diff --git a/external_imported/Catch2/.bazelrc b/external_imported/Catch2/.bazelrc
index c01cb39f1..9cb0aa1b8 100644
--- a/external_imported/Catch2/.bazelrc
+++ b/external_imported/Catch2/.bazelrc
@@ -8,3 +8,4 @@ build:vs2022 --cxxopt=/std:c++17
 
 build:windows --config=vs2022
 build:linux --config=gcc11
+build:macos --cxxopt=-std=c++2b
diff --git a/external_imported/Catch2/.github/workflows/linux-bazel-builds.yml b/external_imported/Catch2/.github/workflows/linux-bazel-builds.yml
index 9006652e2..dc826ac0d 100644
--- a/external_imported/Catch2/.github/workflows/linux-bazel-builds.yml
+++ b/external_imported/Catch2/.github/workflows/linux-bazel-builds.yml
@@ -11,7 +11,7 @@ jobs:
         compilation_mode: [fastbuild, dbg, opt]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Mount bazel cache
       uses: actions/cache@v3
diff --git a/external_imported/Catch2/.github/workflows/linux-meson-builds.yml b/external_imported/Catch2/.github/workflows/linux-meson-builds.yml
index dec701b61..4ffa0243a 100644
--- a/external_imported/Catch2/.github/workflows/linux-meson-builds.yml
+++ b/external_imported/Catch2/.github/workflows/linux-meson-builds.yml
@@ -18,10 +18,12 @@ jobs:
             other_pkgs: clang-11
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Prepare environment
-      run: sudo apt-get install -y meson ninja-build ${{matrix.other_pkgs}}
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y meson ninja-build ${{matrix.other_pkgs}}
 
     - name: Configure build
       env:
diff --git a/external_imported/Catch2/.github/workflows/linux-other-builds.yml b/external_imported/Catch2/.github/workflows/linux-other-builds.yml
index cf4e2c06b..4a7f5ecc6 100644
--- a/external_imported/Catch2/.github/workflows/linux-other-builds.yml
+++ b/external_imported/Catch2/.github/workflows/linux-other-builds.yml
@@ -29,13 +29,13 @@ jobs:
             build_type: Debug
             std: 14
             other_pkgs: g++-7
-            cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON
+            cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON -DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON
           - cxx: g++-7
             build_description: Extras + Examples
             build_type: Release
             std: 14
             other_pkgs: g++-7
-            cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON
+            cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON -DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON
 
           # Extras and examples with Clang-10
           - cxx: clang++-10
@@ -43,13 +43,13 @@ jobs:
             build_type: Debug
             std: 17
             other_pkgs: clang-10
-            cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON
+            cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON -DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON
           - cxx: clang++-10
             build_description: Extras + Examples
             build_type: Release
             std: 17
             other_pkgs: clang-10
-            cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON
+            cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON -DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON
 
           # Configure tests with Clang-10
           - cxx: clang++-10
@@ -70,10 +70,12 @@ jobs:
 
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Prepare environment
-      run: sudo apt-get install -y ninja-build ${{matrix.other_pkgs}}
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y ninja-build ${{matrix.other_pkgs}}
 
     - name: Configure build
       working-directory: ${{runner.workspace}}
diff --git a/external_imported/Catch2/.github/workflows/linux-simple-builds.yml b/external_imported/Catch2/.github/workflows/linux-simple-builds.yml
index 989c4942e..a32eb597e 100644
--- a/external_imported/Catch2/.github/workflows/linux-simple-builds.yml
+++ b/external_imported/Catch2/.github/workflows/linux-simple-builds.yml
@@ -83,7 +83,7 @@ jobs:
             other_pkgs: g++-10
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Add repositories for older GCC
       run: |
@@ -92,7 +92,9 @@ jobs:
       if: ${{ matrix.cxx == 'g++-5' || matrix.cxx == 'g++-6' }}
 
     - name: Prepare environment
-      run: sudo apt-get install -y ninja-build ${{matrix.other_pkgs}}
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y ninja-build ${{matrix.other_pkgs}}
 
     - name: Configure build
       working-directory: ${{runner.workspace}}
diff --git a/external_imported/Catch2/.github/workflows/mac-builds.yml b/external_imported/Catch2/.github/workflows/mac-builds.yml
index 955b81fcc..259d8b367 100644
--- a/external_imported/Catch2/.github/workflows/mac-builds.yml
+++ b/external_imported/Catch2/.github/workflows/mac-builds.yml
@@ -22,7 +22,7 @@ jobs:
             extra_tests: ON
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Configure build
       working-directory: ${{runner.workspace}}
@@ -42,11 +42,10 @@ jobs:
 
     - name: Build tests + lib
       working-directory: ${{runner.workspace}}/build
-      run: make -j 2
+      run: make -j `sysctl -n hw.ncpu`
 
     - name: Run tests
       env:
           CTEST_OUTPUT_ON_FAILURE: 1
       working-directory: ${{runner.workspace}}/build
-      # Hardcode 2 cores we know are there
-      run: ctest -C ${{matrix.build_type}} -j 2
+      run: ctest -C ${{matrix.build_type}} -j `sysctl -n hw.ncpu`
diff --git a/external_imported/Catch2/.github/workflows/validate-header-guards.yml b/external_imported/Catch2/.github/workflows/validate-header-guards.yml
index c02b5d49e..fa9d1574b 100644
--- a/external_imported/Catch2/.github/workflows/validate-header-guards.yml
+++ b/external_imported/Catch2/.github/workflows/validate-header-guards.yml
@@ -9,7 +9,7 @@ jobs:
     steps:
 
       - name: Checkout source code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup Dependencies
         uses: actions/setup-python@v2
diff --git a/external_imported/Catch2/.github/workflows/windows-simple-builds.yml b/external_imported/Catch2/.github/workflows/windows-simple-builds.yml
index 197fa219e..5fb7b8fe7 100644
--- a/external_imported/Catch2/.github/workflows/windows-simple-builds.yml
+++ b/external_imported/Catch2/.github/workflows/windows-simple-builds.yml
@@ -13,7 +13,7 @@ jobs:
         build_type: [Debug, Release]
         std: [14, 17]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Configure build
         working-directory: ${{runner.workspace}}
diff --git a/external_imported/Catch2/BUILD.bazel b/external_imported/Catch2/BUILD.bazel
index 3125e7c54..c51bf57e7 100644
--- a/external_imported/Catch2/BUILD.bazel
+++ b/external_imported/Catch2/BUILD.bazel
@@ -43,12 +43,15 @@ expand_template(
         "#cmakedefine CATCH_CONFIG_NO_GLOBAL_NEXTAFTER": "",
         "#cmakedefine CATCH_CONFIG_NO_POSIX_SIGNALS": "",
         "#cmakedefine CATCH_CONFIG_NO_USE_ASYNC": "",
+        "#cmakedefine CATCH_CONFIG_NO_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT": "",
         "#cmakedefine CATCH_CONFIG_NO_WCHAR": "",
         "#cmakedefine CATCH_CONFIG_NO_WINDOWS_SEH": "",
         "#cmakedefine CATCH_CONFIG_NOSTDOUT": "",
         "#cmakedefine CATCH_CONFIG_POSIX_SIGNALS": "",
         "#cmakedefine CATCH_CONFIG_PREFIX_ALL": "",
+        "#cmakedefine CATCH_CONFIG_PREFIX_MESSAGES": "",
         "#cmakedefine CATCH_CONFIG_SHARED_LIBRARY": "",
+        "#cmakedefine CATCH_CONFIG_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT": "",
         "#cmakedefine CATCH_CONFIG_USE_ASYNC": "",
         "#cmakedefine CATCH_CONFIG_WCHAR": "",
         "#cmakedefine CATCH_CONFIG_WINDOWS_CRTDBG": "",
diff --git a/external_imported/Catch2/CMake/CatchConfigOptions.cmake b/external_imported/Catch2/CMake/CatchConfigOptions.cmake
index 733ec65e2..6eae220df 100644
--- a/external_imported/Catch2/CMake/CatchConfigOptions.cmake
+++ b/external_imported/Catch2/CMake/CatchConfigOptions.cmake
@@ -18,10 +18,12 @@
 macro(AddOverridableConfigOption OptionBaseName)
   option(CATCH_CONFIG_${OptionBaseName} "Read docs/configuration.md for details" OFF)
   option(CATCH_CONFIG_NO_${OptionBaseName} "Read docs/configuration.md for details" OFF)
+  mark_as_advanced(CATCH_CONFIG_${OptionBaseName} CATCH_CONFIG_NO_${OptionBaseName})
 endmacro()
 
 macro(AddConfigOption OptionBaseName)
   option(CATCH_CONFIG_${OptionBaseName} "Read docs/configuration.md for details" OFF)
+  mark_as_advanced(CATCH_CONFIG_${OptionBaseName})
 endmacro()
 
 set(_OverridableOptions
@@ -41,6 +43,7 @@ set(_OverridableOptions
   "WCHAR"
   "WINDOWS_SEH"
   "GETENV"
+  "EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT"
 )
 
 foreach(OptionName ${_OverridableOptions})
@@ -61,6 +64,7 @@ set(_OtherConfigOptions
   "FAST_COMPILE"
   "NOSTDOUT"
   "PREFIX_ALL"
+  "PREFIX_MESSAGES"
   "WINDOWS_CRTDBG"
 )
 
@@ -68,11 +72,17 @@ set(_OtherConfigOptions
 foreach(OptionName ${_OtherConfigOptions})
   AddConfigOption(${OptionName})
 endforeach()
-set(CATCH_CONFIG_SHARED_LIBRARY ${BUILD_SHARED_LIBS})
+if(DEFINED BUILD_SHARED_LIBS)
+    set(CATCH_CONFIG_SHARED_LIBRARY ${BUILD_SHARED_LIBS})
+else()
+    set(CATCH_CONFIG_SHARED_LIBRARY "")
+endif()
 
 set(CATCH_CONFIG_DEFAULT_REPORTER "console" CACHE STRING "Read docs/configuration.md for details. The name of the reporter should be without quotes.")
 set(CATCH_CONFIG_CONSOLE_WIDTH "80" CACHE STRING "Read docs/configuration.md for details. Must form a valid integer literal.")
 
+mark_as_advanced(CATCH_CONFIG_SHARED_LIBRARY CATCH_CONFIG_DEFAULT_REPORTER CATCH_CONFIG_CONSOLE_WIDTH)
+
 # There is no good way to both turn this into a CMake cache variable,
 # and keep reasonable default semantics inside the project. Thus we do
 # not define it and users have to provide it as an outside variable.
diff --git a/external_imported/Catch2/CMake/CatchMiscFunctions.cmake b/external_imported/Catch2/CMake/CatchMiscFunctions.cmake
index 3758d9568..84bd7cc79 100644
--- a/external_imported/Catch2/CMake/CatchMiscFunctions.cmake
+++ b/external_imported/Catch2/CMake/CatchMiscFunctions.cmake
@@ -46,7 +46,6 @@ function(add_warnings_to_targets targets)
         set(CHECKED_WARNING_FLAGS
           "-Wabsolute-value"
           "-Wall"
-          "-Wc++20-compat"
           "-Wcall-to-pure-virtual-from-ctor-dtor"
           "-Wcast-align"
           "-Wcatch-value"
@@ -74,16 +73,18 @@ function(add_warnings_to_targets targets)
           "-Woverloaded-virtual"
           "-Wparentheses"
           "-Wpedantic"
+          "-Wredundant-decls"
           "-Wreorder"
           "-Wreturn-std-move"
           "-Wshadow"
           "-Wstrict-aliasing"
+          "-Wsubobject-linkage"
           "-Wsuggest-destructor-override"
           "-Wsuggest-override"
           "-Wundef"
           "-Wuninitialized"
           "-Wunneeded-internal-declaration"
-          "-Wunreachable-code"
+          "-Wunreachable-code-aggressive"
           "-Wunused"
           "-Wunused-function"
           "-Wunused-parameter"
diff --git a/external_imported/Catch2/CMakeLists.txt b/external_imported/Catch2/CMakeLists.txt
index 6d381d8de..78ac4c8ad 100644
--- a/external_imported/Catch2/CMakeLists.txt
+++ b/external_imported/Catch2/CMakeLists.txt
@@ -11,6 +11,7 @@ endif()
 option(CATCH_INSTALL_DOCS "Install documentation alongside library" ON)
 option(CATCH_INSTALL_EXTRAS "Install extras (CMake scripts, debugger helpers) alongside library" ON)
 option(CATCH_DEVELOPMENT_BUILD "Build tests, enable warnings, enable Werror, etc" OFF)
+option(CATCH_ENABLE_REPRODUCIBLE_BUILD "Add compiler flags for improving build reproducibility" ON)
 
 include(CMakeDependentOption)
 cmake_dependent_option(CATCH_BUILD_TESTING "Build the SelfTest project" ON "CATCH_DEVELOPMENT_BUILD" OFF)
@@ -21,6 +22,7 @@ cmake_dependent_option(CATCH_ENABLE_COVERAGE "Generate coverage for codecov.io"
 cmake_dependent_option(CATCH_ENABLE_WERROR "Enables Werror during build" ON "CATCH_DEVELOPMENT_BUILD" OFF)
 cmake_dependent_option(CATCH_BUILD_SURROGATES "Enable generating and building surrogate TUs for the main headers" OFF "CATCH_DEVELOPMENT_BUILD" OFF)
 cmake_dependent_option(CATCH_ENABLE_CONFIGURE_TESTS "Enable CMake configuration tests. WARNING: VERY EXPENSIVE" OFF "CATCH_DEVELOPMENT_BUILD" OFF)
+cmake_dependent_option(CATCH_ENABLE_CMAKE_HELPER_TESTS "Enable CMake helper tests. WARNING: VERY EXPENSIVE" OFF "CATCH_DEVELOPMENT_BUILD" OFF)
 
 
 # Catch2's build breaks if done in-tree. You probably should not build
@@ -31,7 +33,7 @@ if (CMAKE_BINARY_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
 endif()
 
 project(Catch2
-  VERSION 3.3.2 # CML version placeholder, don't delete
+  VERSION 3.5.2 # CML version placeholder, don't delete
   LANGUAGES CXX
   # HOMEPAGE_URL is not supported until CMake version 3.12, which
   # we do not target yet.
@@ -148,6 +150,8 @@ if (NOT_SUBPROJECT)
             "extras/ParseAndAddCatchTests.cmake"
             "extras/Catch.cmake"
             "extras/CatchAddTests.cmake"
+            "extras/CatchShardTests.cmake"
+            "extras/CatchShardTestsImpl.cmake"
           DESTINATION
             ${CATCH_CMAKE_CONFIG_DESTINATION}
         )
diff --git a/external_imported/Catch2/CMakePresets.json b/external_imported/Catch2/CMakePresets.json
index 00f3a6d3a..885412850 100644
--- a/external_imported/Catch2/CMakePresets.json
+++ b/external_imported/Catch2/CMakePresets.json
@@ -18,7 +18,8 @@
                 "CATCH_BUILD_EXAMPLES": "ON",
                 "CATCH_BUILD_EXTRA_TESTS": "ON",
                 "CATCH_BUILD_SURROGATES": "ON",
-                "CATCH_ENABLE_CONFIGURE_TESTS": "ON"
+                "CATCH_ENABLE_CONFIGURE_TESTS": "ON",
+                "CATCH_ENABLE_CMAKE_HELPER_TESTS": "ON"
             }
         }
     ]   
diff --git a/external_imported/Catch2/Doxyfile b/external_imported/Catch2/Doxyfile
index 07b385ec1..914e59848 100644
--- a/external_imported/Catch2/Doxyfile
+++ b/external_imported/Catch2/Doxyfile
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.9.1
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -32,7 +32,7 @@ DOXYFILE_ENCODING      = UTF-8
 # title of most generated pages and in a few other places.
 # The default value is: My Project.
 
-PROJECT_NAME           = "Catch2"
+PROJECT_NAME           = Catch2
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. This
 # could be handy for archiving the generated documentation or if some version
@@ -51,6 +51,7 @@ PROJECT_BRIEF          = "Popular C++ unit testing framework"
 # pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
 # the logo to the output directory.
 
+PROJECT_LOGO           =
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
 # into which the generated documentation will be written. If a relative path is
@@ -216,6 +217,14 @@ QT_AUTOBRIEF           = YES
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
@@ -251,13 +260,7 @@ TAB_SIZE               = 4
 # a double escape (\\{ and \\})
 
 ALIASES                = "complexity=@par Complexity:" \
-                         "noexcept=**Noexcept**"
-
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
+                         noexcept=**Noexcept**
 
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
@@ -299,19 +302,22 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # parses. With this tag you can assign which parser to use for a given
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
 # Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
 # FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
 # tries to guess whether the code is fixed or free formatted code, this is the
-# default for Fortran type files), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
 # Note that for custom extensions you also need to set FILE_PATTERNS otherwise
-# the files are not read by doxygen.
+# the files are not read by doxygen. When specifying no_extension you should add
+# * to the FILE_PATTERNS.
+#
+# Note see also the list of default file extension mappings.
 
 EXTENSION_MAPPING      =
 
@@ -445,6 +451,19 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
+# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# than 0 to get more control over the balance between CPU load and processing
+# speed. At this moment only the input processing can be done using multiple
+# threads. Since this is still an experimental feature the default is set to 1,
+# which efficively disables parallel processing. Please report any issues you
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -508,6 +527,13 @@ EXTRACT_LOCAL_METHODS  = NO
 
 EXTRACT_ANON_NSPACES   = NO
 
+# If this flag is set to YES, the name of an unnamed parameter in a declaration
+# will be determined by the corresponding definition. By default unnamed
+# parameters remain unnamed in the output.
+# The default value is: YES.
+
+RESOLVE_UNNAMED_PARAMS = YES
+
 # If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
 # undocumented members inside documented classes or files. If set to NO these
 # members will be included in the various overviews, but no documentation
@@ -525,8 +551,8 @@ HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -545,11 +571,18 @@ HIDE_IN_BODY_DOCS      = NO
 
 INTERNAL_DOCS          = NO
 
-# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
-# names in lower-case letters. If set to YES, upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# (including Cygwin) ands Mac users are advised to set this option to NO.
+# With the correct setting of option CASE_SENSE_NAMES doxygen will better be
+# able to match the capabilities of the underlying filesystem. In case the
+# filesystem is case sensitive (i.e. it supports files in the same directory
+# whose names only differ in casing), the option must be set to YES to properly
+# deal with such files in case they appear in the input. For filesystems that
+# are not case sensitive the option should be be set to NO to properly deal with
+# output files written for symbols that only differ in casing, such as for two
+# classes, one named CLASS and the other named Class, and to also support
+# references to files without having to specify the exact matching casing. On
+# Windows (including Cygwin) and MacOS, users should typically set this option
+# to NO, whereas on Linux or other Unix flavors it should typically be set to
+# YES.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = NO
@@ -788,7 +821,10 @@ WARN_IF_DOC_ERROR      = YES
 WARN_NO_PARAMDOC       = YES
 
 # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
-# a warning is encountered.
+# a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS
+# then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but
+# at the end of the doxygen process doxygen will return with a non-zero status.
+# Possible values are: NO, YES and FAIL_ON_WARNINGS.
 # The default value is: NO.
 
 WARN_AS_ERROR          = NO
@@ -819,13 +855,13 @@ WARN_LOGFILE           = doxygen.errors
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT  = "src/catch2"
+INPUT                  = src/catch2
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
 # libiconv (or the iconv built into libc) for the transcoding. See the libiconv
-# documentation (see: https://www.gnu.org/software/libiconv/) for the list of
-# possible encodings.
+# documentation (see:
+# https://www.gnu.org/software/libiconv/) for the list of possible encodings.
 # The default value is: UTF-8.
 
 INPUT_ENCODING         = UTF-8
@@ -838,13 +874,61 @@ INPUT_ENCODING         = UTF-8
 # need to set EXTENSION_MAPPING for the extension otherwise the files are not
 # read by doxygen.
 #
+# Note the list of default checked file patterns might differ from the list of
+# default file extension mappings.
+#
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
 # *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
-
-# FILE_PATTERNS          =
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, *.vhdl,
+# *.ucf, *.qsf and *.ice.
+
+FILE_PATTERNS          = *.c \
+                         *.cc \
+                         *.cxx \
+                         *.cpp \
+                         *.c++ \
+                         *.java \
+                         *.ii \
+                         *.ixx \
+                         *.ipp \
+                         *.i++ \
+                         *.inl \
+                         *.idl \
+                         *.ddl \
+                         *.odl \
+                         *.h \
+                         *.hh \
+                         *.hxx \
+                         *.hpp \
+                         *.h++ \
+                         *.cs \
+                         *.d \
+                         *.php \
+                         *.php4 \
+                         *.php5 \
+                         *.phtml \
+                         *.inc \
+                         *.m \
+                         *.markdown \
+                         *.md \
+                         *.mm \
+                         *.dox \
+                         *.py \
+                         *.pyw \
+                         *.f90 \
+                         *.f95 \
+                         *.f03 \
+                         *.f08 \
+                         *.f18 \
+                         *.f \
+                         *.for \
+                         *.vhd \
+                         *.vhdl \
+                         *.ucf \
+                         *.qsf \
+                         *.ice
 
 # The RECURSIVE tag can be used to specify whether or not subdirectories should
 # be searched for input files as well.
@@ -968,6 +1052,7 @@ FILTER_SOURCE_PATTERNS =
 # (index.html). This can be useful if you have a project on for instance GitHub
 # and want to reuse the introduction page also for the doxygen output.
 
+USE_MDFILE_AS_MAINPAGE =
 
 #---------------------------------------------------------------------------
 # Configuration options related to source browsing
@@ -1055,6 +1140,44 @@ USE_HTAGS              = NO
 
 VERBATIM_HEADERS       = YES
 
+# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
+# clang parser (see:
+# http://clang.llvm.org/) for more accurate parsing at the cost of reduced
+# performance. This can be particularly helpful with template rich C++ code for
+# which doxygen's built-in parser lacks the necessary type information.
+# Note: The availability of this option depends on whether or not doxygen was
+# generated with the -Duse_libclang=ON option for CMake.
+# The default value is: NO.
+
+CLANG_ASSISTED_PARSING = NO
+
+# If clang assisted parsing is enabled and the CLANG_ADD_INC_PATHS tag is set to
+# YES then doxygen will add the directory of each input to the include path.
+# The default value is: YES.
+
+CLANG_ADD_INC_PATHS    = YES
+
+# If clang assisted parsing is enabled you can provide the compiler with command
+# line options that you would normally use when invoking the compiler. Note that
+# the include paths will already be set by doxygen for the files and directories
+# specified with INPUT and INCLUDE_PATH.
+# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
+
+CLANG_OPTIONS          =
+
+# If clang assisted parsing is enabled you can provide the clang parser with the
+# path to the directory containing a file called compile_commands.json. This
+# file is the compilation database (see:
+# http://clang.llvm.org/docs/HowToSetupToolingForLLVM.html) containing the
+# options used when the source files were built. This is equivalent to
+# specifying the -p option to a clang tool, such as clang-check. These options
+# will then be passed to the parser. Any options specified with CLANG_OPTIONS
+# will be added as well.
+# Note: The availability of this option depends on whether or not doxygen was
+# generated with the -Duse_libclang=ON option for CMake.
+
+CLANG_DATABASE_PATH    =
+
 #---------------------------------------------------------------------------
 # Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
@@ -1066,13 +1189,6 @@ VERBATIM_HEADERS       = YES
 
 ALPHABETICAL_INDEX     = YES
 
-# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
-# which the alphabetical index list will be split.
-# Minimum value: 1, maximum value: 20, default value: 5.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-COLS_IN_ALPHA_INDEX    = 5
-
 # In case all classes in a project start with a common prefix, all classes will
 # be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
 # can be used to specify a prefix (or a list of prefixes) that should be ignored
@@ -1211,9 +1327,9 @@ HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
 # consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
 # like the Qt help browser.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1243,10 +1359,11 @@ HTML_INDEX_NUM_ENTRIES = 100
 
 # If the GENERATE_DOCSET tag is set to YES, additional index files will be
 # generated that can be used as input for Apple's Xcode 3 integrated development
-# environment (see: https://developer.apple.com/xcode/), introduced with OSX
-# 10.5 (Leopard). To create a documentation set, doxygen will generate a
-# Makefile in the HTML output directory. Running make will produce the docset in
-# that directory and running make install will install the docset in
+# environment (see:
+# https://developer.apple.com/xcode/), introduced with OSX 10.5 (Leopard). To
+# create a documentation set, doxygen will generate a Makefile in the HTML
+# output directory. Running make will produce the docset in that directory and
+# running make install will install the docset in
 # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
 # startup. See https://developer.apple.com/library/archive/featuredarticles/Doxy
 # genXcode/_index.html for more information.
@@ -1288,8 +1405,8 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see: https://www.microsoft.com/en-us/download/details.aspx?id=21138) on
-# Windows.
+# (see:
+# https://www.microsoft.com/en-us/download/details.aspx?id=21138) on Windows.
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
 # generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
@@ -1364,7 +1481,8 @@ QCH_FILE               =
 
 # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
 # Project output. For more information please see Qt Help Project / Namespace
-# (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace).
+# (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace).
 # The default value is: org.doxygen.Project.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
@@ -1372,8 +1490,8 @@ QHP_NAMESPACE          = org.doxygen.Project
 
 # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
 # Help Project output. For more information please see Qt Help Project / Virtual
-# Folders (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual-
-# folders).
+# Folders (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual-folders).
 # The default value is: doc.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
@@ -1381,16 +1499,16 @@ QHP_VIRTUAL_FOLDER     = doc
 
 # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
 # filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-
-# filters).
+# Filters (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_CUST_FILTER_NAME   =
 
 # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
 # custom filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-
-# filters).
+# Filters (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_CUST_FILTER_ATTRS  =
@@ -1402,9 +1520,9 @@ QHP_CUST_FILTER_ATTRS  =
 
 QHP_SECT_FILTER_ATTRS  =
 
-# The QHG_LOCATION tag can be used to specify the location of Qt's
-# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
-# generated .qhp file.
+# The QHG_LOCATION tag can be used to specify the location (absolute path
+# including file name) of Qt's qhelpgenerator. If non-empty doxygen will try to
+# run qhelpgenerator on the generated .qhp file.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHG_LOCATION           =
@@ -1481,6 +1599,17 @@ TREEVIEW_WIDTH         = 250
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1501,8 +1630,14 @@ FORMULA_FONTSIZE       = 10
 
 FORMULA_TRANSPARENT    = YES
 
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1514,7 +1649,7 @@ USE_MATHJAX            = YES
 
 # When MathJax is enabled you can set the default output format to be used for
 # the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/latest/output.html) for more details.
+# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details.
 # Possible values are: HTML-CSS (which is slower, but has the best
 # compatibility), NativeMML (i.e. MathML) and SVG.
 # The default value is: HTML-CSS.
@@ -1530,7 +1665,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
 # MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
@@ -1545,7 +1680,8 @@ MATHJAX_EXTENSIONS     = TeX/AMSmath \
 
 # The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
 # of code that will be used on startup of the MathJax code. See the MathJax site
-# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details. For an
 # example see the documentation.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1573,7 +1709,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
@@ -1592,7 +1728,8 @@ SERVER_BASED_SEARCH    = NO
 #
 # Doxygen ships with an example indexer (doxyindexer) and search engine
 # (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: https://xapian.org/).
+# Xapian (see:
+# https://xapian.org/).
 #
 # See the section "External Indexing and Searching" for details.
 # The default value is: NO.
@@ -1605,8 +1742,9 @@ EXTERNAL_SEARCH        = NO
 #
 # Doxygen ships with an example indexer (doxyindexer) and search engine
 # (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: https://xapian.org/). See the section "External Indexing and
-# Searching" for details.
+# Xapian (see:
+# https://xapian.org/). See the section "External Indexing and Searching" for
+# details.
 # This tag requires that the tag SEARCHENGINE is set to YES.
 
 SEARCHENGINE_URL       =
@@ -1770,9 +1908,11 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = YES
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -2204,7 +2344,7 @@ HIDE_UNDOC_RELATIONS   = YES
 # http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
 # Bell Labs. The other options in this section have no effect if this option is
 # set to NO
-# The default value is: NO.
+# The default value is: YES.
 
 HAVE_DOT               = YES
 
@@ -2283,10 +2423,32 @@ UML_LOOK               = NO
 # but if the number exceeds 15, the total amount of fields shown is limited to
 # 10.
 # Minimum value: 0, maximum value: 100, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
+# This tag requires that the tag UML_LOOK is set to YES.
 
 UML_LIMIT_NUM_FIELDS   = 10
 
+# If the DOT_UML_DETAILS tag is set to NO, doxygen will show attributes and
+# methods without types and arguments in the UML graphs. If the DOT_UML_DETAILS
+# tag is set to YES, doxygen will add type and arguments for attributes and
+# methods in the UML graphs. If the DOT_UML_DETAILS tag is set to NONE, doxygen
+# will not generate fields with class member information in the UML graphs. The
+# class diagrams will look similar to the default class diagrams but using UML
+# notation for the relationships.
+# Possible values are: NO, YES and NONE.
+# The default value is: NO.
+# This tag requires that the tag UML_LOOK is set to YES.
+
+DOT_UML_DETAILS        = NO
+
+# The DOT_WRAP_THRESHOLD tag can be used to set the maximum number of characters
+# to display on a single line. If the actual line length exceeds this threshold
+# significantly it will wrapped across multiple lines. Some heuristics are apply
+# to avoid ugly line breaks.
+# Minimum value: 0, maximum value: 1000, default value: 17.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_WRAP_THRESHOLD     = 17
+
 # If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
 # collaboration graphs will show the relations between templates and their
 # instances.
@@ -2360,7 +2522,9 @@ DIRECTORY_GRAPH        = NO
 # Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
 # to make the SVG files visible in IE 9+ (other browsers do not have this
 # requirement).
-# Possible values are: png, jpg, gif, svg, png:gd, png:gd:gd, png:cairo,
+# Possible values are: png, png:cairo, png:cairo:cairo, png:cairo:gd, png:gd,
+# png:gd:gd, jpg, jpg:cairo, jpg:cairo:gd, jpg:gd, jpg:gd:gd, gif, gif:cairo,
+# gif:cairo:gd, gif:gd, gif:gd:gd, svg, png:gd, png:gd:gd, png:cairo,
 # png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
 # png:gdiplus:gdiplus.
 # The default value is: png.
@@ -2476,9 +2640,11 @@ DOT_MULTI_TARGETS      = YES
 
 GENERATE_LEGEND        = YES
 
-# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
 # files that are used to generate the various graphs.
+#
+# Note: This setting is not only used for dot files but also for msc and
+# plantuml temporary files.
 # The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_CLEANUP            = YES
diff --git a/external_imported/Catch2/MODULE.bazel b/external_imported/Catch2/MODULE.bazel
new file mode 100644
index 000000000..a7846cd60
--- /dev/null
+++ b/external_imported/Catch2/MODULE.bazel
@@ -0,0 +1,3 @@
+module(name = "catch2")
+
+bazel_dep(name = "bazel_skylib", version = "1.5.0")
diff --git a/external_imported/Catch2/WORKSPACE.bazel b/external_imported/Catch2/WORKSPACE.bazel
index 6fd2ffa5d..357e6f944 100644
--- a/external_imported/Catch2/WORKSPACE.bazel
+++ b/external_imported/Catch2/WORKSPACE.bazel
@@ -4,12 +4,13 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
     name = "bazel_skylib",
+    sha256 = "cd55a062e763b9349921f0f5db8c3933288dc8ba4f76dd9416aac68acee3cb94",
     urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.3.0/bazel-skylib-1.3.0.tar.gz",
-        "https://github.com/bazelbuild/bazel-skylib/releases/download/1.3.0/bazel-skylib-1.3.0.tar.gz",
+        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.5.0/bazel-skylib-1.5.0.tar.gz",
+        "https://github.com/bazelbuild/bazel-skylib/releases/download/1.5.0/bazel-skylib-1.5.0.tar.gz",
     ],
-    sha256 = "74d544d96f4a5bb630d465ca8bbcfe231e3594e5aae57e1edbf17a6eb3ca2506",
 )
 
 load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
+
 bazel_skylib_workspace()
diff --git a/external_imported/Catch2/appveyor.yml b/external_imported/Catch2/appveyor.yml
index 3b6580d8b..7a0ad83ff 100644
--- a/external_imported/Catch2/appveyor.yml
+++ b/external_imported/Catch2/appveyor.yml
@@ -70,14 +70,3 @@ environment:
       additional_flags: "/permissive- /std:c++latest"
       platform: x64
       configuration: Debug
-
-    - FLAVOR: VS 2017 x64 Debug
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      platform: x64
-      configuration: Debug
-
-    - FLAVOR: VS 2017 x64 Release Coverage
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      coverage: 1
-      platform: x64
-      configuration: Debug
\ No newline at end of file
diff --git a/external_imported/Catch2/docs/benchmarks.md b/external_imported/Catch2/docs/benchmarks.md
index 548913c76..9edbb93c7 100644
--- a/external_imported/Catch2/docs/benchmarks.md
+++ b/external_imported/Catch2/docs/benchmarks.md
@@ -93,7 +93,7 @@ Fibonacci
 -------------------------------------------------------------------------------
 C:\path\to\Catch2\Benchmark.tests.cpp(10)
 ...............................................................................
-benchmark name                                  samples       iterations    estimated
+benchmark name                                  samples       iterations    est run time
                                                 mean          low mean      high mean
                                                 std dev       low std dev   high std dev
 -------------------------------------------------------------------------------
diff --git a/external_imported/Catch2/docs/ci-and-misc.md b/external_imported/Catch2/docs/ci-and-misc.md
index c07da29f0..49bbd9891 100644
--- a/external_imported/Catch2/docs/ci-and-misc.md
+++ b/external_imported/Catch2/docs/ci-and-misc.md
@@ -82,7 +82,7 @@ variable set to "1".
 
 ### CodeCoverage module (GCOV, LCOV...)
 
-If you are using GCOV tool to get testing coverage of your code, and are not sure how to integrate it with CMake and Catch, there should be an external example over at https://github.com/fkromer/catch_cmake_coverage
+If you are using GCOV tool to get testing coverage of your code, and are not sure how to integrate it with CMake and Catch, there should be an external example over at https://github.com/claremacrae/catch_cmake_coverage
 
 
 ### pkg-config
diff --git a/external_imported/Catch2/docs/cmake-integration.md b/external_imported/Catch2/docs/cmake-integration.md
index 0720a95b0..86666efe2 100644
--- a/external_imported/Catch2/docs/cmake-integration.md
+++ b/external_imported/Catch2/docs/cmake-integration.md
@@ -51,7 +51,7 @@ Include(FetchContent)
 FetchContent_Declare(
   Catch2
   GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-  GIT_TAG        v3.0.1 # or a later release
+  GIT_TAG        v3.4.0 # or a later release
 )
 
 FetchContent_MakeAvailable(Catch2)
@@ -126,6 +126,7 @@ catch_discover_tests(target
                      [OUTPUT_DIR dir]
                      [OUTPUT_PREFIX prefix]
                      [OUTPUT_SUFFIX suffix]
+                     [DISCOVERY_MODE <POST_BUILD|PRE_TEST>]
 )
 ```
 
@@ -198,6 +199,16 @@ If specified, `suffix` is added to each output file name, like so
 `--out dir/<test_name>suffix`. This can be used to add a file extension to
 the output file name e.g. ".xml".
 
+* `DISCOVERY_MODE mode`
+
+If specified allows control over when test discovery is performed.
+For a value of `POST_BUILD` (default) test discovery is performed at build time.
+For a value of `PRE_TEST` test discovery is delayed until just prior to test
+execution (useful e.g. in cross-compilation environments).
+``DISCOVERY_MODE`` defaults to the value of the
+``CMAKE_CATCH_DISCOVER_TESTS_DISCOVERY_MODE`` variable if it is not passed when
+calling ``catch_discover_tests``. This provides a mechanism for globally
+selecting a preferred test discovery behavior.
 
 ### `ParseAndAddCatchTests.cmake`
 
diff --git a/external_imported/Catch2/docs/command-line.md b/external_imported/Catch2/docs/command-line.md
index a15a21314..bb483959d 100644
--- a/external_imported/Catch2/docs/command-line.md
+++ b/external_imported/Catch2/docs/command-line.md
@@ -85,43 +85,102 @@ Click one of the following links to take you straight to that option - or scroll
 
 <pre>&lt;test-spec> ...</pre>
 
-Test cases, wildcarded test cases, tags and tag expressions are all passed directly as arguments. Tags are distinguished by being enclosed in square brackets.
+By providing a test spec, you filter which tests will be run. If you call
+Catch2 without any test spec, then it will run all non-hidden test
+cases. A test case is hidden if it has the `[!benchmark]` tag, any tag
+with a dot at the start, e.g. `[.]` or `[.foo]`.
 
-If no test specs are supplied then all test cases, except "hidden" tests, are run.
-A test is hidden by giving it any tag starting with (or just) a period (```.```) - or, in the deprecated case, tagged ```[hide]``` or given name starting with `'./'`. To specify hidden tests from the command line ```[.]``` or ```[hide]``` can be used *regardless of how they were declared*.
+There are three basic test specs that can then be combined into more
+complex specs:
 
-Specs must be enclosed in quotes if they contain spaces. If they do not contain spaces the quotes are optional.
+  * Full test name, e.g. `"Test 1"`.
 
-Wildcards consist of the `*` character at the beginning and/or end of test case names and can substitute for any number of any characters (including none).
+    This allows only test cases whose name is "Test 1".
 
-Test specs are case insensitive.
+  * Wildcarded test name, e.g. `"*Test"`, or `"Test*"`, or `"*Test*"`.
 
-If a spec is prefixed with `exclude:` or the `~` character then the pattern matches an exclusion. This means that tests matching the pattern are excluded from the set - even if a prior inclusion spec included them. Subsequent inclusion specs will take precedence, however.
-Inclusions and exclusions are evaluated in left-to-right order.
+    This allows any test case whose name ends with, starts with, or contains
+    in the middle the string "Test". Note that the wildcard can only be at
+    the start or end.
 
-Test case examples:
+  * Tag name, e.g. `[some-tag]`.
 
+    This allows any test case tagged with "[some-tag]". Remember that some
+    tags are special, e.g. those that start with "." or with "!".
+
+
+You can also combine the basic test specs to create more complex test
+specs. You can:
+
+  * Concatenate specs to apply all of them, e.g. `[some-tag][other-tag]`.
+
+    This allows test cases that are tagged with **both** "[some-tag]" **and**
+    "[other-tag]". A test case with just "[some-tag]" will not pass the filter,
+    nor will test case with just "[other-tag]".
+
+  * Comma-join specs to apply any of them, e.g. `[some-tag],[other-tag]`.
+
+    This allows test cases that are tagged with **either** "[some-tag]" **or**
+    "[other-tag]". A test case with both will obviously also pass the filter.
+
+    Note that commas take precendence over simple concatenation. This means
+    that `[a][b],[c]` accepts tests that are tagged with either both "[a]" and
+    "[b]", or tests that are tagged with just "[c]".
+
+  * Negate the spec by prepending it with `~`, e.g. `~[some-tag]`.
+
+    This rejects any test case that is tagged with "[some-tag]". Note that
+    rejection takes precedence over other filters.
+
+    Note that negations always binds to the following _basic_ test spec.
+    This means that `~[foo][bar]` negates only the "[foo]" tag and not the
+    "[bar]" tag.
+
+Note that when Catch2 is deciding whether to include a test, first it
+checks whether the test matches any negative filters. If it does,
+the test is rejected. After that, the behaviour depends on whether there
+are positive filters as well. If there are no positive filters, all
+remaining non-hidden tests are included. If there are positive filters,
+only tests that match the positive filters are included.
+
+You can also match test names with special characters by escaping them
+with a backslash (`"\"`), e.g. a test named `"Do A, then B"` is matched
+by "Do A\, then B" test spec. Backslash also escapes itself.
+
+
+### Examples
+
+Given these TEST_CASEs,
 ```
-thisTestOnly            Matches the test case called, 'thisTestOnly'
-"this test only"        Matches the test case called, 'this test only'
-these*                  Matches all cases starting with 'these'
-exclude:notThis         Matches all tests except, 'notThis'
-~notThis                Matches all tests except, 'notThis'
-~*private*              Matches all tests except those that contain 'private'
-a* ~ab* abc             Matches all tests that start with 'a', except those that
-                        start with 'ab', except 'abc', which is included
-~[tag1]                 Matches all tests except those tagged with '[tag1]'
--# [#somefile]          Matches all tests from the file 'somefile.cpp'
+TEST_CASE("Test 1") {}
+
+TEST_CASE("Test 2", "[.foo]") {}
+
+TEST_CASE("Test 3", "[.bar]") {}
+
+TEST_CASE("Test 4", "[.][foo][bar]") {}
 ```
 
-Names within square brackets are interpreted as tags.
-A series of tags form an AND expression whereas a comma-separated sequence forms an OR expression. e.g.:
+this is the result of these filters
+```
+./tests                      # Selects only the first test, others are hidden
+./tests "Test 1"             # Selects only the first test, other do not match
+./tests ~"Test 1"            # Selects no tests. Test 1 is rejected, other tests are hidden
+./tests "Test *"             # Selects all tests.
+./tests [bar]                # Selects tests 3 and 4. Other tests are not tagged [bar]
+./tests ~[foo]               # Selects test 1, because it is the only non-hidden test without [foo] tag
+./tests [foo][bar]           # Selects test 4.
+./tests [foo],[bar]          # Selects tests 2, 3, 4.
+./tests ~[foo][bar]          # Selects test 3. 2 and 4 are rejected due to having [foo] tag
+./tests ~"Test 2"[foo]       # Selects test 4, because test 2 is explicitly rejected
+./tests [foo][bar],"Test 1"  # Selects tests 1 and 4.
+./tests "Test 1*"            # Selects test 1, wildcard can match zero characters
+```
 
-<pre>[one][two],[three]</pre>
-This matches all tests tagged `[one]` and `[two]`, as well as all tests tagged `[three]`
+_Note: Using plain asterisk on a command line can cause issues with shell
+expansion. Make sure that the asterisk is passed to Catch2 and is not
+interpreted by the shell._
 
-Test names containing special characters, such as `,` or `[` can specify them on the command line using `\`.
-`\` also escapes itself.
 
 <a id="choosing-a-reporter-to-use"></a>
 ## Choosing a reporter to use
diff --git a/external_imported/Catch2/docs/configuration.md b/external_imported/Catch2/docs/configuration.md
index d4421f3c0..8a3ddfab5 100644
--- a/external_imported/Catch2/docs/configuration.md
+++ b/external_imported/Catch2/docs/configuration.md
@@ -15,6 +15,7 @@
 [Enabling stringification](#enabling-stringification)<br>
 [Disabling exceptions](#disabling-exceptions)<br>
 [Overriding Catch's debug break (`-b`)](#overriding-catchs-debug-break--b)<br>
+[Static analysis support](#static-analysis-support)<br>
 
 Catch2 is designed to "just work" as much as possible, and most of the
 configuration options below are changed automatically during compilation,
@@ -25,7 +26,8 @@ with the same name.
 
 ## Prefixing Catch macros
 
-    CATCH_CONFIG_PREFIX_ALL
+    CATCH_CONFIG_PREFIX_ALL       // Prefix all macros with CATCH_
+    CATCH_CONFIG_PREFIX_MESSAGES  // Prefix only INFO, UNSCOPED_INFO, WARN and CAPTURE
 
 To keep test code clean and uncluttered Catch uses short macro names (e.g. ```TEST_CASE``` and ```REQUIRE```). Occasionally these may conflict with identifiers from platform headers or the system under test. In this case the above identifier can be defined. This will cause all the Catch user macros to be prefixed with ```CATCH_``` (e.g. ```CATCH_TEST_CASE``` and ```CATCH_REQUIRE```).
 
@@ -264,6 +266,31 @@ The macro will be used as is, that is, `CATCH_BREAK_INTO_DEBUGGER();`
 must compile and must break into debugger.
 
 
+## Static analysis support
+
+> Introduced in Catch2 3.4.0.
+
+Some parts of Catch2, e.g. `SECTION`s, can be hard for static analysis
+tools to reason about. Catch2 can change its internals to help static
+analysis tools reason about the tests.
+
+Catch2 automatically detects some static analysis tools (initial
+implementation checks for clang-tidy and Coverity), but you can override
+its detection (in either direction) via
+
+```
+CATCH_CONFIG_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT     // force enables static analysis help
+CATCH_CONFIG_NO_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT  // force disables static analysis help
+```
+
+_As the name suggests, this is currently experimental, and thus we provide
+no backwards compatibility guarantees._
+
+**DO NOT ENABLE THIS FOR BUILDS YOU INTEND TO RUN.** The changed internals
+are not meant to be runnable, only "scannable".
+
+
+
 ---
 
 [Home](Readme.md#top)
diff --git a/external_imported/Catch2/docs/faq.md b/external_imported/Catch2/docs/faq.md
index 0f303ee50..80923d26e 100644
--- a/external_imported/Catch2/docs/faq.md
+++ b/external_imported/Catch2/docs/faq.md
@@ -10,6 +10,7 @@
 [Does Catch2 support running tests in parallel?](#does-catch2-support-running-tests-in-parallel)<br>
 [Can I compile Catch2 into a dynamic library?](#can-i-compile-catch2-into-a-dynamic-library)<br>
 [What repeatability guarantees does Catch2 provide?](#what-repeatability-guarantees-does-catch2-provide)<br>
+[My build cannot find `catch2/catch_user_config.hpp`, how can I fix it?](#my-build-cannot-find-catch2catch_user_confighpp-how-can-i-fix-it)<br>
 
 
 ## How do I run global setup/teardown only if tests will be run?
@@ -28,7 +29,7 @@ depending on how often the cleanup needs to happen.
 ## Why cannot I derive from the built-in reporters?
 
 They are not made to be overridden, in that we do not attempt to maintain
-a consistent internal state if a member function is overriden, and by
+a consistent internal state if a member function is overridden, and by
 forbidding users from using them as a base class, we can refactor them
 as needed later.
 
@@ -83,12 +84,30 @@ and it is also generally repeatable across versions, but we might break
 it from time to time. E.g. we broke repeatability with previous versions
 in v2.13.4 so that test cases with similar names are shuffled better.
 
-Random generators currently rely on platform's stdlib, specifically
-the distributions from `<random>`. We thus provide no extra guarantee
-above what your platform does. **Important: `<random>`'s distributions
+Since Catch2 3.5.0 the random generators use custom distributions,
+that should be repeatable across different platforms, with few caveats.
+For details see the section on random generators in the [Generator
+documentation](generators.md#random-number-generators-details).
+
+Before this version, random generators relied on distributions from
+platform's stdlib. We thus can provide no extra guarantee on top of the
+ones given by your platform. **Important: `<random>`'s distributions
 are not specified to be repeatable across different platforms.**
 
 
+## My build cannot find `catch2/catch_user_config.hpp`, how can I fix it?
+
+`catch2/catch_user_config.hpp` is a generated header that contains user
+compile time configuration. It is generated by CMake/Meson/Bazel during
+build. If you are not using either of these, your three options are to
+
+1) Build Catch2 separately using build tool that will generate the header
+2) Use the amalgamated files to build Catch2
+3) Use CMake to configure a build. This will generate the header and you
+   can copy it into your own checkout of Catch2.
+
+
+
 ---
 
 [Home](Readme.md#top)
diff --git a/external_imported/Catch2/docs/generators.md b/external_imported/Catch2/docs/generators.md
index 69d1a02d1..8bca54c75 100644
--- a/external_imported/Catch2/docs/generators.md
+++ b/external_imported/Catch2/docs/generators.md
@@ -134,7 +134,7 @@ type, making their usage much nicer. These are
 * `map<T>(func, GeneratorWrapper<U>&&)` for `MapGenerator<T, U, Func>` (map `U` to `T`)
 * `chunk(chunk-size, GeneratorWrapper<T>&&)` for `ChunkGenerator<T>`
 * `random(IntegerOrFloat a, IntegerOrFloat b)` for `RandomIntegerGenerator` or `RandomFloatGenerator`
-* `range(Arithemtic start, Arithmetic end)` for `RangeGenerator<Arithmetic>` with a step size of `1`
+* `range(Arithmetic start, Arithmetic end)` for `RangeGenerator<Arithmetic>` with a step size of `1`
 * `range(Arithmetic start, Arithmetic end, Arithmetic step)` for `RangeGenerator<Arithmetic>` with a custom step size
 * `from_range(InputIterator from, InputIterator to)` for `IteratorGenerator<T>`
 * `from_range(Container const&)` for `IteratorGenerator<T>`
@@ -189,6 +189,31 @@ TEST_CASE("type conversion", "[generators]") {
 }
 ```
 
+
+### Random number generators: details
+
+> This section applies from Catch2 3.5.0. Before that, random generators
+> were a thin wrapper around distributions from `<random>`.
+
+All of the `random(a, b)` generators in Catch2 currently generate uniformly
+distributed number in closed interval \[a; b\]. This  is different from
+`std::uniform_real_distribution`, which should return numbers in interval
+\[a; b) (but due to rounding can end up returning b anyway), but the
+difference is intentional, so that `random(a, a)` makes sense. If there is
+enough interest from users, we can provide API to pick any of CC, CO, OC,
+or OO ranges.
+
+Unlike `std::uniform_int_distribution`, Catch2's generators also support
+various single-byte integral types, such as `char` or `bool`.
+
+Given the same seed, the output from the integral generators is
+reproducible across different platforms. For floating point generators,
+we only promise reproducibility on platforms that obey the IEEE 754
+standard, and where `float` is 4 bytes and `double` is 8 bytes. We provide
+no guarantees for `long double`, as the internals of `long double` can
+vary wildly across different platforms.
+
+
 ## Generator interface
 
 You can also implement your own generators, by deriving from the
@@ -221,3 +246,21 @@ For full example of implementing your own generator, look into Catch2's
 examples, specifically
 [Generators: Create your own generator](../examples/300-Gen-OwnGenerator.cpp).
 
+
+### Handling empty generators
+
+The generator interface assumes that a generator always has at least one
+element. This is not always true, e.g. if the generator depends on an external
+datafile, the file might be missing.
+
+There are two ways to handle this, depending on whether you want this
+to be an error or not.
+
+ * If empty generator **is** an error, throw an exception in constructor.
+ * If empty generator **is not** an error, use the [`SKIP`](skipping-passing-failing.md#skipping-test-cases-at-runtime) in constructor.
+
+
+
+---
+
+[Home](Readme.md#top)
diff --git a/external_imported/Catch2/docs/limitations.md b/external_imported/Catch2/docs/limitations.md
index cc0ed05d1..099dd82a5 100644
--- a/external_imported/Catch2/docs/limitations.md
+++ b/external_imported/Catch2/docs/limitations.md
@@ -173,13 +173,3 @@ TEST_CASE("b") {
 
 If you are seeing a problem like this, i.e. weird test paths that trigger only under Clang with `libc++`, or only under very specific version of `libstdc++`, it is very likely you are seeing this. The only known workaround is to use a fixed version of your standard library.
 
-
-### libstdc++, `_GLIBCXX_DEBUG` macro and random ordering of tests
-
-Running a Catch2 binary compiled against libstdc++ with `_GLIBCXX_DEBUG`
-macro defined with `--order rand` will cause a debug check to trigger and
-abort the run due to self-assignment.
-[This is a known bug inside libstdc++](https://stackoverflow.com/questions/22915325/avoiding-self-assignment-in-stdshuffle/23691322)
-
-Workaround: Don't use `--order rand` when compiling against debug-enabled
-libstdc++.
diff --git a/external_imported/Catch2/docs/matchers.md b/external_imported/Catch2/docs/matchers.md
index 14c158982..d5be1f5a3 100644
--- a/external_imported/Catch2/docs/matchers.md
+++ b/external_imported/Catch2/docs/matchers.md
@@ -50,25 +50,43 @@ Both of the string matchers used in the examples above live in the
 `catch_matchers_string.hpp` header, so to compile the code above also
 requires `#include <catch2/matchers/catch_matchers_string.hpp>`.
 
+### Combining operators and lifetimes
+
 **IMPORTANT**: The combining operators do not take ownership of the
-matcher objects being combined. This means that if you store combined
-matcher object, you have to ensure that the matchers being combined
-outlive its last use. What this means is that the following code leads
-to a use-after-free (UAF):
+matcher objects being combined.
+
+This means that if you store combined matcher object, you have to ensure
+that the individual matchers being combined outlive the combined matcher.
+Note that the negation matcher from `!` also counts as combining matcher
+for this.
 
+Explained on an example, this is fine
 ```cpp
-#include <catch2/catch_test_macros.hpp>
-#include <catch2/matchers/catch_matchers_string.hpp>
+CHECK_THAT(value, WithinAbs(0, 2e-2) && !WithinULP(0., 1));
+```
 
-TEST_CASE("Bugs, bugs, bugs", "[Bug]"){
-    std::string str = "Bugs as a service";
+and so is this
+```cpp
+auto is_close_to_zero = WithinAbs(0, 2e-2);
+auto is_zero          = WithinULP(0., 1);
 
-    auto match_expression = Catch::Matchers::EndsWith( "as a service" ) ||
-        (Catch::Matchers::StartsWith( "Big data" ) && !Catch::Matchers::ContainsSubstring( "web scale" ) );
-    REQUIRE_THAT(str, match_expression);
-}
+CHECK_THAT(value, is_close_to_zero && !is_zero);
 ```
 
+but this is not
+```cpp
+auto is_close_to_zero = WithinAbs(0, 2e-2);
+auto is_zero          = WithinULP(0., 1);
+auto is_close_to_but_not_zero = is_close_to_zero && !is_zero;
+
+CHECK_THAT(a_value, is_close_to_but_not_zero); // UAF
+```
+
+because `!is_zero` creates a temporary instance of Negation matcher,
+which the `is_close_to_but_not_zero` refers to. After the line ends,
+the temporary is destroyed and the combined `is_close_to_but_not_zero`
+matcher now refers to non-existent object, so using it causes use-after-free.
+
 
 ## Built-in matchers
 
@@ -286,7 +304,7 @@ comparable. (e.g. you may compare `std::vector<int>` to `std::array<char>`).
 `UnorderedRangeEquals` is similar to `RangeEquals`, but the order
 does not matter. For example "1, 2, 3" would match "3, 2, 1", but not
 "1, 1, 2, 3" As with `RangeEquals`, `UnorderedRangeEquals` compares
-the individual elements using using `operator==` by default.
+the individual elements using `operator==` by default.
 
 Both `RangeEquals` and `UnorderedRangeEquals` optionally accept a
 predicate which can be used to compare the containers element-wise.
diff --git a/external_imported/Catch2/docs/opensource-users.md b/external_imported/Catch2/docs/opensource-users.md
index 12b4551c5..a02d0b98e 100644
--- a/external_imported/Catch2/docs/opensource-users.md
+++ b/external_imported/Catch2/docs/opensource-users.md
@@ -95,6 +95,9 @@ A C++ client library for Consul. Consul is a distributed tool for discovering an
 ### [Reactive-Extensions/ RxCpp](https://github.com/Reactive-Extensions/RxCpp)
 A library of algorithms for values-distributed-in-time.
 
+### [SFML](https://github.com/SFML/SFML)
+Simple and Fast Multimedia Library.
+
 ### [SOCI](https://github.com/SOCI/soci)
 The C++ Database Access Library.
 
@@ -110,6 +113,12 @@ A header-only TOML parser and serializer for modern C++.
 ### [Trompeloeil](https://github.com/rollbear/trompeloeil)
 A thread-safe header-only mocking framework for C++14.
 
+### [wxWidgets](https://www.wxwidgets.org/)
+Cross-Platform C++ GUI Library.
+
+### [xmlwrapp](https://github.com/vslavik/xmlwrapp)
+C++ XML parsing library using libxml2.
+
 ## Applications & Tools
 
 ### [App Mesh](https://github.com/laoshanxi/app-mesh)
@@ -137,7 +146,7 @@ Newsbeuter is an open-source RSS/Atom feed reader for text terminals.
 A 2D, Zombie, RPG game which is being made on our own engine.
 
 ### [raspigcd](https://github.com/pantadeusz/raspigcd)
-Low level CLI app and library for execution of GCODE on Raspberry Pi without any additional microcontrolers (just RPi + Stepsticks).
+Low level CLI app and library for execution of GCODE on Raspberry Pi without any additional microcontrollers (just RPi + Stepsticks).
 
 ### [SpECTRE](https://github.com/sxs-collaboration/spectre)
 SpECTRE is a code for multi-scale, multi-physics problems in astrophysics and gravitational physics.
diff --git a/external_imported/Catch2/docs/release-notes.md b/external_imported/Catch2/docs/release-notes.md
index 1fa37da43..ca7f4ddee 100644
--- a/external_imported/Catch2/docs/release-notes.md
+++ b/external_imported/Catch2/docs/release-notes.md
@@ -2,6 +2,10 @@
 
 # Release notes
 **Contents**<br>
+[3.5.2](#352)<br>
+[3.5.1](#351)<br>
+[3.5.0](#350)<br>
+[3.4.0](#340)<br>
 [3.3.2](#332)<br>
 [3.3.1](#331)<br>
 [3.3.0](#330)<br>
@@ -56,6 +60,87 @@
 [Even Older versions](#even-older-versions)<br>
 
 
+## 3.5.1
+
+### Fixes
+* Fixed `-Wsubobject-linkage` in the Console reporter (#2794)
+* Fixed adding new CLI Options to lvalue parser using `|` (#2787)
+
+
+## 3.5.1
+
+### Improvements
+* Significantly improved performance of the CLI parsing.
+  * This includes the cost of preparing the CLI parser, so Catch2's binaries start much faster.
+
+### Miscellaneous
+* Added support for Bazel modules (#2781)
+* Added CMake option to disable the build reproducibility settings (#2785)
+* Added `log` library linking to the Meson build (#2784)
+
+
+## 3.5.0
+
+### Improvements
+* Introduced `CATCH_CONFIG_PREFIX_MESSAGES` to prefix only logging macros (#2544)
+  * This means `INFO`, `UNSCOPED_INFO`, `WARN` and `CAPTURE`.
+* Section hints in static analysis mode are now `const`
+  * This prevents Clang-Tidy from complaining about `misc-const-correctness`.
+* `from_range` generator supports C arrays and ranges that require ADL (#2737)
+* Stringification support for `std::optional` now also includes `std::nullopt` (#2740)
+* The Console reporter flushes output after writing benchmark runtime estimate.
+  * This means that you can immediately see for how long the benchmark is expected to run.
+* Added workaround to enable compilation with ICC 19.1 (#2551, #2766)
+* Compiling Catch2 for XBox should work out of the box (#2772)
+  * Catch2 should automatically disable getenv when compiled for XBox.
+* Compiling Catch2 with exceptions disabled no longer triggers `Wunused-function` (#2726)
+* **`random` Generators for integral types are now reproducible across different platforms**
+  * Unlike `<random>`, Catch2's generators also support 1 byte integral types (`char`, `bool`, ...)
+* **`random` Generators for `float` and `double` are now reproducible across different platforms**
+  * `long double` varies across different platforms too much to be reproducible
+  * This guarantee applies only to platforms with IEEE 754 floats.
+
+### Fixes
+* UDL declaration inside Catch2 are now strictly conforming to the standard
+  * `operator "" _a` is UB, `operator ""_a` is fine. Seriously.
+* Fixed `CAPTURE` tests failing to compile in C++23 mode (#2744)
+* Fixed missing include in `catch_message.hpp` (#2758)
+* Fixed `CHECK_ELSE` suppressing failure from uncaught exceptions(#2723)
+
+### Miscellaneous
+* The documentation for specifying which tests to run through commandline has been completely rewritten (#2738)
+* Fixed installation when building Catch2 with meson (#2722, #2742)
+* Fixed `catch_discover_tests` when using custom reporter and `PRE_TEST` discovery mode (#2747)
+* `catch_discover_tests` supports multi-config CMake generator in `PRE_TEST` discovery mode (#2739, #2746)
+
+
+## 3.4.0
+
+### Improvements
+* `VectorEquals` supports elements that provide only `==` and not `!=` (#2648)
+* Catch2 supports compiling with IAR compiler (#2651)
+* Various small internal performance improvements
+* Various small internal compilation time improvements
+* XMLReporter now reports location info for INFO and WARN (#1251)
+  * This bumps up the xml format version to 3
+* Documented that `SKIP` in generator constructor can be used to handle empty  generator (#1593)
+* Added experimental static analysis support to `TEST_CASE` and `SECTION` macros (#2681)
+  * The two macros are redefined in a way that helps the SA tools reason about the possible paths through a test case with sections.
+  * The support is controlled by the `CATCH_CONFIG_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT` option and autodetects clang-tidy and Coverity.
+* `*_THROWS`, `*_THROWS_AS`, etc now suppress warning coming from `__attribute__((warn_unused_result))` on GCC  (#2691)
+  * Unlike plain `[[nodiscard]]`, this warning is not silenced by void cast. WTF GCC?
+
+### Fixes
+* Fixed `assertionStarting` events being sent after the expr is evaluated (#2678)
+* Errors in `TEST_CASE` tags are now reported nicely (#2650)
+
+### Miscellaneous
+* Bunch of improvements to `catch_discover_tests`
+  * Added DISCOVERY_MODE option, so the discovery can happen either post build or pre-run.
+  * Fixed handling of semicolons and backslashes in test names (#2674, #2676)
+* meson build can disable building tests (#2693)
+* meson build properly sets meson version 0.54.1 as the minimal supported version (#2688)
+
 
 ## 3.3.2
 
@@ -149,7 +234,7 @@
 
 ### Fixes
 * Cleaned out some warnings and static analysis issues
-  * Suppressed `-Wcomma` warning rarely occuring in templated test cases (#2543)
+  * Suppressed `-Wcomma` warning rarely occurring in templated test cases (#2543)
   * Constified implementation details in `INFO` (#2564)
   * Made `MatcherGenericBase` copy constructor const (#2566)
 * Fixed serialization of test filters so the output roundtrips
@@ -352,7 +437,7 @@ v3 releases.
 * Added `STATIC_CHECK` macro, similar to `STATIC_REQUIRE` (#2318)
   * When deferred tu runtime, it behaves like `CHECK`, and not like `REQUIRE`.
 * You can have multiple tests with the same name, as long as other parts of the test identity differ (#1915, #1999, #2175)
-  * Test identity includes test's name, test's tags and and test's class name if applicable.
+  * Test identity includes test's name, test's tags and test's class name if applicable.
 * Added new warning, `UnmatchedTestSpec`, to error on test specs with no matching tests
 * The `-w`, `--warn` warning flags can now be provided multiple times to enable multiple warnings
 * The case-insensitive handling of tags is now more reliable and takes up less memory
@@ -517,7 +602,7 @@ v3 releases.
   * The `SECTION`(s) before the `GENERATE` will not be run multiple times, the following ones will.
 * Added `-D`/`--min-duration` command line flag (#1910)
   * If a test takes longer to finish than the provided value, its name and duration will be printed.
-  * This flag is overriden by setting `-d`/`--duration`.
+  * This flag is overridden by setting `-d`/`--duration`.
 
 ### Fixes
 * `TAPReporter` no longer skips successful assertions (#1983)
@@ -585,7 +670,7 @@ v3 releases.
 ### Fixes
 * Fixed computation of benchmarking column widths in ConsoleReporter (#1885, #1886)
 * Suppressed clang-tidy's `cppcoreguidelines-pro-type-vararg` in assertions (#1901)
-  * It was a false positive trigered by the new warning support workaround
+  * It was a false positive triggered by the new warning support workaround
 * Fixed bug in test specification parser handling of OR'd patterns using escaping (#1905)
 
 ### Miscellaneous
@@ -922,7 +1007,7 @@ v3 releases.
 
 ### Contrib
 * `ParseAndAddCatchTests` has learned how to use `DISABLED` CTest property (#1452)
-* `ParseAndAddCatchTests` now works when there is a whitspace before the test name (#1493)
+* `ParseAndAddCatchTests` now works when there is a whitespace before the test name (#1493)
 
 
 ### Miscellaneous
diff --git a/external_imported/Catch2/docs/reporter-events.md b/external_imported/Catch2/docs/reporter-events.md
index 32a0ae507..015f67be4 100644
--- a/external_imported/Catch2/docs/reporter-events.md
+++ b/external_imported/Catch2/docs/reporter-events.md
@@ -96,12 +96,12 @@ void assertionStarting( AssertionInfo const& assertionInfo );
 void assertionEnded( AssertionStats const& assertionStats );
 ```
 
-`assertionStarting` is called after the expression is captured, but before
-the assertion expression is evaluated. This might seem like a minor
-distinction, but what it means is that if you have assertion like
-`REQUIRE( a + b == c + d )`, then what happens is that `a + b` and `c + d`
-are evaluated before `assertionStarting` is emitted, while the `==` is
-evaluated after the event.
+The `assertionStarting` event is emitted before the expression in the
+assertion is captured or evaluated and `assertionEnded` is emitted
+afterwards. This means that given assertion like `REQUIRE(a + b == c + d)`,
+Catch2 first emits `assertionStarting` event, then `a + b` and `c + d`
+are evaluated, then their results are captured, the comparison is evaluated,
+and then `assertionEnded` event is emitted.
 
 
 ## Benchmarking events
diff --git a/external_imported/Catch2/docs/reporters.md b/external_imported/Catch2/docs/reporters.md
index 496c61a92..e2abfe34d 100644
--- a/external_imported/Catch2/docs/reporters.md
+++ b/external_imported/Catch2/docs/reporters.md
@@ -52,7 +52,7 @@ its machine-readable XML output to file `result-junit.xml`, and the
 uses ANSI colour codes for colouring the output.
 
 Using multiple reporters (or one reporter and one-or-more [event
-listeners](event-listener.md#top)) can have surprisingly complex semantics
+listeners](event-listeners.md#top)) can have surprisingly complex semantics
 when using customization points provided to reporters by Catch2, namely
 capturing stdout/stderr from test cases.
 
diff --git a/external_imported/Catch2/docs/skipping-passing-failing.md b/external_imported/Catch2/docs/skipping-passing-failing.md
index 4300d9d32..52bb18f76 100644
--- a/external_imported/Catch2/docs/skipping-passing-failing.md
+++ b/external_imported/Catch2/docs/skipping-passing-failing.md
@@ -9,7 +9,7 @@ In some situations it may not be possible to meaningfully execute a test case,
 for example when the system under test is missing certain hardware capabilities.
 If the required conditions can only be determined at runtime, it often
 doesn't make sense to consider such a test case as either passed or failed,
-because it simply can not run at all.
+because it simply cannot run at all.
 
 To properly express such scenarios, Catch2 provides a way to explicitly
 _skip_ test cases, using the `SKIP` macro:
@@ -84,6 +84,12 @@ exit code, same as it does if no test cases have run. This behaviour can
 be overridden using the [--allow-running-no-tests](command-line.md#no-tests-override)
 flag.
 
+### `SKIP` inside generators
+
+You can also use the `SKIP` macro inside generator's constructor to handle
+cases where the generator is empty, but you do not want to fail the test
+case.
+
 
 ## Passing and failing test cases
 
diff --git a/external_imported/Catch2/docs/test-cases-and-sections.md b/external_imported/Catch2/docs/test-cases-and-sections.md
index acebcc51d..01c898bb6 100644
--- a/external_imported/Catch2/docs/test-cases-and-sections.md
+++ b/external_imported/Catch2/docs/test-cases-and-sections.md
@@ -231,7 +231,7 @@ TEMPLATE_TEST_CASE( "vectors can be sized and resized", "[vector][template]", in
 
 > [Introduced](https://github.com/catchorg/Catch2/issues/1468) in Catch2 2.6.0.
 
-_template-type1_ through _template-typen_ is list of template template
+_template-type1_ through _template-typen_ is list of template
 types which should be combined with each of _template-arg1_ through
  _template-argm_, resulting in _n * m_ test cases. Inside the test case,
 the resulting type is available under the name of `TestType`.
diff --git a/external_imported/Catch2/docs/tostring.md b/external_imported/Catch2/docs/tostring.md
index adce3cc76..b99b67426 100644
--- a/external_imported/Catch2/docs/tostring.md
+++ b/external_imported/Catch2/docs/tostring.md
@@ -75,7 +75,7 @@ CATCH_TRANSLATE_EXCEPTION( MyType const& ex ) {
 
 Enums that already have a `<<` overload for `std::ostream` will convert to strings as expected.
 If you only need to convert enums to strings for test reporting purposes you can provide a `StringMaker` specialisations as any other type.
-However, as a convenience, Catch provides the `REGISTER_ENUM` helper macro that will generate the `StringMaker` specialiation for you with minimal code.
+However, as a convenience, Catch provides the `REGISTER_ENUM` helper macro that will generate the `StringMaker` specialisation for you with minimal code.
 Simply provide it the (qualified) enum name, followed by all the enum values, and you're done!
 
 E.g.
diff --git a/external_imported/Catch2/docs/tutorial.md b/external_imported/Catch2/docs/tutorial.md
index 342c73818..dfccac888 100644
--- a/external_imported/Catch2/docs/tutorial.md
+++ b/external_imported/Catch2/docs/tutorial.md
@@ -119,7 +119,7 @@ This is best explained through an example ([code](../examples/100-Fix-Section.cp
 
 ```c++
 TEST_CASE( "vectors can be sized and resized", "[vector]" ) {
-
+    // This setup will be done 4 times in total, once for each section
     std::vector<int> v( 5 );
 
     REQUIRE( v.size() == 5 );
@@ -152,11 +152,12 @@ TEST_CASE( "vectors can be sized and resized", "[vector]" ) {
 }
 ```
 
-For each `SECTION` the `TEST_CASE` is executed from the start. This means
+For each `SECTION` the `TEST_CASE` is **executed from the start**. This means
 that each section is entered with a freshly constructed vector `v`, that
 we know has size 5 and capacity at least 5, because the two assertions
-are also checked before the section is entered. Each run through a test
-case will execute one, and only one, leaf section.
+are also checked before the section is entered. This behaviour may not be
+ideal for tests where setup is expensive. Each run through a test case will
+execute one, and only one, leaf section.
 
 Section can also be nested, in which case the parent section can be
 entered multiple times, once for each leaf section. Nested sections are
diff --git a/external_imported/Catch2/docs/why-catch.md b/external_imported/Catch2/docs/why-catch.md
index 2c0178ca5..b7367496b 100644
--- a/external_imported/Catch2/docs/why-catch.md
+++ b/external_imported/Catch2/docs/why-catch.md
@@ -30,7 +30,7 @@ So what does Catch2 bring to the party that differentiates it from these? Apart
 * Output is through modular reporter objects. Basic textual and XML reporters are included. Custom reporters can easily be added.
 * JUnit xml output is supported for integration with third-party tools, such as CI servers.
 * A default main() function is provided, but you can supply your own for complete control (e.g. integration into your own test runner GUI).
-* A command line parser is provided and can still be used if you choose to provided your own main() function.
+* A command line parser is provided and can still be used if you choose to provide your own main() function.
 * Alternative assertion macro(s) report failures but don't abort the test case
 * Good set of facilities for floating point comparisons (`Catch::Approx` and full set of matchers)
 * Internal and friendly macros are isolated so name clashes can be managed
@@ -41,8 +41,8 @@ So what does Catch2 bring to the party that differentiates it from these? Apart
 
 ## Who else is using Catch2?
 
-A whole lot of people. According to the 2021 JetBrains C++ ecosystem survey,
-about 11% of C++ programmers use Catch2 for unit testing, making it the
+A whole lot of people. According to [the 2022 JetBrains C++ ecosystem survey](https://www.jetbrains.com/lp/devecosystem-2022/cpp/#Which-unit-testing-frameworks-do-you-regularly-use),
+about 12% of C++ programmers use Catch2 for unit testing, making it the
 second most popular unit testing framework.
 
 You can also take a look at the (incomplete) list of [open source projects](opensource-users.md#top)
diff --git a/external_imported/Catch2/examples/010-TestCase.cpp b/external_imported/Catch2/examples/010-TestCase.cpp
index 7ec208d5f..9e5cd8cd3 100644
--- a/external_imported/Catch2/examples/010-TestCase.cpp
+++ b/external_imported/Catch2/examples/010-TestCase.cpp
@@ -1,3 +1,11 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+
 // 010-TestCase.cpp
 // And write tests in the same file:
 #include <catch2/catch_test_macros.hpp>
diff --git a/external_imported/Catch2/examples/020-TestCase-1.cpp b/external_imported/Catch2/examples/020-TestCase-1.cpp
index cec55799a..a9d87dbcb 100644
--- a/external_imported/Catch2/examples/020-TestCase-1.cpp
+++ b/external_imported/Catch2/examples/020-TestCase-1.cpp
@@ -1,3 +1,11 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+
 // 020-TestCase-1.cpp
 
 #include <catch2/catch_test_macros.hpp>
diff --git a/external_imported/Catch2/examples/020-TestCase-2.cpp b/external_imported/Catch2/examples/020-TestCase-2.cpp
index 3f5767b34..72dd0ffb6 100644
--- a/external_imported/Catch2/examples/020-TestCase-2.cpp
+++ b/external_imported/Catch2/examples/020-TestCase-2.cpp
@@ -1,3 +1,11 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+
 // 020-TestCase-2.cpp
 
 // main() provided by Catch in file 020-TestCase-1.cpp.
diff --git a/external_imported/Catch2/examples/030-Asn-Require-Check.cpp b/external_imported/Catch2/examples/030-Asn-Require-Check.cpp
index 0d027ca93..62cd3cfc4 100644
--- a/external_imported/Catch2/examples/030-Asn-Require-Check.cpp
+++ b/external_imported/Catch2/examples/030-Asn-Require-Check.cpp
@@ -1,3 +1,11 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+
 // 030-Asn-Require-Check.cpp
 
 // Catch has two natural expression assertion macro's:
diff --git a/external_imported/Catch2/examples/100-Fix-Section.cpp b/external_imported/Catch2/examples/100-Fix-Section.cpp
index cfbfa79f9..7c8d8aa86 100644
--- a/external_imported/Catch2/examples/100-Fix-Section.cpp
+++ b/external_imported/Catch2/examples/100-Fix-Section.cpp
@@ -1,3 +1,11 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+
 // 100-Fix-Section.cpp
 
 // Catch has two ways to express fixtures:
diff --git a/external_imported/Catch2/examples/110-Fix-ClassFixture.cpp b/external_imported/Catch2/examples/110-Fix-ClassFixture.cpp
index 75c10da62..614c37979 100644
--- a/external_imported/Catch2/examples/110-Fix-ClassFixture.cpp
+++ b/external_imported/Catch2/examples/110-Fix-ClassFixture.cpp
@@ -1,3 +1,11 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+
 // 110-Fix-ClassFixture.cpp
 
 // Catch has two ways to express fixtures:
diff --git a/external_imported/Catch2/examples/120-Bdd-ScenarioGivenWhenThen.cpp b/external_imported/Catch2/examples/120-Bdd-ScenarioGivenWhenThen.cpp
index 99cdf9ab9..345d53c38 100644
--- a/external_imported/Catch2/examples/120-Bdd-ScenarioGivenWhenThen.cpp
+++ b/external_imported/Catch2/examples/120-Bdd-ScenarioGivenWhenThen.cpp
@@ -1,3 +1,11 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+
 // 120-Bdd-ScenarioGivenWhenThen.cpp
 
 // main() provided by linkage with Catch2WithMain
diff --git a/external_imported/Catch2/examples/210-Evt-EventListeners.cpp b/external_imported/Catch2/examples/210-Evt-EventListeners.cpp
index 6cedb885c..56b050d41 100644
--- a/external_imported/Catch2/examples/210-Evt-EventListeners.cpp
+++ b/external_imported/Catch2/examples/210-Evt-EventListeners.cpp
@@ -1,3 +1,11 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+
 // 210-Evt-EventListeners.cpp
 
 // Contents:
diff --git a/external_imported/Catch2/examples/231-Cfg-OutputStreams.cpp b/external_imported/Catch2/examples/231-Cfg-OutputStreams.cpp
index b77c12735..da1713cf8 100644
--- a/external_imported/Catch2/examples/231-Cfg-OutputStreams.cpp
+++ b/external_imported/Catch2/examples/231-Cfg-OutputStreams.cpp
@@ -1,3 +1,11 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+
 // 231-Cfg-OutputStreams.cpp
 // Show how to replace the streams with a simple custom made streambuf.
 
diff --git a/external_imported/Catch2/examples/232-Cfg-CustomMain.cpp b/external_imported/Catch2/examples/232-Cfg-CustomMain.cpp
new file mode 100644
index 000000000..69fba7f16
--- /dev/null
+++ b/external_imported/Catch2/examples/232-Cfg-CustomMain.cpp
@@ -0,0 +1,41 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+
+// 232-Cfg-CustomMain.cpp
+// Show how to use custom main and add a custom option to the CLI parser
+
+#include <catch2/catch_session.hpp>
+
+#include <iostream>
+
+int main(int argc, char** argv) {
+  Catch::Session session; // There must be exactly one instance
+
+  int height = 0; // Some user variable you want to be able to set
+
+  // Build a new parser on top of Catch2's
+  using namespace Catch::Clara;
+  auto cli
+    = session.cli()           // Get Catch2's command line parser
+    | Opt( height, "height" ) // bind variable to a new option, with a hint string
+         ["--height"]         // the option names it will respond to
+         ("how high?");       // description string for the help output
+
+  // Now pass the new composite back to Catch2 so it uses that
+  session.cli( cli );
+
+  // Let Catch2 (using Clara) parse the command line
+  int returnCode = session.applyCommandLine( argc, argv );
+  if( returnCode != 0 ) // Indicates a command line error
+      return returnCode;
+
+  // if set on the command line then 'height' is now set at this point
+  std::cout << "height: " << height << std::endl;
+
+  return session.run();
+}
diff --git a/external_imported/Catch2/examples/300-Gen-OwnGenerator.cpp b/external_imported/Catch2/examples/300-Gen-OwnGenerator.cpp
index 09643d6f7..b5d951ac4 100644
--- a/external_imported/Catch2/examples/300-Gen-OwnGenerator.cpp
+++ b/external_imported/Catch2/examples/300-Gen-OwnGenerator.cpp
@@ -1,3 +1,11 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+
 // 300-Gen-OwnGenerator.cpp
 // Shows how to define a custom generator.
 
diff --git a/external_imported/Catch2/examples/301-Gen-MapTypeConversion.cpp b/external_imported/Catch2/examples/301-Gen-MapTypeConversion.cpp
index ba55f65f1..a065d87ae 100644
--- a/external_imported/Catch2/examples/301-Gen-MapTypeConversion.cpp
+++ b/external_imported/Catch2/examples/301-Gen-MapTypeConversion.cpp
@@ -1,3 +1,11 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+
 // 301-Gen-MapTypeConversion.cpp
 // Shows how to use map to modify generator's return type.
 
diff --git a/external_imported/Catch2/examples/302-Gen-Table.cpp b/external_imported/Catch2/examples/302-Gen-Table.cpp
index 743195183..3cdb14301 100644
--- a/external_imported/Catch2/examples/302-Gen-Table.cpp
+++ b/external_imported/Catch2/examples/302-Gen-Table.cpp
@@ -1,3 +1,11 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+
 // 302-Gen-Table.cpp
 // Shows how to use table to run a test many times with different inputs. Lifted from examples on
 // issue #850.
@@ -44,11 +52,11 @@ TEST_CASE("Table allows pre-computed test inputs and outputs", "[example][genera
 
 /* Possible simplifications where less legacy toolchain support is needed:
  *
- * - With libstdc++6 or newer, the make_tuple() calls can be ommitted
+ * - With libstdc++6 or newer, the make_tuple() calls can be omitted
  * (technically C++17 but does not require -std in GCC/Clang). See
  *   https://stackoverflow.com/questions/12436586/tuple-vector-and-initializer-list
  *
- * - In C++17 mode std::tie() and the preceding variable delcarations can be
+ * - In C++17 mode std::tie() and the preceding variable declarations can be
  * replaced by structured bindings: auto [test_input, expected] = GENERATE(
  * table<std::string, size_t>({ ...
  */
diff --git a/external_imported/Catch2/examples/310-Gen-VariablesInGenerators.cpp b/external_imported/Catch2/examples/310-Gen-VariablesInGenerators.cpp
index 0339c5f18..5d24d45a1 100644
--- a/external_imported/Catch2/examples/310-Gen-VariablesInGenerators.cpp
+++ b/external_imported/Catch2/examples/310-Gen-VariablesInGenerators.cpp
@@ -1,3 +1,11 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+
 // 310-Gen-VariablesInGenerator.cpp
 // Shows how to use variables when creating generators.
 
diff --git a/external_imported/Catch2/examples/311-Gen-CustomCapture.cpp b/external_imported/Catch2/examples/311-Gen-CustomCapture.cpp
index d12ee7090..ee3103835 100644
--- a/external_imported/Catch2/examples/311-Gen-CustomCapture.cpp
+++ b/external_imported/Catch2/examples/311-Gen-CustomCapture.cpp
@@ -1,3 +1,11 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+
 // 311-Gen-CustomCapture.cpp
 // Shows how to provide custom capture list to the generator expression
 
diff --git a/external_imported/Catch2/examples/CMakeLists.txt b/external_imported/Catch2/examples/CMakeLists.txt
index f99333418..82734adab 100644
--- a/external_imported/Catch2/examples/CMakeLists.txt
+++ b/external_imported/Catch2/examples/CMakeLists.txt
@@ -30,6 +30,7 @@ set( SOURCES_IDIOMATIC_EXAMPLES
     110-Fix-ClassFixture.cpp
     120-Bdd-ScenarioGivenWhenThen.cpp
     210-Evt-EventListeners.cpp
+    232-Cfg-CustomMain.cpp
     300-Gen-OwnGenerator.cpp
     301-Gen-MapTypeConversion.cpp
     302-Gen-Table.cpp
@@ -53,7 +54,7 @@ set(ALL_EXAMPLE_TARGETS
 )
 
 foreach( name ${ALL_EXAMPLE_TARGETS} )
-    target_link_libraries( ${name} Catch2 Catch2WithMain )
+    target_link_libraries( ${name} Catch2WithMain )
 endforeach()
 
 
diff --git a/external_imported/Catch2/extras/Catch.cmake b/external_imported/Catch2/extras/Catch.cmake
index bc553591b..8f30688c5 100644
--- a/external_imported/Catch2/extras/Catch.cmake
+++ b/external_imported/Catch2/extras/Catch.cmake
@@ -35,8 +35,9 @@ same as the Catch name; see also ``TEST_PREFIX`` and ``TEST_SUFFIX``.
                          [TEST_LIST var]
                          [REPORTER reporter]
                          [OUTPUT_DIR dir]
-                         [OUTPUT_PREFIX prefix}
+                         [OUTPUT_PREFIX prefix]
                          [OUTPUT_SUFFIX suffix]
+                         [DISCOVERY_MODE <POST_BUILD|PRE_TEST>]
     )
 
   ``catch_discover_tests`` sets up a post-build command on the test executable
@@ -123,14 +124,28 @@ same as the Catch name; see also ``TEST_PREFIX`` and ``TEST_SUFFIX``.
     test executable and when the tests are executed themselves. This requires
     cmake/ctest >= 3.22.
 
+  `DISCOVERY_MODE mode``
+    Provides control over when ``catch_discover_tests`` performs test discovery.
+    By default, ``POST_BUILD`` sets up a post-build command to perform test discovery
+    at build time. In certain scenarios, like cross-compiling, this ``POST_BUILD``
+    behavior is not desirable. By contrast, ``PRE_TEST`` delays test discovery until
+    just prior to test execution. This way test discovery occurs in the target environment
+    where the test has a better chance at finding appropriate runtime dependencies.
+
+    ``DISCOVERY_MODE`` defaults to the value of the
+    ``CMAKE_CATCH_DISCOVER_TESTS_DISCOVERY_MODE`` variable if it is not passed when
+    calling ``catch_discover_tests``. This provides a mechanism for globally selecting
+    a preferred test discovery behavior without having to modify each call site.
+
 #]=======================================================================]
 
 #------------------------------------------------------------------------------
 function(catch_discover_tests TARGET)
+
   cmake_parse_arguments(
     ""
     ""
-    "TEST_PREFIX;TEST_SUFFIX;WORKING_DIRECTORY;TEST_LIST;REPORTER;OUTPUT_DIR;OUTPUT_PREFIX;OUTPUT_SUFFIX"
+    "TEST_PREFIX;TEST_SUFFIX;WORKING_DIRECTORY;TEST_LIST;REPORTER;OUTPUT_DIR;OUTPUT_PREFIX;OUTPUT_SUFFIX;DISCOVERY_MODE"
     "TEST_SPEC;EXTRA_ARGS;PROPERTIES;DL_PATHS"
     ${ARGN}
   )
@@ -141,57 +156,128 @@ function(catch_discover_tests TARGET)
   if(NOT _TEST_LIST)
     set(_TEST_LIST ${TARGET}_TESTS)
   endif()
-
   if (_DL_PATHS)
     if(${CMAKE_VERSION} VERSION_LESS "3.22.0")
         message(FATAL_ERROR "The DL_PATHS option requires at least cmake 3.22")
     endif()
   endif()
+  if(NOT _DISCOVERY_MODE)
+    if(NOT CMAKE_CATCH_DISCOVER_TESTS_DISCOVERY_MODE)
+      set(CMAKE_CATCH_DISCOVER_TESTS_DISCOVERY_MODE "POST_BUILD")
+    endif()
+    set(_DISCOVERY_MODE ${CMAKE_CATCH_DISCOVER_TESTS_DISCOVERY_MODE})
+  endif()
+  if (NOT _DISCOVERY_MODE MATCHES "^(POST_BUILD|PRE_TEST)$")
+    message(FATAL_ERROR "Unknown DISCOVERY_MODE: ${_DISCOVERY_MODE}")
+  endif()
 
   ## Generate a unique name based on the extra arguments
   string(SHA1 args_hash "${_TEST_SPEC} ${_EXTRA_ARGS} ${_REPORTER} ${_OUTPUT_DIR} ${_OUTPUT_PREFIX} ${_OUTPUT_SUFFIX}")
   string(SUBSTRING ${args_hash} 0 7 args_hash)
 
   # Define rule to generate test list for aforementioned test executable
-  set(ctest_include_file "${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_include-${args_hash}.cmake")
-  set(ctest_tests_file "${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_tests-${args_hash}.cmake")
+  set(ctest_file_base "${CMAKE_CURRENT_BINARY_DIR}/${TARGET}-${args_hash}")
+  set(ctest_include_file "${ctest_file_base}_include.cmake")
+  set(ctest_tests_file "${ctest_file_base}_tests.cmake")
+
   get_property(crosscompiling_emulator
     TARGET ${TARGET}
     PROPERTY CROSSCOMPILING_EMULATOR
   )
-  add_custom_command(
-    TARGET ${TARGET} POST_BUILD
-    BYPRODUCTS "${ctest_tests_file}"
-    COMMAND "${CMAKE_COMMAND}"
-            -D "TEST_TARGET=${TARGET}"
-            -D "TEST_EXECUTABLE=$<TARGET_FILE:${TARGET}>"
-            -D "TEST_EXECUTOR=${crosscompiling_emulator}"
-            -D "TEST_WORKING_DIR=${_WORKING_DIRECTORY}"
-            -D "TEST_SPEC=${_TEST_SPEC}"
-            -D "TEST_EXTRA_ARGS=${_EXTRA_ARGS}"
-            -D "TEST_PROPERTIES=${_PROPERTIES}"
-            -D "TEST_PREFIX=${_TEST_PREFIX}"
-            -D "TEST_SUFFIX=${_TEST_SUFFIX}"
-            -D "TEST_LIST=${_TEST_LIST}"
-            -D "TEST_REPORTER=${_REPORTER}"
-            -D "TEST_OUTPUT_DIR=${_OUTPUT_DIR}"
-            -D "TEST_OUTPUT_PREFIX=${_OUTPUT_PREFIX}"
-            -D "TEST_OUTPUT_SUFFIX=${_OUTPUT_SUFFIX}"
-            -D "TEST_DL_PATHS=${_DL_PATHS}"
-            -D "CTEST_FILE=${ctest_tests_file}"
-            -P "${_CATCH_DISCOVER_TESTS_SCRIPT}"
-    VERBATIM
-  )
 
-  file(WRITE "${ctest_include_file}"
-    "if(EXISTS \"${ctest_tests_file}\")\n"
-    "  include(\"${ctest_tests_file}\")\n"
-    "else()\n"
-    "  add_test(${TARGET}_NOT_BUILT-${args_hash} ${TARGET}_NOT_BUILT-${args_hash})\n"
-    "endif()\n"
-  )
+  if(_DISCOVERY_MODE STREQUAL "POST_BUILD")
+    add_custom_command(
+      TARGET ${TARGET} POST_BUILD
+      BYPRODUCTS "${ctest_tests_file}"
+      COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_TARGET=${TARGET}"
+              -D "TEST_EXECUTABLE=$<TARGET_FILE:${TARGET}>"
+              -D "TEST_EXECUTOR=${crosscompiling_emulator}"
+              -D "TEST_WORKING_DIR=${_WORKING_DIRECTORY}"
+              -D "TEST_SPEC=${_TEST_SPEC}"
+              -D "TEST_EXTRA_ARGS=${_EXTRA_ARGS}"
+              -D "TEST_PROPERTIES=${_PROPERTIES}"
+              -D "TEST_PREFIX=${_TEST_PREFIX}"
+              -D "TEST_SUFFIX=${_TEST_SUFFIX}"
+              -D "TEST_LIST=${_TEST_LIST}"
+              -D "TEST_REPORTER=${_REPORTER}"
+              -D "TEST_OUTPUT_DIR=${_OUTPUT_DIR}"
+              -D "TEST_OUTPUT_PREFIX=${_OUTPUT_PREFIX}"
+              -D "TEST_OUTPUT_SUFFIX=${_OUTPUT_SUFFIX}"
+              -D "TEST_DL_PATHS=${_DL_PATHS}"
+              -D "CTEST_FILE=${ctest_tests_file}"
+              -P "${_CATCH_DISCOVER_TESTS_SCRIPT}"
+      VERBATIM
+    )
+
+    file(WRITE "${ctest_include_file}"
+      "if(EXISTS \"${ctest_tests_file}\")\n"
+      "  include(\"${ctest_tests_file}\")\n"
+      "else()\n"
+      "  add_test(${TARGET}_NOT_BUILT-${args_hash} ${TARGET}_NOT_BUILT-${args_hash})\n"
+      "endif()\n"
+    )
 
-  if(NOT ${CMAKE_VERSION} VERSION_LESS "3.10.0") 
+  elseif(_DISCOVERY_MODE STREQUAL "PRE_TEST")
+
+    get_property(GENERATOR_IS_MULTI_CONFIG GLOBAL
+        PROPERTY GENERATOR_IS_MULTI_CONFIG
+    )
+
+    if(GENERATOR_IS_MULTI_CONFIG)
+      set(ctest_tests_file "${ctest_file_base}_tests-$<CONFIG>.cmake")
+    endif()
+
+    string(CONCAT ctest_include_content
+      "if(EXISTS \"$<TARGET_FILE:${TARGET}>\")"                                    "\n"
+      "  if(NOT EXISTS \"${ctest_tests_file}\" OR"                                 "\n"
+      "     NOT \"${ctest_tests_file}\" IS_NEWER_THAN \"$<TARGET_FILE:${TARGET}>\" OR\n"
+      "     NOT \"${ctest_tests_file}\" IS_NEWER_THAN \"\${CMAKE_CURRENT_LIST_FILE}\")\n"
+      "    include(\"${_CATCH_DISCOVER_TESTS_SCRIPT}\")"                           "\n"
+      "    catch_discover_tests_impl("                                             "\n"
+      "      TEST_EXECUTABLE"        " [==[" "$<TARGET_FILE:${TARGET}>"   "]==]"   "\n"
+      "      TEST_EXECUTOR"          " [==[" "${crosscompiling_emulator}" "]==]"   "\n"
+      "      TEST_WORKING_DIR"       " [==[" "${_WORKING_DIRECTORY}"      "]==]"   "\n"
+      "      TEST_SPEC"              " [==[" "${_TEST_SPEC}"              "]==]"   "\n"
+      "      TEST_EXTRA_ARGS"        " [==[" "${_EXTRA_ARGS}"             "]==]"   "\n"
+      "      TEST_PROPERTIES"        " [==[" "${_PROPERTIES}"             "]==]"   "\n"
+      "      TEST_PREFIX"            " [==[" "${_TEST_PREFIX}"            "]==]"   "\n"
+      "      TEST_SUFFIX"            " [==[" "${_TEST_SUFFIX}"            "]==]"   "\n"
+      "      TEST_LIST"              " [==[" "${_TEST_LIST}"              "]==]"   "\n"
+      "      TEST_REPORTER"          " [==[" "${_REPORTER}"               "]==]"   "\n"
+      "      TEST_OUTPUT_DIR"        " [==[" "${_OUTPUT_DIR}"             "]==]"   "\n"
+      "      TEST_OUTPUT_PREFIX"     " [==[" "${_OUTPUT_PREFIX}"          "]==]"   "\n"
+      "      TEST_OUTPUT_SUFFIX"     " [==[" "${_OUTPUT_SUFFIX}"          "]==]"   "\n"
+      "      CTEST_FILE"             " [==[" "${ctest_tests_file}"        "]==]"   "\n"
+      "      TEST_DL_PATHS"          " [==[" "${_DL_PATHS}"               "]==]"   "\n"
+      "      CTEST_FILE"             " [==[" "${CTEST_FILE}"              "]==]"   "\n"
+      "    )"                                                                      "\n"
+      "  endif()"                                                                  "\n"
+      "  include(\"${ctest_tests_file}\")"                                         "\n"
+      "else()"                                                                     "\n"
+      "  add_test(${TARGET}_NOT_BUILT ${TARGET}_NOT_BUILT)"                        "\n"
+      "endif()"                                                                    "\n"
+    )
+
+    if(GENERATOR_IS_MULTI_CONFIG)
+      foreach(_config ${CMAKE_CONFIGURATION_TYPES})
+        file(GENERATE OUTPUT "${ctest_file_base}_include-${_config}.cmake" CONTENT "${ctest_include_content}" CONDITION $<CONFIG:${_config}>)
+      endforeach()
+      string(CONCAT ctest_include_multi_content
+        "if(NOT CTEST_CONFIGURATION_TYPE)"                                              "\n"
+        "  message(\"No configuration for testing specified, use '-C <cfg>'.\")"        "\n"
+        "else()"                                                                        "\n"
+        "  include(\"${ctest_file_base}_include-\${CTEST_CONFIGURATION_TYPE}.cmake\")"  "\n"
+        "endif()"                                                                       "\n"
+      )
+      file(GENERATE OUTPUT "${ctest_include_file}" CONTENT "${ctest_include_multi_content}")
+    else()
+      file(GENERATE OUTPUT "${ctest_file_base}_include.cmake" CONTENT "${ctest_include_content}")
+      file(WRITE "${ctest_include_file}" "include(\"${ctest_file_base}_include.cmake\")")
+    endif()
+  endif()
+
+  if(NOT ${CMAKE_VERSION} VERSION_LESS "3.10.0")
     # Add discovered tests to directory TEST_INCLUDE_FILES
     set_property(DIRECTORY
       APPEND PROPERTY TEST_INCLUDE_FILES "${ctest_include_file}"
@@ -204,9 +290,7 @@ function(catch_discover_tests TARGET)
         PROPERTY TEST_INCLUDE_FILE "${ctest_include_file}"
       )
     else()
-      message(FATAL_ERROR
-        "Cannot set more than one TEST_INCLUDE_FILE"
-      )
+      message(FATAL_ERROR "Cannot set more than one TEST_INCLUDE_FILE")
     endif()
   endif()
 
diff --git a/external_imported/Catch2/extras/CatchAddTests.cmake b/external_imported/Catch2/extras/CatchAddTests.cmake
index beec3aede..692e34056 100644
--- a/external_imported/Catch2/extras/CatchAddTests.cmake
+++ b/external_imported/Catch2/extras/CatchAddTests.cmake
@@ -1,28 +1,6 @@
 # Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
 # file Copyright.txt or https://cmake.org/licensing for details.
 
-set(prefix "${TEST_PREFIX}")
-set(suffix "${TEST_SUFFIX}")
-set(spec ${TEST_SPEC})
-set(extra_args ${TEST_EXTRA_ARGS})
-set(properties ${TEST_PROPERTIES})
-set(reporter ${TEST_REPORTER})
-set(output_dir ${TEST_OUTPUT_DIR})
-set(output_prefix ${TEST_OUTPUT_PREFIX})
-set(output_suffix ${TEST_OUTPUT_SUFFIX})
-set(dl_paths ${TEST_DL_PATHS})
-set(script)
-set(suite)
-set(tests)
-
-if(WIN32)
-  set(dl_paths_variable_name PATH)
-elseif(APPLE)
-  set(dl_paths_variable_name DYLD_LIBRARY_PATH)
-else()
-  set(dl_paths_variable_name LD_LIBRARY_PATH)
-endif()
-
 function(add_command NAME)
   set(_args "")
   # use ARGV* instead of ARGN, because ARGN splits arrays into multiple arguments
@@ -38,119 +16,177 @@ function(add_command NAME)
   set(script "${script}${NAME}(${_args})\n" PARENT_SCOPE)
 endfunction()
 
-# Run test executable to get list of available tests
-if(NOT EXISTS "${TEST_EXECUTABLE}")
-  message(FATAL_ERROR
-    "Specified test executable '${TEST_EXECUTABLE}' does not exist"
+function(catch_discover_tests_impl)
+
+  cmake_parse_arguments(
+    ""
+    ""
+    "TEST_EXECUTABLE;TEST_WORKING_DIR;TEST_DL_PATHS;TEST_OUTPUT_DIR;TEST_OUTPUT_PREFIX;TEST_OUTPUT_SUFFIX;TEST_PREFIX;TEST_REPORTER;TEST_SPEC;TEST_SUFFIX;TEST_LIST;CTEST_FILE"
+    "TEST_EXTRA_ARGS;TEST_PROPERTIES;TEST_EXECUTOR"
+    ${ARGN}
   )
-endif()
 
-if(dl_paths)
-  cmake_path(CONVERT "${dl_paths}" TO_NATIVE_PATH_LIST paths)
-  set(ENV{${dl_paths_variable_name}} "${paths}")
-endif()
+  set(prefix "${_TEST_PREFIX}")
+  set(suffix "${_TEST_SUFFIX}")
+  set(spec ${_TEST_SPEC})
+  set(extra_args ${_TEST_EXTRA_ARGS})
+  set(properties ${_TEST_PROPERTIES})
+  set(reporter ${_TEST_REPORTER})
+  set(output_dir ${_TEST_OUTPUT_DIR})
+  set(output_prefix ${_TEST_OUTPUT_PREFIX})
+  set(output_suffix ${_TEST_OUTPUT_SUFFIX})
+  set(dl_paths ${_TEST_DL_PATHS})
+  set(script)
+  set(suite)
+  set(tests)
+
+  if(WIN32)
+    set(dl_paths_variable_name PATH)
+  elseif(APPLE)
+    set(dl_paths_variable_name DYLD_LIBRARY_PATH)
+  else()
+    set(dl_paths_variable_name LD_LIBRARY_PATH)
+  endif()
 
-execute_process(
-  COMMAND ${TEST_EXECUTOR} "${TEST_EXECUTABLE}" ${spec} --list-tests --verbosity quiet
-  OUTPUT_VARIABLE output
-  RESULT_VARIABLE result
-  WORKING_DIRECTORY "${TEST_WORKING_DIR}"
-)
-if(NOT ${result} EQUAL 0)
-  message(FATAL_ERROR
-    "Error running test executable '${TEST_EXECUTABLE}':\n"
-    "  Result: ${result}\n"
-    "  Output: ${output}\n"
-  )
-endif()
+  # Run test executable to get list of available tests
+  if(NOT EXISTS "${_TEST_EXECUTABLE}")
+    message(FATAL_ERROR
+      "Specified test executable '${_TEST_EXECUTABLE}' does not exist"
+    )
+  endif()
 
-string(REPLACE "\n" ";" output "${output}")
-
-# Run test executable to get list of available reporters
-execute_process(
-  COMMAND ${TEST_EXECUTOR} "${TEST_EXECUTABLE}" ${spec} --list-reporters
-  OUTPUT_VARIABLE reporters_output
-  RESULT_VARIABLE reporters_result
-  WORKING_DIRECTORY "${TEST_WORKING_DIR}"
-)
-if(NOT ${reporters_result} EQUAL 0)
-  message(FATAL_ERROR
-    "Error running test executable '${TEST_EXECUTABLE}':\n"
-    "  Result: ${reporters_result}\n"
-    "  Output: ${reporters_output}\n"
-  )
-endif()
-string(FIND "${reporters_output}" "${reporter}" reporter_is_valid)
-if(reporter AND ${reporter_is_valid} EQUAL -1)
-  message(FATAL_ERROR
-    "\"${reporter}\" is not a valid reporter!\n"
-  )
-endif()
+  if(dl_paths)
+    cmake_path(CONVERT "${dl_paths}" TO_NATIVE_PATH_LIST paths)
+    set(ENV{${dl_paths_variable_name}} "${paths}")
+  endif()
 
-# Prepare reporter
-if(reporter)
-  set(reporter_arg "--reporter ${reporter}")
-endif()
+  execute_process(
+    COMMAND ${_TEST_EXECUTOR} "${_TEST_EXECUTABLE}" ${spec} --list-tests --verbosity quiet
+    OUTPUT_VARIABLE output
+    RESULT_VARIABLE result
+    WORKING_DIRECTORY "${_TEST_WORKING_DIR}"
+  )
+  if(NOT ${result} EQUAL 0)
+    message(FATAL_ERROR
+      "Error running test executable '${_TEST_EXECUTABLE}':\n"
+      "  Result: ${result}\n"
+      "  Output: ${output}\n"
+    )
+  endif()
 
-# Prepare output dir
-if(output_dir AND NOT IS_ABSOLUTE ${output_dir})
-  set(output_dir "${TEST_WORKING_DIR}/${output_dir}")
-  if(NOT EXISTS ${output_dir})
-    file(MAKE_DIRECTORY ${output_dir})
+  # Make sure to escape ; (semicolons) in test names first, because
+  # that'd break the foreach loop for "Parse output" later and create
+  # wrongly splitted and thus failing test cases (false positives)
+  string(REPLACE ";" "\;" output "${output}")
+  string(REPLACE "\n" ";" output "${output}")
+
+  # Prepare reporter
+  if(reporter)
+    set(reporter_arg "--reporter ${reporter}")
+
+    # Run test executable to check whether reporter is available
+    # note that the use of --list-reporters is not the important part,
+    # we only want to check whether the execution succeeds with ${reporter_arg}
+    execute_process(
+      COMMAND ${_TEST_EXECUTOR} "${_TEST_EXECUTABLE}" ${spec} ${reporter_arg} --list-reporters
+      OUTPUT_VARIABLE reporter_check_output
+      RESULT_VARIABLE reporter_check_result
+      WORKING_DIRECTORY "${_TEST_WORKING_DIR}"
+    )
+    if(${reporter_check_result} EQUAL 255)
+      message(FATAL_ERROR
+        "\"${reporter}\" is not a valid reporter!\n"
+      )
+    elseif(NOT ${reporter_check_result} EQUAL 0)
+      message(FATAL_ERROR
+        "Error running test executable '${_TEST_EXECUTABLE}':\n"
+        "  Result: ${reporter_check_result}\n"
+        "  Output: ${reporter_check_output}\n"
+      )
+    endif()
   endif()
-endif()
 
-if(dl_paths)
-  foreach(path ${dl_paths})
-    cmake_path(NATIVE_PATH path native_path)
-    list(APPEND environment_modifications "${dl_paths_variable_name}=path_list_prepend:${native_path}")
-  endforeach()
-endif()
+  # Prepare output dir
+  if(output_dir AND NOT IS_ABSOLUTE ${output_dir})
+    set(output_dir "${_TEST_WORKING_DIR}/${output_dir}")
+    if(NOT EXISTS ${output_dir})
+      file(MAKE_DIRECTORY ${output_dir})
+    endif()
+  endif()
 
-# Parse output
-foreach(line ${output})
-  set(test ${line})
-  # Escape characters in test case names that would be parsed by Catch2
-  set(test_name ${test})
-  foreach(char , [ ])
-    string(REPLACE ${char} "\\${char}" test_name ${test_name})
-  endforeach(char)
-  # ...add output dir
-  if(output_dir)
-    string(REGEX REPLACE "[^A-Za-z0-9_]" "_" test_name_clean ${test_name})
-    set(output_dir_arg "--out ${output_dir}/${output_prefix}${test_name_clean}${output_suffix}")
+  if(dl_paths)
+    foreach(path ${dl_paths})
+      cmake_path(NATIVE_PATH path native_path)
+      list(APPEND environment_modifications "${dl_paths_variable_name}=path_list_prepend:${native_path}")
+    endforeach()
   endif()
-  
-  # ...and add to script
-  add_command(add_test
-    "${prefix}${test}${suffix}"
-    ${TEST_EXECUTOR}
-    "${TEST_EXECUTABLE}"
-    "${test_name}"
-    ${extra_args}
-    "${reporter_arg}"
-    "${output_dir_arg}"
-  )
-  add_command(set_tests_properties
-    "${prefix}${test}${suffix}"
-    PROPERTIES
-    WORKING_DIRECTORY "${TEST_WORKING_DIR}"
-    ${properties}
-  )
 
-   if(environment_modifications)
-     add_command(set_tests_properties
-       "${prefix}${test}${suffix}"
-       PROPERTIES
-       ENVIRONMENT_MODIFICATION "${environment_modifications}")
-   endif()
+  # Parse output
+  foreach(line ${output})
+    set(test "${line}")
+    # Escape characters in test case names that would be parsed by Catch2
+    # Note that the \ escaping must happen FIRST! Do not change the order.
+    set(test_name "${test}")
+    foreach(char \\ , [ ])
+      string(REPLACE ${char} "\\${char}" test_name "${test_name}")
+    endforeach(char)
+    # ...add output dir
+    if(output_dir)
+      string(REGEX REPLACE "[^A-Za-z0-9_]" "_" test_name_clean "${test_name}")
+      set(output_dir_arg "--out ${output_dir}/${output_prefix}${test_name_clean}${output_suffix}")
+    endif()
+
+    # ...and add to script
+    add_command(add_test
+      "${prefix}${test}${suffix}"
+      ${_TEST_EXECUTOR}
+      "${_TEST_EXECUTABLE}"
+      "${test_name}"
+      ${extra_args}
+      "${reporter_arg}"
+      "${output_dir_arg}"
+    )
+    add_command(set_tests_properties
+      "${prefix}${test}${suffix}"
+      PROPERTIES
+      WORKING_DIRECTORY "${_TEST_WORKING_DIR}"
+      ${properties}
+    )
+
+    if(environment_modifications)
+      add_command(set_tests_properties
+        "${prefix}${test}${suffix}"
+        PROPERTIES
+        ENVIRONMENT_MODIFICATION "${environment_modifications}")
+    endif()
+
+    list(APPEND tests "${prefix}${test}${suffix}")
+  endforeach()
 
-  list(APPEND tests "${prefix}${test}${suffix}")
-endforeach()
+  # Create a list of all discovered tests, which users may use to e.g. set
+  # properties on the tests
+  add_command(set ${_TEST_LIST} ${tests})
 
-# Create a list of all discovered tests, which users may use to e.g. set
-# properties on the tests
-add_command(set ${TEST_LIST} ${tests})
+  # Write CTest script
+  file(WRITE "${_CTEST_FILE}" "${script}")
+endfunction()
 
-# Write CTest script
-file(WRITE "${CTEST_FILE}" "${script}")
+if(CMAKE_SCRIPT_MODE_FILE)
+  catch_discover_tests_impl(
+    TEST_EXECUTABLE ${TEST_EXECUTABLE}
+    TEST_EXECUTOR ${TEST_EXECUTOR}
+    TEST_WORKING_DIR ${TEST_WORKING_DIR}
+    TEST_SPEC ${TEST_SPEC}
+    TEST_EXTRA_ARGS ${TEST_EXTRA_ARGS}
+    TEST_PROPERTIES ${TEST_PROPERTIES}
+    TEST_PREFIX ${TEST_PREFIX}
+    TEST_SUFFIX ${TEST_SUFFIX}
+    TEST_LIST ${TEST_LIST}
+    TEST_REPORTER ${TEST_REPORTER}
+    TEST_OUTPUT_DIR ${TEST_OUTPUT_DIR}
+    TEST_OUTPUT_PREFIX ${TEST_OUTPUT_PREFIX}
+    TEST_OUTPUT_SUFFIX ${TEST_OUTPUT_SUFFIX}
+    TEST_DL_PATHS ${TEST_DL_PATHS}
+    CTEST_FILE ${CTEST_FILE}
+  )
+endif()
diff --git a/external_imported/Catch2/extras/CatchShardTests.cmake b/external_imported/Catch2/extras/CatchShardTests.cmake
index 5e043cf06..68228f5a6 100644
--- a/external_imported/Catch2/extras/CatchShardTests.cmake
+++ b/external_imported/Catch2/extras/CatchShardTests.cmake
@@ -46,7 +46,7 @@ function(catch_add_sharded_tests TARGET)
     APPEND PROPERTY TEST_INCLUDE_FILES "${ctest_include_file}"
   )
 
-  set(shard_impl_script_file "${CMAKE_CURRENT_LIST_DIR}/CatchShardTestsImpl.cmake")
+  set(shard_impl_script_file "${_CATCH_DISCOVER_SHARD_TESTS_IMPL_SCRIPT}")
 
   add_custom_command(
     TARGET ${TARGET} POST_BUILD
@@ -64,3 +64,11 @@ function(catch_add_sharded_tests TARGET)
 
 
 endfunction()
+
+
+###############################################################################
+
+set(_CATCH_DISCOVER_SHARD_TESTS_IMPL_SCRIPT
+    ${CMAKE_CURRENT_LIST_DIR}/CatchShardTestsImpl.cmake
+  CACHE INTERNAL "Catch2 full path to CatchShardTestsImpl.cmake helper file"
+)
diff --git a/external_imported/Catch2/extras/catch_amalgamated.cpp b/external_imported/Catch2/extras/catch_amalgamated.cpp
index a81b1b6ae..f68c9005b 100644
--- a/external_imported/Catch2/extras/catch_amalgamated.cpp
+++ b/external_imported/Catch2/extras/catch_amalgamated.cpp
@@ -1,3 +1,4 @@
+
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
 //   (See accompanying file LICENSE.txt or copy at
@@ -5,8 +6,8 @@
 
 // SPDX-License-Identifier: BSL-1.0
 
-//  Catch v3.3.2
-//  Generated: 2023-02-26 10:28:48.270752
+//  Catch v3.5.2
+//  Generated: 2024-01-15 14:06:36.675713
 //  ----------------------------------------------------------
 //  This file is an amalgamation of multiple different files.
 //  You probably shouldn't edit it directly.
@@ -48,6 +49,80 @@ namespace Catch {
 } // namespace Catch
 
 
+// Adapted from donated nonius code.
+
+
+#include <vector>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            SampleAnalysis analyse(const IConfig &cfg, FDuration* first, FDuration* last) {
+                if (!cfg.benchmarkNoAnalysis()) {
+                    std::vector<double> samples;
+                    samples.reserve(static_cast<size_t>(last - first));
+                    for (auto current = first; current != last; ++current) {
+                        samples.push_back( current->count() );
+                    }
+
+                    auto analysis = Catch::Benchmark::Detail::analyse_samples(
+                        cfg.benchmarkConfidenceInterval(),
+                        cfg.benchmarkResamples(),
+                        samples.data(),
+                        samples.data() + samples.size() );
+                    auto outliers = Catch::Benchmark::Detail::classify_outliers(
+                        samples.data(), samples.data() + samples.size() );
+
+                    auto wrap_estimate = [](Estimate<double> e) {
+                        return Estimate<FDuration> {
+                            FDuration(e.point),
+                                FDuration(e.lower_bound),
+                                FDuration(e.upper_bound),
+                                e.confidence_interval,
+                        };
+                    };
+                    std::vector<FDuration> samples2;
+                    samples2.reserve(samples.size());
+                    for (auto s : samples) {
+                        samples2.push_back( FDuration( s ) );
+                    }
+
+                    return {
+                        CATCH_MOVE(samples2),
+                        wrap_estimate(analysis.mean),
+                        wrap_estimate(analysis.standard_deviation),
+                        outliers,
+                        analysis.outlier_variance,
+                    };
+                } else {
+                    std::vector<FDuration> samples;
+                    samples.reserve(static_cast<size_t>(last - first));
+
+                    FDuration mean = FDuration(0);
+                    int i = 0;
+                    for (auto it = first; it < last; ++it, ++i) {
+                        samples.push_back(FDuration(*it));
+                        mean += FDuration(*it);
+                    }
+                    mean /= i;
+
+                    return SampleAnalysis{
+                        CATCH_MOVE(samples),
+                        Estimate<FDuration>{ mean, mean, mean, 0.0 },
+                        Estimate<FDuration>{ FDuration( 0 ),
+                                             FDuration( 0 ),
+                                             FDuration( 0 ),
+                                             0.0 },
+                        OutlierClassification{},
+                        0.0
+                    };
+                }
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+
 
 
 namespace Catch {
@@ -60,6 +135,7 @@ namespace Catch {
 
 
 
+
 #include <exception>
 
 namespace Catch {
@@ -86,9 +162,11 @@ namespace Catch {
 
 
 
+#include <algorithm>
 #include <cassert>
+#include <cmath>
 #include <cstddef>
-#include <iterator>
+#include <numeric>
 #include <random>
 
 
@@ -96,139 +174,199 @@ namespace Catch {
 #include <future>
 #endif
 
-namespace {
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            namespace {
+
+                template <typename URng, typename Estimator>
+                static sample
+                resample( URng& rng,
+                          unsigned int resamples,
+                          double const* first,
+                          double const* last,
+                          Estimator& estimator ) {
+                    auto n = static_cast<size_t>( last - first );
+                    std::uniform_int_distribution<size_t> dist( 0, n - 1 );
+
+                    sample out;
+                    out.reserve( resamples );
+                    std::vector<double> resampled;
+                    resampled.reserve( n );
+                    for ( size_t i = 0; i < resamples; ++i ) {
+                        resampled.clear();
+                        for ( size_t s = 0; s < n; ++s ) {
+                            resampled.push_back( first[dist( rng )] );
+                        }
+                        const auto estimate =
+                            estimator( resampled.data(), resampled.data() + resampled.size() );
+                        out.push_back( estimate );
+                    }
+                    std::sort( out.begin(), out.end() );
+                    return out;
+                }
 
-using Catch::Benchmark::Detail::sample;
-
-     template <typename URng, typename Estimator>
-     sample resample(URng& rng, unsigned int resamples, std::vector<double>::iterator first, std::vector<double>::iterator last, Estimator& estimator) {
-         auto n = static_cast<size_t>(last - first);
-         std::uniform_int_distribution<decltype(n)> dist(0, n - 1);
-
-         sample out;
-         out.reserve(resamples);
-         std::generate_n(std::back_inserter(out), resamples, [n, first, &estimator, &dist, &rng] {
-             std::vector<double> resampled;
-             resampled.reserve(n);
-             std::generate_n(std::back_inserter(resampled), n, [first, &dist, &rng] { return first[static_cast<std::ptrdiff_t>(dist(rng))]; });
-             return estimator(resampled.begin(), resampled.end());
-         });
-         std::sort(out.begin(), out.end());
-         return out;
-     }
-
-
-    double erf_inv(double x) {
-        // Code accompanying the article "Approximating the erfinv function" in GPU Computing Gems, Volume 2
-        double w, p;
-
-        w = -log((1.0 - x) * (1.0 + x));
-
-        if (w < 6.250000) {
-            w = w - 3.125000;
-            p = -3.6444120640178196996e-21;
-            p = -1.685059138182016589e-19 + p * w;
-            p = 1.2858480715256400167e-18 + p * w;
-            p = 1.115787767802518096e-17 + p * w;
-            p = -1.333171662854620906e-16 + p * w;
-            p = 2.0972767875968561637e-17 + p * w;
-            p = 6.6376381343583238325e-15 + p * w;
-            p = -4.0545662729752068639e-14 + p * w;
-            p = -8.1519341976054721522e-14 + p * w;
-            p = 2.6335093153082322977e-12 + p * w;
-            p = -1.2975133253453532498e-11 + p * w;
-            p = -5.4154120542946279317e-11 + p * w;
-            p = 1.051212273321532285e-09 + p * w;
-            p = -4.1126339803469836976e-09 + p * w;
-            p = -2.9070369957882005086e-08 + p * w;
-            p = 4.2347877827932403518e-07 + p * w;
-            p = -1.3654692000834678645e-06 + p * w;
-            p = -1.3882523362786468719e-05 + p * w;
-            p = 0.0001867342080340571352 + p * w;
-            p = -0.00074070253416626697512 + p * w;
-            p = -0.0060336708714301490533 + p * w;
-            p = 0.24015818242558961693 + p * w;
-            p = 1.6536545626831027356 + p * w;
-        } else if (w < 16.000000) {
-            w = sqrt(w) - 3.250000;
-            p = 2.2137376921775787049e-09;
-            p = 9.0756561938885390979e-08 + p * w;
-            p = -2.7517406297064545428e-07 + p * w;
-            p = 1.8239629214389227755e-08 + p * w;
-            p = 1.5027403968909827627e-06 + p * w;
-            p = -4.013867526981545969e-06 + p * w;
-            p = 2.9234449089955446044e-06 + p * w;
-            p = 1.2475304481671778723e-05 + p * w;
-            p = -4.7318229009055733981e-05 + p * w;
-            p = 6.8284851459573175448e-05 + p * w;
-            p = 2.4031110387097893999e-05 + p * w;
-            p = -0.0003550375203628474796 + p * w;
-            p = 0.00095328937973738049703 + p * w;
-            p = -0.0016882755560235047313 + p * w;
-            p = 0.0024914420961078508066 + p * w;
-            p = -0.0037512085075692412107 + p * w;
-            p = 0.005370914553590063617 + p * w;
-            p = 1.0052589676941592334 + p * w;
-            p = 3.0838856104922207635 + p * w;
-        } else {
-            w = sqrt(w) - 5.000000;
-            p = -2.7109920616438573243e-11;
-            p = -2.5556418169965252055e-10 + p * w;
-            p = 1.5076572693500548083e-09 + p * w;
-            p = -3.7894654401267369937e-09 + p * w;
-            p = 7.6157012080783393804e-09 + p * w;
-            p = -1.4960026627149240478e-08 + p * w;
-            p = 2.9147953450901080826e-08 + p * w;
-            p = -6.7711997758452339498e-08 + p * w;
-            p = 2.2900482228026654717e-07 + p * w;
-            p = -9.9298272942317002539e-07 + p * w;
-            p = 4.5260625972231537039e-06 + p * w;
-            p = -1.9681778105531670567e-05 + p * w;
-            p = 7.5995277030017761139e-05 + p * w;
-            p = -0.00021503011930044477347 + p * w;
-            p = -0.00013871931833623122026 + p * w;
-            p = 1.0103004648645343977 + p * w;
-            p = 4.8499064014085844221 + p * w;
-        }
-        return p * x;
-    }
-
-    double standard_deviation(std::vector<double>::iterator first, std::vector<double>::iterator last) {
-        auto m = Catch::Benchmark::Detail::mean(first, last);
-        double variance = std::accumulate( first,
-                                           last,
-                                           0.,
-                                           [m]( double a, double b ) {
-                                               double diff = b - m;
-                                               return a + diff * diff;
-                                           } ) /
-                          ( last - first );
-        return std::sqrt( variance );
-    }
+                static double outlier_variance( Estimate<double> mean,
+                                                Estimate<double> stddev,
+                                                int n ) {
+                    double sb = stddev.point;
+                    double mn = mean.point / n;
+                    double mg_min = mn / 2.;
+                    double sg = (std::min)( mg_min / 4., sb / std::sqrt( n ) );
+                    double sg2 = sg * sg;
+                    double sb2 = sb * sb;
+
+                    auto c_max = [n, mn, sb2, sg2]( double x ) -> double {
+                        double k = mn - x;
+                        double d = k * k;
+                        double nd = n * d;
+                        double k0 = -n * nd;
+                        double k1 = sb2 - n * sg2 + nd;
+                        double det = k1 * k1 - 4 * sg2 * k0;
+                        return static_cast<int>( -2. * k0 /
+                                                 ( k1 + std::sqrt( det ) ) );
+                    };
+
+                    auto var_out = [n, sb2, sg2]( double c ) {
+                        double nc = n - c;
+                        return ( nc / n ) * ( sb2 - nc * sg2 );
+                    };
+
+                    return (std::min)( var_out( 1 ),
+                                       var_out(
+                                           (std::min)( c_max( 0. ),
+                                                       c_max( mg_min ) ) ) ) /
+                           sb2;
+                }
 
-}
+                static double erf_inv( double x ) {
+                    // Code accompanying the article "Approximating the erfinv
+                    // function" in GPU Computing Gems, Volume 2
+                    double w, p;
+
+                    w = -log( ( 1.0 - x ) * ( 1.0 + x ) );
+
+                    if ( w < 6.250000 ) {
+                        w = w - 3.125000;
+                        p = -3.6444120640178196996e-21;
+                        p = -1.685059138182016589e-19 + p * w;
+                        p = 1.2858480715256400167e-18 + p * w;
+                        p = 1.115787767802518096e-17 + p * w;
+                        p = -1.333171662854620906e-16 + p * w;
+                        p = 2.0972767875968561637e-17 + p * w;
+                        p = 6.6376381343583238325e-15 + p * w;
+                        p = -4.0545662729752068639e-14 + p * w;
+                        p = -8.1519341976054721522e-14 + p * w;
+                        p = 2.6335093153082322977e-12 + p * w;
+                        p = -1.2975133253453532498e-11 + p * w;
+                        p = -5.4154120542946279317e-11 + p * w;
+                        p = 1.051212273321532285e-09 + p * w;
+                        p = -4.1126339803469836976e-09 + p * w;
+                        p = -2.9070369957882005086e-08 + p * w;
+                        p = 4.2347877827932403518e-07 + p * w;
+                        p = -1.3654692000834678645e-06 + p * w;
+                        p = -1.3882523362786468719e-05 + p * w;
+                        p = 0.0001867342080340571352 + p * w;
+                        p = -0.00074070253416626697512 + p * w;
+                        p = -0.0060336708714301490533 + p * w;
+                        p = 0.24015818242558961693 + p * w;
+                        p = 1.6536545626831027356 + p * w;
+                    } else if ( w < 16.000000 ) {
+                        w = sqrt( w ) - 3.250000;
+                        p = 2.2137376921775787049e-09;
+                        p = 9.0756561938885390979e-08 + p * w;
+                        p = -2.7517406297064545428e-07 + p * w;
+                        p = 1.8239629214389227755e-08 + p * w;
+                        p = 1.5027403968909827627e-06 + p * w;
+                        p = -4.013867526981545969e-06 + p * w;
+                        p = 2.9234449089955446044e-06 + p * w;
+                        p = 1.2475304481671778723e-05 + p * w;
+                        p = -4.7318229009055733981e-05 + p * w;
+                        p = 6.8284851459573175448e-05 + p * w;
+                        p = 2.4031110387097893999e-05 + p * w;
+                        p = -0.0003550375203628474796 + p * w;
+                        p = 0.00095328937973738049703 + p * w;
+                        p = -0.0016882755560235047313 + p * w;
+                        p = 0.0024914420961078508066 + p * w;
+                        p = -0.0037512085075692412107 + p * w;
+                        p = 0.005370914553590063617 + p * w;
+                        p = 1.0052589676941592334 + p * w;
+                        p = 3.0838856104922207635 + p * w;
+                    } else {
+                        w = sqrt( w ) - 5.000000;
+                        p = -2.7109920616438573243e-11;
+                        p = -2.5556418169965252055e-10 + p * w;
+                        p = 1.5076572693500548083e-09 + p * w;
+                        p = -3.7894654401267369937e-09 + p * w;
+                        p = 7.6157012080783393804e-09 + p * w;
+                        p = -1.4960026627149240478e-08 + p * w;
+                        p = 2.9147953450901080826e-08 + p * w;
+                        p = -6.7711997758452339498e-08 + p * w;
+                        p = 2.2900482228026654717e-07 + p * w;
+                        p = -9.9298272942317002539e-07 + p * w;
+                        p = 4.5260625972231537039e-06 + p * w;
+                        p = -1.9681778105531670567e-05 + p * w;
+                        p = 7.5995277030017761139e-05 + p * w;
+                        p = -0.00021503011930044477347 + p * w;
+                        p = -0.00013871931833623122026 + p * w;
+                        p = 1.0103004648645343977 + p * w;
+                        p = 4.8499064014085844221 + p * w;
+                    }
+                    return p * x;
+                }
+
+                static double
+                standard_deviation( double const* first, double const* last ) {
+                    auto m = Catch::Benchmark::Detail::mean( first, last );
+                    double variance =
+                        std::accumulate( first,
+                                         last,
+                                         0.,
+                                         [m]( double a, double b ) {
+                                             double diff = b - m;
+                                             return a + diff * diff;
+                                         } ) /
+                        ( last - first );
+                    return std::sqrt( variance );
+                }
+
+                static sample jackknife( double ( *estimator )( double const*,
+                                                                double const* ),
+                                         double* first,
+                                         double* last ) {
+                    const auto second = first + 1;
+                    sample results;
+                    results.reserve( static_cast<size_t>( last - first ) );
+
+                    for ( auto it = first; it != last; ++it ) {
+                        std::iter_swap( it, first );
+                        results.push_back( estimator( second, last ) );
+                    }
+
+                    return results;
+                }
+
+
+            } // namespace
+        }     // namespace Detail
+    }         // namespace Benchmark
+} // namespace Catch
 
 namespace Catch {
     namespace Benchmark {
         namespace Detail {
 
-#if defined( __GNUC__ ) || defined( __clang__ )
-#    pragma GCC diagnostic push
-#    pragma GCC diagnostic ignored "-Wfloat-equal"
-#endif
-            bool directCompare( double lhs, double rhs ) { return lhs == rhs; }
-#if defined( __GNUC__ ) || defined( __clang__ )
-#    pragma GCC diagnostic pop
-#endif
-
-            double weighted_average_quantile(int k, int q, std::vector<double>::iterator first, std::vector<double>::iterator last) {
+            double weighted_average_quantile( int k,
+                                              int q,
+                                              double* first,
+                                              double* last ) {
                 auto count = last - first;
                 double idx = (count - 1) * k / static_cast<double>(q);
                 int j = static_cast<int>(idx);
                 double g = idx - j;
                 std::nth_element(first, first + j, last);
                 auto xj = first[j];
-                if ( directCompare( g, 0 ) ) {
+                if ( Catch::Detail::directCompare( g, 0 ) ) {
                     return xj;
                 }
 
@@ -236,6 +374,48 @@ namespace Catch {
                 return xj + g * (xj1 - xj);
             }
 
+            OutlierClassification
+            classify_outliers( double const* first, double const* last ) {
+                std::vector<double> copy( first, last );
+
+                auto q1 = weighted_average_quantile( 1, 4, copy.data(), copy.data() + copy.size() );
+                auto q3 = weighted_average_quantile( 3, 4, copy.data(), copy.data() + copy.size() );
+                auto iqr = q3 - q1;
+                auto los = q1 - ( iqr * 3. );
+                auto lom = q1 - ( iqr * 1.5 );
+                auto him = q3 + ( iqr * 1.5 );
+                auto his = q3 + ( iqr * 3. );
+
+                OutlierClassification o;
+                for ( ; first != last; ++first ) {
+                    const double t = *first;
+                    if ( t < los ) {
+                        ++o.low_severe;
+                    } else if ( t < lom ) {
+                        ++o.low_mild;
+                    } else if ( t > his ) {
+                        ++o.high_severe;
+                    } else if ( t > him ) {
+                        ++o.high_mild;
+                    }
+                    ++o.samples_seen;
+                }
+                return o;
+            }
+
+            double mean( double const* first, double const* last ) {
+                auto count = last - first;
+                double sum = 0.;
+                while (first != last) {
+                    sum += *first;
+                    ++first;
+                }
+                return sum / static_cast<double>(count);
+            }
+
+            double normal_cdf( double x ) {
+                return std::erfc( -x / std::sqrt( 2.0 ) ) / 2.0;
+            }
 
             double erfc_inv(double x) {
                 return erf_inv(1.0 - x);
@@ -257,50 +437,77 @@ namespace Catch {
                 return result;
             }
 
+            Estimate<double>
+            bootstrap( double confidence_level,
+                       double* first,
+                       double* last,
+                       sample const& resample,
+                       double ( *estimator )( double const*, double const* ) ) {
+                auto n_samples = last - first;
+
+                double point = estimator( first, last );
+                // Degenerate case with a single sample
+                if ( n_samples == 1 )
+                    return { point, point, point, confidence_level };
+
+                sample jack = jackknife( estimator, first, last );
+                double jack_mean =
+                    mean( jack.data(), jack.data() + jack.size() );
+                double sum_squares = 0, sum_cubes = 0;
+                for ( double x : jack ) {
+                    auto difference = jack_mean - x;
+                    auto square = difference * difference;
+                    auto cube = square * difference;
+                    sum_squares += square;
+                    sum_cubes += cube;
+                }
 
-            double outlier_variance(Estimate<double> mean, Estimate<double> stddev, int n) {
-                double sb = stddev.point;
-                double mn = mean.point / n;
-                double mg_min = mn / 2.;
-                double sg = (std::min)(mg_min / 4., sb / std::sqrt(n));
-                double sg2 = sg * sg;
-                double sb2 = sb * sb;
+                double accel = sum_cubes / ( 6 * std::pow( sum_squares, 1.5 ) );
+                long n = static_cast<long>( resample.size() );
+                double prob_n =
+                    std::count_if( resample.begin(),
+                                   resample.end(),
+                                   [point]( double x ) { return x < point; } ) /
+                    static_cast<double>( n );
+                // degenerate case with uniform samples
+                if ( Catch::Detail::directCompare( prob_n, 0. ) ) {
+                    return { point, point, point, confidence_level };
+                }
 
-                auto c_max = [n, mn, sb2, sg2](double x) -> double {
-                    double k = mn - x;
-                    double d = k * k;
-                    double nd = n * d;
-                    double k0 = -n * nd;
-                    double k1 = sb2 - n * sg2 + nd;
-                    double det = k1 * k1 - 4 * sg2 * k0;
-                    return static_cast<int>(-2. * k0 / (k1 + std::sqrt(det)));
-                };
+                double bias = normal_quantile( prob_n );
+                double z1 = normal_quantile( ( 1. - confidence_level ) / 2. );
 
-                auto var_out = [n, sb2, sg2](double c) {
-                    double nc = n - c;
-                    return (nc / n) * (sb2 - nc * sg2);
+                auto cumn = [n]( double x ) -> long {
+                    return std::lround( normal_cdf( x ) *
+                                        static_cast<double>( n ) );
                 };
-
-                return (std::min)(var_out(1), var_out((std::min)(c_max(0.), c_max(mg_min)))) / sb2;
-            }
-
-
-            bootstrap_analysis analyse_samples(double confidence_level, unsigned int n_resamples, std::vector<double>::iterator first, std::vector<double>::iterator last) {
-                CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
-                CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS
-                static std::random_device entropy;
-                CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-                auto n = static_cast<int>(last - first); // seriously, one can't use integral types without hell in C++
-
-                auto mean = &Detail::mean<std::vector<double>::iterator>;
+                auto a = [bias, accel]( double b ) {
+                    return bias + b / ( 1. - accel * b );
+                };
+                double b1 = bias + z1;
+                double b2 = bias - z1;
+                double a1 = a( b1 );
+                double a2 = a( b2 );
+                auto lo = static_cast<size_t>( (std::max)( cumn( a1 ), 0l ) );
+                auto hi =
+                    static_cast<size_t>( (std::min)( cumn( a2 ), n - 1 ) );
+
+                return { point, resample[lo], resample[hi], confidence_level };
+            }
+
+            bootstrap_analysis analyse_samples(double confidence_level,
+                                               unsigned int n_resamples,
+                                               double* first,
+                                               double* last) {
+                auto mean = &Detail::mean;
                 auto stddev = &standard_deviation;
 
 #if defined(CATCH_CONFIG_USE_ASYNC)
-                auto Estimate = [=](double(*f)(std::vector<double>::iterator, std::vector<double>::iterator)) {
-                    auto seed = entropy();
+                auto Estimate = [=](double(*f)(double const*, double const*)) {
+                    std::random_device rd;
+                    auto seed = rd();
                     return std::async(std::launch::async, [=] {
-                        std::mt19937 rng(seed);
+                        SimplePcg32 rng( seed );
                         auto resampled = resample(rng, n_resamples, first, last, f);
                         return bootstrap(confidence_level, first, last, resampled, f);
                     });
@@ -312,9 +519,10 @@ namespace Catch {
                 auto mean_estimate = mean_future.get();
                 auto stddev_estimate = stddev_future.get();
 #else
-                auto Estimate = [=](double(*f)(std::vector<double>::iterator, std::vector<double>::iterator)) {
-                    auto seed = entropy();
-                    std::mt19937 rng(seed);
+                auto Estimate = [=](double(*f)(double const* , double const*)) {
+                    std::random_device rd;
+                    auto seed = rd();
+                    SimplePcg32 rng( seed );
                     auto resampled = resample(rng, n_resamples, first, last, f);
                     return bootstrap(confidence_level, first, last, resampled, f);
                 };
@@ -323,6 +531,7 @@ namespace Catch {
                 auto stddev_estimate = Estimate(stddev);
 #endif // CATCH_USE_ASYNC
 
+                auto n = static_cast<int>(last - first); // seriously, one can't use integral types without hell in C++
                 double outlier_variance = Detail::outlier_variance(mean_estimate, stddev_estimate, n);
 
                 return { mean_estimate, stddev_estimate, outlier_variance };
@@ -394,10 +603,10 @@ namespace Catch {
     }
 
 namespace literals {
-    Approx operator "" _a(long double val) {
+    Approx operator ""_a(long double val) {
         return Approx(val);
     }
-    Approx operator "" _a(unsigned long long val) {
+    Approx operator ""_a(unsigned long long val) {
         return Approx(val);
     }
 } // end namespace literals
@@ -596,7 +805,7 @@ namespace Catch {
             elem = trim(elem);
         }
 
-        // Insert the default reporter if user hasn't asked for a specfic one
+        // Insert the default reporter if user hasn't asked for a specific one
         if ( m_data.reporterSpecifications.empty() ) {
             m_data.reporterSpecifications.push_back( {
 #if defined( CATCH_CONFIG_DEFAULT_REPORTER )
@@ -775,7 +984,11 @@ namespace Catch {
     }
 
 
-    Capturer::Capturer( StringRef macroName, SourceLineInfo const& lineInfo, ResultWas::OfType resultType, StringRef names ) {
+    Capturer::Capturer( StringRef macroName,
+                        SourceLineInfo const& lineInfo,
+                        ResultWas::OfType resultType,
+                        StringRef names ):
+        m_resultCapture( getResultCapture() ) {
         auto trimmed = [&] (size_t start, size_t end) {
             while (names[start] == ',' || isspace(static_cast<unsigned char>(names[start]))) {
                 ++start;
@@ -852,6 +1065,8 @@ namespace Catch {
 
 
 
+#include <exception>
+
 namespace Catch {
 
     namespace {
@@ -862,7 +1077,7 @@ namespace Catch {
 
         public: // IRegistryHub
             RegistryHub() = default;
-            IReporterRegistry const& getReporterRegistry() const override {
+            ReporterRegistry const& getReporterRegistry() const override {
                 return m_reporterRegistry;
             }
             ITestCaseRegistry const& getTestCaseRegistry() const override {
@@ -938,6 +1153,7 @@ namespace Catch {
 
 #include <algorithm>
 #include <cassert>
+#include <exception>
 #include <iomanip>
 #include <set>
 
@@ -1420,12 +1636,20 @@ namespace Catch {
         for (size_t idx = 0; idx < originalTags.size(); ++idx) {
             auto c = originalTags[idx];
             if (c == '[') {
-                assert(!inTag);
+                CATCH_ENFORCE(
+                    !inTag,
+                    "Found '[' inside a tag while registering test case '"
+                        << _nameAndTags.name << "' at " << _lineInfo );
+
                 inTag = true;
                 tagStart = idx;
             }
             if (c == ']') {
-                assert(inTag);
+                CATCH_ENFORCE(
+                    inTag,
+                    "Found unmatched ']' while registering test case '"
+                        << _nameAndTags.name << "' at " << _lineInfo );
+
                 inTag = false;
                 tagEnd = idx;
                 assert(tagStart < tagEnd);
@@ -1434,7 +1658,11 @@ namespace Catch {
                 // it over to backing storage and actually reference the
                 // backing storage in the saved tags
                 StringRef tagStr = originalTags.substr(tagStart+1, tagEnd - tagStart - 1);
-                CATCH_ENFORCE(!tagStr.empty(), "Empty tags are not allowed");
+                CATCH_ENFORCE( !tagStr.empty(),
+                               "Found an empty tag while registering test case '"
+                                   << _nameAndTags.name << "' at "
+                                   << _lineInfo );
+
                 enforceNotReservedTag(tagStr, lineInfo);
                 properties |= parseSpecialTag(tagStr);
                 // When copying a tag to the backing storage, we need to
@@ -1448,8 +1676,12 @@ namespace Catch {
                 // the tags.
                 internalAppendTag(tagStr);
             }
-            (void)inTag; // Silence "set-but-unused" warning in release mode.
         }
+        CATCH_ENFORCE( !inTag,
+                       "Found an unclosed tag while registering test case '"
+                           << _nameAndTags.name << "' at " << _lineInfo );
+
+
         // Add [.] if relevant
         if (isHidden()) {
             internalAppendTag("."_sr);
@@ -1625,16 +1857,18 @@ namespace Catch {
         return std::any_of( m_filters.begin(), m_filters.end(), [&]( Filter const& f ){ return f.matches( testCase ); } );
     }
 
-    TestSpec::Matches TestSpec::matchesByFilter( std::vector<TestCaseHandle> const& testCases, IConfig const& config ) const
-    {
-        Matches matches( m_filters.size() );
-        std::transform( m_filters.begin(), m_filters.end(), matches.begin(), [&]( Filter const& filter ){
+    TestSpec::Matches TestSpec::matchesByFilter( std::vector<TestCaseHandle> const& testCases, IConfig const& config ) const {
+        Matches matches;
+        matches.reserve( m_filters.size() );
+        for ( auto const& filter : m_filters ) {
             std::vector<TestCaseHandle const*> currentMatches;
-            for( auto const& test : testCases )
-                if( isThrowSafe( test, config ) && filter.matches( test.getTestCaseInfo() ) )
+            for ( auto const& test : testCases )
+                if ( isThrowSafe( test, config ) &&
+                     filter.matches( test.getTestCaseInfo() ) )
                     currentMatches.emplace_back( &test );
-            return FilterMatch{ extractFilterName(filter), currentMatches };
-        } );
+            matches.push_back(
+                FilterMatch{ extractFilterName( filter ), currentMatches } );
+        }
         return matches;
     }
 
@@ -1991,6 +2225,19 @@ namespace Catch {
 }
 
 
+
+
+namespace Catch {
+    namespace Detail {
+        void registerTranslatorImpl(
+            Detail::unique_ptr<IExceptionTranslator>&& translator ) {
+            getMutableRegistryHub().registerTranslator(
+                CATCH_MOVE( translator ) );
+        }
+    } // namespace Detail
+} // namespace Catch
+
+
 #include <ostream>
 
 namespace Catch {
@@ -2021,7 +2268,7 @@ namespace Catch {
     }
 
     Version const& libraryVersion() {
-        static Version version( 3, 3, 2, "", 0 );
+        static Version version( 3, 5, 2, "", 0 );
         return version;
     }
 
@@ -2074,8 +2321,36 @@ namespace Detail {
 
 
 
+#include <random>
 
-std::uint32_t Catch::Generators::Detail::getSeed() { return sharedRng()(); }
+namespace Catch {
+    namespace Generators {
+        namespace Detail {
+            std::uint32_t getSeed() { return sharedRng()(); }
+        } // namespace Detail
+
+        struct RandomFloatingGenerator<long double>::PImpl {
+            PImpl( long double a, long double b, uint32_t seed ):
+                rng( seed ), dist( a, b ) {}
+
+            Catch::SimplePcg32 rng;
+            std::uniform_real_distribution<long double> dist;
+        };
+
+        RandomFloatingGenerator<long double>::RandomFloatingGenerator(
+            long double a, long double b, std::uint32_t seed) :
+            m_pimpl(Catch::Detail::make_unique<PImpl>(a, b, seed)) {
+            static_cast<void>( next() );
+        }
+
+        RandomFloatingGenerator<long double>::~RandomFloatingGenerator() =
+            default;
+        bool RandomFloatingGenerator<long double>::next() {
+            m_current_number = m_pimpl->dist( m_pimpl->rng );
+            return true;
+        }
+    } // namespace Generators
+} // namespace Catch
 
 
 
@@ -2135,9 +2410,7 @@ namespace Catch {
 
 
 
-#include <algorithm>
 #include <cassert>
-#include <iomanip>
 
 namespace Catch {
 
@@ -2172,8 +2445,6 @@ namespace Catch {
         infoMessages( _infoMessages ),
         totals( _totals )
     {
-        assertionResult.m_resultData.lazyExpression.m_transientExpression = _assertionResult.m_resultData.lazyExpression.m_transientExpression;
-
         if( assertionResult.hasMessage() ) {
             // Copy message into messages list.
             // !TBD This should have been done earlier, somewhere
@@ -2232,14 +2503,6 @@ namespace Catch {
 
 
 namespace Catch {
-    IReporterRegistry::~IReporterRegistry() = default;
-}
-
-
-
-
-namespace Catch {
-    ITestInvoker::~ITestInvoker() = default;
     ITestCaseRegistry::~ITestCaseRegistry() = default;
 }
 
@@ -2254,7 +2517,9 @@ namespace Catch {
             ResultDisposition::Flags resultDisposition )
     :   m_assertionInfo{ macroName, lineInfo, capturedExpression, resultDisposition },
         m_resultCapture( getResultCapture() )
-    {}
+    {
+        m_resultCapture.notifyAssertionStarted( m_assertionInfo );
+    }
 
     void AssertionHandler::handleExpr( ITransientExpression const& expr ) {
         m_resultCapture.handleExpr( m_assertionInfo, expr, m_reaction );
@@ -2268,7 +2533,7 @@ namespace Catch {
     }
 
     void AssertionHandler::complete() {
-        setCompleted();
+        m_completed = true;
         if( m_reaction.shouldDebugBreak ) {
 
             // If you find your debugger stopping you here then go one level up on the
@@ -2281,16 +2546,9 @@ namespace Catch {
             throw_test_failure_exception();
         }
         if ( m_reaction.shouldSkip ) {
-#if !defined( CATCH_CONFIG_DISABLE_EXCEPTIONS )
-            throw Catch::TestSkipException();
-#else
-            CATCH_ERROR( "Explicitly skipping tests during runtime requires exceptions" );
-#endif
+            throw_test_skip_exception();
         }
     }
-    void AssertionHandler::setCompleted() {
-        m_completed = true;
-    }
 
     void AssertionHandler::handleUnexpectedInflightException() {
         m_resultCapture.handleUnexpectedInflightException( m_assertionInfo, Catch::translateActiveException(), m_reaction );
@@ -2362,13 +2620,29 @@ namespace {
             ;
     }
 
-    std::string normaliseOpt( std::string const& optName ) {
-#ifdef CATCH_PLATFORM_WINDOWS
-        if ( optName[0] == '/' )
-            return "-" + optName.substr( 1 );
-        else
+    Catch::StringRef normaliseOpt( Catch::StringRef optName ) {
+        if ( optName[0] == '-'
+#if defined(CATCH_PLATFORM_WINDOWS)
+             || optName[0] == '/'
 #endif
-            return optName;
+        ) {
+            return optName.substr( 1, optName.size() );
+        }
+
+        return optName;
+    }
+
+    static size_t find_first_separator(Catch::StringRef sr) {
+        auto is_separator = []( char c ) {
+            return c == ' ' || c == ':' || c == '=';
+        };
+        size_t pos = 0;
+        while (pos < sr.size()) {
+            if (is_separator(sr[pos])) { return pos; }
+            ++pos;
+        }
+
+        return Catch::StringRef::npos;
     }
 
 } // namespace
@@ -2386,23 +2660,23 @@ namespace Catch {
                 }
 
                 if ( it != itEnd ) {
-                    auto const& next = *it;
+                    StringRef next = *it;
                     if ( isOptPrefix( next[0] ) ) {
-                        auto delimiterPos = next.find_first_of( " :=" );
-                        if ( delimiterPos != std::string::npos ) {
+                        auto delimiterPos = find_first_separator(next);
+                        if ( delimiterPos != StringRef::npos ) {
                             m_tokenBuffer.push_back(
                                 { TokenType::Option,
                                   next.substr( 0, delimiterPos ) } );
                             m_tokenBuffer.push_back(
                                 { TokenType::Argument,
-                                  next.substr( delimiterPos + 1 ) } );
+                                  next.substr( delimiterPos + 1, next.size() ) } );
                         } else {
                             if ( next[1] != '-' && next.size() > 2 ) {
-                                std::string opt = "- ";
+                                // Combined short args, e.g. "-ab" for "-a -b"
                                 for ( size_t i = 1; i < next.size(); ++i ) {
-                                    opt[1] = next[i];
                                     m_tokenBuffer.push_back(
-                                        { TokenType::Option, opt } );
+                                        { TokenType::Option,
+                                          next.substr( i, 1 ) } );
                                 }
                             } else {
                                 m_tokenBuffer.push_back(
@@ -2462,12 +2736,12 @@ namespace Catch {
             size_t ParserBase::cardinality() const { return 1; }
 
             InternalParseResult ParserBase::parse( Args const& args ) const {
-                return parse( args.exeName(), TokenStream( args ) );
+                return parse( static_cast<std::string>(args.exeName()), TokenStream( args ) );
             }
 
             ParseState::ParseState( ParseResultType type,
-                                    TokenStream const& remainingTokens ):
-                m_type( type ), m_remainingTokens( remainingTokens ) {}
+                                    TokenStream remainingTokens ):
+                m_type( type ), m_remainingTokens( CATCH_MOVE(remainingTokens) ) {}
 
             ParserResult BoundFlagRef::setFlag( bool flag ) {
                 m_ref = flag;
@@ -2485,34 +2759,34 @@ namespace Catch {
 } // namespace Detail
 
         Detail::InternalParseResult Arg::parse(std::string const&,
-                                               Detail::TokenStream const& tokens) const {
+                                               Detail::TokenStream tokens) const {
             auto validationResult = validate();
             if (!validationResult)
                 return Detail::InternalParseResult(validationResult);
 
-            auto remainingTokens = tokens;
-            auto const& token = *remainingTokens;
+            auto token = *tokens;
             if (token.type != Detail::TokenType::Argument)
                 return Detail::InternalParseResult::ok(Detail::ParseState(
-                    ParseResultType::NoMatch, remainingTokens));
+                    ParseResultType::NoMatch, CATCH_MOVE(tokens)));
 
             assert(!m_ref->isFlag());
             auto valueRef =
                 static_cast<Detail::BoundValueRefBase*>(m_ref.get());
 
-            auto result = valueRef->setValue(remainingTokens->token);
-            if (!result)
-                return Detail::InternalParseResult(result);
+            auto result = valueRef->setValue(static_cast<std::string>(token.token));
+            if ( !result )
+                return Detail::InternalParseResult( result );
             else
-                return Detail::InternalParseResult::ok(Detail::ParseState(
-                    ParseResultType::Matched, ++remainingTokens));
+                return Detail::InternalParseResult::ok(
+                    Detail::ParseState( ParseResultType::Matched,
+                                        CATCH_MOVE( ++tokens ) ) );
         }
 
         Opt::Opt(bool& ref) :
             ParserRefImpl(std::make_shared<Detail::BoundFlagRef>(ref)) {}
 
-        std::vector<Detail::HelpColumns> Opt::getHelpColumns() const {
-            std::ostringstream oss;
+        Detail::HelpColumns Opt::getHelpColumns() const {
+            ReusableStringStream oss;
             bool first = true;
             for (auto const& opt : m_optNames) {
                 if (first)
@@ -2523,10 +2797,10 @@ namespace Catch {
             }
             if (!m_hint.empty())
                 oss << " <" << m_hint << '>';
-            return { { oss.str(), m_description } };
+            return { oss.str(), m_description };
         }
 
-        bool Opt::isMatch(std::string const& optToken) const {
+        bool Opt::isMatch(StringRef optToken) const {
             auto normalisedToken = normaliseOpt(optToken);
             for (auto const& name : m_optNames) {
                 if (normaliseOpt(name) == normalisedToken)
@@ -2536,15 +2810,14 @@ namespace Catch {
         }
 
         Detail::InternalParseResult Opt::parse(std::string const&,
-                                       Detail::TokenStream const& tokens) const {
+                                       Detail::TokenStream tokens) const {
             auto validationResult = validate();
             if (!validationResult)
                 return Detail::InternalParseResult(validationResult);
 
-            auto remainingTokens = tokens;
-            if (remainingTokens &&
-                remainingTokens->type == Detail::TokenType::Option) {
-                auto const& token = *remainingTokens;
+            if (tokens &&
+                tokens->type == Detail::TokenType::Option) {
+                auto const& token = *tokens;
                 if (isMatch(token.token)) {
                     if (m_ref->isFlag()) {
                         auto flagRef =
@@ -2556,35 +2829,35 @@ namespace Catch {
                         if (result.value() ==
                             ParseResultType::ShortCircuitAll)
                             return Detail::InternalParseResult::ok(Detail::ParseState(
-                                result.value(), remainingTokens));
+                                result.value(), CATCH_MOVE(tokens)));
                     } else {
                         auto valueRef =
                             static_cast<Detail::BoundValueRefBase*>(
                                 m_ref.get());
-                        ++remainingTokens;
-                        if (!remainingTokens)
+                        ++tokens;
+                        if (!tokens)
                             return Detail::InternalParseResult::runtimeError(
                                 "Expected argument following " +
                                 token.token);
-                        auto const& argToken = *remainingTokens;
+                        auto const& argToken = *tokens;
                         if (argToken.type != Detail::TokenType::Argument)
                             return Detail::InternalParseResult::runtimeError(
                                 "Expected argument following " +
                                 token.token);
-                        const auto result = valueRef->setValue(argToken.token);
+                        const auto result = valueRef->setValue(static_cast<std::string>(argToken.token));
                         if (!result)
                             return Detail::InternalParseResult(result);
                         if (result.value() ==
                             ParseResultType::ShortCircuitAll)
                             return Detail::InternalParseResult::ok(Detail::ParseState(
-                                result.value(), remainingTokens));
+                                result.value(), CATCH_MOVE(tokens)));
                     }
                     return Detail::InternalParseResult::ok(Detail::ParseState(
-                        ParseResultType::Matched, ++remainingTokens));
+                        ParseResultType::Matched, CATCH_MOVE(++tokens)));
                 }
             }
             return Detail::InternalParseResult::ok(
-                Detail::ParseState(ParseResultType::NoMatch, remainingTokens));
+                Detail::ParseState(ParseResultType::NoMatch, CATCH_MOVE(tokens)));
         }
 
         Detail::Result Opt::validate() const {
@@ -2616,9 +2889,9 @@ namespace Catch {
 
         Detail::InternalParseResult
             ExeName::parse(std::string const&,
-                           Detail::TokenStream const& tokens) const {
+                           Detail::TokenStream tokens) const {
             return Detail::InternalParseResult::ok(
-                Detail::ParseState(ParseResultType::NoMatch, tokens));
+                Detail::ParseState(ParseResultType::NoMatch, CATCH_MOVE(tokens)));
         }
 
         ParserResult ExeName::set(std::string const& newName) {
@@ -2648,9 +2921,9 @@ namespace Catch {
 
         std::vector<Detail::HelpColumns> Parser::getHelpColumns() const {
             std::vector<Detail::HelpColumns> cols;
+            cols.reserve( m_options.size() );
             for ( auto const& o : m_options ) {
-                auto childCols = o.getHelpColumns();
-                cols.insert( cols.end(), childCols.begin(), childCols.end() );
+                cols.push_back(o.getHelpColumns());
             }
             return cols;
         }
@@ -2688,12 +2961,12 @@ namespace Catch {
 
             optWidth = ( std::min )( optWidth, consoleWidth / 2 );
 
-            for ( auto const& cols : rows ) {
-                auto row = TextFlow::Column( cols.left )
+            for ( auto& cols : rows ) {
+                auto row = TextFlow::Column( CATCH_MOVE(cols.left) )
                                .width( optWidth )
                                .indent( 2 ) +
                            TextFlow::Spacer( 4 ) +
-                           TextFlow::Column( cols.right )
+                           TextFlow::Column( static_cast<std::string>(cols.descriptions) )
                                .width( consoleWidth - 7 - optWidth );
                 os << row << '\n';
             }
@@ -2715,7 +2988,7 @@ namespace Catch {
 
         Detail::InternalParseResult
         Parser::parse( std::string const& exeName,
-                       Detail::TokenStream const& tokens ) const {
+                       Detail::TokenStream tokens ) const {
 
             struct ParserInfo {
                 ParserBase const* parser = nullptr;
@@ -2733,7 +3006,7 @@ namespace Catch {
             m_exeName.set( exeName );
 
             auto result = Detail::InternalParseResult::ok(
-                Detail::ParseState( ParseResultType::NoMatch, tokens ) );
+                Detail::ParseState( ParseResultType::NoMatch, CATCH_MOVE(tokens) ) );
             while ( result.value().remainingTokens() ) {
                 bool tokenParsed = false;
 
@@ -2741,7 +3014,7 @@ namespace Catch {
                     if ( parseInfo.parser->cardinality() == 0 ||
                          parseInfo.count < parseInfo.parser->cardinality() ) {
                         result = parseInfo.parser->parse(
-                            exeName, result.value().remainingTokens() );
+                            exeName, CATCH_MOVE(result).value().remainingTokens() );
                         if ( !result )
                             return result;
                         if ( result.value().type() !=
@@ -2767,7 +3040,7 @@ namespace Catch {
         Args::Args(int argc, char const* const* argv) :
             m_exeName(argv[0]), m_args(argv + 1, argv + argc) {}
 
-        Args::Args(std::initializer_list<std::string> args) :
+        Args::Args(std::initializer_list<StringRef> args) :
             m_exeName(*args.begin()),
             m_args(args.begin() + 1, args.end()) {}
 
@@ -2917,7 +3190,7 @@ namespace Catch {
 
             auto const& reporterSpec = *parsed;
 
-            IReporterRegistry::FactoryMap const& factories =
+            auto const& factories =
                 getRegistryHub().getReporterRegistry().getFactories();
             auto result = factories.find( reporterSpec.name() );
 
@@ -3073,8 +3346,8 @@ namespace Catch {
                 ( "split the tests to execute into this many groups" )
             | Opt( setShardIndex, "shard index" )
                 ["--shard-index"]
-                ( "index of the group of tests to execute (see --shard-count)" ) |
-            Opt( config.allowZeroTests )
+                ( "index of the group of tests to execute (see --shard-count)" )
+            | Opt( config.allowZeroTests )
                 ["--allow-running-no-tests"]
                 ( "Treat 'No tests run' as a success" )
             | Arg( config.testsOrTags, "test name|pattern|tags" )
@@ -3155,7 +3428,7 @@ namespace Catch {
     namespace {
         //! A do-nothing implementation of colour, used as fallback for unknown
         //! platforms, and when the user asks to deactivate all colours.
-        class NoColourImpl : public ColourImpl {
+        class NoColourImpl final : public ColourImpl {
         public:
             NoColourImpl( IStream* stream ): ColourImpl( stream ) {}
 
@@ -3173,7 +3446,7 @@ namespace Catch {
 namespace Catch {
 namespace {
 
-    class Win32ColourImpl : public ColourImpl {
+    class Win32ColourImpl final : public ColourImpl {
     public:
         Win32ColourImpl(IStream* stream):
             ColourImpl(stream) {
@@ -3239,7 +3512,7 @@ namespace {
 namespace Catch {
 namespace {
 
-    class ANSIColourImpl : public ColourImpl {
+    class ANSIColourImpl final : public ColourImpl {
     public:
         ANSIColourImpl( IStream* stream ): ColourImpl( stream ) {}
 
@@ -3355,49 +3628,27 @@ namespace Catch {
 
 namespace Catch {
 
-    class Context : public IMutableContext, private Detail::NonCopyable {
-
-    public: // IContext
-        IResultCapture* getResultCapture() override {
-            return m_resultCapture;
-        }
-
-        IConfig const* getConfig() const override {
-            return m_config;
-        }
-
-        ~Context() override;
-
-    public: // IMutableContext
-        void setResultCapture( IResultCapture* resultCapture ) override {
-            m_resultCapture = resultCapture;
-        }
-        void setConfig( IConfig const* config ) override {
-            m_config = config;
-        }
+    Context* Context::currentContext = nullptr;
 
-        friend IMutableContext& getCurrentMutableContext();
-
-    private:
-        IConfig const* m_config = nullptr;
-        IResultCapture* m_resultCapture = nullptr;
-    };
-
-    IMutableContext *IMutableContext::currentContext = nullptr;
-
-    void IMutableContext::createContext()
-    {
+    void cleanUpContext() {
+        delete Context::currentContext;
+        Context::currentContext = nullptr;
+    }
+    void Context::createContext() {
         currentContext = new Context();
     }
 
-    void cleanUpContext() {
-        delete IMutableContext::currentContext;
-        IMutableContext::currentContext = nullptr;
+    Context& getCurrentMutableContext() {
+        if ( !Context::currentContext ) { Context::createContext(); }
+        // NOLINTNEXTLINE(clang-analyzer-core.uninitialized.UndefReturn)
+        return *Context::currentContext;
     }
-    IContext::~IContext() = default;
-    IMutableContext::~IMutableContext() = default;
-    Context::~Context() = default;
 
+    void Context::setResultCapture( IResultCapture* resultCapture ) {
+        m_resultCapture = resultCapture;
+    }
+
+    void Context::setConfig( IConfig const* config ) { m_config = config; }
 
     SimplePcg32& sharedRng() {
         static SimplePcg32 s_rng;
@@ -3635,7 +3886,7 @@ namespace Catch {
             return parsed;
         }
 
-        EnumInfo::~EnumInfo() {}
+        EnumInfo::~EnumInfo() = default;
 
         StringRef EnumInfo::lookup( int value ) const {
             for( auto const& valueToName : m_values ) {
@@ -3680,10 +3931,27 @@ namespace Catch {
 
 
 
+#include <exception>
+
 namespace Catch {
 
-    ExceptionTranslatorRegistry::~ExceptionTranslatorRegistry() {
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+    namespace {
+        static std::string tryTranslators(
+            std::vector<
+                Detail::unique_ptr<IExceptionTranslator const>> const& translators ) {
+            if ( translators.empty() ) {
+                std::rethrow_exception( std::current_exception() );
+            } else {
+                return translators[0]->translate( translators.begin() + 1,
+                                                  translators.end() );
+            }
+        }
+
     }
+#endif //!defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+
+    ExceptionTranslatorRegistry::~ExceptionTranslatorRegistry() = default;
 
     void ExceptionTranslatorRegistry::registerTranslator( Detail::unique_ptr<IExceptionTranslator>&& translator ) {
         m_translators.push_back( CATCH_MOVE( translator ) );
@@ -3706,7 +3974,7 @@ namespace Catch {
         // First we try user-registered translators. If none of them can
         // handle the exception, it will be rethrown handled by our defaults.
         try {
-            return tryTranslators();
+            return tryTranslators(m_translators);
         }
         // To avoid having to handle TFE explicitly everywhere, we just
         // rethrow it so that it goes back up the caller.
@@ -3730,25 +3998,12 @@ namespace Catch {
         }
     }
 
-    std::string ExceptionTranslatorRegistry::tryTranslators() const {
-        if (m_translators.empty()) {
-            std::rethrow_exception(std::current_exception());
-        } else {
-            return m_translators[0]->translate(m_translators.begin() + 1, m_translators.end());
-        }
-    }
-
 #else // ^^ Exceptions are enabled // Exceptions are disabled vv
     std::string ExceptionTranslatorRegistry::translateActiveException() const {
         CATCH_INTERNAL_ERROR("Attempted to translate active exception under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
     }
-
-    std::string ExceptionTranslatorRegistry::tryTranslators() const {
-        CATCH_INTERNAL_ERROR("Attempted to use exception translators under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
-    }
 #endif
 
-
 }
 
 
@@ -4005,6 +4260,17 @@ namespace Catch {
             return i;
         }
 
+#if defined( __GNUC__ ) || defined( __clang__ )
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+        bool directCompare( float lhs, float rhs ) { return lhs == rhs; }
+        bool directCompare( double lhs, double rhs ) { return lhs == rhs; }
+#if defined( __GNUC__ ) || defined( __clang__ )
+#    pragma GCC diagnostic pop
+#endif
+
+
     } // end namespace Detail
 } // end namespace Catch
 
@@ -4053,7 +4319,7 @@ namespace Catch {
 namespace Detail {
     namespace {
         template<typename WriterF, std::size_t bufferSize=256>
-        class StreamBufImpl : public std::streambuf {
+        class StreamBufImpl final : public std::streambuf {
             char data[bufferSize];
             WriterF m_writer;
 
@@ -4101,7 +4367,7 @@ namespace Detail {
 
         ///////////////////////////////////////////////////////////////////////////
 
-        class FileStream : public IStream {
+        class FileStream final : public IStream {
             std::ofstream m_ofs;
         public:
             FileStream( std::string const& filename ) {
@@ -4109,7 +4375,6 @@ namespace Detail {
                 CATCH_ENFORCE( !m_ofs.fail(), "Unable to open file: '" << filename << '\'' );
                 m_ofs << std::unitbuf;
             }
-            ~FileStream() override = default;
         public: // IStream
             std::ostream& stream() override {
                 return m_ofs;
@@ -4118,13 +4383,12 @@ namespace Detail {
 
         ///////////////////////////////////////////////////////////////////////////
 
-        class CoutStream : public IStream {
+        class CoutStream final : public IStream {
             std::ostream m_os;
         public:
             // Store the streambuf from cout up-front because
             // cout may get redirected when running tests
             CoutStream() : m_os( Catch::cout().rdbuf() ) {}
-            ~CoutStream() override = default;
 
         public: // IStream
             std::ostream& stream() override { return m_os; }
@@ -4138,7 +4402,6 @@ namespace Detail {
             // Store the streambuf from cerr up-front because
             // cout may get redirected when running tests
             CerrStream(): m_os( Catch::cerr().rdbuf() ) {}
-            ~CerrStream() override = default;
 
         public: // IStream
             std::ostream& stream() override { return m_os; }
@@ -4147,7 +4410,7 @@ namespace Detail {
 
         ///////////////////////////////////////////////////////////////////////////
 
-        class DebugOutStream : public IStream {
+        class DebugOutStream final : public IStream {
             Detail::unique_ptr<StreamBufImpl<OutputDebugWriter>> m_streamBuf;
             std::ostream m_os;
         public:
@@ -4156,8 +4419,6 @@ namespace Detail {
                 m_os( m_streamBuf.get() )
             {}
 
-            ~DebugOutStream() override = default;
-
         public: // IStream
             std::ostream& stream() override { return m_os; }
         };
@@ -4189,6 +4450,147 @@ namespace Detail {
 
 
 
+namespace Catch {
+    void JsonUtils::indent( std::ostream& os, std::uint64_t level ) {
+        for ( std::uint64_t i = 0; i < level; ++i ) {
+            os << "  ";
+        }
+    }
+    void JsonUtils::appendCommaNewline( std::ostream& os,
+                                        bool& should_comma,
+                                        std::uint64_t level ) {
+        if ( should_comma ) { os << ','; }
+        should_comma = true;
+        os << '\n';
+        indent( os, level );
+    }
+
+    JsonObjectWriter::JsonObjectWriter( std::ostream& os ):
+        JsonObjectWriter{ os, 0 } {}
+
+    JsonObjectWriter::JsonObjectWriter( std::ostream& os,
+                                        std::uint64_t indent_level ):
+        m_os{ os }, m_indent_level{ indent_level } {
+        m_os << '{';
+    }
+    JsonObjectWriter::JsonObjectWriter( JsonObjectWriter&& source ):
+        m_os{ source.m_os },
+        m_indent_level{ source.m_indent_level },
+        m_should_comma{ source.m_should_comma },
+        m_active{ source.m_active } {
+        source.m_active = false;
+    }
+
+    JsonObjectWriter::~JsonObjectWriter() {
+        if ( !m_active ) { return; }
+
+        m_os << '\n';
+        JsonUtils::indent( m_os, m_indent_level );
+        m_os << '}';
+    }
+
+    JsonValueWriter JsonObjectWriter::write( StringRef key ) {
+        JsonUtils::appendCommaNewline(
+            m_os, m_should_comma, m_indent_level + 1 );
+
+        m_os << '"' << key << "\": ";
+        return JsonValueWriter{ m_os, m_indent_level + 1 };
+    }
+
+    JsonArrayWriter::JsonArrayWriter( std::ostream& os ):
+        JsonArrayWriter{ os, 0 } {}
+    JsonArrayWriter::JsonArrayWriter( std::ostream& os,
+                                      std::uint64_t indent_level ):
+        m_os{ os }, m_indent_level{ indent_level } {
+        m_os << '[';
+    }
+    JsonArrayWriter::JsonArrayWriter( JsonArrayWriter&& source ):
+        m_os{ source.m_os },
+        m_indent_level{ source.m_indent_level },
+        m_should_comma{ source.m_should_comma },
+        m_active{ source.m_active } {
+        source.m_active = false;
+    }
+    JsonArrayWriter::~JsonArrayWriter() {
+        if ( !m_active ) { return; }
+
+        m_os << '\n';
+        JsonUtils::indent( m_os, m_indent_level );
+        m_os << ']';
+    }
+
+    JsonObjectWriter JsonArrayWriter::writeObject() {
+        JsonUtils::appendCommaNewline(
+            m_os, m_should_comma, m_indent_level + 1 );
+        return JsonObjectWriter{ m_os, m_indent_level + 1 };
+    }
+
+    JsonArrayWriter JsonArrayWriter::writeArray() {
+        JsonUtils::appendCommaNewline(
+            m_os, m_should_comma, m_indent_level + 1 );
+        return JsonArrayWriter{ m_os, m_indent_level + 1 };
+    }
+
+    JsonArrayWriter& JsonArrayWriter::write( bool value ) {
+        return writeImpl( value );
+    }
+
+    JsonValueWriter::JsonValueWriter( std::ostream& os ):
+        JsonValueWriter{ os, 0 } {}
+
+    JsonValueWriter::JsonValueWriter( std::ostream& os,
+                                      std::uint64_t indent_level ):
+        m_os{ os }, m_indent_level{ indent_level } {}
+
+    JsonObjectWriter JsonValueWriter::writeObject() && {
+        return JsonObjectWriter{ m_os, m_indent_level };
+    }
+
+    JsonArrayWriter JsonValueWriter::writeArray() && {
+        return JsonArrayWriter{ m_os, m_indent_level };
+    }
+
+    void JsonValueWriter::write( Catch::StringRef value ) && {
+        writeImpl( value, true );
+    }
+
+    void JsonValueWriter::write( bool value ) && {
+        writeImpl( value ? "true"_sr : "false"_sr, false );
+    }
+
+    void JsonValueWriter::writeImpl( Catch::StringRef value, bool quote ) {
+        if ( quote ) { m_os << '"'; }
+        for (char c : value) {
+            // Escape list taken from https://www.json.org/json-en.html,
+            // string definition.
+            // Note that while forward slash _can_ be escaped, it does
+            // not have to be, if JSON is not further embedded somewhere
+            // where forward slash is meaningful.
+            if ( c == '"' ) {
+                m_os << "\\\"";
+            } else if ( c == '\\' ) {
+                m_os << "\\\\";
+            } else if ( c == '\b' ) {
+                m_os << "\\b";
+            } else if ( c == '\f' ) {
+                m_os << "\\f";
+            } else if ( c == '\n' ) {
+                m_os << "\\n";
+            } else if ( c == '\r' ) {
+                m_os << "\\r";
+            } else if ( c == '\t' ) {
+                m_os << "\\t";
+            } else {
+                m_os << c;
+            }
+        }
+        if ( quote ) { m_os << '"'; }
+    }
+
+} // namespace Catch
+
+
+
 
 namespace Catch {
 
@@ -4231,7 +4633,7 @@ namespace Catch {
 
 #else // ^^ Windows crt debug heap enabled // Windows crt debug heap disabled vv
 
-    Catch::LeakDetector::LeakDetector() {}
+    Catch::LeakDetector::LeakDetector() = default;
 
 #endif // CATCH_CONFIG_WINDOWS_CRTDBG
 
@@ -4242,7 +4644,6 @@ Catch::LeakDetector::~LeakDetector() {
 
 
 
-
 namespace Catch {
     namespace {
 
@@ -4277,7 +4678,7 @@ namespace Catch {
         void listReporters(IEventListener& reporter) {
             std::vector<ReporterDescription> descriptions;
 
-            IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories();
+            auto const& factories = getRegistryHub().getReporterRegistry().getFactories();
             descriptions.reserve(factories.size());
             for (auto const& fac : factories) {
                 descriptions.push_back({ fac.first, fac.second->getDescription() });
@@ -4599,6 +5000,14 @@ namespace Catch {
     }
 #endif
 
+#if !defined( CATCH_CONFIG_GLOBAL_NEXTAFTER )
+    float nextafter( float x, float y ) { return std::nextafter( x, y ); }
+    double nextafter( double x, double y ) { return std::nextafter( x, y ); }
+#else
+    float nextafter( float x, float y ) { return ::nextafterf( x, y ); }
+    double nextafter( double x, double y ) { return ::nextafter( x, y ); }
+#endif
+
 } // end namespace Catch
 
 
@@ -4680,10 +5089,10 @@ namespace Catch {
             return static_cast<std::uint32_t>( std::time( nullptr ) );
 
         case GenerateFrom::Default:
-        case GenerateFrom::RandomDevice:
-            // In theory, a platform could have random_device that returns just
-            // 16 bits. That is still some randomness, so we don't care too much
-            return static_cast<std::uint32_t>( std::random_device{}() );
+        case GenerateFrom::RandomDevice: {
+            std::random_device rd;
+            return Detail::fillBitsFrom<std::uint32_t>( rd );
+        }
 
         default:
             CATCH_ERROR("Unknown generation method");
@@ -4696,49 +5105,73 @@ namespace Catch {
 
 
 namespace Catch {
+    struct ReporterRegistry::ReporterRegistryImpl {
+        std::vector<Detail::unique_ptr<EventListenerFactory>> listeners;
+        std::map<std::string, IReporterFactoryPtr, Detail::CaseInsensitiveLess>
+            factories;
+    };
 
-    ReporterRegistry::ReporterRegistry() {
+    ReporterRegistry::ReporterRegistry():
+        m_impl( Detail::make_unique<ReporterRegistryImpl>() ) {
         // Because it is impossible to move out of initializer list,
         // we have to add the elements manually
-        m_factories["Automake"] = Detail::make_unique<ReporterFactory<AutomakeReporter>>();
-        m_factories["compact"] = Detail::make_unique<ReporterFactory<CompactReporter>>();
-        m_factories["console"] = Detail::make_unique<ReporterFactory<ConsoleReporter>>();
-        m_factories["JUnit"] = Detail::make_unique<ReporterFactory<JunitReporter>>();
-        m_factories["SonarQube"] = Detail::make_unique<ReporterFactory<SonarQubeReporter>>();
-        m_factories["TAP"] = Detail::make_unique<ReporterFactory<TAPReporter>>();
-        m_factories["TeamCity"] = Detail::make_unique<ReporterFactory<TeamCityReporter>>();
-        m_factories["XML"] = Detail::make_unique<ReporterFactory<XmlReporter>>();
+        m_impl->factories["Automake"] =
+            Detail::make_unique<ReporterFactory<AutomakeReporter>>();
+        m_impl->factories["compact"] =
+            Detail::make_unique<ReporterFactory<CompactReporter>>();
+        m_impl->factories["console"] =
+            Detail::make_unique<ReporterFactory<ConsoleReporter>>();
+        m_impl->factories["JUnit"] =
+            Detail::make_unique<ReporterFactory<JunitReporter>>();
+        m_impl->factories["SonarQube"] =
+            Detail::make_unique<ReporterFactory<SonarQubeReporter>>();
+        m_impl->factories["TAP"] =
+            Detail::make_unique<ReporterFactory<TAPReporter>>();
+        m_impl->factories["TeamCity"] =
+            Detail::make_unique<ReporterFactory<TeamCityReporter>>();
+        m_impl->factories["XML"] =
+            Detail::make_unique<ReporterFactory<XmlReporter>>();
+        m_impl->factories["JSON"] =
+            Detail::make_unique<ReporterFactory<JsonReporter>>();
     }
 
     ReporterRegistry::~ReporterRegistry() = default;
 
-
-    IEventListenerPtr ReporterRegistry::create( std::string const& name, ReporterConfig&& config ) const {
-        auto it =  m_factories.find( name );
-        if( it == m_factories.end() )
-            return nullptr;
-        return it->second->create( CATCH_MOVE(config) );
+    IEventListenerPtr
+    ReporterRegistry::create( std::string const& name,
+                              ReporterConfig&& config ) const {
+        auto it = m_impl->factories.find( name );
+        if ( it == m_impl->factories.end() ) return nullptr;
+        return it->second->create( CATCH_MOVE( config ) );
     }
 
-    void ReporterRegistry::registerReporter( std::string const& name, IReporterFactoryPtr factory ) {
+    void ReporterRegistry::registerReporter( std::string const& name,
+                                             IReporterFactoryPtr factory ) {
         CATCH_ENFORCE( name.find( "::" ) == name.npos,
-                       "'::' is not allowed in reporter name: '" + name + '\'' );
-        auto ret = m_factories.emplace(name, CATCH_MOVE(factory));
-        CATCH_ENFORCE( ret.second, "reporter using '" + name + "' as name was already registered" );
+                       "'::' is not allowed in reporter name: '" + name +
+                           '\'' );
+        auto ret = m_impl->factories.emplace( name, CATCH_MOVE( factory ) );
+        CATCH_ENFORCE( ret.second,
+                       "reporter using '" + name +
+                           "' as name was already registered" );
     }
     void ReporterRegistry::registerListener(
         Detail::unique_ptr<EventListenerFactory> factory ) {
-        m_listeners.push_back( CATCH_MOVE(factory) );
+        m_impl->listeners.push_back( CATCH_MOVE( factory ) );
     }
 
-    IReporterRegistry::FactoryMap const& ReporterRegistry::getFactories() const {
-        return m_factories;
-    }
-    IReporterRegistry::Listeners const& ReporterRegistry::getListeners() const {
-        return m_listeners;
+    std::map<std::string,
+             IReporterFactoryPtr,
+             Detail::CaseInsensitiveLess> const&
+    ReporterRegistry::getFactories() const {
+        return m_impl->factories;
     }
 
-}
+    std::vector<Detail::unique_ptr<EventListenerFactory>> const&
+    ReporterRegistry::getListeners() const {
+        return m_impl->listeners;
+    }
+} // namespace Catch
 
 
 
@@ -4754,9 +5187,9 @@ namespace Catch {
         };
 
         kvPair splitKVPair(StringRef kvString) {
-            auto splitPos = static_cast<size_t>( std::distance(
-                kvString.begin(),
-                std::find( kvString.begin(), kvString.end(), '=' ) ) );
+            auto splitPos = static_cast<size_t>(
+                std::find( kvString.begin(), kvString.end(), '=' ) -
+                kvString.begin() );
 
             return { kvString.substr( 0, splitPos ),
                      kvString.substr( splitPos + 1, kvString.size() ) };
@@ -4988,146 +5421,151 @@ namespace Catch {
 namespace Catch {
 
     namespace Generators {
-        struct GeneratorTracker : TestCaseTracking::TrackerBase, IGeneratorTracker {
-            GeneratorBasePtr m_generator;
+        namespace {
+            struct GeneratorTracker final : TestCaseTracking::TrackerBase,
+                                      IGeneratorTracker {
+                GeneratorBasePtr m_generator;
+
+                GeneratorTracker(
+                    TestCaseTracking::NameAndLocation&& nameAndLocation,
+                    TrackerContext& ctx,
+                    ITracker* parent ):
+                    TrackerBase( CATCH_MOVE( nameAndLocation ), ctx, parent ) {}
+
+                static GeneratorTracker*
+                acquire( TrackerContext& ctx,
+                         TestCaseTracking::NameAndLocationRef const&
+                             nameAndLocation ) {
+                    GeneratorTracker* tracker;
+
+                    ITracker& currentTracker = ctx.currentTracker();
+                    // Under specific circumstances, the generator we want
+                    // to acquire is also the current tracker. If this is
+                    // the case, we have to avoid looking through current
+                    // tracker's children, and instead return the current
+                    // tracker.
+                    // A case where this check is important is e.g.
+                    //     for (int i = 0; i < 5; ++i) {
+                    //         int n = GENERATE(1, 2);
+                    //     }
+                    //
+                    // without it, the code above creates 5 nested generators.
+                    if ( currentTracker.nameAndLocation() == nameAndLocation ) {
+                        auto thisTracker = currentTracker.parent()->findChild(
+                            nameAndLocation );
+                        assert( thisTracker );
+                        assert( thisTracker->isGeneratorTracker() );
+                        tracker = static_cast<GeneratorTracker*>( thisTracker );
+                    } else if ( ITracker* childTracker =
+                                    currentTracker.findChild(
+                                        nameAndLocation ) ) {
+                        assert( childTracker );
+                        assert( childTracker->isGeneratorTracker() );
+                        tracker =
+                            static_cast<GeneratorTracker*>( childTracker );
+                    } else {
+                        return nullptr;
+                    }
 
-            GeneratorTracker( TestCaseTracking::NameAndLocation&& nameAndLocation, TrackerContext& ctx, ITracker* parent )
-            :   TrackerBase( CATCH_MOVE(nameAndLocation), ctx, parent )
-            {}
-            ~GeneratorTracker() override;
-
-            static GeneratorTracker* acquire( TrackerContext& ctx, TestCaseTracking::NameAndLocationRef const& nameAndLocation ) {
-                GeneratorTracker* tracker;
-
-                ITracker& currentTracker = ctx.currentTracker();
-                // Under specific circumstances, the generator we want
-                // to acquire is also the current tracker. If this is
-                // the case, we have to avoid looking through current
-                // tracker's children, and instead return the current
-                // tracker.
-                // A case where this check is important is e.g.
-                //     for (int i = 0; i < 5; ++i) {
-                //         int n = GENERATE(1, 2);
-                //     }
-                //
-                // without it, the code above creates 5 nested generators.
-                if ( currentTracker.nameAndLocation() == nameAndLocation ) {
-                    auto thisTracker =
-                        currentTracker.parent()->findChild( nameAndLocation );
-                    assert( thisTracker );
-                    assert( thisTracker->isGeneratorTracker() );
-                    tracker = static_cast<GeneratorTracker*>( thisTracker );
-                } else if ( ITracker* childTracker =
-                                currentTracker.findChild( nameAndLocation ) ) {
-                    assert( childTracker );
-                    assert( childTracker->isGeneratorTracker() );
-                    tracker = static_cast<GeneratorTracker*>( childTracker );
-                } else {
-                    return nullptr;
-                }
+                    if ( !tracker->isComplete() ) { tracker->open(); }
 
-                if( !tracker->isComplete() ) {
-                    tracker->open();
+                    return tracker;
                 }
 
-                return tracker;
-            }
-
-            // TrackerBase interface
-            bool isGeneratorTracker() const override { return true; }
-            auto hasGenerator() const -> bool override {
-                return !!m_generator;
-            }
-            void close() override {
-                TrackerBase::close();
-                // If a generator has a child (it is followed by a section)
-                // and none of its children have started, then we must wait
-                // until later to start consuming its values.
-                // This catches cases where `GENERATE` is placed between two
-                // `SECTION`s.
-                // **The check for m_children.empty cannot be removed**.
-                // doing so would break `GENERATE` _not_ followed by `SECTION`s.
-                const bool should_wait_for_child = [&]() {
-                    // No children -> nobody to wait for
-                    if ( m_children.empty() ) {
-                        return false;
-                    }
-                    // If at least one child started executing, don't wait
-                    if ( std::find_if(
-                             m_children.begin(),
-                             m_children.end(),
-                             []( TestCaseTracking::ITrackerPtr const& tracker ) {
-                                 return tracker->hasStarted();
-                             } ) != m_children.end() ) {
-                        return false;
-                    }
-
-                    // No children have started. We need to check if they _can_
-                    // start, and thus we should wait for them, or they cannot
-                    // start (due to filters), and we shouldn't wait for them
-                    ITracker* parent = m_parent;
-                    // This is safe: there is always at least one section
-                    // tracker in a test case tracking tree
-                    while ( !parent->isSectionTracker() ) {
-                        parent = parent->parent();
-                    }
-                    assert( parent &&
-                            "Missing root (test case) level section" );
-
-                    auto const& parentSection =
-                        static_cast<SectionTracker const&>( *parent );
-                    auto const& filters = parentSection.getFilters();
-                    // No filters -> no restrictions on running sections
-                    if ( filters.empty() ) {
-                        return true;
-                    }
+                // TrackerBase interface
+                bool isGeneratorTracker() const override { return true; }
+                auto hasGenerator() const -> bool override {
+                    return !!m_generator;
+                }
+                void close() override {
+                    TrackerBase::close();
+                    // If a generator has a child (it is followed by a section)
+                    // and none of its children have started, then we must wait
+                    // until later to start consuming its values.
+                    // This catches cases where `GENERATE` is placed between two
+                    // `SECTION`s.
+                    // **The check for m_children.empty cannot be removed**.
+                    // doing so would break `GENERATE` _not_ followed by
+                    // `SECTION`s.
+                    const bool should_wait_for_child = [&]() {
+                        // No children -> nobody to wait for
+                        if ( m_children.empty() ) { return false; }
+                        // If at least one child started executing, don't wait
+                        if ( std::find_if(
+                                 m_children.begin(),
+                                 m_children.end(),
+                                 []( TestCaseTracking::ITrackerPtr const&
+                                         tracker ) {
+                                     return tracker->hasStarted();
+                                 } ) != m_children.end() ) {
+                            return false;
+                        }
 
-                    for ( auto const& child : m_children ) {
-                        if ( child->isSectionTracker() &&
-                             std::find(
-                                 filters.begin(),
-                                 filters.end(),
-                                 static_cast<SectionTracker const&>( *child )
-                                     .trimmedName() ) != filters.end() ) {
-                            return true;
+                        // No children have started. We need to check if they
+                        // _can_ start, and thus we should wait for them, or
+                        // they cannot start (due to filters), and we shouldn't
+                        // wait for them
+                        ITracker* parent = m_parent;
+                        // This is safe: there is always at least one section
+                        // tracker in a test case tracking tree
+                        while ( !parent->isSectionTracker() ) {
+                            parent = parent->parent();
                         }
+                        assert( parent &&
+                                "Missing root (test case) level section" );
+
+                        auto const& parentSection =
+                            static_cast<SectionTracker const&>( *parent );
+                        auto const& filters = parentSection.getFilters();
+                        // No filters -> no restrictions on running sections
+                        if ( filters.empty() ) { return true; }
+
+                        for ( auto const& child : m_children ) {
+                            if ( child->isSectionTracker() &&
+                                 std::find( filters.begin(),
+                                            filters.end(),
+                                            static_cast<SectionTracker const&>(
+                                                *child )
+                                                .trimmedName() ) !=
+                                     filters.end() ) {
+                                return true;
+                            }
+                        }
+                        return false;
+                    }();
+
+                    // This check is a bit tricky, because m_generator->next()
+                    // has a side-effect, where it consumes generator's current
+                    // value, but we do not want to invoke the side-effect if
+                    // this generator is still waiting for any child to start.
+                    assert( m_generator && "Tracker without generator" );
+                    if ( should_wait_for_child ||
+                         ( m_runState == CompletedSuccessfully &&
+                           m_generator->countedNext() ) ) {
+                        m_children.clear();
+                        m_runState = Executing;
                     }
-                    return false;
-                }();
-
-                // This check is a bit tricky, because m_generator->next()
-                // has a side-effect, where it consumes generator's current
-                // value, but we do not want to invoke the side-effect if
-                // this generator is still waiting for any child to start.
-                assert( m_generator && "Tracker without generator" );
-                if ( should_wait_for_child ||
-                     ( m_runState == CompletedSuccessfully &&
-                       m_generator->countedNext() ) ) {
-                    m_children.clear();
-                    m_runState = Executing;
                 }
-            }
 
-            // IGeneratorTracker interface
-            auto getGenerator() const -> GeneratorBasePtr const& override {
-                return m_generator;
-            }
-            void setGenerator( GeneratorBasePtr&& generator ) override {
-                m_generator = CATCH_MOVE( generator );
-            }
-        };
-        GeneratorTracker::~GeneratorTracker() = default;
+                // IGeneratorTracker interface
+                auto getGenerator() const -> GeneratorBasePtr const& override {
+                    return m_generator;
+                }
+                void setGenerator( GeneratorBasePtr&& generator ) override {
+                    m_generator = CATCH_MOVE( generator );
+                }
+            };
+        } // namespace
     }
 
     RunContext::RunContext(IConfig const* _config, IEventListenerPtr&& reporter)
     :   m_runInfo(_config->name()),
-        m_context(getCurrentMutableContext()),
         m_config(_config),
         m_reporter(CATCH_MOVE(reporter)),
         m_lastAssertionInfo{ StringRef(), SourceLineInfo("",0), StringRef(), ResultDisposition::Normal },
         m_includeSuccessfulResults( m_config->includeSuccessfulResults() || m_reporter->getPreferences().shouldReportAllAssertions )
     {
-        m_context.setResultCapture(this);
+        getCurrentMutableContext().setResultCapture( this );
         m_reporter->testRunStarting(m_runInfo);
     }
 
@@ -5222,7 +5660,7 @@ namespace Catch {
     }
 
 
-    void RunContext::assertionEnded(AssertionResult const & result) {
+    void RunContext::assertionEnded(AssertionResult&& result) {
         if (result.getResultType() == ResultWas::Ok) {
             m_totals.assertions.passed++;
             m_lastAssertionPassed = true;
@@ -5244,19 +5682,27 @@ namespace Catch {
 
         m_reporter->assertionEnded(AssertionStats(result, m_messages, m_totals));
 
-        if (result.getResultType() != ResultWas::Warning)
+        if ( result.getResultType() != ResultWas::Warning ) {
             m_messageScopes.clear();
+        }
 
-        // Reset working state
-        resetAssertionInfo();
-        m_lastResult = result;
+        // Reset working state. assertion info will be reset after
+        // populateReaction is run if it is needed
+        m_lastResult = CATCH_MOVE( result );
     }
     void RunContext::resetAssertionInfo() {
         m_lastAssertionInfo.macroName = StringRef();
         m_lastAssertionInfo.capturedExpression = "{Unknown expression after the reported line}"_sr;
+        m_lastAssertionInfo.resultDisposition = ResultDisposition::Normal;
+    }
+
+    void RunContext::notifyAssertionStarted( AssertionInfo const& info ) {
+        m_reporter->assertionStarting( info );
     }
 
-    bool RunContext::sectionStarted(StringRef sectionName, SourceLineInfo const& sectionLineInfo, Counts & assertions) {
+    bool RunContext::sectionStarted( StringRef sectionName,
+                                     SourceLineInfo const& sectionLineInfo,
+                                     Counts& assertions ) {
         ITracker& sectionTracker =
             SectionTracker::acquire( m_trackerContext,
                                      TestCaseTracking::NameAndLocationRef(
@@ -5394,7 +5840,8 @@ namespace Catch {
         tempResult.message = static_cast<std::string>(message);
         AssertionResult result(m_lastAssertionInfo, CATCH_MOVE(tempResult));
 
-        assertionEnded(result);
+        assertionEnded(CATCH_MOVE(result) );
+        resetAssertionInfo();
 
         handleUnfinishedSections();
 
@@ -5516,8 +5963,6 @@ namespace Catch {
         ITransientExpression const& expr,
         AssertionReaction& reaction
     ) {
-        m_reporter->assertionStarting( info );
-
         bool negated = isFalseTest( info.resultDisposition );
         bool result = expr.getResult() != negated;
 
@@ -5533,6 +5978,7 @@ namespace Catch {
             reportExpr(info, ResultWas::ExpressionFailed, &expr, negated );
             populateReaction( reaction );
         }
+        resetAssertionInfo();
     }
     void RunContext::reportExpr(
             AssertionInfo const &info,
@@ -5546,7 +5992,7 @@ namespace Catch {
         AssertionResult assertionResult{ info, CATCH_MOVE( data ) };
         assertionResult.m_resultData.lazyExpression.m_transientExpression = expr;
 
-        assertionEnded( assertionResult );
+        assertionEnded( CATCH_MOVE(assertionResult) );
     }
 
     void RunContext::handleMessage(
@@ -5555,22 +6001,23 @@ namespace Catch {
             StringRef message,
             AssertionReaction& reaction
     ) {
-        m_reporter->assertionStarting( info );
-
         m_lastAssertionInfo = info;
 
         AssertionResultData data( resultType, LazyExpression( false ) );
         data.message = static_cast<std::string>(message);
         AssertionResult assertionResult{ m_lastAssertionInfo,
                                          CATCH_MOVE( data ) };
-        assertionEnded( assertionResult );
-        if ( !assertionResult.isOk() ) {
+
+        const auto isOk = assertionResult.isOk();
+        assertionEnded( CATCH_MOVE(assertionResult) );
+        if ( !isOk ) {
             populateReaction( reaction );
         } else if ( resultType == ResultWas::ExplicitSkip ) {
             // TODO: Need to handle this explicitly, as ExplicitSkip is
             // considered "OK"
             reaction.shouldSkip = true;
         }
+        resetAssertionInfo();
     }
     void RunContext::handleUnexpectedExceptionNotThrown(
             AssertionInfo const& info,
@@ -5581,16 +6028,17 @@ namespace Catch {
 
     void RunContext::handleUnexpectedInflightException(
             AssertionInfo const& info,
-            std::string const& message,
+            std::string&& message,
             AssertionReaction& reaction
     ) {
         m_lastAssertionInfo = info;
 
         AssertionResultData data( ResultWas::ThrewException, LazyExpression( false ) );
-        data.message = message;
+        data.message = CATCH_MOVE(message);
         AssertionResult assertionResult{ info, CATCH_MOVE(data) };
-        assertionEnded( assertionResult );
+        assertionEnded( CATCH_MOVE(assertionResult) );
         populateReaction( reaction );
+        resetAssertionInfo();
     }
 
     void RunContext::populateReaction( AssertionReaction& reaction ) {
@@ -5607,7 +6055,8 @@ namespace Catch {
         AssertionResultData data( ResultWas::ThrewException, LazyExpression( false ) );
         data.message = "Exception translation was disabled by CATCH_CONFIG_FAST_COMPILE"s;
         AssertionResult assertionResult{ info, CATCH_MOVE( data ) };
-        assertionEnded( assertionResult );
+        assertionEnded( CATCH_MOVE(assertionResult) );
+        resetAssertionInfo();
     }
     void RunContext::handleNonExpr(
             AssertionInfo const &info,
@@ -5618,10 +6067,11 @@ namespace Catch {
 
         AssertionResultData data( resultType, LazyExpression( false ) );
         AssertionResult assertionResult{ info, CATCH_MOVE( data ) };
-        assertionEnded( assertionResult );
 
-        if( !assertionResult.isOk() )
-            populateReaction( reaction );
+        const auto isOk = assertionResult.isOk();
+        assertionEnded( CATCH_MOVE(assertionResult) );
+        if ( !isOk ) { populateReaction( reaction ); }
+        resetAssertionInfo();
     }
 
 
@@ -5790,7 +6240,6 @@ namespace Catch {
 
 
 
-#include <algorithm>
 #include <ostream>
 #include <cstring>
 #include <cctype>
@@ -5814,9 +6263,9 @@ namespace Catch {
         return s.find( infix ) != std::string::npos;
     }
     void toLowerInPlace( std::string& s ) {
-        std::transform( s.begin(), s.end(), s.begin(), []( char c ) {
-            return toLower( c );
-        } );
+        for ( char& c : s ) {
+            c = toLower( c );
+        }
     }
     std::string toLower( std::string const& s ) {
         std::string lc = s;
@@ -5949,7 +6398,7 @@ namespace Catch {
 
 namespace Catch {
 
-    TagAliasRegistry::~TagAliasRegistry() {}
+    TagAliasRegistry::~TagAliasRegistry() = default;
 
     TagAlias const* TagAliasRegistry::find( std::string const& alias ) const {
         auto it = m_registry.find( alias );
@@ -6030,6 +6479,38 @@ namespace Catch {
 
 namespace Catch {
 
+    namespace {
+        static void enforceNoDuplicateTestCases(
+            std::vector<TestCaseHandle> const& tests ) {
+            auto testInfoCmp = []( TestCaseInfo const* lhs,
+                                   TestCaseInfo const* rhs ) {
+                return *lhs < *rhs;
+            };
+            std::set<TestCaseInfo const*, decltype( testInfoCmp )&> seenTests(
+                testInfoCmp );
+            for ( auto const& test : tests ) {
+                const auto infoPtr = &test.getTestCaseInfo();
+                const auto prev = seenTests.insert( infoPtr );
+                CATCH_ENFORCE( prev.second,
+                               "error: test case \""
+                                   << infoPtr->name << "\", with tags \""
+                                   << infoPtr->tagsAsString()
+                                   << "\" already defined.\n"
+                                   << "\tFirst seen at "
+                                   << ( *prev.first )->lineInfo << "\n"
+                                   << "\tRedefined at " << infoPtr->lineInfo );
+            }
+        }
+
+        static bool matchTest( TestCaseHandle const& testCase,
+                               TestSpec const& testSpec,
+                               IConfig const& config ) {
+            return testSpec.matches( testCase.getTestCaseInfo() ) &&
+                   isThrowSafe( testCase, config );
+        }
+
+    } // end unnamed namespace
+
     std::vector<TestCaseHandle> sortTests( IConfig const& config, std::vector<TestCaseHandle> const& unsortedTestCases ) {
         switch (config.runOrder()) {
         case TestRunOrder::Declared:
@@ -6047,7 +6528,6 @@ namespace Catch {
             return sorted;
         }
         case TestRunOrder::Randomized: {
-            seedRng(config);
             using TestWithHash = std::pair<TestCaseInfoHasher::hash_t, TestCaseHandle>;
 
             TestCaseInfoHasher h{ config.rngSeed() };
@@ -6086,29 +6566,6 @@ namespace Catch {
         return !testCase.getTestCaseInfo().throws() || config.allowThrows();
     }
 
-    bool matchTest( TestCaseHandle const& testCase, TestSpec const& testSpec, IConfig const& config ) {
-        return testSpec.matches( testCase.getTestCaseInfo() ) && isThrowSafe( testCase, config );
-    }
-
-    void
-    enforceNoDuplicateTestCases( std::vector<TestCaseHandle> const& tests ) {
-        auto testInfoCmp = []( TestCaseInfo const* lhs,
-                               TestCaseInfo const* rhs ) {
-            return *lhs < *rhs;
-        };
-        std::set<TestCaseInfo const*, decltype(testInfoCmp) &> seenTests(testInfoCmp);
-        for ( auto const& test : tests ) {
-            const auto infoPtr = &test.getTestCaseInfo();
-            const auto prev = seenTests.insert( infoPtr );
-            CATCH_ENFORCE(
-                prev.second,
-                "error: test case \"" << infoPtr->name << "\", with tags \""
-                    << infoPtr->tagsAsString() << "\" already defined.\n"
-                    << "\tFirst seen at " << ( *prev.first )->lineInfo << "\n"
-                    << "\tRedefined at " << infoPtr->lineInfo );
-        }
-    }
-
     std::vector<TestCaseHandle> filterTests( std::vector<TestCaseHandle> const& testCases, TestSpec const& testSpec, IConfig const& config ) {
         std::vector<TestCaseHandle> filtered;
         filtered.reserve( testCases.size() );
@@ -6149,13 +6606,6 @@ namespace Catch {
         return m_sortedFunctions;
     }
 
-
-
-    ///////////////////////////////////////////////////////////////////////////
-    void TestInvokerAsFunction::invoke() const {
-        m_testAsFunction();
-    }
-
 } // end namespace Catch
 
 
@@ -6401,6 +6851,14 @@ namespace Catch {
 #endif
     }
 
+    void throw_test_skip_exception() {
+#if !defined( CATCH_CONFIG_DISABLE_EXCEPTIONS )
+        throw Catch::TestSkipException();
+#else
+        CATCH_ERROR( "Explicitly skipping tests during runtime requires exceptions" );
+#endif
+    }
+
 } // namespace Catch
 
 
@@ -6409,9 +6867,10 @@ namespace Catch {
 #include <iterator>
 
 namespace Catch {
+    ITestInvoker::~ITestInvoker() = default;
 
     namespace {
-        StringRef extractClassName( StringRef classOrMethodName ) {
+        static StringRef extractClassName( StringRef classOrMethodName ) {
             if ( !startsWith( classOrMethodName, '&' ) ) {
                 return classOrMethodName;
             }
@@ -6438,6 +6897,18 @@ namespace Catch {
                 static_cast<std::size_t>( startIdx ),
                 static_cast<std::size_t>( classNameSize ) );
         }
+
+        class TestInvokerAsFunction final : public ITestInvoker {
+            using TestType = void ( * )();
+            TestType m_testAsFunction;
+
+        public:
+            TestInvokerAsFunction( TestType testAsFunction ) noexcept:
+                m_testAsFunction( testAsFunction ) {}
+
+            void invoke() const override { m_testAsFunction(); }
+        };
+
     } // namespace
 
     Detail::unique_ptr<ITestInvoker> makeTestInvoker( void(*testAsFunction)() ) {
@@ -6919,23 +7390,36 @@ namespace Catch {
             return os;
         }
 
-        Columns Column::operator+( Column const& other ) {
+        Columns operator+(Column const& lhs, Column const& rhs) {
             Columns cols;
-            cols += *this;
-            cols += other;
+            cols += lhs;
+            cols += rhs;
             return cols;
         }
-
-        Columns& Columns::operator+=( Column const& col ) {
-            m_columns.push_back( col );
-            return *this;
+        Columns operator+(Column&& lhs, Column&& rhs) {
+            Columns cols;
+            cols += CATCH_MOVE( lhs );
+            cols += CATCH_MOVE( rhs );
+            return cols;
         }
 
-        Columns Columns::operator+( Column const& col ) {
-            Columns combined = *this;
-            combined += col;
+        Columns& operator+=(Columns& lhs, Column const& rhs) {
+            lhs.m_columns.push_back( rhs );
+            return lhs;
+        }
+        Columns& operator+=(Columns& lhs, Column&& rhs) {
+            lhs.m_columns.push_back( CATCH_MOVE(rhs) );
+            return lhs;
+        }
+        Columns operator+( Columns const& lhs, Column const& rhs ) {
+            auto combined( lhs );
+            combined += rhs;
             return combined;
         }
+        Columns operator+( Columns&& lhs, Column&& rhs ) {
+            lhs += CATCH_MOVE( rhs );
+            return CATCH_MOVE( lhs );
+        }
 
     } // namespace TextFlow
 } // namespace Catch
@@ -7431,26 +7915,11 @@ namespace {
         return ulpDist <= maxUlpDiff;
     }
 
-#if defined(CATCH_CONFIG_GLOBAL_NEXTAFTER)
-
-    float nextafter(float x, float y) {
-        return ::nextafterf(x, y);
-    }
-
-    double nextafter(double x, double y) {
-        return ::nextafter(x, y);
-    }
-
-#endif // ^^^ CATCH_CONFIG_GLOBAL_NEXTAFTER ^^^
 
 template <typename FP>
 FP step(FP start, FP direction, uint64_t steps) {
     for (uint64_t i = 0; i < steps; ++i) {
-#if defined(CATCH_CONFIG_GLOBAL_NEXTAFTER)
         start = Catch::nextafter(start, direction);
-#else
-        start = std::nextafter(start, direction);
-#endif
     }
     return start;
 }
@@ -7824,7 +8293,7 @@ namespace Catch {
 
 namespace Catch {
 
-    AutomakeReporter::~AutomakeReporter() {}
+    AutomakeReporter::~AutomakeReporter() = default;
 
     void AutomakeReporter::testCaseEnded(TestCaseStats const& _testCaseStats) {
         // Possible values to emit are PASS, XFAIL, SKIP, FAIL, XPASS and ERROR.
@@ -8046,7 +8515,7 @@ class AssertionPrinter {
             return;
 
         const auto itEnd = messages.cend();
-        const auto N = static_cast<std::size_t>(std::distance(itMessage, itEnd));
+        const auto N = static_cast<std::size_t>(itEnd - itMessage);
 
         stream << colourImpl->guardColour( colour ) << " with "
                << pluralise( N, "message"_sr ) << ':';
@@ -8124,7 +8593,7 @@ class AssertionPrinter {
             StreamingReporterBase::testRunEnded( _testRunStats );
         }
 
-        CompactReporter::~CompactReporter() {}
+        CompactReporter::~CompactReporter() = default;
 
 } // end namespace Catch
 
@@ -8319,15 +8788,9 @@ findMax( std::size_t& i, std::size_t& j, std::size_t& k, std::size_t& l ) {
         return l;
 }
 
-enum class Justification { Left, Right };
-
-struct ColumnInfo {
-    std::string name;
-    std::size_t width;
-    Justification justification;
-};
 struct ColumnBreak {};
 struct RowBreak {};
+struct OutputFlush {};
 
 class Duration {
     enum class Unit {
@@ -8402,6 +8865,14 @@ class Duration {
 };
 } // end anon namespace
 
+enum class Justification { Left, Right };
+
+struct ColumnInfo {
+    std::string name;
+    std::size_t width;
+    Justification justification;
+};
+
 class TablePrinter {
     std::ostream& m_os;
     std::vector<ColumnInfo> m_columnInfos;
@@ -8424,11 +8895,10 @@ class TablePrinter {
             *this << RowBreak();
 
 			TextFlow::Columns headerCols;
-			auto spacer = TextFlow::Spacer(2);
 			for (auto const& info : m_columnInfos) {
                 assert(info.width > 2);
 				headerCols += TextFlow::Column(info.name).width(info.width - 2);
-				headerCols += spacer;
+                headerCols += TextFlow::Spacer( 2 );
 			}
 			m_os << headerCols << '\n';
 
@@ -8444,12 +8914,12 @@ class TablePrinter {
     }
 
     template<typename T>
-    friend TablePrinter& operator << (TablePrinter& tp, T const& value) {
+    friend TablePrinter& operator<< (TablePrinter& tp, T const& value) {
         tp.m_oss << value;
         return tp;
     }
 
-    friend TablePrinter& operator << (TablePrinter& tp, ColumnBreak) {
+    friend TablePrinter& operator<< (TablePrinter& tp, ColumnBreak) {
         auto colStr = tp.m_oss.str();
         const auto strSize = colStr.size();
         tp.m_oss.str("");
@@ -8471,13 +8941,18 @@ class TablePrinter {
         return tp;
     }
 
-    friend TablePrinter& operator << (TablePrinter& tp, RowBreak) {
+    friend TablePrinter& operator<< (TablePrinter& tp, RowBreak) {
         if (tp.m_currentColumn > 0) {
             tp.m_os << '\n';
             tp.m_currentColumn = -1;
         }
         return tp;
     }
+
+    friend TablePrinter& operator<<(TablePrinter& tp, OutputFlush) {
+        tp.m_os << std::flush;
+        return tp;
+    }
 };
 
 ConsoleReporter::ConsoleReporter(ReporterConfig&& config):
@@ -8499,7 +8974,7 @@ ConsoleReporter::ConsoleReporter(ReporterConfig&& config):
                 { "benchmark name", CATCH_CONFIG_CONSOLE_WIDTH - 43, Justification::Left },
                 { "samples      mean       std dev", 14, Justification::Right },
                 { "iterations   low mean   low std dev", 14, Justification::Right },
-                { "estimated    high mean  high std dev", 14, Justification::Right }
+                { "est run time high mean  high std dev", 14, Justification::Right }
             };
         }
     }())) {}
@@ -8583,8 +9058,11 @@ void ConsoleReporter::benchmarkPreparing( StringRef name ) {
 void ConsoleReporter::benchmarkStarting(BenchmarkInfo const& info) {
     (*m_tablePrinter) << info.samples << ColumnBreak()
         << info.iterations << ColumnBreak();
-    if (!m_config->benchmarkNoAnalysis())
-        (*m_tablePrinter) << Duration(info.estimatedDuration) << ColumnBreak();
+    if ( !m_config->benchmarkNoAnalysis() ) {
+        ( *m_tablePrinter )
+            << Duration( info.estimatedDuration ) << ColumnBreak();
+    }
+    ( *m_tablePrinter ) << OutputFlush{};
 }
 void ConsoleReporter::benchmarkEnded(BenchmarkStats<> const& stats) {
     if (m_config->benchmarkNoAnalysis())
@@ -9280,6 +9758,366 @@ namespace Catch {
 } // namespace Catch
 
 
+//
+
+namespace Catch {
+    namespace {
+        void writeSourceInfo( JsonObjectWriter& writer,
+                              SourceLineInfo const& sourceInfo ) {
+            auto source_location_writer =
+                writer.write( "source-location"_sr ).writeObject();
+            source_location_writer.write( "filename"_sr )
+                .write( sourceInfo.file );
+            source_location_writer.write( "line"_sr ).write( sourceInfo.line );
+        }
+
+        void writeTags( JsonArrayWriter writer, std::vector<Tag> const& tags ) {
+            for ( auto const& tag : tags ) {
+                writer.write( tag.original );
+            }
+        }
+
+        void writeProperties( JsonArrayWriter writer,
+                              TestCaseInfo const& info ) {
+            if ( info.isHidden() ) { writer.write( "is-hidden"_sr ); }
+            if ( info.okToFail() ) { writer.write( "ok-to-fail"_sr ); }
+            if ( info.expectedToFail() ) {
+                writer.write( "expected-to-fail"_sr );
+            }
+            if ( info.throws() ) { writer.write( "throws"_sr ); }
+        }
+
+    } // namespace
+
+    JsonReporter::JsonReporter( ReporterConfig&& config ):
+        StreamingReporterBase{ CATCH_MOVE( config ) } {
+
+        m_preferences.shouldRedirectStdOut = true;
+        // TBD: Do we want to report all assertions? XML reporter does
+        //      not, but for machine-parseable reporters I think the answer
+        //      should be yes.
+        m_preferences.shouldReportAllAssertions = true;
+
+        m_objectWriters.emplace( m_stream );
+        m_writers.emplace( Writer::Object );
+        auto& writer = m_objectWriters.top();
+
+        writer.write( "version"_sr ).write( 1 );
+
+        {
+            auto metadata_writer = writer.write( "metadata"_sr ).writeObject();
+            metadata_writer.write( "name"_sr ).write( m_config->name() );
+            metadata_writer.write( "rng-seed"_sr ).write( m_config->rngSeed() );
+            metadata_writer.write( "catch2-version"_sr )
+                .write( libraryVersion() );
+            if ( m_config->testSpec().hasFilters() ) {
+                metadata_writer.write( "filters"_sr )
+                    .write( m_config->testSpec() );
+            }
+        }
+    }
+
+    JsonReporter::~JsonReporter() {
+        endListing();
+        // TODO: Ensure this closes the top level object, add asserts
+        assert( m_writers.size() == 1 && "Only the top level object should be open" );
+        assert( m_writers.top() == Writer::Object );
+        endObject();
+        m_stream << '\n' << std::flush;
+        assert( m_writers.empty() );
+    }
+
+    JsonArrayWriter& JsonReporter::startArray() {
+        m_arrayWriters.emplace( m_arrayWriters.top().writeArray() );
+        m_writers.emplace( Writer::Array );
+        return m_arrayWriters.top();
+    }
+    JsonArrayWriter& JsonReporter::startArray( StringRef key ) {
+        m_arrayWriters.emplace(
+            m_objectWriters.top().write( key ).writeArray() );
+        m_writers.emplace( Writer::Array );
+        return m_arrayWriters.top();
+    }
+
+    JsonObjectWriter& JsonReporter::startObject() {
+        m_objectWriters.emplace( m_arrayWriters.top().writeObject() );
+        m_writers.emplace( Writer::Object );
+        return m_objectWriters.top();
+    }
+    JsonObjectWriter& JsonReporter::startObject( StringRef key ) {
+        m_objectWriters.emplace(
+            m_objectWriters.top().write( key ).writeObject() );
+        m_writers.emplace( Writer::Object );
+        return m_objectWriters.top();
+    }
+
+    void JsonReporter::endObject() {
+        assert( isInside( Writer::Object ) );
+        m_objectWriters.pop();
+        m_writers.pop();
+    }
+    void JsonReporter::endArray() {
+        assert( isInside( Writer::Array ) );
+        m_arrayWriters.pop();
+        m_writers.pop();
+    }
+
+    bool JsonReporter::isInside( Writer writer ) {
+        return !m_writers.empty() && m_writers.top() == writer;
+    }
+
+    void JsonReporter::startListing() {
+        if ( !m_startedListing ) { startObject( "listings"_sr ); }
+        m_startedListing = true;
+    }
+    void JsonReporter::endListing() {
+        if ( m_startedListing ) { endObject(); }
+        m_startedListing = false;
+    }
+
+    std::string JsonReporter::getDescription() {
+        return "Outputs listings as JSON. Test listing is Work-in-Progress!";
+    }
+
+    void JsonReporter::testRunStarting( TestRunInfo const& testInfo ) {
+        StreamingReporterBase::testRunStarting( testInfo );
+        endListing();
+
+        assert( isInside( Writer::Object ) );
+        startObject( "test-run"_sr );
+        startArray( "test-cases"_sr );
+    }
+
+     static void writeCounts( JsonObjectWriter&& writer, Counts const& counts ) {
+        writer.write( "passed"_sr ).write( counts.passed );
+        writer.write( "failed"_sr ).write( counts.failed );
+        writer.write( "fail-but-ok"_sr ).write( counts.failedButOk );
+        writer.write( "skipped"_sr ).write( counts.skipped );
+    }
+
+    void JsonReporter::testRunEnded(TestRunStats const& runStats) {
+        assert( isInside( Writer::Array ) );
+        // End "test-cases"
+        endArray();
+
+        {
+            auto totals =
+                m_objectWriters.top().write( "totals"_sr ).writeObject();
+            writeCounts( totals.write( "assertions"_sr ).writeObject(),
+                         runStats.totals.assertions );
+            writeCounts( totals.write( "test-cases"_sr ).writeObject(),
+                         runStats.totals.testCases );
+        }
+
+        // End the "test-run" object
+        endObject();
+    }
+
+    void JsonReporter::testCaseStarting( TestCaseInfo const& tcInfo ) {
+        StreamingReporterBase::testCaseStarting( tcInfo );
+
+        assert( isInside( Writer::Array ) &&
+                "We should be in the 'test-cases' array" );
+        startObject();
+        // "test-info" prelude
+        {
+            auto testInfo =
+                m_objectWriters.top().write( "test-info"_sr ).writeObject();
+            // TODO: handle testName vs className!!
+            testInfo.write( "name"_sr ).write( tcInfo.name );
+            writeSourceInfo(testInfo, tcInfo.lineInfo);
+            writeTags( testInfo.write( "tags"_sr ).writeArray(), tcInfo.tags );
+            writeProperties( testInfo.write( "properties"_sr ).writeArray(),
+                             tcInfo );
+        }
+
+
+        // Start the array for individual test runs (testCasePartial pairs)
+        startArray( "runs"_sr );
+    }
+
+    void JsonReporter::testCaseEnded( TestCaseStats const& tcStats ) {
+        StreamingReporterBase::testCaseEnded( tcStats );
+
+        // We need to close the 'runs' array before finishing the test case
+        assert( isInside( Writer::Array ) );
+        endArray();
+
+        {
+            auto totals =
+                m_objectWriters.top().write( "totals"_sr ).writeObject();
+            writeCounts( totals.write( "assertions"_sr ).writeObject(),
+                         tcStats.totals.assertions );
+            // We do not write the test case totals, because there will always be just one test case here.
+            // TODO: overall "result" -> success, skip, fail here? Or in partial result?
+        }
+        // We do not write out stderr/stdout, because we instead wrote those out in partial runs
+
+        // TODO: aborting?
+
+        // And we also close this test case's object
+        assert( isInside( Writer::Object ) );
+        endObject();
+    }
+
+    void JsonReporter::testCasePartialStarting( TestCaseInfo const& /*tcInfo*/,
+                                                uint64_t index ) {
+        startObject();
+        m_objectWriters.top().write( "run-idx"_sr ).write( index );
+        startArray( "path"_sr );
+        // TODO: we want to delay most of the printing to the 'root' section
+        // TODO: childSection key name?
+    }
+
+    void JsonReporter::testCasePartialEnded( TestCaseStats const& tcStats,
+                                             uint64_t /*index*/ ) {
+        // Fixme: the top level section handles this.
+        //// path object
+        endArray();
+        if ( !tcStats.stdOut.empty() ) {
+            m_objectWriters.top()
+                .write( "captured-stdout"_sr )
+                .write( tcStats.stdOut );
+        }
+        if ( !tcStats.stdErr.empty() ) {
+            m_objectWriters.top()
+                .write( "captured-stderr"_sr )
+                .write( tcStats.stdErr );
+        }
+        {
+            auto totals =
+                m_objectWriters.top().write( "totals"_sr ).writeObject();
+            writeCounts( totals.write( "assertions"_sr ).writeObject(),
+                         tcStats.totals.assertions );
+            // We do not write the test case totals, because there will
+            // always be just one test case here.
+            // TODO: overall "result" -> success, skip, fail here? Or in
+            // partial result?
+        }
+        // TODO: aborting?
+        // run object
+        endObject();
+    }
+
+    void JsonReporter::sectionStarting( SectionInfo const& sectionInfo ) {
+        assert( isInside( Writer::Array ) &&
+                "Section should always start inside an object" );
+        // We want to nest top level sections, even though it shares name
+        // and source loc with the TEST_CASE
+        auto& sectionObject = startObject();
+        sectionObject.write( "kind"_sr ).write( "section"_sr );
+        sectionObject.write( "name"_sr ).write( sectionInfo.name );
+        writeSourceInfo( m_objectWriters.top(), sectionInfo.lineInfo );
+
+
+        // TBD: Do we want to create this event lazily? It would become
+        //      rather complex, but we could do it, and it would look
+        //      better for empty sections. OTOH, empty sections should
+        //      be rare.
+        startArray( "path"_sr );
+    }
+    void JsonReporter::sectionEnded( SectionStats const& /*sectionStats */) {
+        // End the subpath array
+        endArray();
+        // TODO: metadata
+        // TODO: what info do we have here?
+
+        // End the section object
+        endObject();
+    }
+
+    void JsonReporter::assertionStarting( AssertionInfo const& /*assertionInfo*/ ) {}
+    void JsonReporter::assertionEnded( AssertionStats const& assertionStats ) {
+        // TODO: There is lot of different things to handle here, but
+        //       we can fill it in later, after we show that the basic
+        //       outline and streaming reporter impl works well enough.
+        //if ( !m_config->includeSuccessfulResults()
+        //    && assertionStats.assertionResult.isOk() ) {
+        //    return;
+        //}
+        assert( isInside( Writer::Array ) );
+        auto assertionObject = m_arrayWriters.top().writeObject();
+
+        assertionObject.write( "kind"_sr ).write( "assertion"_sr );
+        writeSourceInfo( assertionObject,
+                         assertionStats.assertionResult.getSourceInfo() );
+        assertionObject.write( "status"_sr )
+            .write( assertionStats.assertionResult.isOk() );
+        // TODO: handling of result.
+        // TODO: messages
+        // TODO: totals?
+    }
+
+
+    void JsonReporter::benchmarkPreparing( StringRef name ) { (void)name; }
+    void JsonReporter::benchmarkStarting( BenchmarkInfo const& ) {}
+    void JsonReporter::benchmarkEnded( BenchmarkStats<> const& ) {}
+    void JsonReporter::benchmarkFailed( StringRef error ) { (void)error; }
+
+    void JsonReporter::listReporters(
+        std::vector<ReporterDescription> const& descriptions ) {
+        startListing();
+
+        auto writer =
+            m_objectWriters.top().write( "reporters"_sr ).writeArray();
+        for ( auto const& desc : descriptions ) {
+            auto desc_writer = writer.writeObject();
+            desc_writer.write( "name"_sr ).write( desc.name );
+            desc_writer.write( "description"_sr ).write( desc.description );
+        }
+    }
+    void JsonReporter::listListeners(
+        std::vector<ListenerDescription> const& descriptions ) {
+        startListing();
+
+        auto writer =
+            m_objectWriters.top().write( "listeners"_sr ).writeArray();
+
+        for ( auto const& desc : descriptions ) {
+            auto desc_writer = writer.writeObject();
+            desc_writer.write( "name"_sr ).write( desc.name );
+            desc_writer.write( "description"_sr ).write( desc.description );
+        }
+    }
+    void JsonReporter::listTests( std::vector<TestCaseHandle> const& tests ) {
+        startListing();
+
+        auto writer = m_objectWriters.top().write( "tests"_sr ).writeArray();
+
+        for ( auto const& test : tests ) {
+            auto desc_writer = writer.writeObject();
+            auto const& info = test.getTestCaseInfo();
+
+            desc_writer.write( "name"_sr ).write( info.name );
+            desc_writer.write( "class-name"_sr ).write( info.className );
+            {
+                auto tag_writer = desc_writer.write( "tags"_sr ).writeArray();
+                for ( auto const& tag : info.tags ) {
+                    tag_writer.write( tag.original );
+                }
+            }
+            writeSourceInfo( desc_writer, info.lineInfo );
+        }
+    }
+    void JsonReporter::listTags( std::vector<TagInfo> const& tags ) {
+        startListing();
+
+        auto writer = m_objectWriters.top().write( "tags"_sr ).writeArray();
+        for ( auto const& tag : tags ) {
+            auto tag_writer = writer.writeObject();
+            {
+                auto aliases_writer =
+                    tag_writer.write( "aliases"_sr ).writeArray();
+                for ( auto alias : tag.spellings ) {
+                    aliases_writer.write( alias );
+                }
+            }
+            tag_writer.write( "count"_sr ).write( tag.count );
+        }
+    }
+} // namespace Catch
+
+
 
 
 #include <cassert>
@@ -9299,6 +10137,8 @@ namespace Catch {
             gmtime_s(&timeInfo, &rawtime);
 #elif defined (CATCH_PLATFORM_PLAYSTATION)
             gmtime_s(&rawtime, &timeInfo);
+#elif defined (__IAR_SYSTEMS_ICC__)
+            timeInfo = *std::gmtime(&rawtime);
 #else
             gmtime_r(&rawtime, &timeInfo);
 #endif
@@ -9559,7 +10399,7 @@ namespace Catch {
                 }
             }
 
-            if( !result.getMessage().empty() )
+            if( result.hasMessage() )
                 rss << result.getMessage() << '\n';
             for( auto const& msg : stats.infoMessages )
                 if( msg.type == ResultWas::Info )
@@ -9678,7 +10518,6 @@ namespace Catch {
         }
     }
 
-    // The return value indicates if the messages buffer should be cleared:
     void MultiReporter::assertionEnded( AssertionStats const& assertionStats ) {
         const bool reportByDefault =
             assertionStats.assertionResult.getResultType() != ResultWas::Ok ||
@@ -9781,6 +10620,11 @@ namespace Catch {
             }
         }
 
+        void registerListenerImpl( Detail::unique_ptr<EventListenerFactory> listenerFactory ) {
+            getMutableRegistryHub().registerListener( CATCH_MOVE(listenerFactory) );
+        }
+
+
     } // namespace Detail
 } // namespace Catch
 
@@ -9920,7 +10764,7 @@ namespace Catch {
                 }
             }
 
-            if (!result.getMessage().empty())
+            if (result.hasMessage())
                 textRss << result.getMessage() << '\n';
 
             for (auto const& msg : stats.infoMessages)
@@ -9954,7 +10798,6 @@ namespace Catch {
 
 
 #include <algorithm>
-#include <iterator>
 #include <ostream>
 
 namespace Catch {
@@ -10105,7 +10948,7 @@ namespace Catch {
 
                 // using messages.end() directly (or auto) yields compilation error:
                 std::vector<MessageInfo>::const_iterator itEnd = messages.end();
-                const std::size_t N = static_cast<std::size_t>(std::distance(itMessage, itEnd));
+                const std::size_t N = static_cast<std::size_t>(itEnd - itMessage);
 
                 stream << colourImpl->guardColour( colour ) << " with "
                        << pluralise( N, "message"_sr ) << ':';
@@ -10203,7 +11046,7 @@ namespace Catch {
     } // end anonymous namespace
 
 
-    TeamCityReporter::~TeamCityReporter() {}
+    TeamCityReporter::~TeamCityReporter() = default;
 
     void TeamCityReporter::testRunStarting( TestRunInfo const& runInfo ) {
         m_stream << "##teamcity[testSuiteStarted name='" << escape( runInfo.name )
@@ -10377,7 +11220,7 @@ namespace Catch {
         m_xml.startElement("Catch2TestRun")
              .writeAttribute("name"_sr, m_config->name())
              .writeAttribute("rng-seed"_sr, m_config->rngSeed())
-             .writeAttribute("xml-format-version"_sr, 2)
+             .writeAttribute("xml-format-version"_sr, 3)
              .writeAttribute("catch2-version"_sr, libraryVersion());
         if ( m_config->testSpec().hasFilters() ) {
             m_xml.writeAttribute( "filters"_sr, m_config->testSpec() );
@@ -10419,11 +11262,13 @@ namespace Catch {
             // Print any info messages in <Info> tags.
             for( auto const& msg : assertionStats.infoMessages ) {
                 if( msg.type == ResultWas::Info && includeResults ) {
-                    m_xml.scopedElement( "Info" )
-                            .writeText( msg.message );
+                    auto t = m_xml.scopedElement( "Info" );
+                    writeSourceInfo( msg.lineInfo );
+                    t.writeText( msg.message );
                 } else if ( msg.type == ResultWas::Warning ) {
-                    m_xml.scopedElement( "Warning" )
-                            .writeText( msg.message );
+                    auto t = m_xml.scopedElement( "Warning" );
+                    writeSourceInfo( msg.lineInfo );
+                    t.writeText( msg.message );
                 }
             }
         }
@@ -10553,26 +11398,23 @@ namespace Catch {
     }
 
     void XmlReporter::benchmarkEnded(BenchmarkStats<> const& benchmarkStats) {
-        m_xml.startElement("mean")
+        m_xml.scopedElement("mean")
             .writeAttribute("value"_sr, benchmarkStats.mean.point.count())
             .writeAttribute("lowerBound"_sr, benchmarkStats.mean.lower_bound.count())
             .writeAttribute("upperBound"_sr, benchmarkStats.mean.upper_bound.count())
             .writeAttribute("ci"_sr, benchmarkStats.mean.confidence_interval);
-        m_xml.endElement();
-        m_xml.startElement("standardDeviation")
+        m_xml.scopedElement("standardDeviation")
             .writeAttribute("value"_sr, benchmarkStats.standardDeviation.point.count())
             .writeAttribute("lowerBound"_sr, benchmarkStats.standardDeviation.lower_bound.count())
             .writeAttribute("upperBound"_sr, benchmarkStats.standardDeviation.upper_bound.count())
             .writeAttribute("ci"_sr, benchmarkStats.standardDeviation.confidence_interval);
-        m_xml.endElement();
-        m_xml.startElement("outliers")
+        m_xml.scopedElement("outliers")
             .writeAttribute("variance"_sr, benchmarkStats.outlierVariance)
             .writeAttribute("lowMild"_sr, benchmarkStats.outliers.low_mild)
             .writeAttribute("lowSevere"_sr, benchmarkStats.outliers.low_severe)
             .writeAttribute("highMild"_sr, benchmarkStats.outliers.high_mild)
             .writeAttribute("highSevere"_sr, benchmarkStats.outliers.high_severe);
         m_xml.endElement();
-        m_xml.endElement();
     }
 
     void XmlReporter::benchmarkFailed(StringRef error) {
diff --git a/external_imported/Catch2/extras/catch_amalgamated.hpp b/external_imported/Catch2/extras/catch_amalgamated.hpp
index 321cec5da..fdba759a7 100644
--- a/external_imported/Catch2/extras/catch_amalgamated.hpp
+++ b/external_imported/Catch2/extras/catch_amalgamated.hpp
@@ -1,3 +1,4 @@
+
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
 //   (See accompanying file LICENSE.txt or copy at
@@ -5,8 +6,8 @@
 
 // SPDX-License-Identifier: BSL-1.0
 
-//  Catch v3.3.2
-//  Generated: 2023-02-26 10:28:46.785908
+//  Catch v3.5.2
+//  Generated: 2024-01-15 14:06:34.036475
 //  ----------------------------------------------------------
 //  This file is an amalgamation of multiple different files.
 //  You probably shouldn't edit it directly.
@@ -59,238 +60,6 @@
 
 
 
-#ifndef CATCH_INTERFACES_CONFIG_HPP_INCLUDED
-#define CATCH_INTERFACES_CONFIG_HPP_INCLUDED
-
-
-
-#ifndef CATCH_NONCOPYABLE_HPP_INCLUDED
-#define CATCH_NONCOPYABLE_HPP_INCLUDED
-
-namespace Catch {
-    namespace Detail {
-
-        //! Deriving classes become noncopyable and nonmovable
-        class NonCopyable {
-            NonCopyable( NonCopyable const& ) = delete;
-            NonCopyable( NonCopyable&& ) = delete;
-            NonCopyable& operator=( NonCopyable const& ) = delete;
-            NonCopyable& operator=( NonCopyable&& ) = delete;
-
-        protected:
-            NonCopyable() noexcept = default;
-        };
-
-    } // namespace Detail
-} // namespace Catch
-
-#endif // CATCH_NONCOPYABLE_HPP_INCLUDED
-
-
-#ifndef CATCH_STRINGREF_HPP_INCLUDED
-#define CATCH_STRINGREF_HPP_INCLUDED
-
-#include <cstddef>
-#include <string>
-#include <iosfwd>
-#include <cassert>
-
-#include <cstring>
-
-namespace Catch {
-
-    /// A non-owning string class (similar to the forthcoming std::string_view)
-    /// Note that, because a StringRef may be a substring of another string,
-    /// it may not be null terminated.
-    class StringRef {
-    public:
-        using size_type = std::size_t;
-        using const_iterator = const char*;
-
-    private:
-        static constexpr char const* const s_empty = "";
-
-        char const* m_start = s_empty;
-        size_type m_size = 0;
-
-    public: // construction
-        constexpr StringRef() noexcept = default;
-
-        StringRef( char const* rawChars ) noexcept;
-
-        constexpr StringRef( char const* rawChars, size_type size ) noexcept
-        :   m_start( rawChars ),
-            m_size( size )
-        {}
-
-        StringRef( std::string const& stdString ) noexcept
-        :   m_start( stdString.c_str() ),
-            m_size( stdString.size() )
-        {}
-
-        explicit operator std::string() const {
-            return std::string(m_start, m_size);
-        }
-
-    public: // operators
-        auto operator == ( StringRef other ) const noexcept -> bool {
-            return m_size == other.m_size
-                && (std::memcmp( m_start, other.m_start, m_size ) == 0);
-        }
-        auto operator != (StringRef other) const noexcept -> bool {
-            return !(*this == other);
-        }
-
-        constexpr auto operator[] ( size_type index ) const noexcept -> char {
-            assert(index < m_size);
-            return m_start[index];
-        }
-
-        bool operator<(StringRef rhs) const noexcept;
-
-    public: // named queries
-        constexpr auto empty() const noexcept -> bool {
-            return m_size == 0;
-        }
-        constexpr auto size() const noexcept -> size_type {
-            return m_size;
-        }
-
-        // Returns a substring of [start, start + length).
-        // If start + length > size(), then the substring is [start, start + size()).
-        // If start > size(), then the substring is empty.
-        constexpr StringRef substr(size_type start, size_type length) const noexcept {
-            if (start < m_size) {
-                const auto shortened_size = m_size - start;
-                return StringRef(m_start + start, (shortened_size < length) ? shortened_size : length);
-            } else {
-                return StringRef();
-            }
-        }
-
-        // Returns the current start pointer. May not be null-terminated.
-        constexpr char const* data() const noexcept {
-            return m_start;
-        }
-
-        constexpr const_iterator begin() const { return m_start; }
-        constexpr const_iterator end() const { return m_start + m_size; }
-
-
-        friend std::string& operator += (std::string& lhs, StringRef sr);
-        friend std::ostream& operator << (std::ostream& os, StringRef sr);
-        friend std::string operator+(StringRef lhs, StringRef rhs);
-
-        /**
-         * Provides a three-way comparison with rhs
-         *
-         * Returns negative number if lhs < rhs, 0 if lhs == rhs, and a positive
-         * number if lhs > rhs
-         */
-        int compare( StringRef rhs ) const;
-    };
-
-
-    constexpr auto operator ""_sr( char const* rawChars, std::size_t size ) noexcept -> StringRef {
-        return StringRef( rawChars, size );
-    }
-} // namespace Catch
-
-constexpr auto operator ""_catch_sr( char const* rawChars, std::size_t size ) noexcept -> Catch::StringRef {
-    return Catch::StringRef( rawChars, size );
-}
-
-#endif // CATCH_STRINGREF_HPP_INCLUDED
-
-#include <chrono>
-#include <iosfwd>
-#include <string>
-#include <vector>
-
-namespace Catch {
-
-    enum class Verbosity {
-        Quiet = 0,
-        Normal,
-        High
-    };
-
-    struct WarnAbout { enum What {
-        Nothing = 0x00,
-        //! A test case or leaf section did not run any assertions
-        NoAssertions = 0x01,
-        //! A command line test spec matched no test cases
-        UnmatchedTestSpec = 0x02,
-    }; };
-
-    enum class ShowDurations {
-        DefaultForReporter,
-        Always,
-        Never
-    };
-    enum class TestRunOrder {
-        Declared,
-        LexicographicallySorted,
-        Randomized
-    };
-    enum class ColourMode : std::uint8_t {
-        //! Let Catch2 pick implementation based on platform detection
-        PlatformDefault,
-        //! Use ANSI colour code escapes
-        ANSI,
-        //! Use Win32 console colour API
-        Win32,
-        //! Don't use any colour
-        None
-    };
-    struct WaitForKeypress { enum When {
-        Never,
-        BeforeStart = 1,
-        BeforeExit = 2,
-        BeforeStartAndExit = BeforeStart | BeforeExit
-    }; };
-
-    class TestSpec;
-    class IStream;
-
-    class IConfig : public Detail::NonCopyable {
-    public:
-        virtual ~IConfig();
-
-        virtual bool allowThrows() const = 0;
-        virtual StringRef name() const = 0;
-        virtual bool includeSuccessfulResults() const = 0;
-        virtual bool shouldDebugBreak() const = 0;
-        virtual bool warnAboutMissingAssertions() const = 0;
-        virtual bool warnAboutUnmatchedTestSpecs() const = 0;
-        virtual bool zeroTestsCountAsSuccess() const = 0;
-        virtual int abortAfter() const = 0;
-        virtual bool showInvisibles() const = 0;
-        virtual ShowDurations showDurations() const = 0;
-        virtual double minDuration() const = 0;
-        virtual TestSpec const& testSpec() const = 0;
-        virtual bool hasTestFilters() const = 0;
-        virtual std::vector<std::string> const& getTestsOrTags() const = 0;
-        virtual TestRunOrder runOrder() const = 0;
-        virtual uint32_t rngSeed() const = 0;
-        virtual unsigned int shardCount() const = 0;
-        virtual unsigned int shardIndex() const = 0;
-        virtual ColourMode defaultColourMode() const = 0;
-        virtual std::vector<std::string> const& getSectionsToRun() const = 0;
-        virtual Verbosity verbosity() const = 0;
-
-        virtual bool skipBenchmarks() const = 0;
-        virtual bool benchmarkNoAnalysis() const = 0;
-        virtual unsigned int benchmarkSamples() const = 0;
-        virtual double benchmarkConfidenceInterval() const = 0;
-        virtual unsigned int benchmarkResamples() const = 0;
-        virtual std::chrono::milliseconds benchmarkWarmupTime() const = 0;
-    };
-}
-
-#endif // CATCH_INTERFACES_CONFIG_HPP_INCLUDED
-
-
 #ifndef CATCH_COMPILER_CAPABILITIES_HPP_INCLUDED
 #define CATCH_COMPILER_CAPABILITIES_HPP_INCLUDED
 
@@ -366,12 +135,18 @@ namespace Catch {
 #    define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
          _Pragma( "GCC diagnostic ignored \"-Wparentheses\"" )
 
+#    define CATCH_INTERNAL_SUPPRESS_UNUSED_RESULT \
+         _Pragma( "GCC diagnostic ignored \"-Wunused-result\"" )
+
 #    define CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS \
          _Pragma( "GCC diagnostic ignored \"-Wunused-variable\"" )
 
 #    define CATCH_INTERNAL_SUPPRESS_USELESS_CAST_WARNINGS \
          _Pragma( "GCC diagnostic ignored \"-Wuseless-cast\"" )
 
+#    define CATCH_INTERNAL_SUPPRESS_SHADOW_WARNINGS \
+         _Pragma( "GCC diagnostic ignored \"-Wshadow\"" )
+
 #    define CATCH_INTERNAL_IGNORE_BUT_WARN(...) (void)__builtin_constant_p(__VA_ARGS__)
 
 #endif
@@ -444,6 +219,9 @@ namespace Catch {
 #    define CATCH_INTERNAL_SUPPRESS_COMMA_WARNINGS \
         _Pragma( "clang diagnostic ignored \"-Wcomma\"" )
 
+#    define CATCH_INTERNAL_SUPPRESS_SHADOW_WARNINGS \
+        _Pragma( "clang diagnostic ignored \"-Wshadow\"" )
+
 #endif // __clang__
 
 
@@ -463,7 +241,9 @@ namespace Catch {
 
 ////////////////////////////////////////////////////////////////////////////////
 // Assume that some platforms do not support getenv.
-#if defined(CATCH_PLATFORM_WINDOWS_UWP) || defined(CATCH_PLATFORM_PLAYSTATION)
+#if defined( CATCH_PLATFORM_WINDOWS_UWP ) ||                                   \
+    defined( CATCH_PLATFORM_PLAYSTATION ) ||                                   \
+    defined( _GAMING_XBOX )
 #    define CATCH_INTERNAL_CONFIG_NO_GETENV
 #else
 #    define CATCH_INTERNAL_CONFIG_GETENV
@@ -681,6 +461,9 @@ namespace Catch {
 #if !defined(CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS)
 #   define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS
 #endif
+#if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_RESULT)
+#   define CATCH_INTERNAL_SUPPRESS_UNUSED_RESULT
+#endif
 #if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS)
 #   define CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS
 #endif
@@ -690,6 +473,16 @@ namespace Catch {
 #if !defined(CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS)
 #   define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS
 #endif
+#if !defined( CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS )
+#    define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS
+#endif
+#if !defined( CATCH_INTERNAL_SUPPRESS_COMMA_WARNINGS )
+#    define CATCH_INTERNAL_SUPPRESS_COMMA_WARNINGS
+#endif
+#if !defined( CATCH_INTERNAL_SUPPRESS_SHADOW_WARNINGS )
+#    define CATCH_INTERNAL_SUPPRESS_SHADOW_WARNINGS
+#endif
+
 
 // The goal of this macro is to avoid evaluation of the arguments, but
 // still have the compiler warn on problems inside...
@@ -703,13 +496,6 @@ namespace Catch {
 #   undef CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS
 #endif
 
-#if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS)
-#   define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS
-#endif
-
-#if !defined(CATCH_INTERNAL_SUPPRESS_COMMA_WARNINGS)
-#   define CATCH_INTERNAL_SUPPRESS_COMMA_WARNINGS
-#endif
 
 #if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
 #define CATCH_TRY if ((true))
@@ -755,38 +541,31 @@ namespace Catch {
     class IResultCapture;
     class IConfig;
 
-    class IContext {
-    public:
-        virtual ~IContext(); // = default
+    class Context {
+        IConfig const* m_config = nullptr;
+        IResultCapture* m_resultCapture = nullptr;
 
-        virtual IResultCapture* getResultCapture() = 0;
-        virtual IConfig const* getConfig() const = 0;
-    };
+        CATCH_EXPORT static Context* currentContext;
+        friend Context& getCurrentMutableContext();
+        friend Context const& getCurrentContext();
+        static void createContext();
+        friend void cleanUpContext();
 
-    class IMutableContext : public IContext {
     public:
-        ~IMutableContext() override; // = default
-        virtual void setResultCapture( IResultCapture* resultCapture ) = 0;
-        virtual void setConfig( IConfig const* config ) = 0;
-
-    private:
-        CATCH_EXPORT static IMutableContext* currentContext;
-        friend IMutableContext& getCurrentMutableContext();
-        friend void cleanUpContext();
-        static void createContext();
+        IResultCapture* getResultCapture() const { return m_resultCapture; }
+        IConfig const* getConfig() const { return m_config; }
+        void setResultCapture( IResultCapture* resultCapture );
+        void setConfig( IConfig const* config );
     };
 
-    inline IMutableContext& getCurrentMutableContext()
-    {
-        if( !IMutableContext::currentContext )
-            IMutableContext::createContext();
+    Context& getCurrentMutableContext();
+
+    inline Context const& getCurrentContext() {
+        // We duplicate the logic from `getCurrentMutableContext` here,
+        // to avoid paying the call overhead in debug mode.
+        if ( !Context::currentContext ) { Context::createContext(); }
         // NOLINTNEXTLINE(clang-analyzer-core.uninitialized.UndefReturn)
-        return *IMutableContext::currentContext;
-    }
-
-    inline IContext& getCurrentContext()
-    {
-        return getCurrentMutableContext();
+        return *Context::currentContext;
     }
 
     void cleanUpContext();
@@ -798,16 +577,6 @@ namespace Catch {
 #endif // CATCH_CONTEXT_HPP_INCLUDED
 
 
-#ifndef CATCH_INTERFACES_REPORTER_HPP_INCLUDED
-#define CATCH_INTERFACES_REPORTER_HPP_INCLUDED
-
-
-
-#ifndef CATCH_SECTION_INFO_HPP_INCLUDED
-#define CATCH_SECTION_INFO_HPP_INCLUDED
-
-
-
 #ifndef CATCH_MOVE_AND_FORWARD_HPP_INCLUDED
 #define CATCH_MOVE_AND_FORWARD_HPP_INCLUDED
 
@@ -822,110 +591,201 @@ namespace Catch {
 #endif // CATCH_MOVE_AND_FORWARD_HPP_INCLUDED
 
 
-#ifndef CATCH_SOURCE_LINE_INFO_HPP_INCLUDED
-#define CATCH_SOURCE_LINE_INFO_HPP_INCLUDED
-
-#include <cstddef>
-#include <iosfwd>
+#ifndef CATCH_TEST_FAILURE_EXCEPTION_HPP_INCLUDED
+#define CATCH_TEST_FAILURE_EXCEPTION_HPP_INCLUDED
 
 namespace Catch {
 
-    struct SourceLineInfo {
+    //! Used to signal that an assertion macro failed
+    struct TestFailureException{};
+    //! Used to signal that the remainder of a test should be skipped
+    struct TestSkipException {};
 
-        SourceLineInfo() = delete;
-        constexpr SourceLineInfo( char const* _file, std::size_t _line ) noexcept:
-            file( _file ),
-            line( _line )
-        {}
+    /**
+     * Outlines throwing of `TestFailureException` into a single TU
+     *
+     * Also handles `CATCH_CONFIG_DISABLE_EXCEPTIONS` for callers.
+     */
+    [[noreturn]] void throw_test_failure_exception();
 
-        bool operator == ( SourceLineInfo const& other ) const noexcept;
-        bool operator < ( SourceLineInfo const& other ) const noexcept;
+    /**
+     * Outlines throwing of `TestSkipException` into a single TU
+     *
+     * Also handles `CATCH_CONFIG_DISABLE_EXCEPTIONS` for callers.
+     */
+    [[noreturn]] void throw_test_skip_exception();
 
-        char const* file;
-        std::size_t line;
+} // namespace Catch
 
-        friend std::ostream& operator << (std::ostream& os, SourceLineInfo const& info);
-    };
-}
+#endif // CATCH_TEST_FAILURE_EXCEPTION_HPP_INCLUDED
 
-#define CATCH_INTERNAL_LINEINFO \
-    ::Catch::SourceLineInfo( __FILE__, static_cast<std::size_t>( __LINE__ ) )
 
-#endif // CATCH_SOURCE_LINE_INFO_HPP_INCLUDED
+#ifndef CATCH_UNIQUE_NAME_HPP_INCLUDED
+#define CATCH_UNIQUE_NAME_HPP_INCLUDED
 
 
-#ifndef CATCH_TOTALS_HPP_INCLUDED
-#define CATCH_TOTALS_HPP_INCLUDED
 
-#include <cstdint>
 
-namespace Catch {
+/** \file
+ * Wrapper for the CONFIG configuration option
+ *
+ * When generating internal unique names, there are two options. Either
+ * we mix in the current line number, or mix in an incrementing number.
+ * We prefer the latter, using `__COUNTER__`, but users might want to
+ * use the former.
+ */
 
-    struct Counts {
-        Counts operator - ( Counts const& other ) const;
-        Counts& operator += ( Counts const& other );
+#ifndef CATCH_CONFIG_COUNTER_HPP_INCLUDED
+#define CATCH_CONFIG_COUNTER_HPP_INCLUDED
 
-        std::uint64_t total() const;
-        bool allPassed() const;
-        bool allOk() const;
 
-        std::uint64_t passed = 0;
-        std::uint64_t failed = 0;
-        std::uint64_t failedButOk = 0;
-        std::uint64_t skipped = 0;
-    };
+#if ( !defined(__JETBRAINS_IDE__) || __JETBRAINS_IDE__ >= 20170300L )
+    #define CATCH_INTERNAL_CONFIG_COUNTER
+#endif
 
-    struct Totals {
+#if defined( CATCH_INTERNAL_CONFIG_COUNTER ) && \
+    !defined( CATCH_CONFIG_NO_COUNTER ) && \
+    !defined( CATCH_CONFIG_COUNTER )
+#    define CATCH_CONFIG_COUNTER
+#endif
 
-        Totals operator - ( Totals const& other ) const;
-        Totals& operator += ( Totals const& other );
 
-        Totals delta( Totals const& prevTotals ) const;
+#endif // CATCH_CONFIG_COUNTER_HPP_INCLUDED
+#define INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) name##line
+#define INTERNAL_CATCH_UNIQUE_NAME_LINE( name, line ) INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line )
+#ifdef CATCH_CONFIG_COUNTER
+#  define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __COUNTER__ )
+#else
+#  define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __LINE__ )
+#endif
 
-        Counts assertions;
-        Counts testCases;
-    };
-}
+#endif // CATCH_UNIQUE_NAME_HPP_INCLUDED
 
-#endif // CATCH_TOTALS_HPP_INCLUDED
 
+#ifndef CATCH_INTERFACES_CAPTURE_HPP_INCLUDED
+#define CATCH_INTERFACES_CAPTURE_HPP_INCLUDED
+
+#include <string>
+#include <chrono>
+
+
+
+#ifndef CATCH_STRINGREF_HPP_INCLUDED
+#define CATCH_STRINGREF_HPP_INCLUDED
+
+#include <cstddef>
 #include <string>
+#include <iosfwd>
+#include <cassert>
+
+#include <cstring>
 
 namespace Catch {
 
-    struct SectionInfo {
-        // The last argument is ignored, so that people can write
-        // SECTION("ShortName", "Proper description that is long") and
-        // still use the `-c` flag comfortably.
-        SectionInfo( SourceLineInfo const& _lineInfo, std::string _name,
-                    const char* const = nullptr ):
-            name(CATCH_MOVE(_name)),
-            lineInfo(_lineInfo)
-            {}
+    /// A non-owning string class (similar to the forthcoming std::string_view)
+    /// Note that, because a StringRef may be a substring of another string,
+    /// it may not be null terminated.
+    class StringRef {
+    public:
+        using size_type = std::size_t;
+        using const_iterator = const char*;
 
-        std::string name;
-        SourceLineInfo lineInfo;
-    };
+        static constexpr size_type npos{ static_cast<size_type>( -1 ) };
 
-    struct SectionEndInfo {
-        SectionInfo sectionInfo;
-        Counts prevAssertions;
-        double durationInSeconds;
-    };
+    private:
+        static constexpr char const* const s_empty = "";
 
-} // end namespace Catch
+        char const* m_start = s_empty;
+        size_type m_size = 0;
 
-#endif // CATCH_SECTION_INFO_HPP_INCLUDED
+    public: // construction
+        constexpr StringRef() noexcept = default;
 
+        StringRef( char const* rawChars ) noexcept;
 
-#ifndef CATCH_ASSERTION_RESULT_HPP_INCLUDED
-#define CATCH_ASSERTION_RESULT_HPP_INCLUDED
+        constexpr StringRef( char const* rawChars, size_type size ) noexcept
+        :   m_start( rawChars ),
+            m_size( size )
+        {}
+
+        StringRef( std::string const& stdString ) noexcept
+        :   m_start( stdString.c_str() ),
+            m_size( stdString.size() )
+        {}
 
+        explicit operator std::string() const {
+            return std::string(m_start, m_size);
+        }
 
+    public: // operators
+        auto operator == ( StringRef other ) const noexcept -> bool {
+            return m_size == other.m_size
+                && (std::memcmp( m_start, other.m_start, m_size ) == 0);
+        }
+        auto operator != (StringRef other) const noexcept -> bool {
+            return !(*this == other);
+        }
 
-#ifndef CATCH_ASSERTION_INFO_HPP_INCLUDED
-#define CATCH_ASSERTION_INFO_HPP_INCLUDED
+        constexpr auto operator[] ( size_type index ) const noexcept -> char {
+            assert(index < m_size);
+            return m_start[index];
+        }
+
+        bool operator<(StringRef rhs) const noexcept;
+
+    public: // named queries
+        constexpr auto empty() const noexcept -> bool {
+            return m_size == 0;
+        }
+        constexpr auto size() const noexcept -> size_type {
+            return m_size;
+        }
+
+        // Returns a substring of [start, start + length).
+        // If start + length > size(), then the substring is [start, size()).
+        // If start > size(), then the substring is empty.
+        constexpr StringRef substr(size_type start, size_type length) const noexcept {
+            if (start < m_size) {
+                const auto shortened_size = m_size - start;
+                return StringRef(m_start + start, (shortened_size < length) ? shortened_size : length);
+            } else {
+                return StringRef();
+            }
+        }
+
+        // Returns the current start pointer. May not be null-terminated.
+        constexpr char const* data() const noexcept {
+            return m_start;
+        }
+
+        constexpr const_iterator begin() const { return m_start; }
+        constexpr const_iterator end() const { return m_start + m_size; }
+
+
+        friend std::string& operator += (std::string& lhs, StringRef sr);
+        friend std::ostream& operator << (std::ostream& os, StringRef sr);
+        friend std::string operator+(StringRef lhs, StringRef rhs);
+
+        /**
+         * Provides a three-way comparison with rhs
+         *
+         * Returns negative number if lhs < rhs, 0 if lhs == rhs, and a positive
+         * number if lhs > rhs
+         */
+        int compare( StringRef rhs ) const;
+    };
+
+
+    constexpr auto operator ""_sr( char const* rawChars, std::size_t size ) noexcept -> StringRef {
+        return StringRef( rawChars, size );
+    }
+} // namespace Catch
+
+constexpr auto operator ""_catch_sr( char const* rawChars, std::size_t size ) noexcept -> Catch::StringRef {
+    return Catch::StringRef( rawChars, size );
+}
 
+#endif // CATCH_STRINGREF_HPP_INCLUDED
 
 
 #ifndef CATCH_RESULT_TYPE_HPP_INCLUDED
@@ -979,120 +839,12 @@ namespace Catch {
 
 #endif // CATCH_RESULT_TYPE_HPP_INCLUDED
 
-namespace Catch {
-
-    struct AssertionInfo {
-        // AssertionInfo() = delete;
-
-        StringRef macroName;
-        SourceLineInfo lineInfo;
-        StringRef capturedExpression;
-        ResultDisposition::Flags resultDisposition;
-    };
-
-} // end namespace Catch
-
-#endif // CATCH_ASSERTION_INFO_HPP_INCLUDED
 
+#ifndef CATCH_UNIQUE_PTR_HPP_INCLUDED
+#define CATCH_UNIQUE_PTR_HPP_INCLUDED
 
-#ifndef CATCH_LAZY_EXPR_HPP_INCLUDED
-#define CATCH_LAZY_EXPR_HPP_INCLUDED
-
-#include <iosfwd>
-
-namespace Catch {
-
-    class ITransientExpression;
-
-    class LazyExpression {
-        friend class AssertionHandler;
-        friend struct AssertionStats;
-        friend class RunContext;
-
-        ITransientExpression const* m_transientExpression = nullptr;
-        bool m_isNegated;
-    public:
-        LazyExpression( bool isNegated ):
-            m_isNegated(isNegated)
-        {}
-        LazyExpression(LazyExpression const& other) = default;
-        LazyExpression& operator = ( LazyExpression const& ) = delete;
-
-        explicit operator bool() const {
-            return m_transientExpression != nullptr;
-        }
-
-        friend auto operator << ( std::ostream& os, LazyExpression const& lazyExpr ) -> std::ostream&;
-    };
-
-} // namespace Catch
-
-#endif // CATCH_LAZY_EXPR_HPP_INCLUDED
-
-#include <string>
-
-namespace Catch {
-
-    struct AssertionResultData
-    {
-        AssertionResultData() = delete;
-
-        AssertionResultData( ResultWas::OfType _resultType, LazyExpression const& _lazyExpression );
-
-        std::string message;
-        mutable std::string reconstructedExpression;
-        LazyExpression lazyExpression;
-        ResultWas::OfType resultType;
-
-        std::string reconstructExpression() const;
-    };
-
-    class AssertionResult {
-    public:
-        AssertionResult() = delete;
-        AssertionResult( AssertionInfo const& info, AssertionResultData&& data );
-
-        bool isOk() const;
-        bool succeeded() const;
-        ResultWas::OfType getResultType() const;
-        bool hasExpression() const;
-        bool hasMessage() const;
-        std::string getExpression() const;
-        std::string getExpressionInMacro() const;
-        bool hasExpandedExpression() const;
-        std::string getExpandedExpression() const;
-        StringRef getMessage() const;
-        SourceLineInfo getSourceInfo() const;
-        StringRef getTestMacroName() const;
-
-    //protected:
-        AssertionInfo m_info;
-        AssertionResultData m_resultData;
-    };
-
-} // end namespace Catch
-
-#endif // CATCH_ASSERTION_RESULT_HPP_INCLUDED
-
-
-#ifndef CATCH_MESSAGE_INFO_HPP_INCLUDED
-#define CATCH_MESSAGE_INFO_HPP_INCLUDED
-
-
-
-#ifndef CATCH_INTERFACES_CAPTURE_HPP_INCLUDED
-#define CATCH_INTERFACES_CAPTURE_HPP_INCLUDED
-
-#include <string>
-#include <chrono>
-
-
-
-#ifndef CATCH_UNIQUE_PTR_HPP_INCLUDED
-#define CATCH_UNIQUE_PTR_HPP_INCLUDED
-
-#include <cassert>
-#include <type_traits>
+#include <cassert>
+#include <type_traits>
 
 
 namespace Catch {
@@ -1199,6 +951,45 @@ namespace Detail {
 
 #endif // CATCH_UNIQUE_PTR_HPP_INCLUDED
 
+
+#ifndef CATCH_BENCHMARK_STATS_FWD_HPP_INCLUDED
+#define CATCH_BENCHMARK_STATS_FWD_HPP_INCLUDED
+
+
+
+// Adapted from donated nonius code.
+
+#ifndef CATCH_CLOCK_HPP_INCLUDED
+#define CATCH_CLOCK_HPP_INCLUDED
+
+#include <chrono>
+
+namespace Catch {
+    namespace Benchmark {
+        using IDuration = std::chrono::nanoseconds;
+        using FDuration = std::chrono::duration<double, std::nano>;
+
+        template <typename Clock>
+        using TimePoint = typename Clock::time_point;
+
+        using default_clock = std::chrono::steady_clock;
+    } // namespace Benchmark
+} // namespace Catch
+
+#endif // CATCH_CLOCK_HPP_INCLUDED
+
+namespace Catch {
+
+    // We cannot forward declare the type with default template argument
+    // multiple times, so it is split out into a separate header so that
+    // we can prevent multiple declarations in dependees
+    template <typename Duration = Benchmark::FDuration>
+    struct BenchmarkStats;
+
+} // end namespace Catch
+
+#endif // CATCH_BENCHMARK_STATS_FWD_HPP_INCLUDED
+
 namespace Catch {
 
     class AssertionResult;
@@ -1215,8 +1006,6 @@ namespace Catch {
     class IGeneratorTracker;
 
     struct BenchmarkInfo;
-    template <typename Duration = std::chrono::duration<double, std::nano>>
-    struct BenchmarkStats;
 
     namespace Generators {
         class GeneratorUntypedBase;
@@ -1228,6 +1017,7 @@ namespace Catch {
     public:
         virtual ~IResultCapture();
 
+        virtual void notifyAssertionStarted( AssertionInfo const& info ) = 0;
         virtual bool sectionStarted( StringRef sectionName,
                                      SourceLineInfo const& sectionLineInfo,
                                      Counts& assertions ) = 0;
@@ -1268,7 +1058,7 @@ namespace Catch {
                     AssertionReaction& reaction ) = 0;
         virtual void handleUnexpectedInflightException
                 (   AssertionInfo const& info,
-                    std::string const& message,
+                    std::string&& message,
                     AssertionReaction& reaction ) = 0;
         virtual void handleIncomplete
                 (   AssertionInfo const& info ) = 0;
@@ -1293,415 +1083,308 @@ namespace Catch {
 
 #endif // CATCH_INTERFACES_CAPTURE_HPP_INCLUDED
 
-#include <string>
-
-namespace Catch {
-
-    struct MessageInfo {
-        MessageInfo(    StringRef _macroName,
-                        SourceLineInfo const& _lineInfo,
-                        ResultWas::OfType _type );
-
-        StringRef macroName;
-        std::string message;
-        SourceLineInfo lineInfo;
-        ResultWas::OfType type;
-        unsigned int sequence;
-
-        bool operator == (MessageInfo const& other) const {
-            return sequence == other.sequence;
-        }
-        bool operator < (MessageInfo const& other) const {
-            return sequence < other.sequence;
-        }
-    private:
-        static unsigned int globalCount;
-    };
 
-} // end namespace Catch
-
-#endif // CATCH_MESSAGE_INFO_HPP_INCLUDED
+#ifndef CATCH_INTERFACES_CONFIG_HPP_INCLUDED
+#define CATCH_INTERFACES_CONFIG_HPP_INCLUDED
 
 
-// Adapted from donated nonius code.
 
-#ifndef CATCH_ESTIMATE_HPP_INCLUDED
-#define CATCH_ESTIMATE_HPP_INCLUDED
+#ifndef CATCH_NONCOPYABLE_HPP_INCLUDED
+#define CATCH_NONCOPYABLE_HPP_INCLUDED
 
 namespace Catch {
-    namespace Benchmark {
-        template <typename Duration>
-        struct Estimate {
-            Duration point;
-            Duration lower_bound;
-            Duration upper_bound;
-            double confidence_interval;
-
-            template <typename Duration2>
-            operator Estimate<Duration2>() const {
-                return { point, lower_bound, upper_bound, confidence_interval };
-            }
-        };
-    } // namespace Benchmark
-} // namespace Catch
-
-#endif // CATCH_ESTIMATE_HPP_INCLUDED
-
-
-// Adapted from donated nonius code.
-
-#ifndef CATCH_OUTLIER_CLASSIFICATION_HPP_INCLUDED
-#define CATCH_OUTLIER_CLASSIFICATION_HPP_INCLUDED
+    namespace Detail {
 
-namespace Catch {
-    namespace Benchmark {
-        struct OutlierClassification {
-            int samples_seen = 0;
-            int low_severe = 0;     // more than 3 times IQR below Q1
-            int low_mild = 0;       // 1.5 to 3 times IQR below Q1
-            int high_mild = 0;      // 1.5 to 3 times IQR above Q3
-            int high_severe = 0;    // more than 3 times IQR above Q3
+        //! Deriving classes become noncopyable and nonmovable
+        class NonCopyable {
+            NonCopyable( NonCopyable const& ) = delete;
+            NonCopyable( NonCopyable&& ) = delete;
+            NonCopyable& operator=( NonCopyable const& ) = delete;
+            NonCopyable& operator=( NonCopyable&& ) = delete;
 
-            int total() const {
-                return low_severe + low_mild + high_mild + high_severe;
-            }
+        protected:
+            NonCopyable() noexcept = default;
         };
-    } // namespace Benchmark
-} // namespace Catch
 
-#endif // CATCH_OUTLIERS_CLASSIFICATION_HPP_INCLUDED
+    } // namespace Detail
+} // namespace Catch
 
+#endif // CATCH_NONCOPYABLE_HPP_INCLUDED
 
-#include <map>
+#include <chrono>
+#include <iosfwd>
 #include <string>
 #include <vector>
-#include <iosfwd>
 
 namespace Catch {
 
-    struct ReporterDescription;
-    struct ListenerDescription;
-    struct TagInfo;
-    struct TestCaseInfo;
-    class TestCaseHandle;
-    class IConfig;
-    class IStream;
-    enum class ColourMode : std::uint8_t;
-
-    struct ReporterConfig {
-        ReporterConfig( IConfig const* _fullConfig,
-                        Detail::unique_ptr<IStream> _stream,
-                        ColourMode colourMode,
-                        std::map<std::string, std::string> customOptions );
-
-        ReporterConfig( ReporterConfig&& ) = default;
-        ReporterConfig& operator=( ReporterConfig&& ) = default;
-        ~ReporterConfig(); // = default
+    enum class Verbosity {
+        Quiet = 0,
+        Normal,
+        High
+    };
 
-        Detail::unique_ptr<IStream> takeStream() &&;
-        IConfig const* fullConfig() const;
-        ColourMode colourMode() const;
-        std::map<std::string, std::string> const& customOptions() const;
+    struct WarnAbout { enum What {
+        Nothing = 0x00,
+        //! A test case or leaf section did not run any assertions
+        NoAssertions = 0x01,
+        //! A command line test spec matched no test cases
+        UnmatchedTestSpec = 0x02,
+    }; };
 
-    private:
-        Detail::unique_ptr<IStream> m_stream;
-        IConfig const* m_fullConfig;
-        ColourMode m_colourMode;
-        std::map<std::string, std::string> m_customOptions;
+    enum class ShowDurations {
+        DefaultForReporter,
+        Always,
+        Never
     };
-
-    struct TestRunInfo {
-        constexpr TestRunInfo(StringRef _name) : name(_name) {}
-        StringRef name;
+    enum class TestRunOrder {
+        Declared,
+        LexicographicallySorted,
+        Randomized
     };
-
-    struct AssertionStats {
-        AssertionStats( AssertionResult const& _assertionResult,
-                        std::vector<MessageInfo> const& _infoMessages,
-                        Totals const& _totals );
-
-        AssertionStats( AssertionStats const& )              = default;
-        AssertionStats( AssertionStats && )                  = default;
-        AssertionStats& operator = ( AssertionStats const& ) = delete;
-        AssertionStats& operator = ( AssertionStats && )     = delete;
-
-        AssertionResult assertionResult;
-        std::vector<MessageInfo> infoMessages;
-        Totals totals;
+    enum class ColourMode : std::uint8_t {
+        //! Let Catch2 pick implementation based on platform detection
+        PlatformDefault,
+        //! Use ANSI colour code escapes
+        ANSI,
+        //! Use Win32 console colour API
+        Win32,
+        //! Don't use any colour
+        None
     };
+    struct WaitForKeypress { enum When {
+        Never,
+        BeforeStart = 1,
+        BeforeExit = 2,
+        BeforeStartAndExit = BeforeStart | BeforeExit
+    }; };
 
-    struct SectionStats {
-        SectionStats(   SectionInfo&& _sectionInfo,
-                        Counts const& _assertions,
-                        double _durationInSeconds,
-                        bool _missingAssertions );
+    class TestSpec;
+    class IStream;
 
-        SectionInfo sectionInfo;
-        Counts assertions;
-        double durationInSeconds;
-        bool missingAssertions;
-    };
+    class IConfig : public Detail::NonCopyable {
+    public:
+        virtual ~IConfig();
 
-    struct TestCaseStats {
-        TestCaseStats(  TestCaseInfo const& _testInfo,
-                        Totals const& _totals,
-                        std::string&& _stdOut,
-                        std::string&& _stdErr,
-                        bool _aborting );
+        virtual bool allowThrows() const = 0;
+        virtual StringRef name() const = 0;
+        virtual bool includeSuccessfulResults() const = 0;
+        virtual bool shouldDebugBreak() const = 0;
+        virtual bool warnAboutMissingAssertions() const = 0;
+        virtual bool warnAboutUnmatchedTestSpecs() const = 0;
+        virtual bool zeroTestsCountAsSuccess() const = 0;
+        virtual int abortAfter() const = 0;
+        virtual bool showInvisibles() const = 0;
+        virtual ShowDurations showDurations() const = 0;
+        virtual double minDuration() const = 0;
+        virtual TestSpec const& testSpec() const = 0;
+        virtual bool hasTestFilters() const = 0;
+        virtual std::vector<std::string> const& getTestsOrTags() const = 0;
+        virtual TestRunOrder runOrder() const = 0;
+        virtual uint32_t rngSeed() const = 0;
+        virtual unsigned int shardCount() const = 0;
+        virtual unsigned int shardIndex() const = 0;
+        virtual ColourMode defaultColourMode() const = 0;
+        virtual std::vector<std::string> const& getSectionsToRun() const = 0;
+        virtual Verbosity verbosity() const = 0;
 
-        TestCaseInfo const * testInfo;
-        Totals totals;
-        std::string stdOut;
-        std::string stdErr;
-        bool aborting;
+        virtual bool skipBenchmarks() const = 0;
+        virtual bool benchmarkNoAnalysis() const = 0;
+        virtual unsigned int benchmarkSamples() const = 0;
+        virtual double benchmarkConfidenceInterval() const = 0;
+        virtual unsigned int benchmarkResamples() const = 0;
+        virtual std::chrono::milliseconds benchmarkWarmupTime() const = 0;
     };
+}
 
-    struct TestRunStats {
-        TestRunStats(   TestRunInfo const& _runInfo,
-                        Totals const& _totals,
-                        bool _aborting );
+#endif // CATCH_INTERFACES_CONFIG_HPP_INCLUDED
 
-        TestRunInfo runInfo;
-        Totals totals;
-        bool aborting;
-    };
 
+#ifndef CATCH_INTERFACES_REGISTRY_HUB_HPP_INCLUDED
+#define CATCH_INTERFACES_REGISTRY_HUB_HPP_INCLUDED
 
-    struct BenchmarkInfo {
-        std::string name;
-        double estimatedDuration;
-        int iterations;
-        unsigned int samples;
-        unsigned int resamples;
-        double clockResolution;
-        double clockCost;
-    };
 
-    template <class Duration>
-    struct BenchmarkStats {
-        BenchmarkInfo info;
+#include <string>
 
-        std::vector<Duration> samples;
-        Benchmark::Estimate<Duration> mean;
-        Benchmark::Estimate<Duration> standardDeviation;
-        Benchmark::OutlierClassification outliers;
-        double outlierVariance;
+namespace Catch {
 
-        template <typename Duration2>
-        operator BenchmarkStats<Duration2>() const {
-            std::vector<Duration2> samples2;
-            samples2.reserve(samples.size());
-            for (auto const& sample : samples) {
-                samples2.push_back(Duration2(sample));
-            }
-            return {
-                info,
-                CATCH_MOVE(samples2),
-                mean,
-                standardDeviation,
-                outliers,
-                outlierVariance,
-            };
-        }
-    };
+    class TestCaseHandle;
+    struct TestCaseInfo;
+    class ITestCaseRegistry;
+    class IExceptionTranslatorRegistry;
+    class IExceptionTranslator;
+    class ReporterRegistry;
+    class IReporterFactory;
+    class ITagAliasRegistry;
+    class ITestInvoker;
+    class IMutableEnumValuesRegistry;
+    struct SourceLineInfo;
 
-    //! By setting up its preferences, a reporter can modify Catch2's behaviour
-    //! in some regards, e.g. it can request Catch2 to capture writes to
-    //! stdout/stderr during test execution, and pass them to the reporter.
-    struct ReporterPreferences {
-        //! Catch2 should redirect writes to stdout and pass them to the
-        //! reporter
-        bool shouldRedirectStdOut = false;
-        //! Catch2 should call `Reporter::assertionEnded` even for passing
-        //! assertions
-        bool shouldReportAllAssertions = false;
-    };
+    class StartupExceptionRegistry;
+    class EventListenerFactory;
 
-    /**
-     * The common base for all reporters and event listeners
-     *
-     * Implementing classes must also implement:
-     *
-     *     //! User-friendly description of the reporter/listener type
-     *     static std::string getDescription()
-     *
-     * Generally shouldn't be derived from by users of Catch2 directly,
-     * instead they should derive from one of the utility bases that
-     * derive from this class.
-     */
-    class IEventListener {
-    protected:
-        //! Derived classes can set up their preferences here
-        ReporterPreferences m_preferences;
-        //! The test run's config as filled in from CLI and defaults
-        IConfig const* m_config;
+    using IReporterFactoryPtr = Detail::unique_ptr<IReporterFactory>;
 
+    class IRegistryHub {
     public:
-        IEventListener( IConfig const* config ): m_config( config ) {}
+        virtual ~IRegistryHub(); // = default
 
-        virtual ~IEventListener(); // = default;
+        virtual ReporterRegistry const& getReporterRegistry() const = 0;
+        virtual ITestCaseRegistry const& getTestCaseRegistry() const = 0;
+        virtual ITagAliasRegistry const& getTagAliasRegistry() const = 0;
+        virtual IExceptionTranslatorRegistry const& getExceptionTranslatorRegistry() const = 0;
 
-        // Implementing class must also provide the following static methods:
-        // static std::string getDescription();
 
-        ReporterPreferences const& getPreferences() const {
-            return m_preferences;
-        }
+        virtual StartupExceptionRegistry const& getStartupExceptionRegistry() const = 0;
+    };
 
-        //! Called when no test cases match provided test spec
-        virtual void noMatchingTestCases( StringRef unmatchedSpec ) = 0;
-        //! Called for all invalid test specs from the cli
-        virtual void reportInvalidTestSpec( StringRef invalidArgument ) = 0;
+    class IMutableRegistryHub {
+    public:
+        virtual ~IMutableRegistryHub(); // = default
+        virtual void registerReporter( std::string const& name, IReporterFactoryPtr factory ) = 0;
+        virtual void registerListener( Detail::unique_ptr<EventListenerFactory> factory ) = 0;
+        virtual void registerTest(Detail::unique_ptr<TestCaseInfo>&& testInfo, Detail::unique_ptr<ITestInvoker>&& invoker) = 0;
+        virtual void registerTranslator( Detail::unique_ptr<IExceptionTranslator>&& translator ) = 0;
+        virtual void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) = 0;
+        virtual void registerStartupException() noexcept = 0;
+        virtual IMutableEnumValuesRegistry& getMutableEnumValuesRegistry() = 0;
+    };
 
-        /**
-         * Called once in a testing run before tests are started
-         *
-         * Not called if tests won't be run (e.g. only listing will happen)
-         */
-        virtual void testRunStarting( TestRunInfo const& testRunInfo ) = 0;
+    IRegistryHub const& getRegistryHub();
+    IMutableRegistryHub& getMutableRegistryHub();
+    void cleanUp();
+    std::string translateActiveException();
 
-        //! Called _once_ for each TEST_CASE, no matter how many times it is entered
-        virtual void testCaseStarting( TestCaseInfo const& testInfo ) = 0;
-        //! Called _every time_ a TEST_CASE is entered, including repeats (due to sections)
-        virtual void testCasePartialStarting( TestCaseInfo const& testInfo, uint64_t partNumber ) = 0;
-        //! Called when a `SECTION` is being entered. Not called for skipped sections
-        virtual void sectionStarting( SectionInfo const& sectionInfo ) = 0;
+}
 
-        //! Called when user-code is being probed before the actual benchmark runs
-        virtual void benchmarkPreparing( StringRef benchmarkName ) = 0;
-        //! Called after probe but before the user-code is being benchmarked
-        virtual void benchmarkStarting( BenchmarkInfo const& benchmarkInfo ) = 0;
-        //! Called with the benchmark results if benchmark successfully finishes
-        virtual void benchmarkEnded( BenchmarkStats<> const& benchmarkStats ) = 0;
-        //! Called if running the benchmarks fails for any reason
-        virtual void benchmarkFailed( StringRef benchmarkName ) = 0;
+#endif // CATCH_INTERFACES_REGISTRY_HUB_HPP_INCLUDED
 
-        //! Called before assertion success/failure is evaluated
-        virtual void assertionStarting( AssertionInfo const& assertionInfo ) = 0;
 
-        //! Called after assertion was fully evaluated
-        virtual void assertionEnded( AssertionStats const& assertionStats ) = 0;
+#ifndef CATCH_BENCHMARK_STATS_HPP_INCLUDED
+#define CATCH_BENCHMARK_STATS_HPP_INCLUDED
 
-        //! Called after a `SECTION` has finished running
-        virtual void sectionEnded( SectionStats const& sectionStats ) = 0;
-        //! Called _every time_ a TEST_CASE is entered, including repeats (due to sections)
-        virtual void testCasePartialEnded(TestCaseStats const& testCaseStats, uint64_t partNumber ) = 0;
-        //! Called _once_ for each TEST_CASE, no matter how many times it is entered
-        virtual void testCaseEnded( TestCaseStats const& testCaseStats ) = 0;
-        /**
-         * Called once after all tests in a testing run are finished
-         *
-         * Not called if tests weren't run (e.g. only listings happened)
-         */
-        virtual void testRunEnded( TestRunStats const& testRunStats ) = 0;
 
-        /**
-         * Called with test cases that are skipped due to the test run aborting.
-         * NOT called for test cases that are explicitly skipped using the `SKIP` macro.
-         *
-         * Deprecated - will be removed in the next major release.
-         */
-        virtual void skipTest( TestCaseInfo const& testInfo ) = 0;
 
-        //! Called if a fatal error (signal/structured exception) occured
-        virtual void fatalErrorEncountered( StringRef error ) = 0;
+// Adapted from donated nonius code.
 
-        //! Writes out information about provided reporters using reporter-specific format
-        virtual void listReporters(std::vector<ReporterDescription> const& descriptions) = 0;
-        //! Writes out the provided listeners descriptions using reporter-specific format
-        virtual void listListeners(std::vector<ListenerDescription> const& descriptions) = 0;
-        //! Writes out information about provided tests using reporter-specific format
-        virtual void listTests(std::vector<TestCaseHandle> const& tests) = 0;
-        //! Writes out information about the provided tags using reporter-specific format
-        virtual void listTags(std::vector<TagInfo> const& tags) = 0;
-    };
-    using IEventListenerPtr = Detail::unique_ptr<IEventListener>;
+#ifndef CATCH_ESTIMATE_HPP_INCLUDED
+#define CATCH_ESTIMATE_HPP_INCLUDED
 
-} // end namespace Catch
+namespace Catch {
+    namespace Benchmark {
+        template <typename Type>
+        struct Estimate {
+            Type point;
+            Type lower_bound;
+            Type upper_bound;
+            double confidence_interval;
+        };
+    } // namespace Benchmark
+} // namespace Catch
 
-#endif // CATCH_INTERFACES_REPORTER_HPP_INCLUDED
+#endif // CATCH_ESTIMATE_HPP_INCLUDED
 
 
-#ifndef CATCH_UNIQUE_NAME_HPP_INCLUDED
-#define CATCH_UNIQUE_NAME_HPP_INCLUDED
+// Adapted from donated nonius code.
 
+#ifndef CATCH_OUTLIER_CLASSIFICATION_HPP_INCLUDED
+#define CATCH_OUTLIER_CLASSIFICATION_HPP_INCLUDED
 
+namespace Catch {
+    namespace Benchmark {
+        struct OutlierClassification {
+            int samples_seen = 0;
+            int low_severe = 0;     // more than 3 times IQR below Q1
+            int low_mild = 0;       // 1.5 to 3 times IQR below Q1
+            int high_mild = 0;      // 1.5 to 3 times IQR above Q3
+            int high_severe = 0;    // more than 3 times IQR above Q3
 
+            int total() const {
+                return low_severe + low_mild + high_mild + high_severe;
+            }
+        };
+    } // namespace Benchmark
+} // namespace Catch
 
-/** \file
- * Wrapper for the CONFIG configuration option
- *
- * When generating internal unique names, there are two options. Either
- * we mix in the current line number, or mix in an incrementing number.
- * We prefer the latter, using `__COUNTER__`, but users might want to
- * use the former.
- */
+#endif // CATCH_OUTLIERS_CLASSIFICATION_HPP_INCLUDED
+// The fwd decl & default specialization needs to be seen by VS2017 before
+// BenchmarkStats itself, or VS2017 will report compilation error.
 
-#ifndef CATCH_CONFIG_COUNTER_HPP_INCLUDED
-#define CATCH_CONFIG_COUNTER_HPP_INCLUDED
+#include <string>
+#include <vector>
 
-#if ( !defined(__JETBRAINS_IDE__) || __JETBRAINS_IDE__ >= 20170300L )
-    #define CATCH_INTERNAL_CONFIG_COUNTER
-#endif
+namespace Catch {
 
-#if defined( CATCH_INTERNAL_CONFIG_COUNTER ) && \
-    !defined( CATCH_CONFIG_NO_COUNTER ) && \
-    !defined( CATCH_CONFIG_COUNTER )
-#    define CATCH_CONFIG_COUNTER
-#endif
+    struct BenchmarkInfo {
+        std::string name;
+        double estimatedDuration;
+        int iterations;
+        unsigned int samples;
+        unsigned int resamples;
+        double clockResolution;
+        double clockCost;
+    };
 
+    // We need to keep template parameter for backwards compatibility,
+    // but we also do not want to use the template paraneter.
+    template <class Dummy>
+    struct BenchmarkStats {
+        BenchmarkInfo info;
 
-#endif // CATCH_CONFIG_COUNTER_HPP_INCLUDED
-#define INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) name##line
-#define INTERNAL_CATCH_UNIQUE_NAME_LINE( name, line ) INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line )
-#ifdef CATCH_CONFIG_COUNTER
-#  define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __COUNTER__ )
-#else
-#  define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __LINE__ )
-#endif
+        std::vector<Benchmark::FDuration> samples;
+        Benchmark::Estimate<Benchmark::FDuration> mean;
+        Benchmark::Estimate<Benchmark::FDuration> standardDeviation;
+        Benchmark::OutlierClassification outliers;
+        double outlierVariance;
+    };
 
-#endif // CATCH_UNIQUE_NAME_HPP_INCLUDED
+
+} // end namespace Catch
+
+#endif // CATCH_BENCHMARK_STATS_HPP_INCLUDED
 
 
 // Adapted from donated nonius code.
 
-#ifndef CATCH_CHRONOMETER_HPP_INCLUDED
-#define CATCH_CHRONOMETER_HPP_INCLUDED
+#ifndef CATCH_ENVIRONMENT_HPP_INCLUDED
+#define CATCH_ENVIRONMENT_HPP_INCLUDED
 
 
+namespace Catch {
+    namespace Benchmark {
+        struct EnvironmentEstimate {
+            FDuration mean;
+            OutlierClassification outliers;
+        };
+        struct Environment {
+            EnvironmentEstimate clock_resolution;
+            EnvironmentEstimate clock_cost;
+        };
+    } // namespace Benchmark
+} // namespace Catch
+
+#endif // CATCH_ENVIRONMENT_HPP_INCLUDED
+
 
 // Adapted from donated nonius code.
 
-#ifndef CATCH_CLOCK_HPP_INCLUDED
-#define CATCH_CLOCK_HPP_INCLUDED
+#ifndef CATCH_EXECUTION_PLAN_HPP_INCLUDED
+#define CATCH_EXECUTION_PLAN_HPP_INCLUDED
 
-#include <chrono>
-#include <ratio>
 
-namespace Catch {
-    namespace Benchmark {
-        template <typename Clock>
-        using ClockDuration = typename Clock::duration;
-        template <typename Clock>
-        using FloatDuration = std::chrono::duration<double, typename Clock::period>;
 
-        template <typename Clock>
-        using TimePoint = typename Clock::time_point;
+// Adapted from donated nonius code.
 
-        using default_clock = std::chrono::steady_clock;
+#ifndef CATCH_BENCHMARK_FUNCTION_HPP_INCLUDED
+#define CATCH_BENCHMARK_FUNCTION_HPP_INCLUDED
 
-        template <typename Clock>
-        struct now {
-            TimePoint<Clock> operator()() const {
-                return Clock::now();
-            }
-        };
 
-        using fp_seconds = std::chrono::duration<double, std::ratio<1>>;
-    } // namespace Benchmark
-} // namespace Catch
 
-#endif // CATCH_CLOCK_HPP_INCLUDED
+// Adapted from donated nonius code.
+
+#ifndef CATCH_CHRONOMETER_HPP_INCLUDED
+#define CATCH_CHRONOMETER_HPP_INCLUDED
+
 
 
 // Adapted from donated nonius code.
@@ -1709,7 +1392,7 @@ namespace Catch {
 #ifndef CATCH_OPTIMIZER_HPP_INCLUDED
 #define CATCH_OPTIMIZER_HPP_INCLUDED
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) || defined(__IAR_SYSTEMS_ICC__)
 #   include <atomic> // atomic_thread_fence
 #endif
 
@@ -1730,16 +1413,23 @@ namespace Catch {
         namespace Detail {
             inline void optimizer_barrier() { keep_memory(); }
         } // namespace Detail
-#elif defined(_MSC_VER)
+#elif defined(_MSC_VER) || defined(__IAR_SYSTEMS_ICC__)
 
+#if defined(_MSVC_VER)
 #pragma optimize("", off)
+#elif defined(__IAR_SYSTEMS_ICC__)
+// For IAR the pragma only affects the following function
+#pragma optimize=disable
+#endif
         template <typename T>
         inline void keep_memory(T* p) {
             // thanks @milleniumbug
             *reinterpret_cast<char volatile*>(p) = *reinterpret_cast<char const volatile*>(p);
         }
         // TODO equivalent keep_memory()
+#if defined(_MSVC_VER)
 #pragma optimize("", on)
+#endif
 
         namespace Detail {
             inline void optimizer_barrier() {
@@ -1751,52 +1441,22 @@ namespace Catch {
 
         template <typename T>
         inline void deoptimize_value(T&& x) {
-            keep_memory(&x);
-        }
-
-        template <typename Fn, typename... Args>
-        inline auto invoke_deoptimized(Fn&& fn, Args&&... args) -> std::enable_if_t<!std::is_same<void, decltype(fn(args...))>::value> {
-            deoptimize_value(CATCH_FORWARD(fn) (CATCH_FORWARD(args)...));
-        }
-
-        template <typename Fn, typename... Args>
-        inline auto invoke_deoptimized(Fn&& fn, Args&&... args) -> std::enable_if_t<std::is_same<void, decltype(fn(args...))>::value> {
-            CATCH_FORWARD(fn) (CATCH_FORWARD(args)...);
-        }
-    } // namespace Benchmark
-} // namespace Catch
-
-#endif // CATCH_OPTIMIZER_HPP_INCLUDED
-
-
-// Adapted from donated nonius code.
-
-#ifndef CATCH_COMPLETE_INVOKE_HPP_INCLUDED
-#define CATCH_COMPLETE_INVOKE_HPP_INCLUDED
-
-
-
-#ifndef CATCH_TEST_FAILURE_EXCEPTION_HPP_INCLUDED
-#define CATCH_TEST_FAILURE_EXCEPTION_HPP_INCLUDED
-
-namespace Catch {
-
-    //! Used to signal that an assertion macro failed
-    struct TestFailureException{};
-
-    /**
-     * Outlines throwing of `TestFailureException` into a single TU
-     *
-     * Also handles `CATCH_CONFIG_DISABLE_EXCEPTIONS` for callers.
-     */
-    [[noreturn]] void throw_test_failure_exception();
+            keep_memory(&x);
+        }
 
-    //! Used to signal that the remainder of a test should be skipped
-    struct TestSkipException{};
+        template <typename Fn, typename... Args>
+        inline auto invoke_deoptimized(Fn&& fn, Args&&... args) -> std::enable_if_t<!std::is_same<void, decltype(fn(args...))>::value> {
+            deoptimize_value(CATCH_FORWARD(fn) (CATCH_FORWARD(args)...));
+        }
 
+        template <typename Fn, typename... Args>
+        inline auto invoke_deoptimized(Fn&& fn, Args&&... args) -> std::enable_if_t<std::is_same<void, decltype(fn(args...))>::value> {
+            CATCH_FORWARD((fn)) (CATCH_FORWARD(args)...);
+        }
+    } // namespace Benchmark
 } // namespace Catch
 
-#endif // CATCH_TEST_FAILURE_EXCEPTION_HPP_INCLUDED
+#endif // CATCH_OPTIMIZER_HPP_INCLUDED
 
 
 #ifndef CATCH_META_HPP_INCLUDED
@@ -1840,112 +1500,6 @@ namespace mpl_{
 
 #endif // CATCH_META_HPP_INCLUDED
 
-
-#ifndef CATCH_INTERFACES_REGISTRY_HUB_HPP_INCLUDED
-#define CATCH_INTERFACES_REGISTRY_HUB_HPP_INCLUDED
-
-
-#include <string>
-
-namespace Catch {
-
-    class TestCaseHandle;
-    struct TestCaseInfo;
-    class ITestCaseRegistry;
-    class IExceptionTranslatorRegistry;
-    class IExceptionTranslator;
-    class IReporterRegistry;
-    class IReporterFactory;
-    class ITagAliasRegistry;
-    class ITestInvoker;
-    class IMutableEnumValuesRegistry;
-    struct SourceLineInfo;
-
-    class StartupExceptionRegistry;
-    class EventListenerFactory;
-
-    using IReporterFactoryPtr = Detail::unique_ptr<IReporterFactory>;
-
-    class IRegistryHub {
-    public:
-        virtual ~IRegistryHub(); // = default
-
-        virtual IReporterRegistry const& getReporterRegistry() const = 0;
-        virtual ITestCaseRegistry const& getTestCaseRegistry() const = 0;
-        virtual ITagAliasRegistry const& getTagAliasRegistry() const = 0;
-        virtual IExceptionTranslatorRegistry const& getExceptionTranslatorRegistry() const = 0;
-
-
-        virtual StartupExceptionRegistry const& getStartupExceptionRegistry() const = 0;
-    };
-
-    class IMutableRegistryHub {
-    public:
-        virtual ~IMutableRegistryHub(); // = default
-        virtual void registerReporter( std::string const& name, IReporterFactoryPtr factory ) = 0;
-        virtual void registerListener( Detail::unique_ptr<EventListenerFactory> factory ) = 0;
-        virtual void registerTest(Detail::unique_ptr<TestCaseInfo>&& testInfo, Detail::unique_ptr<ITestInvoker>&& invoker) = 0;
-        virtual void registerTranslator( Detail::unique_ptr<IExceptionTranslator>&& translator ) = 0;
-        virtual void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) = 0;
-        virtual void registerStartupException() noexcept = 0;
-        virtual IMutableEnumValuesRegistry& getMutableEnumValuesRegistry() = 0;
-    };
-
-    IRegistryHub const& getRegistryHub();
-    IMutableRegistryHub& getMutableRegistryHub();
-    void cleanUp();
-    std::string translateActiveException();
-
-}
-
-#endif // CATCH_INTERFACES_REGISTRY_HUB_HPP_INCLUDED
-
-#include <type_traits>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename T>
-            struct CompleteType { using type = T; };
-            template <>
-            struct CompleteType<void> { struct type {}; };
-
-            template <typename T>
-            using CompleteType_t = typename CompleteType<T>::type;
-
-            template <typename Result>
-            struct CompleteInvoker {
-                template <typename Fun, typename... Args>
-                static Result invoke(Fun&& fun, Args&&... args) {
-                    return CATCH_FORWARD(fun)(CATCH_FORWARD(args)...);
-                }
-            };
-            template <>
-            struct CompleteInvoker<void> {
-                template <typename Fun, typename... Args>
-                static CompleteType_t<void> invoke(Fun&& fun, Args&&... args) {
-                    CATCH_FORWARD(fun)(CATCH_FORWARD(args)...);
-                    return {};
-                }
-            };
-
-            // invoke and not return void :(
-            template <typename Fun, typename... Args>
-            CompleteType_t<FunctionReturnType<Fun, Args...>> complete_invoke(Fun&& fun, Args&&... args) {
-                return CompleteInvoker<FunctionReturnType<Fun, Args...>>::invoke(CATCH_FORWARD(fun), CATCH_FORWARD(args)...);
-            }
-
-        } // namespace Detail
-
-        template <typename Fun>
-        Detail::CompleteType_t<FunctionReturnType<Fun>> user_code(Fun&& fun) {
-            return Detail::complete_invoke(CATCH_FORWARD(fun));
-        }
-    } // namespace Benchmark
-} // namespace Catch
-
-#endif // CATCH_COMPLETE_INVOKE_HPP_INCLUDED
-
 namespace Catch {
     namespace Benchmark {
         namespace Detail {
@@ -1963,7 +1517,10 @@ namespace Catch {
                 void start() override { started = Clock::now(); }
                 void finish() override { finished = Clock::now(); }
 
-                ClockDuration<Clock> elapsed() const { return finished - started; }
+                IDuration elapsed() const {
+                    return std::chrono::duration_cast<std::chrono::nanoseconds>(
+                        finished - started );
+                }
 
                 TimePoint<Clock> started;
                 TimePoint<Clock> finished;
@@ -2004,50 +1561,6 @@ namespace Catch {
 
 #endif // CATCH_CHRONOMETER_HPP_INCLUDED
 
-
-// Adapted from donated nonius code.
-
-#ifndef CATCH_ENVIRONMENT_HPP_INCLUDED
-#define CATCH_ENVIRONMENT_HPP_INCLUDED
-
-
-namespace Catch {
-    namespace Benchmark {
-        template <typename Duration>
-        struct EnvironmentEstimate {
-            Duration mean;
-            OutlierClassification outliers;
-
-            template <typename Duration2>
-            operator EnvironmentEstimate<Duration2>() const {
-                return { mean, outliers };
-            }
-        };
-        template <typename Clock>
-        struct Environment {
-            using clock_type = Clock;
-            EnvironmentEstimate<FloatDuration<Clock>> clock_resolution;
-            EnvironmentEstimate<FloatDuration<Clock>> clock_cost;
-        };
-    } // namespace Benchmark
-} // namespace Catch
-
-#endif // CATCH_ENVIRONMENT_HPP_INCLUDED
-
-
-// Adapted from donated nonius code.
-
-#ifndef CATCH_EXECUTION_PLAN_HPP_INCLUDED
-#define CATCH_EXECUTION_PLAN_HPP_INCLUDED
-
-
-
-// Adapted from donated nonius code.
-
-#ifndef CATCH_BENCHMARK_FUNCTION_HPP_INCLUDED
-#define CATCH_BENCHMARK_FUNCTION_HPP_INCLUDED
-
-
 #include <type_traits>
 
 namespace Catch {
@@ -2184,6 +1697,57 @@ namespace Catch {
 
 
 
+// Adapted from donated nonius code.
+
+#ifndef CATCH_COMPLETE_INVOKE_HPP_INCLUDED
+#define CATCH_COMPLETE_INVOKE_HPP_INCLUDED
+
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename T>
+            struct CompleteType { using type = T; };
+            template <>
+            struct CompleteType<void> { struct type {}; };
+
+            template <typename T>
+            using CompleteType_t = typename CompleteType<T>::type;
+
+            template <typename Result>
+            struct CompleteInvoker {
+                template <typename Fun, typename... Args>
+                static Result invoke(Fun&& fun, Args&&... args) {
+                    return CATCH_FORWARD(fun)(CATCH_FORWARD(args)...);
+                }
+            };
+            template <>
+            struct CompleteInvoker<void> {
+                template <typename Fun, typename... Args>
+                static CompleteType_t<void> invoke(Fun&& fun, Args&&... args) {
+                    CATCH_FORWARD(fun)(CATCH_FORWARD(args)...);
+                    return {};
+                }
+            };
+
+            // invoke and not return void :(
+            template <typename Fun, typename... Args>
+            CompleteType_t<FunctionReturnType<Fun, Args...>> complete_invoke(Fun&& fun, Args&&... args) {
+                return CompleteInvoker<FunctionReturnType<Fun, Args...>>::invoke(CATCH_FORWARD(fun), CATCH_FORWARD(args)...);
+            }
+
+        } // namespace Detail
+
+        template <typename Fun>
+        Detail::CompleteType_t<FunctionReturnType<Fun>> user_code(Fun&& fun) {
+            return Detail::complete_invoke(CATCH_FORWARD(fun));
+        }
+    } // namespace Benchmark
+} // namespace Catch
+
+#endif // CATCH_COMPLETE_INVOKE_HPP_INCLUDED
+
+
 // Adapted from donated nonius code.
 
 #ifndef CATCH_TIMING_HPP_INCLUDED
@@ -2194,14 +1758,14 @@ namespace Catch {
 
 namespace Catch {
     namespace Benchmark {
-        template <typename Duration, typename Result>
+        template <typename Result>
         struct Timing {
-            Duration elapsed;
+            IDuration elapsed;
             Result result;
             int iterations;
         };
-        template <typename Clock, typename Func, typename... Args>
-        using TimingOf = Timing<ClockDuration<Clock>, Detail::CompleteType_t<FunctionReturnType<Func, Args...>>>;
+        template <typename Func, typename... Args>
+        using TimingOf = Timing<Detail::CompleteType_t<FunctionReturnType<Func, Args...>>>;
     } // namespace Benchmark
 } // namespace Catch
 
@@ -2211,7 +1775,7 @@ namespace Catch {
     namespace Benchmark {
         namespace Detail {
             template <typename Clock, typename Fun, typename... Args>
-            TimingOf<Clock, Fun, Args...> measure(Fun&& fun, Args&&... args) {
+            TimingOf<Fun, Args...> measure(Fun&& fun, Args&&... args) {
                 auto start = Clock::now();
                 auto&& r = Detail::complete_invoke(fun, CATCH_FORWARD(args)...);
                 auto end = Clock::now();
@@ -2230,11 +1794,11 @@ namespace Catch {
     namespace Benchmark {
         namespace Detail {
             template <typename Clock, typename Fun>
-            TimingOf<Clock, Fun, int> measure_one(Fun&& fun, int iters, std::false_type) {
+            TimingOf<Fun, int> measure_one(Fun&& fun, int iters, std::false_type) {
                 return Detail::measure<Clock>(fun, iters);
             }
             template <typename Clock, typename Fun>
-            TimingOf<Clock, Fun, Chronometer> measure_one(Fun&& fun, int iters, std::true_type) {
+            TimingOf<Fun, Chronometer> measure_one(Fun&& fun, int iters, std::true_type) {
                 Detail::ChronometerModel<Clock> meter;
                 auto&& result = Detail::complete_invoke(fun, Chronometer(meter, iters));
 
@@ -2249,8 +1813,8 @@ namespace Catch {
             void throw_optimized_away_error();
 
             template <typename Clock, typename Fun>
-            TimingOf<Clock, Fun, run_for_at_least_argument_t<Clock, Fun>>
-                run_for_at_least(ClockDuration<Clock> how_long,
+            TimingOf<Fun, run_for_at_least_argument_t<Clock, Fun>>
+                run_for_at_least(IDuration how_long,
                                  const int initial_iterations,
                                  Fun&& fun) {
                 auto iters = initial_iterations;
@@ -2270,38 +1834,38 @@ namespace Catch {
 
 #endif // CATCH_RUN_FOR_AT_LEAST_HPP_INCLUDED
 
-#include <algorithm>
-#include <iterator>
+#include <vector>
 
 namespace Catch {
     namespace Benchmark {
-        template <typename Duration>
         struct ExecutionPlan {
             int iterations_per_sample;
-            Duration estimated_duration;
+            FDuration estimated_duration;
             Detail::BenchmarkFunction benchmark;
-            Duration warmup_time;
+            FDuration warmup_time;
             int warmup_iterations;
 
-            template <typename Duration2>
-            operator ExecutionPlan<Duration2>() const {
-                return { iterations_per_sample, estimated_duration, benchmark, warmup_time, warmup_iterations };
-            }
-
             template <typename Clock>
-            std::vector<FloatDuration<Clock>> run(const IConfig &cfg, Environment<FloatDuration<Clock>> env) const {
+            std::vector<FDuration> run(const IConfig &cfg, Environment env) const {
                 // warmup a bit
-                Detail::run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(warmup_time), warmup_iterations, Detail::repeat(now<Clock>{}));
+                Detail::run_for_at_least<Clock>(
+                    std::chrono::duration_cast<IDuration>( warmup_time ),
+                    warmup_iterations,
+                    Detail::repeat( []() { return Clock::now(); } )
+                );
 
-                std::vector<FloatDuration<Clock>> times;
-                times.reserve(cfg.benchmarkSamples());
-                std::generate_n(std::back_inserter(times), cfg.benchmarkSamples(), [this, env] {
+                std::vector<FDuration> times;
+                const auto num_samples = cfg.benchmarkSamples();
+                times.reserve( num_samples );
+                for ( size_t i = 0; i < num_samples; ++i ) {
                     Detail::ChronometerModel<Clock> model;
-                    this->benchmark(Chronometer(model, iterations_per_sample));
+                    this->benchmark( Chronometer( model, iterations_per_sample ) );
                     auto sample_time = model.elapsed() - env.clock_cost.mean;
-                    if (sample_time < FloatDuration<Clock>::zero()) sample_time = FloatDuration<Clock>::zero();
-                    return sample_time / iterations_per_sample;
-                });
+                    if ( sample_time < FDuration::zero() ) {
+                        sample_time = FDuration::zero();
+                    }
+                    times.push_back(sample_time / iterations_per_sample);
+                }
                 return times;
             }
         };
@@ -2324,122 +1888,35 @@ namespace Catch {
 #define CATCH_STATS_HPP_INCLUDED
 
 
-#include <algorithm>
 #include <vector>
-#include <numeric>
-#include <tuple>
-#include <cmath>
 
 namespace Catch {
     namespace Benchmark {
         namespace Detail {
             using sample = std::vector<double>;
 
-            // Used when we know we want == comparison of two doubles
-            // to centralize warning suppression
-            bool directCompare( double lhs, double rhs );
-
-            double weighted_average_quantile(int k, int q, std::vector<double>::iterator first, std::vector<double>::iterator last);
-
-            template <typename Iterator>
-            OutlierClassification classify_outliers(Iterator first, Iterator last) {
-                std::vector<double> copy(first, last);
-
-                auto q1 = weighted_average_quantile(1, 4, copy.begin(), copy.end());
-                auto q3 = weighted_average_quantile(3, 4, copy.begin(), copy.end());
-                auto iqr = q3 - q1;
-                auto los = q1 - (iqr * 3.);
-                auto lom = q1 - (iqr * 1.5);
-                auto him = q3 + (iqr * 1.5);
-                auto his = q3 + (iqr * 3.);
-
-                OutlierClassification o;
-                for (; first != last; ++first) {
-                    auto&& t = *first;
-                    if (t < los) ++o.low_severe;
-                    else if (t < lom) ++o.low_mild;
-                    else if (t > his) ++o.high_severe;
-                    else if (t > him) ++o.high_mild;
-                    ++o.samples_seen;
-                }
-                return o;
-            }
-
-            template <typename Iterator>
-            double mean(Iterator first, Iterator last) {
-                auto count = last - first;
-                double sum = std::accumulate(first, last, 0.);
-                return sum / static_cast<double>(count);
-            }
+            double weighted_average_quantile( int k,
+                                              int q,
+                                              double* first,
+                                              double* last );
 
-            template <typename Estimator, typename Iterator>
-            sample jackknife(Estimator&& estimator, Iterator first, Iterator last) {
-                auto n = static_cast<size_t>(last - first);
-                auto second = first;
-                ++second;
-                sample results;
-                results.reserve(n);
+            OutlierClassification
+            classify_outliers( double const* first, double const* last );
 
-                for (auto it = first; it != last; ++it) {
-                    std::iter_swap(it, first);
-                    results.push_back(estimator(second, last));
-                }
-
-                return results;
-            }
+            double mean( double const* first, double const* last );
 
-            inline double normal_cdf(double x) {
-                return std::erfc(-x / std::sqrt(2.0)) / 2.0;
-            }
+            double normal_cdf( double x );
 
             double erfc_inv(double x);
 
             double normal_quantile(double p);
 
-            template <typename Iterator, typename Estimator>
-            Estimate<double> bootstrap(double confidence_level, Iterator first, Iterator last, sample const& resample, Estimator&& estimator) {
-                auto n_samples = last - first;
-
-                double point = estimator(first, last);
-                // Degenerate case with a single sample
-                if (n_samples == 1) return { point, point, point, confidence_level };
-
-                sample jack = jackknife(estimator, first, last);
-                double jack_mean = mean(jack.begin(), jack.end());
-                double sum_squares, sum_cubes;
-                std::tie(sum_squares, sum_cubes) = std::accumulate(jack.begin(), jack.end(), std::make_pair(0., 0.), [jack_mean](std::pair<double, double> sqcb, double x) -> std::pair<double, double> {
-                    auto d = jack_mean - x;
-                    auto d2 = d * d;
-                    auto d3 = d2 * d;
-                    return { sqcb.first + d2, sqcb.second + d3 };
-                });
-
-                double accel = sum_cubes / (6 * std::pow(sum_squares, 1.5));
-                long n = static_cast<long>(resample.size());
-                double prob_n = std::count_if(resample.begin(), resample.end(), [point](double x) { return x < point; }) / static_cast<double>(n);
-                // degenerate case with uniform samples
-                if ( directCompare( prob_n, 0. ) ) {
-                    return { point, point, point, confidence_level };
-                }
-
-                double bias = normal_quantile(prob_n);
-                double z1 = normal_quantile((1. - confidence_level) / 2.);
-
-                auto cumn = [n]( double x ) -> long {
-                    return std::lround( normal_cdf( x ) * static_cast<double>(n) );
-                };
-                auto a = [bias, accel](double b) { return bias + b / (1. - accel * b); };
-                double b1 = bias + z1;
-                double b2 = bias - z1;
-                double a1 = a(b1);
-                double a2 = a(b2);
-                auto lo = static_cast<size_t>((std::max)(cumn(a1), 0l));
-                auto hi = static_cast<size_t>((std::min)(cumn(a2), n - 1));
-
-                return { point, resample[lo], resample[hi], confidence_level };
-            }
-
-            double outlier_variance(Estimate<double> mean, Estimate<double> stddev, int n);
+            Estimate<double>
+            bootstrap( double confidence_level,
+                       double* first,
+                       double* last,
+                       sample const& resample,
+                       double ( *estimator )( double const*, double const* ) );
 
             struct bootstrap_analysis {
                 Estimate<double> mean;
@@ -2447,7 +1924,10 @@ namespace Catch {
                 double outlier_variance;
             };
 
-            bootstrap_analysis analyse_samples(double confidence_level, unsigned int n_resamples, std::vector<double>::iterator first, std::vector<double>::iterator last);
+            bootstrap_analysis analyse_samples(double confidence_level,
+                                               unsigned int n_resamples,
+                                               double* first,
+                                               double* last);
         } // namespace Detail
     } // namespace Benchmark
 } // namespace Catch
@@ -2455,7 +1935,6 @@ namespace Catch {
 #endif // CATCH_STATS_HPP_INCLUDED
 
 #include <algorithm>
-#include <iterator>
 #include <vector>
 #include <cmath>
 
@@ -2466,46 +1945,49 @@ namespace Catch {
             std::vector<double> resolution(int k) {
                 std::vector<TimePoint<Clock>> times;
                 times.reserve(static_cast<size_t>(k + 1));
-                std::generate_n(std::back_inserter(times), k + 1, now<Clock>{});
+                for ( int i = 0; i < k + 1; ++i ) {
+                    times.push_back( Clock::now() );
+                }
 
                 std::vector<double> deltas;
                 deltas.reserve(static_cast<size_t>(k));
-                std::transform(std::next(times.begin()), times.end(), times.begin(),
-                    std::back_inserter(deltas),
-                    [](TimePoint<Clock> a, TimePoint<Clock> b) { return static_cast<double>((a - b).count()); });
+                for ( size_t idx = 1; idx < times.size(); ++idx ) {
+                    deltas.push_back( static_cast<double>(
+                        ( times[idx] - times[idx - 1] ).count() ) );
+                }
 
                 return deltas;
             }
 
-            const auto warmup_iterations = 10000;
-            const auto warmup_time = std::chrono::milliseconds(100);
-            const auto minimum_ticks = 1000;
-            const auto warmup_seed = 10000;
-            const auto clock_resolution_estimation_time = std::chrono::milliseconds(500);
-            const auto clock_cost_estimation_time_limit = std::chrono::seconds(1);
-            const auto clock_cost_estimation_tick_limit = 100000;
-            const auto clock_cost_estimation_time = std::chrono::milliseconds(10);
-            const auto clock_cost_estimation_iterations = 10000;
+            constexpr auto warmup_iterations = 10000;
+            constexpr auto warmup_time = std::chrono::milliseconds(100);
+            constexpr auto minimum_ticks = 1000;
+            constexpr auto warmup_seed = 10000;
+            constexpr auto clock_resolution_estimation_time = std::chrono::milliseconds(500);
+            constexpr auto clock_cost_estimation_time_limit = std::chrono::seconds(1);
+            constexpr auto clock_cost_estimation_tick_limit = 100000;
+            constexpr auto clock_cost_estimation_time = std::chrono::milliseconds(10);
+            constexpr auto clock_cost_estimation_iterations = 10000;
 
             template <typename Clock>
             int warmup() {
-                return run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(warmup_time), warmup_seed, &resolution<Clock>)
+                return run_for_at_least<Clock>(warmup_time, warmup_seed, &resolution<Clock>)
                     .iterations;
             }
             template <typename Clock>
-            EnvironmentEstimate<FloatDuration<Clock>> estimate_clock_resolution(int iterations) {
-                auto r = run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(clock_resolution_estimation_time), iterations, &resolution<Clock>)
+            EnvironmentEstimate estimate_clock_resolution(int iterations) {
+                auto r = run_for_at_least<Clock>(clock_resolution_estimation_time, iterations, &resolution<Clock>)
                     .result;
                 return {
-                    FloatDuration<Clock>(mean(r.begin(), r.end())),
-                    classify_outliers(r.begin(), r.end()),
+                    FDuration(mean(r.data(), r.data() + r.size())),
+                    classify_outliers(r.data(), r.data() + r.size()),
                 };
             }
             template <typename Clock>
-            EnvironmentEstimate<FloatDuration<Clock>> estimate_clock_cost(FloatDuration<Clock> resolution) {
+            EnvironmentEstimate estimate_clock_cost(FDuration resolution) {
                 auto time_limit = (std::min)(
                     resolution * clock_cost_estimation_tick_limit,
-                    FloatDuration<Clock>(clock_cost_estimation_time_limit));
+                    FDuration(clock_cost_estimation_time_limit));
                 auto time_clock = [](int k) {
                     return Detail::measure<Clock>([k] {
                         for (int i = 0; i < k; ++i) {
@@ -2516,26 +1998,28 @@ namespace Catch {
                 };
                 time_clock(1);
                 int iters = clock_cost_estimation_iterations;
-                auto&& r = run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(clock_cost_estimation_time), iters, time_clock);
+                auto&& r = run_for_at_least<Clock>(clock_cost_estimation_time, iters, time_clock);
                 std::vector<double> times;
                 int nsamples = static_cast<int>(std::ceil(time_limit / r.elapsed));
                 times.reserve(static_cast<size_t>(nsamples));
-                std::generate_n(std::back_inserter(times), nsamples, [time_clock, &r] {
-                    return static_cast<double>((time_clock(r.iterations) / r.iterations).count());
-                });
+                for ( int s = 0; s < nsamples; ++s ) {
+                    times.push_back( static_cast<double>(
+                        ( time_clock( r.iterations ) / r.iterations )
+                            .count() ) );
+                }
                 return {
-                    FloatDuration<Clock>(mean(times.begin(), times.end())),
-                    classify_outliers(times.begin(), times.end()),
+                    FDuration(mean(times.data(), times.data() + times.size())),
+                    classify_outliers(times.data(), times.data() + times.size()),
                 };
             }
 
             template <typename Clock>
-            Environment<FloatDuration<Clock>> measure_environment() {
+            Environment measure_environment() {
 #if defined(__clang__)
 #    pragma clang diagnostic push
 #    pragma clang diagnostic ignored "-Wexit-time-destructors"
 #endif
-                static Catch::Detail::unique_ptr<Environment<FloatDuration<Clock>>> env;
+                static Catch::Detail::unique_ptr<Environment> env;
 #if defined(__clang__)
 #    pragma clang diagnostic pop
 #endif
@@ -2547,7 +2031,7 @@ namespace Catch {
                 auto resolution = Detail::estimate_clock_resolution<Clock>(iters);
                 auto cost = Detail::estimate_clock_cost<Clock>(resolution.mean);
 
-                env = Catch::Detail::make_unique<Environment<FloatDuration<Clock>>>( Environment<FloatDuration<Clock>>{resolution, cost} );
+                env = Catch::Detail::make_unique<Environment>( Environment{resolution, cost} );
                 return *env;
             }
         } // namespace Detail
@@ -2570,95 +2054,29 @@ namespace Catch {
 #define CATCH_SAMPLE_ANALYSIS_HPP_INCLUDED
 
 
-#include <algorithm>
 #include <vector>
-#include <iterator>
 
 namespace Catch {
     namespace Benchmark {
-        template <typename Duration>
         struct SampleAnalysis {
-            std::vector<Duration> samples;
-            Estimate<Duration> mean;
-            Estimate<Duration> standard_deviation;
+            std::vector<FDuration> samples;
+            Estimate<FDuration> mean;
+            Estimate<FDuration> standard_deviation;
             OutlierClassification outliers;
             double outlier_variance;
-
-            template <typename Duration2>
-            operator SampleAnalysis<Duration2>() const {
-                std::vector<Duration2> samples2;
-                samples2.reserve(samples.size());
-                std::transform(samples.begin(), samples.end(), std::back_inserter(samples2), [](Duration d) { return Duration2(d); });
-                return {
-                    CATCH_MOVE(samples2),
-                    mean,
-                    standard_deviation,
-                    outliers,
-                    outlier_variance,
-                };
-            }
         };
     } // namespace Benchmark
 } // namespace Catch
 
 #endif // CATCH_SAMPLE_ANALYSIS_HPP_INCLUDED
 
-#include <algorithm>
-#include <iterator>
-#include <vector>
 
 namespace Catch {
+    class IConfig;
+
     namespace Benchmark {
         namespace Detail {
-            template <typename Duration, typename Iterator>
-            SampleAnalysis<Duration> analyse(const IConfig &cfg, Environment<Duration>, Iterator first, Iterator last) {
-                if (!cfg.benchmarkNoAnalysis()) {
-                    std::vector<double> samples;
-                    samples.reserve(static_cast<size_t>(last - first));
-                    std::transform(first, last, std::back_inserter(samples), [](Duration d) { return d.count(); });
-
-                    auto analysis = Catch::Benchmark::Detail::analyse_samples(cfg.benchmarkConfidenceInterval(), cfg.benchmarkResamples(), samples.begin(), samples.end());
-                    auto outliers = Catch::Benchmark::Detail::classify_outliers(samples.begin(), samples.end());
-
-                    auto wrap_estimate = [](Estimate<double> e) {
-                        return Estimate<Duration> {
-                            Duration(e.point),
-                                Duration(e.lower_bound),
-                                Duration(e.upper_bound),
-                                e.confidence_interval,
-                        };
-                    };
-                    std::vector<Duration> samples2;
-                    samples2.reserve(samples.size());
-                    std::transform(samples.begin(), samples.end(), std::back_inserter(samples2), [](double d) { return Duration(d); });
-                    return {
-                        CATCH_MOVE(samples2),
-                        wrap_estimate(analysis.mean),
-                        wrap_estimate(analysis.standard_deviation),
-                        outliers,
-                        analysis.outlier_variance,
-                    };
-                } else {
-                    std::vector<Duration> samples;
-                    samples.reserve(static_cast<size_t>(last - first));
-
-                    Duration mean = Duration(0);
-                    int i = 0;
-                    for (auto it = first; it < last; ++it, ++i) {
-                        samples.push_back(Duration(*it));
-                        mean += Duration(*it);
-                    }
-                    mean /= i;
-
-                    return {
-                        CATCH_MOVE(samples),
-                        Estimate<Duration>{mean, mean, mean, 0.0},
-                        Estimate<Duration>{Duration(0), Duration(0), Duration(0), 0.0},
-                        OutlierClassification{},
-                        0.0
-                    };
-                }
-            }
+            SampleAnalysis analyse(const IConfig &cfg, FDuration* first, FDuration* last);
         } // namespace Detail
     } // namespace Benchmark
 } // namespace Catch
@@ -2666,9 +2084,9 @@ namespace Catch {
 #endif // CATCH_ANALYSE_HPP_INCLUDED
 
 #include <algorithm>
-#include <functional>
+#include <chrono>
+#include <exception>
 #include <string>
-#include <vector>
 #include <cmath>
 
 namespace Catch {
@@ -2682,16 +2100,18 @@ namespace Catch {
                 : fun(CATCH_MOVE(func)), name(CATCH_MOVE(benchmarkName)) {}
 
             template <typename Clock>
-            ExecutionPlan<FloatDuration<Clock>> prepare(const IConfig &cfg, Environment<FloatDuration<Clock>> env) const {
+            ExecutionPlan prepare(const IConfig &cfg, Environment env) const {
                 auto min_time = env.clock_resolution.mean * Detail::minimum_ticks;
                 auto run_time = std::max(min_time, std::chrono::duration_cast<decltype(min_time)>(cfg.benchmarkWarmupTime()));
-                auto&& test = Detail::run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(run_time), 1, fun);
+                auto&& test = Detail::run_for_at_least<Clock>(std::chrono::duration_cast<IDuration>(run_time), 1, fun);
                 int new_iters = static_cast<int>(std::ceil(min_time * test.iterations / test.elapsed));
-                return { new_iters, test.elapsed / test.iterations * new_iters * cfg.benchmarkSamples(), fun, std::chrono::duration_cast<FloatDuration<Clock>>(cfg.benchmarkWarmupTime()), Detail::warmup_iterations };
+                return { new_iters, test.elapsed / test.iterations * new_iters * cfg.benchmarkSamples(), fun, std::chrono::duration_cast<FDuration>(cfg.benchmarkWarmupTime()), Detail::warmup_iterations };
             }
 
             template <typename Clock = default_clock>
             void run() {
+                static_assert( Clock::is_steady,
+                               "Benchmarking clock should be steady" );
                 auto const* cfg = getCurrentContext().getConfig();
 
                 auto env = Detail::measure_environment<Clock>();
@@ -2718,10 +2138,10 @@ namespace Catch {
                         return plan.template run<Clock>(*cfg, env);
                     });
 
-                    auto analysis = Detail::analyse(*cfg, env, samples.begin(), samples.end());
-                    BenchmarkStats<FloatDuration<Clock>> stats{ CATCH_MOVE(info), CATCH_MOVE(analysis.samples), analysis.mean, analysis.standard_deviation, analysis.outliers, analysis.outlier_variance };
+                    auto analysis = Detail::analyse(*cfg, samples.data(), samples.data() + samples.size());
+                    BenchmarkStats<> stats{ CATCH_MOVE(info), CATCH_MOVE(analysis.samples), analysis.mean, analysis.standard_deviation, analysis.outliers, analysis.outlier_variance };
                     getResultCapture().benchmarkEnded(stats);
-                } CATCH_CATCH_ANON (TestFailureException) {
+                } CATCH_CATCH_ANON (TestFailureException const&) {
                     getResultCapture().benchmarkFailed("Benchmark failed due to failed assertion"_sr);
                 } CATCH_CATCH_ALL{
                     getResultCapture().benchmarkFailed(translateActiveException());
@@ -2889,6 +2309,7 @@ namespace Catch {
 #ifndef CATCH_CONFIG_WCHAR_HPP_INCLUDED
 #define CATCH_CONFIG_WCHAR_HPP_INCLUDED
 
+
 // We assume that WCHAR should be enabled by default, and only disabled
 // for a shortlist (so far only DJGPP) of compilers.
 
@@ -3112,7 +2533,6 @@ namespace Catch {
     } // namespace Detail
 
 
-    // If we decide for C++14, change these to enable_if_ts
     template <typename T, typename = void>
     struct StringMaker {
         template <typename Fake = T>
@@ -3395,6 +2815,12 @@ namespace Catch {
             }
         }
     };
+    template <>
+    struct StringMaker<std::nullopt_t> {
+        static std::string convert(const std::nullopt_t&) {
+            return "{ }";
+        }
+    };
 }
 #endif // CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER
 
@@ -3781,6 +3207,143 @@ struct StringMaker<Catch::Approx> {
 #endif // CATCH_APPROX_HPP_INCLUDED
 
 
+#ifndef CATCH_ASSERTION_INFO_HPP_INCLUDED
+#define CATCH_ASSERTION_INFO_HPP_INCLUDED
+
+
+
+#ifndef CATCH_SOURCE_LINE_INFO_HPP_INCLUDED
+#define CATCH_SOURCE_LINE_INFO_HPP_INCLUDED
+
+#include <cstddef>
+#include <iosfwd>
+
+namespace Catch {
+
+    struct SourceLineInfo {
+
+        SourceLineInfo() = delete;
+        constexpr SourceLineInfo( char const* _file, std::size_t _line ) noexcept:
+            file( _file ),
+            line( _line )
+        {}
+
+        bool operator == ( SourceLineInfo const& other ) const noexcept;
+        bool operator < ( SourceLineInfo const& other ) const noexcept;
+
+        char const* file;
+        std::size_t line;
+
+        friend std::ostream& operator << (std::ostream& os, SourceLineInfo const& info);
+    };
+}
+
+#define CATCH_INTERNAL_LINEINFO \
+    ::Catch::SourceLineInfo( __FILE__, static_cast<std::size_t>( __LINE__ ) )
+
+#endif // CATCH_SOURCE_LINE_INFO_HPP_INCLUDED
+
+namespace Catch {
+
+    struct AssertionInfo {
+        // AssertionInfo() = delete;
+
+        StringRef macroName;
+        SourceLineInfo lineInfo;
+        StringRef capturedExpression;
+        ResultDisposition::Flags resultDisposition;
+    };
+
+} // end namespace Catch
+
+#endif // CATCH_ASSERTION_INFO_HPP_INCLUDED
+
+
+#ifndef CATCH_ASSERTION_RESULT_HPP_INCLUDED
+#define CATCH_ASSERTION_RESULT_HPP_INCLUDED
+
+
+
+#ifndef CATCH_LAZY_EXPR_HPP_INCLUDED
+#define CATCH_LAZY_EXPR_HPP_INCLUDED
+
+#include <iosfwd>
+
+namespace Catch {
+
+    class ITransientExpression;
+
+    class LazyExpression {
+        friend class AssertionHandler;
+        friend struct AssertionStats;
+        friend class RunContext;
+
+        ITransientExpression const* m_transientExpression = nullptr;
+        bool m_isNegated;
+    public:
+        LazyExpression( bool isNegated ):
+            m_isNegated(isNegated)
+        {}
+        LazyExpression(LazyExpression const& other) = default;
+        LazyExpression& operator = ( LazyExpression const& ) = delete;
+
+        explicit operator bool() const {
+            return m_transientExpression != nullptr;
+        }
+
+        friend auto operator << ( std::ostream& os, LazyExpression const& lazyExpr ) -> std::ostream&;
+    };
+
+} // namespace Catch
+
+#endif // CATCH_LAZY_EXPR_HPP_INCLUDED
+
+#include <string>
+
+namespace Catch {
+
+    struct AssertionResultData
+    {
+        AssertionResultData() = delete;
+
+        AssertionResultData( ResultWas::OfType _resultType, LazyExpression const& _lazyExpression );
+
+        std::string message;
+        mutable std::string reconstructedExpression;
+        LazyExpression lazyExpression;
+        ResultWas::OfType resultType;
+
+        std::string reconstructExpression() const;
+    };
+
+    class AssertionResult {
+    public:
+        AssertionResult() = delete;
+        AssertionResult( AssertionInfo const& info, AssertionResultData&& data );
+
+        bool isOk() const;
+        bool succeeded() const;
+        ResultWas::OfType getResultType() const;
+        bool hasExpression() const;
+        bool hasMessage() const;
+        std::string getExpression() const;
+        std::string getExpressionInMacro() const;
+        bool hasExpandedExpression() const;
+        std::string getExpandedExpression() const;
+        StringRef getMessage() const;
+        SourceLineInfo getSourceInfo() const;
+        StringRef getTestMacroName() const;
+
+    //protected:
+        AssertionInfo m_info;
+        AssertionResultData m_resultData;
+    };
+
+} // end namespace Catch
+
+#endif // CATCH_ASSERTION_RESULT_HPP_INCLUDED
+
+
 #ifndef CATCH_CONFIG_HPP_INCLUDED
 #define CATCH_CONFIG_HPP_INCLUDED
 
@@ -3945,6 +3508,7 @@ namespace Catch {
 #ifndef CATCH_OPTIONAL_HPP_INCLUDED
 #define CATCH_OPTIONAL_HPP_INCLUDED
 
+
 #include <cassert>
 
 namespace Catch {
@@ -3953,35 +3517,50 @@ namespace Catch {
     template<typename T>
     class Optional {
     public:
-        Optional() : nullableValue( nullptr ) {}
-        Optional( T const& _value )
-        : nullableValue( new( storage ) T( _value ) )
-        {}
-        Optional( Optional const& _other )
-        : nullableValue( _other ? new( storage ) T( *_other ) : nullptr )
-        {}
+        Optional(): nullableValue( nullptr ) {}
+        ~Optional() { reset(); }
+
+        Optional( T const& _value ):
+            nullableValue( new ( storage ) T( _value ) ) {}
+        Optional( T&& _value ):
+            nullableValue( new ( storage ) T( CATCH_MOVE( _value ) ) ) {}
 
-        ~Optional() {
+        Optional& operator=( T const& _value ) {
+            reset();
+            nullableValue = new ( storage ) T( _value );
+            return *this;
+        }
+        Optional& operator=( T&& _value ) {
             reset();
+            nullableValue = new ( storage ) T( CATCH_MOVE( _value ) );
+            return *this;
         }
 
-        Optional& operator= ( Optional const& _other ) {
-            if( &_other != this ) {
+        Optional( Optional const& _other ):
+            nullableValue( _other ? new ( storage ) T( *_other ) : nullptr ) {}
+        Optional( Optional&& _other ):
+            nullableValue( _other ? new ( storage ) T( CATCH_MOVE( *_other ) )
+                                  : nullptr ) {}
+
+        Optional& operator=( Optional const& _other ) {
+            if ( &_other != this ) {
                 reset();
-                if( _other )
-                    nullableValue = new( storage ) T( *_other );
+                if ( _other ) { nullableValue = new ( storage ) T( *_other ); }
             }
             return *this;
         }
-        Optional& operator = ( T const& _value ) {
-            reset();
-            nullableValue = new( storage ) T( _value );
+        Optional& operator=( Optional&& _other ) {
+            if ( &_other != this ) {
+                reset();
+                if ( _other ) {
+                    nullableValue = new ( storage ) T( CATCH_MOVE( *_other ) );
+                }
+            }
             return *this;
         }
 
         void reset() {
-            if( nullableValue )
-                nullableValue->~T();
+            if ( nullableValue ) { nullableValue->~T(); }
             nullableValue = nullptr;
         }
 
@@ -4025,177 +3604,42 @@ namespace Catch {
         }
         friend bool operator!=(Optional const& a, Optional const& b) {
             return !( a == b );
-        }
-
-    private:
-        T *nullableValue;
-        alignas(alignof(T)) char storage[sizeof(T)];
-    };
-
-} // end namespace Catch
-
-#endif // CATCH_OPTIONAL_HPP_INCLUDED
-
-
-#ifndef CATCH_RANDOM_SEED_GENERATION_HPP_INCLUDED
-#define CATCH_RANDOM_SEED_GENERATION_HPP_INCLUDED
-
-#include <cstdint>
-
-namespace Catch {
-
-    enum class GenerateFrom {
-        Time,
-        RandomDevice,
-        //! Currently equivalent to RandomDevice, but can change at any point
-        Default
-    };
-
-    std::uint32_t generateRandomSeed(GenerateFrom from);
-
-} // end namespace Catch
-
-#endif // CATCH_RANDOM_SEED_GENERATION_HPP_INCLUDED
-
-
-#ifndef CATCH_REPORTER_SPEC_PARSER_HPP_INCLUDED
-#define CATCH_REPORTER_SPEC_PARSER_HPP_INCLUDED
-
-
-
-#ifndef CATCH_CONSOLE_COLOUR_HPP_INCLUDED
-#define CATCH_CONSOLE_COLOUR_HPP_INCLUDED
-
-
-#include <iosfwd>
-#include <cstdint>
-
-namespace Catch {
-
-    enum class ColourMode : std::uint8_t;
-    class IStream;
-
-    struct Colour {
-        enum Code {
-            None = 0,
-
-            White,
-            Red,
-            Green,
-            Blue,
-            Cyan,
-            Yellow,
-            Grey,
-
-            Bright = 0x10,
-
-            BrightRed = Bright | Red,
-            BrightGreen = Bright | Green,
-            LightGrey = Bright | Grey,
-            BrightWhite = Bright | White,
-            BrightYellow = Bright | Yellow,
-
-            // By intention
-            FileName = LightGrey,
-            Warning = BrightYellow,
-            ResultError = BrightRed,
-            ResultSuccess = BrightGreen,
-            ResultExpectedFailure = Warning,
-
-            Error = BrightRed,
-            Success = Green,
-            Skip = LightGrey,
-
-            OriginalExpression = Cyan,
-            ReconstructedExpression = BrightYellow,
-
-            SecondaryText = LightGrey,
-            Headers = White
-        };
-    };
-
-    class ColourImpl {
-    protected:
-        //! The associated stream of this ColourImpl instance
-        IStream* m_stream;
-    public:
-        ColourImpl( IStream* stream ): m_stream( stream ) {}
-
-        //! RAII wrapper around writing specific colour of text using specific
-        //! colour impl into a stream.
-        class ColourGuard {
-            ColourImpl const* m_colourImpl;
-            Colour::Code m_code;
-            bool m_engaged = false;
+        }
 
-        public:
-            //! Does **not** engage the guard/start the colour
-            ColourGuard( Colour::Code code,
-                         ColourImpl const* colour );
+    private:
+        T* nullableValue;
+        alignas(alignof(T)) char storage[sizeof(T)];
+    };
 
-            ColourGuard( ColourGuard const& rhs ) = delete;
-            ColourGuard& operator=( ColourGuard const& rhs ) = delete;
+} // end namespace Catch
 
-            ColourGuard( ColourGuard&& rhs ) noexcept;
-            ColourGuard& operator=( ColourGuard&& rhs ) noexcept;
+#endif // CATCH_OPTIONAL_HPP_INCLUDED
 
-            //! Removes colour _if_ the guard was engaged
-            ~ColourGuard();
 
-            /**
-             * Explicitly engages colour for given stream.
-             *
-             * The API based on operator<< should be preferred.
-             */
-            ColourGuard& engage( std::ostream& stream ) &;
-            /**
-             * Explicitly engages colour for given stream.
-             *
-             * The API based on operator<< should be preferred.
-             */
-            ColourGuard&& engage( std::ostream& stream ) &&;
+#ifndef CATCH_RANDOM_SEED_GENERATION_HPP_INCLUDED
+#define CATCH_RANDOM_SEED_GENERATION_HPP_INCLUDED
 
-        private:
-            //! Engages the guard and starts using colour
-            friend std::ostream& operator<<( std::ostream& lhs,
-                                             ColourGuard& guard ) {
-                guard.engageImpl( lhs );
-                return lhs;
-            }
-            //! Engages the guard and starts using colour
-            friend std::ostream& operator<<( std::ostream& lhs,
-                                            ColourGuard&& guard) {
-                guard.engageImpl( lhs );
-                return lhs;
-            }
+#include <cstdint>
 
-            void engageImpl( std::ostream& stream );
+namespace Catch {
 
-        };
+    enum class GenerateFrom {
+        Time,
+        RandomDevice,
+        //! Currently equivalent to RandomDevice, but can change at any point
+        Default
+    };
 
-        virtual ~ColourImpl(); // = default
-        /**
-         * Creates a guard object for given colour and this colour impl
-         *
-         * **Important:**
-         * the guard starts disengaged, and has to be engaged explicitly.
-         */
-        ColourGuard guardColour( Colour::Code colourCode );
+    std::uint32_t generateRandomSeed(GenerateFrom from);
 
-    private:
-        virtual void use( Colour::Code colourCode ) const = 0;
-    };
+} // end namespace Catch
 
-    //! Provides ColourImpl based on global config and target compilation platform
-    Detail::unique_ptr<ColourImpl> makeColourImpl( ColourMode colourSelection,
-                                                   IStream* stream );
+#endif // CATCH_RANDOM_SEED_GENERATION_HPP_INCLUDED
 
-    //! Checks if specific colour impl has been compiled into the binary
-    bool isColourImplAvailable( ColourMode colourSelection );
 
-} // end namespace Catch
+#ifndef CATCH_REPORTER_SPEC_PARSER_HPP_INCLUDED
+#define CATCH_REPORTER_SPEC_PARSER_HPP_INCLUDED
 
-#endif // CATCH_CONSOLE_COLOUR_HPP_INCLUDED
 
 #include <map>
 #include <string>
@@ -4322,7 +3766,7 @@ namespace Catch {
         bool benchmarkNoAnalysis = false;
         unsigned int benchmarkSamples = 100;
         double benchmarkConfidenceInterval = 0.95;
-        unsigned int benchmarkResamples = 100000;
+        unsigned int benchmarkResamples = 100'000;
         std::chrono::milliseconds::rep benchmarkWarmupTime = 100;
 
         Verbosity verbosity = Verbosity::Normal;
@@ -4424,6 +3868,29 @@ namespace Catch {
 
 
 
+
+/** \file
+ * Wrapper for the CATCH_CONFIG_PREFIX_MESSAGES configuration option
+ *
+ * CATCH_CONFIG_PREFIX_ALL can be used to avoid clashes with other macros
+ * by prepending CATCH_. This may not be desirable if the only clashes are with
+ * logger macros such as INFO and WARN. In this cases
+ * CATCH_CONFIG_PREFIX_MESSAGES can be used to only prefix a small subset
+ * of relevant macros.
+ *
+ */
+
+#ifndef CATCH_CONFIG_PREFIX_MESSAGES_HPP_INCLUDED
+#define CATCH_CONFIG_PREFIX_MESSAGES_HPP_INCLUDED
+
+
+#if defined(CATCH_CONFIG_PREFIX_ALL) && !defined(CATCH_CONFIG_PREFIX_MESSAGES)
+    #define CATCH_CONFIG_PREFIX_MESSAGES
+#endif
+
+#endif // CATCH_CONFIG_PREFIX_MESSAGES_HPP_INCLUDED
+
+
 #ifndef CATCH_STREAM_END_STOP_HPP_INCLUDED
 #define CATCH_STREAM_END_STOP_HPP_INCLUDED
 
@@ -4435,10 +3902,10 @@ namespace Catch {
     // as well as
     //    << stuff +StreamEndStop
     struct StreamEndStop {
-        StringRef operator+() const { return StringRef(); }
+        constexpr StringRef operator+() const { return StringRef(); }
 
         template <typename T>
-        friend T const& operator+( T const& value, StreamEndStop ) {
+        constexpr friend T const& operator+( T const& value, StreamEndStop ) {
             return value;
         }
     };
@@ -4447,12 +3914,47 @@ namespace Catch {
 
 #endif // CATCH_STREAM_END_STOP_HPP_INCLUDED
 
+
+#ifndef CATCH_MESSAGE_INFO_HPP_INCLUDED
+#define CATCH_MESSAGE_INFO_HPP_INCLUDED
+
+
+#include <string>
+
+namespace Catch {
+
+    struct MessageInfo {
+        MessageInfo(    StringRef _macroName,
+                        SourceLineInfo const& _lineInfo,
+                        ResultWas::OfType _type );
+
+        StringRef macroName;
+        std::string message;
+        SourceLineInfo lineInfo;
+        ResultWas::OfType type;
+        unsigned int sequence;
+
+        bool operator == (MessageInfo const& other) const {
+            return sequence == other.sequence;
+        }
+        bool operator < (MessageInfo const& other) const {
+            return sequence < other.sequence;
+        }
+    private:
+        static unsigned int globalCount;
+    };
+
+} // end namespace Catch
+
+#endif // CATCH_MESSAGE_INFO_HPP_INCLUDED
+
 #include <string>
 #include <vector>
 
 namespace Catch {
 
     struct SourceLineInfo;
+    class IResultCapture;
 
     struct MessageStream {
 
@@ -4493,7 +3995,7 @@ namespace Catch {
 
     class Capturer {
         std::vector<MessageInfo> m_messages;
-        IResultCapture& m_resultCapture = getResultCapture();
+        IResultCapture& m_resultCapture;
         size_t m_captured = 0;
     public:
         Capturer( StringRef macroName, SourceLineInfo const& lineInfo, ResultWas::OfType resultType, StringRef names );
@@ -4544,28 +4046,28 @@ namespace Catch {
     Catch::getResultCapture().emplaceUnscopedMessage( Catch::MessageBuilder( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log )
 
 
-#if defined(CATCH_CONFIG_PREFIX_ALL) && !defined(CATCH_CONFIG_DISABLE)
+#if defined(CATCH_CONFIG_PREFIX_MESSAGES) && !defined(CATCH_CONFIG_DISABLE)
 
   #define CATCH_INFO( msg ) INTERNAL_CATCH_INFO( "CATCH_INFO", msg )
   #define CATCH_UNSCOPED_INFO( msg ) INTERNAL_CATCH_UNSCOPED_INFO( "CATCH_UNSCOPED_INFO", msg )
   #define CATCH_WARN( msg ) INTERNAL_CATCH_MSG( "CATCH_WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg )
   #define CATCH_CAPTURE( ... ) INTERNAL_CATCH_CAPTURE( INTERNAL_CATCH_UNIQUE_NAME(capturer), "CATCH_CAPTURE", __VA_ARGS__ )
 
-#elif defined(CATCH_CONFIG_PREFIX_ALL) && defined(CATCH_CONFIG_DISABLE)
+#elif defined(CATCH_CONFIG_PREFIX_MESSAGES) && defined(CATCH_CONFIG_DISABLE)
 
   #define CATCH_INFO( msg )          (void)(0)
   #define CATCH_UNSCOPED_INFO( msg ) (void)(0)
   #define CATCH_WARN( msg )          (void)(0)
   #define CATCH_CAPTURE( ... )       (void)(0)
 
-#elif !defined(CATCH_CONFIG_PREFIX_ALL) && !defined(CATCH_CONFIG_DISABLE)
+#elif !defined(CATCH_CONFIG_PREFIX_MESSAGES) && !defined(CATCH_CONFIG_DISABLE)
 
   #define INFO( msg ) INTERNAL_CATCH_INFO( "INFO", msg )
   #define UNSCOPED_INFO( msg ) INTERNAL_CATCH_UNSCOPED_INFO( "UNSCOPED_INFO", msg )
   #define WARN( msg ) INTERNAL_CATCH_MSG( "WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg )
   #define CAPTURE( ... ) INTERNAL_CATCH_CAPTURE( INTERNAL_CATCH_UNIQUE_NAME(capturer), "CAPTURE", __VA_ARGS__ )
 
-#elif !defined(CATCH_CONFIG_PREFIX_ALL) && defined(CATCH_CONFIG_DISABLE)
+#elif !defined(CATCH_CONFIG_PREFIX_MESSAGES) && defined(CATCH_CONFIG_DISABLE)
 
   #define INFO( msg )          (void)(0)
   #define UNSCOPED_INFO( msg ) (void)(0)
@@ -4580,6 +4082,75 @@ namespace Catch {
 #endif // CATCH_MESSAGE_HPP_INCLUDED
 
 
+#ifndef CATCH_SECTION_INFO_HPP_INCLUDED
+#define CATCH_SECTION_INFO_HPP_INCLUDED
+
+
+
+#ifndef CATCH_TOTALS_HPP_INCLUDED
+#define CATCH_TOTALS_HPP_INCLUDED
+
+#include <cstdint>
+
+namespace Catch {
+
+    struct Counts {
+        Counts operator - ( Counts const& other ) const;
+        Counts& operator += ( Counts const& other );
+
+        std::uint64_t total() const;
+        bool allPassed() const;
+        bool allOk() const;
+
+        std::uint64_t passed = 0;
+        std::uint64_t failed = 0;
+        std::uint64_t failedButOk = 0;
+        std::uint64_t skipped = 0;
+    };
+
+    struct Totals {
+
+        Totals operator - ( Totals const& other ) const;
+        Totals& operator += ( Totals const& other );
+
+        Totals delta( Totals const& prevTotals ) const;
+
+        Counts assertions;
+        Counts testCases;
+    };
+}
+
+#endif // CATCH_TOTALS_HPP_INCLUDED
+
+#include <string>
+
+namespace Catch {
+
+    struct SectionInfo {
+        // The last argument is ignored, so that people can write
+        // SECTION("ShortName", "Proper description that is long") and
+        // still use the `-c` flag comfortably.
+        SectionInfo( SourceLineInfo const& _lineInfo, std::string _name,
+                    const char* const = nullptr ):
+            name(CATCH_MOVE(_name)),
+            lineInfo(_lineInfo)
+            {}
+
+        std::string name;
+        SourceLineInfo lineInfo;
+    };
+
+    struct SectionEndInfo {
+        SectionInfo sectionInfo;
+        Counts prevAssertions;
+        double durationInSeconds;
+    };
+
+} // end namespace Catch
+
+#endif // CATCH_SECTION_INFO_HPP_INCLUDED
+
+
 #ifndef CATCH_SESSION_HPP_INCLUDED
 #define CATCH_SESSION_HPP_INCLUDED
 
@@ -4683,17 +4254,16 @@ namespace Catch {
             enum class TokenType { Option, Argument };
             struct Token {
                 TokenType type;
-                std::string token;
+                StringRef token;
             };
 
             // Abstracts iterators into args as a stream of tokens, with option
             // arguments uniformly handled
             class TokenStream {
-                using Iterator = std::vector<std::string>::const_iterator;
+                using Iterator = std::vector<StringRef>::const_iterator;
                 Iterator it;
                 Iterator itEnd;
                 std::vector<Token> m_tokenBuffer;
-
                 void loadBuffer();
 
             public:
@@ -4745,12 +4315,17 @@ namespace Catch {
                 ResultType m_type;
             };
 
-            template <typename T> class ResultValueBase : public ResultBase {
+            template <typename T>
+            class ResultValueBase : public ResultBase {
             public:
-                auto value() const -> T const& {
+                T const& value() const& {
                     enforceOk();
                     return m_value;
                 }
+                T&& value() && {
+                    enforceOk();
+                    return CATCH_MOVE( m_value );
+                }
 
             protected:
                 ResultValueBase( ResultType type ): ResultBase( type ) {}
@@ -4760,13 +4335,23 @@ namespace Catch {
                     if ( m_type == ResultType::Ok )
                         new ( &m_value ) T( other.m_value );
                 }
+                ResultValueBase( ResultValueBase&& other ):
+                    ResultBase( other ) {
+                    if ( m_type == ResultType::Ok )
+                        new ( &m_value ) T( CATCH_MOVE(other.m_value) );
+                }
 
-                ResultValueBase( ResultType, T const& value ): ResultBase( ResultType::Ok ) {
+
+                ResultValueBase( ResultType, T const& value ):
+                    ResultBase( ResultType::Ok ) {
                     new ( &m_value ) T( value );
                 }
+                ResultValueBase( ResultType, T&& value ):
+                    ResultBase( ResultType::Ok ) {
+                    new ( &m_value ) T( CATCH_MOVE(value) );
+                }
 
-                auto operator=( ResultValueBase const& other )
-                    -> ResultValueBase& {
+                ResultValueBase& operator=( ResultValueBase const& other ) {
                     if ( m_type == ResultType::Ok )
                         m_value.~T();
                     ResultBase::operator=( other );
@@ -4774,6 +4359,14 @@ namespace Catch {
                         new ( &m_value ) T( other.m_value );
                     return *this;
                 }
+                ResultValueBase& operator=( ResultValueBase&& other ) {
+                    if ( m_type == ResultType::Ok ) m_value.~T();
+                    ResultBase::operator=( other );
+                    if ( m_type == ResultType::Ok )
+                        new ( &m_value ) T( CATCH_MOVE(other.m_value) );
+                    return *this;
+                }
+
 
                 ~ResultValueBase() override {
                     if ( m_type == ResultType::Ok )
@@ -4801,8 +4394,8 @@ namespace Catch {
                 }
 
                 template <typename U>
-                static auto ok( U const& value ) -> BasicResult {
-                    return { ResultType::Ok, value };
+                static auto ok( U&& value ) -> BasicResult {
+                    return { ResultType::Ok, CATCH_FORWARD(value) };
                 }
                 static auto ok() -> BasicResult { return { ResultType::Ok }; }
                 static auto logicError( std::string&& message )
@@ -4849,12 +4442,15 @@ namespace Catch {
             class ParseState {
             public:
                 ParseState( ParseResultType type,
-                            TokenStream const& remainingTokens );
+                            TokenStream remainingTokens );
 
                 ParseResultType type() const { return m_type; }
-                TokenStream const& remainingTokens() const {
+                TokenStream const& remainingTokens() const& {
                     return m_remainingTokens;
                 }
+                TokenStream&& remainingTokens() && {
+                    return CATCH_MOVE( m_remainingTokens );
+                }
 
             private:
                 ParseResultType m_type;
@@ -4867,7 +4463,7 @@ namespace Catch {
 
             struct HelpColumns {
                 std::string left;
-                std::string right;
+                StringRef descriptions;
             };
 
             template <typename T>
@@ -5027,7 +4623,7 @@ namespace Catch {
                 virtual ~ParserBase() = default;
                 virtual auto validate() const -> Result { return Result::ok(); }
                 virtual auto parse( std::string const& exeName,
-                                    TokenStream const& tokens ) const
+                                    TokenStream tokens ) const
                     -> InternalParseResult = 0;
                 virtual size_t cardinality() const;
 
@@ -5047,8 +4643,8 @@ namespace Catch {
             protected:
                 Optionality m_optionality = Optionality::Optional;
                 std::shared_ptr<BoundRef> m_ref;
-                std::string m_hint;
-                std::string m_description;
+                StringRef m_hint;
+                StringRef m_description;
 
                 explicit ParserRefImpl( std::shared_ptr<BoundRef> const& ref ):
                     m_ref( ref ) {}
@@ -5057,28 +4653,32 @@ namespace Catch {
                 template <typename LambdaT>
                 ParserRefImpl( accept_many_t,
                                LambdaT const& ref,
-                               std::string const& hint ):
+                               StringRef hint ):
                     m_ref( std::make_shared<BoundManyLambda<LambdaT>>( ref ) ),
                     m_hint( hint ) {}
 
                 template <typename T,
                           typename = typename std::enable_if_t<
                               !Detail::is_unary_function<T>::value>>
-                ParserRefImpl( T& ref, std::string const& hint ):
+                ParserRefImpl( T& ref, StringRef hint ):
                     m_ref( std::make_shared<BoundValueRef<T>>( ref ) ),
                     m_hint( hint ) {}
 
                 template <typename LambdaT,
                           typename = typename std::enable_if_t<
                               Detail::is_unary_function<LambdaT>::value>>
-                ParserRefImpl( LambdaT const& ref, std::string const& hint ):
+                ParserRefImpl( LambdaT const& ref, StringRef hint ):
                     m_ref( std::make_shared<BoundLambda<LambdaT>>( ref ) ),
                     m_hint( hint ) {}
 
-                auto operator()( std::string const& description ) -> DerivedT& {
+                DerivedT& operator()( StringRef description ) & {
                     m_description = description;
                     return static_cast<DerivedT&>( *this );
                 }
+                DerivedT&& operator()( StringRef description ) && {
+                    m_description = description;
+                    return static_cast<DerivedT&&>( *this );
+                }
 
                 auto optional() -> DerivedT& {
                     m_optionality = Optionality::Optional;
@@ -5101,7 +4701,7 @@ namespace Catch {
                         return 1;
                 }
 
-                std::string const& hint() const { return m_hint; }
+                StringRef hint() const { return m_hint; }
             };
 
         } // namespace detail
@@ -5115,13 +4715,13 @@ namespace Catch {
 
             Detail::InternalParseResult
                 parse(std::string const&,
-                      Detail::TokenStream const& tokens) const override;
+                      Detail::TokenStream tokens) const override;
         };
 
         // A parser for options
         class Opt : public Detail::ParserRefImpl<Opt> {
         protected:
-            std::vector<std::string> m_optNames;
+            std::vector<StringRef> m_optNames;
 
         public:
             template <typename LambdaT>
@@ -5134,33 +4734,37 @@ namespace Catch {
             template <typename LambdaT,
                       typename = typename std::enable_if_t<
                           Detail::is_unary_function<LambdaT>::value>>
-            Opt( LambdaT const& ref, std::string const& hint ):
+            Opt( LambdaT const& ref, StringRef hint ):
                 ParserRefImpl( ref, hint ) {}
 
             template <typename LambdaT>
-            Opt( accept_many_t, LambdaT const& ref, std::string const& hint ):
+            Opt( accept_many_t, LambdaT const& ref, StringRef hint ):
                 ParserRefImpl( accept_many, ref, hint ) {}
 
             template <typename T,
                       typename = typename std::enable_if_t<
                           !Detail::is_unary_function<T>::value>>
-            Opt( T& ref, std::string const& hint ):
+            Opt( T& ref, StringRef hint ):
                 ParserRefImpl( ref, hint ) {}
 
-            auto operator[](std::string const& optName) -> Opt& {
+            Opt& operator[]( StringRef optName ) & {
                 m_optNames.push_back(optName);
                 return *this;
             }
+            Opt&& operator[]( StringRef optName ) && {
+                m_optNames.push_back( optName );
+                return CATCH_MOVE(*this);
+            }
 
-            std::vector<Detail::HelpColumns> getHelpColumns() const;
+            Detail::HelpColumns getHelpColumns() const;
 
-            bool isMatch(std::string const& optToken) const;
+            bool isMatch(StringRef optToken) const;
 
             using ParserBase::parse;
 
             Detail::InternalParseResult
                 parse(std::string const&,
-                      Detail::TokenStream const& tokens) const override;
+                      Detail::TokenStream tokens) const override;
 
             Detail::Result validate() const override;
         };
@@ -5183,7 +4787,7 @@ namespace Catch {
             // handled specially
             Detail::InternalParseResult
                 parse(std::string const&,
-                      Detail::TokenStream const& tokens) const override;
+                      Detail::TokenStream tokens) const override;
 
             std::string const& name() const { return *m_name; }
             Detail::ParserResult set(std::string const& newName);
@@ -5208,16 +4812,28 @@ namespace Catch {
                 return *this;
             }
 
-            auto operator|=(Opt const& opt) -> Parser& {
-                m_options.push_back(opt);
-                return *this;
+            friend Parser& operator|=( Parser& p, Opt const& opt ) {
+                p.m_options.push_back( opt );
+                return p;
+            }
+            friend Parser& operator|=( Parser& p, Opt&& opt ) {
+                p.m_options.push_back( CATCH_MOVE(opt) );
+                return p;
             }
 
             Parser& operator|=(Parser const& other);
 
             template <typename T>
-            auto operator|(T const& other) const -> Parser {
-                return Parser(*this) |= other;
+            friend Parser operator|( Parser const& p, T&& rhs ) {
+                Parser temp( p );
+                temp |= rhs;
+                return temp;
+            }
+
+            template <typename T>
+            friend Parser operator|( Parser&& p, T&& rhs ) {
+                p |= CATCH_FORWARD(rhs);
+                return CATCH_MOVE(p);
             }
 
             std::vector<Detail::HelpColumns> getHelpColumns() const;
@@ -5235,21 +4851,23 @@ namespace Catch {
             using ParserBase::parse;
             Detail::InternalParseResult
                 parse(std::string const& exeName,
-                      Detail::TokenStream const& tokens) const override;
+                      Detail::TokenStream tokens) const override;
         };
 
-        // Transport for raw args (copied from main args, or supplied via
-        // init list for testing)
+        /**
+         * Wrapper over argc + argv, assumes that the inputs outlive it
+         */
         class Args {
             friend Detail::TokenStream;
-            std::string m_exeName;
-            std::vector<std::string> m_args;
+            StringRef m_exeName;
+            std::vector<StringRef> m_args;
 
         public:
             Args(int argc, char const* const* argv);
-            Args(std::initializer_list<std::string> args);
+            // Helper constructor for testing
+            Args(std::initializer_list<StringRef> args);
 
-            std::string const& exeName() const { return m_exeName; }
+            StringRef exeName() const { return m_exeName; }
         };
 
 
@@ -5855,8 +5473,6 @@ namespace Catch {
 
 namespace Catch {
 
-    class IResultCapture;
-
     struct AssertionReaction {
         bool shouldDebugBreak = false;
         bool shouldThrow = false;
@@ -5897,7 +5513,6 @@ namespace Catch {
         void handleUnexpectedInflightException();
 
         void complete();
-        void setCompleted();
 
         // query
         auto allowThrows() const -> bool;
@@ -5909,13 +5524,10 @@ namespace Catch {
 
 #endif // CATCH_ASSERTION_HANDLER_HPP_INCLUDED
 
-// We need this suppression to leak, because it took until GCC 10
-// for the front end to handle local suppression via _Pragma properly
-#if defined(__GNUC__) && !defined(__clang__) && !defined(__ICC) && __GNUC__ <= 9
-  #pragma GCC diagnostic ignored "-Wparentheses"
-#endif
 
-#if !defined(CATCH_CONFIG_DISABLE)
+#ifndef CATCH_PREPROCESSOR_INTERNAL_STRINGIFY_HPP_INCLUDED
+#define CATCH_PREPROCESSOR_INTERNAL_STRINGIFY_HPP_INCLUDED
+
 
 #if !defined(CATCH_CONFIG_DISABLE_STRINGIFICATION)
   #define CATCH_INTERNAL_STRINGIFY(...) #__VA_ARGS__##_catch_sr
@@ -5923,6 +5535,16 @@ namespace Catch {
   #define CATCH_INTERNAL_STRINGIFY(...) "Disabled by CATCH_CONFIG_DISABLE_STRINGIFICATION"_catch_sr
 #endif
 
+#endif // CATCH_PREPROCESSOR_INTERNAL_STRINGIFY_HPP_INCLUDED
+
+// We need this suppression to leak, because it took until GCC 10
+// for the front end to handle local suppression via _Pragma properly
+#if defined(__GNUC__) && !defined(__clang__) && !defined(__ICC) && __GNUC__ <= 9
+  #pragma GCC diagnostic ignored "-Wparentheses"
+#endif
+
+#if !defined(CATCH_CONFIG_DISABLE)
+
 #if defined(CATCH_CONFIG_FAST_COMPILE) || defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -5934,7 +5556,7 @@ namespace Catch {
 #else // CATCH_CONFIG_FAST_COMPILE
 
 #define INTERNAL_CATCH_TRY try
-#define INTERNAL_CATCH_CATCH( handler ) catch(...) { handler.handleUnexpectedInflightException(); }
+#define INTERNAL_CATCH_CATCH( handler ) catch(...) { (handler).handleUnexpectedInflightException(); }
 
 #endif
 
@@ -5990,6 +5612,7 @@ namespace Catch {
         if( catchAssertionHandler.allowThrows() ) \
             try { \
                 CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+                CATCH_INTERNAL_SUPPRESS_UNUSED_RESULT \
                 CATCH_INTERNAL_SUPPRESS_USELESS_CAST_WARNINGS \
                 static_cast<void>(__VA_ARGS__); \
                 CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
@@ -6010,6 +5633,7 @@ namespace Catch {
         if( catchAssertionHandler.allowThrows() ) \
             try { \
                 CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+                CATCH_INTERNAL_SUPPRESS_UNUSED_RESULT \
                 CATCH_INTERNAL_SUPPRESS_USELESS_CAST_WARNINGS \
                 static_cast<void>(expr); \
                 CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
@@ -6036,6 +5660,7 @@ namespace Catch {
         if( catchAssertionHandler.allowThrows() ) \
             try { \
                 CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+                CATCH_INTERNAL_SUPPRESS_UNUSED_RESULT \
                 CATCH_INTERNAL_SUPPRESS_USELESS_CAST_WARNINGS \
                 static_cast<void>(__VA_ARGS__); \
                 CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
@@ -6051,12 +5676,40 @@ namespace Catch {
 
 #endif // CATCH_CONFIG_DISABLE
 
-#endif // CATCH_TEST_MACRO_IMPL_HPP_INCLUDED
+#endif // CATCH_TEST_MACRO_IMPL_HPP_INCLUDED
+
+
+#ifndef CATCH_SECTION_HPP_INCLUDED
+#define CATCH_SECTION_HPP_INCLUDED
+
+
+
+
+/** \file
+ * Wrapper for the STATIC_ANALYSIS_SUPPORT configuration option
+ *
+ * Some of Catch2's macros can be defined differently to work better with
+ * static analysis tools, like clang-tidy or coverity.
+ * Currently the main use case is to show that `SECTION`s are executed
+ * exclusively, and not all in one run of a `TEST_CASE`.
+ */
+
+#ifndef CATCH_CONFIG_STATIC_ANALYSIS_SUPPORT_HPP_INCLUDED
+#define CATCH_CONFIG_STATIC_ANALYSIS_SUPPORT_HPP_INCLUDED
+
+
+#if defined(__clang_analyzer__) || defined(__COVERITY__)
+    #define CATCH_INTERNAL_CONFIG_STATIC_ANALYSIS_SUPPORT
+#endif
 
+#if defined( CATCH_INTERNAL_CONFIG_STATIC_ANALYSIS_SUPPORT ) && \
+    !defined( CATCH_CONFIG_NO_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT ) && \
+    !defined( CATCH_CONFIG_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT )
+#    define CATCH_CONFIG_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT
+#endif
 
-#ifndef CATCH_SECTION_HPP_INCLUDED
-#define CATCH_SECTION_HPP_INCLUDED
 
+#endif // CATCH_CONFIG_STATIC_ANALYSIS_SUPPORT_HPP_INCLUDED
 
 
 #ifndef CATCH_TIMER_HPP_INCLUDED
@@ -6103,17 +5756,63 @@ namespace Catch {
 
 } // end namespace Catch
 
-#define INTERNAL_CATCH_SECTION( ... ) \
-    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-    CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS \
-    if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::Section( CATCH_INTERNAL_LINEINFO, __VA_ARGS__ ) ) \
-    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+#if !defined(CATCH_CONFIG_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT)
+#    define INTERNAL_CATCH_SECTION( ... )                                 \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION                         \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS                  \
+        if ( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME(            \
+                 catch_internal_Section ) =                               \
+                 Catch::Section( CATCH_INTERNAL_LINEINFO, __VA_ARGS__ ) ) \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+#    define INTERNAL_CATCH_DYNAMIC_SECTION( ... )                     \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION                     \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS              \
+        if ( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME(        \
+                 catch_internal_Section ) =                           \
+                 Catch::SectionInfo(                                  \
+                     CATCH_INTERNAL_LINEINFO,                         \
+                     ( Catch::ReusableStringStream() << __VA_ARGS__ ) \
+                         .str() ) )                                   \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+#else
+
+// These section definitions imply that at most one section at one level
+// will be intered (because only one section's __LINE__ can be equal to
+// the dummy `catchInternalSectionHint` variable from `TEST_CASE`).
+
+namespace Catch {
+    namespace Detail {
+        // Intentionally without linkage, as it should only be used as a dummy
+        // symbol for static analysis.
+        int GetNewSectionHint();
+    } // namespace Detail
+} // namespace Catch
+
+
+#    define INTERNAL_CATCH_SECTION( ... )                                   \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION                           \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS                    \
+        CATCH_INTERNAL_SUPPRESS_SHADOW_WARNINGS                             \
+        if ( [[maybe_unused]] const int catchInternalPreviousSectionHint =  \
+                 catchInternalSectionHint,                                  \
+             catchInternalSectionHint = Catch::Detail::GetNewSectionHint(); \
+             catchInternalPreviousSectionHint == __LINE__ )                 \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+#    define INTERNAL_CATCH_DYNAMIC_SECTION( ... )                           \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION                           \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS                    \
+        CATCH_INTERNAL_SUPPRESS_SHADOW_WARNINGS                             \
+        if ( [[maybe_unused]] const int catchInternalPreviousSectionHint =  \
+                 catchInternalSectionHint,                                  \
+             catchInternalSectionHint = Catch::Detail::GetNewSectionHint(); \
+             catchInternalPreviousSectionHint == __LINE__ )                 \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+#endif
 
-#define INTERNAL_CATCH_DYNAMIC_SECTION( ... ) \
-    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-    CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS \
-    if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, (Catch::ReusableStringStream() << __VA_ARGS__).str() ) ) \
-    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
 
 #endif // CATCH_SECTION_HPP_INCLUDED
 
@@ -6123,42 +5822,20 @@ namespace Catch {
 
 
 
-#ifndef CATCH_INTERFACES_TESTCASE_HPP_INCLUDED
-#define CATCH_INTERFACES_TESTCASE_HPP_INCLUDED
-
-#include <vector>
+#ifndef CATCH_INTERFACES_TEST_INVOKER_HPP_INCLUDED
+#define CATCH_INTERFACES_TEST_INVOKER_HPP_INCLUDED
 
 namespace Catch {
 
-    class TestSpec;
-    struct TestCaseInfo;
-
     class ITestInvoker {
     public:
-        virtual void invoke () const = 0;
+        virtual void invoke() const = 0;
         virtual ~ITestInvoker(); // = default
     };
 
-    class TestCaseHandle;
-    class IConfig;
-
-    class ITestCaseRegistry {
-    public:
-        virtual ~ITestCaseRegistry(); // = default
-        // TODO: this exists only for adding filenames to test cases -- let's expose this in a saner way later
-        virtual std::vector<TestCaseInfo* > const& getAllInfos() const = 0;
-        virtual std::vector<TestCaseHandle> const& getAllTests() const = 0;
-        virtual std::vector<TestCaseHandle> const& getAllTestsSorted( IConfig const& config ) const = 0;
-    };
-
-    bool isThrowSafe( TestCaseHandle const& testCase, IConfig const& config );
-    bool matchTest( TestCaseHandle const& testCase, TestSpec const& testSpec, IConfig const& config );
-    std::vector<TestCaseHandle> filterTests( std::vector<TestCaseHandle> const& testCases, TestSpec const& testSpec, IConfig const& config );
-    std::vector<TestCaseHandle> const& getAllTestCasesSorted( IConfig const& config );
-
-}
+} // namespace Catch
 
-#endif // CATCH_INTERFACES_TESTCASE_HPP_INCLUDED
+#endif // CATCH_INTERFACES_TEST_INVOKER_HPP_INCLUDED
 
 
 #ifndef CATCH_PREPROCESSOR_REMOVE_PARENS_HPP_INCLUDED
@@ -6230,6 +5907,9 @@ struct AutoReg : Detail::NonCopyable {
         void TestName::test()
 #endif
 
+
+#if !defined(CATCH_CONFIG_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT)
+
     ///////////////////////////////////////////////////////////////////////////////
     #define INTERNAL_CATCH_TESTCASE2( TestName, ... ) \
         static void TestName(); \
@@ -6242,19 +5922,40 @@ struct AutoReg : Detail::NonCopyable {
     #define INTERNAL_CATCH_TESTCASE( ... ) \
         INTERNAL_CATCH_TESTCASE2( INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEST_ ), __VA_ARGS__ )
 
-    ///////////////////////////////////////////////////////////////////////////////
-    #define INTERNAL_CATCH_METHOD_AS_TEST_CASE( QualifiedMethod, ... ) \
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS \
-        namespace {                                                           \
-        const Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( \
-            Catch::makeTestInvoker( &QualifiedMethod ),                   \
-            CATCH_INTERNAL_LINEINFO,                                      \
-            "&" #QualifiedMethod##_catch_sr,                              \
-            Catch::NameAndTags{ __VA_ARGS__ } );                          \
-    } /* NOLINT */ \
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+#else  // ^^ !CATCH_CONFIG_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT | vv CATCH_CONFIG_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT
+
+
+// Dummy registrator for the dumy test case macros
+namespace Catch {
+    namespace Detail {
+        struct DummyUse {
+            DummyUse( void ( * )( int ) );
+        };
+    } // namespace Detail
+} // namespace Catch
+
+// Note that both the presence of the argument and its exact name are
+// necessary for the section support.
+
+// We provide a shadowed variable so that a `SECTION` inside non-`TEST_CASE`
+// tests can compile. The redefined `TEST_CASE` shadows this with param.
+static int catchInternalSectionHint = 0;
+
+#    define INTERNAL_CATCH_TESTCASE2( fname )                              \
+        static void fname( int );                                          \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION                          \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS                           \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS                   \
+        static const Catch::Detail::DummyUse INTERNAL_CATCH_UNIQUE_NAME(   \
+            dummyUser )( &(fname) );                                       \
+        CATCH_INTERNAL_SUPPRESS_SHADOW_WARNINGS                            \
+        static void fname( [[maybe_unused]] int catchInternalSectionHint ) \
+            CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+#    define INTERNAL_CATCH_TESTCASE( ... ) \
+        INTERNAL_CATCH_TESTCASE2( INTERNAL_CATCH_UNIQUE_NAME( dummyFunction ) )
+
+
+#endif // CATCH_CONFIG_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT
 
     ///////////////////////////////////////////////////////////////////////////////
     #define INTERNAL_CATCH_TEST_CASE_METHOD2( TestName, ClassName, ... )\
@@ -6276,6 +5977,22 @@ struct AutoReg : Detail::NonCopyable {
     #define INTERNAL_CATCH_TEST_CASE_METHOD( ClassName, ... ) \
         INTERNAL_CATCH_TEST_CASE_METHOD2( INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEST_ ), ClassName, __VA_ARGS__ )
 
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_METHOD_AS_TEST_CASE( QualifiedMethod, ... ) \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS \
+        namespace {                                                           \
+        const Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( \
+            Catch::makeTestInvoker( &QualifiedMethod ),                   \
+            CATCH_INTERNAL_LINEINFO,                                      \
+            "&" #QualifiedMethod##_catch_sr,                              \
+            Catch::NameAndTags{ __VA_ARGS__ } );                          \
+    } /* NOLINT */ \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+
     ///////////////////////////////////////////////////////////////////////////////
     #define INTERNAL_CATCH_REGISTER_TESTCASE( Function, ... ) \
         do { \
@@ -7194,6 +6911,7 @@ namespace Catch {
     };
 
     class ITestInvoker;
+    struct NameAndTags;
 
     enum class TestCaseProperties : uint8_t {
         None = 0,
@@ -7318,6 +7036,10 @@ namespace Catch {
 #include <exception>
 
 namespace Catch {
+    namespace Detail {
+        void registerTranslatorImpl(
+            Detail::unique_ptr<IExceptionTranslator>&& translator );
+    }
 
     class ExceptionTranslatorRegistrar {
         template<typename T>
@@ -7351,9 +7073,9 @@ namespace Catch {
     public:
         template<typename T>
         ExceptionTranslatorRegistrar( std::string(*translateFunction)( T const& ) ) {
-            getMutableRegistryHub().registerTranslator(
-                Detail::make_unique<ExceptionTranslator<T>>(translateFunction)
-            );
+            Detail::registerTranslatorImpl(
+                Detail::make_unique<ExceptionTranslator<T>>(
+                    translateFunction ) );
         }
     };
 
@@ -7425,7 +7147,7 @@ namespace Catch {
 #define CATCH_VERSION_MACROS_HPP_INCLUDED
 
 #define CATCH_VERSION_MAJOR 3
-#define CATCH_VERSION_MINOR 3
+#define CATCH_VERSION_MINOR 5
 #define CATCH_VERSION_PATCH 2
 
 #endif // CATCH_VERSION_MACROS_HPP_INCLUDED
@@ -7584,12 +7306,6 @@ namespace Detail {
         }
 
     public:
-        ~IGenerator() override = default;
-        IGenerator() = default;
-        IGenerator(IGenerator const&) = default;
-        IGenerator& operator=(IGenerator const&) = default;
-
-
         // Returns the current element of the generator
         //
         // \Precondition The generator is either freshly constructed,
@@ -8058,37 +7774,578 @@ namespace Catch {
             return static_cast<result_type>(-1);
         }
 
-        // Provide some default initial state for the default constructor
-        SimplePcg32():SimplePcg32(0xed743cc4U) {}
+        // Provide some default initial state for the default constructor
+        SimplePcg32():SimplePcg32(0xed743cc4U) {}
+
+        explicit SimplePcg32(result_type seed_);
+
+        void seed(result_type seed_);
+        void discard(uint64_t skip);
+
+        result_type operator()();
+
+    private:
+        friend bool operator==(SimplePcg32 const& lhs, SimplePcg32 const& rhs);
+        friend bool operator!=(SimplePcg32 const& lhs, SimplePcg32 const& rhs);
+
+        // In theory we also need operator<< and operator>>
+        // In practice we do not use them, so we will skip them for now
+
+
+        std::uint64_t m_state;
+        // This part of the state determines which "stream" of the numbers
+        // is chosen -- we take it as a constant for Catch2, so we only
+        // need to deal with seeding the main state.
+        // Picked by reading 8 bytes from `/dev/random` :-)
+        static const std::uint64_t s_inc = (0x13ed0cc53f939476ULL << 1ULL) | 1ULL;
+    };
+
+} // end namespace Catch
+
+#endif // CATCH_RANDOM_NUMBER_GENERATOR_HPP_INCLUDED
+
+
+
+#ifndef CATCH_UNIFORM_INTEGER_DISTRIBUTION_HPP_INCLUDED
+#define CATCH_UNIFORM_INTEGER_DISTRIBUTION_HPP_INCLUDED
+
+
+
+
+#ifndef CATCH_RANDOM_INTEGER_HELPERS_HPP_INCLUDED
+#define CATCH_RANDOM_INTEGER_HELPERS_HPP_INCLUDED
+
+#include <climits>
+#include <cstddef>
+#include <cstdint>
+#include <type_traits>
+
+namespace Catch {
+    namespace Detail {
+
+        template <std::size_t>
+        struct SizedUnsignedType;
+#define SizedUnsignedTypeHelper( TYPE )        \
+    template <>                                \
+    struct SizedUnsignedType<sizeof( TYPE )> { \
+        using type = TYPE;                     \
+    }
+
+        SizedUnsignedTypeHelper( std::uint8_t );
+        SizedUnsignedTypeHelper( std::uint16_t );
+        SizedUnsignedTypeHelper( std::uint32_t );
+        SizedUnsignedTypeHelper( std::uint64_t );
+#undef SizedUnsignedTypeHelper
+
+        template <std::size_t sz>
+        using SizedUnsignedType_t = typename SizedUnsignedType<sz>::type;
+
+        template <typename T>
+        using DoubleWidthUnsignedType_t = SizedUnsignedType_t<2 * sizeof( T )>;
+
+        template <typename T>
+        struct ExtendedMultResult {
+            T upper;
+            T lower;
+            friend bool operator==( ExtendedMultResult const& lhs,
+                                    ExtendedMultResult const& rhs ) {
+                return lhs.upper == rhs.upper && lhs.lower == rhs.lower;
+            }
+        };
+
+        // Returns 128 bit result of multiplying lhs and rhs
+        constexpr ExtendedMultResult<std::uint64_t>
+        extendedMult( std::uint64_t lhs, std::uint64_t rhs ) {
+            // We use the simple long multiplication approach for
+            // correctness, we can use platform specific builtins
+            // for performance later.
+
+            // Split the lhs and rhs into two 32bit "digits", so that we can
+            // do 64 bit arithmetic to handle carry bits.
+            //            32b    32b    32b    32b
+            //     lhs                  L1     L2
+            //   * rhs                  R1     R2
+            //            ------------------------
+            //                       |  R2 * L2  |
+            //                 |  R2 * L1  |
+            //                 |  R1 * L2  |
+            //           |  R1 * L1  |
+            //           -------------------------
+            //           |  a  |  b  |  c  |  d  |
+
+#define CarryBits( x ) ( x >> 32 )
+#define Digits( x ) ( x & 0xFF'FF'FF'FF )
+
+            auto r2l2 = Digits( rhs ) * Digits( lhs );
+            auto r2l1 = Digits( rhs ) * CarryBits( lhs );
+            auto r1l2 = CarryBits( rhs ) * Digits( lhs );
+            auto r1l1 = CarryBits( rhs ) * CarryBits( lhs );
+
+            // Sum to columns first
+            auto d = Digits( r2l2 );
+            auto c = CarryBits( r2l2 ) + Digits( r2l1 ) + Digits( r1l2 );
+            auto b = CarryBits( r2l1 ) + CarryBits( r1l2 ) + Digits( r1l1 );
+            auto a = CarryBits( r1l1 );
+
+            // Propagate carries between columns
+            c += CarryBits( d );
+            b += CarryBits( c );
+            a += CarryBits( b );
+
+            // Remove the used carries
+            c = Digits( c );
+            b = Digits( b );
+            a = Digits( a );
+
+#undef CarryBits
+#undef Digits
+
+            return {
+                a << 32 | b, // upper 64 bits
+                c << 32 | d  // lower 64 bits
+            };
+        }
+
+        template <typename UInt>
+        constexpr ExtendedMultResult<UInt> extendedMult( UInt lhs, UInt rhs ) {
+            static_assert( std::is_unsigned<UInt>::value,
+                           "extendedMult can only handle unsigned integers" );
+            static_assert( sizeof( UInt ) < sizeof( std::uint64_t ),
+                           "Generic extendedMult can only handle types smaller "
+                           "than uint64_t" );
+            using WideType = DoubleWidthUnsignedType_t<UInt>;
+
+            auto result = WideType( lhs ) * WideType( rhs );
+            return {
+                static_cast<UInt>( result >> ( CHAR_BIT * sizeof( UInt ) ) ),
+                static_cast<UInt>( result & UInt( -1 ) ) };
+        }
+
+
+        template <typename TargetType,
+                  typename Generator>
+            std::enable_if_t<sizeof(typename Generator::result_type) >= sizeof(TargetType),
+            TargetType> fillBitsFrom(Generator& gen) {
+            using gresult_type = typename Generator::result_type;
+            static_assert( std::is_unsigned<TargetType>::value, "Only unsigned integers are supported" );
+            static_assert( Generator::min() == 0 &&
+                           Generator::max() == static_cast<gresult_type>( -1 ),
+                           "Generator must be able to output all numbers in its result type (effectively it must be a random bit generator)" );
+
+            // We want to return the top bits from a generator, as they are
+            // usually considered higher quality.
+            constexpr auto generated_bits = sizeof( gresult_type ) * CHAR_BIT;
+            constexpr auto return_bits = sizeof( TargetType ) * CHAR_BIT;
+
+            return static_cast<TargetType>( gen() >>
+                                            ( generated_bits - return_bits) );
+        }
+
+        template <typename TargetType,
+                  typename Generator>
+            std::enable_if_t<sizeof(typename Generator::result_type) < sizeof(TargetType),
+            TargetType> fillBitsFrom(Generator& gen) {
+            using gresult_type = typename Generator::result_type;
+            static_assert( std::is_unsigned<TargetType>::value,
+                           "Only unsigned integers are supported" );
+            static_assert( Generator::min() == 0 &&
+                           Generator::max() == static_cast<gresult_type>( -1 ),
+                           "Generator must be able to output all numbers in its result type (effectively it must be a random bit generator)" );
+
+            constexpr auto generated_bits = sizeof( gresult_type ) * CHAR_BIT;
+            constexpr auto return_bits = sizeof( TargetType ) * CHAR_BIT;
+            std::size_t filled_bits = 0;
+            TargetType ret = 0;
+            do {
+                ret <<= generated_bits;
+                ret |= gen();
+                filled_bits += generated_bits;
+            } while ( filled_bits < return_bits );
+
+            return ret;
+        }
+
+        /*
+         * Transposes numbers into unsigned type while keeping their ordering
+         *
+         * This means that signed types are changed so that the ordering is
+         * [INT_MIN, ..., -1, 0, ..., INT_MAX], rather than order we would
+         * get by simple casting ([0, ..., INT_MAX, INT_MIN, ..., -1])
+         */
+        template <typename OriginalType, typename UnsignedType>
+        std::enable_if_t<std::is_signed<OriginalType>::value, UnsignedType>
+        transposeToNaturalOrder( UnsignedType in ) {
+            static_assert(
+                sizeof( OriginalType ) == sizeof( UnsignedType ),
+                "reordering requires the same sized types on both sides" );
+            static_assert( std::is_unsigned<UnsignedType>::value,
+                           "Input type must be unsigned" );
+            // Assuming 2s complement (standardized in current C++), the
+            // positive and negative numbers are already internally ordered,
+            // and their difference is in the top bit. Swapping it orders
+            // them the desired way.
+            constexpr auto highest_bit =
+                UnsignedType( 1 ) << ( sizeof( UnsignedType ) * CHAR_BIT - 1 );
+            return static_cast<UnsignedType>( in ^ highest_bit );
+        }
+
+
+
+        template <typename OriginalType,
+                  typename UnsignedType>
+        std::enable_if_t<std::is_unsigned<OriginalType>::value, UnsignedType>
+            transposeToNaturalOrder(UnsignedType in) {
+            static_assert(
+                sizeof( OriginalType ) == sizeof( UnsignedType ),
+                "reordering requires the same sized types on both sides" );
+            static_assert( std::is_unsigned<UnsignedType>::value, "Input type must be unsigned" );
+            // No reordering is needed for unsigned -> unsigned
+            return in;
+        }
+    } // namespace Detail
+} // namespace Catch
+
+#endif // CATCH_RANDOM_INTEGER_HELPERS_HPP_INCLUDED
+
+namespace Catch {
+
+    namespace Detail {
+        // Indirection to enable make_unsigned<bool> behaviour.
+        template <typename T>
+        struct make_unsigned {
+            using type = std::make_unsigned_t<T>;
+        };
+
+        template <>
+        struct make_unsigned<bool> {
+            using type = uint8_t;
+        };
+
+        template <typename T>
+        using make_unsigned_t = typename make_unsigned<T>::type;
+    }
+
+/**
+ * Implementation of uniform distribution on integers.
+ *
+ * Unlike `std::uniform_int_distribution`, this implementation supports
+ * various 1 byte integral types, including bool (but you should not
+ * actually use it for bools).
+ *
+ * The underlying algorithm is based on the one described in "Fast Random
+ * Integer Generation in an Interval" by Daniel Lemire, but has been
+ * optimized under the assumption of reuse of the same distribution object.
+ */
+template <typename IntegerType>
+class uniform_integer_distribution {
+    static_assert(std::is_integral<IntegerType>::value, "...");
+
+    using UnsignedIntegerType = Detail::make_unsigned_t<IntegerType>;
+
+    // Only the left bound is stored, and we store it converted to its
+    // unsigned image. This avoids having to do the conversions inside
+    // the operator(), at the cost of having to do the conversion in
+    // the a() getter. The right bound is only needed in the b() getter,
+    // so we recompute it there from other stored data.
+    UnsignedIntegerType m_a;
+
+    // How many different values are there in [a, b]. a == b => 1, can be 0 for distribution over all values in the type.
+    UnsignedIntegerType m_ab_distance;
+
+    // We hoisted this out of the main generation function. Technically,
+    // this means that using this distribution will be slower than Lemire's
+    // algorithm if this distribution instance will be used only few times,
+    // but it will be faster if it is used many times. Since Catch2 uses
+    // distributions only to implement random generators, we assume that each
+    // distribution will be reused many times and this is an optimization.
+    UnsignedIntegerType m_rejection_threshold = 0;
+
+    UnsignedIntegerType computeDistance(IntegerType a, IntegerType b) const {
+        // This overflows and returns 0 if a == 0 and b == TYPE_MAX.
+        // We handle that later when generating the number.
+        return transposeTo(b) - transposeTo(a) + 1;
+    }
+
+    static UnsignedIntegerType computeRejectionThreshold(UnsignedIntegerType ab_distance) {
+        // distance == 0 means that we will return all possible values from
+        // the type's range, and that we shouldn't reject anything.
+        if ( ab_distance == 0 ) { return 0; }
+        return ( ~ab_distance + 1 ) % ab_distance;
+    }
+
+    static UnsignedIntegerType transposeTo(IntegerType in) {
+        return Detail::transposeToNaturalOrder<IntegerType>(
+            static_cast<UnsignedIntegerType>( in ) );
+    }
+    static IntegerType transposeBack(UnsignedIntegerType in) {
+        return static_cast<IntegerType>(
+            Detail::transposeToNaturalOrder<IntegerType>(in) );
+    }
+
+public:
+    using result_type = IntegerType;
+
+    uniform_integer_distribution( IntegerType a, IntegerType b ):
+        m_a( transposeTo(a) ),
+        m_ab_distance( computeDistance(a, b) ),
+        m_rejection_threshold( computeRejectionThreshold(m_ab_distance) ) {
+        assert( a <= b );
+    }
+
+    template <typename Generator>
+    result_type operator()( Generator& g ) {
+        // All possible values of result_type are valid.
+        if ( m_ab_distance == 0 ) {
+            return transposeBack( Detail::fillBitsFrom<UnsignedIntegerType>( g ) );
+        }
+
+        auto random_number = Detail::fillBitsFrom<UnsignedIntegerType>( g );
+        auto emul = Detail::extendedMult( random_number, m_ab_distance );
+        // Unlike Lemire's algorithm we skip the ab_distance check, since
+        // we precomputed the rejection threshold, which is always tighter.
+        while (emul.lower < m_rejection_threshold) {
+            random_number = Detail::fillBitsFrom<UnsignedIntegerType>( g );
+            emul = Detail::extendedMult( random_number, m_ab_distance );
+        }
+
+        return transposeBack(m_a + emul.upper);
+    }
+
+    result_type a() const { return transposeBack(m_a); }
+    result_type b() const { return transposeBack(m_ab_distance + m_a - 1); }
+};
+
+} // end namespace Catch
+
+#endif // CATCH_UNIFORM_INTEGER_DISTRIBUTION_HPP_INCLUDED
+
+
+
+#ifndef CATCH_UNIFORM_FLOATING_POINT_DISTRIBUTION_HPP_INCLUDED
+#define CATCH_UNIFORM_FLOATING_POINT_DISTRIBUTION_HPP_INCLUDED
+
+
+
+
+#ifndef CATCH_RANDOM_FLOATING_POINT_HELPERS_HPP_INCLUDED
+#define CATCH_RANDOM_FLOATING_POINT_HELPERS_HPP_INCLUDED
+
+
+
+#ifndef CATCH_POLYFILLS_HPP_INCLUDED
+#define CATCH_POLYFILLS_HPP_INCLUDED
+
+namespace Catch {
+
+    bool isnan(float f);
+    bool isnan(double d);
+
+    float nextafter(float x, float y);
+    double nextafter(double x, double y);
+
+}
+
+#endif // CATCH_POLYFILLS_HPP_INCLUDED
+
+#include <cassert>
+#include <cmath>
+#include <cstdint>
+#include <limits>
+#include <type_traits>
+
+namespace Catch {
+
+    namespace Detail {
+        /**
+         * Returns the largest magnitude of 1-ULP distance inside the [a, b] range.
+         *
+         * Assumes `a < b`.
+         */
+        template <typename FloatType>
+        FloatType gamma(FloatType a, FloatType b) {
+            static_assert( std::is_floating_point<FloatType>::value,
+                           "gamma returns the largest ULP magnitude within "
+                           "floating point range [a, b]. This only makes sense "
+                           "for floating point types" );
+            assert( a <= b );
+
+            const auto gamma_up = Catch::nextafter( a, std::numeric_limits<FloatType>::infinity() ) - a;
+            const auto gamma_down = b - Catch::nextafter( b, -std::numeric_limits<FloatType>::infinity() );
+
+            return gamma_up < gamma_down ? gamma_down : gamma_up;
+        }
+
+        template <typename FloatingPoint>
+        struct DistanceTypePicker;
+        template <>
+        struct DistanceTypePicker<float> {
+            using type = std::uint32_t;
+        };
+        template <>
+        struct DistanceTypePicker<double> {
+            using type = std::uint64_t;
+        };
+
+        template <typename T>
+        using DistanceType = typename DistanceTypePicker<T>::type;
+
+#if defined( __GNUC__ ) || defined( __clang__ )
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+        /**
+         * Computes the number of equi-distant floats in [a, b]
+         *
+         * Since not every range can be split into equidistant floats
+         * exactly, we actually compute ceil(b/distance - a/distance),
+         * because in those cases we want to overcount.
+         *
+         * Uses modified Dekker's FastTwoSum algorithm to handle rounding.
+         */
+        template <typename FloatType>
+        DistanceType<FloatType>
+        count_equidistant_floats( FloatType a, FloatType b, FloatType distance ) {
+            assert( a <= b );
+            // We get distance as gamma for our uniform float distribution,
+            // so this will round perfectly.
+            const auto ag = a / distance;
+            const auto bg = b / distance;
+
+            const auto s = bg - ag;
+            const auto err = ( std::fabs( a ) <= std::fabs( b ) )
+                                 ? -ag - ( s - bg )
+                                 : bg - ( s + ag );
+            const auto ceil_s = static_cast<DistanceType<FloatType>>( std::ceil( s ) );
+
+            return ( ceil_s != s ) ? ceil_s : ceil_s + ( err > 0 );
+        }
+#if defined( __GNUC__ ) || defined( __clang__ )
+#    pragma GCC diagnostic pop
+#endif
+
+    }
 
-        explicit SimplePcg32(result_type seed_);
+} // end namespace Catch
 
-        void seed(result_type seed_);
-        void discard(uint64_t skip);
+#endif // CATCH_RANDOM_FLOATING_POINT_HELPERS_HPP_INCLUDED
 
-        result_type operator()();
+#include <cmath>
+#include <type_traits>
 
-    private:
-        friend bool operator==(SimplePcg32 const& lhs, SimplePcg32 const& rhs);
-        friend bool operator!=(SimplePcg32 const& lhs, SimplePcg32 const& rhs);
+namespace Catch {
 
-        // In theory we also need operator<< and operator>>
-        // In practice we do not use them, so we will skip them for now
+    namespace Detail {
+#if defined( __GNUC__ ) || defined( __clang__ )
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+        // The issue with overflow only happens with maximal ULP and HUGE
+        // distance, e.g. when generating numbers in [-inf, inf] for given
+        // type. So we only check for the largest possible ULP in the
+        // type, and return something that does not overflow to inf in 1 mult.
+        constexpr std::uint64_t calculate_max_steps_in_one_go(double gamma) {
+            if ( gamma == 1.99584030953472e+292 ) { return 9007199254740991; }
+            return static_cast<std::uint64_t>( -1 );
+        }
+        constexpr std::uint32_t calculate_max_steps_in_one_go(float gamma) {
+            if ( gamma == 2.028241e+31f ) { return 16777215; }
+            return static_cast<std::uint32_t>( -1 );
+        }
+#if defined( __GNUC__ ) || defined( __clang__ )
+#    pragma GCC diagnostic pop
+#endif
+    }
 
+/**
+ * Implementation of uniform distribution on floating point numbers.
+ *
+ * Note that we support only `float` and `double` types, because these
+ * usually mean the same thing across different platform. `long double`
+ * varies wildly by platform and thus we cannot provide reproducible
+ * implementation. Also note that we don't implement all parts of
+ * distribution per standard: this distribution is not serializable, nor
+ * can the range be arbitrarily reset.
+ *
+ * The implementation also uses different approach than the one taken by
+ * `std::uniform_real_distribution`, where instead of generating a number
+ * between [0, 1) and then multiplying the range bounds with it, we first
+ * split the [a, b] range into a set of equidistributed floating point
+ * numbers, and then use uniform int distribution to pick which one to
+ * return.
+ *
+ * This has the advantage of guaranteeing uniformity (the multiplication
+ * method loses uniformity due to rounding when multiplying floats), except
+ * for small non-uniformity at one side of the interval, where we have
+ * to deal with the fact that not every interval is splittable into
+ * equidistributed floats.
+ *
+ * Based on "Drawing random floating-point numbers from an interval" by
+ * Frederic Goualard.
+ */
+template <typename FloatType>
+class uniform_floating_point_distribution {
+    static_assert(std::is_floating_point<FloatType>::value, "...");
+    static_assert(!std::is_same<FloatType, long double>::value,
+                  "We do not support long double due to inconsistent behaviour between platforms");
+
+    using WidthType = Detail::DistanceType<FloatType>;
+
+    FloatType m_a, m_b;
+    FloatType m_ulp_magnitude;
+    WidthType m_floats_in_range;
+    uniform_integer_distribution<WidthType> m_int_dist;
+
+    // In specific cases, we can overflow into `inf` when computing the
+    // `steps * g` offset. To avoid this, we don't offset by more than this
+    // in one multiply + addition.
+    WidthType m_max_steps_in_one_go;
+    // We don't want to do the magnitude check every call to `operator()`
+    bool m_a_has_leq_magnitude;
 
-        std::uint64_t m_state;
-        // This part of the state determines which "stream" of the numbers
-        // is chosen -- we take it as a constant for Catch2, so we only
-        // need to deal with seeding the main state.
-        // Picked by reading 8 bytes from `/dev/random` :-)
-        static const std::uint64_t s_inc = (0x13ed0cc53f939476ULL << 1ULL) | 1ULL;
-    };
+public:
+    using result_type = FloatType;
+
+    uniform_floating_point_distribution( FloatType a, FloatType b ):
+        m_a( a ),
+        m_b( b ),
+        m_ulp_magnitude( Detail::gamma( m_a, m_b ) ),
+        m_floats_in_range( Detail::count_equidistant_floats( m_a, m_b, m_ulp_magnitude ) ),
+        m_int_dist(0, m_floats_in_range),
+        m_max_steps_in_one_go( Detail::calculate_max_steps_in_one_go(m_ulp_magnitude)),
+        m_a_has_leq_magnitude(std::fabs(m_a) <= std::fabs(m_b))
+    {
+        assert( a <= b );
+    }
 
-} // end namespace Catch
+    template <typename Generator>
+    result_type operator()( Generator& g ) {
+        WidthType steps = m_int_dist( g );
+        if ( m_a_has_leq_magnitude ) {
+            if ( steps == m_floats_in_range ) { return m_a; }
+            auto b = m_b;
+            while (steps > m_max_steps_in_one_go) {
+                b -= m_max_steps_in_one_go * m_ulp_magnitude;
+                steps -= m_max_steps_in_one_go;
+            }
+            return b - steps * m_ulp_magnitude;
+        } else {
+            if ( steps == m_floats_in_range ) { return m_b; }
+            auto a = m_a;
+            while (steps > m_max_steps_in_one_go) {
+                a += m_max_steps_in_one_go * m_ulp_magnitude;
+                steps -= m_max_steps_in_one_go;
+            }
+            return a + steps * m_ulp_magnitude;
+        }
+    }
 
-#endif // CATCH_RANDOM_NUMBER_GENERATOR_HPP_INCLUDED
+    result_type a() const { return m_a; }
+    result_type b() const { return m_b; }
+};
+
+} // end namespace Catch
 
-#include <random>
+#endif // CATCH_UNIFORM_FLOATING_POINT_DISTRIBUTION_HPP_INCLUDED
 
 namespace Catch {
 namespace Generators {
@@ -8102,7 +8359,7 @@ namespace Detail {
 template <typename Float>
 class RandomFloatingGenerator final : public IGenerator<Float> {
     Catch::SimplePcg32 m_rng;
-    std::uniform_real_distribution<Float> m_dist;
+    Catch::uniform_floating_point_distribution<Float> m_dist;
     Float m_current_number;
 public:
     RandomFloatingGenerator( Float a, Float b, std::uint32_t seed ):
@@ -8120,10 +8377,27 @@ class RandomFloatingGenerator final : public IGenerator<Float> {
     }
 };
 
+template <>
+class RandomFloatingGenerator<long double> final : public IGenerator<long double> {
+    // We still rely on <random> for this specialization, but we don't
+    // want to drag it into the header.
+    struct PImpl;
+    Catch::Detail::unique_ptr<PImpl> m_pimpl;
+    long double m_current_number;
+
+public:
+    RandomFloatingGenerator( long double a, long double b, std::uint32_t seed );
+
+    long double const& get() const override { return m_current_number; }
+    bool next() override;
+
+    ~RandomFloatingGenerator() override; // = default
+};
+
 template <typename Integer>
 class RandomIntegerGenerator final : public IGenerator<Integer> {
     Catch::SimplePcg32 m_rng;
-    std::uniform_int_distribution<Integer> m_dist;
+    Catch::uniform_integer_distribution<Integer> m_dist;
     Integer m_current_number;
 public:
     RandomIntegerGenerator( Integer a, Integer b, std::uint32_t seed ):
@@ -8144,14 +8418,6 @@ class RandomIntegerGenerator final : public IGenerator<Integer> {
 template <typename T>
 std::enable_if_t<std::is_integral<T>::value, GeneratorWrapper<T>>
 random(T a, T b) {
-    static_assert(
-        !std::is_same<T, char>::value &&
-        !std::is_same<T, int8_t>::value &&
-        !std::is_same<T, uint8_t>::value &&
-        !std::is_same<T, signed char>::value &&
-        !std::is_same<T, unsigned char>::value &&
-        !std::is_same<T, bool>::value,
-        "The requested type is not supported by the underlying random distributions from std" );
     return GeneratorWrapper<T>(
         Catch::Detail::make_unique<RandomIntegerGenerator<T>>(a, b, Detail::getSeed())
     );
@@ -8264,39 +8530,266 @@ GeneratorWrapper<ResultType> from_range(InputIterator from, InputSentinel to) {
     return GeneratorWrapper<ResultType>(Catch::Detail::make_unique<IteratorGenerator<ResultType>>(from, to));
 }
 
-template <typename Container,
-          typename ResultType = typename Container::value_type>
-GeneratorWrapper<ResultType> from_range(Container const& cnt) {
-    return GeneratorWrapper<ResultType>(Catch::Detail::make_unique<IteratorGenerator<ResultType>>(cnt.begin(), cnt.end()));
+template <typename Container>
+auto from_range(Container const& cnt) {
+    using std::begin;
+    using std::end;
+    return from_range( begin( cnt ), end( cnt ) );
 }
 
 
-} // namespace Generators
-} // namespace Catch
+} // namespace Generators
+} // namespace Catch
+
+
+#endif // CATCH_GENERATORS_RANGE_HPP_INCLUDED
+
+#endif // CATCH_GENERATORS_ALL_HPP_INCLUDED
+
+
+/** \file
+ * This is a convenience header for Catch2's interfaces. It includes
+ * **all** of Catch2 headers related to interfaces.
+ *
+ * Generally the Catch2 users should use specific includes they need,
+ * but this header can be used instead for ease-of-experimentation, or
+ * just plain convenience, at the cost of somewhat increased compilation
+ * times.
+ *
+ * When a new header is added to either the `interfaces` folder, or to
+ * the corresponding internal subfolder, it should be added here.
+ */
+
+
+#ifndef CATCH_INTERFACES_ALL_HPP_INCLUDED
+#define CATCH_INTERFACES_ALL_HPP_INCLUDED
+
+
+
+#ifndef CATCH_INTERFACES_REPORTER_HPP_INCLUDED
+#define CATCH_INTERFACES_REPORTER_HPP_INCLUDED
+
+
+
+#ifndef CATCH_TEST_RUN_INFO_HPP_INCLUDED
+#define CATCH_TEST_RUN_INFO_HPP_INCLUDED
+
+
+namespace Catch {
+
+    struct TestRunInfo {
+        constexpr TestRunInfo(StringRef _name) : name(_name) {}
+        StringRef name;
+    };
+
+} // end namespace Catch
+
+#endif // CATCH_TEST_RUN_INFO_HPP_INCLUDED
+
+#include <map>
+#include <string>
+#include <vector>
+#include <iosfwd>
+
+namespace Catch {
+
+    struct ReporterDescription;
+    struct ListenerDescription;
+    struct TagInfo;
+    struct TestCaseInfo;
+    class TestCaseHandle;
+    class IConfig;
+    class IStream;
+    enum class ColourMode : std::uint8_t;
+
+    struct ReporterConfig {
+        ReporterConfig( IConfig const* _fullConfig,
+                        Detail::unique_ptr<IStream> _stream,
+                        ColourMode colourMode,
+                        std::map<std::string, std::string> customOptions );
+
+        ReporterConfig( ReporterConfig&& ) = default;
+        ReporterConfig& operator=( ReporterConfig&& ) = default;
+        ~ReporterConfig(); // = default
+
+        Detail::unique_ptr<IStream> takeStream() &&;
+        IConfig const* fullConfig() const;
+        ColourMode colourMode() const;
+        std::map<std::string, std::string> const& customOptions() const;
+
+    private:
+        Detail::unique_ptr<IStream> m_stream;
+        IConfig const* m_fullConfig;
+        ColourMode m_colourMode;
+        std::map<std::string, std::string> m_customOptions;
+    };
+
+    struct AssertionStats {
+        AssertionStats( AssertionResult const& _assertionResult,
+                        std::vector<MessageInfo> const& _infoMessages,
+                        Totals const& _totals );
+
+        AssertionStats( AssertionStats const& )              = default;
+        AssertionStats( AssertionStats && )                  = default;
+        AssertionStats& operator = ( AssertionStats const& ) = delete;
+        AssertionStats& operator = ( AssertionStats && )     = delete;
+
+        AssertionResult assertionResult;
+        std::vector<MessageInfo> infoMessages;
+        Totals totals;
+    };
+
+    struct SectionStats {
+        SectionStats(   SectionInfo&& _sectionInfo,
+                        Counts const& _assertions,
+                        double _durationInSeconds,
+                        bool _missingAssertions );
+
+        SectionInfo sectionInfo;
+        Counts assertions;
+        double durationInSeconds;
+        bool missingAssertions;
+    };
+
+    struct TestCaseStats {
+        TestCaseStats(  TestCaseInfo const& _testInfo,
+                        Totals const& _totals,
+                        std::string&& _stdOut,
+                        std::string&& _stdErr,
+                        bool _aborting );
+
+        TestCaseInfo const * testInfo;
+        Totals totals;
+        std::string stdOut;
+        std::string stdErr;
+        bool aborting;
+    };
+
+    struct TestRunStats {
+        TestRunStats(   TestRunInfo const& _runInfo,
+                        Totals const& _totals,
+                        bool _aborting );
+
+        TestRunInfo runInfo;
+        Totals totals;
+        bool aborting;
+    };
+
+    //! By setting up its preferences, a reporter can modify Catch2's behaviour
+    //! in some regards, e.g. it can request Catch2 to capture writes to
+    //! stdout/stderr during test execution, and pass them to the reporter.
+    struct ReporterPreferences {
+        //! Catch2 should redirect writes to stdout and pass them to the
+        //! reporter
+        bool shouldRedirectStdOut = false;
+        //! Catch2 should call `Reporter::assertionEnded` even for passing
+        //! assertions
+        bool shouldReportAllAssertions = false;
+    };
+
+    /**
+     * The common base for all reporters and event listeners
+     *
+     * Implementing classes must also implement:
+     *
+     *     //! User-friendly description of the reporter/listener type
+     *     static std::string getDescription()
+     *
+     * Generally shouldn't be derived from by users of Catch2 directly,
+     * instead they should derive from one of the utility bases that
+     * derive from this class.
+     */
+    class IEventListener {
+    protected:
+        //! Derived classes can set up their preferences here
+        ReporterPreferences m_preferences;
+        //! The test run's config as filled in from CLI and defaults
+        IConfig const* m_config;
+
+    public:
+        IEventListener( IConfig const* config ): m_config( config ) {}
+
+        virtual ~IEventListener(); // = default;
+
+        // Implementing class must also provide the following static methods:
+        // static std::string getDescription();
+
+        ReporterPreferences const& getPreferences() const {
+            return m_preferences;
+        }
+
+        //! Called when no test cases match provided test spec
+        virtual void noMatchingTestCases( StringRef unmatchedSpec ) = 0;
+        //! Called for all invalid test specs from the cli
+        virtual void reportInvalidTestSpec( StringRef invalidArgument ) = 0;
+
+        /**
+         * Called once in a testing run before tests are started
+         *
+         * Not called if tests won't be run (e.g. only listing will happen)
+         */
+        virtual void testRunStarting( TestRunInfo const& testRunInfo ) = 0;
+
+        //! Called _once_ for each TEST_CASE, no matter how many times it is entered
+        virtual void testCaseStarting( TestCaseInfo const& testInfo ) = 0;
+        //! Called _every time_ a TEST_CASE is entered, including repeats (due to sections)
+        virtual void testCasePartialStarting( TestCaseInfo const& testInfo, uint64_t partNumber ) = 0;
+        //! Called when a `SECTION` is being entered. Not called for skipped sections
+        virtual void sectionStarting( SectionInfo const& sectionInfo ) = 0;
+
+        //! Called when user-code is being probed before the actual benchmark runs
+        virtual void benchmarkPreparing( StringRef benchmarkName ) = 0;
+        //! Called after probe but before the user-code is being benchmarked
+        virtual void benchmarkStarting( BenchmarkInfo const& benchmarkInfo ) = 0;
+        //! Called with the benchmark results if benchmark successfully finishes
+        virtual void benchmarkEnded( BenchmarkStats<> const& benchmarkStats ) = 0;
+        //! Called if running the benchmarks fails for any reason
+        virtual void benchmarkFailed( StringRef benchmarkName ) = 0;
 
+        //! Called before assertion success/failure is evaluated
+        virtual void assertionStarting( AssertionInfo const& assertionInfo ) = 0;
 
-#endif // CATCH_GENERATORS_RANGE_HPP_INCLUDED
+        //! Called after assertion was fully evaluated
+        virtual void assertionEnded( AssertionStats const& assertionStats ) = 0;
 
-#endif // CATCH_GENERATORS_ALL_HPP_INCLUDED
+        //! Called after a `SECTION` has finished running
+        virtual void sectionEnded( SectionStats const& sectionStats ) = 0;
+        //! Called _every time_ a TEST_CASE is entered, including repeats (due to sections)
+        virtual void testCasePartialEnded(TestCaseStats const& testCaseStats, uint64_t partNumber ) = 0;
+        //! Called _once_ for each TEST_CASE, no matter how many times it is entered
+        virtual void testCaseEnded( TestCaseStats const& testCaseStats ) = 0;
+        /**
+         * Called once after all tests in a testing run are finished
+         *
+         * Not called if tests weren't run (e.g. only listings happened)
+         */
+        virtual void testRunEnded( TestRunStats const& testRunStats ) = 0;
 
+        /**
+         * Called with test cases that are skipped due to the test run aborting.
+         * NOT called for test cases that are explicitly skipped using the `SKIP` macro.
+         *
+         * Deprecated - will be removed in the next major release.
+         */
+        virtual void skipTest( TestCaseInfo const& testInfo ) = 0;
 
-/** \file
- * This is a convenience header for Catch2's interfaces. It includes
- * **all** of Catch2 headers related to interfaces.
- *
- * Generally the Catch2 users should use specific includes they need,
- * but this header can be used instead for ease-of-experimentation, or
- * just plain convenience, at the cost of somewhat increased compilation
- * times.
- *
- * When a new header is added to either the `interfaces` folder, or to
- * the corresponding internal subfolder, it should be added here.
- */
+        //! Called if a fatal error (signal/structured exception) occurred
+        virtual void fatalErrorEncountered( StringRef error ) = 0;
 
+        //! Writes out information about provided reporters using reporter-specific format
+        virtual void listReporters(std::vector<ReporterDescription> const& descriptions) = 0;
+        //! Writes out the provided listeners descriptions using reporter-specific format
+        virtual void listListeners(std::vector<ListenerDescription> const& descriptions) = 0;
+        //! Writes out information about provided tests using reporter-specific format
+        virtual void listTests(std::vector<TestCaseHandle> const& tests) = 0;
+        //! Writes out information about the provided tags using reporter-specific format
+        virtual void listTags(std::vector<TagInfo> const& tags) = 0;
+    };
+    using IEventListenerPtr = Detail::unique_ptr<IEventListener>;
 
-#ifndef CATCH_INTERFACES_ALL_HPP_INCLUDED
-#define CATCH_INTERFACES_ALL_HPP_INCLUDED
+} // end namespace Catch
 
+#endif // CATCH_INTERFACES_REPORTER_HPP_INCLUDED
 
 
 #ifndef CATCH_INTERFACES_REPORTER_FACTORY_HPP_INCLUDED
@@ -8337,89 +8830,79 @@ namespace Catch {
 #endif // CATCH_INTERFACES_REPORTER_FACTORY_HPP_INCLUDED
 
 
-#ifndef CATCH_INTERFACES_REPORTER_REGISTRY_HPP_INCLUDED
-#define CATCH_INTERFACES_REPORTER_REGISTRY_HPP_INCLUDED
+#ifndef CATCH_INTERFACES_TAG_ALIAS_REGISTRY_HPP_INCLUDED
+#define CATCH_INTERFACES_TAG_ALIAS_REGISTRY_HPP_INCLUDED
 
+#include <string>
 
+namespace Catch {
 
-#ifndef CATCH_CASE_INSENSITIVE_COMPARISONS_HPP_INCLUDED
-#define CATCH_CASE_INSENSITIVE_COMPARISONS_HPP_INCLUDED
+    struct TagAlias;
 
+    class ITagAliasRegistry {
+    public:
+        virtual ~ITagAliasRegistry(); // = default
+        // Nullptr if not present
+        virtual TagAlias const* find( std::string const& alias ) const = 0;
+        virtual std::string expandAliases( std::string const& unexpandedTestSpec ) const = 0;
 
-namespace Catch {
-    namespace Detail {
-        //! Provides case-insensitive `op<` semantics when called
-        struct CaseInsensitiveLess {
-            bool operator()( StringRef lhs,
-                             StringRef rhs ) const;
-        };
+        static ITagAliasRegistry const& get();
+    };
 
-        //! Provides case-insensitive `op==` semantics when called
-        struct CaseInsensitiveEqualTo {
-            bool operator()( StringRef lhs,
-                             StringRef rhs ) const;
-        };
+} // end namespace Catch
 
-    } // namespace Detail
-} // namespace Catch
+#endif // CATCH_INTERFACES_TAG_ALIAS_REGISTRY_HPP_INCLUDED
 
-#endif // CATCH_CASE_INSENSITIVE_COMPARISONS_HPP_INCLUDED
 
-#include <string>
+#ifndef CATCH_INTERFACES_TESTCASE_HPP_INCLUDED
+#define CATCH_INTERFACES_TESTCASE_HPP_INCLUDED
+
 #include <vector>
-#include <map>
 
 namespace Catch {
 
+    struct TestCaseInfo;
+    class TestCaseHandle;
     class IConfig;
 
-    class IEventListener;
-    using IEventListenerPtr = Detail::unique_ptr<IEventListener>;
-    class IReporterFactory;
-    using IReporterFactoryPtr = Detail::unique_ptr<IReporterFactory>;
-    struct ReporterConfig;
-    class EventListenerFactory;
-
-    class IReporterRegistry {
+    class ITestCaseRegistry {
     public:
-        using FactoryMap = std::map<std::string, IReporterFactoryPtr, Detail::CaseInsensitiveLess>;
-        using Listeners = std::vector<Detail::unique_ptr<EventListenerFactory>>;
-
-        virtual ~IReporterRegistry(); // = default
-        virtual IEventListenerPtr create( std::string const& name, ReporterConfig&& config ) const = 0;
-        virtual FactoryMap const& getFactories() const = 0;
-        virtual Listeners const& getListeners() const = 0;
+        virtual ~ITestCaseRegistry(); // = default
+        // TODO: this exists only for adding filenames to test cases -- let's expose this in a saner way later
+        virtual std::vector<TestCaseInfo* > const& getAllInfos() const = 0;
+        virtual std::vector<TestCaseHandle> const& getAllTests() const = 0;
+        virtual std::vector<TestCaseHandle> const& getAllTestsSorted( IConfig const& config ) const = 0;
     };
 
-} // end namespace Catch
-
-#endif // CATCH_INTERFACES_REPORTER_REGISTRY_HPP_INCLUDED
-
+}
 
-#ifndef CATCH_INTERFACES_TAG_ALIAS_REGISTRY_HPP_INCLUDED
-#define CATCH_INTERFACES_TAG_ALIAS_REGISTRY_HPP_INCLUDED
+#endif // CATCH_INTERFACES_TESTCASE_HPP_INCLUDED
 
-#include <string>
+#endif // CATCH_INTERFACES_ALL_HPP_INCLUDED
 
-namespace Catch {
 
-    struct TagAlias;
+#ifndef CATCH_CASE_INSENSITIVE_COMPARISONS_HPP_INCLUDED
+#define CATCH_CASE_INSENSITIVE_COMPARISONS_HPP_INCLUDED
 
-    class ITagAliasRegistry {
-    public:
-        virtual ~ITagAliasRegistry(); // = default
-        // Nullptr if not present
-        virtual TagAlias const* find( std::string const& alias ) const = 0;
-        virtual std::string expandAliases( std::string const& unexpandedTestSpec ) const = 0;
 
-        static ITagAliasRegistry const& get();
-    };
+namespace Catch {
+    namespace Detail {
+        //! Provides case-insensitive `op<` semantics when called
+        struct CaseInsensitiveLess {
+            bool operator()( StringRef lhs,
+                             StringRef rhs ) const;
+        };
 
-} // end namespace Catch
+        //! Provides case-insensitive `op==` semantics when called
+        struct CaseInsensitiveEqualTo {
+            bool operator()( StringRef lhs,
+                             StringRef rhs ) const;
+        };
 
-#endif // CATCH_INTERFACES_TAG_ALIAS_REGISTRY_HPP_INCLUDED
+    } // namespace Detail
+} // namespace Catch
 
-#endif // CATCH_INTERFACES_ALL_HPP_INCLUDED
+#endif // CATCH_CASE_INSENSITIVE_COMPARISONS_HPP_INCLUDED
 
 
 
@@ -8446,46 +8929,182 @@ namespace Catch {
 #    define CATCH_CONFIG_ANDROID_LOGWRITE
 #endif
 
-#endif // CATCH_CONFIG_ANDROID_LOGWRITE_HPP_INCLUDED
+#endif // CATCH_CONFIG_ANDROID_LOGWRITE_HPP_INCLUDED
+
+
+
+/** \file
+ * Wrapper for UNCAUGHT_EXCEPTIONS configuration option
+ *
+ * For some functionality, Catch2 requires to know whether there is
+ * an active exception. Because `std::uncaught_exception` is deprecated
+ * in C++17, we want to use `std::uncaught_exceptions` if possible.
+ */
+
+#ifndef CATCH_CONFIG_UNCAUGHT_EXCEPTIONS_HPP_INCLUDED
+#define CATCH_CONFIG_UNCAUGHT_EXCEPTIONS_HPP_INCLUDED
+
+
+#if defined(_MSC_VER)
+#  if _MSC_VER >= 1900 // Visual Studio 2015 or newer
+#    define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
+#  endif
+#endif
+
+
+#include <exception>
+
+#if defined(__cpp_lib_uncaught_exceptions) \
+    && !defined(CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
+
+#  define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
+#endif // __cpp_lib_uncaught_exceptions
+
+
+#if defined(CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS) \
+    && !defined(CATCH_CONFIG_NO_CPP17_UNCAUGHT_EXCEPTIONS) \
+    && !defined(CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
+
+#  define CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
+#endif
+
+
+#endif // CATCH_CONFIG_UNCAUGHT_EXCEPTIONS_HPP_INCLUDED
+
+
+#ifndef CATCH_CONSOLE_COLOUR_HPP_INCLUDED
+#define CATCH_CONSOLE_COLOUR_HPP_INCLUDED
+
+
+#include <iosfwd>
+#include <cstdint>
+
+namespace Catch {
+
+    enum class ColourMode : std::uint8_t;
+    class IStream;
+
+    struct Colour {
+        enum Code {
+            None = 0,
+
+            White,
+            Red,
+            Green,
+            Blue,
+            Cyan,
+            Yellow,
+            Grey,
+
+            Bright = 0x10,
+
+            BrightRed = Bright | Red,
+            BrightGreen = Bright | Green,
+            LightGrey = Bright | Grey,
+            BrightWhite = Bright | White,
+            BrightYellow = Bright | Yellow,
+
+            // By intention
+            FileName = LightGrey,
+            Warning = BrightYellow,
+            ResultError = BrightRed,
+            ResultSuccess = BrightGreen,
+            ResultExpectedFailure = Warning,
+
+            Error = BrightRed,
+            Success = Green,
+            Skip = LightGrey,
+
+            OriginalExpression = Cyan,
+            ReconstructedExpression = BrightYellow,
+
+            SecondaryText = LightGrey,
+            Headers = White
+        };
+    };
+
+    class ColourImpl {
+    protected:
+        //! The associated stream of this ColourImpl instance
+        IStream* m_stream;
+    public:
+        ColourImpl( IStream* stream ): m_stream( stream ) {}
+
+        //! RAII wrapper around writing specific colour of text using specific
+        //! colour impl into a stream.
+        class ColourGuard {
+            ColourImpl const* m_colourImpl;
+            Colour::Code m_code;
+            bool m_engaged = false;
 
+        public:
+            //! Does **not** engage the guard/start the colour
+            ColourGuard( Colour::Code code,
+                         ColourImpl const* colour );
 
+            ColourGuard( ColourGuard const& rhs ) = delete;
+            ColourGuard& operator=( ColourGuard const& rhs ) = delete;
 
-/** \file
- * Wrapper for UNCAUGHT_EXCEPTIONS configuration option
- *
- * For some functionality, Catch2 requires to know whether there is
- * an active exception. Because `std::uncaught_exception` is deprecated
- * in C++17, we want to use `std::uncaught_exceptions` if possible.
- */
+            ColourGuard( ColourGuard&& rhs ) noexcept;
+            ColourGuard& operator=( ColourGuard&& rhs ) noexcept;
 
-#ifndef CATCH_CONFIG_UNCAUGHT_EXCEPTIONS_HPP_INCLUDED
-#define CATCH_CONFIG_UNCAUGHT_EXCEPTIONS_HPP_INCLUDED
+            //! Removes colour _if_ the guard was engaged
+            ~ColourGuard();
 
-#if defined(_MSC_VER)
-#  if _MSC_VER >= 1900 // Visual Studio 2015 or newer
-#    define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
-#  endif
-#endif
+            /**
+             * Explicitly engages colour for given stream.
+             *
+             * The API based on operator<< should be preferred.
+             */
+            ColourGuard& engage( std::ostream& stream ) &;
+            /**
+             * Explicitly engages colour for given stream.
+             *
+             * The API based on operator<< should be preferred.
+             */
+            ColourGuard&& engage( std::ostream& stream ) &&;
 
+        private:
+            //! Engages the guard and starts using colour
+            friend std::ostream& operator<<( std::ostream& lhs,
+                                             ColourGuard& guard ) {
+                guard.engageImpl( lhs );
+                return lhs;
+            }
+            //! Engages the guard and starts using colour
+            friend std::ostream& operator<<( std::ostream& lhs,
+                                            ColourGuard&& guard) {
+                guard.engageImpl( lhs );
+                return lhs;
+            }
 
-#include <exception>
+            void engageImpl( std::ostream& stream );
 
-#if defined(__cpp_lib_uncaught_exceptions) \
-    && !defined(CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
+        };
 
-#  define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
-#endif // __cpp_lib_uncaught_exceptions
+        virtual ~ColourImpl(); // = default
+        /**
+         * Creates a guard object for given colour and this colour impl
+         *
+         * **Important:**
+         * the guard starts disengaged, and has to be engaged explicitly.
+         */
+        ColourGuard guardColour( Colour::Code colourCode );
 
+    private:
+        virtual void use( Colour::Code colourCode ) const = 0;
+    };
 
-#if defined(CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS) \
-    && !defined(CATCH_CONFIG_NO_CPP17_UNCAUGHT_EXCEPTIONS) \
-    && !defined(CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
+    //! Provides ColourImpl based on global config and target compilation platform
+    Detail::unique_ptr<ColourImpl> makeColourImpl( ColourMode colourSelection,
+                                                   IStream* stream );
 
-#  define CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
-#endif
+    //! Checks if specific colour impl has been compiled into the binary
+    bool isColourImplAvailable( ColourMode colourSelection );
 
+} // end namespace Catch
 
-#endif // CATCH_CONFIG_UNCAUGHT_EXCEPTIONS_HPP_INCLUDED
+#endif // CATCH_CONSOLE_COLOUR_HPP_INCLUDED
 
 
 #ifndef CATCH_CONSOLE_WIDTH_HPP_INCLUDED
@@ -8751,7 +9370,6 @@ namespace Catch {
         ~ExceptionTranslatorRegistry() override;
         void registerTranslator( Detail::unique_ptr<IExceptionTranslator>&& translator );
         std::string translateActiveException() const override;
-        std::string tryTranslators() const;
 
     private:
         ExceptionTranslators m_translators;
@@ -8764,7 +9382,6 @@ namespace Catch {
 #ifndef CATCH_FATAL_CONDITION_HANDLER_HPP_INCLUDED
 #define CATCH_FATAL_CONDITION_HANDLER_HPP_INCLUDED
 
-
 #include <cassert>
 
 namespace Catch {
@@ -8827,17 +9444,6 @@ namespace Catch {
 #define CATCH_FLOATING_POINT_HELPERS_HPP_INCLUDED
 
 
-
-#ifndef CATCH_POLYFILLS_HPP_INCLUDED
-#define CATCH_POLYFILLS_HPP_INCLUDED
-
-namespace Catch {
-    bool isnan(float f);
-    bool isnan(double d);
-}
-
-#endif // CATCH_POLYFILLS_HPP_INCLUDED
-
 #include <cassert>
 #include <cmath>
 #include <cstdint>
@@ -8850,6 +9456,11 @@ namespace Catch {
         uint32_t convertToBits(float f);
         uint64_t convertToBits(double d);
 
+        // Used when we know we want == comparison of two doubles
+        // to centralize warning suppression
+        bool directCompare( float lhs, float rhs );
+        bool directCompare( double lhs, double rhs );
+
     } // end namespace Detail
 
 
@@ -9126,6 +9737,119 @@ namespace Catch {
 #endif // CATCH_STREAM_HPP_INCLUDED
 
 
+#ifndef CATCH_JSONWRITER_HPP_INCLUDED
+#define CATCH_JSONWRITER_HPP_INCLUDED
+
+
+#include <cstdint>
+#include <sstream>
+
+namespace Catch {
+    class JsonObjectWriter;
+    class JsonArrayWriter;
+
+    struct JsonUtils {
+        static void indent( std::ostream& os, std::uint64_t level );
+        static void appendCommaNewline( std::ostream& os,
+                                        bool& should_comma,
+                                        std::uint64_t level );
+    };
+
+    class JsonValueWriter {
+    public:
+        JsonValueWriter( std::ostream& os );
+        JsonValueWriter( std::ostream& os, std::uint64_t indent_level );
+
+        JsonObjectWriter writeObject() &&;
+        JsonArrayWriter writeArray() &&;
+
+        template <typename T>
+        void write( T const& value ) && {
+            writeImpl( value, !std::is_arithmetic<T>::value );
+        }
+        void write( StringRef value ) &&;
+        void write( bool value ) &&;
+
+    private:
+        void writeImpl( StringRef value, bool quote );
+
+        // Without this SFINAE, this overload is a better match
+        // for `std::string`, `char const*`, `char const[N]` args.
+        // While it would still work, it would cause code bloat
+        // and multiple iteration over the strings
+        template <typename T,
+                  typename = typename std::enable_if_t<
+                      !std::is_convertible<T, StringRef>::value>>
+        void writeImpl( T const& value, bool quote_value ) {
+            m_sstream << value;
+            writeImpl( m_sstream.str(), quote_value );
+        }
+
+        std::ostream& m_os;
+        std::stringstream m_sstream;
+        std::uint64_t m_indent_level;
+    };
+
+    class JsonObjectWriter {
+    public:
+        JsonObjectWriter( std::ostream& os );
+        JsonObjectWriter( std::ostream& os, std::uint64_t indent_level );
+
+        JsonObjectWriter( JsonObjectWriter&& source );
+        JsonObjectWriter& operator=( JsonObjectWriter&& source ) = delete;
+
+        ~JsonObjectWriter();
+
+        JsonValueWriter write( StringRef key );
+
+    private:
+        std::ostream& m_os;
+        std::uint64_t m_indent_level;
+        bool m_should_comma = false;
+        bool m_active = true;
+    };
+
+    class JsonArrayWriter {
+    public:
+        JsonArrayWriter( std::ostream& os );
+        JsonArrayWriter( std::ostream& os, std::uint64_t indent_level );
+
+        JsonArrayWriter( JsonArrayWriter&& source );
+        JsonArrayWriter& operator=( JsonArrayWriter&& source ) = delete;
+
+        ~JsonArrayWriter();
+
+        JsonObjectWriter writeObject();
+        JsonArrayWriter writeArray();
+
+        template <typename T>
+        JsonArrayWriter& write( T const& value ) {
+            return writeImpl( value );
+        }
+
+        JsonArrayWriter& write( bool value );
+
+    private:
+        template <typename T>
+        JsonArrayWriter& writeImpl( T const& value ) {
+            JsonUtils::appendCommaNewline(
+                m_os, m_should_comma, m_indent_level + 1 );
+            JsonValueWriter{ m_os }.write( value );
+
+            return *this;
+        }
+
+        std::ostream& m_os;
+        std::uint64_t m_indent_level;
+        bool m_should_comma = false;
+        bool m_active = true;
+    };
+
+} // namespace Catch
+
+#endif // CATCH_JSONWRITER_HPP_INCLUDED
+
+
 #ifndef CATCH_LEAK_DETECTOR_HPP_INCLUDED
 #define CATCH_LEAK_DETECTOR_HPP_INCLUDED
 
@@ -9312,28 +10036,45 @@ namespace Catch {
 
 
 #include <map>
+#include <string>
+#include <vector>
 
 namespace Catch {
 
-    class ReporterRegistry : public IReporterRegistry {
-    public:
+    class IEventListener;
+    using IEventListenerPtr = Detail::unique_ptr<IEventListener>;
+    class IReporterFactory;
+    using IReporterFactoryPtr = Detail::unique_ptr<IReporterFactory>;
+    struct ReporterConfig;
+    class EventListenerFactory;
+
+    class ReporterRegistry {
+        struct ReporterRegistryImpl;
+        Detail::unique_ptr<ReporterRegistryImpl> m_impl;
 
+    public:
         ReporterRegistry();
-        ~ReporterRegistry() override; // = default, out of line to allow fwd decl
+        ~ReporterRegistry(); // = default;
 
-        IEventListenerPtr create( std::string const& name, ReporterConfig&& config ) const override;
+        IEventListenerPtr create( std::string const& name,
+                                  ReporterConfig&& config ) const;
 
-        void registerReporter( std::string const& name, IReporterFactoryPtr factory );
-        void registerListener( Detail::unique_ptr<EventListenerFactory> factory );
+        void registerReporter( std::string const& name,
+                               IReporterFactoryPtr factory );
 
-        FactoryMap const& getFactories() const override;
-        Listeners const& getListeners() const override;
+        void
+        registerListener( Detail::unique_ptr<EventListenerFactory> factory );
 
-    private:
-        FactoryMap m_factories;
-        Listeners m_listeners;
+        std::map<std::string,
+                 IReporterFactoryPtr,
+                 Detail::CaseInsensitiveLess> const&
+        getFactories() const;
+
+        std::vector<Detail::unique_ptr<EventListenerFactory>> const&
+        getListeners() const;
     };
-}
+
+} // end namespace Catch
 
 #endif // CATCH_REPORTER_REGISTRY_HPP_INCLUDED
 
@@ -9448,7 +10189,7 @@ namespace TestCaseTracking {
 
         //! Returns true if tracker run to completion (successfully or not)
         virtual bool isComplete() const = 0;
-        //! Returns true if tracker run to completion succesfully
+        //! Returns true if tracker run to completion successfully
         bool isSuccessfullyCompleted() const {
             return m_runState == CompletedSuccessfully;
         }
@@ -9582,13 +10323,14 @@ using TestCaseTracking::SectionTracker;
 
 namespace Catch {
 
-    class IMutableContext;
     class IGeneratorTracker;
     class IConfig;
+    class IEventListener;
+    using IEventListenerPtr = Detail::unique_ptr<IEventListener>;
 
     ///////////////////////////////////////////////////////////////////////////
 
-    class RunContext : public IResultCapture {
+    class RunContext final : public IResultCapture {
 
     public:
         RunContext( RunContext const& ) = delete;
@@ -9617,7 +10359,7 @@ namespace Catch {
                     AssertionReaction& reaction ) override;
         void handleUnexpectedInflightException
                 (   AssertionInfo const& info,
-                    std::string const& message,
+                    std::string&& message,
                     AssertionReaction& reaction ) override;
         void handleIncomplete
                 (   AssertionInfo const& info ) override;
@@ -9626,6 +10368,7 @@ namespace Catch {
                     ResultWas::OfType resultType,
                     AssertionReaction &reaction ) override;
 
+        void notifyAssertionStarted( AssertionInfo const& info ) override;
         bool sectionStarted( StringRef sectionName,
                              SourceLineInfo const& sectionLineInfo,
                              Counts& assertions ) override;
@@ -9676,7 +10419,7 @@ namespace Catch {
         void resetAssertionInfo();
         bool testForMissingAssertions( Counts& assertions );
 
-        void assertionEnded( AssertionResult const& result );
+        void assertionEnded( AssertionResult&& result );
         void reportExpr
                 (   AssertionInfo const &info,
                     ResultWas::OfType resultType,
@@ -9690,7 +10433,6 @@ namespace Catch {
         void handleUnfinishedSections();
 
         TestRunInfo m_runInfo;
-        IMutableContext& m_context;
         TestCaseHandle const* m_activeTestCase = nullptr;
         ITracker* m_testCaseTracker = nullptr;
         Optional<AssertionResult> m_lastResult;
@@ -9720,7 +10462,7 @@ namespace Catch {
 #ifndef CATCH_SHARDING_HPP_INCLUDED
 #define CATCH_SHARDING_HPP_INCLUDED
 
-
+#include <cassert>
 #include <cmath>
 #include <algorithm>
 
@@ -9947,24 +10689,20 @@ namespace Catch {
 
 namespace Catch {
 
-    class TestCaseHandle;
     class IConfig;
+    class ITestInvoker;
+    class TestCaseHandle;
     class TestSpec;
 
     std::vector<TestCaseHandle> sortTests( IConfig const& config, std::vector<TestCaseHandle> const& unsortedTestCases );
 
     bool isThrowSafe( TestCaseHandle const& testCase, IConfig const& config );
-    bool matchTest( TestCaseHandle const& testCase, TestSpec const& testSpec, IConfig const& config );
-
-    void enforceNoDuplicateTestCases( std::vector<TestCaseHandle> const& functions );
 
     std::vector<TestCaseHandle> filterTests( std::vector<TestCaseHandle> const& testCases, TestSpec const& testSpec, IConfig const& config );
     std::vector<TestCaseHandle> const& getAllTestCasesSorted( IConfig const& config );
 
     class TestRegistry : public ITestCaseRegistry {
     public:
-        ~TestRegistry() override = default;
-
         void registerTest( Detail::unique_ptr<TestCaseInfo> testInfo, Detail::unique_ptr<ITestInvoker> testInvoker );
 
         std::vector<TestCaseInfo*> const& getAllInfos() const override;
@@ -9985,18 +10723,6 @@ namespace Catch {
 
     ///////////////////////////////////////////////////////////////////////////
 
-    class TestInvokerAsFunction final : public ITestInvoker {
-        using TestType = void(*)();
-        TestType m_testAsFunction;
-    public:
-        TestInvokerAsFunction(TestType testAsFunction) noexcept:
-            m_testAsFunction(testAsFunction) {}
-
-        void invoke() const override;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////
-
 
 } // end namespace Catch
 
@@ -10082,6 +10808,7 @@ namespace Catch {
 #ifndef CATCH_TEXTFLOW_HPP_INCLUDED
 #define CATCH_TEXTFLOW_HPP_INCLUDED
 
+
 #include <cassert>
 #include <string>
 #include <vector>
@@ -10110,7 +10837,7 @@ namespace Catch {
 
         public:
             /**
-             * Iterates "lines" in `Column` and return sthem
+             * Iterates "lines" in `Column` and returns them
              */
             class const_iterator {
                 friend Column;
@@ -10132,7 +10859,7 @@ namespace Catch {
                 // Calculates the length of the current line
                 void calcLength();
 
-                // Returns current indention width
+                // Returns current indentation width
                 size_t indentSize() const;
 
                 // Creates an indented and (optionally) suffixed string from
@@ -10164,20 +10891,35 @@ namespace Catch {
             using iterator = const_iterator;
 
             explicit Column( std::string const& text ): m_string( text ) {}
+            explicit Column( std::string&& text ):
+                m_string( CATCH_MOVE(text)) {}
 
-            Column& width( size_t newWidth ) {
+            Column& width( size_t newWidth ) & {
                 assert( newWidth > 0 );
                 m_width = newWidth;
                 return *this;
             }
-            Column& indent( size_t newIndent ) {
+            Column&& width( size_t newWidth ) && {
+                assert( newWidth > 0 );
+                m_width = newWidth;
+                return CATCH_MOVE( *this );
+            }
+            Column& indent( size_t newIndent ) & {
                 m_indent = newIndent;
                 return *this;
             }
-            Column& initialIndent( size_t newIndent ) {
+            Column&& indent( size_t newIndent ) && {
+                m_indent = newIndent;
+                return CATCH_MOVE( *this );
+            }
+            Column& initialIndent( size_t newIndent ) & {
                 m_initialIndent = newIndent;
                 return *this;
             }
+            Column&& initialIndent( size_t newIndent ) && {
+                m_initialIndent = newIndent;
+                return CATCH_MOVE( *this );
+            }
 
             size_t width() const { return m_width; }
             const_iterator begin() const { return const_iterator( *this ); }
@@ -10186,7 +10928,8 @@ namespace Catch {
             friend std::ostream& operator<<( std::ostream& os,
                                              Column const& col );
 
-            Columns operator+( Column const& other );
+            friend Columns operator+( Column const& lhs, Column const& rhs );
+            friend Columns operator+( Column&& lhs, Column&& rhs );
         };
 
         //! Creates a column that serves as an empty space of specific width
@@ -10230,8 +10973,10 @@ namespace Catch {
             iterator begin() const { return iterator( *this ); }
             iterator end() const { return { *this, iterator::EndTag() }; }
 
-            Columns& operator+=( Column const& col );
-            Columns operator+( Column const& col );
+            friend Columns& operator+=( Columns& lhs, Column const& rhs );
+            friend Columns& operator+=( Columns& lhs, Column&& rhs );
+            friend Columns operator+( Columns const& lhs, Column const& rhs );
+            friend Columns operator+( Columns&& lhs, Column&& rhs );
 
             friend std::ostream& operator<<( std::ostream& os,
                                              Columns const& cols );
@@ -10445,6 +11190,8 @@ namespace Catch {
 #define CATCH_MATCHERS_IMPL_HPP_INCLUDED
 
 
+#include <string>
+
 namespace Catch {
 
     template<typename ArgT, typename MatcherT>
@@ -11680,7 +12427,7 @@ namespace Catch {
 
         /**
          * Creates a matcher that checks if all elements in a range are equal
-         * to all elements in another range, in some permuation.
+         * to all elements in another range, in some permutation.
          *
          * Uses to provided predicate `predicate` to do the comparisons
          */
@@ -11850,11 +12597,10 @@ namespace Matchers {
             // - a more general approach would be via a compare template that defaults
             // to using !=. but could be specialised for, e.g. std::vector<T> etc
             // - then just call that directly
-            if (m_comparator.size() != v.size())
-                return false;
-            for (std::size_t i = 0; i < v.size(); ++i)
-                if (m_comparator[i] != v[i])
-                    return false;
+            if ( m_comparator.size() != v.size() ) { return false; }
+            for ( std::size_t i = 0; i < v.size(); ++i ) {
+                if ( !( m_comparator[i] == v[i] ) ) { return false; }
+            }
             return true;
         }
         std::string describe() const override {
@@ -12358,7 +13104,7 @@ namespace Catch {
         void skipTest(TestCaseInfo const&) override {}
 
     protected:
-        //! Should the cumulative base store the assertion expansion for succesful assertions?
+        //! Should the cumulative base store the assertion expansion for successful assertions?
         bool m_shouldStoreSuccesfulAssertions = true;
         //! Should the cumulative base store the assertion expansion for failed assertions?
         bool m_shouldStoreFailedAssertions = true;
@@ -12526,6 +13272,93 @@ namespace Catch {
 #endif // CATCH_REPORTER_HELPERS_HPP_INCLUDED
 
 
+
+#ifndef CATCH_REPORTER_JSON_HPP_INCLUDED
+#define CATCH_REPORTER_JSON_HPP_INCLUDED
+
+
+#include <stack>
+
+namespace Catch {
+    class JsonReporter : public StreamingReporterBase {
+    public:
+        JsonReporter( ReporterConfig&& config );
+
+        ~JsonReporter() override;
+
+        static std::string getDescription();
+
+    public: // StreamingReporterBase
+        void testRunStarting( TestRunInfo const& runInfo ) override;
+        void testRunEnded( TestRunStats const& runStats ) override;
+
+        void testCaseStarting( TestCaseInfo const& tcInfo ) override;
+        void testCaseEnded( TestCaseStats const& tcStats ) override;
+
+        void testCasePartialStarting( TestCaseInfo const& tcInfo,
+                                      uint64_t index ) override;
+        void testCasePartialEnded( TestCaseStats const& tcStats,
+                                   uint64_t index ) override;
+
+        void sectionStarting( SectionInfo const& sectionInfo ) override;
+        void sectionEnded( SectionStats const& sectionStats ) override;
+
+        void assertionStarting( AssertionInfo const& assertionInfo ) override;
+        void assertionEnded( AssertionStats const& assertionStats ) override;
+
+        //void testRunEndedCumulative() override;
+
+        void benchmarkPreparing( StringRef name ) override;
+        void benchmarkStarting( BenchmarkInfo const& ) override;
+        void benchmarkEnded( BenchmarkStats<> const& ) override;
+        void benchmarkFailed( StringRef error ) override;
+
+        void listReporters(
+            std::vector<ReporterDescription> const& descriptions ) override;
+        void listListeners(
+            std::vector<ListenerDescription> const& descriptions ) override;
+        void listTests( std::vector<TestCaseHandle> const& tests ) override;
+        void listTags( std::vector<TagInfo> const& tags ) override;
+
+    private:
+        Timer m_testCaseTimer;
+        enum class Writer {
+            Object,
+            Array
+        };
+
+        JsonArrayWriter& startArray();
+        JsonArrayWriter& startArray( StringRef key );
+
+        JsonObjectWriter& startObject();
+        JsonObjectWriter& startObject( StringRef key );
+
+        void endObject();
+        void endArray();
+
+        bool isInside( Writer writer );
+
+        void startListing();
+        void endListing();
+
+        // Invariant:
+        // When m_writers is not empty and its top element is
+        // - Writer::Object, then m_objectWriters is not be empty
+        // - Writer::Array,  then m_arrayWriters shall not be empty
+        std::stack<JsonObjectWriter> m_objectWriters{};
+        std::stack<JsonArrayWriter> m_arrayWriters{};
+        std::stack<Writer> m_writers{};
+
+        bool m_startedListing = false;
+
+        // std::size_t m_sectionDepth = 0;
+        // std::size_t m_sectionStarted = 0;
+    };
+} // namespace Catch
+
+#endif // CATCH_REPORTER_JSON_HPP_INCLUDED
+
+
 #ifndef CATCH_REPORTER_JUNIT_HPP_INCLUDED
 #define CATCH_REPORTER_JUNIT_HPP_INCLUDED
 
@@ -12537,8 +13370,6 @@ namespace Catch {
     public:
         JunitReporter(ReporterConfig&& _config);
 
-        ~JunitReporter() override = default;
-
         static std::string getDescription();
 
         void testRunStarting(TestRunInfo const& runInfo) override;
@@ -12665,7 +13496,8 @@ namespace Catch {
         //! independent on the reporter's concrete type
         void registerReporterImpl( std::string const& name,
                                    IReporterFactoryPtr reporterPtr );
-
+        //! Actually registers the factory, independent on listener's concrete type
+        void registerListenerImpl( Detail::unique_ptr<EventListenerFactory> listenerFactory );
     } // namespace Detail
 
     class IEventListener;
@@ -12726,7 +13558,7 @@ namespace Catch {
 
     public:
         ListenerRegistrar(StringRef listenerName) {
-            getMutableRegistryHub().registerListener( Detail::make_unique<TypedListenerFactory>(listenerName) );
+            registerListenerImpl( Detail::make_unique<TypedListenerFactory>(listenerName) );
         }
     };
 }
@@ -12778,8 +13610,6 @@ namespace Catch {
             m_shouldStoreSuccesfulAssertions = false;
         }
 
-        ~SonarQubeReporter() override = default;
-
         static std::string getDescription() {
             using namespace std::string_literals;
             return "Reports test results in the Generic Test Data SonarQube XML format"s;
@@ -12826,7 +13656,6 @@ namespace Catch {
             StreamingReporterBase( CATCH_MOVE(config) ) {
             m_preferences.shouldReportAllAssertions = true;
         }
-        ~TAPReporter() override = default;
 
         static std::string getDescription() {
             using namespace std::string_literals;
diff --git a/external_imported/Catch2/fuzzing/NullOStream.cpp b/external_imported/Catch2/fuzzing/NullOStream.cpp
index 53e0893dc..e3a181e80 100644
--- a/external_imported/Catch2/fuzzing/NullOStream.cpp
+++ b/external_imported/Catch2/fuzzing/NullOStream.cpp
@@ -1,3 +1,11 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+
 #include "NullOStream.h"
 
 void NullOStream::avoidOutOfLineVirtualCompilerWarning()
diff --git a/external_imported/Catch2/fuzzing/NullOStream.h b/external_imported/Catch2/fuzzing/NullOStream.h
index e1fe15b08..abbec09c8 100644
--- a/external_imported/Catch2/fuzzing/NullOStream.h
+++ b/external_imported/Catch2/fuzzing/NullOStream.h
@@ -1,3 +1,11 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+
 #pragma once
 
 #include <ostream>
diff --git a/external_imported/Catch2/fuzzing/fuzz_TestSpecParser.cpp b/external_imported/Catch2/fuzzing/fuzz_TestSpecParser.cpp
index af4de4062..3aba8c840 100644
--- a/external_imported/Catch2/fuzzing/fuzz_TestSpecParser.cpp
+++ b/external_imported/Catch2/fuzzing/fuzz_TestSpecParser.cpp
@@ -1,4 +1,10 @@
-//License: Boost 1.0
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
 //By Paul Dreik 2020
 
 #include <catch2/internal/catch_test_spec_parser.hpp>
diff --git a/external_imported/Catch2/fuzzing/fuzz_XmlWriter.cpp b/external_imported/Catch2/fuzzing/fuzz_XmlWriter.cpp
index f8e5a0d9a..70c4ed803 100644
--- a/external_imported/Catch2/fuzzing/fuzz_XmlWriter.cpp
+++ b/external_imported/Catch2/fuzzing/fuzz_XmlWriter.cpp
@@ -1,4 +1,10 @@
-//License: Boost 1.0
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
 //By Paul Dreik 2020
 
 #include <catch2/internal/catch_xmlwriter.hpp>
diff --git a/external_imported/Catch2/fuzzing/fuzz_textflow.cpp b/external_imported/Catch2/fuzzing/fuzz_textflow.cpp
index eafe79feb..7000f420f 100644
--- a/external_imported/Catch2/fuzzing/fuzz_textflow.cpp
+++ b/external_imported/Catch2/fuzzing/fuzz_textflow.cpp
@@ -1,4 +1,10 @@
-//License: Boost 1.0
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
 //By Paul Dreik 2020
 
 #include <catch2/internal/catch_textflow.hpp>
diff --git a/external_imported/Catch2/meson.build b/external_imported/Catch2/meson.build
index 1faca35f7..0a897520d 100644
--- a/external_imported/Catch2/meson.build
+++ b/external_imported/Catch2/meson.build
@@ -8,10 +8,12 @@
 project(
   'catch2',
   'cpp',
-  version: '3.3.2', # CML version placeholder, don't delete
+  version: '3.5.2', # CML version placeholder, don't delete
   license: 'BSL-1.0',
-  meson_version: '>=0.50.0',
+  meson_version: '>=0.54.1',
 )
 
 subdir('src/catch2')
-subdir('tests')
+if get_option('tests')
+  subdir('tests')
+endif
diff --git a/external_imported/Catch2/meson_options.txt b/external_imported/Catch2/meson_options.txt
new file mode 100644
index 000000000..769048735
--- /dev/null
+++ b/external_imported/Catch2/meson_options.txt
@@ -0,0 +1 @@
+option('tests', type: 'boolean', value: true, description: 'Build the unit tests')
diff --git a/external_imported/Catch2/src/CMakeLists.txt b/external_imported/Catch2/src/CMakeLists.txt
index fd05dbdde..eb805ddd0 100644
--- a/external_imported/Catch2/src/CMakeLists.txt
+++ b/external_imported/Catch2/src/CMakeLists.txt
@@ -21,6 +21,8 @@ set(BENCHMARK_HEADERS
   ${SOURCES_DIR}/benchmark/catch_sample_analysis.hpp
   ${SOURCES_DIR}/benchmark/detail/catch_analyse.hpp
   ${SOURCES_DIR}/benchmark/detail/catch_benchmark_function.hpp
+  ${SOURCES_DIR}/benchmark/detail/catch_benchmark_stats.hpp
+  ${SOURCES_DIR}/benchmark/detail/catch_benchmark_stats_fwd.hpp
   ${SOURCES_DIR}/benchmark/detail/catch_complete_invoke.hpp
   ${SOURCES_DIR}/benchmark/detail/catch_estimate_clock.hpp
   ${SOURCES_DIR}/benchmark/detail/catch_measure.hpp
@@ -31,6 +33,7 @@ set(BENCHMARK_HEADERS
 )
 set(BENCHMARK_SOURCES
   ${SOURCES_DIR}/benchmark/catch_chronometer.cpp
+  ${SOURCES_DIR}/benchmark/detail/catch_analyse.cpp
   ${SOURCES_DIR}/benchmark/detail/catch_benchmark_function.cpp
   ${SOURCES_DIR}/benchmark/detail/catch_run_for_at_least.cpp
   ${SOURCES_DIR}/benchmark/detail/catch_stats.cpp
@@ -71,6 +74,7 @@ set(IMPL_HEADERS
   ${SOURCES_DIR}/internal/catch_compiler_capabilities.hpp
   ${SOURCES_DIR}/internal/catch_config_android_logwrite.hpp
   ${SOURCES_DIR}/internal/catch_config_counter.hpp
+  ${SOURCES_DIR}/internal/catch_config_static_analysis_support.hpp
   ${SOURCES_DIR}/internal/catch_config_uncaught_exceptions.hpp
   ${SOURCES_DIR}/internal/catch_config_wchar.hpp
   ${SOURCES_DIR}/internal/catch_console_colour.hpp
@@ -89,6 +93,7 @@ set(IMPL_HEADERS
   ${SOURCES_DIR}/internal/catch_getenv.hpp
   ${SOURCES_DIR}/internal/catch_istream.hpp
   ${SOURCES_DIR}/internal/catch_is_permutation.hpp
+  ${SOURCES_DIR}/internal/catch_jsonwriter.hpp
   ${SOURCES_DIR}/internal/catch_lazy_expr.hpp
   ${SOURCES_DIR}/internal/catch_leak_detector.hpp
   ${SOURCES_DIR}/internal/catch_list.hpp
@@ -104,6 +109,8 @@ set(IMPL_HEADERS
   ${SOURCES_DIR}/internal/catch_polyfills.hpp
   ${SOURCES_DIR}/internal/catch_preprocessor.hpp
   ${SOURCES_DIR}/internal/catch_preprocessor_remove_parens.hpp
+  ${SOURCES_DIR}/internal/catch_random_floating_point_helpers.hpp
+  ${SOURCES_DIR}/internal/catch_random_integer_helpers.hpp
   ${SOURCES_DIR}/internal/catch_random_number_generator.hpp
   ${SOURCES_DIR}/internal/catch_random_seed_generation.hpp
   ${SOURCES_DIR}/internal/catch_reporter_registry.hpp
@@ -128,10 +135,13 @@ set(IMPL_HEADERS
   ${SOURCES_DIR}/internal/catch_test_failure_exception.hpp
   ${SOURCES_DIR}/internal/catch_test_macro_impl.hpp
   ${SOURCES_DIR}/internal/catch_test_registry.hpp
+  ${SOURCES_DIR}/internal/catch_test_run_info.hpp
   ${SOURCES_DIR}/internal/catch_test_spec_parser.hpp
   ${SOURCES_DIR}/internal/catch_textflow.hpp
   ${SOURCES_DIR}/internal/catch_to_string.hpp
   ${SOURCES_DIR}/internal/catch_uncaught_exceptions.hpp
+  ${SOURCES_DIR}/internal/catch_uniform_floating_point_distribution.hpp
+  ${SOURCES_DIR}/internal/catch_uniform_integer_distribution.hpp
   ${SOURCES_DIR}/internal/catch_unique_name.hpp
   ${SOURCES_DIR}/internal/catch_unique_ptr.hpp
   ${SOURCES_DIR}/internal/catch_void_type.hpp
@@ -153,6 +163,7 @@ set(IMPL_SOURCES
   ${SOURCES_DIR}/catch_timer.cpp
   ${SOURCES_DIR}/catch_tostring.cpp
   ${SOURCES_DIR}/catch_totals.cpp
+  ${SOURCES_DIR}/catch_translate_exception.cpp
   ${SOURCES_DIR}/catch_version.cpp
   ${SOURCES_DIR}/internal/catch_assertion_handler.cpp
   ${SOURCES_DIR}/internal/catch_case_insensitive_comparisons.cpp
@@ -171,6 +182,7 @@ set(IMPL_SOURCES
   ${SOURCES_DIR}/internal/catch_floating_point_helpers.cpp
   ${SOURCES_DIR}/internal/catch_getenv.cpp
   ${SOURCES_DIR}/internal/catch_istream.cpp
+  ${SOURCES_DIR}/internal/catch_jsonwriter.cpp
   ${SOURCES_DIR}/internal/catch_lazy_expr.cpp
   ${SOURCES_DIR}/internal/catch_leak_detector.cpp
   ${SOURCES_DIR}/internal/catch_list.cpp
@@ -216,8 +228,8 @@ set(INTERFACE_HEADERS
   ${SOURCES_DIR}/interfaces/catch_interfaces_registry_hub.hpp
   ${SOURCES_DIR}/interfaces/catch_interfaces_reporter.hpp
   ${SOURCES_DIR}/interfaces/catch_interfaces_reporter_factory.hpp
-  ${SOURCES_DIR}/interfaces/catch_interfaces_reporter_registry.hpp
   ${SOURCES_DIR}/interfaces/catch_interfaces_tag_alias_registry.hpp
+  ${SOURCES_DIR}/interfaces/catch_interfaces_test_invoker.hpp
   ${SOURCES_DIR}/interfaces/catch_interfaces_testcase.hpp
 )
 set(INTERFACE_SOURCES
@@ -228,7 +240,6 @@ set(INTERFACE_SOURCES
   ${SOURCES_DIR}/interfaces/catch_interfaces_registry_hub.cpp
   ${SOURCES_DIR}/interfaces/catch_interfaces_reporter.cpp
   ${SOURCES_DIR}/interfaces/catch_interfaces_reporter_factory.cpp
-  ${SOURCES_DIR}/interfaces/catch_interfaces_reporter_registry.cpp
   ${SOURCES_DIR}/interfaces/catch_interfaces_testcase.cpp
 )
 set(INTERFACE_FILES ${INTERFACE_HEADERS} ${INTERFACE_SOURCES})
@@ -284,6 +295,7 @@ set(REPORTER_HEADERS
   ${SOURCES_DIR}/reporters/catch_reporter_cumulative_base.hpp
   ${SOURCES_DIR}/reporters/catch_reporter_event_listener.hpp
   ${SOURCES_DIR}/reporters/catch_reporter_helpers.hpp
+  ${SOURCES_DIR}/reporters/catch_reporter_json.hpp
   ${SOURCES_DIR}/reporters/catch_reporter_junit.hpp
   ${SOURCES_DIR}/reporters/catch_reporter_multi.hpp
   ${SOURCES_DIR}/reporters/catch_reporter_registrars.hpp
@@ -302,6 +314,7 @@ set(REPORTER_SOURCES
   ${SOURCES_DIR}/reporters/catch_reporter_cumulative_base.cpp
   ${SOURCES_DIR}/reporters/catch_reporter_event_listener.cpp
   ${SOURCES_DIR}/reporters/catch_reporter_helpers.cpp
+  ${SOURCES_DIR}/reporters/catch_reporter_json.cpp
   ${SOURCES_DIR}/reporters/catch_reporter_junit.cpp
   ${SOURCES_DIR}/reporters/catch_reporter_multi.cpp
   ${SOURCES_DIR}/reporters/catch_reporter_registrars.cpp
@@ -335,7 +348,9 @@ source_group("generated headers"
 )
 
 add_library(Catch2 ${ALL_FILES})
-add_build_reproducibility_settings(Catch2)
+if (CATCH_ENABLE_REPRODUCIBLE_BUILD)
+    add_build_reproducibility_settings(Catch2)
+endif()
 add_library(Catch2::Catch2 ALIAS Catch2)
 
 if (ANDROID)
@@ -388,7 +403,9 @@ target_include_directories(Catch2
 add_library(Catch2WithMain
     ${SOURCES_DIR}/internal/catch_main.cpp
 )
-add_build_reproducibility_settings(Catch2WithMain)
+if (CATCH_ENABLE_REPRODUCIBLE_BUILD)
+    add_build_reproducibility_settings(Catch2WithMain)
+endif()
 add_library(Catch2::Catch2WithMain ALIAS Catch2WithMain)
 target_link_libraries(Catch2WithMain PUBLIC Catch2)
 set_target_properties(Catch2WithMain
diff --git a/external_imported/Catch2/src/catch2/benchmark/catch_benchmark.hpp b/external_imported/Catch2/src/catch2/benchmark/catch_benchmark.hpp
index 1cf10be66..3db40bb04 100644
--- a/external_imported/Catch2/src/catch2/benchmark/catch_benchmark.hpp
+++ b/external_imported/Catch2/src/catch2/benchmark/catch_benchmark.hpp
@@ -10,26 +10,28 @@
 #ifndef CATCH_BENCHMARK_HPP_INCLUDED
 #define CATCH_BENCHMARK_HPP_INCLUDED
 
-#include <catch2/interfaces/catch_interfaces_config.hpp>
+#include <catch2/catch_user_config.hpp>
 #include <catch2/internal/catch_compiler_capabilities.hpp>
 #include <catch2/internal/catch_context.hpp>
-#include <catch2/interfaces/catch_interfaces_reporter.hpp>
-#include <catch2/internal/catch_unique_name.hpp>
 #include <catch2/internal/catch_move_and_forward.hpp>
-#include <catch2/benchmark/catch_chronometer.hpp>
+#include <catch2/internal/catch_test_failure_exception.hpp>
+#include <catch2/internal/catch_unique_name.hpp>
+#include <catch2/interfaces/catch_interfaces_capture.hpp>
+#include <catch2/interfaces/catch_interfaces_config.hpp>
+#include <catch2/interfaces/catch_interfaces_registry_hub.hpp>
+#include <catch2/benchmark/detail/catch_benchmark_stats.hpp>
 #include <catch2/benchmark/catch_clock.hpp>
 #include <catch2/benchmark/catch_environment.hpp>
 #include <catch2/benchmark/catch_execution_plan.hpp>
 #include <catch2/benchmark/detail/catch_estimate_clock.hpp>
-#include <catch2/benchmark/detail/catch_complete_invoke.hpp>
 #include <catch2/benchmark/detail/catch_analyse.hpp>
 #include <catch2/benchmark/detail/catch_benchmark_function.hpp>
 #include <catch2/benchmark/detail/catch_run_for_at_least.hpp>
 
 #include <algorithm>
-#include <functional>
+#include <chrono>
+#include <exception>
 #include <string>
-#include <vector>
 #include <cmath>
 
 namespace Catch {
@@ -43,16 +45,18 @@ namespace Catch {
                 : fun(CATCH_MOVE(func)), name(CATCH_MOVE(benchmarkName)) {}
 
             template <typename Clock>
-            ExecutionPlan<FloatDuration<Clock>> prepare(const IConfig &cfg, Environment<FloatDuration<Clock>> env) const {
+            ExecutionPlan prepare(const IConfig &cfg, Environment env) const {
                 auto min_time = env.clock_resolution.mean * Detail::minimum_ticks;
                 auto run_time = std::max(min_time, std::chrono::duration_cast<decltype(min_time)>(cfg.benchmarkWarmupTime()));
-                auto&& test = Detail::run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(run_time), 1, fun);
+                auto&& test = Detail::run_for_at_least<Clock>(std::chrono::duration_cast<IDuration>(run_time), 1, fun);
                 int new_iters = static_cast<int>(std::ceil(min_time * test.iterations / test.elapsed));
-                return { new_iters, test.elapsed / test.iterations * new_iters * cfg.benchmarkSamples(), fun, std::chrono::duration_cast<FloatDuration<Clock>>(cfg.benchmarkWarmupTime()), Detail::warmup_iterations };
+                return { new_iters, test.elapsed / test.iterations * new_iters * cfg.benchmarkSamples(), fun, std::chrono::duration_cast<FDuration>(cfg.benchmarkWarmupTime()), Detail::warmup_iterations };
             }
 
             template <typename Clock = default_clock>
             void run() {
+                static_assert( Clock::is_steady,
+                               "Benchmarking clock should be steady" );
                 auto const* cfg = getCurrentContext().getConfig();
 
                 auto env = Detail::measure_environment<Clock>();
@@ -79,10 +83,10 @@ namespace Catch {
                         return plan.template run<Clock>(*cfg, env);
                     });
 
-                    auto analysis = Detail::analyse(*cfg, env, samples.begin(), samples.end());
-                    BenchmarkStats<FloatDuration<Clock>> stats{ CATCH_MOVE(info), CATCH_MOVE(analysis.samples), analysis.mean, analysis.standard_deviation, analysis.outliers, analysis.outlier_variance };
+                    auto analysis = Detail::analyse(*cfg, samples.data(), samples.data() + samples.size());
+                    BenchmarkStats<> stats{ CATCH_MOVE(info), CATCH_MOVE(analysis.samples), analysis.mean, analysis.standard_deviation, analysis.outliers, analysis.outlier_variance };
                     getResultCapture().benchmarkEnded(stats);
-                } CATCH_CATCH_ANON (TestFailureException) {
+                } CATCH_CATCH_ANON (TestFailureException const&) {
                     getResultCapture().benchmarkFailed("Benchmark failed due to failed assertion"_sr);
                 } CATCH_CATCH_ALL{
                     getResultCapture().benchmarkFailed(translateActiveException());
diff --git a/external_imported/Catch2/src/catch2/benchmark/catch_benchmark_all.hpp b/external_imported/Catch2/src/catch2/benchmark/catch_benchmark_all.hpp
index eb81f2386..56fc7c74c 100644
--- a/external_imported/Catch2/src/catch2/benchmark/catch_benchmark_all.hpp
+++ b/external_imported/Catch2/src/catch2/benchmark/catch_benchmark_all.hpp
@@ -33,6 +33,8 @@
 #include <catch2/benchmark/catch_sample_analysis.hpp>
 #include <catch2/benchmark/detail/catch_analyse.hpp>
 #include <catch2/benchmark/detail/catch_benchmark_function.hpp>
+#include <catch2/benchmark/detail/catch_benchmark_stats.hpp>
+#include <catch2/benchmark/detail/catch_benchmark_stats_fwd.hpp>
 #include <catch2/benchmark/detail/catch_complete_invoke.hpp>
 #include <catch2/benchmark/detail/catch_estimate_clock.hpp>
 #include <catch2/benchmark/detail/catch_measure.hpp>
diff --git a/external_imported/Catch2/src/catch2/benchmark/catch_chronometer.hpp b/external_imported/Catch2/src/catch2/benchmark/catch_chronometer.hpp
index bce2406b8..95498e6be 100644
--- a/external_imported/Catch2/src/catch2/benchmark/catch_chronometer.hpp
+++ b/external_imported/Catch2/src/catch2/benchmark/catch_chronometer.hpp
@@ -12,7 +12,6 @@
 
 #include <catch2/benchmark/catch_clock.hpp>
 #include <catch2/benchmark/catch_optimizer.hpp>
-#include <catch2/benchmark/detail/catch_complete_invoke.hpp>
 #include <catch2/internal/catch_meta.hpp>
 #include <catch2/internal/catch_move_and_forward.hpp>
 
@@ -33,7 +32,10 @@ namespace Catch {
                 void start() override { started = Clock::now(); }
                 void finish() override { finished = Clock::now(); }
 
-                ClockDuration<Clock> elapsed() const { return finished - started; }
+                IDuration elapsed() const {
+                    return std::chrono::duration_cast<std::chrono::nanoseconds>(
+                        finished - started );
+                }
 
                 TimePoint<Clock> started;
                 TimePoint<Clock> finished;
diff --git a/external_imported/Catch2/src/catch2/benchmark/catch_clock.hpp b/external_imported/Catch2/src/catch2/benchmark/catch_clock.hpp
index cee46097d..4068c4d29 100644
--- a/external_imported/Catch2/src/catch2/benchmark/catch_clock.hpp
+++ b/external_imported/Catch2/src/catch2/benchmark/catch_clock.hpp
@@ -11,28 +11,16 @@
 #define CATCH_CLOCK_HPP_INCLUDED
 
 #include <chrono>
-#include <ratio>
 
 namespace Catch {
     namespace Benchmark {
-        template <typename Clock>
-        using ClockDuration = typename Clock::duration;
-        template <typename Clock>
-        using FloatDuration = std::chrono::duration<double, typename Clock::period>;
+        using IDuration = std::chrono::nanoseconds;
+        using FDuration = std::chrono::duration<double, std::nano>;
 
         template <typename Clock>
         using TimePoint = typename Clock::time_point;
 
         using default_clock = std::chrono::steady_clock;
-
-        template <typename Clock>
-        struct now {
-            TimePoint<Clock> operator()() const {
-                return Clock::now();
-            }
-        };
-
-        using fp_seconds = std::chrono::duration<double, std::ratio<1>>;
     } // namespace Benchmark
 } // namespace Catch
 
diff --git a/external_imported/Catch2/src/catch2/benchmark/catch_environment.hpp b/external_imported/Catch2/src/catch2/benchmark/catch_environment.hpp
index de4d77df4..da3f2fa95 100644
--- a/external_imported/Catch2/src/catch2/benchmark/catch_environment.hpp
+++ b/external_imported/Catch2/src/catch2/benchmark/catch_environment.hpp
@@ -15,21 +15,13 @@
 
 namespace Catch {
     namespace Benchmark {
-        template <typename Duration>
         struct EnvironmentEstimate {
-            Duration mean;
+            FDuration mean;
             OutlierClassification outliers;
-
-            template <typename Duration2>
-            operator EnvironmentEstimate<Duration2>() const {
-                return { mean, outliers };
-            }
         };
-        template <typename Clock>
         struct Environment {
-            using clock_type = Clock;
-            EnvironmentEstimate<FloatDuration<Clock>> clock_resolution;
-            EnvironmentEstimate<FloatDuration<Clock>> clock_cost;
+            EnvironmentEstimate clock_resolution;
+            EnvironmentEstimate clock_cost;
         };
     } // namespace Benchmark
 } // namespace Catch
diff --git a/external_imported/Catch2/src/catch2/benchmark/catch_estimate.hpp b/external_imported/Catch2/src/catch2/benchmark/catch_estimate.hpp
index be594a189..64383a2e5 100644
--- a/external_imported/Catch2/src/catch2/benchmark/catch_estimate.hpp
+++ b/external_imported/Catch2/src/catch2/benchmark/catch_estimate.hpp
@@ -12,17 +12,12 @@
 
 namespace Catch {
     namespace Benchmark {
-        template <typename Duration>
+        template <typename Type>
         struct Estimate {
-            Duration point;
-            Duration lower_bound;
-            Duration upper_bound;
+            Type point;
+            Type lower_bound;
+            Type upper_bound;
             double confidence_interval;
-
-            template <typename Duration2>
-            operator Estimate<Duration2>() const {
-                return { point, lower_bound, upper_bound, confidence_interval };
-            }
         };
     } // namespace Benchmark
 } // namespace Catch
diff --git a/external_imported/Catch2/src/catch2/benchmark/catch_execution_plan.hpp b/external_imported/Catch2/src/catch2/benchmark/catch_execution_plan.hpp
index 039de7ee5..17ca589f5 100644
--- a/external_imported/Catch2/src/catch2/benchmark/catch_execution_plan.hpp
+++ b/external_imported/Catch2/src/catch2/benchmark/catch_execution_plan.hpp
@@ -17,38 +17,38 @@
 #include <catch2/benchmark/detail/catch_repeat.hpp>
 #include <catch2/benchmark/detail/catch_run_for_at_least.hpp>
 
-#include <algorithm>
-#include <iterator>
+#include <vector>
 
 namespace Catch {
     namespace Benchmark {
-        template <typename Duration>
         struct ExecutionPlan {
             int iterations_per_sample;
-            Duration estimated_duration;
+            FDuration estimated_duration;
             Detail::BenchmarkFunction benchmark;
-            Duration warmup_time;
+            FDuration warmup_time;
             int warmup_iterations;
 
-            template <typename Duration2>
-            operator ExecutionPlan<Duration2>() const {
-                return { iterations_per_sample, estimated_duration, benchmark, warmup_time, warmup_iterations };
-            }
-
             template <typename Clock>
-            std::vector<FloatDuration<Clock>> run(const IConfig &cfg, Environment<FloatDuration<Clock>> env) const {
+            std::vector<FDuration> run(const IConfig &cfg, Environment env) const {
                 // warmup a bit
-                Detail::run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(warmup_time), warmup_iterations, Detail::repeat(now<Clock>{}));
-
-                std::vector<FloatDuration<Clock>> times;
-                times.reserve(cfg.benchmarkSamples());
-                std::generate_n(std::back_inserter(times), cfg.benchmarkSamples(), [this, env] {
+                Detail::run_for_at_least<Clock>(
+                    std::chrono::duration_cast<IDuration>( warmup_time ),
+                    warmup_iterations,
+                    Detail::repeat( []() { return Clock::now(); } )
+                );
+
+                std::vector<FDuration> times;
+                const auto num_samples = cfg.benchmarkSamples();
+                times.reserve( num_samples );
+                for ( size_t i = 0; i < num_samples; ++i ) {
                     Detail::ChronometerModel<Clock> model;
-                    this->benchmark(Chronometer(model, iterations_per_sample));
+                    this->benchmark( Chronometer( model, iterations_per_sample ) );
                     auto sample_time = model.elapsed() - env.clock_cost.mean;
-                    if (sample_time < FloatDuration<Clock>::zero()) sample_time = FloatDuration<Clock>::zero();
-                    return sample_time / iterations_per_sample;
-                });
+                    if ( sample_time < FDuration::zero() ) {
+                        sample_time = FDuration::zero();
+                    }
+                    times.push_back(sample_time / iterations_per_sample);
+                }
                 return times;
             }
         };
diff --git a/external_imported/Catch2/src/catch2/benchmark/catch_optimizer.hpp b/external_imported/Catch2/src/catch2/benchmark/catch_optimizer.hpp
index 0dbfc1450..61e6571f6 100644
--- a/external_imported/Catch2/src/catch2/benchmark/catch_optimizer.hpp
+++ b/external_imported/Catch2/src/catch2/benchmark/catch_optimizer.hpp
@@ -10,7 +10,7 @@
 #ifndef CATCH_OPTIMIZER_HPP_INCLUDED
 #define CATCH_OPTIMIZER_HPP_INCLUDED
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) || defined(__IAR_SYSTEMS_ICC__)
 #   include <atomic> // atomic_thread_fence
 #endif
 
@@ -32,16 +32,23 @@ namespace Catch {
         namespace Detail {
             inline void optimizer_barrier() { keep_memory(); }
         } // namespace Detail
-#elif defined(_MSC_VER)
+#elif defined(_MSC_VER) || defined(__IAR_SYSTEMS_ICC__)
 
+#if defined(_MSVC_VER)
 #pragma optimize("", off)
+#elif defined(__IAR_SYSTEMS_ICC__)
+// For IAR the pragma only affects the following function
+#pragma optimize=disable
+#endif
         template <typename T>
         inline void keep_memory(T* p) {
             // thanks @milleniumbug
             *reinterpret_cast<char volatile*>(p) = *reinterpret_cast<char const volatile*>(p);
         }
         // TODO equivalent keep_memory()
+#if defined(_MSVC_VER)
 #pragma optimize("", on)
+#endif
 
         namespace Detail {
             inline void optimizer_barrier() {
@@ -63,7 +70,7 @@ namespace Catch {
 
         template <typename Fn, typename... Args>
         inline auto invoke_deoptimized(Fn&& fn, Args&&... args) -> std::enable_if_t<std::is_same<void, decltype(fn(args...))>::value> {
-            CATCH_FORWARD(fn) (CATCH_FORWARD(args)...);
+            CATCH_FORWARD((fn)) (CATCH_FORWARD(args)...);
         }
     } // namespace Benchmark
 } // namespace Catch
diff --git a/external_imported/Catch2/src/catch2/benchmark/catch_sample_analysis.hpp b/external_imported/Catch2/src/catch2/benchmark/catch_sample_analysis.hpp
index d849d2464..aeb87d05a 100644
--- a/external_imported/Catch2/src/catch2/benchmark/catch_sample_analysis.hpp
+++ b/external_imported/Catch2/src/catch2/benchmark/catch_sample_analysis.hpp
@@ -10,38 +10,20 @@
 #ifndef CATCH_SAMPLE_ANALYSIS_HPP_INCLUDED
 #define CATCH_SAMPLE_ANALYSIS_HPP_INCLUDED
 
-#include <catch2/benchmark/catch_clock.hpp>
 #include <catch2/benchmark/catch_estimate.hpp>
 #include <catch2/benchmark/catch_outlier_classification.hpp>
-#include <catch2/internal/catch_move_and_forward.hpp>
+#include <catch2/benchmark/catch_clock.hpp>
 
-#include <algorithm>
 #include <vector>
-#include <iterator>
 
 namespace Catch {
     namespace Benchmark {
-        template <typename Duration>
         struct SampleAnalysis {
-            std::vector<Duration> samples;
-            Estimate<Duration> mean;
-            Estimate<Duration> standard_deviation;
+            std::vector<FDuration> samples;
+            Estimate<FDuration> mean;
+            Estimate<FDuration> standard_deviation;
             OutlierClassification outliers;
             double outlier_variance;
-
-            template <typename Duration2>
-            operator SampleAnalysis<Duration2>() const {
-                std::vector<Duration2> samples2;
-                samples2.reserve(samples.size());
-                std::transform(samples.begin(), samples.end(), std::back_inserter(samples2), [](Duration d) { return Duration2(d); });
-                return {
-                    CATCH_MOVE(samples2),
-                    mean,
-                    standard_deviation,
-                    outliers,
-                    outlier_variance,
-                };
-            }
         };
     } // namespace Benchmark
 } // namespace Catch
diff --git a/external_imported/Catch2/src/catch2/benchmark/detail/catch_analyse.cpp b/external_imported/Catch2/src/catch2/benchmark/detail/catch_analyse.cpp
new file mode 100644
index 000000000..7d27daf19
--- /dev/null
+++ b/external_imported/Catch2/src/catch2/benchmark/detail/catch_analyse.cpp
@@ -0,0 +1,85 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+// Adapted from donated nonius code.
+
+#include <catch2/benchmark/detail/catch_analyse.hpp>
+#include <catch2/benchmark/catch_clock.hpp>
+#include <catch2/benchmark/catch_sample_analysis.hpp>
+#include <catch2/benchmark/detail/catch_stats.hpp>
+#include <catch2/interfaces/catch_interfaces_config.hpp>
+#include <catch2/internal/catch_move_and_forward.hpp>
+
+#include <vector>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            SampleAnalysis analyse(const IConfig &cfg, FDuration* first, FDuration* last) {
+                if (!cfg.benchmarkNoAnalysis()) {
+                    std::vector<double> samples;
+                    samples.reserve(static_cast<size_t>(last - first));
+                    for (auto current = first; current != last; ++current) {
+                        samples.push_back( current->count() );
+                    }
+
+                    auto analysis = Catch::Benchmark::Detail::analyse_samples(
+                        cfg.benchmarkConfidenceInterval(),
+                        cfg.benchmarkResamples(),
+                        samples.data(),
+                        samples.data() + samples.size() );
+                    auto outliers = Catch::Benchmark::Detail::classify_outliers(
+                        samples.data(), samples.data() + samples.size() );
+
+                    auto wrap_estimate = [](Estimate<double> e) {
+                        return Estimate<FDuration> {
+                            FDuration(e.point),
+                                FDuration(e.lower_bound),
+                                FDuration(e.upper_bound),
+                                e.confidence_interval,
+                        };
+                    };
+                    std::vector<FDuration> samples2;
+                    samples2.reserve(samples.size());
+                    for (auto s : samples) {
+                        samples2.push_back( FDuration( s ) );
+                    }
+
+                    return {
+                        CATCH_MOVE(samples2),
+                        wrap_estimate(analysis.mean),
+                        wrap_estimate(analysis.standard_deviation),
+                        outliers,
+                        analysis.outlier_variance,
+                    };
+                } else {
+                    std::vector<FDuration> samples;
+                    samples.reserve(static_cast<size_t>(last - first));
+
+                    FDuration mean = FDuration(0);
+                    int i = 0;
+                    for (auto it = first; it < last; ++it, ++i) {
+                        samples.push_back(FDuration(*it));
+                        mean += FDuration(*it);
+                    }
+                    mean /= i;
+
+                    return SampleAnalysis{
+                        CATCH_MOVE(samples),
+                        Estimate<FDuration>{ mean, mean, mean, 0.0 },
+                        Estimate<FDuration>{ FDuration( 0 ),
+                                             FDuration( 0 ),
+                                             FDuration( 0 ),
+                                             0.0 },
+                        OutlierClassification{},
+                        0.0
+                    };
+                }
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
diff --git a/external_imported/Catch2/src/catch2/benchmark/detail/catch_analyse.hpp b/external_imported/Catch2/src/catch2/benchmark/detail/catch_analyse.hpp
index 77b0a9d38..5e3f7b0f5 100644
--- a/external_imported/Catch2/src/catch2/benchmark/detail/catch_analyse.hpp
+++ b/external_imported/Catch2/src/catch2/benchmark/detail/catch_analyse.hpp
@@ -11,68 +11,15 @@
 #define CATCH_ANALYSE_HPP_INCLUDED
 
 #include <catch2/benchmark/catch_clock.hpp>
-#include <catch2/benchmark/catch_environment.hpp>
 #include <catch2/benchmark/catch_sample_analysis.hpp>
-#include <catch2/benchmark/detail/catch_stats.hpp>
-#include <catch2/interfaces/catch_interfaces_config.hpp>
-#include <catch2/internal/catch_move_and_forward.hpp>
 
-#include <algorithm>
-#include <iterator>
-#include <vector>
 
 namespace Catch {
+    class IConfig;
+
     namespace Benchmark {
         namespace Detail {
-            template <typename Duration, typename Iterator>
-            SampleAnalysis<Duration> analyse(const IConfig &cfg, Environment<Duration>, Iterator first, Iterator last) {
-                if (!cfg.benchmarkNoAnalysis()) {
-                    std::vector<double> samples;
-                    samples.reserve(static_cast<size_t>(last - first));
-                    std::transform(first, last, std::back_inserter(samples), [](Duration d) { return d.count(); });
-
-                    auto analysis = Catch::Benchmark::Detail::analyse_samples(cfg.benchmarkConfidenceInterval(), cfg.benchmarkResamples(), samples.begin(), samples.end());
-                    auto outliers = Catch::Benchmark::Detail::classify_outliers(samples.begin(), samples.end());
-
-                    auto wrap_estimate = [](Estimate<double> e) {
-                        return Estimate<Duration> {
-                            Duration(e.point),
-                                Duration(e.lower_bound),
-                                Duration(e.upper_bound),
-                                e.confidence_interval,
-                        };
-                    };
-                    std::vector<Duration> samples2;
-                    samples2.reserve(samples.size());
-                    std::transform(samples.begin(), samples.end(), std::back_inserter(samples2), [](double d) { return Duration(d); });
-                    return {
-                        CATCH_MOVE(samples2),
-                        wrap_estimate(analysis.mean),
-                        wrap_estimate(analysis.standard_deviation),
-                        outliers,
-                        analysis.outlier_variance,
-                    };
-                } else {
-                    std::vector<Duration> samples;
-                    samples.reserve(static_cast<size_t>(last - first));
-
-                    Duration mean = Duration(0);
-                    int i = 0;
-                    for (auto it = first; it < last; ++it, ++i) {
-                        samples.push_back(Duration(*it));
-                        mean += Duration(*it);
-                    }
-                    mean /= i;
-
-                    return {
-                        CATCH_MOVE(samples),
-                        Estimate<Duration>{mean, mean, mean, 0.0},
-                        Estimate<Duration>{Duration(0), Duration(0), Duration(0), 0.0},
-                        OutlierClassification{},
-                        0.0
-                    };
-                }
-            }
+            SampleAnalysis analyse(const IConfig &cfg, FDuration* first, FDuration* last);
         } // namespace Detail
     } // namespace Benchmark
 } // namespace Catch
diff --git a/external_imported/Catch2/src/catch2/benchmark/detail/catch_benchmark_function.hpp b/external_imported/Catch2/src/catch2/benchmark/detail/catch_benchmark_function.hpp
index 152982587..144e4b6e4 100644
--- a/external_imported/Catch2/src/catch2/benchmark/detail/catch_benchmark_function.hpp
+++ b/external_imported/Catch2/src/catch2/benchmark/detail/catch_benchmark_function.hpp
@@ -11,7 +11,6 @@
 #define CATCH_BENCHMARK_FUNCTION_HPP_INCLUDED
 
 #include <catch2/benchmark/catch_chronometer.hpp>
-#include <catch2/benchmark/detail/catch_complete_invoke.hpp>
 #include <catch2/internal/catch_meta.hpp>
 #include <catch2/internal/catch_unique_ptr.hpp>
 #include <catch2/internal/catch_move_and_forward.hpp>
diff --git a/external_imported/Catch2/src/catch2/benchmark/detail/catch_benchmark_stats.hpp b/external_imported/Catch2/src/catch2/benchmark/detail/catch_benchmark_stats.hpp
new file mode 100644
index 000000000..3633bc9f9
--- /dev/null
+++ b/external_imported/Catch2/src/catch2/benchmark/detail/catch_benchmark_stats.hpp
@@ -0,0 +1,48 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+#ifndef CATCH_BENCHMARK_STATS_HPP_INCLUDED
+#define CATCH_BENCHMARK_STATS_HPP_INCLUDED
+
+#include <catch2/benchmark/catch_estimate.hpp>
+#include <catch2/benchmark/catch_outlier_classification.hpp>
+// The fwd decl & default specialization needs to be seen by VS2017 before
+// BenchmarkStats itself, or VS2017 will report compilation error.
+#include <catch2/benchmark/detail/catch_benchmark_stats_fwd.hpp>
+
+#include <string>
+#include <vector>
+
+namespace Catch {
+
+    struct BenchmarkInfo {
+        std::string name;
+        double estimatedDuration;
+        int iterations;
+        unsigned int samples;
+        unsigned int resamples;
+        double clockResolution;
+        double clockCost;
+    };
+
+    // We need to keep template parameter for backwards compatibility,
+    // but we also do not want to use the template paraneter.
+    template <class Dummy>
+    struct BenchmarkStats {
+        BenchmarkInfo info;
+
+        std::vector<Benchmark::FDuration> samples;
+        Benchmark::Estimate<Benchmark::FDuration> mean;
+        Benchmark::Estimate<Benchmark::FDuration> standardDeviation;
+        Benchmark::OutlierClassification outliers;
+        double outlierVariance;
+    };
+
+
+} // end namespace Catch
+
+#endif // CATCH_BENCHMARK_STATS_HPP_INCLUDED
diff --git a/external_imported/Catch2/src/catch2/benchmark/detail/catch_benchmark_stats_fwd.hpp b/external_imported/Catch2/src/catch2/benchmark/detail/catch_benchmark_stats_fwd.hpp
new file mode 100644
index 000000000..2ccc25d58
--- /dev/null
+++ b/external_imported/Catch2/src/catch2/benchmark/detail/catch_benchmark_stats_fwd.hpp
@@ -0,0 +1,23 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+#ifndef CATCH_BENCHMARK_STATS_FWD_HPP_INCLUDED
+#define CATCH_BENCHMARK_STATS_FWD_HPP_INCLUDED
+
+#include <catch2/benchmark/catch_clock.hpp>
+
+namespace Catch {
+
+    // We cannot forward declare the type with default template argument
+    // multiple times, so it is split out into a separate header so that
+    // we can prevent multiple declarations in dependees
+    template <typename Duration = Benchmark::FDuration>
+    struct BenchmarkStats;
+
+} // end namespace Catch
+
+#endif // CATCH_BENCHMARK_STATS_FWD_HPP_INCLUDED
diff --git a/external_imported/Catch2/src/catch2/benchmark/detail/catch_complete_invoke.hpp b/external_imported/Catch2/src/catch2/benchmark/detail/catch_complete_invoke.hpp
index 49db413ec..4dff4b7eb 100644
--- a/external_imported/Catch2/src/catch2/benchmark/detail/catch_complete_invoke.hpp
+++ b/external_imported/Catch2/src/catch2/benchmark/detail/catch_complete_invoke.hpp
@@ -10,14 +10,9 @@
 #ifndef CATCH_COMPLETE_INVOKE_HPP_INCLUDED
 #define CATCH_COMPLETE_INVOKE_HPP_INCLUDED
 
-#include <catch2/internal/catch_test_failure_exception.hpp>
 #include <catch2/internal/catch_meta.hpp>
-#include <catch2/interfaces/catch_interfaces_capture.hpp>
-#include <catch2/interfaces/catch_interfaces_registry_hub.hpp>
 #include <catch2/internal/catch_move_and_forward.hpp>
 
-#include <type_traits>
-
 namespace Catch {
     namespace Benchmark {
         namespace Detail {
diff --git a/external_imported/Catch2/src/catch2/benchmark/detail/catch_estimate_clock.hpp b/external_imported/Catch2/src/catch2/benchmark/detail/catch_estimate_clock.hpp
index 907773f24..8e3552796 100644
--- a/external_imported/Catch2/src/catch2/benchmark/detail/catch_estimate_clock.hpp
+++ b/external_imported/Catch2/src/catch2/benchmark/detail/catch_estimate_clock.hpp
@@ -19,7 +19,6 @@
 #include <catch2/internal/catch_unique_ptr.hpp>
 
 #include <algorithm>
-#include <iterator>
 #include <vector>
 #include <cmath>
 
@@ -30,46 +29,49 @@ namespace Catch {
             std::vector<double> resolution(int k) {
                 std::vector<TimePoint<Clock>> times;
                 times.reserve(static_cast<size_t>(k + 1));
-                std::generate_n(std::back_inserter(times), k + 1, now<Clock>{});
+                for ( int i = 0; i < k + 1; ++i ) {
+                    times.push_back( Clock::now() );
+                }
 
                 std::vector<double> deltas;
                 deltas.reserve(static_cast<size_t>(k));
-                std::transform(std::next(times.begin()), times.end(), times.begin(),
-                    std::back_inserter(deltas),
-                    [](TimePoint<Clock> a, TimePoint<Clock> b) { return static_cast<double>((a - b).count()); });
+                for ( size_t idx = 1; idx < times.size(); ++idx ) {
+                    deltas.push_back( static_cast<double>(
+                        ( times[idx] - times[idx - 1] ).count() ) );
+                }
 
                 return deltas;
             }
 
-            const auto warmup_iterations = 10000;
-            const auto warmup_time = std::chrono::milliseconds(100);
-            const auto minimum_ticks = 1000;
-            const auto warmup_seed = 10000;
-            const auto clock_resolution_estimation_time = std::chrono::milliseconds(500);
-            const auto clock_cost_estimation_time_limit = std::chrono::seconds(1);
-            const auto clock_cost_estimation_tick_limit = 100000;
-            const auto clock_cost_estimation_time = std::chrono::milliseconds(10);
-            const auto clock_cost_estimation_iterations = 10000;
+            constexpr auto warmup_iterations = 10000;
+            constexpr auto warmup_time = std::chrono::milliseconds(100);
+            constexpr auto minimum_ticks = 1000;
+            constexpr auto warmup_seed = 10000;
+            constexpr auto clock_resolution_estimation_time = std::chrono::milliseconds(500);
+            constexpr auto clock_cost_estimation_time_limit = std::chrono::seconds(1);
+            constexpr auto clock_cost_estimation_tick_limit = 100000;
+            constexpr auto clock_cost_estimation_time = std::chrono::milliseconds(10);
+            constexpr auto clock_cost_estimation_iterations = 10000;
 
             template <typename Clock>
             int warmup() {
-                return run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(warmup_time), warmup_seed, &resolution<Clock>)
+                return run_for_at_least<Clock>(warmup_time, warmup_seed, &resolution<Clock>)
                     .iterations;
             }
             template <typename Clock>
-            EnvironmentEstimate<FloatDuration<Clock>> estimate_clock_resolution(int iterations) {
-                auto r = run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(clock_resolution_estimation_time), iterations, &resolution<Clock>)
+            EnvironmentEstimate estimate_clock_resolution(int iterations) {
+                auto r = run_for_at_least<Clock>(clock_resolution_estimation_time, iterations, &resolution<Clock>)
                     .result;
                 return {
-                    FloatDuration<Clock>(mean(r.begin(), r.end())),
-                    classify_outliers(r.begin(), r.end()),
+                    FDuration(mean(r.data(), r.data() + r.size())),
+                    classify_outliers(r.data(), r.data() + r.size()),
                 };
             }
             template <typename Clock>
-            EnvironmentEstimate<FloatDuration<Clock>> estimate_clock_cost(FloatDuration<Clock> resolution) {
+            EnvironmentEstimate estimate_clock_cost(FDuration resolution) {
                 auto time_limit = (std::min)(
                     resolution * clock_cost_estimation_tick_limit,
-                    FloatDuration<Clock>(clock_cost_estimation_time_limit));
+                    FDuration(clock_cost_estimation_time_limit));
                 auto time_clock = [](int k) {
                     return Detail::measure<Clock>([k] {
                         for (int i = 0; i < k; ++i) {
@@ -80,26 +82,28 @@ namespace Catch {
                 };
                 time_clock(1);
                 int iters = clock_cost_estimation_iterations;
-                auto&& r = run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(clock_cost_estimation_time), iters, time_clock);
+                auto&& r = run_for_at_least<Clock>(clock_cost_estimation_time, iters, time_clock);
                 std::vector<double> times;
                 int nsamples = static_cast<int>(std::ceil(time_limit / r.elapsed));
                 times.reserve(static_cast<size_t>(nsamples));
-                std::generate_n(std::back_inserter(times), nsamples, [time_clock, &r] {
-                    return static_cast<double>((time_clock(r.iterations) / r.iterations).count());
-                });
+                for ( int s = 0; s < nsamples; ++s ) {
+                    times.push_back( static_cast<double>(
+                        ( time_clock( r.iterations ) / r.iterations )
+                            .count() ) );
+                }
                 return {
-                    FloatDuration<Clock>(mean(times.begin(), times.end())),
-                    classify_outliers(times.begin(), times.end()),
+                    FDuration(mean(times.data(), times.data() + times.size())),
+                    classify_outliers(times.data(), times.data() + times.size()),
                 };
             }
 
             template <typename Clock>
-            Environment<FloatDuration<Clock>> measure_environment() {
+            Environment measure_environment() {
 #if defined(__clang__)
 #    pragma clang diagnostic push
 #    pragma clang diagnostic ignored "-Wexit-time-destructors"
 #endif
-                static Catch::Detail::unique_ptr<Environment<FloatDuration<Clock>>> env;
+                static Catch::Detail::unique_ptr<Environment> env;
 #if defined(__clang__)
 #    pragma clang diagnostic pop
 #endif
@@ -111,7 +115,7 @@ namespace Catch {
                 auto resolution = Detail::estimate_clock_resolution<Clock>(iters);
                 auto cost = Detail::estimate_clock_cost<Clock>(resolution.mean);
 
-                env = Catch::Detail::make_unique<Environment<FloatDuration<Clock>>>( Environment<FloatDuration<Clock>>{resolution, cost} );
+                env = Catch::Detail::make_unique<Environment>( Environment{resolution, cost} );
                 return *env;
             }
         } // namespace Detail
diff --git a/external_imported/Catch2/src/catch2/benchmark/detail/catch_measure.hpp b/external_imported/Catch2/src/catch2/benchmark/detail/catch_measure.hpp
index 388814c1c..37494a68f 100644
--- a/external_imported/Catch2/src/catch2/benchmark/detail/catch_measure.hpp
+++ b/external_imported/Catch2/src/catch2/benchmark/detail/catch_measure.hpp
@@ -10,7 +10,6 @@
 #ifndef CATCH_MEASURE_HPP_INCLUDED
 #define CATCH_MEASURE_HPP_INCLUDED
 
-#include <catch2/benchmark/catch_clock.hpp>
 #include <catch2/benchmark/detail/catch_complete_invoke.hpp>
 #include <catch2/benchmark/detail/catch_timing.hpp>
 #include <catch2/internal/catch_move_and_forward.hpp>
@@ -19,7 +18,7 @@ namespace Catch {
     namespace Benchmark {
         namespace Detail {
             template <typename Clock, typename Fun, typename... Args>
-            TimingOf<Clock, Fun, Args...> measure(Fun&& fun, Args&&... args) {
+            TimingOf<Fun, Args...> measure(Fun&& fun, Args&&... args) {
                 auto start = Clock::now();
                 auto&& r = Detail::complete_invoke(fun, CATCH_FORWARD(args)...);
                 auto end = Clock::now();
diff --git a/external_imported/Catch2/src/catch2/benchmark/detail/catch_run_for_at_least.cpp b/external_imported/Catch2/src/catch2/benchmark/detail/catch_run_for_at_least.cpp
index 35778b27f..3ebdcc05a 100644
--- a/external_imported/Catch2/src/catch2/benchmark/detail/catch_run_for_at_least.cpp
+++ b/external_imported/Catch2/src/catch2/benchmark/detail/catch_run_for_at_least.cpp
@@ -7,9 +7,10 @@
 // SPDX-License-Identifier: BSL-1.0
 
 #include <catch2/benchmark/detail/catch_run_for_at_least.hpp>
-#include <exception>
 #include <catch2/internal/catch_enforce.hpp>
 
+#include <exception>
+
 namespace Catch {
     namespace Benchmark {
         namespace Detail {
diff --git a/external_imported/Catch2/src/catch2/benchmark/detail/catch_run_for_at_least.hpp b/external_imported/Catch2/src/catch2/benchmark/detail/catch_run_for_at_least.hpp
index 976a4b243..4dfa8bbbb 100644
--- a/external_imported/Catch2/src/catch2/benchmark/detail/catch_run_for_at_least.hpp
+++ b/external_imported/Catch2/src/catch2/benchmark/detail/catch_run_for_at_least.hpp
@@ -24,11 +24,11 @@ namespace Catch {
     namespace Benchmark {
         namespace Detail {
             template <typename Clock, typename Fun>
-            TimingOf<Clock, Fun, int> measure_one(Fun&& fun, int iters, std::false_type) {
+            TimingOf<Fun, int> measure_one(Fun&& fun, int iters, std::false_type) {
                 return Detail::measure<Clock>(fun, iters);
             }
             template <typename Clock, typename Fun>
-            TimingOf<Clock, Fun, Chronometer> measure_one(Fun&& fun, int iters, std::true_type) {
+            TimingOf<Fun, Chronometer> measure_one(Fun&& fun, int iters, std::true_type) {
                 Detail::ChronometerModel<Clock> meter;
                 auto&& result = Detail::complete_invoke(fun, Chronometer(meter, iters));
 
@@ -43,8 +43,8 @@ namespace Catch {
             void throw_optimized_away_error();
 
             template <typename Clock, typename Fun>
-            TimingOf<Clock, Fun, run_for_at_least_argument_t<Clock, Fun>>
-                run_for_at_least(ClockDuration<Clock> how_long,
+            TimingOf<Fun, run_for_at_least_argument_t<Clock, Fun>>
+                run_for_at_least(IDuration how_long,
                                  const int initial_iterations,
                                  Fun&& fun) {
                 auto iters = initial_iterations;
diff --git a/external_imported/Catch2/src/catch2/benchmark/detail/catch_stats.cpp b/external_imported/Catch2/src/catch2/benchmark/detail/catch_stats.cpp
index 514ed1f73..52cee4eea 100644
--- a/external_imported/Catch2/src/catch2/benchmark/detail/catch_stats.cpp
+++ b/external_imported/Catch2/src/catch2/benchmark/detail/catch_stats.cpp
@@ -10,10 +10,14 @@
 #include <catch2/benchmark/detail/catch_stats.hpp>
 
 #include <catch2/internal/catch_compiler_capabilities.hpp>
+#include <catch2/internal/catch_floating_point_helpers.hpp>
+#include <catch2/internal/catch_random_number_generator.hpp>
 
+#include <algorithm>
 #include <cassert>
+#include <cmath>
 #include <cstddef>
-#include <iterator>
+#include <numeric>
 #include <random>
 
 
@@ -21,139 +25,199 @@
 #include <future>
 #endif
 
-namespace {
-
-using Catch::Benchmark::Detail::sample;
-
-     template <typename URng, typename Estimator>
-     sample resample(URng& rng, unsigned int resamples, std::vector<double>::iterator first, std::vector<double>::iterator last, Estimator& estimator) {
-         auto n = static_cast<size_t>(last - first);
-         std::uniform_int_distribution<decltype(n)> dist(0, n - 1);
-
-         sample out;
-         out.reserve(resamples);
-         std::generate_n(std::back_inserter(out), resamples, [n, first, &estimator, &dist, &rng] {
-             std::vector<double> resampled;
-             resampled.reserve(n);
-             std::generate_n(std::back_inserter(resampled), n, [first, &dist, &rng] { return first[static_cast<std::ptrdiff_t>(dist(rng))]; });
-             return estimator(resampled.begin(), resampled.end());
-         });
-         std::sort(out.begin(), out.end());
-         return out;
-     }
-
-
-    double erf_inv(double x) {
-        // Code accompanying the article "Approximating the erfinv function" in GPU Computing Gems, Volume 2
-        double w, p;
-
-        w = -log((1.0 - x) * (1.0 + x));
-
-        if (w < 6.250000) {
-            w = w - 3.125000;
-            p = -3.6444120640178196996e-21;
-            p = -1.685059138182016589e-19 + p * w;
-            p = 1.2858480715256400167e-18 + p * w;
-            p = 1.115787767802518096e-17 + p * w;
-            p = -1.333171662854620906e-16 + p * w;
-            p = 2.0972767875968561637e-17 + p * w;
-            p = 6.6376381343583238325e-15 + p * w;
-            p = -4.0545662729752068639e-14 + p * w;
-            p = -8.1519341976054721522e-14 + p * w;
-            p = 2.6335093153082322977e-12 + p * w;
-            p = -1.2975133253453532498e-11 + p * w;
-            p = -5.4154120542946279317e-11 + p * w;
-            p = 1.051212273321532285e-09 + p * w;
-            p = -4.1126339803469836976e-09 + p * w;
-            p = -2.9070369957882005086e-08 + p * w;
-            p = 4.2347877827932403518e-07 + p * w;
-            p = -1.3654692000834678645e-06 + p * w;
-            p = -1.3882523362786468719e-05 + p * w;
-            p = 0.0001867342080340571352 + p * w;
-            p = -0.00074070253416626697512 + p * w;
-            p = -0.0060336708714301490533 + p * w;
-            p = 0.24015818242558961693 + p * w;
-            p = 1.6536545626831027356 + p * w;
-        } else if (w < 16.000000) {
-            w = sqrt(w) - 3.250000;
-            p = 2.2137376921775787049e-09;
-            p = 9.0756561938885390979e-08 + p * w;
-            p = -2.7517406297064545428e-07 + p * w;
-            p = 1.8239629214389227755e-08 + p * w;
-            p = 1.5027403968909827627e-06 + p * w;
-            p = -4.013867526981545969e-06 + p * w;
-            p = 2.9234449089955446044e-06 + p * w;
-            p = 1.2475304481671778723e-05 + p * w;
-            p = -4.7318229009055733981e-05 + p * w;
-            p = 6.8284851459573175448e-05 + p * w;
-            p = 2.4031110387097893999e-05 + p * w;
-            p = -0.0003550375203628474796 + p * w;
-            p = 0.00095328937973738049703 + p * w;
-            p = -0.0016882755560235047313 + p * w;
-            p = 0.0024914420961078508066 + p * w;
-            p = -0.0037512085075692412107 + p * w;
-            p = 0.005370914553590063617 + p * w;
-            p = 1.0052589676941592334 + p * w;
-            p = 3.0838856104922207635 + p * w;
-        } else {
-            w = sqrt(w) - 5.000000;
-            p = -2.7109920616438573243e-11;
-            p = -2.5556418169965252055e-10 + p * w;
-            p = 1.5076572693500548083e-09 + p * w;
-            p = -3.7894654401267369937e-09 + p * w;
-            p = 7.6157012080783393804e-09 + p * w;
-            p = -1.4960026627149240478e-08 + p * w;
-            p = 2.9147953450901080826e-08 + p * w;
-            p = -6.7711997758452339498e-08 + p * w;
-            p = 2.2900482228026654717e-07 + p * w;
-            p = -9.9298272942317002539e-07 + p * w;
-            p = 4.5260625972231537039e-06 + p * w;
-            p = -1.9681778105531670567e-05 + p * w;
-            p = 7.5995277030017761139e-05 + p * w;
-            p = -0.00021503011930044477347 + p * w;
-            p = -0.00013871931833623122026 + p * w;
-            p = 1.0103004648645343977 + p * w;
-            p = 4.8499064014085844221 + p * w;
-        }
-        return p * x;
-    }
-
-    double standard_deviation(std::vector<double>::iterator first, std::vector<double>::iterator last) {
-        auto m = Catch::Benchmark::Detail::mean(first, last);
-        double variance = std::accumulate( first,
-                                           last,
-                                           0.,
-                                           [m]( double a, double b ) {
-                                               double diff = b - m;
-                                               return a + diff * diff;
-                                           } ) /
-                          ( last - first );
-        return std::sqrt( variance );
-    }
-
-}
-
 namespace Catch {
     namespace Benchmark {
         namespace Detail {
+            namespace {
+
+                template <typename URng, typename Estimator>
+                static sample
+                resample( URng& rng,
+                          unsigned int resamples,
+                          double const* first,
+                          double const* last,
+                          Estimator& estimator ) {
+                    auto n = static_cast<size_t>( last - first );
+                    std::uniform_int_distribution<size_t> dist( 0, n - 1 );
+
+                    sample out;
+                    out.reserve( resamples );
+                    std::vector<double> resampled;
+                    resampled.reserve( n );
+                    for ( size_t i = 0; i < resamples; ++i ) {
+                        resampled.clear();
+                        for ( size_t s = 0; s < n; ++s ) {
+                            resampled.push_back( first[dist( rng )] );
+                        }
+                        const auto estimate =
+                            estimator( resampled.data(), resampled.data() + resampled.size() );
+                        out.push_back( estimate );
+                    }
+                    std::sort( out.begin(), out.end() );
+                    return out;
+                }
 
-#if defined( __GNUC__ ) || defined( __clang__ )
-#    pragma GCC diagnostic push
-#    pragma GCC diagnostic ignored "-Wfloat-equal"
-#endif
-            bool directCompare( double lhs, double rhs ) { return lhs == rhs; }
-#if defined( __GNUC__ ) || defined( __clang__ )
-#    pragma GCC diagnostic pop
-#endif
+                static double outlier_variance( Estimate<double> mean,
+                                                Estimate<double> stddev,
+                                                int n ) {
+                    double sb = stddev.point;
+                    double mn = mean.point / n;
+                    double mg_min = mn / 2.;
+                    double sg = (std::min)( mg_min / 4., sb / std::sqrt( n ) );
+                    double sg2 = sg * sg;
+                    double sb2 = sb * sb;
+
+                    auto c_max = [n, mn, sb2, sg2]( double x ) -> double {
+                        double k = mn - x;
+                        double d = k * k;
+                        double nd = n * d;
+                        double k0 = -n * nd;
+                        double k1 = sb2 - n * sg2 + nd;
+                        double det = k1 * k1 - 4 * sg2 * k0;
+                        return static_cast<int>( -2. * k0 /
+                                                 ( k1 + std::sqrt( det ) ) );
+                    };
+
+                    auto var_out = [n, sb2, sg2]( double c ) {
+                        double nc = n - c;
+                        return ( nc / n ) * ( sb2 - nc * sg2 );
+                    };
+
+                    return (std::min)( var_out( 1 ),
+                                       var_out(
+                                           (std::min)( c_max( 0. ),
+                                                       c_max( mg_min ) ) ) ) /
+                           sb2;
+                }
+
+                static double erf_inv( double x ) {
+                    // Code accompanying the article "Approximating the erfinv
+                    // function" in GPU Computing Gems, Volume 2
+                    double w, p;
+
+                    w = -log( ( 1.0 - x ) * ( 1.0 + x ) );
+
+                    if ( w < 6.250000 ) {
+                        w = w - 3.125000;
+                        p = -3.6444120640178196996e-21;
+                        p = -1.685059138182016589e-19 + p * w;
+                        p = 1.2858480715256400167e-18 + p * w;
+                        p = 1.115787767802518096e-17 + p * w;
+                        p = -1.333171662854620906e-16 + p * w;
+                        p = 2.0972767875968561637e-17 + p * w;
+                        p = 6.6376381343583238325e-15 + p * w;
+                        p = -4.0545662729752068639e-14 + p * w;
+                        p = -8.1519341976054721522e-14 + p * w;
+                        p = 2.6335093153082322977e-12 + p * w;
+                        p = -1.2975133253453532498e-11 + p * w;
+                        p = -5.4154120542946279317e-11 + p * w;
+                        p = 1.051212273321532285e-09 + p * w;
+                        p = -4.1126339803469836976e-09 + p * w;
+                        p = -2.9070369957882005086e-08 + p * w;
+                        p = 4.2347877827932403518e-07 + p * w;
+                        p = -1.3654692000834678645e-06 + p * w;
+                        p = -1.3882523362786468719e-05 + p * w;
+                        p = 0.0001867342080340571352 + p * w;
+                        p = -0.00074070253416626697512 + p * w;
+                        p = -0.0060336708714301490533 + p * w;
+                        p = 0.24015818242558961693 + p * w;
+                        p = 1.6536545626831027356 + p * w;
+                    } else if ( w < 16.000000 ) {
+                        w = sqrt( w ) - 3.250000;
+                        p = 2.2137376921775787049e-09;
+                        p = 9.0756561938885390979e-08 + p * w;
+                        p = -2.7517406297064545428e-07 + p * w;
+                        p = 1.8239629214389227755e-08 + p * w;
+                        p = 1.5027403968909827627e-06 + p * w;
+                        p = -4.013867526981545969e-06 + p * w;
+                        p = 2.9234449089955446044e-06 + p * w;
+                        p = 1.2475304481671778723e-05 + p * w;
+                        p = -4.7318229009055733981e-05 + p * w;
+                        p = 6.8284851459573175448e-05 + p * w;
+                        p = 2.4031110387097893999e-05 + p * w;
+                        p = -0.0003550375203628474796 + p * w;
+                        p = 0.00095328937973738049703 + p * w;
+                        p = -0.0016882755560235047313 + p * w;
+                        p = 0.0024914420961078508066 + p * w;
+                        p = -0.0037512085075692412107 + p * w;
+                        p = 0.005370914553590063617 + p * w;
+                        p = 1.0052589676941592334 + p * w;
+                        p = 3.0838856104922207635 + p * w;
+                    } else {
+                        w = sqrt( w ) - 5.000000;
+                        p = -2.7109920616438573243e-11;
+                        p = -2.5556418169965252055e-10 + p * w;
+                        p = 1.5076572693500548083e-09 + p * w;
+                        p = -3.7894654401267369937e-09 + p * w;
+                        p = 7.6157012080783393804e-09 + p * w;
+                        p = -1.4960026627149240478e-08 + p * w;
+                        p = 2.9147953450901080826e-08 + p * w;
+                        p = -6.7711997758452339498e-08 + p * w;
+                        p = 2.2900482228026654717e-07 + p * w;
+                        p = -9.9298272942317002539e-07 + p * w;
+                        p = 4.5260625972231537039e-06 + p * w;
+                        p = -1.9681778105531670567e-05 + p * w;
+                        p = 7.5995277030017761139e-05 + p * w;
+                        p = -0.00021503011930044477347 + p * w;
+                        p = -0.00013871931833623122026 + p * w;
+                        p = 1.0103004648645343977 + p * w;
+                        p = 4.8499064014085844221 + p * w;
+                    }
+                    return p * x;
+                }
+
+                static double
+                standard_deviation( double const* first, double const* last ) {
+                    auto m = Catch::Benchmark::Detail::mean( first, last );
+                    double variance =
+                        std::accumulate( first,
+                                         last,
+                                         0.,
+                                         [m]( double a, double b ) {
+                                             double diff = b - m;
+                                             return a + diff * diff;
+                                         } ) /
+                        ( last - first );
+                    return std::sqrt( variance );
+                }
+
+                static sample jackknife( double ( *estimator )( double const*,
+                                                                double const* ),
+                                         double* first,
+                                         double* last ) {
+                    const auto second = first + 1;
+                    sample results;
+                    results.reserve( static_cast<size_t>( last - first ) );
+
+                    for ( auto it = first; it != last; ++it ) {
+                        std::iter_swap( it, first );
+                        results.push_back( estimator( second, last ) );
+                    }
+
+                    return results;
+                }
+
+
+            } // namespace
+        }     // namespace Detail
+    }         // namespace Benchmark
+} // namespace Catch
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
 
-            double weighted_average_quantile(int k, int q, std::vector<double>::iterator first, std::vector<double>::iterator last) {
+            double weighted_average_quantile( int k,
+                                              int q,
+                                              double* first,
+                                              double* last ) {
                 auto count = last - first;
                 double idx = (count - 1) * k / static_cast<double>(q);
                 int j = static_cast<int>(idx);
                 double g = idx - j;
                 std::nth_element(first, first + j, last);
                 auto xj = first[j];
-                if ( directCompare( g, 0 ) ) {
+                if ( Catch::Detail::directCompare( g, 0 ) ) {
                     return xj;
                 }
 
@@ -161,6 +225,48 @@ namespace Catch {
                 return xj + g * (xj1 - xj);
             }
 
+            OutlierClassification
+            classify_outliers( double const* first, double const* last ) {
+                std::vector<double> copy( first, last );
+
+                auto q1 = weighted_average_quantile( 1, 4, copy.data(), copy.data() + copy.size() );
+                auto q3 = weighted_average_quantile( 3, 4, copy.data(), copy.data() + copy.size() );
+                auto iqr = q3 - q1;
+                auto los = q1 - ( iqr * 3. );
+                auto lom = q1 - ( iqr * 1.5 );
+                auto him = q3 + ( iqr * 1.5 );
+                auto his = q3 + ( iqr * 3. );
+
+                OutlierClassification o;
+                for ( ; first != last; ++first ) {
+                    const double t = *first;
+                    if ( t < los ) {
+                        ++o.low_severe;
+                    } else if ( t < lom ) {
+                        ++o.low_mild;
+                    } else if ( t > his ) {
+                        ++o.high_severe;
+                    } else if ( t > him ) {
+                        ++o.high_mild;
+                    }
+                    ++o.samples_seen;
+                }
+                return o;
+            }
+
+            double mean( double const* first, double const* last ) {
+                auto count = last - first;
+                double sum = 0.;
+                while (first != last) {
+                    sum += *first;
+                    ++first;
+                }
+                return sum / static_cast<double>(count);
+            }
+
+            double normal_cdf( double x ) {
+                return std::erfc( -x / std::sqrt( 2.0 ) ) / 2.0;
+            }
 
             double erfc_inv(double x) {
                 return erf_inv(1.0 - x);
@@ -182,50 +288,77 @@ namespace Catch {
                 return result;
             }
 
+            Estimate<double>
+            bootstrap( double confidence_level,
+                       double* first,
+                       double* last,
+                       sample const& resample,
+                       double ( *estimator )( double const*, double const* ) ) {
+                auto n_samples = last - first;
+
+                double point = estimator( first, last );
+                // Degenerate case with a single sample
+                if ( n_samples == 1 )
+                    return { point, point, point, confidence_level };
+
+                sample jack = jackknife( estimator, first, last );
+                double jack_mean =
+                    mean( jack.data(), jack.data() + jack.size() );
+                double sum_squares = 0, sum_cubes = 0;
+                for ( double x : jack ) {
+                    auto difference = jack_mean - x;
+                    auto square = difference * difference;
+                    auto cube = square * difference;
+                    sum_squares += square;
+                    sum_cubes += cube;
+                }
 
-            double outlier_variance(Estimate<double> mean, Estimate<double> stddev, int n) {
-                double sb = stddev.point;
-                double mn = mean.point / n;
-                double mg_min = mn / 2.;
-                double sg = (std::min)(mg_min / 4., sb / std::sqrt(n));
-                double sg2 = sg * sg;
-                double sb2 = sb * sb;
-
-                auto c_max = [n, mn, sb2, sg2](double x) -> double {
-                    double k = mn - x;
-                    double d = k * k;
-                    double nd = n * d;
-                    double k0 = -n * nd;
-                    double k1 = sb2 - n * sg2 + nd;
-                    double det = k1 * k1 - 4 * sg2 * k0;
-                    return static_cast<int>(-2. * k0 / (k1 + std::sqrt(det)));
-                };
+                double accel = sum_cubes / ( 6 * std::pow( sum_squares, 1.5 ) );
+                long n = static_cast<long>( resample.size() );
+                double prob_n =
+                    std::count_if( resample.begin(),
+                                   resample.end(),
+                                   [point]( double x ) { return x < point; } ) /
+                    static_cast<double>( n );
+                // degenerate case with uniform samples
+                if ( Catch::Detail::directCompare( prob_n, 0. ) ) {
+                    return { point, point, point, confidence_level };
+                }
 
-                auto var_out = [n, sb2, sg2](double c) {
-                    double nc = n - c;
-                    return (nc / n) * (sb2 - nc * sg2);
-                };
+                double bias = normal_quantile( prob_n );
+                double z1 = normal_quantile( ( 1. - confidence_level ) / 2. );
 
-                return (std::min)(var_out(1), var_out((std::min)(c_max(0.), c_max(mg_min)))) / sb2;
+                auto cumn = [n]( double x ) -> long {
+                    return std::lround( normal_cdf( x ) *
+                                        static_cast<double>( n ) );
+                };
+                auto a = [bias, accel]( double b ) {
+                    return bias + b / ( 1. - accel * b );
+                };
+                double b1 = bias + z1;
+                double b2 = bias - z1;
+                double a1 = a( b1 );
+                double a2 = a( b2 );
+                auto lo = static_cast<size_t>( (std::max)( cumn( a1 ), 0l ) );
+                auto hi =
+                    static_cast<size_t>( (std::min)( cumn( a2 ), n - 1 ) );
+
+                return { point, resample[lo], resample[hi], confidence_level };
             }
 
-
-            bootstrap_analysis analyse_samples(double confidence_level, unsigned int n_resamples, std::vector<double>::iterator first, std::vector<double>::iterator last) {
-                CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
-                CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS
-                static std::random_device entropy;
-                CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-                auto n = static_cast<int>(last - first); // seriously, one can't use integral types without hell in C++
-
-                auto mean = &Detail::mean<std::vector<double>::iterator>;
+            bootstrap_analysis analyse_samples(double confidence_level,
+                                               unsigned int n_resamples,
+                                               double* first,
+                                               double* last) {
+                auto mean = &Detail::mean;
                 auto stddev = &standard_deviation;
 
 #if defined(CATCH_CONFIG_USE_ASYNC)
-                auto Estimate = [=](double(*f)(std::vector<double>::iterator, std::vector<double>::iterator)) {
-                    auto seed = entropy();
+                auto Estimate = [=](double(*f)(double const*, double const*)) {
+                    std::random_device rd;
+                    auto seed = rd();
                     return std::async(std::launch::async, [=] {
-                        std::mt19937 rng(seed);
+                        SimplePcg32 rng( seed );
                         auto resampled = resample(rng, n_resamples, first, last, f);
                         return bootstrap(confidence_level, first, last, resampled, f);
                     });
@@ -237,9 +370,10 @@ namespace Catch {
                 auto mean_estimate = mean_future.get();
                 auto stddev_estimate = stddev_future.get();
 #else
-                auto Estimate = [=](double(*f)(std::vector<double>::iterator, std::vector<double>::iterator)) {
-                    auto seed = entropy();
-                    std::mt19937 rng(seed);
+                auto Estimate = [=](double(*f)(double const* , double const*)) {
+                    std::random_device rd;
+                    auto seed = rd();
+                    SimplePcg32 rng( seed );
                     auto resampled = resample(rng, n_resamples, first, last, f);
                     return bootstrap(confidence_level, first, last, resampled, f);
                 };
@@ -248,6 +382,7 @@ namespace Catch {
                 auto stddev_estimate = Estimate(stddev);
 #endif // CATCH_USE_ASYNC
 
+                auto n = static_cast<int>(last - first); // seriously, one can't use integral types without hell in C++
                 double outlier_variance = Detail::outlier_variance(mean_estimate, stddev_estimate, n);
 
                 return { mean_estimate, stddev_estimate, outlier_variance };
diff --git a/external_imported/Catch2/src/catch2/benchmark/detail/catch_stats.hpp b/external_imported/Catch2/src/catch2/benchmark/detail/catch_stats.hpp
index 4c54ec52e..3bea612f9 100644
--- a/external_imported/Catch2/src/catch2/benchmark/detail/catch_stats.hpp
+++ b/external_imported/Catch2/src/catch2/benchmark/detail/catch_stats.hpp
@@ -13,122 +13,35 @@
 #include <catch2/benchmark/catch_estimate.hpp>
 #include <catch2/benchmark/catch_outlier_classification.hpp>
 
-#include <algorithm>
 #include <vector>
-#include <numeric>
-#include <tuple>
-#include <cmath>
 
 namespace Catch {
     namespace Benchmark {
         namespace Detail {
             using sample = std::vector<double>;
 
-            // Used when we know we want == comparison of two doubles
-            // to centralize warning suppression
-            bool directCompare( double lhs, double rhs );
-
-            double weighted_average_quantile(int k, int q, std::vector<double>::iterator first, std::vector<double>::iterator last);
-
-            template <typename Iterator>
-            OutlierClassification classify_outliers(Iterator first, Iterator last) {
-                std::vector<double> copy(first, last);
-
-                auto q1 = weighted_average_quantile(1, 4, copy.begin(), copy.end());
-                auto q3 = weighted_average_quantile(3, 4, copy.begin(), copy.end());
-                auto iqr = q3 - q1;
-                auto los = q1 - (iqr * 3.);
-                auto lom = q1 - (iqr * 1.5);
-                auto him = q3 + (iqr * 1.5);
-                auto his = q3 + (iqr * 3.);
-
-                OutlierClassification o;
-                for (; first != last; ++first) {
-                    auto&& t = *first;
-                    if (t < los) ++o.low_severe;
-                    else if (t < lom) ++o.low_mild;
-                    else if (t > his) ++o.high_severe;
-                    else if (t > him) ++o.high_mild;
-                    ++o.samples_seen;
-                }
-                return o;
-            }
-
-            template <typename Iterator>
-            double mean(Iterator first, Iterator last) {
-                auto count = last - first;
-                double sum = std::accumulate(first, last, 0.);
-                return sum / static_cast<double>(count);
-            }
-
-            template <typename Estimator, typename Iterator>
-            sample jackknife(Estimator&& estimator, Iterator first, Iterator last) {
-                auto n = static_cast<size_t>(last - first);
-                auto second = first;
-                ++second;
-                sample results;
-                results.reserve(n);
-
-                for (auto it = first; it != last; ++it) {
-                    std::iter_swap(it, first);
-                    results.push_back(estimator(second, last));
-                }
-
-                return results;
-            }
-
-            inline double normal_cdf(double x) {
-                return std::erfc(-x / std::sqrt(2.0)) / 2.0;
-            }
+            double weighted_average_quantile( int k,
+                                              int q,
+                                              double* first,
+                                              double* last );
+
+            OutlierClassification
+            classify_outliers( double const* first, double const* last );
+
+            double mean( double const* first, double const* last );
+
+            double normal_cdf( double x );
 
             double erfc_inv(double x);
 
             double normal_quantile(double p);
 
-            template <typename Iterator, typename Estimator>
-            Estimate<double> bootstrap(double confidence_level, Iterator first, Iterator last, sample const& resample, Estimator&& estimator) {
-                auto n_samples = last - first;
-
-                double point = estimator(first, last);
-                // Degenerate case with a single sample
-                if (n_samples == 1) return { point, point, point, confidence_level };
-
-                sample jack = jackknife(estimator, first, last);
-                double jack_mean = mean(jack.begin(), jack.end());
-                double sum_squares, sum_cubes;
-                std::tie(sum_squares, sum_cubes) = std::accumulate(jack.begin(), jack.end(), std::make_pair(0., 0.), [jack_mean](std::pair<double, double> sqcb, double x) -> std::pair<double, double> {
-                    auto d = jack_mean - x;
-                    auto d2 = d * d;
-                    auto d3 = d2 * d;
-                    return { sqcb.first + d2, sqcb.second + d3 };
-                });
-
-                double accel = sum_cubes / (6 * std::pow(sum_squares, 1.5));
-                long n = static_cast<long>(resample.size());
-                double prob_n = std::count_if(resample.begin(), resample.end(), [point](double x) { return x < point; }) / static_cast<double>(n);
-                // degenerate case with uniform samples
-                if ( directCompare( prob_n, 0. ) ) {
-                    return { point, point, point, confidence_level };
-                }
-
-                double bias = normal_quantile(prob_n);
-                double z1 = normal_quantile((1. - confidence_level) / 2.);
-
-                auto cumn = [n]( double x ) -> long {
-                    return std::lround( normal_cdf( x ) * static_cast<double>(n) );
-                };
-                auto a = [bias, accel](double b) { return bias + b / (1. - accel * b); };
-                double b1 = bias + z1;
-                double b2 = bias - z1;
-                double a1 = a(b1);
-                double a2 = a(b2);
-                auto lo = static_cast<size_t>((std::max)(cumn(a1), 0l));
-                auto hi = static_cast<size_t>((std::min)(cumn(a2), n - 1));
-
-                return { point, resample[lo], resample[hi], confidence_level };
-            }
-
-            double outlier_variance(Estimate<double> mean, Estimate<double> stddev, int n);
+            Estimate<double>
+            bootstrap( double confidence_level,
+                       double* first,
+                       double* last,
+                       sample const& resample,
+                       double ( *estimator )( double const*, double const* ) );
 
             struct bootstrap_analysis {
                 Estimate<double> mean;
@@ -136,7 +49,10 @@ namespace Catch {
                 double outlier_variance;
             };
 
-            bootstrap_analysis analyse_samples(double confidence_level, unsigned int n_resamples, std::vector<double>::iterator first, std::vector<double>::iterator last);
+            bootstrap_analysis analyse_samples(double confidence_level,
+                                               unsigned int n_resamples,
+                                               double* first,
+                                               double* last);
         } // namespace Detail
     } // namespace Benchmark
 } // namespace Catch
diff --git a/external_imported/Catch2/src/catch2/benchmark/detail/catch_timing.hpp b/external_imported/Catch2/src/catch2/benchmark/detail/catch_timing.hpp
index f5c25571c..da5671908 100644
--- a/external_imported/Catch2/src/catch2/benchmark/detail/catch_timing.hpp
+++ b/external_imported/Catch2/src/catch2/benchmark/detail/catch_timing.hpp
@@ -17,14 +17,14 @@
 
 namespace Catch {
     namespace Benchmark {
-        template <typename Duration, typename Result>
+        template <typename Result>
         struct Timing {
-            Duration elapsed;
+            IDuration elapsed;
             Result result;
             int iterations;
         };
-        template <typename Clock, typename Func, typename... Args>
-        using TimingOf = Timing<ClockDuration<Clock>, Detail::CompleteType_t<FunctionReturnType<Func, Args...>>>;
+        template <typename Func, typename... Args>
+        using TimingOf = Timing<Detail::CompleteType_t<FunctionReturnType<Func, Args...>>>;
     } // namespace Benchmark
 } // namespace Catch
 
diff --git a/external_imported/Catch2/src/catch2/catch_all.hpp b/external_imported/Catch2/src/catch2/catch_all.hpp
index be146421e..f2cc85365 100644
--- a/external_imported/Catch2/src/catch2/catch_all.hpp
+++ b/external_imported/Catch2/src/catch2/catch_all.hpp
@@ -54,6 +54,8 @@
 #include <catch2/internal/catch_compiler_capabilities.hpp>
 #include <catch2/internal/catch_config_android_logwrite.hpp>
 #include <catch2/internal/catch_config_counter.hpp>
+#include <catch2/internal/catch_config_prefix_messages.hpp>
+#include <catch2/internal/catch_config_static_analysis_support.hpp>
 #include <catch2/internal/catch_config_uncaught_exceptions.hpp>
 #include <catch2/internal/catch_config_wchar.hpp>
 #include <catch2/internal/catch_console_colour.hpp>
@@ -72,6 +74,7 @@
 #include <catch2/internal/catch_getenv.hpp>
 #include <catch2/internal/catch_is_permutation.hpp>
 #include <catch2/internal/catch_istream.hpp>
+#include <catch2/internal/catch_jsonwriter.hpp>
 #include <catch2/internal/catch_lazy_expr.hpp>
 #include <catch2/internal/catch_leak_detector.hpp>
 #include <catch2/internal/catch_list.hpp>
@@ -86,7 +89,10 @@
 #include <catch2/internal/catch_platform.hpp>
 #include <catch2/internal/catch_polyfills.hpp>
 #include <catch2/internal/catch_preprocessor.hpp>
+#include <catch2/internal/catch_preprocessor_internal_stringify.hpp>
 #include <catch2/internal/catch_preprocessor_remove_parens.hpp>
+#include <catch2/internal/catch_random_floating_point_helpers.hpp>
+#include <catch2/internal/catch_random_integer_helpers.hpp>
 #include <catch2/internal/catch_random_number_generator.hpp>
 #include <catch2/internal/catch_random_seed_generation.hpp>
 #include <catch2/internal/catch_reporter_registry.hpp>
@@ -111,10 +117,13 @@
 #include <catch2/internal/catch_test_failure_exception.hpp>
 #include <catch2/internal/catch_test_macro_impl.hpp>
 #include <catch2/internal/catch_test_registry.hpp>
+#include <catch2/internal/catch_test_run_info.hpp>
 #include <catch2/internal/catch_test_spec_parser.hpp>
 #include <catch2/internal/catch_textflow.hpp>
 #include <catch2/internal/catch_to_string.hpp>
 #include <catch2/internal/catch_uncaught_exceptions.hpp>
+#include <catch2/internal/catch_uniform_floating_point_distribution.hpp>
+#include <catch2/internal/catch_uniform_integer_distribution.hpp>
 #include <catch2/internal/catch_unique_name.hpp>
 #include <catch2/internal/catch_unique_ptr.hpp>
 #include <catch2/internal/catch_void_type.hpp>
diff --git a/external_imported/Catch2/src/catch2/catch_approx.cpp b/external_imported/Catch2/src/catch2/catch_approx.cpp
index 407586d1d..9ad4ce3ee 100644
--- a/external_imported/Catch2/src/catch2/catch_approx.cpp
+++ b/external_imported/Catch2/src/catch2/catch_approx.cpp
@@ -70,10 +70,10 @@ namespace Catch {
     }
 
 namespace literals {
-    Approx operator "" _a(long double val) {
+    Approx operator ""_a(long double val) {
         return Approx(val);
     }
-    Approx operator "" _a(unsigned long long val) {
+    Approx operator ""_a(unsigned long long val) {
         return Approx(val);
     }
 } // end namespace literals
diff --git a/external_imported/Catch2/src/catch2/catch_config.cpp b/external_imported/Catch2/src/catch2/catch_config.cpp
index eb4f5ad36..34f50f175 100644
--- a/external_imported/Catch2/src/catch2/catch_config.cpp
+++ b/external_imported/Catch2/src/catch2/catch_config.cpp
@@ -105,7 +105,7 @@ namespace Catch {
             elem = trim(elem);
         }
 
-        // Insert the default reporter if user hasn't asked for a specfic one
+        // Insert the default reporter if user hasn't asked for a specific one
         if ( m_data.reporterSpecifications.empty() ) {
             m_data.reporterSpecifications.push_back( {
 #if defined( CATCH_CONFIG_DEFAULT_REPORTER )
diff --git a/external_imported/Catch2/src/catch2/catch_config.hpp b/external_imported/Catch2/src/catch2/catch_config.hpp
index 784de4aa5..17e983e5c 100644
--- a/external_imported/Catch2/src/catch2/catch_config.hpp
+++ b/external_imported/Catch2/src/catch2/catch_config.hpp
@@ -69,7 +69,7 @@ namespace Catch {
         bool benchmarkNoAnalysis = false;
         unsigned int benchmarkSamples = 100;
         double benchmarkConfidenceInterval = 0.95;
-        unsigned int benchmarkResamples = 100000;
+        unsigned int benchmarkResamples = 100'000;
         std::chrono::milliseconds::rep benchmarkWarmupTime = 100;
 
         Verbosity verbosity = Verbosity::Normal;
diff --git a/external_imported/Catch2/src/catch2/catch_message.cpp b/external_imported/Catch2/src/catch2/catch_message.cpp
index d4723e949..384f180e5 100644
--- a/external_imported/Catch2/src/catch2/catch_message.cpp
+++ b/external_imported/Catch2/src/catch2/catch_message.cpp
@@ -37,7 +37,11 @@ namespace Catch {
     }
 
 
-    Capturer::Capturer( StringRef macroName, SourceLineInfo const& lineInfo, ResultWas::OfType resultType, StringRef names ) {
+    Capturer::Capturer( StringRef macroName,
+                        SourceLineInfo const& lineInfo,
+                        ResultWas::OfType resultType,
+                        StringRef names ):
+        m_resultCapture( getResultCapture() ) {
         auto trimmed = [&] (size_t start, size_t end) {
             while (names[start] == ',' || isspace(static_cast<unsigned char>(names[start]))) {
                 ++start;
diff --git a/external_imported/Catch2/src/catch2/catch_message.hpp b/external_imported/Catch2/src/catch2/catch_message.hpp
index e6bc1b5dc..05325ee8f 100644
--- a/external_imported/Catch2/src/catch2/catch_message.hpp
+++ b/external_imported/Catch2/src/catch2/catch_message.hpp
@@ -8,12 +8,13 @@
 #ifndef CATCH_MESSAGE_HPP_INCLUDED
 #define CATCH_MESSAGE_HPP_INCLUDED
 
+#include <catch2/internal/catch_config_prefix_messages.hpp>
 #include <catch2/internal/catch_result_type.hpp>
 #include <catch2/internal/catch_reusable_string_stream.hpp>
 #include <catch2/internal/catch_stream_end_stop.hpp>
 #include <catch2/internal/catch_message_info.hpp>
-#include <catch2/interfaces/catch_interfaces_capture.hpp>
 #include <catch2/catch_tostring.hpp>
+#include <catch2/interfaces/catch_interfaces_capture.hpp>
 
 #include <string>
 #include <vector>
@@ -21,6 +22,7 @@
 namespace Catch {
 
     struct SourceLineInfo;
+    class IResultCapture;
 
     struct MessageStream {
 
@@ -61,7 +63,7 @@ namespace Catch {
 
     class Capturer {
         std::vector<MessageInfo> m_messages;
-        IResultCapture& m_resultCapture = getResultCapture();
+        IResultCapture& m_resultCapture;
         size_t m_captured = 0;
     public:
         Capturer( StringRef macroName, SourceLineInfo const& lineInfo, ResultWas::OfType resultType, StringRef names );
@@ -112,28 +114,28 @@ namespace Catch {
     Catch::getResultCapture().emplaceUnscopedMessage( Catch::MessageBuilder( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log )
 
 
-#if defined(CATCH_CONFIG_PREFIX_ALL) && !defined(CATCH_CONFIG_DISABLE)
+#if defined(CATCH_CONFIG_PREFIX_MESSAGES) && !defined(CATCH_CONFIG_DISABLE)
 
   #define CATCH_INFO( msg ) INTERNAL_CATCH_INFO( "CATCH_INFO", msg )
   #define CATCH_UNSCOPED_INFO( msg ) INTERNAL_CATCH_UNSCOPED_INFO( "CATCH_UNSCOPED_INFO", msg )
   #define CATCH_WARN( msg ) INTERNAL_CATCH_MSG( "CATCH_WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg )
   #define CATCH_CAPTURE( ... ) INTERNAL_CATCH_CAPTURE( INTERNAL_CATCH_UNIQUE_NAME(capturer), "CATCH_CAPTURE", __VA_ARGS__ )
 
-#elif defined(CATCH_CONFIG_PREFIX_ALL) && defined(CATCH_CONFIG_DISABLE)
+#elif defined(CATCH_CONFIG_PREFIX_MESSAGES) && defined(CATCH_CONFIG_DISABLE)
 
   #define CATCH_INFO( msg )          (void)(0)
   #define CATCH_UNSCOPED_INFO( msg ) (void)(0)
   #define CATCH_WARN( msg )          (void)(0)
   #define CATCH_CAPTURE( ... )       (void)(0)
 
-#elif !defined(CATCH_CONFIG_PREFIX_ALL) && !defined(CATCH_CONFIG_DISABLE)
+#elif !defined(CATCH_CONFIG_PREFIX_MESSAGES) && !defined(CATCH_CONFIG_DISABLE)
 
   #define INFO( msg ) INTERNAL_CATCH_INFO( "INFO", msg )
   #define UNSCOPED_INFO( msg ) INTERNAL_CATCH_UNSCOPED_INFO( "UNSCOPED_INFO", msg )
   #define WARN( msg ) INTERNAL_CATCH_MSG( "WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg )
   #define CAPTURE( ... ) INTERNAL_CATCH_CAPTURE( INTERNAL_CATCH_UNIQUE_NAME(capturer), "CAPTURE", __VA_ARGS__ )
 
-#elif !defined(CATCH_CONFIG_PREFIX_ALL) && defined(CATCH_CONFIG_DISABLE)
+#elif !defined(CATCH_CONFIG_PREFIX_MESSAGES) && defined(CATCH_CONFIG_DISABLE)
 
   #define INFO( msg )          (void)(0)
   #define UNSCOPED_INFO( msg ) (void)(0)
diff --git a/external_imported/Catch2/src/catch2/catch_registry_hub.cpp b/external_imported/Catch2/src/catch2/catch_registry_hub.cpp
index 243dd2b0c..8716db3a7 100644
--- a/external_imported/Catch2/src/catch2/catch_registry_hub.cpp
+++ b/external_imported/Catch2/src/catch2/catch_registry_hub.cpp
@@ -20,6 +20,9 @@
 #include <catch2/internal/catch_noncopyable.hpp>
 #include <catch2/interfaces/catch_interfaces_reporter_factory.hpp>
 #include <catch2/internal/catch_move_and_forward.hpp>
+#include <catch2/internal/catch_reporter_registry.hpp>
+
+#include <exception>
 
 namespace Catch {
 
@@ -31,7 +34,7 @@ namespace Catch {
 
         public: // IRegistryHub
             RegistryHub() = default;
-            IReporterRegistry const& getReporterRegistry() const override {
+            ReporterRegistry const& getReporterRegistry() const override {
                 return m_reporterRegistry;
             }
             ITestCaseRegistry const& getTestCaseRegistry() const override {
diff --git a/external_imported/Catch2/src/catch2/catch_session.cpp b/external_imported/Catch2/src/catch2/catch_session.cpp
index 43465f0c4..f1ed5f9cc 100644
--- a/external_imported/Catch2/src/catch2/catch_session.cpp
+++ b/external_imported/Catch2/src/catch2/catch_session.cpp
@@ -13,13 +13,13 @@
 #include <catch2/internal/catch_run_context.hpp>
 #include <catch2/catch_test_spec.hpp>
 #include <catch2/catch_version.hpp>
-#include <catch2/interfaces/catch_interfaces_reporter.hpp>
 #include <catch2/internal/catch_startup_exception_registry.hpp>
 #include <catch2/internal/catch_sharding.hpp>
+#include <catch2/internal/catch_test_case_registry_impl.hpp>
 #include <catch2/internal/catch_textflow.hpp>
 #include <catch2/internal/catch_windows_h_proxy.hpp>
 #include <catch2/reporters/catch_reporter_multi.hpp>
-#include <catch2/interfaces/catch_interfaces_reporter_registry.hpp>
+#include <catch2/internal/catch_reporter_registry.hpp>
 #include <catch2/interfaces/catch_interfaces_reporter_factory.hpp>
 #include <catch2/internal/catch_move_and_forward.hpp>
 #include <catch2/internal/catch_stdstreams.hpp>
@@ -27,6 +27,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <exception>
 #include <iomanip>
 #include <set>
 
diff --git a/external_imported/Catch2/src/catch2/catch_test_case_info.cpp b/external_imported/Catch2/src/catch2/catch_test_case_info.cpp
index a6adce0ae..c38ee55ac 100644
--- a/external_imported/Catch2/src/catch2/catch_test_case_info.cpp
+++ b/external_imported/Catch2/src/catch2/catch_test_case_info.cpp
@@ -9,6 +9,7 @@
 #include <catch2/internal/catch_enforce.hpp>
 #include <catch2/internal/catch_string_manip.hpp>
 #include <catch2/internal/catch_case_insensitive_comparisons.hpp>
+#include <catch2/internal/catch_test_registry.hpp>
 
 #include <cassert>
 #include <cctype>
@@ -139,12 +140,20 @@ namespace Catch {
         for (size_t idx = 0; idx < originalTags.size(); ++idx) {
             auto c = originalTags[idx];
             if (c == '[') {
-                assert(!inTag);
+                CATCH_ENFORCE(
+                    !inTag,
+                    "Found '[' inside a tag while registering test case '"
+                        << _nameAndTags.name << "' at " << _lineInfo );
+
                 inTag = true;
                 tagStart = idx;
             }
             if (c == ']') {
-                assert(inTag);
+                CATCH_ENFORCE(
+                    inTag,
+                    "Found unmatched ']' while registering test case '"
+                        << _nameAndTags.name << "' at " << _lineInfo );
+
                 inTag = false;
                 tagEnd = idx;
                 assert(tagStart < tagEnd);
@@ -153,7 +162,11 @@ namespace Catch {
                 // it over to backing storage and actually reference the
                 // backing storage in the saved tags
                 StringRef tagStr = originalTags.substr(tagStart+1, tagEnd - tagStart - 1);
-                CATCH_ENFORCE(!tagStr.empty(), "Empty tags are not allowed");
+                CATCH_ENFORCE( !tagStr.empty(),
+                               "Found an empty tag while registering test case '"
+                                   << _nameAndTags.name << "' at "
+                                   << _lineInfo );
+
                 enforceNotReservedTag(tagStr, lineInfo);
                 properties |= parseSpecialTag(tagStr);
                 // When copying a tag to the backing storage, we need to
@@ -167,8 +180,12 @@ namespace Catch {
                 // the tags.
                 internalAppendTag(tagStr);
             }
-            (void)inTag; // Silence "set-but-unused" warning in release mode.
         }
+        CATCH_ENFORCE( !inTag,
+                       "Found an unclosed tag while registering test case '"
+                           << _nameAndTags.name << "' at " << _lineInfo );
+
+
         // Add [.] if relevant
         if (isHidden()) {
             internalAppendTag("."_sr);
diff --git a/external_imported/Catch2/src/catch2/catch_test_case_info.hpp b/external_imported/Catch2/src/catch2/catch_test_case_info.hpp
index 5ff3e3e72..a2f4b43ec 100644
--- a/external_imported/Catch2/src/catch2/catch_test_case_info.hpp
+++ b/external_imported/Catch2/src/catch2/catch_test_case_info.hpp
@@ -8,10 +8,10 @@
 #ifndef CATCH_TEST_CASE_INFO_HPP_INCLUDED
 #define CATCH_TEST_CASE_INFO_HPP_INCLUDED
 
+#include <catch2/interfaces/catch_interfaces_test_invoker.hpp>
 #include <catch2/internal/catch_source_line_info.hpp>
 #include <catch2/internal/catch_noncopyable.hpp>
 #include <catch2/internal/catch_stringref.hpp>
-#include <catch2/internal/catch_test_registry.hpp>
 #include <catch2/internal/catch_unique_ptr.hpp>
 
 
@@ -44,6 +44,7 @@ namespace Catch {
     };
 
     class ITestInvoker;
+    struct NameAndTags;
 
     enum class TestCaseProperties : uint8_t {
         None = 0,
diff --git a/external_imported/Catch2/src/catch2/catch_test_spec.cpp b/external_imported/Catch2/src/catch2/catch_test_spec.cpp
index f27ce99c3..f32f9864c 100644
--- a/external_imported/Catch2/src/catch2/catch_test_spec.cpp
+++ b/external_imported/Catch2/src/catch2/catch_test_spec.cpp
@@ -6,6 +6,8 @@
 
 // SPDX-License-Identifier: BSL-1.0
 #include <catch2/catch_test_spec.hpp>
+#include <catch2/interfaces/catch_interfaces_testcase.hpp>
+#include <catch2/internal/catch_test_case_registry_impl.hpp>
 #include <catch2/internal/catch_reusable_string_stream.hpp>
 #include <catch2/internal/catch_string_manip.hpp>
 #include <catch2/catch_test_case_info.hpp>
@@ -106,16 +108,18 @@ namespace Catch {
         return std::any_of( m_filters.begin(), m_filters.end(), [&]( Filter const& f ){ return f.matches( testCase ); } );
     }
 
-    TestSpec::Matches TestSpec::matchesByFilter( std::vector<TestCaseHandle> const& testCases, IConfig const& config ) const
-    {
-        Matches matches( m_filters.size() );
-        std::transform( m_filters.begin(), m_filters.end(), matches.begin(), [&]( Filter const& filter ){
+    TestSpec::Matches TestSpec::matchesByFilter( std::vector<TestCaseHandle> const& testCases, IConfig const& config ) const {
+        Matches matches;
+        matches.reserve( m_filters.size() );
+        for ( auto const& filter : m_filters ) {
             std::vector<TestCaseHandle const*> currentMatches;
-            for( auto const& test : testCases )
-                if( isThrowSafe( test, config ) && filter.matches( test.getTestCaseInfo() ) )
+            for ( auto const& test : testCases )
+                if ( isThrowSafe( test, config ) &&
+                     filter.matches( test.getTestCaseInfo() ) )
                     currentMatches.emplace_back( &test );
-            return FilterMatch{ extractFilterName(filter), currentMatches };
-        } );
+            matches.push_back(
+                FilterMatch{ extractFilterName( filter ), currentMatches } );
+        }
         return matches;
     }
 
diff --git a/external_imported/Catch2/src/catch2/catch_tostring.hpp b/external_imported/Catch2/src/catch2/catch_tostring.hpp
index 904caa7e7..f3fb0beb7 100644
--- a/external_imported/Catch2/src/catch2/catch_tostring.hpp
+++ b/external_imported/Catch2/src/catch2/catch_tostring.hpp
@@ -116,7 +116,6 @@ namespace Catch {
     } // namespace Detail
 
 
-    // If we decide for C++14, change these to enable_if_ts
     template <typename T, typename = void>
     struct StringMaker {
         template <typename Fake = T>
@@ -399,6 +398,12 @@ namespace Catch {
             }
         }
     };
+    template <>
+    struct StringMaker<std::nullopt_t> {
+        static std::string convert(const std::nullopt_t&) {
+            return "{ }";
+        }
+    };
 }
 #endif // CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER
 
diff --git a/external_imported/Catch2/src/catch2/catch_translate_exception.cpp b/external_imported/Catch2/src/catch2/catch_translate_exception.cpp
new file mode 100644
index 000000000..c4b289449
--- /dev/null
+++ b/external_imported/Catch2/src/catch2/catch_translate_exception.cpp
@@ -0,0 +1,20 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+
+#include <catch2/catch_translate_exception.hpp>
+#include <catch2/interfaces/catch_interfaces_registry_hub.hpp>
+
+namespace Catch {
+    namespace Detail {
+        void registerTranslatorImpl(
+            Detail::unique_ptr<IExceptionTranslator>&& translator ) {
+            getMutableRegistryHub().registerTranslator(
+                CATCH_MOVE( translator ) );
+        }
+    } // namespace Detail
+} // namespace Catch
diff --git a/external_imported/Catch2/src/catch2/catch_translate_exception.hpp b/external_imported/Catch2/src/catch2/catch_translate_exception.hpp
index 2dbeb17e8..5a4dc5e37 100644
--- a/external_imported/Catch2/src/catch2/catch_translate_exception.hpp
+++ b/external_imported/Catch2/src/catch2/catch_translate_exception.hpp
@@ -15,6 +15,10 @@
 #include <exception>
 
 namespace Catch {
+    namespace Detail {
+        void registerTranslatorImpl(
+            Detail::unique_ptr<IExceptionTranslator>&& translator );
+    }
 
     class ExceptionTranslatorRegistrar {
         template<typename T>
@@ -48,9 +52,9 @@ namespace Catch {
     public:
         template<typename T>
         ExceptionTranslatorRegistrar( std::string(*translateFunction)( T const& ) ) {
-            getMutableRegistryHub().registerTranslator(
-                Detail::make_unique<ExceptionTranslator<T>>(translateFunction)
-            );
+            Detail::registerTranslatorImpl(
+                Detail::make_unique<ExceptionTranslator<T>>(
+                    translateFunction ) );
         }
     };
 
diff --git a/external_imported/Catch2/src/catch2/catch_user_config.hpp.in b/external_imported/Catch2/src/catch2/catch_user_config.hpp.in
index 3f6b10e89..10d61937f 100644
--- a/external_imported/Catch2/src/catch2/catch_user_config.hpp.in
+++ b/external_imported/Catch2/src/catch2/catch_user_config.hpp.in
@@ -169,9 +169,18 @@
 #endif
 
 
+#cmakedefine CATCH_CONFIG_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT
+#cmakedefine CATCH_CONFIG_NO_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT
+
+#if defined( CATCH_CONFIG_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT ) && \
+    defined( CATCH_CONFIG_NO_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT )
+#    error Cannot force STATIC_ANALYSIS_SUPPORT to both ON and OFF
+#endif
+
+
 // ------
 // Simple toggle defines
-// their value is never used and they cannot be overriden
+// their value is never used and they cannot be overridden
 // ------
 
 
@@ -189,6 +198,7 @@
 #cmakedefine CATCH_CONFIG_FAST_COMPILE
 #cmakedefine CATCH_CONFIG_NOSTDOUT
 #cmakedefine CATCH_CONFIG_PREFIX_ALL
+#cmakedefine CATCH_CONFIG_PREFIX_MESSAGES
 #cmakedefine CATCH_CONFIG_WINDOWS_CRTDBG
 
 #cmakedefine CATCH_CONFIG_SHARED_LIBRARY
diff --git a/external_imported/Catch2/src/catch2/catch_version.cpp b/external_imported/Catch2/src/catch2/catch_version.cpp
index 19cab91b3..4e67d968c 100644
--- a/external_imported/Catch2/src/catch2/catch_version.cpp
+++ b/external_imported/Catch2/src/catch2/catch_version.cpp
@@ -36,7 +36,7 @@ namespace Catch {
     }
 
     Version const& libraryVersion() {
-        static Version version( 3, 3, 2, "", 0 );
+        static Version version( 3, 5, 2, "", 0 );
         return version;
     }
 
diff --git a/external_imported/Catch2/src/catch2/catch_version_macros.hpp b/external_imported/Catch2/src/catch2/catch_version_macros.hpp
index 9ece85051..be2a04d2f 100644
--- a/external_imported/Catch2/src/catch2/catch_version_macros.hpp
+++ b/external_imported/Catch2/src/catch2/catch_version_macros.hpp
@@ -9,7 +9,7 @@
 #define CATCH_VERSION_MACROS_HPP_INCLUDED
 
 #define CATCH_VERSION_MAJOR 3
-#define CATCH_VERSION_MINOR 3
+#define CATCH_VERSION_MINOR 5
 #define CATCH_VERSION_PATCH 2
 
 #endif // CATCH_VERSION_MACROS_HPP_INCLUDED
diff --git a/external_imported/Catch2/src/catch2/generators/catch_generators.hpp b/external_imported/Catch2/src/catch2/generators/catch_generators.hpp
index 117f19019..0f35a9968 100644
--- a/external_imported/Catch2/src/catch2/generators/catch_generators.hpp
+++ b/external_imported/Catch2/src/catch2/generators/catch_generators.hpp
@@ -37,12 +37,6 @@ namespace Detail {
         }
 
     public:
-        ~IGenerator() override = default;
-        IGenerator() = default;
-        IGenerator(IGenerator const&) = default;
-        IGenerator& operator=(IGenerator const&) = default;
-
-
         // Returns the current element of the generator
         //
         // \Precondition The generator is either freshly constructed,
diff --git a/external_imported/Catch2/src/catch2/generators/catch_generators_random.cpp b/external_imported/Catch2/src/catch2/generators/catch_generators_random.cpp
index 2e3390fdf..00a8e634f 100644
--- a/external_imported/Catch2/src/catch2/generators/catch_generators_random.cpp
+++ b/external_imported/Catch2/src/catch2/generators/catch_generators_random.cpp
@@ -7,7 +7,35 @@
 // SPDX-License-Identifier: BSL-1.0
 
 #include <catch2/generators/catch_generators_random.hpp>
-
 #include <catch2/internal/catch_context.hpp>
 
-std::uint32_t Catch::Generators::Detail::getSeed() { return sharedRng()(); }
+#include <random>
+
+namespace Catch {
+    namespace Generators {
+        namespace Detail {
+            std::uint32_t getSeed() { return sharedRng()(); }
+        } // namespace Detail
+
+        struct RandomFloatingGenerator<long double>::PImpl {
+            PImpl( long double a, long double b, uint32_t seed ):
+                rng( seed ), dist( a, b ) {}
+
+            Catch::SimplePcg32 rng;
+            std::uniform_real_distribution<long double> dist;
+        };
+
+        RandomFloatingGenerator<long double>::RandomFloatingGenerator(
+            long double a, long double b, std::uint32_t seed) :
+            m_pimpl(Catch::Detail::make_unique<PImpl>(a, b, seed)) {
+            static_cast<void>( next() );
+        }
+
+        RandomFloatingGenerator<long double>::~RandomFloatingGenerator() =
+            default;
+        bool RandomFloatingGenerator<long double>::next() {
+            m_current_number = m_pimpl->dist( m_pimpl->rng );
+            return true;
+        }
+    } // namespace Generators
+} // namespace Catch
diff --git a/external_imported/Catch2/src/catch2/generators/catch_generators_random.hpp b/external_imported/Catch2/src/catch2/generators/catch_generators_random.hpp
index bcd4888dc..712835619 100644
--- a/external_imported/Catch2/src/catch2/generators/catch_generators_random.hpp
+++ b/external_imported/Catch2/src/catch2/generators/catch_generators_random.hpp
@@ -8,11 +8,11 @@
 #ifndef CATCH_GENERATORS_RANDOM_HPP_INCLUDED
 #define CATCH_GENERATORS_RANDOM_HPP_INCLUDED
 
-#include <catch2/internal/catch_context.hpp>
 #include <catch2/generators/catch_generators.hpp>
 #include <catch2/internal/catch_random_number_generator.hpp>
-
-#include <random>
+#include <catch2/internal/catch_uniform_integer_distribution.hpp>
+#include <catch2/internal/catch_uniform_floating_point_distribution.hpp>
+#include <catch2/internal/catch_unique_ptr.hpp>
 
 namespace Catch {
 namespace Generators {
@@ -26,7 +26,7 @@ namespace Detail {
 template <typename Float>
 class RandomFloatingGenerator final : public IGenerator<Float> {
     Catch::SimplePcg32 m_rng;
-    std::uniform_real_distribution<Float> m_dist;
+    Catch::uniform_floating_point_distribution<Float> m_dist;
     Float m_current_number;
 public:
     RandomFloatingGenerator( Float a, Float b, std::uint32_t seed ):
@@ -44,10 +44,27 @@ class RandomFloatingGenerator final : public IGenerator<Float> {
     }
 };
 
+template <>
+class RandomFloatingGenerator<long double> final : public IGenerator<long double> {
+    // We still rely on <random> for this specialization, but we don't
+    // want to drag it into the header.
+    struct PImpl;
+    Catch::Detail::unique_ptr<PImpl> m_pimpl;
+    long double m_current_number;
+
+public:
+    RandomFloatingGenerator( long double a, long double b, std::uint32_t seed );
+
+    long double const& get() const override { return m_current_number; }
+    bool next() override;
+
+    ~RandomFloatingGenerator() override; // = default
+};
+
 template <typename Integer>
 class RandomIntegerGenerator final : public IGenerator<Integer> {
     Catch::SimplePcg32 m_rng;
-    std::uniform_int_distribution<Integer> m_dist;
+    Catch::uniform_integer_distribution<Integer> m_dist;
     Integer m_current_number;
 public:
     RandomIntegerGenerator( Integer a, Integer b, std::uint32_t seed ):
@@ -68,14 +85,6 @@ class RandomIntegerGenerator final : public IGenerator<Integer> {
 template <typename T>
 std::enable_if_t<std::is_integral<T>::value, GeneratorWrapper<T>>
 random(T a, T b) {
-    static_assert(
-        !std::is_same<T, char>::value &&
-        !std::is_same<T, int8_t>::value &&
-        !std::is_same<T, uint8_t>::value &&
-        !std::is_same<T, signed char>::value &&
-        !std::is_same<T, unsigned char>::value &&
-        !std::is_same<T, bool>::value,
-        "The requested type is not supported by the underlying random distributions from std" );
     return GeneratorWrapper<T>(
         Catch::Detail::make_unique<RandomIntegerGenerator<T>>(a, b, Detail::getSeed())
     );
diff --git a/external_imported/Catch2/src/catch2/generators/catch_generators_range.hpp b/external_imported/Catch2/src/catch2/generators/catch_generators_range.hpp
index 495acb950..b67c1590e 100644
--- a/external_imported/Catch2/src/catch2/generators/catch_generators_range.hpp
+++ b/external_imported/Catch2/src/catch2/generators/catch_generators_range.hpp
@@ -96,10 +96,11 @@ GeneratorWrapper<ResultType> from_range(InputIterator from, InputSentinel to) {
     return GeneratorWrapper<ResultType>(Catch::Detail::make_unique<IteratorGenerator<ResultType>>(from, to));
 }
 
-template <typename Container,
-          typename ResultType = typename Container::value_type>
-GeneratorWrapper<ResultType> from_range(Container const& cnt) {
-    return GeneratorWrapper<ResultType>(Catch::Detail::make_unique<IteratorGenerator<ResultType>>(cnt.begin(), cnt.end()));
+template <typename Container>
+auto from_range(Container const& cnt) {
+    using std::begin;
+    using std::end;
+    return from_range( begin( cnt ), end( cnt ) );
 }
 
 
diff --git a/external_imported/Catch2/src/catch2/interfaces/catch_interfaces_all.hpp b/external_imported/Catch2/src/catch2/interfaces/catch_interfaces_all.hpp
index 87b746d8c..a99fdcdc9 100644
--- a/external_imported/Catch2/src/catch2/interfaces/catch_interfaces_all.hpp
+++ b/external_imported/Catch2/src/catch2/interfaces/catch_interfaces_all.hpp
@@ -30,8 +30,8 @@
 #include <catch2/interfaces/catch_interfaces_registry_hub.hpp>
 #include <catch2/interfaces/catch_interfaces_reporter.hpp>
 #include <catch2/interfaces/catch_interfaces_reporter_factory.hpp>
-#include <catch2/interfaces/catch_interfaces_reporter_registry.hpp>
 #include <catch2/interfaces/catch_interfaces_tag_alias_registry.hpp>
+#include <catch2/interfaces/catch_interfaces_test_invoker.hpp>
 #include <catch2/interfaces/catch_interfaces_testcase.hpp>
 
 #endif // CATCH_INTERFACES_ALL_HPP_INCLUDED
diff --git a/external_imported/Catch2/src/catch2/interfaces/catch_interfaces_capture.hpp b/external_imported/Catch2/src/catch2/interfaces/catch_interfaces_capture.hpp
index 2a469c12b..a1876a4ca 100644
--- a/external_imported/Catch2/src/catch2/interfaces/catch_interfaces_capture.hpp
+++ b/external_imported/Catch2/src/catch2/interfaces/catch_interfaces_capture.hpp
@@ -14,6 +14,7 @@
 #include <catch2/internal/catch_stringref.hpp>
 #include <catch2/internal/catch_result_type.hpp>
 #include <catch2/internal/catch_unique_ptr.hpp>
+#include <catch2/benchmark/detail/catch_benchmark_stats_fwd.hpp>
 
 namespace Catch {
 
@@ -31,8 +32,6 @@ namespace Catch {
     class IGeneratorTracker;
 
     struct BenchmarkInfo;
-    template <typename Duration = std::chrono::duration<double, std::nano>>
-    struct BenchmarkStats;
 
     namespace Generators {
         class GeneratorUntypedBase;
@@ -44,6 +43,7 @@ namespace Catch {
     public:
         virtual ~IResultCapture();
 
+        virtual void notifyAssertionStarted( AssertionInfo const& info ) = 0;
         virtual bool sectionStarted( StringRef sectionName,
                                      SourceLineInfo const& sectionLineInfo,
                                      Counts& assertions ) = 0;
@@ -84,7 +84,7 @@ namespace Catch {
                     AssertionReaction& reaction ) = 0;
         virtual void handleUnexpectedInflightException
                 (   AssertionInfo const& info,
-                    std::string const& message,
+                    std::string&& message,
                     AssertionReaction& reaction ) = 0;
         virtual void handleIncomplete
                 (   AssertionInfo const& info ) = 0;
diff --git a/external_imported/Catch2/src/catch2/interfaces/catch_interfaces_exception.hpp b/external_imported/Catch2/src/catch2/interfaces/catch_interfaces_exception.hpp
index 9177666ae..fcc2a8f9c 100644
--- a/external_imported/Catch2/src/catch2/interfaces/catch_interfaces_exception.hpp
+++ b/external_imported/Catch2/src/catch2/interfaces/catch_interfaces_exception.hpp
@@ -8,7 +8,6 @@
 #ifndef CATCH_INTERFACES_EXCEPTION_HPP_INCLUDED
 #define CATCH_INTERFACES_EXCEPTION_HPP_INCLUDED
 
-#include <catch2/interfaces/catch_interfaces_registry_hub.hpp>
 #include <catch2/internal/catch_unique_ptr.hpp>
 
 #include <string>
diff --git a/external_imported/Catch2/src/catch2/interfaces/catch_interfaces_registry_hub.hpp b/external_imported/Catch2/src/catch2/interfaces/catch_interfaces_registry_hub.hpp
index 8813b538d..113f223e8 100644
--- a/external_imported/Catch2/src/catch2/interfaces/catch_interfaces_registry_hub.hpp
+++ b/external_imported/Catch2/src/catch2/interfaces/catch_interfaces_registry_hub.hpp
@@ -19,7 +19,7 @@ namespace Catch {
     class ITestCaseRegistry;
     class IExceptionTranslatorRegistry;
     class IExceptionTranslator;
-    class IReporterRegistry;
+    class ReporterRegistry;
     class IReporterFactory;
     class ITagAliasRegistry;
     class ITestInvoker;
@@ -35,7 +35,7 @@ namespace Catch {
     public:
         virtual ~IRegistryHub(); // = default
 
-        virtual IReporterRegistry const& getReporterRegistry() const = 0;
+        virtual ReporterRegistry const& getReporterRegistry() const = 0;
         virtual ITestCaseRegistry const& getTestCaseRegistry() const = 0;
         virtual ITagAliasRegistry const& getTagAliasRegistry() const = 0;
         virtual IExceptionTranslatorRegistry const& getExceptionTranslatorRegistry() const = 0;
diff --git a/external_imported/Catch2/src/catch2/interfaces/catch_interfaces_reporter.cpp b/external_imported/Catch2/src/catch2/interfaces/catch_interfaces_reporter.cpp
index 67c5c80ed..90536bb36 100644
--- a/external_imported/Catch2/src/catch2/interfaces/catch_interfaces_reporter.cpp
+++ b/external_imported/Catch2/src/catch2/interfaces/catch_interfaces_reporter.cpp
@@ -7,19 +7,11 @@
 // SPDX-License-Identifier: BSL-1.0
 #include <catch2/interfaces/catch_interfaces_reporter.hpp>
 #include <catch2/interfaces/catch_interfaces_config.hpp>
-#include <catch2/internal/catch_console_colour.hpp>
-#include <catch2/internal/catch_console_width.hpp>
 #include <catch2/catch_message.hpp>
-#include <catch2/internal/catch_list.hpp>
-#include <catch2/internal/catch_string_manip.hpp>
-#include <catch2/catch_test_case_info.hpp>
-#include <catch2/reporters/catch_reporter_helpers.hpp>
 #include <catch2/internal/catch_move_and_forward.hpp>
 #include <catch2/internal/catch_istream.hpp>
 
-#include <algorithm>
 #include <cassert>
-#include <iomanip>
 
 namespace Catch {
 
@@ -54,8 +46,6 @@ namespace Catch {
         infoMessages( _infoMessages ),
         totals( _totals )
     {
-        assertionResult.m_resultData.lazyExpression.m_transientExpression = _assertionResult.m_resultData.lazyExpression.m_transientExpression;
-
         if( assertionResult.hasMessage() ) {
             // Copy message into messages list.
             // !TBD This should have been done earlier, somewhere
diff --git a/external_imported/Catch2/src/catch2/interfaces/catch_interfaces_reporter.hpp b/external_imported/Catch2/src/catch2/interfaces/catch_interfaces_reporter.hpp
index cf414f10e..a052c5db1 100644
--- a/external_imported/Catch2/src/catch2/interfaces/catch_interfaces_reporter.hpp
+++ b/external_imported/Catch2/src/catch2/interfaces/catch_interfaces_reporter.hpp
@@ -13,11 +13,9 @@
 #include <catch2/catch_assertion_result.hpp>
 #include <catch2/internal/catch_message_info.hpp>
 #include <catch2/internal/catch_stringref.hpp>
+#include <catch2/internal/catch_test_run_info.hpp>
 #include <catch2/internal/catch_unique_ptr.hpp>
-#include <catch2/internal/catch_move_and_forward.hpp>
-#include <catch2/benchmark/catch_estimate.hpp>
-#include <catch2/benchmark/catch_outlier_classification.hpp>
-
+#include <catch2/benchmark/detail/catch_benchmark_stats.hpp>
 
 #include <map>
 #include <string>
@@ -57,11 +55,6 @@ namespace Catch {
         std::map<std::string, std::string> m_customOptions;
     };
 
-    struct TestRunInfo {
-        constexpr TestRunInfo(StringRef _name) : name(_name) {}
-        StringRef name;
-    };
-
     struct AssertionStats {
         AssertionStats( AssertionResult const& _assertionResult,
                         std::vector<MessageInfo> const& _infoMessages,
@@ -113,45 +106,6 @@ namespace Catch {
         bool aborting;
     };
 
-
-    struct BenchmarkInfo {
-        std::string name;
-        double estimatedDuration;
-        int iterations;
-        unsigned int samples;
-        unsigned int resamples;
-        double clockResolution;
-        double clockCost;
-    };
-
-    template <class Duration>
-    struct BenchmarkStats {
-        BenchmarkInfo info;
-
-        std::vector<Duration> samples;
-        Benchmark::Estimate<Duration> mean;
-        Benchmark::Estimate<Duration> standardDeviation;
-        Benchmark::OutlierClassification outliers;
-        double outlierVariance;
-
-        template <typename Duration2>
-        operator BenchmarkStats<Duration2>() const {
-            std::vector<Duration2> samples2;
-            samples2.reserve(samples.size());
-            for (auto const& sample : samples) {
-                samples2.push_back(Duration2(sample));
-            }
-            return {
-                info,
-                CATCH_MOVE(samples2),
-                mean,
-                standardDeviation,
-                outliers,
-                outlierVariance,
-            };
-        }
-    };
-
     //! By setting up its preferences, a reporter can modify Catch2's behaviour
     //! in some regards, e.g. it can request Catch2 to capture writes to
     //! stdout/stderr during test execution, and pass them to the reporter.
@@ -250,7 +204,7 @@ namespace Catch {
          */
         virtual void skipTest( TestCaseInfo const& testInfo ) = 0;
 
-        //! Called if a fatal error (signal/structured exception) occured
+        //! Called if a fatal error (signal/structured exception) occurred
         virtual void fatalErrorEncountered( StringRef error ) = 0;
 
         //! Writes out information about provided reporters using reporter-specific format
diff --git a/external_imported/Catch2/src/catch2/interfaces/catch_interfaces_reporter_registry.cpp b/external_imported/Catch2/src/catch2/interfaces/catch_interfaces_reporter_registry.cpp
deleted file mode 100644
index f620cbc8d..000000000
--- a/external_imported/Catch2/src/catch2/interfaces/catch_interfaces_reporter_registry.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-
-#include <catch2/interfaces/catch_interfaces_reporter_registry.hpp>
-
-namespace Catch {
-    IReporterRegistry::~IReporterRegistry() = default;
-}
diff --git a/external_imported/Catch2/src/catch2/interfaces/catch_interfaces_reporter_registry.hpp b/external_imported/Catch2/src/catch2/interfaces/catch_interfaces_reporter_registry.hpp
deleted file mode 100644
index 277d1761b..000000000
--- a/external_imported/Catch2/src/catch2/interfaces/catch_interfaces_reporter_registry.hpp
+++ /dev/null
@@ -1,42 +0,0 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-#ifndef CATCH_INTERFACES_REPORTER_REGISTRY_HPP_INCLUDED
-#define CATCH_INTERFACES_REPORTER_REGISTRY_HPP_INCLUDED
-
-#include <catch2/internal/catch_case_insensitive_comparisons.hpp>
-#include <catch2/internal/catch_unique_ptr.hpp>
-
-#include <string>
-#include <vector>
-#include <map>
-
-namespace Catch {
-
-    class IConfig;
-
-    class IEventListener;
-    using IEventListenerPtr = Detail::unique_ptr<IEventListener>;
-    class IReporterFactory;
-    using IReporterFactoryPtr = Detail::unique_ptr<IReporterFactory>;
-    struct ReporterConfig;
-    class EventListenerFactory;
-
-    class IReporterRegistry {
-    public:
-        using FactoryMap = std::map<std::string, IReporterFactoryPtr, Detail::CaseInsensitiveLess>;
-        using Listeners = std::vector<Detail::unique_ptr<EventListenerFactory>>;
-
-        virtual ~IReporterRegistry(); // = default
-        virtual IEventListenerPtr create( std::string const& name, ReporterConfig&& config ) const = 0;
-        virtual FactoryMap const& getFactories() const = 0;
-        virtual Listeners const& getListeners() const = 0;
-    };
-
-} // end namespace Catch
-
-#endif // CATCH_INTERFACES_REPORTER_REGISTRY_HPP_INCLUDED
diff --git a/external_imported/Catch2/src/catch2/interfaces/catch_interfaces_test_invoker.hpp b/external_imported/Catch2/src/catch2/interfaces/catch_interfaces_test_invoker.hpp
new file mode 100644
index 000000000..3caeff9a3
--- /dev/null
+++ b/external_imported/Catch2/src/catch2/interfaces/catch_interfaces_test_invoker.hpp
@@ -0,0 +1,21 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+#ifndef CATCH_INTERFACES_TEST_INVOKER_HPP_INCLUDED
+#define CATCH_INTERFACES_TEST_INVOKER_HPP_INCLUDED
+
+namespace Catch {
+
+    class ITestInvoker {
+    public:
+        virtual void invoke() const = 0;
+        virtual ~ITestInvoker(); // = default
+    };
+
+} // namespace Catch
+
+#endif // CATCH_INTERFACES_TEST_INVOKER_HPP_INCLUDED
diff --git a/external_imported/Catch2/src/catch2/interfaces/catch_interfaces_testcase.cpp b/external_imported/Catch2/src/catch2/interfaces/catch_interfaces_testcase.cpp
index 5e632ba89..a543116c3 100644
--- a/external_imported/Catch2/src/catch2/interfaces/catch_interfaces_testcase.cpp
+++ b/external_imported/Catch2/src/catch2/interfaces/catch_interfaces_testcase.cpp
@@ -9,6 +9,5 @@
 #include <catch2/interfaces/catch_interfaces_testcase.hpp>
 
 namespace Catch {
-    ITestInvoker::~ITestInvoker() = default;
     ITestCaseRegistry::~ITestCaseRegistry() = default;
 }
diff --git a/external_imported/Catch2/src/catch2/interfaces/catch_interfaces_testcase.hpp b/external_imported/Catch2/src/catch2/interfaces/catch_interfaces_testcase.hpp
index 78ee20216..daee84829 100644
--- a/external_imported/Catch2/src/catch2/interfaces/catch_interfaces_testcase.hpp
+++ b/external_imported/Catch2/src/catch2/interfaces/catch_interfaces_testcase.hpp
@@ -12,15 +12,7 @@
 
 namespace Catch {
 
-    class TestSpec;
     struct TestCaseInfo;
-
-    class ITestInvoker {
-    public:
-        virtual void invoke () const = 0;
-        virtual ~ITestInvoker(); // = default
-    };
-
     class TestCaseHandle;
     class IConfig;
 
@@ -33,11 +25,6 @@ namespace Catch {
         virtual std::vector<TestCaseHandle> const& getAllTestsSorted( IConfig const& config ) const = 0;
     };
 
-    bool isThrowSafe( TestCaseHandle const& testCase, IConfig const& config );
-    bool matchTest( TestCaseHandle const& testCase, TestSpec const& testSpec, IConfig const& config );
-    std::vector<TestCaseHandle> filterTests( std::vector<TestCaseHandle> const& testCases, TestSpec const& testSpec, IConfig const& config );
-    std::vector<TestCaseHandle> const& getAllTestCasesSorted( IConfig const& config );
-
 }
 
 #endif // CATCH_INTERFACES_TESTCASE_HPP_INCLUDED
diff --git a/external_imported/Catch2/src/catch2/internal/catch_assertion_handler.cpp b/external_imported/Catch2/src/catch2/internal/catch_assertion_handler.cpp
index 0b14e0bba..f650a7073 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_assertion_handler.cpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_assertion_handler.cpp
@@ -8,11 +8,8 @@
 #include <catch2/internal/catch_assertion_handler.hpp>
 #include <catch2/interfaces/catch_interfaces_config.hpp>
 #include <catch2/internal/catch_context.hpp>
-#include <catch2/internal/catch_enforce.hpp>
 #include <catch2/internal/catch_debugger.hpp>
 #include <catch2/internal/catch_test_failure_exception.hpp>
-#include <catch2/interfaces/catch_interfaces_registry_hub.hpp>
-#include <catch2/internal/catch_run_context.hpp>
 #include <catch2/matchers/catch_matchers_string.hpp>
 
 namespace Catch {
@@ -24,7 +21,9 @@ namespace Catch {
             ResultDisposition::Flags resultDisposition )
     :   m_assertionInfo{ macroName, lineInfo, capturedExpression, resultDisposition },
         m_resultCapture( getResultCapture() )
-    {}
+    {
+        m_resultCapture.notifyAssertionStarted( m_assertionInfo );
+    }
 
     void AssertionHandler::handleExpr( ITransientExpression const& expr ) {
         m_resultCapture.handleExpr( m_assertionInfo, expr, m_reaction );
@@ -38,7 +37,7 @@ namespace Catch {
     }
 
     void AssertionHandler::complete() {
-        setCompleted();
+        m_completed = true;
         if( m_reaction.shouldDebugBreak ) {
 
             // If you find your debugger stopping you here then go one level up on the
@@ -51,16 +50,9 @@ namespace Catch {
             throw_test_failure_exception();
         }
         if ( m_reaction.shouldSkip ) {
-#if !defined( CATCH_CONFIG_DISABLE_EXCEPTIONS )
-            throw Catch::TestSkipException();
-#else
-            CATCH_ERROR( "Explicitly skipping tests during runtime requires exceptions" );
-#endif
+            throw_test_skip_exception();
         }
     }
-    void AssertionHandler::setCompleted() {
-        m_completed = true;
-    }
 
     void AssertionHandler::handleUnexpectedInflightException() {
         m_resultCapture.handleUnexpectedInflightException( m_assertionInfo, Catch::translateActiveException(), m_reaction );
diff --git a/external_imported/Catch2/src/catch2/internal/catch_assertion_handler.hpp b/external_imported/Catch2/src/catch2/internal/catch_assertion_handler.hpp
index ae7776d8b..01dd7801d 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_assertion_handler.hpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_assertion_handler.hpp
@@ -11,14 +11,11 @@
 #include <catch2/catch_assertion_info.hpp>
 #include <catch2/internal/catch_decomposer.hpp>
 #include <catch2/interfaces/catch_interfaces_capture.hpp>
-#include <catch2/internal/catch_lazy_expr.hpp>
 
 #include <string>
 
 namespace Catch {
 
-    class IResultCapture;
-
     struct AssertionReaction {
         bool shouldDebugBreak = false;
         bool shouldThrow = false;
@@ -59,7 +56,6 @@ namespace Catch {
         void handleUnexpectedInflightException();
 
         void complete();
-        void setCompleted();
 
         // query
         auto allowThrows() const -> bool;
diff --git a/external_imported/Catch2/src/catch2/internal/catch_clara.cpp b/external_imported/Catch2/src/catch2/internal/catch_clara.cpp
index c9bc76959..c76089eea 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_clara.cpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_clara.cpp
@@ -11,6 +11,7 @@
 #include <catch2/internal/catch_platform.hpp>
 #include <catch2/internal/catch_string_manip.hpp>
 #include <catch2/internal/catch_textflow.hpp>
+#include <catch2/internal/catch_reusable_string_stream.hpp>
 
 #include <algorithm>
 #include <ostream>
@@ -24,13 +25,29 @@ namespace {
             ;
     }
 
-    std::string normaliseOpt( std::string const& optName ) {
-#ifdef CATCH_PLATFORM_WINDOWS
-        if ( optName[0] == '/' )
-            return "-" + optName.substr( 1 );
-        else
+    Catch::StringRef normaliseOpt( Catch::StringRef optName ) {
+        if ( optName[0] == '-'
+#if defined(CATCH_PLATFORM_WINDOWS)
+             || optName[0] == '/'
 #endif
-            return optName;
+        ) {
+            return optName.substr( 1, optName.size() );
+        }
+
+        return optName;
+    }
+
+    static size_t find_first_separator(Catch::StringRef sr) {
+        auto is_separator = []( char c ) {
+            return c == ' ' || c == ':' || c == '=';
+        };
+        size_t pos = 0;
+        while (pos < sr.size()) {
+            if (is_separator(sr[pos])) { return pos; }
+            ++pos;
+        }
+
+        return Catch::StringRef::npos;
     }
 
 } // namespace
@@ -48,23 +65,23 @@ namespace Catch {
                 }
 
                 if ( it != itEnd ) {
-                    auto const& next = *it;
+                    StringRef next = *it;
                     if ( isOptPrefix( next[0] ) ) {
-                        auto delimiterPos = next.find_first_of( " :=" );
-                        if ( delimiterPos != std::string::npos ) {
+                        auto delimiterPos = find_first_separator(next);
+                        if ( delimiterPos != StringRef::npos ) {
                             m_tokenBuffer.push_back(
                                 { TokenType::Option,
                                   next.substr( 0, delimiterPos ) } );
                             m_tokenBuffer.push_back(
                                 { TokenType::Argument,
-                                  next.substr( delimiterPos + 1 ) } );
+                                  next.substr( delimiterPos + 1, next.size() ) } );
                         } else {
                             if ( next[1] != '-' && next.size() > 2 ) {
-                                std::string opt = "- ";
+                                // Combined short args, e.g. "-ab" for "-a -b"
                                 for ( size_t i = 1; i < next.size(); ++i ) {
-                                    opt[1] = next[i];
                                     m_tokenBuffer.push_back(
-                                        { TokenType::Option, opt } );
+                                        { TokenType::Option,
+                                          next.substr( i, 1 ) } );
                                 }
                             } else {
                                 m_tokenBuffer.push_back(
@@ -124,12 +141,12 @@ namespace Catch {
             size_t ParserBase::cardinality() const { return 1; }
 
             InternalParseResult ParserBase::parse( Args const& args ) const {
-                return parse( args.exeName(), TokenStream( args ) );
+                return parse( static_cast<std::string>(args.exeName()), TokenStream( args ) );
             }
 
             ParseState::ParseState( ParseResultType type,
-                                    TokenStream const& remainingTokens ):
-                m_type( type ), m_remainingTokens( remainingTokens ) {}
+                                    TokenStream remainingTokens ):
+                m_type( type ), m_remainingTokens( CATCH_MOVE(remainingTokens) ) {}
 
             ParserResult BoundFlagRef::setFlag( bool flag ) {
                 m_ref = flag;
@@ -147,34 +164,34 @@ namespace Catch {
 } // namespace Detail
 
         Detail::InternalParseResult Arg::parse(std::string const&,
-                                               Detail::TokenStream const& tokens) const {
+                                               Detail::TokenStream tokens) const {
             auto validationResult = validate();
             if (!validationResult)
                 return Detail::InternalParseResult(validationResult);
 
-            auto remainingTokens = tokens;
-            auto const& token = *remainingTokens;
+            auto token = *tokens;
             if (token.type != Detail::TokenType::Argument)
                 return Detail::InternalParseResult::ok(Detail::ParseState(
-                    ParseResultType::NoMatch, remainingTokens));
+                    ParseResultType::NoMatch, CATCH_MOVE(tokens)));
 
             assert(!m_ref->isFlag());
             auto valueRef =
                 static_cast<Detail::BoundValueRefBase*>(m_ref.get());
 
-            auto result = valueRef->setValue(remainingTokens->token);
-            if (!result)
-                return Detail::InternalParseResult(result);
+            auto result = valueRef->setValue(static_cast<std::string>(token.token));
+            if ( !result )
+                return Detail::InternalParseResult( result );
             else
-                return Detail::InternalParseResult::ok(Detail::ParseState(
-                    ParseResultType::Matched, ++remainingTokens));
+                return Detail::InternalParseResult::ok(
+                    Detail::ParseState( ParseResultType::Matched,
+                                        CATCH_MOVE( ++tokens ) ) );
         }
 
         Opt::Opt(bool& ref) :
             ParserRefImpl(std::make_shared<Detail::BoundFlagRef>(ref)) {}
 
-        std::vector<Detail::HelpColumns> Opt::getHelpColumns() const {
-            std::ostringstream oss;
+        Detail::HelpColumns Opt::getHelpColumns() const {
+            ReusableStringStream oss;
             bool first = true;
             for (auto const& opt : m_optNames) {
                 if (first)
@@ -185,10 +202,10 @@ namespace Catch {
             }
             if (!m_hint.empty())
                 oss << " <" << m_hint << '>';
-            return { { oss.str(), m_description } };
+            return { oss.str(), m_description };
         }
 
-        bool Opt::isMatch(std::string const& optToken) const {
+        bool Opt::isMatch(StringRef optToken) const {
             auto normalisedToken = normaliseOpt(optToken);
             for (auto const& name : m_optNames) {
                 if (normaliseOpt(name) == normalisedToken)
@@ -198,15 +215,14 @@ namespace Catch {
         }
 
         Detail::InternalParseResult Opt::parse(std::string const&,
-                                       Detail::TokenStream const& tokens) const {
+                                       Detail::TokenStream tokens) const {
             auto validationResult = validate();
             if (!validationResult)
                 return Detail::InternalParseResult(validationResult);
 
-            auto remainingTokens = tokens;
-            if (remainingTokens &&
-                remainingTokens->type == Detail::TokenType::Option) {
-                auto const& token = *remainingTokens;
+            if (tokens &&
+                tokens->type == Detail::TokenType::Option) {
+                auto const& token = *tokens;
                 if (isMatch(token.token)) {
                     if (m_ref->isFlag()) {
                         auto flagRef =
@@ -218,35 +234,35 @@ namespace Catch {
                         if (result.value() ==
                             ParseResultType::ShortCircuitAll)
                             return Detail::InternalParseResult::ok(Detail::ParseState(
-                                result.value(), remainingTokens));
+                                result.value(), CATCH_MOVE(tokens)));
                     } else {
                         auto valueRef =
                             static_cast<Detail::BoundValueRefBase*>(
                                 m_ref.get());
-                        ++remainingTokens;
-                        if (!remainingTokens)
+                        ++tokens;
+                        if (!tokens)
                             return Detail::InternalParseResult::runtimeError(
                                 "Expected argument following " +
                                 token.token);
-                        auto const& argToken = *remainingTokens;
+                        auto const& argToken = *tokens;
                         if (argToken.type != Detail::TokenType::Argument)
                             return Detail::InternalParseResult::runtimeError(
                                 "Expected argument following " +
                                 token.token);
-                        const auto result = valueRef->setValue(argToken.token);
+                        const auto result = valueRef->setValue(static_cast<std::string>(argToken.token));
                         if (!result)
                             return Detail::InternalParseResult(result);
                         if (result.value() ==
                             ParseResultType::ShortCircuitAll)
                             return Detail::InternalParseResult::ok(Detail::ParseState(
-                                result.value(), remainingTokens));
+                                result.value(), CATCH_MOVE(tokens)));
                     }
                     return Detail::InternalParseResult::ok(Detail::ParseState(
-                        ParseResultType::Matched, ++remainingTokens));
+                        ParseResultType::Matched, CATCH_MOVE(++tokens)));
                 }
             }
             return Detail::InternalParseResult::ok(
-                Detail::ParseState(ParseResultType::NoMatch, remainingTokens));
+                Detail::ParseState(ParseResultType::NoMatch, CATCH_MOVE(tokens)));
         }
 
         Detail::Result Opt::validate() const {
@@ -278,9 +294,9 @@ namespace Catch {
 
         Detail::InternalParseResult
             ExeName::parse(std::string const&,
-                           Detail::TokenStream const& tokens) const {
+                           Detail::TokenStream tokens) const {
             return Detail::InternalParseResult::ok(
-                Detail::ParseState(ParseResultType::NoMatch, tokens));
+                Detail::ParseState(ParseResultType::NoMatch, CATCH_MOVE(tokens)));
         }
 
         ParserResult ExeName::set(std::string const& newName) {
@@ -310,9 +326,9 @@ namespace Catch {
 
         std::vector<Detail::HelpColumns> Parser::getHelpColumns() const {
             std::vector<Detail::HelpColumns> cols;
+            cols.reserve( m_options.size() );
             for ( auto const& o : m_options ) {
-                auto childCols = o.getHelpColumns();
-                cols.insert( cols.end(), childCols.begin(), childCols.end() );
+                cols.push_back(o.getHelpColumns());
             }
             return cols;
         }
@@ -350,12 +366,12 @@ namespace Catch {
 
             optWidth = ( std::min )( optWidth, consoleWidth / 2 );
 
-            for ( auto const& cols : rows ) {
-                auto row = TextFlow::Column( cols.left )
+            for ( auto& cols : rows ) {
+                auto row = TextFlow::Column( CATCH_MOVE(cols.left) )
                                .width( optWidth )
                                .indent( 2 ) +
                            TextFlow::Spacer( 4 ) +
-                           TextFlow::Column( cols.right )
+                           TextFlow::Column( static_cast<std::string>(cols.descriptions) )
                                .width( consoleWidth - 7 - optWidth );
                 os << row << '\n';
             }
@@ -377,7 +393,7 @@ namespace Catch {
 
         Detail::InternalParseResult
         Parser::parse( std::string const& exeName,
-                       Detail::TokenStream const& tokens ) const {
+                       Detail::TokenStream tokens ) const {
 
             struct ParserInfo {
                 ParserBase const* parser = nullptr;
@@ -395,7 +411,7 @@ namespace Catch {
             m_exeName.set( exeName );
 
             auto result = Detail::InternalParseResult::ok(
-                Detail::ParseState( ParseResultType::NoMatch, tokens ) );
+                Detail::ParseState( ParseResultType::NoMatch, CATCH_MOVE(tokens) ) );
             while ( result.value().remainingTokens() ) {
                 bool tokenParsed = false;
 
@@ -403,7 +419,7 @@ namespace Catch {
                     if ( parseInfo.parser->cardinality() == 0 ||
                          parseInfo.count < parseInfo.parser->cardinality() ) {
                         result = parseInfo.parser->parse(
-                            exeName, result.value().remainingTokens() );
+                            exeName, CATCH_MOVE(result).value().remainingTokens() );
                         if ( !result )
                             return result;
                         if ( result.value().type() !=
@@ -429,7 +445,7 @@ namespace Catch {
         Args::Args(int argc, char const* const* argv) :
             m_exeName(argv[0]), m_args(argv + 1, argv + argc) {}
 
-        Args::Args(std::initializer_list<std::string> args) :
+        Args::Args(std::initializer_list<StringRef> args) :
             m_exeName(*args.begin()),
             m_args(args.begin() + 1, args.end()) {}
 
diff --git a/external_imported/Catch2/src/catch2/internal/catch_clara.hpp b/external_imported/Catch2/src/catch2/internal/catch_clara.hpp
index 9117b65e8..d869593bf 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_clara.hpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_clara.hpp
@@ -29,6 +29,7 @@
 #    endif
 #endif
 
+#include <catch2/internal/catch_stringref.hpp>
 #include <catch2/internal/catch_move_and_forward.hpp>
 #include <catch2/internal/catch_noncopyable.hpp>
 #include <catch2/internal/catch_void_type.hpp>
@@ -101,17 +102,16 @@ namespace Catch {
             enum class TokenType { Option, Argument };
             struct Token {
                 TokenType type;
-                std::string token;
+                StringRef token;
             };
 
             // Abstracts iterators into args as a stream of tokens, with option
             // arguments uniformly handled
             class TokenStream {
-                using Iterator = std::vector<std::string>::const_iterator;
+                using Iterator = std::vector<StringRef>::const_iterator;
                 Iterator it;
                 Iterator itEnd;
                 std::vector<Token> m_tokenBuffer;
-
                 void loadBuffer();
 
             public:
@@ -163,12 +163,17 @@ namespace Catch {
                 ResultType m_type;
             };
 
-            template <typename T> class ResultValueBase : public ResultBase {
+            template <typename T>
+            class ResultValueBase : public ResultBase {
             public:
-                auto value() const -> T const& {
+                T const& value() const& {
                     enforceOk();
                     return m_value;
                 }
+                T&& value() && {
+                    enforceOk();
+                    return CATCH_MOVE( m_value );
+                }
 
             protected:
                 ResultValueBase( ResultType type ): ResultBase( type ) {}
@@ -178,13 +183,23 @@ namespace Catch {
                     if ( m_type == ResultType::Ok )
                         new ( &m_value ) T( other.m_value );
                 }
+                ResultValueBase( ResultValueBase&& other ):
+                    ResultBase( other ) {
+                    if ( m_type == ResultType::Ok )
+                        new ( &m_value ) T( CATCH_MOVE(other.m_value) );
+                }
+
 
-                ResultValueBase( ResultType, T const& value ): ResultBase( ResultType::Ok ) {
+                ResultValueBase( ResultType, T const& value ):
+                    ResultBase( ResultType::Ok ) {
                     new ( &m_value ) T( value );
                 }
+                ResultValueBase( ResultType, T&& value ):
+                    ResultBase( ResultType::Ok ) {
+                    new ( &m_value ) T( CATCH_MOVE(value) );
+                }
 
-                auto operator=( ResultValueBase const& other )
-                    -> ResultValueBase& {
+                ResultValueBase& operator=( ResultValueBase const& other ) {
                     if ( m_type == ResultType::Ok )
                         m_value.~T();
                     ResultBase::operator=( other );
@@ -192,6 +207,14 @@ namespace Catch {
                         new ( &m_value ) T( other.m_value );
                     return *this;
                 }
+                ResultValueBase& operator=( ResultValueBase&& other ) {
+                    if ( m_type == ResultType::Ok ) m_value.~T();
+                    ResultBase::operator=( other );
+                    if ( m_type == ResultType::Ok )
+                        new ( &m_value ) T( CATCH_MOVE(other.m_value) );
+                    return *this;
+                }
+
 
                 ~ResultValueBase() override {
                     if ( m_type == ResultType::Ok )
@@ -219,8 +242,8 @@ namespace Catch {
                 }
 
                 template <typename U>
-                static auto ok( U const& value ) -> BasicResult {
-                    return { ResultType::Ok, value };
+                static auto ok( U&& value ) -> BasicResult {
+                    return { ResultType::Ok, CATCH_FORWARD(value) };
                 }
                 static auto ok() -> BasicResult { return { ResultType::Ok }; }
                 static auto logicError( std::string&& message )
@@ -267,12 +290,15 @@ namespace Catch {
             class ParseState {
             public:
                 ParseState( ParseResultType type,
-                            TokenStream const& remainingTokens );
+                            TokenStream remainingTokens );
 
                 ParseResultType type() const { return m_type; }
-                TokenStream const& remainingTokens() const {
+                TokenStream const& remainingTokens() const& {
                     return m_remainingTokens;
                 }
+                TokenStream&& remainingTokens() && {
+                    return CATCH_MOVE( m_remainingTokens );
+                }
 
             private:
                 ParseResultType m_type;
@@ -285,7 +311,7 @@ namespace Catch {
 
             struct HelpColumns {
                 std::string left;
-                std::string right;
+                StringRef descriptions;
             };
 
             template <typename T>
@@ -445,7 +471,7 @@ namespace Catch {
                 virtual ~ParserBase() = default;
                 virtual auto validate() const -> Result { return Result::ok(); }
                 virtual auto parse( std::string const& exeName,
-                                    TokenStream const& tokens ) const
+                                    TokenStream tokens ) const
                     -> InternalParseResult = 0;
                 virtual size_t cardinality() const;
 
@@ -465,8 +491,8 @@ namespace Catch {
             protected:
                 Optionality m_optionality = Optionality::Optional;
                 std::shared_ptr<BoundRef> m_ref;
-                std::string m_hint;
-                std::string m_description;
+                StringRef m_hint;
+                StringRef m_description;
 
                 explicit ParserRefImpl( std::shared_ptr<BoundRef> const& ref ):
                     m_ref( ref ) {}
@@ -475,28 +501,32 @@ namespace Catch {
                 template <typename LambdaT>
                 ParserRefImpl( accept_many_t,
                                LambdaT const& ref,
-                               std::string const& hint ):
+                               StringRef hint ):
                     m_ref( std::make_shared<BoundManyLambda<LambdaT>>( ref ) ),
                     m_hint( hint ) {}
 
                 template <typename T,
                           typename = typename std::enable_if_t<
                               !Detail::is_unary_function<T>::value>>
-                ParserRefImpl( T& ref, std::string const& hint ):
+                ParserRefImpl( T& ref, StringRef hint ):
                     m_ref( std::make_shared<BoundValueRef<T>>( ref ) ),
                     m_hint( hint ) {}
 
                 template <typename LambdaT,
                           typename = typename std::enable_if_t<
                               Detail::is_unary_function<LambdaT>::value>>
-                ParserRefImpl( LambdaT const& ref, std::string const& hint ):
+                ParserRefImpl( LambdaT const& ref, StringRef hint ):
                     m_ref( std::make_shared<BoundLambda<LambdaT>>( ref ) ),
                     m_hint( hint ) {}
 
-                auto operator()( std::string const& description ) -> DerivedT& {
+                DerivedT& operator()( StringRef description ) & {
                     m_description = description;
                     return static_cast<DerivedT&>( *this );
                 }
+                DerivedT&& operator()( StringRef description ) && {
+                    m_description = description;
+                    return static_cast<DerivedT&&>( *this );
+                }
 
                 auto optional() -> DerivedT& {
                     m_optionality = Optionality::Optional;
@@ -519,7 +549,7 @@ namespace Catch {
                         return 1;
                 }
 
-                std::string const& hint() const { return m_hint; }
+                StringRef hint() const { return m_hint; }
             };
 
         } // namespace detail
@@ -533,13 +563,13 @@ namespace Catch {
 
             Detail::InternalParseResult
                 parse(std::string const&,
-                      Detail::TokenStream const& tokens) const override;
+                      Detail::TokenStream tokens) const override;
         };
 
         // A parser for options
         class Opt : public Detail::ParserRefImpl<Opt> {
         protected:
-            std::vector<std::string> m_optNames;
+            std::vector<StringRef> m_optNames;
 
         public:
             template <typename LambdaT>
@@ -552,33 +582,37 @@ namespace Catch {
             template <typename LambdaT,
                       typename = typename std::enable_if_t<
                           Detail::is_unary_function<LambdaT>::value>>
-            Opt( LambdaT const& ref, std::string const& hint ):
+            Opt( LambdaT const& ref, StringRef hint ):
                 ParserRefImpl( ref, hint ) {}
 
             template <typename LambdaT>
-            Opt( accept_many_t, LambdaT const& ref, std::string const& hint ):
+            Opt( accept_many_t, LambdaT const& ref, StringRef hint ):
                 ParserRefImpl( accept_many, ref, hint ) {}
 
             template <typename T,
                       typename = typename std::enable_if_t<
                           !Detail::is_unary_function<T>::value>>
-            Opt( T& ref, std::string const& hint ):
+            Opt( T& ref, StringRef hint ):
                 ParserRefImpl( ref, hint ) {}
 
-            auto operator[](std::string const& optName) -> Opt& {
+            Opt& operator[]( StringRef optName ) & {
                 m_optNames.push_back(optName);
                 return *this;
             }
+            Opt&& operator[]( StringRef optName ) && {
+                m_optNames.push_back( optName );
+                return CATCH_MOVE(*this);
+            }
 
-            std::vector<Detail::HelpColumns> getHelpColumns() const;
+            Detail::HelpColumns getHelpColumns() const;
 
-            bool isMatch(std::string const& optToken) const;
+            bool isMatch(StringRef optToken) const;
 
             using ParserBase::parse;
 
             Detail::InternalParseResult
                 parse(std::string const&,
-                      Detail::TokenStream const& tokens) const override;
+                      Detail::TokenStream tokens) const override;
 
             Detail::Result validate() const override;
         };
@@ -601,7 +635,7 @@ namespace Catch {
             // handled specially
             Detail::InternalParseResult
                 parse(std::string const&,
-                      Detail::TokenStream const& tokens) const override;
+                      Detail::TokenStream tokens) const override;
 
             std::string const& name() const { return *m_name; }
             Detail::ParserResult set(std::string const& newName);
@@ -626,16 +660,28 @@ namespace Catch {
                 return *this;
             }
 
-            auto operator|=(Opt const& opt) -> Parser& {
-                m_options.push_back(opt);
-                return *this;
+            friend Parser& operator|=( Parser& p, Opt const& opt ) {
+                p.m_options.push_back( opt );
+                return p;
+            }
+            friend Parser& operator|=( Parser& p, Opt&& opt ) {
+                p.m_options.push_back( CATCH_MOVE(opt) );
+                return p;
             }
 
             Parser& operator|=(Parser const& other);
 
             template <typename T>
-            auto operator|(T const& other) const -> Parser {
-                return Parser(*this) |= other;
+            friend Parser operator|( Parser const& p, T&& rhs ) {
+                Parser temp( p );
+                temp |= rhs;
+                return temp;
+            }
+
+            template <typename T>
+            friend Parser operator|( Parser&& p, T&& rhs ) {
+                p |= CATCH_FORWARD(rhs);
+                return CATCH_MOVE(p);
             }
 
             std::vector<Detail::HelpColumns> getHelpColumns() const;
@@ -653,21 +699,23 @@ namespace Catch {
             using ParserBase::parse;
             Detail::InternalParseResult
                 parse(std::string const& exeName,
-                      Detail::TokenStream const& tokens) const override;
+                      Detail::TokenStream tokens) const override;
         };
 
-        // Transport for raw args (copied from main args, or supplied via
-        // init list for testing)
+        /**
+         * Wrapper over argc + argv, assumes that the inputs outlive it
+         */
         class Args {
             friend Detail::TokenStream;
-            std::string m_exeName;
-            std::vector<std::string> m_args;
+            StringRef m_exeName;
+            std::vector<StringRef> m_args;
 
         public:
             Args(int argc, char const* const* argv);
-            Args(std::initializer_list<std::string> args);
+            // Helper constructor for testing
+            Args(std::initializer_list<StringRef> args);
 
-            std::string const& exeName() const { return m_exeName; }
+            StringRef exeName() const { return m_exeName; }
         };
 
 
diff --git a/external_imported/Catch2/src/catch2/internal/catch_commandline.cpp b/external_imported/Catch2/src/catch2/internal/catch_commandline.cpp
index 81aa073c8..c29a801d3 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_commandline.cpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_commandline.cpp
@@ -9,8 +9,9 @@
 
 #include <catch2/catch_config.hpp>
 #include <catch2/internal/catch_string_manip.hpp>
+#include <catch2/interfaces/catch_interfaces_config.hpp>
 #include <catch2/interfaces/catch_interfaces_registry_hub.hpp>
-#include <catch2/interfaces/catch_interfaces_reporter_registry.hpp>
+#include <catch2/internal/catch_reporter_registry.hpp>
 #include <catch2/internal/catch_console_colour.hpp>
 #include <catch2/internal/catch_parse_numbers.hpp>
 #include <catch2/internal/catch_reporter_spec_parser.hpp>
@@ -144,7 +145,7 @@ namespace Catch {
 
             auto const& reporterSpec = *parsed;
 
-            IReporterRegistry::FactoryMap const& factories =
+            auto const& factories =
                 getRegistryHub().getReporterRegistry().getFactories();
             auto result = factories.find( reporterSpec.name() );
 
@@ -300,8 +301,8 @@ namespace Catch {
                 ( "split the tests to execute into this many groups" )
             | Opt( setShardIndex, "shard index" )
                 ["--shard-index"]
-                ( "index of the group of tests to execute (see --shard-count)" ) |
-            Opt( config.allowZeroTests )
+                ( "index of the group of tests to execute (see --shard-count)" )
+            | Opt( config.allowZeroTests )
                 ["--allow-running-no-tests"]
                 ( "Treat 'No tests run' as a success" )
             | Arg( config.testsOrTags, "test name|pattern|tags" )
diff --git a/external_imported/Catch2/src/catch2/internal/catch_compiler_capabilities.hpp b/external_imported/Catch2/src/catch2/internal/catch_compiler_capabilities.hpp
index 42631a5f1..dacae01b7 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_compiler_capabilities.hpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_compiler_capabilities.hpp
@@ -50,12 +50,18 @@
 #    define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
          _Pragma( "GCC diagnostic ignored \"-Wparentheses\"" )
 
+#    define CATCH_INTERNAL_SUPPRESS_UNUSED_RESULT \
+         _Pragma( "GCC diagnostic ignored \"-Wunused-result\"" )
+
 #    define CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS \
          _Pragma( "GCC diagnostic ignored \"-Wunused-variable\"" )
 
 #    define CATCH_INTERNAL_SUPPRESS_USELESS_CAST_WARNINGS \
          _Pragma( "GCC diagnostic ignored \"-Wuseless-cast\"" )
 
+#    define CATCH_INTERNAL_SUPPRESS_SHADOW_WARNINGS \
+         _Pragma( "GCC diagnostic ignored \"-Wshadow\"" )
+
 #    define CATCH_INTERNAL_IGNORE_BUT_WARN(...) (void)__builtin_constant_p(__VA_ARGS__)
 
 #endif
@@ -128,6 +134,9 @@
 #    define CATCH_INTERNAL_SUPPRESS_COMMA_WARNINGS \
         _Pragma( "clang diagnostic ignored \"-Wcomma\"" )
 
+#    define CATCH_INTERNAL_SUPPRESS_SHADOW_WARNINGS \
+        _Pragma( "clang diagnostic ignored \"-Wshadow\"" )
+
 #endif // __clang__
 
 
@@ -147,7 +156,9 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // Assume that some platforms do not support getenv.
-#if defined(CATCH_PLATFORM_WINDOWS_UWP) || defined(CATCH_PLATFORM_PLAYSTATION)
+#if defined( CATCH_PLATFORM_WINDOWS_UWP ) ||                                   \
+    defined( CATCH_PLATFORM_PLAYSTATION ) ||                                   \
+    defined( _GAMING_XBOX )
 #    define CATCH_INTERNAL_CONFIG_NO_GETENV
 #else
 #    define CATCH_INTERNAL_CONFIG_GETENV
@@ -365,6 +376,9 @@
 #if !defined(CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS)
 #   define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS
 #endif
+#if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_RESULT)
+#   define CATCH_INTERNAL_SUPPRESS_UNUSED_RESULT
+#endif
 #if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS)
 #   define CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS
 #endif
@@ -374,6 +388,16 @@
 #if !defined(CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS)
 #   define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS
 #endif
+#if !defined( CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS )
+#    define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS
+#endif
+#if !defined( CATCH_INTERNAL_SUPPRESS_COMMA_WARNINGS )
+#    define CATCH_INTERNAL_SUPPRESS_COMMA_WARNINGS
+#endif
+#if !defined( CATCH_INTERNAL_SUPPRESS_SHADOW_WARNINGS )
+#    define CATCH_INTERNAL_SUPPRESS_SHADOW_WARNINGS
+#endif
+
 
 // The goal of this macro is to avoid evaluation of the arguments, but
 // still have the compiler warn on problems inside...
@@ -387,13 +411,6 @@
 #   undef CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS
 #endif
 
-#if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS)
-#   define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS
-#endif
-
-#if !defined(CATCH_INTERNAL_SUPPRESS_COMMA_WARNINGS)
-#   define CATCH_INTERNAL_SUPPRESS_COMMA_WARNINGS
-#endif
 
 #if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
 #define CATCH_TRY if ((true))
diff --git a/external_imported/Catch2/src/catch2/internal/catch_config_counter.hpp b/external_imported/Catch2/src/catch2/internal/catch_config_counter.hpp
index 23b223245..a482ce346 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_config_counter.hpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_config_counter.hpp
@@ -18,6 +18,8 @@
 #ifndef CATCH_CONFIG_COUNTER_HPP_INCLUDED
 #define CATCH_CONFIG_COUNTER_HPP_INCLUDED
 
+#include <catch2/catch_user_config.hpp>
+
 #if ( !defined(__JETBRAINS_IDE__) || __JETBRAINS_IDE__ >= 20170300L )
     #define CATCH_INTERNAL_CONFIG_COUNTER
 #endif
diff --git a/external_imported/Catch2/src/catch2/internal/catch_config_prefix_messages.hpp b/external_imported/Catch2/src/catch2/internal/catch_config_prefix_messages.hpp
new file mode 100644
index 000000000..be1e9a963
--- /dev/null
+++ b/external_imported/Catch2/src/catch2/internal/catch_config_prefix_messages.hpp
@@ -0,0 +1,29 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+
+/** \file
+ * Wrapper for the CATCH_CONFIG_PREFIX_MESSAGES configuration option
+ *
+ * CATCH_CONFIG_PREFIX_ALL can be used to avoid clashes with other macros
+ * by prepending CATCH_. This may not be desirable if the only clashes are with
+ * logger macros such as INFO and WARN. In this cases
+ * CATCH_CONFIG_PREFIX_MESSAGES can be used to only prefix a small subset
+ * of relevant macros.
+ *
+ */
+
+#ifndef CATCH_CONFIG_PREFIX_MESSAGES_HPP_INCLUDED
+#define CATCH_CONFIG_PREFIX_MESSAGES_HPP_INCLUDED
+
+#include <catch2/catch_user_config.hpp>
+
+#if defined(CATCH_CONFIG_PREFIX_ALL) && !defined(CATCH_CONFIG_PREFIX_MESSAGES)
+    #define CATCH_CONFIG_PREFIX_MESSAGES
+#endif
+
+#endif // CATCH_CONFIG_PREFIX_MESSAGES_HPP_INCLUDED
diff --git a/external_imported/Catch2/src/catch2/internal/catch_config_static_analysis_support.hpp b/external_imported/Catch2/src/catch2/internal/catch_config_static_analysis_support.hpp
new file mode 100644
index 000000000..81bdf39f4
--- /dev/null
+++ b/external_imported/Catch2/src/catch2/internal/catch_config_static_analysis_support.hpp
@@ -0,0 +1,34 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+
+/** \file
+ * Wrapper for the STATIC_ANALYSIS_SUPPORT configuration option
+ *
+ * Some of Catch2's macros can be defined differently to work better with
+ * static analysis tools, like clang-tidy or coverity.
+ * Currently the main use case is to show that `SECTION`s are executed
+ * exclusively, and not all in one run of a `TEST_CASE`.
+ */
+
+#ifndef CATCH_CONFIG_STATIC_ANALYSIS_SUPPORT_HPP_INCLUDED
+#define CATCH_CONFIG_STATIC_ANALYSIS_SUPPORT_HPP_INCLUDED
+
+#include <catch2/catch_user_config.hpp>
+
+#if defined(__clang_analyzer__) || defined(__COVERITY__)
+    #define CATCH_INTERNAL_CONFIG_STATIC_ANALYSIS_SUPPORT
+#endif
+
+#if defined( CATCH_INTERNAL_CONFIG_STATIC_ANALYSIS_SUPPORT ) && \
+    !defined( CATCH_CONFIG_NO_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT ) && \
+    !defined( CATCH_CONFIG_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT )
+#    define CATCH_CONFIG_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT
+#endif
+
+
+#endif // CATCH_CONFIG_STATIC_ANALYSIS_SUPPORT_HPP_INCLUDED
diff --git a/external_imported/Catch2/src/catch2/internal/catch_config_uncaught_exceptions.hpp b/external_imported/Catch2/src/catch2/internal/catch_config_uncaught_exceptions.hpp
index 5c4cb9301..20b1dfca4 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_config_uncaught_exceptions.hpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_config_uncaught_exceptions.hpp
@@ -17,6 +17,8 @@
 #ifndef CATCH_CONFIG_UNCAUGHT_EXCEPTIONS_HPP_INCLUDED
 #define CATCH_CONFIG_UNCAUGHT_EXCEPTIONS_HPP_INCLUDED
 
+#include <catch2/catch_user_config.hpp>
+
 #if defined(_MSC_VER)
 #  if _MSC_VER >= 1900 // Visual Studio 2015 or newer
 #    define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
diff --git a/external_imported/Catch2/src/catch2/internal/catch_config_wchar.hpp b/external_imported/Catch2/src/catch2/internal/catch_config_wchar.hpp
index 8c758ec43..90d85d055 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_config_wchar.hpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_config_wchar.hpp
@@ -17,6 +17,8 @@
 #ifndef CATCH_CONFIG_WCHAR_HPP_INCLUDED
 #define CATCH_CONFIG_WCHAR_HPP_INCLUDED
 
+#include <catch2/catch_user_config.hpp>
+
 // We assume that WCHAR should be enabled by default, and only disabled
 // for a shortlist (so far only DJGPP) of compilers.
 
diff --git a/external_imported/Catch2/src/catch2/internal/catch_console_colour.cpp b/external_imported/Catch2/src/catch2/internal/catch_console_colour.cpp
index 099a6c59b..e1238816a 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_console_colour.cpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_console_colour.cpp
@@ -85,7 +85,7 @@ namespace Catch {
     namespace {
         //! A do-nothing implementation of colour, used as fallback for unknown
         //! platforms, and when the user asks to deactivate all colours.
-        class NoColourImpl : public ColourImpl {
+        class NoColourImpl final : public ColourImpl {
         public:
             NoColourImpl( IStream* stream ): ColourImpl( stream ) {}
 
@@ -103,7 +103,7 @@ namespace Catch {
 namespace Catch {
 namespace {
 
-    class Win32ColourImpl : public ColourImpl {
+    class Win32ColourImpl final : public ColourImpl {
     public:
         Win32ColourImpl(IStream* stream):
             ColourImpl(stream) {
@@ -169,7 +169,7 @@ namespace {
 namespace Catch {
 namespace {
 
-    class ANSIColourImpl : public ColourImpl {
+    class ANSIColourImpl final : public ColourImpl {
     public:
         ANSIColourImpl( IStream* stream ): ColourImpl( stream ) {}
 
diff --git a/external_imported/Catch2/src/catch2/internal/catch_context.cpp b/external_imported/Catch2/src/catch2/internal/catch_context.cpp
index 17f285097..3b1cc2774 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_context.cpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_context.cpp
@@ -11,49 +11,27 @@
 
 namespace Catch {
 
-    class Context : public IMutableContext, private Detail::NonCopyable {
+    Context* Context::currentContext = nullptr;
 
-    public: // IContext
-        IResultCapture* getResultCapture() override {
-            return m_resultCapture;
-        }
-
-        IConfig const* getConfig() const override {
-            return m_config;
-        }
-
-        ~Context() override;
-
-    public: // IMutableContext
-        void setResultCapture( IResultCapture* resultCapture ) override {
-            m_resultCapture = resultCapture;
-        }
-        void setConfig( IConfig const* config ) override {
-            m_config = config;
-        }
-
-        friend IMutableContext& getCurrentMutableContext();
-
-    private:
-        IConfig const* m_config = nullptr;
-        IResultCapture* m_resultCapture = nullptr;
-    };
-
-    IMutableContext *IMutableContext::currentContext = nullptr;
-
-    void IMutableContext::createContext()
-    {
+    void cleanUpContext() {
+        delete Context::currentContext;
+        Context::currentContext = nullptr;
+    }
+    void Context::createContext() {
         currentContext = new Context();
     }
 
-    void cleanUpContext() {
-        delete IMutableContext::currentContext;
-        IMutableContext::currentContext = nullptr;
+    Context& getCurrentMutableContext() {
+        if ( !Context::currentContext ) { Context::createContext(); }
+        // NOLINTNEXTLINE(clang-analyzer-core.uninitialized.UndefReturn)
+        return *Context::currentContext;
+    }
+
+    void Context::setResultCapture( IResultCapture* resultCapture ) {
+        m_resultCapture = resultCapture;
     }
-    IContext::~IContext() = default;
-    IMutableContext::~IMutableContext() = default;
-    Context::~Context() = default;
 
+    void Context::setConfig( IConfig const* config ) { m_config = config; }
 
     SimplePcg32& sharedRng() {
         static SimplePcg32 s_rng;
diff --git a/external_imported/Catch2/src/catch2/internal/catch_context.hpp b/external_imported/Catch2/src/catch2/internal/catch_context.hpp
index a9d1b3941..6ccb3b318 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_context.hpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_context.hpp
@@ -15,38 +15,31 @@ namespace Catch {
     class IResultCapture;
     class IConfig;
 
-    class IContext {
-    public:
-        virtual ~IContext(); // = default
+    class Context {
+        IConfig const* m_config = nullptr;
+        IResultCapture* m_resultCapture = nullptr;
 
-        virtual IResultCapture* getResultCapture() = 0;
-        virtual IConfig const* getConfig() const = 0;
-    };
+        CATCH_EXPORT static Context* currentContext;
+        friend Context& getCurrentMutableContext();
+        friend Context const& getCurrentContext();
+        static void createContext();
+        friend void cleanUpContext();
 
-    class IMutableContext : public IContext {
     public:
-        ~IMutableContext() override; // = default
-        virtual void setResultCapture( IResultCapture* resultCapture ) = 0;
-        virtual void setConfig( IConfig const* config ) = 0;
-
-    private:
-        CATCH_EXPORT static IMutableContext* currentContext;
-        friend IMutableContext& getCurrentMutableContext();
-        friend void cleanUpContext();
-        static void createContext();
+        IResultCapture* getResultCapture() const { return m_resultCapture; }
+        IConfig const* getConfig() const { return m_config; }
+        void setResultCapture( IResultCapture* resultCapture );
+        void setConfig( IConfig const* config );
     };
 
-    inline IMutableContext& getCurrentMutableContext()
-    {
-        if( !IMutableContext::currentContext )
-            IMutableContext::createContext();
-        // NOLINTNEXTLINE(clang-analyzer-core.uninitialized.UndefReturn)
-        return *IMutableContext::currentContext;
-    }
+    Context& getCurrentMutableContext();
 
-    inline IContext& getCurrentContext()
-    {
-        return getCurrentMutableContext();
+    inline Context const& getCurrentContext() {
+        // We duplicate the logic from `getCurrentMutableContext` here,
+        // to avoid paying the call overhead in debug mode.
+        if ( !Context::currentContext ) { Context::createContext(); }
+        // NOLINTNEXTLINE(clang-analyzer-core.uninitialized.UndefReturn)
+        return *Context::currentContext;
     }
 
     void cleanUpContext();
diff --git a/external_imported/Catch2/src/catch2/internal/catch_enum_values_registry.cpp b/external_imported/Catch2/src/catch2/internal/catch_enum_values_registry.cpp
index 7e8bf5e5e..a94b60881 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_enum_values_registry.cpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_enum_values_registry.cpp
@@ -39,7 +39,7 @@ namespace Catch {
             return parsed;
         }
 
-        EnumInfo::~EnumInfo() {}
+        EnumInfo::~EnumInfo() = default;
 
         StringRef EnumInfo::lookup( int value ) const {
             for( auto const& valueToName : m_values ) {
diff --git a/external_imported/Catch2/src/catch2/internal/catch_exception_translator_registry.cpp b/external_imported/Catch2/src/catch2/internal/catch_exception_translator_registry.cpp
index 0645c6ce0..1eb611473 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_exception_translator_registry.cpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_exception_translator_registry.cpp
@@ -11,10 +11,27 @@
 #include <catch2/internal/catch_test_failure_exception.hpp>
 #include <catch2/internal/catch_move_and_forward.hpp>
 
+#include <exception>
+
 namespace Catch {
 
-    ExceptionTranslatorRegistry::~ExceptionTranslatorRegistry() {
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+    namespace {
+        static std::string tryTranslators(
+            std::vector<
+                Detail::unique_ptr<IExceptionTranslator const>> const& translators ) {
+            if ( translators.empty() ) {
+                std::rethrow_exception( std::current_exception() );
+            } else {
+                return translators[0]->translate( translators.begin() + 1,
+                                                  translators.end() );
+            }
+        }
+
     }
+#endif //!defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+
+    ExceptionTranslatorRegistry::~ExceptionTranslatorRegistry() = default;
 
     void ExceptionTranslatorRegistry::registerTranslator( Detail::unique_ptr<IExceptionTranslator>&& translator ) {
         m_translators.push_back( CATCH_MOVE( translator ) );
@@ -37,7 +54,7 @@ namespace Catch {
         // First we try user-registered translators. If none of them can
         // handle the exception, it will be rethrown handled by our defaults.
         try {
-            return tryTranslators();
+            return tryTranslators(m_translators);
         }
         // To avoid having to handle TFE explicitly everywhere, we just
         // rethrow it so that it goes back up the caller.
@@ -61,23 +78,10 @@ namespace Catch {
         }
     }
 
-    std::string ExceptionTranslatorRegistry::tryTranslators() const {
-        if (m_translators.empty()) {
-            std::rethrow_exception(std::current_exception());
-        } else {
-            return m_translators[0]->translate(m_translators.begin() + 1, m_translators.end());
-        }
-    }
-
 #else // ^^ Exceptions are enabled // Exceptions are disabled vv
     std::string ExceptionTranslatorRegistry::translateActiveException() const {
         CATCH_INTERNAL_ERROR("Attempted to translate active exception under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
     }
-
-    std::string ExceptionTranslatorRegistry::tryTranslators() const {
-        CATCH_INTERNAL_ERROR("Attempted to use exception translators under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
-    }
 #endif
 
-
 }
diff --git a/external_imported/Catch2/src/catch2/internal/catch_exception_translator_registry.hpp b/external_imported/Catch2/src/catch2/internal/catch_exception_translator_registry.hpp
index 2aafa684f..3123e93d7 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_exception_translator_registry.hpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_exception_translator_registry.hpp
@@ -21,7 +21,6 @@ namespace Catch {
         ~ExceptionTranslatorRegistry() override;
         void registerTranslator( Detail::unique_ptr<IExceptionTranslator>&& translator );
         std::string translateActiveException() const override;
-        std::string tryTranslators() const;
 
     private:
         ExceptionTranslators m_translators;
diff --git a/external_imported/Catch2/src/catch2/internal/catch_fatal_condition_handler.cpp b/external_imported/Catch2/src/catch2/internal/catch_fatal_condition_handler.cpp
index f9702b184..9ef5b2179 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_fatal_condition_handler.cpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_fatal_condition_handler.cpp
@@ -26,6 +26,7 @@
 
 #include <catch2/internal/catch_fatal_condition_handler.hpp>
 
+#include <catch2/internal/catch_compiler_capabilities.hpp>
 #include <catch2/internal/catch_context.hpp>
 #include <catch2/internal/catch_enforce.hpp>
 #include <catch2/interfaces/catch_interfaces_capture.hpp>
diff --git a/external_imported/Catch2/src/catch2/internal/catch_fatal_condition_handler.hpp b/external_imported/Catch2/src/catch2/internal/catch_fatal_condition_handler.hpp
index ce07f9b6a..81728b563 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_fatal_condition_handler.hpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_fatal_condition_handler.hpp
@@ -8,9 +8,6 @@
 #ifndef CATCH_FATAL_CONDITION_HANDLER_HPP_INCLUDED
 #define CATCH_FATAL_CONDITION_HANDLER_HPP_INCLUDED
 
-#include <catch2/internal/catch_platform.hpp>
-#include <catch2/internal/catch_compiler_capabilities.hpp>
-
 #include <cassert>
 
 namespace Catch {
diff --git a/external_imported/Catch2/src/catch2/internal/catch_floating_point_helpers.cpp b/external_imported/Catch2/src/catch2/internal/catch_floating_point_helpers.cpp
index e30ee4342..9631ed6d2 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_floating_point_helpers.cpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_floating_point_helpers.cpp
@@ -27,6 +27,17 @@ namespace Catch {
             return i;
         }
 
+#if defined( __GNUC__ ) || defined( __clang__ )
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+        bool directCompare( float lhs, float rhs ) { return lhs == rhs; }
+        bool directCompare( double lhs, double rhs ) { return lhs == rhs; }
+#if defined( __GNUC__ ) || defined( __clang__ )
+#    pragma GCC diagnostic pop
+#endif
+
+
     } // end namespace Detail
 } // end namespace Catch
 
diff --git a/external_imported/Catch2/src/catch2/internal/catch_floating_point_helpers.hpp b/external_imported/Catch2/src/catch2/internal/catch_floating_point_helpers.hpp
index ca883c613..b2143726d 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_floating_point_helpers.hpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_floating_point_helpers.hpp
@@ -22,6 +22,11 @@ namespace Catch {
         uint32_t convertToBits(float f);
         uint64_t convertToBits(double d);
 
+        // Used when we know we want == comparison of two doubles
+        // to centralize warning suppression
+        bool directCompare( float lhs, float rhs );
+        bool directCompare( double lhs, double rhs );
+
     } // end namespace Detail
 
 
diff --git a/external_imported/Catch2/src/catch2/internal/catch_istream.cpp b/external_imported/Catch2/src/catch2/internal/catch_istream.cpp
index 489396ec7..2867ce747 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_istream.cpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_istream.cpp
@@ -24,7 +24,7 @@ namespace Catch {
 namespace Detail {
     namespace {
         template<typename WriterF, std::size_t bufferSize=256>
-        class StreamBufImpl : public std::streambuf {
+        class StreamBufImpl final : public std::streambuf {
             char data[bufferSize];
             WriterF m_writer;
 
@@ -72,7 +72,7 @@ namespace Detail {
 
         ///////////////////////////////////////////////////////////////////////////
 
-        class FileStream : public IStream {
+        class FileStream final : public IStream {
             std::ofstream m_ofs;
         public:
             FileStream( std::string const& filename ) {
@@ -80,7 +80,6 @@ namespace Detail {
                 CATCH_ENFORCE( !m_ofs.fail(), "Unable to open file: '" << filename << '\'' );
                 m_ofs << std::unitbuf;
             }
-            ~FileStream() override = default;
         public: // IStream
             std::ostream& stream() override {
                 return m_ofs;
@@ -89,13 +88,12 @@ namespace Detail {
 
         ///////////////////////////////////////////////////////////////////////////
 
-        class CoutStream : public IStream {
+        class CoutStream final : public IStream {
             std::ostream m_os;
         public:
             // Store the streambuf from cout up-front because
             // cout may get redirected when running tests
             CoutStream() : m_os( Catch::cout().rdbuf() ) {}
-            ~CoutStream() override = default;
 
         public: // IStream
             std::ostream& stream() override { return m_os; }
@@ -109,7 +107,6 @@ namespace Detail {
             // Store the streambuf from cerr up-front because
             // cout may get redirected when running tests
             CerrStream(): m_os( Catch::cerr().rdbuf() ) {}
-            ~CerrStream() override = default;
 
         public: // IStream
             std::ostream& stream() override { return m_os; }
@@ -118,7 +115,7 @@ namespace Detail {
 
         ///////////////////////////////////////////////////////////////////////////
 
-        class DebugOutStream : public IStream {
+        class DebugOutStream final : public IStream {
             Detail::unique_ptr<StreamBufImpl<OutputDebugWriter>> m_streamBuf;
             std::ostream m_os;
         public:
@@ -127,8 +124,6 @@ namespace Detail {
                 m_os( m_streamBuf.get() )
             {}
 
-            ~DebugOutStream() override = default;
-
         public: // IStream
             std::ostream& stream() override { return m_os; }
         };
diff --git a/external_imported/Catch2/src/catch2/internal/catch_jsonwriter.cpp b/external_imported/Catch2/src/catch2/internal/catch_jsonwriter.cpp
new file mode 100644
index 000000000..ff65a9d34
--- /dev/null
+++ b/external_imported/Catch2/src/catch2/internal/catch_jsonwriter.cpp
@@ -0,0 +1,148 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+#include <catch2/internal/catch_enforce.hpp>
+#include <catch2/internal/catch_jsonwriter.hpp>
+
+namespace Catch {
+    void JsonUtils::indent( std::ostream& os, std::uint64_t level ) {
+        for ( std::uint64_t i = 0; i < level; ++i ) {
+            os << "  ";
+        }
+    }
+    void JsonUtils::appendCommaNewline( std::ostream& os,
+                                        bool& should_comma,
+                                        std::uint64_t level ) {
+        if ( should_comma ) { os << ','; }
+        should_comma = true;
+        os << '\n';
+        indent( os, level );
+    }
+
+    JsonObjectWriter::JsonObjectWriter( std::ostream& os ):
+        JsonObjectWriter{ os, 0 } {}
+
+    JsonObjectWriter::JsonObjectWriter( std::ostream& os,
+                                        std::uint64_t indent_level ):
+        m_os{ os }, m_indent_level{ indent_level } {
+        m_os << '{';
+    }
+    JsonObjectWriter::JsonObjectWriter( JsonObjectWriter&& source ):
+        m_os{ source.m_os },
+        m_indent_level{ source.m_indent_level },
+        m_should_comma{ source.m_should_comma },
+        m_active{ source.m_active } {
+        source.m_active = false;
+    }
+
+    JsonObjectWriter::~JsonObjectWriter() {
+        if ( !m_active ) { return; }
+
+        m_os << '\n';
+        JsonUtils::indent( m_os, m_indent_level );
+        m_os << '}';
+    }
+
+    JsonValueWriter JsonObjectWriter::write( StringRef key ) {
+        JsonUtils::appendCommaNewline(
+            m_os, m_should_comma, m_indent_level + 1 );
+
+        m_os << '"' << key << "\": ";
+        return JsonValueWriter{ m_os, m_indent_level + 1 };
+    }
+
+    JsonArrayWriter::JsonArrayWriter( std::ostream& os ):
+        JsonArrayWriter{ os, 0 } {}
+    JsonArrayWriter::JsonArrayWriter( std::ostream& os,
+                                      std::uint64_t indent_level ):
+        m_os{ os }, m_indent_level{ indent_level } {
+        m_os << '[';
+    }
+    JsonArrayWriter::JsonArrayWriter( JsonArrayWriter&& source ):
+        m_os{ source.m_os },
+        m_indent_level{ source.m_indent_level },
+        m_should_comma{ source.m_should_comma },
+        m_active{ source.m_active } {
+        source.m_active = false;
+    }
+    JsonArrayWriter::~JsonArrayWriter() {
+        if ( !m_active ) { return; }
+
+        m_os << '\n';
+        JsonUtils::indent( m_os, m_indent_level );
+        m_os << ']';
+    }
+
+    JsonObjectWriter JsonArrayWriter::writeObject() {
+        JsonUtils::appendCommaNewline(
+            m_os, m_should_comma, m_indent_level + 1 );
+        return JsonObjectWriter{ m_os, m_indent_level + 1 };
+    }
+
+    JsonArrayWriter JsonArrayWriter::writeArray() {
+        JsonUtils::appendCommaNewline(
+            m_os, m_should_comma, m_indent_level + 1 );
+        return JsonArrayWriter{ m_os, m_indent_level + 1 };
+    }
+
+    JsonArrayWriter& JsonArrayWriter::write( bool value ) {
+        return writeImpl( value );
+    }
+
+    JsonValueWriter::JsonValueWriter( std::ostream& os ):
+        JsonValueWriter{ os, 0 } {}
+
+    JsonValueWriter::JsonValueWriter( std::ostream& os,
+                                      std::uint64_t indent_level ):
+        m_os{ os }, m_indent_level{ indent_level } {}
+
+    JsonObjectWriter JsonValueWriter::writeObject() && {
+        return JsonObjectWriter{ m_os, m_indent_level };
+    }
+
+    JsonArrayWriter JsonValueWriter::writeArray() && {
+        return JsonArrayWriter{ m_os, m_indent_level };
+    }
+
+    void JsonValueWriter::write( Catch::StringRef value ) && {
+        writeImpl( value, true );
+    }
+
+    void JsonValueWriter::write( bool value ) && {
+        writeImpl( value ? "true"_sr : "false"_sr, false );
+    }
+
+    void JsonValueWriter::writeImpl( Catch::StringRef value, bool quote ) {
+        if ( quote ) { m_os << '"'; }
+        for (char c : value) {
+            // Escape list taken from https://www.json.org/json-en.html,
+            // string definition.
+            // Note that while forward slash _can_ be escaped, it does
+            // not have to be, if JSON is not further embedded somewhere
+            // where forward slash is meaningful.
+            if ( c == '"' ) {
+                m_os << "\\\"";
+            } else if ( c == '\\' ) {
+                m_os << "\\\\";
+            } else if ( c == '\b' ) {
+                m_os << "\\b";
+            } else if ( c == '\f' ) {
+                m_os << "\\f";
+            } else if ( c == '\n' ) {
+                m_os << "\\n";
+            } else if ( c == '\r' ) {
+                m_os << "\\r";
+            } else if ( c == '\t' ) {
+                m_os << "\\t";
+            } else {
+                m_os << c;
+            }
+        }
+        if ( quote ) { m_os << '"'; }
+    }
+
+} // namespace Catch
diff --git a/external_imported/Catch2/src/catch2/internal/catch_jsonwriter.hpp b/external_imported/Catch2/src/catch2/internal/catch_jsonwriter.hpp
new file mode 100644
index 000000000..59c044e45
--- /dev/null
+++ b/external_imported/Catch2/src/catch2/internal/catch_jsonwriter.hpp
@@ -0,0 +1,120 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+#ifndef CATCH_JSONWRITER_HPP_INCLUDED
+#define CATCH_JSONWRITER_HPP_INCLUDED
+
+#include <catch2/internal/catch_reusable_string_stream.hpp>
+#include <catch2/internal/catch_stringref.hpp>
+
+#include <cstdint>
+#include <sstream>
+
+namespace Catch {
+    class JsonObjectWriter;
+    class JsonArrayWriter;
+
+    struct JsonUtils {
+        static void indent( std::ostream& os, std::uint64_t level );
+        static void appendCommaNewline( std::ostream& os,
+                                        bool& should_comma,
+                                        std::uint64_t level );
+    };
+
+    class JsonValueWriter {
+    public:
+        JsonValueWriter( std::ostream& os );
+        JsonValueWriter( std::ostream& os, std::uint64_t indent_level );
+
+        JsonObjectWriter writeObject() &&;
+        JsonArrayWriter writeArray() &&;
+
+        template <typename T>
+        void write( T const& value ) && {
+            writeImpl( value, !std::is_arithmetic<T>::value );
+        }
+        void write( StringRef value ) &&;
+        void write( bool value ) &&;
+
+    private:
+        void writeImpl( StringRef value, bool quote );
+
+        // Without this SFINAE, this overload is a better match
+        // for `std::string`, `char const*`, `char const[N]` args.
+        // While it would still work, it would cause code bloat
+        // and multiple iteration over the strings
+        template <typename T,
+                  typename = typename std::enable_if_t<
+                      !std::is_convertible<T, StringRef>::value>>
+        void writeImpl( T const& value, bool quote_value ) {
+            m_sstream << value;
+            writeImpl( m_sstream.str(), quote_value );
+        }
+
+        std::ostream& m_os;
+        std::stringstream m_sstream;
+        std::uint64_t m_indent_level;
+    };
+
+    class JsonObjectWriter {
+    public:
+        JsonObjectWriter( std::ostream& os );
+        JsonObjectWriter( std::ostream& os, std::uint64_t indent_level );
+
+        JsonObjectWriter( JsonObjectWriter&& source );
+        JsonObjectWriter& operator=( JsonObjectWriter&& source ) = delete;
+
+        ~JsonObjectWriter();
+
+        JsonValueWriter write( StringRef key );
+
+    private:
+        std::ostream& m_os;
+        std::uint64_t m_indent_level;
+        bool m_should_comma = false;
+        bool m_active = true;
+    };
+
+    class JsonArrayWriter {
+    public:
+        JsonArrayWriter( std::ostream& os );
+        JsonArrayWriter( std::ostream& os, std::uint64_t indent_level );
+
+        JsonArrayWriter( JsonArrayWriter&& source );
+        JsonArrayWriter& operator=( JsonArrayWriter&& source ) = delete;
+
+        ~JsonArrayWriter();
+
+        JsonObjectWriter writeObject();
+        JsonArrayWriter writeArray();
+
+        template <typename T>
+        JsonArrayWriter& write( T const& value ) {
+            return writeImpl( value );
+        }
+
+        JsonArrayWriter& write( bool value );
+
+    private:
+        template <typename T>
+        JsonArrayWriter& writeImpl( T const& value ) {
+            JsonUtils::appendCommaNewline(
+                m_os, m_should_comma, m_indent_level + 1 );
+            JsonValueWriter{ m_os }.write( value );
+
+            return *this;
+        }
+
+        std::ostream& m_os;
+        std::uint64_t m_indent_level;
+        bool m_should_comma = false;
+        bool m_active = true;
+    };
+
+} // namespace Catch
+
+#endif // CATCH_JSONWRITER_HPP_INCLUDED
diff --git a/external_imported/Catch2/src/catch2/internal/catch_leak_detector.cpp b/external_imported/Catch2/src/catch2/internal/catch_leak_detector.cpp
index 7389eaf77..691bc772e 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_leak_detector.cpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_leak_detector.cpp
@@ -29,7 +29,7 @@ namespace Catch {
 
 #else // ^^ Windows crt debug heap enabled // Windows crt debug heap disabled vv
 
-    Catch::LeakDetector::LeakDetector() {}
+    Catch::LeakDetector::LeakDetector() = default;
 
 #endif // CATCH_CONFIG_WINDOWS_CRTDBG
 
diff --git a/external_imported/Catch2/src/catch2/internal/catch_list.cpp b/external_imported/Catch2/src/catch2/internal/catch_list.cpp
index 263781d60..5bd06a2ae 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_list.cpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_list.cpp
@@ -9,15 +9,12 @@
 
 #include <catch2/interfaces/catch_interfaces_registry_hub.hpp>
 #include <catch2/interfaces/catch_interfaces_reporter.hpp>
-#include <catch2/interfaces/catch_interfaces_reporter_registry.hpp>
-#include <catch2/interfaces/catch_interfaces_testcase.hpp>
 #include <catch2/interfaces/catch_interfaces_reporter_factory.hpp>
+#include <catch2/internal/catch_test_case_registry_impl.hpp>
+#include <catch2/internal/catch_reporter_registry.hpp>
 #include <catch2/internal/catch_move_and_forward.hpp>
 #include <catch2/internal/catch_case_insensitive_comparisons.hpp>
-
-#include <catch2/internal/catch_context.hpp>
 #include <catch2/catch_config.hpp>
-#include <catch2/catch_test_spec.hpp>
 #include <catch2/catch_test_case_info.hpp>
 
 namespace Catch {
@@ -54,7 +51,7 @@ namespace Catch {
         void listReporters(IEventListener& reporter) {
             std::vector<ReporterDescription> descriptions;
 
-            IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories();
+            auto const& factories = getRegistryHub().getReporterRegistry().getFactories();
             descriptions.reserve(factories.size());
             for (auto const& fac : factories) {
                 descriptions.push_back({ fac.first, fac.second->getDescription() });
diff --git a/external_imported/Catch2/src/catch2/internal/catch_message_info.hpp b/external_imported/Catch2/src/catch2/internal/catch_message_info.hpp
index d2658429e..1ef43fdaf 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_message_info.hpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_message_info.hpp
@@ -10,7 +10,7 @@
 
 #include <catch2/internal/catch_result_type.hpp>
 #include <catch2/internal/catch_source_line_info.hpp>
-#include <catch2/interfaces/catch_interfaces_capture.hpp>
+#include <catch2/internal/catch_stringref.hpp>
 
 #include <string>
 
diff --git a/external_imported/Catch2/src/catch2/internal/catch_optional.hpp b/external_imported/Catch2/src/catch2/internal/catch_optional.hpp
index ac3714ee8..d1e953ad9 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_optional.hpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_optional.hpp
@@ -8,6 +8,8 @@
 #ifndef CATCH_OPTIONAL_HPP_INCLUDED
 #define CATCH_OPTIONAL_HPP_INCLUDED
 
+#include <catch2/internal/catch_move_and_forward.hpp>
+
 #include <cassert>
 
 namespace Catch {
@@ -16,35 +18,50 @@ namespace Catch {
     template<typename T>
     class Optional {
     public:
-        Optional() : nullableValue( nullptr ) {}
-        Optional( T const& _value )
-        : nullableValue( new( storage ) T( _value ) )
-        {}
-        Optional( Optional const& _other )
-        : nullableValue( _other ? new( storage ) T( *_other ) : nullptr )
-        {}
-
-        ~Optional() {
+        Optional(): nullableValue( nullptr ) {}
+        ~Optional() { reset(); }
+
+        Optional( T const& _value ):
+            nullableValue( new ( storage ) T( _value ) ) {}
+        Optional( T&& _value ):
+            nullableValue( new ( storage ) T( CATCH_MOVE( _value ) ) ) {}
+
+        Optional& operator=( T const& _value ) {
             reset();
+            nullableValue = new ( storage ) T( _value );
+            return *this;
         }
+        Optional& operator=( T&& _value ) {
+            reset();
+            nullableValue = new ( storage ) T( CATCH_MOVE( _value ) );
+            return *this;
+        }
+
+        Optional( Optional const& _other ):
+            nullableValue( _other ? new ( storage ) T( *_other ) : nullptr ) {}
+        Optional( Optional&& _other ):
+            nullableValue( _other ? new ( storage ) T( CATCH_MOVE( *_other ) )
+                                  : nullptr ) {}
 
-        Optional& operator= ( Optional const& _other ) {
-            if( &_other != this ) {
+        Optional& operator=( Optional const& _other ) {
+            if ( &_other != this ) {
                 reset();
-                if( _other )
-                    nullableValue = new( storage ) T( *_other );
+                if ( _other ) { nullableValue = new ( storage ) T( *_other ); }
             }
             return *this;
         }
-        Optional& operator = ( T const& _value ) {
-            reset();
-            nullableValue = new( storage ) T( _value );
+        Optional& operator=( Optional&& _other ) {
+            if ( &_other != this ) {
+                reset();
+                if ( _other ) {
+                    nullableValue = new ( storage ) T( CATCH_MOVE( *_other ) );
+                }
+            }
             return *this;
         }
 
         void reset() {
-            if( nullableValue )
-                nullableValue->~T();
+            if ( nullableValue ) { nullableValue->~T(); }
             nullableValue = nullptr;
         }
 
@@ -91,7 +108,7 @@ namespace Catch {
         }
 
     private:
-        T *nullableValue;
+        T* nullableValue;
         alignas(alignof(T)) char storage[sizeof(T)];
     };
 
diff --git a/external_imported/Catch2/src/catch2/internal/catch_polyfills.cpp b/external_imported/Catch2/src/catch2/internal/catch_polyfills.cpp
index 96efad5dd..776c22439 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_polyfills.cpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_polyfills.cpp
@@ -31,4 +31,12 @@ namespace Catch {
     }
 #endif
 
+#if !defined( CATCH_CONFIG_GLOBAL_NEXTAFTER )
+    float nextafter( float x, float y ) { return std::nextafter( x, y ); }
+    double nextafter( double x, double y ) { return std::nextafter( x, y ); }
+#else
+    float nextafter( float x, float y ) { return ::nextafterf( x, y ); }
+    double nextafter( double x, double y ) { return ::nextafter( x, y ); }
+#endif
+
 } // end namespace Catch
diff --git a/external_imported/Catch2/src/catch2/internal/catch_polyfills.hpp b/external_imported/Catch2/src/catch2/internal/catch_polyfills.hpp
index 23a9332bc..4503f8f2a 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_polyfills.hpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_polyfills.hpp
@@ -9,8 +9,13 @@
 #define CATCH_POLYFILLS_HPP_INCLUDED
 
 namespace Catch {
+
     bool isnan(float f);
     bool isnan(double d);
+
+    float nextafter(float x, float y);
+    double nextafter(double x, double y);
+
 }
 
 #endif // CATCH_POLYFILLS_HPP_INCLUDED
diff --git a/external_imported/Catch2/src/catch2/internal/catch_preprocessor_internal_stringify.hpp b/external_imported/Catch2/src/catch2/internal/catch_preprocessor_internal_stringify.hpp
new file mode 100644
index 000000000..2fd64e1c6
--- /dev/null
+++ b/external_imported/Catch2/src/catch2/internal/catch_preprocessor_internal_stringify.hpp
@@ -0,0 +1,19 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+#ifndef CATCH_PREPROCESSOR_INTERNAL_STRINGIFY_HPP_INCLUDED
+#define CATCH_PREPROCESSOR_INTERNAL_STRINGIFY_HPP_INCLUDED
+
+#include <catch2/catch_user_config.hpp>
+
+#if !defined(CATCH_CONFIG_DISABLE_STRINGIFICATION)
+  #define CATCH_INTERNAL_STRINGIFY(...) #__VA_ARGS__##_catch_sr
+#else
+  #define CATCH_INTERNAL_STRINGIFY(...) "Disabled by CATCH_CONFIG_DISABLE_STRINGIFICATION"_catch_sr
+#endif
+
+#endif // CATCH_PREPROCESSOR_INTERNAL_STRINGIFY_HPP_INCLUDED
diff --git a/external_imported/Catch2/src/catch2/internal/catch_random_floating_point_helpers.hpp b/external_imported/Catch2/src/catch2/internal/catch_random_floating_point_helpers.hpp
new file mode 100644
index 000000000..c59c05391
--- /dev/null
+++ b/external_imported/Catch2/src/catch2/internal/catch_random_floating_point_helpers.hpp
@@ -0,0 +1,94 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+
+#ifndef CATCH_RANDOM_FLOATING_POINT_HELPERS_HPP_INCLUDED
+#define CATCH_RANDOM_FLOATING_POINT_HELPERS_HPP_INCLUDED
+
+#include <catch2/internal/catch_polyfills.hpp>
+
+#include <cassert>
+#include <cmath>
+#include <cstdint>
+#include <limits>
+#include <type_traits>
+
+namespace Catch {
+
+    namespace Detail {
+        /**
+         * Returns the largest magnitude of 1-ULP distance inside the [a, b] range.
+         *
+         * Assumes `a < b`.
+         */
+        template <typename FloatType>
+        FloatType gamma(FloatType a, FloatType b) {
+            static_assert( std::is_floating_point<FloatType>::value,
+                           "gamma returns the largest ULP magnitude within "
+                           "floating point range [a, b]. This only makes sense "
+                           "for floating point types" );
+            assert( a <= b );
+
+            const auto gamma_up = Catch::nextafter( a, std::numeric_limits<FloatType>::infinity() ) - a;
+            const auto gamma_down = b - Catch::nextafter( b, -std::numeric_limits<FloatType>::infinity() );
+
+            return gamma_up < gamma_down ? gamma_down : gamma_up;
+        }
+
+        template <typename FloatingPoint>
+        struct DistanceTypePicker;
+        template <>
+        struct DistanceTypePicker<float> {
+            using type = std::uint32_t;
+        };
+        template <>
+        struct DistanceTypePicker<double> {
+            using type = std::uint64_t;
+        };
+
+        template <typename T>
+        using DistanceType = typename DistanceTypePicker<T>::type;
+
+#if defined( __GNUC__ ) || defined( __clang__ )
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+        /**
+         * Computes the number of equi-distant floats in [a, b]
+         *
+         * Since not every range can be split into equidistant floats
+         * exactly, we actually compute ceil(b/distance - a/distance),
+         * because in those cases we want to overcount.
+         *
+         * Uses modified Dekker's FastTwoSum algorithm to handle rounding.
+         */
+        template <typename FloatType>
+        DistanceType<FloatType>
+        count_equidistant_floats( FloatType a, FloatType b, FloatType distance ) {
+            assert( a <= b );
+            // We get distance as gamma for our uniform float distribution,
+            // so this will round perfectly.
+            const auto ag = a / distance;
+            const auto bg = b / distance;
+
+            const auto s = bg - ag;
+            const auto err = ( std::fabs( a ) <= std::fabs( b ) )
+                                 ? -ag - ( s - bg )
+                                 : bg - ( s + ag );
+            const auto ceil_s = static_cast<DistanceType<FloatType>>( std::ceil( s ) );
+
+            return ( ceil_s != s ) ? ceil_s : ceil_s + ( err > 0 );
+        }
+#if defined( __GNUC__ ) || defined( __clang__ )
+#    pragma GCC diagnostic pop
+#endif
+
+    }
+
+} // end namespace Catch
+
+#endif // CATCH_RANDOM_FLOATING_POINT_HELPERS_HPP_INCLUDED
diff --git a/external_imported/Catch2/src/catch2/internal/catch_random_integer_helpers.hpp b/external_imported/Catch2/src/catch2/internal/catch_random_integer_helpers.hpp
new file mode 100644
index 000000000..1c450f05c
--- /dev/null
+++ b/external_imported/Catch2/src/catch2/internal/catch_random_integer_helpers.hpp
@@ -0,0 +1,202 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+
+#ifndef CATCH_RANDOM_INTEGER_HELPERS_HPP_INCLUDED
+#define CATCH_RANDOM_INTEGER_HELPERS_HPP_INCLUDED
+
+#include <climits>
+#include <cstddef>
+#include <cstdint>
+#include <type_traits>
+
+namespace Catch {
+    namespace Detail {
+
+        template <std::size_t>
+        struct SizedUnsignedType;
+#define SizedUnsignedTypeHelper( TYPE )        \
+    template <>                                \
+    struct SizedUnsignedType<sizeof( TYPE )> { \
+        using type = TYPE;                     \
+    }
+
+        SizedUnsignedTypeHelper( std::uint8_t );
+        SizedUnsignedTypeHelper( std::uint16_t );
+        SizedUnsignedTypeHelper( std::uint32_t );
+        SizedUnsignedTypeHelper( std::uint64_t );
+#undef SizedUnsignedTypeHelper
+
+        template <std::size_t sz>
+        using SizedUnsignedType_t = typename SizedUnsignedType<sz>::type;
+
+        template <typename T>
+        using DoubleWidthUnsignedType_t = SizedUnsignedType_t<2 * sizeof( T )>;
+
+        template <typename T>
+        struct ExtendedMultResult {
+            T upper;
+            T lower;
+            friend bool operator==( ExtendedMultResult const& lhs,
+                                    ExtendedMultResult const& rhs ) {
+                return lhs.upper == rhs.upper && lhs.lower == rhs.lower;
+            }
+        };
+
+        // Returns 128 bit result of multiplying lhs and rhs
+        constexpr ExtendedMultResult<std::uint64_t>
+        extendedMult( std::uint64_t lhs, std::uint64_t rhs ) {
+            // We use the simple long multiplication approach for
+            // correctness, we can use platform specific builtins
+            // for performance later.
+
+            // Split the lhs and rhs into two 32bit "digits", so that we can
+            // do 64 bit arithmetic to handle carry bits.
+            //            32b    32b    32b    32b
+            //     lhs                  L1     L2
+            //   * rhs                  R1     R2
+            //            ------------------------
+            //                       |  R2 * L2  |
+            //                 |  R2 * L1  |
+            //                 |  R1 * L2  |
+            //           |  R1 * L1  |
+            //           -------------------------
+            //           |  a  |  b  |  c  |  d  |
+
+#define CarryBits( x ) ( x >> 32 )
+#define Digits( x ) ( x & 0xFF'FF'FF'FF )
+
+            auto r2l2 = Digits( rhs ) * Digits( lhs );
+            auto r2l1 = Digits( rhs ) * CarryBits( lhs );
+            auto r1l2 = CarryBits( rhs ) * Digits( lhs );
+            auto r1l1 = CarryBits( rhs ) * CarryBits( lhs );
+
+            // Sum to columns first
+            auto d = Digits( r2l2 );
+            auto c = CarryBits( r2l2 ) + Digits( r2l1 ) + Digits( r1l2 );
+            auto b = CarryBits( r2l1 ) + CarryBits( r1l2 ) + Digits( r1l1 );
+            auto a = CarryBits( r1l1 );
+
+            // Propagate carries between columns
+            c += CarryBits( d );
+            b += CarryBits( c );
+            a += CarryBits( b );
+
+            // Remove the used carries
+            c = Digits( c );
+            b = Digits( b );
+            a = Digits( a );
+
+#undef CarryBits
+#undef Digits
+
+            return {
+                a << 32 | b, // upper 64 bits
+                c << 32 | d  // lower 64 bits
+            };
+        }
+
+        template <typename UInt>
+        constexpr ExtendedMultResult<UInt> extendedMult( UInt lhs, UInt rhs ) {
+            static_assert( std::is_unsigned<UInt>::value,
+                           "extendedMult can only handle unsigned integers" );
+            static_assert( sizeof( UInt ) < sizeof( std::uint64_t ),
+                           "Generic extendedMult can only handle types smaller "
+                           "than uint64_t" );
+            using WideType = DoubleWidthUnsignedType_t<UInt>;
+
+            auto result = WideType( lhs ) * WideType( rhs );
+            return {
+                static_cast<UInt>( result >> ( CHAR_BIT * sizeof( UInt ) ) ),
+                static_cast<UInt>( result & UInt( -1 ) ) };
+        }
+
+
+        template <typename TargetType,
+                  typename Generator>
+            std::enable_if_t<sizeof(typename Generator::result_type) >= sizeof(TargetType),
+            TargetType> fillBitsFrom(Generator& gen) {
+            using gresult_type = typename Generator::result_type;
+            static_assert( std::is_unsigned<TargetType>::value, "Only unsigned integers are supported" );
+            static_assert( Generator::min() == 0 &&
+                           Generator::max() == static_cast<gresult_type>( -1 ),
+                           "Generator must be able to output all numbers in its result type (effectively it must be a random bit generator)" );
+
+            // We want to return the top bits from a generator, as they are
+            // usually considered higher quality.
+            constexpr auto generated_bits = sizeof( gresult_type ) * CHAR_BIT;
+            constexpr auto return_bits = sizeof( TargetType ) * CHAR_BIT;
+
+            return static_cast<TargetType>( gen() >>
+                                            ( generated_bits - return_bits) );
+        }
+
+        template <typename TargetType,
+                  typename Generator>
+            std::enable_if_t<sizeof(typename Generator::result_type) < sizeof(TargetType),
+            TargetType> fillBitsFrom(Generator& gen) {
+            using gresult_type = typename Generator::result_type;
+            static_assert( std::is_unsigned<TargetType>::value,
+                           "Only unsigned integers are supported" );
+            static_assert( Generator::min() == 0 &&
+                           Generator::max() == static_cast<gresult_type>( -1 ),
+                           "Generator must be able to output all numbers in its result type (effectively it must be a random bit generator)" );
+
+            constexpr auto generated_bits = sizeof( gresult_type ) * CHAR_BIT;
+            constexpr auto return_bits = sizeof( TargetType ) * CHAR_BIT;
+            std::size_t filled_bits = 0;
+            TargetType ret = 0;
+            do {
+                ret <<= generated_bits;
+                ret |= gen();
+                filled_bits += generated_bits;
+            } while ( filled_bits < return_bits );
+
+            return ret;
+        }
+
+        /*
+         * Transposes numbers into unsigned type while keeping their ordering
+         *
+         * This means that signed types are changed so that the ordering is
+         * [INT_MIN, ..., -1, 0, ..., INT_MAX], rather than order we would
+         * get by simple casting ([0, ..., INT_MAX, INT_MIN, ..., -1])
+         */
+        template <typename OriginalType, typename UnsignedType>
+        std::enable_if_t<std::is_signed<OriginalType>::value, UnsignedType>
+        transposeToNaturalOrder( UnsignedType in ) {
+            static_assert(
+                sizeof( OriginalType ) == sizeof( UnsignedType ),
+                "reordering requires the same sized types on both sides" );
+            static_assert( std::is_unsigned<UnsignedType>::value,
+                           "Input type must be unsigned" );
+            // Assuming 2s complement (standardized in current C++), the
+            // positive and negative numbers are already internally ordered,
+            // and their difference is in the top bit. Swapping it orders
+            // them the desired way.
+            constexpr auto highest_bit =
+                UnsignedType( 1 ) << ( sizeof( UnsignedType ) * CHAR_BIT - 1 );
+            return static_cast<UnsignedType>( in ^ highest_bit );
+        }
+
+
+
+        template <typename OriginalType,
+                  typename UnsignedType>
+        std::enable_if_t<std::is_unsigned<OriginalType>::value, UnsignedType>
+            transposeToNaturalOrder(UnsignedType in) {
+            static_assert(
+                sizeof( OriginalType ) == sizeof( UnsignedType ),
+                "reordering requires the same sized types on both sides" );
+            static_assert( std::is_unsigned<UnsignedType>::value, "Input type must be unsigned" );
+            // No reordering is needed for unsigned -> unsigned
+            return in;
+        }
+    } // namespace Detail
+} // namespace Catch
+
+#endif // CATCH_RANDOM_INTEGER_HELPERS_HPP_INCLUDED
diff --git a/external_imported/Catch2/src/catch2/internal/catch_random_seed_generation.cpp b/external_imported/Catch2/src/catch2/internal/catch_random_seed_generation.cpp
index 40c468cb4..fdc3fa19e 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_random_seed_generation.cpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_random_seed_generation.cpp
@@ -9,6 +9,7 @@
 #include <catch2/internal/catch_random_seed_generation.hpp>
 
 #include <catch2/internal/catch_enforce.hpp>
+#include <catch2/internal/catch_random_integer_helpers.hpp>
 
 #include <ctime>
 #include <random>
@@ -21,10 +22,10 @@ namespace Catch {
             return static_cast<std::uint32_t>( std::time( nullptr ) );
 
         case GenerateFrom::Default:
-        case GenerateFrom::RandomDevice:
-            // In theory, a platform could have random_device that returns just
-            // 16 bits. That is still some randomness, so we don't care too much
-            return static_cast<std::uint32_t>( std::random_device{}() );
+        case GenerateFrom::RandomDevice: {
+            std::random_device rd;
+            return Detail::fillBitsFrom<std::uint32_t>( rd );
+        }
 
         default:
             CATCH_ERROR("Unknown generation method");
diff --git a/external_imported/Catch2/src/catch2/internal/catch_reporter_registry.cpp b/external_imported/Catch2/src/catch2/internal/catch_reporter_registry.cpp
index 4c0c44f42..cea8c4dc9 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_reporter_registry.cpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_reporter_registry.cpp
@@ -5,61 +5,87 @@
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0
-#include <catch2/internal/catch_reporter_registry.hpp>
 
-#include <catch2/reporters/catch_reporter_registrars.hpp>
+#include <catch2/interfaces/catch_interfaces_reporter_factory.hpp>
+#include <catch2/internal/catch_enforce.hpp>
+#include <catch2/internal/catch_move_and_forward.hpp>
+#include <catch2/internal/catch_reporter_registry.hpp>
 #include <catch2/reporters/catch_reporter_automake.hpp>
 #include <catch2/reporters/catch_reporter_compact.hpp>
 #include <catch2/reporters/catch_reporter_console.hpp>
+#include <catch2/reporters/catch_reporter_json.hpp>
 #include <catch2/reporters/catch_reporter_junit.hpp>
+#include <catch2/reporters/catch_reporter_registrars.hpp>
 #include <catch2/reporters/catch_reporter_sonarqube.hpp>
 #include <catch2/reporters/catch_reporter_tap.hpp>
 #include <catch2/reporters/catch_reporter_teamcity.hpp>
 #include <catch2/reporters/catch_reporter_xml.hpp>
-#include <catch2/internal/catch_move_and_forward.hpp>
-#include <catch2/internal/catch_enforce.hpp>
 
 namespace Catch {
+    struct ReporterRegistry::ReporterRegistryImpl {
+        std::vector<Detail::unique_ptr<EventListenerFactory>> listeners;
+        std::map<std::string, IReporterFactoryPtr, Detail::CaseInsensitiveLess>
+            factories;
+    };
 
-    ReporterRegistry::ReporterRegistry() {
+    ReporterRegistry::ReporterRegistry():
+        m_impl( Detail::make_unique<ReporterRegistryImpl>() ) {
         // Because it is impossible to move out of initializer list,
         // we have to add the elements manually
-        m_factories["Automake"] = Detail::make_unique<ReporterFactory<AutomakeReporter>>();
-        m_factories["compact"] = Detail::make_unique<ReporterFactory<CompactReporter>>();
-        m_factories["console"] = Detail::make_unique<ReporterFactory<ConsoleReporter>>();
-        m_factories["JUnit"] = Detail::make_unique<ReporterFactory<JunitReporter>>();
-        m_factories["SonarQube"] = Detail::make_unique<ReporterFactory<SonarQubeReporter>>();
-        m_factories["TAP"] = Detail::make_unique<ReporterFactory<TAPReporter>>();
-        m_factories["TeamCity"] = Detail::make_unique<ReporterFactory<TeamCityReporter>>();
-        m_factories["XML"] = Detail::make_unique<ReporterFactory<XmlReporter>>();
+        m_impl->factories["Automake"] =
+            Detail::make_unique<ReporterFactory<AutomakeReporter>>();
+        m_impl->factories["compact"] =
+            Detail::make_unique<ReporterFactory<CompactReporter>>();
+        m_impl->factories["console"] =
+            Detail::make_unique<ReporterFactory<ConsoleReporter>>();
+        m_impl->factories["JUnit"] =
+            Detail::make_unique<ReporterFactory<JunitReporter>>();
+        m_impl->factories["SonarQube"] =
+            Detail::make_unique<ReporterFactory<SonarQubeReporter>>();
+        m_impl->factories["TAP"] =
+            Detail::make_unique<ReporterFactory<TAPReporter>>();
+        m_impl->factories["TeamCity"] =
+            Detail::make_unique<ReporterFactory<TeamCityReporter>>();
+        m_impl->factories["XML"] =
+            Detail::make_unique<ReporterFactory<XmlReporter>>();
+        m_impl->factories["JSON"] =
+            Detail::make_unique<ReporterFactory<JsonReporter>>();
     }
 
     ReporterRegistry::~ReporterRegistry() = default;
 
-
-    IEventListenerPtr ReporterRegistry::create( std::string const& name, ReporterConfig&& config ) const {
-        auto it =  m_factories.find( name );
-        if( it == m_factories.end() )
-            return nullptr;
-        return it->second->create( CATCH_MOVE(config) );
+    IEventListenerPtr
+    ReporterRegistry::create( std::string const& name,
+                              ReporterConfig&& config ) const {
+        auto it = m_impl->factories.find( name );
+        if ( it == m_impl->factories.end() ) return nullptr;
+        return it->second->create( CATCH_MOVE( config ) );
     }
 
-    void ReporterRegistry::registerReporter( std::string const& name, IReporterFactoryPtr factory ) {
+    void ReporterRegistry::registerReporter( std::string const& name,
+                                             IReporterFactoryPtr factory ) {
         CATCH_ENFORCE( name.find( "::" ) == name.npos,
-                       "'::' is not allowed in reporter name: '" + name + '\'' );
-        auto ret = m_factories.emplace(name, CATCH_MOVE(factory));
-        CATCH_ENFORCE( ret.second, "reporter using '" + name + "' as name was already registered" );
+                       "'::' is not allowed in reporter name: '" + name +
+                           '\'' );
+        auto ret = m_impl->factories.emplace( name, CATCH_MOVE( factory ) );
+        CATCH_ENFORCE( ret.second,
+                       "reporter using '" + name +
+                           "' as name was already registered" );
     }
     void ReporterRegistry::registerListener(
         Detail::unique_ptr<EventListenerFactory> factory ) {
-        m_listeners.push_back( CATCH_MOVE(factory) );
+        m_impl->listeners.push_back( CATCH_MOVE( factory ) );
     }
 
-    IReporterRegistry::FactoryMap const& ReporterRegistry::getFactories() const {
-        return m_factories;
-    }
-    IReporterRegistry::Listeners const& ReporterRegistry::getListeners() const {
-        return m_listeners;
+    std::map<std::string,
+             IReporterFactoryPtr,
+             Detail::CaseInsensitiveLess> const&
+    ReporterRegistry::getFactories() const {
+        return m_impl->factories;
     }
 
-}
+    std::vector<Detail::unique_ptr<EventListenerFactory>> const&
+    ReporterRegistry::getListeners() const {
+        return m_impl->listeners;
+    }
+} // namespace Catch
diff --git a/external_imported/Catch2/src/catch2/internal/catch_reporter_registry.hpp b/external_imported/Catch2/src/catch2/internal/catch_reporter_registry.hpp
index 5577b9ef6..92a889279 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_reporter_registry.hpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_reporter_registry.hpp
@@ -8,31 +8,48 @@
 #ifndef CATCH_REPORTER_REGISTRY_HPP_INCLUDED
 #define CATCH_REPORTER_REGISTRY_HPP_INCLUDED
 
-#include <catch2/interfaces/catch_interfaces_reporter.hpp>
-#include <catch2/interfaces/catch_interfaces_reporter_registry.hpp>
+#include <catch2/internal/catch_case_insensitive_comparisons.hpp>
+#include <catch2/internal/catch_unique_ptr.hpp>
 
 #include <map>
+#include <string>
+#include <vector>
 
 namespace Catch {
 
-    class ReporterRegistry : public IReporterRegistry {
-    public:
+    class IEventListener;
+    using IEventListenerPtr = Detail::unique_ptr<IEventListener>;
+    class IReporterFactory;
+    using IReporterFactoryPtr = Detail::unique_ptr<IReporterFactory>;
+    struct ReporterConfig;
+    class EventListenerFactory;
+
+    class ReporterRegistry {
+        struct ReporterRegistryImpl;
+        Detail::unique_ptr<ReporterRegistryImpl> m_impl;
 
+    public:
         ReporterRegistry();
-        ~ReporterRegistry() override; // = default, out of line to allow fwd decl
+        ~ReporterRegistry(); // = default;
 
-        IEventListenerPtr create( std::string const& name, ReporterConfig&& config ) const override;
+        IEventListenerPtr create( std::string const& name,
+                                  ReporterConfig&& config ) const;
 
-        void registerReporter( std::string const& name, IReporterFactoryPtr factory );
-        void registerListener( Detail::unique_ptr<EventListenerFactory> factory );
+        void registerReporter( std::string const& name,
+                               IReporterFactoryPtr factory );
 
-        FactoryMap const& getFactories() const override;
-        Listeners const& getListeners() const override;
+        void
+        registerListener( Detail::unique_ptr<EventListenerFactory> factory );
 
-    private:
-        FactoryMap m_factories;
-        Listeners m_listeners;
+        std::map<std::string,
+                 IReporterFactoryPtr,
+                 Detail::CaseInsensitiveLess> const&
+        getFactories() const;
+
+        std::vector<Detail::unique_ptr<EventListenerFactory>> const&
+        getListeners() const;
     };
-}
+
+} // end namespace Catch
 
 #endif // CATCH_REPORTER_REGISTRY_HPP_INCLUDED
diff --git a/external_imported/Catch2/src/catch2/internal/catch_reporter_spec_parser.cpp b/external_imported/Catch2/src/catch2/internal/catch_reporter_spec_parser.cpp
index f6591d9ac..8b88b170a 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_reporter_spec_parser.cpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_reporter_spec_parser.cpp
@@ -21,9 +21,9 @@ namespace Catch {
         };
 
         kvPair splitKVPair(StringRef kvString) {
-            auto splitPos = static_cast<size_t>( std::distance(
-                kvString.begin(),
-                std::find( kvString.begin(), kvString.end(), '=' ) ) );
+            auto splitPos = static_cast<size_t>(
+                std::find( kvString.begin(), kvString.end(), '=' ) -
+                kvString.begin() );
 
             return { kvString.substr( 0, splitPos ),
                      kvString.substr( splitPos + 1, kvString.size() ) };
diff --git a/external_imported/Catch2/src/catch2/internal/catch_reporter_spec_parser.hpp b/external_imported/Catch2/src/catch2/internal/catch_reporter_spec_parser.hpp
index d446ce98b..9f447ee2f 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_reporter_spec_parser.hpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_reporter_spec_parser.hpp
@@ -8,7 +8,7 @@
 #ifndef CATCH_REPORTER_SPEC_PARSER_HPP_INCLUDED
 #define CATCH_REPORTER_SPEC_PARSER_HPP_INCLUDED
 
-#include <catch2/internal/catch_console_colour.hpp>
+#include <catch2/interfaces/catch_interfaces_config.hpp>
 #include <catch2/internal/catch_optional.hpp>
 #include <catch2/internal/catch_stringref.hpp>
 
diff --git a/external_imported/Catch2/src/catch2/internal/catch_run_context.cpp b/external_imported/Catch2/src/catch2/internal/catch_run_context.cpp
index 08086b28e..77b476d82 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_run_context.cpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_run_context.cpp
@@ -8,8 +8,9 @@
 #include <catch2/internal/catch_run_context.hpp>
 
 #include <catch2/catch_user_config.hpp>
-#include <catch2/interfaces/catch_interfaces_generatortracker.hpp>
 #include <catch2/interfaces/catch_interfaces_config.hpp>
+#include <catch2/interfaces/catch_interfaces_generatortracker.hpp>
+#include <catch2/interfaces/catch_interfaces_reporter.hpp>
 #include <catch2/internal/catch_compiler_capabilities.hpp>
 #include <catch2/internal/catch_context.hpp>
 #include <catch2/internal/catch_enforce.hpp>
@@ -19,6 +20,7 @@
 #include <catch2/internal/catch_output_redirect.hpp>
 #include <catch2/internal/catch_assertion_handler.hpp>
 #include <catch2/internal/catch_test_failure_exception.hpp>
+#include <catch2/internal/catch_result_type.hpp>
 
 #include <cassert>
 #include <algorithm>
@@ -26,146 +28,151 @@
 namespace Catch {
 
     namespace Generators {
-        struct GeneratorTracker : TestCaseTracking::TrackerBase, IGeneratorTracker {
-            GeneratorBasePtr m_generator;
-
-            GeneratorTracker( TestCaseTracking::NameAndLocation&& nameAndLocation, TrackerContext& ctx, ITracker* parent )
-            :   TrackerBase( CATCH_MOVE(nameAndLocation), ctx, parent )
-            {}
-            ~GeneratorTracker() override;
-
-            static GeneratorTracker* acquire( TrackerContext& ctx, TestCaseTracking::NameAndLocationRef const& nameAndLocation ) {
-                GeneratorTracker* tracker;
-
-                ITracker& currentTracker = ctx.currentTracker();
-                // Under specific circumstances, the generator we want
-                // to acquire is also the current tracker. If this is
-                // the case, we have to avoid looking through current
-                // tracker's children, and instead return the current
-                // tracker.
-                // A case where this check is important is e.g.
-                //     for (int i = 0; i < 5; ++i) {
-                //         int n = GENERATE(1, 2);
-                //     }
-                //
-                // without it, the code above creates 5 nested generators.
-                if ( currentTracker.nameAndLocation() == nameAndLocation ) {
-                    auto thisTracker =
-                        currentTracker.parent()->findChild( nameAndLocation );
-                    assert( thisTracker );
-                    assert( thisTracker->isGeneratorTracker() );
-                    tracker = static_cast<GeneratorTracker*>( thisTracker );
-                } else if ( ITracker* childTracker =
-                                currentTracker.findChild( nameAndLocation ) ) {
-                    assert( childTracker );
-                    assert( childTracker->isGeneratorTracker() );
-                    tracker = static_cast<GeneratorTracker*>( childTracker );
-                } else {
-                    return nullptr;
-                }
+        namespace {
+            struct GeneratorTracker final : TestCaseTracking::TrackerBase,
+                                      IGeneratorTracker {
+                GeneratorBasePtr m_generator;
+
+                GeneratorTracker(
+                    TestCaseTracking::NameAndLocation&& nameAndLocation,
+                    TrackerContext& ctx,
+                    ITracker* parent ):
+                    TrackerBase( CATCH_MOVE( nameAndLocation ), ctx, parent ) {}
+
+                static GeneratorTracker*
+                acquire( TrackerContext& ctx,
+                         TestCaseTracking::NameAndLocationRef const&
+                             nameAndLocation ) {
+                    GeneratorTracker* tracker;
+
+                    ITracker& currentTracker = ctx.currentTracker();
+                    // Under specific circumstances, the generator we want
+                    // to acquire is also the current tracker. If this is
+                    // the case, we have to avoid looking through current
+                    // tracker's children, and instead return the current
+                    // tracker.
+                    // A case where this check is important is e.g.
+                    //     for (int i = 0; i < 5; ++i) {
+                    //         int n = GENERATE(1, 2);
+                    //     }
+                    //
+                    // without it, the code above creates 5 nested generators.
+                    if ( currentTracker.nameAndLocation() == nameAndLocation ) {
+                        auto thisTracker = currentTracker.parent()->findChild(
+                            nameAndLocation );
+                        assert( thisTracker );
+                        assert( thisTracker->isGeneratorTracker() );
+                        tracker = static_cast<GeneratorTracker*>( thisTracker );
+                    } else if ( ITracker* childTracker =
+                                    currentTracker.findChild(
+                                        nameAndLocation ) ) {
+                        assert( childTracker );
+                        assert( childTracker->isGeneratorTracker() );
+                        tracker =
+                            static_cast<GeneratorTracker*>( childTracker );
+                    } else {
+                        return nullptr;
+                    }
 
-                if( !tracker->isComplete() ) {
-                    tracker->open();
-                }
+                    if ( !tracker->isComplete() ) { tracker->open(); }
 
-                return tracker;
-            }
-
-            // TrackerBase interface
-            bool isGeneratorTracker() const override { return true; }
-            auto hasGenerator() const -> bool override {
-                return !!m_generator;
-            }
-            void close() override {
-                TrackerBase::close();
-                // If a generator has a child (it is followed by a section)
-                // and none of its children have started, then we must wait
-                // until later to start consuming its values.
-                // This catches cases where `GENERATE` is placed between two
-                // `SECTION`s.
-                // **The check for m_children.empty cannot be removed**.
-                // doing so would break `GENERATE` _not_ followed by `SECTION`s.
-                const bool should_wait_for_child = [&]() {
-                    // No children -> nobody to wait for
-                    if ( m_children.empty() ) {
-                        return false;
-                    }
-                    // If at least one child started executing, don't wait
-                    if ( std::find_if(
-                             m_children.begin(),
-                             m_children.end(),
-                             []( TestCaseTracking::ITrackerPtr const& tracker ) {
-                                 return tracker->hasStarted();
-                             } ) != m_children.end() ) {
-                        return false;
-                    }
+                    return tracker;
+                }
 
-                    // No children have started. We need to check if they _can_
-                    // start, and thus we should wait for them, or they cannot
-                    // start (due to filters), and we shouldn't wait for them
-                    ITracker* parent = m_parent;
-                    // This is safe: there is always at least one section
-                    // tracker in a test case tracking tree
-                    while ( !parent->isSectionTracker() ) {
-                        parent = parent->parent();
-                    }
-                    assert( parent &&
-                            "Missing root (test case) level section" );
-
-                    auto const& parentSection =
-                        static_cast<SectionTracker const&>( *parent );
-                    auto const& filters = parentSection.getFilters();
-                    // No filters -> no restrictions on running sections
-                    if ( filters.empty() ) {
-                        return true;
-                    }
+                // TrackerBase interface
+                bool isGeneratorTracker() const override { return true; }
+                auto hasGenerator() const -> bool override {
+                    return !!m_generator;
+                }
+                void close() override {
+                    TrackerBase::close();
+                    // If a generator has a child (it is followed by a section)
+                    // and none of its children have started, then we must wait
+                    // until later to start consuming its values.
+                    // This catches cases where `GENERATE` is placed between two
+                    // `SECTION`s.
+                    // **The check for m_children.empty cannot be removed**.
+                    // doing so would break `GENERATE` _not_ followed by
+                    // `SECTION`s.
+                    const bool should_wait_for_child = [&]() {
+                        // No children -> nobody to wait for
+                        if ( m_children.empty() ) { return false; }
+                        // If at least one child started executing, don't wait
+                        if ( std::find_if(
+                                 m_children.begin(),
+                                 m_children.end(),
+                                 []( TestCaseTracking::ITrackerPtr const&
+                                         tracker ) {
+                                     return tracker->hasStarted();
+                                 } ) != m_children.end() ) {
+                            return false;
+                        }
 
-                    for ( auto const& child : m_children ) {
-                        if ( child->isSectionTracker() &&
-                             std::find(
-                                 filters.begin(),
-                                 filters.end(),
-                                 static_cast<SectionTracker const&>( *child )
-                                     .trimmedName() ) != filters.end() ) {
-                            return true;
+                        // No children have started. We need to check if they
+                        // _can_ start, and thus we should wait for them, or
+                        // they cannot start (due to filters), and we shouldn't
+                        // wait for them
+                        ITracker* parent = m_parent;
+                        // This is safe: there is always at least one section
+                        // tracker in a test case tracking tree
+                        while ( !parent->isSectionTracker() ) {
+                            parent = parent->parent();
+                        }
+                        assert( parent &&
+                                "Missing root (test case) level section" );
+
+                        auto const& parentSection =
+                            static_cast<SectionTracker const&>( *parent );
+                        auto const& filters = parentSection.getFilters();
+                        // No filters -> no restrictions on running sections
+                        if ( filters.empty() ) { return true; }
+
+                        for ( auto const& child : m_children ) {
+                            if ( child->isSectionTracker() &&
+                                 std::find( filters.begin(),
+                                            filters.end(),
+                                            static_cast<SectionTracker const&>(
+                                                *child )
+                                                .trimmedName() ) !=
+                                     filters.end() ) {
+                                return true;
+                            }
                         }
+                        return false;
+                    }();
+
+                    // This check is a bit tricky, because m_generator->next()
+                    // has a side-effect, where it consumes generator's current
+                    // value, but we do not want to invoke the side-effect if
+                    // this generator is still waiting for any child to start.
+                    assert( m_generator && "Tracker without generator" );
+                    if ( should_wait_for_child ||
+                         ( m_runState == CompletedSuccessfully &&
+                           m_generator->countedNext() ) ) {
+                        m_children.clear();
+                        m_runState = Executing;
                     }
-                    return false;
-                }();
-
-                // This check is a bit tricky, because m_generator->next()
-                // has a side-effect, where it consumes generator's current
-                // value, but we do not want to invoke the side-effect if
-                // this generator is still waiting for any child to start.
-                assert( m_generator && "Tracker without generator" );
-                if ( should_wait_for_child ||
-                     ( m_runState == CompletedSuccessfully &&
-                       m_generator->countedNext() ) ) {
-                    m_children.clear();
-                    m_runState = Executing;
                 }
-            }
 
-            // IGeneratorTracker interface
-            auto getGenerator() const -> GeneratorBasePtr const& override {
-                return m_generator;
-            }
-            void setGenerator( GeneratorBasePtr&& generator ) override {
-                m_generator = CATCH_MOVE( generator );
-            }
-        };
-        GeneratorTracker::~GeneratorTracker() = default;
+                // IGeneratorTracker interface
+                auto getGenerator() const -> GeneratorBasePtr const& override {
+                    return m_generator;
+                }
+                void setGenerator( GeneratorBasePtr&& generator ) override {
+                    m_generator = CATCH_MOVE( generator );
+                }
+            };
+        } // namespace
     }
 
     RunContext::RunContext(IConfig const* _config, IEventListenerPtr&& reporter)
     :   m_runInfo(_config->name()),
-        m_context(getCurrentMutableContext()),
         m_config(_config),
         m_reporter(CATCH_MOVE(reporter)),
         m_lastAssertionInfo{ StringRef(), SourceLineInfo("",0), StringRef(), ResultDisposition::Normal },
         m_includeSuccessfulResults( m_config->includeSuccessfulResults() || m_reporter->getPreferences().shouldReportAllAssertions )
     {
-        m_context.setResultCapture(this);
+        getCurrentMutableContext().setResultCapture( this );
         m_reporter->testRunStarting(m_runInfo);
     }
 
@@ -260,7 +267,7 @@ namespace Catch {
     }
 
 
-    void RunContext::assertionEnded(AssertionResult const & result) {
+    void RunContext::assertionEnded(AssertionResult&& result) {
         if (result.getResultType() == ResultWas::Ok) {
             m_totals.assertions.passed++;
             m_lastAssertionPassed = true;
@@ -282,19 +289,27 @@ namespace Catch {
 
         m_reporter->assertionEnded(AssertionStats(result, m_messages, m_totals));
 
-        if (result.getResultType() != ResultWas::Warning)
+        if ( result.getResultType() != ResultWas::Warning ) {
             m_messageScopes.clear();
+        }
 
-        // Reset working state
-        resetAssertionInfo();
-        m_lastResult = result;
+        // Reset working state. assertion info will be reset after
+        // populateReaction is run if it is needed
+        m_lastResult = CATCH_MOVE( result );
     }
     void RunContext::resetAssertionInfo() {
         m_lastAssertionInfo.macroName = StringRef();
         m_lastAssertionInfo.capturedExpression = "{Unknown expression after the reported line}"_sr;
+        m_lastAssertionInfo.resultDisposition = ResultDisposition::Normal;
     }
 
-    bool RunContext::sectionStarted(StringRef sectionName, SourceLineInfo const& sectionLineInfo, Counts & assertions) {
+    void RunContext::notifyAssertionStarted( AssertionInfo const& info ) {
+        m_reporter->assertionStarting( info );
+    }
+
+    bool RunContext::sectionStarted( StringRef sectionName,
+                                     SourceLineInfo const& sectionLineInfo,
+                                     Counts& assertions ) {
         ITracker& sectionTracker =
             SectionTracker::acquire( m_trackerContext,
                                      TestCaseTracking::NameAndLocationRef(
@@ -432,7 +447,8 @@ namespace Catch {
         tempResult.message = static_cast<std::string>(message);
         AssertionResult result(m_lastAssertionInfo, CATCH_MOVE(tempResult));
 
-        assertionEnded(result);
+        assertionEnded(CATCH_MOVE(result) );
+        resetAssertionInfo();
 
         handleUnfinishedSections();
 
@@ -554,8 +570,6 @@ namespace Catch {
         ITransientExpression const& expr,
         AssertionReaction& reaction
     ) {
-        m_reporter->assertionStarting( info );
-
         bool negated = isFalseTest( info.resultDisposition );
         bool result = expr.getResult() != negated;
 
@@ -571,6 +585,7 @@ namespace Catch {
             reportExpr(info, ResultWas::ExpressionFailed, &expr, negated );
             populateReaction( reaction );
         }
+        resetAssertionInfo();
     }
     void RunContext::reportExpr(
             AssertionInfo const &info,
@@ -584,7 +599,7 @@ namespace Catch {
         AssertionResult assertionResult{ info, CATCH_MOVE( data ) };
         assertionResult.m_resultData.lazyExpression.m_transientExpression = expr;
 
-        assertionEnded( assertionResult );
+        assertionEnded( CATCH_MOVE(assertionResult) );
     }
 
     void RunContext::handleMessage(
@@ -593,22 +608,23 @@ namespace Catch {
             StringRef message,
             AssertionReaction& reaction
     ) {
-        m_reporter->assertionStarting( info );
-
         m_lastAssertionInfo = info;
 
         AssertionResultData data( resultType, LazyExpression( false ) );
         data.message = static_cast<std::string>(message);
         AssertionResult assertionResult{ m_lastAssertionInfo,
                                          CATCH_MOVE( data ) };
-        assertionEnded( assertionResult );
-        if ( !assertionResult.isOk() ) {
+
+        const auto isOk = assertionResult.isOk();
+        assertionEnded( CATCH_MOVE(assertionResult) );
+        if ( !isOk ) {
             populateReaction( reaction );
         } else if ( resultType == ResultWas::ExplicitSkip ) {
             // TODO: Need to handle this explicitly, as ExplicitSkip is
             // considered "OK"
             reaction.shouldSkip = true;
         }
+        resetAssertionInfo();
     }
     void RunContext::handleUnexpectedExceptionNotThrown(
             AssertionInfo const& info,
@@ -619,16 +635,17 @@ namespace Catch {
 
     void RunContext::handleUnexpectedInflightException(
             AssertionInfo const& info,
-            std::string const& message,
+            std::string&& message,
             AssertionReaction& reaction
     ) {
         m_lastAssertionInfo = info;
 
         AssertionResultData data( ResultWas::ThrewException, LazyExpression( false ) );
-        data.message = message;
+        data.message = CATCH_MOVE(message);
         AssertionResult assertionResult{ info, CATCH_MOVE(data) };
-        assertionEnded( assertionResult );
+        assertionEnded( CATCH_MOVE(assertionResult) );
         populateReaction( reaction );
+        resetAssertionInfo();
     }
 
     void RunContext::populateReaction( AssertionReaction& reaction ) {
@@ -645,7 +662,8 @@ namespace Catch {
         AssertionResultData data( ResultWas::ThrewException, LazyExpression( false ) );
         data.message = "Exception translation was disabled by CATCH_CONFIG_FAST_COMPILE"s;
         AssertionResult assertionResult{ info, CATCH_MOVE( data ) };
-        assertionEnded( assertionResult );
+        assertionEnded( CATCH_MOVE(assertionResult) );
+        resetAssertionInfo();
     }
     void RunContext::handleNonExpr(
             AssertionInfo const &info,
@@ -656,10 +674,11 @@ namespace Catch {
 
         AssertionResultData data( resultType, LazyExpression( false ) );
         AssertionResult assertionResult{ info, CATCH_MOVE( data ) };
-        assertionEnded( assertionResult );
 
-        if( !assertionResult.isOk() )
-            populateReaction( reaction );
+        const auto isOk = assertionResult.isOk();
+        assertionEnded( CATCH_MOVE(assertionResult) );
+        if ( !isOk ) { populateReaction( reaction ); }
+        resetAssertionInfo();
     }
 
 
diff --git a/external_imported/Catch2/src/catch2/internal/catch_run_context.hpp b/external_imported/Catch2/src/catch2/internal/catch_run_context.hpp
index 3928180e2..c749304d3 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_run_context.hpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_run_context.hpp
@@ -8,8 +8,9 @@
 #ifndef CATCH_RUN_CONTEXT_HPP_INCLUDED
 #define CATCH_RUN_CONTEXT_HPP_INCLUDED
 
-#include <catch2/interfaces/catch_interfaces_reporter.hpp>
+#include <catch2/interfaces/catch_interfaces_capture.hpp>
 #include <catch2/internal/catch_test_registry.hpp>
+#include <catch2/internal/catch_test_run_info.hpp>
 #include <catch2/internal/catch_fatal_condition_handler.hpp>
 #include <catch2/catch_test_case_info.hpp>
 #include <catch2/catch_message.hpp>
@@ -24,13 +25,14 @@
 
 namespace Catch {
 
-    class IMutableContext;
     class IGeneratorTracker;
     class IConfig;
+    class IEventListener;
+    using IEventListenerPtr = Detail::unique_ptr<IEventListener>;
 
     ///////////////////////////////////////////////////////////////////////////
 
-    class RunContext : public IResultCapture {
+    class RunContext final : public IResultCapture {
 
     public:
         RunContext( RunContext const& ) = delete;
@@ -59,7 +61,7 @@ namespace Catch {
                     AssertionReaction& reaction ) override;
         void handleUnexpectedInflightException
                 (   AssertionInfo const& info,
-                    std::string const& message,
+                    std::string&& message,
                     AssertionReaction& reaction ) override;
         void handleIncomplete
                 (   AssertionInfo const& info ) override;
@@ -68,6 +70,7 @@ namespace Catch {
                     ResultWas::OfType resultType,
                     AssertionReaction &reaction ) override;
 
+        void notifyAssertionStarted( AssertionInfo const& info ) override;
         bool sectionStarted( StringRef sectionName,
                              SourceLineInfo const& sectionLineInfo,
                              Counts& assertions ) override;
@@ -118,7 +121,7 @@ namespace Catch {
         void resetAssertionInfo();
         bool testForMissingAssertions( Counts& assertions );
 
-        void assertionEnded( AssertionResult const& result );
+        void assertionEnded( AssertionResult&& result );
         void reportExpr
                 (   AssertionInfo const &info,
                     ResultWas::OfType resultType,
@@ -132,7 +135,6 @@ namespace Catch {
         void handleUnfinishedSections();
 
         TestRunInfo m_runInfo;
-        IMutableContext& m_context;
         TestCaseHandle const* m_activeTestCase = nullptr;
         ITracker* m_testCaseTracker = nullptr;
         Optional<AssertionResult> m_lastResult;
diff --git a/external_imported/Catch2/src/catch2/internal/catch_section.cpp b/external_imported/Catch2/src/catch2/internal/catch_section.cpp
index 061732b1d..677c2164c 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_section.cpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_section.cpp
@@ -6,7 +6,7 @@
 
 // SPDX-License-Identifier: BSL-1.0
 #include <catch2/internal/catch_section.hpp>
-#include <catch2/internal/catch_run_context.hpp>
+#include <catch2/interfaces/catch_interfaces_capture.hpp>
 #include <catch2/internal/catch_uncaught_exceptions.hpp>
 #include <catch2/internal/catch_move_and_forward.hpp>
 
diff --git a/external_imported/Catch2/src/catch2/internal/catch_section.hpp b/external_imported/Catch2/src/catch2/internal/catch_section.hpp
index 8c1a882bb..8c894eeb8 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_section.hpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_section.hpp
@@ -9,6 +9,7 @@
 #define CATCH_SECTION_HPP_INCLUDED
 
 #include <catch2/internal/catch_compiler_capabilities.hpp>
+#include <catch2/internal/catch_config_static_analysis_support.hpp>
 #include <catch2/internal/catch_noncopyable.hpp>
 #include <catch2/catch_section_info.hpp>
 #include <catch2/catch_timer.hpp>
@@ -38,16 +39,62 @@ namespace Catch {
 
 } // end namespace Catch
 
-#define INTERNAL_CATCH_SECTION( ... ) \
-    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-    CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS \
-    if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::Section( CATCH_INTERNAL_LINEINFO, __VA_ARGS__ ) ) \
-    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-#define INTERNAL_CATCH_DYNAMIC_SECTION( ... ) \
-    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-    CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS \
-    if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, (Catch::ReusableStringStream() << __VA_ARGS__).str() ) ) \
-    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+#if !defined(CATCH_CONFIG_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT)
+#    define INTERNAL_CATCH_SECTION( ... )                                 \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION                         \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS                  \
+        if ( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME(            \
+                 catch_internal_Section ) =                               \
+                 Catch::Section( CATCH_INTERNAL_LINEINFO, __VA_ARGS__ ) ) \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+#    define INTERNAL_CATCH_DYNAMIC_SECTION( ... )                     \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION                     \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS              \
+        if ( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME(        \
+                 catch_internal_Section ) =                           \
+                 Catch::SectionInfo(                                  \
+                     CATCH_INTERNAL_LINEINFO,                         \
+                     ( Catch::ReusableStringStream() << __VA_ARGS__ ) \
+                         .str() ) )                                   \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+#else
+
+// These section definitions imply that at most one section at one level
+// will be intered (because only one section's __LINE__ can be equal to
+// the dummy `catchInternalSectionHint` variable from `TEST_CASE`).
+
+namespace Catch {
+    namespace Detail {
+        // Intentionally without linkage, as it should only be used as a dummy
+        // symbol for static analysis.
+        int GetNewSectionHint();
+    } // namespace Detail
+} // namespace Catch
+
+
+#    define INTERNAL_CATCH_SECTION( ... )                                   \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION                           \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS                    \
+        CATCH_INTERNAL_SUPPRESS_SHADOW_WARNINGS                             \
+        if ( [[maybe_unused]] const int catchInternalPreviousSectionHint =  \
+                 catchInternalSectionHint,                                  \
+             catchInternalSectionHint = Catch::Detail::GetNewSectionHint(); \
+             catchInternalPreviousSectionHint == __LINE__ )                 \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+#    define INTERNAL_CATCH_DYNAMIC_SECTION( ... )                           \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION                           \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS                    \
+        CATCH_INTERNAL_SUPPRESS_SHADOW_WARNINGS                             \
+        if ( [[maybe_unused]] const int catchInternalPreviousSectionHint =  \
+                 catchInternalSectionHint,                                  \
+             catchInternalSectionHint = Catch::Detail::GetNewSectionHint(); \
+             catchInternalPreviousSectionHint == __LINE__ )                 \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+#endif
+
 
 #endif // CATCH_SECTION_HPP_INCLUDED
diff --git a/external_imported/Catch2/src/catch2/internal/catch_sharding.hpp b/external_imported/Catch2/src/catch2/internal/catch_sharding.hpp
index d0e4cfa13..22561f4bf 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_sharding.hpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_sharding.hpp
@@ -8,8 +8,7 @@
 #ifndef CATCH_SHARDING_HPP_INCLUDED
 #define CATCH_SHARDING_HPP_INCLUDED
 
-#include <catch2/catch_session.hpp>
-
+#include <cassert>
 #include <cmath>
 #include <algorithm>
 
diff --git a/external_imported/Catch2/src/catch2/internal/catch_stream_end_stop.hpp b/external_imported/Catch2/src/catch2/internal/catch_stream_end_stop.hpp
index 61379f20d..66d678cf8 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_stream_end_stop.hpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_stream_end_stop.hpp
@@ -17,10 +17,10 @@ namespace Catch {
     // as well as
     //    << stuff +StreamEndStop
     struct StreamEndStop {
-        StringRef operator+() const { return StringRef(); }
+        constexpr StringRef operator+() const { return StringRef(); }
 
         template <typename T>
-        friend T const& operator+( T const& value, StreamEndStop ) {
+        constexpr friend T const& operator+( T const& value, StreamEndStop ) {
             return value;
         }
     };
diff --git a/external_imported/Catch2/src/catch2/internal/catch_string_manip.cpp b/external_imported/Catch2/src/catch2/internal/catch_string_manip.cpp
index cb96dd4fb..0c889ca18 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_string_manip.cpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_string_manip.cpp
@@ -8,7 +8,6 @@
 #include <catch2/internal/catch_string_manip.hpp>
 #include <catch2/internal/catch_stringref.hpp>
 
-#include <algorithm>
 #include <ostream>
 #include <cstring>
 #include <cctype>
@@ -32,9 +31,9 @@ namespace Catch {
         return s.find( infix ) != std::string::npos;
     }
     void toLowerInPlace( std::string& s ) {
-        std::transform( s.begin(), s.end(), s.begin(), []( char c ) {
-            return toLower( c );
-        } );
+        for ( char& c : s ) {
+            c = toLower( c );
+        }
     }
     std::string toLower( std::string const& s ) {
         std::string lc = s;
diff --git a/external_imported/Catch2/src/catch2/internal/catch_stringref.hpp b/external_imported/Catch2/src/catch2/internal/catch_stringref.hpp
index 99bb9a986..4b9212bfa 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_stringref.hpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_stringref.hpp
@@ -25,6 +25,8 @@ namespace Catch {
         using size_type = std::size_t;
         using const_iterator = const char*;
 
+        static constexpr size_type npos{ static_cast<size_type>( -1 ) };
+
     private:
         static constexpr char const* const s_empty = "";
 
@@ -75,7 +77,7 @@ namespace Catch {
         }
 
         // Returns a substring of [start, start + length).
-        // If start + length > size(), then the substring is [start, start + size()).
+        // If start + length > size(), then the substring is [start, size()).
         // If start > size(), then the substring is empty.
         constexpr StringRef substr(size_type start, size_type length) const noexcept {
             if (start < m_size) {
diff --git a/external_imported/Catch2/src/catch2/internal/catch_tag_alias_registry.cpp b/external_imported/Catch2/src/catch2/internal/catch_tag_alias_registry.cpp
index b7c6b9ec7..510df167f 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_tag_alias_registry.cpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_tag_alias_registry.cpp
@@ -6,14 +6,13 @@
 
 // SPDX-License-Identifier: BSL-1.0
 #include <catch2/internal/catch_tag_alias_registry.hpp>
-#include <catch2/internal/catch_console_colour.hpp>
 #include <catch2/internal/catch_enforce.hpp>
 #include <catch2/interfaces/catch_interfaces_registry_hub.hpp>
 #include <catch2/internal/catch_string_manip.hpp>
 
 namespace Catch {
 
-    TagAliasRegistry::~TagAliasRegistry() {}
+    TagAliasRegistry::~TagAliasRegistry() = default;
 
     TagAlias const* TagAliasRegistry::find( std::string const& alias ) const {
         auto it = m_registry.find( alias );
diff --git a/external_imported/Catch2/src/catch2/internal/catch_test_case_registry_impl.cpp b/external_imported/Catch2/src/catch2/internal/catch_test_case_registry_impl.cpp
index 4b3d2e471..c2b052daf 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_test_case_registry_impl.cpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_test_case_registry_impl.cpp
@@ -7,11 +7,9 @@
 // SPDX-License-Identifier: BSL-1.0
 #include <catch2/internal/catch_test_case_registry_impl.hpp>
 
-#include <catch2/internal/catch_context.hpp>
 #include <catch2/internal/catch_enforce.hpp>
+#include <catch2/interfaces/catch_interfaces_config.hpp>
 #include <catch2/interfaces/catch_interfaces_registry_hub.hpp>
-#include <catch2/internal/catch_random_number_generator.hpp>
-#include <catch2/internal/catch_run_context.hpp>
 #include <catch2/internal/catch_sharding.hpp>
 #include <catch2/catch_test_case_info.hpp>
 #include <catch2/catch_test_spec.hpp>
@@ -23,6 +21,38 @@
 
 namespace Catch {
 
+    namespace {
+        static void enforceNoDuplicateTestCases(
+            std::vector<TestCaseHandle> const& tests ) {
+            auto testInfoCmp = []( TestCaseInfo const* lhs,
+                                   TestCaseInfo const* rhs ) {
+                return *lhs < *rhs;
+            };
+            std::set<TestCaseInfo const*, decltype( testInfoCmp )&> seenTests(
+                testInfoCmp );
+            for ( auto const& test : tests ) {
+                const auto infoPtr = &test.getTestCaseInfo();
+                const auto prev = seenTests.insert( infoPtr );
+                CATCH_ENFORCE( prev.second,
+                               "error: test case \""
+                                   << infoPtr->name << "\", with tags \""
+                                   << infoPtr->tagsAsString()
+                                   << "\" already defined.\n"
+                                   << "\tFirst seen at "
+                                   << ( *prev.first )->lineInfo << "\n"
+                                   << "\tRedefined at " << infoPtr->lineInfo );
+            }
+        }
+
+        static bool matchTest( TestCaseHandle const& testCase,
+                               TestSpec const& testSpec,
+                               IConfig const& config ) {
+            return testSpec.matches( testCase.getTestCaseInfo() ) &&
+                   isThrowSafe( testCase, config );
+        }
+
+    } // end unnamed namespace
+
     std::vector<TestCaseHandle> sortTests( IConfig const& config, std::vector<TestCaseHandle> const& unsortedTestCases ) {
         switch (config.runOrder()) {
         case TestRunOrder::Declared:
@@ -40,7 +70,6 @@ namespace Catch {
             return sorted;
         }
         case TestRunOrder::Randomized: {
-            seedRng(config);
             using TestWithHash = std::pair<TestCaseInfoHasher::hash_t, TestCaseHandle>;
 
             TestCaseInfoHasher h{ config.rngSeed() };
@@ -79,29 +108,6 @@ namespace Catch {
         return !testCase.getTestCaseInfo().throws() || config.allowThrows();
     }
 
-    bool matchTest( TestCaseHandle const& testCase, TestSpec const& testSpec, IConfig const& config ) {
-        return testSpec.matches( testCase.getTestCaseInfo() ) && isThrowSafe( testCase, config );
-    }
-
-    void
-    enforceNoDuplicateTestCases( std::vector<TestCaseHandle> const& tests ) {
-        auto testInfoCmp = []( TestCaseInfo const* lhs,
-                               TestCaseInfo const* rhs ) {
-            return *lhs < *rhs;
-        };
-        std::set<TestCaseInfo const*, decltype(testInfoCmp) &> seenTests(testInfoCmp);
-        for ( auto const& test : tests ) {
-            const auto infoPtr = &test.getTestCaseInfo();
-            const auto prev = seenTests.insert( infoPtr );
-            CATCH_ENFORCE(
-                prev.second,
-                "error: test case \"" << infoPtr->name << "\", with tags \""
-                    << infoPtr->tagsAsString() << "\" already defined.\n"
-                    << "\tFirst seen at " << ( *prev.first )->lineInfo << "\n"
-                    << "\tRedefined at " << infoPtr->lineInfo );
-        }
-    }
-
     std::vector<TestCaseHandle> filterTests( std::vector<TestCaseHandle> const& testCases, TestSpec const& testSpec, IConfig const& config ) {
         std::vector<TestCaseHandle> filtered;
         filtered.reserve( testCases.size() );
@@ -142,11 +148,4 @@ namespace Catch {
         return m_sortedFunctions;
     }
 
-
-
-    ///////////////////////////////////////////////////////////////////////////
-    void TestInvokerAsFunction::invoke() const {
-        m_testAsFunction();
-    }
-
 } // end namespace Catch
diff --git a/external_imported/Catch2/src/catch2/internal/catch_test_case_registry_impl.hpp b/external_imported/Catch2/src/catch2/internal/catch_test_case_registry_impl.hpp
index 228dbb799..99a38498f 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_test_case_registry_impl.hpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_test_case_registry_impl.hpp
@@ -8,31 +8,28 @@
 #ifndef CATCH_TEST_CASE_REGISTRY_IMPL_HPP_INCLUDED
 #define CATCH_TEST_CASE_REGISTRY_IMPL_HPP_INCLUDED
 
-#include <catch2/internal/catch_test_registry.hpp>
+#include <catch2/interfaces/catch_interfaces_testcase.hpp>
 #include <catch2/interfaces/catch_interfaces_config.hpp>
+#include <catch2/internal/catch_unique_ptr.hpp>
 
 #include <vector>
 
 namespace Catch {
 
-    class TestCaseHandle;
     class IConfig;
+    class ITestInvoker;
+    class TestCaseHandle;
     class TestSpec;
 
     std::vector<TestCaseHandle> sortTests( IConfig const& config, std::vector<TestCaseHandle> const& unsortedTestCases );
 
     bool isThrowSafe( TestCaseHandle const& testCase, IConfig const& config );
-    bool matchTest( TestCaseHandle const& testCase, TestSpec const& testSpec, IConfig const& config );
-
-    void enforceNoDuplicateTestCases( std::vector<TestCaseHandle> const& functions );
 
     std::vector<TestCaseHandle> filterTests( std::vector<TestCaseHandle> const& testCases, TestSpec const& testSpec, IConfig const& config );
     std::vector<TestCaseHandle> const& getAllTestCasesSorted( IConfig const& config );
 
     class TestRegistry : public ITestCaseRegistry {
     public:
-        ~TestRegistry() override = default;
-
         void registerTest( Detail::unique_ptr<TestCaseInfo> testInfo, Detail::unique_ptr<ITestInvoker> testInvoker );
 
         std::vector<TestCaseInfo*> const& getAllInfos() const override;
@@ -53,18 +50,6 @@ namespace Catch {
 
     ///////////////////////////////////////////////////////////////////////////
 
-    class TestInvokerAsFunction final : public ITestInvoker {
-        using TestType = void(*)();
-        TestType m_testAsFunction;
-    public:
-        TestInvokerAsFunction(TestType testAsFunction) noexcept:
-            m_testAsFunction(testAsFunction) {}
-
-        void invoke() const override;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////
-
 
 } // end namespace Catch
 
diff --git a/external_imported/Catch2/src/catch2/internal/catch_test_case_tracker.hpp b/external_imported/Catch2/src/catch2/internal/catch_test_case_tracker.hpp
index beff8d6d9..50278c910 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_test_case_tracker.hpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_test_case_tracker.hpp
@@ -113,7 +113,7 @@ namespace TestCaseTracking {
 
         //! Returns true if tracker run to completion (successfully or not)
         virtual bool isComplete() const = 0;
-        //! Returns true if tracker run to completion succesfully
+        //! Returns true if tracker run to completion successfully
         bool isSuccessfullyCompleted() const {
             return m_runState == CompletedSuccessfully;
         }
diff --git a/external_imported/Catch2/src/catch2/internal/catch_test_failure_exception.cpp b/external_imported/Catch2/src/catch2/internal/catch_test_failure_exception.cpp
index c1edff3cc..8ea313131 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_test_failure_exception.cpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_test_failure_exception.cpp
@@ -20,4 +20,12 @@ namespace Catch {
 #endif
     }
 
+    void throw_test_skip_exception() {
+#if !defined( CATCH_CONFIG_DISABLE_EXCEPTIONS )
+        throw Catch::TestSkipException();
+#else
+        CATCH_ERROR( "Explicitly skipping tests during runtime requires exceptions" );
+#endif
+    }
+
 } // namespace Catch
diff --git a/external_imported/Catch2/src/catch2/internal/catch_test_failure_exception.hpp b/external_imported/Catch2/src/catch2/internal/catch_test_failure_exception.hpp
index 13c5fc082..1ef883648 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_test_failure_exception.hpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_test_failure_exception.hpp
@@ -12,6 +12,8 @@ namespace Catch {
 
     //! Used to signal that an assertion macro failed
     struct TestFailureException{};
+    //! Used to signal that the remainder of a test should be skipped
+    struct TestSkipException {};
 
     /**
      * Outlines throwing of `TestFailureException` into a single TU
@@ -20,8 +22,12 @@ namespace Catch {
      */
     [[noreturn]] void throw_test_failure_exception();
 
-    //! Used to signal that the remainder of a test should be skipped
-    struct TestSkipException{};
+    /**
+     * Outlines throwing of `TestSkipException` into a single TU
+     *
+     * Also handles `CATCH_CONFIG_DISABLE_EXCEPTIONS` for callers.
+     */
+    [[noreturn]] void throw_test_skip_exception();
 
 } // namespace Catch
 
diff --git a/external_imported/Catch2/src/catch2/internal/catch_test_macro_impl.hpp b/external_imported/Catch2/src/catch2/internal/catch_test_macro_impl.hpp
index e569680bb..59c851e8f 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_test_macro_impl.hpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_test_macro_impl.hpp
@@ -10,6 +10,7 @@
 
 #include <catch2/catch_user_config.hpp>
 #include <catch2/internal/catch_assertion_handler.hpp>
+#include <catch2/internal/catch_preprocessor_internal_stringify.hpp>
 #include <catch2/interfaces/catch_interfaces_capture.hpp>
 #include <catch2/internal/catch_stringref.hpp>
 #include <catch2/internal/catch_source_line_info.hpp>
@@ -22,12 +23,6 @@
 
 #if !defined(CATCH_CONFIG_DISABLE)
 
-#if !defined(CATCH_CONFIG_DISABLE_STRINGIFICATION)
-  #define CATCH_INTERNAL_STRINGIFY(...) #__VA_ARGS__##_catch_sr
-#else
-  #define CATCH_INTERNAL_STRINGIFY(...) "Disabled by CATCH_CONFIG_DISABLE_STRINGIFICATION"_catch_sr
-#endif
-
 #if defined(CATCH_CONFIG_FAST_COMPILE) || defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -39,7 +34,7 @@
 #else // CATCH_CONFIG_FAST_COMPILE
 
 #define INTERNAL_CATCH_TRY try
-#define INTERNAL_CATCH_CATCH( handler ) catch(...) { handler.handleUnexpectedInflightException(); }
+#define INTERNAL_CATCH_CATCH( handler ) catch(...) { (handler).handleUnexpectedInflightException(); }
 
 #endif
 
@@ -95,6 +90,7 @@
         if( catchAssertionHandler.allowThrows() ) \
             try { \
                 CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+                CATCH_INTERNAL_SUPPRESS_UNUSED_RESULT \
                 CATCH_INTERNAL_SUPPRESS_USELESS_CAST_WARNINGS \
                 static_cast<void>(__VA_ARGS__); \
                 CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
@@ -115,6 +111,7 @@
         if( catchAssertionHandler.allowThrows() ) \
             try { \
                 CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+                CATCH_INTERNAL_SUPPRESS_UNUSED_RESULT \
                 CATCH_INTERNAL_SUPPRESS_USELESS_CAST_WARNINGS \
                 static_cast<void>(expr); \
                 CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
@@ -141,6 +138,7 @@
         if( catchAssertionHandler.allowThrows() ) \
             try { \
                 CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+                CATCH_INTERNAL_SUPPRESS_UNUSED_RESULT \
                 CATCH_INTERNAL_SUPPRESS_USELESS_CAST_WARNINGS \
                 static_cast<void>(__VA_ARGS__); \
                 CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
diff --git a/external_imported/Catch2/src/catch2/internal/catch_test_registry.cpp b/external_imported/Catch2/src/catch2/internal/catch_test_registry.cpp
index 9769ed032..e9c999fec 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_test_registry.cpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_test_registry.cpp
@@ -8,7 +8,6 @@
 #include <catch2/internal/catch_test_registry.hpp>
 #include <catch2/internal/catch_compiler_capabilities.hpp>
 #include <catch2/catch_test_case_info.hpp>
-#include <catch2/internal/catch_test_case_registry_impl.hpp>
 #include <catch2/interfaces/catch_interfaces_registry_hub.hpp>
 #include <catch2/internal/catch_string_manip.hpp>
 #include <catch2/internal/catch_move_and_forward.hpp>
@@ -17,9 +16,10 @@
 #include <iterator>
 
 namespace Catch {
+    ITestInvoker::~ITestInvoker() = default;
 
     namespace {
-        StringRef extractClassName( StringRef classOrMethodName ) {
+        static StringRef extractClassName( StringRef classOrMethodName ) {
             if ( !startsWith( classOrMethodName, '&' ) ) {
                 return classOrMethodName;
             }
@@ -46,6 +46,18 @@ namespace Catch {
                 static_cast<std::size_t>( startIdx ),
                 static_cast<std::size_t>( classNameSize ) );
         }
+
+        class TestInvokerAsFunction final : public ITestInvoker {
+            using TestType = void ( * )();
+            TestType m_testAsFunction;
+
+        public:
+            TestInvokerAsFunction( TestType testAsFunction ) noexcept:
+                m_testAsFunction( testAsFunction ) {}
+
+            void invoke() const override { m_testAsFunction(); }
+        };
+
     } // namespace
 
     Detail::unique_ptr<ITestInvoker> makeTestInvoker( void(*testAsFunction)() ) {
diff --git a/external_imported/Catch2/src/catch2/internal/catch_test_registry.hpp b/external_imported/Catch2/src/catch2/internal/catch_test_registry.hpp
index f53b93c8b..7766fe111 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_test_registry.hpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_test_registry.hpp
@@ -8,9 +8,10 @@
 #ifndef CATCH_TEST_REGISTRY_HPP_INCLUDED
 #define CATCH_TEST_REGISTRY_HPP_INCLUDED
 
+#include <catch2/internal/catch_config_static_analysis_support.hpp>
 #include <catch2/internal/catch_source_line_info.hpp>
 #include <catch2/internal/catch_noncopyable.hpp>
-#include <catch2/interfaces/catch_interfaces_testcase.hpp>
+#include <catch2/interfaces/catch_interfaces_test_invoker.hpp>
 #include <catch2/internal/catch_stringref.hpp>
 #include <catch2/internal/catch_unique_ptr.hpp>
 #include <catch2/internal/catch_unique_name.hpp>
@@ -72,6 +73,9 @@ struct AutoReg : Detail::NonCopyable {
         void TestName::test()
 #endif
 
+
+#if !defined(CATCH_CONFIG_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT)
+
     ///////////////////////////////////////////////////////////////////////////////
     #define INTERNAL_CATCH_TESTCASE2( TestName, ... ) \
         static void TestName(); \
@@ -84,19 +88,40 @@ struct AutoReg : Detail::NonCopyable {
     #define INTERNAL_CATCH_TESTCASE( ... ) \
         INTERNAL_CATCH_TESTCASE2( INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEST_ ), __VA_ARGS__ )
 
-    ///////////////////////////////////////////////////////////////////////////////
-    #define INTERNAL_CATCH_METHOD_AS_TEST_CASE( QualifiedMethod, ... ) \
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS \
-        namespace {                                                           \
-        const Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( \
-            Catch::makeTestInvoker( &QualifiedMethod ),                   \
-            CATCH_INTERNAL_LINEINFO,                                      \
-            "&" #QualifiedMethod##_catch_sr,                              \
-            Catch::NameAndTags{ __VA_ARGS__ } );                          \
-    } /* NOLINT */ \
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+#else  // ^^ !CATCH_CONFIG_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT | vv CATCH_CONFIG_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT
+
+
+// Dummy registrator for the dumy test case macros
+namespace Catch {
+    namespace Detail {
+        struct DummyUse {
+            DummyUse( void ( * )( int ) );
+        };
+    } // namespace Detail
+} // namespace Catch
+
+// Note that both the presence of the argument and its exact name are
+// necessary for the section support.
+
+// We provide a shadowed variable so that a `SECTION` inside non-`TEST_CASE`
+// tests can compile. The redefined `TEST_CASE` shadows this with param.
+static int catchInternalSectionHint = 0;
+
+#    define INTERNAL_CATCH_TESTCASE2( fname )                              \
+        static void fname( int );                                          \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION                          \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS                           \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS                   \
+        static const Catch::Detail::DummyUse INTERNAL_CATCH_UNIQUE_NAME(   \
+            dummyUser )( &(fname) );                                       \
+        CATCH_INTERNAL_SUPPRESS_SHADOW_WARNINGS                            \
+        static void fname( [[maybe_unused]] int catchInternalSectionHint ) \
+            CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+#    define INTERNAL_CATCH_TESTCASE( ... ) \
+        INTERNAL_CATCH_TESTCASE2( INTERNAL_CATCH_UNIQUE_NAME( dummyFunction ) )
+
+
+#endif // CATCH_CONFIG_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT
 
     ///////////////////////////////////////////////////////////////////////////////
     #define INTERNAL_CATCH_TEST_CASE_METHOD2( TestName, ClassName, ... )\
@@ -118,6 +143,22 @@ struct AutoReg : Detail::NonCopyable {
     #define INTERNAL_CATCH_TEST_CASE_METHOD( ClassName, ... ) \
         INTERNAL_CATCH_TEST_CASE_METHOD2( INTERNAL_CATCH_UNIQUE_NAME( CATCH2_INTERNAL_TEST_ ), ClassName, __VA_ARGS__ )
 
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_METHOD_AS_TEST_CASE( QualifiedMethod, ... ) \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS \
+        namespace {                                                           \
+        const Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( \
+            Catch::makeTestInvoker( &QualifiedMethod ),                   \
+            CATCH_INTERNAL_LINEINFO,                                      \
+            "&" #QualifiedMethod##_catch_sr,                              \
+            Catch::NameAndTags{ __VA_ARGS__ } );                          \
+    } /* NOLINT */ \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+
     ///////////////////////////////////////////////////////////////////////////////
     #define INTERNAL_CATCH_REGISTER_TESTCASE( Function, ... ) \
         do { \
diff --git a/external_imported/Catch2/src/catch2/internal/catch_test_run_info.hpp b/external_imported/Catch2/src/catch2/internal/catch_test_run_info.hpp
new file mode 100644
index 000000000..90357b0af
--- /dev/null
+++ b/external_imported/Catch2/src/catch2/internal/catch_test_run_info.hpp
@@ -0,0 +1,22 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+#ifndef CATCH_TEST_RUN_INFO_HPP_INCLUDED
+#define CATCH_TEST_RUN_INFO_HPP_INCLUDED
+
+#include <catch2/internal/catch_stringref.hpp>
+
+namespace Catch {
+
+    struct TestRunInfo {
+        constexpr TestRunInfo(StringRef _name) : name(_name) {}
+        StringRef name;
+    };
+
+} // end namespace Catch
+
+#endif // CATCH_TEST_RUN_INFO_HPP_INCLUDED
diff --git a/external_imported/Catch2/src/catch2/internal/catch_textflow.cpp b/external_imported/Catch2/src/catch2/internal/catch_textflow.cpp
index 7eac97325..857fd2b9f 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_textflow.cpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_textflow.cpp
@@ -233,23 +233,36 @@ namespace Catch {
             return os;
         }
 
-        Columns Column::operator+( Column const& other ) {
+        Columns operator+(Column const& lhs, Column const& rhs) {
             Columns cols;
-            cols += *this;
-            cols += other;
+            cols += lhs;
+            cols += rhs;
             return cols;
         }
-
-        Columns& Columns::operator+=( Column const& col ) {
-            m_columns.push_back( col );
-            return *this;
+        Columns operator+(Column&& lhs, Column&& rhs) {
+            Columns cols;
+            cols += CATCH_MOVE( lhs );
+            cols += CATCH_MOVE( rhs );
+            return cols;
         }
 
-        Columns Columns::operator+( Column const& col ) {
-            Columns combined = *this;
-            combined += col;
+        Columns& operator+=(Columns& lhs, Column const& rhs) {
+            lhs.m_columns.push_back( rhs );
+            return lhs;
+        }
+        Columns& operator+=(Columns& lhs, Column&& rhs) {
+            lhs.m_columns.push_back( CATCH_MOVE(rhs) );
+            return lhs;
+        }
+        Columns operator+( Columns const& lhs, Column const& rhs ) {
+            auto combined( lhs );
+            combined += rhs;
             return combined;
         }
+        Columns operator+( Columns&& lhs, Column&& rhs ) {
+            lhs += CATCH_MOVE( rhs );
+            return CATCH_MOVE( lhs );
+        }
 
     } // namespace TextFlow
 } // namespace Catch
diff --git a/external_imported/Catch2/src/catch2/internal/catch_textflow.hpp b/external_imported/Catch2/src/catch2/internal/catch_textflow.hpp
index ceac675d5..a78451d55 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_textflow.hpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_textflow.hpp
@@ -8,8 +8,10 @@
 #ifndef CATCH_TEXTFLOW_HPP_INCLUDED
 #define CATCH_TEXTFLOW_HPP_INCLUDED
 
-#include <cassert>
 #include <catch2/internal/catch_console_width.hpp>
+#include <catch2/internal/catch_move_and_forward.hpp>
+
+#include <cassert>
 #include <string>
 #include <vector>
 
@@ -37,7 +39,7 @@ namespace Catch {
 
         public:
             /**
-             * Iterates "lines" in `Column` and return sthem
+             * Iterates "lines" in `Column` and returns them
              */
             class const_iterator {
                 friend Column;
@@ -59,7 +61,7 @@ namespace Catch {
                 // Calculates the length of the current line
                 void calcLength();
 
-                // Returns current indention width
+                // Returns current indentation width
                 size_t indentSize() const;
 
                 // Creates an indented and (optionally) suffixed string from
@@ -91,20 +93,35 @@ namespace Catch {
             using iterator = const_iterator;
 
             explicit Column( std::string const& text ): m_string( text ) {}
+            explicit Column( std::string&& text ):
+                m_string( CATCH_MOVE(text)) {}
 
-            Column& width( size_t newWidth ) {
+            Column& width( size_t newWidth ) & {
                 assert( newWidth > 0 );
                 m_width = newWidth;
                 return *this;
             }
-            Column& indent( size_t newIndent ) {
+            Column&& width( size_t newWidth ) && {
+                assert( newWidth > 0 );
+                m_width = newWidth;
+                return CATCH_MOVE( *this );
+            }
+            Column& indent( size_t newIndent ) & {
                 m_indent = newIndent;
                 return *this;
             }
-            Column& initialIndent( size_t newIndent ) {
+            Column&& indent( size_t newIndent ) && {
+                m_indent = newIndent;
+                return CATCH_MOVE( *this );
+            }
+            Column& initialIndent( size_t newIndent ) & {
                 m_initialIndent = newIndent;
                 return *this;
             }
+            Column&& initialIndent( size_t newIndent ) && {
+                m_initialIndent = newIndent;
+                return CATCH_MOVE( *this );
+            }
 
             size_t width() const { return m_width; }
             const_iterator begin() const { return const_iterator( *this ); }
@@ -113,7 +130,8 @@ namespace Catch {
             friend std::ostream& operator<<( std::ostream& os,
                                              Column const& col );
 
-            Columns operator+( Column const& other );
+            friend Columns operator+( Column const& lhs, Column const& rhs );
+            friend Columns operator+( Column&& lhs, Column&& rhs );
         };
 
         //! Creates a column that serves as an empty space of specific width
@@ -157,8 +175,10 @@ namespace Catch {
             iterator begin() const { return iterator( *this ); }
             iterator end() const { return { *this, iterator::EndTag() }; }
 
-            Columns& operator+=( Column const& col );
-            Columns operator+( Column const& col );
+            friend Columns& operator+=( Columns& lhs, Column const& rhs );
+            friend Columns& operator+=( Columns& lhs, Column&& rhs );
+            friend Columns operator+( Columns const& lhs, Column const& rhs );
+            friend Columns operator+( Columns&& lhs, Column&& rhs );
 
             friend std::ostream& operator<<( std::ostream& os,
                                              Columns const& cols );
diff --git a/external_imported/Catch2/src/catch2/internal/catch_uncaught_exceptions.cpp b/external_imported/Catch2/src/catch2/internal/catch_uncaught_exceptions.cpp
index 704d6e1ca..8cfabc0f8 100644
--- a/external_imported/Catch2/src/catch2/internal/catch_uncaught_exceptions.cpp
+++ b/external_imported/Catch2/src/catch2/internal/catch_uncaught_exceptions.cpp
@@ -7,7 +7,6 @@
 // SPDX-License-Identifier: BSL-1.0
 
 #include <catch2/internal/catch_uncaught_exceptions.hpp>
-#include <catch2/internal/catch_compiler_capabilities.hpp>
 #include <catch2/internal/catch_config_uncaught_exceptions.hpp>
 #include <catch2/catch_user_config.hpp>
 
diff --git a/external_imported/Catch2/src/catch2/internal/catch_uniform_floating_point_distribution.hpp b/external_imported/Catch2/src/catch2/internal/catch_uniform_floating_point_distribution.hpp
new file mode 100644
index 000000000..23d03b43c
--- /dev/null
+++ b/external_imported/Catch2/src/catch2/internal/catch_uniform_floating_point_distribution.hpp
@@ -0,0 +1,131 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+
+#ifndef CATCH_UNIFORM_FLOATING_POINT_DISTRIBUTION_HPP_INCLUDED
+#define CATCH_UNIFORM_FLOATING_POINT_DISTRIBUTION_HPP_INCLUDED
+
+#include <catch2/internal/catch_random_floating_point_helpers.hpp>
+#include <catch2/internal/catch_uniform_integer_distribution.hpp>
+
+#include <cmath>
+#include <type_traits>
+
+namespace Catch {
+
+    namespace Detail {
+#if defined( __GNUC__ ) || defined( __clang__ )
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+        // The issue with overflow only happens with maximal ULP and HUGE
+        // distance, e.g. when generating numbers in [-inf, inf] for given
+        // type. So we only check for the largest possible ULP in the
+        // type, and return something that does not overflow to inf in 1 mult.
+        constexpr std::uint64_t calculate_max_steps_in_one_go(double gamma) {
+            if ( gamma == 1.99584030953472e+292 ) { return 9007199254740991; }
+            return static_cast<std::uint64_t>( -1 );
+        }
+        constexpr std::uint32_t calculate_max_steps_in_one_go(float gamma) {
+            if ( gamma == 2.028241e+31f ) { return 16777215; }
+            return static_cast<std::uint32_t>( -1 );
+        }
+#if defined( __GNUC__ ) || defined( __clang__ )
+#    pragma GCC diagnostic pop
+#endif
+    }
+
+/**
+ * Implementation of uniform distribution on floating point numbers.
+ *
+ * Note that we support only `float` and `double` types, because these
+ * usually mean the same thing across different platform. `long double`
+ * varies wildly by platform and thus we cannot provide reproducible
+ * implementation. Also note that we don't implement all parts of
+ * distribution per standard: this distribution is not serializable, nor
+ * can the range be arbitrarily reset.
+ *
+ * The implementation also uses different approach than the one taken by
+ * `std::uniform_real_distribution`, where instead of generating a number
+ * between [0, 1) and then multiplying the range bounds with it, we first
+ * split the [a, b] range into a set of equidistributed floating point
+ * numbers, and then use uniform int distribution to pick which one to
+ * return.
+ *
+ * This has the advantage of guaranteeing uniformity (the multiplication
+ * method loses uniformity due to rounding when multiplying floats), except
+ * for small non-uniformity at one side of the interval, where we have
+ * to deal with the fact that not every interval is splittable into
+ * equidistributed floats.
+ *
+ * Based on "Drawing random floating-point numbers from an interval" by
+ * Frederic Goualard.
+ */
+template <typename FloatType>
+class uniform_floating_point_distribution {
+    static_assert(std::is_floating_point<FloatType>::value, "...");
+    static_assert(!std::is_same<FloatType, long double>::value,
+                  "We do not support long double due to inconsistent behaviour between platforms");
+
+    using WidthType = Detail::DistanceType<FloatType>;
+
+    FloatType m_a, m_b;
+    FloatType m_ulp_magnitude;
+    WidthType m_floats_in_range;
+    uniform_integer_distribution<WidthType> m_int_dist;
+
+    // In specific cases, we can overflow into `inf` when computing the
+    // `steps * g` offset. To avoid this, we don't offset by more than this
+    // in one multiply + addition.
+    WidthType m_max_steps_in_one_go;
+    // We don't want to do the magnitude check every call to `operator()`
+    bool m_a_has_leq_magnitude;
+
+public:
+    using result_type = FloatType;
+
+    uniform_floating_point_distribution( FloatType a, FloatType b ):
+        m_a( a ),
+        m_b( b ),
+        m_ulp_magnitude( Detail::gamma( m_a, m_b ) ),
+        m_floats_in_range( Detail::count_equidistant_floats( m_a, m_b, m_ulp_magnitude ) ),
+        m_int_dist(0, m_floats_in_range),
+        m_max_steps_in_one_go( Detail::calculate_max_steps_in_one_go(m_ulp_magnitude)),
+        m_a_has_leq_magnitude(std::fabs(m_a) <= std::fabs(m_b))
+    {
+        assert( a <= b );
+    }
+
+    template <typename Generator>
+    result_type operator()( Generator& g ) {
+        WidthType steps = m_int_dist( g );
+        if ( m_a_has_leq_magnitude ) {
+            if ( steps == m_floats_in_range ) { return m_a; }
+            auto b = m_b;
+            while (steps > m_max_steps_in_one_go) {
+                b -= m_max_steps_in_one_go * m_ulp_magnitude;
+                steps -= m_max_steps_in_one_go;
+            }
+            return b - steps * m_ulp_magnitude;
+        } else {
+            if ( steps == m_floats_in_range ) { return m_b; }
+            auto a = m_a;
+            while (steps > m_max_steps_in_one_go) {
+                a += m_max_steps_in_one_go * m_ulp_magnitude;
+                steps -= m_max_steps_in_one_go;
+            }
+            return a + steps * m_ulp_magnitude;
+        }
+    }
+
+    result_type a() const { return m_a; }
+    result_type b() const { return m_b; }
+};
+
+} // end namespace Catch
+
+#endif // CATCH_UNIFORM_FLOATING_POINT_DISTRIBUTION_HPP_INCLUDED
diff --git a/external_imported/Catch2/src/catch2/internal/catch_uniform_integer_distribution.hpp b/external_imported/Catch2/src/catch2/internal/catch_uniform_integer_distribution.hpp
new file mode 100644
index 000000000..afa2015d9
--- /dev/null
+++ b/external_imported/Catch2/src/catch2/internal/catch_uniform_integer_distribution.hpp
@@ -0,0 +1,124 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+
+#ifndef CATCH_UNIFORM_INTEGER_DISTRIBUTION_HPP_INCLUDED
+#define CATCH_UNIFORM_INTEGER_DISTRIBUTION_HPP_INCLUDED
+
+#include <catch2/internal/catch_random_integer_helpers.hpp>
+
+namespace Catch {
+
+    namespace Detail {
+        // Indirection to enable make_unsigned<bool> behaviour.
+        template <typename T>
+        struct make_unsigned {
+            using type = std::make_unsigned_t<T>;
+        };
+
+        template <>
+        struct make_unsigned<bool> {
+            using type = uint8_t;
+        };
+
+        template <typename T>
+        using make_unsigned_t = typename make_unsigned<T>::type;
+    }
+
+/**
+ * Implementation of uniform distribution on integers.
+ *
+ * Unlike `std::uniform_int_distribution`, this implementation supports
+ * various 1 byte integral types, including bool (but you should not
+ * actually use it for bools).
+ *
+ * The underlying algorithm is based on the one described in "Fast Random
+ * Integer Generation in an Interval" by Daniel Lemire, but has been
+ * optimized under the assumption of reuse of the same distribution object.
+ */
+template <typename IntegerType>
+class uniform_integer_distribution {
+    static_assert(std::is_integral<IntegerType>::value, "...");
+
+    using UnsignedIntegerType = Detail::make_unsigned_t<IntegerType>;
+
+    // Only the left bound is stored, and we store it converted to its
+    // unsigned image. This avoids having to do the conversions inside
+    // the operator(), at the cost of having to do the conversion in
+    // the a() getter. The right bound is only needed in the b() getter,
+    // so we recompute it there from other stored data.
+    UnsignedIntegerType m_a;
+
+    // How many different values are there in [a, b]. a == b => 1, can be 0 for distribution over all values in the type.
+    UnsignedIntegerType m_ab_distance;
+
+    // We hoisted this out of the main generation function. Technically,
+    // this means that using this distribution will be slower than Lemire's
+    // algorithm if this distribution instance will be used only few times,
+    // but it will be faster if it is used many times. Since Catch2 uses
+    // distributions only to implement random generators, we assume that each
+    // distribution will be reused many times and this is an optimization.
+    UnsignedIntegerType m_rejection_threshold = 0;
+
+    UnsignedIntegerType computeDistance(IntegerType a, IntegerType b) const {
+        // This overflows and returns 0 if a == 0 and b == TYPE_MAX.
+        // We handle that later when generating the number.
+        return transposeTo(b) - transposeTo(a) + 1;
+    }
+
+    static UnsignedIntegerType computeRejectionThreshold(UnsignedIntegerType ab_distance) {
+        // distance == 0 means that we will return all possible values from
+        // the type's range, and that we shouldn't reject anything.
+        if ( ab_distance == 0 ) { return 0; }
+        return ( ~ab_distance + 1 ) % ab_distance;
+    }
+
+    static UnsignedIntegerType transposeTo(IntegerType in) {
+        return Detail::transposeToNaturalOrder<IntegerType>(
+            static_cast<UnsignedIntegerType>( in ) );
+    }
+    static IntegerType transposeBack(UnsignedIntegerType in) {
+        return static_cast<IntegerType>(
+            Detail::transposeToNaturalOrder<IntegerType>(in) );
+    }
+
+public:
+    using result_type = IntegerType;
+
+    uniform_integer_distribution( IntegerType a, IntegerType b ):
+        m_a( transposeTo(a) ),
+        m_ab_distance( computeDistance(a, b) ),
+        m_rejection_threshold( computeRejectionThreshold(m_ab_distance) ) {
+        assert( a <= b );
+    }
+
+    template <typename Generator>
+    result_type operator()( Generator& g ) {
+        // All possible values of result_type are valid.
+        if ( m_ab_distance == 0 ) {
+            return transposeBack( Detail::fillBitsFrom<UnsignedIntegerType>( g ) );
+        }
+
+        auto random_number = Detail::fillBitsFrom<UnsignedIntegerType>( g );
+        auto emul = Detail::extendedMult( random_number, m_ab_distance );
+        // Unlike Lemire's algorithm we skip the ab_distance check, since
+        // we precomputed the rejection threshold, which is always tighter.
+        while (emul.lower < m_rejection_threshold) {
+            random_number = Detail::fillBitsFrom<UnsignedIntegerType>( g );
+            emul = Detail::extendedMult( random_number, m_ab_distance );
+        }
+
+        return transposeBack(m_a + emul.upper);
+    }
+
+    result_type a() const { return transposeBack(m_a); }
+    result_type b() const { return transposeBack(m_ab_distance + m_a - 1); }
+};
+
+} // end namespace Catch
+
+#endif // CATCH_UNIFORM_INTEGER_DISTRIBUTION_HPP_INCLUDED
diff --git a/external_imported/Catch2/src/catch2/matchers/catch_matchers_floating_point.cpp b/external_imported/Catch2/src/catch2/matchers/catch_matchers_floating_point.cpp
index 6e596466e..206332ef7 100644
--- a/external_imported/Catch2/src/catch2/matchers/catch_matchers_floating_point.cpp
+++ b/external_imported/Catch2/src/catch2/matchers/catch_matchers_floating_point.cpp
@@ -38,26 +38,11 @@ namespace {
         return ulpDist <= maxUlpDiff;
     }
 
-#if defined(CATCH_CONFIG_GLOBAL_NEXTAFTER)
-
-    float nextafter(float x, float y) {
-        return ::nextafterf(x, y);
-    }
-
-    double nextafter(double x, double y) {
-        return ::nextafter(x, y);
-    }
-
-#endif // ^^^ CATCH_CONFIG_GLOBAL_NEXTAFTER ^^^
 
 template <typename FP>
 FP step(FP start, FP direction, uint64_t steps) {
     for (uint64_t i = 0; i < steps; ++i) {
-#if defined(CATCH_CONFIG_GLOBAL_NEXTAFTER)
         start = Catch::nextafter(start, direction);
-#else
-        start = std::nextafter(start, direction);
-#endif
     }
     return start;
 }
diff --git a/external_imported/Catch2/src/catch2/matchers/catch_matchers_range_equals.hpp b/external_imported/Catch2/src/catch2/matchers/catch_matchers_range_equals.hpp
index ce66bed9b..95b781a43 100644
--- a/external_imported/Catch2/src/catch2/matchers/catch_matchers_range_equals.hpp
+++ b/external_imported/Catch2/src/catch2/matchers/catch_matchers_range_equals.hpp
@@ -129,7 +129,7 @@ namespace Catch {
 
         /**
          * Creates a matcher that checks if all elements in a range are equal
-         * to all elements in another range, in some permuation.
+         * to all elements in another range, in some permutation.
          *
          * Uses to provided predicate `predicate` to do the comparisons
          */
diff --git a/external_imported/Catch2/src/catch2/matchers/catch_matchers_vector.hpp b/external_imported/Catch2/src/catch2/matchers/catch_matchers_vector.hpp
index 9a4b024f6..fffbfdf63 100644
--- a/external_imported/Catch2/src/catch2/matchers/catch_matchers_vector.hpp
+++ b/external_imported/Catch2/src/catch2/matchers/catch_matchers_vector.hpp
@@ -85,11 +85,10 @@ namespace Matchers {
             // - a more general approach would be via a compare template that defaults
             // to using !=. but could be specialised for, e.g. std::vector<T> etc
             // - then just call that directly
-            if (m_comparator.size() != v.size())
-                return false;
-            for (std::size_t i = 0; i < v.size(); ++i)
-                if (m_comparator[i] != v[i])
-                    return false;
+            if ( m_comparator.size() != v.size() ) { return false; }
+            for ( std::size_t i = 0; i < v.size(); ++i ) {
+                if ( !( m_comparator[i] == v[i] ) ) { return false; }
+            }
             return true;
         }
         std::string describe() const override {
diff --git a/external_imported/Catch2/src/catch2/matchers/internal/catch_matchers_impl.hpp b/external_imported/Catch2/src/catch2/matchers/internal/catch_matchers_impl.hpp
index 12455bfe7..2ee9f0c09 100644
--- a/external_imported/Catch2/src/catch2/matchers/internal/catch_matchers_impl.hpp
+++ b/external_imported/Catch2/src/catch2/matchers/internal/catch_matchers_impl.hpp
@@ -8,9 +8,14 @@
 #ifndef CATCH_MATCHERS_IMPL_HPP_INCLUDED
 #define CATCH_MATCHERS_IMPL_HPP_INCLUDED
 
-#include <catch2/internal/catch_test_macro_impl.hpp>
+#include <catch2/internal/catch_assertion_handler.hpp>
+#include <catch2/internal/catch_source_line_info.hpp>
+#include <catch2/internal/catch_decomposer.hpp>
+#include <catch2/internal/catch_preprocessor_internal_stringify.hpp>
 #include <catch2/internal/catch_move_and_forward.hpp>
 
+#include <string>
+
 namespace Catch {
 
     template<typename ArgT, typename MatcherT>
diff --git a/external_imported/Catch2/src/catch2/meson.build b/external_imported/Catch2/src/catch2/meson.build
index 0e114065b..cc45e6419 100644
--- a/external_imported/Catch2/src/catch2/meson.build
+++ b/external_imported/Catch2/src/catch2/meson.build
@@ -18,6 +18,8 @@ configure_file(
   configuration: conf_data,
 )
 
+fs = import('fs')
+
 benchmark_headers = [
   'benchmark/catch_benchmark.hpp',
   'benchmark/catch_benchmark_all.hpp',
@@ -32,6 +34,8 @@ benchmark_headers = [
   'benchmark/catch_sample_analysis.hpp',
   'benchmark/detail/catch_analyse.hpp',
   'benchmark/detail/catch_benchmark_function.hpp',
+  'benchmark/detail/catch_benchmark_stats.hpp',
+  'benchmark/detail/catch_benchmark_stats_fwd.hpp',
   'benchmark/detail/catch_complete_invoke.hpp',
   'benchmark/detail/catch_estimate_clock.hpp',
   'benchmark/detail/catch_measure.hpp',
@@ -43,6 +47,7 @@ benchmark_headers = [
 
 benchmark_sources = files(
   'benchmark/catch_chronometer.cpp',
+  'benchmark/detail/catch_analyse.cpp',
   'benchmark/detail/catch_benchmark_function.cpp',
   'benchmark/detail/catch_run_for_at_least.cpp',
   'benchmark/detail/catch_stats.cpp',
@@ -64,8 +69,8 @@ internal_headers = [
   'interfaces/catch_interfaces_registry_hub.hpp',
   'interfaces/catch_interfaces_reporter.hpp',
   'interfaces/catch_interfaces_reporter_factory.hpp',
-  'interfaces/catch_interfaces_reporter_registry.hpp',
   'interfaces/catch_interfaces_tag_alias_registry.hpp',
+  'interfaces/catch_interfaces_test_invoker.hpp',
   'interfaces/catch_interfaces_testcase.hpp',
   'internal/catch_assertion_handler.hpp',
   'internal/catch_case_insensitive_comparisons.hpp',
@@ -76,6 +81,7 @@ internal_headers = [
   'internal/catch_compiler_capabilities.hpp',
   'internal/catch_config_android_logwrite.hpp',
   'internal/catch_config_counter.hpp',
+  'internal/catch_config_static_analysis_support.hpp',
   'internal/catch_config_uncaught_exceptions.hpp',
   'internal/catch_config_wchar.hpp',
   'internal/catch_console_colour.hpp',
@@ -94,6 +100,7 @@ internal_headers = [
   'internal/catch_getenv.hpp',
   'internal/catch_istream.hpp',
   'internal/catch_is_permutation.hpp',
+  'internal/catch_jsonwriter.hpp',
   'internal/catch_lazy_expr.hpp',
   'internal/catch_leak_detector.hpp',
   'internal/catch_list.hpp',
@@ -108,7 +115,10 @@ internal_headers = [
   'internal/catch_platform.hpp',
   'internal/catch_polyfills.hpp',
   'internal/catch_preprocessor.hpp',
+  'internal/catch_preprocessor_internal_stringify.hpp',
   'internal/catch_preprocessor_remove_parens.hpp',
+  'internal/catch_random_floating_point_helpers.hpp',
+  'internal/catch_random_integer_helpers.hpp',
   'internal/catch_random_number_generator.hpp',
   'internal/catch_random_seed_generation.hpp',
   'internal/catch_reporter_registry.hpp',
@@ -133,10 +143,13 @@ internal_headers = [
   'internal/catch_test_failure_exception.hpp',
   'internal/catch_test_macro_impl.hpp',
   'internal/catch_test_registry.hpp',
+  'internal/catch_test_run_info.hpp',
   'internal/catch_test_spec_parser.hpp',
   'internal/catch_textflow.hpp',
   'internal/catch_to_string.hpp',
   'internal/catch_uncaught_exceptions.hpp',
+  'internal/catch_uniform_floating_point_distribution.hpp',
+  'internal/catch_uniform_integer_distribution.hpp',
   'internal/catch_unique_name.hpp',
   'internal/catch_unique_ptr.hpp',
   'internal/catch_void_type.hpp',
@@ -151,6 +164,7 @@ internal_headers = [
   'matchers/catch_matchers_floating_point.hpp',
   'matchers/catch_matchers_predicate.hpp',
   'matchers/catch_matchers_quantifiers.hpp',
+  'matchers/catch_matchers_range_equals.hpp',
   'matchers/catch_matchers_string.hpp',
   'matchers/catch_matchers_templated.hpp',
   'matchers/catch_matchers_vector.hpp',
@@ -189,7 +203,6 @@ internal_sources = files(
   'interfaces/catch_interfaces_registry_hub.cpp',
   'interfaces/catch_interfaces_reporter.cpp',
   'interfaces/catch_interfaces_reporter_factory.cpp',
-  'interfaces/catch_interfaces_reporter_registry.cpp',
   'interfaces/catch_interfaces_testcase.cpp',
   'internal/catch_assertion_handler.cpp',
   'internal/catch_case_insensitive_comparisons.cpp',
@@ -208,6 +221,7 @@ internal_sources = files(
   'internal/catch_floating_point_helpers.cpp',
   'internal/catch_getenv.cpp',
   'internal/catch_istream.cpp',
+  'internal/catch_jsonwriter.cpp',
   'internal/catch_lazy_expr.cpp',
   'internal/catch_leak_detector.cpp',
   'internal/catch_list.cpp',
@@ -262,6 +276,7 @@ internal_sources = files(
   'catch_timer.cpp',
   'catch_tostring.cpp',
   'catch_totals.cpp',
+  'catch_translate_exception.cpp',
   'catch_version.cpp',
 )
 
@@ -273,6 +288,7 @@ reporter_headers = [
   'reporters/catch_reporter_cumulative_base.hpp',
   'reporters/catch_reporter_event_listener.hpp',
   'reporters/catch_reporter_helpers.hpp',
+  'reporters/catch_reporter_json.hpp',
   'reporters/catch_reporter_junit.hpp',
   'reporters/catch_reporter_multi.hpp',
   'reporters/catch_reporter_registrars.hpp',
@@ -292,6 +308,7 @@ reporter_sources = files(
   'reporters/catch_reporter_cumulative_base.cpp',
   'reporters/catch_reporter_event_listener.cpp',
   'reporters/catch_reporter_helpers.cpp',
+  'reporters/catch_reporter_json.cpp',
   'reporters/catch_reporter_junit.cpp',
   'reporters/catch_reporter_multi.cpp',
   'reporters/catch_reporter_registrars.cpp',
@@ -325,9 +342,19 @@ foreach file : headers
   install_headers(file, subdir: join_paths(include_subdir, folder))
 endforeach
 
+catch2_dependencies = []
+# Check if this is an Android NDK build.
+if ((host_machine.system() == 'android') or
+  # Check if this is an Android Termux build.
+  (host_machine.system() == 'linux' and fs.is_dir('/data/data/com.termux')))
+  log_dep = meson.get_compiler('cpp').find_library('log')
+  catch2_dependencies += log_dep
+endif
+
 catch2 = static_library(
   'Catch2',
   sources,
+  dependencies: catch2_dependencies,
   include_directories: '..',
   install: true,
 )
diff --git a/external_imported/Catch2/src/catch2/reporters/catch_reporter_automake.cpp b/external_imported/Catch2/src/catch2/reporters/catch_reporter_automake.cpp
index 993b594b8..5e506a6bc 100644
--- a/external_imported/Catch2/src/catch2/reporters/catch_reporter_automake.cpp
+++ b/external_imported/Catch2/src/catch2/reporters/catch_reporter_automake.cpp
@@ -12,7 +12,7 @@
 
 namespace Catch {
 
-    AutomakeReporter::~AutomakeReporter() {}
+    AutomakeReporter::~AutomakeReporter() = default;
 
     void AutomakeReporter::testCaseEnded(TestCaseStats const& _testCaseStats) {
         // Possible values to emit are PASS, XFAIL, SKIP, FAIL, XPASS and ERROR.
diff --git a/external_imported/Catch2/src/catch2/reporters/catch_reporter_automake.hpp b/external_imported/Catch2/src/catch2/reporters/catch_reporter_automake.hpp
index 3475a1fd4..a639428c3 100644
--- a/external_imported/Catch2/src/catch2/reporters/catch_reporter_automake.hpp
+++ b/external_imported/Catch2/src/catch2/reporters/catch_reporter_automake.hpp
@@ -8,7 +8,6 @@
 #ifndef CATCH_REPORTER_AUTOMAKE_HPP_INCLUDED
 #define CATCH_REPORTER_AUTOMAKE_HPP_INCLUDED
 
-#include <catch2/interfaces/catch_interfaces_reporter.hpp>
 #include <catch2/reporters/catch_reporter_streaming_base.hpp>
 #include <catch2/internal/catch_move_and_forward.hpp>
 
diff --git a/external_imported/Catch2/src/catch2/reporters/catch_reporter_compact.cpp b/external_imported/Catch2/src/catch2/reporters/catch_reporter_compact.cpp
index 3a9b870c4..0f855944e 100644
--- a/external_imported/Catch2/src/catch2/reporters/catch_reporter_compact.cpp
+++ b/external_imported/Catch2/src/catch2/reporters/catch_reporter_compact.cpp
@@ -171,7 +171,7 @@ class AssertionPrinter {
             return;
 
         const auto itEnd = messages.cend();
-        const auto N = static_cast<std::size_t>(std::distance(itMessage, itEnd));
+        const auto N = static_cast<std::size_t>(itEnd - itMessage);
 
         stream << colourImpl->guardColour( colour ) << " with "
                << pluralise( N, "message"_sr ) << ':';
@@ -249,6 +249,6 @@ class AssertionPrinter {
             StreamingReporterBase::testRunEnded( _testRunStats );
         }
 
-        CompactReporter::~CompactReporter() {}
+        CompactReporter::~CompactReporter() = default;
 
 } // end namespace Catch
diff --git a/external_imported/Catch2/src/catch2/reporters/catch_reporter_console.cpp b/external_imported/Catch2/src/catch2/reporters/catch_reporter_console.cpp
index a46b22cf0..f3b8b5b14 100644
--- a/external_imported/Catch2/src/catch2/reporters/catch_reporter_console.cpp
+++ b/external_imported/Catch2/src/catch2/reporters/catch_reporter_console.cpp
@@ -209,15 +209,9 @@ findMax( std::size_t& i, std::size_t& j, std::size_t& k, std::size_t& l ) {
         return l;
 }
 
-enum class Justification { Left, Right };
-
-struct ColumnInfo {
-    std::string name;
-    std::size_t width;
-    Justification justification;
-};
 struct ColumnBreak {};
 struct RowBreak {};
+struct OutputFlush {};
 
 class Duration {
     enum class Unit {
@@ -292,6 +286,14 @@ class Duration {
 };
 } // end anon namespace
 
+enum class Justification { Left, Right };
+
+struct ColumnInfo {
+    std::string name;
+    std::size_t width;
+    Justification justification;
+};
+
 class TablePrinter {
     std::ostream& m_os;
     std::vector<ColumnInfo> m_columnInfos;
@@ -314,11 +316,10 @@ class TablePrinter {
             *this << RowBreak();
 
 			TextFlow::Columns headerCols;
-			auto spacer = TextFlow::Spacer(2);
 			for (auto const& info : m_columnInfos) {
                 assert(info.width > 2);
 				headerCols += TextFlow::Column(info.name).width(info.width - 2);
-				headerCols += spacer;
+                headerCols += TextFlow::Spacer( 2 );
 			}
 			m_os << headerCols << '\n';
 
@@ -334,12 +335,12 @@ class TablePrinter {
     }
 
     template<typename T>
-    friend TablePrinter& operator << (TablePrinter& tp, T const& value) {
+    friend TablePrinter& operator<< (TablePrinter& tp, T const& value) {
         tp.m_oss << value;
         return tp;
     }
 
-    friend TablePrinter& operator << (TablePrinter& tp, ColumnBreak) {
+    friend TablePrinter& operator<< (TablePrinter& tp, ColumnBreak) {
         auto colStr = tp.m_oss.str();
         const auto strSize = colStr.size();
         tp.m_oss.str("");
@@ -361,13 +362,18 @@ class TablePrinter {
         return tp;
     }
 
-    friend TablePrinter& operator << (TablePrinter& tp, RowBreak) {
+    friend TablePrinter& operator<< (TablePrinter& tp, RowBreak) {
         if (tp.m_currentColumn > 0) {
             tp.m_os << '\n';
             tp.m_currentColumn = -1;
         }
         return tp;
     }
+
+    friend TablePrinter& operator<<(TablePrinter& tp, OutputFlush) {
+        tp.m_os << std::flush;
+        return tp;
+    }
 };
 
 ConsoleReporter::ConsoleReporter(ReporterConfig&& config):
@@ -389,7 +395,7 @@ ConsoleReporter::ConsoleReporter(ReporterConfig&& config):
                 { "benchmark name", CATCH_CONFIG_CONSOLE_WIDTH - 43, Justification::Left },
                 { "samples      mean       std dev", 14, Justification::Right },
                 { "iterations   low mean   low std dev", 14, Justification::Right },
-                { "estimated    high mean  high std dev", 14, Justification::Right }
+                { "est run time high mean  high std dev", 14, Justification::Right }
             };
         }
     }())) {}
@@ -473,8 +479,11 @@ void ConsoleReporter::benchmarkPreparing( StringRef name ) {
 void ConsoleReporter::benchmarkStarting(BenchmarkInfo const& info) {
     (*m_tablePrinter) << info.samples << ColumnBreak()
         << info.iterations << ColumnBreak();
-    if (!m_config->benchmarkNoAnalysis())
-        (*m_tablePrinter) << Duration(info.estimatedDuration) << ColumnBreak();
+    if ( !m_config->benchmarkNoAnalysis() ) {
+        ( *m_tablePrinter )
+            << Duration( info.estimatedDuration ) << ColumnBreak();
+    }
+    ( *m_tablePrinter ) << OutputFlush{};
 }
 void ConsoleReporter::benchmarkEnded(BenchmarkStats<> const& stats) {
     if (m_config->benchmarkNoAnalysis())
diff --git a/external_imported/Catch2/src/catch2/reporters/catch_reporter_cumulative_base.hpp b/external_imported/Catch2/src/catch2/reporters/catch_reporter_cumulative_base.hpp
index cdff99913..267b39fdb 100644
--- a/external_imported/Catch2/src/catch2/reporters/catch_reporter_cumulative_base.hpp
+++ b/external_imported/Catch2/src/catch2/reporters/catch_reporter_cumulative_base.hpp
@@ -8,7 +8,6 @@
 #ifndef CATCH_REPORTER_CUMULATIVE_BASE_HPP_INCLUDED
 #define CATCH_REPORTER_CUMULATIVE_BASE_HPP_INCLUDED
 
-#include <catch2/interfaces/catch_interfaces_reporter.hpp>
 #include <catch2/reporters/catch_reporter_common_base.hpp>
 #include <catch2/internal/catch_move_and_forward.hpp>
 #include <catch2/internal/catch_unique_ptr.hpp>
@@ -125,7 +124,7 @@ namespace Catch {
         void skipTest(TestCaseInfo const&) override {}
 
     protected:
-        //! Should the cumulative base store the assertion expansion for succesful assertions?
+        //! Should the cumulative base store the assertion expansion for successful assertions?
         bool m_shouldStoreSuccesfulAssertions = true;
         //! Should the cumulative base store the assertion expansion for failed assertions?
         bool m_shouldStoreFailedAssertions = true;
diff --git a/external_imported/Catch2/src/catch2/reporters/catch_reporter_json.cpp b/external_imported/Catch2/src/catch2/reporters/catch_reporter_json.cpp
new file mode 100644
index 000000000..1f0db8b0d
--- /dev/null
+++ b/external_imported/Catch2/src/catch2/reporters/catch_reporter_json.cpp
@@ -0,0 +1,372 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+//
+#include <catch2/catch_test_case_info.hpp>
+#include <catch2/catch_test_spec.hpp>
+#include <catch2/catch_version.hpp>
+#include <catch2/interfaces/catch_interfaces_config.hpp>
+#include <catch2/internal/catch_list.hpp>
+#include <catch2/internal/catch_string_manip.hpp>
+#include <catch2/reporters/catch_reporter_json.hpp>
+
+namespace Catch {
+    namespace {
+        void writeSourceInfo( JsonObjectWriter& writer,
+                              SourceLineInfo const& sourceInfo ) {
+            auto source_location_writer =
+                writer.write( "source-location"_sr ).writeObject();
+            source_location_writer.write( "filename"_sr )
+                .write( sourceInfo.file );
+            source_location_writer.write( "line"_sr ).write( sourceInfo.line );
+        }
+
+        void writeTags( JsonArrayWriter writer, std::vector<Tag> const& tags ) {
+            for ( auto const& tag : tags ) {
+                writer.write( tag.original );
+            }
+        }
+
+        void writeProperties( JsonArrayWriter writer,
+                              TestCaseInfo const& info ) {
+            if ( info.isHidden() ) { writer.write( "is-hidden"_sr ); }
+            if ( info.okToFail() ) { writer.write( "ok-to-fail"_sr ); }
+            if ( info.expectedToFail() ) {
+                writer.write( "expected-to-fail"_sr );
+            }
+            if ( info.throws() ) { writer.write( "throws"_sr ); }
+        }
+
+    } // namespace
+
+    JsonReporter::JsonReporter( ReporterConfig&& config ):
+        StreamingReporterBase{ CATCH_MOVE( config ) } {
+
+        m_preferences.shouldRedirectStdOut = true;
+        // TBD: Do we want to report all assertions? XML reporter does
+        //      not, but for machine-parseable reporters I think the answer
+        //      should be yes.
+        m_preferences.shouldReportAllAssertions = true;
+
+        m_objectWriters.emplace( m_stream );
+        m_writers.emplace( Writer::Object );
+        auto& writer = m_objectWriters.top();
+
+        writer.write( "version"_sr ).write( 1 );
+
+        {
+            auto metadata_writer = writer.write( "metadata"_sr ).writeObject();
+            metadata_writer.write( "name"_sr ).write( m_config->name() );
+            metadata_writer.write( "rng-seed"_sr ).write( m_config->rngSeed() );
+            metadata_writer.write( "catch2-version"_sr )
+                .write( libraryVersion() );
+            if ( m_config->testSpec().hasFilters() ) {
+                metadata_writer.write( "filters"_sr )
+                    .write( m_config->testSpec() );
+            }
+        }
+    }
+
+    JsonReporter::~JsonReporter() {
+        endListing();
+        // TODO: Ensure this closes the top level object, add asserts
+        assert( m_writers.size() == 1 && "Only the top level object should be open" );
+        assert( m_writers.top() == Writer::Object );
+        endObject();
+        m_stream << '\n' << std::flush;
+        assert( m_writers.empty() );
+    }
+
+    JsonArrayWriter& JsonReporter::startArray() {
+        m_arrayWriters.emplace( m_arrayWriters.top().writeArray() );
+        m_writers.emplace( Writer::Array );
+        return m_arrayWriters.top();
+    }
+    JsonArrayWriter& JsonReporter::startArray( StringRef key ) {
+        m_arrayWriters.emplace(
+            m_objectWriters.top().write( key ).writeArray() );
+        m_writers.emplace( Writer::Array );
+        return m_arrayWriters.top();
+    }
+
+    JsonObjectWriter& JsonReporter::startObject() {
+        m_objectWriters.emplace( m_arrayWriters.top().writeObject() );
+        m_writers.emplace( Writer::Object );
+        return m_objectWriters.top();
+    }
+    JsonObjectWriter& JsonReporter::startObject( StringRef key ) {
+        m_objectWriters.emplace(
+            m_objectWriters.top().write( key ).writeObject() );
+        m_writers.emplace( Writer::Object );
+        return m_objectWriters.top();
+    }
+
+    void JsonReporter::endObject() {
+        assert( isInside( Writer::Object ) );
+        m_objectWriters.pop();
+        m_writers.pop();
+    }
+    void JsonReporter::endArray() {
+        assert( isInside( Writer::Array ) );
+        m_arrayWriters.pop();
+        m_writers.pop();
+    }
+
+    bool JsonReporter::isInside( Writer writer ) {
+        return !m_writers.empty() && m_writers.top() == writer;
+    }
+
+    void JsonReporter::startListing() {
+        if ( !m_startedListing ) { startObject( "listings"_sr ); }
+        m_startedListing = true;
+    }
+    void JsonReporter::endListing() {
+        if ( m_startedListing ) { endObject(); }
+        m_startedListing = false;
+    }
+
+    std::string JsonReporter::getDescription() {
+        return "Outputs listings as JSON. Test listing is Work-in-Progress!";
+    }
+
+    void JsonReporter::testRunStarting( TestRunInfo const& testInfo ) {
+        StreamingReporterBase::testRunStarting( testInfo );
+        endListing();
+
+        assert( isInside( Writer::Object ) );
+        startObject( "test-run"_sr );
+        startArray( "test-cases"_sr );
+    }
+
+     static void writeCounts( JsonObjectWriter&& writer, Counts const& counts ) {
+        writer.write( "passed"_sr ).write( counts.passed );
+        writer.write( "failed"_sr ).write( counts.failed );
+        writer.write( "fail-but-ok"_sr ).write( counts.failedButOk );
+        writer.write( "skipped"_sr ).write( counts.skipped );
+    }
+
+    void JsonReporter::testRunEnded(TestRunStats const& runStats) {
+        assert( isInside( Writer::Array ) );
+        // End "test-cases"
+        endArray();
+
+        {
+            auto totals =
+                m_objectWriters.top().write( "totals"_sr ).writeObject();
+            writeCounts( totals.write( "assertions"_sr ).writeObject(),
+                         runStats.totals.assertions );
+            writeCounts( totals.write( "test-cases"_sr ).writeObject(),
+                         runStats.totals.testCases );
+        }
+
+        // End the "test-run" object
+        endObject();
+    }
+
+    void JsonReporter::testCaseStarting( TestCaseInfo const& tcInfo ) {
+        StreamingReporterBase::testCaseStarting( tcInfo );
+
+        assert( isInside( Writer::Array ) &&
+                "We should be in the 'test-cases' array" );
+        startObject();
+        // "test-info" prelude
+        {
+            auto testInfo =
+                m_objectWriters.top().write( "test-info"_sr ).writeObject();
+            // TODO: handle testName vs className!!
+            testInfo.write( "name"_sr ).write( tcInfo.name );
+            writeSourceInfo(testInfo, tcInfo.lineInfo);
+            writeTags( testInfo.write( "tags"_sr ).writeArray(), tcInfo.tags );
+            writeProperties( testInfo.write( "properties"_sr ).writeArray(),
+                             tcInfo );
+        }
+
+
+        // Start the array for individual test runs (testCasePartial pairs)
+        startArray( "runs"_sr );
+    }
+
+    void JsonReporter::testCaseEnded( TestCaseStats const& tcStats ) {
+        StreamingReporterBase::testCaseEnded( tcStats );
+
+        // We need to close the 'runs' array before finishing the test case
+        assert( isInside( Writer::Array ) );
+        endArray();
+
+        {
+            auto totals =
+                m_objectWriters.top().write( "totals"_sr ).writeObject();
+            writeCounts( totals.write( "assertions"_sr ).writeObject(),
+                         tcStats.totals.assertions );
+            // We do not write the test case totals, because there will always be just one test case here.
+            // TODO: overall "result" -> success, skip, fail here? Or in partial result?
+        }
+        // We do not write out stderr/stdout, because we instead wrote those out in partial runs
+
+        // TODO: aborting?
+
+        // And we also close this test case's object
+        assert( isInside( Writer::Object ) );
+        endObject();
+    }
+
+    void JsonReporter::testCasePartialStarting( TestCaseInfo const& /*tcInfo*/,
+                                                uint64_t index ) {
+        startObject();
+        m_objectWriters.top().write( "run-idx"_sr ).write( index );
+        startArray( "path"_sr );
+        // TODO: we want to delay most of the printing to the 'root' section
+        // TODO: childSection key name?
+    }
+
+    void JsonReporter::testCasePartialEnded( TestCaseStats const& tcStats,
+                                             uint64_t /*index*/ ) {
+        // Fixme: the top level section handles this.
+        //// path object
+        endArray();
+        if ( !tcStats.stdOut.empty() ) {
+            m_objectWriters.top()
+                .write( "captured-stdout"_sr )
+                .write( tcStats.stdOut );
+        }
+        if ( !tcStats.stdErr.empty() ) {
+            m_objectWriters.top()
+                .write( "captured-stderr"_sr )
+                .write( tcStats.stdErr );
+        }
+        {
+            auto totals =
+                m_objectWriters.top().write( "totals"_sr ).writeObject();
+            writeCounts( totals.write( "assertions"_sr ).writeObject(),
+                         tcStats.totals.assertions );
+            // We do not write the test case totals, because there will
+            // always be just one test case here.
+            // TODO: overall "result" -> success, skip, fail here? Or in
+            // partial result?
+        }
+        // TODO: aborting?
+        // run object
+        endObject();
+    }
+
+    void JsonReporter::sectionStarting( SectionInfo const& sectionInfo ) {
+        assert( isInside( Writer::Array ) &&
+                "Section should always start inside an object" );
+        // We want to nest top level sections, even though it shares name
+        // and source loc with the TEST_CASE
+        auto& sectionObject = startObject();
+        sectionObject.write( "kind"_sr ).write( "section"_sr );
+        sectionObject.write( "name"_sr ).write( sectionInfo.name );
+        writeSourceInfo( m_objectWriters.top(), sectionInfo.lineInfo );
+
+
+        // TBD: Do we want to create this event lazily? It would become
+        //      rather complex, but we could do it, and it would look
+        //      better for empty sections. OTOH, empty sections should
+        //      be rare.
+        startArray( "path"_sr );
+    }
+    void JsonReporter::sectionEnded( SectionStats const& /*sectionStats */) {
+        // End the subpath array
+        endArray();
+        // TODO: metadata
+        // TODO: what info do we have here?
+
+        // End the section object
+        endObject();
+    }
+
+    void JsonReporter::assertionStarting( AssertionInfo const& /*assertionInfo*/ ) {}
+    void JsonReporter::assertionEnded( AssertionStats const& assertionStats ) {
+        // TODO: There is lot of different things to handle here, but
+        //       we can fill it in later, after we show that the basic
+        //       outline and streaming reporter impl works well enough.
+        //if ( !m_config->includeSuccessfulResults()
+        //    && assertionStats.assertionResult.isOk() ) {
+        //    return;
+        //}
+        assert( isInside( Writer::Array ) );
+        auto assertionObject = m_arrayWriters.top().writeObject();
+
+        assertionObject.write( "kind"_sr ).write( "assertion"_sr );
+        writeSourceInfo( assertionObject,
+                         assertionStats.assertionResult.getSourceInfo() );
+        assertionObject.write( "status"_sr )
+            .write( assertionStats.assertionResult.isOk() );
+        // TODO: handling of result.
+        // TODO: messages
+        // TODO: totals?
+    }
+
+
+    void JsonReporter::benchmarkPreparing( StringRef name ) { (void)name; }
+    void JsonReporter::benchmarkStarting( BenchmarkInfo const& ) {}
+    void JsonReporter::benchmarkEnded( BenchmarkStats<> const& ) {}
+    void JsonReporter::benchmarkFailed( StringRef error ) { (void)error; }
+
+    void JsonReporter::listReporters(
+        std::vector<ReporterDescription> const& descriptions ) {
+        startListing();
+
+        auto writer =
+            m_objectWriters.top().write( "reporters"_sr ).writeArray();
+        for ( auto const& desc : descriptions ) {
+            auto desc_writer = writer.writeObject();
+            desc_writer.write( "name"_sr ).write( desc.name );
+            desc_writer.write( "description"_sr ).write( desc.description );
+        }
+    }
+    void JsonReporter::listListeners(
+        std::vector<ListenerDescription> const& descriptions ) {
+        startListing();
+
+        auto writer =
+            m_objectWriters.top().write( "listeners"_sr ).writeArray();
+
+        for ( auto const& desc : descriptions ) {
+            auto desc_writer = writer.writeObject();
+            desc_writer.write( "name"_sr ).write( desc.name );
+            desc_writer.write( "description"_sr ).write( desc.description );
+        }
+    }
+    void JsonReporter::listTests( std::vector<TestCaseHandle> const& tests ) {
+        startListing();
+
+        auto writer = m_objectWriters.top().write( "tests"_sr ).writeArray();
+
+        for ( auto const& test : tests ) {
+            auto desc_writer = writer.writeObject();
+            auto const& info = test.getTestCaseInfo();
+
+            desc_writer.write( "name"_sr ).write( info.name );
+            desc_writer.write( "class-name"_sr ).write( info.className );
+            {
+                auto tag_writer = desc_writer.write( "tags"_sr ).writeArray();
+                for ( auto const& tag : info.tags ) {
+                    tag_writer.write( tag.original );
+                }
+            }
+            writeSourceInfo( desc_writer, info.lineInfo );
+        }
+    }
+    void JsonReporter::listTags( std::vector<TagInfo> const& tags ) {
+        startListing();
+
+        auto writer = m_objectWriters.top().write( "tags"_sr ).writeArray();
+        for ( auto const& tag : tags ) {
+            auto tag_writer = writer.writeObject();
+            {
+                auto aliases_writer =
+                    tag_writer.write( "aliases"_sr ).writeArray();
+                for ( auto alias : tag.spellings ) {
+                    aliases_writer.write( alias );
+                }
+            }
+            tag_writer.write( "count"_sr ).write( tag.count );
+        }
+    }
+} // namespace Catch
diff --git a/external_imported/Catch2/src/catch2/reporters/catch_reporter_json.hpp b/external_imported/Catch2/src/catch2/reporters/catch_reporter_json.hpp
new file mode 100644
index 000000000..c938ca394
--- /dev/null
+++ b/external_imported/Catch2/src/catch2/reporters/catch_reporter_json.hpp
@@ -0,0 +1,95 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+
+#ifndef CATCH_REPORTER_JSON_HPP_INCLUDED
+#define CATCH_REPORTER_JSON_HPP_INCLUDED
+
+#include <catch2/catch_timer.hpp>
+#include <catch2/internal/catch_jsonwriter.hpp>
+#include <catch2/reporters/catch_reporter_streaming_base.hpp>
+
+#include <stack>
+
+namespace Catch {
+    class JsonReporter : public StreamingReporterBase {
+    public:
+        JsonReporter( ReporterConfig&& config );
+
+        ~JsonReporter() override;
+
+        static std::string getDescription();
+
+    public: // StreamingReporterBase
+        void testRunStarting( TestRunInfo const& runInfo ) override;
+        void testRunEnded( TestRunStats const& runStats ) override;
+
+        void testCaseStarting( TestCaseInfo const& tcInfo ) override;
+        void testCaseEnded( TestCaseStats const& tcStats ) override;
+
+        void testCasePartialStarting( TestCaseInfo const& tcInfo,
+                                      uint64_t index ) override;
+        void testCasePartialEnded( TestCaseStats const& tcStats,
+                                   uint64_t index ) override;
+
+        void sectionStarting( SectionInfo const& sectionInfo ) override;
+        void sectionEnded( SectionStats const& sectionStats ) override;
+
+        void assertionStarting( AssertionInfo const& assertionInfo ) override;
+        void assertionEnded( AssertionStats const& assertionStats ) override;
+
+        //void testRunEndedCumulative() override;
+
+        void benchmarkPreparing( StringRef name ) override;
+        void benchmarkStarting( BenchmarkInfo const& ) override;
+        void benchmarkEnded( BenchmarkStats<> const& ) override;
+        void benchmarkFailed( StringRef error ) override;
+
+        void listReporters(
+            std::vector<ReporterDescription> const& descriptions ) override;
+        void listListeners(
+            std::vector<ListenerDescription> const& descriptions ) override;
+        void listTests( std::vector<TestCaseHandle> const& tests ) override;
+        void listTags( std::vector<TagInfo> const& tags ) override;
+
+    private:
+        Timer m_testCaseTimer;
+        enum class Writer {
+            Object,
+            Array
+        };
+
+        JsonArrayWriter& startArray();
+        JsonArrayWriter& startArray( StringRef key );
+
+        JsonObjectWriter& startObject();
+        JsonObjectWriter& startObject( StringRef key );
+
+        void endObject();
+        void endArray();
+
+        bool isInside( Writer writer );
+
+        void startListing();
+        void endListing();
+
+        // Invariant:
+        // When m_writers is not empty and its top element is
+        // - Writer::Object, then m_objectWriters is not be empty
+        // - Writer::Array,  then m_arrayWriters shall not be empty
+        std::stack<JsonObjectWriter> m_objectWriters{};
+        std::stack<JsonArrayWriter> m_arrayWriters{};
+        std::stack<Writer> m_writers{};
+
+        bool m_startedListing = false;
+
+        // std::size_t m_sectionDepth = 0;
+        // std::size_t m_sectionStarted = 0;
+    };
+} // namespace Catch
+
+#endif // CATCH_REPORTER_JSON_HPP_INCLUDED
diff --git a/external_imported/Catch2/src/catch2/reporters/catch_reporter_junit.cpp b/external_imported/Catch2/src/catch2/reporters/catch_reporter_junit.cpp
index 22d6526fa..fc5cae34a 100644
--- a/external_imported/Catch2/src/catch2/reporters/catch_reporter_junit.cpp
+++ b/external_imported/Catch2/src/catch2/reporters/catch_reporter_junit.cpp
@@ -33,6 +33,8 @@ namespace Catch {
             gmtime_s(&timeInfo, &rawtime);
 #elif defined (CATCH_PLATFORM_PLAYSTATION)
             gmtime_s(&rawtime, &timeInfo);
+#elif defined (__IAR_SYSTEMS_ICC__)
+            timeInfo = *std::gmtime(&rawtime);
 #else
             gmtime_r(&rawtime, &timeInfo);
 #endif
@@ -293,7 +295,7 @@ namespace Catch {
                 }
             }
 
-            if( !result.getMessage().empty() )
+            if( result.hasMessage() )
                 rss << result.getMessage() << '\n';
             for( auto const& msg : stats.infoMessages )
                 if( msg.type == ResultWas::Info )
diff --git a/external_imported/Catch2/src/catch2/reporters/catch_reporter_junit.hpp b/external_imported/Catch2/src/catch2/reporters/catch_reporter_junit.hpp
index 87c7c5679..7cb53c25b 100644
--- a/external_imported/Catch2/src/catch2/reporters/catch_reporter_junit.hpp
+++ b/external_imported/Catch2/src/catch2/reporters/catch_reporter_junit.hpp
@@ -19,8 +19,6 @@ namespace Catch {
     public:
         JunitReporter(ReporterConfig&& _config);
 
-        ~JunitReporter() override = default;
-
         static std::string getDescription();
 
         void testRunStarting(TestRunInfo const& runInfo) override;
diff --git a/external_imported/Catch2/src/catch2/reporters/catch_reporter_multi.cpp b/external_imported/Catch2/src/catch2/reporters/catch_reporter_multi.cpp
index ebf28b64f..531902bea 100644
--- a/external_imported/Catch2/src/catch2/reporters/catch_reporter_multi.cpp
+++ b/external_imported/Catch2/src/catch2/reporters/catch_reporter_multi.cpp
@@ -114,7 +114,6 @@ namespace Catch {
         }
     }
 
-    // The return value indicates if the messages buffer should be cleared:
     void MultiReporter::assertionEnded( AssertionStats const& assertionStats ) {
         const bool reportByDefault =
             assertionStats.assertionResult.getResultType() != ResultWas::Ok ||
diff --git a/external_imported/Catch2/src/catch2/reporters/catch_reporter_registrars.cpp b/external_imported/Catch2/src/catch2/reporters/catch_reporter_registrars.cpp
index a9787ce58..2a3ac9579 100644
--- a/external_imported/Catch2/src/catch2/reporters/catch_reporter_registrars.cpp
+++ b/external_imported/Catch2/src/catch2/reporters/catch_reporter_registrars.cpp
@@ -8,6 +8,7 @@
 
 #include <catch2/reporters/catch_reporter_registrars.hpp>
 
+#include <catch2/interfaces/catch_interfaces_registry_hub.hpp>
 #include <catch2/internal/catch_compiler_capabilities.hpp>
 
 namespace Catch {
@@ -26,5 +27,10 @@ namespace Catch {
             }
         }
 
+        void registerListenerImpl( Detail::unique_ptr<EventListenerFactory> listenerFactory ) {
+            getMutableRegistryHub().registerListener( CATCH_MOVE(listenerFactory) );
+        }
+
+
     } // namespace Detail
 } // namespace Catch
diff --git a/external_imported/Catch2/src/catch2/reporters/catch_reporter_registrars.hpp b/external_imported/Catch2/src/catch2/reporters/catch_reporter_registrars.hpp
index db5688f25..a93963f06 100644
--- a/external_imported/Catch2/src/catch2/reporters/catch_reporter_registrars.hpp
+++ b/external_imported/Catch2/src/catch2/reporters/catch_reporter_registrars.hpp
@@ -8,8 +8,6 @@
 #ifndef CATCH_REPORTER_REGISTRARS_HPP_INCLUDED
 #define CATCH_REPORTER_REGISTRARS_HPP_INCLUDED
 
-#include <catch2/interfaces/catch_interfaces_registry_hub.hpp>
-#include <catch2/interfaces/catch_interfaces_reporter.hpp>
 #include <catch2/interfaces/catch_interfaces_reporter_factory.hpp>
 #include <catch2/internal/catch_compiler_capabilities.hpp>
 #include <catch2/internal/catch_unique_name.hpp>
@@ -36,7 +34,8 @@ namespace Catch {
         //! independent on the reporter's concrete type
         void registerReporterImpl( std::string const& name,
                                    IReporterFactoryPtr reporterPtr );
-
+        //! Actually registers the factory, independent on listener's concrete type
+        void registerListenerImpl( Detail::unique_ptr<EventListenerFactory> listenerFactory );
     } // namespace Detail
 
     class IEventListener;
@@ -97,7 +96,7 @@ namespace Catch {
 
     public:
         ListenerRegistrar(StringRef listenerName) {
-            getMutableRegistryHub().registerListener( Detail::make_unique<TypedListenerFactory>(listenerName) );
+            registerListenerImpl( Detail::make_unique<TypedListenerFactory>(listenerName) );
         }
     };
 }
diff --git a/external_imported/Catch2/src/catch2/reporters/catch_reporter_sonarqube.cpp b/external_imported/Catch2/src/catch2/reporters/catch_reporter_sonarqube.cpp
index dd002b611..9c391b1f4 100644
--- a/external_imported/Catch2/src/catch2/reporters/catch_reporter_sonarqube.cpp
+++ b/external_imported/Catch2/src/catch2/reporters/catch_reporter_sonarqube.cpp
@@ -147,7 +147,7 @@ namespace Catch {
                 }
             }
 
-            if (!result.getMessage().empty())
+            if (result.hasMessage())
                 textRss << result.getMessage() << '\n';
 
             for (auto const& msg : stats.infoMessages)
diff --git a/external_imported/Catch2/src/catch2/reporters/catch_reporter_sonarqube.hpp b/external_imported/Catch2/src/catch2/reporters/catch_reporter_sonarqube.hpp
index cad6deec8..d26af62e8 100644
--- a/external_imported/Catch2/src/catch2/reporters/catch_reporter_sonarqube.hpp
+++ b/external_imported/Catch2/src/catch2/reporters/catch_reporter_sonarqube.hpp
@@ -25,8 +25,6 @@ namespace Catch {
             m_shouldStoreSuccesfulAssertions = false;
         }
 
-        ~SonarQubeReporter() override = default;
-
         static std::string getDescription() {
             using namespace std::string_literals;
             return "Reports test results in the Generic Test Data SonarQube XML format"s;
diff --git a/external_imported/Catch2/src/catch2/reporters/catch_reporter_streaming_base.hpp b/external_imported/Catch2/src/catch2/reporters/catch_reporter_streaming_base.hpp
index 13672a285..5448000c7 100644
--- a/external_imported/Catch2/src/catch2/reporters/catch_reporter_streaming_base.hpp
+++ b/external_imported/Catch2/src/catch2/reporters/catch_reporter_streaming_base.hpp
@@ -8,7 +8,6 @@
 #ifndef CATCH_REPORTER_STREAMING_BASE_HPP_INCLUDED
 #define CATCH_REPORTER_STREAMING_BASE_HPP_INCLUDED
 
-#include <catch2/interfaces/catch_interfaces_reporter.hpp>
 #include <catch2/reporters/catch_reporter_common_base.hpp>
 #include <catch2/internal/catch_move_and_forward.hpp>
 
diff --git a/external_imported/Catch2/src/catch2/reporters/catch_reporter_tap.cpp b/external_imported/Catch2/src/catch2/reporters/catch_reporter_tap.cpp
index 563d6fb1b..67d406fb8 100644
--- a/external_imported/Catch2/src/catch2/reporters/catch_reporter_tap.cpp
+++ b/external_imported/Catch2/src/catch2/reporters/catch_reporter_tap.cpp
@@ -14,7 +14,6 @@
 #include <catch2/reporters/catch_reporter_helpers.hpp>
 
 #include <algorithm>
-#include <iterator>
 #include <ostream>
 
 namespace Catch {
@@ -165,7 +164,7 @@ namespace Catch {
 
                 // using messages.end() directly (or auto) yields compilation error:
                 std::vector<MessageInfo>::const_iterator itEnd = messages.end();
-                const std::size_t N = static_cast<std::size_t>(std::distance(itMessage, itEnd));
+                const std::size_t N = static_cast<std::size_t>(itEnd - itMessage);
 
                 stream << colourImpl->guardColour( colour ) << " with "
                        << pluralise( N, "message"_sr ) << ':';
diff --git a/external_imported/Catch2/src/catch2/reporters/catch_reporter_tap.hpp b/external_imported/Catch2/src/catch2/reporters/catch_reporter_tap.hpp
index fe45df63e..e6889bb11 100644
--- a/external_imported/Catch2/src/catch2/reporters/catch_reporter_tap.hpp
+++ b/external_imported/Catch2/src/catch2/reporters/catch_reporter_tap.hpp
@@ -19,7 +19,6 @@ namespace Catch {
             StreamingReporterBase( CATCH_MOVE(config) ) {
             m_preferences.shouldReportAllAssertions = true;
         }
-        ~TAPReporter() override = default;
 
         static std::string getDescription() {
             using namespace std::string_literals;
diff --git a/external_imported/Catch2/src/catch2/reporters/catch_reporter_teamcity.cpp b/external_imported/Catch2/src/catch2/reporters/catch_reporter_teamcity.cpp
index 320728007..38aa55a65 100644
--- a/external_imported/Catch2/src/catch2/reporters/catch_reporter_teamcity.cpp
+++ b/external_imported/Catch2/src/catch2/reporters/catch_reporter_teamcity.cpp
@@ -45,7 +45,7 @@ namespace Catch {
     } // end anonymous namespace
 
 
-    TeamCityReporter::~TeamCityReporter() {}
+    TeamCityReporter::~TeamCityReporter() = default;
 
     void TeamCityReporter::testRunStarting( TestRunInfo const& runInfo ) {
         m_stream << "##teamcity[testSuiteStarted name='" << escape( runInfo.name )
diff --git a/external_imported/Catch2/src/catch2/reporters/catch_reporter_xml.cpp b/external_imported/Catch2/src/catch2/reporters/catch_reporter_xml.cpp
index 13812b927..35a3028ee 100644
--- a/external_imported/Catch2/src/catch2/reporters/catch_reporter_xml.cpp
+++ b/external_imported/Catch2/src/catch2/reporters/catch_reporter_xml.cpp
@@ -56,7 +56,7 @@ namespace Catch {
         m_xml.startElement("Catch2TestRun")
              .writeAttribute("name"_sr, m_config->name())
              .writeAttribute("rng-seed"_sr, m_config->rngSeed())
-             .writeAttribute("xml-format-version"_sr, 2)
+             .writeAttribute("xml-format-version"_sr, 3)
              .writeAttribute("catch2-version"_sr, libraryVersion());
         if ( m_config->testSpec().hasFilters() ) {
             m_xml.writeAttribute( "filters"_sr, m_config->testSpec() );
@@ -98,11 +98,13 @@ namespace Catch {
             // Print any info messages in <Info> tags.
             for( auto const& msg : assertionStats.infoMessages ) {
                 if( msg.type == ResultWas::Info && includeResults ) {
-                    m_xml.scopedElement( "Info" )
-                            .writeText( msg.message );
+                    auto t = m_xml.scopedElement( "Info" );
+                    writeSourceInfo( msg.lineInfo );
+                    t.writeText( msg.message );
                 } else if ( msg.type == ResultWas::Warning ) {
-                    m_xml.scopedElement( "Warning" )
-                            .writeText( msg.message );
+                    auto t = m_xml.scopedElement( "Warning" );
+                    writeSourceInfo( msg.lineInfo );
+                    t.writeText( msg.message );
                 }
             }
         }
@@ -232,26 +234,23 @@ namespace Catch {
     }
 
     void XmlReporter::benchmarkEnded(BenchmarkStats<> const& benchmarkStats) {
-        m_xml.startElement("mean")
+        m_xml.scopedElement("mean")
             .writeAttribute("value"_sr, benchmarkStats.mean.point.count())
             .writeAttribute("lowerBound"_sr, benchmarkStats.mean.lower_bound.count())
             .writeAttribute("upperBound"_sr, benchmarkStats.mean.upper_bound.count())
             .writeAttribute("ci"_sr, benchmarkStats.mean.confidence_interval);
-        m_xml.endElement();
-        m_xml.startElement("standardDeviation")
+        m_xml.scopedElement("standardDeviation")
             .writeAttribute("value"_sr, benchmarkStats.standardDeviation.point.count())
             .writeAttribute("lowerBound"_sr, benchmarkStats.standardDeviation.lower_bound.count())
             .writeAttribute("upperBound"_sr, benchmarkStats.standardDeviation.upper_bound.count())
             .writeAttribute("ci"_sr, benchmarkStats.standardDeviation.confidence_interval);
-        m_xml.endElement();
-        m_xml.startElement("outliers")
+        m_xml.scopedElement("outliers")
             .writeAttribute("variance"_sr, benchmarkStats.outlierVariance)
             .writeAttribute("lowMild"_sr, benchmarkStats.outliers.low_mild)
             .writeAttribute("lowSevere"_sr, benchmarkStats.outliers.low_severe)
             .writeAttribute("highMild"_sr, benchmarkStats.outliers.high_mild)
             .writeAttribute("highSevere"_sr, benchmarkStats.outliers.high_severe);
         m_xml.endElement();
-        m_xml.endElement();
     }
 
     void XmlReporter::benchmarkFailed(StringRef error) {
diff --git a/external_imported/Catch2/src/catch2/reporters/catch_reporters_all.hpp b/external_imported/Catch2/src/catch2/reporters/catch_reporters_all.hpp
index 16f7bd70c..5c713fe14 100644
--- a/external_imported/Catch2/src/catch2/reporters/catch_reporters_all.hpp
+++ b/external_imported/Catch2/src/catch2/reporters/catch_reporters_all.hpp
@@ -28,6 +28,7 @@
 #include <catch2/reporters/catch_reporter_cumulative_base.hpp>
 #include <catch2/reporters/catch_reporter_event_listener.hpp>
 #include <catch2/reporters/catch_reporter_helpers.hpp>
+#include <catch2/reporters/catch_reporter_json.hpp>
 #include <catch2/reporters/catch_reporter_junit.hpp>
 #include <catch2/reporters/catch_reporter_multi.hpp>
 #include <catch2/reporters/catch_reporter_registrars.hpp>
diff --git a/external_imported/Catch2/tests/CMakeLists.txt b/external_imported/Catch2/tests/CMakeLists.txt
index 7be57abec..d3ab14a7f 100644
--- a/external_imported/Catch2/tests/CMakeLists.txt
+++ b/external_imported/Catch2/tests/CMakeLists.txt
@@ -78,6 +78,7 @@ endif(MSVC) #Temporary workaround
 set(TEST_SOURCES
         ${SELF_TEST_DIR}/TestRegistrations.cpp
         ${SELF_TEST_DIR}/IntrospectiveTests/Algorithms.tests.cpp
+        ${SELF_TEST_DIR}/IntrospectiveTests/AssertionHandler.tests.cpp
         ${SELF_TEST_DIR}/IntrospectiveTests/Clara.tests.cpp
         ${SELF_TEST_DIR}/IntrospectiveTests/CmdLine.tests.cpp
         ${SELF_TEST_DIR}/IntrospectiveTests/CmdLineHelpers.tests.cpp
@@ -85,7 +86,9 @@ set(TEST_SOURCES
         ${SELF_TEST_DIR}/IntrospectiveTests/Details.tests.cpp
         ${SELF_TEST_DIR}/IntrospectiveTests/FloatingPoint.tests.cpp
         ${SELF_TEST_DIR}/IntrospectiveTests/GeneratorsImpl.tests.cpp
+        ${SELF_TEST_DIR}/IntrospectiveTests/Integer.tests.cpp
         ${SELF_TEST_DIR}/IntrospectiveTests/InternalBenchmark.tests.cpp
+        ${SELF_TEST_DIR}/IntrospectiveTests/Json.tests.cpp
         ${SELF_TEST_DIR}/IntrospectiveTests/Parse.tests.cpp
         ${SELF_TEST_DIR}/IntrospectiveTests/PartTracker.tests.cpp
         ${SELF_TEST_DIR}/IntrospectiveTests/RandomNumberGeneration.tests.cpp
@@ -622,6 +625,18 @@ if (CATCH_ENABLE_CONFIGURE_TESTS)
     endforeach()
 endif()
 
+if (CATCH_ENABLE_CMAKE_HELPER_TESTS)
+    add_test(NAME "CMakeHelper::DiscoverTests"
+      COMMAND
+        "${PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_LIST_DIR}/TestScripts/DiscoverTests/VerifyRegistration.py" "${CATCH_DIR}" "${CMAKE_CURRENT_BINARY_DIR}"
+    )
+    set_tests_properties("CMakeHelper::DiscoverTests"
+      PROPERTIES
+        COST 240
+        LABELS "uses-python"
+    )
+endif()
+
 foreach (reporterName # "Automake" - the simple .trs format does not support any kind of comments/metadata
                       "compact"
                       "console"
@@ -629,7 +644,8 @@ foreach (reporterName # "Automake" - the simple .trs format does not support any
                       "SonarQube"
                       "TAP"
                       # "TeamCity" - does not seem to support test suite-level metadata/comments
-                      "XML")
+                      "XML"
+                      "JSON")
 
     add_test(NAME "Reporters:Filters:${reporterName}"
       COMMAND
@@ -639,6 +655,8 @@ foreach (reporterName # "Automake" - the simple .trs format does not support any
     # Different regex for these two reporters, because the commas end up xml-escaped
     if (reporterName MATCHES "JUnit|XML")
       set(testCaseNameFormat "&quot;CaseInsensitiveLess is case insensitive&quot;")
+    elseif(reporterName MATCHES "JSON")
+      set(testCaseNameFormat "\\\\\"CaseInsensitiveLess is case insensitive\\\\\"")
     else()
       set(testCaseNameFormat "\"CaseInsensitiveLess is case insensitive\"")
     endif()
diff --git a/external_imported/Catch2/tests/ExtraTests/CMakeLists.txt b/external_imported/Catch2/tests/ExtraTests/CMakeLists.txt
index 4172d7a03..2a810e258 100644
--- a/external_imported/Catch2/tests/ExtraTests/CMakeLists.txt
+++ b/external_imported/Catch2/tests/ExtraTests/CMakeLists.txt
@@ -468,6 +468,17 @@ set_tests_properties(
 )
 
 
+add_executable(AssertionStartingEventGoesBeforeAssertionIsEvaluated
+  X20-AssertionStartingEventGoesBeforeAssertionIsEvaluated.cpp
+)
+target_link_libraries(AssertionStartingEventGoesBeforeAssertionIsEvaluated
+  PRIVATE Catch2::Catch2WithMain
+)
+add_test(
+  NAME ReporterEvents::AssertionStartingHappensBeforeAssertionIsEvaluated
+  COMMAND $<TARGET_FILE:AssertionStartingEventGoesBeforeAssertionIsEvaluated>
+)
+
 #add_executable(DebugBreakMacros ${TESTS_DIR}/X12-CustomDebugBreakMacro.cpp)
 #target_link_libraries(DebugBreakMacros Catch2)
 #add_test(NAME DebugBreakMacros COMMAND DebugBreakMacros --break)
diff --git a/external_imported/Catch2/tests/ExtraTests/X20-AssertionStartingEventGoesBeforeAssertionIsEvaluated.cpp b/external_imported/Catch2/tests/ExtraTests/X20-AssertionStartingEventGoesBeforeAssertionIsEvaluated.cpp
new file mode 100644
index 000000000..6f44bf691
--- /dev/null
+++ b/external_imported/Catch2/tests/ExtraTests/X20-AssertionStartingEventGoesBeforeAssertionIsEvaluated.cpp
@@ -0,0 +1,77 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+
+/**\file
+ * Registers an event listener to increments counter of assertionStarting events.
+ *
+ * Different assertion macros then check that the counter is at expected
+ * value when they are evaluated.
+ */
+
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/reporters/catch_reporter_event_listener.hpp>
+#include <catch2/reporters/catch_reporter_registrars.hpp>
+#include <catch2/matchers/catch_matchers_predicate.hpp>
+
+namespace {
+
+    static size_t assertion_starting_events_seen = 0;
+
+    class AssertionStartingListener : public Catch::EventListenerBase {
+    public:
+        AssertionStartingListener( Catch::IConfig const* config ):
+            EventListenerBase( config ) {}
+
+        void assertionStarting( Catch::AssertionInfo const& ) override {
+            ++assertion_starting_events_seen;
+        }
+    };
+
+    static bool f1() {
+        return assertion_starting_events_seen == 1;
+    }
+
+    static void f2() {
+        if ( assertion_starting_events_seen != 2 ) { throw 1; }
+    }
+
+    static void f3() {
+        if ( assertion_starting_events_seen == 3 ) { throw 1; }
+    }
+
+    static bool f4() { return assertion_starting_events_seen == 4; }
+
+    static void f5() { throw assertion_starting_events_seen; }
+
+} // anonymous namespace
+
+CATCH_REGISTER_LISTENER( AssertionStartingListener )
+
+TEST_CASE() {
+    // **IMPORTANT**
+    // The order of assertions below matters.
+    REQUIRE( f1() );
+    REQUIRE_NOTHROW( f2() );
+    REQUIRE_THROWS( f3() );
+    REQUIRE_THAT( f4(),
+                  Catch::Matchers::Predicate<bool>( []( bool b ) { return b; } ) );
+    REQUIRE_THROWS_MATCHES(
+        f5(), size_t, Catch::Matchers::Predicate<size_t>( []( size_t i ) {
+            return i == 5;
+        } ) );
+
+    CAPTURE( assertion_starting_events_seen ); // **not** an assertion
+    INFO( "some info msg" );                   // **not** an assertion
+    WARN( "warning! warning!" );               // assertion-like message
+    SUCCEED();                                 // assertion-like message
+
+    // We skip FAIL/SKIP and so on, which fail the test.
+
+    // This require will also increment the count once
+    REQUIRE( assertion_starting_events_seen == 8 );
+}
diff --git a/external_imported/Catch2/tests/SelfTest/Baselines/automake.sw.approved.txt b/external_imported/Catch2/tests/SelfTest/Baselines/automake.sw.approved.txt
index d33effddf..88c23e173 100644
--- a/external_imported/Catch2/tests/SelfTest/Baselines/automake.sw.approved.txt
+++ b/external_imported/Catch2/tests/SelfTest/Baselines/automake.sw.approved.txt
@@ -130,8 +130,8 @@ Nor would this
 :test-result: FAIL Custom std-exceptions can be custom translated
 :test-result: PASS Default scale is invisible to comparison
 :test-result: PASS Directly creating an EnumInfo
+:test-result: SKIP Empty generators can SKIP in constructor
 :test-result: PASS Empty stream name opens cout stream
-:test-result: PASS Empty tag is not allowed
 :test-result: FAIL EndsWith string matcher
 :test-result: PASS Enums can quickly have stringification enabled using REGISTER_ENUM
 :test-result: PASS Enums in namespaces can quickly have stringification enabled using REGISTER_ENUM
@@ -154,6 +154,7 @@ Nor would this
 :test-result: PASS Filter generator throws exception for empty generator
 :test-result: PASS Floating point matchers: double
 :test-result: PASS Floating point matchers: float
+:test-result: PASS GENERATE can combine literals and generators
 :test-result: PASS Generators -- adapters
 :test-result: PASS Generators -- simple
 :test-result: PASS Generators internals
@@ -162,12 +163,16 @@ Nor would this
 :test-result: PASS Hashers with same seed produce same hash
 :test-result: PASS Hashing different test cases produces different result
 :test-result: PASS Hashing test case produces same hash across multiple calls
+:test-result: FAIL INFO and UNSCOPED_INFO can stream multiple arguments
 :test-result: FAIL INFO and WARN do not abort tests
 :test-result: FAIL INFO gets logged on failure
 :test-result: FAIL INFO gets logged on failure, even if captured before successful assertions
 :test-result: FAIL INFO is reset for each loop
+:test-result: XFAIL Incomplete AssertionHandler
 :test-result: XFAIL Inequality checks that should fail
 :test-result: PASS Inequality checks that should succeed
+:test-result: PASS JsonWriter
+:test-result: PASS JsonWriter escapes charaters in strings properly
 :test-result: PASS Lambdas in assertions
 :test-result: PASS Less-than inequalities with different epsilons
 :test-result: PASS ManuallyRegistered
@@ -265,6 +270,8 @@ Message from section two
 :test-result: PASS Testing checked-if
 :test-result: XFAIL Testing checked-if 2
 :test-result: XFAIL Testing checked-if 3
+:test-result: XFAIL Testing checked-if 4
+:test-result: XFAIL Testing checked-if 5
 :test-result: FAIL The NO_FAIL macro reports a failure but does not fail the test
 :test-result: PASS The default listing implementation write to provided stream
 :test-result: FAIL This test 'should' fail but doesn't
@@ -408,6 +415,7 @@ b1!
 :test-result: PASS tuple<string,string>
 :test-result: PASS tuple<tuple<int>,tuple<>,float>
 :test-result: PASS uniform samples
+:test-result: PASS uniform_integer_distribution can return the bounds
 :test-result: PASS unique_ptr reimplementation: basic functionality
 :test-result: PASS vec<vec<string,alloc>> -> toString
 :test-result: PASS vector<bool> -> toString
diff --git a/external_imported/Catch2/tests/SelfTest/Baselines/automake.sw.multi.approved.txt b/external_imported/Catch2/tests/SelfTest/Baselines/automake.sw.multi.approved.txt
index f698f0c57..a37b1a2b5 100644
--- a/external_imported/Catch2/tests/SelfTest/Baselines/automake.sw.multi.approved.txt
+++ b/external_imported/Catch2/tests/SelfTest/Baselines/automake.sw.multi.approved.txt
@@ -128,8 +128,8 @@
 :test-result: FAIL Custom std-exceptions can be custom translated
 :test-result: PASS Default scale is invisible to comparison
 :test-result: PASS Directly creating an EnumInfo
+:test-result: SKIP Empty generators can SKIP in constructor
 :test-result: PASS Empty stream name opens cout stream
-:test-result: PASS Empty tag is not allowed
 :test-result: FAIL EndsWith string matcher
 :test-result: PASS Enums can quickly have stringification enabled using REGISTER_ENUM
 :test-result: PASS Enums in namespaces can quickly have stringification enabled using REGISTER_ENUM
@@ -152,6 +152,7 @@
 :test-result: PASS Filter generator throws exception for empty generator
 :test-result: PASS Floating point matchers: double
 :test-result: PASS Floating point matchers: float
+:test-result: PASS GENERATE can combine literals and generators
 :test-result: PASS Generators -- adapters
 :test-result: PASS Generators -- simple
 :test-result: PASS Generators internals
@@ -160,12 +161,16 @@
 :test-result: PASS Hashers with same seed produce same hash
 :test-result: PASS Hashing different test cases produces different result
 :test-result: PASS Hashing test case produces same hash across multiple calls
+:test-result: FAIL INFO and UNSCOPED_INFO can stream multiple arguments
 :test-result: FAIL INFO and WARN do not abort tests
 :test-result: FAIL INFO gets logged on failure
 :test-result: FAIL INFO gets logged on failure, even if captured before successful assertions
 :test-result: FAIL INFO is reset for each loop
+:test-result: XFAIL Incomplete AssertionHandler
 :test-result: XFAIL Inequality checks that should fail
 :test-result: PASS Inequality checks that should succeed
+:test-result: PASS JsonWriter
+:test-result: PASS JsonWriter escapes charaters in strings properly
 :test-result: PASS Lambdas in assertions
 :test-result: PASS Less-than inequalities with different epsilons
 :test-result: PASS ManuallyRegistered
@@ -258,6 +263,8 @@
 :test-result: PASS Testing checked-if
 :test-result: XFAIL Testing checked-if 2
 :test-result: XFAIL Testing checked-if 3
+:test-result: XFAIL Testing checked-if 4
+:test-result: XFAIL Testing checked-if 5
 :test-result: FAIL The NO_FAIL macro reports a failure but does not fail the test
 :test-result: PASS The default listing implementation write to provided stream
 :test-result: FAIL This test 'should' fail but doesn't
@@ -397,6 +404,7 @@
 :test-result: PASS tuple<string,string>
 :test-result: PASS tuple<tuple<int>,tuple<>,float>
 :test-result: PASS uniform samples
+:test-result: PASS uniform_integer_distribution can return the bounds
 :test-result: PASS unique_ptr reimplementation: basic functionality
 :test-result: PASS vec<vec<string,alloc>> -> toString
 :test-result: PASS vector<bool> -> toString
diff --git a/external_imported/Catch2/tests/SelfTest/Baselines/compact.sw.approved.txt b/external_imported/Catch2/tests/SelfTest/Baselines/compact.sw.approved.txt
index 541770ccc..0669fdbbb 100644
--- a/external_imported/Catch2/tests/SelfTest/Baselines/compact.sw.approved.txt
+++ b/external_imported/Catch2/tests/SelfTest/Baselines/compact.sw.approved.txt
@@ -331,7 +331,7 @@ MatchersRanges.tests.cpp:<line number>: passed: inner_lists_are_empty.front(), I
 MatchersRanges.tests.cpp:<line number>: passed: has_empty{}, !IsEmpty() for: {?} not is empty
 MatchersRanges.tests.cpp:<line number>: passed: unrelated::ADL_empty{}, IsEmpty() for: {?} is empty
 Message.tests.cpp:<line number>: passed: with 7 messages: 'a := 1' and 'b := 2' and 'c := 3' and 'a + b := 3' and 'a+b := 3' and 'c > b := true' and 'a == 1 := true'
-Message.tests.cpp:<line number>: passed: with 7 messages: 'std::vector<int>{1, 2, 3}[0, 1, 2] := 3' and 'std::vector<int>{1, 2, 3}[(0, 1)] := 2' and 'std::vector<int>{1, 2, 3}[0] := 1' and '(helper_1436<int, int>{12, -12}) := { 12, -12 }' and '(helper_1436<int, int>(-12, 12)) := { -12, 12 }' and '(1, 2) := 2' and '(2, 3) := 3'
+Message.tests.cpp:<line number>: passed: with 7 messages: 'custom_index_op<int>{1, 2, 3}[0, 1, 2] := 0' and 'custom_index_op<int>{1, 2, 3}[(0, 1)] := 0' and 'custom_index_op<int>{1, 2, 3}[0] := 0' and '(helper_1436<int, int>{12, -12}) := { 12, -12 }' and '(helper_1436<int, int>(-12, 12)) := { -12, 12 }' and '(1, 2) := 2' and '(2, 3) := 3'
 Message.tests.cpp:<line number>: passed: with 11 messages: '("comma, in string", "escaped, \", ") := "escaped, ", "' and '"single quote in string,'," := "single quote in string,',"' and '"some escapes, \\,\\\\" := "some escapes, \,\\"' and '"some, ), unmatched, } prenheses {[<" := "some, ), unmatched, } prenheses {[<"' and ''"' := '"'' and ''\'' := '''' and '',' := ','' and ''}' := '}'' and '')' := ')'' and ''(' := '('' and ''{' := '{''
 ToStringGeneral.tests.cpp:<line number>: passed: true with 1 message: 'i := 2'
 ToStringGeneral.tests.cpp:<line number>: passed: true with 1 message: '3'
@@ -520,8 +520,8 @@ ToString.tests.cpp:<line number>: passed: enumInfo->lookup(1) == "Value2" for: V
 ToString.tests.cpp:<line number>: passed: enumInfo->lookup(3) == "{** unexpected enum value **}" for: {** unexpected enum value **}
 ==
 "{** unexpected enum value **}"
+Skip.tests.cpp:<line number>: skipped: 'This generator is empty'
 Stream.tests.cpp:<line number>: passed: Catch::makeStream( "" )->isConsole() for: true
-Tag.tests.cpp:<line number>: passed: Catch::TestCaseInfo( "", { "fake test name", "[]" }, dummySourceLineInfo )
 Matchers.tests.cpp:<line number>: failed: testStringForMatching(), EndsWith( "Substring" ) for: "this string contains 'abc' as a substring" ends with: "Substring"
 Matchers.tests.cpp:<line number>: failed: testStringForMatching(), EndsWith( "this", Catch::CaseSensitive::No ) for: "this string contains 'abc' as a substring" ends with: "this" (case insensitive)
 EnumToString.tests.cpp:<line number>: passed: stringify( EnumClass3::Value1 ) == "Value1" for: "Value1" == "Value1"
@@ -666,6 +666,10 @@ Matchers.tests.cpp:<line number>: passed: 1., !IsNaN() for: 1.0 not is NaN
 Generators.tests.cpp:<line number>: passed: i % 2 == 0 for: 0 == 0
 Generators.tests.cpp:<line number>: passed: i % 2 == 0 for: 0 == 0
 Generators.tests.cpp:<line number>: passed: i % 2 == 0 for: 0 == 0
+Generators.tests.cpp:<line number>: passed: i % 2 == 0 for: 0 == 0
+Generators.tests.cpp:<line number>: passed: i % 2 == 0 for: 0 == 0
+Generators.tests.cpp:<line number>: passed: i % 2 == 0 for: 0 == 0
+Generators.tests.cpp:<line number>: passed: i % 2 == 0 for: 0 == 0
 Generators.tests.cpp:<line number>: passed: filter([] (int) {return false; }, value(1)), Catch::GeneratorException
 Generators.tests.cpp:<line number>: passed: i < 4 for: 1 < 4
 Generators.tests.cpp:<line number>: passed: i < 4 for: 2 < 4
@@ -944,6 +948,7 @@ TestCaseInfoHasher.tests.cpp:<line number>: passed: h( dummy1 ) != h( dummy2 ) f
 TestCaseInfoHasher.tests.cpp:<line number>: passed: h( dummy ) == h( dummy ) for: 3422778688 (0x<hex digits>)
 ==
 3422778688 (0x<hex digits>)
+Message.tests.cpp:<line number>: failed: explicitly with 3 messages: 'This info has multiple parts.' and 'This unscoped info has multiple parts.' and 'Show infos!'
 Message.tests.cpp:<line number>: warning: 'this is a message' with 1 message: 'this is a warning'
 Message.tests.cpp:<line number>: failed: a == 1 for: 2 == 1 with 2 messages: 'this message should be logged' and 'so should this'
 Message.tests.cpp:<line number>: passed: a == 2 for: 2 == 2 with 1 message: 'this message may be logged later'
@@ -961,6 +966,7 @@ Message.tests.cpp:<line number>: passed: i < 10 for: 7 < 10 with 2 messages: 'cu
 Message.tests.cpp:<line number>: passed: i < 10 for: 8 < 10 with 2 messages: 'current counter 8' and 'i := 8'
 Message.tests.cpp:<line number>: passed: i < 10 for: 9 < 10 with 2 messages: 'current counter 9' and 'i := 9'
 Message.tests.cpp:<line number>: failed: i < 10 for: 10 < 10 with 2 messages: 'current counter 10' and 'i := 10'
+AssertionHandler.tests.cpp:<line number>: failed: unexpected exception with message: 'Exception translation was disabled by CATCH_CONFIG_FAST_COMPILE'; expression was: Dummy
 Condition.tests.cpp:<line number>: failed: data.int_seven != 7 for: 7 != 7
 Condition.tests.cpp:<line number>: failed: data.float_nine_point_one != Approx( 9.1f ) for: 9.1f != Approx( 9.1000003815 )
 Condition.tests.cpp:<line number>: failed: data.double_pi != Approx( 3.1415926535 ) for: 3.1415926535 != Approx( 3.1415926535 )
@@ -977,6 +983,91 @@ Condition.tests.cpp:<line number>: passed: data.str_hello != "goodbye" for: "hel
 Condition.tests.cpp:<line number>: passed: data.str_hello != "hell" for: "hello" != "hell"
 Condition.tests.cpp:<line number>: passed: data.str_hello != "hello1" for: "hello" != "hello1"
 Condition.tests.cpp:<line number>: passed: data.str_hello.size() != 6 for: 5 != 6
+Json.tests.cpp:<line number>: passed: stream.str() == "" for: "" == ""
+Json.tests.cpp:<line number>: passed: stream.str() == "{\n}" for: "{
+}"
+==
+"{
+}"
+Json.tests.cpp:<line number>: passed: stream.str(), ContainsSubstring( "\"int\": 1," ) && ContainsSubstring( "\"double\": 1.5," ) && ContainsSubstring( "\"true\": true," ) && ContainsSubstring( "\"false\": false," ) && ContainsSubstring( "\"string\": \"this is a string\"," ) && ContainsSubstring( "\"array\": [\n    1,\n    2\n  ]\n}" ) for: "{
+  "int": 1,
+  "double": 1.5,
+  "true": true,
+  "false": false,
+  "string": "this is a string",
+  "array": [
+    1,
+    2
+  ]
+}" ( contains: ""int": 1," and contains: ""double": 1.5," and contains: ""true": true," and contains: ""false": false," and contains: ""string": "this is a string"," and contains: ""array": [
+    1,
+    2
+  ]
+}" )
+Json.tests.cpp:<line number>: passed: stream.str(), ContainsSubstring( "\"empty_object\": {\n  }," ) && ContainsSubstring( "\"fully_object\": {\n    \"key\": 1\n  }" ) for: "{
+  "empty_object": {
+  },
+  "fully_object": {
+    "key": 1
+  }
+}" ( contains: ""empty_object": {
+  }," and contains: ""fully_object": {
+    "key": 1
+  }" )
+Json.tests.cpp:<line number>: passed: stream.str() == "[\n]" for: "[
+]"
+==
+"[
+]"
+Json.tests.cpp:<line number>: passed: stream.str() == "[\n  1,\n  1.5,\n  true,\n  false,\n  \"this is a string\",\n  {\n    \"object\": 42\n  },\n  [\n    \"array\",\n    42.5\n  ]\n]" for: "[
+  1,
+  1.5,
+  true,
+  false,
+  "this is a string",
+  {
+    "object": 42
+  },
+  [
+    "array",
+    42.5
+  ]
+]"
+==
+"[
+  1,
+  1.5,
+  true,
+  false,
+  "this is a string",
+  {
+    "object": 42
+  },
+  [
+    "array",
+    42.5
+  ]
+]"
+Json.tests.cpp:<line number>: passed: stream.str() == "{\n}" for: "{
+}"
+==
+"{
+}"
+Json.tests.cpp:<line number>: passed: stream.str() == "[\n]" for: "[
+]"
+==
+"[
+]"
+Json.tests.cpp:<line number>: passed: stream.str() == "\"custom\"" for: ""custom"" == ""custom""
+Json.tests.cpp:<line number>: passed: sstream.str() == "\"\\\"\"" for: ""\""" == ""\"""
+Json.tests.cpp:<line number>: passed: sstream.str() == "\"\\\\\"" for: ""\\"" == ""\\""
+Json.tests.cpp:<line number>: passed: sstream.str() == "\"/\"" for: ""/"" == ""/""
+Json.tests.cpp:<line number>: passed: sstream.str() == "\"\\b\"" for: ""\b"" == ""\b""
+Json.tests.cpp:<line number>: passed: sstream.str() == "\"\\f\"" for: ""\f"" == ""\f""
+Json.tests.cpp:<line number>: passed: sstream.str() == "\"\\n\"" for: ""\n"" == ""\n""
+Json.tests.cpp:<line number>: passed: sstream.str() == "\"\\r\"" for: ""\r"" == ""\r""
+Json.tests.cpp:<line number>: passed: sstream.str() == "\"\\t\"" for: ""\t"" == ""\t""
+Json.tests.cpp:<line number>: passed: sstream.str() == "\"\\\\/\\t\\r\\n\"" for: ""\\/\t\r\n"" == ""\\/\t\r\n""
 Compilation.tests.cpp:<line number>: passed: []() { return true; }() for: true
 Approx.tests.cpp:<line number>: passed: d <= Approx( 1.24 ) for: 1.23 <= Approx( 1.24 )
 Approx.tests.cpp:<line number>: passed: d <= Approx( 1.23 ) for: 1.23 <= Approx( 1.23 )
@@ -1341,6 +1432,60 @@ Reporters.tests.cpp:<line number>: passed: listingString, ContainsSubstring( "fa
 
 " ( contains: "fake test name" and contains: "fakeTestTag" ) with 1 message: 'Tested reporter: console'
 Reporters.tests.cpp:<line number>: passed: !(factories.empty()) for: !false
+Reporters.tests.cpp:<line number>: passed: listingString, ContainsSubstring("fakeTag"s) for: "{
+  "version": 1,
+  "metadata": {
+    "name": "",
+    "rng-seed": 1234,
+    "catch2-version": "<version>"
+  },
+  "listings": {
+    "tags": [
+      {
+        "aliases": [
+          "fakeTag"
+        ],
+        "count": 1
+      }
+    ]" contains: "fakeTag" with 1 message: 'Tested reporter: JSON'
+Reporters.tests.cpp:<line number>: passed: !(factories.empty()) for: !false
+Reporters.tests.cpp:<line number>: passed: listingString, ContainsSubstring("fake reporter"s) for: "{
+  "version": 1,
+  "metadata": {
+    "name": "",
+    "rng-seed": 1234,
+    "catch2-version": "<version>"
+  },
+  "listings": {
+    "reporters": [
+      {
+        "name": "fake reporter",
+        "description": "fake description"
+      }
+    ]" contains: "fake reporter" with 1 message: 'Tested reporter: JSON'
+Reporters.tests.cpp:<line number>: passed: !(factories.empty()) for: !false
+Reporters.tests.cpp:<line number>: passed: listingString, ContainsSubstring( "fake test name"s ) && ContainsSubstring( "fakeTestTag"s ) for: "{
+  "version": 1,
+  "metadata": {
+    "name": "",
+    "rng-seed": 1234,
+    "catch2-version": "<version>"
+  },
+  "listings": {
+    "tests": [
+      {
+        "name": "fake test name",
+        "class-name": "",
+        "tags": [
+          "fakeTestTag"
+        ],
+        "source-location": {
+          "filename": "fake-file.cpp",
+          "line": 123456789
+        }
+      }
+    ]" ( contains: "fake test name" and contains: "fakeTestTag" ) with 1 message: 'Tested reporter: JSON'
+Reporters.tests.cpp:<line number>: passed: !(factories.empty()) for: !false
 Reporters.tests.cpp:<line number>: passed: listingString, ContainsSubstring("fakeTag"s) for: "<?xml version="1.0" encoding="UTF-8"?>
 All available tags:
    1  [fakeTag]
@@ -1750,6 +1895,10 @@ Misc.tests.cpp:<line number>: passed: true
 Misc.tests.cpp:<line number>: failed: explicitly
 Misc.tests.cpp:<line number>: failed - but was ok: false
 Misc.tests.cpp:<line number>: failed: explicitly
+Misc.tests.cpp:<line number>: passed: true
+Misc.tests.cpp:<line number>: failed: unexpected exception with message: 'Uncaught exception should fail!'; expression was: {Unknown expression after the reported line}
+Misc.tests.cpp:<line number>: failed - but was ok: false
+Misc.tests.cpp:<line number>: failed: unexpected exception with message: 'Uncaught exception should fail!'; expression was: {Unknown expression after the reported line}
 Message.tests.cpp:<line number>: failed - but was ok: 1 == 2
 Reporters.tests.cpp:<line number>: passed: listingString, ContainsSubstring("[fakeTag]"s) for: "All available tags:
    1  [fakeTag]
@@ -2473,6 +2622,8 @@ InternalBenchmark.tests.cpp:<line number>: passed: e.point == 23 for: 23.0 == 23
 InternalBenchmark.tests.cpp:<line number>: passed: e.upper_bound == 23 for: 23.0 == 23
 InternalBenchmark.tests.cpp:<line number>: passed: e.lower_bound == 23 for: 23.0 == 23
 InternalBenchmark.tests.cpp:<line number>: passed: e.confidence_interval == 0.95 for: 0.95 == 0.95
+RandomNumberGeneration.tests.cpp:<line number>: passed: dist.a() == -10 for: -10 == -10
+RandomNumberGeneration.tests.cpp:<line number>: passed: dist.b() == 10 for: 10 == 10
 UniquePtr.tests.cpp:<line number>: passed: !(ptr) for: !{?}
 UniquePtr.tests.cpp:<line number>: passed: ptr.get() == 0 for: 0 == 0
 UniquePtr.tests.cpp:<line number>: passed: ptr for: {?}
@@ -2538,7 +2689,7 @@ InternalBenchmark.tests.cpp:<line number>: passed: med == 18. for: 18.0 == 18.0
 InternalBenchmark.tests.cpp:<line number>: passed: q3 == 23. for: 23.0 == 23.0
 Misc.tests.cpp:<line number>: passed:
 Misc.tests.cpp:<line number>: passed:
-test cases:  409 |  309 passed |  84 failed | 5 skipped | 11 failed as expected
-assertions: 2226 | 2049 passed | 145 failed | 32 failed as expected
+test cases:  417 |  312 passed |  85 failed | 6 skipped | 14 failed as expected
+assertions: 2260 | 2079 passed | 146 failed | 35 failed as expected
 
 
diff --git a/external_imported/Catch2/tests/SelfTest/Baselines/compact.sw.multi.approved.txt b/external_imported/Catch2/tests/SelfTest/Baselines/compact.sw.multi.approved.txt
index 5b292da12..214fef74b 100644
--- a/external_imported/Catch2/tests/SelfTest/Baselines/compact.sw.multi.approved.txt
+++ b/external_imported/Catch2/tests/SelfTest/Baselines/compact.sw.multi.approved.txt
@@ -329,7 +329,7 @@ MatchersRanges.tests.cpp:<line number>: passed: inner_lists_are_empty.front(), I
 MatchersRanges.tests.cpp:<line number>: passed: has_empty{}, !IsEmpty() for: {?} not is empty
 MatchersRanges.tests.cpp:<line number>: passed: unrelated::ADL_empty{}, IsEmpty() for: {?} is empty
 Message.tests.cpp:<line number>: passed: with 7 messages: 'a := 1' and 'b := 2' and 'c := 3' and 'a + b := 3' and 'a+b := 3' and 'c > b := true' and 'a == 1 := true'
-Message.tests.cpp:<line number>: passed: with 7 messages: 'std::vector<int>{1, 2, 3}[0, 1, 2] := 3' and 'std::vector<int>{1, 2, 3}[(0, 1)] := 2' and 'std::vector<int>{1, 2, 3}[0] := 1' and '(helper_1436<int, int>{12, -12}) := { 12, -12 }' and '(helper_1436<int, int>(-12, 12)) := { -12, 12 }' and '(1, 2) := 2' and '(2, 3) := 3'
+Message.tests.cpp:<line number>: passed: with 7 messages: 'custom_index_op<int>{1, 2, 3}[0, 1, 2] := 0' and 'custom_index_op<int>{1, 2, 3}[(0, 1)] := 0' and 'custom_index_op<int>{1, 2, 3}[0] := 0' and '(helper_1436<int, int>{12, -12}) := { 12, -12 }' and '(helper_1436<int, int>(-12, 12)) := { -12, 12 }' and '(1, 2) := 2' and '(2, 3) := 3'
 Message.tests.cpp:<line number>: passed: with 11 messages: '("comma, in string", "escaped, \", ") := "escaped, ", "' and '"single quote in string,'," := "single quote in string,',"' and '"some escapes, \\,\\\\" := "some escapes, \,\\"' and '"some, ), unmatched, } prenheses {[<" := "some, ), unmatched, } prenheses {[<"' and ''"' := '"'' and ''\'' := '''' and '',' := ','' and ''}' := '}'' and '')' := ')'' and ''(' := '('' and ''{' := '{''
 ToStringGeneral.tests.cpp:<line number>: passed: true with 1 message: 'i := 2'
 ToStringGeneral.tests.cpp:<line number>: passed: true with 1 message: '3'
@@ -518,8 +518,8 @@ ToString.tests.cpp:<line number>: passed: enumInfo->lookup(1) == "Value2" for: V
 ToString.tests.cpp:<line number>: passed: enumInfo->lookup(3) == "{** unexpected enum value **}" for: {** unexpected enum value **}
 ==
 "{** unexpected enum value **}"
+Skip.tests.cpp:<line number>: skipped: 'This generator is empty'
 Stream.tests.cpp:<line number>: passed: Catch::makeStream( "" )->isConsole() for: true
-Tag.tests.cpp:<line number>: passed: Catch::TestCaseInfo( "", { "fake test name", "[]" }, dummySourceLineInfo )
 Matchers.tests.cpp:<line number>: failed: testStringForMatching(), EndsWith( "Substring" ) for: "this string contains 'abc' as a substring" ends with: "Substring"
 Matchers.tests.cpp:<line number>: failed: testStringForMatching(), EndsWith( "this", Catch::CaseSensitive::No ) for: "this string contains 'abc' as a substring" ends with: "this" (case insensitive)
 EnumToString.tests.cpp:<line number>: passed: stringify( EnumClass3::Value1 ) == "Value1" for: "Value1" == "Value1"
@@ -664,6 +664,10 @@ Matchers.tests.cpp:<line number>: passed: 1., !IsNaN() for: 1.0 not is NaN
 Generators.tests.cpp:<line number>: passed: i % 2 == 0 for: 0 == 0
 Generators.tests.cpp:<line number>: passed: i % 2 == 0 for: 0 == 0
 Generators.tests.cpp:<line number>: passed: i % 2 == 0 for: 0 == 0
+Generators.tests.cpp:<line number>: passed: i % 2 == 0 for: 0 == 0
+Generators.tests.cpp:<line number>: passed: i % 2 == 0 for: 0 == 0
+Generators.tests.cpp:<line number>: passed: i % 2 == 0 for: 0 == 0
+Generators.tests.cpp:<line number>: passed: i % 2 == 0 for: 0 == 0
 Generators.tests.cpp:<line number>: passed: filter([] (int) {return false; }, value(1)), Catch::GeneratorException
 Generators.tests.cpp:<line number>: passed: i < 4 for: 1 < 4
 Generators.tests.cpp:<line number>: passed: i < 4 for: 2 < 4
@@ -942,6 +946,7 @@ TestCaseInfoHasher.tests.cpp:<line number>: passed: h( dummy1 ) != h( dummy2 ) f
 TestCaseInfoHasher.tests.cpp:<line number>: passed: h( dummy ) == h( dummy ) for: 3422778688 (0x<hex digits>)
 ==
 3422778688 (0x<hex digits>)
+Message.tests.cpp:<line number>: failed: explicitly with 3 messages: 'This info has multiple parts.' and 'This unscoped info has multiple parts.' and 'Show infos!'
 Message.tests.cpp:<line number>: warning: 'this is a message' with 1 message: 'this is a warning'
 Message.tests.cpp:<line number>: failed: a == 1 for: 2 == 1 with 2 messages: 'this message should be logged' and 'so should this'
 Message.tests.cpp:<line number>: passed: a == 2 for: 2 == 2 with 1 message: 'this message may be logged later'
@@ -959,6 +964,7 @@ Message.tests.cpp:<line number>: passed: i < 10 for: 7 < 10 with 2 messages: 'cu
 Message.tests.cpp:<line number>: passed: i < 10 for: 8 < 10 with 2 messages: 'current counter 8' and 'i := 8'
 Message.tests.cpp:<line number>: passed: i < 10 for: 9 < 10 with 2 messages: 'current counter 9' and 'i := 9'
 Message.tests.cpp:<line number>: failed: i < 10 for: 10 < 10 with 2 messages: 'current counter 10' and 'i := 10'
+AssertionHandler.tests.cpp:<line number>: failed: unexpected exception with message: 'Exception translation was disabled by CATCH_CONFIG_FAST_COMPILE'; expression was: Dummy
 Condition.tests.cpp:<line number>: failed: data.int_seven != 7 for: 7 != 7
 Condition.tests.cpp:<line number>: failed: data.float_nine_point_one != Approx( 9.1f ) for: 9.1f != Approx( 9.1000003815 )
 Condition.tests.cpp:<line number>: failed: data.double_pi != Approx( 3.1415926535 ) for: 3.1415926535 != Approx( 3.1415926535 )
@@ -975,6 +981,91 @@ Condition.tests.cpp:<line number>: passed: data.str_hello != "goodbye" for: "hel
 Condition.tests.cpp:<line number>: passed: data.str_hello != "hell" for: "hello" != "hell"
 Condition.tests.cpp:<line number>: passed: data.str_hello != "hello1" for: "hello" != "hello1"
 Condition.tests.cpp:<line number>: passed: data.str_hello.size() != 6 for: 5 != 6
+Json.tests.cpp:<line number>: passed: stream.str() == "" for: "" == ""
+Json.tests.cpp:<line number>: passed: stream.str() == "{\n}" for: "{
+}"
+==
+"{
+}"
+Json.tests.cpp:<line number>: passed: stream.str(), ContainsSubstring( "\"int\": 1," ) && ContainsSubstring( "\"double\": 1.5," ) && ContainsSubstring( "\"true\": true," ) && ContainsSubstring( "\"false\": false," ) && ContainsSubstring( "\"string\": \"this is a string\"," ) && ContainsSubstring( "\"array\": [\n    1,\n    2\n  ]\n}" ) for: "{
+  "int": 1,
+  "double": 1.5,
+  "true": true,
+  "false": false,
+  "string": "this is a string",
+  "array": [
+    1,
+    2
+  ]
+}" ( contains: ""int": 1," and contains: ""double": 1.5," and contains: ""true": true," and contains: ""false": false," and contains: ""string": "this is a string"," and contains: ""array": [
+    1,
+    2
+  ]
+}" )
+Json.tests.cpp:<line number>: passed: stream.str(), ContainsSubstring( "\"empty_object\": {\n  }," ) && ContainsSubstring( "\"fully_object\": {\n    \"key\": 1\n  }" ) for: "{
+  "empty_object": {
+  },
+  "fully_object": {
+    "key": 1
+  }
+}" ( contains: ""empty_object": {
+  }," and contains: ""fully_object": {
+    "key": 1
+  }" )
+Json.tests.cpp:<line number>: passed: stream.str() == "[\n]" for: "[
+]"
+==
+"[
+]"
+Json.tests.cpp:<line number>: passed: stream.str() == "[\n  1,\n  1.5,\n  true,\n  false,\n  \"this is a string\",\n  {\n    \"object\": 42\n  },\n  [\n    \"array\",\n    42.5\n  ]\n]" for: "[
+  1,
+  1.5,
+  true,
+  false,
+  "this is a string",
+  {
+    "object": 42
+  },
+  [
+    "array",
+    42.5
+  ]
+]"
+==
+"[
+  1,
+  1.5,
+  true,
+  false,
+  "this is a string",
+  {
+    "object": 42
+  },
+  [
+    "array",
+    42.5
+  ]
+]"
+Json.tests.cpp:<line number>: passed: stream.str() == "{\n}" for: "{
+}"
+==
+"{
+}"
+Json.tests.cpp:<line number>: passed: stream.str() == "[\n]" for: "[
+]"
+==
+"[
+]"
+Json.tests.cpp:<line number>: passed: stream.str() == "\"custom\"" for: ""custom"" == ""custom""
+Json.tests.cpp:<line number>: passed: sstream.str() == "\"\\\"\"" for: ""\""" == ""\"""
+Json.tests.cpp:<line number>: passed: sstream.str() == "\"\\\\\"" for: ""\\"" == ""\\""
+Json.tests.cpp:<line number>: passed: sstream.str() == "\"/\"" for: ""/"" == ""/""
+Json.tests.cpp:<line number>: passed: sstream.str() == "\"\\b\"" for: ""\b"" == ""\b""
+Json.tests.cpp:<line number>: passed: sstream.str() == "\"\\f\"" for: ""\f"" == ""\f""
+Json.tests.cpp:<line number>: passed: sstream.str() == "\"\\n\"" for: ""\n"" == ""\n""
+Json.tests.cpp:<line number>: passed: sstream.str() == "\"\\r\"" for: ""\r"" == ""\r""
+Json.tests.cpp:<line number>: passed: sstream.str() == "\"\\t\"" for: ""\t"" == ""\t""
+Json.tests.cpp:<line number>: passed: sstream.str() == "\"\\\\/\\t\\r\\n\"" for: ""\\/\t\r\n"" == ""\\/\t\r\n""
 Compilation.tests.cpp:<line number>: passed: []() { return true; }() for: true
 Approx.tests.cpp:<line number>: passed: d <= Approx( 1.24 ) for: 1.23 <= Approx( 1.24 )
 Approx.tests.cpp:<line number>: passed: d <= Approx( 1.23 ) for: 1.23 <= Approx( 1.23 )
@@ -1339,6 +1430,60 @@ Reporters.tests.cpp:<line number>: passed: listingString, ContainsSubstring( "fa
 
 " ( contains: "fake test name" and contains: "fakeTestTag" ) with 1 message: 'Tested reporter: console'
 Reporters.tests.cpp:<line number>: passed: !(factories.empty()) for: !false
+Reporters.tests.cpp:<line number>: passed: listingString, ContainsSubstring("fakeTag"s) for: "{
+  "version": 1,
+  "metadata": {
+    "name": "",
+    "rng-seed": 1234,
+    "catch2-version": "<version>"
+  },
+  "listings": {
+    "tags": [
+      {
+        "aliases": [
+          "fakeTag"
+        ],
+        "count": 1
+      }
+    ]" contains: "fakeTag" with 1 message: 'Tested reporter: JSON'
+Reporters.tests.cpp:<line number>: passed: !(factories.empty()) for: !false
+Reporters.tests.cpp:<line number>: passed: listingString, ContainsSubstring("fake reporter"s) for: "{
+  "version": 1,
+  "metadata": {
+    "name": "",
+    "rng-seed": 1234,
+    "catch2-version": "<version>"
+  },
+  "listings": {
+    "reporters": [
+      {
+        "name": "fake reporter",
+        "description": "fake description"
+      }
+    ]" contains: "fake reporter" with 1 message: 'Tested reporter: JSON'
+Reporters.tests.cpp:<line number>: passed: !(factories.empty()) for: !false
+Reporters.tests.cpp:<line number>: passed: listingString, ContainsSubstring( "fake test name"s ) && ContainsSubstring( "fakeTestTag"s ) for: "{
+  "version": 1,
+  "metadata": {
+    "name": "",
+    "rng-seed": 1234,
+    "catch2-version": "<version>"
+  },
+  "listings": {
+    "tests": [
+      {
+        "name": "fake test name",
+        "class-name": "",
+        "tags": [
+          "fakeTestTag"
+        ],
+        "source-location": {
+          "filename": "fake-file.cpp",
+          "line": 123456789
+        }
+      }
+    ]" ( contains: "fake test name" and contains: "fakeTestTag" ) with 1 message: 'Tested reporter: JSON'
+Reporters.tests.cpp:<line number>: passed: !(factories.empty()) for: !false
 Reporters.tests.cpp:<line number>: passed: listingString, ContainsSubstring("fakeTag"s) for: "<?xml version="1.0" encoding="UTF-8"?>
 All available tags:
    1  [fakeTag]
@@ -1743,6 +1888,10 @@ Misc.tests.cpp:<line number>: passed: true
 Misc.tests.cpp:<line number>: failed: explicitly
 Misc.tests.cpp:<line number>: failed - but was ok: false
 Misc.tests.cpp:<line number>: failed: explicitly
+Misc.tests.cpp:<line number>: passed: true
+Misc.tests.cpp:<line number>: failed: unexpected exception with message: 'Uncaught exception should fail!'; expression was: {Unknown expression after the reported line}
+Misc.tests.cpp:<line number>: failed - but was ok: false
+Misc.tests.cpp:<line number>: failed: unexpected exception with message: 'Uncaught exception should fail!'; expression was: {Unknown expression after the reported line}
 Message.tests.cpp:<line number>: failed - but was ok: 1 == 2
 Reporters.tests.cpp:<line number>: passed: listingString, ContainsSubstring("[fakeTag]"s) for: "All available tags:
    1  [fakeTag]
@@ -2462,6 +2611,8 @@ InternalBenchmark.tests.cpp:<line number>: passed: e.point == 23 for: 23.0 == 23
 InternalBenchmark.tests.cpp:<line number>: passed: e.upper_bound == 23 for: 23.0 == 23
 InternalBenchmark.tests.cpp:<line number>: passed: e.lower_bound == 23 for: 23.0 == 23
 InternalBenchmark.tests.cpp:<line number>: passed: e.confidence_interval == 0.95 for: 0.95 == 0.95
+RandomNumberGeneration.tests.cpp:<line number>: passed: dist.a() == -10 for: -10 == -10
+RandomNumberGeneration.tests.cpp:<line number>: passed: dist.b() == 10 for: 10 == 10
 UniquePtr.tests.cpp:<line number>: passed: !(ptr) for: !{?}
 UniquePtr.tests.cpp:<line number>: passed: ptr.get() == 0 for: 0 == 0
 UniquePtr.tests.cpp:<line number>: passed: ptr for: {?}
@@ -2527,7 +2678,7 @@ InternalBenchmark.tests.cpp:<line number>: passed: med == 18. for: 18.0 == 18.0
 InternalBenchmark.tests.cpp:<line number>: passed: q3 == 23. for: 23.0 == 23.0
 Misc.tests.cpp:<line number>: passed:
 Misc.tests.cpp:<line number>: passed:
-test cases:  409 |  309 passed |  84 failed | 5 skipped | 11 failed as expected
-assertions: 2226 | 2049 passed | 145 failed | 32 failed as expected
+test cases:  417 |  312 passed |  85 failed | 6 skipped | 14 failed as expected
+assertions: 2260 | 2079 passed | 146 failed | 35 failed as expected
 
 
diff --git a/external_imported/Catch2/tests/SelfTest/Baselines/console.std.approved.txt b/external_imported/Catch2/tests/SelfTest/Baselines/console.std.approved.txt
index 15d8b024f..254262565 100644
--- a/external_imported/Catch2/tests/SelfTest/Baselines/console.std.approved.txt
+++ b/external_imported/Catch2/tests/SelfTest/Baselines/console.std.approved.txt
@@ -383,6 +383,16 @@ Exception.tests.cpp:<line number>: FAILED:
 due to unexpected exception with message:
   custom std exception
 
+-------------------------------------------------------------------------------
+Empty generators can SKIP in constructor
+-------------------------------------------------------------------------------
+Skip.tests.cpp:<line number>
+...............................................................................
+
+Skip.tests.cpp:<line number>: SKIPPED:
+explicitly with message:
+  This generator is empty
+
 -------------------------------------------------------------------------------
 EndsWith string matcher
 -------------------------------------------------------------------------------
@@ -589,6 +599,18 @@ explicitly with message:
 Message.tests.cpp:<line number>: warning:
   This message appears in the output
 
+-------------------------------------------------------------------------------
+INFO and UNSCOPED_INFO can stream multiple arguments
+-------------------------------------------------------------------------------
+Message.tests.cpp:<line number>
+...............................................................................
+
+Message.tests.cpp:<line number>: FAILED:
+explicitly with messages:
+  This info has multiple parts.
+  This unscoped info has multiple parts.
+  Show infos!
+
 -------------------------------------------------------------------------------
 INFO and WARN do not abort tests
 -------------------------------------------------------------------------------
@@ -649,6 +671,17 @@ with messages:
   current counter 10
   i := 10
 
+-------------------------------------------------------------------------------
+Incomplete AssertionHandler
+-------------------------------------------------------------------------------
+AssertionHandler.tests.cpp:<line number>
+...............................................................................
+
+AssertionHandler.tests.cpp:<line number>: FAILED:
+  REQUIRE( Dummy )
+due to unexpected exception with message:
+  Exception translation was disabled by CATCH_CONFIG_FAST_COMPILE
+
 -------------------------------------------------------------------------------
 Inequality checks that should fail
 -------------------------------------------------------------------------------
@@ -987,6 +1020,28 @@ Misc.tests.cpp:<line number>
 
 Misc.tests.cpp:<line number>: FAILED:
 
+-------------------------------------------------------------------------------
+Testing checked-if 4
+-------------------------------------------------------------------------------
+Misc.tests.cpp:<line number>
+...............................................................................
+
+Misc.tests.cpp:<line number>: FAILED:
+  {Unknown expression after the reported line}
+due to unexpected exception with message:
+  Uncaught exception should fail!
+
+-------------------------------------------------------------------------------
+Testing checked-if 5
+-------------------------------------------------------------------------------
+Misc.tests.cpp:<line number>
+...............................................................................
+
+Misc.tests.cpp:<line number>: FAILED:
+  {Unknown expression after the reported line}
+due to unexpected exception with message:
+  Uncaught exception should fail!
+
 -------------------------------------------------------------------------------
 Thrown string literals are translated
 -------------------------------------------------------------------------------
@@ -1533,6 +1588,6 @@ due to unexpected exception with message:
   Why would you throw a std::string?
 
 ===============================================================================
-test cases:  409 |  323 passed |  69 failed | 6 skipped | 11 failed as expected
-assertions: 2209 | 2049 passed | 128 failed | 32 failed as expected
+test cases:  417 |  326 passed |  70 failed | 7 skipped | 14 failed as expected
+assertions: 2243 | 2079 passed | 129 failed | 35 failed as expected
 
diff --git a/external_imported/Catch2/tests/SelfTest/Baselines/console.sw.approved.txt b/external_imported/Catch2/tests/SelfTest/Baselines/console.sw.approved.txt
index 26d5e8f35..077b7bf75 100644
--- a/external_imported/Catch2/tests/SelfTest/Baselines/console.sw.approved.txt
+++ b/external_imported/Catch2/tests/SelfTest/Baselines/console.sw.approved.txt
@@ -2740,9 +2740,9 @@ Message.tests.cpp:<line number>
 
 Message.tests.cpp:<line number>: PASSED:
 with messages:
-  std::vector<int>{1, 2, 3}[0, 1, 2] := 3
-  std::vector<int>{1, 2, 3}[(0, 1)] := 2
-  std::vector<int>{1, 2, 3}[0] := 1
+  custom_index_op<int>{1, 2, 3}[0, 1, 2] := 0
+  custom_index_op<int>{1, 2, 3}[(0, 1)] := 0
+  custom_index_op<int>{1, 2, 3}[0] := 0
   (helper_1436<int, int>{12, -12}) := { 12, -12 }
   (helper_1436<int, int>(-12, 12)) := { -12, 12 }
   (1, 2) := 2
@@ -3956,6 +3956,16 @@ with expansion:
   ==
   "{** unexpected enum value **}"
 
+-------------------------------------------------------------------------------
+Empty generators can SKIP in constructor
+-------------------------------------------------------------------------------
+Skip.tests.cpp:<line number>
+...............................................................................
+
+Skip.tests.cpp:<line number>: SKIPPED:
+explicitly with message:
+  This generator is empty
+
 -------------------------------------------------------------------------------
 Empty stream name opens cout stream
 -------------------------------------------------------------------------------
@@ -3967,15 +3977,6 @@ Stream.tests.cpp:<line number>: PASSED:
 with expansion:
   true
 
--------------------------------------------------------------------------------
-Empty tag is not allowed
--------------------------------------------------------------------------------
-Tag.tests.cpp:<line number>
-...............................................................................
-
-Tag.tests.cpp:<line number>: PASSED:
-  REQUIRE_THROWS( Catch::TestCaseInfo( "", { "fake test name", "[]" }, dummySourceLineInfo ) )
-
 -------------------------------------------------------------------------------
 EndsWith string matcher
 -------------------------------------------------------------------------------
@@ -4888,6 +4889,50 @@ Matchers.tests.cpp:<line number>: PASSED:
 with expansion:
   1.0 not is NaN
 
+-------------------------------------------------------------------------------
+GENERATE can combine literals and generators
+-------------------------------------------------------------------------------
+Generators.tests.cpp:<line number>
+...............................................................................
+
+Generators.tests.cpp:<line number>: PASSED:
+  REQUIRE( i % 2 == 0 )
+with expansion:
+  0 == 0
+
+-------------------------------------------------------------------------------
+GENERATE can combine literals and generators
+-------------------------------------------------------------------------------
+Generators.tests.cpp:<line number>
+...............................................................................
+
+Generators.tests.cpp:<line number>: PASSED:
+  REQUIRE( i % 2 == 0 )
+with expansion:
+  0 == 0
+
+-------------------------------------------------------------------------------
+GENERATE can combine literals and generators
+-------------------------------------------------------------------------------
+Generators.tests.cpp:<line number>
+...............................................................................
+
+Generators.tests.cpp:<line number>: PASSED:
+  REQUIRE( i % 2 == 0 )
+with expansion:
+  0 == 0
+
+-------------------------------------------------------------------------------
+GENERATE can combine literals and generators
+-------------------------------------------------------------------------------
+Generators.tests.cpp:<line number>
+...............................................................................
+
+Generators.tests.cpp:<line number>: PASSED:
+  REQUIRE( i % 2 == 0 )
+with expansion:
+  0 == 0
+
 -------------------------------------------------------------------------------
 Generators -- adapters
   Filtering by predicate
@@ -6981,6 +7026,18 @@ with expansion:
   ==
   3422778688 (0x<hex digits>)
 
+-------------------------------------------------------------------------------
+INFO and UNSCOPED_INFO can stream multiple arguments
+-------------------------------------------------------------------------------
+Message.tests.cpp:<line number>
+...............................................................................
+
+Message.tests.cpp:<line number>: FAILED:
+explicitly with messages:
+  This info has multiple parts.
+  This unscoped info has multiple parts.
+  Show infos!
+
 -------------------------------------------------------------------------------
 INFO and WARN do not abort tests
 -------------------------------------------------------------------------------
@@ -7142,6 +7199,17 @@ with messages:
   current counter 10
   i := 10
 
+-------------------------------------------------------------------------------
+Incomplete AssertionHandler
+-------------------------------------------------------------------------------
+AssertionHandler.tests.cpp:<line number>
+...............................................................................
+
+AssertionHandler.tests.cpp:<line number>: FAILED:
+  REQUIRE( Dummy )
+due to unexpected exception with message:
+  Exception translation was disabled by CATCH_CONFIG_FAST_COMPILE
+
 -------------------------------------------------------------------------------
 Inequality checks that should fail
 -------------------------------------------------------------------------------
@@ -7234,6 +7302,291 @@ Condition.tests.cpp:<line number>: PASSED:
 with expansion:
   5 != 6
 
+-------------------------------------------------------------------------------
+JsonWriter
+  Newly constructed JsonWriter does nothing
+-------------------------------------------------------------------------------
+Json.tests.cpp:<line number>
+...............................................................................
+
+Json.tests.cpp:<line number>: PASSED:
+  REQUIRE( stream.str() == "" )
+with expansion:
+  "" == ""
+
+-------------------------------------------------------------------------------
+JsonWriter
+  Calling writeObject will create an empty pair of braces
+-------------------------------------------------------------------------------
+Json.tests.cpp:<line number>
+...............................................................................
+
+Json.tests.cpp:<line number>: PASSED:
+  REQUIRE( stream.str() == "{\n}" )
+with expansion:
+  "{
+  }"
+  ==
+  "{
+  }"
+
+-------------------------------------------------------------------------------
+JsonWriter
+  Calling writeObject with key will create an object to write the value
+-------------------------------------------------------------------------------
+Json.tests.cpp:<line number>
+...............................................................................
+
+Json.tests.cpp:<line number>: PASSED:
+  REQUIRE_THAT( stream.str(), ContainsSubstring( "\"int\": 1," ) && ContainsSubstring( "\"double\": 1.5," ) && ContainsSubstring( "\"true\": true," ) && ContainsSubstring( "\"false\": false," ) && ContainsSubstring( "\"string\": \"this is a string\"," ) && ContainsSubstring( "\"array\": [\n    1,\n    2\n  ]\n}" ) )
+with expansion:
+  "{
+    "int": 1,
+    "double": 1.5,
+    "true": true,
+    "false": false,
+    "string": "this is a string",
+    "array": [
+      1,
+      2
+    ]
+  }" ( contains: ""int": 1," and contains: ""double": 1.5," and contains:
+  ""true": true," and contains: ""false": false," and contains: ""string":
+  "this is a string"," and contains: ""array": [
+      1,
+      2
+    ]
+  }" )
+
+-------------------------------------------------------------------------------
+JsonWriter
+  nesting objects
+-------------------------------------------------------------------------------
+Json.tests.cpp:<line number>
+...............................................................................
+
+Json.tests.cpp:<line number>: PASSED:
+  REQUIRE_THAT( stream.str(), ContainsSubstring( "\"empty_object\": {\n  }," ) && ContainsSubstring( "\"fully_object\": {\n    \"key\": 1\n  }" ) )
+with expansion:
+  "{
+    "empty_object": {
+    },
+    "fully_object": {
+      "key": 1
+    }
+  }" ( contains: ""empty_object": {
+    }," and contains: ""fully_object": {
+      "key": 1
+    }" )
+
+-------------------------------------------------------------------------------
+JsonWriter
+  Calling writeArray will create an empty pair of braces
+-------------------------------------------------------------------------------
+Json.tests.cpp:<line number>
+...............................................................................
+
+Json.tests.cpp:<line number>: PASSED:
+  REQUIRE( stream.str() == "[\n]" )
+with expansion:
+  "[
+  ]"
+  ==
+  "[
+  ]"
+
+-------------------------------------------------------------------------------
+JsonWriter
+  Calling writeArray creates array to write the values to
+-------------------------------------------------------------------------------
+Json.tests.cpp:<line number>
+...............................................................................
+
+Json.tests.cpp:<line number>: PASSED:
+  REQUIRE( stream.str() == "[\n  1,\n  1.5,\n  true,\n  false,\n  \"this is a string\",\n  {\n    \"object\": 42\n  },\n  [\n    \"array\",\n    42.5\n  ]\n]" )
+with expansion:
+  "[
+    1,
+    1.5,
+    true,
+    false,
+    "this is a string",
+    {
+      "object": 42
+    },
+    [
+      "array",
+      42.5
+    ]
+  ]"
+  ==
+  "[
+    1,
+    1.5,
+    true,
+    false,
+    "this is a string",
+    {
+      "object": 42
+    },
+    [
+      "array",
+      42.5
+    ]
+  ]"
+
+-------------------------------------------------------------------------------
+JsonWriter
+  Moved from JsonObjectWriter shall not insert superfluous brace
+-------------------------------------------------------------------------------
+Json.tests.cpp:<line number>
+...............................................................................
+
+Json.tests.cpp:<line number>: PASSED:
+  REQUIRE( stream.str() == "{\n}" )
+with expansion:
+  "{
+  }"
+  ==
+  "{
+  }"
+
+-------------------------------------------------------------------------------
+JsonWriter
+  Moved from JsonArrayWriter shall not insert superfluous bracket
+-------------------------------------------------------------------------------
+Json.tests.cpp:<line number>
+...............................................................................
+
+Json.tests.cpp:<line number>: PASSED:
+  REQUIRE( stream.str() == "[\n]" )
+with expansion:
+  "[
+  ]"
+  ==
+  "[
+  ]"
+
+-------------------------------------------------------------------------------
+JsonWriter
+  Custom class shall be quoted
+-------------------------------------------------------------------------------
+Json.tests.cpp:<line number>
+...............................................................................
+
+Json.tests.cpp:<line number>: PASSED:
+  REQUIRE( stream.str() == "\"custom\"" )
+with expansion:
+  ""custom"" == ""custom""
+
+-------------------------------------------------------------------------------
+JsonWriter escapes charaters in strings properly
+  Quote in a string is escaped
+-------------------------------------------------------------------------------
+Json.tests.cpp:<line number>
+...............................................................................
+
+Json.tests.cpp:<line number>: PASSED:
+  REQUIRE( sstream.str() == "\"\\\"\"" )
+with expansion:
+  ""\""" == ""\"""
+
+-------------------------------------------------------------------------------
+JsonWriter escapes charaters in strings properly
+  Backslash in a string is escaped
+-------------------------------------------------------------------------------
+Json.tests.cpp:<line number>
+...............................................................................
+
+Json.tests.cpp:<line number>: PASSED:
+  REQUIRE( sstream.str() == "\"\\\\\"" )
+with expansion:
+  ""\\"" == ""\\""
+
+-------------------------------------------------------------------------------
+JsonWriter escapes charaters in strings properly
+  Forward slash in a string is **not** escaped
+-------------------------------------------------------------------------------
+Json.tests.cpp:<line number>
+...............................................................................
+
+Json.tests.cpp:<line number>: PASSED:
+  REQUIRE( sstream.str() == "\"/\"" )
+with expansion:
+  ""/"" == ""/""
+
+-------------------------------------------------------------------------------
+JsonWriter escapes charaters in strings properly
+  Backspace in a string is escaped
+-------------------------------------------------------------------------------
+Json.tests.cpp:<line number>
+...............................................................................
+
+Json.tests.cpp:<line number>: PASSED:
+  REQUIRE( sstream.str() == "\"\\b\"" )
+with expansion:
+  ""\b"" == ""\b""
+
+-------------------------------------------------------------------------------
+JsonWriter escapes charaters in strings properly
+  Formfeed in a string is escaped
+-------------------------------------------------------------------------------
+Json.tests.cpp:<line number>
+...............................................................................
+
+Json.tests.cpp:<line number>: PASSED:
+  REQUIRE( sstream.str() == "\"\\f\"" )
+with expansion:
+  ""\f"" == ""\f""
+
+-------------------------------------------------------------------------------
+JsonWriter escapes charaters in strings properly
+  linefeed in a string is escaped
+-------------------------------------------------------------------------------
+Json.tests.cpp:<line number>
+...............................................................................
+
+Json.tests.cpp:<line number>: PASSED:
+  REQUIRE( sstream.str() == "\"\\n\"" )
+with expansion:
+  ""\n"" == ""\n""
+
+-------------------------------------------------------------------------------
+JsonWriter escapes charaters in strings properly
+  carriage return in a string is escaped
+-------------------------------------------------------------------------------
+Json.tests.cpp:<line number>
+...............................................................................
+
+Json.tests.cpp:<line number>: PASSED:
+  REQUIRE( sstream.str() == "\"\\r\"" )
+with expansion:
+  ""\r"" == ""\r""
+
+-------------------------------------------------------------------------------
+JsonWriter escapes charaters in strings properly
+  tab in a string is escaped
+-------------------------------------------------------------------------------
+Json.tests.cpp:<line number>
+...............................................................................
+
+Json.tests.cpp:<line number>: PASSED:
+  REQUIRE( sstream.str() == "\"\\t\"" )
+with expansion:
+  ""\t"" == ""\t""
+
+-------------------------------------------------------------------------------
+JsonWriter escapes charaters in strings properly
+  combination of characters is escaped
+-------------------------------------------------------------------------------
+Json.tests.cpp:<line number>
+...............................................................................
+
+Json.tests.cpp:<line number>: PASSED:
+  REQUIRE( sstream.str() == "\"\\\\/\\t\\r\\n\"" )
+with expansion:
+  ""\\/\t\r\n"" == ""\\/\t\r\n""
+
 -------------------------------------------------------------------------------
 Lambdas in assertions
 -------------------------------------------------------------------------------
@@ -9732,6 +10085,129 @@ Reporter's write listings to provided stream
 Reporters.tests.cpp:<line number>
 ...............................................................................
 
+Reporters.tests.cpp:<line number>: PASSED:
+  REQUIRE_FALSE( factories.empty() )
+with expansion:
+  !false
+
+-------------------------------------------------------------------------------
+Reporter's write listings to provided stream
+  JSON reporter lists tags
+-------------------------------------------------------------------------------
+Reporters.tests.cpp:<line number>
+...............................................................................
+
+Reporters.tests.cpp:<line number>: PASSED:
+  REQUIRE_THAT( listingString, ContainsSubstring("fakeTag"s) )
+with expansion:
+  "{
+    "version": 1,
+    "metadata": {
+      "name": "",
+      "rng-seed": 1234,
+      "catch2-version": "<version>"
+    },
+    "listings": {
+      "tags": [
+        {
+          "aliases": [
+            "fakeTag"
+          ],
+          "count": 1
+        }
+      ]" contains: "fakeTag"
+with message:
+  Tested reporter: JSON
+
+-------------------------------------------------------------------------------
+Reporter's write listings to provided stream
+-------------------------------------------------------------------------------
+Reporters.tests.cpp:<line number>
+...............................................................................
+
+Reporters.tests.cpp:<line number>: PASSED:
+  REQUIRE_FALSE( factories.empty() )
+with expansion:
+  !false
+
+-------------------------------------------------------------------------------
+Reporter's write listings to provided stream
+  JSON reporter lists reporters
+-------------------------------------------------------------------------------
+Reporters.tests.cpp:<line number>
+...............................................................................
+
+Reporters.tests.cpp:<line number>: PASSED:
+  REQUIRE_THAT( listingString, ContainsSubstring("fake reporter"s) )
+with expansion:
+  "{
+    "version": 1,
+    "metadata": {
+      "name": "",
+      "rng-seed": 1234,
+      "catch2-version": "<version>"
+    },
+    "listings": {
+      "reporters": [
+        {
+          "name": "fake reporter",
+          "description": "fake description"
+        }
+      ]" contains: "fake reporter"
+with message:
+  Tested reporter: JSON
+
+-------------------------------------------------------------------------------
+Reporter's write listings to provided stream
+-------------------------------------------------------------------------------
+Reporters.tests.cpp:<line number>
+...............................................................................
+
+Reporters.tests.cpp:<line number>: PASSED:
+  REQUIRE_FALSE( factories.empty() )
+with expansion:
+  !false
+
+-------------------------------------------------------------------------------
+Reporter's write listings to provided stream
+  JSON reporter lists tests
+-------------------------------------------------------------------------------
+Reporters.tests.cpp:<line number>
+...............................................................................
+
+Reporters.tests.cpp:<line number>: PASSED:
+  REQUIRE_THAT( listingString, ContainsSubstring( "fake test name"s ) && ContainsSubstring( "fakeTestTag"s ) )
+with expansion:
+  "{
+    "version": 1,
+    "metadata": {
+      "name": "",
+      "rng-seed": 1234,
+      "catch2-version": "<version>"
+    },
+    "listings": {
+      "tests": [
+        {
+          "name": "fake test name",
+          "class-name": "",
+          "tags": [
+            "fakeTestTag"
+          ],
+          "source-location": {
+            "filename": "fake-file.cpp",
+            "line": 123456789
+          }
+        }
+      ]" ( contains: "fake test name" and contains: "fakeTestTag" )
+with message:
+  Tested reporter: JSON
+
+-------------------------------------------------------------------------------
+Reporter's write listings to provided stream
+-------------------------------------------------------------------------------
+Reporters.tests.cpp:<line number>
+...............................................................................
+
 Reporters.tests.cpp:<line number>: PASSED:
   REQUIRE_FALSE( factories.empty() )
 with expansion:
@@ -12521,6 +12997,34 @@ Misc.tests.cpp:<line number>: FAILED - but was ok:
 
 Misc.tests.cpp:<line number>: FAILED:
 
+-------------------------------------------------------------------------------
+Testing checked-if 4
+-------------------------------------------------------------------------------
+Misc.tests.cpp:<line number>
+...............................................................................
+
+Misc.tests.cpp:<line number>: PASSED:
+  CHECKED_ELSE( true )
+
+Misc.tests.cpp:<line number>: FAILED:
+  {Unknown expression after the reported line}
+due to unexpected exception with message:
+  Uncaught exception should fail!
+
+-------------------------------------------------------------------------------
+Testing checked-if 5
+-------------------------------------------------------------------------------
+Misc.tests.cpp:<line number>
+...............................................................................
+
+Misc.tests.cpp:<line number>: FAILED - but was ok:
+  CHECKED_ELSE( false )
+
+Misc.tests.cpp:<line number>: FAILED:
+  {Unknown expression after the reported line}
+due to unexpected exception with message:
+  Uncaught exception should fail!
+
 -------------------------------------------------------------------------------
 The NO_FAIL macro reports a failure but does not fail the test
 -------------------------------------------------------------------------------
@@ -13460,7 +13964,7 @@ with expansion:
 -------------------------------------------------------------------------------
 Usage of AllTrue range matcher
   Basic usage
-  One false evalutes to false
+  One false evaluates to false
 -------------------------------------------------------------------------------
 MatchersRanges.tests.cpp:<line number>
 ...............................................................................
@@ -13499,7 +14003,7 @@ with expansion:
 -------------------------------------------------------------------------------
 Usage of AllTrue range matcher
   Contained type is convertible to bool
-  One false evalutes to false
+  One false evaluates to false
 -------------------------------------------------------------------------------
 MatchersRanges.tests.cpp:<line number>
 ...............................................................................
@@ -13735,7 +14239,7 @@ with expansion:
 -------------------------------------------------------------------------------
 Usage of AnyTrue range matcher
   Basic usage
-  One true evalutes to true
+  One true evaluates to true
 -------------------------------------------------------------------------------
 MatchersRanges.tests.cpp:<line number>
 ...............................................................................
@@ -13774,7 +14278,7 @@ with expansion:
 -------------------------------------------------------------------------------
 Usage of AnyTrue range matcher
   Contained type is convertible to bool
-  One true evalutes to true
+  One true evaluates to true
 -------------------------------------------------------------------------------
 MatchersRanges.tests.cpp:<line number>
 ...............................................................................
@@ -14010,7 +14514,7 @@ with expansion:
 -------------------------------------------------------------------------------
 Usage of NoneTrue range matcher
   Basic usage
-  One true evalutes to false
+  One true evaluates to false
 -------------------------------------------------------------------------------
 MatchersRanges.tests.cpp:<line number>
 ...............................................................................
@@ -14049,7 +14553,7 @@ with expansion:
 -------------------------------------------------------------------------------
 Usage of NoneTrue range matcher
   Contained type is convertible to bool
-  One true evalutes to false
+  One true evaluates to false
 -------------------------------------------------------------------------------
 MatchersRanges.tests.cpp:<line number>
 ...............................................................................
@@ -17744,6 +18248,22 @@ InternalBenchmark.tests.cpp:<line number>: PASSED:
 with expansion:
   0.95 == 0.95
 
+-------------------------------------------------------------------------------
+uniform_integer_distribution can return the bounds
+-------------------------------------------------------------------------------
+RandomNumberGeneration.tests.cpp:<line number>
+...............................................................................
+
+RandomNumberGeneration.tests.cpp:<line number>: PASSED:
+  REQUIRE( dist.a() == -10 )
+with expansion:
+  -10 == -10
+
+RandomNumberGeneration.tests.cpp:<line number>: PASSED:
+  REQUIRE( dist.b() == 10 )
+with expansion:
+  10 == 10
+
 -------------------------------------------------------------------------------
 unique_ptr reimplementation: basic functionality
   Default constructed unique_ptr is empty
@@ -18231,6 +18751,6 @@ Misc.tests.cpp:<line number>
 Misc.tests.cpp:<line number>: PASSED:
 
 ===============================================================================
-test cases:  409 |  309 passed |  84 failed | 5 skipped | 11 failed as expected
-assertions: 2226 | 2049 passed | 145 failed | 32 failed as expected
+test cases:  417 |  312 passed |  85 failed | 6 skipped | 14 failed as expected
+assertions: 2260 | 2079 passed | 146 failed | 35 failed as expected
 
diff --git a/external_imported/Catch2/tests/SelfTest/Baselines/console.sw.multi.approved.txt b/external_imported/Catch2/tests/SelfTest/Baselines/console.sw.multi.approved.txt
index 80b63ab84..5d204990c 100644
--- a/external_imported/Catch2/tests/SelfTest/Baselines/console.sw.multi.approved.txt
+++ b/external_imported/Catch2/tests/SelfTest/Baselines/console.sw.multi.approved.txt
@@ -2738,9 +2738,9 @@ Message.tests.cpp:<line number>
 
 Message.tests.cpp:<line number>: PASSED:
 with messages:
-  std::vector<int>{1, 2, 3}[0, 1, 2] := 3
-  std::vector<int>{1, 2, 3}[(0, 1)] := 2
-  std::vector<int>{1, 2, 3}[0] := 1
+  custom_index_op<int>{1, 2, 3}[0, 1, 2] := 0
+  custom_index_op<int>{1, 2, 3}[(0, 1)] := 0
+  custom_index_op<int>{1, 2, 3}[0] := 0
   (helper_1436<int, int>{12, -12}) := { 12, -12 }
   (helper_1436<int, int>(-12, 12)) := { -12, 12 }
   (1, 2) := 2
@@ -3954,6 +3954,16 @@ with expansion:
   ==
   "{** unexpected enum value **}"
 
+-------------------------------------------------------------------------------
+Empty generators can SKIP in constructor
+-------------------------------------------------------------------------------
+Skip.tests.cpp:<line number>
+...............................................................................
+
+Skip.tests.cpp:<line number>: SKIPPED:
+explicitly with message:
+  This generator is empty
+
 -------------------------------------------------------------------------------
 Empty stream name opens cout stream
 -------------------------------------------------------------------------------
@@ -3965,15 +3975,6 @@ Stream.tests.cpp:<line number>: PASSED:
 with expansion:
   true
 
--------------------------------------------------------------------------------
-Empty tag is not allowed
--------------------------------------------------------------------------------
-Tag.tests.cpp:<line number>
-...............................................................................
-
-Tag.tests.cpp:<line number>: PASSED:
-  REQUIRE_THROWS( Catch::TestCaseInfo( "", { "fake test name", "[]" }, dummySourceLineInfo ) )
-
 -------------------------------------------------------------------------------
 EndsWith string matcher
 -------------------------------------------------------------------------------
@@ -4886,6 +4887,50 @@ Matchers.tests.cpp:<line number>: PASSED:
 with expansion:
   1.0 not is NaN
 
+-------------------------------------------------------------------------------
+GENERATE can combine literals and generators
+-------------------------------------------------------------------------------
+Generators.tests.cpp:<line number>
+...............................................................................
+
+Generators.tests.cpp:<line number>: PASSED:
+  REQUIRE( i % 2 == 0 )
+with expansion:
+  0 == 0
+
+-------------------------------------------------------------------------------
+GENERATE can combine literals and generators
+-------------------------------------------------------------------------------
+Generators.tests.cpp:<line number>
+...............................................................................
+
+Generators.tests.cpp:<line number>: PASSED:
+  REQUIRE( i % 2 == 0 )
+with expansion:
+  0 == 0
+
+-------------------------------------------------------------------------------
+GENERATE can combine literals and generators
+-------------------------------------------------------------------------------
+Generators.tests.cpp:<line number>
+...............................................................................
+
+Generators.tests.cpp:<line number>: PASSED:
+  REQUIRE( i % 2 == 0 )
+with expansion:
+  0 == 0
+
+-------------------------------------------------------------------------------
+GENERATE can combine literals and generators
+-------------------------------------------------------------------------------
+Generators.tests.cpp:<line number>
+...............................................................................
+
+Generators.tests.cpp:<line number>: PASSED:
+  REQUIRE( i % 2 == 0 )
+with expansion:
+  0 == 0
+
 -------------------------------------------------------------------------------
 Generators -- adapters
   Filtering by predicate
@@ -6979,6 +7024,18 @@ with expansion:
   ==
   3422778688 (0x<hex digits>)
 
+-------------------------------------------------------------------------------
+INFO and UNSCOPED_INFO can stream multiple arguments
+-------------------------------------------------------------------------------
+Message.tests.cpp:<line number>
+...............................................................................
+
+Message.tests.cpp:<line number>: FAILED:
+explicitly with messages:
+  This info has multiple parts.
+  This unscoped info has multiple parts.
+  Show infos!
+
 -------------------------------------------------------------------------------
 INFO and WARN do not abort tests
 -------------------------------------------------------------------------------
@@ -7140,6 +7197,17 @@ with messages:
   current counter 10
   i := 10
 
+-------------------------------------------------------------------------------
+Incomplete AssertionHandler
+-------------------------------------------------------------------------------
+AssertionHandler.tests.cpp:<line number>
+...............................................................................
+
+AssertionHandler.tests.cpp:<line number>: FAILED:
+  REQUIRE( Dummy )
+due to unexpected exception with message:
+  Exception translation was disabled by CATCH_CONFIG_FAST_COMPILE
+
 -------------------------------------------------------------------------------
 Inequality checks that should fail
 -------------------------------------------------------------------------------
@@ -7232,6 +7300,291 @@ Condition.tests.cpp:<line number>: PASSED:
 with expansion:
   5 != 6
 
+-------------------------------------------------------------------------------
+JsonWriter
+  Newly constructed JsonWriter does nothing
+-------------------------------------------------------------------------------
+Json.tests.cpp:<line number>
+...............................................................................
+
+Json.tests.cpp:<line number>: PASSED:
+  REQUIRE( stream.str() == "" )
+with expansion:
+  "" == ""
+
+-------------------------------------------------------------------------------
+JsonWriter
+  Calling writeObject will create an empty pair of braces
+-------------------------------------------------------------------------------
+Json.tests.cpp:<line number>
+...............................................................................
+
+Json.tests.cpp:<line number>: PASSED:
+  REQUIRE( stream.str() == "{\n}" )
+with expansion:
+  "{
+  }"
+  ==
+  "{
+  }"
+
+-------------------------------------------------------------------------------
+JsonWriter
+  Calling writeObject with key will create an object to write the value
+-------------------------------------------------------------------------------
+Json.tests.cpp:<line number>
+...............................................................................
+
+Json.tests.cpp:<line number>: PASSED:
+  REQUIRE_THAT( stream.str(), ContainsSubstring( "\"int\": 1," ) && ContainsSubstring( "\"double\": 1.5," ) && ContainsSubstring( "\"true\": true," ) && ContainsSubstring( "\"false\": false," ) && ContainsSubstring( "\"string\": \"this is a string\"," ) && ContainsSubstring( "\"array\": [\n    1,\n    2\n  ]\n}" ) )
+with expansion:
+  "{
+    "int": 1,
+    "double": 1.5,
+    "true": true,
+    "false": false,
+    "string": "this is a string",
+    "array": [
+      1,
+      2
+    ]
+  }" ( contains: ""int": 1," and contains: ""double": 1.5," and contains:
+  ""true": true," and contains: ""false": false," and contains: ""string":
+  "this is a string"," and contains: ""array": [
+      1,
+      2
+    ]
+  }" )
+
+-------------------------------------------------------------------------------
+JsonWriter
+  nesting objects
+-------------------------------------------------------------------------------
+Json.tests.cpp:<line number>
+...............................................................................
+
+Json.tests.cpp:<line number>: PASSED:
+  REQUIRE_THAT( stream.str(), ContainsSubstring( "\"empty_object\": {\n  }," ) && ContainsSubstring( "\"fully_object\": {\n    \"key\": 1\n  }" ) )
+with expansion:
+  "{
+    "empty_object": {
+    },
+    "fully_object": {
+      "key": 1
+    }
+  }" ( contains: ""empty_object": {
+    }," and contains: ""fully_object": {
+      "key": 1
+    }" )
+
+-------------------------------------------------------------------------------
+JsonWriter
+  Calling writeArray will create an empty pair of braces
+-------------------------------------------------------------------------------
+Json.tests.cpp:<line number>
+...............................................................................
+
+Json.tests.cpp:<line number>: PASSED:
+  REQUIRE( stream.str() == "[\n]" )
+with expansion:
+  "[
+  ]"
+  ==
+  "[
+  ]"
+
+-------------------------------------------------------------------------------
+JsonWriter
+  Calling writeArray creates array to write the values to
+-------------------------------------------------------------------------------
+Json.tests.cpp:<line number>
+...............................................................................
+
+Json.tests.cpp:<line number>: PASSED:
+  REQUIRE( stream.str() == "[\n  1,\n  1.5,\n  true,\n  false,\n  \"this is a string\",\n  {\n    \"object\": 42\n  },\n  [\n    \"array\",\n    42.5\n  ]\n]" )
+with expansion:
+  "[
+    1,
+    1.5,
+    true,
+    false,
+    "this is a string",
+    {
+      "object": 42
+    },
+    [
+      "array",
+      42.5
+    ]
+  ]"
+  ==
+  "[
+    1,
+    1.5,
+    true,
+    false,
+    "this is a string",
+    {
+      "object": 42
+    },
+    [
+      "array",
+      42.5
+    ]
+  ]"
+
+-------------------------------------------------------------------------------
+JsonWriter
+  Moved from JsonObjectWriter shall not insert superfluous brace
+-------------------------------------------------------------------------------
+Json.tests.cpp:<line number>
+...............................................................................
+
+Json.tests.cpp:<line number>: PASSED:
+  REQUIRE( stream.str() == "{\n}" )
+with expansion:
+  "{
+  }"
+  ==
+  "{
+  }"
+
+-------------------------------------------------------------------------------
+JsonWriter
+  Moved from JsonArrayWriter shall not insert superfluous bracket
+-------------------------------------------------------------------------------
+Json.tests.cpp:<line number>
+...............................................................................
+
+Json.tests.cpp:<line number>: PASSED:
+  REQUIRE( stream.str() == "[\n]" )
+with expansion:
+  "[
+  ]"
+  ==
+  "[
+  ]"
+
+-------------------------------------------------------------------------------
+JsonWriter
+  Custom class shall be quoted
+-------------------------------------------------------------------------------
+Json.tests.cpp:<line number>
+...............................................................................
+
+Json.tests.cpp:<line number>: PASSED:
+  REQUIRE( stream.str() == "\"custom\"" )
+with expansion:
+  ""custom"" == ""custom""
+
+-------------------------------------------------------------------------------
+JsonWriter escapes charaters in strings properly
+  Quote in a string is escaped
+-------------------------------------------------------------------------------
+Json.tests.cpp:<line number>
+...............................................................................
+
+Json.tests.cpp:<line number>: PASSED:
+  REQUIRE( sstream.str() == "\"\\\"\"" )
+with expansion:
+  ""\""" == ""\"""
+
+-------------------------------------------------------------------------------
+JsonWriter escapes charaters in strings properly
+  Backslash in a string is escaped
+-------------------------------------------------------------------------------
+Json.tests.cpp:<line number>
+...............................................................................
+
+Json.tests.cpp:<line number>: PASSED:
+  REQUIRE( sstream.str() == "\"\\\\\"" )
+with expansion:
+  ""\\"" == ""\\""
+
+-------------------------------------------------------------------------------
+JsonWriter escapes charaters in strings properly
+  Forward slash in a string is **not** escaped
+-------------------------------------------------------------------------------
+Json.tests.cpp:<line number>
+...............................................................................
+
+Json.tests.cpp:<line number>: PASSED:
+  REQUIRE( sstream.str() == "\"/\"" )
+with expansion:
+  ""/"" == ""/""
+
+-------------------------------------------------------------------------------
+JsonWriter escapes charaters in strings properly
+  Backspace in a string is escaped
+-------------------------------------------------------------------------------
+Json.tests.cpp:<line number>
+...............................................................................
+
+Json.tests.cpp:<line number>: PASSED:
+  REQUIRE( sstream.str() == "\"\\b\"" )
+with expansion:
+  ""\b"" == ""\b""
+
+-------------------------------------------------------------------------------
+JsonWriter escapes charaters in strings properly
+  Formfeed in a string is escaped
+-------------------------------------------------------------------------------
+Json.tests.cpp:<line number>
+...............................................................................
+
+Json.tests.cpp:<line number>: PASSED:
+  REQUIRE( sstream.str() == "\"\\f\"" )
+with expansion:
+  ""\f"" == ""\f""
+
+-------------------------------------------------------------------------------
+JsonWriter escapes charaters in strings properly
+  linefeed in a string is escaped
+-------------------------------------------------------------------------------
+Json.tests.cpp:<line number>
+...............................................................................
+
+Json.tests.cpp:<line number>: PASSED:
+  REQUIRE( sstream.str() == "\"\\n\"" )
+with expansion:
+  ""\n"" == ""\n""
+
+-------------------------------------------------------------------------------
+JsonWriter escapes charaters in strings properly
+  carriage return in a string is escaped
+-------------------------------------------------------------------------------
+Json.tests.cpp:<line number>
+...............................................................................
+
+Json.tests.cpp:<line number>: PASSED:
+  REQUIRE( sstream.str() == "\"\\r\"" )
+with expansion:
+  ""\r"" == ""\r""
+
+-------------------------------------------------------------------------------
+JsonWriter escapes charaters in strings properly
+  tab in a string is escaped
+-------------------------------------------------------------------------------
+Json.tests.cpp:<line number>
+...............................................................................
+
+Json.tests.cpp:<line number>: PASSED:
+  REQUIRE( sstream.str() == "\"\\t\"" )
+with expansion:
+  ""\t"" == ""\t""
+
+-------------------------------------------------------------------------------
+JsonWriter escapes charaters in strings properly
+  combination of characters is escaped
+-------------------------------------------------------------------------------
+Json.tests.cpp:<line number>
+...............................................................................
+
+Json.tests.cpp:<line number>: PASSED:
+  REQUIRE( sstream.str() == "\"\\\\/\\t\\r\\n\"" )
+with expansion:
+  ""\\/\t\r\n"" == ""\\/\t\r\n""
+
 -------------------------------------------------------------------------------
 Lambdas in assertions
 -------------------------------------------------------------------------------
@@ -9730,6 +10083,129 @@ Reporter's write listings to provided stream
 Reporters.tests.cpp:<line number>
 ...............................................................................
 
+Reporters.tests.cpp:<line number>: PASSED:
+  REQUIRE_FALSE( factories.empty() )
+with expansion:
+  !false
+
+-------------------------------------------------------------------------------
+Reporter's write listings to provided stream
+  JSON reporter lists tags
+-------------------------------------------------------------------------------
+Reporters.tests.cpp:<line number>
+...............................................................................
+
+Reporters.tests.cpp:<line number>: PASSED:
+  REQUIRE_THAT( listingString, ContainsSubstring("fakeTag"s) )
+with expansion:
+  "{
+    "version": 1,
+    "metadata": {
+      "name": "",
+      "rng-seed": 1234,
+      "catch2-version": "<version>"
+    },
+    "listings": {
+      "tags": [
+        {
+          "aliases": [
+            "fakeTag"
+          ],
+          "count": 1
+        }
+      ]" contains: "fakeTag"
+with message:
+  Tested reporter: JSON
+
+-------------------------------------------------------------------------------
+Reporter's write listings to provided stream
+-------------------------------------------------------------------------------
+Reporters.tests.cpp:<line number>
+...............................................................................
+
+Reporters.tests.cpp:<line number>: PASSED:
+  REQUIRE_FALSE( factories.empty() )
+with expansion:
+  !false
+
+-------------------------------------------------------------------------------
+Reporter's write listings to provided stream
+  JSON reporter lists reporters
+-------------------------------------------------------------------------------
+Reporters.tests.cpp:<line number>
+...............................................................................
+
+Reporters.tests.cpp:<line number>: PASSED:
+  REQUIRE_THAT( listingString, ContainsSubstring("fake reporter"s) )
+with expansion:
+  "{
+    "version": 1,
+    "metadata": {
+      "name": "",
+      "rng-seed": 1234,
+      "catch2-version": "<version>"
+    },
+    "listings": {
+      "reporters": [
+        {
+          "name": "fake reporter",
+          "description": "fake description"
+        }
+      ]" contains: "fake reporter"
+with message:
+  Tested reporter: JSON
+
+-------------------------------------------------------------------------------
+Reporter's write listings to provided stream
+-------------------------------------------------------------------------------
+Reporters.tests.cpp:<line number>
+...............................................................................
+
+Reporters.tests.cpp:<line number>: PASSED:
+  REQUIRE_FALSE( factories.empty() )
+with expansion:
+  !false
+
+-------------------------------------------------------------------------------
+Reporter's write listings to provided stream
+  JSON reporter lists tests
+-------------------------------------------------------------------------------
+Reporters.tests.cpp:<line number>
+...............................................................................
+
+Reporters.tests.cpp:<line number>: PASSED:
+  REQUIRE_THAT( listingString, ContainsSubstring( "fake test name"s ) && ContainsSubstring( "fakeTestTag"s ) )
+with expansion:
+  "{
+    "version": 1,
+    "metadata": {
+      "name": "",
+      "rng-seed": 1234,
+      "catch2-version": "<version>"
+    },
+    "listings": {
+      "tests": [
+        {
+          "name": "fake test name",
+          "class-name": "",
+          "tags": [
+            "fakeTestTag"
+          ],
+          "source-location": {
+            "filename": "fake-file.cpp",
+            "line": 123456789
+          }
+        }
+      ]" ( contains: "fake test name" and contains: "fakeTestTag" )
+with message:
+  Tested reporter: JSON
+
+-------------------------------------------------------------------------------
+Reporter's write listings to provided stream
+-------------------------------------------------------------------------------
+Reporters.tests.cpp:<line number>
+...............................................................................
+
 Reporters.tests.cpp:<line number>: PASSED:
   REQUIRE_FALSE( factories.empty() )
 with expansion:
@@ -12514,6 +12990,34 @@ Misc.tests.cpp:<line number>: FAILED - but was ok:
 
 Misc.tests.cpp:<line number>: FAILED:
 
+-------------------------------------------------------------------------------
+Testing checked-if 4
+-------------------------------------------------------------------------------
+Misc.tests.cpp:<line number>
+...............................................................................
+
+Misc.tests.cpp:<line number>: PASSED:
+  CHECKED_ELSE( true )
+
+Misc.tests.cpp:<line number>: FAILED:
+  {Unknown expression after the reported line}
+due to unexpected exception with message:
+  Uncaught exception should fail!
+
+-------------------------------------------------------------------------------
+Testing checked-if 5
+-------------------------------------------------------------------------------
+Misc.tests.cpp:<line number>
+...............................................................................
+
+Misc.tests.cpp:<line number>: FAILED - but was ok:
+  CHECKED_ELSE( false )
+
+Misc.tests.cpp:<line number>: FAILED:
+  {Unknown expression after the reported line}
+due to unexpected exception with message:
+  Uncaught exception should fail!
+
 -------------------------------------------------------------------------------
 The NO_FAIL macro reports a failure but does not fail the test
 -------------------------------------------------------------------------------
@@ -13453,7 +13957,7 @@ with expansion:
 -------------------------------------------------------------------------------
 Usage of AllTrue range matcher
   Basic usage
-  One false evalutes to false
+  One false evaluates to false
 -------------------------------------------------------------------------------
 MatchersRanges.tests.cpp:<line number>
 ...............................................................................
@@ -13492,7 +13996,7 @@ with expansion:
 -------------------------------------------------------------------------------
 Usage of AllTrue range matcher
   Contained type is convertible to bool
-  One false evalutes to false
+  One false evaluates to false
 -------------------------------------------------------------------------------
 MatchersRanges.tests.cpp:<line number>
 ...............................................................................
@@ -13728,7 +14232,7 @@ with expansion:
 -------------------------------------------------------------------------------
 Usage of AnyTrue range matcher
   Basic usage
-  One true evalutes to true
+  One true evaluates to true
 -------------------------------------------------------------------------------
 MatchersRanges.tests.cpp:<line number>
 ...............................................................................
@@ -13767,7 +14271,7 @@ with expansion:
 -------------------------------------------------------------------------------
 Usage of AnyTrue range matcher
   Contained type is convertible to bool
-  One true evalutes to true
+  One true evaluates to true
 -------------------------------------------------------------------------------
 MatchersRanges.tests.cpp:<line number>
 ...............................................................................
@@ -14003,7 +14507,7 @@ with expansion:
 -------------------------------------------------------------------------------
 Usage of NoneTrue range matcher
   Basic usage
-  One true evalutes to false
+  One true evaluates to false
 -------------------------------------------------------------------------------
 MatchersRanges.tests.cpp:<line number>
 ...............................................................................
@@ -14042,7 +14546,7 @@ with expansion:
 -------------------------------------------------------------------------------
 Usage of NoneTrue range matcher
   Contained type is convertible to bool
-  One true evalutes to false
+  One true evaluates to false
 -------------------------------------------------------------------------------
 MatchersRanges.tests.cpp:<line number>
 ...............................................................................
@@ -17733,6 +18237,22 @@ InternalBenchmark.tests.cpp:<line number>: PASSED:
 with expansion:
   0.95 == 0.95
 
+-------------------------------------------------------------------------------
+uniform_integer_distribution can return the bounds
+-------------------------------------------------------------------------------
+RandomNumberGeneration.tests.cpp:<line number>
+...............................................................................
+
+RandomNumberGeneration.tests.cpp:<line number>: PASSED:
+  REQUIRE( dist.a() == -10 )
+with expansion:
+  -10 == -10
+
+RandomNumberGeneration.tests.cpp:<line number>: PASSED:
+  REQUIRE( dist.b() == 10 )
+with expansion:
+  10 == 10
+
 -------------------------------------------------------------------------------
 unique_ptr reimplementation: basic functionality
   Default constructed unique_ptr is empty
@@ -18220,6 +18740,6 @@ Misc.tests.cpp:<line number>
 Misc.tests.cpp:<line number>: PASSED:
 
 ===============================================================================
-test cases:  409 |  309 passed |  84 failed | 5 skipped | 11 failed as expected
-assertions: 2226 | 2049 passed | 145 failed | 32 failed as expected
+test cases:  417 |  312 passed |  85 failed | 6 skipped | 14 failed as expected
+assertions: 2260 | 2079 passed | 146 failed | 35 failed as expected
 
diff --git a/external_imported/Catch2/tests/SelfTest/Baselines/junit.sw.approved.txt b/external_imported/Catch2/tests/SelfTest/Baselines/junit.sw.approved.txt
index 25129349c..48eccfc3d 100644
--- a/external_imported/Catch2/tests/SelfTest/Baselines/junit.sw.approved.txt
+++ b/external_imported/Catch2/tests/SelfTest/Baselines/junit.sw.approved.txt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuitesloose text artifact
 >
-  <testsuite name="<exe-name>" errors="17" failures="128" skipped="11" tests="2237" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
+  <testsuite name="<exe-name>" errors="17" failures="129" skipped="12" tests="2272" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
     <properties>
       <property name="random-seed" value="1"/>
       <property name="filters" value="&quot;*&quot; ~[!nonportable] ~[!benchmark] ~[approvals]"/>
@@ -462,8 +462,14 @@ at Exception.tests.cpp:<line number>
     </testcase>
     <testcase classname="<exe-name>.global" name="Default scale is invisible to comparison" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Directly creating an EnumInfo" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Empty generators can SKIP in constructor" time="{duration}" status="run">
+      <skipped type="SKIP">
+SKIPPED
+This generator is empty
+at Skip.tests.cpp:<line number>
+      </skipped>
+    </testcase>
     <testcase classname="<exe-name>.global" name="Empty stream name opens cout stream" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Empty tag is not allowed" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="EndsWith string matcher" time="{duration}" status="run">
       <failure message="testStringForMatching(), EndsWith( &quot;Substring&quot; )" type="CHECK_THAT">
 FAILED:
@@ -702,6 +708,7 @@ at Message.tests.cpp:<line number>
     <testcase classname="<exe-name>.global" name="Floating point matchers: float/Composed" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Floating point matchers: float/Constructor validation" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Floating point matchers: float/IsNaN" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="GENERATE can combine literals and generators" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Generators -- adapters/Filtering by predicate/Basic usage" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Generators -- adapters/Filtering by predicate/Throws if there are no matching values" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Generators -- adapters/Shortening a range" time="{duration}" status="run"/>
@@ -746,6 +753,15 @@ at Message.tests.cpp:<line number>
     <testcase classname="<exe-name>.global" name="Hashing different test cases produces different result/Different classname" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Hashing different test cases produces different result/Different tags" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Hashing test case produces same hash across multiple calls" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="INFO and UNSCOPED_INFO can stream multiple arguments" time="{duration}" status="run">
+      <failure type="FAIL">
+FAILED:
+Show infos!
+This info has multiple parts.
+This unscoped info has multiple parts.
+at Message.tests.cpp:<line number>
+      </failure>
+    </testcase>
     <testcase classname="<exe-name>.global" name="INFO and WARN do not abort tests" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="INFO gets logged on failure" time="{duration}" status="run">
       <failure message="a == 1" type="REQUIRE">
@@ -790,6 +806,15 @@ i := 10
 at Message.tests.cpp:<line number>
       </failure>
     </testcase>
+    <testcase classname="<exe-name>.global" name="Incomplete AssertionHandler" time="{duration}" status="run">
+      <skipped message="TEST_CASE tagged with !mayfail"/>
+      <error message="Dummy" type="REQUIRE">
+FAILED:
+  REQUIRE( Dummy )
+Exception translation was disabled by CATCH_CONFIG_FAST_COMPILE
+at AssertionHandler.tests.cpp:<line number>
+      </error>
+    </testcase>
     <testcase classname="<exe-name>.global" name="Inequality checks that should fail" time="{duration}" status="run">
       <skipped message="TEST_CASE tagged with !mayfail"/>
       <failure message="data.int_seven != 7" type="CHECK">
@@ -829,6 +854,24 @@ at Condition.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Inequality checks that should succeed" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="JsonWriter/Newly constructed JsonWriter does nothing" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="JsonWriter/Calling writeObject will create an empty pair of braces" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="JsonWriter/Calling writeObject with key will create an object to write the value" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="JsonWriter/nesting objects" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="JsonWriter/Calling writeArray will create an empty pair of braces" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="JsonWriter/Calling writeArray creates array to write the values to" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="JsonWriter/Moved from JsonObjectWriter shall not insert superfluous brace" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="JsonWriter/Moved from JsonArrayWriter shall not insert superfluous bracket" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="JsonWriter/Custom class shall be quoted" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/Quote in a string is escaped" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/Backslash in a string is escaped" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/Forward slash in a string is **not** escaped" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/Backspace in a string is escaped" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/Formfeed in a string is escaped" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/linefeed in a string is escaped" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/carriage return in a string is escaped" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/tab in a string is escaped" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/combination of characters is escaped" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Lambdas in assertions" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Less-than inequalities with different epsilons" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="ManuallyRegistered" time="{duration}" status="run"/>
@@ -1166,6 +1209,9 @@ at Matchers.tests.cpp:<line number>
     <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/console reporter lists tags" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/console reporter lists reporters" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/console reporter lists tests" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/JSON reporter lists tags" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/JSON reporter lists reporters" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/JSON reporter lists tests" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/JUnit reporter lists tags" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/JUnit reporter lists reporters" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/JUnit reporter lists tests" time="{duration}" status="run"/>
@@ -1354,6 +1400,24 @@ FAILED:
 at Misc.tests.cpp:<line number>
       </failure>
     </testcase>
+    <testcase classname="<exe-name>.global" name="Testing checked-if 4" time="{duration}" status="run">
+      <skipped message="TEST_CASE tagged with !mayfail"/>
+      <error message="{Unknown expression after the reported line}">
+FAILED:
+  {Unknown expression after the reported line}
+Uncaught exception should fail!
+at Misc.tests.cpp:<line number>
+      </error>
+    </testcase>
+    <testcase classname="<exe-name>.global" name="Testing checked-if 5" time="{duration}" status="run">
+      <skipped message="TEST_CASE tagged with !mayfail"/>
+      <error message="{Unknown expression after the reported line}">
+FAILED:
+  {Unknown expression after the reported line}
+Uncaught exception should fail!
+at Misc.tests.cpp:<line number>
+      </error>
+    </testcase>
     <testcase classname="<exe-name>.global" name="The NO_FAIL macro reports a failure but does not fail the test" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="The default listing implementation write to provided stream/Listing tags" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="The default listing implementation write to provided stream/Listing reporters" time="{duration}" status="run"/>
@@ -1401,10 +1465,10 @@ at Exception.tests.cpp:<line number>
     <testcase classname="<exe-name>.global" name="Usage of AllMatch range matcher/Shortcircuiting/Short-circuited" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AllTrue range matcher/Basic usage/All true evaluates to true" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AllTrue range matcher/Basic usage/Empty evaluates to true" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Usage of AllTrue range matcher/Basic usage/One false evalutes to false" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Usage of AllTrue range matcher/Basic usage/One false evaluates to false" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AllTrue range matcher/Basic usage/All false evaluates to false" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AllTrue range matcher/Contained type is convertible to bool/All true evaluates to true" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Usage of AllTrue range matcher/Contained type is convertible to bool/One false evalutes to false" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Usage of AllTrue range matcher/Contained type is convertible to bool/One false evaluates to false" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AllTrue range matcher/Contained type is convertible to bool/All false evaluates to false" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AllTrue range matcher/Shortcircuiting/All are read" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AllTrue range matcher/Shortcircuiting/Short-circuited" time="{duration}" status="run"/>
@@ -1414,10 +1478,10 @@ at Exception.tests.cpp:<line number>
     <testcase classname="<exe-name>.global" name="Usage of AnyMatch range matcher/Shortcircuiting/Short-circuited" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AnyTrue range matcher/Basic usage/All true evaluates to true" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AnyTrue range matcher/Basic usage/Empty evaluates to false" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Usage of AnyTrue range matcher/Basic usage/One true evalutes to true" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Usage of AnyTrue range matcher/Basic usage/One true evaluates to true" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AnyTrue range matcher/Basic usage/All false evaluates to false" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AnyTrue range matcher/Contained type is convertible to bool/All true evaluates to true" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Usage of AnyTrue range matcher/Contained type is convertible to bool/One true evalutes to true" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Usage of AnyTrue range matcher/Contained type is convertible to bool/One true evaluates to true" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AnyTrue range matcher/Contained type is convertible to bool/All false evaluates to false" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AnyTrue range matcher/Shortcircuiting/All are read" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AnyTrue range matcher/Shortcircuiting/Short-circuited" time="{duration}" status="run"/>
@@ -1427,10 +1491,10 @@ at Exception.tests.cpp:<line number>
     <testcase classname="<exe-name>.global" name="Usage of NoneMatch range matcher/Shortcircuiting/Short-circuited" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of NoneTrue range matcher/Basic usage/All true evaluates to false" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of NoneTrue range matcher/Basic usage/Empty evaluates to true" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Usage of NoneTrue range matcher/Basic usage/One true evalutes to false" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Usage of NoneTrue range matcher/Basic usage/One true evaluates to false" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of NoneTrue range matcher/Basic usage/All false evaluates to true" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of NoneTrue range matcher/Contained type is convertible to bool/All true evaluates to false" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Usage of NoneTrue range matcher/Contained type is convertible to bool/One true evalutes to false" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Usage of NoneTrue range matcher/Contained type is convertible to bool/One true evaluates to false" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of NoneTrue range matcher/Contained type is convertible to bool/All false evaluates to true" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of NoneTrue range matcher/Shortcircuiting/All are read" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of NoneTrue range matcher/Shortcircuiting/Short-circuited" time="{duration}" status="run"/>
@@ -2011,6 +2075,7 @@ at Exception.tests.cpp:<line number>
     <testcase classname="<exe-name>.global" name="tuple&lt;string,string>" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="tuple&lt;tuple&lt;int>,tuple&lt;>,float>" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="uniform samples" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="uniform_integer_distribution can return the bounds" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="unique_ptr reimplementation: basic functionality/Default constructed unique_ptr is empty" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="unique_ptr reimplementation: basic functionality/Take ownership of allocation" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="unique_ptr reimplementation: basic functionality/Take ownership of allocation/Plain reset deallocates" time="{duration}" status="run"/>
diff --git a/external_imported/Catch2/tests/SelfTest/Baselines/junit.sw.multi.approved.txt b/external_imported/Catch2/tests/SelfTest/Baselines/junit.sw.multi.approved.txt
index 6220d8e23..d270c88fb 100644
--- a/external_imported/Catch2/tests/SelfTest/Baselines/junit.sw.multi.approved.txt
+++ b/external_imported/Catch2/tests/SelfTest/Baselines/junit.sw.multi.approved.txt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites>
-  <testsuite name="<exe-name>" errors="17" failures="128" skipped="11" tests="2237" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
+  <testsuite name="<exe-name>" errors="17" failures="129" skipped="12" tests="2272" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
     <properties>
       <property name="random-seed" value="1"/>
       <property name="filters" value="&quot;*&quot; ~[!nonportable] ~[!benchmark] ~[approvals]"/>
@@ -461,8 +461,14 @@ at Exception.tests.cpp:<line number>
     </testcase>
     <testcase classname="<exe-name>.global" name="Default scale is invisible to comparison" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Directly creating an EnumInfo" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Empty generators can SKIP in constructor" time="{duration}" status="run">
+      <skipped type="SKIP">
+SKIPPED
+This generator is empty
+at Skip.tests.cpp:<line number>
+      </skipped>
+    </testcase>
     <testcase classname="<exe-name>.global" name="Empty stream name opens cout stream" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Empty tag is not allowed" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="EndsWith string matcher" time="{duration}" status="run">
       <failure message="testStringForMatching(), EndsWith( &quot;Substring&quot; )" type="CHECK_THAT">
 FAILED:
@@ -701,6 +707,7 @@ at Message.tests.cpp:<line number>
     <testcase classname="<exe-name>.global" name="Floating point matchers: float/Composed" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Floating point matchers: float/Constructor validation" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Floating point matchers: float/IsNaN" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="GENERATE can combine literals and generators" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Generators -- adapters/Filtering by predicate/Basic usage" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Generators -- adapters/Filtering by predicate/Throws if there are no matching values" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Generators -- adapters/Shortening a range" time="{duration}" status="run"/>
@@ -745,6 +752,15 @@ at Message.tests.cpp:<line number>
     <testcase classname="<exe-name>.global" name="Hashing different test cases produces different result/Different classname" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Hashing different test cases produces different result/Different tags" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Hashing test case produces same hash across multiple calls" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="INFO and UNSCOPED_INFO can stream multiple arguments" time="{duration}" status="run">
+      <failure type="FAIL">
+FAILED:
+Show infos!
+This info has multiple parts.
+This unscoped info has multiple parts.
+at Message.tests.cpp:<line number>
+      </failure>
+    </testcase>
     <testcase classname="<exe-name>.global" name="INFO and WARN do not abort tests" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="INFO gets logged on failure" time="{duration}" status="run">
       <failure message="a == 1" type="REQUIRE">
@@ -789,6 +805,15 @@ i := 10
 at Message.tests.cpp:<line number>
       </failure>
     </testcase>
+    <testcase classname="<exe-name>.global" name="Incomplete AssertionHandler" time="{duration}" status="run">
+      <skipped message="TEST_CASE tagged with !mayfail"/>
+      <error message="Dummy" type="REQUIRE">
+FAILED:
+  REQUIRE( Dummy )
+Exception translation was disabled by CATCH_CONFIG_FAST_COMPILE
+at AssertionHandler.tests.cpp:<line number>
+      </error>
+    </testcase>
     <testcase classname="<exe-name>.global" name="Inequality checks that should fail" time="{duration}" status="run">
       <skipped message="TEST_CASE tagged with !mayfail"/>
       <failure message="data.int_seven != 7" type="CHECK">
@@ -828,6 +853,24 @@ at Condition.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Inequality checks that should succeed" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="JsonWriter/Newly constructed JsonWriter does nothing" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="JsonWriter/Calling writeObject will create an empty pair of braces" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="JsonWriter/Calling writeObject with key will create an object to write the value" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="JsonWriter/nesting objects" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="JsonWriter/Calling writeArray will create an empty pair of braces" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="JsonWriter/Calling writeArray creates array to write the values to" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="JsonWriter/Moved from JsonObjectWriter shall not insert superfluous brace" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="JsonWriter/Moved from JsonArrayWriter shall not insert superfluous bracket" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="JsonWriter/Custom class shall be quoted" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/Quote in a string is escaped" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/Backslash in a string is escaped" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/Forward slash in a string is **not** escaped" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/Backspace in a string is escaped" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/Formfeed in a string is escaped" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/linefeed in a string is escaped" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/carriage return in a string is escaped" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/tab in a string is escaped" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/combination of characters is escaped" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Lambdas in assertions" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Less-than inequalities with different epsilons" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="ManuallyRegistered" time="{duration}" status="run"/>
@@ -1165,6 +1208,9 @@ at Matchers.tests.cpp:<line number>
     <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/console reporter lists tags" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/console reporter lists reporters" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/console reporter lists tests" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/JSON reporter lists tags" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/JSON reporter lists reporters" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/JSON reporter lists tests" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/JUnit reporter lists tags" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/JUnit reporter lists reporters" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/JUnit reporter lists tests" time="{duration}" status="run"/>
@@ -1353,6 +1399,24 @@ FAILED:
 at Misc.tests.cpp:<line number>
       </failure>
     </testcase>
+    <testcase classname="<exe-name>.global" name="Testing checked-if 4" time="{duration}" status="run">
+      <skipped message="TEST_CASE tagged with !mayfail"/>
+      <error message="{Unknown expression after the reported line}">
+FAILED:
+  {Unknown expression after the reported line}
+Uncaught exception should fail!
+at Misc.tests.cpp:<line number>
+      </error>
+    </testcase>
+    <testcase classname="<exe-name>.global" name="Testing checked-if 5" time="{duration}" status="run">
+      <skipped message="TEST_CASE tagged with !mayfail"/>
+      <error message="{Unknown expression after the reported line}">
+FAILED:
+  {Unknown expression after the reported line}
+Uncaught exception should fail!
+at Misc.tests.cpp:<line number>
+      </error>
+    </testcase>
     <testcase classname="<exe-name>.global" name="The NO_FAIL macro reports a failure but does not fail the test" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="The default listing implementation write to provided stream/Listing tags" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="The default listing implementation write to provided stream/Listing reporters" time="{duration}" status="run"/>
@@ -1400,10 +1464,10 @@ at Exception.tests.cpp:<line number>
     <testcase classname="<exe-name>.global" name="Usage of AllMatch range matcher/Shortcircuiting/Short-circuited" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AllTrue range matcher/Basic usage/All true evaluates to true" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AllTrue range matcher/Basic usage/Empty evaluates to true" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Usage of AllTrue range matcher/Basic usage/One false evalutes to false" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Usage of AllTrue range matcher/Basic usage/One false evaluates to false" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AllTrue range matcher/Basic usage/All false evaluates to false" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AllTrue range matcher/Contained type is convertible to bool/All true evaluates to true" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Usage of AllTrue range matcher/Contained type is convertible to bool/One false evalutes to false" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Usage of AllTrue range matcher/Contained type is convertible to bool/One false evaluates to false" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AllTrue range matcher/Contained type is convertible to bool/All false evaluates to false" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AllTrue range matcher/Shortcircuiting/All are read" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AllTrue range matcher/Shortcircuiting/Short-circuited" time="{duration}" status="run"/>
@@ -1413,10 +1477,10 @@ at Exception.tests.cpp:<line number>
     <testcase classname="<exe-name>.global" name="Usage of AnyMatch range matcher/Shortcircuiting/Short-circuited" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AnyTrue range matcher/Basic usage/All true evaluates to true" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AnyTrue range matcher/Basic usage/Empty evaluates to false" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Usage of AnyTrue range matcher/Basic usage/One true evalutes to true" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Usage of AnyTrue range matcher/Basic usage/One true evaluates to true" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AnyTrue range matcher/Basic usage/All false evaluates to false" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AnyTrue range matcher/Contained type is convertible to bool/All true evaluates to true" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Usage of AnyTrue range matcher/Contained type is convertible to bool/One true evalutes to true" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Usage of AnyTrue range matcher/Contained type is convertible to bool/One true evaluates to true" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AnyTrue range matcher/Contained type is convertible to bool/All false evaluates to false" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AnyTrue range matcher/Shortcircuiting/All are read" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AnyTrue range matcher/Shortcircuiting/Short-circuited" time="{duration}" status="run"/>
@@ -1426,10 +1490,10 @@ at Exception.tests.cpp:<line number>
     <testcase classname="<exe-name>.global" name="Usage of NoneMatch range matcher/Shortcircuiting/Short-circuited" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of NoneTrue range matcher/Basic usage/All true evaluates to false" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of NoneTrue range matcher/Basic usage/Empty evaluates to true" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Usage of NoneTrue range matcher/Basic usage/One true evalutes to false" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Usage of NoneTrue range matcher/Basic usage/One true evaluates to false" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of NoneTrue range matcher/Basic usage/All false evaluates to true" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of NoneTrue range matcher/Contained type is convertible to bool/All true evaluates to false" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Usage of NoneTrue range matcher/Contained type is convertible to bool/One true evalutes to false" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Usage of NoneTrue range matcher/Contained type is convertible to bool/One true evaluates to false" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of NoneTrue range matcher/Contained type is convertible to bool/All false evaluates to true" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of NoneTrue range matcher/Shortcircuiting/All are read" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of NoneTrue range matcher/Shortcircuiting/Short-circuited" time="{duration}" status="run"/>
@@ -2010,6 +2074,7 @@ at Exception.tests.cpp:<line number>
     <testcase classname="<exe-name>.global" name="tuple&lt;string,string>" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="tuple&lt;tuple&lt;int>,tuple&lt;>,float>" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="uniform samples" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="uniform_integer_distribution can return the bounds" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="unique_ptr reimplementation: basic functionality/Default constructed unique_ptr is empty" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="unique_ptr reimplementation: basic functionality/Take ownership of allocation" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="unique_ptr reimplementation: basic functionality/Take ownership of allocation/Plain reset deallocates" time="{duration}" status="run"/>
diff --git a/external_imported/Catch2/tests/SelfTest/Baselines/sonarqube.sw.approved.txt b/external_imported/Catch2/tests/SelfTest/Baselines/sonarqube.sw.approved.txt
index a4e08bd26..36b05e54d 100644
--- a/external_imported/Catch2/tests/SelfTest/Baselines/sonarqube.sw.approved.txt
+++ b/external_imported/Catch2/tests/SelfTest/Baselines/sonarqube.sw.approved.txt
@@ -2,6 +2,16 @@
 <!-- filters='"*" ~[!nonportable] ~[!benchmark] ~[approvals]' rng-seed=1 -->
 <testExecutions version="1"loose text artifact
 >
+  <file path="tests/<exe-name>/IntrospectiveTests/AssertionHandler.tests.cpp">
+    <testCase name="Incomplete AssertionHandler" duration="{duration}">
+      <skipped message="REQUIRE(Dummy)">
+FAILED:
+	REQUIRE( Dummy )
+Exception translation was disabled by CATCH_CONFIG_FAST_COMPILE
+at AssertionHandler.tests.cpp:<line number>
+      </skipped>
+    </testCase>
+  </file>
   <file path="tests/<exe-name>/IntrospectiveTests/Clara.tests.cpp">
     <testCase name="Clara::Arg supports single-arg parse the way Opt does" duration="{duration}"/>
     <testCase name="Clara::Opt supports accept-many lambdas/Parsing fails on multiple options without accept_many" duration="{duration}"/>
@@ -120,6 +130,26 @@
     <testCase name="warmup" duration="{duration}"/>
     <testCase name="weighted_average_quantile" duration="{duration}"/>
   </file>
+  <file path="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp">
+    <testCase name="JsonWriter/Newly constructed JsonWriter does nothing" duration="{duration}"/>
+    <testCase name="JsonWriter/Calling writeObject will create an empty pair of braces" duration="{duration}"/>
+    <testCase name="JsonWriter/Calling writeObject with key will create an object to write the value" duration="{duration}"/>
+    <testCase name="JsonWriter/nesting objects" duration="{duration}"/>
+    <testCase name="JsonWriter/Calling writeArray will create an empty pair of braces" duration="{duration}"/>
+    <testCase name="JsonWriter/Calling writeArray creates array to write the values to" duration="{duration}"/>
+    <testCase name="JsonWriter/Moved from JsonObjectWriter shall not insert superfluous brace" duration="{duration}"/>
+    <testCase name="JsonWriter/Moved from JsonArrayWriter shall not insert superfluous bracket" duration="{duration}"/>
+    <testCase name="JsonWriter/Custom class shall be quoted" duration="{duration}"/>
+    <testCase name="JsonWriter escapes charaters in strings properly/Quote in a string is escaped" duration="{duration}"/>
+    <testCase name="JsonWriter escapes charaters in strings properly/Backslash in a string is escaped" duration="{duration}"/>
+    <testCase name="JsonWriter escapes charaters in strings properly/Forward slash in a string is **not** escaped" duration="{duration}"/>
+    <testCase name="JsonWriter escapes charaters in strings properly/Backspace in a string is escaped" duration="{duration}"/>
+    <testCase name="JsonWriter escapes charaters in strings properly/Formfeed in a string is escaped" duration="{duration}"/>
+    <testCase name="JsonWriter escapes charaters in strings properly/linefeed in a string is escaped" duration="{duration}"/>
+    <testCase name="JsonWriter escapes charaters in strings properly/carriage return in a string is escaped" duration="{duration}"/>
+    <testCase name="JsonWriter escapes charaters in strings properly/tab in a string is escaped" duration="{duration}"/>
+    <testCase name="JsonWriter escapes charaters in strings properly/combination of characters is escaped" duration="{duration}"/>
+  </file>
   <file path="tests/<exe-name>/IntrospectiveTests/Parse.tests.cpp">
     <testCase name="Parse uints/proper inputs" duration="{duration}"/>
     <testCase name="Parse uints/Bad inputs" duration="{duration}"/>
@@ -151,6 +181,7 @@
     <testCase name="Our PCG implementation provides expected results for known seeds/Specific seed" duration="{duration}"/>
     <testCase name="Random seed generation accepts known methods" duration="{duration}"/>
     <testCase name="Random seed generation reports unknown methods" duration="{duration}"/>
+    <testCase name="uniform_integer_distribution can return the bounds" duration="{duration}"/>
   </file>
   <file path="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp">
     <testCase name="Multireporter calls reporters and listeners in correct order" duration="{duration}"/>
@@ -168,6 +199,9 @@
     <testCase name="Reporter's write listings to provided stream/console reporter lists tags" duration="{duration}"/>
     <testCase name="Reporter's write listings to provided stream/console reporter lists reporters" duration="{duration}"/>
     <testCase name="Reporter's write listings to provided stream/console reporter lists tests" duration="{duration}"/>
+    <testCase name="Reporter's write listings to provided stream/JSON reporter lists tags" duration="{duration}"/>
+    <testCase name="Reporter's write listings to provided stream/JSON reporter lists reporters" duration="{duration}"/>
+    <testCase name="Reporter's write listings to provided stream/JSON reporter lists tests" duration="{duration}"/>
     <testCase name="Reporter's write listings to provided stream/JUnit reporter lists tags" duration="{duration}"/>
     <testCase name="Reporter's write listings to provided stream/JUnit reporter lists reporters" duration="{duration}"/>
     <testCase name="Reporter's write listings to provided stream/JUnit reporter lists tests" duration="{duration}"/>
@@ -233,7 +267,6 @@
     <testCase name="startsWith" duration="{duration}"/>
   </file>
   <file path="tests/<exe-name>/IntrospectiveTests/Tag.tests.cpp">
-    <testCase name="Empty tag is not allowed" duration="{duration}"/>
     <testCase name="Tag alias can be registered against tag patterns/The same tag alias can only be registered once" duration="{duration}"/>
     <testCase name="Tag alias can be registered against tag patterns/Tag aliases must be of the form [@name]" duration="{duration}"/>
     <testCase name="Tags with spaces and non-alphanumerical characters are accepted" duration="{duration}"/>
@@ -1039,6 +1072,7 @@ at Generators.tests.cpp:<line number>
     <testCase name="Copy and then generate a range/from var and iterators" duration="{duration}"/>
     <testCase name="Copy and then generate a range/From a temporary container" duration="{duration}"/>
     <testCase name="Copy and then generate a range/Final validation" duration="{duration}"/>
+    <testCase name="GENERATE can combine literals and generators" duration="{duration}"/>
     <testCase name="Generators -- adapters/Filtering by predicate/Basic usage" duration="{duration}"/>
     <testCase name="Generators -- adapters/Filtering by predicate/Throws if there are no matching values" duration="{duration}"/>
     <testCase name="Generators -- adapters/Shortening a range" duration="{duration}"/>
@@ -1389,10 +1423,10 @@ at Matchers.tests.cpp:<line number>
     <testCase name="Usage of AllMatch range matcher/Shortcircuiting/Short-circuited" duration="{duration}"/>
     <testCase name="Usage of AllTrue range matcher/Basic usage/All true evaluates to true" duration="{duration}"/>
     <testCase name="Usage of AllTrue range matcher/Basic usage/Empty evaluates to true" duration="{duration}"/>
-    <testCase name="Usage of AllTrue range matcher/Basic usage/One false evalutes to false" duration="{duration}"/>
+    <testCase name="Usage of AllTrue range matcher/Basic usage/One false evaluates to false" duration="{duration}"/>
     <testCase name="Usage of AllTrue range matcher/Basic usage/All false evaluates to false" duration="{duration}"/>
     <testCase name="Usage of AllTrue range matcher/Contained type is convertible to bool/All true evaluates to true" duration="{duration}"/>
-    <testCase name="Usage of AllTrue range matcher/Contained type is convertible to bool/One false evalutes to false" duration="{duration}"/>
+    <testCase name="Usage of AllTrue range matcher/Contained type is convertible to bool/One false evaluates to false" duration="{duration}"/>
     <testCase name="Usage of AllTrue range matcher/Contained type is convertible to bool/All false evaluates to false" duration="{duration}"/>
     <testCase name="Usage of AllTrue range matcher/Shortcircuiting/All are read" duration="{duration}"/>
     <testCase name="Usage of AllTrue range matcher/Shortcircuiting/Short-circuited" duration="{duration}"/>
@@ -1402,10 +1436,10 @@ at Matchers.tests.cpp:<line number>
     <testCase name="Usage of AnyMatch range matcher/Shortcircuiting/Short-circuited" duration="{duration}"/>
     <testCase name="Usage of AnyTrue range matcher/Basic usage/All true evaluates to true" duration="{duration}"/>
     <testCase name="Usage of AnyTrue range matcher/Basic usage/Empty evaluates to false" duration="{duration}"/>
-    <testCase name="Usage of AnyTrue range matcher/Basic usage/One true evalutes to true" duration="{duration}"/>
+    <testCase name="Usage of AnyTrue range matcher/Basic usage/One true evaluates to true" duration="{duration}"/>
     <testCase name="Usage of AnyTrue range matcher/Basic usage/All false evaluates to false" duration="{duration}"/>
     <testCase name="Usage of AnyTrue range matcher/Contained type is convertible to bool/All true evaluates to true" duration="{duration}"/>
-    <testCase name="Usage of AnyTrue range matcher/Contained type is convertible to bool/One true evalutes to true" duration="{duration}"/>
+    <testCase name="Usage of AnyTrue range matcher/Contained type is convertible to bool/One true evaluates to true" duration="{duration}"/>
     <testCase name="Usage of AnyTrue range matcher/Contained type is convertible to bool/All false evaluates to false" duration="{duration}"/>
     <testCase name="Usage of AnyTrue range matcher/Shortcircuiting/All are read" duration="{duration}"/>
     <testCase name="Usage of AnyTrue range matcher/Shortcircuiting/Short-circuited" duration="{duration}"/>
@@ -1415,10 +1449,10 @@ at Matchers.tests.cpp:<line number>
     <testCase name="Usage of NoneMatch range matcher/Shortcircuiting/Short-circuited" duration="{duration}"/>
     <testCase name="Usage of NoneTrue range matcher/Basic usage/All true evaluates to false" duration="{duration}"/>
     <testCase name="Usage of NoneTrue range matcher/Basic usage/Empty evaluates to true" duration="{duration}"/>
-    <testCase name="Usage of NoneTrue range matcher/Basic usage/One true evalutes to false" duration="{duration}"/>
+    <testCase name="Usage of NoneTrue range matcher/Basic usage/One true evaluates to false" duration="{duration}"/>
     <testCase name="Usage of NoneTrue range matcher/Basic usage/All false evaluates to true" duration="{duration}"/>
     <testCase name="Usage of NoneTrue range matcher/Contained type is convertible to bool/All true evaluates to false" duration="{duration}"/>
-    <testCase name="Usage of NoneTrue range matcher/Contained type is convertible to bool/One true evalutes to false" duration="{duration}"/>
+    <testCase name="Usage of NoneTrue range matcher/Contained type is convertible to bool/One true evaluates to false" duration="{duration}"/>
     <testCase name="Usage of NoneTrue range matcher/Contained type is convertible to bool/All false evaluates to true" duration="{duration}"/>
     <testCase name="Usage of NoneTrue range matcher/Shortcircuiting/All are read" duration="{duration}"/>
     <testCase name="Usage of NoneTrue range matcher/Shortcircuiting/Short-circuited" duration="{duration}"/>
@@ -1468,6 +1502,15 @@ at Message.tests.cpp:<line number>
       <failure message="FAIL_CHECK()">
 FAILED:
 This is a failure
+at Message.tests.cpp:<line number>
+      </failure>
+    </testCase>
+    <testCase name="INFO and UNSCOPED_INFO can stream multiple arguments" duration="{duration}">
+      <failure message="FAIL()">
+FAILED:
+Show infos!
+This info has multiple parts.
+This unscoped info has multiple parts.
 at Message.tests.cpp:<line number>
       </failure>
     </testCase>
@@ -1728,6 +1771,22 @@ at Misc.tests.cpp:<line number>
     <testCase name="Testing checked-if 3" duration="{duration}">
       <skipped message="FAIL()">
 FAILED:
+at Misc.tests.cpp:<line number>
+      </skipped>
+    </testCase>
+    <testCase name="Testing checked-if 4" duration="{duration}">
+      <skipped message="({Unknown expression after the reported line})">
+FAILED:
+	{Unknown expression after the reported line}
+Uncaught exception should fail!
+at Misc.tests.cpp:<line number>
+      </skipped>
+    </testCase>
+    <testCase name="Testing checked-if 5" duration="{duration}">
+      <skipped message="({Unknown expression after the reported line})">
+FAILED:
+	{Unknown expression after the reported line}
+Uncaught exception should fail!
 at Misc.tests.cpp:<line number>
       </skipped>
     </testCase>
@@ -1871,6 +1930,13 @@ at Misc.tests.cpp:<line number>
     <testCase name="xmlentitycheck/encoded chars: these should all be encoded: &amp;&amp;&amp;&quot;&quot;&quot;&lt;&lt;&lt;&amp;&quot;&lt;&lt;&amp;&quot;" duration="{duration}"/>
   </file>
   <file path="tests/<exe-name>/UsageTests/Skip.tests.cpp">
+    <testCase name="Empty generators can SKIP in constructor" duration="{duration}">
+      <skipped message="SKIP()">
+SKIPPED
+This generator is empty
+at Skip.tests.cpp:<line number>
+      </skipped>
+    </testCase>
     <testCase name="a succeeding test can still be skipped" duration="{duration}">
       <skipped message="SKIP()">
 SKIPPED
diff --git a/external_imported/Catch2/tests/SelfTest/Baselines/sonarqube.sw.multi.approved.txt b/external_imported/Catch2/tests/SelfTest/Baselines/sonarqube.sw.multi.approved.txt
index c00defae7..c9d3d205b 100644
--- a/external_imported/Catch2/tests/SelfTest/Baselines/sonarqube.sw.multi.approved.txt
+++ b/external_imported/Catch2/tests/SelfTest/Baselines/sonarqube.sw.multi.approved.txt
@@ -1,6 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- filters='"*" ~[!nonportable] ~[!benchmark] ~[approvals]' rng-seed=1 -->
 <testExecutions version="1">
+  <file path="tests/<exe-name>/IntrospectiveTests/AssertionHandler.tests.cpp">
+    <testCase name="Incomplete AssertionHandler" duration="{duration}">
+      <skipped message="REQUIRE(Dummy)">
+FAILED:
+	REQUIRE( Dummy )
+Exception translation was disabled by CATCH_CONFIG_FAST_COMPILE
+at AssertionHandler.tests.cpp:<line number>
+      </skipped>
+    </testCase>
+  </file>
   <file path="tests/<exe-name>/IntrospectiveTests/Clara.tests.cpp">
     <testCase name="Clara::Arg supports single-arg parse the way Opt does" duration="{duration}"/>
     <testCase name="Clara::Opt supports accept-many lambdas/Parsing fails on multiple options without accept_many" duration="{duration}"/>
@@ -119,6 +129,26 @@
     <testCase name="warmup" duration="{duration}"/>
     <testCase name="weighted_average_quantile" duration="{duration}"/>
   </file>
+  <file path="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp">
+    <testCase name="JsonWriter/Newly constructed JsonWriter does nothing" duration="{duration}"/>
+    <testCase name="JsonWriter/Calling writeObject will create an empty pair of braces" duration="{duration}"/>
+    <testCase name="JsonWriter/Calling writeObject with key will create an object to write the value" duration="{duration}"/>
+    <testCase name="JsonWriter/nesting objects" duration="{duration}"/>
+    <testCase name="JsonWriter/Calling writeArray will create an empty pair of braces" duration="{duration}"/>
+    <testCase name="JsonWriter/Calling writeArray creates array to write the values to" duration="{duration}"/>
+    <testCase name="JsonWriter/Moved from JsonObjectWriter shall not insert superfluous brace" duration="{duration}"/>
+    <testCase name="JsonWriter/Moved from JsonArrayWriter shall not insert superfluous bracket" duration="{duration}"/>
+    <testCase name="JsonWriter/Custom class shall be quoted" duration="{duration}"/>
+    <testCase name="JsonWriter escapes charaters in strings properly/Quote in a string is escaped" duration="{duration}"/>
+    <testCase name="JsonWriter escapes charaters in strings properly/Backslash in a string is escaped" duration="{duration}"/>
+    <testCase name="JsonWriter escapes charaters in strings properly/Forward slash in a string is **not** escaped" duration="{duration}"/>
+    <testCase name="JsonWriter escapes charaters in strings properly/Backspace in a string is escaped" duration="{duration}"/>
+    <testCase name="JsonWriter escapes charaters in strings properly/Formfeed in a string is escaped" duration="{duration}"/>
+    <testCase name="JsonWriter escapes charaters in strings properly/linefeed in a string is escaped" duration="{duration}"/>
+    <testCase name="JsonWriter escapes charaters in strings properly/carriage return in a string is escaped" duration="{duration}"/>
+    <testCase name="JsonWriter escapes charaters in strings properly/tab in a string is escaped" duration="{duration}"/>
+    <testCase name="JsonWriter escapes charaters in strings properly/combination of characters is escaped" duration="{duration}"/>
+  </file>
   <file path="tests/<exe-name>/IntrospectiveTests/Parse.tests.cpp">
     <testCase name="Parse uints/proper inputs" duration="{duration}"/>
     <testCase name="Parse uints/Bad inputs" duration="{duration}"/>
@@ -150,6 +180,7 @@
     <testCase name="Our PCG implementation provides expected results for known seeds/Specific seed" duration="{duration}"/>
     <testCase name="Random seed generation accepts known methods" duration="{duration}"/>
     <testCase name="Random seed generation reports unknown methods" duration="{duration}"/>
+    <testCase name="uniform_integer_distribution can return the bounds" duration="{duration}"/>
   </file>
   <file path="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp">
     <testCase name="Multireporter calls reporters and listeners in correct order" duration="{duration}"/>
@@ -167,6 +198,9 @@
     <testCase name="Reporter's write listings to provided stream/console reporter lists tags" duration="{duration}"/>
     <testCase name="Reporter's write listings to provided stream/console reporter lists reporters" duration="{duration}"/>
     <testCase name="Reporter's write listings to provided stream/console reporter lists tests" duration="{duration}"/>
+    <testCase name="Reporter's write listings to provided stream/JSON reporter lists tags" duration="{duration}"/>
+    <testCase name="Reporter's write listings to provided stream/JSON reporter lists reporters" duration="{duration}"/>
+    <testCase name="Reporter's write listings to provided stream/JSON reporter lists tests" duration="{duration}"/>
     <testCase name="Reporter's write listings to provided stream/JUnit reporter lists tags" duration="{duration}"/>
     <testCase name="Reporter's write listings to provided stream/JUnit reporter lists reporters" duration="{duration}"/>
     <testCase name="Reporter's write listings to provided stream/JUnit reporter lists tests" duration="{duration}"/>
@@ -232,7 +266,6 @@
     <testCase name="startsWith" duration="{duration}"/>
   </file>
   <file path="tests/<exe-name>/IntrospectiveTests/Tag.tests.cpp">
-    <testCase name="Empty tag is not allowed" duration="{duration}"/>
     <testCase name="Tag alias can be registered against tag patterns/The same tag alias can only be registered once" duration="{duration}"/>
     <testCase name="Tag alias can be registered against tag patterns/Tag aliases must be of the form [@name]" duration="{duration}"/>
     <testCase name="Tags with spaces and non-alphanumerical characters are accepted" duration="{duration}"/>
@@ -1038,6 +1071,7 @@ at Generators.tests.cpp:<line number>
     <testCase name="Copy and then generate a range/from var and iterators" duration="{duration}"/>
     <testCase name="Copy and then generate a range/From a temporary container" duration="{duration}"/>
     <testCase name="Copy and then generate a range/Final validation" duration="{duration}"/>
+    <testCase name="GENERATE can combine literals and generators" duration="{duration}"/>
     <testCase name="Generators -- adapters/Filtering by predicate/Basic usage" duration="{duration}"/>
     <testCase name="Generators -- adapters/Filtering by predicate/Throws if there are no matching values" duration="{duration}"/>
     <testCase name="Generators -- adapters/Shortening a range" duration="{duration}"/>
@@ -1388,10 +1422,10 @@ at Matchers.tests.cpp:<line number>
     <testCase name="Usage of AllMatch range matcher/Shortcircuiting/Short-circuited" duration="{duration}"/>
     <testCase name="Usage of AllTrue range matcher/Basic usage/All true evaluates to true" duration="{duration}"/>
     <testCase name="Usage of AllTrue range matcher/Basic usage/Empty evaluates to true" duration="{duration}"/>
-    <testCase name="Usage of AllTrue range matcher/Basic usage/One false evalutes to false" duration="{duration}"/>
+    <testCase name="Usage of AllTrue range matcher/Basic usage/One false evaluates to false" duration="{duration}"/>
     <testCase name="Usage of AllTrue range matcher/Basic usage/All false evaluates to false" duration="{duration}"/>
     <testCase name="Usage of AllTrue range matcher/Contained type is convertible to bool/All true evaluates to true" duration="{duration}"/>
-    <testCase name="Usage of AllTrue range matcher/Contained type is convertible to bool/One false evalutes to false" duration="{duration}"/>
+    <testCase name="Usage of AllTrue range matcher/Contained type is convertible to bool/One false evaluates to false" duration="{duration}"/>
     <testCase name="Usage of AllTrue range matcher/Contained type is convertible to bool/All false evaluates to false" duration="{duration}"/>
     <testCase name="Usage of AllTrue range matcher/Shortcircuiting/All are read" duration="{duration}"/>
     <testCase name="Usage of AllTrue range matcher/Shortcircuiting/Short-circuited" duration="{duration}"/>
@@ -1401,10 +1435,10 @@ at Matchers.tests.cpp:<line number>
     <testCase name="Usage of AnyMatch range matcher/Shortcircuiting/Short-circuited" duration="{duration}"/>
     <testCase name="Usage of AnyTrue range matcher/Basic usage/All true evaluates to true" duration="{duration}"/>
     <testCase name="Usage of AnyTrue range matcher/Basic usage/Empty evaluates to false" duration="{duration}"/>
-    <testCase name="Usage of AnyTrue range matcher/Basic usage/One true evalutes to true" duration="{duration}"/>
+    <testCase name="Usage of AnyTrue range matcher/Basic usage/One true evaluates to true" duration="{duration}"/>
     <testCase name="Usage of AnyTrue range matcher/Basic usage/All false evaluates to false" duration="{duration}"/>
     <testCase name="Usage of AnyTrue range matcher/Contained type is convertible to bool/All true evaluates to true" duration="{duration}"/>
-    <testCase name="Usage of AnyTrue range matcher/Contained type is convertible to bool/One true evalutes to true" duration="{duration}"/>
+    <testCase name="Usage of AnyTrue range matcher/Contained type is convertible to bool/One true evaluates to true" duration="{duration}"/>
     <testCase name="Usage of AnyTrue range matcher/Contained type is convertible to bool/All false evaluates to false" duration="{duration}"/>
     <testCase name="Usage of AnyTrue range matcher/Shortcircuiting/All are read" duration="{duration}"/>
     <testCase name="Usage of AnyTrue range matcher/Shortcircuiting/Short-circuited" duration="{duration}"/>
@@ -1414,10 +1448,10 @@ at Matchers.tests.cpp:<line number>
     <testCase name="Usage of NoneMatch range matcher/Shortcircuiting/Short-circuited" duration="{duration}"/>
     <testCase name="Usage of NoneTrue range matcher/Basic usage/All true evaluates to false" duration="{duration}"/>
     <testCase name="Usage of NoneTrue range matcher/Basic usage/Empty evaluates to true" duration="{duration}"/>
-    <testCase name="Usage of NoneTrue range matcher/Basic usage/One true evalutes to false" duration="{duration}"/>
+    <testCase name="Usage of NoneTrue range matcher/Basic usage/One true evaluates to false" duration="{duration}"/>
     <testCase name="Usage of NoneTrue range matcher/Basic usage/All false evaluates to true" duration="{duration}"/>
     <testCase name="Usage of NoneTrue range matcher/Contained type is convertible to bool/All true evaluates to false" duration="{duration}"/>
-    <testCase name="Usage of NoneTrue range matcher/Contained type is convertible to bool/One true evalutes to false" duration="{duration}"/>
+    <testCase name="Usage of NoneTrue range matcher/Contained type is convertible to bool/One true evaluates to false" duration="{duration}"/>
     <testCase name="Usage of NoneTrue range matcher/Contained type is convertible to bool/All false evaluates to true" duration="{duration}"/>
     <testCase name="Usage of NoneTrue range matcher/Shortcircuiting/All are read" duration="{duration}"/>
     <testCase name="Usage of NoneTrue range matcher/Shortcircuiting/Short-circuited" duration="{duration}"/>
@@ -1467,6 +1501,15 @@ at Message.tests.cpp:<line number>
       <failure message="FAIL_CHECK()">
 FAILED:
 This is a failure
+at Message.tests.cpp:<line number>
+      </failure>
+    </testCase>
+    <testCase name="INFO and UNSCOPED_INFO can stream multiple arguments" duration="{duration}">
+      <failure message="FAIL()">
+FAILED:
+Show infos!
+This info has multiple parts.
+This unscoped info has multiple parts.
 at Message.tests.cpp:<line number>
       </failure>
     </testCase>
@@ -1727,6 +1770,22 @@ at Misc.tests.cpp:<line number>
     <testCase name="Testing checked-if 3" duration="{duration}">
       <skipped message="FAIL()">
 FAILED:
+at Misc.tests.cpp:<line number>
+      </skipped>
+    </testCase>
+    <testCase name="Testing checked-if 4" duration="{duration}">
+      <skipped message="({Unknown expression after the reported line})">
+FAILED:
+	{Unknown expression after the reported line}
+Uncaught exception should fail!
+at Misc.tests.cpp:<line number>
+      </skipped>
+    </testCase>
+    <testCase name="Testing checked-if 5" duration="{duration}">
+      <skipped message="({Unknown expression after the reported line})">
+FAILED:
+	{Unknown expression after the reported line}
+Uncaught exception should fail!
 at Misc.tests.cpp:<line number>
       </skipped>
     </testCase>
@@ -1870,6 +1929,13 @@ at Misc.tests.cpp:<line number>
     <testCase name="xmlentitycheck/encoded chars: these should all be encoded: &amp;&amp;&amp;&quot;&quot;&quot;&lt;&lt;&lt;&amp;&quot;&lt;&lt;&amp;&quot;" duration="{duration}"/>
   </file>
   <file path="tests/<exe-name>/UsageTests/Skip.tests.cpp">
+    <testCase name="Empty generators can SKIP in constructor" duration="{duration}">
+      <skipped message="SKIP()">
+SKIPPED
+This generator is empty
+at Skip.tests.cpp:<line number>
+      </skipped>
+    </testCase>
     <testCase name="a succeeding test can still be skipped" duration="{duration}">
       <skipped message="SKIP()">
 SKIPPED
diff --git a/external_imported/Catch2/tests/SelfTest/Baselines/tap.sw.approved.txt b/external_imported/Catch2/tests/SelfTest/Baselines/tap.sw.approved.txt
index 920c95fd7..a02dbd954 100644
--- a/external_imported/Catch2/tests/SelfTest/Baselines/tap.sw.approved.txt
+++ b/external_imported/Catch2/tests/SelfTest/Baselines/tap.sw.approved.txt
@@ -659,7 +659,7 @@ ok {test-number} - unrelated::ADL_empty{}, IsEmpty() for: {?} is empty
 # CAPTURE can deal with complex expressions
 ok {test-number} - with 7 messages: 'a := 1' and 'b := 2' and 'c := 3' and 'a + b := 3' and 'a+b := 3' and 'c > b := true' and 'a == 1 := true'
 # CAPTURE can deal with complex expressions involving commas
-ok {test-number} - with 7 messages: 'std::vector<int>{1, 2, 3}[0, 1, 2] := 3' and 'std::vector<int>{1, 2, 3}[(0, 1)] := 2' and 'std::vector<int>{1, 2, 3}[0] := 1' and '(helper_1436<int, int>{12, -12}) := { 12, -12 }' and '(helper_1436<int, int>(-12, 12)) := { -12, 12 }' and '(1, 2) := 2' and '(2, 3) := 3'
+ok {test-number} - with 7 messages: 'custom_index_op<int>{1, 2, 3}[0, 1, 2] := 0' and 'custom_index_op<int>{1, 2, 3}[(0, 1)] := 0' and 'custom_index_op<int>{1, 2, 3}[0] := 0' and '(helper_1436<int, int>{12, -12}) := { 12, -12 }' and '(helper_1436<int, int>(-12, 12)) := { -12, 12 }' and '(1, 2) := 2' and '(2, 3) := 3'
 # CAPTURE parses string and character constants
 ok {test-number} - with 11 messages: '("comma, in string", "escaped, \", ") := "escaped, ", "' and '"single quote in string,'," := "single quote in string,',"' and '"some escapes, \\,\\\\" := "some escapes, \,\\"' and '"some, ), unmatched, } prenheses {[<" := "some, ), unmatched, } prenheses {[<"' and ''"' := '"'' and ''\'' := '''' and '',' := ','' and ''}' := '}'' and '')' := ')'' and ''(' := '('' and ''{' := '{''
 # Capture and info messages
@@ -984,10 +984,10 @@ ok {test-number} - enumInfo->lookup(0) == "Value1" for: Value1 == "Value1"
 ok {test-number} - enumInfo->lookup(1) == "Value2" for: Value2 == "Value2"
 # Directly creating an EnumInfo
 ok {test-number} - enumInfo->lookup(3) == "{** unexpected enum value **}" for: {** unexpected enum value **} == "{** unexpected enum value **}"
+# Empty generators can SKIP in constructor
+ok {test-number} -  # SKIP 'This generator is empty'
 # Empty stream name opens cout stream
 ok {test-number} - Catch::makeStream( "" )->isConsole() for: true
-# Empty tag is not allowed
-ok {test-number} - Catch::TestCaseInfo( "", { "fake test name", "[]" }, dummySourceLineInfo )
 # EndsWith string matcher
 not ok {test-number} - testStringForMatching(), EndsWith( "Substring" ) for: "this string contains 'abc' as a substring" ends with: "Substring"
 # EndsWith string matcher
@@ -1258,6 +1258,14 @@ ok {test-number} - WithinRel( 1.f, -0.2f ), std::domain_error
 ok {test-number} - WithinRel( 1.f, 1.f ), std::domain_error
 # Floating point matchers: float
 ok {test-number} - 1., !IsNaN() for: 1.0 not is NaN
+# GENERATE can combine literals and generators
+ok {test-number} - i % 2 == 0 for: 0 == 0
+# GENERATE can combine literals and generators
+ok {test-number} - i % 2 == 0 for: 0 == 0
+# GENERATE can combine literals and generators
+ok {test-number} - i % 2 == 0 for: 0 == 0
+# GENERATE can combine literals and generators
+ok {test-number} - i % 2 == 0 for: 0 == 0
 # Generators -- adapters
 ok {test-number} - i % 2 == 0 for: 0 == 0
 # Generators -- adapters
@@ -1796,6 +1804,8 @@ ok {test-number} - h( dummy1 ) != h( dummy2 ) for: 2673152918 (0x<hex digits>) !
 ok {test-number} - h( dummy1 ) != h( dummy2 ) for: 2074929312 (0x<hex digits>) != 3429949824 (0x<hex digits>)
 # Hashing test case produces same hash across multiple calls
 ok {test-number} - h( dummy ) == h( dummy ) for: 3422778688 (0x<hex digits>) == 3422778688 (0x<hex digits>)
+# INFO and UNSCOPED_INFO can stream multiple arguments
+not ok {test-number} - explicitly with 3 messages: 'This info has multiple parts.' and 'This unscoped info has multiple parts.' and 'Show infos!'
 # INFO and WARN do not abort tests
 warning {test-number} - 'this is a message' with 1 message: 'this is a warning'
 # INFO gets logged on failure
@@ -1830,6 +1840,8 @@ ok {test-number} - i < 10 for: 8 < 10 with 2 messages: 'current counter 8' and '
 ok {test-number} - i < 10 for: 9 < 10 with 2 messages: 'current counter 9' and 'i := 9'
 # INFO is reset for each loop
 not ok {test-number} - i < 10 for: 10 < 10 with 2 messages: 'current counter 10' and 'i := 10'
+# Incomplete AssertionHandler
+not ok {test-number} - unexpected exception with message: 'Exception translation was disabled by CATCH_CONFIG_FAST_COMPILE'; expression was: Dummy
 # Inequality checks that should fail
 not ok {test-number} - data.int_seven != 7 for: 7 != 7
 # Inequality checks that should fail
@@ -1862,6 +1874,42 @@ ok {test-number} - data.str_hello != "hell" for: "hello" != "hell"
 ok {test-number} - data.str_hello != "hello1" for: "hello" != "hello1"
 # Inequality checks that should succeed
 ok {test-number} - data.str_hello.size() != 6 for: 5 != 6
+# JsonWriter
+ok {test-number} - stream.str() == "" for: "" == ""
+# JsonWriter
+ok {test-number} - stream.str() == "{\n}" for: "{ }" == "{ }"
+# JsonWriter
+ok {test-number} - stream.str(), ContainsSubstring( "\"int\": 1," ) && ContainsSubstring( "\"double\": 1.5," ) && ContainsSubstring( "\"true\": true," ) && ContainsSubstring( "\"false\": false," ) && ContainsSubstring( "\"string\": \"this is a string\"," ) && ContainsSubstring( "\"array\": [\n    1,\n    2\n  ]\n}" ) for: "{   "int": 1,   "double": 1.5,   "true": true,   "false": false,   "string": "this is a string",   "array": [     1,     2   ] }" ( contains: ""int": 1," and contains: ""double": 1.5," and contains: ""true": true," and contains: ""false": false," and contains: ""string": "this is a string"," and contains: ""array": [     1,     2   ] }" )
+# JsonWriter
+ok {test-number} - stream.str(), ContainsSubstring( "\"empty_object\": {\n  }," ) && ContainsSubstring( "\"fully_object\": {\n    \"key\": 1\n  }" ) for: "{   "empty_object": {   },   "fully_object": {     "key": 1   } }" ( contains: ""empty_object": {   }," and contains: ""fully_object": {     "key": 1   }" )
+# JsonWriter
+ok {test-number} - stream.str() == "[\n]" for: "[ ]" == "[ ]"
+# JsonWriter
+ok {test-number} - stream.str() == "[\n  1,\n  1.5,\n  true,\n  false,\n  \"this is a string\",\n  {\n    \"object\": 42\n  },\n  [\n    \"array\",\n    42.5\n  ]\n]" for: "[   1,   1.5,   true,   false,   "this is a string",   {     "object": 42   },   [     "array",     42.5   ] ]" == "[   1,   1.5,   true,   false,   "this is a string",   {     "object": 42   },   [     "array",     42.5   ] ]"
+# JsonWriter
+ok {test-number} - stream.str() == "{\n}" for: "{ }" == "{ }"
+# JsonWriter
+ok {test-number} - stream.str() == "[\n]" for: "[ ]" == "[ ]"
+# JsonWriter
+ok {test-number} - stream.str() == "\"custom\"" for: ""custom"" == ""custom""
+# JsonWriter escapes charaters in strings properly
+ok {test-number} - sstream.str() == "\"\\\"\"" for: ""\""" == ""\"""
+# JsonWriter escapes charaters in strings properly
+ok {test-number} - sstream.str() == "\"\\\\\"" for: ""\\"" == ""\\""
+# JsonWriter escapes charaters in strings properly
+ok {test-number} - sstream.str() == "\"/\"" for: ""/"" == ""/""
+# JsonWriter escapes charaters in strings properly
+ok {test-number} - sstream.str() == "\"\\b\"" for: ""\b"" == ""\b""
+# JsonWriter escapes charaters in strings properly
+ok {test-number} - sstream.str() == "\"\\f\"" for: ""\f"" == ""\f""
+# JsonWriter escapes charaters in strings properly
+ok {test-number} - sstream.str() == "\"\\n\"" for: ""\n"" == ""\n""
+# JsonWriter escapes charaters in strings properly
+ok {test-number} - sstream.str() == "\"\\r\"" for: ""\r"" == ""\r""
+# JsonWriter escapes charaters in strings properly
+ok {test-number} - sstream.str() == "\"\\t\"" for: ""\t"" == ""\t""
+# JsonWriter escapes charaters in strings properly
+ok {test-number} - sstream.str() == "\"\\\\/\\t\\r\\n\"" for: ""\\/\t\r\n"" == ""\\/\t\r\n""
 # Lambdas in assertions
 ok {test-number} - []() { return true; }() for: true
 # Less-than inequalities with different epsilons
@@ -2455,6 +2503,18 @@ ok {test-number} - listingString, ContainsSubstring( "fake test name"s ) && Cont
 # Reporter's write listings to provided stream
 ok {test-number} - !(factories.empty()) for: !false
 # Reporter's write listings to provided stream
+ok {test-number} - listingString, ContainsSubstring("fakeTag"s) for: "{   "version": 1,   "metadata": {     "name": "",     "rng-seed": 1234,     "catch2-version": "<version>"   },   "listings": {     "tags": [       {         "aliases": [           "fakeTag"         ],         "count": 1       }     ]" contains: "fakeTag" with 1 message: 'Tested reporter: JSON'
+# Reporter's write listings to provided stream
+ok {test-number} - !(factories.empty()) for: !false
+# Reporter's write listings to provided stream
+ok {test-number} - listingString, ContainsSubstring("fake reporter"s) for: "{   "version": 1,   "metadata": {     "name": "",     "rng-seed": 1234,     "catch2-version": "<version>"   },   "listings": {     "reporters": [       {         "name": "fake reporter",         "description": "fake description"       }     ]" contains: "fake reporter" with 1 message: 'Tested reporter: JSON'
+# Reporter's write listings to provided stream
+ok {test-number} - !(factories.empty()) for: !false
+# Reporter's write listings to provided stream
+ok {test-number} - listingString, ContainsSubstring( "fake test name"s ) && ContainsSubstring( "fakeTestTag"s ) for: "{   "version": 1,   "metadata": {     "name": "",     "rng-seed": 1234,     "catch2-version": "<version>"   },   "listings": {     "tests": [       {         "name": "fake test name",         "class-name": "",         "tags": [           "fakeTestTag"         ],         "source-location": {           "filename": "fake-file.cpp",           "line": 123456789         }       }     ]" ( contains: "fake test name" and contains: "fakeTestTag" ) with 1 message: 'Tested reporter: JSON'
+# Reporter's write listings to provided stream
+ok {test-number} - !(factories.empty()) for: !false
+# Reporter's write listings to provided stream
 ok {test-number} - listingString, ContainsSubstring("fakeTag"s) for: "<?xml version="1.0" encoding="UTF-8"?> All available tags:    1  [fakeTag] 1 tag  " contains: "fakeTag" with 1 message: 'Tested reporter: JUnit'
 # Reporter's write listings to provided stream
 ok {test-number} - !(factories.empty()) for: !false
@@ -3067,6 +3127,14 @@ not ok {test-number} - explicitly
 ok {test-number} - false  # TODO
 # Testing checked-if 3
 not ok {test-number} - explicitly
+# Testing checked-if 4
+ok {test-number} - true
+# Testing checked-if 4
+not ok {test-number} - unexpected exception with message: 'Uncaught exception should fail!'; expression was: {Unknown expression after the reported line}
+# Testing checked-if 5
+ok {test-number} - false  # TODO
+# Testing checked-if 5
+not ok {test-number} - unexpected exception with message: 'Uncaught exception should fail!'; expression was: {Unknown expression after the reported line}
 # The NO_FAIL macro reports a failure but does not fail the test
 ok {test-number} - 1 == 2  # TODO
 # The default listing implementation write to provided stream
@@ -4355,6 +4423,10 @@ ok {test-number} - e.upper_bound == 23 for: 23.0 == 23
 ok {test-number} - e.lower_bound == 23 for: 23.0 == 23
 # uniform samples
 ok {test-number} - e.confidence_interval == 0.95 for: 0.95 == 0.95
+# uniform_integer_distribution can return the bounds
+ok {test-number} - dist.a() == -10 for: -10 == -10
+# uniform_integer_distribution can return the bounds
+ok {test-number} - dist.b() == 10 for: 10 == 10
 # unique_ptr reimplementation: basic functionality
 ok {test-number} - !(ptr) for: !{?}
 # unique_ptr reimplementation: basic functionality
@@ -4477,5 +4549,5 @@ ok {test-number} - q3 == 23. for: 23.0 == 23.0
 ok {test-number} -
 # xmlentitycheck
 ok {test-number} -
-1..2237
+1..2272
 
diff --git a/external_imported/Catch2/tests/SelfTest/Baselines/tap.sw.multi.approved.txt b/external_imported/Catch2/tests/SelfTest/Baselines/tap.sw.multi.approved.txt
index c0e0c4dbe..13449bd40 100644
--- a/external_imported/Catch2/tests/SelfTest/Baselines/tap.sw.multi.approved.txt
+++ b/external_imported/Catch2/tests/SelfTest/Baselines/tap.sw.multi.approved.txt
@@ -657,7 +657,7 @@ ok {test-number} - unrelated::ADL_empty{}, IsEmpty() for: {?} is empty
 # CAPTURE can deal with complex expressions
 ok {test-number} - with 7 messages: 'a := 1' and 'b := 2' and 'c := 3' and 'a + b := 3' and 'a+b := 3' and 'c > b := true' and 'a == 1 := true'
 # CAPTURE can deal with complex expressions involving commas
-ok {test-number} - with 7 messages: 'std::vector<int>{1, 2, 3}[0, 1, 2] := 3' and 'std::vector<int>{1, 2, 3}[(0, 1)] := 2' and 'std::vector<int>{1, 2, 3}[0] := 1' and '(helper_1436<int, int>{12, -12}) := { 12, -12 }' and '(helper_1436<int, int>(-12, 12)) := { -12, 12 }' and '(1, 2) := 2' and '(2, 3) := 3'
+ok {test-number} - with 7 messages: 'custom_index_op<int>{1, 2, 3}[0, 1, 2] := 0' and 'custom_index_op<int>{1, 2, 3}[(0, 1)] := 0' and 'custom_index_op<int>{1, 2, 3}[0] := 0' and '(helper_1436<int, int>{12, -12}) := { 12, -12 }' and '(helper_1436<int, int>(-12, 12)) := { -12, 12 }' and '(1, 2) := 2' and '(2, 3) := 3'
 # CAPTURE parses string and character constants
 ok {test-number} - with 11 messages: '("comma, in string", "escaped, \", ") := "escaped, ", "' and '"single quote in string,'," := "single quote in string,',"' and '"some escapes, \\,\\\\" := "some escapes, \,\\"' and '"some, ), unmatched, } prenheses {[<" := "some, ), unmatched, } prenheses {[<"' and ''"' := '"'' and ''\'' := '''' and '',' := ','' and ''}' := '}'' and '')' := ')'' and ''(' := '('' and ''{' := '{''
 # Capture and info messages
@@ -982,10 +982,10 @@ ok {test-number} - enumInfo->lookup(0) == "Value1" for: Value1 == "Value1"
 ok {test-number} - enumInfo->lookup(1) == "Value2" for: Value2 == "Value2"
 # Directly creating an EnumInfo
 ok {test-number} - enumInfo->lookup(3) == "{** unexpected enum value **}" for: {** unexpected enum value **} == "{** unexpected enum value **}"
+# Empty generators can SKIP in constructor
+ok {test-number} -  # SKIP 'This generator is empty'
 # Empty stream name opens cout stream
 ok {test-number} - Catch::makeStream( "" )->isConsole() for: true
-# Empty tag is not allowed
-ok {test-number} - Catch::TestCaseInfo( "", { "fake test name", "[]" }, dummySourceLineInfo )
 # EndsWith string matcher
 not ok {test-number} - testStringForMatching(), EndsWith( "Substring" ) for: "this string contains 'abc' as a substring" ends with: "Substring"
 # EndsWith string matcher
@@ -1256,6 +1256,14 @@ ok {test-number} - WithinRel( 1.f, -0.2f ), std::domain_error
 ok {test-number} - WithinRel( 1.f, 1.f ), std::domain_error
 # Floating point matchers: float
 ok {test-number} - 1., !IsNaN() for: 1.0 not is NaN
+# GENERATE can combine literals and generators
+ok {test-number} - i % 2 == 0 for: 0 == 0
+# GENERATE can combine literals and generators
+ok {test-number} - i % 2 == 0 for: 0 == 0
+# GENERATE can combine literals and generators
+ok {test-number} - i % 2 == 0 for: 0 == 0
+# GENERATE can combine literals and generators
+ok {test-number} - i % 2 == 0 for: 0 == 0
 # Generators -- adapters
 ok {test-number} - i % 2 == 0 for: 0 == 0
 # Generators -- adapters
@@ -1794,6 +1802,8 @@ ok {test-number} - h( dummy1 ) != h( dummy2 ) for: 2673152918 (0x<hex digits>) !
 ok {test-number} - h( dummy1 ) != h( dummy2 ) for: 2074929312 (0x<hex digits>) != 3429949824 (0x<hex digits>)
 # Hashing test case produces same hash across multiple calls
 ok {test-number} - h( dummy ) == h( dummy ) for: 3422778688 (0x<hex digits>) == 3422778688 (0x<hex digits>)
+# INFO and UNSCOPED_INFO can stream multiple arguments
+not ok {test-number} - explicitly with 3 messages: 'This info has multiple parts.' and 'This unscoped info has multiple parts.' and 'Show infos!'
 # INFO and WARN do not abort tests
 warning {test-number} - 'this is a message' with 1 message: 'this is a warning'
 # INFO gets logged on failure
@@ -1828,6 +1838,8 @@ ok {test-number} - i < 10 for: 8 < 10 with 2 messages: 'current counter 8' and '
 ok {test-number} - i < 10 for: 9 < 10 with 2 messages: 'current counter 9' and 'i := 9'
 # INFO is reset for each loop
 not ok {test-number} - i < 10 for: 10 < 10 with 2 messages: 'current counter 10' and 'i := 10'
+# Incomplete AssertionHandler
+not ok {test-number} - unexpected exception with message: 'Exception translation was disabled by CATCH_CONFIG_FAST_COMPILE'; expression was: Dummy
 # Inequality checks that should fail
 not ok {test-number} - data.int_seven != 7 for: 7 != 7
 # Inequality checks that should fail
@@ -1860,6 +1872,42 @@ ok {test-number} - data.str_hello != "hell" for: "hello" != "hell"
 ok {test-number} - data.str_hello != "hello1" for: "hello" != "hello1"
 # Inequality checks that should succeed
 ok {test-number} - data.str_hello.size() != 6 for: 5 != 6
+# JsonWriter
+ok {test-number} - stream.str() == "" for: "" == ""
+# JsonWriter
+ok {test-number} - stream.str() == "{\n}" for: "{ }" == "{ }"
+# JsonWriter
+ok {test-number} - stream.str(), ContainsSubstring( "\"int\": 1," ) && ContainsSubstring( "\"double\": 1.5," ) && ContainsSubstring( "\"true\": true," ) && ContainsSubstring( "\"false\": false," ) && ContainsSubstring( "\"string\": \"this is a string\"," ) && ContainsSubstring( "\"array\": [\n    1,\n    2\n  ]\n}" ) for: "{   "int": 1,   "double": 1.5,   "true": true,   "false": false,   "string": "this is a string",   "array": [     1,     2   ] }" ( contains: ""int": 1," and contains: ""double": 1.5," and contains: ""true": true," and contains: ""false": false," and contains: ""string": "this is a string"," and contains: ""array": [     1,     2   ] }" )
+# JsonWriter
+ok {test-number} - stream.str(), ContainsSubstring( "\"empty_object\": {\n  }," ) && ContainsSubstring( "\"fully_object\": {\n    \"key\": 1\n  }" ) for: "{   "empty_object": {   },   "fully_object": {     "key": 1   } }" ( contains: ""empty_object": {   }," and contains: ""fully_object": {     "key": 1   }" )
+# JsonWriter
+ok {test-number} - stream.str() == "[\n]" for: "[ ]" == "[ ]"
+# JsonWriter
+ok {test-number} - stream.str() == "[\n  1,\n  1.5,\n  true,\n  false,\n  \"this is a string\",\n  {\n    \"object\": 42\n  },\n  [\n    \"array\",\n    42.5\n  ]\n]" for: "[   1,   1.5,   true,   false,   "this is a string",   {     "object": 42   },   [     "array",     42.5   ] ]" == "[   1,   1.5,   true,   false,   "this is a string",   {     "object": 42   },   [     "array",     42.5   ] ]"
+# JsonWriter
+ok {test-number} - stream.str() == "{\n}" for: "{ }" == "{ }"
+# JsonWriter
+ok {test-number} - stream.str() == "[\n]" for: "[ ]" == "[ ]"
+# JsonWriter
+ok {test-number} - stream.str() == "\"custom\"" for: ""custom"" == ""custom""
+# JsonWriter escapes charaters in strings properly
+ok {test-number} - sstream.str() == "\"\\\"\"" for: ""\""" == ""\"""
+# JsonWriter escapes charaters in strings properly
+ok {test-number} - sstream.str() == "\"\\\\\"" for: ""\\"" == ""\\""
+# JsonWriter escapes charaters in strings properly
+ok {test-number} - sstream.str() == "\"/\"" for: ""/"" == ""/""
+# JsonWriter escapes charaters in strings properly
+ok {test-number} - sstream.str() == "\"\\b\"" for: ""\b"" == ""\b""
+# JsonWriter escapes charaters in strings properly
+ok {test-number} - sstream.str() == "\"\\f\"" for: ""\f"" == ""\f""
+# JsonWriter escapes charaters in strings properly
+ok {test-number} - sstream.str() == "\"\\n\"" for: ""\n"" == ""\n""
+# JsonWriter escapes charaters in strings properly
+ok {test-number} - sstream.str() == "\"\\r\"" for: ""\r"" == ""\r""
+# JsonWriter escapes charaters in strings properly
+ok {test-number} - sstream.str() == "\"\\t\"" for: ""\t"" == ""\t""
+# JsonWriter escapes charaters in strings properly
+ok {test-number} - sstream.str() == "\"\\\\/\\t\\r\\n\"" for: ""\\/\t\r\n"" == ""\\/\t\r\n""
 # Lambdas in assertions
 ok {test-number} - []() { return true; }() for: true
 # Less-than inequalities with different epsilons
@@ -2453,6 +2501,18 @@ ok {test-number} - listingString, ContainsSubstring( "fake test name"s ) && Cont
 # Reporter's write listings to provided stream
 ok {test-number} - !(factories.empty()) for: !false
 # Reporter's write listings to provided stream
+ok {test-number} - listingString, ContainsSubstring("fakeTag"s) for: "{   "version": 1,   "metadata": {     "name": "",     "rng-seed": 1234,     "catch2-version": "<version>"   },   "listings": {     "tags": [       {         "aliases": [           "fakeTag"         ],         "count": 1       }     ]" contains: "fakeTag" with 1 message: 'Tested reporter: JSON'
+# Reporter's write listings to provided stream
+ok {test-number} - !(factories.empty()) for: !false
+# Reporter's write listings to provided stream
+ok {test-number} - listingString, ContainsSubstring("fake reporter"s) for: "{   "version": 1,   "metadata": {     "name": "",     "rng-seed": 1234,     "catch2-version": "<version>"   },   "listings": {     "reporters": [       {         "name": "fake reporter",         "description": "fake description"       }     ]" contains: "fake reporter" with 1 message: 'Tested reporter: JSON'
+# Reporter's write listings to provided stream
+ok {test-number} - !(factories.empty()) for: !false
+# Reporter's write listings to provided stream
+ok {test-number} - listingString, ContainsSubstring( "fake test name"s ) && ContainsSubstring( "fakeTestTag"s ) for: "{   "version": 1,   "metadata": {     "name": "",     "rng-seed": 1234,     "catch2-version": "<version>"   },   "listings": {     "tests": [       {         "name": "fake test name",         "class-name": "",         "tags": [           "fakeTestTag"         ],         "source-location": {           "filename": "fake-file.cpp",           "line": 123456789         }       }     ]" ( contains: "fake test name" and contains: "fakeTestTag" ) with 1 message: 'Tested reporter: JSON'
+# Reporter's write listings to provided stream
+ok {test-number} - !(factories.empty()) for: !false
+# Reporter's write listings to provided stream
 ok {test-number} - listingString, ContainsSubstring("fakeTag"s) for: "<?xml version="1.0" encoding="UTF-8"?> All available tags:    1  [fakeTag] 1 tag  " contains: "fakeTag" with 1 message: 'Tested reporter: JUnit'
 # Reporter's write listings to provided stream
 ok {test-number} - !(factories.empty()) for: !false
@@ -3060,6 +3120,14 @@ not ok {test-number} - explicitly
 ok {test-number} - false  # TODO
 # Testing checked-if 3
 not ok {test-number} - explicitly
+# Testing checked-if 4
+ok {test-number} - true
+# Testing checked-if 4
+not ok {test-number} - unexpected exception with message: 'Uncaught exception should fail!'; expression was: {Unknown expression after the reported line}
+# Testing checked-if 5
+ok {test-number} - false  # TODO
+# Testing checked-if 5
+not ok {test-number} - unexpected exception with message: 'Uncaught exception should fail!'; expression was: {Unknown expression after the reported line}
 # The NO_FAIL macro reports a failure but does not fail the test
 ok {test-number} - 1 == 2  # TODO
 # The default listing implementation write to provided stream
@@ -4344,6 +4412,10 @@ ok {test-number} - e.upper_bound == 23 for: 23.0 == 23
 ok {test-number} - e.lower_bound == 23 for: 23.0 == 23
 # uniform samples
 ok {test-number} - e.confidence_interval == 0.95 for: 0.95 == 0.95
+# uniform_integer_distribution can return the bounds
+ok {test-number} - dist.a() == -10 for: -10 == -10
+# uniform_integer_distribution can return the bounds
+ok {test-number} - dist.b() == 10 for: 10 == 10
 # unique_ptr reimplementation: basic functionality
 ok {test-number} - !(ptr) for: !{?}
 # unique_ptr reimplementation: basic functionality
@@ -4466,5 +4538,5 @@ ok {test-number} - q3 == 23. for: 23.0 == 23.0
 ok {test-number} -
 # xmlentitycheck
 ok {test-number} -
-1..2237
+1..2272
 
diff --git a/external_imported/Catch2/tests/SelfTest/Baselines/teamcity.sw.approved.txt b/external_imported/Catch2/tests/SelfTest/Baselines/teamcity.sw.approved.txt
index 8a8b55e2b..2a2c40cfc 100644
--- a/external_imported/Catch2/tests/SelfTest/Baselines/teamcity.sw.approved.txt
+++ b/external_imported/Catch2/tests/SelfTest/Baselines/teamcity.sw.approved.txt
@@ -299,10 +299,11 @@
 ##teamcity[testFinished name='Default scale is invisible to comparison' duration="{duration}"]
 ##teamcity[testStarted name='Directly creating an EnumInfo']
 ##teamcity[testFinished name='Directly creating an EnumInfo' duration="{duration}"]
+##teamcity[testStarted name='Empty generators can SKIP in constructor']
+##teamcity[testIgnored name='Empty generators can SKIP in constructor' message='Skip.tests.cpp:<line number>|n...............................................................................|n|nSkip.tests.cpp:<line number>|nexplicit skip with message:|n  "This generator is empty"']
+##teamcity[testFinished name='Empty generators can SKIP in constructor' duration="{duration}"]
 ##teamcity[testStarted name='Empty stream name opens cout stream']
 ##teamcity[testFinished name='Empty stream name opens cout stream' duration="{duration}"]
-##teamcity[testStarted name='Empty tag is not allowed']
-##teamcity[testFinished name='Empty tag is not allowed' duration="{duration}"]
 ##teamcity[testStarted name='EndsWith string matcher']
 ##teamcity[testFailed name='EndsWith string matcher' message='Matchers.tests.cpp:<line number>|n...............................................................................|n|nMatchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), EndsWith( "Substring" ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" ends with: "Substring"|n']
 ##teamcity[testFailed name='EndsWith string matcher' message='Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), EndsWith( "this", Catch::CaseSensitive::No ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" ends with: "this" (case insensitive)|n']
@@ -376,6 +377,8 @@
 ##teamcity[testFinished name='Floating point matchers: double' duration="{duration}"]
 ##teamcity[testStarted name='Floating point matchers: float']
 ##teamcity[testFinished name='Floating point matchers: float' duration="{duration}"]
+##teamcity[testStarted name='GENERATE can combine literals and generators']
+##teamcity[testFinished name='GENERATE can combine literals and generators' duration="{duration}"]
 ##teamcity[testStarted name='Generators -- adapters']
 ##teamcity[testFinished name='Generators -- adapters' duration="{duration}"]
 ##teamcity[testStarted name='Generators -- simple']
@@ -392,6 +395,9 @@
 ##teamcity[testFinished name='Hashing different test cases produces different result' duration="{duration}"]
 ##teamcity[testStarted name='Hashing test case produces same hash across multiple calls']
 ##teamcity[testFinished name='Hashing test case produces same hash across multiple calls' duration="{duration}"]
+##teamcity[testStarted name='INFO and UNSCOPED_INFO can stream multiple arguments']
+##teamcity[testFailed name='INFO and UNSCOPED_INFO can stream multiple arguments' message='Message.tests.cpp:<line number>|n...............................................................................|n|nMessage.tests.cpp:<line number>|nexplicit failure with messages:|n  "This info has multiple parts."|n  "This unscoped info has multiple parts."|n  "Show infos!"']
+##teamcity[testFinished name='INFO and UNSCOPED_INFO can stream multiple arguments' duration="{duration}"]
 ##teamcity[testStarted name='INFO and WARN do not abort tests']
 ##teamcity[testFinished name='INFO and WARN do not abort tests' duration="{duration}"]
 ##teamcity[testStarted name='INFO gets logged on failure']
@@ -404,6 +410,9 @@
 ##teamcity[testStarted name='INFO is reset for each loop']
 ##teamcity[testFailed name='INFO is reset for each loop' message='Message.tests.cpp:<line number>|n...............................................................................|n|nMessage.tests.cpp:<line number>|nexpression failed with messages:|n  "current counter 10"|n  "i := 10"|n  REQUIRE( i < 10 )|nwith expansion:|n  10 < 10|n']
 ##teamcity[testFinished name='INFO is reset for each loop' duration="{duration}"]
+##teamcity[testStarted name='Incomplete AssertionHandler']
+##teamcity[testIgnored name='Incomplete AssertionHandler' message='AssertionHandler.tests.cpp:<line number>|n...............................................................................|n|nAssertionHandler.tests.cpp:<line number>|nunexpected exception with message:|n  "Exception translation was disabled by CATCH_CONFIG_FAST_COMPILE"|n  REQUIRE( Dummy )|nwith expansion:|n  Dummy|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testFinished name='Incomplete AssertionHandler' duration="{duration}"]
 ##teamcity[testStarted name='Inequality checks that should fail']
 ##teamcity[testIgnored name='Inequality checks that should fail' message='Condition.tests.cpp:<line number>|n...............................................................................|n|nCondition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven != 7 )|nwith expansion:|n  7 != 7|n- failure ignore as test marked as |'ok to fail|'|n']
 ##teamcity[testIgnored name='Inequality checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.float_nine_point_one != Approx( 9.1f ) )|nwith expansion:|n  9.1f != Approx( 9.1000003815 )|n- failure ignore as test marked as |'ok to fail|'|n']
@@ -413,6 +422,10 @@
 ##teamcity[testFinished name='Inequality checks that should fail' duration="{duration}"]
 ##teamcity[testStarted name='Inequality checks that should succeed']
 ##teamcity[testFinished name='Inequality checks that should succeed' duration="{duration}"]
+##teamcity[testStarted name='JsonWriter']
+##teamcity[testFinished name='JsonWriter' duration="{duration}"]
+##teamcity[testStarted name='JsonWriter escapes charaters in strings properly']
+##teamcity[testFinished name='JsonWriter escapes charaters in strings properly' duration="{duration}"]
 ##teamcity[testStarted name='Lambdas in assertions']
 ##teamcity[testFinished name='Lambdas in assertions' duration="{duration}"]
 ##teamcity[testStarted name='Less-than inequalities with different epsilons']
@@ -638,6 +651,12 @@
 ##teamcity[testStarted name='Testing checked-if 3']
 ##teamcity[testIgnored name='Testing checked-if 3' message='Misc.tests.cpp:<line number>|n...............................................................................|n|nMisc.tests.cpp:<line number>|nexplicit failure- failure ignore as test marked as |'ok to fail|'|n']
 ##teamcity[testFinished name='Testing checked-if 3' duration="{duration}"]
+##teamcity[testStarted name='Testing checked-if 4']
+##teamcity[testIgnored name='Testing checked-if 4' message='Misc.tests.cpp:<line number>|n...............................................................................|n|nMisc.tests.cpp:<line number>|nunexpected exception with message:|n  "Uncaught exception should fail!"|n  {Unknown expression after the reported line}|nwith expansion:|n  {Unknown expression after the reported line}|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testFinished name='Testing checked-if 4' duration="{duration}"]
+##teamcity[testStarted name='Testing checked-if 5']
+##teamcity[testIgnored name='Testing checked-if 5' message='Misc.tests.cpp:<line number>|n...............................................................................|n|nMisc.tests.cpp:<line number>|nunexpected exception with message:|n  "Uncaught exception should fail!"|n  {Unknown expression after the reported line}|nwith expansion:|n  {Unknown expression after the reported line}|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testFinished name='Testing checked-if 5' duration="{duration}"]
 ##teamcity[testStarted name='The NO_FAIL macro reports a failure but does not fail the test']
 ##teamcity[testFinished name='The NO_FAIL macro reports a failure but does not fail the test' duration="{duration}"]
 ##teamcity[testStarted name='The default listing implementation write to provided stream']
@@ -975,6 +994,8 @@ loose text artifact
 ##teamcity[testFinished name='tuple<tuple<int>,tuple<>,float>' duration="{duration}"]
 ##teamcity[testStarted name='uniform samples']
 ##teamcity[testFinished name='uniform samples' duration="{duration}"]
+##teamcity[testStarted name='uniform_integer_distribution can return the bounds']
+##teamcity[testFinished name='uniform_integer_distribution can return the bounds' duration="{duration}"]
 ##teamcity[testStarted name='unique_ptr reimplementation: basic functionality']
 ##teamcity[testFinished name='unique_ptr reimplementation: basic functionality' duration="{duration}"]
 ##teamcity[testStarted name='vec<vec<string,alloc>> -> toString']
diff --git a/external_imported/Catch2/tests/SelfTest/Baselines/teamcity.sw.multi.approved.txt b/external_imported/Catch2/tests/SelfTest/Baselines/teamcity.sw.multi.approved.txt
index 77f70a630..24ed5d988 100644
--- a/external_imported/Catch2/tests/SelfTest/Baselines/teamcity.sw.multi.approved.txt
+++ b/external_imported/Catch2/tests/SelfTest/Baselines/teamcity.sw.multi.approved.txt
@@ -299,10 +299,11 @@
 ##teamcity[testFinished name='Default scale is invisible to comparison' duration="{duration}"]
 ##teamcity[testStarted name='Directly creating an EnumInfo']
 ##teamcity[testFinished name='Directly creating an EnumInfo' duration="{duration}"]
+##teamcity[testStarted name='Empty generators can SKIP in constructor']
+##teamcity[testIgnored name='Empty generators can SKIP in constructor' message='Skip.tests.cpp:<line number>|n...............................................................................|n|nSkip.tests.cpp:<line number>|nexplicit skip with message:|n  "This generator is empty"']
+##teamcity[testFinished name='Empty generators can SKIP in constructor' duration="{duration}"]
 ##teamcity[testStarted name='Empty stream name opens cout stream']
 ##teamcity[testFinished name='Empty stream name opens cout stream' duration="{duration}"]
-##teamcity[testStarted name='Empty tag is not allowed']
-##teamcity[testFinished name='Empty tag is not allowed' duration="{duration}"]
 ##teamcity[testStarted name='EndsWith string matcher']
 ##teamcity[testFailed name='EndsWith string matcher' message='Matchers.tests.cpp:<line number>|n...............................................................................|n|nMatchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), EndsWith( "Substring" ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" ends with: "Substring"|n']
 ##teamcity[testFailed name='EndsWith string matcher' message='Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), EndsWith( "this", Catch::CaseSensitive::No ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" ends with: "this" (case insensitive)|n']
@@ -376,6 +377,8 @@
 ##teamcity[testFinished name='Floating point matchers: double' duration="{duration}"]
 ##teamcity[testStarted name='Floating point matchers: float']
 ##teamcity[testFinished name='Floating point matchers: float' duration="{duration}"]
+##teamcity[testStarted name='GENERATE can combine literals and generators']
+##teamcity[testFinished name='GENERATE can combine literals and generators' duration="{duration}"]
 ##teamcity[testStarted name='Generators -- adapters']
 ##teamcity[testFinished name='Generators -- adapters' duration="{duration}"]
 ##teamcity[testStarted name='Generators -- simple']
@@ -392,6 +395,9 @@
 ##teamcity[testFinished name='Hashing different test cases produces different result' duration="{duration}"]
 ##teamcity[testStarted name='Hashing test case produces same hash across multiple calls']
 ##teamcity[testFinished name='Hashing test case produces same hash across multiple calls' duration="{duration}"]
+##teamcity[testStarted name='INFO and UNSCOPED_INFO can stream multiple arguments']
+##teamcity[testFailed name='INFO and UNSCOPED_INFO can stream multiple arguments' message='Message.tests.cpp:<line number>|n...............................................................................|n|nMessage.tests.cpp:<line number>|nexplicit failure with messages:|n  "This info has multiple parts."|n  "This unscoped info has multiple parts."|n  "Show infos!"']
+##teamcity[testFinished name='INFO and UNSCOPED_INFO can stream multiple arguments' duration="{duration}"]
 ##teamcity[testStarted name='INFO and WARN do not abort tests']
 ##teamcity[testFinished name='INFO and WARN do not abort tests' duration="{duration}"]
 ##teamcity[testStarted name='INFO gets logged on failure']
@@ -404,6 +410,9 @@
 ##teamcity[testStarted name='INFO is reset for each loop']
 ##teamcity[testFailed name='INFO is reset for each loop' message='Message.tests.cpp:<line number>|n...............................................................................|n|nMessage.tests.cpp:<line number>|nexpression failed with messages:|n  "current counter 10"|n  "i := 10"|n  REQUIRE( i < 10 )|nwith expansion:|n  10 < 10|n']
 ##teamcity[testFinished name='INFO is reset for each loop' duration="{duration}"]
+##teamcity[testStarted name='Incomplete AssertionHandler']
+##teamcity[testIgnored name='Incomplete AssertionHandler' message='AssertionHandler.tests.cpp:<line number>|n...............................................................................|n|nAssertionHandler.tests.cpp:<line number>|nunexpected exception with message:|n  "Exception translation was disabled by CATCH_CONFIG_FAST_COMPILE"|n  REQUIRE( Dummy )|nwith expansion:|n  Dummy|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testFinished name='Incomplete AssertionHandler' duration="{duration}"]
 ##teamcity[testStarted name='Inequality checks that should fail']
 ##teamcity[testIgnored name='Inequality checks that should fail' message='Condition.tests.cpp:<line number>|n...............................................................................|n|nCondition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven != 7 )|nwith expansion:|n  7 != 7|n- failure ignore as test marked as |'ok to fail|'|n']
 ##teamcity[testIgnored name='Inequality checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.float_nine_point_one != Approx( 9.1f ) )|nwith expansion:|n  9.1f != Approx( 9.1000003815 )|n- failure ignore as test marked as |'ok to fail|'|n']
@@ -413,6 +422,10 @@
 ##teamcity[testFinished name='Inequality checks that should fail' duration="{duration}"]
 ##teamcity[testStarted name='Inequality checks that should succeed']
 ##teamcity[testFinished name='Inequality checks that should succeed' duration="{duration}"]
+##teamcity[testStarted name='JsonWriter']
+##teamcity[testFinished name='JsonWriter' duration="{duration}"]
+##teamcity[testStarted name='JsonWriter escapes charaters in strings properly']
+##teamcity[testFinished name='JsonWriter escapes charaters in strings properly' duration="{duration}"]
 ##teamcity[testStarted name='Lambdas in assertions']
 ##teamcity[testFinished name='Lambdas in assertions' duration="{duration}"]
 ##teamcity[testStarted name='Less-than inequalities with different epsilons']
@@ -638,6 +651,12 @@
 ##teamcity[testStarted name='Testing checked-if 3']
 ##teamcity[testIgnored name='Testing checked-if 3' message='Misc.tests.cpp:<line number>|n...............................................................................|n|nMisc.tests.cpp:<line number>|nexplicit failure- failure ignore as test marked as |'ok to fail|'|n']
 ##teamcity[testFinished name='Testing checked-if 3' duration="{duration}"]
+##teamcity[testStarted name='Testing checked-if 4']
+##teamcity[testIgnored name='Testing checked-if 4' message='Misc.tests.cpp:<line number>|n...............................................................................|n|nMisc.tests.cpp:<line number>|nunexpected exception with message:|n  "Uncaught exception should fail!"|n  {Unknown expression after the reported line}|nwith expansion:|n  {Unknown expression after the reported line}|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testFinished name='Testing checked-if 4' duration="{duration}"]
+##teamcity[testStarted name='Testing checked-if 5']
+##teamcity[testIgnored name='Testing checked-if 5' message='Misc.tests.cpp:<line number>|n...............................................................................|n|nMisc.tests.cpp:<line number>|nunexpected exception with message:|n  "Uncaught exception should fail!"|n  {Unknown expression after the reported line}|nwith expansion:|n  {Unknown expression after the reported line}|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testFinished name='Testing checked-if 5' duration="{duration}"]
 ##teamcity[testStarted name='The NO_FAIL macro reports a failure but does not fail the test']
 ##teamcity[testFinished name='The NO_FAIL macro reports a failure but does not fail the test' duration="{duration}"]
 ##teamcity[testStarted name='The default listing implementation write to provided stream']
@@ -974,6 +993,8 @@
 ##teamcity[testFinished name='tuple<tuple<int>,tuple<>,float>' duration="{duration}"]
 ##teamcity[testStarted name='uniform samples']
 ##teamcity[testFinished name='uniform samples' duration="{duration}"]
+##teamcity[testStarted name='uniform_integer_distribution can return the bounds']
+##teamcity[testFinished name='uniform_integer_distribution can return the bounds' duration="{duration}"]
 ##teamcity[testStarted name='unique_ptr reimplementation: basic functionality']
 ##teamcity[testFinished name='unique_ptr reimplementation: basic functionality' duration="{duration}"]
 ##teamcity[testStarted name='vec<vec<string,alloc>> -> toString']
diff --git a/external_imported/Catch2/tests/SelfTest/Baselines/xml.sw.approved.txt b/external_imported/Catch2/tests/SelfTest/Baselines/xml.sw.approved.txt
index 6a0d1587c..be57798bf 100644
--- a/external_imported/Catch2/tests/SelfTest/Baselines/xml.sw.approved.txt
+++ b/external_imported/Catch2/tests/SelfTest/Baselines/xml.sw.approved.txt
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Catch2TestRun name="<exe-name>" rng-seed="1" xml-format-version="2" catch2-version="<version>" filters="&quot;*&quot; ~[!nonportable] ~[!benchmark] ~[approvals]">
+<Catch2TestRun name="<exe-name>" rng-seed="1" xml-format-version="3" catch2-version="<version>" filters="&quot;*&quot; ~[!nonportable] ~[!benchmark] ~[approvals]">
   <TestCase name="# A test name that starts with a #" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
     <OverallResult success="true" skips="0"/>
   </TestCase>
@@ -77,10 +77,10 @@
     <OverallResult success="true" skips="0"/>
   </TestCase>
   <TestCase name="#1238" filename="tests/<exe-name>/UsageTests/Compilation.tests.cpp" >
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Compilation.tests.cpp" >
       uarr := "123"
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Compilation.tests.cpp" >
       sarr := "456"
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Compilation.tests.cpp" >
@@ -91,10 +91,10 @@
         0 == 0
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Compilation.tests.cpp" >
       uarr := "123"
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Compilation.tests.cpp" >
       sarr := "456"
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Compilation.tests.cpp" >
@@ -128,11 +128,11 @@
     <OverallResult success="true" skips="0"/>
   </TestCase>
   <TestCase name="#1455 - INFO and WARN can start with a linebreak" tags="[.][messages]" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
 
 This info message starts with a linebreak
     </Info>
-    <Warning>
+    <Warning filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
 
 This warning message starts with a linebreak
     </Warning>
@@ -384,91 +384,91 @@ Nor would this
     <Section name="A" filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
     </Section>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       i := 1
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       j := 3
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       k := 5
     </Info>
     <Section name="B" filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
     </Section>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       i := 1
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       j := 3
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       k := 6
     </Info>
     <Section name="B" filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
     </Section>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       i := 1
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       j := 4
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       k := 5
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       i := 1
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       j := 4
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       k := 6
     </Info>
     <Section name="A" filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
     </Section>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       i := 2
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       j := 3
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       k := 5
     </Info>
     <Section name="B" filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
     </Section>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       i := 2
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       j := 3
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       k := 6
     </Info>
     <Section name="B" filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
     </Section>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       i := 2
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       j := 4
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       k := 5
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       i := 2
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       j := 4
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       k := 6
     </Info>
     <OverallResult success="true" skips="0"/>
@@ -667,7 +667,7 @@ Nor would this
     </Expression>
     <OverallResult success="true" skips="0"/>
   </TestCase>
-  <TestCase name="#2615 - Throwing in constructor generator fails test case but does not abort" tags="[!shouldfail]" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
+  <TestCase name="#2615 - Throwing in constructor generator fails test case but does not abort" tags="[!shouldfail][generators][regression]" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
     <Exception filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
       failure to init
     </Exception>
@@ -675,7 +675,7 @@ Nor would this
   </TestCase>
   <TestCase name="#748 - captures with unexpected exceptions" tags="[!shouldfail][!throws][.][failing]" filename="tests/<exe-name>/UsageTests/Exception.tests.cpp" >
     <Section name="outside assertions" filename="tests/<exe-name>/UsageTests/Exception.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/UsageTests/Exception.tests.cpp" >
         answer := 42
       </Info>
       <Exception filename="tests/<exe-name>/UsageTests/Exception.tests.cpp" >
@@ -684,7 +684,7 @@ Nor would this
       <OverallResults successes="0" failures="0" expectedFailures="1" skipped="false"/>
     </Section>
     <Section name="inside REQUIRE_NOTHROW" filename="tests/<exe-name>/UsageTests/Exception.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/UsageTests/Exception.tests.cpp" >
         answer := 42
       </Info>
       <Expression success="false" type="REQUIRE_NOTHROW" filename="tests/<exe-name>/UsageTests/Exception.tests.cpp" >
@@ -701,7 +701,7 @@ Nor would this
       <OverallResults successes="0" failures="0" expectedFailures="1" skipped="false"/>
     </Section>
     <Section name="inside REQUIRE_THROWS" filename="tests/<exe-name>/UsageTests/Exception.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/UsageTests/Exception.tests.cpp" >
         answer := 42
       </Info>
       <Expression success="true" type="REQUIRE_THROWS" filename="tests/<exe-name>/UsageTests/Exception.tests.cpp" >
@@ -806,7 +806,7 @@ Nor would this
     <OverallResult success="true" skips="0"/>
   </TestCase>
   <TestCase name="#872" filename="tests/<exe-name>/UsageTests/Compilation.tests.cpp" >
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Compilation.tests.cpp" >
       dummy := 0
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Compilation.tests.cpp" >
@@ -2886,92 +2886,92 @@ Nor would this
     <OverallResult success="true" skips="0"/>
   </TestCase>
   <TestCase name="CAPTURE can deal with complex expressions" tags="[capture][messages]" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       a := 1
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       b := 2
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       c := 3
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       a + b := 3
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       a+b := 3
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       c > b := true
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       a == 1 := true
     </Info>
     <OverallResult success="true" skips="0"/>
   </TestCase>
   <TestCase name="CAPTURE can deal with complex expressions involving commas" tags="[capture][messages]" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
-    <Info>
-      std::vector&lt;int>{1, 2, 3}[0, 1, 2] := 3
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
+      custom_index_op&lt;int>{1, 2, 3}[0, 1, 2] := 0
     </Info>
-    <Info>
-      std::vector&lt;int>{1, 2, 3}[(0, 1)] := 2
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
+      custom_index_op&lt;int>{1, 2, 3}[(0, 1)] := 0
     </Info>
-    <Info>
-      std::vector&lt;int>{1, 2, 3}[0] := 1
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
+      custom_index_op&lt;int>{1, 2, 3}[0] := 0
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       (helper_1436&lt;int, int>{12, -12}) := { 12, -12 }
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       (helper_1436&lt;int, int>(-12, 12)) := { -12, 12 }
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       (1, 2) := 2
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       (2, 3) := 3
     </Info>
     <OverallResult success="true" skips="0"/>
   </TestCase>
   <TestCase name="CAPTURE parses string and character constants" tags="[capture][messages]" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       ("comma, in string", "escaped, \", ") := "escaped, ", "
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       "single quote in string,'," := "single quote in string,',"
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       "some escapes, \\,\\\\" := "some escapes, \,\\"
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       "some, ), unmatched, } prenheses {[&lt;" := "some, ), unmatched, } prenheses {[&lt;"
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       '"' := '"'
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       '\'' := '''
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       ',' := ','
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       '}' := '}'
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       ')' := ')'
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       '(' := '('
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       '{' := '{'
     </Info>
     <OverallResult success="true" skips="0"/>
   </TestCase>
   <TestCase name="Capture and info messages" filename="tests/<exe-name>/UsageTests/ToStringGeneral.tests.cpp" >
     <Section name="Capture should stringify like assertions" filename="tests/<exe-name>/UsageTests/ToStringGeneral.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/UsageTests/ToStringGeneral.tests.cpp" >
         i := 2
       </Info>
       <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/ToStringGeneral.tests.cpp" >
@@ -2985,7 +2985,7 @@ Nor would this
       <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
     </Section>
     <Section name="Info should NOT stringify the way assertions do" filename="tests/<exe-name>/UsageTests/ToStringGeneral.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/UsageTests/ToStringGeneral.tests.cpp" >
         3
       </Info>
       <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/ToStringGeneral.tests.cpp" >
@@ -4364,6 +4364,12 @@ C
     </Expression>
     <OverallResult success="true" skips="0"/>
   </TestCase>
+  <TestCase name="Empty generators can SKIP in constructor" tags="[skipping]" filename="tests/<exe-name>/UsageTests/Skip.tests.cpp" >
+    <Skip filename="tests/<exe-name>/UsageTests/Skip.tests.cpp" >
+      This generator is empty
+    </Skip>
+    <OverallResult success="true" skips="1"/>
+  </TestCase>
   <TestCase name="Empty stream name opens cout stream" tags="[streams]" filename="tests/<exe-name>/IntrospectiveTests/Stream.tests.cpp" >
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Stream.tests.cpp" >
       <Original>
@@ -4375,17 +4381,6 @@ C
     </Expression>
     <OverallResult success="true" skips="0"/>
   </TestCase>
-  <TestCase name="Empty tag is not allowed" filename="tests/<exe-name>/IntrospectiveTests/Tag.tests.cpp" >
-    <Expression success="true" type="REQUIRE_THROWS" filename="tests/<exe-name>/IntrospectiveTests/Tag.tests.cpp" >
-      <Original>
-        Catch::TestCaseInfo( "", { "fake test name", "[]" }, dummySourceLineInfo )
-      </Original>
-      <Expanded>
-        Catch::TestCaseInfo( "", { "fake test name", "[]" }, dummySourceLineInfo )
-      </Expanded>
-    </Expression>
-    <OverallResult success="true" skips="0"/>
-  </TestCase>
   <TestCase name="EndsWith string matcher" tags="[.][failing][matchers]" filename="tests/<exe-name>/UsageTests/Matchers.tests.cpp" >
     <Expression success="false" type="CHECK_THAT" filename="tests/<exe-name>/UsageTests/Matchers.tests.cpp" >
       <Original>
@@ -4977,7 +4972,7 @@ C
     <Failure filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       This is a failure
     </Failure>
-    <Warning>
+    <Warning filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       This message appears in the output
     </Warning>
     <OverallResult success="false" skips="0"/>
@@ -5588,6 +5583,41 @@ C
     </Section>
     <OverallResult success="true" skips="0"/>
   </TestCase>
+  <TestCase name="GENERATE can combine literals and generators" tags="[generators]" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
+      <Original>
+        i % 2 == 0
+      </Original>
+      <Expanded>
+        0 == 0
+      </Expanded>
+    </Expression>
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
+      <Original>
+        i % 2 == 0
+      </Original>
+      <Expanded>
+        0 == 0
+      </Expanded>
+    </Expression>
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
+      <Original>
+        i % 2 == 0
+      </Original>
+      <Expanded>
+        0 == 0
+      </Expanded>
+    </Expression>
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
+      <Original>
+        i % 2 == 0
+      </Original>
+      <Expanded>
+        0 == 0
+      </Expanded>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
   <TestCase name="Generators -- adapters" tags="[generators][generic]" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
     <Section name="Filtering by predicate" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
       <Section name="Basic usage" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
@@ -7246,7 +7276,7 @@ C
       <Section name="Positive manual step" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
         <Section name="Floating Point" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
           <Section name="Exact" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -1
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7257,7 +7287,7 @@ C
                 -1.0 == Approx( -1.0 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -1
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7268,7 +7298,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.9
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7279,7 +7309,7 @@ C
                 -0.9 == Approx( -0.9 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.9
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7290,7 +7320,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.8
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7301,7 +7331,7 @@ C
                 -0.8 == Approx( -0.8 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.8
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7312,7 +7342,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.7
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7323,7 +7353,7 @@ C
                 -0.7 == Approx( -0.7 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.7
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7334,7 +7364,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.6
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7345,7 +7375,7 @@ C
                 -0.6 == Approx( -0.6 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.6
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7356,7 +7386,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.5
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7367,7 +7397,7 @@ C
                 -0.5 == Approx( -0.5 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.5
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7378,7 +7408,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.4
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7389,7 +7419,7 @@ C
                 -0.4 == Approx( -0.4 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.4
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7400,7 +7430,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.3
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7411,7 +7441,7 @@ C
                 -0.3 == Approx( -0.3 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.3
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7422,7 +7452,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.2
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7433,7 +7463,7 @@ C
                 -0.2 == Approx( -0.2 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.2
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7444,7 +7474,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.1
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7455,7 +7485,7 @@ C
                 -0.1 == Approx( -0.1 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.1
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7466,7 +7496,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -1.38778e-16
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7477,7 +7507,7 @@ C
                 -0.0 == Approx( -0.0 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -1.38778e-16
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7488,7 +7518,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.1
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7499,7 +7529,7 @@ C
                 0.1 == Approx( 0.1 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.1
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7510,7 +7540,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.2
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7521,7 +7551,7 @@ C
                 0.2 == Approx( 0.2 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.2
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7532,7 +7562,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.3
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7543,7 +7573,7 @@ C
                 0.3 == Approx( 0.3 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.3
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7554,7 +7584,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.4
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7565,7 +7595,7 @@ C
                 0.4 == Approx( 0.4 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.4
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7576,7 +7606,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.5
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7587,7 +7617,7 @@ C
                 0.5 == Approx( 0.5 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.5
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7598,7 +7628,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.6
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7609,7 +7639,7 @@ C
                 0.6 == Approx( 0.6 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.6
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7620,7 +7650,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.7
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7631,7 +7661,7 @@ C
                 0.7 == Approx( 0.7 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.7
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7642,7 +7672,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.8
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7653,7 +7683,7 @@ C
                 0.8 == Approx( 0.8 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.8
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7664,7 +7694,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.9
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7675,7 +7705,7 @@ C
                 0.9 == Approx( 0.9 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.9
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7714,7 +7744,7 @@ C
       <Section name="Positive manual step" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
         <Section name="Floating Point" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
           <Section name="Slightly over end" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -1
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7725,7 +7755,7 @@ C
                 -1.0 == Approx( -1.0 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -1
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7736,7 +7766,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.7
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7747,7 +7777,7 @@ C
                 -0.7 == Approx( -0.7 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.7
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7758,7 +7788,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.4
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7769,7 +7799,7 @@ C
                 -0.4 == Approx( -0.4 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.4
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7780,7 +7810,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.1
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7791,7 +7821,7 @@ C
                 -0.1 == Approx( -0.1 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.1
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7802,7 +7832,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.2
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7813,7 +7843,7 @@ C
                 0.2 == Approx( 0.2 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.2
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7824,7 +7854,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.5
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7835,7 +7865,7 @@ C
                 0.5 == Approx( 0.5 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.5
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7866,7 +7896,7 @@ C
       <Section name="Positive manual step" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
         <Section name="Floating Point" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
           <Section name="Slightly under end" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -1
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7877,7 +7907,7 @@ C
                 -1.0 == Approx( -1.0 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -1
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7888,7 +7918,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.7
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7899,7 +7929,7 @@ C
                 -0.7 == Approx( -0.7 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.7
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7910,7 +7940,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.4
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7921,7 +7951,7 @@ C
                 -0.4 == Approx( -0.4 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.4
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7932,7 +7962,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.1
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7943,7 +7973,7 @@ C
                 -0.1 == Approx( -0.1 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.1
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7954,7 +7984,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.2
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7965,7 +7995,7 @@ C
                 0.2 == Approx( 0.2 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.2
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7976,7 +8006,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.5
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7987,7 +8017,7 @@ C
                 0.5 == Approx( 0.5 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.5
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -8376,20 +8406,32 @@ C
     </Expression>
     <OverallResult success="true" skips="0"/>
   </TestCase>
+  <TestCase name="INFO and UNSCOPED_INFO can stream multiple arguments" tags="[.][failing][info][messages]" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
+      This info has multiple parts.
+    </Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
+      This unscoped info has multiple parts.
+    </Info>
+    <Failure filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
+      Show infos!
+    </Failure>
+    <OverallResult success="false" skips="0"/>
+  </TestCase>
   <TestCase name="INFO and WARN do not abort tests" tags="[.][messages]" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       this is a message
     </Info>
-    <Warning>
+    <Warning filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       this is a warning
     </Warning>
     <OverallResult success="false" skips="0"/>
   </TestCase>
   <TestCase name="INFO gets logged on failure" tags="[.][failing][messages]" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       this message should be logged
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       so should this
     </Info>
     <Expression success="false" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -8403,7 +8445,7 @@ C
     <OverallResult success="false" skips="0"/>
   </TestCase>
   <TestCase name="INFO gets logged on failure, even if captured before successful assertions" tags="[.][failing][messages]" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       this message may be logged later
     </Info>
     <Expression success="true" type="CHECK" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -8414,10 +8456,10 @@ C
         2 == 2
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       this message may be logged later
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       this message should be logged
     </Info>
     <Expression success="false" type="CHECK" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -8428,13 +8470,13 @@ C
         2 == 1
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       this message may be logged later
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       this message should be logged
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       and this, but later
     </Info>
     <Expression success="false" type="CHECK" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -8445,16 +8487,16 @@ C
         2 == 0
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       this message may be logged later
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       this message should be logged
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       and this, but later
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       but not this
     </Info>
     <Expression success="true" type="CHECK" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -8468,10 +8510,10 @@ C
     <OverallResult success="false" skips="0"/>
   </TestCase>
   <TestCase name="INFO is reset for each loop" tags="[.][failing][messages]" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       current counter 0
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       i := 0
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -8482,10 +8524,10 @@ C
         0 &lt; 10
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       current counter 1
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       i := 1
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -8496,10 +8538,10 @@ C
         1 &lt; 10
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       current counter 2
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       i := 2
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -8510,10 +8552,10 @@ C
         2 &lt; 10
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       current counter 3
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       i := 3
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -8524,10 +8566,10 @@ C
         3 &lt; 10
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       current counter 4
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       i := 4
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -8538,10 +8580,10 @@ C
         4 &lt; 10
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       current counter 5
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       i := 5
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -8552,10 +8594,10 @@ C
         5 &lt; 10
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       current counter 6
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       i := 6
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -8566,10 +8608,10 @@ C
         6 &lt; 10
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       current counter 7
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       i := 7
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -8580,10 +8622,10 @@ C
         7 &lt; 10
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       current counter 8
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       i := 8
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -8594,10 +8636,10 @@ C
         8 &lt; 10
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       current counter 9
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       i := 9
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -8608,10 +8650,10 @@ C
         9 &lt; 10
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       current counter 10
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       i := 10
     </Info>
     <Expression success="false" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -8624,6 +8666,20 @@ C
     </Expression>
     <OverallResult success="false" skips="0"/>
   </TestCase>
+  <TestCase name="Incomplete AssertionHandler" tags="[!shouldfail][assertion-handler]" filename="tests/<exe-name>/IntrospectiveTests/AssertionHandler.tests.cpp" >
+    <Expression success="false" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/AssertionHandler.tests.cpp" >
+      <Original>
+        Dummy
+      </Original>
+      <Expanded>
+        Dummy
+      </Expanded>
+      <Exception filename="tests/<exe-name>/IntrospectiveTests/AssertionHandler.tests.cpp" >
+        Exception translation was disabled by CATCH_CONFIG_FAST_COMPILE
+      </Exception>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
   <TestCase name="Inequality checks that should fail" tags="[!shouldfail][.][failing]" filename="tests/<exe-name>/UsageTests/Condition.tests.cpp" >
     <Expression success="false" type="CHECK" filename="tests/<exe-name>/UsageTests/Condition.tests.cpp" >
       <Original>
@@ -8758,6 +8814,277 @@ C
     </Expression>
     <OverallResult success="true" skips="0"/>
   </TestCase>
+  <TestCase name="JsonWriter" tags="[JSON][JsonWriter]" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+    <Section name="Newly constructed JsonWriter does nothing" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+        <Original>
+          stream.str() == ""
+        </Original>
+        <Expanded>
+          "" == ""
+        </Expanded>
+      </Expression>
+      <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
+    </Section>
+    <Section name="Calling writeObject will create an empty pair of braces" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+        <Original>
+          stream.str() == "{\n}"
+        </Original>
+        <Expanded>
+          "{
+}"
+==
+"{
+}"
+        </Expanded>
+      </Expression>
+      <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
+    </Section>
+    <Section name="Calling writeObject with key will create an object to write the value" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+      <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+        <Original>
+          stream.str(), ContainsSubstring( "\"int\": 1," ) &amp;&amp; ContainsSubstring( "\"double\": 1.5," ) &amp;&amp; ContainsSubstring( "\"true\": true," ) &amp;&amp; ContainsSubstring( "\"false\": false," ) &amp;&amp; ContainsSubstring( "\"string\": \"this is a string\"," ) &amp;&amp; ContainsSubstring( "\"array\": [\n    1,\n    2\n  ]\n}" )
+        </Original>
+        <Expanded>
+          "{
+  "int": 1,
+  "double": 1.5,
+  "true": true,
+  "false": false,
+  "string": "this is a string",
+  "array": [
+    1,
+    2
+  ]
+}" ( contains: ""int": 1," and contains: ""double": 1.5," and contains: ""true": true," and contains: ""false": false," and contains: ""string": "this is a string"," and contains: ""array": [
+    1,
+    2
+  ]
+}" )
+        </Expanded>
+      </Expression>
+      <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
+    </Section>
+    <Section name="nesting objects" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+      <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+        <Original>
+          stream.str(), ContainsSubstring( "\"empty_object\": {\n  }," ) &amp;&amp; ContainsSubstring( "\"fully_object\": {\n    \"key\": 1\n  }" )
+        </Original>
+        <Expanded>
+          "{
+  "empty_object": {
+  },
+  "fully_object": {
+    "key": 1
+  }
+}" ( contains: ""empty_object": {
+  }," and contains: ""fully_object": {
+    "key": 1
+  }" )
+        </Expanded>
+      </Expression>
+      <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
+    </Section>
+    <Section name="Calling writeArray will create an empty pair of braces" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+        <Original>
+          stream.str() == "[\n]"
+        </Original>
+        <Expanded>
+          "[
+]"
+==
+"[
+]"
+        </Expanded>
+      </Expression>
+      <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
+    </Section>
+    <Section name="Calling writeArray creates array to write the values to" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+        <Original>
+          stream.str() == "[\n  1,\n  1.5,\n  true,\n  false,\n  \"this is a string\",\n  {\n    \"object\": 42\n  },\n  [\n    \"array\",\n    42.5\n  ]\n]"
+        </Original>
+        <Expanded>
+          "[
+  1,
+  1.5,
+  true,
+  false,
+  "this is a string",
+  {
+    "object": 42
+  },
+  [
+    "array",
+    42.5
+  ]
+]"
+==
+"[
+  1,
+  1.5,
+  true,
+  false,
+  "this is a string",
+  {
+    "object": 42
+  },
+  [
+    "array",
+    42.5
+  ]
+]"
+        </Expanded>
+      </Expression>
+      <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
+    </Section>
+    <Section name="Moved from JsonObjectWriter shall not insert superfluous brace" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+        <Original>
+          stream.str() == "{\n}"
+        </Original>
+        <Expanded>
+          "{
+}"
+==
+"{
+}"
+        </Expanded>
+      </Expression>
+      <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
+    </Section>
+    <Section name="Moved from JsonArrayWriter shall not insert superfluous bracket" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+        <Original>
+          stream.str() == "[\n]"
+        </Original>
+        <Expanded>
+          "[
+]"
+==
+"[
+]"
+        </Expanded>
+      </Expression>
+      <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
+    </Section>
+    <Section name="Custom class shall be quoted" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+        <Original>
+          stream.str() == "\"custom\""
+        </Original>
+        <Expanded>
+          ""custom"" == ""custom""
+        </Expanded>
+      </Expression>
+      <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
+    </Section>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
+  <TestCase name="JsonWriter escapes charaters in strings properly" tags="[JsonWriter]" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+    <Section name="Quote in a string is escaped" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+        <Original>
+          sstream.str() == "\"\\\"\""
+        </Original>
+        <Expanded>
+          ""\""" == ""\"""
+        </Expanded>
+      </Expression>
+      <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
+    </Section>
+    <Section name="Backslash in a string is escaped" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+        <Original>
+          sstream.str() == "\"\\\\\""
+        </Original>
+        <Expanded>
+          ""\\"" == ""\\""
+        </Expanded>
+      </Expression>
+      <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
+    </Section>
+    <Section name="Forward slash in a string is **not** escaped" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+        <Original>
+          sstream.str() == "\"/\""
+        </Original>
+        <Expanded>
+          ""/"" == ""/""
+        </Expanded>
+      </Expression>
+      <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
+    </Section>
+    <Section name="Backspace in a string is escaped" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+        <Original>
+          sstream.str() == "\"\\b\""
+        </Original>
+        <Expanded>
+          ""\b"" == ""\b""
+        </Expanded>
+      </Expression>
+      <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
+    </Section>
+    <Section name="Formfeed in a string is escaped" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+        <Original>
+          sstream.str() == "\"\\f\""
+        </Original>
+        <Expanded>
+          ""\f"" == ""\f""
+        </Expanded>
+      </Expression>
+      <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
+    </Section>
+    <Section name="linefeed in a string is escaped" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+        <Original>
+          sstream.str() == "\"\\n\""
+        </Original>
+        <Expanded>
+          ""\n"" == ""\n""
+        </Expanded>
+      </Expression>
+      <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
+    </Section>
+    <Section name="carriage return in a string is escaped" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+        <Original>
+          sstream.str() == "\"\\r\""
+        </Original>
+        <Expanded>
+          ""\r"" == ""\r""
+        </Expanded>
+      </Expression>
+      <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
+    </Section>
+    <Section name="tab in a string is escaped" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+        <Original>
+          sstream.str() == "\"\\t\""
+        </Original>
+        <Expanded>
+          ""\t"" == ""\t""
+        </Expanded>
+      </Expression>
+      <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
+    </Section>
+    <Section name="combination of characters is escaped" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+        <Original>
+          sstream.str() == "\"\\\\/\\t\\r\\n\""
+        </Original>
+        <Expanded>
+          ""\\/\t\r\n"" == ""\\/\t\r\n""
+        </Expanded>
+      </Expression>
+      <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
+    </Section>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
   <TestCase name="Lambdas in assertions" filename="tests/<exe-name>/UsageTests/Compilation.tests.cpp" >
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Compilation.tests.cpp" >
       <Original>
@@ -9219,7 +9546,7 @@ C
     <OverallResult success="true" skips="0"/>
   </TestCase>
   <TestCase name="Nice descriptive name" tags="[.][tag1][tag2][tag3]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
-    <Warning>
+    <Warning filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
       This one ran
     </Warning>
     <OverallResult success="false" skips="0"/>
@@ -10005,7 +10332,7 @@ C
     <OverallResult success="true" skips="0"/>
   </TestCase>
   <TestCase name="Parsing tags with non-alphabetical characters is pass-through" tags="[test-spec][test-spec-parser]" filename="tests/<exe-name>/IntrospectiveTests/TestSpecParser.tests.cpp" >
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/TestSpecParser.tests.cpp" >
       tagString := "[tag with spaces]"
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/TestSpecParser.tests.cpp" >
@@ -10016,7 +10343,7 @@ C
         true
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/TestSpecParser.tests.cpp" >
       tagString := "[tag with spaces]"
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/TestSpecParser.tests.cpp" >
@@ -10027,7 +10354,7 @@ C
         true
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/TestSpecParser.tests.cpp" >
       tagString := "[tag with spaces]"
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/TestSpecParser.tests.cpp" >
@@ -10038,7 +10365,7 @@ C
         true
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/TestSpecParser.tests.cpp" >
       tagString := "[I said "good day" sir!]"
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/TestSpecParser.tests.cpp" >
@@ -10049,7 +10376,7 @@ C
         true
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/TestSpecParser.tests.cpp" >
       tagString := "[I said "good day" sir!]"
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/TestSpecParser.tests.cpp" >
@@ -10060,7 +10387,7 @@ C
         true
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/TestSpecParser.tests.cpp" >
       tagString := "[I said "good day" sir!]"
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/TestSpecParser.tests.cpp" >
@@ -10471,7 +10798,7 @@ C
     </Section>
     <Section name="reporter" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
       <Section name="-r/console" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
-        <Info>
+        <Info filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           result.errorMessage() := ""
         </Info>
         <Expression success="true" type="CHECK" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
@@ -10482,7 +10809,7 @@ C
             {?}
           </Expanded>
         </Expression>
-        <Info>
+        <Info filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           result.errorMessage() := ""
         </Info>
         <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
@@ -10499,7 +10826,7 @@ C
     </Section>
     <Section name="reporter" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
       <Section name="-r/xml" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
-        <Info>
+        <Info filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           result.errorMessage() := ""
         </Info>
         <Expression success="true" type="CHECK" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
@@ -10510,7 +10837,7 @@ C
             {?}
           </Expanded>
         </Expression>
-        <Info>
+        <Info filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           result.errorMessage() := ""
         </Info>
         <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
@@ -10527,7 +10854,7 @@ C
     </Section>
     <Section name="reporter" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
       <Section name="--reporter/junit" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
-        <Info>
+        <Info filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           result.errorMessage() := ""
         </Info>
         <Expression success="true" type="CHECK" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
@@ -10538,7 +10865,7 @@ C
             {?}
           </Expanded>
         </Expression>
-        <Info>
+        <Info filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           result.errorMessage() := ""
         </Info>
         <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
@@ -10577,7 +10904,7 @@ C
     </Section>
     <Section name="reporter" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
       <Section name="With output file" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
-        <Info>
+        <Info filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           result.errorMessage() := ""
         </Info>
         <Expression success="true" type="CHECK" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
@@ -10588,7 +10915,7 @@ C
             {?}
           </Expanded>
         </Expression>
-        <Info>
+        <Info filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           result.errorMessage() := ""
         </Info>
         <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
@@ -10605,7 +10932,7 @@ C
     </Section>
     <Section name="reporter" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
       <Section name="With Windows-like absolute path as output file" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
-        <Info>
+        <Info filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           result.errorMessage() := ""
         </Info>
         <Expression success="true" type="CHECK" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
@@ -10616,7 +10943,7 @@ C
             {?}
           </Expanded>
         </Expression>
-        <Info>
+        <Info filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           result.errorMessage() := ""
         </Info>
         <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
@@ -11441,7 +11768,7 @@ C
       </Expanded>
     </Expression>
     <Section name="Automake reporter lists tags" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: Automake
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -11467,7 +11794,7 @@ C
       </Expanded>
     </Expression>
     <Section name="Automake reporter lists reporters" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: Automake
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -11492,7 +11819,7 @@ C
       </Expanded>
     </Expression>
     <Section name="Automake reporter lists tests" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: Automake
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -11519,7 +11846,7 @@ C
       </Expanded>
     </Expression>
     <Section name="compact reporter lists tags" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: compact
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -11545,7 +11872,7 @@ C
       </Expanded>
     </Expression>
     <Section name="compact reporter lists reporters" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: compact
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -11570,7 +11897,7 @@ C
       </Expanded>
     </Expression>
     <Section name="compact reporter lists tests" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: compact
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -11597,7 +11924,7 @@ C
       </Expanded>
     </Expression>
     <Section name="console reporter lists tags" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: console
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -11623,7 +11950,7 @@ C
       </Expanded>
     </Expression>
     <Section name="console reporter lists reporters" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: console
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -11648,7 +11975,7 @@ C
       </Expanded>
     </Expression>
     <Section name="console reporter lists tests" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: console
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -11674,8 +12001,122 @@ C
         !false
       </Expanded>
     </Expression>
+    <Section name="JSON reporter lists tags" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
+        Tested reporter: JSON
+      </Info>
+      <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
+        <Original>
+          listingString, ContainsSubstring("fakeTag"s)
+        </Original>
+        <Expanded>
+          "{
+  "version": 1,
+  "metadata": {
+    "name": "",
+    "rng-seed": 1234,
+    "catch2-version": "<version>"
+  },
+  "listings": {
+    "tags": [
+      {
+        "aliases": [
+          "fakeTag"
+        ],
+        "count": 1
+      }
+    ]" contains: "fakeTag"
+        </Expanded>
+      </Expression>
+      <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
+    </Section>
+    <Expression success="true" type="REQUIRE_FALSE" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
+      <Original>
+        !(factories.empty())
+      </Original>
+      <Expanded>
+        !false
+      </Expanded>
+    </Expression>
+    <Section name="JSON reporter lists reporters" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
+        Tested reporter: JSON
+      </Info>
+      <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
+        <Original>
+          listingString, ContainsSubstring("fake reporter"s)
+        </Original>
+        <Expanded>
+          "{
+  "version": 1,
+  "metadata": {
+    "name": "",
+    "rng-seed": 1234,
+    "catch2-version": "<version>"
+  },
+  "listings": {
+    "reporters": [
+      {
+        "name": "fake reporter",
+        "description": "fake description"
+      }
+    ]" contains: "fake reporter"
+        </Expanded>
+      </Expression>
+      <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
+    </Section>
+    <Expression success="true" type="REQUIRE_FALSE" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
+      <Original>
+        !(factories.empty())
+      </Original>
+      <Expanded>
+        !false
+      </Expanded>
+    </Expression>
+    <Section name="JSON reporter lists tests" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
+        Tested reporter: JSON
+      </Info>
+      <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
+        <Original>
+          listingString, ContainsSubstring( "fake test name"s ) &amp;&amp; ContainsSubstring( "fakeTestTag"s )
+        </Original>
+        <Expanded>
+          "{
+  "version": 1,
+  "metadata": {
+    "name": "",
+    "rng-seed": 1234,
+    "catch2-version": "<version>"
+  },
+  "listings": {
+    "tests": [
+      {
+        "name": "fake test name",
+        "class-name": "",
+        "tags": [
+          "fakeTestTag"
+        ],
+        "source-location": {
+          "filename": "fake-file.cpp",
+          "line": 123456789
+        }
+      }
+    ]" ( contains: "fake test name" and contains: "fakeTestTag" )
+        </Expanded>
+      </Expression>
+      <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
+    </Section>
+    <Expression success="true" type="REQUIRE_FALSE" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
+      <Original>
+        !(factories.empty())
+      </Original>
+      <Expanded>
+        !false
+      </Expanded>
+    </Expression>
     <Section name="JUnit reporter lists tags" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: JUnit
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -11702,7 +12143,7 @@ All available tags:
       </Expanded>
     </Expression>
     <Section name="JUnit reporter lists reporters" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: JUnit
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -11728,7 +12169,7 @@ Available reporters:
       </Expanded>
     </Expression>
     <Section name="JUnit reporter lists tests" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: JUnit
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -11756,7 +12197,7 @@ All available test cases:
       </Expanded>
     </Expression>
     <Section name="SonarQube reporter lists tags" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: SonarQube
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -11783,7 +12224,7 @@ All available tags:
       </Expanded>
     </Expression>
     <Section name="SonarQube reporter lists reporters" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: SonarQube
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -11809,7 +12250,7 @@ Available reporters:
       </Expanded>
     </Expression>
     <Section name="SonarQube reporter lists tests" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: SonarQube
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -11837,7 +12278,7 @@ All available test cases:
       </Expanded>
     </Expression>
     <Section name="TAP reporter lists tags" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: TAP
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -11863,7 +12304,7 @@ All available test cases:
       </Expanded>
     </Expression>
     <Section name="TAP reporter lists reporters" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: TAP
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -11888,7 +12329,7 @@ All available test cases:
       </Expanded>
     </Expression>
     <Section name="TAP reporter lists tests" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: TAP
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -11915,7 +12356,7 @@ All available test cases:
       </Expanded>
     </Expression>
     <Section name="TeamCity reporter lists tags" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: TeamCity
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -11941,7 +12382,7 @@ All available test cases:
       </Expanded>
     </Expression>
     <Section name="TeamCity reporter lists reporters" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: TeamCity
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -11966,7 +12407,7 @@ All available test cases:
       </Expanded>
     </Expression>
     <Section name="TeamCity reporter lists tests" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: TeamCity
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -11993,7 +12434,7 @@ All available test cases:
       </Expanded>
     </Expression>
     <Section name="XML reporter lists tags" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: XML
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -12023,7 +12464,7 @@ All available test cases:
       </Expanded>
     </Expression>
     <Section name="XML reporter lists reporters" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: XML
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -12051,7 +12492,7 @@ All available test cases:
       </Expanded>
     </Expression>
     <Section name="XML reporter lists tests" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: XML
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -14552,6 +14993,50 @@ Message from section two
     <Failure filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" />
     <OverallResult success="true" skips="0"/>
   </TestCase>
+  <TestCase name="Testing checked-if 4" tags="[!shouldfail][checked-if]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
+    <Expression success="true" type="CHECKED_ELSE" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
+      <Original>
+        true
+      </Original>
+      <Expanded>
+        true
+      </Expanded>
+    </Expression>
+    <Expression success="false" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
+      <Original>
+        {Unknown expression after the reported line}
+      </Original>
+      <Expanded>
+        {Unknown expression after the reported line}
+      </Expanded>
+      <Exception filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
+        Uncaught exception should fail!
+      </Exception>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
+  <TestCase name="Testing checked-if 5" tags="[!shouldfail][checked-if]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
+    <Expression success="false" type="CHECKED_ELSE" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
+      <Original>
+        false
+      </Original>
+      <Expanded>
+        false
+      </Expanded>
+    </Expression>
+    <Expression success="false" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
+      <Original>
+        {Unknown expression after the reported line}
+      </Original>
+      <Expanded>
+        {Unknown expression after the reported line}
+      </Expanded>
+      <Exception filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
+        Uncaught exception should fail!
+      </Exception>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
   <TestCase name="The NO_FAIL macro reports a failure but does not fail the test" tags="[messages]" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
     <Expression success="false" type="CHECK_NOFAIL" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       <Original>
@@ -15670,7 +16155,7 @@ There is no extra whitespace here
       <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
     </Section>
     <Section name="Basic usage" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
-      <Section name="One false evalutes to false" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
+      <Section name="One false evaluates to false" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
         <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
           <Original>
             data, !AllTrue()
@@ -15712,7 +16197,7 @@ There is no extra whitespace here
       <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
     </Section>
     <Section name="Contained type is convertible to bool" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
-      <Section name="One false evalutes to false" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
+      <Section name="One false evaluates to false" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
         <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
           <Original>
             data, !AllTrue()
@@ -16020,7 +16505,7 @@ There is no extra whitespace here
       <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
     </Section>
     <Section name="Basic usage" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
-      <Section name="One true evalutes to true" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
+      <Section name="One true evaluates to true" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
         <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
           <Original>
             data, AnyTrue()
@@ -16062,7 +16547,7 @@ There is no extra whitespace here
       <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
     </Section>
     <Section name="Contained type is convertible to bool" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
-      <Section name="One true evalutes to true" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
+      <Section name="One true evaluates to true" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
         <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
           <Original>
             data, AnyTrue()
@@ -16370,7 +16855,7 @@ There is no extra whitespace here
       <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
     </Section>
     <Section name="Basic usage" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
-      <Section name="One true evalutes to false" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
+      <Section name="One true evaluates to false" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
         <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
           <Original>
             data, !NoneTrue()
@@ -16412,7 +16897,7 @@ There is no extra whitespace here
       <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
     </Section>
     <Section name="Contained type is convertible to bool" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
-      <Section name="One true evalutes to false" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
+      <Section name="One true evaluates to false" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
         <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
           <Original>
             data, !NoneTrue()
@@ -18766,7 +19251,7 @@ loose text artifact
     <OverallResult success="false" skips="0"/>
   </TestCase>
   <TestCase name="looped tests" tags="[.][failing]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
       Testing if fib[0] (1) is even
     </Info>
     <Expression success="false" type="CHECK" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
@@ -18777,7 +19262,7 @@ loose text artifact
         1 == 0
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
       Testing if fib[1] (1) is even
     </Info>
     <Expression success="false" type="CHECK" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
@@ -18788,7 +19273,7 @@ loose text artifact
         1 == 0
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
       Testing if fib[2] (2) is even
     </Info>
     <Expression success="true" type="CHECK" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
@@ -18799,7 +19284,7 @@ loose text artifact
         0 == 0
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
       Testing if fib[3] (3) is even
     </Info>
     <Expression success="false" type="CHECK" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
@@ -18810,7 +19295,7 @@ loose text artifact
         1 == 0
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
       Testing if fib[4] (5) is even
     </Info>
     <Expression success="false" type="CHECK" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
@@ -18821,7 +19306,7 @@ loose text artifact
         1 == 0
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
       Testing if fib[5] (8) is even
     </Info>
     <Expression success="true" type="CHECK" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
@@ -18832,7 +19317,7 @@ loose text artifact
         0 == 0
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
       Testing if fib[6] (13) is even
     </Info>
     <Expression success="false" type="CHECK" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
@@ -18843,7 +19328,7 @@ loose text artifact
         1 == 0
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
       Testing if fib[7] (21) is even
     </Info>
     <Expression success="false" type="CHECK" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
@@ -18982,22 +19467,22 @@ loose text artifact
     <OverallResult success="true" skips="0"/>
   </TestCase>
   <TestCase name="mix info, unscoped info and warning" tags="[info][unscoped]" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       info
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       unscoped info
     </Info>
-    <Warning>
+    <Warning filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       and warn may mix
     </Warning>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       info
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       unscoped info
     </Info>
-    <Warning>
+    <Warning filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       they are not cleared after warnings
     </Warning>
     <OverallResult success="false" skips="0"/>
@@ -19204,7 +19689,7 @@ b1!
     <OverallResult success="true" skips="0"/>
   </TestCase>
   <TestCase name="not prints unscoped info from previous failures" tags="[.][failing][info][unscoped]" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       this MAY be seen only for the FIRST assertion IF info is printed for passing assertions
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -19215,7 +19700,7 @@ b1!
         true
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       this MAY be seen only for the SECOND assertion IF info is printed for passing assertions
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -19226,7 +19711,7 @@ b1!
         true
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       this SHOULD be seen
     </Info>
     <Expression success="false" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -19362,7 +19847,7 @@ b1!
     <OverallResult success="true" skips="0"/>
   </TestCase>
   <TestCase name="print unscoped info if passing unscoped info is printed" tags="[info][unscoped]" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       this MAY be seen IF info is printed for passing assertions
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -19376,10 +19861,10 @@ b1!
     <OverallResult success="true" skips="0"/>
   </TestCase>
   <TestCase name="prints unscoped info on failure" tags="[.][failing][info][unscoped]" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       this SHOULD be seen
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       this SHOULD also be seen
     </Info>
     <Expression success="false" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -19393,7 +19878,7 @@ b1!
     <OverallResult success="false" skips="0"/>
   </TestCase>
   <TestCase name="prints unscoped info only for the first assertion" tags="[.][failing][info][unscoped]" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       this SHOULD be seen only ONCE
     </Info>
     <Expression success="false" type="CHECK" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -19412,7 +19897,7 @@ b1!
         true
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       this MAY also be seen only ONCE IF info is printed for passing assertions
     </Info>
     <Expression success="true" type="CHECK" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -19895,7 +20380,7 @@ b1!
     <OverallResult success="true" skips="1"/>
   </TestCase>
   <TestCase name="send a single char to INFO" tags="[.][failing]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
       3
     </Info>
     <Expression success="false" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
@@ -19909,10 +20394,10 @@ b1!
     <OverallResult success="false" skips="0"/>
   </TestCase>
   <TestCase name="sends information to INFO" tags="[.][failing]" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       hi
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       i := 7
     </Info>
     <Expression success="false" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -19970,16 +20455,16 @@ b1!
     <OverallResult success="true" skips="0"/>
   </TestCase>
   <TestCase name="stacks unscoped info in loops" tags="[.][failing][info][unscoped]" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       Count 1 to 3...
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       1
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       2
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       3
     </Info>
     <Expression success="false" type="CHECK" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -19990,16 +20475,16 @@ b1!
         false
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       Count 4 to 6...
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       4
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       5
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       6
     </Info>
     <Expression success="false" type="CHECK" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -20649,6 +21134,25 @@ b1!
     </Expression>
     <OverallResult success="true" skips="0"/>
   </TestCase>
+  <TestCase name="uniform_integer_distribution can return the bounds" tags="[distribution][rng]" filename="tests/<exe-name>/IntrospectiveTests/RandomNumberGeneration.tests.cpp" >
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/RandomNumberGeneration.tests.cpp" >
+      <Original>
+        dist.a() == -10
+      </Original>
+      <Expanded>
+        -10 == -10
+      </Expanded>
+    </Expression>
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/RandomNumberGeneration.tests.cpp" >
+      <Original>
+        dist.b() == 10
+      </Original>
+      <Expanded>
+        10 == 10
+      </Expanded>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
   <TestCase name="unique_ptr reimplementation: basic functionality" tags="[internals][unique-ptr]" filename="tests/<exe-name>/IntrospectiveTests/UniquePtr.tests.cpp" >
     <Section name="Default constructed unique_ptr is empty" filename="tests/<exe-name>/IntrospectiveTests/UniquePtr.tests.cpp" >
       <Expression success="true" type="REQUIRE_FALSE" filename="tests/<exe-name>/IntrospectiveTests/UniquePtr.tests.cpp" >
@@ -21203,6 +21707,6 @@ b1!
     </Section>
     <OverallResult success="true" skips="0"/>
   </TestCase>
-  <OverallResults successes="2049" failures="145" expectedFailures="32" skips="11"/>
-  <OverallResultsCases successes="309" failures="84" expectedFailures="11" skips="5"/>
+  <OverallResults successes="2079" failures="146" expectedFailures="35" skips="12"/>
+  <OverallResultsCases successes="312" failures="85" expectedFailures="14" skips="6"/>
 </Catch2TestRun>
diff --git a/external_imported/Catch2/tests/SelfTest/Baselines/xml.sw.multi.approved.txt b/external_imported/Catch2/tests/SelfTest/Baselines/xml.sw.multi.approved.txt
index c6ddfc808..08ff6c437 100644
--- a/external_imported/Catch2/tests/SelfTest/Baselines/xml.sw.multi.approved.txt
+++ b/external_imported/Catch2/tests/SelfTest/Baselines/xml.sw.multi.approved.txt
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Catch2TestRun name="<exe-name>" rng-seed="1" xml-format-version="2" catch2-version="<version>" filters="&quot;*&quot; ~[!nonportable] ~[!benchmark] ~[approvals]">
+<Catch2TestRun name="<exe-name>" rng-seed="1" xml-format-version="3" catch2-version="<version>" filters="&quot;*&quot; ~[!nonportable] ~[!benchmark] ~[approvals]">
   <TestCase name="# A test name that starts with a #" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
     <OverallResult success="true" skips="0"/>
   </TestCase>
@@ -77,10 +77,10 @@
     <OverallResult success="true" skips="0"/>
   </TestCase>
   <TestCase name="#1238" filename="tests/<exe-name>/UsageTests/Compilation.tests.cpp" >
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Compilation.tests.cpp" >
       uarr := "123"
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Compilation.tests.cpp" >
       sarr := "456"
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Compilation.tests.cpp" >
@@ -91,10 +91,10 @@
         0 == 0
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Compilation.tests.cpp" >
       uarr := "123"
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Compilation.tests.cpp" >
       sarr := "456"
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Compilation.tests.cpp" >
@@ -128,11 +128,11 @@
     <OverallResult success="true" skips="0"/>
   </TestCase>
   <TestCase name="#1455 - INFO and WARN can start with a linebreak" tags="[.][messages]" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
 
 This info message starts with a linebreak
     </Info>
-    <Warning>
+    <Warning filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
 
 This warning message starts with a linebreak
     </Warning>
@@ -384,91 +384,91 @@ Nor would this
     <Section name="A" filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
     </Section>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       i := 1
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       j := 3
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       k := 5
     </Info>
     <Section name="B" filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
     </Section>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       i := 1
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       j := 3
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       k := 6
     </Info>
     <Section name="B" filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
     </Section>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       i := 1
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       j := 4
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       k := 5
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       i := 1
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       j := 4
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       k := 6
     </Info>
     <Section name="A" filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
     </Section>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       i := 2
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       j := 3
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       k := 5
     </Info>
     <Section name="B" filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
     </Section>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       i := 2
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       j := 3
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       k := 6
     </Info>
     <Section name="B" filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
     </Section>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       i := 2
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       j := 4
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       k := 5
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       i := 2
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       j := 4
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp" >
       k := 6
     </Info>
     <OverallResult success="true" skips="0"/>
@@ -667,7 +667,7 @@ Nor would this
     </Expression>
     <OverallResult success="true" skips="0"/>
   </TestCase>
-  <TestCase name="#2615 - Throwing in constructor generator fails test case but does not abort" tags="[!shouldfail]" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
+  <TestCase name="#2615 - Throwing in constructor generator fails test case but does not abort" tags="[!shouldfail][generators][regression]" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
     <Exception filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
       failure to init
     </Exception>
@@ -675,7 +675,7 @@ Nor would this
   </TestCase>
   <TestCase name="#748 - captures with unexpected exceptions" tags="[!shouldfail][!throws][.][failing]" filename="tests/<exe-name>/UsageTests/Exception.tests.cpp" >
     <Section name="outside assertions" filename="tests/<exe-name>/UsageTests/Exception.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/UsageTests/Exception.tests.cpp" >
         answer := 42
       </Info>
       <Exception filename="tests/<exe-name>/UsageTests/Exception.tests.cpp" >
@@ -684,7 +684,7 @@ Nor would this
       <OverallResults successes="0" failures="0" expectedFailures="1" skipped="false"/>
     </Section>
     <Section name="inside REQUIRE_NOTHROW" filename="tests/<exe-name>/UsageTests/Exception.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/UsageTests/Exception.tests.cpp" >
         answer := 42
       </Info>
       <Expression success="false" type="REQUIRE_NOTHROW" filename="tests/<exe-name>/UsageTests/Exception.tests.cpp" >
@@ -701,7 +701,7 @@ Nor would this
       <OverallResults successes="0" failures="0" expectedFailures="1" skipped="false"/>
     </Section>
     <Section name="inside REQUIRE_THROWS" filename="tests/<exe-name>/UsageTests/Exception.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/UsageTests/Exception.tests.cpp" >
         answer := 42
       </Info>
       <Expression success="true" type="REQUIRE_THROWS" filename="tests/<exe-name>/UsageTests/Exception.tests.cpp" >
@@ -806,7 +806,7 @@ Nor would this
     <OverallResult success="true" skips="0"/>
   </TestCase>
   <TestCase name="#872" filename="tests/<exe-name>/UsageTests/Compilation.tests.cpp" >
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Compilation.tests.cpp" >
       dummy := 0
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Compilation.tests.cpp" >
@@ -2886,92 +2886,92 @@ Nor would this
     <OverallResult success="true" skips="0"/>
   </TestCase>
   <TestCase name="CAPTURE can deal with complex expressions" tags="[capture][messages]" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       a := 1
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       b := 2
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       c := 3
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       a + b := 3
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       a+b := 3
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       c > b := true
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       a == 1 := true
     </Info>
     <OverallResult success="true" skips="0"/>
   </TestCase>
   <TestCase name="CAPTURE can deal with complex expressions involving commas" tags="[capture][messages]" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
-    <Info>
-      std::vector&lt;int>{1, 2, 3}[0, 1, 2] := 3
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
+      custom_index_op&lt;int>{1, 2, 3}[0, 1, 2] := 0
     </Info>
-    <Info>
-      std::vector&lt;int>{1, 2, 3}[(0, 1)] := 2
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
+      custom_index_op&lt;int>{1, 2, 3}[(0, 1)] := 0
     </Info>
-    <Info>
-      std::vector&lt;int>{1, 2, 3}[0] := 1
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
+      custom_index_op&lt;int>{1, 2, 3}[0] := 0
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       (helper_1436&lt;int, int>{12, -12}) := { 12, -12 }
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       (helper_1436&lt;int, int>(-12, 12)) := { -12, 12 }
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       (1, 2) := 2
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       (2, 3) := 3
     </Info>
     <OverallResult success="true" skips="0"/>
   </TestCase>
   <TestCase name="CAPTURE parses string and character constants" tags="[capture][messages]" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       ("comma, in string", "escaped, \", ") := "escaped, ", "
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       "single quote in string,'," := "single quote in string,',"
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       "some escapes, \\,\\\\" := "some escapes, \,\\"
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       "some, ), unmatched, } prenheses {[&lt;" := "some, ), unmatched, } prenheses {[&lt;"
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       '"' := '"'
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       '\'' := '''
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       ',' := ','
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       '}' := '}'
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       ')' := ')'
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       '(' := '('
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       '{' := '{'
     </Info>
     <OverallResult success="true" skips="0"/>
   </TestCase>
   <TestCase name="Capture and info messages" filename="tests/<exe-name>/UsageTests/ToStringGeneral.tests.cpp" >
     <Section name="Capture should stringify like assertions" filename="tests/<exe-name>/UsageTests/ToStringGeneral.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/UsageTests/ToStringGeneral.tests.cpp" >
         i := 2
       </Info>
       <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/ToStringGeneral.tests.cpp" >
@@ -2985,7 +2985,7 @@ Nor would this
       <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
     </Section>
     <Section name="Info should NOT stringify the way assertions do" filename="tests/<exe-name>/UsageTests/ToStringGeneral.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/UsageTests/ToStringGeneral.tests.cpp" >
         3
       </Info>
       <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/ToStringGeneral.tests.cpp" >
@@ -4364,6 +4364,12 @@ C
     </Expression>
     <OverallResult success="true" skips="0"/>
   </TestCase>
+  <TestCase name="Empty generators can SKIP in constructor" tags="[skipping]" filename="tests/<exe-name>/UsageTests/Skip.tests.cpp" >
+    <Skip filename="tests/<exe-name>/UsageTests/Skip.tests.cpp" >
+      This generator is empty
+    </Skip>
+    <OverallResult success="true" skips="1"/>
+  </TestCase>
   <TestCase name="Empty stream name opens cout stream" tags="[streams]" filename="tests/<exe-name>/IntrospectiveTests/Stream.tests.cpp" >
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Stream.tests.cpp" >
       <Original>
@@ -4375,17 +4381,6 @@ C
     </Expression>
     <OverallResult success="true" skips="0"/>
   </TestCase>
-  <TestCase name="Empty tag is not allowed" filename="tests/<exe-name>/IntrospectiveTests/Tag.tests.cpp" >
-    <Expression success="true" type="REQUIRE_THROWS" filename="tests/<exe-name>/IntrospectiveTests/Tag.tests.cpp" >
-      <Original>
-        Catch::TestCaseInfo( "", { "fake test name", "[]" }, dummySourceLineInfo )
-      </Original>
-      <Expanded>
-        Catch::TestCaseInfo( "", { "fake test name", "[]" }, dummySourceLineInfo )
-      </Expanded>
-    </Expression>
-    <OverallResult success="true" skips="0"/>
-  </TestCase>
   <TestCase name="EndsWith string matcher" tags="[.][failing][matchers]" filename="tests/<exe-name>/UsageTests/Matchers.tests.cpp" >
     <Expression success="false" type="CHECK_THAT" filename="tests/<exe-name>/UsageTests/Matchers.tests.cpp" >
       <Original>
@@ -4977,7 +4972,7 @@ C
     <Failure filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       This is a failure
     </Failure>
-    <Warning>
+    <Warning filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       This message appears in the output
     </Warning>
     <OverallResult success="false" skips="0"/>
@@ -5588,6 +5583,41 @@ C
     </Section>
     <OverallResult success="true" skips="0"/>
   </TestCase>
+  <TestCase name="GENERATE can combine literals and generators" tags="[generators]" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
+      <Original>
+        i % 2 == 0
+      </Original>
+      <Expanded>
+        0 == 0
+      </Expanded>
+    </Expression>
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
+      <Original>
+        i % 2 == 0
+      </Original>
+      <Expanded>
+        0 == 0
+      </Expanded>
+    </Expression>
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
+      <Original>
+        i % 2 == 0
+      </Original>
+      <Expanded>
+        0 == 0
+      </Expanded>
+    </Expression>
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
+      <Original>
+        i % 2 == 0
+      </Original>
+      <Expanded>
+        0 == 0
+      </Expanded>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
   <TestCase name="Generators -- adapters" tags="[generators][generic]" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
     <Section name="Filtering by predicate" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
       <Section name="Basic usage" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
@@ -7246,7 +7276,7 @@ C
       <Section name="Positive manual step" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
         <Section name="Floating Point" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
           <Section name="Exact" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -1
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7257,7 +7287,7 @@ C
                 -1.0 == Approx( -1.0 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -1
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7268,7 +7298,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.9
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7279,7 +7309,7 @@ C
                 -0.9 == Approx( -0.9 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.9
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7290,7 +7320,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.8
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7301,7 +7331,7 @@ C
                 -0.8 == Approx( -0.8 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.8
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7312,7 +7342,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.7
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7323,7 +7353,7 @@ C
                 -0.7 == Approx( -0.7 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.7
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7334,7 +7364,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.6
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7345,7 +7375,7 @@ C
                 -0.6 == Approx( -0.6 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.6
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7356,7 +7386,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.5
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7367,7 +7397,7 @@ C
                 -0.5 == Approx( -0.5 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.5
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7378,7 +7408,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.4
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7389,7 +7419,7 @@ C
                 -0.4 == Approx( -0.4 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.4
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7400,7 +7430,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.3
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7411,7 +7441,7 @@ C
                 -0.3 == Approx( -0.3 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.3
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7422,7 +7452,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.2
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7433,7 +7463,7 @@ C
                 -0.2 == Approx( -0.2 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.2
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7444,7 +7474,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.1
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7455,7 +7485,7 @@ C
                 -0.1 == Approx( -0.1 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.1
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7466,7 +7496,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -1.38778e-16
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7477,7 +7507,7 @@ C
                 -0.0 == Approx( -0.0 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -1.38778e-16
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7488,7 +7518,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.1
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7499,7 +7529,7 @@ C
                 0.1 == Approx( 0.1 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.1
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7510,7 +7540,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.2
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7521,7 +7551,7 @@ C
                 0.2 == Approx( 0.2 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.2
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7532,7 +7562,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.3
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7543,7 +7573,7 @@ C
                 0.3 == Approx( 0.3 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.3
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7554,7 +7584,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.4
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7565,7 +7595,7 @@ C
                 0.4 == Approx( 0.4 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.4
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7576,7 +7606,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.5
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7587,7 +7617,7 @@ C
                 0.5 == Approx( 0.5 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.5
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7598,7 +7628,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.6
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7609,7 +7639,7 @@ C
                 0.6 == Approx( 0.6 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.6
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7620,7 +7650,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.7
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7631,7 +7661,7 @@ C
                 0.7 == Approx( 0.7 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.7
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7642,7 +7672,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.8
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7653,7 +7683,7 @@ C
                 0.8 == Approx( 0.8 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.8
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7664,7 +7694,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.9
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7675,7 +7705,7 @@ C
                 0.9 == Approx( 0.9 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.9
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7714,7 +7744,7 @@ C
       <Section name="Positive manual step" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
         <Section name="Floating Point" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
           <Section name="Slightly over end" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -1
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7725,7 +7755,7 @@ C
                 -1.0 == Approx( -1.0 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -1
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7736,7 +7766,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.7
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7747,7 +7777,7 @@ C
                 -0.7 == Approx( -0.7 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.7
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7758,7 +7788,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.4
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7769,7 +7799,7 @@ C
                 -0.4 == Approx( -0.4 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.4
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7780,7 +7810,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.1
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7791,7 +7821,7 @@ C
                 -0.1 == Approx( -0.1 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.1
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7802,7 +7832,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.2
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7813,7 +7843,7 @@ C
                 0.2 == Approx( 0.2 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.2
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7824,7 +7854,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.5
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7835,7 +7865,7 @@ C
                 0.5 == Approx( 0.5 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.5
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7866,7 +7896,7 @@ C
       <Section name="Positive manual step" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
         <Section name="Floating Point" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
           <Section name="Slightly under end" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -1
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7877,7 +7907,7 @@ C
                 -1.0 == Approx( -1.0 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -1
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7888,7 +7918,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.7
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7899,7 +7929,7 @@ C
                 -0.7 == Approx( -0.7 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.7
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7910,7 +7940,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.4
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7921,7 +7951,7 @@ C
                 -0.4 == Approx( -0.4 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.4
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7932,7 +7962,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.1
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7943,7 +7973,7 @@ C
                 -0.1 == Approx( -0.1 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is -0.1
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7954,7 +7984,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.2
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7965,7 +7995,7 @@ C
                 0.2 == Approx( 0.2 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.2
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7976,7 +8006,7 @@ C
                 true
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.5
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -7987,7 +8017,7 @@ C
                 0.5 == Approx( 0.5 )
               </Expanded>
             </Expression>
-            <Info>
+            <Info filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
               Current expected value is 0.5
             </Info>
             <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp" >
@@ -8376,20 +8406,32 @@ C
     </Expression>
     <OverallResult success="true" skips="0"/>
   </TestCase>
+  <TestCase name="INFO and UNSCOPED_INFO can stream multiple arguments" tags="[.][failing][info][messages]" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
+      This info has multiple parts.
+    </Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
+      This unscoped info has multiple parts.
+    </Info>
+    <Failure filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
+      Show infos!
+    </Failure>
+    <OverallResult success="false" skips="0"/>
+  </TestCase>
   <TestCase name="INFO and WARN do not abort tests" tags="[.][messages]" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       this is a message
     </Info>
-    <Warning>
+    <Warning filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       this is a warning
     </Warning>
     <OverallResult success="false" skips="0"/>
   </TestCase>
   <TestCase name="INFO gets logged on failure" tags="[.][failing][messages]" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       this message should be logged
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       so should this
     </Info>
     <Expression success="false" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -8403,7 +8445,7 @@ C
     <OverallResult success="false" skips="0"/>
   </TestCase>
   <TestCase name="INFO gets logged on failure, even if captured before successful assertions" tags="[.][failing][messages]" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       this message may be logged later
     </Info>
     <Expression success="true" type="CHECK" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -8414,10 +8456,10 @@ C
         2 == 2
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       this message may be logged later
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       this message should be logged
     </Info>
     <Expression success="false" type="CHECK" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -8428,13 +8470,13 @@ C
         2 == 1
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       this message may be logged later
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       this message should be logged
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       and this, but later
     </Info>
     <Expression success="false" type="CHECK" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -8445,16 +8487,16 @@ C
         2 == 0
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       this message may be logged later
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       this message should be logged
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       and this, but later
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       but not this
     </Info>
     <Expression success="true" type="CHECK" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -8468,10 +8510,10 @@ C
     <OverallResult success="false" skips="0"/>
   </TestCase>
   <TestCase name="INFO is reset for each loop" tags="[.][failing][messages]" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       current counter 0
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       i := 0
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -8482,10 +8524,10 @@ C
         0 &lt; 10
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       current counter 1
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       i := 1
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -8496,10 +8538,10 @@ C
         1 &lt; 10
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       current counter 2
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       i := 2
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -8510,10 +8552,10 @@ C
         2 &lt; 10
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       current counter 3
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       i := 3
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -8524,10 +8566,10 @@ C
         3 &lt; 10
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       current counter 4
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       i := 4
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -8538,10 +8580,10 @@ C
         4 &lt; 10
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       current counter 5
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       i := 5
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -8552,10 +8594,10 @@ C
         5 &lt; 10
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       current counter 6
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       i := 6
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -8566,10 +8608,10 @@ C
         6 &lt; 10
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       current counter 7
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       i := 7
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -8580,10 +8622,10 @@ C
         7 &lt; 10
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       current counter 8
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       i := 8
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -8594,10 +8636,10 @@ C
         8 &lt; 10
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       current counter 9
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       i := 9
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -8608,10 +8650,10 @@ C
         9 &lt; 10
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       current counter 10
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       i := 10
     </Info>
     <Expression success="false" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -8624,6 +8666,20 @@ C
     </Expression>
     <OverallResult success="false" skips="0"/>
   </TestCase>
+  <TestCase name="Incomplete AssertionHandler" tags="[!shouldfail][assertion-handler]" filename="tests/<exe-name>/IntrospectiveTests/AssertionHandler.tests.cpp" >
+    <Expression success="false" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/AssertionHandler.tests.cpp" >
+      <Original>
+        Dummy
+      </Original>
+      <Expanded>
+        Dummy
+      </Expanded>
+      <Exception filename="tests/<exe-name>/IntrospectiveTests/AssertionHandler.tests.cpp" >
+        Exception translation was disabled by CATCH_CONFIG_FAST_COMPILE
+      </Exception>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
   <TestCase name="Inequality checks that should fail" tags="[!shouldfail][.][failing]" filename="tests/<exe-name>/UsageTests/Condition.tests.cpp" >
     <Expression success="false" type="CHECK" filename="tests/<exe-name>/UsageTests/Condition.tests.cpp" >
       <Original>
@@ -8758,6 +8814,277 @@ C
     </Expression>
     <OverallResult success="true" skips="0"/>
   </TestCase>
+  <TestCase name="JsonWriter" tags="[JSON][JsonWriter]" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+    <Section name="Newly constructed JsonWriter does nothing" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+        <Original>
+          stream.str() == ""
+        </Original>
+        <Expanded>
+          "" == ""
+        </Expanded>
+      </Expression>
+      <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
+    </Section>
+    <Section name="Calling writeObject will create an empty pair of braces" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+        <Original>
+          stream.str() == "{\n}"
+        </Original>
+        <Expanded>
+          "{
+}"
+==
+"{
+}"
+        </Expanded>
+      </Expression>
+      <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
+    </Section>
+    <Section name="Calling writeObject with key will create an object to write the value" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+      <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+        <Original>
+          stream.str(), ContainsSubstring( "\"int\": 1," ) &amp;&amp; ContainsSubstring( "\"double\": 1.5," ) &amp;&amp; ContainsSubstring( "\"true\": true," ) &amp;&amp; ContainsSubstring( "\"false\": false," ) &amp;&amp; ContainsSubstring( "\"string\": \"this is a string\"," ) &amp;&amp; ContainsSubstring( "\"array\": [\n    1,\n    2\n  ]\n}" )
+        </Original>
+        <Expanded>
+          "{
+  "int": 1,
+  "double": 1.5,
+  "true": true,
+  "false": false,
+  "string": "this is a string",
+  "array": [
+    1,
+    2
+  ]
+}" ( contains: ""int": 1," and contains: ""double": 1.5," and contains: ""true": true," and contains: ""false": false," and contains: ""string": "this is a string"," and contains: ""array": [
+    1,
+    2
+  ]
+}" )
+        </Expanded>
+      </Expression>
+      <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
+    </Section>
+    <Section name="nesting objects" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+      <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+        <Original>
+          stream.str(), ContainsSubstring( "\"empty_object\": {\n  }," ) &amp;&amp; ContainsSubstring( "\"fully_object\": {\n    \"key\": 1\n  }" )
+        </Original>
+        <Expanded>
+          "{
+  "empty_object": {
+  },
+  "fully_object": {
+    "key": 1
+  }
+}" ( contains: ""empty_object": {
+  }," and contains: ""fully_object": {
+    "key": 1
+  }" )
+        </Expanded>
+      </Expression>
+      <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
+    </Section>
+    <Section name="Calling writeArray will create an empty pair of braces" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+        <Original>
+          stream.str() == "[\n]"
+        </Original>
+        <Expanded>
+          "[
+]"
+==
+"[
+]"
+        </Expanded>
+      </Expression>
+      <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
+    </Section>
+    <Section name="Calling writeArray creates array to write the values to" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+        <Original>
+          stream.str() == "[\n  1,\n  1.5,\n  true,\n  false,\n  \"this is a string\",\n  {\n    \"object\": 42\n  },\n  [\n    \"array\",\n    42.5\n  ]\n]"
+        </Original>
+        <Expanded>
+          "[
+  1,
+  1.5,
+  true,
+  false,
+  "this is a string",
+  {
+    "object": 42
+  },
+  [
+    "array",
+    42.5
+  ]
+]"
+==
+"[
+  1,
+  1.5,
+  true,
+  false,
+  "this is a string",
+  {
+    "object": 42
+  },
+  [
+    "array",
+    42.5
+  ]
+]"
+        </Expanded>
+      </Expression>
+      <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
+    </Section>
+    <Section name="Moved from JsonObjectWriter shall not insert superfluous brace" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+        <Original>
+          stream.str() == "{\n}"
+        </Original>
+        <Expanded>
+          "{
+}"
+==
+"{
+}"
+        </Expanded>
+      </Expression>
+      <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
+    </Section>
+    <Section name="Moved from JsonArrayWriter shall not insert superfluous bracket" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+        <Original>
+          stream.str() == "[\n]"
+        </Original>
+        <Expanded>
+          "[
+]"
+==
+"[
+]"
+        </Expanded>
+      </Expression>
+      <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
+    </Section>
+    <Section name="Custom class shall be quoted" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+        <Original>
+          stream.str() == "\"custom\""
+        </Original>
+        <Expanded>
+          ""custom"" == ""custom""
+        </Expanded>
+      </Expression>
+      <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
+    </Section>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
+  <TestCase name="JsonWriter escapes charaters in strings properly" tags="[JsonWriter]" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+    <Section name="Quote in a string is escaped" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+        <Original>
+          sstream.str() == "\"\\\"\""
+        </Original>
+        <Expanded>
+          ""\""" == ""\"""
+        </Expanded>
+      </Expression>
+      <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
+    </Section>
+    <Section name="Backslash in a string is escaped" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+        <Original>
+          sstream.str() == "\"\\\\\""
+        </Original>
+        <Expanded>
+          ""\\"" == ""\\""
+        </Expanded>
+      </Expression>
+      <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
+    </Section>
+    <Section name="Forward slash in a string is **not** escaped" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+        <Original>
+          sstream.str() == "\"/\""
+        </Original>
+        <Expanded>
+          ""/"" == ""/""
+        </Expanded>
+      </Expression>
+      <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
+    </Section>
+    <Section name="Backspace in a string is escaped" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+        <Original>
+          sstream.str() == "\"\\b\""
+        </Original>
+        <Expanded>
+          ""\b"" == ""\b""
+        </Expanded>
+      </Expression>
+      <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
+    </Section>
+    <Section name="Formfeed in a string is escaped" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+        <Original>
+          sstream.str() == "\"\\f\""
+        </Original>
+        <Expanded>
+          ""\f"" == ""\f""
+        </Expanded>
+      </Expression>
+      <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
+    </Section>
+    <Section name="linefeed in a string is escaped" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+        <Original>
+          sstream.str() == "\"\\n\""
+        </Original>
+        <Expanded>
+          ""\n"" == ""\n""
+        </Expanded>
+      </Expression>
+      <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
+    </Section>
+    <Section name="carriage return in a string is escaped" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+        <Original>
+          sstream.str() == "\"\\r\""
+        </Original>
+        <Expanded>
+          ""\r"" == ""\r""
+        </Expanded>
+      </Expression>
+      <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
+    </Section>
+    <Section name="tab in a string is escaped" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+        <Original>
+          sstream.str() == "\"\\t\""
+        </Original>
+        <Expanded>
+          ""\t"" == ""\t""
+        </Expanded>
+      </Expression>
+      <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
+    </Section>
+    <Section name="combination of characters is escaped" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+      <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
+        <Original>
+          sstream.str() == "\"\\\\/\\t\\r\\n\""
+        </Original>
+        <Expanded>
+          ""\\/\t\r\n"" == ""\\/\t\r\n""
+        </Expanded>
+      </Expression>
+      <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
+    </Section>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
   <TestCase name="Lambdas in assertions" filename="tests/<exe-name>/UsageTests/Compilation.tests.cpp" >
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Compilation.tests.cpp" >
       <Original>
@@ -9219,7 +9546,7 @@ C
     <OverallResult success="true" skips="0"/>
   </TestCase>
   <TestCase name="Nice descriptive name" tags="[.][tag1][tag2][tag3]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
-    <Warning>
+    <Warning filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
       This one ran
     </Warning>
     <OverallResult success="false" skips="0"/>
@@ -10005,7 +10332,7 @@ C
     <OverallResult success="true" skips="0"/>
   </TestCase>
   <TestCase name="Parsing tags with non-alphabetical characters is pass-through" tags="[test-spec][test-spec-parser]" filename="tests/<exe-name>/IntrospectiveTests/TestSpecParser.tests.cpp" >
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/TestSpecParser.tests.cpp" >
       tagString := "[tag with spaces]"
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/TestSpecParser.tests.cpp" >
@@ -10016,7 +10343,7 @@ C
         true
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/TestSpecParser.tests.cpp" >
       tagString := "[tag with spaces]"
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/TestSpecParser.tests.cpp" >
@@ -10027,7 +10354,7 @@ C
         true
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/TestSpecParser.tests.cpp" >
       tagString := "[tag with spaces]"
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/TestSpecParser.tests.cpp" >
@@ -10038,7 +10365,7 @@ C
         true
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/TestSpecParser.tests.cpp" >
       tagString := "[I said "good day" sir!]"
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/TestSpecParser.tests.cpp" >
@@ -10049,7 +10376,7 @@ C
         true
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/TestSpecParser.tests.cpp" >
       tagString := "[I said "good day" sir!]"
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/TestSpecParser.tests.cpp" >
@@ -10060,7 +10387,7 @@ C
         true
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/IntrospectiveTests/TestSpecParser.tests.cpp" >
       tagString := "[I said "good day" sir!]"
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/TestSpecParser.tests.cpp" >
@@ -10471,7 +10798,7 @@ C
     </Section>
     <Section name="reporter" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
       <Section name="-r/console" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
-        <Info>
+        <Info filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           result.errorMessage() := ""
         </Info>
         <Expression success="true" type="CHECK" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
@@ -10482,7 +10809,7 @@ C
             {?}
           </Expanded>
         </Expression>
-        <Info>
+        <Info filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           result.errorMessage() := ""
         </Info>
         <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
@@ -10499,7 +10826,7 @@ C
     </Section>
     <Section name="reporter" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
       <Section name="-r/xml" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
-        <Info>
+        <Info filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           result.errorMessage() := ""
         </Info>
         <Expression success="true" type="CHECK" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
@@ -10510,7 +10837,7 @@ C
             {?}
           </Expanded>
         </Expression>
-        <Info>
+        <Info filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           result.errorMessage() := ""
         </Info>
         <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
@@ -10527,7 +10854,7 @@ C
     </Section>
     <Section name="reporter" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
       <Section name="--reporter/junit" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
-        <Info>
+        <Info filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           result.errorMessage() := ""
         </Info>
         <Expression success="true" type="CHECK" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
@@ -10538,7 +10865,7 @@ C
             {?}
           </Expanded>
         </Expression>
-        <Info>
+        <Info filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           result.errorMessage() := ""
         </Info>
         <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
@@ -10577,7 +10904,7 @@ C
     </Section>
     <Section name="reporter" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
       <Section name="With output file" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
-        <Info>
+        <Info filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           result.errorMessage() := ""
         </Info>
         <Expression success="true" type="CHECK" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
@@ -10588,7 +10915,7 @@ C
             {?}
           </Expanded>
         </Expression>
-        <Info>
+        <Info filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           result.errorMessage() := ""
         </Info>
         <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
@@ -10605,7 +10932,7 @@ C
     </Section>
     <Section name="reporter" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
       <Section name="With Windows-like absolute path as output file" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
-        <Info>
+        <Info filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           result.errorMessage() := ""
         </Info>
         <Expression success="true" type="CHECK" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
@@ -10616,7 +10943,7 @@ C
             {?}
           </Expanded>
         </Expression>
-        <Info>
+        <Info filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
           result.errorMessage() := ""
         </Info>
         <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
@@ -11441,7 +11768,7 @@ C
       </Expanded>
     </Expression>
     <Section name="Automake reporter lists tags" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: Automake
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -11467,7 +11794,7 @@ C
       </Expanded>
     </Expression>
     <Section name="Automake reporter lists reporters" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: Automake
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -11492,7 +11819,7 @@ C
       </Expanded>
     </Expression>
     <Section name="Automake reporter lists tests" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: Automake
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -11519,7 +11846,7 @@ C
       </Expanded>
     </Expression>
     <Section name="compact reporter lists tags" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: compact
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -11545,7 +11872,7 @@ C
       </Expanded>
     </Expression>
     <Section name="compact reporter lists reporters" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: compact
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -11570,7 +11897,7 @@ C
       </Expanded>
     </Expression>
     <Section name="compact reporter lists tests" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: compact
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -11597,7 +11924,7 @@ C
       </Expanded>
     </Expression>
     <Section name="console reporter lists tags" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: console
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -11623,7 +11950,7 @@ C
       </Expanded>
     </Expression>
     <Section name="console reporter lists reporters" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: console
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -11648,7 +11975,7 @@ C
       </Expanded>
     </Expression>
     <Section name="console reporter lists tests" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: console
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -11674,8 +12001,122 @@ C
         !false
       </Expanded>
     </Expression>
+    <Section name="JSON reporter lists tags" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
+        Tested reporter: JSON
+      </Info>
+      <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
+        <Original>
+          listingString, ContainsSubstring("fakeTag"s)
+        </Original>
+        <Expanded>
+          "{
+  "version": 1,
+  "metadata": {
+    "name": "",
+    "rng-seed": 1234,
+    "catch2-version": "<version>"
+  },
+  "listings": {
+    "tags": [
+      {
+        "aliases": [
+          "fakeTag"
+        ],
+        "count": 1
+      }
+    ]" contains: "fakeTag"
+        </Expanded>
+      </Expression>
+      <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
+    </Section>
+    <Expression success="true" type="REQUIRE_FALSE" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
+      <Original>
+        !(factories.empty())
+      </Original>
+      <Expanded>
+        !false
+      </Expanded>
+    </Expression>
+    <Section name="JSON reporter lists reporters" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
+        Tested reporter: JSON
+      </Info>
+      <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
+        <Original>
+          listingString, ContainsSubstring("fake reporter"s)
+        </Original>
+        <Expanded>
+          "{
+  "version": 1,
+  "metadata": {
+    "name": "",
+    "rng-seed": 1234,
+    "catch2-version": "<version>"
+  },
+  "listings": {
+    "reporters": [
+      {
+        "name": "fake reporter",
+        "description": "fake description"
+      }
+    ]" contains: "fake reporter"
+        </Expanded>
+      </Expression>
+      <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
+    </Section>
+    <Expression success="true" type="REQUIRE_FALSE" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
+      <Original>
+        !(factories.empty())
+      </Original>
+      <Expanded>
+        !false
+      </Expanded>
+    </Expression>
+    <Section name="JSON reporter lists tests" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
+        Tested reporter: JSON
+      </Info>
+      <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
+        <Original>
+          listingString, ContainsSubstring( "fake test name"s ) &amp;&amp; ContainsSubstring( "fakeTestTag"s )
+        </Original>
+        <Expanded>
+          "{
+  "version": 1,
+  "metadata": {
+    "name": "",
+    "rng-seed": 1234,
+    "catch2-version": "<version>"
+  },
+  "listings": {
+    "tests": [
+      {
+        "name": "fake test name",
+        "class-name": "",
+        "tags": [
+          "fakeTestTag"
+        ],
+        "source-location": {
+          "filename": "fake-file.cpp",
+          "line": 123456789
+        }
+      }
+    ]" ( contains: "fake test name" and contains: "fakeTestTag" )
+        </Expanded>
+      </Expression>
+      <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
+    </Section>
+    <Expression success="true" type="REQUIRE_FALSE" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
+      <Original>
+        !(factories.empty())
+      </Original>
+      <Expanded>
+        !false
+      </Expanded>
+    </Expression>
     <Section name="JUnit reporter lists tags" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: JUnit
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -11702,7 +12143,7 @@ All available tags:
       </Expanded>
     </Expression>
     <Section name="JUnit reporter lists reporters" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: JUnit
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -11728,7 +12169,7 @@ Available reporters:
       </Expanded>
     </Expression>
     <Section name="JUnit reporter lists tests" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: JUnit
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -11756,7 +12197,7 @@ All available test cases:
       </Expanded>
     </Expression>
     <Section name="SonarQube reporter lists tags" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: SonarQube
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -11783,7 +12224,7 @@ All available tags:
       </Expanded>
     </Expression>
     <Section name="SonarQube reporter lists reporters" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: SonarQube
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -11809,7 +12250,7 @@ Available reporters:
       </Expanded>
     </Expression>
     <Section name="SonarQube reporter lists tests" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: SonarQube
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -11837,7 +12278,7 @@ All available test cases:
       </Expanded>
     </Expression>
     <Section name="TAP reporter lists tags" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: TAP
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -11863,7 +12304,7 @@ All available test cases:
       </Expanded>
     </Expression>
     <Section name="TAP reporter lists reporters" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: TAP
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -11888,7 +12329,7 @@ All available test cases:
       </Expanded>
     </Expression>
     <Section name="TAP reporter lists tests" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: TAP
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -11915,7 +12356,7 @@ All available test cases:
       </Expanded>
     </Expression>
     <Section name="TeamCity reporter lists tags" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: TeamCity
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -11941,7 +12382,7 @@ All available test cases:
       </Expanded>
     </Expression>
     <Section name="TeamCity reporter lists reporters" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: TeamCity
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -11966,7 +12407,7 @@ All available test cases:
       </Expanded>
     </Expression>
     <Section name="TeamCity reporter lists tests" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: TeamCity
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -11993,7 +12434,7 @@ All available test cases:
       </Expanded>
     </Expression>
     <Section name="XML reporter lists tags" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: XML
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -12023,7 +12464,7 @@ All available test cases:
       </Expanded>
     </Expression>
     <Section name="XML reporter lists reporters" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: XML
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -12051,7 +12492,7 @@ All available test cases:
       </Expanded>
     </Expression>
     <Section name="XML reporter lists tests" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
-      <Info>
+      <Info filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         Tested reporter: XML
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
@@ -14552,6 +14993,50 @@ Message from section two
     <Failure filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" />
     <OverallResult success="true" skips="0"/>
   </TestCase>
+  <TestCase name="Testing checked-if 4" tags="[!shouldfail][checked-if]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
+    <Expression success="true" type="CHECKED_ELSE" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
+      <Original>
+        true
+      </Original>
+      <Expanded>
+        true
+      </Expanded>
+    </Expression>
+    <Expression success="false" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
+      <Original>
+        {Unknown expression after the reported line}
+      </Original>
+      <Expanded>
+        {Unknown expression after the reported line}
+      </Expanded>
+      <Exception filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
+        Uncaught exception should fail!
+      </Exception>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
+  <TestCase name="Testing checked-if 5" tags="[!shouldfail][checked-if]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
+    <Expression success="false" type="CHECKED_ELSE" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
+      <Original>
+        false
+      </Original>
+      <Expanded>
+        false
+      </Expanded>
+    </Expression>
+    <Expression success="false" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
+      <Original>
+        {Unknown expression after the reported line}
+      </Original>
+      <Expanded>
+        {Unknown expression after the reported line}
+      </Expanded>
+      <Exception filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
+        Uncaught exception should fail!
+      </Exception>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
   <TestCase name="The NO_FAIL macro reports a failure but does not fail the test" tags="[messages]" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
     <Expression success="false" type="CHECK_NOFAIL" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       <Original>
@@ -15670,7 +16155,7 @@ There is no extra whitespace here
       <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
     </Section>
     <Section name="Basic usage" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
-      <Section name="One false evalutes to false" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
+      <Section name="One false evaluates to false" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
         <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
           <Original>
             data, !AllTrue()
@@ -15712,7 +16197,7 @@ There is no extra whitespace here
       <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
     </Section>
     <Section name="Contained type is convertible to bool" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
-      <Section name="One false evalutes to false" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
+      <Section name="One false evaluates to false" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
         <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
           <Original>
             data, !AllTrue()
@@ -16020,7 +16505,7 @@ There is no extra whitespace here
       <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
     </Section>
     <Section name="Basic usage" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
-      <Section name="One true evalutes to true" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
+      <Section name="One true evaluates to true" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
         <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
           <Original>
             data, AnyTrue()
@@ -16062,7 +16547,7 @@ There is no extra whitespace here
       <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
     </Section>
     <Section name="Contained type is convertible to bool" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
-      <Section name="One true evalutes to true" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
+      <Section name="One true evaluates to true" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
         <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
           <Original>
             data, AnyTrue()
@@ -16370,7 +16855,7 @@ There is no extra whitespace here
       <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
     </Section>
     <Section name="Basic usage" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
-      <Section name="One true evalutes to false" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
+      <Section name="One true evaluates to false" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
         <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
           <Original>
             data, !NoneTrue()
@@ -16412,7 +16897,7 @@ There is no extra whitespace here
       <OverallResults successes="1" failures="0" expectedFailures="0" skipped="false"/>
     </Section>
     <Section name="Contained type is convertible to bool" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
-      <Section name="One true evalutes to false" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
+      <Section name="One true evaluates to false" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
         <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
           <Original>
             data, !NoneTrue()
@@ -18765,7 +19250,7 @@ There is no extra whitespace here
     <OverallResult success="false" skips="0"/>
   </TestCase>
   <TestCase name="looped tests" tags="[.][failing]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
       Testing if fib[0] (1) is even
     </Info>
     <Expression success="false" type="CHECK" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
@@ -18776,7 +19261,7 @@ There is no extra whitespace here
         1 == 0
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
       Testing if fib[1] (1) is even
     </Info>
     <Expression success="false" type="CHECK" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
@@ -18787,7 +19272,7 @@ There is no extra whitespace here
         1 == 0
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
       Testing if fib[2] (2) is even
     </Info>
     <Expression success="true" type="CHECK" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
@@ -18798,7 +19283,7 @@ There is no extra whitespace here
         0 == 0
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
       Testing if fib[3] (3) is even
     </Info>
     <Expression success="false" type="CHECK" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
@@ -18809,7 +19294,7 @@ There is no extra whitespace here
         1 == 0
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
       Testing if fib[4] (5) is even
     </Info>
     <Expression success="false" type="CHECK" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
@@ -18820,7 +19305,7 @@ There is no extra whitespace here
         1 == 0
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
       Testing if fib[5] (8) is even
     </Info>
     <Expression success="true" type="CHECK" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
@@ -18831,7 +19316,7 @@ There is no extra whitespace here
         0 == 0
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
       Testing if fib[6] (13) is even
     </Info>
     <Expression success="false" type="CHECK" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
@@ -18842,7 +19327,7 @@ There is no extra whitespace here
         1 == 0
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
       Testing if fib[7] (21) is even
     </Info>
     <Expression success="false" type="CHECK" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
@@ -18981,22 +19466,22 @@ There is no extra whitespace here
     <OverallResult success="true" skips="0"/>
   </TestCase>
   <TestCase name="mix info, unscoped info and warning" tags="[info][unscoped]" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       info
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       unscoped info
     </Info>
-    <Warning>
+    <Warning filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       and warn may mix
     </Warning>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       info
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       unscoped info
     </Info>
-    <Warning>
+    <Warning filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       they are not cleared after warnings
     </Warning>
     <OverallResult success="false" skips="0"/>
@@ -19203,7 +19688,7 @@ b1!
     <OverallResult success="true" skips="0"/>
   </TestCase>
   <TestCase name="not prints unscoped info from previous failures" tags="[.][failing][info][unscoped]" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       this MAY be seen only for the FIRST assertion IF info is printed for passing assertions
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -19214,7 +19699,7 @@ b1!
         true
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       this MAY be seen only for the SECOND assertion IF info is printed for passing assertions
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -19225,7 +19710,7 @@ b1!
         true
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       this SHOULD be seen
     </Info>
     <Expression success="false" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -19361,7 +19846,7 @@ b1!
     <OverallResult success="true" skips="0"/>
   </TestCase>
   <TestCase name="print unscoped info if passing unscoped info is printed" tags="[info][unscoped]" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       this MAY be seen IF info is printed for passing assertions
     </Info>
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -19375,10 +19860,10 @@ b1!
     <OverallResult success="true" skips="0"/>
   </TestCase>
   <TestCase name="prints unscoped info on failure" tags="[.][failing][info][unscoped]" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       this SHOULD be seen
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       this SHOULD also be seen
     </Info>
     <Expression success="false" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -19392,7 +19877,7 @@ b1!
     <OverallResult success="false" skips="0"/>
   </TestCase>
   <TestCase name="prints unscoped info only for the first assertion" tags="[.][failing][info][unscoped]" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       this SHOULD be seen only ONCE
     </Info>
     <Expression success="false" type="CHECK" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -19411,7 +19896,7 @@ b1!
         true
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       this MAY also be seen only ONCE IF info is printed for passing assertions
     </Info>
     <Expression success="true" type="CHECK" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -19894,7 +20379,7 @@ b1!
     <OverallResult success="true" skips="1"/>
   </TestCase>
   <TestCase name="send a single char to INFO" tags="[.][failing]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
       3
     </Info>
     <Expression success="false" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
@@ -19908,10 +20393,10 @@ b1!
     <OverallResult success="false" skips="0"/>
   </TestCase>
   <TestCase name="sends information to INFO" tags="[.][failing]" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       hi
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       i := 7
     </Info>
     <Expression success="false" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -19969,16 +20454,16 @@ b1!
     <OverallResult success="true" skips="0"/>
   </TestCase>
   <TestCase name="stacks unscoped info in loops" tags="[.][failing][info][unscoped]" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       Count 1 to 3...
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       1
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       2
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       3
     </Info>
     <Expression success="false" type="CHECK" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -19989,16 +20474,16 @@ b1!
         false
       </Expanded>
     </Expression>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       Count 4 to 6...
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       4
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       5
     </Info>
-    <Info>
+    <Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
       6
     </Info>
     <Expression success="false" type="CHECK" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
@@ -20648,6 +21133,25 @@ b1!
     </Expression>
     <OverallResult success="true" skips="0"/>
   </TestCase>
+  <TestCase name="uniform_integer_distribution can return the bounds" tags="[distribution][rng]" filename="tests/<exe-name>/IntrospectiveTests/RandomNumberGeneration.tests.cpp" >
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/RandomNumberGeneration.tests.cpp" >
+      <Original>
+        dist.a() == -10
+      </Original>
+      <Expanded>
+        -10 == -10
+      </Expanded>
+    </Expression>
+    <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/RandomNumberGeneration.tests.cpp" >
+      <Original>
+        dist.b() == 10
+      </Original>
+      <Expanded>
+        10 == 10
+      </Expanded>
+    </Expression>
+    <OverallResult success="true" skips="0"/>
+  </TestCase>
   <TestCase name="unique_ptr reimplementation: basic functionality" tags="[internals][unique-ptr]" filename="tests/<exe-name>/IntrospectiveTests/UniquePtr.tests.cpp" >
     <Section name="Default constructed unique_ptr is empty" filename="tests/<exe-name>/IntrospectiveTests/UniquePtr.tests.cpp" >
       <Expression success="true" type="REQUIRE_FALSE" filename="tests/<exe-name>/IntrospectiveTests/UniquePtr.tests.cpp" >
@@ -21202,6 +21706,6 @@ b1!
     </Section>
     <OverallResult success="true" skips="0"/>
   </TestCase>
-  <OverallResults successes="2049" failures="145" expectedFailures="32" skips="11"/>
-  <OverallResultsCases successes="309" failures="84" expectedFailures="11" skips="5"/>
+  <OverallResults successes="2079" failures="146" expectedFailures="35" skips="12"/>
+  <OverallResultsCases successes="312" failures="85" expectedFailures="14" skips="6"/>
 </Catch2TestRun>
diff --git a/external_imported/Catch2/tests/SelfTest/IntrospectiveTests/AssertionHandler.tests.cpp b/external_imported/Catch2/tests/SelfTest/IntrospectiveTests/AssertionHandler.tests.cpp
new file mode 100644
index 000000000..ab0960745
--- /dev/null
+++ b/external_imported/Catch2/tests/SelfTest/IntrospectiveTests/AssertionHandler.tests.cpp
@@ -0,0 +1,17 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+
+#include <catch2/catch_test_macros.hpp>
+
+TEST_CASE( "Incomplete AssertionHandler", "[assertion-handler][!shouldfail]" ) {
+    Catch::AssertionHandler catchAssertionHandler(
+        "REQUIRE"_catch_sr,
+        CATCH_INTERNAL_LINEINFO,
+        "Dummy",
+        Catch::ResultDisposition::Normal );
+}
diff --git a/external_imported/Catch2/tests/SelfTest/IntrospectiveTests/Details.tests.cpp b/external_imported/Catch2/tests/SelfTest/IntrospectiveTests/Details.tests.cpp
index a5a43926c..d7175756b 100644
--- a/external_imported/Catch2/tests/SelfTest/IntrospectiveTests/Details.tests.cpp
+++ b/external_imported/Catch2/tests/SelfTest/IntrospectiveTests/Details.tests.cpp
@@ -89,6 +89,47 @@ TEST_CASE("Optional comparison ops", "[optional][approvals]") {
     }
 }
 
+namespace {
+    struct MoveChecker {
+        bool has_moved = false;
+        MoveChecker() = default;
+        MoveChecker( MoveChecker const& rhs ) = default;
+        MoveChecker& operator=( MoveChecker const& rhs ) = default;
+        MoveChecker( MoveChecker&& rhs ) noexcept { rhs.has_moved = true; }
+        MoveChecker& operator=( MoveChecker&& rhs ) noexcept {
+            rhs.has_moved = true;
+            return *this;
+        }
+    };
+}
+
+TEST_CASE( "Optional supports move ops", "[optional][approvals]" ) {
+    using Catch::Optional;
+    MoveChecker a;
+    Optional<MoveChecker> opt_A( a );
+    REQUIRE_FALSE( a.has_moved );
+    REQUIRE_FALSE( opt_A->has_moved );
+
+    SECTION( "Move construction from element" ) {
+        Optional<MoveChecker> opt_B( CATCH_MOVE( a ) );
+        REQUIRE( a.has_moved );
+    }
+    SECTION( "Move assignment from element" ) {
+        opt_A = CATCH_MOVE( a );
+        REQUIRE( a.has_moved );
+    }
+    SECTION( "Move construction from optional" ) {
+        Optional<MoveChecker> opt_B( CATCH_MOVE( opt_A ) );
+        REQUIRE( opt_A->has_moved );
+    }
+    SECTION( "Move assignment from optional" ) {
+        Optional<MoveChecker> opt_B( opt_A );
+        REQUIRE_FALSE( opt_A->has_moved );
+        opt_B = CATCH_MOVE( opt_A );
+        REQUIRE( opt_A->has_moved );
+    }
+}
+
 TEST_CASE( "Decomposer checks that the argument is 0 when handling "
            "only-0-comparable types",
            "[decomposition][approvals]" ) {
diff --git a/external_imported/Catch2/tests/SelfTest/IntrospectiveTests/FloatingPoint.tests.cpp b/external_imported/Catch2/tests/SelfTest/IntrospectiveTests/FloatingPoint.tests.cpp
index 08a579c9d..d2181702d 100644
--- a/external_imported/Catch2/tests/SelfTest/IntrospectiveTests/FloatingPoint.tests.cpp
+++ b/external_imported/Catch2/tests/SelfTest/IntrospectiveTests/FloatingPoint.tests.cpp
@@ -9,7 +9,9 @@
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/catch_template_test_macros.hpp>
 #include <catch2/internal/catch_floating_point_helpers.hpp>
+#include <catch2/internal/catch_random_floating_point_helpers.hpp>
 
+#include <limits>
 
 TEST_CASE("convertToBits", "[floating-point][conversion]") {
     using Catch::Detail::convertToBits;
@@ -72,3 +74,66 @@ TEST_CASE("UlpDistance", "[floating-point][ulp][approvals]") {
     CHECK( ulpDistance( 1.f, 2.f ) == 0x80'00'00 );
     CHECK( ulpDistance( -2.f, 2.f ) == 0x80'00'00'00 );
 }
+
+
+
+TEMPLATE_TEST_CASE("gamma", "[approvals][floating-point][ulp][gamma]", float, double) {
+    using Catch::Detail::gamma;
+    using Catch::Detail::directCompare;
+
+    // We need to butcher the equal tests with the directCompare helper,
+    // because the Wfloat-equal triggers in decomposer rather than here,
+    // so we cannot locally disable it. Goddamn GCC.
+    CHECK( directCompare( gamma( TestType( -1. ), TestType( 1. ) ),
+                          gamma( TestType( 0.2332 ), TestType( 1.0 ) ) ) );
+    CHECK( directCompare( gamma( TestType( -2. ), TestType( 0 ) ),
+                          gamma( TestType( 1. ), TestType( 1.5 ) ) ) );
+    CHECK( gamma( TestType( 0. ), TestType( 1.0 ) ) <
+           gamma( TestType( 1.0 ), TestType( 1.5 ) ) );
+    CHECK( gamma( TestType( 0 ), TestType( 1. ) ) <
+           std::numeric_limits<TestType>::epsilon() );
+    CHECK( gamma( TestType( -1. ), TestType( -0. ) ) <
+           std::numeric_limits<TestType>::epsilon() );
+    CHECK( directCompare( gamma( TestType( 1. ), TestType( 2. ) ),
+                          std::numeric_limits<TestType>::epsilon() ) );
+    CHECK( directCompare( gamma( TestType( -2. ), TestType( -1. ) ),
+                          std::numeric_limits<TestType>::epsilon() ) );
+}
+
+TEMPLATE_TEST_CASE("count_equidistant_floats",
+                   "[approvals][floating-point][distance]",
+                   float,
+                   double) {
+    using Catch::Detail::count_equidistant_floats;
+    auto count_steps = []( TestType a, TestType b ) {
+        return count_equidistant_floats( a, b, Catch::Detail::gamma( a, b ) );
+    };
+
+    CHECK( count_steps( TestType( -1. ), TestType( 1. ) ) ==
+           2 * count_steps( TestType( 0. ), TestType( 1. ) ) );
+}
+
+TEST_CASE( "count_equidistant_floats",
+           "[approvals][floating-point][distance]" ) {
+    using Catch::Detail::count_equidistant_floats;
+    auto count_floats_with_scaled_ulp = []( auto a, auto b ) {
+        return count_equidistant_floats( a, b, Catch::Detail::gamma( a, b ) );
+    };
+
+    CHECK( count_floats_with_scaled_ulp( 1., 1.5 ) == 1ull << 51 );
+    CHECK( count_floats_with_scaled_ulp( 1.25, 1.5 ) == 1ull << 50 );
+    CHECK( count_floats_with_scaled_ulp( 1.f, 1.5f ) == 1 << 22 );
+    CHECK( count_floats_with_scaled_ulp( -std::numeric_limits<float>::max(),
+                                         std::numeric_limits<float>::max() ) ==
+           33554430 ); // (1 << 25) - 2 due to not including infinities
+    CHECK( count_floats_with_scaled_ulp( -std::numeric_limits<double>::max(),
+                                         std::numeric_limits<double>::max() ) ==
+           18014398509481982 ); // (1 << 54) - 2 due to not including infinities
+
+    STATIC_REQUIRE( std::is_same<std::uint64_t,
+                                 decltype( count_floats_with_scaled_ulp(
+                                     0., 1. ) )>::value );
+    STATIC_REQUIRE( std::is_same<std::uint32_t,
+                                 decltype( count_floats_with_scaled_ulp(
+                                     0.f, 1.f ) )>::value );
+}
diff --git a/external_imported/Catch2/tests/SelfTest/IntrospectiveTests/GeneratorsImpl.tests.cpp b/external_imported/Catch2/tests/SelfTest/IntrospectiveTests/GeneratorsImpl.tests.cpp
index 64e943f84..acfeebed0 100644
--- a/external_imported/Catch2/tests/SelfTest/IntrospectiveTests/GeneratorsImpl.tests.cpp
+++ b/external_imported/Catch2/tests/SelfTest/IntrospectiveTests/GeneratorsImpl.tests.cpp
@@ -10,6 +10,8 @@
 #    pragma GCC diagnostic ignored "-Wfloat-equal"
 #endif
 
+#include <helpers/range_test_helpers.hpp>
+
 #include <catch2/catch_approx.hpp>
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/generators/catch_generator_exception.hpp>
@@ -412,6 +414,7 @@ TEST_CASE("GENERATE handles function (pointers)", "[generators][compilation][app
 
 TEST_CASE("GENERATE decays arrays", "[generators][compilation][approvals]") {
     auto str = GENERATE("abc", "def", "gh");
+    (void)str;
     STATIC_REQUIRE(std::is_same<decltype(str), const char*>::value);
 }
 
@@ -544,3 +547,30 @@ TEST_CASE("Filter generator throws exception for empty generator",
         filter( []( int ) { return false; }, value( 3 ) ),
         Catch::GeneratorException );
 }
+
+TEST_CASE("from_range(container) supports ADL begin/end and arrays", "[generators][from-range][approvals]") {
+    using namespace Catch::Generators;
+
+    SECTION("C array") {
+        int arr[3]{ 5, 6, 7 };
+        auto gen = from_range( arr );
+        REQUIRE( gen.get() == 5 );
+        REQUIRE( gen.next() );
+        REQUIRE( gen.get() == 6 );
+        REQUIRE( gen.next() );
+        REQUIRE( gen.get() == 7 );
+        REQUIRE_FALSE( gen.next() );
+    }
+
+    SECTION( "ADL range" ) {
+        unrelated::needs_ADL_begin<int> range{ 1, 2, 3 };
+        auto gen = from_range( range );
+        REQUIRE( gen.get() == 1 );
+        REQUIRE( gen.next() );
+        REQUIRE( gen.get() == 2 );
+        REQUIRE( gen.next() );
+        REQUIRE( gen.get() == 3 );
+        REQUIRE_FALSE( gen.next() );
+    }
+
+}
diff --git a/external_imported/Catch2/tests/SelfTest/IntrospectiveTests/Integer.tests.cpp b/external_imported/Catch2/tests/SelfTest/IntrospectiveTests/Integer.tests.cpp
new file mode 100644
index 000000000..fd620ebbf
--- /dev/null
+++ b/external_imported/Catch2/tests/SelfTest/IntrospectiveTests/Integer.tests.cpp
@@ -0,0 +1,150 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/internal/catch_random_integer_helpers.hpp>
+
+namespace {
+    template <typename Int>
+    static void
+    CommutativeMultCheck( Int a, Int b, Int upper_result, Int lower_result ) {
+        using Catch::Detail::extendedMult;
+        using Catch::Detail::ExtendedMultResult;
+        CHECK( extendedMult( a, b ) ==
+               ExtendedMultResult<Int>{ upper_result, lower_result } );
+        CHECK( extendedMult( b, a ) ==
+               ExtendedMultResult<Int>{ upper_result, lower_result } );
+    }
+} // namespace
+
+TEST_CASE( "extendedMult 64x64", "[Integer][approvals]" ) {
+    // a x 0 == 0
+    CommutativeMultCheck<uint64_t>( 0x1234'5678'9ABC'DEFF, 0, 0, 0 );
+
+    // bit carried from low half to upper half
+    CommutativeMultCheck<uint64_t>( uint64_t( 1 ) << 63, 2, 1, 0 );
+
+    // bits in upper half on one side, bits in lower half on other side
+    CommutativeMultCheck<uint64_t>( 0xcdcd'dcdc'0000'0000,
+                                    0x0000'0000'aeae'aeae,
+                                    0x0000'0000'8c6e'5a77,
+                                    0x7391'a588'0000'0000 );
+
+    // Some input numbers without interesting patterns
+    CommutativeMultCheck<uint64_t>( 0xaaaa'aaaa'aaaa'aaaa,
+                                    0xbbbb'bbbb'bbbb'bbbb,
+                                    0x7d27'd27d'27d2'7d26,
+                                    0xd82d'82d8'2d82'd82e );
+
+    CommutativeMultCheck<uint64_t>( 0x7d27'd27d'27d2'7d26,
+                                    0xd82d'82d8'2d82'd82e,
+                                    0x69af'd991'8256'b953,
+                                    0x8724'8909'fcb6'8cd4 );
+
+    CommutativeMultCheck<uint64_t>( 0xdead'beef'dead'beef,
+                                    0xfeed'feed'feed'feef,
+                                    0xddbf'680b'2b0c'b558,
+                                    0x7a36'b06f'2ce9'6321 );
+
+    CommutativeMultCheck<uint64_t>( 0xddbf'680b'2b0c'b558,
+                                    0x7a36'b06f'2ce9'6321,
+                                    0x69dc'96c9'294b'fc7f,
+                                    0xd038'39fa'a3dc'6858 );
+
+    CommutativeMultCheck<uint64_t>( 0x61c8'8646'80b5'83eb,
+                                    0x61c8'8646'80b5'83eb,
+                                    0x2559'92d3'8220'8bbe,
+                                    0xdf44'2d22'ce48'59b9 );
+}
+
+TEST_CASE( "SizedUnsignedType helpers", "[integer][approvals]" ) {
+    using Catch::Detail::SizedUnsignedType_t;
+    using Catch::Detail::DoubleWidthUnsignedType_t;
+
+    STATIC_REQUIRE( sizeof( SizedUnsignedType_t<1> ) == 1 );
+    STATIC_REQUIRE( sizeof( SizedUnsignedType_t<2> ) == 2 );
+    STATIC_REQUIRE( sizeof( SizedUnsignedType_t<4> ) == 4 );
+    STATIC_REQUIRE( sizeof( SizedUnsignedType_t<8> ) == 8 );
+
+    STATIC_REQUIRE( sizeof( DoubleWidthUnsignedType_t<std::uint8_t> ) == 2 );
+    STATIC_REQUIRE( std::is_unsigned<DoubleWidthUnsignedType_t<std::uint8_t>>::value );
+    STATIC_REQUIRE( sizeof( DoubleWidthUnsignedType_t<std::uint16_t> ) == 4 );
+    STATIC_REQUIRE( std::is_unsigned<DoubleWidthUnsignedType_t<std::uint16_t>>::value );
+    STATIC_REQUIRE( sizeof( DoubleWidthUnsignedType_t<std::uint32_t> ) == 8 );
+    STATIC_REQUIRE( std::is_unsigned<DoubleWidthUnsignedType_t<std::uint32_t>>::value );
+}
+
+TEST_CASE( "extendedMult 32x32", "[integer][approvals]" ) {
+    // a x 0 == 0
+    CommutativeMultCheck<uint32_t>( 0x1234'5678, 0, 0, 0 );
+
+    // bit carried from low half to upper half
+    CommutativeMultCheck<uint32_t>( uint32_t(1) << 31, 2, 1, 0 );
+
+    // bits in upper half on one side, bits in lower half on other side
+    CommutativeMultCheck<uint32_t>( 0xdcdc'0000, 0x0000'aabb, 0x0000'934b, 0x6cb4'0000 );
+
+    // Some input numbers without interesting patterns
+    CommutativeMultCheck<uint32_t>(
+        0xaaaa'aaaa, 0xbbbb'bbbb, 0x7d27'd27c, 0x2d82'd82e );
+
+    CommutativeMultCheck<uint32_t>(
+        0x7d27'd27c, 0x2d82'd82e, 0x163f'f7e8, 0xc5b8'7248 );
+
+    CommutativeMultCheck<uint32_t>(
+        0xdead'beef, 0xfeed'feed, 0xddbf'6809, 0x6f8d'e543 );
+
+    CommutativeMultCheck<uint32_t>(
+        0xddbf'6809, 0x6f8d'e543, 0x60a0'e71e, 0x751d'475b );
+}
+
+TEST_CASE( "extendedMult 8x8", "[integer][approvals]" ) {
+    // a x 0 == 0
+    CommutativeMultCheck<uint8_t>( 0xcd, 0, 0, 0 );
+
+    // bit carried from low half to upper half
+    CommutativeMultCheck<uint8_t>( uint8_t( 1 ) << 7, 2, 1, 0 );
+
+    // bits in upper half on one side, bits in lower half on other side
+    CommutativeMultCheck<uint8_t>( 0x80, 0x03, 0x01, 0x80 );
+
+    // Some input numbers without interesting patterns
+    CommutativeMultCheck<uint8_t>( 0xaa, 0xbb, 0x7c, 0x2e );
+    CommutativeMultCheck<uint8_t>( 0x7c, 0x2e, 0x16, 0x48 );
+    CommutativeMultCheck<uint8_t>( 0xdc, 0xcd, 0xb0, 0x2c );
+    CommutativeMultCheck<uint8_t>( 0xb0, 0x2c, 0x1e, 0x40 );
+}
+
+
+TEST_CASE( "negative and positive signed integers keep their order after transposeToNaturalOrder",
+                    "[integer][approvals]") {
+    using Catch::Detail::transposeToNaturalOrder;
+    int32_t negative( -1 );
+    int32_t positive( 1 );
+    uint32_t adjusted_negative =
+        transposeToNaturalOrder<int32_t>( static_cast<uint32_t>( negative ) );
+    uint32_t adjusted_positive =
+        transposeToNaturalOrder<int32_t>( static_cast<uint32_t>( positive ) );
+    REQUIRE( adjusted_negative < adjusted_positive );
+    REQUIRE( adjusted_positive - adjusted_negative == 2 );
+
+    // Conversion has to be reversible
+    REQUIRE( negative == static_cast<int32_t>( transposeToNaturalOrder<int32_t>(
+                             adjusted_negative ) ) );
+    REQUIRE( positive == static_cast<int32_t>( transposeToNaturalOrder<int32_t>(
+                             adjusted_positive ) ) );
+}
+
+TEST_CASE( "unsigned integers are unchanged by transposeToNaturalOrder",
+           "[integer][approvals]") {
+    using Catch::Detail::transposeToNaturalOrder;
+    uint32_t max = std::numeric_limits<uint32_t>::max();
+    uint32_t zero = 0;
+    REQUIRE( max == transposeToNaturalOrder<uint32_t>( max ) );
+    REQUIRE( zero == transposeToNaturalOrder<uint32_t>( zero ) );
+}
diff --git a/external_imported/Catch2/tests/SelfTest/IntrospectiveTests/InternalBenchmark.tests.cpp b/external_imported/Catch2/tests/SelfTest/IntrospectiveTests/InternalBenchmark.tests.cpp
index 96c0977b7..bc8d715b4 100644
--- a/external_imported/Catch2/tests/SelfTest/IntrospectiveTests/InternalBenchmark.tests.cpp
+++ b/external_imported/Catch2/tests/SelfTest/IntrospectiveTests/InternalBenchmark.tests.cpp
@@ -22,6 +22,8 @@
 #include <catch2/benchmark/detail/catch_benchmark_function.hpp>
 #include <catch2/benchmark/detail/catch_estimate_clock.hpp>
 
+#include <numeric>
+
 namespace {
     struct manual_clock {
     public:
@@ -154,8 +156,12 @@ TEST_CASE("uniform samples", "[benchmark]") {
     std::vector<double> samples(100);
     std::fill(samples.begin(), samples.end(), 23);
 
-    using it = std::vector<double>::iterator;
-    auto e = Catch::Benchmark::Detail::bootstrap(0.95, samples.begin(), samples.end(), samples, [](it a, it b) {
+    auto e = Catch::Benchmark::Detail::bootstrap(
+        0.95,
+        samples.data(),
+        samples.data() + samples.size(),
+        samples,
+        []( double const* a, double const* b ) {
         auto sum = std::accumulate(a, b, 0.);
         return sum / (b - a);
     });
@@ -196,7 +202,7 @@ TEST_CASE("normal_quantile", "[benchmark]") {
 TEST_CASE("mean", "[benchmark]") {
     std::vector<double> x{ 10., 20., 14., 16., 30., 24. };
 
-    auto m = Catch::Benchmark::Detail::mean(x.begin(), x.end());
+    auto m = Catch::Benchmark::Detail::mean(x.data(), x.data() + x.size());
 
     REQUIRE(m == 19.);
 }
@@ -204,9 +210,9 @@ TEST_CASE("mean", "[benchmark]") {
 TEST_CASE("weighted_average_quantile", "[benchmark]") {
     std::vector<double> x{ 10., 20., 14., 16., 30., 24. };
 
-    auto q1 = Catch::Benchmark::Detail::weighted_average_quantile(1, 4, x.begin(), x.end());
-    auto med = Catch::Benchmark::Detail::weighted_average_quantile(1, 2, x.begin(), x.end());
-    auto q3 = Catch::Benchmark::Detail::weighted_average_quantile(3, 4, x.begin(), x.end());
+    auto q1 = Catch::Benchmark::Detail::weighted_average_quantile(1, 4, x.data(), x.data() + x.size());
+    auto med = Catch::Benchmark::Detail::weighted_average_quantile(1, 2, x.data(), x.data() + x.size());
+    auto q3 = Catch::Benchmark::Detail::weighted_average_quantile(3, 4, x.data(), x.data() + x.size());
 
     REQUIRE(q1 == 14.5);
     REQUIRE(med == 18.);
@@ -225,7 +231,8 @@ TEST_CASE("classify_outliers", "[benchmark]") {
     SECTION("none") {
         std::vector<double> x{ 10., 20., 14., 16., 30., 24. };
 
-        auto o = Catch::Benchmark::Detail::classify_outliers(x.begin(), x.end());
+        auto o = Catch::Benchmark::Detail::classify_outliers(
+            x.data(), x.data() + x.size() );
 
         REQUIRE(o.samples_seen == static_cast<int>(x.size()));
         require_outliers(o, 0, 0, 0, 0);
@@ -233,7 +240,8 @@ TEST_CASE("classify_outliers", "[benchmark]") {
     SECTION("low severe") {
         std::vector<double> x{ -12., 20., 14., 16., 30., 24. };
 
-        auto o = Catch::Benchmark::Detail::classify_outliers(x.begin(), x.end());
+        auto o = Catch::Benchmark::Detail::classify_outliers(
+            x.data(), x.data() + x.size() );
 
         REQUIRE(o.samples_seen == static_cast<int>(x.size()));
         require_outliers(o, 1, 0, 0, 0);
@@ -241,7 +249,8 @@ TEST_CASE("classify_outliers", "[benchmark]") {
     SECTION("low mild") {
         std::vector<double> x{ 1., 20., 14., 16., 30., 24. };
 
-        auto o = Catch::Benchmark::Detail::classify_outliers(x.begin(), x.end());
+        auto o = Catch::Benchmark::Detail::classify_outliers(
+            x.data(), x.data() + x.size() );
 
         REQUIRE(o.samples_seen == static_cast<int>(x.size()));
         require_outliers(o, 0, 1, 0, 0);
@@ -249,7 +258,8 @@ TEST_CASE("classify_outliers", "[benchmark]") {
     SECTION("high mild") {
         std::vector<double> x{ 10., 20., 14., 16., 36., 24. };
 
-        auto o = Catch::Benchmark::Detail::classify_outliers(x.begin(), x.end());
+        auto o = Catch::Benchmark::Detail::classify_outliers(
+            x.data(), x.data() + x.size() );
 
         REQUIRE(o.samples_seen == static_cast<int>(x.size()));
         require_outliers(o, 0, 0, 1, 0);
@@ -257,7 +267,8 @@ TEST_CASE("classify_outliers", "[benchmark]") {
     SECTION("high severe") {
         std::vector<double> x{ 10., 20., 14., 16., 49., 24. };
 
-        auto o = Catch::Benchmark::Detail::classify_outliers(x.begin(), x.end());
+        auto o = Catch::Benchmark::Detail::classify_outliers(
+            x.data(), x.data() + x.size() );
 
         REQUIRE(o.samples_seen == static_cast<int>(x.size()));
         require_outliers(o, 0, 0, 0, 1);
@@ -265,7 +276,8 @@ TEST_CASE("classify_outliers", "[benchmark]") {
     SECTION("mixed") {
         std::vector<double> x{ -20., 20., 14., 16., 39., 24. };
 
-        auto o = Catch::Benchmark::Detail::classify_outliers(x.begin(), x.end());
+        auto o = Catch::Benchmark::Detail::classify_outliers(
+            x.data(), x.data() + x.size() );
 
         REQUIRE(o.samples_seen == static_cast<int>(x.size()));
         require_outliers(o, 1, 0, 1, 0);
@@ -280,15 +292,13 @@ TEST_CASE("analyse", "[approvals][benchmark]") {
     data.benchmarkSamples = 99;
     Catch::Config config{data};
 
-    using Duration = Catch::Benchmark::FloatDuration<Catch::Benchmark::default_clock>;
-
-    Catch::Benchmark::Environment<Duration> env;
-    std::vector<Duration> samples(99);
+    using FDuration = Catch::Benchmark::FDuration;
+    std::vector<FDuration> samples(99);
     for (size_t i = 0; i < samples.size(); ++i) {
-        samples[i] = Duration(23 + (i % 3 - 1));
+        samples[i] = FDuration(23 + (i % 3 - 1));
     }
 
-    auto analysis = Catch::Benchmark::Detail::analyse(config, env, samples.begin(), samples.end());
+    auto analysis = Catch::Benchmark::Detail::analyse(config, samples.data(), samples.data() + samples.size());
     CHECK( analysis.mean.point.count() == 23 );
     CHECK( analysis.mean.lower_bound.count() < 23 );
     CHECK(analysis.mean.lower_bound.count() > 22);
@@ -321,15 +331,13 @@ TEST_CASE("analyse no analysis", "[benchmark]") {
     data.benchmarkSamples = 99;
     Catch::Config config{ data };
 
-    using Duration = Catch::Benchmark::FloatDuration<Catch::Benchmark::default_clock>;
-
-    Catch::Benchmark::Environment<Duration> env;
-    std::vector<Duration> samples(99);
+    using FDuration = Catch::Benchmark::FDuration;
+    std::vector<FDuration> samples(99);
     for (size_t i = 0; i < samples.size(); ++i) {
-        samples[i] = Duration(23 + (i % 3 - 1));
+        samples[i] = FDuration(23 + (i % 3 - 1));
     }
 
-    auto analysis = Catch::Benchmark::Detail::analyse(config, env, samples.begin(), samples.end());
+    auto analysis = Catch::Benchmark::Detail::analyse(config, samples.data(), samples.data() + samples.size());
     CHECK(analysis.mean.point.count() == 23);
     CHECK(analysis.mean.lower_bound.count() == 23);
     CHECK(analysis.mean.upper_bound.count() == 23);
@@ -442,6 +450,6 @@ TEST_CASE("Failing benchmarks", "[!benchmark][.approvals]") {
 }
 
 TEST_CASE( "Failing benchmark respects should-fail",
-           "[!shouldfail][!benchmark][.approvals]" ) {
+           "[!shouldfail][!benchmark][approvals]" ) {
     BENCHMARK( "Asserting benchmark" ) { REQUIRE( 1 == 2 ); };
 }
diff --git a/external_imported/Catch2/tests/SelfTest/IntrospectiveTests/Json.tests.cpp b/external_imported/Catch2/tests/SelfTest/IntrospectiveTests/Json.tests.cpp
new file mode 100644
index 000000000..8204e3c4b
--- /dev/null
+++ b/external_imported/Catch2/tests/SelfTest/IntrospectiveTests/Json.tests.cpp
@@ -0,0 +1,152 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/internal/catch_jsonwriter.hpp>
+#include <catch2/matchers/catch_matchers_string.hpp>
+
+#include <sstream>
+
+namespace {
+    struct Custom {};
+    static std::ostream& operator<<( std::ostream& os, Custom const& ) {
+        return os << "custom";
+    }
+} // namespace
+
+TEST_CASE( "JsonWriter", "[JSON][JsonWriter]" ) {
+
+    std::stringstream stream;
+    SECTION( "Newly constructed JsonWriter does nothing" ) {
+        Catch::JsonValueWriter writer{ stream };
+        REQUIRE( stream.str() == "" );
+    }
+
+    SECTION( "Calling writeObject will create an empty pair of braces" ) {
+        { auto writer = Catch::JsonValueWriter{ stream }.writeObject(); }
+        REQUIRE( stream.str() == "{\n}" );
+    }
+
+    SECTION( "Calling writeObject with key will create an object to write the "
+             "value" ) {
+        using Catch::Matchers::ContainsSubstring;
+        {
+            auto writer = Catch::JsonValueWriter{ stream }.writeObject();
+            writer.write( "int" ).write( 1 );
+            writer.write( "double" ).write( 1.5 );
+            writer.write( "true" ).write( true );
+            writer.write( "false" ).write( false );
+            writer.write( "string" ).write( "this is a string" );
+            writer.write( "array" ).writeArray().write( 1 ).write( 2 );
+        }
+        REQUIRE_THAT(
+            stream.str(),
+            ContainsSubstring( "\"int\": 1," ) &&
+                ContainsSubstring( "\"double\": 1.5," ) &&
+                ContainsSubstring( "\"true\": true," ) &&
+                ContainsSubstring( "\"false\": false," ) &&
+                ContainsSubstring( "\"string\": \"this is a string\"," ) &&
+                ContainsSubstring( "\"array\": [\n    1,\n    2\n  ]\n}" ) );
+    }
+
+    SECTION( "nesting objects" ) {
+        using Catch::Matchers::ContainsSubstring;
+        {
+            auto writer = Catch::JsonValueWriter{ stream }.writeObject();
+            writer.write( "empty_object" ).writeObject();
+            writer.write( "fully_object" )
+                .writeObject()
+                .write( "key" )
+                .write( 1 );
+        }
+        REQUIRE_THAT( stream.str(),
+                      ContainsSubstring( "\"empty_object\": {\n  }," ) &&
+                          ContainsSubstring(
+                              "\"fully_object\": {\n    \"key\": 1\n  }" ) );
+    }
+
+    SECTION( "Calling writeArray will create an empty pair of braces" ) {
+        { auto writer = Catch::JsonValueWriter{ stream }.writeArray(); }
+        REQUIRE( stream.str() == "[\n]" );
+    }
+
+    SECTION( "Calling writeArray creates array to write the values to" ) {
+        {
+            auto writer = Catch::JsonValueWriter{ stream }.writeArray();
+            writer.write( 1 );
+            writer.write( 1.5 );
+            writer.write( true );
+            writer.write( false );
+            writer.write( "this is a string" );
+            writer.writeObject().write( "object" ).write( 42 );
+            writer.writeArray().write( "array" ).write( 42.5 );
+        }
+        REQUIRE( stream.str() == "[\n  1,\n  1.5,\n  true,\n  false,\n  \"this is a string\",\n  {\n    \"object\": 42\n  },\n  [\n    \"array\",\n    42.5\n  ]\n]" );
+    }
+
+    SECTION(
+        "Moved from JsonObjectWriter shall not insert superfluous brace" ) {
+        {
+            auto writer = Catch::JsonObjectWriter{ stream };
+            auto another_writer = std::move( writer );
+        }
+        REQUIRE( stream.str() == "{\n}" );
+    }
+    SECTION(
+        "Moved from JsonArrayWriter shall not insert superfluous bracket" ) {
+        {
+            auto writer = Catch::JsonArrayWriter{ stream };
+            auto another_writer = std::move( writer );
+        }
+        REQUIRE( stream.str() == "[\n]" );
+    }
+    SECTION( "Custom class shall be quoted" ) {
+        Catch::JsonValueWriter{ stream }.write( Custom{} );
+        REQUIRE( stream.str() == "\"custom\"" );
+    }
+}
+
+TEST_CASE( "JsonWriter escapes charaters in strings properly", "[JsonWriter]" ) {
+    std::stringstream sstream;
+    SECTION( "Quote in a string is escaped" ) {
+        Catch::JsonValueWriter{ sstream }.write( "\"" );
+        REQUIRE( sstream.str() == "\"\\\"\"" );
+    }
+    SECTION("Backslash in a string is escaped") {
+        Catch::JsonValueWriter{ sstream }.write( "\\" );
+        REQUIRE( sstream.str() == "\"\\\\\"" );
+    }
+    SECTION( "Forward slash in a string is **not** escaped" ) {
+        Catch::JsonValueWriter{ sstream }.write( "/" );
+        REQUIRE( sstream.str() == "\"/\"" );
+    }
+    SECTION( "Backspace in a string is escaped" ) {
+        Catch::JsonValueWriter{ sstream }.write( "\b" );
+        REQUIRE( sstream.str() == "\"\\b\"" );
+    }
+    SECTION( "Formfeed in a string is escaped" ) {
+        Catch::JsonValueWriter{ sstream }.write( "\f" );
+        REQUIRE( sstream.str() == "\"\\f\"" );
+    }
+    SECTION( "linefeed in a string is escaped" ) {
+        Catch::JsonValueWriter{ sstream }.write( "\n" );
+        REQUIRE( sstream.str() == "\"\\n\"" );
+    }
+    SECTION( "carriage return in a string is escaped" ) {
+        Catch::JsonValueWriter{ sstream }.write( "\r" );
+        REQUIRE( sstream.str() == "\"\\r\"" );
+    }
+    SECTION( "tab in a string is escaped" ) {
+        Catch::JsonValueWriter{ sstream }.write( "\t" );
+        REQUIRE( sstream.str() == "\"\\t\"" );
+    }
+    SECTION( "combination of characters is escaped" ) {
+        Catch::JsonValueWriter{ sstream }.write( "\\/\t\r\n" );
+        REQUIRE( sstream.str() == "\"\\\\/\\t\\r\\n\"" );
+    }
+}
diff --git a/external_imported/Catch2/tests/SelfTest/IntrospectiveTests/RandomNumberGeneration.tests.cpp b/external_imported/Catch2/tests/SelfTest/IntrospectiveTests/RandomNumberGeneration.tests.cpp
index 8018b7eb0..03be6c9ca 100644
--- a/external_imported/Catch2/tests/SelfTest/IntrospectiveTests/RandomNumberGeneration.tests.cpp
+++ b/external_imported/Catch2/tests/SelfTest/IntrospectiveTests/RandomNumberGeneration.tests.cpp
@@ -7,9 +7,17 @@
 // SPDX-License-Identifier: BSL-1.0
 
 #include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_template_test_macros.hpp>
+#include <catch2/internal/catch_floating_point_helpers.hpp>
+#include <catch2/internal/catch_random_integer_helpers.hpp>
 #include <catch2/internal/catch_random_number_generator.hpp>
 #include <catch2/internal/catch_random_seed_generation.hpp>
+#include <catch2/internal/catch_uniform_floating_point_distribution.hpp>
+#include <catch2/internal/catch_uniform_integer_distribution.hpp>
 #include <catch2/generators/catch_generators.hpp>
+#include <catch2/matchers/catch_matchers_range_equals.hpp>
+
+#include <random>
 
 TEST_CASE("Our PCG implementation provides expected results for known seeds", "[rng]") {
     Catch::SimplePcg32 rng;
@@ -60,3 +68,523 @@ TEST_CASE("Random seed generation accepts known methods", "[rng][seed]") {
 
     REQUIRE_NOTHROW(Catch::generateRandomSeed(method));
 }
+
+TEMPLATE_TEST_CASE("uniform_floating_point_distribution never returns infs from finite range",
+          "[rng][distribution][floating-point][approvals]", float, double) {
+    std::random_device rd{};
+    Catch::SimplePcg32 pcg( rd() );
+    Catch::uniform_floating_point_distribution<TestType> dist(
+        -std::numeric_limits<TestType>::max(),
+        std::numeric_limits<TestType>::max() );
+
+    for (size_t i = 0; i < 10'000; ++i) {
+        auto ret = dist( pcg );
+        REQUIRE_FALSE( std::isinf( ret ) );
+        REQUIRE_FALSE( std::isnan( ret ) );
+    }
+}
+
+TEST_CASE( "fillBitsFrom - shortening and stretching", "[rng][approvals]" ) {
+    using Catch::Detail::fillBitsFrom;
+
+    // The seed is not important, but the numbers below have to be repeatable.
+    // They should also exhibit the same general pattern of being prefixes
+    Catch::SimplePcg32 pcg( 0xaabb'ccdd );
+
+    SECTION( "Shorten to 8 bits" ) {
+        // We cast the result to avoid dealing with char-like type in uint8_t
+        auto shortened = static_cast<uint32_t>( fillBitsFrom<uint8_t>( pcg ) );
+        REQUIRE( shortened == 0xcc );
+    }
+    SECTION( "Shorten to 16 bits" ) {
+        auto shortened = fillBitsFrom<uint16_t>( pcg );
+        REQUIRE( shortened == 0xccbe );
+    }
+    SECTION( "Keep at 32 bits" ) {
+        auto n = fillBitsFrom<uint32_t>( pcg );
+        REQUIRE( n == 0xccbe'5f04 );
+    }
+    SECTION( "Stretch to 64 bits" ) {
+        auto stretched = fillBitsFrom<uint64_t>( pcg );
+        REQUIRE( stretched == 0xccbe'5f04'a424'a486 );
+    }
+}
+
+TEST_CASE("uniform_integer_distribution can return the bounds", "[rng][distribution]") {
+    Catch::uniform_integer_distribution<int32_t> dist( -10, 10 );
+    REQUIRE( dist.a() == -10 );
+    REQUIRE( dist.b() == 10 );
+}
+
+namespace {
+    template <typename T>
+    static void CheckReturnValue(Catch::uniform_integer_distribution<T>& dist,
+                                 Catch::SimplePcg32& rng,
+                                 T target) {
+        REQUIRE( dist.a() == dist.b() );
+        for (int i = 0; i < 1'000; ++i) {
+            REQUIRE( dist( rng ) == target );
+        }
+    }
+}
+
+TEMPLATE_TEST_CASE( "uniform_integer_distribution can handle unit ranges",
+                    "[rng][distribution][approvals]",
+                    unsigned char,
+                    signed char,
+                    char,
+                    uint8_t,
+                    int8_t,
+                    uint16_t,
+                    int16_t,
+                    uint32_t,
+                    int32_t,
+                    uint64_t,
+                    int64_t ) {
+    // We want random seed to sample different parts of the rng state,
+    // the output is predetermined anyway
+    std::random_device rd;
+    auto seed = rd();
+    CAPTURE( seed );
+    Catch::SimplePcg32 pcg( seed );
+
+    // We check unitary ranges of 3 different values, min for type, max for type,
+    // some value inbetween just to make sure
+    SECTION("lowest value") {
+        constexpr auto lowest = std::numeric_limits<TestType>::min();
+        Catch::uniform_integer_distribution<TestType> dist( lowest, lowest );
+        CheckReturnValue( dist, pcg, lowest );
+    }
+    SECTION( "highest value" ) {
+        constexpr auto highest = std::numeric_limits<TestType>::max();
+        Catch::uniform_integer_distribution<TestType> dist( highest, highest );
+        CheckReturnValue( dist, pcg, highest );
+    }
+    SECTION( "some value" ) {
+        constexpr auto some = TestType( 42 );
+        Catch::uniform_integer_distribution<TestType> dist( some, some );
+        CheckReturnValue( dist, pcg, some );
+    }
+}
+
+// Bool needs its own test because it doesn't have a valid "third" value
+TEST_CASE( "uniform_integer_distribution can handle boolean unit ranges",
+           "[rng][distribution][approvals]" ) {
+    // We want random seed to sample different parts of the rng state,
+    // the output is predetermined anyway
+    std::random_device rd;
+    auto seed = rd();
+    CAPTURE( seed );
+    Catch::SimplePcg32 pcg( seed );
+
+    // We check unitary ranges of 3 different values, min for type, max for
+    // type, some value inbetween just to make sure
+    SECTION( "lowest value" ) {
+        Catch::uniform_integer_distribution<bool> dist( false, false );
+        CheckReturnValue( dist, pcg, false );
+    }
+    SECTION( "highest value" ) {
+        Catch::uniform_integer_distribution<bool> dist( true, true );
+        CheckReturnValue( dist, pcg, true );
+    }
+}
+
+TEMPLATE_TEST_CASE( "uniform_integer_distribution can handle full width ranges",
+                    "[rng][distribution][approvals]",
+                    unsigned char,
+                    signed char,
+                    char,
+                    uint8_t,
+                    int8_t,
+                    uint16_t,
+                    int16_t,
+                    uint32_t,
+                    int32_t,
+                    uint64_t,
+                    int64_t ) {
+    // We want random seed to sample different parts of the rng state,
+    // the output is predetermined anyway
+    std::random_device rd;
+    auto seed = rd();
+    CAPTURE( seed );
+    Catch::SimplePcg32 pcg( seed );
+
+    constexpr auto lowest = std::numeric_limits<TestType>::min();
+    constexpr auto highest = std::numeric_limits<TestType>::max();
+    Catch::uniform_integer_distribution<TestType> dist( lowest, highest );
+    STATIC_REQUIRE( std::is_same<TestType, decltype( dist( pcg ) )>::value );
+
+    // We need to do bit operations on the results, so we will have to
+    // cast them to unsigned type.
+    using BitType = std::make_unsigned_t<TestType>;
+    BitType ORs = 0;
+    BitType ANDs = BitType(-1);
+    for (int i = 0; i < 100; ++i) {
+        auto bits = static_cast<BitType>( dist( pcg ) );
+        ORs |= bits;
+        ANDs &= bits;
+    }
+    // Assuming both our RNG and distribution are unbiased, asking for
+    // the full range should essentially give us random bit generator.
+    // Over long run, OR of all the generated values should have all
+    // bits set to 1, while AND should have all bits set to 0.
+    // The chance of this test failing for unbiased pipeline is
+    // 1 / 2**iters, which for 100 iterations is astronomical.
+    REQUIRE( ORs == BitType( -1 ) );
+    REQUIRE( ANDs == 0 );
+}
+
+namespace {
+    template <typename T>
+    struct uniform_integer_test_params;
+
+    template <>
+    struct uniform_integer_test_params<bool> {
+        static constexpr bool lowest = false;
+        static constexpr bool highest = true;
+        //  This seems weird, but it is an artifact of the specific seed
+        static constexpr bool expected[] = { true,
+                                             true,
+                                             true,
+                                             true,
+                                             true,
+                                             true,
+                                             false,
+                                             true,
+                                             true,
+                                             true,
+                                             true,
+                                             true,
+                                             false,
+                                             true,
+                                             true };
+    };
+
+    template <>
+    struct uniform_integer_test_params<char> {
+        static constexpr char lowest = 32;
+        static constexpr char highest = 126;
+        static constexpr char expected[] = { 'k',
+                                             '\\',
+                                             'Z',
+                                             'X',
+                                             '`',
+                                             'Q',
+                                             ';',
+                                             'o',
+                                             ']',
+                                             'T',
+                                             'v',
+                                             'p',
+                                             ':',
+                                             'S',
+                                             't' };
+    };
+
+    template <>
+    struct uniform_integer_test_params<uint8_t> {
+        static constexpr uint8_t lowest = 3;
+        static constexpr uint8_t highest = 123;
+        static constexpr uint8_t expected[] = { 'c',
+                                                'P',
+                                                'M',
+                                                'J',
+                                                'U',
+                                                'A',
+                                                '%',
+                                                'h',
+                                                'Q',
+                                                'F',
+                                                'q',
+                                                'i',
+                                                '$',
+                                                'E',
+                                                'o' };
+    };
+
+    template <>
+    struct uniform_integer_test_params<int8_t> {
+        static constexpr int8_t lowest = -27;
+        static constexpr int8_t highest = 73;
+        static constexpr int8_t expected[] = { '5',
+                                               '%',
+                                               '#',
+                                               ' ',
+                                               '*',
+                                               25,
+                                               2,
+                                               '9',
+                                               '&',
+                                               29,
+                                               'A',
+                                               ':',
+                                               1,
+                                               28,
+                                               '?' };
+    };
+
+    template <>
+    struct uniform_integer_test_params<uint16_t> {
+        static constexpr uint16_t lowest = 123;
+        static constexpr uint16_t highest = 33333;
+        static constexpr uint16_t expected[] = { 26684,
+                                                 21417,
+                                                 20658,
+                                                 19791,
+                                                 22896,
+                                                 17433,
+                                                 9806,
+                                                 27948,
+                                                 21767,
+                                                 18588,
+                                                 30556,
+                                                 28244,
+                                                 9439,
+                                                 18293,
+                                                 29949 };
+    };
+
+    template <>
+    struct uniform_integer_test_params<int16_t> {
+        static constexpr int16_t lowest = -17222;
+        static constexpr int16_t highest = 17222;
+        static constexpr int16_t expected[] = { 10326,
+                                                 4863,
+                                                 4076,
+                                                 3177,
+                                                 6397,
+                                                 731,
+                                                 -7179,
+                                                 11637,
+                                                 5226,
+                                                 1929,
+                                                 14342,
+                                                 11944,
+                                                 -7560,
+                                                 1623,
+                                                 13712 };
+    };
+
+    template <>
+    struct uniform_integer_test_params<uint32_t> {
+        static constexpr uint32_t lowest = 17222;
+        static constexpr uint32_t highest = 234234;
+        static constexpr uint32_t expected[] = { 190784,
+                                                 156367,
+                                                 151409,
+                                                 145743,
+                                                 166032,
+                                                 130337,
+                                                 80501,
+                                                 199046,
+                                                 158654,
+                                                 137883,
+                                                 216091,
+                                                 200981,
+                                                 78099,
+                                                 135954,
+                                                 212120 };
+    };
+
+    template <>
+    struct uniform_integer_test_params<int32_t> {
+        static constexpr int32_t lowest = -237272;
+        static constexpr int32_t highest = 234234;
+        static constexpr int32_t expected[] = { 139829,
+                                                65050,
+                                                54278,
+                                                41969,
+                                                86051,
+                                                8494,
+                                                -99785,
+                                                157781,
+                                                70021,
+                                                24890,
+                                                194815,
+                                                161985,
+                                                -105004,
+                                                20699,
+                                                186186 };
+    };
+
+    template <>
+    struct uniform_integer_test_params<uint64_t> {
+        static constexpr uint64_t lowest = 1234;
+        static constexpr uint64_t highest = 1234567890;
+        static constexpr uint64_t expected[] = { 987382749,
+                                                 763380386,
+                                                 846572137,
+                                                 359990258,
+                                                 804599765,
+                                                 1131353566,
+                                                 346324913,
+                                                 1108760730,
+                                                 1141693933,
+                                                 856999148,
+                                                 879390623,
+                                                 1149485521,
+                                                 900556586,
+                                                 952385958,
+                                                 807916408 };
+    };
+
+    template <>
+    struct uniform_integer_test_params<int64_t> {
+        static constexpr int64_t lowest = -1234567890;
+        static constexpr int64_t highest = 1234567890;
+        static constexpr int64_t expected[] = { 740197113,
+                                                292191940,
+                                                458575608,
+                                                -514589122,
+                                                374630781,
+                                                1028139036,
+                                                -541919840,
+                                                982953318,
+                                                1048819790,
+                                                479429651,
+                                                524212647,
+                                                1064402981,
+                                                566544615,
+                                                670203462,
+                                                381264073 };
+    };
+
+    // We need these definitions for C++14 and earlier, but
+    // GCC will complain about them in newer C++ standards
+#if __cplusplus <= 201402L
+    constexpr bool uniform_integer_test_params<bool>::expected[];
+    constexpr char uniform_integer_test_params<char>::expected[];
+    constexpr uint8_t uniform_integer_test_params<uint8_t>::expected[];
+    constexpr int8_t uniform_integer_test_params<int8_t>::expected[];
+    constexpr uint16_t uniform_integer_test_params<uint16_t>::expected[];
+    constexpr int16_t uniform_integer_test_params<int16_t>::expected[];
+    constexpr uint32_t uniform_integer_test_params<uint32_t>::expected[];
+    constexpr int32_t uniform_integer_test_params<int32_t>::expected[];
+    constexpr uint64_t uniform_integer_test_params<uint64_t>::expected[];
+    constexpr int64_t uniform_integer_test_params<int64_t>::expected[];
+#endif
+
+}
+
+TEMPLATE_TEST_CASE( "uniform_integer_distribution is reproducible",
+                    "[rng][distribution][approvals]",
+                   bool,
+                   char,
+                   uint8_t,
+                   int8_t,
+                   uint16_t,
+                   int16_t,
+                   uint32_t,
+                   int32_t,
+                   uint64_t,
+                   int64_t) {
+    Catch::SimplePcg32 pcg( 0xaabb'ccdd );
+
+    constexpr auto lowest = uniform_integer_test_params<TestType>::lowest;
+    constexpr auto highest = uniform_integer_test_params<TestType>::highest;
+    Catch::uniform_integer_distribution<TestType> dist(lowest, highest);
+
+    constexpr auto iters = 15;
+    std::array<TestType, iters> generated;
+    for (int i = 0; i < iters; ++i) {
+        generated[i] = dist( pcg );
+    }
+
+    REQUIRE_THAT(generated, Catch::Matchers::RangeEquals(uniform_integer_test_params<TestType>::expected));
+}
+
+
+namespace {
+    template <typename T>
+    struct uniform_fp_test_params;
+
+    template<>
+    struct uniform_fp_test_params<float> {
+        // These are exactly representable
+        static constexpr float lowest = -256.125f;
+        static constexpr float highest = 385.125f;
+        // These are just round-trip formatted
+        static constexpr float expected[] = { 92.56961f,
+                                              -23.170044f,
+                                              310.81833f,
+                                              -53.023132f,
+                                              105.03287f,
+                                              198.77591f,
+                                              -172.72931f,
+                                              51.805176f,
+                                              -241.10156f,
+                                              64.66101f,
+                                              212.12509f,
+                                              -49.24292f,
+                                              -177.1399f,
+                                              245.23679f,
+                                              173.22421f };
+    };
+    template <>
+    struct uniform_fp_test_params<double> {
+        // These are exactly representable
+        static constexpr double lowest = -234582.9921875;
+        static constexpr double highest = 261238.015625;
+        // These are just round-trip formatted
+        static constexpr double expected[] = { 35031.207052832615,
+                                               203783.3401838024,
+                                               44667.940405848756,
+                                               -170100.5877224467,
+                                               -222966.7418051684,
+                                               127472.72630072923,
+                                               -173510.88209096913,
+                                               97394.16172239158,
+                                               119123.6921592663,
+                                               22595.741022785165,
+                                               8988.68409120926,
+                                               136906.86520606978,
+                                               33369.19104222473,
+                                               60912.7615841752,
+                                               -149060.05936760217 };
+    };
+
+// We need these definitions for C++14 and earlier, but
+// GCC will complain about them in newer C++ standards
+#if __cplusplus <= 201402L
+    constexpr float uniform_fp_test_params<float>::expected[];
+    constexpr double uniform_fp_test_params<double>::expected[];
+#endif
+} // namespace
+
+TEMPLATE_TEST_CASE( "uniform_floating_point_distribution is reproducible",
+                    "[rng][distribution][floating-point][approvals]",
+                    float,
+                    double ) {
+    Catch::SimplePcg32 pcg( 0xaabb'aabb );
+
+    const auto lowest = uniform_fp_test_params<TestType>::lowest;
+    const auto highest = uniform_fp_test_params<TestType>::highest;
+    Catch::uniform_floating_point_distribution<TestType> dist( lowest, highest );
+
+    constexpr auto iters = 15;
+    std::array<TestType, iters> generated;
+    for ( int i = 0; i < iters; ++i ) {
+        generated[i] = dist( pcg );
+    }
+
+    REQUIRE_THAT( generated, Catch::Matchers::RangeEquals( uniform_fp_test_params<TestType>::expected ) );
+}
+
+TEMPLATE_TEST_CASE( "uniform_floating_point_distribution can handle unitary ranges",
+                    "[rng][distribution][floating-point][approvals]",
+                    float,
+                    double ) {
+    std::random_device rd;
+    auto seed = rd();
+    CAPTURE( seed );
+    Catch::SimplePcg32 pcg( seed );
+
+    const auto highest = uniform_fp_test_params<TestType>::highest;
+    Catch::uniform_floating_point_distribution<TestType> dist( highest,
+                                                               highest );
+
+    constexpr auto iters = 20;
+    for (int i = 0; i < iters; ++i) {
+        REQUIRE( Catch::Detail::directCompare( dist( pcg ), highest ) );
+    }
+}
diff --git a/external_imported/Catch2/tests/SelfTest/IntrospectiveTests/Reporters.tests.cpp b/external_imported/Catch2/tests/SelfTest/IntrospectiveTests/Reporters.tests.cpp
index 54c26a7a2..e5a65bda5 100644
--- a/external_imported/Catch2/tests/SelfTest/IntrospectiveTests/Reporters.tests.cpp
+++ b/external_imported/Catch2/tests/SelfTest/IntrospectiveTests/Reporters.tests.cpp
@@ -12,7 +12,6 @@
 #include <catch2/catch_config.hpp>
 #include <catch2/interfaces/catch_interfaces_reporter.hpp>
 #include <catch2/interfaces/catch_interfaces_reporter_factory.hpp>
-#include <catch2/interfaces/catch_interfaces_reporter_registry.hpp>
 #include <catch2/internal/catch_console_colour.hpp>
 #include <catch2/internal/catch_enforce.hpp>
 #include <catch2/internal/catch_list.hpp>
@@ -110,7 +109,9 @@ TEST_CASE( "Reporter's write listings to provided stream", "[reporters]" ) {
         auto sstream = Catch::Detail::make_unique<StringIStream>();
         auto& sstreamRef = *sstream.get();
 
-        Catch::Config config( Catch::ConfigData{} );
+        Catch::ConfigData cfg_data;
+        cfg_data.rngSeed = 1234;
+        Catch::Config config( cfg_data );
         auto reporter = factory.second->create( Catch::ReporterConfig{
             &config, CATCH_MOVE( sstream ), Catch::ColourMode::None, {} } );
 
@@ -164,7 +165,7 @@ namespace {
                       std::vector<std::string>& recorder,
                       Catch::IConfig const* config ):
             EventListenerBase( config ),
-            m_witness( witness ),
+            m_witness( CATCH_MOVE(witness) ),
             m_recorder( recorder )
         {}
 
@@ -182,7 +183,7 @@ namespace {
                       std::vector<std::string>& recorder,
                       Catch::ReporterConfig&& config ):
             StreamingReporterBase( CATCH_MOVE(config) ),
-            m_witness( witness ),
+            m_witness( CATCH_MOVE(witness) ),
             m_recorder( recorder )
         {}
 
diff --git a/external_imported/Catch2/tests/SelfTest/IntrospectiveTests/String.tests.cpp b/external_imported/Catch2/tests/SelfTest/IntrospectiveTests/String.tests.cpp
index 7a0b3b4ab..43c58b49b 100644
--- a/external_imported/Catch2/tests/SelfTest/IntrospectiveTests/String.tests.cpp
+++ b/external_imported/Catch2/tests/SelfTest/IntrospectiveTests/String.tests.cpp
@@ -177,7 +177,7 @@ TEST_CASE("StringRef at compilation time", "[Strings][StringRef][constexpr]") {
         STATIC_REQUIRE_FALSE(sr1.empty());
         STATIC_REQUIRE(sr1.size() == 3);
 
-        using Catch::operator"" _sr;
+        using Catch::operator""_sr;
         constexpr auto sr2 = ""_sr;
         STATIC_REQUIRE(sr2.empty());
         STATIC_REQUIRE(sr2.size() == 0);
diff --git a/external_imported/Catch2/tests/SelfTest/IntrospectiveTests/Tag.tests.cpp b/external_imported/Catch2/tests/SelfTest/IntrospectiveTests/Tag.tests.cpp
index ef321b274..43723758d 100644
--- a/external_imported/Catch2/tests/SelfTest/IntrospectiveTests/Tag.tests.cpp
+++ b/external_imported/Catch2/tests/SelfTest/IntrospectiveTests/Tag.tests.cpp
@@ -98,7 +98,20 @@ TEST_CASE( "Test case with identical tags keeps just one", "[tags]" ) {
     REQUIRE( testCase.tags[0] == Tag( "tag1" ) );
 }
 
-TEST_CASE( "Empty tag is not allowed" ) {
-    REQUIRE_THROWS( Catch::TestCaseInfo(
-        "", { "fake test name", "[]" }, dummySourceLineInfo ) );
+TEST_CASE("Mismatched square brackets in tags are caught and reported",
+          "[tags][approvals]") {
+    using Catch::TestCaseInfo;
+    using Catch::Matchers::ContainsSubstring;
+            REQUIRE_THROWS_WITH( TestCaseInfo( "",
+                                       { "test with unclosed tag", "[abc" },
+                                       dummySourceLineInfo ),
+                         ContainsSubstring("registering test case 'test with unclosed tag'") );
+    REQUIRE_THROWS_WITH( TestCaseInfo( "",
+                      { "test with nested tags", "[abc[def]]" },
+                      dummySourceLineInfo ),
+        ContainsSubstring("registering test case 'test with nested tags'") );
+    REQUIRE_THROWS_WITH( TestCaseInfo( "",
+                      { "test with superfluous close tags", "[abc][def]]" },
+                      dummySourceLineInfo ),
+        ContainsSubstring("registering test case 'test with superfluous close tags'") );
 }
diff --git a/external_imported/Catch2/tests/SelfTest/UsageTests/Exception.tests.cpp b/external_imported/Catch2/tests/SelfTest/UsageTests/Exception.tests.cpp
index f917932f1..4f91a30c4 100644
--- a/external_imported/Catch2/tests/SelfTest/UsageTests/Exception.tests.cpp
+++ b/external_imported/Catch2/tests/SelfTest/UsageTests/Exception.tests.cpp
@@ -20,7 +20,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wweak-vtables"
 #pragma clang diagnostic ignored "-Wmissing-noreturn"
-#pragma clang diagnostic ignored "-Wunreachable-code"
+#pragma clang diagnostic ignored "-Wunreachable-code-return"
 #endif
 
 namespace {
diff --git a/external_imported/Catch2/tests/SelfTest/UsageTests/Generators.tests.cpp b/external_imported/Catch2/tests/SelfTest/UsageTests/Generators.tests.cpp
index 274c63b8f..f04cf4f09 100644
--- a/external_imported/Catch2/tests/SelfTest/UsageTests/Generators.tests.cpp
+++ b/external_imported/Catch2/tests/SelfTest/UsageTests/Generators.tests.cpp
@@ -261,6 +261,10 @@ TEST_CASE("Copy and then generate a range", "[generators]") {
     }
 }
 
+#if defined( __clang__ )
+#    pragma clang diagnostic pop
+#endif
+
 TEST_CASE("#1913 - GENERATE inside a for loop should not keep recreating the generator", "[regression][generators]") {
     static int counter = 0;
     for (int i = 0; i < 3; ++i) {
@@ -301,13 +305,19 @@ namespace {
 
 } // namespace
 
-TEST_CASE( "#2615 - Throwing in constructor generator fails test case but does not abort", "[!shouldfail]" ) {
+TEST_CASE( "#2615 - Throwing in constructor generator fails test case but does not abort",
+           "[!shouldfail][regression][generators]" ) {
     // this should fail the test case, but not abort the application
     auto sample = GENERATE( make_test_generator() );
     // this assertion shouldn't trigger
-    REQUIRE( sample == 0U );
+    REQUIRE( sample == 0 );
 }
 
-#if defined( __clang__ )
-#    pragma clang diagnostic pop
-#endif
+TEST_CASE( "GENERATE can combine literals and generators", "[generators]" ) {
+    auto i = GENERATE( 2,
+                       4,
+                       take( 2,
+                             filter( []( int val ) { return val % 2 == 0; },
+                                     random( -100, 100 ) ) ) );
+    REQUIRE( i % 2 == 0 );
+}
diff --git a/external_imported/Catch2/tests/SelfTest/UsageTests/Matchers.tests.cpp b/external_imported/Catch2/tests/SelfTest/UsageTests/Matchers.tests.cpp
index 49e25232f..74bedf5ea 100644
--- a/external_imported/Catch2/tests/SelfTest/UsageTests/Matchers.tests.cpp
+++ b/external_imported/Catch2/tests/SelfTest/UsageTests/Matchers.tests.cpp
@@ -406,6 +406,25 @@ TEST_CASE( "Vector matchers that fail", "[matchers][vector][.][failing]" ) {
     }
 }
 
+namespace {
+    struct SomeType {
+        int i;
+        friend bool operator==( SomeType lhs, SomeType rhs ) {
+            return lhs.i == rhs.i;
+        }
+    };
+} // end anonymous namespace
+
+TEST_CASE( "Vector matcher with elements without !=", "[matchers][vector][approvals]" ) {
+    std::vector<SomeType> lhs, rhs;
+    lhs.push_back( { 1 } );
+    lhs.push_back( { 2 } );
+    rhs.push_back( { 1 } );
+    rhs.push_back( { 1 } );
+
+    REQUIRE_THAT( lhs, !Equals(rhs) );
+}
+
 TEST_CASE( "Exception matchers that succeed",
            "[matchers][exceptions][!throws]" ) {
     CHECK_THROWS_MATCHES(
@@ -871,7 +890,7 @@ struct MatcherA : Catch::Matchers::MatcherGenericBase {
         return "equals: (int) 1 or (string) \"1\"";
     }
     bool match( int i ) const { return i == 1; }
-    bool match( std::string s ) const { return s == "1"; }
+    bool match( std::string const& s ) const { return s == "1"; }
 };
 
 struct MatcherB : Catch::Matchers::MatcherGenericBase {
diff --git a/external_imported/Catch2/tests/SelfTest/UsageTests/MatchersRanges.tests.cpp b/external_imported/Catch2/tests/SelfTest/UsageTests/MatchersRanges.tests.cpp
index 05e11b0c3..cc8c54f8b 100644
--- a/external_imported/Catch2/tests/SelfTest/UsageTests/MatchersRanges.tests.cpp
+++ b/external_imported/Catch2/tests/SelfTest/UsageTests/MatchersRanges.tests.cpp
@@ -381,7 +381,7 @@ TEST_CASE("Usage of AllTrue range matcher", "[matchers][templated][quantifiers]"
             std::array<bool, 0> const data{};
             REQUIRE_THAT( data, AllTrue() );
         }
-        SECTION( "One false evalutes to false" ) {
+        SECTION( "One false evaluates to false" ) {
             std::array<bool, 5> const data{ { true, true, false, true, true } };
             REQUIRE_THAT( data, !AllTrue() );
         }
@@ -398,7 +398,7 @@ TEST_CASE("Usage of AllTrue range matcher", "[matchers][templated][quantifiers]"
                 { { true }, { true }, { true }, { true }, { true } } };
             REQUIRE_THAT( data, AllTrue() );
         }
-        SECTION( "One false evalutes to false" ) {
+        SECTION( "One false evaluates to false" ) {
             std::array<ConvertibleToBool, 5> const data{
                 { { true }, { true }, { false }, { true }, { true } } };
             REQUIRE_THAT( data, !AllTrue() );
@@ -446,7 +446,7 @@ TEST_CASE( "Usage of NoneTrue range matcher", "[matchers][templated][quantifiers
             std::array<bool, 0> const data{};
             REQUIRE_THAT( data, NoneTrue() );
         }
-        SECTION( "One true evalutes to false" ) {
+        SECTION( "One true evaluates to false" ) {
             std::array<bool, 5> const data{
                 { false, false, true, false, false } };
             REQUIRE_THAT( data, !NoneTrue() );
@@ -464,7 +464,7 @@ TEST_CASE( "Usage of NoneTrue range matcher", "[matchers][templated][quantifiers
                 { { true }, { true }, { true }, { true }, { true } } };
             REQUIRE_THAT( data, !NoneTrue() );
         }
-        SECTION( "One true evalutes to false" ) {
+        SECTION( "One true evaluates to false" ) {
             std::array<ConvertibleToBool, 5> const data{
                 { { false }, { false }, { true }, { false }, { false } } };
             REQUIRE_THAT( data, !NoneTrue() );
@@ -512,7 +512,7 @@ TEST_CASE( "Usage of AnyTrue range matcher", "[matchers][templated][quantifiers]
             std::array<bool, 0> const data{};
             REQUIRE_THAT( data, !AnyTrue() );
         }
-        SECTION( "One true evalutes to true" ) {
+        SECTION( "One true evaluates to true" ) {
             std::array<bool, 5> const data{
                 { false, false, true, false, false } };
             REQUIRE_THAT( data, AnyTrue() );
@@ -530,7 +530,7 @@ TEST_CASE( "Usage of AnyTrue range matcher", "[matchers][templated][quantifiers]
                 { { true }, { true }, { true }, { true }, { true } } };
             REQUIRE_THAT( data, AnyTrue() );
         }
-        SECTION( "One true evalutes to true" ) {
+        SECTION( "One true evaluates to true" ) {
             std::array<ConvertibleToBool, 5> const data{
                 { { false }, { false }, { true }, { false }, { false } } };
             REQUIRE_THAT( data, AnyTrue() );
diff --git a/external_imported/Catch2/tests/SelfTest/UsageTests/Message.tests.cpp b/external_imported/Catch2/tests/SelfTest/UsageTests/Message.tests.cpp
index a5e695825..6367bf591 100644
--- a/external_imported/Catch2/tests/SelfTest/UsageTests/Message.tests.cpp
+++ b/external_imported/Catch2/tests/SelfTest/UsageTests/Message.tests.cpp
@@ -255,10 +255,24 @@ std::ostream& operator<<(std::ostream& out, helper_1436<T1, T2> const& helper) {
 #pragma clang diagnostic ignored "-Wunused-value"
 #endif
 
+namespace {
+    template <typename T>
+    struct custom_index_op {
+        constexpr custom_index_op( std::initializer_list<T> ) {}
+        constexpr T operator[]( size_t ) { return T{}; }
+#if defined( __cpp_multidimensional_subscript ) && \
+    __cpp_multidimensional_subscript >= 202110L
+        constexpr T operator[]( size_t, size_t, size_t ) const noexcept {
+            return T{};
+        }
+#endif
+    };
+}
+
 TEST_CASE("CAPTURE can deal with complex expressions involving commas", "[messages][capture]") {
-    CAPTURE(std::vector<int>{1, 2, 3}[0, 1, 2],
-            std::vector<int>{1, 2, 3}[(0, 1)],
-            std::vector<int>{1, 2, 3}[0]);
+    CAPTURE(custom_index_op<int>{1, 2, 3}[0, 1, 2],
+            custom_index_op<int>{1, 2, 3}[(0, 1)],
+            custom_index_op<int>{1, 2, 3}[0]);
     CAPTURE((helper_1436<int, int>{12, -12}),
             (helper_1436<int, int>(-12, 12)));
     CAPTURE( (1, 2), (2, 3) );
@@ -285,3 +299,14 @@ TEST_CASE("CAPTURE parses string and character constants", "[messages][capture]"
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
+
+TEST_CASE( "INFO and UNSCOPED_INFO can stream multiple arguments",
+           "[messages][info][.failing]" ) {
+    INFO( "This info"
+          << " has multiple"
+          << " parts." );
+    UNSCOPED_INFO( "This unscoped info"
+                   << " has multiple"
+                   << " parts." );
+    FAIL( "Show infos!" );
+}
diff --git a/external_imported/Catch2/tests/SelfTest/UsageTests/Misc.tests.cpp b/external_imported/Catch2/tests/SelfTest/UsageTests/Misc.tests.cpp
index 6c1fd68f4..7f06704b4 100644
--- a/external_imported/Catch2/tests/SelfTest/UsageTests/Misc.tests.cpp
+++ b/external_imported/Catch2/tests/SelfTest/UsageTests/Misc.tests.cpp
@@ -217,6 +217,18 @@ TEST_CASE("Testing checked-if 3", "[checked-if][!shouldfail]") {
     SUCCEED();
 }
 
+[[noreturn]]
+TEST_CASE("Testing checked-if 4", "[checked-if][!shouldfail]") {
+    CHECKED_ELSE(true) {}
+    throw std::runtime_error("Uncaught exception should fail!");
+}
+
+[[noreturn]]
+TEST_CASE("Testing checked-if 5", "[checked-if][!shouldfail]") {
+    CHECKED_ELSE(false) {}
+    throw std::runtime_error("Uncaught exception should fail!");
+}
+
 TEST_CASE( "xmlentitycheck" ) {
     SECTION( "embedded xml: <test>it should be possible to embed xml characters, such as <, \" or &, or even whole <xml>documents</xml> within an attribute</test>" ) {
         SUCCEED(); // We need this here to stop it failing due to no tests
diff --git a/external_imported/Catch2/tests/SelfTest/UsageTests/Skip.tests.cpp b/external_imported/Catch2/tests/SelfTest/UsageTests/Skip.tests.cpp
index 6bd4189b4..661795e11 100644
--- a/external_imported/Catch2/tests/SelfTest/UsageTests/Skip.tests.cpp
+++ b/external_imported/Catch2/tests/SelfTest/UsageTests/Skip.tests.cpp
@@ -71,3 +71,30 @@ TEST_CASE( "failing for some generator values causes entire test case to fail",
         FAIL();
     }
 }
+
+namespace {
+    class test_skip_generator : public Catch::Generators::IGenerator<int> {
+    public:
+        explicit test_skip_generator() { SKIP( "This generator is empty" ); }
+
+        auto get() const -> int const& override {
+            static constexpr int value = 1;
+            return value;
+        }
+
+        auto next() -> bool override { return false; }
+    };
+
+    static auto make_test_skip_generator()
+        -> Catch::Generators::GeneratorWrapper<int> {
+        return { new test_skip_generator() };
+    }
+
+} // namespace
+
+TEST_CASE( "Empty generators can SKIP in constructor", "[skipping]" ) {
+    // The generator signals emptiness with `SKIP`
+    auto sample = GENERATE( make_test_skip_generator() );
+    // This assertion would fail, but shouldn't trigger
+    REQUIRE( sample == 0 );
+}
diff --git a/external_imported/Catch2/tests/SelfTest/UsageTests/ToStringOptional.tests.cpp b/external_imported/Catch2/tests/SelfTest/UsageTests/ToStringOptional.tests.cpp
index 9fd9d6b45..3671771a7 100644
--- a/external_imported/Catch2/tests/SelfTest/UsageTests/ToStringOptional.tests.cpp
+++ b/external_imported/Catch2/tests/SelfTest/UsageTests/ToStringOptional.tests.cpp
@@ -28,4 +28,8 @@ TEST_CASE( "std::vector<std::optional<int> > -> toString", "[toString][optional]
     REQUIRE( "{ 0, { }, 2 }" == ::Catch::Detail::stringify( type{ 0, {}, 2 } ) );
 }
 
+TEST_CASE( "std::nullopt -> toString", "[toString][optional][approvals]" ) {
+    REQUIRE( "{ }" == ::Catch::Detail::stringify( std::nullopt ) );
+}
+
 #endif // CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL
diff --git a/external_imported/Catch2/tests/TestScripts/DiscoverTests/CMakeLists.txt b/external_imported/Catch2/tests/TestScripts/DiscoverTests/CMakeLists.txt
new file mode 100644
index 000000000..d19f2f889
--- /dev/null
+++ b/external_imported/Catch2/tests/TestScripts/DiscoverTests/CMakeLists.txt
@@ -0,0 +1,16 @@
+cmake_minimum_required(VERSION 3.10)
+
+project(discover-tests-test
+  LANGUAGES CXX
+)
+
+add_executable(tests
+  register-tests.cpp
+)
+
+add_subdirectory(${CATCH2_PATH} catch2-build)
+target_link_libraries(tests PRIVATE Catch2::Catch2WithMain)
+
+include(CTest)
+include(Catch)
+catch_discover_tests(tests)
diff --git a/external_imported/Catch2/tests/TestScripts/DiscoverTests/VerifyRegistration.py b/external_imported/Catch2/tests/TestScripts/DiscoverTests/VerifyRegistration.py
new file mode 100644
index 000000000..9ec42f24c
--- /dev/null
+++ b/external_imported/Catch2/tests/TestScripts/DiscoverTests/VerifyRegistration.py
@@ -0,0 +1,123 @@
+#!/usr/bin/env python3
+
+#              Copyright Catch2 Authors
+# Distributed under the Boost Software License, Version 1.0.
+#   (See accompanying file LICENSE.txt or copy at
+#        https://www.boost.org/LICENSE_1_0.txt)
+
+# SPDX-License-Identifier: BSL-1.0
+
+import os
+import subprocess
+import sys
+
+
+def build_project(sources_dir, output_base_path, catch2_path):
+    build_dir = os.path.join(output_base_path, 'ctest-registration-test')
+    config_cmd = ['cmake',
+                  '-B', build_dir,
+                  '-S', sources_dir,
+                  f'-DCATCH2_PATH={catch2_path}',
+                  '-DCMAKE_BUILD_TYPE=Debug']
+
+    build_cmd = ['cmake',
+                 '--build', build_dir,
+                 '--config', 'Debug']
+
+    try:
+        subprocess.run(config_cmd,
+                       capture_output = True,
+                       check = True,
+                       text = True)
+        subprocess.run(build_cmd,
+                       capture_output = True,
+                       check = True,
+                       text = True)
+    except subprocess.CalledProcessError as err:
+        print('Error when building the test project')
+        print(f'cmd: {err.cmd}')
+        print(f'stderr: {err.stderr}')
+        print(f'stdout: {err.stdout}')
+        exit(3)
+
+    return build_dir
+
+
+
+def get_test_names(build_path):
+    # For now we assume that Windows builds are done using MSBuild under
+    # Debug configuration. This means that we need to add "Debug" folder
+    # to the path when constructing it. On Linux, we don't add anything.
+    config_path = "Debug" if os.name == 'nt' else ""
+    full_path = os.path.join(build_path, config_path, 'tests')
+
+
+    cmd = [full_path, '--reporter', 'xml', '--list-tests']
+    result = subprocess.run(cmd,
+                            capture_output = True,
+                            check = True,
+                            text = True)
+
+    import xml.etree.ElementTree as ET
+    root = ET.fromstring(result.stdout)
+    return [tc.text for tc in root.findall('TestCase/Name')]
+
+
+def list_ctest_tests(build_path):
+    old_path = os.getcwd()
+    os.chdir(build_path)
+
+    cmd = ['ctest', '-C', 'debug', '--show-only=json-v1']
+    result = subprocess.run(cmd,
+                            capture_output = True,
+                            check = True,
+                            text = True)
+    os.chdir(old_path)
+
+    import json
+
+    ctest_response = json.loads(result.stdout)
+    tests = ctest_response['tests']
+    test_names = []
+    for test in tests:
+        test_command = test['command']
+        # First part of the command is the binary, second is the filter.
+        # If there are less, registration has failed. If there are more,
+        # registration has changed and the script needs updating.
+        assert len(test_command) == 2
+        test_names.append(test_command[1])
+        test_name = test_command[1]
+
+    return test_names
+
+def escape_catch2_test_name(name):
+    for char in ('\\', ',', '[', ']'):
+        name = name.replace(char, f"\\{char}")
+    return name
+
+if __name__ == '__main__':
+    if len(sys.argv) != 3:
+        print(f'Usage: {sys.argv[0]} path-to-catch2-cml output-path')
+        exit(2)
+    catch2_path = sys.argv[1]
+    output_base_path = sys.argv[2]
+    sources_dir = os.path.dirname(os.path.abspath(sys.argv[0]))
+
+    build_path = build_project(sources_dir, output_base_path, catch2_path)
+
+    catch_test_names = [escape_catch2_test_name(name) for name in get_test_names(build_path)]
+    ctest_test_names = list_ctest_tests(build_path)
+
+    mismatched = 0
+    for catch_test in catch_test_names:
+        if catch_test not in ctest_test_names:
+            print(f"Catch2 test '{catch_test}' not found in CTest")
+            mismatched += 1
+    for ctest_test in ctest_test_names:
+        if ctest_test not in catch_test_names:
+            print(f"CTest test '{ctest_test}' not found in Catch2")
+            mismatched += 1
+
+    if mismatched:
+        print(f"Found {mismatched} mismatched tests catch test names and ctest test commands!")
+        exit(1)
diff --git a/external_imported/Catch2/tests/TestScripts/DiscoverTests/register-tests.cpp b/external_imported/Catch2/tests/TestScripts/DiscoverTests/register-tests.cpp
new file mode 100644
index 000000000..aa603df1a
--- /dev/null
+++ b/external_imported/Catch2/tests/TestScripts/DiscoverTests/register-tests.cpp
@@ -0,0 +1,16 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+
+#include <catch2/catch_test_macros.hpp>
+
+TEST_CASE("@Script[C:\\EPM1A]=x;\"SCALA_ZERO:\"", "[script regressions]"){}
+TEST_CASE("Some test") {}
+TEST_CASE( "Let's have a test case with a long name. Longer. No, even longer. "
+           "Really looooooooooooong. Even longer than that. Multiple lines "
+           "worth of test name. Yep, like this." ) {}
+TEST_CASE( "And now a test case with weird tags.", "[tl;dr][tl;dw][foo,bar]" ) {}
diff --git a/external_imported/Catch2/tests/meson.build b/external_imported/Catch2/tests/meson.build
index f525f0412..58302b7aa 100644
--- a/external_imported/Catch2/tests/meson.build
+++ b/external_imported/Catch2/tests/meson.build
@@ -17,6 +17,7 @@ self_test_sources = files(
   'SelfTest/IntrospectiveTests/Details.tests.cpp',
   'SelfTest/IntrospectiveTests/FloatingPoint.tests.cpp',
   'SelfTest/IntrospectiveTests/GeneratorsImpl.tests.cpp',
+  'SelfTest/IntrospectiveTests/Integer.tests.cpp',
   'SelfTest/IntrospectiveTests/InternalBenchmark.tests.cpp',
   'SelfTest/IntrospectiveTests/Parse.tests.cpp',
   'SelfTest/IntrospectiveTests/PartTracker.tests.cpp',
diff --git a/external_imported/Catch2/tools/scripts/checkLicense.py b/external_imported/Catch2/tools/scripts/checkLicense.py
index 9a9497692..7078d3ec2 100755
--- a/external_imported/Catch2/tools/scripts/checkLicense.py
+++ b/external_imported/Catch2/tools/scripts/checkLicense.py
@@ -33,7 +33,8 @@ def check_licences_in_path(path: str) -> int:
 
 def check_licences():
     failed = 0
-    roots = ['src/catch2', 'tests']
+    # Add 'extras' after the amalgamted files are regenerated with the new script (past 3.4.0)
+    roots = ['src/catch2', 'tests', 'examples', 'fuzzing']
     for root in roots:
         failed += check_licences_in_path(root)
     
diff --git a/external_imported/Catch2/tools/scripts/generateAmalgamatedFiles.py b/external_imported/Catch2/tools/scripts/generateAmalgamatedFiles.py
index 99fc446bf..e3e86aab9 100755
--- a/external_imported/Catch2/tools/scripts/generateAmalgamatedFiles.py
+++ b/external_imported/Catch2/tools/scripts/generateAmalgamatedFiles.py
@@ -1,4 +1,9 @@
 #!/usr/bin/env python3
+#              Copyright Catch2 Authors
+# Distributed under the Boost Software License, Version 1.0.
+#   (See accompanying file LICENSE.txt or copy at
+#        https://www.boost.org/LICENSE_1_0.txt)
+# SPDX-License-Identifier: BSL-1.0
 
 import os
 import re
@@ -12,6 +17,8 @@
 output_header = os.path.join(catchPath, 'extras', 'catch_amalgamated.hpp')
 output_cpp = os.path.join(catchPath, 'extras', 'catch_amalgamated.cpp')
 
+# REUSE-IgnoreStart
+
 # These are the copyright comments in each file, we want to ignore them
 copyright_lines = [
 '//              Copyright Catch2 Authors\n',
@@ -24,6 +31,7 @@
 # The header of the amalgamated file: copyright information + explanation
 # what this file is.
 file_header = '''\
+
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
 //   (See accompanying file LICENSE.txt or copy at
@@ -39,6 +47,8 @@
 //  ----------------------------------------------------------
 '''
 
+# REUSE-IgnoreEnd
+
 # Returns file header with proper version string and generation time
 def formatted_file_header(version):
     return file_header.format(version_string=version.getVersionString(),
diff --git a/external_imported/Catch2/tools/scripts/releaseCommon.py b/external_imported/Catch2/tools/scripts/releaseCommon.py
index 0d995eaf7..1ff4af291 100644
--- a/external_imported/Catch2/tools/scripts/releaseCommon.py
+++ b/external_imported/Catch2/tools/scripts/releaseCommon.py
@@ -114,8 +114,8 @@ def updateVersionDefine(version):
 def updateVersionPlaceholder(filename, version):
     with open(filename, 'rb') as file:
         lines = file.readlines()
-    placeholderRegex = re.compile(b'in Catch[0-9]? X.Y.Z')
-    replacement = 'in Catch2 {}.{}.{}'.format(version.majorVersion, version.minorVersion, version.patchNumber).encode('ascii')
+    placeholderRegex = re.compile(b'Catch[0-9]? X.Y.Z')
+    replacement = 'Catch2 {}.{}.{}'.format(version.majorVersion, version.minorVersion, version.patchNumber).encode('ascii')
     with open(filename, 'wb') as file:
         for line in lines:
             file.write(placeholderRegex.sub(replacement, line))
diff --git a/external_imported/Catch2/tools/scripts/updateDocumentToC.py b/external_imported/Catch2/tools/scripts/updateDocumentToC.py
index 7b56cfc7a..1840cecc6 100755
--- a/external_imported/Catch2/tools/scripts/updateDocumentToC.py
+++ b/external_imported/Catch2/tools/scripts/updateDocumentToC.py
@@ -287,7 +287,7 @@ def markdownToclify(
         Path to the markdown output file.
 
       min_toc_len: int (default: 2)
-        Miniumum number of entries to create a table of contents for.
+        Minimum number of entries to create a table of contents for.
 
       github: bool (default: False)
         Uses GitHub TOC syntax if True.
diff --git a/external_imported/PlatformFolders/.github/workflows/build.yml b/external_imported/PlatformFolders/.github/workflows/build.yml
new file mode 100644
index 000000000..12a111e76
--- /dev/null
+++ b/external_imported/PlatformFolders/.github/workflows/build.yml
@@ -0,0 +1,16 @@
+on: [push]
+
+jobs:
+  ci_job:
+    runs-on: ubuntu-latest
+    name: Test that the code compiles
+    steps:
+      - name: Check Out Repo
+        uses: actions/checkout@v2
+      - name: Test Linux build
+        run: |
+          sudo apt-get install -y build-essential cmake
+          mkdir -p build && cd build
+          cmake -DPLATFORMFOLDERS_BUILD_TESTING=ON -DCMAKE_BUILD_TYPE=Release .. -B .
+          sudo cmake --build . --target install
+          ctest
diff --git a/external_imported/PlatformFolders/.travis.yml b/external_imported/PlatformFolders/.travis.yml
deleted file mode 100644
index cad7ff48b..000000000
--- a/external_imported/PlatformFolders/.travis.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-language: cpp
-matrix:
-  include:
-    - os: linux
-      env: BUILD_TYPE=Debug
-      compiler: gcc
-    - os: linux
-      env: BUILD_TYPE=Debug
-      compiler: clang
-    - os: linux
-      env: BUILD_TYPE=Release
-      compiler: gcc
-    - os: linux
-      env: BUILD_TYPE=Release
-      compiler: clang
-    - os: osx
-      env: BUILD_TYPE=Debug
-      compiler: gcc
-    - os: osx
-      env: BUILD_TYPE=Debug
-      compiler: clang
-    - os: osx
-      env: BUILD_TYPE=Release
-      compiler: gcc
-    - os: osx
-      env: BUILD_TYPE=Release
-      compiler: clang
-before_script:
-  - mkdir -p build && cd build
-script:
-  # Run cmake, then compile and run tests with make
-  - cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && make -j$(nproc) && make test
-after_failure:
-  # Dumps any logs so you can read the stderr
-  - if [[ -e 'Testing/Temporary/LastTest.log' ]]; then cat 'Testing/Temporary/LastTest.log'; fi
-  - if [[ -e 'CMakeFiles/CMakeError.log' ]]; then cat 'CMakeFiles/CMakeError.log'; fi
-notifications:
-  email: false
diff --git a/external_imported/PlatformFolders/CHANGELOG.md b/external_imported/PlatformFolders/CHANGELOG.md
new file mode 100644
index 000000000..5da7fab36
--- /dev/null
+++ b/external_imported/PlatformFolders/CHANGELOG.md
@@ -0,0 +1,91 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
+
+## [4.2.0] 2022-02-06
+
+### Added
+ - Support for "state" dir aka Local Machine
+
+### Changed
+ - PlatformFolders specific CMake variables are now prefixed with "PLATFORMFOLDERS_" (Thanks @OlivierLDff)
+
+## [4.1.0] 2021-08-08
+
+### Added
+ - CHANGELOG.md
+ - Support for CMAKE_DEBUG_POSTFIX. Makes it possible to add a postfix to debug builds
+
+### Changed
+ - README.md is now included in the Doxygen documentation
+ - Should now be thread safe
+ - Minor internal changes
+
+## [4.0.0] 2018-06-24
+
+### Added
+ - Support for "Public" folder
+ - Support for "Saved Games 2". This will be "Saved Games" in Vista and newer
+ - Unit tests
+
+
+### Changed
+ - The correct "Download" folder is now returned on Windows
+ - Now requires a C++11 compatible compiler (was C++98)
+ - Minimum Windows version raised from Windows XP to Windows 7.
+ - The Mac version no longer depends on CoreServices
+ - The XDG implementation are slightly more resilient to unrelated environments in user-dirs.dirs
+ - Improved CMake system
+
+### Removed
+ - C++98 compatibility
+ - Windows XP compatibility
+ - No longer needs CoreServices on Mac OS X
+
+## [3.2.0] 2018-05-28
+
+### Added
+ - Stand-alone functions. Method calls are no longer needed or recommended.
+
+### Changed
+ - Fixed a bug in the xdg cache function that caused sago::getCacheDir() to return the wrong folder if XDG_CONFIG_HOME and/or XDG_CACHE_HOME were set
+
+## [3.1] 2018-04-21
+
+### Added
+ - Now uses CMake for testing (Thanks @sum01)
+ - It is now possible to compile as a (static) library. (Thanks @sum01)
+ - Appveyor CI integration (Thanks @sum01)
+
+### Changed
+ - Optimised use of iterator.
+ - No longer keeps empty data structure on Mac and Windows platforms.
+
+## [3.0] 2016-10-08
+
+### Changed
+ - On Windows the library now returns UTF-8 encoded paths as default.
+
+## [2.2] 2016-09-06
+
+### Fixed
+ - Fixed a buffer overflow introduced in 2.1 (originally created to ensure C++03 compatibility)
+ - The example file no longer abuses namespaces.
+
+
+## [2.1] 2016-02-22
+
+### Changed
+ - Updated documentation URL
+ - No longer uses a variable length array internally
+
+
+## [2.0] 2015-10-26
+
+### Added
+- Mac OS X support using Core Framework
+
+## [1.0] 2015-09-21
+Designed to work with Linux and Windows XP+
diff --git a/external_imported/PlatformFolders/CMakeLists.txt b/external_imported/PlatformFolders/CMakeLists.txt
index d82991ecc..5ae2017ca 100644
--- a/external_imported/PlatformFolders/CMakeLists.txt
+++ b/external_imported/PlatformFolders/CMakeLists.txt
@@ -1,14 +1,33 @@
 # For target_compile_features
 cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
-project(platform_folders VERSION 4.0.0 LANGUAGES CXX)
 
-# Since it's off, the library will be static by default
-option(BUILD_SHARED_LIBS "Build shared instead of static." OFF)
+set(PLATFORMFOLDERS_MAIN_PROJECT OFF)
+if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
+  set(PLATFORMFOLDERS_MAIN_PROJECT ON)
+endif()
+
+project(platform_folders VERSION 4.2.0 LANGUAGES CXX)
 
-add_library(platform_folders
+# BUILD_SHARED_LIBS is off by default, the library will be static by default
+option(PLATFORMFOLDERS_BUILD_SHARED_LIBS "Build platform_folders shared library" ${BUILD_SHARED_LIBS})
+option(PLATFORMFOLDERS_BUILD_TESTING "Build platform_folders tests" ${PLATFORMFOLDERS_MAIN_PROJECT})
+option(PLATFORMFOLDERS_ENABLE_INSTALL "Enable platform_folders INSTALL target" ${PLATFORMFOLDERS_MAIN_PROJECT})
+
+set(PLATFORMFOLDERS_TYPE STATIC)
+if(PLATFORMFOLDERS_BUILD_SHARED_LIBS)
+	set(PLATFORMFOLDERS_TYPE SHARED)
+endif()
+
+add_library(platform_folders ${PLATFORMFOLDERS_TYPE}
 	sago/platform_folders.cpp
 )
 
+set_target_properties(platform_folders PROPERTIES DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}")
+
+# Creates an alias so that people building in-tree (instead of using find_package)...
+# can still link against the same target
+add_library(sago::platform_folders ALIAS platform_folders)
+
 # Defines standardized defaults for install paths
 include(GNUInstallDirs)
 # Where to search for the header while building
@@ -57,52 +76,52 @@ else()
 	set(_PROJECT_INSTALL_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/platform_folders")
 endif()
 
-# Gives "Make install" esque operations a location to install to...
-# and creates a .cmake file to be exported
-install(TARGETS platform_folders
-	EXPORT "platform_foldersConfig"
-	LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-	ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-	# Tells it where to put the header files
-	PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/sago"
-)
+if(PLATFORMFOLDERS_ENABLE_INSTALL)
+	# Gives "Make install" esque operations a location to install to...
+	# and creates a .cmake file to be exported
+	install(TARGETS platform_folders
+		EXPORT "platform_foldersConfig"
+		LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+		ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+		# Tells it where to put the header files
+		PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/sago"
+	)
 
-# "The install(TARGETS) and install(EXPORT) commands work together to install a target and a file to help import it"
-# Installs a cmake file which external projects can import.
-install(EXPORT "platform_foldersConfig"
-	NAMESPACE sago::
-	DESTINATION "${_PROJECT_INSTALL_CMAKE_DIR}"
-)
+	# "The install(TARGETS) and install(EXPORT) commands work together to install a target and a file to help import it"
+	# Installs a cmake file which external projects can import.
+	install(EXPORT "platform_foldersConfig"
+		NAMESPACE sago::
+		DESTINATION "${_PROJECT_INSTALL_CMAKE_DIR}"
+	)
 
-# "The export command is used to generate a file exporting targets from a project build tree"
-# Creates an import file for external projects which are aware of the build tree.
-# May be useful for cross-compiling
-export(TARGETS platform_folders
-	FILE "platform_folders-exports.cmake"
-)
+	# "The export command is used to generate a file exporting targets from a project build tree"
+	# Creates an import file for external projects which are aware of the build tree.
+	# May be useful for cross-compiling
+	export(TARGETS platform_folders
+		FILE "platform_folders-exports.cmake"
+	)
 
-# For the config and configversion macros
-include(CMakePackageConfigHelpers)
+	# For the config and configversion macros
+	include(CMakePackageConfigHelpers)
 
-# Creates the project's ConfigVersion.cmake file
-# This allows for find_package() to use a version in the call
-write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/platform_foldersConfigVersion.cmake"
-	# This'll require versioning in the project() call
-	VERSION ${CMAKE_PROJECT_VERSION}
-	# Just assuming Semver is followed
-	COMPATIBILITY SameMajorVersion
-)
+	# Creates the project's ConfigVersion.cmake file
+	# This allows for find_package() to use a version in the call
+	write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/platform_foldersConfigVersion.cmake"
+		# This'll require versioning in the project() call
+		VERSION ${CMAKE_PROJECT_VERSION}
+		# Just assuming Semver is followed
+		COMPATIBILITY SameMajorVersion
+	)
 
-# Install the ConfigVersion file, which is located in the build dir
-install(FILES
-		"${CMAKE_CURRENT_BINARY_DIR}/platform_foldersConfigVersion.cmake"
-	DESTINATION "${_PROJECT_INSTALL_CMAKE_DIR}"
-)
+	# Install the ConfigVersion file, which is located in the build dir
+	install(FILES
+			"${CMAKE_CURRENT_BINARY_DIR}/platform_foldersConfigVersion.cmake"
+		DESTINATION "${_PROJECT_INSTALL_CMAKE_DIR}"
+	)
+endif()
 
-# A module for testing the library
-include(CTest)
-# BUILD_TESTING is defined (default ON) in CTest
-if(BUILD_TESTING)
+if(PLATFORMFOLDERS_BUILD_TESTING)
+	enable_testing()
 	add_subdirectory(test)
 	add_executable(platform_folders_sample platform_folders.cpp)
 	target_link_libraries(platform_folders_sample PRIVATE platform_folders)
diff --git a/external_imported/PlatformFolders/README.md b/external_imported/PlatformFolders/README.md
index 4978a0f28..e988ad539 100644
--- a/external_imported/PlatformFolders/README.md
+++ b/external_imported/PlatformFolders/README.md
@@ -2,7 +2,7 @@
 
 A C++ library to look for directories like `My Documents`, `~/.config`, `%APPDATA%`, etc. so that you do not need to write platform-specific code
 
-[Source code](https://github.com/sago007/PlatformFolders) • [Latest release](https://github.com/sago007/PlatformFolders/releases/latest) • [Doxygen documentation](http://sago007.github.io/PlatformFolders/html/doxygen/)
+[Source code](https://github.com/sago007/PlatformFolders) • [Latest release](https://github.com/sago007/PlatformFolders/releases/latest) • [Doxygen documentation](https://sago007.github.io/PlatformFolders/html/doxygen/)
 
 ## Rationale
 
@@ -11,11 +11,11 @@ There are a lot of platform abstraction libraries available. You can get graphic
 But folder abstraction seems to be more difficult.
 My problem was that the code that found the place to save data was platform dependent. This cluttered my code and often I would not discover that it did not compile until moving it to the different platforms.
 
-[I have written a bit more about it here.](http://sago007.blogspot.dk/2015/10/abstraction-for-special-folders.html)
+[I have written a bit more about it here.](https://sago007.blogspot.dk/2015/10/abstraction-for-special-folders.html)
 
 There are some alternatives that you might consider instead:
 
-* [QStandardPaths](http://doc.qt.io/qt-5/qstandardpaths.html)
+* [QStandardPaths](https://doc.qt.io/qt-5/qstandardpaths.html)
 * [glib](https://developer.gnome.org/glib/stable/glib-Miscellaneous-Utility-Functions.html)
 
 Both are properly more mature than this library. However they are both parts of large frameworks and using them with libraries outside the framework may not be that simple.
@@ -45,9 +45,9 @@ This project should be compatible with things like [Cmake's ExternalProject_Add]
 You can also follow the [build step](#building) below to install at a system level, and use [Cmake's find_package](https://cmake.org/cmake/help/latest/command/find_package.html).
 
 ```cmake
-# Specifying a version is optional -- note it follows by Semver
+# Specifying a version is optional -- note it follows Semver
 find_package(platform_folders 3.1.0 REQUIRED)
-# Which creates the IMPORTED lib "sago::platform_folders"
+# Which imports the linkable library "sago::platform_folders"
 # Use it like so...
 target_link_libraries(EXEORLIBNAME PRIVATE sago::platform_folders)
 ```
@@ -55,6 +55,8 @@ target_link_libraries(EXEORLIBNAME PRIVATE sago::platform_folders)
 Alternatively, you can just copy the [sago](https://github.com/sago007/PlatformFolders/tree/master/sago) folder into your program and manually link everything.
 If you use the last option and are using a library version from before 4.0.0: Remember to link to the CoreServices lib when compiling on Mac. This typically means passing "-framework CoreServices" during the linking phase.
 
+Note that if you build in-tree, you can link against the Cmake alias `sago::platform_folders` just like if you had used find_package.
+
 ### Building
 
 **Notes:**
@@ -91,6 +93,7 @@ int main()
 {
 	std::cout << "Config: " << sago::getConfigHome() << "\n";
 	std::cout << "Data: " << sago::getDataHome() << "\n";
+	std::cout << "State: " << sago::getStateDir() << "\n";
 	std::cout << "Cache: " << sago::getCacheDir() << "\n";
 	std::cout << "Documents: " << sago::getDocumentsFolder() << "\n";
 	std::cout << "Desktop: " << sago::getDesktopFolder() << "\n";
@@ -111,6 +114,7 @@ int main()
 ```
 Config: /home/poul/.config
 Data: /home/poul/.local/share
+State: /home/poul/.local/state
 Cache: /home/poul/.cache
 Documents: /home/poul/Dokumenter
 Desktop: /home/poul/Skrivebord
@@ -127,6 +131,7 @@ Save Games 2: /home/poul/.local/share
 ```
 Config: C:\users\poul\Application Data
 Data: C:\users\poul\Application Data
+State: C:\users\poul\Local Settings\Application Data
 Cache: C:\users\poul\Local Settings\Application Data
 Documents: C:\users\poul\Mine dokumenter
 Desktop: C:\users\poul\Skrivebord
@@ -143,6 +148,7 @@ Save Games 2: C:\users\poul\Saved Games
 ```
 Config: /Users/poul/Library/Application Support
 Data: /Users/poul/Library/Application Support
+State: /Users/poul/Library/Application Support
 Cache: /Users/poul/Library/Caches
 Documents: /Users/poul/Documents
 Desktop: /Users/poul/Desktop
diff --git a/external_imported/PlatformFolders/doxygen.conf b/external_imported/PlatformFolders/doxygen.conf
index cea077bc8..66b6a4314 100644
--- a/external_imported/PlatformFolders/doxygen.conf
+++ b/external_imported/PlatformFolders/doxygen.conf
@@ -38,7 +38,7 @@ PROJECT_NAME           = "Platform folders"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "4.0.0"
+PROJECT_NUMBER         = "4.2.0"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -894,7 +894,8 @@ FILTER_SOURCE_PATTERNS =
 # (index.html). This can be useful if you have a project on for instance GitHub
 # and want to reuse the introduction page also for the doxygen output.
 
-USE_MDFILE_AS_MAINPAGE =
+INPUT += README.md
+USE_MDFILE_AS_MAINPAGE = README.md
 
 #---------------------------------------------------------------------------
 # Configuration options related to source browsing
diff --git a/external_imported/PlatformFolders/platform_folders.cpp b/external_imported/PlatformFolders/platform_folders.cpp
index 08a23dfc6..0c796b6cd 100644
--- a/external_imported/PlatformFolders/platform_folders.cpp
+++ b/external_imported/PlatformFolders/platform_folders.cpp
@@ -30,6 +30,7 @@
 int main() {
 	std::cout << "Config: " << sago::getConfigHome() << "\n";
 	std::cout << "Data: " << sago::getDataHome() << "\n";
+	std::cout << "State: " << sago::getStateDir() << "\n";
 	std::cout << "Cache: " << sago::getCacheDir() << "\n";
 	std::cout << "Documents: " << sago::getDocumentsFolder() << "\n";
 	std::cout << "Desktop: " << sago::getDesktopFolder() << "\n";
diff --git a/external_imported/PlatformFolders/sago/platform_folders.cpp b/external_imported/PlatformFolders/sago/platform_folders.cpp
index f4e699e09..b1a08745d 100644
--- a/external_imported/PlatformFolders/sago/platform_folders.cpp
+++ b/external_imported/PlatformFolders/sago/platform_folders.cpp
@@ -52,8 +52,16 @@ static std::string getHome() {
 		res = homeEnv;
 		return res;
 	}
-	struct passwd* pw = getpwuid(uid);
-	if (!pw) {
+	struct passwd* pw = nullptr;
+	struct passwd pwd;
+	long bufsize = sysconf(_SC_GETPW_R_SIZE_MAX);
+	if (bufsize < 0) {
+		bufsize = 16384;
+	}
+	std::vector<char> buffer;
+	buffer.resize(bufsize);
+	int error_code = getpwuid_r(uid, &pwd, buffer.data(), buffer.size(), &pw);
+	if (error_code) {
 		throw std::runtime_error("Unable to get passwd struct.");
 	}
 	const char* tempRes = pw->pw_dir;
@@ -64,7 +72,7 @@ static std::string getHome() {
 	return res;
 }
 
-#endif 
+#endif
 
 #ifdef _WIN32
 // Make sure we don't bring in all the extra junk with windows.h
@@ -80,24 +88,29 @@ static std::string getHome() {
 // For SHGetFolderPathW and various CSIDL "magic numbers"
 #include <shlobj.h>
 
-static std::string win32_utf16_to_utf8(const wchar_t* wstr) {
+namespace sago {
+namespace internal {
+
+std::string win32_utf16_to_utf8(const wchar_t* wstr) {
 	std::string res;
 	// If the 6th parameter is 0 then WideCharToMultiByte returns the number of bytes needed to store the result.
 	int actualSize = WideCharToMultiByte(CP_UTF8, 0, wstr, -1, nullptr, 0, nullptr, nullptr);
 	if (actualSize > 0) {
 		//If the converted UTF-8 string could not be in the initial buffer. Allocate one that can hold it.
 		std::vector<char> buffer(actualSize);
-		actualSize = WideCharToMultiByte(CP_UTF8, 0, wstr, -1, &buffer[0], buffer.size(), nullptr, nullptr);
+		actualSize = WideCharToMultiByte(CP_UTF8, 0, wstr, -1, &buffer[0], static_cast<int>(buffer.size()), nullptr, nullptr);
 		res = buffer.data();
 	}
 	if (actualSize == 0) {
 		// WideCharToMultiByte return 0 for errors.
-		const std::string errorMsg = "UTF16 to UTF8 failed with error code: " + GetLastError();
-		throw std::runtime_error(errorMsg.c_str());
+		throw std::runtime_error("UTF16 to UTF8 failed with error code: " + std::to_string(GetLastError()));
 	}
 	return res;
 }
 
+}  // namesapce internal
+}  // namespace sago
+
 class FreeCoTaskMemory {
 	LPWSTR pointer = NULL;
 public:
@@ -116,7 +129,7 @@ static std::string GetKnownWindowsFolder(REFKNOWNFOLDERID folderId, const char*
 	if (!SUCCEEDED(hr)) {
 		throw std::runtime_error(errorMsg);
 	}
-	return win32_utf16_to_utf8(wszPath);
+	return sago::internal::win32_utf16_to_utf8(wszPath);
 }
 
 static std::string GetAppData() {
@@ -137,6 +150,7 @@ static std::string GetAppDataLocal() {
 #include <sys/types.h>
 // For strlen and strtok
 #include <cstring>
+#include <sstream>
 //Typically Linux. For easy reading the comments will just say Linux but should work with most *nixes
 
 static void throwOnRelative(const char* envName, const char* envValue) {
@@ -161,28 +175,12 @@ static std::string getLinuxFolderDefault(const char* envName, const char* defaul
 	return res;
 }
 
-static void appendExtraFoldersTokenizer(const char* envName, const char* envValue, std::vector<std::string>& folders) {
-	std::vector<char> buffer(envValue, envValue + std::strlen(envValue) + 1);
-	char* p = std::strtok ( &buffer[0], ":");
-	while (p != nullptr) {
-		if (p[0] == '/') {
-			folders.push_back(p);
-		}
-		else {
-			//Unless the system is wrongly configured this should never happen... But of course some systems will be incorectly configured.
-			//The XDG documentation indicates that the folder should be ignored but that the program should continue.
-			std::cerr << "Skipping path \"" << p << "\" in \"" << envName << "\" because it does not start with a \"/\"\n";
-		}
-		p = std::strtok (nullptr, ":");
-	}
-}
-
 static void appendExtraFolders(const char* envName, const char* defaultValue, std::vector<std::string>& folders) {
 	const char* envValue = std::getenv(envName);
 	if (!envValue) {
 		envValue = defaultValue;
 	}
-	appendExtraFoldersTokenizer(envName, envValue, folders);
+	sago::internal::appendExtraFoldersTokenizer(envName, envValue, folders);
 }
 
 #endif
@@ -190,6 +188,25 @@ static void appendExtraFolders(const char* envName, const char* defaultValue, st
 
 namespace sago {
 
+#if !defined(_WIN32) && !defined(__APPLE__)
+namespace internal {
+void appendExtraFoldersTokenizer(const char* envName, const char* envValue, std::vector<std::string>& folders) {
+	std::stringstream ss(envValue);
+	std::string value;
+	while (std::getline(ss, value, ':')) {
+		if (value[0] == '/') {
+			folders.push_back(value);
+		}
+		else {
+			//Unless the system is wrongly configured this should never happen... But of course some systems will be incorectly configured.
+			//The XDG documentation indicates that the folder should be ignored but that the program should continue.
+			std::cerr << "Skipping path \"" << value << "\" in \"" << envName << "\" because it does not start with a \"/\"\n";
+		}
+	}
+}
+}
+#endif
+
 std::string getDataHome() {
 #ifdef _WIN32
 	return GetAppData();
@@ -220,6 +237,16 @@ std::string getCacheDir() {
 #endif
 }
 
+std::string getStateDir() {
+#ifdef _WIN32
+	return GetAppDataLocal();
+#elif defined(__APPLE__)
+	return getHome()+"/Library/Application Support";
+#else
+	return getLinuxFolderDefault("XDG_STATE_HOME", ".local/state");
+#endif
+}
+
 void appendAdditionalDataDirectories(std::vector<std::string>& homes) {
 #ifdef _WIN32
 	homes.push_back(GetAppDataCommon());
@@ -255,7 +282,8 @@ static void PlatformFoldersAddFromFile(const std::string& filename, std::map<std
 			std::size_t valueEnd = line.find('"', valueStart+1);
 			std::string value = line.substr(valueStart+1, valueEnd - valueStart - 1);
 			folders[key] = value;
-		} catch (std::exception&  e) {
+		}
+		catch (std::exception&  e) {
 			std::cerr << "WARNING: Failed to process \"" << line << "\" from \"" << filename << "\". Error: "<< e.what() << "\n";
 			continue;
 		}
diff --git a/external_imported/PlatformFolders/sago/platform_folders.h b/external_imported/PlatformFolders/sago/platform_folders.h
index b2b4ea250..742c829fa 100644
--- a/external_imported/PlatformFolders/sago/platform_folders.h
+++ b/external_imported/PlatformFolders/sago/platform_folders.h
@@ -37,6 +37,17 @@ SOFTWARE.
  */
 namespace sago {
 
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+namespace internal {
+#if !defined(_WIN32) && !defined(__APPLE__)
+void appendExtraFoldersTokenizer(const char* envName, const char* envValue, std::vector<std::string>& folders);
+#endif
+#ifdef _WIN32
+std::string win32_utf16_to_utf8(const wchar_t* wstr);
+#endif
+}
+#endif  //DOXYGEN_SHOULD_SKIP_THIS
+
 /**
  * Retrives the base folder for storing data files.
  * You must add the program name yourself like this:
@@ -44,7 +55,7 @@ namespace sago {
  * string data_home = getDataHome()+"/My Program Name/";
  * @endcode
  * On Windows this defaults to %APPDATA% (Roaming profile)
- * On Linux this defaults to ~/.local/share but can be configured
+ * On Linux this defaults to ~/.local/share but can be configured by the user
  * @return The base folder for storing program data.
  */
 std::string getDataHome();
@@ -56,7 +67,7 @@ std::string getDataHome();
  * string data_home = getConfigHome()+"/My Program Name/";
  * @endcode
  * On Windows this defaults to %APPDATA% (Roaming profile)
- * On Linux this defaults to ~/.config but can be configured
+ * On Linux this defaults to ~/.config but can be configured by the user
  * @return The base folder for storing config data.
  */
 std::string getConfigHome();
@@ -65,14 +76,28 @@ std::string getConfigHome();
  * Retrives the base folder for storing cache files.
  * You must add the program name yourself like this:
  * @code{.cpp}
- * string data_home = getCacheDir()+"/My Program Name/";
+ * string data_home = getCacheDir()+"/My Program Name/cache/";
  * @endcode
  * On Windows this defaults to %APPDATALOCAL%
- * On Linux this defaults to ~/.cache but can be configured
- * @return The base folder for storing data that do not need to be backed up.
+ * On Linux this defaults to ~/.cache but can be configured by the user
+ * Note that it is recommended to append "cache" after the program name to prevent conflicting with "StateDir" under Windows
+ * @return The base folder for storing data that do not need to be backed up and might be deleted.
  */
 std::string getCacheDir();
 
+/**
+ * Retrives the base folder used for state files.
+ * You must add the program name yourself like this:
+ * @code{.cpp}
+ * string data_home = getStateDir()+"/My Program Name/";
+ * @endcode
+ * On Windows this defaults to %APPDATALOCAL%
+ * On Linux this defaults to ~/.local/state but can be configured by the user
+ * On OS X this is the same as getDataHome()
+ * @return The base folder for storing data that do not need to be backed up but should not be reguarly deleted either.
+ */
+std::string getStateDir();
+
 /**
  * This will append extra folders that your program should be looking for data files in.
  * This does not normally include the path returned by GetDataHome().
@@ -214,7 +239,7 @@ class PlatformFolders {
 	 */
 	std::string getPicturesFolder() const;
 	/**
-	 * Use sago::getPublicFolder() instead! 
+	 * Use sago::getPublicFolder() instead!
 	 */
 	std::string getPublicFolder() const;
 	/**
diff --git a/external_imported/PlatformFolders/test/CMakeLists.txt b/external_imported/PlatformFolders/test/CMakeLists.txt
index a5568831a..c11103e5b 100644
--- a/external_imported/PlatformFolders/test/CMakeLists.txt
+++ b/external_imported/PlatformFolders/test/CMakeLists.txt
@@ -47,5 +47,7 @@ _def_test("getMusicFolder")
 _def_test("getPicturesFolder")
 _def_test("getPublicFolder")
 _def_test("getSaveGamesFolder1")
+_def_test("getStateDir")
 _def_test("getVideoFolder")
 _def_test("integration")
+_def_test("internalTest")
\ No newline at end of file
diff --git a/external_imported/PlatformFolders/test/appendAdditionalDataDirectories.cpp b/external_imported/PlatformFolders/test/appendAdditionalDataDirectories.cpp
index ab83d22db..75d874c1c 100644
--- a/external_imported/PlatformFolders/test/appendAdditionalDataDirectories.cpp
+++ b/external_imported/PlatformFolders/test/appendAdditionalDataDirectories.cpp
@@ -2,6 +2,7 @@
 #include "../sago/platform_folders.h"
 #include <string>
 #include <vector>
+#include <iostream>
 
 int main() {
 	std::vector<std::string> extraData;
diff --git a/external_imported/PlatformFolders/test/getStateDir.cpp b/external_imported/PlatformFolders/test/getStateDir.cpp
new file mode 100644
index 000000000..294a00c7f
--- /dev/null
+++ b/external_imported/PlatformFolders/test/getStateDir.cpp
@@ -0,0 +1,7 @@
+#include "tester.hpp"
+#include "../sago/platform_folders.h"
+
+int main() {
+	run_test(sago::getStateDir());
+	return 0;
+}
diff --git a/external_imported/PlatformFolders/test/internalTest.cpp b/external_imported/PlatformFolders/test/internalTest.cpp
new file mode 100644
index 000000000..faae2c1dc
--- /dev/null
+++ b/external_imported/PlatformFolders/test/internalTest.cpp
@@ -0,0 +1,22 @@
+#include "tester.hpp"
+#include "../sago/platform_folders.h"
+#include <string>
+#include <vector>
+#include <iostream>
+
+int main() {
+	std::vector<std::string> extraData;
+	#if !defined(_WIN32) && !defined(__APPLE__)
+	extraData.clear();
+	sago::internal::appendExtraFoldersTokenizer("", "/hello:two:/three", extraData);
+	if (extraData.at(0) != "/hello") {
+		std::cerr << "sago::internal::appendExtraFoldersTokenizer did not return \"/hello\"\n";
+		std::exit(EXIT_FAILURE);
+	}
+	if (extraData.at(1) != "/three") {
+		std::cerr << "sago::internal::appendExtraFoldersTokenizer did not return \"/three\"\n";
+		std::exit(EXIT_FAILURE);
+	}
+	#endif
+	return 0;
+}
diff --git a/external_imported/cpp-httplib/.github/workflows/test.yaml b/external_imported/cpp-httplib/.github/workflows/test.yaml
index 2bf0c3dfd..173daa8c8 100644
--- a/external_imported/cpp-httplib/.github/workflows/test.yaml
+++ b/external_imported/cpp-httplib/.github/workflows/test.yaml
@@ -17,7 +17,7 @@ jobs:
         git config --global core.autocrlf false
         git config --global core.eol lf
     - name: checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: install brotli library on ubuntu
       if: matrix.os == 'ubuntu-latest'
       run: sudo apt update && sudo apt-get install -y libbrotli-dev
@@ -32,7 +32,7 @@ jobs:
       run: cd test && make fuzz_test
     - name: setup msbuild on windows
       if: matrix.os == 'windows-latest'
-      uses: microsoft/setup-msbuild@v1.0.2
+      uses: microsoft/setup-msbuild@v1.1
     - name: make-windows
       if: matrix.os == 'windows-latest'
       run: |
diff --git a/external_imported/cpp-httplib/CMakeLists.txt b/external_imported/cpp-httplib/CMakeLists.txt
index e8781c1ff..73de51189 100644
--- a/external_imported/cpp-httplib/CMakeLists.txt
+++ b/external_imported/cpp-httplib/CMakeLists.txt
@@ -3,18 +3,21 @@
 	* BUILD_SHARED_LIBS (default off) builds as a shared library (if HTTPLIB_COMPILE is ON)
 	* HTTPLIB_USE_OPENSSL_IF_AVAILABLE (default on)
 	* HTTPLIB_USE_ZLIB_IF_AVAILABLE (default on)
+	* HTTPLIB_USE_BROTLI_IF_AVAILABLE (default on)
 	* HTTPLIB_REQUIRE_OPENSSL (default off)
 	* HTTPLIB_REQUIRE_ZLIB (default off)
-	* HTTPLIB_USE_BROTLI_IF_AVAILABLE (default on)
 	* HTTPLIB_REQUIRE_BROTLI (default off)
+	* HTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN (default on)
 	* HTTPLIB_COMPILE (default off)
+	* HTTPLIB_INSTALL (default on)
+	* HTTPLIB_TEST (default off)
 	* BROTLI_USE_STATIC_LIBS - tells Cmake to use the static Brotli libs (only works if you have them installed).
 	* OPENSSL_USE_STATIC_LIBS - tells Cmake to use the static OpenSSL libs (only works if you have them installed).
 
 	-------------------------------------------------------------------------------
 
-	After installation with Cmake, a find_package(httplib) is available.
-	This creates a httplib::httplib target (if found).
+	After installation with Cmake, a find_package(httplib COMPONENTS OpenSSL ZLIB Brotli) is available.
+	This creates a httplib::httplib target (if found and if listed components are supported).
 	It can be linked like so:
 
 	target_link_libraries(your_exe httplib::httplib)
@@ -42,6 +45,7 @@
 	* HTTPLIB_IS_USING_OPENSSL - a bool for if OpenSSL support is enabled.
 	* HTTPLIB_IS_USING_ZLIB - a bool for if ZLIB support is enabled.
 	* HTTPLIB_IS_USING_BROTLI - a bool for if Brotli support is enabled.
+	* HTTPLIB_IS_USING_CERTS_FROM_MACOSX_KEYCHAIN - a bool for if support of loading system certs from the Apple Keychain is enabled.
 	* HTTPLIB_IS_COMPILED - a bool for if the library is compiled, or otherwise header-only.
 	* HTTPLIB_INCLUDE_DIR - the root path to httplib's header (e.g. /usr/include).
 	* HTTPLIB_LIBRARY - the full path to the library if compiled (e.g. /usr/lib/libhttplib.so).
@@ -55,7 +59,6 @@
 
 	-------------------------------------------------------------------------------
 
-	FindPython3 requires Cmake v3.12
 	ARCH_INDEPENDENT option of write_basic_package_version_file() requires Cmake v3.14
 ]]
 cmake_minimum_required(VERSION 3.14.0 FATAL_ERROR)
@@ -65,32 +68,34 @@ cmake_minimum_required(VERSION 3.14.0 FATAL_ERROR)
 # This is so the maintainer doesn't actually need to update this manually.
 file(STRINGS httplib.h _raw_version_string REGEX "CPPHTTPLIB_VERSION \"([0-9]+\\.[0-9]+\\.[0-9]+)\"")
 
-# Needed since git tags have "v" prefixing them.
-# Also used if the fallback to user agent string is being used.
+# Extracts just the version string itself from the whole string contained in _raw_version_string
+# since _raw_version_string would contain the entire line of code where it found the version string
 string(REGEX MATCH "([0-9]+\\.?)+" _httplib_version "${_raw_version_string}")
 
 project(httplib VERSION ${_httplib_version} LANGUAGES CXX)
 
 # Change as needed to set an OpenSSL minimum version.
 # This is used in the installed Cmake config file.
-set(_HTTPLIB_OPENSSL_MIN_VER "1.1.1")
+set(_HTTPLIB_OPENSSL_MIN_VER "3.0.0")
 
+# Lets you disable C++ exception during CMake configure time.
+# The value is used in the install CMake config file.
+option(HTTPLIB_NO_EXCEPTIONS "Disable the use of C++ exceptions" OFF)
 # Allow for a build to require OpenSSL to pass, instead of just being optional
 option(HTTPLIB_REQUIRE_OPENSSL "Requires OpenSSL to be found & linked, or fails build." OFF)
 option(HTTPLIB_REQUIRE_ZLIB "Requires ZLIB to be found & linked, or fails build." OFF)
-# Allow for a build to casually enable OpenSSL/ZLIB support, but silenty continue if not found.
+# Allow for a build to casually enable OpenSSL/ZLIB support, but silently continue if not found.
 # Make these options so their automatic use can be specifically disabled (as needed)
 option(HTTPLIB_USE_OPENSSL_IF_AVAILABLE "Uses OpenSSL (if available) to enable HTTPS support." ON)
 option(HTTPLIB_USE_ZLIB_IF_AVAILABLE "Uses ZLIB (if available) to enable Zlib compression support." ON)
 # Lets you compile the program as a regular library instead of header-only
 option(HTTPLIB_COMPILE "If ON, uses a Python script to split the header into a compilable header & source file (requires Python v3)." OFF)
-# Just setting this variable here for people building in-tree
-if(HTTPLIB_COMPILE)
-	set(HTTPLIB_IS_COMPILED TRUE)
-endif()
-
+# Lets you disable the installation (useful when fetched from another CMake project)
+option(HTTPLIB_INSTALL "Enables the installation target" ON)
+option(HTTPLIB_TEST "Enables testing and builds tests" OFF)
 option(HTTPLIB_REQUIRE_BROTLI "Requires Brotli to be found & linked, or fails build." OFF)
 option(HTTPLIB_USE_BROTLI_IF_AVAILABLE "Uses Brotli (if available) to enable Brotli decompression support." ON)
+option(HTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN "Enable feature to load system certs from the Apple Keychain." ON)
 # Defaults to static library
 option(BUILD_SHARED_LIBS "Build the library as a shared library instead of static. Has no effect if using header-only." OFF)
 if (BUILD_SHARED_LIBS AND WIN32 AND HTTPLIB_COMPILE)
@@ -99,40 +104,48 @@ if (BUILD_SHARED_LIBS AND WIN32 AND HTTPLIB_COMPILE)
 	set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 endif()
 
+# Set some variables that are used in-tree and while building based on our options
+set(HTTPLIB_IS_COMPILED ${HTTPLIB_COMPILE})
+set(HTTPLIB_IS_USING_CERTS_FROM_MACOSX_KEYCHAIN ${HTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN})
+
 # Threads needed for <thread> on some systems, and for <pthread.h> on Linux
+set(THREADS_PREFER_PTHREAD_FLAG TRUE)
 find_package(Threads REQUIRED)
 # Since Cmake v3.11, Crypto & SSL became optional when not specified as COMPONENTS.
 if(HTTPLIB_REQUIRE_OPENSSL)
 	find_package(OpenSSL ${_HTTPLIB_OPENSSL_MIN_VER} COMPONENTS Crypto SSL REQUIRED)
+	set(HTTPLIB_IS_USING_OPENSSL TRUE)
 elseif(HTTPLIB_USE_OPENSSL_IF_AVAILABLE)
 	find_package(OpenSSL ${_HTTPLIB_OPENSSL_MIN_VER} COMPONENTS Crypto SSL QUIET)
-endif()
-# Just setting this variable here for people building in-tree
-if(OPENSSL_FOUND)
-	set(HTTPLIB_IS_USING_OPENSSL TRUE)
+	# Avoid a rare circumstance of not finding all components but the end-user did their
+	# own call for OpenSSL, which might trick us into thinking we'd otherwise have what we wanted
+	if (TARGET OpenSSL::SSL AND TARGET OpenSSL::Crypto)
+		set(HTTPLIB_IS_USING_OPENSSL ${OPENSSL_FOUND})
+	else()
+		set(HTTPLIB_IS_USING_OPENSSL FALSE)
+	endif()
 endif()
 
 if(HTTPLIB_REQUIRE_ZLIB)
 	find_package(ZLIB REQUIRED)
+	set(HTTPLIB_IS_USING_ZLIB TRUE)
 elseif(HTTPLIB_USE_ZLIB_IF_AVAILABLE)
 	find_package(ZLIB QUIET)
-endif()
-# Just setting this variable here for people building in-tree
-# FindZLIB doesn't have a ZLIB_FOUND variable, so check the target.
-if(TARGET ZLIB::ZLIB)
-	set(HTTPLIB_IS_USING_ZLIB TRUE)
+	# FindZLIB doesn't have a ZLIB_FOUND variable, so check the target.
+	if(TARGET ZLIB::ZLIB)
+		set(HTTPLIB_IS_USING_ZLIB TRUE)
+	endif()
 endif()
 
 # Adds our cmake folder to the search path for find_package
+# This is so we can use our custom FindBrotli.cmake
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 if(HTTPLIB_REQUIRE_BROTLI)
 	find_package(Brotli COMPONENTS encoder decoder common REQUIRED)
+	set(HTTPLIB_IS_USING_BROTLI TRUE)
 elseif(HTTPLIB_USE_BROTLI_IF_AVAILABLE)
 	find_package(Brotli COMPONENTS encoder decoder common QUIET)
-endif()
-# Just setting this variable here for people building in-tree
-if(Brotli_FOUND)
-	set(HTTPLIB_IS_USING_BROTLI TRUE)
+	set(HTTPLIB_IS_USING_BROTLI ${Brotli_FOUND})
 endif()
 
 # Used for default, common dirs that the end-user can change (if needed)
@@ -160,7 +173,7 @@ if(HTTPLIB_COMPILE)
 		ERROR_VARIABLE _httplib_split_error
 	)
 	if(_httplib_split_error)
-		message(FATAL_ERROR "Failed when trying to split Cpp-httplib with the Python script.\n${_httplib_split_error}")
+		message(FATAL_ERROR "Failed when trying to split cpp-httplib with the Python script.\n${_httplib_split_error}")
 	endif()
 
 	# split.py puts output in "out"
@@ -175,7 +188,7 @@ if(HTTPLIB_COMPILE)
 	set_target_properties(${PROJECT_NAME}
 		PROPERTIES
 			VERSION ${${PROJECT_NAME}_VERSION}
-			SOVERSION ${${PROJECT_NAME}_VERSION_MAJOR}
+			SOVERSION "${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}"
 	)
 else()
 	# This is for header-only.
@@ -187,22 +200,10 @@ endif()
 # Only useful if building in-tree, versus using it from an installation.
 add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
 
-# Might be missing some, but this list is somewhat comprehensive
-target_compile_features(${PROJECT_NAME} ${_INTERFACE_OR_PUBLIC}
-	cxx_std_11
-	cxx_nullptr
-	cxx_lambdas
-	cxx_override
-	cxx_defaulted_functions
-	cxx_attribute_deprecated
-	cxx_auto_type
-	cxx_decltype
-	cxx_deleted_functions
-	cxx_range_for
-	cxx_sizeof_member
-)
+# Require C++11
+target_compile_features(${PROJECT_NAME} ${_INTERFACE_OR_PUBLIC} cxx_std_11)
 
-target_include_directories(${PROJECT_NAME} ${_INTERFACE_OR_PUBLIC}
+target_include_directories(${PROJECT_NAME} SYSTEM ${_INTERFACE_OR_PUBLIC}
     $<BUILD_INTERFACE:${_httplib_build_includedir}>
     $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
 )
@@ -213,7 +214,8 @@ target_link_libraries(${PROJECT_NAME} ${_INTERFACE_OR_PUBLIC}
 		# Needed for Windows libs on Mingw, as the pragma comment(lib, "xyz") aren't triggered.
 		$<$<PLATFORM_ID:Windows>:ws2_32>
 		$<$<PLATFORM_ID:Windows>:crypt32>
-		$<$<PLATFORM_ID:Windows>:cryptui>
+		# Needed for API from MacOS Security framework
+		"$<$<AND:$<PLATFORM_ID:Darwin>,$<BOOL:${HTTPLIB_IS_USING_OPENSSL}>,$<BOOL:${HTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN}>>:-framework CoreFoundation -framework Security>"
 		# Can't put multiple targets in a single generator expression or it bugs out.
 		$<$<BOOL:${HTTPLIB_IS_USING_BROTLI}>:Brotli::common>
 		$<$<BOOL:${HTTPLIB_IS_USING_BROTLI}>:Brotli::encoder>
@@ -225,20 +227,15 @@ target_link_libraries(${PROJECT_NAME} ${_INTERFACE_OR_PUBLIC}
 
 # Set the definitions to enable optional features
 target_compile_definitions(${PROJECT_NAME} ${_INTERFACE_OR_PUBLIC}
+	$<$<BOOL:${HTTPLIB_NO_EXCEPTIONS}>:CPPHTTPLIB_NO_EXCEPTIONS>
 	$<$<BOOL:${HTTPLIB_IS_USING_BROTLI}>:CPPHTTPLIB_BROTLI_SUPPORT>
 	$<$<BOOL:${HTTPLIB_IS_USING_ZLIB}>:CPPHTTPLIB_ZLIB_SUPPORT>
 	$<$<BOOL:${HTTPLIB_IS_USING_OPENSSL}>:CPPHTTPLIB_OPENSSL_SUPPORT>
+	$<$<AND:$<PLATFORM_ID:Darwin>,$<BOOL:${HTTPLIB_IS_USING_OPENSSL}>,$<BOOL:${HTTPLIB_IS_USING_CERTS_FROM_MACOSX_KEYCHAIN}>>:CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN>
 )
 
-# Cmake's find_package search path is different based on the system
-# See https://cmake.org/cmake/help/latest/command/find_package.html for the list
-if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-	set(_TARGET_INSTALL_CMAKEDIR "${CMAKE_INSTALL_PREFIX}/cmake/${PROJECT_NAME}")
-else()
-	# On Non-Windows, it should be /usr/lib/cmake/<name>/<name>Config.cmake
-	# NOTE: This may or may not work for macOS...
-	set(_TARGET_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
-endif()
+# CMake configuration files installation directory
+set(_TARGET_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
 
 include(CMakePackageConfigHelpers)
 
@@ -248,51 +245,52 @@ configure_package_config_file("${PROJECT_NAME}Config.cmake.in"
 	INSTALL_DESTINATION "${_TARGET_INSTALL_CMAKEDIR}"
 	# Passes the includedir install path
 	PATH_VARS CMAKE_INSTALL_FULL_INCLUDEDIR
-	# There aren't any components, so don't use the macro
-	NO_CHECK_REQUIRED_COMPONENTS_MACRO
 )
 
 if(HTTPLIB_COMPILE)
 	write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
 		# Example: if you find_package(httplib 0.5.4)
-		# then anything >= 0.5 and <= 1.0 is accepted
-		COMPATIBILITY SameMajorVersion
+		# then anything >= 0.5.4 and < 0.6 is accepted
+		COMPATIBILITY SameMinorVersion
 	)
 else()
 	write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
 		# Example: if you find_package(httplib 0.5.4)
-		# then anything >= 0.5 and <= 1.0 is accepted
-		COMPATIBILITY SameMajorVersion
+		# then anything >= 0.5.4 and < 0.6 is accepted
+		COMPATIBILITY SameMinorVersion
 		# Tells Cmake that it's a header-only lib
 		# Mildly useful for end-users :)
 		ARCH_INDEPENDENT
 	)
 endif()
 
-# Creates the export httplibTargets.cmake
-# This is strictly what holds compilation requirements
-# and linkage information (doesn't find deps though).
-install(TARGETS ${PROJECT_NAME}
-	EXPORT httplibTargets
-	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-)
+if(HTTPLIB_INSTALL)
+	# Creates the export httplibTargets.cmake
+	# This is strictly what holds compilation requirements
+	# and linkage information (doesn't find deps though).
+	install(TARGETS ${PROJECT_NAME} EXPORT httplibTargets)
 
-install(FILES "${_httplib_build_includedir}/httplib.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+	install(FILES "${_httplib_build_includedir}/httplib.h" TYPE INCLUDE)
 
-install(FILES
+	install(FILES
 		"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
 		"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
 		# Install it so it can be used later by the httplibConfig.cmake file.
 		# Put it in the same dir as our config file instead of a global path so we don't potentially stomp on other packages.
 		"${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindBrotli.cmake"
-	DESTINATION ${_TARGET_INSTALL_CMAKEDIR}
-)
+		DESTINATION ${_TARGET_INSTALL_CMAKEDIR}
+	)
 
-# NOTE: This path changes depending on if it's on Windows or Linux
-install(EXPORT httplibTargets
-	# Puts the targets into the httplib namespace
-	# So this makes httplib::httplib linkable after doing find_package(httplib)
-	NAMESPACE ${PROJECT_NAME}::
-	DESTINATION ${_TARGET_INSTALL_CMAKEDIR}
-)
+	# NOTE: This path changes depending on if it's on Windows or Linux
+	install(EXPORT httplibTargets
+		# Puts the targets into the httplib namespace
+		# So this makes httplib::httplib linkable after doing find_package(httplib)
+		NAMESPACE ${PROJECT_NAME}::
+		DESTINATION ${_TARGET_INSTALL_CMAKEDIR}
+	)
+endif()
+
+if(HTTPLIB_TEST)
+    include(CTest)
+    add_subdirectory(test)
+endif()
diff --git a/external_imported/cpp-httplib/README.md b/external_imported/cpp-httplib/README.md
index cb4d80289..ebde68aaf 100644
--- a/external_imported/cpp-httplib/README.md
+++ b/external_imported/cpp-httplib/README.md
@@ -7,12 +7,12 @@ A C++11 single-file header-only cross platform HTTP/HTTPS library.
 
 It's extremely easy to setup. Just include the **httplib.h** file in your code!
 
-NOTE: This is a multi-threaded 'blocking' HTTP library. If you are looking for a 'non-blocking' library, this is not the one that you want.
+NOTE: This library uses 'blocking' socket I/O. If you are looking for a library with 'non-blocking' socket I/O, this is not the one that you want.
 
 Simple examples
 ---------------
 
-#### Server
+#### Server (Multi-threaded)
 
 ```c++
 #define CPPHTTPLIB_OPENSSL_SUPPORT
@@ -53,7 +53,9 @@ SSL Support
 
 SSL support is available with `CPPHTTPLIB_OPENSSL_SUPPORT`. `libssl` and `libcrypto` should be linked.
 
-NOTE: cpp-httplib currently supports only version 1.1.1 and 3.0.
+NOTE: cpp-httplib currently supports only version 3.0 or later. Please see [this page](https://www.openssl.org/policies/releasestrat.html) to get more information.
+
+NOTE for macOS: cpp-httplib now can use system certs with `CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN`. `CoreFoundation` and `Security` should be linked with `-framework`.
 
 ```c++
 #define CPPHTTPLIB_OPENSSL_SUPPORT
@@ -65,6 +67,7 @@ httplib::SSLServer svr("./cert.pem", "./key.pem");
 // Client
 httplib::Client cli("https://localhost:1234"); // scheme + host
 httplib::SSLClient cli("localhost:1234"); // host
+httplib::SSLClient cli("localhost", 1234); // host, port
 
 // Use your CA bundle
 cli.set_ca_cert_path("./ca-bundle.crt");
@@ -73,7 +76,7 @@ cli.set_ca_cert_path("./ca-bundle.crt");
 cli.enable_server_certificate_verification(false);
 ```
 
-Note: When using SSL, it seems impossible to avoid SIGPIPE in all cases, since on some operating systems, SIGPIPE can only be suppressed on a per-message basis, but there is no way to make the OpenSSL library do so for its internal communications. If your program needs to avoid being terminated on SIGPIPE, the only fully general way might be to set up a signal handler for SIGPIPE to handle or ignore it yourself.
+NOTE: When using SSL, it seems impossible to avoid SIGPIPE in all cases, since on some operating systems, SIGPIPE can only be suppressed on a per-message basis, but there is no way to make the OpenSSL library do so for its internal communications. If your program needs to avoid being terminated on SIGPIPE, the only fully general way might be to set up a signal handler for SIGPIPE to handle or ignore it yourself.
 
 Server
 ------
@@ -91,11 +94,20 @@ int main(void)
     res.set_content("Hello World!", "text/plain");
   });
 
+  // Match the request path against a regular expression
+  // and extract its captures
   svr.Get(R"(/numbers/(\d+))", [&](const Request& req, Response& res) {
     auto numbers = req.matches[1];
     res.set_content(numbers, "text/plain");
   });
 
+  // Capture the second segment of the request path as "id" path param
+  svr.Get("/users/:id", [&](const Request& req, Response& res) {
+    auto user_id = req.path_params.at("id");
+    res.set_content(user_id, "text/plain");
+  });
+
+  // Extract values from HTTP headers and URL query params
   svr.Get("/body-header-param", [](const Request& req, Response& res) {
     if (req.has_header("Content-Length")) {
       auto val = req.get_header_value("Content-Length");
@@ -178,6 +190,8 @@ The followings are built-in mappings:
 | webm       | video/webm                  | zip        | application/zip             |
 | mp3        | audio/mp3                   | wasm       | application/wasm            |
 
+NOTE: These static file server methods are not thread-safe.
+
 ### File request handler
 
 ```cpp
@@ -187,8 +201,6 @@ svr.set_file_request_handler([](const Request &req, Response &res) {
 });
 ```
 
-NOTE: These static file server methods are not thread-safe.
-
 ### Logging
 
 ```cpp
@@ -212,15 +224,23 @@ svr.set_error_handler([](const auto& req, auto& res) {
 The exception handler gets called if a user routing handler throws an error.
 
 ```cpp
-svr.set_exception_handler([](const auto& req, auto& res, std::exception &e) {
-  res.status = 500;
+svr.set_exception_handler([](const auto& req, auto& res, std::exception_ptr ep) {
   auto fmt = "<h1>Error 500</h1><p>%s</p>";
   char buf[BUFSIZ];
-  snprintf(buf, sizeof(buf), fmt, e.what());
+  try {
+    std::rethrow_exception(ep);
+  } catch (std::exception &e) {
+    snprintf(buf, sizeof(buf), fmt, e.what());
+  } catch (...) { // See the following NOTE
+    snprintf(buf, sizeof(buf), fmt, "Unknown Exception");
+  }
   res.set_content(buf, "text/html");
+  res.status = StatusCode::InternalServerError_500;
 });
 ```
 
+NOTE: if you don't provide the `catch (...)` block for a rethrown exception pointer, an uncaught exception will end up causing the server crash. Be careful!
+
 ### Pre routing handler
 
 ```cpp
@@ -292,7 +312,7 @@ svr.Get("/stream", [&](const Request &req, Response &res) {
   res.set_content_provider(
     data->size(), // Content length
     "text/plain", // Content type
-    [data](size_t offset, size_t length, DataSink &sink) {
+    [&, data](size_t offset, size_t length, DataSink &sink) {
       const auto &d = *data;
       sink.write(&d[offset], std::min(length, DATA_CHUNK_SIZE));
       return true; // return 'false' if you want to cancel the process.
@@ -337,6 +357,27 @@ svr.Get("/chunked", [&](const Request& req, Response& res) {
 });
 ```
 
+With trailer:
+
+```cpp
+svr.Get("/chunked", [&](const Request& req, Response& res) {
+  res.set_header("Trailer", "Dummy1, Dummy2");
+  res.set_chunked_content_provider(
+    "text/plain",
+    [](size_t offset, DataSink &sink) {
+      sink.write("123", 3);
+      sink.write("345", 3);
+      sink.write("789", 3);
+      sink.done_with_trailer({
+        {"Dummy1", "DummyVal1"},
+        {"Dummy2", "DummyVal2"}
+      });
+      return true;
+    }
+  );
+});
+```
+
 ### 'Expect: 100-continue' handler
 
 By default, the server sends a `100 Continue` response for an `Expect: 100-continue` header.
@@ -344,14 +385,14 @@ By default, the server sends a `100 Continue` response for an `Expect: 100-conti
 ```cpp
 // Send a '417 Expectation Failed' response.
 svr.set_expect_100_continue_handler([](const Request &req, Response &res) {
-  return 417;
+  return StatusCode::ExpectationFailed_417;
 });
 ```
 
 ```cpp
 // Send a final status without reading the message body.
 svr.set_expect_100_continue_handler([](const Request &req, Response &res) {
-  return res.status = 401;
+  return res.status = StatusCode::Unauthorized_401;
 });
 ```
 
@@ -376,6 +417,8 @@ svr.set_idle_interval(0, 100000); // 100 milliseconds
 svr.set_payload_max_length(1024 * 1024 * 512); // 512MB
 ```
 
+NOTE: When the request body content type is 'www-form-urlencoded', the actual payload length shouldn't exceed `CPPHTTPLIB_FORM_URL_ENCODED_PAYLOAD_MAX_LENGTH`.
+
 ### Server-Sent Events
 
 Please see [Server example](https://github.com/yhirose/cpp-httplib/blob/master/example/ssesvr.cc) and [Client example](https://github.com/yhirose/cpp-httplib/blob/master/example/ssecli.cc).
@@ -390,6 +433,17 @@ If you want to set the thread count at runtime, there is no convenient way... Bu
 svr.new_task_queue = [] { return new ThreadPool(12); };
 ```
 
+You can also provide an optional parameter to limit the maximum number
+of pending requests, i.e. requests `accept()`ed by the listener but
+still waiting to be serviced by worker threads.
+
+```cpp
+svr.new_task_queue = [] { return new ThreadPool(/*num_threads=*/12, /*max_queued_requests=*/18); };
+```
+
+Default limit is 0 (unlimited). Once the limit is reached, the listener
+will shutdown the client connection.
+
 ### Override the default thread pool with yours
 
 You can supply your own thread pool implementation according to your need.
@@ -401,8 +455,10 @@ public:
     pool_.start_with_thread_count(n);
   }
 
-  virtual void enqueue(std::function<void()> fn) override {
-    pool_.enqueue(fn);
+  virtual bool enqueue(std::function<void()> fn) override {
+    /* Return true if the task was actually enqueued, or false
+     * if the caller must drop the corresponding connection. */
+    return pool_.enqueue(fn);
   }
 
   virtual void shutdown() override {
@@ -430,12 +486,12 @@ int main(void)
   httplib::Client cli("localhost", 1234);
 
   if (auto res = cli.Get("/hi")) {
-    if (res->status == 200) {
+    if (res->status == StatusCode::OK_200) {
       std::cout << res->body << std::endl;
     }
   } else {
     auto err = res.error();
-    ...
+    std::cout << "HTTP error: " << httplib::to_string(err) << std::endl;
   }
 }
 ```
@@ -468,7 +524,9 @@ enum Error {
   SSLConnection,
   SSLLoadingCerts,
   SSLServerVerification,
-  UnsupportedMultipartBoundaryChars
+  UnsupportedMultipartBoundaryChars,
+  Compression,
+  ConnectionTimeout,
 };
 ```
 
@@ -482,6 +540,10 @@ auto res = cli.Get("/hi", headers);
 ```
 or
 ```c++
+auto res = cli.Get("/hi", {{"Accept-Encoding", "gzip, deflate"}});
+```
+or
+```c++
 cli.set_default_headers({
   { "Accept-Encoding", "gzip, deflate" }
 });
@@ -574,7 +636,7 @@ std::string body;
 auto res = cli.Get(
   "/stream", Headers(),
   [&](const Response &response) {
-    EXPECT_EQ(200, response.status);
+    EXPECT_EQ(StatusCode::OK_200, response.status);
     return true; // return 'false' if you want to cancel the request.
   },
   [&](const char *data, size_t data_length) {
@@ -615,7 +677,7 @@ auto res = cli.Post(
 ### With Progress Callback
 
 ```cpp
-httplib::Client client(url, port);
+httplib::Client cli(url, port);
 
 // prints: 0 / 000 bytes => 50% complete
 auto res = cli.Get("/", [](uint64_t len, uint64_t total) {
@@ -797,14 +859,14 @@ Include `httplib.h` before `Windows.h` or include `Windows.h` by defining `WIN32
 #include <httplib.h>
 ```
 
-Note: cpp-httplib officially supports only the latest Visual Studio. It might work with former versions of Visual Studio, but I can no longer verify it. Pull requests are always welcome for the older versions of Visual Studio unless they break the C++11 conformance.
+NOTE: cpp-httplib officially supports only the latest Visual Studio. It might work with former versions of Visual Studio, but I can no longer verify it. Pull requests are always welcome for the older versions of Visual Studio unless they break the C++11 conformance.
 
-Note: Windows 8 or lower and Cygwin on Windows are not supported.
+NOTE: Windows 8 or lower, Visual Studio 2013 or lower, and Cygwin and MSYS2 including MinGW are neither supported nor tested.
 
 License
 -------
 
-MIT license (© 2021 Yuji Hirose)
+MIT license (© 2024 Yuji Hirose)
 
 Special Thanks To
 -----------------
diff --git a/external_imported/cpp-httplib/example/Makefile b/external_imported/cpp-httplib/example/Makefile
index f37cc2464..64a35885f 100644
--- a/external_imported/cpp-httplib/example/Makefile
+++ b/external_imported/cpp-httplib/example/Makefile
@@ -4,16 +4,22 @@ CXXFLAGS = -O2 -std=c++11 -I.. -Wall -Wextra -pthread
 PREFIX = /usr/local
 #PREFIX = $(shell brew --prefix)
 
-OPENSSL_DIR = $(PREFIX)/opt/openssl@1.1
-#OPENSSL_DIR = $(PREFIX)/opt/openssl@3
+OPENSSL_DIR = $(PREFIX)/opt/openssl@3
 OPENSSL_SUPPORT = -DCPPHTTPLIB_OPENSSL_SUPPORT -I$(OPENSSL_DIR)/include -L$(OPENSSL_DIR)/lib -lssl -lcrypto
 
+ifneq ($(OS), Windows_NT)
+	UNAME_S := $(shell uname -s)
+	ifeq ($(UNAME_S), Darwin)
+		OPENSSL_SUPPORT += -framework CoreFoundation -framework Security
+	endif
+endif
+
 ZLIB_SUPPORT = -DCPPHTTPLIB_ZLIB_SUPPORT -lz
 
 BROTLI_DIR = $(PREFIX)/opt/brotli
 BROTLI_SUPPORT = -DCPPHTTPLIB_BROTLI_SUPPORT -I$(BROTLI_DIR)/include -L$(BROTLI_DIR)/lib -lbrotlicommon -lbrotlienc -lbrotlidec
 
-all: server client hello simplecli simplesvr upload redirect ssesvr ssecli benchmark
+all: server client hello simplecli simplesvr upload redirect ssesvr ssecli benchmark issue
 
 server : server.cc ../httplib.h Makefile
 	$(CXX) -o server $(CXXFLAGS) server.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT)
diff --git a/external_imported/cpp-httplib/example/benchmark.cc b/external_imported/cpp-httplib/example/benchmark.cc
index 8e300b9e6..433cc675c 100644
--- a/external_imported/cpp-httplib/example/benchmark.cc
+++ b/external_imported/cpp-httplib/example/benchmark.cc
@@ -26,7 +26,7 @@ int main(void) {
   for (int i = 0; i < 3; i++) {
     StopWatch sw(to_string(i).c_str());
     auto res = cli.Post("/post", body, "application/octet-stream");
-    assert(res->status == 200);
+    assert(res->status == httplib::StatusCode::OK_200);
   }
 
   return 0;
diff --git a/external_imported/cpp-httplib/example/ssesvr.cc b/external_imported/cpp-httplib/example/ssesvr.cc
index d18aed355..5b0e0b93b 100644
--- a/external_imported/cpp-httplib/example/ssesvr.cc
+++ b/external_imported/cpp-httplib/example/ssesvr.cc
@@ -19,7 +19,7 @@ class EventDispatcher {
     unique_lock<mutex> lk(m_);
     int id = id_;
     cv_.wait(lk, [&] { return cid_ == id; });
-    if (sink->is_writable()) { sink->write(message_.data(), message_.size()); }
+    sink->write(message_.data(), message_.size());
   }
 
   void send_event(const string &message) {
diff --git a/external_imported/cpp-httplib/example/uploader.sh b/external_imported/cpp-httplib/example/uploader.sh
index 0e992f459..4382ae621 100755
--- a/external_imported/cpp-httplib/example/uploader.sh
+++ b/external_imported/cpp-httplib/example/uploader.sh
@@ -1,5 +1,5 @@
 #/usr/bin/env bash
-for i in {1..10000}
+for i in {1..1000000}
 do
   echo "#### $i ####"
   curl -X POST -F image_file=@$1 http://localhost:1234/post > /dev/null
diff --git a/external_imported/cpp-httplib/httplib.h b/external_imported/cpp-httplib/httplib.h
index 04a552f0a..dfdd260ab 100644
--- a/external_imported/cpp-httplib/httplib.h
+++ b/external_imported/cpp-httplib/httplib.h
@@ -1,14 +1,14 @@
 //
 //  httplib.h
 //
-//  Copyright (c) 2022 Yuji Hirose. All rights reserved.
+//  Copyright (c) 2024 Yuji Hirose. All rights reserved.
 //  MIT License
 //
 
 #ifndef CPPHTTPLIB_HTTPLIB_H
 #define CPPHTTPLIB_HTTPLIB_H
 
-#define CPPHTTPLIB_VERSION "0.10.7"
+#define CPPHTTPLIB_VERSION "0.15.3"
 
 /*
  * Configuration
@@ -70,10 +70,22 @@
 #define CPPHTTPLIB_REDIRECT_MAX_COUNT 20
 #endif
 
+#ifndef CPPHTTPLIB_MULTIPART_FORM_DATA_FILE_MAX_COUNT
+#define CPPHTTPLIB_MULTIPART_FORM_DATA_FILE_MAX_COUNT 1024
+#endif
+
 #ifndef CPPHTTPLIB_PAYLOAD_MAX_LENGTH
 #define CPPHTTPLIB_PAYLOAD_MAX_LENGTH ((std::numeric_limits<size_t>::max)())
 #endif
 
+#ifndef CPPHTTPLIB_FORM_URL_ENCODED_PAYLOAD_MAX_LENGTH
+#define CPPHTTPLIB_FORM_URL_ENCODED_PAYLOAD_MAX_LENGTH 8192
+#endif
+
+#ifndef CPPHTTPLIB_RANGE_MAX_COUNT
+#define CPPHTTPLIB_RANGE_MAX_COUNT 1024
+#endif
+
 #ifndef CPPHTTPLIB_TCP_NODELAY
 #define CPPHTTPLIB_TCP_NODELAY false
 #endif
@@ -119,23 +131,25 @@
 #endif //_CRT_NONSTDC_NO_DEPRECATE
 
 #if defined(_MSC_VER)
+#if _MSC_VER < 1900
+#error Sorry, Visual Studio versions prior to 2015 are not supported
+#endif
+
+#pragma comment(lib, "ws2_32.lib")
+
 #ifdef _WIN64
 using ssize_t = __int64;
 #else
-using ssize_t = int;
-#endif
-
-#if _MSC_VER < 1900
-#define snprintf _snprintf_s
+using ssize_t = long;
 #endif
 #endif // _MSC_VER
 
 #ifndef S_ISREG
-#define S_ISREG(m) (((m)&S_IFREG) == S_IFREG)
+#define S_ISREG(m) (((m) & S_IFREG) == S_IFREG)
 #endif // S_ISREG
 
 #ifndef S_ISDIR
-#define S_ISDIR(m) (((m)&S_IFDIR) == S_IFDIR)
+#define S_ISDIR(m) (((m) & S_IFDIR) == S_IFDIR)
 #endif // S_ISDIR
 
 #ifndef NOMINMAX
@@ -150,14 +164,6 @@ using ssize_t = int;
 #define WSA_FLAG_NO_HANDLE_INHERIT 0x80
 #endif
 
-#ifdef _MSC_VER
-#pragma comment(lib, "ws2_32.lib")
-#endif
-
-#ifndef strcasecmp
-#define strcasecmp _stricmp
-#endif // strcasecmp
-
 using socket_t = SOCKET;
 #ifdef CPPHTTPLIB_USE_POLL
 #define poll(fds, nfds, timeout) WSAPoll(fds, nfds, timeout)
@@ -166,8 +172,15 @@ using socket_t = SOCKET;
 #else // not _WIN32
 
 #include <arpa/inet.h>
-#include <cstring>
+#if !defined(_AIX) && !defined(__MVS__)
 #include <ifaddrs.h>
+#endif
+#ifdef __MVS__
+#include <strings.h>
+#ifndef NI_MAXHOST
+#define NI_MAXHOST 1025
+#endif
+#endif
 #include <net/if.h>
 #include <netdb.h>
 #include <netinet/in.h>
@@ -180,8 +193,10 @@ using socket_t = SOCKET;
 #endif
 #include <csignal>
 #include <pthread.h>
+#include <sys/mman.h>
 #include <sys/select.h>
 #include <sys/socket.h>
+#include <sys/un.h>
 #include <unistd.h>
 
 using socket_t = int;
@@ -197,7 +212,9 @@ using socket_t = int;
 #include <cctype>
 #include <climits>
 #include <condition_variable>
+#include <cstring>
 #include <errno.h>
+#include <exception>
 #include <fcntl.h>
 #include <fstream>
 #include <functional>
@@ -214,6 +231,9 @@ using socket_t = int;
 #include <string>
 #include <sys/stat.h>
 #include <thread>
+#include <unordered_map>
+#include <unordered_set>
+#include <utility>
 
 #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
 #ifdef _WIN32
@@ -228,9 +248,14 @@ using socket_t = int;
 
 #ifdef _MSC_VER
 #pragma comment(lib, "crypt32.lib")
-#pragma comment(lib, "cryptui.lib")
 #endif
-#endif //_WIN32
+#elif defined(CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN) && defined(__APPLE__)
+#include <TargetConditionals.h>
+#if TARGET_OS_OSX
+#include <CoreFoundation/CoreFoundation.h>
+#include <Security/Security.h>
+#endif // TARGET_OS_OSX
+#endif // _WIN32
 
 #include <openssl/err.h>
 #include <openssl/evp.h>
@@ -244,16 +269,10 @@ using socket_t = int;
 #include <iostream>
 #include <sstream>
 
-#if OPENSSL_VERSION_NUMBER < 0x1010100fL
-#error Sorry, OpenSSL versions prior to 1.1.1 are not supported
+#if OPENSSL_VERSION_NUMBER < 0x30000000L
+#error Sorry, OpenSSL versions prior to 3.0.0 are not supported
 #endif
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-#include <openssl/crypto.h>
-inline const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *asn1) {
-  return M_ASN1_STRING_data(asn1);
-}
-#endif
 #endif
 
 #ifdef CPPHTTPLIB_ZLIB_SUPPORT
@@ -303,8 +322,111 @@ struct ci {
   }
 };
 
+// This is based on
+// "http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n4189".
+
+struct scope_exit {
+  explicit scope_exit(std::function<void(void)> &&f)
+      : exit_function(std::move(f)), execute_on_destruction{true} {}
+
+  scope_exit(scope_exit &&rhs) noexcept
+      : exit_function(std::move(rhs.exit_function)),
+        execute_on_destruction{rhs.execute_on_destruction} {
+    rhs.release();
+  }
+
+  ~scope_exit() {
+    if (execute_on_destruction) { this->exit_function(); }
+  }
+
+  void release() { this->execute_on_destruction = false; }
+
+private:
+  scope_exit(const scope_exit &) = delete;
+  void operator=(const scope_exit &) = delete;
+  scope_exit &operator=(scope_exit &&) = delete;
+
+  std::function<void(void)> exit_function;
+  bool execute_on_destruction;
+};
+
 } // namespace detail
 
+enum StatusCode {
+  // Information responses
+  Continue_100 = 100,
+  SwitchingProtocol_101 = 101,
+  Processing_102 = 102,
+  EarlyHints_103 = 103,
+
+  // Successful responses
+  OK_200 = 200,
+  Created_201 = 201,
+  Accepted_202 = 202,
+  NonAuthoritativeInformation_203 = 203,
+  NoContent_204 = 204,
+  ResetContent_205 = 205,
+  PartialContent_206 = 206,
+  MultiStatus_207 = 207,
+  AlreadyReported_208 = 208,
+  IMUsed_226 = 226,
+
+  // Redirection messages
+  MultipleChoices_300 = 300,
+  MovedPermanently_301 = 301,
+  Found_302 = 302,
+  SeeOther_303 = 303,
+  NotModified_304 = 304,
+  UseProxy_305 = 305,
+  unused_306 = 306,
+  TemporaryRedirect_307 = 307,
+  PermanentRedirect_308 = 308,
+
+  // Client error responses
+  BadRequest_400 = 400,
+  Unauthorized_401 = 401,
+  PaymentRequired_402 = 402,
+  Forbidden_403 = 403,
+  NotFound_404 = 404,
+  MethodNotAllowed_405 = 405,
+  NotAcceptable_406 = 406,
+  ProxyAuthenticationRequired_407 = 407,
+  RequestTimeout_408 = 408,
+  Conflict_409 = 409,
+  Gone_410 = 410,
+  LengthRequired_411 = 411,
+  PreconditionFailed_412 = 412,
+  PayloadTooLarge_413 = 413,
+  UriTooLong_414 = 414,
+  UnsupportedMediaType_415 = 415,
+  RangeNotSatisfiable_416 = 416,
+  ExpectationFailed_417 = 417,
+  ImATeapot_418 = 418,
+  MisdirectedRequest_421 = 421,
+  UnprocessableContent_422 = 422,
+  Locked_423 = 423,
+  FailedDependency_424 = 424,
+  TooEarly_425 = 425,
+  UpgradeRequired_426 = 426,
+  PreconditionRequired_428 = 428,
+  TooManyRequests_429 = 429,
+  RequestHeaderFieldsTooLarge_431 = 431,
+  UnavailableForLegalReasons_451 = 451,
+
+  // Server error responses
+  InternalServerError_500 = 500,
+  NotImplemented_501 = 501,
+  BadGateway_502 = 502,
+  ServiceUnavailable_503 = 503,
+  GatewayTimeout_504 = 504,
+  HttpVersionNotSupported_505 = 505,
+  VariantAlsoNegotiates_506 = 506,
+  InsufficientStorage_507 = 507,
+  LoopDetected_508 = 508,
+  NotExtended_510 = 510,
+  NetworkAuthenticationRequired_511 = 511,
+};
+
 using Headers = std::multimap<std::string, std::string, detail::ci>;
 
 using Params = std::multimap<std::string, std::string>;
@@ -334,8 +456,9 @@ class DataSink {
   DataSink &operator=(DataSink &&) = delete;
 
   std::function<bool(const char *data, size_t data_len)> write;
-  std::function<void()> done;
   std::function<bool()> is_writable;
+  std::function<void()> done;
+  std::function<void(const Headers &trailer)> done_with_trailer;
   std::ostream os;
 
 private:
@@ -344,7 +467,7 @@ class DataSink {
     explicit data_sink_streambuf(DataSink &sink) : sink_(sink) {}
 
   protected:
-    std::streamsize xsputn(const char *s, std::streamsize n) {
+    std::streamsize xsputn(const char *s, std::streamsize n) override {
       sink_.write(s, static_cast<size_t>(n));
       return n;
     }
@@ -364,6 +487,14 @@ using ContentProviderWithoutLength =
 
 using ContentProviderResourceReleaser = std::function<void(bool success)>;
 
+struct MultipartFormDataProvider {
+  std::string name;
+  ContentProviderWithoutLength provider;
+  std::string filename;
+  std::string content_type;
+};
+using MultipartFormDataProviderItems = std::vector<MultipartFormDataProvider>;
+
 using ContentReceiverWithProgress =
     std::function<bool(const char *data, size_t data_length, uint64_t offset,
                        uint64_t total_length)>;
@@ -408,6 +539,8 @@ struct Request {
 
   std::string remote_addr;
   int remote_port = -1;
+  std::string local_addr;
+  int local_port = -1;
 
   // for server
   std::string version;
@@ -416,6 +549,7 @@ struct Request {
   MultipartFormDataMap files;
   Ranges ranges;
   Match matches;
+  std::unordered_map<std::string, std::string> path_params;
 
   // for client
   ResponseHandler response_handler;
@@ -425,22 +559,21 @@ struct Request {
   const SSL *ssl = nullptr;
 #endif
 
-  bool has_header(const char *key) const;
-  std::string get_header_value(const char *key, size_t id = 0) const;
-  template <typename T>
-  T get_header_value(const char *key, size_t id = 0) const;
-  size_t get_header_value_count(const char *key) const;
-  void set_header(const char *key, const char *val);
-  void set_header(const char *key, const std::string &val);
+  bool has_header(const std::string &key) const;
+  std::string get_header_value(const std::string &key, size_t id = 0) const;
+  uint64_t get_header_value_u64(const std::string &key, size_t id = 0) const;
+  size_t get_header_value_count(const std::string &key) const;
+  void set_header(const std::string &key, const std::string &val);
 
-  bool has_param(const char *key) const;
-  std::string get_param_value(const char *key, size_t id = 0) const;
-  size_t get_param_value_count(const char *key) const;
+  bool has_param(const std::string &key) const;
+  std::string get_param_value(const std::string &key, size_t id = 0) const;
+  size_t get_param_value_count(const std::string &key) const;
 
   bool is_multipart_form_data() const;
 
-  bool has_file(const char *key) const;
-  MultipartFormData get_file_value(const char *key) const;
+  bool has_file(const std::string &key) const;
+  MultipartFormData get_file_value(const std::string &key) const;
+  std::vector<MultipartFormData> get_file_values(const std::string &key) const;
 
   // private members...
   size_t redirect_count_ = CPPHTTPLIB_REDIRECT_MAX_COUNT;
@@ -458,29 +591,27 @@ struct Response {
   std::string body;
   std::string location; // Redirect location
 
-  bool has_header(const char *key) const;
-  std::string get_header_value(const char *key, size_t id = 0) const;
-  template <typename T>
-  T get_header_value(const char *key, size_t id = 0) const;
-  size_t get_header_value_count(const char *key) const;
-  void set_header(const char *key, const char *val);
-  void set_header(const char *key, const std::string &val);
+  bool has_header(const std::string &key) const;
+  std::string get_header_value(const std::string &key, size_t id = 0) const;
+  uint64_t get_header_value_u64(const std::string &key, size_t id = 0) const;
+  size_t get_header_value_count(const std::string &key) const;
+  void set_header(const std::string &key, const std::string &val);
 
-  void set_redirect(const char *url, int status = 302);
-  void set_redirect(const std::string &url, int status = 302);
-  void set_content(const char *s, size_t n, const char *content_type);
-  void set_content(const std::string &s, const char *content_type);
+  void set_redirect(const std::string &url, int status = StatusCode::Found_302);
+  void set_content(const char *s, size_t n, const std::string &content_type);
+  void set_content(const std::string &s, const std::string &content_type);
+  void set_content(std::string &&s, const std::string &content_type);
 
   void set_content_provider(
-      size_t length, const char *content_type, ContentProvider provider,
+      size_t length, const std::string &content_type, ContentProvider provider,
       ContentProviderResourceReleaser resource_releaser = nullptr);
 
   void set_content_provider(
-      const char *content_type, ContentProviderWithoutLength provider,
+      const std::string &content_type, ContentProviderWithoutLength provider,
       ContentProviderResourceReleaser resource_releaser = nullptr);
 
   void set_chunked_content_provider(
-      const char *content_type, ContentProviderWithoutLength provider,
+      const std::string &content_type, ContentProviderWithoutLength provider,
       ContentProviderResourceReleaser resource_releaser = nullptr);
 
   Response() = default;
@@ -512,6 +643,7 @@ class Stream {
   virtual ssize_t read(char *ptr, size_t size) = 0;
   virtual ssize_t write(const char *ptr, size_t size) = 0;
   virtual void get_remote_ip_and_port(std::string &ip, int &port) const = 0;
+  virtual void get_local_ip_and_port(std::string &ip, int &port) const = 0;
   virtual socket_t socket() const = 0;
 
   template <typename... Args>
@@ -525,7 +657,7 @@ class TaskQueue {
   TaskQueue() = default;
   virtual ~TaskQueue() = default;
 
-  virtual void enqueue(std::function<void()> fn) = 0;
+  virtual bool enqueue(std::function<void()> fn) = 0;
   virtual void shutdown() = 0;
 
   virtual void on_idle() {}
@@ -533,7 +665,8 @@ class TaskQueue {
 
 class ThreadPool : public TaskQueue {
 public:
-  explicit ThreadPool(size_t n) : shutdown_(false) {
+  explicit ThreadPool(size_t n, size_t mqr = 0)
+      : shutdown_(false), max_queued_requests_(mqr) {
     while (n) {
       threads_.emplace_back(worker(*this));
       n--;
@@ -543,10 +676,17 @@ class ThreadPool : public TaskQueue {
   ThreadPool(const ThreadPool &) = delete;
   ~ThreadPool() override = default;
 
-  void enqueue(std::function<void()> fn) override {
-    std::unique_lock<std::mutex> lock(mutex_);
-    jobs_.push_back(std::move(fn));
+  bool enqueue(std::function<void()> fn) override {
+    {
+      std::unique_lock<std::mutex> lock(mutex_);
+      if (max_queued_requests_ > 0 && jobs_.size() >= max_queued_requests_) {
+        return false;
+      }
+      jobs_.push_back(std::move(fn));
+    }
+
     cond_.notify_one();
+    return true;
   }
 
   void shutdown() override {
@@ -579,7 +719,7 @@ class ThreadPool : public TaskQueue {
 
           if (pool_.shutdown_ && pool_.jobs_.empty()) { break; }
 
-          fn = pool_.jobs_.front();
+          fn = std::move(pool_.jobs_.front());
           pool_.jobs_.pop_front();
         }
 
@@ -596,6 +736,7 @@ class ThreadPool : public TaskQueue {
   std::list<std::function<void()>> jobs_;
 
   bool shutdown_;
+  size_t max_queued_requests_ = 0;
 
   std::condition_variable cond_;
   std::mutex mutex_;
@@ -607,12 +748,88 @@ using SocketOptions = std::function<void(socket_t sock)>;
 
 void default_socket_options(socket_t sock);
 
+const char *status_message(int status);
+
+std::string get_bearer_token_auth(const Request &req);
+
+namespace detail {
+
+class MatcherBase {
+public:
+  virtual ~MatcherBase() = default;
+
+  // Match request path and populate its matches and
+  virtual bool match(Request &request) const = 0;
+};
+
+/**
+ * Captures parameters in request path and stores them in Request::path_params
+ *
+ * Capture name is a substring of a pattern from : to /.
+ * The rest of the pattern is matched agains the request path directly
+ * Parameters are captured starting from the next character after
+ * the end of the last matched static pattern fragment until the next /.
+ *
+ * Example pattern:
+ * "/path/fragments/:capture/more/fragments/:second_capture"
+ * Static fragments:
+ * "/path/fragments/", "more/fragments/"
+ *
+ * Given the following request path:
+ * "/path/fragments/:1/more/fragments/:2"
+ * the resulting capture will be
+ * {{"capture", "1"}, {"second_capture", "2"}}
+ */
+class PathParamsMatcher : public MatcherBase {
+public:
+  PathParamsMatcher(const std::string &pattern);
+
+  bool match(Request &request) const override;
+
+private:
+  static constexpr char marker = ':';
+  // Treat segment separators as the end of path parameter capture
+  // Does not need to handle query parameters as they are parsed before path
+  // matching
+  static constexpr char separator = '/';
+
+  // Contains static path fragments to match against, excluding the '/' after
+  // path params
+  // Fragments are separated by path params
+  std::vector<std::string> static_fragments_;
+  // Stores the names of the path parameters to be used as keys in the
+  // Request::path_params map
+  std::vector<std::string> param_names_;
+};
+
+/**
+ * Performs std::regex_match on request path
+ * and stores the result in Request::matches
+ *
+ * Note that regex match is performed directly on the whole request.
+ * This means that wildcard patterns may match multiple path segments with /:
+ * "/begin/(.*)/end" will match both "/begin/middle/end" and "/begin/1/2/end".
+ */
+class RegexMatcher : public MatcherBase {
+public:
+  RegexMatcher(const std::string &pattern) : regex_(pattern) {}
+
+  bool match(Request &request) const override;
+
+private:
+  std::regex regex_;
+};
+
+ssize_t write_headers(Stream &strm, const Headers &headers);
+
+} // namespace detail
+
 class Server {
 public:
   using Handler = std::function<void(const Request &, Response &)>;
 
   using ExceptionHandler =
-      std::function<void(const Request &, Response &, std::exception &e)>;
+      std::function<void(const Request &, Response &, std::exception_ptr ep)>;
 
   enum class HandlerResponse {
     Handled,
@@ -649,8 +866,9 @@ class Server {
   bool set_mount_point(const std::string &mount_point, const std::string &dir,
                        Headers headers = Headers());
   bool remove_mount_point(const std::string &mount_point);
-  Server &set_file_extension_and_mimetype_mapping(const char *ext,
-                                                  const char *mime);
+  Server &set_file_extension_and_mimetype_mapping(const std::string &ext,
+                                                  const std::string &mime);
+  Server &set_default_file_mimetype(const std::string &mime);
   Server &set_file_request_handler(Handler handler);
 
   Server &set_error_handler(HandlerWithResponse handler);
@@ -667,6 +885,8 @@ class Server {
   Server &set_socket_options(SocketOptions socket_options);
 
   Server &set_default_headers(Headers headers);
+  Server &
+  set_header_writer(std::function<ssize_t(Stream &, Headers &)> const &writer);
 
   Server &set_keep_alive_max_count(size_t count);
   Server &set_keep_alive_timeout(time_t sec);
@@ -685,13 +905,14 @@ class Server {
 
   Server &set_payload_max_length(size_t length);
 
-  bool bind_to_port(const char *host, int port, int socket_flags = 0);
-  int bind_to_any_port(const char *host, int socket_flags = 0);
+  bool bind_to_port(const std::string &host, int port, int socket_flags = 0);
+  int bind_to_any_port(const std::string &host, int socket_flags = 0);
   bool listen_after_bind();
 
-  bool listen(const char *host, int port, int socket_flags = 0);
+  bool listen(const std::string &host, int port, int socket_flags = 0);
 
   bool is_running() const;
+  void wait_until_ready() const;
   void stop();
 
   std::function<TaskQueue *(void)> new_task_queue;
@@ -701,7 +922,7 @@ class Server {
                        bool &connection_closed,
                        const std::function<void(Request &)> &setup_request);
 
-  std::atomic<socket_t> svr_sock_;
+  std::atomic<socket_t> svr_sock_{INVALID_SOCKET};
   size_t keep_alive_max_count_ = CPPHTTPLIB_KEEPALIVE_MAX_COUNT;
   time_t keep_alive_timeout_sec_ = CPPHTTPLIB_KEEPALIVE_TIMEOUT_SECOND;
   time_t read_timeout_sec_ = CPPHTTPLIB_READ_TIMEOUT_SECOND;
@@ -713,28 +934,34 @@ class Server {
   size_t payload_max_length_ = CPPHTTPLIB_PAYLOAD_MAX_LENGTH;
 
 private:
-  using Handlers = std::vector<std::pair<std::regex, Handler>>;
+  using Handlers =
+      std::vector<std::pair<std::unique_ptr<detail::MatcherBase>, Handler>>;
   using HandlersForContentReader =
-      std::vector<std::pair<std::regex, HandlerWithContentReader>>;
+      std::vector<std::pair<std::unique_ptr<detail::MatcherBase>,
+                            HandlerWithContentReader>>;
+
+  static std::unique_ptr<detail::MatcherBase>
+  make_matcher(const std::string &pattern);
 
-  socket_t create_server_socket(const char *host, int port, int socket_flags,
+  socket_t create_server_socket(const std::string &host, int port,
+                                int socket_flags,
                                 SocketOptions socket_options) const;
-  int bind_internal(const char *host, int port, int socket_flags);
+  int bind_internal(const std::string &host, int port, int socket_flags);
   bool listen_internal();
 
   bool routing(Request &req, Response &res, Stream &strm);
   bool handle_file_request(const Request &req, Response &res,
                            bool head = false);
-  bool dispatch_request(Request &req, Response &res, const Handlers &handlers);
-  bool
-  dispatch_request_for_content_reader(Request &req, Response &res,
-                                      ContentReader content_reader,
-                                      const HandlersForContentReader &handlers);
+  bool dispatch_request(Request &req, Response &res,
+                        const Handlers &handlers) const;
+  bool dispatch_request_for_content_reader(
+      Request &req, Response &res, ContentReader content_reader,
+      const HandlersForContentReader &handlers) const;
 
-  bool parse_request_line(const char *s, Request &req);
+  bool parse_request_line(const char *s, Request &req) const;
   void apply_ranges(const Request &req, Response &res,
-                    std::string &content_type, std::string &boundary);
-  bool write_response(Stream &strm, bool close_connection, const Request &req,
+                    std::string &content_type, std::string &boundary) const;
+  bool write_response(Stream &strm, bool close_connection, Request &req,
                       Response &res);
   bool write_response_with_content(Stream &strm, bool close_connection,
                                    const Request &req, Response &res);
@@ -752,21 +979,24 @@ class Server {
                                      ContentReceiver multipart_receiver);
   bool read_content_core(Stream &strm, Request &req, Response &res,
                          ContentReceiver receiver,
-                         MultipartContentHeader mulitpart_header,
-                         ContentReceiver multipart_receiver);
+                         MultipartContentHeader multipart_header,
+                         ContentReceiver multipart_receiver) const;
 
   virtual bool process_and_close_socket(socket_t sock);
 
+  std::atomic<bool> is_running_{false};
+  std::atomic<bool> done_{false};
+
   struct MountPointEntry {
     std::string mount_point;
     std::string base_dir;
     Headers headers;
   };
   std::vector<MountPointEntry> base_dirs_;
-
-  std::atomic<bool> is_running_;
   std::map<std::string, std::string> file_extension_and_mimetype_map_;
+  std::string default_file_mimetype_ = "application/octet-stream";
   Handler file_request_handler_;
+
   Handlers get_handlers_;
   Handlers post_handlers_;
   HandlersForContentReader post_handlers_for_content_reader_;
@@ -777,18 +1007,22 @@ class Server {
   Handlers delete_handlers_;
   HandlersForContentReader delete_handlers_for_content_reader_;
   Handlers options_handlers_;
+
   HandlerWithResponse error_handler_;
   ExceptionHandler exception_handler_;
   HandlerWithResponse pre_routing_handler_;
   Handler post_routing_handler_;
-  Logger logger_;
   Expect100ContinueHandler expect_100_continue_handler_;
 
+  Logger logger_;
+
   int address_family_ = AF_UNSPEC;
   bool tcp_nodelay_ = CPPHTTPLIB_TCP_NODELAY;
   SocketOptions socket_options_ = default_socket_options;
 
   Headers default_headers_;
+  std::function<ssize_t(Stream &, Headers &)> header_writer_ =
+      detail::write_headers;
 };
 
 enum class Error {
@@ -806,14 +1040,19 @@ enum class Error {
   UnsupportedMultipartBoundaryChars,
   Compression,
   ConnectionTimeout,
+  ProxyConnection,
+
+  // For internal use only
+  SSLPeerCouldBeClosed_,
 };
 
-std::string to_string(const Error error);
+std::string to_string(Error error);
 
 std::ostream &operator<<(std::ostream &os, const Error &obj);
 
 class Result {
 public:
+  Result() = default;
   Result(std::unique_ptr<Response> &&res, Error err,
          Headers &&request_headers = Headers{})
       : res_(std::move(res)), err_(err),
@@ -833,15 +1072,16 @@ class Result {
   Error error() const { return err_; }
 
   // Request Headers
-  bool has_request_header(const char *key) const;
-  std::string get_request_header_value(const char *key, size_t id = 0) const;
-  template <typename T>
-  T get_request_header_value(const char *key, size_t id = 0) const;
-  size_t get_request_header_value_count(const char *key) const;
+  bool has_request_header(const std::string &key) const;
+  std::string get_request_header_value(const std::string &key,
+                                       size_t id = 0) const;
+  uint64_t get_request_header_value_u64(const std::string &key,
+                                        size_t id = 0) const;
+  size_t get_request_header_value_count(const std::string &key) const;
 
 private:
   std::unique_ptr<Response> res_;
-  Error err_;
+  Error err_ = Error::Unknown;
   Headers request_headers_;
 };
 
@@ -859,130 +1099,163 @@ class ClientImpl {
 
   virtual bool is_valid() const;
 
-  Result Get(const char *path);
-  Result Get(const char *path, const Headers &headers);
-  Result Get(const char *path, Progress progress);
-  Result Get(const char *path, const Headers &headers, Progress progress);
-  Result Get(const char *path, ContentReceiver content_receiver);
-  Result Get(const char *path, const Headers &headers,
+  Result Get(const std::string &path);
+  Result Get(const std::string &path, const Headers &headers);
+  Result Get(const std::string &path, Progress progress);
+  Result Get(const std::string &path, const Headers &headers,
+             Progress progress);
+  Result Get(const std::string &path, ContentReceiver content_receiver);
+  Result Get(const std::string &path, const Headers &headers,
              ContentReceiver content_receiver);
-  Result Get(const char *path, ContentReceiver content_receiver,
+  Result Get(const std::string &path, ContentReceiver content_receiver,
              Progress progress);
-  Result Get(const char *path, const Headers &headers,
+  Result Get(const std::string &path, const Headers &headers,
              ContentReceiver content_receiver, Progress progress);
-  Result Get(const char *path, ResponseHandler response_handler,
+  Result Get(const std::string &path, ResponseHandler response_handler,
              ContentReceiver content_receiver);
-  Result Get(const char *path, const Headers &headers,
+  Result Get(const std::string &path, const Headers &headers,
              ResponseHandler response_handler,
              ContentReceiver content_receiver);
-  Result Get(const char *path, ResponseHandler response_handler,
+  Result Get(const std::string &path, ResponseHandler response_handler,
              ContentReceiver content_receiver, Progress progress);
-  Result Get(const char *path, const Headers &headers,
+  Result Get(const std::string &path, const Headers &headers,
              ResponseHandler response_handler, ContentReceiver content_receiver,
              Progress progress);
 
-  Result Get(const char *path, const Params &params, const Headers &headers,
+  Result Get(const std::string &path, const Params &params,
+             const Headers &headers, Progress progress = nullptr);
+  Result Get(const std::string &path, const Params &params,
+             const Headers &headers, ContentReceiver content_receiver,
              Progress progress = nullptr);
-  Result Get(const char *path, const Params &params, const Headers &headers,
+  Result Get(const std::string &path, const Params &params,
+             const Headers &headers, ResponseHandler response_handler,
              ContentReceiver content_receiver, Progress progress = nullptr);
-  Result Get(const char *path, const Params &params, const Headers &headers,
-             ResponseHandler response_handler, ContentReceiver content_receiver,
-             Progress progress = nullptr);
 
-  Result Head(const char *path);
-  Result Head(const char *path, const Headers &headers);
-
-  Result Post(const char *path);
-  Result Post(const char *path, const char *body, size_t content_length,
-              const char *content_type);
-  Result Post(const char *path, const Headers &headers, const char *body,
-              size_t content_length, const char *content_type);
-  Result Post(const char *path, const std::string &body,
-              const char *content_type);
-  Result Post(const char *path, const Headers &headers, const std::string &body,
-              const char *content_type);
-  Result Post(const char *path, size_t content_length,
-              ContentProvider content_provider, const char *content_type);
-  Result Post(const char *path, ContentProviderWithoutLength content_provider,
-              const char *content_type);
-  Result Post(const char *path, const Headers &headers, size_t content_length,
-              ContentProvider content_provider, const char *content_type);
-  Result Post(const char *path, const Headers &headers,
+  Result Head(const std::string &path);
+  Result Head(const std::string &path, const Headers &headers);
+
+  Result Post(const std::string &path);
+  Result Post(const std::string &path, const Headers &headers);
+  Result Post(const std::string &path, const char *body, size_t content_length,
+              const std::string &content_type);
+  Result Post(const std::string &path, const Headers &headers, const char *body,
+              size_t content_length, const std::string &content_type);
+  Result Post(const std::string &path, const std::string &body,
+              const std::string &content_type);
+  Result Post(const std::string &path, const Headers &headers,
+              const std::string &body, const std::string &content_type);
+  Result Post(const std::string &path, size_t content_length,
+              ContentProvider content_provider,
+              const std::string &content_type);
+  Result Post(const std::string &path,
               ContentProviderWithoutLength content_provider,
-              const char *content_type);
-  Result Post(const char *path, const Params &params);
-  Result Post(const char *path, const Headers &headers, const Params &params);
-  Result Post(const char *path, const MultipartFormDataItems &items);
-  Result Post(const char *path, const Headers &headers,
+              const std::string &content_type);
+  Result Post(const std::string &path, const Headers &headers,
+              size_t content_length, ContentProvider content_provider,
+              const std::string &content_type);
+  Result Post(const std::string &path, const Headers &headers,
+              ContentProviderWithoutLength content_provider,
+              const std::string &content_type);
+  Result Post(const std::string &path, const Params &params);
+  Result Post(const std::string &path, const Headers &headers,
+              const Params &params);
+  Result Post(const std::string &path, const MultipartFormDataItems &items);
+  Result Post(const std::string &path, const Headers &headers,
               const MultipartFormDataItems &items);
-  Result Post(const char *path, const Headers &headers,
+  Result Post(const std::string &path, const Headers &headers,
               const MultipartFormDataItems &items, const std::string &boundary);
-
-  Result Put(const char *path);
-  Result Put(const char *path, const char *body, size_t content_length,
-             const char *content_type);
-  Result Put(const char *path, const Headers &headers, const char *body,
-             size_t content_length, const char *content_type);
-  Result Put(const char *path, const std::string &body,
-             const char *content_type);
-  Result Put(const char *path, const Headers &headers, const std::string &body,
-             const char *content_type);
-  Result Put(const char *path, size_t content_length,
-             ContentProvider content_provider, const char *content_type);
-  Result Put(const char *path, ContentProviderWithoutLength content_provider,
-             const char *content_type);
-  Result Put(const char *path, const Headers &headers, size_t content_length,
-             ContentProvider content_provider, const char *content_type);
-  Result Put(const char *path, const Headers &headers,
+  Result Post(const std::string &path, const Headers &headers,
+              const MultipartFormDataItems &items,
+              const MultipartFormDataProviderItems &provider_items);
+
+  Result Put(const std::string &path);
+  Result Put(const std::string &path, const char *body, size_t content_length,
+             const std::string &content_type);
+  Result Put(const std::string &path, const Headers &headers, const char *body,
+             size_t content_length, const std::string &content_type);
+  Result Put(const std::string &path, const std::string &body,
+             const std::string &content_type);
+  Result Put(const std::string &path, const Headers &headers,
+             const std::string &body, const std::string &content_type);
+  Result Put(const std::string &path, size_t content_length,
+             ContentProvider content_provider, const std::string &content_type);
+  Result Put(const std::string &path,
              ContentProviderWithoutLength content_provider,
-             const char *content_type);
-  Result Put(const char *path, const Params &params);
-  Result Put(const char *path, const Headers &headers, const Params &params);
-
-  Result Patch(const char *path);
-  Result Patch(const char *path, const char *body, size_t content_length,
-               const char *content_type);
-  Result Patch(const char *path, const Headers &headers, const char *body,
-               size_t content_length, const char *content_type);
-  Result Patch(const char *path, const std::string &body,
-               const char *content_type);
-  Result Patch(const char *path, const Headers &headers,
-               const std::string &body, const char *content_type);
-  Result Patch(const char *path, size_t content_length,
-               ContentProvider content_provider, const char *content_type);
-  Result Patch(const char *path, ContentProviderWithoutLength content_provider,
-               const char *content_type);
-  Result Patch(const char *path, const Headers &headers, size_t content_length,
-               ContentProvider content_provider, const char *content_type);
-  Result Patch(const char *path, const Headers &headers,
+             const std::string &content_type);
+  Result Put(const std::string &path, const Headers &headers,
+             size_t content_length, ContentProvider content_provider,
+             const std::string &content_type);
+  Result Put(const std::string &path, const Headers &headers,
+             ContentProviderWithoutLength content_provider,
+             const std::string &content_type);
+  Result Put(const std::string &path, const Params &params);
+  Result Put(const std::string &path, const Headers &headers,
+             const Params &params);
+  Result Put(const std::string &path, const MultipartFormDataItems &items);
+  Result Put(const std::string &path, const Headers &headers,
+             const MultipartFormDataItems &items);
+  Result Put(const std::string &path, const Headers &headers,
+             const MultipartFormDataItems &items, const std::string &boundary);
+  Result Put(const std::string &path, const Headers &headers,
+             const MultipartFormDataItems &items,
+             const MultipartFormDataProviderItems &provider_items);
+
+  Result Patch(const std::string &path);
+  Result Patch(const std::string &path, const char *body, size_t content_length,
+               const std::string &content_type);
+  Result Patch(const std::string &path, const Headers &headers,
+               const char *body, size_t content_length,
+               const std::string &content_type);
+  Result Patch(const std::string &path, const std::string &body,
+               const std::string &content_type);
+  Result Patch(const std::string &path, const Headers &headers,
+               const std::string &body, const std::string &content_type);
+  Result Patch(const std::string &path, size_t content_length,
+               ContentProvider content_provider,
+               const std::string &content_type);
+  Result Patch(const std::string &path,
+               ContentProviderWithoutLength content_provider,
+               const std::string &content_type);
+  Result Patch(const std::string &path, const Headers &headers,
+               size_t content_length, ContentProvider content_provider,
+               const std::string &content_type);
+  Result Patch(const std::string &path, const Headers &headers,
                ContentProviderWithoutLength content_provider,
-               const char *content_type);
-
-  Result Delete(const char *path);
-  Result Delete(const char *path, const Headers &headers);
-  Result Delete(const char *path, const char *body, size_t content_length,
-                const char *content_type);
-  Result Delete(const char *path, const Headers &headers, const char *body,
-                size_t content_length, const char *content_type);
-  Result Delete(const char *path, const std::string &body,
-                const char *content_type);
-  Result Delete(const char *path, const Headers &headers,
-                const std::string &body, const char *content_type);
-
-  Result Options(const char *path);
-  Result Options(const char *path, const Headers &headers);
+               const std::string &content_type);
+
+  Result Delete(const std::string &path);
+  Result Delete(const std::string &path, const Headers &headers);
+  Result Delete(const std::string &path, const char *body,
+                size_t content_length, const std::string &content_type);
+  Result Delete(const std::string &path, const Headers &headers,
+                const char *body, size_t content_length,
+                const std::string &content_type);
+  Result Delete(const std::string &path, const std::string &body,
+                const std::string &content_type);
+  Result Delete(const std::string &path, const Headers &headers,
+                const std::string &body, const std::string &content_type);
+
+  Result Options(const std::string &path);
+  Result Options(const std::string &path, const Headers &headers);
 
   bool send(Request &req, Response &res, Error &error);
   Result send(const Request &req);
 
-  size_t is_socket_open() const;
-
   void stop();
 
+  std::string host() const;
+  int port() const;
+
+  size_t is_socket_open() const;
+  socket_t socket() const;
+
   void set_hostname_addr_map(std::map<std::string, std::string> addr_map);
 
   void set_default_headers(Headers headers);
 
+  void
+  set_header_writer(std::function<ssize_t(Stream &, Headers &)> const &writer);
+
   void set_address_family(int family);
   void set_tcp_nodelay(bool on);
   void set_socket_options(SocketOptions socket_options);
@@ -1000,10 +1273,11 @@ class ClientImpl {
   template <class Rep, class Period>
   void set_write_timeout(const std::chrono::duration<Rep, Period> &duration);
 
-  void set_basic_auth(const char *username, const char *password);
-  void set_bearer_token_auth(const char *token);
+  void set_basic_auth(const std::string &username, const std::string &password);
+  void set_bearer_token_auth(const std::string &token);
 #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  void set_digest_auth(const char *username, const char *password);
+  void set_digest_auth(const std::string &username,
+                       const std::string &password);
 #endif
 
   void set_keep_alive(bool on);
@@ -1015,19 +1289,22 @@ class ClientImpl {
 
   void set_decompress(bool on);
 
-  void set_interface(const char *intf);
+  void set_interface(const std::string &intf);
 
-  void set_proxy(const char *host, int port);
-  void set_proxy_basic_auth(const char *username, const char *password);
-  void set_proxy_bearer_token_auth(const char *token);
+  void set_proxy(const std::string &host, int port);
+  void set_proxy_basic_auth(const std::string &username,
+                            const std::string &password);
+  void set_proxy_bearer_token_auth(const std::string &token);
 #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  void set_proxy_digest_auth(const char *username, const char *password);
+  void set_proxy_digest_auth(const std::string &username,
+                             const std::string &password);
 #endif
 
 #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  void set_ca_cert_path(const char *ca_cert_file_path,
-                        const char *ca_cert_dir_path = nullptr);
+  void set_ca_cert_path(const std::string &ca_cert_file_path,
+                        const std::string &ca_cert_dir_path = std::string());
   void set_ca_cert_store(X509_STORE *ca_cert_store);
+  X509_STORE *create_ca_cert_store(const char *ca_cert, std::size_t size) const;
 #endif
 
 #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
@@ -1046,8 +1323,6 @@ class ClientImpl {
     bool is_open() const { return sock != INVALID_SOCKET; }
   };
 
-  Result send_(Request &&req);
-
   virtual bool create_and_connect_socket(Socket &socket, Error &error);
 
   // All of:
@@ -1058,18 +1333,18 @@ class ClientImpl {
   // Also, shutdown_ssl and close_socket should also NOT be called concurrently
   // with a DIFFERENT thread sending requests using that socket.
   virtual void shutdown_ssl(Socket &socket, bool shutdown_gracefully);
-  void shutdown_socket(Socket &socket);
+  void shutdown_socket(Socket &socket) const;
   void close_socket(Socket &socket);
 
   bool process_request(Stream &strm, Request &req, Response &res,
                        bool close_connection, Error &error);
 
   bool write_content_with_provider(Stream &strm, const Request &req,
-                                   Error &error);
+                                   Error &error) const;
 
   void copy_settings(const ClientImpl &rhs);
 
-  // Socket endoint information
+  // Socket endpoint information
   const std::string host_;
   const int port_;
   const std::string host_and_port_;
@@ -1090,6 +1365,10 @@ class ClientImpl {
   // Default headers
   Headers default_headers_;
 
+  // Header writer
+  std::function<ssize_t(Stream &, Headers &)> header_writer_ =
+      detail::write_headers;
+
   // Settings
   std::string client_cert_path_;
   std::string client_key_path_;
@@ -1148,24 +1427,31 @@ class ClientImpl {
   Logger logger_;
 
 private:
+  bool send_(Request &req, Response &res, Error &error);
+  Result send_(Request &&req);
+
   socket_t create_client_socket(Error &error) const;
-  bool read_response_line(Stream &strm, const Request &req, Response &res);
+  bool read_response_line(Stream &strm, const Request &req,
+                          Response &res) const;
   bool write_request(Stream &strm, Request &req, bool close_connection,
                      Error &error);
   bool redirect(Request &req, Response &res, Error &error);
   bool handle_request(Stream &strm, Request &req, Response &res,
                       bool close_connection, Error &error);
   std::unique_ptr<Response> send_with_content_provider(
-      Request &req,
-      // const char *method, const char *path, const Headers &headers,
-      const char *body, size_t content_length, ContentProvider content_provider,
+      Request &req, const char *body, size_t content_length,
+      ContentProvider content_provider,
       ContentProviderWithoutLength content_provider_without_length,
-      const char *content_type, Error &error);
+      const std::string &content_type, Error &error);
   Result send_with_content_provider(
-      const char *method, const char *path, const Headers &headers,
-      const char *body, size_t content_length, ContentProvider content_provider,
+      const std::string &method, const std::string &path,
+      const Headers &headers, const char *body, size_t content_length,
+      ContentProvider content_provider,
       ContentProviderWithoutLength content_provider_without_length,
-      const char *content_type);
+      const std::string &content_type);
+  ContentProviderWithoutLength get_multipart_content_provider(
+      const std::string &boundary, const MultipartFormDataItems &items,
+      const MultipartFormDataProviderItems &provider_items) const;
 
   std::string adjust_host_string(const std::string &host) const;
 
@@ -1196,128 +1482,163 @@ class Client {
 
   bool is_valid() const;
 
-  Result Get(const char *path);
-  Result Get(const char *path, const Headers &headers);
-  Result Get(const char *path, Progress progress);
-  Result Get(const char *path, const Headers &headers, Progress progress);
-  Result Get(const char *path, ContentReceiver content_receiver);
-  Result Get(const char *path, const Headers &headers,
+  Result Get(const std::string &path);
+  Result Get(const std::string &path, const Headers &headers);
+  Result Get(const std::string &path, Progress progress);
+  Result Get(const std::string &path, const Headers &headers,
+             Progress progress);
+  Result Get(const std::string &path, ContentReceiver content_receiver);
+  Result Get(const std::string &path, const Headers &headers,
              ContentReceiver content_receiver);
-  Result Get(const char *path, ContentReceiver content_receiver,
+  Result Get(const std::string &path, ContentReceiver content_receiver,
              Progress progress);
-  Result Get(const char *path, const Headers &headers,
+  Result Get(const std::string &path, const Headers &headers,
              ContentReceiver content_receiver, Progress progress);
-  Result Get(const char *path, ResponseHandler response_handler,
+  Result Get(const std::string &path, ResponseHandler response_handler,
              ContentReceiver content_receiver);
-  Result Get(const char *path, const Headers &headers,
+  Result Get(const std::string &path, const Headers &headers,
              ResponseHandler response_handler,
              ContentReceiver content_receiver);
-  Result Get(const char *path, const Headers &headers,
+  Result Get(const std::string &path, const Headers &headers,
              ResponseHandler response_handler, ContentReceiver content_receiver,
              Progress progress);
-  Result Get(const char *path, ResponseHandler response_handler,
+  Result Get(const std::string &path, ResponseHandler response_handler,
              ContentReceiver content_receiver, Progress progress);
 
-  Result Get(const char *path, const Params &params, const Headers &headers,
+  Result Get(const std::string &path, const Params &params,
+             const Headers &headers, Progress progress = nullptr);
+  Result Get(const std::string &path, const Params &params,
+             const Headers &headers, ContentReceiver content_receiver,
              Progress progress = nullptr);
-  Result Get(const char *path, const Params &params, const Headers &headers,
+  Result Get(const std::string &path, const Params &params,
+             const Headers &headers, ResponseHandler response_handler,
              ContentReceiver content_receiver, Progress progress = nullptr);
-  Result Get(const char *path, const Params &params, const Headers &headers,
-             ResponseHandler response_handler, ContentReceiver content_receiver,
-             Progress progress = nullptr);
 
-  Result Head(const char *path);
-  Result Head(const char *path, const Headers &headers);
-
-  Result Post(const char *path);
-  Result Post(const char *path, const char *body, size_t content_length,
-              const char *content_type);
-  Result Post(const char *path, const Headers &headers, const char *body,
-              size_t content_length, const char *content_type);
-  Result Post(const char *path, const std::string &body,
-              const char *content_type);
-  Result Post(const char *path, const Headers &headers, const std::string &body,
-              const char *content_type);
-  Result Post(const char *path, size_t content_length,
-              ContentProvider content_provider, const char *content_type);
-  Result Post(const char *path, ContentProviderWithoutLength content_provider,
-              const char *content_type);
-  Result Post(const char *path, const Headers &headers, size_t content_length,
-              ContentProvider content_provider, const char *content_type);
-  Result Post(const char *path, const Headers &headers,
+  Result Head(const std::string &path);
+  Result Head(const std::string &path, const Headers &headers);
+
+  Result Post(const std::string &path);
+  Result Post(const std::string &path, const Headers &headers);
+  Result Post(const std::string &path, const char *body, size_t content_length,
+              const std::string &content_type);
+  Result Post(const std::string &path, const Headers &headers, const char *body,
+              size_t content_length, const std::string &content_type);
+  Result Post(const std::string &path, const std::string &body,
+              const std::string &content_type);
+  Result Post(const std::string &path, const Headers &headers,
+              const std::string &body, const std::string &content_type);
+  Result Post(const std::string &path, size_t content_length,
+              ContentProvider content_provider,
+              const std::string &content_type);
+  Result Post(const std::string &path,
+              ContentProviderWithoutLength content_provider,
+              const std::string &content_type);
+  Result Post(const std::string &path, const Headers &headers,
+              size_t content_length, ContentProvider content_provider,
+              const std::string &content_type);
+  Result Post(const std::string &path, const Headers &headers,
               ContentProviderWithoutLength content_provider,
-              const char *content_type);
-  Result Post(const char *path, const Params &params);
-  Result Post(const char *path, const Headers &headers, const Params &params);
-  Result Post(const char *path, const MultipartFormDataItems &items);
-  Result Post(const char *path, const Headers &headers,
+              const std::string &content_type);
+  Result Post(const std::string &path, const Params &params);
+  Result Post(const std::string &path, const Headers &headers,
+              const Params &params);
+  Result Post(const std::string &path, const MultipartFormDataItems &items);
+  Result Post(const std::string &path, const Headers &headers,
               const MultipartFormDataItems &items);
-  Result Post(const char *path, const Headers &headers,
+  Result Post(const std::string &path, const Headers &headers,
               const MultipartFormDataItems &items, const std::string &boundary);
-  Result Put(const char *path);
-  Result Put(const char *path, const char *body, size_t content_length,
-             const char *content_type);
-  Result Put(const char *path, const Headers &headers, const char *body,
-             size_t content_length, const char *content_type);
-  Result Put(const char *path, const std::string &body,
-             const char *content_type);
-  Result Put(const char *path, const Headers &headers, const std::string &body,
-             const char *content_type);
-  Result Put(const char *path, size_t content_length,
-             ContentProvider content_provider, const char *content_type);
-  Result Put(const char *path, ContentProviderWithoutLength content_provider,
-             const char *content_type);
-  Result Put(const char *path, const Headers &headers, size_t content_length,
-             ContentProvider content_provider, const char *content_type);
-  Result Put(const char *path, const Headers &headers,
+  Result Post(const std::string &path, const Headers &headers,
+              const MultipartFormDataItems &items,
+              const MultipartFormDataProviderItems &provider_items);
+
+  Result Put(const std::string &path);
+  Result Put(const std::string &path, const char *body, size_t content_length,
+             const std::string &content_type);
+  Result Put(const std::string &path, const Headers &headers, const char *body,
+             size_t content_length, const std::string &content_type);
+  Result Put(const std::string &path, const std::string &body,
+             const std::string &content_type);
+  Result Put(const std::string &path, const Headers &headers,
+             const std::string &body, const std::string &content_type);
+  Result Put(const std::string &path, size_t content_length,
+             ContentProvider content_provider, const std::string &content_type);
+  Result Put(const std::string &path,
              ContentProviderWithoutLength content_provider,
-             const char *content_type);
-  Result Put(const char *path, const Params &params);
-  Result Put(const char *path, const Headers &headers, const Params &params);
-  Result Patch(const char *path);
-  Result Patch(const char *path, const char *body, size_t content_length,
-               const char *content_type);
-  Result Patch(const char *path, const Headers &headers, const char *body,
-               size_t content_length, const char *content_type);
-  Result Patch(const char *path, const std::string &body,
-               const char *content_type);
-  Result Patch(const char *path, const Headers &headers,
-               const std::string &body, const char *content_type);
-  Result Patch(const char *path, size_t content_length,
-               ContentProvider content_provider, const char *content_type);
-  Result Patch(const char *path, ContentProviderWithoutLength content_provider,
-               const char *content_type);
-  Result Patch(const char *path, const Headers &headers, size_t content_length,
-               ContentProvider content_provider, const char *content_type);
-  Result Patch(const char *path, const Headers &headers,
+             const std::string &content_type);
+  Result Put(const std::string &path, const Headers &headers,
+             size_t content_length, ContentProvider content_provider,
+             const std::string &content_type);
+  Result Put(const std::string &path, const Headers &headers,
+             ContentProviderWithoutLength content_provider,
+             const std::string &content_type);
+  Result Put(const std::string &path, const Params &params);
+  Result Put(const std::string &path, const Headers &headers,
+             const Params &params);
+  Result Put(const std::string &path, const MultipartFormDataItems &items);
+  Result Put(const std::string &path, const Headers &headers,
+             const MultipartFormDataItems &items);
+  Result Put(const std::string &path, const Headers &headers,
+             const MultipartFormDataItems &items, const std::string &boundary);
+  Result Put(const std::string &path, const Headers &headers,
+             const MultipartFormDataItems &items,
+             const MultipartFormDataProviderItems &provider_items);
+
+  Result Patch(const std::string &path);
+  Result Patch(const std::string &path, const char *body, size_t content_length,
+               const std::string &content_type);
+  Result Patch(const std::string &path, const Headers &headers,
+               const char *body, size_t content_length,
+               const std::string &content_type);
+  Result Patch(const std::string &path, const std::string &body,
+               const std::string &content_type);
+  Result Patch(const std::string &path, const Headers &headers,
+               const std::string &body, const std::string &content_type);
+  Result Patch(const std::string &path, size_t content_length,
+               ContentProvider content_provider,
+               const std::string &content_type);
+  Result Patch(const std::string &path,
+               ContentProviderWithoutLength content_provider,
+               const std::string &content_type);
+  Result Patch(const std::string &path, const Headers &headers,
+               size_t content_length, ContentProvider content_provider,
+               const std::string &content_type);
+  Result Patch(const std::string &path, const Headers &headers,
                ContentProviderWithoutLength content_provider,
-               const char *content_type);
-
-  Result Delete(const char *path);
-  Result Delete(const char *path, const Headers &headers);
-  Result Delete(const char *path, const char *body, size_t content_length,
-                const char *content_type);
-  Result Delete(const char *path, const Headers &headers, const char *body,
-                size_t content_length, const char *content_type);
-  Result Delete(const char *path, const std::string &body,
-                const char *content_type);
-  Result Delete(const char *path, const Headers &headers,
-                const std::string &body, const char *content_type);
-
-  Result Options(const char *path);
-  Result Options(const char *path, const Headers &headers);
+               const std::string &content_type);
+
+  Result Delete(const std::string &path);
+  Result Delete(const std::string &path, const Headers &headers);
+  Result Delete(const std::string &path, const char *body,
+                size_t content_length, const std::string &content_type);
+  Result Delete(const std::string &path, const Headers &headers,
+                const char *body, size_t content_length,
+                const std::string &content_type);
+  Result Delete(const std::string &path, const std::string &body,
+                const std::string &content_type);
+  Result Delete(const std::string &path, const Headers &headers,
+                const std::string &body, const std::string &content_type);
+
+  Result Options(const std::string &path);
+  Result Options(const std::string &path, const Headers &headers);
 
   bool send(Request &req, Response &res, Error &error);
   Result send(const Request &req);
 
-  size_t is_socket_open() const;
-
   void stop();
 
+  std::string host() const;
+  int port() const;
+
+  size_t is_socket_open() const;
+  socket_t socket() const;
+
   void set_hostname_addr_map(std::map<std::string, std::string> addr_map);
 
   void set_default_headers(Headers headers);
 
+  void
+  set_header_writer(std::function<ssize_t(Stream &, Headers &)> const &writer);
+
   void set_address_family(int family);
   void set_tcp_nodelay(bool on);
   void set_socket_options(SocketOptions socket_options);
@@ -1335,10 +1656,11 @@ class Client {
   template <class Rep, class Period>
   void set_write_timeout(const std::chrono::duration<Rep, Period> &duration);
 
-  void set_basic_auth(const char *username, const char *password);
-  void set_bearer_token_auth(const char *token);
+  void set_basic_auth(const std::string &username, const std::string &password);
+  void set_bearer_token_auth(const std::string &token);
 #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  void set_digest_auth(const char *username, const char *password);
+  void set_digest_auth(const std::string &username,
+                       const std::string &password);
 #endif
 
   void set_keep_alive(bool on);
@@ -1350,13 +1672,15 @@ class Client {
 
   void set_decompress(bool on);
 
-  void set_interface(const char *intf);
+  void set_interface(const std::string &intf);
 
-  void set_proxy(const char *host, int port);
-  void set_proxy_basic_auth(const char *username, const char *password);
-  void set_proxy_bearer_token_auth(const char *token);
+  void set_proxy(const std::string &host, int port);
+  void set_proxy_basic_auth(const std::string &username,
+                            const std::string &password);
+  void set_proxy_bearer_token_auth(const std::string &token);
 #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  void set_proxy_digest_auth(const char *username, const char *password);
+  void set_proxy_digest_auth(const std::string &username,
+                             const std::string &password);
 #endif
 
 #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
@@ -1367,10 +1691,11 @@ class Client {
 
   // SSL
 #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  void set_ca_cert_path(const char *ca_cert_file_path,
-                        const char *ca_cert_dir_path = nullptr);
+  void set_ca_cert_path(const std::string &ca_cert_file_path,
+                        const std::string &ca_cert_dir_path = std::string());
 
   void set_ca_cert_store(X509_STORE *ca_cert_store);
+  void load_ca_cert_store(const char *ca_cert, std::size_t size);
 
   long get_openssl_verify_result() const;
 
@@ -1430,6 +1755,7 @@ class SSLClient : public ClientImpl {
   bool is_valid() const override;
 
   void set_ca_cert_store(X509_STORE *ca_cert_store);
+  void load_ca_cert_store(const char *ca_cert, std::size_t size);
 
   long get_openssl_verify_result() const;
 
@@ -1438,7 +1764,7 @@ class SSLClient : public ClientImpl {
 private:
   bool create_and_connect_socket(Socket &socket, Error &error) override;
   void shutdown_ssl(Socket &socket, bool shutdown_gracefully) override;
-  void shutdown_ssl_impl(Socket &socket, bool shutdown_socket);
+  void shutdown_ssl_impl(Socket &socket, bool shutdown_gracefully);
 
   bool process_socket(const Socket &socket,
                       std::function<bool(Stream &strm)> callback) override;
@@ -1479,17 +1805,12 @@ inline void duration_to_sec_and_usec(const T &duration, U callback) {
   auto usec = std::chrono::duration_cast<std::chrono::microseconds>(
                   duration - std::chrono::seconds(sec))
                   .count();
-  callback(sec, usec);
+  callback(static_cast<time_t>(sec), static_cast<time_t>(usec));
 }
 
-template <typename T>
-inline T get_header_value(const Headers & /*headers*/, const char * /*key*/,
-                          size_t /*id*/ = 0, uint64_t /*def*/ = 0) {}
-
-template <>
-inline uint64_t get_header_value<uint64_t>(const Headers &headers,
-                                           const char *key, size_t id,
-                                           uint64_t def) {
+inline uint64_t get_header_value_u64(const Headers &headers,
+                                     const std::string &key, size_t id,
+                                     uint64_t def) {
   auto rng = headers.equal_range(key);
   auto it = rng.first;
   std::advance(it, static_cast<ssize_t>(id));
@@ -1501,14 +1822,14 @@ inline uint64_t get_header_value<uint64_t>(const Headers &headers,
 
 } // namespace detail
 
-template <typename T>
-inline T Request::get_header_value(const char *key, size_t id) const {
-  return detail::get_header_value<T>(headers, key, id, 0);
+inline uint64_t Request::get_header_value_u64(const std::string &key,
+                                              size_t id) const {
+  return detail::get_header_value_u64(headers, key, id, 0);
 }
 
-template <typename T>
-inline T Response::get_header_value(const char *key, size_t id) const {
-  return detail::get_header_value<T>(headers, key, id, 0);
+inline uint64_t Response::get_header_value_u64(const std::string &key,
+                                               size_t id) const {
+  return detail::get_header_value_u64(headers, key, id, 0);
 }
 
 template <typename... Args>
@@ -1516,11 +1837,7 @@ inline ssize_t Stream::write_format(const char *fmt, const Args &...args) {
   const auto bufsiz = 2048;
   std::array<char, bufsiz> buf{};
 
-#if defined(_MSC_VER) && _MSC_VER < 1900
-  auto sn = _snprintf_s(buf.data(), bufsiz, _TRUNCATE, fmt, args...);
-#else
   auto sn = snprintf(buf.data(), buf.size() - 1, fmt, args...);
-#endif
   if (sn <= 0) { return sn; }
 
   auto n = static_cast<size_t>(sn);
@@ -1530,14 +1847,8 @@ inline ssize_t Stream::write_format(const char *fmt, const Args &...args) {
 
     while (n >= glowable_buf.size() - 1) {
       glowable_buf.resize(glowable_buf.size() * 2);
-#if defined(_MSC_VER) && _MSC_VER < 1900
-      n = static_cast<size_t>(_snprintf_s(&glowable_buf[0], glowable_buf.size(),
-                                          glowable_buf.size() - 1, fmt,
-                                          args...));
-#else
       n = static_cast<size_t>(
           snprintf(&glowable_buf[0], glowable_buf.size() - 1, fmt, args...));
-#endif
     }
     return write(&glowable_buf[0], n);
   } else {
@@ -1548,21 +1859,106 @@ inline ssize_t Stream::write_format(const char *fmt, const Args &...args) {
 inline void default_socket_options(socket_t sock) {
   int yes = 1;
 #ifdef _WIN32
-  setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, reinterpret_cast<char *>(&yes),
-             sizeof(yes));
+  setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
+             reinterpret_cast<const char *>(&yes), sizeof(yes));
   setsockopt(sock, SOL_SOCKET, SO_EXCLUSIVEADDRUSE,
-             reinterpret_cast<char *>(&yes), sizeof(yes));
+             reinterpret_cast<const char *>(&yes), sizeof(yes));
 #else
 #ifdef SO_REUSEPORT
-  setsockopt(sock, SOL_SOCKET, SO_REUSEPORT, reinterpret_cast<void *>(&yes),
-             sizeof(yes));
+  setsockopt(sock, SOL_SOCKET, SO_REUSEPORT,
+             reinterpret_cast<const void *>(&yes), sizeof(yes));
 #else
-  setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, reinterpret_cast<void *>(&yes),
-             sizeof(yes));
+  setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
+             reinterpret_cast<const void *>(&yes), sizeof(yes));
 #endif
 #endif
 }
 
+inline const char *status_message(int status) {
+  switch (status) {
+  case StatusCode::Continue_100: return "Continue";
+  case StatusCode::SwitchingProtocol_101: return "Switching Protocol";
+  case StatusCode::Processing_102: return "Processing";
+  case StatusCode::EarlyHints_103: return "Early Hints";
+  case StatusCode::OK_200: return "OK";
+  case StatusCode::Created_201: return "Created";
+  case StatusCode::Accepted_202: return "Accepted";
+  case StatusCode::NonAuthoritativeInformation_203:
+    return "Non-Authoritative Information";
+  case StatusCode::NoContent_204: return "No Content";
+  case StatusCode::ResetContent_205: return "Reset Content";
+  case StatusCode::PartialContent_206: return "Partial Content";
+  case StatusCode::MultiStatus_207: return "Multi-Status";
+  case StatusCode::AlreadyReported_208: return "Already Reported";
+  case StatusCode::IMUsed_226: return "IM Used";
+  case StatusCode::MultipleChoices_300: return "Multiple Choices";
+  case StatusCode::MovedPermanently_301: return "Moved Permanently";
+  case StatusCode::Found_302: return "Found";
+  case StatusCode::SeeOther_303: return "See Other";
+  case StatusCode::NotModified_304: return "Not Modified";
+  case StatusCode::UseProxy_305: return "Use Proxy";
+  case StatusCode::unused_306: return "unused";
+  case StatusCode::TemporaryRedirect_307: return "Temporary Redirect";
+  case StatusCode::PermanentRedirect_308: return "Permanent Redirect";
+  case StatusCode::BadRequest_400: return "Bad Request";
+  case StatusCode::Unauthorized_401: return "Unauthorized";
+  case StatusCode::PaymentRequired_402: return "Payment Required";
+  case StatusCode::Forbidden_403: return "Forbidden";
+  case StatusCode::NotFound_404: return "Not Found";
+  case StatusCode::MethodNotAllowed_405: return "Method Not Allowed";
+  case StatusCode::NotAcceptable_406: return "Not Acceptable";
+  case StatusCode::ProxyAuthenticationRequired_407:
+    return "Proxy Authentication Required";
+  case StatusCode::RequestTimeout_408: return "Request Timeout";
+  case StatusCode::Conflict_409: return "Conflict";
+  case StatusCode::Gone_410: return "Gone";
+  case StatusCode::LengthRequired_411: return "Length Required";
+  case StatusCode::PreconditionFailed_412: return "Precondition Failed";
+  case StatusCode::PayloadTooLarge_413: return "Payload Too Large";
+  case StatusCode::UriTooLong_414: return "URI Too Long";
+  case StatusCode::UnsupportedMediaType_415: return "Unsupported Media Type";
+  case StatusCode::RangeNotSatisfiable_416: return "Range Not Satisfiable";
+  case StatusCode::ExpectationFailed_417: return "Expectation Failed";
+  case StatusCode::ImATeapot_418: return "I'm a teapot";
+  case StatusCode::MisdirectedRequest_421: return "Misdirected Request";
+  case StatusCode::UnprocessableContent_422: return "Unprocessable Content";
+  case StatusCode::Locked_423: return "Locked";
+  case StatusCode::FailedDependency_424: return "Failed Dependency";
+  case StatusCode::TooEarly_425: return "Too Early";
+  case StatusCode::UpgradeRequired_426: return "Upgrade Required";
+  case StatusCode::PreconditionRequired_428: return "Precondition Required";
+  case StatusCode::TooManyRequests_429: return "Too Many Requests";
+  case StatusCode::RequestHeaderFieldsTooLarge_431:
+    return "Request Header Fields Too Large";
+  case StatusCode::UnavailableForLegalReasons_451:
+    return "Unavailable For Legal Reasons";
+  case StatusCode::NotImplemented_501: return "Not Implemented";
+  case StatusCode::BadGateway_502: return "Bad Gateway";
+  case StatusCode::ServiceUnavailable_503: return "Service Unavailable";
+  case StatusCode::GatewayTimeout_504: return "Gateway Timeout";
+  case StatusCode::HttpVersionNotSupported_505:
+    return "HTTP Version Not Supported";
+  case StatusCode::VariantAlsoNegotiates_506: return "Variant Also Negotiates";
+  case StatusCode::InsufficientStorage_507: return "Insufficient Storage";
+  case StatusCode::LoopDetected_508: return "Loop Detected";
+  case StatusCode::NotExtended_510: return "Not Extended";
+  case StatusCode::NetworkAuthenticationRequired_511:
+    return "Network Authentication Required";
+
+  default:
+  case StatusCode::InternalServerError_500: return "Internal Server Error";
+  }
+}
+
+inline std::string get_bearer_token_auth(const Request &req) {
+  if (req.has_header("Authorization")) {
+    static std::string BearerHeaderPrefix = "Bearer ";
+    return req.get_header_value("Authorization")
+        .substr(BearerHeaderPrefix.length());
+  }
+  return "";
+}
+
 template <class Rep, class Period>
 inline Server &
 Server::set_read_timeout(const std::chrono::duration<Rep, Period> &duration) {
@@ -1589,20 +1985,21 @@ Server::set_idle_interval(const std::chrono::duration<Rep, Period> &duration) {
 
 inline std::string to_string(const Error error) {
   switch (error) {
-  case Error::Success: return "Success";
-  case Error::Connection: return "Connection";
-  case Error::BindIPAddress: return "BindIPAddress";
-  case Error::Read: return "Read";
-  case Error::Write: return "Write";
-  case Error::ExceedRedirectCount: return "ExceedRedirectCount";
-  case Error::Canceled: return "Canceled";
-  case Error::SSLConnection: return "SSLConnection";
-  case Error::SSLLoadingCerts: return "SSLLoadingCerts";
-  case Error::SSLServerVerification: return "SSLServerVerification";
+  case Error::Success: return "Success (no error)";
+  case Error::Connection: return "Could not establish connection";
+  case Error::BindIPAddress: return "Failed to bind IP address";
+  case Error::Read: return "Failed to read connection";
+  case Error::Write: return "Failed to write connection";
+  case Error::ExceedRedirectCount: return "Maximum redirect count exceeded";
+  case Error::Canceled: return "Connection handling canceled";
+  case Error::SSLConnection: return "SSL connection failed";
+  case Error::SSLLoadingCerts: return "SSL certificate loading failed";
+  case Error::SSLServerVerification: return "SSL server verification failed";
   case Error::UnsupportedMultipartBoundaryChars:
-    return "UnsupportedMultipartBoundaryChars";
-  case Error::Compression: return "Compression";
-  case Error::ConnectionTimeout: return "ConnectionTimeout";
+    return "Unsupported HTTP multipart boundary characters";
+  case Error::Compression: return "Compression failed";
+  case Error::ConnectionTimeout: return "Connection timed out";
+  case Error::ProxyConnection: return "Proxy connection failed";
   case Error::Unknown: return "Unknown";
   default: break;
   }
@@ -1616,9 +2013,9 @@ inline std::ostream &operator<<(std::ostream &os, const Error &obj) {
   return os;
 }
 
-template <typename T>
-inline T Result::get_request_header_value(const char *key, size_t id) const {
-  return detail::get_header_value<T>(request_headers_, key, id, 0);
+inline uint64_t Result::get_request_header_value_u64(const std::string &key,
+                                                     size_t id) const {
+  return detail::get_header_value_u64(request_headers_, key, id, 0);
 }
 
 template <class Rep, class Period>
@@ -1666,13 +2063,13 @@ Client::set_write_timeout(const std::chrono::duration<Rep, Period> &duration) {
  * .h + .cc.
  */
 
-std::string hosted_at(const char *hostname);
+std::string hosted_at(const std::string &hostname);
 
-void hosted_at(const char *hostname, std::vector<std::string> &addrs);
+void hosted_at(const std::string &hostname, std::vector<std::string> &addrs);
 
-std::string append_query_params(const char *path, const Params &params);
+std::string append_query_params(const std::string &path, const Params &params);
 
-std::pair<std::string, std::string> make_range_header(Ranges ranges);
+std::pair<std::string, std::string> make_range_header(const Ranges &ranges);
 
 std::pair<std::string, std::string>
 make_basic_authentication_header(const std::string &username,
@@ -1692,25 +2089,31 @@ std::string trim_copy(const std::string &s);
 void split(const char *b, const char *e, char d,
            std::function<void(const char *, const char *)> fn);
 
+void split(const char *b, const char *e, char d, size_t m,
+           std::function<void(const char *, const char *)> fn);
+
 bool process_client_socket(socket_t sock, time_t read_timeout_sec,
                            time_t read_timeout_usec, time_t write_timeout_sec,
                            time_t write_timeout_usec,
                            std::function<bool(Stream &)> callback);
 
 socket_t create_client_socket(
-    const char *host, const char *ip, int port, int address_family,
-    bool tcp_nodelay, SocketOptions socket_options,
+    const std::string &host, const std::string &ip, int port,
+    int address_family, bool tcp_nodelay, SocketOptions socket_options,
     time_t connection_timeout_sec, time_t connection_timeout_usec,
     time_t read_timeout_sec, time_t read_timeout_usec, time_t write_timeout_sec,
     time_t write_timeout_usec, const std::string &intf, Error &error);
 
-const char *get_header_value(const Headers &headers, const char *key,
+const char *get_header_value(const Headers &headers, const std::string &key,
                              size_t id = 0, const char *def = nullptr);
 
 std::string params_to_query_str(const Params &params);
 
 void parse_query_text(const std::string &s, Params &params);
 
+bool parse_multipart_boundary(const std::string &content_type,
+                              std::string &boundary);
+
 bool parse_range_header(const std::string &s, Ranges &ranges);
 
 int close_socket(socket_t sock);
@@ -1733,6 +2136,7 @@ class BufferStream : public Stream {
   ssize_t read(char *ptr, size_t size) override;
   ssize_t write(const char *ptr, size_t size) override;
   void get_remote_ip_and_port(std::string &ip, int &port) const override;
+  void get_local_ip_and_port(std::string &ip, int &port) const override;
   socket_t socket() const override;
 
   const std::string &get_buffer() const;
@@ -1764,7 +2168,7 @@ class decompressor {
 
 class nocompressor : public compressor {
 public:
-  virtual ~nocompressor() = default;
+  ~nocompressor() override = default;
 
   bool compress(const char *data, size_t data_length, bool /*last*/,
                 Callback callback) override;
@@ -1774,7 +2178,7 @@ class nocompressor : public compressor {
 class gzip_compressor : public compressor {
 public:
   gzip_compressor();
-  ~gzip_compressor();
+  ~gzip_compressor() override;
 
   bool compress(const char *data, size_t data_length, bool last,
                 Callback callback) override;
@@ -1787,7 +2191,7 @@ class gzip_compressor : public compressor {
 class gzip_decompressor : public decompressor {
 public:
   gzip_decompressor();
-  ~gzip_decompressor();
+  ~gzip_decompressor() override;
 
   bool is_valid() const override;
 
@@ -1850,6 +2254,29 @@ class stream_line_reader {
   std::string glowable_buffer_;
 };
 
+class mmap {
+public:
+  mmap(const char *path);
+  ~mmap();
+
+  bool open(const char *path);
+  void close();
+
+  bool is_open() const;
+  size_t size() const;
+  const char *data() const;
+
+private:
+#if defined(_WIN32)
+  HANDLE hFile_;
+  HANDLE hMapping_;
+#else
+  int fd_;
+#endif
+  size_t size_;
+  void *addr_;
+};
+
 } // namespace detail
 
 // ----------------------------------------------------------------------------
@@ -1881,7 +2308,7 @@ inline bool from_hex_to_i(const std::string &s, size_t i, size_t cnt,
   val = 0;
   for (; cnt; i++, cnt--) {
     if (!s[i]) { return false; }
-    int v = 0;
+    auto v = 0;
     if (is_hex(s[i], v)) {
       val = val * 16 + v;
     } else {
@@ -1892,7 +2319,7 @@ inline bool from_hex_to_i(const std::string &s, size_t i, size_t cnt,
 }
 
 inline std::string from_i_to_hex(size_t n) {
-  const char *charset = "0123456789abcdef";
+  static const auto charset = "0123456789abcdef";
   std::string ret;
   do {
     ret = charset[n & 15] + ret;
@@ -1903,7 +2330,7 @@ inline std::string from_i_to_hex(size_t n) {
 
 inline size_t to_utf8(int code, char *buff) {
   if (code < 0x0080) {
-    buff[0] = (code & 0x7F);
+    buff[0] = static_cast<char>(code & 0x7F);
     return 1;
   } else if (code < 0x0800) {
     buff[0] = static_cast<char>(0xC0 | ((code >> 6) & 0x1F));
@@ -1942,8 +2369,8 @@ inline std::string base64_encode(const std::string &in) {
   std::string out;
   out.reserve(in.size());
 
-  int val = 0;
-  int valb = -6;
+  auto val = 0;
+  auto valb = -6;
 
   for (auto c : in) {
     val = (val << 8) + static_cast<uint8_t>(c);
@@ -1990,6 +2417,11 @@ inline bool is_valid_path(const std::string &path) {
     // Read component
     auto beg = i;
     while (i < path.size() && path[i] != '/') {
+      if (path[i] == '\0') {
+        return false;
+      } else if (path[i] == '\\') {
+        return false;
+      }
       i++;
     }
 
@@ -2074,7 +2506,7 @@ inline std::string decode_url(const std::string &s,
   for (size_t i = 0; i < s.size(); i++) {
     if (s[i] == '%' && i + 1 < s.size()) {
       if (s[i + 1] == 'u') {
-        int val = 0;
+        auto val = 0;
         if (from_hex_to_i(s, i + 2, 4, val)) {
           // 4 digits Unicode codes
           char buff[4];
@@ -2085,7 +2517,7 @@ inline std::string decode_url(const std::string &s,
           result += s[i];
         }
       } else {
-        int val = 0;
+        auto val = 0;
         if (from_hex_to_i(s, i + 1, 2, val)) {
           // 2 digits hex codes
           result += static_cast<char>(val);
@@ -2138,16 +2570,30 @@ inline std::string trim_copy(const std::string &s) {
   return s.substr(r.first, r.second - r.first);
 }
 
+inline std::string trim_double_quotes_copy(const std::string &s) {
+  if (s.length() >= 2 && s.front() == '"' && s.back() == '"') {
+    return s.substr(1, s.size() - 2);
+  }
+  return s;
+}
+
 inline void split(const char *b, const char *e, char d,
                   std::function<void(const char *, const char *)> fn) {
+  return split(b, e, d, (std::numeric_limits<size_t>::max)(), std::move(fn));
+}
+
+inline void split(const char *b, const char *e, char d, size_t m,
+                  std::function<void(const char *, const char *)> fn) {
   size_t i = 0;
   size_t beg = 0;
+  size_t count = 1;
 
   while (e ? (b + i < e) : (b[i] != '\0')) {
-    if (b[i] == d) {
+    if (b[i] == d && count < m) {
       auto r = trim(b, e, beg, i);
       if (r.first < r.second) { fn(&b[r.first], &b[r.second]); }
       beg = i + 1;
+      count++;
     }
     i++;
   }
@@ -2223,6 +2669,97 @@ inline void stream_line_reader::append(char c) {
   }
 }
 
+inline mmap::mmap(const char *path)
+#if defined(_WIN32)
+    : hFile_(NULL), hMapping_(NULL)
+#else
+    : fd_(-1)
+#endif
+      ,
+      size_(0), addr_(nullptr) {
+  open(path);
+}
+
+inline mmap::~mmap() { close(); }
+
+inline bool mmap::open(const char *path) {
+  close();
+
+#if defined(_WIN32)
+  hFile_ = ::CreateFileA(path, GENERIC_READ, FILE_SHARE_READ, NULL,
+                         OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+
+  if (hFile_ == INVALID_HANDLE_VALUE) { return false; }
+
+  size_ = ::GetFileSize(hFile_, NULL);
+
+  hMapping_ = ::CreateFileMapping(hFile_, NULL, PAGE_READONLY, 0, 0, NULL);
+
+  if (hMapping_ == NULL) {
+    close();
+    return false;
+  }
+
+  addr_ = ::MapViewOfFile(hMapping_, FILE_MAP_READ, 0, 0, 0);
+#else
+  fd_ = ::open(path, O_RDONLY);
+  if (fd_ == -1) { return false; }
+
+  struct stat sb;
+  if (fstat(fd_, &sb) == -1) {
+    close();
+    return false;
+  }
+  size_ = static_cast<size_t>(sb.st_size);
+
+  addr_ = ::mmap(NULL, size_, PROT_READ, MAP_PRIVATE, fd_, 0);
+#endif
+
+  if (addr_ == nullptr) {
+    close();
+    return false;
+  }
+
+  return true;
+}
+
+inline bool mmap::is_open() const { return addr_ != nullptr; }
+
+inline size_t mmap::size() const { return size_; }
+
+inline const char *mmap::data() const {
+  return static_cast<const char *>(addr_);
+}
+
+inline void mmap::close() {
+#if defined(_WIN32)
+  if (addr_) {
+    ::UnmapViewOfFile(addr_);
+    addr_ = nullptr;
+  }
+
+  if (hMapping_) {
+    ::CloseHandle(hMapping_);
+    hMapping_ = NULL;
+  }
+
+  if (hFile_ != INVALID_HANDLE_VALUE) {
+    ::CloseHandle(hFile_);
+    hFile_ = INVALID_HANDLE_VALUE;
+  }
+#else
+  if (addr_ != nullptr) {
+    munmap(addr_, size_);
+    addr_ = nullptr;
+  }
+
+  if (fd_ != -1) {
+    ::close(fd_);
+    fd_ = -1;
+  }
+#endif
+  size_ = 0;
+}
 inline int close_socket(socket_t sock) {
 #ifdef _WIN32
   return closesocket(sock);
@@ -2232,7 +2769,7 @@ inline int close_socket(socket_t sock) {
 }
 
 template <typename T> inline ssize_t handle_EINTR(T fn) {
-  ssize_t res = false;
+  ssize_t res = 0;
   while (true) {
     res = fn();
     if (res < 0 && errno == EINTR) { continue; }
@@ -2277,7 +2814,7 @@ inline ssize_t select_read(socket_t sock, time_t sec, time_t usec) {
   return handle_EINTR([&]() { return poll(&pfd_read, 1, timeout); });
 #else
 #ifndef _WIN32
-  if (sock >= FD_SETSIZE) { return 1; }
+  if (sock >= FD_SETSIZE) { return -1; }
 #endif
 
   fd_set fds;
@@ -2305,7 +2842,7 @@ inline ssize_t select_write(socket_t sock, time_t sec, time_t usec) {
   return handle_EINTR([&]() { return poll(&pfd_read, 1, timeout); });
 #else
 #ifndef _WIN32
-  if (sock >= FD_SETSIZE) { return 1; }
+  if (sock >= FD_SETSIZE) { return -1; }
 #endif
 
   fd_set fds;
@@ -2336,7 +2873,7 @@ inline Error wait_until_socket_is_ready(socket_t sock, time_t sec,
   if (poll_res == 0) { return Error::ConnectionTimeout; }
 
   if (poll_res > 0 && pfd_read.revents & (POLLIN | POLLOUT)) {
-    int error = 0;
+    auto error = 0;
     socklen_t len = sizeof(error);
     auto res = getsockopt(sock, SOL_SOCKET, SO_ERROR,
                           reinterpret_cast<char *>(&error), &len);
@@ -2368,7 +2905,7 @@ inline Error wait_until_socket_is_ready(socket_t sock, time_t sec,
   if (ret == 0) { return Error::ConnectionTimeout; }
 
   if (ret > 0 && (FD_ISSET(sock, &fdsr) || FD_ISSET(sock, &fdsw))) {
-    int error = 0;
+    auto error = 0;
     socklen_t len = sizeof(error);
     auto res = getsockopt(sock, SOL_SOCKET, SO_ERROR,
                           reinterpret_cast<char *>(&error), &len);
@@ -2401,6 +2938,7 @@ class SocketStream : public Stream {
   ssize_t read(char *ptr, size_t size) override;
   ssize_t write(const char *ptr, size_t size) override;
   void get_remote_ip_and_port(std::string &ip, int &port) const override;
+  void get_local_ip_and_port(std::string &ip, int &port) const override;
   socket_t socket() const override;
 
 private:
@@ -2414,7 +2952,7 @@ class SocketStream : public Stream {
   size_t read_buff_off_ = 0;
   size_t read_buff_content_size_ = 0;
 
-  static const size_t read_buff_size_ = 1024 * 4;
+  static const size_t read_buff_size_ = 1024l * 4;
 };
 
 #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
@@ -2430,6 +2968,7 @@ class SSLSocketStream : public Stream {
   ssize_t read(char *ptr, size_t size) override;
   ssize_t write(const char *ptr, size_t size) override;
   void get_remote_ip_and_port(std::string &ip, int &port) const override;
+  void get_local_ip_and_port(std::string &ip, int &port) const override;
   socket_t socket() const override;
 
 private:
@@ -2515,7 +3054,7 @@ inline int shutdown_socket(socket_t sock) {
 }
 
 template <typename BindOrConnect>
-socket_t create_socket(const char *host, const char *ip, int port,
+socket_t create_socket(const std::string &host, const std::string &ip, int port,
                        int address_family, int socket_flags, bool tcp_nodelay,
                        SocketOptions socket_options,
                        BindOrConnect bind_or_connect) {
@@ -2528,17 +3067,44 @@ socket_t create_socket(const char *host, const char *ip, int port,
   hints.ai_socktype = SOCK_STREAM;
   hints.ai_protocol = 0;
 
-  if (ip[0] != '\0') {
-    node = ip;
+  if (!ip.empty()) {
+    node = ip.c_str();
     // Ask getaddrinfo to convert IP in c-string to address
     hints.ai_family = AF_UNSPEC;
     hints.ai_flags = AI_NUMERICHOST;
   } else {
-    node = host;
+    if (!host.empty()) { node = host.c_str(); }
     hints.ai_family = address_family;
     hints.ai_flags = socket_flags;
   }
 
+#ifndef _WIN32
+  if (hints.ai_family == AF_UNIX) {
+    const auto addrlen = host.length();
+    if (addrlen > sizeof(sockaddr_un::sun_path)) { return INVALID_SOCKET; }
+
+    auto sock = socket(hints.ai_family, hints.ai_socktype, hints.ai_protocol);
+    if (sock != INVALID_SOCKET) {
+      sockaddr_un addr{};
+      addr.sun_family = AF_UNIX;
+      std::copy(host.begin(), host.end(), addr.sun_path);
+
+      hints.ai_addr = reinterpret_cast<sockaddr *>(&addr);
+      hints.ai_addrlen = static_cast<socklen_t>(
+          sizeof(addr) - sizeof(addr.sun_path) + addrlen);
+
+      fcntl(sock, F_SETFD, FD_CLOEXEC);
+      if (socket_options) { socket_options(sock); }
+
+      if (!bind_or_connect(sock, hints)) {
+        close_socket(sock);
+        sock = INVALID_SOCKET;
+      }
+    }
+    return sock;
+  }
+#endif
+
   auto service = std::to_string(port);
 
   if (getaddrinfo(node, service.c_str(), &hints, &result)) {
@@ -2577,21 +3143,34 @@ socket_t create_socket(const char *host, const char *ip, int port,
     if (sock == INVALID_SOCKET) { continue; }
 
 #ifndef _WIN32
-    if (fcntl(sock, F_SETFD, FD_CLOEXEC) == -1) { continue; }
+    if (fcntl(sock, F_SETFD, FD_CLOEXEC) == -1) {
+      close_socket(sock);
+      continue;
+    }
 #endif
 
     if (tcp_nodelay) {
-      int yes = 1;
-      setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, reinterpret_cast<char *>(&yes),
-                 sizeof(yes));
+      auto yes = 1;
+#ifdef _WIN32
+      setsockopt(sock, IPPROTO_TCP, TCP_NODELAY,
+                 reinterpret_cast<const char *>(&yes), sizeof(yes));
+#else
+      setsockopt(sock, IPPROTO_TCP, TCP_NODELAY,
+                 reinterpret_cast<const void *>(&yes), sizeof(yes));
+#endif
     }
 
     if (socket_options) { socket_options(sock); }
 
     if (rp->ai_family == AF_INET6) {
-      int no = 0;
-      setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, reinterpret_cast<char *>(&no),
-                 sizeof(no));
+      auto no = 0;
+#ifdef _WIN32
+      setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY,
+                 reinterpret_cast<const char *>(&no), sizeof(no));
+#else
+      setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY,
+                 reinterpret_cast<const void *>(&no), sizeof(no));
+#endif
     }
 
     // bind or connect
@@ -2626,7 +3205,7 @@ inline bool is_connection_error() {
 #endif
 }
 
-inline bool bind_ip_address(socket_t sock, const char *host) {
+inline bool bind_ip_address(socket_t sock, const std::string &host) {
   struct addrinfo hints;
   struct addrinfo *result;
 
@@ -2635,7 +3214,7 @@ inline bool bind_ip_address(socket_t sock, const char *host) {
   hints.ai_socktype = SOCK_STREAM;
   hints.ai_protocol = 0;
 
-  if (getaddrinfo(host, "0", &hints, &result)) { return false; }
+  if (getaddrinfo(host.c_str(), "0", &hints, &result)) { return false; }
 
   auto ret = false;
   for (auto rp = result; rp; rp = rp->ai_next) {
@@ -2650,7 +3229,7 @@ inline bool bind_ip_address(socket_t sock, const char *host) {
   return ret;
 }
 
-#if !defined _WIN32 && !defined ANDROID
+#if !defined _WIN32 && !defined ANDROID && !defined _AIX && !defined __MVS__
 #define USE_IF2IP
 #endif
 
@@ -2694,8 +3273,8 @@ inline std::string if2ip(int address_family, const std::string &ifn) {
 #endif
 
 inline socket_t create_client_socket(
-    const char *host, const char *ip, int port, int address_family,
-    bool tcp_nodelay, SocketOptions socket_options,
+    const std::string &host, const std::string &ip, int port,
+    int address_family, bool tcp_nodelay, SocketOptions socket_options,
     time_t connection_timeout_sec, time_t connection_timeout_usec,
     time_t read_timeout_sec, time_t read_timeout_usec, time_t write_timeout_sec,
     time_t write_timeout_usec, const std::string &intf, Error &error) {
@@ -2704,9 +3283,9 @@ inline socket_t create_client_socket(
       [&](socket_t sock2, struct addrinfo &ai) -> bool {
         if (!intf.empty()) {
 #ifdef USE_IF2IP
-          auto ip = if2ip(address_family, intf);
-          if (ip.empty()) { ip = intf; }
-          if (!bind_ip_address(sock2, ip.c_str())) {
+          auto ip_from_if = if2ip(address_family, intf);
+          if (ip_from_if.empty()) { ip_from_if = intf; }
+          if (!bind_ip_address(sock2, ip_from_if)) {
             error = Error::BindIPAddress;
             return false;
           }
@@ -2734,13 +3313,14 @@ inline socket_t create_client_socket(
 #ifdef _WIN32
           auto timeout = static_cast<uint32_t>(read_timeout_sec * 1000 +
                                                read_timeout_usec / 1000);
-          setsockopt(sock2, SOL_SOCKET, SO_RCVTIMEO, (char *)&timeout,
-                     sizeof(timeout));
+          setsockopt(sock2, SOL_SOCKET, SO_RCVTIMEO,
+                     reinterpret_cast<const char *>(&timeout), sizeof(timeout));
 #else
           timeval tv;
           tv.tv_sec = static_cast<long>(read_timeout_sec);
           tv.tv_usec = static_cast<decltype(tv.tv_usec)>(read_timeout_usec);
-          setsockopt(sock2, SOL_SOCKET, SO_RCVTIMEO, (char *)&tv, sizeof(tv));
+          setsockopt(sock2, SOL_SOCKET, SO_RCVTIMEO,
+                     reinterpret_cast<const void *>(&tv), sizeof(tv));
 #endif
         }
         {
@@ -2748,13 +3328,14 @@ inline socket_t create_client_socket(
 #ifdef _WIN32
           auto timeout = static_cast<uint32_t>(write_timeout_sec * 1000 +
                                                write_timeout_usec / 1000);
-          setsockopt(sock2, SOL_SOCKET, SO_SNDTIMEO, (char *)&timeout,
-                     sizeof(timeout));
+          setsockopt(sock2, SOL_SOCKET, SO_SNDTIMEO,
+                     reinterpret_cast<const char *>(&timeout), sizeof(timeout));
 #else
           timeval tv;
           tv.tv_sec = static_cast<long>(write_timeout_sec);
           tv.tv_usec = static_cast<decltype(tv.tv_usec)>(write_timeout_usec);
-          setsockopt(sock2, SOL_SOCKET, SO_SNDTIMEO, (char *)&tv, sizeof(tv));
+          setsockopt(sock2, SOL_SOCKET, SO_SNDTIMEO,
+                     reinterpret_cast<const void *>(&tv), sizeof(tv));
 #endif
         }
 
@@ -2771,9 +3352,8 @@ inline socket_t create_client_socket(
   return sock;
 }
 
-inline bool get_remote_ip_and_port(const struct sockaddr_storage &addr,
-                                   socklen_t addr_len, std::string &ip,
-                                   int &port) {
+inline bool get_ip_and_port(const struct sockaddr_storage &addr,
+                            socklen_t addr_len, std::string &ip, int &port) {
   if (addr.ss_family == AF_INET) {
     port = ntohs(reinterpret_cast<const struct sockaddr_in *>(&addr)->sin_port);
   } else if (addr.ss_family == AF_INET6) {
@@ -2794,21 +3374,53 @@ inline bool get_remote_ip_and_port(const struct sockaddr_storage &addr,
   return true;
 }
 
+inline void get_local_ip_and_port(socket_t sock, std::string &ip, int &port) {
+  struct sockaddr_storage addr;
+  socklen_t addr_len = sizeof(addr);
+  if (!getsockname(sock, reinterpret_cast<struct sockaddr *>(&addr),
+                   &addr_len)) {
+    get_ip_and_port(addr, addr_len, ip, port);
+  }
+}
+
 inline void get_remote_ip_and_port(socket_t sock, std::string &ip, int &port) {
   struct sockaddr_storage addr;
   socklen_t addr_len = sizeof(addr);
 
   if (!getpeername(sock, reinterpret_cast<struct sockaddr *>(&addr),
                    &addr_len)) {
-    get_remote_ip_and_port(addr, addr_len, ip, port);
+#ifndef _WIN32
+    if (addr.ss_family == AF_UNIX) {
+#if defined(__linux__)
+      struct ucred ucred;
+      socklen_t len = sizeof(ucred);
+      if (getsockopt(sock, SOL_SOCKET, SO_PEERCRED, &ucred, &len) == 0) {
+        port = ucred.pid;
+      }
+#elif defined(SOL_LOCAL) && defined(SO_PEERPID) // __APPLE__
+      pid_t pid;
+      socklen_t len = sizeof(pid);
+      if (getsockopt(sock, SOL_LOCAL, SO_PEERPID, &pid, &len) == 0) {
+        port = pid;
+      }
+#endif
+      return;
+    }
+#endif
+    get_ip_and_port(addr, addr_len, ip, port);
   }
 }
 
 inline constexpr unsigned int str2tag_core(const char *s, size_t l,
                                            unsigned int h) {
-  return (l == 0) ? h
-                  : str2tag_core(s + 1, l - 1,
-                                 (h * 33) ^ static_cast<unsigned char>(*s));
+  return (l == 0)
+             ? h
+             : str2tag_core(
+                   s + 1, l - 1,
+                   // Unsets the 6 high bits of h, therefore no overflow happens
+                   (((std::numeric_limits<unsigned int>::max)() >> 6) &
+                    h * 33) ^
+                       static_cast<unsigned char>(*s));
 }
 
 inline unsigned int str2tag(const std::string &s) {
@@ -2823,18 +3435,20 @@ inline constexpr unsigned int operator"" _t(const char *s, size_t l) {
 
 } // namespace udl
 
-inline const char *
+inline std::string
 find_content_type(const std::string &path,
-                  const std::map<std::string, std::string> &user_data) {
+                  const std::map<std::string, std::string> &user_data,
+                  const std::string &default_content_type) {
   auto ext = file_extension(path);
 
   auto it = user_data.find(ext);
-  if (it != user_data.end()) { return it->second.c_str(); }
+  if (it != user_data.end()) { return it->second; }
 
   using udl::operator""_t;
 
   switch (str2tag(ext)) {
-  default: return nullptr;
+  default: return default_content_type;
+
   case "css"_t: return "text/css";
   case "csv"_t: return "text/csv";
   case "htm"_t:
@@ -2887,76 +3501,6 @@ find_content_type(const std::string &path,
   }
 }
 
-inline const char *status_message(int status) {
-  switch (status) {
-  case 100: return "Continue";
-  case 101: return "Switching Protocol";
-  case 102: return "Processing";
-  case 103: return "Early Hints";
-  case 200: return "OK";
-  case 201: return "Created";
-  case 202: return "Accepted";
-  case 203: return "Non-Authoritative Information";
-  case 204: return "No Content";
-  case 205: return "Reset Content";
-  case 206: return "Partial Content";
-  case 207: return "Multi-Status";
-  case 208: return "Already Reported";
-  case 226: return "IM Used";
-  case 300: return "Multiple Choice";
-  case 301: return "Moved Permanently";
-  case 302: return "Found";
-  case 303: return "See Other";
-  case 304: return "Not Modified";
-  case 305: return "Use Proxy";
-  case 306: return "unused";
-  case 307: return "Temporary Redirect";
-  case 308: return "Permanent Redirect";
-  case 400: return "Bad Request";
-  case 401: return "Unauthorized";
-  case 402: return "Payment Required";
-  case 403: return "Forbidden";
-  case 404: return "Not Found";
-  case 405: return "Method Not Allowed";
-  case 406: return "Not Acceptable";
-  case 407: return "Proxy Authentication Required";
-  case 408: return "Request Timeout";
-  case 409: return "Conflict";
-  case 410: return "Gone";
-  case 411: return "Length Required";
-  case 412: return "Precondition Failed";
-  case 413: return "Payload Too Large";
-  case 414: return "URI Too Long";
-  case 415: return "Unsupported Media Type";
-  case 416: return "Range Not Satisfiable";
-  case 417: return "Expectation Failed";
-  case 418: return "I'm a teapot";
-  case 421: return "Misdirected Request";
-  case 422: return "Unprocessable Entity";
-  case 423: return "Locked";
-  case 424: return "Failed Dependency";
-  case 425: return "Too Early";
-  case 426: return "Upgrade Required";
-  case 428: return "Precondition Required";
-  case 429: return "Too Many Requests";
-  case 431: return "Request Header Fields Too Large";
-  case 451: return "Unavailable For Legal Reasons";
-  case 501: return "Not Implemented";
-  case 502: return "Bad Gateway";
-  case 503: return "Service Unavailable";
-  case 504: return "Gateway Timeout";
-  case 505: return "HTTP Version Not Supported";
-  case 506: return "Variant Also Negotiates";
-  case 507: return "Insufficient Storage";
-  case 508: return "Loop Detected";
-  case 510: return "Not Extended";
-  case 511: return "Network Authentication Required";
-
-  default:
-  case 500: return "Internal Server Error";
-  }
-}
-
 inline bool can_compress_content_type(const std::string &content_type) {
   using udl::operator""_t;
 
@@ -3033,7 +3577,7 @@ inline bool gzip_compressor::compress(const char *data, size_t data_length,
     data += strm_.avail_in;
 
     auto flush = (last && data_length == 0) ? Z_FINISH : Z_NO_FLUSH;
-    int ret = Z_OK;
+    auto ret = Z_OK;
 
     std::array<char, CPPHTTPLIB_COMPRESSION_BUFSIZ> buff{};
     do {
@@ -3077,7 +3621,7 @@ inline bool gzip_decompressor::decompress(const char *data, size_t data_length,
                                           Callback callback) {
   assert(is_valid_);
 
-  int ret = Z_OK;
+  auto ret = Z_OK;
 
   do {
     constexpr size_t max_avail_in =
@@ -3091,16 +3635,12 @@ inline bool gzip_decompressor::decompress(const char *data, size_t data_length,
     data += strm_.avail_in;
 
     std::array<char, CPPHTTPLIB_COMPRESSION_BUFSIZ> buff{};
-    while (strm_.avail_in > 0) {
+    while (strm_.avail_in > 0 && ret == Z_OK) {
       strm_.avail_out = static_cast<uInt>(buff.size());
       strm_.next_out = reinterpret_cast<Bytef *>(buff.data());
 
-      auto prev_avail_in = strm_.avail_in;
-
       ret = inflate(&strm_, Z_NO_FLUSH);
 
-      if (prev_avail_in - strm_.avail_in == 0) { return false; }
-
       assert(ret != Z_STREAM_ERROR);
       switch (ret) {
       case Z_NEED_DICT:
@@ -3113,7 +3653,7 @@ inline bool gzip_decompressor::decompress(const char *data, size_t data_length,
       }
     }
 
-    if (ret != Z_OK && ret != Z_STREAM_END) return false;
+    if (ret != Z_OK && ret != Z_STREAM_END) { return false; }
 
   } while (data_length > 0);
 
@@ -3182,7 +3722,7 @@ inline bool brotli_decompressor::decompress(const char *data,
     return 0;
   }
 
-  const uint8_t *next_in = (const uint8_t *)data;
+  auto next_in = reinterpret_cast<const uint8_t *>(data);
   size_t avail_in = data_length;
   size_t total_out;
 
@@ -3207,12 +3747,13 @@ inline bool brotli_decompressor::decompress(const char *data,
 }
 #endif
 
-inline bool has_header(const Headers &headers, const char *key) {
+inline bool has_header(const Headers &headers, const std::string &key) {
   return headers.find(key) != headers.end();
 }
 
-inline const char *get_header_value(const Headers &headers, const char *key,
-                                    size_t id, const char *def) {
+inline const char *get_header_value(const Headers &headers,
+                                    const std::string &key, size_t id,
+                                    const char *def) {
   auto rng = headers.equal_range(key);
   auto it = rng.first;
   std::advance(it, static_cast<ssize_t>(id));
@@ -3220,6 +3761,14 @@ inline const char *get_header_value(const Headers &headers, const char *key,
   return def;
 }
 
+inline bool compare_case_ignore(const std::string &a, const std::string &b) {
+  if (a.size() != b.size()) { return false; }
+  for (size_t i = 0; i < b.size(); i++) {
+    if (::tolower(a[i]) != ::tolower(b[i])) { return false; }
+  }
+  return true;
+}
+
 template <typename T>
 inline bool parse_header(const char *beg, const char *end, T fn) {
   // Skip trailing spaces and tabs.
@@ -3243,7 +3792,14 @@ inline bool parse_header(const char *beg, const char *end, T fn) {
   }
 
   if (p < end) {
-    fn(std::string(beg, key_end), decode_url(std::string(p, end), false));
+    auto key_len = key_end - beg;
+    if (!key_len) { return false; }
+
+    auto key = std::string(beg, key_end);
+    auto val = compare_case_ignore(key, "Location")
+                   ? std::string(p, end)
+                   : decode_url(std::string(p, end), false);
+    fn(std::move(key), std::move(val));
     return true;
   }
 
@@ -3328,11 +3884,7 @@ inline bool read_content_without_length(Stream &strm,
   uint64_t r = 0;
   for (;;) {
     auto n = strm.read(buf, CPPHTTPLIB_RECV_BUFSIZ);
-    if (n < 0) {
-      return false;
-    } else if (n == 0) {
-      return true;
-    }
+    if (n <= 0) { return true; }
 
     if (!out(buf, static_cast<size_t>(n), r, 0)) { return false; }
     r += static_cast<uint64_t>(n);
@@ -3341,7 +3893,8 @@ inline bool read_content_without_length(Stream &strm,
   return true;
 }
 
-inline bool read_content_chunked(Stream &strm,
+template <typename T>
+inline bool read_content_chunked(Stream &strm, T &x,
                                  ContentReceiverWithProgress out) {
   const auto bufsiz = 16;
   char buf[bufsiz];
@@ -3367,23 +3920,37 @@ inline bool read_content_chunked(Stream &strm,
 
     if (!line_reader.getline()) { return false; }
 
-    if (strcmp(line_reader.ptr(), "\r\n")) { break; }
+    if (strcmp(line_reader.ptr(), "\r\n") != 0) { return false; }
 
     if (!line_reader.getline()) { return false; }
   }
 
-  if (chunk_len == 0) {
-    // Reader terminator after chunks
-    if (!line_reader.getline() || strcmp(line_reader.ptr(), "\r\n"))
-      return false;
+  assert(chunk_len == 0);
+
+  // Trailer
+  if (!line_reader.getline()) { return false; }
+
+  while (strcmp(line_reader.ptr(), "\r\n") != 0) {
+    if (line_reader.size() > CPPHTTPLIB_HEADER_MAX_LENGTH) { return false; }
+
+    // Exclude line terminator
+    constexpr auto line_terminator_len = 2;
+    auto end = line_reader.ptr() + line_reader.size() - line_terminator_len;
+
+    parse_header(line_reader.ptr(), end,
+                 [&](std::string &&key, std::string &&val) {
+                   x.headers.emplace(std::move(key), std::move(val));
+                 });
+
+    if (!line_reader.getline()) { return false; }
   }
 
   return true;
 }
 
 inline bool is_chunked_transfer_encoding(const Headers &headers) {
-  return !strcasecmp(get_header_value(headers, "Transfer-Encoding", 0, ""),
-                     "chunked");
+  return compare_case_ignore(
+      get_header_value(headers, "Transfer-Encoding", 0, ""), "chunked");
 }
 
 template <typename T, typename U>
@@ -3398,14 +3965,14 @@ bool prepare_content_receiver(T &x, int &status,
 #ifdef CPPHTTPLIB_ZLIB_SUPPORT
       decompressor = detail::make_unique<gzip_decompressor>();
 #else
-      status = 415;
+      status = StatusCode::UnsupportedMediaType_415;
       return false;
 #endif
     } else if (encoding.find("br") != std::string::npos) {
 #ifdef CPPHTTPLIB_BROTLI_SUPPORT
       decompressor = detail::make_unique<brotli_decompressor>();
 #else
-      status = 415;
+      status = StatusCode::UnsupportedMediaType_415;
       return false;
 #endif
     }
@@ -3421,7 +3988,7 @@ bool prepare_content_receiver(T &x, int &status,
         };
         return callback(std::move(out));
       } else {
-        status = 500;
+        status = StatusCode::InternalServerError_500;
         return false;
       }
     }
@@ -3445,11 +4012,11 @@ bool read_content(Stream &strm, T &x, size_t payload_max_length, int &status,
         auto exceed_payload_max_length = false;
 
         if (is_chunked_transfer_encoding(x.headers)) {
-          ret = read_content_chunked(strm, out);
+          ret = read_content_chunked(strm, x, out);
         } else if (!has_header(x.headers, "Content-Length")) {
           ret = read_content_without_length(strm, out);
         } else {
-          auto len = get_header_value<uint64_t>(x.headers, "Content-Length");
+          auto len = get_header_value_u64(x.headers, "Content-Length", 0, 0);
           if (len > payload_max_length) {
             exceed_payload_max_length = true;
             skip_content_with_length(strm, len);
@@ -3459,7 +4026,10 @@ bool read_content(Stream &strm, T &x, size_t payload_max_length, int &status,
           }
         }
 
-        if (!ret) { status = exceed_payload_max_length ? 413 : 400; }
+        if (!ret) {
+          status = exceed_payload_max_length ? StatusCode::PayloadTooLarge_413
+                                             : StatusCode::BadRequest_400;
+        }
         return ret;
       });
 } // namespace detail
@@ -3498,7 +4068,7 @@ inline bool write_content(Stream &strm, const ContentProvider &content_provider,
 
   data_sink.write = [&](const char *d, size_t l) -> bool {
     if (ok) {
-      if (write_data(strm, d, l)) {
+      if (strm.is_writable() && write_data(strm, d, l)) {
         offset += l;
       } else {
         ok = false;
@@ -3507,14 +4077,16 @@ inline bool write_content(Stream &strm, const ContentProvider &content_provider,
     return ok;
   };
 
-  data_sink.is_writable = [&](void) { return ok && strm.is_writable(); };
+  data_sink.is_writable = [&]() -> bool { return strm.is_writable(); };
 
   while (offset < end_offset && !is_shutting_down()) {
-    if (!content_provider(offset, end_offset - offset, data_sink)) {
+    if (!strm.is_writable()) {
+      error = Error::Write;
+      return false;
+    } else if (!content_provider(offset, end_offset - offset, data_sink)) {
       error = Error::Canceled;
       return false;
-    }
-    if (!ok) {
+    } else if (!ok) {
       error = Error::Write;
       return false;
     }
@@ -3546,18 +4118,23 @@ write_content_without_length(Stream &strm,
   data_sink.write = [&](const char *d, size_t l) -> bool {
     if (ok) {
       offset += l;
-      if (!write_data(strm, d, l)) { ok = false; }
+      if (!strm.is_writable() || !write_data(strm, d, l)) { ok = false; }
     }
     return ok;
   };
 
-  data_sink.done = [&](void) { data_available = false; };
+  data_sink.is_writable = [&]() -> bool { return strm.is_writable(); };
 
-  data_sink.is_writable = [&](void) { return ok && strm.is_writable(); };
+  data_sink.done = [&](void) { data_available = false; };
 
   while (data_available && !is_shutting_down()) {
-    if (!content_provider(offset, 0, data_sink)) { return false; }
-    if (!ok) { return false; }
+    if (!strm.is_writable()) {
+      return false;
+    } else if (!content_provider(offset, 0, data_sink)) {
+      return false;
+    } else if (!ok) {
+      return false;
+    }
   }
   return true;
 }
@@ -3586,7 +4163,10 @@ write_content_chunked(Stream &strm, const ContentProvider &content_provider,
           // Emit chunked response header and footer for each chunk
           auto chunk =
               from_i_to_hex(payload.size()) + "\r\n" + payload + "\r\n";
-          if (!write_data(strm, chunk.data(), chunk.size())) { ok = false; }
+          if (!strm.is_writable() ||
+              !write_data(strm, chunk.data(), chunk.size())) {
+            ok = false;
+          }
         }
       } else {
         ok = false;
@@ -3595,7 +4175,9 @@ write_content_chunked(Stream &strm, const ContentProvider &content_provider,
     return ok;
   };
 
-  data_sink.done = [&](void) {
+  data_sink.is_writable = [&]() -> bool { return strm.is_writable(); };
+
+  auto done_with_trailer = [&](const Headers *trailer) {
     if (!ok) { return; }
 
     data_available = false;
@@ -3613,26 +4195,46 @@ write_content_chunked(Stream &strm, const ContentProvider &content_provider,
     if (!payload.empty()) {
       // Emit chunked response header and footer for each chunk
       auto chunk = from_i_to_hex(payload.size()) + "\r\n" + payload + "\r\n";
-      if (!write_data(strm, chunk.data(), chunk.size())) {
+      if (!strm.is_writable() ||
+          !write_data(strm, chunk.data(), chunk.size())) {
         ok = false;
         return;
       }
     }
 
-    static const std::string done_marker("0\r\n\r\n");
+    static const std::string done_marker("0\r\n");
     if (!write_data(strm, done_marker.data(), done_marker.size())) {
       ok = false;
     }
+
+    // Trailer
+    if (trailer) {
+      for (const auto &kv : *trailer) {
+        std::string field_line = kv.first + ": " + kv.second + "\r\n";
+        if (!write_data(strm, field_line.data(), field_line.size())) {
+          ok = false;
+        }
+      }
+    }
+
+    static const std::string crlf("\r\n");
+    if (!write_data(strm, crlf.data(), crlf.size())) { ok = false; }
   };
 
-  data_sink.is_writable = [&](void) { return ok && strm.is_writable(); };
+  data_sink.done = [&](void) { done_with_trailer(nullptr); };
+
+  data_sink.done_with_trailer = [&](const Headers &trailer) {
+    done_with_trailer(&trailer);
+  };
 
   while (data_available && !is_shutting_down()) {
-    if (!content_provider(offset, 0, data_sink)) {
+    if (!strm.is_writable()) {
+      error = Error::Write;
+      return false;
+    } else if (!content_provider(offset, 0, data_sink)) {
       error = Error::Canceled;
       return false;
-    }
-    if (!ok) {
+    } else if (!ok) {
       error = Error::Write;
       return false;
     }
@@ -3659,7 +4261,8 @@ inline bool redirect(T &cli, Request &req, Response &res,
   new_req.path = path;
   new_req.redirect_count_ -= 1;
 
-  if (res.status == 303 && (req.method != "GET" && req.method != "HEAD")) {
+  if (res.status == StatusCode::SeeOther_303 &&
+      (req.method != "GET" && req.method != "HEAD")) {
     new_req.method = "GET";
     new_req.body.clear();
     new_req.headers.clear();
@@ -3671,7 +4274,8 @@ inline bool redirect(T &cli, Request &req, Response &res,
   if (ret) {
     req = new_req;
     res = new_res;
-    res.location = location;
+
+    if (res.location.empty()) { res.location = location; }
   }
   return ret;
 }
@@ -3713,16 +4317,39 @@ inline void parse_query_text(const std::string &s, Params &params) {
 
 inline bool parse_multipart_boundary(const std::string &content_type,
                                      std::string &boundary) {
-  auto pos = content_type.find("boundary=");
+  auto boundary_keyword = "boundary=";
+  auto pos = content_type.find(boundary_keyword);
   if (pos == std::string::npos) { return false; }
-  boundary = content_type.substr(pos + 9);
-  if (boundary.length() >= 2 && boundary.front() == '"' &&
-      boundary.back() == '"') {
-    boundary = boundary.substr(1, boundary.size() - 2);
-  }
+  auto end = content_type.find(';', pos);
+  auto beg = pos + strlen(boundary_keyword);
+  boundary = trim_double_quotes_copy(content_type.substr(beg, end - beg));
   return !boundary.empty();
 }
 
+inline void parse_disposition_params(const std::string &s, Params &params) {
+  std::set<std::string> cache;
+  split(s.data(), s.data() + s.size(), ';', [&](const char *b, const char *e) {
+    std::string kv(b, e);
+    if (cache.find(kv) != cache.end()) { return; }
+    cache.insert(kv);
+
+    std::string key;
+    std::string val;
+    split(b, e, '=', [&](const char *b2, const char *e2) {
+      if (key.empty()) {
+        key.assign(b2, e2);
+      } else {
+        val.assign(b2, e2);
+      }
+    });
+
+    if (!key.empty()) {
+      params.emplace(trim_double_quotes_copy((key)),
+                     trim_double_quotes_copy((val)));
+    }
+  });
+}
+
 #ifdef CPPHTTPLIB_NO_EXCEPTIONS
 inline bool parse_range_header(const std::string &s, Ranges &ranges) {
 #else
@@ -3733,9 +4360,9 @@ inline bool parse_range_header(const std::string &s, Ranges &ranges) try {
   if (std::regex_match(s, m, re_first_range)) {
     auto pos = static_cast<size_t>(m.position(1));
     auto len = static_cast<size_t>(m.length(1));
-    bool all_valid_ranges = true;
+    auto all_valid_ranges = true;
     split(&s[pos], &s[pos + len], ',', [&](const char *b, const char *e) {
-      if (!all_valid_ranges) return;
+      if (!all_valid_ranges) { return; }
       static auto re_another_range = std::regex(R"(\s*(\d*)-(\d*))");
       std::cmatch cm;
       if (std::regex_match(b, e, cm, re_another_range)) {
@@ -3769,30 +4396,26 @@ class MultipartFormDataParser {
 public:
   MultipartFormDataParser() = default;
 
-  void set_boundary(std::string &&boundary) { boundary_ = boundary; }
+  void set_boundary(std::string &&boundary) {
+    boundary_ = boundary;
+    dash_boundary_crlf_ = dash_ + boundary_ + crlf_;
+    crlf_dash_boundary_ = crlf_ + dash_ + boundary_;
+  }
 
   bool is_valid() const { return is_valid_; }
 
   bool parse(const char *buf, size_t n, const ContentReceiver &content_callback,
              const MultipartContentHeader &header_callback) {
 
-    // TODO: support 'filename*'
-    static const std::regex re_content_disposition(
-        R"~(^Content-Disposition:\s*form-data;\s*name="(.*?)"(?:;\s*filename="(.*?)")?(?:;\s*filename\*=\S+)?\s*$)~",
-        std::regex_constants::icase);
-
-    static const std::string dash_ = "--";
-    static const std::string crlf_ = "\r\n";
-
     buf_append(buf, n);
 
     while (buf_size() > 0) {
       switch (state_) {
       case 0: { // Initial boundary
-        auto pattern = dash_ + boundary_ + crlf_;
-        if (pattern.size() > buf_size()) { return true; }
-        if (!buf_start_with(pattern)) { return false; }
-        buf_erase(pattern.size());
+        buf_erase(buf_find(dash_boundary_crlf_));
+        if (dash_boundary_crlf_.size() > buf_size()) { return true; }
+        if (!buf_start_with(dash_boundary_crlf_)) { return false; }
+        buf_erase(dash_boundary_crlf_.size());
         state_ = 1;
         break;
       }
@@ -3816,18 +4439,56 @@ class MultipartFormDataParser {
             break;
           }
 
-          static const std::string header_name = "content-type:";
           const auto header = buf_head(pos);
-          if (start_with_case_ignore(header, header_name)) {
-            file_.content_type = trim_copy(header.substr(header_name.size()));
+
+          if (!parse_header(header.data(), header.data() + header.size(),
+                            [&](std::string &&, std::string &&) {})) {
+            is_valid_ = false;
+            return false;
+          }
+
+          static const std::string header_content_type = "Content-Type:";
+
+          if (start_with_case_ignore(header, header_content_type)) {
+            file_.content_type =
+                trim_copy(header.substr(header_content_type.size()));
           } else {
+            static const std::regex re_content_disposition(
+                R"~(^Content-Disposition:\s*form-data;\s*(.*)$)~",
+                std::regex_constants::icase);
+
             std::smatch m;
             if (std::regex_match(header, m, re_content_disposition)) {
-              file_.name = m[1];
-              file_.filename = m[2];
+              Params params;
+              parse_disposition_params(m[1], params);
+
+              auto it = params.find("name");
+              if (it != params.end()) {
+                file_.name = it->second;
+              } else {
+                is_valid_ = false;
+                return false;
+              }
+
+              it = params.find("filename");
+              if (it != params.end()) { file_.filename = it->second; }
+
+              it = params.find("filename*");
+              if (it != params.end()) {
+                // Only allow UTF-8 enconnding...
+                static const std::regex re_rfc5987_encoding(
+                    R"~(^UTF-8''(.+?)$)~", std::regex_constants::icase);
+
+                std::smatch m2;
+                if (std::regex_match(it->second, m2, re_rfc5987_encoding)) {
+                  file_.filename = decode_url(m2[1], false); // override...
+                } else {
+                  is_valid_ = false;
+                  return false;
+                }
+              }
             }
           }
-
           buf_erase(pos + crlf_.size());
           pos = buf_find(crlf_);
         }
@@ -3835,40 +4496,25 @@ class MultipartFormDataParser {
         break;
       }
       case 3: { // Body
-        {
-          auto pattern = crlf_ + dash_;
-          if (pattern.size() > buf_size()) { return true; }
-
-          auto pos = buf_find(pattern);
-
+        if (crlf_dash_boundary_.size() > buf_size()) { return true; }
+        auto pos = buf_find(crlf_dash_boundary_);
+        if (pos < buf_size()) {
           if (!content_callback(buf_data(), pos)) {
             is_valid_ = false;
             return false;
           }
-
-          buf_erase(pos);
-        }
-        {
-          auto pattern = crlf_ + dash_ + boundary_;
-          if (pattern.size() > buf_size()) { return true; }
-
-          auto pos = buf_find(pattern);
-          if (pos < buf_size()) {
-            if (!content_callback(buf_data(), pos)) {
-              is_valid_ = false;
-              return false;
-            }
-
-            buf_erase(pos + pattern.size());
-            state_ = 4;
-          } else {
-            if (!content_callback(buf_data(), pattern.size())) {
+          buf_erase(pos + crlf_dash_boundary_.size());
+          state_ = 4;
+        } else {
+          auto len = buf_size() - crlf_dash_boundary_.size();
+          if (len > 0) {
+            if (!content_callback(buf_data(), len)) {
               is_valid_ = false;
               return false;
             }
-
-            buf_erase(pattern.size());
+            buf_erase(len);
           }
+          return true;
         }
         break;
       }
@@ -3878,22 +4524,17 @@ class MultipartFormDataParser {
           buf_erase(crlf_.size());
           state_ = 1;
         } else {
-          auto pattern = dash_ + crlf_;
-          if (pattern.size() > buf_size()) { return true; }
-          if (buf_start_with(pattern)) {
-            buf_erase(pattern.size());
+          if (dash_.size() > buf_size()) { return true; }
+          if (buf_start_with(dash_)) {
+            buf_erase(dash_.size());
             is_valid_ = true;
-            state_ = 5;
+            buf_erase(buf_size()); // Remove epilogue
           } else {
             return true;
           }
         }
         break;
       }
-      case 5: { // Done
-        is_valid_ = false;
-        return false;
-      }
       }
     }
 
@@ -3916,7 +4557,11 @@ class MultipartFormDataParser {
     return true;
   }
 
+  const std::string dash_ = "--";
+  const std::string crlf_ = "\r\n";
   std::string boundary_;
+  std::string dash_boundary_crlf_;
+  std::string crlf_dash_boundary_;
 
   size_t state_ = 0;
   bool is_valid_ = false;
@@ -4000,65 +4645,174 @@ inline std::string to_lower(const char *beg, const char *end) {
   return out;
 }
 
-inline std::string make_multipart_data_boundary() {
+inline std::string random_string(size_t length) {
   static const char data[] =
       "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
 
   // std::random_device might actually be deterministic on some
   // platforms, but due to lack of support in the c++ standard library,
   // doing better requires either some ugly hacks or breaking portability.
-  std::random_device seed_gen;
+  static std::random_device seed_gen;
 
   // Request 128 bits of entropy for initialization
-  std::seed_seq seed_sequence{seed_gen(), seed_gen(), seed_gen(), seed_gen()};
-  std::mt19937 engine(seed_sequence);
+  static std::seed_seq seed_sequence{seed_gen(), seed_gen(), seed_gen(),
+                                     seed_gen()};
 
-  std::string result = "--cpp-httplib-multipart-data-";
+  static std::mt19937 engine(seed_sequence);
 
-  for (auto i = 0; i < 16; i++) {
+  std::string result;
+  for (size_t i = 0; i < length; i++) {
     result += data[engine() % (sizeof(data) - 1)];
   }
-
   return result;
 }
 
-inline std::pair<size_t, size_t>
-get_range_offset_and_length(const Request &req, size_t content_length,
-                            size_t index) {
-  auto r = req.ranges[index];
+inline std::string make_multipart_data_boundary() {
+  return "--cpp-httplib-multipart-data-" + detail::random_string(16);
+}
+
+inline bool is_multipart_boundary_chars_valid(const std::string &boundary) {
+  auto valid = true;
+  for (size_t i = 0; i < boundary.size(); i++) {
+    auto c = boundary[i];
+    if (!std::isalnum(c) && c != '-' && c != '_') {
+      valid = false;
+      break;
+    }
+  }
+  return valid;
+}
+
+template <typename T>
+inline std::string
+serialize_multipart_formdata_item_begin(const T &item,
+                                        const std::string &boundary) {
+  std::string body = "--" + boundary + "\r\n";
+  body += "Content-Disposition: form-data; name=\"" + item.name + "\"";
+  if (!item.filename.empty()) {
+    body += "; filename=\"" + item.filename + "\"";
+  }
+  body += "\r\n";
+  if (!item.content_type.empty()) {
+    body += "Content-Type: " + item.content_type + "\r\n";
+  }
+  body += "\r\n";
+
+  return body;
+}
+
+inline std::string serialize_multipart_formdata_item_end() { return "\r\n"; }
+
+inline std::string
+serialize_multipart_formdata_finish(const std::string &boundary) {
+  return "--" + boundary + "--\r\n";
+}
+
+inline std::string
+serialize_multipart_formdata_get_content_type(const std::string &boundary) {
+  return "multipart/form-data; boundary=" + boundary;
+}
+
+inline std::string
+serialize_multipart_formdata(const MultipartFormDataItems &items,
+                             const std::string &boundary, bool finish = true) {
+  std::string body;
 
-  if (r.first == -1 && r.second == -1) {
-    return std::make_pair(0, content_length);
+  for (const auto &item : items) {
+    body += serialize_multipart_formdata_item_begin(item, boundary);
+    body += item.content + serialize_multipart_formdata_item_end();
   }
 
-  auto slen = static_cast<ssize_t>(content_length);
+  if (finish) { body += serialize_multipart_formdata_finish(boundary); }
+
+  return body;
+}
+
+inline bool range_error(Request &req, Response &res) {
+  if (!req.ranges.empty() && 200 <= res.status && res.status < 300) {
+    ssize_t contant_len = static_cast<ssize_t>(
+        res.content_length_ ? res.content_length_ : res.body.size());
+
+    ssize_t prev_first_pos = -1;
+    ssize_t prev_last_pos = -1;
+    size_t overwrapping_count = 0;
+
+    // NOTE: The following Range check is based on '14.2. Range' in RFC 9110
+    // 'HTTP Semantics' to avoid potential denial-of-service attacks.
+    // https://www.rfc-editor.org/rfc/rfc9110#section-14.2
+
+    // Too many ranges
+    if (req.ranges.size() > CPPHTTPLIB_RANGE_MAX_COUNT) { return true; }
+
+    for (auto &r : req.ranges) {
+      auto &first_pos = r.first;
+      auto &last_pos = r.second;
+
+      if (first_pos == -1 && last_pos == -1) {
+        first_pos = 0;
+        last_pos = contant_len;
+      }
+
+      if (first_pos == -1) {
+        first_pos = contant_len - last_pos;
+        last_pos = contant_len - 1;
+      }
+
+      if (last_pos == -1) { last_pos = contant_len - 1; }
+
+      // Range must be within content length
+      if (!(0 <= first_pos && first_pos <= last_pos &&
+            last_pos <= contant_len - 1)) {
+        return true;
+      }
+
+      // Ranges must be in ascending order
+      if (first_pos <= prev_first_pos) { return true; }
+
+      // Request must not have more than two overlapping ranges
+      if (first_pos <= prev_last_pos) {
+        overwrapping_count++;
+        if (overwrapping_count > 2) { return true; }
+      }
 
-  if (r.first == -1) {
-    r.first = (std::max)(static_cast<ssize_t>(0), slen - r.second);
-    r.second = slen - 1;
+      prev_first_pos = (std::max)(prev_first_pos, first_pos);
+      prev_last_pos = (std::max)(prev_last_pos, last_pos);
+    }
   }
 
-  if (r.second == -1) { r.second = slen - 1; }
+  return false;
+}
+
+inline std::pair<size_t, size_t>
+get_range_offset_and_length(Range r, size_t content_length) {
+  assert(r.first != -1 && r.second != -1);
+  assert(0 <= r.first && r.first < static_cast<ssize_t>(content_length));
+  assert(r.first <= r.second &&
+         r.second < static_cast<ssize_t>(content_length));
+
   return std::make_pair(r.first, static_cast<size_t>(r.second - r.first) + 1);
 }
 
-inline std::string make_content_range_header_field(size_t offset, size_t length,
-                                                   size_t content_length) {
+inline std::string make_content_range_header_field(
+    const std::pair<size_t, size_t> &offset_and_length, size_t content_length) {
+  auto st = offset_and_length.first;
+  auto ed = st + offset_and_length.second - 1;
+
   std::string field = "bytes ";
-  field += std::to_string(offset);
+  field += std::to_string(st);
   field += "-";
-  field += std::to_string(offset + length - 1);
+  field += std::to_string(ed);
   field += "/";
   field += std::to_string(content_length);
   return field;
 }
 
 template <typename SToken, typename CToken, typename Content>
-bool process_multipart_ranges_data(const Request &req, Response &res,
+bool process_multipart_ranges_data(const Request &req,
                                    const std::string &boundary,
                                    const std::string &content_type,
-                                   SToken stoken, CToken ctoken,
-                                   Content content) {
+                                   size_t content_length, SToken stoken,
+                                   CToken ctoken, Content content) {
   for (size_t i = 0; i < req.ranges.size(); i++) {
     ctoken("--");
     stoken(boundary);
@@ -4069,52 +4823,53 @@ bool process_multipart_ranges_data(const Request &req, Response &res,
       ctoken("\r\n");
     }
 
-    auto offsets = get_range_offset_and_length(req, res.body.size(), i);
-    auto offset = offsets.first;
-    auto length = offsets.second;
+    auto offset_and_length =
+        get_range_offset_and_length(req.ranges[i], content_length);
 
     ctoken("Content-Range: ");
-    stoken(make_content_range_header_field(offset, length, res.body.size()));
+    stoken(make_content_range_header_field(offset_and_length, content_length));
     ctoken("\r\n");
     ctoken("\r\n");
-    if (!content(offset, length)) { return false; }
+
+    if (!content(offset_and_length.first, offset_and_length.second)) {
+      return false;
+    }
     ctoken("\r\n");
   }
 
   ctoken("--");
   stoken(boundary);
-  ctoken("--\r\n");
+  ctoken("--");
 
   return true;
 }
 
-inline bool make_multipart_ranges_data(const Request &req, Response &res,
+inline void make_multipart_ranges_data(const Request &req, Response &res,
                                        const std::string &boundary,
                                        const std::string &content_type,
+                                       size_t content_length,
                                        std::string &data) {
-  return process_multipart_ranges_data(
-      req, res, boundary, content_type,
+  process_multipart_ranges_data(
+      req, boundary, content_type, content_length,
+      [&](const std::string &token) { data += token; },
       [&](const std::string &token) { data += token; },
-      [&](const char *token) { data += token; },
       [&](size_t offset, size_t length) {
-        if (offset < res.body.size()) {
-          data += res.body.substr(offset, length);
-          return true;
-        }
-        return false;
+        assert(offset + length <= content_length);
+        data += res.body.substr(offset, length);
+        return true;
       });
 }
 
-inline size_t
-get_multipart_ranges_data_length(const Request &req, Response &res,
-                                 const std::string &boundary,
-                                 const std::string &content_type) {
+inline size_t get_multipart_ranges_data_length(const Request &req,
+                                               const std::string &boundary,
+                                               const std::string &content_type,
+                                               size_t content_length) {
   size_t data_length = 0;
 
   process_multipart_ranges_data(
-      req, res, boundary, content_type,
+      req, boundary, content_type, content_length,
+      [&](const std::string &token) { data_length += token.size(); },
       [&](const std::string &token) { data_length += token.size(); },
-      [&](const char *token) { data_length += strlen(token); },
       [&](size_t /*offset*/, size_t length) {
         data_length += length;
         return true;
@@ -4124,33 +4879,21 @@ get_multipart_ranges_data_length(const Request &req, Response &res,
 }
 
 template <typename T>
-inline bool write_multipart_ranges_data(Stream &strm, const Request &req,
-                                        Response &res,
-                                        const std::string &boundary,
-                                        const std::string &content_type,
-                                        const T &is_shutting_down) {
+inline bool
+write_multipart_ranges_data(Stream &strm, const Request &req, Response &res,
+                            const std::string &boundary,
+                            const std::string &content_type,
+                            size_t content_length, const T &is_shutting_down) {
   return process_multipart_ranges_data(
-      req, res, boundary, content_type,
+      req, boundary, content_type, content_length,
+      [&](const std::string &token) { strm.write(token); },
       [&](const std::string &token) { strm.write(token); },
-      [&](const char *token) { strm.write(token); },
       [&](size_t offset, size_t length) {
         return write_content(strm, res.content_provider_, offset, length,
                              is_shutting_down);
       });
 }
 
-inline std::pair<size_t, size_t>
-get_range_offset_and_length(const Request &req, const Response &res,
-                            size_t index) {
-  auto r = req.ranges[index];
-
-  if (r.second == -1) {
-    r.second = static_cast<ssize_t>(res.content_length_) - 1;
-  }
-
-  return std::make_pair(r.first, r.second - r.first + 1);
-}
-
 inline bool expect_content(const Request &req) {
   if (req.method == "POST" || req.method == "PUT" || req.method == "PATCH" ||
       req.method == "PRI" || req.method == "DELETE") {
@@ -4160,8 +4903,8 @@ inline bool expect_content(const Request &req) {
   return false;
 }
 
-inline bool has_crlf(const char *s) {
-  auto p = s;
+inline bool has_crlf(const std::string &s) {
+  auto p = s.c_str();
   while (*p) {
     if (*p == '\r' || *p == '\n') { return true; }
     p++;
@@ -4184,7 +4927,7 @@ inline std::string message_digest(const std::string &s, const EVP_MD *algo) {
   std::stringstream ss;
   for (auto i = 0u; i < hash_length; ++i) {
     ss << std::hex << std::setw(2) << std::setfill('0')
-       << (unsigned int)hash[i];
+       << static_cast<unsigned int>(hash[i]);
   }
 
   return ss.str();
@@ -4203,15 +4946,15 @@ inline std::string SHA_512(const std::string &s) {
 }
 #endif
 
-#ifdef _WIN32
 #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+#ifdef _WIN32
 // NOTE: This code came up with the following stackoverflow post:
 // https://stackoverflow.com/questions/9507184/can-openssl-on-windows-use-the-system-certificate-store
 inline bool load_system_certs_on_windows(X509_STORE *store) {
   auto hStore = CertOpenSystemStoreW((HCRYPTPROV_LEGACY)NULL, L"ROOT");
-
   if (!hStore) { return false; }
 
+  auto result = false;
   PCCERT_CONTEXT pContext = NULL;
   while ((pContext = CertEnumCertificatesInStore(hStore, pContext)) !=
          nullptr) {
@@ -4222,16 +4965,109 @@ inline bool load_system_certs_on_windows(X509_STORE *store) {
     if (x509) {
       X509_STORE_add_cert(store, x509);
       X509_free(x509);
+      result = true;
     }
   }
 
   CertFreeCertificateContext(pContext);
   CertCloseStore(hStore, 0);
 
+  return result;
+}
+#elif defined(CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN) && defined(__APPLE__)
+#if TARGET_OS_OSX
+template <typename T>
+using CFObjectPtr =
+    std::unique_ptr<typename std::remove_pointer<T>::type, void (*)(CFTypeRef)>;
+
+inline void cf_object_ptr_deleter(CFTypeRef obj) {
+  if (obj) { CFRelease(obj); }
+}
+
+inline bool retrieve_certs_from_keychain(CFObjectPtr<CFArrayRef> &certs) {
+  CFStringRef keys[] = {kSecClass, kSecMatchLimit, kSecReturnRef};
+  CFTypeRef values[] = {kSecClassCertificate, kSecMatchLimitAll,
+                        kCFBooleanTrue};
+
+  CFObjectPtr<CFDictionaryRef> query(
+      CFDictionaryCreate(nullptr, reinterpret_cast<const void **>(keys), values,
+                         sizeof(keys) / sizeof(keys[0]),
+                         &kCFTypeDictionaryKeyCallBacks,
+                         &kCFTypeDictionaryValueCallBacks),
+      cf_object_ptr_deleter);
+
+  if (!query) { return false; }
+
+  CFTypeRef security_items = nullptr;
+  if (SecItemCopyMatching(query.get(), &security_items) != errSecSuccess ||
+      CFArrayGetTypeID() != CFGetTypeID(security_items)) {
+    return false;
+  }
+
+  certs.reset(reinterpret_cast<CFArrayRef>(security_items));
   return true;
 }
-#endif
 
+inline bool retrieve_root_certs_from_keychain(CFObjectPtr<CFArrayRef> &certs) {
+  CFArrayRef root_security_items = nullptr;
+  if (SecTrustCopyAnchorCertificates(&root_security_items) != errSecSuccess) {
+    return false;
+  }
+
+  certs.reset(root_security_items);
+  return true;
+}
+
+inline bool add_certs_to_x509_store(CFArrayRef certs, X509_STORE *store) {
+  auto result = false;
+  for (auto i = 0; i < CFArrayGetCount(certs); ++i) {
+    const auto cert = reinterpret_cast<const __SecCertificate *>(
+        CFArrayGetValueAtIndex(certs, i));
+
+    if (SecCertificateGetTypeID() != CFGetTypeID(cert)) { continue; }
+
+    CFDataRef cert_data = nullptr;
+    if (SecItemExport(cert, kSecFormatX509Cert, 0, nullptr, &cert_data) !=
+        errSecSuccess) {
+      continue;
+    }
+
+    CFObjectPtr<CFDataRef> cert_data_ptr(cert_data, cf_object_ptr_deleter);
+
+    auto encoded_cert = static_cast<const unsigned char *>(
+        CFDataGetBytePtr(cert_data_ptr.get()));
+
+    auto x509 =
+        d2i_X509(NULL, &encoded_cert, CFDataGetLength(cert_data_ptr.get()));
+
+    if (x509) {
+      X509_STORE_add_cert(store, x509);
+      X509_free(x509);
+      result = true;
+    }
+  }
+
+  return result;
+}
+
+inline bool load_system_certs_on_macos(X509_STORE *store) {
+  auto result = false;
+  CFObjectPtr<CFArrayRef> certs(nullptr, cf_object_ptr_deleter);
+  if (retrieve_certs_from_keychain(certs) && certs) {
+    result = add_certs_to_x509_store(certs.get(), store);
+  }
+
+  if (retrieve_root_certs_from_keychain(certs) && certs) {
+    result = add_certs_to_x509_store(certs.get(), store) || result;
+  }
+
+  return result;
+}
+#endif // TARGET_OS_OSX
+#endif // _WIN32
+#endif // CPPHTTPLIB_OPENSSL_SUPPORT
+
+#ifdef _WIN32
 class WSInit {
 public:
   WSInit() {
@@ -4327,7 +5163,7 @@ inline bool parse_www_authenticate(const Response &res,
         s = s.substr(pos + 1);
         auto beg = std::sregex_iterator(s.begin(), s.end(), re);
         for (auto i = beg; i != std::sregex_iterator(); ++i) {
-          auto m = *i;
+          const auto &m = *i;
           auto key = s.substr(static_cast<size_t>(m.position(1)),
                               static_cast<size_t>(m.length(1)));
           auto val = m.length(2) > 0
@@ -4344,20 +5180,6 @@ inline bool parse_www_authenticate(const Response &res,
   return false;
 }
 
-// https://stackoverflow.com/questions/440133/how-do-i-create-a-random-alpha-numeric-string-in-c/440240#answer-440240
-inline std::string random_string(size_t length) {
-  auto randchar = []() -> char {
-    const char charset[] = "0123456789"
-                           "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                           "abcdefghijklmnopqrstuvwxyz";
-    const size_t max_index = (sizeof(charset) - 1);
-    return charset[static_cast<size_t>(std::rand()) % max_index];
-  };
-  std::string str(length, 0);
-  std::generate_n(str.begin(), length, randchar);
-  return str;
-}
-
 class ContentProviderAdapter {
 public:
   explicit ContentProviderAdapter(
@@ -4374,14 +5196,15 @@ class ContentProviderAdapter {
 
 } // namespace detail
 
-inline std::string hosted_at(const char *hostname) {
+inline std::string hosted_at(const std::string &hostname) {
   std::vector<std::string> addrs;
   hosted_at(hostname, addrs);
   if (addrs.empty()) { return std::string(); }
   return addrs[0];
 }
 
-inline void hosted_at(const char *hostname, std::vector<std::string> &addrs) {
+inline void hosted_at(const std::string &hostname,
+                      std::vector<std::string> &addrs) {
   struct addrinfo hints;
   struct addrinfo *result;
 
@@ -4390,7 +5213,7 @@ inline void hosted_at(const char *hostname, std::vector<std::string> &addrs) {
   hints.ai_socktype = SOCK_STREAM;
   hints.ai_protocol = 0;
 
-  if (getaddrinfo(hostname, nullptr, &hints, &result)) {
+  if (getaddrinfo(hostname.c_str(), nullptr, &hints, &result)) {
 #if defined __linux__ && !defined __ANDROID__
     res_init();
 #endif
@@ -4401,15 +5224,18 @@ inline void hosted_at(const char *hostname, std::vector<std::string> &addrs) {
     const auto &addr =
         *reinterpret_cast<struct sockaddr_storage *>(rp->ai_addr);
     std::string ip;
-    int dummy = -1;
-    if (detail::get_remote_ip_and_port(addr, sizeof(struct sockaddr_storage),
-                                       ip, dummy)) {
+    auto dummy = -1;
+    if (detail::get_ip_and_port(addr, sizeof(struct sockaddr_storage), ip,
+                                dummy)) {
       addrs.push_back(ip);
     }
   }
+
+  freeaddrinfo(result);
 }
 
-inline std::string append_query_params(const char *path, const Params &params) {
+inline std::string append_query_params(const std::string &path,
+                                       const Params &params) {
   std::string path_with_query = path;
   const static std::regex re("[^?]+\\?.*");
   auto delm = std::regex_match(path, re) ? '&' : '?';
@@ -4418,10 +5244,11 @@ inline std::string append_query_params(const char *path, const Params &params) {
 }
 
 // Header utilities
-inline std::pair<std::string, std::string> make_range_header(Ranges ranges) {
+inline std::pair<std::string, std::string>
+make_range_header(const Ranges &ranges) {
   std::string field = "bytes=";
   auto i = 0;
-  for (auto r : ranges) {
+  for (const auto &r : ranges) {
     if (i != 0) { field += ", "; }
     if (r.first != -1) { field += std::to_string(r.first); }
     field += '-';
@@ -4448,36 +5275,33 @@ make_bearer_token_authentication_header(const std::string &token,
 }
 
 // Request implementation
-inline bool Request::has_header(const char *key) const {
+inline bool Request::has_header(const std::string &key) const {
   return detail::has_header(headers, key);
 }
 
-inline std::string Request::get_header_value(const char *key, size_t id) const {
+inline std::string Request::get_header_value(const std::string &key,
+                                             size_t id) const {
   return detail::get_header_value(headers, key, id, "");
 }
 
-inline size_t Request::get_header_value_count(const char *key) const {
+inline size_t Request::get_header_value_count(const std::string &key) const {
   auto r = headers.equal_range(key);
   return static_cast<size_t>(std::distance(r.first, r.second));
 }
 
-inline void Request::set_header(const char *key, const char *val) {
+inline void Request::set_header(const std::string &key,
+                                const std::string &val) {
   if (!detail::has_crlf(key) && !detail::has_crlf(val)) {
     headers.emplace(key, val);
   }
 }
 
-inline void Request::set_header(const char *key, const std::string &val) {
-  if (!detail::has_crlf(key) && !detail::has_crlf(val.c_str())) {
-    headers.emplace(key, val);
-  }
-}
-
-inline bool Request::has_param(const char *key) const {
+inline bool Request::has_param(const std::string &key) const {
   return params.find(key) != params.end();
 }
 
-inline std::string Request::get_param_value(const char *key, size_t id) const {
+inline std::string Request::get_param_value(const std::string &key,
+                                            size_t id) const {
   auto rng = params.equal_range(key);
   auto it = rng.first;
   std::advance(it, static_cast<ssize_t>(id));
@@ -4485,7 +5309,7 @@ inline std::string Request::get_param_value(const char *key, size_t id) const {
   return std::string();
 }
 
-inline size_t Request::get_param_value_count(const char *key) const {
+inline size_t Request::get_param_value_count(const std::string &key) const {
   auto r = params.equal_range(key);
   return static_cast<size_t>(std::distance(r.first, r.second));
 }
@@ -4495,60 +5319,61 @@ inline bool Request::is_multipart_form_data() const {
   return !content_type.rfind("multipart/form-data", 0);
 }
 
-inline bool Request::has_file(const char *key) const {
+inline bool Request::has_file(const std::string &key) const {
   return files.find(key) != files.end();
 }
 
-inline MultipartFormData Request::get_file_value(const char *key) const {
+inline MultipartFormData Request::get_file_value(const std::string &key) const {
   auto it = files.find(key);
   if (it != files.end()) { return it->second; }
   return MultipartFormData();
 }
 
+inline std::vector<MultipartFormData>
+Request::get_file_values(const std::string &key) const {
+  std::vector<MultipartFormData> values;
+  auto rng = files.equal_range(key);
+  for (auto it = rng.first; it != rng.second; it++) {
+    values.push_back(it->second);
+  }
+  return values;
+}
+
 // Response implementation
-inline bool Response::has_header(const char *key) const {
+inline bool Response::has_header(const std::string &key) const {
   return headers.find(key) != headers.end();
 }
 
-inline std::string Response::get_header_value(const char *key,
+inline std::string Response::get_header_value(const std::string &key,
                                               size_t id) const {
   return detail::get_header_value(headers, key, id, "");
 }
 
-inline size_t Response::get_header_value_count(const char *key) const {
+inline size_t Response::get_header_value_count(const std::string &key) const {
   auto r = headers.equal_range(key);
   return static_cast<size_t>(std::distance(r.first, r.second));
 }
 
-inline void Response::set_header(const char *key, const char *val) {
+inline void Response::set_header(const std::string &key,
+                                 const std::string &val) {
   if (!detail::has_crlf(key) && !detail::has_crlf(val)) {
     headers.emplace(key, val);
   }
 }
 
-inline void Response::set_header(const char *key, const std::string &val) {
-  if (!detail::has_crlf(key) && !detail::has_crlf(val.c_str())) {
-    headers.emplace(key, val);
-  }
-}
-
-inline void Response::set_redirect(const char *url, int stat) {
+inline void Response::set_redirect(const std::string &url, int stat) {
   if (!detail::has_crlf(url)) {
     set_header("Location", url);
     if (300 <= stat && stat < 400) {
       this->status = stat;
     } else {
-      this->status = 302;
+      this->status = StatusCode::Found_302;
     }
   }
 }
 
-inline void Response::set_redirect(const std::string &url, int stat) {
-  set_redirect(url.c_str(), stat);
-}
-
 inline void Response::set_content(const char *s, size_t n,
-                                  const char *content_type) {
+                                  const std::string &content_type) {
   body.assign(s, n);
 
   auto rng = headers.equal_range("Content-Type");
@@ -4557,52 +5382,61 @@ inline void Response::set_content(const char *s, size_t n,
 }
 
 inline void Response::set_content(const std::string &s,
-                                  const char *content_type) {
+                                  const std::string &content_type) {
   set_content(s.data(), s.size(), content_type);
 }
 
+inline void Response::set_content(std::string &&s,
+                                  const std::string &content_type) {
+  body = std::move(s);
+
+  auto rng = headers.equal_range("Content-Type");
+  headers.erase(rng.first, rng.second);
+  set_header("Content-Type", content_type);
+}
+
 inline void Response::set_content_provider(
-    size_t in_length, const char *content_type, ContentProvider provider,
+    size_t in_length, const std::string &content_type, ContentProvider provider,
     ContentProviderResourceReleaser resource_releaser) {
-  assert(in_length > 0);
   set_header("Content-Type", content_type);
   content_length_ = in_length;
-  content_provider_ = std::move(provider);
-  content_provider_resource_releaser_ = resource_releaser;
+  if (in_length > 0) { content_provider_ = std::move(provider); }
+  content_provider_resource_releaser_ = std::move(resource_releaser);
   is_chunked_content_provider_ = false;
 }
 
 inline void Response::set_content_provider(
-    const char *content_type, ContentProviderWithoutLength provider,
+    const std::string &content_type, ContentProviderWithoutLength provider,
     ContentProviderResourceReleaser resource_releaser) {
   set_header("Content-Type", content_type);
   content_length_ = 0;
   content_provider_ = detail::ContentProviderAdapter(std::move(provider));
-  content_provider_resource_releaser_ = resource_releaser;
+  content_provider_resource_releaser_ = std::move(resource_releaser);
   is_chunked_content_provider_ = false;
 }
 
 inline void Response::set_chunked_content_provider(
-    const char *content_type, ContentProviderWithoutLength provider,
+    const std::string &content_type, ContentProviderWithoutLength provider,
     ContentProviderResourceReleaser resource_releaser) {
   set_header("Content-Type", content_type);
   content_length_ = 0;
   content_provider_ = detail::ContentProviderAdapter(std::move(provider));
-  content_provider_resource_releaser_ = resource_releaser;
+  content_provider_resource_releaser_ = std::move(resource_releaser);
   is_chunked_content_provider_ = true;
 }
 
 // Result implementation
-inline bool Result::has_request_header(const char *key) const {
+inline bool Result::has_request_header(const std::string &key) const {
   return request_headers_.find(key) != request_headers_.end();
 }
 
-inline std::string Result::get_request_header_value(const char *key,
+inline std::string Result::get_request_header_value(const std::string &key,
                                                     size_t id) const {
   return detail::get_header_value(request_headers_, key, id, "");
 }
 
-inline size_t Result::get_request_header_value_count(const char *key) const {
+inline size_t
+Result::get_request_header_value_count(const std::string &key) const {
   auto r = request_headers_.equal_range(key);
   return static_cast<size_t>(std::distance(r.first, r.second));
 }
@@ -4628,14 +5462,15 @@ inline SocketStream::SocketStream(socket_t sock, time_t read_timeout_sec,
       write_timeout_sec_(write_timeout_sec),
       write_timeout_usec_(write_timeout_usec), read_buff_(read_buff_size_, 0) {}
 
-inline SocketStream::~SocketStream() {}
+inline SocketStream::~SocketStream() = default;
 
 inline bool SocketStream::is_readable() const {
   return select_read(sock_, read_timeout_sec_, read_timeout_usec_) > 0;
 }
 
 inline bool SocketStream::is_writable() const {
-  return select_write(sock_, write_timeout_sec_, write_timeout_usec_) > 0;
+  return select_write(sock_, write_timeout_sec_, write_timeout_usec_) > 0 &&
+         is_socket_alive(sock_);
 }
 
 inline ssize_t SocketStream::read(char *ptr, size_t size) {
@@ -4687,7 +5522,7 @@ inline ssize_t SocketStream::read(char *ptr, size_t size) {
 inline ssize_t SocketStream::write(const char *ptr, size_t size) {
   if (!is_writable()) { return -1; }
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(_WIN64)
   size =
       (std::min)(size, static_cast<size_t>((std::numeric_limits<int>::max)()));
 #endif
@@ -4700,6 +5535,11 @@ inline void SocketStream::get_remote_ip_and_port(std::string &ip,
   return detail::get_remote_ip_and_port(sock_, ip, port);
 }
 
+inline void SocketStream::get_local_ip_and_port(std::string &ip,
+                                                int &port) const {
+  return detail::get_local_ip_and_port(sock_, ip, port);
+}
+
 inline socket_t SocketStream::socket() const { return sock_; }
 
 // Buffer stream implementation
@@ -4708,7 +5548,7 @@ inline bool BufferStream::is_readable() const { return true; }
 inline bool BufferStream::is_writable() const { return true; }
 
 inline ssize_t BufferStream::read(char *ptr, size_t size) {
-#if defined(_MSC_VER) && _MSC_VER <= 1900
+#if defined(_MSC_VER) && _MSC_VER < 1910
   auto len_read = buffer._Copy_s(ptr, size, size, position);
 #else
   auto len_read = buffer.copy(ptr, size, position);
@@ -4725,85 +5565,183 @@ inline ssize_t BufferStream::write(const char *ptr, size_t size) {
 inline void BufferStream::get_remote_ip_and_port(std::string & /*ip*/,
                                                  int & /*port*/) const {}
 
+inline void BufferStream::get_local_ip_and_port(std::string & /*ip*/,
+                                                int & /*port*/) const {}
+
 inline socket_t BufferStream::socket() const { return 0; }
 
 inline const std::string &BufferStream::get_buffer() const { return buffer; }
 
+inline PathParamsMatcher::PathParamsMatcher(const std::string &pattern) {
+  // One past the last ending position of a path param substring
+  std::size_t last_param_end = 0;
+
+#ifndef CPPHTTPLIB_NO_EXCEPTIONS
+  // Needed to ensure that parameter names are unique during matcher
+  // construction
+  // If exceptions are disabled, only last duplicate path
+  // parameter will be set
+  std::unordered_set<std::string> param_name_set;
+#endif
+
+  while (true) {
+    const auto marker_pos = pattern.find(marker, last_param_end);
+    if (marker_pos == std::string::npos) { break; }
+
+    static_fragments_.push_back(
+        pattern.substr(last_param_end, marker_pos - last_param_end));
+
+    const auto param_name_start = marker_pos + 1;
+
+    auto sep_pos = pattern.find(separator, param_name_start);
+    if (sep_pos == std::string::npos) { sep_pos = pattern.length(); }
+
+    auto param_name =
+        pattern.substr(param_name_start, sep_pos - param_name_start);
+
+#ifndef CPPHTTPLIB_NO_EXCEPTIONS
+    if (param_name_set.find(param_name) != param_name_set.cend()) {
+      std::string msg = "Encountered path parameter '" + param_name +
+                        "' multiple times in route pattern '" + pattern + "'.";
+      throw std::invalid_argument(msg);
+    }
+#endif
+
+    param_names_.push_back(std::move(param_name));
+
+    last_param_end = sep_pos + 1;
+  }
+
+  if (last_param_end < pattern.length()) {
+    static_fragments_.push_back(pattern.substr(last_param_end));
+  }
+}
+
+inline bool PathParamsMatcher::match(Request &request) const {
+  request.matches = std::smatch();
+  request.path_params.clear();
+  request.path_params.reserve(param_names_.size());
+
+  // One past the position at which the path matched the pattern last time
+  std::size_t starting_pos = 0;
+  for (size_t i = 0; i < static_fragments_.size(); ++i) {
+    const auto &fragment = static_fragments_[i];
+
+    if (starting_pos + fragment.length() > request.path.length()) {
+      return false;
+    }
+
+    // Avoid unnecessary allocation by using strncmp instead of substr +
+    // comparison
+    if (std::strncmp(request.path.c_str() + starting_pos, fragment.c_str(),
+                     fragment.length()) != 0) {
+      return false;
+    }
+
+    starting_pos += fragment.length();
+
+    // Should only happen when we have a static fragment after a param
+    // Example: '/users/:id/subscriptions'
+    // The 'subscriptions' fragment here does not have a corresponding param
+    if (i >= param_names_.size()) { continue; }
+
+    auto sep_pos = request.path.find(separator, starting_pos);
+    if (sep_pos == std::string::npos) { sep_pos = request.path.length(); }
+
+    const auto &param_name = param_names_[i];
+
+    request.path_params.emplace(
+        param_name, request.path.substr(starting_pos, sep_pos - starting_pos));
+
+    // Mark everythin up to '/' as matched
+    starting_pos = sep_pos + 1;
+  }
+  // Returns false if the path is longer than the pattern
+  return starting_pos >= request.path.length();
+}
+
+inline bool RegexMatcher::match(Request &request) const {
+  request.path_params.clear();
+  return std::regex_match(request.path, request.matches, regex_);
+}
+
 } // namespace detail
 
 // HTTP server implementation
 inline Server::Server()
     : new_task_queue(
-          [] { return new ThreadPool(CPPHTTPLIB_THREAD_POOL_COUNT); }),
-      svr_sock_(INVALID_SOCKET), is_running_(false) {
+          [] { return new ThreadPool(CPPHTTPLIB_THREAD_POOL_COUNT); }) {
 #ifndef _WIN32
   signal(SIGPIPE, SIG_IGN);
 #endif
 }
 
-inline Server::~Server() {}
+inline Server::~Server() = default;
+
+inline std::unique_ptr<detail::MatcherBase>
+Server::make_matcher(const std::string &pattern) {
+  if (pattern.find("/:") != std::string::npos) {
+    return detail::make_unique<detail::PathParamsMatcher>(pattern);
+  } else {
+    return detail::make_unique<detail::RegexMatcher>(pattern);
+  }
+}
 
 inline Server &Server::Get(const std::string &pattern, Handler handler) {
-  get_handlers_.push_back(
-      std::make_pair(std::regex(pattern), std::move(handler)));
+  get_handlers_.emplace_back(make_matcher(pattern), std::move(handler));
   return *this;
 }
 
 inline Server &Server::Post(const std::string &pattern, Handler handler) {
-  post_handlers_.push_back(
-      std::make_pair(std::regex(pattern), std::move(handler)));
+  post_handlers_.emplace_back(make_matcher(pattern), std::move(handler));
   return *this;
 }
 
 inline Server &Server::Post(const std::string &pattern,
                             HandlerWithContentReader handler) {
-  post_handlers_for_content_reader_.push_back(
-      std::make_pair(std::regex(pattern), std::move(handler)));
+  post_handlers_for_content_reader_.emplace_back(make_matcher(pattern),
+                                                 std::move(handler));
   return *this;
 }
 
 inline Server &Server::Put(const std::string &pattern, Handler handler) {
-  put_handlers_.push_back(
-      std::make_pair(std::regex(pattern), std::move(handler)));
+  put_handlers_.emplace_back(make_matcher(pattern), std::move(handler));
   return *this;
 }
 
 inline Server &Server::Put(const std::string &pattern,
                            HandlerWithContentReader handler) {
-  put_handlers_for_content_reader_.push_back(
-      std::make_pair(std::regex(pattern), std::move(handler)));
+  put_handlers_for_content_reader_.emplace_back(make_matcher(pattern),
+                                                std::move(handler));
   return *this;
 }
 
 inline Server &Server::Patch(const std::string &pattern, Handler handler) {
-  patch_handlers_.push_back(
-      std::make_pair(std::regex(pattern), std::move(handler)));
+  patch_handlers_.emplace_back(make_matcher(pattern), std::move(handler));
   return *this;
 }
 
 inline Server &Server::Patch(const std::string &pattern,
                              HandlerWithContentReader handler) {
-  patch_handlers_for_content_reader_.push_back(
-      std::make_pair(std::regex(pattern), std::move(handler)));
+  patch_handlers_for_content_reader_.emplace_back(make_matcher(pattern),
+                                                  std::move(handler));
   return *this;
 }
 
 inline Server &Server::Delete(const std::string &pattern, Handler handler) {
-  delete_handlers_.push_back(
-      std::make_pair(std::regex(pattern), std::move(handler)));
+  delete_handlers_.emplace_back(make_matcher(pattern), std::move(handler));
   return *this;
 }
 
 inline Server &Server::Delete(const std::string &pattern,
                               HandlerWithContentReader handler) {
-  delete_handlers_for_content_reader_.push_back(
-      std::make_pair(std::regex(pattern), std::move(handler)));
+  delete_handlers_for_content_reader_.emplace_back(make_matcher(pattern),
+                                                   std::move(handler));
   return *this;
 }
 
 inline Server &Server::Options(const std::string &pattern, Handler handler) {
-  options_handlers_.push_back(
-      std::make_pair(std::regex(pattern), std::move(handler)));
+  options_handlers_.emplace_back(make_matcher(pattern), std::move(handler));
   return *this;
 }
 
@@ -4835,12 +5773,17 @@ inline bool Server::remove_mount_point(const std::string &mount_point) {
 }
 
 inline Server &
-Server::set_file_extension_and_mimetype_mapping(const char *ext,
-                                                const char *mime) {
+Server::set_file_extension_and_mimetype_mapping(const std::string &ext,
+                                                const std::string &mime) {
   file_extension_and_mimetype_map_[ext] = mime;
   return *this;
 }
 
+inline Server &Server::set_default_file_mimetype(const std::string &mime) {
+  default_file_mimetype_ = mime;
+  return *this;
+}
+
 inline Server &Server::set_file_request_handler(Handler handler) {
   file_request_handler_ = std::move(handler);
   return *this;
@@ -4882,7 +5825,6 @@ inline Server &Server::set_logger(Logger logger) {
 inline Server &
 Server::set_expect_100_continue_handler(Expect100ContinueHandler handler) {
   expect_100_continue_handler_ = std::move(handler);
-
   return *this;
 }
 
@@ -4906,6 +5848,12 @@ inline Server &Server::set_default_headers(Headers headers) {
   return *this;
 }
 
+inline Server &Server::set_header_writer(
+    std::function<ssize_t(Stream &, Headers &)> const &writer) {
+  header_writer_ = writer;
+  return *this;
+}
+
 inline Server &Server::set_keep_alive_max_count(size_t count) {
   keep_alive_max_count_ = count;
   return *this;
@@ -4939,22 +5887,33 @@ inline Server &Server::set_payload_max_length(size_t length) {
   return *this;
 }
 
-inline bool Server::bind_to_port(const char *host, int port, int socket_flags) {
-  if (bind_internal(host, port, socket_flags) < 0) return false;
-  return true;
+inline bool Server::bind_to_port(const std::string &host, int port,
+                                 int socket_flags) {
+  return bind_internal(host, port, socket_flags) >= 0;
 }
-inline int Server::bind_to_any_port(const char *host, int socket_flags) {
+inline int Server::bind_to_any_port(const std::string &host, int socket_flags) {
   return bind_internal(host, 0, socket_flags);
 }
 
-inline bool Server::listen_after_bind() { return listen_internal(); }
+inline bool Server::listen_after_bind() {
+  auto se = detail::scope_exit([&]() { done_ = true; });
+  return listen_internal();
+}
 
-inline bool Server::listen(const char *host, int port, int socket_flags) {
+inline bool Server::listen(const std::string &host, int port,
+                           int socket_flags) {
+  auto se = detail::scope_exit([&]() { done_ = true; });
   return bind_to_port(host, port, socket_flags) && listen_internal();
 }
 
 inline bool Server::is_running() const { return is_running_; }
 
+inline void Server::wait_until_ready() const {
+  while (!is_running() && !done_) {
+    std::this_thread::sleep_for(std::chrono::milliseconds{1});
+  }
+}
+
 inline void Server::stop() {
   if (is_running_) {
     assert(svr_sock_ != INVALID_SOCKET);
@@ -4964,7 +5923,7 @@ inline void Server::stop() {
   }
 }
 
-inline bool Server::parse_request_line(const char *s, Request &req) {
+inline bool Server::parse_request_line(const char *s, Request &req) const {
   auto len = strlen(s);
   if (len < 2 || s[len - 2] != '\r' || s[len - 1] != '\n') { return false; }
   len -= 2;
@@ -5005,7 +5964,7 @@ inline bool Server::parse_request_line(const char *s, Request &req) {
     size_t count = 0;
 
     detail::split(req.target.data(), req.target.data() + req.target.size(), '?',
-                  [&](const char *b, const char *e) {
+                  2, [&](const char *b, const char *e) {
                     switch (count) {
                     case 0:
                       req.path = detail::decode_url(std::string(b, e), false);
@@ -5028,7 +5987,10 @@ inline bool Server::parse_request_line(const char *s, Request &req) {
 }
 
 inline bool Server::write_response(Stream &strm, bool close_connection,
-                                   const Request &req, Response &res) {
+                                   Request &req, Response &res) {
+  // NOTE: `req.ranges` should be empty, otherwise it will be applied
+  // incorrectly to the error content.
+  req.ranges.clear();
   return write_response_core(strm, close_connection, req, res, false);
 }
 
@@ -5084,27 +6046,28 @@ inline bool Server::write_response_core(Stream &strm, bool close_connection,
     detail::BufferStream bstrm;
 
     if (!bstrm.write_format("HTTP/1.1 %d %s\r\n", res.status,
-                            detail::status_message(res.status))) {
+                            status_message(res.status))) {
       return false;
     }
 
-    if (!detail::write_headers(bstrm, res.headers)) { return false; }
+    if (!header_writer_(bstrm, res.headers)) { return false; }
 
     // Flush buffer
     auto &data = bstrm.get_buffer();
-    strm.write(data.data(), data.size());
+    detail::write_data(strm, data.data(), data.size());
   }
 
   // Body
   auto ret = true;
   if (req.method != "HEAD") {
     if (!res.body.empty()) {
-      if (!strm.write(res.body)) { ret = false; }
+      if (!detail::write_data(strm, res.body.data(), res.body.size())) {
+        ret = false;
+      }
     } else if (res.content_provider_) {
       if (write_content_with_provider(strm, req, res, boundary, content_type)) {
         res.content_provider_success_ = true;
       } else {
-        res.content_provider_success_ = false;
         ret = false;
       }
     }
@@ -5129,15 +6092,16 @@ Server::write_content_with_provider(Stream &strm, const Request &req,
       return detail::write_content(strm, res.content_provider_, 0,
                                    res.content_length_, is_shutting_down);
     } else if (req.ranges.size() == 1) {
-      auto offsets =
-          detail::get_range_offset_and_length(req, res.content_length_, 0);
-      auto offset = offsets.first;
-      auto length = offsets.second;
-      return detail::write_content(strm, res.content_provider_, offset, length,
-                                   is_shutting_down);
+      auto offset_and_length = detail::get_range_offset_and_length(
+          req.ranges[0], res.content_length_);
+
+      return detail::write_content(strm, res.content_provider_,
+                                   offset_and_length.first,
+                                   offset_and_length.second, is_shutting_down);
     } else {
       return detail::write_multipart_ranges_data(
-          strm, req, res, boundary, content_type, is_shutting_down);
+          strm, req, res, boundary, content_type, res.content_length_,
+          is_shutting_down);
     }
   } else {
     if (res.is_chunked_content_provider_) {
@@ -5168,6 +6132,7 @@ Server::write_content_with_provider(Stream &strm, const Request &req,
 
 inline bool Server::read_content(Stream &strm, Request &req, Response &res) {
   MultipartFormDataMap::iterator cur;
+  auto file_count = 0;
   if (read_content_core(
           strm, req, res,
           // Regular
@@ -5178,6 +6143,9 @@ inline bool Server::read_content(Stream &strm, Request &req, Response &res) {
           },
           // Multipart
           [&](const MultipartFormData &file) {
+            if (file_count++ == CPPHTTPLIB_MULTIPART_FORM_DATA_FILE_MAX_COUNT) {
+              return false;
+            }
             cur = req.files.emplace(file.name, file);
             return true;
           },
@@ -5189,8 +6157,8 @@ inline bool Server::read_content(Stream &strm, Request &req, Response &res) {
           })) {
     const auto &content_type = req.get_header_value("Content-Type");
     if (!content_type.find("application/x-www-form-urlencoded")) {
-      if (req.body.size() > CPPHTTPLIB_REQUEST_URI_MAX_LENGTH) {
-        res.status = 413; // NOTE: should be 414?
+      if (req.body.size() > CPPHTTPLIB_FORM_URL_ENCODED_PAYLOAD_MAX_LENGTH) {
+        res.status = StatusCode::PayloadTooLarge_413; // NOTE: should be 414?
         return false;
       }
       detail::parse_query_text(req.body, req.params);
@@ -5209,10 +6177,11 @@ inline bool Server::read_content_with_content_receiver(
                            std::move(multipart_receiver));
 }
 
-inline bool Server::read_content_core(Stream &strm, Request &req, Response &res,
-                                      ContentReceiver receiver,
-                                      MultipartContentHeader mulitpart_header,
-                                      ContentReceiver multipart_receiver) {
+inline bool
+Server::read_content_core(Stream &strm, Request &req, Response &res,
+                          ContentReceiver receiver,
+                          MultipartContentHeader multipart_header,
+                          ContentReceiver multipart_receiver) const {
   detail::MultipartFormDataParser multipart_form_data_parser;
   ContentReceiverWithProgress out;
 
@@ -5220,7 +6189,7 @@ inline bool Server::read_content_core(Stream &strm, Request &req, Response &res,
     const auto &content_type = req.get_header_value("Content-Type");
     std::string boundary;
     if (!detail::parse_multipart_boundary(content_type, boundary)) {
-      res.status = 400;
+      res.status = StatusCode::BadRequest_400;
       return false;
     }
 
@@ -5231,14 +6200,14 @@ inline bool Server::read_content_core(Stream &strm, Request &req, Response &res,
       while (pos < n) {
         auto read_size = (std::min)<size_t>(1, n - pos);
         auto ret = multipart_form_data_parser.parse(
-            buf + pos, read_size, multipart_receiver, mulitpart_header);
+            buf + pos, read_size, multipart_receiver, multipart_header);
         if (!ret) { return false; }
         pos += read_size;
       }
       return true;
       */
       return multipart_form_data_parser.parse(buf, n, multipart_receiver,
-                                              mulitpart_header);
+                                              multipart_header);
     };
   } else {
     out = [receiver](const char *buf, size_t n, uint64_t /*off*/,
@@ -5256,7 +6225,7 @@ inline bool Server::read_content_core(Stream &strm, Request &req, Response &res,
 
   if (req.is_multipart_form_data()) {
     if (!multipart_form_data_parser.is_valid()) {
-      res.status = 400;
+      res.status = StatusCode::BadRequest_400;
       return false;
     }
   }
@@ -5275,17 +6244,26 @@ inline bool Server::handle_file_request(const Request &req, Response &res,
         if (path.back() == '/') { path += "index.html"; }
 
         if (detail::is_file(path)) {
-          detail::read_file(path, res.body);
-          auto type =
-              detail::find_content_type(path, file_extension_and_mimetype_map_);
-          if (type) { res.set_header("Content-Type", type); }
           for (const auto &kv : entry.headers) {
-            res.set_header(kv.first.c_str(), kv.second);
+            res.set_header(kv.first, kv.second);
           }
-          res.status = req.has_header("Range") ? 206 : 200;
+
+          auto mm = std::make_shared<detail::mmap>(path.c_str());
+          if (!mm->is_open()) { return false; }
+
+          res.set_content_provider(
+              mm->size(),
+              detail::find_content_type(path, file_extension_and_mimetype_map_,
+                                        default_file_mimetype_),
+              [mm](size_t offset, size_t length, DataSink &sink) -> bool {
+                sink.write(mm->data() + offset, length);
+                return true;
+              });
+
           if (!head && file_request_handler_) {
             file_request_handler_(req, res);
           }
+
           return true;
         }
       }
@@ -5295,10 +6273,11 @@ inline bool Server::handle_file_request(const Request &req, Response &res,
 }
 
 inline socket_t
-Server::create_server_socket(const char *host, int port, int socket_flags,
+Server::create_server_socket(const std::string &host, int port,
+                             int socket_flags,
                              SocketOptions socket_options) const {
   return detail::create_socket(
-      host, "", port, address_family_, socket_flags, tcp_nodelay_,
+      host, std::string(), port, address_family_, socket_flags, tcp_nodelay_,
       std::move(socket_options),
       [](socket_t sock, struct addrinfo &ai) -> bool {
         if (::bind(sock, ai.ai_addr, static_cast<socklen_t>(ai.ai_addrlen))) {
@@ -5309,7 +6288,8 @@ Server::create_server_socket(const char *host, int port, int socket_flags,
       });
 }
 
-inline int Server::bind_internal(const char *host, int port, int socket_flags) {
+inline int Server::bind_internal(const std::string &host, int port,
+                                 int socket_flags) {
   if (!is_valid()) { return -1; }
 
   svr_sock_ = create_server_socket(host, port, socket_flags, socket_options_);
@@ -5337,6 +6317,7 @@ inline int Server::bind_internal(const char *host, int port, int socket_flags) {
 inline bool Server::listen_internal() {
   auto ret = true;
   is_running_ = true;
+  auto se = detail::scope_exit([&]() { is_running_ = false; });
 
   {
     std::unique_ptr<TaskQueue> task_queue(new_task_queue());
@@ -5362,6 +6343,8 @@ inline bool Server::listen_internal() {
           // Try to accept new connections after a short sleep.
           std::this_thread::sleep_for(std::chrono::milliseconds(1));
           continue;
+        } else if (errno == EINTR || errno == EAGAIN) {
+          continue;
         }
         if (svr_sock_ != INVALID_SOCKET) {
           detail::close_socket(svr_sock_);
@@ -5376,13 +6359,14 @@ inline bool Server::listen_internal() {
 #ifdef _WIN32
         auto timeout = static_cast<uint32_t>(read_timeout_sec_ * 1000 +
                                              read_timeout_usec_ / 1000);
-        setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, (char *)&timeout,
-                   sizeof(timeout));
+        setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO,
+                   reinterpret_cast<const char *>(&timeout), sizeof(timeout));
 #else
         timeval tv;
         tv.tv_sec = static_cast<long>(read_timeout_sec_);
         tv.tv_usec = static_cast<decltype(tv.tv_usec)>(read_timeout_usec_);
-        setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, (char *)&tv, sizeof(tv));
+        setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO,
+                   reinterpret_cast<const void *>(&tv), sizeof(tv));
 #endif
       }
       {
@@ -5390,27 +6374,27 @@ inline bool Server::listen_internal() {
 #ifdef _WIN32
         auto timeout = static_cast<uint32_t>(write_timeout_sec_ * 1000 +
                                              write_timeout_usec_ / 1000);
-        setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, (char *)&timeout,
-                   sizeof(timeout));
+        setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO,
+                   reinterpret_cast<const char *>(&timeout), sizeof(timeout));
 #else
         timeval tv;
         tv.tv_sec = static_cast<long>(write_timeout_sec_);
         tv.tv_usec = static_cast<decltype(tv.tv_usec)>(write_timeout_usec_);
-        setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, (char *)&tv, sizeof(tv));
+        setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO,
+                   reinterpret_cast<const void *>(&tv), sizeof(tv));
 #endif
       }
 
-#if __cplusplus > 201703L
-      task_queue->enqueue([=, this]() { process_and_close_socket(sock); });
-#else
-      task_queue->enqueue([=]() { process_and_close_socket(sock); });
-#endif
+      if (!task_queue->enqueue(
+              [this, sock]() { process_and_close_socket(sock); })) {
+        detail::shutdown_socket(sock);
+        detail::close_socket(sock);
+      }
     }
 
     task_queue->shutdown();
   }
 
-  is_running_ = false;
   return ret;
 }
 
@@ -5421,7 +6405,7 @@ inline bool Server::routing(Request &req, Response &res, Stream &strm) {
   }
 
   // File handler
-  bool is_head_request = req.method == "HEAD";
+  auto is_head_request = req.method == "HEAD";
   if ((req.method == "GET" || is_head_request) &&
       handle_file_request(req, res, is_head_request)) {
     return true;
@@ -5487,17 +6471,17 @@ inline bool Server::routing(Request &req, Response &res, Stream &strm) {
     return dispatch_request(req, res, patch_handlers_);
   }
 
-  res.status = 400;
+  res.status = StatusCode::BadRequest_400;
   return false;
 }
 
 inline bool Server::dispatch_request(Request &req, Response &res,
-                                     const Handlers &handlers) {
+                                     const Handlers &handlers) const {
   for (const auto &x : handlers) {
-    const auto &pattern = x.first;
+    const auto &matcher = x.first;
     const auto &handler = x.second;
 
-    if (std::regex_match(req.path, req.matches, pattern)) {
+    if (matcher->match(req)) {
       handler(req, res);
       return true;
     }
@@ -5507,18 +6491,18 @@ inline bool Server::dispatch_request(Request &req, Response &res,
 
 inline void Server::apply_ranges(const Request &req, Response &res,
                                  std::string &content_type,
-                                 std::string &boundary) {
+                                 std::string &boundary) const {
   if (req.ranges.size() > 1) {
-    boundary = detail::make_multipart_data_boundary();
-
     auto it = res.headers.find("Content-Type");
     if (it != res.headers.end()) {
       content_type = it->second;
       res.headers.erase(it);
     }
 
-    res.headers.emplace("Content-Type",
-                        "multipart/byteranges; boundary=" + boundary);
+    boundary = detail::make_multipart_data_boundary();
+
+    res.set_header("Content-Type",
+                   "multipart/byteranges; boundary=" + boundary);
   }
 
   auto type = detail::encoding_type(req, res);
@@ -5529,16 +6513,17 @@ inline void Server::apply_ranges(const Request &req, Response &res,
       if (req.ranges.empty()) {
         length = res.content_length_;
       } else if (req.ranges.size() == 1) {
-        auto offsets =
-            detail::get_range_offset_and_length(req, res.content_length_, 0);
-        auto offset = offsets.first;
-        length = offsets.second;
+        auto offset_and_length = detail::get_range_offset_and_length(
+            req.ranges[0], res.content_length_);
+
+        length = offset_and_length.second;
+
         auto content_range = detail::make_content_range_header_field(
-            offset, length, res.content_length_);
+            offset_and_length, res.content_length_);
         res.set_header("Content-Range", content_range);
       } else {
-        length = detail::get_multipart_ranges_data_length(req, res, boundary,
-                                                          content_type);
+        length = detail::get_multipart_ranges_data_length(
+            req, boundary, content_type, res.content_length_);
       }
       res.set_header("Content-Length", std::to_string(length));
     } else {
@@ -5557,28 +6542,22 @@ inline void Server::apply_ranges(const Request &req, Response &res,
     if (req.ranges.empty()) {
       ;
     } else if (req.ranges.size() == 1) {
-      auto offsets =
-          detail::get_range_offset_and_length(req, res.body.size(), 0);
-      auto offset = offsets.first;
-      auto length = offsets.second;
+      auto offset_and_length =
+          detail::get_range_offset_and_length(req.ranges[0], res.body.size());
+      auto offset = offset_and_length.first;
+      auto length = offset_and_length.second;
+
       auto content_range = detail::make_content_range_header_field(
-          offset, length, res.body.size());
+          offset_and_length, res.body.size());
       res.set_header("Content-Range", content_range);
-      if (offset < res.body.size()) {
-        res.body = res.body.substr(offset, length);
-      } else {
-        res.body.clear();
-        res.status = 416;
-      }
+
+      assert(offset + length <= res.body.size());
+      res.body = res.body.substr(offset, length);
     } else {
       std::string data;
-      if (detail::make_multipart_ranges_data(req, res, boundary, content_type,
-                                             data)) {
-        res.body.swap(data);
-      } else {
-        res.body.clear();
-        res.status = 416;
-      }
+      detail::make_multipart_ranges_data(req, res, boundary, content_type,
+                                         res.body.size(), data);
+      res.body.swap(data);
     }
 
     if (type != detail::EncodingType::None) {
@@ -5617,12 +6596,12 @@ inline void Server::apply_ranges(const Request &req, Response &res,
 
 inline bool Server::dispatch_request_for_content_reader(
     Request &req, Response &res, ContentReader content_reader,
-    const HandlersForContentReader &handlers) {
+    const HandlersForContentReader &handlers) const {
   for (const auto &x : handlers) {
-    const auto &pattern = x.first;
+    const auto &matcher = x.first;
     const auto &handler = x.second;
 
-    if (std::regex_match(req.path, req.matches, pattern)) {
+    if (matcher->match(req)) {
       handler(req, res, content_reader);
       return true;
     }
@@ -5642,15 +6621,10 @@ Server::process_request(Stream &strm, bool close_connection,
   if (!line_reader.getline()) { return false; }
 
   Request req;
-  Response res;
 
+  Response res;
   res.version = "HTTP/1.1";
-
-  for (const auto &header : default_headers_) {
-    if (res.headers.find(header.first) == res.headers.end()) {
-      res.headers.insert(header);
-    }
-  }
+  res.headers = default_headers_;
 
 #ifdef _WIN32
   // TODO: Increase FD_SETSIZE statically (libzmq), dynamically (MySQL).
@@ -5660,7 +6634,7 @@ Server::process_request(Stream &strm, bool close_connection,
   if (strm.socket() >= FD_SETSIZE) {
     Headers dummy;
     detail::read_headers(strm, dummy);
-    res.status = 500;
+    res.status = StatusCode::InternalServerError_500;
     return write_response(strm, close_connection, req, res);
   }
 #endif
@@ -5670,14 +6644,14 @@ Server::process_request(Stream &strm, bool close_connection,
   if (line_reader.size() > CPPHTTPLIB_REQUEST_URI_MAX_LENGTH) {
     Headers dummy;
     detail::read_headers(strm, dummy);
-    res.status = 414;
+    res.status = StatusCode::UriTooLong_414;
     return write_response(strm, close_connection, req, res);
   }
 
   // Request line and headers
   if (!parse_request_line(line_reader.ptr(), req) ||
       !detail::read_headers(strm, req.headers)) {
-    res.status = 400;
+    res.status = StatusCode::BadRequest_400;
     return write_response(strm, close_connection, req, res);
   }
 
@@ -5694,10 +6668,14 @@ Server::process_request(Stream &strm, bool close_connection,
   req.set_header("REMOTE_ADDR", req.remote_addr);
   req.set_header("REMOTE_PORT", std::to_string(req.remote_port));
 
+  strm.get_local_ip_and_port(req.local_addr, req.local_port);
+  req.set_header("LOCAL_ADDR", req.local_addr);
+  req.set_header("LOCAL_PORT", std::to_string(req.local_port));
+
   if (req.has_header("Range")) {
     const auto &range_header_value = req.get_header_value("Range");
     if (!detail::parse_range_header(range_header_value, req.ranges)) {
-      res.status = 416;
+      res.status = StatusCode::RangeNotSatisfiable_416;
       return write_response(strm, close_connection, req, res);
     }
   }
@@ -5705,22 +6683,22 @@ Server::process_request(Stream &strm, bool close_connection,
   if (setup_request) { setup_request(req); }
 
   if (req.get_header_value("Expect") == "100-continue") {
-    auto status = 100;
+    int status = StatusCode::Continue_100;
     if (expect_100_continue_handler_) {
       status = expect_100_continue_handler_(req, res);
     }
     switch (status) {
-    case 100:
-    case 417:
+    case StatusCode::Continue_100:
+    case StatusCode::ExpectationFailed_417:
       strm.write_format("HTTP/1.1 %d %s\r\n\r\n", status,
-                        detail::status_message(status));
+                        status_message(status));
       break;
     default: return write_response(strm, close_connection, req, res);
     }
   }
 
-  // Rounting
-  bool routed = false;
+  // Routing
+  auto routed = false;
 #ifdef CPPHTTPLIB_NO_EXCEPTIONS
   routed = routing(req, res, strm);
 #else
@@ -5728,23 +6706,51 @@ Server::process_request(Stream &strm, bool close_connection,
     routed = routing(req, res, strm);
   } catch (std::exception &e) {
     if (exception_handler_) {
-      exception_handler_(req, res, e);
+      auto ep = std::current_exception();
+      exception_handler_(req, res, ep);
       routed = true;
     } else {
-      res.status = 500;
-      res.set_header("EXCEPTION_WHAT", e.what());
+      res.status = StatusCode::InternalServerError_500;
+      std::string val;
+      auto s = e.what();
+      for (size_t i = 0; s[i]; i++) {
+        switch (s[i]) {
+        case '\r': val += "\\r"; break;
+        case '\n': val += "\\n"; break;
+        default: val += s[i]; break;
+        }
+      }
+      res.set_header("EXCEPTION_WHAT", val);
     }
   } catch (...) {
-    res.status = 500;
-    res.set_header("EXCEPTION_WHAT", "UNKNOWN");
+    if (exception_handler_) {
+      auto ep = std::current_exception();
+      exception_handler_(req, res, ep);
+      routed = true;
+    } else {
+      res.status = StatusCode::InternalServerError_500;
+      res.set_header("EXCEPTION_WHAT", "UNKNOWN");
+    }
   }
 #endif
-
   if (routed) {
-    if (res.status == -1) { res.status = req.ranges.empty() ? 200 : 206; }
+    if (res.status == -1) {
+      res.status = req.ranges.empty() ? StatusCode::OK_200
+                                      : StatusCode::PartialContent_206;
+    }
+
+    if (detail::range_error(req, res)) {
+      res.body.clear();
+      res.content_length_ = 0;
+      res.content_provider_ = nullptr;
+      res.status = StatusCode::RangeNotSatisfiable_416;
+      return write_response(strm, close_connection, req, res);
+    }
+
     return write_response_with_content(strm, close_connection, req, res);
   } else {
-    if (res.status == -1) { res.status = 404; }
+    if (res.status == -1) { res.status = StatusCode::NotFound_404; }
+
     return write_response(strm, close_connection, req, res);
   }
 }
@@ -5835,7 +6841,7 @@ inline void ClientImpl::copy_settings(const ClientImpl &rhs) {
 inline socket_t ClientImpl::create_client_socket(Error &error) const {
   if (!proxy_host_.empty() && proxy_port_ != -1) {
     return detail::create_client_socket(
-        proxy_host_.c_str(), "", proxy_port_, address_family_, tcp_nodelay_,
+        proxy_host_, std::string(), proxy_port_, address_family_, tcp_nodelay_,
         socket_options_, connection_timeout_sec_, connection_timeout_usec_,
         read_timeout_sec_, read_timeout_usec_, write_timeout_sec_,
         write_timeout_usec_, interface_, error);
@@ -5844,13 +6850,13 @@ inline socket_t ClientImpl::create_client_socket(Error &error) const {
   // Check is custom IP specified for host_
   std::string ip;
   auto it = addr_map_.find(host_);
-  if (it != addr_map_.end()) ip = it->second;
+  if (it != addr_map_.end()) { ip = it->second; }
 
   return detail::create_client_socket(
-      host_.c_str(), ip.c_str(), port_, address_family_, tcp_nodelay_,
-      socket_options_, connection_timeout_sec_, connection_timeout_usec_,
-      read_timeout_sec_, read_timeout_usec_, write_timeout_sec_,
-      write_timeout_usec_, interface_, error);
+      host_, ip, port_, address_family_, tcp_nodelay_, socket_options_,
+      connection_timeout_sec_, connection_timeout_usec_, read_timeout_sec_,
+      read_timeout_usec_, write_timeout_sec_, write_timeout_usec_, interface_,
+      error);
 }
 
 inline bool ClientImpl::create_and_connect_socket(Socket &socket,
@@ -5869,7 +6875,7 @@ inline void ClientImpl::shutdown_ssl(Socket & /*socket*/,
          socket_requests_are_from_thread_ == std::this_thread::get_id());
 }
 
-inline void ClientImpl::shutdown_socket(Socket &socket) {
+inline void ClientImpl::shutdown_socket(Socket &socket) const {
   if (socket.sock == INVALID_SOCKET) { return; }
   detail::shutdown_socket(socket.sock);
 }
@@ -5894,7 +6900,7 @@ inline void ClientImpl::close_socket(Socket &socket) {
 }
 
 inline bool ClientImpl::read_response_line(Stream &strm, const Request &req,
-                                           Response &res) {
+                                           Response &res) const {
   std::array<char, 2048> buf{};
 
   detail::stream_line_reader line_reader(strm, buf.data(), buf.size());
@@ -5902,9 +6908,9 @@ inline bool ClientImpl::read_response_line(Stream &strm, const Request &req,
   if (!line_reader.getline()) { return false; }
 
 #ifdef CPPHTTPLIB_ALLOW_LF_AS_LINE_TERMINATOR
-  const static std::regex re("(HTTP/1\\.[01]) (\\d{3})(?: (.*?))?\r\n");
-#else
   const static std::regex re("(HTTP/1\\.[01]) (\\d{3})(?: (.*?))?\r?\n");
+#else
+  const static std::regex re("(HTTP/1\\.[01]) (\\d{3})(?: (.*?))?\r\n");
 #endif
 
   std::cmatch m;
@@ -5916,7 +6922,7 @@ inline bool ClientImpl::read_response_line(Stream &strm, const Request &req,
   res.reason = std::string(m[3]);
 
   // Ignore '100 Continue'
-  while (res.status == 100) {
+  while (res.status == StatusCode::Continue_100) {
     if (!line_reader.getline()) { return false; } // CRLF
     if (!line_reader.getline()) { return false; } // next response line
 
@@ -5931,7 +6937,15 @@ inline bool ClientImpl::read_response_line(Stream &strm, const Request &req,
 
 inline bool ClientImpl::send(Request &req, Response &res, Error &error) {
   std::lock_guard<std::recursive_mutex> request_mutex_guard(request_mutex_);
+  auto ret = send_(req, res, error);
+  if (error == Error::SSLPeerCouldBeClosed_) {
+    assert(!ret);
+    ret = send_(req, res, error);
+  }
+  return ret;
+}
 
+inline bool ClientImpl::send_(Request &req, Response &res, Error &error) {
   {
     std::lock_guard<std::mutex> guard(socket_mutex_);
 
@@ -5962,7 +6976,7 @@ inline bool ClientImpl::send(Request &req, Response &res, Error &error) {
       if (is_ssl()) {
         auto &scli = static_cast<SSLClient &>(*this);
         if (!proxy_host_.empty() && proxy_port_ != -1) {
-          bool success = false;
+          auto success = false;
           if (!scli.connect_with_proxy(socket_, res, success, error)) {
             return success;
           }
@@ -5989,13 +7003,11 @@ inline bool ClientImpl::send(Request &req, Response &res, Error &error) {
     }
   }
 
+  auto ret = false;
   auto close_connection = !keep_alive_;
-  auto ret = process_socket(socket_, [&](Stream &strm) {
-    return handle_request(strm, req, res, close_connection, error);
-  });
 
-  // Briefly lock mutex in order to mark that a request is no longer ongoing
-  {
+  auto se = detail::scope_exit([&]() {
+    // Briefly lock mutex in order to mark that a request is no longer ongoing
     std::lock_guard<std::mutex> guard(socket_mutex_);
     socket_requests_in_flight_ -= 1;
     if (socket_requests_in_flight_ <= 0) {
@@ -6009,7 +7021,11 @@ inline bool ClientImpl::send(Request &req, Response &res, Error &error) {
       shutdown_socket(socket_);
       close_socket(socket_);
     }
-  }
+  });
+
+  ret = process_socket(socket_, [&](Stream &strm) {
+    return handle_request(strm, req, res, close_connection, error);
+  });
 
   if (!ret) {
     if (error == Error::Success) { error = Error::Unknown; }
@@ -6054,15 +7070,31 @@ inline bool ClientImpl::handle_request(Stream &strm, Request &req,
 
   if (!ret) { return false; }
 
+  if (res.get_header_value("Connection") == "close" ||
+      (res.version == "HTTP/1.0" && res.reason != "Connection established")) {
+    // TODO this requires a not-entirely-obvious chain of calls to be correct
+    // for this to be safe.
+
+    // This is safe to call because handle_request is only called by send_
+    // which locks the request mutex during the process. It would be a bug
+    // to call it from a different thread since it's a thread-safety issue
+    // to do these things to the socket if another thread is using the socket.
+    std::lock_guard<std::mutex> guard(socket_mutex_);
+    shutdown_ssl(socket_, true);
+    shutdown_socket(socket_);
+    close_socket(socket_);
+  }
+
   if (300 < res.status && res.status < 400 && follow_location_) {
     req = req_save;
     ret = redirect(req, res, error);
   }
 
 #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  if ((res.status == 401 || res.status == 407) &&
+  if ((res.status == StatusCode::Unauthorized_401 ||
+       res.status == StatusCode::ProxyAuthenticationRequired_407) &&
       req.authorization_count_ < 5) {
-    auto is_proxy = res.status == 407;
+    auto is_proxy = res.status == StatusCode::ProxyAuthenticationRequired_407;
     const auto &username =
         is_proxy ? proxy_digest_auth_username_ : digest_auth_username_;
     const auto &password =
@@ -6097,11 +7129,11 @@ inline bool ClientImpl::redirect(Request &req, Response &res, Error &error) {
     return false;
   }
 
-  auto location = detail::decode_url(res.get_header_value("location"), true);
+  auto location = res.get_header_value("location");
   if (location.empty()) { return false; }
 
   const static std::regex re(
-      R"((?:(https?):)?(?://(?:\[([\d:]+)\]|([^:/?#]+))(?::(\d+))?)?([^?#]*(?:\?[^#]*)?)(?:#.*)?)");
+      R"((?:(https?):)?(?://(?:\[([\d:]+)\]|([^:/?#]+))(?::(\d+))?)?([^?#]*)(\?[^#]*)?(?:#.*)?)");
 
   std::smatch m;
   if (!std::regex_match(location, m, re)) { return false; }
@@ -6113,6 +7145,7 @@ inline bool ClientImpl::redirect(Request &req, Response &res, Error &error) {
   if (next_host.empty()) { next_host = m[3].str(); }
   auto port_str = m[4].str();
   auto next_path = m[5].str();
+  auto next_query = m[6].str();
 
   auto next_port = port_;
   if (!port_str.empty()) {
@@ -6125,33 +7158,35 @@ inline bool ClientImpl::redirect(Request &req, Response &res, Error &error) {
   if (next_host.empty()) { next_host = host_; }
   if (next_path.empty()) { next_path = "/"; }
 
+  auto path = detail::decode_url(next_path, true) + next_query;
+
   if (next_scheme == scheme && next_host == host_ && next_port == port_) {
-    return detail::redirect(*this, req, res, next_path, location, error);
+    return detail::redirect(*this, req, res, path, location, error);
   } else {
     if (next_scheme == "https") {
 #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-      SSLClient cli(next_host.c_str(), next_port);
+      SSLClient cli(next_host, next_port);
       cli.copy_settings(*this);
       if (ca_cert_store_) { cli.set_ca_cert_store(ca_cert_store_); }
-      return detail::redirect(cli, req, res, next_path, location, error);
+      return detail::redirect(cli, req, res, path, location, error);
 #else
       return false;
 #endif
     } else {
-      ClientImpl cli(next_host.c_str(), next_port);
+      ClientImpl cli(next_host, next_port);
       cli.copy_settings(*this);
-      return detail::redirect(cli, req, res, next_path, location, error);
+      return detail::redirect(cli, req, res, path, location, error);
     }
   }
 }
 
 inline bool ClientImpl::write_content_with_provider(Stream &strm,
                                                     const Request &req,
-                                                    Error &error) {
+                                                    Error &error) const {
   auto is_shutting_down = []() { return false; };
 
   if (req.is_chunked_content_provider_) {
-    // TODO: Brotli suport
+    // TODO: Brotli support
     std::unique_ptr<detail::compressor> compressor;
 #ifdef CPPHTTPLIB_ZLIB_SUPPORT
     if (compress_) {
@@ -6168,39 +7203,39 @@ inline bool ClientImpl::write_content_with_provider(Stream &strm,
     return detail::write_content(strm, req.content_provider_, 0,
                                  req.content_length_, is_shutting_down, error);
   }
-} // namespace httplib
+}
 
 inline bool ClientImpl::write_request(Stream &strm, Request &req,
                                       bool close_connection, Error &error) {
   // Prepare additional headers
   if (close_connection) {
     if (!req.has_header("Connection")) {
-      req.headers.emplace("Connection", "close");
+      req.set_header("Connection", "close");
     }
   }
 
   if (!req.has_header("Host")) {
     if (is_ssl()) {
       if (port_ == 443) {
-        req.headers.emplace("Host", host_);
+        req.set_header("Host", host_);
       } else {
-        req.headers.emplace("Host", host_and_port_);
+        req.set_header("Host", host_and_port_);
       }
     } else {
       if (port_ == 80) {
-        req.headers.emplace("Host", host_);
+        req.set_header("Host", host_);
       } else {
-        req.headers.emplace("Host", host_and_port_);
+        req.set_header("Host", host_and_port_);
       }
     }
   }
 
-  if (!req.has_header("Accept")) { req.headers.emplace("Accept", "*/*"); }
+  if (!req.has_header("Accept")) { req.set_header("Accept", "*/*"); }
 
 #ifndef CPPHTTPLIB_NO_DEFAULT_USER_AGENT
   if (!req.has_header("User-Agent")) {
     auto agent = std::string("cpp-httplib/") + CPPHTTPLIB_VERSION;
-    req.headers.emplace("User-Agent", agent);
+    req.set_header("User-Agent", agent);
   }
 #endif
 
@@ -6209,23 +7244,23 @@ inline bool ClientImpl::write_request(Stream &strm, Request &req,
       if (!req.is_chunked_content_provider_) {
         if (!req.has_header("Content-Length")) {
           auto length = std::to_string(req.content_length_);
-          req.headers.emplace("Content-Length", length);
+          req.set_header("Content-Length", length);
         }
       }
     } else {
       if (req.method == "POST" || req.method == "PUT" ||
           req.method == "PATCH") {
-        req.headers.emplace("Content-Length", "0");
+        req.set_header("Content-Length", "0");
       }
     }
   } else {
     if (!req.has_header("Content-Type")) {
-      req.headers.emplace("Content-Type", "text/plain");
+      req.set_header("Content-Type", "text/plain");
     }
 
     if (!req.has_header("Content-Length")) {
       auto length = std::to_string(req.body.size());
-      req.headers.emplace("Content-Length", length);
+      req.set_header("Content-Length", length);
     }
   }
 
@@ -6265,7 +7300,7 @@ inline bool ClientImpl::write_request(Stream &strm, Request &req,
     const auto &path = url_encode_ ? detail::encode_url(req.path) : req.path;
     bstrm.write_format("%s %s HTTP/1.1\r\n", req.method.c_str(), path.c_str());
 
-    detail::write_headers(bstrm, req.headers);
+    header_writer_(bstrm, req.headers);
 
     // Flush buffer
     auto &data = bstrm.get_buffer();
@@ -6289,16 +7324,14 @@ inline bool ClientImpl::write_request(Stream &strm, Request &req,
 }
 
 inline std::unique_ptr<Response> ClientImpl::send_with_content_provider(
-    Request &req,
-    // const char *method, const char *path, const Headers &headers,
-    const char *body, size_t content_length, ContentProvider content_provider,
+    Request &req, const char *body, size_t content_length,
+    ContentProvider content_provider,
     ContentProviderWithoutLength content_provider_without_length,
-    const char *content_type, Error &error) {
-
-  if (content_type) { req.headers.emplace("Content-Type", content_type); }
+    const std::string &content_type, Error &error) {
+  if (!content_type.empty()) { req.set_header("Content-Type", content_type); }
 
 #ifdef CPPHTTPLIB_ZLIB_SUPPORT
-  if (compress_) { req.headers.emplace("Content-Encoding", "gzip"); }
+  if (compress_) { req.set_header("Content-Encoding", "gzip"); }
 #endif
 
 #ifdef CPPHTTPLIB_ZLIB_SUPPORT
@@ -6316,8 +7349,9 @@ inline std::unique_ptr<Response> ClientImpl::send_with_content_provider(
           auto last = offset + data_len == content_length;
 
           auto ret = compressor.compress(
-              data, data_len, last, [&](const char *data, size_t data_len) {
-                req.body.append(data, data_len);
+              data, data_len, last,
+              [&](const char *compressed_data, size_t compressed_data_len) {
+                req.body.append(compressed_data, compressed_data_len);
                 return true;
               });
 
@@ -6330,8 +7364,6 @@ inline std::unique_ptr<Response> ClientImpl::send_with_content_provider(
         return ok;
       };
 
-      data_sink.is_writable = [&](void) { return ok && true; };
-
       while (ok && offset < content_length) {
         if (!content_provider(offset, content_length - offset, data_sink)) {
           error = Error::Canceled;
@@ -6360,10 +7392,9 @@ inline std::unique_ptr<Response> ClientImpl::send_with_content_provider(
       req.content_provider_ = detail::ContentProviderAdapter(
           std::move(content_provider_without_length));
       req.is_chunked_content_provider_ = true;
-      req.headers.emplace("Transfer-Encoding", "chunked");
+      req.set_header("Transfer-Encoding", "chunked");
     } else {
       req.body.assign(body, content_length);
-      ;
     }
   }
 
@@ -6372,10 +7403,10 @@ inline std::unique_ptr<Response> ClientImpl::send_with_content_provider(
 }
 
 inline Result ClientImpl::send_with_content_provider(
-    const char *method, const char *path, const Headers &headers,
+    const std::string &method, const std::string &path, const Headers &headers,
     const char *body, size_t content_length, ContentProvider content_provider,
     ContentProviderWithoutLength content_provider_without_length,
-    const char *content_type) {
+    const std::string &content_type) {
   Request req;
   req.method = method;
   req.headers = headers;
@@ -6384,9 +7415,7 @@ inline Result ClientImpl::send_with_content_provider(
   auto error = Error::Success;
 
   auto res = send_with_content_provider(
-      req,
-      // method, path, headers,
-      body, content_length, std::move(content_provider),
+      req, body, content_length, std::move(content_provider),
       std::move(content_provider_without_length), content_type, error);
 
   return Result{std::move(res), error, std::move(req.headers)};
@@ -6404,6 +7433,20 @@ inline bool ClientImpl::process_request(Stream &strm, Request &req,
   // Send request
   if (!write_request(strm, req, close_connection, error)) { return false; }
 
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  if (is_ssl()) {
+    auto is_proxy_enabled = !proxy_host_.empty() && proxy_port_ != -1;
+    if (!is_proxy_enabled) {
+      char buf[1];
+      if (SSL_peek(socket_.ssl, buf, 1) == 0 &&
+          SSL_get_error(socket_.ssl, 0) == SSL_ERROR_ZERO_RETURN) {
+        error = Error::SSLPeerCouldBeClosed_;
+        return false;
+      }
+    }
+  }
+#endif
+
   // Receive response and headers
   if (!read_response_line(strm, req, res) ||
       !detail::read_headers(strm, res.headers)) {
@@ -6412,7 +7455,8 @@ inline bool ClientImpl::process_request(Stream &strm, Request &req,
   }
 
   // Body
-  if ((res.status != 204) && req.method != "HEAD" && req.method != "CONNECT") {
+  if ((res.status != StatusCode::NoContent_204) && req.method != "HEAD" &&
+      req.method != "CONNECT") {
     auto redirect = 300 < res.status && res.status < 400 && follow_location_;
 
     if (req.response_handler && !redirect) {
@@ -6457,30 +7501,56 @@ inline bool ClientImpl::process_request(Stream &strm, Request &req,
     }
   }
 
-  if (res.get_header_value("Connection") == "close" ||
-      (res.version == "HTTP/1.0" && res.reason != "Connection established")) {
-    // TODO this requires a not-entirely-obvious chain of calls to be correct
-    // for this to be safe. Maybe a code refactor (such as moving this out to
-    // the send function and getting rid of the recursiveness of the mutex)
-    // could make this more obvious.
-
-    // This is safe to call because process_request is only called by
-    // handle_request which is only called by send, which locks the request
-    // mutex during the process. It would be a bug to call it from a different
-    // thread since it's a thread-safety issue to do these things to the socket
-    // if another thread is using the socket.
-    std::lock_guard<std::mutex> guard(socket_mutex_);
-    shutdown_ssl(socket_, true);
-    shutdown_socket(socket_);
-    close_socket(socket_);
-  }
-
   // Log
   if (logger_) { logger_(req, res); }
 
   return true;
 }
 
+inline ContentProviderWithoutLength ClientImpl::get_multipart_content_provider(
+    const std::string &boundary, const MultipartFormDataItems &items,
+    const MultipartFormDataProviderItems &provider_items) const {
+  size_t cur_item = 0;
+  size_t cur_start = 0;
+  // cur_item and cur_start are copied to within the std::function and maintain
+  // state between successive calls
+  return [&, cur_item, cur_start](size_t offset,
+                                  DataSink &sink) mutable -> bool {
+    if (!offset && !items.empty()) {
+      sink.os << detail::serialize_multipart_formdata(items, boundary, false);
+      return true;
+    } else if (cur_item < provider_items.size()) {
+      if (!cur_start) {
+        const auto &begin = detail::serialize_multipart_formdata_item_begin(
+            provider_items[cur_item], boundary);
+        offset += begin.size();
+        cur_start = offset;
+        sink.os << begin;
+      }
+
+      DataSink cur_sink;
+      auto has_data = true;
+      cur_sink.write = sink.write;
+      cur_sink.done = [&]() { has_data = false; };
+
+      if (!provider_items[cur_item].provider(offset - cur_start, cur_sink)) {
+        return false;
+      }
+
+      if (!has_data) {
+        sink.os << detail::serialize_multipart_formdata_item_end();
+        cur_item++;
+        cur_start = 0;
+      }
+      return true;
+    } else {
+      sink.os << detail::serialize_multipart_formdata_finish(boundary);
+      sink.done();
+      return true;
+    }
+  };
+}
+
 inline bool
 ClientImpl::process_socket(const Socket &socket,
                            std::function<bool(Stream &strm)> callback) {
@@ -6491,19 +7561,19 @@ ClientImpl::process_socket(const Socket &socket,
 
 inline bool ClientImpl::is_ssl() const { return false; }
 
-inline Result ClientImpl::Get(const char *path) {
+inline Result ClientImpl::Get(const std::string &path) {
   return Get(path, Headers(), Progress());
 }
 
-inline Result ClientImpl::Get(const char *path, Progress progress) {
+inline Result ClientImpl::Get(const std::string &path, Progress progress) {
   return Get(path, Headers(), std::move(progress));
 }
 
-inline Result ClientImpl::Get(const char *path, const Headers &headers) {
+inline Result ClientImpl::Get(const std::string &path, const Headers &headers) {
   return Get(path, headers, Progress());
 }
 
-inline Result ClientImpl::Get(const char *path, const Headers &headers,
+inline Result ClientImpl::Get(const std::string &path, const Headers &headers,
                               Progress progress) {
   Request req;
   req.method = "GET";
@@ -6514,45 +7584,45 @@ inline Result ClientImpl::Get(const char *path, const Headers &headers,
   return send_(std::move(req));
 }
 
-inline Result ClientImpl::Get(const char *path,
+inline Result ClientImpl::Get(const std::string &path,
                               ContentReceiver content_receiver) {
   return Get(path, Headers(), nullptr, std::move(content_receiver), nullptr);
 }
 
-inline Result ClientImpl::Get(const char *path,
+inline Result ClientImpl::Get(const std::string &path,
                               ContentReceiver content_receiver,
                               Progress progress) {
   return Get(path, Headers(), nullptr, std::move(content_receiver),
              std::move(progress));
 }
 
-inline Result ClientImpl::Get(const char *path, const Headers &headers,
+inline Result ClientImpl::Get(const std::string &path, const Headers &headers,
                               ContentReceiver content_receiver) {
   return Get(path, headers, nullptr, std::move(content_receiver), nullptr);
 }
 
-inline Result ClientImpl::Get(const char *path, const Headers &headers,
+inline Result ClientImpl::Get(const std::string &path, const Headers &headers,
                               ContentReceiver content_receiver,
                               Progress progress) {
   return Get(path, headers, nullptr, std::move(content_receiver),
              std::move(progress));
 }
 
-inline Result ClientImpl::Get(const char *path,
+inline Result ClientImpl::Get(const std::string &path,
                               ResponseHandler response_handler,
                               ContentReceiver content_receiver) {
   return Get(path, Headers(), std::move(response_handler),
              std::move(content_receiver), nullptr);
 }
 
-inline Result ClientImpl::Get(const char *path, const Headers &headers,
+inline Result ClientImpl::Get(const std::string &path, const Headers &headers,
                               ResponseHandler response_handler,
                               ContentReceiver content_receiver) {
   return Get(path, headers, std::move(response_handler),
              std::move(content_receiver), nullptr);
 }
 
-inline Result ClientImpl::Get(const char *path,
+inline Result ClientImpl::Get(const std::string &path,
                               ResponseHandler response_handler,
                               ContentReceiver content_receiver,
                               Progress progress) {
@@ -6560,7 +7630,7 @@ inline Result ClientImpl::Get(const char *path,
              std::move(content_receiver), std::move(progress));
 }
 
-inline Result ClientImpl::Get(const char *path, const Headers &headers,
+inline Result ClientImpl::Get(const std::string &path, const Headers &headers,
                               ResponseHandler response_handler,
                               ContentReceiver content_receiver,
                               Progress progress) {
@@ -6579,40 +7649,43 @@ inline Result ClientImpl::Get(const char *path, const Headers &headers,
   return send_(std::move(req));
 }
 
-inline Result ClientImpl::Get(const char *path, const Params &params,
+inline Result ClientImpl::Get(const std::string &path, const Params &params,
                               const Headers &headers, Progress progress) {
   if (params.empty()) { return Get(path, headers); }
 
   std::string path_with_query = append_query_params(path, params);
-  return Get(path_with_query.c_str(), headers, progress);
+  return Get(path_with_query, headers, std::move(progress));
 }
 
-inline Result ClientImpl::Get(const char *path, const Params &params,
+inline Result ClientImpl::Get(const std::string &path, const Params &params,
                               const Headers &headers,
                               ContentReceiver content_receiver,
                               Progress progress) {
-  return Get(path, params, headers, nullptr, content_receiver, progress);
+  return Get(path, params, headers, nullptr, std::move(content_receiver),
+             std::move(progress));
 }
 
-inline Result ClientImpl::Get(const char *path, const Params &params,
+inline Result ClientImpl::Get(const std::string &path, const Params &params,
                               const Headers &headers,
                               ResponseHandler response_handler,
                               ContentReceiver content_receiver,
                               Progress progress) {
   if (params.empty()) {
-    return Get(path, headers, response_handler, content_receiver, progress);
+    return Get(path, headers, std::move(response_handler),
+               std::move(content_receiver), std::move(progress));
   }
 
   std::string path_with_query = append_query_params(path, params);
-  return Get(path_with_query.c_str(), headers, response_handler,
-             content_receiver, progress);
+  return Get(path_with_query, headers, std::move(response_handler),
+             std::move(content_receiver), std::move(progress));
 }
 
-inline Result ClientImpl::Head(const char *path) {
+inline Result ClientImpl::Head(const std::string &path) {
   return Head(path, Headers());
 }
 
-inline Result ClientImpl::Head(const char *path, const Headers &headers) {
+inline Result ClientImpl::Head(const std::string &path,
+                               const Headers &headers) {
   Request req;
   req.method = "HEAD";
   req.headers = headers;
@@ -6621,288 +7694,338 @@ inline Result ClientImpl::Head(const char *path, const Headers &headers) {
   return send_(std::move(req));
 }
 
-inline Result ClientImpl::Post(const char *path) {
-  return Post(path, std::string(), nullptr);
+inline Result ClientImpl::Post(const std::string &path) {
+  return Post(path, std::string(), std::string());
+}
+
+inline Result ClientImpl::Post(const std::string &path,
+                               const Headers &headers) {
+  return Post(path, headers, nullptr, 0, std::string());
 }
 
-inline Result ClientImpl::Post(const char *path, const char *body,
+inline Result ClientImpl::Post(const std::string &path, const char *body,
                                size_t content_length,
-                               const char *content_type) {
+                               const std::string &content_type) {
   return Post(path, Headers(), body, content_length, content_type);
 }
 
-inline Result ClientImpl::Post(const char *path, const Headers &headers,
+inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
                                const char *body, size_t content_length,
-                               const char *content_type) {
+                               const std::string &content_type) {
   return send_with_content_provider("POST", path, headers, body, content_length,
                                     nullptr, nullptr, content_type);
 }
 
-inline Result ClientImpl::Post(const char *path, const std::string &body,
-                               const char *content_type) {
+inline Result ClientImpl::Post(const std::string &path, const std::string &body,
+                               const std::string &content_type) {
   return Post(path, Headers(), body, content_type);
 }
 
-inline Result ClientImpl::Post(const char *path, const Headers &headers,
+inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
                                const std::string &body,
-                               const char *content_type) {
+                               const std::string &content_type) {
   return send_with_content_provider("POST", path, headers, body.data(),
                                     body.size(), nullptr, nullptr,
                                     content_type);
 }
 
-inline Result ClientImpl::Post(const char *path, const Params &params) {
+inline Result ClientImpl::Post(const std::string &path, const Params &params) {
   return Post(path, Headers(), params);
 }
 
-inline Result ClientImpl::Post(const char *path, size_t content_length,
+inline Result ClientImpl::Post(const std::string &path, size_t content_length,
                                ContentProvider content_provider,
-                               const char *content_type) {
+                               const std::string &content_type) {
   return Post(path, Headers(), content_length, std::move(content_provider),
               content_type);
 }
 
-inline Result ClientImpl::Post(const char *path,
+inline Result ClientImpl::Post(const std::string &path,
                                ContentProviderWithoutLength content_provider,
-                               const char *content_type) {
+                               const std::string &content_type) {
   return Post(path, Headers(), std::move(content_provider), content_type);
 }
 
-inline Result ClientImpl::Post(const char *path, const Headers &headers,
+inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
                                size_t content_length,
                                ContentProvider content_provider,
-                               const char *content_type) {
+                               const std::string &content_type) {
   return send_with_content_provider("POST", path, headers, nullptr,
                                     content_length, std::move(content_provider),
                                     nullptr, content_type);
 }
 
-inline Result ClientImpl::Post(const char *path, const Headers &headers,
+inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
                                ContentProviderWithoutLength content_provider,
-                               const char *content_type) {
+                               const std::string &content_type) {
   return send_with_content_provider("POST", path, headers, nullptr, 0, nullptr,
                                     std::move(content_provider), content_type);
 }
 
-inline Result ClientImpl::Post(const char *path, const Headers &headers,
+inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
                                const Params &params) {
   auto query = detail::params_to_query_str(params);
   return Post(path, headers, query, "application/x-www-form-urlencoded");
 }
 
-inline Result ClientImpl::Post(const char *path,
+inline Result ClientImpl::Post(const std::string &path,
                                const MultipartFormDataItems &items) {
   return Post(path, Headers(), items);
 }
 
-inline Result ClientImpl::Post(const char *path, const Headers &headers,
+inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
                                const MultipartFormDataItems &items) {
-  return Post(path, headers, items, detail::make_multipart_data_boundary());
+  const auto &boundary = detail::make_multipart_data_boundary();
+  const auto &content_type =
+      detail::serialize_multipart_formdata_get_content_type(boundary);
+  const auto &body = detail::serialize_multipart_formdata(items, boundary);
+  return Post(path, headers, body, content_type);
 }
-inline Result ClientImpl::Post(const char *path, const Headers &headers,
+
+inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
                                const MultipartFormDataItems &items,
                                const std::string &boundary) {
-  for (size_t i = 0; i < boundary.size(); i++) {
-    char c = boundary[i];
-    if (!std::isalnum(c) && c != '-' && c != '_') {
-      return Result{nullptr, Error::UnsupportedMultipartBoundaryChars};
-    }
+  if (!detail::is_multipart_boundary_chars_valid(boundary)) {
+    return Result{nullptr, Error::UnsupportedMultipartBoundaryChars};
   }
 
-  std::string body;
-
-  for (const auto &item : items) {
-    body += "--" + boundary + "\r\n";
-    body += "Content-Disposition: form-data; name=\"" + item.name + "\"";
-    if (!item.filename.empty()) {
-      body += "; filename=\"" + item.filename + "\"";
-    }
-    body += "\r\n";
-    if (!item.content_type.empty()) {
-      body += "Content-Type: " + item.content_type + "\r\n";
-    }
-    body += "\r\n";
-    body += item.content + "\r\n";
-  }
-
-  body += "--" + boundary + "--\r\n";
+  const auto &content_type =
+      detail::serialize_multipart_formdata_get_content_type(boundary);
+  const auto &body = detail::serialize_multipart_formdata(items, boundary);
+  return Post(path, headers, body, content_type);
+}
 
-  std::string content_type = "multipart/form-data; boundary=" + boundary;
-  return Post(path, headers, body, content_type.c_str());
+inline Result
+ClientImpl::Post(const std::string &path, const Headers &headers,
+                 const MultipartFormDataItems &items,
+                 const MultipartFormDataProviderItems &provider_items) {
+  const auto &boundary = detail::make_multipart_data_boundary();
+  const auto &content_type =
+      detail::serialize_multipart_formdata_get_content_type(boundary);
+  return send_with_content_provider(
+      "POST", path, headers, nullptr, 0, nullptr,
+      get_multipart_content_provider(boundary, items, provider_items),
+      content_type);
 }
 
-inline Result ClientImpl::Put(const char *path) {
-  return Put(path, std::string(), nullptr);
+inline Result ClientImpl::Put(const std::string &path) {
+  return Put(path, std::string(), std::string());
 }
 
-inline Result ClientImpl::Put(const char *path, const char *body,
-                              size_t content_length, const char *content_type) {
+inline Result ClientImpl::Put(const std::string &path, const char *body,
+                              size_t content_length,
+                              const std::string &content_type) {
   return Put(path, Headers(), body, content_length, content_type);
 }
 
-inline Result ClientImpl::Put(const char *path, const Headers &headers,
+inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
                               const char *body, size_t content_length,
-                              const char *content_type) {
+                              const std::string &content_type) {
   return send_with_content_provider("PUT", path, headers, body, content_length,
                                     nullptr, nullptr, content_type);
 }
 
-inline Result ClientImpl::Put(const char *path, const std::string &body,
-                              const char *content_type) {
+inline Result ClientImpl::Put(const std::string &path, const std::string &body,
+                              const std::string &content_type) {
   return Put(path, Headers(), body, content_type);
 }
 
-inline Result ClientImpl::Put(const char *path, const Headers &headers,
+inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
                               const std::string &body,
-                              const char *content_type) {
+                              const std::string &content_type) {
   return send_with_content_provider("PUT", path, headers, body.data(),
                                     body.size(), nullptr, nullptr,
                                     content_type);
 }
 
-inline Result ClientImpl::Put(const char *path, size_t content_length,
+inline Result ClientImpl::Put(const std::string &path, size_t content_length,
                               ContentProvider content_provider,
-                              const char *content_type) {
+                              const std::string &content_type) {
   return Put(path, Headers(), content_length, std::move(content_provider),
              content_type);
 }
 
-inline Result ClientImpl::Put(const char *path,
+inline Result ClientImpl::Put(const std::string &path,
                               ContentProviderWithoutLength content_provider,
-                              const char *content_type) {
+                              const std::string &content_type) {
   return Put(path, Headers(), std::move(content_provider), content_type);
 }
 
-inline Result ClientImpl::Put(const char *path, const Headers &headers,
+inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
                               size_t content_length,
                               ContentProvider content_provider,
-                              const char *content_type) {
+                              const std::string &content_type) {
   return send_with_content_provider("PUT", path, headers, nullptr,
                                     content_length, std::move(content_provider),
                                     nullptr, content_type);
 }
 
-inline Result ClientImpl::Put(const char *path, const Headers &headers,
+inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
                               ContentProviderWithoutLength content_provider,
-                              const char *content_type) {
+                              const std::string &content_type) {
   return send_with_content_provider("PUT", path, headers, nullptr, 0, nullptr,
                                     std::move(content_provider), content_type);
 }
 
-inline Result ClientImpl::Put(const char *path, const Params &params) {
+inline Result ClientImpl::Put(const std::string &path, const Params &params) {
   return Put(path, Headers(), params);
 }
 
-inline Result ClientImpl::Put(const char *path, const Headers &headers,
+inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
                               const Params &params) {
   auto query = detail::params_to_query_str(params);
   return Put(path, headers, query, "application/x-www-form-urlencoded");
 }
 
-inline Result ClientImpl::Patch(const char *path) {
-  return Patch(path, std::string(), nullptr);
+inline Result ClientImpl::Put(const std::string &path,
+                              const MultipartFormDataItems &items) {
+  return Put(path, Headers(), items);
+}
+
+inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
+                              const MultipartFormDataItems &items) {
+  const auto &boundary = detail::make_multipart_data_boundary();
+  const auto &content_type =
+      detail::serialize_multipart_formdata_get_content_type(boundary);
+  const auto &body = detail::serialize_multipart_formdata(items, boundary);
+  return Put(path, headers, body, content_type);
+}
+
+inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
+                              const MultipartFormDataItems &items,
+                              const std::string &boundary) {
+  if (!detail::is_multipart_boundary_chars_valid(boundary)) {
+    return Result{nullptr, Error::UnsupportedMultipartBoundaryChars};
+  }
+
+  const auto &content_type =
+      detail::serialize_multipart_formdata_get_content_type(boundary);
+  const auto &body = detail::serialize_multipart_formdata(items, boundary);
+  return Put(path, headers, body, content_type);
+}
+
+inline Result
+ClientImpl::Put(const std::string &path, const Headers &headers,
+                const MultipartFormDataItems &items,
+                const MultipartFormDataProviderItems &provider_items) {
+  const auto &boundary = detail::make_multipart_data_boundary();
+  const auto &content_type =
+      detail::serialize_multipart_formdata_get_content_type(boundary);
+  return send_with_content_provider(
+      "PUT", path, headers, nullptr, 0, nullptr,
+      get_multipart_content_provider(boundary, items, provider_items),
+      content_type);
+}
+inline Result ClientImpl::Patch(const std::string &path) {
+  return Patch(path, std::string(), std::string());
 }
 
-inline Result ClientImpl::Patch(const char *path, const char *body,
+inline Result ClientImpl::Patch(const std::string &path, const char *body,
                                 size_t content_length,
-                                const char *content_type) {
+                                const std::string &content_type) {
   return Patch(path, Headers(), body, content_length, content_type);
 }
 
-inline Result ClientImpl::Patch(const char *path, const Headers &headers,
+inline Result ClientImpl::Patch(const std::string &path, const Headers &headers,
                                 const char *body, size_t content_length,
-                                const char *content_type) {
+                                const std::string &content_type) {
   return send_with_content_provider("PATCH", path, headers, body,
                                     content_length, nullptr, nullptr,
                                     content_type);
 }
 
-inline Result ClientImpl::Patch(const char *path, const std::string &body,
-                                const char *content_type) {
+inline Result ClientImpl::Patch(const std::string &path,
+                                const std::string &body,
+                                const std::string &content_type) {
   return Patch(path, Headers(), body, content_type);
 }
 
-inline Result ClientImpl::Patch(const char *path, const Headers &headers,
+inline Result ClientImpl::Patch(const std::string &path, const Headers &headers,
                                 const std::string &body,
-                                const char *content_type) {
+                                const std::string &content_type) {
   return send_with_content_provider("PATCH", path, headers, body.data(),
                                     body.size(), nullptr, nullptr,
                                     content_type);
 }
 
-inline Result ClientImpl::Patch(const char *path, size_t content_length,
+inline Result ClientImpl::Patch(const std::string &path, size_t content_length,
                                 ContentProvider content_provider,
-                                const char *content_type) {
+                                const std::string &content_type) {
   return Patch(path, Headers(), content_length, std::move(content_provider),
                content_type);
 }
 
-inline Result ClientImpl::Patch(const char *path,
+inline Result ClientImpl::Patch(const std::string &path,
                                 ContentProviderWithoutLength content_provider,
-                                const char *content_type) {
+                                const std::string &content_type) {
   return Patch(path, Headers(), std::move(content_provider), content_type);
 }
 
-inline Result ClientImpl::Patch(const char *path, const Headers &headers,
+inline Result ClientImpl::Patch(const std::string &path, const Headers &headers,
                                 size_t content_length,
                                 ContentProvider content_provider,
-                                const char *content_type) {
+                                const std::string &content_type) {
   return send_with_content_provider("PATCH", path, headers, nullptr,
                                     content_length, std::move(content_provider),
                                     nullptr, content_type);
 }
 
-inline Result ClientImpl::Patch(const char *path, const Headers &headers,
+inline Result ClientImpl::Patch(const std::string &path, const Headers &headers,
                                 ContentProviderWithoutLength content_provider,
-                                const char *content_type) {
+                                const std::string &content_type) {
   return send_with_content_provider("PATCH", path, headers, nullptr, 0, nullptr,
                                     std::move(content_provider), content_type);
 }
 
-inline Result ClientImpl::Delete(const char *path) {
-  return Delete(path, Headers(), std::string(), nullptr);
+inline Result ClientImpl::Delete(const std::string &path) {
+  return Delete(path, Headers(), std::string(), std::string());
 }
 
-inline Result ClientImpl::Delete(const char *path, const Headers &headers) {
-  return Delete(path, headers, std::string(), nullptr);
+inline Result ClientImpl::Delete(const std::string &path,
+                                 const Headers &headers) {
+  return Delete(path, headers, std::string(), std::string());
 }
 
-inline Result ClientImpl::Delete(const char *path, const char *body,
+inline Result ClientImpl::Delete(const std::string &path, const char *body,
                                  size_t content_length,
-                                 const char *content_type) {
+                                 const std::string &content_type) {
   return Delete(path, Headers(), body, content_length, content_type);
 }
 
-inline Result ClientImpl::Delete(const char *path, const Headers &headers,
-                                 const char *body, size_t content_length,
-                                 const char *content_type) {
+inline Result ClientImpl::Delete(const std::string &path,
+                                 const Headers &headers, const char *body,
+                                 size_t content_length,
+                                 const std::string &content_type) {
   Request req;
   req.method = "DELETE";
   req.headers = headers;
   req.path = path;
 
-  if (content_type) { req.headers.emplace("Content-Type", content_type); }
+  if (!content_type.empty()) { req.set_header("Content-Type", content_type); }
   req.body.assign(body, content_length);
 
   return send_(std::move(req));
 }
 
-inline Result ClientImpl::Delete(const char *path, const std::string &body,
-                                 const char *content_type) {
+inline Result ClientImpl::Delete(const std::string &path,
+                                 const std::string &body,
+                                 const std::string &content_type) {
   return Delete(path, Headers(), body.data(), body.size(), content_type);
 }
 
-inline Result ClientImpl::Delete(const char *path, const Headers &headers,
+inline Result ClientImpl::Delete(const std::string &path,
+                                 const Headers &headers,
                                  const std::string &body,
-                                 const char *content_type) {
+                                 const std::string &content_type) {
   return Delete(path, headers, body.data(), body.size(), content_type);
 }
 
-inline Result ClientImpl::Options(const char *path) {
+inline Result ClientImpl::Options(const std::string &path) {
   return Options(path, Headers());
 }
 
-inline Result ClientImpl::Options(const char *path, const Headers &headers) {
+inline Result ClientImpl::Options(const std::string &path,
+                                  const Headers &headers) {
   Request req;
   req.method = "OPTIONS";
   req.headers = headers;
@@ -6911,11 +8034,6 @@ inline Result ClientImpl::Options(const char *path, const Headers &headers) {
   return send_(std::move(req));
 }
 
-inline size_t ClientImpl::is_socket_open() const {
-  std::lock_guard<std::mutex> guard(socket_mutex_);
-  return socket_.is_open();
-}
-
 inline void ClientImpl::stop() {
   std::lock_guard<std::mutex> guard(socket_mutex_);
 
@@ -6933,12 +8051,23 @@ inline void ClientImpl::stop() {
     return;
   }
 
-  // Otherwise, sitll holding the mutex, we can shut everything down ourselves
+  // Otherwise, still holding the mutex, we can shut everything down ourselves
   shutdown_ssl(socket_, true);
   shutdown_socket(socket_);
   close_socket(socket_);
 }
 
+inline std::string ClientImpl::host() const { return host_; }
+
+inline int ClientImpl::port() const { return port_; }
+
+inline size_t ClientImpl::is_socket_open() const {
+  std::lock_guard<std::mutex> guard(socket_mutex_);
+  return socket_.is_open();
+}
+
+inline socket_t ClientImpl::socket() const { return socket_.sock; }
+
 inline void ClientImpl::set_connection_timeout(time_t sec, time_t usec) {
   connection_timeout_sec_ = sec;
   connection_timeout_usec_ = usec;
@@ -6954,19 +8083,19 @@ inline void ClientImpl::set_write_timeout(time_t sec, time_t usec) {
   write_timeout_usec_ = usec;
 }
 
-inline void ClientImpl::set_basic_auth(const char *username,
-                                       const char *password) {
+inline void ClientImpl::set_basic_auth(const std::string &username,
+                                       const std::string &password) {
   basic_auth_username_ = username;
   basic_auth_password_ = password;
 }
 
-inline void ClientImpl::set_bearer_token_auth(const char *token) {
+inline void ClientImpl::set_bearer_token_auth(const std::string &token) {
   bearer_token_auth_token_ = token;
 }
 
 #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-inline void ClientImpl::set_digest_auth(const char *username,
-                                        const char *password) {
+inline void ClientImpl::set_digest_auth(const std::string &username,
+                                        const std::string &password) {
   digest_auth_username_ = username;
   digest_auth_password_ = password;
 }
@@ -6987,6 +8116,11 @@ inline void ClientImpl::set_default_headers(Headers headers) {
   default_headers_ = std::move(headers);
 }
 
+inline void ClientImpl::set_header_writer(
+    std::function<ssize_t(Stream &, Headers &)> const &writer) {
+  header_writer_ = writer;
+}
+
 inline void ClientImpl::set_address_family(int family) {
   address_family_ = family;
 }
@@ -7001,36 +8135,36 @@ inline void ClientImpl::set_compress(bool on) { compress_ = on; }
 
 inline void ClientImpl::set_decompress(bool on) { decompress_ = on; }
 
-inline void ClientImpl::set_interface(const char *intf) { interface_ = intf; }
+inline void ClientImpl::set_interface(const std::string &intf) {
+  interface_ = intf;
+}
 
-inline void ClientImpl::set_proxy(const char *host, int port) {
+inline void ClientImpl::set_proxy(const std::string &host, int port) {
   proxy_host_ = host;
   proxy_port_ = port;
 }
 
-inline void ClientImpl::set_proxy_basic_auth(const char *username,
-                                             const char *password) {
+inline void ClientImpl::set_proxy_basic_auth(const std::string &username,
+                                             const std::string &password) {
   proxy_basic_auth_username_ = username;
   proxy_basic_auth_password_ = password;
 }
 
-inline void ClientImpl::set_proxy_bearer_token_auth(const char *token) {
+inline void ClientImpl::set_proxy_bearer_token_auth(const std::string &token) {
   proxy_bearer_token_auth_token_ = token;
 }
 
 #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-inline void ClientImpl::set_proxy_digest_auth(const char *username,
-                                              const char *password) {
+inline void ClientImpl::set_proxy_digest_auth(const std::string &username,
+                                              const std::string &password) {
   proxy_digest_auth_username_ = username;
   proxy_digest_auth_password_ = password;
 }
-#endif
 
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-inline void ClientImpl::set_ca_cert_path(const char *ca_cert_file_path,
-                                         const char *ca_cert_dir_path) {
-  if (ca_cert_file_path) { ca_cert_file_path_ = ca_cert_file_path; }
-  if (ca_cert_dir_path) { ca_cert_dir_path_ = ca_cert_dir_path; }
+inline void ClientImpl::set_ca_cert_path(const std::string &ca_cert_file_path,
+                                         const std::string &ca_cert_dir_path) {
+  ca_cert_file_path_ = ca_cert_file_path;
+  ca_cert_dir_path_ = ca_cert_dir_path;
 }
 
 inline void ClientImpl::set_ca_cert_store(X509_STORE *ca_cert_store) {
@@ -7038,9 +8172,34 @@ inline void ClientImpl::set_ca_cert_store(X509_STORE *ca_cert_store) {
     ca_cert_store_ = ca_cert_store;
   }
 }
-#endif
 
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+inline X509_STORE *ClientImpl::create_ca_cert_store(const char *ca_cert,
+                                                    std::size_t size) const {
+  auto mem = BIO_new_mem_buf(ca_cert, static_cast<int>(size));
+  if (!mem) { return nullptr; }
+
+  auto inf = PEM_X509_INFO_read_bio(mem, nullptr, nullptr, nullptr);
+  if (!inf) {
+    BIO_free_all(mem);
+    return nullptr;
+  }
+
+  auto cts = X509_STORE_new();
+  if (cts) {
+    for (auto i = 0; i < static_cast<int>(sk_X509_INFO_num(inf)); i++) {
+      auto itmp = sk_X509_INFO_value(inf, i);
+      if (!itmp) { continue; }
+
+      if (itmp->x509) { X509_STORE_add_cert(cts, itmp->x509); }
+      if (itmp->crl) { X509_STORE_add_crl(cts, itmp->crl); }
+    }
+  }
+
+  sk_X509_INFO_pop_free(inf, X509_INFO_free);
+  BIO_free_all(mem);
+  return cts;
+}
+
 inline void ClientImpl::enable_server_certificate_verification(bool enabled) {
   server_certificate_verification_ = enabled;
 }
@@ -7104,7 +8263,7 @@ bool ssl_connect_or_accept_nonblocking(socket_t sock, SSL *ssl,
                                        U ssl_connect_or_accept,
                                        time_t timeout_sec,
                                        time_t timeout_usec) {
-  int res = 0;
+  auto res = 0;
   while ((res = ssl_connect_or_accept(ssl)) != 1) {
     auto err = SSL_get_error(ssl, res);
     switch (err) {
@@ -7146,55 +8305,12 @@ process_client_socket_ssl(SSL *ssl, socket_t sock, time_t read_timeout_sec,
   return callback(strm);
 }
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-static std::shared_ptr<std::vector<std::mutex>> openSSL_locks_;
-
-class SSLThreadLocks {
-public:
-  SSLThreadLocks() {
-    openSSL_locks_ =
-        std::make_shared<std::vector<std::mutex>>(CRYPTO_num_locks());
-    CRYPTO_set_locking_callback(locking_callback);
-  }
-
-  ~SSLThreadLocks() { CRYPTO_set_locking_callback(nullptr); }
-
-private:
-  static void locking_callback(int mode, int type, const char * /*file*/,
-                               int /*line*/) {
-    auto &lk = (*openSSL_locks_)[static_cast<size_t>(type)];
-    if (mode & CRYPTO_LOCK) {
-      lk.lock();
-    } else {
-      lk.unlock();
-    }
-  }
-};
-
-#endif
-
 class SSLInit {
 public:
   SSLInit() {
-#if OPENSSL_VERSION_NUMBER < 0x1010001fL
-    SSL_load_error_strings();
-    SSL_library_init();
-#else
     OPENSSL_init_ssl(
         OPENSSL_INIT_LOAD_SSL_STRINGS | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
-#endif
-  }
-
-  ~SSLInit() {
-#if OPENSSL_VERSION_NUMBER < 0x1010001fL
-    ERR_free_strings();
-#endif
   }
-
-private:
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-  SSLThreadLocks thread_init_;
-#endif
 };
 
 // SSL socket stream implementation
@@ -7210,75 +8326,77 @@ inline SSLSocketStream::SSLSocketStream(socket_t sock, SSL *ssl,
   SSL_clear_mode(ssl, SSL_MODE_AUTO_RETRY);
 }
 
-inline SSLSocketStream::~SSLSocketStream() {}
+inline SSLSocketStream::~SSLSocketStream() = default;
 
 inline bool SSLSocketStream::is_readable() const {
   return detail::select_read(sock_, read_timeout_sec_, read_timeout_usec_) > 0;
 }
 
 inline bool SSLSocketStream::is_writable() const {
-  return detail::select_write(sock_, write_timeout_sec_, write_timeout_usec_) >
-         0;
+  return select_write(sock_, write_timeout_sec_, write_timeout_usec_) > 0 &&
+         is_socket_alive(sock_);
 }
 
 inline ssize_t SSLSocketStream::read(char *ptr, size_t size) {
-  size_t readbytes = 0;
   if (SSL_pending(ssl_) > 0) {
-    auto ret = SSL_read_ex(ssl_, ptr, size, &readbytes);
-    if (ret == 1) { return static_cast<ssize_t>(readbytes); }
-    if (SSL_get_error(ssl_, ret) == SSL_ERROR_ZERO_RETURN) { return 0; }
-    return -1;
-  }
-  if (!is_readable()) { return -1; }
-
-  auto ret = SSL_read_ex(ssl_, ptr, size, &readbytes);
-  if (ret == 1) { return static_cast<ssize_t>(readbytes); }
-  auto err = SSL_get_error(ssl_, ret);
-  int n = 1000;
+    return SSL_read(ssl_, ptr, static_cast<int>(size));
+  } else if (is_readable()) {
+    auto ret = SSL_read(ssl_, ptr, static_cast<int>(size));
+    if (ret < 0) {
+      auto err = SSL_get_error(ssl_, ret);
+      auto n = 1000;
 #ifdef _WIN32
-  while (--n >= 0 &&
-         (err == SSL_ERROR_WANT_READ ||
-          (err == SSL_ERROR_SYSCALL && WSAGetLastError() == WSAETIMEDOUT))) {
+      while (--n >= 0 && (err == SSL_ERROR_WANT_READ ||
+                          (err == SSL_ERROR_SYSCALL &&
+                           WSAGetLastError() == WSAETIMEDOUT))) {
 #else
-  while (--n >= 0 && err == SSL_ERROR_WANT_READ) {
+      while (--n >= 0 && err == SSL_ERROR_WANT_READ) {
 #endif
-    if (SSL_pending(ssl_) > 0) {
-      ret = SSL_read_ex(ssl_, ptr, size, &readbytes);
-      if (ret == 1) { return static_cast<ssize_t>(readbytes); }
-      if (SSL_get_error(ssl_, ret) == SSL_ERROR_ZERO_RETURN) { return 0; }
-      return -1;
+        if (SSL_pending(ssl_) > 0) {
+          return SSL_read(ssl_, ptr, static_cast<int>(size));
+        } else if (is_readable()) {
+          std::this_thread::sleep_for(std::chrono::milliseconds(1));
+          ret = SSL_read(ssl_, ptr, static_cast<int>(size));
+          if (ret >= 0) { return ret; }
+          err = SSL_get_error(ssl_, ret);
+        } else {
+          return -1;
+        }
+      }
     }
-    if (!is_readable()) { return -1; }
-    std::this_thread::sleep_for(std::chrono::milliseconds(1));
-    ret = SSL_read_ex(ssl_, ptr, size, &readbytes);
-    if (ret == 1) { return static_cast<ssize_t>(readbytes); }
-    err = SSL_get_error(ssl_, ret);
+    return ret;
   }
-  if (err == SSL_ERROR_ZERO_RETURN) { return 0; }
   return -1;
 }
 
 inline ssize_t SSLSocketStream::write(const char *ptr, size_t size) {
-  if (!is_writable()) { return -1; }
-  size_t written = 0;
-  auto ret = SSL_write_ex(ssl_, ptr, size, &written);
-  if (ret == 1) { return static_cast<ssize_t>(written); }
-  auto err = SSL_get_error(ssl_, ret);
-  int n = 1000;
+  if (is_writable()) {
+    auto handle_size = static_cast<int>(
+        std::min<size_t>(size, (std::numeric_limits<int>::max)()));
+
+    auto ret = SSL_write(ssl_, ptr, static_cast<int>(handle_size));
+    if (ret < 0) {
+      auto err = SSL_get_error(ssl_, ret);
+      auto n = 1000;
 #ifdef _WIN32
-  while (--n >= 0 &&
-         (err == SSL_ERROR_WANT_WRITE ||
-          (err == SSL_ERROR_SYSCALL && WSAGetLastError() == WSAETIMEDOUT))) {
+      while (--n >= 0 && (err == SSL_ERROR_WANT_WRITE ||
+                          (err == SSL_ERROR_SYSCALL &&
+                           WSAGetLastError() == WSAETIMEDOUT))) {
 #else
-  while (--n >= 0 && err == SSL_ERROR_WANT_WRITE) {
+      while (--n >= 0 && err == SSL_ERROR_WANT_WRITE) {
 #endif
-    if (!is_writable()) { return -1; }
-    std::this_thread::sleep_for(std::chrono::milliseconds(1));
-    ret = SSL_write_ex(ssl_, ptr, size, &written);
-    if (ret == 1) { return static_cast<ssize_t>(written); }
-    err = SSL_get_error(ssl_, ret);
+        if (is_writable()) {
+          std::this_thread::sleep_for(std::chrono::milliseconds(1));
+          ret = SSL_write(ssl_, ptr, static_cast<int>(handle_size));
+          if (ret >= 0) { return ret; }
+          err = SSL_get_error(ssl_, ret);
+        } else {
+          return -1;
+        }
+      }
+    }
+    return ret;
   }
-  if (err == SSL_ERROR_ZERO_RETURN) { return 0; }
   return -1;
 }
 
@@ -7287,6 +8405,11 @@ inline void SSLSocketStream::get_remote_ip_and_port(std::string &ip,
   detail::get_remote_ip_and_port(sock_, ip, port);
 }
 
+inline void SSLSocketStream::get_local_ip_and_port(std::string &ip,
+                                                   int &port) const {
+  detail::get_local_ip_and_port(sock_, ip, port);
+}
+
 inline socket_t SSLSocketStream::socket() const { return sock_; }
 
 static SSLInit sslinit_;
@@ -7309,8 +8432,9 @@ inline SSLServer::SSLServer(const char *cert_path, const char *private_key_path,
 
     // add default password callback before opening encrypted private key
     if (private_key_password != nullptr && (private_key_password[0] != '\0')) {
-      SSL_CTX_set_default_passwd_cb_userdata(ctx_,
-                                             (char *)private_key_password);
+      SSL_CTX_set_default_passwd_cb_userdata(
+          ctx_,
+          reinterpret_cast<void *>(const_cast<char *>(private_key_password)));
     }
 
     if (SSL_CTX_use_certificate_chain_file(ctx_, cert_path) != 1 ||
@@ -7374,13 +8498,13 @@ inline SSL_CTX *SSLServer::ssl_context() const { return ctx_; }
 inline bool SSLServer::process_and_close_socket(socket_t sock) {
   auto ssl = detail::ssl_new(
       sock, ctx_, ctx_mutex_,
-      [&](SSL *ssl) {
+      [&](SSL *ssl2) {
         return detail::ssl_connect_or_accept_nonblocking(
-            sock, ssl, SSL_accept, read_timeout_sec_, read_timeout_usec_);
+            sock, ssl2, SSL_accept, read_timeout_sec_, read_timeout_usec_);
       },
-      [](SSL * /*ssl*/) { return true; });
+      [](SSL * /*ssl2*/) { return true; });
 
-  bool ret = false;
+  auto ret = false;
   if (ssl) {
     ret = detail::process_server_socket_ssl(
         svr_sock_, ssl, sock, keep_alive_max_count_, keep_alive_timeout_sec_,
@@ -7418,7 +8542,7 @@ inline SSLClient::SSLClient(const std::string &host, int port,
 
   detail::split(&host_[0], &host_[host_.size()], '.',
                 [&](const char *b, const char *e) {
-                  host_components_.emplace_back(std::string(b, e));
+                  host_components_.emplace_back(b, e);
                 });
 
   if (!client_cert_path.empty() && !client_key_path.empty()) {
@@ -7439,7 +8563,7 @@ inline SSLClient::SSLClient(const std::string &host, int port,
 
   detail::split(&host_[0], &host_[host_.size()], '.',
                 [&](const char *b, const char *e) {
-                  host_components_.emplace_back(std::string(b, e));
+                  host_components_.emplace_back(b, e);
                 });
 
   if (client_cert != nullptr && client_key != nullptr) {
@@ -7474,6 +8598,11 @@ inline void SSLClient::set_ca_cert_store(X509_STORE *ca_cert_store) {
   }
 }
 
+inline void SSLClient::load_ca_cert_store(const char *ca_cert,
+                                          std::size_t size) {
+  set_ca_cert_store(ClientImpl::create_ca_cert_store(ca_cert, size));
+}
+
 inline long SSLClient::get_openssl_verify_result() const {
   return verify_result_;
 }
@@ -7488,14 +8617,14 @@ inline bool SSLClient::create_and_connect_socket(Socket &socket, Error &error) {
 inline bool SSLClient::connect_with_proxy(Socket &socket, Response &res,
                                           bool &success, Error &error) {
   success = true;
-  Response res2;
+  Response proxy_res;
   if (!detail::process_client_socket(
           socket.sock, read_timeout_sec_, read_timeout_usec_,
           write_timeout_sec_, write_timeout_usec_, [&](Stream &strm) {
             Request req2;
             req2.method = "CONNECT";
             req2.path = host_and_port_;
-            return process_request(strm, req2, res2, false, error);
+            return process_request(strm, req2, proxy_res, false, error);
           })) {
     // Thread-safe to close everything because we are assuming there are no
     // requests in flight
@@ -7506,12 +8635,12 @@ inline bool SSLClient::connect_with_proxy(Socket &socket, Response &res,
     return false;
   }
 
-  if (res2.status == 407) {
+  if (proxy_res.status == StatusCode::ProxyAuthenticationRequired_407) {
     if (!proxy_digest_auth_username_.empty() &&
         !proxy_digest_auth_password_.empty()) {
       std::map<std::string, std::string> auth;
-      if (detail::parse_www_authenticate(res2, auth, true)) {
-        Response res3;
+      if (detail::parse_www_authenticate(proxy_res, auth, true)) {
+        proxy_res = Response();
         if (!detail::process_client_socket(
                 socket.sock, read_timeout_sec_, read_timeout_usec_,
                 write_timeout_sec_, write_timeout_usec_, [&](Stream &strm) {
@@ -7522,7 +8651,7 @@ inline bool SSLClient::connect_with_proxy(Socket &socket, Response &res,
                       req3, auth, 1, detail::random_string(10),
                       proxy_digest_auth_username_, proxy_digest_auth_password_,
                       true));
-                  return process_request(strm, req3, res3, false, error);
+                  return process_request(strm, req3, proxy_res, false, error);
                 })) {
           // Thread-safe to close everything because we are assuming there are
           // no requests in flight
@@ -7533,17 +8662,28 @@ inline bool SSLClient::connect_with_proxy(Socket &socket, Response &res,
           return false;
         }
       }
-    } else {
-      res = res2;
-      return false;
     }
   }
 
+  // If status code is not 200, proxy request is failed.
+  // Set error to ProxyConnection and return proxy response
+  // as the response of the request
+  if (proxy_res.status != StatusCode::OK_200) {
+    error = Error::ProxyConnection;
+    res = std::move(proxy_res);
+    // Thread-safe to close everything because we are assuming there are
+    // no requests in flight
+    shutdown_ssl(socket, true);
+    shutdown_socket(socket);
+    close_socket(socket);
+    return false;
+  }
+
   return true;
 }
 
 inline bool SSLClient::load_certs() {
-  bool ret = true;
+  auto ret = true;
 
   std::call_once(initialize_cert_, [&]() {
     std::lock_guard<std::mutex> guard(ctx_mutex_);
@@ -7558,11 +8698,16 @@ inline bool SSLClient::load_certs() {
         ret = false;
       }
     } else {
+      auto loaded = false;
 #ifdef _WIN32
-      detail::load_system_certs_on_windows(SSL_CTX_get_cert_store(ctx_));
-#else
-      SSL_CTX_set_default_verify_paths(ctx_);
-#endif
+      loaded =
+          detail::load_system_certs_on_windows(SSL_CTX_get_cert_store(ctx_));
+#elif defined(CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN) && defined(__APPLE__)
+#if TARGET_OS_OSX
+      loaded = detail::load_system_certs_on_macos(SSL_CTX_get_cert_store(ctx_));
+#endif // TARGET_OS_OSX
+#endif // _WIN32
+      if (!loaded) { SSL_CTX_set_default_verify_paths(ctx_); }
     }
   });
 
@@ -7572,31 +8717,31 @@ inline bool SSLClient::load_certs() {
 inline bool SSLClient::initialize_ssl(Socket &socket, Error &error) {
   auto ssl = detail::ssl_new(
       socket.sock, ctx_, ctx_mutex_,
-      [&](SSL *ssl) {
+      [&](SSL *ssl2) {
         if (server_certificate_verification_) {
           if (!load_certs()) {
             error = Error::SSLLoadingCerts;
             return false;
           }
-          SSL_set_verify(ssl, SSL_VERIFY_NONE, nullptr);
+          SSL_set_verify(ssl2, SSL_VERIFY_NONE, nullptr);
         }
 
         if (!detail::ssl_connect_or_accept_nonblocking(
-                socket.sock, ssl, SSL_connect, connection_timeout_sec_,
+                socket.sock, ssl2, SSL_connect, connection_timeout_sec_,
                 connection_timeout_usec_)) {
           error = Error::SSLConnection;
           return false;
         }
 
         if (server_certificate_verification_) {
-          verify_result_ = SSL_get_verify_result(ssl);
+          verify_result_ = SSL_get_verify_result(ssl2);
 
           if (verify_result_ != X509_V_OK) {
             error = Error::SSLServerVerification;
             return false;
           }
 
-          auto server_cert = SSL_get_peer_certificate(ssl);
+          auto server_cert = SSL_get1_peer_certificate(ssl2);
 
           if (server_cert == nullptr) {
             error = Error::SSLServerVerification;
@@ -7613,8 +8758,12 @@ inline bool SSLClient::initialize_ssl(Socket &socket, Error &error) {
 
         return true;
       },
-      [&](SSL *ssl) {
-        SSL_set_tlsext_host_name(ssl, host_.c_str());
+      [&](SSL *ssl2) {
+        // NOTE: Direct call instead of using the OpenSSL macro to suppress
+        // -Wold-style-cast warning
+        // SSL_set_tlsext_host_name(ssl2, host_.c_str());
+        SSL_ctrl(ssl2, SSL_CTRL_SET_TLSEXT_HOSTNAME, TLSEXT_NAMETYPE_host_name,
+                 static_cast<void *>(const_cast<char *>(host_.c_str())));
         return true;
       });
 
@@ -7688,8 +8837,8 @@ SSLClient::verify_host_with_subject_alt_name(X509 *server_cert) const {
 
   auto type = GEN_DNS;
 
-  struct in6_addr addr6;
-  struct in_addr addr;
+  struct in6_addr addr6 {};
+  struct in_addr addr {};
   size_t addr_len = 0;
 
 #ifndef __MINGW32__
@@ -7707,15 +8856,16 @@ SSLClient::verify_host_with_subject_alt_name(X509 *server_cert) const {
 
   if (alt_names) {
     auto dsn_matched = false;
-    auto ip_mached = false;
+    auto ip_matched = false;
 
     auto count = sk_GENERAL_NAME_num(alt_names);
 
     for (decltype(count) i = 0; i < count && !dsn_matched; i++) {
       auto val = sk_GENERAL_NAME_value(alt_names, i);
       if (val->type == type) {
-        auto name = (const char *)ASN1_STRING_get0_data(val->d.ia5);
-        auto name_len = (size_t)ASN1_STRING_length(val->d.ia5);
+        auto name =
+            reinterpret_cast<const char *>(ASN1_STRING_get0_data(val->d.ia5));
+        auto name_len = static_cast<size_t>(ASN1_STRING_length(val->d.ia5));
 
         switch (type) {
         case GEN_DNS: dsn_matched = check_host_name(name, name_len); break;
@@ -7723,17 +8873,18 @@ SSLClient::verify_host_with_subject_alt_name(X509 *server_cert) const {
         case GEN_IPADD:
           if (!memcmp(&addr6, name, addr_len) ||
               !memcmp(&addr, name, addr_len)) {
-            ip_mached = true;
+            ip_matched = true;
           }
           break;
         }
       }
     }
 
-    if (dsn_matched || ip_mached) { ret = true; }
+    if (dsn_matched || ip_matched) { ret = true; }
   }
 
-  GENERAL_NAMES_free((STACK_OF(GENERAL_NAME) *)alt_names);
+  GENERAL_NAMES_free(const_cast<STACK_OF(GENERAL_NAME) *>(
+      reinterpret_cast<const STACK_OF(GENERAL_NAME) *>(alt_names)));
   return ret;
 }
 
@@ -7762,7 +8913,7 @@ inline bool SSLClient::check_host_name(const char *pattern,
   std::vector<std::string> pattern_components;
   detail::split(&pattern[0], &pattern[pattern_len], '.',
                 [&](const char *b, const char *e) {
-                  pattern_components.emplace_back(std::string(b, e));
+                  pattern_components.emplace_back(b, e);
                 });
 
   if (host_components_.size() != pattern_components.size()) { return false; }
@@ -7818,13 +8969,13 @@ inline Client::Client(const std::string &scheme_host_port,
 
     if (is_ssl) {
 #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-      cli_ = detail::make_unique<SSLClient>(host.c_str(), port,
-                                            client_cert_path, client_key_path);
+      cli_ = detail::make_unique<SSLClient>(host, port, client_cert_path,
+                                            client_key_path);
       is_ssl_ = is_ssl;
 #endif
     } else {
-      cli_ = detail::make_unique<ClientImpl>(host.c_str(), port,
-                                             client_cert_path, client_key_path);
+      cli_ = detail::make_unique<ClientImpl>(host, port, client_cert_path,
+                                             client_key_path);
     }
   } else {
     cli_ = detail::make_unique<ClientImpl>(scheme_host_port, 80,
@@ -7841,257 +8992,302 @@ inline Client::Client(const std::string &host, int port,
     : cli_(detail::make_unique<ClientImpl>(host, port, client_cert_path,
                                            client_key_path)) {}
 
-inline Client::~Client() {}
+inline Client::~Client() = default;
 
 inline bool Client::is_valid() const {
   return cli_ != nullptr && cli_->is_valid();
 }
 
-inline Result Client::Get(const char *path) { return cli_->Get(path); }
-inline Result Client::Get(const char *path, const Headers &headers) {
+inline Result Client::Get(const std::string &path) { return cli_->Get(path); }
+inline Result Client::Get(const std::string &path, const Headers &headers) {
   return cli_->Get(path, headers);
 }
-inline Result Client::Get(const char *path, Progress progress) {
+inline Result Client::Get(const std::string &path, Progress progress) {
   return cli_->Get(path, std::move(progress));
 }
-inline Result Client::Get(const char *path, const Headers &headers,
+inline Result Client::Get(const std::string &path, const Headers &headers,
                           Progress progress) {
   return cli_->Get(path, headers, std::move(progress));
 }
-inline Result Client::Get(const char *path, ContentReceiver content_receiver) {
+inline Result Client::Get(const std::string &path,
+                          ContentReceiver content_receiver) {
   return cli_->Get(path, std::move(content_receiver));
 }
-inline Result Client::Get(const char *path, const Headers &headers,
+inline Result Client::Get(const std::string &path, const Headers &headers,
                           ContentReceiver content_receiver) {
   return cli_->Get(path, headers, std::move(content_receiver));
 }
-inline Result Client::Get(const char *path, ContentReceiver content_receiver,
-                          Progress progress) {
+inline Result Client::Get(const std::string &path,
+                          ContentReceiver content_receiver, Progress progress) {
   return cli_->Get(path, std::move(content_receiver), std::move(progress));
 }
-inline Result Client::Get(const char *path, const Headers &headers,
+inline Result Client::Get(const std::string &path, const Headers &headers,
                           ContentReceiver content_receiver, Progress progress) {
   return cli_->Get(path, headers, std::move(content_receiver),
                    std::move(progress));
 }
-inline Result Client::Get(const char *path, ResponseHandler response_handler,
+inline Result Client::Get(const std::string &path,
+                          ResponseHandler response_handler,
                           ContentReceiver content_receiver) {
   return cli_->Get(path, std::move(response_handler),
                    std::move(content_receiver));
 }
-inline Result Client::Get(const char *path, const Headers &headers,
+inline Result Client::Get(const std::string &path, const Headers &headers,
                           ResponseHandler response_handler,
                           ContentReceiver content_receiver) {
   return cli_->Get(path, headers, std::move(response_handler),
                    std::move(content_receiver));
 }
-inline Result Client::Get(const char *path, ResponseHandler response_handler,
+inline Result Client::Get(const std::string &path,
+                          ResponseHandler response_handler,
                           ContentReceiver content_receiver, Progress progress) {
   return cli_->Get(path, std::move(response_handler),
                    std::move(content_receiver), std::move(progress));
 }
-inline Result Client::Get(const char *path, const Headers &headers,
+inline Result Client::Get(const std::string &path, const Headers &headers,
                           ResponseHandler response_handler,
                           ContentReceiver content_receiver, Progress progress) {
   return cli_->Get(path, headers, std::move(response_handler),
                    std::move(content_receiver), std::move(progress));
 }
-inline Result Client::Get(const char *path, const Params &params,
+inline Result Client::Get(const std::string &path, const Params &params,
                           const Headers &headers, Progress progress) {
-  return cli_->Get(path, params, headers, progress);
+  return cli_->Get(path, params, headers, std::move(progress));
 }
-inline Result Client::Get(const char *path, const Params &params,
+inline Result Client::Get(const std::string &path, const Params &params,
                           const Headers &headers,
                           ContentReceiver content_receiver, Progress progress) {
-  return cli_->Get(path, params, headers, content_receiver, progress);
+  return cli_->Get(path, params, headers, std::move(content_receiver),
+                   std::move(progress));
 }
-inline Result Client::Get(const char *path, const Params &params,
+inline Result Client::Get(const std::string &path, const Params &params,
                           const Headers &headers,
                           ResponseHandler response_handler,
                           ContentReceiver content_receiver, Progress progress) {
-  return cli_->Get(path, params, headers, response_handler, content_receiver,
-                   progress);
+  return cli_->Get(path, params, headers, std::move(response_handler),
+                   std::move(content_receiver), std::move(progress));
 }
 
-inline Result Client::Head(const char *path) { return cli_->Head(path); }
-inline Result Client::Head(const char *path, const Headers &headers) {
+inline Result Client::Head(const std::string &path) { return cli_->Head(path); }
+inline Result Client::Head(const std::string &path, const Headers &headers) {
   return cli_->Head(path, headers);
 }
 
-inline Result Client::Post(const char *path) { return cli_->Post(path); }
-inline Result Client::Post(const char *path, const char *body,
-                           size_t content_length, const char *content_type) {
+inline Result Client::Post(const std::string &path) { return cli_->Post(path); }
+inline Result Client::Post(const std::string &path, const Headers &headers) {
+  return cli_->Post(path, headers);
+}
+inline Result Client::Post(const std::string &path, const char *body,
+                           size_t content_length,
+                           const std::string &content_type) {
   return cli_->Post(path, body, content_length, content_type);
 }
-inline Result Client::Post(const char *path, const Headers &headers,
+inline Result Client::Post(const std::string &path, const Headers &headers,
                            const char *body, size_t content_length,
-                           const char *content_type) {
+                           const std::string &content_type) {
   return cli_->Post(path, headers, body, content_length, content_type);
 }
-inline Result Client::Post(const char *path, const std::string &body,
-                           const char *content_type) {
+inline Result Client::Post(const std::string &path, const std::string &body,
+                           const std::string &content_type) {
   return cli_->Post(path, body, content_type);
 }
-inline Result Client::Post(const char *path, const Headers &headers,
-                           const std::string &body, const char *content_type) {
+inline Result Client::Post(const std::string &path, const Headers &headers,
+                           const std::string &body,
+                           const std::string &content_type) {
   return cli_->Post(path, headers, body, content_type);
 }
-inline Result Client::Post(const char *path, size_t content_length,
+inline Result Client::Post(const std::string &path, size_t content_length,
                            ContentProvider content_provider,
-                           const char *content_type) {
+                           const std::string &content_type) {
   return cli_->Post(path, content_length, std::move(content_provider),
                     content_type);
 }
-inline Result Client::Post(const char *path,
+inline Result Client::Post(const std::string &path,
                            ContentProviderWithoutLength content_provider,
-                           const char *content_type) {
+                           const std::string &content_type) {
   return cli_->Post(path, std::move(content_provider), content_type);
 }
-inline Result Client::Post(const char *path, const Headers &headers,
+inline Result Client::Post(const std::string &path, const Headers &headers,
                            size_t content_length,
                            ContentProvider content_provider,
-                           const char *content_type) {
+                           const std::string &content_type) {
   return cli_->Post(path, headers, content_length, std::move(content_provider),
                     content_type);
 }
-inline Result Client::Post(const char *path, const Headers &headers,
+inline Result Client::Post(const std::string &path, const Headers &headers,
                            ContentProviderWithoutLength content_provider,
-                           const char *content_type) {
+                           const std::string &content_type) {
   return cli_->Post(path, headers, std::move(content_provider), content_type);
 }
-inline Result Client::Post(const char *path, const Params &params) {
+inline Result Client::Post(const std::string &path, const Params &params) {
   return cli_->Post(path, params);
 }
-inline Result Client::Post(const char *path, const Headers &headers,
+inline Result Client::Post(const std::string &path, const Headers &headers,
                            const Params &params) {
   return cli_->Post(path, headers, params);
 }
-inline Result Client::Post(const char *path,
+inline Result Client::Post(const std::string &path,
                            const MultipartFormDataItems &items) {
   return cli_->Post(path, items);
 }
-inline Result Client::Post(const char *path, const Headers &headers,
+inline Result Client::Post(const std::string &path, const Headers &headers,
                            const MultipartFormDataItems &items) {
   return cli_->Post(path, headers, items);
 }
-inline Result Client::Post(const char *path, const Headers &headers,
+inline Result Client::Post(const std::string &path, const Headers &headers,
                            const MultipartFormDataItems &items,
                            const std::string &boundary) {
   return cli_->Post(path, headers, items, boundary);
 }
-inline Result Client::Put(const char *path) { return cli_->Put(path); }
-inline Result Client::Put(const char *path, const char *body,
-                          size_t content_length, const char *content_type) {
+inline Result
+Client::Post(const std::string &path, const Headers &headers,
+             const MultipartFormDataItems &items,
+             const MultipartFormDataProviderItems &provider_items) {
+  return cli_->Post(path, headers, items, provider_items);
+}
+inline Result Client::Put(const std::string &path) { return cli_->Put(path); }
+inline Result Client::Put(const std::string &path, const char *body,
+                          size_t content_length,
+                          const std::string &content_type) {
   return cli_->Put(path, body, content_length, content_type);
 }
-inline Result Client::Put(const char *path, const Headers &headers,
+inline Result Client::Put(const std::string &path, const Headers &headers,
                           const char *body, size_t content_length,
-                          const char *content_type) {
+                          const std::string &content_type) {
   return cli_->Put(path, headers, body, content_length, content_type);
 }
-inline Result Client::Put(const char *path, const std::string &body,
-                          const char *content_type) {
+inline Result Client::Put(const std::string &path, const std::string &body,
+                          const std::string &content_type) {
   return cli_->Put(path, body, content_type);
 }
-inline Result Client::Put(const char *path, const Headers &headers,
-                          const std::string &body, const char *content_type) {
+inline Result Client::Put(const std::string &path, const Headers &headers,
+                          const std::string &body,
+                          const std::string &content_type) {
   return cli_->Put(path, headers, body, content_type);
 }
-inline Result Client::Put(const char *path, size_t content_length,
+inline Result Client::Put(const std::string &path, size_t content_length,
                           ContentProvider content_provider,
-                          const char *content_type) {
+                          const std::string &content_type) {
   return cli_->Put(path, content_length, std::move(content_provider),
                    content_type);
 }
-inline Result Client::Put(const char *path,
+inline Result Client::Put(const std::string &path,
                           ContentProviderWithoutLength content_provider,
-                          const char *content_type) {
+                          const std::string &content_type) {
   return cli_->Put(path, std::move(content_provider), content_type);
 }
-inline Result Client::Put(const char *path, const Headers &headers,
+inline Result Client::Put(const std::string &path, const Headers &headers,
                           size_t content_length,
                           ContentProvider content_provider,
-                          const char *content_type) {
+                          const std::string &content_type) {
   return cli_->Put(path, headers, content_length, std::move(content_provider),
                    content_type);
 }
-inline Result Client::Put(const char *path, const Headers &headers,
+inline Result Client::Put(const std::string &path, const Headers &headers,
                           ContentProviderWithoutLength content_provider,
-                          const char *content_type) {
+                          const std::string &content_type) {
   return cli_->Put(path, headers, std::move(content_provider), content_type);
 }
-inline Result Client::Put(const char *path, const Params &params) {
+inline Result Client::Put(const std::string &path, const Params &params) {
   return cli_->Put(path, params);
 }
-inline Result Client::Put(const char *path, const Headers &headers,
+inline Result Client::Put(const std::string &path, const Headers &headers,
                           const Params &params) {
   return cli_->Put(path, headers, params);
 }
-inline Result Client::Patch(const char *path) { return cli_->Patch(path); }
-inline Result Client::Patch(const char *path, const char *body,
-                            size_t content_length, const char *content_type) {
+inline Result Client::Put(const std::string &path,
+                          const MultipartFormDataItems &items) {
+  return cli_->Put(path, items);
+}
+inline Result Client::Put(const std::string &path, const Headers &headers,
+                          const MultipartFormDataItems &items) {
+  return cli_->Put(path, headers, items);
+}
+inline Result Client::Put(const std::string &path, const Headers &headers,
+                          const MultipartFormDataItems &items,
+                          const std::string &boundary) {
+  return cli_->Put(path, headers, items, boundary);
+}
+inline Result
+Client::Put(const std::string &path, const Headers &headers,
+            const MultipartFormDataItems &items,
+            const MultipartFormDataProviderItems &provider_items) {
+  return cli_->Put(path, headers, items, provider_items);
+}
+inline Result Client::Patch(const std::string &path) {
+  return cli_->Patch(path);
+}
+inline Result Client::Patch(const std::string &path, const char *body,
+                            size_t content_length,
+                            const std::string &content_type) {
   return cli_->Patch(path, body, content_length, content_type);
 }
-inline Result Client::Patch(const char *path, const Headers &headers,
+inline Result Client::Patch(const std::string &path, const Headers &headers,
                             const char *body, size_t content_length,
-                            const char *content_type) {
+                            const std::string &content_type) {
   return cli_->Patch(path, headers, body, content_length, content_type);
 }
-inline Result Client::Patch(const char *path, const std::string &body,
-                            const char *content_type) {
+inline Result Client::Patch(const std::string &path, const std::string &body,
+                            const std::string &content_type) {
   return cli_->Patch(path, body, content_type);
 }
-inline Result Client::Patch(const char *path, const Headers &headers,
-                            const std::string &body, const char *content_type) {
+inline Result Client::Patch(const std::string &path, const Headers &headers,
+                            const std::string &body,
+                            const std::string &content_type) {
   return cli_->Patch(path, headers, body, content_type);
 }
-inline Result Client::Patch(const char *path, size_t content_length,
+inline Result Client::Patch(const std::string &path, size_t content_length,
                             ContentProvider content_provider,
-                            const char *content_type) {
+                            const std::string &content_type) {
   return cli_->Patch(path, content_length, std::move(content_provider),
                      content_type);
 }
-inline Result Client::Patch(const char *path,
+inline Result Client::Patch(const std::string &path,
                             ContentProviderWithoutLength content_provider,
-                            const char *content_type) {
+                            const std::string &content_type) {
   return cli_->Patch(path, std::move(content_provider), content_type);
 }
-inline Result Client::Patch(const char *path, const Headers &headers,
+inline Result Client::Patch(const std::string &path, const Headers &headers,
                             size_t content_length,
                             ContentProvider content_provider,
-                            const char *content_type) {
+                            const std::string &content_type) {
   return cli_->Patch(path, headers, content_length, std::move(content_provider),
                      content_type);
 }
-inline Result Client::Patch(const char *path, const Headers &headers,
+inline Result Client::Patch(const std::string &path, const Headers &headers,
                             ContentProviderWithoutLength content_provider,
-                            const char *content_type) {
+                            const std::string &content_type) {
   return cli_->Patch(path, headers, std::move(content_provider), content_type);
 }
-inline Result Client::Delete(const char *path) { return cli_->Delete(path); }
-inline Result Client::Delete(const char *path, const Headers &headers) {
+inline Result Client::Delete(const std::string &path) {
+  return cli_->Delete(path);
+}
+inline Result Client::Delete(const std::string &path, const Headers &headers) {
   return cli_->Delete(path, headers);
 }
-inline Result Client::Delete(const char *path, const char *body,
-                             size_t content_length, const char *content_type) {
+inline Result Client::Delete(const std::string &path, const char *body,
+                             size_t content_length,
+                             const std::string &content_type) {
   return cli_->Delete(path, body, content_length, content_type);
 }
-inline Result Client::Delete(const char *path, const Headers &headers,
+inline Result Client::Delete(const std::string &path, const Headers &headers,
                              const char *body, size_t content_length,
-                             const char *content_type) {
+                             const std::string &content_type) {
   return cli_->Delete(path, headers, body, content_length, content_type);
 }
-inline Result Client::Delete(const char *path, const std::string &body,
-                             const char *content_type) {
+inline Result Client::Delete(const std::string &path, const std::string &body,
+                             const std::string &content_type) {
   return cli_->Delete(path, body, content_type);
 }
-inline Result Client::Delete(const char *path, const Headers &headers,
+inline Result Client::Delete(const std::string &path, const Headers &headers,
                              const std::string &body,
-                             const char *content_type) {
+                             const std::string &content_type) {
   return cli_->Delete(path, headers, body, content_type);
 }
-inline Result Client::Options(const char *path) { return cli_->Options(path); }
-inline Result Client::Options(const char *path, const Headers &headers) {
+inline Result Client::Options(const std::string &path) {
+  return cli_->Options(path);
+}
+inline Result Client::Options(const std::string &path, const Headers &headers) {
   return cli_->Options(path, headers);
 }
 
@@ -8101,9 +9297,15 @@ inline bool Client::send(Request &req, Response &res, Error &error) {
 
 inline Result Client::send(const Request &req) { return cli_->send(req); }
 
+inline void Client::stop() { cli_->stop(); }
+
+inline std::string Client::host() const { return cli_->host(); }
+
+inline int Client::port() const { return cli_->port(); }
+
 inline size_t Client::is_socket_open() const { return cli_->is_socket_open(); }
 
-inline void Client::stop() { cli_->stop(); }
+inline socket_t Client::socket() const { return cli_->socket(); }
 
 inline void
 Client::set_hostname_addr_map(std::map<std::string, std::string> addr_map) {
@@ -8114,6 +9316,11 @@ inline void Client::set_default_headers(Headers headers) {
   cli_->set_default_headers(std::move(headers));
 }
 
+inline void Client::set_header_writer(
+    std::function<ssize_t(Stream &, Headers &)> const &writer) {
+  cli_->set_header_writer(writer);
+}
+
 inline void Client::set_address_family(int family) {
   cli_->set_address_family(family);
 }
@@ -8136,15 +9343,16 @@ inline void Client::set_write_timeout(time_t sec, time_t usec) {
   cli_->set_write_timeout(sec, usec);
 }
 
-inline void Client::set_basic_auth(const char *username, const char *password) {
+inline void Client::set_basic_auth(const std::string &username,
+                                   const std::string &password) {
   cli_->set_basic_auth(username, password);
 }
-inline void Client::set_bearer_token_auth(const char *token) {
+inline void Client::set_bearer_token_auth(const std::string &token) {
   cli_->set_bearer_token_auth(token);
 }
 #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-inline void Client::set_digest_auth(const char *username,
-                                    const char *password) {
+inline void Client::set_digest_auth(const std::string &username,
+                                    const std::string &password) {
   cli_->set_digest_auth(username, password);
 }
 #endif
@@ -8160,23 +9368,23 @@ inline void Client::set_compress(bool on) { cli_->set_compress(on); }
 
 inline void Client::set_decompress(bool on) { cli_->set_decompress(on); }
 
-inline void Client::set_interface(const char *intf) {
+inline void Client::set_interface(const std::string &intf) {
   cli_->set_interface(intf);
 }
 
-inline void Client::set_proxy(const char *host, int port) {
+inline void Client::set_proxy(const std::string &host, int port) {
   cli_->set_proxy(host, port);
 }
-inline void Client::set_proxy_basic_auth(const char *username,
-                                         const char *password) {
+inline void Client::set_proxy_basic_auth(const std::string &username,
+                                         const std::string &password) {
   cli_->set_proxy_basic_auth(username, password);
 }
-inline void Client::set_proxy_bearer_token_auth(const char *token) {
+inline void Client::set_proxy_bearer_token_auth(const std::string &token) {
   cli_->set_proxy_bearer_token_auth(token);
 }
 #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-inline void Client::set_proxy_digest_auth(const char *username,
-                                          const char *password) {
+inline void Client::set_proxy_digest_auth(const std::string &username,
+                                          const std::string &password) {
   cli_->set_proxy_digest_auth(username, password);
 }
 #endif
@@ -8187,11 +9395,13 @@ inline void Client::enable_server_certificate_verification(bool enabled) {
 }
 #endif
 
-inline void Client::set_logger(Logger logger) { cli_->set_logger(logger); }
+inline void Client::set_logger(Logger logger) {
+  cli_->set_logger(std::move(logger));
+}
 
 #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-inline void Client::set_ca_cert_path(const char *ca_cert_file_path,
-                                     const char *ca_cert_dir_path) {
+inline void Client::set_ca_cert_path(const std::string &ca_cert_file_path,
+                                     const std::string &ca_cert_dir_path) {
   cli_->set_ca_cert_path(ca_cert_file_path, ca_cert_dir_path);
 }
 
@@ -8203,6 +9413,10 @@ inline void Client::set_ca_cert_store(X509_STORE *ca_cert_store) {
   }
 }
 
+inline void Client::load_ca_cert_store(const char *ca_cert, std::size_t size) {
+  set_ca_cert_store(cli_->create_ca_cert_store(ca_cert, size));
+}
+
 inline long Client::get_openssl_verify_result() const {
   if (is_ssl_) {
     return static_cast<SSLClient &>(*cli_).get_openssl_verify_result();
@@ -8220,4 +9434,8 @@ inline SSL_CTX *Client::ssl_context() const {
 
 } // namespace httplib
 
+#if defined(_WIN32) && defined(CPPHTTPLIB_USE_POLL)
+#undef poll
+#endif
+
 #endif // CPPHTTPLIB_HTTPLIB_H
diff --git a/external_imported/cpp-httplib/httplibConfig.cmake.in b/external_imported/cpp-httplib/httplibConfig.cmake.in
index 4cd5ebf72..93dff323d 100644
--- a/external_imported/cpp-httplib/httplibConfig.cmake.in
+++ b/external_imported/cpp-httplib/httplibConfig.cmake.in
@@ -12,19 +12,19 @@ set(HTTPLIB_VERSION @PROJECT_VERSION@)
 include(CMakeFindDependencyMacro)
 
 # We add find_dependency calls here to not make the end-user have to call them.
-find_dependency(Threads REQUIRED)
+find_dependency(Threads)
 if(@HTTPLIB_IS_USING_OPENSSL@)
 	# OpenSSL COMPONENTS were added in Cmake v3.11
 	if(CMAKE_VERSION VERSION_LESS "3.11")
-		find_dependency(OpenSSL @_HTTPLIB_OPENSSL_MIN_VER@ REQUIRED)
+		find_dependency(OpenSSL @_HTTPLIB_OPENSSL_MIN_VER@)
 	else()
 		# Once the COMPONENTS were added, they were made optional when not specified.
 		# Since we use both, we need to search for both.
-		find_dependency(OpenSSL @_HTTPLIB_OPENSSL_MIN_VER@ COMPONENTS Crypto SSL REQUIRED)
+		find_dependency(OpenSSL @_HTTPLIB_OPENSSL_MIN_VER@ COMPONENTS Crypto SSL)
 	endif()
 endif()
 if(@HTTPLIB_IS_USING_ZLIB@)
-	find_dependency(ZLIB REQUIRED)
+	find_dependency(ZLIB)
 endif()
 
 if(@HTTPLIB_IS_USING_BROTLI@)
@@ -32,7 +32,7 @@ if(@HTTPLIB_IS_USING_BROTLI@)
 	# Note that the FindBrotli.cmake file is installed in the same dir as this file.
 	list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
 	set(BROTLI_USE_STATIC_LIBS @BROTLI_USE_STATIC_LIBS@)
-	find_dependency(Brotli COMPONENTS common encoder decoder REQUIRED)
+	find_dependency(Brotli COMPONENTS common encoder decoder)
 endif()
 
 # Mildly useful for end-users
@@ -42,10 +42,19 @@ set_and_check(HTTPLIB_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_FULL_INCLUDEDIR@")
 # This is helpful if you're using Cmake's pre-compiled header feature
 set_and_check(HTTPLIB_HEADER_PATH "@PACKAGE_CMAKE_INSTALL_FULL_INCLUDEDIR@/httplib.h")
 
-# Brings in the target library
-include("${CMAKE_CURRENT_LIST_DIR}/httplibTargets.cmake")
+# Consider each library support as a "component"
+set(httplib_OpenSSL_FOUND @HTTPLIB_IS_USING_OPENSSL@)
+set(httplib_ZLIB_FOUND @HTTPLIB_IS_USING_ZLIB@)
+set(httplib_Brotli_FOUND @HTTPLIB_IS_USING_BROTLI@)
 
-# Ouputs a "found httplib /usr/include/httplib.h" message when using find_package(httplib)
+check_required_components(httplib)
+
+# Brings in the target library, but only if all required components are found
+if(NOT DEFINED httplib_FOUND OR httplib_FOUND)
+	include("${CMAKE_CURRENT_LIST_DIR}/httplibTargets.cmake")
+endif()
+
+# Outputs a "found httplib /usr/include/httplib.h" message when using find_package(httplib)
 include(FindPackageMessage)
 if(TARGET httplib::httplib)
 	set(HTTPLIB_FOUND TRUE)
diff --git a/external_imported/cpp-httplib/meson.build b/external_imported/cpp-httplib/meson.build
index 961777e63..e82ae8451 100644
--- a/external_imported/cpp-httplib/meson.build
+++ b/external_imported/cpp-httplib/meson.build
@@ -19,7 +19,6 @@ project(
 # Check just in case downstream decides to edit the source
 # and add a project version
 version = meson.project_version()
-python3 = find_program('python3')
 if version == 'undefined'
   cxx = meson.get_compiler('cpp')
   version = cxx.get_define('CPPHTTPLIB_VERSION',
@@ -28,15 +27,20 @@ if version == 'undefined'
   assert(version != '', 'failed to get version from httplib.h')
 endif
 
-message('cpp-httplib version ' + version)
-
 deps = [dependency('threads')]
 args = []
 
-openssl_dep = dependency('openssl', version: '>=1.1.1', required: get_option('cpp-httplib_openssl'))
+openssl_dep = dependency('openssl', version: '>=3.0.0', required: get_option('cpp-httplib_openssl'))
 if openssl_dep.found()
   deps += openssl_dep
   args += '-DCPPHTTPLIB_OPENSSL_SUPPORT'
+  if host_machine.system() == 'darwin'
+    macosx_keychain_dep = dependency('appleframeworks', modules: ['CoreFoundation', 'Security'], required: get_option('cpp-httplib_macosx_keychain'))
+    if macosx_keychain_dep.found()
+        deps += macosx_keychain_dep
+        args += '-DCPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN'
+    endif  
+  endif
 endif
 
 zlib_dep = dependency('zlib', required: get_option('cpp-httplib_zlib'))
@@ -64,6 +68,8 @@ endif
 cpp_httplib_dep = dependency('', required: false)
 
 if get_option('cpp-httplib_compile')
+  python3 = find_program('python3')
+
   httplib_ch = custom_target(
     'split',
     input: 'httplib.h',
@@ -78,6 +84,7 @@ if get_option('cpp-httplib_compile')
     dependencies: deps,
     cpp_args: args,
     version: version,
+    soversion: version.split('.')[0] + '.' + version.split('.')[1],
     install: true
   )
   cpp_httplib_dep = declare_dependency(compile_args: args, dependencies: deps, link_with: lib, sources: httplib_ch[1])
diff --git a/external_imported/cpp-httplib/meson_options.txt b/external_imported/cpp-httplib/meson_options.txt
index 6f6d9240f..e15847d42 100644
--- a/external_imported/cpp-httplib/meson_options.txt
+++ b/external_imported/cpp-httplib/meson_options.txt
@@ -5,5 +5,6 @@
 option('cpp-httplib_openssl', type: 'feature', value: 'auto', description: 'Enable OpenSSL support')
 option('cpp-httplib_zlib',    type: 'feature', value: 'auto', description: 'Enable zlib support')
 option('cpp-httplib_brotli',  type: 'feature', value: 'auto', description: 'Enable Brotli support')
-option('cpp-httplib_compile', type: 'boolean', value: false,  description: 'Split the header into a compilable header & source file')
+option('cpp-httplib_macosx_keychain', type: 'feature', value: 'auto', description: 'Enable loading certs from the Keychain on Apple devices')
+option('cpp-httplib_compile', type: 'boolean', value: false,  description: 'Split the header into a compilable header & source file (requires python3)')
 option('cpp-httplib_test',    type: 'boolean', value: false,  description: 'Build tests')
diff --git a/external_imported/cpp-httplib/test/CMakeLists.txt b/external_imported/cpp-httplib/test/CMakeLists.txt
new file mode 100644
index 000000000..3cf2c24d8
--- /dev/null
+++ b/external_imported/cpp-httplib/test/CMakeLists.txt
@@ -0,0 +1,106 @@
+find_package(GTest)
+
+if(GTest_FOUND)
+    if(NOT TARGET GTest::gtest_main AND TARGET GTest::Main)
+	# CMake <3.20
+        add_library(GTest::gtest_main INTERFACE IMPORTED)
+        target_link_libraries(GTest::gtest_main INTERFACE GTest::Main)
+    endif()
+else()
+    if(POLICY CMP0135)
+        cmake_policy(SET CMP0135 NEW)
+    endif()
+
+    include(FetchContent)
+
+    set(BUILD_GMOCK OFF)
+    set(INSTALL_GTEST OFF)
+    set(gtest_force_shared_crt ON)
+
+    FetchContent_Declare(
+        gtest
+        URL https://github.com/google/googletest/archive/main.tar.gz
+    )
+    FetchContent_MakeAvailable(gtest)
+endif()
+
+add_executable(httplib-test test.cc)
+target_compile_options(httplib-test PRIVATE "$<$<CXX_COMPILER_ID:MSVC>:/utf-8;/bigobj>")
+target_link_libraries(httplib-test PRIVATE httplib GTest::gtest_main)
+gtest_discover_tests(httplib-test)
+
+execute_process(
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_LIST_DIR}/www www
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_LIST_DIR}/www2 www2
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_LIST_DIR}/www3 www3
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_LIST_DIR}/ca-bundle.crt ca-bundle.crt
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_LIST_DIR}/image.jpg image.jpg
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    COMMAND_ERROR_IS_FATAL ANY
+)
+
+if(HTTPLIB_IS_USING_OPENSSL)
+    find_program(OPENSSL_COMMAND
+        NAMES openssl
+        PATHS ${OPENSSL_INCLUDE_DIR}/../bin
+        REQUIRED
+    )
+    execute_process(
+        COMMAND ${OPENSSL_COMMAND} genrsa 2048
+        OUTPUT_FILE key.pem
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+        COMMAND_ERROR_IS_FATAL ANY
+    )
+    execute_process(
+        COMMAND ${OPENSSL_COMMAND} req -new -batch -config ${CMAKE_CURRENT_LIST_DIR}/test.conf -key key.pem
+        COMMAND ${OPENSSL_COMMAND} x509 -days 3650 -req -signkey key.pem
+        OUTPUT_FILE cert.pem
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+        COMMAND_ERROR_IS_FATAL ANY
+    )
+    execute_process(
+        COMMAND ${OPENSSL_COMMAND} req -x509 -new -config ${CMAKE_CURRENT_LIST_DIR}/test.conf -key key.pem -sha256 -days 3650 -nodes -out cert2.pem -extensions SAN
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+        COMMAND_ERROR_IS_FATAL ANY
+    )
+    execute_process(
+        COMMAND ${OPENSSL_COMMAND} genrsa 2048
+        OUTPUT_FILE rootCA.key.pem
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+        COMMAND_ERROR_IS_FATAL ANY
+    )
+    execute_process(
+        COMMAND ${OPENSSL_COMMAND} req -x509 -new -batch -config ${CMAKE_CURRENT_LIST_DIR}/test.rootCA.conf -key rootCA.key.pem -days 1024
+        OUTPUT_FILE rootCA.cert.pem
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+        COMMAND_ERROR_IS_FATAL ANY
+    )
+    execute_process(
+        COMMAND ${OPENSSL_COMMAND} genrsa 2048
+        OUTPUT_FILE client.key.pem
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+        COMMAND_ERROR_IS_FATAL ANY
+    )
+    execute_process(
+        COMMAND ${OPENSSL_COMMAND} req -new -batch -config ${CMAKE_CURRENT_LIST_DIR}/test.conf -key client.key.pem
+        COMMAND ${OPENSSL_COMMAND} x509 -days 370 -req -CA rootCA.cert.pem -CAkey rootCA.key.pem -CAcreateserial
+        OUTPUT_FILE client.cert.pem
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+        COMMAND_ERROR_IS_FATAL ANY
+    )
+    execute_process(
+        COMMAND ${OPENSSL_COMMAND} genrsa -passout pass:test123! 2048
+        OUTPUT_FILE key_encrypted.pem
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+        COMMAND_ERROR_IS_FATAL ANY
+    )
+    execute_process(
+        COMMAND ${OPENSSL_COMMAND} req -new -batch -config ${CMAKE_CURRENT_LIST_DIR}/test.conf -key key_encrypted.pem
+        COMMAND ${OPENSSL_COMMAND} x509 -days 3650 -req -signkey key_encrypted.pem
+        OUTPUT_FILE cert_encrypted.pem
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+        COMMAND_ERROR_IS_FATAL ANY
+    )
+endif()
+
+add_subdirectory(fuzzing)
diff --git a/external_imported/cpp-httplib/test/Makefile b/external_imported/cpp-httplib/test/Makefile
index e75ab5b63..3b72d209f 100644
--- a/external_imported/cpp-httplib/test/Makefile
+++ b/external_imported/cpp-httplib/test/Makefile
@@ -1,13 +1,19 @@
 CXX = clang++
-CXXFLAGS = -g -std=c++11 -I. -Wall -Wextra -Wtype-limits -Wconversion # -fno-exceptions -DCPPHTTPLIB_NO_EXCEPTIONS -fsanitize=address
+CXXFLAGS = -g -std=c++11 -I. -Wall -Wextra -Wtype-limits -Wconversion -Wshadow # -fno-exceptions -DCPPHTTPLIB_NO_EXCEPTIONS -fsanitize=address
 
 PREFIX = /usr/local
 #PREFIX = $(shell brew --prefix)
 
-OPENSSL_DIR = $(PREFIX)/opt/openssl@1.1
-#OPENSSL_DIR = $(PREFIX)/opt/openssl@3
+OPENSSL_DIR = $(PREFIX)/opt/openssl@3
 OPENSSL_SUPPORT = -DCPPHTTPLIB_OPENSSL_SUPPORT -I$(OPENSSL_DIR)/include -L$(OPENSSL_DIR)/lib -lssl -lcrypto
 
+ifneq ($(OS), Windows_NT)
+	UNAME_S := $(shell uname -s)
+	ifeq ($(UNAME_S), Darwin)
+		OPENSSL_SUPPORT += -DCPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN -framework CoreFoundation -framework Security
+	endif
+endif
+
 ZLIB_SUPPORT = -DCPPHTTPLIB_ZLIB_SUPPORT -lz
 
 BROTLI_DIR = $(PREFIX)/opt/brotli
diff --git a/external_imported/cpp-httplib/test/fuzzing/CMakeLists.txt b/external_imported/cpp-httplib/test/fuzzing/CMakeLists.txt
new file mode 100644
index 000000000..7e416c7eb
--- /dev/null
+++ b/external_imported/cpp-httplib/test/fuzzing/CMakeLists.txt
@@ -0,0 +1,10 @@
+file(GLOB HTTPLIB_CORPUS corpus/*)
+add_executable(httplib-test-fuzz
+    server_fuzzer.cc
+    standalone_fuzz_target_runner.cpp
+)
+target_link_libraries(httplib-test-fuzz PRIVATE httplib)
+add_test(
+    NAME httplib-test-fuzz
+    COMMAND httplib-test-fuzz ${HTTPLIB_CORPUS}
+)
diff --git a/external_imported/cpp-httplib/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5042094968537088 b/external_imported/cpp-httplib/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5042094968537088
new file mode 100644
index 000000000..032572903
Binary files /dev/null and b/external_imported/cpp-httplib/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5042094968537088 differ
diff --git a/external_imported/cpp-httplib/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5886572146327552 b/external_imported/cpp-httplib/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5886572146327552
new file mode 100644
index 000000000..797165c50
Binary files /dev/null and b/external_imported/cpp-httplib/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5886572146327552 differ
diff --git a/external_imported/cpp-httplib/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-6007379124158464 b/external_imported/cpp-httplib/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-6007379124158464
new file mode 100644
index 000000000..4c4c57e81
Binary files /dev/null and b/external_imported/cpp-httplib/test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-6007379124158464 differ
diff --git a/external_imported/cpp-httplib/test/fuzzing/corpus/issue1264 b/external_imported/cpp-httplib/test/fuzzing/corpus/issue1264
new file mode 100644
index 000000000..fd53db5c9
--- /dev/null
+++ b/external_imported/cpp-httplib/test/fuzzing/corpus/issue1264
@@ -0,0 +1,19 @@
+POST /fform%u008anoÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔÔãm%u08a�g HTTP/1.0
+DondntGnt-Encodin€z-daExpi%20-Enëv2PUT@ËHTkP/

+Rcnðÿÿÿÿÿÿ ,Cotent-Security-Pz-tes=T“peont.e�µ-Typènt-Ty@n/***ww-form-urlenc…Tÿû?aLO%KSi@FrÇTTP/1.0
+Cofffffffffffffffffffffffntemt�
+�
+�
+�
+�
+�
+Content-Length:dent:applica;tion/x-wsw-form%`00368aogrlencod368angrlencoded
+�JJ`
+o
+
+8�ÿõContent-EncodxNg:deflatePtipfo
+
+8�


+9Ö2H2											ncod368anPOST # HTTP/1.0
Content-Encoding:defPOST / HTTP/1.0
+Content-Encoding:PUT { HTTP/1.0
+Content-Type:Range:bytes=-
multipart/
\ No newline at end of file
diff --git a/external_imported/cpp-httplib/test/fuzzing/server_fuzzer.cc b/external_imported/cpp-httplib/test/fuzzing/server_fuzzer.cc
index 9fb4d4b61..3c0e94802 100644
--- a/external_imported/cpp-httplib/test/fuzzing/server_fuzzer.cc
+++ b/external_imported/cpp-httplib/test/fuzzing/server_fuzzer.cc
@@ -1,5 +1,6 @@
+#include <cstdint>
+
 #include <httplib.h>
-#include <memory>
 
 class FuzzedStream : public httplib::Stream {
 public:
@@ -22,8 +23,6 @@ class FuzzedStream : public httplib::Stream {
 
   ssize_t write(const std::string &s) { return write(s.data(), s.size()); }
 
-  std::string get_remote_addr() const { return ""; }
-
   bool is_readable() const override { return true; }
 
   bool is_writable() const override { return true; }
@@ -33,6 +32,11 @@ class FuzzedStream : public httplib::Stream {
     port = 8080;
   }
 
+  void get_local_ip_and_port(std::string &ip, int &port) const override {
+    ip = "127.0.0.1";
+    port = 8080;
+  }
+
   socket_t socket() const override { return 0; }
 
 private:
diff --git a/external_imported/cpp-httplib/test/fuzzing/standalone_fuzz_target_runner.cpp b/external_imported/cpp-httplib/test/fuzzing/standalone_fuzz_target_runner.cpp
index 733737bcf..e8bd5ed6e 100644
--- a/external_imported/cpp-httplib/test/fuzzing/standalone_fuzz_target_runner.cpp
+++ b/external_imported/cpp-httplib/test/fuzzing/standalone_fuzz_target_runner.cpp
@@ -5,13 +5,13 @@
 // on the test corpus or on a single file,
 // e.g. the one that comes from a bug report.
 
-#include <cassert>
-#include <iostream>
+#include <cstdint>
 #include <fstream>
+#include <iostream>
 #include <vector>
 
 // Forward declare the "fuzz target" interface.
-// We deliberately keep this inteface simple and header-free.
+// We deliberately keep this interface simple and header-free.
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size);
 
 // It reads all files passed as parameters and feeds their contents
@@ -21,7 +21,7 @@ int main(int argc, char **argv) {
     std::ifstream in(argv[i]);
     in.seekg(0, in.end);
     size_t length = static_cast<size_t>(in.tellg());
-    in.seekg (0, in.beg);
+    in.seekg(0, in.beg);
     std::cout << "Reading " << length << " bytes from " << argv[i] << std::endl;
     // Allocate exactly length bytes so that we reliably catch buffer overflows.
     std::vector<char> bytes(length);
diff --git a/external_imported/cpp-httplib/test/gtest/gtest-all.cc b/external_imported/cpp-httplib/test/gtest/gtest-all.cc
index eb8fa17c8..24e669e1e 100644
--- a/external_imported/cpp-httplib/test/gtest/gtest-all.cc
+++ b/external_imported/cpp-httplib/test/gtest/gtest-all.cc
@@ -1912,7 +1912,7 @@ void AssertHelper::operator=(const Message& message) const {
 namespace {
 
 // When TEST_P is found without a matching INSTANTIATE_TEST_SUITE_P
-// to creates test cases for it, a syntetic test case is
+// to creates test cases for it, a synthetic test case is
 // inserted to report ether an error or a log message.
 //
 // This configuration bit will likely be removed at some point.
diff --git a/external_imported/cpp-httplib/test/meson.build b/external_imported/cpp-httplib/test/meson.build
index 293ba0563..a83360d5c 100644
--- a/external_imported/cpp-httplib/test/meson.build
+++ b/external_imported/cpp-httplib/test/meson.build
@@ -86,6 +86,12 @@ subdir(join_paths('www', 'dir'))
 subdir(join_paths('www2', 'dir'))
 subdir(join_paths('www3', 'dir'))
 
+# GoogleTest 1.13.0 requires C++14
+test_options = []
+if gtest_dep.version().version_compare('>=1.13.0')
+  test_options += 'cpp_std=c++14'
+endif
+
 test(
   'main',
   executable(
@@ -94,7 +100,8 @@ test(
     dependencies: [
       cpp_httplib_dep,
       gtest_dep
-    ]
+    ],
+    override_options: test_options
   ),
   depends: [
     key_pem,
diff --git a/external_imported/cpp-httplib/test/test.cc b/external_imported/cpp-httplib/test/test.cc
index d7257ee7a..64fc8f289 100644
--- a/external_imported/cpp-httplib/test/test.cc
+++ b/external_imported/cpp-httplib/test/test.cc
@@ -1,10 +1,12 @@
 #include <httplib.h>
+#include <signal.h>
 
 #include <gtest/gtest.h>
 
 #include <atomic>
 #include <chrono>
 #include <future>
+#include <memory>
 #include <sstream>
 #include <stdexcept>
 #include <thread>
@@ -44,7 +46,7 @@ MultipartFormData &get_file_value(MultipartFormDataItems &files,
   return *it;
 #else
   if (it != files.end()) { return *it; }
-  throw std::runtime_error("invalid mulitpart form data name error");
+  throw std::runtime_error("invalid multipart form data name error");
 #endif
 }
 
@@ -69,6 +71,15 @@ TEST(DecodeURLTest, PercentCharacter) {
       R"(descrip=Gastos áéíóúñÑ 6)");
 }
 
+TEST(DecodeURLTest, PercentCharacterNUL) {
+  string expected;
+  expected.push_back('x');
+  expected.push_back('\0');
+  expected.push_back('x');
+
+  EXPECT_EQ(detail::decode_url("x%00x", false), expected);
+}
+
 TEST(EncodeQueryParamTest, ParseUnescapedChararactersTest) {
   string unescapedCharacters = "-_.!~*'()";
 
@@ -109,11 +120,11 @@ TEST(SplitTest, ParseQueryString) {
   detail::split(s.c_str(), s.c_str() + s.size(), '&',
                 [&](const char *b, const char *e) {
                   string key, val;
-                  detail::split(b, e, '=', [&](const char *b, const char *e) {
+                  detail::split(b, e, '=', [&](const char *b2, const char *e2) {
                     if (key.empty()) {
-                      key.assign(b, e);
+                      key.assign(b2, e2);
                     } else {
-                      val.assign(b, e);
+                      val.assign(b2, e2);
                     }
                   });
                   dic.emplace(key, val);
@@ -167,6 +178,40 @@ TEST(ParamsToQueryTest, ConvertParamsToQuery) {
   EXPECT_EQ(detail::params_to_query_str(dic), "key1=val1&key2=val2&key3=val3");
 }
 
+TEST(ParseMultipartBoundaryTest, DefaultValue) {
+  string content_type = "multipart/form-data; boundary=something";
+  string boundary;
+  auto ret = detail::parse_multipart_boundary(content_type, boundary);
+  EXPECT_TRUE(ret);
+  EXPECT_EQ(boundary, "something");
+}
+
+TEST(ParseMultipartBoundaryTest, ValueWithQuote) {
+  string content_type = "multipart/form-data; boundary=\"gc0pJq0M:08jU534c0p\"";
+  string boundary;
+  auto ret = detail::parse_multipart_boundary(content_type, boundary);
+  EXPECT_TRUE(ret);
+  EXPECT_EQ(boundary, "gc0pJq0M:08jU534c0p");
+}
+
+TEST(ParseMultipartBoundaryTest, ValueWithCharset) {
+  string content_type =
+      "multipart/mixed; boundary=THIS_STRING_SEPARATES;charset=UTF-8";
+  string boundary;
+  auto ret = detail::parse_multipart_boundary(content_type, boundary);
+  EXPECT_TRUE(ret);
+  EXPECT_EQ(boundary, "THIS_STRING_SEPARATES");
+}
+
+TEST(ParseMultipartBoundaryTest, ValueWithQuotesAndCharset) {
+  string content_type =
+      "multipart/mixed; boundary=\"cpp-httplib-multipart-data\"; charset=UTF-8";
+  string boundary;
+  auto ret = detail::parse_multipart_boundary(content_type, boundary);
+  EXPECT_TRUE(ret);
+  EXPECT_EQ(boundary, "cpp-httplib-multipart-data");
+}
+
 TEST(GetHeaderValueTest, DefaultValue) {
   Headers headers = {{"Dummy", "Dummy"}};
   auto val = detail::get_header_value(headers, "Content-Type", 0, "text/plain");
@@ -175,8 +220,7 @@ TEST(GetHeaderValueTest, DefaultValue) {
 
 TEST(GetHeaderValueTest, DefaultValueInt) {
   Headers headers = {{"Dummy", "Dummy"}};
-  auto val =
-      detail::get_header_value<uint64_t>(headers, "Content-Length", 0, 100);
+  auto val = detail::get_header_value_u64(headers, "Content-Length", 0, 100);
   EXPECT_EQ(100ull, val);
 }
 
@@ -205,8 +249,7 @@ TEST(GetHeaderValueTest, SetContent) {
 
 TEST(GetHeaderValueTest, RegularValueInt) {
   Headers headers = {{"Content-Length", "100"}, {"Dummy", "Dummy"}};
-  auto val =
-      detail::get_header_value<uint64_t>(headers, "Content-Length", 0, 0);
+  auto val = detail::get_header_value_u64(headers, "Content-Length", 0, 0);
   EXPECT_EQ(100ull, val);
 }
 
@@ -400,7 +443,7 @@ TEST(ChunkedEncodingTest, FromHTTPWatch_Online) {
   std::string out;
   detail::read_file("./image.jpg", out);
 
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ(out, res->body);
 }
 
@@ -408,7 +451,7 @@ TEST(HostnameToIPConversionTest, HTTPWatch_Online) {
   auto host = "www.httpwatch.com";
 
   auto ip = hosted_at(host);
-  EXPECT_EQ("191.236.16.12", ip);
+  EXPECT_EQ("23.96.13.243", ip);
 
   std::vector<std::string> addrs;
   hosted_at(host, addrs);
@@ -453,7 +496,7 @@ TEST(ChunkedEncodingTest, WithContentReceiver_Online) {
   std::string out;
   detail::read_file("./image.jpg", out);
 
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ(out, body);
 }
 
@@ -473,7 +516,7 @@ TEST(ChunkedEncodingTest, WithResponseHandlerAndContentReceiver_Online) {
   auto res = cli.Get(
       "/httpgallery/chunked/chunkedimage.aspx?0.4153841143030137",
       [&](const Response &response) {
-        EXPECT_EQ(200, response.status);
+        EXPECT_EQ(StatusCode::OK_200, response.status);
         return true;
       },
       [&](const char *data, size_t data_length) {
@@ -485,12 +528,18 @@ TEST(ChunkedEncodingTest, WithResponseHandlerAndContentReceiver_Online) {
   std::string out;
   detail::read_file("./image.jpg", out);
 
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ(out, body);
 }
 
 TEST(RangeTest, FromHTTPBin_Online) {
+#ifdef CPPHTTPLIB_DEFAULT_HTTPBIN
   auto host = "httpbin.org";
+  auto path = std::string{"/range/32"};
+#else
+  auto host = "nghttp2.org";
+  auto path = std::string{"/httpbin/range/32"};
+#endif
 
 #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
   auto port = 443;
@@ -502,49 +551,49 @@ TEST(RangeTest, FromHTTPBin_Online) {
   cli.set_connection_timeout(5);
 
   {
-    auto res = cli.Get("/range/32");
+    auto res = cli.Get(path);
     ASSERT_TRUE(res);
     EXPECT_EQ("abcdefghijklmnopqrstuvwxyzabcdef", res->body);
-    EXPECT_EQ(200, res->status);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
   }
 
   {
     Headers headers = {make_range_header({{1, -1}})};
-    auto res = cli.Get("/range/32", headers);
+    auto res = cli.Get(path, headers);
     ASSERT_TRUE(res);
     EXPECT_EQ("bcdefghijklmnopqrstuvwxyzabcdef", res->body);
-    EXPECT_EQ(206, res->status);
+    EXPECT_EQ(StatusCode::PartialContent_206, res->status);
   }
 
   {
     Headers headers = {make_range_header({{1, 10}})};
-    auto res = cli.Get("/range/32", headers);
+    auto res = cli.Get(path, headers);
     ASSERT_TRUE(res);
     EXPECT_EQ("bcdefghijk", res->body);
-    EXPECT_EQ(206, res->status);
+    EXPECT_EQ(StatusCode::PartialContent_206, res->status);
   }
 
   {
     Headers headers = {make_range_header({{0, 31}})};
-    auto res = cli.Get("/range/32", headers);
+    auto res = cli.Get(path, headers);
     ASSERT_TRUE(res);
     EXPECT_EQ("abcdefghijklmnopqrstuvwxyzabcdef", res->body);
-    EXPECT_EQ(200, res->status);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
   }
 
   {
     Headers headers = {make_range_header({{0, -1}})};
-    auto res = cli.Get("/range/32", headers);
+    auto res = cli.Get(path, headers);
     ASSERT_TRUE(res);
     EXPECT_EQ("abcdefghijklmnopqrstuvwxyzabcdef", res->body);
-    EXPECT_EQ(200, res->status);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
   }
 
   {
     Headers headers = {make_range_header({{0, 32}})};
-    auto res = cli.Get("/range/32", headers);
+    auto res = cli.Get(path, headers);
     ASSERT_TRUE(res);
-    EXPECT_EQ(416, res->status);
+    EXPECT_EQ(StatusCode::RangeNotSatisfiable_416, res->status);
   }
 }
 
@@ -594,7 +643,7 @@ TEST(ConnectionErrorTest, InvalidHostCheckResultErrorToString) {
   ASSERT_TRUE(!res);
   stringstream s;
   s << "error code: " << res.error();
-  EXPECT_EQ("error code: Connection (2)", s.str());
+  EXPECT_EQ("error code: Could not establish connection (2)", s.str());
 }
 
 TEST(ConnectionErrorTest, InvalidPort) {
@@ -637,7 +686,13 @@ TEST(ConnectionErrorTest, Timeout_Online) {
 }
 
 TEST(CancelTest, NoCancel_Online) {
+#ifdef CPPHTTPLIB_DEFAULT_HTTPBIN
   auto host = "httpbin.org";
+  auto path = std::string{"/range/32"};
+#else
+  auto host = "nghttp2.org";
+  auto path = std::string{"/httpbin/range/32"};
+#endif
 
 #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
   auto port = 443;
@@ -648,14 +703,20 @@ TEST(CancelTest, NoCancel_Online) {
 #endif
   cli.set_connection_timeout(std::chrono::seconds(5));
 
-  auto res = cli.Get("/range/32", [](uint64_t, uint64_t) { return true; });
+  auto res = cli.Get(path, [](uint64_t, uint64_t) { return true; });
   ASSERT_TRUE(res);
   EXPECT_EQ("abcdefghijklmnopqrstuvwxyzabcdef", res->body);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
 }
 
 TEST(CancelTest, WithCancelSmallPayload_Online) {
+#ifdef CPPHTTPLIB_DEFAULT_HTTPBIN
   auto host = "httpbin.org";
+  auto path = std::string{"/range/32"};
+#else
+  auto host = "nghttp2.org";
+  auto path = std::string{"/httpbin/range/32"};
+#endif
 
 #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
   auto port = 443;
@@ -665,14 +726,20 @@ TEST(CancelTest, WithCancelSmallPayload_Online) {
   Client cli(host, port);
 #endif
 
-  auto res = cli.Get("/range/32", [](uint64_t, uint64_t) { return false; });
+  auto res = cli.Get(path, [](uint64_t, uint64_t) { return false; });
   cli.set_connection_timeout(std::chrono::seconds(5));
   ASSERT_TRUE(!res);
   EXPECT_EQ(Error::Canceled, res.error());
 }
 
 TEST(CancelTest, WithCancelLargePayload_Online) {
+#ifdef CPPHTTPLIB_DEFAULT_HTTPBIN
   auto host = "httpbin.org";
+  auto path = std::string{"/range/65536"};
+#else
+  auto host = "nghttp2.org";
+  auto path = std::string{"/httpbin/range/65536"};
+#endif
 
 #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
   auto port = 443;
@@ -684,14 +751,20 @@ TEST(CancelTest, WithCancelLargePayload_Online) {
   cli.set_connection_timeout(std::chrono::seconds(5));
 
   uint32_t count = 0;
-  auto res = cli.Get("/range/65536",
-                     [&count](uint64_t, uint64_t) { return (count++ == 0); });
+  auto res =
+      cli.Get(path, [&count](uint64_t, uint64_t) { return (count++ == 0); });
   ASSERT_TRUE(!res);
   EXPECT_EQ(Error::Canceled, res.error());
 }
 
 TEST(BaseAuthTest, FromHTTPWatch_Online) {
+#ifdef CPPHTTPLIB_DEFAULT_HTTPBIN
   auto host = "httpbin.org";
+  auto path = std::string{"/basic-auth/hello/world"};
+#else
+  auto host = "nghttp2.org";
+  auto path = std::string{"/httpbin/basic-auth/hello/world"};
+#endif
 
 #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
   auto port = 443;
@@ -702,87 +775,100 @@ TEST(BaseAuthTest, FromHTTPWatch_Online) {
 #endif
 
   {
-    auto res = cli.Get("/basic-auth/hello/world");
+    auto res = cli.Get(path);
     ASSERT_TRUE(res);
-    EXPECT_EQ(401, res->status);
+    EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
   }
 
   {
-    auto res = cli.Get("/basic-auth/hello/world",
-                       {make_basic_authentication_header("hello", "world")});
+    auto res =
+        cli.Get(path, {make_basic_authentication_header("hello", "world")});
     ASSERT_TRUE(res);
     EXPECT_EQ("{\n  \"authenticated\": true, \n  \"user\": \"hello\"\n}\n",
               res->body);
-    EXPECT_EQ(200, res->status);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
   }
 
   {
     cli.set_basic_auth("hello", "world");
-    auto res = cli.Get("/basic-auth/hello/world");
+    auto res = cli.Get(path);
     ASSERT_TRUE(res);
     EXPECT_EQ("{\n  \"authenticated\": true, \n  \"user\": \"hello\"\n}\n",
               res->body);
-    EXPECT_EQ(200, res->status);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
   }
 
   {
     cli.set_basic_auth("hello", "bad");
-    auto res = cli.Get("/basic-auth/hello/world");
+    auto res = cli.Get(path);
     ASSERT_TRUE(res);
-    EXPECT_EQ(401, res->status);
+    EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
   }
 
   {
     cli.set_basic_auth("bad", "world");
-    auto res = cli.Get("/basic-auth/hello/world");
+    auto res = cli.Get(path);
     ASSERT_TRUE(res);
-    EXPECT_EQ(401, res->status);
+    EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
   }
 }
 
 #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
 TEST(DigestAuthTest, FromHTTPWatch_Online) {
+#ifdef CPPHTTPLIB_DEFAULT_HTTPBIN
   auto host = "httpbin.org";
+  auto unauth_path = std::string{"/digest-auth/auth/hello/world"};
+  auto paths = std::vector<std::string>{
+      "/digest-auth/auth/hello/world/MD5",
+      "/digest-auth/auth/hello/world/SHA-256",
+      "/digest-auth/auth/hello/world/SHA-512",
+      "/digest-auth/auth-int/hello/world/MD5",
+  };
+#else
+  auto host = "nghttp2.org";
+  auto unauth_path = std::string{"/httpbin/digest-auth/auth/hello/world"};
+  auto paths = std::vector<std::string>{
+      "/httpbin/digest-auth/auth/hello/world/MD5",
+      "/httpbin/digest-auth/auth/hello/world/SHA-256",
+      "/httpbin/digest-auth/auth/hello/world/SHA-512",
+      "/httpbin/digest-auth/auth-int/hello/world/MD5",
+  };
+#endif
+
   auto port = 443;
   SSLClient cli(host, port);
 
   {
-    auto res = cli.Get("/digest-auth/auth/hello/world");
+    auto res = cli.Get(unauth_path);
     ASSERT_TRUE(res);
-    EXPECT_EQ(401, res->status);
+    EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
   }
 
   {
-    std::vector<std::string> paths = {
-        "/digest-auth/auth/hello/world/MD5",
-        "/digest-auth/auth/hello/world/SHA-256",
-        "/digest-auth/auth/hello/world/SHA-512",
-        "/digest-auth/auth-int/hello/world/MD5",
-    };
 
     cli.set_digest_auth("hello", "world");
-    for (auto path : paths) {
+    for (const auto &path : paths) {
       auto res = cli.Get(path.c_str());
       ASSERT_TRUE(res);
       EXPECT_EQ("{\n  \"authenticated\": true, \n  \"user\": \"hello\"\n}\n",
                 res->body);
-      EXPECT_EQ(200, res->status);
+      EXPECT_EQ(StatusCode::OK_200, res->status);
     }
 
     cli.set_digest_auth("hello", "bad");
-    for (auto path : paths) {
+    for (const auto &path : paths) {
       auto res = cli.Get(path.c_str());
       ASSERT_TRUE(res);
-      EXPECT_EQ(401, res->status);
+      EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
     }
 
     // NOTE: Until httpbin.org fixes issue #46, the following test is commented
-    // out. Plese see https://httpbin.org/digest-auth/auth/hello/world
+    // out. Please see https://httpbin.org/digest-auth/auth/hello/world
     // cli.set_digest_auth("bad", "world");
-    // for (auto path : paths) {
+    // for (const auto& path : paths) {
     //   auto res = cli.Get(path.c_str());
     //   ASSERT_TRUE(res);
-    //   EXPECT_EQ(400, res->status);
+    //   EXPECT_EQ(StatusCode::BadRequest_400, res->status);
     // }
   }
 }
@@ -802,7 +888,7 @@ TEST(SpecifyServerIPAddressTest, AnotherHostname_Online) {
   cli.set_hostname_addr_map({{another_host, wrong_ip}});
   auto res = cli.Get("/");
   ASSERT_TRUE(res);
-  ASSERT_EQ(301, res->status);
+  ASSERT_EQ(StatusCode::MovedPermanently_301, res->status);
 }
 
 TEST(SpecifyServerIPAddressTest, RealHostname_Online) {
@@ -833,7 +919,7 @@ TEST(AbsoluteRedirectTest, Redirect_Online) {
   cli.set_follow_location(true);
   auto res = cli.Get("/httpbin/absolute-redirect/3");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
 }
 
 TEST(RedirectTest, Redirect_Online) {
@@ -848,7 +934,7 @@ TEST(RedirectTest, Redirect_Online) {
   cli.set_follow_location(true);
   auto res = cli.Get("/httpbin/redirect/3");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
 }
 
 TEST(RelativeRedirectTest, Redirect_Online) {
@@ -863,7 +949,7 @@ TEST(RelativeRedirectTest, Redirect_Online) {
   cli.set_follow_location(true);
   auto res = cli.Get("/httpbin/relative-redirect/3");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
 }
 
 TEST(TooManyRedirectTest, Redirect_Online) {
@@ -887,13 +973,13 @@ TEST(YahooRedirectTest, Redirect_Online) {
 
   auto res = cli.Get("/");
   ASSERT_TRUE(res);
-  EXPECT_EQ(301, res->status);
+  EXPECT_EQ(StatusCode::MovedPermanently_301, res->status);
 
   cli.set_follow_location(true);
   res = cli.Get("/");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
-  EXPECT_EQ("https://yahoo.com/", res->location);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("https://www.yahoo.com/", res->location);
 }
 
 TEST(HttpsToHttpRedirectTest, Redirect_Online) {
@@ -902,7 +988,7 @@ TEST(HttpsToHttpRedirectTest, Redirect_Online) {
   auto res = cli.Get(
       "/httpbin/redirect-to?url=http%3A%2F%2Fwww.google.com&status_code=302");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
 }
 
 TEST(HttpsToHttpRedirectTest2, Redirect_Online) {
@@ -915,7 +1001,7 @@ TEST(HttpsToHttpRedirectTest2, Redirect_Online) {
 
   auto res = cli.Get("/httpbin/redirect-to", params, Headers{});
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
 }
 
 TEST(HttpsToHttpRedirectTest3, Redirect_Online) {
@@ -927,7 +1013,7 @@ TEST(HttpsToHttpRedirectTest3, Redirect_Online) {
 
   auto res = cli.Get("/httpbin/redirect-to?status_code=302", params, Headers{});
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
 }
 
 TEST(UrlWithSpace, Redirect_Online) {
@@ -936,12 +1022,50 @@ TEST(UrlWithSpace, Redirect_Online) {
 
   auto res = cli.Get("/files/2595/310/Neat 1.4-17.jar");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
-  EXPECT_EQ(18527U, res->get_header_value<uint64_t>("Content-Length"));
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ(18527U, res->get_header_value_u64("Content-Length"));
 }
 
 #endif
 
+#if !defined(_WIN32) && !defined(_WIN64)
+TEST(ReceiveSignals, Signal) {
+  auto setupSignalHandlers = []() {
+    struct sigaction act;
+
+    sigemptyset(&act.sa_mask);
+    act.sa_flags = SA_SIGINFO;
+    act.sa_sigaction = [](int sig, siginfo_t *, void *) {
+      switch (sig) {
+      case SIGINT:
+      default: break;
+      }
+    };
+    ::sigaction(SIGINT, &act, nullptr);
+  };
+
+  Server svr;
+  int port = 0;
+  auto thread = std::thread([&]() {
+    setupSignalHandlers();
+    port = svr.bind_to_any_port("localhost");
+    svr.listen_after_bind();
+  });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  ASSERT_TRUE(svr.is_running());
+  pthread_kill(thread.native_handle(), SIGINT);
+  std::this_thread::sleep_for(std::chrono::milliseconds(100));
+  ASSERT_TRUE(svr.is_running());
+}
+#endif
+
 TEST(RedirectToDifferentPort, Redirect) {
   Server svr1;
   svr1.Get("/1", [&](const Request & /*req*/, Response &res) {
@@ -964,28 +1088,25 @@ TEST(RedirectToDifferentPort, Redirect) {
     svr2_port = svr2.bind_to_any_port("localhost");
     svr2.listen_after_bind();
   });
+  auto se = detail::scope_exit([&] {
+    svr2.stop();
+    thread2.join();
+    svr1.stop();
+    thread1.join();
+    ASSERT_FALSE(svr2.is_running());
+    ASSERT_FALSE(svr1.is_running());
+  });
 
-  while (!svr1.is_running() || !svr2.is_running()) {
-    std::this_thread::sleep_for(std::chrono::milliseconds(1));
-  }
-
-  // Give GET time to get a few messages.
-  std::this_thread::sleep_for(std::chrono::seconds(1));
+  svr1.wait_until_ready();
+  svr2.wait_until_ready();
 
   Client cli("localhost", svr2_port);
   cli.set_follow_location(true);
 
   auto res = cli.Get("/2");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ("Hello World!", res->body);
-
-  svr1.stop();
-  svr2.stop();
-  thread1.join();
-  thread2.join();
-  ASSERT_FALSE(svr1.is_running());
-  ASSERT_FALSE(svr2.is_running());
 }
 
 TEST(RedirectFromPageWithContent, Redirect) {
@@ -1001,13 +1122,13 @@ TEST(RedirectFromPageWithContent, Redirect) {
   });
 
   auto th = std::thread([&]() { svr.listen("localhost", PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    th.join();
+    ASSERT_FALSE(svr.is_running());
+  });
 
-  while (!svr.is_running()) {
-    std::this_thread::sleep_for(std::chrono::milliseconds(1));
-  }
-
-  // Give GET time to get a few messages.
-  std::this_thread::sleep_for(std::chrono::seconds(1));
+  svr.wait_until_ready();
 
   {
     Client cli("localhost", PORT);
@@ -1020,7 +1141,7 @@ TEST(RedirectFromPageWithContent, Redirect) {
     });
 
     ASSERT_TRUE(res);
-    EXPECT_EQ(200, res->status);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
     EXPECT_EQ("Hello World!", body);
   }
 
@@ -1034,13 +1155,9 @@ TEST(RedirectFromPageWithContent, Redirect) {
     });
 
     ASSERT_TRUE(res);
-    EXPECT_EQ(302, res->status);
+    EXPECT_EQ(StatusCode::Found_302, res->status);
     EXPECT_EQ("___", body);
   }
-
-  svr.stop();
-  th.join();
-  ASSERT_FALSE(svr.is_running());
 }
 
 TEST(RedirectFromPageWithContentIP6, Redirect) {
@@ -1061,6 +1178,11 @@ TEST(RedirectFromPageWithContentIP6, Redirect) {
   });
 
   auto th = std::thread([&]() { svr.listen("::1", 1234); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    th.join();
+    ASSERT_FALSE(svr.is_running());
+  });
 
   // When IPV6 support isn't available svr.listen("::1", 1234) never
   // actually starts anything, so the condition !svr.is_running() will
@@ -1073,9 +1195,6 @@ TEST(RedirectFromPageWithContentIP6, Redirect) {
     ASSERT_LT(milliseconds, 5000U);
   }
 
-  // Give GET time to get a few messages.
-  std::this_thread::sleep_for(std::chrono::seconds(1));
-
   {
     Client cli("http://[::1]:1234");
     cli.set_follow_location(true);
@@ -1087,7 +1206,7 @@ TEST(RedirectFromPageWithContentIP6, Redirect) {
     });
 
     ASSERT_TRUE(res);
-    EXPECT_EQ(200, res->status);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
     EXPECT_EQ("Hello World!", body);
   }
 
@@ -1101,13 +1220,9 @@ TEST(RedirectFromPageWithContentIP6, Redirect) {
     });
 
     ASSERT_TRUE(res);
-    EXPECT_EQ(302, res->status);
+    EXPECT_EQ(StatusCode::Found_302, res->status);
     EXPECT_EQ("___", body);
   }
-
-  svr.stop();
-  th.join();
-  ASSERT_FALSE(svr.is_running());
 }
 
 TEST(PathUrlEncodeTest, PathUrlEncode) {
@@ -1117,16 +1232,20 @@ TEST(PathUrlEncodeTest, PathUrlEncode) {
     auto a = req.params.find("a");
     if (a != req.params.end()) {
       res.set_content((*a).second, "text/plain");
-      res.status = 200;
+      res.status = StatusCode::OK_200;
     } else {
-      res.status = 400;
+      res.status = StatusCode::BadRequest_400;
     }
   });
 
   auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
 
-  // Give GET time to get a few messages.
-  std::this_thread::sleep_for(std::chrono::seconds(1));
+  svr.wait_until_ready();
 
   {
     Client cli(HOST, PORT);
@@ -1134,19 +1253,15 @@ TEST(PathUrlEncodeTest, PathUrlEncode) {
 
     auto res = cli.Get("/foo?a=explicitly+encoded");
     ASSERT_TRUE(res);
-    EXPECT_EQ(200, res->status);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
     // This expects it back with a space, as the `+` won't have been
     // url-encoded, and server-side the params get decoded turning `+`
     // into spaces.
     EXPECT_EQ("explicitly encoded", res->body);
   }
-
-  svr.stop();
-  thread.join();
-  ASSERT_FALSE(svr.is_running());
 }
 
-TEST(BindServerTest, BindDualStack) {
+TEST(BindServerTest, DISABLED_BindDualStack) {
   Server svr;
 
   svr.Get("/1", [&](const Request & /*req*/, Response &res) {
@@ -1154,16 +1269,20 @@ TEST(BindServerTest, BindDualStack) {
   });
 
   auto thread = std::thread([&]() { svr.listen("::", PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
 
-  // Give GET time to get a few messages.
-  std::this_thread::sleep_for(std::chrono::seconds(1));
+  svr.wait_until_ready();
 
   {
     Client cli("127.0.0.1", PORT);
 
     auto res = cli.Get("/1");
     ASSERT_TRUE(res);
-    EXPECT_EQ(200, res->status);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
     EXPECT_EQ("Hello World!", res->body);
   }
   {
@@ -1171,12 +1290,9 @@ TEST(BindServerTest, BindDualStack) {
 
     auto res = cli.Get("/1");
     ASSERT_TRUE(res);
-    EXPECT_EQ(200, res->status);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
     EXPECT_EQ("Hello World!", res->body);
   }
-  svr.stop();
-  thread.join();
-  ASSERT_FALSE(svr.is_running());
 }
 
 TEST(BindServerTest, BindAndListenSeparately) {
@@ -1213,7 +1329,7 @@ TEST(ErrorHandlerTest, ContentLength) {
   Server svr;
 
   svr.set_error_handler([](const Request & /*req*/, Response &res) {
-    res.status = 200;
+    res.status = StatusCode::OK_200;
     res.set_content("abcdefghijklmnopqrstuvwxyz",
                     "text/html"); // <= Content-Length still 13
   });
@@ -1224,24 +1340,24 @@ TEST(ErrorHandlerTest, ContentLength) {
   });
 
   auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
 
-  // Give GET time to get a few messages.
-  std::this_thread::sleep_for(std::chrono::seconds(1));
+  svr.wait_until_ready();
 
   {
     Client cli(HOST, PORT);
 
     auto res = cli.Get("/hi");
     ASSERT_TRUE(res);
-    EXPECT_EQ(200, res->status);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
     EXPECT_EQ("text/html", res->get_header_value("Content-Type"));
     EXPECT_EQ("26", res->get_header_value("Content-Length"));
     EXPECT_EQ("abcdefghijklmnopqrstuvwxyz", res->body);
   }
-
-  svr.stop();
-  thread.join();
-  ASSERT_FALSE(svr.is_running());
 }
 
 #ifndef CPPHTTPLIB_NO_EXCEPTIONS
@@ -1249,9 +1365,12 @@ TEST(ExceptionHandlerTest, ContentLength) {
   Server svr;
 
   svr.set_exception_handler([](const Request & /*req*/, Response &res,
-                               std::exception &e) {
-    EXPECT_EQ("abc", std::string(e.what()));
-    res.status = 500;
+                               std::exception_ptr ep) {
+    EXPECT_FALSE(ep == nullptr);
+    try {
+      std::rethrow_exception(ep);
+    } catch (std::exception &e) { EXPECT_EQ("abc", std::string(e.what())); }
+    res.status = StatusCode::InternalServerError_500;
     res.set_content("abcdefghijklmnopqrstuvwxyz",
                     "text/html"); // <= Content-Length still 13 at this point
   });
@@ -1262,9 +1381,13 @@ TEST(ExceptionHandlerTest, ContentLength) {
   });
 
   auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
 
-  // Give GET time to get a few messages.
-  std::this_thread::sleep_for(std::chrono::seconds(1));
+  svr.wait_until_ready();
 
   for (size_t i = 0; i < 10; i++) {
     Client cli(HOST, PORT);
@@ -1272,7 +1395,7 @@ TEST(ExceptionHandlerTest, ContentLength) {
     for (size_t j = 0; j < 100; j++) {
       auto res = cli.Get("/hi");
       ASSERT_TRUE(res);
-      EXPECT_EQ(500, res->status);
+      EXPECT_EQ(StatusCode::InternalServerError_500, res->status);
       EXPECT_EQ("text/html", res->get_header_value("Content-Type"));
       EXPECT_EQ("26", res->get_header_value("Content-Length"));
       EXPECT_EQ("abcdefghijklmnopqrstuvwxyz", res->body);
@@ -1283,45 +1406,47 @@ TEST(ExceptionHandlerTest, ContentLength) {
     for (size_t j = 0; j < 100; j++) {
       auto res = cli.Get("/hi");
       ASSERT_TRUE(res);
-      EXPECT_EQ(500, res->status);
+      EXPECT_EQ(StatusCode::InternalServerError_500, res->status);
       EXPECT_EQ("text/html", res->get_header_value("Content-Type"));
       EXPECT_EQ("26", res->get_header_value("Content-Length"));
       EXPECT_EQ("abcdefghijklmnopqrstuvwxyz", res->body);
     }
   }
-
-  svr.stop();
-  thread.join();
-  ASSERT_FALSE(svr.is_running());
 }
 #endif
 
 TEST(NoContentTest, ContentLength) {
   Server svr;
 
-  svr.Get("/hi",
-          [](const Request & /*req*/, Response &res) { res.status = 204; });
+  svr.Get("/hi", [](const Request & /*req*/, Response &res) {
+    res.status = StatusCode::NoContent_204;
+  });
   auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
 
-  // Give GET time to get a few messages.
-  std::this_thread::sleep_for(std::chrono::seconds(1));
+  svr.wait_until_ready();
 
   {
     Client cli(HOST, PORT);
 
     auto res = cli.Get("/hi");
     ASSERT_TRUE(res);
-    EXPECT_EQ(204, res->status);
+    EXPECT_EQ(StatusCode::NoContent_204, res->status);
     EXPECT_EQ("0", res->get_header_value("Content-Length"));
   }
-
-  svr.stop();
-  thread.join();
-  ASSERT_FALSE(svr.is_running());
 }
 
 TEST(RoutingHandlerTest, PreRoutingHandler) {
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE);
+  ASSERT_TRUE(svr.is_valid());
+#else
   Server svr;
+#endif
 
   svr.set_pre_routing_handler([](const Request &req, Response &res) {
     if (req.path == "/routing_handler") {
@@ -1347,16 +1472,25 @@ TEST(RoutingHandlerTest, PreRoutingHandler) {
   });
 
   auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
 
-  // Give GET time to get a few messages.
-  std::this_thread::sleep_for(std::chrono::seconds(1));
+  svr.wait_until_ready();
 
   {
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+    SSLClient cli(HOST, PORT);
+    cli.enable_server_certificate_verification(false);
+#else
     Client cli(HOST, PORT);
+#endif
 
     auto res = cli.Get("/routing_handler");
     ASSERT_TRUE(res);
-    EXPECT_EQ(200, res->status);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
     EXPECT_EQ("Routing Handler", res->body);
     EXPECT_EQ(1U, res->get_header_value_count("PRE_ROUTING"));
     EXPECT_EQ("on", res->get_header_value("PRE_ROUTING"));
@@ -1365,30 +1499,36 @@ TEST(RoutingHandlerTest, PreRoutingHandler) {
   }
 
   {
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+    SSLClient cli(HOST, PORT);
+    cli.enable_server_certificate_verification(false);
+#else
     Client cli(HOST, PORT);
+#endif
 
     auto res = cli.Get("/hi");
     ASSERT_TRUE(res);
-    EXPECT_EQ(200, res->status);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
     EXPECT_EQ("Hello World!\n", res->body);
     EXPECT_EQ(0U, res->get_header_value_count("PRE_ROUTING"));
     EXPECT_EQ(0U, res->get_header_value_count("POST_ROUTING"));
   }
 
   {
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+    SSLClient cli(HOST, PORT);
+    cli.enable_server_certificate_verification(false);
+#else
     Client cli(HOST, PORT);
+#endif
 
     auto res = cli.Get("/aaa");
     ASSERT_TRUE(res);
-    EXPECT_EQ(404, res->status);
+    EXPECT_EQ(StatusCode::NotFound_404, res->status);
     EXPECT_EQ("Error", res->body);
     EXPECT_EQ(0U, res->get_header_value_count("PRE_ROUTING"));
     EXPECT_EQ(0U, res->get_header_value_count("POST_ROUTING"));
   }
-
-  svr.stop();
-  thread.join();
-  ASSERT_FALSE(svr.is_running());
 }
 
 TEST(InvalidFormatTest, StatusCode) {
@@ -1400,9 +1540,13 @@ TEST(InvalidFormatTest, StatusCode) {
   });
 
   auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
 
-  // Give GET time to get a few messages.
-  std::this_thread::sleep_for(std::chrono::seconds(1));
+  svr.wait_until_ready();
 
   {
     Client cli(HOST, PORT);
@@ -1410,10 +1554,6 @@ TEST(InvalidFormatTest, StatusCode) {
     auto res = cli.Get("/hi");
     ASSERT_FALSE(res);
   }
-
-  svr.stop();
-  thread.join();
-  ASSERT_FALSE(svr.is_running());
 }
 
 TEST(URLFragmentTest, WithFragment) {
@@ -1424,24 +1564,65 @@ TEST(URLFragmentTest, WithFragment) {
   });
 
   auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
 
-  std::this_thread::sleep_for(std::chrono::seconds(1));
+  svr.wait_until_ready();
 
   {
     Client cli(HOST, PORT);
 
     auto res = cli.Get("/hi#key1=val1=key2=val2");
     EXPECT_TRUE(res);
-    EXPECT_EQ(200, res->status);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
 
     res = cli.Get("/hi%23key1=val1=key2=val2");
     EXPECT_TRUE(res);
-    EXPECT_EQ(404, res->status);
+    EXPECT_EQ(StatusCode::NotFound_404, res->status);
   }
+}
 
-  svr.stop();
-  thread.join();
-  ASSERT_FALSE(svr.is_running());
+TEST(HeaderWriter, SetHeaderWriter) {
+  Server svr;
+
+  svr.set_header_writer([](Stream &strm, Headers &hdrs) {
+    hdrs.emplace("CustomServerHeader", "CustomServerValue");
+    return detail::write_headers(strm, hdrs);
+  });
+  svr.Get("/hi", [](const Request &req, Response &res) {
+    auto it = req.headers.find("CustomClientHeader");
+    EXPECT_TRUE(it != req.headers.end());
+    EXPECT_EQ(it->second, "CustomClientValue");
+    res.set_content("Hello World!\n", "text/plain");
+  });
+
+  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  {
+    Client cli(HOST, PORT);
+    cli.set_header_writer([](Stream &strm, Headers &hdrs) {
+      hdrs.emplace("CustomClientHeader", "CustomClientValue");
+      return detail::write_headers(strm, hdrs);
+    });
+
+    auto res = cli.Get("/hi");
+    EXPECT_TRUE(res);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
+
+    auto it = res->headers.find("CustomServerHeader");
+    EXPECT_TRUE(it != res->headers.end());
+    EXPECT_EQ(it->second, "CustomServerValue");
+  }
 }
 
 class ServerTest : public ::testing::Test {
@@ -1518,6 +1699,17 @@ class ServerTest : public ::testing::Test {
                          std::stoi(req.get_header_value("REMOTE_PORT")));
                res.set_content(remote_addr.c_str(), "text/plain");
              })
+        .Get("/local_addr",
+             [&](const Request &req, Response &res) {
+               EXPECT_TRUE(req.has_header("LOCAL_PORT"));
+               EXPECT_TRUE(req.has_header("LOCAL_ADDR"));
+               auto local_addr = req.get_header_value("LOCAL_ADDR");
+               auto local_port = req.get_header_value("LOCAL_PORT");
+               EXPECT_EQ(req.local_addr, local_addr);
+               EXPECT_EQ(req.local_port, std::stoi(local_port));
+               res.set_content(local_addr.append(":").append(local_port),
+                               "text/plain");
+             })
         .Get("/endwith%",
              [&](const Request & /*req*/, Response &res) {
                res.set_content("Hello World!", "text/plain");
@@ -1530,12 +1722,14 @@ class ServerTest : public ::testing::Test {
              })
         .Get("/", [&](const Request & /*req*/,
                       Response &res) { res.set_redirect("/hi"); })
-        .Post("/1", [](const Request & /*req*/,
-                       Response &res) { res.set_redirect("/2", 303); })
+        .Post("/1",
+              [](const Request & /*req*/, Response &res) {
+                res.set_redirect("/2", StatusCode::SeeOther_303);
+              })
         .Get("/2",
              [](const Request & /*req*/, Response &res) {
                res.set_content("redirected.", "text/plain");
-               res.status = 200;
+               res.status = StatusCode::OK_200;
              })
         .Post("/person",
               [&](const Request &req, Response &res) {
@@ -1543,7 +1737,7 @@ class ServerTest : public ::testing::Test {
                   persons_[req.get_param_value("name")] =
                       req.get_param_value("note");
                 } else {
-                  res.status = 400;
+                  res.status = StatusCode::BadRequest_400;
                 }
               })
         .Put("/person",
@@ -1552,7 +1746,7 @@ class ServerTest : public ::testing::Test {
                  persons_[req.get_param_value("name")] =
                      req.get_param_value("note");
                } else {
-                 res.status = 400;
+                 res.status = StatusCode::BadRequest_400;
                }
              })
         .Get("/person/(.*)",
@@ -1562,7 +1756,7 @@ class ServerTest : public ::testing::Test {
                  auto note = persons_[name];
                  res.set_content(note, "text/plain");
                } else {
-                 res.status = 404;
+                 res.status = StatusCode::NotFound_404;
                }
              })
         .Post("/x-www-form-urlencoded-json",
@@ -1570,13 +1764,12 @@ class ServerTest : public ::testing::Test {
                 auto json = req.get_param_value("json");
                 ASSERT_EQ(JSON_DATA, json);
                 res.set_content(json, "appliation/json");
-                res.status = 200;
+                res.status = StatusCode::OK_200;
               })
         .Get("/streamed-chunked",
              [&](const Request & /*req*/, Response &res) {
                res.set_chunked_content_provider(
                    "text/plain", [](size_t /*offset*/, DataSink &sink) {
-                     EXPECT_TRUE(sink.is_writable());
                      sink.os << "123";
                      sink.os << "456";
                      sink.os << "789";
@@ -1590,7 +1783,6 @@ class ServerTest : public ::testing::Test {
                res.set_chunked_content_provider(
                    "text/plain",
                    [i](size_t /*offset*/, DataSink &sink) {
-                     EXPECT_TRUE(sink.is_writable());
                      switch (*i) {
                      case 0: sink.os << "123"; break;
                      case 1: sink.os << "456"; break;
@@ -1605,6 +1797,30 @@ class ServerTest : public ::testing::Test {
                      delete i;
                    });
              })
+        .Get("/streamed-chunked-with-trailer",
+             [&](const Request & /*req*/, Response &res) {
+               auto i = new int(0);
+               res.set_header("Trailer", "Dummy1, Dummy2");
+               res.set_chunked_content_provider(
+                   "text/plain",
+                   [i](size_t /*offset*/, DataSink &sink) {
+                     switch (*i) {
+                     case 0: sink.os << "123"; break;
+                     case 1: sink.os << "456"; break;
+                     case 2: sink.os << "789"; break;
+                     case 3: {
+                       sink.done_with_trailer(
+                           {{"Dummy1", "DummyVal1"}, {"Dummy2", "DummyVal2"}});
+                     } break;
+                     }
+                     (*i)++;
+                     return true;
+                   },
+                   [i](bool success) {
+                     EXPECT_TRUE(success);
+                     delete i;
+                   });
+             })
         .Get("/streamed",
              [&](const Request & /*req*/, Response &res) {
                res.set_content_provider(
@@ -1615,12 +1831,11 @@ class ServerTest : public ::testing::Test {
                    });
              })
         .Get("/streamed-with-range",
-             [&](const Request & /*req*/, Response &res) {
+             [&](const Request &req, Response &res) {
                auto data = new std::string("abcdefg");
                res.set_content_provider(
                    data->size(), "text/plain",
                    [data](size_t offset, size_t length, DataSink &sink) {
-                     EXPECT_TRUE(sink.is_writable());
                      size_t DATA_CHUNK_SIZE = 4;
                      const auto &d = *data;
                      auto out_len =
@@ -1630,8 +1845,8 @@ class ServerTest : public ::testing::Test {
                      EXPECT_TRUE(ret);
                      return true;
                    },
-                   [data](bool success) {
-                     EXPECT_TRUE(success);
+                   [data, &req](bool success) {
+                     EXPECT_EQ(success, !req.has_param("error"));
                      delete data;
                    });
              })
@@ -1640,11 +1855,15 @@ class ServerTest : public ::testing::Test {
                res.set_content_provider(
                    size_t(-1), "text/plain",
                    [](size_t /*offset*/, size_t /*length*/, DataSink &sink) {
-                     EXPECT_TRUE(sink.is_writable());
                      sink.os << "data_chunk";
                      return true;
                    });
              })
+        .Get("/regex-with-delimiter",
+             [&](const Request &req, Response & /*res*/) {
+               ASSERT_TRUE(req.has_param("key"));
+               EXPECT_EQ("^(?.*(value))", req.get_param_value("key"));
+             })
         .Get("/with-range",
              [&](const Request & /*req*/, Response &res) {
                res.set_content("abcdefg", "text/plain");
@@ -1697,6 +1916,40 @@ class ServerTest : public ::testing::Test {
                   EXPECT_EQ("application/json  tmp-string", file.content_type);
                 }
               })
+        .Post("/multipart/multi_file_values",
+              [&](const Request &req, Response & /*res*/) {
+                EXPECT_EQ(5u, req.files.size());
+                ASSERT_TRUE(!req.has_file("???"));
+                ASSERT_TRUE(req.body.empty());
+
+                {
+                  const auto &text_value = req.get_file_values("text");
+                  EXPECT_EQ(1u, text_value.size());
+                  auto &text = text_value[0];
+                  EXPECT_TRUE(text.filename.empty());
+                  EXPECT_EQ("default text", text.content);
+                }
+                {
+                  const auto &text1_values = req.get_file_values("multi_text1");
+                  EXPECT_EQ(2u, text1_values.size());
+                  EXPECT_EQ("aaaaa", text1_values[0].content);
+                  EXPECT_EQ("bbbbb", text1_values[1].content);
+                }
+
+                {
+                  const auto &file1_values = req.get_file_values("multi_file1");
+                  EXPECT_EQ(2u, file1_values.size());
+                  auto file1 = file1_values[0];
+                  EXPECT_EQ(file1.filename, "hello.txt");
+                  EXPECT_EQ(file1.content_type, "text/plain");
+                  EXPECT_EQ("h\ne\n\nl\nl\no\n", file1.content);
+
+                  auto file2 = file1_values[1];
+                  EXPECT_EQ(file2.filename, "world.json");
+                  EXPECT_EQ(file2.content_type, "application/json");
+                  EXPECT_EQ("{\n  \"world\", true\n}\n", file2.content);
+                }
+              })
         .Post("/empty",
               [&](const Request &req, Response &res) {
                 EXPECT_EQ(req.body, "");
@@ -1711,6 +1964,22 @@ class ServerTest : public ::testing::Test {
                 EXPECT_EQ("0", req.get_header_value("Content-Length"));
                 res.set_content("empty-no-content-type", "text/plain");
               })
+        .Post("/path-only",
+              [&](const Request &req, Response &res) {
+                EXPECT_EQ(req.body, "");
+                EXPECT_EQ("", req.get_header_value("Content-Type"));
+                EXPECT_EQ("0", req.get_header_value("Content-Length"));
+                res.set_content("path-only", "text/plain");
+              })
+        .Post("/path-headers-only",
+              [&](const Request &req, Response &res) {
+                EXPECT_EQ(req.body, "");
+                EXPECT_EQ("", req.get_header_value("Content-Type"));
+                EXPECT_EQ("0", req.get_header_value("Content-Length"));
+                EXPECT_EQ("world", req.get_header_value("hello"));
+                EXPECT_EQ("world2", req.get_header_value("hello2"));
+                res.set_content("path-headers-only", "text/plain");
+              })
         .Post("/post-large",
               [&](const Request &req, Response &res) {
                 EXPECT_EQ(req.body, LARGE_DATA);
@@ -1897,6 +2166,11 @@ class ServerTest : public ::testing::Test {
                   EXPECT_EQ("4", req.get_header_value("Content-Length"));
                   res.set_content(req.body, "application/octet-stream");
                 })
+        .Get("/issue1772",
+             [&](const Request & /*req*/, Response &res) {
+               res.status = 401;
+               res.set_header("WWW-Authenticate", "Basic realm=123456");
+             })
 #if defined(CPPHTTPLIB_ZLIB_SUPPORT) || defined(CPPHTTPLIB_BROTLI_SUPPORT)
         .Get("/compress",
              [&](const Request & /*req*/, Response &res) {
@@ -1936,9 +2210,7 @@ class ServerTest : public ::testing::Test {
 
     t_ = thread([&]() { ASSERT_TRUE(svr_.listen(HOST, PORT)); });
 
-    while (!svr_.is_running()) {
-      std::this_thread::sleep_for(std::chrono::milliseconds(1));
-    }
+    svr_.wait_until_ready();
   }
 
   virtual void TearDown() {
@@ -1968,7 +2240,7 @@ TEST_F(ServerTest, GetMethod200) {
   auto res = cli_.Get("/hi");
   ASSERT_TRUE(res);
   EXPECT_EQ("HTTP/1.1", res->version);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ("OK", res->reason);
   EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
   EXPECT_EQ(1U, res->get_header_value_count("Content-Type"));
@@ -1979,7 +2251,7 @@ TEST_F(ServerTest, GetMethod200withPercentEncoding) {
   auto res = cli_.Get("/%68%69"); // auto res = cli_.Get("/hi");
   ASSERT_TRUE(res);
   EXPECT_EQ("HTTP/1.1", res->version);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
   EXPECT_EQ(1U, res->get_header_value_count("Content-Type"));
   EXPECT_EQ("Hello World!", res->body);
@@ -1988,7 +2260,7 @@ TEST_F(ServerTest, GetMethod200withPercentEncoding) {
 TEST_F(ServerTest, GetMethod302) {
   auto res = cli_.Get("/");
   ASSERT_TRUE(res);
-  EXPECT_EQ(302, res->status);
+  EXPECT_EQ(StatusCode::Found_302, res->status);
   EXPECT_EQ("/hi", res->get_header_value("Location"));
 }
 
@@ -1996,7 +2268,7 @@ TEST_F(ServerTest, GetMethod302Redirect) {
   cli_.set_follow_location(true);
   auto res = cli_.Get("/");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ("Hello World!", res->body);
   EXPECT_EQ("/hi", res->location);
 }
@@ -2004,13 +2276,13 @@ TEST_F(ServerTest, GetMethod302Redirect) {
 TEST_F(ServerTest, GetMethod404) {
   auto res = cli_.Get("/invalid");
   ASSERT_TRUE(res);
-  EXPECT_EQ(404, res->status);
+  EXPECT_EQ(StatusCode::NotFound_404, res->status);
 }
 
 TEST_F(ServerTest, HeadMethod200) {
   auto res = cli_.Head("/hi");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
   EXPECT_TRUE(res->body.empty());
 }
@@ -2018,7 +2290,7 @@ TEST_F(ServerTest, HeadMethod200) {
 TEST_F(ServerTest, HeadMethod200Static) {
   auto res = cli_.Head("/mount/dir/index.html");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ("text/html", res->get_header_value("Content-Type"));
   EXPECT_EQ(104, std::stoi(res->get_header_value("Content-Length")));
   EXPECT_TRUE(res->body.empty());
@@ -2027,14 +2299,14 @@ TEST_F(ServerTest, HeadMethod200Static) {
 TEST_F(ServerTest, HeadMethod404) {
   auto res = cli_.Head("/invalid");
   ASSERT_TRUE(res);
-  EXPECT_EQ(404, res->status);
+  EXPECT_EQ(StatusCode::NotFound_404, res->status);
   EXPECT_TRUE(res->body.empty());
 }
 
 TEST_F(ServerTest, GetMethodPersonJohn) {
   auto res = cli_.Get("/person/john");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
   EXPECT_EQ("programmer", res->body);
 }
@@ -2042,16 +2314,16 @@ TEST_F(ServerTest, GetMethodPersonJohn) {
 TEST_F(ServerTest, PostMethod1) {
   auto res = cli_.Get("/person/john1");
   ASSERT_TRUE(res);
-  ASSERT_EQ(404, res->status);
+  ASSERT_EQ(StatusCode::NotFound_404, res->status);
 
   res = cli_.Post("/person", "name=john1&note=coder",
                   "application/x-www-form-urlencoded");
   ASSERT_TRUE(res);
-  ASSERT_EQ(200, res->status);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
 
   res = cli_.Get("/person/john1");
   ASSERT_TRUE(res);
-  ASSERT_EQ(200, res->status);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
   ASSERT_EQ("text/plain", res->get_header_value("Content-Type"));
   ASSERT_EQ("coder", res->body);
 }
@@ -2059,7 +2331,7 @@ TEST_F(ServerTest, PostMethod1) {
 TEST_F(ServerTest, PostMethod2) {
   auto res = cli_.Get("/person/john2");
   ASSERT_TRUE(res);
-  ASSERT_EQ(404, res->status);
+  ASSERT_EQ(StatusCode::NotFound_404, res->status);
 
   Params params;
   params.emplace("name", "john2");
@@ -2067,11 +2339,11 @@ TEST_F(ServerTest, PostMethod2) {
 
   res = cli_.Post("/person", params);
   ASSERT_TRUE(res);
-  ASSERT_EQ(200, res->status);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
 
   res = cli_.Get("/person/john2");
   ASSERT_TRUE(res);
-  ASSERT_EQ(200, res->status);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
   ASSERT_EQ("text/plain", res->get_header_value("Content-Type"));
   ASSERT_EQ("coder", res->body);
 }
@@ -2079,7 +2351,7 @@ TEST_F(ServerTest, PostMethod2) {
 TEST_F(ServerTest, PutMethod3) {
   auto res = cli_.Get("/person/john3");
   ASSERT_TRUE(res);
-  ASSERT_EQ(404, res->status);
+  ASSERT_EQ(StatusCode::NotFound_404, res->status);
 
   Params params;
   params.emplace("name", "john3");
@@ -2087,11 +2359,11 @@ TEST_F(ServerTest, PutMethod3) {
 
   res = cli_.Put("/person", params);
   ASSERT_TRUE(res);
-  ASSERT_EQ(200, res->status);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
 
   res = cli_.Get("/person/john3");
   ASSERT_TRUE(res);
-  ASSERT_EQ(200, res->status);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
   ASSERT_EQ("text/plain", res->get_header_value("Content-Type"));
   ASSERT_EQ("coder", res->body);
 }
@@ -2103,42 +2375,57 @@ TEST_F(ServerTest, PostWwwFormUrlEncodedJson) {
   auto res = cli_.Post("/x-www-form-urlencoded-json", params);
 
   ASSERT_TRUE(res);
-  ASSERT_EQ(200, res->status);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
   ASSERT_EQ(JSON_DATA, res->body);
 }
 
 TEST_F(ServerTest, PostEmptyContent) {
   auto res = cli_.Post("/empty", "", "text/plain");
   ASSERT_TRUE(res);
-  ASSERT_EQ(200, res->status);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
   ASSERT_EQ("empty", res->body);
 }
 
 TEST_F(ServerTest, PostEmptyContentWithNoContentType) {
   auto res = cli_.Post("/empty-no-content-type");
   ASSERT_TRUE(res);
-  ASSERT_EQ(200, res->status);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
   ASSERT_EQ("empty-no-content-type", res->body);
 }
 
+TEST_F(ServerTest, PostPathOnly) {
+  auto res = cli_.Post("/path-only");
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
+  ASSERT_EQ("path-only", res->body);
+}
+
+TEST_F(ServerTest, PostPathAndHeadersOnly) {
+  auto res = cli_.Post("/path-headers-only",
+                       Headers({{"hello", "world"}, {"hello2", "world2"}}));
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
+  ASSERT_EQ("path-headers-only", res->body);
+}
+
 TEST_F(ServerTest, PostLarge) {
   auto res = cli_.Post("/post-large", LARGE_DATA, "text/plain");
   ASSERT_TRUE(res);
-  ASSERT_EQ(200, res->status);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ(LARGE_DATA, res->body);
 }
 
 TEST_F(ServerTest, PutEmptyContentWithNoContentType) {
   auto res = cli_.Put("/empty-no-content-type");
   ASSERT_TRUE(res);
-  ASSERT_EQ(200, res->status);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
   ASSERT_EQ("empty-no-content-type", res->body);
 }
 
 TEST_F(ServerTest, GetMethodDir) {
   auto res = cli_.Get("/dir/");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ("text/html", res->get_header_value("Content-Type"));
 
   auto body = R"(<html>
@@ -2156,7 +2443,7 @@ TEST_F(ServerTest, GetMethodDir) {
 TEST_F(ServerTest, GetMethodDirTest) {
   auto res = cli_.Get("/dir/test.html");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ("text/html", res->get_header_value("Content-Type"));
   EXPECT_EQ("test.html", res->body);
 }
@@ -2164,7 +2451,7 @@ TEST_F(ServerTest, GetMethodDirTest) {
 TEST_F(ServerTest, GetMethodDirTestWithDoubleDots) {
   auto res = cli_.Get("/dir/../dir/test.html");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ("text/html", res->get_header_value("Content-Type"));
   EXPECT_EQ("test.html", res->body);
 }
@@ -2172,25 +2459,25 @@ TEST_F(ServerTest, GetMethodDirTestWithDoubleDots) {
 TEST_F(ServerTest, GetMethodInvalidPath) {
   auto res = cli_.Get("/dir/../test.html");
   ASSERT_TRUE(res);
-  EXPECT_EQ(404, res->status);
+  EXPECT_EQ(StatusCode::NotFound_404, res->status);
 }
 
 TEST_F(ServerTest, GetMethodOutOfBaseDir) {
   auto res = cli_.Get("/../www/dir/test.html");
   ASSERT_TRUE(res);
-  EXPECT_EQ(404, res->status);
+  EXPECT_EQ(StatusCode::NotFound_404, res->status);
 }
 
 TEST_F(ServerTest, GetMethodOutOfBaseDir2) {
   auto res = cli_.Get("/dir/../../www/dir/test.html");
   ASSERT_TRUE(res);
-  EXPECT_EQ(404, res->status);
+  EXPECT_EQ(StatusCode::NotFound_404, res->status);
 }
 
 TEST_F(ServerTest, GetMethodDirMountTest) {
   auto res = cli_.Get("/mount/dir/test.html");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ("text/html", res->get_header_value("Content-Type"));
   EXPECT_EQ("test.html", res->body);
 }
@@ -2198,7 +2485,7 @@ TEST_F(ServerTest, GetMethodDirMountTest) {
 TEST_F(ServerTest, GetMethodDirMountTestWithDoubleDots) {
   auto res = cli_.Get("/mount/dir/../dir/test.html");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ("text/html", res->get_header_value("Content-Type"));
   EXPECT_EQ("test.html", res->body);
 }
@@ -2206,25 +2493,37 @@ TEST_F(ServerTest, GetMethodDirMountTestWithDoubleDots) {
 TEST_F(ServerTest, GetMethodInvalidMountPath) {
   auto res = cli_.Get("/mount/dir/../test.html");
   ASSERT_TRUE(res);
-  EXPECT_EQ(404, res->status);
+  EXPECT_EQ(StatusCode::NotFound_404, res->status);
+}
+
+TEST_F(ServerTest, GetMethodEmbeddedNUL) {
+  auto res = cli_.Get("/mount/dir/test.html%00.js");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::NotFound_404, res->status);
 }
 
 TEST_F(ServerTest, GetMethodOutOfBaseDirMount) {
   auto res = cli_.Get("/mount/../www2/dir/test.html");
   ASSERT_TRUE(res);
-  EXPECT_EQ(404, res->status);
+  EXPECT_EQ(StatusCode::NotFound_404, res->status);
 }
 
 TEST_F(ServerTest, GetMethodOutOfBaseDirMount2) {
   auto res = cli_.Get("/mount/dir/../../www2/dir/test.html");
   ASSERT_TRUE(res);
-  EXPECT_EQ(404, res->status);
+  EXPECT_EQ(StatusCode::NotFound_404, res->status);
+}
+
+TEST_F(ServerTest, GetMethodOutOfBaseDirMountWithBackslash) {
+  auto res = cli_.Get("/mount/%2e%2e%5c/www2/dir/test.html");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::NotFound_404, res->status);
 }
 
 TEST_F(ServerTest, PostMethod303) {
   auto res = cli_.Post("/1", "body", "text/plain");
   ASSERT_TRUE(res);
-  EXPECT_EQ(303, res->status);
+  EXPECT_EQ(StatusCode::SeeOther_303, res->status);
   EXPECT_EQ("/2", res->get_header_value("Location"));
 }
 
@@ -2232,7 +2531,7 @@ TEST_F(ServerTest, PostMethod303Redirect) {
   cli_.set_follow_location(true);
   auto res = cli_.Post("/1", "body", "text/plain");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ("redirected.", res->body);
   EXPECT_EQ("/2", res->location);
 }
@@ -2240,7 +2539,7 @@ TEST_F(ServerTest, PostMethod303Redirect) {
 TEST_F(ServerTest, UserDefinedMIMETypeMapping) {
   auto res = cli_.Get("/dir/test.abcde");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ("text/abcde", res->get_header_value("Content-Type"));
   EXPECT_EQ("abcde", res->body);
 }
@@ -2248,13 +2547,67 @@ TEST_F(ServerTest, UserDefinedMIMETypeMapping) {
 TEST_F(ServerTest, StaticFileRange) {
   auto res = cli_.Get("/dir/test.abcde", {{make_range_header({{2, 3}})}});
   ASSERT_TRUE(res);
-  EXPECT_EQ(206, res->status);
+  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
   EXPECT_EQ("text/abcde", res->get_header_value("Content-Type"));
   EXPECT_EQ("2", res->get_header_value("Content-Length"));
   EXPECT_EQ(true, res->has_header("Content-Range"));
+  EXPECT_EQ("bytes 2-3/5", res->get_header_value("Content-Range"));
   EXPECT_EQ(std::string("cd"), res->body);
 }
 
+TEST_F(ServerTest, StaticFileRanges) {
+  auto res =
+      cli_.Get("/dir/test.abcde", {{make_range_header({{1, 2}, {4, -1}})}});
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
+  EXPECT_TRUE(
+      res->get_header_value("Content-Type")
+          .find(
+              "multipart/byteranges; boundary=--cpp-httplib-multipart-data-") ==
+      0);
+  EXPECT_EQ("266", res->get_header_value("Content-Length"));
+}
+
+TEST_F(ServerTest, StaticFileRangeHead) {
+  auto res = cli_.Head("/dir/test.abcde", {{make_range_header({{2, 3}})}});
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
+  EXPECT_EQ("text/abcde", res->get_header_value("Content-Type"));
+  EXPECT_EQ("2", res->get_header_value("Content-Length"));
+  EXPECT_EQ(true, res->has_header("Content-Range"));
+  EXPECT_EQ("bytes 2-3/5", res->get_header_value("Content-Range"));
+}
+
+TEST_F(ServerTest, StaticFileRangeBigFile) {
+  auto res = cli_.Get("/dir/1MB.txt", {{make_range_header({{-1, 5}})}});
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
+  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
+  EXPECT_EQ("5", res->get_header_value("Content-Length"));
+  EXPECT_EQ(true, res->has_header("Content-Range"));
+  EXPECT_EQ("bytes 1048571-1048575/1048576",
+            res->get_header_value("Content-Range"));
+  EXPECT_EQ("LAST\n", res->body);
+}
+
+TEST_F(ServerTest, StaticFileRangeBigFile2) {
+  auto res = cli_.Get("/dir/1MB.txt", {{make_range_header({{1, 4097}})}});
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
+  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
+  EXPECT_EQ("4097", res->get_header_value("Content-Length"));
+  EXPECT_EQ(true, res->has_header("Content-Range"));
+  EXPECT_EQ("bytes 1-4097/1048576", res->get_header_value("Content-Range"));
+}
+
+TEST_F(ServerTest, StaticFileBigFile) {
+  auto res = cli_.Get("/dir/1MB.txt");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
+  EXPECT_EQ("1048576", res->get_header_value("Content-Length"));
+}
+
 TEST_F(ServerTest, InvalidBaseDirMount) {
   EXPECT_EQ(false, svr_.set_mount_point("invalid_mount_point", "./www3"));
 }
@@ -2265,25 +2618,25 @@ TEST_F(ServerTest, Binary) {
   auto res = cli_.Post("/binary", binary.data(), binary.size(),
                        "application/octet-stream");
   ASSERT_TRUE(res);
-  ASSERT_EQ(200, res->status);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
   ASSERT_EQ(4U, res->body.size());
 
   res = cli_.Put("/binary", binary.data(), binary.size(),
                  "application/octet-stream");
   ASSERT_TRUE(res);
-  ASSERT_EQ(200, res->status);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
   ASSERT_EQ(4U, res->body.size());
 
   res = cli_.Patch("/binary", binary.data(), binary.size(),
                    "application/octet-stream");
   ASSERT_TRUE(res);
-  ASSERT_EQ(200, res->status);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
   ASSERT_EQ(4U, res->body.size());
 
   res = cli_.Delete("/binary", binary.data(), binary.size(),
                     "application/octet-stream");
   ASSERT_TRUE(res);
-  ASSERT_EQ(200, res->status);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
   ASSERT_EQ(4U, res->body.size());
 }
 
@@ -2292,22 +2645,22 @@ TEST_F(ServerTest, BinaryString) {
 
   auto res = cli_.Post("/binary", binary, "application/octet-stream");
   ASSERT_TRUE(res);
-  ASSERT_EQ(200, res->status);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
   ASSERT_EQ(4U, res->body.size());
 
   res = cli_.Put("/binary", binary, "application/octet-stream");
   ASSERT_TRUE(res);
-  ASSERT_EQ(200, res->status);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
   ASSERT_EQ(4U, res->body.size());
 
   res = cli_.Patch("/binary", binary, "application/octet-stream");
   ASSERT_TRUE(res);
-  ASSERT_EQ(200, res->status);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
   ASSERT_EQ(4U, res->body.size());
 
   res = cli_.Delete("/binary", binary, "application/octet-stream");
   ASSERT_TRUE(res);
-  ASSERT_EQ(200, res->status);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
   ASSERT_EQ(4U, res->body.size());
 }
 
@@ -2327,7 +2680,7 @@ TEST_F(ServerTest, LongRequest) {
   auto res = cli_.Get(request.c_str());
 
   ASSERT_TRUE(res);
-  EXPECT_EQ(404, res->status);
+  EXPECT_EQ(StatusCode::NotFound_404, res->status);
 }
 
 TEST_F(ServerTest, TooLongRequest) {
@@ -2340,7 +2693,7 @@ TEST_F(ServerTest, TooLongRequest) {
   auto res = cli_.Get(request.c_str());
 
   ASSERT_TRUE(res);
-  EXPECT_EQ(414, res->status);
+  EXPECT_EQ(StatusCode::UriTooLong_414, res->status);
 }
 
 TEST_F(ServerTest, LongHeader) {
@@ -2394,14 +2747,14 @@ TEST_F(ServerTest, LongHeader) {
   auto ret = cli_.send(req, *res, error);
 
   ASSERT_TRUE(ret);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
 }
 
 TEST_F(ServerTest, LongQueryValue) {
   auto res = cli_.Get(LONG_QUERY_URL.c_str());
 
   ASSERT_TRUE(res);
-  EXPECT_EQ(414, res->status);
+  EXPECT_EQ(StatusCode::UriTooLong_414, res->status);
 }
 
 TEST_F(ServerTest, TooLongHeader) {
@@ -2455,43 +2808,43 @@ TEST_F(ServerTest, TooLongHeader) {
   auto ret = cli_.send(req, *res, error);
 
   ASSERT_TRUE(ret);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
 }
 
 TEST_F(ServerTest, PercentEncoding) {
   auto res = cli_.Get("/e%6edwith%");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
 }
 
 TEST_F(ServerTest, PercentEncodingUnicode) {
   auto res = cli_.Get("/e%u006edwith%");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
 }
 
 TEST_F(ServerTest, InvalidPercentEncoding) {
   auto res = cli_.Get("/%endwith%");
   ASSERT_TRUE(res);
-  EXPECT_EQ(404, res->status);
+  EXPECT_EQ(StatusCode::NotFound_404, res->status);
 }
 
 TEST_F(ServerTest, InvalidPercentEncodingUnicode) {
   auto res = cli_.Get("/%uendwith%");
   ASSERT_TRUE(res);
-  EXPECT_EQ(404, res->status);
+  EXPECT_EQ(StatusCode::NotFound_404, res->status);
 }
 
 TEST_F(ServerTest, EndWithPercentCharacterInQuery) {
   auto res = cli_.Get("/hello?aaa=bbb%");
   ASSERT_TRUE(res);
-  EXPECT_EQ(404, res->status);
+  EXPECT_EQ(StatusCode::NotFound_404, res->status);
 }
 
 TEST_F(ServerTest, PlusSignEncoding) {
   auto res = cli_.Get("/a+%2Bb?a %2bb=a %2Bb");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ("a +b", res->body);
 }
 
@@ -2507,18 +2860,36 @@ TEST_F(ServerTest, MultipartFormData) {
   auto res = cli_.Post("/multipart", items);
 
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
 }
 
-TEST_F(ServerTest, CaseInsensitiveHeaderName) {
-  auto res = cli_.Get("/hi");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
-  EXPECT_EQ("text/plain", res->get_header_value("content-type"));
-  EXPECT_EQ("Hello World!", res->body);
-}
+TEST_F(ServerTest, MultipartFormDataMultiFileValues) {
+  MultipartFormDataItems items = {
+      {"text", "default text", "", ""},
 
-TEST_F(ServerTest, CaseInsensitiveTransferEncoding) {
+      {"multi_text1", "aaaaa", "", ""},
+      {"multi_text1", "bbbbb", "", ""},
+
+      {"multi_file1", "h\ne\n\nl\nl\no\n", "hello.txt", "text/plain"},
+      {"multi_file1", "{\n  \"world\", true\n}\n", "world.json",
+       "application/json"},
+  };
+
+  auto res = cli_.Post("/multipart/multi_file_values", items);
+
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST_F(ServerTest, CaseInsensitiveHeaderName) {
+  auto res = cli_.Get("/hi");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("text/plain", res->get_header_value("content-type"));
+  EXPECT_EQ("Hello World!", res->body);
+}
+
+TEST_F(ServerTest, CaseInsensitiveTransferEncoding) {
   Request req;
   req.method = "POST";
   req.path = "/chunked";
@@ -2545,21 +2916,23 @@ TEST_F(ServerTest, CaseInsensitiveTransferEncoding) {
   auto ret = cli_.send(req, *res, error);
 
   ASSERT_TRUE(ret);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
 }
 
 TEST_F(ServerTest, GetStreamed2) {
   auto res = cli_.Get("/streamed", {{make_range_header({{2, 3}})}});
   ASSERT_TRUE(res);
-  EXPECT_EQ(206, res->status);
+  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
   EXPECT_EQ("2", res->get_header_value("Content-Length"));
+  EXPECT_EQ(true, res->has_header("Content-Range"));
+  EXPECT_EQ("bytes 2-3/6", res->get_header_value("Content-Range"));
   EXPECT_EQ(std::string("ab"), res->body);
 }
 
 TEST_F(ServerTest, GetStreamed) {
   auto res = cli_.Get("/streamed");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ("6", res->get_header_value("Content-Length"));
   EXPECT_EQ(std::string("aaabbb"), res->body);
 }
@@ -2567,37 +2940,40 @@ TEST_F(ServerTest, GetStreamed) {
 TEST_F(ServerTest, GetStreamedWithRange1) {
   auto res = cli_.Get("/streamed-with-range", {{make_range_header({{3, 5}})}});
   ASSERT_TRUE(res);
-  EXPECT_EQ(206, res->status);
+  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
   EXPECT_EQ("3", res->get_header_value("Content-Length"));
   EXPECT_EQ(true, res->has_header("Content-Range"));
+  EXPECT_EQ("bytes 3-5/7", res->get_header_value("Content-Range"));
   EXPECT_EQ(std::string("def"), res->body);
 }
 
 TEST_F(ServerTest, GetStreamedWithRange2) {
   auto res = cli_.Get("/streamed-with-range", {{make_range_header({{1, -1}})}});
   ASSERT_TRUE(res);
-  EXPECT_EQ(206, res->status);
+  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
   EXPECT_EQ("6", res->get_header_value("Content-Length"));
   EXPECT_EQ(true, res->has_header("Content-Range"));
+  EXPECT_EQ("bytes 1-6/7", res->get_header_value("Content-Range"));
   EXPECT_EQ(std::string("bcdefg"), res->body);
 }
 
 TEST_F(ServerTest, GetStreamedWithRangeSuffix1) {
   auto res = cli_.Get("/streamed-with-range", {{"Range", "bytes=-3"}});
   ASSERT_TRUE(res);
-  EXPECT_EQ(206, res->status);
+  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
   EXPECT_EQ("3", res->get_header_value("Content-Length"));
   EXPECT_EQ(true, res->has_header("Content-Range"));
+  EXPECT_EQ("bytes 4-6/7", res->get_header_value("Content-Range"));
   EXPECT_EQ(std::string("efg"), res->body);
 }
 
 TEST_F(ServerTest, GetStreamedWithRangeSuffix2) {
-  auto res = cli_.Get("/streamed-with-range", {{"Range", "bytes=-9999"}});
+  auto res = cli_.Get("/streamed-with-range?error", {{"Range", "bytes=-9999"}});
   ASSERT_TRUE(res);
-  EXPECT_EQ(206, res->status);
-  EXPECT_EQ("7", res->get_header_value("Content-Length"));
-  EXPECT_EQ(true, res->has_header("Content-Range"));
-  EXPECT_EQ(std::string("abcdefg"), res->body);
+  EXPECT_EQ(StatusCode::RangeNotSatisfiable_416, res->status);
+  EXPECT_EQ("0", res->get_header_value("Content-Length"));
+  EXPECT_EQ(false, res->has_header("Content-Range"));
+  EXPECT_EQ(0U, res->body.size());
 }
 
 TEST_F(ServerTest, GetStreamedWithRangeError) {
@@ -2605,26 +2981,64 @@ TEST_F(ServerTest, GetStreamedWithRangeError) {
                       {{"Range", "bytes=92233720368547758079223372036854775806-"
                                  "92233720368547758079223372036854775807"}});
   ASSERT_TRUE(res);
-  EXPECT_EQ(416, res->status);
+  EXPECT_EQ(StatusCode::RangeNotSatisfiable_416, res->status);
+  EXPECT_EQ("0", res->get_header_value("Content-Length"));
+  EXPECT_EQ(false, res->has_header("Content-Range"));
+  EXPECT_EQ(0U, res->body.size());
 }
 
 TEST_F(ServerTest, GetRangeWithMaxLongLength) {
   auto res =
       cli_.Get("/with-range", {{"Range", "bytes=0-9223372036854775807"}});
-  EXPECT_EQ(206, res->status);
-  EXPECT_EQ("7", res->get_header_value("Content-Length"));
-  EXPECT_EQ(true, res->has_header("Content-Range"));
-  EXPECT_EQ(std::string("abcdefg"), res->body);
+  EXPECT_EQ(StatusCode::RangeNotSatisfiable_416, res->status);
+  EXPECT_EQ("0", res->get_header_value("Content-Length"));
+  EXPECT_EQ(false, res->has_header("Content-Range"));
+  EXPECT_EQ(0U, res->body.size());
 }
 
 TEST_F(ServerTest, GetStreamedWithRangeMultipart) {
   auto res =
       cli_.Get("/streamed-with-range", {{make_range_header({{1, 2}, {4, 5}})}});
   ASSERT_TRUE(res);
-  EXPECT_EQ(206, res->status);
-  EXPECT_EQ("269", res->get_header_value("Content-Length"));
+  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
+  EXPECT_EQ("267", res->get_header_value("Content-Length"));
+  EXPECT_EQ(false, res->has_header("Content-Range"));
+  EXPECT_EQ(267U, res->body.size());
+}
+
+TEST_F(ServerTest, GetStreamedWithTooManyRanges) {
+  Ranges ranges;
+  for (size_t i = 0; i < CPPHTTPLIB_RANGE_MAX_COUNT + 1; i++) {
+    ranges.emplace_back(0, -1);
+  }
+
+  auto res =
+      cli_.Get("/streamed-with-range?error", {{make_range_header(ranges)}});
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::RangeNotSatisfiable_416, res->status);
+  EXPECT_EQ("0", res->get_header_value("Content-Length"));
+  EXPECT_EQ(false, res->has_header("Content-Range"));
+  EXPECT_EQ(0U, res->body.size());
+}
+
+TEST_F(ServerTest, GetStreamedWithNonAscendingRanges) {
+  auto res = cli_.Get("/streamed-with-range?error",
+                      {{make_range_header({{0, -1}, {0, -1}})}});
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::RangeNotSatisfiable_416, res->status);
+  EXPECT_EQ("0", res->get_header_value("Content-Length"));
   EXPECT_EQ(false, res->has_header("Content-Range"));
-  EXPECT_EQ(269U, res->body.size());
+  EXPECT_EQ(0U, res->body.size());
+}
+
+TEST_F(ServerTest, GetStreamedWithRangesMoreThanTwoOverwrapping) {
+  auto res = cli_.Get("/streamed-with-range?error",
+                      {{make_range_header({{0, 1}, {1, 2}, {2, 3}, {3, 4}})}});
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::RangeNotSatisfiable_416, res->status);
+  EXPECT_EQ("0", res->get_header_value("Content-Length"));
+  EXPECT_EQ(false, res->has_header("Content-Range"));
+  EXPECT_EQ(0U, res->body.size());
 }
 
 TEST_F(ServerTest, GetStreamedEndless) {
@@ -2642,19 +3056,24 @@ TEST_F(ServerTest, GetStreamedEndless) {
 }
 
 TEST_F(ServerTest, ClientStop) {
+  std::atomic_size_t count{4};
   std::vector<std::thread> threads;
-  for (auto i = 0; i < 3; i++) {
-    threads.emplace_back(thread([&]() {
+
+  for (auto i = count.load(); i != 0; --i) {
+    threads.emplace_back([&]() {
       auto res = cli_.Get("/streamed-cancel",
                           [&](const char *, uint64_t) { return true; });
+
+      --count;
+
       ASSERT_TRUE(!res);
       EXPECT_TRUE(res.error() == Error::Canceled ||
                   res.error() == Error::Read || res.error() == Error::Write);
-    }));
+    });
   }
 
   std::this_thread::sleep_for(std::chrono::seconds(2));
-  while (cli_.is_socket_open()) {
+  while (count != 0) {
     cli_.stop();
     std::this_thread::sleep_for(std::chrono::milliseconds(10));
   }
@@ -2666,73 +3085,92 @@ TEST_F(ServerTest, ClientStop) {
 TEST_F(ServerTest, GetWithRange1) {
   auto res = cli_.Get("/with-range", {{make_range_header({{3, 5}})}});
   ASSERT_TRUE(res);
-  EXPECT_EQ(206, res->status);
+  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
   EXPECT_EQ("3", res->get_header_value("Content-Length"));
   EXPECT_EQ(true, res->has_header("Content-Range"));
+  EXPECT_EQ("bytes 3-5/7", res->get_header_value("Content-Range"));
   EXPECT_EQ(std::string("def"), res->body);
 }
 
 TEST_F(ServerTest, GetWithRange2) {
   auto res = cli_.Get("/with-range", {{make_range_header({{1, -1}})}});
   ASSERT_TRUE(res);
-  EXPECT_EQ(206, res->status);
+  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
   EXPECT_EQ("6", res->get_header_value("Content-Length"));
   EXPECT_EQ(true, res->has_header("Content-Range"));
+  EXPECT_EQ("bytes 1-6/7", res->get_header_value("Content-Range"));
   EXPECT_EQ(std::string("bcdefg"), res->body);
 }
 
 TEST_F(ServerTest, GetWithRange3) {
   auto res = cli_.Get("/with-range", {{make_range_header({{0, 0}})}});
   ASSERT_TRUE(res);
-  EXPECT_EQ(206, res->status);
+  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
   EXPECT_EQ("1", res->get_header_value("Content-Length"));
   EXPECT_EQ(true, res->has_header("Content-Range"));
+  EXPECT_EQ("bytes 0-0/7", res->get_header_value("Content-Range"));
   EXPECT_EQ(std::string("a"), res->body);
 }
 
 TEST_F(ServerTest, GetWithRange4) {
   auto res = cli_.Get("/with-range", {{make_range_header({{-1, 2}})}});
   ASSERT_TRUE(res);
-  EXPECT_EQ(206, res->status);
+  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
   EXPECT_EQ("2", res->get_header_value("Content-Length"));
   EXPECT_EQ(true, res->has_header("Content-Range"));
+  EXPECT_EQ("bytes 5-6/7", res->get_header_value("Content-Range"));
   EXPECT_EQ(std::string("fg"), res->body);
 }
 
 TEST_F(ServerTest, GetWithRangeOffsetGreaterThanContent) {
   auto res = cli_.Get("/with-range", {{make_range_header({{10000, 20000}})}});
   ASSERT_TRUE(res);
-  EXPECT_EQ(416, res->status);
+  EXPECT_EQ(StatusCode::RangeNotSatisfiable_416, res->status);
 }
 
 TEST_F(ServerTest, GetWithRangeMultipart) {
   auto res = cli_.Get("/with-range", {{make_range_header({{1, 2}, {4, 5}})}});
   ASSERT_TRUE(res);
-  EXPECT_EQ(206, res->status);
-  EXPECT_EQ("269", res->get_header_value("Content-Length"));
+  EXPECT_EQ(StatusCode::PartialContent_206, res->status);
+  EXPECT_EQ("267", res->get_header_value("Content-Length"));
   EXPECT_EQ(false, res->has_header("Content-Range"));
-  EXPECT_EQ(269U, res->body.size());
+  EXPECT_EQ(267U, res->body.size());
 }
 
 TEST_F(ServerTest, GetWithRangeMultipartOffsetGreaterThanContent) {
   auto res =
       cli_.Get("/with-range", {{make_range_header({{-1, 2}, {10000, 30000}})}});
   ASSERT_TRUE(res);
-  EXPECT_EQ(416, res->status);
+  EXPECT_EQ(StatusCode::RangeNotSatisfiable_416, res->status);
+}
+
+TEST_F(ServerTest, Issue1772) {
+  auto res = cli_.Get("/issue1772", {{make_range_header({{1000, -1}})}});
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
 }
 
 TEST_F(ServerTest, GetStreamedChunked) {
   auto res = cli_.Get("/streamed-chunked");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ(std::string("123456789"), res->body);
 }
 
 TEST_F(ServerTest, GetStreamedChunked2) {
   auto res = cli_.Get("/streamed-chunked2");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ(std::string("123456789"), res->body);
+}
+
+TEST_F(ServerTest, GetStreamedChunkedWithTrailer) {
+  auto res = cli_.Get("/streamed-chunked-with-trailer");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ(std::string("123456789"), res->body);
+  EXPECT_EQ(std::string("DummyVal1"), res->get_header_value("Dummy1"));
+  EXPECT_EQ(std::string("DummyVal2"), res->get_header_value("Dummy2"));
 }
 
 TEST_F(ServerTest, LargeChunkedPost) {
@@ -2764,30 +3202,36 @@ TEST_F(ServerTest, LargeChunkedPost) {
   auto ret = cli_.send(req, *res, error);
 
   ASSERT_TRUE(ret);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
 }
 
 TEST_F(ServerTest, GetMethodRemoteAddr) {
   auto res = cli_.Get("/remote_addr");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
   EXPECT_TRUE(res->body == "::1" || res->body == "127.0.0.1");
 }
 
+TEST_F(ServerTest, GetMethodLocalAddr) {
+  auto res = cli_.Get("/local_addr");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
+  EXPECT_TRUE(res->body == std::string("::1:").append(to_string(PORT)) ||
+              res->body == std::string("127.0.0.1:").append(to_string(PORT)));
+}
+
 TEST_F(ServerTest, HTTPResponseSplitting) {
   auto res = cli_.Get("/http_response_splitting");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
 }
 
 TEST_F(ServerTest, SlowRequest) {
-  request_threads_.push_back(
-      std::thread([=]() { auto res = cli_.Get("/slow"); }));
-  request_threads_.push_back(
-      std::thread([=]() { auto res = cli_.Get("/slow"); }));
-  request_threads_.push_back(
-      std::thread([=]() { auto res = cli_.Get("/slow"); }));
+  request_threads_.emplace_back([this]() { auto res = cli_.Get("/slow"); });
+  request_threads_.emplace_back([this]() { auto res = cli_.Get("/slow"); });
+  request_threads_.emplace_back([this]() { auto res = cli_.Get("/slow"); });
 }
 
 #if 0
@@ -2805,7 +3249,7 @@ TEST_F(ServerTest, SlowPost) {
       "text/plain");
 
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
 }
 
 TEST_F(ServerTest, SlowPostFail) {
@@ -2829,7 +3273,7 @@ TEST_F(ServerTest, SlowPostFail) {
 TEST_F(ServerTest, Put) {
   auto res = cli_.Put("/put", "PUT", "text/plain");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ("PUT", res->body);
 }
 
@@ -2837,14 +3281,13 @@ TEST_F(ServerTest, PutWithContentProvider) {
   auto res = cli_.Put(
       "/put", 3,
       [](size_t /*offset*/, size_t /*length*/, DataSink &sink) {
-        EXPECT_TRUE(sink.is_writable());
         sink.os << "PUT";
         return true;
       },
       "text/plain");
 
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ("PUT", res->body);
 }
 
@@ -2864,7 +3307,6 @@ TEST_F(ServerTest, PutWithContentProviderWithoutLength) {
   auto res = cli_.Put(
       "/put",
       [](size_t /*offset*/, DataSink &sink) {
-        EXPECT_TRUE(sink.is_writable());
         sink.os << "PUT";
         sink.done();
         return true;
@@ -2872,7 +3314,7 @@ TEST_F(ServerTest, PutWithContentProviderWithoutLength) {
       "text/plain");
 
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ("PUT", res->body);
 }
 
@@ -2891,14 +3333,13 @@ TEST_F(ServerTest, PutWithContentProviderWithGzip) {
   auto res = cli_.Put(
       "/put", 3,
       [](size_t /*offset*/, size_t /*length*/, DataSink &sink) {
-        EXPECT_TRUE(sink.is_writable());
         sink.os << "PUT";
         return true;
       },
       "text/plain");
 
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ("PUT", res->body);
 }
 
@@ -2920,7 +3361,6 @@ TEST_F(ServerTest, PutWithContentProviderWithoutLengthWithGzip) {
   auto res = cli_.Put(
       "/put",
       [](size_t /*offset*/, DataSink &sink) {
-        EXPECT_TRUE(sink.is_writable());
         sink.os << "PUT";
         sink.done();
         return true;
@@ -2928,7 +3368,7 @@ TEST_F(ServerTest, PutWithContentProviderWithoutLengthWithGzip) {
       "text/plain");
 
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ("PUT", res->body);
 }
 
@@ -2947,7 +3387,7 @@ TEST_F(ServerTest, PutLargeFileWithGzip) {
   auto res = cli_.Put("/put-large", LARGE_DATA, "text/plain");
 
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ(LARGE_DATA, res->body);
 }
 
@@ -2965,9 +3405,9 @@ TEST_F(ServerTest, PutLargeFileWithGzip2) {
   auto res = cli.Put("/put-large", LARGE_DATA, "text/plain");
 
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ(LARGE_DATA, res->body);
-  EXPECT_EQ(101942u, res.get_request_header_value<uint64_t>("Content-Length"));
+  EXPECT_EQ(101942u, res.get_request_header_value_u64("Content-Length"));
   EXPECT_EQ("gzip", res.get_request_header_value("Content-Encoding"));
 }
 
@@ -2980,7 +3420,7 @@ TEST_F(ServerTest, PutContentWithDeflate) {
                       "\170\234\013\010\015\001\0\001\361\0\372", "text/plain");
 
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ("PUT", res->body);
 }
 
@@ -2990,7 +3430,7 @@ TEST_F(ServerTest, GetStreamedChunkedWithGzip) {
 
   auto res = cli_.Get("/streamed-chunked", headers);
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ(std::string("123456789"), res->body);
 }
 
@@ -3000,10 +3440,16 @@ TEST_F(ServerTest, GetStreamedChunkedWithGzip2) {
 
   auto res = cli_.Get("/streamed-chunked2", headers);
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ(std::string("123456789"), res->body);
 }
 
+TEST_F(ServerTest, SplitDelimiterInPathRegex) {
+  auto res = cli_.Get("/regex-with-delimiter?key=^(?.*(value))");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
 TEST(GzipDecompressor, ChunkedDecompression) {
   std::string data;
   for (size_t i = 0; i < 32 * 1024; ++i) {
@@ -3015,8 +3461,10 @@ TEST(GzipDecompressor, ChunkedDecompression) {
     httplib::detail::gzip_compressor compressor;
     bool result = compressor.compress(
         data.data(), data.size(),
-        /*last=*/true, [&](const char *data, size_t size) {
-          compressed_data.insert(compressed_data.size(), data, size);
+        /*last=*/true,
+        [&](const char *compressed_data_chunk, size_t compressed_data_size) {
+          compressed_data.insert(compressed_data.size(), compressed_data_chunk,
+                                 compressed_data_size);
           return true;
         });
     ASSERT_TRUE(result);
@@ -3026,7 +3474,7 @@ TEST(GzipDecompressor, ChunkedDecompression) {
   {
     httplib::detail::gzip_decompressor decompressor;
 
-    // Chunk size is chosen specificaly to have a decompressed chunk size equal
+    // Chunk size is chosen specifically to have a decompressed chunk size equal
     // to 16384 bytes 16384 bytes is the size of decompressor output buffer
     size_t chunk_size = 130;
     for (size_t chunk_begin = 0; chunk_begin < compressed_data.size();
@@ -3035,8 +3483,11 @@ TEST(GzipDecompressor, ChunkedDecompression) {
           std::min(compressed_data.size() - chunk_begin, chunk_size);
       bool result = decompressor.decompress(
           compressed_data.data() + chunk_begin, current_chunk_size,
-          [&](const char *data, size_t size) {
-            decompressed_data.insert(decompressed_data.size(), data, size);
+          [&](const char *decompressed_data_chunk,
+              size_t decompressed_data_chunk_size) {
+            decompressed_data.insert(decompressed_data.size(),
+                                     decompressed_data_chunk,
+                                     decompressed_data_chunk_size);
             return true;
           });
       ASSERT_TRUE(result);
@@ -3045,6 +3496,59 @@ TEST(GzipDecompressor, ChunkedDecompression) {
   ASSERT_EQ(data, decompressed_data);
 }
 
+TEST(GzipDecompressor, DeflateDecompression) {
+  std::string original_text = "Raw deflate without gzip";
+  unsigned char data[32] = {0x78, 0x9C, 0x0B, 0x4A, 0x2C, 0x57, 0x48, 0x49,
+                            0x4D, 0xCB, 0x49, 0x2C, 0x49, 0x55, 0x28, 0xCF,
+                            0x2C, 0xC9, 0xC8, 0x2F, 0x2D, 0x51, 0x48, 0xAF,
+                            0xCA, 0x2C, 0x00, 0x00, 0x6F, 0x98, 0x09, 0x2E};
+  std::string compressed_data(data, data + sizeof(data) / sizeof(data[0]));
+
+  std::string decompressed_data;
+  {
+    httplib::detail::gzip_decompressor decompressor;
+
+    bool result = decompressor.decompress(
+        compressed_data.data(), compressed_data.size(),
+        [&](const char *decompressed_data_chunk,
+            size_t decompressed_data_chunk_size) {
+          decompressed_data.insert(decompressed_data.size(),
+                                   decompressed_data_chunk,
+                                   decompressed_data_chunk_size);
+          return true;
+        });
+    ASSERT_TRUE(result);
+  }
+  ASSERT_EQ(original_text, decompressed_data);
+}
+
+TEST(GzipDecompressor, DeflateDecompressionTrailingBytes) {
+  std::string original_text = "Raw deflate without gzip";
+  unsigned char data[40] = {0x78, 0x9C, 0x0B, 0x4A, 0x2C, 0x57, 0x48, 0x49,
+                            0x4D, 0xCB, 0x49, 0x2C, 0x49, 0x55, 0x28, 0xCF,
+                            0x2C, 0xC9, 0xC8, 0x2F, 0x2D, 0x51, 0x48, 0xAF,
+                            0xCA, 0x2C, 0x00, 0x00, 0x6F, 0x98, 0x09, 0x2E,
+                            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+  std::string compressed_data(data, data + sizeof(data) / sizeof(data[0]));
+
+  std::string decompressed_data;
+  {
+    httplib::detail::gzip_decompressor decompressor;
+
+    bool result = decompressor.decompress(
+        compressed_data.data(), compressed_data.size(),
+        [&](const char *decompressed_data_chunk,
+            size_t decompressed_data_chunk_size) {
+          decompressed_data.insert(decompressed_data.size(),
+                                   decompressed_data_chunk,
+                                   decompressed_data_chunk_size);
+          return true;
+        });
+    ASSERT_TRUE(result);
+  }
+  ASSERT_EQ(original_text, decompressed_data);
+}
+
 #ifdef _WIN32
 TEST(GzipDecompressor, LargeRandomData) {
 
@@ -3101,7 +3605,7 @@ TEST_F(ServerTest, GetStreamedChunkedWithBrotli) {
 
   auto res = cli_.Get("/streamed-chunked", headers);
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ(std::string("123456789"), res->body);
 }
 
@@ -3111,7 +3615,7 @@ TEST_F(ServerTest, GetStreamedChunkedWithBrotli2) {
 
   auto res = cli_.Get("/streamed-chunked2", headers);
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ(std::string("123456789"), res->body);
 }
 #endif
@@ -3119,28 +3623,28 @@ TEST_F(ServerTest, GetStreamedChunkedWithBrotli2) {
 TEST_F(ServerTest, Patch) {
   auto res = cli_.Patch("/patch", "PATCH", "text/plain");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ("PATCH", res->body);
 }
 
 TEST_F(ServerTest, Delete) {
   auto res = cli_.Delete("/delete");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ("DELETE", res->body);
 }
 
 TEST_F(ServerTest, DeleteContentReceiver) {
   auto res = cli_.Delete("/delete-body", "content", "text/plain");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ("content", res->body);
 }
 
 TEST_F(ServerTest, Options) {
   auto res = cli_.Options("*");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ("GET, POST, HEAD, OPTIONS", res->get_header_value("Allow"));
   EXPECT_TRUE(res->body.empty());
 }
@@ -3148,13 +3652,13 @@ TEST_F(ServerTest, Options) {
 TEST_F(ServerTest, URL) {
   auto res = cli_.Get("/request-target?aaa=bbb&ccc=ddd");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
 }
 
 TEST_F(ServerTest, ArrayParam) {
   auto res = cli_.Get("/array-param?array=value1&array=value2&array=value3");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
 }
 
 TEST_F(ServerTest, NoMultipleHeaders) {
@@ -3162,17 +3666,17 @@ TEST_F(ServerTest, NoMultipleHeaders) {
   auto res = cli_.Post("/validate-no-multiple-headers", headers, "hello",
                        "text/plain");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
 }
 
 TEST_F(ServerTest, PostContentReceiver) {
   auto res = cli_.Post("/content_receiver", "content", "text/plain");
   ASSERT_TRUE(res);
-  ASSERT_EQ(200, res->status);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
   ASSERT_EQ("content", res->body);
 }
 
-TEST_F(ServerTest, PostMulitpartFilsContentReceiver) {
+TEST_F(ServerTest, PostMultipartFileContentReceiver) {
   MultipartFormDataItems items = {
       {"text1", "text default", "", ""},
       {"text2", "aωb", "", ""},
@@ -3184,10 +3688,10 @@ TEST_F(ServerTest, PostMulitpartFilsContentReceiver) {
   auto res = cli_.Post("/content_receiver", items);
 
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
 }
 
-TEST_F(ServerTest, PostMulitpartPlusBoundary) {
+TEST_F(ServerTest, PostMultipartPlusBoundary) {
   MultipartFormDataItems items = {
       {"text1", "text default", "", ""},
       {"text2", "aωb", "", ""},
@@ -3219,28 +3723,28 @@ TEST_F(ServerTest, PostMulitpartPlusBoundary) {
   auto res = cli_.Post("/content_receiver", body, content_type.c_str());
 
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
 }
 
 TEST_F(ServerTest, PostContentReceiverGzip) {
   cli_.set_compress(true);
   auto res = cli_.Post("/content_receiver", "content", "text/plain");
   ASSERT_TRUE(res);
-  ASSERT_EQ(200, res->status);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
   ASSERT_EQ("content", res->body);
 }
 
 TEST_F(ServerTest, PutContentReceiver) {
   auto res = cli_.Put("/content_receiver", "content", "text/plain");
   ASSERT_TRUE(res);
-  ASSERT_EQ(200, res->status);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
   ASSERT_EQ("content", res->body);
 }
 
 TEST_F(ServerTest, PatchContentReceiver) {
   auto res = cli_.Patch("/content_receiver", "content", "text/plain");
   ASSERT_TRUE(res);
-  ASSERT_EQ(200, res->status);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
   ASSERT_EQ("content", res->body);
 }
 
@@ -3248,7 +3752,7 @@ TEST_F(ServerTest, PostQueryStringAndBody) {
   auto res =
       cli_.Post("/query-string-and-body?key=value", "content", "text/plain");
   ASSERT_TRUE(res);
-  ASSERT_EQ(200, res->status);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
 }
 
 TEST_F(ServerTest, HTTP2Magic) {
@@ -3262,35 +3766,35 @@ TEST_F(ServerTest, HTTP2Magic) {
   auto ret = cli_.send(req, *res, error);
 
   ASSERT_TRUE(ret);
-  EXPECT_EQ(400, res->status);
+  EXPECT_EQ(StatusCode::BadRequest_400, res->status);
 }
 
 TEST_F(ServerTest, KeepAlive) {
   auto res = cli_.Get("/hi");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
   EXPECT_EQ("Hello World!", res->body);
 
   res = cli_.Get("/hi");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
   EXPECT_EQ("Hello World!", res->body);
 
   res = cli_.Get("/hi");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
   EXPECT_EQ("Hello World!", res->body);
 
   res = cli_.Get("/not-exist");
   ASSERT_TRUE(res);
-  EXPECT_EQ(404, res->status);
+  EXPECT_EQ(StatusCode::NotFound_404, res->status);
 
   res = cli_.Post("/empty", "", "text/plain");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
   EXPECT_EQ("empty", res->body);
   EXPECT_EQ("close", res->get_header_value("Connection"));
@@ -3299,14 +3803,14 @@ TEST_F(ServerTest, KeepAlive) {
       "/empty", 0, [&](size_t, size_t, DataSink &) { return true; },
       "text/plain");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
   EXPECT_EQ("empty", res->body);
 
   cli_.set_keep_alive(false);
   res = cli_.Get("/last-request");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ("close", res->get_header_value("Connection"));
 }
 
@@ -3330,7 +3834,7 @@ TEST_F(ServerTest, Gzip) {
   EXPECT_EQ("123456789012345678901234567890123456789012345678901234567890123456"
             "7890123456789012345678901234567890",
             res->body);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
 }
 
 TEST_F(ServerTest, GzipWithoutAcceptEncoding) {
@@ -3343,7 +3847,7 @@ TEST_F(ServerTest, GzipWithoutAcceptEncoding) {
   EXPECT_EQ("123456789012345678901234567890123456789012345678901234567890123456"
             "7890123456789012345678901234567890",
             res->body);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
 }
 
 TEST_F(ServerTest, GzipWithContentReceiver) {
@@ -3364,7 +3868,7 @@ TEST_F(ServerTest, GzipWithContentReceiver) {
   EXPECT_EQ("123456789012345678901234567890123456789012345678901234567890123456"
             "7890123456789012345678901234567890",
             body);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
 }
 
 TEST_F(ServerTest, GzipWithoutDecompressing) {
@@ -3379,7 +3883,7 @@ TEST_F(ServerTest, GzipWithoutDecompressing) {
   EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
   EXPECT_EQ("33", res->get_header_value("Content-Length"));
   EXPECT_EQ(33U, res->body.size());
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
 }
 
 TEST_F(ServerTest, GzipWithContentReceiverWithoutAcceptEncoding) {
@@ -3397,7 +3901,7 @@ TEST_F(ServerTest, GzipWithContentReceiverWithoutAcceptEncoding) {
   EXPECT_EQ("123456789012345678901234567890123456789012345678901234567890123456"
             "7890123456789012345678901234567890",
             body);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
 }
 
 TEST_F(ServerTest, NoGzip) {
@@ -3412,7 +3916,7 @@ TEST_F(ServerTest, NoGzip) {
   EXPECT_EQ("123456789012345678901234567890123456789012345678901234567890123456"
             "7890123456789012345678901234567890",
             res->body);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
 }
 
 TEST_F(ServerTest, NoGzipWithContentReceiver) {
@@ -3433,7 +3937,7 @@ TEST_F(ServerTest, NoGzipWithContentReceiver) {
   EXPECT_EQ("123456789012345678901234567890123456789012345678901234567890123456"
             "7890123456789012345678901234567890",
             body);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
 }
 
 TEST_F(ServerTest, MultipartFormDataGzip) {
@@ -3446,7 +3950,7 @@ TEST_F(ServerTest, MultipartFormDataGzip) {
   auto res = cli_.Post("/compress-multipart", items);
 
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
 }
 #endif
 
@@ -3463,7 +3967,7 @@ TEST_F(ServerTest, Brotli) {
   EXPECT_EQ("123456789012345678901234567890123456789012345678901234567890123456"
             "7890123456789012345678901234567890",
             res->body);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
 }
 #endif
 
@@ -3510,9 +4014,13 @@ TEST(ServerRequestParsingTest, TrimWhitespaceFromHeaderValues) {
   });
 
   thread t = thread([&] { svr.listen(HOST, PORT); });
-  while (!svr.is_running()) {
-    std::this_thread::sleep_for(std::chrono::milliseconds(1));
-  }
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
 
   // Only space and horizontal tab are whitespace. Make sure other whitespace-
   // like characters are not treated the same - use vertical tab and escape.
@@ -3522,8 +4030,6 @@ TEST(ServerRequestParsingTest, TrimWhitespaceFromHeaderValues) {
                           "\r\n";
 
   ASSERT_TRUE(send_request(5, req));
-  svr.stop();
-  t.join();
   EXPECT_EQ(header_value, "\v bar \x1B");
 }
 
@@ -3545,14 +4051,16 @@ static void test_raw_request(const std::string &req,
   svr.set_read_timeout(std::chrono::seconds(client_read_timeout_sec + 1));
   bool listen_thread_ok = false;
   thread t = thread([&] { listen_thread_ok = svr.listen(HOST, PORT); });
-  while (!svr.is_running()) {
-    std::this_thread::sleep_for(std::chrono::milliseconds(1));
-  }
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+    EXPECT_TRUE(listen_thread_ok);
+  });
+
+  svr.wait_until_ready();
 
   ASSERT_TRUE(send_request(client_read_timeout_sec, req, out));
-  svr.stop();
-  t.join();
-  EXPECT_TRUE(listen_thread_ok);
 }
 
 TEST(ServerRequestParsingTest, ReadHeadersRegexComplexity) {
@@ -3603,10 +4111,10 @@ TEST(ServerRequestParsingTest, ReadHeadersRegexComplexity2) {
       "&&&%%%");
 }
 
-TEST(ServerRequestParsingTest, ExcessiveWhitespaceInUnparseableHeaderLine) {
+TEST(ServerRequestParsingTest, ExcessiveWhitespaceInUnparsableHeaderLine) {
   // Make sure this doesn't crash the server.
   // In a previous version of the header line regex, the "\r" rendered the line
-  // unparseable and the regex engine repeatedly backtracked, trying to look for
+  // unparsable and the regex engine repeatedly backtracked, trying to look for
   // a new position where the leading white space ended and the field value
   // began.
   // The crash occurs with libc++ but not libstdc++.
@@ -3673,21 +4181,20 @@ TEST(ServerStopTest, StopServerWithChunkedTransmission) {
 
   svr.Get("/events", [](const Request & /*req*/, Response &res) {
     res.set_header("Cache-Control", "no-cache");
-    res.set_chunked_content_provider("text/event-stream", [](size_t offset,
-                                                             DataSink &sink) {
-      char buffer[27];
-      auto size = static_cast<size_t>(sprintf(buffer, "data:%zd\n\n", offset));
-      auto ret = sink.write(buffer, size);
-      EXPECT_TRUE(ret);
-      std::this_thread::sleep_for(std::chrono::seconds(1));
-      return true;
-    });
+    res.set_chunked_content_provider(
+        "text/event-stream", [](size_t offset, DataSink &sink) {
+          std::string s = "data:";
+          s += std::to_string(offset);
+          s += "\n\n";
+          auto ret = sink.write(s.data(), s.size());
+          EXPECT_TRUE(ret);
+          std::this_thread::sleep_for(std::chrono::seconds(1));
+          return true;
+        });
   });
 
   auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
-  while (!svr.is_running()) {
-    std::this_thread::sleep_for(std::chrono::milliseconds(1));
-  }
+  svr.wait_until_ready();
 
   Client client(HOST, PORT);
   const Headers headers = {{"Accept", "text/event-stream"}};
@@ -3697,16 +4204,51 @@ TEST(ServerStopTest, StopServerWithChunkedTransmission) {
         "/events", headers,
         [](const char * /*data*/, size_t /*len*/) -> bool { return true; });
   });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    get_thread.join();
+    listen_thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
 
   // Give GET time to get a few messages.
   std::this_thread::sleep_for(std::chrono::seconds(2));
+}
 
-  svr.stop();
+TEST(ServerStopTest, ClientAccessAfterServerDown) {
+  httplib::Server svr;
+  svr.Post("/hi",
+           [&](const httplib::Request & /*req*/, httplib::Response &res) {
+             res.status = StatusCode::OK_200;
+           });
 
-  listen_thread.join();
-  get_thread.join();
+  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
+  svr.wait_until_ready();
+
+  Client cli(HOST, PORT);
+
+  auto res = cli.Post("/hi", "data", "text/plain");
 
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+
+  svr.stop();
+  thread.join();
   ASSERT_FALSE(svr.is_running());
+
+  res = cli.Post("/hi", "data", "text/plain");
+  ASSERT_FALSE(res);
+}
+
+TEST(ServerStopTest, ListenFailure) {
+  Server svr;
+  auto t = thread([&]() {
+    auto ret = svr.listen("????", PORT);
+    EXPECT_FALSE(ret);
+  });
+  svr.wait_until_ready();
+  svr.stop();
+  t.join();
 }
 
 TEST(StreamingTest, NoContentLengthStreaming) {
@@ -3724,9 +4266,13 @@ TEST(StreamingTest, NoContentLengthStreaming) {
   });
 
   auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
-  while (!svr.is_running()) {
-    std::this_thread::sleep_for(std::chrono::milliseconds(1));
-  }
+  auto listen_se = detail::scope_exit([&] {
+    svr.stop();
+    listen_thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
 
   Client client(HOST, PORT);
 
@@ -3739,28 +4285,23 @@ TEST(StreamingTest, NoContentLengthStreaming) {
         });
     EXPECT_EQ("aaabbb", s);
   });
+  auto get_se = detail::scope_exit([&] { get_thread.join(); });
 
   // Give GET time to get a few messages.
   std::this_thread::sleep_for(std::chrono::milliseconds(500));
-
-  svr.stop();
-
-  listen_thread.join();
-  get_thread.join();
-
-  ASSERT_FALSE(svr.is_running());
 }
 
 TEST(MountTest, Unmount) {
   Server svr;
 
   auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
-  while (!svr.is_running()) {
-    std::this_thread::sleep_for(std::chrono::milliseconds(1));
-  }
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    listen_thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
 
-  // Give GET time to get a few messages.
-  std::this_thread::sleep_for(std::chrono::seconds(1));
+  svr.wait_until_ready();
 
   Client cli("localhost", PORT);
 
@@ -3768,61 +4309,67 @@ TEST(MountTest, Unmount) {
 
   auto res = cli.Get("/");
   ASSERT_TRUE(res);
-  EXPECT_EQ(404, res->status);
+  EXPECT_EQ(StatusCode::NotFound_404, res->status);
 
   res = cli.Get("/mount2/dir/test.html");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
 
   svr.set_mount_point("/", "./www");
 
   res = cli.Get("/dir/");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
 
   svr.remove_mount_point("/");
   res = cli.Get("/dir/");
   ASSERT_TRUE(res);
-  EXPECT_EQ(404, res->status);
+  EXPECT_EQ(StatusCode::NotFound_404, res->status);
 
   svr.remove_mount_point("/mount2");
   res = cli.Get("/mount2/dir/test.html");
   ASSERT_TRUE(res);
-  EXPECT_EQ(404, res->status);
-
-  svr.stop();
-  listen_thread.join();
-  ASSERT_FALSE(svr.is_running());
+  EXPECT_EQ(StatusCode::NotFound_404, res->status);
 }
 
 #ifndef CPPHTTPLIB_NO_EXCEPTIONS
 TEST(ExceptionTest, ThrowExceptionInHandler) {
   Server svr;
 
-  svr.Get("/hi", [&](const Request & /*req*/, Response & /*res*/) {
+  svr.Get("/exception", [&](const Request & /*req*/, Response & /*res*/) {
     throw std::runtime_error("exception...");
-    // res.set_content("Hello World!", "text/plain");
+  });
+
+  svr.Get("/unknown", [&](const Request & /*req*/, Response & /*res*/) {
+    throw std::runtime_error("exception\r\n...");
   });
 
   auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
-  while (!svr.is_running()) {
-    std::this_thread::sleep_for(std::chrono::milliseconds(1));
-  }
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    listen_thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
 
-  // Give GET time to get a few messages.
-  std::this_thread::sleep_for(std::chrono::seconds(1));
+  svr.wait_until_ready();
 
   Client cli("localhost", PORT);
 
-  auto res = cli.Get("/hi");
-  ASSERT_TRUE(res);
-  EXPECT_EQ(500, res->status);
-  ASSERT_TRUE(res->has_header("EXCEPTION_WHAT"));
-  EXPECT_EQ("exception...", res->get_header_value("EXCEPTION_WHAT"));
+  {
+    auto res = cli.Get("/exception");
+    ASSERT_TRUE(res);
+    EXPECT_EQ(StatusCode::InternalServerError_500, res->status);
+    ASSERT_TRUE(res->has_header("EXCEPTION_WHAT"));
+    EXPECT_EQ("exception...", res->get_header_value("EXCEPTION_WHAT"));
+  }
 
-  svr.stop();
-  listen_thread.join();
-  ASSERT_FALSE(svr.is_running());
+  {
+    auto res = cli.Get("/unknown");
+    ASSERT_TRUE(res);
+    EXPECT_EQ(StatusCode::InternalServerError_500, res->status);
+    ASSERT_TRUE(res->has_header("EXCEPTION_WHAT"));
+    EXPECT_EQ("exception\\r\\n...", res->get_header_value("EXCEPTION_WHAT"));
+  }
 }
 #endif
 
@@ -3839,60 +4386,102 @@ TEST(KeepAliveTest, ReadTimeout) {
   });
 
   auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
-  while (!svr.is_running()) {
-    std::this_thread::sleep_for(std::chrono::milliseconds(1));
-  }
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    listen_thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
 
-  // Give GET time to get a few messages.
-  std::this_thread::sleep_for(std::chrono::seconds(1));
+  svr.wait_until_ready();
 
   Client cli("localhost", PORT);
   cli.set_keep_alive(true);
   cli.set_read_timeout(std::chrono::seconds(1));
 
   auto resa = cli.Get("/a");
-  ASSERT_TRUE(!resa);
+  ASSERT_FALSE(resa);
   EXPECT_EQ(Error::Read, resa.error());
 
   auto resb = cli.Get("/b");
   ASSERT_TRUE(resb);
-  EXPECT_EQ(200, resb->status);
+  EXPECT_EQ(StatusCode::OK_200, resb->status);
   EXPECT_EQ("b", resb->body);
-
-  svr.stop();
-  listen_thread.join();
-  ASSERT_FALSE(svr.is_running());
 }
 
 TEST(KeepAliveTest, Issue1041) {
-  const auto resourcePath = "/hi";
-
   Server svr;
   svr.set_keep_alive_timeout(3);
 
-  svr.Get(resourcePath, [](const httplib::Request &, httplib::Response &res) {
+  svr.Get("/hi", [](const httplib::Request &, httplib::Response &res) {
     res.set_content("Hello World!", "text/plain");
   });
 
-  auto a2 = std::async(std::launch::async, [&svr] { svr.listen(HOST, PORT); });
-  std::this_thread::sleep_for(std::chrono::milliseconds(200));
+  auto listen_thread = std::thread([&svr] { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    listen_thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
 
   Client cli(HOST, PORT);
   cli.set_keep_alive(true);
 
-  auto result = cli.Get(resourcePath);
+  auto result = cli.Get("/hi");
   ASSERT_TRUE(result);
-  EXPECT_EQ(200, result->status);
+  EXPECT_EQ(StatusCode::OK_200, result->status);
 
   std::this_thread::sleep_for(std::chrono::seconds(5));
 
-  result = cli.Get(resourcePath);
+  result = cli.Get("/hi");
   ASSERT_TRUE(result);
-  EXPECT_EQ(200, result->status);
+  EXPECT_EQ(StatusCode::OK_200, result->status);
+}
 
-  svr.stop();
-  a2.wait();
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+TEST(KeepAliveTest, SSLClientReconnection) {
+  SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE);
+  ASSERT_TRUE(svr.is_valid());
+  svr.set_keep_alive_timeout(1);
+
+  svr.Get("/hi", [](const httplib::Request &, httplib::Response &res) {
+    res.set_content("Hello World!", "text/plain");
+  });
+
+  auto listen_thread = std::thread([&svr] { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    listen_thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  SSLClient cli(HOST, PORT);
+  cli.enable_server_certificate_verification(false);
+  cli.set_keep_alive(true);
+
+  auto result = cli.Get("/hi");
+  ASSERT_TRUE(result);
+  EXPECT_EQ(StatusCode::OK_200, result->status);
+
+  result = cli.Get("/hi");
+  ASSERT_TRUE(result);
+  EXPECT_EQ(StatusCode::OK_200, result->status);
+
+  std::this_thread::sleep_for(std::chrono::seconds(2));
+
+  // Recoonect
+  result = cli.Get("/hi");
+  ASSERT_TRUE(result);
+  EXPECT_EQ(StatusCode::OK_200, result->status);
+
+  result = cli.Get("/hi");
+  ASSERT_TRUE(result);
+  EXPECT_EQ(StatusCode::OK_200, result->status);
 }
+#endif
 
 TEST(ClientProblemDetectionTest, ContentProvider) {
   Server svr;
@@ -3911,25 +4500,38 @@ TEST(ClientProblemDetectionTest, ContentProvider) {
         [](bool success) { ASSERT_FALSE(success); });
   });
 
+  svr.Get("/empty", [&](const Request & /*req*/, Response &res) {
+    res.set_content_provider(
+        0, "text/plain",
+        [&](size_t /*offset*/, size_t /*length*/, DataSink & /*sink*/) -> bool {
+          EXPECT_TRUE(false);
+          return true;
+        },
+        [](bool success) { ASSERT_FALSE(success); });
+  });
+
   auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
-  while (!svr.is_running()) {
-    std::this_thread::sleep_for(std::chrono::milliseconds(1));
-  }
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    listen_thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
 
-  // Give GET time to get a few messages.
-  std::this_thread::sleep_for(std::chrono::seconds(1));
+  svr.wait_until_ready();
 
   Client cli("localhost", PORT);
 
-  auto res = cli.Get("/hi", [&](const char * /*data*/, size_t /*data_length*/) {
-    return false;
-  });
-
-  ASSERT_FALSE(res);
+  {
+    auto res = cli.Get("/hi", [&](const char * /*data*/,
+                                  size_t /*data_length*/) { return false; });
+    ASSERT_FALSE(res);
+  }
 
-  svr.stop();
-  listen_thread.join();
-  ASSERT_FALSE(svr.is_running());
+  {
+    auto res = cli.Get("/empty", [&](const char * /*data*/,
+                                     size_t /*data_length*/) { return false; });
+    ASSERT_TRUE(res);
+  }
 }
 
 TEST(ErrorHandlerWithContentProviderTest, ErrorHandler) {
@@ -3946,23 +4548,57 @@ TEST(ErrorHandlerWithContentProviderTest, ErrorHandler) {
   });
 
   auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
-  while (!svr.is_running()) {
-    std::this_thread::sleep_for(std::chrono::milliseconds(1));
-  }
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    listen_thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
 
-  // Give GET time to get a few messages.
-  std::this_thread::sleep_for(std::chrono::seconds(1));
+  svr.wait_until_ready();
 
   Client cli("localhost", PORT);
 
   auto res = cli.Get("/");
   ASSERT_TRUE(res);
-  EXPECT_EQ(404, res->status);
+  EXPECT_EQ(StatusCode::NotFound_404, res->status);
   EXPECT_EQ("helloworld", res->body);
+}
 
-  svr.stop();
-  listen_thread.join();
-  ASSERT_FALSE(svr.is_running());
+TEST(LongPollingTest, ClientCloseDetection) {
+  Server svr;
+
+  svr.Get("/events", [&](const Request & /*req*/, Response &res) {
+    res.set_chunked_content_provider(
+        "text/plain", [](std::size_t const, DataSink &sink) -> bool {
+          EXPECT_TRUE(sink.is_writable()); // the socket is alive
+          sink.os << "hello";
+
+          auto count = 10;
+          while (count > 0 && sink.is_writable()) {
+            this_thread::sleep_for(chrono::milliseconds(10));
+          }
+          EXPECT_FALSE(sink.is_writable()); // the socket is closed
+          return true;
+        });
+  });
+
+  auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    listen_thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  Client cli("localhost", PORT);
+
+  auto res = cli.Get("/events", [&](const char *data, size_t data_length) {
+    EXPECT_EQ("hello", string(data, data_length));
+    return false; // close the socket immediately.
+  });
+
+  ASSERT_FALSE(res);
 }
 
 TEST(GetWithParametersTest, GetWithParameters) {
@@ -3986,11 +4622,20 @@ TEST(GetWithParametersTest, GetWithParameters) {
     EXPECT_EQ("bar", req.get_param_value("param2"));
   });
 
+  svr.Get("/users/:id", [&](const Request &req, Response &) {
+    EXPECT_EQ("user-id", req.path_params.at("id"));
+    EXPECT_EQ("foo", req.get_param_value("param1"));
+    EXPECT_EQ("bar", req.get_param_value("param2"));
+  });
+
   auto listen_thread = std::thread([&svr]() { svr.listen(HOST, PORT); });
-  while (!svr.is_running()) {
-    std::this_thread::sleep_for(std::chrono::milliseconds(1));
-  }
-  std::this_thread::sleep_for(std::chrono::seconds(1));
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    listen_thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
 
   {
     Client cli(HOST, PORT);
@@ -4002,7 +4647,7 @@ TEST(GetWithParametersTest, GetWithParameters) {
     auto res = cli.Get("/", params, Headers{});
 
     ASSERT_TRUE(res);
-    EXPECT_EQ(200, res->status);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
   }
 
   {
@@ -4011,7 +4656,7 @@ TEST(GetWithParametersTest, GetWithParameters) {
     auto res = cli.Get("/params?hello=world&hello2=world2&hello3=world3");
 
     ASSERT_TRUE(res);
-    EXPECT_EQ(200, res->status);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
   }
 
   {
@@ -4020,12 +4665,17 @@ TEST(GetWithParametersTest, GetWithParameters) {
     auto res = cli.Get("/resources/resource-id?param1=foo&param2=bar");
 
     ASSERT_TRUE(res);
-    EXPECT_EQ(200, res->status);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
   }
 
-  svr.stop();
-  listen_thread.join();
-  ASSERT_FALSE(svr.is_running());
+  {
+    Client cli(HOST, PORT);
+
+    auto res = cli.Get("/users/user-id?param1=foo&param2=bar");
+
+    ASSERT_TRUE(res);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
+  }
 }
 
 TEST(GetWithParametersTest, GetWithParameters2) {
@@ -4037,10 +4687,13 @@ TEST(GetWithParametersTest, GetWithParameters2) {
   });
 
   auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
-  while (!svr.is_running()) {
-    std::this_thread::sleep_for(std::chrono::milliseconds(1));
-  }
-  std::this_thread::sleep_for(std::chrono::seconds(1));
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    listen_thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
 
   Client cli("localhost", PORT);
 
@@ -4055,31 +4708,40 @@ TEST(GetWithParametersTest, GetWithParameters2) {
                      });
 
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ("world", body);
-
-  svr.stop();
-  listen_thread.join();
-  ASSERT_FALSE(svr.is_running());
 }
 
 TEST(ClientDefaultHeadersTest, DefaultHeaders_Online) {
-  Client cli("httpbin.org");
+#ifdef CPPHTTPLIB_DEFAULT_HTTPBIN
+  auto host = "httpbin.org";
+  auto path = std::string{"/range/32"};
+#else
+  auto host = "nghttp2.org";
+  auto path = std::string{"/httpbin/range/32"};
+#endif
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  SSLClient cli(host);
+#else
+  Client cli(host);
+#endif
+
   cli.set_default_headers({make_range_header({{1, 10}})});
   cli.set_connection_timeout(5);
 
   {
-    auto res = cli.Get("/range/32");
+    auto res = cli.Get(path);
     ASSERT_TRUE(res);
     EXPECT_EQ("bcdefghijk", res->body);
-    EXPECT_EQ(206, res->status);
+    EXPECT_EQ(StatusCode::PartialContent_206, res->status);
   }
 
   {
-    auto res = cli.Get("/range/32");
+    auto res = cli.Get(path);
     ASSERT_TRUE(res);
     EXPECT_EQ("bcdefghijk", res->body);
-    EXPECT_EQ(206, res->status);
+    EXPECT_EQ(StatusCode::PartialContent_206, res->status);
   }
 }
 
@@ -4092,23 +4754,22 @@ TEST(ServerDefaultHeadersTest, DefaultHeaders) {
   });
 
   auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
-  while (!svr.is_running()) {
-    std::this_thread::sleep_for(std::chrono::milliseconds(1));
-  }
-  std::this_thread::sleep_for(std::chrono::seconds(1));
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    listen_thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
 
   Client cli("localhost", PORT);
 
   auto res = cli.Get("/");
 
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ("ok", res->body);
   EXPECT_EQ("World", res->get_header_value("Hello"));
-
-  svr.stop();
-  listen_thread.join();
-  ASSERT_FALSE(svr.is_running());
 }
 
 #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
@@ -4126,12 +4787,13 @@ TEST(KeepAliveTest, ReadTimeoutSSL) {
   });
 
   auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
-  while (!svr.is_running()) {
-    std::this_thread::sleep_for(std::chrono::milliseconds(1));
-  }
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    listen_thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
 
-  // Give GET time to get a few messages.
-  std::this_thread::sleep_for(std::chrono::seconds(1));
+  svr.wait_until_ready();
 
   SSLClient cli("localhost", PORT);
   cli.enable_server_certificate_verification(false);
@@ -4144,12 +4806,8 @@ TEST(KeepAliveTest, ReadTimeoutSSL) {
 
   auto resb = cli.Get("/b");
   ASSERT_TRUE(resb);
-  EXPECT_EQ(200, resb->status);
+  EXPECT_EQ(StatusCode::OK_200, resb->status);
   EXPECT_EQ("b", resb->body);
-
-  svr.stop();
-  listen_thread.join();
-  ASSERT_FALSE(svr.is_running());
 }
 #endif
 
@@ -4172,11 +4830,10 @@ class ServerTestWithAI_PASSIVE : public ::testing::Test {
       res.set_content("Hello World!", "text/plain");
     });
 
-    t_ = thread([&]() { ASSERT_TRUE(svr_.listen(nullptr, PORT, AI_PASSIVE)); });
+    t_ = thread(
+        [&]() { ASSERT_TRUE(svr_.listen(std::string(), PORT, AI_PASSIVE)); });
 
-    while (!svr_.is_running()) {
-      std::this_thread::sleep_for(std::chrono::milliseconds(1));
-    }
+    svr_.wait_until_ready();
   }
 
   virtual void TearDown() {
@@ -4197,7 +4854,7 @@ class ServerTestWithAI_PASSIVE : public ::testing::Test {
 TEST_F(ServerTestWithAI_PASSIVE, GetMethod200) {
   auto res = cli_.Get("/hi");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
   EXPECT_EQ("Hello World!", res->body);
 }
@@ -4213,9 +4870,7 @@ class ServerUpDownTest : public ::testing::Test {
       ASSERT_TRUE(svr_.listen_after_bind());
     });
 
-    while (!svr_.is_running()) {
-      std::this_thread::sleep_for(std::chrono::milliseconds(1));
-    }
+    svr_.wait_until_ready();
   }
 
   virtual void TearDown() {
@@ -4256,9 +4911,7 @@ class PayloadMaxLengthTest : public ::testing::Test {
 
     t_ = thread([&]() { ASSERT_TRUE(svr_.listen(HOST, PORT)); });
 
-    while (!svr_.is_running()) {
-      std::this_thread::sleep_for(std::chrono::milliseconds(1));
-    }
+    svr_.wait_until_ready();
   }
 
   virtual void TearDown() {
@@ -4279,13 +4932,33 @@ class PayloadMaxLengthTest : public ::testing::Test {
 TEST_F(PayloadMaxLengthTest, ExceedLimit) {
   auto res = cli_.Post("/test", "123456789", "text/plain");
   ASSERT_TRUE(res);
-  EXPECT_EQ(413, res->status);
+  EXPECT_EQ(StatusCode::PayloadTooLarge_413, res->status);
 
   res = cli_.Post("/test", "12345678", "text/plain");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST(HostAndPortPropertiesTest, NoSSL) {
+  httplib::Client cli("www.google.com", 1234);
+  ASSERT_EQ("www.google.com", cli.host());
+  ASSERT_EQ(1234, cli.port());
+}
+
+TEST(HostAndPortPropertiesTest, NoSSLWithSimpleAPI) {
+  httplib::Client cli("www.google.com:1234");
+  ASSERT_EQ("www.google.com", cli.host());
+  ASSERT_EQ(1234, cli.port());
 }
 
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+TEST(HostAndPortPropertiesTest, SSL) {
+  httplib::SSLClient cli("www.google.com");
+  ASSERT_EQ("www.google.com", cli.host());
+  ASSERT_EQ(443, cli.port());
+}
+#endif
+
 #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
 TEST(SSLClientTest, UpdateCAStore) {
   httplib::SSLClient httplib_client("www.google.com");
@@ -4301,17 +4974,25 @@ TEST(SSLClientTest, UpdateCAStore) {
 }
 
 TEST(SSLClientTest, ServerNameIndication_Online) {
-  SSLClient cli("httpbin.org", 443);
-  auto res = cli.Get("/get");
+#ifdef CPPHTTPLIB_DEFAULT_HTTPBIN
+  auto host = "httpbin.org";
+  auto path = std::string{"/get"};
+#else
+  auto host = "nghttp2.org";
+  auto path = std::string{"/httpbin/get"};
+#endif
+
+  SSLClient cli(host, 443);
+  auto res = cli.Get(path);
   ASSERT_TRUE(res);
-  ASSERT_EQ(200, res->status);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
 }
 
 TEST(SSLClientTest, ServerCertificateVerification1_Online) {
-  SSLClient cli("google.com");
+  Client cli("https://google.com");
   auto res = cli.Get("/");
   ASSERT_TRUE(res);
-  ASSERT_EQ(301, res->status);
+  ASSERT_EQ(StatusCode::MovedPermanently_301, res->status);
 }
 
 TEST(SSLClientTest, ServerCertificateVerification2_Online) {
@@ -4328,7 +5009,7 @@ TEST(SSLClientTest, ServerCertificateVerification3_Online) {
   cli.set_ca_cert_path(CA_CERT_FILE);
   auto res = cli.Get("/");
   ASSERT_TRUE(res);
-  ASSERT_EQ(301, res->status);
+  ASSERT_EQ(StatusCode::MovedPermanently_301, res->status);
 }
 
 TEST(SSLClientTest, ServerCertificateVerification4) {
@@ -4342,7 +5023,12 @@ TEST(SSLClientTest, ServerCertificateVerification4) {
   });
 
   thread t = thread([&]() { ASSERT_TRUE(svr.listen("127.0.0.1", PORT)); });
-  std::this_thread::sleep_for(std::chrono::milliseconds(1));
+  auto se = detail::scope_exit([&] {
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
 
   SSLClient cli("127.0.0.1", PORT);
   cli.set_ca_cert_path(SERVER_CERT2_FILE);
@@ -4351,9 +5037,50 @@ TEST(SSLClientTest, ServerCertificateVerification4) {
 
   auto res = cli.Get("/test");
   ASSERT_TRUE(res);
-  ASSERT_EQ(200, res->status);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
+}
 
-  t.join();
+TEST(SSLClientTest, ServerCertificateVerification5_Online) {
+  std::string cert;
+  detail::read_file(CA_CERT_FILE, cert);
+
+  SSLClient cli("google.com");
+  cli.load_ca_cert_store(cert.data(), cert.size());
+  const auto res = cli.Get("/");
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::MovedPermanently_301, res->status);
+}
+
+TEST(SSLClientTest, ServerCertificateVerification6_Online) {
+  // clang-format off
+  static constexpr char cert[] =
+    "GlobalSign Root CA\n"
+    "==================\n"
+    "-----BEGIN CERTIFICATE-----\n"
+    "MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkGA1UEBhMCQkUx\n"
+    "GTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jvb3QgQ0ExGzAZBgNVBAMTEkds\n"
+    "b2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAwMDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNV\n"
+    "BAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYD\n"
+    "VQQDExJHbG9iYWxTaWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDa\n"
+    "DuaZjc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavpxy0Sy6sc\n"
+    "THAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp1Wrjsok6Vjk4bwY8iGlb\n"
+    "Kk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdGsnUOhugZitVtbNV4FpWi6cgKOOvyJBNP\n"
+    "c1STE4U6G7weNLWLBYy5d4ux2x8gkasJU26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrX\n"
+    "gzT/LCrBbBlDSgeF59N89iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV\n"
+    "HRMBAf8EBTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0BAQUF\n"
+    "AAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOzyj1hTdNGCbM+w6Dj\n"
+    "Y1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE38NflNUVyRRBnMRddWQVDf9VMOyG\n"
+    "j/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymPAbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhH\n"
+    "hm4qxFYxldBniYUr+WymXUadDKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveC\n"
+    "X4XSQRjbgbMEHMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==\n"
+    "-----END CERTIFICATE-----\n";
+  // clang-format on
+
+  SSLClient cli("google.com");
+  cli.load_ca_cert_store(cert, sizeof(cert));
+  const auto res = cli.Get("/");
+  ASSERT_TRUE(res);
+  ASSERT_EQ(StatusCode::MovedPermanently_301, res->status);
 }
 
 TEST(SSLClientTest, WildcardHostNameMatch_Online) {
@@ -4365,7 +5092,7 @@ TEST(SSLClientTest, WildcardHostNameMatch_Online) {
 
   auto res = cli.Get("/");
   ASSERT_TRUE(res);
-  ASSERT_EQ(200, res->status);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
 }
 
 #if 0
@@ -4378,7 +5105,7 @@ TEST(SSLClientTest, SetInterfaceWithINET6) {
 
   auto res = cli->Get("/get");
   ASSERT_TRUE(res);
-  ASSERT_EQ(200, res->status);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
 }
 #endif
 
@@ -4412,7 +5139,12 @@ TEST(SSLClientServerTest, ClientCertPresent) {
   });
 
   thread t = thread([&]() { ASSERT_TRUE(svr.listen(HOST, PORT)); });
-  std::this_thread::sleep_for(std::chrono::milliseconds(1));
+  auto se = detail::scope_exit([&] {
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
 
   SSLClient cli(HOST, PORT, CLIENT_CERT_FILE, CLIENT_PRIVATE_KEY_FILE);
   cli.enable_server_certificate_verification(false);
@@ -4420,9 +5152,7 @@ TEST(SSLClientServerTest, ClientCertPresent) {
 
   auto res = cli.Get("/test");
   ASSERT_TRUE(res);
-  ASSERT_EQ(200, res->status);
-
-  t.join();
+  ASSERT_EQ(StatusCode::OK_200, res->status);
 }
 
 #if !defined(_WIN32) || defined(OPENSSL_USE_APPLINK)
@@ -4484,7 +5214,12 @@ TEST(SSLClientServerTest, MemoryClientCertPresent) {
   });
 
   thread t = thread([&]() { ASSERT_TRUE(svr.listen(HOST, PORT)); });
-  std::this_thread::sleep_for(std::chrono::milliseconds(1));
+  auto se = detail::scope_exit([&] {
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
 
   SSLClient cli(HOST, PORT, client_cert, client_private_key);
   cli.enable_server_certificate_verification(false);
@@ -4492,14 +5227,12 @@ TEST(SSLClientServerTest, MemoryClientCertPresent) {
 
   auto res = cli.Get("/test");
   ASSERT_TRUE(res);
-  ASSERT_EQ(200, res->status);
+  ASSERT_EQ(StatusCode::OK_200, res->status);
 
   X509_free(server_cert);
   EVP_PKEY_free(server_private_key);
   X509_free(client_cert);
   EVP_PKEY_free(client_private_key);
-
-  t.join();
 }
 #endif
 
@@ -4511,17 +5244,19 @@ TEST(SSLClientServerTest, ClientCertMissing) {
   svr.Get("/test", [&](const Request &, Response &) { ASSERT_TRUE(false); });
 
   thread t = thread([&]() { ASSERT_TRUE(svr.listen(HOST, PORT)); });
-  std::this_thread::sleep_for(std::chrono::milliseconds(1));
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
 
   SSLClient cli(HOST, PORT);
   auto res = cli.Get("/test");
   cli.set_connection_timeout(30);
   ASSERT_TRUE(!res);
   EXPECT_EQ(Error::SSLServerVerification, res.error());
-
-  svr.stop();
-
-  t.join();
 }
 
 TEST(SSLClientServerTest, TrustDirOptional) {
@@ -4534,7 +5269,12 @@ TEST(SSLClientServerTest, TrustDirOptional) {
   });
 
   thread t = thread([&]() { ASSERT_TRUE(svr.listen(HOST, PORT)); });
-  std::this_thread::sleep_for(std::chrono::milliseconds(1));
+  auto se = detail::scope_exit([&] {
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
 
   SSLClient cli(HOST, PORT, CLIENT_CERT_FILE, CLIENT_PRIVATE_KEY_FILE);
   cli.enable_server_certificate_verification(false);
@@ -4542,9 +5282,7 @@ TEST(SSLClientServerTest, TrustDirOptional) {
 
   auto res = cli.Get("/test");
   ASSERT_TRUE(res);
-  ASSERT_EQ(200, res->status);
-
-  t.join();
+  ASSERT_EQ(StatusCode::OK_200, res->status);
 }
 
 TEST(SSLClientServerTest, SSLConnectTimeout) {
@@ -4557,12 +5295,12 @@ TEST(SSLClientServerTest, SSLConnectTimeout) {
                     client_ca_cert_dir_path),
           stop_(false) {}
 
-    bool stop_;
+    std::atomic_bool stop_;
 
   private:
     bool process_and_close_socket(socket_t /*sock*/) override {
       // Don't create SSL context
-      while (!stop_) {
+      while (!stop_.load()) {
         std::this_thread::sleep_for(std::chrono::milliseconds(100));
       }
       return true;
@@ -4577,7 +5315,14 @@ TEST(SSLClientServerTest, SSLConnectTimeout) {
   });
 
   thread t = thread([&]() { ASSERT_TRUE(svr.listen(HOST, PORT)); });
-  std::this_thread::sleep_for(std::chrono::milliseconds(1));
+  auto se = detail::scope_exit([&] {
+    svr.stop_ = true;
+    svr.stop();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
 
   SSLClient cli(HOST, PORT, CLIENT_CERT_FILE, CLIENT_PRIVATE_KEY_FILE);
   cli.enable_server_certificate_verification(false);
@@ -4586,10 +5331,6 @@ TEST(SSLClientServerTest, SSLConnectTimeout) {
   auto res = cli.Get("/test");
   ASSERT_TRUE(!res);
   EXPECT_EQ(Error::SSLConnection, res.error());
-
-  svr.stop_ = true;
-  svr.stop();
-  t.join();
 }
 
 TEST(SSLClientServerTest, CustomizeServerSSLCtx) {
@@ -4648,7 +5389,12 @@ TEST(SSLClientServerTest, CustomizeServerSSLCtx) {
   });
 
   thread t = thread([&]() { ASSERT_TRUE(svr.listen(HOST, PORT)); });
-  std::this_thread::sleep_for(std::chrono::milliseconds(1));
+  auto se = detail::scope_exit([&] {
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
 
   SSLClient cli(HOST, PORT, CLIENT_CERT_FILE, CLIENT_PRIVATE_KEY_FILE);
   cli.enable_server_certificate_verification(false);
@@ -4656,9 +5402,7 @@ TEST(SSLClientServerTest, CustomizeServerSSLCtx) {
 
   auto res = cli.Get("/test");
   ASSERT_TRUE(res);
-  ASSERT_EQ(200, res->status);
-
-  t.join();
+  ASSERT_EQ(StatusCode::OK_200, res->status);
 }
 
 // Disabled due to the out-of-memory problem on GitHub Actions Workflows
@@ -4682,9 +5426,13 @@ TEST(SSLClientServerTest, DISABLED_LargeDataTransfer) {
   });
 
   auto listen_thread = std::thread([&svr]() { svr.listen("localhost", PORT); });
-  while (!svr.is_running()) {
-    std::this_thread::sleep_for(std::chrono::milliseconds(1));
-  }
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    listen_thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
 
   // client POST
   SSLClient cli("localhost", PORT);
@@ -4695,14 +5443,9 @@ TEST(SSLClientServerTest, DISABLED_LargeDataTransfer) {
                       large_size_byte, "application/octet-stream");
 
   // compare
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ(large_size_byte, res->body.size());
   EXPECT_EQ(0, std::memcmp(binary.data(), res->body.data(), large_size_byte));
-
-  // cleanup
-  svr.stop();
-  listen_thread.join();
-  ASSERT_FALSE(svr.is_running());
 }
 #endif
 
@@ -4739,8 +5482,76 @@ TEST(SendAPI, SimpleInterface_Online) {
   auto res = cli.send(req);
 
   ASSERT_TRUE(res);
-  EXPECT_EQ(301, res->status);
+  EXPECT_EQ(StatusCode::MovedPermanently_301, res->status);
+}
+
+TEST(ClientImplMethods, GetSocketTest) {
+  httplib::Server svr;
+  svr.Get("/", [&](const httplib::Request & /*req*/, httplib::Response &res) {
+    res.status = StatusCode::OK_200;
+  });
+
+  auto thread = std::thread([&]() { svr.listen("127.0.0.1", 3333); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  {
+    httplib::Client cli("http://127.0.0.1:3333");
+    cli.set_keep_alive(true);
+
+    // Use the behavior of cpp-httplib of opening the connection
+    // only when the first request happens. If that changes,
+    // this test would be obsolete.
+
+    EXPECT_EQ(cli.socket(), INVALID_SOCKET);
+
+    // This also implicitly tests the server. But other tests would fail much
+    // earlier than this one to be considered.
+
+    auto res = cli.Get("/");
+    ASSERT_TRUE(res);
+
+    EXPECT_EQ(StatusCode::OK_200, res->status);
+    ASSERT_TRUE(cli.socket() != INVALID_SOCKET);
+  }
+}
+
+// Disabled due to out-of-memory problem on GitHub Actions
+#ifdef _WIN64
+TEST(ServerLargeContentTest, DISABLED_SendLargeContent) {
+  // allocate content size larger than 2GB in memory
+  const size_t content_size = 2LL * 1024LL * 1024LL * 1024LL + 1LL;
+  char *content = (char *)malloc(content_size);
+  ASSERT_TRUE(content);
+
+  Server svr;
+  svr.Get("/foo",
+          [=](const httplib::Request & /*req*/, httplib::Response &res) {
+            res.set_content(content, content_size, "application/octet-stream");
+          });
+
+  auto listen_thread = std::thread([&svr]() { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    listen_thread.join();
+    if (content) free(content);
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  Client cli(HOST, PORT);
+  auto res = cli.Get("/foo");
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ(content_size, res->body.length());
 }
+#endif
 
 #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
 TEST(YahooRedirectTest2, SimpleInterface_Online) {
@@ -4748,13 +5559,13 @@ TEST(YahooRedirectTest2, SimpleInterface_Online) {
 
   auto res = cli.Get("/");
   ASSERT_TRUE(res);
-  EXPECT_EQ(301, res->status);
+  EXPECT_EQ(StatusCode::MovedPermanently_301, res->status);
 
   cli.set_follow_location(true);
   res = cli.Get("/");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
-  EXPECT_EQ("https://yahoo.com/", res->location);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ("https://www.yahoo.com/", res->location);
 }
 
 TEST(YahooRedirectTest3, SimpleInterface_Online) {
@@ -4762,12 +5573,12 @@ TEST(YahooRedirectTest3, SimpleInterface_Online) {
 
   auto res = cli.Get("/");
   ASSERT_TRUE(res);
-  EXPECT_EQ(301, res->status);
+  EXPECT_EQ(StatusCode::MovedPermanently_301, res->status);
 
   cli.set_follow_location(true);
   res = cli.Get("/");
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ("https://www.yahoo.com/", res->location);
 }
 
@@ -4781,17 +5592,17 @@ TEST(YahooRedirectTest3, NewResultInterface_Online) {
   ASSERT_FALSE(res == nullptr);
   ASSERT_TRUE(res != nullptr);
   EXPECT_EQ(Error::Success, res.error());
-  EXPECT_EQ(301, res.value().status);
-  EXPECT_EQ(301, (*res).status);
-  EXPECT_EQ(301, res->status);
+  EXPECT_EQ(StatusCode::MovedPermanently_301, res.value().status);
+  EXPECT_EQ(StatusCode::MovedPermanently_301, (*res).status);
+  EXPECT_EQ(StatusCode::MovedPermanently_301, res->status);
 
   cli.set_follow_location(true);
   res = cli.Get("/");
   ASSERT_TRUE(res);
   EXPECT_EQ(Error::Success, res.error());
-  EXPECT_EQ(200, res.value().status);
-  EXPECT_EQ(200, (*res).status);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res.value().status);
+  EXPECT_EQ(StatusCode::OK_200, (*res).status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ("https://www.yahoo.com/", res->location);
 }
 
@@ -4802,7 +5613,7 @@ TEST(DecodeWithChunkedEncoding, BrotliEncoding_Online) {
       cli.Get("/ajax/libs/jquery/3.5.1/jquery.js", {{"Accept-Encoding", "br"}});
 
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ(287630U, res->body.size());
   EXPECT_EQ("application/javascript; charset=utf-8",
             res->get_header_value("Content-Type"));
@@ -4817,7 +5628,7 @@ TEST(HttpsToHttpRedirectTest, SimpleInterface_Online) {
               "redirect-to?url=http%3A%2F%2Fwww.google.com&status_code=302");
 
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
 }
 
 TEST(HttpsToHttpRedirectTest2, SimpleInterface_Online) {
@@ -4830,7 +5641,7 @@ TEST(HttpsToHttpRedirectTest2, SimpleInterface_Online) {
 
   auto res = cli.Get("/httpbin/redirect-to", params, Headers{});
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
 }
 
 TEST(HttpsToHttpRedirectTest3, SimpleInterface_Online) {
@@ -4842,7 +5653,7 @@ TEST(HttpsToHttpRedirectTest3, SimpleInterface_Online) {
 
   auto res = cli.Get("/httpbin/redirect-to?status_code=302", params, Headers{});
   ASSERT_TRUE(res);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
 }
 
 TEST(HttpToHttpsRedirectTest, CertFile) {
@@ -4862,7 +5673,14 @@ TEST(HttpToHttpsRedirectTest, CertFile) {
 
   thread t = thread([&]() { ASSERT_TRUE(svr.listen("127.0.0.1", PORT)); });
   thread t2 = thread([&]() { ASSERT_TRUE(ssl_svr.listen("127.0.0.1", 1235)); });
-  std::this_thread::sleep_for(std::chrono::milliseconds(1));
+  auto se = detail::scope_exit([&] {
+    t2.join();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+  ssl_svr.wait_until_ready();
 
   Client cli("127.0.0.1", PORT);
   cli.set_ca_cert_path(SERVER_CERT2_FILE);
@@ -4872,10 +5690,7 @@ TEST(HttpToHttpsRedirectTest, CertFile) {
 
   auto res = cli.Get("/index");
   ASSERT_TRUE(res);
-  ASSERT_EQ(200, res->status);
-
-  t.join();
-  t2.join();
+  ASSERT_EQ(StatusCode::OK_200, res->status);
 }
 
 TEST(MultipartFormDataTest, LargeData) {
@@ -4914,10 +5729,13 @@ TEST(MultipartFormDataTest, LargeData) {
   });
 
   auto t = std::thread([&]() { svr.listen("localhost", 8080); });
-  while (!svr.is_running()) {
-    std::this_thread::sleep_for(std::chrono::milliseconds(1));
-  }
-  std::this_thread::sleep_for(std::chrono::seconds(1));
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
 
   {
     std::string data(1024 * 1024 * 2, '.');
@@ -4934,11 +5752,1158 @@ TEST(MultipartFormDataTest, LargeData) {
 
     auto res = cli.Post("/post", items);
     ASSERT_TRUE(res);
-    ASSERT_EQ(200, res->status);
+    ASSERT_EQ(StatusCode::OK_200, res->status);
   }
+}
 
-  svr.stop();
-  t.join();
+TEST(MultipartFormDataTest, DataProviderItems) {
+
+  std::random_device seed_gen;
+  std::mt19937 random(seed_gen());
+
+  std::string rand1;
+  rand1.resize(1000);
+  std::generate(rand1.begin(), rand1.end(), [&]() { return random(); });
+
+  std::string rand2;
+  rand2.resize(3000);
+  std::generate(rand2.begin(), rand2.end(), [&]() { return random(); });
+
+  SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE);
+
+  svr.Post("/post-none", [&](const Request &req, Response & /*res*/,
+                             const ContentReader &content_reader) {
+    ASSERT_FALSE(req.is_multipart_form_data());
+
+    std::string body;
+    content_reader([&](const char *data, size_t data_length) {
+      body.append(data, data_length);
+      return true;
+    });
+
+    EXPECT_EQ(body, "");
+  });
+
+  svr.Post("/post-items", [&](const Request &req, Response & /*res*/,
+                              const ContentReader &content_reader) {
+    ASSERT_TRUE(req.is_multipart_form_data());
+    MultipartFormDataItems files;
+    content_reader(
+        [&](const MultipartFormData &file) {
+          files.push_back(file);
+          return true;
+        },
+        [&](const char *data, size_t data_length) {
+          files.back().content.append(data, data_length);
+          return true;
+        });
+
+    ASSERT_TRUE(files.size() == 2);
+
+    EXPECT_EQ(std::string(files[0].name), "name1");
+    EXPECT_EQ(files[0].content, "Testing123");
+    EXPECT_EQ(files[0].filename, "filename1");
+    EXPECT_EQ(files[0].content_type, "application/octet-stream");
+
+    EXPECT_EQ(files[1].name, "name2");
+    EXPECT_EQ(files[1].content, "Testing456");
+    EXPECT_EQ(files[1].filename, "");
+    EXPECT_EQ(files[1].content_type, "");
+  });
+
+  svr.Post("/post-providers", [&](const Request &req, Response & /*res*/,
+                                  const ContentReader &content_reader) {
+    ASSERT_TRUE(req.is_multipart_form_data());
+    MultipartFormDataItems files;
+    content_reader(
+        [&](const MultipartFormData &file) {
+          files.push_back(file);
+          return true;
+        },
+        [&](const char *data, size_t data_length) {
+          files.back().content.append(data, data_length);
+          return true;
+        });
+
+    ASSERT_TRUE(files.size() == 2);
+
+    EXPECT_EQ(files[0].name, "name3");
+    EXPECT_EQ(files[0].content, rand1);
+    EXPECT_EQ(files[0].filename, "filename3");
+    EXPECT_EQ(files[0].content_type, "");
+
+    EXPECT_EQ(files[1].name, "name4");
+    EXPECT_EQ(files[1].content, rand2);
+    EXPECT_EQ(files[1].filename, "filename4");
+    EXPECT_EQ(files[1].content_type, "");
+  });
+
+  svr.Post("/post-both", [&](const Request &req, Response & /*res*/,
+                             const ContentReader &content_reader) {
+    ASSERT_TRUE(req.is_multipart_form_data());
+    MultipartFormDataItems files;
+    content_reader(
+        [&](const MultipartFormData &file) {
+          files.push_back(file);
+          return true;
+        },
+        [&](const char *data, size_t data_length) {
+          files.back().content.append(data, data_length);
+          return true;
+        });
+
+    ASSERT_TRUE(files.size() == 4);
+
+    EXPECT_EQ(std::string(files[0].name), "name1");
+    EXPECT_EQ(files[0].content, "Testing123");
+    EXPECT_EQ(files[0].filename, "filename1");
+    EXPECT_EQ(files[0].content_type, "application/octet-stream");
+
+    EXPECT_EQ(files[1].name, "name2");
+    EXPECT_EQ(files[1].content, "Testing456");
+    EXPECT_EQ(files[1].filename, "");
+    EXPECT_EQ(files[1].content_type, "");
+
+    EXPECT_EQ(files[2].name, "name3");
+    EXPECT_EQ(files[2].content, rand1);
+    EXPECT_EQ(files[2].filename, "filename3");
+    EXPECT_EQ(files[2].content_type, "");
+
+    EXPECT_EQ(files[3].name, "name4");
+    EXPECT_EQ(files[3].content, rand2);
+    EXPECT_EQ(files[3].filename, "filename4");
+    EXPECT_EQ(files[3].content_type, "");
+  });
+
+  auto t = std::thread([&]() { svr.listen("localhost", 8080); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  {
+    Client cli("https://localhost:8080");
+    cli.enable_server_certificate_verification(false);
+
+    MultipartFormDataItems items{
+        {"name1", "Testing123", "filename1", "application/octet-stream"},
+        {"name2", "Testing456", "", ""}, // not a file
+    };
+
+    {
+      auto res = cli.Post("/post-none", {}, {}, {});
+      ASSERT_TRUE(res);
+      ASSERT_EQ(StatusCode::OK_200, res->status);
+    }
+
+    MultipartFormDataProviderItems providers;
+
+    {
+      auto res =
+          cli.Post("/post-items", {}, items, providers); // empty providers
+      ASSERT_TRUE(res);
+      ASSERT_EQ(StatusCode::OK_200, res->status);
+    }
+
+    providers.push_back({"name3",
+                         [&](size_t offset, httplib::DataSink &sink) -> bool {
+                           // test the offset is given correctly at each step
+                           if (!offset)
+                             sink.os.write(rand1.data(), 30);
+                           else if (offset == 30)
+                             sink.os.write(rand1.data() + 30, 300);
+                           else if (offset == 330)
+                             sink.os.write(rand1.data() + 330, 670);
+                           else if (offset == rand1.size())
+                             sink.done();
+                           return true;
+                         },
+                         "filename3",
+                         {}});
+
+    providers.push_back({"name4",
+                         [&](size_t offset, httplib::DataSink &sink) -> bool {
+                           // test the offset is given correctly at each step
+                           if (!offset)
+                             sink.os.write(rand2.data(), 2000);
+                           else if (offset == 2000)
+                             sink.os.write(rand2.data() + 2000, 1);
+                           else if (offset == 2001)
+                             sink.os.write(rand2.data() + 2001, 999);
+                           else if (offset == rand2.size())
+                             sink.done();
+                           return true;
+                         },
+                         "filename4",
+                         {}});
+
+    {
+      auto res = cli.Post("/post-providers", {}, {}, providers);
+      ASSERT_TRUE(res);
+      ASSERT_EQ(StatusCode::OK_200, res->status);
+    }
+
+    {
+      auto res = cli.Post("/post-both", {}, items, providers);
+      ASSERT_TRUE(res);
+      ASSERT_EQ(StatusCode::OK_200, res->status);
+    }
+  }
 }
-#endif
 
+TEST(MultipartFormDataTest, BadHeader) {
+  Server svr;
+  svr.Post("/post", [&](const Request & /*req*/, Response &res) {
+    res.set_content("ok", "text/plain");
+  });
+
+  thread t = thread([&] { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  const std::string body =
+      "This is the preamble.  It is to be ignored, though it\r\n"
+      "is a handy place for composition agents to include an\r\n"
+      "explanatory note to non-MIME conformant readers.\r\n"
+      "\r\n"
+      "\r\n"
+      "--simple boundary\r\n"
+      "Content-Disposition: form-data; name=\"field1\"\r\n"
+      ": BAD...\r\n"
+      "\r\n"
+      "value1\r\n"
+      "--simple boundary\r\n"
+      "Content-Disposition: form-data; name=\"field2\"; "
+      "filename=\"example.txt\"\r\n"
+      "\r\n"
+      "value2\r\n"
+      "--simple boundary--\r\n"
+      "This is the epilogue.  It is also to be ignored.\r\n";
+
+  std::string content_type =
+      R"(multipart/form-data; boundary="simple boundary")";
+
+  Client cli(HOST, PORT);
+  auto res = cli.Post("/post", body, content_type.c_str());
+
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::BadRequest_400, res->status);
+}
+
+TEST(MultipartFormDataTest, WithPreamble) {
+  Server svr;
+  svr.Post("/post", [&](const Request & /*req*/, Response &res) {
+    res.set_content("ok", "text/plain");
+  });
+
+  thread t = thread([&] { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  const std::string body =
+      "This is the preamble.  It is to be ignored, though it\r\n"
+      "is a handy place for composition agents to include an\r\n"
+      "explanatory note to non-MIME conformant readers.\r\n"
+      "\r\n"
+      "\r\n"
+      "--simple boundary\r\n"
+      "Content-Disposition: form-data; name=\"field1\"\r\n"
+      "\r\n"
+      "value1\r\n"
+      "--simple boundary\r\n"
+      "Content-Disposition: form-data; name=\"field2\"; "
+      "filename=\"example.txt\"\r\n"
+      "\r\n"
+      "value2\r\n"
+      "--simple boundary--\r\n"
+      "This is the epilogue.  It is also to be ignored.\r\n";
+
+  std::string content_type =
+      R"(multipart/form-data; boundary="simple boundary")";
+
+  Client cli(HOST, PORT);
+  auto res = cli.Post("/post", body, content_type.c_str());
+
+  ASSERT_TRUE(res);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
+}
+
+TEST(MultipartFormDataTest, PostCustomBoundary) {
+  SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE);
+
+  svr.Post("/post_customboundary", [&](const Request &req, Response & /*res*/,
+                                       const ContentReader &content_reader) {
+    if (req.is_multipart_form_data()) {
+      MultipartFormDataItems files;
+      content_reader(
+          [&](const MultipartFormData &file) {
+            files.push_back(file);
+            return true;
+          },
+          [&](const char *data, size_t data_length) {
+            files.back().content.append(data, data_length);
+            return true;
+          });
+
+      EXPECT_TRUE(std::string(files[0].name) == "document");
+      EXPECT_EQ(size_t(1024 * 1024 * 2), files[0].content.size());
+      EXPECT_TRUE(files[0].filename == "2MB_data");
+      EXPECT_TRUE(files[0].content_type == "application/octet-stream");
+
+      EXPECT_TRUE(files[1].name == "hello");
+      EXPECT_TRUE(files[1].content == "world");
+      EXPECT_TRUE(files[1].filename == "");
+      EXPECT_TRUE(files[1].content_type == "");
+    } else {
+      std::string body;
+      content_reader([&](const char *data, size_t data_length) {
+        body.append(data, data_length);
+        return true;
+      });
+    }
+  });
+
+  auto t = std::thread([&]() { svr.listen("localhost", 8080); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  {
+    std::string data(1024 * 1024 * 2, '.');
+    std::stringstream buffer;
+    buffer << data;
+
+    Client cli("https://localhost:8080");
+    cli.enable_server_certificate_verification(false);
+
+    MultipartFormDataItems items{
+        {"document", buffer.str(), "2MB_data", "application/octet-stream"},
+        {"hello", "world", "", ""},
+    };
+
+    auto res = cli.Post("/post_customboundary", {}, items, "abc-abc");
+    ASSERT_TRUE(res);
+    ASSERT_EQ(StatusCode::OK_200, res->status);
+  }
+}
+
+TEST(MultipartFormDataTest, PostInvalidBoundaryChars) {
+  std::string data(1024 * 1024 * 2, '&');
+  std::stringstream buffer;
+  buffer << data;
+
+  Client cli("https://localhost:8080");
+
+  MultipartFormDataItems items{
+      {"document", buffer.str(), "2MB_data", "application/octet-stream"},
+      {"hello", "world", "", ""},
+  };
+
+  for (const char &c : " \t\r\n") {
+    auto res =
+        cli.Post("/invalid_boundary", {}, items, string("abc123").append(1, c));
+    ASSERT_EQ(Error::UnsupportedMultipartBoundaryChars, res.error());
+    ASSERT_FALSE(res);
+  }
+}
+
+TEST(MultipartFormDataTest, PutFormData) {
+  SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE);
+
+  svr.Put("/put", [&](const Request &req, const Response & /*res*/,
+                      const ContentReader &content_reader) {
+    if (req.is_multipart_form_data()) {
+      MultipartFormDataItems files;
+      content_reader(
+          [&](const MultipartFormData &file) {
+            files.push_back(file);
+            return true;
+          },
+          [&](const char *data, size_t data_length) {
+            files.back().content.append(data, data_length);
+            return true;
+          });
+
+      EXPECT_TRUE(std::string(files[0].name) == "document");
+      EXPECT_EQ(size_t(1024 * 1024 * 2), files[0].content.size());
+      EXPECT_TRUE(files[0].filename == "2MB_data");
+      EXPECT_TRUE(files[0].content_type == "application/octet-stream");
+
+      EXPECT_TRUE(files[1].name == "hello");
+      EXPECT_TRUE(files[1].content == "world");
+      EXPECT_TRUE(files[1].filename == "");
+      EXPECT_TRUE(files[1].content_type == "");
+    } else {
+      std::string body;
+      content_reader([&](const char *data, size_t data_length) {
+        body.append(data, data_length);
+        return true;
+      });
+    }
+  });
+
+  auto t = std::thread([&]() { svr.listen("localhost", 8080); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  {
+    std::string data(1024 * 1024 * 2, '&');
+    std::stringstream buffer;
+    buffer << data;
+
+    Client cli("https://localhost:8080");
+    cli.enable_server_certificate_verification(false);
+
+    MultipartFormDataItems items{
+        {"document", buffer.str(), "2MB_data", "application/octet-stream"},
+        {"hello", "world", "", ""},
+    };
+
+    auto res = cli.Put("/put", items);
+    ASSERT_TRUE(res);
+    ASSERT_EQ(StatusCode::OK_200, res->status);
+  }
+}
+
+TEST(MultipartFormDataTest, PutFormDataCustomBoundary) {
+  SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE);
+
+  svr.Put("/put_customboundary",
+          [&](const Request &req, const Response & /*res*/,
+              const ContentReader &content_reader) {
+            if (req.is_multipart_form_data()) {
+              MultipartFormDataItems files;
+              content_reader(
+                  [&](const MultipartFormData &file) {
+                    files.push_back(file);
+                    return true;
+                  },
+                  [&](const char *data, size_t data_length) {
+                    files.back().content.append(data, data_length);
+                    return true;
+                  });
+
+              EXPECT_TRUE(std::string(files[0].name) == "document");
+              EXPECT_EQ(size_t(1024 * 1024 * 2), files[0].content.size());
+              EXPECT_TRUE(files[0].filename == "2MB_data");
+              EXPECT_TRUE(files[0].content_type == "application/octet-stream");
+
+              EXPECT_TRUE(files[1].name == "hello");
+              EXPECT_TRUE(files[1].content == "world");
+              EXPECT_TRUE(files[1].filename == "");
+              EXPECT_TRUE(files[1].content_type == "");
+            } else {
+              std::string body;
+              content_reader([&](const char *data, size_t data_length) {
+                body.append(data, data_length);
+                return true;
+              });
+            }
+          });
+
+  auto t = std::thread([&]() { svr.listen("localhost", 8080); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  {
+    std::string data(1024 * 1024 * 2, '&');
+    std::stringstream buffer;
+    buffer << data;
+
+    Client cli("https://localhost:8080");
+    cli.enable_server_certificate_verification(false);
+
+    MultipartFormDataItems items{
+        {"document", buffer.str(), "2MB_data", "application/octet-stream"},
+        {"hello", "world", "", ""},
+    };
+
+    auto res = cli.Put("/put_customboundary", {}, items, "abc-abc_");
+    ASSERT_TRUE(res);
+    ASSERT_EQ(StatusCode::OK_200, res->status);
+  }
+}
+
+TEST(MultipartFormDataTest, PutInvalidBoundaryChars) {
+  std::string data(1024 * 1024 * 2, '&');
+  std::stringstream buffer;
+  buffer << data;
+
+  Client cli("https://localhost:8080");
+  cli.enable_server_certificate_verification(false);
+
+  MultipartFormDataItems items{
+      {"document", buffer.str(), "2MB_data", "application/octet-stream"},
+      {"hello", "world", "", ""},
+  };
+
+  for (const char &c : " \t\r\n") {
+    auto res = cli.Put("/put", {}, items, string("abc123").append(1, c));
+    ASSERT_EQ(Error::UnsupportedMultipartBoundaryChars, res.error());
+    ASSERT_FALSE(res);
+  }
+}
+
+TEST(MultipartFormDataTest, AlternateFilename) {
+  auto handled = false;
+
+  Server svr;
+  svr.Post("/test", [&](const Request &req, Response &res) {
+    ASSERT_EQ(3u, req.files.size());
+
+    auto it = req.files.begin();
+    ASSERT_EQ("file1", it->second.name);
+    ASSERT_EQ("A.txt", it->second.filename);
+    ASSERT_EQ("text/plain", it->second.content_type);
+    ASSERT_EQ("Content of a.txt.\r\n", it->second.content);
+
+    ++it;
+    ASSERT_EQ("file2", it->second.name);
+    ASSERT_EQ("a.html", it->second.filename);
+    ASSERT_EQ("text/html", it->second.content_type);
+    ASSERT_EQ("<!DOCTYPE html><title>Content of a.html.</title>\r\n",
+              it->second.content);
+
+    ++it;
+    ASSERT_EQ("text", it->second.name);
+    ASSERT_EQ("", it->second.filename);
+    ASSERT_EQ("", it->second.content_type);
+    ASSERT_EQ("text default", it->second.content);
+
+    res.set_content("ok", "text/plain");
+
+    handled = true;
+  });
+
+  thread t = thread([&] { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+    ASSERT_TRUE(handled);
+  });
+
+  svr.wait_until_ready();
+
+  auto req = "POST /test HTTP/1.1\r\n"
+             "Content-Type: multipart/form-data;boundary=--------\r\n"
+             "Content-Length: 399\r\n"
+             "\r\n"
+             "----------\r\n"
+             "Content-Disposition: form-data; name=\"text\"\r\n"
+             "\r\n"
+             "text default\r\n"
+             "----------\r\n"
+             "Content-Disposition: form-data; filename*=\"UTF-8''%41.txt\"; "
+             "filename=\"a.txt\"; name=\"file1\"\r\n"
+             "Content-Type: text/plain\r\n"
+             "\r\n"
+             "Content of a.txt.\r\n"
+             "\r\n"
+             "----------\r\n"
+             "Content-Disposition: form-data;  name=\"file2\" ;filename = "
+             "\"a.html\"\r\n"
+             "Content-Type: text/html\r\n"
+             "\r\n"
+             "<!DOCTYPE html><title>Content of a.html.</title>\r\n"
+             "\r\n"
+             "------------\r\n";
+
+  ASSERT_TRUE(send_request(1, req));
+}
+
+TEST(MultipartFormDataTest, CloseDelimiterWithoutCRLF) {
+  auto handled = false;
+
+  Server svr;
+  svr.Post("/test", [&](const Request &req, Response &) {
+    ASSERT_EQ(2u, req.files.size());
+
+    auto it = req.files.begin();
+    ASSERT_EQ("text1", it->second.name);
+    ASSERT_EQ("text1", it->second.content);
+
+    ++it;
+    ASSERT_EQ("text2", it->second.name);
+    ASSERT_EQ("text2", it->second.content);
+
+    handled = true;
+  });
+
+  thread t = thread([&] { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+    ASSERT_TRUE(handled);
+  });
+
+  svr.wait_until_ready();
+
+  auto req = "POST /test HTTP/1.1\r\n"
+             "Content-Type: multipart/form-data;boundary=--------\r\n"
+             "Content-Length: 146\r\n"
+             "\r\n----------\r\n"
+             "Content-Disposition: form-data; name=\"text1\"\r\n"
+             "\r\n"
+             "text1"
+             "\r\n----------\r\n"
+             "Content-Disposition: form-data; name=\"text2\"\r\n"
+             "\r\n"
+             "text2"
+             "\r\n------------";
+
+  std::string resonse;
+  ASSERT_TRUE(send_request(1, req, &resonse));
+  ASSERT_EQ("200", resonse.substr(9, 3));
+}
+
+TEST(MultipartFormDataTest, ContentLength) {
+  auto handled = false;
+
+  Server svr;
+  svr.Post("/test", [&](const Request &req, Response &) {
+    ASSERT_EQ(2u, req.files.size());
+
+    auto it = req.files.begin();
+    ASSERT_EQ("text1", it->second.name);
+    ASSERT_EQ("text1", it->second.content);
+
+    ++it;
+    ASSERT_EQ("text2", it->second.name);
+    ASSERT_EQ("text2", it->second.content);
+
+    handled = true;
+  });
+
+  thread t = thread([&] { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+    ASSERT_TRUE(handled);
+  });
+
+  svr.wait_until_ready();
+
+  auto req = "POST /test HTTP/1.1\r\n"
+             "Content-Type: multipart/form-data;boundary=--------\r\n"
+             "Content-Length: 167\r\n"
+             "\r\n----------\r\n"
+             "Content-Disposition: form-data; name=\"text1\"\r\n"
+             "Content-Length: 5\r\n"
+             "\r\n"
+             "text1"
+             "\r\n----------\r\n"
+             "Content-Disposition: form-data; name=\"text2\"\r\n"
+             "\r\n"
+             "text2"
+             "\r\n------------\r\n";
+
+  std::string resonse;
+  ASSERT_TRUE(send_request(1, req, &resonse));
+  ASSERT_EQ("200", resonse.substr(9, 3));
+}
+
+#endif
+
+#ifndef _WIN32
+class UnixSocketTest : public ::testing::Test {
+protected:
+  void TearDown() override { std::remove(pathname_.c_str()); }
+
+  void client_GET(const std::string &addr) {
+    httplib::Client cli{addr};
+    cli.set_address_family(AF_UNIX);
+    ASSERT_TRUE(cli.is_valid());
+
+    const auto &result = cli.Get(pattern_);
+    ASSERT_TRUE(result) << "error: " << result.error();
+
+    const auto &resp = result.value();
+    EXPECT_EQ(resp.status, StatusCode::OK_200);
+    EXPECT_EQ(resp.body, content_);
+  }
+
+  const std::string pathname_{"./httplib-server.sock"};
+  const std::string pattern_{"/hi"};
+  const std::string content_{"Hello World!"};
+};
+
+TEST_F(UnixSocketTest, pathname) {
+  httplib::Server svr;
+  svr.Get(pattern_, [&](const httplib::Request &, httplib::Response &res) {
+    res.set_content(content_, "text/plain");
+  });
+
+  std::thread t{[&] {
+    ASSERT_TRUE(svr.set_address_family(AF_UNIX).listen(pathname_, 80));
+  }};
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+  ASSERT_TRUE(svr.is_running());
+
+  client_GET(pathname_);
+}
+
+#if defined(__linux__) ||                                                      \
+    /* __APPLE__ */ (defined(SOL_LOCAL) && defined(SO_PEERPID))
+TEST_F(UnixSocketTest, PeerPid) {
+  httplib::Server svr;
+  std::string remote_port_val;
+  svr.Get(pattern_, [&](const httplib::Request &req, httplib::Response &res) {
+    res.set_content(content_, "text/plain");
+    remote_port_val = req.get_header_value("REMOTE_PORT");
+  });
+
+  std::thread t{[&] {
+    ASSERT_TRUE(svr.set_address_family(AF_UNIX).listen(pathname_, 80));
+  }};
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+  ASSERT_TRUE(svr.is_running());
+
+  client_GET(pathname_);
+  EXPECT_EQ(std::to_string(getpid()), remote_port_val);
+}
+#endif
+
+#ifdef __linux__
+TEST_F(UnixSocketTest, abstract) {
+  constexpr char svr_path[]{"\x00httplib-server.sock"};
+  const std::string abstract_addr{svr_path, sizeof(svr_path) - 1};
+
+  httplib::Server svr;
+  svr.Get(pattern_, [&](const httplib::Request &, httplib::Response &res) {
+    res.set_content(content_, "text/plain");
+  });
+
+  std::thread t{[&] {
+    ASSERT_TRUE(svr.set_address_family(AF_UNIX).listen(abstract_addr, 80));
+  }};
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+  ASSERT_TRUE(svr.is_running());
+
+  client_GET(abstract_addr);
+}
+#endif
+
+TEST(SocketStream, is_writable_UNIX) {
+  int fds[2];
+  ASSERT_EQ(0, socketpair(AF_UNIX, SOCK_STREAM, 0, fds));
+
+  const auto asSocketStream = [&](socket_t fd,
+                                  std::function<bool(Stream &)> func) {
+    return detail::process_client_socket(fd, 0, 0, 0, 0, func);
+  };
+  asSocketStream(fds[0], [&](Stream &s0) {
+    EXPECT_EQ(s0.socket(), fds[0]);
+    EXPECT_TRUE(s0.is_writable());
+
+    EXPECT_EQ(0, close(fds[1]));
+    EXPECT_FALSE(s0.is_writable());
+
+    return true;
+  });
+  EXPECT_EQ(0, close(fds[0]));
+}
+
+TEST(SocketStream, is_writable_INET) {
+  sockaddr_in addr;
+  memset(&addr, 0, sizeof(addr));
+  addr.sin_family = AF_INET;
+  addr.sin_port = htons(PORT + 1);
+  addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+
+  int disconnected_svr_sock = -1;
+  std::thread svr{[&] {
+    const int s = socket(AF_INET, SOCK_STREAM, 0);
+    ASSERT_LE(0, s);
+    ASSERT_EQ(0, ::bind(s, reinterpret_cast<sockaddr *>(&addr), sizeof(addr)));
+    ASSERT_EQ(0, listen(s, 1));
+    ASSERT_LE(0, disconnected_svr_sock = accept(s, nullptr, nullptr));
+    ASSERT_EQ(0, close(s));
+  }};
+  std::this_thread::sleep_for(std::chrono::milliseconds(100));
+
+  std::thread cli{[&] {
+    const int s = socket(AF_INET, SOCK_STREAM, 0);
+    ASSERT_LE(0, s);
+    ASSERT_EQ(0, connect(s, reinterpret_cast<sockaddr *>(&addr), sizeof(addr)));
+    ASSERT_EQ(0, close(s));
+  }};
+  cli.join();
+  svr.join();
+  ASSERT_NE(disconnected_svr_sock, -1);
+
+  const auto asSocketStream = [&](socket_t fd,
+                                  std::function<bool(Stream &)> func) {
+    return detail::process_client_socket(fd, 0, 0, 0, 0, func);
+  };
+  asSocketStream(disconnected_svr_sock, [&](Stream &ss) {
+    EXPECT_EQ(ss.socket(), disconnected_svr_sock);
+    EXPECT_FALSE(ss.is_writable());
+
+    return true;
+  });
+
+  ASSERT_EQ(0, close(disconnected_svr_sock));
+}
+#endif // #ifndef _WIN32
+
+TEST(TaskQueueTest, IncreaseAtomicInteger) {
+  static constexpr unsigned int number_of_tasks{1000000};
+  std::atomic_uint count{0};
+  std::unique_ptr<TaskQueue> task_queue{
+      new ThreadPool{CPPHTTPLIB_THREAD_POOL_COUNT}};
+
+  for (unsigned int i = 0; i < number_of_tasks; ++i) {
+    auto queued = task_queue->enqueue(
+        [&count] { count.fetch_add(1, std::memory_order_relaxed); });
+    EXPECT_TRUE(queued);
+  }
+
+  EXPECT_NO_THROW(task_queue->shutdown());
+  EXPECT_EQ(number_of_tasks, count.load());
+}
+
+TEST(TaskQueueTest, IncreaseAtomicIntegerWithQueueLimit) {
+  static constexpr unsigned int number_of_tasks{1000000};
+  static constexpr unsigned int qlimit{2};
+  unsigned int queued_count{0};
+  std::atomic_uint count{0};
+  std::unique_ptr<TaskQueue> task_queue{
+      new ThreadPool{/*num_threads=*/1, qlimit}};
+
+  for (unsigned int i = 0; i < number_of_tasks; ++i) {
+    if (task_queue->enqueue(
+            [&count] { count.fetch_add(1, std::memory_order_relaxed); })) {
+      queued_count++;
+    }
+  }
+
+  EXPECT_NO_THROW(task_queue->shutdown());
+  EXPECT_EQ(queued_count, count.load());
+  EXPECT_TRUE(queued_count <= number_of_tasks);
+  EXPECT_TRUE(queued_count >= qlimit);
+}
+
+TEST(TaskQueueTest, MaxQueuedRequests) {
+  static constexpr unsigned int qlimit{3};
+  std::unique_ptr<TaskQueue> task_queue{new ThreadPool{1, qlimit}};
+  std::condition_variable sem_cv;
+  std::mutex sem_mtx;
+  int credits = 0;
+  bool queued;
+
+  /* Fill up the queue with tasks that will block until we give them credits to
+   * complete. */
+  for (unsigned int n = 0; n <= qlimit;) {
+    queued = task_queue->enqueue([&sem_mtx, &sem_cv, &credits] {
+      std::unique_lock<std::mutex> lock(sem_mtx);
+      while (credits <= 0) {
+        sem_cv.wait(lock);
+      }
+      /* Consume the credit and signal the test code if they are all gone. */
+      if (--credits == 0) { sem_cv.notify_one(); }
+    });
+
+    if (n < qlimit) {
+      /* The first qlimit enqueues must succeed. */
+      EXPECT_TRUE(queued);
+    } else {
+      /* The last one will succeed only when the worker thread
+       * starts and dequeues the first blocking task. Although
+       * not necessary for the correctness of this test, we sleep for
+       * a short while to avoid busy waiting. */
+      std::this_thread::sleep_for(std::chrono::milliseconds(10));
+    }
+    if (queued) { n++; }
+  }
+
+  /* Further enqueues must fail since the queue is full. */
+  for (auto i = 0; i < 4; i++) {
+    queued = task_queue->enqueue([] {});
+    EXPECT_FALSE(queued);
+  }
+
+  /* Give the credits to allow the previous tasks to complete. */
+  {
+    std::unique_lock<std::mutex> lock(sem_mtx);
+    credits += qlimit + 1;
+  }
+  sem_cv.notify_all();
+
+  /* Wait for all the credits to be consumed. */
+  {
+    std::unique_lock<std::mutex> lock(sem_mtx);
+    while (credits > 0) {
+      sem_cv.wait(lock);
+    }
+  }
+
+  /* Check that we are able again to enqueue at least qlimit tasks. */
+  for (unsigned int i = 0; i < qlimit; i++) {
+    queued = task_queue->enqueue([] {});
+    EXPECT_TRUE(queued);
+  }
+
+  EXPECT_NO_THROW(task_queue->shutdown());
+}
+
+TEST(RedirectTest, RedirectToUrlWithQueryParameters) {
+  Server svr;
+
+  svr.Get("/", [](const Request & /*req*/, Response &res) {
+    res.set_redirect(R"(/hello?key=val%26key2%3Dval2)");
+  });
+
+  svr.Get("/hello", [](const Request &req, Response &res) {
+    res.set_content(req.get_param_value("key"), "text/plain");
+  });
+
+  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  {
+    Client cli(HOST, PORT);
+    cli.set_follow_location(true);
+
+    auto res = cli.Get("/");
+    ASSERT_TRUE(res);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
+    EXPECT_EQ("val&key2=val2", res->body);
+  }
+}
+
+TEST(VulnerabilityTest, CRLFInjection) {
+  Server svr;
+
+  svr.Post("/test1", [](const Request & /*req*/, Response &res) {
+    res.set_content("Hello 1", "text/plain");
+  });
+
+  svr.Delete("/test2", [](const Request & /*req*/, Response &res) {
+    res.set_content("Hello 2", "text/plain");
+  });
+
+  svr.Put("/test3", [](const Request & /*req*/, Response &res) {
+    res.set_content("Hello 3", "text/plain");
+  });
+
+  svr.Patch("/test4", [](const Request & /*req*/, Response &res) {
+    res.set_content("Hello 4", "text/plain");
+  });
+
+  svr.set_logger([](const Request &req, const Response & /*res*/) {
+    for (const auto &x : req.headers) {
+      auto key = x.first;
+      EXPECT_STRNE("evil", key.c_str());
+    }
+  });
+
+  auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  {
+    Client cli(HOST, PORT);
+
+    cli.Post("/test1", "A=B",
+             "application/x-www-form-urlencoded\r\nevil: hello1");
+    cli.Delete("/test2", "A=B", "text/plain\r\nevil: hello2");
+    cli.Put("/test3", "text", "text/plain\r\nevil: hello3");
+    cli.Patch("/test4", "content", "text/plain\r\nevil: hello4");
+  }
+}
+
+TEST(PathParamsTest, StaticMatch) {
+  const auto pattern = "/users/all";
+  detail::PathParamsMatcher matcher(pattern);
+
+  Request request;
+  request.path = "/users/all";
+  ASSERT_TRUE(matcher.match(request));
+
+  std::unordered_map<std::string, std::string> expected_params = {};
+
+  EXPECT_EQ(request.path_params, expected_params);
+}
+
+TEST(PathParamsTest, StaticMismatch) {
+  const auto pattern = "/users/all";
+  detail::PathParamsMatcher matcher(pattern);
+
+  Request request;
+  request.path = "/users/1";
+  ASSERT_FALSE(matcher.match(request));
+}
+
+TEST(PathParamsTest, SingleParamInTheMiddle) {
+  const auto pattern = "/users/:id/subscriptions";
+  detail::PathParamsMatcher matcher(pattern);
+
+  Request request;
+  request.path = "/users/42/subscriptions";
+  ASSERT_TRUE(matcher.match(request));
+
+  std::unordered_map<std::string, std::string> expected_params = {{"id", "42"}};
+
+  EXPECT_EQ(request.path_params, expected_params);
+}
+
+TEST(PathParamsTest, SingleParamInTheEnd) {
+  const auto pattern = "/users/:id";
+  detail::PathParamsMatcher matcher(pattern);
+
+  Request request;
+  request.path = "/users/24";
+  ASSERT_TRUE(matcher.match(request));
+
+  std::unordered_map<std::string, std::string> expected_params = {{"id", "24"}};
+
+  EXPECT_EQ(request.path_params, expected_params);
+}
+
+TEST(PathParamsTest, SingleParamInTheEndTrailingSlash) {
+  const auto pattern = "/users/:id/";
+  detail::PathParamsMatcher matcher(pattern);
+
+  Request request;
+  request.path = "/users/42/";
+  ASSERT_TRUE(matcher.match(request));
+  std::unordered_map<std::string, std::string> expected_params = {{"id", "42"}};
+
+  EXPECT_EQ(request.path_params, expected_params);
+}
+
+TEST(PathParamsTest, EmptyParam) {
+  const auto pattern = "/users/:id/";
+  detail::PathParamsMatcher matcher(pattern);
+
+  Request request;
+  request.path = "/users//";
+  ASSERT_TRUE(matcher.match(request));
+
+  std::unordered_map<std::string, std::string> expected_params = {{"id", ""}};
+
+  EXPECT_EQ(request.path_params, expected_params);
+}
+
+TEST(PathParamsTest, FragmentMismatch) {
+  const auto pattern = "/users/:id/";
+  detail::PathParamsMatcher matcher(pattern);
+
+  Request request;
+  request.path = "/admins/24/";
+  ASSERT_FALSE(matcher.match(request));
+}
+
+TEST(PathParamsTest, ExtraFragments) {
+  const auto pattern = "/users/:id";
+  detail::PathParamsMatcher matcher(pattern);
+
+  Request request;
+  request.path = "/users/42/subscriptions";
+  ASSERT_FALSE(matcher.match(request));
+}
+
+TEST(PathParamsTest, MissingTrailingParam) {
+  const auto pattern = "/users/:id";
+  detail::PathParamsMatcher matcher(pattern);
+
+  Request request;
+  request.path = "/users";
+  ASSERT_FALSE(matcher.match(request));
+}
+
+TEST(PathParamsTest, MissingParamInTheMiddle) {
+  const auto pattern = "/users/:id/subscriptions";
+  detail::PathParamsMatcher matcher(pattern);
+
+  Request request;
+  request.path = "/users/subscriptions";
+  ASSERT_FALSE(matcher.match(request));
+}
+
+TEST(PathParamsTest, MultipleParams) {
+  const auto pattern = "/users/:userid/subscriptions/:subid";
+  detail::PathParamsMatcher matcher(pattern);
+
+  Request request;
+  request.path = "/users/42/subscriptions/2";
+  ASSERT_TRUE(matcher.match(request));
+
+  std::unordered_map<std::string, std::string> expected_params = {
+      {"userid", "42"}, {"subid", "2"}};
+
+  EXPECT_EQ(request.path_params, expected_params);
+}
+
+TEST(PathParamsTest, SequenceOfParams) {
+  const auto pattern = "/values/:x/:y/:z";
+  detail::PathParamsMatcher matcher(pattern);
+
+  Request request;
+  request.path = "/values/1/2/3";
+  ASSERT_TRUE(matcher.match(request));
+
+  std::unordered_map<std::string, std::string> expected_params = {
+      {"x", "1"}, {"y", "2"}, {"z", "3"}};
+
+  EXPECT_EQ(request.path_params, expected_params);
+}
diff --git a/external_imported/cpp-httplib/test/test.vcxproj b/external_imported/cpp-httplib/test/test.vcxproj
index 22739d60e..b169311b1 100644
--- a/external_imported/cpp-httplib/test/test.vcxproj
+++ b/external_imported/cpp-httplib/test/test.vcxproj
@@ -116,6 +116,7 @@
       <AdditionalUsingDirectories>
       </AdditionalUsingDirectories>
       <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -158,6 +159,7 @@
       <AdditionalUsingDirectories>
       </AdditionalUsingDirectories>
       <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
diff --git a/external_imported/cpp-httplib/test/test_proxy.cc b/external_imported/cpp-httplib/test/test_proxy.cc
index 941b74714..88a8ba963 100644
--- a/external_imported/cpp-httplib/test/test_proxy.cc
+++ b/external_imported/cpp-httplib/test/test_proxy.cc
@@ -10,7 +10,7 @@ void ProxyTest(T& cli, bool basic) {
   cli.set_proxy("localhost", basic ? 3128 : 3129);
   auto res = cli.Get("/httpbin/get");
   ASSERT_TRUE(res != nullptr);
-  EXPECT_EQ(407, res->status);
+  EXPECT_EQ(StatusCode::ProxyAuthenticationRequired_407, res->status);
 }
 
 TEST(ProxyTest, NoSSLBasic) {
@@ -51,7 +51,7 @@ void RedirectProxyText(T& cli, const char *path, bool basic) {
 
   auto res = cli.Get(path);
   ASSERT_TRUE(res != nullptr);
-  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(StatusCode::OK_200, res->status);
 }
 
 TEST(RedirectTest, HTTPBinNoSSLBasic) {
@@ -82,7 +82,7 @@ TEST(RedirectTest, YouTubeNoSSLBasic) {
   RedirectProxyText(cli, "/", true);
 }
 
-TEST(RedirectTest, YouTubeNoSSLDigest) {
+TEST(RedirectTest, DISABLED_YouTubeNoSSLDigest) {
   Client cli("youtube.com");
   RedirectProxyText(cli, "/", false);
 }
@@ -108,7 +108,7 @@ void BaseAuthTestFromHTTPWatch(T& cli) {
   {
     auto res = cli.Get("/basic-auth/hello/world");
     ASSERT_TRUE(res != nullptr);
-    EXPECT_EQ(401, res->status);
+    EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
   }
 
   {
@@ -117,7 +117,7 @@ void BaseAuthTestFromHTTPWatch(T& cli) {
                 {make_basic_authentication_header("hello", "world")});
     ASSERT_TRUE(res != nullptr);
     EXPECT_EQ("{\n  \"authenticated\": true, \n  \"user\": \"hello\"\n}\n", res->body);
-    EXPECT_EQ(200, res->status);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
   }
 
   {
@@ -125,21 +125,21 @@ void BaseAuthTestFromHTTPWatch(T& cli) {
     auto res = cli.Get("/basic-auth/hello/world");
     ASSERT_TRUE(res != nullptr);
     EXPECT_EQ("{\n  \"authenticated\": true, \n  \"user\": \"hello\"\n}\n", res->body);
-    EXPECT_EQ(200, res->status);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
   }
 
   {
     cli.set_basic_auth("hello", "bad");
     auto res = cli.Get("/basic-auth/hello/world");
     ASSERT_TRUE(res != nullptr);
-    EXPECT_EQ(401, res->status);
+    EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
   }
 
   {
     cli.set_basic_auth("bad", "world");
     auto res = cli.Get("/basic-auth/hello/world");
     ASSERT_TRUE(res != nullptr);
-    EXPECT_EQ(401, res->status);
+    EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
   }
 }
 
@@ -166,7 +166,7 @@ void DigestAuthTestFromHTTPWatch(T& cli) {
   {
     auto res = cli.Get("/digest-auth/auth/hello/world");
     ASSERT_TRUE(res != nullptr);
-    EXPECT_EQ(401, res->status);
+    EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
   }
 
   {
@@ -182,23 +182,23 @@ void DigestAuthTestFromHTTPWatch(T& cli) {
       auto res = cli.Get(path.c_str());
       ASSERT_TRUE(res != nullptr);
       EXPECT_EQ("{\n  \"authenticated\": true, \n  \"user\": \"hello\"\n}\n", res->body);
-      EXPECT_EQ(200, res->status);
+      EXPECT_EQ(StatusCode::OK_200, res->status);
     }
 
     cli.set_digest_auth("hello", "bad");
     for (auto path : paths) {
       auto res = cli.Get(path.c_str());
       ASSERT_TRUE(res != nullptr);
-      EXPECT_EQ(401, res->status);
+      EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
     }
 
     // NOTE: Until httpbin.org fixes issue #46, the following test is commented
-    // out. Plese see https://httpbin.org/digest-auth/auth/hello/world
+    // out. Please see https://httpbin.org/digest-auth/auth/hello/world
     // cli.set_digest_auth("bad", "world");
     // for (auto path : paths) {
     //   auto res = cli.Get(path.c_str());
     //   ASSERT_TRUE(res != nullptr);
-    //   EXPECT_EQ(401, res->status);
+    //   EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
     // }
   }
 }
@@ -234,11 +234,11 @@ void KeepAliveTest(T& cli, bool basic) {
 
   {
     auto res = cli.Get("/httpbin/get");
-    EXPECT_EQ(200, res->status);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
   }
   {
     auto res = cli.Get("/httpbin/redirect/2");
-    EXPECT_EQ(200, res->status);
+    EXPECT_EQ(StatusCode::OK_200, res->status);
   }
 
   {
@@ -252,7 +252,7 @@ void KeepAliveTest(T& cli, bool basic) {
     for (auto path: paths) {
       auto res = cli.Get(path.c_str());
       EXPECT_EQ("{\n  \"authenticated\": true, \n  \"user\": \"hello\"\n}\n", res->body);
-      EXPECT_EQ(200, res->status);
+      EXPECT_EQ(StatusCode::OK_200, res->status);
     }
   }
 
@@ -260,7 +260,7 @@ void KeepAliveTest(T& cli, bool basic) {
     int count = 10;
     while (count--) {
       auto res = cli.Get("/httpbin/get");
-      EXPECT_EQ(200, res->status);
+      EXPECT_EQ(StatusCode::OK_200, res->status);
     }
   }
 }
diff --git a/external_imported/cpp-httplib/test/www/dir/1MB.txt b/external_imported/cpp-httplib/test/www/dir/1MB.txt
new file mode 100644
index 000000000..f5a9c204f
--- /dev/null
+++ b/external_imported/cpp-httplib/test/www/dir/1MB.txt
@@ -0,0 +1,8192 @@
+9254835974458887629672873635789957411886024698554157393849494864228024962939550688297074527198420261051675205999609689838587412
+7948702662533481896767559573369920938242346354580061545409242090168773727371802699309443935396635866263937828773324526334321892
+7929250312741837331511829643632683169694074912332726993582394725302853411901337696207186358524323117172520907433878952968176465
+9486937364148093931718552300016332142708943190856638524388888569011747617956915519539025796115901484762122047712200094207683584
+0703675740855407318047361595661595146837376373951978537785605481083388906490085533348547865459237835407372374738389274773789264
+3524314516560200536698529022539598732463389124803873184044464663165630452635665559603483233341839268186056673186867104904449866
+3388466377320953222057779182433549144340237502432464295061371141084500222833875925546082542869030852833895137466510262849050187
+2359980877010447170873386178573828860442255448874794721230413368694441497441338856684036949118353204002591974711928301953002372
+6372613557152801003023836434406997863096739346637849381675791163293956729985652182807911615231198696051411047800847064484769940
+4555399892730282159333189930818248844009737851281434494736943722577947684829017806688345340403991974811107725657399196027995602
+3976607710681047393460981746843991626375149576917517874980586155555711990727221948467045177979554215577477183785345135535682148
+8981224019853812859833307577420310576654838103212699667682513798088777109119729024038590682109547975734687407898816774007038892
+9017123764104410282402525387418186790830943654104676998756681754083664849203556615995024922746652778319099999725942494552746687
+4602993085345245279681119328539229356959910969065035141679707233267342542524482900839390718291823532073464112692162110160887576
+8646564120617234541914353449310981315044240998894442066188871011899825887695202156119273906958004776559173081177243291448706570
+4866033151494706872899672197703352421058356661105030485577210664650513250767511742264039882291373723618030276740280451621184372
+9438899492601727676139376045138079061355198567322008270344297244790265795845160675322685239683610065522225253070076549915962270
+8389935622999431104891971065250599273560270041530059453015141663393829191008304620453278274234791447194116642959854046669653221
+4390066870930359126190473237338490788280116222078414392005864878004044572924012489353108185972058375678318527434060575546457283
+0571024164252835918003185534087097269093594036226831977994875139354124615791501602629221816855731144878875700135493432353006251
+5927821910139360288795697248742701824779517711136895716699422565064551330393130338804982871980774254446227613970394730940420871
+3742377272014443550088749485134437400845098911378170974616143540710504172620523980130687874417124218036934374655684373965565750
+1478423915766121994159683752043056020433068572256778826939436280481378432842397489866548450027752963017529841096517341127140258
+8566764493817154363962092792522076892737665735147823735202597353071978920287229637466345140359899735477359400126088124931881468
+8940255760337363163978793913265843793885760290540433771518954295210648595347128727773745692808704267887587662204824695198843990
+0899757006576147578169404543275069681042994730814241204020586377450354179962282687398746645565905502250948590090052580759060254
+6486974981051360582508378437652320531515639324364424491392656403886587101611394285202791775180181840494403192370521504242888310
+0832863857962097233772304981176182241414796661234070317886749751979535621508014316193777356696545211120669034308685700669047575
+1601920560631092775469657814901382577801938745924198963515833985856042317888652481510158158143597978988591350058772254540887509
+2132235148831014717469033542114409228818750252221985002159849994061876844567039235968616101425307518401162305005282076459564485
+3749005491254116003221964938075605607977980187695543266859111481060871108661145469674590183816636520815523589998805144183387552
+3454557776795930937812464849331806246436437524220402821725671887519345824588678830784061509096255092713692879753496348543679698
+6604711892156464428503873379368266697844691398807542828869396127474509499861163107833096454590997165019449027223124752455672795
+1464056065563451406292025100441586772081609300298880665395988771146415490692648836974652685280576941091682396423173897267646839
+0355383165630525414486907132932207574564820206814521900700480593494653392345246480522618317569197186894847097184780188176595384
+2234714652935409724403164799544553996270776652429105659472464101488105672623286713328942045106946821859926624587221567145826782
+0309935578008890373154226142294034025862773115052182464935233315361839771441799453095926400038395389556682588458216003237653863
+1061156071932484650516913321439215405043703716040614962270232640142284681169472791577978618224769535957766957086206741391709970
+7647351716205014294072195135184469100518783539374945598848168573993875333505334011212625117442647232720744618603822330582078365
+6190042304849971211815384939288709598033150233044255711655989057889996862762413082297341687788607689416591830790638752880761817
+3350993967482666602170935703513835999165561197161777938477157925978429670778105685120890113130859239045083522459241247368307415
+5460081669964922086720150722963115784946235169601550836667474277946931369187925788894576312382075479577915204545165252523196796
+9483728931707116749644793319165741326903913011722074179317419072713429472369240811255731316334667969479890293999075667048649131
+3479265891282260862086967904220845208360231245372151218473448305464967324382299780822943482467600298687513476936031155077963601
+5358607166888753271639287331221882667306965170073890751994864930247242443182503197751744519602399141153643026523167858853130538
+7454234112327473005509721991333469328638161495819890863131852055720398755713433050343878076412540696773945682790587599473898772
+1829500286670935139918198012253669665196719074234685642111242009658467409729732638466770339415767564217863874440642300491597266
+5585497029761221358413402963546931530898077983556347511671398790492531247609197801647309393017719703556474420667077635431137035
+8446511749461154540070308470454488783535318141900958816289412388611370858697615498746416636102261400237788596935028958347787028
+3125589335242227429164632721324285385335478344437654660712476162463759322956724441170491898597020350367163787012219584863841888
+6802337989299969519242898184367047999251583706804577726542893830886334416591927545136810611568115854449708934129157129519681281
+4502536799805954583144549032621959969753071050956941684132891200046324576389173182566153807220810192479638581311891427849367417
+6325541021938064574977797529368876421571303611445571554655335842928934553745122110842178236045825160364424732178843094315127909
+7416551206319999579172591987511489686313571898121634456963111089610744020435972487389528243640299599133169203384400119064268257
+5942558924368052900576494867848083529988242331335385049200017447913990221665638834941940132033114280719741451021709322013495656
+3034267296680277379429583962288582457402893052674209528241394670330734634693333770067544918231098413897817493181756172191761769
+4462568735945386723562623780129364617626340957792264088426814103842409805756856047587770203362285297182877719759239486173167134
+8181657858983878076788365457679611406051878073922935400724071002626732091440173091689286855430601190105542880854867957669944342
+1682764258327911438109776589215105175058720345720016147450773913501679216877023673201387960875767306750352156509386560915532694
+4168453046768399507263930483191895109159119018724369742162771101927944398681984030667327651300421681200981291741743361136642792
+5961214949092908589726506803431211408890378633711553535211419472586275853572210445315467622414789208830684013971300686277675328
+9269710543143964341467182430089608998710751826481978504336310277969086698368677287182389959721242273938854619109417313330166529
+8486459999966843090378171773263091325696386996545517566407679424699279968298703891528397394384066258625248890398189881141241156
+1449849546688513154852662654151484110306993368687380709636409815697889872688403677017676988174939843342948688833489247136945501
+3026821425662283243215241228426396875362999466310497066906176240972976192127107346129568606866349374029240104708104443230866441
+4888599832610923002904596161762304764008702325429097763470366526898011656507069583771589908698710318907474941536590688671464002
+2187786798670885931014137550230451723811271617853032443909991254363190383287294838940424051082728434647528986018234698035977262
+4010150476565439429491060857277549534561616385054516756344772776300804281913985317098584407945908254666687113999982299034911916
+9543106789274635042741853569705907409683466986445551664737067041728196021666244823741197574167419992584104093228192902092720801
+1102588771206288521669854794170734776396759389699841902844928003578465247527168100807066013305698109312645455547945036883046986
+3363256734764708042924448420459037705906529627671525144633382899415555101340497992824046104327698365969273385304329013580634534
+5814024400502542484138080303093675479908925878015957334513036393579080542663814740530799226052633254072603206379019404756963615
+8568459878266889844587337958272179244147420281407959235700418194754222652142770182396574372220705526302797889629403089542338729
+8226364273353855713782831639652716359809735693921459950536413341806490125092787610897542413754704628839004798504470781343226879
+9564108089806303912196187245286576464060313163695650258929860024346682416259472890719900060340274063102211811727469052257146328
+0723807096388817245239864356681843226170736144832701238842559718295427226555369395998370081796589238415142792914737246512392617
+4241424816471283201248965000004171003042756134627995493041482479770591013182623840449510466593158465328399081296605282376713554
+9973513220590332519460381924338347505856779256581376567327469745338170108702340101128824216183825500136464452346025348049667485
+8383897971629124447860057453350337067099519586684049058435585462779736095630666963739484221218567448740285624710665297561214099
+9964116268591382706460872763874878534297946361217165257274977145088020502651470013064060961213429959898581048432243027406481577
+4824315082578790346775943088343852549806522479147355182415674805204204673847884219703487656256651056490611337757236524094938348
+7062382447597254598729362880233858271292436951748099256624309342834053225940366427538355199347489811241328865453894894705029296
+9735693411211619628088603452483215272175364970550497151583596541206523461527332458408984429879086514102509879665768932131692226
+6961688387629152540756216546017259642317857065168508958573052496210655276891659756089714383999813015316305245290357709870563638
+3863034723721495784723589237391107262786771026496285596990386769945707595340965195448259401890929565886615037974745228156868323
+3287577904832967842610714371567414265151412481754216777139400930821306278453396427971928947503983582862250196984342590738386627
+1791128295449101351282899590128118669109794265058849951756999066974826947872800232214872176234126177766951584517353226892319930
+8805052099840613606036822579273082344123139982418321238213526119536401574939527633217151490658267375799590895845553195225375174
+1355928510541796297379079857922955866076933929404227257481153317061720856509437585235189609477388103725696248255380889259925943
+1402201875930840177564779603131963190398447445546273482826943610197406605496467698637182093544726028048446184407465904504733488
+1834037129267281181848805100644706716446934703366578946950288560270548606368029542736413168537166947783032181537827321728818305
+2399588088866368871684803227983829485917501647912319399696731866908470118289600881964063135888922021379521028829404789266368968
+5637489977535077950426899162426475829892339881113388204978816994197921201698140466319573566765752657389499556451516488232245559
+6112692169213605381302831305889438504096793315962284966459192757358537426473374519814657784899843476819443537896967951107338491
+7895505461382759098793722523795396339534176000429147383719128841803883949006205025948100090981495836498310874463726230844486437
+9522042614500829901321795525603265978871144309432521198633117362072879318547949126425751870262081563243482328537146079314556599
+5093542621599279420676140514142072884094585996707002095359240117940447064308608734332029368110977503867431654445743620282821742
+2074818355004815481495949283111185240895061522427508730372487670815127557063465146879286952537668866636765956480834805349247418
+0982616183770170277896101663961256388046096956303414645662042291995673037815635718874781061367093483701372208717092453548930045
+3197990341408426456860501773717322183556963874016603497159407408857792270849795326742052795163483613191779561704529979153717213
+0442381165605136382176204027769856937910886725474913822447353042136166362618403395513606165988761350028767809916274534709139581
+1546533500647539778292217072989397950692244341857345231008319214990106951110301762058019968223873956867021450221558460837271796
+1089583682950702039719953402978240768135379617758154644301927987331573523265837746123630494418924793748993674977892210713791382
+2010498095473532597719948269554932451554991652103201520706494302534512806373772862577948592827967992187111665796229241795272327
+4495947525239030494005205359163320911969546009892986032715554824732415447400580445227801191434206229755544175085033640445463730
+5799343664533857261737308836915890943267341995945607000250119768647338018370977116150224513412795224930773162810128318361091070
+2845165641335198012087900200223115487995666447653144922411381435396653532150893427712002942030941647409112450887593516206623257
+5995936189970345951128332927675055555031225056766626864377451946716279426300206796784320339236602175243416848009874418064376734
+2751388225971927284674719275737386426623723915170272496656834116124167598744380632642578314683658323664087930294748983479134152
+4463890675024338744201454760164930410895360686852249316115526602608580347281230566360947860956394767605509297995646286805155429
+3902535272296902694906404269870261097232828009262961508419387381919670436136425912908116240583462930917866834873246313946702767
+0171550221706917129701789274673785241823132172160837286626181116666263103300493781986590027327174868610919833041462749008446670
+1233446436949798212579086729206735034953949556045481891487880919889748751337486349345808929953562851746791383784762700811827813
+3273320169223863915019571833988285591541029709234409949795661766708317004888223115613777281294607726043777706813741640111212754
+2476840221289778122524588163601454015024966289209119530584971298419043747426874336591254749329149388984462650479516131162264547
+8321322112340265706034027413610131445579234122444443539849216325832257070066442940612976748450142222873158683339615189385385401
+2845301295555610107931163495080379964949955895954082606347174241430747973616106979000794362756653542557197433894470866065773098
+7002289110540946230118386265586199860767183813803128176222583812066464632835592487506968002253203796340562076570806978606547027
+0518614265711371822209002835579969441398099868205035333550662371029236766960492501859441092496004547436756442048667962205035734
+4662742623053069471722274771033535333247780680117662494001501801076484609461801093095512629224389725470873708072969419161134986
+8879423231727024904174405990021786946862967043559824446453539979244586561718968470449066018656109597862462444251052806647222165
+2462868109247823087920350263249330583062507248433983310105749602411182363633125913535849740456631462938827755069526554867046297
+0556317986368239387236732047607114173950737209007825151623731055762898522619516377121452352573813859619423710420648830645140602
+0693502619716624171936460417629499350461603844160041861287075322351538559343745415528939056080652464222483749575581089457335292
+4766904028429523888256867990946783862212788485169555738269492360138212802976905819698072914952002888319407814152289904290372830
+3063149485419553279766015944554584134585112055860455417890621924246024514671960271622075351843821409825893454426591239346175825
+4138071925467858356596514010874840756148724225545969356853427243328235466057330927837715365449101436095007553412409485033663473
+1718208277388066697955637942282188804022877425156297722332673824998500535568426990569492133060260476735245935911435663031104540
+7259896781146483425619092546253937377799155709431757305830799439617510543866635784180461435471514956432054478723110546701399601
+4212208190748800869765878332993087846354727233690197986460622890272309218632979045510485708917467310543076772888886969650697402
+5830555875156620379814707898244277917838097196097913596741388644704517369937389656755811401456911697429799824431768975340394565
+5218384019129708961023696421751573471619498755822698446106554346210228582416782419196987283985815988033363104751364948821321736
+1511408675805990625863697514171112598891753956197059919478438005392395089087719396999097527167894172833319566356364163919692543
+6760864061185222844062388472607262118669410742190580800609818458141651702885176634837319000673951554557807668749868767849900633
+4624693982782044541974663953840367719217355838087352148000020445830027606519679992919499646684217452676557562945022247829061975
+2885293059896283301736153794239325555898371313303885556968069349802848506212069388120502744705750493536808390340479824477084109
+4742565846910523167821445663540712005957374896244507720218360942226085109738527921622092099772083368812073433747682045449511884
+6164131243427554092783794384838205105688550227514505179310025715143470000166045228305059905780171994193190773288044579516190413
+6196746209214286300600159852801523856096528659384736317041341206058064233216653841144231397934288134905891354902685060365011048
+5888543435289034798476752259935453803961756168693460157400272434328483248778988626059542292033153708506682448981834226044225475
+3520105979519175798851693163134966793094384503981145911295918784323346445102768597120762535638265452619900970085082259502423098
+6023108133594199401032707688284772080067633191011227704160888217224741219472651134131857620995953537078628999627600457859691029
+7135355737374006279317910328897677569526320656280275576870747086734764513800879537763010892690268998504415888806085447064856828
+7067645951048993310751362481424429404370974532580270127897680271443323793244595619510531091473812713032955994538657114149409819
+4429631547566328842887647552139562050329710358137821590185444827892759275367380722401524911377817064992340751082835810723755618
+7949457580263990600187866192739809055130641391600646169338376355962933757309772135951086682561238922534649604316450790162767470
+6778696718174528127426896010544648198065903564137512038147927254912585276060875391066341248912566730098691603844487954144583289
+9567988530970013733492869819764508889770837509952069384446637448211216157716267753953316429209184585653933599673133926099458608
+3413492966631743395005504952764856687552734825362970605800032693220033767913422924066513158712050177343306017113090503548595910
+6782760373416377101401788671756172877579108677684185994928623883970442286211028728581037425407354811624955553337741266271223038
+4228769569080076083693265874897262718489495320015615486943453828550003614854151710616339504422293141400194809493593482338761720
+1275749976017493214306625272092330580872354604747422498275624636561377503079831465248194508227879655351358840776762816388383155
+4044611547062276323077587550347056464054608166550263311750875441257836393920920323092209759398994038142599127607649577377981910
+4521255521824521693676238300467676986666555950395922139641083951517880343036286546664953201729241686129223651162600610883998263
+4053431348518058012397818472045875672812077824208246071436792077005700411785602017912645840401853632467140385402691379589989961
+5296228207351306866595027867237475870719440724477597041700391443928732836085081541635185416372585087892465757549359102233343361
+5753047891155830333399279611743974102446066339908340811693445790222472707295688908858729491663915472040238337620182908302697924
+1508699849153464593476010736879669905272623521348097908417836104685217230447793112158735284635375208948973376371517941685224649
+0333224377446486130711894052961084313686306998844675785828086842465862992758130724435712277355911443550657464532883107599718794
+6835605634916383199967953082993703931572871914916373072477880100548805151438790628235173925034028725412169450381473208146789756
+5647596797800233744008641095874820885871714922036190240494729749620603436690380840330661337877272707920476284213555812599419547
+5513261332211064956118510684223202485323331553849116007081552356506786559518794150443263231676076605407451231256028775857402194
+0513233346964413426058663133294017428893643801135629939987380889256710071523164000264715556002787400893978524476668487881682249
+2238557041006601823583800792379249859430190860772025645499651325329407777431099926158122243379494002959281894688702064542524790
+5329597914788889055993063859757359411515855405549076867209561054324585069797183524577493085961561532791013967475565456058906425
+1727267651465421481105710991587303136944086691165624660300683125601416772368166283177444892976868345022274558919475820725390404
+9723590243421203442884921434798664645968065479222983928276913077586527562214486087189922112591555037425227530771384194025142882
+2491150360749458092334991769156796313818947278756674701926505201943095015129003490350920079450451251986198697962197375931585963
+3288323311745586996701741630221983319300390047571862205264349777484027201608059718085154305903308263735198400749807369566973087
+1513669962911297058622557295345513797998471626294474435337069062590410594233688469673875484253912558586263976338954760252676149
+5698941909248281308488717883921117273305117757034931046904729563167368375307728972002962702645828488935279252804415118514787991
+4226862654077359109954473957002792990601772994320272543965433892756039129932073592057677191275583708907760929447157089919000104
+5013015202975115790118348806423060224599193301855272198220793587287609415484559416236588999749109103840932649489845113026318936
+0096212754630289886604076288072412229982106747320501739034720205607227829189554712104511341545586461792092663001971581276075105
+1400830012525551115910295470153382076377587383792342868236429581401216573706230071139732339253271088253819425521718399148426972
+8130329129443141149308342972871751834898890054061408002066328617017958243761248655943163660366018684672224076482931610024551435
+1612470444029502611969134698674683976299405806211129021898957209691274647456212891723004609478869086828079731180673443147282673
+2207763612557030174078525394691981763423880246207823469307642881721011975478949627177448531469379452033830830547116487954748579
+8943550014526152971159374128630625318393391528677655228099671641521821415999666028671716937719971706453115362098995997004338463
+6633791090761145650463177053061879817237525424207069349153087084514135819202898699531517360951263097509259970351913296855368085
+3253556229437227815840782322932038842610282009077575504105765620857277275220518640524545781112378703944765595787111117088536490
+3612778048987899240807648365404713381232983899393777316948941796158037305227415310986733359795685540845368139757679718651388721
+0329656082303032301035960655149116897998069813522388783445067885544697734848160954106786926689147778838221235161040983098545023
+4949145925422482842946072091038603570358418034882170359973918018079551251028978485799644769497234033416966830413282850538365544
+9688715528548523732988559882524759509039740049260246259447423254924760566724656561201075170029641287177630144231062011355479091
+9326655743860681005816798142139776662356020296561383131825601205038606699757827396575776760705487871722516625005501108342115046
+4862493770761711413231246894538240278199950440029797832691068222332648670966923316771267216815856555063431665762362373752681261
+7759348913324715341816977430054410931106803880118579894939051307627827449748451051704548335839341424354678283555009009093334643
+5035504534504599464259968803145065603468459325562475588547886212145426779673200191888479107787688352706387961887120658923163596
+7064143605981003619608323632499268464142806140873807593464533126484595249138527994250140164063377300752448939069709418760740581
+3405460804222472492156715297971710492718005664789725902179902462523655008185987881883912400930038752420707768027434069222517179
+6201754337957471374021641947490208688904315801118730053700597398632018696041671232277781587402859428981324544384470959282694488
+6581501955752939978682011949909110724289175482558070539947143137365139752819830357605189104362596510417675677952395485738392629
+5415386438105335984223237131949793153812658394744575126207919072784736846230789712179591745207901814607314375532066326818332653
+3916132472388884065768704630042622537625667251509691545801542090771247404318802955070620862627476301969800427094218570764969521
+4673296443835065767694158631727161041961301871016507435883528289555722603890069782368970629525870136617529702747543702356107980
+3969736866659860369283152300636814307559050510391015595957669034065148689817184431746719346979216411505522453887905503375134993
+2033209673996359127998948182294581452192221728807476998740417776019537129643269360367751767407520936424856588589036363660084548
+8920359577043563701436228560312778025314413146903691717334802285060730546542075837699964573276987471415144914980259764316759773
+3627657012409360919929372833162804983136382545072275729679633045374976939117136265913209976809144657411039862524163682772934353
+7062667690768603813766580397495981633020198031283191319322060508875443418955017187814158494951274114076243932640382433951906100
+7089164714588749807180199878456232640504233132283953906601030144605887922753172274055475279148519962245834295034899100856266109
+6314588522281633268271129575999011547246790816567972537919142521521537511380072338334215014034228037819143744053883142669885047
+1533466041592069230562893355289214460798489775583299853132986367560533284715718053651634282346811547110422080041794519104713892
+4512970626101824923414591998781160477443695022763348614143799819070327746195782058463430126505518264262282025424239196981682678
+0616389983515682792619586855106396642118585620436668809283536133165065564894495800101984339481469054418070569566522216534870046
+3480404934288007401354060197932800798509063792079011642804930003377191431422069063134440047889535881274567178940747418743011151
+6923077833597121569133964233884887129884707102983051918568192593065049229148460460606709813558966649828440283419826988551789494
+7928629618912970441223379654942167876674509009329326197500704752789973531185610595644942798244043453568923441723724834770288101
+5686916225325175369639383018669733714398867749909229151589872339897763998251848983094518391124033198227341074940345064217565274
+6976813108342658294069521014494920511978448452850030848500379855545152314960261910035283177013574685072898109220517966532820914
+1235440485859974578507661524414185881273494203471328032423655298610228309217218895796957468358842309363210353318874365415441005
+4775757215064448647761305923181381380005564211124254441169985896444461359377488533806177746993363765363744834471832298666899659
+6549502546484198000053617666533373457701974326516846596770901748191355355442117405686714513545060992856554971022392931918431672
+7550521620433789157641377352042796699563142807992890238677899811145361588800069593324309664156547033893582449253982866608790396
+8335832703903786234598337454771069254394148676210696718885661839587950139009136903487221685179093872236368600881697661914186761
+6081423646547430855633909798819189360248786532594620983774708429259122445948885539867620755942089483824811916664871291112367965
+6763010129734054857751250818823088329080234337202140258490696882947562857997890963039131549439624749888135285626495741851799125
+3823814359862336359300824370629334246257087407174522366323576913384874982113357872199582879993086251942490130349296563220714459
+5201936494493880745125428463676510521663426683417020693977788479860674628237207703884747094987717754212968764024565059007572287
+5656800692578264688131164439239627529022443380780216659445516384845610830241501827976377913518196568744298647947111534785980646
+1465035810576162949068709350012676100595272189178329025511241633720229686245517256992739629981296918245960598907587127807526613
+3498649092457065189914681277177637039326561250640746889454833842625621406771442705555721525931725554548176228818511280348712812
+1526903631217370487596090586369687092431736602852047414002552907015226570166585529226164536775440508494117144839832365340311216
+7172800070700446830268660237981558246985408200103623671258540515214258800554645764441093416997150958224932045592907480540349584
+8145891984169127686107656905169532154735243264685794264058843466267191409417280492627793038318403119617408184518297221316412215
+3733585102819835157576236492205872180664881259553134950516961350305063296415930019908542524245430548400901559537444244647471710
+8919107817519795022023748231546623121376187758240479239499900553296636944913506176758776881811178925344276782657634277574411018
+0087408240115194690559689367771085179492160150159772172117583670772068640711181227707347785373406551286722418977845204918371862
+4087671496873156369239006050995430210075877655341012369255927938969111714405072240508066221092434986016434496634246773638497705
+3997764933956408083465951727938645280914517402927065500370134817839436837421504452664821784855528363909858322652715776945384928
+6358034140171396799781808478643680937510756584505346662094931360684566558016245219693809041873394197337373027746374913052226841
+3523525169184690915788330052438367441556380178099903982632705234888141866441214930597392851790874812046196446764134474357280196
+7912390044622498326943727559828557263667260605437809865126129166669886288145038860031004268429510310452514645934110806061259377
+8350389661397820495902304825219183306686077590455378114318515252557794852940943308375379300282537760761994418165168215848774199
+4335948571309322083199073879107610257555821153883090762370374143145191005083410872058977433580493717339726072170334542991808382
+0741068478360850873822704930167309345230781173492590875420659162725013692793497218747184011101436665668426379299561926131540226
+9684119382210299933488533355753954403421331470099036025961973755235128720357457186896140454721156015369426494838464841418224574
+2606550410151415944627360045368428365343042196701567415760981599314167562524281114850783881875311867997694821988388783550617647
+3906118902121264712371873625367711895188485445955724568729752600563482629569914020509331709891753567605376276818895453947988485
+1946035303735634882855442231649687139100528774921727985325887697840697252312164193587116219630593036960739462878472488751794288
+7553042934057050700594030020764349497635594011506182646429625749401961796662698874719407015328877341348471848266936805626731614
+3965083773308342246671432838925759649742042738645731254867213711401607696364783002153346490446057228458139827872431818981641456
+6290917282609648173484002432007182859707772380995362779354118181323028872604689080381882966273198128487451758287389558544864092
+5135412345654409193398015818933242323380089276961210614666090376540312839620184116491698184580875294639581135409937430385452967
+7814752714924949029739912516676992468879575093818117912716084850528773868618697654019734174399226706840162753982136880421595798
+8344230549785765490790122830425599688553302815508985004520791080241214227127540251939234623642895839337504147995870998311297157
+1312261536153577576475501063559792340822581967430971162124952202625290357772475691141555237352878643256411801046597748593662978
+5420113078044378326245454890074054926337548530109656935414953837202844128511917486560998089330806876653700112974245139455110655
+1446316293204894461498438056975498718142802987046646526458433588790266320884188848067627056955062757523352642280099730639892974
+8768410207973700878297712434460869178087366365740643368423050061014329802628323539796504787700469737820946806556379851425348409
+6903484946126406722104799612810275531016737884354336960835748710713062889887930835389522081146458095107803234373499389860789149
+6113798456809198989364723468291582407592480139088852307707256783165897446795918270682937158869421622443360894104220836046672216
+1297180429334742843324101908319081257574325368096788573404226330238491288173549545719251363488582787945804486932260991191153289
+6310060489009039954463983763054135671085760401926391779699811819750329003225671390731075907159344886944959170333579705985011394
+8928332308562582665591113793712076278529561597438667031252620919756801258278599576959931680328088876910755153375346545987026059
+6122799394738485298698282219069449469308864175448069521079405422190290510333027132055402559422290946776150886848955390869348557
+3298127120443406100122108547957183131539174057790900079286455780159808161628252012286085211125545510059619150351442374519647873
+7895547723969636832110890595697353438517639756208042458909186966958825057542753856885651750056062715953653156961335641588198051
+7242277604059435612451710438360700839539630420328128639238629662384680381167202360792624305492770524378775130253064094350170239
+6328910744252096963453975544360333319092492567496656064841933375445672717827688660311871137666274201081402086421470543791139037
+1263075806974163649200998435369614522606717804984408053096263479824896274273438278637073802016955266073407127338686266295417138
+3380472791463934939167548524939273036820154830243043930199471181363843017057589926197441097934643398001941245455025305275718778
+6053039097745341259474392045998222000183392630902077243215225896980913571132934688432219430448989534298905581203790323081204451
+9398618592749592673582297312578194153271726432191886003886455601016177152460729663034185278967994135744387261240974218700552874
+5660578626067455796320901716488860867842597868415619043285914590213707161427735661103212503097888685177044222466862770614738888
+7523554669658437443860955048187147707950298396691077287510802686031319997279006079308577219459278947413769480723164988814047848
+7728230896579900984081254526628677638403672817908586482917564357430378814260695955826428360637353362697491648099319657648279806
+1471506063396451021205086178083016198973053283515072407397794280863574093292850961361893442271480652011908263493969049518154719
+1271663389268841465526530211516124798508874084299647641127612963439336172485890973748223056840291177210000865573662838724859865
+1558003045612329244947071838328209194658672648215862136590055290358556159847830215232765640226279624286079243381635121169856392
+5235686772055013347630127336838697764880220575101940207293906989459723943700375632099865606791689918944793971999840022845627855
+3362608893556970872086765317357229622168187942063554148251194799624231946317410456787560024770536041305554794440402555379048363
+5400711312343982155393978124014413441498824140561950458826861214386401267011236483424009049988004220217832202185519723172983734
+4739966966771226209909624912450025675969022747113454805529677743180928548967947375791545038561055048316262023987945828187738406
+8806383430961455857801815047901978280522034447065757458634887588704123408758546678452281010485610787173222519794754395918755668
+1313032694820263690081002684124072214508820793025272277314613304407858220279657882431787747545642867929558977205831435007980692
+3821423807029286765485523471547535800355065560255771366935624333716101960889324812432465967939307158664437101875808531730514686
+0552828401027435473969844207309352000803571913860014776373394805498998489404828887974801011916107676224063398083299850490285852
+3252785594630414326772320135663653623232974740345887923006984684749440127689169558676316478796812920656203083787608388272541143
+0886829100701462879464273672433682081314775699581471366939184918943997271841997863805609882688632845996559926289731733309941773
+1588621110929737275611330049699746179538000510503020090443485760166202124848757232989323035029655555830280894064603577880623924
+9460393092105077041540924186306320293949908924617136654677663794806814239207321566509608838781326729111423409256038330560254768
+2457234134203393682333223194421969884096521962196051357781698196280191186003044231263105047089066125824374037625184294564841726
+1139020355104202113948476242624526315291276395095210708873598278111336130644448701938653730158050834519082575031500159059606323
+5508845274116902540996666349891489554638610844733883825695366107090243640688502082955261760220172087743405531646494097110373564
+6139164128879727447485151113660365410811051772254913947601863445614936478465117644061091010800284725353254306320280311126282508
+3691867968556520735423213939515627425003649240791159831598564334907098275550400308993911728901273767070664323401959466199812550
+4385285527314360012494827503644449196670340936661875727271329351754418864846693134514944138823292825239723190822861243721969511
+3358507325257641984977160116136111658256532073729689685425144586604492783647635836225848095839938544002404873700622644589011676
+0802250613087293781581129847507424374630865942136402236774163044580066760450481644654868348223850714885941401523519942001370346
+4033651642172702525694267019009943272304377112789600524789052835595443304754361088227651039992096267114223436584457492049115625
+1008702122009370555007456522799161340685826326521804374437361823776598365128302875870953921955751574077453333491368066562183540
+8297016982983877478208126579509560908805708870139177751490524014204560610778740303237644832086788493774257972604784310184677682
+6595999611158451837934955382339066842486744152636969464066220937412139592293869816659174158028425151865523439443968468476337116
+8189453034430471397425280708179774110697730501130625090567026833440338110187758034977661201862518966699911402128869207946665922
+2967301009332385012982602845125958037212145265901920840751275900004234804254302792404413397360100212415586648851954797337031843
+4621309795646253111797549932297844132545282162620476457572874699573469126157531277320612819758228011208417228396419529928921453
+8015689409373876308149147646698419734053674168732622753328286778805854267784590171527922720365829353861437404497654095122385810
+3928532819894452405285805315911246752486216644456327155370715615309647716023031992277092232949890587556921144870096925641170977
+8706990895052933118940892301863446619427769704201470123344557113277628075518257745853511560735206426541219526593186205677069195
+9323565048038756996967463636608859147371871703253988562924960678047445864387523330892542610569708364248757858563962167618047606
+7400110024724615888960177029937719273668926142229826804752461957263527604940620456908940268767529855383328656980509173310228171
+2961079316835291946492496420673777366632570317335815018560521820389694972648667220189874230520964455139599084822803458488491752
+2053325276467463411017022059798270225751157375504499399426618848961341529109405849259510473132610506746820731096435354555540869
+8022085653261752864363248353443911714595466837953116893617432029480864961559617145874891482509931363773686667586008577729590619
+9511531059462330034969446429670396910393858411286019648142180898913734931062268324002479006487407711948954747504728441451817299
+2402899664016344765585783952968436864461868976736500943447165022135283244224710415767003722013469693233516880183011359108783628
+3912070384615994999455640965424049848090544713337811655011624123059617272139004908000480810430015004300019350285545631530421459
+7040129421344930471792157420616841533490962354840490248534268666426427664847776443733801972606800005209711387678959754783758169
+4514744752921544867887197341433819468485319076219844212297689345457872671062595496333380534044033301910072934964202067332750929
+7744301249953061021059801665718252827169031698368805857673827901657376462120738712603816558346872095129968009454819539063410887
+6694959951385441493938996005094705323326365638007625755937236084671116883434472854253964886004560210329640317017985931432992507
+9830755088107356428137960573336610521897465624860840691251416368635190221352342520096074021567053917840102300469951496094532646
+0386151915867137989482068036180096232759486104299898530934407665433761886348452364475713105652919177827149093478062390353337982
+5026237611119968967543921268886408485214827943839163757065518470886816959612437396882015040264309844556286249899479340530273455
+3790585606726228419436731177762295480034329918020969162076958086843994331135466429174339242003665276457867681590462499745066166
+2010072822988771442333707800353630624045735130580706054631404185963369356383377732515576219388977808173711224814572042638811746
+7799862036041836103498954213010085023304912197271099528776247085017591855736447939941510010043072233516636490128682332435837718
+5444031310957599380550217779540801553000957068137470959947071825380695799288846148959315246034349773291226461068837384267657314
+2720831922046271298345192916201975278989464655822747470522487119845175483171802764985807888092086888555468865508558747670561030
+5037268239030155207644532217893862758398321608270496665238719184860604497280537678204406616537105359104541182047680859111844623
+4406453518829809819978030558459040108565356220631255519247977687593573153889331324518157228436273334635625807524985686484922311
+7999885151695902136577261421847256015439589971601084977870060297320803728853045230722764838994142711659330991658042253610623719
+7149325976325848648664235796296763337498794913699316628172271388813068172391895353748736320858783488531575015143960860926515250
+9988100123929774124197265328008141820710758495752123486181540545695574140507942678614702580850949656109084164982037643220132234
+0375655311441060929515636645306301671876166021260474227545267428349070029167644989380583812184485451805574601129180998157634256
+2128590561140195400524100610776393812855470570049174388092975612532917892277799041074366790055894057834557983976227857050864930
+3547444389508771568810075527864526064121655767293193457033048336615284399475478737509966968763107403398079684015244980874035979
+8519927849602061794266560801914694036469483013102023144973737181284943231700919734522079332185384045910178109811932848109276138
+3567893790780435626536700059643971391023938979188277544418757492427060624484762199641583855650960393640504524655219454811384399
+1735108417168233650163860054247929680595797171838825452321119827231787146560622246912322232224942016739093046379276365165998295
+2756695873865903361436041234030623662053438358924238813701743016813195378135003338279782291211315013357508842537428877943825850
+6550701509812921278785065189524058197762485207459987155095767921276575821627138362297358879947692406013849533700244092475658064
+1746417294003960060064872265575781963057635907396407260460748957479942537372418296161245217676807862873866767635894044939661427
+2752800199195253529712854754798642118106991591404644917342058968657791030752834046050164301961614256798982226629143783613672100
+0156432932446788502003627727688728508740309980174215347673828299641766130526832968939502574943042109833631744090112189289099293
+3949539215662926707735521667894130134427486982796357220482855624651559957655963754443694394481228836760254413314867991125537370
+0833694740794893624914563726494064663925162779653035815936273173351045298468454290966312347207985664544908635066940292067018215
+0068104260838913669470167249521001975928318786418160510709377212045134485178004263296128628173776672447600907854928188803969244
+5213186606414124173974080816812650470078589656434215381413340547874523982782714789910645183938314140377172417321651847315127943
+3831079213870153648590263375611549325132489817138611364392701108960231363751036773655982850004119077364131468986709426279928740
+0816735516514168218608953096598217254388061619583961807831532937684267549690578384517226873045647249368898189499267589557763196
+7614683199694761607567513771357320522896560891215582525317620218466204798420014498841517198000714225395529432437408592988810647
+6493791813371800888731383040408467219612486147146096499615909931691397312978653723829961950808111958324158561777510444489457609
+4673680562966535580522867179325650694242060572148395328716350087210015917993916484085808071728589768362522840828065262726854285
+9484597285206848463033004828740831651691831183702931423669671299973340807479819361399029066256705512283915649297270684923293120
+1714285317558703325551063623439102862882087552524008272992080310001454376923262343097189280399813634553559119888320098054640112
+6878492562141548781762151287184309582512789444294394903670308453724775992147414690794148922865626436020007876554089383158780819
+9151911784071444893456939300122542765400868095022473582458690303654492910301968711120089416900205538880607052645783814509878005
+1882377638793327163743947324933816937365677683669086577608915703348630259888777501270806753764247220631643679580537815123548411
+6272056421434812628524453496821198676269890972424881983781819205395093370536909259477553372703891212584194254740307122112225533
+9681870026283102041075727337579428100736459914910652574617863758549452931286799490040297351890738617979595875678774646214173033
+4185695124550535533485860637896723654154834853472854068710912474987668413470803105179616610921355620666097149488574561869489797
+3333789216162396397679204330436931257560768258425513267401621836728579265694014546537584859527037491359360764924746663506919770
+2081504393567373511045831331064517139188352171030907247345004840816407938277996907076471099879274974679268216987024065310558333
+4237450865130692858281322184224268516039222037739605355087614033374925113958908332718451900205100215886486089988991485524969556
+7929075290163499129098877300162688469599528046726233844196457006510599251899484746828484574667591829570772351512078305736672654
+9048657921163013454470683806356852138380411128268107788272256300715016144618475970710912738205043728268553865691241054834233600
+7029431095139361764456603528202380622931434502522594214209499225882330762428652317267948702623321489577844016464692915246359712
+1105356646640216883904536505154508223476242075189032231521222657818953039915135319911079058876034135094530224254031516149971890
+9040945596327638323723931073336767619159273652642403035784821558395849500879059623038153539774239738033911626241510146918039749
+5283073188137753905883236902928531799079492225443087557262624838420087547899455213109577396225125545248301841891417389453351792
+7168518951278682051937542342148124215459196543677153007216757499379420036959725544058917170458823956258437616459586004329579552
+5203183504391078070063471026373757432195663011756522268894506479810617330340549685777010011742133881536309636471645529762659089
+4854999787239813251707701121392165868052289429676407362096901868531485589830231940346048063593475645736706551014468995600111842
+4955763538748975069385515923948951672972674499411759026560381765340448515748581186486358853253830173480680063909301824002408127
+9640228631714593257928903905827590703526290377038235443447387587380382054598578561742893844220053769466029427853174638397427339
+7206862882358947361070854137919196014699723353543071743024301192848154276186984110546320724917862537765542130378492262094573104
+9132037902884622149627426018038745128067438979528182768862440252858820253995972446342211888009471423051493159698724414795710825
+4044729478097558603438562691316366082632115863305337165834502683246949426265600257894877978230675496217762990369003197560692400
+1914819988622085254720645203900712417397542695171367605811941681178792903669629925720096971822910923986744641852805301639652708
+2489879698662595408916009150319958484334649360641536805110449468835050783501013718256899380316883895243102069697127104742796718
+4988423693542042725154817443015091705766869067613353141088272355694386531680806067437655514967029170154529196712934789617792274
+9999952996574987268331116423939940247569869095269736111023291772144901858552922926558494336795934151397996022792048113880115874
+1453279672186008281192597269984891593458554070326190463606379023362133764652707672957322700161490484448540753367821464532839504
+8011800610118047251507565848810514239096971840458570325653839372359200258329325658866372171001058138732560340444368314621028592
+8193050742913890615185212677939019076499475354863399017606329114085259623153218920828787136128272822531407941969673998134066236
+6165032662878134088891598296730315347615307351518186514382605872591152954913301540364688295560996800081490449469152762525841628
+6574519924837827479315694440706135165231391744110344384147108151733208482344899812368417803491072197299164648305134049390042783
+4020778253016163495293946067531529520938183648436344477015365877950549136205835548741134429268197026979922853216037833912140076
+2560367110629307999607135522026567041549325633921424597293236948045008668100091755427842685667533245402093886980655601060106544
+8546203408136109675436916166218885966337393842202215612854795887800951672240495314500504099192631873269330473780375743830861472
+9788815056490265802740571039729926738317636325182129335295512619052159101153870121975439793577984106855088335077085584239297075
+0607830196004382404188902942190311303589870612777737359147435465863424442529799140567063628056860095478745600686399779891523221
+6451811221617351847394635729026502559474989696391694472537910902735717543356566711060840045900392940941333171363021277998101010
+5131780001821762931334985227662541898093578808808129086254438607279239181340438600040947973426848418990057822839591824881359023
+1781431927220093804299065870243095263893435123368341056371775420733487563878765425465471958566683414339834418118022714155686281
+7855784526694976383147640552245153733193000678558101047345867400675345449097722230036412101539440443445801673442840764573276547
+7277064664195765848534013590019916383557749169375559963951776576181466602296914352536749809247940247872302329782226925806468043
+7192135649991318277247808266477765244997880386860464765070023950465490749600254005312168230797058556941811885358619067264540155
+7745942254017380214048240376624237449522972214173349323588251697136718540827110673334670762835744617609275818957162829921297194
+9308025524075793350930587214905796399488049433256186463627589329393236892726854692113712455277309297788479077266643487682416715
+0884436213404481146144542589017779230742715119840784000653264872459751590076369675379177572780987987657953814990135600852985178
+3730124530298931373240431341115710398974380360265132276809345755075936226833617497570877144367390338090832665519341170114016004
+4487614165841966483390809601332500844989818602599615930254525814591372642009685306021109318297597415196166334778397096512192919
+9738135052767202788355804851260065753666213740432424577877433994081030576175406007197406894692674226624886870624390536370450115
+4972079333970854412711805268652812255100648740561624233549801666164086630826247751458218621070591048081789263645429911196722042
+6264477153602121971771346665126521727114186506364463613567938860398188315590497953212091430368302124372365408850328299694402187
+7096923163132078408222622634338258654575603652287595704602066710353019363339205986259588116309830845020074124235604674290929803
+8620319232582906151287500817533307221837336344013921731345438451489042597967502976685688377786979657248449082964352894633940456
+2338290774645460787964275902190755185934483199622353782037807590665967507775691698706742149485822727584225845398159573488959138
+9690411512559467787285374715845943612220011261976368220307963458032917206195128934924351124238497339947198608551639030163894645
+2522942273087160899325601687017261599086953489151039944965907240532011926664847298253352884442034273091440472287878013270485552
+1149024375555901235741559582840384810679491209306220816791833779666244374445454015124428345163452944670223052356961455086641846
+4911582198911887147216938492382715818668300238279079306283822841054803949022104243393368739761683072273825914099989412306146198
+9386705286204083264591504191247314048641049210231970001783669995174466309042384199881382505454205575494098905658585266777083412
+6597181522016787958122306510209743227930379650431716531860926286813430719462209935654406493573792531684209677728726902971780496
+7454713877871827759953186012939103462107245349313356776395316754209733644734837949073664445059496108161795213098031298387675255
+8608951097824554197185243937211248657800767047324365682759725200979621123783045604563185385990004228189141941283634284151650878
+5110742662179788336448957887870922104701629467080657819437644833165127617594897707891497065965495615130086622172410875337801320
+2393400609667414757827986008711153834467770780863121443973568354701559598965757992398836770293536284505657099974035105460765424
+5696578078800033701889220099620389665546740070731873354278406253021517777757298261519059116566359233204858968015644380662525991
+0719487243613892918578289524307174160805716406329931625803050285847534463223682481335815436403441752588538391995273084423051287
+6507583132575286651290896026205391515246827860101127710478694329951379556419208073957900692792049817183622267407642643093594278
+1377392380718866307096826670910831948575020464783957275980748872622490677834200043136176315679139636646826582155786548373039619
+6270395893591295820132189201839068186418319333704429754904087462921395570639063307809781688462251183623162844581418406608429879
+5043135604579355727135840436265306254474995931628655768285052525690960177800386175175072542969753822246288489006113161219380471
+2468870042718971405890990067722938578347935929978019468025646064389136067817188723296206441343678326386730657242344326326352583
+4850753963828793552300794217123706294629474328454245842829452531896699931041364932772984481884556840376569123447688057207356583
+7057042541510451935323810217032483925746383540989928451101483213770975125680075200108338616874937924879361446516778250185550748
+0832810498555353548220097752070786325088219810053096162098021215047558250904896030368053916311890910240442204298949146112466005
+6040761853883330139655359121858985041009457655416978338162675746762113717003221699855200571002086517873586911211646864010901906
+7256461701161490507120388412005575681572262509069280090655692691681966297281536854053796037221572903258227405845942489932658062
+8784119159896217889610742272823513831023300901198251714365380671379756902059751391678189474782942687418296669663414454093527211
+1713004342725426977027637006978967397759795215758374886596544583647960566243025979142738914314172995528789806147213520151545065
+6148932160477331319836946915602714548850688076504811022908366977684207197869071392739615383347277286078886115107459496844571114
+2443445647690017845788068401719782165485185661849045242867722200580611203950026796072201135775981201642969396670605705878495845
+1294371619212953132417647548708472622197636506856370676160451382994700324005284453279834375908065277166478082791508699598722770
+0053575986014268796134989286247216849523870686352637864684792640382519878279886269694672196689841813884729761559800125789968281
+4079017492141445585825743793710894771763718871198578437956220555470157513268225528361787107561094227364687598864249537846090985
+3335615421853085612471428388452383268898317706526014807014690533942186796242785098624189594771605450015209158202436565395838528
+6313851017796457232684831975868577197008285743175695149676285515896251363246115689779921987378115615609824156064808941150859547
+2765806218554516717364886537785391971358807028025829434420213828068755277959823238847926003687327479957197440099922200245318093
+0743837871847609090197592779267491068691643664874076633968061486254606691482824855693172784961663018432092989740850414577990750
+6025684120312451259686658587433694029989987324349789159690905104220972232002229613273265979326232104213906084669828970966380427
+6946689887211552778830098495751925653354785324514999092963991842666284889259310987400348941690948665027526678850288865496058905
+6762732711489921976841952967909655635081188142889946182277259409310226741889437458160117435942945024450654816897944448992096154
+5422044978529069360644478126257492572807446085424868838210351520631277115650603746786970481265582987466949165123354295111201812
+4211276624640084315612918421177060204230299421803486633824592006573340606615889580523464227765304350439006450951838160825473751
+1889210243603037535646067281045805960008570285172891727145769267831573879630019508324069996866828486890146852983707941528252170
+6433944896458400005722683036542919674416232401927258992043251760109983309622060221449241884161395267285324969554809613236559401
+5926828496890530602862162152396620975722541268836002211191264684743325984168877494942640619948750726132999624105124012640906283
+8437529190279374121273890161340277025282882572337700420322280964590810755716568643364840307879983400203857287989101011632690781
+5802276041061620122710926329386353739806320420710281218622737558209391349689462899753335081329268758815057487656715890733084223
+8915069186666442083922633115688459542249351209368361689010535548757066038294153139851377020698884275592572198938097053313533421
+3618393873597153740469607428584632822338908997205070091595456519416863149036488990139674096344263132753025929808588767591996177
+8414765535715090848046152050822658084473018911692025473276058620384118863100457752482347145023516317250246454398495927754913591
+4409298010504839698734131748484717641239465901635152376312170896985346043211365815426588368753012122770591860188057761705660735
+5937603186684235090583457539320837412342393238618817530913846014346149555309319385019839106489932216877734882102311404478731716
+7896182092904946306296521788524236999972318921384942071102716941043024956484573567729385887708261561271188936395359650621440543
+9381772394748371157597820184835066654518409316544350915121960781236322808659004922335381181699829103134517372303100027463245782
+2615260350961768130102419692323579521155005867350775325462551282112894826272075572040191002407099324856614539494210810480930402
+1838597774381264536500359028476517592435681239463143604712064430411599943084702827260512914320943321785685269655653280527187527
+6303497221483801786682166005068915785511014637493079986822276972242808097676862236960849777047832121671397043713182928176830651
+4198254431094795957177601291882860974299955452519675630067202852553365287181631847719984611318356336562220811004590160639271651
+2089050062014249099555113392986787327862396528284354504971691665000330719435672605372528268724943691397193582081997337212460855
+8717657741330116057938366732697730717547522872552360477855457981234742653137379848417305649320084599648948083741462795882532206
+9986804236567371664160082803763334644507241277854017370156980387812678877717978239570818728942909512587707736901227099845780710
+1187012467446764171881903676699687486363209718049359334271085642494010609014855350532206473984262423560106107436149534409159662
+2848539362765385732985316450544140366071147981646641820740677994697597799634870260463776941968992688323272637389950097251845343
+2181340059702615616436136969810778034448257219485660110664564303142589278244498041564775661983269433643752893242421364842071587
+6511475958145031560867412663572535560224504744829799500512261131519166232318015397419472829178929843115481631831351152969869230
+5907563295429072630722334129008428981723806690819380400545768764609783317272102244876794754684900328466037092277858030276039049
+6371121545042724094475375695524854871280733127714683231595927748253222937280791764025222016369882957071507439090065827190758754
+1326490274618829941454831367643360383905788459550667904893538378442057279259437234426288871318674319032806392619399812416955409
+2775275011488829091588325070565060813564196841900611728756018532857865700574781000487644896468359788252916194701281784442869238
+5475404321259151425741175250657761031096608313986258427026901467928877964154516924617882931075782136380173762818340243425882456
+8098506275539721604499982773326806644420333816118778369209316210417120818431663778002427348509174034183157653013145092651819004
+3184928471078890543345386093573923680647427432807794321314997911033358058808825224490515008557540951525337845495688169454435522
+2663993815050031607786993170355950506772886776860845172901406916363156294602197804936561148186445731375733299997098917913770308
+9652206542382536216286608096098963262843138133196068261154952924480494400928138047212132673039123404498669742532274932056703877
+0803886057269071094490544437295692503919136095718722047240291609927251689451657849380414877514143018375735518559305335464120670
+0151936480170888759767939879997438315844081206201757776198680712499035405650084830184555439755477818487911581690050566831394218
+6229367230673286153903588882341483871782570684557378319370079577894075314574849976163949953230620503498800993353619885098682722
+0775734990307483598683533921005381003594918538823910337693583925400749988570440308274068133400598419503446320537735625031687287
+2279164484478563946971740937436182665660391281989609876479617857522997660917074445342075564734477309946731477007826609533166522
+3758123683039815493345731508244661356741376276550143129350958441510802897891765417564525850067802663207435432004216770694226804
+5619370786333060777254420771287566622455383721762137194440628363338996839313233289419808657699323597544032060605130001017679348
+1117350732097568268814555936831091979923626150476679569711035279777989299558634893220687598099570940599334574372587146302188862
+7465078440908857228369280211059007709404158916443923372217270156208307015594931088483508995735817533317081734115339967063512432
+0277551433478001259984748926007853394677528181409165584238991766092184666080139589261333280556946872045412337141801061054086949
+0700754560549557192840941960533883683916477333049889110496053434388836650044089728945956844381845980096615663986249384912038818
+1729833498846421646108320742580046475400334773592611265395391377127688594599285540845684396076777993728243626683212706942573378
+4323511472129830807288869567946309250674678068275114664508496611904796208234885435751853338278854135085398181237686024172180393
+1312943548505486065871582599174831836548648084308970713256187466678464307897110260321658188877464727357499093515658589884692245
+7139584610276191442567513021000360376560327542398104492743671139951823728316211591532169872633220764756742780779371664542606277
+8013300125828426771757381146217871760111879193645766888697436656318066675243280906292568248974540959337990973627561398675008197
+5419373124232954726590126551016645137142696380830673731392642951542537238565961064580394978042654467730915963421765890733361548
+8922925533382884854249653772799918390864697404746308525228860651400300505857310156341812355891928439789989969029099008533806665
+0128219411137135309941467559688405403979836275303036131774092714874831957845954239946311223981403764141665925425006138193699503
+4023035360745761142363755560440975222622652382698883967356728120684964102122995320575139970015373461400690787473496703365503109
+2193654449177213661881030975620088565679413977376323484863510871705861613106991010472484286534395967108522932664799263272973605
+1651932770511765948726250021128129739307128956256839990590743197977037091662728274789578774568077274689428101918180304889077378
+5017924617218629587957879829522315523692604428645809008208520226544692314383658761425382226132125228054011492055441635314272210
+6749666157481037578188762106676697225815856020636806090419991079970372071289788209874954711658011019178097283297120172931963024
+3867624578607959056494862536265389313506274108084087969185322137028561490827818437756426384470803080867883480797295503488443754
+0266755732085811371635896735784706558323514361613693558482118358007540674486152236347627273339110326422500120960164943514979392
+5851591583094022546650594344855608619956936942520965617453776819147723734709318492888126759979035908706037791854416714517089588
+7488779820804386679237327683610073367094612676999550051056279635818725821831859618176236859057491859294403215135785905001415728
+3397867405536078184923760377846341551636533657104459673180071634565287960125731400588939475716477977856211995657191117602660471
+6368419292461966253403926350187375212915416793685707098775001247308325202429711397391995493844090131420300451991006099818565158
+3171884061798508018743336874067220372374917564318502076615548912819919624484325005878069566693150527749974672352053137075239471
+6765298415501192506923578604075674679460732604669110708523132941578157177568853063216936080050749029655642031375231708316371762
+3941656184595817536876952668926168956461631341364895778129612449325569155094729678326528659230305783051788455638170048468709384
+9344704062107618220092102502671070488066523904860951808964071896990152691743696929206393427492236495869384495623953241985933433
+2329954473357680885309244441022618801570174231106127708621760839070677029891079166854592191885991850284207932518637882898896696
+2253197905988134418498970803242763736997197997987724202146481273276883471048373064146605033007993208986500108914474101742235859
+4471673346443282932636516218151183887721959139730007987788845685281052854907139082610271978365656275535187015151917676999391516
+1490454357895502187362105850833658593130025904397280081248261243837433753996643256759896119495710470799362993945917928340275859
+4187480193910225053682324326478852139878506761849860931936128187212907303727615513834095500089467988300420504891523377586019041
+2552835341088538861109696869815032626256269959324139802181242249722241877212898021098564840649196902417063584333206994390607317
+1538928060054617317449920025668989345408124114562616395808759769278572186743963855933221653177548947045222630757626854233433755
+5185848360760696218717214816135397052477034052026614446970415328439572221368707488898468973353428786860987024947961924953899839
+2985590716831731870038599668250152561736463733069492744631154471689685148003517537536069537952391933185169671069870236035572482
+0858819385615354860719000425698572982937868475649379251912477519089804489107469755432874178918458772943168929318750385686530082
+4333886362870957848081259613648289163828064171655224322239708870842553708643760011978783227657321411272976905508646641961780912
+2833169683733846355069467452629978104797868384861004576520122658047677739451418977045812632716306848990938028931383957425588061
+6045777379942977654526927417023844498064089452756699867598470436037381168815462649457696613017471951809000988548875034178737874
+9160331824383077463591927113486291567227954453778702317129507491730495740733772073822607464672707613182092741352901404225499494
+2171629178354382148962537134449119312001738349076684871759101972177169632459401670960405086152157843086489006781537667287047896
+5465718260392150704046827088996611582230320415786650066647900151553492798388495126103785840394545507668150495076747239741124643
+1419544523318047856148530079232229449051190304992694484547233964026124081035121194889038106213961089629592355710172833338936041
+5735074574334557161220421706612819925561806730824425800383474349667304718298810588448596848386045836391940535442755152772209476
+4477743831927353467775816826229193246462805293097367869721250682503407993182691455177890744118461259199550137591872314970843570
+9614009267031215091375702771630372739884751484563943485109876681877458872527820916316860531787616767154557713108421464243252888
+5725244451595751926785755645396186934606833650722629688279447836080615920686865486122499155337740847620671316549690747377719416
+9886724243384291436035548475563689452903302006875551792856774087989888845839795026561561511158603968657727537570783565987096483
+4338269257625836943750609173139824275314999458619895874921046346622761766613817248643045610302260828228899586867769128173831852
+1927251435241586742325643335703829021262110618516121300640702167056777723519853174450793473043913595814696522118527504244796457
+3599578411448167894106533981801012494310659214850381649569414007781396645447499689729938374104814729448345077680781325687345087
+6129529633831819171439689515282408943585760656344118595138870514119273973014358876594274788901442968142994742135926265337385656
+2522744449484255252321589542733596606602045925005526885282459116039248444399754430448309551058351839870771919853241700908753171
+8095397674156020153025647112643503525783203561945051043117484225509753196255050991995918313572389826508756030729780202503607157
+0514732746209410237098921106270758705122238404358107693018072790601247661147289735400790334022315641411924147791473123654604067
+2183481353624169330708810250088442996270202852800382852132922090252387617856118236197486397057001588957700864557493511482566082
+0159554686938426672550427425422201760923684567404107605954807954862252513544057244716697622930133085009155635119267747535809775
+1603870374074406842079458547774759610733574985005768921583657069449807861035511349884403260777475545081121567326386609338253275
+2866478551802452645398860404273568244013340206033503958336009745540839717584645607628126532817660071722429335530485083943886111
+4372806755879104949087031501622642625790498233747556727536449464577828956704936323795941826197457122033168971930280473743209480
+3510521745467987614604622504324811929598409501462197588604391588467606320835512728358214802216357643065451820237801293132895101
+8869176817884529359989957422435201680723727230870849702923220814297956988224073755455624237386035731957272496882413670632312027
+4987041709615070926110617696999725204352784063869478762637421619822949085893727644701242995534552198616152209092394050930669848
+7400973738218421741284556096408600962957422728138542260382229658265717929340410249216494966480842797114656043729408022372140555
+5357622280419421430680077268491817179160449030679507850055675685514803114136633487732178706581280425610186327901499849008080553
+2063614935667238312237638365326101007587181929899519898020565403780654677915752203035463564958973934599571280127628650025231204
+7510339610097271890758575355760181313472729121504677949019841665976993380277166759244310422659174282752504901557558455360101043
+6704624590746564335785852066839780043541376118703961641315331313655337920280405840841448353766789935381787637277026193365826955
+5718584531080420228299782199614112550723022759714938401551695221278973774269123526563402857239118115571007974128747966574892058
+7406616537246908705363274038771943716880888382315653131428051669734785136535017075892856676521312977758275400592055721561155447
+8191030503034523458658590430731690106155340044400945735308786298326190302983231623869556707507267012762969572969229893222326020
+2781627756283482808592633115010135954787388098836449433663074354764942592857302479394320001436105974173300167981736974256889069
+0749889909665269146510382674032370824445149525831032970035921874308716508078712017288693000420564774687445800320014347768102977
+9500582955080504298493442003839451470653349230762999448413032412395803444854529134420395637374428892260393652466859653474793248
+5578683404816116099839255848388989533623282136956100112356341602163894219640627502458957004434668830525937659394378712613593339
+1328818081682559186294868249152029912791110338139114004470380993085670292745974492137182403037306610656137695392960137614180452
+9752978688889728250401766859342517990190156836045937377483717028864519242478723992053825465496992411244434140736698055778811865
+5764034558119091657996034001136138512460220698471156208113839665880299241195462026376651406117658603193270831455055313097779290
+8887190533917978952783942478895262358255953083684956216049958401478271139454139129915935858174062762845986202401574727546757519
+9965112384492455902741039666831644918325589401840520355227650968749201419553213336728867559952057316374095495633674649247673155
+6547477349678905420240149432846633096396537735337479158019850832661246628844505249719392841713290257003652108726047676880419068
+4709595063724483081528398865202332209399887790016225322294096330311019868576291990108551198704968033034014495019187100300731545
+3677983555491782274707240632393630038558613476413675438434221141668472183743225033730344641440692723378405837243484642959062746
+5604991163272359834040422515862505640037839519050818603112192411600677144216422234215431187611787844494127075718764452791848799
+4854476179924301594123281798645361490338402536310431288082224776520403651635476604940174850365038818289755315902382966023203577
+0810744335357702561567797304986145218660883831691187353402861163846458499952189536879044115452318681728624510324860015033788398
+3979771283995380891938289539381044182171976827997056764348788204187193621090041996206584024348644400402675325221299998818648561
+8560553235856018013965529605400965645682933039991913219712272084018424710938107420465401522172404020985846364794336906931979136
+4463662321945447989909156167276620401617659159053053338198477063314745749076987397606793494767276193523264007206178167936213596
+6945045570777520341473278974105523918485559285787445842507870137014286454851350178004328369233461521852484045058748849569462881
+7175394733133381132769602280613000317015438488548919976504824538838731947546613872200764083627777984989422833194236427886436510
+6841401583932488101726607361270514543381198032082148492961394207816779730163687527133913837138426969504533356370971942113680465
+7438297763442758000905394998453798098283316097089007654200747461809281986645383560583766595972712154827834692097585224878349332
+9365726487547590990433290508632050107564671461069290060500347861396555664994103630437491491318643117772003180597703910105848664
+6611643426610581687045714856705413399193072506247927181637882082436528718891021527134176567154185837899481317325358321239700678
+1557904502034099580005949862058754523860889792700842593217321816597173581797908357156234792521428404814333336278006477527454771
+5551300020237036342120897324580866490216118116991149735001002790662102209629270626643498774459628186650438561401066616780089887
+6490963755355736580386978526346909059361347064280111211229508805478817906115930155049278075845715671257641653870466615953910939
+5214778972551839841667874021257601195235129654518890488743898996335333591775608284908553206841411120044347642321931257964395096
+5963500480745033263837415489981452116756935833729630104233601643805643301868453891208377454731826714298746739883158478178624208
+8078825488224820778954240186836158374373671746556003072588357835036884385547573916766540198508057742745190671930027702184464479
+7807519854130748159210155879811678899722270728200599689770154189194726372412310007746266228667023082290285051427818296004435318
+8849779730758648974379073101178990211676693852201291929217145528640734853429497077571161674011066495817276757324157483849716817
+3827352998411927949530005101476246283441759897176637008058185334546170312583858564041585383266413483217734023667361663656510262
+4989459887640993845875939547459055523785574975836774839383442442772727790780196274204446558595371067248953971633261788681833422
+1430260652446882399259326117845029992780579944482914613560754920430392419419801174119306529200876322246749783122971752437529985
+1073402550916699040362018956704245437401832452382196705545206547444352132288265525961915924743830388330363555452775455714221746
+1446616034452999060536906307198084433181209978784238878045014349105221877679941993115397416711191417693894301857690745032510836
+2955390019036983033546377278387952218996955027373523655965784118029086980123579985775681000785897246210289721704232358897262443
+1116899333926038276430989136011993311064835969966384464160468735201645112827713375177166600414004561963808951457633980244174631
+3365167597668328545027411315066184915713562624842225290359331084124729347322094220584503855828183282959730835678676639554531692
+3703132630286521554741077336255711977522731641435705473997030102644612053700886241315456330580773390018414386585814426113751822
+9217494111509421272989272558690493322060649433443466464859990829891612802636240902558280843106767641519024486333577210250455758
+1991150751561946927232491146002439007601543254992434751580119323409611022604175456900099304707614992483865118197257172247468485
+4718289269042762658615396540607439436267108037664826892947523927247548349191063673761417193077849996352799507438421286155035753
+3670003174685490297784963434080516316824119943018705327982929605778412196093833118187456471893403114829335230172542023511761918
+3530299462397538994353624879221057016014513591355266971800473995195599575301873296387357918288523036075230002667564181209941862
+5652465756063919538830640228613516853681348031923008502389424015416629283480087157633179737963541694567718976270634283296698772
+0628398273786061322495772855081114777882254155541640367813109541283460927308493462443462004237680494256941289350455650052190389
+6530923425528750248516830645859529161548508001636146477492907827739674571658452569696309864671893300056851989854105052764500328
+6377838408857911124605696723808145124469491655188029699697020610066790779133275460162800601521823852930699312176096876169139587
+0939964825101402137367079294180090650010316165686145129739428563266232844352675969324123159076365905057635263730951535508592474
+1811804823447992196520518580949056544426238843325335935996032408627339563545875884333166832898448807558706376176980463476019811
+1853671195949445539340843650229575714750539986544526174232405759132358558190475375028485355385394868549681406717987759935904458
+0905656451763972780540932190579104438556329939472118207647554428546869843074735432587357981463196272333295652269129883611649971
+8081235587163561191593283995607470950948702816215035438010567011848029435878836700192088876498542980088266248768136664360732349
+9048395346539903256416069243232533610069691095414640231288922049229368354092313481960519237230458713935632653201847905841902926
+3586899375981532151071970206889742452371614510846757239619094223086588901204291404135214382914427118575565088049023826713070734
+2259183814776114935570816268571424671175423119794189492522671432476564901966405647187984087627618260356094922535155595764746633
+8775939779211866982932257974707044029673787248018990390269181484731175023868082868637570701885688930003111950730117366747034776
+7292037040878433775921745075599110933471784681597260046655966261287697859339714368407310137037826533774841074326027111292219013
+0255740507228750627788675142293353045696200562639503837065555027761345191438643278181859657112500994447007605647817675710357329
+2976075331061106900800437561657304517961915727589721564040507512613786451696450429048216474153539650176719572123959448008900012
+3408433706045747990792868143612079234278596536479367304972783738238238625919742682436942402201332632706821698633101418726786131
+8375660756604324838036937822438189146692980841058943655646096987446498055875487503182581651007976496878268593478897138465125407
+0302161625788138941756180586844882835162635784547013096553214201480525116709804815394793585124634598219195269074280104207728072
+4667838900407600665351205946634451166183916253892825653381319301710998507256107777186848085957403008238368100522944303632213848
+0568234978451633682200113830676859774853569376506354250671989943595147694543341125278943952146653132296950198184251693558754266
+0837997184654618266464229835853893240382511414642926848175904359357425914225875122515607126936089890130506925127703951001817058
+7698607971927804322206607636649779969047920064098738740542516881736563449825854806194526365935192809082449412467250570813092077
+7597321887811111154968364298503454292989382990719881362442172931187037500402048057328677657705369081382090672410230632333022578
+5702691344767100466202486216169170905325756285673048601355109036801723677816257513289352210067825399512675664902709627155754391
+9534899164623786842509061739505443727104012615679366121874758009252764781464695793453679090140639672566086270483355150124722338
+3629599380125790239429932208245186801604452556987851483665390481177058173633973798236252529147955843797090679456499291551397899
+1654839141753372209578242837530384383897899016697607163271741042796206564645006293555562819243718356635356102675076651792712069
+0330578183767799422174048823749345411130436371482070584047136107077445803065143356378310883097325525812461948426463818958359831
+0535837083229949247061916351323305805073161284351843348700635104127671026579915150619625693973299904452300157134992421628495782
+9135533592025422741289488252334208635046166354163256661447685205945401888767478319569656787569357811074256962118550453119004362
+9301751134736346294356523345255306657038167822211402293117443464784840025659169376501953957672727051530179579688902595680131766
+2105969846665539329882900056874716520798786759023512793122449365556804018453805656203040461898429839786920406056455733868681013
+8994359707951012841246179634189829024194191300675090705148350390247850109295388787831386650321294752877084504137894482370739618
+9241947230769626839032573755018849701961689378840022528468670515360403514925600595045782712624516468191893178057825723173315417
+0398704518600034083166938112120280977963993296425790225059839016038745051472686938943167918298644018861694001602670324180907739
+2829253174521666979009820015551029220993105373115142695444414232286946938928961493390386858301002697320226848958500348592987936
+4933376341875898717948810316592654389756790528913140902980810511129982071300880573916140408222881362220907631175682400695211957
+2728405831786952505365442116971677026094675638127255014104635321119617454191227198408175192550442007477181962648595382032863011
+3335513609023390087365324523236604049358730860336918649941016742564809500323096143070248679219333226141951672644858949079743290
+2564143013685722767288600853878709769356311565059463598251742499173323941411533573854915762183775988798690410191696639340413240
+0493448733483595346076056156947860868081377709049727106924154044343435604871736849228001533150906569243527614792377672885378205
+5757247991130415486385859064419869200094851432494013487858837812428585929428086640566084149796652609672519627454844564932256297
+4669558478660881121021903646645372020041434507907448258764267056511994202274610206718051374682457426295364768694292186976277202
+1564360996091464350826834839280932166253903015206256531264131271209638480781609315412345487344374301996139188255108960560840234
+9176534815648639973257109408451729832095062649822000160147163265683826755303899059727567592934572490764864402347275743547218198
+1866055495605517210298107031806201932208987305284317169767415130763125409722583393741250961695800822861253047933789380082578910
+7563809612558319699283127796207634523042191451596228205984495682290513031662522019531400901314878626864267750108819514332947951
+6013217317646435086018804719571761416592333129643806900438788455325630320446510012694647580590342912656641492584092556696246675
+0844610636935384963725961540456988648961187114742364338486232200258126457044861826644153851981432318719173242496404738484829592
+3080829363782082227074488901159023270312983944302028828324523976099006110195688729810726298266450333348633619065288392022236229
+8005690472921247866581261895577036104640057531331680489329654614207889686295106419176764455962025382611644995861348654828098933
+8502321967575148172006469677676125932579572402208147927471694132908710196626265784804209764246638587086749717612279459712731943
+8253507041283227562754413288994720899007749153170225893148651683553291625294974124954074490050789574119491844797138467527966227
+0130509196073119104402816135401821552059355465255575401457469499625193746950815086568670490180348072693785487568778765124602003
+0665248124119376664057125582265850335568981888916788294854156077917276025925880496268355143677289608433935345978812154208855268
+8995137970182597573167629723687168196388018417038021858197249313810312106750976993518701591284371821222304917627037046364482239
+3380163047424234535936046961259910243886634603953810906816744443879125914109276466757734603864050055610106148478096732039481501
+0050863632424997195774488430947153709833716798293363139764056905080948883372556055175360309201107604690863026027029304809129018
+3159045522676282622055741762907017038764983291766901157880220174438440331565498671114637842462602216932285417970008975756029800
+3552237063449291059014349162828946704972597219745549772402644156576458713144836954411568696563098211658803621586740322438123527
+8553792749167921622407818214329886287689794104816641507269131593430918574387850051670847355476478466155909359159406347347073422
+4529077230987714405406119382703861571668341576429308147647968381984164008665288474312273798880569173169482210427510225857144151
+6873466267196323702969428729542596817149488353193513581368049814798979078196465830515246880993440065883452528995023407220294628
+3423764900702625807926494346022071251875105005653050523263476206366063134157656968651581937910705560688575444683225925304492434
+2952113637739291573792177591055762311484591345740602655920022962868733639951191003783483933798477891209504511076833970415208477
+5918285063915228730571970492875778946493408022023485280196322884176264848374770469091671934052402742006902024842930375953314997
+0188283754328437589051211543538670804314085522712102214064193375644277314824255259794129098802312806481056628400349306174297818
+7400374465412082001463306963438819366261869661341067811137716763449961651069723995940239925017934226230532596999220744932707685
+6210672490680638537370704393760193333970297977253365672997212980801329671424210333810500664050546692669173806880821364438329547
+0441850655848799432631375117017035628999017015487913470494267041654835295714453029034648907258088418618148803149605119491595378
+0667709470097778550996561398901373747557627918533058120957567808028277879620594852014529739234370013800886373620787541449928329
+3125515897530266841998191196333295200100578758020333846745697177799969213733901430202219148194889600422499239512275441137216920
+5650415027342249979224454839045392096843643602822206652387425455763721764312986203030589819856297909492941454232871627676382600
+9334860923952422719693805188600329744718934283065130982713900165662458916981874159673444880197331666542991521443060535788337790
+2260464469972488038180467803562022523783671731570132720326212442908194344858555602668263231905684505806559421525279834670049624
+7792295078720351079690690721334629651981883246931635344717773193932081371713539221551527543695110154112122644215377568071412160
+9195473483543180179899660415512485164196998646076213127620507751563271324222304453084630241541418631528227182134165081602418516
+6107199131518105376224811112336028754695240510430182476876463353393744511821873843541677824666782764783493452855094114804483949
+4681701662176678506643507046144062278379351438997367570137464357422720669913574736380880061893275748247043675527436431955366100
+7149553832033242764660394022295041894654956152213899886346680985491273200086975419330405272293533518246991447255727068177450390
+3655198436587622677364860349928319378663047397528676907239140945275682820405657108502041392682979560846597921188888907265931036
+6476533442276806500783053564071177712515831376234094631885310570178318133342242810813665266902989059805523937906419013727894188
+5431372487274298724777517697230193875880937677668764659986523658830811826735084723524757461022654674192380627828684371745612348
+3820846618376083469895407196241963862417850743410179248545973893510278183277393709562656195366243761330452232662018800107769440
+2069720833072682115347026542393190511365870201586051736004598121210837565385863777323843786272509797134422300430192141780468920
+0442031082909423594641218252063553777303614020588281829250848330051744891712248697144729676289337492695365177253047051776547762
+7268639820077382077506959745238922291525171731315329144119549984484846531136030620064784882237444115815092112452964098100945835
+9872606636855509027099907122315750101939814965155251567403611737103452272009598076995597635176083234788901670535978209531433759
+1085327638195333244518594079295886331726523118261222009427508754702667381643585015276186491128806622593525832828640622269002176
+8000558812466886549021793247340135947691306446427709528028498200426365682563584527832696795214569479985794618339152398807896264
+6187988847312530289136504030984674599402925257102785831329312431749794271223626066515601194350356075536808657593446997124519277
+8221593778261506773470868068030158332034878924556789236087379527748372902142937754401272228850387450354124993708739623158789162
+0522225048132576688432285718958345124544338046135042578516691967468794904627442698787375554323557096004260191198734997094093259
+2462493092358156921232365706546429643442698260566011347797207644508552329524610339812245114706710736520675636593241151933904714
+8168806409481440220552654041925492552985114821706878419857282323004033916474011864732600044228285384350058041710798941857144196
+8456183927145192331984325229219292792322346278563254801756089348717336352552507588302857665733398806159165657708323657950532344
+7959027432654889449179694030583164431534165468437531025326379868797173494533488353046359898220027884040904102921916878818230634
+1572671474039612214962772842653777925720919829404267236601529791378862012346769450214240286963754895280462160430824808649254296
+2713235643749557564532205594282964657763877791499599519104896455051738725475670902079776954156280521778944415643098383791627273
+6105964254598123007279257593697900824845572590247120355844905046052760198392683039070579501029336629655707492386250995234644336
+2615762358163929247483738668566291188631481608731204506773561888479176007728316484171079619334578564058039995926257045933155309
+9915284962226636771930258072321745421222389817234966851925987744510291810977458517680205953227386190750476782698954854970577352
+5673578687374046860672064496277781044455548859373704110716891640260365042726694184132711815871762240294031220477588483951772686
+8668728817231201425334885333412781573848400038328099971193361147160493544335456580227648349461318031327984792185171580102807503
+0169567182553246331404084202997183149669206523460201655479386533242862563036582654644409484005992680312894606697548079677284436
+2408634459821807360135371085559754639951676453609356475891807606645289547821918227592956096670383760258316085039325249167270345
+0639753426126492725051857242781368140995333223012553263382165242568922620303770347983405643905206504900791961601071942284936427
+0871588895354801816598052309754202243843057099627863238724184518284044817748295192358320828895054008513930794283973928514112196
+9798654324310664456635488952439998180995428408476235283937134417681364575355417817510233366035067348678178856527757300827180944
+0038123007290989063863175985592778519488056333171045377703085872568160778246582018586168915869948568385646644298618780983546355
+7869384600764512734048062223566504717806018441987433044570169614606144975153300488119826197625737171672582011169222743563965980
+6977293818241046999651425289984525444775996710580402650890897413638457082477468109575400763448366802872239506128418904706794072
+5799904603862986594106662322483455329279349540532965537255861860553280872874108710364305979053889159756036410545175996560632213
+1905113425852351684154357685504469533745516493501062212340862826870385326709406031686063551224557399310052952422838419329227931
+7546871961833002037605725905779115533289685288706841277287949763530450546184456445185142124516259820881277398739985868903009290
+5390552777664596373149764240028438950449670876087502765011571015373476441820757391918243018050536384628502031771242890575429423
+5602898175403670523511959645093602460733826479169195731008780332981500631244059144423791577718260284080812356359230721779826632
+0282070388225563293057775488479437333861437827295440192975141284220068554470734762243654683900921775316128776798676828649464561
+7044919729960370651911034098935618095727733916533962937362197410606374931103363062973825850629444853848346339446960413652519614
+7923852433886365419446901963455158024361204561948757781294971510735411634498000899993250692952771388573089449720039510778006556
+6448339128502198442312788117252393804187619178631365039260121533649897690132658417974431016238776431953884429473283621621760928
+4796673454480093007496675559950785558242785307210144883418877108437084521237518409035829359990440607609053004656855467826840969
+2539967222010309449705096804270772495367746726394308555148839954759386392982542739753442093370829925036983594533194718249508227
+5349079635800249074525176724894658939051245265345143033311987922668779171808073614407324686649849960572890952798590407394876104
+8881074380416317599148271017700792806364855765066986663556628051754736630602571628284291106232498605571402693983906331712030753
+9874937506608818776772074340810498838067037288381814044995123846119534641571274807743575095446827709625774292925956993651483030
+1351712538266765203986454072646816009684736475838189392745470191271779327758375268068178391759551780428792430541942252314370156
+8407859484892460620078868667802179357348492180685724246644370230014476781983275135684947107880402240406891839259873980451085903
+4906163533191850256268583682454988749837419823578079473319346296433799092047235338380155019552271132115175763259341940167374009
+0058465924482070913500147064727037054124622100326796664614046484792704959337155884709332716325316023891570424872580884952438266
+2436800291590505288180953642913700972896437288014085488105811040747638787748114199225450616098949678241069300416404785919318926
+1934599170792002326313718708164205938810092585230289681773510059324899654472028348104884160918328871998687720554532160558923223
+2833310668093246151983045850009608661418327316614685260920047242208439507520352050936476946684777115573214252016051709311522733
+5806306154432125296361988853844471579270461201267503074861984238054921903008010783021332277527690547871326604862832931571535476
+6953887201338700880983597387777946758689636635028887005208234910693065403037992011989492126099118102129494636864406808581750418
+8449828487903174265578895543349223421139970247142747092518020699819810023484608128979286359504168816826179123882092074937458466
+8429190917143583035383484835202769619898592015997875633392860989349020465819040052129531463007708159553740489427112502433350259
+0015541288911157030703391088218525575081861192862772160417721389983310098584001488671913042391958271599517521875772879817883670
+8715721723667422477987285388090627370795114420296274720333968016528373376502351404697409435351445641183117232448408900877983999
+8085119600169893659072473239891529571989304915800525658372770589231187553832358134049724486998092398100951195327740893124363904
+6825971614998820258858203237294363381385260403003703481866209020749805588161211696398124406863222077112906818160524737133236376
+4791287439396340287050946270382309108183116290058907007033269789030152170762597022242414148156450382489069745048352057183456698
+7699407910303700018163871163387977417734630895740976320842794125644044206230844211892365927545147294624099819954065586859396532
+3131672188768311610064467750350104984282723151135474654890501043106825950749943883966630006426594607652504022624213316206819824
+2381097970942205624530028578508606408894416081148567879895026246182144217645044116693226312513033539646866882479709987958089969
+8906558060289356651604127285059333055318644242901255378341192868378040612451560944688746385088366187655524363293058496259834503
+6045783943499511329380195312503328218913377235931966010737751685331040259612353101709972563764048165640905281453608759750462107
+2697778235378791219808122722229257971170129904297461026446932149333464400232434190909889478146390656698937276924878791295257123
+2803907707992452534631676946969649948134841465957319668276815925648168701088565169944440306293458637327427324437179025248962792
+4731713616143649458304003973798123909714421863335575637937266819992047643342146589405067966192841049385855050988705354679370809
+5372002945727744156997261317197525282324231196500161732336217784763019914950265863384886596392669097800628799874734609235337063
+0503789478310331174915570738552836640716185310681333898360502850585012405514745303614418697185463616197057663173866523087604838
+0675037169916204490298120588020089851962810662807481941976840354009840553886735946987601156791667665686995459100468477453975696
+6834794049663185275577105102245452812771387897018848470724588835525127031721746222497385677737902506111966509521044773531500357
+5329174285407427305661763207997349560549428910454568831186538339414510256938492615597532037011523362904523476314189986503671291
+2718934812220309630578226399896956440076865897466517017205703733213982937662658920267819470286608114781834913036578565065677437
+0292082835411024840424424503720769844545589088751119682651139453690649901159394940442554457210310520610468908232856172200322893
+2168944494860484191151489757452268440986053558799687398611861491809004454116677153114993411395893222172780575772632409234094898
+0022046237220608888434835342573839194475118566063006131560443847533169495969846042538404623478526559762435571079702487933385421
+2451919192203771937523596048769324041291130793137730493766482430142235410357050813575163787479425148259744336129889104511577631
+4142550759732390528563707063152034344178846568888223418447224601319163578533878251799463243956174732623278426810354689051255154
+3970640202120158350260730117870456696154229567633606514596475612129033212370234978048801831781364493706668262862093481931515716
+6561924140099494620364526936808552193114041143469574838371934269300545161105733392695711211423415123016324534422409169998476243
+2456534483029530345127697481939835893243537886692901492470290039455511175154304300500928667293566968811328935461117311498383274
+7770989718625939764088550940976599710169478296655836026852130278698487150688281647540447530622442916288092929799874814879443957
+9848763764198437026743206591847265528425238321090574928951078930719540533808196681934811602035009442951951047723353414154858302
+5787946077159159168774450433330444862738778849768023490388074911496672265084989382578533753038885946437129868548176233233930301
+8580017107399342108923739552269357825947129658651850931301283981215557531809779053507136238066452267893979878894161383251981836
+9913766525707178278575810543038685579648619267169136094328824697618419625108889858389235878109542078438921757522374605654744287
+4829229647563208502985033637245591132219509835319418276937992741995767258780935271942567981080789563695276467555561800638017448
+1643138233933525491385701115282638884356620775214978523597941747167932566311974729439511528404991306505854174907409034566035713
+6143827997778747391148759316186369744390378766441792907186485522361511087226349625577289271875444080879557771349971812896783921
+8151037464162282243454432112145953184331053916340169687740205103102595400733446898088691425582734935373310066807019088114280263
+8729904943075565576008704186063345542320788733990798433124383054387825974302546390620173375209936756748717665874520884924479185
+9888909645307351789982700065033105216388788398262734159940626037880383673919937047828435841493103609687935677331602519191613414
+8850737384099163846794178899558085730334694261907207404022320796803770107876986360807427894048245601008966306481139963465178636
+9603978263464022093387313902323305847024620528667574592309994157800256182557220046954796119376040712963053063896476690374286989
+3405947975994172973640043088019552492100802303545308377567580689104604977659913539104938989315677959717470803854511462658064563
+3191162645413432233404183050706031855638390349798393321645475424393193065096426473922012746067572812705091078572123464528104522
+5754070330806062132016998542325199869791387417374085617357171312577717425296247007640670351991232446756043415004205160478899347
+1725194535387949369475223998736399458938442651506418282232173272224426998356393475616690357433350683532939697909185050724112276
+1531609961298179460965979011464443408544699180131732903518616680630569852510445519164321486062756903290742218453214665562625462
+4277461038526097907874522581743597670466704734455633690080575913829222964025366450929288253518473640288917518499198469245997685
+7420143434734074307744766434941598412413533864920547945213441905542326713457623437002740516606230037868321117285609425877483514
+5509703411252690324400121230820675240247540075031296148576782911392574907974824839505516956261324207298130826703943230789524466
+6235427271350178310739006810179034776823843871399578101065895786301705049659021548642844679899589499916930305008178597329009228
+8708376738514576473422684695199014327164139367786002985515660277291737951903297112627302613852418677997201436504553518932602363
+9576506417537859055584148204389221076679317163739081159093922729562344633399336320523856409926599959155324451664857304036979342
+7821519375657055506931717396389844553686714012907465431386872822303418480617283652851337727643122589592938283893016029851450741
+4046931470136635022512650864971382510668763279223722442081085741561189482186827034926915081819290103926309450155161557982601266
+4715454308438516658794722092196206636934007267582801367477453071665674490724227142539801920570519231994847446963269786268119916
+9168041401535492095223153393392138627537574429611826175866774713151956729343684934892542983754029148830727112711391973335239513
+6515970901191127073416539618442535739664555006336299291335206114647465786032988393861387837528101930282563813184667131516357399
+6965025115159934457674823672748261872585621777883115554117585206762204650484234255271173958058407125541367807442514328611570278
+4831064230665616198380860322957982656881003885916660535633639193463684058409926839010861838915803748651536627056017889319571392
+2850377483892889368048618651662404196455568541580082178826055899571765132140934322132515590245447090853398672580050380575567268
+3835035801788676880902622563977805200108581423258706942731469718506605351522050771195525463348620059942550507473397926975656075
+8170641249931936194409801838731827726032358290235160889838261562910412201128942409820711534658779929527668900047257962358847821
+3914141889006189906618830872826326907793134446571712010041037077410013305523598603376182060668984447359850821728080727595426748
+0524288363005399115153078597028593878897064055724890623451683531614421839812503951731500983120346087995189240459208148107096125
+4155453406508028056687037448768955586471685200246991147018630064209861444093780513311415335160348800209398873165630411940689888
+6507947702834259046810555837139361937816955993601288388902706347465220128545880169696095175041923698015462911423095653174399855
+3762547022058799188111929405215622052455625552628888943381861262479627747983891009023031983537685246888772136743333720092806316
+1214549690057757944760791464294073960482795674578197576015074847454616235022841464586043262062684847644609779311315421146732973
+8541338437296411555067873828147460205050118794445175546707442427376724688646895066999337376018755680130878200128406968859847082
+9053903102817499105181101245913670467308052365562812081988351351621302283720868904030918069105268441314194378171102376175885834
+7390879175657202991792721024454048282348887367327525251428650799473344325817058656761335824140200255463527106801978883972849023
+9114858631082305511415208423205161099795092979957887353079774012813446208145355233313207283275642795951235302177270570702859527
+9437270466650300884205636449007422609778006468400075137707364599220020468818147412256802671321760977139033664343323597425197602
+0302618076580610803854795974063518981909366239035024103586093127902225268380234904318024257226627138837362185766291678782029207
+3947830739969480621126671162942463986987058328256455824368521897685045168203062702288692030759860685197940546125045250168790201
+0514803654436570370324022741742361761085767189089724981006110323674867393784988265456553747645514420643289677440464150052019123
+5223236088122199447858422156052424410894574207990368063564291905403412016110145065374098953504598451976662453874666981008325424
+8373293703798267046749026333095880042002196112554036817370313956674653924174972808775910245525212215059736970917924397257890308
+2688275927997288192485396746573266295779844438202521819272050705543165472702597009969819708658965256689368204413111379773538064
+5084094239742086467203807611090720704742678798346329233433650521401666169943202745736920597870661200400002701183019652790391816
+9022357095836768187469229301323281507939417769215045474272231522798590708421786910823915726035891376298601448255283206715063088
+7293988737791411397897393109492140546674166871313197493347838700746175919251207836436115320719048184023218823514733017767389387
+7188783211699643174822974868235729901402276203893157987109644622416046761772620967723823455916506713613144614196470266830456333
+3793370001173936142455344055973062003252783611956485218268240522116090384604646513391487197827194186399975132117817107687082668
+3534299426891086746037016872943029880008565862091417500370811850667508670706496943938696062708498042156433801209832903518387378
+3612904603444715041436728628573199366360323396870491816934924984624193337784171063290043144432026274325167439913901462851257791
+8301153338470277907154944290430893973748596163892611069628643761048471308522954471189690031882490684526895423581669049412645780
+9532276724709021001315582137581907800630208033706211952374871095930264465397182584969831143514075753862615083949416688307055905
+8388236378283440896890187881320950399116639874885181013806820276432717798539692296166413239097562927693580121835296266376329989
+7227163697631743317865706478603326970676879690725149096075601615664615649563621319796915072035936935656249230727588009066864898
+4030193127531435008439718127581289588778728561167418433131262502679346011703797827534339742404719888498611315489306325294200918
+0822596041854995877122241367357937629640300673554434225279391124715516842541288461765835730255187409409295964047110843143360218
+8020810762143625695211304403500380226297593451193440072241550883222759127723312388393491431821749019440262383840735943032001195
+8318237479489554100626369597427649553987985282444811016365279010859228891440704149689826185729924642137537603090218575037482996
+5366847590778547088514990246112762636619967032116058526965593868078207507263589910269699995373744003756645473632293041062685541
+9610845056170949836472700450287286628803643135098265884778110832410350875689137416100768678349522724998316556986352522714663266
+1503726130267377258411268772164465860231491482249362263232011498460531343555282835085236658598989040170763967052694908347332552
+9494811816089738912922010509947751572303760145536902984045309394480942411502821839970060527331347541450194445987076121267053844
+0578064800062529101700072602908332148334858119123936457716348054959136175842817084891684097218981249238233949488256020176601607
+8655837084859592004656876506460130727405913211331057771278893395802267144808219629460783237220481671207469404413079770236276202
+2474357024202046544233057042050406320202093782109005795759352430295741395906001878748884723478079164300747108788119563090468194
+9729275772864119080887672349769974091030926766697899488139685369926038289554489717497100438993101868557613700320201349470541544
+9690121476368923069792412981332423045488814436625785624017824621004713254286195984412682695459029135822031307061078889173619865
+7378777371791906660635984844468930766958298884404755753328140351948727806677530013266236008432182713748064589578467419387451399
+5958115863312505525587296099572988051567717080297066945899741469832877228284562546192870097158128338501540449059947967484049806
+1525360297576645372782766370344139731393001666478941675207716176663153356185352097531952067180451056483850877049391450796637643
+0957180541118429393622724140553758348088782996643755097821436674434023381251140872906157549968145359578492278555879752671991774
+6216547228847936682579390485586625009476953902113956539812453553726263850745606267922068236416232274799633682965858910518609181
+9364762411101864870815658017284551581396524871993598349274914322101521556813705161096159781789698091708777511072561306773711005
+9372502462001712636254133123395734859574314940832644465721405982847453658518168263698099694805090947049141539874161892364044592
+2081215406680382103751369362572309567943724594570823605875011736925225634106628852644577321897191396835476563249653975626106030
+4349971249994089684132392481061788229278189139063384564147513903173876133019427848009965641301113400947275878225261721625731279
+0221661121010559617008273964451895647239826707650461656354872916410348912631911913485548662828141859786059545072528125011374221
+4423053386826713852263693496635804173362348029571154806846975163821408623542798104298751000786068795017683260714515841078366993
+8161127671355970070573405532186939626037976009760161070135615665381704277318637283166773287886342633146869956929128780714287331
+4724406673554759228867043031026142833731777584308969100843251135369865682593955020981079390823701606661557011686336153922127671
+6320174341401698137531688064847461308245007114188039688579142931690284251799997677320348583442367762054912291140917964811725137
+8202757825011219494192886746445679726841310275929718330630078072572216660349917135633404881654966136524906313940172149175596901
+4973259052196790674213907468121479716985489021755170094314094085515986880378978689367545392713051595516162518064260512413271805
+1589006020451052603264805726624921702203140540281094471735610296632014298925191276086205769087410850492910589262019474771202876
+5301512438781961299615681939122770744864098845659058825055415852695585895078281739508660406939859772275150311279745599614771126
+4288153404604175490400855789649207035885124038840820254085618553577028061229192741635233861987354455133991517534727391845052478
+6258955556704090814031626148938140929500657324155298474719121746871071846048890688770977276676240866370191127535467056926311394
+9986426460698287989606477786579619338308357811140009068302509875335795457387693847614672598016435455104290716649294340111672025
+5987575195605597807571132149058303080863960035941811196802177359118666488648716460574884370433012992324776906424681910784438914
+3212828929093079665577584834614675181147027766122500255332258719353578136517199306847607401381636227698622152320466280962873067
+4298697726297500762842637031315949284066464528353792900058970168170276550530718742305480231641988165044232612666352048235992340
+6528595274852601267138855685497658048124785482783676783853867479073934060681129115971059226209525138395957477851256838662435594
+6333253678417649760854615241319608105505866305579272971991684020242948061790638726814427247631657265086447512599362760504729659
+0050552281101516551597310571530814588813676939570968218933911952205870242379775297989531959401920856446210979962385790387518282
+8767289958783485919140054170755933223361121752964753574235200401049015889601531517259131960751322512615901642287582440268512260
+3451721805339224609531183820195682695971871204396323817335046115539455320833063731322682287797699412707522241064736997253801427
+9838095438421652946093122030638044112929662006537527680294782737078006325003341225082530500978086841673076833294743067222781678
+9343880589742192946487883613246357871516859764774916328816004546765194900049207055237803648799342279688804719689248327413730472
+0721971662815930264205326239766135366858450956630362245585637639859898001993676716328053273905567456704608882800064784850223773
+0571787432542029050900323916790197508546510517976343882254348928206749045986326975042209032481347983325984442399998495068210198
+6252008138898607709468342620809002496223471138515742069863151888069692871096460617937300581107228988473399264367167623204729419
+2797770513682558101443641688720044042871553905410373246365721075390692021825457052959920292945148726156660506042073326859993576
+9943199450035463537495910614331149365062244685626306093678223057245690588586113869249388996930139917906887631260478153521760102
+1950460426985566320913113822097771379876492753786278737646554639417059453209917138732302032256017931681335738155323404263671794
+2838332702415027792861677040542052438018840283865010592299818970494138350530560217854544968425238656792859418734080761867272852
+6010463746369529626569768506440616846423788144981864845682008740038225629815725166282753185272670640607060429451038753678650440
+3603428316928538153550803942955541314085414603075220414550257874931378714081625009020301955524753074400211685480928675879412454
+9843069053870715332522840750526561812419932672015609424516373833579891793837439080150576601064726524016745608185730860593580037
+4790338120349419657809887950279987231778879709683733319593125286240898651454362025515251496405484678061036071464115462928635106
+4812436174990135339020055889098969606774850114068102256726271424987296420443648067709292253692100724695627779636510134753572039
+8737165463831035630144985978697481580718872897801411679391604620458063323095158841009595789901639579062186093555920948550517282
+6684194497843892923374409974962663409557384721186689597945008117535697913915795350771799536776499659499378233933827449930665824
+7081582116471192658574426394048422901610749624872891986363877792779389085331435286663561611309448994925468965045010492951543901
+3680646340800173339218788077063204059241257097481947777145409084202800888856762009180382127277534304230302616826742040805136435
+8971885064485253090204122142512764196490013452340872579790701372873179615012971724582237981895972101835369658929642000295179467
+3378697466160221993719637822345980287088027594206423215053076460092623235649859970956549802453476198188280999027211336510921505
+2652711751748836279015697510746966396333400935969997511167766407036252126460465825405459671454621493581082715193532241502957665
+0853017906034458377960386056517204258262136080721053029202866891152909200067791240221407899628896204792320935757942824137109755
+1860549007099165197284140872678756594535459353075535851412365063078974696027557562375802944288504306767016261985686187927040312
+6976439902255838121317145194266076485068757990450059106045155783172858632535344129113251970702093415466811410640476211193415639
+0223864295074452283847305560600110714424512989818888930888094361164360320952698546375108408821282297940103191521862113682311023
+1062349856533324628662077342594233105268417141054370232872638557841382516201012169119621084906023902818960772903834214834404456
+6774964345965594961633616650657071025352025214474328041017041037485163730502274877992356272868337521422636796698369213270452116
+3863759791559426852045781221052728648632252466126078672480213084512794723010528131976170544126507023866299598547784848361822975
+6029193859923289086357438220756059069241393076481467455226491973473927966812070493726378405565631775752820893408930243604143389
+8322645429369121872596731546622494472770504292226778137537611049076304139170096181584862462563435300455143882748092410271989379
+5326365807733260201580801629433084263428632745627040818781791453399164548163815232430786017320082301681273560908524949863305250
+0127708812120756378948747377847983639315742195284498126386446424753766099623540522826797908737477298768890173160498925727449025
+2938525448223494002554985481215274772014195861665818544594199880542548809977177276693721985173829796357491362226406805154130568
+8969218337326188250536163628581836759650127208671515917790854163363077352794417610106050375787449708519147175922505361662892084
+9818570904194161360123724397774706465600642465735373239577049512865171271762814912171304543676985961805640424586977875904966200
+5504575938770959529220023577243022588499122259144158193746005510614090936240126010183628014128216077152330048541538274583951558
+1040854914239994126791549056393295346381943572230033663200164558894293446713116407420635913349055999596494259230893231105260703
+2206196014061006612340848198814409910794456229071521204012047591463330479752534343609457402515951279901699854399989958952429475
+7726196843265136180636204555752895156585913253117092477574090168474904085406088453119889514918675712220848883891583790692329162
+2932979781809321279966736276684170473868093894960203921581294390763273096543783962941941740885305313552176422059326344349963187
+7716303606885535604492911546074803956458411462697046763121884171908019143640932002882802971285171891988638807617682091180833424
+6415461043036191035529625558425951185907448251833755623616264167570352631169542482639741527208649286390063877760359771911261699
+2470130258381358062929085215957585938262216089039199788226601264737025509814505817029779107756588940453410080897136093992799084
+8707632659399021754985431789449236853018112947892026429638184953314257900880019675773825490255337783864219014358786450842397851
+5533932851049276649253727477601106534672571299541307151668502286973847937896722437084410916259029864044870523541806218077954614
+7765554877085157744714903505492619912731173476480412564678818534684847115861709661320561820994876787782948571629974821128726525
+4958648468242228861341995358858962307381366972784922066788447146487993304134477988625345942386711833780639553271598395688961584
+1195610154724201767373227499183087873970044260009821201260837039944092568903479517438262374212926002997007192595185854104973828
+1619364472726153539242937799692428699593667255284692675884347709702639988899768923848970457805127213116307471608615036594270036
+9983245059851562634241554611084024908123182475839572134087792577459483664336562817481606414919540980247553055009390347181343478
+6678203813070191242843917525205623295811411258351922528980269188922471356248950351834938277372740881478275242174992792567496074
+4143356634732380642139347869145766266914672583108623737574556686979737703412637109328384991661662700191639112734811399558605096
+1208518184191671627470570937029456222980556566946874634805220009038965108642318793927711482497435062563764442708954406150308502
+9023312095876743701169506435873830799968604505754154998579861924311377960500475654542205202570979796896262463835446621504771900
+1307938351217139321342488304983730107947723886674861520928741265078308049241789485663045316829261201640722069914290181463616514
+3662774552959414495906707805907185396346911240417542898771207054497319717662592108767592192807181086654802759806348618578837674
+1314737004679848142363776160351558775692327407524329957179113590512266999745499877585915362625510835561292623778541138597816039
+0237557760056059081432345998516737302912533244471786164779569231630397999149258259824248258872090314272651220971111732309368883
+6627477978424025488072609778273019056422203214910145966781125727030515618065001832071393756745595983343475497495207623260839724
+3342966216908293442342817978848639488604191273604917723840719378411000753792919755939336669416561658839344042868764649850515740
+4843734023345647692176295441180249482639581287413972097837107583698158034620661397371501344888180961705583629809207419852455696
+4443380077789857586353070023335893700728665808003439355680624696628418230215872552816714310195766329481088338871468994321119252
+9699439754749964974015300163681954912050318298048480045612220669380962262620582805353459791375378214164628533298845978013550599
+5105714350835688155081910384711576767489399113130569825483778697383765314872304014753426304269107388256780976698871683305123430
+7876749639965180153007689268468639912304158853044482532644498399416286758021429281245070574658924487014301816203665832428101533
+0785808281226435244861112112960701400035860271883263300268756398080488577467688265527817734331234380039587960227981962626600939
+3364281430281513574894870100381156896475296131097244720576919647275082387947394192830802845871083057512101147458345259973497437
+2352548478260815071941762637203003924467368412816659772061510861905396984310747338352315940227937768901334141297190271981978620
+7421497155149250772882271160825127041610751435166048440557936723442915599683580765855387190581730147042311189334715395286473607
+9469405090355283185848987802133089556363626275612421572132540664555746805117424373802421917096772214790891162942671883468819382
+1589417274385691408452755936967864047060787328586473526198572660582234669906554955441129992972950187613542002387015080229290084
+6570356377915672505761938151404215475617807815543585573009407518371861507851745477702147309937407690084987324419699405440825645
+0612011361559116532371585728822626979903698606786712794256913394582020905043090461211508518273342883931278463866340432838401156
+6760882395086214518227285005993629709889190889508417455761844997600135276044719721514847763212602718036483323892756763864051034
+9188515996754462022639889466629680669832215175040501200558563344456278764716592388326318156786971890684957626542747491478209927
+8987779229113917038185012511339563267826387201889188999106457112243660191988731669456871109523244231764354533555547239773405699
+6489667993193399907320056380302219372587627376810666191791189051092938301013845696380002825207303265588504074647639636023424359
+5972299897263342080767319345606033144822159869746010125714876643532020183420706758750193523599953077555495726481141414611132824
+5084488926501974380578938135730935789462111699625550813110845128956753975680460172778115855586076226024263960948204752675321380
+2481196609759725214010722486828189087368975741750919937794099496934509151874334791821893377695611203497436421390537165843568949
+5731231776297026471145248406339411301301972034255825750883890535679456779763247607668575953175369910078981695492172415999716775
+4579188403021146726016160128342968838235818738719371073259844121400672340573224465598262036627730489472180977859344538916635018
+4072803135751982897056486221080699066662076832459383392956264311706786163956015331215770418998634239350534320417157397046765970
+1201062381226118587752910736476250954770728984407318744902312031409265281863798225473350200683876473994417794886956931818743554
+4970302735301544243501924330552682090042743013078749961722848840311456198559231934700094783625178641374367971636230883796585194
+7528520099930871600504738859526542685454459947737830229008160696355714649737859829804718726706633142812661022345510571151124118
+8421496990755255433515708880870288195255467739826209142506221198099596830401844825962275951060431553735295340571732198670724017
+8936767354220444343191661460546264683941090169583805460925893859976635128662736335459378982086771782291262296836018682528094985
+2091822408378038044344571653062122443897076701230437493508375904957950547708046448886825832044918141237713293307448531246301325
+3809577056439308352524023850120731400555497421961772257434416551729487887916281181723448155709611102047050048200739035199609339
+3691135325949817192195090067443211343266627775946016712851865749742799362777412328641698096396095788341581675313236780103509391
+7728571205866997785438131913054881617576104163904406501238204339704104937888486853321561284077020503299289883355914615218277880
+1111888880906892863133264981628224969781528602979570581183128605546822078255116005933260161155631478832277334536041066268750461
+0079412603436706091984459336642210703864450821510237108480924013766858888811236465849216492858539373276328300134023520401083981
+9032711135936968864615808603415924938529404508326233015998723558019026312135753805702013665081865026922455487474085399902382380
+1925270181168851392094205156290625337733809503843149282248914199479920984244708969137863994130437975788618973591803506088013062
+5670224338144189138135191184201868809626683864671529567267492650290228767102161777058656146469480714765930525720049680179040530
+7230690280352425636146176530879993888167423730080287061127174186402752375468464868170738182852209838339454679149339529988407952
+5792512066685362806154726245973930382853685512688261188341000372263049656702777229779863118583825044769296407053427341340382043
+9064288699746230367766305172967912478546347888349770026780079432939827599619309710342120385387650986045115258506762134679333064
+0440596074705090759141142692292577561658123037036520266673482910698027486128518652316613594364723726387332531338654819095216165
+6586405699035556181676379611570196812319147084489164717015394853295535428378692362698265567241807453037131148384149957093387466
+9613627657031243653069021006489437859522461371334813124213550061172753326963975967858093098270917873153645156857962187738174651
+1136920419639517807349446907609250529925657860858085930986434051082566457439789550530915328824048952555143480521491002977432620
+9723285190605612751574356382595987410097040493290287438645066768564593720132821343589116869402530302205558307160327389977244390
+9364492329019171456987187525681281472110463501074399197748223709921114091308897093844593961700969890959904837552334397994454560
+3052838056301761186571362672662664380662089189821373489289767638693120179754848616628936578638481820222476538767896516701765186
+5650968841999476243265351662185220984505585094177664675790716289996388896832182868460012463094065416068468660526498381293391126
+9133890615055659775962704691788335028541094043193982847019337250184246131745395473435608325229593796115617156815138186553076713
+2129458246410892733861841029801352092648607760367150219892460311630359921628868730343711772190656001417014669173768985351029224
+1665772830534776231474157241609092342166046079774561656411248463883336203142778691223352454530469529359343352214726777533890124
+8331713345182730719576279806483123633260411891324365421657390996528436543606816818186451009421810586108827795803801756029033502
+1364037207944391495829014284717167206349222584053304291053816472070825719135329033244226893785498596526306122826589748158594087
+5166290726387661882217520391175991236803942524737711932725364262567914513184343152964650814367428507369519194246642124353850820
+0827084375654733169383428093676562471650179031999648254047083978351359301318312364388282400723012984805620892215650029052432539
+3941456090006715583530315193770635520541951076921761324088412023106545476103418543330517872032796586561611105128147089091776975
+1738857734263197422168561159954861725900337109733462635773133902960240600973009046170223803445433108730659547191448827977753217
+2930699447354813297267803165810088809944869393780407968089194813574507757841359950100327174854511476594508709317805723583889020
+7143123510044372032973820765560757174132206252079849711539375893206623268969901549499791778646394614259993009419795504303081399
+1805751816651443729216778302694093259724338799262345264750249439983832664270852123252647682716640466581767974713902148881103321
+8726470726559295990593930464431140413396151555993515614244807290113117258035592083195115356107951148992883803789239385817695980
+3921614672869622892796645795274584202330027636891305986908354816884938844639467554178364479042973665199423978535726526806853994
+1879696934764137925030122852767473404168885624623810742903886724883175975872670995314600387454933128918537822599476294544895031
+6035100939350635436051361083289099777664034736094529995818610825799950536521416106176327389907566363175789821848187634785837579
+9000534727303607788183270598866205796784604375642000912263136681354291802540390456321071569535579301082240092546052754082125140
+1036718094258942656960699558474884940333329012199962569808690163604756147670835128428656230386743308384472157735698077816035891
+6071364091704432824311172611510490775020204802190669441798310247002139209451209194509056421614671635249279135552841468497623698
+4388935023201010068076632458613446034376062184128689428896319432854524321580911853120662708261911385263651607882193115809188251
+7169742597495615052582018265793684790742777650121858370707225197495242787747124696863007018741360971574027831332907655096436810
+0422401456149077117264566129183248282220685815602963735110673297177754943137791219212563311879171990788150209340116758159767140
+2965862835354985730344339045722772376955873793360410786309094363480176270871774839639924049136780870709007238189898961666868275
+2861817902533679195525000340605947416733205573982037034681250485524002724047643727596821058644083422061496633576063860945664624
+2693808963859011255454082437160794171986401169181404558686995397058453911479501396355062702756373669284391335723793677898504528
+7653550559325583799147678302921854984957213549656349312970370601725315750255349048113259251600824306253788257181726835044331139
+2669198588461532129599972595504488308041821964826043635029559596161652526633086414778498340817442875389328897830361220046753460
+2464008866849845585427596306460289186014718930150794200485697147420894155928351507966633760981788686260275637265508592186109230
+8485080800308772606343366155948976547130610312843499421865489766584635822710314441085925235277117540126323440360094147819765072
+3284154124684872982729898726330863362356401302174583854830959819131037571458234265917476543549149369136036055331113709805046443
+6448518117737425864310082406263081225358862769781154236900286043306718901307704827192440877547054996291784365092391305036785917
+6937932081779624691771675203207782587255392167526245881985222450132700822827458180664476166098376639952639111122762216172733126
+4351428226863320079499951081487882664115198758192473811033557945313783704183329712942802900894464150489698398293843181571708391
+4008673285830233165375165239225902635382169451174378889470574573298752951780171507430341658864697744996790183195739971709305547
+3512291497844318467447674406573948587271898370849211096489030445902905335005315909627516994616160913716819045790842998532630215
+5522629798725110629827671497041697233370597035945650285606531591280806838835367751631589755667302233305861288279338186531242009
+4038072792258238775154639697267095650759428219766235775721809805667537846787229698544718121429627243715285966487077144477541907
+5934583620628679989854657650575271470278836721346368661646073065566282621355114101575479793022577251192819889432201758294108462
+4480564984351469882094948004921988867959440174254223793056014056869119031094103106976186436427858310194322489736576393894678612
+6908132113303990201784965196474475898344897609537622286517498106001289334026874927830753197509682053509801560482547631691338408
+9319954675495203754314132567507992211027517777636008035159464490278748417535817989110579370702464528694578198640300697978306801
+4761479515872183180982458008106034482409223233605055754850233921649363735633967021409784641062684672780275455212963103609820201
+2564622328254102204752883685136476152747302286902963024211546476863845751873654900973840371931652957066788857238841473470464835
+0397866053032166080589875219701391296400993039583315649582052801128849941725263617220137826074241870851980225112051857130648469
+8173011294494728142605327204039773210726054522101869637370867240485919811250566145341338527471719086407653593120324797075262800
+9276563059829040598662749592867289249306923572562392127787551507493862417784430100714677869547866344355462003505196714057035937
+3281114518664069193538073304543737277406653201799960331850340753228936196208065150992985287938425817855366760648223669372651097
+2101840795886669078503855800666686104431608113029414404488344962534581805317909553125776693807861855300451192405993773968098583
+6961316934095858314386858284332606626453618369372169846037717301254036577518610498824984225850477019844523165578520651885370736
+5674574044356298030636615794164061879134353864364329335297710010416084563498871752753647964277918366926080825456181880254954413
+1539836063070409136278143569348758593204080100329208721008698517483741296128676983168524689365145284941105915339931290444395066
+5870435438526474510831874542069716476806976094126759545431524918894521691790318139213265279009865120135936482961615836310836321
+2764563926650270576320235999861005882574146665848294584476765322933617549606955812826398821817999980232276039438569048353472002
+4681622264311366983045853037646736891614380849223091345272419576321258005567715693518336948951455962926248349277346106557405718
+8956877856487148384136234859130353374642270367915456930125213227196134161996004529594088595345226945903651779962975528996861250
+8929969605933523152819203271238663371252277051363612117118809528465712440154903065164514629518743371367297353604095710696093004
+7157581534746462952501632250334837099070591121491848742704449306300549604064489388204805910975177833999231196480535164260229721
+0485019965651431731437912577838502867419408108382589212055345268265256532718527981331506279373063176342764821347791812231845829
+7209745175723014456091749043194092299024100594164185069424964912279120968460389124726898963864775282217153874785467678332297469
+6065725443439620053836394925815928161931638271242410865193688681337289422879252019985383178533022928491349413174307090957339832
+4700128875271375466912640968373319232662860319940601106545249660353269122104137983304514576260940899048020820371598690778056227
+7730285573414592054013879878236163258148114953801223831916249666510471398921760574945529246282567489263612670937049902168944246
+9130285817898813367964618316152272977147568779205131506356566544347370722993791917334237866531951886887339933938523558239665651
+6324176517408834364349803908520408107012550850560156082064698531696664057881361151779666150135225685603149038329558618588277296
+8952307375129199935262885586527056730554419885668513403462367686079193825971303716999017662160537275706617381132201851911575059
+9097939471326158030329763386527360778246814576714519406324120582675890884898234797792200042538307916074737348191079713801271431
+3543558395840050080153435933135880595590305720081325097084551423268599148459068228435603649060705649929053840511309887473304515
+9764838954490408335606543556024437767253488401288444187782685927977837265995938637882104106333802927203512151240662538609957779
+2886694819124240943375973107339251767858923004989669776842476259662336587537006376705925903350515688363082070599436191295014286
+4373652465925317661858189411340138062597385913063993168012584788091469995881494867908911062927314918797351706279530078724029778
+2064997451678388426343449295809472909654204980492286328038224332702407992526584281413262450071832225709127884717383554674100721
+7539736814358108443787011442956856478411159063433502735600777534624427911961386455371172130290891500709946519469882478498227746
+6726050228227536316385485897543745820479149980410361188284581130022635250330849613983713225572081803265842903422696226592604564
+7194667876267325769087238008916325523655281922437602110657822708321617107090571364990182422106391457560890252879023326941272951
+8084067244599983014933199534424787256031530896533024441147175887371345390886210891424383817784357384520863399170708018540336261
+6756491974545573085147283999623619067108143004190487704098038956692693217789059190015343978239812814528286370354978428552071154
+7449780712548692282752907313327411787266027754878897309843460775599392567392973717717866266635813723308899529146352109375925165
+4589899290541494280337702591008141258629373350544520604291218705671399173981123075630121451176103241759370092474254377359262199
+6674505740657078583031897307527013973936077370107324719073133704686647880878285508608449940595668407790459295575945823755660650
+4398342537751131171214988271811959189579782716426212830903406974442463464257365397952526980356187741927953055943122410685033921
+0094907389935032343867848721405008172219352354700721989014087040463745373039712419507660947640188922848825854691917677041514246
+1508958586684510982818262867790308592204381251380001158886369026776930843982561684403451614590888186936500388011892045824866501
+5793657116945434882250299286723935630635472763043771513002492162136250578168782159984593375232995341440779322489270838200480406
+1528263927376996749090311110890532617677357745138138771708962614857985706783193215918275341078100860497124422089882672715412665
+8047862045380193284671628316345513578527766132655289631199372572297400350940186548315099505461109159626804827405877434015762079
+4497649985437114106619275583585240709212568170308750996103273375973255643809512987167799126855604592582070720993954457629607433
+4115202807426887388976298359856110123402007311986746450130132490988863002251413157990023529650615874660044346489668889392287152
+6927862701563682169262409452072639909156413247108366389659864970583248090206725794860315733927719571533833830245401473668394282
+6642155549542044431836970672852504846515539364245490047433571110732970388069323446548403285359639096781185191635964711812010789
+3758505500262572544806847683378518452890545811878275350915244958015902281380798955282380990829046266914505428380626717794710699
+8543173740869008063671194651581188030729498726094049008714991031352383511909957936902571701241692397622133551499445586152966454
+8558201709766887626106558682087493174247508346751479027758498057382070135663052096489680200478789301589881335174285636803583368
+4021046412548985259286576563116974009718144433360698911802741759233868394233863822972297994024437477811572624976113883122932672
+5381918891212001167216621281602456221735226414991801854696667000136111863626404844152191631832767778925457352443210000412625595
+5545489652781686362831418324972755141214447870296324256972282335912548489681306938005662008761939913552064594595349128397481698
+1089524707879456280414931183450523776892076608328015438392554074880142678157014194242067164456688702421957600153913700978618426
+8305117650117364060258714900356625435051024551440455926273115470939757929013176898347131589373525848240533670222323888613399302
+8471548092796793462446437655496090111004563242834114582368336961549825665258690557364306703617109594457055331363141186121145408
+2838670852038846380823335210551520468349670239701607224866707358833084563155287946007354912983177147283657585469121005219622389
+5789402261399916318681167359698620197070246205566424633235135391148334480479925501535906551354569207810065959398048065712057919
+7261986944279592176600370192037825062903228830667505762121478097517284917101606104242575975523312739096999493662697366954853560
+9155879998783130488358931786153797296783212124287955652349632245457365996542148509944356865191456587886152913113892875578626974
+9514039241881963923397516312505696923391431643577404694192615351139994947842245479233801981061807552927418310904314043203688694
+4614887134561403862531573523675942563015366589167507205886559178959551755768826801165790017789960028672209846259757000436195062
+6712756378314975481834508159845487505561014170818191973740730433116802799842074666829329785272494733308089058087919052323067808
+4343294134478763284253795500389053885558601278822120237277266312668433120502431917455874080753529426382802888951317455320771924
+2376278290758786366787499337556544479743289945243171688237218372051181305516529407353834157305915645651032848895215696121925178
+3277461207520288197080048258823569914990769314412444872094153856107817656040287107340131396038173497845042121242427193089822818
+0292406985223320173089591545488895576256166382750650552107291481212988120961054843360076945546651513119822979777064017606102333
+4155585975612603215642148373485509667928447809166188682093526614287990594479841858693261264552895318696996233565563963262273017
+3435051958110889869116245172555488932493678104217964596210912258968214519860568648927109250277169274770553939366194092044056400
+5580589234840522431968399852060022338678890148720329696753155804394492049184529967776995091977565256891476404577309506725891693
+7335500310521157522656023934693183042792687707804385279531540473816692277059506917018062802407212114266734977379325447178574076
+1771613660964024539818471437377426571013833744798577093945387086328616540439686380471290881092187502982926867793090143460960995
+2854310614938011180157233734163443946405910506035197343508210254223120818772340019254546366421372519708012585990732220553479817
+1257049653581939929259306981138171825335308854774522129783756061113569283775667916315356572397505175426434698580681752134340583
+0335808023777690523056395860773496290527877864032944037336174082899748170635967157534100283308552217210895819668943595660390141
+0793041940236886441234025927232106929006722186357450970274155143635586525537995503752589941375247670685666954666533793877981889
+5778831921482018016340449172209749049865029154730502990831586948434948616688177219302113345681124510479338999307531273610240254
+0006855309162866716967524960032543880915882390415328777432560766307982993890466192334347172872288555702927609941028091228916549
+7852480060739012387300892561223523799609034777867042713542472004721462831725545348869852796577495340595446292276187383478785958
+7959977096587753530877434044450370650017598273016702141156049535064683872702373865885204993323178473693440316927580843350832264
+5711255434828429627433858416873855046302807982520306738509536092504233877047237492422270856933123651986965389822895956478482440
+6861826464075028721520622101929991628946998804166738863536077306024363695385475918930843524639833318710346078946645157384213109
+3481268732060383732986016495680958177849607099558634081654518008026716403239770966732475944721762791451888118885285069414233963
+8027947110287197529845522807009685886470194904262452476975443162530080660974564750582146126181908103247560999247950332233807322
+7124796294345362297022824568300955114164662928041497399401450052218863148267186902693402640989732333727359655944286809966607247
+6673207022195790654496166749745020173181219341922393697843282922354805033819231485054350962234180921218558256719281039871046137
+9465616068877625982160091084356867655695114307535279252535857794074660077470905649500203254845487633889884403918357791957962609
+5439735864176545493786682348080515776951063552894497267405045766639566000474520462761676673185451169867195127044329565448901474
+4077128683528317505947720920671307017612997849640361880751590889728513950754717072470243203246494346250198972938371059265537757
+1744350487793132663117639969909905883135140378094636348689423577493817809958662291757247314354678873465246383300244542531431911
+4940086036767442787655065360411221974038277063722727918083568388107313711402640446340277014461054034344740215045925518041320283
+6681118829208967331321877862087707476476072276521025702668676229506021840555589912885589031283416146794110309804988142636941186
+2405582757418961820523544833021078187732693088350227346014916968640935524755515218365262141583526578487828351593275991676198367
+2826944841325179084380122395615301242526065149184196022148551459509194360014728846066978997793718470140240650758184827065285092
+2993193263125920746329597500608467852384071869621346018318097029329594882972558366328973665134862355812606060309541457130668022
+4276324020092753413044519728088179483413580580809338027992824022071273342649903541028827269643668077697566268171224024282173079
+3298668219738409681902878367215423318085688425654045440812819269643490157963034537370434474347979142141704582114328144364074548
+3331207723416487218945222041751113899922244456772815194220564328760009807415143846017951460454941724943113249362066483407691380
+6952116171208702291147492954583173797003314720166450613568401114973391179929136073418264108322111138297086137222772204563421106
+7600975435069311874768177860666996344740802287521757586619300995824931951698677022696322801985871429773970218124919477206966901
+3780912628061324155929062282119787356103921261553217430966183645130255649596951891774470507549609157651291460007364039518971745
+3378164561008341242097804088752883493567850412617992500593780122329644848355808639540910546811625908951376798420135130564695711
+1010690664052506424047390590878204998037797666671722315517689809912733797153349697357764209138638827429140983606619452818262145
+9300376547277559089699722018353829113301128665766029981150643108015654465357713345760938255089553063389045170395343438086345129
+5388574617722177598048137212627225252667251794017646238607267836072085293351506292982031628145496634572585511875570432312724337
+2949102931084425964911707872142235444671368657598878661624977383342922503912907622387561510392479663939836372865380891249214191
+4125450850629924708967370485579795410196136664949644795471576226816969360966521409006096786481214505471016659590219454123795063
+1052876846080196429866636468392224678653280363636952881423630013978399548705549755495939234226751546533383899311389616571394812
+4742555980388054447437326569075723750771475897619661025765632486508214470920970384046022812610698865095434736181621465694089157
+8053089116717921661140443537567547341019450706571788438437303262785839761518407332728972316994708287799676864196511854612689905
+9729609228443111962917503361177873795233721041675657438816948255161968110343038443890530223545306466481706693430767571885086143
+5688308264781028505036247702821583514666470671292172916350280224873269657299593653174145005772915708578064978186214186153683267
+2204744465132776025498386899741825318473763441099667987231878067919021578886769657107832299974638025812458213339029056421384587
+2941505567992035598339903647769230684834003209355669548196807243023989038563917277881744820709582631259852618961087166384306292
+8258024223124059927265905619693379087206675705618331236606891852566067360854244728445479329673501981619440816785961582356678690
+6012067901366243313604096658402361049393912691496270752442176761357212025454418262374116671287518874273805796136109140975751742
+1773101052368269774971707329316287503544657412042811119480548137588711677240886794469483314479010931714923252443537409707971115
+6673163431438354320152064250744844641052080216051967752388682876816416999627859168211126178210239748498710723469312339914116142
+5806996877521195102255361656866436538966669931939141317697197556942791721788110932577145668299881351690980272915197702021298156
+3837290410389303517128116353347856259353484969554892124616182205192313287433755106122400179494690010200326668121477882253979202
+4517266820218197081941589722796747209204288657893693887244618207431797169277035145695561271253339157663193312460041285285239201
+9619778362364427885644889878069243475033064627573715740274290928496163757241181156603865800841856421952950186816149922823346976
+2573799739461267334017539893388809186322465134575561495883735717608135099991766507451755547789018617434096932254961072365198882
+5105319049917763260343536285268328841500875349287045804710455434303605043562842410645690374572514107603618866501621709959657187
+7151556358315357415841531703618215410583915203575998268810030381640117079961254114904804786046065507943854733690644791284850608
+8204760879007736798651157366669090166543821998311590636584404376075249452086719646757979910467231964531015916233682304625227803
+7147573127581292166990486442215222962358403851938571275150035153036061725108691622876773795056511233146161151053768550862751540
+6784559304983902886590174698622574195988266824149602039534916660889368814614010342767085921580402597291566274193343471685906410
+7880113249001482900851888199979393787162065292926067710104923584703156779327643300580458887132435255065678627456912854660490039
+1350749751135031413626228320025567623412283741939627729115634082906593503710519533248918652855496972010878915554543211009367225
+0004322455171197190670578109680045148889288778920452116958832375230435697820421502377733900228528866659062527967209953101213734
+2911494504322931801753348544419729543749078880072226980969166346711819931480214331433779640233877327672317049984114641749562870
+2396528513460618041259531318301991286281693049268735199694175803321673323893916691134629842475605991446026813330356086230228330
+8981164060702124227875449453939249569083280933393885800497807219622718057632147355043854391102180378987437281964171835261740700
+4207084959173122310540889440071390175078165835125695056930143838697501277302913507401666310496334451392319525169760616015349520
+1210081234448921940981378280200458404260945592669718748037205896059223823726981351910671794263375996276697272684781727338912271
+0029168415827572351727213122061796310780992187543596747141643738703113178475108090159020344233281790182332311601803329178285993
+3777296404075934053174216751857062118469565443797038517380817156541529651488369770373411767683949249420334108704951789531604654
+0677478972172417855596910438873967997191564526032435944553932413671467038312980120163881839182106666575810117448701361229089668
+2906070251543291085920125260549397785656115356661440571177943054793731483489419102892567240649669779614310761600563474068066656
+8852394653036692892038076417261650066148179764783605637155006560905389777668215992491194523484007340075319390767759607804494192
+5467138831557823428775541689197797741887498255851810682591799669249141593216801183262480761866825456541084229589715596536290776
+7751352765591319462216158866914539056239902442050723154683435064019845231969816008347645334022334350198037412040594819924724593
+3021915992015948439763471750840891829476672656242373621059864369709314486194930162083489346397306741461969474457136306652660884
+3810149798323432950565012468358334053474435740399651150333513841619654716521117976746459459286758520929133377210685994781661011
+4783431510440557379639204082385220913253340902177656244399207972984745234341006126872839573292250089207868222847639289722379753
+7370438575710728204326451494061012215276912157251877502908542289047363288154325283991522374002173371912625950441590135539908011
+3066350412780717315157416276543477507139338679594873856557881443518665559120844101586947952288770461228629756299270909156776058
+0225437513080408599402290104732039265518603222598728765215485627157659513804399230415740373980117223389491501554877516067224969
+6906447098674865317783282853291741419024882827886344308680586123738306172623618313185104401579759220967002703474556768483264969
+7905688354362418737693115373990150326675244455866285863285017259126406290824772728738190085605025791061658351412473817132182003
+0647939692176384124068167344966453433916156302209336971942526032217331539621915101096729732974008611758025821638418841239335586
+8207612011209373495228760846993905535758093646702045474203894639020884032055233069612162464709714659219943117947340234145019206
+6685510574753704984128082407027684573335104766797904438216667655851315902097650094638260466258758906563426639941626773728838182
+2859725751851113943873234212381842264933438665075493160334098268584252964692288511136721035397358821669241681360772178239556283
+5410817225831141636647896001039576920297438613631278187702231335198482845481821124632157811564428311298381077638390915142518664
+5603082383902365441423743060726658870177085955695406252400018823076710944733837738608757044351867174051742821082475300834328708
+8478410686281696423470828758415498795393164508886616098722313596122431017415306773664281061410625509783895380848928242909573156
+1195618788186485122683528679683670597289650244657656876407897279500115335276331331011520690820997358881740005917663903217514124
+1469313024861648921401247135353735958071127626605430535836717325791385228578496115248025350543355198105506645012545576867598396
+4272483837056013890177205566878534986867897273483516131338967706119399325076036529394304714161849476343886942682280685872295940
+6971223873405564611431588388181753597862284579604627783908270991876509853907693857394999066866716324481756490631331601939564088
+8692753456851589867469578350330459046916706027508903379244973723114291207510039578602992677933126396343784500936297228340222600
+3596764762533798756045077959160866048043299983905049607435425529900440769757414376919342785743646389458775443875643589233861301
+9939277922617044929198368291152778217422406940588205287822196961674791811253436361915620783243520085430696637802610907731339802
+9987990017965498772438500667174890865212624587022291536612477503056361052627799082687991851074848222861818981269823302761583997
+8147838382210431535807715103935094271794068054691587562868334683152631170314268604516246803968415953907592500669227061338962852
+5229815249263579089803694020966160885001383014770540554119854860763174611534378849807683267399405523325826175066050422465261245
+3718808810539902175097435162693814660278935973946526145133557384972950132995651178561319774914749271123710684959722970432994100
+9959643168956842935132972702456973644474462349184166563719137832114600377784944150813295076399096859538689536653676932352320454
+3562313742471254053603374767998733448940422800590796399248016870732131873285978468485675936836421845482343165519443520207502472
+6212070810123317420939860915076451492474105989853395883410582273920108061505858814970010182505273303507369510379631126623445635
+0255217936242316574157324758578917396184805700986741727460755136645033816635143639164644674079087020280816581372010788765004026
+8089847944137656769780273194285160566134507215012061013579883469551314461311271302478380193931275275686279445049118291696625976
+5717365181365376852569097535965171977412985242766246364289767242179344339616335652390309582781287529277190209039953388689399517
+7041440160561255381091312862643936475613988744385378977312543669992877553324112750381702041222192086102659343479767405018249915
+2110051683946677346707980171411807954606467103478530131043035978033107947826868347943468663705645386376022529329242653151632937
+3379574154524802337331393517730441276946707038997138141465007355281465799683250899916025487713716291942082244114027843952458642
+5030312724644064165890328712593254449923448331621966613833157539215136234997090424298061395610381815885285290455631522924868317
+4994969373293084869354149476773798201740005462072247291096910619119410509333790774262072570461057954016819195195682237016634823
+4014617100181465701775054953697719420102573860376968588430229723536957418028396409863878695628364581200214130204435051219695552
+9995923662150908682939564279380158287700441111607726222291472481672861788611478655050339588555615320984584521234687823576281254
+7451463346941792082220143976579354392136627715379752529027471716966012381538802459409604897867012386933986500209811720725405141
+5447700282385988297313347229401494009078606483625633850809103068410968238448493407439403040224936061985927544263475630989480459
+1276956495071860259959641422731621493130581830343261790000300846232499293476144299954615667025912420799180581171607386310558493
+5072567626180671481702538305209899197776259094898315797269647260887831166441294066368414302707370453117631015362578331461379694
+1152681127657219064376008724117880126055071670561685874051473152694654802783634954044854697360607744867225915714681210070391625
+4963921877303857727536312369203728666152509364270556408792999159107647346567121427484742607873371889230959069964077737186080579
+2539117036539210376394880318723799879677288248068497337514544989379323165067241670457629058952981263712005132132192204500173772
+6813760519782616773952896216661044250831393786872842763541388164566337619519250295645333112400558661044316307967715017816016933
+2537593940009216399181185307950727066601997003943463162691283637037387944868769661465346762713541328987499170590124382561225808
+2775885197315288545943935069058879566010060299863101752754477420864624440405321494564586899592105748495227288314078895511070581
+5073590254176183749859074321316849201765757369989203202482670238574028719679448337609628523768999643298161243528454637871645997
+4654524903507892912886995134469509913539767744116890388991007614902224668150391846827264198768560243067636303891131378158227338
+0324734826151939630626306117202466456571054839140771329647402994885021118469683547773949974151585727386291916309232652285623776
+1825578079957905035730446040937650014976367810409736691475746813209385827351129150863065044732028040265416217520597270250595073
+3855654215693196726130528392601924163490164258356468808028166928343554047073423362885338439044483545871577569335583661986547054
+7793570955613127244841652451443245937038624291178210631123294830620894480548406463322651814043971289378075631025886964612359732
+2535751039273171851827163526482017707846468207349048105786558968816006070754676314714316763865097547820424829616783998998577881
+2844480806501005182020568712353744447818200854387376634450572497810731969576672980314852204195217762355809650187750497828976590
+0779679209849300532787708183193857610170295918273464149221680774855800423860839661690361920242424552243626034568783063475060030
+0715723560396890811677256708000602036818903166537471742271498254161510038321801193648871563911124555662395779532361864351019488
+0796637275901473841659277764647010680246421160415288649143217531307967149087210418850695712273237810379507829287822942082290828
+2503374558287484037225872566037347531382781922322502069198289211129714070730191986360007963273941619249637438751324038507743444
+1257552500220289953409007738059857241268432142060119245938800646680659562080913958426385782354999183544917531229451796428251407
+0627725746927523912542272514587614535547975158991752064909670083277315643027595358743280831654266470167938798514468394097718636
+8318980485800264189777412075113224818829974167411737699158537404003402647667510002613635249834073904159437111364326870286724933
+8736390761693005617348059895960699070609999931133577397987040270060440645814471436005094800905267014783073740415604380803498206
+5542024002024944354928529036523594800851472969896531771028010643441490945234844042008320398276632902810470392426566175025658836
+7031032484519885828134561441713514585691824451116624144085217816423547864679125010423917860268671111391465300826171047260397179
+8220783551779338773320989765886440391559510492663544076020535514257589749352990988564034320388602959557187208585104844145026439
+8020438087951116022977373383495534674635129594766601601387483705748972280627013851396530590121458524210171753315286548207527820
+8153810125605918943918826453140421737748512940456044065444292520385926730447939082216173702077609971171912049413332448203544586
+0886669881112435179401237673978622874656264303143999122578352317897806033193993865036799045024203333380525337357889563568831448
+3748676570310585965679075167577833926365276411040601559021494474638574451420952356408036362315997810486031449429712897242856220
+0680179178809075888645900355703866665848623566100723748395628721560414660071214664781095082893581316152736759533950009932003975
+0830073511229116156443164078334884149650348116571315260656550335371524295132896582152314795929439939447827419494358066689706173
+3038785789686019127115381229380791436051546935860047229508729818282744657378118473627065099573727853891404083449592265655152693
+7387679714798835215773140865910355708661822160467627107526217765214393654304740207983760504979185513943991488603347106187504836
+4959345618457216694880885929572868404119594959297665383045694122211724921300914575522725438253647266552305439505601459584619177
+0467037747326795908961510775114924268777468775918327644966642534544042676564308146590029193764372898938024544197186375500357840
+8285890907673262212647988009259010379723054727978121814340184295658072413264615156697842474728575585169324914900743103535246719
+8911662589073033021628854642652750279152366994152376376433694906661951714454207190114956328995857009825646477784015810868978338
+6105850627169563438884040914539421660727931317710596144077279839188308966168911142486835009941100149861369756674171355191560490
+2993431983320455272922883788672722733898158280538086533775288120030297726075605253307507669239723828996651212708874872223213527
+2383871203918607138972250186349539349163142546547549565946027359258489597478748862408648058675393278207850385093331126182621573
+9149363763947487276724850656041160743708661373179229186384365572255499194358074217364047819850970764281787263423869876082053909
+5827019270739581666492975342346328261479975112685223225619643483040396563898673337995672909483700478627244101352870984979237732
+6998285824391825859392150613924432428270654497491969804735086552708299672203935039153979762171440238901122660133544046138761976
+9253330844439113156612382643124565174653829532487393981769888635312756386927331059248556801164857640315799609889660186200071275
+5612390497528583434894505132668347409216226770741805847223173711771542665456899372500390460954330204857624315915587829701045748
+3597132578062559495102590042788395347495253649400865738509995118091093608521019322954235222572297567318636643867386469580449507
+8425515407736939284693677162137557410259923224830338231554842919234034510500493129925331580967001474100531060588153614511993338
+9601991297057389436503665001505251866564553593237174176487901010113004032749058341666775216970685449376017846133214652240838962
+1863773381844384208184694104858797647539515137932214592371546918752008772143433088976967184397882651789039128762093118018510138
+8436667156247339295567342218063358078249911156583296510351786615409192064411950727914656163850098232887122260394676405120111886
+7683313388786537579802951656666063632278774842670516448032010207156251926218292168775800210222391153956472045994503212219850049
+8209641417161775663979384085179876713787424866821458112247475298894421880117371699371735285979992519666751909878379569083863705
+5145614759445599831570000861590726100099887859826097034388914355367729544959518374514940678332048394297378845981970826760413852
+8761767120217732947982706113384060618324856798940745761981931692821487049372786616858603289668185012412091827806837321112104047
+9255297129664160944098264261547065105677964568103165093339743646349513755899758152316922927563473869566225326724560456097296052
+8120768832977744822631836021474402079390526097477803448973026451821196612519143995594879311933463926655409414749552006489267940
+7017154772060236322937445448043347707331947096778317016923510498198624836901896034874919545286197554142622789268469355512048260
+4180409321511968885143370514200618650235742405287713769661977834572569077057120974054874981770237845015640851329981775003008191
+2674007147813616401003929214576628097932821870524475792725335810151140502429235053500438517449175945097953478389066531072308154
+2478433215760250770512406042154394331540911914042172939884164584979797404189940441889258451913067147217070836370940898306980314
+1416691061574950251933857581530784660502363969157027453652188159283670553356947339926944472421121743170291855577403109297001923
+9846364489252978228078702013876774947354134510165101268064021721322665802683013959144338916544348159574015107727356473797086745
+5487580365242793847184389294498037980764980441864399341257536426029899353090372478661527651346349015000812904186890490170512422
+0317001187750772629199900746610544979042670580491329322209673449299816557793150957519344382208574308527216206006597313873698350
+3641287214039996737900834675182665853779449596351604582635503134884649233644728626688852457677654231608768591360986911023898427
+6414868015450446904060895609231719309486232701910101120865147273052264604064433289410480856555673255517305129013544577242362891
+0524147637426415811762515415524550268148125432394280267631328443360400295790051752698236429135771292548014257090019134991791562
+9227410989021340348714125220582535723860559138846179511512191891037914244234245126229571603923532773311387103298341477228375501
+4041581080402587294355936437638145699274625343476210354812865278292813236740766242635378473283614144250925302804707242340663339
+0724867859827673965725683173043844289022888248735884487800477685080844896245015920731492673699852061747889861151283779392092379
+5909276888786182094219448158615991460321912732697015860009933234510620643391119454097956755043612428806923128306819132701862789
+5863973408297121204616907602368353757254965361693796331036727921299882051062544545347637276552415740930878434572627384251645258
+2609867181490019825132280383807303218611438271972259358234476006167125808789720811193408861105326321587061359193074883011503250
+2053550365140441314774770422273440770268402358845803831349391590570354084402287239858709867448417600167758148787965827714400727
+7156914133575985423380170082307013620095209686338890246264669241382877333719091759478776099336392938215841439510174135934515390
+4831194527648288858829733221197151800308714018772578642206404911045931696147282373784233544435117870290316107286565703640910861
+3300965303400428799995252612196866095687126018105212822125411581947708785019993474053195560005697252054488325120896486904066095
+5685043938431323336868482886553258817526871549549389321696880672458619872963868160503420041705844727261813948644337640127844475
+8437858633093280150489850618743229089133908480393577494682517449743840953324665700848231841040716763791338769325607594504384201
+5092632498177396936492730922026153200701191354311511401621705191001018224605697557158822145660532720002740219521243300566753090
+0884695364629948365817606370132571392316227842180869160712531089788912972870842630687441550199592940590099216041036498458331435
+7030125885795773170445439886698551870214797580800884149092936799091801845209138388276070168782087225547258102113578759536143915
+8807215865608701057987377248776702944861046260230342503936276411275965656745488818885694005475308409675094846381271540973613956
+6869008153507650455021791206721217199858946589909935757514740552973399919912521587008600090842850454930346920106313925959869436
+8747302342382237757458390343882591560184411401946674013753631245032512422678856746902092711874356365404625893572768808561925896
+1816616401614372016489584185015076832989812362352963164309054653174766477426767816672229374164734973950570074316503361323429424
+1677262729710288413972124464110274430459973064690910792449284824422312855723898793069294265613363135307936039462077553033385323
+0904814204574628728334178723557725337676246503641550973591704771295724843533583760990530372617065538876854581885105724368370399
+5318034405787225786821497050581659615205871549939335953839157390829611482749151979571742480565357809673956661177238715716708421
+5050974915162203984880371984109598616980412684284404767484126024659745317958728060034806278671739980663056141392010690752871879
+3910704359349884254016812391071406772666793577154924194799659346664635964157482006918898999240501149700799097400684650477119203
+0922138102426301243886965897610590765176893150415296968278489084200960754236095696787157337789651225430707548067049568646321905
+9034532106902339573322445743023271918597056331210862099117907113669633072759130199009133076195985791779283506809079562559701881
+8961339360352958868430789580169262538709387737102199957461921100064868143051486287683576990974108237901843716454745741895109283
+3895519300319620380905559168583475674843131617139726705719237185238119833221024548683898215318859806049104445070815116282206901
+3205107673082159654286800880087962054713784047147807335322961266542952563116519811400145837980005316237797804651103815235446781
+4645211086556795731679627686638624553276782440503123281227932461374131645478394881186841410205689089468850242938656791425398127
+8527652116361873059872046061450470630778597394637649835734537239971727675715042761592888819669786191505268650105293343814467234
+4729851960520632361339165114787166123924351946142914574237488059076517558856540707604936767815825051810582920267228276662907034
+4922524498676764577221603274496474839043188887553906964245432382389882944444308052516105844797654740378920402689234115734188908
+5209597697295900954976185802188459574638626316316754990028635919463918798002460967253179124238772322245122243876066379489508079
+4508289933039159505453489164861720999217265104842659882479905333119333431390108947303039851217725991104705191344280222412086293
+8069168568134508776661939124641765187854999589971548041638843098203486147656735371454412494419404765242018465434846607552127178
+2927086453284193065980223266739988186690361081906781869605569767794118257589865157784413584255650425147523732344110338440580815
+1748049647890769557692421227727549481557775151410048868814718985045151061237011017099100528551045245586497019590105694556854099
+5925541326979395577276086387515399363166724218914221343444459910602377753889752768375789640169881596578910501727353216027189265
+0670300499827706283025120061244353545380543254798985391943205942681540582832008582661334249048815794102101737939011541318568554
+1807401946172440506670841188965007674553832019157741404977051650612570825055419487071388288683499429125090172081236081328128795
+1574208400432062514192736694804153587958619698259830513687209529110862276181211516095950235354568516040903749851761677661305637
+4121149896620030430814848794433445919918770329319490730619096312332656236065824412598168467443676868836685315118978623516376785
+7498488621509709129976594981432727530944618723741457356588286547102533914121132990321805599546945869002131411100756554367181741
+2582026542886480869734858959495104201677107827620049653093381222272376273695750172303884972292405628020932588645381010082785621
+4289447606077369793749546092089501817143072386741950941157247080345113014329756464038358626070033871947884567651488044623905631
+2542825564877135509885226287724296817068865459213301536696178082552402072123707396192496897302967815948042943248544343979991813
+2226470997115317096784601264496380718265218871198752715837658374418501244345114451866417686910079224568758319235433015428196960
+8662720543840647608329817530425275416788291903848716280076563958924728751343578053506896388100895823567897044421928057610378475
+4719351914296817015503837199703117466548446025449281302558021903566930798786374684451211437854302542934198900108681526080958767
+3447640954611982803365820977016952430036387460526610055495899354375691830575753318086903113772624764685535267168082007345740305
+1797213012073375178436558221355605782112077809669165249433528557235690262339894762165301931035587761808175461223039297448962130
+6950060736132243209446984212914140861957832417030579738364918001660026811196800334571314378298274260059705895036596817108824926
+9243829747951735931284002210476722019445511064984030772651417194277223668272106134988724834976681779756839767862454568373306618
+4177035873387789691442645602142232402697759139202124087044601161733861189197322918438352811683833924407803890384828993570282474
+4594126055178872656922618774167034354795564094725497124745719061896909861368756961278327080697512762579612758334700763137442983
+5295668887669717485226390123467973887358507953479829153694623729169375830523050788966597377361980793027344718171019365784257200
+9888285370457729318303943315282858750583399490083047557333008218529891417381026015175475841289968239416942724745429537867737999
+3215943066766119309004524839024701086312759322446215895076113158100056596170634794503064752363481133827922180405978563689758589
+5959944414411467463305736849422386192090664596675188756343645002538240622043092367067855848705606619349233737685916244645398642
+3415921462522850660711019463447810831161516098186857649733922254277645246597288489872824421913456035668900907466154510857353878
+0820770271351282269897729773480908180216209552917101530859717823023591831191252679348064887785178954716044181664367902784712050
+4837078657362119194233933526772924288995857318513107274934487922952892071107573280347076419494020490239809987105400407903583211
+4566520950673320089105623215464822027247924240083971798563728505499902175676964769999078225165976694000667473401833118202304025
+6860738161875565205941822290237567447513259073024464364524976929966835518792473395436546988594137222229184152759954076791794830
+3322947265984158060992158624663708425488918876383348951122905125836522038089874259881383269124957101134232722838965307585611944
+2514815461210894795746476799700740431234580399243562016925036790171527515771508119826976806830254109945111480181093741053447775
+5733504011133442490826886677777865571712956442700084777358932735387221216646199198889278425501261656719619101527490023033629983
+6816820665025994462583833453804933866931009904653183983658207938144775757074429801900721418490709180940459786270732207357575723
+8952696642268346283355069787962809893365964014926493914452473794524489554221368619837559042723108457610361497745820672215991860
+4686726618791630599619015305428791046600757619220375372642195506961581791667069381025833026424470965152344317512976704970780861
+7817535100493702359961847958187008692676255354707895369219620793484182638707169828174557995935583658475438688352992259510602626
+7874029548817067666626239631331985390475404826024086339339243583071276348104332609325698630718922399423989995185805657290031135
+2250809137006081215712604683009748641626154723738138936917095298080941105465629041740614734952469019573555032467949707456686827
+9015780860040863502309304151201467772727168204445161990634325579174702838004535428730659838209979201561616665321137059277802195
+7650185512550554196643188069669262493680280748343975919639135449289335914799374871448334387269516977974949025899212288538454112
+8893662379603774306702720358700430713868475310661351513479439829552220384722225613968805831874918699875259504799262267715048953
+6970047041565543406988313458814942522252185061892588920654751003945616453031191382091583403673677641380943374412110595010134653
+9871101512999920825593895837672777862350486799080847951285270490204712290524251977042420133385216867854292673426124017430550114
+4761750275074356557669956909154179090706612051478635506091941757942400068895124161242203046266249256221284982009220935209300242
+8708015446206142670623126732884105024418284851295914904738375122444129503796268180002105711502782904456582492253779456800326918
+0613210293625239057781585677639979950255289284707390038337154693725678298193172844000279478330485593483147704265272812526895779
+2716164189514060813320272610067774089300292554132648786501937337701166054949053895064937132503546260829302791728809439780621266
+7313188607076954454240146509025347232689443993903699487707438769611328865209183398377855897661913914996316621615825549781446347
+1784361684093575880030474001414660619024654155783784777347697077774197795864389624206377564266630250281594010870492871026068899
+1515638387019036333906018359538519902111800466842577317066502746814101599618916383605825219038858550204877062732542814333739145
+9220084992150752811004335287492444508585899566926596972214201784424729857471199982968054884285888711269768545472118962801716609
+3225729665605184922610258057387753797602084282592399424014307116412082926636660405157448703031528431483170813038850013412917589
+0896837209572767267939653527113544043129466184693048843785638628896239995824306624383959725609177449846462355536652421863726297
+6350549459745687058464464835566280558244152696093628407065101518502946110700562358545869437041517797874386126356678480069546762
+7437438880206605630925397821472561939196877744334362718590301519068712375301433711985727209285202108430567240861306104506294438
+3997013218626793371442945794751768102167128014691257491799130532817890787884088430906840628465718832537193051422942089432586522
+5767261809159521411906210527732505137517003452232973525892796163942363843586179566469412536807588910846358095073973053136806664
+3610420406657475104037145580225980872688624964111041381549594329404718245302720059446156211318636072750134363504069278172819616
+6203445793416289171078116228949526537345367573758934511473904862922585007326728074024526181186924979509692268351022430367531902
+6396903617968213357545062076755915835538061764765669442173658896006627193712410945197598872950553456423579139305216599382954077
+0380250815827704962815549731957552434336266476872009617222288199268494650352751383734703683895685962764217150385921949138345511
+8687569627504118278687806727964146837523838460065586633962532325989849682060922414609471208083225295893531164710651416235932804
+7419608622045901350837303269139752477969857182975189849619797931283834755645259685017775129366698872709262322484867769237487261
+2446574648357299934768068561355356119075191099390351323266829442188920299959413380468532819783426950868690325166385302101461953
+4690378580819708064900475904899019106498140395743178471011674929320871266333196561704778715716963538368801024314408279647276339
+2089232113041890885410086998151297290297216269518414003124742833718798363559663862672468722436254498875698485622178498338429914
+6550115139019878137719854465346267455296956376622672210869101826618943385242099068657285404811000189142469975735597865828978322
+5550336328979484745931555695487878550858216320770924583332798110114879836414978841309407295358874518788123614542792919395667790
+0067101966073227418786203809533671075851186310058420930636457857938955159488144881158165188969895896949949174391923269110027161
+8258211496051765933329722240348370716824091139227581167499651455166693356343053246387421021603939871942981451611393932490380081
+1143232998448167618984488431281685110452032295577636699995232387576558530063365443650214541186195345336376561664260667081107636
+9153874053518331378425571758003432585952239206770799268110257888073536748287123822972824857968518689632999374391956653833541643
+5746454771428065810576182766708428737462219904665952012954717596322305804801076045993811560187169208752861306869132853087960769
+9312948167988600676884786283729313554222793557251794907465964089218336400060941052967060271657136677975942167674352571570304004
+6999898093303477247632176216594681728525645905467929567402604064471637964034911185817952376210008390273053006469300379255866531
+1000632388106711156678341302292429215991586500122697419661097904387224375829260375948304920442750157857268831027577641937349960
+0561600453741069995026478401094735925203677529242298315347820295756013844421038599646676315356655360880496025651231310731701615
+2967967299264819933654047107088552569694325550743639578846283279457367587777819171468331383302126179626852498959303153806267304
+0993137404276474214149260182488025202243237418254946278036864473980040065830274036040054866953015031416924556900973301250401325
+0611401987313671825312920644599670850377089684826838922442681491359233283306670402386279700142617583474055662080523345059224691
+5939710996631567268204735821745742750433473750474145824948890280584535509141301239485088599010310179272128880118496394992466934
+3357460688499765569727929892732936606129832020628130664357730146150594561279515636082352905831482949527411745350155774277195108
+7138561333287682465057643618887421608272303910896561253448290571853039520359195699641420904384787139962581486218527455895010235
+5098065276517497532201660511210544476729427289544804994012760004734407796257346283172974549503877915741488118551582294732680387
+9918245303994525211620190522775746453648980603544567886385199869862202445674868474533709002221515555801308081350907650459178667
+8721390287975913893819238889792260446828081274233551710328471981963516819510944667867602212793558775770710289206007250029862895
+1280952122455041043530594319244152931145497436315530258653194357643115496210565410757613267156777417895715618326341142914815577
+7155758483619829149138641241642134167637824757268284393191488835351550697663275036059641871170325362834558782380774852273848821
+9812670602301209189800121141901793479005817704022886493550881027819499284489381378125534965938777548562514868791510874667018247
+0362874203793328000664031717659796956361927785166994482222033051420000873310315385500469809294516134684467763731164514267312822
+5076794324739899424289073581881385172449093717540058394689713271226423655501988369216296397971568827556688651950460247532081671
+2211691279142831153117347297369818334578478434502829176759746633980926915557525626263924160377780019382684610945724739361356924
+9219339881449560885105533284707871200679261887421531149034514599874409542178946360778835736536874753087132328398630153344208176
+1738323078966650030040964282424869456011617229198020575179773319844636313591780039750411848469791355249483448877218482996481058
+7662725242856974627520011178425574682734942204257582618062074645522175607162830607624141450906516065750218377963070171888324843
+4118042284044277227029777215730052173836438075783336538165120621022353806541561734384066342123951846452650796265263415816226504
+9577454228253953925531431429190317095770965424733462598360193026659796995068726322946365945449373804244913417484873047389958047
+2530447003714965976379236094037411278014717964765934254550861704945379408174897820528178412885512242072953354276409893858269606
+8161920683332117194434729439905850512943519462231619259091383414069915670154194411541846032268055950920748136328515080957772524
+4455001394112823835403683958904433147118332238523201500644925421808301905477707785391327088921953707802405649821266420465223561
+6446522347006213132203935166470869874136295692811490433897687621265910913874552752126752166818595258011990560857727236113871905
+9408818174849694926607806886600067803753381428797382723099805698620415041534972953179055866017711870699147517868454045402246335
+4135626065428509052074741682443536368971147858952760160985560880547769122981012756994845114634562103177568847660082033374741355
+6629483302659977998713743227246471116209038004192175569114510152669193408163108052671223081581651955384894038833735367319970945
+2019914369819713476232512996482094786229436696697562766992595975532622307992117773104105916821954959122045124593739046172932273
+1444770368011659028126820519729159232409884803442212877208399135578736969682832974964729860145229172744181374244786183467104294
+5285602663449673777986234552062489192832103368544537902433053581936823853505740285888319749907423551259460167786803225430704894
+0644806832972865011089771228494426041526498427256197014809301589227000243312341210098122668991020924989347084902763173739593342
+8397927825150753855181618641584202156450292633924809550510911217351590362959737037094558684222129548773410325105794129798697578
+2130742130526719507540424131716191473755652175799405630787752600339151530661377691130274509280084673031861647779131553466473489
+8949445645797314751748458206320095870152672752275260151260265707878555413048057771903238190200758654160960860864191150393477626
+1150155207111417862229200794999414320488018094694431946879621916439109486610009948685634866137188097525670175207351289611083094
+3459879841467541763732336521769192414341573430800023957612803685733924880739274791648569413015334203212412056584388583105695911
+4207107909576145869607620085461426361544959409669769028641359260476393776996951928885197026584290166920423018039379739461412804
+2471437021597594937922441016847924078362096363319644062767483944790539470640965768192086646725793415577156194561524796709562342
+2281835051710898850388364318434644955789879751829726732802303436684019874264646806723409567549761608858039525219541663231620839
+2007932711287625313296243751903200023005400873291491556838807519342296983784742524733445763971687078693207166472588686547509634
+7628738900800911617227705711930133205924637233313615650647097515124961199263711780307927527262674727498690057241315682922136505
+0493387404859274797132212785618181333173806092520644500400240017059008198178246301124430115868753110589721037771703980382573162
+1169775643061410030855660308847307357939679557417322697395889694976054211267593984893969933792226845025198715121269754643254572
+1728088919686607770305974714811474045083911324960307426887087611368014116902540202262357011208475439646884185432232498389602471
+9413509858059972641349538923181108900150612516616095667778909942463828217847216087159443807284569471198894585206492715160193699
+6728843665008266563029199158801993529576549886997200057517865461162768723429256920925422142043184781462681238742660537092344889
+1931599731390297037090231505612731169969829636622229470099002019655957459951531223643763907113518395449915860761987492535032339
+5034107674301251502545019517381773020837552557746624579624919732008873147762835295630900229992866373514578020722517390727520774
+8983019600230774694685639778625463724553591351398381775880431832781553934906986888770789153951456721760712116772577734503027958
+0722579888130638672105073329597090462417149082738030373661949401575813793082783579270436569787902655097641040401368636813371427
+7854245354370422693429496181630052949425191073877308843275368739572310979470712820505147110988781661197587183674125970895995542
+9743873036934859621564820909920160132335721185173809848423866981847229831790016569684947679721801847602901060080188329396305906
+3397337816832712119749817143233767742905059889912076656163289731022283191890667300707504214144077245819520343407565716275839778
+1635431146179533618869624816029047896887367730042516939278216433734900869272992829571445669607086349418935403567352277456520703
+6762725385281999872315155129365300727718531348063401770341896591345777984146395511533572557918080490707700609701643325567678181
+4555558906784569913680220888302706502231120206554070127879841389783669163314482027219519085496782129580409038602612227824819543
+4625553964652973015688630098326028308371988997070002772661734916972323600534194087341555003249709049635157603584665553841867805
+5469615145572204179649517877754736243473051237336198742915870594247954290354530866927776592105619674425818013502199456960100742
+0688295929947456127268347042202884584629259939771429635850789571181349570944477662818026788804604769581716692572546910654441173
+1781053017263760670442837500622338443773255350157040419311002126378320391255428265011649731680948453211623587016944241093429272
+4424881884807343597741531983608658269276205760340198024603987236049280398955549067330598233254907076437393855435114528768763737
+6402747544261459973943024136936806092529416389402993987239813694282531255632557296852083229095761340348625572700195393957513287
+1528386320984169104784676953231416483588713316281109988780398093348714641247346320098277064757682809088330401558069087928359793
+4836620934876383780592087107373057072272745160875663949786761387509864704698529847777036861011698566433232612309834845364039380
+3575337583851040701388845815054721473930456788213430385395140774983959957647809720764167375524924858966015899435919948180069180
+3727628368963430480869218342563326331182798677393171005831460902561217359479597768311004931085102290184621530025879576836660947
+3475800984573188366693910563609274312878602294132115102801727644998770488363543862638723091471157432089891694987852322137790631
+5023683657353497036212732071088147337120821028934424904568945720202766911488162370473709710449329167955152043455364639983165681
+4313458074953427422966761496213154547288857367926863109897916806997328848306557928981283734566043834603735209469550380544603011
+4769534552591442528339142072463485535584209788041390319662187991947284630203143273451030277553655546597381665676996289780792291
+8029659403865541723176070298858179302484672898090770785814054293418165410123040143090326214914018331298053460618863938939353357
+2504331261837289138046426704519324433487258219679900506483638261532541113835978749947580235779347318410118894160450785891787503
+9154332931976583483472163920590162126815140207546760699499178902132160947370072538150136322051659957346811166868803166980109050
+0222142484013400331297859576897114613785020913334195683798252363342695111135735081039945217905782047137997143182303582893239120
+9813120425348259494442258981684713118897639132890990099359593568005985530954284388860261356040562648449500126432442951864251191
+9491055336614888264152467342246996843863880300943314768116172425467094897669780084992632583894436406804533915530813948074710378
+5125880262000217074108251922916601396846452955978383367381037097928649700928330600429463193168987527289334840125068384753709726
+3250963913544985283516074025079436289530032965000091704733601456641384410110473920750483277883697522865698072624602352586775278
+6909533273650494192857472271669762600062165210442469141500817398520087420757013742072500281461753556164642072928308813935348280
+4807129228896091173010215184046472764333315290810434138260279373142369497015166184160402673619706065463269358547161491925056454
+7992119117554165493880872181423830045252323577778753354174393490633929436643377607848377532573742197373252323683113537849603683
+8841806293434459100805456108210596607134914383853585818153512788887296784056237782465358856155449499271949927041469376892328564
+1632152697497520229603928059316997370226452543375632335002549957119486189260078571706186257203470953055703949967851861921520731
+5864396596718182058160283419308429964136934231008821382389697128204242562370820069167753381761875728312424003987892871207159646
+3666084774918882500462621483992172725824109862896378199142479129987559328773744933469602552905906375001745899273316469658254151
+3498338535962144862096688449703329334091149790999664223656029226119319000718124150843673811902580542556051470065598276315050434
+2588642538822153267060185463367170199110995449008021906678609426788891572594252587471982661988824671301251499893937578926745391
+9319707795744627065170409664872689583830132047201026242383522246999299133923376128562725383185342894837098008031828134646969110
+0671702811161136021518386108886822361915633677386996222331112492876474384896788653692739997207795179082317779078270838374606210
+0529680562308620614160670757652951824510508056181488035417621544956335930822186390269360882386498654576366806627786546389748223
+7121344007162987446407144751532917923911603613369296361423444081791345960568825786153422255467670330488573438324604236300940295
+7856126749900534423962976560155869500794418586760356971148877729423323229897743690930063998855496652306786264023420507384957613
+1115472217398806310578221635364703110916537667405172225846214402717552527160481181622222803507823937807179294058810167262993525
+7733396618045594337624445678237438829647882527257597412143681872681853625778555809127382419530057648275810262641644934924071181
+3613929384294435871056622853422519700112176582857461049491276578382237331260522744886532614099866550813707901946900039411643678
+2471863854966531804604197010815017888282961247506056635263741803813648407515388558830396273074055989597305977778886391310447068
+5772682018682680181055188634541777077934406094474845232952841473576584969574909042981622739932442934509311768673906919851347223
+1971820335809415226886329944736554280331033759806916931583970783266805147633904060778157532814909009520404718412464333929846412
+9304789467519446866413824868897777103238294214707967726874145548954743749977770022421296628566823077488711722686581183789601459
+4520829387352906480220193366391017100275344244933837568936172706668016811057327408759076674979685576296077953383462420493700931
+8246906431343919288012465266462141639350962646993227082304804964566869105156074039984736745415005176673660764795387467919402546
+0186162998111273052854513690953012281012706484313894676418003816742150384731546652072390520748548343581415404883693106949598503
+7407453409468893649012012693295080963235028162714227398127099455397823529445343521263605978197734068303737481555026299674237511
+1229395187707069269668822522188040767339600015117257223444650130799671208076697307072988709360546665590067811729152682754853792
+2543283984004058807502208094435749036903952553879602762556029245920852075326946498509084553554503835502118795067551626235164267
+2007797747581357604343336945727914338356814330722751353631792234077965818274628997502349441503414970786616526353391356822676384
+5194656346701670632084824377074289402109258239302810982753490912710811175011533673266509733689435108026608580234617657393376969
+9037146495591802460947583581948869619219502922722697707400434384802310554421740985009894719409552319891457897233615461251631720
+3990697080273078766162376909117528749470352764935216917028329174981312070290561402015804824976866738329336998564205666524939715
+7848352778978178394189920640395834604512765967920164240559275230242580756053219581598506048812354481467677378211973577424576951
+9532477816991813127692436491685156204938010748592475096875883131377908630365761647389532075843048673325944084338736570456096797
+6164242821944626959915759190590818947629953857895701779138738262444662644883838599728736964664029753263536337011632748825080378
+2817015241236739478928849304183816788634913242150862112550226668153792859950263630837585979285928908928017849179569989536100198
+3188299380080735588065637018955883708261980780287989654193640067585824757814983887808561472404025858752559638368589207857289458
+2148159553153805396206627740954877447246881212999958661604167091735503989349952300666940107138834649908131455364478740204253214
+5183812867943299697018327767670320460762394440257519747758147645570356514775758990004394658301628734229570022912960712413921130
+2264795742893091605616321707447640168594382931899898384410937459110317820561426704161424031904340033048159158399357351652777596
+2139572365125527551258839222311219599103367463992672950511023648604600231272790630354961828455031402437496547839035832950304233
+5563173043827945218120288721053385228256759107947287607765533263965688120561373605092351078219345874822210656978425318969319770
+8518350618323036588967937820117667974812517069373788130975907844737917546000454481446588184420492343516807727330574227463796535
+2208092079415381688598883619322045535433174373692220944523386140424053570720154062384759984606718110454232154813303857905183459
+0403764445312406400743177177292964855962834587085077838226697948324657642954983884229554291774482754430895940798928630071520949
+1218078030268093244894387180566099112644808636942463725970271185753041625812549630461585448271241111674252623627152709755765524
+4640249030477405125378434884747349008061139769305596841781606951188241867017869136729477063722445205619856063985162910427240398
+2909590245662898324814954125183873527735419113049232565629860534526664160220755933343864533662307471463902405211409478015729764
+1532024154051612895466466141175266647835257739963433595273778351297990606120134172421391748505385924656782899507982823237116066
+7625676430217706141880242765715903813773188383257526213002250997251341961521914541749167347954676286972265765550795698115431540
+3971204449523415473814450392924406717851351635913252062373246080376997499866289003353070967905385783507116089156113219681812229
+7080951492315882179871809720207741914174481310077398153033680591523295504167580131795931815413662606081970038126846874489797367
+2964040579217611595547760234190477290346436427835968877980338437548172752209833653855504469466390943293257324156532489625950388
+3972616808815375498057586682316341344883202169607183819718037286789995473261003288017415010063837288806976576286819527639032681
+1290138051725002391039102512231630818525813814320415691425261417707087230623051869853213472687397101016144678883680930245168423
+3850834662586016207855419987088023334696460550057253060411826174208076438814838201928582833181083830814307068201908029863175971
+7944749902703521228274612063687297856087416799604592533936372400167341391775276233906976252493497295192482610468181988345091916
+7011096175582468584236690812621406307216715768647084636075068364924266221366474623044001441060540006895424513815585241978347109
+9612362696533734373153334851655466254197093486211639205861389987966709302035551682330490724447416578042696870553662285651851441
+0111552534765233442760444257765948564305822466469203165903339169326584537556214779726091179725355707166736526121645211226756106
+5885039259881836616302187141071464709494663689251644989212209295897461744225634984400183422383926438027326803031066696585257111
+5396579069429715251643225942479087285188610492026082322649552644481241838275988175206718743351678720472794668564948833054357449
+8688233606386980591001497882755114729508367160997540301693192893291539036951478433163921320714186025327605130043325851253234451
+4872214673472278544834646890891722960548978190052377730643946484747055518801507106492936171927846554906068388153908514485343068
+7214840374326612339276352609419398397127314205763710059777054421447567554750695002090543962570373028396055745121721373269382936
+4524482436241914482911352925071095921316760701089039169544052169552093783128384931032814298463081577630793680822839743941613795
+4223734008339327317027315036935919017365387705335808468598641390301926191406305147914145568155445735877807426352454856646393111
+5101170944379204574558835956241764204898906557725918071785044288986731351021322301083120247570462572136590876553271594974477165
+1498954940338463049076496039744592188429182308195708965464178219513192666612550201124332096109168498851228361187923717360547190
+2838593784210615507907908324852279814008797652951109874718831612968151452611605913542110950712021617053098075818112497307624799
+9381906333865113269293243176861228537211612376105763917319466803899016867981408631123044887142147183129506705177986309824780722
+5409043531218283220619747469806558139995337403975277796517573718341286548125289716392847076083882092014379916668361163684338425
+1904893321014375227674131798347455361695847285890504332145250525132622615658888584205703776156043946440538442055020240373771823
+1351830991497076875181168528408533516757044944191964801761366476485666222599596030732870772285002472325833568217236712614883027
+7315021210616605619597435420913698876375528968662848736161937624720303296895982028335232063555260929924269983942028091369465040
+5072200871530059327653441988927547294080741487165355628851444397293608964873155978474929308924899776875776153220999350338874781
+7297806144047991652107617589673777407092234699017295323732250434070279346790076112443512292202647551871470787944370705490593514
+8338680194506251068070541345811382066184901866943035469419313397753521282182668152084983612781310002659403231835343007351253055
+6114581775690037701739519471149107309520083450078485755172388779153808947468636573364766942355736298359796132744647242525151199
+7574059840087355237287159427555431111919013708861023222908038566164641505519732443177083128309239177653941203870945389834998157
+0673474392377001399825892148070125779937209491690893896089896421739180565135864053866800087116893052683453216209088258021309774
+4693630023596081716394525302256706650097913048822663453433130852833930985337805085115332988734054335391426675730296735748012109
+1093024463171151726057935490277564245957695353097684106836395483499057575855912524860400186656839768087931489404973303617192884
+7635877951810419014091014411375539957398983529537012020519286943703105851379947162885419241335326379003488660213681674994537920
+7313912009934610962402221459721660669217906503605255214027757570091733853488694769091622366303142874602414314687218525998341547
+1566050559171006939210753283371737704974135991991141945660050193578931524036467433476181347487862613613591250793557188528520720
+8176429431061693107924500762483197651311460029641913001176379201100638867103309766025948024030323914130084770751860668764418979
+1729648696441840023063291425166270194908270401060650039064514332458826292034060316832564595611388754933869606578691497545240684
+5096948893204927421293649874213362565576773971352082850459718459918977951318599802521678656926223913450782713343578245294043312
+3086541714606171194181739777107223773075014101828171109460641650405365226657056099487143258905930679574237317845176027548390939
+7740302926757091096782313708390498469422515280866564744352174072524950077317896546008807496266670386420521998084434771204151893
+5027934064208470666653625072824590692528078583512194513874229573957257382460729248431045517338285948895199087965965424240384379
+4571860754401274665671127939865476298997613160622025616980368067727347277864838846767268485621173877779887690613158095362529635
+6944876714447267999239762443038959101083236381747476636643523496718859843462703424789350147757356429745707937022796547995361159
+1608685279655308172831370710312433300754386599666997983340912162248117716366440489547493562293368632280675661325251959965144367
+0470115155279779686716584895721905617913807392365128663764858517955975388392843450401077964641050043314321327171303982059553970
+6215103349524529478271694130462996515027440018395285605756916821272681672383831564950333676633547276622946473458222960324229716
+5752661076880540890733587009248458903926085507327954333035749203073156883894621881819872469950016600034383209674501094959670531
+1945586770541986321354980385963397070039734408942633942296911586196737659678600361467268366772660352728384921986880900512427348
+0224298460720490332231265716874929497392701347632450314627063512555464017409367105505507132766860559659364230297395631822230539
+1702023132625842749699356356536784362975613947059773629978196487288877402990298821674431326788769352305708774873068640207819256
+0837874454109632180336808361233189153201698197837194960277668995755988025271886650717010166150668262322432532297058508033324759
+3169311626099247379274799980132948823347592107280599635475818048919814215035606030291543579920124429871014029266938736200412702
+1914619565140979302991699155094170839054951976790499833713849411741065459327090513567799966465721776223514774008243762437394273
+0284830262288056137733605741424808121279641702537891966081045603173960192239888264018200262442793489277094386722616393425116590
+1173151387211465492751444105592198529015440250049757464822160661232074007786672709170841572180341360083386765961004042180282066
+2747834197332941363146926817441453515366505571978984487189489275517487274745916049268403158626553738640115381387510687487708488
+1958762131814281375452347210594453320648975262319481726099981862965271971390001963271654018154213822420613244796687794506233768
+5861590138913305751605474142329109238465204802867089486028021810232894377402829167243953763417451369079334074531476305390636648
+6931736509544684644323440543056340368361669695138186889701847677102848670844548402669049251722131793379128120867567738961962646
+6821092152578736586590175476051687813270318648206546383329391485549308897384882743702278026541948728683530021908873051239269012
+3127870261792191598343155115866595959890760429348459173942873213248004394755219777755565345896164898508858847846745938219558572
+4104690546998169355396414252792133064383123628337383872945199098541769741499506855287626343383400914652705990644014540006261236
+8792100596328961741396764802811919634888917999468524631681735602589600555328679349075778614192998476904702613310979642799638155
+6734793674993705010403616483433595873080508573310753327845752574399663353072797746592366100412052447212721125322772808600316385
+0099515723538668132596125963466202152817452490708599517233532239221132293841708379481396652887673374586403485713968074564071453
+0083805755888358130747915433250146084164753782259744459712819051842998158461581619972310157769421457011089633907439164606444507
+7652876608005273562462370933960187647117519619868786042595158425921249718553500241273244226393132978251127763667423654542879946
+4405249132813172389850479368504130884719811118887711374371841091799443512801595585892341132692059703325567321860246290919547167
+6941199045895501309914547487559727954258599982156757774973817213033640726217789962907551298312065690327505399614397188477788050
+5358645453073717607933338901589045055393757684759513577031387645637409945004898936885098068574782470685593557377991753572387018
+4706013177574137609818422036943485331576839280415982210652357962891328244924452137995064340517319656166353370990119146719861836
+6329505987385677903166233247184756000826411332850477352758018273420949926789280244169127178212529891658087198774279941207714390
+1511370436371213645604523617727839098695940567432172783593724006252095799407942743832278211803447800402891197805298593983426545
+3022464264863164058488714249339098231034997516428008392896433897781383885524218363385806736382055438093644340647396074293733782
+4501101178543767329620885826562169899606635544112652117620964836027885674519772391619599940633712271697963657935450955634525900
+6375010018855545330452050093482150077359764898798182405456683026765532905675606074372556178229924063905296358938093169081598198
+8483257277634207523851089755598501951207216079577367620523344599612671928857960638762403403726285770712060711385777082614045533
+8256451384331378443868986535492407706512110875647453641525322621598498933275339800741719049869908400644823204415096675208523961
+9398321546440720870569872262936542811668490033035472870984698676634686438176528523891161540254323161470512628073841436944062388
+7797071423711013392162710663609589623668119033549706301015274145920933018984092472146696838533855941884096071158160204252589379
+4261414209517939560365542448209082777049757262017603674203052224119028323101718025778556206926756191607192650438859403548542695
+1466289085237622991161102650836935979121797669268051582725264475273671975785294342068745493084363600896894177743687712147368123
+9181597431483593985916614200861015600827448233462428138664038851972627461175903260548893373194383862378492912625568875647273959
+9257826929421951643418775488431746425388390160227055490497812088985726596130954189607412047036836095076045019637105980229125135
+0051088814685847441269344262748461773674703937437029964258894662753422844953047676499113437643607083551852374126649110465539183
+9719703193787962011022241398606941751940065229976379345648357311141518661729448144028369831751739729767389915436519514302519528
+4754705205114290966030322546625592332320235853494013451121235653943274561055976709436804717429731588488742125670116982095506624
+7915307785043160782062481393173682663021526076353055172054644485732609943157735268019683657488875580064373381138013382280006724
+1348120551409342824081918999927191374394809490457882851229963796819461455853157081977254041113267197827298870478281259789531341
+3812065821388690082091959389908490155933727232741583927718485507099116748923648769090644447688804257458798099398350465758474495
+2937863476645119756329442458144939324030284617554341982278719802555921010666415523070911564773110585363083165465312366738827231
+9179756558387423308702990244249813252311594585173041207944901196092166608366163256489844497165091829615643175666074910233765563
+6459378049219057988171618077989915820678435345205197081776728544947416949166191536837274889454949606246062308000247423136050336
+9590694274127077084581072678020481871509177233838867384578103147792423645131300534630220077747270144036126808318115046320973761
+0633314308759908977900550446703882605141401119276147159777634200043370016079844602659915203435729306675829065339742126589258345
+1889317316284541412519941066954231638054475095114130395821846044209964998882207473650227876029465587838652109009674311273487678
+1491201614697119361909884499515016131285970573442170426537294317539659125369759905519191669796894139802704690179128614455530965
+7312991894729010255958350913145958890797364015827373553097639087944419042322472672141767845335817123220952073258598944857610720
+1824787410780276399243095677626477613009119292679764840577779945279669981000204638159164277233130499426714911295485793124165881
+3599221696151384019695918691913331345308102473844702422853474390767392532790500021180165318933884607342905862054572886894689533
+7797578535955366187957171752724494492272818965402286074464704517072955420112819202222670121573771410655986788904078893257371168
+3476992235872213742357632857624847275225481432286353014243838356580086497628026465199448029895990288276361657184717108337186384
+7666621551208709893696388991140973902647787737649797506777580191326933697405674502023865297304974748640809764705859758691017754
+6544825495307606554357924631329747091007811292348124154567821317868772060770803350068486092232254680993513246201748613742385991
+6866165375349816659160016479507285079045466715841081115993221601429358066993308321907376618487248492349626318569998572862307928
+2954124850369537534496609519161469912394832203382444510628904117251662671751490677012621979800464348066614680001698354593940135
+0193499508454379205949576005154484505543366786538069430200252986165917146991374529470556848495722371613024998552648030029385354
+6300091436093722524653066330745577837674427424963685925900231612998930766803747751089009018089480544176580489192755004987058784
+0521904612577648015929532704786690696377674858853171421019639025087849558650954768145265982042719739087464082587058116910545924
+2995811242507764873679857631100733041164546962708369112790103328792294311269786039292022283070742012101949352297665947227182231
+0598910805263795572231168128611351576632001399408367899641814748409013513401170040370795100905848171920487777572798457368620639
+5688904469919555388263250672582090539068694827337359228605791133091700320455439594271216798892203930514646320638691425342088585
+8515424974655688512862245643897078195523156507477939116050565619183311712594098054858317849757764852624936019665610738326843069
+5113156995533534391502169817952742278838176530218998980784387996273419179922080679783505603663683376521615832986618021979492127
+1086319824275441488370793880965889728722603318901376609034648244802721809098732997770252918945517263258021059460064891744542026
+1590099478966776519298307952043122519324124336024594288380180094489716784777893529727657815697554594607079223393500535902031225
+7357641282650721485620638312466056185406173433791953981763404688139736645500991900862738958018055032882772556895285743906215162
+1650489828204176805947705046005072475080530548765982426627534295084219207983407930870882583588364915870597364960371942080426209
+4961456796449042167841011430036294492463136865448894885627513655748299627165496853898722132001299392052298889154231937053221092
+9292679093929935825812492666003758036634836903177775163898869080980492856814299385978432904050294518519563887081873640579238706
+3011512315941368814678516363524198263828364895022582836616309022291899256400386653229758118495144379060943664767132561955347093
+7994582030787878507087359159314617931782658556072425334054967106060186618004693028010903789497198319676911594575116984344480865
+6353605238667338186351983657599555627480760430658384201616896420757729940462911589836581183482303716623193619087127242146945823
+5587627832512661518234488087236957525879895860979271923639746468639388295216331627000259398878042734326931204663332399636686573
+0672965511904852366825996694902980930309250905369947812120763277890579450585046143580711709629358309790006863408567461111578107
+7579999047873643551313574662014234072727914277127742448350969386406545430650595860664380236476144348769728322529154001617830780
+7768720905776990806878980911933213548469388055876623124525549575902760321680062870410042191450149173795942693780209583496274718
+7500581851674961002356261345542689400915034872242480502581980604450197467020488142845109390383270729947278076491900579496982299
+2129690101587171429651661009917402506767801016536968984813683892465052790569498753467876499730105980696506174974591421872344509
+7047018820490212289369541715584056487037206133357581281018603240803633328043751106808274944483601431153046581012102597333076902
+8327884098495349573228357110403653478827808473415101824363258200250596339218554185491862934594792362506926494486378909931564949
+1740056330174856891125669279294923651309763604203532765617783458152533228430452541997637109088581841891669514331609715059758968
+4197367157825328214419156751555885819747937310581379204615061923091469679845199014292435432070508700023932922581376409143095993
+2165125379005342133424590972755612895768392827051354709297231877589314385116008084334202246281649011825694669304551295469244979
+4509728839111272144692019658264673559690649474179262646699331625117318888277703635865926266976720285188867979085670193580891875
+7275477166128052446741208082801962510905074668975005769114065221711777393514237422266031434604625793424024653464475330291262873
+0817046411197027445752205700663441451626769878011224256767794721900542448009071309280703954949009199107668829370562168637408040
+9787763619368655981881242490879775693879040221802840519661369579710229328600940826654427779387311550329699789056384531195194998
+2723448594543172549888888596962814780076107260643457934204621584814413545214573904777806106803313154411323713368897701260407449
+8000951726014956095448794689858919573269714659606606617498924039765372767236447524498222062645212525371056330185170891625286898
+7400634580995643373473457408678165048789850829161271772842260046851336944770097590727744202976687517001530085639423877373364847
+6131960772116097152434381501203781193864171006504601138647645912125860654370952251962787439280635180850121164508129160794934976
+8194796768491845741394186667260815254416308027847649620467735109219757947751470402197659639068665099777922925932497275155739813
+5209664008657449547795035193830830788192397569777052795318568835532699855624203558168754541268446171707037486010417690857467487
+8377976554519991606329945190868959375772837211176688945495596448296939525690240337764633216663866800325009183616688088580000528
+5192787146614999641495067302066620692218333148024412938301229255333067720338121642154391246693289222550082295681213541896998006
+8136852204722481664059335120578115477689164853072624921786692464359828604653937695373728935390680120663294293493176103289690254
+1144435038869128719771735108732844672639943553994309593207501141582954078007058121278827020008994616209652065957537243296195065
+0970656298377136326223895516660489631269402730038663872646787518014244370067321464425302758563853474605729399708299081361238244
+0240779629525661769222180612134943092596901392802155389763359378856115803129803025504659400407739325825079102512268146609621569
+1920020849630289059227598433172661405103577932866917079329997842631426173495463282180424424558897910324932519322784595681717233
+1144193327801538649747431966846093543676528159861420323208804005782998653152702827377592130780075570401214786834816747288844424
+7672000694647648348909906701159130777349487715893771185782393615180543175659863092467698777377397102350383295634648499503885338
+0495630306491592179663093479474155305629241895069310776977867647781537028272341913619281785471238537339471770501056143359192572
+7308837601725546836619910084602280257935558569169920782961917685472285154488319168403367545336906857013748237755825054290532894
+9661814404701500878628706398803486793202614438164625925828662516099882010742067149392493627954571934045651513234013334682059852
+0312168977557161126723210896500911203207572745509229840888786198868413208045541779692684493190694384662556740715047630385587973
+8520266389063839477339561111091620930884162729262785462465146299021058533677470756448900131157092740484913244873616221850614852
+2366892600338849323238354679971377016007007696850190096980341739336594207986799037588279474367471064265784394163814443326245256
+4911325423638475961054407270474262985635705119625522856108931080012973303196967168739739944802380176010145279834846779349851937
+4257810389850148158544144932315012034020829622092429506782620637342284858172415547207765264086812199822149360687311593339577078
+9708659858477940738903030251204629213359548332123829955153191520032561522000846708640602917979387525987407975336034837147466054
+8086930623135121532860695594083516763569498334428501641151038532550501591735570621442476271723263173645629791905305955098548029
+2777352200022791503781001509067591047738954816120020121065054036180446105221458464420759433938919480637654297994424050557216733
+4557327979787779116307153599001198923403057470538783746410924085722270113118125208362788921890249447415394699853853075390237309
+4365884384429048241521760483369109759203884801440475321881130286288789565265074980716663859447668954490193155283240957032437631
+2400761044210689572007006009552492603834440745618264315468884643834376009957185817870038205575856137576307667033965516109840180
+9737040417279915834911486990827520959476936502177184234720809847197612305989565105760154340868284644203521456078055612096029018
+9781808678278846885397125652129297898882169803910679237997846224593685450165476495607070948013373905740079438009246883252169515
+7739852920294363425633218123401420673829295163516060432640021373043583962110762867984429100483394773437741380363822754539046324
+0883431115446791272406513984118239461183841794345923431236238292749873478934884995894017966307053473725524062094771916898837907
+6139386014396316197310075826416043562421564641768733346779156742528616231256212666391070181857228107399708720583287723130892055
+8564495834035892079724353995520557131026025067703760714350598180164418444716168502414005579666385014431317699567383147791141861
+2311406885413424305003701677451722846677377710768986204839545491722958560065098823523147478261771908820851989126482817082569115
+9602340226869859614696378992497033778548537442058541618817057710375353486743749797455027651809309416058045995383235110379798461
+9628709222162680949961060074815226201933096277151174310696525731658668144988286362519156716805236829848685383992849148064465103
+9735346812240729849346428396581006547963793149866858949294858741576251512791660305611651687839731531035722282235292660633788691
+9538042061855430905977346502656421504814621398394569363683719060626568625659708532699356988708790883640172621307887407813836364
+6305019984976325257337569429166547690694053229542307273781369534773313407694544352991644928363693848808898178142342306260087117
+1805704646504085604801764484506100460470712673185793035853367748681894021658904030806253312188697070560965442489042489792077571
+2490985236219600794455119570755743690829793064352980492197865586952595298856978623488801799239792633697972577551080842006688049
+4451839628325290929728145285465077829042998419941805433824084767085375358192064592570165051059371791323138480645291403839150350
+2979438318932849641805788421308077401361414307061802172300131888869924632094305534351210554801463479850767128364891176166829465
+8872921500436141106816138238492673770588860037153870977927285412564501357209059187194899313386454964167921543412282921398037659
+7636485131279033828460677166640282160440679145358607334279812434544494120552175807283800350790566307285400625724030248887429340
+4680751592769547019498010899871228144441828285042700998685644394131763248290312908027689367430340488843863114128754770298553903
+7371408142591796865710653973046215109255786437157352313924442478531290092820677548020730647005559727973069973416903159076053104
+0296204614919758433624657596498376245793058852298819735885655373134544548701918947319286620768915718576221199382936906689136966
+4514861015660728180490886079334753171354215683899059435960727947953401618302867137487819801076786142685334483700384896695954037
+2862199178730357056510866292501440152986864077701674864131708177930481209373944027435441136206079828523990989033623289788521958
+3232125855905003070647322986167904784829417211608519129888545490992306400854811324029764732798696566611533605039116218287211064
+3328048087467522304174357185558580322486932881453149442008314359000540253074863751401069345083176437332910631591438430165816043
+6086110405144344067589331082608930355326779125945673110136783179380891079747539440654925994890579005806127474614509336396435324
+7215091301714414443069868776064064504395207482808517829405383379414684365187710912963053526301972343897304816484149722894728342
+2436471129882505774580140273945136647748090634204279933544155848974105586771383680141377892142181597367201114241681187884944773
+2048644482475865853030326358622959819676030401734261133906361439604280224652350627125083350512410927294034793877892580606553735
+3602935472072437248748601211519488988169731855279575778400706577254567463123219123896535430970244921999769114868734160215986062
+7783657628040022836086246510234417653915945131795351860293548640058155931582229824232337815003665382949403984933860425849161499
+7472148054410673792713655531708222900140217409627089428063743914621052166172358563633841329724840401144427912925448192355476917
+0347053733535476550133949622008506766494989314867137093489295258193336447136204549399148001892481820212852414088927422900419709
+9639078047884835538046942482094804161605891002036742318046907668105442784580061293938476627159719249453272549683221805416505790
+1032786228200415283294994910054729118848671075845281886209463073179728081317785205722424406468440642562912784973899656483223098
+6968595178017412521208376863115552570593292656764798517030930445070380603195697501931025439581550142699705302804245618724490111
+5453654356413064906966652124099905267347821364144623020142756809037695527255942562866173971391249170311659304510623511853516154
+2732536262071170918681622064325048337837520111884271935643287214208402090379942906531363266640024631740298714867728868944222573
+3147285446615157276563228822132897878376378847350594831988142529113309891139340761458000809351957235529902167556281922497506368
+4354478919601617063477169153215969873898414180925342349186710519974948744199229908589593712396666250201617868945303106857533139
+6882511013607261756622150246671069745871933132400620002505947164316958006187665439907383822926483113411891198332966708317599278
+5134964407461253261959522854559873663187547708050982034442691200555341283933873911454057728258698109359806239057894517156699836
+6450666103279081547887551782344908272320062944069880747023544207556937435206656509659651679103507702121341392065845820245893429
+0369780371537429488949966165797604230927289652620569227359744404503741546226260737989821878745670653730192856868459952515531054
+3093345869807819730548713734544643718538694047498494322996726007960107180939172720629651622711868833028333458719243526925076960
+7989599203565850572942150442657633965818968052176208211383992661670496993990824695668976291478797155039216428981397014999174383
+1307119242405531123217610464790254600437026788611070015681427406612197589802556879143899518155467294982590879340815458735590885
+7771734336463859132744468610337712969586326511610847632572701236574882685603506834926412287387742247547804989759024383729486919
+5271411219228882208040644078382620627789689028134461694434130394862996168758457553833289759810275955726724366779012750280404286
+9512730467284947060387240979546511277358650894416265360099607348235188428440048072383761268322342324845297508884228837212297345
+5520192598997086640709924048681358015575115024163991652287513881247554854286841200564378110057343645081513230448973403055902132
+7020240592700662201858752560247475343913953666111892278775820432145603140381127320826667055090149454135269196723432849201394471
+5046712344141591199667738249797803701007407397593500840656021101416075518278507896267944040576213675962509419570331142339223528
+5009173314040221242742971167778009936788547416346651832329001334847054317513290947080798012432976916063888435394522306337209156
+1366848096908460688950147484431870925661107449748979391978321496249695501280906214711588783547789400280700153426360634008817145
+5032320677216082097266187853807984797656213614647275198101803139086954569491022740666386321968921335192817122277500443048900363
+5004785469025981206660221297903847696398366951138307001168655587727211921402639926973173862035209940308951165885978641411045411
+8785398824958308479147867520302086574154227898640917802025901098713415060910391722736844682709559806414137007346900318504025652
+4829177039724412998798470463159506613910620057768809973408365008034259886542242550978070824664073713620021235802691404413458167
+9261226904113620784725763761828029554734562287674270893824453948307773514334280989553881807221303459863642843519335273228474128
+3311573735232406552245381370523373424363177967581228254334269537766809380288366330679697723673023553333593300509406940840178257
+5850353980111617800710390835159343131583882096987317262767588967118575624615788759557354550955443154249258491730584290096574346
+6058742867661098727133777961247323273097355895095662383648934730004254372357455111922489913009492093823561131792526688980983778
+7068373836217667990225856363415691473206022105532884987579074277226993152918608006384495892970483440333181267244554192632887695
+0375929236714973683664267906774009903162875936131255110025871545553310661098253000439303508717945000859600253447780364023263921
+3589236909622208939924919255987333064134666511205037102476749734554331712415072770445515704120917930961110839990243914307170158
+6795584768746356073781978623124211251870230688353778395309754364333319536742360245765209901147398777468379230149142523181377411
+2729948487677410474357762288343380948554393380782338431844676175646578459942584025062978984890983296713845183696219799180782039
+8853156389861615819589926505138052323380550759364020828050387019448769426662074170464533329827565869171293278882331249180195752
+5354617268287092363055229579924827016859348547054043349609066878817933385065188678139799271936447212380584467570750380867131343
+6669574812003056132820086160683395897628895296098843871784268115803999250621428898234509785779912888254113882189729913124138323
+1094710833263258542617692112795417986473641110466966207723302828445199198995397058382901854029835381782441946019335577334721714
+7084654187809403875061887873785967514836739155665927380077234732823032340675248478794617424267309726934964316167994411232825813
+8586810770368457480021270214945101098418804122645991758117744041940927633232985858835902473466474854825024480648895385708401183
+5596898921066046808429836093228050083092077217562084369964360104846761170405526779538921555848456229448715495096371173722462344
+5660195590159993019077789825004164832246820538076625410586718868028600352830449932992980717485232030870587444549082470943172077
+0821935416600837395349048851468072663127356309332941980901438793730151587795962214031501434310617749617534269164881521735791175
+3042072934705160703532059769445721283937901499649463824595439982424043872605434635393216517511777007087089174560510963232009367
+5464155662396168936608488040261163576038165196682279135320764015816698209508887367606848299565138365679605265583581996112669276
+6753095562768549798586933346781184629087517744898743057935941129179204236737611864578907720852163937289062427955626269555922129
+5716541079272109791401178359438691238957049044014297693164836859127158377764717929820749372762244199830728156908190474636597721
+6048348633690063166546832299456572409599753235001536610146572139811087134501881675589119526672410909520126024302026020371798099
+1171674402450497762501699459068107617561003253876215131387056282446344211385618131395030296408469586922564210025675216461987907
+9312371022806876440175927558224158477356755411023006311819103124252221341547172708634888791607917037276394431911343613744399883
+0922159956723896116809200304280546821592880397796462717485456950002852867129487923589665229233372270334774238944990617682919310
+7658709241655408916654408381196074058493866541161875193933692025333882777349795393761970679827330490202099389041851596493234215
+9234545178442642967566968436599668141535683259923279950462781030512766827071494181783393026832191674347556257505316419663487762
+0041257342453564273568929735796453624713683399848511617479340816490608890963355058355974856413150349382759095918170362098854394
+9592779304960316507865578967321355607760068698329045954497816675023927602619347677723250166350520531047186145206536424990428337
+4299316161376269795506896486995922307501710625151467203920818965364151628354223037516185750241653836563366411298238504451597789
+8841671421275735676647633262528681899530392131503705721695449652045887039670882496194478043622621695748874619557992717633215233
+2073059696519439089739646800449388322820261958926389800326850308700850275001529873409140035288149114816334962577827586268363961
+2490360047432436143344657376283381577226551875079136121637392911221073093866166045906272906769849919522908370281254710635409730
+4974848754591262059988003622570276863287575164608170178580822963208162146400835022943896925242423440936618793540028102479004702
+4372126595413379264526984770633204109208673880518625238463206225086878596008443858616399507133771134539070683384873925072702058
+0639171273649854719051709551224607779261350414555233764709993649110326667200717789312129165461963429321431418833445603440663689
+7186962822361873750181210266660607397813719262382253059434948056476254707273143420389570046116876618519383113357898774377253891
+4319529017033432347952439153798524883464591210553274851928717915148566352954737293867412627976883192261494139098284868083014649
+2622939111808623590774562258070588172127827495395694013730379591966886930134915200669202327099882207686441261515920355425526638
+1200973651071533307294108492132851108586204275141332635739794068695424575790972361088170979623763207458716935295604008671317983
+1251374850775260697268191392326213755565839271682628582402356668458562455145193885654924842502488021956636839087993338831884363
+2092679910172237700017761223090447686346621171455515944807634834063707579619074178681232780539980362324148874096831135359068248
+7059799025589703414119220067452626516006331839767724497907056535882707433149950178268364082722639297792594500281095862497786970
+4542905544332920101592075397986385645511891063856851014878633174032148021231620025882083670673312205077519194573640381350698919
+1312255205389657370322617251904525722465432117955235178041221031184821368449334584954069933722375723026079372281725777733909489
+8940234530803425309074547064952811642951856360280155612932727691967562499759113316867977300723413954039644096858319695187621995
+1667713304364140592650059312268785120415368020836414159057787321290823207568631669529330852196553357371986318924246623685192637
+0422089184234642438098080557484372830069143118691288742408958852833389685002956551956492581208496774233386094905265339874099483
+1677835356907666147956557529262732608196197501168021350247232245111279150809917571509855702652690905689682229523319549019678024
+3645155615476272052329623583943381582821256380614894465459876556622453836730749021655688760168012160726745987877981868221817319
+5647755640891329597098392215119820185325320967799221680909508299218493251878104661039386657485694867555315346235424508828545406
+2249500944046395955203873004372279572553883458895334843433140571043474669708074473381457065865063499709405786900325552248426583
+1230511579171467602223112925195512272958191569060831817009891427720423564097069405239471201694564617244826682098552152177059273
+8469866721000791525531110152439789939013289745066720962189402891838096512969001059723536174778699525713458075138245336864075519
+1296905270266717168150361331577154511349585629938472384230294812334459038517468323643620870384471376627488513753063864443527971
+8484849516117452587091720711551100043539596219785764133452403530020825880462282298393651618450654255243582938022557870602084123
+1944353914349184905366261486479354722961723711488366658700425467290309892874206605011693831609609440448499484127167958439545979
+1904342525350793098590501390656028964534129323617049186915074724786886755773131382892183343708636631327982725884104881408443775
+4047731221209068512782993439144246721190758070966515666060478086425710216870076434550244885851035049595368742260028400195490338
+3375747312957348876639595293489234210411377963219380216708693519698209655124852272292375830483071612875799792380567345928238534
+5110079232697543396393866568868109799067673989898575725771625847005572590499345721422620239447760726870678880204127450730489419
+1892883230935369730591390745517921975081616548082333381141791553938700817410468926449238904528671037503779324573001732065035519
+8395077376884962568002904176016991329810132526312963614723727626088091850321489438757392596606168596638103913778878129196298132
+3938927636631738411085232552592623008752473475775738216360990000223836611551924314564820835426069886741001153829625505334993487
+1299692449183332553204542348863840181665273246414104121624684776356638436277872632132123576236177751436546351690643540205371844
+9194356489958293805818668234623245496942584158879649161401045859846964460358471563904833418667460716546730472435403875780613403
+9275256836090272445757731146730052254532930338266683064726986679677894399506235508548851649563290194895324537517696553037056936
+6401315045565945782629076626066813595555038611734944119511046358367624104666208828448443470577765348785145599426526721185590575
+0586738484454531185743029468713911469676776854865676690022624209621140076731906638884334409090253652724218159918793965233464039
+3171209020852465810305033445747086308509991604961680580404820907479024353374887015602705890939142087700418451581794807689385348
+9424311150932643701645157338987499029528852262438813754400403069738023146915551968014972578206454343730343122265559473474927849
+7742146609950233423816671939328483772283214892322537597846916524424589673152890736557038920458731659652032921748569241119859976
+6687533180189782962288035952098447575892236672807319984532899523336137857362773056256776453970744401322852572058367357860586750
+5112973080188345114036362904396465766939815911981737447433859679102909113460170044475876180448426521815838110280974934802651453
+0141366660566071877771992446357332649851216791119528638672163150044856967323023760152081614645879961910911227845879654515023475
+2214123760185353539707121031098580866690882823675580600794715047520486504684525675655152270550399135886572417008928998130462848
+9223973656232181173590003292639341133004977532862200821270596930208889426180465089396056658959981954090935260888619248916061940
+6623578698318166136431412779326115216613003933902509874343492190835346614403255698238178964137991654202739789058288364219841871
+8291158969189181550110191401002122993337707939239499805961356987899937471416091612952104089354586248344316163672726189677077009
+2569911973118347742318591298716009672334442600647034815935927622454202539592391699029450660978546827587095337413939180709898411
+0899648100113650188435064875802395140965508050973328163902047496526339571954451436627138016940395531683176282436292339394573885
+3218116539223354243511329358754444736017570099304122222814440304223163469524526595019625005310578387024223128529473465323727623
+2903847495538482030544840551895363794476928236443136637630260470246965452066473119820100467512281726986329810864283236603867046
+4226586385557184936270267709088518321173404628666811633771213904835009960571786348833009556180773685058946093743512399598902672
+8536593915600232712348175092402812063615932808932457150254760365196790780020038688785606653890320304533826035350207715944668272
+7207307332779658122899268750088169215451053148485733154400660830345046074837509653982716901490942833776007996597381089382249055
+7354364139715042807616100729619187431380023428907586266528433249618278407719620456619422594117403277614144426686677487237152240
+7463017222778211045789643242204755641148330540930800826901784405753146374489626927527265867849180494980902054821139633747003818
+5151230162674659769071431499839596583910959703956345024479063722159584629356540852497161935430481786349464090482420412307760810
+9834488101241849496636150547202745300929538510953947644624667132590235877398283748992791388091916279125999482122365178401663101
+3799117737061812716778711014651789301773605485731280987694315010080752800132070053513995645594283497896886041897544784262244652
+7787706667573783951864085352707088626343810856713494836743287556709150843482692271254078127357988781374166954894723733919964351
+3850833609175684557920955809259004150766406752693874551692602542748508158101511651908521148570349768720243116655926752800025156
+0542333256075861408967459343438031423694963841751597298639419078331767590705140401244001636510150856151990464720632445051520472
+6303430699933496407768275797041897577889994294810383735293345544688537126863233465001327982318529841153751728223029693637728347
+5397568768462052741831355049132795323985421528118062025164276988946171985642590654143451292287062379578161283874235728279748519
+4640901822963272018953105436900070403241616145463711907565248533620946580204196365483196723416387548557874992063706490486368853
+2187665586968675889547896116950223441017696539693810802819756256217188102291391477467930773393197219210849036472348714939348493
+0530870138541801269405772003173391922440292694411582576482977240988452402062182324365937231322664832700142793000599915699446377
+3232764179605713808662558293727950897506959582972158149863534091415959234408922619772945504672047855130269189456164558749700864
+7976387712997851037838832161690498586021679479533477214488890351913481087239877288703362839723676811186594991567854176580725967
+8767096970476797579593159059506720944428573124512821132135870916546309651522551842044412513318859523946351494542237948488449896
+0718064204159475781113170590472579807866358541733298234646266805452325502205676982790448617382183104529620072495546016035798369
+6656888096932816475747398102488120987337320254949271905969490909227960204913812078261626642629009104843808070570261399892364887
+7197928827518406319220242665874355187232953000643123084932578105682719648228431872207900564999025910692470162420939628457406240
+9390054304943829673541677221189814900027963471043254648597886086990795714249446234111674340418457357710907778877224567169903636
+3047190706971324195888140547475741620358462920833528017528636158028581644462796976018091635090361132164631234849610385434473088
+1299169151001233913629789222426928990506746164121889744635941525381099603593944992448532482489564134843216370953945058018816372
+8022886634541463283701288620853613352158026264893049477075544241214340204041747957155846007535087712499320675089565208063975842
+8518974453812680488184297781261482966404248280615326837256707090751389480480211355208009414536208955423929547041219391948623885
+3604467721690594055924832819820324481035373705830034807313911053016213471052470202123999030910736617997566930544442854033269439
+0783963633104292458209399376532444272248160361826344666316224873723641667255667675127680227315908535163742986352235015659049712
+4004639628899564002311837850986616952858773518487977784208052701702476955042845648511721265262737849283604073030798668836277183
+0862408653011082563803132060254754932254909982790619138767168477417959797920610077885997837256974272446346326081237570982197007
+0940886136952306043500899870090754863364443344376526643707265847999796477272121932881155662360934605500536289044543909420287159
+9325468416880604404675394196786101658805312863903480479928341990160539724867416343519113232899201923506345096672360143197907320
+7602604379899247751883206653536848520843218205588950289513511227638017895858870330990465204694386615676242643330003217066315632
+0851199846447079085502271034855714656668178101657497639831079366789502032474686387227843449343312220724903806454747746782689424
+4098848471040002241791388735422021963275960354775258076923928679254165040693087908221190070756034164623860222301010088075103056
+3055192757629057465255631284293545235726639464473675957498678493846951810733281325747646636144880693592596312740548434768830767
+6731474905682791005984276464714844713588718904361218261812425686803684106123652431919970410078795392818111582997268429659349585
+7924410389518202685905806688713577803625532077879713115752972677622209346192681858566234259911076164694414416704969551453021886
+9355683562980634479815919874568756218379958083872036318959815690363034752884522901587704723069489938561066700856799286608658620
+0543220462343036193244858851552821480362000689940188453022451557344919396300863983139599553360452940548134852258624017234867371
+1067014527356580183151961289434647684360706506035600010429135039073802230973345888131418619960777100132646812026883383699827970
+5359069383361932605007503288578185157851793814788353694181498218990573049785293883804780055838358139459377587968253742572072043
+4573719136273381835268729540845328454994954362222395612112318303745157807658681724375200294326161779060096534923740884933625708
+3514458846264455850674231783280205705825729759163794635971944702176098831501306476593168602881301267771422854514181550204581778
+2814589926430879599930014687698610766303495462811227979670379853246555977897078815634814137435467174275073493314846601851573261
+9109412328394243903990091864894855454386078755925003658916610663445020722891205775398782367407839761338086985543481077581229638
+1491723826525165284311575346657279958318121038102570973778417404071686643040506005133105712555305338320966176072017676784923629
+5488218241739200538202629320385686355121297434909655261539604247574676965715827475716615737941607238002608903015929093309168488
+6222350309549145806267049598652344478433516262239158892817022906333942210072994901250459132730572231739319182532518293889630019
+8044072077285353283240535057997955717161542654506209603492744952552847242899140500411096612225095709028876598587942929972397072
+1885954490526928165806858149219735696470308645981279734404025197278823077339850867123073835557226495747843398970587652389656636
+3636990744440216604699149114584326945110057025978680402356462092308935861145193409488632679598241716104734129398885084544095857
+6069902893386332364062130016921517943943574898468298687528180638591233629526536463888804022514538460226447545474670300837773440
+0715242925233223925302043184620521073165032928562060926764419538572558168218946544243657541925010495652673050247406203961490742
+4163377094941935791929068796922863289449570870715728363127254502097952823099544701660693419650850191571787642058768071578191335
+2362149372830570291861457450525257727016337864275693314681112878356465000993320675510813633779009823896594571255519867010367760
+9335339409871128425332395511671431500329529218909754194982323897857550540930935004728114503428724192561034251245345901549129065
+0756506273973719264925319448914314432556471353593665242663682345436151888535592338801660197397976918922142540903105362128344221
+7296939654818049488767067190718755957947538340790260392001857532393622868997477129188922872359726386124323878376837617352814907
+4078579999111217939011699307760285871218819333972182125286903838312055662520500719903656687016759241817857273468272683917688574
+8726333004719198815434960721386959090224338905967680668744954339106442434132414526246207631805974218944345895924595868424575128
+8809968439523768418749746186037611280882890683322020074536396621763557542013569567593054212148112921735580176883820120783267348
+2537069038616920940158973428724068585048795501013293376681740631186566951229973336427931288891824421015980577224523633941036996
+7974808176187279818828936860482106588007126950454089943602952411737485839990023098877207814888492767150658782003308086338815157
+1588659669715002646102364063331711646691061797936643322785359527528662208821134749050337274899095692843563066296876088924734707
+4549130202526685872258479111021810868210332005793914145311147798812593113617843971880716197778981371491177307945521311901222788
+8560297570244477829694687977784621455987068942424983136944870380427057052887779787702603030649524780263375021654142024115901877
+2048774313776039429808088171712835186320571466269472744364892701622816406146475324290364012640387008030349061922998372137187474
+1958983930518040048400877463606239970518078952389442564587925608445408847664043055091202257080066087803944336882062127350978604
+4065348283423540496042896789726757274478123900698244046915478972359449728574613924262102889566496871444268574144572205450579978
+3629438124450409423602990222911509881985430704078927765904795404045938118161221397917848075421341126252805098426191320837834521
+8085534923914835313209677375813349364458599796275600866316693139878003025545882010477316042716780306226946838431532163667037127
+9898915134568321964545103764074604849670802062543079353666823915979509779221620608508897413582424170944308180311897168957048017
+5385323115399849956058889239701492340513864492761797303099763383900112373871513361204005145800948160917012448658958645510687464
+8637322858113048873422361029279103210946558131854412009103898341572774795544194370639320402689943405658836056138282160542993169
+3301482949893831756487465487869018898293856072780727019945397657149862423574816057140762598392679733606145316506298182753363157
+1989885295563430148607778298379580655148124775805236404809749482897588166275331919278290911157248463196182871139898936725797368
+8850340804158989499571102548588275214111587736824329752538481445797164191835592201791780416442465525643066854658921528683230761
+1421812723062059588410998478367550671697961940333154251595442093624642651562126033425248558504164225223871598921143098979968917
+2477995193068866106116650832975646638319811948342255800290956070421894468168681224145709091760495793451121243995417375669474096
+3150729646482352886032550446062928871539222609285098660402450856512727724053427921573737445175821849100475781418189174380995632
+7046750620615596575236877490285020288321290904270312430965440858488622217217317102253600290127052465317624607416177498383288106
+9945695686299042380678429305385240697039293151977430358157956385467140053019250720885367675692664936064594234820657654969335744
+5571751022714308898152825948152037875574841245733361004625842517428626308101356793475497881525020804091668118665745094943275801
+8608762448666074656196662829963227928222015907465782465504699762597437156318531429585635263586424089541092855892902609967867982
+1978685830753176969518395838040278058667840236176435782603960672407003909222439483538760352906908927302768494238355233209217253
+7074071920319953536604510843365153876170171633349491568232092272150542222706006804946809770825099582766752656052960983718114235
+3280496115751440895543554193849398007467023324006497516116534251153591572725745514291959829061315518724947165745450390160259001
+0601737046591989613120616719919874653529282948250689745032606820130735453268070027901333295387220734852357272804293331117523997
+6136958737937467562116926228263651346592589988767235293060122410789132148757897567424381946719333849272080001742385628150689944
+1891595701639675010992493605507619576155702842803896050077803395482631144748035073236453571286662875633494080865014296782405059
+6994138350962374748911276067098522195781999897499082597900135054301540799702368264182765273926228557006482725202228009397664985
+7788023609935244035749201882811852725625300846793646185552122933557882704452555648205100150340311907075711931570895497802594450
+2197653103798752067286172607092220822596982226247423576487125070944191009560709583893589326623076734376750057424185701225493266
+8863132327252007877822761700057804325184406486939470443703245734365105772001424789573894937476178130538608010471355446757855177
+8174190110749058109791874932401725786307915411703003043709908238217181652029602262116068758446055873309569311805547464496642142
+2490958747068677929992898459199669839140241121204680850335549077174567238373970308977898462513690749136086901700597984427253536
+5982357462083434284507903055152940486985159078049952746161034961672224995628192794860546561549979398991180455860037140923248338
+8926976775587697462174304166383030496921336111150196335640267063653243971405939737115496867091474614902122111713955464436671112
+2328015592752422584686538755738383160041067711192111211555671470860520931401458590260603642848665758765427324349701633338120285
+3238367054704111120178059574962944110115171398341904274585267575082605150464279484097073060481753901121878225454945359042570553
+3450237761306126967240618521993384597368444622149529677366929462149782561575513795963740446321127465963106959992420775690369312
+3448814725588587245567368751607825271329254275986408132599484784341832975302652140521158378926626072460485474580935278488412601
+9150780220021887436734602033408383688852530542191765389359753381850912455739194414678686576674855611507802645590418679170889751
+4835292344245385826099978982021385208338079311915794842181613685383986799333650292340449601221579759524765161463912861431586003
+8364091375971775721571844301438463624297900164446658688640976105663184901553656708363187917609334998277021278755741801258289094
+7084708048206234641953289421943297010794421803966656094223814335341165874897678668246105857901156960186097878571917343164253048
+1580091826012825586670694920435572709977363754508123881333362672498821977048126176623956391025928031884064853593246953559407401
+1343143393297933839473552543351834063051545756389274017156011730389906161525821950360013682370064447544881706475110217230969461
+3302514538150761859786668968377489515133804300482090273478961905590177116881654275768644498073647264106408418864420104945624333
+1455642109436975199690456185370628722356663838058282076416293074142932077562024273500214654758558303856335007961702080005015078
+8063031532965823241531821249811544926127012157501395220835632529512891602224510304171587094059291180949555426978545235398053558
+6792060710713434110654251175014016166953632439786838514140951524356192499726146571336067500056531834668571621898017480292338282
+1437695510093265077864080367192602710341444418961408220405302548941539890702354912153612054318858614633735009858764482449040861
+5181414865532338468286437374705876616670683310417100729198121447458573292151625305538384979133781114543503822301014850960361423
+0442509889959385737920714766510641471461284309092021412176656794047214218226892073311469169814612693044014585717564971417728218
+2325595356223658506960436649084028083363095352384800259697237546709925440654926883086116058532378827751785516901620186132035077
+5272017869427934924377297497212161665902064352062568107159660976294283182349751217848859566575424801083760720335160297859673425
+4927647302447341405487506286250768152116103802235113601574433911840768325925117428685709060725568588745725091307806563183578704
+6009173829226300709392490503960716312095637543299322573027471284752881663572097511651811613598957587604124624018835545870558611
+9874256128717490827444943646188644499417848153072863603454092200052312279880710501340245614763095671533551439274986414901802322
+0712116664532492284027602515056442554560965687688409213710573265303359796914199163349296608736358741384041138558244053035969858
+9693983191087651982342027390681525334777714170455444776207288727295047097906322701667199571113890318007616548536163726817679168
+6706523778360875477183129443881169868743369990013775836046887154518569535610947164990958856446973388802060554267647855673512269
+5862057420569669693068391429181291253874208771601116624815603880238130385298427887023332027652265710135551985724073597417285974
+1151313997638402328677281725415458206631525714244607205307139347412188214659490398369065819541976622293080801350270699351750349
+5489131825943276548129703872359273308252153537674522058679810049913479398153870812359217912596783251244700635734540612732369203
+3810123181289945953628771451906051867522552261199661987069529884844103683969181491185606510174695973406830793843872394354042162
+3346242314263710422512316433607417431578705396179309838772547308651613774189871178285455805352015354652802479496815910335754476
+5032059944587174601615131788722847272253927881072336845872496308794095355330608135957953660775615970673613290442946086962710905
+3407385896995114869865346803277241560730078573870063366755416777507927736959074993460049742600768481558296737228998922109024099
+0049052520096863687692070927701978011226142548782375715516453178031755305702747877694502859869129537906539333534520649523091710
+0991259574063512483397592194908683392249793361680299501959035992654866098958575700878621835330177239453007223378603834381079687
+1103177507554459538813745204571902700244177530864339036101223775180048578597548931452670546251696214644617674818880606435247986
+4019388020763636749355438098141001952281422670022244785922521428313256185545192914769702955966048643204981030086298329088086717
+1549239391810219717095199987772454895177623386763902046734720379092060908409042895882464384442634362486868518995850543330943745
+5263274887172899674152253042181056688293450964020128773142784973127071891058343458622006778652971493625047746423062870250661196
+2492300927820520335243072396524887229850551524757145264574209619185242101186100663595852135831547431534587842715149723823788454
+0239821705984933412196203741296576026949577895980132509651253316722691651055934018399445089497754941402505430183658650264000569
+4454480470480799484331207273048645656468167612178274351303856622687362159020726843169180682079344623827123515453025370828135970
+6142817374030811769491227966611452974299687874240073880283247099440633899922286466254504368749938286010203764066551001971357963
+9169371099648374900400474139097217260717487967105154156622253602791903705738661081630850020115390238371457432815879031763979788
+5560591117813511863922620504148281644660212448276865905578433181502848473767100143776780656617049797235772123812344362645447507
+7125601127543091335948203843174929841142906765885076202058923049770681372235738838189576737300366872775686393117885907972185950
+3813261893105186097817193647097680347436595910522013775725325978428043833139417789267610377229028363642103442485430761044994912
+3166100516390908023193075423476442023657276364366869002050485177701831320339505415669888608102030204859429175627661908828955978
+9494583112215459385851845969134725676775320276319447511947728695272882901489693777569547667119292451041697329224102769821139225
+7691777515996491255498611230620011375291757353871825879292337748953866037150788019954259501731583992956846734646612549716437169
+4674403391449814677760084246730522440833433795684947826674440906657230316614951017230444639014782979009506122819959837960185292
+0124355369267161692186629219979251945207193338015531285271750882020294586168274943975716404048435047057151424920598922068881892
+4259039872889979839195103377532319383985569925201669042943584292754218542022884377759029683915124413393419307275904131879991019
+1735669223208908684334277224397343396336961848404316449603849894027168642444303310792840158007116435560970914275701222063897926
+4461905512399641675513869110628312166872040099906116555152852234330620387342830937229572832948858700069818699059571737043133655
+2317566091257832110561031578973018527337285656514910017567896208598685109912802746001639928928505435442403312983994465299665281
+7100315234971800925514182498331922330287575769352512401970636582041663941571732261396082519132641394516031353060487765740093218
+9334108345710950934819716799864030596011645738530063495673802842261253827926601866855793893356025796840470669373855061371630452
+9938632519142602121728449903028585427271086908360215670337654867014624403654411514574585082225609074457979619906343109374814363
+8543685485409092161128411354085800792705928451605723409112677460751012429082851977989992688721655128865875431794910678786635771
+7286092726668793850700794820169050814700948490519583438078010079869324333131287831724247406778611721612540484173599614481822185
+4574626770701467258525092815137010178678255624898097602082268698327798870150981485054197815103745515005378748184630266101601233
+6996566956298539914158437280054873330111337840249130739283399579411421525420812145476940206933841167306808654076518530796691101
+8418268977140865314494741099167445020028244920345037125932530888607409097769183652295273473400544354104335924214164055029523702
+8653179301531871439574603212631671179611383475494609355467328013854637990353997237551580336715104250041179882078593885288177498
+6757096834181706624090949791934584516326051126444323415129234296822035888300651545387936037901447054120865724936805272897353272
+3719471070090385271298581540906250911443020297189549719410313905300350268160333497598330190662838247612158675798074496367653467
+7420546839654007142424912212795950734732168508855699265941182387494625335487354878640173067010282119575715050167662820992299427
+8999971488927790060730948508800281979058687995045352068109470869864835768781397747295222955822196732634803342790733054201967597
+6576480323890189237090109618880316708942469888066595108911237671288781962755118036472198419023002661197238821372958077703913188
+0030541257153278168215715641021711922462243607936192442241352641161941478602829260934238679472069149540374325351015851641339748
+2308535064234691761213175923993413124441933619616103905759452431159366446936203305785164404138919753229165645626046227853031827
+9274311478528593074600453989280243110143811549871941292371158642466286143077576823957560727090752083042241440289345317446749500
+1173344584450748636805732688311608479601983149113524409946668094326431976475189882181347248492781101482302481266734427266149348
+6919145353409181506683417908661000530570384104910516382895650835980412723990294313264588477866084060873540703108364930450237118
+5325748279790493246685409745464007302387808804042056122442284885720787803880628218787879564860434934892913815793329423983574457
+6453232382761168189611119093517182812167138336965744983593436983776900497001902946217406040709180061277827817549237791463409689
+5084186690867471312419665514325307095801242831316185457562663155798586037028408988187703062546161289787145296742552136882463426
+8870611874224684584815641540909217473850820482485529973916085066540438294865034479488663791703681082228740535939513197426568394
+3829342886981207956995705990631766515300196466846957375041259104048073176049856454632700433183856168388096468289412653196954791
+5561500767524576355366009997865394697845244227185393733933754620619491997202491015533470742012384145261633852618565246889880329
+6777844984653507188325486982839438152297369628419739121210603276755667853986365800165693953505799574103492924940759456778294070
+2214788746856145315547663790110177531050862742765653751073730521273798413515040644084618990342819820992718598911810035213540952
+8641245540354058813605493935866324134857506571449379897541736929598327494870227097960497570120553215541706501704428439721082223
+1700972466803583171420254007427289345043866532653318330426834471075577492940413011600530531542381075895357213715112384747031546
+4123673880740060770118806009141779021375877044026069684883815887385967786493701519196377144556351001736897028481481645941513408
+2662387772790420942409426074953672031980544055539694698764834339968798663047095391766181294233657281432203121874861027827377503
+3000685337077147654086746625753896686864534986031835702363775205640514651662788785826457436508900020141827996232430281971022030
+3024908258360292259670809665500668877816383415506517420287409766113445399746700536527732408780456759980633419485517682977905050
+7609884167715679957397855272558744514159873182477148797463658401514781751802711120892880095270644173320069885204433134067923423
+0014100455158046473463596055055311019866188559065450226001282429179589867255611231640796556419411721523548855378235369309657647
+9633011209397874287442661801560684815176053929256216322999478244794557838852723961384875065741787167826618848105863793521919749
+5428219888294008773249094303237486065991730028127620139643719301859855449270217745813940272539972852306476328220561773494939103
+4521537632739898925531910531504909038824924540851609471635849282948417316063275786486909546139512668787750779344864961591530650
+0285764732059028849862258838048464137495797174589639632732738487543884739338580280553036435526582504329979148309470441850901993
+3193744331770081476790157034764887938574991726583896870321256839758584043852505285610942913104942834651377543523173599555843275
+7417116084257040522072018694176431604709041564144995596676144624737792695410277079523480490262409478745371723464489814999444924
+0087200564277539488709914626916914001557170500699327915642055990350944184767970585140183066326636283502929299531353689075738930
+9142572663076266551791245195307340496553949814370587843903642543965453293671993338189766065010527351493298615638788367806472270
+3051117521339185890745759762693550854894691691802102995243849634880012010573871449566457109934687770743470466412945533888196288
+4158491602681925772695910708467090530134341332595220736564785569416215771589193350272179369165509097131151416084829009479740145
+1103853287929082360008599627015884781258703830958532256506076724299192350494313751000293453841630584783094561339455205657099017
+6669316988454995197629701325242327637911706551201433838323166461015137492273818007712193923739461699066479249555708713191227011
+2113634008934694195638896909191311796132499125975665209093925839375449400491235035672664100786917876149509780668632265414075514
+0126792384563810279878665722622429577480527747103593555729429055584348852183674740137123973052149872227487163624179929217676754
+0429035865573402523285948804441336965668748085575713483346016033116457998360922288296258888389027618101688101669309692510329301
+4327425318090553450075452219201170395108911828576562899226660479453870050953529030012653173886753094327406771671224243820895023
+5520772008782057192477714645125967892355088889936328957302124838926954775059515639556003228522011635026617680256545865946919398
+5091701805891827972817338370300267783615596474978619035655959815481776653782092336443749908777349150397039742672328322075757599
+5790089502501043722549854203882262801131152082075103693079735744546403353282880501020065196803852275180952587214373981006637291
+9796322418193084084142426874342342820014220995329829353218013607479946651207097461896332568716316883980489998209799290426511423
+2380307550005537574650358548246683232060877572246000949898947779365886734692122861965160733025000170093436288569747823376036955
+1082935962455046112099818942036953428151667543776795511944294244788427450015296441783391903107987172541886534905100146388519657
+8380489382633120509090625034073608336127658262734309778765867742476489991527857117594934853404329609845740341120593238746572358
+0633586457978329098387174811695256037738146638558272816343120362030421967763476640034051908578551893496813666553354240880945358
+5373098216766144042601726925416970539214195693276289721208185447267076741060153916852700809475592729479267755151190925441394762
+0437558873199426030384531618231327018631366219163826316141114912440580402838580312314548478509711368795320884000345769917178052
+5639423930316613774685180001977671844817204570499797609653987640525926925309564084656003072725353558374445587925969239833796829
+1210135977251946489323174272650887900867086890978166723808871820517325894679293066521051888521481265231417131690626664853728495
+0539462898410401286175566033379657439604282033567012883413399478842279156974842259796901368805265470365140797961756617874554244
+8867613639089241484274514628778139575529407010929548231466056716290533770512410612299882134379199476168691871070113322417352240
+4833451141363445314543208606007459133355986460223413209331799936622495058516670427933156376684533870032838911569984108849259357
+4227813092685468088212208364841572112496680733745196711345105782294865361331232982776705201607924522572931046426758698077037314
+3298920484699256928312414816543062270280813072616261084031990462638788100585936907797010649601422888227353971911450080527103430
+8677297821634129486433214400771371293863980023792460946229497228182272173859417196509074761854532992353908622744248599410546426
+6781620363930103389596792660725581404654123168036180688431615736861252151699433810032668453228299140054818608750957825124796595
+8122906022184441989524946520995601380863784338127264956306250128205898953341684941467474429559908562531894365353100792345598520
+0411240004527716081891095406341655736648076045216518268298111043258024354531159970495009766409513979584877788837540685928510096
+8110610731150417715423694936324187409013994345563727775716872413402896219029394300366269945656385788061342489896665541029423618
+3755150141442065122724114186286854845339699980415816422951602029278923264626041281480497555316143381278936597056953084064028022
+9997198501283363781790158682287440631540353151583792163912187892594225150451760679251039984200332891341466144376776153588743411
+8117278660244194155818259161232321467141273951036898758016163015261776236723767428479024530348209694127274271155128147667928805
+0936167378563389999940015556970429817708525142859666613441735283201399969921725036498088504412772933143791841603758820099231969
+1224164983307664154773003073878449221074064106296765689183370554165942272977254560731754387603794592725273703193699452227243648
+0945223186347621257574665017745770814803043072264123465865881332861490934432664674134678310921895127370062396231037904388566491
+5578757540264948131008953288936928142006135647005490612913881156326258717861846071301620618495929699330750590715333343381570370
+8766152138213724166896984751062466183413369758646701425025924527217037621942282338912065834670044626031344011383552551288896568
+3053487311706357675549287442389024758844523549667853410498690516184480612259764698839374235801509026206625335813997095967736808
+0878702145089270046099454388880300081151816870001049594773880813882330822460954086402671799804568587855965385027526964053573154
+4675804956846633737319204649690805027179329770063541964923158992410097311744090492573918964775287855196910884200372242948299414
+9493162547793763389979831614732404846665474684277822658912090008789913594349007683276852208398902139951370774691434150042517692
+7345730422542157756414350209374237744157462270676494668123673800976571405254566784526649041229590418069453350314530822807850416
+1964598394787617389494252382959463826235528571672258679974212194662236832005305369294264438079751870505403383373187745093885686
+8249944446042573821740194113388700642890510755384482816288425486723007601353010761537384611960083168099219424928983664383056396
+3337126174819661239061831213486837993026986769690178323635308622147431003839607372786324521326222541843059384926020501381139876
+3550125336344588588098791695947139914704682212688259894589141433972450950443922835504195392482891358587151935390940488550833886
+7749712101826086175922145824388719830543614893730681609524662863877518177721578349626789661635402530736054829364302745002369020
+7052231140791673822400576065079175225485411488088090330405642998541294857834801823806307475957421894499261138427284899379872160
+1843292586638145520787104685467083303977045950130084986120058743550949902430669077350548793220932862849879063881005931348774482
+1487754184031131275500703273842524528318488976791651801275003631033587218395976230647938697685183895874331282612016119932243681
+9443865463893265996646234621765924400556069796282223873874118161895663217586723720163197972926787252465189277090874867985305943
+0897354453697180183636362963351299526862015366834373289147517835099724224465741319067052046603751698502499127219361448464402391
+5704747041899601180624074915530540633028597706644514489974845238123048510465569828429534100611326273262355319658327363672387706
+8316996307878784269659645906887598359322978350217418291053466278096200407791776549885681670136754711514051366460206315185892069
+4722848610616728633370187439001656108169740264355894513804107426599369076853462061213905264840303368831514494760256744683488217
+3692367810726295806823047818393633700597950772879297341267237845287738595298116096169937443486203130496785989216239853131904645
+2667811751880900529395751251780403233472004508704751605995052039171718893677809009851286227285227934697321953881347551922850785
+6909280644240056221753293916337855667825910341176418724960272141306897770589964342155201798900696411923242239316269753447770119
+0999650808847959816984860421127802079006195715319055574680057716511026426618826912583374854994252722086849395905477181959336308
+6682428165643537701794115175085151859549462586484758294772142985146427091765603916714315410145159899524436580396471513525615313
+0287601495196877948543109041275994870460190783889596253917385102642407519701386785758190101150573237633840832279432894588540853
+8953039640516871936098610139590123074456039528834700886251621001651688622097083336798736244961699802438533721144359429291546962
+9090712409265567652916908423800558494486073728012853735882650836864723820428807816418262790577395429269519877994493798687893365
+1660175388130474812877157640023025667491901812382385258466335889928876299301453437354017152844077297406456989761054934994390342
+9934657654239690864626478281461559020855371564678749001531999572350068313050489634121119934441378970500982348402296361517516343
+6359086489575862410458280767790738382982543594459454924194612177893193423779790100018577922756855011303081967830570557786235066
+9627300155446988370785806212844429529453154177930814144914555470252140016234923123986998575098139584073958387735640106379021856
+1431322355214385540867355391544675004031897330982334142717560574603867105320387323557316017902469957357722433291210791176477230
+2894506203039713875024969465668820869708991702780944843854568441944017095189870471544531770235169544173059692732034123691090895
+9985087463071783533894010510378579436608410386134175083499511116916575290748570942191993555978994826375337547024070760036740444
+6261306132531269467443124232293674590069389935930085698373191334535132795190967480627467212037239181698443751352939224782894445
+2120942222786996279924477488386308186164427794112389492451650285444010405583566731254920895180572589153915684428013418667038463
+1430800636064677716455907326084896393465425867531959255704442690767435730899236888138775592453451717734356391997983296892276722
+6245887023168571979343600695324609549057431178812999538431044619282851448174071578424122279044132430998592688952289021834131681
+9674276988668745718949139392247616305459443871778443070291211471809698194880071407948810420513382171773670397147925755783987072
+8396960072488524616931349500116793025065793132740236508100883299116095620726458675309257154864629749532773543158061852267047338
+4708002781694658659895872218532749075225884113621393683821853677375696999740077965880387656889715948194663339565410394344347289
+5555870327192777337829881158886331270254424879662205835411641384434648950116158681537009743933205450514200494453854527945997900
+7477629425593340948832945986684831020436243430891488737957650425170704516063535499519492960538931301090427592749932503236484184
+8423876423875909116240287411777889735748877901032042101830839646783823015629217546200038215020201848216827890202734808048558954
+0807456230133883710789676060781653192722644571250120561750361830812875165496905115518629620725251203869040049714454953862738741
+5303451865971911125648060457840129182131488705975454818569283523145391216818437057554152537823305765736049257100852046148635621
+1261116302127532039373528605959266607418243283938981652100937053779793268699698358833723678904084230346993115051100507293779300
+8426944066403361349421019695464969608724905091684569968020665596067769625988182192985084507208329554219894020546830342373194912
+9836620096551496246720748973842622026481410313119306152287268352751048064398407415273133860155815754408933010180348795503748753
+4609338756911699625776639967309034003047928015509904888467025680057353339055998784262880963136510735792422530687128803685177960
+3794220657491630690779260465220147420857430753103256706506076703567632175129351004805264212916552247643663829004772139169350940
+7434241221131032055118140342385838086277269231509234123959703170231052929402882172699084758826526485094213048561191825363736939
+0904036155468367437756029547852649525568053491591721559536888529587622171812488273446127650656057211625693401063929504404510727
+8594239813337093390867462989975908087174105244731466049861585875653241923202495711120654077327719056153590078128352003621088112
+6550980939146114945715655019872060022635651047970499718424015515740106255804720532248662461951505100400404921280927158680583839
+6741404050546354494349489969507458195999859785965336806692031040435145352201853821004643353403220778871762826594034649052903693
+5050161106286616149825562707832775275340760357578872487646716309800665185049903572794595588208600449320559114964177323489795050
+7988668426398349050514452498533331732900030359537800440340518464659495823291497139184592287414133272356549392805616744235453149
+9266075338762306748845630416478232159198106165396768656800162018036519950819645985549720852139273704724379986117806399232175170
+5556988932197330115132604542704979085477903108338527639954740461587257180160289420796745117217674397152069207476864049579397740
+2173348172420527062990485233356407054265180085263061116024667765176353870469789794863489543966815025332527451848905334447400043
+2653295629344700441742575198328366052220017722996829827117810780652298604720896185508927603921863120335461979927552660891307644
+0066285895594775046166427188466940243950248922228033222148293913898651489477743932715196100030572189599370661700468278120150796
+9557220581453859816276169005234368536133383160153382159372481458293494645221000658600106273797363754949138070903261376602472730
+3805492311138707905865671027330890704509145113408439234581134791375788711343962876719164349282530634198140214550594966178264550
+1436926045326544742314469119616902325996600826173849367078861191857896132772006881206929709595222480758410968732831090627983535
+1444386260983859263563013696700221044836992640755935489313754181471481261753184503838050091200730279031416065367564840157446166
+2902149047863838396186395637335864504592375088936920775765866174611877001827681253531321463980847446832448377620176627133555161
+4791558390249335499772225358752569718358080171845842601137108723166037557543519329054572216953276760772287383669070062122544693
+3653096889815826831439877436629034472435210543189243295673175535474384447647824085044069839822212271287638158109858092072312186
+0748574544351788265285261914954044165932622710335856937231283900552445994528620171010664109729214838117784033934235805145199914
+5275894527081180465946457660332530286653207667782652877623355615488795343761394166684000047525776778529177571402318083997867530
+6467109418857304686760026137696284413841248686101454431645726165291910757652786986378480149853820055715870646485922893256858093
+6676215878298696393785441082359744916852977084427450114208277030042915360587042453548139647735771416607502451093388273522788649
+7671054706470997891661682369520143839129305382788490682363534839812789784359519127806453517900921204537766515545890569275307893
+1361042207361371441527086792533736691205317414847988400835638938786015770536113548366581806919926001472840811854920801842703777
+3513103534581691803636903931367504112887620002748826537288400922168108606124444688399865918353400722960622289440592437281395265
+7889386408564819031497565924192895193912656422791697412472168255473833561450568882333025985344661645666990267705103860364236866
+4138536431654239332667925068305482627915123154662709208870044077990559363503200410357003059370208164876016094801255094919175222
+8463391696176344840026735185830036495571599978819527559041511392555529527154011417043582657075386914403021244017762572439715299
+6162318218961162791019379824579408557803275130662824155987476456514181881477682742571553987831058318649000691189597142635269772
+0762970133488857814721372272166424064692356325030921377174309564434883115428450738561984323237757935361350713032425828308741123
+4714351982559489932236335028957017819906944707422172680018267561533474486226912008423131335876195206249325093723564894293512080
+2816500946584950779938046762589915909515704971018715869504032011106342871269261795583577290967260307340084652876419981696310087
+2895004364486838513889537109545822827678603850445221912466809759993491507875666091568956682275842225830234855225383245575493552
+2650099647818037615116956954341655646634963643235750472739733468509790968870462418042203958941068786618484819431710507936599802
+7533481270625343830151159727689285867369942408696652407015806894633372367355011778476566950994358633971847804532262002525341326
+6932860309305588424128816753568417315152512711756820693574982607856846643933251360676478873401876049759834996395397442053366771
+6368418934202491624332453410763014824694322271983857287392943327020965722037743354197029665328443075456374222598320483575376742
+4282586458471797802238473382178433687724169447427314412337761093512867942490521429740324461721167516599618126259885014134320111
+6677394682606606653900300409179091142196198876169170096213616729601352901860163965806655227312385454363306654134273762118341113
+7643573234932937551595703701897895283801028602846877296702625125220327139117379468939484216431057135643790896852072143295568124
+7835389220407382114018498622358193237717282193191181508848234026347203068182480302817923964772670420825100195578203841958774014
+0034680494236515185913110737330886189937723492058708152408147979713114102686546086347368499582981596157232052021983733385897893
+9959931900795867812310134476649406402976231824404571628106712844354935633442704883886435745579659139240624317737165693276684021
+7687653483916295211948300957846886688394120859824086212655110896478780014654869246794209169764271870284569926071280986536129686
+5389201304796699165935771717834181664385244359824248801827481372360749339940576454594000410357902778074011200874064037958889186
+2726930691205319100949599707692925525547420349048657283658532712722412081334373160958039199607974848481872853703890943042973921
+7254087398978104571457211604241039805468739560240953011032729779871018385163199958508492807104550542120182914215024552352099374
+0577915788776618918085672242537299536604399259342051743390425673863630842390420280176568564228989365174973256614738413491070038
+6830892093137210682654019600696831217364160874783778871977883927322860408992703263164973180938595498029716242874574648385670449
+5774283228582139254923100205140724149936447963980034063069342493084827233283799090727386532026590721266521634433539903773672657
+8489342339836233604189107412549422519166707342446243631744337172427688799797300485425305108241084447320396355017099790987982304
+5579039086144583780301772101084268454284211524135896968194358624225126732215388025582474957280102865197930121676550220972263090
+3389908879281737422526309759732063914252217622801815648828128392852505613143446838612931228798897371072027044252222238376051988
+3571583131629499703290168358948884937302565954157189422433659984916252703476429662770576623285862465399735505261324990848316694
+9423186355018278041568884367207433805709684366572651006506138520185260823230823570755489649379382727052958581331266615555167678
+6126444225712076374139461277391085492256424369818965208777930082776462483927136117628590877335005615182912506580467844672001776
+2323186582401204627524733122349298471005163415025134564249126647383086521203590734419048262603709759435997087128843414545136629
+1421280371866708001926278928901318288694248295906455469958649830300570517830927222281187526547437638030692046413330135004977193
+4201689423423687675024635448407327285565295542200018160703811061939134316388397382336397162201256369493787936488029791585101767
+1265877778847130342563633758037018164444481581498122824054055477037485608751037801526946223069038643514687690116234164514587643
+6465410554863527094647350795029177204941109231775452235798798372912591022108733306213831496272836341289051922220644943607370174
+4555709604071919166868299016817656945294419168762671940808165674695761877170460702219178063962280901485563918842254363745508105
+0013210837712837766354170359690869396554185818181209225721015219925108353810498389109811284979505591805687297968690234266672264
+3540066879463905504617792447842885657986052603128773981944573151451301111933677250259888942146768184470087035596773903177095378
+5526250295384032490751656419926139482444274162610961490517202317645513359417017299610996672882236901128269120411948696682951298
+1147928498844392902179227619628807696892271738030552398135463750372457058220840887917423404648021366673468670510142397314290816
+2022158104950164034675577261500173802135526124382488977804744045573154829053227880877248106935421683250032295002832455111826392
+8408395848784043250462314109208469565763023368052967204488715596813441318603486322106989843882974610129619714497130039489786739
+0214994088989310972413925550111779902382656332396702390689823464515504633177056625665996413210331231059059122014949611785985118
+5638643037266704666895115401268842632588292722777701463135298698439281447394022408579092978979422708178801226855288373349007705
+8326215915178072795379523340039085009563169070517125775679474479863606678664704404360480187047960485640111421757696617713004548
+7011793090984794876958820884434550749243106407550272966012525399145703465211673094494166304978135466245182409167311669917812035
+0646616697055433264306514791141300386873739412778313053422926573847874849306566154499488632029298944379782617421929711377514401
+9297384752555069074761141370510516463922575237795983591479132397584337422724053423993525662073888857524562744276272922807488244
+1675900193060201503933483483504265157956265823054822690157216718534136770295979836197494827206847083365905242438375193125219057
+1431083489513661032602020638770515681536739853677363483613015298018233407875797334225693452983166033993589897236847768729569036
+3412842920266990322594256412420427432972591970945387529406395749977856430023496367881365081011414676715347811993981995507454759
+5814144158348481510698013052752762134884248303529348153673229587940320030719465454064415732294560941869034046035698546780721067
+3694293937312762744233869259702927434016315955447360677690945403418821029256532787548058243155743890295919743842535871205350185
+8704385056392271497806649473016369833786145282019863224686988090496033200166054190979749241314009880507707963024916288921654292
+3157093902990992972624660747840907228349704051194371097267625916545775966277296334446546102566702460108399894331979790861994643
+6211141708601791603941445199717151439636201237385208163393264036156546491266459438443028650233309419884755515206198073403412631
+7609935217879726233731421923555596716242460372189351557516117275999330506730738459524772217152788164129973955538645698104965588
+9847824808961328798019186709647321679530290047204083126132050648182784705034270305452693472108814807665149578959595630309221057
+2336424726766825888588931956562955321343032371214572623650620016457504060828907233038750693736196960807811513112341914628133531
+9997503724107344142689181995651896815056436454295876248977561163594537358114242360861284248276610577578928061231272901007371912
+2013755472268039887671228509805013770238575064767125406070391538875450803622634669600191763159687914916440803301533482646017516
+5799981996920369911160876482866900908859555470100550461338722440379485926728401393736777675182480925560316384661340355950830168
+4131746820931543634876854491169439418699998977639325418048790558796894160516876451374044889060607036066881936080985211558198717
+8071462893187814119459304307555930509471933902061826760709069595504601694208191737856286699434878770893482761009503838844594596
+7181730908337307386590819037242463777795080011670425589895801753553643404874388537396185083285326538843075531064088612600268485
+7874226918011033625880877484768842271536701038369116084490113476976040281425980324472775723714911411152630252812320962593721057
+0414263983887707664017378501754926805713789236380580564348508099662975168539697702344553508537455836440798954696577079098427990
+5498272997168152869729083312401990047724554350008563240202328869525129660589507428406050419409546123885174117080636577540661417
+2321805983098426879552953451815149973073351984882483766093075912871745174124737636496091875961776384678278562342333189413446156
+7532047930885191527458749856036064187500060909405487710845907268217223665450938676158247000950256593423837838865029236735406065
+4326287344295297838879679103933460283015103512394382866450845885799711951741393486898208614864273534333346921541450681108663424
+8567495767845161425037712088656492510273651099963049803480674659806775332933320452431001042997191274150089937218301268747409008
+1892491166044214033213915009098534855928106088594182060850901874215590307570900626843004514029616915218847005161443909006676086
+3105173474201156958194039816160955452881468075916368040511971709028208813038518932050264340243550030216756906608101248802881284
+5437478863331533890468364414134511741947560918971502005022258558696334726057777326125552089511046269814814736730962698056311073
+4951554244048858298258123156812226947705933314291630536799208713986095914743504621255604040168912151175487398095913442501527517
+1612279415688868683265625113331706654838561784474685978138326507909792993504451472859581305912676732125668231491237540161852687
+1352117401098609459260904440848555453118498774861101544577811081137171667682199549961162875051222443028292136608108908775783291
+4668566015341904293075901042719184643021339885314119600028221153413672044545251474917661767760069310540295768155060202109602728
+2520334200236839012091693839792035322503068072072460065591632021254758742371667902074341537861212278319285847598815912703706243
+3175268051143981660033747106123282192419159048635214903634052864839951778255031756400562020446144172393222917501787673701002700
+6674523291734748122422773809147614700484318146175088254981107335895144969807349660283900516719746118645468637821636061386059378
+4188188277626583767786502184322569089569789412892621297176431619545847378700138574560707680259428721989759555839556974186233480
+7390532896972001905316907714622971854007628170763072962479615247643615622571558632228493177244362089074929594584800973845536848
+9849264610200952816901406520106384682505741852721568226048835135789532787094701294801848704745256861395407908649513920150263639
+7854370986367091444291966220372693018093730764321979930716154354135718272983430773038337101141108835455952869661500155683833074
+9808115836250545782744528663456612751035343126746511715032833222650951208562936847133894670903159578406935434899681616157157677
+5449933772771897148631641377562540641640474848389783754029100557570032554566006191465792063723092795517702238425793412416470001
+2937905058909924731783049378468003437910238645835264792097079136587087350442777867813702093887200643761896159097869017005937395
+7717133729012763683884090295651337537034023162131283487583227409327777370699292346651312872193008211062413650051860746533410200
+4095695950110108518764643338298928366182339223897361738328378044503564041168430011712729973754089101835569129650304327287404972
+1174584897511466194183788253926349029362049505536254582209201338252575420290164983455933289840278231035884030712260894346134552
+7761765877961955439161913415420485543948776016504802146528406434389546215574979243086360938551004600037990661153084242444222743
+4353062554304250531566068529474211745999775668076123932253052153101156786485645664269792342453816897835171506547074839704777091
+8193385707206057241016991296332616186095885707895014417445978963635638843413167453713147741250557894417823842378892716883564383
+4414701258878541571780503656512173574547903536405524255843710113697817741762054938128322216548020454736882148058230445988304376
+8363544420911047180282206501238156287142986596377518728647856328365181602387822102287895774281073353368828111014956911375392578
+5780430022747871965685716392391425352083934583867099701698503567269032511748940082003282777645389137257025389413017452674572537
+2606024393701221307694529871431154164540614164993497271619958131424791186768644684669356636777831879397734272673335705649633002
+4789715983933276471694982923444249864558464851612286765926229253919876317314926011029164829296322542092827015562884359904206642
+4213428153587165381335521523932052241841163300973801287138253226845490672931816978773941803990440278669979647051465348624079105
+3419168581475572983260190361701934633564914249990805271700921787735379441310149748846950460105295646015883522763651311765718139
+0643017584581435034370880134992336308617187531872808223433939732921528795419567765739615646487503731718827467059811489514462708
+8240926821672036119484675230474136343520006840157742512260506574754560864426113591474981060698558545401924390339201368669580151
+2180431409945375285121040004138946753923265119496541829137171528887590486854621739462433884861201148650039065347599969036034946
+1220794484575763660002325630268586558185893116790653322219525972500497727914800636242536069684827121496593553311794674511534108
+1435781606190730034271758074654507450242292934136120417582018758847558210750517197211614624177861297537749923102696299059068262
+0472496196020370020276610485121224239313415267755759579734483426439502592786733423472402917351281201878422928096327388672118427
+5664545446808704741371688000935805171339458791507069541059893057148797349299303009996748288669321167515451714205892864440743408
+3539189653746007637884781151821846130210806166359445842675385724193537198834368015119520365512286626859121785638758771673116936
+7228747311262908816869990638505266862436414983330364594232199408818881369887998094729811275091341031498735810192826600585848478
+0205817711643909986528303579098875467050350065610591795091066174715779956393527864740830714556714738435192795203670003124014759
+9197293866434029742096641108142225947219962019182256790387923893087254917713809995074288755692595202295289706002058647970706318
+5801028709225408662416729985040929435165270531028696258985082752391299922713342941633843800570338856731347298583819618303436452
+8554584149353583626116529209271190042567689752495849141906628210792514969913837494587223513509196504949988416482688661169416704
+1402557567228850127015457900783688564010064141030969351494178978419198543363884975731636660451573493841983931009293074401767946
+3030096749835569373371333947576923588432247404291305005146406298391452901679290153566364898274791521766815033709118309495674776
+5711698251707518922789190956913393869735623141004406498318629780886567378932420667481352170410684788247915724815490088304482484
+3076891999474110399724898312925906240059216711193634437769661170118805829580169752019184852464954183024109801959695130678652316
+5549698831705307512844145517641207234201273500862193514468462342310564088815360136277681192006596458241962992029526454841238730
+6411622599480809121036108851843289420809827360922656655734346202711742438003990222191272251022816208079113097900823895134384085
+8642218596518127375568301272202091207693967578318544987425186514107159773089906580986790334784827799489119999185876094206749612
+0920817351118635692704580562112859516048707763068110821230955827967708140350064043987570026933663880446183554485511010170742288
+6208781018246003491238792622187493762169792217017386868912187285653248963115594278272915569084370195923738619149855997663765716
+2725282513427928049648973662146630492856487618068183730067763515357833597788940914019736675580475997314248706127026547890194380
+0912098065082008833983417148631289829848433926717155189805055489641556714887595710925279228500591899600062727405015074732933183
+5895616117549258380703685066950990019495929210886386708101945826998030626417636766877015647925822567530097432835311405452851781
+3061662816058323226135782103379493145683394691280827163116839270882202901941521202335712663514020076981153846416619848715503675
+3704213022599283410938645199398840870678548274677230864636710751729466573816253072905154246398964963820890925958414003660031502
+4630926004977081614276851598024033198734821505047735799361816301169717640380369512425102474864033576302498992022080746889954455
+8300690807062719013236716321873014112140959900671073008576129360776883572345888774946590273926184154530838752149268349654124927
+3447912234767016528327462063192808290048544233618790028527492173810076784214345126091690768646666027973848294720038771161886178
+5457890600658613094704911994422834789695852986406564746776631261869186614541778685993675186223192485017919263967183543307324819
+5220338990377375643418843097310570471194246573225298484773451484736001523372710934922163010657077255170019875356114982042678628
+3627624529201855124798528837400884425278033564368552915095248122583917121126951781145851039073704399808416096566055979179720996
+6138215215437842405346946457258803271828305596332127664808930703097188386621950424243497121232196129953435128118553466623324068
+5920381194124220091735356882290501723032521874921419228504863143247804084726835859796865644318358484363167764149683837216715113
+9615036434361215242420376195665243628638184799766269042140156331651635843944014951375098750172039065463946417568449326243598402
+2848169979084951950982695318867752277301100025960923376831113692149385936857810916874319944880663028251022532340529140647508871
+9496200698078244875645144567349529530108679183666387943211721642572053750534478253516851058589093730399207634528878897274151362
+2928780676487223500661310045048476864951396027388478482164226318809641027170548978608486524888062863065934362652787878241515138
+6280140376322091582258435509210383633979192424770386485640747341583226684971908322655364759264755383681296473387197771187476598
+7993834385710389281257683754961049197160221786960013125265044154150064439440391405850545737192660609079271627770663100625583357
+6072190114323511020360786591498148692349156157375850747362774972374185937176303811511475665210532862701141979885066767496308496
+6809986728266957224821129384937931767139546739620244968569547174693124128355961928311295430759387663715690541708892900136725621
+8713302194814326105418406542612287987228114780045964567511737165272440568730052294690749670110950977545749571399774020053301568
+7216372973252354647766828421771297596834262561708247359782436050128141372353679212726164448161015103612893738264244644610968102
+5490158565324437536585310937019467679460278414170537463829112562515850928229747475007728895628087831498962809803771938282971625
+7508575669851979183836777758657815365989035447083239066619058708444094473391492540134970134555418935400444033568972945852753572
+2681051665685441434594259287440247146082524888648989023037549139977692642794573123372272447282566487899476245382067369090850227
+3516664349028783594652935471979981657724225297147289075312362875423752912404004312370632615551263897637065247961679885605652690
+9466216134195188009940680229231563219004828730503835830166900891639648098483491041893870240357033427709041628218884025561211450
+4848574180102172215721912201870496816515688173491866267900855346017402326765363320124474261873980008204988494006538252079431490
+0175523216285771758146998384814407339456495403123042145864725622594607160861096627528216923235632801268714390775921555811885643
+3472489136602420352765486727018974617090254641528435634640334942425890346384541194932965110314503859645146781896767507525832148
+3797532143892746774112201800929601204074380314303366575611389855222496601937222584569281001864863917059035591510412512996095572
+6540831912166873834974788036724952907724341969947205585823842409980011722639587514582627960169448155988074691268777322159243577
+8665277823830969067856126267665294223334216725032631778088124483157924821285251588520602045895388804877588758409591955378022156
+6073508435137376529408576041907918073738449051031545977935509368280423831551346121480713109837860058648169729195905582970167345
+3067341878979134838523394919669124325563435281537910461171499830549480992384643061189946199980549578258740383418503347009079843
+6535435940186811905537955923044494920097170641355108274375772163581055863892145187878626476077935978473720854007118125956368393
+7039488100826115931812511833016243383119511518291750301509797980336012158668128482275262947277553272940357496952990711563149829
+6786417640541461059254040553435360397444650993725507452127477820766859236159070974204514281362156361495968903161994222700825800
+2231234046323964842602361033236684311038633571563965762668970125159431168316364793191351729000958068187715242930876778118365126
+0967020148060045963966458121640283348948132407097784342111426011211692372274414489985481236783110642969061229593384194970583663
+0518863000584387454760957529314643812512823643579550158516331617073251164731368407116086238782619225015253603821594850218277314
+9500480699512272865605970060364505765826990178852739273720908237913877224017867775678563171957729835114722642208632758208282247
+9138815300684460564222550599375232818221500256241474012816587003367381334232108533309664763635997507997023730828738583077664669
+8788277264997082732015978733262501251796460091814731315709354222338224334551918351172940509755714499856609104221032539934398062
+5201268981606265439495692981057225390935909458631770334121087316181673897848115792408678690299457980695904707677321358225662858
+1753894444989509786731779001286291244699622264775676367978135041545186928742736879462156569826451402964970455781449463407937916
+0502111951096040580120210611615484977765606052460541731989539917916976249725653281972573849533515652151626503088059881052346467
+3880078154575290219658231687424062098862063067654268460424536569017374872824177081255701341783967148208402475928724455704261768
+4392256036256639333393028072709593018903870460743710545351823219115495656631234924513636506499865017761998475934414247147614073
+9879823269518650692917107025520590107178762204459762006129828636469652976104262657652867426597078219790167485035259125893130526
+4491505097353181156857564911252591317148670618490859288558887139051313551147429010258650026546020137477020225229299116254389267
+6985649712270923660498384674089852650962875340575045596604964662128408959309248980968270692814095597628820086983662450615030773
+6856393844414418123694511010327503283724147879193562418774164993500731367874976787177535887228795026180482876909284579667315939
+6933319890504711538399213021011090982613851985557386817639509779738587337666166285748238443831950809951451700040304637246662798
+8972237565184004138743415214250280650420991574154677063216686873786654244381615346208802365774879184715316421935088510122029692
+6620712954831004627906209308475373401688370427674946161939930227860450185388905612087218953668667006558048824549749639289702982
+2252979368901033426647735610872049783979382409247439935969647741186385842273253355085952551816588123321471149874812539836048112
+4296535534263007024565979896369915411490254323267398694533004344505948807352166933785377686738429645888455485219163542489241753
+3740204196364178691705296568637646938043711157073683455458837069839389554673644717418013786210053159123354215579725572298341488
+9402853270709855032434056268150751702914142055269816941745088351607954708943354365301302743628246326922883750858759728646811815
+7702984283703968225748705248163911320353463996186650929366431271533557842658056577524133407573715263399635592058138266058468047
+0714364441200044139354320382443415251209148277388628504182113543224388038221246572844030594506529807381529435302712895155562998
+0439249856337395882945730885613068512496256701244515252923706394988734280606704794447812748091162906835016774939625011625452587
+8701684848748737861671752322431955447724661967607517009813604790923987516158908955881849157986515334551799664962438730731109340
+1331695486624815425190823239475277990544123745272288937823732446789801006674641059010522745250663013852871097862751638189259629
+0016943722810447477028299392663967547809929491638369830715943306970577569121839921705532284065788504261357162084070598074698898
+8301370408134947453196729774027640676030589016291539644959237246218491449189371838582480346507102754824929019477369849852385466
+2141296007314745921128534279212951822200061786556429858733058886029876384472876002241385397319110771995753216118435172891077520
+9778033995372614700099511429265411943800576787023724043391866778854759353346452408608492285235768924255415140931221126895275706
+6825951183619818611745057594180574765846145064255544523604725057011807870654883273137368630387060066151211603237021909384345606
+6330524686796934177420756525152826921339672339044318925623881985016143335928837573713885535605018904858579244102576335089585010
+6476163553560279805504121578981537068558170447489713068606370855078339092366601341950660196338341527489856914865088585338744059
+9336566578276542977779339876759708356666986167810967015943735975240831465492474205336898814725322385265950743359319117386285955
+1003736656415305664502391530550831810874960043692083942495595913831106487788016650162073804988081719551806867379947943364891966
+4573789346107222063252149996048100164143705560186510044433851243141510350751823081763496713992637129016266999061673393254758192
+0532366470306788734368951439658028825164454629260106890282620855033982533015451546843353901652120510130789111458392221784617757
+3253852880221087799999614626290882768972817659832607861376923098885595639154736935283503251479471872499871522284582447822302040
+6285682722317206257124522813577367514121775302484636697810948128394195942996079881830875566043123925277038343926112033315427349
+3775226925665315936530276286731605375257672911376828473612175726312446039948354980701402997357293119532073936998664168131452515
+9033989479402366425600648174316259705202840220576987680353222246016330572206033521947195443476632332503203414941943726000075449
+3497459952076058462828783375726894554577596495151945532419592454939988268844456907659575363299273992966202955633347460395801503
+3425070812671430759768577458384150050234482462127557226191091262303333548668785285283704391650036078067518873006221217224813250
+1772566105841430765131974198596141137685703304393653624186537427347991201369580105964338526460016536799639038488848966636423096
+6770176829068426450217510320589346020757715335312260267538371974073805419798173049507293562584393319422383700569196675270010649
+8817107380879373164458511189191184591118659927137093795839429896643513855977855984835472389317216929700259038397397174527984545
+9182176191236023496232040243155433201447895622909243154991531577802143936144665255362367572046313372242799588041424257757065202
+6776868876338528332502171518394602792217092464624165442452676081627495348032268487133922812426314590277917132179444733559137458
+2894505940700668608956696393712351416879091173479440509500831009675626499007967467374789971290965256917798968433095199887640804
+2933556414955828193417995654373126786599609721238527340939127371332396349156901995803794360944816870450892560704118441975220867
+8553706670591731040619297656286157301262507708170329674504933402137245881090232925455937213553504830839742590855235282434383116
+9795978189578883639204205303262814903090980902741535992637415797011196591002116065669674171784371634354111486560182744790314795
+4119132103638186216017314646897106719838984255536083613903341238051086509058863316947216192276628486590741349320633205188806897
+5670698885913664671019828424294908157556037863822378418679559826760134301152250392322845741422553340998938758664406467756180798
+7800330341660310724142951110753435998016854748165017611258286920601003037645494210716339815788133485140202482683448446213209716
+8180605035942700911937960726293062276511453378796626425148211321573098417580088171144007867547815289216240544844126601589466966
+7821272307041782298994133562164496850666805515425583415056198384421212580796187662587737326754702942280674718201253410570348983
+1042240816866808878998548317060777151321655529169893824595029339588028328148179827446446643616423322057981572730612868764050015
+1252481771070461052389437601673649482439048233841755345725688472923079857771939132303119904339949419801565589936559095363036112
+9690992931777916802696331919514208983516033826094247916936120742724743873182994969726283601645253015955852055017097669830871832
+5020330232719825823684760306159154637346729706124058199917604069885798242234996370123942691457916122474221663868046994104598933
+3075139912987034850456516141324884611162536977850304751997334983975217864864834605427571083113425269670859785386338318467147612
+0588929507981854517277972648054247858977149919377574480251256787460673116218337687478964763305472549592601599187647039007311159
+8091499973422866102588159323886136790375349337327388200287148626779716184548302459458465936817938524771802569873742301251650117
+7114931231277684778417144640504976098202413303636808727117937611520910337365455884518757181692362707318939628346107928380267487
+4950235887683950624565704360578955553783208046483127644086525832912071037741169842458625817412278583829306158758057435134618696
+8199425955265652644399992914133529916068954186792582922740480043066932022166380883075792995446339961281184510898029007416993672
+9600726548050421231768431078919064425306219469503912968092554459127359674333330276775477837154780938957377807571696713004700625
+7295599369136487293154800206051955319915985280570186743302107975100582206721744471004980480977594771538574498512856521123216578
+6297798457301239668561079936581574605258366525996359269984364801565322122584365843225724581654618783605926367931879918225442452
+6533005631078137948109852121400341144965267577414971222703110484819122046478368287561575133762804019638669026806894198861867537
+9875087635268237028446411260770380453643015454432015279985047995719605753073640336797720945754884595273185611911133456865738261
+1289442162696753398201423924491482730765830984320927644525084976853458311031303193411990973143614781325043459014068347046089289
+5407587059442212092113638721767282263392344800170580359252927060347500966261590384053868270413268344224069405566567860000139705
+8360711621827142923632844470555921440996634627172367848310520969393805873503222609811062308946619951688125101610027026987846081
+0944723049476073716566027637737569127176067300129222186002435041592350356420231369282460258580648007773781925508162225156920162
+8475983626059931171149310298021646566523963848825823192493400102745845807108661239544077702836139330088359628977689491846874286
+9167471361458822389556369913209606973474148790242038515231761016355472551050907573614312829544645064709238887157780557241782741
+7014298247554687536486236050770971039248187073536082362810060976896826815113357515444053263548215504897920396644014795535941249
+0560999088691723682614108804238530988595549473233071643241045493910124491974900926784898185428410219894939857122959475910314078
+0706992135879838500099998224229773341412566822617554024599579881313516475013871821845580144033844736871959630619808210884015298
+3257284534077293882786787542863570138992146936142087051892058183105267975351672517356758026095332624891123361507959805527300464
+4074440343205139647276844490970010808052229358468787479224053850708044118534407822903344480715673998402733320764968913814756460
+7541792444051749131437550370667287159419463038893712135130829128921018730253201583423068101308427818790061823168162915307740555
+1517558628903132612936551305596370414201320454890625631435775037687907085643182588609436062805330988597026150223859036793476645
+6591140085443467002438387440547002194892167702007183254656681949652141186889776360123350307460795672547510863464622633652798129
+7586611318404573147896264171755514255213812732114705872658268827371541849326158561820698871403138855140301594042187495345343587
+8296969079616469879346007981374601146907653922591351081026313152884017339179855411584129459367820354848581380738645777750515335
+8731520753126192088044684618604970364839081511006806274832524720914395021711036520236353757973882463981033460910456305044738117
+8522729809358153390546384877141395094866223397312997581315815377215593011496352023911920483284381829852239261360027871178466434
+1761342609588366253125631150586581982113849076981180786682830283076537811478367306351425774976563602440271445970009753618288192
+2190966255981782407270090701820316391321596233574351800067587131465490412933509752425381764960420707947936543904169527628499764
+9513655081411394282745221856716659032453348163674130701896927299389413958771625248039619427975826651601280801943472380714643137
+0617514295978753057337209914173385759751936634152085643157967813155609425512280471102235144051790721763863647958187237685008587
+3639355491023500583172147594486316367021278514106274611239107265098592491987675254836995000835549078267373162122839134981244694
+3032030608995234928881439477961757003027720355891764881759463215674265954842081986273329762678139617217680974433220699552082278
+1162323720318256232198753258939220028085022540772566418699150206741508982674558652349158167206478285853624098497667218452569282
+5449383863141380776369123912608347050738601579475359170938129811063143046219515664348459639566915361115334890006657006031842097
+0352577524785516785715741803748070461694324222115473415680064156677430016348738412256655844328208932407174179588633693022145069
+3240824351920886083704779764410813380504193208597077988968552959949184540967132284829781189340533621232738907229081350464536533
+9963137564898255760485048365009768861444430624328428769392562608655048396702090989488644412080235346086820241525013306324575413
+6313120896902229376551555163469139342705609183907471905448131939609829452611107992213294654747615543541094148280055017927542670
+2193326928610645174628017287211712211408683079421721839813537852939457890561997238125898536070007981217325358023811789787011723
+8243869736268481951401784440593310926754240433539070013976127357814953175386685024013642745787559590618261612069606519053423542
+0179110493828168312231149822817828204338127248358983471224771340698766448231962762617835559498180861959832229135237920163613151
+4787386815157272287656433720722356482569671165537977997843012106191355180546649834098738516604856452092754246704403258051505371
+0634701773994997694376147550495812360818423051628930021511577756465075343321034591427451854134383867627150784580620161049855432
+0766676598258381037189024267219785521248498516810290597640526034223344261052531930836169758828566004912961881921058343147697444
+6482511785125094948376527886610692241647293945078604787929517099856009510498982203730650348969745313708621728477885759515338493
+5205196085155489849560658125068733947071196666550006357643461400687947338189762369344420067691692171235090223284004207347050790
+9809626775201561107404043309301598988061425083419682730787633868247584100867048954636838021112840948572297116645919603622359907
+0822943415366943321888436141210445288839456758217953163265370657515497810970631795622846252681104767475177503937782564413276889
+0099794234571476050102251924980186262893747705880229668101192044145818046711997376029940219465691893053496893208450200931362078
+7338980161503676399103395907119988361285887220551606875942870878016149229490400212073840391368478482151725734739290023095487410
+7899326915683751786630813196982092775796371026481722729931635095642264999233728389534905015911812126591048864589797672830096696
+2751118177471534985294175817313968889734356500489672942275914873801559720503551024017816293024629330339229860581633938440765263
+2579409952433198069628120504384999886282779583918285844878077794508256550262226622072460752726666294025165627679376513073930940
+1557518549380248705140615993858146675367318700594928368305022009826106738355680320673267541599976659073767016002316705812605118
+0706655774414337358133841048392051795234166451755892548200847217249090290629891786004054678210061272314883459040459769608941760
+1894242091014594788195514987048397793320863358408872612791768967887371355399390803287124928045545098723504490408131463760999333
+3060272094521186414251733828941054176318890330197109603090531231771409739699564694060282342629340263255630493316904735659002049
+1028815907660526325417480678219858187627208188992524766305787455603486273947607751634385261335594552079352038645485771077029993
+0683468157651545576501200944305620051155390867906355388005127965874177601579306536442110166029928489048442610212141268455617318
+0988081700313980006604864032962026305268670102163784987963985127384885587927642407664223367758558519122248185218742873483956807
+8435692954315269375984976106264988536738299966701776101047442064080401887709348151446333391726616352591853741366988778921917957
+8956328839854159854532673749984321247777028190876411555620913589749860701945785300696279975495557163768982684990843868186778431
+2520325381475441756157721367873710939223796803781885424158254911912476533014496257166233162377942526340788173572154209732321202
+8180099306765466453860728219641256442389031828386563717730489464926442454808958172470108839488494541309400369186661157251374638
+0628247148382602252920534144240581556722670156430583076620252695866327968997749969112676595494827895760196984828212360640034869
+1083401588117745555669152288505435653771338944376475705488767101152826312238533625308441022273664874833693060276780849703095095
+1156085057274283778724094356821366624982478225088443694900412624860954703963723162086763699442272343649549404340286403255643105
+7910121814653271873529362722249047841930063953194714561480180469523505989148782328178679381325533730833709002539304255163521040
+1625855113537607234401449098110230513476322963277630854102799933050565678807805089239388422442620697922678611315082884292068865
+4371620713456528072846857825011777710835705836437187394614071662418465730864540826899869210260117229659041798505650538477261368
+8985576750846387981996728278040998786610281073838965731512714567426037576813755214228497693635971824751946973019990502558550741
+3401249486943615979298276104790818107736649764729969044884395409904447217117866856126816079991915988836153438356752147841144170
+4762938795985970542856369222277414531064648102624695688826552014393694646959714635482411149329964264665288374841117934547255987
+8266183745098026650707351627828760547702165330658530132998099760473617506446329738701905894912433667123567916471538563863907720
+1749733602645901685261363936495062217041689057898136406969925562689807608184144495204588063954048062251421026224871438707736424
+8548102168448428644279598842714118177587767821370906237000294038845928905112282335030976267725288843840126116450813362024012439
+5938499597145637343173003399875431713125443282016722261731991805628239317480073706051380874344456692406363674536084190692646142
+0730500561374089587897509875647211800809704761282604727960645054003482860298243507208373227297725664305984934399424216469588628
+8419154111597746163254112932894914530620901371133608712199806376981269451117389112518987662727134188058972066300128519445766440
+7937806580759161251998478953470159484262859343028238192145225348422179576900021837242945100592904945106701907680168893307572302
+7516873429370795478978284132360296301129718931677825172903818753611017830921544550227392257770205145640364461713731347634995836
+4812445494938381664839724186613091405433366166945041207304600303147241282114042034521353097954231266436563888803937496834589712
+3378087498752524611421562976032943128888258876939559646852575538636633313807640898785156463287303741217790696080003514700600687
+2916828602935343245489574829087284839505734067476926451104496434541582983914416281292812699388088495707067652976139900162078153
+1962925444708479245069456050692574860960690835458249514553536707157865617717301444683893731781098151767222498616081872995504896
+8173903682609218746993851247188524280631112843215665762250628484523471921122641923241385617676960635551184550463145418449684690
+2919933149036430836155770474842583951453613631150982113752681626101371527818957365564134323888669717562193735500885632774199608
+1609040194815030093545138643057865379099082109649230423000768558709693305039551156969735710643672277845208035827493067182565724
+6908049177553254273158603203912637795720376483171212869602699514186725461068506421013630496115516175113680573200157037543353536
+7096806396941038667344905110986317666939904573544009284947400783005195693194103701914010433669991415780015087815639572682791514
+3680756978168727352707707927350530897842094443052210887958488018513662258743146529661558086974070289076864455883890457256934114
+1990854389059420349848505548169668954938843880071111806085356892226974097003547436768393216697877346132002814225746150600875921
+4374492277982018508835930955357380285574652568017468028145914088210165891776161047538281175076369924948661559170128551211440651
+6393090046195615488795758266312386404911848462625030168594274415704463604586947949625250757933039912135660379167156550736214014
+5728243934436503311699358540925223297549609990942386098315769782770878982264993140803173130768644963918006938211060093506696811
+8242993502087208931436768299544970974899425557012952209431499521399155627662162396837380424393929443574272383673835625796387465
+2907417733054963303298412175669470571774232019901402324926626651661243360954715973085766036500273697051651414938093042950467378
+6785894337286818807967188916007632157799934091531302525882785328964971157321099749451607078727217297793573097237856806946698841
+2698558719450879861393803875387234736047009367170703129862250880475805397892793129358764218650002148641764709592993056227677164
+0081971305438865752091446464085352177755237063190907377734114566649793616356658589817576855323559323530686449621884731840150788
+1826939540243947080817186653825740075444935631469715645767626335326860305087307127848152820195439244125563274241365606473310540
+8086243883958240578268878611599696204485799969418845316458163879163274209827292559109804125366908746820981499563030997204003905
+0386391010049409963011357239704626669689746915426124197111331235480408669200583724344735150698143659880232480059746405028850204
+7070621356175994235487518719187218494861976025281218293612423462113181646903473241591007825352754630207984555163787848738511210
+5746214941035113394857005157649321493185603337720914119128667915231061424163637568324581504110784614852811094476768652380182856
+9112517888906528267503001049949573135127874375506725576149307826638851599758326023611417494647191891545342374452874064341534379
+2427813650814077661287436979575407398921688136831196702246080880472345267198382221158754713144173467705458354166291752011017130
+3427037443878854401716449891823089902160247151232344993329995686205840347612271617101573796125148445827775208799719717001561364
+6663271105359323644532079372626792834540392816461024173260479629489907065371009161907255452160867279588979514640773444750654047
+5973386387254971355387042682264494417370956942797373987206113528047687059080572493246240752693790196755839336183495531383520500
+0786113322119991260636829390212550532753074849695602064584008995135867708856455125847634381213436388672553141147016113632022246
+5315245540985412852477846866194175059739189599584743384794049685678013782286205098025299864897730658726559776885622145372207093
+2947046237055804495388214736381241294012375243250351412075115454784594240484997746146442841037234277389231586332048832314609602
+4940560326735767175083614737052886039378277408442894735731934794992054788139312451587128497131293085948245032106415584594528368
+0132772291233611554088929401128017045937329980274933241381990578374018596495898631586186020586965351932668997510872004538098971
+6387651070790112849045385204698059096706128798635300671169181792420546539133767532896269735055635232257735434930885609585584847
+9016459024097607724588041340562451108743288014737496316921528251742165151671257409207041532182399287641327587310586187223956817
+7534883738445463926481692970148340291005837757179973259685921796789142441810657257829230854362459214897426800925224271446152113
+0560193061957298132549489635518745231685759631661778699250394638322691452161479836232887573811183208096513244778566157714733211
+1547430295477490963534296984638628258877576273566145152920369666682577588376652374130208299869130148553971805471715526321961195
+6131510592032893543765491267410178707297913936975805122290905928404238596549066769665229727337467790389337961037867643489553699
+0609065177988688342181444376437189336384085173474299503743870199156371216381879438127542687917993261590322648797772549606051885
+5486486858037007564853644084702405129390388809213365108089374357918264647019430516503970264903210163964653753490047274772902330
+0461300174226405350596681300475321223682365336534045385167141718398138848125986935473489411898994178547406946367385725330213907
+1293509274626976153463652826393079169386713361776443893666230924263947932847701762953659799461100689690446626123374959253884277
+1306373580520533113454583490110255646387329350405309931889447247185635126485724261288069862689556565591921946727772549017471108
+4575946994632942954732825619796920704805541065043930109567542878956936210283544264617080903536339854736947121491562648913229061
+3705434044613436537344272909123399762720035093491390444488810776264889843570633561219106570438196072991495500597843887820183050
+9436774296203905562085230110417550251074216179370977223886873788396051869595539699599654175540263842606847704783570758848289347
+8739544541060559735321933455321086474549444477666793232318769795339438758735396350156993223591143789407202109979058296632555075
+4292457420547255026544250001229816943682894619632431862491477990869504856164569154248439119907994750443837979614731379296026483
+7759359950784829354681821925764141180511597239315053998175532245470389364554510124781233539932768390441633522487434841829277108
+6460068597420725351564334958788443977520626552046510044910725038151710003467025913052244964411427404827820741380296783360351862
+5211054158075000733081570753562084145801231533068994378093380973748015206056523195741701721944088905307131000364624646104412959
+5581089920926259625216459931700561828077094118449960988240945610479754976194870306805076133937666171790939426378434449418282506
+6039057527913534217575393813423847928955750038761332266774182283692275076570170104686335201401167177077211434292507428463611621
+0405115165537284758792010216853186661681734615099607405177733845109910013152569350731884598363743840624814198617754273927011515
+1407618016023682414983073935592618659194377480743081488662206405541839291934958759003119610099774589701968015068594030177949217
+0790315691986911016674475309797543936300728937674591920985541138152579574295860682375269717640514911824203818306809998011275060
+4382117983381412972994275528147432373242673418215434465602805780063289348278856395267652713597654578622689358031371373016193682
+4971203890127140128708179164505005602256484886747097346823610758765747601150832737555748482400760746795103492345268624660081193
+1238474101549902789927134668369786012288633703563425355984226013256465916402333622807942597885223175366854363298056733781480165
+2475056989181989715935840837103963570756393472493139600699839539995767516688497969127775142807367604482540314805881080534085920
+5110483916952128964226635567750120557932419254741576165448818621280817929369091427028028668168593266857526132988629197479499338
+7382097529770364245616319813419439630747996451787212372784898440040645194051307376865641947314145623284843530906118562837024282
+1180719306858134644273288620402473339088866088558646666749328622134176944113672979075244216767608666882416653166422367766359934
+7454692494850748528168077614552490356358640467830959916873691009192683520419187156489031520981784955116022176529954332656159900
+5703126531777606205672012335960434796458742284617167876316278828807209603472901804370309819783462306443611963348173237324352923
+7622935915352142387734818536448742013947936195902370636105913778439778154319304174619967238291501475263405722167671985219327033
+4192469391918128902822325360387297654953797790226858555687025028458729211895927349803665945095655786671449147679921097155626406
+2780677237649339975622761955036413080116980723465856549727438471457957358521359815258203894427475417964365478268462653223640340
+6384355742271287800278025268983527483432389226283229170112845354988683227778986191910815226499442938779725664362022274661446656
+8983529286956750153487719136198257278584599062333134754547317517831680020077715886321603644059583997509690986046227389994861108
+7329782796097322937140185361853575699691754834694652931632748528792770060065607908729085140248378226282625852546158156687855610
+7542858690282896923167331772353246169388345238738453225427851985834084721866947550098641275435407170332769801857389664211235898
+5799583185812386717849837795175430854770749931463501139883970148364355569591352178627597816164651268936590016366615235430971843
+1626691744466309451182517845050907803525893409042451069687831523577743242687080029262942742968372360368621788807914146915526880
+5318459023686131069631243003764992320489381131276662425282581511713606116289353391248019203404378565007089996278162834011328054
+2940914263304203321901619997487124198689066488749388375440671721678381773728920019056941032982814050260828373786697860844945937
+0935106263610485636127316359361586585062460943315331019818757835533567856247177900197592421873824025425985298148601575872003838
+7678845567273084139170475285839065925039600025616987691701666903861540800590513965950744386259900437461673353720707990879400851
+8954549187260534626790030686600472676242184422173770737899202674956746463128211733652450269429272431346452882295888511514249530
+2678743312277245350760231139022995628706226321476561623183303095250671287742041881664219630594695703026351221927214229218759706
+8754746770599874955073426285210045733061478934256278154824723752843570542480374148666553082213624470594178380618511944338556770
+1258342170448502309847524118053510267304683961421264512188294654208652383435713573419843151024833136714917076044792376946554552
+2686790894179727162588194653073820095034068415445717821765878768235572220948743946189649565838289653662296142578461681042115408
+4979975702994756010947392018214486397764251254586716632357033001934850295130508675410334819960903160411122706650159720668896818
+3588969475934951426055953320940144471459990302441248110905750552714828775127383961567862284258836730043491152173444309138622805
+0885835602018492226235865580484440117123283431801851414462459989105042310153202450298431895243159623304698553633960555968674076
+2495404637338396778354332975443524901010204103490577360377282407257576116606492214532864036869380580423420924036214250605437552
+0273823801820228766960129999040441972228765926389245168282516822705610151382079832776017382538534107323345050070717318572440468
+3719693296470114077607298610532514071278447231443437795910351532332738448270051379404482177889663554053263746637709700053641967
+9828951429348008059079973550469791268813640030847883313731919419849614743360559828672182938947231250356355114573949483277719010
+8160147790535337222916241165963603517851503563087426894556730214593005608351479878086372777584308199478067490440060949884647159
+2948684894394971841029364986618911826288588400559264365297543464936912860908849309130216792677280193265598685884468366012698447
+3139146768567604514882268160880542261286448423327913447026774946542138981930662613526814753066924945383435581070740645979592320
+2648770517875200683345474598491811627153093170689853703611806314466352414707945002443742160480066256003350127740349411901099140
+3308592816806695381210143529051488111319581220479904092647583948868369653515446635908476209492392955841254295107008775348098134
+9546057832057661112548846778480873064251831646186943320977718022174333455691510572548784701482794043711785251965805930805124302
+9797598220825240487337675580868560618123083511865310119111306172185132317065154479238514833175902325985968356007574306322665172
+6169700545459665615556940263207457415925074513750097043236324790451429771342105725243301487094857682554118664272164353388631072
+2065773265591123476370674843120027879502951065822173174917589895449890375502164860452910893685397468281488262706240927914630538
+1707471421521563472417257512298478800552951214730430454446551411959701879859928077389843110236600965268158074916952323108191254
+2504020366275453319690764881376901720307904782764373433647976640867427413961893744590272111954111461916745192557787193817126040
+1588579151481338108756894573873934357158704669830936720767495898488860812251579113152660788061419535504615986627104261122375990
+7331623622011754370645778091243569467777379728540842719407347993337611435365175147413009114962875879124181378102542276566594108
+7484609326756980072187285780841286543812762762534587441056462410575222582806689121646585229111979073490526305371963936438467919
+5706586317647554978296224372749817614542161459685489294484897802898801747536653246958762657311576344225567199024088879682797895
+7982416710167868709570332702438980645861985176457876981357976675349506324625350574864591977896798566893422693217353865223434242
+4612810517637816971256206727690640808547458195070320671241318078156152911173576755031013652809873321281227880993755057868636257
+5869566853914426396407700744200965755799089377206196772845889331869496057116760154715122075783787728423594874902542137832225559
+9589225721722482637458883619679136109478999500918895037360018469933679740571642521146059558547268528193088694289457407297389417
+8114608149302113225536168603740452239048816211285413122470267658232185443153634579198429078537401989102386028340268733889611123
+1658771744647637356624539664960206812688702241127922503053926273465214516451739790546967335354319444825617690989800359892589856
+0053465651697302095039711511050038742810220818349852842019182724663703883278427036626489847521335203092583455303768771456368837
+9461783935995459315552854731516681231226811974225458662840484653357703794689886592991537310946084831023202899386375997693481512
+4533585921481186000403378289480817856084298244494770175994273545179036968044114231324393781909984894250047249639320078105176941
+0088337423065130496692628858394850230047403024636567775158827661121094757863694577077324592397639708861018849419374525563390572
+9433907825695888321692655143225283986904641901823924591220365135713855259383744336203797993519930945597887702113356326830645826
+6988446116797840398450853279454162958768243775646820798515687585868046231740714350466068297160555230698894793181661331483900976
+3228255598385373641636782196372646263654896275851591790742732186929071139789500558984105284755563028281035328678092579289714000
+4681011094010579149015425103883784622081638214345888273901960768244903621448040859732301956914911242855175944393888342553563087
+2560980412018398873410432462155957943116348971819529996430919042949095207925589612393187400930103605496273814170584912659092382
+9069469616610979589154787060025562176784632650316733720274832314981371020706161084351225782272365506817110974959084699634535788
+6765587755549143676480283034752182178980320308874937062805295265849032617917049285075020134633510431916668093086266525800515736
+1987129393090049213521579473208927794007157494973792406906256045288699283419276005662236119067885571670938877198469481410429981
+3722619269607651225319072582934109199126677644296125933160645018724047938190291886105626593185859522559253131444513872231301882
+3878903450400959596968323921819162239731394330071230682797573061816799122019281619186466630116704421984435128057686311537024574
+2171772674581440679441147914828465322671796713303729214917204516452594596558898159147461291026535836576291138961274078954494387
+1278996875658664588862768319875101010284199226028473900312140448349990579106956212227946883352757991736474264479730037979113425
+8251737524782800721142346398693390112514424073577724343296177123905498209033583895128953063498814237667366732979745537429555278
+0896743149526940034664390783553213882383502205749882093466354195761918368893140199641725113693740413564898871253806941096124190
+7796854830589872123486600630498401268330698814798157768931103798808711643064916232366065296644778046047073412187780619253278677
+6500537503531609708551372800808683958268146390074367413801774325497534682441389495398023074938743544207866592122064463211672009
+8374007659269318743410884141200642883663626493756879447578129358932170292700541285549708569643545027306452528039696051958912164
+5461313220523803049639223578843432913631643532704665479011316367050573380692644563882130994146341345324086855525040200238888685
+8089200828994642111859047971321583377842360402699515255215765930754030446170133309029861283548123601950771958367816928039501979
+4921861981592932540366839797291842409375656173168252866766746284441002285941098783812692417408647250610811303546299712956961745
+9167799975366484899208629064327399424255199740686280222254809555146344897012896217389558240697588684347940576269967072665683864
+9259388885200851860744997606520800745929512006692275733677005833780389985037437438896650034386964970221299725643606029624930990
+1923555984126235140744073661251739569863134027553494228555366490941034788475845541690058986834251129830243447779754071605873640
+8546321296959618681680784347875855095908171158196021873844044080735403609307093046577378976184646301996038465275795577308210631
+0292841602799520083981301964025702228115813520124006499666068950846030422607104364257191751077960220252620197225981403964787782
+1502322992487049171872430148257934075524270686852895414785698734102981748355080650539194240735935759095611779799454232906920170
+7645673745116807956634247517521534891766878215315481669195796109233157590171328181080639943010458633508897705148841450600988472
+5372622766288568973430030404326811200585106334044292931194542876927622884286129265334479806408440904927200146880239590676743160
+9737852886366125426992930022076166695307759649277919719824038921587655496096287480936269368326605698820270793854355939980396762
+3180790631743853089037422811844405317287386545411386410379668362987107109358079426452748318127402761332147799830440163526016129
+9051792458167155549317710812956107571797762247756516089487421498534083002847984096816239076561386593955153876706013822381927681
+4173095560231171732875361485159122658902814416236442472154640300288401422165407659115651941434514022078384640403200843998671972
+5966470556331046673745430553457883526280940892044422560744252802816860579980940340917982940500224988618235941234788610789509168
+0789375239650015659257828854233372959702664651151444414363942452653680312005125741160555543069598467797693116222658921071003474
+8906623899466461239060702070337224569185523906567051838309830757794131815206179504935357263945463042333252081048931892858013514
+2565946185596833054040544913117114680329109501977878093743966290348734278988799428312347727405020457211698124070822545220367599
+7887639027440626642608258462581197685627001806341140783071773706310063459682140433859377089948217599328491885205500920242752765
+9105042785087589492163764806502467978793005126850254340679666786999523605304678430709511644540488408967072195820451312364898977
+4806602335002501148210169758225301946374240051070758860058332659173580299590222924023022260764063882929324416573334085874519685
+8860484115578005776711551777005731510087855975894724843956874006078066036507250577776451260714027733005242056180700853839120022
+9972510062716845450929888769682540876602068670550887529330503339523242901354677312818632650357341649500497585776441604969459550
+2623606137079639076047135393717143616094073824102105929404170935516181957666178130675618698894069752882863773580174806425770058
+4036671892720176871088682314351824213287902597131301780764439176800136663620269901795969751693427552587437595932156820043424392
+0677294124292240149296066696637747776445858679559483174535961774585189431151122220911414705647847144029722579499169874681984001
+3515611659295600392682520429928899147250410034409210806506732173247308027181439461299331344368884698174936563300497600474483708
+0063773420552619484426050490136425686777123343387056930411442496315945289353053161802745807953399447036489317450479861853401831
+1025437802898670603956439520711493780674154126180902484921242469929281393551385642769157018539956452797615106532069322627218483
+8759796578568398063968102679425317647163292357375418469803494058822777510870684874739268000355169575539187937262850844553141671
+0520130761108166376660600783005143635657232142524978468353606381401953088627097253750920455395288123559132491257402067683088919
+2890887289996966535342242107315365601206035014159576380219737883962373302977227719789793402712556663655879816814402801231940391
+7075049290134330330911964129274745947329781151686133509827045508476840011833420977165532815261601339404747681713954176358695787
+4190862513692697255977164180664759574127822507052658315853043337010650269787647027656260221445450941719360532423677717036461514
+6908155746961875390092893184110336543104604423996158420042649680420697682015958655453176718660496277341803127921088518280061343
+8331309328194407889735199978235437818800306669005429636917360222653217191676841870581785131998034245906906399415366961802496511
+4025301862689940996141896458524993405457637230423945068131717803505952316603722440206101338781745994056920279938566008667957974
+8407156560172061727221211500538117499687747789630891734019549331980906693172176957439813668311313041124185359330130579817813671
+7466416959132373028000515440426004927338552129675365950832267054293724597329240325990928091976976797329108528262309484406803795
+7029882344252063506996455416881601769204928489785629548747090770306190718064516950313796925310576174715934481881905681054628070
+6880642279419324327941511209000580929409891074059158709439715032933825582097408872913695012908119133558817540571147731630417054
+0450976304961807996926719984418185237945644387146277128118939816965978556618267349869880710186417738649005061794411263100794703
+7430304052534898545934660709004803179571319216041424124846029027406133093839979267839656729246840664461817790155804024698154985
+7645544772776077953527747512204638297554270388027111651502874795299134795410937797070656228161921719694817879801901345933313665
+1313410076049663998827811921356048583498283359569530324863158193199961087225704771561935232487625934010979224924950123845221938
+5542450907649094312430747916423053695607417672358828335758664117685424978394617325307248658166202146920547925646776725087468720
+8125710483678181819120321493187443931435742819361342552711290450551262872707443639793745995943576289709507020621251828473114770
+5808995455056792083922234742431742082106369821885564948694790039533752228468465967393391425326441602867483086230714643155046641
+2407915004627569028579526596926110527896052886334582385573230907225818330304996992697006735418150830862621130034997989250568103
+4747836691209220024929494385208567863244371223110054782899030754719240501536232821233744154670656379727685527957774155672319475
+9632183735133215405359145903218054467186662532650851575633645907886287911612022173510068469813052313582577723168904869118582615
+1758443894147315526858202229285381300192667883978558926059924490571584269631902778078169815289434853467255533171050775547788250
+6827379725903576619807972215479471705793002981926808670091729392075163455575073588508765374074600361763199064144608650998814612
+1139348883195112842120618191199370895634072657781661691958053236883789482321308598352679539450892103726749423679416567117182472
+5628380449503846780627597266237186381426941668768981275727365655268389180764025467621494196092237996217033830813378898293373834
+6249982118767143075646051931844250281862161753132641089322013640269043322260625061753846454820580624883961230554153956989845603
+1506389246361534372134008198497771836659467625678409854914006570144648661265229365915719554541771143877999578976720337073985818
+7005263179523699177762675340194056182817188450058666203568903779623473238455975919469726862072009578002483873154457672262756142
+2974648493466373909300392298493641388947991203930909247567333382267233769728042131150238686456747730553128288781731025800074389
+5103801198075821222369482103926218823537252278659224466101143285542928579893855240568803378461857010249847636234366813910593321
+8255444368358914408018189587539831385866661807993390145935560791507824844153502737089683973595182396850151415917641412882278385
+6994623624086457510788033568938511176649748143257081559534249807952079088004873263643117220080770572410226081636499222544341556
+5868861827549149829709753995576140261303291609060728919357591890769431437067208298630183272025511291993873213366101172628545169
+3536668590020988868465523872067378130539719812107645831862475320339405404292929655894962610265222780223832442563481658864747632
+3855559579815655284020206856324714890689773172461142431850331038157366681406979208119201701019291754639995462477549126425391350
+8450291792039621077539436402960450989801386738795258875543765926494042577259109968714035988972694939518009619956412673656801521
+9433075795122748111293126771649210779744396506362417079033687912993766618349565561906099136133480366162159291355560623721579187
+3378797875509332216281558051343681937584540368139917115626876588840206579792879445323063696609803160334574023091211019696117960
+8286659856511129135392256673984667705469454940089344874655311260297659378259031305125448870028720171028350742267966605006358033
+1559883131888908511800248016547342952257309383028102249271256078844439208862517563884780187208616611438790446776997799461384713
+9213000700276768725565441947730287329227888200262127732583001595805481558214719061412862292967561082950848644790833398460564723
+1237463356367627789252505343790157426584837476951882453112990120548575795054118752744721410491509448371890573822392145256573546
+0705282244277315586839396249472907788988824858086668101214804950902161992883203183045693099700874860748969961552066568180233875
+3649804362910298143091615106831740058421008356128934335979284102172120855125136327683861035088765145754792315464262726624806783
+9434730144784579817482674138286237679514020123482574946846405367389289759453442305761634017866345369865209680919734485563877769
+7735810389258589718835809442124950108708303704945904199371845065484839372522859566124912994258804441548671551838820818437896075
+7383779025406555287701082383561184897642996999173556341153509465466385364878232088945280693653997350128318569872380406482923450
+0873625836034957145587001580511059464110231294763738687292419746897783167632026738408026265866915946594910670670203196220111099
+7591072259741426420367322902499121885937012842290323842004604562106110626665272233088406003591488022718144482545987747891823870
+9175117307974364573779518417573849521480439605413624062061689756346227400155445091604379572899069013192269044493766848399848392
+5240204070345240378009455038862456326732346785249576960346569277468135720674493354585769115025511723751059422380004118585409709
+3349173998694448270286501817135410477702569648480525937208264068896413487832339295364105296137401893118290448960552591536754124
+2721855377073042117183109540215181252714104113649070283807754222580162122302324470826848007123339852921541117150545915474905734
+4442237467667117475961916917266329385273400917266015718314637687934575915917583933649989627896013912399205012102463085560527584
+4091026285900629392132231811067909337191049861336953793421590084466340471776345574531068461460044327698926685026108185944785273
+5202568174541673346987530914965105932805689677456919213224331168071054852507039901870720345655716025476685968559834858758422493
+0614858796890361150654138608860068135509273139791153876597516417474596470901950497034522305572817639212080825359999795816120790
+4690019462662785935463711750437540580321430169890806355137538513325878535253326703788253684313085653375194280379587086774403636
+1192297531414960747356858854539457018921020998476941206542822005080405209643807598603349026957600933047420780702135587594220420
+6385879114957936148095665992720513226197859511089355764654052901972661068207137358088876405026746758171573905075146612191621724
+7225256074560068850195651541217829216290435321680622077492940113765770295891334808874940394348277026794361425754981697514840551
+6579386119350941004072171940171520374772062901476128261790580552298150743389764668933362002827319670377285437400224631386514541
+8225060930462866114265671430768226751533399557663700459188510439035058277166158167696828360029527807376628848000272330091576713
+0060985472860653127812993949032906458731116791182858234879179245998734711417931089452148679024170798661176089885161196837664106
+3722805008939449259124307009136610112592018063781886320098372656598331954054355261215122816645348365251690431718100984807641151
+7671563753475866652087409998956658850991352510305691362750704516857124752942784347614592502287785972007339688267613862027066735
+1058283061155393934892259910225706182663785747481861117691921311446649045132526185682558542054377226003665649454406375422089246
+9732227956822666337303879201449758438032098745926653063569926833474234804332766368153105341066282800778041496886005184241210550
+3671076559003594556531982936604847786145732585941552091406028722895252734130685947197552543811727116647815405252804851390263345
+6932108260738047486627928786730592183240725916073436786293871274003576099287405402166418657664483313714856186223383473022466647
+3109816045417430083537878210451471667742535838802468841651352736464574926057073048472886864367560530408263557356129708697457730
+5131047990674797494394562345612521219564146779615283892037401029449518064490250135341621616256327661631926681344727899774392825
+9793560539429965156147946048811944830887554283992612919784433839525971829092056423046384752108153956186882584119526879128063725
+4848894438740997315189560856906795393017681147097928684567412396811955257068230623390617279746246419592475583485164533349133972
+9247196347885177565475533963701634576057917406510305607776085697222055528129649096213092034549229625900854393776713393006598014
+0895574299458423626122169092017122327940337399418681543962293182652716019527292869659349372977261887962838657423721599638764034
+8069818312801265892359056947805299813404068292205524125399036272188934298155723014962611157660369164361085013693243392717540968
+1746313469892957608005716135870516847580996237870651257913684437466577959076954626426758903637186057505535214913540381448786350
+0826130380070802481888865468100577235559992056039751752075537240976306665243883422413804381659448597324700429367218879041686316
+8783969310605138136810926575209117557352903553802462523920408350875226887462880478648547408932195087998226093346126517623953622
+3655963588132204550439064715232312197339282921758181601943083078440247650220106399066615678880555199248431536315260442825292972
+2898418712339146920156618115849473564647025888554958680753487875973131958912468912448106432964749351366422577093050105438712807
+1852498129286540733225557917645869957332090278845330056842464816843083325044360873406582227952116884337704935341689726805650922
+3976284069253193914079828201683985526108157492968673193265258027640406409120387997580216531505549000204500196895696438933985023
+7344227386409800578949975082890327124630045606308364332447462178940410322375677488036092734345158152279018751575711953710675611
+1365860719506143953539467521806358327791893587420884033512557356449628421974197081525171097681451739962654458105945042338824044
+7339951041651291336434788317295707347631976285149811926440821662705811682404836418364754712250487175296474328282212659994274238
+0212161973979980092408896174977830808566631947896643996545492647236993898876722578200269918604906863319277003087190525085408577
+4872695328272197013637039406318385585335721591609046713028487734545081008963689929406578869624586103965589484238888590831714070
+3093781382852235095749474972285903266360882836791963595009076006750220113661602476802687021999748113402446232401462878936110934
+6435034693320558902105688910308538965196623309949466683973971294957981775446228096356658904951613108961843850602970532678592796
+9900412913465232057825708257994535036127184304885007026505543104350741668197223958911527343764741682299736861152999772201279599
+0514985184283479308437214277006973884479296109534451984897036545588323471166529442587769709637302971344236763633165248653048272
+2548677505362732783025625571327094753804197898599649990120724885114160782630110803234921618274764179324553264262464188071111602
+1490102219572319216164107062405778780633273426833137366869390517112371874174117264586848123441331500645236212846316718716883477
+6374557134532066647778099833443353940716636987739316642710720220881882944339283639205849477871629369917099561362221287484469397
+5537933700604880504714026554029166587597577826204845542181354963551493735767539318268321221914383282788245529093887530478824907
+4539736948571324006868573970323898689460869616752573795437663232396854974783326373421982301397494963660135114656842200560632231
+5417628879269942844019831356484605118567348015685889718110291011794547506306795984565230200245047127434730978214554859175571386
+5244295129306313578981901753289283565322938724988065200258490956019375699629296714989839545066652554067148655850643910689520282
+2971836240187409511885225271973597558472371014435493899110877817281998758924278138897958733963027723716372919312791817550414257
+3718036377547310037822620295119160273747183347935451508155041258644862468137971759991204189248362267356043409939280563151645203
+2059403653814048643066476915696010105560937121353588493219472721117585709084500577027269061641086537899045745026346755806963182
+4321247098580397470005864122314116779988792921164422171095663365610591552259489098505982208555327107941284015766148898178511334
+4129075760977557106793231123557041651779523250483585239932004312719534628408382643294636229121610127684366632908893383504173184
+2529072874533404417364878145806482135038499775952105421793815591456627903830117948809720387389717200574623969207051170720940841
+8319746694698707336604137199806790228573013581807699678418425604568242103303802544153333753105945256725487631110225791990763711
+3880160358558853965367146276153313624158725831047412244380280879089394407413109649993209520904697096729360273647396579418687376
+2091906829462709596208568404663223009844823381264480008433097662223468678702122339891481765380241818468489069582210313140199504
+7634167069455911451763369770809802453049016134384625283172635485682336911180471943157282346432504400241673963332048163371168819
+6945528084709716553738011980160563280642542751055915815221655609127228922438332498633425574184424076324567457335614537707491118
+6855985221224698806898182154405013337026345633363958698774698699505064139860586968819626692305575161911369355200549282693239574
+9661995161189339321012455875057211575581587182476156883528607442238967236926672903199283225630412167629967841892682077069456544
+5556977126081270383421853880021926196747677623279360503448724398127284807443362608046943892392030345708092629807650879718315338
+2008556770184273576766805643194174770708191017610672185545130733621276522353464775534219302741371801405182864900478774809576537
+3865082900785088869003731961311138273432940384506242628178208362272250891137755623037615929981020628600026015312604846649871045
+1810271541153370013506194385701474067688519311563701121092950023460871685900667973434789085894353689769155959515852286976707125
+9220855281244525680311255117572398240118776083069705246489217127641378521494501271090294888487837045515780398860147999941580644
+7341485956164711767365322167960284966203049807458284565556017984048646824943506319395879136232290301571995491168074801397213067
+5371405547126368328180403806382396944697802094247261778722922120527093199887586224288144259646007747572032786762234373440343768
+9641998676406552363362334096338343938226513712459780071504106769464358782102176567281764333076640338559714360625098972864983029
+5780224793125175832096440772460219675603258721147649221639684097269727175225573293185628479999177881598175668238919939024400140
+5871315749737173437146622211284749783435729572078139529891438562616324259909214610231102730312223921245301659630109254504380334
+6697637358599635782137313649853967748604644159075078379860391872979880640358744386814475406235163749464766557762029498100317344
+9260432917913444420430985635427292687992391436924828756222785655924726309271829922076362876173530631675597755661167920958784469
+8008272163146127952220122593079694523591964786341879588418492633364085713190449203278430539536800444410958318893570820694596913
+5865771428552651226808077349460469511350507824410126508014924137043903316541107301501243645730254790431504727160432598689746741
+0797866504326277547835398517451743711623314102885283925539211029404096358855485908679412360891989483761400122402649553985042303
+6315338269917337190802305575034003552890761126872174385267928282692687307003769845400327640284655468895977857113820663582843212
+5883143761391732179613778683464000760776952507578651405618216504779945736760856433526347237980076786027307666785673805176780505
+2608019170724255979187609288672429113478903050968752935506997075853793110328285209939065370268834945095553185289660445134585271
+5934178091636548622002305410563118241322636012045119794891759960583808782939464117247149044590174301040963274743429124451974081
+9822212841254646950102433569804383682318140936706127266382165162763534213426673482380144302560262856995513292329891211427952322
+4939074943058922639133209628604240951813644498408022254626546671648111368884617471264005460319454857408802054462873323814596304
+3567851550694955955743156890344607975932611999373517821856035756405925438219730313496771878294219292907299376903706456079314724
+4355891716120089571168867921156570013309057339164893294310027619061553640293850173132141828093723591781265620877693908024633891
+3432150765823697928455051347308237232788126878764759364421680111689906395962403729413891780224106047993476140159348719814489238
+0234684991575714928121012708547654894568292786765465546202194583822334911755447378931758555122045328265456840620648627956740582
+6213762564459648735386518381734716590458385722741140951208497160837103126054522292981022939593107580769282971517719856277138950
+9795430658880195944561326976463238641719113418421451290008508454179670774519228875316092692131997401436104108663905564902246214
+9652373982485787988119955149332007099514930250170109206849474570844779657182243727422415156736246473756296181666403081597210612
+6363221919442807657179269261813196315614323943076172547080772762082497876523976444410926957078802241443845971487934887307740781
+8442538716705496485993660458983193034639571775952652456130115624584796446966906201307091498198760859970990751619599499849168922
+7540755071266549940783200519568012630337075342163311989445430751720634069245959298519839175642543857453232073106471321794307960
+1699245059009156264426959609151370644710641713396754020166970217700932248280718651485571836633670709702375632170998942628345680
+0816396190588432801059693946646313280382672711087244012208759747817406868034578850546787526313820913242493648577159472787123381
+0759322746357530465987827894614798343895157467747058744481984104257507440485290934854164189380366013210043776529824930881371048
+6385658080000822018084506735695449199723297410443658699992360702264595362859622022028092450523165950738306668328519968101921178
+9290969633149036611961423129438616262578501454017560337962795366936304454531175225394994520495848281893733418969823834849646325
+4866905011511861701376543806753349151579844197278285044705460570867283644779510401658626041128258372474841328027560368075591684
+4097340967374048459759351247293757377219970623863320131555594933368226711740987383236414710324945367020743532195606500683770435
+8777289231702354648686196142357855572861820397757772835817870476148855333166772599103631182225390962911857675993162562793056451
+1643701292272316612682496492137369576459996136135417810378930005125534965897227946840522877611416279622753205256995171831362038
+0366738891350724663780781742018384952618867530073606447030185424566647732433327301660674858875240792034393577096349757765316310
+8289591408206074373434407333542355057011414872348953466323958988208406535831896578204946085981588003478321397316316325936083627
+9704718565559121039339280928457498417206123777131839564784077774260566019404908403357317188872113841441577298919813210986548633
+9293886303171570837540716535349361584600602170148405662530496205079833641395026663688854207586823003823193883976384903470625532
+1727675041270249998973772127828169098733155135266069947499638944765750528948036161984830730668217006998355034769138526948886812
+0092789759212121413625842309085282315688319684507180858726957280563112424218015623004324904038907228951254860936129174811193610
+7248502251808372373101361237612617365642190393287142805878594705588056326330546884029678052177636399750149538893582015648656691
+3367150919108114535725714981888781359653934702237037159199343298241562681613327166427987327289684634196866794561168570101129576
+3376393226054192039386172081865991731275655717454440752850294664224843539838937920883445641690602345087514795742186569107517414
+3623971382393048718491241619316545941650237621831224965329865224908967972818626887372855949653336237529478398264567160685068577
+4052813893095863733367924664141451148648087387776942749014403408537141959668060633169208644494300366994545481397333067992909358
+0667669402093903159518564734675653958529086910570255872008713355774046040785518290333034404789497402572158389475386895486868259
+7468963766629011848413788837165962853506507117471181320045844652746289086413801588758664510368868946415159144280007188633881726
+7244685543653493127669292847190750279258471265994953355225441242455255911176450067019362851931161106818923851255323971731656588
+5234890473800747514454607303289634698091529945347698407177688996229422965619449293992367330399443066079751703944482713291326343
+6459044264277571164204689989304404957960666476059760392612837445978755062781098058819661144475485054149528425812865761888665230
+4335062014272927898970122302854052906295227383275313276798239957308395793035503825814636802802824167294443473540831595897555019
+7272548964073946058176039524239703608785612474858328053422538963447385787828187985994849316214926394617015487472147004996421715
+5996250931763812814551030631847429127490485716717613966608339966170653265360723312151608339298980087240888475983661731432872181
+2297536852364764322872184823063403907099469015512172454623275616030363118664676670421610327708607480232788374190290021972622793
+6341746181410744070773088966325798253704849845010112635545932402181743821794042899160348845322610793015131752714444557452077603
+0974929188283489944704823132680006629007254931129889666199080416689925517182595848963795936091170595822025233402048475030835352
+6345563891720858751435127759306670956633219054037703933137927110019397801896389210768937954353107771885376564624836527498565777
+7406605189056950050564580620487220225704555865872099535962165458171814654057503675391062376917680202395298499820248250031013118
+9646002186451042668001138188414741520592517338749162144757726571293411846579111672780359450504540363461450479439757376293399965
+5620887367929571798109873216776069586763980872092222280624201174614361433514239488022226011723867237579885237366697226018636145
+7658816676965243906096876039909445364177324988679848256414790985301032302828151276736018655718069421805321528401722943260148087
+3504531887253350368429518151187892137924735559724530027941664978322897818820489478004391185810494126054267658700325358193119630
+6476950573687760010199531144942136546086284325150545828401223666989902218958065517474495615521528611225439578736181496123291235
+8141273699960775743878136458997315091877968088833966155435545803714212437024032432947661397098373986850161208575249088483734667
+7526564869781879172205819920641629162261070844597301726270751056013595355206013946667713217060767795442616244184317275433955181
+6807778755059399042252363801724898729347456888637350665052001794960468288523356956423878794195125458046129085019792922364372832
+9606605635909164393346308754559022246397895156754911940817409436883533684563312856180585298884265000503280045621922703129043223
+1353282688124152832117904166784884443448057703427122162928095824570260033806131301099883014390489674198929314751517488130229287
+3941712694041861559776002423763440625536805158907454771393762216105225325673929237051966211204216493810015246774275044495594616
+3694132772158289887311123798026659094603586436166517150338257882694213224057803554027693325965893134619716724281180373864668897
+0965421930380580362871564338408316626579345707567981028006568747619015807088576948951469852219385041334895298633260796214042764
+4365061209195177145333592267894941789748549729388820653503884365772532158665492262305741107905299439181875779535940222413616201
+7002692668339856374514202085788525299569973429859432424389034479629705876996023622182434169328690891870930429505413389490533136
+4295933444463189433951574721728951160043627069745406122977006157620687110134601604174649175489421916452229565760756130297102064
+1960368933597422050626608328849588309269037647433491188814133197810733941601294848194060829957660144812059760171213031036827489
+5163673581923411040228773859014781426438397455478270422462230943695383387244412044104565525899545629313341781559828594738866880
+9340062964014870509227099698887936675774112546104074153547361150335199188541340855227153532746778775047019132401967059701871242
+3486224254115155530038741441994666898680466167832566881940775772365423817200581937154559007068187829334117784945473428671685916
+6007443619236946702946484250753989318115938165448366527641686620981129998037010871500824063178061129082786722904909804168031283
+5077049104333703032159256335893142225775472800145797927383645074150506549583979834771372332786212436563421519736302401896553214
+9328253090460566002578048864828230612968529907510194421722878024618561333479693530779323192843841998003032594026649617397117033
+6902940885468724446328665796554679901999854957523032465138455983570952184108442966984143957137952183112915545991326476857170678
+1147940566264959316051371696041947904637481710293264721589819021588178200143221071704512368347198312678908673679523259812561827
+1664627873674389755627490418493705966611982979380988314739579220409030725477944088566536789756067951060713524593551031845158984
+3598081566704365022254984411009080907751257030857437625615151390400729972784657938585703465777027605245686537246903748184890274
+3743523412032108137414706768919475408652123860125336712812291505493576913938367683595349130153523703056997225766687176144402340
+0831940301479210349558229457276992358900461281585291044594812536347699257011182959431429011534075284989504481274394019519138849
+5294182590907051056305209676408046536522421503936187377406071503791132907536141109384530248717758304915645762984125835020638228
+2925263782209751558565689180869492270244285946019041108330056058905348740666223484108200048676063426609063511425234359377856803
+5066811579460770402822516077692569897555102184861090248580603480179709451447581598869819018321983813091599472628576647298283510
+6074763977940235151776420120127969582510026900568916108091774893522283047922950769687105424389690185426520673414305707753060144
+1829809239775426957360751626081187328513913192137296926783947378382044283754109795780048763911203026361961183033933012273700578
+6256148707335785289325167505290076615535370263567053348838880542975561767345020465640090418173271179915907484593965695502745441
+2416400711412329501943051474827325196149637971289654356289167838113336024091716837472756809029018726324544210527893716549434408
+2077670900805210878733285491095692143052856294682669529394939361462198474814099442765549871744436963471806447226559851872954947
+9082929602325709346337243734095265641562540772131425161193766826203999287761238275537747088073534676484013517045928815906520421
+5721840157618684926859754448303249283214882375060250302441861554867804071849460117284782240184817225436567120551507130457965054
+3640323862784940017360312940091490694469989530945043763136591022334344797040629558445856236949010602808244365211211804494530091
+6701192226260174575156745632984043284760428280836716963199179332091776863302070789290228857289693019520852953529236479717683160
+7117865720410815041230240613271283107726446255341876904224653305719269008887983911844926604802435682901331270611392890319564523
+6692783449614566649026808017316150504276465383033625466313163064737973819404507236614011588134611220037079763294452798973884759
+0914820111491787540225084826895277018554164459289529667607470230351077932208310255555375301186238522549530796497320559115264320
+5836662613656654780353360816866098001238641884282152191319830259179620144977780872729828947449487560906147944637380292807461055
+6561572680280173994959056296932010485999239763428796091258639640337313710982242786240160248574519338042692530967139936885572234
+2825509566854748807330632140109077953768464116764873006974740017020211637781546586566316927017884251448954820201170637677959988
+0832497323156260043765386414739221132824464852853436205409279663532624738981652928962852787063322728977472723705113895939816648
+3887836720640005567311856937351200913471468555895780989932698604802967755682558413334239668009044766569135994431992317817193615
+9488541867758126379374062288207207762501971013768400508156207999323493728384215408284344930017408986904527951285518045057193770
+1193456086093196883061110691053041347131507623254475732487481683124957212918787096719880296652189465479161772651216902388161935
+9023602670135872848924155417498176225830627494225163432154996996459879170929691453342113731711303819248475466023815067381174572
+2080493294756115922317931111866355542145263306791051695700043555158422272380979294286809277064163627702612725392431921737967789
+5506584820111354803017904304944193794950330337626863953844116710622843699200721933361001889997152111163384731679702997569228667
+4453953407265344555661480951607569587119336749659238396970668832430048807500071385571032957421002113212240607304287845329689873
+9400568404300352678168177542306869394633571699501805048687025644577243527012594817839631515308187464636399822139186673563109194
+0383996386779379889997394025888104236940479474160100383602505977089098334042031033748699121508022116963448387393566265472288965
+0847531693445140037287515174964594859379085364324835476807557964238229721804605800683718605401718393447954937423707976551995646
+8901279644569224520056558762822223149315014455057454435980383798016264269841766056870811144787284148299586773970705052525539895
+0256120889703056267161520334600912740468642740690884187820554569479971860126461193414499951106260376564440623032634236822171234
+9700910582776001785061958742334821043319568168457980526939228569330951842352229610659307009566518307187068255993195333178816924
+8084009439471986482548298108494644279210299285939700414080731141355145274821687079465639330167799278714667429384500519830074150
+7502762255088959326392982513450122047410180131292434743496089993750128169949631240918611287380175422097126458912263961350683605
+9825024574318602570230904976205086057242856859840660113304499069379218541308171998260227484149937812807157987838492362751492073
+5236013621279011602439272005713397632062733928777510296548649421999353087528124960783236699168282936749555076309059950538448044
+6316174264399599155501461815935271957641181470379962431535756895151732821144407472754664303419949275610161730902538833181412620
+4057262138394989003315257406621046570918156102356055537411042166653273066886196141130782850554134831168704085162214611295749827
+1728494807516097505065593608124398864640297391491113562997206711322054216710834884111534067711304959653237337706486015754839628
+5402941401919360128506367871554679221289967323748328989926516006333132440966780154068277893259475878724270654107817685397502294
+5331749302510962305291613004333202326722920832094875206002590142911609625146433305314091631233538797653208605364527924132244946
+6532771118816432093996083328883576769019322364788699903259151365484388584381218032915424365355589731770063912720956702509258388
+3882789530639893098899335537330679624810372563783381211488557543067129370526059579061942074775015254040779746533167078485769900
+3805020437690986060459807837031266916198079638277454221416718947378635541609908151334933790442634344916435987118766221380030868
+1492873283652410067454455812350782971829174602968575413579966330593167559586103530053302924740897504468176712345572924410751989
+1402681422012394852214397745855323854981769611609240399129690457712558487768725787104039715649959552365787249656873757201153712
+7034615208236270834171130441362610841044504351389336191409989539270321328989800821619371048375553928712514470949748975085093770
+4290878195796201049040671016672715493368576254144716365945552067883559930088219118750514982822693100430367769784775351909372687
+4911033872681823931983855759969195568792322301570737362071175550474999508803728901587248248809147697357896852570255543589500900
+1706971004869558605860088419347382200967993695904618287963224847080176675951145483137675636512072408162582506993137174472960694
+5573663486380813348973168761749599259962367833751791115712074445847171992391927789752756447549332777671869328971664763925290830
+3549115232652328982096333522858191070453865857146234126898896140406643330756492575988127393599824952457257137615690188707592890
+1525981890012719417710592274397314151142262744434946961995671692595224961001445969622314797497698000523423663899015096913051877
+5058249696800337974138653960205886721218275906496709288754537792787671454609339328245451684579097878838116584542322616579053187
+8462720851869420776547815997374420654356793047547706068426425982466357700923014078111329124212863212450480733486009748682342594
+8687099289779458763026259506520765785275805315714163404563447144528065795533004752634001703743154416316364697795177031670571395
+7862389886797621228571167458335190181377137309906389411269247283889070732381228453233824760431622453252798014077600435024553202
+9884611862481302466807813924732912660462964877829202613446787892509006450191623119538981968974508042576824347741032177030382425
+3275371888164672951716608075300420614160898739974183834737152799222716640347298255880801705875381815950138367820787575063612645
+9756093031018363423853254508819810837905492342390007409090686184553436757595124339753724654015162734521998021981012802729263275
+3427616385168365599989752741868814273183927471411894804297652680678085002922251517971806076560284843234235639397961184180625624
+1126099034992853577542894567722591646934072315106827450408752081909824273574814734547622072209980280969251694858199479989346866
+8324744163428589301098203537736106384602289116499145216551769186060030444438336222899526023763743834415207190662514180019708518
+9860319477002084962218177584666884101089885263708103715532250072465740590415811526551340778700948662719303811079801949032990730
+9442895797928578191430950680716135775881506952099465712614129706777971670822951940768332168877767587109595551931372470789023062
+9676406861977772053008009279919036888396717196766804819265649832410502497794545528956267262992497398344695416980354321065043902
+3430450368036376703613028439245508507778168871582511449294099014869582746432398446542812126358198966694091267937409209466063739
+3928978146389085853115437005111689057451518521401216175319263947818787743509560003599577334399518674836615112723186476720359894
+4447676769726440097553180938842032872197723469668279942479093598413513198335476789357764400869873866217837103053672831807359964
+9438439139166494727711797686854076602382501450775000543946895474100528401256910882752544466058353451178988269998012104071279388
+6796506900519353467866660536525382267232333410870940350598284296015115345501330091034294987205096937204489666809908368374224287
+2156069024262468587697645236488193119228612123037868983120993219205723939445417381491095019098927648926035392978843470867760614
+7821524721406495642677263766762922840188657758664683038649201210659149304382137313140079079190066786903508941027377579459577045
+2846438208088991099137843881611431007996513901288343001595074297103385844197112994321057890476648269334831505632974358825733750
+1231729513446989718094794150861322831069880594276720936717092445853573977523050237490193119260788535329095088882720971495287598
+6552792304258966749461747651069123750999083956204720301600561922121624443601785058830034234673249878353748610370038504030736047
+4350618220429461920496227812205841572163867546971596032105207072905191109123570652010474485250661135080242831754570708916683989
+3648963905128198988374985403745574043149005801382728738825016196793544318399117519577715497903566248991289200713376389062963733
+9079224255192675318799042558252967439629275533715026478752109034505102371733784051667760885774671501306079109448761994271014212
+1512159183483513720286072997122368280567403105173759926916954869853277451339001028186617037332009159449259382498277868408842981
+5560323178755830694146107056035341050323807669577457330458808700666012312546070466530820114714620579338594279601664840585122075
+1503852393417110615057020185323349829356846940778480270527833679702648854699330937650632301666517518142397830288536621388668145
+3710500442232649775196536006291799614616427004022039024161898799546077671371127704078583325133930080437162856065176543455363091
+9667028302235222877392627005222715604718844825560371250888081705125248380997161235203510947690674677658525524540413177350345055
+1651124581699981562124791312861972388295643691956825406823017359302629847041679857625842731954319702741028762561310737659882575
+7234973146912955319568057648697281752581304980681832088301794847222733894976160526360976917273669474157112988773823160903919773
+7236452528456462658486826400719408745377253190375111579049732814880300278553197889206203166333133501206064778109147665779882391
+7682375338032730875672864027350071637472437979382544031201751667224513438710165103834022186623616196654886225240056588996350179
+0853897451837131243025169955161135908558413022976148659863288496875873894764829106676107357256982339087954980489000376844916919
+8360603574420141848805577433559168689130304284043047944444385048148193572183817853604188280975779635124804366554607129505815592
+5620546941760373757081442569363535705009166704002199788324439031196454334794954999272772623824166956059123197810751221134756232
+8439866566091270892187388961159863817415914847036125600694319372852752155914048990490541073567566380258061226260248539927574844
+3029318850407273236073024405659942071591211229297986931569472429177060698779317028894343293006454758184946754805713329630249820
+2687678405796666588388227397973494711846620655765600330508932225839545844068520955016865194693435829894249625192750034081363961
+0826642719445444861688478619229100303043863369218122546764063288271554588608667295145429271395132923307142550915748046259216532
+0468573883399305338589054269280928735368128284996899601120318736730996079626128417354949909634397399033464297120851931573621836
+3410567460401768661525344506338831729399382001213762232285178082217011433200810491330007874531405259479829710109345021089321397
+4652171379208756546308171186440327278368902304830062446989533198226580273246735128676055302820200408293662986737676930578153746
+2150739333645551554065559172680067798805779396460259578671413082802669062176930977818789038399646027209326563780688854879437364
+5947149323195596075203471654735880096964253215673415065855952449622950653788545812330777657299303345667765138612882163698466977
+2308935140239438613941108953213493640813697893782475635075053824082277617694735156671731366529539638010664196515846143425205110
+8579861845970706058547725114635120976593327222009873742050798971923964666256857891243866172081317410728590091574945331275284201
+6824605749924142731964725200957618055202505975317938345133949930752079669713432776367891693447902213677009365812998801001720273
+9233059182009261025428591058709759978362385968915457411652886788541048883340218037203772730667179361924214082717915090369829831
+2313518106392278036401430877932921941234750269539064717318812526416633477902124303231275087598527988161235948020286385526463743
+3838476810771838510370563675061364260967203242139687527568417240328961372800287193798489828795160993501686735937478711295496291
+1519858055532723186083206022574209495517859134830555261865370844903580200999194798031588523243896559267197627522165919682799739
+9373974604821907639636032716761671130085088834596447375314712571767917652624045445822422980937123575808022402072804691330745798
+1179538903767384713618264919378659303577920743409425206952169277638505227558099310711226481165660388253070855325241107221381882
+1789290788643749161623308260296145948321831584631161915478987224126348775962249568727630631570400533850489485693171250304745466
+6433974998050768158826396562741859990471614366251286876757878787725794466582791436968613297526831824776182286993388108679611273
+6110623308937612049537824555231489221014173246666865428966654501963681680683054782880195354576356714786682961340119163196471017
+7065396261977852039518801715732959486507529242741135438482938793950709913003256496248997903954928882444470989824659787821204683
+9252764834270969572461432198412629509667322770306467304657216423067070489844755342237360066917220335677138645076622463524222641
+2863822477918798068216749348395676325852006154849615936810666235080045937062299799315963185719888255745874252084645488043646414
+7004033498629565919058730350299817723186869899372617107591275993421694639356397475575742082851089041949288607800654160534708316
+4190299271083535674187523239133194914262331993315335908926599556351517813335151871562105201268635100775530492262605262924734429
+9412474523205479108160235037378746252342301320435142535429384588026050874475919119800213524490595720796240406073642925771858154
+2913084106745765525951041794109785827673640207212541754087108553407118981892598453634040675583256537303820724542193091642590800
+6534476025728340988278166932729090239881218889572681282009000341783806869952125287383734393447529192404697677486779298438469322
+2829214412991708861478313576349293840205174852775802339069812401323737815710652651384534932732051408295532745074816386764349267
+7099631393624915897100017625766879968866232677413779562258136847735611193368355358377164844416154018729080207420593111993431521
+9679117084184583456113996444214687961259734088670459741393316532022602071869803421115792325270648228861169427886111180946003583
+9793622141632553469977231970499144123659775068372909299552862631976151882730222347477076919808461706462627308819362671717147651
+8286017842303147776294340423265613507963077365773181170674484922475010476392279295555883161702991597407378465228254838715678283
+7139981166981912432328248939664037584747665029041762831645786266577343138070260044935844528507385472563673503510303215480074901
+6952789894317576895242795097137355300336216988450939924501915977563360873810170551299455217264567889345472118057178061331257728
+1694193485067381935776175208128377412895577843695434073687471815717642677045054952476930977756497488385115713913555764776948263
+2231234433522295956531798985522781927112508008839457523109337600193193052076325806292222155384767900607744680674492935529295805
+7875818939048046279625548208487559794494231792862975497567734812838016356460114239167085114060525364762528245992233228644094327
+5021327908105698731349894818836329218148701613108177279681910593746940136925470307141167410364253643713010143547929247739518061
+9070977175221547245640857484222877237472955055880739878012461158071643167060432840330043982130511367475881160956788509827952621
+3413847694252380420294340031416724229995257917239755969134460592475590887547733435481300484633477930736275363875263891668995643
+6581430213176248276716948697514387283511867935196454364984608140452221982505162813367283133818168866214263555481101556955727420
+0078360325719735185976311476426092189177189796469613813653608015870137963763116020948507804890688620493269983909621885486957143
+5618073667256477516793467657312199638612399475873899685969826531992817695372605952175192740133201709617218497592077143464993595
+9686528263740598514413702973825670801929614448327903726180967797157579946183718568106283503561970266617924646393019216381949796
+7239480687825534075396618625255444191589146664116441837547061247242846107878949219756732241373337771333630723471570758001480280
+2126415066562760335451168640052256439621013367706107505889219639609857343988288214828754545448713238798703235273922756046005812
+0281498418252644767093639973704165385252675952065796869316299823450944375075913221341612192647317518382010547568017829174497579
+1057968057525848488438423398887379257534282986505898261044295544509349907137424691109525427205047296410961152317113953498675027
+8037990675600906293845109738467043233236225877257801109348395466430705164075214123065322814006154190811607337254708305938085250
+7210750787555252394437778367913891376849871377061775971887348544361550409572803722815881181222850658661431069707417398802536368
+3948215469610248733031315237243553696794016591253408216711885250561262516305255457076505242344244633141474145222490778655694723
+6617637025342831507631846476937783337058482960397621355078541340935495458638237325584632545957068938913331687735591931648307374
+8523372206558862816505119548118888594916440410353297374883874035661877591624592793870237386066600870369847319996357899821848884
+2706665246531670922861049993051412169291896643639078882262700663889473964251112689202969447822598990637782956377227324903867608
+4848299459820567898610921948177867341511272056149848749209193175952272681698383112955078617288403697439760095671946801857673079
+1356542472568516852079785586485413072353853487441642185000260635680413178133480855130718255056119475830508178140915142512386038
+6695877448601376560251771173382757011161242171039619918232438391997384640483554361477105518555170292200647684746099630559477876
+3728050473071484393708670159181207753885192509059591605951929761162380613874243004953769191772521075466929499282741107419333117
+7606734018487546777450475520310398974869459655169606480072758933265326533542081878074199816338268783853568241202511239916973258
+1633835831994903654810299535109070687398984404650301845605445387393310102422388713024846802629758902868815270339924811537344859
+8928571046801342106880818013492293682607259787490363620233716285093685649713330924728743681650501355104561967670012038426873625
+9125730098479474089046067867529096250921613432172766348896492595710398358975815806788579245423344223729093128465048555061302778
+3282236766431701005576011421891586267683372954054171332350103840612998244535378427127331925639537865313201470923709392166490250
+0060953065190643840375181038485605085116833098863859869877736596835368776079089936760138916464834786551291455693169964704950417
+7199761056487159527818318808980388404160177710661891595418127883387542011797165555082211982772990941128288012248134317959535274
+3151702008500412396300814816932022272142827209737059555958537947102106965289850740478085447869942031637107833939492398930644696
+5466978918720768258413199259613003866496795654264247159666752558539556973496507886748391341566752558990139978324598436936793928
+7875629494705039695595741518975797423129800053333398650746169290789301147238968164288511049704954808998463415048261417058627843
+3675014761845381637345570687526385375856012330298649384510964329070850231207976330807099687112778366295062201878036276787748707
+4186642715813159153197640948334883431130155154184492235081536887094317988019087470651733545171824399201735161775652002448517265
+4661100517204949080442753518341612732523752379970048081237708561434446413436675964518402865361477156495973338379138615279891674
+3104047228288563492721376497746751756302186258285396146017997376211045579689813619459200950120798719227167890408329425880640799
+8361120737152440781721610389840480574105404073477545436637229579684528270718993412816918987324414005130598864358095704485655816
+2635022304411690520549036888248912012839104866750669849182202670549996591599148236127250813538958602763034624939004690945598644
+7161693686069093177957527866565203934639363610988615731752113714098234889877144865056494208717095238090181742851725619039913679
+7926731919437873880030756176008264549114452715998481120029937345677673326677605995613852123446385084312717926880869469763207023
+2138495852046091769881664603146562927499752742224823433380060312750362684368906102817542844818392822621059272739767561472497448
+3487585927757204836571198808541456058695288628326581580540815649602826692062251298954681717253220499784757374087955966951533070
+4467286406109149470022526422047665420981641926169730080064026643952810388751979407214952628713107539097869076094466606508205808
+0329251645328585224993793572099403208481085245076448698022757086335438075955415420248533451214205820043135499362946801092902796
+0976117055234786919615481110380099853162437989837673156044051970682580784609511428623279845514623277521398030431160849037450740
+8697358783561542570626868871304762629606530282055602229180460161462702998318108546783149370269213126706148977779508293460733304
+5685401232626893164468498498310349947377219975132662081047738432680920912627837266028376099158214591714411685177672935669560017
+1991014855525662209159171891334726717439346791115150429082237201563017187579488089876803702248258879215762021955798945536843228
+3358779497231258973228903279307787602968091467986183211284685640196892409994105852728310998830904989480714242762651865855421586
+5348281152141939663360571564939207399533427205490276937846050282692131755481373457167966144301656498283646918663467663563230116
+0442219576879355438661813222738756969322895770177941048443578213219939881424295242319200710244313116242014329915750902609753298
+6880215129386746871145799105266743824027120004725079746962555401718867449525806260178086747751584880447035314395435465651034570
+5590819486053989106201536213480377379276227468376756122798396628016810991489235173054754920663273388709967201645610835786499004
+9939124283008389379680409146709896607754411605235108861950292912142332714272148567105156028757875660670111321491114463297009230
+2097548826892083113543893580713808393001576983724545670281722041343097928800752617116438879952016563025042978404320211936405203
+6082731184886898638758782020161455765775544117220425974704422223842521161418889571069655363278462600259872240060382048674290190
+2889620681353481574769346958935531281292735580442822115141047535414968598234054161580569343948696497621906027825367798221210232
+0975609392326975398368477771498401808897612300017559800926232766502316691201583773217274029458304062931758320244725915302928993
+2656060793106179140097207671393073878144623719159743370358884637219392258120064605880204498430784571518779561821815030688040645
+5261532754299991261842655852754335348627643855237017342819255089240352732014055394202970458645445920979909498339363437891353307
+2437642062562451324051185886722830951326647012880268770841964036842838215823451274151497274115272960818748924818830295293023164
+6427726746699539771500247174272715628837777269348318525014112099038948379809971189523179740600410427829712055609005231760641337
+2123549160662241455227582001148252334968910254759170985955722387116765936697038502260200822286774138322324033501219326909463806
+0821193700130194457116090490985590394866182284594574006494500813138155877966705322490599457628280712279954157952750704655060385
+3280391474844631197279842080980749627555722515522776772617462578270115902754706089142103829738218939451926197117850790818482759
+1294311329582945102206118794968530880988413255047180804846373165792608079444603588122636074961065406623564621335429415769062656
+8977139076449153307860216027207885939587708357239425724499000050811065643249463642868728678159848609219920477201880783130814232
+6033248813331250043643381559597258568598550852601730339407737331740193572873459479638405202147132462334764720678461849283231967
+5244706826495860145056785602766589976181173320167438082817365766859974115630195914700440671364272919565408159761417527099133015
+5244648245024168084347025892989203801674105350823195087890804798433093162301085522657402786073312465657131861678950736152896502
+7020998265858326008838932594312667517103689364315007929663379806725932670838335332530002316590322181497959301133051038639381171
+3173858772156448895864459261457987925785493055610741437909826143835126197998316368571824712159171580331713288750535891179500215
+2461289349520625956975133669730507522155477555105599302736241191876700580974296813158063100071375109901417730679844357856593047
+7673877787687493268983420698315905381260558449663590054448103444553449366277579160597491777336624754840213430260072450113764481
+2114017564926717940676432504294232477129802350412122813350795229854770687737407776153546967564248142801354985562159014016660409
+7639567903574424627121988012936196690968952173335045547572877439937623104537739475753166073603089257419976655666993295754279243
+5512010810515840583007802011584440810442039388430026796415104195890917308156926213851922793907826473532250186114497099571038088
+1090443322487112398586196562777035714693242567109619766467418285811180453954969091778067062185341924208029182725946749209676264
+9663462321929487207790152045012463956298339314526151434668136673612071349597053270833334450801647517402244793354108502290993012
+7465047517200443480317342789716535487720038254767800382013521445375492608318405493546080410946096145404154482214436078102318897
+3241343339884810074493047134584332154632775327907375423171218727031001503885369275032870180181698599353279959939076928392091092
+3566208126745756363429701058439360596278930537654250601183842796400352091131220495755538686838579076983412474092980588063067246
+4135280622573899686743659033428766204732217042537180031329938266218979406566474637509065330050474399644477629470645922989131608
+7243489726801527985565622807882110752891684081535249425920277363697188485817835521822988850811873532635201983418016593214492469
+8143017528502801938786431108109170005870927726570176129291655180782741998755590156671788445329312481442984040900285747284336895
+5565100360014106030272353666080827357535103165363399802552515662750922553611500390854921288593734087100792149327574407938377815
+4240318921296779247997230590857031671134516419731819431863267883435154179769593315054293181367248263035923946261410558920492931
+3065344926131172598974832603770803242453631170305261893085619634353617662701712503317939637731383890741691116709803904180847998
+9640635307154881695674450558215122808610162087865073261126743708282066313632270460083280371892143332906784831299555537946109939
+0645039315913940793949968013785570770789031780794104310782057130859521600859343415595288573910289771410236190253921849657190998
+2817116940059523621717397073394274259776453515913607417038665482821641102656240840561075406926383495205691566077252073640483438
+6876828215210014803339974347992473188369840859181281062746399956666218336920552262054357048613213862945863515439475503711072752
+1206178405392180823761458212656703549891855527651389518191357531805984535259972031066177734136716154598488260571189715523538978
+4990265766954047391630449528696946350646833442858182431131915610086870866589089866607870181211091256487223226710174280311854030
+6161821498017905298626518871081902325899313379230902725132275803649959728622670760552023317532682229232464170889758455581169141
+2416184842590677978922625659052895162548385411298782741233394356631320019382233371212037232115448059660819419247622831630454503
+8975030577721689746153882576268854827896373568358085985637110827886139292888578025729952622899410488518168089967179203288999038
+0077221628423351964468120440528719933928163566191359047160562478933063353123985611799118577768774930246047770557959247998776831
+1721135782157358288734205102478591394569267133297228431858377971925993589071779657700502192679741782178657102555324869244446359
+7869917278483084269980405860197759252589350638010408763257025389708116328761797581159680452123249311643134587279719495772936617
+8130672462738712860454774853313086658312258840823449860002088944658955778609509469061098214154416089413962879973327200377762688
+8704019840879290058261002736123709853095591291334597972059260229183193853550672628813904508834589255323455601476677738648315934
+3234707347670711573887321944356094703845291499731243740116195333742959154260950396149564697796845304852992191344817095433298019
+4556001053283765367945967785584518418747873282740299536406596053579536242035383267115157980628785476579854884310834210027387315
+3952399660098012461635956108592408478331533765191761940733106633178973207757390760027945616808844645166556348572120907508405281
+9620717181599113391181876705169833156639227504083941308593882555592005786644351550764764616222603704206370090556397818828816448
+1082150428965180471148236660642979232846204673076692680655912004876027643170213363695294926023526278443457817518033465638673749
+5350172689969152071949149368789531895369178652578561324968877842847433493285130074155790255799028895045897756190837543509860775
+8482306198938020753154634340975595193686061652677880586337892305604321362120530299145893988789835870281018804163394448979511499
+7488870885383052769468046156937025798795341295237597526911841052145121608390932943180983640617731865473642038426653712735002335
+9011612227214170561522052833657180847394409367216727282193072678838450183604374539578667642858779645471672950276478435834423943
+0042627888400396166577808028511674909710254329416152368725303977021338640330576476481308582201268866056584880471857573435293178
+9268879578435020158729300163317051184609265956929202720052876516659404370185319984314639348524347471621091689443144604058655054
+5852357719309697687694316961668030847489545691322959818739069805501234210837740692288860145679956618287254425865421435945272722
+7947183003454715593442541393266684657719476151125892217474788448864376694397034056195614730803146207684810002655419508268188406
+0212392708824827732017576889397138488570370042723523923833128481673477500325568912519958461261978143669880070457987816169424188
+1965090700335288348865794109082688653306331467742286624350702924857750689705564771477934006408695884251431946386364556639034176
+6475202723487206164676214732339055881658522754087991356304799053722702797567004357975452415295767243300651018833595864642447417
+4933751846153559955643592816488612142322342560545913045826692544542626150928640726729092043333739064265750508139974673275834713
+2427576527067163076789990338481516933446902541780767233056948866977560689363984682741766823172377515643032993191346658956321461
+7240324801931427740710853207105854320415521035336023346171992089619399728628105888007254180361185035803733126321368733856723085
+1503702321045090573654976317248889826950138261936742489712456263150062608622387827772363799121813242734818379753299053724286228
+5076095412377646585652542244868299631686826272014334350505998081702990345584728215380800687580035780236658004071510394469994071
+9933250676927268802066614172669848689165401909644815070604643321993975291059605403370117318954869373816750869659405704139511279
+1490487519262534395623800813247168885091994099496258142463552140723866858712657283749576144012562970919330051773400199590563572
+8265606609996094143464919138293434901647769730550988047626306005465014764814728223656959001378552960458572921902571777313119856
+0301901698751025073371353819870024706444286250847057963018585025053110220589734085318599463450687736352183212884401020231957087
+4456959908526601850236631528599915374848039675582388183944917813443948321814362879113998039695208714072018715891598727749400184
+7983572039054110543265312946188122716587941443406593149730482849110607363599698686119685785597056173835119438876589991354302327
+0157777305454082280716591110467065838967277498987788761274920512893356487762316080383017175970582934458813655903151031833258038
+6820568297362586686149767416323236376371752928724979488399337093603770184434877480032885947231535650930077949030676059598788698
+8108972963805156390445400882624903314064494634772981427763122632358977184343156109534055951999238879890515883719506599847044143
+5178486334616508289086769240536520705517396788807705586482419714104331671474772634945045486037353039747544411584344166691513962
+8343543694892040940224135766807400138072678909751563547074645700842179499138145819361180694589974178543789544801347334713872045
+9708545131525935820756667264787954116125739691093797584888706242100925330533736446977764101332858478855148268301440155677807429
+8363906279880507853775707450188819239306527160717217937065519073363784713378967477694756526571005707114651691767780955073859818
+5651083308096512159550753176200623584419958971162109603579598590262428369134046173758247656339396228143231420340091898293104843
+4302402395996304257050404831355580727247848379655438560342120245630874884033522016540414633929586663157231554069390318916865498
+2822530065271711681487170629161962249557718383135273443686990757846857063424817696146359531243469019949939521304535035359286967
+4074330918579124906980668220696463605660380759667033381676449310911291881680221895239419422515427861193964219305035700436309668
+3698935243696912496491762756802269973014707849066246048122302860046406677238810686973357352423777172732249145383686882436002629
+2170964033471347644711273905006241361125626168342597916481066003694402986372839549149179850327741026797871619199281396638967050
+3740578777458341247832731137954141104761544067127564384269992513879476807275980026551471675919580563967451050762083496336212971
+7234069436162575416758566662736313504628826119312240011212647893254386199394411434394192850902621006968244175625150393585420756
+0819505443586556219267270131584242241933754418772049304646166400049758424842433111724173775260453475529050201556290830854251309
+8694504279853225298817987700209881068598742151871017058490633074185456825579641586256200310473031416146096103034054724162968499
+1678422417003132262043356103744836118876129032014712571839148276942048121918851516621273265839886300177612597618998212159348375
+2526979362189085413641977979132635792430656327264789820332281372901762624494315668746921549021511066663733746233883697857770994
+0998995661761657851385372991367035240872501467476816162857262794643509591735415040438155899974797001865973911239317650890930815
+0189734426599237495702149267240934080052773268635893422129378135841786547348314154856133018855495625125449892981908291205858083
+1077322089308800545276469380562276682750368988122928137210856581036772006900205486477908581832538965073059726766472615915649559
+7595664231420716081656297104542741477179939201745233207227457362234020070465865805626851389405073254933773440235630530654929440
+4561326689796974026193323140357607026602878702428514108628434286473624453127013395116455824218643518830181373377505009554553648
+5175104916514700448781338224183451234036582197678358641053766734457042147404203339056493172875783393464733980674769043154128903
+9625053130166787806916253108452498110678784874573415439254136465274322837153616892957540974054903367967131773174510386204520192
+4708907023698793329968287054491892003035884220479471761449794976142360667172403302792534515419470234070842851218805657152102504
+5165815294615880424810698811972894519218327570376404414484865603951627216319921021460205245622341179697179353800333764741713858
+3375832459808523959735342163302977206974789134934574309888193442489681770595931407566150654834927560855722717629843449379732533
+0696873250701946777504053721122628669489758761941472800177248115996803185013999823071443413470671100299081264402635064626229095
+8025269049201568533557667082941257090329107268081485134499591411578665111542402290969079825247733361568938034890137999482482426
+8413571137578802277713985161717245739847221863546744280234586017009016274669615970285654793200770322063367655004275873714400764
+0799707402410991916198286689965775278824664119744877317308731118045964149958722032731308079677323234905411311426216785693702443
+4397846375057495792019955808977919911307473873070308655227892822037825751568866737076516050806909779275729314309462325310751161
+5878515311252357335941687228452716020488777361851148660668041257248641752627888839374533734775241618706657533250097255962909759
+7924103963089477116974416014956752830485444377913838660792557425488769129517146048639663168698011387132583363962130759916380103
+8854627858331158799334753893263279859800213644437374816465531701511843970386899153300191498875238863924442400115037208900760391
+6931077305054934679510399257137017692212293765671016977117885559987800112104522229358688690556795828786584220491722127422607686
+1161689224772384204986305992766453244735906304538266466175104130240871760142886069723737054629941552777930420547825827115890782
+1184882323411827620265622192040661772065557335415769691870166844416649885380327832148533301202237904520864333379649271453239928
+2427936123038564183450762355240415926776086706660362490151633725587501086167861442974904906015877742003232322938651897499721504
+7575735828907721001810713381085000197583517056663976862531026160720187808215284714716227545242555746984605470134836970810868686
+7690274030579086519662066594780770842382679015250578750543674207604336237491570959207826549369435808803521562398005006071237827
+1591235570232351829740515082573934645171861807176059621044839781347865804129548447089911918892970375115928184446756254541226685
+2615960213766977626603096139489045595459731295282305420627566186367919926990597793979775395219871115824222384407322704217828184
+7269890378837649922156673232477845852726935996940584696490442582150880559450498906939124023442999694271016368614887466665480687
+2492299648986452580995323839604907135499552296977074591849011346778726414701224990442027943081442825619102646860492552917507521
+1791849743502515995886083914654782544108637930226038487802556564179211481768559160141129157276978288393204371047755590042629364
+2476979194376897909780308753936290021359131405027064825271771828980164040364357335094434041723555965477129434483174161190644661
+8416023154844136801169958073248822091441560069684654659045233353502161929981208692256561137140555110119558013208216615513472071
+8088260724856516409808086622373800856820389920242427841076949364650960501816473316120878023138924750918248626057879988336142195
+8686116426096280530843620941389111299655341997827197141570086674404151699053951971920289530070752071000490045958486626799786432
+6549357623845124371617655875408646869879278421775346320373177073222854384021377119568271293703313232299103659136776571632693838
+6591886804108118051730248844194375009874244915537509136047158661056246282742880964703031154340229700891206754898355101039366979
+7268446901106376070498745112524561027602391892725887518917435705098580461006376837385629028194839014124169131891549609455012171
+2285131899533028794555938374512548939747904214953588004250694538667660139983891321230034509152717542342156366790660293952707870
+7433656872059365457021513060668191880971221287545847083471271690608548455879533083319220177538857519457319889888751900959653068
+9242848205306926609548172769597825608518368367889673409305233019839916718283755877093610440755381268416027885226989117854626319
+8543014996495123544046729990961256012932771211075541381188839964005105738775284593953696325073738652709607173130510895811417458
+1100281056074250163495442070917233405800039282178047058927490789657980634481405379098411400723381012395226453993698124096414583
+1497707784106353163476884094382224594079935684207379351580860836917141337699813295106036949622008098195962892923132082743352822
+0227639803444432864090266134712772762851750164363159986164200332551145986599690734005702172852457747000704439537884708919681464
+3297805927942628853699179019515733067501114704121488080361171310117107236329567894778609250864163044875868270159183178936230020
+5632160100910553597455671868785895773407892040726468337688933116567628214043646404787040937392191211462332257825317687874338725
+2296104873433207092085115555734422123208784998029195153841807872132818719198275132977492788603520666575735728468601968901331765
+8507664661851267844375807200747151263758160914796423476220162799279781135476440706809418288627923653896822426541736985486808537
+8804577755163112469882477676592666556395113447285604375941404675578061757730014398552781158003833295830499727417346600077947853
+5831914326747916706642066586312780276779650520761789440673709492335505292573240738337240722730985752273930258542997960743098240
+0068020053146252182779250786628431011150801984991349353593228652822215156799328870412166924618702218796377703357100331644399678
+8109188902158713215146842638263856459757440491023323555585167449490157093903282451159411558188534514053282926080246371635200972
+1083689238510925211444565358062724034393858074119865447872227462830480815166007221130324188970568012551002420122076677588668537
+8348566408824119448641450955381151117598257925347235252204110951120532544649854733446808547885490496232547849386772180981787081
+4560676276145414580213909440734926632475864478909927595616312861612204269485671554044668485757818928586611911258131650112268582
+6442754729881254198230970045300311192828701003356370115227215491493010569367089158620723231028014912810350816540331381099940995
+2865041663295338237509904105995789610569727200605222728767332785967873952215814407401152907766797309671425581760149058652925760
+4017820912206849712695013871311183547029336150750415340954915312119753021914893470116876327839429907255892388374033828544982922
+6915440546354439943941953788638484102813214756761743923515532313884486004173505190595536349294404018810183152351908266279594331
+2928244470990795144278024903861617956853603900951440210459677120550845092043556188794480813102688176816346489991301120405759270
+1186435866287315352826686449165308561598819563912734578580650689933009781657638259105653726859937343022833693021987646952723005
+8712542566252718904406054272317438859093977264257379132707981296910101101713844533871886378161442772031073848272459192591830784
+1058110999534770164492882010801967465978671453250245066874219221865094533085057504007502380425647847612715483754244102708112443
+1742666667868535721098914454487184166505673192687612783065836658057498575235907333228055857705494275550823062941047285844371213
+4854496575428807093051119901176270909165842784911651361479733219811770760153017103816762799215219103460967340988812865617828044
+1917561105792307812885764646858740340976693913696981626941718101122829669609931847477816007131803415395929587982744622533841587
+9667546614449025826471505952967761841638682554759010436234535597997076544716136876213634826200883843816631177929989595634824997
+9075236896089146108414434690485647098336762127620316996183949539422311636347004018452729032082455756224021955521110115243171929
+7022352504520236787549133408418756692328586206498166126138700604093881377702931259764322041155662852059678496015745189492835117
+7091800587591451755394603236816915477651467511713772374848670866752841854518597403280700140135675063538245814642015579501650431
+3475133641567131461159293976535068676192194831897897611380261311134218099223461446586431446131415308645022873899564559364425282
+3789965382702942084656483383865958903699057640653956948168423022124988840895696969117651267238844593486453639829783832289036588
+1651772364049655351227109534629863148340655489696054950189023140607819232747963074764923819690470465024081626771998338862194589
+8535421442026745607190566634422441543153174467912420591988970152959270609189415618141521453452531554132027545470737271909694248
+4266576066028018898848004953928316732798903447774832407967130237423961865629656870579836679541833228863492849112635373253768730
+9318620813778397458907750295204099889575365028367626038475757355404525059311775107234951920852829456542067713455662881377001712
+9660563316063581065664074432670545816492979485719464785114250983280531864483884025594604925138921571079067953012249664289286107
+4733006686229685087965270923863015490601420365854224908680910247314401508516820945614321593880289181386292705522860502467700146
+9595467875394655716250868523623848001720836247002935008259127820208612390799061964695134992188932480652490964335096936081240148
+1812489955447149372964288932685703059456499125726325849419752698359991222537673326627718506868098338620828381688669635638529284
+2277365318750471576552640984213353147488350298228497735938404810800516562727031985237579073707417430708173600319624539956749453
+8558865515990107426689500711926656694092773040192992037548490908808858324669008603563963750417300374317505710614289622964156217
+2457409596680804630516887336784028949728779145781319560216200606134423822190318186800036885710141555957030479473061434184735920
+9100569805069607595713477651532945125488629510591455102444809609662844669593112401315706794492448332303051585825039449951564890
+2934068975480357331702373570405176114572488785747724819226534222897314789801301206100799457068445592290174980265109976510186964
+6974436264361115896790352170073260547419486352304459996628335808264941225228110927615548124284539746249063361590443246656233810
+2022987197590236256417410387584617910709314684989417286318087666015073752226802244527631727840148104686143554769788772100971964
+3931314203567669848668014170818609543271827823841957939988437792149776879965413983671414699512124596470803895106449229017252962
+1646897058572253319802460817369397398067528887800488520057974357980724071070615260303277654527720835652573050782049698374251316
+0612949136289175984348022991134845911118529208723293255584972808307452158666230105816460375784187988904522880654792018341929152
+6230320383294577758148209875436786980246088588555018398742402423700033755813061790265512976391765915810238317924960933176044915
+6724326703636717615730930803229989144709304487765743249773045992631205387565818549594275877262188712201760168274734486308418567
+9793449160017973876181891146468573134118620184336387033315592292444997748610681437980592831049932965491128002640896459624743912
+4292773888056347657265747923515456543197563688072118373801968694939175467616839381912904118459023550508906592936405878500629369
+0726575398511990054804247570050536297610421442312874646372000460857738421341575986454091454129764640046210072544927787587872609
+6223497359073574286258812426783136238045789247117981734256875260415121593723556039489844073919163685845325053278772517808357882
+4805353931456319684552807410713836603840908704132137938671395582768618313934438378980539779778185823334069713366782891327854771
+6127074671224214243978383308821083055917752075116334068237357481944923919216084154202678626979129283869929664457025576182992309
+9095642603811777857467738034071749226163187428061948529437320054852470403172207781014210493833697169288095448800181203251014035
+4736481344099852996408105951657679269262847981157582390462101509329835494113215114942443801348682136828613264161536188227115466
+4003055863718708771225642500990071025833297545571403747979992978828908605722348616364122656556369792934466258936918430294297508
+0884716108700884651920742851823456839844922966806960079344733214332219603718719129110850475334654765668025057309956984350345154
+4885236271502923816983822161323233481126598003985902081480145736364185121032980985643061033399360057443356862260970037248156868
+9095109506937315402103438551736664529148909771957666146775454439817301965157339466426336556934667643823128218330998524081566484
+9554172468178139926024925040064147501158211448170728837042601105476806693933691272219558658718966118313273471191896511638062325
+9954369358233682690458005171274421730241048095790588467590844502525588085948164312745806267036443692262270244497152879755376313
+8540761990884030057918282213961331175575293790886064372121411245265558611444044299259702033859938015653338871057063134186390567
+2937295853774855369815055903708691070046531641376115545763368983982874877046797588826386810643172084809422213611867667864377575
+7456129086242673800167308357557286842740029636829456648911252509981444991813390655015368895052836323823418477931875989888413494
+7619903401290202996353920197163165845104216512134977822317453208086977782938058360962563863616931222677006031494617743246676098
+8619837607929254793532399964916863199570819754247459608169557658376643077622610923724449371091028101105519894212018425361113161
+0198232737234871539712619394554173033293046636313472444724663228704935678432306609229598127499957898688691002287353410535746129
+9160344825935915883479808009630827527538308033068458669327511758149831271072074138691690968888119139014429832927001663077896093
+6075520157463461341098226057137016444093714810741234441217965271334334440753561468859945005901907007749818800609799068435785758
+0546092246435123497159753904346692263278071121042508101131684892541656872975812647089730436015791483195690674123772749878087282
+6758449872382291050831212201949792798424861556134983601310627614120558124555112900385099751123167702480059628861813816928572678
+2294380967592455168636104873737766456888729486890507823276579714836828251933669783531511408873018452811541618386657467835047578
+9771964953738092240932562360117185595020635073758269035209960005817272212266420970453644822258523689081214708732161974226486482
+2078896042427351080221479050978223463317038184395717248909464597626365437809427793625231151897894098417132582150723722131356816
+2733651127665461066112679225653017158187022844835577848138599970119201959393371465576981148627618500453766449113619920556794832
+3098796406035170187586479893078215549068777188615428168013041309627717475700524281634638706348659216956344427373631234955931788
+8266607652077744997152631910857696622624195835857414262086680438204284388121731692389911117940177851680318293050972437430080491
+5263662912508589659968304863826115756592152285582835871560573052117732379831943224939230850768149596127803763098910581308889239
+1399259544384714811458348148272122374447108528351486026748375991519038080289258112233626298579932128994892803010854830711867003
+0120562601270662181088525907457246972630366755109340652778459673777734310903812432648671068725042051752322546900077059823883777
+1071975377081858251465844724729282629412278512504579575631776161691808267150394386844729953211628319505799528227342615586982667
+5142190253907427483211782117002935160362621628506088192922092212154140185826659904555543974037176549370222198088358512119912742
+7709122677369521964052899819214134971313049580616225982506654419124826044743127724976092244678406630989264402052401911579629855
+5241083294500875288635504487164898666527862404520007162909767182104068330196614730977680503144106835763690135404371824827295654
+6210246422372066059297630639990103921525353988425004032130811899385175353438423745075299078297982811812894692845392714907314914
+6639687154171290857100923298064297354897427312066201467165805288117452112109293854180789331988821851079333157010919824197308857
+2725453575267288288994357675260613771455378866560128031996095809604727908410382843600101001039972876558637948184365207490031492
+3022829447684501701771651529957077694566855215179433255048106574130176149607854191690519660804326926806696105896923466573489014
+2276500150756721393101309310240889850130747890241895231090329328679796493201088708899083812272168509412763541079565359287160502
+0441480433094880222135017379174984153891031352882663477623197838966247123264644246447696041370087767283894667315757217159981846
+6600209627389381111032923919248323966625789375205223637463959729585017236548352912218466643214096190786355523902607233701011308
+0879209770503108176937425508560832114089876275039410069927508813642206128497418765988069857902212785710790868994707145334746457
+1573213691519886100372421851125709104684878670999887084420803400476797705625591520633797149282934213606570900108998582064311163
+8676807063736715112005822408555267407647050728641117839753641320386536310057649950460984214505375532528456592558681408856748600
+0458633214841398749014431880145127111888700604235741500367092065118505389545560189317863466505700948103428117858933891140917600
+5132202176401630576193346962510769965520088034746560321030328807272795203005246723655044384670879356197070618995577734499503916
+6506939563329550580672846170456665825955418030610189100857896112174782009029170826779986506077333681379230762539236049071683000
+6370393487113254502942284063528147627172601717639450424195980075047464787096908959060881173708540962987133431304917906118868338
+9267746888420071021500735075663336736361717345091433424161991124952838871022030399503645263408791327784786086730026429717318657
+1672147391408891002327479016767689503494648768717682253138108661180075426978036916352251329255918145397491166698770599594009604
+1973656522713866421729264353952482643307862403936073686775977710379738331755646451684387173747099995521827339722863619385237499
+5408235756969453434913224193378329404979503566466468217232986076880098924660185616188785089771941834979789440134998311199906069
+2232778818840350786605080110308895419763433233707234872571290509162878857914634432096414764357358087088039057924071148091731175
+6015400792410124384152213047000568844879712268022351230585299428537516602169557527154990684330404034064121063393300034030430905
+2306055374539312465651241264233074065955242079361211680462145344554747450796349210759636113482252702608031612245403353997125476
+3803253691034432130798363413192595243576410393487613462409388440991106589264853952016023685661448176427389232941666704057678369
+8628747721532797463638681268551173019525973277356279608142072485533442125834239673920151827309537064739870526314899247429664781
+9025827660968538606553886333865132013576294269585884802265251611104643759277860774328243246331432389944537967831541391858902940
+1930816587488360252688732499160213070813273038333861895643529140656993608246150830322861238139209540926180077253222099793719072
+8959519042048720068153629627140256241685908963439182993973204720950662335620899080859042503691987552467007737450276337233761755
+6288965328635383011799009079228464765004787324704548708119617161002013632986577780042057914052383556753286042031709306907755664
+9921350932285357024268612614215975988614776231803905241441720250462994526451363159473639866331342141233807338499617054943944238
+0578049360816576019800945237402222592171684814088734743903979539564400529178521960883785173251341874550331866956766247772470369
+6083904254700701911630159329372053705191987684688500636724033475465777760911461588784110437867357713431148790643538763108521995
+0296263770538400456769346062348737783795801732870097577376952964730500440617573963135158364912865598645263299913463769215039071
+9483488255991073328145731534454837990839423394416473517085030613349147333787972449423197209621559003595529788900553100012406747
+6566884594766054381929553636693829055015384572992260492476307544253448277903698366356427152189807274375674035466963843196695551
+6323074679661834194813723642658721376145252523971723277400835325217197190050897668239821693181091121061162219401288326146881306
+1808318984353930429816050257400279035517547964016766257303295002919848213345027516727642354899576468006486504355233740324100211
+0373421583654094261005790222006220690243740321608605292144463259644370384862300052723119124037021639917903672109294422220446746
+0968367458627898019517765631253210766036998155063276402536135475040822567588712196840514962484791203840216962030611173316284918
+6730753402413401318179055308056338575836289967262947906669540139949663260817034924092055901733213326920487904492973772740252118
+6813399504142772729322264698007839309738863435169195740088479397131114450638902610593694986422730992468798340242051077542153965
+9094257292692469011371694239749935666279240094911204646416349941755315640280190692332906803301138668428433338486284139761451437
+4927696735702519573953727266824755919361553550569177388087634691983381789617481807188380885676894329271297374663349552211867549
+6214976348118306656535007501010457882239285954427884872811741042673638154912694956412208130004776408704809831151781445974935728
+0120629582751291565009219505554682954747176012178127728953108970378564330824283571745236870527703343674549433801104649142185888
+3235814158776446629647585300745371840827518705724793256416163401064594247074494980560274282618040988687418212805930332830675213
+9481691238337366800610093527436128723725108303743340453678113695806808341554588638276662497395500403037304969340369996972707032
+4082676737625354210464419813293767706297361241754982481007296169725698649583516782177058747437891980516222464440989464874961596
+6461961406394849542189779035893533584829634128015156718397540384299215958366542622049511074988966488475073248255117221338638960
+0142933164629079463406544918744481398396204306933357431841214352733485790844296470933212820449310522157583393441447538375216436
+3436698506912676403242337919492000906428711269510381173399936468041047249569064777837314598565623718618433285256806067639636763
+8460415932660725184337524946121929924205499042071794021186039050613143778222559008526610557979170270365704047948250328090311884
+8815703597819948360630939744751577068004694199231149936335126538352407733636909351409964233765563167198074923729461436493523959
+0713926842635856417640343723268323797389202591360887205782568996458244122502082280450763638212538223700620622044815212320168684
+9492871418408066338755969200124883796242190267635257673723366249954282292979482645457308347074754036142876356477739278675875440
+2183538168589813954235091042917215997797441009968993171615399263341109892414323128649997905799043937988646881424204624530006049
+7733957096488341212048475007904035717627062565794383079540365496869348281433928986222996400495215587152772750589584231009322321
+6967167721546910451512704467642578730007590171739084668065616508498732163764275594573615283985791091469103384452900988352107000
+6807413612465354023458660940481659053886101973060578770973513038430471528121342377174140575232152423951725002933862875035962993
+5491625968951170241792359320698419197951622254963187269169519754789130928703155856710378168285319433421425146672702276206900357
+6582314544521282948303668171056488977803778991914594073284490075274341682398796202525053587573368003492350674264590216915743030
+0229180917308822559423399370500197589688253700875858499871606888817412759424516191276640847554118760685723541416666202243509736
+9274208984682823732942979222927492539292245964003720945726994325795924579380001664666341956208236538074900737136200088724900215
+5814292572624892701632682972030886871485930705868231267185916589385811869703139406294452824977282139608709779376891002163708313
+4033763100173660376690182575379995726083861081926510802579785312647154456013703372795547129639766049095465742696104516613357933
+2568315805640894925038031436747677782703800879694535494046794349191040639680313707242709239136167699797774023104845097743799234
+6763080953224487156488442945555613963349180931811315907436001825754710792409694328952798340996992622252003347436512459358128857
+3954533989335010638156841066648473526011867397359480295694595402042037502438174479721797977373598413288286342098814213128179837
+2396433612158432510452891115965816912823381888049756989510546093247222344511226918341455435352327199403241839439420506108676964
+0795850610161143815844607948060775881656537958435083754755508315612517655376939244238451149176008256028242905067513932423707050
+3517402986146524008574508829340726577308717530546869694363472906429850377209335971237767032862995433224020904386089476753728648
+7922151222682324169544546785791039508552110735905147311483313421452486749631056709157326288104257728264776617306059521303067262
+9433265821676424821718658733270406951796862690935463256100330389699577509374904038151899940074906081844482171701461900939078601
+6186077218855804555456232441080881439587655776678203701080218698681846807414980313213113823373021577317623820418853903404980853
+2057729858963790488672801591735476430626710017313638370400064539747700089967564851982820372204387613607305955240060602392589527
+0383881550897793438940267029950019121382581949345028853214775595378737481122241954444306274659828618843592228475107234699152687
+5284798962706326315885441962112759776606317588723708150855167126722288961236786090248841992912344949773249220873179712041971922
+9678187960541674562218790198419395947752158216709587927827286969325482868753908887434457039802709422399284864987575179916747347
+5327838914777072714692085263368643404584146218804037383216974773265161119155906542869845216416813947477024304569196702936579095
+6268003933265575972147374394617649572960257762413423428779104569461013465964897200866208582709538990234194911357542427621601938
+8074876525846270711334089333528645517621667077382560706349198812216415510664481057225472908752257947691952856523071940619013694
+8017368030459649790293701927587307177007662644838805113977690349437913275410750363651007980050566471766249753077608880102272532
+1982797159364965178888531580373430260986522031868350608333752657707407931000254944024943348168140524874484514493735113742249981
+6288538584949755098193652659249807271937205648283720864311553381239244146100739200355642491916783137202534161705603274089556521
+9354739749045138253043275273268328367815186805183694069007675806235940663397422177024952828447038786641822001541524569479714913
+7698528117160783953905420058390896481011235446749390616223922774275291430828661119528466868454607218473820114505896776059375354
+1619019266174818706077047840193129831420498197596777970098691437675408999864116292704117680089265101055969410774137278714249866
+3704870678985840970113166302795462489950063082099943547515245655672648446079824717316402600594084559028770660910436751665528235
+4429408197253611572221699160867353954702111945889329273311821911416970564822252007768702453855504730931208682912670990901446785
+5056501125351085290367349611566587022633517744283896529455313187439470673480194626772000636195743336806541403680260332379718964
+4062991551971333412504544251310884322830607074386974123640580284992839293238984564989258127209764459890435786526862148574118080
+2625522665812777011614768650094518338934467618573508691312860257788451631146950375887371627144471854275002143114396671788841878
+2226696461215179698643658067033045890658991544538880319431666117259518073995053382607108900045909290904771038098705696699068324
+6726532088338857549906950143621062126429461929145317128221035122460444306074528944822699784500814789341052158726046904507897034
+6793037164285887325166583356411787362893236497739544799385622176244058491240539097656877256235845151279052346581850041111149908
+4093573044381701004333825958081420923185855648955716595548583153752167241574306747073123301312447687906770815027018933422227596
+6707271839374572454938209957923490292030537274459728356418336773458317286912917431092307541994164910938497543069009665010432516
+7241600538166073336929364870095691302789706058064621204209320909673557421090888354529446748882788614331747011940455844576764284
+7137143302702161225320499515565654830535431434870632910006167776519433451398361978770695152191140156154509207190258738746324525
+7177837461622149136708945368215880972643302158259696018853584758017706472295497707280871705217770629770641478542481671610250773
+5554013978114456033660343221358867604345109625580200393288313536168463029481940254044728394046188030569648323861618169629477000
+8748988786120543881188413407361779739580428614335192009085939766971185616502526635854198592751325209395171686208426924544564152
+6617729010736669611153048037379873649289970538055287963581277014784710903080627770559078145423490012308690390159447385760636617
+1396112919025930755072794022535421762089970913319020087082933809741223660404657644541118861471741622430838236195432385726159361
+7249197652757615950334012535738132798576509936889286629270864681020298782574659494783085110319815705595177485744225974776618676
+4858557343521566530159783491610288461205535017137620369901510860776505101408698469561089138749268742702921025433191359814405089
+1405508073047405874902803040100792069570430571449445778558936794822787960786336616853548170322337310425822658832018643837559079
+7255075818431908394615699437073631405701119134607024097267578921840611418622682373870814723883284591259922905738590072345115516
+4240694967339735201081972989105259182809574142617805837465112261091318429255228721568810181664317538777929819157212160575829023
+2748237669200464565992816533713130419647283186413179673011963172187269272224647869974262327569585442612854368077691269344188871
+1222760335817459965853292578856201576938118519312855304508610105281112231513426234814422228921425942855517206703964421120719762
+5224765636718330925202872259803187360837016560225525039097597027027310508724003400835919326880989701929146674585353105826375662
+4608686356759945389820261327877835956104857982859971343770150256738677287345081654437248462809898624047205228119203349515135144
+6762635128848980939500701402251709503914581106728361156687648893186497005364492516596632908393739083848785619442884628144162198
+9408219837678921746467927680318487696309519621970987584546154535257273988915610716263345779849862915767049642549659017655936977
+2878461866210176159858735856155729710212544372367962529421415383498942572742627275020994117127943578105501057737118382232121164
+6202970140395425040275648643808519609153095822076099220917958127812733404125781257612941188098229102786208245263355552763155862
+3412899983063072356219645639174430993848691176774827540248823520470123385464397586328853608924297363157128484769714643392030260
+7516335187749776239975100738544129195651952155894618035351972235899711941435830137791970183095848641340212385537760526454996975
+9326117473414458915105300842976184452176417489508025383214692364884363250764059076859137855740438113389750789393201920849913143
+8213713819060950631004232834986002902474872793703875917119551478078092258435100422531909399249521481966638648761188280089875780
+4759150755939784604117474362263502288999681621525995527689733138120086197663894427404346527959682389904515329738583325486736756
+9325978425209872464237977527958499931962722888446298443732493719892549369851302316811008601401750818556435135705126450083049922
+6347121675883203194927076244218929133933870815129366063255106247006180593262999464959953693728515646161688550961478583928288648
+1770297585530292141472219789662846895032928913171250259285237148388628954759446094661658933173846573153793706711301693991850474
+0792606603197595851399011444059807607822829889531316870539398964731417122727677982590799094547174678976545309066723508642538395
+7542251187115005568283732133757451228935803355815247833157647444961116649664568241618566131440468159056245333148920222556848970
+1686590915600101341570938724862037843381611006851337958368672209742162426192678307570447318588843817286911928534762475716887889
+5985898442600265569905129276649109155018541224177922670883691334985077196371351903258301592600475229763499481236752268688794381
+9908334038229937596478744640386393429233365920050089472460888907538665294038594595567391991275514366380037563916695381509760722
+6697176988394487279550132960940875716670256744139528862226095599316038741474608986574869723524996958686407456560239747388319182
+5272345146409276991368562911742268892736319679968918454777104809692672080906197146972033144703725807051487037561295160467451538
+3361581138752178146561886363234614574825214993383047665369152075131490893168140965966229773832573946751662445845244243875117807
+8497747825333018837277204487016088859935993376161231128402571833027091271675038762646104326773996163504827534262519513030402352
+2850247104178367791237021165640248127529302018809122924281078393572312164207913339929888292707995450264033189457174311609184073
+8924909933371581642458243436549195910810805622486372258791244747556044533591204446068293714215938334798650520367000310196349472
+4508128384366452869820524778886955415968833938807781198993008689473057745756213279992800316467476453813822465284911857999907387
+2023953430847273884483235864052375615320236609720705596526699723117087569499174093607783752368506950667179330339328300764225536
+2114055767363508202672868934173997107264743852817603394956504753530153541861401139621693806395357957937922300502759889840467545
+0621018093521434841220357944235687355230152336239627344725027296978480489999738827553268628247847786834042126152054295485896741
+1728177905254640772617413047936979080771772313470023078251325162582234445493894126314939244900306139362255151328277418578396047
+1792422884816727055970087290849551106652457784152258102530082023142369893647618177451355631227247379577671860849853688299849551
+1175037347149672092098074310747361251964753674884333700769847744830036555394374700856740987145924794681060765600644641697283847
+9174589667717240975144336198616364140632445180996668524271118863864525314244946497799850056518633949293612226613509484575056441
+3024489420602308444377762407441001512681502589345978196662197798484057230208048085644756143263157845710447555275495197040972213
+5990095737215350840694710792788564049039561363466293476205766559255673678361573392948770517450420686662337759686497763541080151
+5536095650185550909008740808818202276021308469567387829730017248451381382214473271435330569988489076831395673641296020100168963
+8691489605876605176450990544960425812802030262532258796192840475047025803288315858498575542856190938582743335067317105863072855
+8766959566097551451268355313989562707945501704157509911384107284566676448181401117485715830603954518469086610851712800284373857
+2622452939630203014872224939693671859800249164641618680985148159351811785234412541320836473437263872332827932949209391274805175
+6798235720998149184680985250493187047397164050502295623889415695762080775856311836882958794525078302171514915009308220188324579
+7404140736104785086437030648484406734008243907361526117865122472043884228991384547907143497695706699559582484787176857952820522
+8804256451428134606481551907263647977538193140987930551038510575189609463453621867637464848455610801693723759700181203650436839
+2454914648531519297448584075603475998203868332048006750382533505496359960760723675619846780966293281981298326598027774066580197
+7995861529357273876737015678397822856184868318896981667361295506177063218216975663372922918478316465965515092121524544927046347
+7075516111646427841984461388320881450094372462158722036978724530408790912720869813138049436688811195541657354372228803333585071
+6429445107361977048898774220057765467210817429170612447918756002833100352538329968035564836996813252177717820091122268457886430
+7174078917945962391527335388096356842601813618444449251961003226992399982772853124625379285502923443657958530018722098893816397
+4966136548214340660067711135963960273659031432856630667889996071606345454141323196469871177597395097849304859547230071866679596
+3726141431238995322616590363658851982624885785492321657227849247981548495242247508727680411775990290110420891478204977360853532
+1644317907061571688813615690182418379232646792079005297020445585096706983621152261491067330546246215457831060764875633375743540
+0260037498619368766791619780583839981870124397870392302778118229013764892065306663721631976910781105530817819103416467777655922
+1257160865985307861172892171513923812618825522832093610372208245587343312911128848417617475098350804052464802003464019493811163
+3766028847159301257741274325560482246090419451830573366629957679849625493927009484554531296839025641820596875488169323390321224
+8232388226007759579919663974563407506786051531271638328419810743863932368666194478382016978871056258046863096095307264426924960
+4549834654287891305590680957281622094960361243150054432811463994295196664383435297694301203486327605844830810715344529812950660
+5753311902123482227347291010505867923405362170620911512612976729652957268599586765352146177919457594239032123428411979879139233
+1756522666058959488542110121660842887596621268641851969762507171503624064440144225359791257651455405971257235743672383114242117
+3669744927951794530124706132421697781115421405857509254735757547057701496218013526040546290811670945415111481766033696065077908
+3743986898663416455838782244658330408591406810811925113737418608085893951934341548820971030074613077943621026895167359064570606
+9471978412930979202834282673808363212715221979769900548835760002508328425519756934140019511728229374555172954389643589129389588
+9455543651731906114795743817911783078297338344457513508249293073101170733009370971042675747320086133963697038647918247059612888
+8987238012717473365026512535048463787033301244418231940438539856074603360903070483058902057658066015083363248256775852399567354
+3364502373064620236820638615612559600453180311037005397530277541350185917242503038852432559174885033399595723295543954546558084
+9899331087165498351833150053347482195081440704956752507876144131532942935103436324218551370249739155812929164520262875021494783
+6908904643032400627041773579937621950623563067061899745276566450404645141582156514162192031414915906603166745603027411059622640
+6495757281070400862553880509625330137059949973388167457480215447233006890221821337932185784669081820552176614865399261551583475
+5214987707999082292941559306056717820096495439266384956685554643672988468125971218644583921446293636673793845912080991022068721
+9098075542650837679681095355197850211686123726685262897042587789900344672369748441583193738857149324437982999889236683375639656
+3454737499177458611505297150687929879276146562076664745364918792408073476880967147036390541767431864129948395331642282070602239
+6878237499611110425456520778926623547629857959652095556385934261653929146175223058776396057712180642186976052559776640567287939
+9117825842497962507655739795549675536045986355442960959176637564697703951624943028930326642942379066897205661256857648338706258
+5607249824040048715831055763915681630425710558796489860046207669351392908027930067134903067626066854044057840603625024212216072
+6132093035960157469992103741008683953459144927130308314821395510817197195888871912314613073270790771658400690547770532514734857
+2289766523163076031024159344583085122839051296194651927355671209701571188590931542840886950235609126079848243347538568462648984
+5766639281060869652151900461538022230554309323803322083408453315192390160247383316259588161796028371801133887539960085255308323
+9483650441565836194775795637439945189737766569777908677905305601319160962603730861873961369931413625520373523170442339205096446
+6397277751314562067770288602692729550017088466152598972362685935373861021657565974015373030623318967239986491125515528075018887
+5402601339014610197678055292860126657475597634829577844878918241260173909075027791997352414032212153167271561905364752619385786
+8491863948995147633786778542070447298998068007279647829967199136460489001972567744945790789456373114064713748773853626265799228
+2370209092117301003097542080527068882722669167429990641325299940901538545419032212913930826834352316812337709858765794889107909
+1398631884718147949515763634548480975677014453715972288924837802795200463595978496786857308537512388719226166051585776739717368
+6941189534316796817726911487247546420252712714875639017653467949442416805399033991555627055669486555645886651826109264153186819
+4940516166674720818220542130511334825103331157208156275492549414655335399338455554953498955587141484886410449146234826660024826
+6659792948006838082450272697160209259339168888357685416533244048793279607628259013570705943914832132649302220555803191155769678
+3450607770354143996892622745433805449122734203977711922327068576407370897444833149206827486642681899060356549533970828759001934
+5727275520263633514968976110225542746359061074870472786303946464842833869445090010825025879958856002949152638295200941043841906
+1327175710840731608371208629917959139504834096615996636184118498113010168900528468440699292352911245996048410672241669829930509
+5804872329617982647538232786144744032881485213965459136524837612293635959247462464117508493059931748287964717902656930987863246
+4277723315738568098484054986328302182182023008609946701266751039890388797338292226205365731416488922689962862442504898912370823
+0169167783207015850910326779335592201489472916428336283983741331168324385837589731443211700684040249551018329769335204931232483
+5298537282274168905097783252545295159931996045324669229561719918373117774516092756810950028198012718738992851067743291059615923
+9444851345487696935698137109913963152214976022384665735269814043959675847649595558507091607437770303094115672250928216923641250
+2149472592686716079768844857346451000286201002122320769034758020998927559101579776094371380910427183625784710226757782544230415
+0647876642293735785152692483992423954470320088754545909378609961100700126777198798362991474951795873563734734785888619665299138
+5849838488444430649533263787538811331357728938722568950445006777515651519234515285808516388251516110101450462227962034131202241
+7276104739525907372419126181186384546119321638501786879645354354875497667502927550069197442007577146458961731206493061524033007
+9422217503140335187736221742892478886207544102369268483447607791356773560830807813772377547585429918129160635826252418480968692
+4951724274446263780114357613049442315030582695389596800003586264063614032462365896162651936067640252887621519671734335954108739
+7454566191860852039559843736923834077952568697550937244831873949705841445761551247253789687164216518186201016215799884228535871
+8439893371971012000885553951535059948361302183174942319645796198457357286423328894929588756597087846522596101434099524110623679
+2208231333330844864465745363677908966068876448934931718761801046807820975248234034617078513450119384012451530340905431793537946
+2305572597375584599916270867173159433891169944691281508143382202813205881528811308590035206333627177252785229699333403132814188
+6581817307307772248849032636830370028521484024024459152842727518740380359881146898101434552487760886134249651169919754088451088
+9972253499037895070298514770518285390402914258598519025675691003304065496834156654347189749182550625905099172508363395356804877
+5758008808025624632351941198979018660594929305107322792450818499652772086629264781844489198081813129733546688788720899531192457
+2745675328488913480621264293304705435951452309540398654081411328496424730516137398740590505211615977997709945823736263422098774
+4319217301030265407335508264753089155109074707762624338354639950177679811707826932551029618948153019495825747590381756914645981
+9125342547489286004121333337059776054538539726153714180036823804029952720452919240063140345998373975940156807239544138619226508
+7242675874264000704878339896544038336920890771642735504973073959953113142490324395737352393349120127057115852252907686376626747
+3473321596354209308933007945651010752129252885281924230373167976919072240297072208573755175225599946410500654362886750707794528
+5727589543974524706691693259117706864773673979587751324354353742658357813584415514973239116989629743388388478173856874552697761
+1142418605095869987288446285147568178401344806595851658792922110020211362874700057924021743582095514290749364426026381491938886
+7017216586801442390706943294273005287782115442259090512088524168970016375416554459606914186390125156135455842825317699271637907
+0211233315441242280840462166926685973850749956345775689925242698347596240183158491250150173733543845430700552741593194555804750
+1797724078344241125893042060239537330994558786922162379383591805537659608535521283089375039292199790021670953442916099772863332
+6130652679697033488878720295305832453720948952785209088953761883766005724826476556165454243473790630572440696210857988190704713
+4744821686581324503785124383460438165434233854467259677279955943920755162775872557500679297287992727542016808831027373389642811
+8818850180176632238377551894120301699425047464434209428644888921239546400810384063448594908229208386662084553428371435016786566
+2565402723149127183692936818466510584042955514361987237908845951130503356391102529543147109435545190864583265738886354448729716
+2555888389438655691918145095510314610669012618591908132566801282747594112804817710376968735883323783155393749243633468461076212
+4037970808854790499072817736929400553034907676890898900783090149602127450205466513482819048073679969106848951996174948205730701
+0816030875372524859030697931442206128673990318458281042368684773151576092499288971063578724086458233384930941299441451767263066
+1664521612180858396451529620088930659358500352782541669595817923485051339758066634536721977274523994998146473981701939017205602
+2524104027099484717563367769361246592695182470261402965977193164101572566284710942794698915634141627566609476347965721168530986
+4359025426573155220274777012266852482447049345363636421786714781355224872652596955092178684933842367455487342490049229104686636
+1405127824749409497462184480237538519293466992317964479311951604897323056429690265101169427550747026874617333157171121236924703
+6018076627013550295381656119236991061160617457180144979226462876301063552180250667955529552359828561142316939674528337208856344
+4374830018868998904944977293261195517662546966324518234611103690143089662138017933662034152841911712239931096922875112835748433
+0236447221655510600424621887641222992324877860049632049076965940501963553949996895966286320389211270787434721126820780971624253
+1124118658886218410732481795333541469161905682578320893049989427979158879370075562912903672274463984603712619157580009287344826
+1490073439715132975375184719480763004789606934374075237219980119217402660147346676094869754304392997432951402325274930204871342
+7507088153751893726167389642050254715794421419546083151335746591084804700733010001661585164038391983336305667211157845088930512
+9454605864819889656904342091511833717539963300409957365660591244004512939427858955522107791635547956216918186634105330346773979
+0658593516322846162016300446203238142166026181710436615937557978420890524597354295972144917810824199008158678995080211427722929
+8980589661160288330719076634082892363742482807739228207426629330991685667550752678607146578792931470069849286956087928508404855
+0981420843325337105199162550260043516249035154228170027681913983488364730292863723816365277728171439162179656110789246164875870
+7235989772218476249654125554327002628917857770756363184283174214585030441232386973067535578285982100385381595377232095167172355
+8531968481709055316167180990447601481938541581517577911736493317452245372585792259012856477270057051421673563226983021870172320
+3966519268023261060863087111821082801296148611252172465597370204173800451852480272015584093876590792853690848377385063421097933
+4667059194375637666825712724740535719642601441210189891690016272378550854485280624499553958549215837331920055819015130335235748
+5180652276625067336617174370015460185337302241346649852510792894228685353669611675801310899772318114006268028233834332313504023
+1941303813100529733477333374209673305915978659212933725574700988773740701325826021523545062039757705261878074707241548966802269
+2746067443336418197240323253838643666106109625323987238695096142699993722607024221029583744572542375113816178166737688431737737
+1790082381839115387609873262982695752275538347088304949304931589485737690198187441832377091589179048950816796427590616885843542
+5552689266955858826481326722121453449315123458065490624658389457610909531278210069460670951157478754958271396713130819467585412
+8161144774814776141255994752061769287038765060690866140571952344698969957192475271081186838639007943816699743960034503332953194
+8789192141356424274503562578603345033063547574284980009602843989229909463071658256259561315235167835094522110712803401150014304
+2269120125327746733199585385420581800688978135760399189023545691870920243025811096318243711254873352522759304218250492540601301
+3220660009367443347579325094663071621014417170436158246461857082697811419327408184450532404128001876815109034413458694764955526
+4236810019612678173215181621403086283786465950563987195979676317579127299901400746488219293603220797858502005948349760508971512
+0842456999754267165377711495312735495780613161991580964945616998690779002045181519007002606802172925174094502143404195978695837
+4416749583760585438101952975396064089728080431113199590836008764153005621794368480547875309689843049490843783015113705286745691
+0795274682904383996694242263473123412015847505963674606830368047427506205910859669522416907398900276339485220277009294111636658
+0726660439712285671104280059752886748116228091939311944983809111670167487220776456879193368274819545300958924106260054971842623
+8150764216086897115298219326429987785009191738597276238467913392040684511353140756968540557235239878544391001829270153861846092
+4383222134341106409110971398373626248863354871646454326385144812872101996077996725153807549596115873770116755372384144360289549
+8170673501302124114120744895395545744756695363267571023745570418014263093634951684729982428233593809293841917967048459961199699
+9763136038244743451806991825890314924556837135102471133555361059824564665398157293669951119702184740695499289874076409711970682
+1422421956968116348857989939957276677533229421063047970708284154758036180433546990214632661390471026182712000805513222171655488
+0790454789270387069048408785812014404576158995323548751958890039523932351478622587142638056133836919868045535455845844392024399
+6828229983228262659292226957969701095193296498963956591476120614340834793473477949399153199148731691820887892496627505449096093
+8624492093374718033878604413583151815223479591147786368391299257097621796393142945746725700896309907581595691253852161958930992
+7107729406703783687280485106218574382700030054257355689626925093581880354626104182184797971451190514868852721286584413091561305
+8741987234103316893377380144344514006198840745678799814654988835056150781397439910157073114301452768509065135515533734967678598
+2735043292667576626222020726140529203825880750760734206750175908534901067729659839678099054130592189468939769616706044680647240
+2763006819383647925527431911808115681683993973822624367816274873450252222984650251537326892288304742295886859351709349425297650
+7134753100395351301348083365117683812003850761712390745630056031799089854945233811860729771699517948808663082113548033370410055
+2156718353193091760663949540389192861228968135157606923907872289234299014121301709409557692508414639141148641363055713300497167
+9323046502608972228620000366263176485575290223984881067717695579312796433503231136630486297616245185739116228913473000321724069
+3402413948021099348085449161508115950805641814124236561124067595528674925736958070838477983849773356429271615279624883406948406
+2586362309829746055325863292755259087415528960697154410026073785183365372343620398551768197389974234910915413966255239135166137
+6948141006945340339297784658800718813009858499271702100629421441689482806248257882748211373263608811093415305500022007093455945
+0842258683716404942736428616895358695656655266518974938995151040768012671515151979466768515865903424648012383400333040320383895
+5049269512019956300105561497239010604854186206683961343893764070138734690927147819767835829400814779254514025647466904224213470
+9569948375696342652641662102284605174592869950745185014008552719701570802715911338264166097617707320465336842190177333964575034
+9428680684767284183633020532362541285325879314896297017757679938122092115670160403478099811406505218708402491047782860144041267
+2048668363875460097326211666406188941409324970507852534507916458181293600129195542233794471499710031501087442970014489278431811
+3405993437193068750979763065800204417948705854493241428660974718747020128492308645680153785966021095932035295060527677641892559
+2814589083509652662902787080397228682431174828014560598681492336798258054680671382857806718386021239491601389601875295478518945
+5986699496572944083337074930929834075993621216590713141225309670719782429561351058677320246208472110574056384475102009208825158
+3701143845992716374497567663523592738178836225177899343548036997338523733500001300643656167477000925420983129066143726434092701
+7423291379038754262185514882391794604313384501082737513845672893062736061561920457702887522180551612186897189287428790772663945
+8038882462960387008399150903931548842040303337569963977574310341965170156166264463639669524288945874943197641758694114087360524
+6755427287648373311476510042437767363082433235534497669444705172475485394287772438817148371693824101932257743465051113814804574
+3302584529244780057393036854445554623243089576362550605055694156880682183315829897197741778897975736012282052319045886108088033
+8087176493289867561968800923375092924482419715512093174473694625106772042668885277666098646361898523510402733964872800445131037
+8320007995921770348498605128869111626930267035943426816435809551556518111290098800524644244409358410267473862764842446130048523
+1436098828025610017328979458386153232076446194265248731690143382189291992244935737904603822794261840119592775301158595671929956
+1859896675014716704798696047818739852245706249557223427847334266658566082156593745460337399765187932861285602937611319183698837
+8695387218535720582564065835479455701900416698839376472323627804365945785468346621682197696163783828936362978547295808542269445
+8279752484506847142094417985544033613129823835703913986703044915444548737906032583690923865665220094573089105884291792454719678
+1316169725449877686068579181522410565098719766530274437681078973112896904796812316498589687674134438686508004774642199962324204
+4690063619499878869524791692206588255254568407388459022366711747832387099104508881401463078787110967721065394141648606132537550
+1451429470869671002057789223158518659342906175930490990163086609677315590447420960904216338864582531646704745882645257996753003
+3594769224483393076962577578336775804994360716705648101110515582304099946203974654110102114903083901640907564773113403226112614
+7842811390980512417623967516307862595714647209118659868698680060437058188686064362842966029195804418885454481156401460457680810
+1353730331240432284758809177395482784888827256712163440645440749728289433010840369051942073911490213001477219496896397735829211
+4601945158211709423733169616586120219445506544455684681994448828365740758425856347182450418912396580393258871768216932273389644
+7546606883962070377792485250777570864737360035965255716590780907370097846008363755114568550428189781279182714576817370377989913
+5909871699164748481388103916215854782263584875652627145927520783000462057342075067627629231607264735052014948668522278967261465
+7789853062938105623444363261994088544665616630390123445507860288440231593034911635167838522597643333127458708364830418263896184
+1286144438352596484065325500754944308173042437315362632781599996019422261591416810474894175619846059414717720198222378370653571
+6971462477582470633206125394932199429053380382783796898399516803651438673139498531736021776634684941580638746309619120992683170
+8629432822993724963855361987882118654589234693568266212440633573606219295689682039033133123609808063033145394447533709295411896
+0281594967652261579794466637274919984182923757681634332365968310833409307348568763974412665592870158544818035335013012421932763
+7655826860692715418764005666669293766929001138134358352328235302135813053504743107776878655717896623753934484760219931500298692
+9290168663678775972562133999711785783179036668870829240738642007250789936063529444287722257668245891843786516368999364205453698
+1388094089899362163718773572230079214466119375080348978705038480095898940916060131319234067470176587422484787467679366538347868
+8017293664803927630769729168954945146012294840940686008911896485848777037133106837925465110245874730110174759001141830380040038
+0120439722450454617928179479243857705288134086458602893871161972846537382451740227055242495699985657918659780373398590814158015
+9185549346791665800883510913273745072991047690371888044204398878541170797025220849684634548447569944177523688037116487344544844
+3983330147768673814424552255794031561316294164196820680509267685360230979960997521617397764375675161021883986966830273621436840
+5559819786199323213875219658620019627595340113429135282821726501703289978583492131096279542835050405087347140325687712807079487
+9787946090092230362250195573096660493646419587912974580035697132589473417918325240116393969464922906025196729087774385693764553
+9860355320714920060965670358032280168554148297437945180860387882403591842300282814921233640661490871801402207762626482522032047
+3097025361491117451005377278198487212237099544908247111077372764356886263791448989161160949762415522639831639294698581458345985
+7119461403366321455704765813404706513096376229662175435103856904757065360840168635845572631764671801632765978886309611217770123
+2355725108730791813146700353437818727398062989969964100944171032459233591148110740093249920429111285758187817891195538479372333
+7717147589069034365041184332554553609756818941590171329038369697464604453126540943732615622700321916184110353125350100127752260
+5400719243883713007355805618610788516934976237500923767706894033322172234355015854525038569883308926393709084041999484656996753
+1283666031444516796129629651038339271512674202354596553588525167158551065999313761923723647718179391480101442800341777895133996
+0753973775383179955400385390016380992296547654995782315767306424246762945687075752145691419815405005932537449947304486849576643
+2979180958396224767297581462043320034127704743702992357878029772922817116999851784773690688789215232089766369127969016032601856
+3851573261415488209314332793330099314068046066211719044146103127781354079770099732602779302176734228288014045681315375260376275
+5613084622744138175415292879907528314309988380989805830104342547726499059288400078772029464667932988421246953056079406071204771
+4586730576036740853854978952480253788859203002939257757392716256983049436420156853771221502897572109716517239674204969203181474
+0982119350191052441755943123327258611832950316806139591389360751863567226397368531779203766930988225110737707276225086269268083
+1166609927459152345242074308503846915870742513191815496448329154263550697382001973332037653901875197894977220232463712982961473
+8742250538546251559619529217497793362557849446641056066254726761640756859174902719692841027963345440941200289292587371677456563
+1787473730619074666648808301286212846168364513813858291223488226257956569272198811926719725754005926219281926579718279777830444
+9964885779070155802556863992597887379404305287991864566420006473195804170299129414259096081893003248613986369776375193541122827
+8679261717535638702784929128089835277682571491318590535314932208130153018789998592505582846756436233025096155853923159667457622
+0064101062279216730164192200983393569735835140706754353527254528463606619322108164129797836707319607352924077829068257856221565
+4098966914598730293864163204728437998349124344700052324246741119119244973881766239805489297351925527481613098094358252765642656
+3256631812453399632987567720287450907847236484423613740997675264597104916297183865029408528402827703543717537820987540612308827
+9763193844988062420108359297687488837148328286540087218373263127565810612066788312087172343604520200144217517124505185828378183
+0839169941798971803467138716750724876136916222233258526467257984594030393990037357389464526262272705365500201964650768865692587
+6552250604997641261294087071350242489522328429130222914193744223497369981001341679952214443941383946458063259049876349424028513
+2213974436158368636025109248174911312580051245505113315795959437260475388392500593400331863318219524296806654096778830779216940
+4878685599516319690797457606707664358483790224825508827231099632903629838432588023623129489722939201221165328880348763488094404
+4425772854689128756512183299147748549960529805463272504802739617344094375960651486501133996216955411590283887952698362709773340
+3400068591062085249345178361745959828363146278918068111168494145377017234716441154409189698261322125169944980545699464089750536
+8846865398199885991570109728269877331973845988335052515573008133676441111176443077214835337189028637762538757833593083011292020
+5146028640720658045073881058022137119722140728994381646856170548927402303281330627742305686994941764560406751703346767750713886
+7209258975092391507951817856714755923161856176501059139093203502102911025009832983122251947751287786516716014787221574638939756
+4031047248735708744857275535082996528246946792080390060989384866585501142477546435169883331570932498501313613151748523824910672
+5636536308963660510951867259797466984603129916969819578084787382312187680895777499152465628258228314680156051454804934741689251
+0512085879302345402847429395015269085320583560263939898103230391420972595529857458723736782481282792113866713373594735837816637
+7989131244460061235927200538684991689192443600011394251966967305334141431951393722271395226793607939272662478632186079903315157
+4105861225129127048237596511466748710669457275423951266966241892139141936555720690437418563605034436351637331842274069357984239
+7714780490538701008702866992517751463558344819912101444037343071198346617249265664311758101747127784897043351442589412949637554
+0794058900554049165331519254294841158439399536633260010261808293322453935679510287405960977887161196498223064393352481611148599
+1300801876528225731545729262391681879452425698425569733040068970789105907778300649408653356394071182530765139660697696280006682
+9500403460028711452841481826687628011337250118712797471026118134978473459279189369396543791538899643830373887355243212938105191
+0873118171200026341001915337132116843336126642682077009436271005094613931653248785836179383736770204896797782028704969977499350
+0015763840495758341501065058600781266869591393444306380925176998016954972799133300711081355008885083487358653288976991291458433
+1182038281534129680784410839850542254891681906855217404657576532842299794168911463577129652659153953666202320168343676218151354
+4489515205537483086890747806185147028159038841561163491305751443503026033718219551299657596422184541173585136713789948319572208
+5427049518844513938239013971033113865769356316346953363872557559769111015332419532829697997722648255367995610629118024243751562
+2407474388820183495631279695253839995841338363502759887550630065930650395810552864219034911688436057782562693639597408091177372
+6597246835826333390472023469934087393575305915386587464255626374910540525559513620612895257369286541372428722814356277369790926
+0540482329932732167361734686964636330198342028336626252732092257904785101659859937597352536082164206650257784256989122547150860
+6958569549047812907458129176134743095874743438183862052347741885494624143736509130890665487847350948675120079666371405006768737
+8780431675373547960195603385932928721012510177772630104840609721475744144915357267790854338213160647630650329373129575638594956
+9496521524390891252020171500116808958864975665633521384560269916937417268750283135245520953900937858745308291830904258244389317
+0015367958131832930196538448945414897381505579147872992058659675192664335486653438990141847260783598099119731774723267313420147
+7668586967951300028516829535113315808229408687973080784960696295388250987543953394689424360452251573606982659417899250410280988
+0855610169950498351316129660470090096789046559977941298373823170600445713232790694833343261118257499105417238723309775430866295
+2330553865870284141777533356762036585595078938692432368606760459748846645365953536258322870084801797022785593339163737467833147
+6997226216417469287126591633487052682393389785830401431520389186301156111690874765557617527284900760279233718743071166517225051
+9560345000426728260399841368953209835209100487337639538936954570820031680886090876109665021023200759147113373797389077298422122
+8175155068276335352679806117326566700814346009488428499581701401590558929437455938924635624938224553855781741120788865291783407
+2295536946679503673362429092591476438921243024065802176610048872694278802256805275897901963915809617356852239830206442834187860
+1980560976965565165140981488552352620248220002599581191144636050647934285203553865821505084561426414945738261567792216102403148
+1151908591260497769379834919810177114427370448525005415075150280396616811812913926897078347185577604045023394052213732465977204
+5152624009308747654657296667409633669797187558140762249677298229159695566185953786763883703575683368256625993695568514289670471
+5898396239237604417219674285036697981388707533386023577734556605753254850219222927862511398982564982295186931657039590148578018
+5932796785525089331274908323688642021701636412080489905006446995970747450915290182470813258134915840332610387871533886024451368
+8138194206803987511384906150527820013265474338857553899093509868964543274546783521373587071739152356855552276377502435950664343
+6671221923018976396144288089085545597962326938710922261699996323322275457923099268605292778087753199123847741515682942101433343
+0553836973054122354894964985734607674790792609106461042226839499946875666977767744836458472114784382708675816804952000351499560
+2364997010884637465860014885474868656892220025469289156670808481103243684995557245150848863996066555128792257705475749161690025
+4110649532154387762250909130921439734079690118528643911754202049214907597563788601359791270067268169269560624171237553348861595
+5940616224028249469894892261151683448506705471885912971357007128279832881479611563158245452847817654715394431167451576558923691
+2701950548115303007534807474569747157173002064876638265966317419898895957065042960548048125830083650783906003217529190210069108
+9448438509033254495362865744281724512323137198768884725254104680523096628653622761003126111128301647813853623032837646549389708
+8800961571279179907403520239170262557803310568213744508717356574441764473623277516011904000012404016704294869157929203333991614
+5621867976685621217499877201966531190154493625522363719922688125680349437187226891224242675375445798588375405091275415995993660
+6776602064451444697704536229609651834393352676778641614610712731028707328894803760218379598569050464723477953936124087430950917
+8609350069628812265374110081821823052163446196500492527833170210965201939797385205224718774402651526872691305286672629217382035
+8488697066441224751559631066164022076293716903983024132971083317225244640782734589625800094058649006568726351629980984900472989
+5845746441409288197669763941632849306888745439411555999404218596367981143977695990224865577494042079971012624349908586273448094
+3944731944003065116712174476397673714373918870846441482703374457072218866041336694655582361341131880499845103050687313792470342
+7857292237476195260600973001695477364449307421802939526518179464787823934178232688755800049682688090660718430541383983270572304
+0611341821464316878794523833266573224644012837504558841156871904475125652999503438286924058574554384509785291956022252381864357
+0405626679943651292212678664558286589975871490755359605369624889948784641951887207653741241486219388021477385980747033128784838
+0349563685997861866328510113314436119201124870929479544327167409917885140426561670911266619220856732660355093308773694213795936
+3842271417777258599324767675283259950186722960735488702869088413460362934496727774403713216022454808579752649987147082209915211
+7262086846799716572297263071380322488276591389406786696601706848938742607301811413241169596156442149745813064652698654676224030
+5774876540806221409456713575924968982273367206175097023050483195829231424480633395579433434537883182331511499750784779245974304
+6819745509357317439429415625378554567362388569070215909977624507836378437106698876357999443207523376055325643289588788312580731
+7833148656904363694334569121139758945904938915660261426660062808527488257575416983895078937523942074734502850315306918181450849
+0874641305830980547277712020017148651915548171250649493853510014278214375521776229277631115079740388430042785920214556466053488
+8302249778400205215684880334891997915871809162392886542987069548288428411471154533517912205528047987025944754683578880543791606
+0358320982227642668267885208147099122293592290139450664586369209811129197752858004803010616081626472750567559363814707696436535
+0313506752837594147209139665385131531998918025147449755897149885365821721038971422038604629058413601987368885444084132780675032
+8698373618661979252204221364880007737028947769589369624595251994724054095272484618585409406539000761630748495654887039290015310
+0800818173175869261167775704612174999230343952148568401102639665953327107535357309312915124706207238389207300777172747117401698
+0640073150863859675544943154734483059715378564796905159762945298307365280446171698542814284025032267504158534248530901828343035
+0873201504993233632733239057534034773053022444340692497950449652566396669145334447109018793398061041589027430348848568737315985
+0702523531880691374404054678759180464956226260133696133658291458560416403819468440250477647013266610552428012647058409477074911
+2679888054788444461424298005407130238905755507645631966764120317200939342102226493489457200513433158963725232826211305616759400
+6659241756332251314783750854468182797311328498121933543014291040088680657858265588241030117849346100683667795040402222839296842
+8277427249362157833641670896337597700968219737912856460330555628526942419632625557211562429343845027815601523792180592076379859
+9754404607631948362062894438912954500557072195072644550642458309860663622333701157823267362150209715197912528880882392701349340
+9392967484360182578733939528902161701930343748675665636284278981486199253820383071398887821347218338053979003089742707812914379
+2904235361284953393462862403685101898073830804299574939556200135991635904384199077467177409693740584708928799458835571980205648
+8121614185438088992376830836290018683875444583668400234525664787649173577729566744205001928280399848363250846307170382670891227
+1379156561645180509829419293369128655964653490776933715927876086576622995107120980971557236204092369803081979966524323872401105
+8210634652239640140303181717302977441319086010060056823202877048062527278336721358234059108992008083109338742139836036323492605
+7384031376893772770300054085703713950658765604751229388016547464754511995220292088356538057488534591958960218276518555883565725
+4074775956662864334941163174462487475635543748972688834049926463696503634025310758502751556398690346342648412837461668031647927
+6365750302288055740676475554487791055706610049861824646116595120976061102018119073494765991803213702717674747175954421813209939
+8009331937511328151001411154015547213063838109162601512214845406533014265983012161008264010599651427488015290161524354573353234
+6470978945561557225050621564665550894387519941185513668617316911095236397590508616848692919250154411755818493336504839734750031
+3525111855377922515708294426372763399105358667430235504503228627410198905334837234851992023849271193012460177555030458178964902
+2832205291216922852095126506355099210740893308816704635379794133382523761361826241501772732710458333973916837834880210080414250
+9084082447350749526849475397900892283815818083030975632291741303292925823304366055091504295072069505478412237935230243114270458
+8733240614953524515745727759843129756538792646920469274157284227528661937418719037781765126256474601006075476554791323844619684
+1035243868690685092085007530104395247063420667025726455865466535541087734271159372906562129287612463548495628710375386966180600
+5440542501876451157868698528285357586655663503645304099842630588650168915815059917415278238955617758631802903768822104984447821
+2018849475721498910886528030895133588236820109040257215930892013189827568406433756483461049360024443491773721292902184969255790
+8822875627013591731684908728396697952056849491038175568000507526035874582989907019189676297477355884544173196568562596540184740
+6207027832469439408465681825635058880584562540284002435337574271598044807397129809411607354965616450909115426381853724556891033
+7221658030059861817521753782741366902139395897501991336285575875528980544038829626149666345302799699624831576475243396464744984
+1649540253799052538081391692469181324705607910980425515252483873483980593877409055481936471747872491282539042199279780879543216
+4236145733824367590860331474571745015558798839670826761096891349398910243527132904379844441054007921880393265550231971508677926
+9325201276405157061556423958329163005949768823959483768715570931105074676418085399720398268434277889429566019457186074673651582
+1556755082109554008455021604947841187746491317217027281220528571996910808491743715098726471698066342041982149950618417860098084
+9612051527440619756444098523237719085720236857461176953239899550769256325996619384467815272576473677824512425753715748473823644
+3293706412332532029368150574309147409666660955800738909802362577371939197344269404239579009973609254902956047445459161013030585
+3889810572293351817285095560307955387570122899356894847953368306309169743185951491528192204482516204225431961214922057114411745
+2466537795850541088028557343809549480793529110899163252329393397207265339963882361084755962562912216879860134066671514387618346
+7860354854395803331508980945959835169783983572284248855654573657487835485311040917221652836888254950796354469715116733559514443
+9649687850645361629683896013084952406507914922578933911589068814423571506614639956792270631464418346423540206296752844238915237
+6020288012912630828121914201273847417936995938147436941121877369382021368921214557882494996867880498498027992143690818597132057
+7464732232055318247290946075477625177092427701352448918522702341636498386700884661390140882325113012278493389309349523351396213
+9696483275515491260944768055252019253491922403588385357522280969636691193420388846988546363998678336385777443993831313531774583
+6282522032399446565965739736752150396232120722412203505719106262036358824681398508892551567229346012725815333843066908465157756
+9407628149379572734413508114861082667244920525693627019900560538557779908157912341364139167913811711711544677292025506854245811
+3464634373606321375959043076084467134891991975403488809906777158185809859079955799214529934428440394715803296141747865907907489
+9423993889790762040142434803114305323935291193328498665927373291227929076575533913306444776443880643225751481031179680675214923
+3368470912062297700011980465345274304044785588310672874869214201316579834207228249128013243107286248089143869069547088156308777
+1414590222708121116814503748513196371955339806257298864789960510451079590735116383580469454857965360874314128844784304143454069
+8766678394720390254448078037404671513243310605018703312189431738938607517130277658972087080448195787216475306011123823302381254
+3391550184839202307004590614178501644771630600861096494601392733266531850599404613838770697571965897048614790913072319558856284
+7803230787138777594218452988887094396749088370117209351285801556001096168575241228759515079363186428923678980339871398190852582
+4019696628533985636279505759337532628472390302841917324608852947709111244515112700445738982371253756187679740389512024539739520
+4770847899134941839230668652175028834007538603739876886601634289336067458758592877494727624461743546957277223347887135182085175
+9704365765485920770156655545282270424007413902597806432869012806155483311798101235310454409760720811406614955012826140011450968
+0313480515097495573412839063893028999786645804567919951099814820194282264604422806064547777371073192487100289094441987847150568
+1657543112009039941765308947835121413396501421019711136903259340105124014460634621836811024214292779775980478293474663062122820
+9705767650372955367904858685510440746508331239334572782478185604370866609254504064506288513924921428844442806366648997093161941
+3489214963851233247024856358669087681654387218345765317192165484089902190489810844772030255183904855574220071570304690043795231
+2065091959221855386411960322245401320421129454685844655947550889456851989959823948526569728196088066488438899595441765150072821
+4429114819428348855107669954324003559235452502739679008927728613312163086830142833511895866448006257958165946765071157730382695
+9882679827690443780755577550740154748999710142655073573245474660654485200341800425388615819101330831466686148830980748666684090
+7163405135812565179670235235614927720441373285793867065291904861238349709700184831060873375476942470039510660809272264903320798
+4462917767939061046448018044214701368685457860623889616757211734619696932095108903120448131130054208365085745531785639497736359
+8218165839330532616994196742532527473553555966673141549749982047712150106818828620285541917373915693522694719282613944281399835
+8674485087809037160526520795860814268331241546826667372648249043039257847644579120849321232434718628926179993145231262359579173
+6402705380929919120941181769537062173912605142768108201761013755197467816367902585985810911153925853453654100594647121313245913
+0666872833826033632401371436548685693080139022484100159022033636174658329127466366162032910540421919446428986161784748017789598
+4723199613767942411247930612753447325541505390129994382585659648148388692327147276519250190560063905452973361339890280400124358
+6913416888336681958297148217827338479648390575317941960750631878321348332412104016113215430987661026879407929196484877377640061
+8494663204235300224243052398541725825482919073092074355975063032796596426605495082752541621103997044605964809112021627153615430
+1932408491193512375077001954464823146678231602554522550896013165127235920096414910813761330938337552089472955671775628068540474
+8216732019553272236739723100215131535386354969462704414412180804694918899617675023795044921436432605559415902678545425651517812
+8025247190590822148102225680479409002058106823871348717740963812585351667254545007307100968605826752214724522314039708032085185
+2898242245907570507615621864533672777989484514162394933849338212142607118088404798508269488444104500180113716320167923336719325
+6087711919535546884547342110103435389748847458344462232091767124995184518172878034781269231230242533893228603793308922587510107
+4591474660599204864799066811331150365409997858447042372594886218949250820247279474918230135657009456785941687614114216570961562
+0712145092385555182611993058740320634997625075753366666542910024626577807784857468873721417913984050547176339602792705731039726
+5904226911569176720780206777188612328120845124057780320649670149526594811111907198960857717925291216166167928639613716137663067
+4307416456452371611701931195073322788105756639763524372948315105493615715372579618838296610933712476520491005806495650421658587
+8328103991782890592563008949384942150246156275152343753139757736003563406755966669814359044466955928045317799518086337670918431
+0138083133435376046718367707916060720252112445257291714225747183751131216668718597844623190537189131972377334685833227229634752
+6238721382625606157004023423898943602807707672999152909288657052128785368828226605301253816178238566671806542598902348311422328
+8320139586923410723937149546492213794676826048701166669784481756530412597915193651538414740148097847037639468257092287852640305
+5479022830982203377478476331811758576901670233527290215872232363518816501458927070562308753377018843087767143244104321568604135
+7369186061703793181459759961931363593408835426106781211446368072605366366571248851597783995945722926222426820630491316650527779
+8828573417201809585216027386210261861298732060253123609864528252840272478045882739663756003736716392199489082689850824432511971
+8111646983909651153366476446390221276039522740932580204249319217339578537772918571217444956420257260371077236650618481206170288
+2935054551970379324008798030984106801055948226939968902171687217907155340893582643366397894579369212912093597160438593641683669
+2485378257568528389277310889609277386833678172566456312002344737328227016110453362502908568225831332260414575845627976066579941
+3482852162228716106007258452673841400279159876124086723321209861347673279139378292982201754962295388660515249705755465339980807
+8586012495756212505119149505421333725699491270326513988475156468533804482583378661782959257850441126447111003717332538997317723
+1776086627675735007130894098661445494477133237650830139159997474669449285984774365441233470966013545796673243563388041724650925
+4871204375981896728514583939521811481161849278118060344334503543763509824336823270998963842004711517359429526921820434423765506
+4949119417418804810189631493303008698556136954410752013975187350631734375598695358460132019129899037320268439555839944615572946
+2352205983666568424098911534581381260867463768189900460175744875437666192115066390019086651996365032553554531097825841729484867
+6396761821871154925250940721334814793716957966097731930384514803099552848004844714015522077211735687647117734547230837853524693
+1596031648179998000220637673943792334209148422484797868537888852196932416293373918035158752836265069893009384789762509582269339
+9695024706050496247098862490788952376578622083442656866053965079277898118236124486093149364786379996025483226916387856904200464
+5207178534801739733741859262250257717063345689422848102283865760573174574242830519134626672907219548945944321186449133371889496
+8091522599148708961675484538617588113615426169855145369191110338586586013267131819054886276010519517578355159744969858769754154
+1409888192657898889323633959345553144675637666158270953101126274823625732454329591205013981131246606853736622675628645701807371
+9520905296639004266979383969455080705361676763621326243504360544161563837353776252465278766865244727756979870759572455920688699
+9581386171160687133121725147597447299189214610587624098233087649334093755829602691095533964193964555227483958747057992036054166
+8721053344317784071933338712749304229416314171955616978192540365793299631623144229526476496982594982691261090976385827573975900
+7821592310703338108652726889016577851582851275588755649801212540201927028394346407971389167170778763825909054893860501536766294
+1680216758688189041294684581042122535978201496230771039365667061380634389195094311357702877874169983055267901138828354564408227
+3161070157288336465271541894601581266294703722546655378330486847268915166615856440605517140340676687703279431660743947236511822
+7741994422834194190860106225475557703581613419594307564273066500384493526007784089212735294217591917854424698645245431154845570
+7453435530259083182485810144347944810673614929556646679467919668579911140259730381818980942598880746925296760172341499274790409
+2328005309406832991426090784212693827689769275846169654962563240745452602435209585710235753460014401490458336687380630135023071
+5366592739312999644456849006548399917819901894358497737731098338943033079178655254808256654806548883980302404456845406302737523
+7903862311453131512315977712627346676478344399846058399879029101474967706599628983635802084695117268292559579897221003598626395
+1226042367447825280036345293351132154926212820976803484997329381495188404459278925205516668444497544901886948777923893344531981
+6856828147900151315527595804653628550631963940129883617356848115429626055627960941822258407367220366681493979858804129725050531
+5342427449777364357294403483728929672993293331804282077540029002773232860603723492768689779320843055290078442091489307669129440
+2646993961014124319764296539370434958358249722078956842849671467698536721940846395173191197670777284048312934901527571955362838
+0198542559113109732314309858412233715215167131228324026800689688315670022802995393900835564840785241774828835077665262843753444
+9550183762744591451958276893980778053478437092327149970098767098796188062615518630585477187237482484844353645352242801527565339
+4554133259430221270883589344804016824319680145988501368070988742027201586296359667866696516024912143872664381709357471736498210
+5093801098192097809224518282804541968783581829389873304181998214634779593308644761544892301474532546795113168811568716153209669
+1410860371073926432124196875939453572716037044352794395231284292433400177009767688979893244784882963302195811252949131002020348
+1963827673323077855623143768105648991600618303185458508264555147286917125868559346485583695956446151749324530132278047444739067
+6874456031627491486993438537612795741124963717273593326065380547768578196708046010574823669488232340781667689355939847002297664
+9059011156256654537948571823030159169978023672567790424242785131594034312912382632898662220373433122635586320057460971136026042
+4324851680908243245093083193503431558790765585803419091388697495752260988154385332510991556891584925155976792883412406678432776
+5169890219592441180988843355694784180780002217839745830787310928598719082559628331291213329365294364549008762394123896795514907
+4029304916499522070046006091292088087865888798317559803991873835903034439822636248876206336683085957754970026069257438125567024
+5122833726152490145361691490840338977240905109443464507374230617046450541939205551391476680636725777819582830317640677472291259
+8887879121383290774133008351057610071339235010888965861277804156037797773751958774639837524541250075316907358014661336099985243
+8039061153806899718406603277773464956989757949717475056088907096202984062415028201715624897091896396812284772715615886727140592
+0697572299245622972158982736674917157478112408603912440899066443377237594315710291599368603222944799827489902803052151032150505
+7013603271652485049620063445001242816749693945247727354086779497318820787447165373787134099987577277741625609459410605718145900
+0792184428093364028147126779227116462983472771162905140500152025984437549037622220978921623538498863508150200422542729027788614
+4411728159030287378714419332373354590292666051672346415137756916116829485503628039118411108736302251425180386282192968531233608
+3508034331771430567756401746605566004814192531598982097023747313496871602413228109505959309225451717487757635602112764447022631
+3428939513944422073187530514913804210377096901814387277664055693937327821063211837805670103207586535472844416128884599982345779
+3765013258236529201610750246167509469405857415384290132571908547691847116538830356937781623544344792657443940779980096189839626
+9024565602139835552337325332903285437411134785405743434839219379066510469685518924233636921521087402359934033983973385991471002
+2649847962568274167726165208946386788572121523811142222528040146116227215917720262618074588389904637062666528544746561556536935
+2620030538510199023964637151697713281829456055441798954059894139613970616409824903577033806155241943903044175681019965795785283
+6461188416880024087073825761424480883587286299792763357082205040327994699188993856940062456204962545880583868705703598889787721
+5944413986797134250694896844973795638537262177510549522817774683727110576630405084332924025735617088037709220742387561124513292
+1615973751057225002195236737059699517585264539200525680337988614003524501832730480276366257598203042140690301023569755795697899
+9008200222469601333665860661780983941015300488620597776980944258674129973552734738060885268066420909348372616142102733523433267
+5003598890783029733738430164315966147920008508177297711130783619606431201578483617231981134136392404255762575061631480099367673
+4714080230392459893569173674100327560113467502678424574866012722633975629063693151545366570327641280682622355521718987259238801
+4739385038824895235096103000674296240229268577109938375885209481939108319170129231324096236414336990925757528939018270228944966
+2361210030668060864499350273214477998565800871680472680681932947260121232176894643185754378295528202618772690219192407686919753
+5156059412217536746848726448056144396547837914584560922069735882550291341190213498634134528385275982127813806960692781201779053
+7966885142214723811725348168549783205309168240872140544601559983829401790243561220385975487819401267336194223205730538148703619
+2086985085185073545036414851529838204481235650803097024838796015231330542654233028002529608154776678617456164886732320375739646
+0833105952434512974899609076351921948939569136092110228925816092118172001373677700416412487399777738494320581470807407424704877
+8185614688665309617727123329966574828512583312557787490171669059879359795468437113583190694186011613831079902014081217754134725
+7131783601536200912167420913195076409694857630710552837087267662216383925992631278943851251589580445676689967886327863559646484
+9888310805734900531289699098784350167801387862535778038559729898236704661594447329313866535642213694637004811239940871137589762
+8123715241748226553144892581245052850529932097715696995932059624924557269075540247991049472713937530723957720713793716760718395
+6093034172460809629440737053209815131819638726936540787299401716655839213840485847609031890782549934060830350478366179240604434
+6633327894940509763972045245237235718323112502675490128278367355639972323817271838806709048068724517131782516093900913433491465
+5582353019666679291426183344951264862654895560952921265198755899160545875749490172299073507227437486882523588711701507976499572
+7489002650231525223980434094738594856401532028510616419177773329613390523750901433006132084090755184848290450781826037290985462
+0539323854296447671459242043430937704073386171637825236119340677027183609466820564020370547139050173937355911835070350187485451
+6965582154750741810065288181652685394941853476132562873871859640024361243300296805283748325817168878484565585632754351908511680
+2886210467566660836736517150078351812871682359935951946868379376912994012664524203941072154686353570579681603704825530456774626
+9665362335544365210262820037867343620764616695075643840510926473275049084133707571284177399685539645626628023165977084111958392
+0177820463043321585863992470028736425683626513381632161117010851699245594406701811450201210813697392240877275493182279748367019
+7250981623715632368538564967386387747576695271655268440119068242579103997269027655460321699463398768768277613166901925556040578
+2730921762116366900155596821064099866827590787028023864778747307107976624095851829841563684215591447795700215410952638220148923
+8642501753068607515960160175361362264643558443610150876742595480796702902130477857992388072241713968623856298400849938588555032
+1187308644994319305723690746675187962892871980887310999328792568364489164541385679772588717510375815217942384186220430941913143
+7605854751867100384861067666196612302899049367936234596159545293447341885894031370313641111815396044152641244256403303821921174
+8006560725678932454993887223171401960145271946857211912769628951507047840598467703395747670926287903550867839502877316151413748
+5747061868485506527664044246509977629632520838572005928929416857628593497937173916677705472302579778727680532363758751491026938
+3023153622006915734476058970896478596388304728569523091701672491484313935627044876208043141561946195882862365574965158147452289
+8540852691422877019070250316861163162391778272197273383387116022030059687803664857766804536240988573448290819394431972776651275
+9021443311810736715901066501558981319880316837771114344162148017989800388690774710489918382047318311988709068050500771418272212
+7599513906333939122554708100671399521304710290565461919067937465641955962609388316053120501043224440969693966990639899533003437
+3190313864768728595063193176469208637792413542897116168001394022157595453909893711585707042678368387735204900683732630413423309
+6043003917729256108805619361421477310316625655437814740309514638761344462517487426501249646525209961899684542352037279524879981
+6813035487710494491438894246146083397270552071559892438473910394670225142289451782904407545380437720612171136664498766583513111
+5704425501897608539934816199146825064755643795555188152948142674213138361295684789361927194878162187162220359319096077044697338
+1170042273866788055113160203247185045523345121557337349823787766288071325865947069357672811750151752362658390610542086745537803
+0182650295086344086825098102966797093995388649163271139864646408250278380402342942834021881070263294572807189069134900984272374
+0906668841731928141540118014775032666661994283184008007242068962044782267000273516374045366478779586459658472979356032532424400
+9941559950477797261120283165043361871515058911345852440301289987592080477208449029732297262652194811701835630896804400526302181
+9586422168434769367306983212903836891536506488360440148109923788291834492143450307170521991049310812325101209435949795579328604
+8845618327364168114007785559410459235882830447965260478796725064238526247677648804067848274177910485949526784938820751326532317
+2508842138180368207641530038974478572707059622379262380563191970615374835570345785749767510398007047615953484581417608147080414
+6150921916969845997446844026937752931358496152526223613349123080269156525204842351030887676736715854630790139383298746726376238
+0031087628812333418550306049252849828620365883770156880965318518371047868891562748685920081560624079882621440888924178323074068
+8556547813934656680983629186991073869359264408784267940961601835440468005712703124932656473056207782384291231611143830784642169
+4764006946356475094019331519107580885428818699148255825445877812529420751612646315832517900095651843319599421976422128038327435
+6209251031135205676846184796239439073588798115331056299413787815047447544760251266043212878984345103105431840273907195809002871
+3654931993884850780377252970969582655676559449815451929264323578834644743068604576736541418957979028943061560532360261664725787
+1145330876015831126155307819990268909839073491920596329763420311698726840745194869089228905040694957988171983477254803375572985
+8257437969668449439729079801079379205727147223003815670652927114347162605507272520770488283403449339977650008075057150876981627
+8526350745722665602676982911174850303165259851752432760991481586280102205346134401601648981884690319798225175260769925489404224
+4638271898447020123724423300538195550321048052825314720561544239062181964769986570926083174181155377779882057584541395809301918
+6106817249634524848855511452769182264081765291797239837907787970553958190403210902425419707216288535844322802242224844682625560
+0987012833422099095295557450557916850795807069003361331869709388270541973078686998103429124404642889230735965872322730527661759
+0637705394090134454432592452488278594036085049343720666733736875565892704518648963039960363828210137149300479545174722900885474
+0438909745910598389431226270312843755719991811348892485728211852221096700168476622881940496574796916264512821293932878797623865
+5429545451401418793893535526425687987849470147455674595433976709030225358630706349020692453458568350635883987698939555558472630
+1147145098629672646090540159437091576295858909288901226882948677153091610088843747423989951237804279634707873305141146001310035
+1453067258355914230711608884942303119909820139748995292741299997309447939834224950618749891034712331269306844559292626045946290
+0350632260797112269078999525007760708741928859358707432624911128337604559525225243942115958112015615876335010570860522898738781
+1402978628312279477469329446037732401120697968328000813953667479029085290308524043626235410022744559135665074491331563473370347
+9337757755044278436081677756600946862635252212939271849678018763209718297572192696470355304192247185638719953361091249281203364
+5405880207322161294391822123973103190408090878564615457135856917654118957703067143223083955082019279925860379183853717628861577
+7799366841975673356259200026023839542055869990618462031135739235438635258865047764693545067810235010528954960166478294307447628
+2027467028086256924839310527875817129214597755080392073496545377860632428440004957401492609606750537328284161904594401425287572
+0946928415702129545673169191304792948477302426781915513863540380482590408165885780307409257801864775225156808756934724074392504
+6885597618942836774284752567772379904321306380471869189416734595292130350179577547119957964477389742383246612250778027835962842
+8375378564184742787926400597138354486910116541106048723078444753508902260690644823241797242756355368838174606975331846084479482
+3212968824505986851162688090961261899834237009593445525206396148505570975743205626589129717163778397732428341839974826649188402
+6250784433605236331523177619946160387836454523224441645894992796160653797716355919979290100324224314406791061386652716371890152
+4400989435392530316607884601954369502551234892963245103254821300716613610559994576020035792556553491043544497572846045958494663
+5437689141597501417826982456539318735177994543195003033035189307876601341936559142966278723819207128349590261078232012690448383
+2240565515565951781099043148895044873938264025267367187036427905278273314523689584565134739736805096906657362307932608184624022
+3576329018410785775670826940638079688618282322990520892260090365771287681416891560096002562633570097542699787911417555916230717
+2453291822907103982064112069025122300625453433920178638265846617355201994938801382944512864303440296743023682910689965580508346
+3275346241221900813564939920509014369583021411699796257800366335780055834288641882272217012847000156622653258224710526325808198
+1761823047477639207496107226016946214853880512328754599996142453344143869395811453079561049784458849323538032761380820785136205
+2258773098932947134988484220635633194802789720564239663961212480883691013756304617477696306260192353528126108628749643695576613
+6833244981505084786837439890389565039428783638198451342774797405426073205683183254178026538685346206428799444442723636136435573
+9080842459252171303872018490896413638818633597602353810855257937546412235233854346618680040369752485990328489156699457496819504
+5734956183309699603857071255358660306282081929816419207249476965467352584050195709593369245076183392383809049796820142290983389
+0663950400843838925251438784404925348605007257769726864605575147487057019983649102686292523010863667700171976798290888401737766
+3133554911232814826547253321321519762370231796859406653514455605268584403622162920523841843001241629651167179835787795168834729
+9915875102181929094696545619337694209374642713183714372607433054204210229685880508097695696888633628128273726076768020385810595
+2987095117021662238907432053186678763052465613665295736124815230360572136345177452861949998291445717212884676001873754746660396
+2589155650613427623626563286829473395485125944790254164155482476888221798281733050713864337019212875437294907722695910181965531
+8195108479458493218118347693154287549401864008165971140576262020179031350059154171267408221692360825699802778787719114529741055
+2994227854778559135194271668156980433699910463754412118741685322605625614010496732911474348010716497147621915462772990056635740
+9885103937597375812527288674502022238204092589207503781840088970784707532373479354579114899440649532568358342845263798451171893
+1120400390759648596081862269355864764100400822617213332109125827310532445408926542692499006220714769552811438530408840934868695
+9637352403752939344901814991765254063329438135234927589317161742716459240954818619945185528105201605559036407476820639345279573
+0967725725520221343652248725994878515580037117626550685849684690414565200284452932891511103030564811419601323232328459974123969
+5151667166514928638097099027082126182546856178488195923185506331245117707219875304117100373941938587261574361349595466933901648
+3122056019614029244775838489907181693402454194031630939340884628769127341314464687448572665248434305566402372170442289658220344
+7261444332642187051262725693834547125915901896179000263992637439997458766108204237403853459573909864356641282495892771557042023
+6977452997091657310159593635773017261586291897746068707373152247429150821576531204588421265308077483457611680883539505380780214
+3922860418447742388907173493206552834918162458673611316176697519544920126038326376534410690399328547067085820148163398020288911
+4131844303372153660043567296613439825919900174540571926796003444468128320273120297033737036976412016725245066800816469650561843
+0565592489986925533018758592782811877964316768421296500160427160146511217146432195095933744734673635804950107620352420106654863
+6645406729317349776240373018557665618972564221260681309297356903494539710063100566543717860365197783559220679304253096607594218
+8395581134093404449211217585032937525052183907591091053649490577579801329664352206258963567937765723904612138153463659172391420
+2858367788679710677058155486700833423902690944634848842142528244040019800469662248189870722506296487688337321695524703236140988
+9562335938642263288699025637860876864417622879634601222106055965060418025394207515941236354344664880329773638937529679471456359
+3869629127425084307826072099872319475018151572502025420028453624372211412720817771154291359747053407476074728284771551844057529
+1190185706672366345077026144989614660307994733718658435474012628808621940611349704306495070342196599139286091306151010932970462
+9675509101851273861946201556462769919002921112388488480221448504521451553534147109710141587683279463216951321945573166307639217
+6672697005271871616738575015318763914957713525828413258526916822948066768551357315714715932196912191677461856418144576263544333
+4907150429612203297659855554908990742757537394357200499303314336795187732766056993269698914296065846201908473023132752908744956
+6150083396086150456609926582054844276634569272470435640456573226419822868710777542210573165448531019738194685407995076708226492
+2678786284405544977160356904372320894983311525398796027674382539921414318300162458602130818377816924569056780073177178248997811
+1585303840969268907598807940355932272770894001504038659615940425154386157294260258784536698627961267225191113300660353374029144
+4866449090853757246935294981633041248861600653432843768265539085865624263955878975774708775312072236190746445124355521953038339
+0619885412382828558999175920193016334591402367369763220140054897008235791975355396141026004273210423619062237213937060537525842
+8976484958039104695613723977251336268561215466702146950426183444969792826975925369611735319989524615202694816932040830397174311
+9564951821673710247264553143623225237946783695563652359502341538660577772441234930760198015851060420035149363908475167289811549
+6152784468367404157734119802017549287296220448855141063864170092034156049229526992205564211402819767239639089903951267480899195
+1084349314003385023967647400823528491190700765335630550586981662116778098851626565057148602128362406840285312235675524872617927
+5940674859942896006453306875133525569054425493267698876245403823203215376527985578976643008721792339745957322665402353157011446
+1029563432263058113381593903721587363928336506888785654392441615160711392515188910321841843403492466442469739247826795396883496
+7172639941661127457144015058984534581536740542737103665437103773621233103380626067034160263026558390443198760839727420004712631
+9914873013707039718441199896815680469326923849342274027255430706708553663676894461369886145860075954707988128252410758852549672
+1551922530995012072301491677655182006822391780785787705916872826260151900149221019724939267128249948853451126842232399605725462
+6980483373104508461112547210954800274259585332622017453698311994963928004018795768275261593898964198667538969022507330787533788
+8940619208645823836214853361748146283829606466502798396069751370937123229891589445495370452889766339397264192786388083894708555
+7956574006856378561036342289467521536334236359576203113726730817643632648603038458281607027513534064039819509732524551295593096
+5939647576077639500586029620496592494701352335060993013958711501324112331829653462612315976140447947573865479895456805542744172
+8296423959232512165579460974983453693457497491285869113279013506974543084139634238126476293873284263151589338438860044240330996
+3782355276288558083473518137834514003242038994143031796041577911531844210313799581374155317783854201414730465792201716701206550
+7105406465035531748842630956573813909293101829709167100331101814849787778408887961527614275809837033921260676349397115972110690
+9643615107680266865840715334731751157919061855580521203957602157773380969437003086918579100512932764454793288187949797876169125
+3320437252833110321043772044039248321368660878095814104499448998676046985620748260108371162632325229365624907230743947154301806
+3552088981131531046172808385452694435204741530370783735986679874877536428004908486014008409001068550950540888673128998784481805
+7440503329453373467657006789991046671852958451887155184801369224781302834630349870843861530093008719949904514151022786314021716
+2709390621195321800279652002200952192418979261420927427122958490897500556999549527116421814590121223682055231817153659082402135
+8861992826208042869383343763880314283402643395875744203109296333659792215641368608715044344315779183133340656043459727198349780
+2734853139703811794155039071217208536677070354393864907407146911703003457454092806351920281851834356124440898064979131802059323
+1762234053491518617088128044036706357776327020285634889111113700954005526394521483443227952188980642686375398780347144135711592
+4027397751732022026309364751091606371427768246571192961054471672221120559486812200168063013361795376094462318094221786026438363
+0392038021743121561693528064882454352142444617962196680006981383051817202169379782864384242280286939946138589599414498933359730
+0182070858522164858867574874421689046928982559988292189961850204180007351631664423841067686122468503764793368632417463823286265
+0700191191614031195459835157848968083002627564348814468750050055060620960050671214092145749062318287857521361265309131257106421
+0309993332034066779054757057884677047198784197094514566927373158826040214788501636945490789604082561095662632988383214277496388
+8146430655840989789550968117320096504739356599535135443521661785643633703575650679430439992282453217709233862686803968241138826
+7498984628272507825242938050646337866580174070972879570659031107873223367860364402212183428942145402115290592836227443279445979
+6978276114539892419020829624768340474210713091442435775100177879638010349673639613552216581396012901447719087628078745824194120
+8522095336564609176473140966826492093656451125709888847406519188859548795021576488451306844892007565711047730272408121668647900
+8524767921694471514347227180326839537161579546977834075174921433329341884828393393398191832645952423890037661848882505051151043
+2944580067530192277404349067174032715610611074091485944569506105415953050308842454649185132382815370040650599793085560858695708
+1141032332340176333446374984947231196716478639118202128308413932621313966803046203929215874583358851861354789012133869833074749
+9480985593249065406361871874582636508161948209786505592954264261087303579799611153927773325602584185048591266936288024303976476
+7322835259534879703369663910307964057121123765236316839734559189401161415410496300232441653039670294405632163031483814775087095
+7887660928641822340331849719497888363217187995951806289777062854449559129016492535377000453799053164705981391283757823729876400
+6020813393115291018308864451756852473844549771230553274019875173525511163873500444811237248088951714603052752360262642567865853
+6201967072308522428055969416019910663232530141827188975690227560728650829855364963013282370083361622353100870401742620986225707
+2869802657723987122733883328526226736949680510879014974422147235169606191520933028844627505009715152702759247026991603640320467
+4241131697918560404418795016499808486429648304834823604182336854359989655705275261891160035233666029073733408580774645759107173
+6464198087662041784095710258475229347049766003901523983606673438365749432588484287371422883288614656304912471987516429205303532
+2029089639113957845701115097046043607676790299218866434022020078360708383436488957906770062559366765186955585351813372430895635
+6464504289920784076224333417714908863182256990967502428628619515039237321418833968508382684390570422398059844256244914931448759
+6529784435502409492045275382927262616866859838773431100600230894559679830532230924353989524323228472158682810144077054469603044
+1378563204070129032409938042343154208174485755861395799608824865872543930138962034925792279431758568493941395394754047686715676
+8867499345143102872671197738475892292486346568581939250404454964808538362896520373387072413955104371842316500056740851235207639
+2274346030168140429762079586632175197653839654847793978202115595048824365507532766797058257757822432716594523867292474757570615
+8116418268033688475580223253494948603537184329744599083311334953737050247127839879240255833527455107807664847505065047983484396
+2629458032033571400314592548790506246485500676837502841162113579334258598171571921210523629971864377357109335285657941548264619
+0524276024669364832317266608416143775893545796330992023551256594493130557067547024156422646526989759981543218213803553279470269
+7049845656048970965053022592938828183548869262256486091586477018991837255857719144475359084653581143521408001578287580561915936
+9529610539570129132154472887914287431871889778678946943105713104741010716248000242330469610192173796870030679714772937881344366
+0545264556901297919417188117578751509627881737016436472816406518703771084849520268761391513510275790321817000658619656930708957
+1126630442325657535785952978581421903165028332745161812379117711348541046986438165712940213350699237254925482467553006850919218
+5721411832634196862603413999653849373180502518946059378586343176647830400545625593156677745062236816423794840646924829283523696
+9566889818345214089079695756528442838502922581513940730675014653702918250796815796276266282500947845827720283326159797147319082
+9317560741024728849503640154852784294588264197172188120649331980986731376355567665746330692183280397742589194244588569542845631
+3577828329965372354724624706136258680035391223875847298805321085928193394693686066077198681054782793606636920380474314204706128
+3316822771568615892652610314018713244424614540516258058981790879447066097870072989300359291800915299516058342141748356513095635
+5061676595203394978368391202469283356586340799916518917181619890218937093078654617621002548811013022192072875054917226111499567
+2293159175827100175340065081112035701753220885751903235819929349733241991099088182499008327172200193308932710369190557345577793
+7287877879088510408061450710486988984638957628372307246581657037353807145126249736162916823230146250853818942298633104586163230
+7832024984477944259180948598164959684871867948848537597567339850852013498502229835859692193114794153895539003144519694217709429
+8852158774260606249546637223424939759148603134570091996953512424441839401422606873114052812717989308319825300637980593162367504
+4443868737007280155976070920335648272365458102007219456742917706885599061474160397874769568586074099945991122357965710810304405
+6905794745598083595623675442819199614676323588131811003338385631872023890221085694977414242799825541355735846812034684719203047
+0457011399186690441251124301781521567240706876614307067167646882762698974983127872249705063133235031055532098528898796399551640
+9652581539551646223682272835407450811885069347498654352393131589816331647166209087054200913809824196442611900896852634745826036
+6159069172552131589074592658415752799244670288018595097465086916954714517572062029793973193555030320732773860687445556056374048
+5349001165930930982732148212936887040004758525708856986464739067246746909509060364496603927468208068059374896651091078566710130
+6254982141720413268677308357696628123925721390150502950572640806864637896561429156063059840807574455370484872143372214422469569
+2175489787129382942852202790241971823638922108920609980574885762787573196139571654120370722438096597478384547338469999448759583
+5779677161907195059713244890541696081649739347821725617254499816041573948157136918495996244811587574062062152794567408848302587
+2529817818204143798110200493373689828340608796471631850589769739013205825657411890682974212480864416875107897957894840172709126
+8663943826538718474564967927014748693701498556781723819074861406711142155938775092841806948205850959520646877840367557220520678
+7792447422465445177106699668289442956655097062959653482152033676820332098951332376110889269353539366684304599313150351375802284
+0121046685822850120961765570267263832452267770816505513149214924261156051159905321694021977473033018289683251782668439030324894
+8869657128937432079954235872959567283205921860119040052090516147170061627077989260167387744379514761600478703309504193576305611
+5381561915778733491108127139487324618000049052071735127115368151009776782599438434551832876965146125033956869670863387976299721
+0949362683385697791271115461446907297573048650262795825751967646029677499691298037462050809938530416641818484223928338242122429
+9766820839983470977275951789763019956067562051439591397901411073621068841669094149499180916451056538781312613407170881646764399
+6524347269748594984863393554929474287488214701192085748591350202439606866037583191335302568028741994749726846505035406608976877
+2807315518903493816008029815670675803410749049697801438415798820359073479308467800153777926573033244523898966885887408576598556
+2253435971693966005243248611373406144205306206628977772254035623423592393288603285157497164481644751059433660694427679833172764
+2802621839144263944769655055452576122669485060013276462140874654840615169333830556593045220363613387004343762888697682047116295
+6079893975072940528060570984236651746363761678873252309931727588216926947288076839743652207728678149523270862367475616321714661
+6924992946415404337508448250054422067066309322273329866764351438985216249046429085623842949432537700067268248539671410894502789
+8240333706088312915806196572306355577223650119535205051323962302240268709606481125217437426747720173549677961990418013172593155
+6781963827534077258276934309689853954408488415498885594714929736965951139633336078246485722224486449322009472875775669311469575
+9358007010281073437748629060353526682504603164238126641900438090676758229061250503441387135871208008336678965627603224246244049
+5356708068957856933330346985639541006539430131114293957097055267024756313531830324556261486697384925986987181884646073628504968
+6088781492829096627570053299366443750840538654491246720498646497885473443660031433479078885663560146413659899024021823265546612
+4698755327188359177076358836200498034389012684305157808211750883923932482111066086636126223845187785757048164121301047675382008
+4187475464845783395113764420886751702440050366103999318308171948006157647282740757274766917041519563322385269555023048099709528
+0571195389552617367126852668538451980401879674162973150705011024259186076369903231002763667511763488135226006543931654677750804
+0619275562362999032336486727097255819748979447931027384044606019902431591438640635467977566427621673095319535200747603235302696
+4867604449981342383768009732025809614182230646572537976384930951101533738349930256172344711040076994914315737263468451025930022
+9527865696943210023342715736597334765710291291516121893348495349788313734498145749015674214471321122949483123539062028956769641
+9765176523721839937410174251025970316488964877877371126040698433360574265827174483074565633308845572364434646203497713132542776
+7378651477723436227947997821691317672343016210083663443777377182287912898006288444888091959123188074922030160615537818420033213
+8447189492947088531974966589067358589089364485475991918412867217338548681050492469752464750298772894247076136639226285280041834
+5454360318746876235873485912565983134779435530640178745325450114100396790737296942281564432762776663339965033474759509011312252
+1273643557029602462258772262515086262035743506025601400592823850215645680844288819770466248021756708616474262140257830085882080
+3749316335624058049683001015861489646556394155367973498744773935515065243970160613827515488862189910777219950612111041830333142
+8451480666232257772267491027370674681436846933893722515862731717525412660342458091112720313220482317659721562206466780128741773
+6590252632454850440238194247507400433748088629955607174486085725118788995595732312569896819608944355538496441101640124949497789
+1257684894384392174484251124503854845960148691603301944875996738800826596693185375085047729958430171553740436704869195063748372
+5735178593590752060263331193146970071579446804835972630866651058153595857973419849597143669821080829676089777998056446703836684
+9360907310859244502541304513473974522087020370096397612021384703925636952795854616525882877878108950663963286923299046586524224
+4736748114460524678435616682271235781989815828869520783049700875658488695718736121600271316948975177628944650186309894116256839
+0122265134749874764508072046641714144031116931952372994620287753392883858943809994533079487667165865233880719017940897178306317
+7314139776044966808676160030164847624119585864721750026892048897546015469276703858536945215709271741054424782569701147500084232
+7758065860697872155705967293772173137656465001477901257876428931468366029449777184812467116641975319314916341175480998066511678
+8213787357873005347083763974187729721493820664650580516006337664286359010259386041876040802392491656717630783835571533641496104
+1539726264552952565436503783866624559510200362458151625173082533487696535010112807775556729174429917223668593210128877186508887
+8321470309679685999475535888469479559195982218922599887296055650137375133750432460874145869352229391171673429325865805622380834
+2056541359048531447828515960692963929079449940672170706409337197174760052966541653050946881379320800572898168412293068662723053
+6860373992960297640329729816572073853997874011764757398797944036292846733897735820446934726176024024757470895603256455220029335
+4569926110072668348278664329257941057438032693980297647417188505086076585913708391932628924011735966680243663432137597450444007
+4011230494392556854932236273332089389934747612548401261998294903567663125297736568382740395489945640372131150054623072337132335
+6844595318925439547616931848005923901307170686601327728283791660587722758968622818978597514280133292570491476960507397213932185
+3642313707941792113315508020910489195204450745180517492522873324890987317406946100562361363175345008151634614618218325839525506
+2427692898230648928178646301964171781644216637535917410571457842164951317391990752953058484915364895813865613835337731245388877
+7010431184482412816244666073504621100130866578971286677458525711336280431605171233723698610913008947422033976946085031938114793
+0877515916454772093488878527862660314336276524158489551235818954456016892617227185085470522620693855915519816376238143161430319
+8799443736799287358483938545063592502641553678820618531061987381595925735003006045937462381053795139314188939327005235192961861
+6759340733723316487592044207138087167698990178309899096979902164464364089126370344350744470572331313727851480014896363857798812
+7052560097987652474276867365814450520379120040581256992867022098643876725081745248682691582583629292763400638018100065591005268
+3106774405492401515494177672517042073837303505772295474776502959089196445416987270369786947855131616223965006450641692994332025
+5855582574286277020845503779828089079164761761910842413066849248818854888626393445367304058754822066188520015897444131019700263
+9198472044843711981048071735258326011544302082682349755642269651044020224003915379747598044212429909878394016016714106491656407
+7815377808589332772544290119723706266101079820396212755543706404343739006942558946534655221133089320660150834947988585978442816
+5845893139549225714132593150193123229669033684893833205775336633241518807901847649594321897137880458298454663559120194776464523
+0400879116612606005027575801357996533825782630360057558670923510328348895013335023158934967383007297478557740608358705255176983
+7266683495403368714481550525556638200455893453737443660389337826017810731088543589057015038655883579293647540385262180527785917
+9515154749550773405200793344557941722519749405852747512969927332977178984307036495472318127241347248808326472175619457986406723
+9518368191888409210468669956186116750302181387390597344128917877355951593149853095697850106850745402883068932235000062455347402
+6771238670568019918070196745624606843885430053371888544619960477580892136283363206743364325496202732003423537704812210825777485
+6482929731992099113054720411204927077100453390882438863808021020983016716953161187024589380636187873278841457216002930842647147
+9086580408882584727439595283961649388079282398490521121307077379799427026353954996467076132654318458754445407020982965846766574
+9211933498567658239813690464315557516873798138696846826984940696375072209871675004339676866312551085733908702422475770451671522
+8116601759554721517887607233127079564923984623323605008410478991117346586220447102577578587384958136197341044972808673740184098
+7135146663669772129679997894669791690347234150535985440597324857772792781041329129123706810764665585549577867626836104138395091
+6171338134734949666403237923355751356314985925381428193696582138260452767497882006262979715518886220518431969713213052164146287
+0631430030464172255146123719714749762611746753803707576735960990848350628824677285326419791772891874510486806367078208015683527
+9792995724212035781617488647953282247761468865566020082106220151676123008979512284726786406279413459522157229217252165905352918
+2536766618340462486482122665210247152075138704341907443423031644884751559830028648873890163595496896608683668686938870179657834
+4207985050934314372862959059606329918091261977012574425026916852113090691158385845006538026326042605485030114114277066770366995
+0403083121980863784638665369135497943380554934143397132755814677874063414921737247611566476833724738395380308234640207731607371
+3017035318366003181883008020161130977715784016586015636467061595058652062869875350107267130020471568933409734170464250203156306
+7978597058687788859694752086622825044743069638461579429486476003366615826282892684888720644513019714307671128574626623134255754
+3225178060856930853571262377435203804205020419212526191171244624283460959473575918723283729545170705498401123341048944419740415
+9391613362743685159686501403436221835235931626375947101387495019232220333271032937655938586143908770909065649064710101953494614
+6134742532053652776330925214492259910738874571044952830222662538392022245336085949987893286559101791675451325204933710093660895
+3150091954112952712726674404458997796890860249938694466648235513572474974162093062356467502005784802581269257972393197375619808
+5518818055326965608441276354480052128774778908643152331498791242682676747511171669510551698928872813137576082004507231113018234
+1869442353797750668263237704646436989107574039444714294394574053634166211680018322567901718394177095139221750525981664718345874
+6533895638718548550755018968962814261467954303937753456123595613702977896395623181616704065331577434094624992851719491928609615
+0190398690201868871739512766894228210227318255924906586297140986714101681237768762073978231156784378903908446734627746278198818
+7031625744207762150055633900029138852849133531239672839021846058540394772383588961074862090538883314417964060795273709151209027
+9458808924606129446923894166510777560369040702494184195952257501705875876785777050661631817125173124207320372163502777664965913
+3571992627283246607384090417534713518631913006344389649603958134572814682981286787015904497353080342805307719694940285614675633
+2468021847965102322233545270789228088801077254585303970545296705237224231512698609584385993582329483075661032700231251161660423
+0192713398720255736106913269405387578211504390721637672765578917354808072397586108294538148319234789867624965197532780016350565
+3634551422633123938462201786680417505451646469018713382722643171537409460426340292141021655461958038710203141816197429713424286
+2547844227738650654059981449340163279595536790994781981453043554676804995664853696521066106987131049223085671186846778658607485
+8528870512517578936416926762107480564174061090150629794502095506665701012457777925443164598343164919674568006002249856403680494
+2627259489744462745552373437029184782032929858142986221112288622061305496355657681071521590855144706970497835664724912122006599
+6545391156443312660152544214378226475642958908136790116192718647739147551525217967757101506789062053773824320749961986081365820
+9807243716856995753119727006541625638999515827040154011379764506202860312616961954158869599676568905867509226176218277805150630
+2073942766462908233406965969896132634247796801676354098426177499898295515362604488579021522583028021857262554533983809115858178
+8347131968232485092731301472083865394183193666260253997648555077371404915951205500140212998582177455804377214724298329527661383
+1594405101691517143629153539833183982495777310394687166385933138800061962945009756356701243200756906586574077923344666352145020
+0197245967822981167194710233250484229803417371108743341686105467298388178153158024123847938905011673366872874417478036778662336
+7258512385396982458981727808434299320938547592708453258132441101938548683407696744955847650770224320115020029123283233005466171
+5842172497719189784583681309409508840094316855599405125810349460717428156132068389884811129531014665690641559952450142631134435
+3120882941134196144363251034342986015603525881548802680508329909569735321266175483509995349121263055144465010373367684170785550
+4158635639323481056067212351252293942485312028596582540399759383658505450921291350114073361212206891492359937785370602986743900
+3248674367436665982259747983227106329784209726320992248877150489251570771053020539956408865849029873307934125408634817191607873
+5454247998356721456240658773994350865596498454154991883699218368604475173834985657275975908620474089305230670921518592231403386
+7351062162946891390363227270397968233004651810177775309863584286429947693132180002624305405957468154601633114090431896806560396
+8578733043161456354664012245929168398575757646163138337526746639222181428391936995137008559247216584486677942670927998985802859
+9200314360845834380351667184778736242928721806415925103242410837162869501355174790557366226463713207146043374288777068201363073
+1884840380691470035098733943006470724355475360919052895346183170077857886208887006329282319454011758272954888828936243319780379
+5906121108044999002595816055500975401842454091232971454535066145382445630442880279299409925299375855072691591936952415415855608
+7427547736672177870270669416923472904176994726042270600865769556468182342137641250127961474267696372215125069986572926580684930
+1283565631209283359581543095011894542058022145233771315616803743285668523226044837411757706026740916352039927306329889089649349
+4270078841384513763036784211367232205576108266657423596077336951308763566593324577257390215814671195914760219863020884678789417
+1094797252284852472558752948074017934025826602284347674097641546447667688812462875419412834529814608042996511263599028929742238
+1967645060681138182820884931078366878249535027007771792225806188604957386423876036386080705880427884926800392921951044407013636
+3181566611581199324907272529442720663293855144200609139564151757908337725071341353176155541142076746946246524270499526229012582
+6539374062743440091085243475167651698361455560983223707251591133463685518000037795208788191244350973724875956194617703899137414
+1430821502040369247348912270128694893351423782952149316135243013570919313886614565161358637079094402119428463930234964822013013
+2907845492061431274313604396416192334514224786448855288597321564420931438182778758210128537309848899766746069430202195659612336
+4975634130177816916191624410591783555638901610254745557743055701024321622685828565315892206810167787457147305784539222040470909
+3426187794037654633853814952285180680406547839298481434679476618025289610702493051123252356926166123963245694601391065308079166
+1560694708414872555648575097110162943981198563540849019446854403562264846931619983425916923587136273462584821828465235074422917
+9261979271695865979574032703343588466946379682055875729180379739323087400969273393174411780309814669530363099378105348978942035
+6060070323917526453062047842877465074776912567111669196792162790002591482979059554932579116312700674668070694919873464603223754
+1894071532823340571620020715489409265478540234593867913381245139145940908648942949383027523114581382713294341230059675979933347
+0475001838386962980608799805753326787172142674741106499743819708928855603482127536974433291922816520616537305575646417283646800
+1407873654137191433607314317494815145886982224527312502679184216570574189580738684704012553837521804108283635888649341886347674
+0746298331021251518403002440748995086111379224255590828431961727677994867561042572035686044830391992128329363200090117946273786
+3394767633292754355096521352490384715569381533683416319072637548165685703657478638050012390155682264692286629389917053497837436
+4659095138863302858042866246863612004771584058240848977405503610643181773657781348444480569875240316081167661626347187543347285
+7911879124009359945066105568437670726515538210712672838972140937144499494198784053146413298370949806905102557089313540518536047
+2387001299041180490187017325756798839893484841126540625119691321202951445764540357103908077323391792392357443606419429134662703
+1311387664343269938420538390428981548672980222893983525849983661962674897972783374663857036358464131799985348402057774789061484
+8274461005931054626156020913275021215007841002783185917701579638808358640962009486666957046897388731341995785176631521816719220
+0104967747699292212229371707417874791998945791320492326714053322534677090261456035102963665329391198512545240166335302214953529
+6438295329258114463806507486440728873144766916788136148990852634546220929994618127547833759089567150425084541257262887419748944
+0763510822819190844430827630471119922358130707131670435790654181644862502449964467386506947657809851105256327118765427086936245
+2850131634530202363427136221800593088389014446941597649063703366121196898996686256705732620416208851855006823708510518951595042
+8751603030878422139220116631069675693727662503215348707642267571256820475012856064445690912370994140681017385311381651837184429
+8337808674514385942347760110022916345088925240957432454452424792146056100857933925448423669501901023480223134384961261737051238
+4413770733662528673309544847059059161282542697670213119975814848684886926540572546980353008826625285683672206383376561174283585
+2470179376522057019705141639334564346002921054122405868536589549939044185327352857788406922050956188186959812914331458433168181
+2179183768538040087965101925166314083741211822328135691819236749579736222030235331381929418960851621953749706426251383153679388
+6697638737127992949029219495456980219928837272379992149835670720157263752765848341694925460132961677719444757263352390287952092
+4093217437367696270862739890376907333913414784572650839225342564140670817115158483271922969611210426005659701735005263854191680
+0504868284114293941201391805305848644129473248052919285116546768968370400211720819698688057290313111673099410825833594935299522
+2193387285480585675810105037896679125123370546559641586098343943853768828725430307316784909701983568646060993578149869405653861
+2934591075689506327550526527978208181872636707486069235044785075612292358262482648814374144402086535106182407978781842722397427
+3764043018357659628728101790307107498150768318990432916850503907920600389618490690749145152636599605594698036095369786495988258
+6957155927715716313765479257750780421880426026172174055737331392383266819616843853222801559499877374057106670897236097150948636
+5427827682310804721340200045877249335498355065518235785095376215323629999016684789788057540796773407165234965827360566567682463
+0931247633662980846735922260231265500967979148521116776842985570907612389971711829938070907548905323760203422391349321697221760
+7882789193682587165711403864901445874796286061561018238012019307540878080647271091752229028944021330264150343818926048069144244
+3829234846305757977743751433953176195429230057570537421684266250781148509555390682508579644164157541082064669789683815095364787
+7604939164496265670478495045765555257915418238903189606069500034604107925625520169975834751123093859423683572718773062691097465
+9536565688839857043404968751102502068918401627692404156712144798677665827278179931457967293092502383995754188611043728483106278
+9597088053951878542145390264364113151329590157432302502341917977233379257169202042072712802096599668573120272798291944153363375
+7607153187541747861933137718609189822023639083176590969309128534131402001720049300131597786926920331444518080594310667529269598
+1927075329456693896562301483770530596686903351047943440879405951056391325510081534440975417269136288862213745763314617080452571
+4793088300460286258221203503876214260288694619740795021100096527276740956582412254816142704747725930689538001063488725674114094
+9964651944235263688993656306565044507502459642744800444126035956827838480470927964887269362894767336619648517065502062761621016
+6129875810846273188094595526245494198400294797450838878997940481886389039479255372079045644823922532826285987109316717080651452
+1158870497644577891842220310991400298247186591687353490986090963675370236688750155704648708257105452733670085922368068618952508
+3951586474153083065442516047977847063483146004542723388081748533379792081337808607910165722930346295608653437371334690508592931
+1348798137260798951844725481726752185101778730990513125012632961668430932041485231492712161518123487434868038690945449294611190
+6621726374054578571840509185550584952608718450715584685612358931363303426238432883301985179247942967408291991891183249754595852
+4638603540391846589823234253913403535906012903538328082937776681713183362324668976651509798060188640593955628086698902190682737
+1314136004568121579468174164410670114683609747309631647110337083615027244209788221757184880343776037559026360829925134683110860
+2743916110589248861852284646250771021137678508599837301158835778690463663553082493519868901155377573114305779992715972859595723
+2324106156194950900453760356879741607730365869344607490682695136931314492042609961479060353962654666877592314030242319785217157
+7037168535189901999950898708785124945709252827963059451445136357835564541820565609455192709322939082485154440865255543678569770
+9896528396971770400160528156211153078421941311469208430939294234515837583618887123400678449175339595403746664662044325400329517
+8261684885541466594581605303831216257932122772017718190045767780517645346911853652853978624682959833140344555022435113362676062
+7591075563360347900183625940068873872381827943795851765368024187038497412028598183964746465300474453614206176090307713158346489
+3374371123832409332000144159517441149498304308931146086397279524284139118811410468196667079250510555507523645907234786379143531
+0501327353064942573752656984727083020738199901757943687656464477159443799349546909245912076525128236088399431523118269843367482
+8613396151458427790408589367894556692924575676708650976493092298687011565830641071449135943255849354462437020422889320020232241
+9743887743932345248629409670762729564753828800124861494449000192569258881214737190612239921652995520457700328791744959299446113
+7181302058928852380763877100101757115044093853940723929209952955676211472249441292704903663335543383186649963257659728968301134
+0388255348661563721653151594456333702528830265445870529546222473972548233646402200780627751622560467191291529956825231887562559
+3526669851709736895997935055319638614407522325558293993145073133898821442020970359820377176459127571138998803488194418913023474
+8960318055715147737928173496291103297340011637615159200331936657806625012838282253984371770704650788787874077528191805071976481
+7124181681951361717176138891836878456339953961111533220751215226320942283255447821785246102801554680118941275936544271258524058
+6005709566240667298294089625210827175355499791073268532752944587487068732200218887976443970173147332812756704491687536620579417
+8523733324824779870890616722944885692254782796148238417811553337420218355790067774624307813310722411932853894530043351212104621
+4208314480849782328920489549263981924145677154566910149000272410262683233827903445768177081248117495913152923052663893776265183
+9942787773857699223811513925994334863462094677096830079955240744467436994912827703793978101340756041298804409547081408298801222
+9436460738640015479585458718857778968516432654013043215917075749663128588920464616671554576564466134592276012302780087016944245
+5682263919237157166619832653999221365676490237394196490562353201595416072759662040168607378605240879904649331264075658653944374
+3188760460625654041085468641256306887215807672289682883500357801180231951265973876967365453175824452139544361480252271534860563
+3489612971636788170285039991175495323686795856259626029428439316305263410995491370010061781397716962628385590075791887118786041
+5311327330508694662530309261695611418858308192623059112240071130884198746415297821301302430358551661316850076909001762997643991
+7081644935973288072050639441580584025029531691351232277986672643518925684337072256344249262810387549624475090299911463668556533
+2269997305729536278296569991307939885225827949212711278683260974334694618965859001446604029046584493463719653785353337281283459
+5669018591396191702482439366148219818778884802332484502882028894694251543216632761518648364549018220678109701293026473478656784
+5216611642715035439533559692613121139357309471021194983124318134640525984115565217254793009252347891534891058775512107043759248
+2075136627102497321632846769129196363043810766007725332614332304423370092169449259610020916402169233919813196199842388493441962
+5246508710864902175515674209765293421695856922741891032048768583212886538286815573096956696932708558353574597425799726517739782
+8036312671737074585001040104552777443725646270711497123342871845885341214930320018750607319709014145767035316932229927380726251
+0928548556204438876091471205246192546298228533150898999146677973522875037893164503792472130409496157160476844265385841682474739
+9233703771903675834839283547585483443926383504808637869079921199402511859863654798938168359018632590649252624952570683979540091
+1817221547279336881324191918747916105439761395909101897519754743532665651720607836479601826466707285601138161807075561528644357
+6507813758533570073431536118758351858756886547831285242021547001802317103965340085013359438004591048652288218222633904693766526
+5939230267672950104631374960137514687520839197558900123956846637455545802654473302741665702939840951606373658402834814254928601
+8899091999774572904211301414279903590789989799671058329810205159495566404297154849221520843334449344645035156970528552300030222
+6795649886498390391442973828383660673784035290138239807079635557460618362207456840361649348840778636144683493328779008559160150
+2312967328418841937893181097506584921132253955130661944022425054340098558673444397656011485902801524597729549862183491017801616
+8364392130149044788968141245875416756772094094121947877022476352773253705820364822300001844264751712000950605882778006252697459
+3173455702957684349309232875767407323242741753471239292204928826580888927330167241766284958168551480352850879501139241966892452
+3677753858072439789438100033278254013052115660199724677408997086225534466921024361672151595117485386004966423349406051295735713
+1033555069901179500855772626876468463729168610634688507726870943003645664213844575844814874933857419440136881531279514876328051
+6902431911053955232595350941009434993084829394137562877137241909400659809326832785642273291709998822359902244140526746390924526
+3598394230231172238038637497155035177663453584383356974229908339909881383831792443286626244348781344679035766390554002582686748
+1986522033280153369322100953745103819643767567342601672718065640720320991063977205827436045236651592119137181084201370425284749
+6005671239600468501156161076186950720461257574394357624099400895752471978287422522141370855745760936595412914180235254380961690
+1248432656688783102677099988123915947205672369413239452092262942922895352363751338938332396260328925306803441684111264080959934
+7043361968005295354938534781857472787124249512274641194624952254981027355960086055922235901916884500390183949326239914435749876
+5900769760705257904732141569222453308536443186947518812790214535222294555869866712002026766787105689583023017833746154510155688
+5602689240796761919744677404697558271913792067417789140292202440216539736230658588620970781000844620550456371994946471279052637
+6983815257060123566373254198705908764725007305820906210985164414734561111049679088421536404461082246253221142258100082860407483
+9787291977224975917546280204714841440857941451156318425600052380180319358748436390813045531423344721155836168161085909646309385
+4242317405737007113338681399774018133792533519976132559943781717607228562711266632582303687475696334211416518106220430942562440
+8001103370755032373531777436355301854609759653124445242732075706459884158212645376386153155459030396899392086527430085304137547
+7061352207839212087427452963168038388774060848015551117972221521512460122751953993512403134647980990954916284061921026824432536
+2639034110356917513777636397443311536328136804898636889890450733741495575783711662670202058347655591164148410498512181752116112
+8649347704311634713230582416874077536749261618798919119607870454970552954421518115988625118329175121493449500857931770229652333
+7998158841528743978260913418602919615786831528127648656825638874370061930628233997562266898051264651939263641927874506380487439
+1169319905978231587648398211672101766334393172127691275996797499245406750863796639040056909542250284633880406494091612313210866
+0317572128063301907416088057966656497607301508200217804677889135103287897506118599601843251561058377858126583470533794642274814
+4690147674695890988264540020570125563698789420115878750835681272646540842126992805764557197985389253255527910197264650144295636
+5798557941192958990661384529989091262630978788566879170732007097819131006336590152363030155153413704404260928053167322809868601
+6850987001199817141644762090308087270676753863496477045191783385382914059759989907264265980509298271071343239640773196627310409
+4389027546704283892663222266104915372633460042956234973983464977451929104395584092104280081159181521725125037452942372440981206
+6675905477554320026243055974304148345728455542853879050278442548087322107774875373656985055242105650999387599625064478196226162
+5421451962648003632206646262643905337837657920982111146977004270602922886008501562566012949545116457517171981566495094457953170
+2653749527617823956383177123455781619052217065408026747322738616321944929384445431993242259268884094539560852964142946672208945
+8593461023191475746268918563613277494098559522521079968069246435865433845367704112809898386514701303501214965468624316127309978
+1864190494247307693037266993358200097794635502447995520938928657994547718890764619887745240985736437934807473704761456024575292
+4959121097171972205063831718099245216438006228886790229146916547085014590026042332430672777678300137100806650898573540666242384
+3655898393459642632004541036291612193425851747783279795401104056847304510228417238922574433467131806129145867390315264166063875
+3665579208506648402815517926487551967245716952452342336509872884242496327353828450388024010049265610889985970803926589219237453
+1676400095916770050334175293677803863116549153471866784271105726012628596876429530293900006500470621643237024986843048814960581
+6303887230138382981362522022235864197895867379102358980372057655831897690287262572451017096062107356032913949946624176978299116
+5005151176823509060156202781958197462286719252108370751542425598689093613819219880986961622340717811406826396835254749852492414
+9810879199072089316354376552239141698257935918222963398002559226752773027118660428719265494441568442234264661966547139854597318
+7873099218250455002270603753696336287379126088262705830929170584620542532170428705348694262962278699570554235741942919271113853
+0853097378201921331418681617335834926523454159799372408812168044016229123296540289846574743942294543985242874224122532498334672
+1490594866688679908867416614545427520723745911612132408696699789261886952468259502210832466240663473598353736119026236378375966
+7870513434223037902717553793135590258545562641705185546860782749440609431080399391577848963291799745623426666134231053217546405
+9446201870461219368892707181895875357863356844636097852807754420432074309846001997057609966109454410826649254380546761753175861
+2761057480832813584246237846523502525922933474798627724801784019360724008460215340269094831023982649184534291701279975122991786
+6747259709148196213568727070749193520741364779274424639307959421349714799461578583982498969579857164144199424813392167578660320
+2903178417498559526330742642780679790900780361831699904848420604973586382034364851787093357442413598696765925470890327590522104
+1850819839601928427102795504066478105300817488452603819717168073205087377109510653761519361878295067555599575161123548496116519
+4527800014440544203257680309603709183834604758224679743597378438522340853371773245388147497516647805604078269186299047096706230
+6498133304861002880698895980139890714606455707071690798907848409609045542981039802321508092873754941535671659985239738644320953
+5988405032666743320254142929561597654494413403431947291535930103688912359712380841156852022207805099821357330225186728532082090
+5547768444839618341918220237864475011631317876613320699268333350020360283617553420136149953194413589978795210753934389762807735
+1597329107893662665482951708145282526843200385584016605115945831916977370397498490572333755725067314085934032787782477551454989
+8425608912417288932359069001529317862434139520899814966998471303722622773872512411876898983545914085663888123444680470167948505
+0434379133165396213883414761877309648582182115178764180968488658223225128338783723464562383576437566308911246233632408447704048
+9663996367177301008227471941256368607999821009483324708241288407336982656214907935931597532047696000543001055538357367423684843
+1080054249718909513852149584485289714580193379500564799748250805755830508642143351393106365614646908548224506838553676335276275
+3599779694595660288226660287150289204263669082115248096828431008225170485272045909181946378454893228880239576553739907190878426
+5885850036699891408378122906193395367309415591691241926759692588330412581784093438940668271882079466692153184239937668982303474
+7878175454828248795271539884473981581982185106585811627218428403581816331240364769920118073711196193240357920319448764087086718
+9383157433735677366088538314691739001878394272868474296524756761536638899101995873845026009993980779305151574599223381548532836
+3668859832227797331952981131294963911962283005597571432352599223356213488863688452877543275627906341710804574808946808990599277
+4561238331796792049632393877616772107198692076748218412457533127281687506143050581347703755397549089646358464889763941628738646
+4287040673613995225940479030356811166110299081667864088662964809883579567473005653984288637714354335572597312336813053771357145
+7067167172790181728147512916597493867072803164173683458648511730308061884633961295638170464699169569357249648229427546009552241
+2411562579887913980455816507682929933659712945876292627871263596090842188654178242939374681016381916432972311121058175582055725
+4171582020877122298082911042822107332503076877376941726903575210668249614607891518640837866322224789915987615341840992350582413
+4400620040237405249285698955673350511161843009038833792839643496604322064832266848854377214512824709405806535993728236489108631
+0795420398459113177519012283723869747981824916722015034363766243369266801152099213940570568038081676315926730528271844090048984
+8736235449371678977947912073661875499227319547901313273871106645387069884378420956151320072268281471236296252518071417869812398
+7190598905022008877003332225740349664805580192380729307470319849086922459614014566654582713365646665851557294353631593510036953
+6381552204220558217529826167930690334372579521383903206328505035888174852614555542283456959315756641772011982607288085297853686
+1349874783384878827773365548625629981523061054390679273761674753812182403462337719746346989770142792526923785272095298042279054
+8890444037528702976987014556298735324481383261103576223990679497009263015064472090831542516594399577027449370238294863246623636
+0336415324118608522678012840335823229090847361254516690870558705257294993006716462941193893800422308988102399798523789694443112
+1923359529945753787122624465725573807149022119989195390997561541611804328914617110055244794800371476974622186846094996027068986
+6556505900937451676724626863029277508817962303859724405355623034880805936586542708527460464895044273023827975806326940478307069
+8592969583414428893231495897818982129258755657382413367672348099201190652878055544751096757376276397486791497622706985221853529
+2908214067134856191896613437551307015999440525676444599333628882928075642102806483213033250837448355509306721853006604031173677
+5140214739575524129341946985893116412008106149871779041808900801409064849278864166852383463573647719274024968463791254976359299
+8847571119606652336355242986018768524604507411735194803338041421026584303361841828532589747052208612636774062068296366532983021
+8655354613872561646045351810915955927958378666435016019460717328781560793954138282423423334855186987151419088975164710160358441
+0049260799204162100696414303845623303274803491195157588921793903647526766706979672202295037308810197036167390246126788340972486
+6425819895447745350399433314412535917516434906996482513931003678441923085763619185652238830813722611071936854791527455947241273
+1522067822697883751451720158852174772439898925807262503934468921130385503850561421474472046621939053613032754307326343494446468
+0373529669975958588899685583408106767873002561071952257411549791159364132364256139331134266337194556486549929770686277721381623
+8699593258141567800940600698126100601323395696274203924322395263563919165964829715731584976772134953809087705318959395613991572
+4912970610760196588068419702343479920035578132234944550622679160245214714573304402887577273891607583288099465093463035431694610
+3905758432785910691737893861264914959634002377051354781210095863851654985098474884630562136246052330525659496807184083910344772
+6004796506916845030772132724200525430268203485146341239363234592583508467825890468047631822102162429469995405739029446103026786
+2936254882880449606977442748506803270167246097479977977827447584435796513203817330397221813580364844509174311882193765156654656
+6587840516915974691152625347076034414185867253449830309514472874859872212804040804281552578684775759016088925401886242253588410
+2136162082678649695650433358835719979490577896244051036608023014229544782516370023231616157535453095718156293168346470255374077
+7531511647981041419067438947595659704304601529630424537788677553031920743289991068705064547597248153946867352942473723492529159
+0056165493810107660174271077633956520600765977621759777545425851195592595759244720831020706108951012298629188421930844092200174
+6642191140454110070088900972029229475358599582028206307088525106506003848087788102905904900131739063517620939825620312143365317
+0312737363283798477941966380713988316123472457978241774897278441026567305606285826664686434652740990763564567342068867452842418
+0562084816143782025599524978888894444210155619376771675521151554796594041637061218094181094152665322539245369886205219847245940
+0029405789079825038952711651290857359659229927344229997950428696846444420150303484487905236128836752670607196713086924265912777
+9562937968844743614454574043893713056224816312429825464738549426759328345347674841205841958347360767579803402491577142236137115
+0533906692397009484027899629862953135204910641799594877569760336943034406380230261140675352675702660262675371335224685084951739
+1782949915965578201764231201307179274400901440982114344774078855036237671988151622145580473895458193522528339933303018706591388
+2624100076711766326191346479084275280944607050965314374143191066314104835834695035041295363869510686680641979042639548470149337
+7092183008459177550878010123635992307868170928762105253223870251579666192277376903965022436031647547645865700232025464698571152
+3958091554628717576397311569044621708700856680671753736603162545139430701751294444844592994780440200375396353670083705904818899
+1158314027781793782715830446196630725174972102720930236759032571130842037840584037988906905557214975416804249578167992887315936
+9206031432141826113994005343808438088835006886050009647865275969654889753018433197685269199002634601456210696285807629459472336
+4978328489062061200804108082671938204870858983057488740461332416429168822452529945581949038775475758752323372301506063733079805
+7738055653647518591404108351211994677622659177154884456890162864455435902069510745121823508583748140331565330826498449431014143
+0674653178829590152076432119041481195951363053106794226287750227106636545367810520707295978843237959311321898828560534345440055
+8038620990007430479290370430002421271720574168054663731040351369363896772189503927548376910184417619479114290519008175905383545
+7118330213438952390733597389988833345665275766596109498963112726494459652684601428898616858980054673653547857404417055361966561
+1587037091185968630608431240360245295772438686943763646925036642543820946055469856983284464996007864493360253900748905383563580
+8745104358873817076497065734218673552778861792932465886098953358042048623712145278501699290745480384052380874247143800362538370
+6251997645750683187872814541336341689788360883547457593458471177846675162375769376759272289262293759496680413378317765946726569
+9307054144320271279835934039640502070988256340708987512314880763049398513262419383032058404111149286657762258132166819869740391
+6208679111601546062938461491996426928719837110414091479969117767614499297075986816870114797028327349760763930021316392342344670
+6195338739848107103644806413130142942032473433624064988762100818410644021199176248704887358790343589713845228788844183335779186
+1206612776301905227273380391656909985775786692526546380296204581461396277505352115889617471623174433491331255641939009226704644
+2188221413330256108594133828534885890151834345250541767462459786862391647167810214086311680548340646481922395107065550293841987
+0422053725280997492804556037165046616311376881740818579026242231815216233417949738101116086586716392810175144442461269235250030
+1446402688506317648015492449267953446562377233978895904366659114613140191253374875252211719488638375761957759777329556920444079
+4742234209552120961058674900214350131325585573620862943651827639544267432934381233345762116672659741592229252195548093031985971
+2686838533752676886446680927399440863720061868372851834815109578907201299828776117754439315722227995606329153759209194448678185
+3375830903591078788002755338696975595441586005976260188707036346541857769978992173498220429575524475532930877665817876092460756
+9351987353933462923395374235495972847763917223789357531623204700947268441087397398182190787387926517802157283116535834305980686
+9492332135897364643664989358260446062172464533880475533980243165095186005367740562491795933632109829107385087893207785894397713
+6433768862702582156901779207532027093153001807004150434114821705300991777142257598550961217676112326241485864463713890885328141
+4370423630135664116118217486548726531069411489498186055038679029605744527511210064431632487827249384739496221986798075711280160
+4424010886610887880437216748921409021429656729228727372446155715321241952848523185619209556774687672654909818027324033748491821
+5647085557243826965464774431484515106691575517669395491646712200606275072075247550415886971532904779039992053369051837694948246
+4648536696394853995288135284563546131345084094639405448329957974626886591260968153163248670156108903690012016896947562864068947
+9335817025706673645248672808655206936988229988506868855512246059364735571373658692183981236508753893624162179393300884572562525
+8454550045708811850843967602772364889207411447386933113146884803720821905371224276398839301167373376393299604166530531671536817
+9469613971479940226446065344175803391558840869442680476409858979317446638566865770776832153252927434674599753345041690804354354
+6652209314699751202444785726308628207785053079762876873537555813669271605409315256570040001991644970781331622466129179499281915
+1961444894849498696928429106294385830964606511500699941607840002024216695044414216800293243595307021832292431154543081449089313
+1962091622249577961316459709116638715944104552499484128514903058588880092425282180366103208523455810521574844650965568635887113
+4368421159409460609897114428104781398719260897374658539676968461604386468189383954460163078825080336107872167576349496495408685
+9649536539795842583228826048018046721092374785553431643665884938389496673231436870435149786802809160883735413992798925929876704
+5235671264707293479931013726706891341489539237837731840177933783526465474894432047982015526419973235553573918270319559547403086
+4039735888376366609018757028506161014783678583356813250677778613982578318008203758267120384291005999279443777316382864592311739
+1217739163779382661260606469702245656794710548611797988738048091846590739807732824364552075368990683393959928284317293320069867
+4916615035875154768600732328677330949063202236875210951540534956404960395079564144372822026855682749788976197007630147709880516
+6877745432713411450666647170018266444463633969867263093231179811756276204043142296040101066040921365338143870829243201412736978
+5181332217031028793650384590762724542630876907198977592730043310368021901782721530053394250577461993296684728562642042745578204
+8059743569954838104598948856222744875810352375978155248926213114786009876969666524615446586588275065587752809296977777941299366
+4960623850950107986976011274245247425368704858396317272530283837294761704449561833295704741998045363670811422098828233894939307
+3391941685834457637274247913999521308752675840541536848418544996656831007389255133631777457133457716285009673478699826403200309
+4519130151833287959851246691876615538787874185186936205145712978930546123861640155395430711723899715676633532061887829247109590
+1676546877970973940392277995447472865522499015178996256227821980732651914936762181112328377073844485649563827098289006561421904
+4935465846415256812459944886042442740776629289289624483798607070666905637221701286036356829140962976615020452048228461943046845
+5324252244416512745242538847575585469682159371913734134263569496276780441518422322618507872746192259540742513974372774167973337
+4061947105362693262133270759088934938816594942342421443896871674922874493598103930292152723174036554995062078161445343075609331
+2764956618470182052214734830103729160245043907968784028181813618886443201986039333396356809943270121754709713915646568740151206
+3370863211220134665256513439944166456784396566762502427753466744044215577692010267595936563128872570057590311781066772952724628
+1434093271982951335221748052776429614044261679575670437872151960576974124250079774604982905427771724749469647670243244251475834
+1955236107353798168181042526280355939682930522521300010742221556820749544725933966041624888393993154502962490618839145486969576
+6290416028546495661266540757687391083370341491184427521635724821327522535027514382783824919995740288516481937621675853899158115
+1271233716574270260984632585239413670925887252984501086126979534236923438493445631129740540692858583194337904806381657298903618
+3300535021488010384891010505876121956740827701335944021678777354223576529240510607458801670448052514469687591418109583216371899
+3485417441989301906542262637698405742722722240100485896839477201597733807155335120248775000837222824525999750714790729423644465
+3411348746879651113262757268624543364109755847832677598538228869268434533167862688737780726486206863057323257234642767012961381
+2165814758833781311422742619981746792464126525574786109619341095871177233773859607236931880493129178559812250332066463408514532
+7726034975123054527871123751165334996022991283473243555448093241244802428165706217812562663617393968824053366244173854470750856
+6095264928940472527983481330401867205683258753243162756860090551147348417813873221392674935402798968661528287131244490650915944
+4846998428123345187768488062434480479219313046695253889842680691405315693254169660178067961065703759896641710892485894972873800
+1685615608144031413476448920807056587474093195656920132969415782126007882727463216577625078022336565533036012495150175153154793
+3655761747568001155088833871531145294046756206587264284578974630056937095900549928662096625015556765632408742933996850251895951
+0111954704076325038375601656210245491836721039674987643056715722213989286056097567862156918863302428121309646750177612394901330
+8415584072851574023474900634488379027144152280913594573298990276864512420566377677406310761330579752357658832083046689763512425
+5360991991088493887837058948075647761797269956784924198250160336333432026534756149206974204145691725795668303825556473066440146
+6308534942697410882776557732300657800112150355078878291669302663342797528117730903433654703116183867380240849386640798032108726
+1472159005438778436757327262797064431019220263757862409221343714482887707767271424863105342534371712556647665588514796238299461
+7911386503568215258552458522450938485043355503569972624134133652411157539448177529209200030556438822689089819514432813580599189
+2365679543813190286281972504483805742897733392239676734466218958339246807222637911353738424980809257547217933600526785327528737
+8206666715147505843269892459203855284050942439891047557154055608815102510800979065603928242478158845237310517156379667384978425
+8564365639950704666389094627317673103441553979461958229265682055180735168285879029143428791049454750378104825426147990982959332
+4829102499976584107337249497306375535937865662615510579219221293219668812136853030161705938471830225621587949094705819774556069
+5123783679768692703321434015951275136482214434898378095577232958805557078721200098045359198446613744587543829867662788092598136
+6929950567989350660377223378484336709625123004431484409297585830087971734242391343301362221372782329683381841402343240854937627
+3027430314645534840941417243615965839776590781088050407903488696621208213787375420065466391992905505392720776395628578270203968
+5561557545896908531566696290176040220677116087315281719465429326728445015278079287297460019260738872427151255654689514071849986
+1828538379287013993210377215462458395873947138158932974395044262987261065763556796656318930386507150893214229366028840942649836
+2063121041445493166725834460800448260568700963104181570946402318291105228818528098805135391601388005156357001178185451101272800
+3370800872347836800855502143109732296211615709327616533336180819117537969874343031967516246129400847851680499950308763513532698
+2261251707986576560067694894090522658489287994163408241552992222074332750687259975120713193581210288235466997453538082950570613
+5547333609592722700682015971929817349283991994515812388316385424977175852402318951978198762120074865379726347089860459367729850
+0402544338102912384265553136946539662518389179790301064640333604344279296879018653656722109731114774692564467347146643170192535
+8993673525857276993127971955065805434826324155448624528360859774191561165506877746667502530039089420897916681025323026574636061
+3901599392791219781553830625484740571991825540511807354859441733493239937466053566374517381465227962291796387571020809725382544
+7574422026948740113868646418886560822423385797395522913481336942061412395775696211559412859927044430059903817069457531153931671
+3666927872751409403909634814246127285265889024700225210198280286825210509773750861772507551910169158603017385059974490577083038
+6432266277247351230987806521470687675699096976848067098507903096237956371518053276015484587153777797643144785970196659271124201
+8805175031746648720776866745620376390338985825396413633102505797368825729966186841638401277578013322523402620704692665720430906
+8623786671348700175861755678175427019767971457395145977447813890266721740858466375677681653108760786751356531141090929913781526
+3195648380237469630693855838585465684458789117617495694729011729035913248141836338293691788762707190185659273515849140203833275
+0597402941284234251455344083137079916499435796408338558567042346638713911874856299057564768580158647502818908352952487514100356
+0970868650564875484386825809898953941148685658470222784359891344183429634142985332602653810091182805015332286021467238333362385
+4744217325804259157671625823323830396696824326946849733799160663706608011805733632306227156863544912264884279245494044730337851
+0084125575216079610672037870038502647338343776533232876650551512543864312081271558094734273891229896844012952524148474639077490
+3953838752044271045872553760612072547541462596253868540540395181295139378941954659771594736894686221229277026890071243182491089
+1570455075037097901528554345355410026197839647129067342374536771901052967778273115724862482455356615889491970844930623438114267
+1113425143150646440502818701009316634243943336310155606852136330886016200376990719743484314150050963993583980070237708157561869
+2850497678307680310432965409960545878246397108725852340253836659713228648432015357639072103145170515437738478376685162370275788
+3326664187179079200022042294919767104163644624649594061308737509813605056856101998334843842071022724849290393928923994480353310
+5498899160503467457596940573659595416916940383633806231810327042150722695852999362605105557507669885448657908253818192962915295
+7340742801283937313388827545354690848045358633204829321755059875964474925792234042792682433581007092726558257928146358188938017
+3788737611929951605093399738060446796551970972956586328702617346062935531918635358396384018139217900704517134300111877098173771
+6556088236400468643295262663772005261144129747959817416429151644418457406109514416151746327186627985567345268051259611187659664
+9265455725916581745797982714801820234080260053210177213938914050671185571980281286595729366143889579286214314682943150406601728
+0316466611292764222191535471075816173597528297677167091929792260801201488249926367457821134968651224754973624583045814966898991
+7240870813182642979734405654373311183972717838426383954790596720674570866884378092938010438980361304392635321123093916926377699
+1098769261784660364965755629864526449156402293650490776352458745073647855811975287018649518441512140869999035534937655163547223
+7318570673563180482204840468935262794048795191854962451038993504158655689641517360974735911839513301305317748540458018312631163
+0444738341332226086089060414609016104084271113844087095538006211914540457624942221411569773470678982159365460154412977671269730
+7214452687225977763650799051005862709711542484791447215218763058978813997928801482608042879518784727437915756166238817248827266
+6180378877242192988083619217841832407955378736448569454941330027911152317402955093457538120111385592095583433817050629741079340
+5629107620334905196700840557766414405147144002648539402508824797133924214385476958587576623195377053042403089302692454844253984
+3318554062977863170044352262420619308431178765567333623647941692615442475752129139395428889369180754179899164103774056228855177
+1724684496632837895268448877487345538070342201067523252247951553639414362390924781555578381060846820725528271757795755177666280
+3668536899528123873671104403554809934477255454000919778770432207141030247047304569687086172422809626838419879927821205317757198
+4281376208790055629568334266876725167967493231201019877577819781783383068774238210201096426961674885308966481435486534817275888
+7577712459257967273487604669410934219901389126865013214764147583539515778668315529487762810385482472159142915583111160208903283
+2092476036780853093515438486821087167147843243339127524062892009959789660882873649427006559335981769826686296878365166850602867
+3343172251567689761041900651298644580155321777412234282871319882978374041565615637937824367712999898962026386244164131814440583
+2523107617535787966332348997625949033914601433430397210697903069041012073594953603672415272693571514416319482962732360550203007
+2354311337820780136418582226046355285087018441007811818178174630131348892691010862349686382003869512529793089372921566890105315
+1170999065500729991421364651545352790769082161371433138736113416719659099975772914182032395782369105406892855739430280792570755
+1474708015575641879072739292610329996968899496702225715923818519908679748009454327877467225863186123383312506444593821059541320
+2519230317068471671990663024614062738285094805102560284217361596105049865919692357067522503590280759438003713619649669926160819
+8477593117311192072667283113407927363527106554972169624278711433088640030184820529565097341512033077210672824164404101920707697
+5928625658638382607550288328629457639763193426953494665267869864411489469568811023649446369996193687172148618677078694284120641
+1646459774821145583534736023501469753322215654392655710781868598002276354678420510784519315703507997622744075405271188494799548
+5604976454282399594837769165955324714117059445288436250408738807427315530171196984735484375626981702836635871509821590209332491
+1535805646302302016352504827863133089568000814854822798689081283591430708834238105002833054643250911507660006657799194089124227
+5554971708100609197716368094861383459498089313293558900360605415466184945588159656825590482066432370186681671169454435798038380
+3849073431364569441656271420494005561747519609440641325324675204133825604638188550112139476449622000662627992498117594394096623
+4191048491581987672722516757004987334900086209495744999112552193520096404679809481469054957100693375905822779214877756331765654
+3967826927260531495518865955487463010124395050606347758705435971911583515293152693887305102817702226005465633434328368776552721
+0431488077940753541035965504802229919911746684489825460131664577839381215244988219702491643455403072485117531612606199932108314
+9410075360076281631174487118204030545727872004911310355915647215932318325233997786962419782803117783722823043531791703707719546
+9979899286512850189031098302495325193753351855488331350658951722090011555997930787556662797780665452620638874492236108755984250
+0652520709290586245394513350104966676213533639227604453023649959625928591554435452582297988094318689720723128469217871904823318
+5154138924950867908591044177967760020371009497593629645137446770819235001454567589699623753759581616298742234368099793781827967
+3473470305718567484348272233839660441345062709145235638650446308235096448960992127705010353860654270452060145032963280540290644
+0926811026419214969150491345419181845874142492157134486078145329290631845342202476471135442659122079092431512088292118497802805
+9354612782399796245605885928858715130206027789349453872862552261402417530015360315458931199778666063128483794096976323329377872
+9050549362931470711847062862659110650055274307045585443522892077774880073956334195774718662309192081402741882514069042809280212
+3388599022582995822369209018970901943500870352576118339149315315976479926966165136544818295802570738444044829469770910136539354
+6564372944547448237407512632251508379320872549342100765184348768929229061655816110427490635344170087149155652249787176557737086
+9304726910793034348084164624446844756267779275838929154374342302538079381563499255177774157465080422281305646532991405754916981
+5079495135477953063596578815549589683659295982170939553637877137130071575921564130005951724009912627770427858856970687414583660
+6190459320672966822341653503087470382689354052580606552329874275327388332913948910878502521194902477705810238260537165258752153
+1741863988657791139389205030367955495311579034712194218460880036525975053623461402320730996642095747448443229185546281279794016
+4885628580837209961221029576497258511104739050257941549091025711288015307691459924906488083252587010968968824529177652581775801
+0763397108119317156892696282929270919177456927168774057189218655020688126030914415663313590555442617356391166888501048989509961
+5152773773826793584772678203560374056030587370542989568481592013810907285435722199937156448541686535030998055918516459522290076
+1305239048493423602262076973364789510528152271858803400583562336066393859447415629511735131940444974630579121650398527184965704
+6991327733592729480669828930382613428226140528036104065114673331048967012900401318314500711300298883332334369070527930012816139
+3452427216705740390119289172699570798671134046758624232397496740015824965414235594660630239994200610360038450127723765597890208
+5175730522105055786800808015853823181610779386663930878893825884556056314059074930365519187914921351319328315180621551748091601
+5714910102916106131414571159732353736678835156815504392107562506650484480968671954066774178137781734638792008562430877641109527
+5369362810620715036409904025968522864824364325482506902964133711312038294053559282742499233287959154156854383883148516152426070
+0230923585180985083743915234845529953134912525464096240500757424789301872897111680226897303301395426146920411464973830228585960
+2828878183082532630135919486366960583430058092282156338048743819662184574743797715878229822611358535700802659064501248149009579
+8877808967697355352896283886616902601338873980280498803907441157295597934158728665206373488691687917104704283343745205639622462
+3315755549989540644308207351384163575736340700335343877848915517455194885659684732058284726257857232622941934453881121004726782
+3002928241602670019659934407449689182082678896433504272332382719662522606641231869982252041696766531509399818750721950486163498
+7932472000788041651204426873094409270765907861252426634561030946897515784875744395710037381070458145660220907030271894709835605
+0606375828713960156150750275120802286593052131450659403286977242629895839703700510410871815684746087294738637398861554742127265
+0927164114710800842124744207418934599056137681039495980981311410777428870205405129624149605463522859752503128770836084491952252
+2931015631747347657009129018143774038849625686108045440606651923845534431071983109500879593401459457270781303275371634919948465
+0387570468949867854454498257661547651091256802128345749601432500529628510635061338338862610989893855279059054348321900538486115
+8602609964344200881430293688135456245345432239342905412584133371544661893209862399991442865006457440325878578391699643241518820
+0476780634258919055579958686158323045730786320160920071950074973087521728400869220442510810405620758553467843454120670874658001
+4611389884432116865691971525430161735365815156176932740053507703667082841676421694566703484160697073157865364859324160407900243
+7848340394578239725877088114075619051748487906575872632940285638137907126466280399912812673908953355586620975122613901023009092
+9989300098497815617534003740634757576144040056489564419015441642507944260710401355749819839918602861170379515547533183230261689
+2978159531889967729748526061427217809996789425967856884930963977509421860822261926488518659963801830737928324899351448743506636
+7739373703546853709971163541284486539624807396328266253157406157316793793115843617866707276779926556010088380028395990807722966
+5262595518780890084621315703653759393744008415536932695809891522083236025326969192829600448033930003810949789949558452866508165
+6709958307107045609075677759152351429582355756238261042407300818561928024091909129169346687529817528488405441096301840942497835
+7939846806218683995681953891663100594898796616302246789629809345268814966245162531052163166438108697094692065750286916247302592
+6376737923232528630569024819762238692074089057479592609265302063789788269041103846131589957468529143458603367428237467202691677
+1164704135075482622437354706246898083995113224930951841406301203169957259318901636559771075096487643893444519082342460614778341
+7571486167299822050740707597065176588093664070641995447134130614103674235649546121137008292829783010870775335672457433796269838
+0786000364088666248224822824647357946129181563136369891309362023665749511277214956791187825832905762312557124459238096857752088
+0224756578418586950260891776975306306690545499717256072289157907934175802791666439540405671709869057148319796761025632922961188
+4317800666800783644393485986576298736917563650897164304571720738720115271226750820847348337143207594067034889090129746637573061
+4992035733871695023603260755794332051946719932307664611429871720394241080075351265170984927835215008078524349098428854934511014
+7791275210894880460866040577708447085440157107534047266197077167838868317086743808903866856598023308194718747427381845326367182
+9440053603247145332820937897067937394376812799936768352012215925676355028026697201409962671443788824047418146714929473243964178
+4694097429621088759426437344831944205038778311615485599880533035443309753228841592516038076111818420993913946554412796041546011
+0591550477943256220239415601324460355602248522402154416815822080226505160015237485088369250676462054718340071691237191715854643
+3754782628510988470286589139121850755775569961153502324797466418949716647077195388880488321524207926209705534645689175931304390
+4293579894293631845176289384983754244067774813502510037057302019611329180738850594681778906215406264239719011424001198377631320
+9407877792875650325539404181214900230679005444970369243950847777718535539213759142124477926938032002586130641694624396314012506
+2378295522687601357905408069624354294555654221781438340067666919648970200524898545019520189688682193849864964964428853699551465
+7923565501350073769051751525297874085786148453411032926127268603914648170142127584914619282268063761170983684501064629044484389
+9840829700300902841805899697228329095218443610475399628627070805326825976451593789370050027841655892248443960659103428515769018
+7131899325280315528312838930296738263099442057104969325259438333829573217299432626262718217616786664813337230788868035555543551
+1613365891642882106953566519548821305418260262459032678151796367238313756913498686906585565640299870573937524634136703149075431
+9289249177275626622021358990349141206245802827466686634188302681734388914438573274476670571970132658340810522019108097685976679
+1999547679043388007539431538024419806104005321474063902499212939182657952169737390109212206767202350076020372910741798343053860
+0796380798378956338026387089364560910203624767639137927998294096484424294854533260048523991232484163916572752125119143647479084
+3312139471300109845789877486922941094495320192955690413961709171195278169767812527830359720778178037462244636938901054061989359
+6446495700380140348116004473224522745585963020017740642418321329101387653563805874445580561212083040164396327873544239022001568
+8221316129071405562026280838341093594207054207388991782744751735089766826502781865742057843922709134454840546015717044077633360
+8884079984504038495190808918953678045353356097676798230492279289061735280457857280913457619377057884683523850527395740839623992
+7553178237304616708890828475106185796221210507905405468874982714460646413397054645663825587287675092464040250385703334315092608
+4773590965589763472535194103574470410955536365729704648777555516672917330870335268784268577673152078292448804242825553568245947
+6215819528050303270969774851839361036143312160025453398613079612450766506304878967542263517886001609950018287965333798559597461
+2170641880151969257726247627112079520687196427192459411452224132231427774555020194976266757454256306589376845325708061001674166
+0808706168526831621497924679232450195651965661724083005213398910330404632324992737223126731122399064939390308377239660504899222
+3551818900906904056676616710573047283299775444456072812898768689067250392820375890588789819477340760813736549269624861064751893
+0906163675906901070688176210778473069828249578452605511950224714556564390138087101450788624170738723043479291100038259738176381
+8078282667536765535434830984808011662048300628237758542292327990288591220497965448597597894673766538440553768610799486540893085
+4239348796188542060619155351521608241401936444825596707153268722768490308653700045149495791462321531911996176024726025953987339
+4599085925561530429435581768120454911625188723603840101001827808010649207159239374191781479981311865586606666121770067310616172
+7104627786436327756821840719455701887978236563257187943017156401785911149438142292942970899875188032869983742209547431350943402
+3524068403178617373975067637980111980036408360680020858787573852832862969725456560160112278450433733839443039332972392923338691
+7361417128175114993261450629674608141894725708171510038678649037487846100911817687890240766440318417379790915067480509929873884
+4192563045095005960884279637612799513276543500165975164906153877957210268650229031342852943158004290795716146485254485943610979
+5527495850605424448537975358841328894172810067249914112763981461492106207569150714303562508512966364997576085520454249415595925
+7749567920199753428291369733514893066123672937987655345561072264405494064545300253825630928142777746597418333809686090132329222
+2347190729828800374979423249344630750463633445579902195914226451238506679798785890126552693482294276302768079721653123608475225
+0152265832264604743532240505688517479981918489770686750786602858928368893549157302414453807821089110756269039234757397043529808
+6533482130565176488100655388961819118126865617901005108218775489706817843329452026358354168685608881349897826461107138466301657
+1298673036456454794414764858082769061588499493558362877721489608505337579335664200621558841720543957496547716133300368539580407
+6422724558120550176442233652100893764139597343252110471726917934375351595018103999311490022927771281873120822851829841201522060
+8271532119297676915199374389042651216528118441258413260870365096855873207948565556782103615860771982841168346920959540519710060
+6184875439923588759440136066343058630113336838104030510817176224460276957688775424874821399346650313045479118572616668489003296
+2897490483936533080760701381789308980122333755911815060695347160990990030052801534871717538234667743972256918252210649169228903
+3655303333861985799802708736697214310308014845445976122762735834979387407451810326226050509201808567673064245381176975037733147
+9657194682720093768010430501297373816646166065617291768151706574173498067197264972548166688571305758669319121229890115185819057
+3103510865220902456203344829140970552995511866958564974902239021728149583173073409170941518663482580344763138822732758130711321
+2350688930344799523350604942490602629624759567547933020887009924743050812335493964555189623547661668513628841842940808414417517
+7886476590659571641831046458439879022628434419829165109717986460127979081642839919400368933401267954441646768446103515126565637
+1110171943300926097143589488105661141081024879644220948038639183302967863702059520939356184545779690411373217502283638534283105
+6427345179711846867068806487631152636131101160079927489950186169690439565446479010213897921064107507425078506360801250554414400
+9449471539328516576998441231176991412965843783160858329264144663894049487064693073174535162944480509103362252131259963289347661
+6448977729584408680822098278848838996541448014927561863895692613238880261580223887644439627676547583170203035028358611234118545
+5113424393568423046116537671317616837784363459294529414397028767453793820041115557136079295159075170242753593066820395440768961
+0357417280340583283641050541304196888459267811242609025317032935293813444330705702581551660482757892548218860632259447912758396
+8759325176891928932295819377731294216097307260061594553902071464538665097894582707057397147529275324299057601238957576630914051
+7741473646777114825234899359211272805439289189063644808522711602498268477174042815308766568204260129647306647359885729554656976
+9309329125552267123498982148765832181281490321112798033562587148057414223743472931562572470841497241968346307379573830843375864
+5689803719011022683494640589564528393539106647783122400405858218032186185463041208001667912281578057825422723357469418158669943
+4135592927602852287576618966571253116928765233133651892018881037343848794704599894714843595981667962009408311650894622157342917
+4255899203623494824224271003677968232634091967503097880844441755720576147137952557139636719564772738964156856519335241825543143
+3626415788714735175257556917344733999894086186508542273673131627361802049868502277018604195271807930087879067221107134172074310
+7958546281467926023449343568661101832138815620051349600621939712639392675220715111033777811540451328852498746778968470255323001
+5507407940398075053567751242109569783310327198481187906287038704370431459121242392319816826310134418784694594320070284603132253
+8500952612124145512973435903996934578404485074378319984371754538530064680891506823775364453662506914230333187130946894042814136
+0265665148790173017555028894292865406694173385138855281737615651927882128657965562089006870021634293021436977249028055567123606
+5915024874219893422458723773331806018064564044582475437209765195603359789772265483078502778595048000442697079452809908661825491
+9974005988977051807595272626225779862046223804794634926553502843630881070875123298869912614128545778960915871587536819171698115
+4134066090737503736509722416899089791584075227377094759873530554067748069082533106208531237181423743510501202120010884006504203
+2130661127717575197825945847274376219456565491166146558949366985214290031939401399735403160414646904595040915898139346351713694
+6324612167251656207707087624536097155449639896731425226748776831598133504224173609907231060039276944120772510687900080346884581
+6779168745096711200457711019042996058420593520557512225066879514823155886446534991145884583182566717602534510076749929656585763
+2645365584973687585388329644555202088022989110607367050144776537693714417352526613252012599647340542087230486009799844093446266
+3564846704113295525583758182164662009216216712683832484187612989237709031101278092921642250525269665257513687371728284688457875
+4269555170494408895577906466689197972679804550565920918614809933468304708581306933698168463484178291731316450813136298166976686
+7026547610376955852909877173580002842485362728362791349023862313373489864426541187364755041770087263084268647054320360965911322
+5647079585282992247752748756022346611926842984561046976951468976647765336240687959117772104657541464074764281634923169020133548
+6986017692163536989579104384975828200486159266813636401205178471888697579916647226641294586286142850042407781409124499578432265
+7557633520998487338874304841131912835862129914096167258884138035045133191763280844957441725806050932560746430226219247549692154
+2059549946818227720943211781526111003981250924876459433602235222747377311088585283118957625555745513105052583294040713888376552
+6312790236548842295363447664682859100743206688687480099078223631017589800121679494388116457487107923554186562511797306252062729
+9341961249268388400507893558690543848588537117611908256806356375473026278316829039260672100995233732139958201591529357001905122
+7622440629036046952745648171252074362090378664664601861125598525510174413032785951294400218362705244805632366004605852186841943
+5591402799903315324575404129541681549710964981665090508369906992078809669693743879553048600144250375936726479837822625004211533
+0078063724382242661885925388201522364426479724179540766386042648425409841158873221737967588237291116048440934261723138640261227
+7668975572438016377259095768317171394189060199749631603972553612209575383312005377253743770387375624576792404785414546299669225
+6702311775340274741303788836209727482858012234498189667215083952930215080983474097496335600683835003845218991908331419228161974
+5844861014709438146848025778890120727743982063500046236695299463240688553674143271469625051120980545361183599015488717404464199
+1417923931690244544999340897859985367002505948231379127672256195312588278402509195472407043750082438215262579893876014989408706
+0852865918577980935645894147403286685964996381094297648429648506192278067863183038777421574419694387317777907505729693297708412
+1477876485508630104652801640230580883493634454785840756974806839665717736338880683347432665781835143575902380330089255654038083
+1333574195103318490380293307280457872559202823396902837942959887393577658742570521479101307298105809134466724699237489092865507
+8231986011655928132234768712876079867027010505901813055232448036254614645338353115984374755578779894249199293331904818734171378
+5291198257745669262198453729172996916240029288161181812810389503650167962679364773038871747909175248874112616641407342566234542
+9827656930274121781454100476261391707245667711266140909114058056141317855910068833712824192869630959336254369672357008292856548
+5323877306540282063144065009953089367459505720096157841731259977506672262970125862602619551379971955654409939177527714243403057
+3533286954907536500237907021493132000340867715658050587581466366920687545465498963798769329374590369604149184427380755601882748
+2772451245387121398103687673837186367345979531432828052838695364605611707914643359500610696276887453665009271796449018655863587
+0698238146791660163022661497107232088142858713995181413650802098858185207125972232613318849001183174321522406825869523281989408
+8598554632732565974534400037249824032956321514858885348539735224820260572526802963756049116642833599682551125312131721936464816
+8777244479719589766354029439548567013317807112981262942768196141952117452742612964786718669561362298781178596889656657857438059
+5923903176580798552139931019374192553986137461354795191944498128759243022494357593594711086051327159717361960027267213667050902
+7713620888965717050672864796196500874403820011858648932283473719914877636081597753296264071668416201048071423687724652867885227
+1226026168424754948160701743250583052114587429759744035821120491264623002950973529144113414105707200986835221503669020815368719
+4301615723202468195623453039744894794833018107887889921748034816356630393443669846540007477652862272296203141137911353369865567
+3701305132741529846291547614776780687562767296077648285050793745319685122361946265802267010089656480989090754766793951985030256
+8873911333836369977427224870430320356503521006657767633627578973429639446804587551411591770027775298708856911679457385890346605
+1569544828599021231532143176442191013631066377985711192575263159095165119051577468547654466026788861257476052155683756383480477
+1570683253965182842006010673097287497172850525327662453055182206979693937570550092128731857505346441332074707878996538911947435
+7826422261424373910786428920393564290525228206911026303685173218951588837324122530045948404629473803092607834231045937648966971
+2638900097751822798368796230240210897707934867384226561665436456581464223307579261127638844885560109562036790807667670390644417
+4192581432555251427389363044896326951734847648428400345150360499669512737809145524003991223977279428592712065139442479960445332
+3942282183806384991949767715266661401310060486291440972343510267352817495541237489262806877081824812836064827724828303648923419
+9223072015234086234796090436383818568296143232241955872923081786551697504279591818923391084950971313678554302938168053766302337
+5040295146817500973605556893314901715843407186937767008367308307925199801486021624397893053770707845409279496052311813731054362
+1647014082822566848815080638989025226353949427396868720941862068805915405636344175116957293867502515550210403185422186297987101
+2299194118400856813156210708210682041625725297454205612569506042325388570654000072012600316753710747599029554756191357595113351
+9406123252615695607363852828573549803486496914881699175306276755265739836369938313041363024110056929623864023133434302918217876
+4012400092952627260881136088985623398889677549475347950880378929158923209470729028820934081657587476645444580153423943137551662
+7552074556799764537114289715930906335072549730926411552458159805302034148895295264056331531618830126090300007948842259905560480
+2034810936658458335936482208711459668407533754842615732173788255099444966005654249703291665433879743623245887203502319367176453
+2055826854912228554738248289886125490164761646368783638608966701408500405439745351176591154838568604792386814062201460103196028
+1704883259604470302949798965476058273811653448846315941108597287428362004683627667421915628743842382745845960365444382205614441
+8276093407998769926806805283999661528492618490261728950220171409852969042576745011296912080496971648424710213822281461166346433
+7954055459730823465679899905176049956104235683646988019468094197473567154076726095028250041409673376986848760985312614035795365
+3541288526820871183022785627606776202868249144458419432875958263707872906136295450220559956136362126175679096582857639739948725
+4938942457166622758688764402917253914836669353169972138509951712963418233559611193066044779423979184123891151058275415387004481
+0186693532983400032989768484986211599974215771878040648121115240600011282719832395142348174280309789242173034859607865458058836
+9693011226500711160574222437812022981161460007590617976243921827767353835606291414448435195278815539213466555449489307049996549
+9509118537609881549110785870137427018215479109414974529881125038407426313589072435487055670013225428915901526956102119247020213
+7469585110154725916486236087220807528982687428584047123899577899339622871539124688449741918490207266633825962457784296958609358
+2301098947514645707894405697878233655395086728296961354861714139621104988822145498752087551938260818588440041204929785479253335
+7195002791628422640170129886701270065601981205842819128758172220230767271007555891989535523140754390046908600193906165109046248
+2903714800754690075212414752414239844419261581404644710369810146988392192489474219249291646325601976712417376991598429990116224
+6657841194866308789835186691755481781807363317310203480516610021219245717136441915610841540149737012207330154276656421683007775
+6496393167312732418345038041143115847682160487308598451735321809667649213873941020106124895016322422646066096706495173559340273
+6190352286444996698010567042083025249630998980474746852300834243586692391358290885793710964591096599205367697354040455225748995
+3808084112830212575642888231806203048547309288414193348028410780142000603799742289999737003393558049032105240979729430950416734
+2055001806906934446231057752350125761310442613239626005937018173389749155377417284662314193484961591256165582045826903566815287
+1770910475516651085946142895420353886980271498962773028208448011256576219469415630937607816862320717646276543446021775437024856
+7317728070174544541281155663261784538153312462326658626789839195595942323601274570763560759947639040733318592217361764664122267
+5163497922629734181478583586735139172337995385407882365183581289857390438660661367597010604158349602523776584737697559311077546
+1232290524053006728473192557288773310853272463002083064021874545276391652038777534156787659533007696087737660972241935746823998
+4820797373925070252089423136204599368358477176708061478789645953897583587905165644362770501568086914083487441612509546270070041
+2710844937068669762717114936914428075765570984673461573362652998653398467217253506007120061287151708786386990808903587499291676
+1722239692416177387037629004556867021409013954231954955946248469232703827805268278720272112690685704443311442687874485358911812
+0696442461522918873003473056316397138103158503920758588244927506442635208935867088943853508413143951321019830428306333251201396
+5237490053651269730925587281174140512120043151663340911938612562084343250088788816613613533254540244890538135550921235569055235
+3652159735685467737870844804342436795620955533935479356452033442056822975104591188103222254197338188275216408256009062112739968
+7134994798879023357613115067249723046493042657115745023241318111461450746096281739377465898982050597074346498759749836646750845
+5435539953004427145646816313257688146440880667736243466005411373421754461366941715230523658976477672479751504847483760926576034
+1189232066364746161715297654667683387924489405288055983423309925216635045159783671997425077719999713937624968743960815866938439
+3458042402161473455431554634378956977066496820341904422146434258908727947177474383440746332129391825690966243498723403254667650
+8583588769346353411734495459871858141713721510897174001175951449320360912321580651780695549218819369972998610310409490019288172
+9334204527475060600189111850610268775609506754404225935699578359127242186303638934810994186504201384645847184324944047027889017
+9180203944559928543575350648779851174917364441299737433952437533215087774057147807226819191868491441590442039396662591808502513
+2164065534579878437699757090955883471447031879403082053258427608568820018565147466627486801491876503507730663614122066321703246
+1913587358432681308736116815399127159387589682764288441702400713256228014611237877207779478537639968530764623959147519370506561
+6235255735630858442517033591935698933960554844760005512206225607812740106611830794710056776637176558829867814913080368920324943
+5410646760661322485781048142156629014814968811323925705022272475371023640394527122828545405831491808608741154836760565505004928
+2033787078461763925201661733809116559798197426225447373091087213252755823492809148960852025727421510534412088471340160144342242
+4053406317407103820908867515275579307068390637321468991384194322089645112923727349244540751951979469134053290718220589958599078
+3285805403257089050405641613610899794397383496324785340103859171172319440876039603408630922409574370487373867533449326075083340
+2983815868763252323303322070522064853273357744420576029234853609842229699640881843769482230526051119476446187157115583149336835
+2361402646872012433986880843871560611945683230864891757700569780134284216871106221826645632387373922861192629580123373279881156
+3429998671996373176825887742582100895464377776504251588052739302345778540285554961799280437565093922440989079226166655301999596
+0886198944491737540229136497483278400920360475905860689648388002698383026711966163612310598810941558644533048630182341670726792
+3224790998309426141510868353814679975103849323867287287851298934668662832191399524482143116612939771691776186144211021701423317
+4793327096193585617231688937441621332297850907599875602232326960040073326201864681000919760060752937975322888247984232424151851
+0809471069558103959275275538388584472907830398322459954494433179596574461777867507710018713571052848608078849868820600263934936
+8295056327643509778568235977901421687599218957335038414287972297917509776356464814745628543893936365866982215021206066423916526
+0069175389099655621827463771703163016234772278712340002459468537149630573879420643113985870282366118625694647368265400040980694
+0185330675548785458492267177712810772887558224559469934081174511045410475070695699952516120170917198086628352522241811643698589
+3432240470257950810314775679834800845473620978487244838484905235351184086387166599707527028976915030731776500593580501517198631
+7221196580395629622683771151068414253703527355840765726766691589948635031125477445246126627685840897423930890628894585553998214
+0691851299476896761562326144030082656664005132402228246129440862040530711922127884942717942941321981606132599740710622690829340
+6387805954414104944165651355643971413515987568344486496225929165033526273702557885861628429072595508259134031569932407466556139
+1855370060311355098279801028503699206359780131940779590143641110125855998712927294283001777864930865688001454553164651367990176
+3395026397066375956526282504048669461521946610830298850923781230518236171386053536666469499692151678856847055919172630657325178
+3046849923385707165827109497171128710135811605592578271326373856764418443760349195924655728319788343802029428671675457416769456
+5261821042279220321036999746346900717107895012894353289951489320917708733388530368251182473743527841343292751660664418023250390
+8824252317744508579970406643025576979363288136493464811540150480851485119103480579103156985795448940762007262203877811330652870
+3204055616321408250954812676138625194951030184386810613892670161995606664768252471283913135456955545480933087872315934450481826
+0110599619290339021324056958678493559294456117665436489672772960474962839844256174658530179997209334133515553960451214172384426
+3123165163841681474367010429491835679876709672710839983993762107872490425945162980229932665274102783110995818120564672709048084
+2232035395926446390712487234338471590552947684994788621710474575654186707905435367680711475885293815543060949577152083169955046
+3350028292251658928286123588620947938740352179851517866242963626384508167950485172272074373493999323206780786225244298185666999
+4138239667749081340443940138823062129167164095346506708209137890234837357780622504863833649209158347489730999565991588612008781
+4664217286110698633018092758084011823559493288270590581425742146586929149871453186482768470820080489858199024057046533515257475
+1359038127174952081563588721035499113638671173404164924825530484539148472501653910385502837523160916070082537168043390775386612
+1436923728210391122200372504366645991744778858443244990595402772009992024820412617754275410349299293608939703285522116131987750
+7070475686255460177418547021473687579971194688396164244442299931146128832803904423667313289561781005593542663645306028982529133
+8234121263247251924212841508107137520536152642698580769661242285329043039771966387613256643214231439403217580461965950616775878
+5413104246474816660429811639531866004425878342745986000581091374331764631199000564830359002609727849512990017018293163945873976
+9271235506027321498393346844536657245544343198147802739604119444238511848559098921026630558834845589124777635275843923942487146
+6915026105020117228571904488841353205308577369931061433915716936274811913573096342546878245443525669417786920642396110509919680
+6739657651695868636149376334284237799146008295879768907577994879004415279621922483186516644311320818173589692203657526672858471
+9876510782436209693056682744986249105883882516043932138260023370268816469981968622627487020614107433825722570906101692145161092
+8947476576936475757290736092762279169953016586726757242391235235637432154172158901821960951603571049760362400377076037216546585
+2735502157822565784279289258228694712999190257163908804541511707522385665999422960150232894155188313507493238330302410605425296
+7940101946087505879550405973067848188833812225296523952905032878875050817047074123446017999571197850004230072472112763344801201
+6857142063692961406887982913011490273637829211932192499375592176104274764580285681098203860236999583984675192011342612589287803
+2211465020826460764614937570329924717346527293528447660776999654426823206473097384092520163892337570587601913303602876478051786
+5272016532080322083507311689593741698084734458418980219100525429302190098183573551213250917695957795596851135451614813138939428
+5194225250639639525068156399214932189538746207985167145356511964074580667075083175359149568969997574350520456153735083289658446
+1455560636188297319680331471565963722123437735473357325582592487841750254758281060767877781711667628353861132757458093517522296
+9590937580052253974622159164858580322392765535712215396895455529996073185392085906968002802221878982904887664044332656986715431
+9536212991471446618363328764237863492326635377747715439634427901843465449556160996406079848698687609807559175166455209276718369
+0962150554158891455114948237812845566152678283675857088563676954226626094608713709080121062121158536561703886898127526222898762
+8414892749163551177217490205399965970236826061221918459810953818518538232318451456451553658102845761329243527433596909757880804
+9825158812532083534774503272169600063323718458433952873310136391419269694767849055513012348666684447456130828029837154887287827
+4062509382360859964541627147185929761392475832974190883249337770970320052156457280268514718326951417528373787461693447362886601
+9802384514195519930363615938594105163103928246792737359775050266251933928460657553568168049147890604569802307087230082628479583
+5935332407364708394968146809867463424837289762388992341535259500067286459397511377634976747563308326968703921946360640378185893
+4569961338778055670213869684862788995924625160473819440389284613604453202763523485241482845106528449769880720371645531620509281
+4202560683681703431369153262516802980502196714639887848169937613326674387122996761898343353693436995583214395894151975156893071
+5332713363776927366695888962587179393484799105075109946348286416315933464459810857879632369155531524704654845441581407617245460
+1504145331569763505220832523847632508529957830567158287689592530569297300966404712183597770247546234814056520028432048220079902
+1149483717724666058290549158624685899733135096369862966589441778195807957291623190196664952975922610237417399523101511538417768
+0036082673459241242094083136368293175771615652653244493296672289353318399016588588663275146926170769838811055155231491519921092
+2671555423322348703897548437846131134228893160392027737396758641632859270434645917320325207654186499204544521705733245689882718
+2041837354468721403869880661989984614132154115011011100068745419042193490192096797533733270459341389726436281948139045659902298
+6287265676207191576589342058985373273830354712920659876843903556929428288343172794038913384089049546744993546672999661244015504
+7671119447680097893124176344032941210873441607294204020878536819662836852561652631058964593184756766213107639235733279668108014
+1503597944873319896726432783506968518844581130482208284211813252594573116879179483819354129815885419312761420721174077013349076
+2090575099698794920755209276799477214063322134870825766478922887601572992873375806104725864045048652936083491870937541080699093
+4276983494146036588052551210478424032928358829122542012906258904015903858342990969060460111480318597431250609578131562003677515
+9113189915457840484343399644582165727880755692052210886524470220995792925869536099894161015143779391596346691130912281801612173
+9319631208845800137369253760266414764140198516858735371828537522929558300406662683159046086394078157278265484925694452296859315
+8349237034176302850857262350204638637311808275176159745110236526981407472953488387189243977498778789698586980560479570319641349
+4582085067641332005668306046922050438876194786256238539902378554139808224133740244623740910175342259941720827473284689401445459
+7345697903120299815105938454414060402797077914470248272961589951135290709800128402376384567445478103311791196342258909767408438
+1687450542289596593441156541948105976556022804241843599203672068561696047317558154471118174352593930389361496742548511304322359
+6498489819476221747377877067530863799486747795199009866503783070729160667495759546595972752749803505545796148381282603736838562
+1116947692218975950285800049524721556053629253858269322416639882955425601685355611062823222776368062359326543474366782696365362
+1876190167722031024686917347027779070009896358771654643412669083054810506078866218417271851286420021860907338434817211204686529
+7526344148737332091666585836660697055361931941977353720336283268157952341498338628673162826343734542380046878989163995116270895
+0881257474139601407433704222324056930283355591807454770810061687372318085122818010133000433045729252354366007849932042280735696
+5414676249451280636930231638752958380804768673433252210159619334608464253621441055450445428123593855381938626029786836437726558
+1472864902858611995686957469529408189014561042091105708978737612763064100403995245584630738467933358860436751349270719679653915
+4154741684647123464440327863242393005522818718477064168160551024239993656696764829360125195215986845682299044548790324197334138
+3620127277527314655388754016922253350206555973782560191527034271929722748456430219013528002841930398470078939445946816067765376
+1722243978849829693580351795930973604730338879610427564825410468950337347468265193351290232895574144876817631258161159766300943
+7560827667474386459711757237346751568066838129529407855307314365209698298457841298119589066095648716960974765231576411494919727
+8647954673176727645450541867878958992452684388452058871232181090099976607265059152633077058376469186824930991444056731009872982
+2534991973200933430036026714058825873362205723979737750638944916727241098322793656977758591967127159597583155643556576943448135
+7155096296084695428953865082662825849460303226866978634425536379072621988021237204615220061198468810868414563936757985215986294
+0328355158636181420325206501518296045012302259181045466662110690600154986730477840865756276397313811576274178347247630894639601
+6488666618858920723988680761139802965152715427776544103393791345032803457282545151397254870010332315293514763142030945537580212
+8490792796508337321795619849060108983218521200268617175020002271232501077412217793566906763151880182142093233096870432790215644
+6497520222357920618391446425720257029473583117356819552842063897560547456381395533477059429635070000008137772848031720176668971
+8337012837324253697188573699623123203170708166950795276999966009577648906818828342730326847639721034032786616971040641824194318
+8936005757600971054320025253057644372313238443033194219596927715787049581460393528422411161050154583706800554645719354006707835
+4215727593152764210346931899527305466845340439034432649923099270817579403876601746194619933095404333412889852431784452755466843
+2088097487158522551752685495115047141137278634729729587648195891955992392424399063377394353752520259570862609415201408164480501
+3544474831228092443689968228780611679861586419457086393251353177701671796943515744580842421181721325756988105402798156643588821
+9778536795257051681439799124663145890473401144931092912457976024515106053860305458288529123695426810921506064347775651216836501
+8629179794286699832017474082041208054529672919556607496647432513709724969762646139135868191228785586347557306843431128687158014
+7106456703557605702232569911033196736598272397024373712296482733842097318351505429979256730289847489156750506335880609744614597
+9660558924487542734143121356331540689398560467085012517453390341732092436780513934245365179678624863881161450471818695381011735
+3612453516034902143796136205048511802780802772294479133906585232123112871839607661282061340027850740910859483338299107807956460
+7138724118583930096084405139356471004624454913317962414308274669136174812224878197906201370412577330455805945128690650516949333
+1730291821726950196206552159924266720782365385611242853448279354949948923432277012453511172303822029259754519038931979427529263
+0548575047242616318508715072515332204278272517306960109310804996719916332590161894788700070468159978743034429043329057033741956
+6780889499085964528861899269034340070621419803779139024411147795371750105312955245739852543595775978340360773771494478163557276
+8779458235824687171901362922249920581085853186181780124486013927395708657432957030172044779093473433280766667409407392636463029
+6492579411705822845905066201120652601308459859010659739650561022388466983198156117882306744218369432413488854001765063909641296
+8476320260631331607201248389753502857961661494677170435281685503191366884817616726638971291309647117085069726218509290967362859
+0810139343653776833125734038676243930878414416044335363929863448842581458674823745747264416650503948061405425537368655356993636
+5246772266327550199529567399996744188644213516458735587639817991224447177904904043235549503266714688854194981790228117033924563
+5461999291173972450770635507697104176866762020802521790899644748842731393628432841194003711839701487245460386154522697276378209
+5508101058683508523829079387008807816663732920071304290119836347773461806818814318630035261732455767269492882409702742637950576
+4599609444549117705097045766405200220153090927581307100167391516722145681413981100426906534790499705750570830947858845925010025
+1009651634984508835728715571045793550385433404603846489058904184111368085059460823145504327889561854662565906194985160507019989
+9357881999324778923494272780697498659881414033472270442304085245770043338219929173021287371666801815069695486701740310076529915
+4608279080766236606674170110085478654830337635040537744779366742642067739517988003498779451425063495418123468371481260706586708
+2700839483986172436829409192485873721128692643705335631914640430691426436305173498220746572777225402080014675196382731227699368
+0086136702746607717078625347234495013215002090165872533540039551264212687781885399476155438281141614343873696580481400589706298
+1705902722746414058890369373242227296762941970919549616605978259694120130539911344963309277369189903126883321693536398430654697
+5704737347400443449757566987270236468633966314353505101478851263083176174429030344023607680553018559157482487272502931014168203
+0929253853547791644998906236759598501768018124990991199353184644473283908513254590068607924929473380232470364424573291631346278
+7114456427076321654054593005258016944651062956332800845969220254804995756234489111294820165405880256529733135691041245584370134
+8553075127747556822577563288536391683930679292906640525736392953226223500696613649419343205087984527799731174525862937043354377
+7195787380049689624114711568372766827743368052980829823446372539589421589808988393401756593651612425875577606936738214349475949
+0181544697505469142362834711903740140759734959010974977126438624042186356553593244884210506676336566524109269413687671228874205
+2896686735795141476730158554607522934103668703053995570782216706155323744964613382384967846986182100960586040580173953854307263
+0286768549279297394586785263108063892918942908459235186623403809969114153282154910435594392237358132752498428484045697160025994
+5955615832427009939764606346259378692931215536161617155986791397037887173705219219646647075071165536665651942885935717666403172
+4276536421804556864922554676992233459439755861177568827029918375612999063128068548901725736512083925758415949098712083242055096
+1725062474106111957956927114735687646594918046204634711666975260667778901437761819647914937715436330233142512856404865653199627
+1291532637755334170692403451392823323540177224847012033326608939686606026939972956526341007272336243309559194347525857345975521
+4741600004754011316928740091902596508371266808717732973936254941000335221943249074812743110404969466723162046697491974991225004
+9085942759791031775731739206062635146158396893656161608173687371708987211298821225045306367484626014700868922039873009889166761
+2541340395518961317950998826785729636172355473248648132541946680948357368185423797382627281741493372551999786014593359188997484
+5815863362546532185070737662568520327034674676319716730206859041401224197894669598892125005912741187360523778711460345399659500
+5019261584110255017064950229895215051849707546749811603776445037494938571872346104053773024040213974077890562979334359709174595
+8333959703819799129975411673347762248495046754138982930023526377690018754531518740079491735091275401960400702618787889510076010
+4581333314409607030057543494344952121287231730028937956224706941567517833092451729648212810249480493474654543033507398453170912
+7852221502784071535646166335599143402394637641678513241517161191111016811759837825114453186940577300367319815188600287295217212
+2010730508881189649006207896145313350898015140508068016693226343978406558747353752836658017965545008809220423091595161424950648
+0496642867065050893136545829132837570390366632826974250747266589629788809643453838849392317508541173149110672931572489980731531
+5044656574615736195246481865299114510211631762807229391764826087155637720268154669986339615396192306621947657967460512382581862
+3895441416167225879629472693046552479446299590678533650004819143386099678646479751244788463147638567925169013110241886917506841
+2313203706796269432481996570645174678020808456857425673026366797683548661197668493887407113195800476443548512276825541513285096
+8842881585797604763305986235159142379357301472286513544030211227645270193019240287343188528847284806872333232004379253392212209
+2688409746134847438143178885250323822851284371547861492401669288415720100963691981973327453125586959600245064339903637953701615
+2157845883601129857682095395770985605599007238545319703595004924079346833281510603116153010794429037127659368861617341676777914
+4401447994414721274888256152671021736338924549726141907269816501834171190194745666679544881448528084111510223352357146390678748
+1598441987414496519030297478102458680201205753852279934039229453001433839642149793337137629917651258040708764206181523433254292
+8502235049697025555092849971402076674867464110183607528142090872909056796241616598564935589465706229822069262366265937628292137
+0055816249709410284431305701461181450452686881595061600026629505373443676670339321519731346337868758756244867546936430600344835
+2653221234894262976174352794968903515069018957828772393070009300269049849197795885320787480595346792949215526978359438371233230
+2573198395480105527983836130766181207518943018866225650015829519188519988960108721260257064720088842555685468531102293009893766
+7692694226464861550196190446675400547348832497307906496613188251375658889565533214610868096123194257835553142178169804139054021
+7725637998171173785445603097719118044612631181543666841703322233562489202164880099839601175940461517268783567897496005081890093
+1623476912740353658966890439792885600281612076194740147557413318421891935617196959684345685434629547787219047616918564873155095
+7025393340892141498709286165315521796432685307146924561201314330411100254047950443336104515273461423562157427134079178986568513
+3037051173501455568382307906695636378996155638857317043809314274578391987572790382804869815651855972786188467330565714827922500
+4074893387854201023525918388726764794855730871461446351512218023803177488574497502040250654764531910469820302411970861290475346
+4505685142400586418253034395353236203805450253479017801928704774791824048811941055335303586560686324885362705510247805420001343
+3089154219080968310703760534064569831009505236913263817236675143668487294264949278958590434251398242365729091805726174530517140
+0036394729791915199963247134854987262729782792900430729405932713576759938708525288045097625035200406357341027793528833641758308
+6352067888617175431411674423431768301646476262241768575619045274936408735985350498083851711439785845206739316196883719103192098
+4796246905383107193048562525408958439687461541231738438567101188983088993969984494129981508412118318349184613817013959589269737
+6278309646817389075935268193490507135536415367887824086765490270943493340352420279233033265958209197334685770879485799469719026
+6501644826983757753799478095020135205854302975462551896895597291920140799672078608383168757287535179491461326280401680688209269
+6878526040144420355891683769364803589616260114471471935609824723068550467740012749917856656207461894693384857525476785223522600
+9913533038664755944016342494625355616351591218888135528544319832829890186060691211822484503271002284261557646472978467535245524
+6548210843247451049422320528853823425570998217119732063096360026534131251690098102596630502775298567714836475115745947762170767
+8887884056401989307352068428168695321737823154308274924885994114161224059109503941221400198439058269599476104839310697936760947
+1499621302434101869959148741723191678491689696644090274728115214408462354277075304721665902694379966811617179086736989510478453
+4472180192689505631132593579798684787021607827033405644669077356547531106428251322335834054519860462918400592332567647993370324
+9048351300356674084399149618697303904545693491523593398209411550081390607196236295352104843258693200555492607047645055200473684
+3904033119579621911938196032662442953927339169769049079015529114126726770405396769752836907821633197786728940414757447592836029
+5698177775039384194905994353296325732870874582783505440992449252246418852133705888017732270642203555475460239299507823556669568
+4584762886535479770675275444567493237009137069030861149601485784515963297935895153471843170037858613325007001549210631837023209
+2986230798529869904729567059889517914570160421964137879893497645563877292347055745496295096825111567999357916375574494934291205
+7206470066816931559279891084092643447735267681920960477832257393262206090265312234429580381825327805715755696980240563671249333
+4975196191021868367044398019078519059684387790904063324517862970957096304027938042892083911602143438683752393325035772333502998
+1316065614559478287404397163400580119624302865064035828659428240183667221604845265166461282189820016614382937134407772850983969
+6172722824726265969836224691170018753182037736393837492582066024393428721754417142086323296047227886511163988288746175386143366
+3150098340574634288363424590978979671688129464997330011306067549875063142531548626552657667362582081599069751262734236839198246
+7320831408674583797739325661435931815687746601771458516299735930183747747803369077854960129285952199586802721391111341133770000
+9781649076575876416834626425635920411598588075542620127671675851163249442163030188821293485762987388143543674662920406406559708
+5939935563329383384304248329695829758747483676028520127505271048590567171170009956748249750276404393523654234793402435394531559
+0252668408043754647206021991183069125065854666835585971567158743285135342908676173306885768974453965943775589652707957703958897
+6941205372351396701250517551254482102589310971175662401605631499693168133844709297036538928165453987035113124871313193061665449
+9276802658913609967848115344605249848453532699908586062377147315012593156326148344297014110306443933718879254374138651819351013
+9358073205389217401007942156414789371666731131537345827743121944929460937083473364444624266082970336996459723671391030112788573
+1765411908158890001229050208942988203575712050271091972655376675898080722954958732806828573013490785204118792568609729781493352
+2380302146221749454886974990613671789801805162408638634096879268990438108120689272991357553079627023448340790990962415597084280
+4048096687228528057040549427950909321059124104059954691594133361792928522598487445722858314871353602305792037504518403367795101
+8791402885580812697264727719699410880547796108771833960539902147827417638408675493518018213254819498104814348795878620396366601
+0903924261354725492168290232167217374559865613331033632981304605379493456181688182582298294804821827770454840207003173905889439
+2319227785834038175693137220680318778454701304164120192954225359327542167556566637258412033259709183354710843065358146305555525
+8673917622829080548174920911891769587355766435165634787328419281721579009044997104872530471989859299305155593643127267879722422
+6682290955279007939673997760490906289041187907827046608623932479656002087546101920096135789193088482019418559812270396482968185
+2423495240985101912282160197226440146044901932777702865325863608790152621900419953459804469566930950992382020196553029673452779
+3436610407681610128962456711300906610774647139359864663150800708313215865508716982334525964257676579485350065609743793059790523
+8492723526317024179966715344536215615681812917282255110526575184184812878258269018344255337700911624857617809339928700208173945
+3637336636381056356070802698487403636259922727330027710606038599582455818066875278487848716217844022297313070587219989978367370
+0060775392327016214743079646392570709223503152196217613938079763344036433088567530057235155273916070612559581478927578508356337
+2980025169096765222953776328674278356394573802596587538549701911336821174109269755308129020228887624742741743790423872778133411
+4050821812671715448039700197323622949979651733365312936187264385591443824448095216098907529899820693216629857601750862463957125
+3142033473651787251598564785166706147991399595143208797800693772522221250290172822723884818192653997830457442015732513857367482
+2434227934816021841461320189923052035591521089170168079786149675686974463633607305584810474242944486308070058500812306124076610
+7715099107942733927512136192299373968619398158672679676087995950860231222104112656659877314698556942502196127845551909712373108
+4069114461731658732633727592893010579600135097271095735648535688306732518715682620335083055144068477571815102417990371455419096
+4513648336048758526599148974167943082379478315281923441623546714332454634302169701041016212788185513022911448815223921787570792
+3624469067047527512170727298754069896031789622645772484827952155406739967506695954077541651367850929296976343602998185574427928
+7941267068022945446692718780586230511573764935339043083147537297266971720289420223564631007244922385010298582167405543731618295
+6806852318072988521804655880278600099719660787055120319799397720389095148995402664025461591174050670273042539667806005860061500
+7207008027571345636661751333090766740919387017591058445443344334627123396031143577924484316316865139392646603641126628696936857
+3077564139261564206167503001531356981773542928052096642681673223984499732941393025220000573381152245673838328811500670802459159
+0948542799001533682410297780373013799791748346265940949566539377367731087302452174028989049580452869089162990037685957268273937
+0880681561126138584261480022891283215404751141789014380796409952816321543905013512146286826522138659411899727000462608467450535
+5880091566261256557011783504868257620770129211977999169370084785384096209807922714348396458806443353193445034311369641072095970
+0556656033549253864960039890721015883335372132680590369609602226419085993403091634173432095151442616233244407104672122152816903
+0104165883408627525444104591380562545622183558159751831249938218150151310276941351661814981521482974647621742382874619909936820
+7313501231477817301767451446702735705428503662442130539627888646852578831768325107739301527824363969429357121983438884878755269
+4393819179422351389843662394835319603450398553466130430331252873486799616761474948216299677793061438633632338236018231007238273
+7068094772817742176160590443426997804722265949259567119852638283512544860402755698118178658952516755701578554245375512654131546
+1929058509678608173068953824208364147161581285515961193245483567752314654578018433833005722739540799467152027333949229966280869
+6336730057716861143854645697201406300653307680945816167555425942108475384088151314617817926634797063108952284581676269870141278
+6513049997339587705695549544072595339278305253913271901919825663866146612507671581432953692087570028664604274026412331620371074
+8287494858287111672511595795429201499531492727612182441663719617940686643391436311349735908431637719847434127985592417043341276
+3683439281027866311263196237695664936547654237370870765012602749829825808040000867227133823847412406422822451359747985192576292
+8080745720999988790691750589159999510681935221965279452806039652949988754070864815196625235801191787296756531552141564212907151
+7193959478339407643118308465039555507133342674876808586706138734909756613087265895500010160295176435656450676824231321652261709
+0364925287385399527025737739685585498448664221812361858587254459582955070942164513804426958941634994463722930608065187062143205
+1510248350334956246451724384468817066713416535078509857129529545180481755289335535116009464206553367625156566677354615817653859
+7881465671702288772143540937915254400157725015862757578041600213873551218117006116952755764443062859739372284691117745149958234
+9088672142145404730278835893039966187590126325943635642412358143475145374782213403246198035026788070070178049812453881844272867
+0338668401687420146135473027030982411204915710337406365921420685513130184588295184291465724202435316806267038332889397443572598
+0839432579664022013756612378573508309364105293988945101718659897497738253028464952712017100629220365209543091962896609529479679
+3205960596777307708890129013560513946330763313564335478005273643120628824046289255031118424365183741647820073945909472936879735
+4620269579622752421433383654982653678424583328146692271652411473449919421964392617935515652881545262048907644967697133592449864
+4910971218311134291321139032124590602851436712963785978946343853100496072075735946195731359706831946181264874128557978861454843
+1011713617018211148846555458691095625992954032111035185714620653734574566700313717404927859717431081627049246861417661324499234
+5786110524543942705885896839017534087003537095772880970962648591315518710892525409209474091669813346069319857029093908507508520
+8853954861830714292944628596393329384568570114810794672937003168548384708307820733820193722197605410037476744326684584534487320
+8506177470614128104032179365484641505802789779285846461790237297261018747968281039195118146388862647365824837138881138267868859
+0627387322960768524871037409484459085875896325439489116621528742302285368082254073124593119410595219290194886865353532781155425
+6809698357496328576273024691628485594217747112697681983376999200098136183929376787562599199562809870612840417370015973807170130
+4180345838072561608049345847198586105129570485513244519517878528919531649387592676465860801665435795014078048815567745274248672
+3354246532695167434429089502120887783749962531689888071529106417054905309204892456124468634666345233412562908228212778433482865
+8025350198646920310690370174859009390241456508358264258699021020277939851249666503547743318751810595431556900870080845029269395
+5024287042925036023658377259430412863334903203075207016434236014370755084100466996153432751138550920390967655897565334875107985
+5140055633415509862050689677756134057716739901647883241169162784527852235725792016297971735177502489661133426961482215258022336
+8037402896490266221826083726250897311919802495381754225581047474087034884706618427848292889662240224463663278752931604522244404
+7043755425948194930791058610151488175614282166409617670305934153837246327320668633959913213103337798602482509159766659520973014
+8270324793209592396753604357772106280615543278837901728489074421806486555551552367821526140160754356205673704266414947144922428
+1799358966488711764366695558613904123247231097498677269788824167860157320461004934898696811210735916673092405907643647942161633
+2879051334510139198581358891368404052755328890835533066541217913121822938905792625249238474950146832344471977043224365781135389
+4792241156268785166424579695585412116561708898561202729978503519790831983242726846466172154727854320602695467825448826562117055
+6892572380716177090374320438112277052543379149328749706362112028296715205065873069869487739216648881329625482801871208985853567
+6373214964682547847971295488976163394711102004330268920420740567984995588029489900437674583804505907280376076761512694288533949
+5155665472119733684583254908202345934203146938766729952819115305923223221786312083916415057710647121628060022705929366547804604
+4979219068691159117673733260174579718275355270622127824048810725346461586407079827993239800649367405496829848031012026874839047
+5453326819721439241285068650662264327283806902040744362117833297041970217611203752467289267570303110513926750426867300123044678
+0552826491452886926336136137608744868267813981244854176639767832954709406334434073383918878421433694185303125198608436174948723
+8232804838617139276458679276053642834353480357742672915996943482707728711707722990226821986645110256211853787080947091570985448
+4530019597199416503606666321373773776661468897805635174486648284631882284913728030703703554479870389738113486662451982640555230
+7993338222145807140991352100542338400006637591961344296816299971822252698512532704506078851263452743784059409504687946969377470
+7050536882923788373466054136459774772814292349043369279413441771827357318562815124739087054575308713882488227553010491099772197
+6089909596225409017825449105685851204483516303044569069782656841637982677940745207225513250507661349031619934115869792030545534
+5623878938475449105483656355950820776480123283684344289877071474158657289092937164564108821983834915760732145489786160801928029
+4816804046415869731980026155380698391293302660706933603124933543082802974288753245590234004708950597141938648083597306991959548
+6285742091945356496670113754904503990748375484181907762641311090270050878330341468974330973619534202556739616012441626266016429
+9943182264167678058972498083665971330560261159232616995578303066019814909746442924781284268163340228187122534568268386331093065
+7152421562633124939028810156815250340969816324770306713467508016775028986746579511353296216202084745909078793312626258806625843
+1270211232086431110376182218366306020098067244906289836262668331857252429211967620796216066094322098532350592071668917821894836
+3845983140880841145716906938062904326623489852177531923802141898083667738472813358868563811996856141869924840103531518902763682
+6718003149619307421590918630236184183948486678786725981990313301354204177947073223184765980604578217913950986068011309908008603
+0928467335337181093723613708048071495790652643180583079182628211576154222901059273081503840088736880283912228917857747961420216
+2166551801482676965109266503314605693500879290753119500152110927158165273225738493344045059814681043424105403563256277265130147
+5602984870377735940956944951929383106107020907201382858387070933315397423879633043403789726957228735509198228676824257307906832
+4033785332705686886894233935205324983504447579271074658738235607798108047836471901273736322254888901735575902110174004577938609
+3402493343952267342344754443371491773245869528553143427384549726736187617570093360565939837511071410896535571400200988988962479
+0467384270228802505542012448307525976842449031499613137353277852822620338697586513075361354863064717799164245330603052561106892
+8842259346260183856170976867586760896719736933276441816021638614978497367736310097708762890208045248689587229972592272876387473
+3259167318440772369838882122021007960375389506141034220872992638686407702750133638151910546511598120704345383522282582904780462
+5442641858108090041720094339574637116216554948307838544047344475741751117118100567565238848037532377180455225898883679663375089
+9577142779120614628627441392665993338561362305904130927688924256501300629907368310744468665785794738752761659537261334710214003
+8036648554081009787955952496618722107214483438085877494384608581966978660817589075759692849806559360759821555215575625537328994
+6018332837847583031691963477349319171451400074031373390713717042745436212897138228273237021196246257873177739985799453366628180
+2105213797394649680881845019293842601907281739434203168302170068885354441461289080251599722778415734193180238772976142195797481
+8846734820754645249343903444980443492288225807913782286509632765370978666435328327850741457922220028478728899676269184885886857
+6241211337754447826883159708571545245319208827655835686933251362672810423079630739434073408653288828495537708526658804579257936
+6272761641480084516721023070052621557056643754854336674557368573875689625068313256900499409409105292963555938180247719262631692
+3370472297661265053196085477234369632895929368519546792630928565306505801718550038387422423219452220411081683199640562587649457
+3951837878713231474233482132735598466639480024677257398672432796607337555329635538613813318615303256000562507502749357845826125
+4701181391450803850270234592090970559917694412710413114961034587689766035663731463069166460549538653431143701866309605231883521
+5130066101866721176356898240445132440597653755333619647577387320361484004480200635865792415170670027337193740214918631143418262
+0808586953125247209833845490228639118624854066699258124848785165048528440583631961380212929557758370252911013779599196305478822
+5521493745858166529682225371969453760228060851280399420192708176554476472315839318021751905690807649055065100259488774569707365
+6158697507308922777896716663452883986126333631244914987739404979553039259206951208801722656773710392910263349735278566679339104
+5235852402635719195587338866742022182421541295397761869128302452896058848115769056351269147058952464962337808384290518791915445
+1541410356265877277120453080537595028913680044162125110791583969590059857305994592466475393255534238742387386696685456308459612
+0685998205305456113478494375669069867507303172663122574416432766684294168665147860680796606372059541989820238442687325132846277
+1106867923762001975234815885590982053876420748926951108789589029118783643675464846081587064829483161231369554788911064379449191
+5812396650186976221479400172298188629572727898176974211003232401377793666992976058114854815038333629709686365618467427463150786
+1384329026943982531591592399085803625354634016228493888015194258739954993856952956641410330220082208258103940975869674221124275
+0959625394390538490258630101489160874897384983747423071388118372125410613424612801559234232776779480366009970965890340120701045
+2667599636961907870724269931710369308622554291093494631427897956168577372077593727180133140549717498300507170013965255252092132
+1737339475235603869117715688789198413446311276950893765017909814539886259628403094769733766342691082854440546058895772248646612
+9197218961185262852748275379196855788331061390003979168135259363646749693751540875250641291188297420332987544882702271806564544
+5155345846357272505381130365306178806560153732924148036950818502559878423925856638459435711194956693467002588044226649914787035
+0339515088331009475687588955523954567747189933073011102332237830656095392839856108022616789694653613303860633782147528467869258
+0130375935586298049775383191407798098669127243484570035128574481514435908283974501169023065679639597582504503336586846159045241
+7077631278309415202815413204154287337150040264985085284229097360757947744868068694211304208527582045828778373828218901884299318
+9750268301116713110151838109753966293343621088077855224277949045570521139532153236249008822916991091102238861514323117478408697
+7155195645472829181908341253643812659814915997068241585467987778740169901860636348467280424257966646686476472265113081410661304
+3489215851493494198992712587668351276298911212514851702684901497030382245009336388185220072052801963314343348536393431861793824
+7433750102437336219240711853055477575713689475760799540383502439038522399381791672647025184537779822386053913810580122038174879
+3818754166719135070632269620576055650986227950584996452818776818068696309115722467830916362575260788613336625118633863774586835
+2178221238069038687341161131798367556148830622561463128345189400786005116148867892392990638096974925106944221425159061603022670
+5524790379877915422325982255364820388029995625235481186060304010456803568052174332647747736403777805245458180638361448671813038
+2561932270943099179760490101865479784716200934807733561691561384108933097340199742932516818080682737612322848740218966854945307
+9080116601255117121383041648878380955264484146894062161454022932953200141179550531168588724355886537447858132714146647197563370
+5582470235237288151308759910566681678927176948236130886004032182125845977161600117740547183580925791449145036400529238606663420
+7837033717084727015977259234033008100455368360038870286352550514822219714510463917848677542164460976523276256801252857727025894
+7130094419267655355009949375142847444276972876916939298289507233195397404513990497114810662137361054915518609388753530456478940
+5388394232615483120266638817714522427995662494049561316381620397442848359037023023824190702655956805505137789130807808295750670
+7728487145979981298300914926600023112696314252375455071809186812868701327870915067718357028716612327551252066278398582389353164
+7289773656445897637637801900198614044295973498998341687324987147175709042706190580765940871231724558042584698396691392833921161
+8657047381454227627618374146397069336202044856822409754902332810974380485722671719214725867693990943072348305834409116868276317
+2768386266640115552548464265203598491327266098674766891714414339959283543826573869249667218521183972556730897770799418342118136
+8189160219232646049490114563802577964294955901129433201250836705921020927053769046687178122894793267915461627258608458791264898
+0219476902780453916709467789696795567878369111867867605857135264741583700268708214119151342234570678050700247598575853332533925
+1642635008587172832360657829315478456525706956941480551250122576528755981779071461911390584857611720174162647873804473942063599
+4967685799379026281672422049403080588839491839093762962697369896023527084701530700159221622072624944257435732610627292851813751
+2044450251147619884660437582513822729870849508689036347657931033634388064328200140554626737296767003665386040440053850111272335
+9965191238699562685527207327106427173242624391995490667681457409129351701642801367806048618652102824703936861574242876103982267
+8167136500949575593721265813173669081199030452059803613088300447991271804667292549385675921231605005292459008477827396828396980
+6509840801282604124983554742769070687886591529251914833953844029743868619125159895774188014042708540332420119945175514865123729
+3692321786307153306613998657737637076488435978265420180472674598878806315670458550057067811482012301407908299677656750462270208
+3553454561634700149917505664871758279230385607072819176680565522193204640320948453398810380708601224770333475704117532694153974
+9739801831118688634434296635463933483606562392700839399728340475392493400599816097076262424865867680957927823749646379318466788
+8207485786494651396331129651303688013258032982874538569357681541288542572016965208057337584986821728683984473782485195031290559
+8109594698571552972881573904540885927360173123269475341745160895931951290769944326526035760450300948152494775976334153020903866
+1739268973385061826289687149889229189956753685868472054090051279828873221786295847959246538258862203254463138510475016160891729
+6472588945675080220223551738194925153786626106262423384260557370130433634861152559973124770729011313810073811203315002214957767
+6317904094534761856637133735479679945651270156668746266850573869850630241143818143990553888552953747865302101114447970138765661
+6050111904910844217007312990287283030132792651432799525258590083326102644255354794948740529248987597130140253327270495396985608
+7218279207220544832644649289313013019030346375149234023654949206605352146548635130815666273562950986058561700625454917451118233
+4591089295985815819108775507988478501559092837715809067331448086286924500664248339776158516774620654659269297333948779421651033
+0402389695369287676425439165311946884646996933164719659142031175373351707836712648952147263228223229642458870791042562919539663
+1663280408606348818705021370639699925355411336760403455952690546859354756234316710656534265824067538349235703012760994218438928
+7331947252166763395452202287514396143003916184577374680861816449247026988630652041781591100537950521820855164931956884346869156
+0167992341341885278124354492799177573677966259864026035120911925009272011711402759093945175436356249669782240856162554344304896
+4307297970448548637044676901410933338328417297377294558704310254387943692431491233869228400552419559003867252598836554809147959
+0400912691036342469718967629054695345164844205186330491298158594966799688436822836744333087245877645780438275466738783338029984
+1522719795609161172147875781283157496792619720043728981895906145341666050986634594495047649741152246939806507306609930123284981
+2105358148148398274033567712304765375367909977448660123752729616799410712586037852322616433905738649313626209308187391551045434
+8184050603718152729487919051152176341217780682835043432591401578282222377677030156609712538101741280977544353648960619498088312
+9780539921497865045552480951265192490326869876857256607893887668594821322177012473373977135212994227092237257692716960309499930
+8387530951877561556746885813088050059098237284649866946622347108029066952894002584214015925808803683837814966224683534722188788
+0980315065961365338422640630321175434205379462185984915822930473041804521924781482514510231643402826027992447752984590090815631
+8885215984427616592965846360943654237762984211426187791836287528989189066470173789608783423601639354776027707428728361921725733
+1713545761488733797112097100438352878478186093850974631628293903780866218943733017611561596620119895299713346283509695880279900
+7056694123692100328413045552536384469910897094450012862955826233283495356986105417266885152765210669772149818027501922143072697
+5044288331991180937483810266252299436099022518584143328384527105505463981298174129945339074070183868941494344473296478243433481
+4945558387028214187495664309036767910507538072289226775563326183770144119596728765797237537898375774364456608274929793323186859
+2322622760682958787774419794236441627708513520567224931868094563846705540632720743482044172976408519449985880794628778392723979
+7704734167762682724779119792543440260650654515136102295412021984201525761889238911775278953009856036983484297176809989345351898
+7538438504892134535588424111693601136717057553968849287415515571796218046474942306436018172239215803280193264125771352664266396
+7105221455394922182238669063185805229847494225913363125711170315190206996126469146603174629254473614090501455991736786538113046
+8157168667432314271904818365481089200297683424381896431649087725330131885687876217074390326660020019876852812089717929283102567
+5370154297245853419804188360942032243192631168128880436140877705786486797146832449934263947276552080089455965696884234934971523
+8611893045023888017310198960086212752413461499017699656702018998940525757023063840379418108573223175879013713671744193748767015
+1169024393509843272061563781622978325016779395605303924999369153283788827391502842037817134058668089767959752756676201396896441
+7712715405049463369575317556974267677998279848759269048895603544096481338768211601218741510541248300317436674252540127015114391
+4834430831243295519098671812863396000922057166207709070811235493720931115916983299692520931163380069504267039634742271991229413
+9287385557045725218161176454965763264083042136444478713449129334549410452033352200798030615759042237027156709457224173930955024
+9440754327156472541302944326043902553561785824204549770748860453197398189036670911169331773914895138408417009555757899645501252
+5832453847611197719596117303718224745254716796559500451686231076822545459079358621425609803998655831572289152307921157534370594
+6716617297863540993457906819123068181321563782640587142663699479729095230755403564453694626863314955875318305864016967285927449
+6751752585208130882471772146338918033811645841373896388668212294917320582400645793013617832138799866544853495551795042553770974
+7292062075462511235154219336433250111030971448383048960076039173673865773457243289124490997622252180509835724029497464904686356
+1703189532838988444479300672213603786659157307392869303094005510273480520540799882625565441527626460538592793551679614793917597
+5131469474921792991086626550504407821816558283404370799177646663722782715758886649389166252871185413421418269585717891891693033
+7009640276492618793739187876608008054508113875022453329081433650929497189681068056166559133270910556458288747450052550799593778
+3775026817449250262071158797005661647517869545017156045641434181332078515755353689003930497030264487465467676524742489128433074
+9510101337115987091584562788637829217924129844325702143952753831115106454935897717213086048464400730491846668741988349250815009
+0460642398157894924642248578767274436367563791950971068099635643161955689433389352445513881354534070645863359289997626236597102
+7422701275758347504612869999447090197900987293675125648746188541872170309069628366658720207642452150511782301406643296921604925
+5722148742542704368310731836532013521833785510008023772247459847917061172721772791747731176316362682231389997934194900072780568
+6833294401022288062004523032063979096666714062815023108654665205678873446818506366372748896978903704125253114795333767006805633
+0409503844899480726742485372066289542014116663615248040053134473634302073503009858583019797024883588714394669118201212140331049
+0801167094699960082079962007695468661043658656967418331551197267388919434693010620339366679098731235659707521841235334772751876
+6325143950028159251006278830542343903327924750282184108026273734472327418765244935721260982532015689685569244807990908472766627
+7594072557268049752783928609937336033485545218183637235406635759394992632389014311377829965838907592318760198667367240484412343
+5995370105199099659966025879437447340499996959986818273399469349454086733538293008250823125200112169460372394345464200255398128
+0278006855752348475839798168839058164956107248521078548181749550904031782397298429598863198195066959241173235250539525076363890
+2434406818995447305231609382502170967538696884871023912846712870860599713914006479152902091530717543673744437190057705732209450
+2049303158709878586595288112356673888760379702189055053773161541139894881284696826212357934526729889089168985110486922861784281
+1480496657855804936389615128385812000095228481966854328817796490269872553734151219601055960998715934877799282526137718284428232
+8638224569717329657108787802886111345753795000064618991042853502960039658407299390014418474102137277340588865538873397922966731
+2915504391345921079597753766165614369426311302871553494239227907927104755401277811135239511652090480469130728548314080193845714
+4662543498990058418814498281187250236958894998429926084397929019382124044722273292092351973221932689481754974738766719140738353
+4190409245555651289372817877351684664080842342410487693494611165285252514427042631380484145603968868053004939443493512729765220
+0119636369629430093021488300230179969441757666478935315483114992540843688913867607317956666306088259979412209337113112892142162
+0522344915049743379719646407210766405374162220565183535557053495876729008927029380341012939110046953015244548503515867668213581
+5545277258914067549098676802369675716209629211229823278440028400844384130766676038181293025311537464968008032689589725571813893
+7241917831784954432887951874113610869422570389407469506150472467208362227227524708480496950010505902724279188045395824562149045
+4536217193131427845613009167815485956442321803951137596941709381463070724725318338865720453796245623311051568325407640234609643
+4950000863730017668562367944404823933355943718044346155630933481082791520987136962663882167172001786426520967022022083855046918
+9948462347102121864710644896101448735320408682918327475914042821856145185407258575043429392954988610306816855047216892742882375
+7607463192368539597117886391111127498537601742711656094819081284338644518509840706151881140781291037342960935079170415736099697
+8170547034180787962131392617751093115453333934584190242119875787080041916215989194964046994229463391170868877473670939015394600
+4967067863801616048208692428984726982425267929231942089387972467090049190181520316912402532109719978404281158192349591335918000
+0182827511598856652325488782019351042712700704721955971553105284410000877214479216605042256842199795133210940783113951447780445
+2845448586343352856456977029480170139895515001400772533947791028664521178270989590999530566461508232129548565121491303912378773
+3186958087525040737796735368369363073980409705399259078085185801788329795473492605756831924612159181775569516279264645527914405
+3736227582287369825938099577236266512057139246043733096797986415476742434871074557767615701953628932757311718425644125724233706
+7173052386737821682078985950554267597062731307233678638341260916391599502956775154905191238402444341035490900454688563799626952
+5147641961470238255748645042116320141678230506441721302812017771332190399762353180889095100320685446894708468194573746305094928
+3469096230652662675602711465325424276546888133056279141284661309882996606616677713056958440903862720614419241163546636652676601
+4000176045790898594283018168562878609386243501149259496688481941480198035420169390431588952838073985685288362095448469635565752
+9472291341301030094187025146867336563674988987757598438413852630025766068250538948297399599973328446303590662904124689712678759
+5558918453683884045568116648619640982031099812596210893142179251292478971547413993326289821580230193948481450670535256195029562
+4928975689440726890177460501590676962108712941853309133182477027909307432937071388936253714931106477057738446899643424898539007
+8940244387920877438974129853648880036120882337129881652544245505645048735775452951748876363983239868801033134946650378020657016
+3701058033103724656733182793045707161803086804756890720227008032425755334349001190669627279911430274518624636020186433616060892
+5795048614649402340472644254299779685615196268626556186825992241948964494636129874107575230767378691185971658847979564205979820
+1236133846548113964258787812605512858795064801453710507748252434757524711761598464790831987938492943750974650361247007836117825
+8985069765244610015917016588371467517920803422724008738355002305222843175513547415525425623310272808519127269635589538855868669
+4866637881580384758530553032050127301271010383021829168699459836736308865544704254424297016793922754172114529453114659796809124
+3421197137282279783180092595776656118340512425979400729754872785822827951114365899638513626864234673281733350488813180030409671
+6116540261589173059806435182727298140303534088364505375974117730218290182662177594123794279119735348291936701406861588485281875
+0383388028538445842643371054045990749985217056001543711456417105050188186522673179186319252532355654228417953034579705914850138
+3589398737652268493665223622209314271095213796466114005222254738357264490629049957974234088293478306962011737255628545244120278
+9242006644961491221804556688452952473719954034253935879343918188942010496090705258446852742963029458182305909452754390287793730
+8783068031607497439341603800503578168008017096526972920750091440007773022446775696934539156855822636256531074692478856955931965
+8800823547223548709312492609422799167744315137636030763502283934241170303284109496261288800964950861563894408561284405190045969
+0236871653896771373931349637525093015261721424149322538581449425146949187109336492808412768678305259961228548229258526615055933
+6808296006076261647807027264924130647898638203490518417736498838185026931804266322409312178542687977048973852811639981510309567
+6711783212313531503601350937924384067635440627869411288664439772524317458074685185346606914709019186196743715338064452022403271
+1329461726620692353133812940387503225279782302791789101276394351197294472993751698133198738485236134603208512597461992464092534
+7712409812790062450698418919781788475967301395142101015147156004348821394973951402124816517835984222889123201533407163528809483
+8878866193884252627688867520926767781102452754391877549372235240772045942305940402248699505448319900090404392151869967674502128
+2483008370299951549301955588790277512316664972307031593695383033586616221934522732614016251454351893271188672805879216575868904
+8930668992950485150931537517355790279447532793020359504907584544928499659083716918240980733762266979363328381222043500384239731
+5449783313063957701679502215046202754515996947849788011011244404372242125949053935941173427778943061308870747330558976279745268
+0087442866677315281344307628368254568290685263159851300491709072441620656219856549470063530059686910247545618397733080267966459
+4275923776467144475919672663054261638444876359385278313589184049205522647886045588220547740175271213225571694335593813888699266
+5631076970562565479284442184748121529273149320713280238168313146627141356684124916604998541431548094125068927278902251637629771
+4049873854233479495273404123122985718709224211298472591495302249456292201698069758048348513785824572699432884088465158829077277
+6601450724720706904135791943277181797939378581152182984849501639363583354753791712537234399122836156611327530479415218232099189
+5823047280117680731777259023254262177630139266484401163220777646941723211983561493087099972956890435877152661438838138706007958
+3871525096685339470645850417153350859644241363604522957863652066029739101996436761253594694922069548250943637910124220796682359
+3789021225120290908842849945791566951268040039302726617891236371450848884685584694857899475642048623621033883942963333740640913
+3413392907322042998743788130668642581010260731658079311951196515199970920919298587850590756579979416052745401954692899254629962
+1834576186290812892686277778078188491493029363265052305832102758282145333131211542287672262899869561233857209736661910966320185
+8640618069436548861856298762841794920426604496493168277782652390652529026370866518863711574378563335650089395301480857411365309
+1062855694706861343683613721473054277513151272875708166067829305351279095564881057460121748427296483260938003342506900294399166
+6708351271129793412643921214770696882147428525507519544681246954889801321262715754608536636546303081680171501901796848282715773
+8170065360748835664225539865399039511547738151434626699419911223518847738407528346693417347838281049824633463358386526323379557
+9773283803239608948889044323843524447778250704201869489766199362127854167469574262448141201863158740882252497005327174568985690
+9629170341829493159540502281159419978757497174339132063688621315745991750554750919122418499757801567167615195540686775308036772
+6813737486648360157997154949184994770910737848857708594705159108226498818076724620595499835896899658135344576077658527954169440
+4916163367448740109143119472115171909713176429892100499193749017654102572161123098799425438195950481418848253249246794538567213
+1943648585194380435794184207380836831419456414164714608475465257187830071751668999365832434059345210749956754565801799757863175
+3687162724713568040156043932976576841434569787909011626375244300886516755159434297033774573216110685196819615175124148320455479
+3344419757198679638351706919063941845054040199124828713172593196435249592482470220242606177271518431150127043364815791934444495
+1400008065520008098162065199768125759577818782918099045365313282741980846275621548204708560469294053250492025107214712766610441
+4165080021198705915210786508550601653226551217888163799551833017968067846988341804528031533804959471453060256667445828562593413
+0316539921143167379344751397929218943090424282667061717675506492829683232765044382831375540458280475310930354270466628024378573
+4617204749069035253813713597661824629929473681227979210717594546338035842018470292109616982725985026372103084242143325201934501
+7628437040946835252535863570081482725836702391432238382009021257963849956941583278276159017021059243802411805222128391491555532
+7118276592277047948538579672067937116293934455417400255981648387252807293008272125197089405857447395662820745517911550198420495
+4817641036360381588057889324736649206689772293316553388319983835732003282890192751493367420760022776216834345866178180918425947
+4046762929816361002114402224273088310438847474234192226897299571581711857975564268312621600137920668387355607049886008638057179
+9349209580226030857313156556379575691164723527464611358492523658913876021766102463374095835678962118324213355237312840525047153
+4458386832215216090846608267034928117933000209670619365236847239547649406543272314067052926849866069213065858041288568227157782
+0323889725674406704675299432615839196837602006707700866051572397447613281818928460518366859474985370527579091269025122957262918
+8693066533952054034279975214015256982660363796184125831239795876267900616583623647519579472331003311428117914837252346650454796
+6978896914173575690746678387000060698232734806725458177123404206650082946025871125219582890983005045333389163168584620102734094
+0208343185195645077429621338459120990032615146936965171481121547620265509203707449471143882951101626839387108073423291107985197
+3806694565547588080124701297594558579857621291153844744163973871845300036486064506978169189349641947450555475680771354116721127
+7571370673293744335868791633492268450482890329783462471218711903016708619390949407758233183647172103050542587791975330523548939
+6895867004702083992837053115350359081392183348123057432804437516085126480426796559419343457573809103554769814374422319272987621
+0493741336702343083547043049060106406621621423866156744878463280624931631638757753907480473151395705318815364246326098575320029
+6546610394497897246218305493409122075422636049647756434404729742804710870898441487104017723846320578576625101570540009682146545
+1011863982645118776769923031005075048502898177517353081584252680645039932448249490068383719149012492191034530578466311073324350
+0940022141946663679361628444591959010381878575634668757912852707910261260983582304441366347012174417975464831931140858093450475
+0648068206853955526969735294213923796512233785864528730934169006767896899020079186828212231303729771906306615698951701782896040
+7705404267837637281673906483600597132329707232579985805240515664780686649377686946124141035632716982723408330472426681691722063
+5719449931034079305356439666263973565128713593058013796099786122163872295053911196817120195135137786906005302955333296169099953
+1565007759742421563846584208111412785562612780177121771600395311757381072903942514964351796547320888609281738762831301074727155
+4840914538717807330571774867536594427640229999158918266573255879619306849868398528582717693006558964074770743956975947230605506
+8434170706163547151705112191666162854461320116071520338539133193324696905732424568076770881016026396766250345270611437134977029
+7078829392513262023910437193357139649522860536333445198136202621793588265321546711781743395796073320028953300954811115494631443
+0358109781392845465184944557313417160881340633391419971812545527651450314512749202620144080637491419201752326439158460989691315
+6502021443239860929638929077452949976769441697009577432157105021271893283919677666379901876413440307841861569738215346309784385
+3775582600443257869423701993595504734055924868316007937741523410145241997102735147790121190918364977637486443176097526249923371
+4637116062887697972788560169232687166734847960365006931173635513798426534363094553967229788862861423059133919581108100325100963
+7530945856385218994386045042760138610248296085030904585153248074916348965900743636913197206787899808540051760130445456596005975
+0082651589864980975976353455996961471089119847766125021188045871260940417581575204228376995886410553255809049908515562710519369
+1760176651046607404619158827695196639809040360410321347276093208667279377323033464221881041272072298115933348047136279306992189
+4449900653089574942697877619922022124081013931968320543380925350254859461377805018823478776678186127822712476112142520129506611
+5360537273314488942383696459647239094488670283840872805432523968819547360255856276619301822761467290415157270983258323381158842
+4069470180647648022724489031315390330623675246416531426538288357194889582860078070141817901349890459635960185352818352346101741
+7844251807909360860529020528005655952345376045413861757127236316061244993838373872852044455049706576181912407467785016013363013
+9052782242469623627138305243693885375972159761715793565717369599576257075617300500868041008633881912456191819467065232604757474
+6257367548773919654525538912712606831341580701967173140576682703453195979358288347264315572356542410824096892368844905848969800
+0225531033632269859821449136659749178099595609866207288912288428688139123199517309089785003185562015618879502978274246919977195
+3412420395378666741269488926730591786905587902546167052955793049551854045851796515140844301739953615780488764468845360750173095
+5314569125098157310473890637519564038989130593324658307078574903372187794019987998391252363359372204089006276213106238012887639
+6663953749875926737127213800088216077686383881272422931892106536521390323291590624983492836817664288184016273391511477345251544
+8638673096407867791116469531963581105938614830552680798696429006418115851082700139624263097469936097502648484256024821946642846
+3261638416472717635495620507090713763983290274773473746283045337514051847664087913092670813304318998742601034170158553214610079
+8880759198069479182867513797991706527425937623927208476182273090404608783390855357409578977746370113730628533384722500327769010
+7964841863629197861004282115308229708980836184692237168958174288698996726561927516939282475998327300490824455643829853959878546
+4078550144875137620442196894251820235783690433882002285566789090860837373159507997956136455505729693351610325429624900264497493
+6050282912476085926950954499140111563620447106769829012752567207785593165136710295523078591701424407957863045561973215300362256
+7166661176552788865443610475451627720514979209097163741564119254519710530732032781304320231265321064373366029789454524964576034
+5731838949398822830420671258681703806386818639376155723888774861742977966282701086517327314375297715355669245126118723701881276
+1224558805186365369295742263213010659311742471260411491616914473284160243356280450620150570408750609913288411042993040473195864
+3965363040687291139829734658431286318462224708522925124414942719604612215357576250193871596416258769483377169469309016314582237
+6893425774786606424591335564336597467021697313261577560777519605605111465025332099784940659090512446671447989183060023172745349
+4463023117754025492704298169088346276715292811942385607520313996627188228077675005968319409041724080200894220147117291796736469
+2838367610734769148543248796176416656292040941138404572575878998139182976355595776291061040689581132913463002164503763638521768
+3585007037968899533646050958305472231296473689572926896126127396786068936357337467731293075452760614111507010520769025993887156
+3025256134722351463444782906552873128386686368275305328178049328442606382059696387241124580313700815579068965097895955058791706
+4888785355196252887855666442682481926655016587897905441501499624695729356509071382797002137717002280304447105900656692938689937
+7373767636755443505506466024295128010399690845976961083809222125377563226037530095320414396885247587842781981216438439176626761
+1467040097296217610154727986310524824930119662672041177376733844872215017687323322767179584613934704188382812120901100084067248
+0055261010703792927114582278798343530536332871891286962151403775103518820096790537756954678439988840466572934380472009105374277
+8745186553258777370952969850546252235196298235316976663904366268611878480055244838332857644576178557847556193922108941720480963
+7310291886872239579954842039199219595404202222951474277713284211951970030467647252785199038918806323250107496561396165925992981
+0269739665100112200470147709926216131752562563116766321854129961314938822821859829783043904077776487245854331065090150597583869
+6022034598022521394602277250974332652859372516801989113143038045232940829875622476147452690929605127893923207935810728978176813
+8336719184987758081413476270877983896287998313373933528191759149653154025750363065606417948489184358633308380877845477894994394
+2211461131853873156810302948765499385999974459433061226146423964769287619911252503115962272972255899290410107199334224556606196
+1402532784763926313823670409002705225482185592078872442217786835593632982577282903273472588503956076522785281354947952227775013
+4429564170373891691353053299293858952840011672714332817264920331107567378250030393312486800497701640449816183190591793478209061
+6696515680454660415306312055092012435204898424655900246268144415272389485588150485707845045690614308427142660270754614963190500
+2858971388307084324374434247865554208042477256400063151868591675576690659860039137955754547923321131572573666015058716528677560
+8082431519645786853787074095747644469767343409908775777981556502295146873300678603062293673505033125364497124824045616025095406
+7796338540952910648733467788030865929612271961440794230689497348772551503718356824778119200166125356293580937006896521596909494
+6623286777262305838866280436574493459341503722464731387299068764367690003490556552997864648359791608273875942027789979081747901
+2820762823681177751588883983434913077317012385982082727245344446265775140411273692313089468167013918322825570599659499017461253
+8261747834117161824733335000918969440857899686470868022119901936951959497914248555296472517607486195543086996762943719289544222
+9801799673583374329577712601117604429044210658931033348348701101269055569381455391166077387776701104476767458640618577366620088
+4812671524372167827325442166901095131227009588677251478248615586184246419258110774327904940522040756539440861199193515869861850
+8664636186261176234317788607818904273283245654628256017166703040583397980518196864696741148650137946657712844496351414683354360
+9233785042626900594870398424394786589093845861107111076865742457098507103631392813148996022790966610376381301013746723765671101
+5599585345939628248728616861490756773613146232759270658252490655694524473642364799716984131253156192355158951050342077829511934
+1018115413367504225955575347257464735373797464835594482025360169817251469418319729479090655145106287600720398462808509722342523
+6277929810316831402715379663360019513470321307271888286707156176722601290897267704973159272389968049881611196311224142002818283
+3935507653397356468132051961271044279593473480413318195705016813924079917284710536189206698836513833423232062305170527285530270
+5930541214728728710514258849354991541204981028873011695299038161284051747700208580498162480391834623057628739847088944321070540
+2131178112490366896971016249779880442716420462976316622931349965957507940779710818286842266030393060843328131735676772739856028
+5339433698747921036431228649318038784378241814872129036313002907877189828316605458939009159662654429547906907634851960924867766
+2725144295031618884966653121214453016640389429569724950019640175004023672074204183536974715285043574870846234625695507751624691
+1101023040899658835128880208200979236233784480432079242348382094125974376887755928733596001730428491870299057160651502141598807
+7529805201863368482438225714843876867695794742159176187308623091428831090441762886002331398279108448588579520003248961018841987
+8520639531359520492110038481387012497220545183327686786319255787574425654228049283708164761318908288816634942299623177967850311
+6808287068903794688768313922352685578188040716704660250946776133077382541811421559714303292759615754217647905753791800896114429
+5661937959933192849164004778980526700005624355990312125795014118394734147334017327033918908976463421944496702296931260093163478
+6866390898079223822127023182717821447021210719486206672090868302561371850042810557962915762631762160188811564644765871940463260
+1983784957124576912722518060888269293020694751991232003856484645400501387457614453894654158242083061986108255912461168024044362
+5023757063288290577909452112558045920010016969071712896564748738667312129264760935144195712725562634643903560619975222875598092
+0140266427651227095088902077296483470532188392053269670883135265668245606745264278532552540957167938303029227319042084398428852
+7212818706985477890259174108784143029357600406814727037979412733984989889987109358055090912357026404921211609781959966663957665
+3885309358663398776897062600124335478996053317484403001725157655044282776168453835403175508740651996708988152698983678588345737
+3549561496006579864153172902480324325137781423364931522958523431287424861594425297230970169266435951937028485126756644018421959
+2100522734881499893473520957404272588614489603694208305341205355969403603944823313607027770883562580199458807047182736184431355
+3558566826776678787162145637003470985297896846344237649664211727912542844807936273529611661291547660198761650362176216275159276
+1697273051970401823436818435327916444246809126780823246257873146180484087471375537086616586114897794676638646530157453530809297
+1877141731822379123458355749374949833686834219493808460922026220049948042459289931477172440353720942293259692771867444391010663
+0596114677690135744062023310258035439858771664427542203238516588128327906442218908975480077474481540939986337760369812161668739
+7140350695399428116941903267710113882542083290951701275369344655927910523637037185426739245384522097331905044898640671070017500
+7453482207139204385313210256702640687353020750058344407280878423180101848431141829884177527114462939147014281506261604724365378
+5747051408867537658614820169384534962462911220360124367460201651929905485919878430356918185750947336103425001412723806012420037
+7672418158298677361496394053891368709542765466425399242228084774006250993472472890952527381058062695609973430135097018848485375
+2721910797057123953879416244095325096151158592383520642643416351496904866623597785985406941433201519864328401275343395705908857
+0642983563496035432630122777955167888076028823131047975325063367604577001605053104073667764503079932854743114362110563627584697
+1737450520589955785122525243234607141022634008326290553045379074437558301788691892914015378729774742647378096844792864200227145
+8049477947243449894011256046326611511617306926576503154750985615770186729781372043096871431456514521234719945343529143211616132
+4060930164560164022219102032312173710730634459253495956116881900466752536260684001258460015562183214690371015163609148581576715
+4339672054138260157605312889148304084301210593319661500758836115820325521753635857005220500312010112221791048318710925629489360
+9098118884517110952549620567550824645268745886275953112452963794466205654973301959016969502644339312155829940467386423970146851
+2030422710629305679756784568188030405053813130034967510951876362126306529129246017456183221963883892572064857246348841309902207
+4014325197777088687588337561652558142332091500654763031260105487352116429628561906919380099545877339112314250562226830515084041
+3366554959465306038343578751837494403196208574534790117389855546409717054044483042532146409499847066640874035730246190276785027
+7784874865116514506998867941821004659533959527747303526874272093224628939120659783314979799979608075209344316698881835617720838
+6440603777916554902557821762272317634207749152011454338456295029524399535728380230269435936275288518444494136138485427687743672
+3697767429372731488197371169546304182440802429138205900920907076873491237616407487249087243231746614255961699354564621444166710
+1737116215657118949418096366707426664676852506304031637797388892083081543972250240515279155087924413491083737598642466601038186
+5943501997584026886556269657780895221836455524956899348998644491412008841758015117023754182242908647650511196372757530427844200
+7126098691386230123347928604422159107062602585844839531380975985325229120484080904014468470157441597070403077589128617082084491
+0277414078111008949169676840880976444791578133697866086476338429943906280786246925904505101785927908752510981120731146336711732
+5011921703942318242688882518650473013576715256957336272842712546671709676486379489552317943731327342059730625728957322661925103
+0879272542563908841343149899911945430473689164183260890378649854294324088836226655479509126988786763035689227450447066454969580
+3635797692910230406460094517526461454920959082159212413377990917407487877377494660930246389887432321322711771671714018210018244
+5496909568572645176488382324921312621177838539677336553279411765862833091060541060811106495286938550448561214644311877956532326
+1372848285800862888898722477263959718622329488994306400315469392140836614515990231729283982778367781183582185203884353672168533
+6002585963544294141850925971586001726265376264686412361898087738304610666926697454083310088708743790359728974336913706461189057
+9544994601782264143680659072037087516325897282651078850550946582804440990613134903404213391711941451230258293606634693846961977
+4294296739368718314807261871407488388139897913896057193551518458028526780686105950168593279489650803151515173510050942218207014
+4440222769538547178501749374936219442687195706297985586916321673062155148432380676822216859833618467359812508595764374585042802
+7090291929148830504311787542972555491835675686001439326827409601590115100758667523079283454747571560861565934370463671494879471
+6306207613636744929606340131323412825985507087453258431275338612289333774848983021189785244607159387364635876091430264215902551
+6978625947059991073203270373760209952614062079324674488242868605448441131389947105750784088354616643566884781392969415722350013
+6876895254868693830649346298281314621651851243964761424180528331393082774872122268180557991527876049313013835528942921722633863
+7994555257251266617368145187318488777925218911343096210380569645729516845387191015748935661281511118325824054860678678241487526
+0561712487759666786219959935849355827031795611802441457990195006279656115907452353501575006228849649556626967066612451740817401
+3065700444272921097020103095032561392189274167240364636985217260309148382438375007728649942200430100798750588348282135626863041
+6418290958339960432209597429802884987767056126860829761197583897408153172039938420304452769552704862796110442336483929988890230
+8411149220304441269312528476234638082926201849344380193272700895522547783655344727512614476846755120115181365390739989354909216
+0361827006206843386504436443633849307138803846456656207910374387223474485947474439419270873842802147250905121223284959187002960
+4561901942869500550331725452244098638243866570298342595884556094097612128702524209824571526031229091793929079092201659156014426
+2569784663225002575851412395224946857021846888745089626571792624047307039913201999491767773809090290291368272189546699726924662
+6874345054057523806453164208085928558404937408086499251394158950058605789150302667994062909598865360566447853006716951800116507
+1806892347177795837940597487685027448543886249836281858785204813002880073746279096873385938335081449362375954555853598273582800
+7280197984136582079744511307894765629896405494228558457447110951049222331477610433641974978714281803792968381573777298819652746
+1797088044067027854938520030542484156979879022746379761147066454374087806486473993175758842146367406488679492927645706548068169
+7653106688789014002295870215309142445613718219291306854675259348422471093504331308963443794325054200760084750801107789128152322
+9003923022817082834921721240788410357242843286036977355497738812382673303415071169601837346379966066053060156517838544048108090
+8927903196351477482460887787174517966173931425526452434853205934174795153124436599267973662874006233354646357728472499860554504
+3649137050137288600334652169002894564926317935052375328874723351133720379648102007752831671041946276927861278960706248758820299
+7881676548153486303936365019720006418330263108526672450012829414081940012783530554845066547004930367871816825750941800388750747
+5617499751970255706526710234532717339068075364068621300856559435412791685014748892438638038434662792832126729610856601828058978
+3609505162338640897172019393757051075698357002384746777463891780931828353562474692966266497051217520058712600221078906316845512
+4218942164849049619324701770389240864171286359070468568203895572380950389773235867347931266228357895243861158024586703415416725
+3286877811857113758575603255834974713137243819997694752214133530728139390482439967896436662426005413536915227299430206070281748
+2197090522718698504657769582076344098155286933671656794750871593655253531647336100969432683359373204499872727545324036411875127
+9266329520011965890398156813860326403682885444460637962832683571266360623432333340007962893574859386016733773045469648300215724
+9360218780816808197711206028145267393233058010562551036732947883280144516446467977991400621686114194941533328336858706301853920
+7975466727102526807928730597288066888928449183473417942716701022737828267407136547666947638756923213101355014521544864295487342
+5529807372773853881156331115996145600478892095295063408262502214227819442322854320893250029815358897498644974831455098851752144
+5217677466571168103885153319146030362086428120742099054171064034691470505077333070394007756131235288630142015715989289401952345
+3238751872112411965525172279795754140090657968922574492232135102357083597107656178253770512768121887161690539858563177051498031
+0621143235328817027584926551312004300826256116914067938452329926333908173348351478521275486940271058902772821984682443421901374
+8675029994765542582556780936437230200725353322681947577235834861538086815882331325782379515826004655685444830286018743065534290
+9009226484124905023296329465126310425464799999137557622919308471018246198151834136297559364600044830857980861753679005100073906
+4026810600660421971978121050945152770853655639964897333811108395111596792046176724058242259398267547036042717629901672105588823
+1701174760060091817941457573061071686086097383906657079983926029247083644956175901708832562604741667581501354921250883246878076
+9360121868675405580012858168094642670756925814930958722345840360155035939830719501362830202256115680429221284715437831407183230
+7627384360887381611002122676157337577850291681707758128451482725333215128574377639863228270429176470896652784523071172226399208
+5924717495388805188609979501739528551778957144375491268555383034743525334962407264117945701829683575948250702090310348063964292
+7285038571762987494406954123411340680613165769286304746181220668099890216085869650378284432589286853709759806525223094629118994
+9108371459503424585162428035918267612861106220506440110173672498423384456764491877643881942033565719022603374698498258614890281
+2119544835856779238923121210216240209691871364625727861760840643200609817224777039142791222829730821468075117365482012776292615
+0287625006985324113383256843550124431381565006783532108722669073077586017057966762263289920449445173729525567088605286164318499
+3802234646726929017573814267132203009806257343348973659561216577528599490870752429375293883854127262090614163544620710283467000
+7574267833171812189998339587827378487203820258567218738257171370030553714438406356225807045913475052445364294909346459733645424
+7057209974818106332836072380332490777736818456915022774135091028181738711236811811377666386715288877847647340595585098875240481
+9197215476954479756497624010576859326493604058234153493216522641384431342823687635555610194191608220091909666730522341780147856
+1119537820044774998504706322100346395055393450296026673688711639572331613882591716507869222690391102545737433635859812821586270
+2028121903848368987212538442391618102128444213522329584551212886903253244685970973210284229639689302832127513289597893485709871
+1139101840913818162477340055623563542434178020287614160741421605723686784042526943742745792272929328869556547712709877327596063
+9107408768006237961652791681788083610784715577214377191666576416371990600318918309907846332307177843177765073709224406749447169
+6733725726008450978073741092474719053157935773438091672305982444490248804288080650618594239161482780330596854243463318510550141
+4618707611170337857871421415147893285747404164961249246066409955331826510336908541776726066361511390478520619795261534651528646
+0029871423726184455790317017373341560382122160829511677232857909382425970016570928985722750518023888742942482674353399294113016
+5851677764630543407742209257890179166834894877003624901201481696534056706522332095998210032002750686323425734736641298781343895
+9906317458124808949504199178481097664951999312281141056844360268819241235749855328929404804574246937697891911753442746410513511
+0301178939436270473741478421267690206733306236983147974561800903978683929049444127508643906957999471564453966363638317098479091
+5695590670680910148994003236516725327853434675592633044599651978504490768012904279502213144296250305384458215615813612885360699
+1739488113025246606429350291878905105006718514335177675021282668693092738324431010591942084632165356255063331639570681777622822
+0452464599884896996261376953519588463160916217402746423924422154683861260191652961898971705302933158251417160490178433853439776
+4496351983750730650624656965901956261109512227868877661440793378743454026849129576683511149685514643006637302234104714172349199
+0650873766138283576167959756442091757660353703079228843249388294567585567331488037468607523624545996431350612623181744202876623
+9217884841612782253645748182653936757610046223059439143748083525756745987386187135434504743166765496977544377259895573270803669
+5233343431863155649799928568730055354198316775389815272387174921789883067246402571006054994197016258947251698092729387460016002
+6222471188835586754619063338314127078684770466144889169048987130424673328124774962008878054843463980934491177848530073946295466
+6092983987521059016788973113331515120050882840886284842856803861355854867424082016223127983920367739842939341557083529339357539
+9152847423135593002663232861455632334026991039822394086654099188131348343461957860123922177650787602787823148319677335222779269
+0688837540315420699495154888659745629289164825587079409113672585691726485783954257060693018031835646491154074592682796993759642
+1560331745546205131052821650865965767504353088368099838110467887791087910699782310016063819056506494246788726522788847044002972
+9843063757395851013539217226262322774482770252168515327930783086524549572291277963238718919614771432829552926078930464389873382
+5165503350814374626462147517304790280393184056104578516266158383058163824599464967401146483647756651293496532192439439145458877
+3334882919381143165661074051363092147447735703148534066554968559573383084492917940343234309775642206678952812922080261015609561
+4150090892422827778476783958648862075260361082863595155851728025658354185826522324370827070485157038772970922137249416500335139
+2270729610239360993359408455484013545432335012129825782822705159183112780581412024925958595707332590452541348227573704213342055
+8812698543571227460191878467610741003808872140196791243938096775905061169632652370417102797369863591037024610630210903737953654
+4650850571724314687005845773201562588529522607481288290365062000530992710204626283641702861862037299641210309359904939817933700
+1541143632255817063903213640253364698002930217355939377060114361273809860644552941254027110592936933650281526566113066201345129
+4904443218069061051090074486584977672087200091073688866301081198367118241651115030647481869824608967401802054144740280994709964
+6714819600988123781424031251846423957142678675252652218273564424036686308763026328451858255344930462603371376203101104448466961
+9509079835837547622180222314290215064732353288206452347849664411672496172109171750484558066698591320017336090478613367662057930
+4411722606999341112288605914814611482715323396030160357274723566603030739104369997016486251468461541345322418772128759607222696
+2948183785699572384084816055776039138878581148811752092336317365102276231176457487558011884744609026187961229782054619496985034
+6425095624545385534119498681567553265889108179726785664829530547971892685921754372850536788921833807429343926950424016846919855
+3908326069100657803588698889883675042505627231337237747168653314558267673583632726264839565017058848634863075879312565153073799
+0321367266050720934662774520376532661682212427124263069420126600109509081952403933716651001460064949865799766176759028464538738
+9741038058065551330442704073919666652946527397570055939551345839830820648016177629571594906346803356773604688620184511211636838
+5025402557710775296650014515224591309232698067998266520271098024189399721692010614452489061642157793190304607388980065831660161
+3865371756663396962706440110406172511579502225888432146828231479035598172810500698253040173626514931478221885791112009689705108
+2972286823839979161832311952971045738890113686974537517223372452946515286365656547601871718080007574659696313592727664057554794
+3671238913457833340723922452738592109309375009714705044237276003225833183922594035143870946960395880735557105535062577056078657
+5639824224660978396027300014663032753936090244783494976851962014859592152013834741021570506331633866559318037963618148063022083
+9565507482964988994686034476299289689477300610763650942914931588839058915298408270882723496065586551944274748829842524532900569
+2950174215698554483745941905548644387438215825109435969023495189379067472134512077000118600012988374494816155364721054534508820
+9518525904194943790633186346738672276318778362232864095452323156494968062204689793145701834333799109246633884847638921045253621
+6777489268860937675801194897856962853781999286279373198884776447439334574892992495036091872659389999472183722596570197112840487
+6940178173947556103657708676822035069381549630078448878860057242455764188710473335746627500154960475546070307022636234086868814
+9329686102999304427635999138246997518586345169303923543680994865014159368545564362656579126189568984209672180187596509411904289
+8400290546843033015441275084455799605870040808860666105081155326036596425585507607789010815662662324838353003534213828215099749
+6262731155067666934829202231823905666280056341904107277513506385716411353609764416145090669300953084810469016331307248958077392
+0982572667217714967858091868055542854621721843072461742877828288780619596753823464439165581485796328231801786913442847252641526
+4848655976411335420584575046674979122655105315200347515565901735274063028061587092460808297171218521824980966675211293241764354
+2938658446761945214970070404972488238286005305727629688975307477962234711112158327154676636619409638849544823620779316735831746
+9233723105727772276287999774922758635916582468201648663126732610340191585232715185516172590941978497752196971596838962424314214
+0715690795433694724565717518703035300373548926507910938888351542625042732566820561320308097626791527666632661894798286702091403
+4964320219506572216963601199129841376254539941692757336784083929771858734782219556315822673159169808692321828354292775097642159
+0335559611733921504268377474272853207366325430567729920137620204884173222566965027114331948190426982554186105784631841860371363
+8033508558384267940900957170710292773682470738089554833769290979485707252598489360936633550982291403202103393568639544279214517
+9104033203529399347159766145704434677301867369574628242547881760927798205454869510642633732888078982477565192220841911379788216
+7987660031763621257245807669247102344394837687835695594169011679441270384265326170270019240149525684618010449694008041756350062
+8151902440733357075969965129856431003770185569733670086864031515027203169324745948550070082363039150127359144961399154724592013
+3790327961179853157835883754649149214290489479319422066362773172577179735157530589191336297098156970651227770438081844185734307
+0727046673630137406560803707058042940068228879956058420026237531511228698088255979495039662974032046384364026969019919437568764
+4204578688546460366354226690592321231974552743860907666913839079477111780605991648504857092410645662298682793993079551732419876
+3756294405429570395559614676089322871628319405115443082409818445213875343993774082306018456892013141571878129826624772129903802
+1915879655542608031603048228973067523323417771894628549592585367737979812887089684899398996853836990904295238545782994463736003
+1862917064901509743356712523964887969381684280627429777002084722985720739317294453681605121270099743339673719320682461749376518
+5235629358000506017419756442938714321316730985284287276160530781176188912088650998156658168743552720877268116184356043543445755
+9443882656574676998601479646029201608533720364834332155558897088411735201080867283586900504743773546108777074700728937687647870
+1677493272605889337983961765432999426943110889282768474699096119469883217687878946342929523139815961885455260346054616901453447
+9942749715588817104901581207188857800673119328816832808571244811062495461360073125883981969697016073423707659358263862951164461
+7589849154636259255662987558451236625196817855393407896633655975124730683842916268495164065502043203437031707489979618651602416
+4877537573726160052953215845080536556910640218250727320033197474127755187683283945624270057808449225177808596236183681916214308
+6307674309759482316304083895463219733480617515657742063182272951154632706337489064696789783685482205360435876431996285794642684
+8643739931017169670588941204387320679922643218218094561807636190505893287798227669018730741719908408353128973453099243266062517
+9595878873331613803340153742041195527735780444717553915355354609332848505998881213100337678158719821578770031967558080136888152
+9826258075448305567391906666815695574763625260042694682673443923778013491658161518721464450500242508138338760627120693213553580
+5553946281220024617384962807582191448987025563460515052097885240434443584003120884005027893320006209592895012188176773812824397
+5351207991648894581591662853877103686069327469518295438143903554689747912914341445196157967066587607931175822601224101946313543
+4718020971952950496510335972370616351651238578779144226177776993578212091520634237018822715136461197024637982739115303152147863
+9502456279815158271330961578383078627663170821879138142148906444928946168505151984176109046790336568113096829851051335078064246
+6953240969636903319954311768057533966261755313567448194782711138760563765547507739230406557393058730942539222575666804143511119
+2069936646276438376676948110321617772893399556260252358509335079746651069969820285929369016951090713864814429938558082689945968
+1521371174145731236232976467624651809029170086344894245707746268123154057519935873219521049882236870962226595226944947282873198
+7819821085451992801895188229558460134173236266804505398682944828070031878272264470195089873005628963880175293100970223151449714
+5581893838568192200692899357118035029378571475716773858918510887575125236858310172913692992079179964473799145336381338174573764
+4769245956084317711076182507252518842194925936437279722455907758875435914157274173921143663890367325067229935879996805150485626
+3134946076248319258593699700301770098983689499295660906642311982752703674969335911328913636983282731424392564971128071529792186
+4653454953851844259383149899336223085116998954459207141602572224661191223836954928657358541085552778110770329785385935394034672
+1848527104180913477755119395683294511819189869818050532796513348646616780772576901429766012659310230873210004958312011164035296
+2958092156871189322732011639055425235756904126336215793291675441374713359747361020499385226744232860514052551561041374928704972
+2212834863497329670476581032210400927271310708293108228424935554688407632484416285274174812931270321948680850009808218617859705
+5759858970411718249018834966145654061840913712087092866138009251429104683711023685469060131756225674409696442152891897372343886
+9744590632172501257249804338242668855862458498369585009073080663432870189779358421204658237236159348444067179731646552147785093
+1487302286960634890703793800583916358993694233181958170067964772301899115902690629049952516027344747956086526751455372742400915
+8338876525824289493587802849949027999302785007312125533604872964433845704867828931952315117389601715858805797176205231916978863
+9771708561966315440823738672686475996359300091791133612159610896088743156170335643885163215910168604808694162494306049091846493
+4260246980990607411798428730055796631495823134395302589335824515261468702425017396399121744052394058025204383900792732372609031
+9971700068769073722960546542881880186840993544233005529300285659415785115249158554970710339057479784757811267863305208596232681
+2366740530644754206054437467535946438364093779279894170145358386159026725061074970741778654202207224942319105808241561149108640
+2131299570746273126264570482316141085118510380774029845237350007337531371596475771574171940133305454244596824947855809667756017
+5149174518393308544163272712602730988826876495407743839625377436405836969824290538418225557277170446225596736304939253815552458
+4121823510749511107366436348094783330267428964699228112245771169272372131739184081655990835742337126629817378548166241761588650
+7681892302838328396599913751062470874471102029977403036886581893796472818466025775981658918091981433719370508505357431231485600
+4066251794397726082230815863792863498887502338665772599923859722198014368910671442996024261604600584351270667582157099044750647
+2453319243126941865196218141928398513931210505017908632678271906294188175528244273588712226403525451579574075491526959814201424
+2165992720884571403675858895697135732268260556618466022757708781513389984131289376166641651464163701439701648503883511692095752
+0809953098069693344801057772787094818934098518685172639722513866511171301116371082267224802273430384579466957516125344869179896
+5481982401939122614289521472353637017126771394148320518526784723238206085981641590886685015768028048372274104457267692145673344
+2306442226244080959840391166046824665212018683995806330612693877379188175903847065416666586796553782166003940513860649019698449
+7839622245401117642004314710277578314230150041129278793586315748881510113272583096733556513373523207978534603403670731996254473
+8688617881383905361473235374450468814839809922748795968256897565635364988983320676159901781893744135189821124712699202769736139
+4654535121453878305432208653573696687720659331945282280482164376466643366264403854440410004602377849435849425047260830549050573
+5901354141130553186089991532215523080159611047438619487077531580624462005235622602720033994742060589665151566143947383285531360
+4404189049080879563477017517544794830939312853525609682809863259313640891722874703005379977055110211171023836236430564193209703
+7229494566794585131912570254848123871703487763830158261455284479338860024826943524410960337002804517176829321597236274083343832
+3895863444104818475102160062282466733057017625695711453552783055209411033854956586687106898952724582542873871156820426292736090
+8900114835631317986947314833806014993742344316565623294563018259706162592235301529753004421871816938486470617127313453996556895
+0571759514976034692556387423658377978720336611483511537576020419517170544073326612329641870061597096528288442406290336718658618
+5351965547349291678130305501394296379111242594063885471825143788366715324130022316640730177505334429253870301505302005277723169
+3916717817342560503418340716556896773392571317597234277462755462162266315055085507027881148045053452399408688937434362014420860
+1395787899840181514485743703752177228078579014380638280483962491760489212783979634460850686798659390084425828810746413759168217
+2135670387347630269927889910568863392759999570308499518950101510541542088393000686133918165399672601047703855590903413630319231
+5402756885639965603367270976348755948712799599490635951531639604227412641095043036804481527401401591963544493042050777198305908
+8529853370862945970036024025436607369800687358272778049961830381455619066198750162208786259673987188349784621840620855238037708
+0287160171661419657676846666977667625410411272514035315874978763125830094141664498713238305106795904657260444752711842879767089
+2429466318667908141926838367968922957966923427083942277132655834855250930739506120606993470384477050842837546690187842884625651
+0859078343456062742869073421013869747003592646292364644445549193378529859368317830004107789688729965524376290149979489394466571
+8035239664854439337661491633430612363668270550373199092404545748888325504908156365529288450637845828980854077097067322982777549
+3141023341289995552305686646515529412648513395018325323202158482204644747543553961230472458295893311161675174437937559470576749
+0847147233703839410907356117466248368234947493218430919253855840473886381053247491509943700747999091387943188137392889875056078
+9027561924408681103294230082697546064172946790782404069187548612190839473120786175725940158419889526634026805571973842865999326
+0264435567708660940819192568711718952454625290701063992984178907184987617554072919582117061061638475508286749372288750484810591
+3758876219081855315432362136232140221117526750802434000370402808679995451358803624973049460963970344708478212627401394392324314
+0737438132749076462394577606428117744360361527711020670066707010174337101948368515240770186600234895342764130573542724774509423
+9073624026312594849755836859839861773390790206872160912057185754009883091290659157623485315161215679742322663821620022079418138
+9512292856680689427009039672717710424584681275009917377139164236516131951125126982668253717705356666975977684408510117347264524
+1614244135791303269397434529358056292497647554306953362312956458703923199969180084694524758403500654442416064508250070732846804
+2519174085201627296034372830011366838603028175377849633378995386798621551863828217907888881997187873208215147973680227021049086
+1003834843003895903348617625671797354229539053440753237068065646834526921585552402882071062806329627104734866652786788079565348
+9629790405359972301542148043545627855421437234097522244411526361848299030888697549739412058687417924390455152178947938956747613
+1220334555078453153775416863741025226449115088431256895031662080047877074330240958104951191074477627437218425259277775462127879
+5330046177874455391020429152325102772616525806909792370732670726443060748075990477694277944732782581654693994482617923050984272
+3673634429035216620140695806733909073383802026068407079504394523147664262305135669486209989893714484828370038683949845972371071
+3708115456116104837959577481370904415573625213784335620684326306607428751455492651914598239687297810388689807875911114963544682
+6275078866641136241403805509431449819259498303907303571719921144438991991012377399643498948247855847742996423485083104296357966
+4819771171509939007698439213480827086866218725106376148904562704537146213203839362150271333692094168029380425896012121918182027
+2363813324380838896838697582331955348538206296702138518105826516120031079298034769024454364560040544650658193748994518844922761
+3584004325313624962617797426518359904557846265454464840046448902633251444504148633006804302389871871448461320891471777760471406
+7015140209188781023966520963877943044151556490498938297548114159848752913311985584190436463500622710986698476383835553548754022
+1839528400463687701674829536257273749291910270980698644016289075485436646251865330303505791679775487148849253452040305315948402
+3145765566550173415234672570838174821210069239627979798684879235063388281638855085067234894023172727303768990495108093511731814
+1483336663514861984292197260930161194717688304395281475857151745194230301582456092278030099203677396095385627051965960418965869
+2854504524032911241727059077016541586716790096641727786446371669834231656716324311341476302384390592511402123780357675520817756
+1896892000036214095213174483595939108751482199845439848320000109938495152786801921343185996467957081886861283697079441114823751
+1013835470696140967938560803552257866025556771879993212750495494783316985507407134125075415195171213975980403552113090097922014
+7515529295471634503543767654884408021479006972212507337901526368761975637401627838535557010674676502841359449244736451534979277
+6386148785910089568558317754358991974549956833481352102962872492406026696207774586778061183616357702706148878186924821100084521
+0786007793408177523760641643227040330556706874975301831960943949711205745890553620154847773954039608277686547389729917607939287
+6601065186724585869718286730900507361468222773067014813540248318802263981782312642062065066278538284353552795463948608367617264
+8710458632884006689061619016115234211820116439477889276589203755014121466655765492211482958675286327074722685854832241409593748
+9721061962175462432000129864627652688757814948302475172688435098625740068901878583888711851475071264973226898929358873311316683
+4174366427344989068552152924708427538956427143878190827546384412926545762544478791156448578168011030464548344644597978114749995
+7360922452061081711320164728509310349083463549987726136205083770590452623618881507969241810844776231293351721107321616807591790
+2550845118266461695500217220306235111000226441822451555820123914245682646337932826709632824811050296875427929721177340139400066
+0537242786569134793043366211458572528023713869510543400208763370329672141795438795279424345734151680580842314157723144187850297
+3691971167907808375655388036762185591921761050859435693988855587355710680373549562866421201047569372572737260475884900803372055
+1007691946206878968978529598838997374929069152901229662680626003917658157134099448777326028788327501120348629153653344792265032
+6789665338488546383152814125714262232923477122140534949024472459646083579525928155625268840134301323030935772657800235228310313
+4868298684968408834649240926318299142611007662477773878693177513443928825272512719998804017438032952107625783388477428012876908
+4309202213419885445857524725380221565049288409243087159437144931986513177158450201360308556789291053726105045930369784581421376
+4918602058560708246713982614793257938660065153424340512931090185661823200932451770267967499779255156975310512692435013776152000
+1110183674703280644653992907629380068789930715341891132020648458097673681456412608084277373854376969813158591776142390000280900
+0445144418946628205657456424237128264942955311965086380583598212294732021966933151948426543613378750502788733253601313302851775
+2374366628960975291734051077636704217339955444337088817734748627762386830985963672836557693273405067738105684469127912825361938
+2027506449534260776940737096467772483868296281393345078755987162674894542324936567113913899614190563606092238595769318736510014
+4601609459626193748838141934701193459914056226332390088463312165368986927729066528661188656389710831973546586554245180984726395
+8820641417137341791284188339243013012221967809583302454529489453970560570507033795822714618813232104921926392983794422966946716
+0917599289793082450351085959141123440985146982836878988204562375158569611940037966919396385952791842444219407364739497415459949
+9477416265026706394163032606799526520617258416558453349947010427060666346412817629143427886670549081801335758913070396959720115
+0666704035859146354165211453275694040361967505403921624893044875089069215309652369723945012113209887458307287755360555234673115
+0255440161315757825615697585801039525106439960924827488627325282298838888854341592966844608858745754258454784788330547612148950
+0874980077738428750262349348089941932765130462263947980854368723919615602845763694707934084120416138718231554631967803081258409
+8981164868907222146030105839525610946849494940635627162577865021292617220051659027789888586435753051650333546661672096178778980
+2620946901150871449077949420947077759285135192780733116251997439655441528374111538899479815498280668657556929167956071921060805
+9030260608320606358567118378046750979991657572292125217943471649264668431650823749458443029769965695844134676138947512285494656
+7911546964476705302214543959264572361084543166660831362636246720337948370592526588629297565497381903059061404007654352003582699
+8922075574627020723499343655693848239182605712427393497956424335482790840429881008002039906918138130808630673506435738463196394
+1030007563952008786387120762737476786971644512140825923263748032598127575949995761019498818566016398257609354069772389656925099
+4044422726596923902940860834745051450250943536191821985629944194928632102239101274072099618807513448554296724965250996986364924
+2354577685813636309146827729776859816069210424412883327405297035176569137490665953223528983078628177275666747947529655966331575
+5477299131598928984485290428357889109417137134680518227595002407302611193611761790018230013945563583265000510580955975339191446
+1619521324601562573756521193045609645344126519940152032470378539517720502293336186421186366939997498341179560168270447355950110
+4230306307869293075421899272149696843537151044956328729562855283491975528896006550623263787552206307775364239158496535813468780
+1611641802461249957884380478543784809385839965522996094364642447223105495756896318541934272292804367584843894271046287233761298
+1709756805199283313621618096481348781674012787506990084789188511001769795898381723775624988249883268986469361054705514036409475
+4042054305280705588082843156563390558519428096353822906407664058875561059644605482196547535261726903242582076817607377960964154
+4253860999746516433043460107715275174182573491654972680242324213294530205657678192111601960601634649905585928529798955700154076
+6676179068384501343541631038132044675296273720164020679619589492139981245074167783663095317254579357724910508792547067262588017
+6293884180622784793929874980896521285454501177558249542530377203281315652064795385736617567836645686619617679168909645709168097
+7743521550856066318163410468235782415369091035062393314878499152138458241235674642599783367386177248502506902767835896501146443
+0483794093371674252980588779386498050198274197464907995529503130294921702208337296889908183028360175355797035085155032755797134
+7360019231801705667141478490298073274830800662389220682649304818227754575701335947775670426238672520023046096705399683924718657
+1560373958818879850684156471739380073353650802319300382801718291634025935869130174150899754981641558303334317282125650661935271
+5092493350585336373714086054348812631829949972662091014907535609939068169965945723736778889287001972766703372105697934518100296
+4734257102525392916687039288087104774233931626636454683584533774360103845888157407165794111547584642769928525653912147278806542
+8822290823497972283964354496248019949369662678090787983018405519062148805449317563743875081526769207312318307346979280704726453
+8280283626279949899078861531461602097441638970306234787225062938541682486544091938804453769368426982357391305981842832099966845
+2217356720554468128605404764499852161966456502338368106620715847133295711653095826628517163144372167241765382757784888551945323
+3293984824292108860635484259719926152739335450946748798660592468126259449417195090268999500256639254414418461654750409028017288
+1675306289991237206693384004427250238261655808453706438418460194044272886240166511333039026240609926117492662156547022216935277
+3798683710262055280473341604637975853707715733359848491914615475081846941708688479067522988710484836724298291195075742855018190
+4581874216800089134728449476207100847781237572690983431502108191722970308605570690039979318708286697553630513952137757229594209
+9413803628857147469961583711007745023208883952507321209502032469098964348049914806057645578293300641835023243516073565578336233
+3421265017714445796604621284137835957308268098924387669789495349357687107880833828961898545436375036341306978848338980923182467
+9343222636188028392447876071807038373006670961664292112334770077234449906744690005047749541517081971030139237186089097495754677
+3197112368581263984569948101844452284212008325999133835851189833940770803601768180655910037983634430639371254776873860967944989
+7762428156063656052457140048976461668407455298961839410706956245596539166362271685772723545123147978715000469199290892122691240
+4878440976953031234401260269958754462435834653516282136155912652234992770322924693740152133726104201502258366755195941397981349
+5410566039278422394352444668313290032035427902945347706947962717669034134093986739640503933965401015646443482046077453432046184
+4739388878693555231586220110918786353416678121114400297535390976972658914130824675010539898056712966138526147925359029678913230
+5886358316255011245098615464017615182438190446564591019394412368509357681569397482568515821423340665852760995420364289038278484
+6311541503127681976206070117236931568310981280275285971795790489631417369196648946460067342315632515195328396495936094906795027
+8224055001487992245066819015245704964683485501844381492046566836373072408682020849321689488337660828971885175876650163928646965
+0254578793821590283140178222280457619069765363934967602749676534057099985483967828656474230988014165618526645571684624945648693
+0109665916508637725280874977575865530242997110923401414431409335639376452646452851515568924163798404754643876369338378812431753
+1218315801760060263870530314784967603071899867258461326183988209146000243519324558810891158838383484826158948667409186010480817
+7903203377696988414945216232421892536173370183150633896237853253925354364816894136252089105545529048726749085139508534886223860
+8148078797101770523716078377874332667044042558325146665083596936734559299430024125955358519934955785765198216278595449870598677
+1116539363983086722722201448783346777178486858969772190694450961667734803002682120934093453206868817575132463247817949468716367
+1637275206589839665316460804048412011573846372603155744795091025936193454883889805228527990919468358500076576823231506244498699
+0027621847956067398935694606560509614067216464874695482321462823676120479915649013012054108931749591716879497574932046754706928
+4550965358813639986179681154209780873107404530149950214180601478806568724333935291072801881538682786052141302073521529721130768
+1636835808005913985865949033373364692120504151732972595493618693947796782831116462924175961942781719381911750675622713009187832
+8144555119970713260660826605512619993205968791014438812251863090080817574324870955751027471809521051989383021792494139844493682
+1585931821612292754292414253292528827165768965683611240737666722015320896218326640019860760530517054982970340862863680710846055
+6536681595996347954437568694119184759342070677456835801973881107420392523103849305532249049602562479138323295711575175876515640
+3486443061013741439479986438866229511864021882422370923187276377158037668029544320414759066219016776345013936686773434186071692
+8652668214037751054395752355562459984977103091936105931037362668574357365575540736744748684242434859190554622399068882473374610
+8580093375714553964201167764812992676992679093090175449230495342109288752328986692009639151993677096258635370756684860954291469
+9964866699458956436463452444822527184213143978744043079921280767307287341419726065990023057954791661193301961189038570454182768
+5099791381798674690627429376704901489902412978407791536768610182213492340739402802196624950327768967894658802241237435134810216
+2644824029820305111520479567245295948221720974051912855629977767969256584700072624737697630748957013069006968156707232150642177
+4694014156265815259320275858444952794733981468869946419687206201356067556770447737925027827372686022309398793525531551762030508
+0692322520193661664579545021783669513925271024381519716157761278129858733071273401229450196329877841294994307214799190419756421
+2529925924690763185785959066401191385349387731434107358942442763904987402826148766868356311114428295259838898928666272489020921
+2079494677073945124622995106365273958525412410850501502163733379133554803716983972906533166904636077433873959124786425510691812
+5600448283577862312179623155268824754692832396408303848264207707120544301021495705368104362648456117090809527815889327217546635
+2343977389207774815138566905589371213682572216665369482458860895527700507201800331270809726620829481769123927780354816652809008
+3857604203317914309286408408516621032904248756858927009945259813983765983907916658284682954733130678932128039594166445571290526
+7783506576165023166951251072092917407173251744876214934915430447355544209919802690055207660666887916247859978935839016078615261
+7480703460843227445195199879222716960672528809567298037159358077924188280933697924269515298429095424116709060884750185401083226
+8717064476124069485152260308142874514219920880901182710267169211713742088964956637523570820108183570127357202528608391772392065
+0183762641286324428853776063863402233453633712505217167155150999046272831538702513532943824820006210590058738974696140094824531
+9112496681140545311761452054846654072950289614507391281868179377997604366151409215985425553727631766796511079991043874131555557
+4848466672408480575274846878733482332783913190570793476048801496992752228173129813319287139570412963303092066006377899503587208
+2004264846825219154033402067536124920004600149381068226608766267724446119288301005499297409144197426544971420258082942394022997
+0140320078386067723015618497818762945156815014583969278200840575341177014900417018827299383394638626203285185921061940008032865
+5962478195492396384491797383201234602669716423445444477699550016949258636112731978273213688262995924599283114955724957765374843
+8311990015515249068920407871121923281094596878515199867380540740586492915851905851867276732161963585489156521545932776243150499
+4592710682075197276504754152068206668838563346968654451648904363538719952128821973082368544846718432978965867108316589932428817
+3552163482893373255049569753046229304178905562057146740570805257427023711941189943044300807285165026750415508222049580394911287
+4596021173135544782173915901528349195173147664807647330846216356295629295015969380040305219923049284417801673254103299322068397
+3943524404368165203936926893260166313850279802117822440456770151714171409778904837544726372346574716859663114202887576413543801
+2969116285326615235890680734637608834483184611588075027596448992877129841445196831709848480423954210927050978003235143506132046
+0153071245386120635128957595884412738484038627307517440237760302728984006580096280602129668935036883924996553872412205753013658
+5621357475787817996023091217050008449865559719579810787563038126520104376758261418798236153692393962370203265309058313384060120
+5031974571476436448786217419749048851015183003367752606459920605017140928435866977820091890996541266633748940714886983142086133
+4562696779266374687250665129144508120768763103068669726719903362264420017240549417302081941962780048493798236161080017811934325
+4744441027688831600256636793504579543928756869184371127623452884135869811364793667736493944686083992892480103958881983194171487
+3993112528998853349337977120649249691278774025202103634228484270608254195748299845801769708524194520077695532568068092195962254
+2329576931503118880223192095103946522402558163495818627264589763485690044385772668639064805859345298816707780560479994433943363
+3218849814933855133187785331003935806771232881004238706522431511966088657254108552621744793383328388740747036182217129765309790
+7924052825089429554499360417535494167874442982520963688982831955472793462543386236218475310833559387701937594241052466519691317
+3120730387098471204669336934308519377296835486747153400369971745719675185172869103202802955453713945706425356726081359191431362
+5436861304614177525957519069526164638577548380287496823470807113570761415650401959363470580496567502232543408020661206474053266
+3120249944908567907826123413136257067078494146549111473184473022022655595636232845880738387277254397911665634549126629364411401
+4035843002062617386757564723259476788690970258752656414372739557004284974159497458955655696811845766981760932359601002427208626
+0779143969819344348002577455948300927630939121921547040685880544649850641595729872650264658050333293212488609440422250520307515
+1460705203029148369614787086632962281691805758071437499284040866802949156450922963941143029043912074471289441815938231327288667
+1549240739672667607945860219999638499322190035348564953406860715951588472937396572245559080251322668950418605324345241657646723
+6681600989234088565629106267156100053645378516406056877177467623317919074902879430656553383602319342476881970725454244483233156
+0192568263169645194866570376494013537343370202553601755904593727729559768993904298684689230055250228064310566719259142616384584
+2226698070135175270997371657677443976168753242911675302780266617573092075405498205119010526964247236701457645067756244640039560
+2411523124866541301070099168413071292074360672744530325093983003307829914552999628543032410966968534244029432252498124255869721
+2032148958117324274615176859919802414958436537913396718375158773684001583339324493639015775574550405787223527127839505198335838
+7873829779466960857655228261450384972633464601331098096364008012962199690499598210503782863578580915221775299630382906076523471
+1033617798236208613493443460691499481184470043787180389655899698166528830636916915480716417683921961582857940369278335021557721
+3570877773431086041166388678403654768190776468384892784896107473099172280071916265352211077124176187206981633533447143541466428
+9162337956051462461244081308639454192982414597589520706270659960902459420484545944118766172576927213645046647438580806130370976
+1679386001024741318115842266812215689927333532837813069949968390429571894735964678235628716093113797167330012932695772923859921
+8804168783787089493714870963570663419696958001331927763315516123670935571014222651056237882407840332672169785104960709919825245
+0497455776366854139775882322268590872937081090128717394425875756408043314452495438785765312873239203328867278937236653265323056
+6042409906538241575209979144212026252259767618647784026916367882392586982801406891358315499203056053321982052638011533498889270
+5665573721287635790869699668106163302621832934471963587290594671222971786422361537494624465628017639194877871599798228379718225
+7432584741479817366719910925645646541846360875945358928938495570674893693392242341873215005147647843928108951666723535877703443
+9626429137239096178611195842928172193314671253797016055524388530347610194243157336306488458466944807366840872517364192307199510
+8872554743012955139567705170988677634651238832225827058388116110755496007697973600003490415480515644505946637930188314840631970
+3992491991103767989877164315291928453885661238942961179632807297112992978760631966972677658662459086278724019257889314597469958
+6669007755891601840756776309575869340114031142955328946684465711503263349456097268207290469828978418533272473362080110971119500
+8033630970428066315841260643530102154382783569132687157611513276699429626479061706898110708339849619210276811595853043955446869
+9768070537230217029438684537825935225327148348372819431279340284261370618005491965480298943126300044774337991256135794900355667
+3657498279192720768668603975934793465689868735015232170607621866439453389115795388712792645934981304662545764256708338815562273
+4841652997648921227154354900004136760485517640549167386012657306424618486993618255961405066483542868908453734101505226047480448
+4390654153631921147807124887078770782524389315313338172327932505555766712042126014521672948387933863420403298182271156860089870
+3083699675349781049946715849913203260143681249018875435801318149856990157414011015651215483550403032096067120964528627647289771
+8136660832504574374548878451558509361941048418373428464399511971079202695299106137651197289051575362091446283996841312766684810
+3676236989934685487277460614965631287879882167402767160319121856718994264197563392677953816932994293095294646864998371569945650
+3049112960977618674809680978004704430920799039334511606915199457270782728770389854739859266964607398443304578468934206463864162
+4020319901840360451062762075624924661391286802372025413278593393390727656336661248466535685907382226627976102440776444559861524
+0166268182450996578449973258577137477283861283683233635300267518223499975003192269667287508860009509128730943175015750710725727
+1027094337033962463834235326303117245639527702316027545974140882034976571260270032549979726479017186330571896766878727628563084
+3735720519280562035416027535373646170800608954405500868661244053278717672230128154298018261865339340499855937060742071802179228
+4620909442780453001381207438741771581539126274686674694429903202199824281873555557550181182902700089108021432193493732079872184
+9458342180011256500005493355500078007350011604607303307732963471459637499551951642174991940916434214889720629725398539493831562
+1757418742866953045608344774690257090125548479597625280633090790836185148048976878560947512134108931123436802430288121604450838
+3439908217353866705662826605127180864607977834354266960510252404933627640585873170058624018410480482791416937234522273135497031
+2172788248827330880258621512418568877495834091216163584166603056260778255791670347944634914745463656259805211952460022859276063
+7062821874356395565274839950114991325558841496177484931811683058289009845398038339874364587482418953564120109998982642304471400
+3698346712015383293895452263862425925615594845734737899372976339855075694671913339207356770288208509103055437248670557197975416
+5731723926926739876475885511154531945948200793682997616742493659519964588297814245753251250515716831733713917292045440536017047
+2326213034490494256432217527368652272393723129996987975280491971552239548286262875444742346718137588580994530639159848308302488
+9664053981063208567695237243202681506536792559295775868533828506782791916794818915656227027388965683683700700077078525885858163
+5667625010472277345606381058073451841188387271842197689932469281333817846476853011214737420944488058943262260113307982047560323
+0376867635943376210756229949512175221086640268169558374511241311647850185329038766762763270981601390818540680562189733654333764
+4491518223112590691196826611428935302844272864063278173063473168207705976253698032183297470010465109985370388667131449602003018
+8802699827748011182168113988637297474486522040228085650948530427329245143454181410142916723537434758973564869412497956238710891
+0653015424586307910784932154517633495234468902775642895621562573878654050393509111804824221865060266482583193591594511748836623
+4094703884414114132180304529532880233548615595688135936066808466092184620343793991343848249436804401054149903884653644876865628
+2718370374189505315521628763517179672356494682994180239553818915110898807872150301279550476267769560111595428023012737770277809
+0983429088572418894311039932871928790123994971756838750348015397853262244219489154464202472581023076365814977799205726076421849
+2244581657719291754700709306659618001196719303854922152332583798578459941542447742263613733064435246505660395020395510382351759
+2371191845917148718985406337649548363315059193935226677398831831786300690640380203874437098924585872141781137278459673035181084
+6868095538827304671263059227883616117642085424440799227282508929248920781388666797060697845611588551792908329555898460456707821
+1192043306305230972108032344493739345654505538181410336224627870081996078504793311999388842368948858806146981869977786056189228
+1263564157432629856155576816827336520937607635620996781728277895852539790604285849253279394716497232033008275892868545867382681
+2337190119883945387644191032300914026172189976929618448527119917727894462635110227775485639758673866947701176216601761844984677
+1541725580846818676211322948610609824222332361334426723507920844056410476870968277509960759021044456134551342168799278225221031
+5808026746515835625867232790523509089624770846326913802756163972740615072842822135746471264238978131846218179577994033108366459
+7209194492748333961784669338759539252535168061991620450390411453076684475148292681430958283119646863377618784660018401847206388
+8164592842234101218973444204368622348477154717654721601252474279965258123105673927507866232148031414671644959483263113289777725
+9536506697075295060127905565119738004002490249111193299408907722018709064690369235720344207608369516256550493184611556526526774
+4560017960261564009218990204461419858845480963206874732488142599183336196461705771053123771553268404282868440226650446328616213
+0784979620602852570679351917990832385632423349482355239911158425540111723754138128518596135522138872178079847769857439148437200
+3065506422221326046922349934844525141835749289303921189806839691414799095653902814723672937020068076690809012734952484971091424
+7531639556490305149862508189711238391327019426642515502558468392326082589336113833462268524671249515158066960751008937821736410
+6252414527138677204351141055246475557495876614593229376289610072418141564580640343324426668169327302426458833085549654617933468
+8091658367794443766667336494599463493723421496560610375457662742614878721712215614199388402972271203457264117746009414601292472
+4908066830822438120188614160836549308604180994779262747990121233555704249867768081188552478880193430879502515548138613493765732
+5079293880539371206967935767115987717076965982796395512686484284292191272158775216705810765026584234552773076439527278292069704
+5164216628992440501162199298685532131413675395537593848742057924552014924010292705113677909421661221880801679108009584398377793
+4121418969859257717214261444608216079650826208617995799712962734646420115576080668425510442736110574190180643945326397724337600
+9884581544962427545759780318699856274991305713483502351242287264905051143111943618139482715140793163760250713362251924403750737
+5001181429052612807248790060512136898354370778167327719757330132811615985502470639866207141577372460429670627788129417134404406
+6178770653157619944192283152223652702640541977712224400210339303510432403323032560310805508239002669348396267104479169736023331
+1565506146888751623012576320991779119855864177643274705087893960131150916233068282254723459661688282729513190349028463435804527
+6845488200397241399013882436401994250911820745822241059508913459645459567274421896167243282273985655453126249904632199335837792
+6040683797579452107027216845343063524780614029426886935760791257030864245182939630838108471908303610357161096840181118609152193
+5867358422344899058837359139467062379239965703229659786120062948805736192330007221916713426793575162507137089954539396331620247
+9120519760679588392286105798236021559061854045122019266108300186277736886734969411204978788065566311792204801446141473355188648
+9729762487738362702158800023376627553944314549674371461896299198497056817939283617350417487984379973531521250384859390378780952
+5278728682099899168824382639886768910340224230494671557124611921288793461227571446099109231672351187529971910075105296077357641
+1730149007222759960804235202582288759192771252526372328644840575023003569331571124411309306137954892577214909905859437364845514
+6359722384817229880817656694157685568966235098606153131789136445509767178564237103959982917552413501317717319150118113725281168
+8331881891680259180368288807257087972744816443005083134263401722243486734946708091896751081947017218318643507133088446490502898
+1564672123742228001093857696640500357335628593848961899541997547484403147074041514838330205353223636545525633021798226061157975
+7577934224848992516208537526305362086756191009198436224096722971843979917310448903629548517759776409320845391838217575441202030
+5842023675100545856824292093806577194777854067803726567456782139496624136800515010149246416535077787552986449619329516458032493
+0373167808153255052885634740314278397690578953752487856466779556596486994777425942109945709709335720717497273570846620327341193
+5952530704523306889233492671665454303269886039975987299656234612350738474857467451882170147036566336312226535534145167519693735
+9607859559588540690534618223279700864577721437927651039992456828233467681820892987538385235563873550538138831743319323285816092
+1624406727909111147099641441681559414299104318980440722709754783222151032344202663364762643657625463452804121615256537142718557
+4340315496406729909696728430969897055002939519672286841554008064322610667892226345008617230358420658804502966997298469146129669
+0210625023915241926959138868143886129423564883883556915150345946486026490910420790564346970440390087533686122782420012907572301
+4721491005031549006749404748103949153294842924575427991607317267682247725581223721840333859898813958860082395329629494670433269
+8089333321693829301610669436388430107322213493559809633043551047784093889175488034859221042528763690657356439399119706918708269
+0081737607011167672164816311361636636595718748621290008823635691873373600228901339494989909273621908199424676593460415730887285
+4160520455923507310701763781457568843470746581847988497318956296776248312754405407533119008905656107514741346097573287623338123
+5386718227154603611476662828982111704301478482540378612558078862521675877095588029121004214011721936617184276464093409939658461
+1979208081789258362592059412017416272899419903367802069424612928998858612300695288310086571610845555893261171864325093713786916
+7319139333841813731995304531194319105663469219744020376897814143833856662869242932535917521586466923358318419175396557400347006
+5043921771833079685531325825310432807800223715751775658072562091646020835717475241682115604301178255769370561929846716138929898
+5795009540103191080406839616053879828656176434583781287476876321448232920090228345539065457933826027880057345811966575002039185
+8576153060956850521311077608763009793771506275720974549550420722202837108735329754654396372138014747847396055096136010954168085
+0509043015950572569270166347532451603412568949379675617083809175396443490772874366901432037667793377607725671409709046037414839
+5757807520296047868933446233650750653295440658940733452331643306076758589809542688132352958487696630197185077693771148210415488
+3493366273573202706880963127674882710949035853748406509260478202136097703296547394474710548706092731416204930859887260446245253
+1707539941222225775800658254639655291940922607284340086831234164821348634212665200587884346716985605251686416602230060503804746
+7119373075229566064030462457605177717171013246215489918839015056056006164706313041702800263980277171617607329962257981016326162
+6663813052725497188713444974040320318581428866821251405183260930030389032259911879414867761739508256774997369921307923003380224
+8543233997255243697045277479565692227756699494957952164631865806868110331658332715068585534381871375140656787606232565908699795
+1127161017080656837915924804407883971278108801828959672411183897706979458144168384325785293840525608900932906069101189576035960
+7746884054099676741518894156142307630763897600710799726835033615686726465390861737711082117067758069961050536090277623500309130
+5637631551447663652036022243883777403508274485804348060822361386569981574710776219228289288499523332852532323527986372935987772
+4799128874055082677319044677884361786887526377254867769810507962743180135340211433750487850964619355570684078365963703331785531
+0073682589254914802156389462761084682583678912826358978335933715271645287806405047356166648799977142475160038979372628423949010
+5037559719886724670132444119093240447382541873564218599313650731701908225623880448841585926824993839038111972019595929993742491
+3846935441857871521862191302228658206156991884533871767438656661539104499878809823997230034119838267962065754111334791148146756
+1506245754838722163589450414720903186576980445131544657545019758753225527419416112605350003805887953770147934624442363883801265
+7711965724693431682894274811945992120534708309601562503539815868676726704850890815034768784240539682384600476706665486329906626
+5956050270087533659778978762952993742209890928275529257391035690977242967921950083594415755279086778292240063613624273000623384
+5061387982251874414971585573609892535056862802605728035065909921406395624271235709374930413322182966464210152496167481038893673
+7793264955081367428964822852138933334974506780923885826935088471472828950440677885279984646325294353993045156334916727728658382
+1917731844388737433964393775321834810791126648863902100900130682254900663770885502300591056044829585219310561565900983432788348
+3993621103753371559559083065225969001381490024230870158740460349214225265354617541796726739208926003200650331011617584531364466
+6446975200293349558151403162258385505474942322796455463090381985898884153879810666921247678344495019592171989327800934238087607
+1116773012813841761179870425820266292137052144431441290909627977940969824030291459806507439794936788928214828707352139273391574
+6029232735235425403035383736905446200540026716844974571516139411975848154720481565143793111521425975198184192780712740114138327
+3438200310045736349450654856319455355471806503450945057852390828051199118282010495739738213447341204668213941183921897766832892
+9512957847613586351781261772535091586107882959218997758350989715296118346024725200133884012765597340862400507624462524830866480
+9478843365776113648646455826476363854336443473601804016310466451767185956320296981753166811182992550179769973329037834636002638
+1745421142947154461000688129964181745046963595109768527672990383210124171587972151958957748633651595231193536560491908213623383
+8381825139460307549572877031135183947681591383140425137518397676071788098018785187454915609863724531998066262732015118963304139
+9818630925621801216199389879103728134389152002296761687336537102178195168590959317811012194485775439363610537061412149495648268
+5576817033233193054333141148999572966012541792116109714940451926593836005748304065707002129553500879663495665687664101078961830
+4255249811578737819490016920102133439336759727576849642889727534022902117660385461887412305323198051682727105599743797538768483
+5664318936157823403995526721241574938566862585452228404066914834889748254113822291330168260243598542768358287033612921584775608
+0493408359374626915181620402845179233550927620380852963377274566085358451742815682206366209318504599243115355217504587070160767
+5099926458337087971802835525020183140934847289656680603935783200084783016975906879446974951582977123093907468193624294378414602
+4993211036037539293757401608261712055642333911428904305517543773653002323722539705273891988338327482438288308063770111207012273
+8875724448927612453412899117913683062983270974383158999932195926949387111141855398745328636343443301765332909049991525667183004
+6179446485196106673286301271613059516541037127280321853066460858041150601008945716021915010720764523897185471929927560029444239
+7849437984569538042541347312104898444874295714765888754190517892771505925662567504469022216257045253341087785885957187833718309
+9972288762936380366686950714951282499790474803745721728891585856096753079311064364081796195123806475478622506713826868777638697
+5194143783169339034131894869316961917794611019135131983101366014715857076410377619181633332553598229324447853163042312520962414
+7850854551539305001687198329060780010579189214774936469033426991594801002823836027328068965959941131816419243666581830678041716
+2062179831972241107526467338284038440066567441767013516710832064119073030278681905009991848241324570216334414105094116172288746
+4795251857046503954973485018229646234695366724410250031504983138843493652944866619750102836093665932368212191653037534272918686
+1825362974498797050137125577095725107017850998954189361286965048355333973664280494182300562942448127524039989758648090694962142
+7512994410145549835156679857014752505125401506747737470958447208937721056830032278112608932324610937928836512547690813007773206
+4386958625254464154906642431853347789932184826155599439488217117827733831342079710541861559451261895702289359997911170346503767
+9160582845194443225222601665399912946931088757458941216770145834719498890068834370787508728005299127862046720974369218083539582
+4881031377785621947067985825999914746359269429111016243690638440462655472434228579718379181809439967478754245522265321625889814
+7583391301685587265357562950095622866121830355803288828241373074939869852539741493888550714334780322503664271906152272539287229
+3706056275918240737054417094100085374094932331005897520832184041773254725650156202489186855782648043533132404772816727073155235
+8593562217884076811451277453364735377701544569033315203869164836320799479709306444027657854268527295924524538225997862678112859
+4570537859634341717395527618756161556420569519217630387646444203036568601265546935410843254883517475649241288633895824882290087
+1279603976070610116464640212199310166444520867245963242449012132718994226744403248200981139871780434324112903659101791778621066
+8744850384566117283317344846157583437411072049976031321951124766354609384768681179440522110424899002915456603055956128713981139
+2086242661312485180876173221212851654741063402662853918748324706267356051777749583559232529239969008936507197332763290031477120
+5741215520375853751719868036345389495144698592395029595732821924732143612679143914116460149908254801423378398341400612840255578
+3112678009802694849286559093313827681147182296039209347542924704088172807791962585025279313952354773038812296501897230865202710
+2464335074070148432312036647984428094369519448454963043288725321796755075626414550577697084871002645789785381682654641241100283
+4946700365473689782081952042866282556327651210752194953923594323433725250140138447685850292340132652464859222629234697220377811
+4116813834263078090553178959891950239969717708797371397856902146227502290357214553371450093318491311749632101080525636146301695
+2152016442288947698443136330933042135184223974200115803798042702098262975256411368585240157169341361695851434355296732786801088
+9469700239580500443632308541309983452163906017765379912144038775472527920834490565234287360219977902823838503195349727039831496
+2028576502159755428471922748239092215954614499408923132851493814161260002491760119779606365853853991681827617094579573055586297
+3640678920108595929213187711839271941417061119448282180155978731064884982006841462863880420761509974612500984423805360525276222
+9057118337335912039094779552592972943649024122835147704439083152493402341167911887606112405528052285968546122798145084807566159
+4304613049097528789015322647077710992450848025235239429386820053371823148160964657760192249248892087179211556970604610852657330
+1245963067779593226119382101475675796217312455063935339967592594066075071514347181089457321147516518204553844378465193273590500
+3560863140415397624008978961463819965678362699058645101497391867248986869781266285523093686811424022579360460735505488281520907
+2803810314481228865478572362393166113955034570401397318410902932552817985751479490450351950758398971928389088057335245044158094
+6904347745025056517093981246275608711548205826384671869194152526627350920208727208140128575295910227390194690418706771705356517
+6784445719916791606648643520294851397681933118673503958741728387886357271190905065762821681465016058740202568162846967243295973
+1820495748778970925066926664077661706850366307799032827973753165199895444172414611070770446635902894354703969177838887030507999
+0792366480532040444153327711554056488308633552915589047332411364711058132183546270866868018652349880999177379420796287072716088
+2231884404962985945388134094475613555762253572694848559208422137166239633417739879274457716224035685193748560132590653034477542
+9227302311116220471908055555125965124068362598930072116668063472712158786276348904469695948132587468164071579543544049342283942
+9611661683770276849635190630772488322125598419492636769106569145188958898006930644639421498885045868655337164693651551682789719
+8113170194159795409724804157277970216585110875118496676005194638884485314135820103479833056690555003499859437927213123666961409
+6776248629614262117061005539488708741664752240716973399951870993215840911122617246729216135676971155075389185544568368200715006
+8136621653681348621828391620654330376833126244814473075974634681828022721817501734663865372891778488609175456672709780494092424
+7509035477896901683836806362847630551058479464889625032860924968434340014421918549778761662492676219077042005549667470710873708
+2649270641258444022173705146602820338815565069036316996296828717613516424116147690610506944602495068800321856748967379303431711
+5231537094318273489411666006633698888790246462698166129109823556983405782712006150780252324827311704109848150151626541203089319
+5293239066624699492800648051071066181862007268310279648019183315312315154420858012591159812489763989269552995744386956174038764
+5180720261104219765835445462051189983679962609760132661239453035110340712611783326617205712026077627868902275865901764502746369
+4450386186789754245435591998462910276602998139642701382886884245787698610667584456364442583085157908011542453439257529663938908
+5226947020891494666123742174916211157087031239651884379910014927950876644487562604700114503798045681730239237952766587287565756
+3462320891328376981719619778327669975981463699579856289946252639770341221258397441894692753073255239973756891174514808164393544
+9266128730309970612623389424292152551017956433451773715730990286170012828117563840968654996015507568606746254308032751484010172
+9555122523637838569715536561794279389081447703619598960381475663155959964617699927258813445644496349054324074619586132556815203
+5221901221258703935673357600398356681976947446424967337708716326590353253394660639230448040100077013280765926948098493319213488
+7738313289310543436800301466124075949448435224583670124694327098481119456888840896351512543815188557251685118660772588456625224
+6115002819234894874533900222654850689485882307323315708374429887345170183105778321445910604513739852020875884337203588872923125
+4481043241227156956639553841037732426965917364470043436075190174090995043087977394594850901991029121373900633832712403510778230
+1122190232976475343331179295988355035324572960682589565916578492624347219825791452145522290660285362795514899273106419997278153
+1419535386080392454227188259532485710914908620105317213100011817889875764632911121751593887025644393163109071422951719422847110
+4026612711274029089236246041114948354793310083266181854689070097597525414068795108775947050469531123122537281180760454160254035
+2729212202223251132035733428110959851887971832113712091873626429082924950281013969697115103891338579818898846568239238607918122
+3944336153317752913161793886424178237035722936447760222478425805766217641600209813232221230340238786982394323446453582721990048
+7389193916919980057221104426235427350670234767999865432553198312811347361703697530913350075859737082487587469312736993623735804
+3544483515704686277538264527506961791275819582201516681389283444580314635355964056417380225809498367162186604237676145482322561
+8044600252747925830317760868421526571377975782889497428302869692743382713250361972424374300944696385157823203594995989063758674
+3762181316198228161833937930845505733610147834846550265056669736693282801787541130363631664735877621678425882651996823896571197
+4895759837384473598984792357851123553619562828621778670882704444499813426092540279529447104250292800981220546692084253328082420
+4664284555514464728238600094152484535233997991752935740228264651440639886242409459644164822259574135218995760166441434144147387
+3498021732532747332097779512063273078194846290742584872890698856916194513341236677884416300942002054144602101645686192153654576
+8855689629475186087358536061769600329981635356231999344927571715122048450556630571843667383074529954198709235538731487573715687
+0984316998018946399866843104618259659452795653432490384229487374720689309493558506727485555071518696965289338830868013877431679
+0444954460337393289812378506420855357215741077375742703669752012654590715324153275679920752247842054109194186158654335712157841
+2806861505564373354176276173563926841713871053400626160801979041772088503472612997224598155147542728678254353573523697935567654
+6201924274245126686318859488923564788418058568530778365444195042057133158737326264356888205129275667061366349202778458019010774
+2825177079603097543301363195546845866777243546459927001122927276132658961336248692066215766333309788747162494346240324193946246
+7328522607444197904276536531669234484641234327006749709725328245867037809150903161226855351918234564454937188245329779811527397
+1625377992337069927288579727970280388115743434164021261444485502332859966787759877144357204976585729746356637542057830900380879
+4756314028565636147037500545330319143265189233753100563686689461353510356901840785161069243491300815016067752040583292254841464
+0425017333645387838654294817531355494569985613245897735076448718279104158222119913920255342054852667882224523660815046839280651
+9062897569747184612738179958208393387812077029581124581459197624411283206076395360970022007778409057996215320186949888642491834
+2577588591174250273899408593063983438617592453792302359558473005206418002455294336176016723332413815891373160708758731967049062
+3790766334026767123109787766877375184100806711868340730414046922950551256206928850545228229670325982658231736019892656930961551
+5274543406306956723055597804421123472449821052046299950205504470231963135543548703265039753201973863356153745730092781664650899
+1020617263114480064430348590768589835423732129147820366131428529210137664442462332795234431300140813802687903923031421483099298
+3305606503022918455845722586154193433226668761115620627747430416848925633688922763380741392673785175993422375485098655310345526
+2853130953848078288453311632699255400113689129756388559283548184844635112023417531659479267970268571040812683475165664822794180
+2783222167931397034746003825257822695087707764404029816076797619920932960124572983887919479900468345097640119343412470086673322
+5063459185940735886394343828328918625032505938760162817991123725871771735016474675217009872180054875341819281047070252038306775
+0743585397605286027482664572990290216960312219499687628442325704541075906118067163819053997876546874075941147761887253181403133
+6865060056069818696891296915545023370983419980885799857058396262667622091719201948407642987224698259796247084724028705854417594
+5103827826152310417357275607217586307830343393236258610369278200854730301259212109525027296782910788706655437239982908254923137
+2959652192735329005701145454769790852470342092444456431448859896236135922540005403226570654335981197446157556763871319983952696
+0906069491801564153648838254163601062811138002404571553190646376754817601328289018602749191681199089353060650264442584766903530
+3785962322135501816792718661619323345882587573641791662855806452191640690223489872037123172150522718319643946771618053874607301
+2342704599377336428681571005102144288192803466969307063516540780329331225964749753260124769353818714585772490856102378132713276
+4346236542835966635872778222659462346707942811767870117146806978169322604045750387880280187005012616459999816635343308178563646
+2604219260434304257671433967264369756269802345023491459538543248359901859356108205297353830910989444923284454022447613985397264
+1822281949178892000423296707942037651472365683251029280064728588016134363373058610506594311454908111460545368768742973357987311
+2329670499086760430314104242828210716854904379725565610986919473143807393666799098016719544449077169306161547903571473642324181
+8934928646320239275117990276319738648757543739070170895539210951333884142223117539519009532014319073300363829125825739466521964
+5363386211310899141728954217940413318460520197666536176317994465965648033515827854532405714333529319178360920611572195490491843
+6452281693971710923703852296775814957821367584399432406445144322839651572894248840082293918339020670715780310479909368596480688
+6791949317913799774656284904153563675547018432823443924016298235065082832647707880299401729868016947630432394689913082273372425
+2712968598557679357916581334926350397464524640833937031346811806334561647348253048938805411658427143226876519485429485016393766
+3501555543617126115194082213265703065410803089224710636262686284845574699295863975355551722711478618786950261560124771603773061
+4778106677024357003045486275897639115668057170330533010873096634039731123238801834051871842868704307554039712015191582514954442
+5218459195255301650149970279364690486331464065970810654696223977244841051824600951397161627678662117382548039349844217280375193
+6369806374093253248520031657537241583648618465123745039819043766572718344368140639003289414418211436811709774570097952888487167
+3212569840247911007598018387084803647762488058555511319640016886915147136497977845568137947542869347226726490373484609221240787
+8115733543956480787117884715874295702599005706164646884593210924736152784838359510894224199377258864940900115663844969555460182
+2035968818201814843503316301816877369650620471604903993852843829395302301918155158237168629501277731356144310878037185323999107
+7016895419441126229181619830275636225832821520441765441532992753638148826237793875874434736200782222141244213180375828740996801
+5879711152250078980107885067914386728437059276590755707069830533352692084569773933300266007591174281283361187767672358396078896
+2103537195144138796197574043874859185879649977538344432422677102393984939164145250471907596342652013494773096173424264207508962
+0637450827987698515011845992398093937196147180755217329303542644463406470700019971836100495535322254679390620873420862364850762
+2242509562912546291760696517385259786276250406593124098460913531494124669973775469757781521279236307631066606896102762073078153
+8737688554624301439839538446862017884613896797755819281023174101498754986747558403862071766932594675733495440363990431783540137
+3643542527592425148722339107873667468772709136145667446671572809454163340131116640859776867285040887038441378816294697995941474
+4072206008606547388536544456067257224875289444010744788037863160664893445070574937489602184055019861155649531412106370948013649
+6183624181311379076807905566573341779391313360549851142539899794930473883081910943750299100861533261211231956101452244671916467
+4790552691647255291761946345206897704211085378644313837821311423673070233392146600975258580259558879486034230540380014801626096
+8493966397430159495762611418791059378501633459275242578770822154956094389019127421733416568122031957966837378624113082091125501
+0539497663700011903785013114734351822728368447618541431249895153026462750771721023669565811790420914410370442390790070707245463
+2527965030066432300857015457970368291786471653036513592059650961230415181073725654607900007084498257528783224577191374901431098
+5466092963804647249090725375187844347347973252108137441562290526430827908072841935677879142427224945383497721669674256500195118
+9408447458584058076150017650238543964665522204847767119461148283020725314993208318241105785737923682521127890161621980525163933
+7752816476751548314213662757572297632611588857400086488089795605852388674435780461993562784936271707018785480608983595358835686
+1627393802741824989025898363620676709684659912421866285079664625171969200262501658717867654051389804050637814037774619076628490
+9122449665202107140311875578301366613855230050319765976709818479408721612162782387682958793989254712472790259401394162587792903
+9264559273820216137804057886666471549044481178190332632113699758788705141611700544482989913381964978281793867160157791927781162
+7442806842403069859300613325533104981898816922110133255013384334075830779759933886533885733793824024671542171085144755776119332
+7374346360629846250873248611855740390376331086859870274251856769041575442564535703086946429812945653348220186072122845016274001
+8100158244663714389704533217051390472696914158612218153906542802690978033894796544874039962095788720080152937661496672600961913
+8620241055478925684985952252838411836616234675852362577897905957450930653087681187667293254151875334644179085362678160756183911
+7978254875299875225763061871403474457110245655385719997304830996169804380424203018555208820048813202142753962116252594621406974
+1364681806031729655441460904058555518845771287158086951978113218142925356256811479736849256168552051145501834683683179144053582
+2064837061784377038174422796078941972546986123715738128334902017019689407784830561790843652346745495974010607663653352384636987
+9087616048769273749416367719522093035127707930211676277159029972485006678648961483209994033836189245748110099847024086616545737
+2425064383233144306141397196556964739088709046393835346029594675076399505634895487000914867003535813058158157320486332684663652
+3641097021982425901903299759975001000185954507785071466003606303822049570876073457705939373716255467071337231807741213874106729
+2074354309025181421785407070622306037112442163872375219312465679573739444271473076859615411141496918260111756219972558400237414
+9209218175245343776137887607783882100053568632353169828579551734386860768832081473967959877027533280331064368843953279403791000
+7265829914895705780556070716875430476662014009364335116363868273301526498001345684876869560767489114942311375190271613882803603
+9073891388696315073189212242611726526377243973277573301675482213008892303352424672983354043608654230919446999369674504952411077
+2313808555572186833151976371065120343070868637724954931470642187595688232146689299510744666262728998553432846824564736716304195
+3769895001051711590090397709284289543423142627611293076964116196325536683515731394758243179761144577336943990391686351744541117
+1964012423430274286597296893918822905314758106425920575603004465793377045724816176059995632780349523671266024041147016652652055
+0559141307894322726836380567121144490621939523042182901839217710526781776038951549469639294413748250130589664480237146063632821
+2784427615240187672159066907559581170138189996990499287132279332580644422377771338142338877270406145886924306247277891647319839
+2650622840124168882146785089864582520075975814107450314378337065910303739372347881027629224527453006767239445485125470798573294
+3280112665923668502905138798645913537592166171499662307256909576761808318862002890184471250591748083711310397550032446473077789
+4839123297739060737950671029462682374736375690549900393153725695518603231578972526440776594614418742798429193873047497505681792
+2160244025080490634108186799676843921536142621408043650219395075800794132235618687434126288996783749492148526728267890467762275
+1151778651927614305188542555589072273825319471951036866487051470913760762080070986450018226884129812856690672034368570260461972
+9126667808863381235489349849691246557114377306076458702232805159967351257175416964221955677360994319567614203175199799743819984
+2789442446232943685597991603590204183390799819475475321518636276804097467590827293001641282750302064255269776064371623832516088
+9048597881455099698450226466082784483581892839976853703691711348479752784919013613635237082895964344395914096977829703979539035
+8807651873851261763689740610852384724724967281185663138373836249447037268804159569417135422054907833329936731832253007919797504
+9682114913920055259992108818897312911322686928213632559659016546514207889796765657343025470035022686294498921433293889021982807
+8817906539189722113102359692407543788732651010055394962852526688290033541790486992705883840600079101359528027208567808930305163
+9801041923433800395009066327257582729179435202758752590945790035180893649947139262456916818609204478389874916889421571462394032
+7712450051093466464431798727528046026835894856944238434402423528849559439733559946888997104896406027931037956349309616326923736
+7381318701427430852131274547674285844624653982181746045743742319196948480723763005752758284784444958915729789741525394299696626
+8012218598270213765952492120607042939337977067878086380794314818747633639449994732495580724511274417714861329582888877331906442
+2523903559053376560461999356914800460953183047966595580074070441846526092785101396532452282664986312641571216344907286853277587
+1243980803716723402043316042450038929890705999070870015541470833748745344879737850504389676782666386423839519311757255510240006
+0284528532586136580475966266604417479884520212063362364900502892825693493079279816397630592037794996982087214380723458893748385
+8491272727902175551882935376152929301347887913314101691264776996119552678466629354884721510455050616404890619695271496162337915
+4545341965713318896843475698632445949069586135305533687841423447686352614650216106958803696792920165610566274323872801678178779
+8253568664915132158211550322533453124118327929548882623091786963905677622475126883200587876894319717512008420758223683547396925
+4320222323998014931144025979173468123790086139354433220062005544015035220976182446830891814234515809043692298378909223491021578
+6069959232219660879097232566121384126364624848136634056377125102029351039021829959177114631501219753707218086851316623762802248
+1243816089430429483661271140945607300465854350055161784219266668283907250544685294916674983006906835039612884905549454140955379
+2940117682598404016293743763452820571055836767681621549318648097809089905651411870200800086998457828557152804031061902717793951
+0887454608619720066585775426385076124950271424460822511049331848391671487328356192926497422819817241814088663154002962024098217
+9444111199203225196678001748854632792810817288744330344130819478809411416720197937516411714390009340089903953898652786438479523
+7598508564858904067093707855688285940754985295788676773297431147947757643127210193954685014018553421494459901761944702436530765
+5554085843289054481441810390185341385291272744398367506999297552891321596456006697431455499740285520112057597547672427356435569
+0013578994633080338189924814677511395910036898885609486453589361725442884886155382037285922038189976648035996103250646536792347
+1883418355117695192895288397176362340054382375638457044029914555409870529840507997093953867543753807297378240486101911704147190
+2990020394219301141282427939313186733000711509741075546302432127423255702951507832353089573401235669455023017949653420450062207
+8315834094959817998047438269545055161942585493293325815723771181252407447320553420868080424394122133699301368250012158017016770
+9114429395330391270070591803725103499827663830583921855069504046749255370339126443177002479229837662039928889147633055859281868
+0939693955047378469672103416236905988750384823305338476710533963327706820167318110473623797427088982971507090747733464699600155
+8097749323633489883895572126941411948413387610953411492455863784508332803867377054591645781447379503035057961144435257072818355
+9192774536491861553570480071143726445650506118482951514380572367117987602662371433431531020944047345411439555055616659122572444
+2538272673224446791161100046059076794348690288664907501420986291128393194698926073716590796828226666658940692534781574652080599
+2296719356672708630298340102476096286223198315529342168688227248665999468122934752834636542066357602969267253948955801596039200
+6907553929212877794229661239340340054507529389112502857484240836627584226292443778415389852020999685448069205241033372399261985
+6092552080660661596415004237982747843962036754844362941207857067711980933061648692291784758051313128780610506614569982941900763
+6594390851938570829005416110125258734178056235062424322731777215369780823020661620803238711218728587137816612075854867828598400
+2369696331217866566447853409278304508453286888356285386844080814982619783652943626843027594633000036437577975836948042581832383
+0948885007237584172710171695745820012612068700229335944852613395850206862454317862915465465928827325249777743488489409096560811
+5495911603990067019527969794975740716100732404562122420639048240417867412633964511077857983711654955131598842753406211465747911
+5938576990907415666730959973171116867930776870120598849297289380213982472240243585128799882672536952585668000017332908127868142
+0055033948608802263653030525631019632385167453147504582749896613855370979829552517051177850239757173815628192095505002356755838
+1575006377951552426189315697593571157901434403253801500948115475871805154047796850271348643125694619380221648554282326550822126
+5246972276283601394823321357823533983734860648197127606415601325852813899044500843947933650765212255657169653289842270182408561
+2963795283400693969427927841410518920229478373496996799858803689356286312942605835353285929732637824507016592351551689198434905
+4524116354075005325609861714463374588743076763717669989113993414649241279740839454455938573607498636902929162122468763846383424
+2179849115762842803410844590988059861418931490923531363860515702620355825744742928541840867928398829472206209785674120570623101
+1132410047750617625576007081275570045071771592714539836172004355577617397790511943990307565673693827096029990088810389666652957
+3079203667265148591706387956264742397674809071114000619637965798572137055721279282178439992636758230593462657176883252897846130
+5344900606236775949063632708480760988922321343844454792539062870953446557548709705912512202634518627191679599405320534739710674
+4862620838291477498931509821859436769537924979388766030614053473312195673928520927507333262772931790461823017698325114264269689
+0377879474949535999373402143435358728101597553950835828260875850446040578864121150552326559433858342085551900119266465442357108
+4145382952202338626169521528905963930174893641795335885386219002691641231007259917968036502863440853204735639598211642320126801
+0053580536687636415170048134719028636721663473814357492351910729926031799390889508364212752500797332425619171871273560570543315
+8050888999124989277531284920879308536986968026163965044507397321505480674446271580916011349473678101309289578265591746813517726
+9127557909914237400136577868957543371638044740008283166851799275961511059368672159330761617818453900045874047935222126146402161
+4101481561011635460925901510238481810190290058999387022386961480571796642806735909558855831574016730200955930521599776711652022
+7452149234766310409197279968867850647491580237728049077688692166936015804308350068889158066597960097627065379539367797830770392
+6879895654050303365324517468233477011666079944449521630351405739029720149442284020545119121309386081120398471736260643772075320
+5115668578180735659993042798673877885823921120201277569914715190894516855160960884928665814998466370463245773786729580361126788
+8473676321663825127148201234179810956242584805477442480418075610556509294721684997709018216961441699698479559880791844442850980
+2548233794760268816189190401306088756408880212519056730724214290704225280819394151931727397286420914387903845669497115561372625
+3358354482836700948199493625980064917823071542164808097350543961229800125334834517703864655364546055166975880935305435123088821
+4029969129548193511513014303632741396672093205336941776475040363815521979058565558783096959704099250216961508907068930707743800
+1178228259948098596059380680409565881553234195364086559565498076952409655440130991639052974945372324956190156780171629355058755
+3717169015464986627001032179838523927735142460855957466743630432390818286505306791995379349323709241837876168544133279436428880
+0351514453291951960472553858319673428002898082287147987459621016579844258976392337653325512601241626465492005157367458123795393
+9131757913676253650480410533013952331883655576543674109012844727933443442812463625615079052305206439748070329783436962037461924
+2344960044770585240104572826430912626099098553793285442582298302002106108601045902079657749391794040816491373923940544837370962
+9188063701594180602103941124399234673973525989100931802175158910488942922514429931243842291939057260146437903218286048586526737
+3095726475590315515951883606439041451987645791724176078005404488548116509110488969805623639698399122683827452715501916665020036
+3403203657780121846439527513421356719526606981096988845264774034545984754667811956286997210908649753612024363260420418331459837
+6454363503953069085653959466382547762654112282647446898596667543948487517796676159860624750118940186171824534509979950086899125
+5534857215488234005757824538224541774649888325359087056984429790126545819871211147018201409980430263764262297169187413523924493
+9520167452539794941218775260774423444492261204451489938948286717754151689428746487424118400020813014135629700319029471552190487
+7649753857278617517384047446362214242830920706961544783469693002591616096695611398984815665331683937899607935227857197308530722
+7670636468635321903676766861271780561993826318676409654225250617146887843176296360469702345236373355189175304203166464435492803
+5456942248296553684603690989598415553795292969337585462669697131930121000520692716176831920728412650435826182698878423955991084
+2896202227362420166816298936702205787111522693592087473120377589659651412246131193859654870409149102874068068052947526362484606
+6206499177988103420772046456006763763163890633653756586913836205106440292257489426046140931638490258992453397047593430476263734
+8271727426541847240045919975482895895407596972876222349935866226855009736203327632117757403576107132386631830517560425145954967
+4982163925157138555939635994371164500846077564198212229817459032427881591645290463697023178851238007473163893076170963474781460
+5340106261127351887331618946742533731988940154583287036382074049074320856289664772105865760586792346984849386692407381048942810
+8539587910802062328556477423232706345676834247983911515809748455837801552264721412722228887311117555317778442883915233779797479
+1727978384302123967727306531882414560603798977850417620003458650086712045078303090511550979287673387880893466154163854646269635
+3674694578655904749986580598395421685146833662087197374056652325798896836233778806349388223093547068287833955056912724333066803
+2847637229990901535043145484946473452323017593046078412652932709449735113175295374406245481235052704111601101677970510368326922
+2791471564967916436181421827384161108238141389611296884460017859614820709694863977807620407661790121758211278587753750388535470
+1311682212671438808292446213587823526675524926735249896308087156166254699859676499961522597030531906137578453887072208144785351
+8861987970713845651946125749765842589051394459161283498525078704659636051445265425124710568264660637581231331333166906616781773
+3433773030784699549858220921642631039795495279596839707512577767723632096893086622754554818674187555230885034907077860457028892
+0456580053379968368017945695164763479833506838952019851181545387562584359601036032261663315698690958554540494006314322814695152
+0089934480486704619783110767294727013349926542271497056296250118282426029001430520413060977864809649544418723152448749796245164
+6374218433638081986774399897692332350976246009622586461188714603950733284096247572024844313234627483374886751903785440297788166
+1964624071497448806005939877571581081852368682713329198774704389508439970356078811686024907131424792844471710419031994307710495
+0920647722499203428391025133284362175932945797352824069655533852410541721344987923656955005597638885921881748026281505225146701
+3234051414875467310335184839402728147911090604477636334326355603404083470772369446633927746336105082555084803709873030579813182
+0797776807854225896647327655002411099428092825155001834564019066984990634531216819521296497699004639732085677368728818595315930
+7917485162442064658421046487728607879599371289976088757626588362451318559683586821768061531908102225442474938214076282479553260
+3281219759953705660325535461460598775637270570011648848817233301493712654518786509665608881437564458093540417006933366539835720
+1421309961668710980725741781573712344943061720229290458895090456489735933725778071381711038599743236066437961925604705889777444
+5346018484213473348778149540609702140487404833149084935132956734625173249282732560039608351835971014828152667004296001672327334
+7640982015534543149522949001287972675835062998825649759593191032854308472369740597155188057572429051521288244481472576347709112
+9082197142126709759172581677046792938596869866773476159806997279087695007866672568094682918889951065921351285356324461616422296
+1936662836367636814393593918150500159197921407091608653457518897602784067757706017281722377124420704953813373267377728149707235
+6165532554189463034890275736530147346375384892741034329027227244542906540148716547806611470041759808947343102903725834811540237
+9921590940060069893953324679767980790622906014798953371116800849894891003273141853411016879477894602450403366892842855960933978
+7315523767557595011955152358473653019805790165086637876204849356737581570450280098237545014539966107468231674446113357850428012
+0791096311925956512226765013630421811573099687378388596324590465120594475232654312603704526616319090075205150090415360289991719
+6209585520294606187513003055352209151687938901113926217849214203137326771247519247105616300171713950372822794825746012319922943
+9070419207282434237195104895273960005868745134822958234433238365905514670266360172103212277318139495451964580465731804042546085
+0338167338157532972668177758079386489083653270128069387600686406564818006155678752863600080494279043355117187180589834925431100
+6075857929007054805987361298779916735419742025429402324367885856941288459616727309405216361897524393233989298288583563658786859
+8295608945048628864124667559446303925571884604451666719475562297491635918267804843940029802361638899118153382320671609177821037
+2582167131471095203583988388775565537112236568527071226697464466863969482609071992299656322827744545682290545625251014139439495
+6711594101773826530320065101211025715415340393938808536071030195055575879765597974028194836866850448633781263352118203830334159
+1911464166497757327229347266491166768994040887477045432967042061773419808596553435219059712816623298485611786304164577509711093
+3950559965553312195375204426888631697136007142008473612408896359608938295800221018496826509159015008898585495437881710932385623
+9874188189105976892158996129334251306053998794609627074731940358792016931428037315501950874633599120688188498035110487709165641
+4173410887164627415991784444779118017795312676797160939963018529923226506062126935003504945358174169319649592822030532548902364
+8585536437904001642599877592181317351676828771494354438414987542591562928890147892012194379909967644778402105597291718886776458
+3150820435297838229930820366686733000243384455249980345366643081949584071763731857162948259797374460060553393333323596509856155
+2746510308210106138913961915766655928022321725147254596535903741506128248245569457512888067134893515592196316478265340857967148
+6054837822399734332369250046782008884610626357811684106025662192613352002782118381922758419491552146516596733810475017566505975
+6253444244691352274570036070483313882748278795425532524034702609588633374333913295809727607310412619066512211586460777396607177
+3167935626890486882612342937895694862011472784369829386553959207681859657350791878067764914715082125859929851130735487337849909
+5973912099248621614115761320919410184939653960557823675647875630413749948258747675478750350454945866579601771984960798194388016
+9736525221109913891380740014791803647462175891768280453619965529263318350088005137408675181210618289125588737889391858187625884
+5353369021308107059796622691343010568879776199002760578714065302617216068310095438159704609241785014319825155619864292170880710
+0495180914933316707105009248960814921465681956792191416760665299694180526760284922837494706424443747428740900047510907222820027
+4261167178860446527279234457781216359164057184535569399549566971774741437839602392078186827336187328588770123788484074481402098
+3638667122645479534954458961543608733857643210245423464371257036918768143627288762652953247716922315676522443004771243444008790
+3924515546743559568892457871009003770852048769643235894176832052809028875813896140562020415910166599360845331504914716199418304
+9539930208848580218543922990732130838884473458954810662182599563214576790823089949536669626168272941913640024171496275351316441
+6014586121604715045014833563011298445249992633905973084716393755263990314978408352185626630254184110544304520462563363100889663
+1480056209827971737404379030390423810733649879094610502529510552900145205746169635070607870308190199905737823014183804945008242
+0269907341608215559877018486447313197581053179139277368261940240899846162645640750726730556726252880111678045833842135360488520
+9452683639389882051701960541518755636274003173728067144992243393027569642308110984514593826650393132965688544590683455796310124
+7380252617100440281579567534384005518334110526934315682916800234325208500512344342386934373532140277510905603770493859349394883
+1640841298979540048287075269187639921568678590871873233480612103263772909669941767642148108401983790040311768132667513845995891
+0797228841202589730512673576721011566549518209931565777081305309555092032097475454967752699515363312040210695622598933787975405
+8668051227922162902176856358741680893763627061240389531754672702747011947735221029021238076999742096989024601711374129582948446
+1940517877834907351003862153234670764674347412348064152632718218140233582465116935278604919054339813155764852687263384383689198
+1258507121750424356317899666874328759136117897322624713333775442411946490404548479399911860814088039900005338783292400154353212
+3215026566497194921100428678498475477212368831513037002482731701747625115899231609161962690257412946823057745227816040916263135
+5553936624046126710513840693074241292678003250027162357678547764315313001417556750343221645935609713903330012474781806462752509
+0087160096352464233135718030584278086059148140723626725159134239250134423251753319043440628036779710209805517160099782393064078
+9318218498563579335348341700906218700126032521018782542069807548617891695409073329049001835630809969460708500370067751685336992
+4208076385552541906663566236770990347477457147392506695455104977958316161334777343709329582406111068678972797895379263213969728
+6469519015224118923867472889765223881558607274601638396572334489644055785283085612422941306760043896876352796674858662547224493
+7581545382840053688960159322695550231110088020621219817091426507061324686155465441741816208389678694769740607167732243171488972
+4513458865704194161496940570841680853750653077515467382681747134693802486964790650970100691348806372555667204130083389487834234
+8611747863343669889389552604708894518837779002018609033906535124466043777729170830388281007572831090596749539330676454829092268
+2614980773184238784409092097541705502166871511835967598046040179529035245968990886914099394023190993075959231506769917989928255
+5078404017663690714097396036195442424905417384596337491669874839339606038090162958546298191413554764614281624619030688715839038
+2641999347004416078674706237266340276545528202969242926658631976187485588763571283416465910176657402769591804490385811120607894
+1022069138109039758566977843736614783843237277066124548095396035264485535383579339344672494958836028783883577568562124831488748
+5036220302308126851203910148295691777409108647096999242270479109438402097077523126876642469999412297820631461204592271671208573
+3765990012871705693020962224239694872611037068970786438641717866334183625110030788667653078611800346467240202316395411589819234
+3782933301188992583378339987527190128332463154672014687853873904582770103495961273158433396887983077621367280840979561172209874
+3749199929332536186794255922364823419316096604597225233951718116228041916547239168206812159635533832324993459328359641335851160
+0949078067861678051433564861906686233060038981581529250289577929864989790385982845786299381823508035058298434160670694386088772
+8589603171909191258961043702444348933790044242468360895051180975009846570524502293795875915077460542906777905339916008769533025
+4696790001285278712597004232911565273828035212555295118585512821803987256554356248161862945364958160311031123882054615472804301
+2136763839544335242427199077661794515629181187002289822787279783807001282765862055208820154228904904403489678312786030757766407
+9614871264207972090235920749815254428999808582182551807788105640461738443833466880592889986393806973211194934814261892282034345
+1053682892737737957362804191027861071649489484546703968499730625323764928679998205513025454613668271807284174919717885935584552
+0107677739834015517323287238318659939175109001778305487593186279160892671682768468572465735391214037913879126299875773890935302
+1453192783717188719965961795655288342172822178539274975297334507529484119848624649135862288188339473719284880061285948938876451
+1104549929363155396273207050870222760506597442331198500643525825130190102095717730285667006432704158844993996831311067931052472
+0828794534801481162296313627002145147495573308897739685396596733882610495059540555269595443659894160127867987587635803471525887
+9824022973580621392509031573913634949593512565298787398230994893915219176490569710003371534856099636970419816555736516423169506
+9878869772576948330900142931880528301401489012367453237909670821957956278129934157555287021598067976133621454184066239649408611
+9449658706952732276667554753119961137301412966671524990966931464264571223338509226807775956572226631814170860570478467598493299
+6650524655470467246688640367290038855618731841663664529545949374735107916410687959478366394614227095766286594581538618985047713
+6086084723895749993359399578577946854255073324766404400181960974843071723540051597517023301307855898898894953430083847202358708
+4753978848939024247917094291054930385042551054372444060172056724142258138979831515270370976027807892767076899036493276499539268
+4888375835344223898032733332908158386194226863203069893727606532739301723911436149446573440019514355993413403576684311443713663
+8296174705195869577823179373277139184472357378750746123040139737885926265459733919518384739329034183096218738593256149149459218
+8744604285228489074099091055498838353604537087151030264581202847750393201247650508352763633370859358894270796201667489608183108
+4803757550419070833057341387873914307394706611793081307683075761521436160450412298883575182283341357874191269212976379223012176
+4435149804710266828206094765772134040146772381477199506975830561360349698395986931196641173574221626045221904844792851097031410
+0140901477445628979104022134212056527853288372076077175566962012356161842830489257088195443545165486451856025672191097292162212
+0064993358872969642733510540028442337052528489493327308542431944612538748472046808937048692371405185247438306806803215040744971
+5863180250517768423942955033295423284494978569038179153339219650484893674393537942959738721683811008504606623434622402463074587
+1057835094428515977317637880823368056821605598124838652727786262421298250352722448869673429472764531868054225289565474229567344
+3983238067434669068143443350182793359210352492378691479389127933138449974060689160199725860332928925347596191014918077016053014
+9909206404814481317875154662284644158413522012241871567063512207157398398808577747347614035401411443650498361772558269985219726
+7744531085141281581884696688318667987388073192993652661160923279555067568241657394706279105517300977887168465546838484164576246
+9611748410338839797298552575152326071882814435353560145135335186607329942289657269580962404267932188572721339477733166705898691
+7946378873728294158344802516673294879896454520313415594420541327407109273815189756012820920103635963852069701484919842956064247
+4874591841062298195410390631359369161750834793590724525846541010552709961171248502344146476896644307714211419632056930049968152
+0852013636597020207693222771451991722621240083418836922565030460173149090294177983564964216327697927947088353859239269055188074
+2400549504774664967997419613371907388057256285629514767888950107220270166626488534296499500671373046737811115964349503266901011
+7846949189277918675793279134349974486913260503583373441600579959916070999842932572749268240452265295033063113981992389359199980
+1807261813286492446582855762770791231541210822077548388510880369998042947014204967053843960432445968862263380028288322991265906
+2762645433260880544005259370505499891003063278739034550726117946384596067905756389481622864019774830490639904899687312014368603
+0877598939078117695418432932115534755404639291467885726434445252435059379183430846339103652602297046524638381772417363883263654
+8359730049870608112690328069372460928467332597727838745244400830648941526818883943362511766258737811338084111308530830389543560
+2410247474136168092178004494614768123474893065682802068994067272461583528237284734448787471492174143726629957921201303786784836
+3419244084207146670255645738668183101897287707313517219103923810981141387894446864639750358126083692639837682548305250192071549
+3436195357834369331471914469743643722462664355231433520254139779344070714371148189113613561574794491575113019678653016828154505
+4439128393642435861391888228862161582205771186938296499633571218847225435482241772976029740807151825694346388408247223423817081
+4171338859609192030035030504936231948955422469935021643277709598491047020926862755743386040228384976638566676326191183360208322
+3510862362886970176404175491659583359746924395962009940383204211293131363439339555697993521569537948812781342292800263161257581
+5726969821251892647951678196842942528264097032325730950425154233756415408461741348237674984518538018983212811201588754756679009
+4778823499024627173529601893322692810338013854983738107737211008580929848242105038076828712411467725165215358148210018424891037
+1496776225022474894349628318466731097093204838845621769757160832213029122420309244726997275518899114578190401052089674878889558
+2150627813505105989559012023523240177523105542484058646465606833626398767902073791909228024464129808047176621447241995834760361
+6052017973982660323612282677894938232580284277106494794233888932365369180563831962638387127741187828046331415436706723759407894
+5180894648613337149931873741726031450761346316713499884971063033267583243155357639761188673059015634957451632776491096066497095
+7359097724129074389636668836328680896804756391700054500433769926703593431467797993796585602417512809374217324038244052246360155
+0320127339112689809171849857331267778192107524355671645529083978652864384633410979534318842451250352236642968028403645196181521
+4118883887076525329129847815663385510560303081843081502700312066224535446821931779450723308317216723461024137619749777688133771
+6860925861993428345905718490095572908986315074234835981417267582301259888782018674341030424958141289788351602467046638469818924
+0143824935249223588362256342022083873670928848969341583470612068807101099916137780686058304339569283167254333748135808339800772
+9845042645815548051061661959342234028016893229602886364367950621055704775648720419681077874002883738984453187494339471937282961
+6185757617018491828131168967624272567910874050935111978401025105754755523134728391834040088198125315748002405260114662632225537
+0001356522238346600683651153474644012974963965580249070955634679932657691126596449770936543341015260416997826513343646145044283
+4828874167962259991499503673600129164632862005208870245173240873585329607224314026307889603968799682624300985376989091014318333
+4168596789573195113960639290119776051474016854378309232971533989042184885619296187870057410925857690307120789952188315701548184
+7815816015467871136014863206025674274535612873638378381437080759117487117954420502148760971346576864484963796596882357424854163
+7278776070084196458814159988413439534481041061939764299982929635630954177993909110795537307351830954498765311432170571984412940
+4866643127910829515007652463394937334032003939291631862785106424516937511685939908344347334073225050202328398177347110978277589
+8801678473026832588217149008639268101698714830248585119117348101801713106570301483277093069752495633755950440945309944552577536
+9617526174545226424763055218268088790352736241937230497521917254797890205799826169553805927031554132395993133419267021828416925
+0588595739388380595646159745519694245103070425108579498054959496392270944865180508024017295767451162258748775694293117545535076
+8702772928743292051022384687311462236447455075709507160040356608423402093661525464261088741775321017969842598962589897299430978
+6237136476697160214138655273076686746008630927947783830802379210660809805387482347921808311217785296709410669748246476297410657
+4956721962293257951828094615247811594706401567441027963919853253912294488061757086648296894406025064932611868738979275806148213
+9236140986639524620047147846000572917224921424609362686790157846221057427556655153843449488971368941339909014048314921826442675
+5366378038534835924469785482056822213525701444985254633404597205774596447015868437597513680309327466710395924280351223623339183
+9261759487436784234076954133371789265925256106206142125748755816777807349896143234487553341181444300315188799020606387261852065
+6449231339989879656134113568400091770993505914272783860814830316499113207580889761456971111735531955653301180535329421263128180
+9593132987957417462820592468596242875901632353771559986709766159903387546786798526051530972235857175987208754226458183961092508
+7166010270941368051527588903270384190676373547534758318035208065713808112773649467017099455130795910402044915843292687098488409
+1937469715418217414858420673158652244798733546985659728265347906685952080207655697652213278741491999837300249957163250199620558
+8228542398195856592161847035652366519403982135370687548941385579105164032051119406009514327346290711302155896619001736994882959
+3637688922930586118891425546901071630399830689323382607140358997300211646909715463890915726479319114588493474688432142961034974
+3846092487931514115420051603659542019430636869539365331821500084544038227936250365288930517356505814134292254191756084661422225
+7491630641568207270697424777290522332626816338241009039782131614678232351819731901409187134000842000166738975995925878926795417
+7070750968877352578247753117115107850387026880348329157736320326010941179590211312594408978595708610843851283204781916328035469
+9579425490712849875219973084577346692279033275981940434988363957383909743141776369454560267346747976256694629456374012164182136
+5715566001611830336152118124700907641876141203182109095013901373890817946278609009427237417191831719001170380251629245333691467
+3777911831700858846402803605902436628175309291503492499557547037759922326055839219601687167716391664999501580752878380637519910
+2345655297190543682328955031766959976133728834616422943753268441547260728586436316967787919247613972239277147037959837372479832
+1264917138428370036605146743753527478105136932962495735773676134552135849746496312485051160777893753074748519890909181403083444
+1019752269689676763134331558096188560591351764633604225395078892173960817806638672836991960044167937282088675278982806967963563
+1646009447412568269213391779579827953653829284427738902923460839464242874336523939561058096952551188341759036552715805796071087
+4514073980834947668053426086988984219335479873558292410478690803080693664498437799009591988658726439726875547569087833595254435
+9375888306479510358575648650751703046541164954438171217850843228076528589259852655316343249086105052230853543970799873699798265
+0497165101239642555970983822927664186264700494353584434852254137560612395432178721562325965038387864052788810184396252265391565
+9637587742861000445296706995627451301787108835157787393998256171661400401789319408568582769562951011299994449045177879050273430
+2769638085862574311449284998834663396793439445498698446119611616703979283028314824805123683773362437290195603306996434216889157
+9746240352274295235857973544138134283682808329702423798784675201114018293748073782256043515882634590777226313897991318556273667
+4701746730536780180098002090253702648694901490740529266632381315672027202981413355374788940709298520432491519903507229198264330
+8070148149525433117389602780506057744721609297582112109576333690538110175139908485162827329907610365996630627743121137187293998
+5104791573207818901442004558359267736381147580646586301522698902268860041597652832411905302035950359208853670857974818287006889
+8341316079342584982610662915730694074266548963632208359785240542883719157226848170269734749166834340935627403531307648991671361
+0980972555646214322144321439065894684434469993258702669138171566031352957356377641038155398195278908409758982420498643103410893
+4371601001168990355540734973104369357289155288304862691393888938344400557230712070949783924178880475136899894295722616103660902
+2650480054074532640486048424756932242389804525662345983096982594522899748828272298964877383316038674083325253436014966605240140
+3856519566975050055663208955514019483009113366052382153385562181732228724721105677879336134186949728875130780075511950816508916
+8078373724394599222427487550133729616625008462045077201670397039714132392823230257154531053190372696559721189464062559107218427
+5533555275076610788085420797340154399319379967237990930040901555785674670104205199936906742420190549652702261090687000720033243
+6220111323366364001766649253557628713894497231901067623752708357435827393686138195041002675760831950319558894058730884453262921
+2672277003207147557184524907281442713352109540367339513087567600977008089227949901291846746947778742548425956666175882640922513
+1341364992092721464190832131115386139839119999152547728030982443332120739263533376607896512917871745789498861904805336640005368
+7658494769549719799407250503812834345058648333149043237321838262779633765459673785919568562329102220327192186018538985265090758
+9891469225677893167626557199385256479464450147340948798817312917938176509424351376822942297600700655298360387396846679746727135
+5585419624514115780086956162546737430419445855772977848266264876064891998070796161296726855803937113862539594644902156882096859
+9369735292641205270247208512449851304357935258980017450069350537303506725253901558161348011161752800022469320895146408450548005
+0250792460158595347750598522833094847081172052676835161342784300572879217498951077354750791561533069799550859447965317570533329
+2215924262194811929293333565918894008757945953561673129802085846175034801490539407544733104736094736753035909391436637603434211
+3003828547025999647155773214469770001753156334255534694689533941988376812539304881256890976599139258146884644045613614613975749
+6800289970404751783592624836999186310592737935219914459902710041374388930994677919752362443845898391179354567028930335795630336
+8505759963363966237797610984127231223565214326257640335015223496586184791131912377414208061741646388077399037761412502229212389
+2367769534630970786705110465175915418118488516256049569042500049966228999665875815493320452276993289094558376973109778079159470
+6740493910513290939463082366133739451516673396242163998658427933891438988618879026121788841470475041492666218138874169322768351
+0357303411110414929271994301686020384849443986791255124503432672170825267728337655437754688169388290097504447359015466216468554
+8192240142847884347063706580178899765888936207019662263339819670804657575316021484690040614562949295841542317355852873318646994
+6622263158780477778507038872483270954479088649415292887077869603719840994025710565546888311161500807362774885446004022146890733
+5176307819234962298055575706826929453118700498832781969398229886642207165799263179818071674130902753482145042794765741675062383
+2751302275326116756435072977812989216925193208517438463427139377868288067976273977283764655073728859395428187073500573181560080
+1845833119022235738677681522695682631533441089840982284202257527507809093077654733824218731845673599302802574363126193666185391
+3166900131346963127277355530406427740614776135936937104096485949875917688047955787215898240293170537866227146364747857832752126
+4669645223062976703005533676266421855057200556768903274559944244985743499257659816488004923631139517399183550005987669212203452
+6297157628559223790562907965128004350109267209905657347407682698178194211365899319173140023292544735908289515011446104226422300
+8502054721545809152280155719799579471628904200160322267901551608506906168294064129630324866997658363940456422902104004108177137
+8611455694956943077268590839116881863962149614279260195002902444128093061737269752861412765172102748566330731758569318211290162
+2118077432186424807711637317365270035214176328074110410477259086405158562676552653953649314850972984909614735542131768665131395
+9130318975369645829745860603018652270421321400871933193989890358079853776989047665775272263249474986926107253991947206182591757
+4325629926598371530112760898633445089584186304063488458578614511450976053503391266403574144006236271752461276059535144816112805
+9310962691558816998084824217608875970240851404516558899699931821439837002656912679683111747809512293159335274051955163666587739
+3902386789985655245291475443305453851903636698632422663873769701394003436882941095444088054500028643416504275287739285414766428
+6731684059779922460344447840778233714899809573570342484286950672469381242333715669289828470432847009362616600780028432025743033
+2276600041430073716292091375271727222342465787797822281415644677410001912257463959430983836963509288786612692459635796134586826
+9782224784159961526251458006646854715817922665126779115397720973464372703397941849152840323345005890646175543131277561028472366
+6526167561528291467123805366888888939086346365110568387291388627679455761130295567840390067905361907699677554800553539940686367
+5318634933920742765367288875699774586510799452591417236786364826083325845867157040527831875773026806940962750032015566117391953
+7493598975572064199793468603272146721884132503560554819191261369489899329392181449153306365084506335645635211479940033483680033
+5666857577286998209607341637144223997808492861427974015972123407497307671199006287616123632355515817115708130939568369663610192
+1205647133800994070282776117664323692713443344045889466640364601504907846992739340462456897562574412472399343745023522153250853
+3330319212199788930516095800858918371890861157149091660451404495244272634139073531985568539542425087248882661841548689414190274
+9339962909966865014181214015249254327772461905399600921043142492498857240896128334661531817157722725029302364254696461600120855
+0275915123664954327692393323944686811113159039391999178218124646929218008261416648150717574114279175738099624550954907847794987
+7571438595941848638134927452374529897917662628583906227103605014116793319790628080501185855732090732338304609688113595225239617
+9130230309512350610529542991215174872450882806867068241227281773112095423160023040208987280292016395893990306260033588936149291
+3745658203217218584383948667226718968580182712181973947156555599253392240064780457939033740602796118129681262618905670233538489
+4412418271808065273371380680584774737632471892264742468899650839254371362867805781616736426407895133489629389395846145646724319
+8489210495984684333844268191310832723383161085211929007986759567690696951893569242504292424131665261321552489038411809330750578
+6574010925786704765333558400961864682658986685222505394734228960816617397028634600968531515638569668302469579752350128387282475
+7078834237219808682337835724461339925697109440081470255808977861161896407485691000442893960515108700590859410043250399284457162
+6826005017559754965121660973424054878627050600950197534543970583792709158920574211453104472613133226055927030752116724686804441
+3714997658728942284217722016417944347609973564690519305766123183125986230197933675112901682033357194516255841107152642532141304
+1057671755594723253182271537993425618933500230542903348744403011513962182314508888904498037845069539547674219152154472098348463
+4167698979868847784276420293320039606112408368549434641654634849595716003611837153708427260322734964264330233981684490094968636
+5842205187892994596332543353231430273153910962730263311288493948447613898642287416656513718409931065308355871917064045665758537
+9483067464396684153711784947324331651250593602460374159868530726671454450164268258494437853338327466263116015842104260460184775
+9918327983152500807062535153855232542858746567492036007943220587038833257219577445237712255513226337182088357385642452970244677
+7796979178949646284046620756567408638628381588842960380640158418933607236535455721736245193350129856456748190582611676103108397
+7474868470568488770868160856619425486013084529184753412392811134951027143914884376770407337322922148422893409126222728159404831
+4025970172900887552972543571216650363430374550536726543515591505239084581125341961497432836939375430662456975979411649814396281
+1376673671354389313333179969625064091561856231653660770117134131024861451548997992193443491241771601133879416546391689721119253
+7812382563778834433247309068407407067582779720037171842393136498269365501469642413788690972515921121053433102407538535462479581
+9706575053071949026852790205126415890557321745536935615519559505631029223517371185086529237733348358256190743027438758336144576
+9006414531022472111125196202814342278375571427110180645405421603811535358205031055882679708681076022342218218061708622772715466
+7014411937404524372862470846165036293398376604107823885481595132489354330681978934995519374885800444029796119672180751145597990
+2217635875626883098820646597303117864519547801664674186453314965253480085119898512655154794357106383983041271503641895125251110
+3512252235837181461231288315033867607629725036297297118913502488196313074376766607719647753171764776345290627421411392489636355
+9367329989873888631983207743830247822211335192876356701620415814984875713241717521999471919347104942898869901044085358319426464
+3886932632919049176756333953836633255259101098478704964812325499313834184343270599669768380535271527046781188364512125103089728
+9085400532850996923140563913725057699601728324308946983801623506065312434754540522710960789580013319731801582815683477412184104
+0482120489559053393661539069411739064074531226478250805786509477678364657275374151794004014104036094940006833641747026194721664
+6223030054108461763808112515000136243498515799834948548188322786124370768805042850586372228996897524679407164853720521651414447
+2045659821087414454414430804224189873085215197748925231475200893842348103097879724089151789730563882183249354356129862099874841
+1315828776287414001746118239879779806183081196189658013775774856212674965726153082362347461854112895332344854176341904165597409
+1213515137476784596057537684608135941219538557595828609988436459029859804112595309586038750020095414785054256852539919216535980
+4484140865975650257767631970278524142097436320367062170812973468859967284286099661751054315067110058820945519136720185944895374
+7742692644036659798892433853855040190699363942257261289132684570773772398269153067661790938476854192452194252168071064023197248
+0852041937859186893599452942342756186406516322350714595377388609314520833365297395472603829432190992959559426685189491282347057
+5433185143289951693194250541689460837628217616946850778491455755537650206858581434235195035172795441448516354831307931147174885
+0450942348007827481803050062279398301950579282155758680606572572109484512358059858330484516434220157350961537316843651345720503
+4380803663067690067136823238680695720389449212682650668097530448778728543739620300359368766106338322729357455486494754904098461
+3264642960305581246967575470210497486665490038206044077023048630121578302316138939937893860519106763145890200076403810118822241
+7107639168089983991587862527040150737165433796689810859573435301169366192576251898692883826389304101824844158348543802249127582
+0669598166832510431109943775944521732861864105283325341271770704933734103372804558821648326293865298432780241079718755089452707
+3568107971104085428061715527742724933050823192969880425640410593395489624255402189258495659521212800172822796344882503818407485
+4194972547530169348356862971069263077075953903800152306693089832494384056021498593498576727061441507427007792270872575143948044
+1172788991936383893646302947517752222941032857029795292428946787677455477081292410506859204482638074930525197495818984377516119
+8708727404823062734669585099177621030117278743659596151369099005394128728746425149879168020045121622056893025422397438542352826
+5536557575335193916360622332260209029723091397745281648820143235533928946294383911963312581783465260511469849131842805230470062
+9799128949323644060685917638538635211442541566486657515013727896653746677089071768007544683389875228688476415065723679786222857
+5615573863935839938823973115950563644124889855629743447770458847381603667537087961954383608440966294356327727154342428403717584
+6135719365304945156195903748702135001035781887797234160617684449358873860897697192990886253607384422197173334101390229305548708
+7355386834242660296627412137907269283682869702323709426719706244145140528071269497974044139621935732608883353990706800769609401
+4117824188478783409286690916041542923147052848706784080198351893505523979781915688089182588499549735693880215954821551279637108
+4670168752285459430877011145545186817108898834243886734027847064654587388165854257852169040893626949216503073312235415138548138
+8311486748387427946913806861679281620866414231742557923760474181682196182819449180979395793050862114181314437692082443568986323
+8048322367949325657177291617359572925594555792044926031542356556453504106573058251613848469630469333674263842694166478603019606
+2241419420107086119951172130953831261301246015464350985640311185360710868324911647982596380951605647282292847958812174415734380
+0207875370509633314857109554449234589264638078127939118196136645009058962335018366740029205503954796978369681506112588271652726
+5224125202089733016629542238144949897132285324338195131993745529968240465385054246763922445031407439625787648928055552616882109
+2793536617404132317781661381899391556171029177272445009604125493001682989300317084296686416290208482553512764370697922889547543
+8188433691033017668731418898412943576673580084814405684350547059200277266867531820522833168888834691511550304066275553413432816
+6069781060072723977215798057681530374205235352090719032425665651313169145801463663003622748057443073337332287692516062915866474
+0991144941963456299854456491439712458220412985735998277280486665724362417204461793739331274746630407706323572187551658131522029
+1128985384630705817449509424373236680198643102398192723995214101875334517122923435752591437827690137749416921444994412824571229
+0933149859869844034267514737213635247382994476023098139584524288805316943149032915781109345152673212416893459588048333327424649
+8431499800476711779747358632413776057189971388402676768615975922425552726845845057116844980552680355154340958763735731899549226
+8999746969039035522234132566990886859367771300359825363759150761208120895977530444860283076544729935781975800213516901282765869
+8578384564148446021966192696855640744733543364607326875346561423047230035981121889907856300901288650704791837601613641976512860
+4782737185453902550739147496508870329447551421595794641391271174654998339963075546317914475664543351090858707240517793471880344
+0532832780888888968522715514533732512924561999915854959906252640056974250958067417634581049729155174966017949852499049433553005
+1013570953208696598838952288133824762193269724513979589866416713036164401176767184475902330276700096926543877198993766233942302
+1558731482683686439823710758826362624215320659618968974586082717778992330445630506757688512508423035162517304559268454636939287
+0350643207571320038261933704850349754594287810435189119965241800581118358691680807766625340717143030794170306528880710869836401
+7542021244067320014248296046012617744009265286583021536650506535157160764351137973007620114482584140630719966828687210278471738
+3972594767241483050839240086921327315906881022442251582254034730627668558044239515436332898375100074941146541911588915186647677
+0697122022586499143860386882839929813751234590790881003673047769341255221587898768035294711863803910391010620206350075218304635
+0915512582808181894140392610882201933416172227163788895549745243551406730258634514282881847090763083210060265428731131498145196
+1501512625884967191270103224021116637844888067197984181082849059840793925774486252348044423174920237439188586936474269289045183
+9546757728181045784907692074408445085975750656689918729547020741600264958315888287557582915125013916814828453001978125724956413
+3762013269830490722798916645093224443451891592652341999436840113601558507630551284115296518475712532341410529593546552381421688
+0535075660768315265313017230395001783344059304089071262026544062275821507449160749765605530180854702975356649517426392492153632
+4462229922158652059017569592409947967925255644154395071833612619360534506981545280294824268624971434641426791536487863590137885
+4122860079882835156235088149203967906043976190683635109983922591971046404170885166646247578979128875141127938069850765269247014
+1129866849265718274907637855113066201183196338524085201233097892015346569822121339489136356302467977157281536251430774161642528
+4989929495806193845801738597980701228751796772240750395477795189154079611747433960930484756810247462060407330702869333431213592
+2584408285550889731205066850550890247663800179003073740079409662955268984464235081016863796902152306425169108972643255331837648
+1846495490902027499953838660575831876113795963871581292212984733841932116361051031722680807069640515568611052917719380714508500
+4730368154761060853591867016650935034777443474265562879400822197268954342492544791524055284219250660710445080227842874954141063
+2999165237216316240588784731941187402326266210523501276042349025855852110771327522344504598981978041650966736224822421754899433
+2237345937661408885897695793709671176319094949111986436639240560063478917538944076082940836147591761497957719533329126550091001
+7598999755791735199200904311392506066249434460145555306422386713523721542555336766166589674039359217816140532997872100172694264
+6085462229902194135463330821695657542854346332891821785703935541518889566865952336969577854576497261635473651422862788436766766
+9330926718781006335569837395334762725138935227106710853342363931868717426383038886351253414292607302835343171708502682390162568
+2759725885383603903963134803626246023341697535265756560586925977858745569648871684971845885034365173610581864076735566479105747
+1316975221277998480665738247654385735782940591833339656446094875845628844928541054371377477189441032462815404076598890156931227
+5084047857098057061549088214576495134500797236087647217879151791731034614882352668503598335757353547259171118367223224526235321
+0797097525215466425082977546510079918770199122108187284931098479825643355771575695825936128687263528517399780086601002282738464
+5882108977367740469432474363253310136350409797015594231680654761034810033039280285322415385168502267113255563957206593967018787
+3765499022319437900072126982943230712423709856742749800481145115762174065774560039072882469409389283337021169962653600686979665
+4601581997618072107980461792417647044978305789885381659804666757198975786036139854382381412304035407153678163339829269303413079
+4804720639771780250811522331538529037693400650190090078194406321327819886301852415216493527923345326577327202798642624789731981
+1262413264233591997549583133381940611046336903584987787247990058376502498817637376736904140547566821566316367905947287384644751
+5776817509537024183629053964111738625804577685331848301319393405578215972673272833105126341165662081776587402862223607527237841
+3028857137505052452119497280084550108942293030946862851209526606327291674235480503744471700882929025765105260116471991605614081
+9340100683840148792620022922546803909003134351687693370396127613819896251128556322124687119185535407506368947843781106277912265
+5837860085277971472343245356960717599185735265281223333386501908378356024658012834775741482445665420888316355875215276412206400
+1493889817668204302273257693995210600140074382228307911629842034054862116792315868260039297702147104111933826341459504324514560
+4753667010660505615221578575743422389046538837003732162433830910088895626144829160559920876420293005201234062697339903600869729
+6354021869352141987691776069755076073591529011311969753213483772524805097648788519425735403544963778868397356812064242294599252
+3007002284988957442402223796792807680185699679494949671140500739304141518373349678385232543712822588498429151363366914067465545
+8768505870421737992314357883218463757749966400771061631074878673057982116800200818694276568644501192730861238043718483873582182
+2517111306024948547742611078204983908881805478217286398022649611447119014425201196572509914583877236045184752832586045682283149
+1376425079937583047628837215348969478849396716756967260659465804416943561566523910593617918317955498182529845524570831173841723
+1739036166752846450279902298627287438597800774942709861167238037011909085160508767640035085875297386568223167138576660874567993
+2749444684052418908020211162253183694144723421354516311236418763218072849726536005435788876083510665834462678112083821685346156
+4979778261313034734593447279308534789267778320343662336147199781647935359075816167778411424508493052174895307203375091235720947
+7206632108909493796814807157234843620292819404196257674170712616419318834035027854762640349933755746419728237290445935893359476
+7972523340752476063451026561953128800722191374241698295085331249527419993680680244353440653002242129183827478637542127263140061
+6106361246560664390746249407209413785337414934577733325155578012914242942249188259728108681483189855141297703781608717770284437
+2459983080689617774602481236618573771655193699359105459132425259318658958293509205828433466503731104595644550263940782605577596
+7182234637562052669040625972588934688697821675314146092726738283785184154736418695256280074985786382718815935852352072100348316
+6798709996334119952629721938215622401513286500076236957073743607147857811179119661766817565585334251822559283874472847953361475
+8077368484549177973605286548826253514295310845993496549862916394171225254015547467894554807332772219846678815481086218479850253
+1557723569466563274008492657223419903746768944164337126986375831639044695750746490501676088871281694494821017358352031765251392
+3419994305802489285895038983304368890483549511884971605938842543322203428568381657097437964153561863023468226697072309642108698
+3155924019915150179568158859379848450337436841515789553391587979303261228659176045375192003213895824215877498665997186076059865
+2999137472267175701076913261675494050812219217526275916261893447733447516002165559492227300890776947227359067981526656072673696
+8601098495166116027734424221556221472614130194797807299983947972112789211510616421380969053402247170620773625487954585201101683
+3246912051329707460282887222043348831157339566467828142441386949856139091307353393247884498427787480035549002968948796358423112
+1150576199110861158548115562719716941558388002376600504843363323295796185489468606412792484061811432762347078760084900402466948
+4752997880608034066503743367113742314926769742881109939696550927489876774818149369014784149716022391683583701555271412269098049
+4122947315189371954201913791790379829165934721428116210038908501041491200253464990161405881080768468552171131345401309484164251
+2900730978305956981781132350165898118101889333020350831669690402919195278513062935410969054110767363793161548411520509850489790
+6317140142444713262780353377445709754525526526100220931420853524029521161445026020859823577131205174501439000115119816705181410
+4499991523210057790779337069784661258008182657881453125037535965670105347302421579889956188914279278573529309721593121892469205
+5508146256593369763940336135259800659809619929794178470062048041370071430831208645554427627646035391559292722312680898801625334
+1648967526716449029810215023304697906807519889979105852637730516484206305531886474058371893246706713362439898050285759339179316
+3759482577410685684593596493926547017312369150876917333521714609230709447558843397643743851645851153700140054595127571231949538
+3562024855350127743440468170916592187245116700044293261821848456699166330596624128415577062851344089770503995251522564366175797
+8477766635255068732724822778949890633417123111391309938080502220545229819981424955190249946666498348138015162432180329219887241
+8326147305998052694691664218432203744648063166741259109591553998325744681167769329433557902221338261010505326465825260282053606
+1089081066369978288230079958586716934294819087031912657105656191281125863299636207713663767265987214971817617524167760055475985
+5956659161052521449892118359418646820302358805073751690270525811449427458601574354728795417080178749838253936083489079736869589
+4756040554221482987126925729358987605986625930694194674956898248814661136244491613548633391179640626903451535330197156879634503
+5269657254348772763363513450959859105237330221730828709908803147787150002260299247932869706456162552333441429917744946610133738
+5165094570822740809419687589443353580562603424278039485215120717937567901150913213688361129548604982677760158365547321585786532
+5721986004191270987440236388972839714531938869537328769699467486823118683325371541953906389947764104960444262942308606574783420
+0825423274999976416479179163665065444342056794814403615470874263539258759123358841581177125724615901000777617590704389294753780
+6742419699812742131364238655136167729098672287631443854160975671169256136755724718145831652290376122821890697634805848496276496
+3900848450956356316829187800619138955746586281240305331127062820418337136267131988611645101253214320267600642044789378308027813
+7768142101816225544376840102775693516634889161775441232950103285109025549587962218777853283361116377890977393111956211092720773
+8166062372469258701826599477785259752674604446062893635372304334593302933414637458058589360745838888558751703330971096452276811
+2564850420537564339701047323195837094030546459418840734199428562634836997313660393990033302759129375346102025176996197579767609
+8872870135828449673289983810960029335233706075121561262257287764860415827304140209641297619500143080704997500176861691643727930
+3523914550868909381989245660265536145050317774721868915147125702074806836551953216452075481799528663908105214114354861340552001
+1593559589951778598427586959614078571783195940556392469576085221648989891950185568932203712798348499019366215767685195049047391
+3677450698912939130282894253043150590674429032380702463421683822229640128060377145549638924052619130706857319423374607432012118
+3201722283329551818782298921051193764095244804825793425784091160773607662095205922340014721050275267634431286245410339294369403
+2407761928636596422414810603411396624762992445889584536298033386878386163466235099237586521069756385945437909851885956052776101
+4551892967264629771755662186507262378960508623998075765778878560332855343021946501189553259398537769291592769103084773248272732
+9106997275950792264693136508466046590049216555344492329753333502148103978681698340982507624277442543719542272924397318970160593
+5003643337652703728951291818235842005801228735393820041591928726474748137284662169580644065969190131576241311478203049648965040
+8986752392715741495979561841249049222033021019539768600866686767034142327899022898431650915325022449300084738502689817549514938
+9360763437700859982761849014720209991738148978736994931574590369983794309597034958260372656270656787930070334337332515206838552
+4451175037964641122624713478708404279076794770827862704532161639277525181767823672699083856308324336587319988741595847500500923
+3042463864865181170367979354550819973787820266099597727415684485159423697903917044701020373206808416942704276522208882269559354
+3048080200899219985092787175219925954199186801590258882778436766885446862979938621696230463254471930200991285622531815432909506
+4494465194385245878424876179842789271630946260267264275467756829223006003558035998437034034758226419782837401641627699056717218
+4254906820448949384513753027180628971432660348348526219339979967375196656324459448972917993637121707012531419527163028051764969
+5795056709264059459045347065077313003930925374715251843125468051992798115117609874425243624614071216341941951333443769594712905
+9786422961702175763231201440570153261798473160575498751716552119467779736203318520988291431980397558340560735449110931384906041
+4425505790631864513694023511858116075339628625002969403915799344384754821079679161200533710912237340094421570796695940926114650
+7558163384552078162151051048460153091046870543482529259775071328325205703384361917997334121827387863984861026567298429845774499
+7024151222382954834390823993921385978213128615164507102313528814208567079688499912070171914927156859122712993045849060653099070
+9429307166946990362134229731057708239430020956417601592711428461279614801214510176796114831132813782448589275144006367262952407
+6718941975166588281116323921210724119843734085559061091993083658912394337924185488399990441930203011310984521684045028699686488
+1289068200800732284238439423123562064066343303384293220311845805205731603115472146721163687728630207002750751276592100892794448
+5346713601139175262412572458619231213504622828349869740030359059521925593845499598173510818770588358689016443776827808183107359
+0509643523301353915236067697449265692352443278187907371809463832094767055096167823904552345535023947977150405485951950799761287
+0296312146861071422545805752124301678869184550494728174693762162879350214577985621448093757895707899661121270041521839117379026
+8409726864010205799722565483699810469720898682668219634727965108320651761711145638969114309423068089263623838477654883333920986
+0701982653061769206880551891091640218809670563459796391962611157072335109465122237619770084725609181414534082646884976727487576
+3526106930335563839568672131933814040405238902124634964052890265269753914225841472646860370300002991439661062411618062909298184
+5489284594499017553239845981638823575689673477128445661568350850251951827238826810782941625211567718831490113495662231409070347
+0761858518186015339779421490664354210470217380607247145985104277374945800693689645130689632481933731656998223732805590077884069
+9539065740290512427091282228814664586680546652097563995149483899551962642839270109575078586841792310434801955703204357001468021
+8203312934682104375075307914019684558657139598128081066927393125488596174624606696359883862043330061635166484866461998328167370
+0125977272761404461319903866680344397363067561278546743044165247263103505646656505183679223334371532724158953424891372755170794
+6917119468055808943262561786048361427010843965462318965409483983665658166958859076133376429071237660115286920877219457193653148
+2210582961962854397595552344204221218872408837841098089244290975638461916790216426889841183579823514753626176299268639366257142
+6938938279494808076759108059141376006848614180404742864748925105751439953802762622388768762467629341123548099684486115445621424
+8751508911757378238494838354486964489105407120238937324611137021997266296685725619021335556120419627792798600024754767811910130
+8942964732151281745754352094851080075271176779020939272053185795856508342400932987956154784656391491859464794187568016580758549
+7093803490558017110343856896961686184727738060163871518042243290379067462803909424058805017311424240997471204900355661374314140
+1566736119124005628798032033275204642554171747963659618881718232992872787295516246973812659316873285663747257448232242034285446
+6562507237663679024109994426672469847713139656813945226527911495634070212834050520202668179078431355382392103665110926728808163
+7163337093376914471075674332970801236470473885515009415164064219689152465011362048740380213961234696943727976782304542628115287
+3743855222420028553131853842508021542825305338712873483864679766747424043976484573734764155416545908654414383080932700776375519
+7834242892295013548785979422302177591758705851513681511359120504187140172485698646885346881713211672798953029529425679446990175
+4633893183134377338289855331963450809211760110920084232081216223646405738494934518180959043407239414117561447413964700328518217
+5433662660787097930154056128793373805525457327147412372094936236754711564146018693671222546348461125048100620268398154557791577
+5116486674264823893675387799935762509658389400995246436075653037631158518006706329179420693907432583221559739906432889568752110
+1646689708083793966601961846963380825939768409816872372745312253381435289673316700861369097472435861788080748455563750632269991
+2394913678196583770021969391869849166343366172108313828891776494450171319520427070741615104344197304147604907461161478146821535
+6970220265997137270733854244424832298730380713169130932100655564124041223879414671509531965328454187192449944156019761861229509
+9043786409994994408835814038392730289274231805044666470305971162880140578631950679277309655392115372566040718447348800220519568
+0260472202194716089247619131312603168906540268723365507831041804698080034582459501938467511494620080710391206340388730610940838
+7326118518322238969330571001468796819573761190336351214992854388628577544497438052708919701742914513344327189122670316147267946
+6390506784888882547755768957113718192319906860888999507544967824165514074944084153555022322181782516106164395236293833936377054
+5714641021392941796626276072711028884736425391454865594302431453743809683815572479844749782164523410744380979378894640742103628
+6367297859579910614284261237130263461592389581599593438725404642412171244089574507753692124870352648825973497683300706972608091
+6528879643690843406788232137812536357500339309765626622435903074816275044864634059559694905228929605192781404349845940406623980
+6885914653705063359510874305420852766939519431522048421204491529430787666838710231728773489324489696476746687650429532899868255
+4233440617969212981294448839630057962261459110072028596849512767604956758310477460111261843845740348872559542671712436710774055
+1508618282454022497140169566835479909506224026572100667557407598641042136865104440157420255694196211078208396396117860451776365
+1507239834904105526832362883413042406464314583874137343256081467177503191240584039921334732134114272817444512404536172921303844
+1462051089737008115697275867129401567569051007638125298802754342170903145796642346081652330045536281219892265708368809837219879
+0453685864744973901237027525243434738854537803039815016737120599127474654581496567442710142699846446910049480896669404203340348
+9346689990227089014642019407223078337725269644715473933462904642091284492249290308972584444368741981346317066840314608857364424
+3692842182371137943388889815198380579665396475153546930512504814795832691928659417816231253704717088404598973194431677726441667
+2526815319204901006066476270701860537782781626529137506566276977867530476935375522834441559090476111355166836264357254224488482
+7009126058180938597916312502300245038383750490075362057823728327394777642420436778059817272275806207554818391187127829756177915
+5110816584935888048243109800031765306763187568267294316288420157299418121619714954580527036028226556975389796598626288986624596
+4019814997533165299992337612192568036796309043358811887855691200355299547444919142751489527995336846485123932685995757878474429
+6005599839728025790953582536623365308961400544193243119538823245141014368431208016452105852057876883877763572171550179791872562
+2500356597670124887859667877622171934055903916486360738831160634956448169247221568037938498171280531058898708454833291828495747
+3109569215216409575065435532987897643346725582420896049058159554867798859087403090846590114662541568279219050551516019161353868
+6185483127396494726368946515385004646852626975268477683334752638226219119476553266373574505398051454753329418244962919295715945
+5344724458607009080560091971792387153222793929070066348570583467465266923727598378490443838259560132593811322661974372369019403
+8458407692595863178782843772482279508788218196221474525584418608306184633515880367399229446502766746947115360332883675953446527
+3121980707768424272697486172479450164639268792099956499632892432254994295106673987928794494946432347077043928557939886000171261
+0577050269924549664323393933836052936324274196559262739026908246179444460993650264121746529145829029909925451248158087279201429
+1182711132849414035693613289891027291528838438771406387710865605582990490514444755922132927296236610194750925496351082081251878
+2109102647103389955876851996958955042517697886815050668367645651505615553003883543425993431580868653965842109551601532047774323
+0249085151080461985544466651926919056622702235431604488689367549402288274733008707563604434799848038664792491456040962095929365
+7278999875589390549123015596410656975040860435505974009899756364318118677742869501641184521884257988494124371969275324199080350
+2143525889485226056728303512644071737922673006177865168448238248795782597126416756968158704999395137061079007456174899879867776
+5408947704672811574519430929617541968994408425732774912564950806181733784295540418756875998713610000715279835936333399272549796
+0046618750251923685648324487668060245166359869535034556031423916249395766390348943983259976779662337330101459084587467420377611
+6066406518226332392745642377882173038406100184159399300600456331777383902825125059202230966872433187523955621780460854740743440
+8412271363530715396852912523334867927661153444730211881314493834485030033457029175684264387115709617680689679312093978999879040
+9657869183165570826073481937962858496613310115706782423102371799566041214554100144472536538085009196821977429400245149738069576
+0816241320499554734167424446072196247447636657341202004109886635882777290094614656786148313850718338218604613751038747577375251
+9117319836426478794488912868694112364734778843674655117850629082666869083673489067903986091210347641126774671760575626609401765
+1008118532396406153376026525242599592034858556342525818569312902010080131834952260460690347206525525021427489641699256115948329
+9403478796471636735520877378951136546880804020374976748551718084257630575582778549740221982719791953968237118454633169542490322
+1286802823239946142833722240859834876694232965252258418975725767245437772637447581851118844815831626565504328510567619469003430
+8292609187732000353612944093829468343729520826414837631688769850723905562968822078612443055462285102551209743540366646373935564
+6195307285792520347832027057354006551256656817339152300843201008404344101735346974655890347210090580920518304844457209111402489
+6224596631460367862650134161563558944936031773882670339156933695467888462978309028912902276648283451994600576418116774756356786
+5472438323418087607827579818345851863545677098783823512135936630219825008658803838212318120192887213931109375285743757983871070
+3462295993623789324823077363153428519235539388072977171154971504655245868325675529422838022778549930317329461099449011610221962
+5200838592621585186795894021330350557903923860725207306860907835414568816984390887997385942459848064357524983387010427408109850
+3373256185275744974070989354450321389766066372305525693275351316959271980719451196548752519719437550201627682282540860722912254
+5801613469773755028551251430496692677302091408721986707132740326731209806971448849117149983546378567141073671063743582525928527
+3697803453226110613863663691507092125649804560354539788548901908917360870034087584677937779281144785927759366742473292064354073
+9963717672138768910209602639579145502161357030053667109664830302862052329208650435316813897369377235565986275115675225384254363
+6761344873607397157287860030945733938977023836366529156220217899463330627464716487783276767734588772780285540219618726811099276
+2472361254288850026102274317845905290678407546967989656293686796378605109224367092391377532276351514638630925654015471910946545
+6893284960359512924679289275759756168128756913637757439682764283483027618435659261867805209746618113123871290501000298928987223
+4604230631532001258913408929361874112508575772563457725381109205712576762498230243782724863115387239822706836827854691589225919
+6353180226120522335706585585655463329450214403091956830465201717296254555917557791034667593584676865134148740185250129625269812
+7681527901091326113048786722462348325784769942754780702258059604458735745233803955056030921585788629283445553041509260093245352
+7309220586489676352977698261496440058970947266199089765873965038198042811288461602506269407874212537834374031596895817266480252
+5671380781713371554805278200673327258182545730441250958579106569242653773093761570049297046722445961242199585137608405012572007
+7828486850550976212754252064205756489990487555478160661135559387233240543781534504267534308047400112433806739577979094229507603
+1735652617764383585639984486995149658650155492118012228612717608699086389981358293860866276067465797190676060353147557719908880
+5809608466540093565672420660893504333126497209645992122475383330847359820073574627113129012380682929130905963299348891171922548
+5002869804918377770158242860178234038771989441187910348213084777623351555039769099812484337067510542127104020429900993982081671
+7709207109088318832932845793851072838104821066587277352066221192004565750065851231562111055731251503571280787745188052871173891
+1300675988020851714469995143129598445432183378365444739669948446307812357058373524561004834384315759687175675721550162755500065
+2986343436898030807360652672895860427883496016032784149587776588259863806298337541233639409877580883769111783951961729854269967
+1601823981755766290542611869833989750039385604668769648848238807861573337182702195579127745245081404264493592362053024115769418
+4107102716492675980158632893016973041072334043127798725365792088221597132425309628489541173280546793641323966773146909247868755
+3819683658930608253697914654878640066261793324512623727802178114862630064529284630973855427311675132424529284212748792990550668
+0736093271588205855246000014782826243591602482151161574269309829561758900770381929089531747951679154943426373942743857678907201
+2579391599623221851200754933465381040789651168701188912204464482208095449667962715138795642341183881460864419304811104815352329
+7570162647614550188694961496075537449438462429576197619766568228578156257291119319362788331980002153009584790725962518357588642
+2867301400919047583578998934993306274019943104502333712247027666654628326692485228040996686989047207277332133939435024962426111
+2800118335388070264161106773949228910777957160444174345990380796529948251126974186339060998840435346432168006747571320370538154
+4476893884627071583698402476874552862205711529686822374264860104226019597554331616506435529408791452032863624032022777509172662
+2387360521387922188586138212711962601419570169405135474539424296757638201501368935895796012267512214174579198583111876438042196
+3207944223864976640314026742675529342045001292563111065130367748865114709153385711357232421423093197866403543774881366812947410
+3024015733350974607130082705448223007580421749047845265584744661269361681112069541859763264352543531462633691003101294808859592
+1169692162436061367720119759930066692678060291627161481443668541634202666603165593913992477700731194838349007676531720171279849
+2751165267818731079924541076614810221037738242037928099580658966017244137214097278777683446450716576425458106456674343770827281
+0396856995901845858069688500739423611458585131275613789773338642449531843526049135797567793850609374983112677866381777610197584
+1531087534395262206112602286543697479767208631357778942636385138053327121554947922895001619615466561594121066079313165604153569
+2093692637556395792176696765614996657813671032355821221008345920651772816571893227375691474134293122057079026746734194976675858
+6656377492316720744820927448196522955924434793647944766092359157144753759050894426200065451501628415477521405487862719508590906
+8342026934212011048128231645702815266555959471653323962526192450377377432253217447538860983839942343996469379287531744331673799
+6119650763732836889688973448048471041648065382987440098529987344461076331072134069257926150018448979279801859696456939951283072
+3364756734455969829310248048507921203362218977909063710162344883654504743601191459570909322659994691353369156210663856657262211
+1878353636597017372001364702577584897453891661198546393569651046602221858825228640216854117340540870937305588763063713204215566
+7246416818039080901692045886943289879346943533530756863194707455582283075691686089441132581902594229725501704594144338085541945
+8508829844172609725721048474190455937918008659794137613216237230265268215971845365542440688734702896182248548131537748110574617
+9749837159931616345230389269791318525672049015765330922830030005687071010042562156668767526231766645728311230400611546831340883
+1042438692813477410787838927504883371438184111986343392632454033632895691282059130126453347410816312739668264804223203706756562
+6361009275683200524885847104957823290376975509915625274519396770442677593644815139040216252662268629183385844801360269251220612
+2229763646114181877287927118379174699532585850694835097303121614336315830870465640665166803477820913104310061050902102789844598
+0133060603914382154852269620976632642294770629603193082836985616373167078617561223317446714275063351779922957184196466970884767
+5219496051735919324804049698971068904312201333312370591154056704186542719979874616042547422134608890139798422893654424476506469
+5309445174646633737921041425428020908437429638540244462052129439971214228921839562115695079069371301404828066341916732725724068
+1929599109824380789046935363381838679112048207357698712063450869013602851026654755608800829647182811384855047709407638244169874
+8711156655539521674331213489806723157012020673218852893220562275184063123762927470825532953422135931696172529627131694897868313
+9146092529763359061139625016856546857269473202244951373230403084240273596615596144680054956193346943461881907308435567570589732
+4427806006379233157431109769793014446131865605460452718401487086503103098553754737499082181376863362004474070049162679495304786
+9908319411586467759323529251895892937674894302534759585448543523471481019079407250526711177578259561097423457479183321229451626
+1131371780154610377491766557592293428206914537775417828678921143427727968850975607814254333398412178045797967112746828184963972
+7463947060005178881443883529993444944563705484864960478232839522887114302507061077267547873033859704180182478601068253214443547
+6363654733262110562720880713693267188885990129857236073837004378034866347649760844198517835526780984480422568814264124396245788
+7422184144089713717140409869475766686474514248637954570906655127051840364408955207306296810118720773449322716315645914875117890
+0847277505961582786741295462154437342373825998662718119420520873688904858163025326891259732777158377960920534957757187301680750
+7127332835591365255818677928303920688285753363566564622227243735455708574607542891965353908456436608550001451776173990862992161
+3829054399301597187964270168808949938169540225900414534726047012413120885338161369990845308813286961059592718025627205221770817
+8092148297686870086401035932812080011392424084497972356658952923082172309746025699168011915919281009722984056602687718337362402
+3027398748877048907651150695381083835937725004446873842854430149618594741819924214123640276762016797602129360641044263480412772
+3710143070992584709931252199044234825397803955966283897640299886246679348943101389030142066287790993761176511866201467864299707
+8525777612726675246376342834401281272453399310074719106459898269090225065025922311415205451670630902470074176854745326883762644
+8262544278833799829033118364917993352082125138925496717970983928091600634758984244372250880458595883955890831596406628913521186
+6897853799297275638235876552327431216883341950745982036695977282177864189708565950522537254131161076036929940837531981536512451
+3213748658129585636531039879081929302798794268346651462737129452506002968774313717689240477017446831448952135158407313634350442
+2055874845167569647361541785365745319937172123917988776868257061731415878495755011208403654576322652419771761741735204486134128
+1873586980474608471307789365974467503495691071252149719435658541818854563735190343177059527503193288117651496365565656653307241
+4168177432498780914163093904219938645313613562804544457122557236850377399062589146156364240794704626265205228184552480787389528
+6002548119488363978641919486071068284491204688921592270835983882131004647117906646204653024128798598225163921424999116659512574
+2157407327085931030684434640191280950835140906873052295703366686157391470840100604628128222870118102675339834080247719766902753
+9516075696286688385617312294770633537786940805769023218236327039881513937432194699645278901401806327344576080861704678059497048
+6871189362548323056223946109945917378776965980493422695153032621053464957232674797346887230723234348508681395275248458966927875
+9336780663866116286377027773514857490216582712388958421219481975628619943979311778012113187699153459212550397452631591800634557
+1884225357321516913996913776484184458840279457439252830670922733976854064570789902403772321837879511792814698370553104269506613
+4608342183802630938543364752477985342180204673563980704638103829760160093636516325877632052705116775395863314477370432360214625
+3293602222611238360052445923968119215574068058661794694301159396049393023879006675439325347420522015724464971518661959121953285
+8043528468318108109054413534510021714964009352370382732039845180887830146914560592175998791412497342760924247174793888155615218
+9953136600515251517270114445026178472065320103271749951560132315486968402879259134348096557033081980214662985678737805295776016
+2082425869735558279582276249486763021868424618618158613101945224876744522204200404218768513612549469324132911065247448884834161
+2715300790048270780472694746992029478410340286154036701148546125752257415749783382221561686531788228065371707859970836437758369
+6586934570724918966767618089617174929582836792685611937969070528242452974277966964414407164887044841543253218406757856518905749
+6701113102105341541135759678684819193668388121785636742894877294681466156143067331027856246686661690573758062813040020779144644
+8573371736029851148801112116958518768083768805313811181481300256743484459392633904102235738743377368774016975057841718194084994
+0319902874585606893329741100525933056084182554392753427931707044407179198386674603799910970919558297811591565044725137884178871
+3211448717893811033719443147078575334620516368575812396883003880411447512133976398395409888756416803178312866623025053382610669
+4561353382089346913344316837392847914820218419836561651969690056195804908190155708078402986544580149409461279682788447362287221
+6541324108089851136771616890125941444979071358059045831564141967544312392874032082755961068514362364886944531733042486972382351
+1947537457345366294923388536623305727166280503481566200274732091551547741549840732121496504900782994752246247415294786133670139
+2790662270964346469038082957923935596601670431239525874522807293008957620170868585946546458722568195100218646703049798761457890
+7207291855021167963306163201383620528292099344156171536132565162121580753163039591601562538194503052311054883261440201088776719
+7081508994123346370534091387062163390235318525916429277771533969354167555829004274478142845946719915110847480617275074050516329
+3008933084371763781228021375479207498806120584984898188493731541257384657224732160257247009445015469067201744844463068899016846
+3400853085115213814503196501389761175483359326430453738990669485692964833263969136641748087708764716019323095274097377414065683
+3262060508094820191682139681063256834961825192399541866597766579614721818676700322392895466758698832928065782064894903472978312
+9760920512587884215163543988536526156574865982745337953096380337326849623081010538502752692990846114093305595114511445577198415
+4534258782640418619628264506406504403447005968106774436451122846867047076694261073542029684272737494317052196031968617018760037
+0005723042928179923030772189645554654702738582913437716383318676665447081003973531059059732707456286646505439805283337167567513
+6867755898727425848664558154624878031288945357600827739272457697556698844756274091214882872082839937589030308224565293706216309
+3727537228724168866963116807318580861851195574160478712150379828696545006021644250770529425526279645439265900826286791538135930
+3153997389799559939607422587882124977791743840140703583207584629133167628782910497529520542920062933572958127405711490497737856
+9067474435390875739488758031979945416769209293461704806750415570467527973320692921500611307072408238071671039355350126215323195
+3397087786775809367683818985726713074834263187298828458889483102002512283284602983872325517586754239568315454503146853407356331
+1156217453455804570907455838506537271360924924818686966590633031323668379608702859282734283827376245634390166587981939981633250
+3412106433453184147582934702569648764561354607002098617356742259624760387826342970038831595863063739528564750876654025034114351
+9541719290749487737141992118412804491779799111981476193385533300689670528815189491502637221085072487226634588032661043056759668
+2892064967147629869694614423619676513067951679311770744515022309616589783655846699918308471661872732172650395986258940991120106
+5144184865919978928920815222171229181997238748998964019938552954342118630154574987629428918689878418879411760377091395290416344
+6885105521575830610256425097707534533542028808834255387318107287078639558846084308180272966744285679093270081574095013341117481
+0825712842225983699546990461215024477130525988490880256409773994103713908818390693122587907689102651005737105310805023272218302
+5661584786775396459681434880691492087318430940497979741425101788956553140338175653002561188152737818909816437963790481976018401
+2333796064755969606150287094100220527676969430567702969130345130599373183629780646448254004373148786027781444947828389799036231
+2370159800594514645060430450080996614777495906387714719376787944968432214762676658329959973122495250133837956302119421564977403
+8812738504000258149359611948440268119800977088619535948947126735318099451090706379617772423943777604512120621890539370786597632
+1363253012488373680482054568974446439190725621429231276569324135313694462859720454323916583978487818838914751980359776090418942
+5309412448985837938866251311974802939648013868273488976753659392241870912692861488024484868367836148433592247524575436350374927
+9969514974899115014452925807661936280550953879875740514792224284344537632692977097082883985126798768022555743127429841568583436
+9127480468310694537875735497900079126170848463529624094796935948030072227221587835070990509651876620138981087391650544865276910
+0663274772751898865701481848764433338510687274568588217413099134231887382122648096865873338497066278774094796953376828006000126
+2223991886894820013487780739895880221686260123953688255289857284508367990146047269272253817887508457566736245360372546074724620
+9022913659536358863270572069247332195356175380482645548420742634480093147625717187780842180713151897503373416116801897541549813
+0040126272697263557284035143648280938089213881029883862911870694532327995219687847437429389232425351493591671711796587562791256
+4017430425461987380494086228031466897556783584467938250558585791601061306591861372175583299944343371927286490389555179774602318
+7872955211264709896492762009841470583148357109101357998512705454425930076065324016499469004837167664624659717653859578461687235
+9667310959423600740682018043806968632350609113790915003388710593533872466670325086871976600837835610439552558719613595783702236
+5280944927395295859052540423240381366808883628148042644568662154130067762884915257137995873057791352572012021048384019627522811
+6995106927652578556591681036413486142384921333996800868230237202393167717311762878194321699747706337864446498735182883503516810
+4894127087101054059360113153040095596503789486674685811347198640008673703554343464924312512011781208631600506972544379180978661
+3653914862578195810106428140030210938175294156340298752901536901851573154592330206774109827394766622168822827213223926407598523
+1752287994131637967328932739154812431240663561508299992489581255396838237199970478414918524473397520840434054432691053868383392
+4475254299662836002489198880413157763837585826054191105485073144949660180125415108179810953128183235091235263489809711965370068
+5618413924400018858280428271296438533254641173714166471746748160577329614446433367969692047250196643164558060988866789634419083
+1976673569829377798715474066924169354140929130742194843186922903877261219583485904128878654906618865153383966440192899927641018
+8533161119710252096705226091491715680664590252842043928311396400578644885931777054299394359376613317844464091496561469756448904
+8685184190096699452877940339075889148354699442923532123110999704074604303853725375307368452619373244845552599196580274471194639
+9829578543429362536437207266353476212156141077734490396691958840205815483098775874456262295189398128556239354143693110486242701
+9970409655619169147931181826146996933740442172396548865369872311637351974239103479278809874040155159335694067867509786798916993
+8934739229131395268686186934227620999682967502345755750450754377980375485746895673108969778424574385778481433357869228670933712
+6403853140387575318798294898252560753364466868740386419346298915926350400035543680556378607221479519818692502368546406996064171
+1053081251212324305626596587814428006013451031378599825941680949090154726066128761151070261252589982556578267160212779194125716
+2889755089191961889036525987804900491217472837363091046321293846058934856253393138783914577483067599584740608242898988136077107
+3871240659195668412257855781781704566864660291767024614816347476774763467463583115867939922590382680508695307915014840948963808
+2822134512303137695995007841922537885648949227095598324952993245073100048846948118672641286579492473549786447729014913418849577
+7115799710686817026544023974604506965289044028358314166807497671714007777434113787389629694840769613243261303424414900494011898
+7392257640112536311638754807439431161718219269700164766558394503991923942217206220355994391249150834799995352874004008637120732
+1738169836253384974782709569139552429502554327170357536474522232448622509720551967534903770682965229229310748674655279819812001
+1013488426299593714852536878758330763717657950972685023529624029812092380027913386862035092137102088651474613519196497838916967
+2365712331332348797178741500614741133803176085015200716152828860157706088237891249512432828832383523202673780925247731837609823
+8343543339820274706718254393402391405027365642281414672601521735599554959777377014041823630157212633295524276413560148004499161
+6041268421639300061742794731401962219148955309257726102832738599350862047986714418077392903665425072627420761149419742624568473
+5903163798089327161860705456299199357142261228683379549747158444438483324626130181126533716219751215937033507622299908730009529
+0388816251038799487192843352437014500990877413652618253793690269472286848421450299377527429839922951807455986611893857644960410
+6747097789593097432933016398117542211434597285816625911203020562919342940284869769635598001370921459163969583961849156409633978
+6058253598655377264266980145151402530578841715801191174134703632064724433621375404185347776838645447066321662228541280092856110
+8706460045506764337863851824656889505997963004840404222919355019179623835893581428684583324979366713626899343900308968866457307
+7217115588869155277775561876870949020701337732105962145058144137569073157203270186719489063643062743100706189008644101702506879
+2134117466607949382162669449831544904500037626615605917490932121868589822502449721652777432598078974018800021624932345792700743
+8772537472143251033025302537735317107162425743475413816038506301465925279856675607449722802889718409431120703912286958510209941
+4868004080038983558128526716248086993854257004538122139718459319434617070817759239833696965506062568522567601751636677225399970
+5772707421791629107161650375371738241195109244751411366251362152446624847548801413381446956815082676765934768156267696685640257
+3337783332137332131442737895629161974159375156476294489620941247396447219121871778030180022268049183913926389862808328015747496
+2718665162373177306261228085712460052227574664675638031209424855973371465310593845908878207798419801473033533102851536608498988
+8594650062259102571664509669089099570629940328720500583665382040942904077679708565306833479512196713193874213822763114277561821
+7763922398020531727099680865423760176807414153322182938644853758445162559723450312367220101572741122819976006288279862925391533
+0609418074163954317311535425632639460543917210847556877142776065667429208580080239400632276304974925905306867007809952150307911
+6324798067968629831501975773028726696101515750158909358262168518496428350181893495977033603403728917956907772455104980623840611
+3585603421384321409739580272281986370246357840985885096013164036482124665391931947880815558360671475167152552411643258730493458
+6674212278514790724079384829207583320586965949581600859999150201711417012504831581096750857003895316139028753798041233239967350
+0724838602272073110730847467620546382405164306488489590470927625949743749910925230346070277479842393578994351426637786933239473
+9758486324598916254826474547605389356962763994905059896268073096288839687527478615702716618454224618511400537520151578922366430
+0912492025822760544865884599694514920137845684369437041888556762598262707248611887100015044910247510922363893211117566916277207
+4970896832680655065722060515676245073680441413700428191825160119923053062012241474629435368642857468208602093702394160800952368
+0401643954061460061469538963715677841733067884978557675498904356226239814257513498478706711931106662782912959490144875688684392
+6427801429230014330280067244320390813250002494116054667882575684276220510978170909405937360209445943389405620264406898441269151
+4513961131947927648793953864754056606418638015682203461287515973198501950396575668694970608763112445843545620657603445132209084
+5756001157040952762796856519600056686459818285012859365932754153307811718432937457957972840218047257233193928872388202493970468
+5745171294650962698731398420701143198082563097452816181021021324846599968746630383827244381072653879098831871344995918422668994
+3440697357810684087609635992103602934958412129332726402190737073092334237927797275626663021730679412659760103153021222137031354
+2561873488408007135940986273685629006346887762950502897998328704241551747655409051903344700915847431066705228403387636950645457
+6677547618819900422307650673816956131536670246263056210725538571359966918216630406962626983531012334568659195035619701341684239
+2420112802529724475156900639848021386946999992189525298915178531829794178899375316321752347503745229384277622075513609101448077
+0978966580118766906719339709431650123507257526495690738543102142511117335171869720713914484644191091368983835287599510980274549
+7253035688826486175835885694607345249760996565501754434755643707038772708239856393717371875268895624588946691881982666455004955
+1229157575767360965832607989363181678043448764770403987112238108580504462888836301106969202711436540526584606392030520555629817
+4303800215068042550679859587110369621335305905151798020996167677493237088394878180209234115765088470219122388293468346691575131
+7160108019683761926270404198160152789263213718306724711634865022789627807005870451606075994736870542860235641292939358601690892
+1281304446363067443221484815128597038007892955460785907630142069752866701460026126386319238710932447939095864553352289508365136
+0314065667002957866858488765937097697311458242916562733459459218151551894102884025238852720369894804551004088501646041028776937
+6071040163745909418176019453877965601147459065352750105116872007917183143758403418504559900007858465882670700927317278238845262
+2057864431401330101261675645065867887669270980722933655585800822914522258771084932227437807465603988558837727049424395413086192
+0838403065062402417019069366493917705353727605973078124319419683057212743574597310780151384502291168595626908520023754345467963
+5237595147390251950945857498093768496867490339391087595954081288707206848402637964670896124834883491892023218043300933428536303
+9038575918527245239784697127935511565993493329345587370301152888215360283868124687096008034911588337723498130857892917083893566
+4326309213195337889918560482484162052931169753291241688638438611871045719430309380350737659700684663483713556511824284273648934
+4109675537859830665204217999322330504340383531423575355281348688917399955785319877102842092110480808916641344634371327017518067
+5976571379562477291805315122658077767583602698526304594638663614898936945525476463455648126285604724437435096863798048639029149
+6805684460338235182637901097297785029718931952225347991353757161498388530429639352729227333463916470311358261242265252454882149
+3713554069757475756235174202220726685159145970448234073615786797869189321230621988473892723703610057245772568034893831333824268
+6384329807418457095553971699330059290079181553384702995369891469896964859336812164228972258241580918221240870171611342340166996
+4238496467737330476039022845048701321182330582443048269767680094107459509184801830653831569366411726902088279531793681281083241
+1389317145760821195180078109186551396173257466092123382087137757380977821227017398905747777928583603397479220222412134551964141
+4172433396133877482307354312025003410197620920424049031355359918529883398507939057731022302176139038905017200234464598134643926
+3776455852500808911518410528880591214453698534859661007977301367112639128608957724121376845610991533136565527742397972171004531
+2169236758277228509207094221732914621136016542832442557119974462763405873279434363734315812872035133971702886820591857401769365
+0469858184126033613406108887661308724723319896168974862654713098974773391394034562612379275030863451007736429954454094411166680
+6170337864185847270755623945219598905895923685556701346236877669819713556924060508835912462997027984549870490684576221788467996
+2684567926478205893568909529013411584469062508988939792621227026970772272619563307265559984083650571137624804538833124458965412
+1535835911469765914801129303385752847166878267150358870063623206823946840223186885612380869419340578863726545596738437580294661
+1159345796279619020659424502037780228138063084481952522217422192474814460650570150288813492963026126513178935693001157815213888
+4115255308469968312956667592729481570942886979872098274544235236610800153069537830562688683755471055934166523033112817689423559
+9188936491751459321231439471707842349428821745374698747871010980962280880750506886802895843191246598782044554283344177438872823
+8347722755763795357915434510354216096329858917788023158970394599943300789945002208151468416849121549451743359325575523192943247
+0386458822265636778073946364464754663546374429692132747455551460488109624863176490317455770854516391720009905789081791014745242
+5441057113825577288143510443291415701276478572336349873718556812697918623782132025707841689574266907977935843620901112527314879
+0138974051576176017602134330816942995720273624834286549509110307443436271222852721817459586302582019304440451903755250893098006
+8714580715983710618302573323538613568787984646210126690769977327196476888780472811559022322326994280966501214045283109750894159
+1238724204438864658817267118920298143255297575901621515081809762078906592560699017605054545611366055292052387838303773046414151
+2117880548683675747162798543936995265803158300313026522266732130084089973850929862579530307924250791678839458713648131052866542
+8688866589649054666206289287368847639201089110726068276561807440633436849032550737263946103998593920752309241137169715090564726
+7992366978913349109203408811669845313806318145335482602504586472079577960741456598112230859758567892658655917499886892820156294
+9269289344377943028314943737975747440225464454099585770665233191895455121597963497469457088101021828673050970000696324467074275
+2620213720505096912466481021388401048520027588680889621938076715558063059090115474427731634806419367474059903683493740456083416
+0419258099585668206386510983923399175364308512576355916179825772896253917529784626455469847416203745543857585138629447495124687
+4926957394763419387802807256844093371043881188012601196274750577103452141865582262123425456983325248975618318937642166941469448
+7745531482212763608085822252151342022701776876422939982991937310338710298056659311711100694774221511805463875602371671771107991
+7622297042918195524581284988624821755976081656742322232878212092814401063399047757727446586120047765852193643525978220488403806
+7694553355731009082341963145016321622315287166497298675517840848325124707270827181601834343475566034855078916693975601380159131
+5691081048224248376219969516692299552551684485812747394911625377626308622713328149116932634160209525550974738125918251287523859
+0467965216958213222976523551707473542482226303543330237484038813545187688169900375790194437313184877958505335015185533760569003
+9313388170020500404223350587859029392425277844920011385363704844190916888907282100497715918895587428711392085764058004531043856
+4805593106127448601646584342013400666164278454947086863410933724954207481882298946080783397578430480735942749099815836074939980
+5829488935963766897295398693976065473334615080031996490066697080972996155867227149556928263586779745098746381741955988476480256
+5145688238158921108920160861540066499070337742408273263858244236306539277333029376512623358171655471201632148566471544471879593
+9921214229435926996318797357630113668084683534980450540625624914828693276400997437801995497337699991160179152196384869788686202
+5452970283364847951628816855350106161884215992345914720345452469417460755112437907196741570679787585797744951997013243245883760
+5291067302501955637725509930308800308821879902449540996764882569862895237545484938003965194362900224359317192536398128214213941
+6161982577027434530385173942460521391267875161999821213546453369930955209737128453903802184733420666743600784696394324963677611
+7259796660195828763104609417030954701404550411856256961919298349416990278446333820166279192694569999689157318159650815071786127
+1409252775006780923895660512761218733793242701073753044161926851887250329246949307610371367921483913476091276544943910212219648
+2024883815854805620725646102396569531338296559295702755514936293184048845778213281077499032309766928238274933799920207837132838
+8210747670883127249029109720500900846638073842072735692712299242482036224417598293305373767651397688387681839834164347629159924
+6849912340362293051521285112884702937904971535989594393302698489020568178389718625627324020502329354706893589619173731210032692
+7043789553739208010357759707009160597258827438739048435319844873364203025319025627611147486361041079291073784131340379802864271
+5630517567000455573262321447961724157507366377593234074637396775521413915860857523966422306759381837353927621547514858375348648
+3907374620037626404876010563369584978900791842626728009855287567645993864184962785602670934980414501849977057712840353440946698
+4146385141059123870591051497280881668008298341992956096236493101498703482256305064373982480667690632647788868461225656591267014
+1968850563894509480587740368883124473858275653505054105229249423142559298770511499954927552803754424222038587228379761857441343
+3593066522032907759239532950409720855609763959255411331452747381650146615224156577229227092417969990679672022642682488460230666
+4777284684581020086703554379926122352924845140673649610422757744893763657846499512591483929572896919893136740342514388775709356
+3278001195584405224574340518455727489287475412287946187833805383833415237459010850315390550944653852931708140442412147400013062
+4193626826135963841422031213601650476649922753686929704940497664287967482680127644394472418039840709944058706759350270065888771
+0496707764123239353916969348556102234417341754509205481354601177831190831135133718891421262586922485229955848858284322651713550
+2364211115463126546765721277139380044647678205497997698025656179147544409871931320460204274120159204240964415234469912669043171
+8252385686403049790333736390573303996823129984313927885511658858105668489196273816414521496403236288238282761677474764476093781
+1249545053006377773498004690990118213356171931577992909398589918937522320753583797192061779831406344206481621920250152295078939
+3709843278222111715104072968292537550135689257500851260250849491755576197121702408117922267107801447424437466479647604658838505
+9854374828488017805142065771759506637983062326803172669751646781389776006196509659848336558123328010610366919010236885546271093
+4449279473317813512456203547757437510023295240020059908269371826627596476653671730054696042131496333128833416321765418914320719
+3406255777740484368806154865989716577772954696365667763046622581695081667791363935783289021366520297269972594689838903064379670
+3971992965532938884360604600128828768832371480402617473079458005449743185395881312301575878592825423836990732749119210579499565
+4964414428994770524920627355735483099389790803639808833122768311697123316450497548024460387672711368021069867385676748771138907
+7272947208705814863061836555172890754692453812368615959884812383294177521377885043762530023437311935454983526848574910569784985
+9715236460972266941105456775641088939352379849288420663874812734503948765928906653066695278788734445614220395365589281481052985
+2219149571492569121653088856413977750911860290899252411873082297287513781665034941515671551141663335672214686872998009233611673
+3252445083210515790502427230581525204628936179674886617751355536540130374691771589975236704266655393863956951833668294842751553
+1066643170812591610511115847160870442604844517253754311969780356590045310298592533473063715395834561034249527692096332630663031
+6094678693574789972643719059293336351890222699519292906160704354339193005774875964485745420773135852897610846364640226020416376
+0078821325017540745977661794444919031229533952549930041702337654768594140134838827623154832919375367293846998623573154781662214
+7359805369711475680734455906157477769170543397898162106347663466476684547058977605857152935135397794083854436364067424905370520
+9053319467618246985715935346228519691376765059011804822695041370567668817595587435020117179808441224160004516561911764361051760
+5279785887324494559284533174001913906340668600486179364934683183133265522486775587610826495582037876134991475823478304604306409
+3941979376926208894324337577802341103192284179207690346815460983649049917703085665853453770292030524017689837132097566609313622
+0874696648882529341619751279943169854047021416531564941329234495433297775450795376776860235960754121606226960482122943806912723
+4403142549129181418798689888112583174439363438245360666469436690361242515845002333293117928704700704567851599171947638983428803
+3086178172887575667595570158882926151846562563832038255451988723965663322118638716096644911129577785347672668155756960077259260
+7016060211620447349613366392265953857687262706207804671997611538526738050334785125634177152240160503249217159499633364839660140
+5489512175142718110444335510020717260552562939322469369407097546446468340557730058147393474938996409762845800786386613781180803
+5316893398694618358236834304108186582233111640280225864142166804368748966281116139163914774116490280764125236118841244780654205
+7528194334785274348270807743401184076977359005808989097790847628594537909545137710117536079654129720175240043680499382931315617
+9670385576675265565821666921824539041489513174876467496206200652157451658908879498586135223489695875901066307973744711118179562
+9293554881752014067237144247792025493783429506129044867060712220683356640982811741139549073541449462843252209357539966735713385
+4766042719100373229390546845449462827735583320023428894346366740071025652090167656518273656932135482003817661060458673642777968
+6301526335239349282461856549816100522037177673330915447520746670914149246304276129215650553527297720437502141660843474787824161
+8981954968443818080133345527259601739419841565729583936192031325311804839597158161812415269217752774138988523259895019553556494
+1375817110090726843596408461202879175175450080051006863993971804570798947994555625585878024069026053117840656838335462247825434
+2951238989342425774096587516368372195370856662387116086488893532196578602234813604266303300411633704142608233959411992656817117
+1078366109359744038481314864313226318060249081213275603047710120330297564750748020015170091244280923403487005151336327967793644
+2590644710984063836471814396137903631095128763841800600303330827770204519245855428525596893191150792386804495821205935562805056
+7587927489845850917488079723623306056569190541982982580007185500509384196528055437763768159799054085157690272308144066104571631
+2716691447638059359782976991714931875589838509515317643963169052633209626064370311932621633892908726622398410656122098501462508
+2187341550744516068766043103052788709422923668066123030675357066234501008353745371362353282261896383609682551818558419836467474
+6386821883063127753430057004971408049021180273353275003607608462963509731380707112452702494852068512020333193164120541304971821
+6414619855917522699462290111082170337250489881403447602549155371621815281167692543542521085921503446688385053019234090686216914
+1514251753750908058132963706101498627247758343884090328099690893144318542740931341743091728225255850843917610568152776796003007
+0586747600603620622562637108763020672642036425806055677095355709416205188154703219135342081900691181922293308472380603914641966
+6943882703466448671671347942866066071729197097929636191832480851465967168936588557508460013143074231989501890259153468168582090
+5106944931177904690443492972535629421878279108027478056702348421231814228319595001969285380236108675594104178148223368821682505
+1013423077468134180344202453328649263556597230333389978398486618230751510288831048067335293062077986298410020248356624260186784
+9609742549854821633067526470397698241682366743287992123678759953855431672859515457048320102063982700799641338555460645670603233
+7227510683690963888209842085118318517866633639207568611885740247627869030070367221673493120062595703412511430540635725690733531
+4166904720216643652362019185541125336279973971095473810174484610634739482031555699998920445667293351815342116856019765913024721
+0204685598907595748165591866024787377707833163733227729761204199756529370097242687722444149797918578951904826714174399654373078
+0029695243252514591043935308120948291772608227171634548103690625246068887952914933102467669452782090604646361027594958463008648
+0606043910237689889945195721316745105694059044358961433889516172023390307325162841023925000976730946622777686367139699337140288
+6532770425227279669614506342121365572660042996371513972011473090716295756052824631404973053818570282987235859556502147507091296
+5784383703297394066201455976072965897350946662861440804630035111722516300582625065762906422553404492330383168345359661866546635
+7755352359361297136322168309187217709956128684689901207140385336402261861792474715981622821266358097679527860080999492143093132
+1766368206837633471921145548103904997241216165904015409300725066451342178028580494490424756975699571333186681161146526160888637
+6435676017243653308531673583521916536301571057843651379516536378840317706213255198563089909258098489728121633860286779010828363
+4431604721944445862183599288814310892377084499055111017374193726585680550914726436314439993180521094601524845475777232173548652
+8838913044786662722923315829866963645973025803566829523066407753524509752981118743428995908031509623037684132020735808440759714
+6831533201518779101708294838185079163952906812726056828622166710833228863087344104415454342957894082410432960146722394394312810
+0026750412265305432804678135281250107474394107101163961158631241381326874456825116424953228542574854725058161235809819422717951
+0530095666016377728309821374273950714947770494099333703734720428753672558560341529622248519497385032763976784920070775745998492
+9988103492323582802831123529566020729884479858348071107686123450154590877464099472518837056085048970237891379355375854402767816
+5730632914573233372640655739395224654373166501801926999740491530052469701082483441902155873112176686047852502749353152358488650
+2570177044053910045946498496953083595646140791798652856797075918041625426521730745013108556438270557756261535076617672897082024
+8070822196216776547306746987791806776779912117872036753101249436897151550298686891155685227497724326515850755173992122017730073
+8834834453446142095731369167693716173639921382555584546233080228430284169771661090869805523170856183199180807458939980812347666
+3374034628848110181967055896853894757362330956181597331342944383294532319770922905892283292682026888125967189041997170645906930
+2816796708896328193169753615809284330192400628212014852560752820595983573685822703155361815716715825780349446395688288981323009
+7068534005360767613192042797492589713014221879034298952445175191916602695770589539510033643533276163270684273301159972772079846
+0851847960381648176955810985408204753982844887706344041815181406997985867444440863020286602964269777581948956459433973575818007
+7244153065545137632239977736639101263396745129055793110973443976621943425823784182900120559207556057714294191011934647831514642
+6220112071917364308442903062123692544853904143920646475613405698807838684964691297033599042267911174717943845099876701146499041
+1997737579617455507368079950355247973464185824287192636611840482334933626092039322468638416062106707636638684831343949569888001
+9056473674062962705649948566947590595122246493016055906506275120659977645801864949778640366697230510631836906881678697914437413
+9851293934933351435860731679561845700615460829332071112719063019501427379839759911846192375852475742108532990355637732868083608
+1981670764831163220456625777162284911174669042984422665330847096514572430663915704539930674009046717718308791910081803605092076
+1436167228645743999726495063433059497403336540806399989879727825522625780324646087140141119024144101040594738802339934675234494
+4511331339256646611464785947970006064997210981736418145964184001849876673693526718038480153571548117761471182638795979792615062
+1795579829237064976093578272496505322533909223281608272636931019121795380635442871500788593701642237770643966129586714071750006
+2259558543726883196265093171148297545202455060457641437680621020678468079454735539167389894892674876922877875836968284903103240
+5190322659532635977759442475453937445078305277952610411039017125942798503797185204729242079034555967093953206391753749025286545
+3346586896166410527904055884469771043579999692960199777847808583456813215611676699557144873569764821207184084966272170201919310
+8492812746065013433267691323002027533207826063607337577540310499920611687417123621076705455447051576454279273880574231655581484
+7963980271743134112154087260650334248257065896933807620141668762775373128572470229135441642876072741306062133796013873900656717
+7155588355012012778870617504567123068873574015355543463865010611682540901252618661459039457810933495173848721472502301449759789
+6250342428228956319030041026630301654869718238658413832351916020529083012909954188736775565330222063260635143292678318707172682
+6306362489099506339243174369018743275045301435603437084640257826344578993743886263071878533536813315686531934206065891475930962
+7256078764576049009416184871748648772794832357694303718710674780587401830972226331756569564368514137449167545781329158975242668
+5137011302637382277771122596368810380574982751431852882121643844964841634725254405565914232138014950212916177841984286676442765
+0130766950573613943351861223297588274240988343477886895038747758639966388317215304568124673651393253970716618528199527580176531
+6359126988671940758748887099156058290162393017636744749307547677028026325587696225823070273928497980385751428178855356190336058
+1262747164602205208071416052898259778064629199619315166088744120423992672210748461774575909144208599043872184758764391922991513
+1637777143251220955861291729128344859755814246044289400356284088474702731048933137147907743901585132956196475715784684303014662
+2779656199507816022148661387875419531355613321583333187996164541556836852609250800638246651009398874732599973734012124894691052
+7354320128684821812105410562348993616339745664287363950112497961551242247169256027249678322546929448755022227225938009677843721
+8972855810687812606653074585753478301824708270260970161604946179349054120962204468271996990113102973342165999101606421899608935
+2427496334389700886512192278170872300796174251105207296701976843139085003204747190192754643836301630137058164840301068688355227
+3959418860712955101125551436177454788270598656333682307048221492143694319890230219738438292220497263359673419823698673057872078
+3013408623490314068776627587135426768753482653895410991590323095157887499728772798489129923069618646593123822639438579269538635
+1908216328408109211109195709992731650405613610224189255235529994289098765621895894667201782074632616819297670322225038809119550
+0817943537763128333901984566290468707429051150902489063403888015248830107015875323502758058360302496764604163625874755344905059
+7334562477121670573355518606105354751505482715112941146764597746549856497547302376364513456936736713783904762299121613461158516
+5283407076162674672773440443861453333470684691925760891504089347363035836279580135355221825821573398468104182485287843330909617
+7205284306122028970211792875328746564733992888131805747056055043004240391649557442465694153748887961289838987106491544764907052
+2500872325568857502281229098611844366313487869502518915819858430987626410127129066096878146872919622682973073559229804271266907
+8295782206872660046903141337058447164373782585028140797785111578071196136068281762757693333793450310851105370333208052458896958
+1725889330426145518489875923548346134621897254499345669060138933732620752098808224545684009099318550221718273960774029508377011
+6086360263760539829227685105382480409473035021789956560069988221518928563686053953426925951987832850158619577369793062706768043
+4352919017742582830329403068368693550555003865896903349651288061511525716234272382256062983241592888339539171693959034050993111
+7316775446918119981332285689855871890517757525471516688406003916733927585058269512316355228173253797483394637476145877140830653
+4449523419101039158408708904430347733804700552814623747680680614331040890499889250979677397459532347731846180044631683772954511
+8775927277284478472403620186389038850970249719140155845452372844321949705137084066166954690611328982193781479003940799798395822
+7036309001309751772232372080817838422988947200353430157955341599997125428100524596360021893214442902724490483771053395386266905
+2526553722458751882973801186174660169500936459737553375965211051557068305755252365586897544315025598670454207459745656417390706
+2637149880243542713228217652476736046313897745886197441813742086881967480415661410956495847064049122729695529600136287474175290
+1793795271658672504903869428016853432949018555098626397052181786382888682206907544219009649133780351002110388824693692103301828
+1084255129975610497399774428514444229695501619744314654316691842636967058501657387850037557822192693461604997872810120193484078
+1690635325513958119210187262311486075808664902577687177132226261921963946973671413085629761815694454894584772804358916692902290
+8584983060051303667121308176671074873807110361225378981139031261855126176018462516372607208578426174357538994152717337719252523
+4278036428830763724403099207458044021754910574858908048715320547117712294990028756794510860977637952837840922253254728458600984
+7883825345262132475931206135018623229949112586397174487649066363051114417355320278795734783658869193239014023523778761960029033
+8695026444117478979408146585926902316341504795145288358653821833800650855569985787340203101735816503203866669795526287437002033
+0245051742430260486282155254132179648064481192529358125651323989892545661828432074084630060930677773108561342125212783387281955
+1156534912244337917835348237158665382209292463641851049571853921423174805869049378131731211644957860891749912005458383867541676
+5778772564492822262562399502030821202632651082331648596186198421567114506013473886361019711381249854838415342169443696628858178
+4018937636066081000726527827443126701548588875106206226537909295887328559668190334839725133746234608966652449462868965060152769
+8173777546154775498367210355738304841393638757271541666703324260466614672029573295838066643359099243819511379078208545782984277
+3894531584135582441443997552974471433572355979512626259310899921004753808626563585592085956971397408889173848312206978387162122
+4249778224435541775834672279093907849532605623442929414275448734738794025759189569362602709330104719867391830325898742293638318
+5618458472230917207115381643121156657396683440299320861523898119230249426608095966989749077626813445096806473183743262392826169
+5141443017081978141752639960290174384446691905687453519079674615609648441987212131402698830771368709970102768419122745998384912
+2946562140012561122001343127839838295167741172616748608003211961781629115805578417306196780198449660660896672943032048541196007
+3488478058250138575080356458275864826075120035949332139371412714212223138848322951784969631050003335580101622399775487873990978
+4317860282593236100733831872685638869277432762005042347567404549772458118340256499688632865717895145858533810557576307974444603
+1928173630042126038543686101259940626688530747112695018229893249219604395612728537717051374474126617790845613836004135628746556
+6994181584676204860202674587876078621483635083475446039294576324194007589602377577833162510613729896861820149258590200450670657
+9591153201889299370958865743889668888080847094554165557463441635078117012681280739489741681606506751718013927402701136203548044
+1780167360508315641369667116901861812842526826720765686979668702075706357523197794146674984683061754983908320058757429657215020
+4621260027453785113729584439569855185620374311773708057945213037359358758689719104605870656508325190409944963614795797144191442
+6611412529823091494357371703456481103154272600004279607488151916951301067639113190114505272247774489140541745738078452548556834
+8106748866753253878302577929999224844368660368702977874939897082451513356653811013795048262545973632043664542271741351318143337
+0778069182951962287178555694626059563658908945272131830094793792647180018850962827338479100883010796179956428416377824203799082
+9473023880877077477396337686061036427727779399244945597262198872743579391652952681609513942805826872165303709494805916573728492
+6294092277154179951451094865452721844277717466377028709711650186357899779470166784063622634966195721705046717157464710442807466
+5804785796886616339545161571917895816310538794711393196665470438339980915686578699904466139950097093535760550147855823745768311
+4727439998296384114816286463820007469707513836075275400610242782096499770391027100262738743742494025582717951675320717526395925
+5770688225429387772370873623458820190254941682623110262393319797303540835367273621810830554446149103975368995431078077876936297
+2405529175616664747550451981407708416427503988134127731468009719622521436517602196339409678849267725633683568413854707742239684
+1747116986005191343502956460687122356601160408668274191052227378815062922961362392926820216609198684542476134407735883221896780
+2662260497987146574078784874203657867733135048405416920171958838688884627100473968981627006284094098910015991752992842055879818
+7034398681569535649106832499610645350629642323049347631261095876814181084980886779188444300173631359422796869708950194760718387
+6836733703618557086120703365229061728453720426186389529699692510071571231710123347703658534972106524417884249218380254553097325
+9819799847270574690752534052463450597318916271469886310284525865231260264874522733678980911253701800076986898602579299994595517
+9135488779985085378045629972341159746040904128068784460666062698063117787215014912137720162075250475265414449002077183911431414
+9809851736195297213683107966811862847637535801414773082875296684360754325074703853487298740359726050853338447561139214515571992
+1029599022890794387902179784268370369360935567144903247409435981421651841889958031240517172069175107596477581973881408689860362
+7400367259185579353010164869469689488102231791643828135531761198096403804156803391787688285965553218505121457658933398225058406
+5220283029470788325194233641742163486977117357701064964101876499830666046451739488161844284719262317454589282938926798508893597
+4856368375624850629404156042966360434746200563963426632219247842217835149470275034357811087591708435161482657165228727592100816
+6253772836778061529203496032750827006398455227451857109564867169437129073006140463432201664058302222335982176666409479667581160
+2936456922664809261586171438046311878472513284135606095783748274074803411461233988794425470611010249655925624921046206975885663
+7903340067868061097623144373319704434575514501755821812557204930865063397777392798291309341112700415633886191910088310537801960
+5573481392684970852911664492959855735295070104374454536083712417507044706607037494482191236686504544140731669546789850452790174
+0904993356742978486159542255719565213826027717277534463338027027906360296595539148861118855418724089346480767402189286985762676
+1005223076106599446960454896515318564456413560395537757983458843931854126284677517864393826744115625918435152244510791809692478
+2164405990650873094086602365842140190819719314893955030230888932507331906676191911961689961891255808931785984896260979975690681
+3253727014960636085246150995307788585817654532411113862158610700251523142672098671368947509829930523262641611496136611155754050
+5927873322526687970315921879739844277763573086829985560339421326548635360045717801382027508629836290928584431149151932663653210
+4760858192547745555268997678117732829237567270192822266668837972286266876280740550930386549524048812443132805094528566843643923
+0552200604353097511107833851418517885398565041104987050582967853637644070929822812409158588536557876274185029987107810161351297
+8488557995995493390642962339468082402922946581115285486581085810242830297673687274512734725802547502660334048415579446341045330
+5709356062023991965872528242196958896198910586431524813751700975464715731688842846588438403790663597080684309160359805580967928
+1809180118084899386382440090650505696513340627765123157216132637785703218992306349927445013022757227491085193637218705876572392
+0750092974015461540416097560544979024242793468547428554110331500932107320102022511854661891492261408877458706999860502548130498
+6089719190070430700600786193146021409101280174362984471307624705342744373049193769815102419864609660529369826990237068799451547
+9880823550824400406858764215681272127616403736552454898294728046365136835488231881807123019108941139138735003722461424915329488
+7529037321181887616470646776506017170053425836736636947752180676382271801340633168596956291990586642144447067879824547939050775
+0702265125795249993652978449111254341598591409462513412644706330823597010310419837016366205284525093508925291114478065520543206
+2486005489914656200352331842636430195667576175939710807407359823751196926836356542172998603833007594132689750457318477364742581
+7540614426291493245957654051180243018629278083258315716499682711339148507426602166172200768552170520220563426401305349960660512
+2404338617929580850851496148983728094122155851959629735499313721174625488662780908166750428714979229469660586277142190041914098
+2734970584167413642829413555542927092036718157943315563661250374551603827984602155759774285156429894221533968500275418633637182
+6560220052859607041833971976550951076186294969188109531953615241005064465315852535875503380591519469842863315620903120851882868
+4362109461838990069490474891539380133820330011017862518437725479693309451782697543824505868730424985500423739583859994419014638
+5084805381905175100929792755321577290419383142651436157340596535511027236705949268189435276570853108955493181266234603455114274
+8408563281709145363110504396918026400160693545535873614031123523353385515760396989543124701606521301192906747319853776998158894
+2312458699599599230972023213413420672303278131983854442962403875724144311681960596932014490316204359247402654596736629024793653
+9839221740989926513947745565345687824749236841443758276831531279631822480088615812410461505184335496692743570654981097859767887
+0148513962240941032376953093608164659349988907238073209903158402845914764726830224719377417036845150993399330628686012123441747
+5919614485617148484720530134538022911021657584302803306902527053421247675384565988567910916387370777305148589468626006026739483
+7159664152823325316769176118475149162428707398939203649766531576459678350978394525441052205823105345184421463902500121849981000
+8288659993085551546441461743163304405139009826361143974328223331967419739647241073571212327801960556484524118468883764120169524
+2246338306775029095975369446186770386599660011384020498379465046982275031718873753405808637548601707969197710675661519594764281
+9599700671171430778834023658375047244787074487357323294015535711745803913257607799601446000833932736200689998469969708376723008
+5081943791810860552689101511523648202214658112058332928346393590013555144813066914194030280115978731407804149764646197662984115
+8801177359464553557557965020150275317953374369713023241680758235462889780964894972416089799047047809594791811478533742030190073
+0665429844750818754679057503636454736605371676903157540119156106676570191787583727649819947468340786574584101743147082806534991
+3657977605543416424987117022654696293608374996078959363230667155054631271871981115488592293902083994811357408917297410729122498
+1862650934481731910956432936712254764601612734362801048040108459535230079759939514256093409449391542317896091270323008227781776
+6653398313274972684240408723778161592189390653041468423088421653090661249171357282254451145484842067919237970412388771640682294
+4059821256052393643115972017853583376641290368154419793622859038067932722073228138326697082834080833163668963795873824307443161
+4885945116785653293180979216652517189039102100870721593874386070396567484340764036310998065513336640289679790609291581823883333
+3428604720660372157112193405611757297738411485553283296939642822708738180393410023516446689646065368009275111140421244624003704
+5562960052258931350563961074454414104687746794788022658055770332756970270739126216170694306943534685894930524814764997593650416
+3008384543733504706776478261526614225467564069116098586935957253917385357687398588155803265872788670839186222042335779464643037
+3618994828725096012458832876031499829184389279845891008599618731986280732307102787004526300770299430819579608003697211024173693
+9217086377524454012913218100708405723232921242597498783314818967648121936298190307693812351239182876627690699979858904402641018
+6156985750875948360548164905855940506817600324843389599811157633619677210306664432514278405659673075559217581592839918628085400
+4764772987507938088705673246656764726283775492007659316410580014942504090614797117731679264296150069410102991752421283871178501
+9088021494611622294962362961658529846402973311983387998125910749644155422299932240783260368601058914444067830424352644504379196
+7142168355025888186137900382975205885091374237093915396552747486547739152007548268368634296637427030850473757422944218387854757
+7616183325502874293153395715965826837360328123096242771948215374071981140320994435687149135694129364024023152186261051421982087
+2832792230789485819847349814552874874835409931161612591863141976920380812857719621635320076324767599038119716738981834869773741
+2754959867605262800904073710237512445047870616662855713005574347858126481109562377143573312098011061313182520482126994274243272
+5944572495216446034342198294744331850728989442478427239279385418283344155306850003896073771784045248648249808863649089110085745
+4935039678346741118281854023639235666178336524231495974905785711915838245296715638301791203620715851604930385744033263165263809
+7601373980902035512868636064609722029939023536705525076519976556652492714730630698715244783359777077548960439099573621098774644
+6788103237769355632318040401274560065924878241545893694505228598734431875252964572555463844283713282670737691866931493869606535
+0416187164312031460323292595651046052380878338516759425813027437945468646970166296000101963391062426079829338723963248745406623
+0923089990664161924027191610177696764629811421643542437939862866986835556859764272302075103487218202328441244550298063164681875
+2019867260237068480077811032787819165579411546914115220954604696377168121100888419574969311251245311564544879246746582842436916
+6868613732260412990938531237301911324073055318005385120355972354500615925738636280898984348888758911483752216818128353784893125
+4877207978980281193491650735689287510067435635758992016711009033554062927257985428856499572775171602494384045603122508003854191
+5729531014485818371423575856151555802439384687195667542811436864469460636476071341511650757925855405897036006697261458329928553
+5460991959983883494783035364470651652782232918135295761659407906592669701830570881217510435070790362298581095301898060905173789
+7646351028988526172675924552809872541181626761125500157109077472362508995981523449708391893239705562284235588614429905027555758
+1619134181392874715654091932556140391724453901036282239744719175838602787922700433547863998561669814541630538374359332841359124
+0642132589359772875036014752032306706353508991088875094683831897858049315214902256977825841683325136398731544129046064024590934
+8005838235188541103906355513876550842936138467720245485620712847710339766152168792765762537490548824247757795430623230546063661
+1739498737086961685166983125262113774813358028871712079307291894391835363168962025939984050181882718770421839433587670806624476
+4755044069459609604971745446900378189205860081010611662569670882836262612421135453240273781870602310532514360568130085933991129
+7924290416111768289187834903766663006016528601174525638099383915633909474617753311810491476284105443999724682875652267118724896
+5850681695306617855936614324554272763867627188224507120915540200480120428647332751636414058742508052557803594703673781795569627
+5161939368398633733681924028671740682293310854421624725144685852406527972897380355105818239535806432392343196805358469063293155
+8819559114109771559602841216196553885494830284200973490048941610619985614867118986891106961906280843338752508763555675909702206
+6241566490588598271025864796744098875607062200785043619624462705052447512034382219094774621478633751781359662848610200184361678
+8704633729839925740538038689681271982506814499991016892558765319948519205733093865854380442216165127136281006009985719211033451
+5874590475603382790640233559612673482775953839089864470737210616394894296028059828241641608622138456309335058488482647911816483
+8528577480552717173959823507749229677977069134280953275629509898562844929982109573639706635205828305920402590508711781395835713
+0089930344552012906619817966789113931607542416094931145768127062728799915073397115668423507229674038044945322045301649766598530
+0236619236986319774758924493517372212562285619369190213778360087721105343106507409406716723533090029620699768530871602210981580
+4900295631035231554608058112293217835929574133906243363911069130644679986177379278388410792340109628431007635443781281483062060
+4988368133324357435318270787600078029431686121284484541827394881261897104701243599451161363480613963194743733844807088688115634
+5178871803932196297861340370803170767481272576611956494376594793113965439245117335478620700378039639755713637510132362926267306
+1973846871626730910248052978143950536530975380151232887509932339881071793647054810578672393058114957563604971882394961817835491
+8978209292630747251522017252062343300917165930874691119490642832557026684811610939173618238354559097444010525631775837097840951
+8326182506155413337881369137900095820346248710691175947937982923048432643166491650906416257503450243786283464120124419550826667
+6090914463028322098876359782808759824243499333411218847428154348072847658504046701534863522297418259623151406625685618209367317
+4253745664431692653592530190665547218310374995530293912340336697232683775175851639464892393461388136647485464789810252552522056
+9182156878387604674503124667923684369744370052287701241975705851689429509464670883347575783846313229293967680582071694204051095
+3321006971958449910630372247668837211034782309154572655303854890011708581736868651280877351904031869989741999700057554577154390
+1273067298313752548096207203603148138418750927315375729523637857281549085842436944573932481003443446922848528006413314412427332
+1441821872672191871420138772481289303458305298682170739045298765824678050356023853590500427850176428627107627730008396343350473
+1052326101498218606100898713263447573551827490516947668567656571319040829379674136592743558516074455124317265474909140902458087
+7834541971992916704455016525869622512851276565353916338983507230882585013003793323808346566693345857527479053033593116284574877
+6838252895614149905894777313466208709968773989472894570857815422084908815232548928189324969136065895039808122393702760781384523
+2929303794620328740393974372454877708805842222813897741603177439187185228877406834374147233014054610369299556729412885884560745
+4370856078387921623155622787671852014805409807299060561419288539719819906697663945124473843579383816264514077377269614977581685
+3394601383138607507974293429184042736065549935759370359893007688911547744095191909676349245026886870781533913476330551278360831
+5351259816322765307961191402595778339300322026355376338266384698585109900534462235764152505801492032987502080039176402011160649
+6015860540766825761905783450339596728965747988413885573654798343784315606643443103943694670901175274103478596479365688106195479
+9733596316022892971509096088392032363480840038385290255713310540683102401152243848292964926264212842555582110823197263253672828
+1062515708221923559386659794495097841198809034454364525085442636233669203446069926961726048176600711294973993391741061849180079
+9806127623797585819585111237146636415904332057123217989550966977692535517011996512651123910136604576120833852264076101548649068
+0894752723723477938861483316019471992063859736335516787664755140329957520633060255798252299793172160680450787189861312439796670
+3913142052442456614486902320774033281367626065329089488796925098543116615817296515061149179999137691128957532263158924327442783
+4918858536678070436088759702284980929577025191565900433342638171236644159755504144947154030057873677997786393398810399270491800
+8872734106335380929798217774610094691386997739307412068494969134661496618521118209935954632189343140189392135323738890270473225
+1245647673515237131109490917571703008777281273557596852732435015863930630266628924061119974383584899927931767742330245961719796
+6852379757973100072309834676038484260260899346508201154263890305770366822928200041404900931901074539015449894481478124870846606
+5288592940348602075775045536917167753748198797428454287343716300518081003013742004598309648467119358078992444950790157070897622
+6178224434793312241397484872165819485491096197408141733026367177440768594738187232231600889719889461459739097869779145699996070
+2192775687835295828387187709692569714086691619295450894879843196267448458847228413092057333128571855124524447189613776196209305
+6242914540023653075456224110675459930237745861318742551814072907467664681202170417286866153184100097311858010110265935844444511
+5209497239417620919469741474768380931492201661270471587341653498268177621359803201248700031595849957309397980724999380306103922
+0556894331856087053327675958304000445533946185075415894264871473185811965493131424842414390488954096468377128994425485984798739
+0196159676818515225003292466076872625799134390488404188280002687542570342770954127173812843410476595231005479765885421327808255
+2605242865388848411850848235973559236245406311003883744452617685164124063273300160172061005325886640047067612731170493761853684
+3723865217540793835273126631505051186346898929963194134815240955269409964826180214819749886514216356192979128714223656587784030
+1612652380049586827710856241890765244152817303616193799144244842589626119110544403111366867458976947676427002814778923808924618
+3631721504060950588384351554676808360758437911729833313655406741373502411393332262640744499827573245395519111703225362606878417
+1363409383247041202382518900846037480203513170344097014906470642027432914804792692599759592956926861572014354287205548305433650
+9938363167455625445680112095072694438021204263665499289036436205115409602435745285690360330318532747799997172095972559600945294
+3849224957526742255789376070484796163223388025899309472042686406132560940455845848040737742829859477224469824421878404438255777
+9153640594267832855398773722288983227094747426234571630063269545219291207342356377829705537624593717193629488670483397161337722
+4742683466675948276596206085950351177248268507712030644980189541847011659976997997291786802803131893537147312873666734632318013
+0962031832358588577470495716330583413563622072795533159442347186921867618325791765612531566938977664106322136330634216330706485
+3562792846227123177501866289549655646263423972314841727623087546398961182987448990222751356418413165373556965561892665216006475
+0506481362115739578595809306613922949438046074388531145186498774188751322860892046433870735773039483261252104554347599292426213
+6629076659887419139215806756640799939588104500582964705062365481405718348479866775939471858338157222844571173771380330117254323
+9427611277124624517129218643055712610406848999072749557192128496185603527876575966140152280783898310639896801498077008734557576
+4949349263979842274642964286301282439502057095606102606822710846752651420038445554041921101778203644249576817202379962365236644
+9000537778793090403522534841735088671708809700351632320108127651758914457761194719832533167517277944390073544087779452376879039
+2179620974987315833763764525622394287879156162214632089232065378247731638836108414730685627306496030775755582279275263164338314
+9850178620109230660864047257606734366763600031327072575073099542439779650618140023637464021494877439885488556217335419454669846
+7274436451730146692806124202594474275423757115268107978580315116832524063995327727093500514697813597360878942124695394787220781
+8077050800020141873083229149343719418506939350096709806686454834234546620350690053797423042331890117409969910833834635664137578
+4222569085314829230694422189066171115029353200770994620763730497186499678980036529016196644500138184587387164123266827728301061
+9140763168998745887384781477877234025340780171338591152461030018239430263211801503428946233869503372300942372235304400820946852
+8437399467538616927457301639250511729312614497619431195080809960619969552298634956256648869707957943168309430154835637684617202
+9927888920815679261894236713565064562156846670872463967287481642034739020192858148286147625951137420641797396365115772980951219
+3655403238951645285818609634851118279549531888817205406539748497770277166060720853420241694457643803188820531391415953932633187
+8096429698574955422724412934129163958768439154851606366794537099440778504483170647334793461803467077456150095540043989710581777
+2365201968161103470136827409580883843970089911974172408580391996075540014445987053836291636308746569551411995558157351658739831
+6950345059892537018933018077820506883809089865363951638996552650340293111131388149509355326175519823347067351884531383182623006
+9729692983578755541105852708900437725294440871971817004794137742625651321002377622365955498287088740364399525852759257372235252
+4593851734614428386795483124618557640086184414899615960895693770722697765927766996280493365204591488466719654529288305662919475
+0122479598904859751605583470001521191650223688479671370454989314043303051942287523649808609527628133476925823025842389422672084
+3056608819600468295745423499468437706122458751753728982506585826980159252966514250379765257256312249132321573973154317443215255
+1261003464887189939919598811711885508553376196973665253914113359871227784508364309872766800569364687529405313394507842277777341
+3335595614255964343357224505993110214988297629416503148121404268247459966936550735839779347369294370575468296662036041463516505
+7279136021331762991558929156754763672783232261635376259854674650491435829901582103560659803340084857348232939069746185793481086
+7001312755863777334623418958360382433258119385097977803059882470820602915102809159265450380632894446941317444541503087066649605
+8796169740654134032665098260784549928283316353597416172219489498769356834724310846396610790766934291348253075369200618334478026
+8802831163686839169667839421840117736653893219551959966388948111069365662007487678001136916755953605936920644573768537311349838
+9739545132806507773311726139940569054566559814706558048797461242055138311352937387308888484537481230253759123043684421386096698
+0953084370435253065135920609321712138864781756707944630525539032264477854921495176982483322151742604869890730064964430072465893
+8563889642871990807691809483723365775240608384031148556634799934500723149755352447233079304887498827996963939978814660785015524
+4422068594927829463105462477608520539620307156466022889708603842952278355035865136962605151617935839688034493508879959012432457
+1797597440197984699879058451944014171742351115567915351330880426124733117964473476818687526048324044778050824433512831279314278
+3544880014006914530017330247894174199038635755809673971423695196336512713364189925640866570283506889971990951009729565756092473
+7989020444450139152190142450813270776908916050703362005761467814560672206433992898775383186508883181569920382329721780736328572
+5963607248916565843748383716251646836534350100847190837736559193434644723784998135363197913246364668420334826697708573880522965
+3263484959293045146013061177283236124170085863131765193651484251463844732711431227375764646336930721004123585223994485289918901
+0583029668150873954157367992526151571563606918837234329358185868795166989340614129979830550547132857672143145949742222265113600
+7440572366306644814358767338023644569585694763643144805041668167574800647065193962831865616870056333413559981420227280146948103
+7295355536699420073390947523011459995035076225978883439577116325646324872851036992256964558891639573786018094493982547872559135
+7129457262838894246866292831053823350947068553550051302734533231301531811721807950765452389323781067242015285235015915373253500
+7003661686534989695171145431734885832337556123063280208162395256598378269110597151277334587048349487450140097618803853206266757
+9082217774055830430004211027285925285344275476747121049534781396260863522010542259349559050699781590339007899734612452403479287
+3191667292995301649109040619271406402727834137378627737752393244791408796163577067403946973388491815614922007647090321324522320
+2949712664738909367012483650928320008049914477514031653686312257788502415066119921871956279807885221949190218605724017500310920
+3169525625766817202209440542641629818384859195018848363928308881901815336912072399651202491194626625193357131514851165636605801
+7255316665553834762495164950088245569336300767957000036188227515262775800565384194139225891768802813443198621045801692291233140
+2574872647913296219947966169138393924496399035916640976364671914696565353222749621284958305509352891507065537978150518314618840
+1953749417768878991833661315137426428652077503145679920658786397955780176167247358992933014357557538701378753423037285649046608
+4668877807427263578702242652781568611601647436182495270690516771196062145719412914253392449657363828299691513193636571040444936
+6886803557429783411232920271165325523458164084362409904470754437138270784982746722601116409545759719688367256037780110379647023
+2300356518881462544550334413932731049376257074071686920169237332025867743966470152553906187385400688773328478685498436856277618
+3440412356699057087611095963196908710039931495043446625996426055839433344899946522222609944936452224313579344290272586318016202
+8993953982184479368753437594218699447584551919428710623167603425460525558734552005471227418138809891695708393142992004433396157
+1641364290874900167201473644758505077028954784718448987507776152112958786620272578580374033281627136838108776465262593788494546
+7335791534524477898748563122556395894974284747735359153516999217809354333772921832279669823385048414976444462237355621384907691
+2772845418405555209223672772048928810050444241654554863085813477997024445507615114437302354148041362541497074784257678291599777
+7178588655224708624898385615582303156928858845044700179599109039474166324676359828675085010955238472718587302252391630153958817
+7714350463980300266933000010667914572625520828229727411680133017980270989103849220980928606661613727680746076907445089175447948
+8959804988970943750240542329725780454835670277149205665534383835852603494258686925800889072070906952377561912949333090450610435
+9127584427822125708186685340454898072189100248623017561567872674357247419856515640720894591586135918230623264124957308938825903
+8565660274882658423962595807578322116479785809616786494557353542161430392650520437776730973491703217016387298185714704526578560
+9055899627055835280579204790473134990779700561942294557075688923514759353053304752653692669704340622777026507467115119994712711
+6401990429555126633982558874714554382951718476795179895512968275571839503381782370343773457772170386412634133151122279458473043
+0293309378136412704813380987793756861154395548470319616928895806731980671468030021029452883570696897386186564749939824907170573
+1417717547255789991707004411151265689787923836241613415526707758612724058279277154586299713815047231145490533591839466123670638
+8468716387126244026336620863493031193083664955579994896168486675960587844522828676215258682659462698160621004514607084416783102
+1449640886898263771104309544234611139764719954279503593908340282487665393419611852384397377672021450701130079538845214864162053
+8048887383017701836654298226594900075026630240187365178333016065699848058831083230977644940244574444820285738121188435273257549
+7734838976170306869973081121181660448148530318134255364556117593964696552501147168845028313551613495459270535042160362667658266
+1546639029308273692114824601121738207436726090786353640928151613146720401120659236951025944213817893334993036938357931276755092
+3794363877794105698247622335925064622343924657500773158672876932260234127197098205417204884907008074223982761704004122962430390
+2332227732674259579606138447783556533770663844706548255581644643545209413054398521429945056259218551425238380035190336407512204
+2377559578117061565563176922758264522313042429970112963159461355099505172026291216364090521544160711259708331105724128544891227
+6832428920554567726830569490691102432470549042227057932067103955101428247157515420358182404777567376342028775513115385366928419
+4241634693879583625259038169292585038330173637743744110426172931636984875802849325805759410994995655688205543970012859415471525
+4435409455307673255925091284402380740900794676435449835586381572908519616958395334196299914509777009013685912584824599000928046
+3987500940366892833785739644668889848240740024168650731790637517228616861342434915208852629849188021280517196274460956387434019
+9025408507685643206458885320228075047871187183125968258455419735129168110055303698970042275578099161589116560991845557669784646
+3366934559408606275260397226783303207383085083713447307195484607017198247596814686470103165356557218941037264416211493596219700
+9986983198296827970312097410216841561044999906047830934706495494099795173682393665158233220314878778675703926172446242051213291
+7327936388263057744394340969867975674336916032235104437222484250956772949755115175068343392125983148796915268153189466560134516
+4505129238068974615562203042384229709458199180125982048735704933556566236123385106774238252165050271569657572461570289000767894
+3255121682739504137653843468184029546420570010142268916658213975683507187608005044348538495082520951103601067607492368878206287
+4806852545996927533787451480123813559737763425204966730971472301392243492249231539770928832609537982396509758149828504617903683
+3852759316339548366895421554002413138488562983328873969801625973328318967409411308340716647240522981188392227872470754156065273
+9712297766053304902554018245083167928441148337025924749085910105658941917341095233228980927774840543348243226033787592995988515
+5229452832882947701986160360761878773430032426431930521890318903440689202842760168592576826646125537090631410703061420763990796
+9492775501530308620829606600311339640855706549659904872171618766544922435708097161505981598338090549562866490651446857290681656
+1678808597459616937537502211249586561665053229525645425138896011542471614595178170509581277828163045626690556829964393718215591
+7053324203154477437019031580603162546890080238913915157646559489429803976541625693989468806549155901365763128179885048681463067
+8903137465669354155616857417689085085205927330249024040964205952230818210265737328326102255377329508350857922236822007786665553
+2734904576394968648887628638128862963608976988414917192020797115239688653336018428937106985737003652208275177709699892675605393
+2387808386702882349280874532643852585858561738093225119093657885192947905905747402618285721157837466909047447734685099503267111
+4222155360968520550560237616569205752212233789555461181069785768415048417477169723562149137809030351670058489971512620085540222
+4298243051299268952240909211177826836030583513734437502197104884602882464340255753900393068054947046141922743129752936688868680
+1061375462364377985228292590232948700810225069864185759076897910654198361668411325978825417457852278989472721657536588031658991
+3940469338205826791620626804680412258933163753767218044848985297248760060861868407223928680948167632232230076213403901155993516
+4300489987649264460199719443525675282990880539122997731272161031062934060033770185574543151609533413639501738216215062848675971
+2177118188977585453528133388279985990921229278769939253605657684059131396416486258985713207176129279519783451725740599907936598
+5468202247459866994978249422059052436184697608003427416719037990135361500297493876720017894883453685240892163318994013086288251
+0775391987748089844439257445352687468561143051750745275017026626096588861151466861293340177217020485953364933966278607508804835
+1628141832107584076506487704333155316297016420320945282094351104594402285535278391969212402643994113779520387919087141691462578
+4568389047366302665905669107740203378971862242851210284195394536420153604497510004787197852478898999690840962496286253318550921
+5915870003274717803413556085627698745281531034825477926175968946204463905051355885851004345422507537344854894128229093755738123
+3106488353902440267975241920861283331388536648597182081274348906670754514090626662608509624737135193693712779860188833406087992
+7845555194352577902505815561879589158643398041086893321684441920278495085775044919835855368307051779503838399479822915036806084
+1432352323824143885623247262050454612927281487774810795510104248803405617391180050263987964438216016361064912733157137057008420
+8930414578064185485247400714821333921221435324501439994244285682760117301820424406392510602828280562393052749013520039103061655
+3173670884438194788166911165081056822054430147218290866655074231005149200684080014396687574505239932587314443974144267617007284
+1527450743968461168931869720925121234258369083166801029927251949358618661922498099466741377608784560458426370545741910023312926
+3234042028371733121222497619662259149254047701278276017559926645765011785573767542697475259020390524937117767929011666715323342
+4704564242794556338739787095791826301668604024597313082723259898622680965079684337190731792129157208207454560161440807617595099
+0586578102694447320030978034126807967366576180034644346378206991116172450484663474175770472979363179024738326934451423318607575
+6711140559239053730606360957739329179929007703740765446432207582934464258439308670322228705839599858462219965901802441668368441
+8135099406701400995240439771871466473527799329781080913941715241663698683730014850012873125772974693072458542177139084387995864
+6568179602365017697198231075678811557245910639538778108917663715366214082022315024791477373317009595760696873073681125441512291
+7907116539452577187506381898980888332568593365733396512784485641208492339371509014105839017197673863709466309379039960962534849
+4750829188061091962181509528044851805549096285740983094887975885868844208625379458016822827359147295255429793714493083753502809
+7458122759750053134279494636824383187336514214679539541415555708799139748870593845560799552363619897719534116667792275265497323
+5164505983084622666859401822913429103147582979952129213026773147211467590148787858747588041796556975884830210299871356341343674
+3017622046748766474496658478936400050960631692047289817971683454103138868538745678486924385845403439475522996310311537377432294
+4414433427221551082351019813726625491301604743637648323980649889708459225496111765515476857080238229389480546313915805440388154
+7128048414711368158025433805098117535633079017719775105234085215317610434688668866637527464933292899758107458405969861125706230
+3650863400245738680980130673926472854780296246906056457846071189797804208159343552552140320987399388241880735463419185645329289
+3725491818789741913366698889863185159632846810598378698135320769928269090296785595628838126516727088490704926873118733305049981
+1156989564178115063843077403158558596361694573121010738084003904783088187504126348616809589260761446819325657369704310082822306
+3039078554378698516122693013852039986103065748081512292985255853944982748397274910996825923066426171066912792454508578589756672
+1894849971820554276778681262205130604407309897326530536792905116831412406644096303796353324894146354102174288891383230945427806
+6519430441043631674771677332934701069341868125297788424647970576482950339536231483156528606063230103167532910086072700422834732
+5003294909621810744051481544451641763277370208048653102677095428677725528287642449117886584959778219864346164599848968697364087
+6751096317004399279893854072583230132666460132819591435600170059086840170914605351655306551416965997517899522960511150518237562
+5960953398400790636904166620422410033200069198453455057858306095484024517953196610901762809189095112424175853725058162186086849
+2378590573214575182954920757796313474094094261522041549359071498710995391605164191319908953433331128043052410209542459403183882
+6967512166626834760387377091334566417667045028443096775043889705526174743033818006933449908412813794430186357687977532151972724
+6459437209781961727829502811704779207375810741393525593812033931653583330049048561114949732748301604240502210577065589268424394
+5485945220569893838677587873427380906709988368671130490257845675526326075411511740051320570135507392241324306058959038656611327
+9867804575762976412063217986099462524791020332282964702449941371619543236717809914141667173375719858685004628965511347280443141
+2110798992334306839358051076527899985588107686694616660268331099137978416904137377280100977825535315137051402200610861241845328
+0363449860601942956031660094586702469467050513998615147930502263169980700379643465968570908871332692146680759419252634341789329
+4178175171299653546801324512595807182660716928201014996433033979566075147588628538125142107342090640143892070802843256418010103
+0456138779092213905930697158012877976499848878257289818896704580464918962127445564050766970246810568260512090191166877529968532
+5482828669997339487166576516726609979104834674845622909875424783106655102257236764736990686408975204793086071837965911886835119
+0267535380044835507754251971519271244598217325940244403179333727723642934577686643739339224195755654907218801997476469074206459
+0065138464529181013506268966674037435955704351830301533242369638335168171139259359713958529701206344946001165594755646272160394
+9247709545287060822576712084519151900147438436096859182537437687606226004692040127414633767616557761740535046385163645108196795
+3057714321815816843173779617852754091940306380163712243160807705160943819438940855547343479788687898931661575785126108832716960
+9533193667848378687611829528479562728893899352573352696025950207316753012731502558223567081292045437196069989946207141541601008
+2746003049129497733856902406986044430147897422219852413496236136281848127325893646312380454532608491203709112537348345922832907
+5956088319437370932773128721138395583820924421370173711672367829016504396575639303752597289231640106298414733655039838766441635
+6180360982212734271044173784836239476693843516863507994881855803639383910953492384867775507310386199169825014966152355545690080
+3474612962133776522839849256217894365224998226219581308883384099107152737580490415337430321380267679764659802341675603080689884
+8385214883553973286697705130178868327520836907858212929553123995458539418552809580075802670275820221517432874193060009661810485
+7635870550202301972338809565930908660230248958179738819097744222123891965883613360999839391218647211336772299291193850385713932
+0223196991899819000674224598203238140866873922543961390070945675722542943959098310960399662895718004978803705167927661114684329
+1353039351866220611077365279049149758286033094828313328435837478853295648033377121231092341833142961745552118705722131187887027
+0630837254454720024736805497864487627874608261900388501662821043624883721807437900259240409899471051510920617085099514167842832
+1988240186121860008928979530309334258534723646976027619874403865209331775508112215956780097468860667994721263707215073620406836
+6148969112241707992551262221756342003961909547272415999992255159101022681539848421608837594935060720460495066842999521680449846
+3457737254497423194650056810264127963010085423288394333781451846227050135758357730754076741230565869445804248143832527389323252
+9790762908682747953438433738621860423268309500095630988326150834401786630708761812852217486714179905608190957461442085387864531
+1522476382145618120242675473759696978079648715587754580423057134915914494338656294472760447616089310947302406703031809581038470
+0171535968526973835184507085581755238300981407341777890096801351412273999921818828858705625413157216884807494772810429053662454
+8619996360469711195123911341155232797961140155492488752604043466908848244534955186766472286479836154777737654804742176595782417
+0442287907416054215425872961111123258314536732740500399960690027024024360050777203631279476105577959878524421999307563248792796
+5348313098484066077132466864776966488466415145151104355092278471837179740560502130988667962911672913331290100002597980514807384
+6973148695771873711809347394667364106588642004523762177909283034839940053425839430616152779752491636974036365528618662576277264
+7738896628379276240988497456223829719984420682404133841162697625994660783140799400756439398245883415372300490612168611754778835
+2968155785628016494964773780830380372616577140688533547628672148913272007307142811840952334174750520152544790354169079912774158
+6160810488767205184519228782587106677087830138711937806611950216229418417002136640356986986424817853470899640679854298647927259
+7389645808720792658628388654675620007991152874617887911936239398213102595897949513877377839509375811277492184373982237380291082
+1922598786894089615133138929724905768857077536113336665514173213408958842847812824030198485744051056380839435865339196791176969
+2136038443877769241444454895223211664298720250012371885167260344691881420934862218782035849576910341176642258076960704001222187
+3619101830106431706477720342582912973276053324213930842322321478885278765764844239473581443510550046154371836075105045519367692
+6632620878175338782391713943229145276164648915620343082760668528508249819030769842115080099804055533615175586509178038716739002
+6375633941128896351976814553047937414266141967344986676911841486068926852092747499580940682140408121435982416523093436110154753
+3222139045759943847229548540511800241253979460730316619733573541964096618975921352811299052448712030457862855059140594007137487
+5542934473211875603591035637674955693033630753758706551752052733350020451305012112157194134893565133530552290159364523539238466
+9616750069420348886409611437053219761816707838644591613686536212537661191394262393089971240329521480448880783267163369576343597
+7663178436164222857814082876400941903973450706396969842174499622842764650335956819817450043712545807776915977745377365681672284
+2935635454175721831517097628434415466056776136240049950596242823574086540015840252558304179235526092054789562977490616481745276
+2672225222323108279006574534254983148801337991382313626787322270855974712894468368216489102586460739019744587910470428744488347
+4456074219727400675373619105257416175699861456100136151468602175897841754789156021282927447724373220233266891662271346817093855
+1945491471112632720796456775261728821202881302996527116048267476118823402662922873934255261349533307722895013671219044843545536
+3793064262773487395195026532854447589979023796935998929027789654646824047287035198327952786992674028615601422606183219879793442
+1630579923384492024946757118026605898057464509351571155868933384841116903091820066294965297665314366667361460313869589402652652
+5439801899827848778232404947415524928188533947410081530624338414230329436826968163987544645598294181482211511249572440955572589
+9020302797433585342712570197932059030880158484733343798115491391574065623327717092645488738835390428206014044345059915068656197
+6778633319862050630189473515487955936852231827578947650626369925629640725543661083890077620427798703103241551925751730707081567
+2865799458475868282589650599779702798567688820803000453419899694057649460056145012638522245118862822941880894081107383763766480
+9848357801406244621888791600769552120182014301160477310095737436308083268418063998275870777119923015945538580745005505737103338
+7945415897343252007659617183211493332054610541474762203740026194193724624943127621999433384183901217893204226254420212426063638
+7076158492133875552332779907935346207685056687613427451355599366014714317865416656614209291512293922523145859007589727797381122
+9946333250403836274494116934757202951674758307883028448572093526467181950556672615580772027423711017988838817957391185266051907
+2671612744740733351071730789204383122286756475831821553120581637533315869945628262846596800538216358815764391197830622296989405
+6992508792590965425974849365498446258624365117468171476061738700582645427331625361075430086525639161565604855405377972628830548
+1767000101633223839049666007882398066097691088797110243675124836228262533287561681535331091157763899063838214576189418367103407
+6457110670443987985620843280548984156731527065461755656723700576735027138342545097213504695717743645364185206786138748271882473
+1596890724976137980689991632152444686110535638170408866300049744279882252913535065665891060859035882361321345023887058337830307
+3373623078064203672049256820541947607511438489025503639693977760706696248117065715718091918113311545970967574977708709494235026
+3986923221612406956343410179388036231285096894778891156497956823154793926342464675477516471934158222112337889492119504249964378
+8383359661494890362436075780531143970408529612575647080037096675346333712031003814298042719987791032534165077846901212886629083
+1031714454907840175775311491859630739967098843327841882994334085317927475102526174618259645090436553276509976956833748682136561
+9064443423702201811261101290439334315411997283217810869669829733471939988609585312109817796812433049198581074521140984709783531
+1643172980645376942250431938106354165389537074459078140489244293256765030797030616074547245248075610258161012282504441637098927
+1963449744475973480042625489273145165780544076999525577661332442838969621507452441516783367746336168024894911875794707697541031
+7478540879501049129571343735300770536436533927260315165717247241849652331693508424305277324109605811185754598081962423629189840
+6683599827684293037220931133813347833193703737280727037200969748489983084498274135581120006138983726589125846483814619896382039
+1059986341689241962791022654106008362005402932907446471177268388894146241093638783546170660638544503679877547754823916693779241
+6066567318288101759879455792419222471083652734422111018558539534478864130071102091839803023165372816119391124984955696131849946
+6509143418752724874347225367749147359005862337831645120532349014908613153135844609402649987007336422813208143055617331460906483
+3354213199998376189921305928077126664201462525396049040175801721488556837349266500704234038852235700461088952452452884233498199
+4256488814582093977539133655050527294580364706253926894156976648375809383013472871520377935537449640402956782630405195205364082
+4477841383190587477839953144802218475017581377483593956131465077901385252056389226406917609350544701283827958845981175691165035
+9675317500791142255855936241556896374576355116352110763482014692288089584642987642868701466081788634493767773533747361856594926
+1789275548140948127853887574961649444778475578058016075475638253177323030087374164983465707068923303558558151943477905316462894
+6521653020185636533316557444077296865023590390333185648729621716717902230175881569862122737390334951189041533339830180227274093
+2241738740799072036341573074248811436322223477169424669409308388622966605065590062245566692647119962939155999944641570918974529
+1928105019305194521974392400885274260434232105024551451106931113484210411868649822559924165796213171984543031754090678126105970
+7223691850432923916423525460668413682740557862272946646859452084367199412001020057846809103738751744440123325432522452656213927
+3644451389904659220831784890291126628998096321970481352017638587386823902603865110497499248782547323024785254006989249949637036
+2368125490914853885015667449603549765164883918157991257417554348691174190395500642639268158971914968315411160008374937535704060
+2009275459811984599922767470947284560232970282990047819179940733002227635796160576632463265974978503386125557611307429312063703
+5284668210801338637743489600143584813073507148578726973558859500688227447435508050513188287747750741584385175252456997688110085
+3073679804770516059033436419747376347125944073396261678398209865762812539120718854779696622769273119321506920635555831381282691
+7090364017219499874566644997354338979508197792775841533060988865177458368657219876491035282278982441665265219245626731000939486
+0475155794230569303711742143247875808031690475413279208626652350784369479556492756708347931041817323940692567675398118277710202
+5987347394026084150071478790424131834854554229261815024383846088465079695373324503305612702444122591068763896541604539174335033
+4436269510455092220918525983424623113381645210225340601560482106077382634781965165780342556554085651205866195116920957396275838
+3995168889104032757269451494854524514321628575817645123299310077893411388042092201792884422861886303896708749182469953549119697
+4535001242830034769362884028681925364864771844433940737375296944979919237869503095436572944940055711115231301447509402025904715
+1800925216578304292056694261819970660613390371844516635237968892926502845404165792819051199273212724458326926182758338001776015
+5370775490948607047730587515100674887605918594533934598837391246334643161422435117919064366778561014958058716726561922586618810
+4628995498127197780734498354535034114170874670064085395510892816542000534421254922356138052258209965701576585535292854686090278
+3177671938008077658853731628156335766651218454783739782004804667103681002183460703859644141290605438413899770795832449230476552
+3025608055188815266778993615750176656164484757488579062995887277096944086284232725973634996318024169760316516668522315338538984
+6602875499695059755336245084768806035216324561236127708770615233130804510875618781547430556541215471796577953669434492812681721
+7882550875891690926234268000498082339514970368440072348061964280285302475222074394484586936518612822244399239424272459493452968
+5181563270479719492880854609815755784042683606603220498202601700410969538595041484423412424024708099469125521786037119075251369
+1248580037503075406711823500465872772309344548541150892813671393177549861436277865197182621221456420646870403987260426109411933
+8643731351640151069976036541617610531794845092323107755413601880551863223421905943669090586959614825141812500194544006658912658
+9742463384500880801343550699245637258131793581488832729126778269174701627529245091838528797596704702724365423027345604418154777
+1491976930735419986039574314558277854162840810698202905470921161004472351694186257157283632042119485754805929863758038770286999
+8776957710513013252382046879914405882388509080000643024892306629178763000752942096488188622280178608686752194263930907107345039
+7700223390484500013939160057722983340948636861897585123716556883603506625380447610584051517968188462287828774879778811063488262
+2795184513732482674790613434841545867779716565739406351364662664736206685645328526381352909903916053024580749353932896630696063
+4740510819037498201511535054658680017511924766740460699058893969064394902765714052038187304179100787141754044221407272788215435
+0593548885409678785621622325583756109305462458590848222639139506641697602853829884986982801690179238753218240401694408881886033
+7410128478642788707381845999570686789659413433178313527394929430353749262597920022866973734073910557598880611659693295671936482
+4050137980096982959463694663632299864309583041246448456720658864445243964035849113054975666938514766051492807225377478267946248
+9230953430893702870077668677812927912187053690817849571057339797969486866950088035191626753948056471063994773880460982770051756
+3412034824969056166032815703553100561028200933063775986905919463873509475321843375830242381162225467967586471609115452917543492
+2276619135566337663226716925555717587888015126203959605452287702197704113342129180746061351411545746680564903503675372305630554
+0286134594910134037086879568380122070111392862199290853114304309332761209262076794099989915249949904726721530928297666077629849
+4661032688517145326760870540723245614758880946406315180541283633369882854109153204199703802230512566561461752474068428161370873
+9985206963338598229560272298952476210547736996017303976951734650959079279082066159408637306110242916656383381032701493580216738
+5913923322753424774114001206375448829014685918194637698592895629614872898525330558761701771138709572823367430917528581806962699
+9424883011486160624035588850742276732199499002202807230209412116053419259700106808447590894864084149744926170960405759460241951
+0111713605391910548623870259046900302961074850779853822097709685279966809633918351283533571183917553534326378996150978977861347
+1050239621857569309671883851470643478606629045329299864518009651449122046063366124913574153087650803586812245327770871382994089
+7338464051366649209011968493386794592783056535912533194525947811637756396164788969037121048254365052840678648300844862166030403
+8244368111563457237764184604100489524090599993135317160344204589670504422777317128963386304474615794833181756194674508984426359
+6271679168658661069189900053139794326069244916803991726466041535821018909664293827288937825025439753702650278433431356713529954
+5346852690092871593686894605405997962260976572140748476453131018042391268683407218753909113662935434807662980531252367452071209
+0705634605741863631683627483540085543041836023190103343436641588904884705166081263630037435630150915106908441737355700766586129
+2154922713467232816471312647563953292047715226865590918846184574044421063130666383320555928376617359704955430293171097080231031
+6735370005980738361139146789749484206639522950848455336267649778629028940168072161013843975973729190308856690607301961044761977
+9897723534911105404785432577277586147477026587182509778621368216939584671433875920453602299697242616307976245807249371547062253
+3864808728722705732544842322660134226278752025136368637744919793216576700939583871247088670783610602247097814787263304145508390
+6389663947104499816842871432275844541634180937582381422116532840275365272420061136044394514594368541860114545782560162829849217
+6461508204689611076377900958964324912439197085219708917353896453831247651446957118893020342996847989755084869372230374673491989
+8433851389135866749479827490565035784654953912616746305746664585754447284795963325019971006496729330088735987747297399102902166
+1771497470275815103247219843409878702558703790756432271114114625912471360708464566558219993340028146304118900320024587821960404
+5976617030473732204037553918438169303047012033263099608437162902327180494837554619833899125897762143660304278719895133912883606
+7761343244919347585259429796353568917054332343654064758967248953925035366120514799510920191615767532119958355777106600079597516
+3095394058128591553990850297147880385815415033833458376807751479083131186229720635268920776120415936997418185983635572280182597
+6753076258298533536576760943150454522971260918131318703703785217592559654671733288977408306810194844570204346184368392179063403
+6769837756043399718259982003405678775173052005969429887545845745194588303371446514765027612890020128811539282517812340583382742
+1145447512453860943574015365970108349103036202936884373965378227317332374230149559079576915215507294569467043944303098203606050
+8331961563901986606916925958427127071602998579210529763507751756811409645017688889813292902535048662887095342609935463489041490
+9736668802244229960622339427799905563413901438749725163782080129777353814116461004513305940715905434522181472880934497720795747
+8089231465924779558459413345521275018800849869822143818873965081853887737597561843190118386215028657051186337416427295963183576
+5419828194392698210106536176184087551774670922454148544855468554475299499312061306599825835773673050247207685913286844665654322
+2029050617375681673334265164512497368276347055093268045529145666800867914194334235145959975127160210970603920222624846997715913
+3338289728310358326423356618856438897910927180875153967318427145237491006914876971227986916804404786999082347353908985698677388
+7003592673799641258705037230618030712653838166741113566125031462959628644295056269826492276245790120809269461415827782914919523
+7933808111352753578305022191116925704616734794703884497922451694274860316351759525772713769181944674741861315056661705956786856
+8984597543198443392303548683602615735750098545443867287028649374064105213301110278127297110019939173598045760404284726471910865
+7750264118815211285409646722851047280505065647360902845736489925465867330208651476223128001763893620074546763783343802324668030
+7948487261322735741590287466404743224701011374099821413313798593806289098955840277566381979282309078179393391191764372912784048
+2031963937573607333606298955675833689352959686316425308916957187087489102352532079680910868716368077096336327451835608150057007
+8744303746009770077282182559273953960324245388355803375849588763883535017206175431068707914836359928021715134879810455899706000
+5908433402194706392948327209167569206279605516036898586828659659699407482487006764800996251885333845684403771593097852947347762
+3484375963559500648211146100726353736952008101895174614070329067925003079219669004928157370633196400836866091467437872364498774
+2081484205640426298611707106538905461885148824043568864528394387116332857339440668358439402474410629912663441714724196706517933
+3644343088909312558175950443352757850056547896271926536743829402725583986356025290388997593791573353364649376090870755738159871
+3017618967565343354488657372318982952747583634309941675726567297969538505603943497976312767045820564276791044673865996984930840
+6755211147212352533715490737391598930938409102322563339784308800982635726297552669891177376792489264858203303571448544969284885
+7207413969560628720009738274631537646543552986672220301640499255496422838738773705028096119936179105477192211718065255929107570
+3952347918324244189239309810051132796520311457058379135751168560732193370931728585607246787585935133034431471433154073599431184
+5948122133173804973271249039138486246462418117000640467153032385374427588683813496957187641107568040808210363510174360369854945
+6331834561201934486343354906308493614367011264274134644391474781936706762560771237417922164625963715633624786284367782142544668
+7058988605827353891060874777352863740110376065711990117582066617633614262447752203022541270469488891576938820572417323582324874
+7650494373012942929901692837674976301695625545739424778268284160337186164992467580080040539595408395037645199431241659430435207
+8656919176134694488026966726643058582704520649434961668466021566505602068958240292321141423966866142697100141650705135865554164
+6074242737126300341900975693876422564450176547153341379638414445501488034596312318816964962988094532520846350286682968373824742
+4534503855120241805255426868718961329975641710164649957599487128347011734954984504486944932371682996864451326051197976215900771
+6630007989276431575068445405328391722701879448701430734576747641331918162377214794008905979133776103351215776077151862759310804
+6329412106193202180915032816114091690804553056071102324935636935651606678882718350090015499101515918794964067433252126478982521
+1507488089191785086302341745012119227252927110062837567351191646939013086128950794430586208439605756178768284242079693463131834
+5134585587442274519690540303774472196006421738851673713532054649167344075465437753885506375501473079004259777595528824429150142
+0167920777588082886922742091652852786107461336681294679615598036369318540905949328746327769828031291675250740935570893774610363
+0038129096989223899832722064059115068115632289006675498997130267266081648211647293457692956590546845542631469315045748487379716
+2520900382745986244596184110700770194581607346454171538723932383294827821673322365898338493511029865949821494463508742106545267
+0565722884026288308442559359348206336146522003909225136977382087745807490609842307769964489536237904153503877870475885643050177
+2879720936866676112852941496983745298612873646677215750883429056007867869583163799946103524454641087004812983861736126233920563
+2682472400392268500328620582825275316785330033129835929951831594780666869418979561874633816166907302039950903765570878767521214
+6000673278648346135978034734234778737168645117288730828023574501322757674622590092065551189918194137651428146720102471591456653
+5327338501961495043879408610895757013526179026139024561532644668711391863557108491473051168562266679950416482721536337117909482
+5138678303997976985493577927432562758408369467781462054517017307284536794110651849922852301352432225552398279721808418546811336
+5942090618633537593070786933293193872947689557210874049534803895058142797994756021217906395785182382696435144831868446840701054
+0805866230785777399683174946303367253262058687100298157860323746012789121984620953083069679370163347105957163924550067110548159
+4041789012854867563385153833627178486269852350526357948901776390770563029842109776450416321004402898078350462398525384367774030
+2665510818821145216742821558285899523213916502258403631925403804385199376750878427488901928524046342897043307449003184422505729
+2048478041171475190266068119919204384149581828382571880806118238802367751477551342088588974943077841775978105590373879036044712
+2582550167003327483543334770578776146465326561660371559249486818965320307377862762238777770099168908851119806663382875070424505
+5444680706893164832113072218288281376031594555136022935125966599054561592735752631698479935094668438169179747421550309847079353
+7876386229779167984882703960774028877296085268097204654180082218579776041301150186998163564389835397054336008319799363495236122
+3595623959964323543031266473552625582982574960453793645874949571464306599166850005238654688725079784506108930071723727021644099
+9904805562100105780931661247162991156577135587825115134266116050943890998432158388576995701892214120245792294717827415173723116
+3198902109416772023345787207073949684308452839612518670096056433197360112721221131290963458888501686457236376124484894557704239
+1439923839664744053843985184599889045003833780920311682293838839176055898856807867213644378338290067096258257324765963896543835
+5700918940980369141639579109635400284102047501766736959067637462699617150713985354772825179670276479720622682613542577452843978
+5832673606644924997743952540484980626339060224968813632527031664879549813855034184500405400404100621140495713672255224298990414
+7192889419886464319914820529555240869091567523179106161721958129392253172606561099507740238957725006168387598704764060094854671
+3309479510962185342022955705280901753250343720767822070179996628541199963151640899372621594086084748660799272108092321615608962
+4880909425016446720046143938905942262706584339160340379312192206890240470343647456683169242925461208146677458242299921836024115
+9112782389287307875231265914118831295892615090298799256818943475243201711378213965480178556028607894090008691361256922857338305
+7878997196220126636517126620736341433150726102479409458917297307599211520723041036260833938983460239182766740060701211352201191
+8683094774314359941970056128495804368612258860699432526379799515947600345795062224586289908023772808639146020665057226162935485
+9660235891943541046373003698737146580202165968722595524291168751596799140752064994627768069683240083731174671310320210501136516
+3952299801633659008575843631974719807086212606583728034228268635353770341290150958327244666611228164923899770204672751927925499
+1681865396625682674685451758504759903079794185779114689381923935911799262023419094458049787998569136087163049641052695527707434
+7051981372339577512946597699315700689964039969082898958542940125278978182609047860935808672479205043611404976983579300374284797
+9494276685604001130980581987978951663125638076896908522150813094023439651488500315910058707670482621722763754582892271598798239
+2297480620143752383199993430862475021936852109466853279971476608874530008450195147642064323768140191491557557914372058492369456
+3210874548598055876505562103390094444210433165591830328725710043504607452200463576289609058990598342445857989436858490154233543
+8132507672542987199374049904308113523835831443354290371614453927015873910762212637250354565826616538395197156337073925141693484
+6828640682510305462478950222772217556425645114511993512248969567524785308290443499084010706135805334321921588360262285590883409
+2594395457778771868965633838538089838472114546447151674569430202509411063873470113459762471547280714167783037132473173267526307
+1601839698883476534179701757004074668031433379390884724016658551011492507080285489891017007383477491584644025888213433125759305
+7523532561560703539946099285117454732843364985652611667389407913314960693543811095755855340427962780551780192610470189512825524
+0348247544916136977309530119407469259627024645454634138436438519986158560867875479423449700625816301245511994796229708771223160
+3917296084877555076938742844381232454610347414176454495292235478841999037736204668770470759408859717947445502249268193464913498
+9942815514474689741504492308012003642347161752400872994567873248383495234578303317585084447735662421098893789187005435875125952
+7400181919019490047282686705057224403673442901199627215721287263528829739748034312624985655044437343710362758307470148179539661
+8008829134593470730958751998114225068506458584106597781009501241738039124829892755451932663527484529522803117480503191650035801
+3220127286757997144992978308357689318213671314902934383221575508818519767526663815112777913873690474000419949051472231014820267
+1399894109901863236068753449286869832068943284626949416147238270002784106062189067937811371979896380361397172738949505933506481
+4254902873234171699063619785819122642732788292824537159169433666069361612397840595910726633660384383938078177403483650975568259
+2209368179438159444309719519784098123505334554409147220881995692904711982790135929098654648473758048308424437091906340638974131
+8784927854050511928452505266509077489186830632833630361379070849447072741785156478899585449175370978549268898176795868437582718
+3231975833056135924558298656515294400028803078329218944207863428380011023399283981167261222531969361122301223500410734344217228
+0958925958615134583645559459986109673563012970906230471133763988818583110841341249599399387466204289301186261815920165156578985
+1991110694748693828675086932988793084291818416422390423728768580762059411945640551530823790024178761601499474873560699371792162
+5361696020245404957765470178767621215479647553935020898244576640893571391546565492142211775010405579641149396961911772636411704
+5933641384834122776049822258585947581244135364908556513226296636775905866481756079367435635748095205281573764949264635941006411
+5041011491795017405240846374877784042033437774313006536528316953327476960247723830386371163515353865121506304361011426783525735
+5488997063517475914229301557438267886673740763412117613628897204796477231021684048588313466034859903879245472327441120566103502
+8530760385580859337137628786690355170400764087907594224462686544107056072485919968752489909254263413225447887894153248109175652
+6157903578937685041336967794345564722166007100607239958562466608483279980200607600350161886932405833906442195659498278360919430
+9828873150674702059652960737024831945705458855872859591267757719944168191278626072224244567244295799804168245158850647976515767
+6733614592966966657616990010769041211313964384427177615958783894640954404002730067938048093833284287697173874637222402450231077
+0815239310564450548270963278380227549898803833625140660969258768879529883774142739151346026790443492061196604908528916004363340
+4528891650268490704421594911777184311417838640306057034638291330148034732863406008674812263692977851302665645685305101437279625
+3233475352967519524983898638596372885741145463145393518228460271054338502613983364910024616107499752355701791207046590492672193
+1607766030654760272868975035371747266369258074306005268123601506826295532939956628851683606599198929232644016608548496393286833
+0164998823596400554560038697981327950512161089142533974519294883428101099674224630562022297926592367086936345609705271926077768
+7913025882622995728679690258052758137385077334095212932668418477051379462440145509778953697224292738907994604706710137743620276
+5951558921066718365814901585239666946472249768608440652585316569506390348051275814890810652375791805564478189249435436637972574
+9602716095164159166038408316037910403855288603710934148506742938423062837375851102966449162297207365844156933403348477083451353
+4627498098319599205600533412615626896664838788638148524473652142820739172777284703948483540298530565794965460580139030303425684
+1565284739336025065162908150482205331120001945515224141600855715524039864305366369748820024483450351626491054274468986093516231
+5340418952181086209554963565801571626818882174630725995663438985529129315572417340527118943747399687973820656682726051844769221
+4320926831481382140838060220194555123790396897025705923345941235597539508677805522059012930976097312217637965288298799051778479
+0908830534451543414307140854781014820685341080782566962124152921948070095677549807088847640541631088209567823713325266131951427
+6110373879023562027503964302970937405830359276112650695138428936697834271328145752116000081078410010751317037848623862138058557
+8822703971093401247422493922044598594234342733457558225718617586744418222085876701060696882821515543129744401944915912235798465
+6594559520819849307838207390295967732653907650649027886332594421647601798566341345946992510422578734064164433073111139225071621
+6354737391657731503659719583497860062575481051328877369003533126272128322177145084735337788672157007937391387995919117571678161
+6945608633872227095639320829071216249131553642307083427955811490415705093929385003029105106248578633207939138356220965510578956
+8875904572434922005652897358604531384916362396100014485333372047722658292461442588088931849935109173016445065149146280103138497
+6344250852997852406467930596512109372720069308708153172074632971208643949842907827125891877283714403480777088075917332714430078
+2141088112696908575603884902935424862191062652660730968192553423838776572288261313561512545353202622522229101786236940604077536
+5420581455921312988453042096323962394005097705232943223301112814607176607418563604729931333417412031473023307632699354685035657
+4904931609893963364651740622632458671635349731291306084872673976452365611310080979515796567705432384020374827307261624382593308
+4292701172515433578998040448234672894273087795215109333668233787741983605782088266764474905796649724673659270602807201042559641
+0405892711593975173584006410022813365106426354541842020523033260675160988528765885253376470412464249071597201808795790920249321
+2969506372363457771265917606965665281965775472879910780113511573805868748553670687571273946389007257215130433994049155446244186
+9422294818781445710760638755747391659377594672815933259737267891227254986222671631563563954141355946614955207418080860505944166
+0087286626782644309557643177400304492693387991339358406695023215774476540471075851900070969889709559625262772196723374356067617
+5897279697608188221125456894430238474410213921346239465846675042270793388259552491229704041982502727376305057500585797419096572
+9629126678093091084216993559586337141715599917690951379809444249525710962700663884823083705316885810747054287541385125785199583
+7595346119985543253389563272070967517963948640714499895302628870263490256644647992172402145011433583359949875045014139097383990
+7523156213061115787711878716816595972617134587220608008483487762219572353605120083032766155082751752855610567994430397014253895
+3701919959515768374982789437891830642750960645657994589236832995980797844253496076657711645006752860088626834982056251575040225
+0979950855271929320767873941275718754278787090305240807928650242101643623835476811933436063479233606315724201732634520101994785
+8113983065740845934933526321338302277547952641828910682131706421618856976337728051411744765715349602385454916896966865817502458
+3541043147303624444017398708391616664010004834339935228226187248791543655458437287589626370079460316930365464946671005586907844
+6467142906481062672351612846421358624595986748030105764102127849419935691001942740215832120384833855662335231988116688960608695
+2788530799703761722379561161257911074841314957231380008835616333860526518888348729384930186986891972631716493196919384541563044
+9960151488910951179842583784111062968107086150565586865326760613018375413860020781154310137687104793480739369654379775885629180
+5757125618091793590015555342485911625792045336449768530669665131967481618933921507464033442861020327590807013639300157233850794
+0108561117599044904729443235325450727345789731582292014742872599813512719247096059598721914318005872025916402947088829272312140
+0248866797650825595958204057508507830807476195084664283762933417519142347075582529326241506715718869000199121666869916905668032
+8723343677864688450245361288384636252992454056026441166941292835836423200070814147349431308408145782824860695919605646719597656
+4679974361161727145100641660878503281476844268161393833161261969965276371391589006952925603728082872969549646978882403423923010
+1471039994683623569789873331804012722815466719684852070254837711074357511238693361592620597284807521864906755820794891745584020
+0746324287724173135220206601559184495263174825463472438325932765982783597938536871848298666533763661034332204209283999095134727
+8847622479138729829083277482843135313544249094572861179333595590622772221061675396437819003622647477864448706978670376179646671
+2102601933270120920559135994545418775337484717153198432612404295706149728016561442479718981277683958181059597372600330224769132
+1259053282379608711992970881977405077810774056106800273103144031624467658496517236458989974966732962924668833215016485379965273
+8337096778081104941132624055977594869352911917306275484469902456879306916808789684303864335821138065913931420528939044385046271
+4299368276599609244497481316123376963837008957992736164808101728168540138407838646916364855310221850303575133697274394091619868
+2713682765289699129061431150379322274699877403663503040025037596762253721290401208216082436415144118858632156119324419976312546
+2881609371673910343032291044465003849815028985591391451188131927898325558643746240832264615980161723347980750483187867525894824
+1267916226042826987257806754004440337824069605413162886825139485042850988829975658205470396562194892003670768255291562747373670
+9234220033570807048609309912547070817083287541492891357818324994480536846132188820055694019487542207004276192292369053562016777
+0261127578143197454905032632100124793899615216318941692486325853609952184783830755458121912666549923939667928989436426770649961
+5323045993412285553048451071174802746049476412795340271320920389475261483664749025686760199917517732942380222819936015551403774
+9891352074356975839408670998973900071675970495889358565662068888386887973659152279951010618083877084169404988201568384833942255
+3238050166229051707803832286590198074734858215255713288528844554284335600396367554775218985201346513397387400209397068796825742
+5728107211476180762511967972657147473012924183544027968479506893336809289253531374220504641466496667214723927677602095165464315
+9011192930379184487659969643233786997863887173759888022579642343995986799605176120033884333316312893660726740709366636155465721
+8537171701432226276253255188614622965933151059377811653184802609155191205285178705789524447418786231655055288040171432169049130
+2707936970837574068569629371931407362409248401030806380356720552870356587923391333211272591561747393382939386843280495661244314
+1175509422804438381892148322240590701277543376729396595323849510597370466005945680426336918977914561211300792916203174309654171
+4042805192423544654158411198004453353597731647696727421911837745446359133507547657475484034048732290037678198364742205283336338
+9337695707833044354501853716373623356235483326284612569311911355595616206369186001725088755459930335959640295675396477063274478
+5056639209721879485672408789757891131387617511313947970994081160678454602320697412448491839531065552976208944273555314142041880
+4822378866853898824086257862623541730929040197220702007762078231078349736989651940081080724932828161588263934616036801731107678
+7042616549110273896023934480613769270956663187245804271172698934235574549161064775406631472230169390486643998381840493803484843
+4432695989367708020512810012276065008453086786966931783819054126557051679306430656639833606398733688366162720200084451796967553
+5350105131227057106985599834342048762794186401151883770272342638155104883645396726235498798575148882718582404327490926780130044
+5764192533929612390344710894456047465905143834205988681215996081613514814903908502795919703880401811242594826105306055481784823
+3081736917550671392293064759141270028494719167332097201455667940386826052104961288882027240309372922868375595753000121957263246
+4989894866974583276238356566258521642610551259726323252743986766553600472233437943119765905133915493843897768279428421555764861
+6801273161353076961494549671635819940275013580673219344227796480147357333556424794612960445706828140206119824948840749240399787
+1573785648039077385334262023034272384935398204989144292167011651539471971703585283557377107933951650497678725581455181207346698
+4874698339219730333194095651462069186623435369684882832433815952523247766685863473588031370751632910706819521148264821690235129
+1745856207579350369947762735836875634021204626000569901414064309006844235664625468595115296405455194740314530759379861609679354
+1263339035301388606388533163722497011371588322482095769750979879436887231718408664779720990691297703089437248834586600555339842
+6251850491772376275294393458209471528965471290147918965218220499155230361216164967212789860144972751525815583122397986208096706
+3484214175754929920259118693783510869997218078047468018854269713219002531566539459352397848678904622285083238008575450746485192
+5035485477939887603964624838580376893177633857009639663967781579876337080786152281286836780643711497334038142643551235377859312
+5770990490009748551131841465407612077195558195928231585911499648608018583508169531801015305515399706824738442071885239921251502
+5505962701249607762425096231287734763141665342862391398728642501706701840207749211087529147723821274132607543767155647569233366
+9531752996646776228330405381959650186056935054844849148234315573131250892996644098435195362019426286916985576819912113865830014
+1606555436659451432978242703284043412347220692073799660822918397493666695089541486316957331014765996271479614514099842437809535
+0289392478723841946498232349165923942701150815142311799644394965419544149980499852640646717021478951519649059011872310248139100
+5511032978947425845575588456445816057377640214105339473284188761415785249565799756251192934762389301520020016150949209737931857
+8405804800314504366659749363367231268121943183966514746661384830649579675620136873178912503421474419998605051121952540207826204
+7505457456876976664571641545260379929258562329503538400546169325488895767917670975295980264182906923671943997046060564087753548
+1274387949977098682446892314563863257816052408410571422114222854885606494860672338931736657657635104187063013087549529686451859
+5042755850832972022663213277248439000831269961224227718932272498745376713860758630276016079020855254056636945995345396441383249
+6344700532270890968181465829707309620564725384105716449055864407328703719779390283415257182087348958918979888739066384714906447
+2478502268884223599964876320836160710993832544375139942095572555604343446400261859797019349052899588226956407340248510969084412
+2858479499626608853379284122587510516464864248784114135053508629608620108109543831989223100900685873301894882329747241764687394
+3516073975240799285196283516667224035786957693305024409405170967493899593072209653378675045399225752043351688237909816464332488
+7045960591955279992811051225021192695063962021956994060992139199430008815112575669363055918094781304106258599283195179624447775
+8303548637737456436395221856298882133107004338700669993457647426042442520873552718504789607522324772936205923889075833787877983
+4528959091848677214793256254827374251508317477836642431769535470979890535339665561280184226951752824749258073794415152803073480
+1459998553825438645486213601892946519503789985188491129629213533576249295139024141113828276369687768834808863007813942900737363
+7827507025285847290454033855290419493832906414032145098230761761828468254431382777807611448800062745765313713732689219610038574
+3538625159483449646940178756166257692080479081424585343862543469052182432934925669284445293824171233112956439604122644220734705
+8884093066755275809492142335471176239144329953772128474695403479470145379846983260079920680227191033324315471442379828977213518
+8161874018859891048210600302227335518426279312266158906257386817733776024570411483770025016852705510503728654494429243801612182
+6746947553453295308964010256393213729923189009745905892535754926116629620973613924884980514744338995975237628963272677038960017
+2316979912101253225038374374358240155041996499533280966926264100171569427093110935120513047386276224147665309331079377719563345
+5252039218101191323619349210669314090591183299132043388783600602372822313158646436097466384432429894279310347011205483804258365
+8849078102378497326534646727789474466302897639756078400720546541976326397706257168948381071970398216623030217390426497155999023
+3271457271229858454657827770335612567349224212240695221407152662225083082143775459834013524692150107287815992741275927112028076
+6697268153473360409230969649314429281006253608637773637800129431557004336600687209561833649108523766841818697796052616713524406
+1264023927267188505910887476294511895228887727108862538027310305679469919872644028196540981088809214448552558389500274219570341
+2341820289505149961074855375132511787200836031120337305514546465652487797619606591322268017233923749079200060539286691098575276
+7095345917502068750136490067362248249806291619173145831611517423916491683475780750592775740226681145459237438975249038494918255
+5854207316691383141245954956380735287065353365324788816174156724268585661703068556010195412645633774843480772404581791184447848
+5983572806554767884384691619553163176913927916522767085440008009887977162986441335924089064521714048589756802500400756006764546
+8749074908864079527865640561432569820363365495585933467014689209329639785755338623694144042638210864919006966920756182400308068
+1488418928276481402385931315882264463640479342727038934158474806015143604448429971536086762337574137961555181782018130291223711
+7647631250366260770657650732694263292505761395977741171841175592881623563088242488954360090722844918014816525013438918815206919
+1155451667283610662459850201212152183408308503418856279359708202057227744768180593554527508439246428232801124311275672977637096
+3703563826897681685685127020250312031591544945988953353941140195645214477592978106315927871524898358121653801020581142274555566
+0502532594831295067422782714984502485832073390165137849670240378837997996971720348493993863606290066187249274244662460276318689
+0152755194697776938435286119441290637386200629628199446127743622173851669645911455169432495002024405765718643210153464143701889
+2562249212763374000591086405147643148598332714850654045728093130807693494090674026473297812238167578278207216049055667059931109
+1802942091998951751764726262310843905210614073350123667768202638105831131108058708767584753018377136585264570210097378501497188
+9619747156993809984322106521027559385156110152742577368251988283361064503255508785410345421538190771023025825991060075397692057
+7975279398046115700291300736456549463218759811012712333893946746580558137896237287869240420636891089058025806023431754219781359
+4988421426405962855719392598321200928497349040850013918965781094541442225330283536616202634976088463128589329235150833173556905
+8706200507172140856416642848813849966143817717503023224834106896623433469273328907429832511563972309658830234487588093651045739
+1804318877742597644565913208808319750885352430439083436497378247283858616368363127977363367800390625897013789449450637875537399
+6640589174553589654051256599633381120024749952650719727219130629373315456037578535279963334633963259335915488696463449646684320
+8032272830450718870582856393550555068150335019058461099968557096935808325051772579016403379075019846185741776197086257884683319
+9863845517847573376326098832507232200317675290516210661300649571154879306959674077908278504743343209243187243262639791806186829
+8260961262731301702271912238265956345814430445731867024044874570864287595912998480366912356847572447005441275362156399624494941
+9393142035376317879394642824057024278760474627041377093083443136837548371844421180440200277690935722486852916560800667873141543
+2707649253179074679795746660619684282278565191941032558500021642302377918384225264159606437430918854686420568233535916210590247
+3653446714468860199818770176822269463628134871277975181151133360475139855607198727163601307481114241837610243765527921963130342
+7740886414228885927181817969815506430494309276878003524396743847692333838266397442280441863182363662933711077420022986422070281
+1048387053761801939044385077721021658809540040018134673396554017098633248966461113346771441179046101247543088625644697892282167
+8354720955462557218106068480057094392968433715936618376234382444557134795213907950353329761280756136821666440990155365084581402
+3688937719186699342108738462217437423679733279917547383863629404136782590007047571508080094271518356483515978166149181632884691
+9910698753207335191315666777695731726998145344199523600464027456153460564479006998462380767579651598842317204792886070420998182
+9896983218119310999564732404427002821382477892511011450905458994448002735795600011464506066851494867367124445888153203962666112
+0874480478255387464724872537442210377291532518746867402289144019512477208223281547993390653821697806118478800205575150577662857
+4918888004811316598554705337363884151483714153627256672377291874950758530975380513235648385297027498654040181963476939202925535
+2944953053399838723025577285199841577289179795119166022276762443360574684698180143394617215098184693212410119796009072687729739
+9732016373361334253176297777291060712041712200359193577310902701783613655008446771602140682798342306314527926659629849329119883
+6451043591004466592393679872228794008130850294984708968342075888842891418002758594861642712850414025146690654543853793479725972
+3268929657246764345075224814644064768187234583627518324258659649632755014931180023989253455291331973610627056888949488127145955
+4261926089033087120812284628614836440477048559583788705295941729615760122728002946792084729956587080892613331345225489314812847
+1986796721026437522158295162217239471552249715846680613750709615232262912940447904521346670150883469709041492285328187488804299
+6628012528405245613161440847234508491425287943434287101928325272535635664307751412665147263964282878231211570769131706300759265
+7377088066364420743764402212273540338705138073396342307947494852950818207406971919647576428347904811456431944019834650692515506
+4705138654618320095006319217530505261916581737627651424491878629844356338877632449493703212698711863106207638016952512058495841
+3297864919576913522726817303334406976314952205292550373391722910736512885151802773872849953849211298237482028668331950499038336
+8974669281536290012748118151506739167431258730634523888446083432703773451432089051580445107667501300580071396777438663916505890
+6676388335245038478835892287014370527286751599266433016127479958260673956274510190770236842963946164980795747343439314929899367
+9777763357901635768971296015139054097237772494695148781717193551641896481882800982585569826367439263979611639005318235314749057
+2006174408272512048656262525906502452313110102817338015892638328650570498699472308145823254807565718645774486952361348150134146
+8820513608849516349458467726176340280776183307750894733331062785346417632047203675211923303269854905166452369376623717371465515
+0487090344893360730368974812186113379856699749061983876927406730979994152222167896194935782650684486995334925005887216364226178
+4428212757677682587368912604936275746129828292671231661463255473216528603314371364809318568990891647756504476074694167225494387
+6438298664776502895176225722692218937876815974395529173364685280466577427859435428997212680686584089016477667080112002827762955
+5372837358048305432426520203755641518748461432567909426155727245524828496289926253694681592910381964428484012886894327170000564
+0966786693488185832806410657062413915673905612790978639242251067404941406079608751238017548545457392976940768385484687626020964
+7081334569477079676309855956739406608641536536529136201573794386634730088085065014162237881535086131012737674806790302926845508
+3849506256608406770319555639552727023819412680964197246748248202159679944624779483651489821124252171233790787024388338169387126
+1220350189747959004534763654451835109235619957413590127042747161319131890755258681890420398880573552502186079819673130304226319
+7793578559294710797103985830517016163667215076322029333261233893714376644214340079810529332625249572639110330515277641165833848
+3375779071080037456833323971305312807921291040172365572121296035080033198190386403786992644365488916964829938879099337521148544
+2151885079681150752124200634430960212055491111062153428630936693865872096334814997531820067268121582290646921550422149642030109
+8613181778258533141158145972750085504588401393903967265445772834337987637418600396630528732934239316047591685154760079805548066
+6810794208813864500809678470319323448087878028803605043954670396669190693495990898866714597544374154361810960387728955757997027
+3780694542345726440651447280692129044592214402723296549397501233597057657590741164054767713089063618201384926245188297986421050
+8252358803202927045538322743598848427122577241918805031148056119515867274399187693181758263084888023518690338982779085780404769
+2424326538477152923084594002081423911440158206786241827087394911592939363042513317947630468078474296989628062484584400644343448
+6293560419015354447114147053377323271370974957505862615433195073799026219744354293045028357502721448147460831465672262899873109
+7387532795839583928982541818961799651808690944192536299119649406867938059084796080728700163640618737891537102681397327040310310
+8646371766907348023824656340748360066056892200614557523317897955392332090329097835097131487719957799594533173582638863081864212
+4986100049536290446290958993632891990045407747006838784207732735249166707023914891375926737812449203630774188546578985599909811
+1084402346707970131458723746814930784514195757804466199671002857316090262762516878154322011683754629425143857675752082486603247
+8761838577711280264766083372187992430863964477324546898292032760669740251929185543394862067810777754782525582117312630882437464
+0771509220114585291617227270613376384799093204219724418023916278133523270037263368542243169870229505561283586085433377009674011
+9820385787390786107677870809083528732710164474423943477332838364565199183957564959608617849089060421328797474250989472544417321
+7919326323563029775076417955118634250595776343877190502902725431786697484594693383405493496141691115991728752796848704617855725
+2558255581109821405634179872876958166347174474348761073684217931689004048682704410888017280103004988712033725528911209075578017
+9160863221896162516421424469589930231499714756713528296148018288586763465400454214603217797926981201646940396481239125062147650
+9840316514604720267572846195066141632646978531870664811024154364403354983561787177052598257504070314131100093324913554509718449
+9311775701841172266095504345180054522901312438857477399185382790126084433098439433269362739881218978298243657480689874068996355
+3022781945908762278768811002699224365141074026805076790548873962428543441756247033480754889441799694147133688175673557083134054
+5661203741867036406194178717036861247199166773801082533375613708479585773697108277538910907988050442661518792070910621436071059
+0690138478379736786396005725249615711997663990048585261495921831819669914145515073403200894318211855461357229650824823305525133
+1751585791160648049215935161043755494836647727651069321059714784747155745680573976254930604344088093264307898664770655705644210
+7624145261014687805152488774841289678583856425221410365164555890159519557132962343799732888357700797774204345288024762788982261
+7890710552868121263477187455194185399264846143513087916598365744278210315488246993448630198352186843484020444533061474327432896
+8206909625120146564482691781469049022430111838502858582644125909195387775957182358764356323550045553074686821737193044914677910
+8204337650424296695493149708468179951960014630538528111508141341188662936175939750414398867506644825258652647525390439239752201
+1219359010151342200692679606063626284788399861632782010310804100495631217242235430375489322644648855854345633079496117764048987
+6653697464408607985860924202927606340854610960203650555980002938739009437996650927711204711526682854187368829518663287620378635
+9615765538591556297112167827891749863300345638363300995749126057833117511099109253123549891887992882557489784541036449471882403
+5919028352049694001658038819829671235731815415745829048231249060308117257367536285634944658365311943856716917740139982945041953
+5779687741861700152585779009366027675558545586949850924189709461217199740749305528005166461978008407813915390937008493360553115
+5834977903061566139099870190655547716966444068581774636647968617674813198281268006404303675453751976888820043577600761967333881
+6972326585063978838443446520453713997506879344217941897803906052743968972254016142258731934881056702957790715642228115030783951
+1362425902796546798395679404782769752464205460307818179674687205006891103510168328363308032810297518997174255427908231022445396
+1509825900031470252867573280977984303757520410764668672441796612789584482854046983756780462029600563288455226754517497700564660
+7759844224301976256343546717305935453950775711909213261546888518009701479912670689049983757648821113680742909226880646315005569
+8295567234561669944338275143058695909726066802894545455268764288094686590468443329734647916141835949923568889966174907115365925
+8847804451408263609187211738763773284048172606546780028907522556324927271519705281526806470352840988271648499699486513703844773
+6679160425612818347335886820513491773906491628651444000288856405322740614920289642723221399498209432232637228104522990852837747
+4111012689294616788593607591102956684483592350971102538317426326909441395344097833084048144520705500574792401000355907792380226
+8347617047251388711302856164567942061715329050448779661635598992241168749527006373179435024773116055832951174916423963970112173
+9055087726497472517559694026453105136312139238988721622285684818285622456138820844308772825216777711338810456475617988242424162
+4197863232696784218000746661193362219301917851338032677667264033511098062281872897803087758355321546501532794013889570222549856
+6115749894285255554690322957000949336927917916709996337643587065466062558943015944180187981070089004992789679317730749848395116
+4787717685054333694149897473720745326568218218182852236278365043324649884567032268831086174748464582606382556519285049880278120
+3971535819215057024510844131306800637142690099398881617684362973207491682213220003762765264571054110883901103595485168757504333
+3733461701846483183011223494998710865469936261566419212369452729547931045469934427223536598514620405179798084202385746863975487
+6787515125117652836269017536232648894348703796120091034388135038967463209181552965632410604353037772756879239864709539921500366
+6197228209653401639582453147092770443022867307115583008238408014093437109999520308757528533277994723967340185717046004119026260
+0327403058251198538854684801262565688227840370906858688450070334229654311591524491257725374686504434311374381373826709761897189
+6320800720313217016667089641041343357180293991403820786439200978809209918586099663595021544518755767970175732723433500537775215
+8586605557740559261081287090127076957830333678084994220662406403052293892606977228772765289631860524156764537528844813070064403
+8457029064238615286786107279460798384585105993306593540395560420933072225512825677840166549704827482169925869109982598418898944
+0346460363516674840943211123653705144516811133167773396076974206411386351987012791478690845256647926914987854519697980693850902
+4071039292859550793054081697582930309815712485519665021072773643984757349601035844973218854642152867868823320985485836576692696
+3566944195916064023455915853671413519744116499257428302391059795726588226281448949481887857567458305547585518788070366283222643
+4475630384874509141748841479483575783195093285020751153893790442309506156006253308563119939383816229293457633418322795791651798
+2534236711768923060748330398823973796625511107263972895904532310389295669901143468746002992855700338033513519817927059960082258
+3266833442506157497412341209730995861476441931081314990884968759007025722755350805078872002993770048685210269397083340942969079
+3325013293836474893127556216824859727670678446693115589979109778870903809827936806876988266059842178470200459657153466761585276
+9339215768239697841992780261560272323641382940735693971437349481277136632058838727826902049882698280374121176916226254815769890
+0579266322319718076679029381516879866920214093645961826097287139995438556892638562807533592029177968784950961959651824138364712
+6905593271581094882293836027956049322801541013654133342099776388830151131142904625837046121178740403372359293970069573073460036
+1334657560229091661514767192486484034874814804158436588838115645203542626667263606421481459341052191296393864355597357106139612
+8983996484498008491962652081920903788269022697096829121085293173454864230335343930546161539206227982332409686050424799265682960
+5979943191308039044837616371196377606973368879788064283861010090419804092295381096855027541458106648574572073809903498794247525
+5748223869403535883463902896159174890497470441638233019825678773597770107171367867175754297335334571074534607008535043181405194
+8795353535341345876592035589428503364517129250540037247550521782811791666374510791517112671288737422099652323046937343991337828
+1845836116381331085732349956975527066319503790930145646064646988078457512408200058689118375881261700543344729871472397774510391
+9908840174753246368222566017712326787176851291551010131314349894185604484963390215007002796394968662213178018411586445058609354
+3648708782366479438386590662421575557958786432758515733410030956830742717789884410593667200352894830011183921069426063462365103
+0863636445701114598272155058937842933641739192649108654968863927721554489981493578009581287965498827240184001075889430327826948
+4493294744917241293353606762738125798775389304371272784848161045309965481110981617696456977856845295663146310544856961560395701
+5828350063875380289041787243953420472517640405923728557572182762701021146981223831971084235740009591348792854248246191617472390
+8142911427486019533916938360973756294199899650632305767565787069658787674361642673323286198646595884519076147156672045347769575
+6919034458315451231488534732525157456948587079445950850088410378838535977516348080551775162637211781455681436512037018188409356
+4896222628077283599302550538329307529265839416312577475209070966536398530653252477467412899117369638571925172776374288534229909
+2854126939661606237890723618332733028245947026454912620083338662672080884075389624244778233027185136679702658181696482687520771
+5486768970237811447646114465006645965128132304833174901323446834886512598955526763233636026886751282286763353050412483339880879
+9146149867375327619762240148102487012789152939324347118132416925423213349620444217738724989375651879154078406666532230695010261
+6432289704281535683765846177747137478857199113830933135896448323481180075359182281747819927805855289891296771338965010648932514
+3498778884149977137993362603088225708342761654666600988476000304267323094698652989046529561743798096047380169014973930605911712
+1555513950736376520645091335370846495268353191373549111643901821633347913274787967705297774512956543219272395543943905097818713
+9824515005207942672277682844175672734608049189360837751069564229080983682875340351162730595292836110710458156809584248318311829
+8644392801319979903321539224060850887494189887888933968978507838319574610389051812420770840579282228222004146980291262806411960
+7170669714045362254284955377287230002812263383500586848752066007279901210618595185664394253569437180949208007446172620486446640
+1197418824383226696240145317846075038217263309407432715400718235690780656588433075117078422196797078588171900080472556706089444
+6058081175983404316870378185108517992309376387807189465675421456144616633676191879370638648087281836756096354696164358804958793
+7175300097350528879964995120589418404250514397730435804307880003642423238815219743208925752113332762492815676234753855313749687
+2216821005143022212418811965038884804162533171952178272981773050431225972337066809470007006624527746167477143326209744916009321
+2874879795494394023670916234680048368860577149936343642623399857065876920729230526286990908222249218870734087284012928821855198
+4892669237695278094261059350844729450055740052868656916863083244548039117228735586420221099748057054754127348342899320517500476
+4913533064284953905878883623486045020791418669162484614426142342087782118817607434327885376004285685360966673400518425200903095
+5236853047264130432207807874987854720636307899392809936830966680235406253508899133299685304059306299982669510153104336419138281
+2635729217127660380760950574877790788724558832203965184259818062945607402185371541729168619518031385767332811305256686570812707
+2508693777459660048221434065348386546516873503781056818039736884680690592725066422073878336659156014383855199604525567079024098
+2527847075125720859307217125972603526269724367871881994978039745425984811500976939283305909268477371136914408464862183620857832
+0690848798245605847434249059051242459537031098176625887386313497201621005955291382938621297556760277294613833001841927601417783
+7028637829951952641999762601338035213911204478792655772152455046625599760300329777350980475951284319951538433620056110253564781
+6305383937871208842219397097772665248616270756493102017303010524320362272253687689906320569651514870191751716750048983549016387
+2503753802832702119325330648883246982515086513140942076923304514033686102637700160768687271319427097046984664384031053585769263
+8859227992404387206024381418823288245956367455432601449940099288001162654396819305512052575309088805570615034227083337938687529
+4650804026596773751781171691707686499798853858855531297662807643678150070418762900082986264876734988853277036828880591174772676
+9388499761915323706082278918760363181675840316081077581226482199990184463308418161663917171550066696858396843063924348798640785
+1339519437101345180144205804260788988338143185013195486237509665528555982435461459049630103016492555659996037806521222234571639
+4775406178328515482958996000719481194780201067828314313954411507309766697327602402398592936844052573242705274081653994583193860
+3528381321380368083594961454997422094241837847317957074543832643804670074418168234251527826193469648447514505161752970468032251
+5644398364843284455563221983222109730803753471463129763873997470655511240512635865533704491564823907699160432034740568090163512
+2019394829622861074339274739867648100223183661088275367604560854273519173101761322314118755022999112270121442893766921444175618
+1024961245677370458394203192048216519899540056189972652416007572725591801341729111029393594712226889998156435621046992279746041
+0271013842729391960551828591764938026380238772791709945105208575380084459912538928688891874547881085895537996185248760341022722
+6443644163751965239785936903668129878996022934136734635016147841655906985263150160687560568016130320940069489352717984945617017
+3980979401244807308375088961101007696165282732048547089807678715095196311609438432458589671418362252711116197050123998645160718
+5029882228039159089170628100687054725011048437854579104323727026278151658455314659996721845525056734089399419451901797673293081
+6285409273407838783004808714400055644398911907669583936293776767386307697838130877184976183405711337976463042849151509723365986
+3789116449777854153143327216807443418065067164460291516731014023725079965308205893342647719238044202553135045734641879985943779
+8298817649314977181973643591691453651364965447794449764965615478663842601481733390271221156996231579991946480360911957202482419
+9923477919534528913583979154285960230181626227828624997322864558028580882337999440750509388244247586570466385544276236851986673
+6266991152224272268084343794242067444247144028060688211987908624847699372423422643841707689624467016900013832905272766427426840
+1355067343839251713050029297274635544953158759007585898844352763675665452680269506694090597773786276467200134181329183129591894
+1203185079814519449730972616794089846681228932967991544425024262788862162483806670387321965112895932667954720701857303315356633
+3010223406691406448732071777784917670640450961064883921707223591238303897553076936064137492313930301276184114003498965768546700
+5055662053584872171686392213754554115803665951484341184481678793730256377197108916198950525496472627926989148952673813222574403
+9135301836957832126464142557708338619444651703425091454666943559384577035607172295502116858050756179608799326777436914985064677
+7849895476822416074994849352092796372963487124157171056152173017480389097568380804863683908585558640345480249639539155208814003
+9261731284405809837137712563712141454654064296465941789875748814378776568326711784539691121352690345339673695586510989770974288
+9504548640513288992288616894826847158596027709105403654435535528958145029279713253496007210603612311147571118952157286120765811
+3172019293671644099810154685400878900781863310226630973663196219151877477083273521217193649999031944551410361083160211498456657
+4584835039206895266033291139088493090671186991332152100943013968139485825629047583367832339953098893263224674847060194281239454
+0086703131238762939716791409510475698044261061184491246815071586146930458568320808697308895974335329174951890370629879266697586
+4531479959438670471013925537723663881523195629756820131576957595320119441034946472734403049979337927590688920672812290238838992
+4555784600301091463114748695085394421438230893318590726172334093673394223159678897396878630225087240466235943323892469006400425
+3181295825258212728965331361945064921751996326740368121061708410146864334211196041567878993280564094949434554682791503673171658
+0842856419453623298809261289857239402872945556557159985688775020115214582384781860334689651493902766220136835999359515682473907
+9925790212755349035787540271290598847673187935010889467948737594198142964082798741209190025028872359505393133888993203341623719
+6881035084279659821037463368291359288972809796102439700962259394869871767171237148065599497261891353342041591198086826562479936
+3071229176011336182119446125694433597177517266017496957596892485297788477134388949109492032269677674633006492819820954408939636
+2158505696670981583492100994722239785061126885782859457540392078035784726890160616966602169759722004423370966068470851220475055
+1608442432121043588281125489656099832629914426535320512741673998725277196703980523715247319219104260826637474643734228192860916
+4370675331345005605018147797477139808981239675873728794694700612511771169428567641131258023552337644203474230406734637422278712
+0072859216860622480346667080043679784914202926542586524758456470894276035984569755855670540260788837234221463158700441389231519
+5908942320852274627106540557811105888610228644494103402263750822407154871367868699882023311506835501899157241704189414346964284
+1936077419723541310264634055462791796583876957815065743467706393867078774982042343936087382789908364464848533080889495741496533
+7254584486083999860932338903788745031776193198150907253247533783144266741445178920158676792459480942978555519260352341102863868
+2324388659990555102109355727630603564463003730580206681960957998377155433799099008210231393030776738444219722412702108302468947
+9926613338642730749665937063588945780266089547872794933113744630542358661411190558266352099886620858549171525338223571617167711
+8986318093141580580876428982707764579287478469073583981696234648037808185140269756651566921560785874161230201920488349770275568
+1902800771331526181562098287158829944843731017880219524960324079005886150803168559590390474829249427791824941894802034999528722
+3088584384403360990907891602519470935005839028378253171884990772710302832296914348751708792698002306050160936562533914379396209
+1408310312115069530150233048818331378284637723150482392301602795737916335332815872089409379843010863320155338585218615794879180
+9677693345069319403701934383954872660888681515065440356051840106884171038792426226463129841417745680354406721408968771559961954
+4557539513449236642758101806291205473048350296831633561735117237579593752211878576489139742035316348287283326781007355249045447
+0883189604094854361797387824593448971971447378881204753543909216846733915206018358578418844775503490330084862478510316277108659
+4392550432502243314906975265564518025479113098902169136391369512817565837562370156090165943691065253900876426946219189578736203
+8435865573452195078786548417341611434423772217538030617156223901185493595765324312422048299670372764076523094427788078350076588
+8758192779916285126332006796232045283091922027709795938540004604312898200544114013208612412744965934919541932903174519980041254
+1905758872835083202758499042134848212716811095613617523820839042848090697442064092232729193928479222578050789364469898951584433
+2042272602260087723772848808702134767220173723358646135775389214656797340171301999623954978758165595263461874252751080813852370
+6274949154731112794816216220066048303875986872572001517499070940234617966182507743418989487331756345308613913050407521686762445
+6252730979488500452149052167583298496816203113490366754560247487872848255355376484138619549701240217905711665471993273764649239
+2281622687072260169420599936083131206454896277499378500769391609676460024680767553958496006032193910593446808391535507538458599
+2191010913898494379461759294973512837440625801801770581499807998348601134363013493664904191350527640096566620000395093356134597
+1660938804470213933500623938584649317535645503810385086838104030744441292813013981381095457570526776722828297499568794267530527
+0049591878181449823254506571309609592366697654558586847111232650386057621118329999460228856081046031697258812551653592183584022
+6258688415014551491572224840400910043380364244249549379338382107530054462860121947719561782286604468083436850199239844591653106
+2286199429292183729722721966817924988059655688863458946473056847154314312282407066615331874808857982581754086039286737461422747
+9602373046472185399409121350660074121130363291629972502459350277036971026440212505022927430609191673069989761094096992091670991
+7527879946650183351260678785085159093046180958175365176059942440628342275638429735328061936632746613485734744234236065653841137
+0853905941635849403951594887838110573652181835969202362039487221504242797299698627659839204874816529447544114385531980406666739
+8062623009337523311886378539061039298966733017052114071143987228104904834551295397466673191503750551657795489921304516776700376
+9007862096833941572335165844081198462047136819292917564132567522715598859947138927117299956642745110763969251319858190814717852
+8138958664951405431541453825461330550794221363483549976099721937150607149588852431715285804748382531904426919820630714135461983
+2082397885435139903190314072146037819079478576247984221600827812796545457214101194496220097049368103574832514769701472385466387
+6896832416290927778053721602166743175733725992261187904101998561355457754417056692268681305083190893002118259512241765998122185
+2636968504609327449982531058224266443456972154252698660084884189652857349507395676672582020179531698016039374573532855093674020
+1136026577034357822803043248989730467073666295507784903395493121839773911132783532427651934810756742564183961335402101819870313
+4917099632663820977131969667158301701831087873930909603855469814730542409624643679930249460380846245995843352815176947927777445
+7319944731827475004706218777611396753968431393783636860295774463198452128755272715443101250558014321901313052738593050746571261
+1707391395815003284391913583753339859531852184651610466904418403752429242924142601415582143805388089376849781779454300111958363
+9869108151029888337540428241180238714963181644033868424652184814249832670934245802862990793758097055499023243559198701686575666
+0187337650771748598070996214382876748717075026419386245187486192182726086987036097255846930650043060886509574171932845313409481
+6310275245723435456702127325230222604362757109683102954203602714184216564293906952316506569915992137104170152492029578927512300
+2305363922251604346990506838961419388192179030700159072409204210540634525740072656419492493606787180195424067534096459265589672
+9014680664163948601215499948895470475969838465633327315676059364457476028555130517706511356929094761498786703750352514595140558
+9277484889618105650227338993928615130344847104186489285414725102606461111639517477747291575877009412511989063198428666104065406
+5967555124952181729420151522869271680843682059283488086279627160865021360567069797183031645357984651583784813809428355166017913
+3607122306789653495447270140672966362274565501229973599229667563911606772081598572491953192767189192005766778789005815828610262
+2082222249317420567583150769393704141643717042001944511315146960110297197944325284159980684280693676403148609684883994123930097
+8731372124960991940185405379357412214932260280623846110357067671501251533776628907031655983387403452673941318358548346602760124
+1976021347697640428375581819297827333264016242688348297392388997119461967525771833238891591593742490277240125530759579876491077
+6072466888350935400785328899402008544459154165636826625026958037650740601926412225205263947146298128779293383020953022202454362
+8044034560774166401511114766914479073842481064943729623980836043134237110449322364783254518711575480004977127696613076710220521
+0564017571074921724777748862479718313010297525498781712387929033234996773668361156592993020275412793744070740135811199115493778
+8419964042103133610587792208097044601548949029168486670192222439144702607241592021192461521821947279760550828661220709620486303
+1088814982734131440185884327578226836944316287501836068430921447613687229952034388566585290882851495307655765844223170274340586
+9005799435401477659962899657617685769970912656575731463413483835844226203192655446200112583102919467583122082891247399200176783
+1851901588702515045318382295536798092875597244431065042731697266394552848998020859370638943554279437980607960337319274852691748
+4157648096188098267490705839256314766006302678665206847589272557754575914579199683296869793220703658904894112352768597742132369
+8723572441033421822131850984144065793127526826673880856427241209325971643349588168485181604003549286943794523645867631822180512
+9961788999122788832400015923298335447164102572685865228181427272076170219015236471640964326542574283167180040163937092128142732
+4937228274511747775697611764578391450794749466871545726021901964860582325608076362650424934625277209649989981489750831225970741
+5984541310271980053712817247539372152339967892775462123252335196274653874061592183413734875908267266920758029830479031847869228
+3871371830143074933411065987051697909188835376373962685096571028998970101211924718499411402849248202339306457377199877126871389
+0586547099952007576979285722825771295071780721616176263387445055392095793671230602073249233658371312728279604207471382798903479
+8923577166944872998618492077791653391106848257807366227129544881151900203904339062941439729248722161475876280041042987870134297
+6237224656556330445619379055992474217471454724969182529987949872722998015945413515067495314489889032179791415649686011073157477
+3003735334796840694489912665109880649358659073702150516968523096869480344821929684468744926264579118587187974938771984262183130
+9005753590334142936036827167253181517255166676962390793299722321456204920350620126047032582007457817410580787154332130609567063
+6768747081081207028623866855036005032042045118427663709885224327750939144410815093506371403873404919815687844934325487062884410
+9939375834444884922802271908890569123942112471025359287053666892829043053920922878243233005965596366467035614279935114942794959
+4228677728256796231027207112191813165638914358249269082781564785198933238543379292199026489661901488181239514397059686005148486
+9858539705692720243176916548886314393535919032096542151105543882501065636878211469917818253828853172821658378951042353768012326
+4422150194025015880156761058170304509425792379790006321176948407538912546088068547813798000277530779888405928477531694464231990
+9405650213736879289008838391184069127301195712710013925801226563743554996233482554161918019454022970208565224871459380574639835
+9130794172100568378934252595907690555743933712658951585006391044055921485334952756122241280828770097902109351842319381201019204
+5387985013440379266230518099534711152536460959269911655397255034626367231069408969413762813968064236154692333107664286960252886
+0837118680763800551465069959598175835527467398611671504215567143391659195926190188250898459493898805547983688580472819756799921
+3903220661160023222988830014776994424185300024466935537043911148899196047568212527843430862631973366330579525805431481011727438
+6908486037368642919233388174527626955887348839535505480142124695672332446751550909649591921180619995217291566458925431968029596
+5922782959375057616516378703156580986104482212435661177276107010237081047649806919032851751263569965116169589560831643100864715
+9530369870366296156375956282332841862206458152569867266578623568655520592049072587837930649946891321926334502571392866551701600
+2244120737959672078726164762991283327806243441107419508409939471693616693409630730506528517088302223393878360169050233927904848
+1173648771365582895309968552846929556758030253414605906336548466169612035971381029462786542081116525705113252983939162686385109
+3234155840835288921699357747660762996672264982174457829675917923339715647526557875639742064383339589189545825487931401530995501
+6887665436803180794927923177816956708553785264323074693008344374916559316617894764427215802134641031792988573701240438184249750
+3839539179042881405914564139952865952209303008409731497507386952470654995467985010268759732897359668659271914262252626200604099
+3901076984640950131960333781644223983532267536121313347358475229440208418673453842347657506344090138736051557656821297434982077
+1623302641135870181311409682200177224901019997404700215147219379739297672524540935209651730504196225871915072497095486880839456
+8525315354478812852093356397223120386907828133392270722811606375757983394361481913342296750609970915686272616757634461450159831
+1758237483830901977324883248068822612744747099358422855339260889327800667524049577373525949059825015390160043063670312221072626
+0817646239152869131112173902854770980862701701464607169211772950069653293230684510278012053087035337608494974396015461535406222
+8646346589715796030816122730522353992998487085588488148264344066530587174128544229529685414458831257128748560990578804587360715
+4892783957104711928531643465336739867007712821809759300577073458900066680389265377353301997705565938884080611069388312576416304
+2814927389151100129042633757615682635990656949553591616128856450443418496471442467646240189440950521511107482659253501599167684
+6135116334119022986012296077975055833220297155080260438551907096128989879928867449175546615606752828933549694825257606317586967
+7016532424149169529714586507287588315821039767281860867212525388739062009398857291177966375322314074508942295009826535646980545
+1130704846522761465358987904002837038112315864342341500267273512280490182439691698104185495677754466174462509539951393350430049
+6239545452060864474289817540605900770875649791603624701849860428246844860967392240963173839859434643202570338001444647069601535
+2892256768296868079082781775690843873409200886346998104928582896183217369070621962623861890767458984640863725872163427837396161
+1015987233236680540127175130575507867333440719260832000405122222181144252353002520085749044160442813319007733231316952017735844
+9207122991749764391450668652103974356514593013095625877412964336676292277200308352297929615022995501002585354045748416214004090
+5010570807508645991981283973843421015013551379801238469792061968346208698033924105198332080219826873915414042770997813678587105
+7079764317445013461353198084076807018884451655619023138435629015461147032511308684817994462582990789356614515379970417351047112
+9725881506883451817378068264565401988152381111185798791532824098438029254469346518084626414715068349480830207550031462251028658
+1504691090829009028694497048664643697386279163491642380984787314683252474807267403308118309227599112336474348292331546087385709
+8374045238326514850352601439525770150385106432876360117179641265901618172845807500617241643296725102357385086749024223414320695
+8751924711372854963768655608131773099674117966941670496696797649406607434691461307943445287152706412809962107879642575743136123
+0303974873561466480968743445273196900705427451656962370162651211903195479518829395352847623644931113876694882674530035776397562
+7062275706646629882491960277069009716984996924439240397590784333436313250958554553224460478301293892351431447612983420608299779
+4021998564670601304459878729468539224393130081394097452696802435298562203672631426231047502881058781296871522825905804208338252
+6603870763394362689777694406864771464497251023441752146535341971346977029094361489321326128197028616266687437237475295317363781
+9156020188117437220553660891624641158468448699614504995148457693527457205903178159270764484168386506020072977552224361333700137
+6800793585132251294965485406539737210356860431874461572263005112556102550605119443415354337340356018964066943951864924412299915
+9176918467253843792621229869758475550809947953676328982327607776920014653501974832672677357939313552991103607402118582223524673
+9686597280549256712036750220654564584483912204263497709158167656617008449221355316543489486938189978195357412962551710086697028
+0388429487175354035020158054103632924527177834523214082900849111108930893956355794346651605160826522047668675831813135358949190
+4345101694469873179969332042811556018423606297108948984557961826035019597070396285751114257989897953296299318364378614357933290
+4949793892609892089229851776026934561460317731511255552266868980253783700717106802153694611663582999276204920297363252094371934
+3674663375108601609896202396621130718019413744942494222052103933540452779973933501106619925311069127219850907767043719608829470
+2702622493254040904859153876396184987380395898007693621320399251663876437827374821903867019473977298529862021085159803043642262
+7628804430192406674682789691745692230306369379190920544277057351743344722619473702262372514469670378356778783948762245486971339
+0209360041654178829792127599208780855624409037374530019447406585398770659754872987726192651460619482209256452092276066423476738
+4709783672042319775995641852494077105915433063897114034300326610462577068371066683331006070063551265931785531029670403665686700
+4587667003896460717120912220270889981167563292172474600789871114756272885374551741764032376074283701965139574996577462686971467
+3848976224442081690472022609003207496720929495444016043645809920259850317579964113261377231461428538754038582648249855596427337
+6172335672098748490848298205075949543310509985651798361629655073050078700179132155025462638010290501496311312192593367695422649
+5726384573393389957861087954363684393648224844030047057212547523809090733733447320925926719918185564312722906061784825834541657
+4665490918503684461998203394016725914244105391374685986007968106627529172068516391306150797382538751326421691707344779240051404
+2641961236056444783029513171308212582932163735856854734301365261361011265730957017358847540597925397759304056715637265630175924
+3143119314616534179607705689766936638499515116711864605104806787742064610741185862931157231900890917045797092416341390041404007
+3447931172643093407899075956016941324761309449689246711224867235309324518097331543836073039264012951510199018054862544697302228
+1563566785164424421738528286186718541346261171578886688118979569809183215506908080307606078120020216388497864724764057557754295
+8570889786931244194585660557574434060147391448332058484468219132867607862446662006468299620134301595151046310252336800694251427
+0217713452224504960721091364387786965013258053103569599886166960333008816549340813042469646283329089138949995982273574974215868
+5241363057936964400802812697301682184281492778601196784957952838829973528993067785327299171845639921011068758599950934223980914
+3238619506166339720940794008445086813283016112070588367871958447351766426343723002443074101469688320695818179265745434758910694
+6296789680362763149161376071869217199662771928863547592423030630832336241218625794010606091635986342053359908043568336874619758
+5796450483018638379674081988788071939094611782491186354599577562913830254367966241420426194905385522339051453836242132016154075
+7739106134294761084702741107955615651072406250165155261201936784282832131480551569227393410480076418655073059966098939360374229
+2971567365547701845803783070635993312664824380381023912535236337973918393748125160984639017693662692774791712740599492208482304
+2270720904622266004044552929046382853488397030569658054130832432158967100326401536494483965188041727224259066348964879067583812
+3443273270836744114169351145812281297836105568675664537098362750380900035541986757124762712416133474277811013584828903165701857
+5742987445704693742780012691654778768416076035850059897986267208927114643299349752186944079949266040605774961616317552910045136
+1240573283641630694358812830029096031820509750547875205950719721469746524236951030334909216603563649107173637973757255912252238
+1182181309135378156725140117731218230316055150298076621940456444204177883491865113883523054776801063888819486505485385264913416
+5069068146388574137237425212952037225400371744975152454660711335647864580574001943714998326035983681508282903233341771279568745
+8467943310622656536228892538026964919357667642832630682651110048817452858559725652837991052187308635773654812551494387013316194
+6440134083862480163392226300450457593962112666903507568451147153007397865298280740371802995538252604177619078977124651051346524
+0537206772933648445348418297957633068071300723364120286017796847418742109018037795201017609886014503958468715621463005263787770
+3432430202920291906940764640954727327787760258258401409130943189103009317398784374181000619017547537895364515789076658241461815
+5914935373373404632064261928025631881068410722283620043865276873695737002786518062855969064577740316535280772509182462064465423
+4663807875203623784262624547123565729447932492414543360035449489544264792983057557527120665531457725601958452570287012086637115
+0847474551270439717567791117916716520890209772268515126243374020404961236068669964591032312120458856151122774707229179093256702
+2728583785414355071386563956562688209782901746373262288816864290881579324219562028197868974414398025024344306680144426091625030
+0910829767068265611067617086376443471268114912189289789288578161296371552096260414590275441364898692653660772972831143055685254
+6907552020126899986435407709381912657932246467804972165765350364308400598137400904853881086873855469475626923756560878726730206
+9692227748520363042215131444256441345425607520902904049752565589636006403442938604002826527897011684910364030121356648587505405
+4764025506989776287250936345001157192241256998927684892678268726606209680040843191546472014984020704327316352200558172668843000
+0564503985848436331698791790813182963520559967441699554268886929254925633860614440306175833628563304317763920599751129071094309
+0175566287557279025857970584297243285600759435104151831150200001725607992873593941524916608511725999483859291253760003734973775
+3039168535120967789573627753936889933310390638519872912077737282540474993630496322839461848810678646381314301370434612679202453
+5290955424609618789728513231303753525180260090737043547498273247450093929519045624882089783253628274100484171694237532423254859
+8186844862044986653314802892230697717326617551815053423012041608272398516591496440428962043914698069230013270892802838135287280
+2942112717174269473287862314996229628874313075502005461595688743732840097634991389852224318945641142059923309434297254976695326
+2444525231843962298275031069381314438305678331941237253189959661616931936428403908777740475422459580996785256969423138340880864
+3680179310627154010609137293613898326769365871171324366981855057912989303388559760676270131578093527806064422528032847530674921
+9355461118722504639190973677696806900807813249020915988601326357024391608006515894656601520223498473406143763133984605551760635
+2692839783034034225135191314183486878688437669767719161941937422862653760924569831725084821460846216076710658987697058689127356
+3364076178555288032798058397361297765867389733546080821420688209714329880465424718281983378741966307965647446727248970877582835
+5097154920011309551648620026419749934729546113147672841385317729841476832905993191729886098778334663461209723905553676387326787
+7544038203057755483948118938898802083672133837458011190981229303171157034238018580240354203030584798053880317332961525265980136
+1511152526450600575245224610801100379737911240153008627074626764499468695975779959724757934622234502314480579416277867481722879
+9208761275469748679977983637248710137550354113725122267268928582906191386758550109656015747293931779066403562806751200098816649
+2774371960428126935364571996703554555526862912399267217503390978028481995519553561409174881144281743002477593997449474113614320
+3283118387697337618913008345214573134792212133551845640272542182183565756097005950085429574121104212579366752791246087630740431
+2251626647794796903046417171601708089033102353726791435541243544024082843362831636356376144988414260766152555993385246920667885
+4120430579803988192186052185336786436260523534744839109920724061087523726726856003315563861271636470368332064799342319979701963
+1178460847308168095740461067148790390275190816124283621727277092177096823111400887004927669450338704196432823728793780107282726
+6147466566392578561700534815888328209861843963585876273190658740165656380640111544922854734365367040797352367883442096872576161
+0655254149992445465845820920429897376775083347655359252308973271695549200271712623988532809944592500421544522541040542744651771
+8895306524774577797925949127567789976094837338117657136712633080384090456221881872243825996086082147423517476054977573177854050
+4943011385246149882784947556915542478920754812582717541224558316858308474902436139789610336015128572291595765038163819815572793
+0059519490142292292642467486355644357871443222407272677363258010549846343690410511589487255437861629574221414317395258487976995
+6701428890977392343133134256358135045673673123158832116303929634062094950503008501398110339118434776130231986975400156621462276
+4809112204042804726404274446015570840535663272343219408139885535879522105193162064034829419212674983141334515042809663864776730
+3339872236842534294842100648778519220364381792736266281427277880995347117460315427394400908444602067720779504370559025897150525
+0666515892628240976196163023835072227181720931267205367481763695114784962335391370607825220441784558120081030826294430035145825
+5990171621923618467399400881105334235398291318764791324436841208478784739274728174080402657482105706012062680090302017358495564
+5800215155555227538662802534678916888507797284554941341847639680300462071370712985768701847640442454877861723356457893345549450
+0044372835991682943791367236860846326267985956993372513320157207230356385776345982286545530591945027191940491720657627496371424
+3896431871159669144163572836324937737933585239956934241358540063356296466656555165061326841756648545874963895216091891197215432
+1150436121846416639357239779525130732656046114770001886098939931426129354428928259723637803567803101198938817466591948073654097
+3680333838160206864509221215320873122528703603282455751545397796927467717336094169326962640299653768153008615924472102530867643
+6770050643269265320774249712789524649226429216132578192388680218997460246361157967129125548877818859824163987287642561738796200
+5254046150685030619784205850259746232647288005274167276588953501245671262327906633892459399349248665683674586756619925085832749
+8138659441098017401153449742392984232024716079021347321627336986000612605589176674195767657558188526805373912850372987580206973
+8191739475819996816485468724355025309335206345790673864079265551398839303546015301031614690697079405116794058344817857751170058
+5907733664187032783992586304169841870946162957846844623230375351751398150941213221188521406317499729525031329275753209552972135
+9176007624492506072188440485436086995355405038611315169617103420795642254487038087275622057368505174049950711687063028236514019
+2054382102455304130470152360854926810408620809647732343016107388521668970316223874173994646760209951211428665814705542349614124
+6010507266966547829863386841978029050310064720150129583679215294838434102788460967870976228374996605588773396271433676057289822
+7051841412308687295953020826737760628903413518500966433370038504670238126933304749517485860557144247313921158680957030845329616
+2360033770199629503223807832521648961131842719239878810835014788911969787608442436353630358920568228223028658040834409931217202
+8400997693934004696590555410764211165674028575041130093079293183383749718414250933932351869983505392135593326730456694681893830
+9601966479081797142729057700273038016579775812303462568369987589932810195102540708796028133906200420900692102185183676170434137
+3162497370959471401670744764602103343725945241209609871641803759642428128312023652491828868062451307296471228615569464816843941
+8764436487815154921343571706294950245330020417561336192910050884197950522678946771691143370350696790098631293864395203215663546
+2103973531056753606278933160819590888661208989653023859755262642075600795082475977389553769715231157147229187302967554388198370
+5511263147464601148510010944839861149087736327442223343582633059022202904665113422199247896714934045390179111585670544907398745
+6503691628140930095878935309503466424485388886339832328600458315631288162890181616057639363435222140281269282576385033650710680
+8454254370393439429040009560609022779619788056284224520991161927353411842168395626223590494290282053470410540843450407987926472
+1336825679355920509182270187363852809609898538144457557442453481966013998014732868105005901821373796606751500831791325616529203
+5075118330341336536977717509239821947081842843667207368538939749602952519028901304254002381236022047524790390418089280097834547
+7087002693940685994858725839374363930880942852293359924965925052590869503751762743229260822706873201650092697209849276502693145
+7306083000612674447155484200177291509744727003567573915026132438684216504412932709214471251820240604475149792423248249870477794
+1828750345492089414352178700274996717656637631789061874232476374372589026121784200003799632748786969419729627555600483655428983
+1419038605582900945308948756881180557106644399148478031842482768934058982366460243721966998715761966320233275607842960609086807
+8995674775072395937621113944922442969450956475559169579744736615353848691595206952225921509080923588771792361528472949801095259
+8071164393093218807836177998870397618178243287174730595843254576188688725044187468313573761652235487642008727514328298453902298
+0249472421551084408818726321837167660068433212182140863918498142778473568559604363644028430498972834010437189971676814372359835
+6326215711122626023900879284642848379045342532983675870120785391214889560676166670449442675798343547201651587376372310330260972
+7721128349367234491190961548434288775058240627555576639847795303346657927088312538298685663289068965153779510427872075661840307
+6404054826004851129562529146035965093659305313594131922007840749997852785915480413483418179403471734301385082608331943522033365
+9733723661694274986939415998932370600151791965983225598026282848806043753357041009447678948117256393500635321688798336983220809
+3023589135170563869561312040343087996767334919517638058142422305672311345678035221436322642357974773060658747505711133889241231
+1715152441111565992971519735514891973779991073609482568950260394204089469526267416519043590653468197703445241031998318436540928
+2571161687670398639649025206286059219618343667065497532146361041751088315806996390315937024865023472982359206847895714744923905
+5104856285757044366877940768642231044057490201353054349716001939164041109356173546969025877651803874584635636362767779008126317
+3656921864783698643075571406752016536758441120671704957195627803118074461526120679475816346733176098378409722349965248254591396
+1131443502066788861338718815939549028179403039813213172777877033453234020243883715396074872970863142546452822669185069959899184
+3828769910844736669658151259692028871696603091005326667495981150974845310134146991259645265882236097619326183020932698293809389
+4299190605742357746915386971343055529972124390299804481008342198376182446383261925929177219506772125075974364335839610948010146
+1147666764087177430198110110312435274731031579695008275499991697667495238558041459480531076474591001063866865437151222907417625
+3118583599222787818632900781019308738830040805599161996484071877144944130661026998282751748208682924005109173737574254051272267
+7248376535827628635806240316333585049198937287552863170331727642858039762809709721675292461634836370227092107000659180675306750
+5306506627623780068062337884640840561088552876565604494700675337745509144650468822636638698294453362040534422173031206225551013
+4252579308534696009946359817557643262143167696605231236359117810698816646524895198187607892477097108960784373761400944824549798
+6045449932335488814802338206074710052382801251742328755176048705595171441928353779134497634248965450262069632636038949744898591
+5048702418591439721957110373280102402968469372594873031440576890966279374555142674908990757259647232567240212811527932452059539
+6445116473158402926922663638150560761537491240522157144544441504700466911488897981059188305240921784775901100861995605851341634
+6426302952753103378949324692632848243080208624864503932730319385221633332864218296337728836033257029589381148577572779689079838
+8323351033213327371073881110283228611521471023685177945561596153462821296338506612181495253533007296541471850977144060198153791
+8612240193336900124220751825865213792796718254928148410457543169565765686381156512821242185857562689521331372459681870446271120
+2190046770619246800670427384048126037985607253433475697587520496744179478706647309818755439429545326720329201172200607765064227
+3736184856673482672738889087427014657874110745468152414492168023597661163943017362999706603380493625843592458433287608755926735
+4182865681401614720438201427164757077032257161772988732629306857669039790289782177374506368443513627759379215518499475202046737
+0697566863573366009839193988358046426820897141853585923998497091914817356341676241151406963597520055377063092845547594101697448
+9770510287164808256026738019695567751276805483623280478598925336381177794945569958800804342768914035606587017994256909693642474
+7259755154611086941695255874435534803016372667978524879504844920733928636400671846029963027849546724083520281554956394251995619
+1834558695670914755649864898844629047200426021450454765139131674876570357846943407935142270035129746721137853801869970041785717
+1163596604514706992103337640896730977362836499853948987124318776421720842943109071494096297915872890046802390417171851693498985
+6696873506860390067654571204036998680608912603658516851469732917336706912396900863519518863153116679969409193499475151912748965
+5772630153097284117632752487886616553301227224710840592032831301443809681968538716385350119500103381352429438906070006049324510
+7255320449590155185339594353774382542901912346562333365165993746566717810379624006716063017965110258762932735063223456498216112
+6248309487192090873881009634314790029246770378814629258114526635202683322798948006269443152846896870196478753064865917440440787
+1079237303256511529274839846470858035223497145513826461412560940325017754834231423361883666751693338383865225187216612119160015
+4861549012935871901840283860561328549067295489644918336638431557892707608901138017599623121810750153111482390969696067122547247
+2439131148441383234199376711842415663942174805857098114579871600691759196917341291603802573327405138562282722593414751206457843
+1973359935209045256671529911507316084304214657632392500349841226204006608244837820483129185333807659672251730206136609040933140
+8184943256874541309753395121370721662620513066937352652876771594490437810449353276322830929392380590748672786848276069239565457
+3348707026381104836690412750227080237859968000391150025633563394577801401905026748085615086352851413067595432050498561008571529
+1877075667972855586652155165911443897166143801340467259805712033287524340520335275436517702758812944056177253493418193171478211
+3774854369590560985587771159245595691913575127970445498501177157738494672527414527162836050852813684096791146417973149365483037
+6704552131555310027219368793280881514598163193897955852905718685913917573430057096937340959824715120372466589909944315684960960
+1012314375846207604646749185426484171598374093369935297204972798525329648052886568477644707532784462941904877487489747098535818
+7985674284714583813663198777955800874049562438949351977791559431711873042288148908962573859023348239888106006645129281470473018
+9254850687404139400561382825175974131012329412859199274634520950110017567085977669352012785318630525841745235957179742713982397
+5097303689162257167085390435448404263178199429357071875772715774544733708487138600770119134943129539543347602041901144161660698
+6953181183113203630678272715731094392489433607360104735402092320971396494926265205286840279679199637087859730680473846380532205
+7565033230336604389926974822292700950491849340699150720775179860790531037997637976970549940150909535407513425455328335706561853
+5335368312471755733760541805372968424193070274491865313428788002453279122401760512494622819480016105587606929438634932015824839
+5559016338160351661853688320039654018084969722536423822579994200012801736919709694310831609907486201946501673508356764142877308
+7309191546539260723637253628477957548575327772499530308454034050815650925443083418507106015799454347735223841084017225944595226
+4885590707691548323545253419048477650698836445425272829459034786263150039138385336170173040262385017882023012446601786508537725
+3159300795992899648874466508404624507417341674483549750138299511054547355595935184376005929821246479521411349307469101710751249
+2708412392547375974662585574062716099744667256888486220537125770970468132844596575936704205294434437646542619212125911160088350
+7671842861670510559275736664436986661209239228900436842961873275642777838933287515196746049787877411927981310119576400549956135
+8080578380146388148902757671260230173280743467984486835312292349158474503715607238743382799824745964056080082925917323860644616
+2120225379169780135148292573265658608927358543522142151484031366388491618786494744941370627406622031907792989518445311039563243
+6616422310981362438162790258221845503573731451992162868203601740290116853659138924079987226446597241351646843845278977024986205
+3662517640661488061073964114703410205367685498808240378692251201166863090113025726146269622096930731719426952075506480919216671
+4823643457908716999726557603223790753609939423361772712423018042932577115436095139459068730410826645568806300379584835433450946
+7837676208477360145796134097352072195957133041368812408314333472555459775670645841696822521516557015970698046160780950308863139
+5015658403765286649459660652152764801017680991103667912937430519322186712931073677796456215078436603241360959178629806771058487
+9139921128024002577938454673706047243620589115000240242563021016654786832806633509254081676514023612790990852595917560180876986
+9308821204883025320496874045455981233709125160954382611635568126874562312377547977111739040746530325193651004237373402504537024
+1600821697316131396065115975797494969376263815891380490449703227459763844691726208596151555303610430036532384862800860173068687
+1677749011530966588655330008218462556189908006964342216676682876215290543872066380630113889263010720992320394875173725292986311
+6989579261987669045792589013853182107944124182584456537044269091571439065320682853599165887592383283334586801282099984394392022
+9970108676029913047954776468886108937529661369633484559390003673582932372797656385704195055160295258401674267521236080828952316
+3273802761420937902459164150004835781371893878839475301617292925707508874975102558388990001315786419341804043737604037226331752
+6423865093791333509337877707981916567162340796885934470115945789596479789320653277617641131277451340371426117129794514423620761
+7417609321834214164793102707841568625675868448913528641242723253295495191476269874558175687931888576975179732585669568870748778
+5922089337143793314961512325922930026645734559888635155138481555659443901618808201784727019382947895019140665125084159195324704
+2832300412363246058905063308416630201890917641050411420603351067801736891124820850891397186056454796477918095532199343583413766
+3842538349880871712437577001398701888177344881522702272474861972439339253087204797211344636084653095826769076765966355059432859
+9877839498202302366738674681533509411775934456542381162185787945980551914209016996885507489310451917077029188324180322160260432
+2738878897545393488539641042595991720479279596803533846602159358145022104838297930283221202267258855473584700375502341592186375
+9062102173051107870783580788794675784912283028909776152369743147402812551267763802726764393893702046520930303504745751378996798
+1890158543698671287785156969862722836025364759849336645190863408137034806850238192071351320453303572785270717307117565718365448
+7734822410504169526033583218346170435610106103279145679136488844339942839493180608845290017442034674025577300763459944350044123
+6105040904995754702216898271414142776115817083443246834852579568391309141621714380298793479424942862844759389997283360409266478
+8207744090633188685115276563756960203356370566871533095111186389044186232441179082078908516925531610020829064403059153715127765
+4543411669625489070844963508370766554494552051662899693726257799474616282059274838670819153036396550543481066774790569529843561
+6679799651036598201198464287278166599830430479287605906552407498711145045497296895091710143423667516678729308766311555682391918
+9060618446032966067396024483927774799271013972963401931215359008050857228820472502367068320857075813753280582206475097498167537
+1091834892775689353192772704190529392359261014072163618697328287354942394830079331974933337512857161868992496906607708010073398
+5364177554337994653512816619520240821994073186844625407311661314696382001907220045017648487411581430791143507856735567122196867
+0716761726451434192525856251744493844256079661428358229774069510316066898590543756088198375973992063361152435222465923662351366
+0043075513893517349925411233398957648025096112448548886678072991181902374596438596256297098774636238148028169588473828501924259
+3228516645884143195864667466124866845099402543607000135666586926382976262509368071827459582454935921975303881150829096536404067
+4761157693052962556888050028734514069905365690844215214316263823173976897101122538440327270223709317772895230031391498145736860
+6385041084622772519780334652630409495229736116311103527030831268982936563366735822928512879378203876837625284271193343076105495
+8825229991999801614347782438381474867852878074358430022437396713162807802543161593009219312576950358519990247724194904234397934
+7703801976947027234960802861233790319790676821468496141323682139060568458559647230530529267618724263639883376817372167884440632
+1726382143017323548108870010820096752312836426102452450577004449101845698867822824844060001600494219691513701486376765683162295
+8567344046439933818792026021934172754782928648841755910876641284145941585066904498876784179002951113808421135227067381608911653
+2236981696764483162752804813037353468784452076739585261632267090804876266610444767882886160729217192498345880705115733282372008
+1313046830998564657547840785183730714291004250275503590948256987454019097344722968276149211207582987088443854985798581722550023
+9063006406664758572850022859344148370428972822517076773683529207252067208935050546823673576957790680951020623419459032466629849
+7938928170423206022080881849589066531884975323736816185913375521669990715327020849225286810140422793741838143465182856377816749
+1265756842388175742586708059491362377918488379984875832030848543287918941984050070389106581268802594158962582407355351035627049
+5900221712437059899622129468224343840497771816212975521659975058333318690798732737341876177817630804815720469182652538833483463
+5823081639915099173836211725045578069819187508359785075471465778986260818861591546963352470179514396250583548650281488440780418
+7451048170517299540822354367273854496577812259623792325601325690996083083112151683648900535783537568629739368276233311118065909
+9084734714613092289461178939653038690130944168935857129538400432419569476969252314501208058863985767404598559353985694589773895
+6277214607560240011967714168838143750302367595949536752213657372427124984199709048837186130780108450270594932950252051594320147
+3499572321088417920853211811454866152496225537457554175697449661675274675801653044218258736968600625898775131530277707042339508
+9914225219653958408220404955503421597988800462882509224240059485399789816322467527449242209991095322026817971575335077154317985
+5278081500892846628897442768350495212681297210154604830667333056587120720522354514329460517681155334733974540010110756237411297
+8210591237075811936724693019310304435150990235368637778807792760313222154371335709089813727563208995319466715986861635780866968
+7932415587435911762210037637958044637519791039364219987373646146500303943912999127265553435145017969397164413915816752545161718
+5633226031400350789184112011648210881013020831437183038308240362781644283374155015679893305443987813011631237184023671550613020
+5811978080228290171238069706605813947244025818423549831774560590994763911374360626408512454006214897383037052649605527910939842
+1578662832737601740265954708879993575835470810729170613732770615041114798158887175252200232752097837948350852301754510131346245
+6068409444406865116594371496646576550470605636603063539678037419994055698404550683594340710909264161990867009969259182486360989
+3207255402572128867597708386762297362519921843080894171603067736003753278183424031926979188196805787920726466251458690002582913
+5008569364534625206093594865389861974491057988729642501378201086357626134901180260883065306275795854872408871966970358994916566
+5260870280380960692056382943423819321600456629197713258529958092905135072192290151897612011642141070383635146934909632500071674
+5103943101344555719687493820066438065019249811470335254469779344109290667032018362593087359223818942995619770011635033602760781
+6090182191502983738438010896590866621707943859659299906860770756177151013807688207972939771298998138528654622092955429850905653
+1626336772125369872523005387925612023085181385255260458074393235131647700974860337649978590067937668268507156384372177447503498
+0983088220975640726485831380650348574527016263360984693517646111104451963030529155545125362875373684368744288268392996464031787
+1886577864886560438915496753180364296870396016073972814584707172757602216484353054194841318491639088652070784986581587056423963
+5791295955798452846006486957884980659241458306340044696019455166134558465794056766142717707049752847050948964499027310212291201
+3920118159051788842792018209898781792646763214510193250573669914454162275192491103856842226701566784572791940951044194717542411
+5568425247114245514540844570366702834465456557122445652286286614869534230920871827766118797945440453053831301603663599611151007
+9132285049335898106348530191639824752961756612096827245060794650887002292087021431444313048295402370831165699527783501924024187
+9094264576555332744996979181892440388769625070877328456545115444598432716233979462060670021904359658071557042696819752714761359
+2624335032983933790947468174067700780434730280286305837296068262033116687738482347338258135450536831314508366201724139587815922
+8450751384747855334597310320588125802084226440657572189418133991724784364158225409421748567123411489197359560319327166452150553
+0217315146965805878176534045386582646736519057669936823885725039838691917663928104666774688631639185290691596050519297245051431
+7940957013433199012061114563562278128253591876081307949974283942244584406336676182042124767131849195077146222822951756668914757
+6589005956437167623060683298552386150740712051896264556502825752701728084586373026820140301271827258402697782005508526864025995
+3287288894211530920495178421618385358928209601522908652144815977173646436635300032777312309529559530424309089857544514218168330
+6097483328468004536631471410495796391660358670051698715076410248502303660016161800128810231929174703618080502422800241933644130
+2956392224013095847029227680428083425620941588942686433369479814315411693725173853101111802188051631515982053459377355277916857
+3065681935968907368748287973480293783213808382487086015879418794067438804225330554229750223350574245985145312570124344685276455
+3489772935059313564818602631010215526615299221297140830316899208960430528821219213991899112889288129943720176337014173173174332
+4169981630658215328566362976636435099613640630157506404256612156966851420692144492745499377619802506248375541742742014068421649
+3723697831339666759125999969874386488250045997138226100381868783065151573396084764792101954730971063666073382268822664370648202
+7695739092394145422409597895972497681500338948172798211529024633083754418602669479252615594701113082363308526566375385313538692
+0362024243582700927996091721261779876357892824920462321831613846936511858949877169168914710103805138231321626700946199996026230
+0910370398336603134902288593437904852970471827636244578441003561376156126397047213862430430449454667576391124197185148345471598
+5028346423876572027639326365391106837855425740087158529449602646500698308039624506892347711322718143846562617911464289132024496
+9181010776426759091535139982513243227866023899159123168014651495554175929065144279128447458894513674919834462361991122972799428
+6472902683846165829490192503189706567753176937559527683694767361120216602239730653948099377610225798683453077405631209096231256
+0512986051426035486790488833906991553793296020140460296126591780195814787329857676072922129878562425136025882880600984983973989
+8577540121631192413042201337007929873227061283325668352988181356692287167551269236062168964313569524237889901244379824573640154
+5738145734013901847027973765976787682776812683421111101939034836663608749968365412229382487929512185391212964474327857768911300
+7562207836356806317921677823535902895646261255973726228824124734902468677105214682457780953879753523764199156291556619449942205
+6685144408630396033374384521831023348395708816803320958823787110609396335187767019703187308157675845831700883961350733812554544
+7576609828782901349340272529157644117188745883108516505970478068227119245704450471362770646680973620118556831550370068906691429
+7387998131808587529731801781598911046784196725282943998624870759033897379214694560999940160160935915403688360574784745832951209
+6248576464881189569842693329569180599977760906738941622134746107827192298531798906163755685774369390363347404463590563452485459
+0534570888244129725519284614466994594106901806409139995601464274045789187815608635654309801136434736637205014712781222746921224
+7852721958335248170761829133326246797700730414740667697834509581576475365734827900004460335634027879413672459976734498386195835
+5088370360545200433735093090688791665393907039059272593032100436084501418577206986549399579720624028466951070544585214365207165
+6435187129368614449937580538296933531792687165143536181239511296901417188887649499928950174527974591005214327286330726199831884
+5864261175041853165789209708620714822361777843032399821785843235985913827357647540975103877312914819841724359018056154229990484
+1936832320986190570216413377747783409617074645446275675504398782817281167330026961325947267465552277788937638823143961712338389
+6643014994016028760819796829700070956205113377466899907953033114796754643995517690305975245695734383895488045495784881027449542
+9277149772110266765516542199009389979979428729803481968242094114554310414335680714665255584623073310801300516821617747378223514
+5122582985363185134103472499467534154970594419472963412571152321765481331992341844237099548533622925469977982035402603376599366
+5702039170472823969912601643296899307773750835106819267275831078282467998094066465029472821615682366477091470622470049719032042
+0671010358945492991105729283517652015315441687350701252921272273957729883415005085140318681745681298665587818639399209287652478
+8504952151973256765543113775190946452315557877268395630007206112950274261280515123602637574614066439170518948486082023049534264
+8318785147359309244073883391968368385030412213804815219561275632927036049996919071912768810313118985299449822580618372563128123
+5447965794084022881336224721150430474622954063445132529997642171980649882452452874371660709010271333178089011623650142945593513
+7498570392070031176556263724838104407401975655807188803601068318852915004571680712468602581133705435004279673319305506280782318
+4235251770160613000830130983063100984485301111420207302571915861863284245935054969687285090784775829404258632032504825073887582
+6407248272722201582954889873840796724288126199508498948167917317499903480984445960848498060154084891463403285778107348687889003
+4953941330396268815099409977237615027521463257528034758197037642240947224961515275989640733601052280398818164960445717239008728
+4426630124553142687273205330644281511721380282097626819427510520776002629092574526215543555846304555626987349130475830717662512
+2679622415503744585776560549326024439456730222065789254179516934309405880579097989297964155354764447981652276792153719461894070
+6549452078295195952851972101892868752466073329081552637836554870868329745518970415001754631788228704301414087107528862687179382
+3095714010946058367115405111675588241660359378724218257897889232511664785827286570897205547229279697287663245465265895194075831
+9805465298621739062011152177896594580714703932025865262409510756369094551491315344002976208292437754134178483455044310999687172
+5635853083465443752399385809613532628000929554168679920157180193163062291041706935484519604033746044464716659982230583915172977
+1397085494342438160066950214161726216316797535747161972858218528442291370670389809452231490128596440810108729216233152926963393
+8718938957831579949398261083744948669476176529513240710990560722588644755296402086806852345746538236347718030640062631744819555
+9204989031916871283227517942830744003831314993547893753197955379403077174291901637842637655437310798500528596483721526174221178
+4510621681082500438705444746385938892179962383128718253236867948364044872547102979732643922151263657382171953178711857903512864
+3434625913079139632847162412927858083774910063803492872036606235419074389757800463882617655159555904544646003283714069095719127
+9422478480758793975004764634088848124200701219293815383644557399151474644429876593122326476162568364525117348282565684006439054
+6415412788931044743766779624337137193856769272687596658353208728053926044570228051289974744446738511898266628888688489033821326
+3857187055764486798882511807937125159502970249818799519647825055901143034107396715341111836431533491237288074873324479254847609
+1944275217447109672414805304798039892872048551668309961639053276921203694927946551682999672834794575568139407200344761188832584
+9228691574818073805866351085919567356330517627511140717776424135867621344167516969731782408297076690641510925488519425339786231
+2831239904815704920016412032913992948413502229392159186483640311971384616648328934218616172408437024641339341534952850417631408
+7800709599423404547224077175920136421077429331304204846667623312748910375272177983791546978316206296185604509872479031731294077
+6784795879386865023891006814459422181459242147354385223330262696056730516247499993593952360113613078289229711721789291466201911
+1558378948527819137236700414103122090944390583763494240148255786716027072401897565958932034145583789267171948650451004479200278
+5903365269957297061267790413012843976619330012086443873201405355132327717135407147467813950090532723390786355726062359803253439
+7629287528827946090011668159293077488731123501345393936384022425933097863996545653037874008416991412735073016080615679561676815
+3237960418959875052085168366152912866396485668534444686608623522780325138572281373258421046475238324527598957994900036953588632
+9883457218912143598750744649289916045155230666253998012127292069605955397882251577278616463161982956480851083203582599294132885
+8739605725967415654345383552272209454198363876790394143551885453633595477692847087747048445889713841117432214889427740276964122
+1808274594398149686259653460592417452536265711085053636183889817336547379067581749366999937190487929782077243956107305394452893
+2858306534503555758138192142342374976569912519114070071304001216131565171144485590883323767986065555672710513575942087665489357
+4757258115582473299797872077008431880804766429204591994348523186470015406253571125582684142251809933836340635261386229168816736
+9918555292750664784762306372865895993392873092492120139178044227677315162874458415577767229742354738329991177067335396671747156
+9915416169565774505455198608946138326580556663002878103141442158950284935423931276623631554768708518659417736110868144091121408
+7485024844800932215930566743200643612646843426043824587026297306446562930746643938917961270550045568670866510426684185886721448
+4920398501344484751530060228048138752162844188260697740262204586350188489261031255952257367650241279996726021255197979400713310
+0983903945365766675649828378701431579004857069167244696371192650313930100887222144395396003002837274898192175630515559492616368
+3277569441388072350944394279081011821982637576381780324461779633187405677617459795408379063310477462661505822241372624056397980
+2796195339856562934096874382820282192099707799004934067504550995736513197478848274092619553245513516215920528915358178045259427
+3947135872153511247151284668940911981933985156149720562664695031030349744372110088157223178406720212021960705751648342245477823
+8276198303392861443910819050105767637970397653898744484200995946877348235373325786715347188697829025445506211703973576651655150
+5882576032689008918318143363475006909501115410116941599853261283394744451901101910507633092078494500214632287815925595536310673
+7269241743888980922214944937348603959760552838607959592411748713582006971089673926445144319837129979120595791416170081356544964
+3311215693514569183444297282757452024106434743342415838798070572517431245405339373780763180400593713529558089381582197573125752
+4556878108283717136754864320383151773421100605854818531410424407658443836201366417280243912680383714161438889747985913112617159
+3825283938152818066103999819485641639048153915591788440799327104545750772861261496085802570014233362502408220258846139854490942
+3543037705426699624325696485612282411023745859388735341967646420985563945181345313960301854453402790876180716518598169356488497
+0055015399759018591540911328290609447855851641187622864276870240973176403939507548117764594583218172186919643238977138111158956
+2302146157347717928300258596580246250649908644352652697865369736710811431250945078622499892640698932203651495464626034751579299
+0465216581077322245370388400939469195489616593652097640401043603078806904801413336072374703228412879808024013691780444525050754
+9151727760868811886689437563229171390965138504950138407176506255752456724326383897323049258585289255126700265024238726662681731
+0098281899254404044904741984338800905867702052389334861534065540083641450439874866038625038945827791603161398328731872690722059
+6264530562489216043969280034408943083142765136686187837798682491792210809601751533837187815038112873969767271421029102693650921
+7670518311894906730059859298650685509520663627502700465860614043829130684092155123515969024766529965326820247830045239762876384
+1971827918374425559499103800305418434180845901819771222995898394549615763182780848478726307902754377493105414864115497763562067
+7293146824231836764324358936471102982745003549454252992884038807314576844595566006507289403671236553892547396334547842381936455
+3707012658412106034610065750021436552038057251146149724375405389299956024255098042568008242870114719254029045709055991603654930
+4543749521242879802728408392725236169206369176046813175364511678612424177154836269263324760122983569594445005273913013269664551
+5817700093174352547416009939112502133121085536020612539401905269863944981266637678387919942591042471679114800424206674615903746
+9928390417067700668674925186060124842260894166668581468768675095262594932684909013159566891337437296287921942274275342136808279
+1720526807320641693668140417766107453595978158154018754776221360462162393984770342801365549647871062173743896063916005240392253
+5161802386530577435326894842370519298812054283209695964545050386222673476579184628919106024296128426895608065795872894836272477
+9269809290510364760281346041981538977140734635535715877861564862122154561230471413453427434440292536928348809500100637413855174
+0657501300841813074935854851050163894991818276164751987873048063138250805404584707419292446697964047248725308217946641983844311
+8063478785147013188508380911686106501438761736788881545360437305874844044022285005421389985126661063912349587081288388003345466
+5080385912620164034274035663131591931589292314684519240800453976434478145811035864455399019210261903984106215732682395895799522
+0939020059406813121907073513079575778716665344964094359764782266431575550874973231091097656538411338304404129653958312868999842
+6732798933518323978985303323091966916070134400750942228988862433672654847071015762525448860254590537863809085645618465872667306
+0427846766351683194895724811056690695837239230026578986973494357639196637007765612283664140977141629336513743191474504552821790
+3228155682944358310924291228796943417467684350283874136741330013804595358442242749651649995689037646356343539795964269040555905
+6826145487746532059740843858150338835296508366342272235981293613561407683050389559856243442342524690245207486156018191382164551
+1327436225221742602074234993619036983345996345216008664910823535986496447271949044534929738194453356131648251656209560053354614
+0407290886807276555505472513777566509192309345071661761386510676177956004136233159240180697853305064135526857625954524710679122
+1431829687708285619275876929673787963838663779016128696006658789855078135858492072768308764926825429711165034052613724177837083
+7028553048202580189681827868563421125284289066186493489485470631057243002992982744971998313406439308961352814738730662842546474
+1661580089658576037549874036611720164076275368701553799369961428692585978010787204558502174932891500734632543309652429899761996
+9575856899639421670892327891209797029282817824375074240277705275435359082312316792956844954585652271368228646822716619012170165
+4690146795978834583378953218274128128954879679834962721495470431115747652300230454490265247933455376976025418712883919785265770
+4032584676449148273007032590154174755542691092611500872882432669889260868344191769763590664159630537010368972815582431630162563
+5692592732110530293190433213941741940871216528267789341138499704212959459631375151781937020467215223500973204249438057106028338
+1541214818072382006149334712979978351719934230083959861254175062060206728245934867359880240685020444293227864055618527079589472
+1439159705776204064690488345048299759772753492079024651663143703086754589449249599931908249754660757813918172727140178033198709
+7752381183500066741893133463291861429042158260704598873907314527361438231014952758222297919601552459311683576335125432073345960
+4158788096315630807867178963280856579732177587633674289101034755608242832707107748491269005626588055241208204418618388578035469
+1184416032139115028602210049000593619116279959516862765906011705138739437332038056873961010636018153261556031158803924660448426
+9834587809319862013631879808865489908412831755556199315250744409755028410760389172898604230817719091796600511778684843691064279
+7878372956127669698977302339079670592653146391325443980293253311254734925614678750486528888944734310378404782150993544089766813
+4482271911480681906845899905802627519765113355182171607609262740960268207890619067150293516596923655844247586174848972864721468
+9552003526630991149245651109495761934587784128507108647124483752936558263106644305431230364441437558819641682185001628863763328
+9406159315820904843204929487522677107941937076263988953382649335050929875295580457118791755887589396355358703932935557257606830
+2969493527901243167542109903168828628101917337300403325039813279857934939104326409957807201457446262732489661524241158979368142
+1833967145487476098973136162241392322964264292952490319901422154921305200229075272133864200487657774340560812039475075659326308
+1445298822625141627089594319278576573094647719202883678449230305616300998398218250958603519589651710614887336894157702428315107
+8911019753589361230572967964751571906635823516517521975275494263948066958905939807605210390275340148405377313480598158489558111
+3183749609096747980513864052412964607501407465024842349303716927046134047076464086834827581454812880653390898896534483223922702
+2047220404370553586495348686661844320582343653984119122227275984849504305399708851775077220602618170548438073982557547603633042
+5484875538490583169391720574953649919139069950121342298729189319935008363006908499817188567294646844902804708973781249800855552
+7421001424990409022663446235185073936721530809635245828159482916215742480785440259606637437758227633658889520747280770098045723
+6510075506635860479703887783619213078585799368504850589990946726994909109916359460180863720392604659818835051505356439580781411
+0959165291367850253561235537386721365762207442766902579631829064237987397582522884081947056330594794737026301952693630585102680
+6267281924773054128920399667616892395906931391070201721710734680164804934661829697133693962106573047827000567454860592220102084
+6351225785373403775734572811446819619019190839393144125015360556285521375890386016901082233720031340998488590003458019399286006
+8086983669350678861956334882898616321436714400384547300867927315159417274826609618496301870293049853960758679069277021904136960
+9865037759852510085988938641077600576537641357106366728530348981390205491195956901092388717027996104357442748303975082427786786
+7507248774842522159480897459767378325396763974897420116495369220388118224704985677597657612836164641593242643705906198310715923
+6020323897854469493762019753971728667497338537420217765895884555350482562903234559598367966289598307357713584270039680501758042
+2970682482901424731104641663111768757582340710358846705532647449734646971482108058532929343635001949578504462729212526976463810
+8406644630764947233594179128313043631264609165757699872474368034583055609364865453910940072958562666156078109884350362008700655
+9106501316131398908994689175684333822574784889714347654697727209736986308940910431037486363365667132654371414795819563310659169
+0137910472839714679161637852622472509459014895991142745425159229935069751019575455036034662579025492228994125955644298201357138
+2263663590472781654218931217059804728469684174302359039764853349702219977113201315914188584584955078222068657185984247622363558
+5695450824338155861977114741562006985207639935376048162114526556989656274727076392276059583216303897816482298413238883403403632
+0038975862485843345228895776545691226502347548540923009663654944132545600827380276828701039586345737400863528654887451057233197
+1285772332269416234665537910079978608222632602148452508934499816027147308767944385913555512454637610386856292966968437445496548
+1261330191618765210009782014085845073559775965093415001665110717532374517158996315004359428915981278340620344383170562473911188
+0755483943667647640579099438554263999127548734337936583257964438443463208543269429173892355146856191237124938489437234962714824
+9129303544439064208938552091032859116474732583566245269345387009587018850752964356086348467165770868170114265169858965115946288
+7279622065007376862875602615836848329672073134886504804366938182665036461895999032293214820132094992897811456738921945565996030
+4834236494451378286976564913106384851412866607459667235230175488097172277734513000370973157558689076209485032473704000163914074
+2906852713508769108670361019771730001144071549164484831831379004788411810506441972725735257048988599402331202363984166872400551
+4374843284474261559922201408952633150671870157517305411040726961843624607898601648184347808307024923212656070285299487288795732
+8117441033938778257340076295628604371272466046790715921004843853378457388333862596453687093388500288301007959254642621709441228
+8336419205482595246714478040728678515920231077940527413442313540990859460129785367310524821300597125039005330560255760446207185
+3407569957745240672748410048085824476146107644741791845367520753456514888607145322239479922742610070735465164422006326154369011
+8894279996606564122245246476739025836636961740221798143384506169709797876615015522415620193119156094455114077417058486277270353
+7131151035004395224877087554662361771017971918239145723682405673667071436258453271309611849685373102636336093172827546720740657
+8432145665345782054212385521456100690288045272048653500410117161030682916822394178179943934653293870095835416016828701651397729
+9807379993673315841883406823522043062628694861759093682354411179777001696451399181533177926653740164108712792568617753057780749
+7552198060883514609633356358462724322863739238474217533806217264897669042731651388657558396154686026363774639912794923252267503
+6291771443785740732590982981719905524567339994411151615939323485160260431350712239547320702908777027534814334898810771281406391
+8383725943909858701756050979518960102350055348726092344362770497395426060226252186716626586574811491995835598427931237638307288
+8507265667315900242180544608612147833573934012185340789193936346356941286917069481442515796977733286907179390046007293777378415
+8688298391307343027481331662068268845813946664921272848764804887244314914603468930763919183778517730411504413547554154855526591
+5310568546507610904043747230819248926074837842921381365456929822505503792963441504203788828448597610860322974517666735027993699
+8190512204618058514563016675739391233696406975567198996502543146118326981238682542313301537034074950744994938638623004424018628
+5962797353210542352910227068452267455627736914233254078275501019026029219977380762852165264848013890176220808626487330453830607
+1392715231741123546207682784414187261145744424815836598165304144212321073536110482416294352751979189695534837507189501132643925
+9547196873348778230662094351866444409683500705986806451682346762409749401895555972393170493498341109191510645940668680160665767
+9096955810744288162025152776265225979561511052982298941267330985571152782374720461772752985049704669084322641186449467889515212
+4360617959299125510229120098324080014685874269740158186892010379118371918256414709312045505595343772662619039003425826619680875
+8242651081630156918805572079983037638369031262141838260427869758050055377235638965872717517504788429694521145838583513263909672
+4433259455372438105974775408627724880736064277338137893108385178827104479149305047828800826485922049778207824411348676510055718
+8718825984885049258859271868511156347573558547616835487996237695354831720772501296121171500663173314753159506044722718279173640
+2709996430110563394535123371054969016136174141380219513450493806426805948941155396288218826477132071568170532718023856256400877
+4412955918580719390710872526700485018418160226844433869987075876676044792011973789419662798626013873183203506118837233134120481
+8772819562426148199715932002776622117594716096791960417797687467419822085071157480539482033047913473604918965910085487367720357
+4625085282706988812822930138218466374524023159847349699030998731244290316248877616127354994943514784160430249591960166158827428
+3012297335233487487686932791672504848939891571342804916267615897166810277253170819233520663757428230248104405100538854660927429
+9123919446207336590235297840044149569787830675448852079217813254125078565940555357151112153929694801251132171203795549941163920
+7476175369012980559938118310990110840174599144325883878065361105628152837782089093135806082805172562067617245231771061838879589
+4768469919871257284902195592516344833223851928691778696654759047583702848545509080899254152913598427216007302226235522358460750
+5223927757227044947866784478462919350895723643402842384138354740120256079056226884847266693352002580953694527348195695223607106
+4705073558122375415417200921965563405533347843275197814453910296613637292816403322858277400213988846375567124674868467361795016
+4745728385156852832029629080429064757351207656991841817680115495315482039644479548944488439788311653187692817074819840714497361
+5386314847182104599263810424039609228765878994123179215715094367283327303020988006589792974721368333841513658700314945433634456
+3685020221252259142980926069027074077129168059113331677771782227727933843623094566219277157186574916058687802285827552124321505
+0794558617931775588320039074320252238014802597836590634824227249703483529574186006183975509386000848443692647358501225142361167
+3942679708028160995866607265771564423203677879968679929985370044267348240320617033379072586756373490054605230219409903866795469
+7536599276764983130315949383875187945686502994166320326189211280377933687730984141460802381512939077916932152569652666724046409
+0292377825630966235158683241512971091944539929600065707699283877623772501033680549048220288927590692487589517712276010516389098
+4141777627623117777410741182897322646935774432337593489702909715834793849902052358894916963594941828827118210427424755222982593
+0263099400776234259640984881940007947968250580544744304077736076557953616095573458814306253535718606350692981623255928091096507
+0588327094996262431505059042095661828596107333578122924612340170790916991622052806671333685104366780235136494027277232872825498
+1523246308282008538061408160202517775966824053244715248653671495274650673682535042749033828795099010214859776685551489176975506
+5811209762314534687747281829159103097186141033482266881873367741901377849867980657673782571505747169485443159028925476795003998
+963436785863456565690613348237130676523955561372248056220702510606833697646989872355666869136182759934340379879840576201228LAST
diff --git a/external_imported/cpp-httplib/test/www/dir/meson.build b/external_imported/cpp-httplib/test/www/dir/meson.build
index 8339b6361..e88ec79fb 100644
--- a/external_imported/cpp-httplib/test/www/dir/meson.build
+++ b/external_imported/cpp-httplib/test/www/dir/meson.build
@@ -5,3 +5,4 @@
 configure_file(input: 'index.html', output: 'index.html', copy: true)
 configure_file(input: 'test.abcde', output: 'test.abcde', copy: true)
 configure_file(input: 'test.html',  output: 'test.html',  copy: true)
+configure_file(input: '1MB.txt',    output: '1MB.txt',    copy: true)
diff --git a/external_imported/json/.circleci/config.yml b/external_imported/json/.circleci/config.yml
deleted file mode 100644
index 82e509840..000000000
--- a/external_imported/json/.circleci/config.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-version: 2
-jobs:
-  build_stable:
-    docker:
-      - image: debian:stretch
-
-    steps:
-      - checkout
-
-      - run:
-          name: Install required tools
-          command: 'apt-get update && apt-get install -y gcc g++ git cmake'
-      - run:
-          name: Run CMake
-          command: 'mkdir build ; cd build ; cmake .. -DJSON_BuildTests=On'
-      - run:
-          name: Compile
-          command: 'cmake --build build'
-      - run:
-          name: Execute test suite
-          command: 'cd build ; ctest --output-on-failure -j 2'
-
-  build_bleeding_edge:
-    docker:
-      - image: archlinux
-
-    steps:
-      - checkout
-
-      - run:
-          name: Install required tools
-          command: 'pacman -Sy --noconfirm base base-devel gcc git cmake'
-      - run:
-          name: Run CMake
-          command: 'mkdir build ; cd build ; cmake .. -DJSON_BuildTests=On'
-      - run:
-          name: Compile
-          command: 'cmake --build build'
-      - run:
-          name: Execute test suite
-          command: 'cd build ; ctest --output-on-failure -j 2'
-
-workflows:
-  version: 2
-  build_and_test_all:
-    jobs:
-      - build_stable:
-          filters:
-            branches:
-              ignore:
-                gh-pages
-      - build_bleeding_edge:
-          filters:
-            branches:
-              ignore:
-                gh-pages
diff --git a/external_imported/json/.cirrus.yml b/external_imported/json/.cirrus.yml
new file mode 100644
index 000000000..be6331506
--- /dev/null
+++ b/external_imported/json/.cirrus.yml
@@ -0,0 +1,17 @@
+arm_container:
+  image: gcc:latest
+
+check_task:
+  check_script:
+  - wget https://github.com/Kitware/CMake/releases/download/v3.20.2/cmake-3.20.2.tar.gz
+  - tar xfz cmake-3.20.2.tar.gz
+  - cd cmake-3.20.2
+  - ./configure
+  - make cmake ctest -j4
+  - cd ..
+  - mkdir build
+  - cd build
+  - ../cmake-3.20.2/bin/cmake .. -DJSON_FastTests=ON
+  - make -j4
+  - cd tests
+  - ../../cmake-3.20.2/bin/ctest -j4
diff --git a/external_imported/json/.clang-tidy b/external_imported/json/.clang-tidy
index 046d84f87..339360b08 100644
--- a/external_imported/json/.clang-tidy
+++ b/external_imported/json/.clang-tidy
@@ -1,23 +1,65 @@
 Checks: '*,
+         -altera-id-dependent-backward-branch,
+         -altera-struct-pack-align,
+         -altera-unroll-loops,
+         -android-cloexec-fopen,
+         -bugprone-easily-swappable-parameters,
+         -cert-err58-cpp,
+         -concurrency-mt-unsafe,
+         -cppcoreguidelines-avoid-const-or-ref-data-members,
+         -cppcoreguidelines-avoid-do-while,
          -cppcoreguidelines-avoid-goto,
          -cppcoreguidelines-avoid-magic-numbers,
+         -cppcoreguidelines-avoid-non-const-global-variables,
          -cppcoreguidelines-macro-usage,
+         -cppcoreguidelines-pro-bounds-array-to-pointer-decay,
+         -cppcoreguidelines-pro-bounds-constant-array-index,
+         -cppcoreguidelines-pro-bounds-pointer-arithmetic,
+         -cppcoreguidelines-pro-type-reinterpret-cast,
+         -cppcoreguidelines-pro-type-union-access,
+         -cppcoreguidelines-rvalue-reference-param-not-moved,
+         -cppcoreguidelines-virtual-class-destructor,
          -fuchsia-default-arguments-calls,
          -fuchsia-default-arguments-declarations,
          -fuchsia-overloaded-operator,
          -google-explicit-constructor,
+         -google-readability-function-size,
+         -google-runtime-int,
          -google-runtime-references,
          -hicpp-avoid-goto,
          -hicpp-explicit-conversions,
+         -hicpp-function-size,
          -hicpp-no-array-decay,
+         -hicpp-no-assembler,
+         -hicpp-signed-bitwise,
          -hicpp-uppercase-literal-suffix,
          -llvm-header-guard,
          -llvm-include-order,
+         -llvmlibc-*,
+         -misc-use-anonymous-namespace,
+         -misc-confusable-identifiers,
+         -misc-include-cleaner,
+         -misc-no-recursion,
          -misc-non-private-member-variables-in-classes,
+         -modernize-concat-nested-namespaces,
+         -modernize-type-traits,
+         -modernize-use-constraints,
+         -modernize-use-nodiscard,
          -modernize-use-trailing-return-type,
+         -performance-enum-size,
+         -readability-function-cognitive-complexity,
+         -readability-function-size,
+         -readability-identifier-length,
          -readability-magic-numbers,
+         -readability-redundant-access-specifiers,
+         -readability-simplify-boolean-expr,
          -readability-uppercase-literal-suffix'
 
 CheckOptions:
   - key: hicpp-special-member-functions.AllowSoleDefaultDtor
     value: 1
+
+WarningsAsErrors: '*'
+
+#HeaderFilterRegex: '.*nlohmann.*'
+HeaderFilterRegex: '.*hpp$'
diff --git a/external_imported/json/.github/CODEOWNERS b/external_imported/json/.github/CODEOWNERS
index 4d5ee0440..e1e1040fc 100644
--- a/external_imported/json/.github/CODEOWNERS
+++ b/external_imported/json/.github/CODEOWNERS
@@ -1,5 +1,5 @@
-# JSON for Modern C++ has been originally written by Niels Lohmann.
-# Since 2013 over 140 contributors have helped to improve the library.
+# JSON for Modern C++ was originally written by Niels Lohmann.
+# Since 2013, over 250 contributors have helped to improve the library.
 # This CODEOWNERS file is only to make sure that @nlohmann is requested
 # for a code review in case of a pull request.
 
diff --git a/external_imported/json/CODE_OF_CONDUCT.md b/external_imported/json/.github/CODE_OF_CONDUCT.md
similarity index 100%
rename from external_imported/json/CODE_OF_CONDUCT.md
rename to external_imported/json/.github/CODE_OF_CONDUCT.md
diff --git a/external_imported/json/.github/CONTRIBUTING.md b/external_imported/json/.github/CONTRIBUTING.md
index 7f12d5070..4d33c67bf 100644
--- a/external_imported/json/.github/CONTRIBUTING.md
+++ b/external_imported/json/.github/CONTRIBUTING.md
@@ -22,17 +22,17 @@ Clearly describe the issue:
 - If you propose a change or addition, try to give an **example** how the improved code could look like or how to use it.
 - If you found a compilation error, please tell us which **compiler** (version and operating system) you used and paste the (relevant part of) the error messages to the ticket.
 
-Please stick to the provided issue templates ([bug report](https://github.com/nlohmann/json/blob/develop/.github/ISSUE_TEMPLATE/Bug_report.md), [feature request](https://github.com/nlohmann/json/blob/develop/.github/ISSUE_TEMPLATE/Feature_request.md), or [question](https://github.com/nlohmann/json/blob/develop/.github/ISSUE_TEMPLATE/question.md)) if possible.
+Please stick to the provided issue template ([bug report](https://github.com/nlohmann/json/blob/develop/.github/ISSUE_TEMPLATE/bug.yml) if possible. For questions, feature or support requests, please [open a discussion](https://github.com/nlohmann/json/discussions/new).
 
 ## Files to change
 
-:exclamation: Before you make any changes, note the single-header file [`single_include/nlohmann/json.hpp`](https://github.com/nlohmann/json/blob/develop/single_include/nlohmann/json.hpp) is **generated** from the source files in the [`include/nlohmann` directory](https://github.com/nlohmann/json/tree/develop/include/nlohmann). Please **do not** edit file `single_include/nlohmann/json.hpp` directly, but change the `include/nlohmann` sources and regenerate file `single_include/nlohmann/json.hpp` by executing `make amalgamate`.
+:exclamation: Before you make any changes, note the single-header files [`single_include/nlohmann/json.hpp`](https://github.com/nlohmann/json/blob/develop/single_include/nlohmann/json.hpp) and [`single_include/nlohmann/json_fwd.hpp`](https://github.com/nlohmann/json/blob/develop/single_include/nlohmann/json_fwd.hpp) are **generated** from the source files in the [`include/nlohmann` directory](https://github.com/nlohmann/json/tree/develop/include/nlohmann). Please **do not** edit the files `single_include/nlohmann/json.hpp` and `single_include/nlohmann/json_fwd.hpp` directly, but change the `include/nlohmann` sources and regenerate the files by executing `make amalgamate`.
 
 To make changes, you need to edit the following files:
 
-1. [`include/nlohmann/*`](https://github.com/nlohmann/json/tree/develop/include/nlohmann) - These files are the sources of the library. Before testing or creating a pull request, execute `make amalgamate` to regenerate `single_include/nlohmann/json.hpp`.
+1. [`include/nlohmann/*`](https://github.com/nlohmann/json/tree/develop/include/nlohmann) - These files are the sources of the library. Before testing or creating a pull request, execute `make amalgamate` to regenerate `single_include/nlohmann/json.hpp` and `single_include/nlohmann/json_fwd.hpp`.
 
-2. [`test/src/unit-*.cpp`](https://github.com/nlohmann/json/tree/develop/test/src) - These files contain the [doctest](https://github.com/onqtam/doctest) unit tests which currently cover [100 %](https://coveralls.io/github/nlohmann/json) of the library's code.
+2. [`tests/src/unit-*.cpp`](https://github.com/nlohmann/json/tree/develop/tests/src) - These files contain the [doctest](https://github.com/onqtam/doctest) unit tests which currently cover [100 %](https://coveralls.io/github/nlohmann/json) of the library's code.  Before creating a pull request, execute `make pretty` to make sure that the style is correct, as this will be checked by the CI. 
 
    If you add or change a feature, please also add a unit test to this file. The unit tests can be compiled and executed with
 
@@ -55,10 +55,10 @@ To make changes, you need to edit the following files:
 ## Please don't
 
 - The C++11 support varies between different **compilers** and versions. Please note the [list of supported compilers](https://github.com/nlohmann/json/blob/master/README.md#supported-compilers). Some compilers like GCC 4.7 (and earlier), Clang 3.3 (and earlier), or Microsoft Visual Studio 13.0 and earlier are known not to work due to missing or incomplete C++11 support. Please refrain from proposing changes that work around these compiler's limitations with `#ifdef`s or other means.
-- Specifically, I am aware of compilation problems with **Microsoft Visual Studio** (there even is an [issue label](https://github.com/nlohmann/json/issues?utf8=✓&q=label%3A%22visual+studio%22+) for these kind of bugs). I understand that even in 2016, complete C++11 support isn't there yet. But please also understand that I do not want to drop features or uglify the code just to make Microsoft's sub-standard compiler happy. The past has shown that there are ways to express the functionality such that the code compiles with the most recent MSVC - unfortunately, this is not the main objective of the project.
+- Specifically, I am aware of compilation problems with **Microsoft Visual Studio** (there even is an [issue label](https://github.com/nlohmann/json/issues?utf8=✓&q=label%3A%22visual+studio%22+) for this kind of bug). I understand that even in 2016, complete C++11 support isn't there yet. But please also understand that I do not want to drop features or uglify the code just to make Microsoft's sub-standard compiler happy. The past has shown that there are ways to express the functionality such that the code compiles with the most recent MSVC - unfortunately, this is not the main objective of the project.
 - Please refrain from proposing changes that would **break [JSON](https://json.org) conformance**. If you propose a conformant extension of JSON to be supported by the library, please motivate this extension.
   - We shall not extend the library to **support comments**. There is quite some [controversy](https://www.reddit.com/r/programming/comments/4v6chu/why_json_doesnt_support_comments_douglas_crockford/) around this topic, and there were quite some [issues](https://github.com/nlohmann/json/issues/376) on this. We believe that JSON is fine without comments.
-  - We do not preserve the **insertion order of object elements**. The [JSON standard](https://tools.ietf.org/html/rfc7159.html) defines objects as "an unordered collection of zero or more name/value pairs". To this end, this library does not preserve insertion order of name/value pairs. (In fact, keys will be traversed in alphabetical order as `std::map` with `std::less` is used by default.) Note this behavior conforms to the standard, and we shall not change it to any other order. If you do want to preserve the insertion order, you can specialize the object type with containers like [`tsl::ordered_map`](https://github.com/Tessil/ordered-map) or [`nlohmann::fifo_map`](https://github.com/nlohmann/fifo_map).
+  - We do not preserve the **insertion order of object elements**. The [JSON standard](https://tools.ietf.org/html/rfc8259.html) defines objects as "an unordered collection of zero or more name/value pairs". To this end, this library does not preserve insertion order of name/value pairs. (In fact, keys will be traversed in alphabetical order as `std::map` with `std::less` is used by default.) Note this behavior conforms to the standard, and we shall not change it to any other order. If you do want to preserve the insertion order, you can specialize the object type with containers like [`tsl::ordered_map`](https://github.com/Tessil/ordered-map) or [`nlohmann::fifo_map`](https://github.com/nlohmann/fifo_map).
 
 - Please do not open pull requests that address **multiple issues**.
 
diff --git a/external_imported/json/.github/ISSUE_TEMPLATE/Bug_report.md b/external_imported/json/.github/ISSUE_TEMPLATE/Bug_report.md
deleted file mode 100644
index 6dfa7d2d8..000000000
--- a/external_imported/json/.github/ISSUE_TEMPLATE/Bug_report.md
+++ /dev/null
@@ -1,57 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: 'kind: bug'
-assignees: ''
-
----
-
-<!-- Provide a concise summary of the issue in the title above. -->
-
-#### What is the issue you have?
-
-<!-- Provide a detailed introduction to the issue itself, and why you consider it to be a bug. -->
-<!-- If possible, be specific and add stack traces, error messages, etc. Avoid vague terms like "crash" or "doesn't work". -->
-
-#### Please describe the steps to reproduce the issue.
-
-<!-- Provide a link to a live example, or an unambiguous set of steps to -->
-<!-- reproduce this bug. Include code to reproduce, if relevant -->
-
-1.
-2.
-3.
-
-#### Can you provide a small but working code example?
-
-<!-- Please understand that we cannot analyze and debug large code bases. -->
-
-#### What is the expected behavior?
-
-<!-- Tell us what should happen -->
-
-#### And what is the actual behavior instead?
-
-<!-- Tell us what happens instead. -->
-
-#### Which compiler and operating system are you using?
-
-<!-- Include as many relevant details about the environment you experienced the bug in. -->
-<!-- Make sure you use a supported compiler, see https://github.com/nlohmann/json#supported-compilers. -->
-
-- Compiler: ___
-- Operating system: ___
-
-#### Which version of the library did you use?
-
-<!-- Please add an `x` to the respective line. -->
-
-- [ ] latest release version 3.9.1
-- [ ] other release - please state the version: ___
-- [ ] the `develop` branch
-
-#### If you experience a compilation error: can you [compile and run the unit tests](https://github.com/nlohmann/json#execute-unit-tests)?
-
-- [ ] yes
-- [ ] no - please copy/paste the error message below
diff --git a/external_imported/json/.github/ISSUE_TEMPLATE/bug.yaml b/external_imported/json/.github/ISSUE_TEMPLATE/bug.yaml
new file mode 100644
index 000000000..f7acdf18b
--- /dev/null
+++ b/external_imported/json/.github/ISSUE_TEMPLATE/bug.yaml
@@ -0,0 +1,93 @@
+name: Bug Report
+description: Create a bug report
+labels:
+  - 'kind: bug'
+body:
+  - type: markdown
+    attributes:
+      value: >
+        Thanks for taking the time to fill out this bug report!
+        
+        Make sure you give it a short and specific **title** so that the report
+        is searchable and uniquely identifiable.
+        
+        Note that this form is for bug reports only. Please
+        [open a discussion](https://github.com/nlohmann/json/discussions/new)
+        for questions, feature requests, or support requests
+  - type: textarea
+    id: summary
+    attributes:
+      label: Description
+      description: >
+        Please provide an abstract description of the issue to the developers,
+        and why you consider it to be a bug. Please include any specific links
+        to the documentation, JSON specification, or code.
+    validations:
+      required: true
+  - type: textarea
+    id: reproduce
+    attributes:
+      label: Reproduction steps
+      description: >
+        How do you trigger the bug? Please walk us through step by step. Be as
+        specific as possible.
+    validations:
+      required: true
+  - type: textarea
+    id: results
+    attributes:
+      label: Expected vs. actual results
+      description: >
+        Please describe what you expected to happen after the steps above and
+        what actually happened.
+    validations:
+      required: true
+  - type: textarea
+    id: code
+    attributes:
+      label: Minimal code example
+      description: >
+        If possible, provide a small and self-contained example that triggers
+        the bug. Please understand that we cannot analyze and debug large code
+        bases. Please do not paste screenshots here.
+      render: Shell
+  - type: textarea
+    id: output
+    attributes:
+      label: Error messages
+      description: >
+        Please provide any kind of error output (compilation errors, exception
+        messages, stack traces, etc.) which can help to diagnose the error.
+      render: Shell
+  - type: input
+    id: compiler
+    attributes:
+      label: Compiler and operating system
+      description: >
+        On which operating systems and compilers have you observed the issue?
+        Include as many relevant details about the environment you experienced
+        the bug in. Make sure you use a
+        [supported compiler](https://github.com/nlohmann/json#supported-compilers).
+    validations:
+      required: true
+  - type: input
+    id: version
+    attributes:
+      label: Library version
+      description: >
+        Which version of the library did you use? If it is a released version,
+        please enter the version number (e.g., 3.11.3). Otherwise, please enter
+        the commit hash. If you got the library from another source as the
+        GitHub repository (e.g., via a package manager), please also state
+        this.
+    validations:
+      required: true
+  - type: checkboxes
+    id: validation
+    attributes:
+      label: Validation
+      description: >
+        Please check these additional steps:
+      options:
+        - label: The bug also occurs if the latest version from the [`develop`](https://github.com/nlohmann/json/tree/develop) branch is used.
+        - label: I can successfully [compile and run the unit tests](https://github.com/nlohmann/json#execute-unit-tests).
diff --git a/external_imported/json/.github/PULL_REQUEST_TEMPLATE.md b/external_imported/json/.github/PULL_REQUEST_TEMPLATE.md
index 5f303a6e0..c9c7cb793 100644
--- a/external_imported/json/.github/PULL_REQUEST_TEMPLATE.md
+++ b/external_imported/json/.github/PULL_REQUEST_TEMPLATE.md
@@ -9,11 +9,11 @@ Read the [Contribution Guidelines](https://github.com/nlohmann/json/blob/develop
 - [ ]  Changes are described in the pull request, or an [existing issue is referenced](https://github.com/nlohmann/json/issues).
 - [ ]  The test suite [compiles and runs](https://github.com/nlohmann/json/blob/develop/README.md#execute-unit-tests) without error.
 - [ ]  [Code coverage](https://coveralls.io/github/nlohmann/json) is 100%. Test cases can be added by editing the [test suite](https://github.com/nlohmann/json/tree/develop/test/src).
-- [ ]  The source code is amalgamated; that is, after making changes to the sources in the `include/nlohmann` directory, run `make amalgamate` to create the single-header file `single_include/nlohmann/json.hpp`. The whole process is described [here](https://github.com/nlohmann/json/blob/develop/.github/CONTRIBUTING.md#files-to-change).
+- [ ]  The source code is amalgamated; that is, after making changes to the sources in the `include/nlohmann` directory, run `make amalgamate` to create the single-header files `single_include/nlohmann/json.hpp` and `single_include/nlohmann/json_fwd.hpp`. The whole process is described [here](https://github.com/nlohmann/json/blob/develop/.github/CONTRIBUTING.md#files-to-change).
 
 ## Please don't
 
 - The C++11 support varies between different **compilers** and versions. Please note the [list of supported compilers](https://github.com/nlohmann/json/blob/master/README.md#supported-compilers). Some compilers like GCC 4.7 (and earlier), Clang 3.3 (and earlier), or Microsoft Visual Studio 13.0 and earlier are known not to work due to missing or incomplete C++11 support. Please refrain from proposing changes that work around these compiler's limitations with `#ifdef`s or other means.
-- Specifically, I am aware of compilation problems with **Microsoft Visual Studio** (there even is an [issue label](https://github.com/nlohmann/json/issues?utf8=✓&q=label%3A%22visual+studio%22+) for these kind of bugs). I understand that even in 2016, complete C++11 support isn't there yet. But please also understand that I do not want to drop features or uglify the code just to make Microsoft's sub-standard compiler happy. The past has shown that there are ways to express the functionality such that the code compiles with the most recent MSVC - unfortunately, this is not the main objective of the project.
+- Specifically, I am aware of compilation problems with **Microsoft Visual Studio** (there even is an [issue label](https://github.com/nlohmann/json/issues?utf8=✓&q=label%3A%22visual+studio%22+) for this kind of bug). I understand that even in 2016, complete C++11 support isn't there yet. But please also understand that I do not want to drop features or uglify the code just to make Microsoft's sub-standard compiler happy. The past has shown that there are ways to express the functionality such that the code compiles with the most recent MSVC - unfortunately, this is not the main objective of the project.
 - Please refrain from proposing changes that would **break [JSON](https://json.org) conformance**. If you propose a conformant extension of JSON to be supported by the library, please motivate this extension.
 - Please do not open pull requests that address **multiple issues**.
diff --git a/external_imported/json/.github/external_ci/appveyor.yml b/external_imported/json/.github/external_ci/appveyor.yml
new file mode 100644
index 000000000..126ed99b3
--- /dev/null
+++ b/external_imported/json/.github/external_ci/appveyor.yml
@@ -0,0 +1,91 @@
+version: '{build}'
+
+# only build PRs and commits to develop branch
+# (see https://help.appveyor.com/discussions/questions/55079-two-builds-per-commit-to-pull-request)
+branches:
+  only:
+    - develop
+
+only_commits:
+  files:
+    - .github/external_ci/appveyor.yml
+    - cmake/
+    - include/
+    - tests/
+    - CMakeLists.txt
+
+environment:
+  matrix:
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      configuration: Debug
+      platform: x86
+      CXX_FLAGS: "/W4 /WX"
+      CMAKE_OPTIONS: ""
+      GENERATOR: Visual Studio 14 2015
+
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      configuration: Release
+      platform: x86
+      CXX_FLAGS: "/W4 /WX"
+      CMAKE_OPTIONS: ""
+      GENERATOR: Visual Studio 14 2015
+
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      configuration: Release
+      platform: x86
+      name: with_win_header
+      CXX_FLAGS: "/W4 /WX"
+      CMAKE_OPTIONS: ""
+      GENERATOR: Visual Studio 14 2015
+
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      configuration: Release
+      platform: x86
+      CXX_FLAGS: "/permissive- /std:c++latest /utf-8 /W4 /WX"
+      CMAKE_OPTIONS: ""
+      GENERATOR: Visual Studio 15 2017
+
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      configuration: Release
+      platform: x86
+      CXX_FLAGS: "/W4 /WX"
+      CMAKE_OPTIONS: "-DJSON_ImplicitConversions=OFF"
+      GENERATOR: Visual Studio 16 2019
+
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      configuration: Release
+      platform: x64
+      CXX_FLAGS: "/W4 /WX"
+      CMAKE_OPTIONS: ""
+      GENERATOR: Visual Studio 14 2015
+
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      configuration: Release
+      platform: x64
+      CXX_FLAGS: "/permissive- /std:c++latest /Zc:__cplusplus /utf-8 /W4 /WX"
+      CMAKE_OPTIONS: ""
+      GENERATOR: Visual Studio 15 2017
+
+init:
+  - cmake --version
+  - msbuild /version
+
+install:
+  - if "%platform%"=="x86"    set GENERATOR_PLATFORM=Win32
+
+before_build:
+  # for with_win_header build, inject the inclusion of Windows.h to the single-header library
+  - ps: if ($env:name -Eq "with_win_header") { $header_path = "single_include\nlohmann\json.hpp" }
+  - ps: if ($env:name -Eq "with_win_header") { "#include <Windows.h>`n" + (Get-Content $header_path | Out-String) | Set-Content $header_path }
+  - cmake . -G "%GENERATOR%" -A "%GENERATOR_PLATFORM%" -DCMAKE_CXX_FLAGS="%CXX_FLAGS%" -DCMAKE_IGNORE_PATH="C:/Program Files/Git/usr/bin" -DJSON_BuildTests=On "%CMAKE_OPTIONS%"
+
+build_script:
+  - cmake --build . --config "%configuration%" --parallel 2
+
+test_script:
+  - if "%configuration%"=="Release" ctest -C "%configuration%" --parallel 2 --output-on-failure
+  # On Debug builds, skip test-unicode_all
+  # as it is extremely slow to run and cause
+  # occasional timeouts on AppVeyor.
+  # More info: https://github.com/nlohmann/json/pull/1570
+  - if "%configuration%"=="Debug" ctest --exclude-regex "test-unicode" -C "%configuration%" --parallel 2 --output-on-failure
diff --git a/external_imported/json/.github/labeler.yml b/external_imported/json/.github/labeler.yml
new file mode 100644
index 000000000..024d3e6da
--- /dev/null
+++ b/external_imported/json/.github/labeler.yml
@@ -0,0 +1,38 @@
+version: 1
+
+labels:
+- label: "documentation"
+  files:
+    - "README.md"
+
+- label: "documentation"
+  files:
+    - "docs/.*"
+
+- label: "tests"
+  files:
+    - "tests/.*"
+
+- label: "CMake"
+  files:
+    - ".*CMakeLists.txt"
+
+- label: "CMake"
+  files:
+    - "cmake/.*"
+
+- label: "CI"
+  files:
+    - "github/workflows/.*"
+
+- label: "CI"
+  files:
+    - "github/external_ci/.*"
+
+- label: "S"
+  size-below: 10
+- label: "M"
+  size-above: 9
+  size-below: 100
+- label: "L"
+  size-above: 100
diff --git a/external_imported/json/.github/workflows/check_amalgamation.yml b/external_imported/json/.github/workflows/check_amalgamation.yml
new file mode 100644
index 000000000..0fadb5206
--- /dev/null
+++ b/external_imported/json/.github/workflows/check_amalgamation.yml
@@ -0,0 +1,70 @@
+name: "Check amalgamation"
+
+on:
+  pull_request:
+
+permissions: read-all
+
+jobs:
+  save:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Save PR number
+        run: |
+          mkdir -p ./pr
+          echo ${{ github.event.number }} > ./pr/number
+          echo ${{ github.event.pull_request.user.login }} > ./pr/author
+      - uses: actions/upload-artifact@v2
+        with:
+          name: pr
+          path: pr/
+
+  check:
+    runs-on: ubuntu-latest
+    env:
+      MAIN_DIR: ${{ github.workspace }}/main
+      INCLUDE_DIR: ${{ github.workspace }}/main/single_include/nlohmann
+      TOOL_DIR: ${{ github.workspace }}/tools/tools/amalgamate
+      ASTYLE_FLAGS: >
+        --style=allman --indent=spaces=4 --indent-modifiers --indent-switches --indent-preproc-block
+        --indent-preproc-define --indent-col1-comments --pad-oper --pad-header --align-pointer=type
+        --align-reference=type --add-brackets --convert-tabs --close-templates --lineend=linux --preserve-date
+        --formatted
+
+    steps:
+      - name: Checkout pull request
+        uses: actions/checkout@v3
+        with:
+          path: main
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      - name: Checkout tools
+        uses: actions/checkout@v3
+        with:
+          path: tools
+          ref: develop
+
+      - name: Install astyle
+        run: |
+          sudo apt-get update
+          sudo apt-get install astyle
+
+      - name: Check amalgamation
+        run: |
+          cd $MAIN_DIR
+
+          rm -fr $INCLUDE_DIR/json.hpp~ $INCLUDE_DIR/json_fwd.hpp~
+          cp $INCLUDE_DIR/json.hpp $INCLUDE_DIR/json.hpp~
+          cp $INCLUDE_DIR/json_fwd.hpp $INCLUDE_DIR/json_fwd.hpp~
+
+          python3 $TOOL_DIR/amalgamate.py -c $TOOL_DIR/config_json.json -s .
+          python3 $TOOL_DIR/amalgamate.py -c $TOOL_DIR/config_json_fwd.json -s .
+          echo "Format (1)"
+          astyle $ASTYLE_FLAGS --suffix=none --quiet $INCLUDE_DIR/json.hpp $INCLUDE_DIR/json_fwd.hpp
+
+          diff $INCLUDE_DIR/json.hpp~ $INCLUDE_DIR/json.hpp
+          diff $INCLUDE_DIR/json_fwd.hpp~ $INCLUDE_DIR/json_fwd.hpp
+
+          astyle $ASTYLE_FLAGS $(find docs/examples include tests -type f \( -name '*.hpp' -o -name '*.cpp' -o -name '*.cu' \) -not -path 'tests/thirdparty/*' -not -path 'tests/abi/include/nlohmann/*' | sort)
+          echo Check
+          find $MAIN_DIR -name '*.orig' -exec false {} \+
diff --git a/external_imported/json/.github/workflows/cifuzz.yml b/external_imported/json/.github/workflows/cifuzz.yml
new file mode 100644
index 000000000..0fd355bce
--- /dev/null
+++ b/external_imported/json/.github/workflows/cifuzz.yml
@@ -0,0 +1,30 @@
+name: CIFuzz
+on: [pull_request]
+
+permissions:
+  contents: read
+
+jobs:
+  Fuzzing:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Build Fuzzers
+      id: build
+      uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master
+      with:
+        oss-fuzz-project-name: 'json'
+        dry-run: false
+        language: c++
+    - name: Run Fuzzers
+      uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master
+      with:
+        oss-fuzz-project-name: 'json'
+        fuzz-seconds: 300
+        dry-run: false
+        language: c++
+    - name: Upload Crash
+      uses: actions/upload-artifact@v3
+      if: failure() && steps.build.outcome == 'success'
+      with:
+        name: artifacts
+        path: ./out/artifacts
diff --git a/external_imported/json/.github/workflows/codeql-analysis.yml b/external_imported/json/.github/workflows/codeql-analysis.yml
index 5ee44a04e..93923a182 100644
--- a/external_imported/json/.github/workflows/codeql-analysis.yml
+++ b/external_imported/json/.github/workflows/codeql-analysis.yml
@@ -2,53 +2,43 @@ name: "Code scanning - action"
 
 on:
   push:
-    branches: [develop, ]
+    branches:
+      - develop
+      - master
+      - release/*
   pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [develop]
   schedule:
     - cron: '0 19 * * 1'
+  workflow_dispatch:
+  
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
+  cancel-in-progress: true
 
 jobs:
   CodeQL-Build:
 
     runs-on: ubuntu-latest
+    permissions:
+      security-events: write
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
-      with:
-        # We must fetch at least the immediate parents so that if this is
-        # a pull request then we can checkout the head.
-        fetch-depth: 2
-
-    # If this run was triggered by a pull request event, then checkout
-    # the head of the pull request instead of the merge commit.
-    - run: git checkout HEAD^2
-      if: ${{ github.event_name == 'pull_request' }}
+      uses: actions/checkout@v3
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      # Override language selection by uncommenting this and choosing your languages
-      # with:
-      #   languages: go, javascript, csharp, python, cpp, java
+      uses: github/codeql-action/init@v2
+      with:
+        languages: c-cpp
 
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
-
-    # ℹ� Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # �� If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-
-    #- run: |
-    #   make bootstrap
-    #   make release
+      uses: github/codeql-action/autobuild@v2
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2
diff --git a/external_imported/json/.github/workflows/comment_check_amalgamation.yml b/external_imported/json/.github/workflows/comment_check_amalgamation.yml
new file mode 100644
index 000000000..2ab5ebb97
--- /dev/null
+++ b/external_imported/json/.github/workflows/comment_check_amalgamation.yml
@@ -0,0 +1,75 @@
+name: Comment Check Amalgamation
+on:
+  workflow_run:
+    workflows: ["Check amalgamation"]
+    types:
+      - completed
+
+permissions: {}
+
+jobs:
+  comment:
+    if: ${{ github.event.workflow_run.conclusion == 'failure' }}
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      actions: read
+      issues: read
+      pull-requests: write
+    steps:
+      - name: 'Download artifact'
+        uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0
+        with:
+          script: |
+            var artifacts = await github.rest.actions.listWorkflowRunArtifacts({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               run_id: ${{github.event.workflow_run.id }},
+            });
+            var matchArtifact = artifacts.data.artifacts.filter((artifact) => {
+              return artifact.name == "pr"
+            })[0];
+            var download = await github.rest.actions.downloadArtifact({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               artifact_id: matchArtifact.id,
+               archive_format: 'zip',
+            });
+            var fs = require('fs');
+            fs.writeFileSync('${{github.workspace}}/pr.zip', Buffer.from(download.data));
+      - run: unzip pr.zip
+
+      - name: 'Comment on PR'
+        uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            var fs = require('fs');
+            const author = fs.readFileSync('./author')
+            const issue_number = Number(fs.readFileSync('./number'));
+            const opts = github.rest.issues.listForRepo.endpoint.merge({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              creator: author,
+              state: 'all'
+            })
+            let first = true
+            const issues = await github.paginate(opts)
+            for (const issue of issues) {
+              if (issue.number === issue_number) {
+                continue
+              }
+              if (issue.pull_request) {
+                first = false
+                break
+              }
+            }
+            await github.rest.issues.createComment({
+              issue_number: issue_number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: '## 🔴 Amalgamation check failed! 🔴\nThe source code has not been amalgamated.'
+                    + (first ? ' @' + author + ' Please read and follow the [Contribution Guidelines]'
+                               + '(https://github.com/nlohmann/json/blob/develop/.github/CONTRIBUTING.md#files-to-change).'
+                             : '')
+              })
diff --git a/external_imported/json/.github/workflows/labeler.yml b/external_imported/json/.github/workflows/labeler.yml
new file mode 100644
index 000000000..11925e1af
--- /dev/null
+++ b/external_imported/json/.github/workflows/labeler.yml
@@ -0,0 +1,20 @@
+name: "Pull Request Labeler"
+
+on:
+  pull_request_target:
+    types: [opened, synchronize]
+
+permissions: {}
+
+jobs:
+  label:
+    permissions:
+      contents: read
+      pull-requests: write
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: srvaroa/labeler@master
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/external_imported/json/.github/workflows/macos.yml b/external_imported/json/.github/workflows/macos.yml
index 5b178ad05..9ac1fe3fa 100644
--- a/external_imported/json/.github/workflows/macos.yml
+++ b/external_imported/json/.github/workflows/macos.yml
@@ -1,17 +1,67 @@
 name: macOS
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - develop
+      - master
+      - release/*
+  pull_request:
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
+  cancel-in-progress: true
 
 jobs:
-  build:
+  xcode_1:
+    runs-on: macos-11
+    strategy:
+      matrix:
+        xcode: ['11.7', '12.4', '12.5.1', '13.0']
+    env:
+      DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Run CMake
+        run: cmake -S . -B build -D CMAKE_BUILD_TYPE=Debug -DJSON_BuildTests=On -DJSON_FastTests=ON
+      - name: Build
+        run: cmake --build build --parallel 10
+      - name: Test
+        run: cd build ; ctest -j 10 --output-on-failure
+
+  xcode_2:
+    runs-on: macos-12
+    strategy:
+      matrix:
+        xcode: ['13.1', '13.2.1', '13.3.1', '13.4.1', '14.0', '14.0.1', '14.1']
+    env:
+      DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Run CMake
+        run: cmake -S . -B build -D CMAKE_BUILD_TYPE=Debug -DJSON_BuildTests=On -DJSON_FastTests=ON
+      - name: Build
+        run: cmake --build build --parallel 10
+      - name: Test
+        run: cd build ; ctest -j 10 --output-on-failure
 
+  xcode_standards:
     runs-on: macos-latest
+    strategy:
+      matrix:
+        standard: [11, 14, 17, 20, 23]
 
     steps:
-    - uses: actions/checkout@v1
-    - name: cmake
-      run: cmake -S . -B build -D CMAKE_BUILD_TYPE=Debug -DJSON_BuildTests=On
-    - name: build
-      run: cmake --build build --parallel 10
-    - name: test
-      run: cd build ; ctest -j 10 --output-on-failure
+      - uses: actions/checkout@v3
+      - name: Run CMake
+        run: cmake -S . -B build -D CMAKE_BUILD_TYPE=Debug -DJSON_BuildTests=On -DJSON_TestStandards=${{ matrix.standard }}
+      - name: Build
+        run: cmake --build build --parallel 10
+      - name: Test
+        run: cd build ; ctest -j 10 --output-on-failure
diff --git a/external_imported/json/.github/workflows/publish_documentation.yml b/external_imported/json/.github/workflows/publish_documentation.yml
new file mode 100644
index 000000000..5a32d13a4
--- /dev/null
+++ b/external_imported/json/.github/workflows/publish_documentation.yml
@@ -0,0 +1,41 @@
+name: Publish documentation
+
+# publish the documentation on every merge to develop branch
+on:
+  push:
+    branches:
+      - develop
+    paths:
+      - docs/mkdocs/**
+      - docs/examples/**
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+# we don't want to have concurrent jobs, and we don't want to cancel running jobs to avoid broken publications
+concurrency:
+  group: documentation
+  cancel-in-progress: false
+
+jobs:
+  publish_documentation:
+    if: github.repository == 'nlohmann/json'
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Install and update PlantUML
+        run: sudo apt-get update ; sudo apt-get install -y plantuml
+
+      - name: Install virtual environment
+        run: make install_venv -C docs/mkdocs
+
+      - name: Build documentation
+        run: make build -C docs/mkdocs
+
+      - name: Deploy documentation
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./docs/mkdocs/site
diff --git a/external_imported/json/.github/workflows/ubuntu.yml b/external_imported/json/.github/workflows/ubuntu.yml
index d6b654077..35fb9573c 100644
--- a/external_imported/json/.github/workflows/ubuntu.yml
+++ b/external_imported/json/.github/workflows/ubuntu.yml
@@ -1,64 +1,248 @@
 name: Ubuntu
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - develop
+      - master
+      - release/*
+  pull_request:
+  workflow_dispatch:
+  
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
+  cancel-in-progress: true
 
 jobs:
-  gcc_build:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: install_gcc
-      run: |
-           sudo apt update
-           sudo apt install gcc-10 g++-10
-      shell: bash
-    - name: cmake
-      run: cmake -S . -B build -D CMAKE_BUILD_TYPE=Debug -DJSON_BuildTests=On
-      env:
-        CC:   gcc-10
-        CXX:  g++-10
-    - name: build
-      run: cmake --build build --parallel 10
-    - name: test
-      run: cd build ; ctest -j 10 --output-on-failure
-
-  clang_build:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: install_gcc
-      run: |
-           sudo apt update
-           sudo apt install clang-10
-      shell: bash
-    - name: cmake
-      run: cmake -S . -B build -D CMAKE_BUILD_TYPE=Debug -DJSON_BuildTests=On
-      env:
-        CC:   clang-10
-        CXX:  clang++-10
-    - name: build
-      run: cmake --build build --parallel 10
-    - name: test
-      run: cd build ; ctest -j 10 --output-on-failure
-
-  clang_build_cxx20:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: install_gcc
-      run: |
-           sudo apt update
-           sudo apt install clang-10
-      shell: bash
-    - name: cmake
-      run: cmake -S . -B build -D CMAKE_BUILD_TYPE=Debug -DJSON_BuildTests=On -DCMAKE_CXX_STANDARD=20 -DCMAKE_CXX_STANDARD_REQUIRED=ON
-      env:
-        CC:   clang-10
-        CXX:  clang++-10
-    - name: build
-      run: cmake --build build --parallel 10
-    - name: test
-      run: cd build ; ctest -j 10 --output-on-failure
+  ci_test_clang:
+    runs-on: ubuntu-latest
+    container: silkeh/clang:dev
+    steps:
+      - name: Install git and unzip
+        run: apt-get update ; apt-get install -y git unzip
+      - uses: actions/checkout@v3
+      - name: Get latest CMake and ninja
+        uses: lukka/get-cmake@v3.27.7
+      - name: Run CMake
+        run: cmake -S . -B build -DJSON_CI=On
+      - name: Build
+        run: cmake --build build --target ci_test_clang
+
+  ci_test_gcc:
+    runs-on: ubuntu-latest
+    container: ghcr.io/nlohmann/json-ci:v2.4.0
+    steps:
+      - uses: actions/checkout@v3
+      - name: Run CMake
+        run: cmake -S . -B build -DJSON_CI=On
+      - name: Build
+        run: cmake --build build --target ci_test_gcc
+
+  ci_static_analysis:
+    runs-on: ubuntu-latest
+    container: ghcr.io/nlohmann/json-ci:v2.4.0
+    strategy:
+      matrix:
+        target: [ci_cppcheck, ci_test_valgrind, ci_test_amalgamation, ci_test_single_header, ci_single_binaries, ci_infer]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Run CMake
+        run: cmake -S . -B build -DJSON_CI=On
+      - name: Build
+        run: cmake --build build --target ${{ matrix.target }}
+
+  ci_static_analysis_ubuntu:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        target: [ci_cpplint, ci_reproducible_tests, ci_non_git_tests, ci_offline_testdata]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Get latest CMake and ninja
+        uses: lukka/get-cmake@v3.27.7
+      - name: Run CMake
+        run: cmake -S . -B build -DJSON_CI=On
+      - name: Build
+        run: cmake --build build --target ${{ matrix.target }}
+
+  ci_static_analysis_clang:
+    runs-on: ubuntu-latest
+    container: silkeh/clang:dev
+    strategy:
+      matrix:
+        target: [ci_clang_tidy, ci_test_clang_sanitizer, ci_clang_analyze]
+    steps:
+      - name: Install git, clang-tools, and unzip
+        run: apt-get update ; apt-get install -y git clang-tools unzip
+      - uses: actions/checkout@v3
+      - name: Get latest CMake and ninja
+        uses: lukka/get-cmake@v3.27.7
+      - name: Run CMake
+        run: cmake -S . -B build -DJSON_CI=On
+      - name: Build
+        run: cmake --build build --target ${{ matrix.target }}
+
+  ci_cmake_options:
+    runs-on: ubuntu-latest
+    container: ubuntu:focal
+    strategy:
+      matrix:
+        target: [ci_cmake_flags, ci_test_diagnostics, ci_test_noexceptions, ci_test_noimplicitconversions, ci_test_legacycomparison, ci_test_noglobaludls]
+    steps:
+      - name: Install build-essential
+        run: apt-get update ; apt-get install -y build-essential unzip wget git
+      - uses: actions/checkout@v3
+      - name: Get latest CMake and ninja
+        uses: lukka/get-cmake@v3.27.7
+      - name: Run CMake
+        run: cmake -S . -B build -DJSON_CI=On
+      - name: Build
+        run: cmake --build build --target ${{ matrix.target }}
+
+  ci_test_coverage:
+    runs-on: ubuntu-latest
+    container: ghcr.io/nlohmann/json-ci:v2.4.0
+    permissions:
+      contents: read
+      checks: write
+    steps:
+      - uses: actions/checkout@v3
+      - name: Run CMake
+        run: cmake -S . -B build -DJSON_CI=On
+      - name: Build
+        run: cmake --build build --target ci_test_coverage
+      - name: Archive coverage report
+        uses: actions/upload-artifact@v3
+        with:
+          name: code-coverage-report
+          path: ${{ github.workspace }}/build/html
+      - name: Publish report to Coveralls
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          path-to-lcov: ${{ github.workspace }}/build/json.info.filtered.noexcept
+
+  ci_test_compilers_gcc:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        compiler: ['4', '5', '6', '7', '8', '9', '10', '11', '12', 'latest']
+    container: gcc:${{ matrix.compiler }}
+    steps:
+      - uses: actions/checkout@v3
+      - name: Get latest CMake and ninja
+        uses: lukka/get-cmake@v3.27.7
+      - name: Run CMake
+        run: cmake -S . -B build -DJSON_CI=On
+      - name: Build
+        run: cmake --build build --target ci_test_compiler_default
+
+  ci_test_compilers_clang:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        compiler: ['3.5', '3.6', '3.7', '3.8', '3.9', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15-bullseye', 'latest']
+    container: silkeh/clang:${{ matrix.compiler }}
+    steps:
+      - name: Install unzip and git
+        run: apt-get update ; apt-get install -y unzip git
+      - uses: actions/checkout@v3
+      - name: Get latest CMake and ninja
+        uses: lukka/get-cmake@v3.27.7
+      - name: Set env FORCE_STDCPPFS_FLAG for clang 7 / 8 / 9 / 10
+        run: echo "JSON_FORCED_GLOBAL_COMPILE_OPTIONS=-DJSON_HAS_FILESYSTEM=0;-DJSON_HAS_EXPERIMENTAL_FILESYSTEM=0" >> "$GITHUB_ENV"
+        if: ${{ matrix.compiler == '7' || matrix.compiler == '8' || matrix.compiler == '9' || matrix.compiler == '10' }}
+      - name: Run CMake
+        run: cmake -S . -B build -DJSON_CI=On
+      - name: Build
+        run: cmake --build build --target ci_test_compiler_default
+
+  ci_test_compilers:
+    runs-on: ubuntu-latest
+    container: ghcr.io/nlohmann/json-ci:v2.4.0
+    strategy:
+      matrix:
+        compiler: [g++-4.8]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Run CMake
+        run: cmake -S . -B build -DJSON_CI=On
+      - name: Build
+        run: cmake --build build --target ci_test_compiler_${{ matrix.compiler }}
+
+  ci_test_standards_gcc:
+    runs-on: ubuntu-latest
+    container: ghcr.io/nlohmann/json-ci:v2.4.0
+    strategy:
+      matrix:
+        standard: [11, 14, 17, 20, 23]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Run CMake
+        run: cmake -S . -B build -DJSON_CI=On
+      - name: Build
+        run: cmake --build build --target ci_test_gcc_cxx${{ matrix.standard }}
+
+  ci_test_standards_clang:
+    runs-on: ubuntu-latest
+    container: silkeh/clang:latest
+    strategy:
+      matrix:
+        standard: [11, 14, 17, 20, 23]
+    steps:
+      - name: Install git and unzip
+        run: apt-get update ; apt-get install -y git unzip
+      - uses: actions/checkout@v3
+      - name: Get latest CMake and ninja
+        uses: lukka/get-cmake@v3.27.7
+      - name: Run CMake
+        run: cmake -S . -B build -DJSON_CI=On
+      - name: Build
+        run: cmake --build build --target ci_test_clang_cxx${{ matrix.standard }}
+
+  ci_cuda_example:
+    runs-on: ubuntu-latest
+    container: ghcr.io/nlohmann/json-ci:v2.4.0
+    steps:
+      - uses: actions/checkout@v3
+      - name: Run CMake
+        run: cmake -S . -B build -DJSON_CI=On
+      - name: Build
+        run: cmake --build build --target ci_cuda_example
+
+  ci_icpc:
+    runs-on: ubuntu-latest
+    container: ghcr.io/nlohmann/json-ci:v2.2.0
+    steps:
+      - uses: actions/checkout@v2
+      - name: Run CMake
+        run: cmake -S . -B build -DJSON_CI=On
+      - name: Build
+        run: |
+          . /opt/intel/oneapi/setvars.sh
+          cmake --build build --target ci_icpc
+
+  ci_reuse_compliance:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v3
+      - name: Install REUSE tool
+        run:  python -m pip install reuse
+      - name: Run REUSE lint
+        run: reuse lint
+
+  ci_test_documentation:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        target: [ci_test_examples, ci_test_api_documentation]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Run CMake
+        run: cmake -S . -B build -DJSON_CI=On
+      - name: Build
+        run: cmake --build build --target ${{ matrix.target }}
diff --git a/external_imported/json/.github/workflows/windows.yml b/external_imported/json/.github/workflows/windows.yml
index 1778c9418..7ddd4be25 100644
--- a/external_imported/json/.github/workflows/windows.yml
+++ b/external_imported/json/.github/workflows/windows.yml
@@ -1,54 +1,134 @@
 name: Windows
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - develop
+      - master
+      - release/*
+  pull_request:
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
+  cancel-in-progress: true
 
 jobs:
+  mingw:
+    runs-on: windows-2019
+    strategy:
+      matrix:
+        architecture: [x64, x86]
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up MinGW
+        uses: egor-tensin/setup-mingw@v2
+        with:
+          platform: ${{ matrix.architecture }}
+          version: 12.2.0 # https://github.com/egor-tensin/setup-mingw/issues/14
+      - name: Run CMake
+        run: cmake -S . -B build -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Debug -DJSON_BuildTests=On
+      - name: Build
+        run: cmake --build build --parallel 10
+      - name: Test
+        run: cd build ; ctest -j 10 -C Debug --output-on-failure
+
   msvc2019:
-    runs-on: windows-latest
+    runs-on: windows-2019
+    strategy:
+      matrix:
+        build_type: [Debug, Release]
+        architecture: [Win32, x64]
 
     steps:
-    - uses: actions/checkout@v1
-    - name: cmake
-      run: cmake -S . -B build -G "Visual Studio 16 2019" -D CMAKE_BUILD_TYPE=Debug -DJSON_BuildTests=On
-    - name: build
-      run: cmake --build build --parallel 10
-    - name: test
-      run: cd build ; ctest -j 10 -C Debug --exclude-regex "test-unicode" --output-on-failure
+    - uses: actions/checkout@v3
+    - name: Run CMake
+      run: cmake -S . -B build -G "Visual Studio 16 2019" -A ${{ matrix.architecture }} -DJSON_BuildTests=On -DCMAKE_CXX_FLAGS="/W4 /WX"
+      if: matrix.build_type == 'Release'
+    - name: Run CMake
+      run: cmake -S . -B build -G "Visual Studio 16 2019" -A ${{ matrix.architecture }} -DJSON_BuildTests=On -DJSON_FastTests=ON -DCMAKE_CXX_FLAGS="/W4 /WX"
+      if: matrix.build_type == 'Debug'
+    - name: Build
+      run: cmake --build build --config ${{ matrix.build_type }} --parallel 10
+    - name: Test
+      run: cd build ; ctest -j 10 -C ${{ matrix.build_type }} --output-on-failure
 
-  clang10:
-    runs-on: windows-latest
+  msvc2019_latest:
+    runs-on: windows-2019
 
     steps:
-      - uses: actions/checkout@v1
-      - name: install Clang
-        run: curl -fsSL -o LLVM10.exe https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/LLVM-10.0.0-win64.exe ; 7z x LLVM10.exe -y -o"C:/Program Files/LLVM"
-      - name: cmake
-        run: cmake -S . -B build -DCMAKE_CXX_COMPILER="C:/Program Files/LLVM/bin/clang++.exe" -G"MinGW Makefiles" -DCMAKE_BUILD_TYPE=Debug -DJSON_BuildTests=On
-      - name: build
-        run: cmake --build build --parallel 10
-      - name: test
-        run: cd build ; ctest -j 10 -C Debug --exclude-regex "test-unicode" --output-on-failure
+    - uses: actions/checkout@v3
+    - name: Run CMake
+      run: cmake -S . -B build -G "Visual Studio 16 2019" -DJSON_BuildTests=On -DCMAKE_CXX_FLAGS="/permissive- /std:c++latest /utf-8 /W4 /WX"
+    - name: Build
+      run: cmake --build build --config Release --parallel 10
+    - name: Test
+      run: cd build ; ctest -j 10 -C Release --output-on-failure
 
-  clang-cl-10-x64:
-    runs-on: windows-latest
+  msvc2022:
+    runs-on: windows-2022
+    strategy:
+      matrix:
+        build_type: [Debug, Release]
+        architecture: [Win32, x64]
 
     steps:
-      - uses: actions/checkout@v1
-      - name: cmake
-        run: cmake -S . -B build -G "Visual Studio 16 2019" -A x64 -T ClangCL -DJSON_BuildTests=On
-      - name: build
-        run: cmake --build build --config Debug --parallel 10
-      - name: test
+    - uses: actions/checkout@v3
+    - name: Run CMake
+      run: cmake -S . -B build -G "Visual Studio 17 2022" -A ${{ matrix.architecture }} -DJSON_BuildTests=On -DCMAKE_CXX_FLAGS="/W4 /WX"
+      if: matrix.build_type == 'Release'
+    - name: Run CMake
+      run: cmake -S . -B build -G "Visual Studio 17 2022" -A ${{ matrix.architecture }} -DJSON_BuildTests=On -DJSON_FastTests=ON -DCMAKE_CXX_FLAGS="/W4 /WX"
+      if: matrix.build_type == 'Debug'
+    - name: Build
+      run: cmake --build build --config ${{ matrix.build_type }} --parallel 10
+    - name: Test
+      run: cd build ; ctest -j 10 -C ${{ matrix.build_type }} --output-on-failure
+
+  msvc2022_latest:
+    runs-on: windows-2022
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Run CMake
+      run: cmake -S . -B build -G "Visual Studio 17 2022" -DJSON_BuildTests=On -DCMAKE_CXX_FLAGS="/permissive- /std:c++latest /utf-8 /W4 /WX"
+    - name: Build
+      run: cmake --build build --config Release --parallel 10
+    - name: Test
+      run: cd build ; ctest -j 10 -C Release --output-on-failure
+
+  clang:
+    runs-on: windows-2019
+    strategy:
+      matrix:
+        version: [11, 12, 13, 14, 15]
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install Clang
+        run: curl -fsSL -o LLVM${{ matrix.version }}.exe https://github.com/llvm/llvm-project/releases/download/llvmorg-${{ matrix.version }}.0.0/LLVM-${{ matrix.version }}.0.0-win64.exe ; 7z x LLVM${{ matrix.version }}.exe -y -o"C:/Program Files/LLVM"
+      - name: Run CMake
+        run: cmake -S . -B build -DCMAKE_CXX_COMPILER="C:/Program Files/LLVM/bin/clang++.exe" -G"MinGW Makefiles" -DCMAKE_BUILD_TYPE=Debug -DJSON_BuildTests=On
+      - name: Build
+        run: cmake --build build --parallel 10
+      - name: Test
         run: cd build ; ctest -j 10 -C Debug --exclude-regex "test-unicode" --output-on-failure
 
-  clang-cl-10-x86:
-    runs-on: windows-latest
+  clang-cl-11:
+    runs-on: windows-2019
+    strategy:
+      matrix:
+        architecture: [Win32, x64]
 
     steps:
-      - uses: actions/checkout@v1
-      - name: cmake
-        run: cmake -S . -B build -G "Visual Studio 16 2019" -A Win32 -T ClangCL -DJSON_BuildTests=On
-      - name: build
+      - uses: actions/checkout@v3
+      - name: Run CMake
+        run: cmake -S . -B build -G "Visual Studio 16 2019" -A ${{ matrix.architecture }} -T ClangCL -DJSON_BuildTests=On
+      - name: Build
         run: cmake --build build --config Debug --parallel 10
-      - name: test
+      - name: Test
         run: cd build ; ctest -j 10 -C Debug --exclude-regex "test-unicode" --output-on-failure
diff --git a/external_imported/json/.gitignore b/external_imported/json/.gitignore
index bf938c8ea..bfd52b4c6 100644
--- a/external_imported/json/.gitignore
+++ b/external_imported/json/.gitignore
@@ -1,36 +1,44 @@
-json_unit
-json_benchmarks
-json_benchmarks_simple
-fuzz-testing
-
 *.dSYM
 *.o
 *.gcno
 *.gcda
-
-build
-build_coverage
-clang_analyze_build
-
-doc/xml
-doc/html
-me.nlohmann.json.docset
-
-benchmarks/files/numbers/*.json
+.DS_Store
 
 .wsjcpp-logs/*
 .wsjcpp/*
 
-.idea
+/.idea
 /cmake-build-*
 
-test/test-*
-/.vs
-
-doc/mkdocs/venv/
-doc/mkdocs/docs/images
-doc/mkdocs/docs/examples
-doc/mkdocs/site
-doc/mkdocs/docs/__pycache__/
-doc/xml
-/doc/docset/nlohmann_json.docset/
+# Visual Studio / Visual Studio Code
+/.vs/
+/.vscode/
+/out/
+
+# clangd cache
+/.cache/
+
+# build directories (vscode-cmake-tools, user-defined, ...)
+/build*/
+
+# fuzzers
+/tests/corpus_*
+/tests/parse_*_fuzzer
+
+# documentation
+/docs/docset/docSet.dsidx
+/docs/docset/JSON_for_Modern_C++.docset/
+/docs/docset/JSON_for_Modern_C++.tgz
+/docs/mkdocs/docs/__pycache__/
+/docs/mkdocs/docs/examples/
+/docs/mkdocs/docs/images/json.gif
+/docs/mkdocs/site/
+/docs/mkdocs/venv/
+
+# serve_header
+/localhost.pem
+/localhost-key.pem
+/serve_header.yml
+
+# Swift Package Manager build directory
+/.build
\ No newline at end of file
diff --git a/external_imported/json/.lgtm.yml b/external_imported/json/.lgtm.yml
new file mode 100644
index 000000000..b62f9fb37
--- /dev/null
+++ b/external_imported/json/.lgtm.yml
@@ -0,0 +1,4 @@
+path_classifiers:
+  thirdparty:
+    - /tools/amalgamate
+    - /tools/cpplint
diff --git a/external_imported/json/.reuse/README.md b/external_imported/json/.reuse/README.md
new file mode 100644
index 000000000..29c2b67a1
--- /dev/null
+++ b/external_imported/json/.reuse/README.md
@@ -0,0 +1,7 @@
+# REUSE Software
+
+This directory contains supporting files to make the project compliant with the REUSE specification.
+
+The root `Makefile` contains a target `reuse` that updates copyright headers and checks for compliance.
+
+See <http://reuse.software> for more information.
diff --git a/external_imported/json/.reuse/dep5 b/external_imported/json/.reuse/dep5
new file mode 100644
index 000000000..315cae923
--- /dev/null
+++ b/external_imported/json/.reuse/dep5
@@ -0,0 +1,32 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: json
+Upstream-Contact: Niels Lohmann <mail@nlohmann.me>
+Source: https://github.com/nlohmann/json
+
+Files: *
+Copyright: 2013-2022 Niels Lohmann <https://nlohmann.me>
+License: MIT
+
+Files: tests/thirdparty/doctest/*
+Copyright: 2016-2021 Viktor Kirilov
+License: MIT
+
+Files: tests/thirdparty/fifo_map/*
+Copyright: 2015-2017 Niels Lohmann
+License: MIT
+
+Files: tests/thirdparty/Fuzzer/*
+Copyright: 2003-2022, LLVM Project.
+License: Apache-2.0
+
+Files: tests/thirdparty/imapdl/*
+Copyright: 2017 Georg Sauthoff <mail@gms.tf>
+License: GPL-3.0-only
+
+Files: tools/amalgamate/*
+Copyright: 2012 Erik Edlund <erik.edlund@32767.se>
+License: BSD-3-Clause
+
+Files: tools/gdb_pretty_printer
+Copyright: 2020 Hannes Domani <https://github.com/ssbssa>
+License: MIT
diff --git a/external_imported/json/.reuse/templates/json.jinja2 b/external_imported/json/.reuse/templates/json.jinja2
new file mode 100644
index 000000000..9f7df2a39
--- /dev/null
+++ b/external_imported/json/.reuse/templates/json.jinja2
@@ -0,0 +1,11 @@
+    __ _____ _____ _____
+ __|  |   __|     |   | |  JSON for Modern C++
+|  |  |__   |  |  | | | |  version 3.11.3
+|_____|_____|_____|_|___|  https://github.com/nlohmann/json
+
+{% for copyright_line in copyright_lines %}
+{{ copyright_line }}
+{% endfor %}
+{% for expression in spdx_expressions %}
+SPDX-License-Identifier: {{ expression }}
+{% endfor %}
diff --git a/external_imported/json/.reuse/templates/json_support.jinja2 b/external_imported/json/.reuse/templates/json_support.jinja2
new file mode 100644
index 000000000..f12832cb8
--- /dev/null
+++ b/external_imported/json/.reuse/templates/json_support.jinja2
@@ -0,0 +1,11 @@
+    __ _____ _____ _____
+ __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+|  |  |__   |  |  | | | |  version 3.11.3
+|_____|_____|_____|_|___|  https://github.com/nlohmann/json
+
+{% for copyright_line in copyright_lines %}
+{{ copyright_line }}
+{% endfor %}
+{% for expression in spdx_expressions %}
+SPDX-License-Identifier: {{ expression }}
+{% endfor %}
diff --git a/external_imported/json/.travis.yml b/external_imported/json/.travis.yml
deleted file mode 100644
index f48ee1fd6..000000000
--- a/external_imported/json/.travis.yml
+++ /dev/null
@@ -1,339 +0,0 @@
-#########################
-# project configuration #
-#########################
-
-# C++ project
-language: cpp
-
-dist: trusty
-sudo: required
-group: edge
-
-
-################
-# build matrix #
-################
-
-matrix:
-  include:
-
-  # Valgrind
-  - os: linux
-    compiler: gcc
-    env:
-      - COMPILER=g++-4.9
-      - CMAKE_OPTIONS=-DJSON_Valgrind=ON
-    addons:
-      apt:
-        sources: ['ubuntu-toolchain-r-test']
-        packages: ['g++-4.9', 'valgrind', 'ninja-build']
-
-  # clang sanitizer
-  - os: linux
-    compiler: clang
-    env:
-      - COMPILER=clang++-7
-      - CMAKE_OPTIONS=-DJSON_Sanitizer=ON
-      - UBSAN_OPTIONS=print_stacktrace=1,suppressions=$(pwd)/test/src/UBSAN.supp
-    addons:
-      apt:
-        sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-7']
-        packages: ['g++-6', 'clang-7', 'ninja-build']
-    before_script:
-      - export PATH=$PATH:/usr/lib/llvm-7/bin
-
-  # cppcheck
-  - os: linux
-    compiler: gcc
-    env:
-      - COMPILER=g++-4.9
-      - SPECIAL=cppcheck
-    addons:
-      apt:
-        sources: ['ubuntu-toolchain-r-test']
-        packages: ['g++-4.9', 'cppcheck', 'ninja-build']
-    after_success:
-      - make cppcheck
-
-  # no exceptions
-  - os: linux
-    compiler: gcc
-    env:
-      - COMPILER=g++-4.9
-      - CMAKE_OPTIONS=-DJSON_NoExceptions=ON
-    addons:
-      apt:
-        sources: ['ubuntu-toolchain-r-test']
-        packages: ['g++-4.9', 'ninja-build']
-
-  # check amalgamation
-  - os: linux
-    compiler: gcc
-    env:
-      - COMPILER=g++-4.9
-      - SPECIAL=amalgamation
-      - MULTIPLE_HEADERS=ON
-    addons:
-      apt:
-        sources: ['ubuntu-toolchain-r-test']
-        packages: ['g++-4.9', 'astyle', 'ninja-build']
-    after_success:
-      - make check-amalgamation
-
-  # Coveralls (http://gronlier.fr/blog/2015/01/adding-code-coverage-to-your-c-project/)
-
-  - os: linux
-    compiler: gcc
-    dist: bionic
-    addons:
-      apt:
-        sources: ['ubuntu-toolchain-r-test']
-        packages: ['g++-7', 'ninja-build']
-    before_script:
-      - pip install --user cpp-coveralls
-    after_success:
-      - coveralls --build-root test --include include/nlohmann --gcov 'gcov-7' --gcov-options '\-lp'
-    env:
-      - COMPILER=g++-7
-      - CMAKE_OPTIONS=-DJSON_Coverage=ON
-      - MULTIPLE_HEADERS=ON
-
-  # Coverity (only for branch coverity_scan)
-
-  - os: linux
-    compiler: clang
-    before_install: echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-certificates.crt
-    addons:
-      apt:
-        sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.6']
-        packages: ['g++-6', 'clang-3.6', 'ninja-build']
-      coverity_scan:
-        project:
-          name: "nlohmann/json"
-          description: "Build submitted via Travis CI"
-        notification_email: niels.lohmann@gmail.com
-        build_command_prepend: "mkdir coverity_build ; cd coverity_build ; cmake .. ; cd .."
-        build_command: "make -C coverity_build"
-        branch_pattern: coverity_scan
-    env:
-      - SPECIAL=coverity
-      - COMPILER=clang++-3.6
-        # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
-        #   via the "travis encrypt" command using the project repo's public key
-      - secure: "m89SSgE+ASLO38rSKx7MTXK3n5NkP9bIx95jwY71YEiuFzib30PDJ/DifKnXxBjvy/AkCGztErQRk/8ZCvq+4HXozU2knEGnL/RUitvlwbhzfh2D4lmS3BvWBGS3N3NewoPBrRmdcvnT0xjOGXxtZaJ3P74TkB9GBnlz/HmKORA="
-
-  # OSX / Clang
-
-  - os: osx
-    osx_image: xcode10.2
-
-  - os: osx
-    osx_image: xcode11.2
-
-  - os: osx
-    osx_image: xcode12
-
-  - os: osx
-    osx_image: xcode12
-    env:
-      - IMPLICIT_CONVERSIONS=OFF
-
-  # Linux / GCC
-
-  - os: linux
-    compiler: gcc
-    env: COMPILER=g++-4.8
-    addons:
-      apt:
-        sources: ['ubuntu-toolchain-r-test']
-        packages: ['g++-4.8', 'ninja-build']
-
-  - os: linux
-    compiler: gcc
-    env: COMPILER=g++-4.9
-    addons:
-      apt:
-        sources: ['ubuntu-toolchain-r-test']
-        packages: ['g++-4.9', 'ninja-build']
-
-  - os: linux
-    compiler: gcc
-    env: COMPILER=g++-5
-    addons:
-      apt:
-        sources: ['ubuntu-toolchain-r-test']
-        packages: ['g++-5', 'ninja-build']
-
-  - os: linux
-    compiler: gcc
-    env: COMPILER=g++-6
-    addons:
-      apt:
-        sources: ['ubuntu-toolchain-r-test']
-        packages: ['g++-6', 'ninja-build']
-
-  - os: linux
-    compiler: gcc
-    env: COMPILER=g++-7
-    addons:
-      apt:
-        sources: ['ubuntu-toolchain-r-test']
-        packages: ['g++-7', 'ninja-build']
-
-  - os: linux
-    compiler: gcc
-    env: COMPILER=g++-8
-    addons:
-      apt:
-        sources: ['ubuntu-toolchain-r-test']
-        packages: ['g++-8', 'ninja-build']
-
-  - os: linux
-    compiler: gcc
-    env: COMPILER=g++-9
-    addons:
-      apt:
-        sources: ['ubuntu-toolchain-r-test']
-        packages: ['g++-9', 'ninja-build']
-
-  - os: linux
-    compiler: gcc
-    env:
-      - COMPILER=g++-9
-      - IMPLICIT_CONVERSIONS=OFF
-    addons:
-      apt:
-        sources: ['ubuntu-toolchain-r-test']
-        packages: ['g++-9', 'ninja-build']
-
-  - os: linux
-    compiler: gcc
-    env:
-      - COMPILER=g++-9
-      - CXX_STANDARD=17
-    addons:
-      apt:
-        sources: ['ubuntu-toolchain-r-test']
-        packages: ['g++-9', 'ninja-build']
-
-  # Linux / Clang
-
-  - os: linux
-    compiler: clang
-    env: COMPILER=clang++-3.5
-    addons:
-      apt:
-        sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5']
-        packages: ['g++-6', 'clang-3.5', 'ninja-build']
-
-  - os: linux
-    compiler: clang
-    env: COMPILER=clang++-3.6
-    addons:
-      apt:
-        sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.6']
-        packages: ['g++-6', 'clang-3.6', 'ninja-build']
-
-  - os: linux
-    compiler: clang
-    env: COMPILER=clang++-3.7
-    addons:
-      apt:
-        sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.7']
-        packages: ['g++-6', 'clang-3.7', 'ninja-build']
-
-  - os: linux
-    compiler: clang
-    env: COMPILER=clang++-3.8
-    addons:
-      apt:
-        sources: ['ubuntu-toolchain-r-test']
-        packages: ['g++-6', 'clang-3.8', 'ninja-build']
-
-  - os: linux
-    compiler: clang
-    env: COMPILER=clang++-3.9
-    addons:
-      apt:
-        sources: ['ubuntu-toolchain-r-test']
-        packages: ['g++-6', 'clang-3.9', 'ninja-build']
-
-  - os: linux
-    compiler: clang
-    env: COMPILER=clang++-4.0
-    addons:
-      apt:
-        sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-4.0']
-        packages: ['g++-6', 'clang-4.0', 'ninja-build']
-
-  - os: linux
-    compiler: clang
-    env: COMPILER=clang++-5.0
-    addons:
-      apt:
-        sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-5.0']
-        packages: ['g++-6', 'clang-5.0', 'ninja-build']
-
-  - os: linux
-    compiler: clang
-    env: COMPILER=clang++-6.0
-    addons:
-      apt:
-        sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-6.0']
-        packages: ['g++-6', 'clang-6.0', 'ninja-build']
-
-  - os: linux
-    compiler: clang
-    env: COMPILER=clang++-7
-    addons:
-      apt:
-        sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-7']
-        packages: ['g++-6', 'clang-7', 'ninja-build']
-
-  - os: linux
-    compiler: clang
-    env:
-      - COMPILER=clang++-7
-      - CXX_STANDARD=17
-    addons:
-      apt:
-        sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-7']
-        packages: ['g++-7', 'clang-7', 'ninja-build']
-
-################
-# build script #
-################
-
-script:
-  # get CMake and Ninja (only for systems with brew - macOS)
-  - |
-     if [[ (-x $(which brew)) ]]; then
-       brew update
-       brew install cmake ninja
-       brew upgrade cmake
-       cmake --version
-     fi
-
-  # make sure CXX is correctly set
-  - if [[ "${COMPILER}" != "" ]]; then export CXX=${COMPILER}; fi
-  # by default, use the single-header version
-  - if [[ "${MULTIPLE_HEADERS}" == "" ]]; then export MULTIPLE_HEADERS=OFF; fi
-  # by default, use implicit conversions
-  - if [[ "${IMPLICIT_CONVERSIONS}" == "" ]]; then export IMPLICIT_CONVERSIONS=ON; fi
-
-  # append CXX_STANDARD to CMAKE_OPTIONS if required
-  - CMAKE_OPTIONS+=${CXX_STANDARD:+ -DCMAKE_CXX_STANDARD=$CXX_STANDARD -DCMAKE_CXX_STANDARD_REQUIRED=ON}
-
-  # compile and execute unit tests
-  - mkdir -p build && cd build
-  - cmake .. ${CMAKE_OPTIONS} -DJSON_MultipleHeaders=${MULTIPLE_HEADERS} -DJSON_ImplicitConversions=${IMPLICIT_CONVERSIONS} -DJSON_BuildTests=On -GNinja && cmake --build . --config Release
-  - ctest -C Release --timeout 2700 -V -j
-  - cd ..
-
-  # check if homebrew works (only checks develop branch)   
-  - if [ `which brew` ]; then   
-    brew update ;   
-    brew tap nlohmann/json ;    
-    brew install nlohmann_json --HEAD ;    
-    brew test nlohmann_json ;    
-    fi
diff --git a/external_imported/json/BUILD.bazel b/external_imported/json/BUILD.bazel
new file mode 100644
index 000000000..15d84f16b
--- /dev/null
+++ b/external_imported/json/BUILD.bazel
@@ -0,0 +1,53 @@
+cc_library(
+    name = "json",
+    hdrs = [
+        "include/nlohmann/adl_serializer.hpp",
+        "include/nlohmann/byte_container_with_subtype.hpp",
+        "include/nlohmann/detail/abi_macros.hpp",
+        "include/nlohmann/detail/conversions/from_json.hpp",
+        "include/nlohmann/detail/conversions/to_chars.hpp",
+        "include/nlohmann/detail/conversions/to_json.hpp",
+        "include/nlohmann/detail/exceptions.hpp",
+        "include/nlohmann/detail/hash.hpp",
+        "include/nlohmann/detail/input/binary_reader.hpp",
+        "include/nlohmann/detail/input/input_adapters.hpp",
+        "include/nlohmann/detail/input/json_sax.hpp",
+        "include/nlohmann/detail/input/lexer.hpp",
+        "include/nlohmann/detail/input/parser.hpp",
+        "include/nlohmann/detail/input/position_t.hpp",
+        "include/nlohmann/detail/iterators/internal_iterator.hpp",
+        "include/nlohmann/detail/iterators/iter_impl.hpp",
+        "include/nlohmann/detail/iterators/iteration_proxy.hpp",
+        "include/nlohmann/detail/iterators/iterator_traits.hpp",
+        "include/nlohmann/detail/iterators/json_reverse_iterator.hpp",
+        "include/nlohmann/detail/iterators/primitive_iterator.hpp",
+        "include/nlohmann/detail/json_custom_base_class.hpp",
+        "include/nlohmann/detail/json_pointer.hpp",
+        "include/nlohmann/detail/json_ref.hpp",
+        "include/nlohmann/detail/macro_scope.hpp",
+        "include/nlohmann/detail/macro_unscope.hpp",
+        "include/nlohmann/detail/meta/call_std/begin.hpp",
+        "include/nlohmann/detail/meta/call_std/end.hpp",
+        "include/nlohmann/detail/meta/cpp_future.hpp",
+        "include/nlohmann/detail/meta/detected.hpp",
+        "include/nlohmann/detail/meta/identity_tag.hpp",
+        "include/nlohmann/detail/meta/is_sax.hpp",
+        "include/nlohmann/detail/meta/std_fs.hpp",
+        "include/nlohmann/detail/meta/type_traits.hpp",
+        "include/nlohmann/detail/meta/void_t.hpp",
+        "include/nlohmann/detail/output/binary_writer.hpp",
+        "include/nlohmann/detail/output/output_adapters.hpp",
+        "include/nlohmann/detail/output/serializer.hpp",
+        "include/nlohmann/detail/string_concat.hpp",
+        "include/nlohmann/detail/string_escape.hpp",
+        "include/nlohmann/detail/value_t.hpp",
+        "include/nlohmann/json.hpp",
+        "include/nlohmann/json_fwd.hpp",
+        "include/nlohmann/ordered_map.hpp",
+        "include/nlohmann/thirdparty/hedley/hedley.hpp",
+        "include/nlohmann/thirdparty/hedley/hedley_undef.hpp",
+    ],
+    includes = ["include"],
+    visibility = ["//visibility:public"],
+    alwayslink = True,
+)
diff --git a/external_imported/json/CITATION.cff b/external_imported/json/CITATION.cff
new file mode 100644
index 000000000..fd3b76713
--- /dev/null
+++ b/external_imported/json/CITATION.cff
@@ -0,0 +1,14 @@
+cff-version: 1.2.0
+message: "If you use this software, please cite it as below."
+authors:
+  - family-names: Lohmann
+    given-names: Niels
+    orcid: https://orcid.org/0000-0001-9037-795X
+    email: mail@nlohmann.me
+    website: https://nlohmann.me
+title: "JSON for Modern C++"
+version: 3.11.3
+date-released: 2023-11-28
+license: MIT
+repository-code: "https://github.com/nlohmann"
+url: https://json.nlohmann.me
diff --git a/external_imported/json/CMakeLists.txt b/external_imported/json/CMakeLists.txt
index 36f1cf705..7a49dc47e 100644
--- a/external_imported/json/CMakeLists.txt
+++ b/external_imported/json/CMakeLists.txt
@@ -1,10 +1,10 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.1...3.14)
 
 ##
 ## PROJECT
 ## name and version
 ##
-project(nlohmann_json VERSION 3.9.1 LANGUAGES CXX)
+project(nlohmann_json VERSION 3.11.3 LANGUAGES CXX)
 
 ##
 ## MAIN_PROJECT CHECK
@@ -12,13 +12,14 @@ project(nlohmann_json VERSION 3.9.1 LANGUAGES CXX)
 ##
 set(MAIN_PROJECT OFF)
 if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
-  set(MAIN_PROJECT ON)
+    set(MAIN_PROJECT ON)
 endif()
 
 ##
 ## INCLUDE
 ##
 ##
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
 include(ExternalProject)
 
 ##
@@ -30,11 +31,26 @@ if (POLICY CMP0077)
     cmake_policy(SET CMP0077 NEW)
 endif ()
 
-option(JSON_BuildTests "Build the unit tests when BUILD_TESTING is enabled." ${MAIN_PROJECT})
-option(JSON_Install "Install CMake targets during install step." ${MAIN_PROJECT})
-option(JSON_MultipleHeaders "Use non-amalgamated version of the library." OFF)
-option(JSON_ImplicitConversions "Enable implicit conversions." ON)
-option(JSON_Diagnostics "Enable better diagnostic messages." OFF)
+# VERSION_GREATER_EQUAL is not available in CMake 3.1
+if(${MAIN_PROJECT} AND (${CMAKE_VERSION} VERSION_EQUAL 3.13 OR ${CMAKE_VERSION} VERSION_GREATER 3.13))
+    set(JSON_BuildTests_INIT ON)
+else()
+    set(JSON_BuildTests_INIT OFF)
+endif()
+option(JSON_BuildTests                     "Build the unit tests when BUILD_TESTING is enabled." ${JSON_BuildTests_INIT})
+option(JSON_CI                             "Enable CI build targets." OFF)
+option(JSON_Diagnostics                    "Use extended diagnostic messages." OFF)
+option(JSON_GlobalUDLs                     "Place use-defined string literals in the global namespace." ON)
+option(JSON_ImplicitConversions            "Enable implicit conversions." ON)
+option(JSON_DisableEnumSerialization       "Disable default integer enum serialization." OFF)
+option(JSON_LegacyDiscardedValueComparison "Enable legacy discarded value comparison." OFF)
+option(JSON_Install                        "Install CMake targets during install step." ${MAIN_PROJECT})
+option(JSON_MultipleHeaders                "Use non-amalgamated version of the library." ON)
+option(JSON_SystemInclude                  "Include as system headers (skip for clang-tidy)." OFF)
+
+if (JSON_CI)
+    include(ci)
+endif ()
 
 ##
 ## CONFIGURATION
@@ -42,7 +58,7 @@ option(JSON_Diagnostics "Enable better diagnostic messages." OFF)
 include(GNUInstallDirs)
 
 set(NLOHMANN_JSON_TARGET_NAME               ${PROJECT_NAME})
-set(NLOHMANN_JSON_CONFIG_INSTALL_DIR        "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" CACHE INTERNAL "")
+set(NLOHMANN_JSON_CONFIG_INSTALL_DIR        "${CMAKE_INSTALL_DATADIR}/cmake/${PROJECT_NAME}" CACHE INTERNAL "")
 set(NLOHMANN_JSON_INCLUDE_INSTALL_DIR       "${CMAKE_INSTALL_INCLUDEDIR}")
 set(NLOHMANN_JSON_TARGETS_EXPORT_NAME       "${PROJECT_NAME}Targets")
 set(NLOHMANN_JSON_CMAKE_CONFIG_TEMPLATE     "cmake/config.cmake.in")
@@ -50,7 +66,7 @@ set(NLOHMANN_JSON_CMAKE_CONFIG_DIR          "${CMAKE_CURRENT_BINARY_DIR}")
 set(NLOHMANN_JSON_CMAKE_VERSION_CONFIG_FILE "${NLOHMANN_JSON_CMAKE_CONFIG_DIR}/${PROJECT_NAME}ConfigVersion.cmake")
 set(NLOHMANN_JSON_CMAKE_PROJECT_CONFIG_FILE "${NLOHMANN_JSON_CMAKE_CONFIG_DIR}/${PROJECT_NAME}Config.cmake")
 set(NLOHMANN_JSON_CMAKE_PROJECT_TARGETS_FILE "${NLOHMANN_JSON_CMAKE_CONFIG_DIR}/${PROJECT_NAME}Targets.cmake")
-set(NLOHMANN_JSON_PKGCONFIG_INSTALL_DIR     "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+set(NLOHMANN_JSON_PKGCONFIG_INSTALL_DIR     "${CMAKE_INSTALL_DATADIR}/pkgconfig")
 
 if (JSON_MultipleHeaders)
     set(NLOHMANN_JSON_INCLUDE_BUILD_DIR "${PROJECT_SOURCE_DIR}/include/")
@@ -64,10 +80,22 @@ if (NOT JSON_ImplicitConversions)
     message(STATUS "Implicit conversions are disabled")
 endif()
 
+if (JSON_DisableEnumSerialization)
+    message(STATUS "Enum integer serialization is disabled")
+endif()
+
+if (JSON_LegacyDiscardedValueComparison)
+    message(STATUS "Legacy discarded value comparison enabled")
+endif()
+
 if (JSON_Diagnostics)
     message(STATUS "Diagnostics enabled")
 endif()
 
+if (JSON_SystemInclude)
+    set(NLOHMANN_JSON_SYSTEM_INCLUDE "SYSTEM")
+endif()
+
 ##
 ## TARGET
 ## create target and add include path
@@ -83,15 +111,18 @@ endif()
 target_compile_definitions(
     ${NLOHMANN_JSON_TARGET_NAME}
     INTERFACE
-    JSON_USE_IMPLICIT_CONVERSIONS=$<BOOL:${JSON_ImplicitConversions}>
-    JSON_DIAGNOSTICS=$<BOOL:${JSON_Diagnostics}>
+    $<$<NOT:$<BOOL:${JSON_GlobalUDLs}>>:JSON_USE_GLOBAL_UDLS=0>
+    $<$<NOT:$<BOOL:${JSON_ImplicitConversions}>>:JSON_USE_IMPLICIT_CONVERSIONS=0>
+    $<$<BOOL:${JSON_DisableEnumSerialization}>:JSON_DISABLE_ENUM_SERIALIZATION=1>
+    $<$<BOOL:${JSON_Diagnostics}>:JSON_DIAGNOSTICS=1>
+    $<$<BOOL:${JSON_LegacyDiscardedValueComparison}>:JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON=1>
 )
 
 target_include_directories(
     ${NLOHMANN_JSON_TARGET_NAME}
-    INTERFACE
+    ${NLOHMANN_JSON_SYSTEM_INCLUDE} INTERFACE
     $<BUILD_INTERFACE:${NLOHMANN_JSON_INCLUDE_BUILD_DIR}>
-    $<INSTALL_INTERFACE:include>
+    $<INSTALL_INTERFACE:${NLOHMANN_JSON_INCLUDE_INSTALL_DIR}>
 )
 
 ## add debug view definition file for msvc (natvis)
@@ -108,8 +139,8 @@ endif()
 
 # Install a pkg-config file, so other tools can find this.
 CONFIGURE_FILE(
-  "${CMAKE_CURRENT_SOURCE_DIR}/cmake/pkg-config.pc.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
+    "${CMAKE_CURRENT_SOURCE_DIR}/cmake/pkg-config.pc.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
 )
 
 ##
@@ -119,7 +150,7 @@ CONFIGURE_FILE(
 if (JSON_BuildTests)
     include(CTest)
     enable_testing()
-    add_subdirectory(test)
+    add_subdirectory(tests)
 endif()
 
 ##
@@ -155,7 +186,7 @@ if(JSON_Install)
             FILES ${NLOHMANN_NATVIS_FILE}
             DESTINATION .
     )
-endif()
+    endif()
     export(
         TARGETS ${NLOHMANN_JSON_TARGET_NAME}
         NAMESPACE ${PROJECT_NAME}::
diff --git a/external_imported/json/ChangeLog.md b/external_imported/json/ChangeLog.md
index e4cec7c5a..656d68bcf 100644
--- a/external_imported/json/ChangeLog.md
+++ b/external_imported/json/ChangeLog.md
@@ -1,6 +1,597 @@
 # Changelog
 All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.11.2](https://github.com/nlohmann/json/releases/tag/3.11.2) (2022-08-12)
+
+[Full Changelog](https://github.com/nlohmann/json/compare/v3.11.1...3.11.2)
+
+- MSVC natvis visualizer does not work after introduction of inline ABI namespace [\#3696](https://github.com/nlohmann/json/issues/3696)
+- The use of parenthesis gives compilation errors in some situations [\#3682](https://github.com/nlohmann/json/issues/3682)
+- extern from/to\_json result in linker error [\#3657](https://github.com/nlohmann/json/issues/3657)
+- json\_fwd.hpp no longer standalone [\#3656](https://github.com/nlohmann/json/issues/3656)
+- regression: `.value<size_t>` is compilation error. [\#3655](https://github.com/nlohmann/json/issues/3655)
+- Regression: no match for 'operator!=' comparing json\_pointer and const char \*/string\_t [\#3654](https://github.com/nlohmann/json/issues/3654)
+- Regression: call to member function 'value' is ambiguous [\#3652](https://github.com/nlohmann/json/issues/3652)
+- macOS 10.15 Actions runner image deprecation [\#3612](https://github.com/nlohmann/json/issues/3612)
+
+- generate\_natvis.py: validate version number; cleanup [\#3698](https://github.com/nlohmann/json/pull/3698) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Add Python script for generating Natvis file and update file for 3.11.2 [\#3697](https://github.com/nlohmann/json/pull/3697) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- fix typo in json\_pointer.md [\#3692](https://github.com/nlohmann/json/pull/3692) ([eltociear](https://github.com/eltociear))
+- Add amalgamated json-fwd.hpp to release [\#3687](https://github.com/nlohmann/json/pull/3687) ([nlohmann](https://github.com/nlohmann))
+- Documentation updates for 3.11.2 [\#3686](https://github.com/nlohmann/json/pull/3686) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Make json\_pointer usable as map key \(again\) [\#3685](https://github.com/nlohmann/json/pull/3685) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Deprecate json\_pointer/string\_t comparisons [\#3684](https://github.com/nlohmann/json/pull/3684) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Restructure inline namespace and allow version component to be disabled [\#3683](https://github.com/nlohmann/json/pull/3683) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Properly constrain non-string json\_pointer overloads [\#3681](https://github.com/nlohmann/json/pull/3681) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Amalgamate the forward declaration header [\#3679](https://github.com/nlohmann/json/pull/3679) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Fix 'const' qualifier on bool& has no effect [\#3678](https://github.com/nlohmann/json/pull/3678) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Fix whitespace in workflow files [\#3675](https://github.com/nlohmann/json/pull/3675) ([nlohmann](https://github.com/nlohmann))
+- Attempt to fix labeler permissions [\#3674](https://github.com/nlohmann/json/pull/3674) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Refine 'Publish documentation' workflow [\#3673](https://github.com/nlohmann/json/pull/3673) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Documentation change [\#3672](https://github.com/nlohmann/json/pull/3672) ([nlohmann](https://github.com/nlohmann))
+- Add labeler action [\#3671](https://github.com/nlohmann/json/pull/3671) ([nlohmann](https://github.com/nlohmann))
+- Complete contributor list [\#3670](https://github.com/nlohmann/json/pull/3670) ([nlohmann](https://github.com/nlohmann))
+- Add json\_pointer/string\_t equality comparison operators [\#3664](https://github.com/nlohmann/json/pull/3664) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Reimplement value\(\) access functions [\#3663](https://github.com/nlohmann/json/pull/3663) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Complete contributor list [\#3662](https://github.com/nlohmann/json/pull/3662) ([nlohmann](https://github.com/nlohmann))
+- Adjust naming of GitHub action jobs [\#3661](https://github.com/nlohmann/json/pull/3661) ([nlohmann](https://github.com/nlohmann))
+- Publish documentation on push to develop branch [\#3660](https://github.com/nlohmann/json/pull/3660) ([nlohmann](https://github.com/nlohmann))
+- Add Discord badge to README [\#3651](https://github.com/nlohmann/json/pull/3651) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Miscellaneous small fixes [\#3643](https://github.com/nlohmann/json/pull/3643) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Minor BJData fixes [\#3637](https://github.com/nlohmann/json/pull/3637) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Update CI [\#3626](https://github.com/nlohmann/json/pull/3626) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+
+## [v3.11.1](https://github.com/nlohmann/json/releases/tag/v3.11.1) (2022-08-01)
+
+[Full Changelog](https://github.com/nlohmann/json/compare/v3.11.0...v3.11.1)
+
+- Regression: no matching literal operator for call to 'operator""\_json' [\#3645](https://github.com/nlohmann/json/issues/3645)
+- \_json  operator""\(\)  [\#3644](https://github.com/nlohmann/json/issues/3644)
+
+- Fix global UDLs [\#3646](https://github.com/nlohmann/json/pull/3646) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+
+## [v3.11.0](https://github.com/nlohmann/json/releases/tag/v3.11.0) (2022-08-01)
+
+[Full Changelog](https://github.com/nlohmann/json/compare/v3.10.5...v3.11.0)
+
+- ICPC: warning \#1098: the qualifier on this friend declaration is ignored [\#3632](https://github.com/nlohmann/json/issues/3632)
+- Starting with 3.10.4, just adding `\#include json.hpp` causes compile error: `overload resolution selected deleted operator '=' [\#3620](https://github.com/nlohmann/json/issues/3620)
+- xwidgets doesn't compile with version \>3.10.3 [\#3602](https://github.com/nlohmann/json/issues/3602)
+- json\_pointer\_\_pop\_back.cpp example does not compile [\#3600](https://github.com/nlohmann/json/issues/3600)
+- nlohmann::json::array 'push\_back' is ambiguous [\#3589](https://github.com/nlohmann/json/issues/3589)
+- Multiple versions causing conflict [\#3588](https://github.com/nlohmann/json/issues/3588)
+- ERROR: ThreadSanitizer: SEGV on unknown address [\#3584](https://github.com/nlohmann/json/issues/3584)
+- unicode4 test consistently fails on RISC-V hardware [\#3579](https://github.com/nlohmann/json/issues/3579)
+- sax\_parse\(iterator, json\_sax\_t \*\) string callback clobbers spaces [\#3574](https://github.com/nlohmann/json/issues/3574)
+- Nlohmann JSON Parse crash with raylib-cpp [\#3570](https://github.com/nlohmann/json/issues/3570)
+- ordered\_json doesn't accept keys of types other than string\_t \(e.g., string\_view\) [\#3558](https://github.com/nlohmann/json/issues/3558)
+- turning an object into an array [\#3547](https://github.com/nlohmann/json/issues/3547)
+- json:parse\_bjdata\_fuzzer: ASSERT: ref\_stack.back\(\)-\>is\_array\(\) [\#3541](https://github.com/nlohmann/json/issues/3541)
+- Warning about potential null dereference in GCC 12.1 \(Fedora 36\) [\#3525](https://github.com/nlohmann/json/issues/3525)
+- Enable 32bit unit test in CI [\#3524](https://github.com/nlohmann/json/issues/3524)
+- Error when roundtripping BJData [\#3519](https://github.com/nlohmann/json/issues/3519)
+- ASSERT error while parsing BJData [\#3513](https://github.com/nlohmann/json/issues/3513)
+- An exception occurred when sending a string with double quotes [\#3504](https://github.com/nlohmann/json/issues/3504)
+- Binary reader for BJData creates incorrect SAX events [\#3503](https://github.com/nlohmann/json/issues/3503)
+- It can't support  "nan", "inf", "-inf" for float type [\#3494](https://github.com/nlohmann/json/issues/3494)
+- ASAN error while parsing BJData \(Heap-buffer-overflow READ 1\) [\#3492](https://github.com/nlohmann/json/issues/3492)
+- UBSAN error while parsing BJData \(Null-dereference\) [\#3491](https://github.com/nlohmann/json/issues/3491)
+- UBSAN error while parsing BJData \(Invalid-bool-value\) [\#3490](https://github.com/nlohmann/json/issues/3490)
+- json:parse\_bjdata\_fuzzer reaches assertion [\#3475](https://github.com/nlohmann/json/issues/3475)
+- Compilation with -fmodules-ts and use inside of a module [\#3472](https://github.com/nlohmann/json/issues/3472)
+- json.exception.parse\_error.101 only occurs outside of IDE  [\#3467](https://github.com/nlohmann/json/issues/3467)
+- json:parse\_bjdata\_fuzzer reaches assertion [\#3461](https://github.com/nlohmann/json/issues/3461)
+- NLOHMANN\_DEFINE\_TYPE\_NON\_INTRUSIVE\_WITH\_DEFAULT can not parse { "key" : null} [\#3458](https://github.com/nlohmann/json/issues/3458)
+- Unable to compile when using Microsoft's \_CRTDBG [\#3457](https://github.com/nlohmann/json/issues/3457)
+- Compilation errors when including `<filesystem>` and using `--std=c++17` or above \(MinGW/Win10\) [\#3449](https://github.com/nlohmann/json/issues/3449)
+- Weird things on for statement [\#3447](https://github.com/nlohmann/json/issues/3447)
+- Parsing error when there is a json string within a Json [\#3445](https://github.com/nlohmann/json/issues/3445)
+- ordered\_json vs json types comparison [\#3443](https://github.com/nlohmann/json/issues/3443)
+- Error occurred when converting nlohmann::json to std::any [\#3428](https://github.com/nlohmann/json/issues/3428)
+- I was forced to report an assertion error when copying an array of strings [\#3419](https://github.com/nlohmann/json/issues/3419)
+- About Serialization Error invalid UTF-8 byte at index [\#3414](https://github.com/nlohmann/json/issues/3414)
+- Comparison of NaN differs between json and float [\#3409](https://github.com/nlohmann/json/issues/3409)
+- when i use it in C++ sserver,it it constantly show that fatal error: adl\_serializer.hpp: No such file or directory [\#3404](https://github.com/nlohmann/json/issues/3404)
+- parse error [\#3403](https://github.com/nlohmann/json/issues/3403)
+- CMake script MAIN\_PROJECT always OFF [\#3390](https://github.com/nlohmann/json/issues/3390)
+- Parser unable to handle large floating point numbers [\#3389](https://github.com/nlohmann/json/issues/3389)
+- Compilation error if json\_pointer is used with alternative string type [\#3388](https://github.com/nlohmann/json/issues/3388)
+- Unit tests conversions & items fail to build \(Clang \<4.0/C++14 only\) [\#3384](https://github.com/nlohmann/json/issues/3384)
+- Regression test for \#3070 is not being run and fails when enabled [\#3377](https://github.com/nlohmann/json/issues/3377)
+- Refactor unit tests to use more convenient doctest assertion macros [\#3365](https://github.com/nlohmann/json/issues/3365)
+- An json.h issue reported in a static code analyzer [\#3361](https://github.com/nlohmann/json/issues/3361)
+- Mixing different JSON\_DIAGNOSTICS settings in separately compiled units leads to core [\#3360](https://github.com/nlohmann/json/issues/3360)
+- json::out\_of\_range exception matches against lot of others while testing [\#3352](https://github.com/nlohmann/json/issues/3352)
+- use mipsel-openwrt-linux-g++ -std=c++11 to compile, it has some errors "error: 'snprintf' is not a member of 'std'" [\#3349](https://github.com/nlohmann/json/issues/3349)
+- Add proper issue templates [\#3348](https://github.com/nlohmann/json/issues/3348)
+- switch from json to ordered\_json [\#3343](https://github.com/nlohmann/json/issues/3343)
+- Json dump use to compilation errors [\#3339](https://github.com/nlohmann/json/issues/3339)
+- Ambiguous conversion from nlohmann::basic\_json\<\> to custom class. [\#3333](https://github.com/nlohmann/json/issues/3333)
+- Iterator doesn't satisfy std::incrementable because post-increment may change constness [\#3331](https://github.com/nlohmann/json/issues/3331)
+- Inconsistent handling of floating point numbers after parse\(\) [\#3329](https://github.com/nlohmann/json/issues/3329)
+- Documentation for `ordered_json` should show proper use of the `parse()` function. [\#3325](https://github.com/nlohmann/json/issues/3325)
+- "type must be boolean, but is object" error thrown on non-boolean object [\#3319](https://github.com/nlohmann/json/issues/3319)
+- Incomplete Type in request parms [\#3318](https://github.com/nlohmann/json/issues/3318)
+- �米 MIX4 MIUI13  bug [\#3316](https://github.com/nlohmann/json/issues/3316)
+- json.exception.parse\_error.101 when parsing data received over a socket [\#3313](https://github.com/nlohmann/json/issues/3313)
+- Parse to custom class from unordered\_json breaks on G++11.2.0 with C++20 [\#3312](https://github.com/nlohmann/json/issues/3312)
+- try to assign dumped string to a class member varible [\#3300](https://github.com/nlohmann/json/issues/3300)
+- includedir in pkgconfig is error if install\_headers\(\) has subdir argument.  [\#3284](https://github.com/nlohmann/json/issues/3284)
+- SHA-256 sum of json-3.10.5.tar.xz changes over time \(but not the content itself\) [\#3281](https://github.com/nlohmann/json/issues/3281)
+- items\(\) method does not follow order of json message [\#3278](https://github.com/nlohmann/json/issues/3278)
+- Perplexing template deduction failure serialising a 3rd party type using base class [\#3267](https://github.com/nlohmann/json/issues/3267)
+- json.hpp 'isfinite' is not a member of 'std' also isinf; snprintf; stoull and to\_string members of std [\#3263](https://github.com/nlohmann/json/issues/3263)
+- JSON build fails for C++ cmake [\#3256](https://github.com/nlohmann/json/issues/3256)
+- Unexpected implicit conversion [\#3254](https://github.com/nlohmann/json/issues/3254)
+- Add a function that checks for valid json in a C++ string  [\#3245](https://github.com/nlohmann/json/issues/3245)
+- Replace use of standard IO from error handling [\#3239](https://github.com/nlohmann/json/issues/3239)
+- Use Catch for unit tests [\#3232](https://github.com/nlohmann/json/issues/3232)
+- Exception thrown during initialization causes a memory leak [\#3215](https://github.com/nlohmann/json/issues/3215)
+- Tests failing when compiling with c++20 [\#3207](https://github.com/nlohmann/json/issues/3207)
+- ambiguous regression [\#3204](https://github.com/nlohmann/json/issues/3204)
+- Deserialization: if class is\_constructible from std::string wrong from\_json overload is being selected, compilation failed [\#3171](https://github.com/nlohmann/json/issues/3171)
+- 'clang++ ./json.hpp' with no usage: Compiler syntax problem in clang 3.7.0 \(tizen :/ \) [\#3153](https://github.com/nlohmann/json/issues/3153)
+- build failure on upcoming gcc-12: test/src/unit-regression1.cpp:392:22: error: ambiguous overload for 'operator=' [\#3138](https://github.com/nlohmann/json/issues/3138)
+- Applying JSON patch creates parent object [\#3134](https://github.com/nlohmann/json/issues/3134)
+- Iterators cannot be used with range-v3 [\#3130](https://github.com/nlohmann/json/issues/3130)
+- std::shared\_ptr\<T\> == nlohmann::json compiles, which seem undesirable [\#3026](https://github.com/nlohmann/json/issues/3026)
+- Error in test\download\_test\_data.vcxproj custom build step when compiling with Visual Studio 2019 16.7.7 msbuild on Windows 10 [\#2593](https://github.com/nlohmann/json/issues/2593)
+- Consider putting the user-defined literals in a namespace [\#1682](https://github.com/nlohmann/json/issues/1682)
+- Using versioned namespaces [\#1539](https://github.com/nlohmann/json/issues/1539)
+- How can I use std::string\_view as the json\_key to "operator \[\]" ? [\#1529](https://github.com/nlohmann/json/issues/1529)
+- serialize std::variant\<...\> [\#1261](https://github.com/nlohmann/json/issues/1261)
+
+- Prepare 3.11.0 release [\#3635](https://github.com/nlohmann/json/pull/3635) ([nlohmann](https://github.com/nlohmann))
+- Fix warning [\#3634](https://github.com/nlohmann/json/pull/3634) ([nlohmann](https://github.com/nlohmann))
+- Add license header to new files [\#3633](https://github.com/nlohmann/json/pull/3633) ([nlohmann](https://github.com/nlohmann))
+- Add a unit test including windows.h [\#3631](https://github.com/nlohmann/json/pull/3631) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Fixed latest build error in msvc platform [\#3630](https://github.com/nlohmann/json/pull/3630) ([KsaNL](https://github.com/KsaNL))
+- Add regression tests for \#3204 and \#3333 [\#3629](https://github.com/nlohmann/json/pull/3629) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Fix patch::add creating nonexistent parents [\#3628](https://github.com/nlohmann/json/pull/3628) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Adjust JSON Pointer examples [\#3622](https://github.com/nlohmann/json/pull/3622) ([nlohmann](https://github.com/nlohmann))
+- Disable exceptions on ICPC [\#3621](https://github.com/nlohmann/json/pull/3621) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- build: install .pc and .cmake files to share/ [\#3619](https://github.com/nlohmann/json/pull/3619) ([Tachi107](https://github.com/Tachi107))
+- Fix MinGW CI failures [\#3618](https://github.com/nlohmann/json/pull/3618) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Fix Unicode test timeout \(for real this time!\) [\#3614](https://github.com/nlohmann/json/pull/3614) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Use 'concurrency' in GitHub workflows [\#3610](https://github.com/nlohmann/json/pull/3610) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Use swap\(\) by ADL [\#3609](https://github.com/nlohmann/json/pull/3609) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Move UDLs out of the global namespace [\#3605](https://github.com/nlohmann/json/pull/3605) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Re-add value\_type detection to distinguish string types [\#3604](https://github.com/nlohmann/json/pull/3604) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Add operator\<\<\(json\_pointer\) [\#3601](https://github.com/nlohmann/json/pull/3601) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Add documentation for comparing json and ordered\_json [\#3599](https://github.com/nlohmann/json/pull/3599) ([nlohmann](https://github.com/nlohmann))
+- Clean up after \#3581 [\#3596](https://github.com/nlohmann/json/pull/3596) ([nlohmann](https://github.com/nlohmann))
+- Add assertion if nullptr is passed to parse function [\#3593](https://github.com/nlohmann/json/pull/3593) ([nlohmann](https://github.com/nlohmann))
+- Minor documentation fixes [\#3592](https://github.com/nlohmann/json/pull/3592) ([nlohmann](https://github.com/nlohmann))
+- Add versioned, ABI-tagged inline namespace and namespace macros [\#3590](https://github.com/nlohmann/json/pull/3590) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Add badge for https://repology.org/project/nlohmann-json/versions [\#3586](https://github.com/nlohmann/json/pull/3586) ([nlohmann](https://github.com/nlohmann))
+- Add error message if test suite cannot be found [\#3585](https://github.com/nlohmann/json/pull/3585) ([nlohmann](https://github.com/nlohmann))
+- add patch\_inplace function [\#3581](https://github.com/nlohmann/json/pull/3581) ([wolfv](https://github.com/wolfv))
+- Enable overriding test properties and set Unicode test timeouts [\#3580](https://github.com/nlohmann/json/pull/3580) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Ignore output directory [\#3572](https://github.com/nlohmann/json/pull/3572) ([NN---](https://github.com/NN---))
+- Optimize output vector adapter write [\#3569](https://github.com/nlohmann/json/pull/3569) ([romainreignier](https://github.com/romainreignier))
+- Add overloads for more key types to ordered\_map and fix ordered\_map::erase\(first, last\) with first == last [\#3564](https://github.com/nlohmann/json/pull/3564) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Make certain usage patterns more prominent in the README [\#3557](https://github.com/nlohmann/json/pull/3557) ([jez](https://github.com/jez))
+- CI: fix "JSON\_MultipleHeaders" option spelling [\#3555](https://github.com/nlohmann/json/pull/3555) ([karzhenkov](https://github.com/karzhenkov))
+- More documentation updates for 3.11.0 [\#3553](https://github.com/nlohmann/json/pull/3553) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Use DOCTEST\_\* compiler macros and suppress pragmas warning [\#3550](https://github.com/nlohmann/json/pull/3550) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Add unit test to make sure iterator\_input\_adapter advances iterators correctly [\#3548](https://github.com/nlohmann/json/pull/3548) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Use REUSE framework [\#3546](https://github.com/nlohmann/json/pull/3546) ([nlohmann](https://github.com/nlohmann))
+- Use `std::iterator_traits` to extract `iterator_category` [\#3544](https://github.com/nlohmann/json/pull/3544) ([Mike-Leo-Smith](https://github.com/Mike-Leo-Smith))
+- BJData dimension length can not be string\_t::npos, fix \#3541 [\#3543](https://github.com/nlohmann/json/pull/3543) ([fangq](https://github.com/fangq))
+- Allow disabling default enum conversions [\#3536](https://github.com/nlohmann/json/pull/3536) ([zxey](https://github.com/zxey))
+- Add to\_json\(\) for std::vector\<bool\>::reference [\#3534](https://github.com/nlohmann/json/pull/3534) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- CI: Enable 32bit unit test \(3\) [\#3532](https://github.com/nlohmann/json/pull/3532) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Use new CI image [\#3528](https://github.com/nlohmann/json/pull/3528) ([nlohmann](https://github.com/nlohmann))
+- Fix ndarray dimension signedness, fix ndarray length overflow \(2\); add 32bit unit test [\#3523](https://github.com/nlohmann/json/pull/3523) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Small documentation fixes [\#3520](https://github.com/nlohmann/json/pull/3520) ([nlohmann](https://github.com/nlohmann))
+- Add assertion to converting constructor [\#3517](https://github.com/nlohmann/json/pull/3517) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- CI: Remove -Wstrict-overflow [\#3516](https://github.com/nlohmann/json/pull/3516) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Fix nlohmann/json\#3513, explain is\_ndarray flag [\#3514](https://github.com/nlohmann/json/pull/3514) ([fangq](https://github.com/fangq))
+- Prevent ndarray size vector from recursive use, fix nlohmann/json\#3503 [\#3505](https://github.com/nlohmann/json/pull/3505) ([fangq](https://github.com/fangq))
+- prevent ndarray dimension vector from recusive array, nlohmann/json\#3500 [\#3502](https://github.com/nlohmann/json/pull/3502) ([fangq](https://github.com/fangq))
+- Discard optimized containers with negative counts in UBJSON/BJData \(\#3491,\#3492,\#3490\) [\#3500](https://github.com/nlohmann/json/pull/3500) ([fangq](https://github.com/fangq))
+- Update json.hpp [\#3499](https://github.com/nlohmann/json/pull/3499) ([ivanovmp](https://github.com/ivanovmp))
+- Add assertion for invariant in SAX-DOM parser [\#3498](https://github.com/nlohmann/json/pull/3498) ([nlohmann](https://github.com/nlohmann))
+- Add more macOS builders [\#3485](https://github.com/nlohmann/json/pull/3485) ([nlohmann](https://github.com/nlohmann))
+- change bjdata ndarray flag to detect negative size, as part of \#3475 [\#3479](https://github.com/nlohmann/json/pull/3479) ([fangq](https://github.com/fangq))
+- Document fuzzer usage [\#3478](https://github.com/nlohmann/json/pull/3478) ([nlohmann](https://github.com/nlohmann))
+- Add build step for ICPC \(with fixes\) [\#3465](https://github.com/nlohmann/json/pull/3465) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Complete documentation for 3.11.0 [\#3464](https://github.com/nlohmann/json/pull/3464) ([nlohmann](https://github.com/nlohmann))
+- Handle invalid BJData optimized type, fix \#3461 [\#3463](https://github.com/nlohmann/json/pull/3463) ([fangq](https://github.com/fangq))
+- Reorganize directories [\#3462](https://github.com/nlohmann/json/pull/3462) ([nlohmann](https://github.com/nlohmann))
+- Enable rapid testing and development on Compiler Explorer [\#3456](https://github.com/nlohmann/json/pull/3456) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- cpplint 1.6.0 [\#3454](https://github.com/nlohmann/json/pull/3454) ([nlohmann](https://github.com/nlohmann))
+- Disable regression test for \#3070 on GCC \<8.4 [\#3451](https://github.com/nlohmann/json/pull/3451) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Fix C++20/gcc-12 issues \(Part 2\) [\#3446](https://github.com/nlohmann/json/pull/3446) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Overwork documentation [\#3444](https://github.com/nlohmann/json/pull/3444) ([nlohmann](https://github.com/nlohmann))
+- Fix typo in basic\_json documentation [\#3439](https://github.com/nlohmann/json/pull/3439) ([jhnlee](https://github.com/jhnlee))
+- Exclude std::any from implicit conversion \(fixes \#3428\) [\#3437](https://github.com/nlohmann/json/pull/3437) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Document which version introduced the macros [\#3431](https://github.com/nlohmann/json/pull/3431) ([nlohmann](https://github.com/nlohmann))
+- Fix constraints on from\_json\(\) for strings \(fixes \#3171, \#3267, \#3312, \#3384\) [\#3427](https://github.com/nlohmann/json/pull/3427) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- at.md: fix typo [\#3426](https://github.com/nlohmann/json/pull/3426) ([heinemml](https://github.com/heinemml))
+- Implement support for string\_view \(attempt no. 3\) [\#3423](https://github.com/nlohmann/json/pull/3423) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- CI: speedup AppVeyor builds by ~30% [\#3422](https://github.com/nlohmann/json/pull/3422) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Restore disabled check for \#3070 \(except on MSVC\) [\#3421](https://github.com/nlohmann/json/pull/3421) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Update CI image [\#3420](https://github.com/nlohmann/json/pull/3420) ([nlohmann](https://github.com/nlohmann))
+- Add check if different version is also included [\#3418](https://github.com/nlohmann/json/pull/3418) ([nlohmann](https://github.com/nlohmann))
+- Report the right \_\_cplusplus value for MSVC in basic\_json meta\(\) [\#3417](https://github.com/nlohmann/json/pull/3417) ([flagarde](https://github.com/flagarde))
+- CI: windows-2016 has been deprecated; remove jobs [\#3416](https://github.com/nlohmann/json/pull/3416) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Re-template json\_pointer on string type [\#3415](https://github.com/nlohmann/json/pull/3415) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Refactor unit tests to use more convenient doctest assertion macros \(Part 2\) [\#3405](https://github.com/nlohmann/json/pull/3405) ([kkarbowiak](https://github.com/kkarbowiak))
+- Refactor unit tests to use more convenient doctest assertion macros [\#3393](https://github.com/nlohmann/json/pull/3393) ([kkarbowiak](https://github.com/kkarbowiak))
+- Improve unit testing \(Part 1\) [\#3380](https://github.com/nlohmann/json/pull/3380) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Fix C++20/gcc-12 issues \(Part 1\) [\#3379](https://github.com/nlohmann/json/pull/3379) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Add clarification to avoid misunderstanding that cause \#3360 [\#3378](https://github.com/nlohmann/json/pull/3378) ([puffetto](https://github.com/puffetto))
+- Fix ordered\_map ctor with initializer\_list \(fixes \#3343\) [\#3370](https://github.com/nlohmann/json/pull/3370) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Fix and update CI [\#3368](https://github.com/nlohmann/json/pull/3368) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- FetchContent\_MakeAvailable [\#3351](https://github.com/nlohmann/json/pull/3351) ([nlohmann](https://github.com/nlohmann))
+- Avoid clash with Arduino defines [\#3338](https://github.com/nlohmann/json/pull/3338) ([DarkZeros](https://github.com/DarkZeros))
+- Support UBJSON-derived Binary JData \(BJData\) format [\#3336](https://github.com/nlohmann/json/pull/3336) ([fangq](https://github.com/fangq))
+- Make iterator operator++/--\(int\) equality-preserving [\#3332](https://github.com/nlohmann/json/pull/3332) ([falbrechtskirchinger](https://github.com/falbrechtskirchinger))
+- Add note on parsing ordered\_json [\#3326](https://github.com/nlohmann/json/pull/3326) ([nlohmann](https://github.com/nlohmann))
+- Fix CITATION.cff and add automatic validation of your citation metadata [\#3320](https://github.com/nlohmann/json/pull/3320) ([fdiblen](https://github.com/fdiblen))
+- .github/workflows/windows.yml: Add support for Visual Studio 2022 [\#3295](https://github.com/nlohmann/json/pull/3295) ([t-b](https://github.com/t-b))
+- Add maintainer targets to create source archive [\#3289](https://github.com/nlohmann/json/pull/3289) ([nlohmann](https://github.com/nlohmann))
+- Fix a typo [\#3265](https://github.com/nlohmann/json/pull/3265) ([fhuberts](https://github.com/fhuberts))
+- Fix typo [\#3249](https://github.com/nlohmann/json/pull/3249) ([rex4539](https://github.com/rex4539))
+- Add documentation for JSON Lines [\#3247](https://github.com/nlohmann/json/pull/3247) ([nlohmann](https://github.com/nlohmann))
+- Improve documentation InputType and IteratorType [\#3246](https://github.com/nlohmann/json/pull/3246) ([nlohmann](https://github.com/nlohmann))
+- Remove stringstream [\#3244](https://github.com/nlohmann/json/pull/3244) ([nlohmann](https://github.com/nlohmann))
+- fix \_MSC\_VER version to check for std::filesystem [\#3240](https://github.com/nlohmann/json/pull/3240) ([gcerretani](https://github.com/gcerretani))
+- Add macros NLOHMANN\_DEFINE\_TYPE\_INTRUSIVE\_WITH\_DEFAULT and ...\_NON\_INTRUSIVE\_WITH\_DEFAULT [\#3143](https://github.com/nlohmann/json/pull/3143) ([pketelsen](https://github.com/pketelsen))
+
+## [v3.10.5](https://github.com/nlohmann/json/releases/tag/v3.10.5) (2022-01-03)
+
+[Full Changelog](https://github.com/nlohmann/json/compare/v3.10.4...v3.10.5)
+
+- \#include \<filesystem\> doesn't work with gcc-7 when `-std=c++17` is specified. [\#3203](https://github.com/nlohmann/json/issues/3203)
+- Not able to use nlohmann json with c++ code built using emscripten to wasm [\#3200](https://github.com/nlohmann/json/issues/3200)
+- Warning for shadowed variables [\#3188](https://github.com/nlohmann/json/issues/3188)
+- Accessing missing keys on const json object leads to assert [\#3183](https://github.com/nlohmann/json/issues/3183)
+- Data member is available, but null is reported, and program throws error [\#3173](https://github.com/nlohmann/json/issues/3173)
+- serialization problem, from\_json need construct new object [\#3169](https://github.com/nlohmann/json/issues/3169)
+- std::filesystem unavailable on macOS lower deployment targets [\#3156](https://github.com/nlohmann/json/issues/3156)
+- \[json.exception.type\_error.305\] cannot use operator\[\] with a string argument with string [\#3151](https://github.com/nlohmann/json/issues/3151)
+- json::dump\(\) is not compatible with C++ standards [\#3147](https://github.com/nlohmann/json/issues/3147)
+- Issue with json::parse decoding codepoints [\#3142](https://github.com/nlohmann/json/issues/3142)
+- Simple parse of json object thinks it should be an array [\#3136](https://github.com/nlohmann/json/issues/3136)
+- How to properly read a Json string that may be null in some cases? [\#3135](https://github.com/nlohmann/json/issues/3135)
+- Deadlock on create json - windows only [\#3129](https://github.com/nlohmann/json/issues/3129)
+- Wrong parsing of int64 values nearest of limit [\#3126](https://github.com/nlohmann/json/issues/3126)
+- ordered\_json doesn't support range based erase [\#3108](https://github.com/nlohmann/json/issues/3108)
+- Apple build failed with json/single\_include/nlohmann/json.hpp:4384:57: 'path' is unavailable [\#3097](https://github.com/nlohmann/json/issues/3097)
+- GCC 7.5.0 with --std=c++17: filesystem: No such file or directory [\#3090](https://github.com/nlohmann/json/issues/3090)
+- Drop Travis CI [\#3087](https://github.com/nlohmann/json/issues/3087)
+- ordered\_json::reset\(\) compile error with nvcc [\#3013](https://github.com/nlohmann/json/issues/3013)
+- Support for unordered\_map as object\_t [\#2932](https://github.com/nlohmann/json/issues/2932)
+- Compiler warning with Intel compiler, same as \#755 [\#2712](https://github.com/nlohmann/json/issues/2712)
+- Compiler warnings with NVCC 11.2 [\#2676](https://github.com/nlohmann/json/issues/2676)
+- some static analysis warning at line 11317 [\#1390](https://github.com/nlohmann/json/issues/1390)
+- Compiling with icpc [\#755](https://github.com/nlohmann/json/issues/755)
+
+- Fix compilation error with NVCC [\#3234](https://github.com/nlohmann/json/pull/3234) ([nlohmann](https://github.com/nlohmann))
+- Remove Travis CI [\#3233](https://github.com/nlohmann/json/pull/3233) ([nlohmann](https://github.com/nlohmann))
+- Add build step for NVCC and fix a warning [\#3227](https://github.com/nlohmann/json/pull/3227) ([nlohmann](https://github.com/nlohmann))
+- Update cpplint [\#3225](https://github.com/nlohmann/json/pull/3225) ([nlohmann](https://github.com/nlohmann))
+- Fix: Warning for shadowed variables \(\#3188\) [\#3193](https://github.com/nlohmann/json/pull/3193) ([kernie](https://github.com/kernie))
+- Fix FAQ hyperlink typo in readme [\#3148](https://github.com/nlohmann/json/pull/3148) ([Prince-Mendiratta](https://github.com/Prince-Mendiratta))
+- Docs: Update `skip_comments` to `ignore_comments` [\#3145](https://github.com/nlohmann/json/pull/3145) ([daniel-kun](https://github.com/daniel-kun))
+- fix typos in documentation [\#3140](https://github.com/nlohmann/json/pull/3140) ([striezel](https://github.com/striezel))
+- Fix spelling [\#3125](https://github.com/nlohmann/json/pull/3125) ([axic](https://github.com/axic))
+- Extend std specializations [\#3121](https://github.com/nlohmann/json/pull/3121) ([nlohmann](https://github.com/nlohmann))
+- Add missing erase\(first, last\) function to ordered\_map [\#3109](https://github.com/nlohmann/json/pull/3109) ([nlohmann](https://github.com/nlohmann))
+- Fix typos in operator\[\] documentation [\#3102](https://github.com/nlohmann/json/pull/3102) ([axnsan12](https://github.com/axnsan12))
+- Add C++17 copies of the test binaries [\#3101](https://github.com/nlohmann/json/pull/3101) ([nlohmann](https://github.com/nlohmann))
+- Add examples for parsing from iterator pair [\#3100](https://github.com/nlohmann/json/pull/3100) ([nlohmann](https://github.com/nlohmann))
+- Update CI [\#3088](https://github.com/nlohmann/json/pull/3088) ([nlohmann](https://github.com/nlohmann))
+- Consolidate documentation [\#3071](https://github.com/nlohmann/json/pull/3071) ([nlohmann](https://github.com/nlohmann))
+- Add recursive update function [\#3069](https://github.com/nlohmann/json/pull/3069) ([nlohmann](https://github.com/nlohmann))
+
+## [v3.10.4](https://github.com/nlohmann/json/releases/tag/v3.10.4) (2021-10-16)
+
+[Full Changelog](https://github.com/nlohmann/json/compare/v3.10.3...v3.10.4)
+
+- Compiler error in output serializer due to 'incompatible initializer' [\#3081](https://github.com/nlohmann/json/issues/3081)
+- Strange behaviour when using std::sort on std::vector\<json\> [\#3080](https://github.com/nlohmann/json/issues/3080)
+- Unhandled exception: nlohmann::detail::parse\_error [\#3078](https://github.com/nlohmann/json/issues/3078)
+- explicit constructor with default does not compile [\#3077](https://github.com/nlohmann/json/issues/3077)
+- Parse an object but get an array using GCC [\#3076](https://github.com/nlohmann/json/issues/3076)
+- Version 3.10.3 breaks backward-compatibility with 3.10.2 [\#3070](https://github.com/nlohmann/json/issues/3070)
+- Feature request, Add to\_json/from\_json to align with other to/from binary api.  [\#3067](https://github.com/nlohmann/json/issues/3067)
+- vcpkg is out of date [\#3066](https://github.com/nlohmann/json/issues/3066)
+
+- Revert invalid fix [\#3082](https://github.com/nlohmann/json/pull/3082) ([nlohmann](https://github.com/nlohmann))
+- Allow to use get with explicit constructor [\#3079](https://github.com/nlohmann/json/pull/3079) ([nlohmann](https://github.com/nlohmann))
+- fix std::filesystem::path regression [\#3073](https://github.com/nlohmann/json/pull/3073) ([theodelrieu](https://github.com/theodelrieu))
+
+## [v3.10.3](https://github.com/nlohmann/json/releases/tag/v3.10.3) (2021-10-08)
+
+[Full Changelog](https://github.com/nlohmann/json/compare/v3.10.2...v3.10.3)
+
+- Parsing an emtpy string returns a string with size 1 instead of expected 0 [\#3057](https://github.com/nlohmann/json/issues/3057)
+- Linking error  "duplicate symbol: std::type\_info::operator==" on static build with MinGW [\#3042](https://github.com/nlohmann/json/issues/3042)
+- Yet another assertion failure when inserting into arrays with JSON\_DIAGNOSTICS set [\#3032](https://github.com/nlohmann/json/issues/3032)
+- accept and parse function not work well with a pure number string [\#3029](https://github.com/nlohmann/json/issues/3029)
+- push\_back doesn't work for serializing containers [\#3027](https://github.com/nlohmann/json/issues/3027)
+- Strange behaviour when creating array with single element [\#3025](https://github.com/nlohmann/json/issues/3025)
+- Input ordered\_json doesn't work [\#3023](https://github.com/nlohmann/json/issues/3023)
+- Issue iterating through 'items' [\#3021](https://github.com/nlohmann/json/issues/3021)
+- Cannot spell the namespace right [\#3015](https://github.com/nlohmann/json/issues/3015)
+- JSON Parse error when reading json object from file [\#3011](https://github.com/nlohmann/json/issues/3011)
+- Parent pointer not properly set when using update\(\) [\#3007](https://github.com/nlohmann/json/issues/3007)
+- Overwriting terminated null character [\#3001](https://github.com/nlohmann/json/issues/3001)
+- 'operator =' is ambiguous on VS2017 [\#2997](https://github.com/nlohmann/json/issues/2997)
+- JSON Patch for Array Elements [\#2994](https://github.com/nlohmann/json/issues/2994)
+- JSON Parse throwing error [\#2983](https://github.com/nlohmann/json/issues/2983)
+- to\_{binary format} does not provide a mechanism for specifying a custom allocator for the returned type. [\#2982](https://github.com/nlohmann/json/issues/2982)
+- 3.10.1 zip json.hpp has version number 3.10.0 instead of 3.10.1 [\#2973](https://github.com/nlohmann/json/issues/2973)
+- Assertion failure when serializing array with JSON\_DIAGNOSTICS set [\#2926](https://github.com/nlohmann/json/issues/2926)
+
+- Fix Clang version [\#3040](https://github.com/nlohmann/json/pull/3040) ([nlohmann](https://github.com/nlohmann))
+- Fix assertion failure for JSON\_DIAGNOSTICS [\#3037](https://github.com/nlohmann/json/pull/3037) ([carlsmedstad](https://github.com/carlsmedstad))
+- meta: fix is\_compatible/constructible traits [\#3020](https://github.com/nlohmann/json/pull/3020) ([theodelrieu](https://github.com/theodelrieu))
+- Set parent pointers for values inserted via update\(\) \(fixes \#3007\). [\#3008](https://github.com/nlohmann/json/pull/3008) ([AnthonyVH](https://github.com/AnthonyVH))
+- Allow allocators for output\_vector\_adapter [\#2989](https://github.com/nlohmann/json/pull/2989) ([nlohmann](https://github.com/nlohmann))
+- Re-add Clang 12 [\#2986](https://github.com/nlohmann/json/pull/2986) ([nlohmann](https://github.com/nlohmann))
+- Use new Docker image [\#2981](https://github.com/nlohmann/json/pull/2981) ([nlohmann](https://github.com/nlohmann))
+- Update docset generation script [\#2967](https://github.com/nlohmann/json/pull/2967) ([nlohmann](https://github.com/nlohmann))
+
+## [v3.10.2](https://github.com/nlohmann/json/releases/tag/v3.10.2) (2021-08-26)
+
+[Full Changelog](https://github.com/nlohmann/json/compare/v3.10.1...v3.10.2)
+
+- Annoying -Wundef on new JSON\_DIAGNOSTICS macro [\#2975](https://github.com/nlohmann/json/issues/2975)
+- += issue with multiple redirection. [\#2970](https://github.com/nlohmann/json/issues/2970)
+- "incomplete type ‘nlohmann::detail::wide\_string\_input\_helper" compilation error [\#2969](https://github.com/nlohmann/json/issues/2969)
+
+- Fix -Wunused warnings on JSON\_DIAGNOSTICS  [\#2976](https://github.com/nlohmann/json/pull/2976) ([gcerretani](https://github.com/gcerretani))
+
+## [v3.10.1](https://github.com/nlohmann/json/releases/tag/v3.10.1) (2021-08-24)
+
+[Full Changelog](https://github.com/nlohmann/json/compare/v3.10.0...v3.10.1)
+
+- JSON\_DIAGNOSTICS assertion for ordered\_json [\#2962](https://github.com/nlohmann/json/issues/2962)
+- Inserting in unordered json using a pointer retains the leading slash [\#2958](https://github.com/nlohmann/json/issues/2958)
+- Test  \#9: test-cbor test case sample.json fails in debug mode - Stack overflow [\#2955](https://github.com/nlohmann/json/issues/2955)
+- 3.10.0 broke at least the Bear project [\#2953](https://github.com/nlohmann/json/issues/2953)
+- 2 tests fail in 3.10.0: cmake\_fetch\_content\_configure, cmake\_fetch\_content\_build [\#2951](https://github.com/nlohmann/json/issues/2951)
+- ctest \(58+60,/67 cmake\_import\_configure\) fails when build with -D JSON\_Install:BOOL=OFF because of missing nlohmann\_jsonTargets.cmake [\#2946](https://github.com/nlohmann/json/issues/2946)
+- Document vcpkg usage [\#2944](https://github.com/nlohmann/json/issues/2944)
+- Linker error LNK2005 when compiling \(x64\) json-3.10.0.zip with Visual Studio 2019 16.11.1  [\#2941](https://github.com/nlohmann/json/issues/2941)
+- Move Travis jobs to travis-ci.com [\#2938](https://github.com/nlohmann/json/issues/2938)
+
+- Fixed typo in docs/api/basic\_json/parse.md [\#2968](https://github.com/nlohmann/json/pull/2968) ([mbadhan](https://github.com/mbadhan))
+- Add link to Homebrew package [\#2966](https://github.com/nlohmann/json/pull/2966) ([nlohmann](https://github.com/nlohmann))
+- Fix parent update for diagnostics with ordered\_json [\#2963](https://github.com/nlohmann/json/pull/2963) ([nlohmann](https://github.com/nlohmann))
+- Set stack size for some unit tests when using MSVC [\#2961](https://github.com/nlohmann/json/pull/2961) ([nlohmann](https://github.com/nlohmann))
+- Add regression test [\#2960](https://github.com/nlohmann/json/pull/2960) ([nlohmann](https://github.com/nlohmann))
+- Update Travis badge [\#2959](https://github.com/nlohmann/json/pull/2959) ([nlohmann](https://github.com/nlohmann))
+- Fix some extra ";" clang warnings [\#2957](https://github.com/nlohmann/json/pull/2957) ([Hallot](https://github.com/Hallot))
+- Add documentation for integration via vcpkg [\#2954](https://github.com/nlohmann/json/pull/2954) ([nlohmann](https://github.com/nlohmann))
+- Avoid duplicate AppVeyor builds [\#2952](https://github.com/nlohmann/json/pull/2952) ([nlohmann](https://github.com/nlohmann))
+- 🚨 fix gdb\_pretty\_printer failure on basic types [\#2950](https://github.com/nlohmann/json/pull/2950) ([senyai](https://github.com/senyai))
+- Add header to use value\_t [\#2948](https://github.com/nlohmann/json/pull/2948) ([nlohmann](https://github.com/nlohmann))
+- Skip some tests if JSON\_Install is not set [\#2947](https://github.com/nlohmann/json/pull/2947) ([nlohmann](https://github.com/nlohmann))
+- Remove outdated json\_unit test binary [\#2945](https://github.com/nlohmann/json/pull/2945) ([nlohmann](https://github.com/nlohmann))
+- Updating the Homebrew Command [\#2943](https://github.com/nlohmann/json/pull/2943) ([amirmasoudabdol](https://github.com/amirmasoudabdol))
+
+## [v3.10.0](https://github.com/nlohmann/json/releases/tag/v3.10.0) (2021-08-17)
+
+[Full Changelog](https://github.com/nlohmann/json/compare/v3.9.1...v3.10.0)
+
+- Latest version 3.9.1 uses throw instead of JSON\_THROW in the amalgamated json.hpp file [\#2934](https://github.com/nlohmann/json/issues/2934)
+- Copy to a variable inside a Structure [\#2933](https://github.com/nlohmann/json/issues/2933)
+- warning C4068: unknown pragma 'GCC' on MSVC/cl [\#2924](https://github.com/nlohmann/json/issues/2924)
+- Errors during ninja test [\#2918](https://github.com/nlohmann/json/issues/2918)
+- compiler warning: "not return a value" [\#2917](https://github.com/nlohmann/json/issues/2917)
+- Comparison floating points causes warning [\#2909](https://github.com/nlohmann/json/issues/2909)
+- Why can't I have std::vector\<json&\> testList? [\#2900](https://github.com/nlohmann/json/issues/2900)
+- \[json.hpp\] from releases doesnt work [\#2897](https://github.com/nlohmann/json/issues/2897)
+- g++ \(11\) -Wuseless-cast gives lots of warnings [\#2893](https://github.com/nlohmann/json/issues/2893)
+- Cannot serialize and immediatly deserialize json to/from bson [\#2892](https://github.com/nlohmann/json/issues/2892)
+- Floating-point precision conversion error [\#2876](https://github.com/nlohmann/json/issues/2876)
+- How to avoid escaping for an already escaped string in .dump\(\) [\#2870](https://github.com/nlohmann/json/issues/2870)
+- can't parse std::vector\<std::byte\> [\#2869](https://github.com/nlohmann/json/issues/2869)
+- ASAN detects memory leaks [\#2865](https://github.com/nlohmann/json/issues/2865)
+- Binary subtype field cannot represent all CBOR tags [\#2863](https://github.com/nlohmann/json/issues/2863)
+- string literals possibly being parsed as another type due to the presence of only digits and full-stops [\#2852](https://github.com/nlohmann/json/issues/2852)
+- json::parse\(\) works only with absolute paths [\#2851](https://github.com/nlohmann/json/issues/2851)
+- Compiler Warnings on Raspberry Pi OS [\#2850](https://github.com/nlohmann/json/issues/2850)
+- Braced initialization and aggregate initialization behavior is different for `json::array()` function call. [\#2848](https://github.com/nlohmann/json/issues/2848)
+- 3.9.1: test suite is failing [\#2845](https://github.com/nlohmann/json/issues/2845)
+- Documentation for macro JSON\_NO\_IO is missing [\#2842](https://github.com/nlohmann/json/issues/2842)
+- Assertion failure when inserting into arrays with JSON\_DIAGNOSTICS set [\#2838](https://github.com/nlohmann/json/issues/2838)
+- HELP! There is a memory leak in the code?! [\#2837](https://github.com/nlohmann/json/issues/2837)
+- Elegant conversion of a 2-D-json array to a standard C++ array [\#2805](https://github.com/nlohmann/json/issues/2805)
+- Swift Package Manager support [\#2802](https://github.com/nlohmann/json/issues/2802)
+- Referencing a subkey which doesn't exist gives crash [\#2797](https://github.com/nlohmann/json/issues/2797)
+- Failed benchmark due to renamed branch [\#2796](https://github.com/nlohmann/json/issues/2796)
+- Build Errors with VS 2019 and json Version 3.9.1 when attempting to replicate SAX Example [\#2782](https://github.com/nlohmann/json/issues/2782)
+- Value with spaces cannot be parsed [\#2781](https://github.com/nlohmann/json/issues/2781)
+- \[Question\] CBOR rfc support. [\#2779](https://github.com/nlohmann/json/issues/2779)
+- Using JSON.hpp header file in Visual Studio 2013 \(C++ Project\) [\#2775](https://github.com/nlohmann/json/issues/2775)
+- compilation error on clang-8 + C++17 [\#2759](https://github.com/nlohmann/json/issues/2759)
+- Undefined symbol EOF  [\#2755](https://github.com/nlohmann/json/issues/2755)
+- Parsing a string into json object behaves differently under g++ and MinGW compilers. [\#2746](https://github.com/nlohmann/json/issues/2746)
+- big git history size [\#2742](https://github.com/nlohmann/json/issues/2742)
+- How to get reference of std::vector\<T\> [\#2735](https://github.com/nlohmann/json/issues/2735)
+- CMake failure in VS2019 Community [\#2734](https://github.com/nlohmann/json/issues/2734)
+- Possibility to use with custom c++ version to use in intel sgx enclaves [\#2730](https://github.com/nlohmann/json/issues/2730)
+- Possibility to use without the dependency to file io and streams to use in intel sgx enclaves [\#2728](https://github.com/nlohmann/json/issues/2728)
+- error C2784& error C2839... in my visual studio 2015 compiler [\#2726](https://github.com/nlohmann/json/issues/2726)
+- `-fno-expection` not respected anymore in 3.9.1 [\#2725](https://github.com/nlohmann/json/issues/2725)
+- When exceptions disabled with JSON\_NOEXCEPTION, lib just aborts without any message [\#2724](https://github.com/nlohmann/json/issues/2724)
+- Critical error detected c0000374 on windows10 msvc 2019 16.8.5 [\#2710](https://github.com/nlohmann/json/issues/2710)
+- unused parameter error/warning [\#2706](https://github.com/nlohmann/json/issues/2706)
+- How to store data into a Map from json file [\#2691](https://github.com/nlohmann/json/issues/2691)
+- Tests do not compile with pre-release glibc [\#2686](https://github.com/nlohmann/json/issues/2686)
+- compile errors .... chromium-style [\#2680](https://github.com/nlohmann/json/issues/2680)
+- .dump\(\) not allowing compact form [\#2678](https://github.com/nlohmann/json/issues/2678)
+- error: no matching function for call to ‘nlohmann::basic\_json\<\>::value\(int, std::set\<int\>&\)’ [\#2671](https://github.com/nlohmann/json/issues/2671)
+- Compiler warning: unused parameter [\#2668](https://github.com/nlohmann/json/issues/2668)
+- Deserializing to a struct as shown on the project homepage throws compile time errors [\#2665](https://github.com/nlohmann/json/issues/2665)
+- Unable to compile on MSVC 2019 with SDL checking enabled: This function or variable may be unsafe [\#2664](https://github.com/nlohmann/json/issues/2664)
+- terminating with uncaught exception of type nlohmann::detail::type\_error: \[json.exception.type\_error.302\] type must be array, but is object [\#2661](https://github.com/nlohmann/json/issues/2661)
+- unused-parameter on OSX when Diagnostics is off [\#2658](https://github.com/nlohmann/json/issues/2658)
+- std::pair wrong serialization [\#2655](https://github.com/nlohmann/json/issues/2655)
+- The result of json is\_number\_integer\(\) function is wrong when read a json file  [\#2653](https://github.com/nlohmann/json/issues/2653)
+- 2 backslash cause problem [\#2652](https://github.com/nlohmann/json/issues/2652)
+- No support for using an external/system copy of Hedley [\#2651](https://github.com/nlohmann/json/issues/2651)
+- error: incomplete type 'qfloat16' used in type trait expression [\#2650](https://github.com/nlohmann/json/issues/2650)
+- Unused variable in exception class when not using improved diagnostics [\#2646](https://github.com/nlohmann/json/issues/2646)
+- I am trying to do this - converting from wstring works incorrectly! [\#2642](https://github.com/nlohmann/json/issues/2642)
+- Exception 207 On ARM Processor During Literal String Parsing [\#2634](https://github.com/nlohmann/json/issues/2634)
+- double free or corruption \(!prev\) error on Json push\_back and write [\#2632](https://github.com/nlohmann/json/issues/2632)
+- nlohmann::detail::parse\_error: syntax error while parsing CBOR string: expected length specification \(0x60-0x7B\) or indefinite string type \(0x7F\) [\#2629](https://github.com/nlohmann/json/issues/2629)
+- please allow disabling implicit conversions in non-single-file use [\#2621](https://github.com/nlohmann/json/issues/2621)
+- Preserve decimal formatting [\#2618](https://github.com/nlohmann/json/issues/2618)
+- Visual Studio Visual Assist code issues reported by VA code inspection of file json.hpp [\#2615](https://github.com/nlohmann/json/issues/2615)
+- Missing get function and no viable overloaded '=' on mac [\#2610](https://github.com/nlohmann/json/issues/2610)
+- corruption when parse from string [\#2603](https://github.com/nlohmann/json/issues/2603)
+- Parse from byte-vector results in compile error [\#2602](https://github.com/nlohmann/json/issues/2602)
+- Memory leak when working on ARM Linux [\#2601](https://github.com/nlohmann/json/issues/2601)
+- Unhandled exception in test-cbor.exe Stack overflow when debugging project with Visual Studio 2019 16.7.7 compiled with c++17 or c++latest [\#2598](https://github.com/nlohmann/json/issues/2598)
+- Error in download\_test\_data.vcxproj when compiling with Visual Studio 2019 16.7.7 Professional msbuild on Windows 10 2004 Professional [\#2594](https://github.com/nlohmann/json/issues/2594)
+- Warnings  C4715 and C4127 when building json-3.9.1 with Visual Studio 2019 16.7.7 [\#2592](https://github.com/nlohmann/json/issues/2592)
+- I tried some change to dump\(\) for \[1,2,3...\] [\#2584](https://github.com/nlohmann/json/issues/2584)
+- try/catch block does not catch parsing error [\#2579](https://github.com/nlohmann/json/issues/2579)
+- Serializing uint64\_t is broken for large values [\#2578](https://github.com/nlohmann/json/issues/2578)
+- deserializing arrays should be part of the library [\#2575](https://github.com/nlohmann/json/issues/2575)
+- Deserialization to std::array with non-default constructable types fails [\#2574](https://github.com/nlohmann/json/issues/2574)
+- Compilation error when trying to use same type for number\_integer\_t and number\_unsigned\_t in basic\_json template specification. [\#2573](https://github.com/nlohmann/json/issues/2573)
+- compiler error: directive output may be truncated writing between 2 and 8 bytes [\#2572](https://github.com/nlohmann/json/issues/2572)
+- Incorrect convert map to json when key cannot construct an string i.e. int  [\#2564](https://github.com/nlohmann/json/issues/2564)
+- no matching function for call to ‘nlohmann::basic\_json\<\>::basic\_json\(\<brace-enclosed initializer list\>\)’ [\#2559](https://github.com/nlohmann/json/issues/2559)
+- type\_error factory creates a dangling pointer \(in VisualStudio 2019\) [\#2535](https://github.com/nlohmann/json/issues/2535)
+- Cannot assign from ordered\_json vector\<CustomStruct\> to value in not ordered json [\#2528](https://github.com/nlohmann/json/issues/2528)
+- Qt6: Break changes [\#2519](https://github.com/nlohmann/json/issues/2519)
+- valgrind memcheck Illegal instruction when use nlohmann::json::parse [\#2518](https://github.com/nlohmann/json/issues/2518)
+- Buffer overflow [\#2515](https://github.com/nlohmann/json/issues/2515)
+- Including CTest in the top-level CMakeLists.txt sets BUILD\_TESTING=ON for parent projects [\#2513](https://github.com/nlohmann/json/issues/2513)
+- Compilation error when using NLOHMANN\_JSON\_SERIALIZE\_ENUM ordered\_json on libc++ [\#2491](https://github.com/nlohmann/json/issues/2491)
+- Missing "void insert\( InputIt first, InputIt last \);" overload in nlohmann::ordered\_map [\#2490](https://github.com/nlohmann/json/issues/2490)
+- Could not find a package configuration file provided by "nlohmann\_json" [\#2482](https://github.com/nlohmann/json/issues/2482)
+- json becomes empty for unknown reason [\#2470](https://github.com/nlohmann/json/issues/2470)
+- Using std::wstring as StringType fails compiling [\#2459](https://github.com/nlohmann/json/issues/2459)
+- Sample code in GIF slide outdated \(cannot use emplace\(\) with array\) [\#2457](https://github.com/nlohmann/json/issues/2457)
+- from\_json\<std::wstring\> is treated as an array on latest MSVC [\#2453](https://github.com/nlohmann/json/issues/2453)
+- MemorySanitizer: use-of-uninitialized-value [\#2449](https://github.com/nlohmann/json/issues/2449)
+- I need help [\#2441](https://github.com/nlohmann/json/issues/2441)
+- type conversion failing with clang ext\_vector\_type  [\#2436](https://github.com/nlohmann/json/issues/2436)
+- json::parse\(\) can't be resolved under specific circumstances [\#2427](https://github.com/nlohmann/json/issues/2427)
+- from\_\*\(ptr, len\) deprecation [\#2426](https://github.com/nlohmann/json/issues/2426)
+- Error ONLY in release mode [\#2425](https://github.com/nlohmann/json/issues/2425)
+- "Custom data source" exemple make no sense [\#2423](https://github.com/nlohmann/json/issues/2423)
+- Refuses to compile in project [\#2419](https://github.com/nlohmann/json/issues/2419)
+- Compilation failure of tests with C++20 standard \(caused by change of u8 literals\)  [\#2413](https://github.com/nlohmann/json/issues/2413)
+- No matching function for call to 'input\_adapter' under Xcode of with nlohmann version 3.9.1 [\#2412](https://github.com/nlohmann/json/issues/2412)
+- Git tags are not valid semvers [\#2409](https://github.com/nlohmann/json/issues/2409)
+- after dump, stderr output disappear [\#2403](https://github.com/nlohmann/json/issues/2403)
+- Using custom string. [\#2398](https://github.com/nlohmann/json/issues/2398)
+- value\(\) throws unhandled exception for partially specified json object [\#2393](https://github.com/nlohmann/json/issues/2393)
+- assertion on runtime causes program to stop when accessing const json with missing key [\#2392](https://github.com/nlohmann/json/issues/2392)
+- Usage with -fno-elide-constructors causes dump\(\) output to be array of `null`s [\#2387](https://github.com/nlohmann/json/issues/2387)
+- Build fails with clang-cl due to override of CMAKE\_CXX\_COMPILER\(?\) [\#2384](https://github.com/nlohmann/json/issues/2384)
+- std::optional not working with primitive types [\#2383](https://github.com/nlohmann/json/issues/2383)
+- Unexpected array when initializing a json const& on gcc 4.8.5 using uniform syntax [\#2370](https://github.com/nlohmann/json/issues/2370)
+- setprecision support [\#2362](https://github.com/nlohmann/json/issues/2362)
+- json::parse\(allow\_exceptions = false\) documentation is misleading. [\#2360](https://github.com/nlohmann/json/issues/2360)
+- std::begin and std::end usage without specifying std namespace [\#2359](https://github.com/nlohmann/json/issues/2359)
+- Custom object conversion to json hangs in background thread [\#2358](https://github.com/nlohmann/json/issues/2358)
+- Add support of nullable fields to NLOHMANN\_DEFINE\_TYPE\_NON\_INTRUSIVE and NLOHMANN\_DEFINE\_TYPE\_INTRUSIVE [\#2356](https://github.com/nlohmann/json/issues/2356)
+- the portfile for the vcpkg is not working. [\#2351](https://github.com/nlohmann/json/issues/2351)
+- Compiler warns of implicit fallthrough when defining preprocessor macro NDEBUG [\#2348](https://github.com/nlohmann/json/issues/2348)
+- Compile error on Intel compiler running in Windows [\#2346](https://github.com/nlohmann/json/issues/2346)
+- Build error caused by overwriting CMAKE\_CXX\_COMPILER [\#2343](https://github.com/nlohmann/json/issues/2343)
+- Error: an attribute list cannot appear here     JSON\_HEDLEY\_DEPRECATED\_FOR [\#2342](https://github.com/nlohmann/json/issues/2342)
+- compiler warning [\#2341](https://github.com/nlohmann/json/issues/2341)
+- 3.9.0: tests make build non-reproducible [\#2324](https://github.com/nlohmann/json/issues/2324)
+- Initialization different between gcc/clang [\#2311](https://github.com/nlohmann/json/issues/2311)
+- Attempt to `get()` a numeric value as a type which cannot represent it should throw [\#2310](https://github.com/nlohmann/json/issues/2310)
+- Surprising behaviour with overloaded operators [\#2256](https://github.com/nlohmann/json/issues/2256)
+- ADL issue in input\_adapter [\#2248](https://github.com/nlohmann/json/issues/2248)
+- Output adapters should be templated. [\#2172](https://github.com/nlohmann/json/issues/2172)
+- error when using nlohmann::json, std::function and std::bind [\#2147](https://github.com/nlohmann/json/issues/2147)
+- Remove undefined behavior for const operator\[\] [\#2111](https://github.com/nlohmann/json/issues/2111)
+- json\({}\) gives null instead of empty object with GCC and -std=c++17 [\#2046](https://github.com/nlohmann/json/issues/2046)
+- GDB pretty printing support [\#1952](https://github.com/nlohmann/json/issues/1952)
+- Always compile tests with all warnings enabled and error out on warnings [\#1798](https://github.com/nlohmann/json/issues/1798)
+- Fixes Cppcheck warnings [\#1759](https://github.com/nlohmann/json/issues/1759)
+- How to get position info or parser context with custom from\_json\(\) that may throw exceptions? [\#1508](https://github.com/nlohmann/json/issues/1508)
+- Suggestion to improve value\(\) accessors with respect to move semantics [\#1275](https://github.com/nlohmann/json/issues/1275)
+- Add Key name to Exception [\#932](https://github.com/nlohmann/json/issues/932)
+
+- Overwork warning flags [\#2936](https://github.com/nlohmann/json/pull/2936) ([nlohmann](https://github.com/nlohmann))
+- Treat MSVC warnings as errors [\#2930](https://github.com/nlohmann/json/pull/2930) ([nlohmann](https://github.com/nlohmann))
+- All: fix warnings when compiling with -Wswitch-enum [\#2927](https://github.com/nlohmann/json/pull/2927) ([fhuberts](https://github.com/fhuberts))
+- Guard GCC pragmas [\#2925](https://github.com/nlohmann/json/pull/2925) ([nlohmann](https://github.com/nlohmann))
+- Supress -Wfloat-equal on intended float comparisions [\#2911](https://github.com/nlohmann/json/pull/2911) ([Finkman](https://github.com/Finkman))
+- Fix binary subtypes [\#2908](https://github.com/nlohmann/json/pull/2908) ([nlohmann](https://github.com/nlohmann))
+- Fix useless-cast warnings [\#2902](https://github.com/nlohmann/json/pull/2902) ([nlohmann](https://github.com/nlohmann))
+- Add regression test [\#2898](https://github.com/nlohmann/json/pull/2898) ([nlohmann](https://github.com/nlohmann))
+- Refactor Unicode tests [\#2889](https://github.com/nlohmann/json/pull/2889) ([nlohmann](https://github.com/nlohmann))
+- CMake cleanup [\#2885](https://github.com/nlohmann/json/pull/2885) ([nlohmann](https://github.com/nlohmann))
+- Avoid string in case of empty CBOR objects [\#2879](https://github.com/nlohmann/json/pull/2879) ([nlohmann](https://github.com/nlohmann))
+- Suppress C4127 warning in unit-json\_pointer.cpp [\#2875](https://github.com/nlohmann/json/pull/2875) ([nlohmann](https://github.com/nlohmann))
+- Fix truncation warning [\#2874](https://github.com/nlohmann/json/pull/2874) ([nlohmann](https://github.com/nlohmann))
+- Fix memory leak in to\_json [\#2872](https://github.com/nlohmann/json/pull/2872) ([nlohmann](https://github.com/nlohmann))
+- Fix assertion failure in diagnostics [\#2866](https://github.com/nlohmann/json/pull/2866) ([nlohmann](https://github.com/nlohmann))
+- Update documentation [\#2861](https://github.com/nlohmann/json/pull/2861) ([nlohmann](https://github.com/nlohmann))
+- Consistency with `using` in README.md [\#2826](https://github.com/nlohmann/json/pull/2826) ([justanotheranonymoususer](https://github.com/justanotheranonymoususer))
+- Properly constrain the basic\_json conversion operator [\#2825](https://github.com/nlohmann/json/pull/2825) ([ldionne](https://github.com/ldionne))
+- Fix CI [\#2817](https://github.com/nlohmann/json/pull/2817) ([nlohmann](https://github.com/nlohmann))
+- Specified git branch for google benchmark fetch in benchmark test [\#2795](https://github.com/nlohmann/json/pull/2795) ([grafail](https://github.com/grafail))
+- Add C++ standards to macOS matrix [\#2790](https://github.com/nlohmann/json/pull/2790) ([nlohmann](https://github.com/nlohmann))
+- Update URLs to HTTPS [\#2789](https://github.com/nlohmann/json/pull/2789) ([TotalCaesar659](https://github.com/TotalCaesar659))
+- Link to Conan Center package added [\#2771](https://github.com/nlohmann/json/pull/2771) ([offa](https://github.com/offa))
+- Keep consistent formatting [\#2770](https://github.com/nlohmann/json/pull/2770) ([jasmcaus](https://github.com/jasmcaus))
+- Add a cmake option to use SYSTEM in target\_include\_directories [\#2762](https://github.com/nlohmann/json/pull/2762) ([jpl-mac](https://github.com/jpl-mac))
+- replace EOF with std::char\_traits\<char\>::eof\(\) [\#2756](https://github.com/nlohmann/json/pull/2756) ([nlohmann](https://github.com/nlohmann))
+- Fix typo in README [\#2754](https://github.com/nlohmann/json/pull/2754) ([mortenfyhn](https://github.com/mortenfyhn))
+- Update documentation [\#2749](https://github.com/nlohmann/json/pull/2749) ([nlohmann](https://github.com/nlohmann))
+- Add documentation for numbers [\#2747](https://github.com/nlohmann/json/pull/2747) ([nlohmann](https://github.com/nlohmann))
+- Use Clang 12 in CI [\#2737](https://github.com/nlohmann/json/pull/2737) ([nlohmann](https://github.com/nlohmann))
+- Fixes \#2730 [\#2731](https://github.com/nlohmann/json/pull/2731) ([theShmoo](https://github.com/theShmoo))
+- Possibility to use without the dependency to file io and streams to use in intel sgx enclaves [\#2729](https://github.com/nlohmann/json/pull/2729) ([theShmoo](https://github.com/theShmoo))
+- Update json.hpp [\#2707](https://github.com/nlohmann/json/pull/2707) ([raduteo](https://github.com/raduteo))
+- pkg-config.pc.in: Don't concatenate paths [\#2690](https://github.com/nlohmann/json/pull/2690) ([doronbehar](https://github.com/doronbehar))
+- add more CI steps [\#2689](https://github.com/nlohmann/json/pull/2689) ([nlohmann](https://github.com/nlohmann))
+- Update doctest from 2.4.4 to 2.4.6 \(fixes \#2686\) [\#2687](https://github.com/nlohmann/json/pull/2687) ([musicinmybrain](https://github.com/musicinmybrain))
+- License fix [\#2683](https://github.com/nlohmann/json/pull/2683) ([nlohmann](https://github.com/nlohmann))
+- Update parse\_exceptions.md - correct `json::exception::parse_error` [\#2679](https://github.com/nlohmann/json/pull/2679) ([frasermarlow](https://github.com/frasermarlow))
+- Remove HEDLEY annotation from exception::what\(\) [\#2673](https://github.com/nlohmann/json/pull/2673) ([remyjette](https://github.com/remyjette))
+- Fix amount of entries in the json object [\#2659](https://github.com/nlohmann/json/pull/2659) ([abbaswasim](https://github.com/abbaswasim))
+- Fix missing 1.78 in example in README.md [\#2625](https://github.com/nlohmann/json/pull/2625) ([wawiesel](https://github.com/wawiesel))
+- Add GDB pretty printer [\#2607](https://github.com/nlohmann/json/pull/2607) ([nlohmann](https://github.com/nlohmann))
+- readme: fix tilde character display [\#2582](https://github.com/nlohmann/json/pull/2582) ([bl-ue](https://github.com/bl-ue))
+- Add support for deserialization of STL containers of non-default constructable types \(fixes \#2574\). [\#2576](https://github.com/nlohmann/json/pull/2576) ([AnthonyVH](https://github.com/AnthonyVH))
+- Better diagnostics [\#2562](https://github.com/nlohmann/json/pull/2562) ([nlohmann](https://github.com/nlohmann))
+- CI targets [\#2561](https://github.com/nlohmann/json/pull/2561) ([nlohmann](https://github.com/nlohmann))
+- Add switch to skip non-reproducible tests. [\#2560](https://github.com/nlohmann/json/pull/2560) ([nlohmann](https://github.com/nlohmann))
+- Fix compilation of input\_adapter\(container\) in edge cases [\#2553](https://github.com/nlohmann/json/pull/2553) ([jasujm](https://github.com/jasujm))
+- Allow parsing from std::byte containers [\#2550](https://github.com/nlohmann/json/pull/2550) ([nlohmann](https://github.com/nlohmann))
+- Travis doesn't run any tests in C++17 mode [\#2540](https://github.com/nlohmann/json/pull/2540) ([karzhenkov](https://github.com/karzhenkov))
+- Doctest is updated to v2.4.3 [\#2538](https://github.com/nlohmann/json/pull/2538) ([YarikTH](https://github.com/YarikTH))
+- Fix warnings [\#2537](https://github.com/nlohmann/json/pull/2537) ([nlohmann](https://github.com/nlohmann))
+- Fix a shadowing warning [\#2536](https://github.com/nlohmann/json/pull/2536) ([nlohmann](https://github.com/nlohmann))
+- Clarify license of is\_complete\_type implementation [\#2534](https://github.com/nlohmann/json/pull/2534) ([nlohmann](https://github.com/nlohmann))
+- Do not unconditionally redefine C++14 constructs [\#2533](https://github.com/nlohmann/json/pull/2533) ([nlohmann](https://github.com/nlohmann))
+- Doctest is updated to v2.4.1 [\#2525](https://github.com/nlohmann/json/pull/2525) ([YarikTH](https://github.com/YarikTH))
+- Add MAIN\_PROJECT check for test and install options [\#2514](https://github.com/nlohmann/json/pull/2514) ([globberwops](https://github.com/globberwops))
+- Ranged insert test section is added in unit-ordered\_json.cpp [\#2512](https://github.com/nlohmann/json/pull/2512) ([YarikTH](https://github.com/YarikTH))
+- Add asserts to suppress C28020 [\#2447](https://github.com/nlohmann/json/pull/2447) ([jbzdarkid](https://github.com/jbzdarkid))
+- Change argument name "subtype" in byte\_container\_with\_subtype [\#2444](https://github.com/nlohmann/json/pull/2444) ([linev](https://github.com/linev))
+- �  add CPM.Cmake example [\#2406](https://github.com/nlohmann/json/pull/2406) ([leozz37](https://github.com/leozz37))
+- Fix move constructor of json\_ref [\#2405](https://github.com/nlohmann/json/pull/2405) ([karzhenkov](https://github.com/karzhenkov))
+- Properly select "Release" build for Travis [\#2375](https://github.com/nlohmann/json/pull/2375) ([karzhenkov](https://github.com/karzhenkov))
+- Update Hedley [\#2367](https://github.com/nlohmann/json/pull/2367) ([nlohmann](https://github.com/nlohmann))
+- Fix and extend documentation of discarded values [\#2363](https://github.com/nlohmann/json/pull/2363) ([nlohmann](https://github.com/nlohmann))
+- Fix typos in documentation [\#2354](https://github.com/nlohmann/json/pull/2354) ([rbuch](https://github.com/rbuch))
+- Remove "\#define private public" from tests [\#2352](https://github.com/nlohmann/json/pull/2352) ([nlohmann](https://github.com/nlohmann))
+- Remove -Wimplicit-fallthrough warning [\#2349](https://github.com/nlohmann/json/pull/2349) ([nlohmann](https://github.com/nlohmann))
+- Fix code to work without exceptions [\#2347](https://github.com/nlohmann/json/pull/2347) ([nlohmann](https://github.com/nlohmann))
+- fix cmake script overwriting compiler path [\#2344](https://github.com/nlohmann/json/pull/2344) ([ongjunjie](https://github.com/ongjunjie))
+
 ## [v3.9.1](https://github.com/nlohmann/json/releases/tag/v3.9.1) (2020-08-06)
 
 [Full Changelog](https://github.com/nlohmann/json/compare/v3.9.0...v3.9.1)
@@ -22,7 +613,6 @@ All notable changes to this project will be documented in this file. This projec
 - Fix a bug due to missing overloads in ordered\_map container [\#2319](https://github.com/nlohmann/json/pull/2319) ([nlohmann](https://github.com/nlohmann))
 - cmake: install pkg-config file relative to current\_binary\_dir [\#2318](https://github.com/nlohmann/json/pull/2318) ([eli-schwartz](https://github.com/eli-schwartz))
 - Fixed installation of pkg-config file on other than Ubuntu [\#2314](https://github.com/nlohmann/json/pull/2314) ([xvitaly](https://github.com/xvitaly))
-- Cleanup [\#2303](https://github.com/nlohmann/json/pull/2303) ([nlohmann](https://github.com/nlohmann))
 
 ## [v3.9.0](https://github.com/nlohmann/json/releases/tag/v3.9.0) (2020-07-27)
 
@@ -103,6 +693,7 @@ All notable changes to this project will be documented in this file. This projec
 - Fix bug in CBOR tag handling [\#2308](https://github.com/nlohmann/json/pull/2308) ([nlohmann](https://github.com/nlohmann))
 - added inline to NLOHMANN\_DEFINE\_TYPE\_NON\_INTRUSIVE macro [\#2306](https://github.com/nlohmann/json/pull/2306) ([jwittbrodt](https://github.com/jwittbrodt))
 - fixes unused variable 'ex' for \#2304 [\#2305](https://github.com/nlohmann/json/pull/2305) ([AODQ](https://github.com/AODQ))
+- Cleanup [\#2303](https://github.com/nlohmann/json/pull/2303) ([nlohmann](https://github.com/nlohmann))
 - Add test with multiple translation units [\#2301](https://github.com/nlohmann/json/pull/2301) ([nlohmann](https://github.com/nlohmann))
 - Merge GitHub actions [\#2300](https://github.com/nlohmann/json/pull/2300) ([nlohmann](https://github.com/nlohmann))
 - Fix unused parameter [\#2299](https://github.com/nlohmann/json/pull/2299) ([nlohmann](https://github.com/nlohmann))
@@ -135,7 +726,7 @@ All notable changes to this project will be documented in this file. This projec
 - Use unsigned indizies for array index in json pointer [\#2203](https://github.com/nlohmann/json/pull/2203) ([t-b](https://github.com/t-b))
 - Add option to not rely on Internet connectivity during test stage [\#2202](https://github.com/nlohmann/json/pull/2202) ([nlohmann](https://github.com/nlohmann))
 - Serialize floating-point numbers with 32 bit when possible \(MessagePack\) [\#2201](https://github.com/nlohmann/json/pull/2201) ([nlohmann](https://github.com/nlohmann))
-- Fix consistency in function `int\_to\_string\(\)` [\#2193](https://github.com/nlohmann/json/pull/2193) ([dota17](https://github.com/dota17))
+- Fix consistency in function `int_to_string()` [\#2193](https://github.com/nlohmann/json/pull/2193) ([dota17](https://github.com/dota17))
 - Fix issue\#1275 [\#2181](https://github.com/nlohmann/json/pull/2181) ([dota17](https://github.com/dota17))
 - C++20 support by removing swap specialization [\#2176](https://github.com/nlohmann/json/pull/2176) ([gracicot](https://github.com/gracicot))
 - Feat/explicit conversion operator [\#1559](https://github.com/nlohmann/json/pull/1559) ([theodelrieu](https://github.com/theodelrieu))
@@ -291,7 +882,6 @@ All notable changes to this project will be documented in this file. This projec
 - forced type conversion or lexical cast without exception. [\#1955](https://github.com/nlohmann/json/issues/1955)
 - Add json\_view type support to avoid excessive copying [\#1954](https://github.com/nlohmann/json/issues/1954)
 - Adding "examples" section for real-life usages [\#1953](https://github.com/nlohmann/json/issues/1953)
-- GDB pretty printing support [\#1952](https://github.com/nlohmann/json/issues/1952)
 - Add nlohmann::json::key\_type [\#1951](https://github.com/nlohmann/json/issues/1951)
 - cannot use operator\[\] with a string argument with string [\#1949](https://github.com/nlohmann/json/issues/1949)
 - std::ifstream \>\> json error [\#1948](https://github.com/nlohmann/json/issues/1948)
@@ -387,7 +977,7 @@ All notable changes to this project will be documented in this file. This projec
 - Serialize big data in json [\#1828](https://github.com/nlohmann/json/issues/1828)
 - Backslash '\' in value causes exception [\#1827](https://github.com/nlohmann/json/issues/1827)
 - from\_json for non default constructible class with dependency injection [\#1819](https://github.com/nlohmann/json/issues/1819)
-- Semi-frequent timeouts in `test-unicode\_all` with 3.6.1 \(aarch64\) [\#1816](https://github.com/nlohmann/json/issues/1816)
+- Semi-frequent timeouts in `test-unicode_all` with 3.6.1 \(aarch64\) [\#1816](https://github.com/nlohmann/json/issues/1816)
 - input\_adapter not user extensible [\#1813](https://github.com/nlohmann/json/issues/1813)
 - crash at json::destroy on android  [\#1812](https://github.com/nlohmann/json/issues/1812)
 - Logs are repeating while cmake [\#1809](https://github.com/nlohmann/json/issues/1809)
@@ -455,11 +1045,33 @@ All notable changes to this project will be documented in this file. This projec
 - Fix issue\#1719 [\#2044](https://github.com/nlohmann/json/pull/2044) ([dota17](https://github.com/dota17))
 - Add missing testcase about NaN in unit-constructor1.cpp [\#2043](https://github.com/nlohmann/json/pull/2043) ([dota17](https://github.com/dota17))
 - Templatize basic\_json constructor from json\_ref [\#2034](https://github.com/nlohmann/json/pull/2034) ([ArtemSarmini](https://github.com/ArtemSarmini))
+- Replace deprecated std::is\_pod [\#2033](https://github.com/nlohmann/json/pull/2033) ([nlohmann](https://github.com/nlohmann))
+- Fixes \#1971 \(memory leak in basic\_json::push\_back\) [\#2025](https://github.com/nlohmann/json/pull/2025) ([ArtemSarmini](https://github.com/ArtemSarmini))
 - fix \#1982:json\_pointer.contains\(\) exception is incorrectly raised [\#2019](https://github.com/nlohmann/json/pull/2019) ([dota17](https://github.com/dota17))
+- Update LICENSE.MIT [\#2010](https://github.com/nlohmann/json/pull/2010) ([magamig](https://github.com/magamig))
+- PR for \#2006 to test in AppVeyor. [\#2008](https://github.com/nlohmann/json/pull/2008) ([garethsb](https://github.com/garethsb))
+- Added wsjcpp.yml [\#2004](https://github.com/nlohmann/json/pull/2004) ([sea-kg](https://github.com/sea-kg))
+- fix error 'setw' is not a member of 'std' in Wandbox example [\#2002](https://github.com/nlohmann/json/pull/2002) ([alexandermyasnikov](https://github.com/alexandermyasnikov))
 - catch exceptions for json\_pointer : ..../+99 [\#1990](https://github.com/nlohmann/json/pull/1990) ([dota17](https://github.com/dota17))
+- Modify the document about operator== [\#1984](https://github.com/nlohmann/json/pull/1984) ([dota17](https://github.com/dota17))
+- Rename argument array\_index to array\_indx in json\_pointer methods [\#1980](https://github.com/nlohmann/json/pull/1980) ([linev](https://github.com/linev))
+- README: Fix string representation of `dump`ed `json` [\#1979](https://github.com/nlohmann/json/pull/1979) ([alexweej](https://github.com/alexweej))
 - fix warnings in serializer.hpp for VS2019 [\#1969](https://github.com/nlohmann/json/pull/1969) ([dota17](https://github.com/dota17))
 - Fix C26451 warnnings in to\_chars.hpp [\#1967](https://github.com/nlohmann/json/pull/1967) ([dota17](https://github.com/dota17))
+- appveyor.yml: Compile and test with latest version for \_\_cplusplus ma… [\#1958](https://github.com/nlohmann/json/pull/1958) ([t-b](https://github.com/t-b))
+- Fix typo in examples [\#1956](https://github.com/nlohmann/json/pull/1956) ([dota17](https://github.com/dota17))
 - templated input adapters [\#1950](https://github.com/nlohmann/json/pull/1950) ([FrancoisChabot](https://github.com/FrancoisChabot))
+- Update README.md : add a FAQ about memory release [\#1933](https://github.com/nlohmann/json/pull/1933) ([dota17](https://github.com/dota17))
+- Some typos [\#1923](https://github.com/nlohmann/json/pull/1923) ([Coeur](https://github.com/Coeur))
+- Fix link to parse function in README [\#1918](https://github.com/nlohmann/json/pull/1918) ([kastiglione](https://github.com/kastiglione))
+- Readme: Updated links to hunter repo & docs [\#1917](https://github.com/nlohmann/json/pull/1917) ([jothepro](https://github.com/jothepro))
+- Adds instruction for using Build2's package manager [\#1909](https://github.com/nlohmann/json/pull/1909) ([Klaim](https://github.com/Klaim))
+- Update README.md [\#1907](https://github.com/nlohmann/json/pull/1907) ([pauljurczak](https://github.com/pauljurczak))
+- Fix warning: ignoring return value [\#1871](https://github.com/nlohmann/json/pull/1871) ([sonulohani](https://github.com/sonulohani))
+- docs: add central repository as conan source to readme [\#1857](https://github.com/nlohmann/json/pull/1857) ([gocarlos](https://github.com/gocarlos))
+- README: Package in MSYS2 renamed to nlohmann-json [\#1853](https://github.com/nlohmann/json/pull/1853) ([podsvirov](https://github.com/podsvirov))
+- Fix msvc warnings [\#1846](https://github.com/nlohmann/json/pull/1846) ([MBalszun](https://github.com/MBalszun))
+- Update tests that generate CMake projects to use main project's C++ compiler [\#1844](https://github.com/nlohmann/json/pull/1844) ([Tridacnid](https://github.com/Tridacnid))
 - make CMake's version config file architecture-independent [\#1746](https://github.com/nlohmann/json/pull/1746) ([uhoreg](https://github.com/uhoreg))
 - Add binary type support to all binary file formats, as well as an internally represented binary type [\#1662](https://github.com/nlohmann/json/pull/1662) ([OmnipotentEntity](https://github.com/OmnipotentEntity))
 
@@ -489,7 +1101,7 @@ All notable changes to this project will be documented in this file. This projec
 - Segmentation fault \(stack overflow\) due to unbounded recursion [\#1419](https://github.com/nlohmann/json/issues/1419)
 - Stack-overflow \(OSS-Fuzz 4234\) [\#832](https://github.com/nlohmann/json/issues/832)
 
-- Configure WhiteSource Bolt for GitHub [\#1830](https://github.com/nlohmann/json/pull/1830) ([whitesource-bolt-for-github[bot]](https://github.com/apps/whitesource-bolt-for-github))
+- Configure WhiteSource Bolt for GitHub [\#1830](https://github.com/nlohmann/json/pull/1830) ([mend-bolt-for-github[bot]](https://github.com/apps/mend-bolt-for-github))
 - Prevent stackoverflow caused by recursive deconstruction [\#1436](https://github.com/nlohmann/json/pull/1436) ([nickaein](https://github.com/nickaein))
 
 ## [v3.7.1](https://github.com/nlohmann/json/releases/tag/v3.7.1) (2019-11-06)
@@ -501,7 +1113,7 @@ All notable changes to this project will be documented in this file. This projec
 - json class should have a get\_or member function [\#1823](https://github.com/nlohmann/json/issues/1823)
 - NLOHMANN\_JSON\_SERIALIZE\_ENUM macro capture's json objects by value [\#1822](https://github.com/nlohmann/json/issues/1822)
 - Parse fails when number literals start with zero [\#1820](https://github.com/nlohmann/json/issues/1820)
-- Weird behaviour of `contains` with `json\_pointer` [\#1815](https://github.com/nlohmann/json/issues/1815)
+- Weird behaviour of `contains` with `json_pointer` [\#1815](https://github.com/nlohmann/json/issues/1815)
 - strange behaviour with json\_pointer and .contains\(\) [\#1811](https://github.com/nlohmann/json/issues/1811)
 - Can \#1695 be re-opened? [\#1808](https://github.com/nlohmann/json/issues/1808)
 - Merge two json objects [\#1807](https://github.com/nlohmann/json/issues/1807)
@@ -534,7 +1146,7 @@ All notable changes to this project will be documented in this file. This projec
 - \[Nested Json Objects\] Segmentation fault [\#1753](https://github.com/nlohmann/json/issues/1753)
 - remove/replace assert with exceptions [\#1752](https://github.com/nlohmann/json/issues/1752)
 - Add array support for update\(\) function [\#1751](https://github.com/nlohmann/json/issues/1751)
-- Is there a reason the `get\_to` method is defined in `include/nlohmann/json.hpp` but not in `single\_include/nlohmann/json.hpp`? [\#1750](https://github.com/nlohmann/json/issues/1750)
+- Is there a reason the `get_to` method is defined in `include/nlohmann/json.hpp` but not in `single_include/nlohmann/json.hpp`? [\#1750](https://github.com/nlohmann/json/issues/1750)
 - how to validate json object before calling dump\(\) [\#1748](https://github.com/nlohmann/json/issues/1748)
 - Unable to invoke accessors on json objects in lldb [\#1745](https://github.com/nlohmann/json/issues/1745)
 - Escaping string before parsing [\#1743](https://github.com/nlohmann/json/issues/1743)
@@ -580,7 +1192,6 @@ All notable changes to this project will be documented in this file. This projec
 - Information: My project uses this awesome library [\#1691](https://github.com/nlohmann/json/issues/1691)
 - Consider listing files explicitly instead of using GLOB [\#1686](https://github.com/nlohmann/json/issues/1686)
 - Failing tests on MSVC with VS2019 15.9.13 x64 [\#1685](https://github.com/nlohmann/json/issues/1685)
-- Consider putting the user-defined literals in a namespace [\#1682](https://github.com/nlohmann/json/issues/1682)
 - Change from v2 to v3. Encoding with cp1252 [\#1680](https://github.com/nlohmann/json/issues/1680)
 - How to add Fifo\_map into json using Cmake [\#1679](https://github.com/nlohmann/json/issues/1679)
 - include.zip should contain meson.build [\#1672](https://github.com/nlohmann/json/issues/1672)
@@ -690,7 +1301,7 @@ All notable changes to this project will be documented in this file. This projec
 - json::parse return value and errors [\#1595](https://github.com/nlohmann/json/issues/1595)
 - initializer list constructor makes curly brace initialization fragile [\#1594](https://github.com/nlohmann/json/issues/1594)
 - trying to log message for missing keyword, difference between \["foo"\] and at\("foo"\) [\#1593](https://github.com/nlohmann/json/issues/1593)
-- std::string and std::wstring `to\_json`  [\#1592](https://github.com/nlohmann/json/issues/1592)
+- std::string and std::wstring `to_json`  [\#1592](https://github.com/nlohmann/json/issues/1592)
 - I have a C structure which I need to convert to a JSON. How do I do it? Haven't found proper examples so far. [\#1591](https://github.com/nlohmann/json/issues/1591)
 - dump\_escaped possible error ? [\#1589](https://github.com/nlohmann/json/issues/1589)
 - json::parse\(\) into a vector\<string\> results in unhandled exception [\#1587](https://github.com/nlohmann/json/issues/1587)
@@ -732,20 +1343,17 @@ All notable changes to this project will be documented in this file. This projec
 - \[Help Needed!\] Season of Docs [\#1542](https://github.com/nlohmann/json/issues/1542)
 - program still abort\(\) or exit\(\) with try catch [\#1541](https://github.com/nlohmann/json/issues/1541)
 - Have a json::type\_error exception because of JSON object [\#1540](https://github.com/nlohmann/json/issues/1540)
-- Using versioned namespaces [\#1539](https://github.com/nlohmann/json/issues/1539)
 - Quoted numbers [\#1538](https://github.com/nlohmann/json/issues/1538)
 - Reading a JSON file into an object [\#1537](https://github.com/nlohmann/json/issues/1537)
 - Releases 3.6.0 and 3.6.1 don't build on conda / windows [\#1536](https://github.com/nlohmann/json/issues/1536)
 - \[Clang\] warning: use of the 'nodiscard' attribute is a C++17 extension \[-Wc++17-extensions\] [\#1535](https://github.com/nlohmann/json/issues/1535)
 - wchar\_t/std::wstring json can be created but not accessed [\#1533](https://github.com/nlohmann/json/issues/1533)
 - json stringify [\#1532](https://github.com/nlohmann/json/issues/1532)
-- How can I use std::string\_view as the json\_key to "operator \[\]" ? [\#1529](https://github.com/nlohmann/json/issues/1529)
 - How can I use it from gcc on RPI [\#1528](https://github.com/nlohmann/json/issues/1528)
-- std::pair treated as an array instead of key-value in `std::vector\<std::pair\<\>\>` [\#1520](https://github.com/nlohmann/json/issues/1520)
+- std::pair treated as an array instead of key-value in `std::vector<std::pair<>>` [\#1520](https://github.com/nlohmann/json/issues/1520)
 - Excessive Memory Usage for Large Json File [\#1516](https://github.com/nlohmann/json/issues/1516)
 - SAX dumper [\#1512](https://github.com/nlohmann/json/issues/1512)
 - Conversion to user type containing a std::vector not working with documented approach [\#1511](https://github.com/nlohmann/json/issues/1511)
-- How to get position info or parser context with custom from\_json\(\) that may throw exceptions? [\#1508](https://github.com/nlohmann/json/issues/1508)
 - Inconsistent use of type alias. [\#1507](https://github.com/nlohmann/json/issues/1507)
 - Is there a current way to represent strings as json int? [\#1503](https://github.com/nlohmann/json/issues/1503)
 - Intermittent issues with loadJSON [\#1484](https://github.com/nlohmann/json/issues/1484)
@@ -795,7 +1403,7 @@ All notable changes to this project will be documented in this file. This projec
 - Json object from string from a TCP socket [\#1504](https://github.com/nlohmann/json/issues/1504)
 - MSVC warning C4946 \("reinterpret\_cast used between related classes"\) compiling json.hpp [\#1502](https://github.com/nlohmann/json/issues/1502)
 - How to programmatically fill an n-th dimensional JSON object? [\#1501](https://github.com/nlohmann/json/issues/1501)
-- Error compiling with clang and `JSON\_NOEXCEPTION`: need to include `cstdlib` [\#1500](https://github.com/nlohmann/json/issues/1500)
+- Error compiling with clang and `JSON_NOEXCEPTION`: need to include `cstdlib` [\#1500](https://github.com/nlohmann/json/issues/1500)
 - The code compiles unsuccessfully with android-ndk-r10e [\#1499](https://github.com/nlohmann/json/issues/1499)
 - Cmake 3.1 in develop, when is it likely to make it into a stable release? [\#1498](https://github.com/nlohmann/json/issues/1498)
 - Some Help please object inside array [\#1494](https://github.com/nlohmann/json/issues/1494)
@@ -814,7 +1422,7 @@ All notable changes to this project will be documented in this file. This projec
 - Unable to modify one of the values within the JSON file, and save it  [\#1475](https://github.com/nlohmann/json/issues/1475)
 - Documentation of parse function has two identical @pre causes [\#1473](https://github.com/nlohmann/json/issues/1473)
 - GCC 9.0 build failure [\#1472](https://github.com/nlohmann/json/issues/1472)
-- Can we have an `exists\(\)` method? [\#1471](https://github.com/nlohmann/json/issues/1471)
+- Can we have an `exists()` method? [\#1471](https://github.com/nlohmann/json/issues/1471)
 - How to parse multi object json from file? [\#1470](https://github.com/nlohmann/json/issues/1470)
 - How to returns the name of the upper object? [\#1467](https://github.com/nlohmann/json/issues/1467)
 - Error: "tuple\_size" has already been declared in the current scope [\#1466](https://github.com/nlohmann/json/issues/1466)
@@ -875,7 +1483,7 @@ All notable changes to this project will be documented in this file. This projec
 - Do proper endian conversions [\#1489](https://github.com/nlohmann/json/pull/1489) ([andreas-schwab](https://github.com/andreas-schwab))
 - Fix documentation [\#1477](https://github.com/nlohmann/json/pull/1477) ([nickaein](https://github.com/nickaein))
 - Implement contains\(\) member function [\#1474](https://github.com/nlohmann/json/pull/1474) ([nickaein](https://github.com/nickaein))
-- Add operator/= and operator/ to construct a JSON pointer by appending two JSON pointers [\#1469](https://github.com/nlohmann/json/pull/1469) ([garethsb-sony](https://github.com/garethsb-sony))
+- Add operator/= and operator/ to construct a JSON pointer by appending two JSON pointers [\#1469](https://github.com/nlohmann/json/pull/1469) ([garethsb](https://github.com/garethsb))
 - Disable Clang -Wmismatched-tags warning on tuple\_size / tuple\_element [\#1468](https://github.com/nlohmann/json/pull/1468) ([past-due](https://github.com/past-due))
 - Disable installation when used as meson subproject. \#1463 [\#1464](https://github.com/nlohmann/json/pull/1464) ([elvisoric](https://github.com/elvisoric))
 - docs: README typo [\#1455](https://github.com/nlohmann/json/pull/1455) ([wythe](https://github.com/wythe))
@@ -892,7 +1500,6 @@ All notable changes to this project will be documented in this file. This projec
 - Fix x64 target platform for appveyor [\#1414](https://github.com/nlohmann/json/pull/1414) ([nickaein](https://github.com/nickaein))
 - Improve dump\_integer performance [\#1411](https://github.com/nlohmann/json/pull/1411) ([nickaein](https://github.com/nickaein))
 - buildsystem: relax requirement on cmake version [\#1409](https://github.com/nlohmann/json/pull/1409) ([yann-morin-1998](https://github.com/yann-morin-1998))
--  Added Support for Structured Bindings  [\#1391](https://github.com/nlohmann/json/pull/1391) ([pratikpc](https://github.com/pratikpc))
 - CMake: Optional Install if Embedded [\#1330](https://github.com/nlohmann/json/pull/1330) ([ax3l](https://github.com/ax3l))
 
 ## [v3.5.0](https://github.com/nlohmann/json/releases/tag/v3.5.0) (2018-12-21)
@@ -902,7 +1509,6 @@ All notable changes to this project will be documented in this file. This projec
 - Copyconstructor inserts original into array with single element [\#1397](https://github.com/nlohmann/json/issues/1397)
 - Get value without explicit typecasting [\#1395](https://github.com/nlohmann/json/issues/1395)
 - Big file parsing [\#1393](https://github.com/nlohmann/json/issues/1393)
-- some static analysis warning at line 11317 [\#1390](https://github.com/nlohmann/json/issues/1390)
 - Adding Structured Binding Support [\#1388](https://github.com/nlohmann/json/issues/1388)
 - map\<json::value\_t, string\> exhibits unexpected behavior [\#1387](https://github.com/nlohmann/json/issues/1387)
 - Error Code Return [\#1386](https://github.com/nlohmann/json/issues/1386)
@@ -962,6 +1568,7 @@ All notable changes to this project will be documented in this file. This projec
 - Check value for existence by json\_pointer [\#1194](https://github.com/nlohmann/json/issues/1194)
 
 - Feature/add file input adapter [\#1392](https://github.com/nlohmann/json/pull/1392) ([dumarjo](https://github.com/dumarjo))
+-  Added Support for Structured Bindings  [\#1391](https://github.com/nlohmann/json/pull/1391) ([pratikpc](https://github.com/pratikpc))
 - Link to issue \#958 broken [\#1382](https://github.com/nlohmann/json/pull/1382) ([kjpus](https://github.com/kjpus))
 - readme: fix typo [\#1380](https://github.com/nlohmann/json/pull/1380) ([manu-chroma](https://github.com/manu-chroma))
 - recommend using explicit from JSON conversions [\#1363](https://github.com/nlohmann/json/pull/1363) ([theodelrieu](https://github.com/theodelrieu))
@@ -970,7 +1577,6 @@ All notable changes to this project will be documented in this file. This projec
 - Set eofbit on exhausted input stream. [\#1343](https://github.com/nlohmann/json/pull/1343) ([mefyl](https://github.com/mefyl))
 - Add a SFINAE friendly iterator\_traits and use that instead. [\#1342](https://github.com/nlohmann/json/pull/1342) ([dgavedissian](https://github.com/dgavedissian))
 - Fix EOL Whitespaces & CMake Spelling [\#1329](https://github.com/nlohmann/json/pull/1329) ([ax3l](https://github.com/ax3l))
-- Add BSON support [\#1320](https://github.com/nlohmann/json/pull/1320) ([nlohmann](https://github.com/nlohmann))
 
 ## [v3.4.0](https://github.com/nlohmann/json/releases/tag/v3.4.0) (2018-10-30)
 
@@ -1003,13 +1609,13 @@ All notable changes to this project will be documented in this file. This projec
 - syntax error  on right json string [\#1276](https://github.com/nlohmann/json/issues/1276)
 - Parsing JSON Array where members have no key, using custom types [\#1267](https://github.com/nlohmann/json/issues/1267)
 - I get a json exception periodically from json::parse for the same json  [\#1263](https://github.com/nlohmann/json/issues/1263)
-- serialize std::variant\<...\> [\#1261](https://github.com/nlohmann/json/issues/1261)
 - GCC 8.2.1. Compilation error: invalid conversion from... [\#1246](https://github.com/nlohmann/json/issues/1246)
 - BSON support [\#1244](https://github.com/nlohmann/json/issues/1244)
 - enum to json mapping [\#1208](https://github.com/nlohmann/json/issues/1208)
 - Soften the landing when dumping non-UTF8 strings \(type\_error.316 exception\) [\#1198](https://github.com/nlohmann/json/issues/1198)
 
 - Add macro to define enum/JSON mapping [\#1323](https://github.com/nlohmann/json/pull/1323) ([nlohmann](https://github.com/nlohmann))
+- Add BSON support [\#1320](https://github.com/nlohmann/json/pull/1320) ([nlohmann](https://github.com/nlohmann))
 - Properly convert constants to CharType [\#1315](https://github.com/nlohmann/json/pull/1315) ([nlohmann](https://github.com/nlohmann))
 - Allow to set error handler for decoding errors [\#1314](https://github.com/nlohmann/json/pull/1314) ([nlohmann](https://github.com/nlohmann))
 - Add Meson related info to README [\#1305](https://github.com/nlohmann/json/pull/1305) ([koponomarenko](https://github.com/koponomarenko))
@@ -1108,7 +1714,7 @@ All notable changes to this project will be documented in this file. This projec
 - Add key name when throwing type error [\#1189](https://github.com/nlohmann/json/issues/1189)
 - Not able to include in visual studio code? [\#1188](https://github.com/nlohmann/json/issues/1188)
 - Get an Index or row number of an element [\#1186](https://github.com/nlohmann/json/issues/1186)
-- Difference between `merge\_patch` and `update` [\#1183](https://github.com/nlohmann/json/issues/1183)
+- Difference between `merge_patch` and `update` [\#1183](https://github.com/nlohmann/json/issues/1183)
 - Is there a way to get an element from a JSON without throwing an exception on failure? [\#1182](https://github.com/nlohmann/json/issues/1182)
 - to\_string? [\#1181](https://github.com/nlohmann/json/issues/1181)
 - How to cache a json object's pointer into a map? [\#1180](https://github.com/nlohmann/json/issues/1180)
@@ -1244,7 +1850,6 @@ All notable changes to this project will be documented in this file. This projec
 - How to create a json variable? [\#990](https://github.com/nlohmann/json/issues/990)
 - istream \>\> json  --- 1st character skipped in stream [\#976](https://github.com/nlohmann/json/issues/976)
 - Add a SAX parser [\#971](https://github.com/nlohmann/json/issues/971)
-- Add Key name to Exception [\#932](https://github.com/nlohmann/json/issues/932)
 - How to solve large json file? [\#927](https://github.com/nlohmann/json/issues/927)
 - json\_pointer public push\_back, pop\_back [\#837](https://github.com/nlohmann/json/issues/837)
 - Using input\_adapter in a slightly unexpected way [\#834](https://github.com/nlohmann/json/issues/834)
@@ -1298,7 +1903,7 @@ All notable changes to this project will be documented in this file. This projec
 - "forcing MSVC stacktrace to show which T we're talking about." error [\#980](https://github.com/nlohmann/json/issues/980)
 - reverse order of serialization  [\#979](https://github.com/nlohmann/json/issues/979)
 - Assigning between different json types [\#977](https://github.com/nlohmann/json/issues/977)
-- Support serialisation of `unique\_ptr\<\>` and `shared\_ptr\<\>` [\#975](https://github.com/nlohmann/json/issues/975)
+- Support serialisation of `unique_ptr<>` and `shared_ptr<>` [\#975](https://github.com/nlohmann/json/issues/975)
 - Unexpected end of input \(not same as one before\) [\#974](https://github.com/nlohmann/json/issues/974)
 - Segfault on direct initializing json object [\#973](https://github.com/nlohmann/json/issues/973)
 - Segmentation fault on G++ when trying to assign json string literal to custom json type. [\#972](https://github.com/nlohmann/json/issues/972)
@@ -1521,7 +2126,6 @@ All notable changes to this project will be documented in this file. This projec
 - Compilation error with unordered\_map\< int, int \> [\#758](https://github.com/nlohmann/json/issues/758)
 - CBOR string [\#757](https://github.com/nlohmann/json/issues/757)
 - Proposal: out\_of\_range should be a subclass of std::out\_of\_range [\#756](https://github.com/nlohmann/json/issues/756)
-- Compiling with icpc [\#755](https://github.com/nlohmann/json/issues/755)
 - Getter is setting the value to null if the key does not exist [\#754](https://github.com/nlohmann/json/issues/754)
 - parsing works sometimes and crashes others [\#752](https://github.com/nlohmann/json/issues/752)
 - Static\_assert failed "incompatible pointer type" with Xcode [\#751](https://github.com/nlohmann/json/issues/751)
@@ -1597,7 +2201,7 @@ All notable changes to this project will be documented in this file. This projec
 - Compilation "note" on GCC 6 ARM [\#658](https://github.com/nlohmann/json/issues/658)
 - Adding additional push\_back/operator+= rvalue overloads for JSON object [\#657](https://github.com/nlohmann/json/issues/657)
 - dump's parameter "ensure\_ascii" creates too long sequences [\#656](https://github.com/nlohmann/json/issues/656)
-- Question: parsing `void \*` [\#655](https://github.com/nlohmann/json/issues/655)
+- Question: parsing `void *` [\#655](https://github.com/nlohmann/json/issues/655)
 - how should I check a string is valid JSON string ? [\#653](https://github.com/nlohmann/json/issues/653)
 - Question: thread safety of read only accesses [\#651](https://github.com/nlohmann/json/issues/651)
 - Eclipse: Method 'size' could not be resolved [\#649](https://github.com/nlohmann/json/issues/649)
@@ -1626,7 +2230,7 @@ All notable changes to this project will be documented in this file. This projec
 - Insertion into nested json field [\#621](https://github.com/nlohmann/json/issues/621)
 - Question: return static json object from function [\#618](https://github.com/nlohmann/json/issues/618)
 - icc16 error [\#617](https://github.com/nlohmann/json/issues/617)
-- \[-Wdeprecated-declarations\] in row `j \>\> ss;` in file `json.hpp:7405:26` and FAILED unit tests with MinGWx64! [\#616](https://github.com/nlohmann/json/issues/616)
+- \[-Wdeprecated-declarations\] in row `j >> ss;` in file `json.hpp:7405:26` and FAILED unit tests with MinGWx64! [\#616](https://github.com/nlohmann/json/issues/616)
 - to\_json for pairs, tuples [\#614](https://github.com/nlohmann/json/issues/614)
 - Using uninitialized memory 'buf' in line 11173 v2.1.1? [\#613](https://github.com/nlohmann/json/issues/613)
 - How to parse multiple same Keys of JSON and save them? [\#612](https://github.com/nlohmann/json/issues/612)
@@ -1686,7 +2290,7 @@ All notable changes to this project will be documented in this file. This projec
 - Duplicate symbols error happens while to\_json/from\_json method implemented inside entity definition header file [\#542](https://github.com/nlohmann/json/issues/542)
 - consider adding a bool json::is\_valid\(std::string const&\) non-member function [\#541](https://github.com/nlohmann/json/issues/541)
 - Help request [\#539](https://github.com/nlohmann/json/issues/539)
-- How to deal with missing keys in `from\_json`? [\#538](https://github.com/nlohmann/json/issues/538)
+- How to deal with missing keys in `from_json`? [\#538](https://github.com/nlohmann/json/issues/538)
 - recursive from\_msgpack implementation will stack overflow [\#537](https://github.com/nlohmann/json/issues/537)
 - Exception objects must be nothrow copy constructible \(ERR60-CPP\) [\#531](https://github.com/nlohmann/json/issues/531)
 - Support for multiple root elements [\#529](https://github.com/nlohmann/json/issues/529)
@@ -1792,6 +2396,35 @@ All notable changes to this project will be documented in this file. This projec
 - Digraph warning [\#679](https://github.com/nlohmann/json/pull/679) ([traits](https://github.com/traits))
 - massage -\> message [\#678](https://github.com/nlohmann/json/pull/678) ([DmitryKuk](https://github.com/DmitryKuk))
 - Fix "not constraint" grammar in docs [\#674](https://github.com/nlohmann/json/pull/674) ([wincent](https://github.com/wincent))
+- Add documentation for integration with CMake and hunter [\#671](https://github.com/nlohmann/json/pull/671) ([dan-42](https://github.com/dan-42))
+- REFACTOR: rewrite CMakeLists.txt for better inlcude and reuse [\#669](https://github.com/nlohmann/json/pull/669) ([dan-42](https://github.com/dan-42))
+- enable\_testing only if the JSON\_BuildTests is ON [\#666](https://github.com/nlohmann/json/pull/666) ([effolkronium](https://github.com/effolkronium))
+- Support moving from rvalues in std::initializer\_list [\#663](https://github.com/nlohmann/json/pull/663) ([himikof](https://github.com/himikof))
+- add ensure\_ascii parameter to dump. \#330 [\#654](https://github.com/nlohmann/json/pull/654) ([ryanjmulder](https://github.com/ryanjmulder))
+- Rename BuildTests to JSON\_BuildTests [\#652](https://github.com/nlohmann/json/pull/652) ([olegendo](https://github.com/olegendo))
+- Don't include \<iostream\>, use std::make\_shared [\#650](https://github.com/nlohmann/json/pull/650) ([olegendo](https://github.com/olegendo))
+- Refacto/split basic json [\#643](https://github.com/nlohmann/json/pull/643) ([theodelrieu](https://github.com/theodelrieu))
+- fix typo in operator\_\_notequal example [\#630](https://github.com/nlohmann/json/pull/630) ([Chocobo1](https://github.com/Chocobo1))
+- Fix MSVC warning C4819 [\#629](https://github.com/nlohmann/json/pull/629) ([Chocobo1](https://github.com/Chocobo1))
+- \[BugFix\] Add parentheses around std::min [\#626](https://github.com/nlohmann/json/pull/626) ([koemeet](https://github.com/koemeet))
+- add pair/tuple conversions [\#624](https://github.com/nlohmann/json/pull/624) ([theodelrieu](https://github.com/theodelrieu))
+- remove std::pair support [\#615](https://github.com/nlohmann/json/pull/615) ([theodelrieu](https://github.com/theodelrieu))
+- Add pair support, fix CompatibleObject conversions \(fixes \#600\) [\#609](https://github.com/nlohmann/json/pull/609) ([theodelrieu](https://github.com/theodelrieu))
+- \#550 Fix iterator related compiling issues for Intel icc [\#598](https://github.com/nlohmann/json/pull/598) ([HenryRLee](https://github.com/HenryRLee))
+- Issue \#593 Fix the arithmetic operators in the iterator and reverse iterator [\#595](https://github.com/nlohmann/json/pull/595) ([HenryRLee](https://github.com/HenryRLee))
+- fix doxygen error of basic\_json::get\(\) [\#583](https://github.com/nlohmann/json/pull/583) ([zhaohuaxishi](https://github.com/zhaohuaxishi))
+- Fixing assignement for iterator wrapper second, and adding unit test [\#579](https://github.com/nlohmann/json/pull/579) ([Type1J](https://github.com/Type1J))
+- Adding first and second properties to iteration\_proxy\_internal [\#578](https://github.com/nlohmann/json/pull/578) ([Type1J](https://github.com/Type1J))
+- Adding support for Meson. [\#576](https://github.com/nlohmann/json/pull/576) ([Type1J](https://github.com/Type1J))
+- add enum class default conversions [\#545](https://github.com/nlohmann/json/pull/545) ([theodelrieu](https://github.com/theodelrieu))
+- Properly pop diagnostics [\#540](https://github.com/nlohmann/json/pull/540) ([tinloaf](https://github.com/tinloaf))
+- Add Visual Studio 17 image to appveyor build matrix [\#536](https://github.com/nlohmann/json/pull/536) ([vpetrigo](https://github.com/vpetrigo))
+- UTF8 encoding enhancement [\#534](https://github.com/nlohmann/json/pull/534) ([TedLyngmo](https://github.com/TedLyngmo))
+- Fix typo [\#530](https://github.com/nlohmann/json/pull/530) ([berkus](https://github.com/berkus))
+- Make exception base class visible in basic\_json [\#526](https://github.com/nlohmann/json/pull/526) ([ghost](https://github.com/ghost))
+- :art: Namespace `uint8_t` from the C++ stdlib [\#510](https://github.com/nlohmann/json/pull/510) ([alexweej](https://github.com/alexweej))
+- add to\_json method for C arrays [\#508](https://github.com/nlohmann/json/pull/508) ([theodelrieu](https://github.com/theodelrieu))
+- Fix -Weffc++ warnings \(GNU 6.3.1\) [\#496](https://github.com/nlohmann/json/pull/496) ([TedLyngmo](https://github.com/TedLyngmo))
 
 ## [v2.1.1](https://github.com/nlohmann/json/releases/tag/v2.1.1) (2017-02-25)
 
@@ -1997,7 +2630,6 @@ All notable changes to this project will be documented in this file. This projec
 - Fix usage examples' comments for std::multiset [\#321](https://github.com/nlohmann/json/pull/321) ([vasild](https://github.com/vasild))
 - Include dir relocation [\#318](https://github.com/nlohmann/json/pull/318) ([ChristophJud](https://github.com/ChristophJud))
 - trivial documentation fix [\#313](https://github.com/nlohmann/json/pull/313) ([5tefan](https://github.com/5tefan))
-- unit-constructor1.cpp: Fix floating point truncation warning [\#300](https://github.com/nlohmann/json/pull/300) ([t-b](https://github.com/t-b))
 
 ## [v2.0.5](https://github.com/nlohmann/json/releases/tag/v2.0.5) (2016-09-14)
 
@@ -2030,6 +2662,8 @@ All notable changes to this project will be documented in this file. This projec
 - Incorrect parsing of large int64\_t numbers [\#287](https://github.com/nlohmann/json/issues/287)
 - \[question\]: macro to disable floating point support [\#284](https://github.com/nlohmann/json/issues/284)
 
+- unit-constructor1.cpp: Fix floating point truncation warning [\#300](https://github.com/nlohmann/json/pull/300) ([t-b](https://github.com/t-b))
+
 ## [v2.0.2](https://github.com/nlohmann/json/releases/tag/v2.0.2) (2016-07-31)
 
 [Full Changelog](https://github.com/nlohmann/json/compare/v2.0.1...v2.0.2)
@@ -2106,6 +2740,7 @@ All notable changes to this project will be documented in this file. This projec
 - What is within scope? [\#192](https://github.com/nlohmann/json/issues/192)
 - Bugs in miloyip/nativejson-benchmark: roundtrips [\#187](https://github.com/nlohmann/json/issues/187)
 - Floating point exceptions [\#181](https://github.com/nlohmann/json/issues/181)
+- Integer conversion to unsigned [\#178](https://github.com/nlohmann/json/issues/178)
 - map string string fails to compile [\#176](https://github.com/nlohmann/json/issues/176)
 - In basic\_json::basic\_json\(const CompatibleArrayType& val\), the requirement of CompatibleArrayType is not strict enough. [\#174](https://github.com/nlohmann/json/issues/174)
 - Provide a FAQ [\#163](https://github.com/nlohmann/json/issues/163)
@@ -2124,6 +2759,7 @@ All notable changes to this project will be documented in this file. This projec
 - fixed noexcept; added constexpr [\#208](https://github.com/nlohmann/json/pull/208) ([nlohmann](https://github.com/nlohmann))
 - Add support for afl-fuzz testing [\#207](https://github.com/nlohmann/json/pull/207) ([mykter](https://github.com/mykter))
 - replaced ssize\_t occurrences with auto \(addresses \#204\) [\#205](https://github.com/nlohmann/json/pull/205) ([nlohmann](https://github.com/nlohmann))
+- Fixed issue \#199 - Small bugs in json.hpp \(get\_number\) and unit.cpp \(non-standard integer type test\) [\#200](https://github.com/nlohmann/json/pull/200) ([twelsby](https://github.com/twelsby))
 - Fix broken link [\#197](https://github.com/nlohmann/json/pull/197) ([vog](https://github.com/vog))
 - Issue \#195 - update Travis to Trusty due to gcc/clang strtod\(\) bug [\#196](https://github.com/nlohmann/json/pull/196) ([twelsby](https://github.com/twelsby))
 - Issue \#178 - Extending support to full uint64\_t/int64\_t range and unsigned type \(updated\) [\#193](https://github.com/nlohmann/json/pull/193) ([twelsby](https://github.com/twelsby))
@@ -2137,7 +2773,6 @@ All notable changes to this project will be documented in this file. This projec
 - Floating point equality [\#185](https://github.com/nlohmann/json/issues/185)
 - Unused variables in catch [\#180](https://github.com/nlohmann/json/issues/180)
 - Typo in documentation [\#179](https://github.com/nlohmann/json/issues/179)
-- Integer conversion to unsigned [\#178](https://github.com/nlohmann/json/issues/178)
 - JSON performance benchmark comparision [\#177](https://github.com/nlohmann/json/issues/177)
 - Since re2c is often ignored in pull requests, it may make sense to make a contributing.md file [\#175](https://github.com/nlohmann/json/issues/175)
 - Question about exceptions [\#173](https://github.com/nlohmann/json/issues/173)
@@ -2151,11 +2786,11 @@ All notable changes to this project will be documented in this file. This projec
 - range based for loop for objects [\#83](https://github.com/nlohmann/json/issues/83)
 - Consider submitting this to the Boost Library Incubator [\#66](https://github.com/nlohmann/json/issues/66)
 
-- Fixed issue \#199 - Small bugs in json.hpp \(get\_number\) and unit.cpp \(non-standard integer type test\) [\#200](https://github.com/nlohmann/json/pull/200) ([twelsby](https://github.com/twelsby))
 - Fixed Issue \#186 - add strto\(f|d|ld\) overload wrappers, "-0.0" special case and FP trailing zero [\#191](https://github.com/nlohmann/json/pull/191) ([twelsby](https://github.com/twelsby))
 - Issue \#185 - remove approx\(\) and use \#pragma to kill warnings [\#190](https://github.com/nlohmann/json/pull/190) ([twelsby](https://github.com/twelsby))
 - Fixed Issue \#171 - added two extra template overloads of operator\[\] for T\* arguments [\#189](https://github.com/nlohmann/json/pull/189) ([twelsby](https://github.com/twelsby))
 - Fixed issue \#167 - removed operator ValueType\(\) condition for VS2015 [\#188](https://github.com/nlohmann/json/pull/188) ([twelsby](https://github.com/twelsby))
+- Implementation of get\_ref\(\) [\#184](https://github.com/nlohmann/json/pull/184) ([dariomt](https://github.com/dariomt))
 - Fixed some typos in CONTRIBUTING.md [\#182](https://github.com/nlohmann/json/pull/182) ([nibroc](https://github.com/nibroc))
 
 ## [v1.0.0](https://github.com/nlohmann/json/releases/tag/v1.0.0) (2015-12-27)
@@ -2165,7 +2800,7 @@ All notable changes to this project will be documented in this file. This projec
 - add key name to exception [\#160](https://github.com/nlohmann/json/issues/160)
 - Getting member discarding qualifyer [\#159](https://github.com/nlohmann/json/issues/159)
 - basic\_json::iterator::value\(\) output includes quotes while basic\_json::iterator::key\(\) doesn't [\#158](https://github.com/nlohmann/json/issues/158)
-- Indexing `const basic\_json\<\>` with `const basic\_string\<char\>` [\#157](https://github.com/nlohmann/json/issues/157)
+- Indexing `const basic_json<>` with `const basic_string<char>` [\#157](https://github.com/nlohmann/json/issues/157)
 - token\_type\_name\(token\_type t\): not all control paths return a value [\#156](https://github.com/nlohmann/json/issues/156)
 - prevent json.hpp from emitting compiler warnings [\#154](https://github.com/nlohmann/json/issues/154)
 - json::parse\(string\) does not check utf8 bom [\#152](https://github.com/nlohmann/json/issues/152)
@@ -2197,7 +2832,6 @@ All notable changes to this project will be documented in this file. This projec
 - Wishlist [\#65](https://github.com/nlohmann/json/issues/65)
 - Windows/Visual Studio \(through 2013\) is unsupported [\#62](https://github.com/nlohmann/json/issues/62)
 
-- Implementation of get\_ref\(\) [\#184](https://github.com/nlohmann/json/pull/184) ([dariomt](https://github.com/dariomt))
 - Replace sprintf with hex function, this fixes \#149 [\#153](https://github.com/nlohmann/json/pull/153) ([whackashoe](https://github.com/whackashoe))
 - Fix character skipping after a surrogate pair [\#146](https://github.com/nlohmann/json/pull/146) ([robertmrk](https://github.com/robertmrk))
 - Detect correctly pointer-to-const [\#137](https://github.com/nlohmann/json/pull/137) ([dariomt](https://github.com/dariomt))
@@ -2284,13 +2918,25 @@ All notable changes to this project will be documented in this file. This projec
 - Remove useless typename [\#86](https://github.com/nlohmann/json/pull/86) ([ahamez](https://github.com/ahamez))
 - Avoid warning with Xcode's clang [\#85](https://github.com/nlohmann/json/pull/85) ([ahamez](https://github.com/ahamez))
 -  Fix typos [\#73](https://github.com/nlohmann/json/pull/73) ([aqnouch](https://github.com/aqnouch))
-- Replace `default\_callback` function with `nullptr` and check for null… [\#72](https://github.com/nlohmann/json/pull/72) ([aburgh](https://github.com/aburgh))
+- Replace `default_callback` function with `nullptr` and check for null… [\#72](https://github.com/nlohmann/json/pull/72) ([aburgh](https://github.com/aburgh))
 - support enum [\#71](https://github.com/nlohmann/json/pull/71) ([likebeta](https://github.com/likebeta))
 - Fix performance regression introduced with the parsing callback feature. [\#69](https://github.com/nlohmann/json/pull/69) ([aburgh](https://github.com/aburgh))
 - Improve the implementations of the comparission-operators [\#63](https://github.com/nlohmann/json/pull/63) ([Florianjw](https://github.com/Florianjw))
 - Fix compilation of json\_unit with GCC 5 [\#59](https://github.com/nlohmann/json/pull/59) ([dkopecek](https://github.com/dkopecek))
 - Parse streams incrementally. [\#40](https://github.com/nlohmann/json/pull/40) ([aburgh](https://github.com/aburgh))
 - Feature/small float serialization [\#38](https://github.com/nlohmann/json/pull/38) ([jrandall](https://github.com/jrandall))
+- template version with re2c scanner [\#36](https://github.com/nlohmann/json/pull/36) ([nlohmann](https://github.com/nlohmann))
+- more descriptive documentation in example [\#33](https://github.com/nlohmann/json/pull/33) ([luxe](https://github.com/luxe))
+- Fix string conversion under Clang [\#26](https://github.com/nlohmann/json/pull/26) ([wancw](https://github.com/wancw))
+- Fixed dumping of strings [\#24](https://github.com/nlohmann/json/pull/24) ([Teemperor](https://github.com/Teemperor))
+- Added a remark to the readme that coverage is GCC only for now [\#23](https://github.com/nlohmann/json/pull/23) ([Teemperor](https://github.com/Teemperor))
+- Unicode escaping [\#22](https://github.com/nlohmann/json/pull/22) ([Teemperor](https://github.com/Teemperor))
+- Implemented the JSON spec for string parsing for everything but the \uXXXX escaping [\#21](https://github.com/nlohmann/json/pull/21) ([Teemperor](https://github.com/Teemperor))
+- add the std iterator typedefs to iterator and const\_iterator [\#19](https://github.com/nlohmann/json/pull/19) ([kirkshoop](https://github.com/kirkshoop))
+- Fixed escaped quotes [\#18](https://github.com/nlohmann/json/pull/18) ([Teemperor](https://github.com/Teemperor))
+- Fix double delete on std::bad\_alloc exception [\#14](https://github.com/nlohmann/json/pull/14) ([elliotgoodrich](https://github.com/elliotgoodrich))
+- Added CMake and lcov [\#6](https://github.com/nlohmann/json/pull/6) ([Teemperor](https://github.com/Teemperor))
+- Version 2.0 [\#5](https://github.com/nlohmann/json/pull/5) ([nlohmann](https://github.com/nlohmann))
 
 
 
diff --git a/external_imported/json/LICENSE.MIT b/external_imported/json/LICENSE.MIT
index f0622d6dc..1c1f7a690 100644
--- a/external_imported/json/LICENSE.MIT
+++ b/external_imported/json/LICENSE.MIT
@@ -1,6 +1,6 @@
 MIT License 
 
-Copyright (c) 2013-2021 Niels Lohmann
+Copyright (c) 2013-2022 Niels Lohmann
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/external_imported/json/LICENSES/Apache-2.0.txt b/external_imported/json/LICENSES/Apache-2.0.txt
new file mode 100644
index 000000000..137069b82
--- /dev/null
+++ b/external_imported/json/LICENSES/Apache-2.0.txt
@@ -0,0 +1,73 @@
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+
+     (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and
+
+     (b) You must cause any modified files to carry prominent notices stating that You changed the files; and
+
+     (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
+
+     (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
+
+     You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!)  The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/external_imported/json/LICENSES/BSD-3-Clause.txt b/external_imported/json/LICENSES/BSD-3-Clause.txt
new file mode 100644
index 000000000..ea890afbc
--- /dev/null
+++ b/external_imported/json/LICENSES/BSD-3-Clause.txt
@@ -0,0 +1,11 @@
+Copyright (c) <year> <owner>. 
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+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.
+
+3. Neither the name of the copyright holder 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 HOLDER 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.
diff --git a/external_imported/json/LICENSES/GPL-3.0-only.txt b/external_imported/json/LICENSES/GPL-3.0-only.txt
new file mode 100644
index 000000000..d41c0bd98
--- /dev/null
+++ b/external_imported/json/LICENSES/GPL-3.0-only.txt
@@ -0,0 +1,232 @@
+GNU GENERAL PUBLIC LICENSE
+Version 3, 29 June 2007
+
+Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/>
+
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+
+Preamble
+
+The GNU General Public License is a free, copyleft license for software and other kinds of works.
+
+The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things.
+
+To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others.
+
+For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
+
+Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it.
+
+For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions.
+
+Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users.
+
+Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free.
+
+The precise terms and conditions for copying, distribution and modification follow.
+
+TERMS AND CONDITIONS
+
+0. Definitions.
+
+“This License� refers to version 3 of the GNU General Public License.
+
+“Copyright� also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.
+
+“The Program� refers to any copyrightable work licensed under this License. Each licensee is addressed as “you�. “Licensees� and “recipients� may be individuals or organizations.
+
+To “modify� a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a “modified version� of the earlier work or a work “based on� the earlier work.
+
+A “covered work� means either the unmodified Program or a work based on the Program.
+
+To “propagate� a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well.
+
+To “convey� a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying.
+
+An interactive user interface displays “Appropriate Legal Notices� to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion.
+
+1. Source Code.
+The “source code� for a work means the preferred form of the work for making modifications to it. “Object code� means any non-source form of a work.
+
+A “Standard Interface� means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language.
+
+The “System Libraries� of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A “Major Component�, in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it.
+
+The “Corresponding Source� for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work.
+
+The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source.
+
+The Corresponding Source for a work in source code form is that same work.
+
+2. Basic Permissions.
+All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law.
+
+You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you.
+
+Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
+
+3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures.
+
+When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures.
+
+4. Conveying Verbatim Copies.
+You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program.
+
+You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee.
+
+5. Conveying Modified Source Versions.
+You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions:
+
+     a) The work must carry prominent notices stating that you modified it, and giving a relevant date.
+
+     b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to “keep intact all notices�.
+
+     c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it.
+
+     d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so.
+
+A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an “aggregate� if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate.
+
+6. Conveying Non-Source Forms.
+You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways:
+
+     a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange.
+
+     b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge.
+
+     c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b.
+
+     d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements.
+
+     e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d.
+
+A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work.
+
+A “User Product� is either (1) a “consumer product�, which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, “normally used� refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product.
+
+“Installation Information� for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made.
+
+If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM).
+
+The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network.
+
+Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying.
+
+7. Additional Terms.
+“Additional permissions� are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions.
+
+When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission.
+
+Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms:
+
+     a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or
+
+     b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or
+
+     c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or
+
+     d) Limiting the use for publicity purposes of names of licensors or authors of the material; or
+
+     e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or
+
+     f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors.
+
+All other non-permissive additional terms are considered “further restrictions� within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying.
+
+If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms.
+
+Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way.
+
+8. Termination.
+You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11).
+
+However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.
+
+Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10.
+
+9. Acceptance Not Required for Having Copies.
+You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so.
+
+10. Automatic Licensing of Downstream Recipients.
+Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License.
+
+An “entity transaction� is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts.
+
+You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it.
+
+11. Patents.
+A “contributor� is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's “contributor version�.
+
+A contributor's “essential patent claims� are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, “control� includes the right to grant patent sublicenses in a manner consistent with the requirements of this License.
+
+Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version.
+
+In the following three paragraphs, a “patent license� is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To “grant� such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party.
+
+If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. “Knowingly relying� means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid.
+
+If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it.
+
+A patent license is “discriminatory� if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007.
+
+Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law.
+
+12. No Surrender of Others' Freedom.
+If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program.
+
+13. Use with the GNU Affero General Public License.
+Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such.
+
+14. Revised Versions of this License.
+The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License “or any later version� applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation.
+
+If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program.
+
+Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version.
+
+15. Disclaimer of Warranty.
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS� WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+16. Limitation of Liability.
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+17. Interpretation of Sections 15 and 16.
+If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee.
+
+END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the “copyright� line and a pointer to where the full notice is found.
+
+     <one line to give the program's name and a brief idea of what it does.>
+     Copyright (C) <year>  <name of author>
+
+     This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+
+     This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public License along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode:
+
+     <program>  Copyright (C) <year>  <name of author>
+     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+     This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, your program's commands might be different; for a GUI interface, you would use an “about box�.
+
+You should also get your employer (if you work as a programmer) or school, if any, to sign a “copyright disclaimer� for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see <http://www.gnu.org/licenses/>.
+
+The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read <http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/external_imported/json/LICENSES/MIT.txt b/external_imported/json/LICENSES/MIT.txt
new file mode 100644
index 000000000..2071b23b0
--- /dev/null
+++ b/external_imported/json/LICENSES/MIT.txt
@@ -0,0 +1,9 @@
+MIT License
+
+Copyright (c) <year> <copyright holders>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/external_imported/json/Makefile b/external_imported/json/Makefile
index d3963f503..a1b4e7328 100644
--- a/external_imported/json/Makefile
+++ b/external_imported/json/Makefile
@@ -4,9 +4,6 @@
 # configuration
 ##########################################################################
 
-# directory to recent compiler binaries
-COMPILER_DIR=/usr/local/opt/llvm/bin
-
 # find GNU sed to use `-i` parameter
 SED:=$(shell command -v gsed || which sed)
 
@@ -18,8 +15,12 @@ SED:=$(shell command -v gsed || which sed)
 # the list of sources in the include folder
 SRCS=$(shell find include -type f | sort)
 
-# the single header (amalgamated from the source files)
+# the list of sources in the tests folder
+TESTS_SRCS=$(shell find tests -type f \( -name '*.hpp' -o -name '*.cpp' -o -name '*.cu' \) -not -path 'tests/thirdparty/*' -not -path 'tests/abi/include/nlohmann/*' | sort)
+
+# the single headers (amalgamated from the source files)
 AMALGAMATED_FILE=single_include/nlohmann/json.hpp
+AMALGAMATED_FWD_FILE=single_include/nlohmann/json_fwd.hpp
 
 
 ##########################################################################
@@ -28,346 +29,28 @@ AMALGAMATED_FILE=single_include/nlohmann/json.hpp
 
 # main target
 all:
-	@echo "amalgamate - amalgamate file single_include/nlohmann/json.hpp from the include/nlohmann sources"
+	@echo "amalgamate - amalgamate files single_include/nlohmann/json{,_fwd}.hpp from the include/nlohmann sources"
 	@echo "ChangeLog.md - generate ChangeLog file"
 	@echo "check-amalgamation - check whether sources have been amalgamated"
 	@echo "clean - remove built files"
-	@echo "coverage - create coverage information with lcov"
-	@echo "cppcheck - analyze code with cppcheck"
-	@echo "cpplint - analyze code with cpplint"
-	@echo "clang_tidy - analyze code with Clang-Tidy"
-	@echo "clang_analyze - analyze code with Clang-Analyzer"
 	@echo "doctest - compile example files and check their output"
 	@echo "fuzz_testing - prepare fuzz testing of the JSON parser"
 	@echo "fuzz_testing_bson - prepare fuzz testing of the BSON parser"
 	@echo "fuzz_testing_cbor - prepare fuzz testing of the CBOR parser"
 	@echo "fuzz_testing_msgpack - prepare fuzz testing of the MessagePack parser"
 	@echo "fuzz_testing_ubjson - prepare fuzz testing of the UBJSON parser"
-	@echo "pedantic_clang - run Clang with maximal warning flags"
-	@echo "pedantic_gcc - run GCC with maximal warning flags"
 	@echo "pretty - beautify code with Artistic Style"
 	@echo "run_benchmarks - build and run benchmarks"
 
 
-##########################################################################
-# coverage
-##########################################################################
-
-coverage:
-	rm -fr cmake-build-coverage
-	mkdir cmake-build-coverage
-	cd cmake-build-coverage ; cmake .. -GNinja -DCMAKE_BUILD_TYPE=Debug -DJSON_Coverage=ON -DJSON_MultipleHeaders=ON
-	cd cmake-build-coverage ; ninja
-	cd cmake-build-coverage ; ctest -j10
-	cd cmake-build-coverage ; ninja lcov_html
-	open cmake-build-coverage/test/html/index.html
-
 ##########################################################################
 # documentation tests
 ##########################################################################
 
 # compile example files and check output
 doctest:
-	$(MAKE) check_output -C doc
-
-
-##########################################################################
-# warning detector
-##########################################################################
+	$(MAKE) check_output -C docs
 
-# calling Clang with all warnings, except:
-# -Wno-c++2a-compat: u8 literals will behave differently in C++20...
-# -Wno-deprecated-declarations: the library deprecated some functions
-# -Wno-documentation-unknown-command: code uses user-defined commands like @complexity
-# -Wno-exit-time-destructors: warning in json code triggered by NLOHMANN_JSON_SERIALIZE_ENUM
-# -Wno-float-equal: not all comparisons in the tests can be replaced by Approx
-# -Wno-missing-prototypes: for NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE
-# -Wno-padded: padding is nothing to warn about
-# -Wno-range-loop-analysis: items tests "for(const auto i...)"
-# -Wno-extra-semi-stmt: spurious warnings for semicolons after JSON_ASSERT()
-# -Wno-switch-enum -Wno-covered-switch-default: pedantic/contradicting warnings about switches
-# -Wno-weak-vtables: exception class is defined inline, but has virtual method
-pedantic_clang:
-	rm -fr cmake-build-pedantic
-	CXXFLAGS=" \
-		-std=c++11 -Wno-c++98-compat -Wno-c++98-compat-pedantic \
-		-Werror \
-		-Weverything \
-		-Wno-c++2a-compat \
-		-Wno-deprecated-declarations \
-		-Wno-documentation-unknown-command \
-		-Wno-exit-time-destructors \
-		-Wno-float-equal \
-		-Wno-missing-prototypes \
-		-Wno-padded \
-		-Wno-range-loop-analysis \
-		-Wno-extra-semi-stmt \
-		-Wno-switch-enum -Wno-covered-switch-default \
-		-Wno-weak-vtables" cmake -S . -B cmake-build-pedantic -GNinja -DCMAKE_BUILD_TYPE=Debug -DJSON_MultipleHeaders=ON -DJSON_BuildTests=On
-	cmake --build cmake-build-pedantic
-
-# calling GCC with most warnings
-pedantic_gcc:
-	rm -fr cmake-build-pedantic
-	CXXFLAGS=" \
-		-std=c++11 \
-		-pedantic \
-		-Werror \
-		--all-warnings                                    \
-		--extra-warnings                                  \
-		-W                                                \
-		-Wno-abi-tag                                         \
-		-Waddress                                         \
-		-Waddress-of-packed-member                        \
-		-Wno-aggregate-return                                \
-		-Waggressive-loop-optimizations                   \
-		-Waligned-new=all                                 \
-		-Wall                                             \
-		-Walloc-zero                                      \
-		-Walloca                                          \
-		-Wanalyzer-double-fclose                          \
-		-Wanalyzer-double-free                            \
-		-Wanalyzer-exposure-through-output-file           \
-		-Wanalyzer-file-leak                              \
-		-Wanalyzer-free-of-non-heap                       \
-		-Wanalyzer-malloc-leak                            \
-		-Wanalyzer-null-argument                          \
-		-Wanalyzer-null-dereference                       \
-		-Wanalyzer-possible-null-argument                 \
-		-Wanalyzer-possible-null-dereference              \
-		-Wanalyzer-stale-setjmp-buffer                    \
-		-Wanalyzer-tainted-array-index                    \
-		-Wanalyzer-too-complex                            \
-		-Wanalyzer-unsafe-call-within-signal-handler      \
-		-Wanalyzer-use-after-free                         \
-		-Wanalyzer-use-of-pointer-in-stale-stack-frame    \
-		-Warith-conversion                                \
-		-Warray-bounds                                    \
-		-Warray-bounds=2                                  \
-		-Wattribute-alias=2                               \
-		-Wattribute-warning                               \
-		-Wattributes                                      \
-		-Wbool-compare                                    \
-		-Wbool-operation                                  \
-		-Wbuiltin-declaration-mismatch                    \
-		-Wbuiltin-macro-redefined                         \
-		-Wc++0x-compat                                    \
-		-Wc++11-compat                                    \
-		-Wc++14-compat                                    \
-		-Wc++17-compat                                    \
-		-Wc++1z-compat                                    \
-		-Wc++20-compat                                    \
-		-Wc++2a-compat                                    \
-		-Wcannot-profile                                  \
-		-Wcast-align                                      \
-		-Wcast-align=strict                               \
-		-Wcast-function-type                              \
-		-Wcast-qual                                       \
-		-Wcatch-value=3                                   \
-		-Wchar-subscripts                                 \
-		-Wclass-conversion                                \
-		-Wclass-memaccess                                 \
-		-Wclobbered                                       \
-		-Wcomma-subscript                                 \
-		-Wcomment                                         \
-		-Wcomments                                        \
-		-Wconditionally-supported                         \
-		-Wconversion                                      \
-		-Wconversion-null                                 \
-		-Wcoverage-mismatch                               \
-		-Wcpp                                             \
-		-Wctor-dtor-privacy                               \
-		-Wdangling-else                                   \
-		-Wdate-time                                       \
-		-Wdelete-incomplete                               \
-		-Wdelete-non-virtual-dtor                         \
-		-Wdeprecated                                      \
-		-Wdeprecated-copy                                 \
-		-Wdeprecated-copy-dtor                            \
-		-Wdeprecated-declarations                         \
-		-Wdisabled-optimization                           \
-		-Wdiv-by-zero                                     \
-		-Wdouble-promotion                                \
-		-Wduplicated-branches                             \
-		-Wduplicated-cond                                 \
-		-Weffc++                                          \
-		-Wempty-body                                      \
-		-Wendif-labels                                    \
-		-Wenum-compare                                    \
-		-Wexpansion-to-defined                            \
-		-Wextra                                           \
-		-Wextra-semi                                      \
-		-Wfloat-conversion                                \
-		-Wfloat-equal                                     \
-		-Wformat -Wformat-contains-nul                    \
-		-Wformat -Wformat-extra-args                      \
-		-Wformat -Wformat-nonliteral                      \
-		-Wformat -Wformat-security                        \
-		-Wformat -Wformat-y2k                             \
-		-Wformat -Wformat-zero-length                     \
-		-Wformat-diag                                     \
-		-Wformat-overflow=2                               \
-		-Wformat-signedness                               \
-		-Wformat-truncation=2                             \
-		-Wformat=2                                        \
-		-Wframe-address                                   \
-		-Wfree-nonheap-object                             \
-		-Whsa                                             \
-		-Wif-not-aligned                                  \
-		-Wignored-attributes                              \
-		-Wignored-qualifiers                              \
-		-Wimplicit-fallthrough=5                          \
-		-Winaccessible-base                               \
-		-Winherited-variadic-ctor                         \
-		-Winit-list-lifetime                              \
-		-Winit-self                                       \
-		-Winline                                          \
-		-Wint-in-bool-context                             \
-		-Wint-to-pointer-cast                             \
-		-Winvalid-memory-model                            \
-		-Winvalid-offsetof                                \
-		-Winvalid-pch                                     \
-		-Wliteral-suffix                                  \
-		-Wlogical-not-parentheses                         \
-		-Wlogical-op                                      \
-		-Wno-long-long                                       \
-		-Wlto-type-mismatch                               \
-		-Wmain                                            \
-		-Wmaybe-uninitialized                             \
-		-Wmemset-elt-size                                 \
-		-Wmemset-transposed-args                          \
-		-Wmisleading-indentation                          \
-		-Wmismatched-tags                                 \
-		-Wmissing-attributes                              \
-		-Wmissing-braces                                  \
-		-Wno-missing-declarations                            \
-		-Wmissing-field-initializers                      \
-		-Wmissing-include-dirs                            \
-		-Wmissing-profile                                 \
-		-Wmultichar                                       \
-		-Wmultiple-inheritance                            \
-		-Wmultistatement-macros                           \
-		-Wno-namespaces                                      \
-		-Wnarrowing                                       \
-		-Wno-noexcept                                        \
-		-Wnoexcept-type                                   \
-		-Wnon-template-friend                             \
-		-Wnon-virtual-dtor                                \
-		-Wnonnull                                         \
-		-Wnonnull-compare                                 \
-		-Wnonportable-cfstrings                           \
-		-Wnormalized=nfkc                                 \
-		-Wnull-dereference                                \
-		-Wodr                                             \
-		-Wold-style-cast                                  \
-		-Wopenmp-simd                                     \
-		-Woverflow                                        \
-		-Woverlength-strings                              \
-		-Woverloaded-virtual                              \
-		-Wpacked                                          \
-		-Wpacked-bitfield-compat                          \
-		-Wpacked-not-aligned                              \
-		-Wno-padded                                          \
-		-Wparentheses                                     \
-		-Wpedantic                                        \
-		-Wpessimizing-move                                \
-		-Wplacement-new=2                                 \
-		-Wpmf-conversions                                 \
-		-Wpointer-arith                                   \
-		-Wpointer-compare                                 \
-		-Wpragmas                                         \
-		-Wprio-ctor-dtor                                  \
-		-Wpsabi                                           \
-		-Wredundant-decls                                 \
-		-Wredundant-move                                  \
-		-Wredundant-tags                                  \
-		-Wregister                                        \
-		-Wreorder                                         \
-		-Wrestrict                                        \
-		-Wreturn-local-addr                               \
-		-Wreturn-type                                     \
-		-Wscalar-storage-order                            \
-		-Wsequence-point                                  \
-		-Wshadow=compatible-local                         \
-		-Wshadow=global                                   \
-		-Wshadow=local                                    \
-		-Wshift-count-negative                            \
-		-Wshift-count-overflow                            \
-		-Wshift-negative-value                            \
-		-Wshift-overflow=2                                \
-		-Wsign-compare                                    \
-		-Wsign-conversion                                 \
-		-Wsign-promo                                      \
-		-Wsized-deallocation                              \
-		-Wsizeof-array-argument                           \
-		-Wsizeof-pointer-div                              \
-		-Wsizeof-pointer-memaccess                        \
-		-Wstack-protector                                 \
-		-Wstrict-aliasing                                 \
-		-Wstrict-aliasing=3                               \
-		-Wstrict-null-sentinel                            \
-		-Wstrict-overflow                                 \
-		-Wstrict-overflow=5                               \
-		-Wstring-compare                                  \
-		-Wstringop-overflow                               \
-		-Wstringop-overflow=4                             \
-		-Wstringop-truncation                             \
-		-Wsubobject-linkage                               \
-		-Wsuggest-attribute=cold                          \
-		-Wsuggest-attribute=const                         \
-		-Wsuggest-attribute=format                        \
-		-Wsuggest-attribute=malloc                        \
-		-Wsuggest-attribute=noreturn                      \
-		-Wsuggest-attribute=pure                          \
-		-Wsuggest-final-methods                           \
-		-Wsuggest-final-types                             \
-		-Wsuggest-override                                \
-		-Wswitch                                          \
-		-Wswitch-bool                                     \
-		-Wswitch-default                                  \
-		-Wno-switch-enum                                     \
-		-Wswitch-outside-range                            \
-		-Wswitch-unreachable                              \
-		-Wsync-nand                                       \
-		-Wsynth                                           \
-		-Wno-system-headers                                  \
-		-Wtautological-compare                            \
-		-Wno-templates                                       \
-		-Wterminate                                       \
-		-Wtrampolines                                     \
-		-Wtrigraphs                                       \
-		-Wtype-limits                                     \
-		-Wundef                                           \
-		-Wuninitialized                                   \
-		-Wunknown-pragmas                                 \
-		-Wunreachable-code                                \
-		-Wunsafe-loop-optimizations                       \
-		-Wunused                                          \
-		-Wunused-but-set-parameter                        \
-		-Wunused-but-set-variable                         \
-		-Wunused-const-variable=2                         \
-		-Wunused-function                                 \
-		-Wunused-label                                    \
-		-Wno-unused-local-typedefs                           \
-		-Wunused-macros                                   \
-		-Wunused-parameter                                \
-		-Wunused-result                                   \
-		-Wunused-value                                    \
-		-Wunused-variable                                 \
-		-Wuseless-cast                                    \
-		-Wvarargs                                         \
-		-Wvariadic-macros                                 \
-		-Wvector-operation-performance                    \
-		-Wvirtual-inheritance                             \
-		-Wvirtual-move-assign                             \
-		-Wvla                                             \
-		-Wvolatile                                        \
-		-Wvolatile-register-var                           \
-		-Wwrite-strings                                   \
-		-Wzero-as-null-pointer-constant                   \
-		-Wzero-length-bounds                              \
-		" cmake -S . -B cmake-build-pedantic -GNinja -DCMAKE_BUILD_TYPE=Debug -DJSON_MultipleHeaders=ON -DJSON_BuildTests=On
-	cmake --build cmake-build-pedantic
 
 ##########################################################################
 # benchmarks
@@ -376,10 +59,11 @@ pedantic_gcc:
 run_benchmarks:
 	rm -fr cmake-build-benchmarks
 	mkdir cmake-build-benchmarks
-	cd cmake-build-benchmarks ; cmake ../benchmarks -GNinja -DCMAKE_BUILD_TYPE=Release -DJSON_BuildTests=On
+	cd cmake-build-benchmarks ; cmake ../tests/benchmarks -GNinja -DCMAKE_BUILD_TYPE=Release
 	cd cmake-build-benchmarks ; ninja
 	cd cmake-build-benchmarks ; ./json_benchmarks
 
+
 ##########################################################################
 # fuzzing
 ##########################################################################
@@ -388,41 +72,41 @@ run_benchmarks:
 fuzz_testing:
 	rm -fr fuzz-testing
 	mkdir -p fuzz-testing fuzz-testing/testcases fuzz-testing/out
-	$(MAKE) parse_afl_fuzzer -C test CXX=afl-clang++
-	mv test/parse_afl_fuzzer fuzz-testing/fuzzer
-	find test/data/json_tests -size -5k -name *json | xargs -I{} cp "{}" fuzz-testing/testcases
+	$(MAKE) parse_afl_fuzzer -C tests CXX=afl-clang++
+	mv tests/parse_afl_fuzzer fuzz-testing/fuzzer
+	find tests/data/json_tests -size -5k -name *json | xargs -I{} cp "{}" fuzz-testing/testcases
 	@echo "Execute: afl-fuzz -i fuzz-testing/testcases -o fuzz-testing/out fuzz-testing/fuzzer"
 
 fuzz_testing_bson:
 	rm -fr fuzz-testing
 	mkdir -p fuzz-testing fuzz-testing/testcases fuzz-testing/out
-	$(MAKE) parse_bson_fuzzer -C test CXX=afl-clang++
-	mv test/parse_bson_fuzzer fuzz-testing/fuzzer
-	find test/data -size -5k -name *.bson | xargs -I{} cp "{}" fuzz-testing/testcases
+	$(MAKE) parse_bson_fuzzer -C tests CXX=afl-clang++
+	mv tests/parse_bson_fuzzer fuzz-testing/fuzzer
+	find tests/data -size -5k -name *.bson | xargs -I{} cp "{}" fuzz-testing/testcases
 	@echo "Execute: afl-fuzz -i fuzz-testing/testcases -o fuzz-testing/out fuzz-testing/fuzzer"
 
 fuzz_testing_cbor:
 	rm -fr fuzz-testing
 	mkdir -p fuzz-testing fuzz-testing/testcases fuzz-testing/out
-	$(MAKE) parse_cbor_fuzzer -C test CXX=afl-clang++
-	mv test/parse_cbor_fuzzer fuzz-testing/fuzzer
-	find test/data -size -5k -name *.cbor | xargs -I{} cp "{}" fuzz-testing/testcases
+	$(MAKE) parse_cbor_fuzzer -C tests CXX=afl-clang++
+	mv tests/parse_cbor_fuzzer fuzz-testing/fuzzer
+	find tests/data -size -5k -name *.cbor | xargs -I{} cp "{}" fuzz-testing/testcases
 	@echo "Execute: afl-fuzz -i fuzz-testing/testcases -o fuzz-testing/out fuzz-testing/fuzzer"
 
 fuzz_testing_msgpack:
 	rm -fr fuzz-testing
 	mkdir -p fuzz-testing fuzz-testing/testcases fuzz-testing/out
-	$(MAKE) parse_msgpack_fuzzer -C test CXX=afl-clang++
-	mv test/parse_msgpack_fuzzer fuzz-testing/fuzzer
-	find test/data -size -5k -name *.msgpack | xargs -I{} cp "{}" fuzz-testing/testcases
+	$(MAKE) parse_msgpack_fuzzer -C tests CXX=afl-clang++
+	mv tests/parse_msgpack_fuzzer fuzz-testing/fuzzer
+	find tests/data -size -5k -name *.msgpack | xargs -I{} cp "{}" fuzz-testing/testcases
 	@echo "Execute: afl-fuzz -i fuzz-testing/testcases -o fuzz-testing/out fuzz-testing/fuzzer"
 
 fuzz_testing_ubjson:
 	rm -fr fuzz-testing
 	mkdir -p fuzz-testing fuzz-testing/testcases fuzz-testing/out
-	$(MAKE) parse_ubjson_fuzzer -C test CXX=afl-clang++
-	mv test/parse_ubjson_fuzzer fuzz-testing/fuzzer
-	find test/data -size -5k -name *.ubjson | xargs -I{} cp "{}" fuzz-testing/testcases
+	$(MAKE) parse_ubjson_fuzzer -C tests CXX=afl-clang++
+	mv tests/parse_ubjson_fuzzer fuzz-testing/fuzzer
+	find tests/data -size -5k -name *.ubjson | xargs -I{} cp "{}" fuzz-testing/testcases
 	@echo "Execute: afl-fuzz -i fuzz-testing/testcases -o fuzz-testing/out fuzz-testing/fuzzer"
 
 fuzzing-start:
@@ -444,33 +128,6 @@ fuzzing-stop:
 # Static analysis
 ##########################################################################
 
-# call cppcheck <http://cppcheck.sourceforge.net>
-# Note: this target is called by Travis
-cppcheck:
-	cppcheck --enable=warning --inline-suppr --inconclusive --force --std=c++11 $(AMALGAMATED_FILE) --error-exitcode=1
-
-# call Clang Static Analyzer <https://clang-analyzer.llvm.org>
-clang_analyze:
-	rm -fr cmake-build-clang-analyze
-	mkdir cmake-build-clang-analyze
-	cd cmake-build-clang-analyze ; CCC_CXX=$(COMPILER_DIR)/clang++ CXX=$(COMPILER_DIR)/clang++ $(COMPILER_DIR)/scan-build cmake .. -GNinja -DJSON_BuildTests=On
-	cd cmake-build-clang-analyze ; \
-		$(COMPILER_DIR)/scan-build \
-			-enable-checker alpha.core.BoolAssignment,alpha.core.CallAndMessageUnInitRefArg,alpha.core.CastSize,alpha.core.CastToStruct,alpha.core.Conversion,alpha.core.DynamicTypeChecker,alpha.core.FixedAddr,alpha.core.PointerArithm,alpha.core.PointerSub,alpha.core.SizeofPtr,alpha.core.StackAddressAsyncEscape,alpha.core.TestAfterDivZero,alpha.deadcode.UnreachableCode,core.builtin.BuiltinFunctions,core.builtin.NoReturnFunctions,core.CallAndMessage,core.DivideZero,core.DynamicTypePropagation,core.NonnilStringConstants,core.NonNullParamChecker,core.NullDereference,core.StackAddressEscape,core.UndefinedBinaryOperatorResult,core.uninitialized.ArraySubscript,core.uninitialized.Assign,core.uninitialized.Branch,core.uninitialized.CapturedBlockVariable,core.uninitialized.UndefReturn,core.VLASize,cplusplus.InnerPointer,cplusplus.Move,cplusplus.NewDelete,cplusplus.NewDeleteLeaks,cplusplus.SelfAssignment,deadcode.DeadStores,nullability.NullableDereferenced,nullability.NullablePassedToNonnull,nullability.NullableReturnedFromNonnull,nullability.NullPassedToNonnull,nullability.NullReturnedFromNonnull \
-			--use-c++=$(COMPILER_DIR)/clang++ -analyze-headers -o report ninja
-	open cmake-build-clang-analyze/report/*/index.html
-
-# call cpplint <https://github.com/cpplint/cpplint>
-# Note: some errors expected due to false positives
-cpplint:
-	third_party/cpplint/cpplint.py \
-		--filter=-whitespace,-legal,-readability/alt_tokens,-runtime/references,-runtime/explicit \
-		--quiet --recursive $(SRCS)
-
-# call Clang-Tidy <https://clang.llvm.org/extra/clang-tidy/>
-clang_tidy:
-	$(COMPILER_DIR)/clang-tidy $(SRCS) -- -Iinclude -std=c++11
-
 # call PVS-Studio Analyzer <https://www.viva64.com/en/pvs-studio/>
 pvs_studio:
 	rm -fr cmake-build-pvs-studio
@@ -480,25 +137,6 @@ pvs_studio:
 	cd cmake-build-pvs-studio ; plog-converter -a'GA:1,2;64:1;CS' -t fullhtml PVS-Studio.log -o pvs
 	open cmake-build-pvs-studio/pvs/index.html
 
-# call Infer <https://fbinfer.com> static analyzer
-infer:
-	rm -fr cmake-build-infer
-	mkdir cmake-build-infer
-	cd cmake-build-infer ; infer compile -- cmake .. -DJSON_MultipleHeaders=ON ; infer run -- make -j 4
-
-# call OCLint <http://oclint.org> static analyzer
-oclint:
-	oclint $(SRCS) -report-type html -enable-global-analysis -o oclint_report.html -max-priority-1=10000 -max-priority-2=10000 -max-priority-3=10000 -- -std=c++11 -Iinclude
-	open oclint_report.html
-
-# execute the test suite with Clang sanitizers (address and undefined behavior)
-clang_sanitize:
-	rm -fr cmake-build-clang-sanitize
-	mkdir cmake-build-clang-sanitize
-	cd cmake-build-clang-sanitize ; CXX=$(COMPILER_DIR)/clang++ cmake .. -DJSON_Sanitizer=On -DJSON_MultipleHeaders=ON -DJSON_BuildTests=On -GNinja
-	cd cmake-build-clang-sanitize ; ninja
-	cd cmake-build-clang-sanitize ; ctest -j10
-
 
 ##########################################################################
 # Code format and source amalgamation
@@ -507,9 +145,9 @@ clang_sanitize:
 # call the Artistic Style pretty printer on all source files
 pretty:
 	astyle \
-		--style=allman \
-		--indent=spaces=4 \
-		--indent-modifiers \
+	    --style=allman \
+	    --indent=spaces=4 \
+	    --indent-modifiers \
 	    --indent-switches \
 	    --indent-preproc-block \
 	    --indent-preproc-define \
@@ -518,71 +156,45 @@ pretty:
 	    --pad-header \
 	    --align-pointer=type \
 	    --align-reference=type \
-	    --add-brackets \
+	    --add-braces \
+	    --squeeze-lines=2 \
 	    --convert-tabs \
 	    --close-templates \
 	    --lineend=linux \
 	    --preserve-date \
 	    --suffix=none \
 	    --formatted \
-	   $(SRCS) $(AMALGAMATED_FILE) test/src/*.cpp test/src/*.hpp benchmarks/src/benchmarks.cpp doc/examples/*.cpp
+	   $(SRCS) $(TESTS_SRCS) $(AMALGAMATED_FILE) $(AMALGAMATED_FWD_FILE) docs/examples/*.cpp
 
 # call the Clang-Format on all source files
 pretty_format:
-	for FILE in $(SRCS) $(AMALGAMATED_FILE) test/src/*.cpp test/src/*.hpp benchmarks/src/benchmarks.cpp doc/examples/*.cpp; do echo $$FILE; clang-format -i $$FILE; done
+	for FILE in $(SRCS) $(TESTS_SRCS) $(AMALGAMATED_FILE) docs/examples/*.cpp; do echo $$FILE; clang-format -i $$FILE; done
 
-# create single header file
-amalgamate: $(AMALGAMATED_FILE)
+# create single header files and pretty print
+amalgamate: $(AMALGAMATED_FILE) $(AMALGAMATED_FWD_FILE)
+	$(MAKE) pretty
 
-# call the amalgamation tool and pretty print
+# call the amalgamation tool for json.hpp
 $(AMALGAMATED_FILE): $(SRCS)
-	third_party/amalgamate/amalgamate.py -c third_party/amalgamate/config.json -s . --verbose=yes
-	$(MAKE) pretty
+	tools/amalgamate/amalgamate.py -c tools/amalgamate/config_json.json -s . --verbose=yes
+
+# call the amalgamation tool for json_fwd.hpp
+$(AMALGAMATED_FWD_FILE): $(SRCS)
+	tools/amalgamate/amalgamate.py -c tools/amalgamate/config_json_fwd.json -s . --verbose=yes
 
 # check if file single_include/nlohmann/json.hpp has been amalgamated from the nlohmann sources
 # Note: this target is called by Travis
 check-amalgamation:
 	@mv $(AMALGAMATED_FILE) $(AMALGAMATED_FILE)~
+	@mv $(AMALGAMATED_FWD_FILE) $(AMALGAMATED_FWD_FILE)~
 	@$(MAKE) amalgamate
 	@diff $(AMALGAMATED_FILE) $(AMALGAMATED_FILE)~ || (echo "===================================================================\n  Amalgamation required! Please read the contribution guidelines\n  in file .github/CONTRIBUTING.md.\n===================================================================" ; mv $(AMALGAMATED_FILE)~ $(AMALGAMATED_FILE) ; false)
+	@diff $(AMALGAMATED_FWD_FILE) $(AMALGAMATED_FWD_FILE)~ || (echo "===================================================================\n  Amalgamation required! Please read the contribution guidelines\n  in file .github/CONTRIBUTING.md.\n===================================================================" ; mv $(AMALGAMATED_FWD_FILE)~ $(AMALGAMATED_FWD_FILE) ; false)
 	@mv $(AMALGAMATED_FILE)~ $(AMALGAMATED_FILE)
+	@mv $(AMALGAMATED_FWD_FILE)~ $(AMALGAMATED_FWD_FILE)
 
-# check if every header in nlohmann includes sufficient headers to be compiled individually
-check-single-includes:
-	@for x in $(SRCS); do \
-	  echo "Checking self-sufficiency of $$x..." ; \
-	  echo "#include <$$x>\nint main() {}\n" | $(SED) 's|include/||' > single_include_test.cpp; \
-	  $(CXX) $(CXXFLAGS) -Iinclude -std=c++11 single_include_test.cpp -o single_include_test; \
-	  rm -f single_include_test.cpp single_include_test; \
-	done
-
-
-##########################################################################
-# CMake
-##########################################################################
-
-# grep "^option" CMakeLists.txt test/CMakeLists.txt | $(SED) 's/(/ /' | awk '{print $2}' | xargs
-
-# check if all flags of our CMake files work
-check_cmake_flags_do:
-	$(CMAKE_BINARY) --version
-	for flag in JSON_BuildTests JSON_Install JSON_MultipleHeaders JSON_Sanitizer JSON_Valgrind JSON_NoExceptions JSON_Coverage; do \
-		rm -fr cmake_build; \
-		mkdir cmake_build; \
-		echo "\n\n$(CMAKE_BINARY) .. -D$$flag=On\n" ; \
-		cd cmake_build ; \
-		$(CMAKE_BINARY) -Werror=dev .. -D$$flag=On -DCMAKE_CXX_COMPILE_FEATURES="cxx_std_11;cxx_range_for" -DCMAKE_CXX_FLAGS="-std=gnu++11" ; \
-		test -f Makefile || exit 1 ; \
-		cd .. ; \
-	done;
-
-# call target `check_cmake_flags_do` twice: once for minimal required CMake version 3.1.0 and once for the installed version
-check_cmake_flags:
-	wget https://github.com/Kitware/CMake/releases/download/v3.1.0/cmake-3.1.0-Darwin64.tar.gz
-	tar xfz cmake-3.1.0-Darwin64.tar.gz
-	CMAKE_BINARY=$(abspath cmake-3.1.0-Darwin64/CMake.app/Contents/bin/cmake) $(MAKE) check_cmake_flags_do
-	CMAKE_BINARY=$(shell which cmake) $(MAKE) check_cmake_flags_do
-
+BUILD.bazel: $(SRCS)
+	cmake -P cmake/scripts/gen_bazel_build_file.cmake
 
 ##########################################################################
 # ChangeLog
@@ -604,20 +216,31 @@ ChangeLog.md:
 # Release files
 ##########################################################################
 
-# Create the files for a release and add signatures and hashes. We use `-X` to make the resulting ZIP file
-# reproducible, see <https://content.pivotal.io/blog/barriers-to-deterministic-reproducible-zip-files>.
-
-release:
+# Create a tar.gz archive that contains sufficient files to be used as CMake project (e.g., using FetchContent). The
+# archive is created according to the advices of <https://reproducible-builds.org/docs/archives/>.
+json.tar.xz:
+	mkdir json
+	rsync -R $(shell find LICENSE.MIT nlohmann_json.natvis CMakeLists.txt cmake/*.in include single_include -type f) json
+	gtar --sort=name --mtime="@$(shell git log -1 --pretty=%ct)" --owner=0 --group=0 --numeric-owner --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime --create --file - json | xz --compress -9e --threads=2 - > json.tar.xz
+	rm -fr json
+
+# We use `-X` to make the resulting ZIP file reproducible, see
+# <https://content.pivotal.io/blog/barriers-to-deterministic-reproducible-zip-files>.
+include.zip: BUILD.bazel
+	zip -9 --recurse-paths -X include.zip $(SRCS) $(AMALGAMATED_FILE) $(AMALGAMATED_FWD_FILE) BUILD.bazel WORKSPACE.bazel meson.build LICENSE.MIT
+
+# Create the files for a release and add signatures and hashes.
+release: include.zip json.tar.xz
 	rm -fr release_files
 	mkdir release_files
-	zip -9 --recurse-paths -X include.zip $(SRCS) $(AMALGAMATED_FILE) meson.build LICENSE.MIT
 	gpg --armor --detach-sig include.zip
-	mv include.zip include.zip.asc release_files
 	gpg --armor --detach-sig $(AMALGAMATED_FILE)
+	gpg --armor --detach-sig $(AMALGAMATED_FWD_FILE)
+	gpg --armor --detach-sig json.tar.xz
 	cp $(AMALGAMATED_FILE) release_files
-	mv $(AMALGAMATED_FILE).asc release_files
-	cd release_files ; shasum -a 256 json.hpp > hashes.txt
-	cd release_files ; shasum -a 256 include.zip >> hashes.txt
+	cp $(AMALGAMATED_FWD_FILE) release_files
+	mv $(AMALGAMATED_FILE).asc $(AMALGAMATED_FWD_FILE).asc json.tar.xz json.tar.xz.asc include.zip include.zip.asc release_files
+	cd release_files ; shasum -a 256 json.hpp include.zip json.tar.xz > hashes.txt
 
 
 ##########################################################################
@@ -626,11 +249,11 @@ release:
 
 # clean up
 clean:
-	rm -fr json_unit json_benchmarks fuzz fuzz-testing *.dSYM test/*.dSYM oclint_report.html
+	rm -fr fuzz fuzz-testing *.dSYM tests/*.dSYM
 	rm -fr benchmarks/files/numbers/*.json
-	rm -fr cmake-3.1.0-Darwin64.tar.gz cmake-3.1.0-Darwin64
-	rm -fr cmake-build-coverage cmake-build-benchmarks cmake-build-pedantic fuzz-testing cmake-build-clang-analyze cmake-build-pvs-studio cmake-build-infer cmake-build-clang-sanitize cmake_build
-	$(MAKE) clean -Cdoc
+	rm -fr cmake-build-benchmarks fuzz-testing cmake-build-pvs-studio release_files
+	$(MAKE) clean -Cdocs
+
 
 ##########################################################################
 # Thirdparty code
@@ -641,4 +264,22 @@ update_hedley:
 	curl https://raw.githubusercontent.com/nemequ/hedley/master/hedley.h -o include/nlohmann/thirdparty/hedley/hedley.hpp
 	$(SED) -i 's/HEDLEY_/JSON_HEDLEY_/g' include/nlohmann/thirdparty/hedley/hedley.hpp
 	grep "[[:blank:]]*#[[:blank:]]*undef" include/nlohmann/thirdparty/hedley/hedley.hpp | grep -v "__" | sort | uniq | $(SED) 's/ //g' | $(SED) 's/undef/undef /g' > include/nlohmann/thirdparty/hedley/hedley_undef.hpp
+	$(SED) -i '1s/^/#pragma once\n\n/' include/nlohmann/thirdparty/hedley/hedley.hpp
+	$(SED) -i '1s/^/#pragma once\n\n/' include/nlohmann/thirdparty/hedley/hedley_undef.hpp
 	$(MAKE) amalgamate
+
+##########################################################################
+# serve_header.py
+##########################################################################
+
+serve_header:
+	./tools/serve_header/serve_header.py --make $(MAKE)
+
+##########################################################################
+# REUSE
+##########################################################################
+
+reuse:
+	pipx run reuse addheader --recursive single_include include -tjson --license MIT --copyright "Niels Lohmann <https://nlohmann.me>" --year "2013-2022"
+	pipx run reuse addheader $(TESTS_SRCS) --style=c -tjson_support --license MIT --copyright "Niels Lohmann <https://nlohmann.me>" --year "2013-2022"
+	pipx run reuse lint
diff --git a/external_imported/json/Package.swift b/external_imported/json/Package.swift
new file mode 100644
index 000000000..2f9c4a1f4
--- /dev/null
+++ b/external_imported/json/Package.swift
@@ -0,0 +1,22 @@
+// swift-tools-version: 5.9
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "nlohmann-json",
+     platforms: [
+        .iOS(.v12), .macOS(.v10_13), .tvOS(.v12), .watchOS(.v4)
+    ],
+    products: [
+        .library(name: "json", targets: ["json"])
+    ],
+    targets: [
+        .target(
+            name: "json",
+            path: "single_include/nlohmann",
+            publicHeadersPath: "."
+        )
+    ],
+    cxxLanguageStandard: .cxx11
+)
diff --git a/external_imported/json/README.md b/external_imported/json/README.md
index 5d354f1ed..910902706 100644
--- a/external_imported/json/README.md
+++ b/external_imported/json/README.md
@@ -1,33 +1,34 @@
-[![JSON for Modern C++](https://raw.githubusercontent.com/nlohmann/json/master/doc/json.gif)](https://github.com/nlohmann/json/releases)
+[![JSON for Modern C++](docs/json.gif)](https://github.com/nlohmann/json/releases)
 
-[![Build Status](https://travis-ci.org/nlohmann/json.svg?branch=master)](https://travis-ci.org/nlohmann/json)
 [![Build Status](https://ci.appveyor.com/api/projects/status/1acb366xfyg3qybk/branch/develop?svg=true)](https://ci.appveyor.com/project/nlohmann/json)
 [![Ubuntu](https://github.com/nlohmann/json/workflows/Ubuntu/badge.svg)](https://github.com/nlohmann/json/actions?query=workflow%3AUbuntu)
 [![macOS](https://github.com/nlohmann/json/workflows/macOS/badge.svg)](https://github.com/nlohmann/json/actions?query=workflow%3AmacOS)
 [![Windows](https://github.com/nlohmann/json/workflows/Windows/badge.svg)](https://github.com/nlohmann/json/actions?query=workflow%3AWindows)
-[![Build Status](https://circleci.com/gh/nlohmann/json.svg?style=svg)](https://circleci.com/gh/nlohmann/json)
 [![Coverage Status](https://coveralls.io/repos/github/nlohmann/json/badge.svg?branch=develop)](https://coveralls.io/github/nlohmann/json?branch=develop)
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/5550/badge.svg)](https://scan.coverity.com/projects/nlohmann-json)
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/f3732b3327e34358a0e9d1fe9f661f08)](https://www.codacy.com/app/nlohmann/json?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=nlohmann/json&amp;utm_campaign=Badge_Grade)
-[![Language grade: C/C++](https://img.shields.io/lgtm/grade/cpp/g/nlohmann/json.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/nlohmann/json/context:cpp)
+[![Codacy Badge](https://app.codacy.com/project/badge/Grade/e0d1a9d5d6fd46fcb655c4cb930bb3e8)](https://www.codacy.com/gh/nlohmann/json/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=nlohmann/json&amp;utm_campaign=Badge_Grade)
+[![Cirrus CI](https://api.cirrus-ci.com/github/nlohmann/json.svg)](https://cirrus-ci.com/github/nlohmann/json)
 [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/json.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:json)
-[![Try online](https://img.shields.io/badge/try-online-blue.svg)](https://wandbox.org/permlink/3lCHrFUZANONKv7a)
-[![Documentation](https://img.shields.io/badge/docs-doxygen-blue.svg)](https://nlohmann.github.io/json/doxygen/index.html)
+[![Try online](https://img.shields.io/badge/try-online-blue.svg)](https://wandbox.org/permlink/1mp10JbaANo6FUc7)
+[![Documentation](https://img.shields.io/badge/docs-mkdocs-blue.svg)](https://json.nlohmann.me)
 [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/nlohmann/json/master/LICENSE.MIT)
 [![GitHub Releases](https://img.shields.io/github/release/nlohmann/json.svg)](https://github.com/nlohmann/json/releases)
+[![Vcpkg Version](https://img.shields.io/vcpkg/v/nlohmann-json)](https://vcpkg.link/ports/nlohmann-json)
+[![Packaging status](https://repology.org/badge/tiny-repos/nlohmann-json.svg)](https://repology.org/project/nlohmann-json/versions)
 [![GitHub Downloads](https://img.shields.io/github/downloads/nlohmann/json/total)](https://github.com/nlohmann/json/releases)
 [![GitHub Issues](https://img.shields.io/github/issues/nlohmann/json.svg)](https://github.com/nlohmann/json/issues)
 [![Average time to resolve an issue](https://isitmaintained.com/badge/resolution/nlohmann/json.svg)](https://isitmaintained.com/project/nlohmann/json "Average time to resolve an issue")
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/289/badge)](https://bestpractices.coreinfrastructure.org/projects/289)
 [![GitHub Sponsors](https://img.shields.io/badge/GitHub-Sponsors-ff69b4)](https://github.com/sponsors/nlohmann)
+[![REUSE status](https://api.reuse.software/badge/github.com/nlohmann/json)](https://api.reuse.software/info/github.com/nlohmann/json)
+[![Discord](https://img.shields.io/discord/1003743314341793913)](https://discord.gg/6mrGXKvX7y)
 
 - [Design goals](#design-goals)
 - [Sponsors](#sponsors)
-- [Integration](#integration)
-  - [CMake](#cmake)
-  - [Package Managers](#package-managers)
-  - [Pkg-config](#pkg-config)
+- [Support](#support) ([documentation](https://json.nlohmann.me), [FAQ](https://json.nlohmann.me/home/faq/), [discussions](https://github.com/nlohmann/json/discussions), [API](https://json.nlohmann.me/api/basic_json/), [bug issues](https://github.com/nlohmann/json/issues))
 - [Examples](#examples)
+  - [Read JSON from a file](#read-json-from-a-file)
+  - [Creating `json` objects from JSON literals](#creating-json-objects-from-json-literals)
   - [JSON as first-class data type](#json-as-first-class-data-type)
   - [Serialization / Deserialization](#serialization--deserialization)
   - [STL-like access](#stl-like-access)
@@ -37,8 +38,12 @@
   - [Implicit conversions](#implicit-conversions)
   - [Conversions to/from arbitrary types](#arbitrary-types-conversions)
   - [Specializing enum conversion](#specializing-enum-conversion)
-  - [Binary formats (BSON, CBOR, MessagePack, and UBJSON)](#binary-formats-bson-cbor-messagepack-and-ubjson)
+  - [Binary formats (BSON, CBOR, MessagePack, UBJSON, and BJData)](#binary-formats-bson-cbor-messagepack-ubjson-and-bjdata)
 - [Supported compilers](#supported-compilers)
+- [Integration](#integration)
+  - [CMake](#cmake)
+  - [Package Managers](#package-managers)
+  - [Pkg-config](#pkg-config)
 - [License](#license)
 - [Contact](#contact)
 - [Thanks](#thanks)
@@ -55,7 +60,7 @@ There are myriads of [JSON](https://json.org) libraries out there, and each may
 
 - **Trivial integration**. Our whole code consists of a single header file [`json.hpp`](https://github.com/nlohmann/json/blob/develop/single_include/nlohmann/json.hpp). That's it. No library, no subproject, no dependencies, no complex build system. The class is written in vanilla C++11. All in all, everything should require no adjustment of your compiler flags or project settings.
 
-- **Serious testing**. Our class is heavily [unit-tested](https://github.com/nlohmann/json/tree/develop/test/src) and covers [100%](https://coveralls.io/r/nlohmann/json) of the code, including all exceptional behavior. Furthermore, we checked with [Valgrind](https://valgrind.org) and the [Clang Sanitizers](https://clang.llvm.org/docs/index.html) that there are no memory leaks. [Google OSS-Fuzz](https://github.com/google/oss-fuzz/tree/master/projects/json) additionally runs fuzz tests against all parsers 24/7, effectively executing billions of tests so far. To maintain high quality, the project is following the [Core Infrastructure Initiative (CII) best practices](https://bestpractices.coreinfrastructure.org/projects/289).
+- **Serious testing**. Our code is heavily [unit-tested](https://github.com/nlohmann/json/tree/develop/tests/src) and covers [100%](https://coveralls.io/r/nlohmann/json) of the code, including all exceptional behavior. Furthermore, we checked with [Valgrind](https://valgrind.org) and the [Clang Sanitizers](https://clang.llvm.org/docs/index.html) that there are no memory leaks. [Google OSS-Fuzz](https://github.com/google/oss-fuzz/tree/master/projects/json) additionally runs fuzz tests against all parsers 24/7, effectively executing billions of tests so far. To maintain high quality, the project is following the [Core Infrastructure Initiative (CII) best practices](https://bestpractices.coreinfrastructure.org/projects/289).
 
 Other aspects were not so important to us:
 
@@ -70,6 +75,10 @@ See the [contribution guidelines](https://github.com/nlohmann/json/blob/master/.
 
 You can sponsor this library at [GitHub Sponsors](https://github.com/sponsors/nlohmann).
 
+### :office: Corporate Sponsor
+
+[![](https://upload.wikimedia.org/wikipedia/commons/thumb/9/9e/Codacy-logo-black.svg/320px-Codacy-logo-black.svg.png)](https://github.com/codacy/About)
+
 ### :label: Named Sponsors
 
 - [Michael Hartmann](https://github.com/reFX-Mike)
@@ -77,188 +86,86 @@ You can sponsor this library at [GitHub Sponsors](https://github.com/sponsors/nl
 - [Steve Sperandeo](https://github.com/homer6)
 - [Robert Jefe Lindstädt](https://github.com/eljefedelrodeodeljefe)
 - [Steve Wagner](https://github.com/ciroque)
+- [Lion Yang](https://github.com/LionNatsu)
 
 Thanks everyone!
 
+## Support
 
-## Integration
-
-[`json.hpp`](https://github.com/nlohmann/json/blob/develop/single_include/nlohmann/json.hpp) is the single required file in `single_include/nlohmann` or [released here](https://github.com/nlohmann/json/releases). You need to add
-
-```cpp
-#include <nlohmann/json.hpp>
-
-// for convenience
-using json = nlohmann::json;
-```
-
-to the files you want to process JSON and set the necessary switches to enable C++11 (e.g., `-std=c++11` for GCC and Clang).
-
-You can further use file [`include/nlohmann/json_fwd.hpp`](https://github.com/nlohmann/json/blob/develop/include/nlohmann/json_fwd.hpp) for forward-declarations. The installation of json_fwd.hpp (as part of cmake's install step), can be achieved by setting `-DJSON_MultipleHeaders=ON`.
+:question: If you have a **question**, please check if it is already answered in the [**FAQ**](https://json.nlohmann.me/home/faq/) or the [**Q&A**](https://github.com/nlohmann/json/discussions/categories/q-a) section. If not, please [**ask a new question**](https://github.com/nlohmann/json/discussions/new) there.
 
-### CMake
+:books: If you want to **learn more** about how to use the library, check out the rest of the [**README**](#examples), have a look at [**code examples**](https://github.com/nlohmann/json/tree/develop/docs/examples), or browse through the [**help pages**](https://json.nlohmann.me).
 
-You can also use the `nlohmann_json::nlohmann_json` interface target in CMake.  This target populates the appropriate usage requirements for `INTERFACE_INCLUDE_DIRECTORIES` to point to the appropriate include directories and `INTERFACE_COMPILE_FEATURES` for the necessary C++11 flags.
+:construction: If you want to understand the **API** better, check out the [**API Reference**](https://json.nlohmann.me/api/basic_json/).
 
-#### External
+:bug: If you found a **bug**, please check the [**FAQ**](https://json.nlohmann.me/home/faq/) if it is a known issue or the result of a design decision. Please also have a look at the [**issue list**](https://github.com/nlohmann/json/issues) before you [**create a new issue**](https://github.com/nlohmann/json/issues/new/choose). Please provide as much information as possible to help us understand and reproduce your issue.
 
-To use this library from a CMake project, you can locate it directly with `find_package()` and use the namespaced imported target from the generated package configuration:
+There is also a [**docset**](https://github.com/Kapeli/Dash-User-Contributions/tree/master/docsets/JSON_for_Modern_C%2B%2B) for the documentation browsers [Dash](https://kapeli.com/dash), [Velocity](https://velocity.silverlakesoftware.com), and [Zeal](https://zealdocs.org) that contains the full [documentation](https://json.nlohmann.me) as offline resource.
 
-```cmake
-# CMakeLists.txt
-find_package(nlohmann_json 3.2.0 REQUIRED)
-...
-add_library(foo ...)
-...
-target_link_libraries(foo PRIVATE nlohmann_json::nlohmann_json)
-```
-
-The package configuration file, `nlohmann_jsonConfig.cmake`, can be used either from an install tree or directly out of the build tree.
-
-#### Embedded
-
-To embed the library directly into an existing CMake project, place the entire source tree in a subdirectory and call `add_subdirectory()` in your `CMakeLists.txt` file:
+## Examples
 
-```cmake
-# Typically you don't care so much for a third party library's tests to be
-# run from your own project's code.
-set(JSON_BuildTests OFF CACHE INTERNAL "")
+Here are some examples to give you an idea how to use the class.
 
-# If you only include this third party in PRIVATE source files, you do not
-# need to install it when your main project gets installed.
-# set(JSON_Install OFF CACHE INTERNAL "")
+Beside the examples below, you may want to:
 
-# Don't use include(nlohmann_json/CMakeLists.txt) since that carries with it
-# unintended consequences that will break the build.  It's generally
-# discouraged (although not necessarily well documented as such) to use
-# include(...) for pulling in other CMake projects anyways.
-add_subdirectory(nlohmann_json)
-...
-add_library(foo ...)
-...
-target_link_libraries(foo PRIVATE nlohmann_json::nlohmann_json)
-```
+→ Check the [documentation](https://json.nlohmann.me/)\
+→ Browse the [standalone example files](https://github.com/nlohmann/json/tree/develop/docs/examples)
 
-##### Embedded (FetchContent)
+Every API function (documented in the [API Documentation](https://json.nlohmann.me/api/basic_json/)) has a corresponding standalone example file. For example, the [`emplace()`](https://json.nlohmann.me/api/basic_json/emplace/) function has a matching [emplace.cpp](https://github.com/nlohmann/json/blob/develop/docs/examples/emplace.cpp) example file.
 
-Since CMake v3.11,
-[FetchContent](https://cmake.org/cmake/help/v3.11/module/FetchContent.html) can
-be used to automatically download the repository as a dependency at configure type.
+### Read JSON from a file
 
-Example:
-```cmake
-include(FetchContent)
+The `json` class provides an API for manipulating a JSON value. To create a `json` object by reading a JSON file:
 
-FetchContent_Declare(json
-  GIT_REPOSITORY https://github.com/nlohmann/json.git
-  GIT_TAG v3.7.3)
+```cpp
+#include <fstream>
+#include <nlohmann/json.hpp>
+using json = nlohmann::json;
 
-FetchContent_GetProperties(json)
-if(NOT json_POPULATED)
-  FetchContent_Populate(json)
-  add_subdirectory(${json_SOURCE_DIR} ${json_BINARY_DIR} EXCLUDE_FROM_ALL)
-endif()
+// ...
 
-target_link_libraries(foo PRIVATE nlohmann_json::nlohmann_json)
+std::ifstream f("example.json");
+json data = json::parse(f);
 ```
 
-**Note**: The repository https://github.com/nlohmann/json download size is huge.
-It contains all the dataset used for the benchmarks. You might want to depend on
-a smaller repository. For instance, you might want to replace the URL above by
-https://github.com/ArthurSonzogni/nlohmann_json_cmake_fetchcontent
+### Creating `json` objects from JSON literals
 
-#### Supporting Both
-
-To allow your project to support either an externally supplied or an embedded JSON library, you can use a pattern akin to the following:
+Assume you want to create hard-code this literal JSON value in a file, as a `json` object:
 
-``` cmake
-# Top level CMakeLists.txt
-project(FOO)
-...
-option(FOO_USE_EXTERNAL_JSON "Use an external JSON library" OFF)
-...
-add_subdirectory(thirdparty)
-...
-add_library(foo ...)
-...
-# Note that the namespaced target will always be available regardless of the
-# import method
-target_link_libraries(foo PRIVATE nlohmann_json::nlohmann_json)
-```
-```cmake
-# thirdparty/CMakeLists.txt
-...
-if(FOO_USE_EXTERNAL_JSON)
-  find_package(nlohmann_json 3.2.0 REQUIRED)
-else()
-  set(JSON_BuildTests OFF CACHE INTERNAL "")
-  add_subdirectory(nlohmann_json)
-endif()
-...
-```
-
-`thirdparty/nlohmann_json` is then a complete copy of this source tree.
-
-### Package Managers
-
-:beer: If you are using OS X and [Homebrew](https://brew.sh), just type `brew tap nlohmann/json` and `brew install nlohmann-json` and you're set. If you want the bleeding edge rather than the latest release, use `brew install nlohmann-json --HEAD`.
-
-If you are using the [Meson Build System](https://mesonbuild.com), add this source tree as a [meson subproject](https://mesonbuild.com/Subprojects.html#using-a-subproject). You may also use the `include.zip` published in this project's [Releases](https://github.com/nlohmann/json/releases) to reduce the size of the vendored source tree. Alternatively, you can get a wrap file by downloading it from [Meson WrapDB](https://wrapdb.mesonbuild.com/nlohmann_json), or simply use `meson wrap install nlohmann_json`. Please see the meson project for any issues regarding the packaging.
-
-The provided meson.build can also be used as an alternative to cmake for installing `nlohmann_json` system-wide in which case a pkg-config file is installed. To use it, simply have your build system require the `nlohmann_json` pkg-config dependency. In Meson, it is preferred to use the [`dependency()`](https://mesonbuild.com/Reference-manual.html#dependency) object with a subproject fallback, rather than using the subproject directly.
-
-If you are using [Conan](https://www.conan.io/) to manage your dependencies, merely add `nlohmann_json/x.y.z` to your `conanfile`'s requires, where `x.y.z` is the release version you want to use. Please file issues [here](https://github.com/conan-io/conan-center-index/issues) if you experience problems with the packages.
-
-If you are using [Spack](https://www.spack.io/) to manage your dependencies, you can use the [`nlohmann-json` package](https://spack.readthedocs.io/en/latest/package_list.html#nlohmann-json). Please see the [spack project](https://github.com/spack/spack) for any issues regarding the packaging.
-
-If you are using [hunter](https://github.com/cpp-pm/hunter) on your project for external dependencies, then you can use the [nlohmann_json package](https://hunter.readthedocs.io/en/latest/packages/pkg/nlohmann_json.html). Please see the hunter project for any issues regarding the packaging.
-
-If you are using [Buckaroo](https://buckaroo.pm), you can install this library's module with `buckaroo add github.com/buckaroo-pm/nlohmann-json`. Please file issues [here](https://github.com/buckaroo-pm/nlohmann-json). There is a demo repo [here](https://github.com/njlr/buckaroo-nholmann-json-example).
-
-If you are using [vcpkg](https://github.com/Microsoft/vcpkg/) on your project for external dependencies, then you can use the [nlohmann-json package](https://github.com/Microsoft/vcpkg/tree/master/ports/nlohmann-json). Please see the vcpkg project for any issues regarding the packaging.
-
-If you are using [cget](https://cget.readthedocs.io/en/latest/), you can install the latest development version with `cget install nlohmann/json`. A specific version can be installed with `cget install nlohmann/json@v3.1.0`. Also, the multiple header version can be installed by adding the `-DJSON_MultipleHeaders=ON` flag (i.e., `cget install nlohmann/json -DJSON_MultipleHeaders=ON`).
-
-If you are using [CocoaPods](https://cocoapods.org), you can use the library by adding pod `"nlohmann_json", '~>3.1.2'` to your podfile (see [an example](https://bitbucket.org/benman/nlohmann_json-cocoapod/src/master/)). Please file issues [here](https://bitbucket.org/benman/nlohmann_json-cocoapod/issues?status=new&status=open).
-
-If you are using [NuGet](https://www.nuget.org), you can use the package [nlohmann.json](https://www.nuget.org/packages/nlohmann.json/). Please check [this extensive description](https://github.com/nlohmann/json/issues/1132#issuecomment-452250255) on how to use the package. Please files issues [here](https://github.com/hnkb/nlohmann-json-nuget/issues).
-
-If you are using [conda](https://conda.io/), you can use the package [nlohmann_json](https://github.com/conda-forge/nlohmann_json-feedstock) from [conda-forge](https://conda-forge.org) executing `conda install -c conda-forge nlohmann_json`. Please file issues [here](https://github.com/conda-forge/nlohmann_json-feedstock/issues).
-
-If you are using [MSYS2](https://www.msys2.org/), your can use the [mingw-w64-nlohmann-json](https://packages.msys2.org/base/mingw-w64-nlohmann-json) package, just type `pacman -S mingw-w64-i686-nlohmann-json` or `pacman -S mingw-w64-x86_64-nlohmann-json` for installation. Please file issues [here](https://github.com/msys2/MINGW-packages/issues/new?title=%5Bnlohmann-json%5D) if you experience problems with the packages.
-
-If you are using [`build2`](https://build2.org), you can use the [`nlohmann-json`](https://cppget.org/nlohmann-json) package from the public repository https://cppget.org or directly from the [package's sources repository](https://github.com/build2-packaging/nlohmann-json). In your project's `manifest` file, just add `depends: nlohmann-json` (probably with some [version constraints](https://build2.org/build2-toolchain/doc/build2-toolchain-intro.xhtml#guide-add-remove-deps)). If you are not familiar with using dependencies in `build2`, [please read this introduction](https://build2.org/build2-toolchain/doc/build2-toolchain-intro.xhtml).
-Please file issues [here](https://github.com/build2-packaging/nlohmann-json) if you experience problems with the packages.
-
-If you are using [`wsjcpp`](https://wsjcpp.org), you can use the command `wsjcpp install "https://github.com/nlohmann/json:develop"` to get the latest version. Note you can change the branch ":develop" to an existing tag or another branch.
-
-If you are using [`CPM.cmake`](https://github.com/TheLartians/CPM.cmake), you can check this [`example`](https://github.com/TheLartians/CPM.cmake/tree/master/examples/json). After [adding CPM script](https://github.com/TheLartians/CPM.cmake#adding-cpm) to your project, implement the following snippet to your CMake:
-
-```cmake
-CPMAddPackage(
-    NAME nlohmann_json
-    GITHUB_REPOSITORY nlohmann/json
-    VERSION 3.9.1)
+```json
+{
+  "pi": 3.141,
+  "happy": true
+}
 ```
 
-### Pkg-config
-
-If you are using bare Makefiles, you can use `pkg-config` to generate the include flags that point to where the library is installed:
+There are various options:
 
-```sh
-pkg-config nlohmann_json --cflags
-```
+```cpp
+// Using (raw) string literals and json::parse
+json ex1 = json::parse(R"(
+  {
+    "pi": 3.141,
+    "happy": true
+  }
+)");
 
-Users of the Meson build system will also be able to use a system wide library, which will be found by `pkg-config`:
+// Using user-defined (raw) string literals
+using namespace nlohmann::literals;
+json ex2 = R"(
+  {
+    "pi": 3.141,
+    "happy": true
+  }
+)"_json;
 
-```meson
-json = dependency('nlohmann_json', required: true)
+// Using initializer lists
+json ex3 = {
+  {"happy", true},
+  {"pi", 3.141},
+};
 ```
 
-## Examples
-
-Beside the examples below, you may want to check the [documentation](https://nlohmann.github.io/json/) where each function contains a separate code example (e.g., check out [`emplace()`](https://nlohmann.github.io/json/api/basic_json/emplace/)). All [example files](https://github.com/nlohmann/json/tree/develop/doc/examples) can be compiled and executed on their own (e.g., file [emplace.cpp](https://github.com/nlohmann/json/blob/develop/doc/examples/emplace.cpp)).
-
 ### JSON as first-class data type
 
 Here are some examples to give you an idea how to use the class.
@@ -326,7 +233,7 @@ json j2 = {
 };
 ```
 
-Note that in all these cases, you never need to "tell" the compiler which JSON value type you want to use. If you want to be explicit or express some edge cases, the functions [`json::array()`](https://nlohmann.github.io/json/api/basic_json/array/) and [`json::object()`](https://nlohmann.github.io/json/api/basic_json/object/) will help:
+Note that in all these cases, you never need to "tell" the compiler which JSON value type you want to use. If you want to be explicit or express some edge cases, the functions [`json::array()`](https://json.nlohmann.me/api/basic_json/array/) and [`json::object()`](https://json.nlohmann.me/api/basic_json/object/) will help:
 
 ```cpp
 // a way to express the empty array []
@@ -359,13 +266,18 @@ auto j2 = R"(
 )"_json;
 ```
 
-Note that without appending the `_json` suffix, the passed string literal is not parsed, but just used as JSON string value. That is, `json j = "{ \"happy\": true, \"pi\": 3.141 }"` would just store the string `"{ "happy": true, "pi": 3.141 }"` rather than parsing the actual object.
+Note that without appending the `_json` suffix, the passed string literal is not parsed, but just used as JSON string
+value. That is, `json j = "{ \"happy\": true, \"pi\": 3.141 }"` would just store the string
+`"{ "happy": true, "pi": 3.141 }"` rather than parsing the actual object.
+
+The string literal should be brought into scope with `using namespace nlohmann::literals;`
+(see [`json::parse()`](https://json.nlohmann.me/api/operator_literal_json/)).
 
-The above example can also be expressed explicitly using [`json::parse()`](https://nlohmann.github.io/json/api/basic_json/parse/):
+The above example can also be expressed explicitly using [`json::parse()`](https://json.nlohmann.me/api/basic_json/parse/):
 
 ```cpp
 // parse explicitly
-auto j3 = json::parse("{ \"happy\": true, \"pi\": 3.141 }");
+auto j3 = json::parse(R"({"happy": true, "pi": 3.141})");
 ```
 
 You can also get a string representation of a JSON value (serialize):
@@ -390,8 +302,8 @@ Note the difference between serialization and assignment:
 json j_string = "this is a string";
 
 // retrieve the string value
-auto cpp_string = j_string.get<std::string>();
-// retrieve the string value (alternative when an variable already exists)
+auto cpp_string = j_string.template get<std::string>();
+// retrieve the string value (alternative when a variable already exists)
 std::string cpp_string2;
 j_string.get_to(cpp_string2);
 
@@ -399,14 +311,14 @@ j_string.get_to(cpp_string2);
 std::string serialized_string = j_string.dump();
 
 // output of original string
-std::cout << cpp_string << " == " << cpp_string2 << " == " << j_string.get<std::string>() << '\n';
+std::cout << cpp_string << " == " << cpp_string2 << " == " << j_string.template get<std::string>() << '\n';
 // output of serialized value
 std::cout << j_string << " == " << serialized_string << std::endl;
 ```
 
-[`.dump()`](https://nlohmann.github.io/json/api/basic_json/dump/) returns the originally stored string value.
+[`.dump()`](https://json.nlohmann.me/api/basic_json/dump/) returns the originally stored string value.
 
-Note the library only supports UTF-8. When you store strings with different encodings in the library, calling [`dump()`](https://nlohmann.github.io/json/api/basic_json/dump/) may throw an exception unless `json::error_handler_t::replace` or `json::error_handler_t::ignore` are used as error handlers.
+Note the library only supports UTF-8. When you store strings with different encodings in the library, calling [`dump()`](https://json.nlohmann.me/api/basic_json/dump/) may throw an exception unless `json::error_handler_t::replace` or `json::error_handler_t::ignore` are used as error handlers.
 
 #### To/from streams (e.g. files, string streams)
 
@@ -572,15 +484,15 @@ for (auto& element : j) {
 }
 
 // getter/setter
-const auto tmp = j[0].get<std::string>();
+const auto tmp = j[0].template get<std::string>();
 j[1] = 42;
 bool foo = j.at(2);
 
 // comparison
-j == "[\"foo\", 42, true, 1.78]"_json;  // true
+j == R"(["foo", 1, true, 1.78])"_json;  // true
 
 // other stuff
-j.size();     // 3 entries
+j.size();     // 4 entries
 j.empty();    // false
 j.type();     // json::value_t::array
 j.clear();    // the array is empty again
@@ -700,7 +612,7 @@ json j_ummap(c_ummap); // only one entry for key "three" is used
 
 ### JSON Pointer and JSON Patch
 
-The library supports **JSON Pointer** ([RFC 6901](https://tools.ietf.org/html/rfc6901)) as alternative means to address structured values. On top of this, **JSON Patch** ([RFC 6902](https://tools.ietf.org/html/rfc6902)) allows to describe differences between two JSON values - effectively allowing patch and diff operations known from Unix.
+The library supports **JSON Pointer** ([RFC 6901](https://tools.ietf.org/html/rfc6901)) as alternative means to address structured values. On top of this, **JSON Patch** ([RFC 6902](https://tools.ietf.org/html/rfc6902)) allows describing differences between two JSON values - effectively allowing patch and diff operations known from Unix.
 
 ```cpp
 // a JSON value
@@ -780,7 +692,7 @@ You can switch off implicit conversions by defining `JSON_USE_IMPLICIT_CONVERSIO
 // strings
 std::string s1 = "Hello, world!";
 json js = s1;
-auto s2 = js.get<std::string>();
+auto s2 = js.template get<std::string>();
 // NOT RECOMMENDED
 std::string s3 = js;
 std::string s4;
@@ -789,7 +701,7 @@ s4 = js;
 // Booleans
 bool b1 = true;
 json jb = b1;
-auto b2 = jb.get<bool>();
+auto b2 = jb.template get<bool>();
 // NOT RECOMMENDED
 bool b3 = jb;
 bool b4;
@@ -798,7 +710,7 @@ b4 = jb;
 // numbers
 int i = 42;
 json jn = i;
-auto f = jn.get<double>();
+auto f = jn.template get<double>();
 // NOT RECOMMENDED
 double f2 = jb;
 double f3;
@@ -841,9 +753,9 @@ j["age"] = p.age;
 
 // convert from JSON: copy each value from the JSON object
 ns::person p {
-    j["name"].get<std::string>(),
-    j["address"].get<std::string>(),
-    j["age"].get<int>()
+    j["name"].template get<std::string>(),
+    j["address"].template get<std::string>(),
+    j["age"].template get<int>()
 };
 ```
 
@@ -860,7 +772,7 @@ std::cout << j << std::endl;
 // {"address":"744 Evergreen Terrace","age":60,"name":"Ned Flanders"}
 
 // conversion: json -> person
-auto p2 = j.get<ns::person>();
+auto p2 = j.template get<ns::person>();
 
 // that's it
 assert(p == p2);
@@ -871,7 +783,7 @@ assert(p == p2);
 To make this work with one of your types, you only need to provide two functions:
 
 ```cpp
-using nlohmann::json;
+using json = nlohmann::json;
 
 namespace ns {
     void to_json(json& j, const person& p) {
@@ -887,14 +799,14 @@ namespace ns {
 ```
 
 That's all! When calling the `json` constructor with your type, your custom `to_json` method will be automatically called.
-Likewise, when calling `get<your_type>()` or `get_to(your_type&)`, the `from_json` method will be called.
+Likewise, when calling `template get<your_type>()` or `get_to(your_type&)`, the `from_json` method will be called.
 
 Some important things:
 
 * Those methods **MUST** be in your type's namespace (which can be the global namespace), or the library will not be able to locate them (in this example, they are in namespace `ns`, where `person` is defined).
 * Those methods **MUST** be available (e.g., proper headers must be included) everywhere you use these conversions. Look at [issue 1108](https://github.com/nlohmann/json/issues/1108) for errors that may occur otherwise.
-* When using `get<your_type>()`, `your_type` **MUST** be [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible). (There is a way to bypass this requirement described later.)
-* In function `from_json`, use function [`at()`](https://nlohmann.github.io/json/api/basic_json/at/) to access the object values rather than `operator[]`. In case a key does not exist, `at` throws an exception that you can handle, whereas `operator[]` exhibits undefined behavior.
+* When using `template get<your_type>()`, `your_type` **MUST** be [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible). (There is a way to bypass this requirement described later.)
+* In function `from_json`, use function [`at()`](https://json.nlohmann.me/api/basic_json/at/) to access the object values rather than `operator[]`. In case a key does not exist, `at` throws an exception that you can handle, whereas `operator[]` exhibits undefined behavior.
 * You do not need to add serializers or deserializers for STL types like `std::vector`: the library already implements these.
 
 #### Simplify your life with macros
@@ -903,8 +815,8 @@ If you just want to serialize/deserialize some structs, the `to_json`/`from_json
 
 There are two macros to make your life easier as long as you (1) want to use a JSON object as serialization and (2) want to use the member variable names as object keys in that object:
 
-- `NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(name, member1, member2, ...)` is to be defined inside of the namespace of the class/struct to create code for.
-- `NLOHMANN_DEFINE_TYPE_INTRUSIVE(name, member1, member2, ...)` is to be defined inside of the class/struct to create code for. This macro can also access private members.
+- `NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(name, member1, member2, ...)` is to be defined inside the namespace of the class/struct to create code for.
+- `NLOHMANN_DEFINE_TYPE_INTRUSIVE(name, member1, member2, ...)` is to be defined inside the class/struct to create code for. This macro can also access private members.
 
 In both macros, the first parameter is the name of the class/struct, and all remaining parameters name the members.
 
@@ -978,8 +890,8 @@ namespace nlohmann {
             if (j.is_null()) {
                 opt = boost::none;
             } else {
-                opt = j.get<T>(); // same as above, but with
-                                  // adl_serializer<T>::from_json
+                opt = j.template get<T>(); // same as above, but with
+                                           // adl_serializer<T>::from_json
             }
         }
     };
@@ -1006,10 +918,10 @@ namespace nlohmann {
         // note: the return type is no longer 'void', and the method only takes
         // one argument
         static move_only_type from_json(const json& j) {
-            return {j.get<int>()};
+            return {j.template get<int>()};
         }
 
-        // Here's the catch! You must provide a to_json method! Otherwise you
+        // Here's the catch! You must provide a to_json method! Otherwise, you
         // will not be able to convert move_only_type to json, since you fully
         // specialized adl_serializer on that type
         static void to_json(json& j, move_only_type t) {
@@ -1021,7 +933,7 @@ namespace nlohmann {
 
 #### Can I write my own serializer? (Advanced use)
 
-Yes. You might want to take a look at [`unit-udt.cpp`](https://github.com/nlohmann/json/blob/develop/test/src/unit-udt.cpp) in the test suite, to see a few examples.
+Yes. You might want to take a look at [`unit-udt.cpp`](https://github.com/nlohmann/json/blob/develop/tests/src/unit-udt.cpp) in the test suite, to see a few examples.
 
 If you write your own serializer, you'll need to do a few things:
 
@@ -1110,24 +1022,24 @@ assert(j == "stopped");
 
 // json string to enum
 json j3 = "running";
-assert(j3.get<TaskState>() == TS_RUNNING);
+assert(j3.template get<TaskState>() == TS_RUNNING);
 
 // undefined json value to enum (where the first map entry above is the default)
 json jPi = 3.14;
-assert(jPi.get<TaskState>() == TS_INVALID );
+assert(jPi.template get<TaskState>() == TS_INVALID );
 ```
 
 Just as in [Arbitrary Type Conversions](#arbitrary-types-conversions) above,
-- `NLOHMANN_JSON_SERIALIZE_ENUM()` MUST be declared in your enum type's namespace (which can be the global namespace), or the library will not be able to locate it and it will default to integer serialization.
+- `NLOHMANN_JSON_SERIALIZE_ENUM()` MUST be declared in your enum type's namespace (which can be the global namespace), or the library will not be able to locate it, and it will default to integer serialization.
 - It MUST be available (e.g., proper headers must be included) everywhere you use the conversions.
 
 Other Important points:
-- When using `get<ENUM_TYPE>()`, undefined JSON values will default to the first pair specified in your map. Select this default pair carefully.
+- When using `template get<ENUM_TYPE>()`, undefined JSON values will default to the first pair specified in your map. Select this default pair carefully.
 - If an enum or JSON value is specified more than once in your map, the first matching occurrence from the top of the map will be returned when converting to or from JSON.
 
-### Binary formats (BSON, CBOR, MessagePack, and UBJSON)
+### Binary formats (BSON, CBOR, MessagePack, UBJSON, and BJData)
 
-Though JSON is a ubiquitous data format, it is not a very compact format suitable for data exchange, for instance over a network. Hence, the library supports [BSON](http://bsonspec.org) (Binary JSON), [CBOR](https://cbor.io) (Concise Binary Object Representation), [MessagePack](https://msgpack.org), and [UBJSON](http://ubjson.org) (Universal Binary JSON Specification) to efficiently encode JSON values to byte vectors and to decode such vectors.
+Though JSON is a ubiquitous data format, it is not a very compact format suitable for data exchange, for instance over a network. Hence, the library supports [BSON](https://bsonspec.org) (Binary JSON), [CBOR](https://cbor.io) (Concise Binary Object Representation), [MessagePack](https://msgpack.org), [UBJSON](https://ubjson.org) (Universal Binary JSON Specification) and [BJData](https://neurojson.org/bjdata) (Binary JData) to efficiently encode JSON values to byte vectors and to decode such vectors.
 
 ```cpp
 // create a JSON value
@@ -1166,7 +1078,7 @@ std::vector<std::uint8_t> v_ubjson = json::to_ubjson(j);
 json j_from_ubjson = json::from_ubjson(v_ubjson);
 ```
 
-The library also supports binary types from BSON, CBOR (byte strings), and MessagePack (bin, ext, fixext). They are stored by default as `std::vector<std::uint8_t>` to be processed outside of the library.
+The library also supports binary types from BSON, CBOR (byte strings), and MessagePack (bin, ext, fixext). They are stored by default as `std::vector<std::uint8_t>` to be processed outside the library.
 
 ```cpp
 // CBOR byte string with payload 0xCAFE
@@ -1199,15 +1111,17 @@ auto cbor = json::to_msgpack(j); // 0xD5 (fixext2), 0x10, 0xCA, 0xFE
 
 ## Supported compilers
 
-Though it's 2021 already, the support for C++11 is still a bit sparse. Currently, the following compilers are known to work:
+Though it's 2023 already, the support for C++11 is still a bit sparse. Currently, the following compilers are known to work:
 
-- GCC 4.8 - 11.0 (and possibly later)
-- Clang 3.4 - 11.0 (and possibly later)
-- Apple Clang 9.1 - 12.3 (and possibly later)
+- GCC 4.8 - 12.0 (and possibly later)
+- Clang 3.4 - 15.0 (and possibly later)
+- Apple Clang 9.1 - 13.1 (and possibly later)
 - Intel C++ Compiler 17.0.2 (and possibly later)
+- Nvidia CUDA Compiler 11.0.221 (and possibly later)
 - Microsoft Visual C++ 2015 / Build Tools 14.0.25123.0 (and possibly later)
 - Microsoft Visual C++ 2017 / Build Tools 15.5.180.51428 (and possibly later)
 - Microsoft Visual C++ 2019 / Build Tools 16.3.1+1def00d3d (and possibly later)
+- Microsoft Visual C++ 2022 / Build Tools 19.30.30709.0 (and possibly later)
 
 I would be happy to learn about other compilers/versions.
 
@@ -1228,50 +1142,248 @@ Please note:
 
 - Unsupported versions of GCC and Clang are rejected by `#error` directives. This can be switched off by defining `JSON_SKIP_UNSUPPORTED_COMPILER_CHECK`. Note that you can expect no support in this case.
 
-The following compilers are currently used in continuous integration at [Travis](https://travis-ci.org/nlohmann/json), [AppVeyor](https://ci.appveyor.com/project/nlohmann/json), [GitHub Actions](https://github.com/nlohmann/json/actions), and [CircleCI](https://circleci.com/gh/nlohmann/json):
-
-| Compiler                                                          | Operating System   | CI Provider    |
-|-------------------------------------------------------------------|--------------------|----------------|
-| Apple Clang 10.0.1 (clang-1001.0.46.4); Xcode 10.2.1              | macOS 10.14.4      | Travis         |
-| Apple Clang 11.0.0 (clang-1100.0.33.12); Xcode 11.2.1             | macOS 10.14.6      | Travis         |
-| Apple Clang 11.0.3 (clang-1103.0.32.59); Xcode 11.4.1             | macOS 10.15.4      | GitHub Actions |
-| Apple Clang 12.0.0 (clang-1200.0.22.7); Xcode 11.4.1              | macOS 10.15.5      | Travis         |
-| Clang 3.5.0 (3.5.0-4ubuntu2\~trusty2)                             | Ubuntu 14.04.5 LTS | Travis         |
-| Clang 3.6.2 (3.6.2-svn240577-1\~exp1)                             | Ubuntu 14.04.5 LTS | Travis         |
-| Clang 3.7.1 (3.7.1-svn253571-1\~exp1)                             | Ubuntu 14.04.5 LTS | Travis         |
-| Clang 3.8.0 (3.8.0-2ubuntu3\~trusty5)                             | Ubuntu 14.04.5 LTS | Travis         |
-| Clang 3.9.1 (3.9.1-4ubuntu3\~14.04.3)                             | Ubuntu 14.04.5 LTS | Travis         |
-| Clang 4.0.1 (4.0.1-svn305264-1\~exp1)                             | Ubuntu 14.04.5 LTS | Travis         |
-| Clang 5.0.2 (version 5.0.2-svn328729-1\~exp1\~20180509123505.100) | Ubuntu 14.04.5 LTS | Travis         |
-| Clang 6.0.1 (6.0.1-svn334776-1\~exp1\~20190309042707.121)         | Ubuntu 14.04.5 LTS | Travis         |
-| Clang 7.1.0 (7.1.0-svn353565-1\~exp1\~20190419134007.64)          | Ubuntu 14.04.5 LTS | Travis         |
-| Clang 7.5.0 (Ubuntu 7.5.0-3ubuntu1\~18.04)                        | Ubuntu 18.04.4 LTS | Travis         |
-| Clang 9.0.0 (x86_64-pc-windows-msvc)                              | Windows-10.0.17763 | GitHub Actions |
-| Clang 10.0.0 (x86_64-pc-windows-msvc)                             | Windows-10.0.17763 | GitHub Actions |
-| GCC 4.8.5 (Ubuntu 4.8.5-4ubuntu8\~14.04.2)                        | Ubuntu 14.04.5 LTS | Travis         |
-| GCC 4.9.4 (Ubuntu 4.9.4-2ubuntu1\~14.04.1)                        | Ubuntu 14.04.5 LTS | Travis         |
-| GCC 5.5.0 (Ubuntu 5.5.0-12ubuntu1\~14.04)                         | Ubuntu 14.04.5 LTS | Travis         |
-| GCC 6.3.0 (Debian 6.3.0-18+deb9u1)                                | Debian 9           | Circle CI      |
-| GCC 6.5.0 (Ubuntu 6.5.0-2ubuntu1\~14.04.1)                        | Ubuntu 14.04.5 LTS | Travis         |
-| GCC 7.3.0 (x86_64-posix-seh-rev0, Built by MinGW-W64 project)     | Windows-6.3.9600   | AppVeyor       |
-| GCC 7.5.0 (Ubuntu 7.5.0-3ubuntu1\~14.04.1)                        | Ubuntu 14.04.5 LTS | Travis         |
-| GCC 7.5.0 (Ubuntu 7.5.0-3ubuntu1\~18.04)                          | Ubuntu 18.04.4 LTS | GitHub Actions |
-| GCC 8.4.0 (Ubuntu 8.4.0-1ubuntu1\~14.04)                          | Ubuntu 14.04.5 LTS | Travis         |
-| GCC 9.3.0 (Ubuntu 9.3.0-11ubuntu0\~14.04)                         | Ubuntu 14.04.5 LTS | Travis         |
-| GCC 10.1.0 (Arch Linux latest)                                    | Arch Linux         | Circle CI      |
-| MSVC 19.0.24241.7 (Build Engine version 14.0.25420.1)             | Windows-6.3.9600   | AppVeyor       |
-| MSVC 19.16.27035.0 (15.9.21+g9802d43bc3 for .NET Framework)       | Windows-10.0.14393 | AppVeyor       |
-| MSVC 19.25.28614.0 (Build Engine version 16.5.0+d4cbfca49 for .NET Framework) | Windows-10.0.17763  | AppVeyor       |
-| MSVC 19.25.28614.0 (Build Engine version 16.5.0+d4cbfca49 for .NET Framework) | Windows-10.0.17763  | GitHub Actions |
-| MSVC 19.25.28614.0 (Build Engine version 16.5.0+d4cbfca49 for .NET Framework) with ClangCL 10.0.0 | Windows-10.0.17763  | GitHub Actions |
+The following compilers are currently used in continuous integration at [AppVeyor](https://ci.appveyor.com/project/nlohmann/json), [Cirrus CI](https://cirrus-ci.com/github/nlohmann/json), and [GitHub Actions](https://github.com/nlohmann/json/actions):
+
+| Compiler                                                                                               | Operating System   | CI Provider    |
+|--------------------------------------------------------------------------------------------------------|--------------------|----------------|
+| Apple Clang 11.0.3 (clang-1103.0.32.62);  Xcode 11.7                                                   | macOS 11.7.1       | GitHub Actions |
+| Apple Clang 12.0.0 (clang-1200.0.32.29);  Xcode 12.4                                                   | macOS 11.7.1       | GitHub Actions |
+| Apple Clang 12.0.5 (clang-1205.0.22.11);  Xcode 12.5.1                                                 | macOS 11.7.1       | GitHub Actions |
+| Apple Clang 13.0.0 (clang-1300.0.29.3);   Xcode 13.0                                                   | macOS 11.7.1       | GitHub Actions |
+| Apple Clang 13.0.0 (clang-1300.0.29.3);   Xcode 13.1                                                   | macOS 12.6.1       | GitHub Actions |
+| Apple Clang 13.0.0 (clang-1300.0.29.30);  Xcode 13.2.1                                                 | macOS 12.6.1       | GitHub Actions |
+| Apple Clang 13.1.6 (clang-1316.0.21.2.3); Xcode 13.3.1                                                 | macOS 12.6.1       | GitHub Actions |
+| Apple Clang 13.1.6 (clang-1316.0.21.2.5); Xcode 13.4.1                                                 | macOS 12.6.1       | GitHub Actions |
+| Apple Clang 14.0.0 (clang-1400.0.29.102); Xcode 14.0                                                   | macOS 12.6.1       | GitHub Actions |
+| Apple Clang 14.0.0 (clang-1400.0.29.102); Xcode 14.0.1                                                 | macOS 12.6.1       | GitHub Actions |
+| Apple Clang 14.0.0 (clang-1400.0.29.202); Xcode 14.1                                                   | macOS 12.6.1       | GitHub Actions |
+| Clang 3.5.2                                                                                            | Ubuntu 20.04.3 LTS | GitHub Actions |
+| Clang 3.6.2                                                                                            | Ubuntu 20.04.3 LTS | GitHub Actions |
+| Clang 3.7.1                                                                                            | Ubuntu 20.04.3 LTS | GitHub Actions |
+| Clang 3.8.1                                                                                            | Ubuntu 20.04.3 LTS | GitHub Actions |
+| Clang 3.9.1                                                                                            | Ubuntu 20.04.3 LTS | GitHub Actions |
+| Clang 4.0.1                                                                                            | Ubuntu 20.04.3 LTS | GitHub Actions |
+| Clang 5.0.2                                                                                            | Ubuntu 20.04.3 LTS | GitHub Actions |
+| Clang 6.0.1                                                                                            | Ubuntu 20.04.3 LTS | GitHub Actions |
+| Clang 7.0.1                                                                                            | Ubuntu 20.04.3 LTS | GitHub Actions |
+| Clang 8.0.0                                                                                            | Ubuntu 20.04.3 LTS | GitHub Actions |
+| Clang 9.0.0                                                                                            | Ubuntu 20.04.3 LTS | GitHub Actions |
+| Clang 10.0.0                                                                                           | Ubuntu 20.04.3 LTS | GitHub Actions |
+| Clang 10.0.0 with GNU-like command-line                                                                | Windows-10.0.17763 | GitHub Actions |
+| Clang 11.0.0 with GNU-like command-line                                                                | Windows-10.0.17763 | GitHub Actions |
+| Clang 11.0.0 with MSVC-like command-line                                                               | Windows-10.0.17763 | GitHub Actions |
+| Clang 11.0.0                                                                                           | Ubuntu 20.04.3 LTS | GitHub Actions |
+| Clang 12.0.0                                                                                           | Ubuntu 20.04.3 LTS | GitHub Actions |
+| Clang 12.0.0 with GNU-like command-line                                                                | Windows-10.0.17763 | GitHub Actions |
+| Clang 13.0.0                                                                                           | Ubuntu 20.04.3 LTS | GitHub Actions |
+| Clang 13.0.0 with GNU-like command-line                                                                | Windows-10.0.17763 | GitHub Actions |
+| Clang 14.0.0                                                                                           | Ubuntu 20.04.3 LTS | GitHub Actions |
+| Clang 14.0.0 with GNU-like command-line                                                                | Windows-10.0.17763 | GitHub Actions |
+| Clang 15.0.0 with GNU-like command-line                                                                | Windows-10.0.17763 | GitHub Actions |
+| Clang 15.0.4                                                                                           | Ubuntu 20.04.3 LTS | GitHub Actions |
+| Clang 16.0.0 (16.0.0-++20221031071727+500876226c60-1~exp1~20221031071831.439)                          | Ubuntu 20.04.3 LTS | GitHub Actions |
+| GCC 4.8.5 (Ubuntu 4.8.5-4ubuntu2)                                                                      | Ubuntu 20.04.3 LTS | GitHub Actions |
+| GCC 4.9.4                                                                                              | Ubuntu 20.04.3 LTS | GitHub Actions |
+| GCC 5.5.0                                                                                              | Ubuntu 20.04.3 LTS | GitHub Actions |
+| GCC 6.5.0                                                                                              | Ubuntu 20.04.3 LTS | GitHub Actions |
+| GCC 7.5.0                                                                                              | Ubuntu 20.04.3 LTS | GitHub Actions |
+| GCC 8.1.0 (i686-posix-dwarf-rev0, Built by MinGW-W64 project)                                          | Windows-10.0.17763 | GitHub Actions |
+| GCC 8.1.0 (x86_64-posix-seh-rev0, Built by MinGW-W64 project)                                          | Windows-10.0.17763 | GitHub Actions |
+| GCC 8.5.0                                                                                              | Ubuntu 20.04.3 LTS | GitHub Actions |
+| GCC 9.5.0                                                                                              | Ubuntu 20.04.3 LTS | GitHub Actions |
+| GCC 10.4.0                                                                                             | Ubuntu 20.04.3 LTS | GitHub Actions |
+| GCC 11.1.0                                                                                             | Ubuntu (aarch64)   | Cirrus CI      |
+| GCC 11.3.0                                                                                             | Ubuntu 20.04.3 LTS | GitHub Actions |
+| GCC 12.2.0                                                                                             | Ubuntu 20.04.3 LTS | GitHub Actions |
+| GCC 13.0.0 20220605 (experimental)                                                                     | Ubuntu 20.04.3 LTS | GitHub Actions |
+| Intel C++ Compiler 2021.5.0.20211109                                                                   | Ubuntu 20.04.3 LTS | GitHub Actions |
+| NVCC 11.0.221                                                                                          | Ubuntu 20.04.3 LTS | GitHub Actions |
+| Visual Studio 14 2015 MSVC 19.0.24241.7 (Build Engine version 14.0.25420.1)                            | Windows-6.3.9600   | AppVeyor       |
+| Visual Studio 15 2017 MSVC 19.16.27035.0 (Build Engine version 15.9.21+g9802d43bc3 for .NET Framework) | Windows-10.0.14393 | AppVeyor       |
+| Visual Studio 16 2019 MSVC 19.28.29912.0 (Build Engine version 16.9.0+57a23d249 for .NET Framework)    | Windows-10.0.17763 | GitHub Actions |
+| Visual Studio 16 2019 MSVC 19.28.29912.0 (Build Engine version 16.9.0+57a23d249 for .NET Framework)    | Windows-10.0.17763 | AppVeyor       |
+| Visual Studio 17 2022 MSVC 19.30.30709.0 (Build Engine version 17.0.31804.368 for .NET Framework)      | Windows-10.0.20348 | GitHub Actions |
+
+
+## Integration
+
+[`json.hpp`](https://github.com/nlohmann/json/blob/develop/single_include/nlohmann/json.hpp) is the single required file in `single_include/nlohmann` or [released here](https://github.com/nlohmann/json/releases). You need to add
+
+```cpp
+#include <nlohmann/json.hpp>
+
+// for convenience
+using json = nlohmann::json;
+```
+
+to the files you want to process JSON and set the necessary switches to enable C++11 (e.g., `-std=c++11` for GCC and Clang).
+
+You can further use file [`include/nlohmann/json_fwd.hpp`](https://github.com/nlohmann/json/blob/develop/include/nlohmann/json_fwd.hpp) for forward-declarations. The installation of json_fwd.hpp (as part of cmake's install step), can be achieved by setting `-DJSON_MultipleHeaders=ON`.
+
+### CMake
+
+You can also use the `nlohmann_json::nlohmann_json` interface target in CMake.  This target populates the appropriate usage requirements for `INTERFACE_INCLUDE_DIRECTORIES` to point to the appropriate include directories and `INTERFACE_COMPILE_FEATURES` for the necessary C++11 flags.
+
+#### External
+
+To use this library from a CMake project, you can locate it directly with `find_package()` and use the namespaced imported target from the generated package configuration:
+
+```cmake
+# CMakeLists.txt
+find_package(nlohmann_json 3.2.0 REQUIRED)
+...
+add_library(foo ...)
+...
+target_link_libraries(foo PRIVATE nlohmann_json::nlohmann_json)
+```
+
+The package configuration file, `nlohmann_jsonConfig.cmake`, can be used either from an install tree or directly out of the build tree.
+
+#### Embedded
+
+To embed the library directly into an existing CMake project, place the entire source tree in a subdirectory and call `add_subdirectory()` in your `CMakeLists.txt` file:
+
+```cmake
+# Typically you don't care so much for a third party library's tests to be
+# run from your own project's code.
+set(JSON_BuildTests OFF CACHE INTERNAL "")
+
+# If you only include this third party in PRIVATE source files, you do not
+# need to install it when your main project gets installed.
+# set(JSON_Install OFF CACHE INTERNAL "")
+
+# Don't use include(nlohmann_json/CMakeLists.txt) since that carries with it
+# unintended consequences that will break the build.  It's generally
+# discouraged (although not necessarily well documented as such) to use
+# include(...) for pulling in other CMake projects anyways.
+add_subdirectory(nlohmann_json)
+...
+add_library(foo ...)
+...
+target_link_libraries(foo PRIVATE nlohmann_json::nlohmann_json)
+```
+
+##### Embedded (FetchContent)
+
+Since CMake v3.11,
+[FetchContent](https://cmake.org/cmake/help/v3.11/module/FetchContent.html) can
+be used to automatically download a release as a dependency at configure time.
+
+Example:
+```cmake
+include(FetchContent)
+
+FetchContent_Declare(json URL https://github.com/nlohmann/json/releases/download/v3.11.3/json.tar.xz)
+FetchContent_MakeAvailable(json)
+
+target_link_libraries(foo PRIVATE nlohmann_json::nlohmann_json)
+```
+
+**Note**: It is recommended to use the URL approach described above which is supported as of version 3.10.0. See
+<https://json.nlohmann.me/integration/cmake/#fetchcontent> for more information.
+
+#### Supporting Both
+
+To allow your project to support either an externally supplied or an embedded JSON library, you can use a pattern akin to the following:
+
+``` cmake
+# Top level CMakeLists.txt
+project(FOO)
+...
+option(FOO_USE_EXTERNAL_JSON "Use an external JSON library" OFF)
+...
+add_subdirectory(thirdparty)
+...
+add_library(foo ...)
+...
+# Note that the namespaced target will always be available regardless of the
+# import method
+target_link_libraries(foo PRIVATE nlohmann_json::nlohmann_json)
+```
+```cmake
+# thirdparty/CMakeLists.txt
+...
+if(FOO_USE_EXTERNAL_JSON)
+  find_package(nlohmann_json 3.2.0 REQUIRED)
+else()
+  set(JSON_BuildTests OFF CACHE INTERNAL "")
+  add_subdirectory(nlohmann_json)
+endif()
+...
+```
+
+`thirdparty/nlohmann_json` is then a complete copy of this source tree.
+
+### Package Managers
+
+:beer: If you are using OS X and [Homebrew](https://brew.sh), just type `brew install nlohmann-json` and you're set. If you want the bleeding edge rather than the latest release, use `brew install nlohmann-json --HEAD`. See [nlohmann-json](https://formulae.brew.sh/formula/nlohmann-json) for more information.
+
+If you are using the [Meson Build System](https://mesonbuild.com), add this source tree as a [meson subproject](https://mesonbuild.com/Subprojects.html#using-a-subproject). You may also use the `include.zip` published in this project's [Releases](https://github.com/nlohmann/json/releases) to reduce the size of the vendored source tree. Alternatively, you can get a wrap file by downloading it from [Meson WrapDB](https://wrapdb.mesonbuild.com/nlohmann_json), or simply use `meson wrap install nlohmann_json`. Please see the meson project for any issues regarding the packaging.
+
+The provided `meson.build` can also be used as an alternative to CMake for installing `nlohmann_json` system-wide in which case a pkg-config file is installed. To use it, simply have your build system require the `nlohmann_json` pkg-config dependency. In Meson, it is preferred to use the [`dependency()`](https://mesonbuild.com/Reference-manual.html#dependency) object with a subproject fallback, rather than using the subproject directly.
+
+If you are using [Bazel](https://bazel.build/) you can simply reference this repository using `http_archive` or `git_repository` and depend on `@nlohmann_json//:json`.
+
+If you are using [Conan](https://www.conan.io/) to manage your dependencies, merely add [`nlohmann_json/x.y.z`](https://conan.io/center/nlohmann_json) to your `conanfile`'s requires, where `x.y.z` is the release version you want to use. Please file issues [here](https://github.com/conan-io/conan-center-index/issues) if you experience problems with the packages.
+
+If you are using [Spack](https://www.spack.io/) to manage your dependencies, you can use the [`nlohmann-json` package](https://spack.readthedocs.io/en/latest/package_list.html#nlohmann-json). Please see the [spack project](https://github.com/spack/spack) for any issues regarding the packaging.
+
+If you are using [hunter](https://github.com/cpp-pm/hunter) on your project for external dependencies, then you can use the [nlohmann_json package](https://hunter.readthedocs.io/en/latest/packages/pkg/nlohmann_json.html). Please see the hunter project for any issues regarding the packaging.
+
+If you are using [Buckaroo](https://buckaroo.pm), you can install this library's module with `buckaroo add github.com/buckaroo-pm/nlohmann-json`. Please file issues [here](https://github.com/buckaroo-pm/nlohmann-json). There is a demo repo [here](https://github.com/njlr/buckaroo-nholmann-json-example).
+
+If you are using [vcpkg](https://github.com/Microsoft/vcpkg/) on your project for external dependencies, then you can install the [nlohmann-json package](https://github.com/Microsoft/vcpkg/tree/master/ports/nlohmann-json) with `vcpkg install nlohmann-json` and follow the then displayed descriptions. Please see the vcpkg project for any issues regarding the packaging.
+
+If you are using [cget](https://cget.readthedocs.io/en/latest/), you can install the latest development version with `cget install nlohmann/json`. A specific version can be installed with `cget install nlohmann/json@v3.1.0`. Also, the multiple header version can be installed by adding the `-DJSON_MultipleHeaders=ON` flag (i.e., `cget install nlohmann/json -DJSON_MultipleHeaders=ON`).
+
+If you are using [CocoaPods](https://cocoapods.org), you can use the library by adding pod `"nlohmann_json", '~>3.1.2'` to your podfile (see [an example](https://bitbucket.org/benman/nlohmann_json-cocoapod/src/master/)). Please file issues [here](https://bitbucket.org/benman/nlohmann_json-cocoapod/issues?status=new&status=open).
+
+If you are using [Swift Package Manager](https://swift.org/package-manager/), you can use the library by adding a package dependency to this repository. And target dependency as `.product(name: "nlohmann-json", package: "json")`.
+
+If you are using [NuGet](https://www.nuget.org), you can use the package [nlohmann.json](https://www.nuget.org/packages/nlohmann.json/). Please check [this extensive description](https://github.com/nlohmann/json/issues/1132#issuecomment-452250255) on how to use the package. Please file issues [here](https://github.com/hnkb/nlohmann-json-nuget/issues).
+
+If you are using [conda](https://conda.io/), you can use the package [nlohmann_json](https://github.com/conda-forge/nlohmann_json-feedstock) from [conda-forge](https://conda-forge.org) executing `conda install -c conda-forge nlohmann_json`. Please file issues [here](https://github.com/conda-forge/nlohmann_json-feedstock/issues).
+
+If you are using [MSYS2](https://www.msys2.org/), you can use the [mingw-w64-nlohmann-json](https://packages.msys2.org/base/mingw-w64-nlohmann-json) package, just type `pacman -S mingw-w64-i686-nlohmann-json` or `pacman -S mingw-w64-x86_64-nlohmann-json` for installation. Please file issues [here](https://github.com/msys2/MINGW-packages/issues/new?title=%5Bnlohmann-json%5D) if you experience problems with the packages.
+
+If you are using [MacPorts](https://ports.macports.org), execute `sudo port install nlohmann-json` to install the [nlohmann-json](https://ports.macports.org/port/nlohmann-json/) package.
+
+If you are using [`build2`](https://build2.org), you can use the [`nlohmann-json`](https://cppget.org/nlohmann-json) package from the public repository https://cppget.org or directly from the [package's sources repository](https://github.com/build2-packaging/nlohmann-json). In your project's `manifest` file, just add `depends: nlohmann-json` (probably with some [version constraints](https://build2.org/build2-toolchain/doc/build2-toolchain-intro.xhtml#guide-add-remove-deps)). If you are not familiar with using dependencies in `build2`, [please read this introduction](https://build2.org/build2-toolchain/doc/build2-toolchain-intro.xhtml).
+Please file issues [here](https://github.com/build2-packaging/nlohmann-json) if you experience problems with the packages.
+
+If you are using [`wsjcpp`](https://wsjcpp.org), you can use the command `wsjcpp install "https://github.com/nlohmann/json:develop"` to get the latest version. Note you can change the branch ":develop" to an existing tag or another branch.
+
+If you are using [`CPM.cmake`](https://github.com/TheLartians/CPM.cmake), you can check this [`example`](https://github.com/TheLartians/CPM.cmake/tree/master/examples/json). After [adding CPM script](https://github.com/TheLartians/CPM.cmake#adding-cpm) to your project, implement the following snippet to your CMake:
+
+```cmake
+CPMAddPackage(
+    NAME nlohmann_json
+    GITHUB_REPOSITORY nlohmann/json
+    VERSION 3.9.1)
+```
+
+### Pkg-config
+
+If you are using bare Makefiles, you can use `pkg-config` to generate the include flags that point to where the library is installed:
+
+```sh
+pkg-config nlohmann_json --cflags
+```
+
+Users of the Meson build system will also be able to use a system-wide library, which will be found by `pkg-config`:
+
+```meson
+json = dependency('nlohmann_json', required: true)
+```
+
 
 ## License
 
-<img align="right" src="http://opensource.org/trademarks/opensource/OSI-Approved-License-100x137.png">
+<img align="right" src="https://opensource.org/trademarks/opensource/OSI-Approved-License-100x137.png">
 
-The class is licensed under the [MIT License](http://opensource.org/licenses/MIT):
+The class is licensed under the [MIT License](https://opensource.org/licenses/MIT):
 
-Copyright &copy; 2013-2021 [Niels Lohmann](https://nlohmann.me)
+Copyright &copy; 2013-2022 [Niels Lohmann](https://nlohmann.me)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software�), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
@@ -1281,12 +1393,14 @@ THE SOFTWARE IS PROVIDED “AS IS�, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR I
 
 * * *
 
-The class contains the UTF-8 Decoder from Bjoern Hoehrmann which is licensed under the [MIT License](http://opensource.org/licenses/MIT) (see above). Copyright &copy; 2008-2009 [Björn Hoehrmann](https://bjoern.hoehrmann.de/) <bjoern@hoehrmann.de>
+The class contains the UTF-8 Decoder from Bjoern Hoehrmann which is licensed under the [MIT License](https://opensource.org/licenses/MIT) (see above). Copyright &copy; 2008-2009 [Björn Hoehrmann](https://bjoern.hoehrmann.de/) <bjoern@hoehrmann.de>
 
-The class contains a slightly modified version of the Grisu2 algorithm from Florian Loitsch which is licensed under the [MIT License](http://opensource.org/licenses/MIT) (see above). Copyright &copy; 2009 [Florian Loitsch](https://florian.loitsch.com/)
+The class contains a slightly modified version of the Grisu2 algorithm from Florian Loitsch which is licensed under the [MIT License](https://opensource.org/licenses/MIT) (see above). Copyright &copy; 2009 [Florian Loitsch](https://florian.loitsch.com/)
 
 The class contains a copy of [Hedley](https://nemequ.github.io/hedley/) from Evan Nemerson which is licensed as [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/).
 
+The class contains parts of [Google Abseil](https://github.com/abseil/abseil-cpp) which is licensed under the [Apache 2.0 License](https://opensource.org/licenses/Apache-2.0).
+
 ## Contact
 
 If you have questions regarding the library, I would like to invite you to [open an issue at GitHub](https://github.com/nlohmann/json/issues/new/choose). Please describe your request, problem, or question as detailed as possible, and also mention the version of the library you are using as well as the version of your compiler and operating system. Opening an issue at GitHub allows other users and contributors to this library to collaborate. For instance, I have little experience with MSVC, and most issues in this regard have been solved by a growing community. If you have a look at the [closed issues](https://github.com/nlohmann/json/issues?q=is%3Aissue+is%3Aclosed), you will see that we react quite timely in most cases.
@@ -1301,234 +1415,354 @@ Only if your request would contain confidential information, please [send me an
 
 I deeply appreciate the help of the following people.
 
-<img src="https://raw.githubusercontent.com/nlohmann/json/develop/doc/avatars.png" align="right">
-
-- [Teemperor](https://github.com/Teemperor) implemented CMake support and lcov integration, realized escape and Unicode handling in the string parser, and fixed the JSON serialization.
-- [elliotgoodrich](https://github.com/elliotgoodrich) fixed an issue with double deletion in the iterator classes.
-- [kirkshoop](https://github.com/kirkshoop) made the iterators of the class composable to other libraries.
-- [wancw](https://github.com/wanwc) fixed a bug that hindered the class to compile with Clang.
-- Tomas Ã…blad found a bug in the iterator implementation.
-- [Joshua C. Randall](https://github.com/jrandall) fixed a bug in the floating-point serialization.
-- [Aaron Burghardt](https://github.com/aburgh) implemented code to parse streams incrementally. Furthermore, he greatly improved the parser class by allowing the definition of a filter function to discard undesired elements while parsing.
-- [Daniel Kope�ek](https://github.com/dkopecek) fixed a bug in the compilation with GCC 5.0.
-- [Florian Weber](https://github.com/Florianjw) fixed a bug in and improved the performance of the comparison operators.
-- [Eric Cornelius](https://github.com/EricMCornelius) pointed out a bug in the handling with NaN and infinity values. He also improved the performance of the string escaping.
-- [易�龙](https://github.com/likebeta) implemented a conversion from anonymous enums.
-- [kepkin](https://github.com/kepkin) patiently pushed forward the support for Microsoft Visual studio.
-- [gregmarr](https://github.com/gregmarr) simplified the implementation of reverse iterators and helped with numerous hints and improvements. In particular, he pushed forward the implementation of user-defined types.
-- [Caio Luppi](https://github.com/caiovlp) fixed a bug in the Unicode handling.
-- [dariomt](https://github.com/dariomt) fixed some typos in the examples.
-- [Daniel Frey](https://github.com/d-frey) cleaned up some pointers and implemented exception-safe memory allocation.
-- [Colin Hirsch](https://github.com/ColinH) took care of a small namespace issue.
-- [Huu Nguyen](https://github.com/whoshuu) correct a variable name in the documentation.
-- [Silverweed](https://github.com/silverweed) overloaded `parse()` to accept an rvalue reference.
-- [dariomt](https://github.com/dariomt) fixed a subtlety in MSVC type support and implemented the `get_ref()` function to get a reference to stored values.
-- [ZahlGraf](https://github.com/ZahlGraf) added a workaround that allows compilation using Android NDK.
-- [whackashoe](https://github.com/whackashoe) replaced a function that was marked as unsafe by Visual Studio.
-- [406345](https://github.com/406345) fixed two small warnings.
-- [Glen Fernandes](https://github.com/glenfe) noted a potential portability problem in the `has_mapped_type` function.
-- [Corbin Hughes](https://github.com/nibroc) fixed some typos in the contribution guidelines.
-- [twelsby](https://github.com/twelsby) fixed the array subscript operator, an issue that failed the MSVC build, and floating-point parsing/dumping. He further added support for unsigned integer numbers and implemented better roundtrip support for parsed numbers.
-- [Volker Diels-Grabsch](https://github.com/vog) fixed a link in the README file.
-- [msm-](https://github.com/msm-) added support for American Fuzzy Lop.
-- [Annihil](https://github.com/Annihil) fixed an example in the README file.
-- [Themercee](https://github.com/Themercee) noted a wrong URL in the README file.
-- [Lv Zheng](https://github.com/lv-zheng) fixed a namespace issue with `int64_t` and `uint64_t`.
-- [abc100m](https://github.com/abc100m) analyzed the issues with GCC 4.8 and proposed a [partial solution](https://github.com/nlohmann/json/pull/212).
-- [zewt](https://github.com/zewt) added useful notes to the README file about Android.
-- [Róbert Márki](https://github.com/robertmrk) added a fix to use move iterators and improved the integration via CMake.
-- [Chris Kitching](https://github.com/ChrisKitching) cleaned up the CMake files.
-- [Tom Needham](https://github.com/06needhamt) fixed a subtle bug with MSVC 2015 which was also proposed by [Michael K.](https://github.com/Epidal).
-- [Mário Feroldi](https://github.com/thelostt) fixed a small typo.
-- [duncanwerner](https://github.com/duncanwerner) found a really embarrassing performance regression in the 2.0.0 release.
-- [Damien](https://github.com/dtoma) fixed one of the last conversion warnings.
-- [Thomas Braun](https://github.com/t-b) fixed a warning in a test case and adjusted MSVC calls in the CI.
-- [Théo DELRIEU](https://github.com/theodelrieu) patiently and constructively oversaw the long way toward [iterator-range parsing](https://github.com/nlohmann/json/issues/290). He also implemented the magic behind the serialization/deserialization of user-defined types and split the single header file into smaller chunks.
-- [Stefan](https://github.com/5tefan) fixed a minor issue in the documentation.
-- [Vasil Dimov](https://github.com/vasild) fixed the documentation regarding conversions from `std::multiset`.
-- [ChristophJud](https://github.com/ChristophJud) overworked the CMake files to ease project inclusion.
-- [Vladimir Petrigo](https://github.com/vpetrigo) made a SFINAE hack more readable and added Visual Studio 17 to the build matrix.
-- [Denis Andrejew](https://github.com/seeekr) fixed a grammar issue in the README file.
-- [Pierre-Antoine Lacaze](https://github.com/palacaze) found a subtle bug in the `dump()` function.
-- [TurpentineDistillery](https://github.com/TurpentineDistillery) pointed to [`std::locale::classic()`](https://en.cppreference.com/w/cpp/locale/locale/classic) to avoid too much locale joggling, found some nice performance improvements in the parser, improved the benchmarking code, and realized locale-independent number parsing and printing.
-- [cgzones](https://github.com/cgzones) had an idea how to fix the Coverity scan.
-- [Jared Grubb](https://github.com/jaredgrubb) silenced a nasty documentation warning.
-- [Yixin Zhang](https://github.com/qwename) fixed an integer overflow check.
-- [Bosswestfalen](https://github.com/Bosswestfalen) merged two iterator classes into a smaller one.
-- [Daniel599](https://github.com/Daniel599) helped to get Travis execute the tests with Clang's sanitizers.
-- [Jonathan Lee](https://github.com/vjon) fixed an example in the README file.
-- [gnzlbg](https://github.com/gnzlbg) supported the implementation of user-defined types.
-- [Alexej Harm](https://github.com/qis) helped to get the user-defined types working with Visual Studio.
-- [Jared Grubb](https://github.com/jaredgrubb) supported the implementation of user-defined types.
-- [EnricoBilla](https://github.com/EnricoBilla) noted a typo in an example.
-- [Martin Hořeňovský](https://github.com/horenmar) found a way for a 2x speedup for the compilation time of the test suite.
-- [ukhegg](https://github.com/ukhegg) found proposed an improvement for the examples section.
-- [rswanson-ihi](https://github.com/rswanson-ihi) noted a typo in the README.
-- [Mihai Stan](https://github.com/stanmihai4) fixed a bug in the comparison with `nullptr`s.
-- [Tushar Maheshwari](https://github.com/tusharpm) added [cotire](https://github.com/sakra/cotire) support to speed up the compilation.
-- [TedLyngmo](https://github.com/TedLyngmo) noted a typo in the README, removed unnecessary bit arithmetic, and fixed some `-Weffc++` warnings.
-- [Krzysztof WoÅ›](https://github.com/krzysztofwos) made exceptions more visible.
-- [ftillier](https://github.com/ftillier) fixed a compiler warning.
-- [tinloaf](https://github.com/tinloaf) made sure all pushed warnings are properly popped.
-- [Fytch](https://github.com/Fytch) found a bug in the documentation.
-- [Jay Sistar](https://github.com/Type1J) implemented a Meson build description.
-- [Henry Lee](https://github.com/HenryRLee) fixed a warning in ICC and improved the iterator implementation.
-- [Vincent Thiery](https://github.com/vthiery) maintains a package for the Conan package manager.
-- [Steffen](https://github.com/koemeet) fixed a potential issue with MSVC and `std::min`.
-- [Mike Tzou](https://github.com/Chocobo1) fixed some typos.
-- [amrcode](https://github.com/amrcode) noted a misleading documentation about comparison of floats.
-- [Oleg Endo](https://github.com/olegendo) reduced the memory consumption by replacing `<iostream>` with `<iosfwd>`.
-- [dan-42](https://github.com/dan-42) cleaned up the CMake files to simplify including/reusing of the library.
-- [Nikita Ofitserov](https://github.com/himikof) allowed for moving values from initializer lists.
-- [Greg Hurrell](https://github.com/wincent) fixed a typo.
-- [Dmitry Kukovinets](https://github.com/DmitryKuk) fixed a typo.
-- [kbthomp1](https://github.com/kbthomp1) fixed an issue related to the Intel OSX compiler.
-- [Markus Werle](https://github.com/daixtrose) fixed a typo.
-- [WebProdPP](https://github.com/WebProdPP) fixed a subtle error in a precondition check.
-- [Alex](https://github.com/leha-bot) noted an error in a code sample.
-- [Tom de Geus](https://github.com/tdegeus) reported some warnings with ICC and helped fixing them.
-- [Perry Kundert](https://github.com/pjkundert) simplified reading from input streams.
-- [Sonu Lohani](https://github.com/sonulohani) fixed a small compilation error.
-- [Jamie Seward](https://github.com/jseward) fixed all MSVC warnings.
-- [Nate Vargas](https://github.com/eld00d) added a Doxygen tag file.
-- [pvleuven](https://github.com/pvleuven) helped fixing a warning in ICC.
-- [Pavel](https://github.com/crea7or) helped fixing some warnings in MSVC.
-- [Jamie Seward](https://github.com/jseward) avoided unnecessary string copies in `find()` and `count()`.
-- [Mitja](https://github.com/Itja) fixed some typos.
-- [Jorrit Wronski](https://github.com/jowr) updated the Hunter package links.
-- [Matthias Möller](https://github.com/TinyTinni) added a `.natvis` for the MSVC debug view.
-- [bogemic](https://github.com/bogemic) fixed some C++17 deprecation warnings.
-- [Eren Okka](https://github.com/erengy) fixed some MSVC warnings.
-- [abolz](https://github.com/abolz) integrated the Grisu2 algorithm for proper floating-point formatting, allowing more roundtrip checks to succeed.
-- [Vadim Evard](https://github.com/Pipeliner) fixed a Markdown issue in the README.
-- [zerodefect](https://github.com/zerodefect) fixed a compiler warning.
-- [Kert](https://github.com/kaidokert) allowed to template the string type in the serialization and added the possibility to override the exceptional behavior.
-- [mark-99](https://github.com/mark-99) helped fixing an ICC error.
-- [Patrik Huber](https://github.com/patrikhuber) fixed links in the README file.
-- [johnfb](https://github.com/johnfb) found a bug in the implementation of CBOR's indefinite length strings.
-- [Paul Fultz II](https://github.com/pfultz2) added a note on the cget package manager.
-- [Wilson Lin](https://github.com/wla80) made the integration section of the README more concise.
-- [RalfBielig](https://github.com/ralfbielig) detected and fixed a memory leak in the parser callback.
-- [agrianius](https://github.com/agrianius) allowed to dump JSON to an alternative string type.
-- [Kevin Tonon](https://github.com/ktonon) overworked the C++11 compiler checks in CMake.
-- [Axel Huebl](https://github.com/ax3l) simplified a CMake check and added support for the [Spack package manager](https://spack.io).
-- [Carlos O'Ryan](https://github.com/coryan) fixed a typo.
-- [James Upjohn](https://github.com/jammehcow) fixed a version number in the compilers section.
-- [Chuck Atkins](https://github.com/chuckatkins) adjusted the CMake files to the CMake packaging guidelines and provided documentation for the CMake integration.
-- [Jan Schöppach](https://github.com/dns13) fixed a typo.
-- [martin-mfg](https://github.com/martin-mfg) fixed a typo.
-- [Matthias Möller](https://github.com/TinyTinni) removed the dependency from `std::stringstream`.
-- [agrianius](https://github.com/agrianius) added code to use alternative string implementations.
-- [Daniel599](https://github.com/Daniel599) allowed to use more algorithms with the `items()` function.
-- [Julius Rakow](https://github.com/jrakow) fixed the Meson include directory and fixed the links to [cppreference.com](cppreference.com).
-- [Sonu Lohani](https://github.com/sonulohani) fixed the compilation with MSVC 2015 in debug mode.
-- [grembo](https://github.com/grembo) fixed the test suite and re-enabled several test cases.
-- [Hyeon Kim](https://github.com/simnalamburt) introduced the macro `JSON_INTERNAL_CATCH` to control the exception handling inside the library.
-- [thyu](https://github.com/thyu) fixed a compiler warning.
-- [David Guthrie](https://github.com/LEgregius) fixed a subtle compilation error with Clang 3.4.2.
-- [Dennis Fischer](https://github.com/dennisfischer) allowed to call `find_package` without installing the library.
-- [Hyeon Kim](https://github.com/simnalamburt) fixed an issue with a double macro definition.
-- [Ben Berman](https://github.com/rivertam) made some error messages more understandable.
-- [zakalibit](https://github.com/zakalibit) fixed a compilation problem with the Intel C++ compiler.
-- [mandreyel](https://github.com/mandreyel) fixed a compilation problem.
-- [Kostiantyn Ponomarenko](https://github.com/koponomarenko) added version and license information to the Meson build file.
-- [Henry Schreiner](https://github.com/henryiii) added support for GCC 4.8.
-- [knilch](https://github.com/knilch0r) made sure the test suite does not stall when run in the wrong directory.
-- [Antonio Borondo](https://github.com/antonioborondo) fixed an MSVC 2017 warning.
-- [Dan Gendreau](https://github.com/dgendreau) implemented the `NLOHMANN_JSON_SERIALIZE_ENUM` macro to quickly define a enum/JSON mapping.
-- [efp](https://github.com/efp) added line and column information to parse errors.
-- [julian-becker](https://github.com/julian-becker) added BSON support.
-- [Pratik Chowdhury](https://github.com/pratikpc) added support for structured bindings.
-- [David Avedissian](https://github.com/davedissian) added support for Clang 5.0.1 (PS4 version).
-- [Jonathan Dumaresq](https://github.com/dumarjo) implemented an input adapter to read from `FILE*`.
-- [kjpus](https://github.com/kjpus) fixed a link in the documentation.
-- [Manvendra Singh](https://github.com/manu-chroma) fixed a typo in the documentation.
-- [ziggurat29](https://github.com/ziggurat29) fixed an MSVC warning.
-- [Sylvain Corlay](https://github.com/SylvainCorlay) added code to avoid an issue with MSVC.
-- [mefyl](https://github.com/mefyl) fixed a bug when JSON was parsed from an input stream.
-- [Millian Poquet](https://github.com/mpoquet) allowed to install the library via Meson.
-- [Michael Behrns-Miller](https://github.com/moodboom) found an issue with a missing namespace.
-- [Nasztanovics Ferenc](https://github.com/naszta) fixed a compilation issue with libc 2.12.
-- [Andreas Schwab](https://github.com/andreas-schwab) fixed the endian conversion.
-- [Mark-Dunning](https://github.com/Mark-Dunning) fixed a warning in MSVC.
-- [Gareth Sylvester-Bradley](https://github.com/garethsb-sony) added `operator/` for JSON Pointers.
-- [John-Mark](https://github.com/johnmarkwayve) noted a missing header.
-- [Vitaly Zaitsev](https://github.com/xvitaly) fixed compilation with GCC 9.0.
-- [Laurent Stacul](https://github.com/stac47) fixed compilation with GCC 9.0.
-- [Ivor Wanders](https://github.com/iwanders) helped reducing the CMake requirement to version 3.1.
-- [njlr](https://github.com/njlr) updated the Buckaroo instructions.
-- [Lion](https://github.com/lieff) fixed a compilation issue with GCC 7 on CentOS.
-- [Isaac Nickaein](https://github.com/nickaein) improved the integer serialization performance and  implemented the `contains()` function.
-- [past-due](https://github.com/past-due) suppressed an unfixable warning.
-- [Elvis Oric](https://github.com/elvisoric) improved Meson support.
-- [Matěj Plch](https://github.com/Afforix) fixed an example in the README.
-- [Mark Beckwith](https://github.com/wythe) fixed a typo.
-- [scinart](https://github.com/scinart) fixed bug in the serializer.
-- [Patrick Boettcher](https://github.com/pboettch) implemented `push_back()` and `pop_back()` for JSON Pointers.
-- [Bruno Oliveira](https://github.com/nicoddemus) added support for Conda.
-- [Michele Caini](https://github.com/skypjack) fixed links in the README.
-- [Hani](https://github.com/hnkb) documented how to install the library with NuGet.
-- [Mark Beckwith](https://github.com/wythe) fixed a typo.
-- [yann-morin-1998](https://github.com/yann-morin-1998) helped reducing the CMake requirement to version 3.1.
-- [Konstantin Podsvirov](https://github.com/podsvirov) maintains a package for the MSYS2 software distro.
-- [remyabel](https://github.com/remyabel) added GNUInstallDirs to the CMake files.
-- [Taylor Howard](https://github.com/taylorhoward92) fixed a unit test.
-- [Gabe Ron](https://github.com/Macr0Nerd) implemented the `to_string` method.
-- [Watal M. Iwasaki](https://github.com/heavywatal) fixed a Clang warning.
-- [Viktor Kirilov](https://github.com/onqtam) switched the unit tests from [Catch](https://github.com/philsquared/Catch) to [doctest](https://github.com/onqtam/doctest)
-- [Juncheng E](https://github.com/ejcjason) fixed a typo.
-- [tete17](https://github.com/tete17) fixed a bug in the `contains` function.
-- [Xav83](https://github.com/Xav83) fixed some cppcheck warnings.
-- [0xflotus](https://github.com/0xflotus) fixed some typos.
-- [Christian Deneke](https://github.com/chris0x44) added a const version of `json_pointer::back`.
-- [Julien Hamaide](https://github.com/crazyjul) made the `items()` function work with custom string types.
-- [Evan Nemerson](https://github.com/nemequ) updated fixed a bug in Hedley and updated this library accordingly.
-- [Florian Pigorsch](https://github.com/flopp) fixed a lot of typos.
-- [Camille Bégué](https://github.com/cbegue) fixed an issue in the conversion from  `std::pair` and `std::tuple` to `json`.
-- [Anthony VH](https://github.com/AnthonyVH) fixed a compile error in an enum deserialization.
-- [Yuriy Vountesmery](https://github.com/ua-code-dragon) noted a subtle bug in a preprocessor check.
-- [Chen](https://github.com/dota17) fixed numerous issues in the library.
-- [Antony Kellermann](https://github.com/aokellermann) added a CI step for GCC 10.1.
-- [Alex](https://github.com/gistrec) fixed an MSVC warning.
-- [Rainer](https://github.com/rvjr) proposed an improvement in the floating-point serialization in CBOR.
-- [Francois Chabot](https://github.com/FrancoisChabot) made performance improvements in the input adapters.
-- [Arthur Sonzogni](https://github.com/ArthurSonzogni) documented how the library can be included via `FetchContent`.
-- [Rimas Misevi�ius](https://github.com/rmisev) fixed an error message.
-- [Alexander Myasnikov](https://github.com/alexandermyasnikov) fixed some examples and a link in the README.
-- [Hubert Chathi](https://github.com/uhoreg) made CMake's version config file architecture-independent.
-- [OmnipotentEntity](https://github.com/OmnipotentEntity) implemented the binary values for CBOR, MessagePack, BSON, and UBJSON.
-- [ArtemSarmini](https://github.com/ArtemSarmini) fixed a compilation issue with GCC 10 and fixed a leak.
-- [Evgenii Sopov](https://github.com/sea-kg) integrated the library to the wsjcpp package manager.
-- [Sergey Linev](https://github.com/linev) fixed a compiler warning.
-- [Miguel Magalhães](https://github.com/magamig) fixed the year in the copyright.
-- [Gareth Sylvester-Bradley](https://github.com/garethsb-sony) fixed a compilation issue with MSVC.
-- [Alexander “weej� Jones](https://github.com/alex-weej) fixed an example in the README.
-- [Antoine CÅ“ur](https://github.com/Coeur) fixed some typos in the documentation.
-- [jothepro](https://github.com/jothepro) updated links to the Hunter package.
-- [Dave Lee](https://github.com/kastiglione) fixed link in the README.
-- [Joël Lamotte](https://github.com/Klaim) added instruction for using Build2's package manager.
-- [Paul Jurczak](https://github.com/pauljurczak) fixed an example in the README.
-- [Sonu Lohani](https://github.com/sonulohani) fixed a warning.
-- [Carlos Gomes Martinho](https://github.com/gocarlos) updated the Conan package source.
-- [Konstantin Podsvirov](https://github.com/podsvirov) fixed the MSYS2 package documentation.
-- [Tridacnid](https://github.com/Tridacnid) improved the CMake tests.
-- [Michael](https://github.com/MBalszun) fixed MSVC warnings.
-- [Quentin Barbarat](https://github.com/quentin-dev) fixed an example in the documentation.
-- [XyFreak](https://github.com/XyFreak) fixed a compiler warning.
-- [TotalCaesar659](https://github.com/TotalCaesar659) fixed links in the README.
-- [Tanuj Garg](https://github.com/tanuj208) improved the fuzzer coverage for UBSAN input.
-- [AODQ](https://github.com/AODQ) fixed a compiler warning.
-- [jwittbrodt](https://github.com/jwittbrodt) made `NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE` inline.
-- [pfeatherstone](https://github.com/pfeatherstone) improved the upper bound of arguments of the `NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE`/`NLOHMANN_DEFINE_TYPE_INTRUSIVE` macros.
-- [Jan Procházka](https://github.com/jprochazk) fixed a bug in the CBOR parser for binary and string values.
-- [T0b1-iOS](https://github.com/T0b1-iOS) fixed a bug in the new hash implementation.
-- [Matthew Bauer](https://github.com/matthewbauer) adjusted the CBOR writer to create tags for binary subtypes.
-- [gatopeich](https://github.com/gatopeich) implemented an ordered map container for `nlohmann::ordered_json`.
-- [Érico Nogueira Rolim](https://github.com/ericonr) added support for pkg-config.
-- [KonanM](https://github.com/KonanM) proposed an implementation for the `NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE`/`NLOHMANN_DEFINE_TYPE_INTRUSIVE` macros.
-- [Guillaume Racicot](https://github.com/gracicot) implemented `string_view` support and allowed C++20 support.
-- [Alex Reinking](https://github.com/alexreinking) improved CMake support for `FetchContent`.
-- [Hannes Domani](https://github.com/ssbssa) provided a GDB pretty printer.
+<img src="https://raw.githubusercontent.com/nlohmann/json/develop/docs/avatars.png" align="right">
+
+1. [Teemperor](https://github.com/Teemperor) implemented CMake support and lcov integration, realized escape and Unicode handling in the string parser, and fixed the JSON serialization.
+2. [elliotgoodrich](https://github.com/elliotgoodrich) fixed an issue with double deletion in the iterator classes.
+3. [kirkshoop](https://github.com/kirkshoop) made the iterators of the class composable to other libraries.
+4. [wancw](https://github.com/wanwc) fixed a bug that hindered the class to compile with Clang.
+5. Tomas Ã…blad found a bug in the iterator implementation.
+6. [Joshua C. Randall](https://github.com/jrandall) fixed a bug in the floating-point serialization.
+7. [Aaron Burghardt](https://github.com/aburgh) implemented code to parse streams incrementally. Furthermore, he greatly improved the parser class by allowing the definition of a filter function to discard undesired elements while parsing.
+8. [Daniel Kope�ek](https://github.com/dkopecek) fixed a bug in the compilation with GCC 5.0.
+9. [Florian Weber](https://github.com/Florianjw) fixed a bug in and improved the performance of the comparison operators.
+10. [Eric Cornelius](https://github.com/EricMCornelius) pointed out a bug in the handling with NaN and infinity values. He also improved the performance of the string escaping.
+11. [易�龙](https://github.com/likebeta) implemented a conversion from anonymous enums.
+12. [kepkin](https://github.com/kepkin) patiently pushed forward the support for Microsoft Visual studio.
+13. [gregmarr](https://github.com/gregmarr) simplified the implementation of reverse iterators and helped with numerous hints and improvements. In particular, he pushed forward the implementation of user-defined types.
+14. [Caio Luppi](https://github.com/caiovlp) fixed a bug in the Unicode handling.
+15. [dariomt](https://github.com/dariomt) fixed some typos in the examples.
+16. [Daniel Frey](https://github.com/d-frey) cleaned up some pointers and implemented exception-safe memory allocation.
+17. [Colin Hirsch](https://github.com/ColinH) took care of a small namespace issue.
+18. [Huu Nguyen](https://github.com/whoshuu) correct a variable name in the documentation.
+19. [Silverweed](https://github.com/silverweed) overloaded `parse()` to accept an rvalue reference.
+20. [dariomt](https://github.com/dariomt) fixed a subtlety in MSVC type support and implemented the `get_ref()` function to get a reference to stored values.
+21. [ZahlGraf](https://github.com/ZahlGraf) added a workaround that allows compilation using Android NDK.
+22. [whackashoe](https://github.com/whackashoe) replaced a function that was marked as unsafe by Visual Studio.
+23. [406345](https://github.com/406345) fixed two small warnings.
+24. [Glen Fernandes](https://github.com/glenfe) noted a potential portability problem in the `has_mapped_type` function.
+25. [Corbin Hughes](https://github.com/nibroc) fixed some typos in the contribution guidelines.
+26. [twelsby](https://github.com/twelsby) fixed the array subscript operator, an issue that failed the MSVC build, and floating-point parsing/dumping. He further added support for unsigned integer numbers and implemented better roundtrip support for parsed numbers.
+27. [Volker Diels-Grabsch](https://github.com/vog) fixed a link in the README file.
+28. [msm-](https://github.com/msm-) added support for American Fuzzy Lop.
+29. [Annihil](https://github.com/Annihil) fixed an example in the README file.
+30. [Themercee](https://github.com/Themercee) noted a wrong URL in the README file.
+31. [Lv Zheng](https://github.com/lv-zheng) fixed a namespace issue with `int64_t` and `uint64_t`.
+32. [abc100m](https://github.com/abc100m) analyzed the issues with GCC 4.8 and proposed a [partial solution](https://github.com/nlohmann/json/pull/212).
+33. [zewt](https://github.com/zewt) added useful notes to the README file about Android.
+34. [Róbert Márki](https://github.com/robertmrk) added a fix to use move iterators and improved the integration via CMake.
+35. [Chris Kitching](https://github.com/ChrisKitching) cleaned up the CMake files.
+36. [Tom Needham](https://github.com/06needhamt) fixed a subtle bug with MSVC 2015 which was also proposed by [Michael K.](https://github.com/Epidal).
+37. [Mário Feroldi](https://github.com/thelostt) fixed a small typo.
+38. [duncanwerner](https://github.com/duncanwerner) found a really embarrassing performance regression in the 2.0.0 release.
+39. [Damien](https://github.com/dtoma) fixed one of the last conversion warnings.
+40. [Thomas Braun](https://github.com/t-b) fixed a warning in a test case and adjusted MSVC calls in the CI.
+41. [Théo DELRIEU](https://github.com/theodelrieu) patiently and constructively oversaw the long way toward [iterator-range parsing](https://github.com/nlohmann/json/issues/290). He also implemented the magic behind the serialization/deserialization of user-defined types and split the single header file into smaller chunks.
+42. [Stefan](https://github.com/5tefan) fixed a minor issue in the documentation.
+43. [Vasil Dimov](https://github.com/vasild) fixed the documentation regarding conversions from `std::multiset`.
+44. [ChristophJud](https://github.com/ChristophJud) overworked the CMake files to ease project inclusion.
+45. [Vladimir Petrigo](https://github.com/vpetrigo) made a SFINAE hack more readable and added Visual Studio 17 to the build matrix.
+46. [Denis Andrejew](https://github.com/seeekr) fixed a grammar issue in the README file.
+47. [Pierre-Antoine Lacaze](https://github.com/palacaze) found a subtle bug in the `dump()` function.
+48. [TurpentineDistillery](https://github.com/TurpentineDistillery) pointed to [`std::locale::classic()`](https://en.cppreference.com/w/cpp/locale/locale/classic) to avoid too much locale joggling, found some nice performance improvements in the parser, improved the benchmarking code, and realized locale-independent number parsing and printing.
+49. [cgzones](https://github.com/cgzones) had an idea how to fix the Coverity scan.
+50. [Jared Grubb](https://github.com/jaredgrubb) silenced a nasty documentation warning.
+51. [Yixin Zhang](https://github.com/qwename) fixed an integer overflow check.
+52. [Bosswestfalen](https://github.com/Bosswestfalen) merged two iterator classes into a smaller one.
+53. [Daniel599](https://github.com/Daniel599) helped to get Travis execute the tests with Clang's sanitizers.
+54. [Jonathan Lee](https://github.com/vjon) fixed an example in the README file.
+55. [gnzlbg](https://github.com/gnzlbg) supported the implementation of user-defined types.
+56. [Alexej Harm](https://github.com/qis) helped to get the user-defined types working with Visual Studio.
+57. [Jared Grubb](https://github.com/jaredgrubb) supported the implementation of user-defined types.
+58. [EnricoBilla](https://github.com/EnricoBilla) noted a typo in an example.
+59. [Martin Hořeňovský](https://github.com/horenmar) found a way for a 2x speedup for the compilation time of the test suite.
+60. [ukhegg](https://github.com/ukhegg) found proposed an improvement for the examples section.
+61. [rswanson-ihi](https://github.com/rswanson-ihi) noted a typo in the README.
+62. [Mihai Stan](https://github.com/stanmihai4) fixed a bug in the comparison with `nullptr`s.
+63. [Tushar Maheshwari](https://github.com/tusharpm) added [cotire](https://github.com/sakra/cotire) support to speed up the compilation.
+64. [TedLyngmo](https://github.com/TedLyngmo) noted a typo in the README, removed unnecessary bit arithmetic, and fixed some `-Weffc++` warnings.
+65. [Krzysztof WoÅ›](https://github.com/krzysztofwos) made exceptions more visible.
+66. [ftillier](https://github.com/ftillier) fixed a compiler warning.
+67. [tinloaf](https://github.com/tinloaf) made sure all pushed warnings are properly popped.
+68. [Fytch](https://github.com/Fytch) found a bug in the documentation.
+69. [Jay Sistar](https://github.com/Type1J) implemented a Meson build description.
+70. [Henry Lee](https://github.com/HenryRLee) fixed a warning in ICC and improved the iterator implementation.
+71. [Vincent Thiery](https://github.com/vthiery) maintains a package for the Conan package manager.
+72. [Steffen](https://github.com/koemeet) fixed a potential issue with MSVC and `std::min`.
+73. [Mike Tzou](https://github.com/Chocobo1) fixed some typos.
+74. [amrcode](https://github.com/amrcode) noted a misleading documentation about comparison of floats.
+75. [Oleg Endo](https://github.com/olegendo) reduced the memory consumption by replacing `<iostream>` with `<iosfwd>`.
+76. [dan-42](https://github.com/dan-42) cleaned up the CMake files to simplify including/reusing of the library.
+77. [Nikita Ofitserov](https://github.com/himikof) allowed for moving values from initializer lists.
+78. [Greg Hurrell](https://github.com/wincent) fixed a typo.
+79. [Dmitry Kukovinets](https://github.com/DmitryKuk) fixed a typo.
+80. [kbthomp1](https://github.com/kbthomp1) fixed an issue related to the Intel OSX compiler.
+81. [Markus Werle](https://github.com/daixtrose) fixed a typo.
+82. [WebProdPP](https://github.com/WebProdPP) fixed a subtle error in a precondition check.
+83. [Alex](https://github.com/leha-bot) noted an error in a code sample.
+84. [Tom de Geus](https://github.com/tdegeus) reported some warnings with ICC and helped to fix them.
+85. [Perry Kundert](https://github.com/pjkundert) simplified reading from input streams.
+86. [Sonu Lohani](https://github.com/sonulohani) fixed a small compilation error.
+87. [Jamie Seward](https://github.com/jseward) fixed all MSVC warnings.
+88. [Nate Vargas](https://github.com/eld00d) added a Doxygen tag file.
+89. [pvleuven](https://github.com/pvleuven) helped to fix a warning in ICC.
+90. [Pavel](https://github.com/crea7or) helped to fix some warnings in MSVC.
+91. [Jamie Seward](https://github.com/jseward) avoided unnecessary string copies in `find()` and `count()`.
+92. [Mitja](https://github.com/Itja) fixed some typos.
+93. [Jorrit Wronski](https://github.com/jowr) updated the Hunter package links.
+94. [Matthias Möller](https://github.com/TinyTinni) added a `.natvis` for the MSVC debug view.
+95. [bogemic](https://github.com/bogemic) fixed some C++17 deprecation warnings.
+96. [Eren Okka](https://github.com/erengy) fixed some MSVC warnings.
+97. [abolz](https://github.com/abolz) integrated the Grisu2 algorithm for proper floating-point formatting, allowing more roundtrip checks to succeed.
+98. [Vadim Evard](https://github.com/Pipeliner) fixed a Markdown issue in the README.
+99. [zerodefect](https://github.com/zerodefect) fixed a compiler warning.
+100. [Kert](https://github.com/kaidokert) allowed to template the string type in the serialization and added the possibility to override the exceptional behavior.
+101. [mark-99](https://github.com/mark-99) helped fixing an ICC error.
+102. [Patrik Huber](https://github.com/patrikhuber) fixed links in the README file.
+103. [johnfb](https://github.com/johnfb) found a bug in the implementation of CBOR's indefinite length strings.
+104. [Paul Fultz II](https://github.com/pfultz2) added a note on the cget package manager.
+105. [Wilson Lin](https://github.com/wla80) made the integration section of the README more concise.
+106. [RalfBielig](https://github.com/ralfbielig) detected and fixed a memory leak in the parser callback.
+107. [agrianius](https://github.com/agrianius) allowed to dump JSON to an alternative string type.
+108. [Kevin Tonon](https://github.com/ktonon) overworked the C++11 compiler checks in CMake.
+109. [Axel Huebl](https://github.com/ax3l) simplified a CMake check and added support for the [Spack package manager](https://spack.io).
+110. [Carlos O'Ryan](https://github.com/coryan) fixed a typo.
+111. [James Upjohn](https://github.com/jammehcow) fixed a version number in the compilers section.
+112. [Chuck Atkins](https://github.com/chuckatkins) adjusted the CMake files to the CMake packaging guidelines and provided documentation for the CMake integration.
+113. [Jan Schöppach](https://github.com/dns13) fixed a typo.
+114. [martin-mfg](https://github.com/martin-mfg) fixed a typo.
+115. [Matthias Möller](https://github.com/TinyTinni) removed the dependency from `std::stringstream`.
+116. [agrianius](https://github.com/agrianius) added code to use alternative string implementations.
+117. [Daniel599](https://github.com/Daniel599) allowed to use more algorithms with the `items()` function.
+118. [Julius Rakow](https://github.com/jrakow) fixed the Meson include directory and fixed the links to [cppreference.com](cppreference.com).
+119. [Sonu Lohani](https://github.com/sonulohani) fixed the compilation with MSVC 2015 in debug mode.
+120. [grembo](https://github.com/grembo) fixed the test suite and re-enabled several test cases.
+121. [Hyeon Kim](https://github.com/simnalamburt) introduced the macro `JSON_INTERNAL_CATCH` to control the exception handling inside the library.
+122. [thyu](https://github.com/thyu) fixed a compiler warning.
+123. [David Guthrie](https://github.com/LEgregius) fixed a subtle compilation error with Clang 3.4.2.
+124. [Dennis Fischer](https://github.com/dennisfischer) allowed to call `find_package` without installing the library.
+125. [Hyeon Kim](https://github.com/simnalamburt) fixed an issue with a double macro definition.
+126. [Ben Berman](https://github.com/rivertam) made some error messages more understandable.
+127. [zakalibit](https://github.com/zakalibit) fixed a compilation problem with the Intel C++ compiler.
+128. [mandreyel](https://github.com/mandreyel) fixed a compilation problem.
+129. [Kostiantyn Ponomarenko](https://github.com/koponomarenko) added version and license information to the Meson build file.
+130. [Henry Schreiner](https://github.com/henryiii) added support for GCC 4.8.
+131. [knilch](https://github.com/knilch0r) made sure the test suite does not stall when run in the wrong directory.
+132. [Antonio Borondo](https://github.com/antonioborondo) fixed an MSVC 2017 warning.
+133. [Dan Gendreau](https://github.com/dgendreau) implemented the `NLOHMANN_JSON_SERIALIZE_ENUM` macro to quickly define an enum/JSON mapping.
+134. [efp](https://github.com/efp) added line and column information to parse errors.
+135. [julian-becker](https://github.com/julian-becker) added BSON support.
+136. [Pratik Chowdhury](https://github.com/pratikpc) added support for structured bindings.
+137. [David Avedissian](https://github.com/davedissian) added support for Clang 5.0.1 (PS4 version).
+138. [Jonathan Dumaresq](https://github.com/dumarjo) implemented an input adapter to read from `FILE*`.
+139. [kjpus](https://github.com/kjpus) fixed a link in the documentation.
+140. [Manvendra Singh](https://github.com/manu-chroma) fixed a typo in the documentation.
+141. [ziggurat29](https://github.com/ziggurat29) fixed an MSVC warning.
+142. [Sylvain Corlay](https://github.com/SylvainCorlay) added code to avoid an issue with MSVC.
+143. [mefyl](https://github.com/mefyl) fixed a bug when JSON was parsed from an input stream.
+144. [Millian Poquet](https://github.com/mpoquet) allowed to install the library via Meson.
+145. [Michael Behrns-Miller](https://github.com/moodboom) found an issue with a missing namespace.
+146. [Nasztanovics Ferenc](https://github.com/naszta) fixed a compilation issue with libc 2.12.
+147. [Andreas Schwab](https://github.com/andreas-schwab) fixed the endian conversion.
+148. [Mark-Dunning](https://github.com/Mark-Dunning) fixed a warning in MSVC.
+149. [Gareth Sylvester-Bradley](https://github.com/garethsb-sony) added `operator/` for JSON Pointers.
+150. [John-Mark](https://github.com/johnmarkwayve) noted a missing header.
+151. [Vitaly Zaitsev](https://github.com/xvitaly) fixed compilation with GCC 9.0.
+152. [Laurent Stacul](https://github.com/stac47) fixed compilation with GCC 9.0.
+153. [Ivor Wanders](https://github.com/iwanders) helped to reduce the CMake requirement to version 3.1.
+154. [njlr](https://github.com/njlr) updated the Buckaroo instructions.
+155. [Lion](https://github.com/lieff) fixed a compilation issue with GCC 7 on CentOS.
+156. [Isaac Nickaein](https://github.com/nickaein) improved the integer serialization performance and  implemented the `contains()` function.
+157. [past-due](https://github.com/past-due) suppressed an unfixable warning.
+158. [Elvis Oric](https://github.com/elvisoric) improved Meson support.
+159. [Matěj Plch](https://github.com/Afforix) fixed an example in the README.
+160. [Mark Beckwith](https://github.com/wythe) fixed a typo.
+161. [scinart](https://github.com/scinart) fixed bug in the serializer.
+162. [Patrick Boettcher](https://github.com/pboettch) implemented `push_back()` and `pop_back()` for JSON Pointers.
+163. [Bruno Oliveira](https://github.com/nicoddemus) added support for Conda.
+164. [Michele Caini](https://github.com/skypjack) fixed links in the README.
+165. [Hani](https://github.com/hnkb) documented how to install the library with NuGet.
+166. [Mark Beckwith](https://github.com/wythe) fixed a typo.
+167. [yann-morin-1998](https://github.com/yann-morin-1998) helped to reduce the CMake requirement to version 3.1.
+168. [Konstantin Podsvirov](https://github.com/podsvirov) maintains a package for the MSYS2 software distro.
+169. [remyabel](https://github.com/remyabel) added GNUInstallDirs to the CMake files.
+170. [Taylor Howard](https://github.com/taylorhoward92) fixed a unit test.
+171. [Gabe Ron](https://github.com/Macr0Nerd) implemented the `to_string` method.
+172. [Watal M. Iwasaki](https://github.com/heavywatal) fixed a Clang warning.
+173. [Viktor Kirilov](https://github.com/onqtam) switched the unit tests from [Catch](https://github.com/philsquared/Catch) to [doctest](https://github.com/onqtam/doctest)
+174. [Juncheng E](https://github.com/ejcjason) fixed a typo.
+175. [tete17](https://github.com/tete17) fixed a bug in the `contains` function.
+176. [Xav83](https://github.com/Xav83) fixed some cppcheck warnings.
+177. [0xflotus](https://github.com/0xflotus) fixed some typos.
+178. [Christian Deneke](https://github.com/chris0x44) added a const version of `json_pointer::back`.
+179. [Julien Hamaide](https://github.com/crazyjul) made the `items()` function work with custom string types.
+180. [Evan Nemerson](https://github.com/nemequ) updated fixed a bug in Hedley and updated this library accordingly.
+181. [Florian Pigorsch](https://github.com/flopp) fixed a lot of typos.
+182. [Camille Bégué](https://github.com/cbegue) fixed an issue in the conversion from  `std::pair` and `std::tuple` to `json`.
+183. [Anthony VH](https://github.com/AnthonyVH) fixed a compile error in an enum deserialization.
+184. [Yuriy Vountesmery](https://github.com/ua-code-dragon) noted a subtle bug in a preprocessor check.
+185. [Chen](https://github.com/dota17) fixed numerous issues in the library.
+186. [Antony Kellermann](https://github.com/aokellermann) added a CI step for GCC 10.1.
+187. [Alex](https://github.com/gistrec) fixed an MSVC warning.
+188. [Rainer](https://github.com/rvjr) proposed an improvement in the floating-point serialization in CBOR.
+189. [Francois Chabot](https://github.com/FrancoisChabot) made performance improvements in the input adapters.
+190. [Arthur Sonzogni](https://github.com/ArthurSonzogni) documented how the library can be included via `FetchContent`.
+191. [Rimas Misevi�ius](https://github.com/rmisev) fixed an error message.
+192. [Alexander Myasnikov](https://github.com/alexandermyasnikov) fixed some examples and a link in the README.
+193. [Hubert Chathi](https://github.com/uhoreg) made CMake's version config file architecture-independent.
+194. [OmnipotentEntity](https://github.com/OmnipotentEntity) implemented the binary values for CBOR, MessagePack, BSON, and UBJSON.
+195. [ArtemSarmini](https://github.com/ArtemSarmini) fixed a compilation issue with GCC 10 and fixed a leak.
+196. [Evgenii Sopov](https://github.com/sea-kg) integrated the library to the wsjcpp package manager.
+197. [Sergey Linev](https://github.com/linev) fixed a compiler warning.
+198. [Miguel Magalhães](https://github.com/magamig) fixed the year in the copyright.
+199. [Gareth Sylvester-Bradley](https://github.com/garethsb-sony) fixed a compilation issue with MSVC.
+200. [Alexander “weej� Jones](https://github.com/alex-weej) fixed an example in the README.
+201. [Antoine CÅ“ur](https://github.com/Coeur) fixed some typos in the documentation.
+202. [jothepro](https://github.com/jothepro) updated links to the Hunter package.
+203. [Dave Lee](https://github.com/kastiglione) fixed link in the README.
+204. [Joël Lamotte](https://github.com/Klaim) added instruction for using Build2's package manager.
+205. [Paul Jurczak](https://github.com/pauljurczak) fixed an example in the README.
+206. [Sonu Lohani](https://github.com/sonulohani) fixed a warning.
+207. [Carlos Gomes Martinho](https://github.com/gocarlos) updated the Conan package source.
+208. [Konstantin Podsvirov](https://github.com/podsvirov) fixed the MSYS2 package documentation.
+209. [Tridacnid](https://github.com/Tridacnid) improved the CMake tests.
+210. [Michael](https://github.com/MBalszun) fixed MSVC warnings.
+211. [Quentin Barbarat](https://github.com/quentin-dev) fixed an example in the documentation.
+212. [XyFreak](https://github.com/XyFreak) fixed a compiler warning.
+213. [TotalCaesar659](https://github.com/TotalCaesar659) fixed links in the README.
+214. [Tanuj Garg](https://github.com/tanuj208) improved the fuzzer coverage for UBSAN input.
+215. [AODQ](https://github.com/AODQ) fixed a compiler warning.
+216. [jwittbrodt](https://github.com/jwittbrodt) made `NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE` inline.
+217. [pfeatherstone](https://github.com/pfeatherstone) improved the upper bound of arguments of the `NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE`/`NLOHMANN_DEFINE_TYPE_INTRUSIVE` macros.
+218. [Jan Procházka](https://github.com/jprochazk) fixed a bug in the CBOR parser for binary and string values.
+219. [T0b1-iOS](https://github.com/T0b1-iOS) fixed a bug in the new hash implementation.
+220. [Matthew Bauer](https://github.com/matthewbauer) adjusted the CBOR writer to create tags for binary subtypes.
+221. [gatopeich](https://github.com/gatopeich) implemented an ordered map container for `nlohmann::ordered_json`.
+222. [Érico Nogueira Rolim](https://github.com/ericonr) added support for pkg-config.
+223. [KonanM](https://github.com/KonanM) proposed an implementation for the `NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE`/`NLOHMANN_DEFINE_TYPE_INTRUSIVE` macros.
+224. [Guillaume Racicot](https://github.com/gracicot) implemented `string_view` support and allowed C++20 support.
+225. [Alex Reinking](https://github.com/alexreinking) improved CMake support for `FetchContent`.
+226. [Hannes Domani](https://github.com/ssbssa) provided a GDB pretty printer.
+227. Lars Wirzenius reviewed the README file.
+228. [Jun Jie](https://github.com/ongjunjie) fixed a compiler path in the CMake scripts.
+229. [Ronak Buch](https://github.com/rbuch) fixed typos in the documentation.
+230. [Alexander Karzhenkov](https://github.com/karzhenkov) fixed a move constructor and the Travis builds.
+231. [Leonardo Lima](https://github.com/leozz37) added CPM.Cmake support.
+232. [Joseph Blackman](https://github.com/jbzdarkid) fixed a warning.
+233. [Yaroslav](https://github.com/YarikTH) updated doctest and implemented unit tests.
+234. [Martin Stump](https://github.com/globberwops) fixed a bug in the CMake files.
+235. [Jaakko Moisio](https://github.com/jasujm) fixed a bug in the input adapters.
+236. [bl-ue](https://github.com/bl-ue) fixed some Markdown issues in the README file.
+237. [William A. Wieselquist](https://github.com/wawiesel) fixed an example from the README.
+238. [abbaswasim](https://github.com/abbaswasim) fixed an example from the README.
+239. [Remy Jette](https://github.com/remyjette) fixed a warning.
+240. [Fraser](https://github.com/frasermarlow) fixed the documentation.
+241. [Ben Beasley](https://github.com/musicinmybrain) updated doctest.
+242. [Doron Behar](https://github.com/doronbehar) fixed pkg-config.pc.
+243. [raduteo](https://github.com/raduteo) fixed a warning.
+244. [David Pfahler](https://github.com/theShmoo) added the possibility to compile the library without I/O support.
+245. [Morten Fyhn Amundsen](https://github.com/mortenfyhn) fixed a typo.
+246. [jpl-mac](https://github.com/jpl-mac) allowed to treat the library as a system header in CMake.
+247. [Jason Dsouza](https://github.com/jasmcaus) fixed the indentation of the CMake file.
+248. [offa](https://github.com/offa) added a link to Conan Center to the documentation.
+249. [TotalCaesar659](https://github.com/TotalCaesar659) updated the links in the documentation to use HTTPS.
+250. [Rafail Giavrimis](https://github.com/grafail) fixed the Google Benchmark default branch.
+251. [Louis Dionne](https://github.com/ldionne) fixed a conversion operator.
+252. [justanotheranonymoususer](https://github.com/justanotheranonymoususer) made the examples in the README more consistent.
+253. [Finkman](https://github.com/Finkman) suppressed some `-Wfloat-equal` warnings.
+254. [Ferry Huberts](https://github.com/fhuberts) fixed `-Wswitch-enum` warnings.
+255. [Arseniy Terekhin](https://github.com/senyai) made the GDB pretty-printer robust against unset variable names.
+256. [Amir Masoud Abdol](https://github.com/amirmasoudabdol) updated the Homebrew command as nlohmann/json is now in homebrew-core.
+257. [Hallot](https://github.com/Hallot) fixed some `-Wextra-semi-stmt warnings`.
+258. [Giovanni Cerretani](https://github.com/gcerretani) fixed `-Wunused` warnings on `JSON_DIAGNOSTICS`.
+259. [Bogdan Popescu](https://github.com/Kapeli) hosts the [docset](https://github.com/Kapeli/Dash-User-Contributions/tree/master/docsets/JSON_for_Modern_C%2B%2B) for offline documentation viewers.
+260. [Carl Smedstad](https://github.com/carlsmedstad) fixed an assertion error when using `JSON_DIAGNOSTICS`.
+261. [miikka75](https://github.com/miikka75) provided an important fix to compile C++17 code with Clang 9.
+262. [Maarten Becker](https://github.com/kernie) fixed a warning for shadowed variables.
+263. [Cristi Vîjdea](https://github.com/axnsan12) fixed typos in the `operator[]` documentation.
+264. [Alex Beregszaszi](https://github.com/axic) fixed spelling mistakes in comments.
+265. [Dirk Stolle](https://github.com/striezel) fixed typos in documentation.
+266. [Daniel Albuschat](https://github.com/daniel-kun) corrected the parameter name in the `parse` documentation.
+267. [Prince Mendiratta](https://github.com/Prince-Mendiratta) fixed a link to the FAQ.
+268. [Florian Albrechtskirchinger](https://github.com/falbrechtskirchinger) implemented `std::string_view` support for object keys and made dozens of other improvements.
+269. [Qianqian Fang](https://github.com/fangq) implemented the Binary JData (BJData) format.
+270. [pketelsen](https://github.com/pketelsen) added macros `NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT` and `NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT`.
+271. [DarkZeros](https://github.com/DarkZeros) adjusted to code to not clash with Arduino defines.
+272. [flagarde](https://github.com/flagarde) fixed the output of `meta()` for MSVC.
+273. [Giovanni Cerretani](https://github.com/gcerretani) fixed a check for `std::filesystem`.
+274. [Dimitris Apostolou](https://github.com/rex4539) fixed a typo.
+275. [Ferry Huberts](https://github.com/fhuberts) fixed a typo.
+276. [Michael Nosthoff](https://github.com/heinemml) fixed a typo.
+277. [JungHoon Lee](https://github.com/jhnlee) fixed a typo.
+278. [Faruk D.](https://github.com/fdiblen) fixed the CITATION.CFF file.
+279. [Andrea Cocito](https://github.com/puffetto) added a clarification on macro usage to the documentation.
+280. [Krzysiek Karbowiak](https://github.com/kkarbowiak) refactored the tests to use `CHECK_THROWS_WITH_AS`.
+281. [Chaoqi Zhang](https://github.com/prncoprs) fixed a typo.
+282. [ivanovmp](https://github.com/ivanovmp) fixed a whitespace error.
+283. [KsaNL](https://github.com/KsaNL) fixed a build error when including `<windows.h>`.
+284. [Andrea Pappacoda](https://github.com/Tachi107) moved `.pc` and `.cmake` files to `share` directory.
+285. [Wolf Vollprecht](https://github.com/wolfv) added the `patch_inplace` function.
+286. [Jake Zimmerman](https://github.com/jez) highlighted common usage patterns in the README file.
+287. [NN](https://github.com/NN---) added the Visual Studio output directory to `.gitignore`.
+288. [Romain Reignier](https://github.com/romainreignier) improved the performance the vector output adapter.
+289. [Mike](https://github.com/Mike-Leo-Smith) fixed the `std::iterator_traits`.
+290. [Richard Hozák](https://github.com/zxey) added macro `JSON_NO_ENUM` to disable default enum conversions.
+291. [vakokako](https://github.com/vakokako) fixed tests when compiling with C++20.
+292. [Alexander “weej� Jones](https://github.com/alexweej) fixed an example in the README.
+293. [Eli Schwartz](https://github.com/eli-schwartz) added more files to the `include.zip` archive.
+294. [Kevin Lu](https://github.com/kevinlul) fixed a compilation issue when typedefs with certain names were present.
+295. [Trevor Hickey](https://github.com/luxe) improved the description of an example.
+296. [Jef LeCompte](https://github.com/jef) updated the year in the README file.
+297. [Alexandre Hamez](https://github.com/ahamez) fixed a warning.
+298. [Maninderpal Badhan](https://github.com/mbadhan) fixed a typo.
+299. [kevin--](https://github.com/kevin--) added a note to an example in the README file.
+300. [I](https://github.com/wx257osn2) fixed a typo.
+301. [Gregorio Litenstein](https://github.com/Lord-Kamina) fixed the Clang detection.
+302. [Andreas Smas](https://github.com/andoma) added a Doozer badge.
+303. [WanCW](https://github.com/wancw) fixed the string conversion with Clang.
+304. [zhaohuaxishi](https://github.com/zhaohuaxishi) fixed a Doxygen error.
+305. [emvivre](https://github.com/emvivre) removed an invalid parameter from CMake.
+306. [Tobias Hermann](https://github.com/Dobiasd) fixed a link in the README file.
+307. [Michael](https://github.com/traits) fixed a warning.
+308. [Ryan Mulder](https://github.com/ryanjmulder) added `ensure_ascii` to the `dump` function.
+309. [Muri Nicanor](https://github.com/murinicanor) fixed the `sed` discovery in the Makefile.
+310. [David Avedissian](https://github.com/dgavedissian) implemented SFINAE-friendly `iterator_traits`.
+311. [AQNOUCH Mohammed](https://github.com/aqnouch) fixed a typo in the README.
+312. [Gareth Sylvester-Bradley](https://github.com/garethsb) added `operator/=` and `operator/` to construct JSON pointers.
+313. [Michael Macnair](https://github.com/mykter) added support for afl-fuzz testing.
+314. [Berkus Decker](https://github.com/berkus) fixed a typo in the README.
+315. [Illia Polishchuk](https://github.com/effolkronium) improved the CMake testing.
+316. [Ikko Ashimine](https://github.com/eltociear) fixed a typo.
+317. [Raphael Grimm](https://github.com/barcode) added the possibility to define a custom base class.
+318. [tocic](https://github.com/tocic) fixed typos in the documentation.
+319. [Vertexwahn](https://github.com/Vertexwahn) added Bazel build support.
+320. [Dirk Stolle](https://github.com/striezel) fixed typos in the documentation.
+321. [DavidKorczynski](https://github.com/DavidKorczynski) added a CIFuzz CI GitHub action.
+322. [Finkman](https://github.com/Finkman) fixed the debug pretty-printer.
+323. [Florian Segginger](https://github.com/floriansegginger) bumped the years in the README.
+324. [haadfida](https://github.com/haadfida) cleaned up the badges of used services.
+325. [Arsen Arsenović](https://github.com/ArsenArsen) fixed a build error.
+326. [theevilone45](https://github.com/theevilone45) fixed a typo in a CMake file.
+327. [Sergei Trofimovich](https://github.com/trofi) fixed the custom allocator support.
+328. [Joyce](https://github.com/joycebrum) fixed some security issues in the GitHub workflows.
+329. [Nicolas Jakob](https://github.com/njakob) add vcpkg version badge.
+330. [Tomerkm](https://github.com/Tomerkm) added tests.
+331. [No.](https://github.com/tusooa) fixed the use of `get<>` calls.
+332. [taro](https://github.com/tarolling) fixed a typo in the `CODEOWNERS` file.
+333. [Ikko Eltociear Ashimine](https://github.com/eltociear) fixed a typo.
+334. [Felix Yan](https://github.com/felixonmars) fixed a typo in the README.
+335. [HO-COOH](https://github.com/HO-COOH) fixed a parentheses in the documentation.
+336. [Ivor Wanders](https://github.com/iwanders) fixed the examples to catch exception by `const&`.
+337. [miny1233](https://github.com/miny1233) fixed a parentheses in the documentation.
+338. [tomalakgeretkal](https://github.com/tomalakgeretkal) fixed a compilation error.
+339. [alferov](https://github.com/ALF-ONE) fixed a compilation error.
+340. [Craig Scott](https://github.com/craigscott-crascit) fixed a deprecation warning in CMake.
+341. [Vyacheslav Zhdanovskiy](https://github.com/ZeronSix) added macros for serialization-only types.
+342. [Mathieu Westphal](https://github.com/mwestphal) fixed typos.
+343. [scribam](https://github.com/scribam) fixed the MinGW workflow.
+344. [Aleksei Sapitskii](https://github.com/aleksproger) added support for Apple's Swift Package Manager.
+345. [Benjamin Buch](https://github.com/bebuch) fixed the installation path in CMake.
+346. [Colby Haskell](https://github.com/colbychaskell) clarified the parse error message in case a file cannot be opened.
 
 Thanks a lot for helping out! Please [let me know](mailto:mail@nlohmann.me) if I forgot someone.
 
@@ -1541,32 +1775,29 @@ The library itself consists of a single header file licensed under the MIT licen
 - [**American fuzzy lop**](https://lcamtuf.coredump.cx/afl/) for fuzz testing
 - [**AppVeyor**](https://www.appveyor.com) for [continuous integration](https://ci.appveyor.com/project/nlohmann/json) on Windows
 - [**Artistic Style**](http://astyle.sourceforge.net) for automatic source code indentation
-- [**CircleCI**](https://circleci.com) for [continuous integration](https://circleci.com/gh/nlohmann/json).
 - [**Clang**](https://clang.llvm.org) for compilation with code sanitizers
 - [**CMake**](https://cmake.org) for build automation
-- [**Codacity**](https://www.codacy.com) for further [code analysis](https://www.codacy.com/app/nlohmann/json)
+- [**Codacy**](https://www.codacy.com) for further [code analysis](https://www.codacy.com/app/nlohmann/json)
 - [**Coveralls**](https://coveralls.io) to measure [code coverage](https://coveralls.io/github/nlohmann/json)
 - [**Coverity Scan**](https://scan.coverity.com) for [static analysis](https://scan.coverity.com/projects/nlohmann-json)
 - [**cppcheck**](http://cppcheck.sourceforge.net) for static analysis
 - [**doctest**](https://github.com/onqtam/doctest) for the unit tests
-- [**Doxygen**](https://www.doxygen.nl/index.html) to generate [documentation](https://nlohmann.github.io/json/doxygen/index.html)
 - [**git-update-ghpages**](https://github.com/rstacruz/git-update-ghpages) to upload the documentation to gh-pages
 - [**GitHub Changelog Generator**](https://github.com/skywinder/github-changelog-generator) to generate the [ChangeLog](https://github.com/nlohmann/json/blob/develop/ChangeLog.md)
 - [**Google Benchmark**](https://github.com/google/benchmark) to implement the benchmarks
 - [**Hedley**](https://nemequ.github.io/hedley/) to avoid re-inventing several compiler-agnostic feature macros
-- [**lcov**](http://ltp.sourceforge.net/coverage/lcov.php) to process coverage information and create a HTML view
+- [**lcov**](http://ltp.sourceforge.net/coverage/lcov.php) to process coverage information and create an HTML view
 - [**libFuzzer**](https://llvm.org/docs/LibFuzzer.html) to implement fuzz testing for OSS-Fuzz
+- [**Material for MkDocs**](https://squidfunk.github.io/mkdocs-material/) for the style of the documentation site
+- [**MkDocs**](https://www.mkdocs.org) for the documentation site
 - [**OSS-Fuzz**](https://github.com/google/oss-fuzz) for continuous fuzz testing of the library ([project repository](https://github.com/google/oss-fuzz/tree/master/projects/json))
 - [**Probot**](https://probot.github.io) for automating maintainer tasks such as closing stale issues, requesting missing information, or detecting toxic comments.
-- [**send_to_wandbox**](https://github.com/nlohmann/json/blob/develop/doc/scripts/send_to_wandbox.py) to send code examples to [Wandbox](http://melpon.org/wandbox)
-- [**Travis**](https://travis-ci.org) for [continuous integration](https://travis-ci.org/nlohmann/json) on Linux and macOS
 - [**Valgrind**](https://valgrind.org) to check for correct memory management
-- [**Wandbox**](https://wandbox.org) for [online examples](https://wandbox.org/permlink/3lCHrFUZANONKv7a)
 
 
 ## Projects using JSON for Modern C++
 
-The library is currently used in Apple macOS Sierra and iOS 10. I am not sure what they are using the library for, but I am happy that it runs on so many devices.
+The library is currently used in Apple macOS Sierra-Monterey and iOS 10-15. I am not sure what they are using the library for, but I am happy that it runs on so many devices.
 
 
 ## Notes
@@ -1581,7 +1812,8 @@ The library supports **Unicode input** as follows:
 - [Unicode noncharacters](https://www.unicode.org/faq/private_use.html#nonchar1) will not be replaced by the library.
 - Invalid surrogates (e.g., incomplete pairs such as `\uDEAD`) will yield parse errors.
 - The strings stored in the library are UTF-8 encoded. When using the default string type (`std::string`), note that its length/size functions return the number of stored bytes rather than the number of characters or glyphs.
-- When you store strings with different encodings in the library, calling [`dump()`](https://nlohmann.github.io/json/api/basic_json/dump/) may throw an exception unless `json::error_handler_t::replace` or `json::error_handler_t::ignore` are used as error handlers.
+- When you store strings with different encodings in the library, calling [`dump()`](https://json.nlohmann.me/api/basic_json/dump/) may throw an exception unless `json::error_handler_t::replace` or `json::error_handler_t::ignore` are used as error handlers.
+- To store wide strings (e.g., `std::wstring`), you need to convert them to a UTF-8 encoded `std::string` before, see [an example](https://json.nlohmann.me/home/faq/#wide-string-handling).
 
 ### Comments in JSON
 
@@ -1608,17 +1840,17 @@ If you do want to preserve the insertion order, you can try the type [`nlohmann:
 
 We checked with Valgrind and the Address Sanitizer (ASAN) that there are no memory leaks.
 
-If you find that a parsing program with this library does not release memory, please consider the following case and it maybe unrelated to this library.
+If you find that a parsing program with this library does not release memory, please consider the following case, and it may be unrelated to this library.
 
 **Your program is compiled with glibc.** There is a tunable threshold that glibc uses to decide whether to actually return memory to the system or whether to cache it for later reuse. If in your program you make lots of small allocations and those small allocations are not a contiguous block and are presumably below the threshold, then they will not get returned to the OS.
 Here is a related issue [#1924](https://github.com/nlohmann/json/issues/1924).
 
 ### Further notes
 
-- The code contains numerous debug **assertions** which can be switched off by defining the preprocessor macro `NDEBUG`, see the [documentation of `assert`](https://en.cppreference.com/w/cpp/error/assert). In particular, note [`operator[]`](https://nlohmann.github.io/json/api/basic_json/operator%5B%5D/) implements **unchecked access** for const objects: If the given key is not present, the behavior is undefined (think of a dereferenced null pointer) and yields an [assertion failure](https://github.com/nlohmann/json/issues/289) if assertions are switched on. If you are not sure whether an element in an object exists, use checked access with the [`at()` function](https://nlohmann.github.io/json/api/basic_json/at/). Furthermore, you can define `JSON_ASSERT(x)` to replace calls to `assert(x)`.
-- As the exact type of a number is not defined in the [JSON specification](https://tools.ietf.org/html/rfc8259.html), this library tries to choose the best fitting C++ number type automatically. As a result, the type `double` may be used to store numbers which may yield [**floating-point exceptions**](https://github.com/nlohmann/json/issues/181) in certain rare situations if floating-point exceptions have been unmasked in the calling code. These exceptions are not caused by the library and need to be fixed in the calling code, such as by re-masking the exceptions prior to calling library functions.
+- The code contains numerous debug **assertions** which can be switched off by defining the preprocessor macro `NDEBUG`, see the [documentation of `assert`](https://en.cppreference.com/w/cpp/error/assert). In particular, note [`operator[]`](https://json.nlohmann.me/api/basic_json/operator%5B%5D/) implements **unchecked access** for const objects: If the given key is not present, the behavior is undefined (think of a dereferenced null pointer) and yields an [assertion failure](https://github.com/nlohmann/json/issues/289) if assertions are switched on. If you are not sure whether an element in an object exists, use checked access with the [`at()` function](https://json.nlohmann.me/api/basic_json/at/). Furthermore, you can define `JSON_ASSERT(x)` to replace calls to `assert(x)`.
+- As the exact number type is not defined in the [JSON specification](https://tools.ietf.org/html/rfc8259.html), this library tries to choose the best fitting C++ number type automatically. As a result, the type `double` may be used to store numbers which may yield [**floating-point exceptions**](https://github.com/nlohmann/json/issues/181) in certain rare situations if floating-point exceptions have been unmasked in the calling code. These exceptions are not caused by the library and need to be fixed in the calling code, such as by re-masking the exceptions prior to calling library functions.
 - The code can be compiled without C++ **runtime type identification** features; that is, you can use the `-fno-rtti` compiler flag.
-- **Exceptions** are used widely within the library. They can, however, be switched off with either using the compiler flag `-fno-exceptions` or by defining the symbol `JSON_NOEXCEPTION`. In this case, exceptions are replaced by `abort()` calls. You can further control this behavior by defining `JSON_THROW_USER` (overriding `throw`), `JSON_TRY_USER` (overriding `try`), and `JSON_CATCH_USER` (overriding `catch`). Note that `JSON_THROW_USER` should leave the current scope (e.g., by throwing or aborting), as continuing after it may yield undefined behavior.
+- **Exceptions** are used widely within the library. They can, however, be switched off with either using the compiler flag `-fno-exceptions` or by defining the symbol `JSON_NOEXCEPTION`. In this case, exceptions are replaced by `abort()` calls. You can further control this behavior by defining `JSON_THROW_USER` (overriding `throw`), `JSON_TRY_USER` (overriding `try`), and `JSON_CATCH_USER` (overriding `catch`). Note that `JSON_THROW_USER` should leave the current scope (e.g., by throwing or aborting), as continuing after it may yield undefined behavior. Note the explanatory [`what()`](https://en.cppreference.com/w/cpp/error/exception/what) string of exceptions is not available for MSVC if exceptions are disabled, see [#2824](https://github.com/nlohmann/json/discussions/2824).
 
 ## Execute unit tests
 
@@ -1634,7 +1866,23 @@ $ ctest --output-on-failure
 
 Note that during the `ctest` stage, several JSON test files are downloaded from an [external repository](https://github.com/nlohmann/json_test_data). If policies forbid downloading artifacts during testing, you can download the files yourself and pass the directory with the test files via `-DJSON_TestDataDirectory=path` to CMake. Then, no Internet connectivity is required. See [issue #2189](https://github.com/nlohmann/json/issues/2189) for more information.
 
-In case you have downloaded the library rather than checked out the code via Git, test `cmake_fetch_content_configure`. Please execute `ctest -LE git_required` to skip these tests. See [issue #2189](https://github.com/nlohmann/json/issues/2189) for more information.
+If the test suite is not found, several test suites will fail like this:
+
+```
+===============================================================================
+json/tests/src/make_test_data_available.hpp:21:
+TEST CASE:  check test suite is downloaded
+
+json/tests/src/make_test_data_available.hpp:23: FATAL ERROR: REQUIRE( utils::check_testsuite_downloaded() ) is NOT correct!
+  values: REQUIRE( false )
+  logged: Test data not found in 'json/cmake-build-debug/json_test_data'.
+          Please execute target 'download_test_data' before running this test suite.
+          See <https://github.com/nlohmann/json#execute-unit-tests> for more information.
+
+===============================================================================
+```
+
+In case you have downloaded the library rather than checked out the code via Git, test `cmake_fetch_content_configure` will fail. Please execute `ctest -LE git_required` to skip these tests. See [issue #2189](https://github.com/nlohmann/json/issues/2189) for more information.
 
 Some tests change the installed files and hence make the whole process not reproducible. Please execute `ctest -LE not_reproducible` to skip these tests. See [issue #2324](https://github.com/nlohmann/json/issues/2324) for more information.
 
diff --git a/external_imported/json/WORKSPACE.bazel b/external_imported/json/WORKSPACE.bazel
new file mode 100644
index 000000000..2b2ae9dba
--- /dev/null
+++ b/external_imported/json/WORKSPACE.bazel
@@ -0,0 +1 @@
+workspace(name = "nlohmann_json")
diff --git a/external_imported/json/appveyor.yml b/external_imported/json/appveyor.yml
deleted file mode 100644
index 5836f88d0..000000000
--- a/external_imported/json/appveyor.yml
+++ /dev/null
@@ -1,147 +0,0 @@
-version: '{build}'
-
-environment:
-  matrix:
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      configuration: Debug
-      platform: x86
-      CXX_FLAGS: ""
-      LINKER_FLAGS: ""
-      CMAKE_OPTIONS: ""
-      GENERATOR: Visual Studio 14 2015
-
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      configuration: Debug
-      platform: x86
-      CXX_FLAGS: ""
-      LINKER_FLAGS: ""
-      CMAKE_OPTIONS: ""
-      GENERATOR: Visual Studio 15 2017
-
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-      configuration: Debug
-      platform: x86
-      CXX_FLAGS: ""
-      LINKER_FLAGS: ""
-      CMAKE_OPTIONS: ""
-      GENERATOR: Visual Studio 16 2019
-
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-      configuration: Debug
-      platform: x64
-      CXX_FLAGS: ""
-      LINKER_FLAGS: ""
-      CMAKE_OPTIONS: ""
-      GENERATOR: Visual Studio 16 2019
-
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      configuration: Debug
-      COMPILER: mingw
-      platform: x86
-      CXX_FLAGS: ""
-      LINKER_FLAGS: ""
-      CMAKE_OPTIONS: ""
-      GENERATOR: Ninja
-
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      configuration: Release
-      COMPILER: mingw
-      platform: x86
-      CXX_FLAGS: ""
-      LINKER_FLAGS: ""
-      CMAKE_OPTIONS: ""
-      GENERATOR: Ninja
-
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      configuration: Release
-      platform: x86
-      CXX_FLAGS: ""
-      LINKER_FLAGS: ""
-      CMAKE_OPTIONS: ""
-      GENERATOR: Visual Studio 14 2015
-
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      configuration: Release
-      platform: x86
-      name: with_win_header
-      CXX_FLAGS: ""
-      LINKER_FLAGS: ""
-      CMAKE_OPTIONS: ""
-      GENERATOR: Visual Studio 14 2015
-
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      configuration: Release
-      platform: x86
-      CXX_FLAGS: "/permissive- /std:c++latest /utf-8"
-      LINKER_FLAGS: ""
-      CMAKE_OPTIONS: ""
-      GENERATOR: Visual Studio 15 2017
-
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-      configuration: Release
-      platform: x86
-      CXX_FLAGS: ""
-      LINKER_FLAGS: ""
-      CMAKE_OPTIONS: "-DJSON_ImplicitConversions=OFF"
-      GENERATOR: Visual Studio 16 2019
-
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-      configuration: Release
-      platform: x64
-      CXX_FLAGS: ""
-      LINKER_FLAGS: ""
-      CMAKE_OPTIONS: ""
-      GENERATOR: Visual Studio 16 2019
-
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      configuration: Release
-      platform: x64
-      CXX_FLAGS: ""
-      LINKER_FLAGS: ""
-      CMAKE_OPTIONS: ""
-      GENERATOR: Visual Studio 14 2015
-
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      configuration: Release
-      platform: x64
-      CXX_FLAGS: "/permissive- /std:c++latest /Zc:__cplusplus /utf-8 /F4000000"
-      LINKER_FLAGS: "/STACK:4000000"
-      CMAKE_OPTIONS: ""
-      GENERATOR: Visual Studio 15 2017
-
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-      configuration: Release
-      platform: x64
-      CXX_FLAGS: ""
-      LINKER_FLAGS: ""
-      CMAKE_OPTIONS: ""
-      GENERATOR: Visual Studio 16 2019
-
-init:
-  - cmake --version
-  - msbuild /version
-
-install:
-  - if "%COMPILER%"=="mingw"  appveyor DownloadFile https://github.com/ninja-build/ninja/releases/download/v1.6.0/ninja-win.zip -FileName ninja.zip
-  - if "%COMPILER%"=="mingw"  7z x ninja.zip -oC:\projects\deps\ninja > nul
-  - if "%COMPILER%"=="mingw"  set PATH=C:\projects\deps\ninja;%PATH%
-  - if "%COMPILER%"=="mingw"  set PATH=C:\mingw-w64\x86_64-7.3.0-posix-seh-rt_v5-rev0\mingw64\bin;%PATH%
-  - if "%COMPILER%"=="mingw"  g++ --version
-  - if "%platform%"=="x86"    set GENERATOR_PLATFORM=Win32
-
-before_build:
-  # for with_win_header build, inject the inclusion of Windows.h to the single-header library
-  - ps: if ($env:name -Eq "with_win_header") { $header_path = "single_include\nlohmann\json.hpp" }
-  - ps: if ($env:name -Eq "with_win_header") { "#include <Windows.h>`n" + (Get-Content $header_path | Out-String) | Set-Content $header_path }
-  - if "%GENERATOR%"=="Ninja" (cmake . -G "%GENERATOR%" -DCMAKE_BUILD_TYPE="%configuration%" -DCMAKE_CXX_FLAGS="%CXX_FLAGS%" -DCMAKE_EXE_LINKER_FLAGS="%LINKER_FLAGS%" -DCMAKE_IGNORE_PATH="C:/Program Files/Git/usr/bin" -DJSON_BuildTests=On "%CMAKE_OPTIONS%") else (cmake . -G "%GENERATOR%" -A "%GENERATOR_PLATFORM%" -DCMAKE_CXX_FLAGS="%CXX_FLAGS%" -DCMAKE_EXE_LINKER_FLAGS="%LINKER_FLAGS%" -DCMAKE_IGNORE_PATH="C:/Program Files/Git/usr/bin" -DJSON_BuildTests=On "%CMAKE_OPTIONS%")
-
-build_script:
-  - cmake --build . --config "%configuration%"
-
-test_script:
-  - if "%configuration%"=="Release" ctest -C "%configuration%" -V -j
-  # On Debug builds, skip test-unicode_all
-  # as it is extremely slow to run and cause
-  # occasional timeouts on AppVeyor.
-  # More info: https://github.com/nlohmann/json/pull/1570
-  - if "%configuration%"=="Debug" ctest --exclude-regex "test-unicode" -C "%configuration%" -V -j
diff --git a/external_imported/json/benchmarks/CMakeLists.txt b/external_imported/json/benchmarks/CMakeLists.txt
deleted file mode 100644
index 86063dbad..000000000
--- a/external_imported/json/benchmarks/CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-cmake_minimum_required(VERSION 3.8)
-project(JSON_Benchmarks LANGUAGES CXX)
-
-# set compiler flags
-if((CMAKE_CXX_COMPILER_ID MATCHES GNU) OR (CMAKE_CXX_COMPILER_ID MATCHES Clang))
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto -DNDEBUG -O3")
-endif()
-
-# configure Google Benchmarks
-set(BENCHMARK_ENABLE_TESTING OFF CACHE INTERNAL "" FORCE)
-add_subdirectory(thirdparty/benchmark)
-
-# header directories
-include_directories(thirdparty)
-include_directories(${CMAKE_SOURCE_DIR}/../single_include)
-
-# download test data
-include(${CMAKE_SOURCE_DIR}/../cmake/download_test_data.cmake)
-
-# benchmark binary
-add_executable(json_benchmarks src/benchmarks.cpp)
-target_compile_features(json_benchmarks PRIVATE cxx_std_11)
-target_link_libraries(json_benchmarks benchmark ${CMAKE_THREAD_LIBS_INIT})
-add_dependencies(json_benchmarks download_test_data)
-target_include_directories(json_benchmarks PRIVATE ${CMAKE_BINARY_DIR}/include)
diff --git a/external_imported/json/benchmarks/src/benchmarks.cpp b/external_imported/json/benchmarks/src/benchmarks.cpp
deleted file mode 100644
index 4f32a61a2..000000000
--- a/external_imported/json/benchmarks/src/benchmarks.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-#include "benchmark/benchmark.h"
-#include <nlohmann/json.hpp>
-#include <fstream>
-#include <test_data.hpp>
-
-using json = nlohmann::json;
-
-//////////////////////////////////////////////////////////////////////////////
-// parse JSON from file
-//////////////////////////////////////////////////////////////////////////////
-
-static void ParseFile(benchmark::State& state, const char* filename)
-{
-    while (state.KeepRunning())
-    {
-        state.PauseTiming();
-        auto* f = new std::ifstream(filename);
-        auto* j = new json();
-        state.ResumeTiming();
-
-        *j = json::parse(*f);
-
-        state.PauseTiming();
-        delete f;
-        delete j;
-        state.ResumeTiming();
-    }
-
-    std::ifstream file(filename, std::ios::binary | std::ios::ate);
-    state.SetBytesProcessed(state.iterations() * file.tellg());
-}
-BENCHMARK_CAPTURE(ParseFile, jeopardy,          TEST_DATA_DIRECTORY "/jeopardy/jeopardy.json");
-BENCHMARK_CAPTURE(ParseFile, canada,            TEST_DATA_DIRECTORY "/nativejson-benchmark/canada.json");
-BENCHMARK_CAPTURE(ParseFile, citm_catalog,      TEST_DATA_DIRECTORY "/nativejson-benchmark/citm_catalog.json");
-BENCHMARK_CAPTURE(ParseFile, twitter,           TEST_DATA_DIRECTORY "/nativejson-benchmark/twitter.json");
-BENCHMARK_CAPTURE(ParseFile, floats,            TEST_DATA_DIRECTORY "/regression/floats.json");
-BENCHMARK_CAPTURE(ParseFile, signed_ints,       TEST_DATA_DIRECTORY "/regression/signed_ints.json");
-BENCHMARK_CAPTURE(ParseFile, unsigned_ints,     TEST_DATA_DIRECTORY "/regression/unsigned_ints.json");
-BENCHMARK_CAPTURE(ParseFile, small_signed_ints, TEST_DATA_DIRECTORY "/regression/small_signed_ints.json");
-
-//////////////////////////////////////////////////////////////////////////////
-// parse JSON from string
-//////////////////////////////////////////////////////////////////////////////
-
-static void ParseString(benchmark::State& state, const char* filename)
-{
-    std::ifstream f(filename);
-    std::string str((std::istreambuf_iterator<char>(f)), std::istreambuf_iterator<char>());
-
-    while (state.KeepRunning())
-    {
-        state.PauseTiming();
-        auto* j = new json();
-        state.ResumeTiming();
-
-        *j = json::parse(str);
-
-        state.PauseTiming();
-        delete j;
-        state.ResumeTiming();
-    }
-
-    state.SetBytesProcessed(state.iterations() * str.size());
-}
-BENCHMARK_CAPTURE(ParseString, jeopardy,          TEST_DATA_DIRECTORY "/jeopardy/jeopardy.json");
-BENCHMARK_CAPTURE(ParseString, canada,            TEST_DATA_DIRECTORY "/nativejson-benchmark/canada.json");
-BENCHMARK_CAPTURE(ParseString, citm_catalog,      TEST_DATA_DIRECTORY "/nativejson-benchmark/citm_catalog.json");
-BENCHMARK_CAPTURE(ParseString, twitter,           TEST_DATA_DIRECTORY "/nativejson-benchmark/twitter.json");
-BENCHMARK_CAPTURE(ParseString, floats,            TEST_DATA_DIRECTORY "/regression/floats.json");
-BENCHMARK_CAPTURE(ParseString, signed_ints,       TEST_DATA_DIRECTORY "/regression/signed_ints.json");
-BENCHMARK_CAPTURE(ParseString, unsigned_ints,     TEST_DATA_DIRECTORY "/regression/unsigned_ints.json");
-BENCHMARK_CAPTURE(ParseString, small_signed_ints, TEST_DATA_DIRECTORY "/regression/small_signed_ints.json");
-
-
-//////////////////////////////////////////////////////////////////////////////
-// serialize JSON
-//////////////////////////////////////////////////////////////////////////////
-
-static void Dump(benchmark::State& state, const char* filename, int indent)
-{
-    std::ifstream f(filename);
-    std::string str((std::istreambuf_iterator<char>(f)), std::istreambuf_iterator<char>());
-    json j = json::parse(str);
-
-    while (state.KeepRunning())
-    {
-        j.dump(indent);
-    }
-
-    state.SetBytesProcessed(state.iterations() * j.dump(indent).size());
-}
-BENCHMARK_CAPTURE(Dump, jeopardy / -,          TEST_DATA_DIRECTORY "/jeopardy/jeopardy.json",                 -1);
-BENCHMARK_CAPTURE(Dump, jeopardy / 4,          TEST_DATA_DIRECTORY "/jeopardy/jeopardy.json",                 4);
-BENCHMARK_CAPTURE(Dump, canada / -,            TEST_DATA_DIRECTORY "/nativejson-benchmark/canada.json",       -1);
-BENCHMARK_CAPTURE(Dump, canada / 4,            TEST_DATA_DIRECTORY "/nativejson-benchmark/canada.json",       4);
-BENCHMARK_CAPTURE(Dump, citm_catalog / -,      TEST_DATA_DIRECTORY "/nativejson-benchmark/citm_catalog.json", -1);
-BENCHMARK_CAPTURE(Dump, citm_catalog / 4,      TEST_DATA_DIRECTORY "/nativejson-benchmark/citm_catalog.json", 4);
-BENCHMARK_CAPTURE(Dump, twitter / -,           TEST_DATA_DIRECTORY "/nativejson-benchmark/twitter.json",      -1);
-BENCHMARK_CAPTURE(Dump, twitter / 4,           TEST_DATA_DIRECTORY "/nativejson-benchmark/twitter.json",      4);
-BENCHMARK_CAPTURE(Dump, floats / -,            TEST_DATA_DIRECTORY "/regression/floats.json",                 -1);
-BENCHMARK_CAPTURE(Dump, floats / 4,            TEST_DATA_DIRECTORY "/regression/floats.json",                 4);
-BENCHMARK_CAPTURE(Dump, signed_ints / -,       TEST_DATA_DIRECTORY "/regression/signed_ints.json",            -1);
-BENCHMARK_CAPTURE(Dump, signed_ints / 4,       TEST_DATA_DIRECTORY "/regression/signed_ints.json",            4);
-BENCHMARK_CAPTURE(Dump, unsigned_ints / -,     TEST_DATA_DIRECTORY "/regression/unsigned_ints.json",          -1);
-BENCHMARK_CAPTURE(Dump, unsigned_ints / 4,     TEST_DATA_DIRECTORY "/regression/unsigned_ints.json",          4);
-BENCHMARK_CAPTURE(Dump, small_signed_ints / -, TEST_DATA_DIRECTORY "/regression/small_signed_ints.json",      -1);
-BENCHMARK_CAPTURE(Dump, small_signed_ints / 4, TEST_DATA_DIRECTORY "/regression/small_signed_ints.json",      4);
-
-
-BENCHMARK_MAIN();
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/AUTHORS b/external_imported/json/benchmarks/thirdparty/benchmark/AUTHORS
deleted file mode 100755
index f8219036d..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/AUTHORS
+++ /dev/null
@@ -1,46 +0,0 @@
-# This is the official list of benchmark authors for copyright purposes.
-# This file is distinct from the CONTRIBUTORS files.
-# See the latter for an explanation.
-#
-# Names should be added to this file as:
-#	Name or Organization <email address>
-# The email address is not required for organizations.
-#
-# Please keep the list sorted.
-
-Albert Pretorius <pretoalb@gmail.com>
-Arne Beer <arne@twobeer.de>
-Carto
-Christopher Seymour <chris.j.seymour@hotmail.com>
-David Coeurjolly <david.coeurjolly@liris.cnrs.fr>
-Deniz Evrenci <denizevrenci@gmail.com>
-Dirac Research 
-Dominik Czarnota <dominik.b.czarnota@gmail.com>
-Eric Fiselier <eric@efcs.ca>
-Eugene Zhuk <eugene.zhuk@gmail.com>
-Evgeny Safronov <division494@gmail.com>
-Felix Homann <linuxaudio@showlabor.de>
-Google Inc.
-International Business Machines Corporation
-Ismael Jimenez Martinez <ismael.jimenez.martinez@gmail.com>
-Jern-Kuan Leong <jernkuan@gmail.com>
-JianXiong Zhou <zhoujianxiong2@gmail.com>
-Joao Paulo Magalhaes <joaoppmagalhaes@gmail.com>
-Jussi Knuuttila <jussi.knuuttila@gmail.com>
-Kaito Udagawa <umireon@gmail.com>
-Kishan Kumar <kumar.kishan@outlook.com>
-Lei Xu <eddyxu@gmail.com>
-Matt Clarkson <mattyclarkson@gmail.com>
-Maxim Vafin <maxvafin@gmail.com>
-MongoDB Inc.
-Nick Hutchinson <nshutchinson@gmail.com>
-Oleksandr Sochka <sasha.sochka@gmail.com>
-Paul Redmond <paul.redmond@gmail.com>
-Radoslav Yovchev <radoslav.tm@gmail.com>
-Roman Lebedev <lebedev.ri@gmail.com>
-Shuo Chen <chenshuo@chenshuo.com>
-Steinar H. Gunderson <sgunderson@bigfoot.com>
-Stripe, Inc.
-Yixuan Qiu <yixuanq@gmail.com>
-Yusuke Suzuki <utatane.tea@gmail.com>
-Zbigniew Skowron <zbychs@gmail.com>
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/BUILD.bazel b/external_imported/json/benchmarks/thirdparty/benchmark/BUILD.bazel
deleted file mode 100755
index 6ee69f290..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/BUILD.bazel
+++ /dev/null
@@ -1,42 +0,0 @@
-licenses(["notice"])
-
-config_setting(
-    name = "windows",
-    values = {
-        "cpu": "x64_windows",
-    },
-    visibility = [":__subpackages__"],
-)
-
-cc_library(
-    name = "benchmark",
-    srcs = glob(
-        [
-            "src/*.cc",
-            "src/*.h",
-        ],
-        exclude = ["src/benchmark_main.cc"],
-    ),
-    hdrs = ["include/benchmark/benchmark.h"],
-    linkopts = select({
-        ":windows": ["-DEFAULTLIB:shlwapi.lib"],
-        "//conditions:default": ["-pthread"],
-    }),
-    strip_include_prefix = "include",
-    visibility = ["//visibility:public"],
-)
-
-cc_library(
-    name = "benchmark_main",
-    srcs = ["src/benchmark_main.cc"],
-    hdrs = ["include/benchmark/benchmark.h"],
-    strip_include_prefix = "include",
-    visibility = ["//visibility:public"],
-    deps = [":benchmark"],
-)
-
-cc_library(
-    name = "benchmark_internal_headers",
-    hdrs = glob(["src/*.h"]),
-    visibility = ["//test:__pkg__"],
-)
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/CMakeLists.txt b/external_imported/json/benchmarks/thirdparty/benchmark/CMakeLists.txt
deleted file mode 100755
index b1c1d3d5a..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/CMakeLists.txt
+++ /dev/null
@@ -1,251 +0,0 @@
-cmake_minimum_required (VERSION 2.8.12)
-
-project (benchmark)
-
-foreach(p
-    CMP0054 # CMake 3.1
-    CMP0056 # export EXE_LINKER_FLAGS to try_run
-    CMP0057 # Support no if() IN_LIST operator
-    )
-  if(POLICY ${p})
-    cmake_policy(SET ${p} NEW)
-  endif()
-endforeach()
-
-option(BENCHMARK_ENABLE_TESTING "Enable testing of the benchmark library." ON)
-option(BENCHMARK_ENABLE_EXCEPTIONS "Enable the use of exceptions in the benchmark library." ON)
-option(BENCHMARK_ENABLE_LTO "Enable link time optimisation of the benchmark library." OFF)
-option(BENCHMARK_USE_LIBCXX "Build and test using libc++ as the standard library." OFF)
-option(BENCHMARK_BUILD_32_BITS "Build a 32 bit version of the library." OFF)
-option(BENCHMARK_ENABLE_INSTALL "Enable installation of benchmark. (Projects embedding benchmark may want to turn this OFF.)" ON)
-
-# Allow unmet dependencies to be met using CMake's ExternalProject mechanics, which
-# may require downloading the source code.
-option(BENCHMARK_DOWNLOAD_DEPENDENCIES "Allow the downloading and in-tree building of unmet dependencies" OFF)
-
-# This option can be used to disable building and running unit tests which depend on gtest
-# in cases where it is not possible to build or find a valid version of gtest.
-option(BENCHMARK_ENABLE_GTEST_TESTS "Enable building the unit tests which depend on gtest" ON)
-
-set(ENABLE_ASSEMBLY_TESTS_DEFAULT OFF)
-function(should_enable_assembly_tests)
-  if(CMAKE_BUILD_TYPE)
-    string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LOWER)
-    if (${CMAKE_BUILD_TYPE_LOWER} MATCHES "coverage")
-      # FIXME: The --coverage flag needs to be removed when building assembly
-      # tests for this to work.
-      return()
-    endif()
-  endif()
-  if (MSVC)
-    return()
-  elseif(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
-    return()
-  elseif(NOT CMAKE_SIZEOF_VOID_P EQUAL 8)
-    # FIXME: Make these work on 32 bit builds
-    return()
-  elseif(BENCHMARK_BUILD_32_BITS)
-     # FIXME: Make these work on 32 bit builds
-    return()
-  endif()
-  find_program(LLVM_FILECHECK_EXE FileCheck)
-  if (LLVM_FILECHECK_EXE)
-    set(LLVM_FILECHECK_EXE "${LLVM_FILECHECK_EXE}" CACHE PATH "llvm filecheck" FORCE)
-    message(STATUS "LLVM FileCheck Found: ${LLVM_FILECHECK_EXE}")
-  else()
-    message(STATUS "Failed to find LLVM FileCheck")
-    return()
-  endif()
-  set(ENABLE_ASSEMBLY_TESTS_DEFAULT ON PARENT_SCOPE)
-endfunction()
-should_enable_assembly_tests()
-
-# This option disables the building and running of the assembly verification tests
-option(BENCHMARK_ENABLE_ASSEMBLY_TESTS "Enable building and running the assembly tests"
-    ${ENABLE_ASSEMBLY_TESTS_DEFAULT})
-
-# Make sure we can import out CMake functions
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules")
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-
-
-# Read the git tags to determine the project version
-include(GetGitVersion)
-get_git_version(GIT_VERSION)
-
-# Tell the user what versions we are using
-string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" VERSION ${GIT_VERSION})
-message("-- Version: ${VERSION}")
-
-# The version of the libraries
-set(GENERIC_LIB_VERSION ${VERSION})
-string(SUBSTRING ${VERSION} 0 1 GENERIC_LIB_SOVERSION)
-
-# Import our CMake modules
-include(CheckCXXCompilerFlag)
-include(AddCXXCompilerFlag)
-include(CXXFeatureCheck)
-
-if (BENCHMARK_BUILD_32_BITS)
-  add_required_cxx_compiler_flag(-m32)
-endif()
-
-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-  # Turn compiler warnings up to 11
-  string(REGEX REPLACE "[-/]W[1-4]" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
-  add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-
-  if (NOT BENCHMARK_ENABLE_EXCEPTIONS)
-    add_cxx_compiler_flag(-EHs-)
-    add_cxx_compiler_flag(-EHa-)
-  endif()
-  # Link time optimisation
-  if (BENCHMARK_ENABLE_LTO)
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GL")
-    set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} /LTCG")
-    set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /LTCG")
-    set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG")
-
-    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /GL")
-    string(REGEX REPLACE "[-/]INCREMENTAL" "/INCREMENTAL:NO" CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO}")
-    set(CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO} /LTCG")
-    string(REGEX REPLACE "[-/]INCREMENTAL" "/INCREMENTAL:NO" CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO}")
-    set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} /LTCG")
-    string(REGEX REPLACE "[-/]INCREMENTAL" "/INCREMENTAL:NO" CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO}")
-    set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /LTCG")
-
-    set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /GL")
-    set(CMAKE_STATIC_LINKER_FLAGS_MINSIZEREL "${CMAKE_STATIC_LINKER_FLAGS_MINSIZEREL} /LTCG")
-    set(CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL "${CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL} /LTCG")
-    set(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL} /LTCG")
-  endif()
-else()
-  # Try and enable C++11. Don't use C++14 because it doesn't work in some
-  # configurations.
-  add_cxx_compiler_flag(-std=c++11)
-  if (NOT HAVE_CXX_FLAG_STD_CXX11)
-    add_cxx_compiler_flag(-std=c++0x)
-  endif()
-
-  # Turn compiler warnings up to 11
-  add_cxx_compiler_flag(-Wall)
-
-  add_cxx_compiler_flag(-Wextra)
-  add_cxx_compiler_flag(-Wshadow)
-  add_cxx_compiler_flag(-Werror RELEASE)
-  add_cxx_compiler_flag(-Werror RELWITHDEBINFO)
-  add_cxx_compiler_flag(-Werror MINSIZEREL)
-  add_cxx_compiler_flag(-pedantic)
-  add_cxx_compiler_flag(-pedantic-errors)
-  add_cxx_compiler_flag(-Wshorten-64-to-32)
-  add_cxx_compiler_flag(-Wfloat-equal)
-  add_cxx_compiler_flag(-fstrict-aliasing)
-  if (NOT BENCHMARK_ENABLE_EXCEPTIONS)
-    add_cxx_compiler_flag(-fno-exceptions)
-  endif()
-
-  if (HAVE_CXX_FLAG_FSTRICT_ALIASING)
-    if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "Intel") #ICC17u2: Many false positives for Wstrict-aliasing
-      add_cxx_compiler_flag(-Wstrict-aliasing)
-    endif()
-  endif()
-  # ICC17u2: overloaded virtual function "benchmark::Fixture::SetUp" is only partially overridden
-  # (because of deprecated overload)
-  add_cxx_compiler_flag(-wd654)  
-  add_cxx_compiler_flag(-Wthread-safety)
-  if (HAVE_CXX_FLAG_WTHREAD_SAFETY)
-    cxx_feature_check(THREAD_SAFETY_ATTRIBUTES)
-  endif()
-
-  # On most UNIX like platforms g++ and clang++ define _GNU_SOURCE as a
-  # predefined macro, which turns on all of the wonderful libc extensions.
-  # However g++ doesn't do this in Cygwin so we have to define it ourselfs
-  # since we depend on GNU/POSIX/BSD extensions.
-  if (CYGWIN)
-    add_definitions(-D_GNU_SOURCE=1)
-  endif()
-
-  # Link time optimisation
-  if (BENCHMARK_ENABLE_LTO)
-    add_cxx_compiler_flag(-flto)
-    if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
-      find_program(GCC_AR gcc-ar)
-      if (GCC_AR)
-        set(CMAKE_AR ${GCC_AR})
-      endif()
-      find_program(GCC_RANLIB gcc-ranlib)
-      if (GCC_RANLIB)
-        set(CMAKE_RANLIB ${GCC_RANLIB})
-      endif()
-    elseif("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
-      include(llvm-toolchain)
-    endif()
-  endif()
-
-  # Coverage build type
-  set(BENCHMARK_CXX_FLAGS_COVERAGE "${CMAKE_CXX_FLAGS_DEBUG}"
-    CACHE STRING "Flags used by the C++ compiler during coverage builds."
-    FORCE)
-  set(BENCHMARK_EXE_LINKER_FLAGS_COVERAGE "${CMAKE_EXE_LINKER_FLAGS_DEBUG}"
-    CACHE STRING "Flags used for linking binaries during coverage builds."
-    FORCE)
-  set(BENCHMARK_SHARED_LINKER_FLAGS_COVERAGE "${CMAKE_SHARED_LINKER_FLAGS_DEBUG}"
-    CACHE STRING "Flags used by the shared libraries linker during coverage builds."
-    FORCE)
-  mark_as_advanced(
-    BENCHMARK_CXX_FLAGS_COVERAGE
-    BENCHMARK_EXE_LINKER_FLAGS_COVERAGE
-    BENCHMARK_SHARED_LINKER_FLAGS_COVERAGE)
-  set(CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING
-    "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel Coverage.")
-  add_cxx_compiler_flag(--coverage COVERAGE)
-endif()
-
-if (BENCHMARK_USE_LIBCXX)
-  if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-    add_cxx_compiler_flag(-stdlib=libc++)
-  elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR
-          "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
-    add_cxx_compiler_flag(-nostdinc++)
-    message("libc++ header path must be manually specified using CMAKE_CXX_FLAGS")
-    # Adding -nodefaultlibs directly to CMAKE_<TYPE>_LINKER_FLAGS will break
-    # configuration checks such as 'find_package(Threads)'
-    list(APPEND BENCHMARK_CXX_LINKER_FLAGS -nodefaultlibs)
-    # -lc++ cannot be added directly to CMAKE_<TYPE>_LINKER_FLAGS because
-    # linker flags appear before all linker inputs and -lc++ must appear after.
-    list(APPEND BENCHMARK_CXX_LIBRARIES c++)
-  else()
-    message(FATAL_ERROR "-DBENCHMARK_USE_LIBCXX:BOOL=ON is not supported for compiler")
-  endif()
-endif(BENCHMARK_USE_LIBCXX)
-
-# C++ feature checks
-# Determine the correct regular expression engine to use
-cxx_feature_check(STD_REGEX)
-cxx_feature_check(GNU_POSIX_REGEX)
-cxx_feature_check(POSIX_REGEX)
-if(NOT HAVE_STD_REGEX AND NOT HAVE_GNU_POSIX_REGEX AND NOT HAVE_POSIX_REGEX)
-  message(FATAL_ERROR "Failed to determine the source files for the regular expression backend")
-endif()
-if (NOT BENCHMARK_ENABLE_EXCEPTIONS AND HAVE_STD_REGEX
-        AND NOT HAVE_GNU_POSIX_REGEX AND NOT HAVE_POSIX_REGEX)
-  message(WARNING "Using std::regex with exceptions disabled is not fully supported")
-endif()
-cxx_feature_check(STEADY_CLOCK)
-# Ensure we have pthreads
-find_package(Threads REQUIRED)
-
-# Set up directories
-include_directories(${PROJECT_SOURCE_DIR}/include)
-
-# Build the targets
-add_subdirectory(src)
-
-if (BENCHMARK_ENABLE_TESTING)
-  enable_testing()
-  if (BENCHMARK_ENABLE_GTEST_TESTS)
-    include(HandleGTest)
-  endif()
-  add_subdirectory(test)
-endif()
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/CONTRIBUTING.md b/external_imported/json/benchmarks/thirdparty/benchmark/CONTRIBUTING.md
deleted file mode 100755
index 43de4c9d4..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/CONTRIBUTING.md
+++ /dev/null
@@ -1,58 +0,0 @@
-# How to contribute #
-
-We'd love to accept your patches and contributions to this project.  There are
-a just a few small guidelines you need to follow.
-
-
-## Contributor License Agreement ##
-
-Contributions to any Google project must be accompanied by a Contributor
-License Agreement.  This is not a copyright **assignment**, it simply gives
-Google permission to use and redistribute your contributions as part of the
-project.
-
-  * If you are an individual writing original source code and you're sure you
-    own the intellectual property, then you'll need to sign an [individual
-    CLA][].
-
-  * If you work for a company that wants to allow you to contribute your work,
-    then you'll need to sign a [corporate CLA][].
-
-You generally only need to submit a CLA once, so if you've already submitted
-one (even if it was for a different project), you probably don't need to do it
-again.
-
-[individual CLA]: https://developers.google.com/open-source/cla/individual
-[corporate CLA]: https://developers.google.com/open-source/cla/corporate
-
-Once your CLA is submitted (or if you already submitted one for
-another Google project), make a commit adding yourself to the
-[AUTHORS][] and [CONTRIBUTORS][] files. This commit can be part
-of your first [pull request][].
-
-[AUTHORS]: AUTHORS
-[CONTRIBUTORS]: CONTRIBUTORS
-
-
-## Submitting a patch ##
-
-  1. It's generally best to start by opening a new issue describing the bug or
-     feature you're intending to fix.  Even if you think it's relatively minor,
-     it's helpful to know what people are working on.  Mention in the initial
-     issue that you are planning to work on that bug or feature so that it can
-     be assigned to you.
-
-  1. Follow the normal process of [forking][] the project, and setup a new
-     branch to work in.  It's important that each group of changes be done in
-     separate branches in order to ensure that a pull request only includes the
-     commits related to that bug or feature.
-
-  1. Do your best to have [well-formed commit messages][] for each change.
-     This provides consistency throughout the project, and ensures that commit
-     messages are able to be formatted properly by various git tools.
-
-  1. Finally, push the commits to your fork and submit a [pull request][].
-
-[forking]: https://help.github.com/articles/fork-a-repo
-[well-formed commit messages]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
-[pull request]: https://help.github.com/articles/creating-a-pull-request
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/CONTRIBUTORS b/external_imported/json/benchmarks/thirdparty/benchmark/CONTRIBUTORS
deleted file mode 100755
index 1cf04db17..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/CONTRIBUTORS
+++ /dev/null
@@ -1,65 +0,0 @@
-# People who have agreed to one of the CLAs and can contribute patches.
-# The AUTHORS file lists the copyright holders; this file
-# lists people.  For example, Google employees are listed here
-# but not in AUTHORS, because Google holds the copyright.
-#
-# Names should be added to this file only after verifying that
-# the individual or the individual's organization has agreed to
-# the appropriate Contributor License Agreement, found here:
-#
-# https://developers.google.com/open-source/cla/individual
-# https://developers.google.com/open-source/cla/corporate
-#
-# The agreement for individuals can be filled out on the web.
-#
-# When adding J Random Contributor's name to this file,
-# either J's name or J's organization's name should be
-# added to the AUTHORS file, depending on whether the
-# individual or corporate CLA was used.
-#
-# Names should be added to this file as:
-#     Name <email address>
-#
-# Please keep the list sorted.
-
-Albert Pretorius <pretoalb@gmail.com>
-Arne Beer <arne@twobeer.de>
-Billy Robert O'Neal III <billy.oneal@gmail.com> <bion@microsoft.com>
-Chris Kennelly <ckennelly@google.com> <ckennelly@ckennelly.com>
-Christopher Seymour <chris.j.seymour@hotmail.com>
-David Coeurjolly <david.coeurjolly@liris.cnrs.fr>
-Deniz Evrenci <denizevrenci@gmail.com>
-Dominic Hamon <dma@stripysock.com> <dominic@google.com>
-Dominik Czarnota <dominik.b.czarnota@gmail.com>
-Eric Fiselier <eric@efcs.ca>
-Eugene Zhuk <eugene.zhuk@gmail.com>
-Evgeny Safronov <division494@gmail.com>
-Felix Homann <linuxaudio@showlabor.de>
-Ismael Jimenez Martinez <ismael.jimenez.martinez@gmail.com>
-Jern-Kuan Leong <jernkuan@gmail.com>
-JianXiong Zhou <zhoujianxiong2@gmail.com>
-Joao Paulo Magalhaes <joaoppmagalhaes@gmail.com>
-John Millikin <jmillikin@stripe.com>
-Jussi Knuuttila <jussi.knuuttila@gmail.com>
-Kai Wolf <kai.wolf@gmail.com>
-Kishan Kumar <kumar.kishan@outlook.com>
-Kaito Udagawa <umireon@gmail.com>
-Lei Xu <eddyxu@gmail.com>
-Matt Clarkson <mattyclarkson@gmail.com>
-Maxim Vafin <maxvafin@gmail.com>
-Nick Hutchinson <nshutchinson@gmail.com>
-Oleksandr Sochka <sasha.sochka@gmail.com>
-Pascal Leroy <phl@google.com>
-Paul Redmond <paul.redmond@gmail.com>
-Pierre Phaneuf <pphaneuf@google.com>
-Radoslav Yovchev <radoslav.tm@gmail.com>
-Raul Marin <rmrodriguez@cartodb.com>
-Ray Glover <ray.glover@uk.ibm.com>
-Robert Guo <robert.guo@mongodb.com>
-Roman Lebedev <lebedev.ri@gmail.com>
-Shuo Chen <chenshuo@chenshuo.com>
-Tobias Ulvgård <tobias.ulvgard@dirac.se>
-Tom Madams <tom.ej.madams@gmail.com> <tmadams@google.com>
-Yixuan Qiu <yixuanq@gmail.com>
-Yusuke Suzuki <utatane.tea@gmail.com>
-Zbigniew Skowron <zbychs@gmail.com>
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/LICENSE b/external_imported/json/benchmarks/thirdparty/benchmark/LICENSE
deleted file mode 100755
index d64569567..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/README.md b/external_imported/json/benchmarks/thirdparty/benchmark/README.md
deleted file mode 100755
index 0341c31bd..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/README.md
+++ /dev/null
@@ -1,950 +0,0 @@
-# benchmark
-[![Build Status](https://travis-ci.org/google/benchmark.svg?branch=master)](https://travis-ci.org/google/benchmark)
-[![Build status](https://ci.appveyor.com/api/projects/status/u0qsyp7t1tk7cpxs/branch/master?svg=true)](https://ci.appveyor.com/project/google/benchmark/branch/master)
-[![Coverage Status](https://coveralls.io/repos/google/benchmark/badge.svg)](https://coveralls.io/r/google/benchmark)
-[![slackin](https://slackin-iqtfqnpzxd.now.sh/badge.svg)](https://slackin-iqtfqnpzxd.now.sh/)
-
-A library to support the benchmarking of functions, similar to unit-tests.
-
-Discussion group: https://groups.google.com/d/forum/benchmark-discuss
-
-IRC channel: https://freenode.net #googlebenchmark
-
-[Known issues and common problems](#known-issues)
-
-[Additional Tooling Documentation](docs/tools.md)
-
-[Assembly Testing Documentation](docs/AssemblyTests.md)
-
-
-## Building
-
-The basic steps for configuring and building the library look like this:
-
-```bash
-$ git clone https://github.com/google/benchmark.git
-# Benchmark requires Google Test as a dependency. Add the source tree as a subdirectory.
-$ git clone https://github.com/google/googletest.git benchmark/googletest
-$ mkdir build && cd build
-$ cmake -G <generator> [options] ../benchmark
-# Assuming a makefile generator was used
-$ make
-```
-
-Note that Google Benchmark requires Google Test to build and run the tests. This
-dependency can be provided two ways:
-
-* Checkout the Google Test sources into `benchmark/googletest` as above.
-* Otherwise, if `-DBENCHMARK_DOWNLOAD_DEPENDENCIES=ON` is specified during
-  configuration, the library will automatically download and build any required
-  dependencies.
-
-If you do not wish to build and run the tests, add `-DBENCHMARK_ENABLE_GTEST_TESTS=OFF`
-to `CMAKE_ARGS`.
-
-
-## Installation Guide
-
-For Ubuntu and Debian Based System
-
-First make sure you have git and cmake installed (If not please install it)
-
-```
-sudo apt-get install git
-sudo apt-get install cmake
-```
-
-Now, let's clone the repository and build it
-
-```
-git clone https://github.com/google/benchmark.git
-cd benchmark
-git clone https://github.com/google/googletest.git
-mkdir build
-cd build
-cmake .. -DCMAKE_BUILD_TYPE=RELEASE
-make
-```
-
-We need to install the library globally now
-
-```
-sudo make install
-```
-
-Now you have google/benchmark installed in your machine
-Note: Don't forget to link to pthread library while building
-
-## Stable and Experimental Library Versions
-
-The main branch contains the latest stable version of the benchmarking library;
-the API of which can be considered largely stable, with source breaking changes
-being made only upon the release of a new major version.
-
-Newer, experimental, features are implemented and tested on the
-[`v2` branch](https://github.com/google/benchmark/tree/v2). Users who wish
-to use, test, and provide feedback on the new features are encouraged to try
-this branch. However, this branch provides no stability guarantees and reserves
-the right to change and break the API at any time.
-
-##Prerequisite knowledge
-
-Before attempting to understand this framework one should ideally have some familiarity with the structure and format of the Google Test framework, upon which it is based. Documentation for Google Test, including a "Getting Started" (primer) guide, is available here:
-https://github.com/google/googletest/blob/master/googletest/docs/Documentation.md
-
-
-## Example usage
-### Basic usage
-Define a function that executes the code to be measured.
-
-```c++
-#include <benchmark/benchmark.h>
-
-static void BM_StringCreation(benchmark::State& state) {
-  for (auto _ : state)
-    std::string empty_string;
-}
-// Register the function as a benchmark
-BENCHMARK(BM_StringCreation);
-
-// Define another benchmark
-static void BM_StringCopy(benchmark::State& state) {
-  std::string x = "hello";
-  for (auto _ : state)
-    std::string copy(x);
-}
-BENCHMARK(BM_StringCopy);
-
-BENCHMARK_MAIN();
-```
-
-Don't forget to inform your linker to add benchmark library e.g. through 
-`-lbenchmark` compilation flag. Alternatively, you may leave out the 
-`BENCHMARK_MAIN();` at the end of the source file and link against 
-`-lbenchmark_main` to get the same default behavior.
-
-The benchmark library will reporting the timing for the code within the `for(...)` loop.
-
-### Passing arguments
-Sometimes a family of benchmarks can be implemented with just one routine that
-takes an extra argument to specify which one of the family of benchmarks to
-run. For example, the following code defines a family of benchmarks for
-measuring the speed of `memcpy()` calls of different lengths:
-
-```c++
-static void BM_memcpy(benchmark::State& state) {
-  char* src = new char[state.range(0)];
-  char* dst = new char[state.range(0)];
-  memset(src, 'x', state.range(0));
-  for (auto _ : state)
-    memcpy(dst, src, state.range(0));
-  state.SetBytesProcessed(int64_t(state.iterations()) *
-                          int64_t(state.range(0)));
-  delete[] src;
-  delete[] dst;
-}
-BENCHMARK(BM_memcpy)->Arg(8)->Arg(64)->Arg(512)->Arg(1<<10)->Arg(8<<10);
-```
-
-The preceding code is quite repetitive, and can be replaced with the following
-short-hand. The following invocation will pick a few appropriate arguments in
-the specified range and will generate a benchmark for each such argument.
-
-```c++
-BENCHMARK(BM_memcpy)->Range(8, 8<<10);
-```
-
-By default the arguments in the range are generated in multiples of eight and
-the command above selects [ 8, 64, 512, 4k, 8k ]. In the following code the
-range multiplier is changed to multiples of two.
-
-```c++
-BENCHMARK(BM_memcpy)->RangeMultiplier(2)->Range(8, 8<<10);
-```
-Now arguments generated are [ 8, 16, 32, 64, 128, 256, 512, 1024, 2k, 4k, 8k ].
-
-You might have a benchmark that depends on two or more inputs. For example, the
-following code defines a family of benchmarks for measuring the speed of set
-insertion.
-
-```c++
-static void BM_SetInsert(benchmark::State& state) {
-  std::set<int> data;
-  for (auto _ : state) {
-    state.PauseTiming();
-    data = ConstructRandomSet(state.range(0));
-    state.ResumeTiming();
-    for (int j = 0; j < state.range(1); ++j)
-      data.insert(RandomNumber());
-  }
-}
-BENCHMARK(BM_SetInsert)
-    ->Args({1<<10, 128})
-    ->Args({2<<10, 128})
-    ->Args({4<<10, 128})
-    ->Args({8<<10, 128})
-    ->Args({1<<10, 512})
-    ->Args({2<<10, 512})
-    ->Args({4<<10, 512})
-    ->Args({8<<10, 512});
-```
-
-The preceding code is quite repetitive, and can be replaced with the following
-short-hand. The following macro will pick a few appropriate arguments in the
-product of the two specified ranges and will generate a benchmark for each such
-pair.
-
-```c++
-BENCHMARK(BM_SetInsert)->Ranges({{1<<10, 8<<10}, {128, 512}});
-```
-
-For more complex patterns of inputs, passing a custom function to `Apply` allows
-programmatic specification of an arbitrary set of arguments on which to run the
-benchmark. The following example enumerates a dense range on one parameter,
-and a sparse range on the second.
-
-```c++
-static void CustomArguments(benchmark::internal::Benchmark* b) {
-  for (int i = 0; i <= 10; ++i)
-    for (int j = 32; j <= 1024*1024; j *= 8)
-      b->Args({i, j});
-}
-BENCHMARK(BM_SetInsert)->Apply(CustomArguments);
-```
-
-### Calculate asymptotic complexity (Big O)
-Asymptotic complexity might be calculated for a family of benchmarks. The
-following code will calculate the coefficient for the high-order term in the
-running time and the normalized root-mean square error of string comparison.
-
-```c++
-static void BM_StringCompare(benchmark::State& state) {
-  std::string s1(state.range(0), '-');
-  std::string s2(state.range(0), '-');
-  for (auto _ : state) {
-    benchmark::DoNotOptimize(s1.compare(s2));
-  }
-  state.SetComplexityN(state.range(0));
-}
-BENCHMARK(BM_StringCompare)
-    ->RangeMultiplier(2)->Range(1<<10, 1<<18)->Complexity(benchmark::oN);
-```
-
-As shown in the following invocation, asymptotic complexity might also be
-calculated automatically.
-
-```c++
-BENCHMARK(BM_StringCompare)
-    ->RangeMultiplier(2)->Range(1<<10, 1<<18)->Complexity();
-```
-
-The following code will specify asymptotic complexity with a lambda function,
-that might be used to customize high-order term calculation.
-
-```c++
-BENCHMARK(BM_StringCompare)->RangeMultiplier(2)
-    ->Range(1<<10, 1<<18)->Complexity([](int n)->double{return n; });
-```
-
-### Templated benchmarks
-Templated benchmarks work the same way: This example produces and consumes
-messages of size `sizeof(v)` `range_x` times. It also outputs throughput in the
-absence of multiprogramming.
-
-```c++
-template <class Q> int BM_Sequential(benchmark::State& state) {
-  Q q;
-  typename Q::value_type v;
-  for (auto _ : state) {
-    for (int i = state.range(0); i--; )
-      q.push(v);
-    for (int e = state.range(0); e--; )
-      q.Wait(&v);
-  }
-  // actually messages, not bytes:
-  state.SetBytesProcessed(
-      static_cast<int64_t>(state.iterations())*state.range(0));
-}
-BENCHMARK_TEMPLATE(BM_Sequential, WaitQueue<int>)->Range(1<<0, 1<<10);
-```
-
-Three macros are provided for adding benchmark templates.
-
-```c++
-#ifdef BENCHMARK_HAS_CXX11
-#define BENCHMARK_TEMPLATE(func, ...) // Takes any number of parameters.
-#else // C++ < C++11
-#define BENCHMARK_TEMPLATE(func, arg1)
-#endif
-#define BENCHMARK_TEMPLATE1(func, arg1)
-#define BENCHMARK_TEMPLATE2(func, arg1, arg2)
-```
-
-### A Faster KeepRunning loop
-
-In C++11 mode, a ranged-based for loop should be used in preference to
-the `KeepRunning` loop for running the benchmarks. For example:
-
-```c++
-static void BM_Fast(benchmark::State &state) {
-  for (auto _ : state) {
-    FastOperation();
-  }
-}
-BENCHMARK(BM_Fast);
-```
-
-The reason the ranged-for loop is faster than using `KeepRunning`, is
-because `KeepRunning` requires a memory load and store of the iteration count
-ever iteration, whereas the ranged-for variant is able to keep the iteration count
-in a register.
-
-For example, an empty inner loop of using the ranged-based for method looks like:
-
-```asm
-# Loop Init
-  mov rbx, qword ptr [r14 + 104]
-  call benchmark::State::StartKeepRunning()
-  test rbx, rbx
-  je .LoopEnd
-.LoopHeader: # =>This Inner Loop Header: Depth=1
-  add rbx, -1
-  jne .LoopHeader
-.LoopEnd:
-```
-
-Compared to an empty `KeepRunning` loop, which looks like:
-
-```asm
-.LoopHeader: # in Loop: Header=BB0_3 Depth=1
-  cmp byte ptr [rbx], 1
-  jne .LoopInit
-.LoopBody: # =>This Inner Loop Header: Depth=1
-  mov rax, qword ptr [rbx + 8]
-  lea rcx, [rax + 1]
-  mov qword ptr [rbx + 8], rcx
-  cmp rax, qword ptr [rbx + 104]
-  jb .LoopHeader
-  jmp .LoopEnd
-.LoopInit:
-  mov rdi, rbx
-  call benchmark::State::StartKeepRunning()
-  jmp .LoopBody
-.LoopEnd:
-```
-
-Unless C++03 compatibility is required, the ranged-for variant of writing
-the benchmark loop should be preferred.  
-
-## Passing arbitrary arguments to a benchmark
-In C++11 it is possible to define a benchmark that takes an arbitrary number
-of extra arguments. The `BENCHMARK_CAPTURE(func, test_case_name, ...args)`
-macro creates a benchmark that invokes `func`  with the `benchmark::State` as
-the first argument followed by the specified `args...`.
-The `test_case_name` is appended to the name of the benchmark and
-should describe the values passed.
-
-```c++
-template <class ...ExtraArgs>
-void BM_takes_args(benchmark::State& state, ExtraArgs&&... extra_args) {
-  [...]
-}
-// Registers a benchmark named "BM_takes_args/int_string_test" that passes
-// the specified values to `extra_args`.
-BENCHMARK_CAPTURE(BM_takes_args, int_string_test, 42, std::string("abc"));
-```
-Note that elements of `...args` may refer to global variables. Users should
-avoid modifying global state inside of a benchmark.
-
-## Using RegisterBenchmark(name, fn, args...)
-
-The `RegisterBenchmark(name, func, args...)` function provides an alternative
-way to create and register benchmarks.
-`RegisterBenchmark(name, func, args...)` creates, registers, and returns a
-pointer to a new benchmark with the specified `name` that invokes
-`func(st, args...)` where `st` is a `benchmark::State` object.
-
-Unlike the `BENCHMARK` registration macros, which can only be used at the global
-scope, the `RegisterBenchmark` can be called anywhere. This allows for
-benchmark tests to be registered programmatically.
-
-Additionally `RegisterBenchmark` allows any callable object to be registered
-as a benchmark. Including capturing lambdas and function objects.
-
-For Example:
-```c++
-auto BM_test = [](benchmark::State& st, auto Inputs) { /* ... */ };
-
-int main(int argc, char** argv) {
-  for (auto& test_input : { /* ... */ })
-      benchmark::RegisterBenchmark(test_input.name(), BM_test, test_input);
-  benchmark::Initialize(&argc, argv);
-  benchmark::RunSpecifiedBenchmarks();
-}
-```
-
-### Multithreaded benchmarks
-In a multithreaded test (benchmark invoked by multiple threads simultaneously),
-it is guaranteed that none of the threads will start until all have reached
-the start of the benchmark loop, and all will have finished before any thread
-exits the benchmark loop. (This behavior is also provided by the `KeepRunning()`
-API) As such, any global setup or teardown can be wrapped in a check against the thread
-index:
-
-```c++
-static void BM_MultiThreaded(benchmark::State& state) {
-  if (state.thread_index == 0) {
-    // Setup code here.
-  }
-  for (auto _ : state) {
-    // Run the test as normal.
-  }
-  if (state.thread_index == 0) {
-    // Teardown code here.
-  }
-}
-BENCHMARK(BM_MultiThreaded)->Threads(2);
-```
-
-If the benchmarked code itself uses threads and you want to compare it to
-single-threaded code, you may want to use real-time ("wallclock") measurements
-for latency comparisons:
-
-```c++
-BENCHMARK(BM_test)->Range(8, 8<<10)->UseRealTime();
-```
-
-Without `UseRealTime`, CPU time is used by default.
-
-
-## Manual timing
-For benchmarking something for which neither CPU time nor real-time are
-correct or accurate enough, completely manual timing is supported using
-the `UseManualTime` function.
-
-When `UseManualTime` is used, the benchmarked code must call
-`SetIterationTime` once per iteration of the benchmark loop to
-report the manually measured time.
-
-An example use case for this is benchmarking GPU execution (e.g. OpenCL
-or CUDA kernels, OpenGL or Vulkan or Direct3D draw calls), which cannot
-be accurately measured using CPU time or real-time. Instead, they can be
-measured accurately using a dedicated API, and these measurement results
-can be reported back with `SetIterationTime`.
-
-```c++
-static void BM_ManualTiming(benchmark::State& state) {
-  int microseconds = state.range(0);
-  std::chrono::duration<double, std::micro> sleep_duration {
-    static_cast<double>(microseconds)
-  };
-
-  for (auto _ : state) {
-    auto start = std::chrono::high_resolution_clock::now();
-    // Simulate some useful workload with a sleep
-    std::this_thread::sleep_for(sleep_duration);
-    auto end   = std::chrono::high_resolution_clock::now();
-
-    auto elapsed_seconds =
-      std::chrono::duration_cast<std::chrono::duration<double>>(
-        end - start);
-
-    state.SetIterationTime(elapsed_seconds.count());
-  }
-}
-BENCHMARK(BM_ManualTiming)->Range(1, 1<<17)->UseManualTime();
-```
-
-### Preventing optimisation
-To prevent a value or expression from being optimized away by the compiler
-the `benchmark::DoNotOptimize(...)` and `benchmark::ClobberMemory()`
-functions can be used.
-
-```c++
-static void BM_test(benchmark::State& state) {
-  for (auto _ : state) {
-      int x = 0;
-      for (int i=0; i < 64; ++i) {
-        benchmark::DoNotOptimize(x += i);
-      }
-  }
-}
-```
-
-`DoNotOptimize(<expr>)` forces the  *result* of `<expr>` to be stored in either
-memory or a register. For GNU based compilers it acts as read/write barrier
-for global memory. More specifically it forces the compiler to flush pending
-writes to memory and reload any other values as necessary.
-
-Note that `DoNotOptimize(<expr>)` does not prevent optimizations on `<expr>`
-in any way. `<expr>` may even be removed entirely when the result is already
-known. For example:
-
-```c++
-  /* Example 1: `<expr>` is removed entirely. */
-  int foo(int x) { return x + 42; }
-  while (...) DoNotOptimize(foo(0)); // Optimized to DoNotOptimize(42);
-
-  /*  Example 2: Result of '<expr>' is only reused */
-  int bar(int) __attribute__((const));
-  while (...) DoNotOptimize(bar(0)); // Optimized to:
-  // int __result__ = bar(0);
-  // while (...) DoNotOptimize(__result__);
-```
-
-The second tool for preventing optimizations is `ClobberMemory()`. In essence
-`ClobberMemory()` forces the compiler to perform all pending writes to global
-memory. Memory managed by block scope objects must be "escaped" using
-`DoNotOptimize(...)` before it can be clobbered. In the below example
-`ClobberMemory()` prevents the call to `v.push_back(42)` from being optimized
-away.
-
-```c++
-static void BM_vector_push_back(benchmark::State& state) {
-  for (auto _ : state) {
-    std::vector<int> v;
-    v.reserve(1);
-    benchmark::DoNotOptimize(v.data()); // Allow v.data() to be clobbered.
-    v.push_back(42);
-    benchmark::ClobberMemory(); // Force 42 to be written to memory.
-  }
-}
-```
-
-Note that `ClobberMemory()` is only available for GNU or MSVC based compilers.
-
-### Set time unit manually
-If a benchmark runs a few milliseconds it may be hard to visually compare the
-measured times, since the output data is given in nanoseconds per default. In
-order to manually set the time unit, you can specify it manually:
-
-```c++
-BENCHMARK(BM_test)->Unit(benchmark::kMillisecond);
-```
-
-## Controlling number of iterations
-In all cases, the number of iterations for which the benchmark is run is
-governed by the amount of time the benchmark takes. Concretely, the number of
-iterations is at least one, not more than 1e9, until CPU time is greater than
-the minimum time, or the wallclock time is 5x minimum time. The minimum time is
-set as a flag `--benchmark_min_time` or per benchmark by calling `MinTime` on
-the registered benchmark object.
-
-## Reporting the mean, median and standard deviation by repeated benchmarks
-By default each benchmark is run once and that single result is reported.
-However benchmarks are often noisy and a single result may not be representative
-of the overall behavior. For this reason it's possible to repeatedly rerun the
-benchmark.
-
-The number of runs of each benchmark is specified globally by the
-`--benchmark_repetitions` flag or on a per benchmark basis by calling
-`Repetitions` on the registered benchmark object. When a benchmark is run more
-than once the mean, median and standard deviation of the runs will be reported.
-
-Additionally the `--benchmark_report_aggregates_only={true|false}` flag or
-`ReportAggregatesOnly(bool)` function can be used to change how repeated tests
-are reported. By default the result of each repeated run is reported. When this
-option is `true` only the mean, median and standard deviation of the runs is reported.
-Calling `ReportAggregatesOnly(bool)` on a registered benchmark object overrides
-the value of the flag for that benchmark.
-
-## User-defined statistics for repeated benchmarks
-While having mean, median and standard deviation is nice, this may not be
-enough for everyone. For example you may want to know what is the largest
-observation, e.g. because you have some real-time constraints. This is easy.
-The following code will specify a custom statistic to be calculated, defined
-by a lambda function.
-
-```c++
-void BM_spin_empty(benchmark::State& state) {
-  for (auto _ : state) {
-    for (int x = 0; x < state.range(0); ++x) {
-      benchmark::DoNotOptimize(x);
-    }
-  }
-}
-
-BENCHMARK(BM_spin_empty)
-  ->ComputeStatistics("max", [](const std::vector<double>& v) -> double {
-    return *(std::max_element(std::begin(v), std::end(v)));
-  })
-  ->Arg(512);
-```
-
-## Fixtures
-Fixture tests are created by
-first defining a type that derives from `::benchmark::Fixture` and then
-creating/registering the tests using the following macros:
-
-* `BENCHMARK_F(ClassName, Method)`
-* `BENCHMARK_DEFINE_F(ClassName, Method)`
-* `BENCHMARK_REGISTER_F(ClassName, Method)`
-
-For Example:
-
-```c++
-class MyFixture : public benchmark::Fixture {};
-
-BENCHMARK_F(MyFixture, FooTest)(benchmark::State& st) {
-   for (auto _ : st) {
-     ...
-  }
-}
-
-BENCHMARK_DEFINE_F(MyFixture, BarTest)(benchmark::State& st) {
-   for (auto _ : st) {
-     ...
-  }
-}
-/* BarTest is NOT registered */
-BENCHMARK_REGISTER_F(MyFixture, BarTest)->Threads(2);
-/* BarTest is now registered */
-```
-
-### Templated fixtures
-Also you can create templated fixture by using the following macros:
-
-* `BENCHMARK_TEMPLATE_F(ClassName, Method, ...)`
-* `BENCHMARK_TEMPLATE_DEFINE_F(ClassName, Method, ...)`
-
-For example:
-```c++
-template<typename T>
-class MyFixture : public benchmark::Fixture {};
-
-BENCHMARK_TEMPLATE_F(MyFixture, IntTest, int)(benchmark::State& st) {
-   for (auto _ : st) {
-     ...
-  }
-}
-
-BENCHMARK_TEMPLATE_DEFINE_F(MyFixture, DoubleTest, double)(benchmark::State& st) {
-   for (auto _ : st) {
-     ...
-  }
-}
-
-BENCHMARK_REGISTER_F(MyFixture, DoubleTest)->Threads(2);
-```
-
-## User-defined counters
-
-You can add your own counters with user-defined names. The example below
-will add columns "Foo", "Bar" and "Baz" in its output:
-
-```c++
-static void UserCountersExample1(benchmark::State& state) {
-  double numFoos = 0, numBars = 0, numBazs = 0;
-  for (auto _ : state) {
-    // ... count Foo,Bar,Baz events
-  }
-  state.counters["Foo"] = numFoos;
-  state.counters["Bar"] = numBars;
-  state.counters["Baz"] = numBazs;
-}
-```
-
-The `state.counters` object is a `std::map` with `std::string` keys
-and `Counter` values. The latter is a `double`-like class, via an implicit
-conversion to `double&`. Thus you can use all of the standard arithmetic
-assignment operators (`=,+=,-=,*=,/=`) to change the value of each counter.
-
-In multithreaded benchmarks, each counter is set on the calling thread only.
-When the benchmark finishes, the counters from each thread will be summed;
-the resulting sum is the value which will be shown for the benchmark.
-
-The `Counter` constructor accepts two parameters: the value as a `double`
-and a bit flag which allows you to show counters as rates and/or as
-per-thread averages:
-
-```c++
-  // sets a simple counter
-  state.counters["Foo"] = numFoos;
-
-  // Set the counter as a rate. It will be presented divided
-  // by the duration of the benchmark.
-  state.counters["FooRate"] = Counter(numFoos, benchmark::Counter::kIsRate);
-
-  // Set the counter as a thread-average quantity. It will
-  // be presented divided by the number of threads.
-  state.counters["FooAvg"] = Counter(numFoos, benchmark::Counter::kAvgThreads);
-
-  // There's also a combined flag:
-  state.counters["FooAvgRate"] = Counter(numFoos,benchmark::Counter::kAvgThreadsRate);
-```
-
-When you're compiling in C++11 mode or later you can use `insert()` with
-`std::initializer_list`:
-
-```c++
-  // With C++11, this can be done:
-  state.counters.insert({{"Foo", numFoos}, {"Bar", numBars}, {"Baz", numBazs}});
-  // ... instead of:
-  state.counters["Foo"] = numFoos;
-  state.counters["Bar"] = numBars;
-  state.counters["Baz"] = numBazs;
-```
-
-### Counter reporting
-
-When using the console reporter, by default, user counters are are printed at
-the end after the table, the same way as ``bytes_processed`` and
-``items_processed``. This is best for cases in which there are few counters,
-or where there are only a couple of lines per benchmark. Here's an example of
-the default output:
-
-```
-------------------------------------------------------------------------------
-Benchmark                        Time           CPU Iterations UserCounters...
-------------------------------------------------------------------------------
-BM_UserCounter/threads:8      2248 ns      10277 ns      68808 Bar=16 Bat=40 Baz=24 Foo=8
-BM_UserCounter/threads:1      9797 ns       9788 ns      71523 Bar=2 Bat=5 Baz=3 Foo=1024m
-BM_UserCounter/threads:2      4924 ns       9842 ns      71036 Bar=4 Bat=10 Baz=6 Foo=2
-BM_UserCounter/threads:4      2589 ns      10284 ns      68012 Bar=8 Bat=20 Baz=12 Foo=4
-BM_UserCounter/threads:8      2212 ns      10287 ns      68040 Bar=16 Bat=40 Baz=24 Foo=8
-BM_UserCounter/threads:16     1782 ns      10278 ns      68144 Bar=32 Bat=80 Baz=48 Foo=16
-BM_UserCounter/threads:32     1291 ns      10296 ns      68256 Bar=64 Bat=160 Baz=96 Foo=32
-BM_UserCounter/threads:4      2615 ns      10307 ns      68040 Bar=8 Bat=20 Baz=12 Foo=4
-BM_Factorial                    26 ns         26 ns   26608979 40320
-BM_Factorial/real_time          26 ns         26 ns   26587936 40320
-BM_CalculatePiRange/1           16 ns         16 ns   45704255 0
-BM_CalculatePiRange/8           73 ns         73 ns    9520927 3.28374
-BM_CalculatePiRange/64         609 ns        609 ns    1140647 3.15746
-BM_CalculatePiRange/512       4900 ns       4901 ns     142696 3.14355
-```
-
-If this doesn't suit you, you can print each counter as a table column by
-passing the flag `--benchmark_counters_tabular=true` to the benchmark
-application. This is best for cases in which there are a lot of counters, or
-a lot of lines per individual benchmark. Note that this will trigger a
-reprinting of the table header any time the counter set changes between
-individual benchmarks. Here's an example of corresponding output when
-`--benchmark_counters_tabular=true` is passed:
-
-```
----------------------------------------------------------------------------------------
-Benchmark                        Time           CPU Iterations    Bar   Bat   Baz   Foo
----------------------------------------------------------------------------------------
-BM_UserCounter/threads:8      2198 ns       9953 ns      70688     16    40    24     8
-BM_UserCounter/threads:1      9504 ns       9504 ns      73787      2     5     3     1
-BM_UserCounter/threads:2      4775 ns       9550 ns      72606      4    10     6     2
-BM_UserCounter/threads:4      2508 ns       9951 ns      70332      8    20    12     4
-BM_UserCounter/threads:8      2055 ns       9933 ns      70344     16    40    24     8
-BM_UserCounter/threads:16     1610 ns       9946 ns      70720     32    80    48    16
-BM_UserCounter/threads:32     1192 ns       9948 ns      70496     64   160    96    32
-BM_UserCounter/threads:4      2506 ns       9949 ns      70332      8    20    12     4
---------------------------------------------------------------
-Benchmark                        Time           CPU Iterations
---------------------------------------------------------------
-BM_Factorial                    26 ns         26 ns   26392245 40320
-BM_Factorial/real_time          26 ns         26 ns   26494107 40320
-BM_CalculatePiRange/1           15 ns         15 ns   45571597 0
-BM_CalculatePiRange/8           74 ns         74 ns    9450212 3.28374
-BM_CalculatePiRange/64         595 ns        595 ns    1173901 3.15746
-BM_CalculatePiRange/512       4752 ns       4752 ns     147380 3.14355
-BM_CalculatePiRange/4k       37970 ns      37972 ns      18453 3.14184
-BM_CalculatePiRange/32k     303733 ns     303744 ns       2305 3.14162
-BM_CalculatePiRange/256k   2434095 ns    2434186 ns        288 3.1416
-BM_CalculatePiRange/1024k  9721140 ns    9721413 ns         71 3.14159
-BM_CalculatePi/threads:8      2255 ns       9943 ns      70936
-```
-Note above the additional header printed when the benchmark changes from
-``BM_UserCounter`` to ``BM_Factorial``. This is because ``BM_Factorial`` does
-not have the same counter set as ``BM_UserCounter``.
-
-## Exiting Benchmarks in Error
-
-When errors caused by external influences, such as file I/O and network
-communication, occur within a benchmark the
-`State::SkipWithError(const char* msg)` function can be used to skip that run
-of benchmark and report the error. Note that only future iterations of the
-`KeepRunning()` are skipped. For the ranged-for version of the benchmark loop
-Users must explicitly exit the loop, otherwise all iterations will be performed.
-Users may explicitly return to exit the benchmark immediately.
-
-The `SkipWithError(...)` function may be used at any point within the benchmark,
-including before and after the benchmark loop.
-
-For example:
-
-```c++
-static void BM_test(benchmark::State& state) {
-  auto resource = GetResource();
-  if (!resource.good()) {
-      state.SkipWithError("Resource is not good!");
-      // KeepRunning() loop will not be entered.
-  }
-  for (state.KeepRunning()) {
-      auto data = resource.read_data();
-      if (!resource.good()) {
-        state.SkipWithError("Failed to read data!");
-        break; // Needed to skip the rest of the iteration.
-     }
-     do_stuff(data);
-  }
-}
-
-static void BM_test_ranged_fo(benchmark::State & state) {
-  state.SkipWithError("test will not be entered");
-  for (auto _ : state) {
-    state.SkipWithError("Failed!");
-    break; // REQUIRED to prevent all further iterations.
-  }
-}
-```
-
-## Running a subset of the benchmarks
-
-The `--benchmark_filter=<regex>` option can be used to only run the benchmarks
-which match the specified `<regex>`. For example:
-
-```bash
-$ ./run_benchmarks.x --benchmark_filter=BM_memcpy/32
-Run on (1 X 2300 MHz CPU )
-2016-06-25 19:34:24
-Benchmark              Time           CPU Iterations
-----------------------------------------------------
-BM_memcpy/32          11 ns         11 ns   79545455
-BM_memcpy/32k       2181 ns       2185 ns     324074
-BM_memcpy/32          12 ns         12 ns   54687500
-BM_memcpy/32k       1834 ns       1837 ns     357143
-```
-
-
-## Output Formats
-The library supports multiple output formats. Use the
-`--benchmark_format=<console|json|csv>` flag to set the format type. `console`
-is the default format.
-
-The Console format is intended to be a human readable format. By default
-the format generates color output. Context is output on stderr and the
-tabular data on stdout. Example tabular output looks like:
-```
-Benchmark                               Time(ns)    CPU(ns) Iterations
-----------------------------------------------------------------------
-BM_SetInsert/1024/1                        28928      29349      23853  133.097kB/s   33.2742k items/s
-BM_SetInsert/1024/8                        32065      32913      21375  949.487kB/s   237.372k items/s
-BM_SetInsert/1024/10                       33157      33648      21431  1.13369MB/s   290.225k items/s
-```
-
-The JSON format outputs human readable json split into two top level attributes.
-The `context` attribute contains information about the run in general, including
-information about the CPU and the date.
-The `benchmarks` attribute contains a list of every benchmark run. Example json
-output looks like:
-```json
-{
-  "context": {
-    "date": "2015/03/17-18:40:25",
-    "num_cpus": 40,
-    "mhz_per_cpu": 2801,
-    "cpu_scaling_enabled": false,
-    "build_type": "debug"
-  },
-  "benchmarks": [
-    {
-      "name": "BM_SetInsert/1024/1",
-      "iterations": 94877,
-      "real_time": 29275,
-      "cpu_time": 29836,
-      "bytes_per_second": 134066,
-      "items_per_second": 33516
-    },
-    {
-      "name": "BM_SetInsert/1024/8",
-      "iterations": 21609,
-      "real_time": 32317,
-      "cpu_time": 32429,
-      "bytes_per_second": 986770,
-      "items_per_second": 246693
-    },
-    {
-      "name": "BM_SetInsert/1024/10",
-      "iterations": 21393,
-      "real_time": 32724,
-      "cpu_time": 33355,
-      "bytes_per_second": 1199226,
-      "items_per_second": 299807
-    }
-  ]
-}
-```
-
-The CSV format outputs comma-separated values. The `context` is output on stderr
-and the CSV itself on stdout. Example CSV output looks like:
-```
-name,iterations,real_time,cpu_time,bytes_per_second,items_per_second,label
-"BM_SetInsert/1024/1",65465,17890.7,8407.45,475768,118942,
-"BM_SetInsert/1024/8",116606,18810.1,9766.64,3.27646e+06,819115,
-"BM_SetInsert/1024/10",106365,17238.4,8421.53,4.74973e+06,1.18743e+06,
-```
-
-## Output Files
-The library supports writing the output of the benchmark to a file specified
-by `--benchmark_out=<filename>`. The format of the output can be specified
-using `--benchmark_out_format={json|console|csv}`. Specifying
-`--benchmark_out` does not suppress the console output.
-
-## Debug vs Release
-By default, benchmark builds as a debug library. You will see a warning in the output when this is the case. To build it as a release library instead, use:
-
-```
-cmake -DCMAKE_BUILD_TYPE=Release
-```
-
-To enable link-time optimisation, use
-
-```
-cmake -DCMAKE_BUILD_TYPE=Release -DBENCHMARK_ENABLE_LTO=true
-```
-
-If you are using gcc, you might need to set `GCC_AR` and `GCC_RANLIB` cmake cache variables, if autodetection fails.
-If you are using clang, you may need to set `LLVMAR_EXECUTABLE`, `LLVMNM_EXECUTABLE` and `LLVMRANLIB_EXECUTABLE` cmake cache variables.
-
-## Linking against the library
-
-When the library is built using GCC it is necessary to link with `-pthread`,
-due to how GCC implements `std::thread`.
-
-For GCC 4.x failing to link to pthreads will lead to runtime exceptions, not linker errors.
-See [issue #67](https://github.com/google/benchmark/issues/67) for more details.
-
-## Compiler Support
-
-Google Benchmark uses C++11 when building the library. As such we require
-a modern C++ toolchain, both compiler and standard library.
-
-The following minimum versions are strongly recommended build the library:
-
-* GCC 4.8
-* Clang 3.4
-* Visual Studio 2013
-* Intel 2015 Update 1
-
-Anything older *may* work.
-
-Note: Using the library and its headers in C++03 is supported. C++11 is only
-required to build the library.
-
-## Disable CPU frequency scaling
-If you see this error:
-```
-***WARNING*** CPU scaling is enabled, the benchmark real time measurements may be noisy and will incur extra overhead.
-```
-you might want to disable the CPU frequency scaling while running the benchmark:
-```bash
-sudo cpupower frequency-set --governor performance
-./mybench
-sudo cpupower frequency-set --governor powersave
-```
-
-# Known Issues
-
-### Windows with CMake
-
-* Users must manually link `shlwapi.lib`. Failure to do so may result
-in unresolved symbols.
-
-### Solaris
-
-* Users must explicitly link with kstat library (-lkstat compilation flag).
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/WORKSPACE b/external_imported/json/benchmarks/thirdparty/benchmark/WORKSPACE
deleted file mode 100755
index 54734f1ea..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/WORKSPACE
+++ /dev/null
@@ -1,7 +0,0 @@
-workspace(name = "com_github_google_benchmark")
-
-http_archive(
-     name = "com_google_googletest",
-     urls = ["https://github.com/google/googletest/archive/3f0cf6b62ad1eb50d8736538363d3580dd640c3e.zip"],
-     strip_prefix = "googletest-3f0cf6b62ad1eb50d8736538363d3580dd640c3e",
-)
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/appveyor.yml b/external_imported/json/benchmarks/thirdparty/benchmark/appveyor.yml
deleted file mode 100755
index e99c6e77f..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/appveyor.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-version: '{build}'
-
-image: Visual Studio 2017
-
-configuration:
-  - Debug
-  - Release
-
-environment:
-  matrix:
-    - compiler: msvc-15-seh
-      generator: "Visual Studio 15 2017"
-
-    - compiler: msvc-15-seh
-      generator: "Visual Studio 15 2017 Win64"
-
-    - compiler: msvc-14-seh
-      generator: "Visual Studio 14 2015"
-
-    - compiler: msvc-14-seh
-      generator: "Visual Studio 14 2015 Win64"
-
-    - compiler: msvc-12-seh
-      generator: "Visual Studio 12 2013"
-
-    - compiler: msvc-12-seh
-      generator: "Visual Studio 12 2013 Win64"
-
-    - compiler: gcc-5.3.0-posix
-      generator: "MinGW Makefiles"
-      cxx_path: 'C:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0\mingw32\bin'
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-
-matrix:
-  fast_finish: true
-
-install:
-  # git bash conflicts with MinGW makefiles
-  - if "%generator%"=="MinGW Makefiles" (set "PATH=%PATH:C:\Program Files\Git\usr\bin;=%")
-  - if not "%cxx_path%"=="" (set "PATH=%PATH%;%cxx_path%")
-
-build_script:
-  - md _build -Force
-  - cd _build
-  - echo %configuration%
-  - cmake -G "%generator%" "-DCMAKE_BUILD_TYPE=%configuration%" -DBENCHMARK_DOWNLOAD_DEPENDENCIES=ON ..
-  - cmake --build . --config %configuration%
-
-test_script:
-  - ctest -c %configuration% --timeout 300 --output-on-failure
-
-artifacts:
-  - path: '_build/CMakeFiles/*.log'
-    name: logs
-  - path: '_build/Testing/**/*.xml'
-    name: test_results
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/cmake/AddCXXCompilerFlag.cmake b/external_imported/json/benchmarks/thirdparty/benchmark/cmake/AddCXXCompilerFlag.cmake
deleted file mode 100755
index d0d209981..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/cmake/AddCXXCompilerFlag.cmake
+++ /dev/null
@@ -1,74 +0,0 @@
-# - Adds a compiler flag if it is supported by the compiler
-#
-# This function checks that the supplied compiler flag is supported and then
-# adds it to the corresponding compiler flags
-#
-#  add_cxx_compiler_flag(<FLAG> [<VARIANT>])
-#
-# - Example
-#
-# include(AddCXXCompilerFlag)
-# add_cxx_compiler_flag(-Wall)
-# add_cxx_compiler_flag(-no-strict-aliasing RELEASE)
-# Requires CMake 2.6+
-
-if(__add_cxx_compiler_flag)
-  return()
-endif()
-set(__add_cxx_compiler_flag INCLUDED)
-
-include(CheckCXXCompilerFlag)
-
-function(mangle_compiler_flag FLAG OUTPUT)
-  string(TOUPPER "HAVE_CXX_FLAG_${FLAG}" SANITIZED_FLAG)
-  string(REPLACE "+" "X" SANITIZED_FLAG ${SANITIZED_FLAG})
-  string(REGEX REPLACE "[^A-Za-z_0-9]" "_" SANITIZED_FLAG ${SANITIZED_FLAG})
-  string(REGEX REPLACE "_+" "_" SANITIZED_FLAG ${SANITIZED_FLAG})
-  set(${OUTPUT} "${SANITIZED_FLAG}" PARENT_SCOPE)
-endfunction(mangle_compiler_flag)
-
-function(add_cxx_compiler_flag FLAG)
-  mangle_compiler_flag("${FLAG}" MANGLED_FLAG)
-  set(OLD_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
-  set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${FLAG}")
-  check_cxx_compiler_flag("${FLAG}" ${MANGLED_FLAG})
-  set(CMAKE_REQUIRED_FLAGS "${OLD_CMAKE_REQUIRED_FLAGS}")
-  if(${MANGLED_FLAG})
-    set(VARIANT ${ARGV1})
-    if(ARGV1)
-      string(TOUPPER "_${VARIANT}" VARIANT)
-    endif()
-    set(CMAKE_CXX_FLAGS${VARIANT} "${CMAKE_CXX_FLAGS${VARIANT}} ${BENCHMARK_CXX_FLAGS${VARIANT}} ${FLAG}" PARENT_SCOPE)
-  endif()
-endfunction()
-
-function(add_required_cxx_compiler_flag FLAG)
-  mangle_compiler_flag("${FLAG}" MANGLED_FLAG)
-  set(OLD_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
-  set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${FLAG}")
-  check_cxx_compiler_flag("${FLAG}" ${MANGLED_FLAG})
-  set(CMAKE_REQUIRED_FLAGS "${OLD_CMAKE_REQUIRED_FLAGS}")
-  if(${MANGLED_FLAG})
-    set(VARIANT ${ARGV1})
-    if(ARGV1)
-      string(TOUPPER "_${VARIANT}" VARIANT)
-    endif()
-    set(CMAKE_CXX_FLAGS${VARIANT} "${CMAKE_CXX_FLAGS${VARIANT}} ${FLAG}" PARENT_SCOPE)
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${FLAG}" PARENT_SCOPE)
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${FLAG}" PARENT_SCOPE)
-    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${FLAG}" PARENT_SCOPE)
-    set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${FLAG}" PARENT_SCOPE)
-  else()
-    message(FATAL_ERROR "Required flag '${FLAG}' is not supported by the compiler")
-  endif()
-endfunction()
-
-function(check_cxx_warning_flag FLAG)
-  mangle_compiler_flag("${FLAG}" MANGLED_FLAG)
-  set(OLD_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
-  # Add -Werror to ensure the compiler generates an error if the warning flag
-  # doesn't exist.
-  set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -Werror ${FLAG}")
-  check_cxx_compiler_flag("${FLAG}" ${MANGLED_FLAG})
-  set(CMAKE_REQUIRED_FLAGS "${OLD_CMAKE_REQUIRED_FLAGS}")
-endfunction()
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/cmake/CXXFeatureCheck.cmake b/external_imported/json/benchmarks/thirdparty/benchmark/cmake/CXXFeatureCheck.cmake
deleted file mode 100755
index c4c4d660f..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/cmake/CXXFeatureCheck.cmake
+++ /dev/null
@@ -1,64 +0,0 @@
-# - Compile and run code to check for C++ features
-#
-# This functions compiles a source file under the `cmake` folder
-# and adds the corresponding `HAVE_[FILENAME]` flag to the CMake
-# environment
-#
-#  cxx_feature_check(<FLAG> [<VARIANT>])
-#
-# - Example
-#
-# include(CXXFeatureCheck)
-# cxx_feature_check(STD_REGEX)
-# Requires CMake 2.8.12+
-
-if(__cxx_feature_check)
-  return()
-endif()
-set(__cxx_feature_check INCLUDED)
-
-function(cxx_feature_check FILE)
-  string(TOLOWER ${FILE} FILE)
-  string(TOUPPER ${FILE} VAR)
-  string(TOUPPER "HAVE_${VAR}" FEATURE)
-  if (DEFINED HAVE_${VAR})
-    set(HAVE_${VAR} 1 PARENT_SCOPE)
-    add_definitions(-DHAVE_${VAR})
-    return()
-  endif()
-
-  if (NOT DEFINED COMPILE_${FEATURE})
-    message("-- Performing Test ${FEATURE}")
-    if(CMAKE_CROSSCOMPILING)
-      try_compile(COMPILE_${FEATURE}
-              ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/${FILE}.cpp
-              CMAKE_FLAGS ${BENCHMARK_CXX_LINKER_FLAGS}
-              LINK_LIBRARIES ${BENCHMARK_CXX_LIBRARIES})
-      if(COMPILE_${FEATURE})
-        message(WARNING
-              "If you see build failures due to cross compilation, try setting HAVE_${VAR} to 0")
-        set(RUN_${FEATURE} 0)
-      else()
-        set(RUN_${FEATURE} 1)
-      endif()
-    else()
-      message("-- Performing Test ${FEATURE}")
-      try_run(RUN_${FEATURE} COMPILE_${FEATURE}
-              ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/${FILE}.cpp
-              CMAKE_FLAGS ${BENCHMARK_CXX_LINKER_FLAGS}
-              LINK_LIBRARIES ${BENCHMARK_CXX_LIBRARIES})
-    endif()
-  endif()
-
-  if(RUN_${FEATURE} EQUAL 0)
-    message("-- Performing Test ${FEATURE} -- success")
-    set(HAVE_${VAR} 1 PARENT_SCOPE)
-    add_definitions(-DHAVE_${VAR})
-  else()
-    if(NOT COMPILE_${FEATURE})
-      message("-- Performing Test ${FEATURE} -- failed to compile")
-    else()
-      message("-- Performing Test ${FEATURE} -- compiled but failed to run")
-    endif()
-  endif()
-endfunction()
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/cmake/Config.cmake.in b/external_imported/json/benchmarks/thirdparty/benchmark/cmake/Config.cmake.in
deleted file mode 100755
index 6e9256eea..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/cmake/Config.cmake.in
+++ /dev/null
@@ -1 +0,0 @@
-include("${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake")
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/cmake/GetGitVersion.cmake b/external_imported/json/benchmarks/thirdparty/benchmark/cmake/GetGitVersion.cmake
deleted file mode 100755
index 88cebe3a1..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/cmake/GetGitVersion.cmake
+++ /dev/null
@@ -1,54 +0,0 @@
-# - Returns a version string from Git tags
-#
-# This function inspects the annotated git tags for the project and returns a string
-# into a CMake variable
-#
-#  get_git_version(<var>)
-#
-# - Example
-#
-# include(GetGitVersion)
-# get_git_version(GIT_VERSION)
-#
-# Requires CMake 2.8.11+
-find_package(Git)
-
-if(__get_git_version)
-  return()
-endif()
-set(__get_git_version INCLUDED)
-
-function(get_git_version var)
-  if(GIT_EXECUTABLE)
-      execute_process(COMMAND ${GIT_EXECUTABLE} describe --match "v[0-9]*.[0-9]*.[0-9]*" --abbrev=8
-          WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-          RESULT_VARIABLE status
-          OUTPUT_VARIABLE GIT_VERSION
-          ERROR_QUIET)
-      if(${status})
-          set(GIT_VERSION "v0.0.0")
-      else()
-          string(STRIP ${GIT_VERSION} GIT_VERSION)
-          string(REGEX REPLACE "-[0-9]+-g" "-" GIT_VERSION ${GIT_VERSION})
-      endif()
-
-      # Work out if the repository is dirty
-      execute_process(COMMAND ${GIT_EXECUTABLE} update-index -q --refresh
-          WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-          OUTPUT_QUIET
-          ERROR_QUIET)
-      execute_process(COMMAND ${GIT_EXECUTABLE} diff-index --name-only HEAD --
-          WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-          OUTPUT_VARIABLE GIT_DIFF_INDEX
-          ERROR_QUIET)
-      string(COMPARE NOTEQUAL "${GIT_DIFF_INDEX}" "" GIT_DIRTY)
-      if (${GIT_DIRTY})
-          set(GIT_VERSION "${GIT_VERSION}-dirty")
-      endif()
-  else()
-      set(GIT_VERSION "v0.0.0")
-  endif()
-
-  message("-- git Version: ${GIT_VERSION}")
-  set(${var} ${GIT_VERSION} PARENT_SCOPE)
-endfunction()
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/cmake/HandleGTest.cmake b/external_imported/json/benchmarks/thirdparty/benchmark/cmake/HandleGTest.cmake
deleted file mode 100755
index 7ce1a633d..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/cmake/HandleGTest.cmake
+++ /dev/null
@@ -1,113 +0,0 @@
-
-include(split_list)
-
-macro(build_external_gtest)
-  include(ExternalProject)
-  set(GTEST_FLAGS "")
-  if (BENCHMARK_USE_LIBCXX)
-    if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-      list(APPEND GTEST_FLAGS -stdlib=libc++)
-    else()
-      message(WARNING "Unsupported compiler (${CMAKE_CXX_COMPILER}) when using libc++")
-    endif()
-  endif()
-  if (BENCHMARK_BUILD_32_BITS)
-    list(APPEND GTEST_FLAGS -m32)
-  endif()
-  if (NOT "${CMAKE_CXX_FLAGS}" STREQUAL "")
-    list(APPEND GTEST_FLAGS ${CMAKE_CXX_FLAGS})
-  endif()
-  string(TOUPPER "${CMAKE_BUILD_TYPE}" GTEST_BUILD_TYPE)
-  if ("${GTEST_BUILD_TYPE}" STREQUAL "COVERAGE")
-    set(GTEST_BUILD_TYPE "DEBUG")
-  endif()
-  # FIXME: Since 10/Feb/2017 the googletest trunk has had a bug where
-  # -Werror=unused-function fires during the build on OS X. This is a temporary
-  # workaround to keep our travis bots from failing. It should be removed
-  # once gtest is fixed.
-  if (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-    list(APPEND GTEST_FLAGS "-Wno-unused-function")
-  endif()
-  split_list(GTEST_FLAGS)
-  set(EXCLUDE_FROM_ALL_OPT "")
-  set(EXCLUDE_FROM_ALL_VALUE "")
-  if (${CMAKE_VERSION} VERSION_GREATER "3.0.99")
-      set(EXCLUDE_FROM_ALL_OPT "EXCLUDE_FROM_ALL")
-      set(EXCLUDE_FROM_ALL_VALUE "ON")
-  endif()
-  ExternalProject_Add(googletest
-      ${EXCLUDE_FROM_ALL_OPT} ${EXCLUDE_FROM_ALL_VALUE}
-      GIT_REPOSITORY https://github.com/google/googletest.git
-      GIT_TAG master
-      PREFIX "${CMAKE_BINARY_DIR}/googletest"
-      INSTALL_DIR "${CMAKE_BINARY_DIR}/googletest"
-      CMAKE_CACHE_ARGS
-        -DCMAKE_BUILD_TYPE:STRING=${GTEST_BUILD_TYPE}
-        -DCMAKE_C_COMPILER:STRING=${CMAKE_C_COMPILER}
-        -DCMAKE_CXX_COMPILER:STRING=${CMAKE_CXX_COMPILER}
-        -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-        -DCMAKE_INSTALL_LIBDIR:PATH=<INSTALL_DIR>/lib
-        -DCMAKE_CXX_FLAGS:STRING=${GTEST_FLAGS}
-        -Dgtest_force_shared_crt:BOOL=ON
-      )
-
-  ExternalProject_Get_Property(googletest install_dir)
-  set(GTEST_INCLUDE_DIRS ${install_dir}/include)
-  file(MAKE_DIRECTORY ${GTEST_INCLUDE_DIRS})
-
-  set(LIB_SUFFIX "${CMAKE_STATIC_LIBRARY_SUFFIX}")
-  set(LIB_PREFIX "${CMAKE_STATIC_LIBRARY_PREFIX}")
-  if("${GTEST_BUILD_TYPE}" STREQUAL "DEBUG")
-    set(LIB_SUFFIX "d${CMAKE_STATIC_LIBRARY_SUFFIX}")
-  endif()
-
-  # Use gmock_main instead of gtest_main because it initializes gtest as well.
-  # Note: The libraries are listed in reverse order of their dependancies.
-  foreach(LIB gtest gmock gmock_main)
-    add_library(${LIB} UNKNOWN IMPORTED)
-    set_target_properties(${LIB} PROPERTIES
-      IMPORTED_LOCATION ${install_dir}/lib/${LIB_PREFIX}${LIB}${LIB_SUFFIX}
-      INTERFACE_INCLUDE_DIRECTORIES ${GTEST_INCLUDE_DIRS}
-      INTERFACE_LINK_LIBRARIES "${GTEST_BOTH_LIBRARIES}"
-    )
-    add_dependencies(${LIB} googletest)
-    list(APPEND GTEST_BOTH_LIBRARIES ${LIB})
-  endforeach()
-endmacro(build_external_gtest)
-
-if (BENCHMARK_ENABLE_GTEST_TESTS)
-  if (IS_DIRECTORY ${CMAKE_SOURCE_DIR}/googletest)
-    set(GTEST_ROOT "${CMAKE_SOURCE_DIR}/googletest")
-    set(INSTALL_GTEST OFF CACHE INTERNAL "")
-    set(INSTALL_GMOCK OFF CACHE INTERNAL "")
-    add_subdirectory(${CMAKE_SOURCE_DIR}/googletest)
-    set(GTEST_BOTH_LIBRARIES gtest gmock gmock_main)
-    foreach(HEADER test mock)
-      # CMake 2.8 and older don't respect INTERFACE_INCLUDE_DIRECTORIES, so we
-      # have to add the paths ourselves.
-      set(HFILE g${HEADER}/g${HEADER}.h)
-      set(HPATH ${GTEST_ROOT}/google${HEADER}/include)
-      find_path(HEADER_PATH_${HEADER} ${HFILE}
-          NO_DEFAULT_PATHS
-          HINTS ${HPATH}
-      )
-      if (NOT HEADER_PATH_${HEADER})
-        message(FATAL_ERROR "Failed to find header ${HFILE} in ${HPATH}")
-      endif()
-      list(APPEND GTEST_INCLUDE_DIRS ${HEADER_PATH_${HEADER}})
-    endforeach()
-  elseif(BENCHMARK_DOWNLOAD_DEPENDENCIES)
-    build_external_gtest()
-  else()
-    find_package(GTest REQUIRED)
-    find_path(GMOCK_INCLUDE_DIRS gmock/gmock.h
-        HINTS ${GTEST_INCLUDE_DIRS})
-    if (NOT GMOCK_INCLUDE_DIRS)
-      message(FATAL_ERROR "Failed to find header gmock/gmock.h with hint ${GTEST_INCLUDE_DIRS}")
-    endif()
-    set(GTEST_INCLUDE_DIRS ${GTEST_INCLUDE_DIRS} ${GMOCK_INCLUDE_DIRS})
-    # FIXME: We don't currently require the gmock library to build the tests,
-    # and it's likely we won't find it, so we don't try. As long as we've
-    # found the gmock/gmock.h header and gtest_main that should be good enough.
-  endif()
-endif()
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/cmake/Modules/FindLLVMAr.cmake b/external_imported/json/benchmarks/thirdparty/benchmark/cmake/Modules/FindLLVMAr.cmake
deleted file mode 100755
index 23469813c..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/cmake/Modules/FindLLVMAr.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-include(FeatureSummary)
-
-find_program(LLVMAR_EXECUTABLE
-  NAMES llvm-ar
-  DOC "The llvm-ar executable"
-  )
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(LLVMAr
-  DEFAULT_MSG
-  LLVMAR_EXECUTABLE)
-
-SET_PACKAGE_PROPERTIES(LLVMAr PROPERTIES
-  URL https://llvm.org/docs/CommandGuide/llvm-ar.html
-  DESCRIPTION "create, modify, and extract from archives"
-)
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/cmake/Modules/FindLLVMNm.cmake b/external_imported/json/benchmarks/thirdparty/benchmark/cmake/Modules/FindLLVMNm.cmake
deleted file mode 100755
index e56430a04..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/cmake/Modules/FindLLVMNm.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-include(FeatureSummary)
-
-find_program(LLVMNM_EXECUTABLE
-  NAMES llvm-nm
-  DOC "The llvm-nm executable"
-  )
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(LLVMNm
-  DEFAULT_MSG
-  LLVMNM_EXECUTABLE)
-
-SET_PACKAGE_PROPERTIES(LLVMNm PROPERTIES
-  URL https://llvm.org/docs/CommandGuide/llvm-nm.html
-  DESCRIPTION "list LLVM bitcode and object file’s symbol table"
-)
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/cmake/Modules/FindLLVMRanLib.cmake b/external_imported/json/benchmarks/thirdparty/benchmark/cmake/Modules/FindLLVMRanLib.cmake
deleted file mode 100755
index 7b53e1a79..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/cmake/Modules/FindLLVMRanLib.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-include(FeatureSummary)
-
-find_program(LLVMRANLIB_EXECUTABLE
-  NAMES llvm-ranlib
-  DOC "The llvm-ranlib executable"
-  )
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(LLVMRanLib
-  DEFAULT_MSG
-  LLVMRANLIB_EXECUTABLE)
-
-SET_PACKAGE_PROPERTIES(LLVMRanLib PROPERTIES
-  DESCRIPTION "generate index for LLVM archive"
-)
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/cmake/benchmark.pc.in b/external_imported/json/benchmarks/thirdparty/benchmark/cmake/benchmark.pc.in
deleted file mode 100755
index 1e84bff68..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/cmake/benchmark.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-libdir=${prefix}/lib
-includedir=${prefix}/include
-
-Name: @PROJECT_NAME@
-Description: Google microbenchmark framework
-Version: @VERSION@
-
-Libs: -L${libdir} -lbenchmark
-Cflags: -I${includedir}
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/cmake/gnu_posix_regex.cpp b/external_imported/json/benchmarks/thirdparty/benchmark/cmake/gnu_posix_regex.cpp
deleted file mode 100755
index b5b91cdab..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/cmake/gnu_posix_regex.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <gnuregex.h>
-#include <string>
-int main() {
-  std::string str = "test0159";
-  regex_t re;
-  int ec = regcomp(&re, "^[a-z]+[0-9]+$", REG_EXTENDED | REG_NOSUB);
-  if (ec != 0) {
-    return ec;
-  }
-  return regexec(&re, str.c_str(), 0, nullptr, 0) ? -1 : 0;
-}
-
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/cmake/llvm-toolchain.cmake b/external_imported/json/benchmarks/thirdparty/benchmark/cmake/llvm-toolchain.cmake
deleted file mode 100755
index fc119e52f..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/cmake/llvm-toolchain.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-find_package(LLVMAr REQUIRED)
-set(CMAKE_AR "${LLVMAR_EXECUTABLE}" CACHE FILEPATH "" FORCE)
-
-find_package(LLVMNm REQUIRED)
-set(CMAKE_NM "${LLVMNM_EXECUTABLE}" CACHE FILEPATH "" FORCE)
-
-find_package(LLVMRanLib REQUIRED)
-set(CMAKE_RANLIB "${LLVMRANLIB_EXECUTABLE}" CACHE FILEPATH "" FORCE)
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/cmake/posix_regex.cpp b/external_imported/json/benchmarks/thirdparty/benchmark/cmake/posix_regex.cpp
deleted file mode 100755
index 466dc6256..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/cmake/posix_regex.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <regex.h>
-#include <string>
-int main() {
-  std::string str = "test0159";
-  regex_t re;
-  int ec = regcomp(&re, "^[a-z]+[0-9]+$", REG_EXTENDED | REG_NOSUB);
-  if (ec != 0) {
-    return ec;
-  }
-  int ret = regexec(&re, str.c_str(), 0, nullptr, 0) ? -1 : 0;
-  regfree(&re);
-  return ret;
-}
-
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/cmake/split_list.cmake b/external_imported/json/benchmarks/thirdparty/benchmark/cmake/split_list.cmake
deleted file mode 100755
index 67aed3fdc..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/cmake/split_list.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-macro(split_list listname)
-  string(REPLACE ";" " " ${listname} "${${listname}}")
-endmacro()
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/cmake/std_regex.cpp b/external_imported/json/benchmarks/thirdparty/benchmark/cmake/std_regex.cpp
deleted file mode 100755
index 696f2a26b..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/cmake/std_regex.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <regex>
-#include <string>
-int main() {
-  const std::string str = "test0159";
-  std::regex re;
-  re = std::regex("^[a-z]+[0-9]+$",
-       std::regex_constants::extended | std::regex_constants::nosubs);
-  return std::regex_search(str, re) ? 0 : -1;
-}
-
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/cmake/steady_clock.cpp b/external_imported/json/benchmarks/thirdparty/benchmark/cmake/steady_clock.cpp
deleted file mode 100755
index 66d50d17e..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/cmake/steady_clock.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <chrono>
-
-int main() {
-    typedef std::chrono::steady_clock Clock;
-    Clock::time_point tp = Clock::now();
-    ((void)tp);
-}
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/cmake/thread_safety_attributes.cpp b/external_imported/json/benchmarks/thirdparty/benchmark/cmake/thread_safety_attributes.cpp
deleted file mode 100755
index 46161babd..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/cmake/thread_safety_attributes.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-#define HAVE_THREAD_SAFETY_ATTRIBUTES
-#include "../src/mutex.h"
-
-int main() {}
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/docs/AssemblyTests.md b/external_imported/json/benchmarks/thirdparty/benchmark/docs/AssemblyTests.md
deleted file mode 100755
index 1fbdc269b..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/docs/AssemblyTests.md
+++ /dev/null
@@ -1,147 +0,0 @@
-# Assembly Tests
-
-The Benchmark library provides a number of functions whose primary
-purpose in to affect assembly generation, including `DoNotOptimize`
-and `ClobberMemory`. In addition there are other functions,
-such as `KeepRunning`, for which generating good assembly is paramount.
-
-For these functions it's important to have tests that verify the
-correctness and quality of the implementation. This requires testing
-the code generated by the compiler.
-
-This document describes how the Benchmark library tests compiler output,
-as well as how to properly write new tests.
-
-
-## Anatomy of a Test
-
-Writing a test has two steps:
-
-* Write the code you want to generate assembly for.
-* Add `// CHECK` lines to match against the verified assembly.
-
-Example:
-```c++
-
-// CHECK-LABEL: test_add:
-extern "C" int test_add() {
-    extern int ExternInt;
-    return ExternInt + 1;
-
-    // CHECK: movl ExternInt(%rip), %eax
-    // CHECK: addl %eax
-    // CHECK: ret
-}
-
-```
-
-#### LLVM Filecheck
-
-[LLVM's Filecheck](https://llvm.org/docs/CommandGuide/FileCheck.html)
-is used to test the generated assembly against the `// CHECK` lines
-specified in the tests source file. Please see the documentation
-linked above for information on how to write `CHECK` directives.
-
-#### Tips and Tricks:
-
-* Tests should match the minimal amount of output required to establish
-correctness. `CHECK` directives don't have to match on the exact next line
-after the previous match, so tests should omit checks for unimportant
-bits of assembly. ([`CHECK-NEXT`](https://llvm.org/docs/CommandGuide/FileCheck.html#the-check-next-directive)
-can be used to ensure a match occurs exactly after the previous match).
-
-* The tests are compiled with `-O3 -g0`. So we're only testing the
-optimized output.
-
-* The assembly output is further cleaned up using `tools/strip_asm.py`.
-This removes comments, assembler directives, and unused labels before
-the test is run.
-
-* The generated and stripped assembly file for a test is output under
-`<build-directory>/test/<test-name>.s`
-
-* Filecheck supports using [`CHECK` prefixes](https://llvm.org/docs/CommandGuide/FileCheck.html#cmdoption-check-prefixes)
-to specify lines that should only match in certain situations.
-The Benchmark tests use `CHECK-CLANG` and `CHECK-GNU` for lines that
-are only expected to match Clang or GCC's output respectively. Normal
-`CHECK` lines match against all compilers. (Note: `CHECK-NOT` and
-`CHECK-LABEL` are NOT prefixes. They are versions of non-prefixed
-`CHECK` lines)
-
-* Use `extern "C"` to disable name mangling for specific functions. This
-makes them easier to name in the `CHECK` lines.
-
-
-## Problems Writing Portable Tests
-
-Writing tests which check the code generated by a compiler are
-inherently non-portable. Different compilers and even different compiler
-versions may generate entirely different code. The Benchmark tests
-must tolerate this.
-
-LLVM Filecheck provides a number of mechanisms to help write
-"more portable" tests; including [matching using regular expressions](https://llvm.org/docs/CommandGuide/FileCheck.html#filecheck-pattern-matching-syntax),
-allowing the creation of [named variables](https://llvm.org/docs/CommandGuide/FileCheck.html#filecheck-variables)
-for later matching, and [checking non-sequential matches](https://llvm.org/docs/CommandGuide/FileCheck.html#the-check-dag-directive).
-
-#### Capturing Variables
-
-For example, say GCC stores a variable in a register but Clang stores
-it in memory. To write a test that tolerates both cases we "capture"
-the destination of the store, and then use the captured expression
-to write the remainder of the test.
-
-```c++
-// CHECK-LABEL: test_div_no_op_into_shr:
-extern "C" void test_div_no_op_into_shr(int value) {
-    int divisor = 2;
-    benchmark::DoNotOptimize(divisor); // hide the value from the optimizer
-    return value / divisor;
-
-    // CHECK: movl $2, [[DEST:.*]]
-    // CHECK: idivl [[DEST]]
-    // CHECK: ret
-}
-```
-
-#### Using Regular Expressions to Match Differing Output
-
-Often tests require testing assembly lines which may subtly differ
-between compilers or compiler versions. A common example of this
-is matching stack frame addresses. In this case regular expressions
-can be used to match the differing bits of output. For example:
-
-```c++
-int ExternInt;
-struct Point { int x, y, z; };
-
-// CHECK-LABEL: test_store_point:
-extern "C" void test_store_point() {
-    Point p{ExternInt, ExternInt, ExternInt};
-    benchmark::DoNotOptimize(p);
-
-    // CHECK: movl ExternInt(%rip), %eax
-    // CHECK: movl %eax, -{{[0-9]+}}(%rsp)
-    // CHECK: movl %eax, -{{[0-9]+}}(%rsp)
-    // CHECK: movl %eax, -{{[0-9]+}}(%rsp)
-    // CHECK: ret
-}
-```
-
-## Current Requirements and Limitations
-
-The tests require Filecheck to be installed along the `PATH` of the
-build machine. Otherwise the tests will be disabled.
-
-Additionally, as mentioned in the previous section, codegen tests are
-inherently non-portable. Currently the tests are limited to:
-
-* x86_64 targets.
-* Compiled with GCC or Clang
-
-Further work could be done, at least on a limited basis, to extend the
-tests to other architectures and compilers (using `CHECK` prefixes).
-
-Furthermore, the tests fail for builds which specify additional flags
-that modify code generation, including `--coverage` or `-fsanitize=`.
-
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/docs/tools.md b/external_imported/json/benchmarks/thirdparty/benchmark/docs/tools.md
deleted file mode 100755
index 70500bd32..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/docs/tools.md
+++ /dev/null
@@ -1,242 +0,0 @@
-# Benchmark Tools
-
-## compare_bench.py
-
-The `compare_bench.py` utility which can be used to compare the result of benchmarks.
-The program is invoked like:
-
-``` bash
-$ compare_bench.py <old-benchmark> <new-benchmark> [benchmark options]...
-```
-
-Where `<old-benchmark>` and `<new-benchmark>` either specify a benchmark executable file, or a JSON output file. The type of the input file is automatically detected. If a benchmark executable is specified then the benchmark is run to obtain the results. Otherwise the results are simply loaded from the output file.
-
-`[benchmark options]` will be passed to the benchmarks invocations. They can be anything that binary accepts, be it either normal `--benchmark_*` parameters, or some custom parameters your binary takes.
-
-The sample output using the JSON test files under `Inputs/` gives:
-
-``` bash
-$ ./compare_bench.py ./gbench/Inputs/test1_run1.json ./gbench/Inputs/test1_run2.json
-Comparing ./gbench/Inputs/test1_run1.json to ./gbench/Inputs/test1_run2.json
-Benchmark                        Time             CPU      Time Old      Time New       CPU Old       CPU New
--------------------------------------------------------------------------------------------------------------
-BM_SameTimes                  +0.0000         +0.0000            10            10            10            10
-BM_2xFaster                   -0.5000         -0.5000            50            25            50            25
-BM_2xSlower                   +1.0000         +1.0000            50           100            50           100
-BM_1PercentFaster             -0.0100         -0.0100           100            99           100            99
-BM_1PercentSlower             +0.0100         +0.0100           100           101           100           101
-BM_10PercentFaster            -0.1000         -0.1000           100            90           100            90
-BM_10PercentSlower            +0.1000         +0.1000           100           110           100           110
-BM_100xSlower                +99.0000        +99.0000           100         10000           100         10000
-BM_100xFaster                 -0.9900         -0.9900         10000           100         10000           100
-BM_10PercentCPUToTime         +0.1000         -0.1000           100           110           100            90
-BM_ThirdFaster                -0.3333         -0.3334           100            67           100            67
-BM_BadTimeUnit                -0.9000         +0.2000             0             0             0             1
-```
-
-As you can note, the values in `Time` and `CPU` columns are calculated as `(new - old) / |old|`.
-
-When a benchmark executable is run, the raw output from the benchmark is printed in real time to stdout. The sample output using `benchmark/basic_test` for both arguments looks like:
-
-```
-./compare_bench.py  test/basic_test test/basic_test  --benchmark_filter=BM_empty.*
-RUNNING: test/basic_test --benchmark_filter=BM_empty.* --benchmark_out=/tmp/tmpN7LF3a
-Run on (8 X 4000 MHz CPU s)
-2017-11-07 23:28:36
----------------------------------------------------------------------
-Benchmark                              Time           CPU Iterations
----------------------------------------------------------------------
-BM_empty                               4 ns          4 ns  170178757
-BM_empty/threads:8                     1 ns          7 ns  103868920
-BM_empty_stop_start                    0 ns          0 ns 1000000000
-BM_empty_stop_start/threads:8          0 ns          0 ns 1403031720
-RUNNING: /test/basic_test --benchmark_filter=BM_empty.* --benchmark_out=/tmp/tmplvrIp8
-Run on (8 X 4000 MHz CPU s)
-2017-11-07 23:28:38
----------------------------------------------------------------------
-Benchmark                              Time           CPU Iterations
----------------------------------------------------------------------
-BM_empty                               4 ns          4 ns  169534855
-BM_empty/threads:8                     1 ns          7 ns  104188776
-BM_empty_stop_start                    0 ns          0 ns 1000000000
-BM_empty_stop_start/threads:8          0 ns          0 ns 1404159424
-Comparing ../build/test/basic_test to ../build/test/basic_test
-Benchmark                                Time             CPU      Time Old      Time New       CPU Old       CPU New
----------------------------------------------------------------------------------------------------------------------
-BM_empty                              -0.0048         -0.0049             4             4             4             4
-BM_empty/threads:8                    -0.0123         -0.0054             1             1             7             7
-BM_empty_stop_start                   -0.0000         -0.0000             0             0             0             0
-BM_empty_stop_start/threads:8         -0.0029         +0.0001             0             0             0             0
-
-```
-
-As you can note, the values in `Time` and `CPU` columns are calculated as `(new - old) / |old|`.
-Obviously this example doesn't give any useful output, but it's intended to show the output format when 'compare_bench.py' needs to run benchmarks.
-
-## compare.py
-
-The `compare.py` can be used to compare the result of benchmarks.
-There are three modes of operation:
-
-1. Just compare two benchmarks, what `compare_bench.py` did.
-The program is invoked like:
-
-``` bash
-$ compare.py benchmarks <benchmark_baseline> <benchmark_contender> [benchmark options]...
-```
-Where `<benchmark_baseline>` and `<benchmark_contender>` either specify a benchmark executable file, or a JSON output file. The type of the input file is automatically detected. If a benchmark executable is specified then the benchmark is run to obtain the results. Otherwise the results are simply loaded from the output file.
-
-`[benchmark options]` will be passed to the benchmarks invocations. They can be anything that binary accepts, be it either normal `--benchmark_*` parameters, or some custom parameters your binary takes.
-
-Example output:
-```
-$ ./compare.py benchmarks ./a.out ./a.out
-RUNNING: ./a.out --benchmark_out=/tmp/tmprBT5nW
-Run on (8 X 4000 MHz CPU s)
-2017-11-07 21:16:44
-------------------------------------------------------
-Benchmark               Time           CPU Iterations
-------------------------------------------------------
-BM_memcpy/8            36 ns         36 ns   19101577   211.669MB/s
-BM_memcpy/64           76 ns         76 ns    9412571   800.199MB/s
-BM_memcpy/512          84 ns         84 ns    8249070   5.64771GB/s
-BM_memcpy/1024        116 ns        116 ns    6181763   8.19505GB/s
-BM_memcpy/8192        643 ns        643 ns    1062855   11.8636GB/s
-BM_copy/8             222 ns        222 ns    3137987   34.3772MB/s
-BM_copy/64           1608 ns       1608 ns     432758   37.9501MB/s
-BM_copy/512         12589 ns      12589 ns      54806   38.7867MB/s
-BM_copy/1024        25169 ns      25169 ns      27713   38.8003MB/s
-BM_copy/8192       201165 ns     201112 ns       3486   38.8466MB/s
-RUNNING: ./a.out --benchmark_out=/tmp/tmpt1wwG_
-Run on (8 X 4000 MHz CPU s)
-2017-11-07 21:16:53
-------------------------------------------------------
-Benchmark               Time           CPU Iterations
-------------------------------------------------------
-BM_memcpy/8            36 ns         36 ns   19397903   211.255MB/s
-BM_memcpy/64           73 ns         73 ns    9691174   839.635MB/s
-BM_memcpy/512          85 ns         85 ns    8312329   5.60101GB/s
-BM_memcpy/1024        118 ns        118 ns    6438774   8.11608GB/s
-BM_memcpy/8192        656 ns        656 ns    1068644   11.6277GB/s
-BM_copy/8             223 ns        223 ns    3146977   34.2338MB/s
-BM_copy/64           1611 ns       1611 ns     435340   37.8751MB/s
-BM_copy/512         12622 ns      12622 ns      54818   38.6844MB/s
-BM_copy/1024        25257 ns      25239 ns      27779   38.6927MB/s
-BM_copy/8192       205013 ns     205010 ns       3479    38.108MB/s
-Comparing ./a.out to ./a.out
-Benchmark                 Time             CPU      Time Old      Time New       CPU Old       CPU New
-------------------------------------------------------------------------------------------------------
-BM_memcpy/8            +0.0020         +0.0020            36            36            36            36
-BM_memcpy/64           -0.0468         -0.0470            76            73            76            73
-BM_memcpy/512          +0.0081         +0.0083            84            85            84            85
-BM_memcpy/1024         +0.0098         +0.0097           116           118           116           118
-BM_memcpy/8192         +0.0200         +0.0203           643           656           643           656
-BM_copy/8              +0.0046         +0.0042           222           223           222           223
-BM_copy/64             +0.0020         +0.0020          1608          1611          1608          1611
-BM_copy/512            +0.0027         +0.0026         12589         12622         12589         12622
-BM_copy/1024           +0.0035         +0.0028         25169         25257         25169         25239
-BM_copy/8192           +0.0191         +0.0194        201165        205013        201112        205010
-```
-
-What it does is for the every benchmark from the first run it looks for the benchmark with exactly the same name in the second run, and then compares the results. If the names differ, the benchmark is omitted from the diff.
-As you can note, the values in `Time` and `CPU` columns are calculated as `(new - old) / |old|`.
-
-2. Compare two different filters of one benchmark
-The program is invoked like:
-
-``` bash
-$ compare.py filters <benchmark> <filter_baseline> <filter_contender> [benchmark options]...
-```
-Where `<benchmark>` either specify a benchmark executable file, or a JSON output file. The type of the input file is automatically detected. If a benchmark executable is specified then the benchmark is run to obtain the results. Otherwise the results are simply loaded from the output file.
-
-Where `<filter_baseline>` and `<filter_contender>` are the same regex filters that you would pass to the `[--benchmark_filter=<regex>]` parameter of the benchmark binary.
-
-`[benchmark options]` will be passed to the benchmarks invocations. They can be anything that binary accepts, be it either normal `--benchmark_*` parameters, or some custom parameters your binary takes.
-
-Example output:
-```
-$ ./compare.py filters ./a.out BM_memcpy BM_copy
-RUNNING: ./a.out --benchmark_filter=BM_memcpy --benchmark_out=/tmp/tmpBWKk0k
-Run on (8 X 4000 MHz CPU s)
-2017-11-07 21:37:28
-------------------------------------------------------
-Benchmark               Time           CPU Iterations
-------------------------------------------------------
-BM_memcpy/8            36 ns         36 ns   17891491   211.215MB/s
-BM_memcpy/64           74 ns         74 ns    9400999   825.646MB/s
-BM_memcpy/512          87 ns         87 ns    8027453   5.46126GB/s
-BM_memcpy/1024        111 ns        111 ns    6116853    8.5648GB/s
-BM_memcpy/8192        657 ns        656 ns    1064679   11.6247GB/s
-RUNNING: ./a.out --benchmark_filter=BM_copy --benchmark_out=/tmp/tmpAvWcOM
-Run on (8 X 4000 MHz CPU s)
-2017-11-07 21:37:33
-----------------------------------------------------
-Benchmark             Time           CPU Iterations
-----------------------------------------------------
-BM_copy/8           227 ns        227 ns    3038700   33.6264MB/s
-BM_copy/64         1640 ns       1640 ns     426893   37.2154MB/s
-BM_copy/512       12804 ns      12801 ns      55417   38.1444MB/s
-BM_copy/1024      25409 ns      25407 ns      27516   38.4365MB/s
-BM_copy/8192     202986 ns     202990 ns       3454   38.4871MB/s
-Comparing BM_memcpy to BM_copy (from ./a.out)
-Benchmark                               Time             CPU      Time Old      Time New       CPU Old       CPU New
---------------------------------------------------------------------------------------------------------------------
-[BM_memcpy vs. BM_copy]/8            +5.2829         +5.2812            36           227            36           227
-[BM_memcpy vs. BM_copy]/64          +21.1719        +21.1856            74          1640            74          1640
-[BM_memcpy vs. BM_copy]/512        +145.6487       +145.6097            87         12804            87         12801
-[BM_memcpy vs. BM_copy]/1024       +227.1860       +227.1776           111         25409           111         25407
-[BM_memcpy vs. BM_copy]/8192       +308.1664       +308.2898           657        202986           656        202990
-```
-
-As you can see, it applies filter to the benchmarks, both when running the benchmark, and before doing the diff. And to make the diff work, the matches are replaced with some common string. Thus, you can compare two different benchmark families within one benchmark binary.
-As you can note, the values in `Time` and `CPU` columns are calculated as `(new - old) / |old|`.
-
-3. Compare filter one from benchmark one to filter two from benchmark two:
-The program is invoked like:
-
-``` bash
-$ compare.py filters <benchmark_baseline> <filter_baseline> <benchmark_contender> <filter_contender> [benchmark options]...
-```
-
-Where `<benchmark_baseline>` and `<benchmark_contender>` either specify a benchmark executable file, or a JSON output file. The type of the input file is automatically detected. If a benchmark executable is specified then the benchmark is run to obtain the results. Otherwise the results are simply loaded from the output file.
-
-Where `<filter_baseline>` and `<filter_contender>` are the same regex filters that you would pass to the `[--benchmark_filter=<regex>]` parameter of the benchmark binary.
-
-`[benchmark options]` will be passed to the benchmarks invocations. They can be anything that binary accepts, be it either normal `--benchmark_*` parameters, or some custom parameters your binary takes.
-
-Example output:
-```
-$ ./compare.py benchmarksfiltered ./a.out BM_memcpy ./a.out BM_copy
-RUNNING: ./a.out --benchmark_filter=BM_memcpy --benchmark_out=/tmp/tmp_FvbYg
-Run on (8 X 4000 MHz CPU s)
-2017-11-07 21:38:27
-------------------------------------------------------
-Benchmark               Time           CPU Iterations
-------------------------------------------------------
-BM_memcpy/8            37 ns         37 ns   18953482   204.118MB/s
-BM_memcpy/64           74 ns         74 ns    9206578   828.245MB/s
-BM_memcpy/512          91 ns         91 ns    8086195   5.25476GB/s
-BM_memcpy/1024        120 ns        120 ns    5804513   7.95662GB/s
-BM_memcpy/8192        664 ns        664 ns    1028363   11.4948GB/s
-RUNNING: ./a.out --benchmark_filter=BM_copy --benchmark_out=/tmp/tmpDfL5iE
-Run on (8 X 4000 MHz CPU s)
-2017-11-07 21:38:32
-----------------------------------------------------
-Benchmark             Time           CPU Iterations
-----------------------------------------------------
-BM_copy/8           230 ns        230 ns    2985909   33.1161MB/s
-BM_copy/64         1654 ns       1653 ns     419408   36.9137MB/s
-BM_copy/512       13122 ns      13120 ns      53403   37.2156MB/s
-BM_copy/1024      26679 ns      26666 ns      26575   36.6218MB/s
-BM_copy/8192     215068 ns     215053 ns       3221   36.3283MB/s
-Comparing BM_memcpy (from ./a.out) to BM_copy (from ./a.out)
-Benchmark                               Time             CPU      Time Old      Time New       CPU Old       CPU New
---------------------------------------------------------------------------------------------------------------------
-[BM_memcpy vs. BM_copy]/8            +5.1649         +5.1637            37           230            37           230
-[BM_memcpy vs. BM_copy]/64          +21.4352        +21.4374            74          1654            74          1653
-[BM_memcpy vs. BM_copy]/512        +143.6022       +143.5865            91         13122            91         13120
-[BM_memcpy vs. BM_copy]/1024       +221.5903       +221.4790           120         26679           120         26666
-[BM_memcpy vs. BM_copy]/8192       +322.9059       +323.0096           664        215068           664        215053
-```
-This is a mix of the previous two modes, two (potentially different) benchmark binaries are run, and a different filter is applied to each one.
-As you can note, the values in `Time` and `CPU` columns are calculated as `(new - old) / |old|`.
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/include/benchmark/benchmark.h b/external_imported/json/benchmarks/thirdparty/benchmark/include/benchmark/benchmark.h
deleted file mode 100755
index 23dd3d09b..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/include/benchmark/benchmark.h
+++ /dev/null
@@ -1,1456 +0,0 @@
-// Copyright 2015 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Support for registering benchmarks for functions.
-
-/* Example usage:
-// Define a function that executes the code to be measured a
-// specified number of times:
-static void BM_StringCreation(benchmark::State& state) {
-  for (auto _ : state)
-    std::string empty_string;
-}
-
-// Register the function as a benchmark
-BENCHMARK(BM_StringCreation);
-
-// Define another benchmark
-static void BM_StringCopy(benchmark::State& state) {
-  std::string x = "hello";
-  for (auto _ : state)
-    std::string copy(x);
-}
-BENCHMARK(BM_StringCopy);
-
-// Augment the main() program to invoke benchmarks if specified
-// via the --benchmarks command line flag.  E.g.,
-//       my_unittest --benchmark_filter=all
-//       my_unittest --benchmark_filter=BM_StringCreation
-//       my_unittest --benchmark_filter=String
-//       my_unittest --benchmark_filter='Copy|Creation'
-int main(int argc, char** argv) {
-  benchmark::Initialize(&argc, argv);
-  benchmark::RunSpecifiedBenchmarks();
-  return 0;
-}
-
-// Sometimes a family of microbenchmarks can be implemented with
-// just one routine that takes an extra argument to specify which
-// one of the family of benchmarks to run.  For example, the following
-// code defines a family of microbenchmarks for measuring the speed
-// of memcpy() calls of different lengths:
-
-static void BM_memcpy(benchmark::State& state) {
-  char* src = new char[state.range(0)]; char* dst = new char[state.range(0)];
-  memset(src, 'x', state.range(0));
-  for (auto _ : state)
-    memcpy(dst, src, state.range(0));
-  state.SetBytesProcessed(int64_t(state.iterations()) *
-                          int64_t(state.range(0)));
-  delete[] src; delete[] dst;
-}
-BENCHMARK(BM_memcpy)->Arg(8)->Arg(64)->Arg(512)->Arg(1<<10)->Arg(8<<10);
-
-// The preceding code is quite repetitive, and can be replaced with the
-// following short-hand.  The following invocation will pick a few
-// appropriate arguments in the specified range and will generate a
-// microbenchmark for each such argument.
-BENCHMARK(BM_memcpy)->Range(8, 8<<10);
-
-// You might have a microbenchmark that depends on two inputs.  For
-// example, the following code defines a family of microbenchmarks for
-// measuring the speed of set insertion.
-static void BM_SetInsert(benchmark::State& state) {
-  set<int> data;
-  for (auto _ : state) {
-    state.PauseTiming();
-    data = ConstructRandomSet(state.range(0));
-    state.ResumeTiming();
-    for (int j = 0; j < state.range(1); ++j)
-      data.insert(RandomNumber());
-  }
-}
-BENCHMARK(BM_SetInsert)
-   ->Args({1<<10, 128})
-   ->Args({2<<10, 128})
-   ->Args({4<<10, 128})
-   ->Args({8<<10, 128})
-   ->Args({1<<10, 512})
-   ->Args({2<<10, 512})
-   ->Args({4<<10, 512})
-   ->Args({8<<10, 512});
-
-// The preceding code is quite repetitive, and can be replaced with
-// the following short-hand.  The following macro will pick a few
-// appropriate arguments in the product of the two specified ranges
-// and will generate a microbenchmark for each such pair.
-BENCHMARK(BM_SetInsert)->Ranges({{1<<10, 8<<10}, {128, 512}});
-
-// For more complex patterns of inputs, passing a custom function
-// to Apply allows programmatic specification of an
-// arbitrary set of arguments to run the microbenchmark on.
-// The following example enumerates a dense range on
-// one parameter, and a sparse range on the second.
-static void CustomArguments(benchmark::internal::Benchmark* b) {
-  for (int i = 0; i <= 10; ++i)
-    for (int j = 32; j <= 1024*1024; j *= 8)
-      b->Args({i, j});
-}
-BENCHMARK(BM_SetInsert)->Apply(CustomArguments);
-
-// Templated microbenchmarks work the same way:
-// Produce then consume 'size' messages 'iters' times
-// Measures throughput in the absence of multiprogramming.
-template <class Q> int BM_Sequential(benchmark::State& state) {
-  Q q;
-  typename Q::value_type v;
-  for (auto _ : state) {
-    for (int i = state.range(0); i--; )
-      q.push(v);
-    for (int e = state.range(0); e--; )
-      q.Wait(&v);
-  }
-  // actually messages, not bytes:
-  state.SetBytesProcessed(
-      static_cast<int64_t>(state.iterations())*state.range(0));
-}
-BENCHMARK_TEMPLATE(BM_Sequential, WaitQueue<int>)->Range(1<<0, 1<<10);
-
-Use `Benchmark::MinTime(double t)` to set the minimum time used to run the
-benchmark. This option overrides the `benchmark_min_time` flag.
-
-void BM_test(benchmark::State& state) {
- ... body ...
-}
-BENCHMARK(BM_test)->MinTime(2.0); // Run for at least 2 seconds.
-
-In a multithreaded test, it is guaranteed that none of the threads will start
-until all have reached the loop start, and all will have finished before any
-thread exits the loop body. As such, any global setup or teardown you want to
-do can be wrapped in a check against the thread index:
-
-static void BM_MultiThreaded(benchmark::State& state) {
-  if (state.thread_index == 0) {
-    // Setup code here.
-  }
-  for (auto _ : state) {
-    // Run the test as normal.
-  }
-  if (state.thread_index == 0) {
-    // Teardown code here.
-  }
-}
-BENCHMARK(BM_MultiThreaded)->Threads(4);
-
-
-If a benchmark runs a few milliseconds it may be hard to visually compare the
-measured times, since the output data is given in nanoseconds per default. In
-order to manually set the time unit, you can specify it manually:
-
-BENCHMARK(BM_test)->Unit(benchmark::kMillisecond);
-*/
-
-#ifndef BENCHMARK_BENCHMARK_H_
-#define BENCHMARK_BENCHMARK_H_
-
-
-// The _MSVC_LANG check should detect Visual Studio 2015 Update 3 and newer.
-#if __cplusplus >= 201103L || (defined(_MSVC_LANG) && _MSVC_LANG >= 201103L)
-#define BENCHMARK_HAS_CXX11
-#endif
-
-#include <stdint.h>
-
-#include <algorithm>
-#include <cassert>
-#include <cstddef>
-#include <iosfwd>
-#include <string>
-#include <vector>
-#include <map>
-#include <set>
-
-#if defined(BENCHMARK_HAS_CXX11)
-#include <type_traits>
-#include <initializer_list>
-#include <utility>
-#endif
-
-#if defined(_MSC_VER)
-#include <intrin.h> // for _ReadWriteBarrier
-#endif
-
-#ifndef BENCHMARK_HAS_CXX11
-#define BENCHMARK_DISALLOW_COPY_AND_ASSIGN(TypeName) \
-  TypeName(const TypeName&);                         \
-  TypeName& operator=(const TypeName&)
-#else
-#define BENCHMARK_DISALLOW_COPY_AND_ASSIGN(TypeName) \
-  TypeName(const TypeName&) = delete;                \
-  TypeName& operator=(const TypeName&) = delete
-#endif
-
-#if defined(__GNUC__)
-#define BENCHMARK_UNUSED __attribute__((unused))
-#define BENCHMARK_ALWAYS_INLINE __attribute__((always_inline))
-#define BENCHMARK_NOEXCEPT noexcept
-#define BENCHMARK_NOEXCEPT_OP(x) noexcept(x)
-#elif defined(_MSC_VER) && !defined(__clang__)
-#define BENCHMARK_UNUSED
-#define BENCHMARK_ALWAYS_INLINE __forceinline
-#if _MSC_VER >= 1900
-#define BENCHMARK_NOEXCEPT noexcept
-#define BENCHMARK_NOEXCEPT_OP(x) noexcept(x)
-#else
-#define BENCHMARK_NOEXCEPT
-#define BENCHMARK_NOEXCEPT_OP(x)
-#endif
-#define __func__ __FUNCTION__
-#else
-#define BENCHMARK_UNUSED
-#define BENCHMARK_ALWAYS_INLINE
-#define BENCHMARK_NOEXCEPT
-#define BENCHMARK_NOEXCEPT_OP(x)
-#endif
-
-#define BENCHMARK_INTERNAL_TOSTRING2(x) #x
-#define BENCHMARK_INTERNAL_TOSTRING(x) BENCHMARK_INTERNAL_TOSTRING2(x)
-
-#if defined(__GNUC__)
-#define BENCHMARK_BUILTIN_EXPECT(x, y) __builtin_expect(x, y)
-#define BENCHMARK_DEPRECATED_MSG(msg) __attribute__((deprecated(msg)))
-#else
-#define BENCHMARK_BUILTIN_EXPECT(x, y) x
-#define BENCHMARK_DEPRECATED_MSG(msg)
-#define BENCHMARK_WARNING_MSG(msg) __pragma(message(__FILE__ "(" BENCHMARK_INTERNAL_TOSTRING(__LINE__) ") : warning note: " msg))
-#endif
-
-#if defined(__GNUC__) && !defined(__clang__)
-#define BENCHMARK_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
-#endif
-
-namespace benchmark {
-class BenchmarkReporter;
-
-void Initialize(int* argc, char** argv);
-
-// Report to stdout all arguments in 'argv' as unrecognized except the first.
-// Returns true there is at least on unrecognized argument (i.e. 'argc' > 1).
-bool ReportUnrecognizedArguments(int argc, char** argv);
-
-// Generate a list of benchmarks matching the specified --benchmark_filter flag
-// and if --benchmark_list_tests is specified return after printing the name
-// of each matching benchmark. Otherwise run each matching benchmark and
-// report the results.
-//
-// The second and third overload use the specified 'console_reporter' and
-//  'file_reporter' respectively. 'file_reporter' will write to the file
-//  specified
-//   by '--benchmark_output'. If '--benchmark_output' is not given the
-//  'file_reporter' is ignored.
-//
-// RETURNS: The number of matching benchmarks.
-size_t RunSpecifiedBenchmarks();
-size_t RunSpecifiedBenchmarks(BenchmarkReporter* console_reporter);
-size_t RunSpecifiedBenchmarks(BenchmarkReporter* console_reporter,
-                              BenchmarkReporter* file_reporter);
-
-// If this routine is called, peak memory allocation past this point in the
-// benchmark is reported at the end of the benchmark report line. (It is
-// computed by running the benchmark once with a single iteration and a memory
-// tracer.)
-// TODO(dominic)
-// void MemoryUsage();
-
-namespace internal {
-class Benchmark;
-class BenchmarkImp;
-class BenchmarkFamilies;
-
-void UseCharPointer(char const volatile*);
-
-// Take ownership of the pointer and register the benchmark. Return the
-// registered benchmark.
-Benchmark* RegisterBenchmarkInternal(Benchmark*);
-
-// Ensure that the standard streams are properly initialized in every TU.
-int InitializeStreams();
-BENCHMARK_UNUSED static int stream_init_anchor = InitializeStreams();
-
-}  // namespace internal
-
-
-#if (!defined(__GNUC__) && !defined(__clang__)) || defined(__pnacl__) || \
-    defined(__EMSCRIPTEN__)
-# define BENCHMARK_HAS_NO_INLINE_ASSEMBLY
-#endif
-
-
-// The DoNotOptimize(...) function can be used to prevent a value or
-// expression from being optimized away by the compiler. This function is
-// intended to add little to no overhead.
-// See: https://youtu.be/nXaxk27zwlk?t=2441
-#ifndef BENCHMARK_HAS_NO_INLINE_ASSEMBLY
-template <class Tp>
-inline BENCHMARK_ALWAYS_INLINE
-void DoNotOptimize(Tp const& value) {
-    asm volatile("" : : "r,m"(value) : "memory");
-}
-
-template <class Tp>
-inline BENCHMARK_ALWAYS_INLINE void DoNotOptimize(Tp& value) {
-#if defined(__clang__)
-  asm volatile("" : "+r,m"(value) : : "memory");
-#else
-  asm volatile("" : "+m,r"(value) : : "memory");
-#endif
-}
-
-// Force the compiler to flush pending writes to global memory. Acts as an
-// effective read/write barrier
-inline BENCHMARK_ALWAYS_INLINE void ClobberMemory() {
-  asm volatile("" : : : "memory");
-}
-#elif defined(_MSC_VER)
-template <class Tp>
-inline BENCHMARK_ALWAYS_INLINE void DoNotOptimize(Tp const& value) {
-  internal::UseCharPointer(&reinterpret_cast<char const volatile&>(value));
-  _ReadWriteBarrier();
-}
-
-inline BENCHMARK_ALWAYS_INLINE void ClobberMemory() {
-  _ReadWriteBarrier();
-}
-#else
-template <class Tp>
-inline BENCHMARK_ALWAYS_INLINE void DoNotOptimize(Tp const& value) {
-  internal::UseCharPointer(&reinterpret_cast<char const volatile&>(value));
-}
-// FIXME Add ClobberMemory() for non-gnu and non-msvc compilers
-#endif
-
-
-
-// This class is used for user-defined counters.
-class Counter {
-public:
-
-  enum Flags {
-    kDefaults   = 0,
-    // Mark the counter as a rate. It will be presented divided
-    // by the duration of the benchmark.
-    kIsRate     = 1,
-    // Mark the counter as a thread-average quantity. It will be
-    // presented divided by the number of threads.
-    kAvgThreads = 2,
-    // Mark the counter as a thread-average rate. See above.
-    kAvgThreadsRate = kIsRate|kAvgThreads
-  };
-
-  double value;
-  Flags  flags;
-
-  BENCHMARK_ALWAYS_INLINE
-  Counter(double v = 0., Flags f = kDefaults) : value(v), flags(f) {}
-
-  BENCHMARK_ALWAYS_INLINE operator double const& () const { return value; }
-  BENCHMARK_ALWAYS_INLINE operator double      & ()       { return value; }
-
-};
-
-// This is the container for the user-defined counters.
-typedef std::map<std::string, Counter> UserCounters;
-
-
-// TimeUnit is passed to a benchmark in order to specify the order of magnitude
-// for the measured time.
-enum TimeUnit { kNanosecond, kMicrosecond, kMillisecond };
-
-// BigO is passed to a benchmark in order to specify the asymptotic
-// computational
-// complexity for the benchmark. In case oAuto is selected, complexity will be
-// calculated automatically to the best fit.
-enum BigO { oNone, o1, oN, oNSquared, oNCubed, oLogN, oNLogN, oAuto, oLambda };
-
-// BigOFunc is passed to a benchmark in order to specify the asymptotic
-// computational complexity for the benchmark.
-typedef double(BigOFunc)(int64_t);
-
-// StatisticsFunc is passed to a benchmark in order to compute some descriptive
-// statistics over all the measurements of some type
-typedef double(StatisticsFunc)(const std::vector<double>&);
-
-struct Statistics {
-  std::string name_;
-  StatisticsFunc* compute_;
-
-  Statistics(std::string name, StatisticsFunc* compute)
-    : name_(name), compute_(compute) {}
-};
-
-namespace internal {
-class ThreadTimer;
-class ThreadManager;
-
-enum ReportMode
-#if defined(BENCHMARK_HAS_CXX11)
-  : unsigned
-#else
-#endif
-  {
-  RM_Unspecified,  // The mode has not been manually specified
-  RM_Default,      // The mode is user-specified as default.
-  RM_ReportAggregatesOnly
-};
-}  // namespace internal
-
-// State is passed to a running Benchmark and contains state for the
-// benchmark to use.
-class State {
- public:
-  struct StateIterator;
-  friend struct StateIterator;
-
-  // Returns iterators used to run each iteration of a benchmark using a
-  // C++11 ranged-based for loop. These functions should not be called directly.
-  //
-  // REQUIRES: The benchmark has not started running yet. Neither begin nor end
-  // have been called previously.
-  //
-  // NOTE: KeepRunning may not be used after calling either of these functions.
-  BENCHMARK_ALWAYS_INLINE StateIterator begin();
-  BENCHMARK_ALWAYS_INLINE StateIterator end();
-
-  // Returns true if the benchmark should continue through another iteration.
-  // NOTE: A benchmark may not return from the test until KeepRunning() has
-  // returned false.
-  bool KeepRunning();
-
-  // Returns true iff the benchmark should run n more iterations.
-  // REQUIRES: 'n' > 0.
-  // NOTE: A benchmark must not return from the test until KeepRunningBatch()
-  // has returned false.
-  // NOTE: KeepRunningBatch() may overshoot by up to 'n' iterations.
-  //
-  // Intended usage:
-  //   while (state.KeepRunningBatch(1000)) {
-  //     // process 1000 elements
-  //   }
-  bool KeepRunningBatch(size_t n);
-
-  // REQUIRES: timer is running and 'SkipWithError(...)' has not been called
-  //           by the current thread.
-  // Stop the benchmark timer.  If not called, the timer will be
-  // automatically stopped after the last iteration of the benchmark loop.
-  //
-  // For threaded benchmarks the PauseTiming() function only pauses the timing
-  // for the current thread.
-  //
-  // NOTE: The "real time" measurement is per-thread. If different threads
-  // report different measurements the largest one is reported.
-  //
-  // NOTE: PauseTiming()/ResumeTiming() are relatively
-  // heavyweight, and so their use should generally be avoided
-  // within each benchmark iteration, if possible.
-  void PauseTiming();
-
-  // REQUIRES: timer is not running and 'SkipWithError(...)' has not been called
-  //           by the current thread.
-  // Start the benchmark timer.  The timer is NOT running on entrance to the
-  // benchmark function. It begins running after control flow enters the
-  // benchmark loop.
-  //
-  // NOTE: PauseTiming()/ResumeTiming() are relatively
-  // heavyweight, and so their use should generally be avoided
-  // within each benchmark iteration, if possible.
-  void ResumeTiming();
-
-  // REQUIRES: 'SkipWithError(...)' has not been called previously by the
-  //            current thread.
-  // Report the benchmark as resulting in an error with the specified 'msg'.
-  // After this call the user may explicitly 'return' from the benchmark.
-  //
-  // If the ranged-for style of benchmark loop is used, the user must explicitly
-  // break from the loop, otherwise all future iterations will be run.
-  // If the 'KeepRunning()' loop is used the current thread will automatically
-  // exit the loop at the end of the current iteration.
-  //
-  // For threaded benchmarks only the current thread stops executing and future
-  // calls to `KeepRunning()` will block until all threads have completed
-  // the `KeepRunning()` loop. If multiple threads report an error only the
-  // first error message is used.
-  //
-  // NOTE: Calling 'SkipWithError(...)' does not cause the benchmark to exit
-  // the current scope immediately. If the function is called from within
-  // the 'KeepRunning()' loop the current iteration will finish. It is the users
-  // responsibility to exit the scope as needed.
-  void SkipWithError(const char* msg);
-
-  // REQUIRES: called exactly once per iteration of the benchmarking loop.
-  // Set the manually measured time for this benchmark iteration, which
-  // is used instead of automatically measured time if UseManualTime() was
-  // specified.
-  //
-  // For threaded benchmarks the final value will be set to the largest
-  // reported values.
-  void SetIterationTime(double seconds);
-
-  // Set the number of bytes processed by the current benchmark
-  // execution.  This routine is typically called once at the end of a
-  // throughput oriented benchmark.  If this routine is called with a
-  // value > 0, the report is printed in MB/sec instead of nanoseconds
-  // per iteration.
-  //
-  // REQUIRES: a benchmark has exited its benchmarking loop.
-  BENCHMARK_ALWAYS_INLINE
-  void SetBytesProcessed(int64_t bytes) { bytes_processed_ = bytes; }
-
-  BENCHMARK_ALWAYS_INLINE
-  int64_t bytes_processed() const { return bytes_processed_; }
-
-  // If this routine is called with complexity_n > 0 and complexity report is
-  // requested for the
-  // family benchmark, then current benchmark will be part of the computation
-  // and complexity_n will
-  // represent the length of N.
-  BENCHMARK_ALWAYS_INLINE
-  void SetComplexityN(int64_t complexity_n) { complexity_n_ = complexity_n; }
-
-  BENCHMARK_ALWAYS_INLINE
-  int64_t complexity_length_n() { return complexity_n_; }
-
-  // If this routine is called with items > 0, then an items/s
-  // label is printed on the benchmark report line for the currently
-  // executing benchmark. It is typically called at the end of a processing
-  // benchmark where a processing items/second output is desired.
-  //
-  // REQUIRES: a benchmark has exited its benchmarking loop.
-  BENCHMARK_ALWAYS_INLINE
-  void SetItemsProcessed(int64_t items) { items_processed_ = items; }
-
-  BENCHMARK_ALWAYS_INLINE
-  int64_t items_processed() const { return items_processed_; }
-
-  // If this routine is called, the specified label is printed at the
-  // end of the benchmark report line for the currently executing
-  // benchmark.  Example:
-  //  static void BM_Compress(benchmark::State& state) {
-  //    ...
-  //    double compress = input_size / output_size;
-  //    state.SetLabel(StrFormat("compress:%.1f%%", 100.0*compression));
-  //  }
-  // Produces output that looks like:
-  //  BM_Compress   50         50   14115038  compress:27.3%
-  //
-  // REQUIRES: a benchmark has exited its benchmarking loop.
-  void SetLabel(const char* label);
-
-  void BENCHMARK_ALWAYS_INLINE SetLabel(const std::string& str) {
-    this->SetLabel(str.c_str());
-  }
-
-  // Range arguments for this run. CHECKs if the argument has been set.
-  BENCHMARK_ALWAYS_INLINE
-  int64_t range(std::size_t pos = 0) const {
-    assert(range_.size() > pos);
-    return range_[pos];
-  }
-
-  BENCHMARK_DEPRECATED_MSG("use 'range(0)' instead")
-  int64_t range_x() const { return range(0); }
-
-  BENCHMARK_DEPRECATED_MSG("use 'range(1)' instead")
-  int64_t range_y() const { return range(1); }
-
-  BENCHMARK_ALWAYS_INLINE
-  size_t iterations() const {
-    if (BENCHMARK_BUILTIN_EXPECT(!started_, false)) {
-      return 0;
-    }
-    return max_iterations - total_iterations_ + batch_leftover_;
-  }
-
-private: // items we expect on the first cache line (ie 64 bytes of the struct)
-
-  // When total_iterations_ is 0, KeepRunning() and friends will return false.
-  // May be larger than max_iterations.
-  size_t total_iterations_;
-
-  // When using KeepRunningBatch(), batch_leftover_ holds the number of
-  // iterations beyond max_iters that were run. Used to track
-  // completed_iterations_ accurately.
-  size_t batch_leftover_;
-
-public:
-  const size_t max_iterations;
-
-private:
-  bool started_;
-  bool finished_;
-  bool error_occurred_;
-
-private: // items we don't need on the first cache line
-  std::vector<int64_t> range_;
-
-  int64_t bytes_processed_;
-  int64_t items_processed_;
-
-  int64_t complexity_n_;
-
- public:
-  // Container for user-defined counters.
-  UserCounters counters;
-  // Index of the executing thread. Values from [0, threads).
-  const int thread_index;
-  // Number of threads concurrently executing the benchmark.
-  const int threads;
-
-
-  // TODO(EricWF) make me private
-  State(size_t max_iters, const std::vector<int64_t>& ranges, int thread_i,
-        int n_threads, internal::ThreadTimer* timer,
-        internal::ThreadManager* manager);
-
- private:
-  void StartKeepRunning();
-  // Implementation of KeepRunning() and KeepRunningBatch().
-  // is_batch must be true unless n is 1.
-  bool KeepRunningInternal(size_t n, bool is_batch);
-  void FinishKeepRunning();
-  internal::ThreadTimer* timer_;
-  internal::ThreadManager* manager_;
-  BENCHMARK_DISALLOW_COPY_AND_ASSIGN(State);
-};
-
-inline BENCHMARK_ALWAYS_INLINE
-bool State::KeepRunning() {
-  return KeepRunningInternal(1, /*is_batch=*/ false);
-}
-
-inline BENCHMARK_ALWAYS_INLINE
-bool State::KeepRunningBatch(size_t n) {
-  return KeepRunningInternal(n, /*is_batch=*/ true);
-}
-
-inline BENCHMARK_ALWAYS_INLINE
-bool State::KeepRunningInternal(size_t n, bool is_batch) {
-  // total_iterations_ is set to 0 by the constructor, and always set to a
-  // nonzero value by StartKepRunning().
-  assert(n > 0);
-  // n must be 1 unless is_batch is true.
-  assert(is_batch || n == 1);
-  if (BENCHMARK_BUILTIN_EXPECT(total_iterations_ >= n, true)) {
-    total_iterations_ -= n;
-    return true;
-  }
-  if (!started_) {
-    StartKeepRunning();
-    if (!error_occurred_ && total_iterations_ >= n) {
-      total_iterations_-= n;
-      return true;
-    }
-  }
-  // For non-batch runs, total_iterations_ must be 0 by now.
-  if (is_batch && total_iterations_ != 0) {
-    batch_leftover_  = n - total_iterations_;
-    total_iterations_ = 0;
-    return true;
-  }
-  FinishKeepRunning();
-  return false;
-}
-
-struct State::StateIterator {
-  struct BENCHMARK_UNUSED Value {};
-  typedef std::forward_iterator_tag iterator_category;
-  typedef Value value_type;
-  typedef Value reference;
-  typedef Value pointer;
-  typedef std::ptrdiff_t difference_type;
-
- private:
-  friend class State;
-  BENCHMARK_ALWAYS_INLINE
-  StateIterator() : cached_(0), parent_() {}
-
-  BENCHMARK_ALWAYS_INLINE
-  explicit StateIterator(State* st)
-      : cached_(st->error_occurred_ ? 0 : st->max_iterations), parent_(st) {}
-
- public:
-  BENCHMARK_ALWAYS_INLINE
-  Value operator*() const { return Value(); }
-
-  BENCHMARK_ALWAYS_INLINE
-  StateIterator& operator++() {
-    assert(cached_ > 0);
-    --cached_;
-    return *this;
-  }
-
-  BENCHMARK_ALWAYS_INLINE
-  bool operator!=(StateIterator const&) const {
-    if (BENCHMARK_BUILTIN_EXPECT(cached_ != 0, true)) return true;
-    parent_->FinishKeepRunning();
-    return false;
-  }
-
- private:
-  size_t cached_;
-  State* const parent_;
-};
-
-inline BENCHMARK_ALWAYS_INLINE State::StateIterator State::begin() {
-  return StateIterator(this);
-}
-inline BENCHMARK_ALWAYS_INLINE State::StateIterator State::end() {
-  StartKeepRunning();
-  return StateIterator();
-}
-
-namespace internal {
-
-typedef void(Function)(State&);
-
-// ------------------------------------------------------
-// Benchmark registration object.  The BENCHMARK() macro expands
-// into an internal::Benchmark* object.  Various methods can
-// be called on this object to change the properties of the benchmark.
-// Each method returns "this" so that multiple method calls can
-// chained into one expression.
-class Benchmark {
- public:
-  virtual ~Benchmark();
-
-  // Note: the following methods all return "this" so that multiple
-  // method calls can be chained together in one expression.
-
-  // Run this benchmark once with "x" as the extra argument passed
-  // to the function.
-  // REQUIRES: The function passed to the constructor must accept an arg1.
-  Benchmark* Arg(int64_t x);
-
-  // Run this benchmark with the given time unit for the generated output report
-  Benchmark* Unit(TimeUnit unit);
-
-  // Run this benchmark once for a number of values picked from the
-  // range [start..limit].  (start and limit are always picked.)
-  // REQUIRES: The function passed to the constructor must accept an arg1.
-  Benchmark* Range(int64_t start, int64_t limit);
-
-  // Run this benchmark once for all values in the range [start..limit] with
-  // specific step
-  // REQUIRES: The function passed to the constructor must accept an arg1.
-  Benchmark* DenseRange(int64_t start, int64_t limit, int step = 1);
-
-  // Run this benchmark once with "args" as the extra arguments passed
-  // to the function.
-  // REQUIRES: The function passed to the constructor must accept arg1, arg2 ...
-  Benchmark* Args(const std::vector<int64_t>& args);
-
-  // Equivalent to Args({x, y})
-  // NOTE: This is a legacy C++03 interface provided for compatibility only.
-  //   New code should use 'Args'.
-  Benchmark* ArgPair(int64_t x, int64_t y) {
-    std::vector<int64_t> args;
-    args.push_back(x);
-    args.push_back(y);
-    return Args(args);
-  }
-
-  // Run this benchmark once for a number of values picked from the
-  // ranges [start..limit].  (starts and limits are always picked.)
-  // REQUIRES: The function passed to the constructor must accept arg1, arg2 ...
-  Benchmark* Ranges(const std::vector<std::pair<int64_t, int64_t> >& ranges);
-
-  // Equivalent to ArgNames({name})
-  Benchmark* ArgName(const std::string& name);
-
-  // Set the argument names to display in the benchmark name. If not called,
-  // only argument values will be shown.
-  Benchmark* ArgNames(const std::vector<std::string>& names);
-
-  // Equivalent to Ranges({{lo1, hi1}, {lo2, hi2}}).
-  // NOTE: This is a legacy C++03 interface provided for compatibility only.
-  //   New code should use 'Ranges'.
-  Benchmark* RangePair(int64_t lo1, int64_t hi1, int64_t lo2, int64_t hi2) {
-    std::vector<std::pair<int64_t, int64_t> > ranges;
-    ranges.push_back(std::make_pair(lo1, hi1));
-    ranges.push_back(std::make_pair(lo2, hi2));
-    return Ranges(ranges);
-  }
-
-  // Pass this benchmark object to *func, which can customize
-  // the benchmark by calling various methods like Arg, Args,
-  // Threads, etc.
-  Benchmark* Apply(void (*func)(Benchmark* benchmark));
-
-  // Set the range multiplier for non-dense range. If not called, the range
-  // multiplier kRangeMultiplier will be used.
-  Benchmark* RangeMultiplier(int multiplier);
-
-  // Set the minimum amount of time to use when running this benchmark. This
-  // option overrides the `benchmark_min_time` flag.
-  // REQUIRES: `t > 0` and `Iterations` has not been called on this benchmark.
-  Benchmark* MinTime(double t);
-
-  // Specify the amount of iterations that should be run by this benchmark.
-  // REQUIRES: 'n > 0' and `MinTime` has not been called on this benchmark.
-  //
-  // NOTE: This function should only be used when *exact* iteration control is
-  //   needed and never to control or limit how long a benchmark runs, where
-  // `--benchmark_min_time=N` or `MinTime(...)` should be used instead.
-  Benchmark* Iterations(size_t n);
-
-  // Specify the amount of times to repeat this benchmark. This option overrides
-  // the `benchmark_repetitions` flag.
-  // REQUIRES: `n > 0`
-  Benchmark* Repetitions(int n);
-
-  // Specify if each repetition of the benchmark should be reported separately
-  // or if only the final statistics should be reported. If the benchmark
-  // is not repeated then the single result is always reported.
-  Benchmark* ReportAggregatesOnly(bool value = true);
-
-  // If a particular benchmark is I/O bound, runs multiple threads internally or
-  // if for some reason CPU timings are not representative, call this method. If
-  // called, the elapsed time will be used to control how many iterations are
-  // run, and in the printing of items/second or MB/seconds values.  If not
-  // called, the cpu time used by the benchmark will be used.
-  Benchmark* UseRealTime();
-
-  // If a benchmark must measure time manually (e.g. if GPU execution time is
-  // being
-  // measured), call this method. If called, each benchmark iteration should
-  // call
-  // SetIterationTime(seconds) to report the measured time, which will be used
-  // to control how many iterations are run, and in the printing of items/second
-  // or MB/second values.
-  Benchmark* UseManualTime();
-
-  // Set the asymptotic computational complexity for the benchmark. If called
-  // the asymptotic computational complexity will be shown on the output.
-  Benchmark* Complexity(BigO complexity = benchmark::oAuto);
-
-  // Set the asymptotic computational complexity for the benchmark. If called
-  // the asymptotic computational complexity will be shown on the output.
-  Benchmark* Complexity(BigOFunc* complexity);
-
-  // Add this statistics to be computed over all the values of benchmark run
-  Benchmark* ComputeStatistics(std::string name, StatisticsFunc* statistics);
-
-  // Support for running multiple copies of the same benchmark concurrently
-  // in multiple threads.  This may be useful when measuring the scaling
-  // of some piece of code.
-
-  // Run one instance of this benchmark concurrently in t threads.
-  Benchmark* Threads(int t);
-
-  // Pick a set of values T from [min_threads,max_threads].
-  // min_threads and max_threads are always included in T.  Run this
-  // benchmark once for each value in T.  The benchmark run for a
-  // particular value t consists of t threads running the benchmark
-  // function concurrently.  For example, consider:
-  //    BENCHMARK(Foo)->ThreadRange(1,16);
-  // This will run the following benchmarks:
-  //    Foo in 1 thread
-  //    Foo in 2 threads
-  //    Foo in 4 threads
-  //    Foo in 8 threads
-  //    Foo in 16 threads
-  Benchmark* ThreadRange(int min_threads, int max_threads);
-
-  // For each value n in the range, run this benchmark once using n threads.
-  // min_threads and max_threads are always included in the range.
-  // stride specifies the increment. E.g. DenseThreadRange(1, 8, 3) starts
-  // a benchmark with 1, 4, 7 and 8 threads.
-  Benchmark* DenseThreadRange(int min_threads, int max_threads, int stride = 1);
-
-  // Equivalent to ThreadRange(NumCPUs(), NumCPUs())
-  Benchmark* ThreadPerCpu();
-
-  virtual void Run(State& state) = 0;
-
-  // Used inside the benchmark implementation
-  struct Instance;
-
- protected:
-  explicit Benchmark(const char* name);
-  Benchmark(Benchmark const&);
-  void SetName(const char* name);
-
-  int ArgsCnt() const;
-
- private:
-  friend class BenchmarkFamilies;
-
-  std::string name_;
-  ReportMode report_mode_;
-  std::vector<std::string> arg_names_;   // Args for all benchmark runs
-  std::vector<std::vector<int64_t> > args_;  // Args for all benchmark runs
-  TimeUnit time_unit_;
-  int range_multiplier_;
-  double min_time_;
-  size_t iterations_;
-  int repetitions_;
-  bool use_real_time_;
-  bool use_manual_time_;
-  BigO complexity_;
-  BigOFunc* complexity_lambda_;
-  std::vector<Statistics> statistics_;
-  std::vector<int> thread_counts_;
-
-  Benchmark& operator=(Benchmark const&);
-};
-
-}  // namespace internal
-
-// Create and register a benchmark with the specified 'name' that invokes
-// the specified functor 'fn'.
-//
-// RETURNS: A pointer to the registered benchmark.
-internal::Benchmark* RegisterBenchmark(const char* name,
-                                       internal::Function* fn);
-
-#if defined(BENCHMARK_HAS_CXX11)
-template <class Lambda>
-internal::Benchmark* RegisterBenchmark(const char* name, Lambda&& fn);
-#endif
-
-// Remove all registered benchmarks. All pointers to previously registered
-// benchmarks are invalidated.
-void ClearRegisteredBenchmarks();
-
-namespace internal {
-// The class used to hold all Benchmarks created from static function.
-// (ie those created using the BENCHMARK(...) macros.
-class FunctionBenchmark : public Benchmark {
- public:
-  FunctionBenchmark(const char* name, Function* func)
-      : Benchmark(name), func_(func) {}
-
-  virtual void Run(State& st);
-
- private:
-  Function* func_;
-};
-
-#ifdef BENCHMARK_HAS_CXX11
-template <class Lambda>
-class LambdaBenchmark : public Benchmark {
- public:
-  virtual void Run(State& st) { lambda_(st); }
-
- private:
-  template <class OLambda>
-  LambdaBenchmark(const char* name, OLambda&& lam)
-      : Benchmark(name), lambda_(std::forward<OLambda>(lam)) {}
-
-  LambdaBenchmark(LambdaBenchmark const&) = delete;
-
- private:
-  template <class Lam>
-  friend Benchmark* ::benchmark::RegisterBenchmark(const char*, Lam&&);
-
-  Lambda lambda_;
-};
-#endif
-
-}  // namespace internal
-
-inline internal::Benchmark* RegisterBenchmark(const char* name,
-                                              internal::Function* fn) {
-  return internal::RegisterBenchmarkInternal(
-      ::new internal::FunctionBenchmark(name, fn));
-}
-
-#ifdef BENCHMARK_HAS_CXX11
-template <class Lambda>
-internal::Benchmark* RegisterBenchmark(const char* name, Lambda&& fn) {
-  using BenchType =
-      internal::LambdaBenchmark<typename std::decay<Lambda>::type>;
-  return internal::RegisterBenchmarkInternal(
-      ::new BenchType(name, std::forward<Lambda>(fn)));
-}
-#endif
-
-#if defined(BENCHMARK_HAS_CXX11) && \
-    (!defined(BENCHMARK_GCC_VERSION) || BENCHMARK_GCC_VERSION >= 409)
-template <class Lambda, class... Args>
-internal::Benchmark* RegisterBenchmark(const char* name, Lambda&& fn,
-                                       Args&&... args) {
-  return benchmark::RegisterBenchmark(
-      name, [=](benchmark::State& st) { fn(st, args...); });
-}
-#else
-#define BENCHMARK_HAS_NO_VARIADIC_REGISTER_BENCHMARK
-#endif
-
-// The base class for all fixture tests.
-class Fixture : public internal::Benchmark {
- public:
-  Fixture() : internal::Benchmark("") {}
-
-  virtual void Run(State& st) {
-    this->SetUp(st);
-    this->BenchmarkCase(st);
-    this->TearDown(st);
-  }
-
-  // These will be deprecated ...
-  virtual void SetUp(const State&) {}
-  virtual void TearDown(const State&) {}
-  // ... In favor of these.
-  virtual void SetUp(State& st) { SetUp(const_cast<const State&>(st)); }
-  virtual void TearDown(State& st) { TearDown(const_cast<const State&>(st)); }
-
- protected:
-  virtual void BenchmarkCase(State&) = 0;
-};
-
-}  // namespace benchmark
-
-// ------------------------------------------------------
-// Macro to register benchmarks
-
-// Check that __COUNTER__ is defined and that __COUNTER__ increases by 1
-// every time it is expanded. X + 1 == X + 0 is used in case X is defined to be
-// empty. If X is empty the expression becomes (+1 == +0).
-#if defined(__COUNTER__) && (__COUNTER__ + 1 == __COUNTER__ + 0)
-#define BENCHMARK_PRIVATE_UNIQUE_ID __COUNTER__
-#else
-#define BENCHMARK_PRIVATE_UNIQUE_ID __LINE__
-#endif
-
-// Helpers for generating unique variable names
-#define BENCHMARK_PRIVATE_NAME(n) \
-  BENCHMARK_PRIVATE_CONCAT(_benchmark_, BENCHMARK_PRIVATE_UNIQUE_ID, n)
-#define BENCHMARK_PRIVATE_CONCAT(a, b, c) BENCHMARK_PRIVATE_CONCAT2(a, b, c)
-#define BENCHMARK_PRIVATE_CONCAT2(a, b, c) a##b##c
-
-#define BENCHMARK_PRIVATE_DECLARE(n)                                 \
-  static ::benchmark::internal::Benchmark* BENCHMARK_PRIVATE_NAME(n) \
-      BENCHMARK_UNUSED
-
-#define BENCHMARK(n)                                     \
-  BENCHMARK_PRIVATE_DECLARE(n) =                         \
-      (::benchmark::internal::RegisterBenchmarkInternal( \
-          new ::benchmark::internal::FunctionBenchmark(#n, n)))
-
-// Old-style macros
-#define BENCHMARK_WITH_ARG(n, a) BENCHMARK(n)->Arg((a))
-#define BENCHMARK_WITH_ARG2(n, a1, a2) BENCHMARK(n)->Args({(a1), (a2)})
-#define BENCHMARK_WITH_UNIT(n, t) BENCHMARK(n)->Unit((t))
-#define BENCHMARK_RANGE(n, lo, hi) BENCHMARK(n)->Range((lo), (hi))
-#define BENCHMARK_RANGE2(n, l1, h1, l2, h2) \
-  BENCHMARK(n)->RangePair({{(l1), (h1)}, {(l2), (h2)}})
-
-#ifdef BENCHMARK_HAS_CXX11
-
-// Register a benchmark which invokes the function specified by `func`
-// with the additional arguments specified by `...`.
-//
-// For example:
-//
-// template <class ...ExtraArgs>`
-// void BM_takes_args(benchmark::State& state, ExtraArgs&&... extra_args) {
-//  [...]
-//}
-// /* Registers a benchmark named "BM_takes_args/int_string_test` */
-// BENCHMARK_CAPTURE(BM_takes_args, int_string_test, 42, std::string("abc"));
-#define BENCHMARK_CAPTURE(func, test_case_name, ...)     \
-  BENCHMARK_PRIVATE_DECLARE(func) =                      \
-      (::benchmark::internal::RegisterBenchmarkInternal( \
-          new ::benchmark::internal::FunctionBenchmark(  \
-              #func "/" #test_case_name,                 \
-              [](::benchmark::State& st) { func(st, __VA_ARGS__); })))
-
-#endif  // BENCHMARK_HAS_CXX11
-
-// This will register a benchmark for a templatized function.  For example:
-//
-// template<int arg>
-// void BM_Foo(int iters);
-//
-// BENCHMARK_TEMPLATE(BM_Foo, 1);
-//
-// will register BM_Foo<1> as a benchmark.
-#define BENCHMARK_TEMPLATE1(n, a)                        \
-  BENCHMARK_PRIVATE_DECLARE(n) =                         \
-      (::benchmark::internal::RegisterBenchmarkInternal( \
-          new ::benchmark::internal::FunctionBenchmark(#n "<" #a ">", n<a>)))
-
-#define BENCHMARK_TEMPLATE2(n, a, b)                                         \
-  BENCHMARK_PRIVATE_DECLARE(n) =                                             \
-      (::benchmark::internal::RegisterBenchmarkInternal(                     \
-          new ::benchmark::internal::FunctionBenchmark(#n "<" #a "," #b ">", \
-                                                       n<a, b>)))
-
-#ifdef BENCHMARK_HAS_CXX11
-#define BENCHMARK_TEMPLATE(n, ...)                       \
-  BENCHMARK_PRIVATE_DECLARE(n) =                         \
-      (::benchmark::internal::RegisterBenchmarkInternal( \
-          new ::benchmark::internal::FunctionBenchmark(  \
-              #n "<" #__VA_ARGS__ ">", n<__VA_ARGS__>)))
-#else
-#define BENCHMARK_TEMPLATE(n, a) BENCHMARK_TEMPLATE1(n, a)
-#endif
-
-#define BENCHMARK_PRIVATE_DECLARE_F(BaseClass, Method)        \
-  class BaseClass##_##Method##_Benchmark : public BaseClass { \
-   public:                                                    \
-    BaseClass##_##Method##_Benchmark() : BaseClass() {        \
-      this->SetName(#BaseClass "/" #Method);                  \
-    }                                                         \
-                                                              \
-   protected:                                                 \
-    virtual void BenchmarkCase(::benchmark::State&);          \
-  };
-
-#define BENCHMARK_TEMPLATE1_PRIVATE_DECLARE_F(BaseClass, Method, a) \
-  class BaseClass##_##Method##_Benchmark : public BaseClass<a> {    \
-   public:                                                          \
-    BaseClass##_##Method##_Benchmark() : BaseClass<a>() {           \
-      this->SetName(#BaseClass"<" #a ">/" #Method);                 \
-    }                                                               \
-                                                                    \
-   protected:                                                       \
-    virtual void BenchmarkCase(::benchmark::State&);                \
-  };
-
-#define BENCHMARK_TEMPLATE2_PRIVATE_DECLARE_F(BaseClass, Method, a, b) \
-  class BaseClass##_##Method##_Benchmark : public BaseClass<a, b> {    \
-   public:                                                             \
-    BaseClass##_##Method##_Benchmark() : BaseClass<a, b>() {           \
-      this->SetName(#BaseClass"<" #a "," #b ">/" #Method);             \
-    }                                                                  \
-                                                                       \
-   protected:                                                          \
-    virtual void BenchmarkCase(::benchmark::State&);                   \
-  };
-
-#ifdef BENCHMARK_HAS_CXX11
-#define BENCHMARK_TEMPLATE_PRIVATE_DECLARE_F(BaseClass, Method, ...)       \
-  class BaseClass##_##Method##_Benchmark : public BaseClass<__VA_ARGS__> { \
-   public:                                                                 \
-    BaseClass##_##Method##_Benchmark() : BaseClass<__VA_ARGS__>() {        \
-      this->SetName(#BaseClass"<" #__VA_ARGS__ ">/" #Method);              \
-    }                                                                      \
-                                                                           \
-   protected:                                                              \
-    virtual void BenchmarkCase(::benchmark::State&);                       \
-  };
-#else
-#define BENCHMARK_TEMPLATE_PRIVATE_DECLARE_F(n, a) BENCHMARK_TEMPLATE1_PRIVATE_DECLARE_F(n, a)
-#endif
-
-#define BENCHMARK_DEFINE_F(BaseClass, Method)    \
-  BENCHMARK_PRIVATE_DECLARE_F(BaseClass, Method) \
-  void BaseClass##_##Method##_Benchmark::BenchmarkCase
-
-#define BENCHMARK_TEMPLATE1_DEFINE_F(BaseClass, Method, a)    \
-  BENCHMARK_TEMPLATE1_PRIVATE_DECLARE_F(BaseClass, Method, a) \
-  void BaseClass##_##Method##_Benchmark::BenchmarkCase
-
-#define BENCHMARK_TEMPLATE2_DEFINE_F(BaseClass, Method, a, b)    \
-  BENCHMARK_TEMPLATE2_PRIVATE_DECLARE_F(BaseClass, Method, a, b) \
-  void BaseClass##_##Method##_Benchmark::BenchmarkCase
-
-#ifdef BENCHMARK_HAS_CXX11
-#define BENCHMARK_TEMPLATE_DEFINE_F(BaseClass, Method, ...)            \
-  BENCHMARK_TEMPLATE_PRIVATE_DECLARE_F(BaseClass, Method, __VA_ARGS__) \
-  void BaseClass##_##Method##_Benchmark::BenchmarkCase
-#else
-#define BENCHMARK_TEMPLATE_DEFINE_F(BaseClass, Method, a) BENCHMARK_TEMPLATE1_DEFINE_F(BaseClass, Method, a)
-#endif
-
-#define BENCHMARK_REGISTER_F(BaseClass, Method) \
-  BENCHMARK_PRIVATE_REGISTER_F(BaseClass##_##Method##_Benchmark)
-
-#define BENCHMARK_PRIVATE_REGISTER_F(TestName) \
-  BENCHMARK_PRIVATE_DECLARE(TestName) =        \
-      (::benchmark::internal::RegisterBenchmarkInternal(new TestName()))
-
-// This macro will define and register a benchmark within a fixture class.
-#define BENCHMARK_F(BaseClass, Method)           \
-  BENCHMARK_PRIVATE_DECLARE_F(BaseClass, Method) \
-  BENCHMARK_REGISTER_F(BaseClass, Method);       \
-  void BaseClass##_##Method##_Benchmark::BenchmarkCase
-
-#define BENCHMARK_TEMPLATE1_F(BaseClass, Method, a)           \
-  BENCHMARK_TEMPLATE1_PRIVATE_DECLARE_F(BaseClass, Method, a) \
-  BENCHMARK_REGISTER_F(BaseClass, Method);                    \
-  void BaseClass##_##Method##_Benchmark::BenchmarkCase
-
-#define BENCHMARK_TEMPLATE2_F(BaseClass, Method, a, b)           \
-  BENCHMARK_TEMPLATE2_PRIVATE_DECLARE_F(BaseClass, Method, a, b) \
-  BENCHMARK_REGISTER_F(BaseClass, Method);                       \
-  void BaseClass##_##Method##_Benchmark::BenchmarkCase
-
-#ifdef BENCHMARK_HAS_CXX11
-#define BENCHMARK_TEMPLATE_F(BaseClass, Method, ...)           \
-  BENCHMARK_TEMPLATE_PRIVATE_DECLARE_F(BaseClass, Method, __VA_ARGS__) \
-  BENCHMARK_REGISTER_F(BaseClass, Method);                     \
-  void BaseClass##_##Method##_Benchmark::BenchmarkCase
-#else
-#define BENCHMARK_TEMPLATE_F(BaseClass, Method, a) BENCHMARK_TEMPLATE1_F(BaseClass, Method, a)
-#endif
-
-// Helper macro to create a main routine in a test that runs the benchmarks
-#define BENCHMARK_MAIN()                   \
-  int main(int argc, char** argv) {        \
-    ::benchmark::Initialize(&argc, argv);  \
-    if (::benchmark::ReportUnrecognizedArguments(argc, argv)) return 1; \
-    ::benchmark::RunSpecifiedBenchmarks(); \
-  }                                        \
-  int main(int, char**)
-
-
-// ------------------------------------------------------
-// Benchmark Reporters
-
-namespace benchmark {
-
-struct CPUInfo {
-  struct CacheInfo {
-    std::string type;
-    int level;
-    int size;
-    int num_sharing;
-  };
-
-  int num_cpus;
-  double cycles_per_second;
-  std::vector<CacheInfo> caches;
-  bool scaling_enabled;
-
-  static const CPUInfo& Get();
-
- private:
-  CPUInfo();
-  BENCHMARK_DISALLOW_COPY_AND_ASSIGN(CPUInfo);
-};
-
-// Interface for custom benchmark result printers.
-// By default, benchmark reports are printed to stdout. However an application
-// can control the destination of the reports by calling
-// RunSpecifiedBenchmarks and passing it a custom reporter object.
-// The reporter object must implement the following interface.
-class BenchmarkReporter {
- public:
-  struct Context {
-    CPUInfo const& cpu_info;
-    // The number of chars in the longest benchmark name.
-    size_t name_field_width;
-    static const char *executable_name;
-    Context();
-  };
-
-  struct Run {
-    Run()
-        : error_occurred(false),
-          iterations(1),
-          time_unit(kNanosecond),
-          real_accumulated_time(0),
-          cpu_accumulated_time(0),
-          bytes_per_second(0),
-          items_per_second(0),
-          max_heapbytes_used(0),
-          complexity(oNone),
-          complexity_lambda(),
-          complexity_n(0),
-          report_big_o(false),
-          report_rms(false),
-          counters() {}
-
-    std::string benchmark_name;
-    std::string report_label;  // Empty if not set by benchmark.
-    bool error_occurred;
-    std::string error_message;
-
-    int64_t iterations;
-    TimeUnit time_unit;
-    double real_accumulated_time;
-    double cpu_accumulated_time;
-
-    // Return a value representing the real time per iteration in the unit
-    // specified by 'time_unit'.
-    // NOTE: If 'iterations' is zero the returned value represents the
-    // accumulated time.
-    double GetAdjustedRealTime() const;
-
-    // Return a value representing the cpu time per iteration in the unit
-    // specified by 'time_unit'.
-    // NOTE: If 'iterations' is zero the returned value represents the
-    // accumulated time.
-    double GetAdjustedCPUTime() const;
-
-    // Zero if not set by benchmark.
-    double bytes_per_second;
-    double items_per_second;
-
-    // This is set to 0.0 if memory tracing is not enabled.
-    double max_heapbytes_used;
-
-    // Keep track of arguments to compute asymptotic complexity
-    BigO complexity;
-    BigOFunc* complexity_lambda;
-    int64_t complexity_n;
-
-    // what statistics to compute from the measurements
-    const std::vector<Statistics>* statistics;
-
-    // Inform print function whether the current run is a complexity report
-    bool report_big_o;
-    bool report_rms;
-
-    UserCounters counters;
-  };
-
-  // Construct a BenchmarkReporter with the output stream set to 'std::cout'
-  // and the error stream set to 'std::cerr'
-  BenchmarkReporter();
-
-  // Called once for every suite of benchmarks run.
-  // The parameter "context" contains information that the
-  // reporter may wish to use when generating its report, for example the
-  // platform under which the benchmarks are running. The benchmark run is
-  // never started if this function returns false, allowing the reporter
-  // to skip runs based on the context information.
-  virtual bool ReportContext(const Context& context) = 0;
-
-  // Called once for each group of benchmark runs, gives information about
-  // cpu-time and heap memory usage during the benchmark run. If the group
-  // of runs contained more than two entries then 'report' contains additional
-  // elements representing the mean and standard deviation of those runs.
-  // Additionally if this group of runs was the last in a family of benchmarks
-  // 'reports' contains additional entries representing the asymptotic
-  // complexity and RMS of that benchmark family.
-  virtual void ReportRuns(const std::vector<Run>& report) = 0;
-
-  // Called once and only once after ever group of benchmarks is run and
-  // reported.
-  virtual void Finalize() {}
-
-  // REQUIRES: The object referenced by 'out' is valid for the lifetime
-  // of the reporter.
-  void SetOutputStream(std::ostream* out) {
-    assert(out);
-    output_stream_ = out;
-  }
-
-  // REQUIRES: The object referenced by 'err' is valid for the lifetime
-  // of the reporter.
-  void SetErrorStream(std::ostream* err) {
-    assert(err);
-    error_stream_ = err;
-  }
-
-  std::ostream& GetOutputStream() const { return *output_stream_; }
-
-  std::ostream& GetErrorStream() const { return *error_stream_; }
-
-  virtual ~BenchmarkReporter();
-
-  // Write a human readable string to 'out' representing the specified
-  // 'context'.
-  // REQUIRES: 'out' is non-null.
-  static void PrintBasicContext(std::ostream* out, Context const& context);
-
- private:
-  std::ostream* output_stream_;
-  std::ostream* error_stream_;
-};
-
-// Simple reporter that outputs benchmark data to the console. This is the
-// default reporter used by RunSpecifiedBenchmarks().
-class ConsoleReporter : public BenchmarkReporter {
-public:
-  enum OutputOptions {
-    OO_None = 0,
-    OO_Color = 1,
-    OO_Tabular = 2,
-    OO_ColorTabular = OO_Color|OO_Tabular,
-    OO_Defaults = OO_ColorTabular
-  };
-  explicit ConsoleReporter(OutputOptions opts_ = OO_Defaults)
-      : output_options_(opts_), name_field_width_(0),
-        prev_counters_(), printed_header_(false) {}
-
-  virtual bool ReportContext(const Context& context);
-  virtual void ReportRuns(const std::vector<Run>& reports);
-
- protected:
-  virtual void PrintRunData(const Run& report);
-  virtual void PrintHeader(const Run& report);
-
-  OutputOptions output_options_;
-  size_t name_field_width_;
-  UserCounters prev_counters_;
-  bool printed_header_;
-};
-
-class JSONReporter : public BenchmarkReporter {
- public:
-  JSONReporter() : first_report_(true) {}
-  virtual bool ReportContext(const Context& context);
-  virtual void ReportRuns(const std::vector<Run>& reports);
-  virtual void Finalize();
-
- private:
-  void PrintRunData(const Run& report);
-
-  bool first_report_;
-};
-
-class CSVReporter : public BenchmarkReporter {
- public:
-  CSVReporter() : printed_header_(false) {}
-  virtual bool ReportContext(const Context& context);
-  virtual void ReportRuns(const std::vector<Run>& reports);
-
- private:
-  void PrintRunData(const Run& report);
-
-  bool printed_header_;
-  std::set< std::string > user_counter_names_;
-};
-
-inline const char* GetTimeUnitString(TimeUnit unit) {
-  switch (unit) {
-    case kMillisecond:
-      return "ms";
-    case kMicrosecond:
-      return "us";
-    case kNanosecond:
-    default:
-      return "ns";
-  }
-}
-
-inline double GetTimeUnitMultiplier(TimeUnit unit) {
-  switch (unit) {
-    case kMillisecond:
-      return 1e3;
-    case kMicrosecond:
-      return 1e6;
-    case kNanosecond:
-    default:
-      return 1e9;
-  }
-}
-
-} // namespace benchmark
-
-#endif  // BENCHMARK_BENCHMARK_H_
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/mingw.py b/external_imported/json/benchmarks/thirdparty/benchmark/mingw.py
deleted file mode 100755
index 706ad559d..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/mingw.py
+++ /dev/null
@@ -1,320 +0,0 @@
-#! /usr/bin/env python
-# encoding: utf-8
-
-import argparse
-import errno
-import logging
-import os
-import platform
-import re
-import sys
-import subprocess
-import tempfile
-
-try:
-    import winreg
-except ImportError:
-    import _winreg as winreg
-try:
-    import urllib.request as request
-except ImportError:
-    import urllib as request
-try:
-    import urllib.parse as parse
-except ImportError:
-    import urlparse as parse
-
-class EmptyLogger(object):
-    '''
-    Provides an implementation that performs no logging
-    '''
-    def debug(self, *k, **kw):
-        pass
-    def info(self, *k, **kw):
-        pass
-    def warn(self, *k, **kw):
-        pass
-    def error(self, *k, **kw):
-        pass
-    def critical(self, *k, **kw):
-        pass
-    def setLevel(self, *k, **kw):
-        pass
-
-urls = (
-    'http://downloads.sourceforge.net/project/mingw-w64/Toolchains%20'
-        'targetting%20Win32/Personal%20Builds/mingw-builds/installer/'
-        'repository.txt',
-    'http://downloads.sourceforge.net/project/mingwbuilds/host-windows/'
-        'repository.txt'
-)
-'''
-A list of mingw-build repositories
-'''
-
-def repository(urls = urls, log = EmptyLogger()):
-    '''
-    Downloads and parse mingw-build repository files and parses them
-    '''
-    log.info('getting mingw-builds repository')
-    versions = {}
-    re_sourceforge = re.compile(r'http://sourceforge.net/projects/([^/]+)/files')
-    re_sub = r'http://downloads.sourceforge.net/project/\1'
-    for url in urls:
-        log.debug(' - requesting: %s', url)
-        socket = request.urlopen(url)
-        repo = socket.read()
-        if not isinstance(repo, str):
-            repo = repo.decode();
-        socket.close()
-        for entry in repo.split('\n')[:-1]:
-            value = entry.split('|')
-            version = tuple([int(n) for n in value[0].strip().split('.')])
-            version = versions.setdefault(version, {})
-            arch = value[1].strip()
-            if arch == 'x32':
-                arch = 'i686'
-            elif arch == 'x64':
-                arch = 'x86_64'
-            arch = version.setdefault(arch, {})
-            threading = arch.setdefault(value[2].strip(), {})
-            exceptions = threading.setdefault(value[3].strip(), {})
-            revision = exceptions.setdefault(int(value[4].strip()[3:]),
-                re_sourceforge.sub(re_sub, value[5].strip()))
-    return versions
-
-def find_in_path(file, path=None):
-    '''
-    Attempts to find an executable in the path
-    '''
-    if platform.system() == 'Windows':
-        file += '.exe'
-    if path is None:
-        path = os.environ.get('PATH', '')
-    if type(path) is type(''):
-        path = path.split(os.pathsep)
-    return list(filter(os.path.exists,
-        map(lambda dir, file=file: os.path.join(dir, file), path)))
-
-def find_7zip(log = EmptyLogger()):
-    '''
-    Attempts to find 7zip for unpacking the mingw-build archives
-    '''
-    log.info('finding 7zip')
-    path = find_in_path('7z')
-    if not path:
-        key = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, r'SOFTWARE\7-Zip')
-        path, _ = winreg.QueryValueEx(key, 'Path')
-        path = [os.path.join(path, '7z.exe')]
-    log.debug('found \'%s\'', path[0])
-    return path[0]
-
-find_7zip()
-
-def unpack(archive, location, log = EmptyLogger()):
-    '''
-    Unpacks a mingw-builds archive
-    '''
-    sevenzip = find_7zip(log)
-    log.info('unpacking %s', os.path.basename(archive))
-    cmd = [sevenzip, 'x', archive, '-o' + location, '-y']
-    log.debug(' - %r', cmd)
-    with open(os.devnull, 'w') as devnull:
-        subprocess.check_call(cmd, stdout = devnull)
-
-def download(url, location, log = EmptyLogger()):
-    '''
-    Downloads and unpacks a mingw-builds archive
-    '''
-    log.info('downloading MinGW')
-    log.debug(' - url: %s', url)
-    log.debug(' - location: %s', location)
-
-    re_content = re.compile(r'attachment;[ \t]*filename=(")?([^"]*)(")?[\r\n]*')
-
-    stream = request.urlopen(url)
-    try:
-        content = stream.getheader('Content-Disposition') or ''
-    except AttributeError:
-        content = stream.headers.getheader('Content-Disposition') or ''
-    matches = re_content.match(content)
-    if matches:
-        filename = matches.group(2)
-    else:
-        parsed = parse.urlparse(stream.geturl())
-        filename = os.path.basename(parsed.path)
-
-    try:
-        os.makedirs(location)
-    except OSError as e:
-        if e.errno == errno.EEXIST and os.path.isdir(location):
-            pass
-        else:
-            raise
-
-    archive = os.path.join(location, filename)
-    with open(archive, 'wb') as out:
-        while True:
-            buf = stream.read(1024)
-            if not buf:
-                break
-            out.write(buf)
-    unpack(archive, location, log = log)
-    os.remove(archive)
-
-    possible = os.path.join(location, 'mingw64')
-    if not os.path.exists(possible):
-        possible = os.path.join(location, 'mingw32')
-        if not os.path.exists(possible):
-            raise ValueError('Failed to find unpacked MinGW: ' + possible)
-    return possible
-
-def root(location = None, arch = None, version = None, threading = None,
-        exceptions = None, revision = None, log = EmptyLogger()):
-    '''
-    Returns the root folder of a specific version of the mingw-builds variant
-    of gcc. Will download the compiler if needed
-    '''
-
-    # Get the repository if we don't have all the information
-    if not (arch and version and threading and exceptions and revision):
-        versions = repository(log = log)
-
-    # Determine some defaults
-    version = version or max(versions.keys())
-    if not arch:
-        arch = platform.machine().lower()
-        if arch == 'x86':
-            arch = 'i686'
-        elif arch == 'amd64':
-            arch = 'x86_64'
-    if not threading:
-        keys = versions[version][arch].keys()
-        if 'posix' in keys:
-            threading = 'posix'
-        elif 'win32' in keys:
-            threading = 'win32'
-        else:
-            threading = keys[0]
-    if not exceptions:
-        keys = versions[version][arch][threading].keys()
-        if 'seh' in keys:
-            exceptions = 'seh'
-        elif 'sjlj' in keys:
-            exceptions = 'sjlj'
-        else:
-            exceptions = keys[0]
-    if revision == None:
-        revision = max(versions[version][arch][threading][exceptions].keys())
-    if not location:
-        location = os.path.join(tempfile.gettempdir(), 'mingw-builds')
-
-    # Get the download url
-    url = versions[version][arch][threading][exceptions][revision]
-
-    # Tell the user whatzzup
-    log.info('finding MinGW %s', '.'.join(str(v) for v in version))
-    log.debug(' - arch: %s', arch)
-    log.debug(' - threading: %s', threading)
-    log.debug(' - exceptions: %s', exceptions)
-    log.debug(' - revision: %s', revision)
-    log.debug(' - url: %s', url)
-
-    # Store each specific revision differently
-    slug = '{version}-{arch}-{threading}-{exceptions}-rev{revision}'
-    slug = slug.format(
-        version = '.'.join(str(v) for v in version),
-        arch = arch,
-        threading = threading,
-        exceptions = exceptions,
-        revision = revision
-    )
-    if arch == 'x86_64':
-        root_dir = os.path.join(location, slug, 'mingw64')
-    elif arch == 'i686':
-        root_dir = os.path.join(location, slug, 'mingw32')
-    else:
-        raise ValueError('Unknown MinGW arch: ' + arch)
-
-    # Download if needed
-    if not os.path.exists(root_dir):
-        downloaded = download(url, os.path.join(location, slug), log = log)
-        if downloaded != root_dir:
-            raise ValueError('The location of mingw did not match\n%s\n%s'
-                % (downloaded, root_dir))
-
-    return root_dir
-
-def str2ver(string):
-    '''
-    Converts a version string into a tuple
-    '''
-    try:
-        version = tuple(int(v) for v in string.split('.'))
-        if len(version) is not 3:
-            raise ValueError()
-    except ValueError:
-        raise argparse.ArgumentTypeError(
-            'please provide a three digit version string')
-    return version
-
-def main():
-    '''
-    Invoked when the script is run directly by the python interpreter
-    '''
-    parser = argparse.ArgumentParser(
-        description = 'Downloads a specific version of MinGW',
-        formatter_class = argparse.ArgumentDefaultsHelpFormatter
-    )
-    parser.add_argument('--location',
-        help = 'the location to download the compiler to',
-        default = os.path.join(tempfile.gettempdir(), 'mingw-builds'))
-    parser.add_argument('--arch', required = True, choices = ['i686', 'x86_64'],
-        help = 'the target MinGW architecture string')
-    parser.add_argument('--version', type = str2ver,
-        help = 'the version of GCC to download')
-    parser.add_argument('--threading', choices = ['posix', 'win32'],
-        help = 'the threading type of the compiler')
-    parser.add_argument('--exceptions', choices = ['sjlj', 'seh', 'dwarf'],
-        help = 'the method to throw exceptions')
-    parser.add_argument('--revision', type=int,
-        help = 'the revision of the MinGW release')
-    group = parser.add_mutually_exclusive_group()
-    group.add_argument('-v', '--verbose', action='store_true',
-        help='increase the script output verbosity')
-    group.add_argument('-q', '--quiet', action='store_true',
-        help='only print errors and warning')
-    args = parser.parse_args()
-
-    # Create the logger
-    logger = logging.getLogger('mingw')
-    handler = logging.StreamHandler()
-    formatter = logging.Formatter('%(message)s')
-    handler.setFormatter(formatter)
-    logger.addHandler(handler)
-    logger.setLevel(logging.INFO)
-    if args.quiet:
-        logger.setLevel(logging.WARN)
-    if args.verbose:
-        logger.setLevel(logging.DEBUG)
-
-    # Get MinGW
-    root_dir = root(location = args.location, arch = args.arch,
-        version = args.version, threading = args.threading,
-        exceptions = args.exceptions, revision = args.revision,
-        log = logger)
-
-    sys.stdout.write('%s\n' % os.path.join(root_dir, 'bin'))
-
-if __name__ == '__main__':
-    try:
-        main()
-    except IOError as e:
-        sys.stderr.write('IO error: %s\n' % e)
-        sys.exit(1)
-    except OSError as e:
-        sys.stderr.write('OS error: %s\n' % e)
-        sys.exit(1)
-    except KeyboardInterrupt as e:
-        sys.stderr.write('Killed\n')
-        sys.exit(1)
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/releasing.md b/external_imported/json/benchmarks/thirdparty/benchmark/releasing.md
deleted file mode 100755
index f0cd7010e..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/releasing.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# How to release
-
-* Make sure you're on master and synced to HEAD
-* Ensure the project builds and tests run (sanity check only, obviously)
-    * `parallel -j0 exec ::: test/*_test` can help ensure everything at least
-      passes
-* Prepare release notes
-    * `git log $(git describe --abbrev=0 --tags)..HEAD` gives you the list of
-      commits between the last annotated tag and HEAD
-    * Pick the most interesting.
-* Create a release through github's interface
-    * Note this will create a lightweight tag.
-    * Update this to an annotated tag:
-      * `git pull --tags`
-      * `git tag -a -f <tag> <tag>`
-      * `git push --force origin`
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/src/CMakeLists.txt b/external_imported/json/benchmarks/thirdparty/benchmark/src/CMakeLists.txt
deleted file mode 100755
index 701804ba0..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/src/CMakeLists.txt
+++ /dev/null
@@ -1,105 +0,0 @@
-# Allow the source files to find headers in src/
-include_directories(${PROJECT_SOURCE_DIR}/src)
-
-if (DEFINED BENCHMARK_CXX_LINKER_FLAGS)
-  list(APPEND CMAKE_SHARED_LINKER_FLAGS ${BENCHMARK_CXX_LINKER_FLAGS})
-  list(APPEND CMAKE_MODULE_LINKER_FLAGS ${BENCHMARK_CXX_LINKER_FLAGS})
-endif()
-
-file(GLOB
-  SOURCE_FILES
-    *.cc
-    ${PROJECT_SOURCE_DIR}/include/benchmark/*.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
-list(FILTER SOURCE_FILES EXCLUDE REGEX "benchmark_main\\.cc")
-
-add_library(benchmark ${SOURCE_FILES})
-set_target_properties(benchmark PROPERTIES
-  OUTPUT_NAME "benchmark"
-  VERSION ${GENERIC_LIB_VERSION}
-  SOVERSION ${GENERIC_LIB_SOVERSION}
-)
-target_include_directories(benchmark PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
-    )
-
-# Link threads.
-target_link_libraries(benchmark  ${BENCHMARK_CXX_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
-find_library(LIBRT rt)
-if(LIBRT)
-  target_link_libraries(benchmark ${LIBRT})
-endif()
-
-# We need extra libraries on Windows
-if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-  target_link_libraries(benchmark Shlwapi)
-endif()
-
-# We need extra libraries on Solaris
-if(${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
-  target_link_libraries(benchmark kstat)
-endif()
-
-# Benchmark main library
-add_library(benchmark_main "benchmark_main.cc")
-set_target_properties(benchmark_main PROPERTIES
-  OUTPUT_NAME "benchmark_main"
-  VERSION ${GENERIC_LIB_VERSION}
-  SOVERSION ${GENERIC_LIB_SOVERSION}
-)
-target_include_directories(benchmark PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
-    )
-target_link_libraries(benchmark_main benchmark)
-
-set(include_install_dir "include")
-set(lib_install_dir "lib/")
-set(bin_install_dir "bin/")
-set(config_install_dir "lib/cmake/${PROJECT_NAME}")
-set(pkgconfig_install_dir "lib/pkgconfig")
-
-set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated")
-
-set(version_config "${generated_dir}/${PROJECT_NAME}ConfigVersion.cmake")
-set(project_config "${generated_dir}/${PROJECT_NAME}Config.cmake")
-set(pkg_config "${generated_dir}/${PROJECT_NAME}.pc")
-set(targets_export_name "${PROJECT_NAME}Targets")
-
-set(namespace "${PROJECT_NAME}::")
-
-include(CMakePackageConfigHelpers)
-write_basic_package_version_file(
-    "${version_config}" VERSION ${GIT_VERSION} COMPATIBILITY SameMajorVersion
-)
-
-configure_file("${PROJECT_SOURCE_DIR}/cmake/Config.cmake.in" "${project_config}" @ONLY)
-configure_file("${PROJECT_SOURCE_DIR}/cmake/benchmark.pc.in" "${pkg_config}" @ONLY)
-
-if (BENCHMARK_ENABLE_INSTALL)
-  # Install target (will install the library to specified CMAKE_INSTALL_PREFIX variable)
-  install(
-    TARGETS benchmark benchmark_main
-    EXPORT ${targets_export_name}
-    ARCHIVE DESTINATION ${lib_install_dir}
-    LIBRARY DESTINATION ${lib_install_dir}
-    RUNTIME DESTINATION ${bin_install_dir}
-    INCLUDES DESTINATION ${include_install_dir})
-
-  install(
-    DIRECTORY "${PROJECT_SOURCE_DIR}/include/benchmark"
-    DESTINATION ${include_install_dir}
-    FILES_MATCHING PATTERN "*.*h")
-
-  install(
-      FILES "${project_config}" "${version_config}"
-      DESTINATION "${config_install_dir}")
-
-  install(
-      FILES "${pkg_config}"
-      DESTINATION "${pkgconfig_install_dir}")
-
-  install(
-      EXPORT "${targets_export_name}"
-      NAMESPACE "${namespace}"
-      DESTINATION "${config_install_dir}")
-endif()
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/src/arraysize.h b/external_imported/json/benchmarks/thirdparty/benchmark/src/arraysize.h
deleted file mode 100755
index 51a50f2df..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/src/arraysize.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef BENCHMARK_ARRAYSIZE_H_
-#define BENCHMARK_ARRAYSIZE_H_
-
-#include "internal_macros.h"
-
-namespace benchmark {
-namespace internal {
-// The arraysize(arr) macro returns the # of elements in an array arr.
-// The expression is a compile-time constant, and therefore can be
-// used in defining new arrays, for example.  If you use arraysize on
-// a pointer by mistake, you will get a compile-time error.
-//
-
-// This template function declaration is used in defining arraysize.
-// Note that the function doesn't need an implementation, as we only
-// use its type.
-template <typename T, size_t N>
-char (&ArraySizeHelper(T (&array)[N]))[N];
-
-// That gcc wants both of these prototypes seems mysterious. VC, for
-// its part, can't decide which to use (another mystery). Matching of
-// template overloads: the final frontier.
-#ifndef COMPILER_MSVC
-template <typename T, size_t N>
-char (&ArraySizeHelper(const T (&array)[N]))[N];
-#endif
-
-#define arraysize(array) (sizeof(::benchmark::internal::ArraySizeHelper(array)))
-
-}  // end namespace internal
-}  // end namespace benchmark
-
-#endif  // BENCHMARK_ARRAYSIZE_H_
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/src/benchmark.cc b/external_imported/json/benchmarks/thirdparty/benchmark/src/benchmark.cc
deleted file mode 100755
index 82b15ac70..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/src/benchmark.cc
+++ /dev/null
@@ -1,630 +0,0 @@
-// Copyright 2015 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "benchmark/benchmark.h"
-#include "benchmark_api_internal.h"
-#include "internal_macros.h"
-
-#ifndef BENCHMARK_OS_WINDOWS
-#ifndef BENCHMARK_OS_FUCHSIA
-#include <sys/resource.h>
-#endif
-#include <sys/time.h>
-#include <unistd.h>
-#endif
-
-#include <algorithm>
-#include <atomic>
-#include <condition_variable>
-#include <cstdio>
-#include <cstdlib>
-#include <fstream>
-#include <iostream>
-#include <memory>
-#include <string>
-#include <thread>
-
-#include "check.h"
-#include "colorprint.h"
-#include "commandlineflags.h"
-#include "complexity.h"
-#include "counter.h"
-#include "internal_macros.h"
-#include "log.h"
-#include "mutex.h"
-#include "re.h"
-#include "statistics.h"
-#include "string_util.h"
-#include "thread_manager.h"
-#include "thread_timer.h"
-
-DEFINE_bool(benchmark_list_tests, false,
-            "Print a list of benchmarks. This option overrides all other "
-            "options.");
-
-DEFINE_string(benchmark_filter, ".",
-              "A regular expression that specifies the set of benchmarks "
-              "to execute.  If this flag is empty, no benchmarks are run.  "
-              "If this flag is the string \"all\", all benchmarks linked "
-              "into the process are run.");
-
-DEFINE_double(benchmark_min_time, 0.5,
-              "Minimum number of seconds we should run benchmark before "
-              "results are considered significant.  For cpu-time based "
-              "tests, this is the lower bound on the total cpu time "
-              "used by all threads that make up the test.  For real-time "
-              "based tests, this is the lower bound on the elapsed time "
-              "of the benchmark execution, regardless of number of "
-              "threads.");
-
-DEFINE_int32(benchmark_repetitions, 1,
-             "The number of runs of each benchmark. If greater than 1, the "
-             "mean and standard deviation of the runs will be reported.");
-
-DEFINE_bool(benchmark_report_aggregates_only, false,
-            "Report the result of each benchmark repetitions. When 'true' is "
-            "specified only the mean, standard deviation, and other statistics "
-            "are reported for repeated benchmarks.");
-
-DEFINE_string(benchmark_format, "console",
-              "The format to use for console output. Valid values are "
-              "'console', 'json', or 'csv'.");
-
-DEFINE_string(benchmark_out_format, "json",
-              "The format to use for file output. Valid values are "
-              "'console', 'json', or 'csv'.");
-
-DEFINE_string(benchmark_out, "", "The file to write additional output to");
-
-DEFINE_string(benchmark_color, "auto",
-              "Whether to use colors in the output.  Valid values: "
-              "'true'/'yes'/1, 'false'/'no'/0, and 'auto'. 'auto' means to use "
-              "colors if the output is being sent to a terminal and the TERM "
-              "environment variable is set to a terminal type that supports "
-              "colors.");
-
-DEFINE_bool(benchmark_counters_tabular, false,
-            "Whether to use tabular format when printing user counters to "
-            "the console.  Valid values: 'true'/'yes'/1, 'false'/'no'/0."
-            "Defaults to false.");
-
-DEFINE_int32(v, 0, "The level of verbose logging to output");
-
-namespace benchmark {
-
-namespace {
-static const size_t kMaxIterations = 1000000000;
-}  // end namespace
-
-namespace internal {
-
-void UseCharPointer(char const volatile*) {}
-
-namespace {
-
-BenchmarkReporter::Run CreateRunReport(
-    const benchmark::internal::Benchmark::Instance& b,
-    const internal::ThreadManager::Result& results,
-    double seconds) {
-  // Create report about this benchmark run.
-  BenchmarkReporter::Run report;
-
-  report.benchmark_name = b.name;
-  report.error_occurred = results.has_error_;
-  report.error_message = results.error_message_;
-  report.report_label = results.report_label_;
-  // This is the total iterations across all threads.
-  report.iterations = results.iterations;
-  report.time_unit = b.time_unit;
-
-  if (!report.error_occurred) {
-    double bytes_per_second = 0;
-    if (results.bytes_processed > 0 && seconds > 0.0) {
-      bytes_per_second = (results.bytes_processed / seconds);
-    }
-    double items_per_second = 0;
-    if (results.items_processed > 0 && seconds > 0.0) {
-      items_per_second = (results.items_processed / seconds);
-    }
-
-    if (b.use_manual_time) {
-      report.real_accumulated_time = results.manual_time_used;
-    } else {
-      report.real_accumulated_time = results.real_time_used;
-    }
-    report.cpu_accumulated_time = results.cpu_time_used;
-    report.bytes_per_second = bytes_per_second;
-    report.items_per_second = items_per_second;
-    report.complexity_n = results.complexity_n;
-    report.complexity = b.complexity;
-    report.complexity_lambda = b.complexity_lambda;
-    report.statistics = b.statistics;
-    report.counters = results.counters;
-    internal::Finish(&report.counters, seconds, b.threads);
-  }
-  return report;
-}
-
-// Execute one thread of benchmark b for the specified number of iterations.
-// Adds the stats collected for the thread into *total.
-void RunInThread(const benchmark::internal::Benchmark::Instance* b,
-                 size_t iters, int thread_id,
-                 internal::ThreadManager* manager) {
-  internal::ThreadTimer timer;
-  State st(iters, b->arg, thread_id, b->threads, &timer, manager);
-  b->benchmark->Run(st);
-  CHECK(st.iterations() >= st.max_iterations)
-      << "Benchmark returned before State::KeepRunning() returned false!";
-  {
-    MutexLock l(manager->GetBenchmarkMutex());
-    internal::ThreadManager::Result& results = manager->results;
-    results.iterations += st.iterations();
-    results.cpu_time_used += timer.cpu_time_used();
-    results.real_time_used += timer.real_time_used();
-    results.manual_time_used += timer.manual_time_used();
-    results.bytes_processed += st.bytes_processed();
-    results.items_processed += st.items_processed();
-    results.complexity_n += st.complexity_length_n();
-    internal::Increment(&results.counters, st.counters);
-  }
-  manager->NotifyThreadComplete();
-}
-
-std::vector<BenchmarkReporter::Run> RunBenchmark(
-    const benchmark::internal::Benchmark::Instance& b,
-    std::vector<BenchmarkReporter::Run>* complexity_reports) {
-  std::vector<BenchmarkReporter::Run> reports;  // return value
-
-  const bool has_explicit_iteration_count = b.iterations != 0;
-  size_t iters = has_explicit_iteration_count ? b.iterations : 1;
-  std::unique_ptr<internal::ThreadManager> manager;
-  std::vector<std::thread> pool(b.threads - 1);
-  const int repeats =
-      b.repetitions != 0 ? b.repetitions : FLAGS_benchmark_repetitions;
-  const bool report_aggregates_only =
-      repeats != 1 &&
-      (b.report_mode == internal::RM_Unspecified
-           ? FLAGS_benchmark_report_aggregates_only
-           : b.report_mode == internal::RM_ReportAggregatesOnly);
-  for (int repetition_num = 0; repetition_num < repeats; repetition_num++) {
-    for (;;) {
-      // Try benchmark
-      VLOG(2) << "Running " << b.name << " for " << iters << "\n";
-
-      manager.reset(new internal::ThreadManager(b.threads));
-      for (std::size_t ti = 0; ti < pool.size(); ++ti) {
-        pool[ti] = std::thread(&RunInThread, &b, iters,
-                               static_cast<int>(ti + 1), manager.get());
-      }
-      RunInThread(&b, iters, 0, manager.get());
-      manager->WaitForAllThreads();
-      for (std::thread& thread : pool) thread.join();
-      internal::ThreadManager::Result results;
-      {
-        MutexLock l(manager->GetBenchmarkMutex());
-        results = manager->results;
-      }
-      manager.reset();
-      // Adjust real/manual time stats since they were reported per thread.
-      results.real_time_used /= b.threads;
-      results.manual_time_used /= b.threads;
-
-      VLOG(2) << "Ran in " << results.cpu_time_used << "/"
-              << results.real_time_used << "\n";
-
-      // Base decisions off of real time if requested by this benchmark.
-      double seconds = results.cpu_time_used;
-      if (b.use_manual_time) {
-        seconds = results.manual_time_used;
-      } else if (b.use_real_time) {
-        seconds = results.real_time_used;
-      }
-
-      const double min_time =
-          !IsZero(b.min_time) ? b.min_time : FLAGS_benchmark_min_time;
-
-      // Determine if this run should be reported; Either it has
-      // run for a sufficient amount of time or because an error was reported.
-      const bool should_report =  repetition_num > 0
-        || has_explicit_iteration_count  // An exact iteration count was requested
-        || results.has_error_
-        || iters >= kMaxIterations  // No chance to try again, we hit the limit.
-        || seconds >= min_time  // the elapsed time is large enough
-        // CPU time is specified but the elapsed real time greatly exceeds the
-        // minimum time. Note that user provided timers are except from this
-        // sanity check.
-        || ((results.real_time_used >= 5 * min_time) && !b.use_manual_time);
-
-      if (should_report) {
-        BenchmarkReporter::Run report = CreateRunReport(b, results, seconds);
-        if (!report.error_occurred && b.complexity != oNone)
-          complexity_reports->push_back(report);
-        reports.push_back(report);
-        break;
-      }
-
-      // See how much iterations should be increased by
-      // Note: Avoid division by zero with max(seconds, 1ns).
-      double multiplier = min_time * 1.4 / std::max(seconds, 1e-9);
-      // If our last run was at least 10% of FLAGS_benchmark_min_time then we
-      // use the multiplier directly. Otherwise we use at most 10 times
-      // expansion.
-      // NOTE: When the last run was at least 10% of the min time the max
-      // expansion should be 14x.
-      bool is_significant = (seconds / min_time) > 0.1;
-      multiplier = is_significant ? multiplier : std::min(10.0, multiplier);
-      if (multiplier <= 1.0) multiplier = 2.0;
-      double next_iters = std::max(multiplier * iters, iters + 1.0);
-      if (next_iters > kMaxIterations) {
-        next_iters = kMaxIterations;
-      }
-      VLOG(3) << "Next iters: " << next_iters << ", " << multiplier << "\n";
-      iters = static_cast<int>(next_iters + 0.5);
-    }
-  }
-  // Calculate additional statistics
-  auto stat_reports = ComputeStats(reports);
-  if ((b.complexity != oNone) && b.last_benchmark_instance) {
-    auto additional_run_stats = ComputeBigO(*complexity_reports);
-    stat_reports.insert(stat_reports.end(), additional_run_stats.begin(),
-                        additional_run_stats.end());
-    complexity_reports->clear();
-  }
-
-  if (report_aggregates_only) reports.clear();
-  reports.insert(reports.end(), stat_reports.begin(), stat_reports.end());
-  return reports;
-}
-
-}  // namespace
-}  // namespace internal
-
-State::State(size_t max_iters, const std::vector<int64_t>& ranges, int thread_i,
-             int n_threads, internal::ThreadTimer* timer,
-             internal::ThreadManager* manager)
-    : total_iterations_(0),
-      batch_leftover_(0),
-      max_iterations(max_iters),
-      started_(false),
-      finished_(false),
-      error_occurred_(false),
-      range_(ranges),
-      bytes_processed_(0),
-      items_processed_(0),
-      complexity_n_(0),
-      counters(),
-      thread_index(thread_i),
-      threads(n_threads),
-      timer_(timer),
-      manager_(manager) {
-  CHECK(max_iterations != 0) << "At least one iteration must be run";
-  CHECK_LT(thread_index, threads) << "thread_index must be less than threads";
-
-  // Note: The use of offsetof below is technically undefined until C++17
-  // because State is not a standard layout type. However, all compilers
-  // currently provide well-defined behavior as an extension (which is
-  // demonstrated since constexpr evaluation must diagnose all undefined
-  // behavior). However, GCC and Clang also warn about this use of offsetof,
-  // which must be suppressed.
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Winvalid-offsetof"
-#endif
-  // Offset tests to ensure commonly accessed data is on the first cache line.
-  const int cache_line_size = 64;
-  static_assert(offsetof(State, error_occurred_) <=
-                (cache_line_size - sizeof(error_occurred_)), "");
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
-}
-
-void State::PauseTiming() {
-  // Add in time accumulated so far
-  CHECK(started_ && !finished_ && !error_occurred_);
-  timer_->StopTimer();
-}
-
-void State::ResumeTiming() {
-  CHECK(started_ && !finished_ && !error_occurred_);
-  timer_->StartTimer();
-}
-
-void State::SkipWithError(const char* msg) {
-  CHECK(msg);
-  error_occurred_ = true;
-  {
-    MutexLock l(manager_->GetBenchmarkMutex());
-    if (manager_->results.has_error_ == false) {
-      manager_->results.error_message_ = msg;
-      manager_->results.has_error_ = true;
-    }
-  }
-  total_iterations_ = 0;
-  if (timer_->running()) timer_->StopTimer();
-}
-
-void State::SetIterationTime(double seconds) {
-  timer_->SetIterationTime(seconds);
-}
-
-void State::SetLabel(const char* label) {
-  MutexLock l(manager_->GetBenchmarkMutex());
-  manager_->results.report_label_ = label;
-}
-
-void State::StartKeepRunning() {
-  CHECK(!started_ && !finished_);
-  started_ = true;
-  total_iterations_ = error_occurred_ ? 0 : max_iterations;
-  manager_->StartStopBarrier();
-  if (!error_occurred_) ResumeTiming();
-}
-
-void State::FinishKeepRunning() {
-  CHECK(started_ && (!finished_ || error_occurred_));
-  if (!error_occurred_) {
-    PauseTiming();
-  }
-  // Total iterations has now wrapped around past 0. Fix this.
-  total_iterations_ = 0;
-  finished_ = true;
-  manager_->StartStopBarrier();
-}
-
-namespace internal {
-namespace {
-
-void RunBenchmarks(const std::vector<Benchmark::Instance>& benchmarks,
-                           BenchmarkReporter* console_reporter,
-                           BenchmarkReporter* file_reporter) {
-  // Note the file_reporter can be null.
-  CHECK(console_reporter != nullptr);
-
-  // Determine the width of the name field using a minimum width of 10.
-  bool has_repetitions = FLAGS_benchmark_repetitions > 1;
-  size_t name_field_width = 10;
-  size_t stat_field_width = 0;
-  for (const Benchmark::Instance& benchmark : benchmarks) {
-    name_field_width =
-        std::max<size_t>(name_field_width, benchmark.name.size());
-    has_repetitions |= benchmark.repetitions > 1;
-
-    for(const auto& Stat : *benchmark.statistics)
-      stat_field_width = std::max<size_t>(stat_field_width, Stat.name_.size());
-  }
-  if (has_repetitions) name_field_width += 1 + stat_field_width;
-
-  // Print header here
-  BenchmarkReporter::Context context;
-  context.name_field_width = name_field_width;
-
-  // Keep track of running times of all instances of current benchmark
-  std::vector<BenchmarkReporter::Run> complexity_reports;
-
-  // We flush streams after invoking reporter methods that write to them. This
-  // ensures users get timely updates even when streams are not line-buffered.
-  auto flushStreams = [](BenchmarkReporter* reporter) {
-    if (!reporter) return;
-    std::flush(reporter->GetOutputStream());
-    std::flush(reporter->GetErrorStream());
-  };
-
-  if (console_reporter->ReportContext(context) &&
-      (!file_reporter || file_reporter->ReportContext(context))) {
-    flushStreams(console_reporter);
-    flushStreams(file_reporter);
-    for (const auto& benchmark : benchmarks) {
-      std::vector<BenchmarkReporter::Run> reports =
-          RunBenchmark(benchmark, &complexity_reports);
-      console_reporter->ReportRuns(reports);
-      if (file_reporter) file_reporter->ReportRuns(reports);
-      flushStreams(console_reporter);
-      flushStreams(file_reporter);
-    }
-  }
-  console_reporter->Finalize();
-  if (file_reporter) file_reporter->Finalize();
-  flushStreams(console_reporter);
-  flushStreams(file_reporter);
-}
-
-std::unique_ptr<BenchmarkReporter> CreateReporter(
-    std::string const& name, ConsoleReporter::OutputOptions output_opts) {
-  typedef std::unique_ptr<BenchmarkReporter> PtrType;
-  if (name == "console") {
-    return PtrType(new ConsoleReporter(output_opts));
-  } else if (name == "json") {
-    return PtrType(new JSONReporter);
-  } else if (name == "csv") {
-    return PtrType(new CSVReporter);
-  } else {
-    std::cerr << "Unexpected format: '" << name << "'\n";
-    std::exit(1);
-  }
-}
-
-}  // end namespace
-
-bool IsZero(double n) {
-  return std::abs(n) < std::numeric_limits<double>::epsilon();
-}
-
-ConsoleReporter::OutputOptions GetOutputOptions(bool force_no_color) {
-  int output_opts = ConsoleReporter::OO_Defaults;
-  if ((FLAGS_benchmark_color == "auto" && IsColorTerminal()) ||
-      IsTruthyFlagValue(FLAGS_benchmark_color)) {
-    output_opts |= ConsoleReporter::OO_Color;
-  } else {
-    output_opts &= ~ConsoleReporter::OO_Color;
-  }
-  if(force_no_color) {
-    output_opts &= ~ConsoleReporter::OO_Color;
-  }
-  if(FLAGS_benchmark_counters_tabular) {
-    output_opts |= ConsoleReporter::OO_Tabular;
-  } else {
-    output_opts &= ~ConsoleReporter::OO_Tabular;
-  }
-  return static_cast< ConsoleReporter::OutputOptions >(output_opts);
-}
-
-}  // end namespace internal
-
-size_t RunSpecifiedBenchmarks() {
-  return RunSpecifiedBenchmarks(nullptr, nullptr);
-}
-
-size_t RunSpecifiedBenchmarks(BenchmarkReporter* console_reporter) {
-  return RunSpecifiedBenchmarks(console_reporter, nullptr);
-}
-
-size_t RunSpecifiedBenchmarks(BenchmarkReporter* console_reporter,
-                              BenchmarkReporter* file_reporter) {
-  std::string spec = FLAGS_benchmark_filter;
-  if (spec.empty() || spec == "all")
-    spec = ".";  // Regexp that matches all benchmarks
-
-  // Setup the reporters
-  std::ofstream output_file;
-  std::unique_ptr<BenchmarkReporter> default_console_reporter;
-  std::unique_ptr<BenchmarkReporter> default_file_reporter;
-  if (!console_reporter) {
-    default_console_reporter = internal::CreateReporter(
-          FLAGS_benchmark_format, internal::GetOutputOptions());
-    console_reporter = default_console_reporter.get();
-  }
-  auto& Out = console_reporter->GetOutputStream();
-  auto& Err = console_reporter->GetErrorStream();
-
-  std::string const& fname = FLAGS_benchmark_out;
-  if (fname.empty() && file_reporter) {
-    Err << "A custom file reporter was provided but "
-           "--benchmark_out=<file> was not specified."
-        << std::endl;
-    std::exit(1);
-  }
-  if (!fname.empty()) {
-    output_file.open(fname);
-    if (!output_file.is_open()) {
-      Err << "invalid file name: '" << fname << std::endl;
-      std::exit(1);
-    }
-    if (!file_reporter) {
-      default_file_reporter = internal::CreateReporter(
-          FLAGS_benchmark_out_format, ConsoleReporter::OO_None);
-      file_reporter = default_file_reporter.get();
-    }
-    file_reporter->SetOutputStream(&output_file);
-    file_reporter->SetErrorStream(&output_file);
-  }
-
-  std::vector<internal::Benchmark::Instance> benchmarks;
-  if (!FindBenchmarksInternal(spec, &benchmarks, &Err)) return 0;
-
-  if (benchmarks.empty()) {
-    Err << "Failed to match any benchmarks against regex: " << spec << "\n";
-    return 0;
-  }
-
-  if (FLAGS_benchmark_list_tests) {
-    for (auto const& benchmark : benchmarks) Out << benchmark.name << "\n";
-  } else {
-    internal::RunBenchmarks(benchmarks, console_reporter, file_reporter);
-  }
-
-  return benchmarks.size();
-}
-
-namespace internal {
-
-void PrintUsageAndExit() {
-  fprintf(stdout,
-          "benchmark"
-          " [--benchmark_list_tests={true|false}]\n"
-          "          [--benchmark_filter=<regex>]\n"
-          "          [--benchmark_min_time=<min_time>]\n"
-          "          [--benchmark_repetitions=<num_repetitions>]\n"
-          "          [--benchmark_report_aggregates_only={true|false}\n"
-          "          [--benchmark_format=<console|json|csv>]\n"
-          "          [--benchmark_out=<filename>]\n"
-          "          [--benchmark_out_format=<json|console|csv>]\n"
-          "          [--benchmark_color={auto|true|false}]\n"
-          "          [--benchmark_counters_tabular={true|false}]\n"
-          "          [--v=<verbosity>]\n");
-  exit(0);
-}
-
-void ParseCommandLineFlags(int* argc, char** argv) {
-  using namespace benchmark;
-  BenchmarkReporter::Context::executable_name = argv[0];
-  for (int i = 1; i < *argc; ++i) {
-    if (ParseBoolFlag(argv[i], "benchmark_list_tests",
-                      &FLAGS_benchmark_list_tests) ||
-        ParseStringFlag(argv[i], "benchmark_filter", &FLAGS_benchmark_filter) ||
-        ParseDoubleFlag(argv[i], "benchmark_min_time",
-                        &FLAGS_benchmark_min_time) ||
-        ParseInt32Flag(argv[i], "benchmark_repetitions",
-                       &FLAGS_benchmark_repetitions) ||
-        ParseBoolFlag(argv[i], "benchmark_report_aggregates_only",
-                      &FLAGS_benchmark_report_aggregates_only) ||
-        ParseStringFlag(argv[i], "benchmark_format", &FLAGS_benchmark_format) ||
-        ParseStringFlag(argv[i], "benchmark_out", &FLAGS_benchmark_out) ||
-        ParseStringFlag(argv[i], "benchmark_out_format",
-                        &FLAGS_benchmark_out_format) ||
-        ParseStringFlag(argv[i], "benchmark_color", &FLAGS_benchmark_color) ||
-        // "color_print" is the deprecated name for "benchmark_color".
-        // TODO: Remove this.
-        ParseStringFlag(argv[i], "color_print", &FLAGS_benchmark_color) ||
-        ParseBoolFlag(argv[i], "benchmark_counters_tabular",
-                        &FLAGS_benchmark_counters_tabular) ||
-        ParseInt32Flag(argv[i], "v", &FLAGS_v)) {
-      for (int j = i; j != *argc - 1; ++j) argv[j] = argv[j + 1];
-
-      --(*argc);
-      --i;
-    } else if (IsFlag(argv[i], "help")) {
-      PrintUsageAndExit();
-    }
-  }
-  for (auto const* flag :
-       {&FLAGS_benchmark_format, &FLAGS_benchmark_out_format})
-    if (*flag != "console" && *flag != "json" && *flag != "csv") {
-      PrintUsageAndExit();
-    }
-  if (FLAGS_benchmark_color.empty()) {
-    PrintUsageAndExit();
-  }
-}
-
-int InitializeStreams() {
-  static std::ios_base::Init init;
-  return 0;
-}
-
-}  // end namespace internal
-
-void Initialize(int* argc, char** argv) {
-  internal::ParseCommandLineFlags(argc, argv);
-  internal::LogLevel() = FLAGS_v;
-}
-
-bool ReportUnrecognizedArguments(int argc, char** argv) {
-  for (int i = 1; i < argc; ++i) {
-    fprintf(stderr, "%s: error: unrecognized command-line flag: %s\n", argv[0], argv[i]);
-  }
-  return argc > 1;
-}
-
-}  // end namespace benchmark
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/src/benchmark_api_internal.h b/external_imported/json/benchmarks/thirdparty/benchmark/src/benchmark_api_internal.h
deleted file mode 100755
index dd7a3ffe8..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/src/benchmark_api_internal.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef BENCHMARK_API_INTERNAL_H
-#define BENCHMARK_API_INTERNAL_H
-
-#include "benchmark/benchmark.h"
-
-#include <cmath>
-#include <iosfwd>
-#include <limits>
-#include <string>
-#include <vector>
-
-namespace benchmark {
-namespace internal {
-
-// Information kept per benchmark we may want to run
-struct Benchmark::Instance {
-  std::string name;
-  Benchmark* benchmark;
-  ReportMode report_mode;
-  std::vector<int64_t> arg;
-  TimeUnit time_unit;
-  int range_multiplier;
-  bool use_real_time;
-  bool use_manual_time;
-  BigO complexity;
-  BigOFunc* complexity_lambda;
-  UserCounters counters;
-  const std::vector<Statistics>* statistics;
-  bool last_benchmark_instance;
-  int repetitions;
-  double min_time;
-  size_t iterations;
-  int threads;  // Number of concurrent threads to us
-};
-
-bool FindBenchmarksInternal(const std::string& re,
-                            std::vector<Benchmark::Instance>* benchmarks,
-                            std::ostream* Err);
-
-bool IsZero(double n);
-
-ConsoleReporter::OutputOptions GetOutputOptions(bool force_no_color = false);
-
-}  // end namespace internal
-}  // end namespace benchmark
-
-#endif  // BENCHMARK_API_INTERNAL_H
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/src/benchmark_main.cc b/external_imported/json/benchmarks/thirdparty/benchmark/src/benchmark_main.cc
deleted file mode 100755
index b3b247831..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/src/benchmark_main.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2018 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "benchmark/benchmark.h"
-
-BENCHMARK_MAIN();
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/src/benchmark_register.cc b/external_imported/json/benchmarks/thirdparty/benchmark/src/benchmark_register.cc
deleted file mode 100755
index dc6f93568..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/src/benchmark_register.cc
+++ /dev/null
@@ -1,461 +0,0 @@
-// Copyright 2015 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "benchmark_register.h"
-
-#ifndef BENCHMARK_OS_WINDOWS
-#ifndef BENCHMARK_OS_FUCHSIA
-#include <sys/resource.h>
-#endif
-#include <sys/time.h>
-#include <unistd.h>
-#endif
-
-#include <algorithm>
-#include <atomic>
-#include <condition_variable>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <fstream>
-#include <iostream>
-#include <memory>
-#include <sstream>
-#include <thread>
-
-#include "benchmark/benchmark.h"
-#include "benchmark_api_internal.h"
-#include "check.h"
-#include "commandlineflags.h"
-#include "complexity.h"
-#include "internal_macros.h"
-#include "log.h"
-#include "mutex.h"
-#include "re.h"
-#include "statistics.h"
-#include "string_util.h"
-#include "timers.h"
-
-namespace benchmark {
-
-namespace {
-// For non-dense Range, intermediate values are powers of kRangeMultiplier.
-static const int kRangeMultiplier = 8;
-// The size of a benchmark family determines is the number of inputs to repeat
-// the benchmark on. If this is "large" then warn the user during configuration.
-static const size_t kMaxFamilySize = 100;
-}  // end namespace
-
-namespace internal {
-
-//=============================================================================//
-//                         BenchmarkFamilies
-//=============================================================================//
-
-// Class for managing registered benchmarks.  Note that each registered
-// benchmark identifies a family of related benchmarks to run.
-class BenchmarkFamilies {
- public:
-  static BenchmarkFamilies* GetInstance();
-
-  // Registers a benchmark family and returns the index assigned to it.
-  size_t AddBenchmark(std::unique_ptr<Benchmark> family);
-
-  // Clear all registered benchmark families.
-  void ClearBenchmarks();
-
-  // Extract the list of benchmark instances that match the specified
-  // regular expression.
-  bool FindBenchmarks(std::string re,
-                      std::vector<Benchmark::Instance>* benchmarks,
-                      std::ostream* Err);
-
- private:
-  BenchmarkFamilies() {}
-
-  std::vector<std::unique_ptr<Benchmark>> families_;
-  Mutex mutex_;
-};
-
-BenchmarkFamilies* BenchmarkFamilies::GetInstance() {
-  static BenchmarkFamilies instance;
-  return &instance;
-}
-
-size_t BenchmarkFamilies::AddBenchmark(std::unique_ptr<Benchmark> family) {
-  MutexLock l(mutex_);
-  size_t index = families_.size();
-  families_.push_back(std::move(family));
-  return index;
-}
-
-void BenchmarkFamilies::ClearBenchmarks() {
-  MutexLock l(mutex_);
-  families_.clear();
-  families_.shrink_to_fit();
-}
-
-bool BenchmarkFamilies::FindBenchmarks(
-    std::string spec, std::vector<Benchmark::Instance>* benchmarks,
-    std::ostream* ErrStream) {
-  CHECK(ErrStream);
-  auto& Err = *ErrStream;
-  // Make regular expression out of command-line flag
-  std::string error_msg;
-  Regex re;
-  bool isNegativeFilter = false;
-  if(spec[0] == '-') {
-      spec.replace(0, 1, "");
-      isNegativeFilter = true;
-  }
-  if (!re.Init(spec, &error_msg)) {
-    Err << "Could not compile benchmark re: " << error_msg << std::endl;
-    return false;
-  }
-
-  // Special list of thread counts to use when none are specified
-  const std::vector<int> one_thread = {1};
-
-  MutexLock l(mutex_);
-  for (std::unique_ptr<Benchmark>& family : families_) {
-    // Family was deleted or benchmark doesn't match
-    if (!family) continue;
-
-    if (family->ArgsCnt() == -1) {
-      family->Args({});
-    }
-    const std::vector<int>* thread_counts =
-        (family->thread_counts_.empty()
-             ? &one_thread
-             : &static_cast<const std::vector<int>&>(family->thread_counts_));
-    const size_t family_size = family->args_.size() * thread_counts->size();
-    // The benchmark will be run at least 'family_size' different inputs.
-    // If 'family_size' is very large warn the user.
-    if (family_size > kMaxFamilySize) {
-      Err << "The number of inputs is very large. " << family->name_
-          << " will be repeated at least " << family_size << " times.\n";
-    }
-    // reserve in the special case the regex ".", since we know the final
-    // family size.
-    if (spec == ".") benchmarks->reserve(family_size);
-
-    for (auto const& args : family->args_) {
-      for (int num_threads : *thread_counts) {
-        Benchmark::Instance instance;
-        instance.name = family->name_;
-        instance.benchmark = family.get();
-        instance.report_mode = family->report_mode_;
-        instance.arg = args;
-        instance.time_unit = family->time_unit_;
-        instance.range_multiplier = family->range_multiplier_;
-        instance.min_time = family->min_time_;
-        instance.iterations = family->iterations_;
-        instance.repetitions = family->repetitions_;
-        instance.use_real_time = family->use_real_time_;
-        instance.use_manual_time = family->use_manual_time_;
-        instance.complexity = family->complexity_;
-        instance.complexity_lambda = family->complexity_lambda_;
-        instance.statistics = &family->statistics_;
-        instance.threads = num_threads;
-
-        // Add arguments to instance name
-        size_t arg_i = 0;
-        for (auto const& arg : args) {
-          instance.name += "/";
-
-          if (arg_i < family->arg_names_.size()) {
-            const auto& arg_name = family->arg_names_[arg_i];
-            if (!arg_name.empty()) {
-              instance.name +=
-                  StrFormat("%s:", family->arg_names_[arg_i].c_str());
-            }
-          }
-
-          instance.name += StrFormat("%d", arg);
-          ++arg_i;
-        }
-
-        if (!IsZero(family->min_time_))
-          instance.name += StrFormat("/min_time:%0.3f", family->min_time_);
-        if (family->iterations_ != 0)
-          instance.name += StrFormat("/iterations:%d", family->iterations_);
-        if (family->repetitions_ != 0)
-          instance.name += StrFormat("/repeats:%d", family->repetitions_);
-
-        if (family->use_manual_time_) {
-          instance.name += "/manual_time";
-        } else if (family->use_real_time_) {
-          instance.name += "/real_time";
-        }
-
-        // Add the number of threads used to the name
-        if (!family->thread_counts_.empty()) {
-          instance.name += StrFormat("/threads:%d", instance.threads);
-        }
-
-        if ((re.Match(instance.name) && !isNegativeFilter) ||
-            (!re.Match(instance.name) && isNegativeFilter)) {
-          instance.last_benchmark_instance = (&args == &family->args_.back());
-          benchmarks->push_back(std::move(instance));
-        }
-      }
-    }
-  }
-  return true;
-}
-
-Benchmark* RegisterBenchmarkInternal(Benchmark* bench) {
-  std::unique_ptr<Benchmark> bench_ptr(bench);
-  BenchmarkFamilies* families = BenchmarkFamilies::GetInstance();
-  families->AddBenchmark(std::move(bench_ptr));
-  return bench;
-}
-
-// FIXME: This function is a hack so that benchmark.cc can access
-// `BenchmarkFamilies`
-bool FindBenchmarksInternal(const std::string& re,
-                            std::vector<Benchmark::Instance>* benchmarks,
-                            std::ostream* Err) {
-  return BenchmarkFamilies::GetInstance()->FindBenchmarks(re, benchmarks, Err);
-}
-
-//=============================================================================//
-//                               Benchmark
-//=============================================================================//
-
-Benchmark::Benchmark(const char* name)
-    : name_(name),
-      report_mode_(RM_Unspecified),
-      time_unit_(kNanosecond),
-      range_multiplier_(kRangeMultiplier),
-      min_time_(0),
-      iterations_(0),
-      repetitions_(0),
-      use_real_time_(false),
-      use_manual_time_(false),
-      complexity_(oNone),
-      complexity_lambda_(nullptr) {
-  ComputeStatistics("mean", StatisticsMean);
-  ComputeStatistics("median", StatisticsMedian);
-  ComputeStatistics("stddev", StatisticsStdDev);
-}
-
-Benchmark::~Benchmark() {}
-
-Benchmark* Benchmark::Arg(int64_t x) {
-  CHECK(ArgsCnt() == -1 || ArgsCnt() == 1);
-  args_.push_back({x});
-  return this;
-}
-
-Benchmark* Benchmark::Unit(TimeUnit unit) {
-  time_unit_ = unit;
-  return this;
-}
-
-Benchmark* Benchmark::Range(int64_t start, int64_t limit) {
-  CHECK(ArgsCnt() == -1 || ArgsCnt() == 1);
-  std::vector<int64_t> arglist;
-  AddRange(&arglist, start, limit, range_multiplier_);
-
-  for (int64_t i : arglist) {
-    args_.push_back({i});
-  }
-  return this;
-}
-
-Benchmark* Benchmark::Ranges(
-    const std::vector<std::pair<int64_t, int64_t>>& ranges) {
-  CHECK(ArgsCnt() == -1 || ArgsCnt() == static_cast<int>(ranges.size()));
-  std::vector<std::vector<int64_t>> arglists(ranges.size());
-  std::size_t total = 1;
-  for (std::size_t i = 0; i < ranges.size(); i++) {
-    AddRange(&arglists[i], ranges[i].first, ranges[i].second,
-             range_multiplier_);
-    total *= arglists[i].size();
-  }
-
-  std::vector<std::size_t> ctr(arglists.size(), 0);
-
-  for (std::size_t i = 0; i < total; i++) {
-    std::vector<int64_t> tmp;
-    tmp.reserve(arglists.size());
-
-    for (std::size_t j = 0; j < arglists.size(); j++) {
-      tmp.push_back(arglists[j].at(ctr[j]));
-    }
-
-    args_.push_back(std::move(tmp));
-
-    for (std::size_t j = 0; j < arglists.size(); j++) {
-      if (ctr[j] + 1 < arglists[j].size()) {
-        ++ctr[j];
-        break;
-      }
-      ctr[j] = 0;
-    }
-  }
-  return this;
-}
-
-Benchmark* Benchmark::ArgName(const std::string& name) {
-  CHECK(ArgsCnt() == -1 || ArgsCnt() == 1);
-  arg_names_ = {name};
-  return this;
-}
-
-Benchmark* Benchmark::ArgNames(const std::vector<std::string>& names) {
-  CHECK(ArgsCnt() == -1 || ArgsCnt() == static_cast<int>(names.size()));
-  arg_names_ = names;
-  return this;
-}
-
-Benchmark* Benchmark::DenseRange(int64_t start, int64_t limit, int step) {
-  CHECK(ArgsCnt() == -1 || ArgsCnt() == 1);
-  CHECK_GE(start, 0);
-  CHECK_LE(start, limit);
-  for (int64_t arg = start; arg <= limit; arg += step) {
-    args_.push_back({arg});
-  }
-  return this;
-}
-
-Benchmark* Benchmark::Args(const std::vector<int64_t>& args) {
-  CHECK(ArgsCnt() == -1 || ArgsCnt() == static_cast<int>(args.size()));
-  args_.push_back(args);
-  return this;
-}
-
-Benchmark* Benchmark::Apply(void (*custom_arguments)(Benchmark* benchmark)) {
-  custom_arguments(this);
-  return this;
-}
-
-Benchmark* Benchmark::RangeMultiplier(int multiplier) {
-  CHECK(multiplier > 1);
-  range_multiplier_ = multiplier;
-  return this;
-}
-
-Benchmark* Benchmark::MinTime(double t) {
-  CHECK(t > 0.0);
-  CHECK(iterations_ == 0);
-  min_time_ = t;
-  return this;
-}
-
-Benchmark* Benchmark::Iterations(size_t n) {
-  CHECK(n > 0);
-  CHECK(IsZero(min_time_));
-  iterations_ = n;
-  return this;
-}
-
-Benchmark* Benchmark::Repetitions(int n) {
-  CHECK(n > 0);
-  repetitions_ = n;
-  return this;
-}
-
-Benchmark* Benchmark::ReportAggregatesOnly(bool value) {
-  report_mode_ = value ? RM_ReportAggregatesOnly : RM_Default;
-  return this;
-}
-
-Benchmark* Benchmark::UseRealTime() {
-  CHECK(!use_manual_time_)
-      << "Cannot set UseRealTime and UseManualTime simultaneously.";
-  use_real_time_ = true;
-  return this;
-}
-
-Benchmark* Benchmark::UseManualTime() {
-  CHECK(!use_real_time_)
-      << "Cannot set UseRealTime and UseManualTime simultaneously.";
-  use_manual_time_ = true;
-  return this;
-}
-
-Benchmark* Benchmark::Complexity(BigO complexity) {
-  complexity_ = complexity;
-  return this;
-}
-
-Benchmark* Benchmark::Complexity(BigOFunc* complexity) {
-  complexity_lambda_ = complexity;
-  complexity_ = oLambda;
-  return this;
-}
-
-Benchmark* Benchmark::ComputeStatistics(std::string name,
-                                        StatisticsFunc* statistics) {
-  statistics_.emplace_back(name, statistics);
-  return this;
-}
-
-Benchmark* Benchmark::Threads(int t) {
-  CHECK_GT(t, 0);
-  thread_counts_.push_back(t);
-  return this;
-}
-
-Benchmark* Benchmark::ThreadRange(int min_threads, int max_threads) {
-  CHECK_GT(min_threads, 0);
-  CHECK_GE(max_threads, min_threads);
-
-  AddRange(&thread_counts_, min_threads, max_threads, 2);
-  return this;
-}
-
-Benchmark* Benchmark::DenseThreadRange(int min_threads, int max_threads,
-                                       int stride) {
-  CHECK_GT(min_threads, 0);
-  CHECK_GE(max_threads, min_threads);
-  CHECK_GE(stride, 1);
-
-  for (auto i = min_threads; i < max_threads; i += stride) {
-    thread_counts_.push_back(i);
-  }
-  thread_counts_.push_back(max_threads);
-  return this;
-}
-
-Benchmark* Benchmark::ThreadPerCpu() {
-  thread_counts_.push_back(CPUInfo::Get().num_cpus);
-  return this;
-}
-
-void Benchmark::SetName(const char* name) { name_ = name; }
-
-int Benchmark::ArgsCnt() const {
-  if (args_.empty()) {
-    if (arg_names_.empty()) return -1;
-    return static_cast<int>(arg_names_.size());
-  }
-  return static_cast<int>(args_.front().size());
-}
-
-//=============================================================================//
-//                            FunctionBenchmark
-//=============================================================================//
-
-void FunctionBenchmark::Run(State& st) { func_(st); }
-
-}  // end namespace internal
-
-void ClearRegisteredBenchmarks() {
-  internal::BenchmarkFamilies::GetInstance()->ClearBenchmarks();
-}
-
-}  // end namespace benchmark
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/src/benchmark_register.h b/external_imported/json/benchmarks/thirdparty/benchmark/src/benchmark_register.h
deleted file mode 100755
index 0705e219f..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/src/benchmark_register.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef BENCHMARK_REGISTER_H
-#define BENCHMARK_REGISTER_H
-
-#include <vector>
-
-#include "check.h"
-
-template <typename T>
-void AddRange(std::vector<T>* dst, T lo, T hi, int mult) {
-  CHECK_GE(lo, 0);
-  CHECK_GE(hi, lo);
-  CHECK_GE(mult, 2);
-
-  // Add "lo"
-  dst->push_back(lo);
-
-  static const T kmax = std::numeric_limits<T>::max();
-
-  // Now space out the benchmarks in multiples of "mult"
-  for (T i = 1; i < kmax / mult; i *= mult) {
-    if (i >= hi) break;
-    if (i > lo) {
-      dst->push_back(i);
-    }
-  }
-
-  // Add "hi" (if different from "lo")
-  if (hi != lo) {
-    dst->push_back(hi);
-  }
-}
-
-#endif  // BENCHMARK_REGISTER_H
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/src/check.h b/external_imported/json/benchmarks/thirdparty/benchmark/src/check.h
deleted file mode 100755
index 73bead2fb..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/src/check.h
+++ /dev/null
@@ -1,79 +0,0 @@
-#ifndef CHECK_H_
-#define CHECK_H_
-
-#include <cstdlib>
-#include <ostream>
-#include <cmath>
-
-#include "internal_macros.h"
-#include "log.h"
-
-namespace benchmark {
-namespace internal {
-
-typedef void(AbortHandlerT)();
-
-inline AbortHandlerT*& GetAbortHandler() {
-  static AbortHandlerT* handler = &std::abort;
-  return handler;
-}
-
-BENCHMARK_NORETURN inline void CallAbortHandler() {
-  GetAbortHandler()();
-  std::abort();  // fallback to enforce noreturn
-}
-
-// CheckHandler is the class constructed by failing CHECK macros. CheckHandler
-// will log information about the failures and abort when it is destructed.
-class CheckHandler {
- public:
-  CheckHandler(const char* check, const char* file, const char* func, int line)
-      : log_(GetErrorLogInstance()) {
-    log_ << file << ":" << line << ": " << func << ": Check `" << check
-         << "' failed. ";
-  }
-
-  LogType& GetLog() { return log_; }
-
-  BENCHMARK_NORETURN ~CheckHandler() BENCHMARK_NOEXCEPT_OP(false) {
-    log_ << std::endl;
-    CallAbortHandler();
-  }
-
-  CheckHandler& operator=(const CheckHandler&) = delete;
-  CheckHandler(const CheckHandler&) = delete;
-  CheckHandler() = delete;
-
- private:
-  LogType& log_;
-};
-
-}  // end namespace internal
-}  // end namespace benchmark
-
-// The CHECK macro returns a std::ostream object that can have extra information
-// written to it.
-#ifndef NDEBUG
-#define CHECK(b)                                                             \
-  (b ? ::benchmark::internal::GetNullLogInstance()                           \
-     : ::benchmark::internal::CheckHandler(#b, __FILE__, __func__, __LINE__) \
-           .GetLog())
-#else
-#define CHECK(b) ::benchmark::internal::GetNullLogInstance()
-#endif
-
-#define CHECK_EQ(a, b) CHECK((a) == (b))
-#define CHECK_NE(a, b) CHECK((a) != (b))
-#define CHECK_GE(a, b) CHECK((a) >= (b))
-#define CHECK_LE(a, b) CHECK((a) <= (b))
-#define CHECK_GT(a, b) CHECK((a) > (b))
-#define CHECK_LT(a, b) CHECK((a) < (b))
-
-#define CHECK_FLOAT_EQ(a, b, eps) CHECK(std::fabs((a) - (b)) <  (eps))
-#define CHECK_FLOAT_NE(a, b, eps) CHECK(std::fabs((a) - (b)) >= (eps))
-#define CHECK_FLOAT_GE(a, b, eps) CHECK((a) - (b) > -(eps))
-#define CHECK_FLOAT_LE(a, b, eps) CHECK((b) - (a) > -(eps))
-#define CHECK_FLOAT_GT(a, b, eps) CHECK((a) - (b) >  (eps))
-#define CHECK_FLOAT_LT(a, b, eps) CHECK((b) - (a) >  (eps))
-
-#endif  // CHECK_H_
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/src/colorprint.cc b/external_imported/json/benchmarks/thirdparty/benchmark/src/colorprint.cc
deleted file mode 100755
index 2dec4a8b2..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/src/colorprint.cc
+++ /dev/null
@@ -1,188 +0,0 @@
-// Copyright 2015 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "colorprint.h"
-
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <memory>
-#include <string>
-
-#include "check.h"
-#include "internal_macros.h"
-
-#ifdef BENCHMARK_OS_WINDOWS
-#include <Windows.h>
-#include <io.h>
-#else
-#include <unistd.h>
-#endif  // BENCHMARK_OS_WINDOWS
-
-namespace benchmark {
-namespace {
-#ifdef BENCHMARK_OS_WINDOWS
-typedef WORD PlatformColorCode;
-#else
-typedef const char* PlatformColorCode;
-#endif
-
-PlatformColorCode GetPlatformColorCode(LogColor color) {
-#ifdef BENCHMARK_OS_WINDOWS
-  switch (color) {
-    case COLOR_RED:
-      return FOREGROUND_RED;
-    case COLOR_GREEN:
-      return FOREGROUND_GREEN;
-    case COLOR_YELLOW:
-      return FOREGROUND_RED | FOREGROUND_GREEN;
-    case COLOR_BLUE:
-      return FOREGROUND_BLUE;
-    case COLOR_MAGENTA:
-      return FOREGROUND_BLUE | FOREGROUND_RED;
-    case COLOR_CYAN:
-      return FOREGROUND_BLUE | FOREGROUND_GREEN;
-    case COLOR_WHITE:  // fall through to default
-    default:
-      return 0;
-  }
-#else
-  switch (color) {
-    case COLOR_RED:
-      return "1";
-    case COLOR_GREEN:
-      return "2";
-    case COLOR_YELLOW:
-      return "3";
-    case COLOR_BLUE:
-      return "4";
-    case COLOR_MAGENTA:
-      return "5";
-    case COLOR_CYAN:
-      return "6";
-    case COLOR_WHITE:
-      return "7";
-    default:
-      return nullptr;
-  };
-#endif
-}
-
-}  // end namespace
-
-std::string FormatString(const char* msg, va_list args) {
-  // we might need a second shot at this, so pre-emptivly make a copy
-  va_list args_cp;
-  va_copy(args_cp, args);
-
-  std::size_t size = 256;
-  char local_buff[256];
-  auto ret = vsnprintf(local_buff, size, msg, args_cp);
-
-  va_end(args_cp);
-
-  // currently there is no error handling for failure, so this is hack.
-  CHECK(ret >= 0);
-
-  if (ret == 0)  // handle empty expansion
-    return {};
-  else if (static_cast<size_t>(ret) < size)
-    return local_buff;
-  else {
-    // we did not provide a long enough buffer on our first attempt.
-    size = (size_t)ret + 1;  // + 1 for the null byte
-    std::unique_ptr<char[]> buff(new char[size]);
-    ret = vsnprintf(buff.get(), size, msg, args);
-    CHECK(ret > 0 && ((size_t)ret) < size);
-    return buff.get();
-  }
-}
-
-std::string FormatString(const char* msg, ...) {
-  va_list args;
-  va_start(args, msg);
-  auto tmp = FormatString(msg, args);
-  va_end(args);
-  return tmp;
-}
-
-void ColorPrintf(std::ostream& out, LogColor color, const char* fmt, ...) {
-  va_list args;
-  va_start(args, fmt);
-  ColorPrintf(out, color, fmt, args);
-  va_end(args);
-}
-
-void ColorPrintf(std::ostream& out, LogColor color, const char* fmt,
-                 va_list args) {
-#ifdef BENCHMARK_OS_WINDOWS
-  ((void)out);  // suppress unused warning
-
-  const HANDLE stdout_handle = GetStdHandle(STD_OUTPUT_HANDLE);
-
-  // Gets the current text color.
-  CONSOLE_SCREEN_BUFFER_INFO buffer_info;
-  GetConsoleScreenBufferInfo(stdout_handle, &buffer_info);
-  const WORD old_color_attrs = buffer_info.wAttributes;
-
-  // We need to flush the stream buffers into the console before each
-  // SetConsoleTextAttribute call lest it affect the text that is already
-  // printed but has not yet reached the console.
-  fflush(stdout);
-  SetConsoleTextAttribute(stdout_handle,
-                          GetPlatformColorCode(color) | FOREGROUND_INTENSITY);
-  vprintf(fmt, args);
-
-  fflush(stdout);
-  // Restores the text color.
-  SetConsoleTextAttribute(stdout_handle, old_color_attrs);
-#else
-  const char* color_code = GetPlatformColorCode(color);
-  if (color_code) out << FormatString("\033[0;3%sm", color_code);
-  out << FormatString(fmt, args) << "\033[m";
-#endif
-}
-
-bool IsColorTerminal() {
-#if BENCHMARK_OS_WINDOWS
-  // On Windows the TERM variable is usually not set, but the
-  // console there does support colors.
-  return 0 != _isatty(_fileno(stdout));
-#else
-  // On non-Windows platforms, we rely on the TERM variable. This list of
-  // supported TERM values is copied from Google Test:
-  // <https://github.com/google/googletest/blob/master/googletest/src/gtest.cc#L2925>.
-  const char* const SUPPORTED_TERM_VALUES[] = {
-      "xterm",         "xterm-color",     "xterm-256color",
-      "screen",        "screen-256color", "tmux",
-      "tmux-256color", "rxvt-unicode",    "rxvt-unicode-256color",
-      "linux",         "cygwin",
-  };
-
-  const char* const term = getenv("TERM");
-
-  bool term_supports_color = false;
-  for (const char* candidate : SUPPORTED_TERM_VALUES) {
-    if (term && 0 == strcmp(term, candidate)) {
-      term_supports_color = true;
-      break;
-    }
-  }
-
-  return 0 != isatty(fileno(stdout)) && term_supports_color;
-#endif  // BENCHMARK_OS_WINDOWS
-}
-
-}  // end namespace benchmark
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/src/colorprint.h b/external_imported/json/benchmarks/thirdparty/benchmark/src/colorprint.h
deleted file mode 100755
index 9f6fab9b3..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/src/colorprint.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef BENCHMARK_COLORPRINT_H_
-#define BENCHMARK_COLORPRINT_H_
-
-#include <cstdarg>
-#include <iostream>
-#include <string>
-
-namespace benchmark {
-enum LogColor {
-  COLOR_DEFAULT,
-  COLOR_RED,
-  COLOR_GREEN,
-  COLOR_YELLOW,
-  COLOR_BLUE,
-  COLOR_MAGENTA,
-  COLOR_CYAN,
-  COLOR_WHITE
-};
-
-std::string FormatString(const char* msg, va_list args);
-std::string FormatString(const char* msg, ...);
-
-void ColorPrintf(std::ostream& out, LogColor color, const char* fmt,
-                 va_list args);
-void ColorPrintf(std::ostream& out, LogColor color, const char* fmt, ...);
-
-// Returns true if stdout appears to be a terminal that supports colored
-// output, false otherwise.
-bool IsColorTerminal();
-
-}  // end namespace benchmark
-
-#endif  // BENCHMARK_COLORPRINT_H_
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/src/commandlineflags.cc b/external_imported/json/benchmarks/thirdparty/benchmark/src/commandlineflags.cc
deleted file mode 100755
index 2fc92517a..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/src/commandlineflags.cc
+++ /dev/null
@@ -1,218 +0,0 @@
-// Copyright 2015 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "commandlineflags.h"
-
-#include <cctype>
-#include <cstdlib>
-#include <cstring>
-#include <iostream>
-#include <limits>
-
-namespace benchmark {
-// Parses 'str' for a 32-bit signed integer.  If successful, writes
-// the result to *value and returns true; otherwise leaves *value
-// unchanged and returns false.
-bool ParseInt32(const std::string& src_text, const char* str, int32_t* value) {
-  // Parses the environment variable as a decimal integer.
-  char* end = nullptr;
-  const long long_value = strtol(str, &end, 10);  // NOLINT
-
-  // Has strtol() consumed all characters in the string?
-  if (*end != '\0') {
-    // No - an invalid character was encountered.
-    std::cerr << src_text << " is expected to be a 32-bit integer, "
-              << "but actually has value \"" << str << "\".\n";
-    return false;
-  }
-
-  // Is the parsed value in the range of an Int32?
-  const int32_t result = static_cast<int32_t>(long_value);
-  if (long_value == std::numeric_limits<long>::max() ||
-      long_value == std::numeric_limits<long>::min() ||
-      // The parsed value overflows as a long.  (strtol() returns
-      // LONG_MAX or LONG_MIN when the input overflows.)
-      result != long_value
-      // The parsed value overflows as an Int32.
-      ) {
-    std::cerr << src_text << " is expected to be a 32-bit integer, "
-              << "but actually has value \"" << str << "\", "
-              << "which overflows.\n";
-    return false;
-  }
-
-  *value = result;
-  return true;
-}
-
-// Parses 'str' for a double.  If successful, writes the result to *value and
-// returns true; otherwise leaves *value unchanged and returns false.
-bool ParseDouble(const std::string& src_text, const char* str, double* value) {
-  // Parses the environment variable as a decimal integer.
-  char* end = nullptr;
-  const double double_value = strtod(str, &end);  // NOLINT
-
-  // Has strtol() consumed all characters in the string?
-  if (*end != '\0') {
-    // No - an invalid character was encountered.
-    std::cerr << src_text << " is expected to be a double, "
-              << "but actually has value \"" << str << "\".\n";
-    return false;
-  }
-
-  *value = double_value;
-  return true;
-}
-
-// Returns the name of the environment variable corresponding to the
-// given flag.  For example, FlagToEnvVar("foo") will return
-// "BENCHMARK_FOO" in the open-source version.
-static std::string FlagToEnvVar(const char* flag) {
-  const std::string flag_str(flag);
-
-  std::string env_var;
-  for (size_t i = 0; i != flag_str.length(); ++i)
-    env_var += static_cast<char>(::toupper(flag_str.c_str()[i]));
-
-  return "BENCHMARK_" + env_var;
-}
-
-// Reads and returns the Boolean environment variable corresponding to
-// the given flag; if it's not set, returns default_value.
-//
-// The value is considered true iff it's not "0".
-bool BoolFromEnv(const char* flag, bool default_value) {
-  const std::string env_var = FlagToEnvVar(flag);
-  const char* const string_value = getenv(env_var.c_str());
-  return string_value == nullptr ? default_value
-                                 : strcmp(string_value, "0") != 0;
-}
-
-// Reads and returns a 32-bit integer stored in the environment
-// variable corresponding to the given flag; if it isn't set or
-// doesn't represent a valid 32-bit integer, returns default_value.
-int32_t Int32FromEnv(const char* flag, int32_t default_value) {
-  const std::string env_var = FlagToEnvVar(flag);
-  const char* const string_value = getenv(env_var.c_str());
-  if (string_value == nullptr) {
-    // The environment variable is not set.
-    return default_value;
-  }
-
-  int32_t result = default_value;
-  if (!ParseInt32(std::string("Environment variable ") + env_var, string_value,
-                  &result)) {
-    std::cout << "The default value " << default_value << " is used.\n";
-    return default_value;
-  }
-
-  return result;
-}
-
-// Reads and returns the string environment variable corresponding to
-// the given flag; if it's not set, returns default_value.
-const char* StringFromEnv(const char* flag, const char* default_value) {
-  const std::string env_var = FlagToEnvVar(flag);
-  const char* const value = getenv(env_var.c_str());
-  return value == nullptr ? default_value : value;
-}
-
-// Parses a string as a command line flag.  The string should have
-// the format "--flag=value".  When def_optional is true, the "=value"
-// part can be omitted.
-//
-// Returns the value of the flag, or nullptr if the parsing failed.
-const char* ParseFlagValue(const char* str, const char* flag,
-                           bool def_optional) {
-  // str and flag must not be nullptr.
-  if (str == nullptr || flag == nullptr) return nullptr;
-
-  // The flag must start with "--".
-  const std::string flag_str = std::string("--") + std::string(flag);
-  const size_t flag_len = flag_str.length();
-  if (strncmp(str, flag_str.c_str(), flag_len) != 0) return nullptr;
-
-  // Skips the flag name.
-  const char* flag_end = str + flag_len;
-
-  // When def_optional is true, it's OK to not have a "=value" part.
-  if (def_optional && (flag_end[0] == '\0')) return flag_end;
-
-  // If def_optional is true and there are more characters after the
-  // flag name, or if def_optional is false, there must be a '=' after
-  // the flag name.
-  if (flag_end[0] != '=') return nullptr;
-
-  // Returns the string after "=".
-  return flag_end + 1;
-}
-
-bool ParseBoolFlag(const char* str, const char* flag, bool* value) {
-  // Gets the value of the flag as a string.
-  const char* const value_str = ParseFlagValue(str, flag, true);
-
-  // Aborts if the parsing failed.
-  if (value_str == nullptr) return false;
-
-  // Converts the string value to a bool.
-  *value = IsTruthyFlagValue(value_str);
-  return true;
-}
-
-bool ParseInt32Flag(const char* str, const char* flag, int32_t* value) {
-  // Gets the value of the flag as a string.
-  const char* const value_str = ParseFlagValue(str, flag, false);
-
-  // Aborts if the parsing failed.
-  if (value_str == nullptr) return false;
-
-  // Sets *value to the value of the flag.
-  return ParseInt32(std::string("The value of flag --") + flag, value_str,
-                    value);
-}
-
-bool ParseDoubleFlag(const char* str, const char* flag, double* value) {
-  // Gets the value of the flag as a string.
-  const char* const value_str = ParseFlagValue(str, flag, false);
-
-  // Aborts if the parsing failed.
-  if (value_str == nullptr) return false;
-
-  // Sets *value to the value of the flag.
-  return ParseDouble(std::string("The value of flag --") + flag, value_str,
-                     value);
-}
-
-bool ParseStringFlag(const char* str, const char* flag, std::string* value) {
-  // Gets the value of the flag as a string.
-  const char* const value_str = ParseFlagValue(str, flag, false);
-
-  // Aborts if the parsing failed.
-  if (value_str == nullptr) return false;
-
-  *value = value_str;
-  return true;
-}
-
-bool IsFlag(const char* str, const char* flag) {
-  return (ParseFlagValue(str, flag, true) != nullptr);
-}
-
-bool IsTruthyFlagValue(const std::string& value) {
-  if (value.empty()) return true;
-  char ch = value[0];
-  return isalnum(ch) &&
-         !(ch == '0' || ch == 'f' || ch == 'F' || ch == 'n' || ch == 'N');
-}
-}  // end namespace benchmark
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/src/commandlineflags.h b/external_imported/json/benchmarks/thirdparty/benchmark/src/commandlineflags.h
deleted file mode 100755
index 945c9a9fc..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/src/commandlineflags.h
+++ /dev/null
@@ -1,79 +0,0 @@
-#ifndef BENCHMARK_COMMANDLINEFLAGS_H_
-#define BENCHMARK_COMMANDLINEFLAGS_H_
-
-#include <cstdint>
-#include <string>
-
-// Macro for referencing flags.
-#define FLAG(name) FLAGS_##name
-
-// Macros for declaring flags.
-#define DECLARE_bool(name) extern bool FLAG(name)
-#define DECLARE_int32(name) extern int32_t FLAG(name)
-#define DECLARE_int64(name) extern int64_t FLAG(name)
-#define DECLARE_double(name) extern double FLAG(name)
-#define DECLARE_string(name) extern std::string FLAG(name)
-
-// Macros for defining flags.
-#define DEFINE_bool(name, default_val, doc) bool FLAG(name) = (default_val)
-#define DEFINE_int32(name, default_val, doc) int32_t FLAG(name) = (default_val)
-#define DEFINE_int64(name, default_val, doc) int64_t FLAG(name) = (default_val)
-#define DEFINE_double(name, default_val, doc) double FLAG(name) = (default_val)
-#define DEFINE_string(name, default_val, doc) \
-  std::string FLAG(name) = (default_val)
-
-namespace benchmark {
-// Parses 'str' for a 32-bit signed integer.  If successful, writes the result
-// to *value and returns true; otherwise leaves *value unchanged and returns
-// false.
-bool ParseInt32(const std::string& src_text, const char* str, int32_t* value);
-
-// Parses a bool/Int32/string from the environment variable
-// corresponding to the given Google Test flag.
-bool BoolFromEnv(const char* flag, bool default_val);
-int32_t Int32FromEnv(const char* flag, int32_t default_val);
-double DoubleFromEnv(const char* flag, double default_val);
-const char* StringFromEnv(const char* flag, const char* default_val);
-
-// Parses a string for a bool flag, in the form of either
-// "--flag=value" or "--flag".
-//
-// In the former case, the value is taken as true if it passes IsTruthyValue().
-//
-// In the latter case, the value is taken as true.
-//
-// On success, stores the value of the flag in *value, and returns
-// true.  On failure, returns false without changing *value.
-bool ParseBoolFlag(const char* str, const char* flag, bool* value);
-
-// Parses a string for an Int32 flag, in the form of
-// "--flag=value".
-//
-// On success, stores the value of the flag in *value, and returns
-// true.  On failure, returns false without changing *value.
-bool ParseInt32Flag(const char* str, const char* flag, int32_t* value);
-
-// Parses a string for a Double flag, in the form of
-// "--flag=value".
-//
-// On success, stores the value of the flag in *value, and returns
-// true.  On failure, returns false without changing *value.
-bool ParseDoubleFlag(const char* str, const char* flag, double* value);
-
-// Parses a string for a string flag, in the form of
-// "--flag=value".
-//
-// On success, stores the value of the flag in *value, and returns
-// true.  On failure, returns false without changing *value.
-bool ParseStringFlag(const char* str, const char* flag, std::string* value);
-
-// Returns true if the string matches the flag.
-bool IsFlag(const char* str, const char* flag);
-
-// Returns true unless value starts with one of: '0', 'f', 'F', 'n' or 'N', or
-// some non-alphanumeric character. As a special case, also returns true if
-// value is the empty string.
-bool IsTruthyFlagValue(const std::string& value);
-}  // end namespace benchmark
-
-#endif  // BENCHMARK_COMMANDLINEFLAGS_H_
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/src/complexity.cc b/external_imported/json/benchmarks/thirdparty/benchmark/src/complexity.cc
deleted file mode 100755
index 97bf6e09b..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/src/complexity.cc
+++ /dev/null
@@ -1,220 +0,0 @@
-// Copyright 2016 Ismael Jimenez Martinez. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Source project : https://github.com/ismaelJimenez/cpp.leastsq
-// Adapted to be used with google benchmark
-
-#include "benchmark/benchmark.h"
-
-#include <algorithm>
-#include <cmath>
-#include "check.h"
-#include "complexity.h"
-
-namespace benchmark {
-
-// Internal function to calculate the different scalability forms
-BigOFunc* FittingCurve(BigO complexity) {
-  switch (complexity) {
-    case oN:
-      return [](int64_t n) -> double { return static_cast<double>(n); };
-    case oNSquared:
-      return [](int64_t n) -> double { return std::pow(n, 2); };
-    case oNCubed:
-      return [](int64_t n) -> double { return std::pow(n, 3); };
-    case oLogN:
-      return [](int64_t n) { return log2(n); };
-    case oNLogN:
-      return [](int64_t n) { return n * log2(n); };
-    case o1:
-    default:
-      return [](int64_t) { return 1.0; };
-  }
-}
-
-// Function to return an string for the calculated complexity
-std::string GetBigOString(BigO complexity) {
-  switch (complexity) {
-    case oN:
-      return "N";
-    case oNSquared:
-      return "N^2";
-    case oNCubed:
-      return "N^3";
-    case oLogN:
-      return "lgN";
-    case oNLogN:
-      return "NlgN";
-    case o1:
-      return "(1)";
-    default:
-      return "f(N)";
-  }
-}
-
-// Find the coefficient for the high-order term in the running time, by
-// minimizing the sum of squares of relative error, for the fitting curve
-// given by the lambda expression.
-//   - n             : Vector containing the size of the benchmark tests.
-//   - time          : Vector containing the times for the benchmark tests.
-//   - fitting_curve : lambda expression (e.g. [](int64_t n) {return n; };).
-
-// For a deeper explanation on the algorithm logic, look the README file at
-// http://github.com/ismaelJimenez/Minimal-Cpp-Least-Squared-Fit
-
-LeastSq MinimalLeastSq(const std::vector<int64_t>& n,
-                       const std::vector<double>& time,
-                       BigOFunc* fitting_curve) {
-  double sigma_gn = 0.0;
-  double sigma_gn_squared = 0.0;
-  double sigma_time = 0.0;
-  double sigma_time_gn = 0.0;
-
-  // Calculate least square fitting parameter
-  for (size_t i = 0; i < n.size(); ++i) {
-    double gn_i = fitting_curve(n[i]);
-    sigma_gn += gn_i;
-    sigma_gn_squared += gn_i * gn_i;
-    sigma_time += time[i];
-    sigma_time_gn += time[i] * gn_i;
-  }
-
-  LeastSq result;
-  result.complexity = oLambda;
-
-  // Calculate complexity.
-  result.coef = sigma_time_gn / sigma_gn_squared;
-
-  // Calculate RMS
-  double rms = 0.0;
-  for (size_t i = 0; i < n.size(); ++i) {
-    double fit = result.coef * fitting_curve(n[i]);
-    rms += pow((time[i] - fit), 2);
-  }
-
-  // Normalized RMS by the mean of the observed values
-  double mean = sigma_time / n.size();
-  result.rms = sqrt(rms / n.size()) / mean;
-
-  return result;
-}
-
-// Find the coefficient for the high-order term in the running time, by
-// minimizing the sum of squares of relative error.
-//   - n          : Vector containing the size of the benchmark tests.
-//   - time       : Vector containing the times for the benchmark tests.
-//   - complexity : If different than oAuto, the fitting curve will stick to
-//                  this one. If it is oAuto, it will be calculated the best
-//                  fitting curve.
-LeastSq MinimalLeastSq(const std::vector<int64_t>& n,
-                       const std::vector<double>& time, const BigO complexity) {
-  CHECK_EQ(n.size(), time.size());
-  CHECK_GE(n.size(), 2);  // Do not compute fitting curve is less than two
-                          // benchmark runs are given
-  CHECK_NE(complexity, oNone);
-
-  LeastSq best_fit;
-
-  if (complexity == oAuto) {
-    std::vector<BigO> fit_curves = {oLogN, oN, oNLogN, oNSquared, oNCubed};
-
-    // Take o1 as default best fitting curve
-    best_fit = MinimalLeastSq(n, time, FittingCurve(o1));
-    best_fit.complexity = o1;
-
-    // Compute all possible fitting curves and stick to the best one
-    for (const auto& fit : fit_curves) {
-      LeastSq current_fit = MinimalLeastSq(n, time, FittingCurve(fit));
-      if (current_fit.rms < best_fit.rms) {
-        best_fit = current_fit;
-        best_fit.complexity = fit;
-      }
-    }
-  } else {
-    best_fit = MinimalLeastSq(n, time, FittingCurve(complexity));
-    best_fit.complexity = complexity;
-  }
-
-  return best_fit;
-}
-
-std::vector<BenchmarkReporter::Run> ComputeBigO(
-    const std::vector<BenchmarkReporter::Run>& reports) {
-  typedef BenchmarkReporter::Run Run;
-  std::vector<Run> results;
-
-  if (reports.size() < 2) return results;
-
-  // Accumulators.
-  std::vector<int64_t> n;
-  std::vector<double> real_time;
-  std::vector<double> cpu_time;
-
-  // Populate the accumulators.
-  for (const Run& run : reports) {
-    CHECK_GT(run.complexity_n, 0) << "Did you forget to call SetComplexityN?";
-    n.push_back(run.complexity_n);
-    real_time.push_back(run.real_accumulated_time / run.iterations);
-    cpu_time.push_back(run.cpu_accumulated_time / run.iterations);
-  }
-
-  LeastSq result_cpu;
-  LeastSq result_real;
-
-  if (reports[0].complexity == oLambda) {
-    result_cpu = MinimalLeastSq(n, cpu_time, reports[0].complexity_lambda);
-    result_real = MinimalLeastSq(n, real_time, reports[0].complexity_lambda);
-  } else {
-    result_cpu = MinimalLeastSq(n, cpu_time, reports[0].complexity);
-    result_real = MinimalLeastSq(n, real_time, result_cpu.complexity);
-  }
-  std::string benchmark_name =
-      reports[0].benchmark_name.substr(0, reports[0].benchmark_name.find('/'));
-
-  // Get the data from the accumulator to BenchmarkReporter::Run's.
-  Run big_o;
-  big_o.benchmark_name = benchmark_name + "_BigO";
-  big_o.iterations = 0;
-  big_o.real_accumulated_time = result_real.coef;
-  big_o.cpu_accumulated_time = result_cpu.coef;
-  big_o.report_big_o = true;
-  big_o.complexity = result_cpu.complexity;
-
-  // All the time results are reported after being multiplied by the
-  // time unit multiplier. But since RMS is a relative quantity it
-  // should not be multiplied at all. So, here, we _divide_ it by the
-  // multiplier so that when it is multiplied later the result is the
-  // correct one.
-  double multiplier = GetTimeUnitMultiplier(reports[0].time_unit);
-
-  // Only add label to mean/stddev if it is same for all runs
-  Run rms;
-  big_o.report_label = reports[0].report_label;
-  rms.benchmark_name = benchmark_name + "_RMS";
-  rms.report_label = big_o.report_label;
-  rms.iterations = 0;
-  rms.real_accumulated_time = result_real.rms / multiplier;
-  rms.cpu_accumulated_time = result_cpu.rms / multiplier;
-  rms.report_rms = true;
-  rms.complexity = result_cpu.complexity;
-  // don't forget to keep the time unit, or we won't be able to
-  // recover the correct value.
-  rms.time_unit = reports[0].time_unit;
-
-  results.push_back(big_o);
-  results.push_back(rms);
-  return results;
-}
-
-}  // end namespace benchmark
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/src/complexity.h b/external_imported/json/benchmarks/thirdparty/benchmark/src/complexity.h
deleted file mode 100755
index df29b48d2..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/src/complexity.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2016 Ismael Jimenez Martinez. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Source project : https://github.com/ismaelJimenez/cpp.leastsq
-// Adapted to be used with google benchmark
-
-#ifndef COMPLEXITY_H_
-#define COMPLEXITY_H_
-
-#include <string>
-#include <vector>
-
-#include "benchmark/benchmark.h"
-
-namespace benchmark {
-
-// Return a vector containing the bigO and RMS information for the specified
-// list of reports. If 'reports.size() < 2' an empty vector is returned.
-std::vector<BenchmarkReporter::Run> ComputeBigO(
-    const std::vector<BenchmarkReporter::Run>& reports);
-
-// This data structure will contain the result returned by MinimalLeastSq
-//   - coef        : Estimated coeficient for the high-order term as
-//                   interpolated from data.
-//   - rms         : Normalized Root Mean Squared Error.
-//   - complexity  : Scalability form (e.g. oN, oNLogN). In case a scalability
-//                   form has been provided to MinimalLeastSq this will return
-//                   the same value. In case BigO::oAuto has been selected, this
-//                   parameter will return the best fitting curve detected.
-
-struct LeastSq {
-  LeastSq() : coef(0.0), rms(0.0), complexity(oNone) {}
-
-  double coef;
-  double rms;
-  BigO complexity;
-};
-
-// Function to return an string for the calculated complexity
-std::string GetBigOString(BigO complexity);
-
-}  // end namespace benchmark
-
-#endif  // COMPLEXITY_H_
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/src/console_reporter.cc b/external_imported/json/benchmarks/thirdparty/benchmark/src/console_reporter.cc
deleted file mode 100755
index 48920ca78..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/src/console_reporter.cc
+++ /dev/null
@@ -1,182 +0,0 @@
-// Copyright 2015 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "benchmark/benchmark.h"
-#include "complexity.h"
-#include "counter.h"
-
-#include <algorithm>
-#include <cstdint>
-#include <cstdio>
-#include <iostream>
-#include <string>
-#include <tuple>
-#include <vector>
-
-#include "check.h"
-#include "colorprint.h"
-#include "commandlineflags.h"
-#include "internal_macros.h"
-#include "string_util.h"
-#include "timers.h"
-
-namespace benchmark {
-
-bool ConsoleReporter::ReportContext(const Context& context) {
-  name_field_width_ = context.name_field_width;
-  printed_header_ = false;
-  prev_counters_.clear();
-
-  PrintBasicContext(&GetErrorStream(), context);
-
-#ifdef BENCHMARK_OS_WINDOWS
-  if ((output_options_ & OO_Color) && &std::cout != &GetOutputStream()) {
-    GetErrorStream()
-        << "Color printing is only supported for stdout on windows."
-           " Disabling color printing\n";
-    output_options_ = static_cast< OutputOptions >(output_options_ & ~OO_Color);
-  }
-#endif
-
-  return true;
-}
-
-void ConsoleReporter::PrintHeader(const Run& run) {
-  std::string str = FormatString("%-*s %13s %13s %10s", static_cast<int>(name_field_width_),
-                                 "Benchmark", "Time", "CPU", "Iterations");
-  if(!run.counters.empty()) {
-    if(output_options_ & OO_Tabular) {
-      for(auto const& c : run.counters) {
-        str += FormatString(" %10s", c.first.c_str());
-      }
-    } else {
-      str += " UserCounters...";
-    }
-  }
-  str += "\n";
-  std::string line = std::string(str.length(), '-');
-  GetOutputStream() << line << "\n" << str << line << "\n";
-}
-
-void ConsoleReporter::ReportRuns(const std::vector<Run>& reports) {
-  for (const auto& run : reports) {
-    // print the header:
-    // --- if none was printed yet
-    bool print_header = !printed_header_;
-    // --- or if the format is tabular and this run
-    //     has different fields from the prev header
-    print_header |= (output_options_ & OO_Tabular) &&
-                    (!internal::SameNames(run.counters, prev_counters_));
-    if (print_header) {
-      printed_header_ = true;
-      prev_counters_ = run.counters;
-      PrintHeader(run);
-    }
-    // As an alternative to printing the headers like this, we could sort
-    // the benchmarks by header and then print. But this would require
-    // waiting for the full results before printing, or printing twice.
-    PrintRunData(run);
-  }
-}
-
-static void IgnoreColorPrint(std::ostream& out, LogColor, const char* fmt,
-                             ...) {
-  va_list args;
-  va_start(args, fmt);
-  out << FormatString(fmt, args);
-  va_end(args);
-}
-
-void ConsoleReporter::PrintRunData(const Run& result) {
-  typedef void(PrinterFn)(std::ostream&, LogColor, const char*, ...);
-  auto& Out = GetOutputStream();
-  PrinterFn* printer = (output_options_ & OO_Color) ?
-                         (PrinterFn*)ColorPrintf : IgnoreColorPrint;
-  auto name_color =
-      (result.report_big_o || result.report_rms) ? COLOR_BLUE : COLOR_GREEN;
-  printer(Out, name_color, "%-*s ", name_field_width_,
-          result.benchmark_name.c_str());
-
-  if (result.error_occurred) {
-    printer(Out, COLOR_RED, "ERROR OCCURRED: \'%s\'",
-            result.error_message.c_str());
-    printer(Out, COLOR_DEFAULT, "\n");
-    return;
-  }
-  // Format bytes per second
-  std::string rate;
-  if (result.bytes_per_second > 0) {
-    rate = StrCat(" ", HumanReadableNumber(result.bytes_per_second), "B/s");
-  }
-
-  // Format items per second
-  std::string items;
-  if (result.items_per_second > 0) {
-    items =
-        StrCat(" ", HumanReadableNumber(result.items_per_second), " items/s");
-  }
-
-  const double real_time = result.GetAdjustedRealTime();
-  const double cpu_time = result.GetAdjustedCPUTime();
-
-  if (result.report_big_o) {
-    std::string big_o = GetBigOString(result.complexity);
-    printer(Out, COLOR_YELLOW, "%10.2f %s %10.2f %s ", real_time, big_o.c_str(),
-            cpu_time, big_o.c_str());
-  } else if (result.report_rms) {
-    printer(Out, COLOR_YELLOW, "%10.0f %% %10.0f %% ", real_time * 100,
-            cpu_time * 100);
-  } else {
-    const char* timeLabel = GetTimeUnitString(result.time_unit);
-    printer(Out, COLOR_YELLOW, "%10.0f %s %10.0f %s ", real_time, timeLabel,
-            cpu_time, timeLabel);
-  }
-
-  if (!result.report_big_o && !result.report_rms) {
-    printer(Out, COLOR_CYAN, "%10lld", result.iterations);
-  }
-
-  for (auto& c : result.counters) {
-    const std::size_t cNameLen = std::max(std::string::size_type(10),
-                                          c.first.length());
-    auto const& s = HumanReadableNumber(c.second.value, 1000);
-    if (output_options_ & OO_Tabular) {
-      if (c.second.flags & Counter::kIsRate) {
-        printer(Out, COLOR_DEFAULT, " %*s/s", cNameLen - 2, s.c_str());
-      } else {
-        printer(Out, COLOR_DEFAULT, " %*s", cNameLen, s.c_str());
-      }
-    } else {
-      const char* unit = (c.second.flags & Counter::kIsRate) ? "/s" : "";
-      printer(Out, COLOR_DEFAULT, " %s=%s%s", c.first.c_str(), s.c_str(),
-              unit);
-    }
-  }
-
-  if (!rate.empty()) {
-    printer(Out, COLOR_DEFAULT, " %*s", 13, rate.c_str());
-  }
-
-  if (!items.empty()) {
-    printer(Out, COLOR_DEFAULT, " %*s", 18, items.c_str());
-  }
-
-  if (!result.report_label.empty()) {
-    printer(Out, COLOR_DEFAULT, " %s", result.report_label.c_str());
-  }
-
-  printer(Out, COLOR_DEFAULT, "\n");
-}
-
-}  // end namespace benchmark
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/src/counter.cc b/external_imported/json/benchmarks/thirdparty/benchmark/src/counter.cc
deleted file mode 100755
index ed1aa044e..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/src/counter.cc
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2015 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "counter.h"
-
-namespace benchmark {
-namespace internal {
-
-double Finish(Counter const& c, double cpu_time, double num_threads) {
-  double v = c.value;
-  if (c.flags & Counter::kIsRate) {
-    v /= cpu_time;
-  }
-  if (c.flags & Counter::kAvgThreads) {
-    v /= num_threads;
-  }
-  return v;
-}
-
-void Finish(UserCounters *l, double cpu_time, double num_threads) {
-  for (auto &c : *l) {
-    c.second.value = Finish(c.second, cpu_time, num_threads);
-  }
-}
-
-void Increment(UserCounters *l, UserCounters const& r) {
-  // add counters present in both or just in *l
-  for (auto &c : *l) {
-    auto it = r.find(c.first);
-    if (it != r.end()) {
-      c.second.value = c.second + it->second;
-    }
-  }
-  // add counters present in r, but not in *l
-  for (auto const &tc : r) {
-    auto it = l->find(tc.first);
-    if (it == l->end()) {
-      (*l)[tc.first] = tc.second;
-    }
-  }
-}
-
-bool SameNames(UserCounters const& l, UserCounters const& r) {
-  if (&l == &r) return true;
-  if (l.size() != r.size()) {
-    return false;
-  }
-  for (auto const& c : l) {
-    if (r.find(c.first) == r.end()) {
-      return false;
-    }
-  }
-  return true;
-}
-
-} // end namespace internal
-} // end namespace benchmark
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/src/counter.h b/external_imported/json/benchmarks/thirdparty/benchmark/src/counter.h
deleted file mode 100755
index dd6865a31..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/src/counter.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2015 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "benchmark/benchmark.h"
-
-namespace benchmark {
-
-// these counter-related functions are hidden to reduce API surface.
-namespace internal {
-void Finish(UserCounters *l, double time, double num_threads);
-void Increment(UserCounters *l, UserCounters const& r);
-bool SameNames(UserCounters const& l, UserCounters const& r);
-} // end namespace internal
-
-} //end namespace benchmark
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/src/csv_reporter.cc b/external_imported/json/benchmarks/thirdparty/benchmark/src/csv_reporter.cc
deleted file mode 100755
index 35510645b..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/src/csv_reporter.cc
+++ /dev/null
@@ -1,149 +0,0 @@
-// Copyright 2015 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "benchmark/benchmark.h"
-#include "complexity.h"
-
-#include <algorithm>
-#include <cstdint>
-#include <iostream>
-#include <string>
-#include <tuple>
-#include <vector>
-
-#include "string_util.h"
-#include "timers.h"
-#include "check.h"
-
-// File format reference: http://edoceo.com/utilitas/csv-file-format.
-
-namespace benchmark {
-
-namespace {
-std::vector<std::string> elements = {
-    "name",           "iterations",       "real_time",        "cpu_time",
-    "time_unit",      "bytes_per_second", "items_per_second", "label",
-    "error_occurred", "error_message"};
-}  // namespace
-
-bool CSVReporter::ReportContext(const Context& context) {
-  PrintBasicContext(&GetErrorStream(), context);
-  return true;
-}
-
-void CSVReporter::ReportRuns(const std::vector<Run> & reports) {
-  std::ostream& Out = GetOutputStream();
-
-  if (!printed_header_) {
-    // save the names of all the user counters
-    for (const auto& run : reports) {
-      for (const auto& cnt : run.counters) {
-        user_counter_names_.insert(cnt.first);
-      }
-    }
-
-    // print the header
-    for (auto B = elements.begin(); B != elements.end();) {
-      Out << *B++;
-      if (B != elements.end()) Out << ",";
-    }
-    for (auto B = user_counter_names_.begin(); B != user_counter_names_.end();) {
-      Out << ",\"" << *B++ << "\"";
-    }
-    Out << "\n";
-
-    printed_header_ = true;
-  } else {
-    // check that all the current counters are saved in the name set
-    for (const auto& run : reports) {
-      for (const auto& cnt : run.counters) {
-        CHECK(user_counter_names_.find(cnt.first) != user_counter_names_.end())
-              << "All counters must be present in each run. "
-              << "Counter named \"" << cnt.first
-              << "\" was not in a run after being added to the header";
-      }
-    }
-  }
-
-  // print results for each run
-  for (const auto& run : reports) {
-    PrintRunData(run);
-  }
-
-}
-
-void CSVReporter::PrintRunData(const Run & run) {
-  std::ostream& Out = GetOutputStream();
-
-  // Field with embedded double-quote characters must be doubled and the field
-  // delimited with double-quotes.
-  std::string name = run.benchmark_name;
-  ReplaceAll(&name, "\"", "\"\"");
-  Out << '"' << name << "\",";
-  if (run.error_occurred) {
-    Out << std::string(elements.size() - 3, ',');
-    Out << "true,";
-    std::string msg = run.error_message;
-    ReplaceAll(&msg, "\"", "\"\"");
-    Out << '"' << msg << "\"\n";
-    return;
-  }
-
-  // Do not print iteration on bigO and RMS report
-  if (!run.report_big_o && !run.report_rms) {
-    Out << run.iterations;
-  }
-  Out << ",";
-
-  Out << run.GetAdjustedRealTime() << ",";
-  Out << run.GetAdjustedCPUTime() << ",";
-
-  // Do not print timeLabel on bigO and RMS report
-  if (run.report_big_o) {
-    Out << GetBigOString(run.complexity);
-  } else if (!run.report_rms) {
-    Out << GetTimeUnitString(run.time_unit);
-  }
-  Out << ",";
-
-  if (run.bytes_per_second > 0.0) {
-    Out << run.bytes_per_second;
-  }
-  Out << ",";
-  if (run.items_per_second > 0.0) {
-    Out << run.items_per_second;
-  }
-  Out << ",";
-  if (!run.report_label.empty()) {
-    // Field with embedded double-quote characters must be doubled and the field
-    // delimited with double-quotes.
-    std::string label = run.report_label;
-    ReplaceAll(&label, "\"", "\"\"");
-    Out << "\"" << label << "\"";
-  }
-  Out << ",,";  // for error_occurred and error_message
-
-  // Print user counters
-  for (const auto &ucn : user_counter_names_) {
-    auto it = run.counters.find(ucn);
-    if(it == run.counters.end()) {
-      Out << ",";
-    } else {
-      Out << "," << it->second;
-    }
-  }
-  Out << '\n';
-}
-
-}  // end namespace benchmark
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/src/cycleclock.h b/external_imported/json/benchmarks/thirdparty/benchmark/src/cycleclock.h
deleted file mode 100755
index 3b376ac57..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/src/cycleclock.h
+++ /dev/null
@@ -1,177 +0,0 @@
-// ----------------------------------------------------------------------
-// CycleClock
-//    A CycleClock tells you the current time in Cycles.  The "time"
-//    is actually time since power-on.  This is like time() but doesn't
-//    involve a system call and is much more precise.
-//
-// NOTE: Not all cpu/platform/kernel combinations guarantee that this
-// clock increments at a constant rate or is synchronized across all logical
-// cpus in a system.
-//
-// If you need the above guarantees, please consider using a different
-// API. There are efforts to provide an interface which provides a millisecond
-// granularity and implemented as a memory read. A memory read is generally
-// cheaper than the CycleClock for many architectures.
-//
-// Also, in some out of order CPU implementations, the CycleClock is not
-// serializing. So if you're trying to count at cycles granularity, your
-// data might be inaccurate due to out of order instruction execution.
-// ----------------------------------------------------------------------
-
-#ifndef BENCHMARK_CYCLECLOCK_H_
-#define BENCHMARK_CYCLECLOCK_H_
-
-#include <cstdint>
-
-#include "benchmark/benchmark.h"
-#include "internal_macros.h"
-
-#if defined(BENCHMARK_OS_MACOSX)
-#include <mach/mach_time.h>
-#endif
-// For MSVC, we want to use '_asm rdtsc' when possible (since it works
-// with even ancient MSVC compilers), and when not possible the
-// __rdtsc intrinsic, declared in <intrin.h>.  Unfortunately, in some
-// environments, <windows.h> and <intrin.h> have conflicting
-// declarations of some other intrinsics, breaking compilation.
-// Therefore, we simply declare __rdtsc ourselves. See also
-// http://connect.microsoft.com/VisualStudio/feedback/details/262047
-#if defined(COMPILER_MSVC) && !defined(_M_IX86)
-extern "C" uint64_t __rdtsc();
-#pragma intrinsic(__rdtsc)
-#endif
-
-#ifndef BENCHMARK_OS_WINDOWS
-#include <sys/time.h>
-#include <time.h>
-#endif
-
-#ifdef BENCHMARK_OS_EMSCRIPTEN
-#include <emscripten.h>
-#endif
-
-namespace benchmark {
-// NOTE: only i386 and x86_64 have been well tested.
-// PPC, sparc, alpha, and ia64 are based on
-//    http://peter.kuscsik.com/wordpress/?p=14
-// with modifications by m3b.  See also
-//    https://setisvn.ssl.berkeley.edu/svn/lib/fftw-3.0.1/kernel/cycle.h
-namespace cycleclock {
-// This should return the number of cycles since power-on.  Thread-safe.
-inline BENCHMARK_ALWAYS_INLINE int64_t Now() {
-#if defined(BENCHMARK_OS_MACOSX)
-  // this goes at the top because we need ALL Macs, regardless of
-  // architecture, to return the number of "mach time units" that
-  // have passed since startup.  See sysinfo.cc where
-  // InitializeSystemInfo() sets the supposed cpu clock frequency of
-  // macs to the number of mach time units per second, not actual
-  // CPU clock frequency (which can change in the face of CPU
-  // frequency scaling).  Also note that when the Mac sleeps, this
-  // counter pauses; it does not continue counting, nor does it
-  // reset to zero.
-  return mach_absolute_time();
-#elif defined(BENCHMARK_OS_EMSCRIPTEN)
-  // this goes above x86-specific code because old versions of Emscripten
-  // define __x86_64__, although they have nothing to do with it.
-  return static_cast<int64_t>(emscripten_get_now() * 1e+6);
-#elif defined(__i386__)
-  int64_t ret;
-  __asm__ volatile("rdtsc" : "=A"(ret));
-  return ret;
-#elif defined(__x86_64__) || defined(__amd64__)
-  uint64_t low, high;
-  __asm__ volatile("rdtsc" : "=a"(low), "=d"(high));
-  return (high << 32) | low;
-#elif defined(__powerpc__) || defined(__ppc__)
-  // This returns a time-base, which is not always precisely a cycle-count.
-  int64_t tbl, tbu0, tbu1;
-  asm("mftbu %0" : "=r"(tbu0));
-  asm("mftb  %0" : "=r"(tbl));
-  asm("mftbu %0" : "=r"(tbu1));
-  tbl &= -static_cast<int64_t>(tbu0 == tbu1);
-  // high 32 bits in tbu1; low 32 bits in tbl  (tbu0 is garbage)
-  return (tbu1 << 32) | tbl;
-#elif defined(__sparc__)
-  int64_t tick;
-  asm(".byte 0x83, 0x41, 0x00, 0x00");
-  asm("mov   %%g1, %0" : "=r"(tick));
-  return tick;
-#elif defined(__ia64__)
-  int64_t itc;
-  asm("mov %0 = ar.itc" : "=r"(itc));
-  return itc;
-#elif defined(COMPILER_MSVC) && defined(_M_IX86)
-  // Older MSVC compilers (like 7.x) don't seem to support the
-  // __rdtsc intrinsic properly, so I prefer to use _asm instead
-  // when I know it will work.  Otherwise, I'll use __rdtsc and hope
-  // the code is being compiled with a non-ancient compiler.
-  _asm rdtsc
-#elif defined(COMPILER_MSVC)
-  return __rdtsc();
-#elif defined(BENCHMARK_OS_NACL)
-  // Native Client validator on x86/x86-64 allows RDTSC instructions,
-  // and this case is handled above. Native Client validator on ARM
-  // rejects MRC instructions (used in the ARM-specific sequence below),
-  // so we handle it here. Portable Native Client compiles to
-  // architecture-agnostic bytecode, which doesn't provide any
-  // cycle counter access mnemonics.
-
-  // Native Client does not provide any API to access cycle counter.
-  // Use clock_gettime(CLOCK_MONOTONIC, ...) instead of gettimeofday
-  // because is provides nanosecond resolution (which is noticable at
-  // least for PNaCl modules running on x86 Mac & Linux).
-  // Initialize to always return 0 if clock_gettime fails.
-  struct timespec ts = { 0, 0 };
-  clock_gettime(CLOCK_MONOTONIC, &ts);
-  return static_cast<int64_t>(ts.tv_sec) * 1000000000 + ts.tv_nsec;
-#elif defined(__aarch64__)
-  // System timer of ARMv8 runs at a different frequency than the CPU's.
-  // The frequency is fixed, typically in the range 1-50MHz.  It can be
-  // read at CNTFRQ special register.  We assume the OS has set up
-  // the virtual timer properly.
-  int64_t virtual_timer_value;
-  asm volatile("mrs %0, cntvct_el0" : "=r"(virtual_timer_value));
-  return virtual_timer_value;
-#elif defined(__ARM_ARCH)
-  // V6 is the earliest arch that has a standard cyclecount
-  // Native Client validator doesn't allow MRC instructions.
-#if (__ARM_ARCH >= 6)
-  uint32_t pmccntr;
-  uint32_t pmuseren;
-  uint32_t pmcntenset;
-  // Read the user mode perf monitor counter access permissions.
-  asm volatile("mrc p15, 0, %0, c9, c14, 0" : "=r"(pmuseren));
-  if (pmuseren & 1) {  // Allows reading perfmon counters for user mode code.
-    asm volatile("mrc p15, 0, %0, c9, c12, 1" : "=r"(pmcntenset));
-    if (pmcntenset & 0x80000000ul) {  // Is it counting?
-      asm volatile("mrc p15, 0, %0, c9, c13, 0" : "=r"(pmccntr));
-      // The counter is set up to count every 64th cycle
-      return static_cast<int64_t>(pmccntr) * 64;  // Should optimize to << 6
-    }
-  }
-#endif
-  struct timeval tv;
-  gettimeofday(&tv, nullptr);
-  return static_cast<int64_t>(tv.tv_sec) * 1000000 + tv.tv_usec;
-#elif defined(__mips__)
-  // mips apparently only allows rdtsc for superusers, so we fall
-  // back to gettimeofday.  It's possible clock_gettime would be better.
-  struct timeval tv;
-  gettimeofday(&tv, nullptr);
-  return static_cast<int64_t>(tv.tv_sec) * 1000000 + tv.tv_usec;
-#elif defined(__s390__) // Covers both s390 and s390x.
-  // Return the CPU clock.
-  uint64_t tsc;
-  asm("stck %0" : "=Q" (tsc) : : "cc");
-  return tsc;
-#else
-// The soft failover to a generic implementation is automatic only for ARM.
-// For other platforms the developer is expected to make an attempt to create
-// a fast implementation and use generic version if nothing better is available.
-#error You need to define CycleTimer for your OS and CPU
-#endif
-}
-}  // end namespace cycleclock
-}  // end namespace benchmark
-
-#endif  // BENCHMARK_CYCLECLOCK_H_
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/src/internal_macros.h b/external_imported/json/benchmarks/thirdparty/benchmark/src/internal_macros.h
deleted file mode 100755
index edb8a5c0a..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/src/internal_macros.h
+++ /dev/null
@@ -1,89 +0,0 @@
-#ifndef BENCHMARK_INTERNAL_MACROS_H_
-#define BENCHMARK_INTERNAL_MACROS_H_
-
-#include "benchmark/benchmark.h"
-
-#ifndef __has_feature
-#define __has_feature(x) 0
-#endif
-#ifndef __has_builtin
-#define __has_builtin(x) 0
-#endif
-
-#if defined(__clang__)
-  #if !defined(COMPILER_CLANG)
-    #define COMPILER_CLANG
-  #endif
-#elif defined(_MSC_VER)
-  #if !defined(COMPILER_MSVC)
-    #define COMPILER_MSVC
-  #endif
-#elif defined(__GNUC__)
-  #if !defined(COMPILER_GCC)
-    #define COMPILER_GCC
-  #endif
-#endif
-
-#if __has_feature(cxx_attributes)
-  #define BENCHMARK_NORETURN [[noreturn]]
-#elif defined(__GNUC__)
-  #define BENCHMARK_NORETURN __attribute__((noreturn))
-#elif defined(COMPILER_MSVC)
-  #define BENCHMARK_NORETURN __declspec(noreturn)
-#else
-  #define BENCHMARK_NORETURN
-#endif
-
-#if defined(__CYGWIN__)
-  #define BENCHMARK_OS_CYGWIN 1
-#elif defined(_WIN32)
-  #define BENCHMARK_OS_WINDOWS 1
-#elif defined(__APPLE__)
-  #define BENCHMARK_OS_APPLE 1
-  #include "TargetConditionals.h"
-  #if defined(TARGET_OS_MAC)
-    #define BENCHMARK_OS_MACOSX 1
-    #if defined(TARGET_OS_IPHONE)
-      #define BENCHMARK_OS_IOS 1
-    #endif
-  #endif
-#elif defined(__FreeBSD__)
-  #define BENCHMARK_OS_FREEBSD 1
-#elif defined(__NetBSD__)
-  #define BENCHMARK_OS_NETBSD 1
-#elif defined(__OpenBSD__)
-  #define BENCHMARK_OS_OPENBSD 1
-#elif defined(__linux__)
-  #define BENCHMARK_OS_LINUX 1
-#elif defined(__native_client__)
-  #define BENCHMARK_OS_NACL 1
-#elif defined(__EMSCRIPTEN__)
-  #define BENCHMARK_OS_EMSCRIPTEN 1
-#elif defined(__rtems__)
-  #define BENCHMARK_OS_RTEMS 1
-#elif defined(__Fuchsia__)
-#define BENCHMARK_OS_FUCHSIA 1
-#elif defined (__SVR4) && defined (__sun)
-#define BENCHMARK_OS_SOLARIS 1
-#endif
-
-#if !__has_feature(cxx_exceptions) && !defined(__cpp_exceptions) \
-     && !defined(__EXCEPTIONS)
-  #define BENCHMARK_HAS_NO_EXCEPTIONS
-#endif
-
-#if defined(COMPILER_CLANG) || defined(COMPILER_GCC)
-  #define BENCHMARK_MAYBE_UNUSED __attribute__((unused))
-#else
-  #define BENCHMARK_MAYBE_UNUSED
-#endif
-
-#if defined(COMPILER_GCC) || __has_builtin(__builtin_unreachable)
-  #define BENCHMARK_UNREACHABLE() __builtin_unreachable()
-#elif defined(COMPILER_MSVC)
-  #define BENCHMARK_UNREACHABLE() __assume(false)
-#else
-  #define BENCHMARK_UNREACHABLE() ((void)0)
-#endif
-
-#endif  // BENCHMARK_INTERNAL_MACROS_H_
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/src/json_reporter.cc b/external_imported/json/benchmarks/thirdparty/benchmark/src/json_reporter.cc
deleted file mode 100755
index 685d6b097..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/src/json_reporter.cc
+++ /dev/null
@@ -1,205 +0,0 @@
-// Copyright 2015 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "benchmark/benchmark.h"
-#include "complexity.h"
-
-#include <algorithm>
-#include <cstdint>
-#include <iostream>
-#include <string>
-#include <tuple>
-#include <vector>
-#include <iomanip> // for setprecision
-#include <limits>
-
-#include "string_util.h"
-#include "timers.h"
-
-namespace benchmark {
-
-namespace {
-
-std::string FormatKV(std::string const& key, std::string const& value) {
-  return StrFormat("\"%s\": \"%s\"", key.c_str(), value.c_str());
-}
-
-std::string FormatKV(std::string const& key, const char* value) {
-  return StrFormat("\"%s\": \"%s\"", key.c_str(), value);
-}
-
-std::string FormatKV(std::string const& key, bool value) {
-  return StrFormat("\"%s\": %s", key.c_str(), value ? "true" : "false");
-}
-
-std::string FormatKV(std::string const& key, int64_t value) {
-  std::stringstream ss;
-  ss << '"' << key << "\": " << value;
-  return ss.str();
-}
-
-std::string FormatKV(std::string const& key, double value) {
-  std::stringstream ss;
-  ss << '"' << key << "\": ";
-
-  const auto max_digits10 = std::numeric_limits<decltype (value)>::max_digits10;
-  const auto max_fractional_digits10 = max_digits10 - 1;
-
-  ss << std::scientific << std::setprecision(max_fractional_digits10) << value;
-  return ss.str();
-}
-
-int64_t RoundDouble(double v) { return static_cast<int64_t>(v + 0.5); }
-
-}  // end namespace
-
-bool JSONReporter::ReportContext(const Context& context) {
-  std::ostream& out = GetOutputStream();
-
-  out << "{\n";
-  std::string inner_indent(2, ' ');
-
-  // Open context block and print context information.
-  out << inner_indent << "\"context\": {\n";
-  std::string indent(4, ' ');
-
-  std::string walltime_value = LocalDateTimeString();
-  out << indent << FormatKV("date", walltime_value) << ",\n";
-
-  if (Context::executable_name) {
-    out << indent << FormatKV("executable", Context::executable_name) << ",\n";
-  }
-
-  CPUInfo const& info = context.cpu_info;
-  out << indent << FormatKV("num_cpus", static_cast<int64_t>(info.num_cpus))
-      << ",\n";
-  out << indent
-      << FormatKV("mhz_per_cpu",
-                  RoundDouble(info.cycles_per_second / 1000000.0))
-      << ",\n";
-  out << indent << FormatKV("cpu_scaling_enabled", info.scaling_enabled)
-      << ",\n";
-
-  out << indent << "\"caches\": [\n";
-  indent = std::string(6, ' ');
-  std::string cache_indent(8, ' ');
-  for (size_t i = 0; i < info.caches.size(); ++i) {
-    auto& CI = info.caches[i];
-    out << indent << "{\n";
-    out << cache_indent << FormatKV("type", CI.type) << ",\n";
-    out << cache_indent << FormatKV("level", static_cast<int64_t>(CI.level))
-        << ",\n";
-    out << cache_indent
-        << FormatKV("size", static_cast<int64_t>(CI.size) * 1000u) << ",\n";
-    out << cache_indent
-        << FormatKV("num_sharing", static_cast<int64_t>(CI.num_sharing))
-        << "\n";
-    out << indent << "}";
-    if (i != info.caches.size() - 1) out << ",";
-    out << "\n";
-  }
-  indent = std::string(4, ' ');
-  out << indent << "],\n";
-
-#if defined(NDEBUG)
-  const char build_type[] = "release";
-#else
-  const char build_type[] = "debug";
-#endif
-  out << indent << FormatKV("library_build_type", build_type) << "\n";
-  // Close context block and open the list of benchmarks.
-  out << inner_indent << "},\n";
-  out << inner_indent << "\"benchmarks\": [\n";
-  return true;
-}
-
-void JSONReporter::ReportRuns(std::vector<Run> const& reports) {
-  if (reports.empty()) {
-    return;
-  }
-  std::string indent(4, ' ');
-  std::ostream& out = GetOutputStream();
-  if (!first_report_) {
-    out << ",\n";
-  }
-  first_report_ = false;
-
-  for (auto it = reports.begin(); it != reports.end(); ++it) {
-    out << indent << "{\n";
-    PrintRunData(*it);
-    out << indent << '}';
-    auto it_cp = it;
-    if (++it_cp != reports.end()) {
-      out << ",\n";
-    }
-  }
-}
-
-void JSONReporter::Finalize() {
-  // Close the list of benchmarks and the top level object.
-  GetOutputStream() << "\n  ]\n}\n";
-}
-
-void JSONReporter::PrintRunData(Run const& run) {
-  std::string indent(6, ' ');
-  std::ostream& out = GetOutputStream();
-  out << indent << FormatKV("name", run.benchmark_name) << ",\n";
-  if (run.error_occurred) {
-    out << indent << FormatKV("error_occurred", run.error_occurred) << ",\n";
-    out << indent << FormatKV("error_message", run.error_message) << ",\n";
-  }
-  if (!run.report_big_o && !run.report_rms) {
-    out << indent << FormatKV("iterations", run.iterations) << ",\n";
-    out << indent
-        << FormatKV("real_time", run.GetAdjustedRealTime())
-        << ",\n";
-    out << indent
-        << FormatKV("cpu_time", run.GetAdjustedCPUTime());
-    out << ",\n"
-        << indent << FormatKV("time_unit", GetTimeUnitString(run.time_unit));
-  } else if (run.report_big_o) {
-    out << indent
-        << FormatKV("cpu_coefficient", run.GetAdjustedCPUTime())
-        << ",\n";
-    out << indent
-        << FormatKV("real_coefficient", run.GetAdjustedRealTime())
-        << ",\n";
-    out << indent << FormatKV("big_o", GetBigOString(run.complexity)) << ",\n";
-    out << indent << FormatKV("time_unit", GetTimeUnitString(run.time_unit));
-  } else if (run.report_rms) {
-    out << indent
-        << FormatKV("rms", run.GetAdjustedCPUTime());
-  }
-  if (run.bytes_per_second > 0.0) {
-    out << ",\n"
-        << indent
-        << FormatKV("bytes_per_second", run.bytes_per_second);
-  }
-  if (run.items_per_second > 0.0) {
-    out << ",\n"
-        << indent
-        << FormatKV("items_per_second", run.items_per_second);
-  }
-  for(auto &c : run.counters) {
-    out << ",\n"
-        << indent
-        << FormatKV(c.first, c.second);
-  }
-  if (!run.report_label.empty()) {
-    out << ",\n" << indent << FormatKV("label", run.report_label);
-  }
-  out << '\n';
-}
-
-} // end namespace benchmark
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/src/log.h b/external_imported/json/benchmarks/thirdparty/benchmark/src/log.h
deleted file mode 100755
index d06e1031d..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/src/log.h
+++ /dev/null
@@ -1,73 +0,0 @@
-#ifndef BENCHMARK_LOG_H_
-#define BENCHMARK_LOG_H_
-
-#include <iostream>
-#include <ostream>
-
-#include "benchmark/benchmark.h"
-
-namespace benchmark {
-namespace internal {
-
-typedef std::basic_ostream<char>&(EndLType)(std::basic_ostream<char>&);
-
-class LogType {
-  friend LogType& GetNullLogInstance();
-  friend LogType& GetErrorLogInstance();
-
-  // FIXME: Add locking to output.
-  template <class Tp>
-  friend LogType& operator<<(LogType&, Tp const&);
-  friend LogType& operator<<(LogType&, EndLType*);
-
- private:
-  LogType(std::ostream* out) : out_(out) {}
-  std::ostream* out_;
-  BENCHMARK_DISALLOW_COPY_AND_ASSIGN(LogType);
-};
-
-template <class Tp>
-LogType& operator<<(LogType& log, Tp const& value) {
-  if (log.out_) {
-    *log.out_ << value;
-  }
-  return log;
-}
-
-inline LogType& operator<<(LogType& log, EndLType* m) {
-  if (log.out_) {
-    *log.out_ << m;
-  }
-  return log;
-}
-
-inline int& LogLevel() {
-  static int log_level = 0;
-  return log_level;
-}
-
-inline LogType& GetNullLogInstance() {
-  static LogType log(nullptr);
-  return log;
-}
-
-inline LogType& GetErrorLogInstance() {
-  static LogType log(&std::clog);
-  return log;
-}
-
-inline LogType& GetLogInstanceForLevel(int level) {
-  if (level <= LogLevel()) {
-    return GetErrorLogInstance();
-  }
-  return GetNullLogInstance();
-}
-
-}  // end namespace internal
-}  // end namespace benchmark
-
-#define VLOG(x)                                                               \
-  (::benchmark::internal::GetLogInstanceForLevel(x) << "-- LOG(" << x << "):" \
-                                                                         " ")
-
-#endif
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/src/mutex.h b/external_imported/json/benchmarks/thirdparty/benchmark/src/mutex.h
deleted file mode 100755
index 5f461d05a..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/src/mutex.h
+++ /dev/null
@@ -1,155 +0,0 @@
-#ifndef BENCHMARK_MUTEX_H_
-#define BENCHMARK_MUTEX_H_
-
-#include <condition_variable>
-#include <mutex>
-
-#include "check.h"
-
-// Enable thread safety attributes only with clang.
-// The attributes can be safely erased when compiling with other compilers.
-#if defined(HAVE_THREAD_SAFETY_ATTRIBUTES)
-#define THREAD_ANNOTATION_ATTRIBUTE__(x) __attribute__((x))
-#else
-#define THREAD_ANNOTATION_ATTRIBUTE__(x)  // no-op
-#endif
-
-#define CAPABILITY(x) THREAD_ANNOTATION_ATTRIBUTE__(capability(x))
-
-#define SCOPED_CAPABILITY THREAD_ANNOTATION_ATTRIBUTE__(scoped_lockable)
-
-#define GUARDED_BY(x) THREAD_ANNOTATION_ATTRIBUTE__(guarded_by(x))
-
-#define PT_GUARDED_BY(x) THREAD_ANNOTATION_ATTRIBUTE__(pt_guarded_by(x))
-
-#define ACQUIRED_BEFORE(...) \
-  THREAD_ANNOTATION_ATTRIBUTE__(acquired_before(__VA_ARGS__))
-
-#define ACQUIRED_AFTER(...) \
-  THREAD_ANNOTATION_ATTRIBUTE__(acquired_after(__VA_ARGS__))
-
-#define REQUIRES(...) \
-  THREAD_ANNOTATION_ATTRIBUTE__(requires_capability(__VA_ARGS__))
-
-#define REQUIRES_SHARED(...) \
-  THREAD_ANNOTATION_ATTRIBUTE__(requires_shared_capability(__VA_ARGS__))
-
-#define ACQUIRE(...) \
-  THREAD_ANNOTATION_ATTRIBUTE__(acquire_capability(__VA_ARGS__))
-
-#define ACQUIRE_SHARED(...) \
-  THREAD_ANNOTATION_ATTRIBUTE__(acquire_shared_capability(__VA_ARGS__))
-
-#define RELEASE(...) \
-  THREAD_ANNOTATION_ATTRIBUTE__(release_capability(__VA_ARGS__))
-
-#define RELEASE_SHARED(...) \
-  THREAD_ANNOTATION_ATTRIBUTE__(release_shared_capability(__VA_ARGS__))
-
-#define TRY_ACQUIRE(...) \
-  THREAD_ANNOTATION_ATTRIBUTE__(try_acquire_capability(__VA_ARGS__))
-
-#define TRY_ACQUIRE_SHARED(...) \
-  THREAD_ANNOTATION_ATTRIBUTE__(try_acquire_shared_capability(__VA_ARGS__))
-
-#define EXCLUDES(...) THREAD_ANNOTATION_ATTRIBUTE__(locks_excluded(__VA_ARGS__))
-
-#define ASSERT_CAPABILITY(x) THREAD_ANNOTATION_ATTRIBUTE__(assert_capability(x))
-
-#define ASSERT_SHARED_CAPABILITY(x) \
-  THREAD_ANNOTATION_ATTRIBUTE__(assert_shared_capability(x))
-
-#define RETURN_CAPABILITY(x) THREAD_ANNOTATION_ATTRIBUTE__(lock_returned(x))
-
-#define NO_THREAD_SAFETY_ANALYSIS \
-  THREAD_ANNOTATION_ATTRIBUTE__(no_thread_safety_analysis)
-
-namespace benchmark {
-
-typedef std::condition_variable Condition;
-
-// NOTE: Wrappers for std::mutex and std::unique_lock are provided so that
-// we can annotate them with thread safety attributes and use the
-// -Wthread-safety warning with clang. The standard library types cannot be
-// used directly because they do not provided the required annotations.
-class CAPABILITY("mutex") Mutex {
- public:
-  Mutex() {}
-
-  void lock() ACQUIRE() { mut_.lock(); }
-  void unlock() RELEASE() { mut_.unlock(); }
-  std::mutex& native_handle() { return mut_; }
-
- private:
-  std::mutex mut_;
-};
-
-class SCOPED_CAPABILITY MutexLock {
-  typedef std::unique_lock<std::mutex> MutexLockImp;
-
- public:
-  MutexLock(Mutex& m) ACQUIRE(m) : ml_(m.native_handle()) {}
-  ~MutexLock() RELEASE() {}
-  MutexLockImp& native_handle() { return ml_; }
-
- private:
-  MutexLockImp ml_;
-};
-
-class Barrier {
- public:
-  Barrier(int num_threads) : running_threads_(num_threads) {}
-
-  // Called by each thread
-  bool wait() EXCLUDES(lock_) {
-    bool last_thread = false;
-    {
-      MutexLock ml(lock_);
-      last_thread = createBarrier(ml);
-    }
-    if (last_thread) phase_condition_.notify_all();
-    return last_thread;
-  }
-
-  void removeThread() EXCLUDES(lock_) {
-    MutexLock ml(lock_);
-    --running_threads_;
-    if (entered_ != 0) phase_condition_.notify_all();
-  }
-
- private:
-  Mutex lock_;
-  Condition phase_condition_;
-  int running_threads_;
-
-  // State for barrier management
-  int phase_number_ = 0;
-  int entered_ = 0;  // Number of threads that have entered this barrier
-
-  // Enter the barrier and wait until all other threads have also
-  // entered the barrier.  Returns iff this is the last thread to
-  // enter the barrier.
-  bool createBarrier(MutexLock& ml) REQUIRES(lock_) {
-    CHECK_LT(entered_, running_threads_);
-    entered_++;
-    if (entered_ < running_threads_) {
-      // Wait for all threads to enter
-      int phase_number_cp = phase_number_;
-      auto cb = [this, phase_number_cp]() {
-        return this->phase_number_ > phase_number_cp ||
-               entered_ == running_threads_;  // A thread has aborted in error
-      };
-      phase_condition_.wait(ml.native_handle(), cb);
-      if (phase_number_ > phase_number_cp) return false;
-      // else (running_threads_ == entered_) and we are the last thread.
-    }
-    // Last thread has reached the barrier
-    phase_number_++;
-    entered_ = 0;
-    return true;
-  }
-};
-
-}  // end namespace benchmark
-
-#endif  // BENCHMARK_MUTEX_H_
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/src/re.h b/external_imported/json/benchmarks/thirdparty/benchmark/src/re.h
deleted file mode 100755
index 924d2f0ba..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/src/re.h
+++ /dev/null
@@ -1,152 +0,0 @@
-// Copyright 2015 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef BENCHMARK_RE_H_
-#define BENCHMARK_RE_H_
-
-#include "internal_macros.h"
-
-#if !defined(HAVE_STD_REGEX) && \
-    !defined(HAVE_GNU_POSIX_REGEX) && \
-    !defined(HAVE_POSIX_REGEX)
-  // No explicit regex selection; detect based on builtin hints.
-  #if defined(BENCHMARK_OS_LINUX) || defined(BENCHMARK_OS_APPLE)
-    #define HAVE_POSIX_REGEX 1
-  #elif __cplusplus >= 199711L
-    #define HAVE_STD_REGEX 1
-  #endif
-#endif
-
-// Prefer C regex libraries when compiling w/o exceptions so that we can
-// correctly report errors.
-#if defined(BENCHMARK_HAS_NO_EXCEPTIONS) && \
-    defined(BENCHMARK_HAVE_STD_REGEX) && \
-    (defined(HAVE_GNU_POSIX_REGEX) || defined(HAVE_POSIX_REGEX))
-  #undef HAVE_STD_REGEX
-#endif
-
-#if defined(HAVE_STD_REGEX)
-  #include <regex>
-#elif defined(HAVE_GNU_POSIX_REGEX)
-  #include <gnuregex.h>
-#elif defined(HAVE_POSIX_REGEX)
-  #include <regex.h>
-#else
-#error No regular expression backend was found!
-#endif
-#include <string>
-
-#include "check.h"
-
-namespace benchmark {
-
-// A wrapper around the POSIX regular expression API that provides automatic
-// cleanup
-class Regex {
- public:
-  Regex() : init_(false) {}
-
-  ~Regex();
-
-  // Compile a regular expression matcher from spec.  Returns true on success.
-  //
-  // On failure (and if error is not nullptr), error is populated with a human
-  // readable error message if an error occurs.
-  bool Init(const std::string& spec, std::string* error);
-
-  // Returns whether str matches the compiled regular expression.
-  bool Match(const std::string& str);
-
- private:
-  bool init_;
-// Underlying regular expression object
-#if defined(HAVE_STD_REGEX)
-  std::regex re_;
-#elif defined(HAVE_POSIX_REGEX) || defined(HAVE_GNU_POSIX_REGEX)
-  regex_t re_;
-#else
-  #error No regular expression backend implementation available
-#endif
-};
-
-#if defined(HAVE_STD_REGEX)
-
-inline bool Regex::Init(const std::string& spec, std::string* error) {
-#ifdef BENCHMARK_HAS_NO_EXCEPTIONS
-  ((void)error); // suppress unused warning
-#else
-  try {
-#endif
-    re_ = std::regex(spec, std::regex_constants::extended);
-    init_ = true;
-#ifndef BENCHMARK_HAS_NO_EXCEPTIONS
-  } catch (const std::regex_error& e) {
-    if (error) {
-      *error = e.what();
-    }
-  }
-#endif
-  return init_;
-}
-
-inline Regex::~Regex() {}
-
-inline bool Regex::Match(const std::string& str) {
-  if (!init_) {
-    return false;
-  }
-  return std::regex_search(str, re_);
-}
-
-#else
-inline bool Regex::Init(const std::string& spec, std::string* error) {
-  int ec = regcomp(&re_, spec.c_str(), REG_EXTENDED | REG_NOSUB);
-  if (ec != 0) {
-    if (error) {
-      size_t needed = regerror(ec, &re_, nullptr, 0);
-      char* errbuf = new char[needed];
-      regerror(ec, &re_, errbuf, needed);
-
-      // regerror returns the number of bytes necessary to null terminate
-      // the string, so we move that when assigning to error.
-      CHECK_NE(needed, 0);
-      error->assign(errbuf, needed - 1);
-
-      delete[] errbuf;
-    }
-
-    return false;
-  }
-
-  init_ = true;
-  return true;
-}
-
-inline Regex::~Regex() {
-  if (init_) {
-    regfree(&re_);
-  }
-}
-
-inline bool Regex::Match(const std::string& str) {
-  if (!init_) {
-    return false;
-  }
-  return regexec(&re_, str.c_str(), 0, nullptr, 0) == 0;
-}
-#endif
-
-}  // end namespace benchmark
-
-#endif  // BENCHMARK_RE_H_
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/src/reporter.cc b/external_imported/json/benchmarks/thirdparty/benchmark/src/reporter.cc
deleted file mode 100755
index 4b40aaec8..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/src/reporter.cc
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright 2015 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "benchmark/benchmark.h"
-#include "timers.h"
-
-#include <cstdlib>
-
-#include <iostream>
-#include <tuple>
-#include <vector>
-
-#include "check.h"
-
-namespace benchmark {
-
-BenchmarkReporter::BenchmarkReporter()
-    : output_stream_(&std::cout), error_stream_(&std::cerr) {}
-
-BenchmarkReporter::~BenchmarkReporter() {}
-
-void BenchmarkReporter::PrintBasicContext(std::ostream *out,
-                                          Context const &context) {
-  CHECK(out) << "cannot be null";
-  auto &Out = *out;
-
-  Out << LocalDateTimeString() << "\n";
-
-  if (context.executable_name)
-    Out << "Running " << context.executable_name << "\n";
-
-  const CPUInfo &info = context.cpu_info;
-  Out << "Run on (" << info.num_cpus << " X "
-      << (info.cycles_per_second / 1000000.0) << " MHz CPU "
-      << ((info.num_cpus > 1) ? "s" : "") << ")\n";
-  if (info.caches.size() != 0) {
-    Out << "CPU Caches:\n";
-    for (auto &CInfo : info.caches) {
-      Out << "  L" << CInfo.level << " " << CInfo.type << " "
-          << (CInfo.size / 1000) << "K";
-      if (CInfo.num_sharing != 0)
-        Out << " (x" << (info.num_cpus / CInfo.num_sharing) << ")";
-      Out << "\n";
-    }
-  }
-
-  if (info.scaling_enabled) {
-    Out << "***WARNING*** CPU scaling is enabled, the benchmark "
-           "real time measurements may be noisy and will incur extra "
-           "overhead.\n";
-  }
-
-#ifndef NDEBUG
-  Out << "***WARNING*** Library was built as DEBUG. Timings may be "
-         "affected.\n";
-#endif
-}
-
-// No initializer because it's already initialized to NULL.
-const char* BenchmarkReporter::Context::executable_name;
-
-BenchmarkReporter::Context::Context() : cpu_info(CPUInfo::Get()) {}
-
-double BenchmarkReporter::Run::GetAdjustedRealTime() const {
-  double new_time = real_accumulated_time * GetTimeUnitMultiplier(time_unit);
-  if (iterations != 0) new_time /= static_cast<double>(iterations);
-  return new_time;
-}
-
-double BenchmarkReporter::Run::GetAdjustedCPUTime() const {
-  double new_time = cpu_accumulated_time * GetTimeUnitMultiplier(time_unit);
-  if (iterations != 0) new_time /= static_cast<double>(iterations);
-  return new_time;
-}
-
-}  // end namespace benchmark
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/src/sleep.cc b/external_imported/json/benchmarks/thirdparty/benchmark/src/sleep.cc
deleted file mode 100755
index 54aa04a42..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/src/sleep.cc
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2015 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "sleep.h"
-
-#include <cerrno>
-#include <cstdlib>
-#include <ctime>
-
-#include "internal_macros.h"
-
-#ifdef BENCHMARK_OS_WINDOWS
-#include <Windows.h>
-#endif
-
-namespace benchmark {
-#ifdef BENCHMARK_OS_WINDOWS
-// Window's Sleep takes milliseconds argument.
-void SleepForMilliseconds(int milliseconds) { Sleep(milliseconds); }
-void SleepForSeconds(double seconds) {
-  SleepForMilliseconds(static_cast<int>(kNumMillisPerSecond * seconds));
-}
-#else   // BENCHMARK_OS_WINDOWS
-void SleepForMicroseconds(int microseconds) {
-  struct timespec sleep_time;
-  sleep_time.tv_sec = microseconds / kNumMicrosPerSecond;
-  sleep_time.tv_nsec = (microseconds % kNumMicrosPerSecond) * kNumNanosPerMicro;
-  while (nanosleep(&sleep_time, &sleep_time) != 0 && errno == EINTR)
-    ;  // Ignore signals and wait for the full interval to elapse.
-}
-
-void SleepForMilliseconds(int milliseconds) {
-  SleepForMicroseconds(milliseconds * kNumMicrosPerMilli);
-}
-
-void SleepForSeconds(double seconds) {
-  SleepForMicroseconds(static_cast<int>(seconds * kNumMicrosPerSecond));
-}
-#endif  // BENCHMARK_OS_WINDOWS
-}  // end namespace benchmark
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/src/sleep.h b/external_imported/json/benchmarks/thirdparty/benchmark/src/sleep.h
deleted file mode 100755
index f98551afe..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/src/sleep.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef BENCHMARK_SLEEP_H_
-#define BENCHMARK_SLEEP_H_
-
-namespace benchmark {
-const int kNumMillisPerSecond = 1000;
-const int kNumMicrosPerMilli = 1000;
-const int kNumMicrosPerSecond = kNumMillisPerSecond * 1000;
-const int kNumNanosPerMicro = 1000;
-const int kNumNanosPerSecond = kNumNanosPerMicro * kNumMicrosPerSecond;
-
-void SleepForMilliseconds(int milliseconds);
-void SleepForSeconds(double seconds);
-}  // end namespace benchmark
-
-#endif  // BENCHMARK_SLEEP_H_
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/src/statistics.cc b/external_imported/json/benchmarks/thirdparty/benchmark/src/statistics.cc
deleted file mode 100755
index 1c91e1015..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/src/statistics.cc
+++ /dev/null
@@ -1,178 +0,0 @@
-// Copyright 2016 Ismael Jimenez Martinez. All rights reserved.
-// Copyright 2017 Roman Lebedev. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "benchmark/benchmark.h"
-
-#include <algorithm>
-#include <cmath>
-#include <string>
-#include <vector>
-#include <numeric>
-#include "check.h"
-#include "statistics.h"
-
-namespace benchmark {
-
-auto StatisticsSum = [](const std::vector<double>& v) {
-  return std::accumulate(v.begin(), v.end(), 0.0);
-};
-
-double StatisticsMean(const std::vector<double>& v) {
-  if (v.empty()) return 0.0;
-  return StatisticsSum(v) * (1.0 / v.size());
-}
-
-double StatisticsMedian(const std::vector<double>& v) {
-  if (v.size() < 3) return StatisticsMean(v);
-  std::vector<double> copy(v);
-
-  auto center = copy.begin() + v.size() / 2;
-  std::nth_element(copy.begin(), center, copy.end());
-
-  // did we have an odd number of samples?
-  // if yes, then center is the median
-  // it no, then we are looking for the average between center and the value before
-  if(v.size() % 2 == 1)
-    return *center;
-  auto center2 = copy.begin() + v.size() / 2 - 1;
-  std::nth_element(copy.begin(), center2, copy.end());
-  return (*center + *center2) / 2.0;
-}
-
-// Return the sum of the squares of this sample set
-auto SumSquares = [](const std::vector<double>& v) {
-  return std::inner_product(v.begin(), v.end(), v.begin(), 0.0);
-};
-
-auto Sqr = [](const double dat) { return dat * dat; };
-auto Sqrt = [](const double dat) {
-  // Avoid NaN due to imprecision in the calculations
-  if (dat < 0.0) return 0.0;
-  return std::sqrt(dat);
-};
-
-double StatisticsStdDev(const std::vector<double>& v) {
-  const auto mean = StatisticsMean(v);
-  if (v.empty()) return mean;
-
-  // Sample standard deviation is undefined for n = 1
-  if (v.size() == 1)
-    return 0.0;
-
-  const double avg_squares = SumSquares(v) * (1.0 / v.size());
-  return Sqrt(v.size() / (v.size() - 1.0) * (avg_squares - Sqr(mean)));
-}
-
-std::vector<BenchmarkReporter::Run> ComputeStats(
-    const std::vector<BenchmarkReporter::Run>& reports) {
-  typedef BenchmarkReporter::Run Run;
-  std::vector<Run> results;
-
-  auto error_count =
-      std::count_if(reports.begin(), reports.end(),
-                    [](Run const& run) { return run.error_occurred; });
-
-  if (reports.size() - error_count < 2) {
-    // We don't report aggregated data if there was a single run.
-    return results;
-  }
-
-  // Accumulators.
-  std::vector<double> real_accumulated_time_stat;
-  std::vector<double> cpu_accumulated_time_stat;
-  std::vector<double> bytes_per_second_stat;
-  std::vector<double> items_per_second_stat;
-
-  real_accumulated_time_stat.reserve(reports.size());
-  cpu_accumulated_time_stat.reserve(reports.size());
-  bytes_per_second_stat.reserve(reports.size());
-  items_per_second_stat.reserve(reports.size());
-
-  // All repetitions should be run with the same number of iterations so we
-  // can take this information from the first benchmark.
-  int64_t const run_iterations = reports.front().iterations;
-  // create stats for user counters
-  struct CounterStat {
-    Counter c;
-    std::vector<double> s;
-  };
-  std::map< std::string, CounterStat > counter_stats;
-  for(Run const& r : reports) {
-    for(auto const& cnt : r.counters) {
-      auto it = counter_stats.find(cnt.first);
-      if(it == counter_stats.end()) {
-        counter_stats.insert({cnt.first, {cnt.second, std::vector<double>{}}});
-        it = counter_stats.find(cnt.first);
-        it->second.s.reserve(reports.size());
-      } else {
-        CHECK_EQ(counter_stats[cnt.first].c.flags, cnt.second.flags);
-      }
-    }
-  }
-
-  // Populate the accumulators.
-  for (Run const& run : reports) {
-    CHECK_EQ(reports[0].benchmark_name, run.benchmark_name);
-    CHECK_EQ(run_iterations, run.iterations);
-    if (run.error_occurred) continue;
-    real_accumulated_time_stat.emplace_back(run.real_accumulated_time);
-    cpu_accumulated_time_stat.emplace_back(run.cpu_accumulated_time);
-    items_per_second_stat.emplace_back(run.items_per_second);
-    bytes_per_second_stat.emplace_back(run.bytes_per_second);
-    // user counters
-    for(auto const& cnt : run.counters) {
-      auto it = counter_stats.find(cnt.first);
-      CHECK_NE(it, counter_stats.end());
-      it->second.s.emplace_back(cnt.second);
-    }
-  }
-
-  // Only add label if it is same for all runs
-  std::string report_label = reports[0].report_label;
-  for (std::size_t i = 1; i < reports.size(); i++) {
-    if (reports[i].report_label != report_label) {
-      report_label = "";
-      break;
-    }
-  }
-
-  for(const auto& Stat : *reports[0].statistics) {
-    // Get the data from the accumulator to BenchmarkReporter::Run's.
-    Run data;
-    data.benchmark_name = reports[0].benchmark_name + "_" + Stat.name_;
-    data.report_label = report_label;
-    data.iterations = run_iterations;
-
-    data.real_accumulated_time = Stat.compute_(real_accumulated_time_stat);
-    data.cpu_accumulated_time = Stat.compute_(cpu_accumulated_time_stat);
-    data.bytes_per_second = Stat.compute_(bytes_per_second_stat);
-    data.items_per_second = Stat.compute_(items_per_second_stat);
-
-    data.time_unit = reports[0].time_unit;
-
-    // user counters
-    for(auto const& kv : counter_stats) {
-      const auto uc_stat = Stat.compute_(kv.second.s);
-      auto c = Counter(uc_stat, counter_stats[kv.first].c.flags);
-      data.counters[kv.first] = c;
-    }
-
-    results.push_back(data);
-  }
-
-  return results;
-}
-
-}  // end namespace benchmark
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/src/statistics.h b/external_imported/json/benchmarks/thirdparty/benchmark/src/statistics.h
deleted file mode 100755
index 7eccc8553..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/src/statistics.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2016 Ismael Jimenez Martinez. All rights reserved.
-// Copyright 2017 Roman Lebedev. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef STATISTICS_H_
-#define STATISTICS_H_
-
-#include <vector>
-
-#include "benchmark/benchmark.h"
-
-namespace benchmark {
-
-// Return a vector containing the mean, median and standard devation information
-// (and any user-specified info) for the specified list of reports. If 'reports'
-// contains less than two non-errored runs an empty vector is returned
-std::vector<BenchmarkReporter::Run> ComputeStats(
-    const std::vector<BenchmarkReporter::Run>& reports);
-
-double StatisticsMean(const std::vector<double>& v);
-double StatisticsMedian(const std::vector<double>& v);
-double StatisticsStdDev(const std::vector<double>& v);
-
-}  // end namespace benchmark
-
-#endif  // STATISTICS_H_
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/src/string_util.cc b/external_imported/json/benchmarks/thirdparty/benchmark/src/string_util.cc
deleted file mode 100755
index ebc3acebd..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/src/string_util.cc
+++ /dev/null
@@ -1,172 +0,0 @@
-#include "string_util.h"
-
-#include <array>
-#include <cmath>
-#include <cstdarg>
-#include <cstdio>
-#include <memory>
-#include <sstream>
-
-#include "arraysize.h"
-
-namespace benchmark {
-namespace {
-
-// kilo, Mega, Giga, Tera, Peta, Exa, Zetta, Yotta.
-const char kBigSIUnits[] = "kMGTPEZY";
-// Kibi, Mebi, Gibi, Tebi, Pebi, Exbi, Zebi, Yobi.
-const char kBigIECUnits[] = "KMGTPEZY";
-// milli, micro, nano, pico, femto, atto, zepto, yocto.
-const char kSmallSIUnits[] = "munpfazy";
-
-// We require that all three arrays have the same size.
-static_assert(arraysize(kBigSIUnits) == arraysize(kBigIECUnits),
-              "SI and IEC unit arrays must be the same size");
-static_assert(arraysize(kSmallSIUnits) == arraysize(kBigSIUnits),
-              "Small SI and Big SI unit arrays must be the same size");
-
-static const int64_t kUnitsSize = arraysize(kBigSIUnits);
-
-void ToExponentAndMantissa(double val, double thresh, int precision,
-                           double one_k, std::string* mantissa,
-                           int64_t* exponent) {
-  std::stringstream mantissa_stream;
-
-  if (val < 0) {
-    mantissa_stream << "-";
-    val = -val;
-  }
-
-  // Adjust threshold so that it never excludes things which can't be rendered
-  // in 'precision' digits.
-  const double adjusted_threshold =
-      std::max(thresh, 1.0 / std::pow(10.0, precision));
-  const double big_threshold = adjusted_threshold * one_k;
-  const double small_threshold = adjusted_threshold;
-  // Values in ]simple_threshold,small_threshold[ will be printed as-is
-  const double simple_threshold = 0.01;
-
-  if (val > big_threshold) {
-    // Positive powers
-    double scaled = val;
-    for (size_t i = 0; i < arraysize(kBigSIUnits); ++i) {
-      scaled /= one_k;
-      if (scaled <= big_threshold) {
-        mantissa_stream << scaled;
-        *exponent = i + 1;
-        *mantissa = mantissa_stream.str();
-        return;
-      }
-    }
-    mantissa_stream << val;
-    *exponent = 0;
-  } else if (val < small_threshold) {
-    // Negative powers
-    if (val < simple_threshold) {
-      double scaled = val;
-      for (size_t i = 0; i < arraysize(kSmallSIUnits); ++i) {
-        scaled *= one_k;
-        if (scaled >= small_threshold) {
-          mantissa_stream << scaled;
-          *exponent = -static_cast<int64_t>(i + 1);
-          *mantissa = mantissa_stream.str();
-          return;
-        }
-      }
-    }
-    mantissa_stream << val;
-    *exponent = 0;
-  } else {
-    mantissa_stream << val;
-    *exponent = 0;
-  }
-  *mantissa = mantissa_stream.str();
-}
-
-std::string ExponentToPrefix(int64_t exponent, bool iec) {
-  if (exponent == 0) return "";
-
-  const int64_t index = (exponent > 0 ? exponent - 1 : -exponent - 1);
-  if (index >= kUnitsSize) return "";
-
-  const char* array =
-      (exponent > 0 ? (iec ? kBigIECUnits : kBigSIUnits) : kSmallSIUnits);
-  if (iec)
-    return array[index] + std::string("i");
-  else
-    return std::string(1, array[index]);
-}
-
-std::string ToBinaryStringFullySpecified(double value, double threshold,
-                                         int precision, double one_k = 1024.0) {
-  std::string mantissa;
-  int64_t exponent;
-  ToExponentAndMantissa(value, threshold, precision, one_k, &mantissa,
-                        &exponent);
-  return mantissa + ExponentToPrefix(exponent, false);
-}
-
-}  // end namespace
-
-void AppendHumanReadable(int n, std::string* str) {
-  std::stringstream ss;
-  // Round down to the nearest SI prefix.
-  ss << ToBinaryStringFullySpecified(n, 1.0, 0);
-  *str += ss.str();
-}
-
-std::string HumanReadableNumber(double n, double one_k) {
-  // 1.1 means that figures up to 1.1k should be shown with the next unit down;
-  // this softens edge effects.
-  // 1 means that we should show one decimal place of precision.
-  return ToBinaryStringFullySpecified(n, 1.1, 1, one_k);
-}
-
-std::string StrFormatImp(const char* msg, va_list args) {
-  // we might need a second shot at this, so pre-emptivly make a copy
-  va_list args_cp;
-  va_copy(args_cp, args);
-
-  // TODO(ericwf): use std::array for first attempt to avoid one memory
-  // allocation guess what the size might be
-  std::array<char, 256> local_buff;
-  std::size_t size = local_buff.size();
-  // 2015-10-08: vsnprintf is used instead of snd::vsnprintf due to a limitation
-  // in the android-ndk
-  auto ret = vsnprintf(local_buff.data(), size, msg, args_cp);
-
-  va_end(args_cp);
-
-  // handle empty expansion
-  if (ret == 0) return std::string{};
-  if (static_cast<std::size_t>(ret) < size)
-    return std::string(local_buff.data());
-
-  // we did not provide a long enough buffer on our first attempt.
-  // add 1 to size to account for null-byte in size cast to prevent overflow
-  size = static_cast<std::size_t>(ret) + 1;
-  auto buff_ptr = std::unique_ptr<char[]>(new char[size]);
-  // 2015-10-08: vsnprintf is used instead of snd::vsnprintf due to a limitation
-  // in the android-ndk
-  ret = vsnprintf(buff_ptr.get(), size, msg, args);
-  return std::string(buff_ptr.get());
-}
-
-std::string StrFormat(const char* format, ...) {
-  va_list args;
-  va_start(args, format);
-  std::string tmp = StrFormatImp(format, args);
-  va_end(args);
-  return tmp;
-}
-
-void ReplaceAll(std::string* str, const std::string& from,
-                const std::string& to) {
-  std::size_t start = 0;
-  while ((start = str->find(from, start)) != std::string::npos) {
-    str->replace(start, from.length(), to);
-    start += to.length();
-  }
-}
-
-}  // end namespace benchmark
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/src/string_util.h b/external_imported/json/benchmarks/thirdparty/benchmark/src/string_util.h
deleted file mode 100755
index e70e76987..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/src/string_util.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef BENCHMARK_STRING_UTIL_H_
-#define BENCHMARK_STRING_UTIL_H_
-
-#include <sstream>
-#include <string>
-#include <utility>
-#include "internal_macros.h"
-
-namespace benchmark {
-
-void AppendHumanReadable(int n, std::string* str);
-
-std::string HumanReadableNumber(double n, double one_k = 1024.0);
-
-std::string StrFormat(const char* format, ...);
-
-inline std::ostream& StrCatImp(std::ostream& out) BENCHMARK_NOEXCEPT {
-  return out;
-}
-
-template <class First, class... Rest>
-inline std::ostream& StrCatImp(std::ostream& out, First&& f,
-                                  Rest&&... rest) {
-  out << std::forward<First>(f);
-  return StrCatImp(out, std::forward<Rest>(rest)...);
-}
-
-template <class... Args>
-inline std::string StrCat(Args&&... args) {
-  std::ostringstream ss;
-  StrCatImp(ss, std::forward<Args>(args)...);
-  return ss.str();
-}
-
-void ReplaceAll(std::string* str, const std::string& from,
-                const std::string& to);
-
-}  // end namespace benchmark
-
-#endif  // BENCHMARK_STRING_UTIL_H_
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/src/sysinfo.cc b/external_imported/json/benchmarks/thirdparty/benchmark/src/sysinfo.cc
deleted file mode 100755
index d19d0ef4c..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/src/sysinfo.cc
+++ /dev/null
@@ -1,587 +0,0 @@
-// Copyright 2015 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "internal_macros.h"
-
-#ifdef BENCHMARK_OS_WINDOWS
-#include <Shlwapi.h>
-#undef StrCat  // Don't let StrCat in string_util.h be renamed to lstrcatA
-#include <VersionHelpers.h>
-#include <Windows.h>
-#else
-#include <fcntl.h>
-#ifndef BENCHMARK_OS_FUCHSIA
-#include <sys/resource.h>
-#endif
-#include <sys/time.h>
-#include <sys/types.h>  // this header must be included before 'sys/sysctl.h' to avoid compilation error on FreeBSD
-#include <unistd.h>
-#if defined BENCHMARK_OS_FREEBSD || defined BENCHMARK_OS_MACOSX || \
-    defined BENCHMARK_OS_NETBSD || defined BENCHMARK_OS_OPENBSD
-#define BENCHMARK_HAS_SYSCTL
-#include <sys/sysctl.h>
-#endif
-#endif
-#if defined(BENCHMARK_OS_SOLARIS)
-#include <kstat.h>
-#endif
-
-#include <algorithm>
-#include <array>
-#include <bitset>
-#include <cerrno>
-#include <climits>
-#include <cstdint>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <fstream>
-#include <iostream>
-#include <iterator>
-#include <limits>
-#include <memory>
-#include <sstream>
-
-#include "check.h"
-#include "cycleclock.h"
-#include "internal_macros.h"
-#include "log.h"
-#include "sleep.h"
-#include "string_util.h"
-
-namespace benchmark {
-namespace {
-
-void PrintImp(std::ostream& out) { out << std::endl; }
-
-template <class First, class... Rest>
-void PrintImp(std::ostream& out, First&& f, Rest&&... rest) {
-  out << std::forward<First>(f);
-  PrintImp(out, std::forward<Rest>(rest)...);
-}
-
-template <class... Args>
-BENCHMARK_NORETURN void PrintErrorAndDie(Args&&... args) {
-  PrintImp(std::cerr, std::forward<Args>(args)...);
-  std::exit(EXIT_FAILURE);
-}
-
-#ifdef BENCHMARK_HAS_SYSCTL
-
-/// ValueUnion - A type used to correctly alias the byte-for-byte output of
-/// `sysctl` with the result type it's to be interpreted as.
-struct ValueUnion {
-  union DataT {
-    uint32_t uint32_value;
-    uint64_t uint64_value;
-    // For correct aliasing of union members from bytes.
-    char bytes[8];
-  };
-  using DataPtr = std::unique_ptr<DataT, decltype(&std::free)>;
-
-  // The size of the data union member + its trailing array size.
-  size_t Size;
-  DataPtr Buff;
-
- public:
-  ValueUnion() : Size(0), Buff(nullptr, &std::free) {}
-
-  explicit ValueUnion(size_t BuffSize)
-      : Size(sizeof(DataT) + BuffSize),
-        Buff(::new (std::malloc(Size)) DataT(), &std::free) {}
-
-  ValueUnion(ValueUnion&& other) = default;
-
-  explicit operator bool() const { return bool(Buff); }
-
-  char* data() const { return Buff->bytes; }
-
-  std::string GetAsString() const { return std::string(data()); }
-
-  int64_t GetAsInteger() const {
-    if (Size == sizeof(Buff->uint32_value))
-      return static_cast<int32_t>(Buff->uint32_value);
-    else if (Size == sizeof(Buff->uint64_value))
-      return static_cast<int64_t>(Buff->uint64_value);
-    BENCHMARK_UNREACHABLE();
-  }
-
-  uint64_t GetAsUnsigned() const {
-    if (Size == sizeof(Buff->uint32_value))
-      return Buff->uint32_value;
-    else if (Size == sizeof(Buff->uint64_value))
-      return Buff->uint64_value;
-    BENCHMARK_UNREACHABLE();
-  }
-
-  template <class T, int N>
-  std::array<T, N> GetAsArray() {
-    const int ArrSize = sizeof(T) * N;
-    CHECK_LE(ArrSize, Size);
-    std::array<T, N> Arr;
-    std::memcpy(Arr.data(), data(), ArrSize);
-    return Arr;
-  }
-};
-
-ValueUnion GetSysctlImp(std::string const& Name) {
-#if defined BENCHMARK_OS_OPENBSD
-  int mib[2];
-
-  mib[0] = CTL_HW;
-  if ((Name == "hw.ncpu") || (Name == "hw.cpuspeed")){
-    ValueUnion buff(sizeof(int));
-
-    if (Name == "hw.ncpu") {
-      mib[1] = HW_NCPU;
-    } else {
-      mib[1] = HW_CPUSPEED;
-    }
-
-    if (sysctl(mib, 2, buff.data(), &buff.Size, nullptr, 0) == -1) {
-      return ValueUnion();
-    }
-    return buff;
-  }
-  return ValueUnion();
-#else
-  size_t CurBuffSize = 0;
-  if (sysctlbyname(Name.c_str(), nullptr, &CurBuffSize, nullptr, 0) == -1)
-    return ValueUnion();
-
-  ValueUnion buff(CurBuffSize);
-  if (sysctlbyname(Name.c_str(), buff.data(), &buff.Size, nullptr, 0) == 0)
-    return buff;
-  return ValueUnion();
-#endif
-}
-
-BENCHMARK_MAYBE_UNUSED
-bool GetSysctl(std::string const& Name, std::string* Out) {
-  Out->clear();
-  auto Buff = GetSysctlImp(Name);
-  if (!Buff) return false;
-  Out->assign(Buff.data());
-  return true;
-}
-
-template <class Tp,
-          class = typename std::enable_if<std::is_integral<Tp>::value>::type>
-bool GetSysctl(std::string const& Name, Tp* Out) {
-  *Out = 0;
-  auto Buff = GetSysctlImp(Name);
-  if (!Buff) return false;
-  *Out = static_cast<Tp>(Buff.GetAsUnsigned());
-  return true;
-}
-
-template <class Tp, size_t N>
-bool GetSysctl(std::string const& Name, std::array<Tp, N>* Out) {
-  auto Buff = GetSysctlImp(Name);
-  if (!Buff) return false;
-  *Out = Buff.GetAsArray<Tp, N>();
-  return true;
-}
-#endif
-
-template <class ArgT>
-bool ReadFromFile(std::string const& fname, ArgT* arg) {
-  *arg = ArgT();
-  std::ifstream f(fname.c_str());
-  if (!f.is_open()) return false;
-  f >> *arg;
-  return f.good();
-}
-
-bool CpuScalingEnabled(int num_cpus) {
-  // We don't have a valid CPU count, so don't even bother.
-  if (num_cpus <= 0) return false;
-#ifndef BENCHMARK_OS_WINDOWS
-  // On Linux, the CPUfreq subsystem exposes CPU information as files on the
-  // local file system. If reading the exported files fails, then we may not be
-  // running on Linux, so we silently ignore all the read errors.
-  std::string res;
-  for (int cpu = 0; cpu < num_cpus; ++cpu) {
-    std::string governor_file =
-        StrCat("/sys/devices/system/cpu/cpu", cpu, "/cpufreq/scaling_governor");
-    if (ReadFromFile(governor_file, &res) && res != "performance") return true;
-  }
-#endif
-  return false;
-}
-
-int CountSetBitsInCPUMap(std::string Val) {
-  auto CountBits = [](std::string Part) {
-    using CPUMask = std::bitset<sizeof(std::uintptr_t) * CHAR_BIT>;
-    Part = "0x" + Part;
-    CPUMask Mask(std::stoul(Part, nullptr, 16));
-    return static_cast<int>(Mask.count());
-  };
-  size_t Pos;
-  int total = 0;
-  while ((Pos = Val.find(',')) != std::string::npos) {
-    total += CountBits(Val.substr(0, Pos));
-    Val = Val.substr(Pos + 1);
-  }
-  if (!Val.empty()) {
-    total += CountBits(Val);
-  }
-  return total;
-}
-
-BENCHMARK_MAYBE_UNUSED
-std::vector<CPUInfo::CacheInfo> GetCacheSizesFromKVFS() {
-  std::vector<CPUInfo::CacheInfo> res;
-  std::string dir = "/sys/devices/system/cpu/cpu0/cache/";
-  int Idx = 0;
-  while (true) {
-    CPUInfo::CacheInfo info;
-    std::string FPath = StrCat(dir, "index", Idx++, "/");
-    std::ifstream f(StrCat(FPath, "size").c_str());
-    if (!f.is_open()) break;
-    std::string suffix;
-    f >> info.size;
-    if (f.fail())
-      PrintErrorAndDie("Failed while reading file '", FPath, "size'");
-    if (f.good()) {
-      f >> suffix;
-      if (f.bad())
-        PrintErrorAndDie(
-            "Invalid cache size format: failed to read size suffix");
-      else if (f && suffix != "K")
-        PrintErrorAndDie("Invalid cache size format: Expected bytes ", suffix);
-      else if (suffix == "K")
-        info.size *= 1000;
-    }
-    if (!ReadFromFile(StrCat(FPath, "type"), &info.type))
-      PrintErrorAndDie("Failed to read from file ", FPath, "type");
-    if (!ReadFromFile(StrCat(FPath, "level"), &info.level))
-      PrintErrorAndDie("Failed to read from file ", FPath, "level");
-    std::string map_str;
-    if (!ReadFromFile(StrCat(FPath, "shared_cpu_map"), &map_str))
-      PrintErrorAndDie("Failed to read from file ", FPath, "shared_cpu_map");
-    info.num_sharing = CountSetBitsInCPUMap(map_str);
-    res.push_back(info);
-  }
-
-  return res;
-}
-
-#ifdef BENCHMARK_OS_MACOSX
-std::vector<CPUInfo::CacheInfo> GetCacheSizesMacOSX() {
-  std::vector<CPUInfo::CacheInfo> res;
-  std::array<uint64_t, 4> CacheCounts{{0, 0, 0, 0}};
-  GetSysctl("hw.cacheconfig", &CacheCounts);
-
-  struct {
-    std::string name;
-    std::string type;
-    int level;
-    size_t num_sharing;
-  } Cases[] = {{"hw.l1dcachesize", "Data", 1, CacheCounts[1]},
-               {"hw.l1icachesize", "Instruction", 1, CacheCounts[1]},
-               {"hw.l2cachesize", "Unified", 2, CacheCounts[2]},
-               {"hw.l3cachesize", "Unified", 3, CacheCounts[3]}};
-  for (auto& C : Cases) {
-    int val;
-    if (!GetSysctl(C.name, &val)) continue;
-    CPUInfo::CacheInfo info;
-    info.type = C.type;
-    info.level = C.level;
-    info.size = val;
-    info.num_sharing = static_cast<int>(C.num_sharing);
-    res.push_back(std::move(info));
-  }
-  return res;
-}
-#elif defined(BENCHMARK_OS_WINDOWS)
-std::vector<CPUInfo::CacheInfo> GetCacheSizesWindows() {
-  std::vector<CPUInfo::CacheInfo> res;
-  DWORD buffer_size = 0;
-  using PInfo = SYSTEM_LOGICAL_PROCESSOR_INFORMATION;
-  using CInfo = CACHE_DESCRIPTOR;
-
-  using UPtr = std::unique_ptr<PInfo, decltype(&std::free)>;
-  GetLogicalProcessorInformation(nullptr, &buffer_size);
-  UPtr buff((PInfo*)malloc(buffer_size), &std::free);
-  if (!GetLogicalProcessorInformation(buff.get(), &buffer_size))
-    PrintErrorAndDie("Failed during call to GetLogicalProcessorInformation: ",
-                     GetLastError());
-
-  PInfo* it = buff.get();
-  PInfo* end = buff.get() + (buffer_size / sizeof(PInfo));
-
-  for (; it != end; ++it) {
-    if (it->Relationship != RelationCache) continue;
-    using BitSet = std::bitset<sizeof(ULONG_PTR) * CHAR_BIT>;
-    BitSet B(it->ProcessorMask);
-    // To prevent duplicates, only consider caches where CPU 0 is specified
-    if (!B.test(0)) continue;
-    CInfo* Cache = &it->Cache;
-    CPUInfo::CacheInfo C;
-    C.num_sharing = static_cast<int>(B.count());
-    C.level = Cache->Level;
-    C.size = Cache->Size;
-    switch (Cache->Type) {
-      case CacheUnified:
-        C.type = "Unified";
-        break;
-      case CacheInstruction:
-        C.type = "Instruction";
-        break;
-      case CacheData:
-        C.type = "Data";
-        break;
-      case CacheTrace:
-        C.type = "Trace";
-        break;
-      default:
-        C.type = "Unknown";
-        break;
-    }
-    res.push_back(C);
-  }
-  return res;
-}
-#endif
-
-std::vector<CPUInfo::CacheInfo> GetCacheSizes() {
-#ifdef BENCHMARK_OS_MACOSX
-  return GetCacheSizesMacOSX();
-#elif defined(BENCHMARK_OS_WINDOWS)
-  return GetCacheSizesWindows();
-#else
-  return GetCacheSizesFromKVFS();
-#endif
-}
-
-int GetNumCPUs() {
-#ifdef BENCHMARK_HAS_SYSCTL
-  int NumCPU = -1;
-  if (GetSysctl("hw.ncpu", &NumCPU)) return NumCPU;
-  fprintf(stderr, "Err: %s\n", strerror(errno));
-  std::exit(EXIT_FAILURE);
-#elif defined(BENCHMARK_OS_WINDOWS)
-  SYSTEM_INFO sysinfo;
-  // Use memset as opposed to = {} to avoid GCC missing initializer false
-  // positives.
-  std::memset(&sysinfo, 0, sizeof(SYSTEM_INFO));
-  GetSystemInfo(&sysinfo);
-  return sysinfo.dwNumberOfProcessors;  // number of logical
-                                        // processors in the current
-                                        // group
-#elif defined(BENCHMARK_OS_SOLARIS)
-  // Returns -1 in case of a failure.
-  int NumCPU = sysconf(_SC_NPROCESSORS_ONLN);
-  if (NumCPU < 0) {
-    fprintf(stderr,
-            "sysconf(_SC_NPROCESSORS_ONLN) failed with error: %s\n",
-            strerror(errno));
-  }
-  return NumCPU;
-#else
-  int NumCPUs = 0;
-  int MaxID = -1;
-  std::ifstream f("/proc/cpuinfo");
-  if (!f.is_open()) {
-    std::cerr << "failed to open /proc/cpuinfo\n";
-    return -1;
-  }
-  const std::string Key = "processor";
-  std::string ln;
-  while (std::getline(f, ln)) {
-    if (ln.empty()) continue;
-    size_t SplitIdx = ln.find(':');
-    std::string value;
-    if (SplitIdx != std::string::npos) value = ln.substr(SplitIdx + 1);
-    if (ln.size() >= Key.size() && ln.compare(0, Key.size(), Key) == 0) {
-      NumCPUs++;
-      if (!value.empty()) {
-        int CurID = std::stoi(value);
-        MaxID = std::max(CurID, MaxID);
-      }
-    }
-  }
-  if (f.bad()) {
-    std::cerr << "Failure reading /proc/cpuinfo\n";
-    return -1;
-  }
-  if (!f.eof()) {
-    std::cerr << "Failed to read to end of /proc/cpuinfo\n";
-    return -1;
-  }
-  f.close();
-
-  if ((MaxID + 1) != NumCPUs) {
-    fprintf(stderr,
-            "CPU ID assignments in /proc/cpuinfo seem messed up."
-            " This is usually caused by a bad BIOS.\n");
-  }
-  return NumCPUs;
-#endif
-  BENCHMARK_UNREACHABLE();
-}
-
-double GetCPUCyclesPerSecond() {
-#if defined BENCHMARK_OS_LINUX || defined BENCHMARK_OS_CYGWIN
-  long freq;
-
-  // If the kernel is exporting the tsc frequency use that. There are issues
-  // where cpuinfo_max_freq cannot be relied on because the BIOS may be
-  // exporintg an invalid p-state (on x86) or p-states may be used to put the
-  // processor in a new mode (turbo mode). Essentially, those frequencies
-  // cannot always be relied upon. The same reasons apply to /proc/cpuinfo as
-  // well.
-  if (ReadFromFile("/sys/devices/system/cpu/cpu0/tsc_freq_khz", &freq)
-      // If CPU scaling is in effect, we want to use the *maximum* frequency,
-      // not whatever CPU speed some random processor happens to be using now.
-      || ReadFromFile("/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq",
-                      &freq)) {
-    // The value is in kHz (as the file name suggests).  For example, on a
-    // 2GHz warpstation, the file contains the value "2000000".
-    return freq * 1000.0;
-  }
-
-  const double error_value = -1;
-  double bogo_clock = error_value;
-
-  std::ifstream f("/proc/cpuinfo");
-  if (!f.is_open()) {
-    std::cerr << "failed to open /proc/cpuinfo\n";
-    return error_value;
-  }
-
-  auto startsWithKey = [](std::string const& Value, std::string const& Key) {
-    if (Key.size() > Value.size()) return false;
-    auto Cmp = [&](char X, char Y) {
-      return std::tolower(X) == std::tolower(Y);
-    };
-    return std::equal(Key.begin(), Key.end(), Value.begin(), Cmp);
-  };
-
-  std::string ln;
-  while (std::getline(f, ln)) {
-    if (ln.empty()) continue;
-    size_t SplitIdx = ln.find(':');
-    std::string value;
-    if (SplitIdx != std::string::npos) value = ln.substr(SplitIdx + 1);
-    // When parsing the "cpu MHz" and "bogomips" (fallback) entries, we only
-    // accept positive values. Some environments (virtual machines) report zero,
-    // which would cause infinite looping in WallTime_Init.
-    if (startsWithKey(ln, "cpu MHz")) {
-      if (!value.empty()) {
-        double cycles_per_second = std::stod(value) * 1000000.0;
-        if (cycles_per_second > 0) return cycles_per_second;
-      }
-    } else if (startsWithKey(ln, "bogomips")) {
-      if (!value.empty()) {
-        bogo_clock = std::stod(value) * 1000000.0;
-        if (bogo_clock < 0.0) bogo_clock = error_value;
-      }
-    }
-  }
-  if (f.bad()) {
-    std::cerr << "Failure reading /proc/cpuinfo\n";
-    return error_value;
-  }
-  if (!f.eof()) {
-    std::cerr << "Failed to read to end of /proc/cpuinfo\n";
-    return error_value;
-  }
-  f.close();
-  // If we found the bogomips clock, but nothing better, we'll use it (but
-  // we're not happy about it); otherwise, fallback to the rough estimation
-  // below.
-  if (bogo_clock >= 0.0) return bogo_clock;
-
-#elif defined BENCHMARK_HAS_SYSCTL
-  constexpr auto* FreqStr =
-#if defined(BENCHMARK_OS_FREEBSD) || defined(BENCHMARK_OS_NETBSD)
-      "machdep.tsc_freq";
-#elif defined BENCHMARK_OS_OPENBSD
-      "hw.cpuspeed";
-#else
-      "hw.cpufrequency";
-#endif
-  unsigned long long hz = 0;
-#if defined BENCHMARK_OS_OPENBSD
-  if (GetSysctl(FreqStr, &hz)) return hz * 1000000;
-#else
-  if (GetSysctl(FreqStr, &hz)) return hz;
-#endif
-  fprintf(stderr, "Unable to determine clock rate from sysctl: %s: %s\n",
-          FreqStr, strerror(errno));
-
-#elif defined BENCHMARK_OS_WINDOWS
-  // In NT, read MHz from the registry. If we fail to do so or we're in win9x
-  // then make a crude estimate.
-  DWORD data, data_size = sizeof(data);
-  if (IsWindowsXPOrGreater() &&
-      SUCCEEDED(
-          SHGetValueA(HKEY_LOCAL_MACHINE,
-                      "HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0",
-                      "~MHz", nullptr, &data, &data_size)))
-    return static_cast<double>((int64_t)data *
-                               (int64_t)(1000 * 1000));  // was mhz
-#elif defined (BENCHMARK_OS_SOLARIS)
-  kstat_ctl_t *kc = kstat_open();
-  if (!kc) {
-    std::cerr << "failed to open /dev/kstat\n";
-    return -1;
-  }
-  kstat_t *ksp = kstat_lookup(kc, (char*)"cpu_info", -1, (char*)"cpu_info0");
-  if (!ksp) {
-    std::cerr << "failed to lookup in /dev/kstat\n";
-    return -1;
-  }
-  if (kstat_read(kc, ksp, NULL) < 0) {
-    std::cerr << "failed to read from /dev/kstat\n";
-    return -1;
-  }
-  kstat_named_t *knp =
-      (kstat_named_t*)kstat_data_lookup(ksp, (char*)"current_clock_Hz");
-  if (!knp) {
-    std::cerr << "failed to lookup data in /dev/kstat\n";
-    return -1;
-  }
-  if (knp->data_type != KSTAT_DATA_UINT64) {
-    std::cerr << "current_clock_Hz is of unexpected data type: "
-              << knp->data_type << "\n";
-    return -1;
-  }
-  double clock_hz = knp->value.ui64;
-  kstat_close(kc);
-  return clock_hz;
-#endif
-  // If we've fallen through, attempt to roughly estimate the CPU clock rate.
-  const int estimate_time_ms = 1000;
-  const auto start_ticks = cycleclock::Now();
-  SleepForMilliseconds(estimate_time_ms);
-  return static_cast<double>(cycleclock::Now() - start_ticks);
-}
-
-}  // end namespace
-
-const CPUInfo& CPUInfo::Get() {
-  static const CPUInfo* info = new CPUInfo();
-  return *info;
-}
-
-CPUInfo::CPUInfo()
-    : num_cpus(GetNumCPUs()),
-      cycles_per_second(GetCPUCyclesPerSecond()),
-      caches(GetCacheSizes()),
-      scaling_enabled(CpuScalingEnabled(num_cpus)) {}
-
-}  // end namespace benchmark
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/src/thread_manager.h b/external_imported/json/benchmarks/thirdparty/benchmark/src/thread_manager.h
deleted file mode 100755
index 82b4d72b6..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/src/thread_manager.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef BENCHMARK_THREAD_MANAGER_H
-#define BENCHMARK_THREAD_MANAGER_H
-
-#include <atomic>
-
-#include "benchmark/benchmark.h"
-#include "mutex.h"
-
-namespace benchmark {
-namespace internal {
-
-class ThreadManager {
- public:
-  ThreadManager(int num_threads)
-      : alive_threads_(num_threads), start_stop_barrier_(num_threads) {}
-
-  Mutex& GetBenchmarkMutex() const RETURN_CAPABILITY(benchmark_mutex_) {
-    return benchmark_mutex_;
-  }
-
-  bool StartStopBarrier() EXCLUDES(end_cond_mutex_) {
-    return start_stop_barrier_.wait();
-  }
-
-  void NotifyThreadComplete() EXCLUDES(end_cond_mutex_) {
-    start_stop_barrier_.removeThread();
-    if (--alive_threads_ == 0) {
-      MutexLock lock(end_cond_mutex_);
-      end_condition_.notify_all();
-    }
-  }
-
-  void WaitForAllThreads() EXCLUDES(end_cond_mutex_) {
-    MutexLock lock(end_cond_mutex_);
-    end_condition_.wait(lock.native_handle(),
-                        [this]() { return alive_threads_ == 0; });
-  }
-
- public:
-  struct Result {
-    int64_t iterations = 0;
-    double real_time_used = 0;
-    double cpu_time_used = 0;
-    double manual_time_used = 0;
-    int64_t bytes_processed = 0;
-    int64_t items_processed = 0;
-    int64_t complexity_n = 0;
-    std::string report_label_;
-    std::string error_message_;
-    bool has_error_ = false;
-    UserCounters counters;
-  };
-  GUARDED_BY(GetBenchmarkMutex()) Result results;
-
- private:
-  mutable Mutex benchmark_mutex_;
-  std::atomic<int> alive_threads_;
-  Barrier start_stop_barrier_;
-  Mutex end_cond_mutex_;
-  Condition end_condition_;
-};
-
-}  // namespace internal
-}  // namespace benchmark
-
-#endif  // BENCHMARK_THREAD_MANAGER_H
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/src/thread_timer.h b/external_imported/json/benchmarks/thirdparty/benchmark/src/thread_timer.h
deleted file mode 100755
index eaf108e01..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/src/thread_timer.h
+++ /dev/null
@@ -1,69 +0,0 @@
-#ifndef BENCHMARK_THREAD_TIMER_H
-#define BENCHMARK_THREAD_TIMER_H
-
-#include "check.h"
-#include "timers.h"
-
-namespace benchmark {
-namespace internal {
-
-class ThreadTimer {
- public:
-  ThreadTimer() = default;
-
-  // Called by each thread
-  void StartTimer() {
-    running_ = true;
-    start_real_time_ = ChronoClockNow();
-    start_cpu_time_ = ThreadCPUUsage();
-  }
-
-  // Called by each thread
-  void StopTimer() {
-    CHECK(running_);
-    running_ = false;
-    real_time_used_ += ChronoClockNow() - start_real_time_;
-    // Floating point error can result in the subtraction producing a negative
-    // time. Guard against that.
-    cpu_time_used_ += std::max<double>(ThreadCPUUsage() - start_cpu_time_, 0);
-  }
-
-  // Called by each thread
-  void SetIterationTime(double seconds) { manual_time_used_ += seconds; }
-
-  bool running() const { return running_; }
-
-  // REQUIRES: timer is not running
-  double real_time_used() {
-    CHECK(!running_);
-    return real_time_used_;
-  }
-
-  // REQUIRES: timer is not running
-  double cpu_time_used() {
-    CHECK(!running_);
-    return cpu_time_used_;
-  }
-
-  // REQUIRES: timer is not running
-  double manual_time_used() {
-    CHECK(!running_);
-    return manual_time_used_;
-  }
-
- private:
-  bool running_ = false;        // Is the timer running
-  double start_real_time_ = 0;  // If running_
-  double start_cpu_time_ = 0;   // If running_
-
-  // Accumulated time so far (does not contain current slice if running_)
-  double real_time_used_ = 0;
-  double cpu_time_used_ = 0;
-  // Manually set iteration time. User sets this with SetIterationTime(seconds).
-  double manual_time_used_ = 0;
-};
-
-}  // namespace internal
-}  // namespace benchmark
-
-#endif  // BENCHMARK_THREAD_TIMER_H
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/src/timers.cc b/external_imported/json/benchmarks/thirdparty/benchmark/src/timers.cc
deleted file mode 100755
index 2010e2450..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/src/timers.cc
+++ /dev/null
@@ -1,217 +0,0 @@
-// Copyright 2015 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "timers.h"
-#include "internal_macros.h"
-
-#ifdef BENCHMARK_OS_WINDOWS
-#include <Shlwapi.h>
-#undef StrCat  // Don't let StrCat in string_util.h be renamed to lstrcatA
-#include <VersionHelpers.h>
-#include <Windows.h>
-#else
-#include <fcntl.h>
-#ifndef BENCHMARK_OS_FUCHSIA
-#include <sys/resource.h>
-#endif
-#include <sys/time.h>
-#include <sys/types.h>  // this header must be included before 'sys/sysctl.h' to avoid compilation error on FreeBSD
-#include <unistd.h>
-#if defined BENCHMARK_OS_FREEBSD || defined BENCHMARK_OS_MACOSX
-#include <sys/sysctl.h>
-#endif
-#if defined(BENCHMARK_OS_MACOSX)
-#include <mach/mach_init.h>
-#include <mach/mach_port.h>
-#include <mach/thread_act.h>
-#endif
-#endif
-
-#ifdef BENCHMARK_OS_EMSCRIPTEN
-#include <emscripten.h>
-#endif
-
-#include <cerrno>
-#include <cstdint>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <ctime>
-#include <iostream>
-#include <limits>
-#include <mutex>
-
-#include "check.h"
-#include "log.h"
-#include "sleep.h"
-#include "string_util.h"
-
-namespace benchmark {
-
-// Suppress unused warnings on helper functions.
-#if defined(__GNUC__)
-#pragma GCC diagnostic ignored "-Wunused-function"
-#endif
-
-namespace {
-#if defined(BENCHMARK_OS_WINDOWS)
-double MakeTime(FILETIME const& kernel_time, FILETIME const& user_time) {
-  ULARGE_INTEGER kernel;
-  ULARGE_INTEGER user;
-  kernel.HighPart = kernel_time.dwHighDateTime;
-  kernel.LowPart = kernel_time.dwLowDateTime;
-  user.HighPart = user_time.dwHighDateTime;
-  user.LowPart = user_time.dwLowDateTime;
-  return (static_cast<double>(kernel.QuadPart) +
-          static_cast<double>(user.QuadPart)) *
-         1e-7;
-}
-#elif !defined(BENCHMARK_OS_FUCHSIA)
-double MakeTime(struct rusage const& ru) {
-  return (static_cast<double>(ru.ru_utime.tv_sec) +
-          static_cast<double>(ru.ru_utime.tv_usec) * 1e-6 +
-          static_cast<double>(ru.ru_stime.tv_sec) +
-          static_cast<double>(ru.ru_stime.tv_usec) * 1e-6);
-}
-#endif
-#if defined(BENCHMARK_OS_MACOSX)
-double MakeTime(thread_basic_info_data_t const& info) {
-  return (static_cast<double>(info.user_time.seconds) +
-          static_cast<double>(info.user_time.microseconds) * 1e-6 +
-          static_cast<double>(info.system_time.seconds) +
-          static_cast<double>(info.system_time.microseconds) * 1e-6);
-}
-#endif
-#if defined(CLOCK_PROCESS_CPUTIME_ID) || defined(CLOCK_THREAD_CPUTIME_ID)
-double MakeTime(struct timespec const& ts) {
-  return ts.tv_sec + (static_cast<double>(ts.tv_nsec) * 1e-9);
-}
-#endif
-
-BENCHMARK_NORETURN static void DiagnoseAndExit(const char* msg) {
-  std::cerr << "ERROR: " << msg << std::endl;
-  std::exit(EXIT_FAILURE);
-}
-
-}  // end namespace
-
-double ProcessCPUUsage() {
-#if defined(BENCHMARK_OS_WINDOWS)
-  HANDLE proc = GetCurrentProcess();
-  FILETIME creation_time;
-  FILETIME exit_time;
-  FILETIME kernel_time;
-  FILETIME user_time;
-  if (GetProcessTimes(proc, &creation_time, &exit_time, &kernel_time,
-                      &user_time))
-    return MakeTime(kernel_time, user_time);
-  DiagnoseAndExit("GetProccessTimes() failed");
-#elif defined(BENCHMARK_OS_EMSCRIPTEN)
-  // clock_gettime(CLOCK_PROCESS_CPUTIME_ID, ...) returns 0 on Emscripten.
-  // Use Emscripten-specific API. Reported CPU time would be exactly the
-  // same as total time, but this is ok because there aren't long-latency
-  // syncronous system calls in Emscripten.
-  return emscripten_get_now() * 1e-3;
-#elif defined(CLOCK_PROCESS_CPUTIME_ID) && !defined(BENCHMARK_OS_MACOSX)
-  // FIXME We want to use clock_gettime, but its not available in MacOS 10.11. See
-  // https://github.com/google/benchmark/pull/292
-  struct timespec spec;
-  if (clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &spec) == 0)
-    return MakeTime(spec);
-  DiagnoseAndExit("clock_gettime(CLOCK_PROCESS_CPUTIME_ID, ...) failed");
-#else
-  struct rusage ru;
-  if (getrusage(RUSAGE_SELF, &ru) == 0) return MakeTime(ru);
-  DiagnoseAndExit("getrusage(RUSAGE_SELF, ...) failed");
-#endif
-}
-
-double ThreadCPUUsage() {
-#if defined(BENCHMARK_OS_WINDOWS)
-  HANDLE this_thread = GetCurrentThread();
-  FILETIME creation_time;
-  FILETIME exit_time;
-  FILETIME kernel_time;
-  FILETIME user_time;
-  GetThreadTimes(this_thread, &creation_time, &exit_time, &kernel_time,
-                 &user_time);
-  return MakeTime(kernel_time, user_time);
-#elif defined(BENCHMARK_OS_MACOSX)
-  // FIXME We want to use clock_gettime, but its not available in MacOS 10.11. See
-  // https://github.com/google/benchmark/pull/292
-  mach_msg_type_number_t count = THREAD_BASIC_INFO_COUNT;
-  thread_basic_info_data_t info;
-  mach_port_t thread = pthread_mach_thread_np(pthread_self());
-  if (thread_info(thread, THREAD_BASIC_INFO, (thread_info_t)&info, &count) ==
-      KERN_SUCCESS) {
-    return MakeTime(info);
-  }
-  DiagnoseAndExit("ThreadCPUUsage() failed when evaluating thread_info");
-#elif defined(BENCHMARK_OS_EMSCRIPTEN)
-  // Emscripten doesn't support traditional threads
-  return ProcessCPUUsage();
-#elif defined(BENCHMARK_OS_RTEMS)
-  // RTEMS doesn't support CLOCK_THREAD_CPUTIME_ID. See
-  // https://github.com/RTEMS/rtems/blob/master/cpukit/posix/src/clockgettime.c
-  return ProcessCPUUsage();
-#elif defined(BENCHMARK_OS_SOLARIS)
-  struct rusage ru;
-  if (getrusage(RUSAGE_LWP, &ru) == 0) return MakeTime(ru);
-  DiagnoseAndExit("getrusage(RUSAGE_LWP, ...) failed");
-#elif defined(CLOCK_THREAD_CPUTIME_ID)
-  struct timespec ts;
-  if (clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts) == 0) return MakeTime(ts);
-  DiagnoseAndExit("clock_gettime(CLOCK_THREAD_CPUTIME_ID, ...) failed");
-#else
-#error Per-thread timing is not available on your system.
-#endif
-}
-
-namespace {
-
-std::string DateTimeString(bool local) {
-  typedef std::chrono::system_clock Clock;
-  std::time_t now = Clock::to_time_t(Clock::now());
-  const std::size_t kStorageSize = 128;
-  char storage[kStorageSize];
-  std::size_t written;
-
-  if (local) {
-#if defined(BENCHMARK_OS_WINDOWS)
-    written =
-        std::strftime(storage, sizeof(storage), "%x %X", ::localtime(&now));
-#else
-    std::tm timeinfo;
-    ::localtime_r(&now, &timeinfo);
-    written = std::strftime(storage, sizeof(storage), "%F %T", &timeinfo);
-#endif
-  } else {
-#if defined(BENCHMARK_OS_WINDOWS)
-    written = std::strftime(storage, sizeof(storage), "%x %X", ::gmtime(&now));
-#else
-    std::tm timeinfo;
-    ::gmtime_r(&now, &timeinfo);
-    written = std::strftime(storage, sizeof(storage), "%F %T", &timeinfo);
-#endif
-  }
-  CHECK(written < kStorageSize);
-  ((void)written);  // prevent unused variable in optimized mode.
-  return std::string(storage);
-}
-
-}  // end namespace
-
-std::string LocalDateTimeString() { return DateTimeString(true); }
-
-}  // end namespace benchmark
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/src/timers.h b/external_imported/json/benchmarks/thirdparty/benchmark/src/timers.h
deleted file mode 100755
index 65606ccd9..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/src/timers.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#ifndef BENCHMARK_TIMERS_H
-#define BENCHMARK_TIMERS_H
-
-#include <chrono>
-#include <string>
-
-namespace benchmark {
-
-// Return the CPU usage of the current process
-double ProcessCPUUsage();
-
-// Return the CPU usage of the children of the current process
-double ChildrenCPUUsage();
-
-// Return the CPU usage of the current thread
-double ThreadCPUUsage();
-
-#if defined(HAVE_STEADY_CLOCK)
-template <bool HighResIsSteady = std::chrono::high_resolution_clock::is_steady>
-struct ChooseSteadyClock {
-  typedef std::chrono::high_resolution_clock type;
-};
-
-template <>
-struct ChooseSteadyClock<false> {
-  typedef std::chrono::steady_clock type;
-};
-#endif
-
-struct ChooseClockType {
-#if defined(HAVE_STEADY_CLOCK)
-  typedef ChooseSteadyClock<>::type type;
-#else
-  typedef std::chrono::high_resolution_clock type;
-#endif
-};
-
-inline double ChronoClockNow() {
-  typedef ChooseClockType::type ClockType;
-  using FpSeconds = std::chrono::duration<double, std::chrono::seconds::period>;
-  return FpSeconds(ClockType::now().time_since_epoch()).count();
-}
-
-std::string LocalDateTimeString();
-
-}  // end namespace benchmark
-
-#endif  // BENCHMARK_TIMERS_H
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/tools/compare.py b/external_imported/json/benchmarks/thirdparty/benchmark/tools/compare.py
deleted file mode 100755
index f0a4455f5..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/tools/compare.py
+++ /dev/null
@@ -1,316 +0,0 @@
-#!/usr/bin/env python
-
-"""
-compare.py - versatile benchmark output compare tool
-"""
-
-import argparse
-from argparse import ArgumentParser
-import sys
-import gbench
-from gbench import util, report
-from gbench.util import *
-
-
-def check_inputs(in1, in2, flags):
-    """
-    Perform checking on the user provided inputs and diagnose any abnormalities
-    """
-    in1_kind, in1_err = classify_input_file(in1)
-    in2_kind, in2_err = classify_input_file(in2)
-    output_file = find_benchmark_flag('--benchmark_out=', flags)
-    output_type = find_benchmark_flag('--benchmark_out_format=', flags)
-    if in1_kind == IT_Executable and in2_kind == IT_Executable and output_file:
-        print(("WARNING: '--benchmark_out=%s' will be passed to both "
-               "benchmarks causing it to be overwritten") % output_file)
-    if in1_kind == IT_JSON and in2_kind == IT_JSON and len(flags) > 0:
-        print("WARNING: passing optional flags has no effect since both "
-              "inputs are JSON")
-    if output_type is not None and output_type != 'json':
-        print(("ERROR: passing '--benchmark_out_format=%s' to 'compare.py`"
-               " is not supported.") % output_type)
-        sys.exit(1)
-
-
-def create_parser():
-    parser = ArgumentParser(
-        description='versatile benchmark output compare tool')
-    subparsers = parser.add_subparsers(
-        help='This tool has multiple modes of operation:',
-        dest='mode')
-
-    parser_a = subparsers.add_parser(
-        'benchmarks',
-        help='The most simple use-case, compare all the output of these two benchmarks')
-    baseline = parser_a.add_argument_group(
-        'baseline', 'The benchmark baseline')
-    baseline.add_argument(
-        'test_baseline',
-        metavar='test_baseline',
-        type=argparse.FileType('r'),
-        nargs=1,
-        help='A benchmark executable or JSON output file')
-    contender = parser_a.add_argument_group(
-        'contender', 'The benchmark that will be compared against the baseline')
-    contender.add_argument(
-        'test_contender',
-        metavar='test_contender',
-        type=argparse.FileType('r'),
-        nargs=1,
-        help='A benchmark executable or JSON output file')
-    parser_a.add_argument(
-        'benchmark_options',
-        metavar='benchmark_options',
-        nargs=argparse.REMAINDER,
-        help='Arguments to pass when running benchmark executables')
-
-    parser_b = subparsers.add_parser(
-        'filters', help='Compare filter one with the filter two of benchmark')
-    baseline = parser_b.add_argument_group(
-        'baseline', 'The benchmark baseline')
-    baseline.add_argument(
-        'test',
-        metavar='test',
-        type=argparse.FileType('r'),
-        nargs=1,
-        help='A benchmark executable or JSON output file')
-    baseline.add_argument(
-        'filter_baseline',
-        metavar='filter_baseline',
-        type=str,
-        nargs=1,
-        help='The first filter, that will be used as baseline')
-    contender = parser_b.add_argument_group(
-        'contender', 'The benchmark that will be compared against the baseline')
-    contender.add_argument(
-        'filter_contender',
-        metavar='filter_contender',
-        type=str,
-        nargs=1,
-        help='The second filter, that will be compared against the baseline')
-    parser_b.add_argument(
-        'benchmark_options',
-        metavar='benchmark_options',
-        nargs=argparse.REMAINDER,
-        help='Arguments to pass when running benchmark executables')
-
-    parser_c = subparsers.add_parser(
-        'benchmarksfiltered',
-        help='Compare filter one of first benchmark with filter two of the second benchmark')
-    baseline = parser_c.add_argument_group(
-        'baseline', 'The benchmark baseline')
-    baseline.add_argument(
-        'test_baseline',
-        metavar='test_baseline',
-        type=argparse.FileType('r'),
-        nargs=1,
-        help='A benchmark executable or JSON output file')
-    baseline.add_argument(
-        'filter_baseline',
-        metavar='filter_baseline',
-        type=str,
-        nargs=1,
-        help='The first filter, that will be used as baseline')
-    contender = parser_c.add_argument_group(
-        'contender', 'The benchmark that will be compared against the baseline')
-    contender.add_argument(
-        'test_contender',
-        metavar='test_contender',
-        type=argparse.FileType('r'),
-        nargs=1,
-        help='The second benchmark executable or JSON output file, that will be compared against the baseline')
-    contender.add_argument(
-        'filter_contender',
-        metavar='filter_contender',
-        type=str,
-        nargs=1,
-        help='The second filter, that will be compared against the baseline')
-    parser_c.add_argument(
-        'benchmark_options',
-        metavar='benchmark_options',
-        nargs=argparse.REMAINDER,
-        help='Arguments to pass when running benchmark executables')
-
-    return parser
-
-
-def main():
-    # Parse the command line flags
-    parser = create_parser()
-    args, unknown_args = parser.parse_known_args()
-    if args.mode is None:
-      parser.print_help()
-      exit(1)
-    assert not unknown_args
-    benchmark_options = args.benchmark_options
-
-    if args.mode == 'benchmarks':
-        test_baseline = args.test_baseline[0].name
-        test_contender = args.test_contender[0].name
-        filter_baseline = ''
-        filter_contender = ''
-
-        # NOTE: if test_baseline == test_contender, you are analyzing the stdev
-
-        description = 'Comparing %s to %s' % (test_baseline, test_contender)
-    elif args.mode == 'filters':
-        test_baseline = args.test[0].name
-        test_contender = args.test[0].name
-        filter_baseline = args.filter_baseline[0]
-        filter_contender = args.filter_contender[0]
-
-        # NOTE: if filter_baseline == filter_contender, you are analyzing the
-        # stdev
-
-        description = 'Comparing %s to %s (from %s)' % (
-            filter_baseline, filter_contender, args.test[0].name)
-    elif args.mode == 'benchmarksfiltered':
-        test_baseline = args.test_baseline[0].name
-        test_contender = args.test_contender[0].name
-        filter_baseline = args.filter_baseline[0]
-        filter_contender = args.filter_contender[0]
-
-        # NOTE: if test_baseline == test_contender and
-        # filter_baseline == filter_contender, you are analyzing the stdev
-
-        description = 'Comparing %s (from %s) to %s (from %s)' % (
-            filter_baseline, test_baseline, filter_contender, test_contender)
-    else:
-        # should never happen
-        print("Unrecognized mode of operation: '%s'" % args.mode)
-        parser.print_help()
-        exit(1)
-
-    check_inputs(test_baseline, test_contender, benchmark_options)
-
-    options_baseline = []
-    options_contender = []
-
-    if filter_baseline and filter_contender:
-        options_baseline = ['--benchmark_filter=%s' % filter_baseline]
-        options_contender = ['--benchmark_filter=%s' % filter_contender]
-
-    # Run the benchmarks and report the results
-    json1 = json1_orig = gbench.util.run_or_load_benchmark(
-        test_baseline, benchmark_options + options_baseline)
-    json2 = json2_orig = gbench.util.run_or_load_benchmark(
-        test_contender, benchmark_options + options_contender)
-
-    # Now, filter the benchmarks so that the difference report can work
-    if filter_baseline and filter_contender:
-        replacement = '[%s vs. %s]' % (filter_baseline, filter_contender)
-        json1 = gbench.report.filter_benchmark(
-            json1_orig, filter_baseline, replacement)
-        json2 = gbench.report.filter_benchmark(
-            json2_orig, filter_contender, replacement)
-
-    # Diff and output
-    output_lines = gbench.report.generate_difference_report(json1, json2)
-    print(description)
-    for ln in output_lines:
-        print(ln)
-
-
-import unittest
-
-
-class TestParser(unittest.TestCase):
-    def setUp(self):
-        self.parser = create_parser()
-        testInputs = os.path.join(
-            os.path.dirname(
-                os.path.realpath(__file__)),
-            'gbench',
-            'Inputs')
-        self.testInput0 = os.path.join(testInputs, 'test1_run1.json')
-        self.testInput1 = os.path.join(testInputs, 'test1_run2.json')
-
-    def test_benchmarks_basic(self):
-        parsed = self.parser.parse_args(
-            ['benchmarks', self.testInput0, self.testInput1])
-        self.assertEqual(parsed.mode, 'benchmarks')
-        self.assertEqual(parsed.test_baseline[0].name, self.testInput0)
-        self.assertEqual(parsed.test_contender[0].name, self.testInput1)
-        self.assertFalse(parsed.benchmark_options)
-
-    def test_benchmarks_with_remainder(self):
-        parsed = self.parser.parse_args(
-            ['benchmarks', self.testInput0, self.testInput1, 'd'])
-        self.assertEqual(parsed.mode, 'benchmarks')
-        self.assertEqual(parsed.test_baseline[0].name, self.testInput0)
-        self.assertEqual(parsed.test_contender[0].name, self.testInput1)
-        self.assertEqual(parsed.benchmark_options, ['d'])
-
-    def test_benchmarks_with_remainder_after_doubleminus(self):
-        parsed = self.parser.parse_args(
-            ['benchmarks', self.testInput0, self.testInput1, '--', 'e'])
-        self.assertEqual(parsed.mode, 'benchmarks')
-        self.assertEqual(parsed.test_baseline[0].name, self.testInput0)
-        self.assertEqual(parsed.test_contender[0].name, self.testInput1)
-        self.assertEqual(parsed.benchmark_options, ['e'])
-
-    def test_filters_basic(self):
-        parsed = self.parser.parse_args(
-            ['filters', self.testInput0, 'c', 'd'])
-        self.assertEqual(parsed.mode, 'filters')
-        self.assertEqual(parsed.test[0].name, self.testInput0)
-        self.assertEqual(parsed.filter_baseline[0], 'c')
-        self.assertEqual(parsed.filter_contender[0], 'd')
-        self.assertFalse(parsed.benchmark_options)
-
-    def test_filters_with_remainder(self):
-        parsed = self.parser.parse_args(
-            ['filters', self.testInput0, 'c', 'd', 'e'])
-        self.assertEqual(parsed.mode, 'filters')
-        self.assertEqual(parsed.test[0].name, self.testInput0)
-        self.assertEqual(parsed.filter_baseline[0], 'c')
-        self.assertEqual(parsed.filter_contender[0], 'd')
-        self.assertEqual(parsed.benchmark_options, ['e'])
-
-    def test_filters_with_remainder_after_doubleminus(self):
-        parsed = self.parser.parse_args(
-            ['filters', self.testInput0, 'c', 'd', '--', 'f'])
-        self.assertEqual(parsed.mode, 'filters')
-        self.assertEqual(parsed.test[0].name, self.testInput0)
-        self.assertEqual(parsed.filter_baseline[0], 'c')
-        self.assertEqual(parsed.filter_contender[0], 'd')
-        self.assertEqual(parsed.benchmark_options, ['f'])
-
-    def test_benchmarksfiltered_basic(self):
-        parsed = self.parser.parse_args(
-            ['benchmarksfiltered', self.testInput0, 'c', self.testInput1, 'e'])
-        self.assertEqual(parsed.mode, 'benchmarksfiltered')
-        self.assertEqual(parsed.test_baseline[0].name, self.testInput0)
-        self.assertEqual(parsed.filter_baseline[0], 'c')
-        self.assertEqual(parsed.test_contender[0].name, self.testInput1)
-        self.assertEqual(parsed.filter_contender[0], 'e')
-        self.assertFalse(parsed.benchmark_options)
-
-    def test_benchmarksfiltered_with_remainder(self):
-        parsed = self.parser.parse_args(
-            ['benchmarksfiltered', self.testInput0, 'c', self.testInput1, 'e', 'f'])
-        self.assertEqual(parsed.mode, 'benchmarksfiltered')
-        self.assertEqual(parsed.test_baseline[0].name, self.testInput0)
-        self.assertEqual(parsed.filter_baseline[0], 'c')
-        self.assertEqual(parsed.test_contender[0].name, self.testInput1)
-        self.assertEqual(parsed.filter_contender[0], 'e')
-        self.assertEqual(parsed.benchmark_options[0], 'f')
-
-    def test_benchmarksfiltered_with_remainder_after_doubleminus(self):
-        parsed = self.parser.parse_args(
-            ['benchmarksfiltered', self.testInput0, 'c', self.testInput1, 'e', '--', 'g'])
-        self.assertEqual(parsed.mode, 'benchmarksfiltered')
-        self.assertEqual(parsed.test_baseline[0].name, self.testInput0)
-        self.assertEqual(parsed.filter_baseline[0], 'c')
-        self.assertEqual(parsed.test_contender[0].name, self.testInput1)
-        self.assertEqual(parsed.filter_contender[0], 'e')
-        self.assertEqual(parsed.benchmark_options[0], 'g')
-
-
-if __name__ == '__main__':
-    # unittest.main()
-    main()
-
-# vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4
-# kate: tab-width: 4; replace-tabs on; indent-width 4; tab-indents: off;
-# kate: indent-mode python; remove-trailing-spaces modified;
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/tools/compare_bench.py b/external_imported/json/benchmarks/thirdparty/benchmark/tools/compare_bench.py
deleted file mode 100755
index 7bbf0d015..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/tools/compare_bench.py
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/usr/bin/env python
-"""
-compare_bench.py - Compare two benchmarks or their results and report the
-                   difference.
-"""
-import argparse
-from argparse import ArgumentParser
-import sys
-import gbench
-from gbench import util, report
-from gbench.util import *
-
-def check_inputs(in1, in2, flags):
-    """
-    Perform checking on the user provided inputs and diagnose any abnormalities
-    """
-    in1_kind, in1_err = classify_input_file(in1)
-    in2_kind, in2_err = classify_input_file(in2)
-    output_file = find_benchmark_flag('--benchmark_out=', flags)
-    output_type = find_benchmark_flag('--benchmark_out_format=', flags)
-    if in1_kind == IT_Executable and in2_kind == IT_Executable and output_file:
-        print(("WARNING: '--benchmark_out=%s' will be passed to both "
-              "benchmarks causing it to be overwritten") % output_file)
-    if in1_kind == IT_JSON and in2_kind == IT_JSON and len(flags) > 0:
-        print("WARNING: passing --benchmark flags has no effect since both "
-              "inputs are JSON")
-    if output_type is not None and output_type != 'json':
-        print(("ERROR: passing '--benchmark_out_format=%s' to 'compare_bench.py`"
-              " is not supported.") % output_type)
-        sys.exit(1)
-
-
-def main():
-    parser = ArgumentParser(
-        description='compare the results of two benchmarks')
-    parser.add_argument(
-        'test1', metavar='test1', type=str, nargs=1,
-        help='A benchmark executable or JSON output file')
-    parser.add_argument(
-        'test2', metavar='test2', type=str, nargs=1,
-        help='A benchmark executable or JSON output file')
-    parser.add_argument(
-        'benchmark_options', metavar='benchmark_options', nargs=argparse.REMAINDER,
-        help='Arguments to pass when running benchmark executables'
-    )
-    args, unknown_args = parser.parse_known_args()
-    # Parse the command line flags
-    test1 = args.test1[0]
-    test2 = args.test2[0]
-    if unknown_args:
-        # should never happen
-        print("Unrecognized positional argument arguments: '%s'"
-              % unknown_args)
-        exit(1)
-    benchmark_options = args.benchmark_options
-    check_inputs(test1, test2, benchmark_options)
-    # Run the benchmarks and report the results
-    json1 = gbench.util.run_or_load_benchmark(test1, benchmark_options)
-    json2 = gbench.util.run_or_load_benchmark(test2, benchmark_options)
-    output_lines = gbench.report.generate_difference_report(json1, json2)
-    print('Comparing %s to %s' % (test1, test2))
-    for ln in output_lines:
-        print(ln)
-
-
-if __name__ == '__main__':
-    main()
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/tools/gbench/Inputs/test1_run1.json b/external_imported/json/benchmarks/thirdparty/benchmark/tools/gbench/Inputs/test1_run1.json
deleted file mode 100755
index d7ec6a9c8..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/tools/gbench/Inputs/test1_run1.json
+++ /dev/null
@@ -1,102 +0,0 @@
-{
-  "context": {
-    "date": "2016-08-02 17:44:46",
-    "num_cpus": 4,
-    "mhz_per_cpu": 4228,
-    "cpu_scaling_enabled": false,
-    "library_build_type": "release"
-  },
-  "benchmarks": [
-    {
-      "name": "BM_SameTimes",
-      "iterations": 1000,
-      "real_time": 10,
-      "cpu_time": 10,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_2xFaster",
-      "iterations": 1000,
-      "real_time": 50,
-      "cpu_time": 50,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_2xSlower",
-      "iterations": 1000,
-      "real_time": 50,
-      "cpu_time": 50,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_1PercentFaster",
-      "iterations": 1000,
-      "real_time": 100,
-      "cpu_time": 100,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_1PercentSlower",
-      "iterations": 1000,
-      "real_time": 100,
-      "cpu_time": 100,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_10PercentFaster",
-      "iterations": 1000,
-      "real_time": 100,
-      "cpu_time": 100,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_10PercentSlower",
-      "iterations": 1000,
-      "real_time": 100,
-      "cpu_time": 100,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_100xSlower",
-      "iterations": 1000,
-      "real_time": 100,
-      "cpu_time": 100,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_100xFaster",
-      "iterations": 1000,
-      "real_time": 10000,
-      "cpu_time": 10000,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_10PercentCPUToTime",
-      "iterations": 1000,
-      "real_time": 100,
-      "cpu_time": 100,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_ThirdFaster",
-      "iterations": 1000,
-      "real_time": 100,
-      "cpu_time": 100,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_BadTimeUnit",
-      "iterations": 1000,
-      "real_time": 0.4,
-      "cpu_time": 0.5,
-      "time_unit": "s"
-    },
-    {
-      "name": "BM_DifferentTimeUnit",
-      "iterations": 1,
-      "real_time": 1,
-      "cpu_time": 1,
-      "time_unit": "s"
-    }
-  ]
-}
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/tools/gbench/Inputs/test1_run2.json b/external_imported/json/benchmarks/thirdparty/benchmark/tools/gbench/Inputs/test1_run2.json
deleted file mode 100755
index 59a5ffaca..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/tools/gbench/Inputs/test1_run2.json
+++ /dev/null
@@ -1,102 +0,0 @@
-{
-  "context": {
-    "date": "2016-08-02 17:44:46",
-    "num_cpus": 4,
-    "mhz_per_cpu": 4228,
-    "cpu_scaling_enabled": false,
-    "library_build_type": "release"
-  },
-  "benchmarks": [
-    {
-      "name": "BM_SameTimes",
-      "iterations": 1000,
-      "real_time": 10,
-      "cpu_time": 10,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_2xFaster",
-      "iterations": 1000,
-      "real_time": 25,
-      "cpu_time": 25,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_2xSlower",
-      "iterations": 20833333,
-      "real_time": 100,
-      "cpu_time": 100,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_1PercentFaster",
-      "iterations": 1000,
-      "real_time": 98.9999999,
-      "cpu_time": 98.9999999,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_1PercentSlower",
-      "iterations": 1000,
-      "real_time": 100.9999999,
-      "cpu_time": 100.9999999,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_10PercentFaster",
-      "iterations": 1000,
-      "real_time": 90,
-      "cpu_time": 90,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_10PercentSlower",
-      "iterations": 1000,
-      "real_time": 110,
-      "cpu_time": 110,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_100xSlower",
-      "iterations": 1000,
-      "real_time": 1.0000e+04,
-      "cpu_time": 1.0000e+04,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_100xFaster",
-      "iterations": 1000,
-      "real_time": 100,
-      "cpu_time": 100,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_10PercentCPUToTime",
-      "iterations": 1000,
-      "real_time": 110,
-      "cpu_time": 90,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_ThirdFaster",
-      "iterations": 1000,
-      "real_time": 66.665,
-      "cpu_time": 66.664,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_BadTimeUnit",
-      "iterations": 1000,
-      "real_time": 0.04,
-      "cpu_time": 0.6,
-      "time_unit": "s"
-    },
-    {
-      "name": "BM_DifferentTimeUnit",
-      "iterations": 1,
-      "real_time": 1,
-      "cpu_time": 1,
-      "time_unit": "ns"
-    }
-  ]
-}
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/tools/gbench/Inputs/test2_run.json b/external_imported/json/benchmarks/thirdparty/benchmark/tools/gbench/Inputs/test2_run.json
deleted file mode 100755
index 15bc69803..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/tools/gbench/Inputs/test2_run.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-  "context": {
-    "date": "2016-08-02 17:44:46",
-    "num_cpus": 4,
-    "mhz_per_cpu": 4228,
-    "cpu_scaling_enabled": false,
-    "library_build_type": "release"
-  },
-  "benchmarks": [
-    {
-      "name": "BM_Hi",
-      "iterations": 1234,
-      "real_time": 42,
-      "cpu_time": 24,
-      "time_unit": "ms"
-    },
-    {
-      "name": "BM_Zero",
-      "iterations": 1000,
-      "real_time": 10,
-      "cpu_time": 10,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_Zero/4",
-      "iterations": 4000,
-      "real_time": 40,
-      "cpu_time": 40,
-      "time_unit": "ns"
-    },
-    {
-      "name": "Prefix/BM_Zero",
-      "iterations": 2000,
-      "real_time": 20,
-      "cpu_time": 20,
-      "time_unit": "ns"
-    },
-    {
-      "name": "Prefix/BM_Zero/3",
-      "iterations": 3000,
-      "real_time": 30,
-      "cpu_time": 30,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_One",
-      "iterations": 5000,
-      "real_time": 5,
-      "cpu_time": 5,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_One/4",
-      "iterations": 2000,
-      "real_time": 20,
-      "cpu_time": 20,
-      "time_unit": "ns"
-    },
-    {
-      "name": "Prefix/BM_One",
-      "iterations": 1000,
-      "real_time": 10,
-      "cpu_time": 10,
-      "time_unit": "ns"
-    },
-    {
-      "name": "Prefix/BM_One/3",
-      "iterations": 1500,
-      "real_time": 15,
-      "cpu_time": 15,
-      "time_unit": "ns"
-    },
-    {
-      "name": "BM_Bye",
-      "iterations": 5321,
-      "real_time": 11,
-      "cpu_time": 63,
-      "time_unit": "ns"
-    }
-  ]
-}
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/tools/gbench/__init__.py b/external_imported/json/benchmarks/thirdparty/benchmark/tools/gbench/__init__.py
deleted file mode 100755
index fce1a1acf..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/tools/gbench/__init__.py
+++ /dev/null
@@ -1,8 +0,0 @@
-"""Google Benchmark tooling"""
-
-__author__ = 'Eric Fiselier'
-__email__ = 'eric@efcs.ca'
-__versioninfo__ = (0, 5, 0)
-__version__ = '.'.join(str(v) for v in __versioninfo__) + 'dev'
-
-__all__ = []
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/tools/gbench/report.py b/external_imported/json/benchmarks/thirdparty/benchmark/tools/gbench/report.py
deleted file mode 100755
index 0c090981a..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/tools/gbench/report.py
+++ /dev/null
@@ -1,208 +0,0 @@
-"""report.py - Utilities for reporting statistics about benchmark results
-"""
-import os
-import re
-import copy
-
-class BenchmarkColor(object):
-    def __init__(self, name, code):
-        self.name = name
-        self.code = code
-
-    def __repr__(self):
-        return '%s%r' % (self.__class__.__name__,
-                         (self.name, self.code))
-
-    def __format__(self, format):
-        return self.code
-
-# Benchmark Colors Enumeration
-BC_NONE = BenchmarkColor('NONE', '')
-BC_MAGENTA = BenchmarkColor('MAGENTA', '\033[95m')
-BC_CYAN = BenchmarkColor('CYAN', '\033[96m')
-BC_OKBLUE = BenchmarkColor('OKBLUE', '\033[94m')
-BC_HEADER = BenchmarkColor('HEADER', '\033[92m')
-BC_WARNING = BenchmarkColor('WARNING', '\033[93m')
-BC_WHITE = BenchmarkColor('WHITE', '\033[97m')
-BC_FAIL = BenchmarkColor('FAIL', '\033[91m')
-BC_ENDC = BenchmarkColor('ENDC', '\033[0m')
-BC_BOLD = BenchmarkColor('BOLD', '\033[1m')
-BC_UNDERLINE = BenchmarkColor('UNDERLINE', '\033[4m')
-
-def color_format(use_color, fmt_str, *args, **kwargs):
-    """
-    Return the result of 'fmt_str.format(*args, **kwargs)' after transforming
-    'args' and 'kwargs' according to the value of 'use_color'. If 'use_color'
-    is False then all color codes in 'args' and 'kwargs' are replaced with
-    the empty string.
-    """
-    assert use_color is True or use_color is False
-    if not use_color:
-        args = [arg if not isinstance(arg, BenchmarkColor) else BC_NONE
-                for arg in args]
-        kwargs = {key: arg if not isinstance(arg, BenchmarkColor) else BC_NONE
-                  for key, arg in kwargs.items()}
-    return fmt_str.format(*args, **kwargs)
-
-
-def find_longest_name(benchmark_list):
-    """
-    Return the length of the longest benchmark name in a given list of
-    benchmark JSON objects
-    """
-    longest_name = 1
-    for bc in benchmark_list:
-        if len(bc['name']) > longest_name:
-            longest_name = len(bc['name'])
-    return longest_name
-
-
-def calculate_change(old_val, new_val):
-    """
-    Return a float representing the decimal change between old_val and new_val.
-    """
-    if old_val == 0 and new_val == 0:
-        return 0.0
-    if old_val == 0:
-        return float(new_val - old_val) / (float(old_val + new_val) / 2)
-    return float(new_val - old_val) / abs(old_val)
-
-
-def filter_benchmark(json_orig, family, replacement=""):
-    """
-    Apply a filter to the json, and only leave the 'family' of benchmarks.
-    """
-    regex = re.compile(family)
-    filtered = {}
-    filtered['benchmarks'] = []
-    for be in json_orig['benchmarks']:
-        if not regex.search(be['name']):
-            continue
-        filteredbench = copy.deepcopy(be) # Do NOT modify the old name!
-        filteredbench['name'] = regex.sub(replacement, filteredbench['name'])
-        filtered['benchmarks'].append(filteredbench)
-    return filtered
-
-
-def generate_difference_report(json1, json2, use_color=True):
-    """
-    Calculate and report the difference between each test of two benchmarks
-    runs specified as 'json1' and 'json2'.
-    """
-    first_col_width = find_longest_name(json1['benchmarks'])
-    def find_test(name):
-        for b in json2['benchmarks']:
-            if b['name'] == name:
-                return b
-        return None
-    first_col_width = max(first_col_width, len('Benchmark'))
-    first_line = "{:<{}s}Time             CPU      Time Old      Time New       CPU Old       CPU New".format(
-        'Benchmark', 12 + first_col_width)
-    output_strs = [first_line, '-' * len(first_line)]
-
-    gen = (bn for bn in json1['benchmarks'] if 'real_time' in bn and 'cpu_time' in bn)
-    for bn in gen:
-        other_bench = find_test(bn['name'])
-        if not other_bench:
-            continue
-
-        if bn['time_unit'] != other_bench['time_unit']:
-            continue
-
-        def get_color(res):
-            if res > 0.05:
-                return BC_FAIL
-            elif res > -0.07:
-                return BC_WHITE
-            else:
-                return BC_CYAN
-        fmt_str = "{}{:<{}s}{endc}{}{:+16.4f}{endc}{}{:+16.4f}{endc}{:14.0f}{:14.0f}{endc}{:14.0f}{:14.0f}"
-        tres = calculate_change(bn['real_time'], other_bench['real_time'])
-        cpures = calculate_change(bn['cpu_time'], other_bench['cpu_time'])
-        output_strs += [color_format(use_color, fmt_str,
-            BC_HEADER, bn['name'], first_col_width,
-            get_color(tres), tres, get_color(cpures), cpures,
-            bn['real_time'], other_bench['real_time'],
-            bn['cpu_time'], other_bench['cpu_time'],
-            endc=BC_ENDC)]
-    return output_strs
-
-###############################################################################
-# Unit tests
-
-import unittest
-
-class TestReportDifference(unittest.TestCase):
-    def load_results(self):
-        import json
-        testInputs = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'Inputs')
-        testOutput1 = os.path.join(testInputs, 'test1_run1.json')
-        testOutput2 = os.path.join(testInputs, 'test1_run2.json')
-        with open(testOutput1, 'r') as f:
-            json1 = json.load(f)
-        with open(testOutput2, 'r') as f:
-            json2 = json.load(f)
-        return json1, json2
-
-    def test_basic(self):
-        expect_lines = [
-            ['BM_SameTimes', '+0.0000', '+0.0000', '10', '10', '10', '10'],
-            ['BM_2xFaster', '-0.5000', '-0.5000', '50', '25', '50', '25'],
-            ['BM_2xSlower', '+1.0000', '+1.0000', '50', '100', '50', '100'],
-            ['BM_1PercentFaster', '-0.0100', '-0.0100', '100', '99', '100', '99'],
-            ['BM_1PercentSlower', '+0.0100', '+0.0100', '100', '101', '100', '101'],
-            ['BM_10PercentFaster', '-0.1000', '-0.1000', '100', '90', '100', '90'],
-            ['BM_10PercentSlower', '+0.1000', '+0.1000', '100', '110', '100', '110'],
-            ['BM_100xSlower', '+99.0000', '+99.0000', '100', '10000', '100', '10000'],
-            ['BM_100xFaster', '-0.9900', '-0.9900', '10000', '100', '10000', '100'],
-            ['BM_10PercentCPUToTime', '+0.1000', '-0.1000', '100', '110', '100', '90'],
-            ['BM_ThirdFaster', '-0.3333', '-0.3334', '100', '67', '100', '67'],
-            ['BM_BadTimeUnit', '-0.9000', '+0.2000', '0', '0', '0', '1'],
-        ]
-        json1, json2 = self.load_results()
-        output_lines_with_header = generate_difference_report(json1, json2, use_color=False)
-        output_lines = output_lines_with_header[2:]
-        print("\n".join(output_lines_with_header))
-        self.assertEqual(len(output_lines), len(expect_lines))
-        for i in range(0, len(output_lines)):
-            parts = [x for x in output_lines[i].split(' ') if x]
-            self.assertEqual(len(parts), 7)
-            self.assertEqual(parts, expect_lines[i])
-
-
-class TestReportDifferenceBetweenFamilies(unittest.TestCase):
-    def load_result(self):
-        import json
-        testInputs = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'Inputs')
-        testOutput = os.path.join(testInputs, 'test2_run.json')
-        with open(testOutput, 'r') as f:
-            json = json.load(f)
-        return json
-
-    def test_basic(self):
-        expect_lines = [
-            ['.', '-0.5000', '-0.5000', '10', '5', '10', '5'],
-            ['./4', '-0.5000', '-0.5000', '40', '20', '40', '20'],
-            ['Prefix/.', '-0.5000', '-0.5000', '20', '10', '20', '10'],
-            ['Prefix/./3', '-0.5000', '-0.5000', '30', '15', '30', '15'],
-        ]
-        json = self.load_result()
-        json1 = filter_benchmark(json, "BM_Z.ro", ".")
-        json2 = filter_benchmark(json, "BM_O.e", ".")
-        output_lines_with_header = generate_difference_report(json1, json2, use_color=False)
-        output_lines = output_lines_with_header[2:]
-        print("\n")
-        print("\n".join(output_lines_with_header))
-        self.assertEqual(len(output_lines), len(expect_lines))
-        for i in range(0, len(output_lines)):
-            parts = [x for x in output_lines[i].split(' ') if x]
-            self.assertEqual(len(parts), 7)
-            self.assertEqual(parts, expect_lines[i])
-
-
-if __name__ == '__main__':
-    unittest.main()
-
-# vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4
-# kate: tab-width: 4; replace-tabs on; indent-width 4; tab-indents: off;
-# kate: indent-mode python; remove-trailing-spaces modified;
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/tools/gbench/util.py b/external_imported/json/benchmarks/thirdparty/benchmark/tools/gbench/util.py
deleted file mode 100755
index 07c237727..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/tools/gbench/util.py
+++ /dev/null
@@ -1,159 +0,0 @@
-"""util.py - General utilities for running, loading, and processing benchmarks
-"""
-import json
-import os
-import tempfile
-import subprocess
-import sys
-
-# Input file type enumeration
-IT_Invalid    = 0
-IT_JSON       = 1
-IT_Executable = 2
-
-_num_magic_bytes = 2 if sys.platform.startswith('win') else 4
-def is_executable_file(filename):
-    """
-    Return 'True' if 'filename' names a valid file which is likely
-    an executable. A file is considered an executable if it starts with the
-    magic bytes for a EXE, Mach O, or ELF file.
-    """
-    if not os.path.isfile(filename):
-        return False
-    with open(filename, mode='rb') as f:
-        magic_bytes = f.read(_num_magic_bytes)
-    if sys.platform == 'darwin':
-        return magic_bytes in [
-            b'\xfe\xed\xfa\xce',  # MH_MAGIC
-            b'\xce\xfa\xed\xfe',  # MH_CIGAM
-            b'\xfe\xed\xfa\xcf',  # MH_MAGIC_64
-            b'\xcf\xfa\xed\xfe',  # MH_CIGAM_64
-            b'\xca\xfe\xba\xbe',  # FAT_MAGIC
-            b'\xbe\xba\xfe\xca'   # FAT_CIGAM
-        ]
-    elif sys.platform.startswith('win'):
-        return magic_bytes == b'MZ'
-    else:
-        return magic_bytes == b'\x7FELF'
-
-
-def is_json_file(filename):
-    """
-    Returns 'True' if 'filename' names a valid JSON output file.
-    'False' otherwise.
-    """
-    try:
-        with open(filename, 'r') as f:
-            json.load(f)
-        return True
-    except:
-        pass
-    return False
-
-
-def classify_input_file(filename):
-    """
-    Return a tuple (type, msg) where 'type' specifies the classified type
-    of 'filename'. If 'type' is 'IT_Invalid' then 'msg' is a human readable
-    string represeting the error.
-    """
-    ftype = IT_Invalid
-    err_msg = None
-    if not os.path.exists(filename):
-        err_msg = "'%s' does not exist" % filename
-    elif not os.path.isfile(filename):
-        err_msg = "'%s' does not name a file" % filename
-    elif is_executable_file(filename):
-        ftype = IT_Executable
-    elif is_json_file(filename):
-        ftype = IT_JSON
-    else:
-        err_msg = "'%s' does not name a valid benchmark executable or JSON file" % filename
-    return ftype, err_msg
-
-
-def check_input_file(filename):
-    """
-    Classify the file named by 'filename' and return the classification.
-    If the file is classified as 'IT_Invalid' print an error message and exit
-    the program.
-    """
-    ftype, msg = classify_input_file(filename)
-    if ftype == IT_Invalid:
-        print("Invalid input file: %s" % msg)
-        sys.exit(1)
-    return ftype
-
-def find_benchmark_flag(prefix, benchmark_flags):
-    """
-    Search the specified list of flags for a flag matching `<prefix><arg>` and
-    if it is found return the arg it specifies. If specified more than once the
-    last value is returned. If the flag is not found None is returned.
-    """
-    assert prefix.startswith('--') and prefix.endswith('=')
-    result = None
-    for f in benchmark_flags:
-        if f.startswith(prefix):
-            result = f[len(prefix):]
-    return result
-
-def remove_benchmark_flags(prefix, benchmark_flags):
-    """
-    Return a new list containing the specified benchmark_flags except those
-    with the specified prefix.
-    """
-    assert prefix.startswith('--') and prefix.endswith('=')
-    return [f for f in benchmark_flags if not f.startswith(prefix)]
-
-def load_benchmark_results(fname):
-    """
-    Read benchmark output from a file and return the JSON object.
-    REQUIRES: 'fname' names a file containing JSON benchmark output.
-    """
-    with open(fname, 'r') as f:
-        return json.load(f)
-
-
-def run_benchmark(exe_name, benchmark_flags):
-    """
-    Run a benchmark specified by 'exe_name' with the specified
-    'benchmark_flags'. The benchmark is run directly as a subprocess to preserve
-    real time console output.
-    RETURNS: A JSON object representing the benchmark output
-    """
-    output_name = find_benchmark_flag('--benchmark_out=',
-                                      benchmark_flags)
-    is_temp_output = False
-    if output_name is None:
-        is_temp_output = True
-        thandle, output_name = tempfile.mkstemp()
-        os.close(thandle)
-        benchmark_flags = list(benchmark_flags) + \
-                          ['--benchmark_out=%s' % output_name]
-
-    cmd = [exe_name] + benchmark_flags
-    print("RUNNING: %s" % ' '.join(cmd))
-    exitCode = subprocess.call(cmd)
-    if exitCode != 0:
-        print('TEST FAILED...')
-        sys.exit(exitCode)
-    json_res = load_benchmark_results(output_name)
-    if is_temp_output:
-        os.unlink(output_name)
-    return json_res
-
-
-def run_or_load_benchmark(filename, benchmark_flags):
-    """
-    Get the results for a specified benchmark. If 'filename' specifies
-    an executable benchmark then the results are generated by running the
-    benchmark. Otherwise 'filename' must name a valid JSON output file,
-    which is loaded and the result returned.
-    """
-    ftype = check_input_file(filename)
-    if ftype == IT_JSON:
-        return load_benchmark_results(filename)
-    elif ftype == IT_Executable:
-        return run_benchmark(filename, benchmark_flags)
-    else:
-        assert False # This branch is unreachable
\ No newline at end of file
diff --git a/external_imported/json/benchmarks/thirdparty/benchmark/tools/strip_asm.py b/external_imported/json/benchmarks/thirdparty/benchmark/tools/strip_asm.py
deleted file mode 100755
index 9030550b4..000000000
--- a/external_imported/json/benchmarks/thirdparty/benchmark/tools/strip_asm.py
+++ /dev/null
@@ -1,151 +0,0 @@
-#!/usr/bin/env python
-
-"""
-strip_asm.py - Cleanup ASM output for the specified file
-"""
-
-from argparse import ArgumentParser
-import sys
-import os
-import re
-
-def find_used_labels(asm):
-    found = set()
-    label_re = re.compile("\s*j[a-z]+\s+\.L([a-zA-Z0-9][a-zA-Z0-9_]*)")
-    for l in asm.splitlines():
-        m = label_re.match(l)
-        if m:
-            found.add('.L%s' % m.group(1))
-    return found
-
-
-def normalize_labels(asm):
-    decls = set()
-    label_decl = re.compile("^[.]{0,1}L([a-zA-Z0-9][a-zA-Z0-9_]*)(?=:)")
-    for l in asm.splitlines():
-        m = label_decl.match(l)
-        if m:
-            decls.add(m.group(0))
-    if len(decls) == 0:
-        return asm
-    needs_dot = next(iter(decls))[0] != '.'
-    if not needs_dot:
-        return asm
-    for ld in decls:
-        asm = re.sub("(^|\s+)" + ld + "(?=:|\s)", '\\1.' + ld, asm)
-    return asm
-
-
-def transform_labels(asm):
-    asm = normalize_labels(asm)
-    used_decls = find_used_labels(asm)
-    new_asm = ''
-    label_decl = re.compile("^\.L([a-zA-Z0-9][a-zA-Z0-9_]*)(?=:)")
-    for l in asm.splitlines():
-        m = label_decl.match(l)
-        if not m or m.group(0) in used_decls:
-            new_asm += l
-            new_asm += '\n'
-    return new_asm
-
-
-def is_identifier(tk):
-    if len(tk) == 0:
-        return False
-    first = tk[0]
-    if not first.isalpha() and first != '_':
-        return False
-    for i in range(1, len(tk)):
-        c = tk[i]
-        if not c.isalnum() and c != '_':
-            return False
-    return True
-
-def process_identifiers(l):
-    """
-    process_identifiers - process all identifiers and modify them to have
-    consistent names across all platforms; specifically across ELF and MachO.
-    For example, MachO inserts an additional understore at the beginning of
-    names. This function removes that.
-    """
-    parts = re.split(r'([a-zA-Z0-9_]+)', l)
-    new_line = ''
-    for tk in parts:
-        if is_identifier(tk):
-            if tk.startswith('__Z'):
-                tk = tk[1:]
-            elif tk.startswith('_') and len(tk) > 1 and \
-                    tk[1].isalpha() and tk[1] != 'Z':
-                tk = tk[1:]
-        new_line += tk
-    return new_line
-
-
-def process_asm(asm):
-    """
-    Strip the ASM of unwanted directives and lines
-    """
-    new_contents = ''
-    asm = transform_labels(asm)
-
-    # TODO: Add more things we want to remove
-    discard_regexes = [
-        re.compile("\s+\..*$"), # directive
-        re.compile("\s*#(NO_APP|APP)$"), #inline ASM
-        re.compile("\s*#.*$"), # comment line
-        re.compile("\s*\.globa?l\s*([.a-zA-Z_][a-zA-Z0-9$_.]*)"), #global directive
-        re.compile("\s*\.(string|asciz|ascii|[1248]?byte|short|word|long|quad|value|zero)"),
-    ]
-    keep_regexes = [
-
-    ]
-    fn_label_def = re.compile("^[a-zA-Z_][a-zA-Z0-9_.]*:")
-    for l in asm.splitlines():
-        # Remove Mach-O attribute
-        l = l.replace('@GOTPCREL', '')
-        add_line = True
-        for reg in discard_regexes:
-            if reg.match(l) is not None:
-                add_line = False
-                break
-        for reg in keep_regexes:
-            if reg.match(l) is not None:
-                add_line = True
-                break
-        if add_line:
-            if fn_label_def.match(l) and len(new_contents) != 0:
-                new_contents += '\n'
-            l = process_identifiers(l)
-            new_contents += l
-            new_contents += '\n'
-    return new_contents
-
-def main():
-    parser = ArgumentParser(
-        description='generate a stripped assembly file')
-    parser.add_argument(
-        'input', metavar='input', type=str, nargs=1,
-        help='An input assembly file')
-    parser.add_argument(
-        'out', metavar='output', type=str, nargs=1,
-        help='The output file')
-    args, unknown_args = parser.parse_known_args()
-    input = args.input[0]
-    output = args.out[0]
-    if not os.path.isfile(input):
-        print(("ERROR: input file '%s' does not exist") % input)
-        sys.exit(1)
-    contents = None
-    with open(input, 'r') as f:
-        contents = f.read()
-    new_contents = process_asm(contents)
-    with open(output, 'w') as f:
-        f.write(new_contents)
-
-
-if __name__ == '__main__':
-    main()
-
-# vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4
-# kate: tab-width: 4; replace-tabs on; indent-width 4; tab-indents: off;
-# kate: indent-mode python; remove-trailing-spaces modified;
diff --git a/external_imported/json/cmake/ci.cmake b/external_imported/json/cmake/ci.cmake
new file mode 100644
index 000000000..bbb2d4cb9
--- /dev/null
+++ b/external_imported/json/cmake/ci.cmake
@@ -0,0 +1,983 @@
+# number of parallel jobs for CTest
+set(N 10)
+
+###############################################################################
+# Needed tools.
+###############################################################################
+
+include(FindPython3)
+find_package(Python3 COMPONENTS Interpreter)
+
+find_program(ASTYLE_TOOL NAMES astyle)
+execute_process(COMMAND ${ASTYLE_TOOL} --version OUTPUT_VARIABLE ASTYLE_TOOL_VERSION ERROR_VARIABLE ASTYLE_TOOL_VERSION)
+string(REGEX MATCH "[0-9]+(\\.[0-9]+)+" ASTYLE_TOOL_VERSION "${ASTYLE_TOOL_VERSION}")
+message(STATUS "🔖 Artistic Style ${ASTYLE_TOOL_VERSION} (${ASTYLE_TOOL})")
+
+find_program(CLANG_TOOL NAMES clang++-HEAD clang++ clang++-17 clang++-16 clang++-15 clang++-14 clang++-13 clang++-12 clang++-11 clang++)
+execute_process(COMMAND ${CLANG_TOOL} --version OUTPUT_VARIABLE CLANG_TOOL_VERSION ERROR_VARIABLE CLANG_TOOL_VERSION)
+string(REGEX MATCH "[0-9]+(\\.[0-9]+)+" CLANG_TOOL_VERSION "${CLANG_TOOL_VERSION}")
+message(STATUS "🔖 Clang ${CLANG_TOOL_VERSION} (${CLANG_TOOL})")
+
+find_program(CLANG_TIDY_TOOL NAMES clang-tidy-17 clang-tidy-16 clang-tidy-15 clang-tidy-14 clang-tidy-13 clang-tidy-12 clang-tidy-11 clang-tidy)
+execute_process(COMMAND ${CLANG_TIDY_TOOL} --version OUTPUT_VARIABLE CLANG_TIDY_TOOL_VERSION ERROR_VARIABLE CLANG_TIDY_TOOL_VERSION)
+string(REGEX MATCH "[0-9]+(\\.[0-9]+)+" CLANG_TIDY_TOOL_VERSION "${CLANG_TIDY_TOOL_VERSION}")
+message(STATUS "🔖 Clang-Tidy ${CLANG_TIDY_TOOL_VERSION} (${CLANG_TIDY_TOOL})")
+
+message(STATUS "🔖 CMake ${CMAKE_VERSION} (${CMAKE_COMMAND})")
+
+find_program(CPPCHECK_TOOL NAMES cppcheck)
+execute_process(COMMAND ${CPPCHECK_TOOL} --version OUTPUT_VARIABLE CPPCHECK_TOOL_VERSION ERROR_VARIABLE CPPCHECK_TOOL_VERSION)
+string(REGEX MATCH "[0-9]+(\\.[0-9]+)+" CPPCHECK_TOOL_VERSION "${CPPCHECK_TOOL_VERSION}")
+message(STATUS "🔖 Cppcheck ${CPPCHECK_TOOL_VERSION} (${CPPCHECK_TOOL})")
+
+find_program(GCC_TOOL NAMES g++-latest g++-HEAD g++-13 g++-12 g++-11 g++-10)
+execute_process(COMMAND ${GCC_TOOL} --version OUTPUT_VARIABLE GCC_TOOL_VERSION ERROR_VARIABLE GCC_TOOL_VERSION)
+string(REGEX MATCH "[0-9]+(\\.[0-9]+)+" GCC_TOOL_VERSION "${GCC_TOOL_VERSION}")
+message(STATUS "🔖 GCC ${GCC_TOOL_VERSION} (${GCC_TOOL})")
+
+find_program(GCOV_TOOL NAMES gcov-HEAD gcov-11 gcov-10 gcov)
+execute_process(COMMAND ${GCOV_TOOL} --version OUTPUT_VARIABLE GCOV_TOOL_VERSION ERROR_VARIABLE GCOV_TOOL_VERSION)
+string(REGEX MATCH "[0-9]+(\\.[0-9]+)+" GCOV_TOOL_VERSION "${GCOV_TOOL_VERSION}")
+message(STATUS "🔖 GCOV ${GCOV_TOOL_VERSION} (${GCOV_TOOL})")
+
+find_program(GIT_TOOL NAMES git)
+execute_process(COMMAND ${GIT_TOOL} --version OUTPUT_VARIABLE GIT_TOOL_VERSION ERROR_VARIABLE GIT_TOOL_VERSION)
+string(REGEX MATCH "[0-9]+(\\.[0-9]+)+" GIT_TOOL_VERSION "${GIT_TOOL_VERSION}")
+message(STATUS "🔖 Git ${GIT_TOOL_VERSION} (${GIT_TOOL})")
+
+find_program(IWYU_TOOL NAMES include-what-you-use iwyu)
+execute_process(COMMAND ${IWYU_TOOL} --version OUTPUT_VARIABLE IWYU_TOOL_VERSION ERROR_VARIABLE IWYU_TOOL_VERSION)
+string(REGEX MATCH "[0-9]+(\\.[0-9]+)+" IWYU_TOOL_VERSION "${IWYU_TOOL_VERSION}")
+message(STATUS "🔖 include-what-you-use ${IWYU_TOOL_VERSION} (${IWYU_TOOL})")
+
+find_program(INFER_TOOL NAMES infer)
+execute_process(COMMAND ${INFER_TOOL} --version OUTPUT_VARIABLE INFER_TOOL_VERSION ERROR_VARIABLE INFER_TOOL_VERSION)
+string(REGEX MATCH "[0-9]+(\\.[0-9]+)+" INFER_TOOL_VERSION "${INFER_TOOL_VERSION}")
+message(STATUS "🔖 Infer ${INFER_TOOL_VERSION} (${INFER_TOOL})")
+
+find_program(LCOV_TOOL NAMES lcov)
+execute_process(COMMAND ${LCOV_TOOL} --version OUTPUT_VARIABLE LCOV_TOOL_VERSION ERROR_VARIABLE LCOV_TOOL_VERSION)
+string(REGEX MATCH "[0-9]+(\\.[0-9]+)+" LCOV_TOOL_VERSION "${LCOV_TOOL_VERSION}")
+message(STATUS "🔖 LCOV ${LCOV_TOOL_VERSION} (${LCOV_TOOL})")
+
+find_program(NINJA_TOOL NAMES ninja)
+execute_process(COMMAND ${NINJA_TOOL} --version OUTPUT_VARIABLE NINJA_TOOL_VERSION ERROR_VARIABLE NINJA_TOOL_VERSION)
+string(REGEX MATCH "[0-9]+(\\.[0-9]+)+" NINJA_TOOL_VERSION "${NINJA_TOOL_VERSION}")
+message(STATUS "🔖 Ninja ${NINJA_TOOL_VERSION} (${NINJA_TOOL})")
+
+find_program(OCLINT_TOOL NAMES oclint-json-compilation-database)
+find_program(OCLINT_VERSION_TOOL NAMES oclint)
+execute_process(COMMAND ${OCLINT_VERSION_TOOL} --version OUTPUT_VARIABLE OCLINT_TOOL_VERSION ERROR_VARIABLE OCLINT_TOOL_VERSION)
+string(REGEX MATCH "[0-9]+(\\.[0-9]+)+" OCLINT_TOOL_VERSION "${OCLINT_TOOL_VERSION}")
+message(STATUS "🔖 OCLint ${OCLINT_TOOL_VERSION} (${OCLINT_TOOL})")
+
+find_program(VALGRIND_TOOL NAMES valgrind)
+execute_process(COMMAND ${VALGRIND_TOOL} --version OUTPUT_VARIABLE VALGRIND_TOOL_VERSION ERROR_VARIABLE VALGRIND_TOOL_VERSION)
+string(REGEX MATCH "[0-9]+(\\.[0-9]+)+" VALGRIND_TOOL_VERSION "${VALGRIND_TOOL_VERSION}")
+message(STATUS "🔖 Valgrind ${VALGRIND_TOOL_VERSION} (${VALGRIND_TOOL})")
+
+find_program(GENHTML_TOOL NAMES genhtml)
+find_program(PLOG_CONVERTER_TOOL NAMES plog-converter)
+find_program(PVS_STUDIO_ANALYZER_TOOL NAMES pvs-studio-analyzer)
+find_program(SCAN_BUILD_TOOL NAMES scan-build-15 scan-build-14 scan-build-13 scan-build-12 scan-build-11 scan-build)
+
+# the individual source files
+file(GLOB_RECURSE SRC_FILES ${PROJECT_SOURCE_DIR}/include/nlohmann/*.hpp)
+
+###############################################################################
+# Thorough check with recent compilers
+###############################################################################
+
+# Ignored Clang warnings:
+# -Wno-c++98-compat               The library targets C++11.
+# -Wno-c++98-compat-pedantic      The library targets C++11.
+# -Wno-deprecated-declarations    The library contains annotations for deprecated functions.
+# -Wno-extra-semi-stmt            The library uses std::assert which triggers this warning.
+# -Wno-padded                     We do not care about padding warnings.
+# -Wno-covered-switch-default     All switches list all cases and a default case.
+# -Wno-unsafe-buffer-usage        Otherwise Doctest would not compile.
+# -Wno-weak-vtables               The library is header-only.
+# -Wreserved-identifier           See https://github.com/onqtam/doctest/issues/536.
+
+set(CLANG_CXXFLAGS
+    -Werror
+    -Weverything
+    -Wno-c++98-compat
+    -Wno-c++98-compat-pedantic
+    -Wno-deprecated-declarations
+    -Wno-extra-semi-stmt
+    -Wno-padded
+    -Wno-covered-switch-default
+    -Wno-unsafe-buffer-usage
+    -Wno-weak-vtables
+    -Wno-reserved-identifier
+)
+
+# Warning flags determined for GCC 13.0 (experimental) with https://github.com/nlohmann/gcc_flags:
+# Ignored GCC warnings:
+# -Wno-abi-tag                    We do not care about ABI tags.
+# -Wno-aggregate-return           The library uses aggregate returns.
+# -Wno-long-long                  The library uses the long long type to interface with system functions.
+# -Wno-namespaces                 The library uses namespaces.
+# -Wno-padded                     We do not care about padding warnings.
+# -Wno-system-headers             We do not care about warnings in system headers.
+# -Wno-templates                  The library uses templates.
+
+set(GCC_CXXFLAGS
+    -pedantic
+    -Werror
+    --all-warnings
+    --extra-warnings
+    -W
+    -WNSObject-attribute
+    -Wno-abi-tag
+    -Waddress
+    -Waddress-of-packed-member
+    -Wno-aggregate-return
+    -Waggressive-loop-optimizations
+    -Waligned-new=all
+    -Wall
+    -Walloc-zero
+    -Walloca
+    -Wanalyzer-double-fclose
+    -Wanalyzer-double-free
+    -Wanalyzer-exposure-through-output-file
+    -Wanalyzer-file-leak
+    -Wanalyzer-free-of-non-heap
+    -Wanalyzer-malloc-leak
+    -Wanalyzer-mismatching-deallocation
+    -Wanalyzer-null-argument
+    -Wanalyzer-null-dereference
+    -Wanalyzer-possible-null-argument
+    -Wanalyzer-possible-null-dereference
+    -Wanalyzer-shift-count-negative
+    -Wanalyzer-shift-count-overflow
+    -Wanalyzer-stale-setjmp-buffer
+    -Wanalyzer-tainted-allocation-size
+    -Wanalyzer-tainted-array-index
+    -Wanalyzer-tainted-divisor
+    -Wanalyzer-tainted-offset
+    -Wanalyzer-tainted-size
+    -Wanalyzer-too-complex
+    -Wanalyzer-unsafe-call-within-signal-handler
+    -Wanalyzer-use-after-free
+    -Wanalyzer-use-of-pointer-in-stale-stack-frame
+    -Wanalyzer-use-of-uninitialized-value
+    -Wanalyzer-va-arg-type-mismatch
+    -Wanalyzer-va-list-exhausted
+    -Wanalyzer-va-list-leak
+    -Wanalyzer-va-list-use-after-va-end
+    -Wanalyzer-write-to-const
+    -Wanalyzer-write-to-string-literal
+    -Warith-conversion
+    -Warray-bounds=2
+    -Warray-compare
+    -Warray-parameter=2
+    -Wattribute-alias=2
+    -Wattribute-warning
+    -Wattributes
+    -Wbool-compare
+    -Wbool-operation
+    -Wbuiltin-declaration-mismatch
+    -Wbuiltin-macro-redefined
+    -Wc++0x-compat
+    -Wc++11-compat
+    -Wc++11-extensions
+    -Wc++14-compat
+    -Wc++14-extensions
+    -Wc++17-compat
+    -Wc++17-extensions
+    -Wc++1z-compat
+    -Wc++20-compat
+    -Wc++20-extensions
+    -Wc++23-extensions
+    -Wc++2a-compat
+    -Wcannot-profile
+    -Wcast-align
+    -Wcast-align=strict
+    -Wcast-function-type
+    -Wcast-qual
+    -Wcatch-value=3
+    -Wchar-subscripts
+    -Wclass-conversion
+    -Wclass-memaccess
+    -Wclobbered
+    -Wcomma-subscript
+    -Wcomment
+    -Wcomments
+    -Wconditionally-supported
+    -Wconversion
+    -Wconversion-null
+    -Wcoverage-invalid-line-number
+    -Wcoverage-mismatch
+    -Wcpp
+    -Wctad-maybe-unsupported
+    -Wctor-dtor-privacy
+    -Wdangling-else
+    -Wdangling-pointer=2
+    -Wdate-time
+    -Wdelete-incomplete
+    -Wdelete-non-virtual-dtor
+    -Wdeprecated
+    -Wdeprecated-copy
+    -Wdeprecated-copy-dtor
+    -Wdeprecated-declarations
+    -Wdeprecated-enum-enum-conversion
+    -Wdeprecated-enum-float-conversion
+    -Wdisabled-optimization
+    -Wdiv-by-zero
+    -Wdouble-promotion
+    -Wduplicated-branches
+    -Wduplicated-cond
+    -Weffc++
+    -Wempty-body
+    -Wendif-labels
+    -Wenum-compare
+    -Wenum-conversion
+    -Wexceptions
+    -Wexpansion-to-defined
+    -Wextra
+    -Wextra-semi
+    -Wfloat-conversion
+    -Wfloat-equal
+    -Wformat-diag
+    -Wformat-overflow=2
+    -Wformat-signedness
+    -Wformat-truncation=2
+    -Wformat=2
+    -Wframe-address
+    -Wfree-nonheap-object
+    -Whsa
+    -Wif-not-aligned
+    -Wignored-attributes
+    -Wignored-qualifiers
+    -Wimplicit-fallthrough=5
+    -Winaccessible-base
+    -Winfinite-recursion
+    -Winherited-variadic-ctor
+    -Winit-list-lifetime
+    -Winit-self
+    -Winline
+    -Wint-in-bool-context
+    -Wint-to-pointer-cast
+    -Winterference-size
+    -Winvalid-imported-macros
+    -Winvalid-memory-model
+    -Winvalid-offsetof
+    -Winvalid-pch
+    -Wliteral-suffix
+    -Wlogical-not-parentheses
+    -Wlogical-op
+    -Wno-long-long
+    -Wlto-type-mismatch
+    -Wmain
+    -Wmaybe-uninitialized
+    -Wmemset-elt-size
+    -Wmemset-transposed-args
+    -Wmisleading-indentation
+    -Wmismatched-dealloc
+    -Wmismatched-new-delete
+    -Wmismatched-tags
+    -Wmissing-attributes
+    -Wmissing-braces
+    -Wmissing-declarations
+    -Wmissing-field-initializers
+    -Wmissing-include-dirs
+    -Wmissing-profile
+    -Wmissing-requires
+    -Wmissing-template-keyword
+    -Wmultichar
+    -Wmultiple-inheritance
+    -Wmultistatement-macros
+    -Wno-namespaces
+    -Wnarrowing
+    -Wnoexcept
+    -Wnoexcept-type
+    -Wnon-template-friend
+    -Wnon-virtual-dtor
+    -Wnonnull
+    -Wnonnull-compare
+    -Wnormalized=nfkc
+    -Wnull-dereference
+    -Wodr
+    -Wold-style-cast
+    -Wopenacc-parallelism
+    -Wopenmp-simd
+    -Woverflow
+    -Woverlength-strings
+    -Woverloaded-virtual
+    -Wpacked
+    -Wpacked-bitfield-compat
+    -Wpacked-not-aligned
+    -Wno-padded
+    -Wparentheses
+    -Wpedantic
+    -Wpessimizing-move
+    -Wplacement-new=2
+    -Wpmf-conversions
+    -Wpointer-arith
+    -Wpointer-compare
+    -Wpragmas
+    -Wprio-ctor-dtor
+    -Wpsabi
+    -Wrange-loop-construct
+    -Wredundant-decls
+    -Wredundant-move
+    -Wredundant-tags
+    -Wregister
+    -Wreorder
+    -Wrestrict
+    -Wreturn-local-addr
+    -Wreturn-type
+    -Wscalar-storage-order
+    -Wsequence-point
+    -Wshadow=compatible-local
+    -Wshadow=global
+    -Wshadow=local
+    -Wshift-count-negative
+    -Wshift-count-overflow
+    -Wshift-negative-value
+    -Wshift-overflow=2
+    -Wsign-compare
+    -Wsign-conversion
+    -Wsign-promo
+    -Wsized-deallocation
+    -Wsizeof-array-argument
+    -Wsizeof-array-div
+    -Wsizeof-pointer-div
+    -Wsizeof-pointer-memaccess
+    -Wstack-protector
+    -Wstrict-aliasing=3
+    -Wstrict-null-sentinel
+    -Wno-strict-overflow
+    -Wstring-compare
+    -Wstringop-overflow=4
+    -Wstringop-overread
+    -Wstringop-truncation
+    -Wsubobject-linkage
+    -Wsuggest-attribute=cold
+    -Wsuggest-attribute=const
+    -Wsuggest-attribute=format
+    -Wsuggest-attribute=malloc
+    -Wsuggest-attribute=noreturn
+    -Wsuggest-attribute=pure
+    -Wsuggest-final-methods
+    -Wsuggest-final-types
+    -Wsuggest-override
+    -Wswitch
+    -Wswitch-bool
+    -Wswitch-default
+    -Wswitch-enum
+    -Wswitch-outside-range
+    -Wswitch-unreachable
+    -Wsync-nand
+    -Wsynth
+    -Wno-system-headers
+    -Wtautological-compare
+    -Wno-templates
+    -Wterminate
+    -Wtrampolines
+    -Wtrigraphs
+    -Wtrivial-auto-var-init
+    -Wtsan
+    -Wtype-limits
+    -Wundef
+    -Wuninitialized
+    -Wunknown-pragmas
+    -Wunreachable-code
+    -Wunsafe-loop-optimizations
+    -Wunused
+    -Wunused-but-set-parameter
+    -Wunused-but-set-variable
+    -Wunused-const-variable=2
+    -Wunused-function
+    -Wunused-label
+    -Wunused-local-typedefs
+    -Wunused-macros
+    -Wunused-parameter
+    -Wunused-result
+    -Wunused-value
+    -Wunused-variable
+    -Wuse-after-free=3
+    -Wuseless-cast
+    -Wvarargs
+    -Wvariadic-macros
+    -Wvector-operation-performance
+    -Wvexing-parse
+    -Wvirtual-inheritance
+    -Wvirtual-move-assign
+    -Wvla
+    -Wvla-parameter
+    -Wvolatile
+    -Wvolatile-register-var
+    -Wwrite-strings
+    -Wzero-as-null-pointer-constant
+    -Wzero-length-bounds
+)
+
+add_custom_target(ci_test_gcc
+    COMMAND CXX=${GCC_TOOL} CXXFLAGS="${GCC_CXXFLAGS}" ${CMAKE_COMMAND}
+        -DCMAKE_BUILD_TYPE=Debug -GNinja
+        -DJSON_BuildTests=ON
+        -S${PROJECT_SOURCE_DIR} -B${PROJECT_BINARY_DIR}/build_gcc
+    COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR}/build_gcc
+    COMMAND cd ${PROJECT_BINARY_DIR}/build_gcc && ${CMAKE_CTEST_COMMAND} --parallel ${N} --output-on-failure
+    COMMENT "Compile and test with GCC using maximal warning flags"
+)
+
+add_custom_target(ci_test_clang
+    COMMAND CXX=${CLANG_TOOL} CXXFLAGS="${CLANG_CXXFLAGS}" ${CMAKE_COMMAND}
+        -DCMAKE_BUILD_TYPE=Debug -GNinja
+        -DJSON_BuildTests=ON
+        -S${PROJECT_SOURCE_DIR} -B${PROJECT_BINARY_DIR}/build_clang
+    COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR}/build_clang
+    COMMAND cd ${PROJECT_BINARY_DIR}/build_clang && ${CMAKE_CTEST_COMMAND} --parallel ${N} --output-on-failure
+    COMMENT "Compile and test with Clang using maximal warning flags"
+)
+
+###############################################################################
+# Different C++ Standards.
+###############################################################################
+
+foreach(CXX_STANDARD 11 14 17 20 23)
+    add_custom_target(ci_test_gcc_cxx${CXX_STANDARD}
+        COMMAND CXX=${GCC_TOOL} CXXFLAGS="${GCC_CXXFLAGS}" ${CMAKE_COMMAND}
+            -DCMAKE_BUILD_TYPE=Debug -GNinja
+            -DJSON_BuildTests=ON -DJSON_FastTests=ON
+            -DJSON_TestStandards=${CXX_STANDARD}
+            -S${PROJECT_SOURCE_DIR} -B${PROJECT_BINARY_DIR}/build_gcc_cxx${CXX_STANDARD}
+        COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR}/build_gcc_cxx${CXX_STANDARD}
+        COMMAND cd ${PROJECT_BINARY_DIR}/build_gcc_cxx${CXX_STANDARD} && ${CMAKE_CTEST_COMMAND} --parallel ${N} --output-on-failure
+        COMMENT "Compile and test with GCC for C++${CXX_STANDARD}"
+    )
+
+    add_custom_target(ci_test_clang_cxx${CXX_STANDARD}
+        COMMAND CXX=${CLANG_TOOL} CXXFLAGS="${CLANG_CXXFLAGS}" ${CMAKE_COMMAND}
+            -DCMAKE_BUILD_TYPE=Debug -GNinja
+            -DJSON_BuildTests=ON -DJSON_FastTests=ON
+            -DJSON_TestStandards=${CXX_STANDARD}
+            -S${PROJECT_SOURCE_DIR} -B${PROJECT_BINARY_DIR}/build_clang_cxx${CXX_STANDARD}
+        COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR}/build_clang_cxx${CXX_STANDARD}
+        COMMAND cd ${PROJECT_BINARY_DIR}/build_clang_cxx${CXX_STANDARD} && ${CMAKE_CTEST_COMMAND} --parallel ${N} --output-on-failure
+        COMMENT "Compile and test with Clang for C++${CXX_STANDARD}"
+    )
+endforeach()
+
+###############################################################################
+# Disable exceptions.
+###############################################################################
+
+add_custom_target(ci_test_noexceptions
+    COMMAND ${CMAKE_COMMAND}
+    -DCMAKE_BUILD_TYPE=Debug -GNinja
+    -DJSON_BuildTests=ON -DCMAKE_CXX_FLAGS=-DJSON_NOEXCEPTION -DDOCTEST_TEST_FILTER=--no-throw
+    -S${PROJECT_SOURCE_DIR} -B${PROJECT_BINARY_DIR}/build_noexceptions
+    COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR}/build_noexceptions
+    COMMAND cd ${PROJECT_BINARY_DIR}/build_noexceptions && ${CMAKE_CTEST_COMMAND} --parallel ${N} --output-on-failure
+    COMMENT "Compile and test with exceptions switched off"
+)
+
+###############################################################################
+# Disable implicit conversions.
+###############################################################################
+
+add_custom_target(ci_test_noimplicitconversions
+    COMMAND ${CMAKE_COMMAND}
+    -DCMAKE_BUILD_TYPE=Debug -GNinja
+    -DJSON_BuildTests=ON -DJSON_ImplicitConversions=OFF
+    -S${PROJECT_SOURCE_DIR} -B${PROJECT_BINARY_DIR}/build_noimplicitconversions
+    COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR}/build_noimplicitconversions
+    COMMAND cd ${PROJECT_BINARY_DIR}/build_noimplicitconversions && ${CMAKE_CTEST_COMMAND} --parallel ${N} --output-on-failure
+    COMMENT "Compile and test with implicit conversions switched off"
+)
+
+###############################################################################
+# Enable improved diagnostics.
+###############################################################################
+
+add_custom_target(ci_test_diagnostics
+    COMMAND ${CMAKE_COMMAND}
+    -DCMAKE_BUILD_TYPE=Debug -GNinja
+    -DJSON_BuildTests=ON -DJSON_Diagnostics=ON
+    -S${PROJECT_SOURCE_DIR} -B${PROJECT_BINARY_DIR}/build_diagnostics
+    COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR}/build_diagnostics
+    COMMAND cd ${PROJECT_BINARY_DIR}/build_diagnostics && ${CMAKE_CTEST_COMMAND} --parallel ${N} --output-on-failure
+    COMMENT "Compile and test with improved diagnostics enabled"
+)
+
+###############################################################################
+# Enable legacy discarded value comparison.
+###############################################################################
+
+add_custom_target(ci_test_legacycomparison
+    COMMAND ${CMAKE_COMMAND}
+    -DCMAKE_BUILD_TYPE=Debug -GNinja
+    -DJSON_BuildTests=ON -DJSON_LegacyDiscardedValueComparison=ON
+    -S${PROJECT_SOURCE_DIR} -B${PROJECT_BINARY_DIR}/build_legacycomparison
+    COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR}/build_legacycomparison
+    COMMAND cd ${PROJECT_BINARY_DIR}/build_legacycomparison && ${CMAKE_CTEST_COMMAND} --parallel ${N} --output-on-failure
+    COMMENT "Compile and test with legacy discarded value comparison enabled"
+)
+
+###############################################################################
+# Disable global UDLs.
+###############################################################################
+
+add_custom_target(ci_test_noglobaludls
+    COMMAND ${CMAKE_COMMAND}
+    -DCMAKE_BUILD_TYPE=Debug -GNinja
+    -DJSON_BuildTests=ON -DJSON_FastTests=ON -DJSON_GlobalUDLs=OFF
+    -DCMAKE_CXX_FLAGS=-DJSON_TEST_NO_GLOBAL_UDLS
+    -S${PROJECT_SOURCE_DIR} -B${PROJECT_BINARY_DIR}/build_noglobaludls
+    COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR}/build_noglobaludls
+    COMMAND cd ${PROJECT_BINARY_DIR}/build_noglobaludls && ${CMAKE_CTEST_COMMAND} --parallel ${N} --output-on-failure
+    COMMENT "Compile and test with global UDLs disabled"
+)
+
+###############################################################################
+# Coverage.
+###############################################################################
+
+add_custom_target(ci_test_coverage
+    COMMAND CXX=g++ ${CMAKE_COMMAND}
+        -DCMAKE_BUILD_TYPE=Debug -GNinja -DCMAKE_CXX_FLAGS="--coverage;-fprofile-arcs;-ftest-coverage"
+        -DJSON_BuildTests=ON
+        -S${PROJECT_SOURCE_DIR} -B${PROJECT_BINARY_DIR}/build_coverage
+    COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR}/build_coverage
+    COMMAND cd ${PROJECT_BINARY_DIR}/build_coverage && ${CMAKE_CTEST_COMMAND} --parallel ${N} --output-on-failure
+
+    COMMAND CXX=g++ ${CMAKE_COMMAND}
+        -DCMAKE_BUILD_TYPE=Debug -GNinja -DCMAKE_CXX_FLAGS="-m32;--coverage;-fprofile-arcs;-ftest-coverage"
+        -DJSON_BuildTests=ON -DJSON_32bitTest=ONLY
+        -S${PROJECT_SOURCE_DIR} -B${PROJECT_BINARY_DIR}/build_coverage32
+    COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR}/build_coverage32
+    COMMAND cd ${PROJECT_BINARY_DIR}/build_coverage32 && ${CMAKE_CTEST_COMMAND} --parallel ${N} --output-on-failure
+
+    COMMAND ${LCOV_TOOL} --directory . --capture --output-file json.info --rc lcov_branch_coverage=1
+    COMMAND ${LCOV_TOOL} -e json.info ${SRC_FILES} --output-file json.info.filtered --rc lcov_branch_coverage=1
+    COMMAND ${CMAKE_SOURCE_DIR}/tests/thirdparty/imapdl/filterbr.py json.info.filtered > json.info.filtered.noexcept
+    COMMAND genhtml --title "JSON for Modern C++" --legend --demangle-cpp --output-directory html --show-details --branch-coverage json.info.filtered.noexcept
+
+    COMMENT "Compile and test with coverage"
+)
+
+###############################################################################
+# Sanitizers.
+###############################################################################
+
+set(CLANG_CXX_FLAGS_SANITIZER "-g -O1 -fsanitize=address -fsanitize=undefined -fsanitize=integer -fsanitize=nullability -fno-omit-frame-pointer -fno-sanitize-recover=all -fno-sanitize=unsigned-integer-overflow -fno-sanitize=unsigned-shift-base")
+
+add_custom_target(ci_test_clang_sanitizer
+    COMMAND CXX=${CLANG_TOOL} CXXFLAGS=${CLANG_CXX_FLAGS_SANITIZER} ${CMAKE_COMMAND}
+        -DCMAKE_BUILD_TYPE=Debug -GNinja
+        -DJSON_BuildTests=ON
+        -S${PROJECT_SOURCE_DIR} -B${PROJECT_BINARY_DIR}/build_clang_sanitizer
+    COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR}/build_clang_sanitizer
+    COMMAND cd ${PROJECT_BINARY_DIR}/build_clang_sanitizer && ${CMAKE_CTEST_COMMAND} --parallel ${N} --output-on-failure
+    COMMENT "Compile and test with sanitizers"
+)
+
+###############################################################################
+# Check if header is amalgamated and sources are properly indented.
+###############################################################################
+
+set(ASTYLE_FLAGS --style=allman --indent=spaces=4 --indent-modifiers --indent-switches --indent-preproc-block --indent-preproc-define --indent-col1-comments --pad-oper --pad-header --align-pointer=type --align-reference=type --add-brackets --convert-tabs --close-templates --lineend=linux --preserve-date --formatted)
+
+file(GLOB_RECURSE INDENT_FILES
+    ${PROJECT_SOURCE_DIR}/include/nlohmann/*.hpp
+        ${PROJECT_SOURCE_DIR}/tests/src/*.cpp
+        ${PROJECT_SOURCE_DIR}/tests/src/*.hpp
+        ${PROJECT_SOURCE_DIR}/tests/benchmarks/src/benchmarks.cpp
+    ${PROJECT_SOURCE_DIR}/docs/examples/*.cpp
+)
+
+set(include_dir ${PROJECT_SOURCE_DIR}/single_include/nlohmann)
+set(tool_dir ${PROJECT_SOURCE_DIR}/tools/amalgamate)
+add_custom_target(ci_test_amalgamation
+    COMMAND rm -fr ${include_dir}/json.hpp~ ${include_dir}/json_fwd.hpp~
+    COMMAND cp ${include_dir}/json.hpp ${include_dir}/json.hpp~
+    COMMAND cp ${include_dir}/json_fwd.hpp ${include_dir}/json_fwd.hpp~
+
+    COMMAND ${Python3_EXECUTABLE} ${tool_dir}/amalgamate.py -c ${tool_dir}/config_json.json -s .
+    COMMAND ${Python3_EXECUTABLE} ${tool_dir}/amalgamate.py -c ${tool_dir}/config_json_fwd.json -s .
+    COMMAND ${ASTYLE_TOOL} ${ASTYLE_FLAGS} --suffix=none --quiet ${include_dir}/json.hpp ${include_dir}/json_fwd.hpp
+
+    COMMAND diff ${include_dir}/json.hpp~ ${include_dir}/json.hpp
+    COMMAND diff ${include_dir}/json_fwd.hpp~ ${include_dir}/json_fwd.hpp
+
+    COMMAND ${ASTYLE_TOOL} ${ASTYLE_FLAGS} ${INDENT_FILES}
+    COMMAND for FILE in `find . -name '*.orig'`\; do false \; done
+
+    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+    COMMENT "Check amalgamation and indentation"
+)
+
+###############################################################################
+# Build and test using the amalgamated header
+###############################################################################
+
+add_custom_target(ci_test_single_header
+    COMMAND CXX=${GCC_TOOL} CXXFLAGS="${GCC_CXXFLAGS}" ${CMAKE_COMMAND}
+        -DCMAKE_BUILD_TYPE=Debug -GNinja
+        -DJSON_BuildTests=ON -DJSON_MultipleHeaders=OFF -DJSON_FastTests=ON
+        -S${PROJECT_SOURCE_DIR} -B${PROJECT_BINARY_DIR}/build_single_header
+    COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR}/build_single_header
+    COMMAND cd ${PROJECT_BINARY_DIR}/build_single_header && ${CMAKE_CTEST_COMMAND} --parallel ${N} --output-on-failure
+    COMMENT "Compile and test single-header version"
+)
+
+###############################################################################
+# Valgrind.
+###############################################################################
+
+add_custom_target(ci_test_valgrind
+    COMMAND CXX=${GCC_TOOL} ${CMAKE_COMMAND}
+        -DCMAKE_BUILD_TYPE=Debug -GNinja
+        -DJSON_BuildTests=ON -DJSON_Valgrind=ON
+        -S${PROJECT_SOURCE_DIR} -B${PROJECT_BINARY_DIR}/build_valgrind
+    COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR}/build_valgrind
+    COMMAND cd ${PROJECT_BINARY_DIR}/build_valgrind && ${CMAKE_CTEST_COMMAND} -L valgrind --parallel ${N} --output-on-failure
+    COMMENT "Compile and test with Valgrind"
+)
+
+###############################################################################
+# Check code with Clang Static Analyzer.
+###############################################################################
+
+set(CLANG_ANALYZER_CHECKS "fuchsia.HandleChecker,nullability.NullableDereferenced,nullability.NullablePassedToNonnull,nullability.NullableReturnedFromNonnull,optin.cplusplus.UninitializedObject,optin.cplusplus.VirtualCall,optin.mpi.MPI-Checker,optin.osx.OSObjectCStyleCast,optin.osx.cocoa.localizability.EmptyLocalizationContextChecker,optin.osx.cocoa.localizability.NonLocalizedStringChecker,optin.performance.GCDAntipattern,optin.performance.Padding,optin.portability.UnixAPI,security.FloatLoopCounter,security.insecureAPI.DeprecatedOrUnsafeBufferHandling,security.insecureAPI.bcmp,security.insecureAPI.bcopy,security.insecureAPI.bzero,security.insecureAPI.rand,security.insecureAPI.strcpy,valist.CopyToSelf,valist.Uninitialized,valist.Unterminated,webkit.NoUncountedMemberChecker,webkit.RefCntblBaseVirtualDtor,core.CallAndMessage,core.DivideZero,core.NonNullParamChecker,core.NullDereference,core.StackAddressEscape,core.UndefinedBinaryOperatorResult,core.VLASize,core.uninitialized.ArraySubscript,core.uninitialized.Assign,core.uninitialized.Branch,core.uninitialized.CapturedBlockVariable,core.uninitialized.UndefReturn,cplusplus.InnerPointer,cplusplus.Move,cplusplus.NewDelete,cplusplus.NewDeleteLeaks,cplusplus.PlacementNew,cplusplus.PureVirtualCall,deadcode.DeadStores,nullability.NullPassedToNonnull,nullability.NullReturnedFromNonnull,osx.API,osx.MIG,osx.NumberObjectConversion,osx.OSObjectRetainCount,osx.ObjCProperty,osx.SecKeychainAPI,osx.cocoa.AtSync,osx.cocoa.AutoreleaseWrite,osx.cocoa.ClassRelease,osx.cocoa.Dealloc,osx.cocoa.IncompatibleMethodTypes,osx.cocoa.Loops,osx.cocoa.MissingSuperCall,osx.cocoa.NSAutoreleasePool,osx.cocoa.NSError,osx.cocoa.NilArg,osx.cocoa.NonNilReturnValue,osx.cocoa.ObjCGenerics,osx.cocoa.RetainCount,osx.cocoa.RunLoopAutoreleaseLeak,osx.cocoa.SelfInit,osx.cocoa.SuperDealloc,osx.cocoa.UnusedIvars,osx.cocoa.VariadicMethodTypes,osx.coreFoundation.CFError,osx.coreFoundation.CFNumber,osx.coreFoundation.CFRetainRelease,osx.coreFoundation.containers.OutOfBounds,osx.coreFoundation.containers.PointerSizedValues,security.insecureAPI.UncheckedReturn,security.insecureAPI.decodeValueOfObjCType,security.insecureAPI.getpw,security.insecureAPI.gets,security.insecureAPI.mkstemp,security.insecureAPI.mktemp,security.insecureAPI.vfork,unix.API,unix.Malloc,unix.MallocSizeof,unix.MismatchedDeallocator,unix.Vfork,unix.cstring.BadSizeArg,unix.cstring.NullArg")
+
+add_custom_target(ci_clang_analyze
+    COMMAND CXX=${CLANG_TOOL} ${CMAKE_COMMAND}
+        -DCMAKE_BUILD_TYPE=Debug -GNinja
+        -DJSON_BuildTests=ON
+        -S${PROJECT_SOURCE_DIR} -B${PROJECT_BINARY_DIR}/build_clang_analyze
+    COMMAND cd ${PROJECT_BINARY_DIR}/build_clang_analyze && ${SCAN_BUILD_TOOL} -enable-checker ${CLANG_ANALYZER_CHECKS} --use-c++=${CLANG_TOOL} -analyze-headers -o ${PROJECT_BINARY_DIR}/report ninja
+    COMMENT "Check code with Clang Analyzer"
+)
+
+###############################################################################
+# Check code with Cppcheck.
+###############################################################################
+
+add_custom_target(ci_cppcheck
+    COMMAND ${CPPCHECK_TOOL} --enable=warning --suppress=missingReturn --inline-suppr --inconclusive --force --std=c++11 ${PROJECT_SOURCE_DIR}/single_include/nlohmann/json.hpp --error-exitcode=1
+    COMMENT "Check code with Cppcheck"
+)
+
+###############################################################################
+# Check code with cpplint.
+###############################################################################
+
+add_custom_target(ci_cpplint
+    COMMAND ${Python3_EXECUTABLE} -mvenv venv_cpplint
+    COMMAND venv_cpplint/bin/pip3 --quiet install cpplint
+    COMMAND venv_cpplint/bin/cpplint --filter=-whitespace,-legal,-runtime/references,-runtime/explicit,-runtime/indentation_namespace,-readability/casting,-readability/nolint --quiet --recursive ${SRC_FILES}
+    COMMENT "Check code with cpplint"
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+)
+
+###############################################################################
+# Check code with OCLint.
+###############################################################################
+
+file(COPY ${PROJECT_SOURCE_DIR}/single_include/nlohmann/json.hpp DESTINATION ${PROJECT_BINARY_DIR}/src_single)
+file(RENAME ${PROJECT_BINARY_DIR}/src_single/json.hpp ${PROJECT_BINARY_DIR}/src_single/all.cpp)
+file(APPEND "${PROJECT_BINARY_DIR}/src_single/all.cpp" "\n\nint main()\n{}\n")
+
+add_executable(single_all ${PROJECT_BINARY_DIR}/src_single/all.cpp)
+target_compile_features(single_all PRIVATE cxx_std_11)
+
+add_custom_target(ci_oclint
+    COMMAND ${CMAKE_COMMAND}
+        -DCMAKE_BUILD_TYPE=Debug
+        -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
+        -DJSON_BuildTests=OFF -DJSON_CI=ON
+        -S${PROJECT_SOURCE_DIR} -B${PROJECT_BINARY_DIR}/build_oclint
+    COMMAND ${OCLINT_TOOL} -i ${PROJECT_BINARY_DIR}/build_oclint/src_single/all.cpp -p ${PROJECT_BINARY_DIR}/build_oclint --
+        -report-type html -enable-global-analysis --max-priority-1=0 --max-priority-2=1000 --max-priority-3=2000
+        --disable-rule=MultipleUnaryOperator
+        --disable-rule=DoubleNegative
+        --disable-rule=ShortVariableName
+        --disable-rule=GotoStatement
+        --disable-rule=LongLine
+        -o ${PROJECT_BINARY_DIR}/build_oclint/oclint_report.html
+    COMMENT "Check code with OCLint"
+)
+
+###############################################################################
+# Check code with Clang-Tidy.
+###############################################################################
+
+add_custom_target(ci_clang_tidy
+    COMMAND CXX=${CLANG_TOOL} ${CMAKE_COMMAND}
+        -DCMAKE_BUILD_TYPE=Debug -GNinja
+        -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_CXX_CLANG_TIDY=${CLANG_TIDY_TOOL}
+        -DJSON_BuildTests=ON
+        -S${PROJECT_SOURCE_DIR} -B${PROJECT_BINARY_DIR}/build_clang_tidy
+    COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR}/build_clang_tidy
+    COMMENT "Check code with Clang-Tidy"
+)
+
+###############################################################################
+# Check code with PVS-Studio Analyzer <https://www.viva64.com/en/pvs-studio/>.
+###############################################################################
+
+add_custom_target(ci_pvs_studio
+    COMMAND CXX=${CLANG_TOOL} ${CMAKE_COMMAND}
+        -DCMAKE_BUILD_TYPE=Debug
+        -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
+        -DJSON_BuildTests=ON
+        -S${PROJECT_SOURCE_DIR} -B${PROJECT_BINARY_DIR}/build_pvs_studio
+    COMMAND cd ${PROJECT_BINARY_DIR}/build_pvs_studio && ${PVS_STUDIO_ANALYZER_TOOL} analyze -j 10
+    COMMAND cd ${PROJECT_BINARY_DIR}/build_pvs_studio && ${PLOG_CONVERTER_TOOL} -a'GA:1,2;64:1;CS' -t fullhtml PVS-Studio.log -o pvs
+    COMMENT "Check code with PVS Studio"
+)
+
+###############################################################################
+# Check code with Infer <https://fbinfer.com> static analyzer.
+###############################################################################
+
+add_custom_target(ci_infer
+    COMMAND mkdir -p ${PROJECT_BINARY_DIR}/build_infer
+    COMMAND cd ${PROJECT_BINARY_DIR}/build_infer && ${INFER_TOOL} compile -- ${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE=Debug ${PROJECT_SOURCE_DIR} -DJSON_BuildTests=ON
+    COMMAND cd ${PROJECT_BINARY_DIR}/build_infer && ${INFER_TOOL} run -- make
+    COMMENT "Check code with Infer"
+)
+
+###############################################################################
+# Run test suite with previously downloaded test data.
+###############################################################################
+
+add_custom_target(ci_offline_testdata
+    COMMAND mkdir -p ${PROJECT_BINARY_DIR}/build_offline_testdata/test_data
+    COMMAND cd ${PROJECT_BINARY_DIR}/build_offline_testdata/test_data && ${GIT_TOOL} clone -c advice.detachedHead=false --branch v3.1.0 https://github.com/nlohmann/json_test_data.git --quiet --depth 1
+    COMMAND ${CMAKE_COMMAND}
+        -DCMAKE_BUILD_TYPE=Debug -GNinja
+        -DJSON_BuildTests=ON -DJSON_FastTests=ON -DJSON_TestDataDirectory=${PROJECT_BINARY_DIR}/build_offline_testdata/test_data/json_test_data
+        -S${PROJECT_SOURCE_DIR} -B${PROJECT_BINARY_DIR}/build_offline_testdata
+    COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR}/build_offline_testdata
+    COMMAND cd ${PROJECT_BINARY_DIR}/build_offline_testdata && ${CMAKE_CTEST_COMMAND} --parallel ${N} --output-on-failure
+    COMMENT "Check code with previously downloaded test data"
+)
+
+###############################################################################
+# Run test suite when project was not checked out from Git
+###############################################################################
+
+add_custom_target(ci_non_git_tests
+    COMMAND git config --global --add safe.directory ${PROJECT_SOURCE_DIR}
+    COMMAND mkdir -p ${PROJECT_BINARY_DIR}/build_non_git_tests/sources
+    COMMAND cd ${PROJECT_SOURCE_DIR} && for FILE in `${GIT_TOOL} ls-tree --name-only HEAD`\; do cp -r $$FILE ${PROJECT_BINARY_DIR}/build_non_git_tests/sources \; done
+    COMMAND ${CMAKE_COMMAND}
+        -DCMAKE_BUILD_TYPE=Debug -GNinja
+        -DJSON_BuildTests=ON -DJSON_FastTests=ON
+        -S${PROJECT_BINARY_DIR}/build_non_git_tests/sources -B${PROJECT_BINARY_DIR}/build_non_git_tests
+    COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR}/build_non_git_tests
+    COMMAND cd ${PROJECT_BINARY_DIR}/build_non_git_tests && ${CMAKE_CTEST_COMMAND} --parallel ${N} -LE git_required --output-on-failure
+    COMMENT "Check code when project was not checked out from Git"
+)
+
+###############################################################################
+# Run test suite and exclude tests that change installed files
+###############################################################################
+
+add_custom_target(ci_reproducible_tests
+    COMMAND ${CMAKE_COMMAND}
+        -DCMAKE_BUILD_TYPE=Debug -GNinja
+        -DJSON_BuildTests=ON -DJSON_FastTests=ON
+        -S${PROJECT_SOURCE_DIR} -B${PROJECT_BINARY_DIR}/build_reproducible_tests
+    COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR}/build_reproducible_tests
+    COMMAND cd ${PROJECT_BINARY_DIR}/build_reproducible_tests && ${CMAKE_CTEST_COMMAND} --parallel ${N} -LE not_reproducible --output-on-failure
+    COMMENT "Check code and exclude tests that change installed files"
+)
+
+###############################################################################
+# Check if every header in the include folder includes sufficient headers to
+# be compiled individually.
+###############################################################################
+
+set(iwyu_path_and_options ${IWYU_TOOL} -Xiwyu --max_line_length=300)
+
+foreach(SRC_FILE ${SRC_FILES})
+    # get relative path of the header file
+    file(RELATIVE_PATH RELATIVE_SRC_FILE "${PROJECT_SOURCE_DIR}/include/nlohmann" "${SRC_FILE}")
+    # replace slashes and strip suffix
+    string(REPLACE "/" "_" RELATIVE_SRC_FILE "${RELATIVE_SRC_FILE}")
+    string(REPLACE ".hpp" "" RELATIVE_SRC_FILE "${RELATIVE_SRC_FILE}")
+    # create code file
+    file(WRITE "${PROJECT_BINARY_DIR}/src_single/${RELATIVE_SRC_FILE}.cpp" "#include \"${SRC_FILE}\" // IWYU pragma: keep\n\nint main()\n{}\n")
+    # create executable
+    add_executable(single_${RELATIVE_SRC_FILE} EXCLUDE_FROM_ALL ${PROJECT_BINARY_DIR}/src_single/${RELATIVE_SRC_FILE}.cpp)
+    target_include_directories(single_${RELATIVE_SRC_FILE} PRIVATE ${PROJECT_SOURCE_DIR}/include)
+    target_compile_features(single_${RELATIVE_SRC_FILE} PRIVATE cxx_std_11)
+    set_property(TARGET single_${RELATIVE_SRC_FILE} PROPERTY CXX_INCLUDE_WHAT_YOU_USE "${iwyu_path_and_options}")
+    # remember binary for ci_single_binaries target
+    list(APPEND single_binaries single_${RELATIVE_SRC_FILE})
+endforeach()
+
+add_custom_target(ci_single_binaries
+    DEPENDS ${single_binaries}
+    COMMENT "Check if headers are self-contained"
+)
+
+###############################################################################
+# Benchmarks
+###############################################################################
+
+add_custom_target(ci_benchmarks
+    COMMAND ${CMAKE_COMMAND}
+        -DCMAKE_BUILD_TYPE=Release -GNinja
+        -S${PROJECT_SOURCE_DIR}/benchmarks -B${PROJECT_BINARY_DIR}/build_benchmarks
+    COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR}/build_benchmarks --target json_benchmarks
+    COMMAND cd ${PROJECT_BINARY_DIR}/build_benchmarks && ./json_benchmarks
+    COMMENT "Run benchmarks"
+)
+
+###############################################################################
+# CMake flags
+###############################################################################
+
+function(ci_get_cmake version var)
+    set(${var} ${PROJECT_BINARY_DIR}/cmake-${version}/bin/cmake)
+    add_custom_command(
+        OUTPUT ${${var}}
+        COMMAND wget -nc https://github.com/Kitware/CMake/releases/download/v${version}/cmake-${version}.tar.gz
+        COMMAND tar xfz cmake-${version}.tar.gz
+        COMMAND rm cmake-${version}.tar.gz
+        COMMAND ${CMAKE_COMMAND} -S cmake-${version} -B cmake-${version}
+        COMMAND ${CMAKE_COMMAND} --build cmake-${version} --parallel 10
+        WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+        COMMENT "Download CMake ${version}"
+    )
+    set(${var} ${${var}} PARENT_SCOPE)
+endfunction()
+
+ci_get_cmake(3.1.0 CMAKE_3_1_0_BINARY)
+ci_get_cmake(3.13.0 CMAKE_3_13_0_BINARY)
+
+set(JSON_CMAKE_FLAGS_3_1_0 JSON_Diagnostics JSON_GlobalUDLs JSON_ImplicitConversions JSON_DisableEnumSerialization
+    JSON_LegacyDiscardedValueComparison JSON_Install JSON_MultipleHeaders JSON_SystemInclude JSON_Valgrind)
+set(JSON_CMAKE_FLAGS_3_13_0 JSON_BuildTests)
+
+function(ci_add_cmake_flags_targets flag min_version)
+    string(TOLOWER "ci_cmake_flag_${flag}" flag_target)
+    string(REPLACE . _ min_version_var ${min_version})
+    set(cmake_binary ${CMAKE_${min_version_var}_BINARY})
+    add_custom_target(${flag_target}
+        COMMENT "Check CMake flag ${flag} (CMake ${CMAKE_VERSION})"
+        COMMAND ${CMAKE_COMMAND}
+            -Werror=dev
+            -D${flag}=ON
+            -S${PROJECT_SOURCE_DIR} -B${PROJECT_BINARY_DIR}/build_${flag_target}
+    )
+    add_custom_target(${flag_target}_${min_version_var}
+        COMMENT "Check CMake flag ${JSON_CMAKE_FLAG} (CMake ${min_version})"
+        COMMAND mkdir -pv ${PROJECT_BINARY_DIR}/build_${flag_target}_${min_version_var}
+        COMMAND cd ${PROJECT_BINARY_DIR}/build_${flag_target}_${min_version_var}
+            && ${cmake_binary} -Werror=dev ${PROJECT_SOURCE_DIR} -D${flag}=ON
+        DEPENDS ${cmake_binary}
+    )
+    list(APPEND JSON_CMAKE_FLAG_TARGETS ${JSON_CMAKE_FLAG_TARGET} ${flag_target}_${min_version_var})
+    list(APPEND JSON_CMAKE_FLAG_BUILD_DIRS ${PROJECT_BINARY_DIR}/build_${flag_target} ${PROJECT_BINARY_DIR}/build_${flag_target}_${min_version_var})
+    set(JSON_CMAKE_FLAG_TARGETS ${JSON_CMAKE_FLAG_TARGETS} PARENT_SCOPE)
+    set(JSON_CMAKE_FLAG_BUILD_DIRS ${JSON_CMAKE_FLAG_BUILD_DIRS} PARENT_SCOPE)
+endfunction()
+
+foreach(JSON_CMAKE_FLAG ${JSON_CMAKE_FLAGS_3_1_0})
+    ci_add_cmake_flags_targets(${JSON_CMAKE_FLAG} 3.1.0)
+endforeach()
+
+foreach(JSON_CMAKE_FLAG ${JSON_CMAKE_FLAGS_3_13_0})
+    ci_add_cmake_flags_targets(${JSON_CMAKE_FLAG} 3.13.0)
+endforeach()
+
+add_custom_target(ci_cmake_flags
+    DEPENDS ${JSON_CMAKE_FLAG_TARGETS}
+    COMMENT "Check CMake flags"
+)
+
+###############################################################################
+# Use more installed compilers.
+###############################################################################
+
+foreach(COMPILER g++-4.8 g++-4.9 g++-5 g++-6 g++-7 g++-8 g++-9 g++-10 g++-11 clang++-3.5 clang++-3.6 clang++-3.7 clang++-3.8 clang++-3.9 clang++-4.0 clang++-5.0 clang++-6.0 clang++-7 clang++-8 clang++-9 clang++-10 clang++-11 clang++-12 clang++-13 clang++-14 clang++-15 clang++-16 clang++-17)
+    find_program(COMPILER_TOOL NAMES ${COMPILER})
+    if (COMPILER_TOOL)
+        unset(ADDITIONAL_FLAGS)
+
+        add_custom_target(ci_test_compiler_${COMPILER}
+            COMMAND CXX=${COMPILER} ${CMAKE_COMMAND}
+                -DCMAKE_BUILD_TYPE=Debug -GNinja
+                -DJSON_BuildTests=ON -DJSON_FastTests=ON
+                -S${PROJECT_SOURCE_DIR} -B${PROJECT_BINARY_DIR}/build_compiler_${COMPILER}
+                ${ADDITIONAL_FLAGS}
+            COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR}/build_compiler_${COMPILER}
+            COMMAND cd ${PROJECT_BINARY_DIR}/build_compiler_${COMPILER} && ${CMAKE_CTEST_COMMAND} --parallel ${N} --exclude-regex "test-unicode" --output-on-failure
+            COMMENT "Compile and test with ${COMPILER}"
+        )
+    endif()
+    unset(COMPILER_TOOL CACHE)
+endforeach()
+
+add_custom_target(ci_test_compiler_default
+    COMMAND ${CMAKE_COMMAND}
+        -DCMAKE_BUILD_TYPE=Debug -GNinja
+        -DJSON_BuildTests=ON -DJSON_FastTests=ON
+        -S${PROJECT_SOURCE_DIR} -B${PROJECT_BINARY_DIR}/build_compiler_default
+        ${ADDITIONAL_FLAGS}
+    COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR}/build_compiler_default --parallel ${N}
+    COMMAND cd ${PROJECT_BINARY_DIR}/build_compiler_default && ${CMAKE_CTEST_COMMAND} --parallel ${N} --exclude-regex "test-unicode" -LE git_required --output-on-failure
+    COMMENT "Compile and test with default C++ compiler"
+)
+
+###############################################################################
+# CUDA example
+###############################################################################
+
+add_custom_target(ci_cuda_example
+    COMMAND ${CMAKE_COMMAND}
+        -DCMAKE_BUILD_TYPE=Debug -GNinja
+        -DCMAKE_CUDA_HOST_COMPILER=g++-8
+        -S${PROJECT_SOURCE_DIR}/tests/cuda_example -B${PROJECT_BINARY_DIR}/build_cuda_example
+    COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR}/build_cuda_example
+)
+
+###############################################################################
+# Intel C++ Compiler
+###############################################################################
+
+add_custom_target(ci_icpc
+    COMMAND ${CMAKE_COMMAND}
+        -DCMAKE_BUILD_TYPE=Debug -GNinja
+        -DCMAKE_C_COMPILER=icc -DCMAKE_CXX_COMPILER=icpc
+        -DJSON_BuildTests=ON -DJSON_FastTests=ON
+        -S${PROJECT_SOURCE_DIR} -B${PROJECT_BINARY_DIR}/build_icpc
+    COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR}/build_icpc
+    COMMAND cd ${PROJECT_BINARY_DIR}/build_icpc && ${CMAKE_CTEST_COMMAND} --parallel ${N} --exclude-regex "test-unicode" --output-on-failure
+    COMMENT "Compile and test with ICPC"
+)
+
+###############################################################################
+# test documentation
+###############################################################################
+
+add_custom_target(ci_test_examples
+    COMMAND make CXX="${GCC_TOOL}" check_output_portable -j8
+    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/docs
+    COMMENT "Check that all examples compile and create the desired output"
+)
+
+add_custom_target(ci_test_api_documentation
+    COMMAND ${Python3_EXECUTABLE} scripts/check_structure.py
+    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/docs/mkdocs
+    COMMENT "Lint the API documentation"
+)
+
+###############################################################################
+# Clean up all generated files.
+###############################################################################
+
+add_custom_target(ci_clean
+    COMMAND rm -fr ${PROJECT_BINARY_DIR}/build_* cmake-3.1.0-Darwin64 ${JSON_CMAKE_FLAG_BUILD_DIRS} ${single_binaries}
+    COMMENT "Clean generated directories"
+)
diff --git a/external_imported/json/cmake/download_test_data.cmake b/external_imported/json/cmake/download_test_data.cmake
index f516a7c3b..1bb998dae 100644
--- a/external_imported/json/cmake/download_test_data.cmake
+++ b/external_imported/json/cmake/download_test_data.cmake
@@ -1,5 +1,5 @@
 set(JSON_TEST_DATA_URL     https://github.com/nlohmann/json_test_data)
-set(JSON_TEST_DATA_VERSION 3.0.0)
+set(JSON_TEST_DATA_VERSION 3.1.0)
 
 # if variable is set, use test data from given directory rather than downloading them
 if(JSON_TestDataDirectory)
diff --git a/external_imported/json/cmake/pkg-config.pc.in b/external_imported/json/cmake/pkg-config.pc.in
index 3541abf0b..d36317f09 100644
--- a/external_imported/json/cmake/pkg-config.pc.in
+++ b/external_imported/json/cmake/pkg-config.pc.in
@@ -1,4 +1,4 @@
 Name: ${PROJECT_NAME}
 Description: JSON for Modern C++
 Version: ${PROJECT_VERSION}
-Cflags: -I${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}
+Cflags: -I${CMAKE_INSTALL_FULL_INCLUDEDIR}
diff --git a/external_imported/json/cmake/scripts/gen_bazel_build_file.cmake b/external_imported/json/cmake/scripts/gen_bazel_build_file.cmake
new file mode 100644
index 000000000..e754d387d
--- /dev/null
+++ b/external_imported/json/cmake/scripts/gen_bazel_build_file.cmake
@@ -0,0 +1,24 @@
+# generate Bazel BUILD file
+
+set(PROJECT_ROOT "${CMAKE_CURRENT_LIST_DIR}/../..")
+set(BUILD_FILE "${PROJECT_ROOT}/BUILD.bazel")
+
+file(GLOB_RECURSE HEADERS LIST_DIRECTORIES false RELATIVE "${PROJECT_ROOT}" "include/*.hpp")
+
+file(WRITE "${BUILD_FILE}" [=[
+cc_library(
+    name = "json",
+    hdrs = [
+]=])
+
+foreach(header ${HEADERS})
+    file(APPEND "${BUILD_FILE}" "        \"${header}\",\n")
+endforeach()
+
+file(APPEND "${BUILD_FILE}" [=[
+    ],
+    includes = ["include"],
+    visibility = ["//visibility:public"],
+    alwayslink = True,
+)
+]=])
diff --git a/external_imported/json/cmake/test.cmake b/external_imported/json/cmake/test.cmake
new file mode 100644
index 000000000..7105b97c3
--- /dev/null
+++ b/external_imported/json/cmake/test.cmake
@@ -0,0 +1,273 @@
+set(_json_test_cmake_list_file ${CMAKE_CURRENT_LIST_FILE})
+
+#############################################################################
+# download test data
+#############################################################################
+
+include(download_test_data)
+
+# test fixture to download test data
+add_test(NAME "download_test_data" COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR}
+    --target download_test_data
+)
+set_tests_properties(download_test_data PROPERTIES FIXTURES_SETUP TEST_DATA)
+
+if(JSON_Valgrind)
+    find_program(CMAKE_MEMORYCHECK_COMMAND valgrind)
+    message(STATUS "Executing test suite with Valgrind (${CMAKE_MEMORYCHECK_COMMAND})")
+    set(memcheck_command "${CMAKE_MEMORYCHECK_COMMAND} ${CMAKE_MEMORYCHECK_COMMAND_OPTIONS} --error-exitcode=1 --leak-check=full")
+    separate_arguments(memcheck_command)
+endif()
+
+#############################################################################
+# detect standard support
+#############################################################################
+
+# C++11 is the minimum required
+set(compiler_supports_cpp_11 TRUE)
+
+foreach(feature ${CMAKE_CXX_COMPILE_FEATURES})
+    if (${feature} STREQUAL cxx_std_14)
+        set(compiler_supports_cpp_14 TRUE)
+    elseif (${feature} STREQUAL cxx_std_17)
+        set(compiler_supports_cpp_17 TRUE)
+    elseif (${feature} STREQUAL cxx_std_20)
+        set(compiler_supports_cpp_20 TRUE)
+    elseif (${feature} STREQUAL cxx_std_23)
+        set(compiler_supports_cpp_23 TRUE)
+    endif()
+endforeach()
+
+#############################################################################
+# test functions
+#############################################################################
+
+#############################################################################
+# json_test_set_test_options(
+#     all|<tests>
+#     [CXX_STANDARDS all|<args>...]
+#     [COMPILE_DEFINITIONS <args>...]
+#     [COMPILE_FEATURES <args>...]
+#     [COMPILE_OPTIONS <args>...]
+#     [LINK_LIBRARIES <args>...]
+#     [LINK_OPTIONS <args>...]
+#     [TEST_PROPERTIES <args>...])
+#
+# Supply test- and standard-specific build settings and/or test properties.
+# Specify multiple tests using a list e.g., "test-foo;test-bar".
+#
+# Must be called BEFORE the test is created.
+#############################################################################
+
+function(json_test_set_test_options tests)
+    cmake_parse_arguments(args "" ""
+        "CXX_STANDARDS;COMPILE_DEFINITIONS;COMPILE_FEATURES;COMPILE_OPTIONS;LINK_LIBRARIES;LINK_OPTIONS;TEST_PROPERTIES"
+        ${ARGN})
+
+    if(NOT args_CXX_STANDARDS)
+        set(args_CXX_STANDARDS "all")
+    endif()
+
+    foreach(test ${tests})
+        if("${test}" STREQUAL "all")
+            set(test "")
+        endif()
+
+        foreach(cxx_standard ${args_CXX_STANDARDS})
+            if("${cxx_standard}" STREQUAL "all")
+                if("${test}" STREQUAL "")
+                    message(FATAL_ERROR "Not supported. Change defaults in: ${_json_test_cmake_list_file}")
+                endif()
+                set(test_interface _json_test_interface_${test})
+            else()
+                set(test_interface _json_test_interface_${test}_cpp_${cxx_standard})
+            endif()
+
+            if(NOT TARGET ${test_interface})
+                add_library(${test_interface} INTERFACE)
+            endif()
+
+            target_compile_definitions(${test_interface} INTERFACE ${args_COMPILE_DEFINITIONS})
+            target_compile_features(${test_interface} INTERFACE ${args_COMPILE_FEATURES})
+            target_compile_options(${test_interface} INTERFACE ${args_COMPILE_OPTIONS})
+            target_link_libraries (${test_interface} INTERFACE ${args_LINK_LIBRARIES})
+            target_link_options(${test_interface} INTERFACE ${args_LINK_OPTIONS})
+            #set_target_properties(${test_interface} PROPERTIES JSON_TEST_PROPERTIES "${args_TEST_PROPERTIES}")
+            set_property(DIRECTORY PROPERTY
+                ${test_interface}_TEST_PROPERTIES "${args_TEST_PROPERTIES}"
+            )
+        endforeach()
+    endforeach()
+endfunction()
+
+# for internal use by _json_test_add_test()
+function(_json_test_apply_test_properties test_target properties_target)
+    #get_target_property(test_properties ${properties_target} JSON_TEST_PROPERTIES)
+    get_property(test_properties DIRECTORY PROPERTY ${properties_target}_TEST_PROPERTIES)
+    if(test_properties)
+        set_tests_properties(${test_target} PROPERTIES ${test_properties})
+    endif()
+endfunction()
+
+# for internal use by json_test_add_test_for()
+function(_json_test_add_test test_name file main cxx_standard)
+    set(test_target ${test_name}_cpp${cxx_standard})
+
+    if(TARGET ${test_target})
+        message(FATAL_ERROR "Target ${test_target} has already been added.")
+    endif()
+
+    add_executable(${test_target} ${file})
+    target_link_libraries(${test_target} PRIVATE ${main})
+
+    # set and require C++ standard
+    set_target_properties(${test_target} PROPERTIES
+        CXX_STANDARD ${cxx_standard}
+        CXX_STANDARD_REQUIRED ON
+    )
+
+    # apply standard-specific build settings
+    if(TARGET _json_test_interface__cpp_${cxx_standard})
+        target_link_libraries(${test_target} PRIVATE _json_test_interface__cpp_${cxx_standard})
+    endif()
+
+    # apply test-specific build settings
+    if(TARGET _json_test_interface_${test_name})
+        target_link_libraries(${test_target} PRIVATE _json_test_interface_${test_name})
+    endif()
+
+    # apply test- and standard-specific build settings
+    if(TARGET _json_test_interface_${test_name}_cpp_${cxx_standard})
+        target_link_libraries(${test_target} PRIVATE
+            _json_test_interface_${test_name}_cpp_${cxx_standard}
+        )
+    endif()
+
+    if (JSON_FastTests)
+        add_test(NAME ${test_target}
+            COMMAND ${test_target} ${DOCTEST_TEST_FILTER}
+            WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        )
+    else()
+        add_test(NAME ${test_target}
+            COMMAND ${test_target} ${DOCTEST_TEST_FILTER} --no-skip
+            WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        )
+    endif()
+    set_tests_properties(${test_target} PROPERTIES LABELS "all" FIXTURES_REQUIRED TEST_DATA)
+
+    # apply standard-specific test properties
+    if(TARGET _json_test_interface__cpp_${cxx_standard})
+        _json_test_apply_test_properties(${test_target} _json_test_interface__cpp_${cxx_standard})
+    endif()
+
+    # apply test-specific test properties
+    if(TARGET _json_test_interface_${test_name})
+        _json_test_apply_test_properties(${test_target} _json_test_interface_${test_name})
+    endif()
+
+    # apply test- and standard-specific test properties
+    if(TARGET _json_test_interface_${test_name}_cpp_${cxx_standard})
+        _json_test_apply_test_properties(${test_target}
+            _json_test_interface_${test_name}_cpp_${cxx_standard}
+        )
+    endif()
+
+    if(JSON_Valgrind)
+        add_test(NAME ${test_target}_valgrind
+            COMMAND ${memcheck_command} $<TARGET_FILE:${test_target}> ${DOCTEST_TEST_FILTER}
+            WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        )
+        set_tests_properties(${test_target}_valgrind PROPERTIES
+            LABELS "valgrind" FIXTURES_REQUIRED TEST_DATA
+        )
+    endif()
+endfunction()
+
+#############################################################################
+# json_test_add_test_for(
+#     <file>
+#     [NAME <name>]
+#     MAIN <main>
+#     [CXX_STANDARDS <version_number>...] [FORCE])
+#
+# Given a <file> unit-foo.cpp, produces
+#
+#     test-foo_cpp<version_number>
+#
+# if C++ standard <version_number> is supported by the compiler and the
+# source file contains JSON_HAS_CPP_<version_number>.
+# Use NAME <name> to override the filename-derived test name.
+# Use FORCE to create the test regardless of the file containing
+# JSON_HAS_CPP_<version_number>.
+# Test targets are linked against <main>.
+# CXX_STANDARDS defaults to "11".
+#############################################################################
+
+function(json_test_add_test_for file)
+    cmake_parse_arguments(args "FORCE" "MAIN;NAME" "CXX_STANDARDS" ${ARGN})
+
+    if("${args_MAIN}" STREQUAL "")
+        message(FATAL_ERROR "Required argument MAIN <main> missing.")
+    endif()
+
+    if("${args_NAME}" STREQUAL "")
+        get_filename_component(file_basename ${file} NAME_WE)
+        string(REGEX REPLACE "unit-([^$]+)" "test-\\1" test_name ${file_basename})
+    else()
+        set(test_name ${args_NAME})
+        if(NOT test_name MATCHES "test-[^$]+")
+            message(FATAL_ERROR "Test name must start with 'test-'.")
+        endif()
+    endif()
+
+    if("${args_CXX_STANDARDS}" STREQUAL "")
+        set(args_CXX_STANDARDS 11)
+    endif()
+
+    file(READ ${file} file_content)
+    foreach(cxx_standard ${args_CXX_STANDARDS})
+        if(NOT compiler_supports_cpp_${cxx_standard})
+            continue()
+        endif()
+
+        # add unconditionally if C++11 (default) or forced
+        if(NOT ("${cxx_standard}" STREQUAL 11 OR args_FORCE))
+            string(FIND "${file_content}" JSON_HAS_CPP_${cxx_standard} has_cpp_found)
+            if(${has_cpp_found} EQUAL -1)
+                continue()
+            endif()
+        endif()
+
+        _json_test_add_test(${test_name} ${file} ${args_MAIN} ${cxx_standard})
+    endforeach()
+endfunction()
+
+#############################################################################
+# json_test_should_build_32bit_test(
+#     <build_32bit_var> <build_32bit_only_var> <input>)
+#
+# Check if the 32bit unit test should be built based on the value of <input>
+# and store the result in the variables <build_32bit_var> and
+# <build_32bit_only_var>.
+#############################################################################
+
+function(json_test_should_build_32bit_test build_32bit_var build_32bit_only_var input)
+    set(${build_32bit_only_var} OFF PARENT_SCOPE)
+    string(TOUPPER "${input}" ${build_32bit_var})
+    if("${${build_32bit_var}}" STREQUAL AUTO)
+        # check if compiler is targeting 32bit by default
+        include(CheckTypeSize)
+        check_type_size("size_t" sizeof_size_t LANGUAGE CXX)
+        if(${sizeof_size_t} AND ${sizeof_size_t} EQUAL 4)
+            message(STATUS "Auto-enabling 32bit unit test.")
+            set(${build_32bit_var} ON)
+        else()
+            set(${build_32bit_var} OFF)
+        endif()
+    elseif("${${build_32bit_var}}" STREQUAL ONLY)
+        set(${build_32bit_only_var} ON PARENT_SCOPE)
+    endif()
+
+    set(${build_32bit_var} "${${build_32bit_var}}" PARENT_SCOPE)
+endfunction()
diff --git a/external_imported/json/doc/Doxyfile b/external_imported/json/doc/Doxyfile
deleted file mode 100644
index 45ca8822b..000000000
--- a/external_imported/json/doc/Doxyfile
+++ /dev/null
@@ -1,335 +0,0 @@
-# Doxyfile 1.9.0
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-DOXYFILE_ENCODING      = UTF-8
-PROJECT_NAME           = "JSON for Modern C++"
-PROJECT_NUMBER         = 3.9.1
-PROJECT_BRIEF          =
-PROJECT_LOGO           =
-OUTPUT_DIRECTORY       = .
-CREATE_SUBDIRS         = NO
-ALLOW_UNICODE_NAMES    = NO
-OUTPUT_LANGUAGE        = English
-OUTPUT_TEXT_DIRECTION  = None
-BRIEF_MEMBER_DESC      = YES
-REPEAT_BRIEF           = NO
-ABBREVIATE_BRIEF       =
-ALWAYS_DETAILED_SEC    = YES
-INLINE_INHERITED_MEMB  = NO
-FULL_PATH_NAMES        = YES
-STRIP_FROM_PATH        =
-STRIP_FROM_INC_PATH    =
-SHORT_NAMES            = NO
-JAVADOC_AUTOBRIEF      = NO
-JAVADOC_BANNER         = NO
-QT_AUTOBRIEF           = NO
-MULTILINE_CPP_IS_BRIEF = NO
-PYTHON_DOCSTRING       = YES
-INHERIT_DOCS           = YES
-SEPARATE_MEMBER_PAGES  = YES
-TAB_SIZE               = 4
-ALIASES                = "complexity=@par Complexity^^" \
-                         "liveexample{2}=@par Example^^ \1 ^^ @includelineno \2.cpp \n Output (play with this example @htmlinclude \2.link):^^ @verbinclude \2.output ^^ The <a href= https://github.com/nlohmann/json/blob/develop/doc/examples/\2.cpp>example code</a> above can be translated with @verbatim g++ -std=c++11 -Isingle_include doc/examples/\2.cpp -o \2 @endverbatim" \
-                         "requirement=@par Requirements^^" \
-                         "exceptionsafety=@par Exception safety^^" \
-                         "iterators=@par Iterator validity^^"
-OPTIMIZE_OUTPUT_FOR_C  = NO
-OPTIMIZE_OUTPUT_JAVA   = NO
-OPTIMIZE_FOR_FORTRAN   = NO
-OPTIMIZE_OUTPUT_VHDL   = NO
-OPTIMIZE_OUTPUT_SLICE  = NO
-EXTENSION_MAPPING      =
-MARKDOWN_SUPPORT       = YES
-TOC_INCLUDE_HEADINGS   = 0
-AUTOLINK_SUPPORT       = NO
-BUILTIN_STL_SUPPORT    = YES
-CPP_CLI_SUPPORT        = NO
-SIP_SUPPORT            = NO
-IDL_PROPERTY_SUPPORT   = YES
-DISTRIBUTE_GROUP_DOC   = NO
-GROUP_NESTED_COMPOUNDS = NO
-SUBGROUPING            = YES
-INLINE_GROUPED_CLASSES = NO
-INLINE_SIMPLE_STRUCTS  = NO
-TYPEDEF_HIDES_STRUCT   = NO
-LOOKUP_CACHE_SIZE      = 0
-NUM_PROC_THREADS       = 1
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-EXTRACT_ALL            = YES
-EXTRACT_PRIVATE        = NO
-EXTRACT_PRIV_VIRTUAL   = NO
-EXTRACT_PACKAGE        = YES
-EXTRACT_STATIC         = YES
-EXTRACT_LOCAL_CLASSES  = YES
-EXTRACT_LOCAL_METHODS  = YES
-EXTRACT_ANON_NSPACES   = YES
-RESOLVE_UNNAMED_PARAMS = YES
-HIDE_UNDOC_MEMBERS     = NO
-HIDE_UNDOC_CLASSES     = NO
-HIDE_FRIEND_COMPOUNDS  = NO
-HIDE_IN_BODY_DOCS      = NO
-INTERNAL_DOCS          = NO
-CASE_SENSE_NAMES       = NO
-HIDE_SCOPE_NAMES       = NO
-HIDE_COMPOUND_REFERENCE= NO
-SHOW_INCLUDE_FILES     = YES
-SHOW_GROUPED_MEMB_INC  = NO
-FORCE_LOCAL_INCLUDES   = NO
-INLINE_INFO            = YES
-SORT_MEMBER_DOCS       = YES
-SORT_BRIEF_DOCS        = YES
-SORT_MEMBERS_CTORS_1ST = YES
-SORT_GROUP_NAMES       = NO
-SORT_BY_SCOPE_NAME     = NO
-STRICT_PROTO_MATCHING  = NO
-GENERATE_TODOLIST      = YES
-GENERATE_TESTLIST      = YES
-GENERATE_BUGLIST       = YES
-GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS       =
-MAX_INITIALIZER_LINES  = 30
-SHOW_USED_FILES        = NO
-SHOW_FILES             = NO
-SHOW_NAMESPACES        = NO
-FILE_VERSION_FILTER    =
-LAYOUT_FILE            =
-CITE_BIB_FILES         =
-#---------------------------------------------------------------------------
-# Configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET                  = YES
-WARNINGS               = YES
-WARN_IF_UNDOCUMENTED   = YES
-WARN_IF_DOC_ERROR      = YES
-WARN_NO_PARAMDOC       = YES
-WARN_AS_ERROR          = NO
-WARN_FORMAT            = "$file:$line: $text"
-WARN_LOGFILE           =
-#---------------------------------------------------------------------------
-# Configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT                  = ../single_include/nlohmann/json.hpp \
-                         index.md
-INPUT_ENCODING         = UTF-8
-FILE_PATTERNS          =
-RECURSIVE              = NO
-EXCLUDE                =
-EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       =
-EXCLUDE_SYMBOLS        = nlohmann::detail
-EXAMPLE_PATH           = examples
-EXAMPLE_PATTERNS       =
-EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             = images
-INPUT_FILTER           =
-FILTER_PATTERNS        =
-FILTER_SOURCE_FILES    = NO
-FILTER_SOURCE_PATTERNS =
-USE_MDFILE_AS_MAINPAGE = index.md
-#---------------------------------------------------------------------------
-# Configuration options related to source browsing
-#---------------------------------------------------------------------------
-SOURCE_BROWSER         = YES
-INLINE_SOURCES         = NO
-STRIP_CODE_COMMENTS    = YES
-REFERENCED_BY_RELATION = NO
-REFERENCES_RELATION    = NO
-REFERENCES_LINK_SOURCE = NO
-SOURCE_TOOLTIPS        = YES
-USE_HTAGS              = NO
-VERBATIM_HEADERS       = NO
-#---------------------------------------------------------------------------
-# Configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX     = YES
-IGNORE_PREFIX          =
-#---------------------------------------------------------------------------
-# Configuration options related to the HTML output
-#---------------------------------------------------------------------------
-GENERATE_HTML          = YES
-HTML_OUTPUT            = html
-HTML_FILE_EXTENSION    = .html
-HTML_HEADER            =
-HTML_FOOTER            =
-HTML_STYLESHEET        =
-HTML_EXTRA_STYLESHEET  = css/mylayout.css
-HTML_EXTRA_FILES       =
-HTML_COLORSTYLE_HUE    = 220
-HTML_COLORSTYLE_SAT    = 100
-HTML_COLORSTYLE_GAMMA  = 80
-HTML_TIMESTAMP         = YES
-HTML_DYNAMIC_MENUS     = YES
-HTML_DYNAMIC_SECTIONS  = YES
-HTML_INDEX_NUM_ENTRIES = 100
-GENERATE_DOCSET        = YES
-DOCSET_FEEDNAME        = "Doxygen generated docs"
-DOCSET_BUNDLE_ID       = me.nlohmann.json
-DOCSET_PUBLISHER_ID    = me.nlohmann
-DOCSET_PUBLISHER_NAME  = NielsLohmann
-GENERATE_HTMLHELP      = NO
-CHM_FILE               =
-HHC_LOCATION           =
-GENERATE_CHI           = NO
-CHM_INDEX_ENCODING     =
-BINARY_TOC             = NO
-TOC_EXPAND             = NO
-GENERATE_QHP           = NO
-QCH_FILE               =
-QHP_NAMESPACE          = org.doxygen.Project
-QHP_VIRTUAL_FOLDER     = doc
-QHP_CUST_FILTER_NAME   =
-QHP_CUST_FILTER_ATTRS  =
-QHP_SECT_FILTER_ATTRS  =
-QHG_LOCATION           =
-GENERATE_ECLIPSEHELP   = NO
-ECLIPSE_DOC_ID         = org.doxygen.Project
-DISABLE_INDEX          = NO
-GENERATE_TREEVIEW      = NO
-ENUM_VALUES_PER_LINE   = 4
-TREEVIEW_WIDTH         = 250
-EXT_LINKS_IN_WINDOW    = NO
-HTML_FORMULA_FORMAT    = png
-FORMULA_FONTSIZE       = 10
-FORMULA_TRANSPARENT    = YES
-FORMULA_MACROFILE      =
-USE_MATHJAX            = NO
-MATHJAX_FORMAT         = HTML-CSS
-MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
-MATHJAX_EXTENSIONS     =
-MATHJAX_CODEFILE       =
-SEARCHENGINE           = YES
-SERVER_BASED_SEARCH    = NO
-EXTERNAL_SEARCH        = NO
-SEARCHENGINE_URL       =
-SEARCHDATA_FILE        = searchdata.xml
-EXTERNAL_SEARCH_ID     =
-EXTRA_SEARCH_MAPPINGS  =
-#---------------------------------------------------------------------------
-# Configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-GENERATE_LATEX         = NO
-LATEX_OUTPUT           = latex
-LATEX_CMD_NAME         = latex
-MAKEINDEX_CMD_NAME     = makeindex
-LATEX_MAKEINDEX_CMD    = \makeindex
-COMPACT_LATEX          = NO
-PAPER_TYPE             = a4
-EXTRA_PACKAGES         =
-LATEX_HEADER           =
-LATEX_FOOTER           =
-LATEX_EXTRA_STYLESHEET =
-LATEX_EXTRA_FILES      =
-PDF_HYPERLINKS         = YES
-USE_PDFLATEX           = YES
-LATEX_BATCHMODE        = NO
-LATEX_HIDE_INDICES     = NO
-LATEX_SOURCE_CODE      = NO
-LATEX_BIB_STYLE        = plain
-LATEX_TIMESTAMP        = NO
-LATEX_EMOJI_DIRECTORY  =
-#---------------------------------------------------------------------------
-# Configuration options related to the RTF output
-#---------------------------------------------------------------------------
-GENERATE_RTF           = NO
-RTF_OUTPUT             = rtf
-COMPACT_RTF            = NO
-RTF_HYPERLINKS         = NO
-RTF_STYLESHEET_FILE    =
-RTF_EXTENSIONS_FILE    =
-RTF_SOURCE_CODE        = NO
-#---------------------------------------------------------------------------
-# Configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN           = NO
-MAN_OUTPUT             = man
-MAN_EXTENSION          = .3
-MAN_SUBDIR             =
-MAN_LINKS              = NO
-#---------------------------------------------------------------------------
-# Configuration options related to the XML output
-#---------------------------------------------------------------------------
-GENERATE_XML           = YES
-XML_OUTPUT             = xml
-XML_PROGRAMLISTING     = YES
-XML_NS_MEMB_FILE_SCOPE = NO
-#---------------------------------------------------------------------------
-# Configuration options related to the DOCBOOK output
-#---------------------------------------------------------------------------
-GENERATE_DOCBOOK       = NO
-DOCBOOK_OUTPUT         = docbook
-DOCBOOK_PROGRAMLISTING = NO
-#---------------------------------------------------------------------------
-# Configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-GENERATE_AUTOGEN_DEF   = NO
-#---------------------------------------------------------------------------
-# Configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-GENERATE_PERLMOD       = NO
-PERLMOD_LATEX          = NO
-PERLMOD_PRETTY         = YES
-PERLMOD_MAKEVAR_PREFIX =
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING   = YES
-MACRO_EXPANSION        = NO
-EXPAND_ONLY_PREDEF     = NO
-SEARCH_INCLUDES        = YES
-INCLUDE_PATH           =
-INCLUDE_FILE_PATTERNS  =
-PREDEFINED             =
-EXPAND_AS_DEFINED      =
-SKIP_FUNCTION_MACROS   = YES
-#---------------------------------------------------------------------------
-# Configuration options related to external references
-#---------------------------------------------------------------------------
-TAGFILES               =
-GENERATE_TAGFILE       = html/nlohmann_json.tag
-ALLEXTERNALS           = NO
-EXTERNAL_GROUPS        = YES
-EXTERNAL_PAGES         = YES
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-CLASS_DIAGRAMS         = NO
-DIA_PATH               =
-HIDE_UNDOC_RELATIONS   = YES
-HAVE_DOT               = YES
-DOT_NUM_THREADS        = 0
-DOT_FONTNAME           = Helvetica
-DOT_FONTSIZE           = 10
-DOT_FONTPATH           =
-CLASS_GRAPH            = NO
-COLLABORATION_GRAPH    = NO
-GROUP_GRAPHS           = YES
-UML_LOOK               = YES
-UML_LIMIT_NUM_FIELDS   = 10
-DOT_UML_DETAILS        = NO
-DOT_WRAP_THRESHOLD     = 17
-TEMPLATE_RELATIONS     = NO
-INCLUDE_GRAPH          = NO
-INCLUDED_BY_GRAPH      = NO
-CALL_GRAPH             = NO
-CALLER_GRAPH           = NO
-GRAPHICAL_HIERARCHY    = NO
-DIRECTORY_GRAPH        = NO
-DOT_IMAGE_FORMAT       = svg
-INTERACTIVE_SVG        = YES
-DOT_PATH               =
-DOTFILE_DIRS           =
-MSCFILE_DIRS           =
-DIAFILE_DIRS           =
-PLANTUML_JAR_PATH      =
-PLANTUML_CFG_FILE      =
-PLANTUML_INCLUDE_PATH  =
-DOT_GRAPH_MAX_NODES    = 50
-MAX_DOT_GRAPH_DEPTH    = 0
-DOT_TRANSPARENT        = NO
-DOT_MULTI_TARGETS      = NO
-GENERATE_LEGEND        = YES
-DOT_CLEANUP            = YES
diff --git a/external_imported/json/doc/Makefile b/external_imported/json/doc/Makefile
deleted file mode 100644
index 9addd3401..000000000
--- a/external_imported/json/doc/Makefile
+++ /dev/null
@@ -1,92 +0,0 @@
-SRCDIR = ../single_include
-SED:=$(shell command -v gsed || which sed)
-
-all: doxygen
-
-
-##########################################################################
-# example files
-##########################################################################
-
-# where are the example cpp files
-EXAMPLES = $(wildcard examples/*.cpp)
-
-# create output from a stand-alone example file
-%.output: %.cpp
-	make $(<:.cpp=) CPPFLAGS="-I $(SRCDIR)" CXXFLAGS="-std=c++11"
-	./$(<:.cpp=) > $@
-	rm $(<:.cpp=)
-
-# compare created output with current output of the example files
-%.test: %.cpp
-	make $(<:.cpp=) CPPFLAGS="-I $(SRCDIR)" CXXFLAGS="-std=c++11"
-	./$(<:.cpp=) > $@
-	diff $@ $(<:.cpp=.output)
-	rm $(<:.cpp=) $@
-
-# create links to try the code online
-%.link: %.cpp
-	rm -fr tmp
-	mkdir tmp
-	cp -r $(SRCDIR)/nlohmann tmp
-	python2 scripts/send_to_wandbox.py tmp $< > $@.tmp
-	/bin/echo -n "<a target=\"_blank\" href=\"`cat $@.tmp`\"><b>online</b></a>" > $@
-	rm -fr tmp $@.tmp
-
-# create output from all stand-alone example files
-create_output: $(EXAMPLES:.cpp=.output)
-
-create_links: $(EXAMPLES:.cpp=.link)
-
-# check output of all stand-alone example files
-check_output: $(EXAMPLES:.cpp=.test)
-
-
-clean:
-	rm -fr me.nlohmann.json.docset html xml $(EXAMPLES:.cpp=)
-	$(MAKE) clean -C docset
-	$(MAKE) clean -C mkdocs
-
-
-##########################################################################
-# Doxygen HTML documentation
-##########################################################################
-
-# create Doxygen documentation
-doxygen: create_output create_links
-	doxygen
-	$(SED) -i 's@&lt; ObjectType, ArrayType, StringType, BooleanType, NumberIntegerType, NumberFloatType, AllocatorType, JSONSerializer &gt;@@g' html/*.html
-	$(SED) -i 's@&lt;&#160;ObjectType,&#160;ArrayType,&#160;StringType,&#160;BooleanType,&#160;NumberIntegerType,&#160;NumberFloatType,&#160;AllocatorType&#160;JSONSerializer&#160;&gt;@@g' html/*.html
-	$(SED) -i 's@&lt; ObjectType, ArrayType, StringType, BooleanType, NumberIntegerType, NumberUnsignedType, NumberFloatType, AllocatorType, JSONSerializer &gt;@@g' html/*.html
-	$(SED) -i 's@< ObjectType, ArrayType, StringType, BooleanType, NumberIntegerType, NumberUnsignedType, NumberFloatType, AllocatorType, JSONSerializer >@@g' html/*.html
-	$(SED) -i 's@&lt;&#160;ObjectType,&#160;ArrayType,&#160;StringType,&#160;BooleanType,&#160;NumberIntegerType,&#160;NumberUnsignedType,&#160;NumberFloatType,&#160;AllocatorType&#160;JSONSerializer&#160;&gt;@@g' html/*.html
-	$(SED) -i 's@template&lt;template&lt; typename U, typename V, typename... Args &gt; class ObjectType = std::map, template&lt; typename U, typename... Args &gt; class ArrayType = std::vector, class StringType = std::string, class BooleanType = bool, class NumberIntegerType = std::int64_t, class NumberUnsignedType = std::uint64_t, class NumberFloatType = double, template&lt; typename U &gt; class AllocatorType = std::allocator, template&lt; typename T, typename SFINAE=void &gt; class JSONSerializer = adl_serializer&gt;@@g' html/*.html
-	$(SED) -i 's@&lt; ObjectType, ArrayType, StringType, BooleanType, NumberIntegerType, NumberUnsignedType, NumberFloatType, AllocatorType, JSONSerializer &gt;@@g' html/*.html
-	$(SED) -i 's@&lt;&#160;ObjectType,&#160;ArrayType,&#160;StringType,&#160;BooleanType,&#160;NumberIntegerType,&#160;NumberUnsignedType,&#160;NumberFloatType,&#160;AllocatorType,&#160;JSONSerializer&#160;&gt;@@g' html/*.html
-	$(SED) -i 's@JSON_HEDLEY_RETURNS_NON_NULL@@g' html/*.html
-	$(SED) -i 's@JSON_HEDLEY_WARN_UNUSED_RESULT@@g' html/*.html
-
-upload: clean doxygen check_output
-	scripts/git-update-ghpages nlohmann/json html
-	rm -fr html
-	open http://nlohmann.github.io/json/
-
-
-##########################################################################
-# docset
-##########################################################################
-
-# create docset for Dash
-docset: create_output
-	cp Doxyfile Doxyfile_docset
-	$(SED) -i 's/DISABLE_INDEX          = NO/DISABLE_INDEX          = YES/' Doxyfile_docset
-	$(SED) -i 's/SEARCHENGINE           = YES/SEARCHENGINE           = NO/' Doxyfile_docset
-	$(SED) -i 's@HTML_EXTRA_STYLESHEET  = css/mylayout.css@HTML_EXTRA_STYLESHEET  = css/mylayout_docset.css@' Doxyfile_docset
-	rm -fr html *.docset
-	doxygen Doxyfile_docset
-	$(SED) -i 's@&lt; ObjectType, ArrayType, StringType, BooleanType, NumberIntegerType, NumberFloatType, AllocatorType &gt;@@g' html/*.html
-	$(SED) -i 's@&lt;&#160;ObjectType,&#160;ArrayType,&#160;StringType,&#160;BooleanType,&#160;NumberIntegerType,&#160;NumberFloatType,&#160;AllocatorType&#160;&gt;@@g' html/*.html
-	make -C html
-	mv html/*.docset .
-	$(SED) -i 's@<string>doxygen</string>@<string>json</string>@' me.nlohmann.json.docset/Contents/Info.plist
-	rm -fr Doxyfile_docset html
diff --git a/external_imported/json/doc/avatars.png b/external_imported/json/doc/avatars.png
deleted file mode 100644
index e3c29989e..000000000
Binary files a/external_imported/json/doc/avatars.png and /dev/null differ
diff --git a/external_imported/json/doc/css/mylayout.css b/external_imported/json/doc/css/mylayout.css
deleted file mode 100644
index fe20b82c5..000000000
--- a/external_imported/json/doc/css/mylayout.css
+++ /dev/null
@@ -1,26 +0,0 @@
-/* hide lengthy template information */
-.memtemplate, .memTemplParams {
-    display: none;
-}
-
-/* allow compiler information to wrap */
-/* https://css-tricks.com/snippets/css/make-pre-text-wrap/ */
-pre.fragment {
-    white-space: pre-wrap;       /* css-3 */
-    white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
-    white-space: -pre-wrap;      /* Opera 4-6 */
-    white-space: -o-pre-wrap;    /* Opera 7 */
-    word-wrap: break-word;       /* Internet Explorer 5.5+ */
-}
-
-td.paramname {
-    vertical-align: top;
-}
-
-.ok_green {
-    background-color: #89C35C;
-}
-
-.nok_throws {
-    background-color: #ffa500;
-}
diff --git a/external_imported/json/doc/css/mylayout_docset.css b/external_imported/json/doc/css/mylayout_docset.css
deleted file mode 100644
index 1a67e99df..000000000
--- a/external_imported/json/doc/css/mylayout_docset.css
+++ /dev/null
@@ -1,27 +0,0 @@
-.memtemplate {
-    display: none;
-}
-
-.memTemplParams {
-    display: none;
-}
-
-.navtab {
-    display: none;
-}
-
-#top, .footer {
-    display: none;
-}
-
-td.paramname {
-    vertical-align: top;
-}
-
-.ok_green {
-    background-color: #89C35C;
-}
-
-.nok_throws {
-    background-color: #ffa500;
-}
diff --git a/external_imported/json/doc/docset/Makefile b/external_imported/json/doc/docset/Makefile
deleted file mode 100644
index 262540a0c..000000000
--- a/external_imported/json/doc/docset/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-nlohmann_json.docset: Info.plist docSet.sql
-	$(MAKE) clean
-	mkdir -p nlohmann_json.docset/Contents/Resources/Documents/
-	cp info.plist nlohmann_json.docset/Contents
-	# build and copy documentation
-	$(MAKE) build -C ../mkdocs
-	cp -r ../mkdocs/site/* nlohmann_json.docset/Contents/Resources/Documents
-	# patch CSS to hide navigation items
-	echo "\n\nheader, footer, navi, div.md-sidebar--primary, nav.md-tabs--active, a.md-content__button { display: none; }" >> nlohmann_json.docset/Contents/Resources/Documents/assets/stylesheets/main.b5d04df8.min.css
-	# fix spacing
-	echo "\n\ndiv.md-sidebar div.md-sidebar--secondary, div.md-main__inner { top: 0; margin-top: 0 }" >> nlohmann_json.docset/Contents/Resources/Documents/assets/stylesheets/main.b5d04df8.min.css
-	# remove "JSON for Modern C++" from page titles
-	find nlohmann_json.docset/Contents/Resources/Documents -type f -exec gsed -i 's| - JSON for Modern C++</title>|</title>|' {} +
-	# clean up
-	rm nlohmann_json.docset/Contents/Resources/Documents/hooks.py
-	rm nlohmann_json.docset/Contents/Resources/Documents/sitemap.*
-	# generate index
-	sqlite3 nlohmann_json.docset/Contents/Resources/docSet.dsidx < docSet.sql
-
-clean:
-	rm -fr nlohmann_json.docset
diff --git a/external_imported/json/doc/docset/README.md b/external_imported/json/doc/docset/README.md
deleted file mode 100644
index b0dd7f81e..000000000
--- a/external_imported/json/doc/docset/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# docset
-
-The folder contains the required files to create a [docset](https://kapeli.com/docsets) which can be used in
-documentation browsers like [Dash](https://kapeli.com/dash), [Velocity](https://velocity.silverlakesoftware.com), or
-[Zeal](https://zealdocs.org).
-
-The docset can be created with
-
-```sh
-make nlohmann_json.docset
-```
-
-The generated folder `nlohmann_json.docset` can then be opened in the documentation browser.
diff --git a/external_imported/json/doc/docset/docSet.sql b/external_imported/json/doc/docset/docSet.sql
deleted file mode 100644
index 243612035..000000000
--- a/external_imported/json/doc/docset/docSet.sql
+++ /dev/null
@@ -1,140 +0,0 @@
-DROP TABLE IF EXISTS searchIndex;
-CREATE TABLE searchIndex(id INTEGER PRIMARY KEY, name TEXT, type TEXT, path TEXT);
-CREATE UNIQUE INDEX anchor ON searchIndex (name, type, path);
-
--- API
-INSERT INTO searchIndex(name, type, path) VALUES ('accept', 'Function', 'api/basic_json/accept/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('adl_serializer', 'Class', 'api/adl_serializer/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('array', 'Function', 'api/basic_json/array/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('array_t', 'Type', 'api/basic_json/array_t/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('at', 'Method', 'api/basic_json/at/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('back', 'Method', 'api/basic_json/back/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('basic_json', 'Class', 'api/basic_json/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('basic_json', 'Constructor', 'api/basic_json/basic_json/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('begin', 'Method', 'api/basic_json/begin/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('binary', 'Function', 'api/basic_json/binary/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('binary_t', 'Type', 'api/basic_json/binary_t/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('boolean_t', 'Type', 'api/basic_json/boolean_t/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('cbegin', 'Method', 'api/basic_json/cbegin/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('cbor_tag_handler_t', 'Enum', 'api/basic_json/cbor_tag_handler_t/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('cend', 'Method', 'api/basic_json/cend/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('clear', 'Method', 'api/basic_json/clear/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('contains', 'Method', 'api/basic_json/contains/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('count', 'Method', 'api/basic_json/count/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('crbegin', 'Method', 'api/basic_json/crbegin/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('crend', 'Method', 'api/basic_json/crend/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('diff', 'Function', 'api/basic_json/diff/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('dump', 'Method', 'api/basic_json/dump/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('emplace', 'Method', 'api/basic_json/emplace/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('emplace_back', 'Method', 'api/basic_json/emplace_back/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('empty', 'Method', 'api/basic_json/empty/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('end', 'Method', 'api/basic_json/end/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('erase', 'Method', 'api/basic_json/erase/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('error_handler_t', 'Enum', 'api/basic_json/error_handler_t/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('exception', 'Class', 'api/basic_json/exception/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('find', 'Method', 'api/basic_json/find/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('flatten', 'Method', 'api/basic_json/flatten/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('from_bson', 'Function', 'api/basic_json/from_bson/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('from_cbor', 'Function', 'api/basic_json/from_cbor/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('from_msgpack', 'Function', 'api/basic_json/from_msgpack/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('from_ubjson', 'Function', 'api/basic_json/from_ubjson/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('front', 'Method', 'api/basic_json/front/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('get', 'Method', 'api/basic_json/get/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('get_allocator', 'Function', 'api/basic_json/get_allocator/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('get_binary', 'Method', 'api/basic_json/get_binary/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('get_ptr', 'Method', 'api/basic_json/get_ptr/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('get_ref', 'Method', 'api/basic_json/get_ref/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('get_to', 'Method', 'api/basic_json/get_to/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('input_format_t', 'Enum', 'api/basic_json/input_format_t/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('insert', 'Method', 'api/basic_json/insert/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('invalid_iterator', 'Class', 'api/basic_json/invalid_iterator/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('is_array', 'Method', 'api/basic_json/is_array/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('is_binary', 'Method', 'api/basic_json/is_binary/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('is_boolean', 'Method', 'api/basic_json/is_boolean/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('is_discarded', 'Method', 'api/basic_json/is_discarded/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('is_null', 'Method', 'api/basic_json/is_null/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('is_number', 'Method', 'api/basic_json/is_number/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('is_number_float', 'Method', 'api/basic_json/is_number_float/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('is_number_integer', 'Method', 'api/basic_json/is_number_integer/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('is_number_unsigned', 'Method', 'api/basic_json/is_number_unsigned/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('is_object', 'Method', 'api/basic_json/is_object/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('is_primitive', 'Method', 'api/basic_json/is_primitive/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('is_string', 'Method', 'api/basic_json/is_string/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('is_structured', 'Method', 'api/basic_json/is_structured/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('items', 'Method', 'api/basic_json/items/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('json', 'Class', 'api/json/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('json_pointer', 'Class', 'api/json_pointer/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('json_serializer', 'Type', 'api/basic_json/json_serializer/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('max_size', 'Method', 'api/basic_json/max_size/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('merge_patch', 'Method', 'api/basic_json/merge_patch/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('meta', 'Function', 'api/basic_json/meta/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('number_float_t', 'Type', 'api/basic_json/number_float_t/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('number_integer_t', 'Type', 'api/basic_json/number_integer_t/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('number_unsigned_t', 'Type', 'api/basic_json/number_unsigned_t/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('object', 'Function', 'api/basic_json/object/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('object_comparator_t', 'Type', 'api/basic_json/object_comparator_t/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('object_t', 'Type', 'api/basic_json/object_t/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('operator!=', 'Operator', 'api/basic_json/operator_ne/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('operator+=', 'Operator', 'api/basic_json/operator+=/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('operator=', 'Operator', 'api/basic_json/operator=/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('operator==', 'Operator', 'api/basic_json/operator_eq/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('operator<', 'Operator', 'api/basic_json/operator_lt/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('operator<=', 'Operator', 'api/basic_json/operator_le/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('operator>', 'Operator', 'api/basic_json/operator_gt/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('operator>=', 'Operator', 'api/basic_json/operator_ge/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('operator[]', 'Operator', 'api/basic_json/operator[]/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('operator""_json', 'Literal', 'api/basic_json/operator_literal_json/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('operator""_json_pointer', 'Literal', 'api/basic_json/operator_literal_json_pointer/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('operator ValueType', 'Operator', 'api/basic_json/operator_ValueType/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('operator value_t', 'Operator', 'api/basic_json/operator_value_t/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('ordered_json', 'Class', 'api/ordered_json/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('ordered_map', 'Class', 'api/ordered_map/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('out_of_range', 'Class', 'api/basic_json/out_of_range/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('other_error', 'Class', 'api/basic_json/other_error/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('parse', 'Function', 'api/basic_json/parse/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('parse_error', 'Class', 'api/basic_json/parse_error/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('parse_event_t', 'Enum', 'api/basic_json/parse_event_t/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('parser_callback_t', 'Type', 'api/basic_json/parser_callback_t/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('patch', 'Method', 'api/basic_json/patch/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('push_back', 'Method', 'api/basic_json/push_back/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('rbegin', 'Method', 'api/basic_json/rbegin/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('rend', 'Method', 'api/basic_json/rend/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('sax_parse', 'Function', 'api/basic_json/sax_parse/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('size', 'Method', 'api/basic_json/size/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('string_t', 'Type', 'api/basic_json/string_t/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('type', 'Method', 'api/basic_json/type/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('type_error', 'Class', 'api/basic_json/type_error/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('type_name', 'Method', 'api/basic_json/type_name/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('unflatten', 'Method', 'api/basic_json/unflatten/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('update', 'Method', 'api/basic_json/update/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('to_bson', 'Function', 'api/basic_json/to_bson/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('to_cbor', 'Function', 'api/basic_json/to_cbor/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('to_msgpack', 'Function', 'api/basic_json/to_msgpack/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('to_ubjson', 'Function', 'api/basic_json/to_ubjson/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('value', 'Method', 'api/basic_json/value/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('value_t', 'Enum', 'api/basic_json/value_t/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('~basic_json', 'Method', 'api/basic_json/~basic_json/index.html');
-
--- Features
-INSERT INTO searchIndex(name, type, path) VALUES ('Binary Formats', 'Guide', 'features/binary_formats/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('BSON', 'Guide', 'features/binary_formats/bson/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('CBOR', 'Guide', 'features/binary_formats/cbor/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('MessagePack', 'Guide', 'features/binary_formats/messagepack/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('UBJSON', 'Guide', 'features/binary_formats/ubjson/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('Supported Macros', 'Guide', 'features/macros/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('Binary Values', 'Guide', 'features/binary_values/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('Comments', 'Guide', 'features/comments/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('Iterators', 'Guide', 'features/iterators/index.html');
-INSERT INTO searchIndex(name, type, path) VALUES ('Types', 'Guide', 'features/types/index.html');
-
--- Macros
-INSERT INTO searchIndex(name, type, path) VALUES ('JSON_ASSERT', 'Macro', 'features/macros/index.html#json_assertx');
-INSERT INTO searchIndex(name, type, path) VALUES ('JSON_CATCH_USER', 'Macro', 'features/macros/index.html#json_catch_userexception');
-INSERT INTO searchIndex(name, type, path) VALUES ('JSON_NOEXCEPTION', 'Macro', 'features/macros/index.html#json_noexception');
-INSERT INTO searchIndex(name, type, path) VALUES ('JSON_SKIP_UNSUPPORTED_COMPILER_CHECK', 'Macro', 'features/macros/index.html#json_skip_unsupported_compiler_check');
-INSERT INTO searchIndex(name, type, path) VALUES ('JSON_THROW_USER', 'Macro', 'features/macros/index.html#json_throw_userexception');
-INSERT INTO searchIndex(name, type, path) VALUES ('JSON_TRY_USER', 'Macro', 'features/macros/index.html#json_try_user');
-INSERT INTO searchIndex(name, type, path) VALUES ('JSON_USE_IMPLICIT_CONVERSIONS', 'Macro', 'features/macros/index.html#json_use_implicit_conversions');
-INSERT INTO searchIndex(name, type, path) VALUES ('NLOHMANN_DEFINE_TYPE_INTRUSIVE', 'Macro', 'features/macros/index.html#nlohmann_define_type_intrusivetype-member');
-INSERT INTO searchIndex(name, type, path) VALUES ('NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE', 'Macro', 'features/macros/index.html#nlohmann_define_type_non_intrusivetype-member');
-INSERT INTO searchIndex(name, type, path) VALUES ('NLOHMANN_JSON_SERIALIZE_ENUM', 'Macro', 'features/macros/index.html#nlohmann_json_serialize_enumtype');
diff --git a/external_imported/json/doc/examples/README.link b/external_imported/json/doc/examples/README.link
deleted file mode 100644
index 2bb56a02a..000000000
--- a/external_imported/json/doc/examples/README.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/UYcLkpu1GaaAO2Cp"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/accept__string.link b/external_imported/json/doc/examples/accept__string.link
deleted file mode 100644
index 8456e3bfc..000000000
--- a/external_imported/json/doc/examples/accept__string.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/r5Tai1spihWHTdFA"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/array.link b/external_imported/json/doc/examples/array.link
deleted file mode 100644
index 4c69b84ec..000000000
--- a/external_imported/json/doc/examples/array.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/Ptk2BoNyGfrZfxRU"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/at__object_t_key_type.link b/external_imported/json/doc/examples/at__object_t_key_type.link
deleted file mode 100644
index 0518fe656..000000000
--- a/external_imported/json/doc/examples/at__object_t_key_type.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/055DW3OWJPwGYr92"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/at__object_t_key_type_const.link b/external_imported/json/doc/examples/at__object_t_key_type_const.link
deleted file mode 100644
index a7cd73be7..000000000
--- a/external_imported/json/doc/examples/at__object_t_key_type_const.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/gM1uqvzukokLwjMa"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/at__size_type.link b/external_imported/json/doc/examples/at__size_type.link
deleted file mode 100644
index a98adcb03..000000000
--- a/external_imported/json/doc/examples/at__size_type.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/H3tBOr4lpufGRHlF"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/at__size_type_const.link b/external_imported/json/doc/examples/at__size_type_const.link
deleted file mode 100644
index 73a13bb1c..000000000
--- a/external_imported/json/doc/examples/at__size_type_const.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/UtGhIQGxCYIml36F"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/at_json_pointer.cpp b/external_imported/json/doc/examples/at_json_pointer.cpp
deleted file mode 100644
index ed450f70d..000000000
--- a/external_imported/json/doc/examples/at_json_pointer.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-#include <iostream>
-#include <nlohmann/json.hpp>
-
-using json = nlohmann::json;
-
-int main()
-{
-    // create a JSON value
-    json j =
-    {
-        {"number", 1}, {"string", "foo"}, {"array", {1, 2}}
-    };
-
-    // read-only access
-
-    // output element with JSON pointer "/number"
-    std::cout << j.at("/number"_json_pointer) << '\n';
-    // output element with JSON pointer "/string"
-    std::cout << j.at("/string"_json_pointer) << '\n';
-    // output element with JSON pointer "/array"
-    std::cout << j.at("/array"_json_pointer) << '\n';
-    // output element with JSON pointer "/array/1"
-    std::cout << j.at("/array/1"_json_pointer) << '\n';
-
-    // writing access
-
-    // change the string
-    j.at("/string"_json_pointer) = "bar";
-    // output the changed string
-    std::cout << j["string"] << '\n';
-
-    // change an array element
-    j.at("/array/1"_json_pointer) = 21;
-    // output the changed array
-    std::cout << j["array"] << '\n';
-
-
-    // out_of_range.106
-    try
-    {
-        // try to use an array index with leading '0'
-        json::reference ref = j.at("/array/01"_json_pointer);
-    }
-    catch (json::parse_error& e)
-    {
-        std::cout << e.what() << '\n';
-    }
-
-    // out_of_range.109
-    try
-    {
-        // try to use an array index that is not a number
-        json::reference ref = j.at("/array/one"_json_pointer);
-    }
-    catch (json::parse_error& e)
-    {
-        std::cout << e.what() << '\n';
-    }
-
-    // out_of_range.401
-    try
-    {
-        // try to use a an invalid array index
-        json::reference ref = j.at("/array/4"_json_pointer);
-    }
-    catch (json::out_of_range& e)
-    {
-        std::cout << e.what() << '\n';
-    }
-
-    // out_of_range.402
-    try
-    {
-        // try to use the array index '-'
-        json::reference ref = j.at("/array/-"_json_pointer);
-    }
-    catch (json::out_of_range& e)
-    {
-        std::cout << e.what() << '\n';
-    }
-
-    // out_of_range.403
-    try
-    {
-        // try to use a JSON pointer to an nonexistent object key
-        json::const_reference ref = j.at("/foo"_json_pointer);
-    }
-    catch (json::out_of_range& e)
-    {
-        std::cout << e.what() << '\n';
-    }
-
-    // out_of_range.404
-    try
-    {
-        // try to use a JSON pointer that cannot be resolved
-        json::reference ref = j.at("/number/foo"_json_pointer);
-    }
-    catch (json::out_of_range& e)
-    {
-        std::cout << e.what() << '\n';
-    }
-}
diff --git a/external_imported/json/doc/examples/at_json_pointer.link b/external_imported/json/doc/examples/at_json_pointer.link
deleted file mode 100644
index a4e2c24fc..000000000
--- a/external_imported/json/doc/examples/at_json_pointer.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/NHe5FLR1KYaiHwBx"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/at_json_pointer_const.cpp b/external_imported/json/doc/examples/at_json_pointer_const.cpp
deleted file mode 100644
index 6f2b2f5ed..000000000
--- a/external_imported/json/doc/examples/at_json_pointer_const.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-#include <iostream>
-#include <nlohmann/json.hpp>
-
-using json = nlohmann::json;
-
-int main()
-{
-    // create a JSON value
-    const json j =
-    {
-        {"number", 1}, {"string", "foo"}, {"array", {1, 2}}
-    };
-
-    // read-only access
-
-    // output element with JSON pointer "/number"
-    std::cout << j.at("/number"_json_pointer) << '\n';
-    // output element with JSON pointer "/string"
-    std::cout << j.at("/string"_json_pointer) << '\n';
-    // output element with JSON pointer "/array"
-    std::cout << j.at("/array"_json_pointer) << '\n';
-    // output element with JSON pointer "/array/1"
-    std::cout << j.at("/array/1"_json_pointer) << '\n';
-
-    // out_of_range.109
-    try
-    {
-        // try to use an array index that is not a number
-        json::const_reference ref = j.at("/array/one"_json_pointer);
-    }
-    catch (json::parse_error& e)
-    {
-        std::cout << e.what() << '\n';
-    }
-
-    // out_of_range.401
-    try
-    {
-        // try to use a an invalid array index
-        json::const_reference ref = j.at("/array/4"_json_pointer);
-    }
-    catch (json::out_of_range& e)
-    {
-        std::cout << e.what() << '\n';
-    }
-
-    // out_of_range.402
-    try
-    {
-        // try to use the array index '-'
-        json::const_reference ref = j.at("/array/-"_json_pointer);
-    }
-    catch (json::out_of_range& e)
-    {
-        std::cout << e.what() << '\n';
-    }
-
-    // out_of_range.403
-    try
-    {
-        // try to use a JSON pointer to an nonexistent object key
-        json::const_reference ref = j.at("/foo"_json_pointer);
-    }
-    catch (json::out_of_range& e)
-    {
-        std::cout << e.what() << '\n';
-    }
-
-    // out_of_range.404
-    try
-    {
-        // try to use a JSON pointer that cannot be resolved
-        json::const_reference ref = j.at("/number/foo"_json_pointer);
-    }
-    catch (json::out_of_range& e)
-    {
-        std::cout << e.what() << '\n';
-    }
-}
diff --git a/external_imported/json/doc/examples/at_json_pointer_const.link b/external_imported/json/doc/examples/at_json_pointer_const.link
deleted file mode 100644
index f04bf5a67..000000000
--- a/external_imported/json/doc/examples/at_json_pointer_const.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/lbZjdwg6yII33cV5"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/back.link b/external_imported/json/doc/examples/back.link
deleted file mode 100644
index 7fe2400a8..000000000
--- a/external_imported/json/doc/examples/back.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/swnzqmd8zj6ij1fb"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/basic_json__CompatibleType.link b/external_imported/json/doc/examples/basic_json__CompatibleType.link
deleted file mode 100644
index a6336474c..000000000
--- a/external_imported/json/doc/examples/basic_json__CompatibleType.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/RodBcX8vpcP5dQ40"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/basic_json__InputIt_InputIt.link b/external_imported/json/doc/examples/basic_json__InputIt_InputIt.link
deleted file mode 100644
index 844e914f5..000000000
--- a/external_imported/json/doc/examples/basic_json__InputIt_InputIt.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/oWFo4AhVlMBjNv8E"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/basic_json__basic_json.link b/external_imported/json/doc/examples/basic_json__basic_json.link
deleted file mode 100644
index 757e2c761..000000000
--- a/external_imported/json/doc/examples/basic_json__basic_json.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/oRn0YsYyurs0Zi5T"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/basic_json__copyassignment.link b/external_imported/json/doc/examples/basic_json__copyassignment.link
deleted file mode 100644
index 86beb677a..000000000
--- a/external_imported/json/doc/examples/basic_json__copyassignment.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/kVknQzPMpqjywTpG"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/basic_json__list_init_t.link b/external_imported/json/doc/examples/basic_json__list_init_t.link
deleted file mode 100644
index 126f69280..000000000
--- a/external_imported/json/doc/examples/basic_json__list_init_t.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/yzkjGGzMOESBkCdH"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/basic_json__moveconstructor.link b/external_imported/json/doc/examples/basic_json__moveconstructor.link
deleted file mode 100644
index 9318284e8..000000000
--- a/external_imported/json/doc/examples/basic_json__moveconstructor.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/eIOvQiuID2qgxp5u"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/basic_json__nullptr_t.link b/external_imported/json/doc/examples/basic_json__nullptr_t.link
deleted file mode 100644
index bcc4e9601..000000000
--- a/external_imported/json/doc/examples/basic_json__nullptr_t.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/Vm0nR32x6co8rq40"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/basic_json__size_type_basic_json.link b/external_imported/json/doc/examples/basic_json__size_type_basic_json.link
deleted file mode 100644
index 6a6742b91..000000000
--- a/external_imported/json/doc/examples/basic_json__size_type_basic_json.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/w4TtEQzlVyokIrtp"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/basic_json__value.link b/external_imported/json/doc/examples/basic_json__value.link
deleted file mode 100644
index f47a80d6b..000000000
--- a/external_imported/json/doc/examples/basic_json__value.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/mNy1nyabOkeHfHGf"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/basic_json__value_ptr.cpp b/external_imported/json/doc/examples/basic_json__value_ptr.cpp
deleted file mode 100644
index f25b7736a..000000000
--- a/external_imported/json/doc/examples/basic_json__value_ptr.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#include <iostream>
-#include <nlohmann/json.hpp>
-
-using json = nlohmann::json;
-
-int main()
-{
-    // create a JSON object with different entry types
-    json j =
-    {
-        {"integer", 1},
-        {"floating", 42.23},
-        {"string", "hello world"},
-        {"boolean", true},
-        {"object", {{"key1", 1}, {"key2", 2}}},
-        {"array", {1, 2, 3}}
-    };
-
-    // access existing values
-    int v_integer = j.value("/integer"_json_pointer, 0);
-    double v_floating = j.value("/floating"_json_pointer, 47.11);
-
-    // access nonexisting values and rely on default value
-    std::string v_string = j.value("/nonexisting"_json_pointer, "oops");
-    bool v_boolean = j.value("/nonexisting"_json_pointer, false);
-
-    // output values
-    std::cout << std::boolalpha << v_integer << " " << v_floating
-              << " " << v_string << " " << v_boolean << "\n";
-}
diff --git a/external_imported/json/doc/examples/basic_json__value_ptr.link b/external_imported/json/doc/examples/basic_json__value_ptr.link
deleted file mode 100644
index 14d3851b4..000000000
--- a/external_imported/json/doc/examples/basic_json__value_ptr.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/a3H6kpORXgbVXylv"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/basic_json__value_t.link b/external_imported/json/doc/examples/basic_json__value_t.link
deleted file mode 100644
index d80f2482a..000000000
--- a/external_imported/json/doc/examples/basic_json__value_t.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/yXZGDwDHH3LOuFIr"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/begin.link b/external_imported/json/doc/examples/begin.link
deleted file mode 100644
index 1f59a9bd7..000000000
--- a/external_imported/json/doc/examples/begin.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/fS4kfQG1hmhjMScn"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/cbegin.link b/external_imported/json/doc/examples/cbegin.link
deleted file mode 100644
index 26ff77342..000000000
--- a/external_imported/json/doc/examples/cbegin.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/hxcSxCPPLHpZMxjS"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/cend.link b/external_imported/json/doc/examples/cend.link
deleted file mode 100644
index a1adb3a82..000000000
--- a/external_imported/json/doc/examples/cend.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/xbnldrrN05tKIOEv"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/clear.link b/external_imported/json/doc/examples/clear.link
deleted file mode 100644
index 0146c1878..000000000
--- a/external_imported/json/doc/examples/clear.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/gDQPYFxMrvD7RK4z"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/contains.cpp b/external_imported/json/doc/examples/contains.cpp
deleted file mode 100644
index df8201c33..000000000
--- a/external_imported/json/doc/examples/contains.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <iostream>
-#include <nlohmann/json.hpp>
-
-using json = nlohmann::json;
-
-int main()
-{
-    // create some JSON values
-    json j_object = R"( {"key": "value"} )"_json;
-    json j_array = R"( [1, 2, 3] )"_json;
-
-    // call contains
-    std::cout << std::boolalpha <<
-              "j_object contains 'key': " << j_object.contains("key") << '\n' <<
-              "j_object contains 'another': " << j_object.contains("another") << '\n' <<
-              "j_array contains 'key': " << j_array.contains("key") << std::endl;
-}
diff --git a/external_imported/json/doc/examples/contains.link b/external_imported/json/doc/examples/contains.link
deleted file mode 100644
index f57e70268..000000000
--- a/external_imported/json/doc/examples/contains.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/vVY4F4xKC3v6pG6F"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/contains_json_pointer.cpp b/external_imported/json/doc/examples/contains_json_pointer.cpp
deleted file mode 100644
index 54bcaa9e4..000000000
--- a/external_imported/json/doc/examples/contains_json_pointer.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-#include <iostream>
-#include <nlohmann/json.hpp>
-
-using json = nlohmann::json;
-
-int main()
-{
-    // create a JSON value
-    json j =
-    {
-        {"number", 1}, {"string", "foo"}, {"array", {1, 2}}
-    };
-
-    std::cout << std::boolalpha
-              << j.contains("/number"_json_pointer) << '\n'
-              << j.contains("/string"_json_pointer) << '\n'
-              << j.contains("/array"_json_pointer) << '\n'
-              << j.contains("/array/1"_json_pointer) << '\n'
-              << j.contains("/array/-"_json_pointer) << '\n'
-              << j.contains("/array/4"_json_pointer) << '\n'
-              << j.contains("/baz"_json_pointer) << std::endl;
-
-    try
-    {
-        // try to use an array index with leading '0'
-        j.contains("/array/01"_json_pointer);
-    }
-    catch (json::parse_error& e)
-    {
-        std::cout << e.what() << '\n';
-    }
-
-    try
-    {
-        // try to use an array index that is not a number
-        j.contains("/array/one"_json_pointer);
-    }
-    catch (json::parse_error& e)
-    {
-        std::cout << e.what() << '\n';
-    }
-}
diff --git a/external_imported/json/doc/examples/contains_json_pointer.link b/external_imported/json/doc/examples/contains_json_pointer.link
deleted file mode 100644
index 1648e373d..000000000
--- a/external_imported/json/doc/examples/contains_json_pointer.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/Q2GTzxF8NA10kVvD"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/count.link b/external_imported/json/doc/examples/count.link
deleted file mode 100644
index 2c4c08131..000000000
--- a/external_imported/json/doc/examples/count.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/6LRjg1bqwchPUoDx"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/crbegin.link b/external_imported/json/doc/examples/crbegin.link
deleted file mode 100644
index f7da8d6fd..000000000
--- a/external_imported/json/doc/examples/crbegin.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/JMDd9jiP0flRKJ6C"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/crend.link b/external_imported/json/doc/examples/crend.link
deleted file mode 100644
index fc3d145fd..000000000
--- a/external_imported/json/doc/examples/crend.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/HdlqwPk8bDfrZ4AE"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/diagnostics_extended.link b/external_imported/json/doc/examples/diagnostics_extended.link
deleted file mode 100644
index 9f10da942..000000000
--- a/external_imported/json/doc/examples/diagnostics_extended.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/pbz3ULoJ4maRnV8N"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/diagnostics_standard.link b/external_imported/json/doc/examples/diagnostics_standard.link
deleted file mode 100644
index cd0453b5e..000000000
--- a/external_imported/json/doc/examples/diagnostics_standard.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/fWfQhHzG03P6PAcC"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/diff.link b/external_imported/json/doc/examples/diff.link
deleted file mode 100644
index 7adb19bba..000000000
--- a/external_imported/json/doc/examples/diff.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/GHVHgDpT5vx0KMPD"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/dump.link b/external_imported/json/doc/examples/dump.link
deleted file mode 100644
index 84d944151..000000000
--- a/external_imported/json/doc/examples/dump.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/DyMiKrkKMwd3R7OU"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/emplace.link b/external_imported/json/doc/examples/emplace.link
deleted file mode 100644
index 02b41d8bb..000000000
--- a/external_imported/json/doc/examples/emplace.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/p9P3Ph8mdxMON6SY"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/emplace_back.link b/external_imported/json/doc/examples/emplace_back.link
deleted file mode 100644
index 7290ca695..000000000
--- a/external_imported/json/doc/examples/emplace_back.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/yMxKrJfRedlFygJD"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/empty.link b/external_imported/json/doc/examples/empty.link
deleted file mode 100644
index cfe5867c2..000000000
--- a/external_imported/json/doc/examples/empty.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/zaexgkNdH3HYJm8D"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/end.link b/external_imported/json/doc/examples/end.link
deleted file mode 100644
index abe8fedd7..000000000
--- a/external_imported/json/doc/examples/end.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/eQ0YI8wWcMIHtBCS"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/erase__IteratorType.link b/external_imported/json/doc/examples/erase__IteratorType.link
deleted file mode 100644
index f1d7ba51d..000000000
--- a/external_imported/json/doc/examples/erase__IteratorType.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/SD62jUgeIuudweZu"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/erase__IteratorType_IteratorType.link b/external_imported/json/doc/examples/erase__IteratorType_IteratorType.link
deleted file mode 100644
index 2d6d24c20..000000000
--- a/external_imported/json/doc/examples/erase__IteratorType_IteratorType.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/gG3bN97HOF04Xw6S"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/erase__key_type.link b/external_imported/json/doc/examples/erase__key_type.link
deleted file mode 100644
index df8239156..000000000
--- a/external_imported/json/doc/examples/erase__key_type.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/WSnobkZJZHUPUIRF"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/erase__size_type.link b/external_imported/json/doc/examples/erase__size_type.link
deleted file mode 100644
index a46d5276c..000000000
--- a/external_imported/json/doc/examples/erase__size_type.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/GGoqGtqEzxAsAKnI"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/exception.link b/external_imported/json/doc/examples/exception.link
deleted file mode 100644
index 5f40ff4c7..000000000
--- a/external_imported/json/doc/examples/exception.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/vky6QCTCqtUnNVlD"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/find__key_type.link b/external_imported/json/doc/examples/find__key_type.link
deleted file mode 100644
index 0bfcc8a70..000000000
--- a/external_imported/json/doc/examples/find__key_type.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/aQjZSjuuDUxXQCjJ"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/flatten.link b/external_imported/json/doc/examples/flatten.link
deleted file mode 100644
index ac836a585..000000000
--- a/external_imported/json/doc/examples/flatten.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/moO4IdryeGS8QmKo"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/from_bson.cpp b/external_imported/json/doc/examples/from_bson.cpp
deleted file mode 100644
index df71dd37e..000000000
--- a/external_imported/json/doc/examples/from_bson.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <iostream>
-#include <iomanip>
-#include <nlohmann/json.hpp>
-
-using json = nlohmann::json;
-
-int main()
-{
-    // create byte vector
-    std::vector<uint8_t> v = {0x1b, 0x00, 0x00, 0x00, 0x08, 0x63, 0x6f, 0x6d,
-                              0x70, 0x61, 0x63, 0x74, 0x00, 0x01, 0x10, 0x73,
-                              0x63, 0x68, 0x65, 0x6d, 0x61, 0x00, 0x00, 0x00,
-                              0x00, 0x00, 0x00
-                             };
-
-    // deserialize it with BSON
-    json j = json::from_bson(v);
-
-    // print the deserialized JSON value
-    std::cout << std::setw(2) << j << std::endl;
-}
diff --git a/external_imported/json/doc/examples/from_bson.link b/external_imported/json/doc/examples/from_bson.link
deleted file mode 100644
index 08af52bcc..000000000
--- a/external_imported/json/doc/examples/from_bson.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/Q7O1liz5QrgQynqQ"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/from_cbor.cpp b/external_imported/json/doc/examples/from_cbor.cpp
deleted file mode 100644
index e49987e55..000000000
--- a/external_imported/json/doc/examples/from_cbor.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <iostream>
-#include <iomanip>
-#include <nlohmann/json.hpp>
-
-using json = nlohmann::json;
-
-int main()
-{
-    // create byte vector
-    std::vector<uint8_t> v = {0xa2, 0x67, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x63,
-                              0x74, 0xf5, 0x66, 0x73, 0x63, 0x68, 0x65, 0x6d,
-                              0x61, 0x00
-                             };
-
-    // deserialize it with CBOR
-    json j = json::from_cbor(v);
-
-    // print the deserialized JSON value
-    std::cout << std::setw(2) << j << std::endl;
-}
diff --git a/external_imported/json/doc/examples/from_cbor.link b/external_imported/json/doc/examples/from_cbor.link
deleted file mode 100644
index bbb578c4a..000000000
--- a/external_imported/json/doc/examples/from_cbor.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/AjdbchxfTsN9PHCL"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/from_msgpack.cpp b/external_imported/json/doc/examples/from_msgpack.cpp
deleted file mode 100644
index 67fdc454b..000000000
--- a/external_imported/json/doc/examples/from_msgpack.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <iostream>
-#include <iomanip>
-#include <nlohmann/json.hpp>
-
-using json = nlohmann::json;
-
-int main()
-{
-    // create byte vector
-    std::vector<uint8_t> v = {0x82, 0xa7, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x63,
-                              0x74, 0xc3, 0xa6, 0x73, 0x63, 0x68, 0x65, 0x6d,
-                              0x61, 0x00
-                             };
-
-    // deserialize it with MessagePack
-    json j = json::from_msgpack(v);
-
-    // print the deserialized JSON value
-    std::cout << std::setw(2) << j << std::endl;
-}
diff --git a/external_imported/json/doc/examples/from_msgpack.link b/external_imported/json/doc/examples/from_msgpack.link
deleted file mode 100644
index 77a55594c..000000000
--- a/external_imported/json/doc/examples/from_msgpack.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/TdJfkKx0RAH5NB62"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/from_ubjson.cpp b/external_imported/json/doc/examples/from_ubjson.cpp
deleted file mode 100644
index a84057ed1..000000000
--- a/external_imported/json/doc/examples/from_ubjson.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <iostream>
-#include <iomanip>
-#include <nlohmann/json.hpp>
-
-using json = nlohmann::json;
-
-int main()
-{
-    // create byte vector
-    std::vector<uint8_t> v = {0x7B, 0x69, 0x07, 0x63, 0x6F, 0x6D, 0x70, 0x61,
-                              0x63, 0x74, 0x54, 0x69, 0x06, 0x73, 0x63, 0x68,
-                              0x65, 0x6D, 0x61, 0x69, 0x00, 0x7D
-                             };
-
-    // deserialize it with UBJSON
-    json j = json::from_ubjson(v);
-
-    // print the deserialized JSON value
-    std::cout << std::setw(2) << j << std::endl;
-}
diff --git a/external_imported/json/doc/examples/from_ubjson.link b/external_imported/json/doc/examples/from_ubjson.link
deleted file mode 100644
index c5f82cb48..000000000
--- a/external_imported/json/doc/examples/from_ubjson.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/GG9VzOZh1MDeTSsK"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/front.link b/external_imported/json/doc/examples/front.link
deleted file mode 100644
index ab3cc8d57..000000000
--- a/external_imported/json/doc/examples/front.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/LtqaiI6oRplSg0KI"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/get__PointerType.cpp b/external_imported/json/doc/examples/get__PointerType.cpp
deleted file mode 100644
index 2f32ed7af..000000000
--- a/external_imported/json/doc/examples/get__PointerType.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <iostream>
-#include <nlohmann/json.hpp>
-
-using json = nlohmann::json;
-
-int main()
-{
-    // create a JSON number
-    json value = 17;
-
-    // explicitly getting pointers
-    auto p1 = value.get<const json::number_integer_t*>();
-    auto p2 = value.get<json::number_integer_t*>();
-    auto p3 = value.get<json::number_integer_t* const>();
-    auto p4 = value.get<const json::number_integer_t* const>();
-    auto p5 = value.get<json::number_float_t*>();
-
-    // print the pointees
-    std::cout << *p1 << ' ' << *p2 << ' ' << *p3 << ' ' << *p4 << '\n';
-    std::cout << std::boolalpha << (p5 == nullptr) << '\n';
-}
diff --git a/external_imported/json/doc/examples/get__PointerType.link b/external_imported/json/doc/examples/get__PointerType.link
deleted file mode 100644
index f4a213e15..000000000
--- a/external_imported/json/doc/examples/get__PointerType.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/ddVSXnbULrNrCbRs"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/get__ValueType_const.cpp b/external_imported/json/doc/examples/get__ValueType_const.cpp
deleted file mode 100644
index 7a703aaeb..000000000
--- a/external_imported/json/doc/examples/get__ValueType_const.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-#include <iostream>
-#include <unordered_map>
-#include <nlohmann/json.hpp>
-
-using json = nlohmann::json;
-
-int main()
-{
-    // create a JSON value with different types
-    json json_types =
-    {
-        {"boolean", true},
-        {
-            "number", {
-                {"integer", 42},
-                {"floating-point", 17.23}
-            }
-        },
-        {"string", "Hello, world!"},
-        {"array", {1, 2, 3, 4, 5}},
-        {"null", nullptr}
-    };
-
-    // use explicit conversions
-    auto v1 = json_types["boolean"].get<bool>();
-    auto v2 = json_types["number"]["integer"].get<int>();
-    auto v3 = json_types["number"]["integer"].get<short>();
-    auto v4 = json_types["number"]["floating-point"].get<float>();
-    auto v5 = json_types["number"]["floating-point"].get<int>();
-    auto v6 = json_types["string"].get<std::string>();
-    auto v7 = json_types["array"].get<std::vector<short>>();
-    auto v8 = json_types.get<std::unordered_map<std::string, json>>();
-
-    // print the conversion results
-    std::cout << v1 << '\n';
-    std::cout << v2 << ' ' << v3 << '\n';
-    std::cout << v4 << ' ' << v5 << '\n';
-    std::cout << v6 << '\n';
-
-    for (auto i : v7)
-    {
-        std::cout << i << ' ';
-    }
-    std::cout << "\n\n";
-
-    for (auto i : v8)
-    {
-        std::cout << i.first << ": " << i.second << '\n';
-    }
-}
diff --git a/external_imported/json/doc/examples/get__ValueType_const.link b/external_imported/json/doc/examples/get__ValueType_const.link
deleted file mode 100644
index cf444a129..000000000
--- a/external_imported/json/doc/examples/get__ValueType_const.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/QjVgxx0bwbKuE9HI"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/get_ptr.link b/external_imported/json/doc/examples/get_ptr.link
deleted file mode 100644
index 139fd0435..000000000
--- a/external_imported/json/doc/examples/get_ptr.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/eA1KrytMlQl1SURe"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/get_ref.link b/external_imported/json/doc/examples/get_ref.link
deleted file mode 100644
index 360d00229..000000000
--- a/external_imported/json/doc/examples/get_ref.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/jVaWWe3kAjKKn99V"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/get_to.link b/external_imported/json/doc/examples/get_to.link
deleted file mode 100644
index 5adf0ec78..000000000
--- a/external_imported/json/doc/examples/get_to.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/UvdMlXdPnXFUq1lJ"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/insert.link b/external_imported/json/doc/examples/insert.link
deleted file mode 100644
index 4d742039f..000000000
--- a/external_imported/json/doc/examples/insert.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/N1nlz2liDCmBn40h"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/insert__count.link b/external_imported/json/doc/examples/insert__count.link
deleted file mode 100644
index 49b892bb7..000000000
--- a/external_imported/json/doc/examples/insert__count.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/eoHfSYf04soRkOto"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/insert__ilist.link b/external_imported/json/doc/examples/insert__ilist.link
deleted file mode 100644
index ea6760f9e..000000000
--- a/external_imported/json/doc/examples/insert__ilist.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/oNhgDq5ejDl5RyqW"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/insert__range.link b/external_imported/json/doc/examples/insert__range.link
deleted file mode 100644
index a2c24a087..000000000
--- a/external_imported/json/doc/examples/insert__range.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/LdmbgtdndQw81wQU"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/insert__range_object.link b/external_imported/json/doc/examples/insert__range_object.link
deleted file mode 100644
index 9c45c4739..000000000
--- a/external_imported/json/doc/examples/insert__range_object.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/kp99ButEWpuNxPbq"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/invalid_iterator.link b/external_imported/json/doc/examples/invalid_iterator.link
deleted file mode 100644
index 0ef322e81..000000000
--- a/external_imported/json/doc/examples/invalid_iterator.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/oUdIj3ZSbg7UCIuz"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/is_array.link b/external_imported/json/doc/examples/is_array.link
deleted file mode 100644
index dd17ccbec..000000000
--- a/external_imported/json/doc/examples/is_array.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/2ZgSEJ7UBJ9d4H6b"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/is_binary.link b/external_imported/json/doc/examples/is_binary.link
deleted file mode 100644
index 0443f9105..000000000
--- a/external_imported/json/doc/examples/is_binary.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/to5RDM1vhrDMUfVv"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/is_boolean.link b/external_imported/json/doc/examples/is_boolean.link
deleted file mode 100644
index 3e740d6c6..000000000
--- a/external_imported/json/doc/examples/is_boolean.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/20OXaCBWTM1dhFmv"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/is_discarded.link b/external_imported/json/doc/examples/is_discarded.link
deleted file mode 100644
index de93aa944..000000000
--- a/external_imported/json/doc/examples/is_discarded.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/rTNvfIpTXdFXIe20"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/is_null.link b/external_imported/json/doc/examples/is_null.link
deleted file mode 100644
index fbeab6e57..000000000
--- a/external_imported/json/doc/examples/is_null.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/GCQOJn7fTbm6kPBo"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/is_number.link b/external_imported/json/doc/examples/is_number.link
deleted file mode 100644
index b10372a0a..000000000
--- a/external_imported/json/doc/examples/is_number.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/guySOWaTCKiXcueC"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/is_number_float.link b/external_imported/json/doc/examples/is_number_float.link
deleted file mode 100644
index f58a47f6d..000000000
--- a/external_imported/json/doc/examples/is_number_float.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/371XB9Jo3cwHDIBc"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/is_number_integer.link b/external_imported/json/doc/examples/is_number_integer.link
deleted file mode 100644
index 94a351dec..000000000
--- a/external_imported/json/doc/examples/is_number_integer.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/qzb1GYNdSbeVRamt"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/is_number_unsigned.link b/external_imported/json/doc/examples/is_number_unsigned.link
deleted file mode 100644
index c8bed2123..000000000
--- a/external_imported/json/doc/examples/is_number_unsigned.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/wcfMOOVBjQMZ6iQi"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/is_object.link b/external_imported/json/doc/examples/is_object.link
deleted file mode 100644
index f8240d977..000000000
--- a/external_imported/json/doc/examples/is_object.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/I9UET2tNOZLYKvf9"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/is_primitive.link b/external_imported/json/doc/examples/is_primitive.link
deleted file mode 100644
index 7f1664989..000000000
--- a/external_imported/json/doc/examples/is_primitive.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/wdEBCnH75A2tWTPp"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/is_string.link b/external_imported/json/doc/examples/is_string.link
deleted file mode 100644
index 999ccd948..000000000
--- a/external_imported/json/doc/examples/is_string.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/Lcz1noVRzYcB7vXP"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/is_structured.link b/external_imported/json/doc/examples/is_structured.link
deleted file mode 100644
index e54b5c1ee..000000000
--- a/external_imported/json/doc/examples/is_structured.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/1eYTBWunXeo3dEXD"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/items.link b/external_imported/json/doc/examples/items.link
deleted file mode 100644
index 61f135604..000000000
--- a/external_imported/json/doc/examples/items.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/ScW4gbehjRyjHyPZ"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/iterator_wrapper.cpp b/external_imported/json/doc/examples/iterator_wrapper.cpp
deleted file mode 100644
index 7ef5bc57e..000000000
--- a/external_imported/json/doc/examples/iterator_wrapper.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <iostream>
-#include <nlohmann/json.hpp>
-
-using json = nlohmann::json;
-
-int main()
-{
-    // create JSON values
-    json j_object = {{"one", 1}, {"two", 2}};
-    json j_array = {1, 2, 4, 8, 16};
-
-    // example for an object
-    for (auto& x : json::iterator_wrapper(j_object))
-    {
-        std::cout << "key: " << x.key() << ", value: " << x.value() << '\n';
-    }
-
-    // example for an array
-    for (auto& x : json::iterator_wrapper(j_array))
-    {
-        std::cout << "key: " << x.key() << ", value: " << x.value() << '\n';
-    }
-}
diff --git a/external_imported/json/doc/examples/iterator_wrapper.link b/external_imported/json/doc/examples/iterator_wrapper.link
deleted file mode 100644
index 43c08ab07..000000000
--- a/external_imported/json/doc/examples/iterator_wrapper.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/CwtYFd6vT8GjFFcd"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/iterator_wrapper.output b/external_imported/json/doc/examples/iterator_wrapper.output
deleted file mode 100644
index 89b09f524..000000000
--- a/external_imported/json/doc/examples/iterator_wrapper.output
+++ /dev/null
@@ -1,7 +0,0 @@
-key: one, value: 1
-key: two, value: 2
-key: 0, value: 1
-key: 1, value: 2
-key: 2, value: 4
-key: 3, value: 8
-key: 4, value: 16
diff --git a/external_imported/json/doc/examples/json_pointer.link b/external_imported/json/doc/examples/json_pointer.link
deleted file mode 100644
index 1d3074ffe..000000000
--- a/external_imported/json/doc/examples/json_pointer.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/FTpanTtjcQQjZc2F"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/json_pointer__back.cpp b/external_imported/json/doc/examples/json_pointer__back.cpp
deleted file mode 100644
index 3d57c589a..000000000
--- a/external_imported/json/doc/examples/json_pointer__back.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <iostream>
-#include <nlohmann/json.hpp>
-
-using json = nlohmann::json;
-
-int main()
-{
-    // different JSON Pointers
-    json::json_pointer ptr1("/foo");
-    json::json_pointer ptr2("/foo/0");
-
-    // call empty()
-    std::cout << "last reference token of " << ptr1 << " is " << ptr1.back() << '\n'
-              << "last reference token of " << ptr2 << " is " << ptr2.back() << std::endl;
-}
diff --git a/external_imported/json/doc/examples/json_pointer__back.link b/external_imported/json/doc/examples/json_pointer__back.link
deleted file mode 100644
index 0ab9687b6..000000000
--- a/external_imported/json/doc/examples/json_pointer__back.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/qjWp2KSJctelS7Fe"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/json_pointer__back.output b/external_imported/json/doc/examples/json_pointer__back.output
deleted file mode 100644
index da4d02794..000000000
--- a/external_imported/json/doc/examples/json_pointer__back.output
+++ /dev/null
@@ -1,2 +0,0 @@
-last reference token of "/foo" is foo
-last reference token of "/foo/0" is 0
diff --git a/external_imported/json/doc/examples/json_pointer__empty.cpp b/external_imported/json/doc/examples/json_pointer__empty.cpp
deleted file mode 100644
index 5daaadc6c..000000000
--- a/external_imported/json/doc/examples/json_pointer__empty.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <iostream>
-#include <nlohmann/json.hpp>
-
-using json = nlohmann::json;
-
-int main()
-{
-    // different JSON Pointers
-    json::json_pointer ptr0;
-    json::json_pointer ptr1("");
-    json::json_pointer ptr2("/foo");
-    json::json_pointer ptr3("/foo/0");
-
-    // call empty()
-    std::cout << std::boolalpha
-              << ptr0 << ": " << ptr0.empty() << '\n'
-              << ptr1 << ": " << ptr1.empty() << '\n'
-              << ptr2 << ": " << ptr2.empty() << '\n'
-              << ptr3 << ": " << ptr3.empty() << std::endl;
-}
diff --git a/external_imported/json/doc/examples/json_pointer__empty.link b/external_imported/json/doc/examples/json_pointer__empty.link
deleted file mode 100644
index bac9163fb..000000000
--- a/external_imported/json/doc/examples/json_pointer__empty.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/0iAoI04B7iJcG1pW"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/json_pointer__operator_add.cpp b/external_imported/json/doc/examples/json_pointer__operator_add.cpp
deleted file mode 100644
index a2bbf59e8..000000000
--- a/external_imported/json/doc/examples/json_pointer__operator_add.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <iostream>
-#include <nlohmann/json.hpp>
-
-using json = nlohmann::json;
-
-int main()
-{
-    // create a JSON pointer
-    json::json_pointer ptr("/foo");
-    std::cout << ptr << '\n';
-
-    // append a JSON Pointer
-    ptr /= json::json_pointer("/bar/baz");
-    std::cout << ptr << '\n';
-
-    // append a string
-    ptr /= "fob";
-    std::cout << ptr << '\n';
-
-    // append an array index
-    ptr /= 42;
-    std::cout << ptr << std::endl;
-}
diff --git a/external_imported/json/doc/examples/json_pointer__operator_add.link b/external_imported/json/doc/examples/json_pointer__operator_add.link
deleted file mode 100644
index 08cfe8c24..000000000
--- a/external_imported/json/doc/examples/json_pointer__operator_add.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/CL6FBsykrydDhRTF"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/json_pointer__operator_add_binary.cpp b/external_imported/json/doc/examples/json_pointer__operator_add_binary.cpp
deleted file mode 100644
index 89e0a6a53..000000000
--- a/external_imported/json/doc/examples/json_pointer__operator_add_binary.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#include <iostream>
-#include <nlohmann/json.hpp>
-
-using json = nlohmann::json;
-
-int main()
-{
-    // create a JSON pointer
-    json::json_pointer ptr("/foo");
-
-    // append a JSON Pointer
-    std::cout << ptr / json::json_pointer("/bar/baz") << '\n';
-
-    // append a string
-    std::cout << ptr / "fob" << '\n';
-
-    // append an array index
-    std::cout << ptr / 42 << std::endl;
-}
diff --git a/external_imported/json/doc/examples/json_pointer__operator_add_binary.link b/external_imported/json/doc/examples/json_pointer__operator_add_binary.link
deleted file mode 100644
index b973a409f..000000000
--- a/external_imported/json/doc/examples/json_pointer__operator_add_binary.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/qbzJzB74w6QVdKPu"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/json_pointer__parent_pointer.cpp b/external_imported/json/doc/examples/json_pointer__parent_pointer.cpp
deleted file mode 100644
index 6021463a1..000000000
--- a/external_imported/json/doc/examples/json_pointer__parent_pointer.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <iostream>
-#include <nlohmann/json.hpp>
-
-using json = nlohmann::json;
-
-int main()
-{
-    // different JSON Pointers
-    json::json_pointer ptr1("");
-    json::json_pointer ptr2("/foo");
-    json::json_pointer ptr3("/foo/0");
-
-    // call parent_pointer()
-    std::cout << std::boolalpha
-              << "parent of " << ptr1 << " is " << ptr1.parent_pointer() << '\n'
-              << "parent of " << ptr2 << " is " << ptr2.parent_pointer() << '\n'
-              << "parent of " << ptr3 << " is " << ptr3.parent_pointer() << std::endl;
-}
diff --git a/external_imported/json/doc/examples/json_pointer__parent_pointer.link b/external_imported/json/doc/examples/json_pointer__parent_pointer.link
deleted file mode 100644
index 63edd5eef..000000000
--- a/external_imported/json/doc/examples/json_pointer__parent_pointer.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/9yiqfnfuF223zRfi"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/json_pointer__pop_back.cpp b/external_imported/json/doc/examples/json_pointer__pop_back.cpp
deleted file mode 100644
index ed3417ec1..000000000
--- a/external_imported/json/doc/examples/json_pointer__pop_back.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <iostream>
-#include <nlohmann/json.hpp>
-
-using json = nlohmann::json;
-
-int main()
-{
-    // create empty JSON Pointer
-    json::json_pointer ptr("/foo/bar/baz");
-    std::cout << ptr << '\n';
-
-    // call pop_back()
-    ptr.pop_back();
-    std::cout << ptr << '\n';
-
-    ptr.pop_back();
-    std::cout << ptr << '\n';
-
-    ptr.pop_back();
-    std::cout << ptr << '\n';
-}
diff --git a/external_imported/json/doc/examples/json_pointer__pop_back.link b/external_imported/json/doc/examples/json_pointer__pop_back.link
deleted file mode 100644
index 93872948d..000000000
--- a/external_imported/json/doc/examples/json_pointer__pop_back.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/qgH4LKyHMvQ2KdBq"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/json_pointer__push_back.cpp b/external_imported/json/doc/examples/json_pointer__push_back.cpp
deleted file mode 100644
index d6536b3f9..000000000
--- a/external_imported/json/doc/examples/json_pointer__push_back.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <iostream>
-#include <nlohmann/json.hpp>
-
-using json = nlohmann::json;
-
-int main()
-{
-    // create empty JSON Pointer
-    json::json_pointer ptr;
-    std::cout << ptr << '\n';
-
-    // call push_back()
-    ptr.push_back("foo");
-    std::cout << ptr << '\n';
-
-    ptr.push_back("0");
-    std::cout << ptr << '\n';
-
-    ptr.push_back("bar");
-    std::cout << ptr << '\n';
-}
diff --git a/external_imported/json/doc/examples/json_pointer__push_back.link b/external_imported/json/doc/examples/json_pointer__push_back.link
deleted file mode 100644
index df40229e2..000000000
--- a/external_imported/json/doc/examples/json_pointer__push_back.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/I9NdFeO2a5DmKDNw"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/json_pointer__to_string.cpp b/external_imported/json/doc/examples/json_pointer__to_string.cpp
deleted file mode 100644
index da397cdf4..000000000
--- a/external_imported/json/doc/examples/json_pointer__to_string.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#include <iostream>
-#include <nlohmann/json.hpp>
-
-using json = nlohmann::json;
-
-int main()
-{
-    // different JSON Pointers
-    json::json_pointer ptr1("");
-    json::json_pointer ptr2("/foo");
-    json::json_pointer ptr3("/foo/0");
-    json::json_pointer ptr4("/");
-    json::json_pointer ptr5("/a~1b");
-    json::json_pointer ptr6("/c%d");
-    json::json_pointer ptr7("/e^f");
-    json::json_pointer ptr8("/g|h");
-    json::json_pointer ptr9("/i\\j");
-    json::json_pointer ptr10("/k\"l");
-    json::json_pointer ptr11("/ ");
-    json::json_pointer ptr12("/m~0n");
-
-
-    std::cout << ptr1.to_string() << '\n'
-              << ptr2.to_string() << '\n'
-              << ptr3.to_string() << '\n'
-              << ptr4.to_string() << '\n'
-              << ptr5.to_string() << '\n'
-              << ptr6.to_string() << '\n'
-              << ptr7.to_string() << '\n'
-              << ptr8.to_string() << '\n'
-              << ptr9.to_string() << '\n'
-              << ptr10.to_string() << '\n'
-              << ptr11.to_string() << '\n'
-              << ptr12.to_string() << std::endl;
-}
diff --git a/external_imported/json/doc/examples/json_pointer__to_string.link b/external_imported/json/doc/examples/json_pointer__to_string.link
deleted file mode 100644
index 51eb09342..000000000
--- a/external_imported/json/doc/examples/json_pointer__to_string.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/elxv2yYChrwAywYM"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/json_pointer__to_string.output b/external_imported/json/doc/examples/json_pointer__to_string.output
deleted file mode 100644
index c4b5ea8fa..000000000
--- a/external_imported/json/doc/examples/json_pointer__to_string.output
+++ /dev/null
@@ -1,12 +0,0 @@
-
-/foo
-/foo/0
-/
-/a~1b
-/c%d
-/e^f
-/g|h
-/i\j
-/k"l
-/ 
-/m~0n
diff --git a/external_imported/json/doc/examples/max_size.link b/external_imported/json/doc/examples/max_size.link
deleted file mode 100644
index 52bd366c7..000000000
--- a/external_imported/json/doc/examples/max_size.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/vv8xdYw8TIzBs5pG"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/max_size.output b/external_imported/json/doc/examples/max_size.output
deleted file mode 100644
index 8c79995ba..000000000
--- a/external_imported/json/doc/examples/max_size.output
+++ /dev/null
@@ -1,7 +0,0 @@
-0
-1
-1
-1
-256204778801521550
-1152921504606846975
-1
diff --git a/external_imported/json/doc/examples/merge_patch.link b/external_imported/json/doc/examples/merge_patch.link
deleted file mode 100644
index 241098940..000000000
--- a/external_imported/json/doc/examples/merge_patch.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/gYRJJgjCLw05QxMI"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/meta.link b/external_imported/json/doc/examples/meta.link
deleted file mode 100644
index 6955de3d7..000000000
--- a/external_imported/json/doc/examples/meta.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/8KPHbPXQYmIYmHVl"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/meta.output b/external_imported/json/doc/examples/meta.output
deleted file mode 100644
index 218febb6c..000000000
--- a/external_imported/json/doc/examples/meta.output
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "compiler": {
-        "c++": "201103",
-        "family": "clang",
-        "version": "12.0.0 (clang-1200.0.32.28)"
-    },
-    "copyright": "(C) 2013-2021 Niels Lohmann",
-    "name": "JSON for Modern C++",
-    "platform": "apple",
-    "url": "https://github.com/nlohmann/json",
-    "version": {
-        "major": 3,
-        "minor": 9,
-        "patch": 1,
-        "string": "3.9.1"
-    }
-}
diff --git a/external_imported/json/doc/examples/object.link b/external_imported/json/doc/examples/object.link
deleted file mode 100644
index 322128e7e..000000000
--- a/external_imported/json/doc/examples/object.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/6FmKs5R3LbpOnwu5"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/operator__ValueType.link b/external_imported/json/doc/examples/operator__ValueType.link
deleted file mode 100644
index e4db023a2..000000000
--- a/external_imported/json/doc/examples/operator__ValueType.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/JfMIJiDcpdQUL8Zf"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/operator__equal.link b/external_imported/json/doc/examples/operator__equal.link
deleted file mode 100644
index 966c4f732..000000000
--- a/external_imported/json/doc/examples/operator__equal.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/LNp7NushnJK4Qdbh"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/operator__equal__nullptr_t.link b/external_imported/json/doc/examples/operator__equal__nullptr_t.link
deleted file mode 100644
index 5321622b1..000000000
--- a/external_imported/json/doc/examples/operator__equal__nullptr_t.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/s62P9RmAe0bB7jVS"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/operator__greater.link b/external_imported/json/doc/examples/operator__greater.link
deleted file mode 100644
index b52b4b832..000000000
--- a/external_imported/json/doc/examples/operator__greater.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/U2Y3DKDAI3QVV6WY"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/operator__greaterequal.link b/external_imported/json/doc/examples/operator__greaterequal.link
deleted file mode 100644
index 7b9b42cfb..000000000
--- a/external_imported/json/doc/examples/operator__greaterequal.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/rPkPEfJCs9deVcDh"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/operator__less.link b/external_imported/json/doc/examples/operator__less.link
deleted file mode 100644
index 96d69ee3a..000000000
--- a/external_imported/json/doc/examples/operator__less.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/uVaxGsyeyMBSgFmD"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/operator__lessequal.link b/external_imported/json/doc/examples/operator__lessequal.link
deleted file mode 100644
index 750c6fcfc..000000000
--- a/external_imported/json/doc/examples/operator__lessequal.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/XuFcFYlyCUhSZOMh"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/operator__notequal.link b/external_imported/json/doc/examples/operator__notequal.link
deleted file mode 100644
index bb094c4f7..000000000
--- a/external_imported/json/doc/examples/operator__notequal.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/zmDAeDnNWMEipr0f"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/operator__notequal__nullptr_t.link b/external_imported/json/doc/examples/operator__notequal__nullptr_t.link
deleted file mode 100644
index 3a013c2e9..000000000
--- a/external_imported/json/doc/examples/operator__notequal__nullptr_t.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/FI3oaFMYKW21XWOx"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/operator__value_t.link b/external_imported/json/doc/examples/operator__value_t.link
deleted file mode 100644
index 71cb2143e..000000000
--- a/external_imported/json/doc/examples/operator__value_t.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/zrh9lwsqcXTRxKAB"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/operator_deserialize.link b/external_imported/json/doc/examples/operator_deserialize.link
deleted file mode 100644
index 2e4f7283a..000000000
--- a/external_imported/json/doc/examples/operator_deserialize.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/u7H6MXaycH9x6z2b"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/operator_serialize.link b/external_imported/json/doc/examples/operator_serialize.link
deleted file mode 100644
index f6d157ecf..000000000
--- a/external_imported/json/doc/examples/operator_serialize.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/XLOzBknv2FczmATS"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/operatorarray__key_type.link b/external_imported/json/doc/examples/operatorarray__key_type.link
deleted file mode 100644
index e03051d58..000000000
--- a/external_imported/json/doc/examples/operatorarray__key_type.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/OpoeAt1xGB4xduPx"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/operatorarray__key_type_const.link b/external_imported/json/doc/examples/operatorarray__key_type_const.link
deleted file mode 100644
index a9023380c..000000000
--- a/external_imported/json/doc/examples/operatorarray__key_type_const.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/csxHXR7rMgsx8lD0"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/operatorarray__size_type.link b/external_imported/json/doc/examples/operatorarray__size_type.link
deleted file mode 100644
index 73b8b1692..000000000
--- a/external_imported/json/doc/examples/operatorarray__size_type.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/FqlufeB2ykspIWMX"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/operatorarray__size_type_const.link b/external_imported/json/doc/examples/operatorarray__size_type_const.link
deleted file mode 100644
index 3f2301897..000000000
--- a/external_imported/json/doc/examples/operatorarray__size_type_const.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/ZdkclPKi4eV5qHAO"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/operatorjson_pointer.cpp b/external_imported/json/doc/examples/operatorjson_pointer.cpp
deleted file mode 100644
index 7a0353a1c..000000000
--- a/external_imported/json/doc/examples/operatorjson_pointer.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-#include <iostream>
-#include <nlohmann/json.hpp>
-
-using json = nlohmann::json;
-
-int main()
-{
-    // create a JSON value
-    json j =
-    {
-        {"number", 1}, {"string", "foo"}, {"array", {1, 2}}
-    };
-
-    // read-only access
-
-    // output element with JSON pointer "/number"
-    std::cout << j["/number"_json_pointer] << '\n';
-    // output element with JSON pointer "/string"
-    std::cout << j["/string"_json_pointer] << '\n';
-    // output element with JSON pointer "/array"
-    std::cout << j["/array"_json_pointer] << '\n';
-    // output element with JSON pointer "/array/1"
-    std::cout << j["/array/1"_json_pointer] << '\n';
-
-    // writing access
-
-    // change the string
-    j["/string"_json_pointer] = "bar";
-    // output the changed string
-    std::cout << j["string"] << '\n';
-
-    // "change" a nonexisting object entry
-    j["/boolean"_json_pointer] = true;
-    // output the changed object
-    std::cout << j << '\n';
-
-    // change an array element
-    j["/array/1"_json_pointer] = 21;
-    // "change" an array element with nonexisting index
-    j["/array/4"_json_pointer] = 44;
-    // output the changed array
-    std::cout << j["array"] << '\n';
-
-    // "change" the array element past the end
-    j["/array/-"_json_pointer] = 55;
-    // output the changed array
-    std::cout << j["array"] << '\n';
-}
diff --git a/external_imported/json/doc/examples/operatorjson_pointer.link b/external_imported/json/doc/examples/operatorjson_pointer.link
deleted file mode 100644
index fa7aecb53..000000000
--- a/external_imported/json/doc/examples/operatorjson_pointer.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/Ip5D5sYs4lFNTeQk"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/operatorjson_pointer_const.cpp b/external_imported/json/doc/examples/operatorjson_pointer_const.cpp
deleted file mode 100644
index a5a437b44..000000000
--- a/external_imported/json/doc/examples/operatorjson_pointer_const.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <iostream>
-#include <nlohmann/json.hpp>
-
-using json = nlohmann::json;
-
-int main()
-{
-    // create a JSON value
-    const json j =
-    {
-        {"number", 1}, {"string", "foo"}, {"array", {1, 2}}
-    };
-
-    // read-only access
-
-    // output element with JSON pointer "/number"
-    std::cout << j["/number"_json_pointer] << '\n';
-    // output element with JSON pointer "/string"
-    std::cout << j["/string"_json_pointer] << '\n';
-    // output element with JSON pointer "/array"
-    std::cout << j["/array"_json_pointer] << '\n';
-    // output element with JSON pointer "/array/1"
-    std::cout << j["/array/1"_json_pointer] << '\n';
-}
diff --git a/external_imported/json/doc/examples/operatorjson_pointer_const.link b/external_imported/json/doc/examples/operatorjson_pointer_const.link
deleted file mode 100644
index eb01e1f03..000000000
--- a/external_imported/json/doc/examples/operatorjson_pointer_const.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/cgeqOQ3Ed4B5H36y"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/other_error.link b/external_imported/json/doc/examples/other_error.link
deleted file mode 100644
index f542efd12..000000000
--- a/external_imported/json/doc/examples/other_error.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/arzWNZW2mX7NN4hn"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/out_of_range.link b/external_imported/json/doc/examples/out_of_range.link
deleted file mode 100644
index 25833f31c..000000000
--- a/external_imported/json/doc/examples/out_of_range.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/N1cH6xfYoW268tU1"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/parse__allow_exceptions.link b/external_imported/json/doc/examples/parse__allow_exceptions.link
deleted file mode 100644
index 386dfe8e4..000000000
--- a/external_imported/json/doc/examples/parse__allow_exceptions.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/2TsG4VSg87HsRQC9"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/parse__array__parser_callback_t.link b/external_imported/json/doc/examples/parse__array__parser_callback_t.link
deleted file mode 100644
index cdecb14a2..000000000
--- a/external_imported/json/doc/examples/parse__array__parser_callback_t.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/GQUBprVlhQf1GAn0"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/parse__contiguouscontainer__parser_callback_t.link b/external_imported/json/doc/examples/parse__contiguouscontainer__parser_callback_t.link
deleted file mode 100644
index c681b8c3f..000000000
--- a/external_imported/json/doc/examples/parse__contiguouscontainer__parser_callback_t.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/vNtAnvMvjPVNbQWr"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/parse__istream__parser_callback_t.link b/external_imported/json/doc/examples/parse__istream__parser_callback_t.link
deleted file mode 100644
index 21118db29..000000000
--- a/external_imported/json/doc/examples/parse__istream__parser_callback_t.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/oVoHIptkIrU5Obmp"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/parse__iteratortype__parser_callback_t.cpp b/external_imported/json/doc/examples/parse__iteratortype__parser_callback_t.cpp
deleted file mode 100644
index 1b5e23d4e..000000000
--- a/external_imported/json/doc/examples/parse__iteratortype__parser_callback_t.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <iostream>
-#include <iomanip>
-#include <nlohmann/json.hpp>
-
-using json = nlohmann::json;
-
-int main()
-{
-    // a JSON text given as std::vector
-    std::vector<uint8_t> text = {'[', '1', ',', '2', ',', '3', ']', '\0'};
-
-    // parse and serialize JSON
-    json j_complete = json::parse(text.begin(), text.end());
-    std::cout << std::setw(4) << j_complete << "\n\n";
-}
diff --git a/external_imported/json/doc/examples/parse__iteratortype__parser_callback_t.link b/external_imported/json/doc/examples/parse__iteratortype__parser_callback_t.link
deleted file mode 100644
index d12ba20b7..000000000
--- a/external_imported/json/doc/examples/parse__iteratortype__parser_callback_t.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/9CXgX4XrjlHDszdi"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/parse__string__parser_callback_t.link b/external_imported/json/doc/examples/parse__string__parser_callback_t.link
deleted file mode 100644
index 2d24e2ec7..000000000
--- a/external_imported/json/doc/examples/parse__string__parser_callback_t.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/vDAnSEYiVgIdK3sK"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/parse_error.link b/external_imported/json/doc/examples/parse_error.link
deleted file mode 100644
index f3c0da789..000000000
--- a/external_imported/json/doc/examples/parse_error.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/ZkoSrF7OOVUQf4Db"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/patch.link b/external_imported/json/doc/examples/patch.link
deleted file mode 100644
index d9b370a8d..000000000
--- a/external_imported/json/doc/examples/patch.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/GrqC402vqxttNYPl"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/push_back.link b/external_imported/json/doc/examples/push_back.link
deleted file mode 100644
index b89d5c635..000000000
--- a/external_imported/json/doc/examples/push_back.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/s6FfaomLrs4KRfPj"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/push_back__initializer_list.link b/external_imported/json/doc/examples/push_back__initializer_list.link
deleted file mode 100644
index 4e57e93a3..000000000
--- a/external_imported/json/doc/examples/push_back__initializer_list.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/mbZlrIGr8Rsdjeow"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/push_back__object_t__value.link b/external_imported/json/doc/examples/push_back__object_t__value.link
deleted file mode 100644
index 6e0cf7b13..000000000
--- a/external_imported/json/doc/examples/push_back__object_t__value.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/AdA8l0WpxC6GiE5E"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/rbegin.link b/external_imported/json/doc/examples/rbegin.link
deleted file mode 100644
index 06beb46da..000000000
--- a/external_imported/json/doc/examples/rbegin.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/VrEpD8lD8TTaI0NX"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/rend.link b/external_imported/json/doc/examples/rend.link
deleted file mode 100644
index bf8e33d4b..000000000
--- a/external_imported/json/doc/examples/rend.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/JwrsWR45xOFouUXN"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/sax_parse.cpp b/external_imported/json/doc/examples/sax_parse.cpp
deleted file mode 100644
index 45273eb6c..000000000
--- a/external_imported/json/doc/examples/sax_parse.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-#include <iostream>
-#include <iomanip>
-#include <sstream>
-#include <nlohmann/json.hpp>
-
-using json = nlohmann::json;
-
-// a simple event consumer that collects string representations of the passed
-// values; not inheriting from json::json_sax_t is not required, but can
-// help not to forget a required function
-class sax_event_consumer : public json::json_sax_t
-{
-  public:
-    std::vector<std::string> events;
-
-    bool null() override
-    {
-        events.push_back("value: null");
-        return true;
-    }
-
-    bool boolean(bool val) override
-    {
-        events.push_back("value: " + std::string(val ? "true" : "false"));
-        return true;
-    }
-
-    bool number_integer(number_integer_t val) override
-    {
-        events.push_back("value: " + std::to_string(val));
-        return true;
-    }
-
-    bool number_unsigned(number_unsigned_t val) override
-    {
-        events.push_back("value: " + std::to_string(val));
-        return true;
-    }
-
-    bool number_float(number_float_t val, const string_t& s) override
-    {
-        events.push_back("value: " + s);
-        return true;
-    }
-
-    bool string(string_t& val) override
-    {
-        events.push_back("value: " + val);
-        return true;
-    }
-
-    bool start_object(std::size_t elements) override
-    {
-        events.push_back("start: object");
-        return true;
-    }
-
-    bool end_object() override
-    {
-        events.push_back("end: object");
-        return true;
-    }
-
-    bool start_array(std::size_t elements) override
-    {
-        events.push_back("start: array");
-        return true;
-    }
-
-    bool end_array() override
-    {
-        events.push_back("end: array");
-        return true;
-    }
-
-    bool key(string_t& val) override
-    {
-        events.push_back("key: " + val);
-        return true;
-    }
-
-    bool binary(json::binary_t& val) override
-    {
-        events.push_back("binary");
-        return true;
-    }
-
-    bool parse_error(std::size_t position, const std::string& last_token, const json::exception& ex) override
-    {
-        events.push_back("error: " + std::string(ex.what()));
-        return false;
-    }
-};
-
-int main()
-{
-    // a JSON text
-    auto text = R"(
-    {
-        "Image": {
-            "Width":  800,
-            "Height": 600,
-            "Title":  "View from 15th Floor",
-            "Thumbnail": {
-                "Url":    "http://www.example.com/image/481989943",
-                "Height": 125,
-                "Width":  100
-            },
-            "Animated" : false,
-            "IDs": [116, 943, 234, 38793],
-            "Distance": 12.723374634
-        }
-    }
-    )";
-
-    // create a SAX event consumer object
-    sax_event_consumer sec;
-
-    // parse and serialize JSON
-    bool result = json::sax_parse(text, &sec);
-
-    // output the recorded events
-    for (auto& event : sec.events)
-    {
-        std::cout << "(" << event << ") ";
-    }
-
-    // output the result of sax_parse
-    std::cout << "\nresult: " << std::boolalpha << result << std::endl;
-}
diff --git a/external_imported/json/doc/examples/sax_parse.link b/external_imported/json/doc/examples/sax_parse.link
deleted file mode 100644
index 8bab12742..000000000
--- a/external_imported/json/doc/examples/sax_parse.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/QaneqALPjiPk81vJ"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/sax_parse.output b/external_imported/json/doc/examples/sax_parse.output
deleted file mode 100644
index e16c2c4de..000000000
--- a/external_imported/json/doc/examples/sax_parse.output
+++ /dev/null
@@ -1,2 +0,0 @@
-(start: object) (key: Image) (start: object) (key: Width) (value: 800) (key: Height) (value: 600) (key: Title) (value: View from 15th Floor) (key: Thumbnail) (start: object) (key: Url) (value: http://www.example.com/image/481989943) (key: Height) (value: 125) (key: Width) (value: 100) (end: object) (key: Animated) (value: false) (key: IDs) (start: array) (value: 116) (value: 943) (value: 234) (value: 38793) (end: array) (key: Distance) (value: 12.723374634) (end: object) (end: object) 
-result: true
diff --git a/external_imported/json/doc/examples/size.link b/external_imported/json/doc/examples/size.link
deleted file mode 100644
index 31f00cad4..000000000
--- a/external_imported/json/doc/examples/size.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/mvJT2pbloHlkrl6r"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/swap__array_t.link b/external_imported/json/doc/examples/swap__array_t.link
deleted file mode 100644
index 75937905d..000000000
--- a/external_imported/json/doc/examples/swap__array_t.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/c0nkTOokPyL8J1JL"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/swap__binary_t.link b/external_imported/json/doc/examples/swap__binary_t.link
deleted file mode 100644
index f035a7170..000000000
--- a/external_imported/json/doc/examples/swap__binary_t.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/OD1Yaew9vlzMYxmX"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/swap__object_t.link b/external_imported/json/doc/examples/swap__object_t.link
deleted file mode 100644
index 45b04995a..000000000
--- a/external_imported/json/doc/examples/swap__object_t.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/IcxTHxey5qxGeAy2"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/swap__reference.link b/external_imported/json/doc/examples/swap__reference.link
deleted file mode 100644
index f056ec405..000000000
--- a/external_imported/json/doc/examples/swap__reference.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/WL9q27mBi3aXi5Pa"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/swap__string_t.link b/external_imported/json/doc/examples/swap__string_t.link
deleted file mode 100644
index 9b00374eb..000000000
--- a/external_imported/json/doc/examples/swap__string_t.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/SyMx0P688ApRQzMt"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/to_bson.link b/external_imported/json/doc/examples/to_bson.link
deleted file mode 100644
index 3bad4a1c4..000000000
--- a/external_imported/json/doc/examples/to_bson.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/hrN6v0tVSMVw8ME9"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/to_cbor.link b/external_imported/json/doc/examples/to_cbor.link
deleted file mode 100644
index efac9b06c..000000000
--- a/external_imported/json/doc/examples/to_cbor.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/r2Sb8yJjRQG98WkO"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/to_msgpack.link b/external_imported/json/doc/examples/to_msgpack.link
deleted file mode 100644
index 4c7a078ca..000000000
--- a/external_imported/json/doc/examples/to_msgpack.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/HtOtIvPkgOy5JVHb"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/to_ubjson.link b/external_imported/json/doc/examples/to_ubjson.link
deleted file mode 100644
index 996e19df1..000000000
--- a/external_imported/json/doc/examples/to_ubjson.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/pc1zxKaned8pvvXJ"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/type.link b/external_imported/json/doc/examples/type.link
deleted file mode 100644
index 746aaa644..000000000
--- a/external_imported/json/doc/examples/type.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/0s7Ewz3zhZQfWzjR"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/type_error.link b/external_imported/json/doc/examples/type_error.link
deleted file mode 100644
index d054b5c24..000000000
--- a/external_imported/json/doc/examples/type_error.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/vBuKAAPU80iMcXQC"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/type_name.link b/external_imported/json/doc/examples/type_name.link
deleted file mode 100644
index c0c55597e..000000000
--- a/external_imported/json/doc/examples/type_name.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/hOsdmb4wLEoYc4xh"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/unflatten.link b/external_imported/json/doc/examples/unflatten.link
deleted file mode 100644
index 0d1be78d2..000000000
--- a/external_imported/json/doc/examples/unflatten.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/x5rihodknargY77f"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/update.cpp b/external_imported/json/doc/examples/update.cpp
deleted file mode 100644
index fecdae760..000000000
--- a/external_imported/json/doc/examples/update.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <iostream>
-#include <iomanip>
-#include <nlohmann/json.hpp>
-
-using json = nlohmann::json;
-
-int main()
-{
-    // create two JSON objects
-    json o1 = R"( {"color": "red", "price": 17.99} )"_json;
-    json o2 = R"( {"color": "blue", "speed": 100} )"_json;
-
-    // add all keys from o2 to o1 (updating "color")
-    o1.update(o2);
-
-    // output updated object o1
-    std::cout << std::setw(2) << o1 << '\n';
-}
diff --git a/external_imported/json/doc/examples/update.link b/external_imported/json/doc/examples/update.link
deleted file mode 100644
index 2728616a2..000000000
--- a/external_imported/json/doc/examples/update.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/KZsjDe1v3arweQPv"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/update.output b/external_imported/json/doc/examples/update.output
deleted file mode 100644
index 69f0965af..000000000
--- a/external_imported/json/doc/examples/update.output
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "color": "blue",
-  "price": 17.99,
-  "speed": 100
-}
diff --git a/external_imported/json/doc/examples/update__range.cpp b/external_imported/json/doc/examples/update__range.cpp
deleted file mode 100644
index 9f3e521a3..000000000
--- a/external_imported/json/doc/examples/update__range.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <iostream>
-#include <iomanip>
-#include <nlohmann/json.hpp>
-
-using json = nlohmann::json;
-
-int main()
-{
-    // create two JSON objects
-    json o1 = R"( {"color": "red", "price": 17.99} )"_json;
-    json o2 = R"( {"color": "blue", "speed": 100} )"_json;
-
-    // add all keys from o2 to o1 (updating "color")
-    o1.update(o2.begin(), o2.end());
-
-    // output updated object o1
-    std::cout << std::setw(2) << o1 << '\n';
-}
diff --git a/external_imported/json/doc/examples/update__range.link b/external_imported/json/doc/examples/update__range.link
deleted file mode 100644
index 562ebf0ce..000000000
--- a/external_imported/json/doc/examples/update__range.link
+++ /dev/null
@@ -1 +0,0 @@
-<a target="_blank" href="https://wandbox.org/permlink/O3XNqD5PQ6SyQ9vS"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/update__range.output b/external_imported/json/doc/examples/update__range.output
deleted file mode 100644
index 69f0965af..000000000
--- a/external_imported/json/doc/examples/update__range.output
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "color": "blue",
-  "price": 17.99,
-  "speed": 100
-}
diff --git a/external_imported/json/doc/index.md b/external_imported/json/doc/index.md
deleted file mode 100644
index fac8b8563..000000000
--- a/external_imported/json/doc/index.md
+++ /dev/null
@@ -1,335 +0,0 @@
-# JSON for Modern C++
-
-These pages contain the API documentation of JSON for Modern C++, a C++11 header-only JSON class.
-
-# Contents
-
-- Classes
-  - @link nlohmann::basic_json `basic_json`@endlink -- class template for JSON values
-  - @link nlohmann::json `json`@endlink -- the default specialization of `basic_json`, defined as `basic_json<>`
-- [Functions](functions_func.html)
-  - object inspection
-    - @link nlohmann::basic_json::dump dump @endlink -- value serialization
-    - @link nlohmann::basic_json::type type @endlink -- type of the value
-    - @link nlohmann::basic_json::is_primitive is_primitive @endlink,
-      @link nlohmann::basic_json::is_structured is_structured @endlink,
-      @link nlohmann::basic_json::is_null is_null @endlink,
-      @link nlohmann::basic_json::is_boolean is_boolean @endlink,
-      @link nlohmann::basic_json::is_number is_number @endlink,
-      @link nlohmann::basic_json::is_number_integer is_number_integer @endlink,
-      @link nlohmann::basic_json::is_number_unsigned is_number_unsigned @endlink,
-      @link nlohmann::basic_json::is_number_float is_number_float @endlink,
-      @link nlohmann::basic_json::is_object is_object @endlink,
-      @link nlohmann::basic_json::is_array is_array @endlink,
-      @link nlohmann::basic_json::is_string is_string @endlink,
-      @link nlohmann::basic_json::is_discarded is_discarded @endlink,
-      @link nlohmann::basic_json::is_binary is_binary @endlink -- check for value type
-    - @link nlohmann::basic_json::operator value_t() const operator value_t @endlink -- type of the value (implicit conversion)
-  - value access
-    - @link nlohmann::basic_json::get get @endlink -- get a value
-    - @link nlohmann::basic_json::get_ptr get_ptr @endlink -- get a value pointer
-    - @link nlohmann::basic_json::get_ref get_ref @endlink -- get a value reference
-    - @link nlohmann::basic_json::get_binary get_binary @endlink -- get a binary value
-    - @link nlohmann::basic_json::operator ValueType() const operator ValueType @endlink -- get a value (implicit conversion)
-    - @link nlohmann::basic_json::value value @endlink -- get a value from an object and return default value if key is not present
-  - exceptions
-    - @link nlohmann::basic_json::parse_error parse_error @endlink for exceptions indicating a parse error
-    - @link nlohmann::basic_json::invalid_iterator invalid_iterator @endlink for exceptions indicating errors with iterators
-    - @link nlohmann::basic_json::type_error type_error @endlink for exceptions indicating executing a member function with a wrong type
-    - @link nlohmann::basic_json::out_of_range out_of_range @endlink for exceptions indicating access out of the defined range
-    - @link nlohmann::basic_json::other_error other_error @endlink for exceptions indicating other library errors
-  - lexicographical comparison operators
-    - @link nlohmann::basic_json::operator== operator== @endlink
-    - @link nlohmann::basic_json::operator!= operator!= @endlink
-    - @link nlohmann::basic_json::operator< operator<= @endlink
-    - @link nlohmann::basic_json::operator<= operator< @endlink
-    - @link nlohmann::basic_json::operator> operator> @endlink
-    - @link nlohmann::basic_json::operator>= operator>= @endlink
-  - serialization
-    - @link nlohmann::basic_json::dump dump @endlink serialize to string
-    - @link nlohmann::basic_json::operator<<(std::ostream&, const basic_json &) operator<< @endlink serialize to stream
-  - deserialization / parsing
-    - @link nlohmann::basic_json::parse parse @endlink parse from input (string, file, etc.) and return JSON value
-    - @link nlohmann::basic_json::sax_parse sax_parse @endlink parse from input (string, file, etc.) and generate SAX events
-    - @link nlohmann::basic_json::operator>>(std::istream&, basic_json&) operator>> @endlink parse from stream
-    - @link nlohmann::basic_json::accept accept @endlink check for syntax errors without parsing
-    - @link nlohmann::json_sax SAX interface @endlink define a user-defined SAX event consumer
-    - @link nlohmann::basic_json::parser_callback_t callback interface @endlink register a callback to the parse function
-  - [binary formats](binary_formats.md):
-    - CBOR: @link nlohmann::basic_json::from_cbor from_cbor @endlink / @link nlohmann::basic_json::to_cbor to_cbor @endlink
-    - MessagePack: @link nlohmann::basic_json::from_msgpack from_msgpack @endlink / @link nlohmann::basic_json::to_msgpack to_msgpack @endlink
-    - UBJSON: @link nlohmann::basic_json::from_ubjson from_ubjson @endlink / @link nlohmann::basic_json::to_ubjson to_ubjson @endlink
-    - BSON: @link nlohmann::basic_json::from_bson from_bson @endlink / @link nlohmann::basic_json::to_bson to_bson @endlink
-- Types
-  - @link nlohmann::basic_json::array_t arrays @endlink
-  - @link nlohmann::basic_json::object_t objects @endlink
-  - @link nlohmann::basic_json::string_t strings @endlink
-  - @link nlohmann::basic_json::boolean_t booleans @endlink
-  - numbers
-    - @link nlohmann::basic_json::number_integer_t signed integers @endlink
-    - @link nlohmann::basic_json::number_unsigned_t unsigned integers @endlink
-    - @link nlohmann::basic_json::number_float_t floating-point @endlink
-  - @link nlohmann::basic_json::binary_t binary values @endlink
-- further JSON standards
-  - @link nlohmann::json_pointer JSON Pointer @endlink (RFC 6901)
-  - @link nlohmann::basic_json::patch JSON Patch @endlink (RFC 6902)
-  - @link nlohmann::basic_json::merge_patch JSON Merge Patch @endlink (RFC 7396)
-
-# Container function overview
-
-The container functions known from STL have been extended to support the different value types from JSON. However, not all functions can be applied to all value types. Note that the signature of some functions differ between the types; for instance, `at` may be called with either a string to address a key in an object or with an integer to address a value in an array.
-
-Note that this table only lists those exceptions thrown due to the type. For instance, the @link nlohmann::basic_json::at(const typename object_t::key_type & key) `at` @endlink function will always throw a @link nlohmann::basic_json::type_error `json::type_error` @endlink exception when called for a string type. When called for an array, it *may* throw an @link nlohmann::basic_json::out_of_range `json::out_of_range` @endlink exception if the passed index is invalid.
-
-<table>
-  <tr>
-    <th rowspan="2">group</th>
-    <th rowspan="2">function</th>
-    <th colspan="6">JSON value type</th>
-  </tr>
-  <tr>
-    <th>object</th>
-    <th>array</th>
-    <th>string</th>
-    <th>number</th>
-    <th>boolean</th>
-    <th>null</th>
-  </tr>
-  <tr>
-    <td rowspan="8">iterators</td>
-    <td>`begin`</td>
-    <td class="ok_green">@link nlohmann::basic_json::begin `begin` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::begin `begin` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::begin `begin` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::begin `begin` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::begin `begin` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::begin `begin` @endlink (returns `end()`)</td>
-  </tr>
-  <tr>
-    <td>`cbegin`</td>
-    <td class="ok_green">@link nlohmann::basic_json::cbegin `cbegin` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::cbegin `cbegin` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::cbegin `cbegin` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::cbegin `cbegin` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::cbegin `cbegin` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::cbegin `cbegin` @endlink (returns `cend()`)</td>
-  </tr>
-  <tr>
-    <td>`end`</td>
-    <td class="ok_green">@link nlohmann::basic_json::end `end` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::end `end` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::end `end` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::end `end` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::end `end` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::end `end` @endlink</td>
-  </tr>
-  <tr>
-    <td>`cend`</td>
-    <td class="ok_green">@link nlohmann::basic_json::cend `cend` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::cend `cend` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::cend `cend` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::cend `cend` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::cend `cend` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::cend `cend` @endlink</td>
-  </tr>
-  <tr>
-    <td>`rbegin`</td>
-    <td class="ok_green">@link nlohmann::basic_json::rbegin `rbegin` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::rbegin `rbegin` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::rbegin `rbegin` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::rbegin `rbegin` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::rbegin `rbegin` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::rbegin `rbegin` @endlink</td>
-  </tr>
-  <tr>
-    <td>`crbegin`</td>
-    <td class="ok_green">@link nlohmann::basic_json::crbegin `crbegin` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::crbegin `crbegin` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::crbegin `crbegin` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::crbegin `crbegin` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::crbegin `crbegin` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::crbegin `crbegin` @endlink</td>
-  </tr>
-  <tr>
-    <td>`rend`</td>
-    <td class="ok_green">@link nlohmann::basic_json::rend `rend` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::rend `rend` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::rend `rend` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::rend `rend` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::rend `rend` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::rend `rend` @endlink</td>
-  </tr>
-  <tr>
-    <td>`crend`</td>
-    <td class="ok_green">@link nlohmann::basic_json::crend `crend` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::crend `crend` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::crend `crend` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::crend `crend` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::crend `crend` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::crend `crend` @endlink</td>
-  </tr>
-  <tr>
-    <td rowspan="4">element<br>access</td>
-    <td>`at`</td>
-    <td class="ok_green">@link nlohmann::basic_json::at(const typename object_t::key_type & key) `at` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::at(size_type) `at` @endlink</td>
-    <td class="nok_throws">throws @link nlohmann::basic_json::type_error `json::type_error` @endlink (304)</td>
-    <td class="nok_throws">throws @link nlohmann::basic_json::type_error `json::type_error` @endlink (304)</td>
-    <td class="nok_throws">throws @link nlohmann::basic_json::type_error `json::type_error` @endlink (304)</td>
-    <td class="nok_throws">throws @link nlohmann::basic_json::type_error `json::type_error` @endlink (304)</td>
-  </tr>
-  <tr>
-    <td>`operator[]`</td>
-    <td class="ok_green">@link nlohmann::basic_json::operator[](const typename object_t::key_type &key) `operator[]` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::operator[](size_type) `operator[]` @endlink</td>
-    <td class="nok_throws">throws @link nlohmann::basic_json::type_error `json::type_error` @endlink (305)</td>
-    <td class="nok_throws">throws @link nlohmann::basic_json::type_error `json::type_error` @endlink (305)</td>
-    <td class="nok_throws">throws @link nlohmann::basic_json::type_error `json::type_error` @endlink (305)</td>
-    <td class="ok_green">@link nlohmann::basic_json::operator[](const typename object_t::key_type & key) `operator[]` @endlink (creates object)<br>@link nlohmann::basic_json::operator[](size_type) `operator[]` @endlink (creates array)</td>
-  </tr>
-  <tr>
-    <td>`front`</td>
-    <td class="ok_green">@link nlohmann::basic_json::front `front` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::front `front` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::front `front` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::front `front` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::front `front` @endlink</td>
-    <td class="nok_throws">throws @link nlohmann::basic_json::invalid_iterator `json::invalid_iterator` @endlink (214)</td>
-  </tr>
-  <tr>
-    <td>`back`</td>
-    <td class="ok_green">@link nlohmann::basic_json::back `back` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::back `back` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::back `back` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::back `back` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::back `back` @endlink</td>
-    <td class="nok_throws">throws @link nlohmann::basic_json::invalid_iterator `json::invalid_iterator` @endlink (214)</td>
-  </tr>
-  <tr>
-    <td rowspan="3">capacity</td>
-    <td>`empty`</td>
-    <td class="ok_green">@link nlohmann::basic_json::empty `empty` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::empty `empty` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::empty `empty` @endlink (returns `false`)</td>
-    <td class="ok_green">@link nlohmann::basic_json::empty `empty` @endlink (returns `false`)</td>
-    <td class="ok_green">@link nlohmann::basic_json::empty `empty` @endlink (returns `false`)</td>
-    <td class="ok_green">@link nlohmann::basic_json::empty `empty` @endlink (returns `true`)</td>
-  </tr>
-  <tr>
-    <td>`size`</td>
-    <td class="ok_green">@link nlohmann::basic_json::size `size` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::size `size` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::size `size` @endlink (returns `1`)</td>
-    <td class="ok_green">@link nlohmann::basic_json::size `size` @endlink (returns `1`)</td>
-    <td class="ok_green">@link nlohmann::basic_json::size `size` @endlink (returns `1`)</td>
-    <td class="ok_green">@link nlohmann::basic_json::size `size` @endlink (returns `0`)</td>
-  </tr>
-  <tr>
-    <td>`max_size_`</td>
-    <td class="ok_green">@link nlohmann::basic_json::max_size `max_size` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::max_size `max_size` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::max_size `max_size` @endlink (returns `1`)</td>
-    <td class="ok_green">@link nlohmann::basic_json::max_size `max_size` @endlink (returns `1`)</td>
-    <td class="ok_green">@link nlohmann::basic_json::max_size `max_size` @endlink (returns `1`)</td>
-    <td class="ok_green">@link nlohmann::basic_json::max_size `max_size` @endlink (returns `0`)</td>
-  </tr>
-  <tr>
-    <td rowspan="7">modifiers</td>
-    <td>`clear`</td>
-    <td class="ok_green">@link nlohmann::basic_json::clear `clear` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::clear `clear` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::clear `clear` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::clear `clear` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::clear `clear` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::clear `clear` @endlink</td>
-  </tr>
-  <tr>
-    <td>`insert`</td>
-    <td class="nok_throws">throws @link nlohmann::basic_json::type_error `json::type_error` @endlink (309)</td>
-    <td class="ok_green">@link nlohmann::basic_json::insert `insert` @endlink</td>
-    <td class="nok_throws">throws @link nlohmann::basic_json::type_error `json::type_error` @endlink (309)</td>
-    <td class="nok_throws">throws @link nlohmann::basic_json::type_error `json::type_error` @endlink (309)</td>
-    <td class="nok_throws">throws @link nlohmann::basic_json::type_error `json::type_error` @endlink (309)</td>
-    <td class="nok_throws">throws @link nlohmann::basic_json::type_error `json::type_error` @endlink (309)</td>
-  </tr>
-  <tr>
-    <td>`erase`</td>
-    <td class="ok_green">@link nlohmann::basic_json::erase `erase` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::erase `erase` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::erase `erase` @endlink (converts to null)</td>
-    <td class="ok_green">@link nlohmann::basic_json::erase `erase` @endlink (converts to null)</td>
-    <td class="ok_green">@link nlohmann::basic_json::erase `erase` @endlink (converts to null)</td>
-    <td class="nok_throws">throws @link nlohmann::basic_json::type_error `json::type_error` @endlink (307)</td>
-  </tr>
-  <tr>
-    <td>`push_back`</td>
-    <td class="ok_green">@link nlohmann::basic_json::push_back(const typename object_t::value_type & val) `push_back` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::push_back(const nlohmann::basic_json &) `push_back` @endlink</td>
-    <td class="nok_throws">throws @link nlohmann::basic_json::type_error `json::type_error` @endlink (308)</td>
-    <td class="nok_throws">throws @link nlohmann::basic_json::type_error `json::type_error` @endlink (308)</td>
-    <td class="nok_throws">throws @link nlohmann::basic_json::type_error `json::type_error` @endlink (308)</td>
-    <td class="ok_green">@link nlohmann::basic_json::push_back(const typename object_t::value_type & val) `push_back` @endlink (creates object)<br>@link nlohmann::basic_json::push_back(const nlohmann::basic_json &) `push_back` @endlink (creates array)</td>
-  </tr>
-  <tr>
-    <td>`emplace` / `emplace_back`</td>
-    <td class="ok_green">@link nlohmann::basic_json::emplace() `emplace` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::emplace_back() `emplace_back` @endlink</td>
-    <td class="nok_throws">throws @link nlohmann::basic_json::type_error `json::type_error` @endlink (311)</td>
-    <td class="nok_throws">throws @link nlohmann::basic_json::type_error `json::type_error` @endlink (311)</td>
-    <td class="nok_throws">throws @link nlohmann::basic_json::type_error `json::type_error` @endlink (311)</td>
-    <td class="ok_green">@link nlohmann::basic_json::emplace() `emplace` @endlink (creates object)<br>@link nlohmann::basic_json::emplace_back() `emplace_back` @endlink (creates array)</td>
-  </tr>
-  <tr>
-    <td>`update`</td>
-    <td class="ok_green">@link nlohmann::basic_json::update() `update` @endlink</td>
-    <td class="nok_throws">throws @link nlohmann::basic_json::type_error `json::type_error` @endlink (312)</td>
-    <td class="nok_throws">throws @link nlohmann::basic_json::type_error `json::type_error` @endlink (312)</td>
-    <td class="nok_throws">throws @link nlohmann::basic_json::type_error `json::type_error` @endlink (312)</td>
-    <td class="nok_throws">throws @link nlohmann::basic_json::type_error `json::type_error` @endlink (312)</td>
-    <td class="nok_throws">throws @link nlohmann::basic_json::type_error `json::type_error` @endlink (312)</td>
-  </tr>
-  <tr>
-    <td>`swap`</td>
-    <td class="ok_green">@link nlohmann::basic_json::swap `swap` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::swap `swap` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::swap `swap` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::swap `swap` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::swap `swap` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::swap `swap` @endlink</td>
-  </tr>
-  <tr>
-    <td rowspan="3">lookup</td>
-    <td>`find`</td>
-    <td class="ok_green">@link nlohmann::basic_json::find `find` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::find `find` @endlink (returns `end()`)</td>
-    <td class="ok_green">@link nlohmann::basic_json::find `find` @endlink (returns `end()`)</td>
-    <td class="ok_green">@link nlohmann::basic_json::find `find` @endlink (returns `end()`)</td>
-    <td class="ok_green">@link nlohmann::basic_json::find `find` @endlink (returns `end()`)</td>
-    <td class="ok_green">@link nlohmann::basic_json::find `find` @endlink (returns `end()`)</td>
-  </tr>
-  <tr>
-    <td>`count`</td>
-    <td class="ok_green">@link nlohmann::basic_json::count `count` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::count `count` @endlink (returns `0`)</td>
-    <td class="ok_green">@link nlohmann::basic_json::count `count` @endlink (returns `0`)</td>
-    <td class="ok_green">@link nlohmann::basic_json::count `count` @endlink (returns `0`)</td>
-    <td class="ok_green">@link nlohmann::basic_json::count `count` @endlink (returns `0`)</td>
-    <td class="ok_green">@link nlohmann::basic_json::count `count` @endlink (returns `0`)</td>
-  </tr>
-  <tr>
-    <td>`contains`</td>
-    <td class="ok_green">@link nlohmann::basic_json::contains `contains` @endlink</td>
-    <td class="ok_green">@link nlohmann::basic_json::contains `contains` @endlink (returns `false`)</td>
-    <td class="ok_green">@link nlohmann::basic_json::contains `contains` @endlink (returns `false`)</td>
-    <td class="ok_green">@link nlohmann::basic_json::contains `contains` @endlink (returns `false`)</td>
-    <td class="ok_green">@link nlohmann::basic_json::contains `contains` @endlink (returns `false`)</td>
-    <td class="ok_green">@link nlohmann::basic_json::contains `contains` @endlink (returns `false`)</td>
-  </tr>
-</table>
-
-@copyright Copyright &copy; 2013-2021 Niels Lohmann. The code is licensed under the [MIT License](http://opensource.org/licenses/MIT).
-
-@author [Niels Lohmann](http://nlohmann.me)
-@see https://github.com/nlohmann/json to download the source code
-
-@version 3.9.1
diff --git a/external_imported/json/doc/json.gif b/external_imported/json/doc/json.gif
deleted file mode 100644
index 7542048ed..000000000
Binary files a/external_imported/json/doc/json.gif and /dev/null differ
diff --git a/external_imported/json/doc/mkdocs/Makefile b/external_imported/json/doc/mkdocs/Makefile
deleted file mode 100644
index 85bc6a920..000000000
--- a/external_imported/json/doc/mkdocs/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# serve the site locally
-serve: prepare_files
-	venv/bin/mkdocs serve
-
-build: prepare_files
-	venv/bin/mkdocs build
-
-# create files that are not versioned inside the mkdocs folder
-prepare_files: clean
-	# build Doxygen
-	$(MAKE) -C ..
-	# create subfolders
-	mkdir docs/images docs/examples
-	# copy images
-	cp -vr ../json.gif ../images/range-begin-end.svg ../images/range-rbegin-rend.svg ../images/callback_events.png docs/images
-	# copy examples
-	cp -vr ../examples/*.cpp ../examples/*.output docs/examples
-
-# clean subfolders
-clean:
-	rm -fr docs/images docs/examples
-
-# publish site to GitHub pages
-publish: prepare_files
-	venv/bin/mkdocs gh-deploy --clean --force
-
-# install a Python virtual environment
-install_venv: requirements.txt
-	python3 -mvenv venv
-	venv/bin/pip install -r requirements.txt
-
-# uninstall the virtual environment
-uninstall_venv: clean
-	rm -fr venv
diff --git a/external_imported/json/doc/mkdocs/docs/api/adl_serializer.md b/external_imported/json/doc/mkdocs/docs/api/adl_serializer.md
deleted file mode 100644
index 7b79747f5..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/adl_serializer.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# adl_serializer
-
-```cpp
-template<typename, typename>
-struct adl_serializer;
-```
-
-Serializer that uses ADL ([Argument-Dependent Lookup](https://en.cppreference.com/w/cpp/language/adl)) to choose
-`to_json`/`from_json` functions from the types' namespaces.
-
-It is implemented similar to
-
-```cpp
-template<typename ValueType>
-struct adl_serializer {
-    template<typename BasicJsonType>
-    static void to_json(BasicJsonType& j, const T& value) {
-        // calls the "to_json" method in T's namespace
-    }
-
-    template<typename BasicJsonType>
-    static void from_json(const BasicJsonType& j, T& value) {
-        // same thing, but with the "from_json" method
-    }
-};
-```
-
-## Member functions
-
-- **from_json** - convert a JSON value to any value type
-- **to_json** - convert any value type to a JSON value
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/accept.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/accept.md
deleted file mode 100644
index b18c5391a..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/accept.md
+++ /dev/null
@@ -1,90 +0,0 @@
-# basic_json::accept
-
-```cpp
-// (1)
-template<typename InputType>
-static bool accept(InputType&& i,
-                   const bool ignore_comments = false);
-
-// (2)
-template<typename IteratorType>
-static bool accept(IteratorType first, IteratorType last,
-                   const bool ignore_comments = false);
-```
-
-Checks whether the input is valid JSON.
-
-1. Reads from a compatible input.
-2. Reads from a pair of character iterators
-    
-    The value_type of the iterator must be a integral type with size of 1, 2 or 4 bytes, which will be interpreted
-    respectively as UTF-8, UTF-16 and UTF-32.
-    
-Unlike the [`parse`](parse.md) function, this function neither throws an exception in case of invalid JSON input
-(i.e., a parse error) nor creates diagnostic information.
-
-## Template parameters
-
-`InputType`
-:   A compatible input, for instance:
-    
-    - an `std::istream` object
-    - a `FILE` pointer
-    - a C-style array of characters
-    - a pointer to a null-terminated string of single byte characters
-    - an object `obj` for which `begin(obj)` and `end(obj)` produces a valid pair of iterators.
-
-`IteratorType`
-:   a compatible iterator type
-
-## Parameters
-
-`i` (in)
-:   Input to parse from.
-
-`ignore_comments` (in)
-:   whether comments should be ignored and treated like whitespace (`#!cpp true`) or yield a parse error
-    (`#!cpp false`); (optional, `#!cpp false` by default)
-
-`first` (in)
-:   iterator to start of character range
-
-`last` (in)
-:   iterator to end of character range
-
-## Return value
-
-Whether the input is valid JSON.
-
-## Exception safety
-
-Strong guarantee: if an exception is thrown, there are no changes in the JSON value.
-
-## Complexity
-
-Linear in the length of the input. The parser is a predictive LL(1) parser.
-
-## Notes
-
-(1) A UTF-8 byte order mark is silently ignored.
-
-## Examples
-
-??? example
-
-    The example below demonstrates the `accept()` function reading from a string.
-
-    ```cpp
-    --8<-- "examples/accept__string.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/accept__string.output"
-    ```
-
-## Version history
-
-- Added in version 3.0.0.
-- Ignoring comments via `ignore_comments` added in version 3.9.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/array_t.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/array_t.md
deleted file mode 100644
index 89e39dbf8..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/array_t.md
+++ /dev/null
@@ -1,52 +0,0 @@
-# basic_json::array_t
-
-```cpp
-using array_t = ArrayType<basic_json, AllocatorType<basic_json>>;
-```
-
-The type used to store JSON arrays.
-
-[RFC 7159](http://rfc7159.net/rfc7159) describes JSON arrays as follows:
-> An array is an ordered sequence of zero or more values.
-
-To store objects in C++, a type is defined by the template parameters explained below.
-
-## Template parameters
-
-`ArrayType`
-:   container type to store arrays (e.g., `std::vector` or `std::list`)
-
-`AllocatorType`
-:   the allocator to use for objects (e.g., `std::allocator`)
-
-## Notes
-
-#### Default type
-
-With the default values for `ArrayType` (`std::vector`) and `AllocatorType` (`std::allocator`), the default value for
-`array_t` is:
-
-```cpp
-std::vector<
-  basic_json, // value_type
-  std::allocator<basic_json> // allocator_type
->
-```
-
-#### Limits
-
-[RFC 7159](http://rfc7159.net/rfc7159) specifies:
-> An implementation may set limits on the maximum depth of nesting.
-
-In this class, the array's limit of nesting is not explicitly constrained. However, a maximum depth of nesting may be
-introduced by the compiler or runtime environment. A theoretical limit can be queried by calling the
-[`max_size`](max_size.md) function of a JSON array.
-
-#### Storage
-
-Arrays are stored as pointers in a `basic_json` type. That is, for any access to array values, a pointer of type
-`#!cpp array_t*` must be dereferenced.
-
-## Version history
-
-- Added in version 1.0.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/at.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/at.md
deleted file mode 100644
index 75977b180..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/at.md
+++ /dev/null
@@ -1,171 +0,0 @@
-# basic_json::at
-
-```cpp
-// (1)
-reference at(size_type idx);
-const_reference at(size_type idx) const;
-
-// (2)
-reference at(const typename object_t::key_type& key);
-const_reference at(const typename object_t::key_type& key) const;
-
-// (3)
-reference at(const json_pointer& ptr);
-const_reference at(const json_pointer& ptr) const;
-```
-
-1. Returns a reference to the element at specified location `idx`, with bounds checking.
-2. Returns a reference to the element at with specified key `key`, with bounds checking.
-3. Returns a reference to the element at with specified JSON pointer `ptr`, with bounds checking.
-
-## Parameters
-
-`idx` (in)
-:   index of the element to access
-
-`key` (in)
-:   object key of the elements to remove
-    
-`ptr` (in)
-:   JSON pointer to the desired element
-    
-## Return value
-
-1. reference to the element at index `idx`
-2. reference to the element at key `key`
-3. reference to the element pointed to by `ptr`
-
-## Exceptions
-
-1. The function can throw the following exceptions:
-    - Throws [`type_error.304`](../../home/exceptions.md#jsonexceptiontype_error304) if the JSON value is not an array;
-      in this case, calling `at` with an index makes no sense. See example below.
-    - Throws [`out_of_range.401`](../../home/exceptions.md#jsonexceptionout_of_range401) if the index `idx` is out of
-      range of the array; that is, `idx >= size()`. See example below.
-2. The function can throw the following exceptions:
-    - Throws [`type_error.304`](../../home/exceptions.md#jsonexceptiontype_error304) if the JSON value is not an object;
-      in this case, calling `at` with a key makes no sense. See example below.
-    - Throws [`out_of_range.403`](../../home/exceptions.md#jsonexceptionout_of_range403) if the key `key` is is not
-      stored in the object; that is, `find(key) == end()`. See example below.
-3. The function can throw the following exceptions:
-    - Throws [`parse_error.106`](../../home/exceptions.md#jsonexceptionparse_error106) if an array index in the passed
-      JSON pointer `ptr` begins with '0'. See example below.
-    - Throws [`parse_error.109`](../../home/exceptions.md#jsonexceptionparse_error109) if an array index in the passed
-      JSON pointer `ptr` is not a number. See example below.
-    - Throws [`out_of_range.401`](../../home/exceptions.md#jsonexceptionout_of_range401) if an array index in the passed
-      JSON pointer `ptr` is out of range. See example below.
-    - Throws [`out_of_range.402`](../../home/exceptions.md#jsonexceptionout_of_range402) if the array index '-' is used
-      in the passed JSON pointer `ptr`. As `at` provides checked access (and no elements are implicitly inserted), the
-      index '-' is always invalid. See example below.
-    - Throws [`out_of_range.403`](../../home/exceptions.md#jsonexceptionout_of_range403) if the JSON pointer describes a
-      key of an object which cannot be found. See example below.
-    - Throws [`out_of_range.404`](../../home/exceptions.md#jsonexceptionout_of_range404) if the JSON pointer `ptr` can
-      not be resolved. See example below.
-
-## Exception safety
-
-Strong exception safety: if an exception occurs, the original value stays intact.
-
-## Complexity
-
-1. Constant
-2. Logarithmic in the size of the container.
-3. Constant
-
-## Example
-
-??? example
-
-    The example below shows how array elements can be read and written using `at()`. It also demonstrates the different
-    exceptions that can be thrown.
-    
-    ```cpp
-    --8<-- "examples/at__size_type.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/at__size_type.output"
-    ```
-
-??? example
-
-    The example below shows how array elements can be read using `at()`. It also demonstrates the different exceptions
-    that can be thrown.
-        
-    ```cpp
-    --8<-- "examples/at__size_type_const.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/at__size_type_const.output"
-    ```
-
-??? example
-
-    The example below shows how object elements can be read and written using `at()`. It also demonstrates the different
-    exceptions that can be thrown.
-        
-    ```cpp
-    --8<-- "examples/at__object_t_key_type.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/at__object_t_key_type.output"
-    ```
-
-??? example
-
-    The example below shows how object elements can be read using `at()`. It also demonstrates the different exceptions
-    that can be thrown.
-        
-    ```cpp
-    --8<-- "examples/at__object_t_key_type_const.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/at__object_t_key_type_const.output"
-    ```
-
-??? example
-
-    The example below shows how object elements can be read and written using `at()`. It also demonstrates the different
-    exceptions that can be thrown.
-        
-    ```cpp
-    --8<-- "examples/at_json_pointer.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/at_json_pointer.output"
-    ```
-
-??? example
-
-    The example below shows how object elements can be read using `at()`. It also demonstrates the different exceptions
-    that can be thrown.
-        
-    ```cpp
-    --8<-- "examples/at_json_pointer_const.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/at_json_pointer_const.output"
-    ```
-
-## Version history
-
-1. Added in version 1.0.0.
-2. Added in version 1.0.0.
-3. Added in version 2.0.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/back.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/back.md
deleted file mode 100644
index 1484153ae..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/back.md
+++ /dev/null
@@ -1,61 +0,0 @@
-# basic_json::back
-
-```cpp
-reference back();
-
-const_reference back() const;
-```
-
-Returns a reference to the last element in the container. For a JSON container `c`, the expression `c.back()` is
-equivalent to
-
-```cpp
-auto tmp = c.end();
---tmp;
-return *tmp;
-```
-    
-## Return value
-
-In case of a structured type (array or object), a reference to the last element is returned. In case of number, string,
-boolean, or binary values, a reference to the value is returned.
-
-## Exceptions
-
-If the JSON value is `#!json null`, exception
-[`invalid_iterator.214`](../../home/exceptions.md#jsonexceptioninvalid_iterator214) is thrown.
-
-## Exception safety
-
-Strong guarantee: if an exception is thrown, there are no changes in the JSON value.
-
-## Complexity
-
-Constant.
-
-## Note
-
-!!! danger
-
-    Calling `back` on an empty array or object is undefined behavior and is **guarded by an assertion**!
-
-## Example
-
-??? example
-
-    The following code shows an example for `back()`.
-     
-    ```cpp
-    --8<-- "examples/back.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/back.output"
-    ```
-
-## Version history
-
-- Added in version 1.0.0.
-- Adjusted code to return reference to binary values in version 3.8.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/binary.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/binary.md
deleted file mode 100644
index 0b1b9f48b..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/binary.md
+++ /dev/null
@@ -1,50 +0,0 @@
-# basic_json::binary
-
-```cpp
-// (1)
-static basic_json binary(const typename binary_t::container_type& init);
-static basic_json binary(typename binary_t::container_type&& init);
-
-// (2)
-static basic_json binary(const typename binary_t::container_type& init,
-                         std::uint8_t subtype);
-static basic_json binary(typename binary_t::container_type&& init,
-                         std::uint8_t subtype);
-```
-
-1. Creates a JSON binary array value from a given binary container.
-2. Creates a JSON binary array value from a given binary container with subtype.
- 
-Binary values are part of various binary formats, such as CBOR, MessagePack, and BSON. This constructor is used to
-create a value for serialization to those formats.
-
-## Parameters
-
-`init` (in)
-:   container containing bytes to use as binary type
-
-`subtype` (in)
-:   subtype to use in CBOR, MessagePack, and BSON
-
-## Return value
-
-JSON binary array value
-
-## Exception safety
-
-Strong guarantee: if an exception is thrown, there are no changes in the JSON value.
-
-## Complexity
-
-Linear in the size of `init`; constant for `typename binary_t::container_type&& init` versions.
-
-## Notes
-
-Note, this function exists because of the difficulty in correctly specifying the correct template overload in the
-standard value ctor, as both JSON arrays and JSON binary arrays are backed with some form of a `std::vector`. Because
-JSON binary arrays are a non-standard extension it was decided that it would be best to prevent automatic initialization
-of a binary array type, for backwards compatibility and so it does not happen on accident.
-
-## Version history
-
-- Added in version 3.8.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/binary_t.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/binary_t.md
deleted file mode 100644
index 2d6cd574e..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/binary_t.md
+++ /dev/null
@@ -1,67 +0,0 @@
-# basic_json::binary_t
-
-```cpp
-using binary_t = byte_container_with_subtype<BinaryType>;
-```
-
-This type is a type designed to carry binary data that appears in various serialized formats, such as CBOR's Major Type
-2, MessagePack's bin, and BSON's generic binary subtype. This type is NOT a part of standard JSON and exists solely for
-compatibility with these binary types. As such, it is simply defined as an ordered sequence of zero or more byte values.
-
-Additionally, as an implementation detail, the subtype of the binary data is carried around as a `std::uint8_t`, which
-is compatible with both of the binary data formats that use binary subtyping, (though the specific numbering is
-incompatible with each other, and it is up to the user to translate between them).
-
-[CBOR's RFC 7049](https://tools.ietf.org/html/rfc7049) describes this type as:
-> Major type 2: a byte string. The string's length in bytes is represented following the rules for positive integers
-> (major type 0).
-
-[MessagePack's documentation on the bin type
-family](https://github.com/msgpack/msgpack/blob/master/spec.md#bin-format-family) describes this type as:
-> Bin format family stores an byte array in 2, 3, or 5 bytes of extra bytes in addition to the size of the byte array.
-
-[BSON's specifications](http://bsonspec.org/spec.html) describe several binary types; however, this type is intended to
-represent the generic binary type which has the description:
-> Generic binary subtype - This is the most commonly used binary subtype and should be the 'default' for drivers and
-> tools.
-
-None of these impose any limitations on the internal representation other than the basic unit of storage be some type of
-array whose parts are decomposable into bytes.
-
-The default representation of this binary format is a `#!cpp std::vector<std::uint8_t>`, which is a very common way to
-represent a byte array in modern C++.
-
-## Template parameters
-
-`BinaryType`
-:   container type to store arrays
-
-## Notes
-
-#### Default type
-
-The default values for `BinaryType` is `#!cpp std::vector<std::uint8_t>`.
-
-#### Storage
-
-Binary Arrays are stored as pointers in a `basic_json` type. That is, for any access to array values, a pointer of the
-type `#!cpp binary_t*` must be dereferenced.
-
-#### Notes on subtypes
-
-- CBOR
-    - Binary values are represented as byte strings. Subtypes are written as tags.
-
-- MessagePack
-    - If a subtype is given and the binary array contains exactly 1, 2, 4, 8, or 16 elements, the fixext family (fixext1,
-      fixext2, fixext4, fixext8) is used. For other sizes, the ext family (ext8, ext16, ext32) is used. The subtype is
-      then added as singed 8-bit integer.
-    - If no subtype is given, the bin family (bin8, bin16, bin32) is used.
-
-- BSON
-    - If a subtype is given, it is used and added as unsigned 8-bit integer.
-    - If no subtype is given, the generic binary subtype 0x00 is used.
-
-## Version history
-
-- Added in version 3.8.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/boolean_t.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/boolean_t.md
deleted file mode 100644
index 926a5f9f4..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/boolean_t.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# basic_json::boolean_t
-
-```cpp
-using boolean_t = BooleanType;
-```
-
-The type used to store JSON booleans.
-
-[RFC 7159](http://rfc7159.net/rfc7159) implicitly describes a boolean as a type which differentiates the two literals
-`#!json true` and `#!json false`.
-
-To store objects in C++, a type is defined by the template parameter  `BooleanType` which chooses the type to use.
-
-## Notes
-
-#### Default type
-
-With the default values for `BooleanType` (`#!cpp bool`), the default value for `boolean_t` is `#!cpp bool`.
-
-#### Storage
-
-Boolean values are stored directly inside a `basic_json` type.
-
-## Version history
-
-- Added in version 1.0.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/cbor_tag_handler_t.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/cbor_tag_handler_t.md
deleted file mode 100644
index ea417de55..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/cbor_tag_handler_t.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# basic_json::cbor_tag_handler_t
-
-```cpp
-enum class cbor_tag_handler_t
-{
-    error,
-    ignore
-};
-```
-
-This enumeration is used in the [`from_cbor`](from_cbor.md) function to choose how to treat tags:
-
-error
-:   throw a `parse_error` exception in case of a tag
-
-ignore
-:   ignore tags
-
-## Version history
-
-- Added in version 3.9.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/clear.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/clear.md
deleted file mode 100644
index 5119b8389..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/clear.md
+++ /dev/null
@@ -1,58 +0,0 @@
-# basic_json::clear
-
-```cpp
-void clear() noexcept;
-```
-
-Clears the content of a JSON value and resets it to the default value as if [`basic_json(value_t)`](basic_json.md) would
-have been called with the current value type from [`type()`](type.md):
-
-Value type  | initial value
------------ | -------------
-null        | `null`
-boolean     | `false`
-string      | `""`
-number      | `0`
-binary      | An empty byte vector
-object      | `{}`
-array       | `[]`
-
-Has the same effect as calling
-
-```.cpp
-*this = basic_json(type());
-```
-
-## Exception safety
-
-No-throw guarantee: this function never throws exceptions.
-
-## Complexity
-
-Linear in the size of the JSON value.
-
-## Notes
-
-All iterators, pointers and references related to this container are invalidated.
-
-## Example
-
-??? example
-
-    The example below shows the effect of `clear()` to different
-    JSON types.
-    
-    ```cpp
-    --8<-- "examples/clear.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/clear.output"
-    ```
-
-## Version history
-
-- Added in version 1.0.0.
-- Added support for binary types in version 3.8.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/contains.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/contains.md
deleted file mode 100644
index 1616f0c2d..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/contains.md
+++ /dev/null
@@ -1,56 +0,0 @@
-# basic_json::contains
-
-```cpp
-template<typename KeyT>
-bool contains(KeyT && key) const;
-```
-
-Check whether an element exists in a JSON object with key equivalent to `key`. If the element is not found or the JSON
-value is not an object, `#!cpp false` is returned.
-
-## Template parameters
-
-`KeyT`
-:   A type for an object key other than `basic_json::json_pointer`.
-
-## Parameters
-
-`key` (in)
-:   key value to check its existence.
-    
-## Return value
-
-`#!cpp true` if an element with specified `key` exists. If no such element with such key is found or the JSON value is
-not an object, `#!cpp false` is returned.
-
-## Exception safety
-
-Strong exception safety: if an exception occurs, the original value stays intact.
-
-## Complexity
-
-Logarithmic in the size of the JSON object.
-
-## Notes
-
-This method always returns `#!cpp false` when executed on a JSON type that is not an object.
-
-## Example
-
-??? example
-
-    The example shows how `contains()` is used.
-    
-    ```cpp
-    --8<-- "examples/contains.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/contains.output"
-    ```
-
-## Version history
-
-- Added in version 3.6.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/count.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/count.md
deleted file mode 100644
index 34f1605d3..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/count.md
+++ /dev/null
@@ -1,55 +0,0 @@
-# basic_json::count
-
-```cpp
-template<typename KeyT>
-size_type count(KeyT&& key) const;
-```
-
-Returns the number of elements with key `key`. If `ObjectType` is the default `std::map` type, the return value will
-always be `0` (`key` was not found) or `1` (`key` was found).
-
-## Template parameters
-
-`KeyT`
-:   A type for an object key.
-
-## Parameters
-
-`key` (in)
-:   key value of the element to count.
-    
-## Return value
-
-Number of elements with key `key`. If the JSON value is not an object, the return value will be `0`.
-
-## Exception safety
-
-Strong exception safety: if an exception occurs, the original value stays intact.
-
-## Complexity
-
-Logarithmic in the size of the JSON object.
-
-## Notes
-
-This method always returns `0` when executed on a JSON type that is not an object.
-
-## Example
-
-??? example
-
-    The example shows how `count()` is used.
-    
-    ```cpp
-    --8<-- "examples/count.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/count.output"
-    ```
-
-## Version history
-
-- Added in version 1.0.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/dump.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/dump.md
deleted file mode 100644
index cad06ca92..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/dump.md
+++ /dev/null
@@ -1,66 +0,0 @@
-# basic_json::dump
-
-```cpp
-string_t dump(const int indent = -1,
-              const char indent_char = ' ',
-              const bool ensure_ascii = false,
-              const error_handler_t error_handler = error_handler_t::strict) const;
-```
-
-Serialization function for JSON values. The function tries to mimic Python's `json.dumps()` function, and currently
-supports its `indent` and `ensure_ascii` parameters.
-    
-## Parameters
-
-`indent` (in)
-:   If `indent` is nonnegative, then array elements and object members will be pretty-printed with that indent level. An
-    indent level of `0` will only insert newlines. `-1` (the default) selects the most compact representation.
-
-`indent_char` (in)
-:   The character to use for indentation if `indent` is greater than `0`. The default is ` ` (space).
-
-`ensure_ascii` (in)
-:   If `ensure_ascii` is true, all non-ASCII characters in the output are escaped with `\uXXXX` sequences, and the
-    result consists of ASCII characters only.
-
-`error_handler` (in)
-:   how to react on decoding errors; there are three possible values (see [`error_handler_t`](error_handler_t.md):
-    `strict` (throws and exception in case a decoding error occurs; default), `replace` (replace invalid UTF-8 sequences
-    with U+FFFD), and `ignore` (ignore invalid UTF-8 sequences during serialization; all bytes are copied to the output
-    unchanged).
-    
-## Return value
-
-string containing the serialization of the JSON value
-
-## Exception safety
-
-Strong guarantee: if an exception is thrown, there are no changes to any JSON value.
-
-## Complexity
-
-Linear.
-
-## Notes
-
-Binary values are serialized as object containing two keys:
-
-- "bytes": an array of bytes as integers
-- "subtype": the subtype as integer or `#!json null` if the binary has no subtype
-
-## Example
-
-??? example
-
-    The following example shows the effect of different `indent`, `indent_char`, and `ensure_ascii` parameters to the
-    result of the serialization.
-
-    ```cpp
-    --8<-- "examples/dump.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/dump.output"
-    ```
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/empty.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/empty.md
deleted file mode 100644
index 151e0739b..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/empty.md
+++ /dev/null
@@ -1,66 +0,0 @@
-# basic_json::empty
-
-```cpp
-bool empty() const noexcept;
-```
-
-Checks if a JSON value has no elements (i.e. whether its [`size()`](size.md) is `0`).
-    
-## Return value
-
-The return value depends on the different types and is defined as follows:
-
-Value type  | return value
------------ | -------------
-null        | `#!cpp true`
-boolean     | `#!cpp false`
-string      | `#!cpp false`
-number      | `#!cpp false`
-binary      | `#!cpp false`
-object      | result of function `object_t::empty()`
-array       | result of function `array_t::empty()`
-
-## Exception safety
-
-No-throw guarantee: this function never throws exceptions.
-
-## Complexity
-
-Constant, as long as [`array_t`](array_t.md) and [`object_t`](object_t.md) satisfy the
-[Container](https://en.cppreference.com/w/cpp/named_req/Container) concept; that is, their `empty()` functions have
-constant complexity.
-
-## Possible implementation
-
-```cpp
-bool empty() const noexcept
-{
-    return size() == 0;
-}
-```
-
-## Notes
-
-This function does not return whether a string stored as JSON value is empty -- it returns whether the JSON container
-itself is empty which is `#!cpp false` in the case of a string.
-
-## Example
-
-??? example
-
-    The following code uses `empty()` to check if a JSON object contains any elements.
-    
-    ```cpp
-    --8<-- "examples/empty.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/empty.output"
-    ```
-
-## Version history
-
-- Added in version 1.0.0.
-- Extended to return `#!cpp false` for binary types in version 3.8.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/erase.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/erase.md
deleted file mode 100644
index 3d80f5bfd..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/erase.md
+++ /dev/null
@@ -1,177 +0,0 @@
-# basic_json::erase
-
-```cpp
-// (1)
-iterator erase(iterator pos);
-const_iterator erase(const_iterator pos);
-
-// (2)
-iterator erase(iterator first, iterator last);
-const_iterator erase(const_iterator first, const_iterator last);
-
-// (3)
-size_type erase(const typename object_t::key_type& key);
-
-// (4)
-void erase(const size_type idx);
-```
-
-1. Removes an element from a JSON value specified by iterator `pos`. The iterator `pos` must be valid and
-   dereferenceable. Thus the `end()` iterator (which is valid, but is not dereferenceable) cannot be used as a value for
-   `pos`.
-   
-    If called on a primitive type other than `#!json null`, the resulting JSON value will be `#!json null`.
-
-2. Remove an element range specified by `[first; last)` from a JSON value. The iterator `first` does not need to be
-   dereferenceable if `first == last`: erasing an empty range is a no-op.
-   
-    If called on a primitive type other than `#!json null`, the resulting JSON value will be `#!json null`.
-
-3. Removes an element from a JSON object by key.
-
-4. Removes an element from a JSON array by index.
-
-## Parameters
-
-`pos` (in)
-:   iterator to the element to remove
-
-`first` (in)
-:   iterator to the beginning of the range to remove
-
-`last` (in)
-:   iterator past the end of the range to remove
-
-`key` (in)
-:   object key of the elements to remove
-    
-`idx` (in)
-:   array index of the element to remove
-    
-## Return value
-
-1. Iterator following the last removed element. If the iterator `pos` refers to the last element, the `end()` iterator
-   is returned.
-2. Iterator following the last removed element. If the iterator `last` refers to the last element, the `end()` iterator
-   is returned.
-3. Number of elements removed. If `ObjectType` is the default `std::map` type, the return value will always be `0`
-   (`key` was not found) or `1` (`key` was found).
-4. /
-
-## Exceptions
-
-1. The function can throw the following exceptions:
-    - Throws [`type_error.307`](../../home/exceptions.md#jsonexceptiontype_error307) if called on a `null` value;
-      example: `"cannot use erase() with null"`
-    - Throws [`invalid_iterator.202`](../../home/exceptions.md#jsonexceptioninvalid_iterator202) if called on an
-      iterator which does not belong to the current JSON value; example: `"iterator does not fit current value"`
-    - Throws [`invalid_iterator.205`](../../home/exceptions.md#jsonexceptioninvalid_iterator205) if called on a
-      primitive type with invalid iterator (i.e., any iterator which is not `begin()`); example: `"iterator out of
-      range"`
-2. The function can throw thw following exceptions:
-    - Throws [`type_error.307`](../../home/exceptions.md#jsonexceptiontype_error307) if called on a `null` value;
-      example: `"cannot use erase() with null"`
-    - Throws [`invalid_iterator.203`](../../home/exceptions.md#jsonexceptioninvalid_iterator203) if called on iterators
-      which does not belong to the current JSON value; example: `"iterators do not fit current value"`
-    - Throws [`invalid_iterator.204`](../../home/exceptions.md#jsonexceptioninvalid_iterator204) if called on a
-      primitive type with invalid iterators (i.e., if `first != begin()` and `last != end()`); example: `"iterators out
-      of range"`
-3. The function can throw thw following exceptions:
-    - Throws [`type_error.307`](../../home/exceptions.md#jsonexceptiontype_error307) when called on a type other than
-      JSON object; example: `"cannot use erase() with null"`
-4. The function can throw thw following exceptions:
-    - Throws [`type_error.307`](../../home/exceptions.md#jsonexceptiontype_error307) when called on a type other than
-      JSON object; example: `"cannot use erase() with null"`
-    - Throws [`out_of_range.401`](../../home/exceptions.md#jsonexceptionout_of_range401) when `idx >= size()`; example:
-      `"array index 17 is out of range"`
-
-## Exception safety
-
-Strong exception safety: if an exception occurs, the original value stays intact.
-
-## Complexity
-
-1. The complexity depends on the type:
-       - objects: amortized constant
-       - arrays: linear in distance between `pos` and the end of the container
-       - strings and binary: linear in the length of the member
-       - other types: constant
-2. The complexity depends on the type:
-       - objects: `log(size()) + std::distance(first, last)`
-       - arrays: linear in the distance between `first` and `last`, plus linear
-         in the distance between `last` and end of the container
-       - strings and binary: linear in the length of the member
-       - other types: constant
-3. `log(size()) + count(key)`
-4. Linear in distance between `idx` and the end of the container.
-
-## Notes
-
-1. Invalidates iterators and references at or after the point of the
-   erase, including the `end()` iterator.
-2. /
-3. References and iterators to the erased elements are invalidated. Other references and iterators are not affected.
-4. /
-
-## Example
-
-??? example
-
-    The example shows the effect of `erase()` for different JSON types using an iterator.
-    
-    ```cpp
-    --8<-- "examples/erase__IteratorType.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/erase__IteratorType.output"
-    ```
-
-??? example
-
-    The example shows the effect of `erase()` for different JSON types using an iterator range.
-    
-    ```cpp
-    --8<-- "examples/erase__IteratorType_IteratorType.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/erase__IteratorType_IteratorType.output"
-    ```
-
-??? example
-
-    The example shows the effect of `erase()` for different JSON types using an object key.
-    
-    ```cpp
-    --8<-- "examples/erase__key_type.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/erase__key_type.output"
-    ```
-
-??? example
-
-    The example shows the effect of `erase()` using an array index.
-    
-    ```cpp
-    --8<-- "examples/erase__size_type.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/erase__size_type.output"
-    ```
-
-## Version history
-
-- Added in version 1.0.0.
-- Added support for binary types in version 3.8.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/error_handler_t.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/error_handler_t.md
deleted file mode 100644
index 050dda14d..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/error_handler_t.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# basic_json::error_handler_t
-
-```cpp
-enum class error_handler_t {
-    strict,
-    replace,
-    ignore
-};
-```
-
-This enumeration is used in the [`dump`](dump.md) function to choose how to treat decoding errors while serializing a
-`basic_json` value. Three values are differentiated:
-
-strict
-:   throw a `type_error` exception in case of invalid UTF-8
-
-replace
-:   replace invalid UTF-8 sequences with U+FFFD (� REPLACEMENT CHARACTER)
-
-ignore
-:   ignore invalid UTF-8 sequences; all bytes are copied to the output unchanged
-
-## Version history
-
-- Added in version 3.4.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/find.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/find.md
deleted file mode 100644
index 5ff4baf61..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/find.md
+++ /dev/null
@@ -1,59 +0,0 @@
-# basic_json::find
-
-```cpp
-template<typename KeyT>
-iterator find(KeyT&& key);
-
-template<typename KeyT>
-const_iterator find(KeyT&& key) const
-```
-
-Finds an element in a JSON object with key equivalent to `key`. If the element is not found or the JSON value is not an
-object, `end()` is returned.
-
-## Template parameters
-
-`KeyT`
-:   A type for an object key.
-
-## Parameters
-
-`key` (in)
-:   key value of the element to search for.
-    
-## Return value
-
-Iterator to an element with key equivalent to `key`. If no such element is found or the JSON value is not an object,
-past-the-end (see `end()`) iterator is returned.
-
-## Exception safety
-
-Strong exception safety: if an exception occurs, the original value stays intact.
-
-## Complexity
-
-Logarithmic in the size of the JSON object.
-
-## Notes
-
-This method always returns `end()` when executed on a JSON type that is not an object.
-
-## Example
-
-??? example
-
-    The example shows how `find()` is used.
-    
-    ```cpp
-    --8<-- "examples/find__key_type.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/find__key_type.output"
-    ```
-
-## Version history
-
-- Added in version 1.0.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/from_bson.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/from_bson.md
deleted file mode 100644
index 6df74f39c..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/from_bson.md
+++ /dev/null
@@ -1,83 +0,0 @@
-# basic_json::from_bson
-
-```cpp
-// (1)
-template<typename InputType>
-static basic_json from_bson(InputType&& i,
-                            const bool strict = true,
-                            const bool allow_exceptions = true);
-// (2)
-template<typename IteratorType>
-static basic_json from_bson(IteratorType first, IteratorType last,
-                            const bool strict = true,
-                            const bool allow_exceptions = true);
-```
-
-Deserializes a given input to a JSON value using the BSON (Binary JSON) serialization format.
-
-1. Reads from a compatible input.
-2. Reads from an iterator range.
-
-## Template parameters
-
-`InputType`
-:   A compatible input, for instance:
-    
-    - an `std::istream` object
-    - a `FILE` pointer
-    - a C-style array of characters
-    - a pointer to a null-terminated string of single byte characters
-    - an object `obj` for which `begin(obj)` and `end(obj)` produces a valid pair of iterators.
-
-`IteratorType`
-:   a compatible iterator type
-
-## Parameters
-
-`i` (in)
-:   an input in BSON format convertible to an input adapter
-
-`first` (in)
-:   iterator to start of the input
-
-`last` (in)
-:   iterator to end of the input
-
-`strict` (in)
-:   whether to expect the input to be consumed until EOF (`#!cpp true` by default)
-
-`allow_exceptions` (in)
-:   whether to throw exceptions in case of a parse error (optional, `#!cpp true` by default)
-
-## Return value
-
-deserialized JSON value; in case of a parse error and `allow_exceptions` set to `#!cpp false`, the return value will be
-`value_t::discarded`.  The latter can be checked with [`is_discarded`](is_discarded.md).
-
-## Exception safety
-
-Strong guarantee: if an exception is thrown, there are no changes in the JSON value.
-
-## Complexity
-
-Linear in the size of the input.
-
-## Example
-
-??? example
-
-    The example shows the deserialization of a byte vector in BSON format to a JSON value.
-     
-    ```cpp
-    --8<-- "examples/from_bson.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/from_bson.output"
-    ```
-
-## Version history
-
-- Added in version 3.4.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/from_cbor.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/from_cbor.md
deleted file mode 100644
index ec186fc2a..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/from_cbor.md
+++ /dev/null
@@ -1,94 +0,0 @@
-# basic_json::from_cbor
-
-```cpp
-// (1)
-template<typename InputType>
-static basic_json from_cbor(InputType&& i,
-                            const bool strict = true,
-                            const bool allow_exceptions = true,
-                            const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error);
-
-// (2)
-template<typename IteratorType>
-static basic_json from_cbor(IteratorType first, IteratorType last,
-                            const bool strict = true,
-                            const bool allow_exceptions = true,
-                            const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error);
-```
-
-Deserializes a given input to a JSON value using the CBOR (Concise Binary Object Representation) serialization format.
-
-1. Reads from a compatible input.
-2. Reads from an iterator range.
-
-## Template parameters
-
-`InputType`
-:   A compatible input, for instance:
-    
-    - an `std::istream` object
-    - a `FILE` pointer
-    - a C-style array of characters
-    - a pointer to a null-terminated string of single byte characters
-    - an object `obj` for which `begin(obj)` and `end(obj)` produces a valid pair of iterators.
-
-`IteratorType`
-:   a compatible iterator type
-
-## Parameters
-
-`i` (in)
-:   an input in CBOR format convertible to an input adapter
-
-`first` (in)
-:   iterator to start of the input
-
-`last` (in)
-:   iterator to end of the input
-
-`strict` (in)
-:   whether to expect the input to be consumed until EOF (`#!cpp true` by default)
-
-`allow_exceptions` (in)
-:   whether to throw exceptions in case of a parse error (optional, `#!cpp true` by default)
-
-`tag_handler` (in)
-:   how to treat CBOR tags (optional, `error` by default); see [`cbor_tag_handler_t`](cbor_tag_handler_t.md) for more
-    information
-
-## Return value
-
-deserialized JSON value; in case of a parse error and `allow_exceptions` set to `#!cpp false`, the return value will be
-`value_t::discarded`.  The latter can be checked with [`is_discarded`](is_discarded.md).
-
-## Exception safety
-
-Strong guarantee: if an exception is thrown, there are no changes in the JSON value.
-
-## Complexity
-
-Linear in the size of the input.
-
-## Example
-
-??? example
-
-    The example shows the deserialization of a byte vector in CBOR format to a JSON value.
-     
-    ```cpp
-    --8<-- "examples/from_cbor.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/from_cbor.output"
-    ```
-
-## Version history
-
-- Added in version 2.0.9.
-- Parameter `start_index` since version 2.1.1.
-- Changed to consume input adapters, removed `start_index` parameter, and added `strict` parameter in version 3.0.0.
-- Added `allow_exceptions` parameter in version 3.2.0.
-- Added `tag_handler` parameter in version 3.9.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/from_msgpack.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/from_msgpack.md
deleted file mode 100644
index 9f6852499..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/from_msgpack.md
+++ /dev/null
@@ -1,86 +0,0 @@
-# basic_json::from_msgpack
-
-```cpp
-// (1)
-template<typename InputType>
-static basic_json from_msgpack(InputType&& i,
-                               const bool strict = true,
-                               const bool allow_exceptions = true);
-// (2)
-template<typename IteratorType>
-static basic_json from_msgpack(IteratorType first, IteratorType last,
-                               const bool strict = true,
-                               const bool allow_exceptions = true);
-```
-
-Deserializes a given input to a JSON value using the MessagePack serialization format.
-
-1. Reads from a compatible input.
-2. Reads from an iterator range.
-
-## Template parameters
-
-`InputType`
-:   A compatible input, for instance:
-    
-    - an `std::istream` object
-    - a `FILE` pointer
-    - a C-style array of characters
-    - a pointer to a null-terminated string of single byte characters
-    - an object `obj` for which `begin(obj)` and `end(obj)` produces a valid pair of iterators.
-
-`IteratorType`
-:   a compatible iterator type
-
-## Parameters
-
-`i` (in)
-:   an input in MessagePack format convertible to an input adapter
-
-`first` (in)
-:   iterator to start of the input
-
-`last` (in)
-:   iterator to end of the input
-
-`strict` (in)
-:   whether to expect the input to be consumed until EOF (`#!cpp true` by default)
-
-`allow_exceptions` (in)
-:   whether to throw exceptions in case of a parse error (optional, `#!cpp true` by default)
-
-## Return value
-
-deserialized JSON value; in case of a parse error and `allow_exceptions` set to `#!cpp false`, the return value will be
-`value_t::discarded`.  The latter can be checked with [`is_discarded`](is_discarded.md).
-
-## Exception safety
-
-Strong guarantee: if an exception is thrown, there are no changes in the JSON value.
-
-## Complexity
-
-Linear in the size of the input.
-
-## Example
-
-??? example
-
-    The example shows the deserialization of a byte vector in MessagePack format to a JSON value.
-     
-    ```cpp
-    --8<-- "examples/from_msgpack.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/from_msgpack.output"
-    ```
-
-## Version history
-
-- Added in version 2.0.9.
-- Parameter `start_index` since version 2.1.1.
-- Changed to consume input adapters, removed `start_index` parameter, and added `strict` parameter in version 3.0.0.
-- Added `allow_exceptions` parameter in version 3.2.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/from_ubjson.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/from_ubjson.md
deleted file mode 100644
index f6213f293..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/from_ubjson.md
+++ /dev/null
@@ -1,84 +0,0 @@
-# basic_json::from_ubjson
-
-```cpp
-// (1)
-template<typename InputType>
-static basic_json from_ubjson(InputType&& i,
-                              const bool strict = true,
-                              const bool allow_exceptions = true);
-// (2)
-template<typename IteratorType>
-static basic_json from_ubjson(IteratorType first, IteratorType last,
-                              const bool strict = true,
-                              const bool allow_exceptions = true);
-```
-
-Deserializes a given input to a JSON value using the UBJSON (Universal Binary JSON) serialization format.
-
-1. Reads from a compatible input.
-2. Reads from an iterator range.
-
-## Template parameters
-
-`InputType`
-:   A compatible input, for instance:
-    
-    - an `std::istream` object
-    - a `FILE` pointer
-    - a C-style array of characters
-    - a pointer to a null-terminated string of single byte characters
-    - an object `obj` for which `begin(obj)` and `end(obj)` produces a valid pair of iterators.
-
-`IteratorType`
-:   a compatible iterator type
-
-## Parameters
-
-`i` (in)
-:   an input in UBJSON format convertible to an input adapter
-
-`first` (in)
-:   iterator to start of the input
-
-`last` (in)
-:   iterator to end of the input
-
-`strict` (in)
-:   whether to expect the input to be consumed until EOF (`#!cpp true` by default)
-
-`allow_exceptions` (in)
-:   whether to throw exceptions in case of a parse error (optional, `#!cpp true` by default)
-
-## Return value
-
-deserialized JSON value; in case of a parse error and `allow_exceptions` set to `#!cpp false`, the return value will be
-`value_t::discarded`. The latter can be checked with [`is_discarded`](is_discarded.md).
-
-## Exception safety
-
-Strong guarantee: if an exception is thrown, there are no changes in the JSON value.
-
-## Complexity
-
-Linear in the size of the input.
-
-## Example
-
-??? example
-
-    The example shows the deserialization of a byte vector in UBJSON format to a JSON value.
-     
-    ```cpp
-    --8<-- "examples/from_ubjson.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/from_ubjson.output"
-    ```
-
-## Version history
-
-- Added in version 3.1.0.
-- Added `allow_exceptions` parameter in version 3.2.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/get_allocator.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/get_allocator.md
deleted file mode 100644
index d4133af7a..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/get_allocator.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# basic_json::get_allocator
-
-```cpp
-static allocator_type get_allocator();
-```
-
-Returns the allocator associated with the container.
-    
-## Return value
-
-associated allocator
-
-## Version history
-
-- Unknown.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/get_binary.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/get_binary.md
deleted file mode 100644
index 46d5b652d..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/get_binary.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# basic_json::get_binary
-
-```cpp
-binary_t& get_binary();
-
-const binary_t& get_binary() const;
-```
-
-Returns a reference to the stored binary value.
-
-## Return value
-
-Reference to binary value.
-
-## Exception safety
-
-Strong exception safety: if an exception occurs, the original value stays intact.
-
-## Exceptions
-
-Throws [`type_error.302`](../../home/exceptions.md#jsonexceptiontype_error302) if the value is not binary
-
-## Complexity
-
-Constant.
-
-## Version history
-
-- Added in version 3.8.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/index.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/index.md
deleted file mode 100644
index e8841e850..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/index.md
+++ /dev/null
@@ -1,252 +0,0 @@
-# basic_json
-
-Defined in header `<json.hpp>`
-
-```cpp
-template<
-    template<typename U, typename V, typename... Args> class ObjectType = std::map,
-    template<typename U, typename... Args> class ArrayType = std::vector,
-    class StringType = std::string,
-    class BooleanType = bool,
-    class NumberIntegerType = std::int64_t,
-    class NumberUnsignedType = std::uint64_t,
-    class NumberFloatType = double,
-    template<typename U> class AllocatorType = std::allocator,
-    template<typename T, typename SFINAE = void> class JSONSerializer = adl_serializer,
-    class BinaryType = std::vector<std::uint8_t>
->
-class basic_json;
-```
-
-## Specializations
-
-- [**json**](../json.md) - default specialization
-- [**ordered_json**](../ordered_json.md) - specialization that maintains the insertion order of object keys
-
-## Template parameters
-
-| Template parameter   | Description | Derived type |
-| -------------------- | ----------- | ------------ |
-| `ObjectType`         | type for JSON objects | [`object_t`](object_t.md) |
-| `ArrayType`          | type for JSON arrays | [`array_t`](array_t.md) |
-| `StringType`         | type for JSON strings and object keys | [`string_t`](string_t.md) |
-| `BooleanType`        | type for JSON booleans | [`boolean_t`](boolean_t.md) |
-| `NumberIntegerType`  | type for JSON integer numbers | [`number_integer_t`](number_integer_t.md) |
-| `NumberUnsignedType` | type for JSON unsigned integer numbers | [`number_unsigned_t`](number_unsigned_t.md) |
-| `NumberFloatType`    | type for JSON floating-point numbers | [`number_float_t`](number_float_t.md) |
-| `AllocatorType`      | type of the allocator to use | |
-| `JSONSerializer`     | the serializer to resolve internal calls to `to_json()` and `from_json()` | [`json_serializer`](json_serializer.md) |
-| `BinaryType`         | type for binary arrays | [`binary_t`](binary_t.md) |
-
-## Iterator invalidation
-
-Todo
-
-## Member types
-
-- [**adl_serializer**](../adl_serializer.md) - the default serializer
-- [**value_t**](value_t.md) - the JSON type enumeration
-- [**json_pointer**](../json_pointer.md) - JSON Pointer implementation
-- [**json_serializer**](json_serializer.md) - type of the serializer to for conversions from/to JSON
-- [**error_handler_t**](error_handler_t.md) - type to choose behavior on decoding errors
-- [**cbor_tag_handler_t**](cbor_tag_handler_t.md) - type to choose how to handle CBOR tags
-- initializer_list_t
-- [**input_format_t**](input_format_t.md) - type to choose the format to parse
-- json_sax_t
-
-### Exceptions
-
-- [**exception**](exception.md) - general exception of the `basic_json` class
-    - [**parse_error**](parse_error.md) - exception indicating a parse error
-    - [**invalid_iterator**](invalid_iterator.md) - exception indicating errors with iterators
-    - [**type_error**](type_error.md) - exception indicating executing a member function with a wrong type
-    - [**out_of_range**](out_of_range.md) - exception indicating access out of the defined range
-    - [**other_error**](other_error.md) - exception indicating other library errors
-
-### Container types
-
-| Type                     | Definition |
-| ------------------------ | ---------- |
-| `value_type`             | `#!cpp basic_json` |
-| `reference`              | `#!cpp value_type&` |
-| `const_reference`        | `#!cpp const value_type&` |
-| `difference_type`        | `#!cpp std::ptrdiff_t` |
-| `size_type`              | `#!cpp std::size_t` |
-| `allocator_type`         | `#!cpp AllocatorType<basic_json>` |
-| `pointer`                | `#!cpp std::allocator_traits<allocator_type>::pointer` |
-| `const_pointer`          | `#!cpp std::allocator_traits<allocator_type>::const_pointer` |
-| `iterator`               | [LegacyBidirectionalIterator](https://en.cppreference.com/w/cpp/named_req/BidirectionalIterator) |
-| `const_iterator`         | constant [LegacyBidirectionalIterator](https://en.cppreference.com/w/cpp/named_req/BidirectionalIterator) |
-| `reverse_iterator`       | reverse iterator, derived from `iterator` |
-| `const_reverse_iterator` | reverse iterator, derived from `const_iterator` |
-| `iteration_proxy`        | helper type for [`items`](items.md) function |
-
-### JSON value data types
-
-- [**array_t**](array_t.md) - type for arrays
-- [**binary_t**](binary_t.md) - type for binary arrays
-- [**boolean_t**](boolean_t.md) - type for booleans
-- [**number_float_t**](number_float_t.md) - type for numbers (floating-point)
-- [**number_integer_t**](number_integer_t.md) - type for numbers (integer)
-- [**number_unsigned_t**](number_unsigned_t.md) - type for numbers (unsigned)
-- [**object_comparator_t**](object_comparator_t.md) - comparator for objects
-- [**object_t**](object_t.md) - type for objects
-- [**string_t**](string_t.md) - type for strings
-
-### Parser callback
-
-- [**parse_event_t**](parse_event_t.md) - parser event types
-- [**parser_callback_t**](parser_callback_t.md) - per-element parser callback type
-
-## Member functions
-
-- [(constructor)](basic_json.md)
-- [(destructor)](~basic_json.md)
-- [**operator=**](operator=.md) - copy assignment
-- [**array**](array_t.md) (static) - explicitly create an array
-- [**binary**](binary.md) (static) - explicitly create a binary array
-- [**object**](object_t.md) (static) - explicitly create an object
-
-### Object inspection
-
-Functions to inspect the type of a JSON value.
-
-- [**type**](type.md) - return the type of the JSON value
-- [**operator value_t**](operator_value_t.md) - return the type of the JSON value
-- [**type_name**](type_name.md) - return the type as string
-- [**is_primitive**](is_primitive.md) - return whether type is primitive
-- [**is_structured**](is_structured.md) - return whether type is structured
-- [**is_null**](is_null.md) - return whether value is null
-- [**is_boolean**](is_boolean.md) - return whether value is a boolean
-- [**is_number**](is_number.md) - return whether value is a number
-- [**is_number_integer**](is_number_integer.md) - return whether value is an integer number
-- [**is_number_unsigned**](is_number_unsigned.md) - return whether value is an unsigned integer number
-- [**is_number_float**](is_number_float.md) - return whether value is a floating-point number
-- [**is_object**](is_object.md) - return whether value is an object
-- [**is_array**](is_array.md) - return whether value is an array
-- [**is_string**](is_string.md) - return whether value is a string
-- [**is_binary**](is_binary.md) - return whether value is a binary array
-- [**is_discarded**](is_discarded.md) - return whether value is discarded
-
-### Value access
-
-Direct access to the stored value of a JSON value.
-
-- [**get**](get.md) - get a value
-- [**get_to**](get_to.md) - get a value and write it to a destination
-- [**get_ptr**](get_ptr.md) - get a pointer value
-- [**get_ref**](get_ref.md) - get a reference value
-- [**operator ValueType**](operator_ValueType.md) - get a value
-- [**get_binary**](get_binary.md) - get a binary value
-
-### Element access
-
-Access to the JSON value
-
-- [**at**](at.md) - access specified element with bounds checking
-- [**operator[]**](operator[].md) - access specified element
-- [**value**](value.md) - access specified object element with default value
-- [**front**](front.md) - access the first element
-- [**back**](back.md) - access the last element
-
-### Lookup
-
-- [**find**](find.md) - find an element in a JSON object
-- [**count**](count.md) - returns the number of occurrences of a key in a JSON object
-- [**contains**](contains.md) - check the existence of an element in a JSON object
-
-### Iterators
-
-- [**begin**](begin.md) - returns an iterator to the first element
-- [**cbegin**](cbegin.md) - returns a const iterator to the first element
-- [**end**](end.md) - returns an iterator to one past the last element
-- [**cend**](cend.md) - returns a const iterator to one past the last element
-- [**rbegin**](rbegin.md) - returns an iterator to the reverse-beginning
-- [**rend**](rend.md) - returns an iterator to the reverse-end
-- [**crbegin**](crbegin.md) - returns a const iterator to the reverse-beginning
-- [**crend**](crend.md) - returns a const iterator to the reverse-end
-- [**items**](items.md) - wrapper to access iterator member functions in range-based for
-
-### Capacity
-
-- [**empty**](empty.md) - checks whether the container is empty
-- [**size**](size.md) - returns the number of elements
-- [**max_size**](max_size.md) - returns the maximum possible number of elements
-
-### Modifiers
-
-- [**clear**](clear.md) - clears the contents
-- [**push_back**](push_back.md) - add a value to an array/object
-- [**operator+=**](operator+=.md) - add a value to an array/object
-- [**emplace_back**](emplace_back.md) - add a value to an array
-- [**emplace**](emplace.md) - add a value to an object if key does not exist
-- [**erase**](erase.md) - remove elements
-- [**insert**](insert.md) - inserts elements
-- [**update**](update.md) - updates a JSON object from another object, overwriting existing keys 
-- swap - exchanges the values
-
-### Lexicographical comparison operators
-
-- [**operator==**](operator_eq.md) - comparison: equal
-- [**operator!=**](operator_ne.md) - comparison: not equal
-- [**operator<**](operator_lt.md) - comparison: less than
-- [**operator<=**](operator_le.md) - comparison: less than or equal
-- [**operator>**](operator_gt.md) - comparison: greater than
-- [**operator>=**](operator_ge.md) - comparison: greater than or equal
-
-### Serialization / Dumping
-
-- [**dump**](dump.md) - serialization
-- to_string - user-defined to_string function for JSON values
-
-### Deserialization / Parsing
-
-- [**parse**](parse.md) (static) - deserialize from a compatible input
-- [**accept**](accept.md) (static) - check if the input is valid JSON
-- [**sax_parse**](sax_parse.md) (static) - generate SAX events
-
-### JSON Pointer functions
-
-- [**flatten**](flatten.md) - return flattened JSON value
-- [**unflatten**](unflatten.md) - unflatten a previously flattened JSON value
-
-### JSON Patch functions
-
-- [**patch**](patch.md) - applies a JSON patch
-- [**diff**](diff.md) (static) - creates a diff as a JSON patch
-
-### JSON Merge Patch functions
-
-- [**merge_patch**](merge_patch.md) - applies a JSON Merge Patch
-
-## Static functions
-
-- [**meta**](meta.md) - returns version information on the library
-- [**get_allocator**](get_allocator.md) - returns the allocator associated with the container
-
-### Binary formats
-
-- [**from_bson**](from_bson.md) (static) - create a JSON value from an input in BSON format
-- [**from_cbor**](from_cbor.md) (static) - create a JSON value from an input in CBOR format
-- [**from_msgpack**](from_msgpack.md) (static) - create a JSON value from an input in MessagePack format
-- [**from_ubjson**](from_ubjson.md) (static) - create a JSON value from an input in UBJSON format
-- [**to_bson**](to_bson.md) (static) - create a BSON serialization of a given JSON value
-- [**to_cbor**](to_cbor.md) (static) - create a CBOR serialization of a given JSON value
-- [**to_msgpack**](to_msgpack.md) (static) - create a MessagePack serialization of a given JSON value
-- [**to_ubjson**](to_ubjson.md) (static) - create a UBJSON serialization of a given JSON value
-
-## Non-member functions
-
-- operator<<(std::ostream&) - serialize to stream
-- operator>>(std::istream&) - deserialize from stream
-
-## Literals
-
-- [**operator""_json**](operator_literal_json.md) - user-defined string literal for JSON values
-- [**operator""_json_pointer**](operator_literal_json_pointer.md) - user-defined string literal for JSON pointers
-
-## Helper classes
-
-- std::hash<nlohmann::json\>
-- std::less<nlohmann::value_t\>
-- std::swap<nlohmann::json\>
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/input_format_t.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/input_format_t.md
deleted file mode 100644
index 783085d8e..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/input_format_t.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# basic_json::input_format_t
-
-```cpp
-enum class input_format_t {
-    json,
-    cbor,
-    msgpack,
-    ubjson,
-    bson
-};
-```
-
-This enumeration is used in the [`sax_parse`](sax_parse.md) function to choose the input format to parse:
-
-json
-:   JSON (JavaScript Object Notation)
-
-cbor
-:   CBOR (Concise Binary Object Representation)
-
-msgpack
-:   MessagePack
-
-ubjson
-:   UBJSON (Universal Binary JSON)
-
-bson
-:   BSON (Bin­ary JSON)
-
-## Version history
-
-- Added in version 3.2.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/invalid_iterator.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/invalid_iterator.md
deleted file mode 100644
index b11b27dfc..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/invalid_iterator.md
+++ /dev/null
@@ -1,59 +0,0 @@
-# basic_json::invalid_iterator
-
-```cpp
-class invalid_iterator : public exception;
-```
-
-This exception is thrown if iterators passed to a library function do not match the expected semantics.
-
-Exceptions have ids 2xx.
-
-```plantuml
-std::exception <|-- basic_json::exception
-basic_json::exception <|-- basic_json::parse_error
-basic_json::exception <|-- basic_json::invalid_iterator
-basic_json::exception <|-- basic_json::type_error
-basic_json::exception <|-- basic_json::out_of_range
-basic_json::exception <|-- basic_json::other_error
-
-interface std::exception {}
-
-class basic_json::exception {
-    + const int id
-    + const char* what() const
-}
-
-class basic_json::parse_error {
-    + const std::size_t byte
-}
-
-class basic_json::invalid_iterator #FFFF00 {}
-```
-
-## Member functions
-
-- **what** - returns explanatory string
-
-## Member variables
-
-- **id** - the id of the exception
-
-## Example
-
-??? example
-
-    The following code shows how a `invalid_iterator` exception can be caught.
-    
-    ```cpp
-    --8<-- "examples/invalid_iterator.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/invalid_iterator.output"
-    ```
-
-## Version history
-
-- Since version 3.0.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/is_number.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/is_number.md
deleted file mode 100644
index 9bcb13144..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/is_number.md
+++ /dev/null
@@ -1,50 +0,0 @@
-# basic_json::is_number
-
-```cpp
-constexpr bool is_number() const noexcept;
-```
-
-This function returns `#!cpp true` if and only if the JSON value is a number. This includes both integer (signed and
-unsigned) and floating-point values.
-    
-## Return value
-
-`#!cpp true` if type is number (regardless whether integer, unsigned integer or floating-type), `#!cpp false` otherwise.
-
-## Exception safety
-
-No-throw guarantee: this member function never throws exceptions.
-
-## Complexity
-
-Constant.
-
-## Possible implementation
-
-```cpp
-constexpr bool is_number() const noexcept
-{
-    return is_number_integer() || is_number_float();
-}
-```
-
-## Example
-
-??? example
-
-    The following code exemplifies `is_number()` for all JSON types.
-    
-    ```cpp
-    --8<-- "examples/is_number.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/is_number.output"
-    ```
-
-## Version history
-
-- Added in version 1.0.0.
-- Extended to also return `#!cpp true` for unsigned integers in 2.0.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/is_number_float.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/is_number_float.md
deleted file mode 100644
index d709bf71b..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/is_number_float.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# basic_json::is_number_float
-
-```cpp
-constexpr bool is_number_float() const noexcept;
-```
-
-This function returns `#!cpp true` if and only if the JSON value is a floating-point number. This excludes signed and
-unsigned integer values.
-    
-## Return value
-
-`#!cpp true` if type is a floating-point number, `#!cpp false` otherwise.
-
-## Exception safety
-
-No-throw guarantee: this member function never throws exceptions.
-
-## Complexity
-
-Constant.
-
-## Example
-
-??? example
-
-    The following code exemplifies `is_number_float()` for all JSON types.
-    
-    ```cpp
-    --8<-- "examples/is_number_float.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/is_number_float.output"
-    ```
-
-## Version history
-
-- Added in version 1.0.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/is_number_integer.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/is_number_integer.md
deleted file mode 100644
index c308c9296..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/is_number_integer.md
+++ /dev/null
@@ -1,41 +0,0 @@
-# basic_json::is_number_integer
-
-```cpp
-constexpr bool is_number_integer() const noexcept;
-```
-
-This function returns `#!cpp true` if and only if the JSON value is a signed or unsigned integer number. This excludes
-floating-point values.
-    
-## Return value
-
-`#!cpp true` if type is an integer or unsigned integer number, `#!cpp false` otherwise.
-
-## Exception safety
-
-No-throw guarantee: this member function never throws exceptions.
-
-## Complexity
-
-Constant.
-
-## Example
-
-??? example
-
-    The following code exemplifies `is_number_integer()` for all JSON types.
-    
-    ```cpp
-    --8<-- "examples/is_number_integer.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/is_number_integer.output"
-    ```
-
-## Version history
-
-- Added in version 1.0.0.
-- Extended to also return `#!cpp true` for unsigned integers in 2.0.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/is_number_unsigned.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/is_number_unsigned.md
deleted file mode 100644
index 56493eae6..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/is_number_unsigned.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# basic_json::is_number_unsigned
-
-```cpp
-constexpr bool is_number_unsigned() const noexcept;
-```
-
-This function returns `#!cpp true` if and only if the JSON value is an unsigned integer number. This excludes
-floating-point and signed integer values.
-    
-## Return value
-
-`#!cpp true` if type is an unsigned integer number, `#!cpp false` otherwise.
-
-## Exception safety
-
-No-throw guarantee: this member function never throws exceptions.
-
-## Complexity
-
-Constant.
-
-## Example
-
-??? example
-
-    The following code exemplifies `is_number_unsigned()` for all JSON types.
-    
-    ```cpp
-    --8<-- "examples/is_number_unsigned.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/is_number_unsigned.output"
-    ```
-
-## Version history
-
-- Added in version 2.0.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/is_primitive.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/is_primitive.md
deleted file mode 100644
index 37be35c7f..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/is_primitive.md
+++ /dev/null
@@ -1,60 +0,0 @@
-# basic_json::is_primitive
-
-```cpp
-constexpr bool is_primitive() const noexcept;
-```
-
-This function returns `#!cpp true` if and only if the JSON type is primitive (string, number, boolean, `#!json null`,
-binary).
-    
-## Return value
-
-`#!cpp true` if type is primitive (string, number, boolean, `#!json null`, or binary), `#!cpp false` otherwise.
-
-## Exception safety
-
-No-throw guarantee: this member function never throws exceptions.
-
-## Complexity
-
-Constant.
-
-## Possible implementation
-
-```cpp
-constexpr bool is_primitive() const noexcept
-{
-    return is_null() || is_string() || is_boolean() || is_number() || is_binary();
-}
-```
-
-## Notes
-
-The term *primitive* stems from [RFC 8259](https://tools.ietf.org/html/rfc8259):
-
-> JSON can represent four primitive types (strings, numbers, booleans, and null) and two structured types (objects and
-> arrays).
-
-This library extends primitive types to binary types, because binary types are  roughly comparable to strings. Hence,
-`is_primitive()` returns `#!cpp true` for binary values.
-
-## Example
-
-??? example
-
-    The following code exemplifies `is_primitive()` for all JSON types.
-    
-    ```cpp
-    --8<-- "examples/is_primitive.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/is_primitive.output"
-    ```
-
-## Version history
-
-- Added in version 1.0.0.
-- Extended to return `#!cpp true` for binary types in version 3.8.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/is_structured.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/is_structured.md
deleted file mode 100644
index 397579884..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/is_structured.md
+++ /dev/null
@@ -1,48 +0,0 @@
-# basic_json::is_structured
-
-```cpp
-constexpr bool is_structured() const noexcept;
-```
-
-This function returns `#!cpp true` if and only if the JSON type is structured (array or object).
-    
-## Return value
-
-`#!cpp true` if type is structured (array or object), `#!cpp false` otherwise.
-
-## Exception safety
-
-No-throw guarantee: this member function never throws exceptions.
-
-## Complexity
-
-Constant.
-
-## Notes
-
-The term *structured* stems from [RFC 8259](https://tools.ietf.org/html/rfc8259):
-
-> JSON can represent four primitive types (strings, numbers, booleans, and null) and two structured types (objects and
-> arrays).
-
-Note that though strings are containers in C++, they are treated as primitive values in JSON.
-
-## Example
-
-??? example
-
-    The following code exemplifies `is_structured()` for all JSON types.
-    
-    ```cpp
-    --8<-- "examples/is_structured.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/is_structured.output"
-    ```
-
-## Version history
-
-- Added in version 1.0.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/json_serializer.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/json_serializer.md
deleted file mode 100644
index 89379acf4..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/json_serializer.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# basic_json::json_serializer
-
-```cpp
-template<typename T, typename SFINAE>
-using json_serializer = JSONSerializer<T, SFINAE>;
-```
-
-## Template parameters
-
-`T`
-:   type to convert; will be used in the `to_json`/`from_json` functions
-
-`SFINAE`
-:   type to add compile type checks via SFINAE; usually `#!cpp void`
-
-## Notes
-
-#### Default type
-
-The default values for `json_serializer` is [`adl_serializer`](../adl_serializer.md).
-
-## Version history
-
-- Since version 2.0.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/max_size.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/max_size.md
deleted file mode 100644
index 21fffa717..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/max_size.md
+++ /dev/null
@@ -1,58 +0,0 @@
-# basic_json::max_size
-
-```cpp
-size_type max_size() const noexcept;
-```
-
-Returns the maximum number of elements a JSON value is able to hold due to system or library implementation limitations,
-i.e. `std::distance(begin(), end())` for the JSON value.
-    
-## Return value
-
-The return value depends on the different types and is defined as follows:
-
-Value type  | return value
------------ | -------------
-null        | `0` (same as [`size()`](size.md))
-boolean     | `1` (same as [`size()`](size.md))
-string      | `1` (same as [`size()`](size.md))
-number      | `1` (same as [`size()`](size.md))
-binary      | `1` (same as [`size()`](size.md))
-object      | result of function `object_t::max_size()`
-array       | result of function `array_t::max_size()`
-
-## Exception safety
-
-No-throw guarantee: this function never throws exceptions.
-
-## Complexity
-
-Constant, as long as [`array_t`](array_t.md) and [`object_t`](object_t.md) satisfy the
-[Container](https://en.cppreference.com/w/cpp/named_req/Container) concept; that is, their `max_size()` functions have
-constant complexity.
-
-## Notes
-
-This function does not return the maximal length of a string stored as JSON value -- it returns the maximal number of
-string elements the JSON value can store which is `1`.
-
-## Example
-
-??? example
-
-    The following code calls `max_size()` on the different value types. Note the output is implementation specific.
-        
-    ```cpp
-    --8<-- "examples/max_size.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/max_size.output"
-    ```
-
-## Version history
-
-- Added in version 1.0.0.
-- Extended to return `1` for binary types in version 3.8.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/meta.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/meta.md
deleted file mode 100644
index 807c2aa73..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/meta.md
+++ /dev/null
@@ -1,48 +0,0 @@
-# basic_json::meta
-
-```cpp
-static basic_json meta();
-```
-
-This function returns a JSON object with information about the library, including the version number and information on
-the platform and compiler.
-    
-## Return value
-
-JSON object holding version information
-
-key         | description
------------ | ---------------
-`compiler`  | Information on the used compiler. It is an object with the following keys: `c++` (the used C++ standard), `family` (the compiler family; possible values are `clang`, `icc`, `gcc`, `ilecpp`, `msvc`, `pgcpp`, `sunpro`, and `unknown`), and `version` (the compiler version).
-`copyright` | The copyright line for the library as string.
-`name`      | The name of the library as string.
-`platform`  | The used platform as string. Possible values are `win32`, `linux`, `apple`, `unix`, and `unknown`.
-`url`       | The URL of the project as string.
-`version`   | The version of the library. It is an object with the following keys: `major`, `minor`, and `patch` as defined by [Semantic Versioning](http://semver.org), and `string` (the version string).
-
-## Exception safety
-
-Strong guarantee: if an exception is thrown, there are no changes to any JSON value.
-
-## Complexity
-
-Constant.
-
-## Example
-
-The following code shows an example output of the `meta()`
-function.
-
-```cpp
---8<-- "examples/meta.cpp"
-```
-
-Output:
-
-```json
---8<-- "examples/meta.output"
-```
-
-## Version history
-
-- Added in version 2.1.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/object_comparator_t.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/object_comparator_t.md
deleted file mode 100644
index 8fb8656c8..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/object_comparator_t.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# basic_json::object_comparator_t
-
-```cpp
-// until C++14
-using object_comparator_t = std::less<StringType>;
-
-// since C++14
-using object_comparator_t = std::less<>;
-```
-
-The comparator used in [`object_t`](object_t.md).
-
-When C++14 is detected, a transparent com parator is used which, when combined with perfect forwarding on find() and
-count() calls, prevents unnecessary string construction.
-
-## Version history
-
-- Unknown.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/operator[].md b/external_imported/json/doc/mkdocs/docs/api/basic_json/operator[].md
deleted file mode 100644
index 4b36f1a91..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/operator[].md
+++ /dev/null
@@ -1,191 +0,0 @@
-# basic_json::operator[]
-
-```cpp
-// (1)
-reference operator[](size_type idx);
-const_reference operator[](size_type idx) const;
-
-// (2)
-reference operator[](const typename object_t::key_type& key);
-const_reference operator[](const typename object_t::key_type& key) const;
-template<typename T>
-reference operator[](T* key);
-template<typename T>
-const_reference operator[](T* key) const;
-
-// (3)
-reference operator[](const json_pointer& ptr);
-const_reference operator[](const json_pointer& ptr) const;
-```
-
-1. Returns a reference to the element at specified location `idx`.
-2. Returns a reference to the element at with specified key `key`.
-3. Returns a reference to the element at with specified JSON pointer `ptr`.
-
-## Template parameters
-
-`T`
-:   string literal convertible to `object_t::key_type`
-
-## Parameters
-
-`idx` (in)
-:   index of the element to access
-
-`key` (in)
-:   object key of the elements to remove
-    
-`ptr` (in)
-:   JSON pointer to the desired element
-    
-## Return value
-
-1. reference to the element at index `idx`
-2. reference to the element at key `key`
-3. reference to the element pointed to by `ptr`
-
-## Exceptions
-
-1. The function can throw the following exceptions:
-    - Throws [`type_error.305`](../../home/exceptions.md#jsonexceptiontype_error305) if the JSON value is not an array
-      or null; in that cases, using the `[]` operator with an index makes no sense.
-2. The function can throw the following exceptions:
-    - Throws [`type_error.305`](../../home/exceptions.md#jsonexceptiontype_error305) if the JSON value is not an array
-      or null; in that cases, using the `[]` operator with an index makes no sense.
-3. The function can throw the following exceptions:
-    - Throws [`parse_error.106`](../../home/exceptions.md#jsonexceptionparse_error106) if an array index in the passed
-      JSON pointer `ptr` begins with '0'.
-    - Throws [`parse_error.109`](../../home/exceptions.md#jsonexceptionparse_error109) if an array index in the passed
-      JSON pointer `ptr` is not a number.
-    - Throws [`out_of_range.402`](../../home/exceptions.md#jsonexceptionout_of_range402) if the array index '-' is used
-      in the passed JSON pointer `ptr` for the const version.
-    - Throws [`out_of_range.404`](../../home/exceptions.md#jsonexceptionout_of_range404) if the JSON pointer `ptr` can
-      not be resolved.
-
-## Notes
-
-!!! danger
-
-    1. If the element with key `idx` does not exist, the behavior is undefined.
-    2. If the element with key `key` does not exist, the behavior is undefined and is **guarded by an assertion**!
-
-1. The non-const version may add values: If `idx` is beyond the range of the array (i.e., `idx >= size()`), then the
-   array is silently filled up with `#!json null` values to make `idx` a valid reference to the last stored element. In
-   case the value was `#!json null` before, it is converted to an array.
-
-2. If `key` is not found in the object, then it is silently added to the object and filled with a `#!json null` value to
-   make `key` a valid reference. In case the value was `#!json null` before, it is converted to an object.
-
-3. `null` values are created in arrays and objects if necessary.
-   
-    In particular:
-
-    - If the JSON pointer points to an object key that does not exist, it is created an filled with a `#!json null`
-      value before a reference to it is returned.
-    - If the JSON pointer points to an array index that does not exist, it is created an filled with a `#!json null`
-      value before a reference to it is returned. All indices between the current maximum and the given index are also
-      filled with `#!json null`.
-    - The special value `-` is treated as a synonym for the index past the end.
-
-## Exception safety
-
-Strong exception safety: if an exception occurs, the original value stays intact.
-
-## Complexity
-
-1. Constant if `idx` is in the range of the array. Otherwise linear in `idx - size()`.
-2. Logarithmic in the size of the container.
-3. Constant
-
-## Example
-
-??? example
-
-    The example below shows how array elements can be read and written using `[]` operator. Note the addition of
-    `#!json null` values.
-        
-    ```cpp
-    --8<-- "examples/operatorarray__size_type.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/operatorarray__size_type.output"
-    ```
-
-??? example
-
-    The example below shows how array elements can be read using the `[]` operator.
-
-    ```cpp
-    --8<-- "examples/operatorarray__size_type_const.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/operatorarray__size_type_const.output"
-    ```
-
-??? example
-
-    The example below shows how object elements can be read and written using the `[]` operator.
-    
-    ```cpp
-    --8<-- "examples/operatorarray__key_type.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/operatorarray__key_type.output"
-    ```
-
-??? example
-
-    The example below shows how object elements can be read using the `[]` operator.
-    
-    ```cpp
-    --8<-- "examples/operatorarray__key_type_const.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/operatorarray__key_type_const.output"
-    ```
-
-??? example
-
-    The example below shows how values can be read and written using JSON Pointers.
-    
-    ```cpp
-    --8<-- "examples/operatorjson_pointer.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/operatorjson_pointer.output"
-    ```
-
-??? example
-
-    The example below shows how values can be read using JSON Pointers.
-    
-    ```cpp
-    --8<-- "examples/operatorjson_pointer_const.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/operatorjson_pointer_const.output"
-    ```
-
-## Version history
-
-1. Added in version 1.0.0.
-2. Added in version 1.0.0. Overloads for `T* key` added in version 1.1.0.
-3. Added in version 2.0.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/operator_ValueType.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/operator_ValueType.md
deleted file mode 100644
index cfb5e64c8..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/operator_ValueType.md
+++ /dev/null
@@ -1,72 +0,0 @@
-# basic_json::operator ValueType
-
-```cpp
-template<typename ValueType>
-JSON_EXPLICIT operator ValueType() const;
-```
-
-Implicit type conversion between the JSON value and a compatible value. The call is realized by calling
-[`get()`](get.md). See [Notes](#notes) for the meaning of `JSON_EXPLICIT`.
-
-## Template parameters
-
-`ValueType`
-:   the value type to return
-
-## Return value
-
-copy of the JSON value, converted to `ValueType`
-
-## Exceptions
-
-Depends on what `json_serializer<ValueType>` `from_json()` method throws
-
-## Complexity
-
-Linear in the size of the JSON value.
-
-## Notes
-
-By default `JSON_EXPLICIT` defined to the empty string, so the signature is:
-
-```cpp
-template<typename ValueType>
-operator ValueType() const;
-```
-
-If [`JSON_USE_IMPLICIT_CONVERSIONS`](../../features/macros.md#json_use_implicit_conversions) is set to `0`,
-`JSON_EXPLICIT` is defined to `#!cpp explicit`:
-
-```cpp
-template<typename ValueType>
-explicit operator ValueType() const;
-```
-
-That is, implicit conversions can be switched off by defining
-[`JSON_USE_IMPLICIT_CONVERSIONS`](../../features/macros.md#json_use_implicit_conversions) to `0`.
-
-## Example
-
-??? example
-
-    The example below shows several conversions from JSON values
-    to other types. There a few things to note: (1) Floating-point numbers can
-    be converted to integers, (2) A JSON array can be converted to a standard
-    `std::vector<short>`, (3) A JSON object can be converted to C++
-    associative containers such as `std::unordered_map<std::string, json>`.
-        
-    ```cpp
-    --8<-- "examples/operator__ValueType.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/operator__ValueType.output"
-    ```
-
-## Version history
-
-- Since version 1.0.0.
-- Macros `JSON_EXPLICIT`/[`JSON_USE_IMPLICIT_CONVERSIONS`](../../features/macros.md#json_use_implicit_conversions) added
-  in version 3.9.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/operator_eq.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/operator_eq.md
deleted file mode 100644
index 34cf5537d..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/operator_eq.md
+++ /dev/null
@@ -1,106 +0,0 @@
-# basic_json::operator==
-
-```cpp
-bool operator==(const_reference lhs, const_reference rhs) noexcept;
-
-template<typename ScalarType>
-bool operator==(const_reference lhs, const ScalarType rhs) noexcept;
-
-template<typename ScalarType>
-bool operator==(ScalarType lhs, const const_reference rhs) noexcept;
-```
-
-Compares two JSON values for equality according to the following rules:
-
-- Two JSON values are equal if (1) they are not discarded, (2) they are from the same type, and (3) their stored values
-  are the same according to their respective `operator==`.
-- Integer and floating-point numbers are automatically converted before comparison. Note that two NaN values are always
-  treated as unequal.
-
-## Template parameters
-
-`ScalarType`
-:   a scalar type according to `std::is_scalar<ScalarType>::value`
-
-## Parameters
-
-`lhs` (in)
-:   first value to consider 
-
-`rhs` (in)
-:   second value to consider 
-
-## Return value
-
-whether the values `lhs` and `rhs` are equal
-
-## Exception safety
-
-No-throw guarantee: this function never throws exceptions.
-
-## Complexity
-
-Linear.
-
-## Notes
-
-!!! note
-
-    - NaN values never compare equal to themselves or to other NaN values.
-    - JSON `#!cpp null` values are all equal.
-    - Discarded values never compare equal to themselves.
-
-!!! note
-
-    Floating-point numbers inside JSON values numbers are compared with `json::number_float_t::operator==` which is
-    `double::operator==` by default. To compare floating-point while respecting an epsilon, an alternative
-    [comparison function](https://github.com/mariokonrad/marnav/blob/master/include/marnav/math/floatingpoint.hpp#L34-#L39)
-    could be used, for instance
-    
-    ```cpp
-    template<typename T, typename = typename std::enable_if<std::is_floating_point<T>::value, T>::type>
-    inline bool is_same(T a, T b, T epsilon = std::numeric_limits<T>::epsilon()) noexcept
-    {
-        return std::abs(a - b) <= epsilon;
-    }
-    ```
-    
-    Or you can self-defined operator equal function like this:
-    
-    ```cpp
-    bool my_equal(const_reference lhs, const_reference rhs)
-    {
-        const auto lhs_type lhs.type();
-        const auto rhs_type rhs.type();
-        if (lhs_type == rhs_type)
-        {
-            switch(lhs_type)
-                // self_defined case
-                case value_t::number_float:
-                    return std::abs(lhs - rhs) <= std::numeric_limits<float>::epsilon();
-                // other cases remain the same with the original
-                ...
-        }
-    ...
-    }
-    ```
-
-## Example
-
-??? example
-
-    The example demonstrates comparing several JSON types.
-        
-    ```cpp
-    --8<-- "examples/operator__equal.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/operator__equal.output"
-    ```
-
-## Version history
-
-- Added in version 1.0.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/operator_ge.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/operator_ge.md
deleted file mode 100644
index 19834c0d8..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/operator_ge.md
+++ /dev/null
@@ -1,59 +0,0 @@
-# basic_json::operator>=
-
-```cpp
-bool operator>=(const_reference lhs, const_reference rhs) noexcept,
-
-template<typename ScalarType>
-bool operator>=(const_reference lhs, const ScalarType rhs) noexcept;
-
-template<typename ScalarType>
-bool operator>=(ScalarType lhs, const const_reference rhs) noexcept;
-```
-
-Compares whether one JSON value `lhs` is greater than or equal to another JSON value `rhs` by calculating
-`#!cpp !(lhs < rhs)`.
-
-## Template parameters
-
-`ScalarType`
-:   a scalar type according to `std::is_scalar<ScalarType>::value`
-
-## Parameters
-
-`lhs` (in)
-:   first value to consider 
-
-`rhs` (in)
-:   second value to consider 
-
-## Return value
-
-whether `lhs` is less than or equal to `rhs`
-
-## Exception safety
-
-No-throw guarantee: this function never throws exceptions.
-
-## Complexity
-
-Linear.
-
-## Example
-
-??? example
-
-    The example demonstrates comparing several JSON types.
-        
-    ```cpp
-    --8<-- "examples/operator__greaterequal.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/operator__greaterequal.output"
-    ```
-
-## Version history
-
-- Added in version 1.0.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/operator_gt.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/operator_gt.md
deleted file mode 100644
index b9e32629d..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/operator_gt.md
+++ /dev/null
@@ -1,58 +0,0 @@
-# basic_json::operator>
-
-```cpp
-bool operator>(const_reference lhs, const_reference rhs) noexcept,
-
-template<typename ScalarType>
-bool operator>(const_reference lhs, const ScalarType rhs) noexcept;
-
-template<typename ScalarType>
-bool operator>(ScalarType lhs, const const_reference rhs) noexcept;
-```
-
-Compares whether one JSON value `lhs` is greater than another JSON value `rhs` by calculating `#!cpp !(lhs <= rhs)`.
-
-## Template parameters
-
-`ScalarType`
-:   a scalar type according to `std::is_scalar<ScalarType>::value`
-
-## Parameters
-
-`lhs` (in)
-:   first value to consider 
-
-`rhs` (in)
-:   second value to consider 
-
-## Return value
-
-whether `lhs` is greater than `rhs`
-
-## Exception safety
-
-No-throw guarantee: this function never throws exceptions.
-
-## Complexity
-
-Linear.
-
-## Example
-
-??? example
-
-    The example demonstrates comparing several JSON types.
-        
-    ```cpp
-    --8<-- "examples/operator__greater.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/operator__greater.output"
-    ```
-
-## Version history
-
-- Added in version 1.0.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/operator_le.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/operator_le.md
deleted file mode 100644
index 452ee4966..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/operator_le.md
+++ /dev/null
@@ -1,59 +0,0 @@
-# basic_json::operator<=
-
-```cpp
-bool operator<=(const_reference lhs, const_reference rhs) noexcept,
-
-template<typename ScalarType>
-bool operator<=(const_reference lhs, const ScalarType rhs) noexcept;
-
-template<typename ScalarType>
-bool operator<=(ScalarType lhs, const const_reference rhs) noexcept;
-```
-
-Compares whether one JSON value `lhs` is less than or equal to another JSON value `rhs` by calculating
-`#cpp !(rhs < lhs)`.
-
-## Template parameters
-
-`ScalarType`
-:   a scalar type according to `std::is_scalar<ScalarType>::value`
-
-## Parameters
-
-`lhs` (in)
-:   first value to consider 
-
-`rhs` (in)
-:   second value to consider 
-
-## Return value
-
-whether `lhs` is less than or equal to `rhs`
-
-## Exception safety
-
-No-throw guarantee: this function never throws exceptions.
-
-## Complexity
-
-Linear.
-
-## Example
-
-??? example
-
-    The example demonstrates comparing several JSON types.
-        
-    ```cpp
-    --8<-- "examples/operator__lessequal.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/operator__lessequal.output"
-    ```
-
-## Version history
-
-- Added in version 1.0.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/operator_literal_json.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/operator_literal_json.md
deleted file mode 100644
index 8c96067b9..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/operator_literal_json.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# basic_json::operator""_json
-
-```cpp
-json operator "" _json(const char* s, std::size_t n)
-```
-
-This operator implements a user-defined string literal for JSON objects. It can be used by adding `#!cpp _json` to a
-string literal and returns a [`json`](../json.md) object if no parse error occurred.
-
-## Parameters
-
-`s` (in)
-:   a string representation of a JSON object
-
-`n` (in)
-:   length of string `s`
-
-## Return value
-
-[`json`](../json.md) value parsed from `s`
-
-## Exceptions
-
-The function can throw anything that [`parse(s, s+n)`](parse.md) would throw.
-
-## Complexity
-
-Linear.
-
-## Version history
-
-- Added in version 1.0.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/operator_literal_json_pointer.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/operator_literal_json_pointer.md
deleted file mode 100644
index 0316b7c61..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/operator_literal_json_pointer.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# basic_json::operator""_json_pointer
-
-```cpp
-json_pointer operator "" _json_pointer(const char* s, std::size_t n)
-```
-
-This operator implements a user-defined string literal for JSON Pointers. It can be used by adding `#!cpp _json_pointer`
-to a string literal and returns a [`json_pointer`](../json_pointer.md) object if no parse error occurred.
-
-## Parameters
-
-`s` (in)
-:   a string representation of a JSON Pointer
-
-`n` (in)
-:   length of string `s`
-
-## Return value
-
-[`json_pointer`](../json_pointer.md) value parsed from `s`
-
-## Exceptions
-
-The function can throw anything that [`json_pointer::json_pointer`](../json_pointer.md) would throw.
-
-## Complexity
-
-Linear.
-
-## Version history
-
-- Added in version 2.0.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/operator_lt.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/operator_lt.md
deleted file mode 100644
index e8d2fb359..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/operator_lt.md
+++ /dev/null
@@ -1,73 +0,0 @@
-# basic_json::operator<
-
-```cpp
-bool operator<(const_reference lhs, const_reference rhs) noexcept,
-
-template<typename ScalarType>
-bool operator<(const_reference lhs, const ScalarType rhs) noexcept;
-
-template<typename ScalarType>
-bool operator<(ScalarType lhs, const const_reference rhs) noexcept;
-```
-
-Compares whether one JSON value `lhs` is less than another JSON value `rhs` according to the following rules:
-
-- If `lhs` and `rhs` have the same type, the values are compared using the default `<` operator.
-- Integer and floating-point numbers are automatically converted before comparison
-- Discarded values a
-- In case `lhs` and `rhs` have different types, the values are ignored and the order of the types is considered, which
-  is:
-    1. null
-    2. boolean
-    3. number (all types)
-    4. object
-    5. array
-    6. string
-    7. binary
-
-    For instance, any boolean value is considered less than any string.
-
-## Template parameters
-
-`ScalarType`
-:   a scalar type according to `std::is_scalar<ScalarType>::value`
-
-## Parameters
-
-`lhs` (in)
-:   first value to consider 
-
-`rhs` (in)
-:   second value to consider 
-
-## Return value
-
-whether `lhs` is less than `rhs`
-
-## Exception safety
-
-No-throw guarantee: this function never throws exceptions.
-
-## Complexity
-
-Linear.
-
-## Example
-
-??? example
-
-    The example demonstrates comparing several JSON types.
-        
-    ```cpp
-    --8<-- "examples/operator__less.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/operator__less.output"
-    ```
-
-## Version history
-
-- Added in version 1.0.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/operator_ne.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/operator_ne.md
deleted file mode 100644
index 5a86201ef..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/operator_ne.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# basic_json::operator!=
-
-```cpp
-bool operator!=(const_reference lhs, const_reference rhs) noexcept;
-
-template<typename ScalarType>
-bool operator!=(const_reference lhs, const ScalarType rhs) noexcept;
-
-template<typename ScalarType>
-bool operator!=(ScalarType lhs, const const_reference rhs) noexcept;
-```
-
-Compares two JSON values for inequality by calculating `#!cpp !(lhs == rhs)`.
-
-## Template parameters
-
-`ScalarType`
-:   a scalar type according to `std::is_scalar<ScalarType>::value`
-
-## Parameters
-
-`lhs` (in)
-:   first value to consider 
-
-`rhs` (in)
-:   second value to consider 
-
-## Return value
-
-whether the values `lhs` and `rhs` are not equal
-
-## Exception safety
-
-No-throw guarantee: this function never throws exceptions.
-
-## Complexity
-
-Linear.
-
-## Example
-
-The example demonstrates comparing several JSON
-types.
-    
-```cpp
---8<-- "examples/operator__notequal.cpp"
-```
-
-Output:
-
-```json
---8<-- "examples/operator__notequal.output"
-```
-
-## Version history
-
-- Added in version 1.0.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/operator_value_t.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/operator_value_t.md
deleted file mode 100644
index 52125146c..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/operator_value_t.md
+++ /dev/null
@@ -1,54 +0,0 @@
-# basic_json::operator value_t
-
-```cpp
-constexpr operator value_t() const noexcept;
-```
-
-Return the type of the JSON value as a value from the [`value_t`](value_t.md) enumeration.
-    
-## Return value
-
-the type of the JSON value
-
-Value type                | return value
-------------------------- | -------------------------
-`#!json null`             | `value_t::null`
-boolean                   | `value_t::boolean`
-string                    | `value_t::string`
-number (integer)          | `value_t::number_integer`
-number (unsigned integer) | `value_t::number_unsigned`
-number (floating-point)   | `value_t::number_float`
-object                    | `value_t::object`
-array                     | `value_t::array`
-binary                    | `value_t::binary`
-discarded                 | `value_t::discarded`
-
-## Exception safety
-
-No-throw guarantee: this member function never throws exceptions.
-
-## Complexity
-
-Constant.
-
-## Example
-
-??? example
-
-    The following code exemplifies `operator value_t()` for all JSON types.
-    
-    ```cpp
-    --8<-- "examples/operator__value_t.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/operator__value_t.output"
-    ```
-
-## Version history
-
-- Added in version 1.0.0.
-- Added unsigned integer type in version 2.0.0.
-- Added binary type in version 3.8.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/other_error.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/other_error.md
deleted file mode 100644
index 492b2d484..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/other_error.md
+++ /dev/null
@@ -1,59 +0,0 @@
-# basic_json::other_error
-
-```cpp
-class other_error : public exception;
-```
-
-This exception is thrown in case of errors that cannot be classified with the other exception types.
-
-Exceptions have ids 5xx.
-
-```plantuml
-std::exception <|-- basic_json::exception
-basic_json::exception <|-- basic_json::parse_error
-basic_json::exception <|-- basic_json::invalid_iterator
-basic_json::exception <|-- basic_json::type_error
-basic_json::exception <|-- basic_json::out_of_range
-basic_json::exception <|-- basic_json::other_error
-
-interface std::exception {}
-
-class basic_json::exception {
-    + const int id
-    + const char* what() const
-}
-
-class basic_json::parse_error {
-    + const std::size_t byte
-}
-
-class basic_json::other_error #FFFF00 {}
-```
-
-## Member functions
-
-- **what** - returns explanatory string
-
-## Member variables
-
-- **id** - the id of the exception
-
-## Example
-
-??? example
-
-    The following code shows how a `other_error` exception can be caught.
-    
-    ```cpp
-    --8<-- "examples/other_error.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/other_error.output"
-    ```
-
-## Version history
-
-- Since version 3.0.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/out_of_range.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/out_of_range.md
deleted file mode 100644
index 47ead87c2..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/out_of_range.md
+++ /dev/null
@@ -1,60 +0,0 @@
-# basic_json::out_of_range
-
-```cpp
-class out_of_range : public exception;
-```
-
-This exception is thrown in case a library function is called on an input parameter that exceeds the expected range, for
-instance in case of array indices or nonexisting object keys.
-
-Exceptions have ids 4xx.
-
-```plantuml
-std::exception <|-- basic_json::exception
-basic_json::exception <|-- basic_json::parse_error
-basic_json::exception <|-- basic_json::invalid_iterator
-basic_json::exception <|-- basic_json::type_error
-basic_json::exception <|-- basic_json::out_of_range
-basic_json::exception <|-- basic_json::other_error
-
-interface std::exception {}
-
-class basic_json::exception {
-    + const int id
-    + const char* what() const
-}
-
-class basic_json::parse_error {
-    + const std::size_t byte
-}
-
-class basic_json::out_of_range #FFFF00 {}
-```
-
-## Member functions
-
-- **what** - returns explanatory string
-
-## Member variables
-
-- **id** - the id of the exception
-
-## Example
-
-??? example
-
-    The following code shows how a `out_of_range` exception can be caught.
-    
-    ```cpp
-    --8<-- "examples/out_of_range.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/out_of_range.output"
-    ```
-
-## Version history
-
-- Since version 3.0.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/parse.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/parse.md
deleted file mode 100644
index 1f991b381..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/parse.md
+++ /dev/null
@@ -1,156 +0,0 @@
-# basic_json::parse
-
-```cpp
-// (1)
-template<typename InputType>
-static basic_json parse(InputType&& i,
-                        const parser_callback_t cb = nullptr,
-                        const bool allow_exceptions = true,
-                        const bool ignore_comments = false);
-
-// (2)
-template<typename IteratorType>
-static basic_json parse(IteratorType first, IteratorType last,
-                        const parser_callback_t cb = nullptr,
-                        const bool allow_exceptions = true,
-                        const bool ignore_comments = false);
-```
-
-1. Deserialize from a compatible input.
-2. Deserialize from a pair of character iterators
-    
-    The value_type of the iterator must be a integral type with size of 1, 2 or 4 bytes, which will be interpreted
-    respectively as UTF-8, UTF-16 and UTF-32.
-
-## Template parameters
-
-`InputType`
-:   A compatible input, for instance:
-    
-    - an `std::istream` object
-    - a `FILE` pointer
-    - a C-style array of characters
-    - a pointer to a null-terminated string of single byte characters
-    - an object `obj` for which `begin(obj)` and `end(obj)` produces a valid pair of iterators.
-
-`IteratorType`
-:   a compatible iterator type
-
-## Parameters
-
-`i` (in)
-:   Input to parse from.
-
-`cb` (in)
-:   a parser callback function of type [`parser_callback_t`](parser_callback_t.md) which is used to control the
-    deserialization by filtering unwanted values (optional)
-
-`allow_exceptions` (in)
-:    whether to throw exceptions in case of a parse error (optional, `#!cpp true` by default)
-
-`ignore_comments` (in)
-:   whether comments should be ignored and treated like whitespace (`#!cpp true`) or yield a parse error
-    (`#!cpp false`); (optional, `#!cpp false` by default)
-
-`first` (in)
-:   iterator to start of character range
-
-`last` (in)
-:   iterator to end of character range
-
-## Return value
-
-Deserialized JSON value; in case of a parse error and `allow_exceptions` set to `#!cpp false`, the return value will be
-`value_t::discarded`. The latter can be checked with [`is_discarded`](is_discarded.md).
-
-## Exception safety
-
-Strong guarantee: if an exception is thrown, there are no changes in the JSON value.
-
-## Complexity
-
-Linear in the length of the input. The parser is a predictive LL(1) parser. The complexity can be higher if the parser
-callback function `cb` or reading from (1) the input `i` or (2) the iterator range [`first`, `last`] has a
-super-linear complexity.
-
-## Notes
-
-(1) A UTF-8 byte order mark is silently ignored.
-
-## Examples
-
-??? example "Parsing from a charater array"
-
-    The example below demonstrates the `parse()` function reading from an array.
-
-    ```cpp
-    --8<-- "examples/parse__array__parser_callback_t.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/parse__array__parser_callback_t.output"
-    ```
-
-??? example "Parsing from a string"
-
-    The example below demonstrates the `parse()` function with and without callback function.
-
-    ```cpp
-    --8<-- "examples/parse__string__parser_callback_t.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/parse__string__parser_callback_t.output"
-    ```
-
-??? example "Parsing from an input stream"
-
-    The example below demonstrates the `parse()` function with and without callback function.
-
-    ```cpp
-    --8<-- "examples/parse__istream__parser_callback_t.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/parse__istream__parser_callback_t.output"
-    ```
-
-??? example "Parsing from a contiguous container"
-
-    The example below demonstrates the `parse()` function reading from a contiguous container.
-
-    ```cpp
-    --8<-- "examples/parse__contiguouscontainer__parser_callback_t.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/parse__contiguouscontainer__parser_callback_t.output"
-    ```
-
-??? example "Effect of `allow_exceptions` parameter"
-
-    The example below demonstrates the effect of the `allow_exceptions` parameter in the ´parse()` function.
-
-    ```cpp
-    --8<-- "examples/parse__allow_exceptions.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/parse__allow_exceptions.output"
-    ```
-
-## Version history
-
-- Added in version 1.0.0.
-- Overload for contiguous containers (1) added in version 2.0.3.
-- Ignoring comments via `ignore_comments` added in version 3.9.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/parse_error.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/parse_error.md
deleted file mode 100644
index de0ee4010..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/parse_error.md
+++ /dev/null
@@ -1,64 +0,0 @@
-# basic_json::parse_error
-
-```cpp
-class parse_error : public exception;
-```
-
-This exception is thrown by the library when a parse error occurs. Parse errors can occur during the deserialization of
-JSON text, BSON, CBOR, MessagePack, UBJSON, as well as when using JSON Patch.
-
-Exceptions have ids 1xx.
-
-```plantuml
-std::exception <|-- basic_json::exception
-basic_json::exception <|-- basic_json::parse_error
-basic_json::exception <|-- basic_json::invalid_iterator
-basic_json::exception <|-- basic_json::type_error
-basic_json::exception <|-- basic_json::out_of_range
-basic_json::exception <|-- basic_json::other_error
-
-interface std::exception {}
-
-class basic_json::exception {
-    + const int id
-    + const char* what() const
-}
-
-class basic_json::parse_error #FFFF00 {
-    + const std::size_t byte
-}
-```
-
-## Member functions
-
-- **what** - returns explanatory string
-
-## Member variables
-
-- **id** - the id of the exception
-- **byte** - byte index of the parse error
-
-## Note
-
-For an input with _n_ bytes, 1 is the index of the first character and _n_+1 is the index of the terminating null byte
-or the end of file. This also holds true when reading a byte vector for binary formats.
-
-## Example
-
-??? example
-
-    The following code shows how a `parse_error` exception can be caught.
-    
-    ```cpp
-    --8<-- "examples/parse_error.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/parse_error.output"
-    ```
-
-## Version history
-
-- Since version 3.0.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/parser_callback_t.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/parser_callback_t.md
deleted file mode 100644
index aeb7c2706..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/parser_callback_t.md
+++ /dev/null
@@ -1,73 +0,0 @@
-# basic_json::parser_callback_t
-
-```cpp
-template<typename BasicJsonType>
-using parser_callback_t =
-    std::function<bool(int depth, parse_event_t event, BasicJsonType& parsed)>;
-```
-
-With a parser callback function, the result of parsing a JSON text can be influenced. When passed to
-[`parse`](parse.md), it is called on certain events (passed as [`parse_event_t`](parse_event_t.md) via parameter
-`event`) with a set recursion depth `depth` and context JSON value `parsed`. The return value of the callback function
-is a boolean indicating whether the element that emitted the callback shall be kept or not.
-
-We distinguish six scenarios (determined by the event type) in which the callback function can be called. The following
-table describes the values of the parameters `depth`, `event`, and `parsed`.
-
-parameter `event` | description | parameter `depth` | parameter `parsed`
------------------- | ----------- | ------------------ | -------------------
-`parse_event_t::object_start` | the parser read `{` and started to process a JSON object | depth of the parent of the JSON object | a JSON value with type discarded
-`parse_event_t::key` | the parser read a key of a value in an object | depth of the currently parsed JSON object | a JSON string containing the key
-`parse_event_t::object_end` | the parser read `}` and finished processing a JSON object | depth of the parent of the JSON object | the parsed JSON object
-`parse_event_t::array_start` | the parser read `[` and started to process a JSON array | depth of the parent of the JSON array | a JSON value with type discarded
-`parse_event_t::array_end` | the parser read `]` and finished processing a JSON array | depth of the parent of the JSON array | the parsed JSON array
-`parse_event_t::value` | the parser finished reading a JSON value | depth of the value | the parsed JSON value
-
-![Example when certain parse events are triggered](../../images/callback_events.png)
-
-Discarding a value (i.e., returning `#!cpp false`) has different effects depending on the context in which function was
-called:
-
-- Discarded values in structured types are skipped. That is, the parser will behave as if the discarded value was never
-  read.
-- In case a value outside a structured type is skipped, it is replaced with `null`. This case happens if the top-level
-  element is skipped.
-
-## Parameters
-
-`depth` (in)
-:   the depth of the recursion during parsing
-
-`event` (in)
-:   an event of type [`parse_event_t`](parse_event_t.md) indicating the context in
-    the callback function has been called
-
-`parsed` (in, out)
-:    the current intermediate parse result; note that
-     writing to this value has no effect for `parse_event_t::key` events
-
-## Return value
-
-Whether the JSON value which called the function during parsing should be kept (`#!cpp true`) or not (`#!cpp false`). In
-the latter case, it is either skipped completely or replaced by an empty discarded object.
-
-# Example
-
-??? example
-
-    The example below demonstrates the `parse()` function with
-    and without callback function.
-
-    ```cpp
-    --8<-- "examples/parse__string__parser_callback_t.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/parse__string__parser_callback_t.output"
-    ```
-
-## Version history
-
-- Added in version 1.0.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/push_back.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/push_back.md
deleted file mode 100644
index c10c94a3e..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/push_back.md
+++ /dev/null
@@ -1,109 +0,0 @@
-# basic_json::push_back
-
-```cpp
-// (1)
-void push_back(basic_json&& val);
-void push_back(const basic_json& val);
-
-// (2)
-void push_back(const typename object_t::value_type& val);
-
-// (3)
-void push_back(initializer_list_t init);
-```
-
-1. Appends the given element `val` to the end of the JSON array. If the function is called on a JSON null value, an
-   empty array is created before appending `val`.
-
-2. Inserts the given element `val` to the JSON object. If the function is called on a JSON null value, an empty object
-   is created before inserting `val`.
-
-3. This function allows to use `push_back` with an initializer list. In case
-
-    1. the current value is an object,
-    2. the initializer list `init` contains only two elements, and
-    3. the first element of `init` is a string,
-
-    `init` is converted into an object element and added using `push_back(const typename object_t::value_type&)`.
-    Otherwise, `init` is converted to a JSON value and added using `push_back(basic_json&&)`.
-
-## Parameters
-
-`val` (in)
-:   the value to add to the JSON array/object
-
-`init` (in)
-:   an initializer list
-
-## Exceptions
-
-1. The function can throw the following exceptions:
-    - Throws [`type_error.308`](../../home/exceptions.md#jsonexceptiontype_error308) when called on a type other than
-      JSON array or null; example: `"cannot use push_back() with number"`
-2. The function can throw the following exceptions:
-    - Throws [`type_error.308`](../../home/exceptions.md#jsonexceptiontype_error308) when called on a type other than
-      JSON object or null; example: `"cannot use push_back() with number"`
-
-## Complexity
-
-1. Amortized constant.
-2. Logarithmic in the size of the container, O(log(`size()`)).
-3. Linear in the size of the initializer list `init`.
-
-## Notes
-
-(3) This function is required to resolve an ambiguous overload error, because pairs like `{"key", "value"}` can be both
-    interpreted as `object_t::value_type` or `std::initializer_list<basic_json>`, see
-    [#235](https://github.com/nlohmann/json/issues/235) for more information.
-
-## Examples
-
-??? example
-
-    The example shows how `push_back()` and `+=` can be used to add elements to a JSON array. Note how the `null` value
-    was silently converted to a JSON array.
-    
-    ```cpp
-    --8<-- "examples/push_back.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/push_back.output"
-    ```
-
-??? example
-
-    The example shows how `push_back()` and `+=` can be used to add elements to a JSON object. Note how the `null` value
-    was silently converted to a JSON object.
-
-    ```cpp
-    --8<-- "examples/push_back__object_t__value.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/push_back__object_t__value.output"
-    ```
-
-??? example
-
-    The example shows how initializer lists are treated as objects when possible.
-
-    ```cpp
-    --8<-- "examples/push_back__initializer_list.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/push_back__initializer_list.output"
-    ```
-
-## Version history
-
-1. Since version 1.0.0.
-2. Since version 1.0.0.
-2. Since version 2.0.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/size.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/size.md
deleted file mode 100644
index 36a9daeb6..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/size.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# basic_json::size
-
-```cpp
-size_type size() const noexcept;
-```
-
-Returns the number of elements in a JSON value.
-    
-## Return value
-
-The return value depends on the different types and is defined as follows:
-
-Value type  | return value
------------ | -------------
-null        | `0`
-boolean     | `1`
-string      | `1`
-number      | `1`
-binary      | `1`
-object      | result of function object_t::size()
-array       | result of function array_t::size()
-
-## Exception safety
-
-No-throw guarantee: this function never throws exceptions.
-
-## Complexity
-
-Constant, as long as [`array_t`](array_t.md) and [`object_t`](object_t.md) satisfy the
-[Container](https://en.cppreference.com/w/cpp/named_req/Container) concept; that is, their `size()` functions have
-constant complexity.
-
-## Notes
-
-This function does not return the length of a string stored as JSON value -- it returns the number of elements in the
-JSON value which is `1` in the case of a string.
-
-## Example
-
-??? example
-
-    The following code calls `size()` on the different value types.
-    
-    ```cpp
-    --8<-- "examples/size.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/size.output"
-    ```
-
-## Version history
-
-- Added in version 1.0.0.
-- Extended to return `1` for binary types in version 3.8.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/string_t.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/string_t.md
deleted file mode 100644
index acdd351b5..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/string_t.md
+++ /dev/null
@@ -1,50 +0,0 @@
-# basic_json::string_t
-
-```cpp
-using string_t = StringType;
-```
-
-The type used to store JSON strings.
-
-[RFC 7159](http://rfc7159.net/rfc7159) describes JSON strings as follows:
-> A string is a sequence of zero or more Unicode characters.
-
-To store objects in C++, a type is defined by the template parameter described below. Unicode values are split by the
-JSON class into byte-sized characters during deserialization.
-
-## Template parameters
-
-`StringType`
-:   the container to store strings (e.g., `std::string`). Note this container is used for keys/names in objects, see
-    [object_t](object_t.md).
-
-## Notes
-
-#### Default type
-
-With the default values for `StringType` (`std::string`), the default value for `string_t` is `#!cpp std::string`.
-
-#### Encoding
-
-Strings are stored in UTF-8 encoding. Therefore, functions like `std::string::size()` or `std::string::length()` return
-the number of bytes in the string rather than the number of characters or glyphs.
-
-#### String comparison
-
-[RFC 7159](http://rfc7159.net/rfc7159) states:
-> Software implementations are typically required to test names of object members for equality. Implementations that
-> transform the textual representation into sequences of Unicode code units and then perform the comparison numerically,
-> code unit by code unit, are interoperable in the sense that implementations will agree in all cases on equality or
-> inequality of two strings. For example, implementations that compare strings with escaped characters unconverted may
-> incorrectly find that `"a\\b"` and `"a\u005Cb"` are not equal.
-
-This implementation is interoperable as it does compare strings code unit by code unit.
-
-#### Storage
-
-String values are stored as pointers in a `basic_json` type. That is, for any access to string values, a pointer of type
-`string_t*` must be dereferenced.
-
-## Version history
-
-- Added in version 1.0.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/type.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/type.md
deleted file mode 100644
index b3482117b..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/type.md
+++ /dev/null
@@ -1,54 +0,0 @@
-# basic_json::type
-
-```cpp
-constexpr value_t type() const noexcept;
-```
-
-Return the type of the JSON value as a value from the [`value_t`](value_t.md) enumeration.
-
-## Return value
-
-the type of the JSON value
-
-Value type                | return value
-------------------------- | -------------------------
-`#!json null`             | `value_t::null`
-boolean                   | `value_t::boolean`
-string                    | `value_t::string`
-number (integer)          | `value_t::number_integer`
-number (unsigned integer) | `value_t::number_unsigned`
-number (floating-point)   | `value_t::number_float`
-object                    | `value_t::object`
-array                     | `value_t::array`
-binary                    | `value_t::binary`
-discarded                 | `value_t::discarded`
-
-## Exception safety
-
-No-throw guarantee: this member function never throws exceptions.
-
-## Complexity
-
-Constant.
-
-## Example
-
-??? example
-
-    The following code exemplifies `type()` for all JSON types.
-    
-    ```cpp
-    --8<-- "examples/type.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/type.output"
-    ```
-
-## Version history
-
-- Added in version 1.0.0.
-- Added unsigned integer type in version 2.0.0.
-- Added binary type in version 3.8.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/type_error.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/type_error.md
deleted file mode 100644
index ea0154e39..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/type_error.md
+++ /dev/null
@@ -1,60 +0,0 @@
-# basic_json::type_error
-
-```cpp
-class type_error : public exception;
-```
-
-This exception is thrown in case of a type error; that is, a library function is executed on a JSON value whose type
-does not match the expected semantics.
-
-Exceptions have ids 3xx.
-
-```plantuml
-std::exception <|-- basic_json::exception
-basic_json::exception <|-- basic_json::parse_error
-basic_json::exception <|-- basic_json::invalid_iterator
-basic_json::exception <|-- basic_json::type_error
-basic_json::exception <|-- basic_json::out_of_range
-basic_json::exception <|-- basic_json::other_error
-
-interface std::exception {}
-
-class basic_json::exception {
-    + const int id
-    + const char* what() const
-}
-
-class basic_json::parse_error {
-    + const std::size_t byte
-}
-
-class basic_json::type_error #FFFF00 {}
-```
-
-## Member functions
-
-- **what** - returns explanatory string
-
-## Member variables
-
-- **id** - the id of the exception
-
-## Example
-
-??? example
-
-    The following code shows how a `type_error` exception can be caught.
-    
-    ```cpp
-    --8<-- "examples/type_error.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/type_error.output"
-    ```
-
-## Version history
-
-- Since version 3.0.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/type_name.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/type_name.md
deleted file mode 100644
index 1a1752610..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/type_name.md
+++ /dev/null
@@ -1,54 +0,0 @@
-# basic_json::type_name
-
-```cpp
-const char* type_name() const noexcept;
-```
-
-Returns the type name as string to be used in error messages -- usually to indicate that a function was called on a
-wrong JSON type.
-    
-## Return value
-
-a string representation of a the type ([`value_t`](value_t.md)):
-
-Value type                                         | return value
--------------------------------------------------- | -------------------------
-`#!json null`                                      | `"null"`
-boolean                                            | `"boolean"`
-string                                             | `"string"`
-number (integer, unsigned integer, floating-point) | `"number"`
-object                                             | `"object`
-array                                              | `"array`
-binary                                             | `"binary`
-discarded                                          | `"discarded`
-
-## Exception safety
-
-No-throw guarantee: this member function never throws exceptions.
-
-## Complexity
-
-Constant.
-
-## Example
-
-??? example
-
-    The following code exemplifies `type_name()` for all JSON types.
-    
-    ```cpp
-    --8<-- "examples/type_name.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/type_name.output"
-    ```
-
-## Version history
-
-- Added in version 1.0.0.
-- Part of the public API version since 2.1.0.
-- Changed return value to `const char*` and added `noexcept` in version 3.0.0.
-- Added support for binary type in version 3.8.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/update.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/update.md
deleted file mode 100644
index a1837c860..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/update.md
+++ /dev/null
@@ -1,78 +0,0 @@
-# basic_json::update
-
-```cpp
-// (1)
-void update(const_reference j);
-
-// (2)
-void update(const_iterator first, const_iterator last);
-```
-
-1. Inserts all values from JSON object `j` and overwrites existing keys.
-2. Inserts all values from from range `[first, last)` and overwrites existing keys.
-
-The function is motivated by Python's [dict.update](https://docs.python.org/3.6/library/stdtypes.html#dict.update)
-function.
-
-## Parameters
-
-`j` (in)
-:   JSON object to read values from
-
-`first` (in)
-:   begin of the range of elements to insert
-
-`last` (in)
-:   end of the range of elements to insert
-
-## Exceptions
-
-1. The function can throw the following exceptions:
-    - Throws [`type_error.312`](../../home/exceptions.md#jsonexceptiontype_error312) if called on JSON values other than
-      objects; example: `"cannot use update() with string"`
-2. The function can throw thw following exceptions:
-    - Throws [`type_error.312`](../../home/exceptions.md#jsonexceptiontype_error312) if called on JSON values other than
-      objects; example: `"cannot use update() with string"`
-    - Throws [`invalid_iterator.202`](../../home/exceptions.md#jsonexceptioninvalid_iterator202) if called on an
-      iterator which does not belong to the current JSON value; example: `"iterator does not fit current value"`
-    - Throws [`invalid_iterator.210`](../../home/exceptions.md#jsonexceptioninvalid_iterator210) if `first` and `last`
-      do not belong to the same JSON value; example: `"iterators do not fit"`
-
-## Complexity
-
-1. O(N*log(size() + N)), where N is the number of elements to insert.
-2. O(N*log(size() + N)), where N is the number of elements to insert.
-
-## Example
-
-??? example
-
-    The example shows how `update()` is used.
-    
-    ```cpp
-    --8<-- "examples/update.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/update.output"
-    ```
-
-??? example
-
-    The example shows how `update()` is used.
-    
-    ```cpp
-    --8<-- "examples/update__range.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/update__range.output"
-    ```
-
-## Version history
-
-- Added in version 3.0.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/value.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/value.md
deleted file mode 100644
index 8fdbc238f..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/value.md
+++ /dev/null
@@ -1,121 +0,0 @@
-# basic_json::value
-
-```cpp
-// (1)
-template<class ValueType>
-ValueType value(const typename object_t::key_type& key,
-                const ValueType& default_value) const;
-
-// (2)
-template<class ValueType>
-ValueType value(const json_pointer& ptr,
-                const ValueType& default_value) const;
-```
-
-1. Returns either a copy of an object's element at the specified key `key` or a given default value if no element with
-   key `key` exists.
-   
-    The function is basically equivalent to executing
-    ```cpp
-    try {
-       return at(key);
-    } catch(out_of_range) {
-       return default_value;
-    }
-    ```
-
-2. Returns either a copy of an object's element at the specified JSON pointer `ptr` or a given default value if no value
-   at `ptr` exists.
-   
-    The function is basically equivalent to executing
-    ```cpp
-    try {
-       return at(ptr);
-    } catch(out_of_range) {
-       return default_value;
-    }
-    ```
-
-Unlike [`operator[]`](operator[].md), this function does not implicitly add an element to the position defined by
-`key`/`ptr` key. This function is furthermore also applicable to const objects.
-
-## Template parameters
-
-`ValueType` 
-:   type compatible to JSON values, for instance `#!cpp int` for JSON integer numbers, `#!cpp bool` for JSON booleans,
-    or `#!cpp std::vector` types for JSON arrays. Note the type of the expected value at `key`/`ptr` and the default
-    value `default_value` must be compatible.
-
-## Parameters
-
-`key` (in)
-:   key of the element to access
-
-`default_value` (in)
-:   the value to return if key/ptr found no value
-
-`ptr` (in)
-:   a JSON pointer to the element to access
-
-## Return value
-
-1. copy of the element at key `key` or `default_value` if `key` is not found
-1. copy of the element at JSON Pointer `ptr` or `default_value` if no value for `ptr` is found
-
-## Exception safety
-
-Strong guarantee: if an exception is thrown, there are no
-changes to any JSON value.
-
-## Exceptions
-
-1. The function can throw thw following exceptions:
-    - Throws [`type_error.302`](../../home/exceptions.md#jsonexceptiontype_error302) if `default_value` does not match
-      the type of the value at `key`
-    - Throws [`type_error.306`](../../home/exceptions.md#jsonexceptiontype_error306) if the JSON value is not an object;
-      in that case, using `value()` with a key makes no sense.
-2. The function can throw thw following exceptions:
-    - Throws [`type_error.302`](../../home/exceptions.md#jsonexceptiontype_error302) if `default_value` does not match
-      the type of the value at `ptr`
-    - Throws [`type_error.306`](../../home/exceptions.md#jsonexceptiontype_error306) if the JSON value is not an object;
-      in that case, using `value()` with a key makes no sense.
-
-## Complexity
-
-1. Logarithmic in the size of the container.
-2. Logarithmic in the size of the container.
-
-## Example
-
-??? example
-
-    The example below shows how object elements can be queried with a default value.
-    
-    ```cpp
-    --8<-- "examples/basic_json__value.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/basic_json__value.output"
-    ```
-
-??? example
-
-    The example below shows how object elements can be queried with a default value.
-    
-    ```cpp
-    --8<-- "examples/basic_json__value_ptr.cpp"
-    ```
-    
-    Output:
-    
-    ```json
-    --8<-- "examples/basic_json__value_ptr.output"
-    ```
-
-## Version history
-
-1. Added in version 1.0.0.
-2. Added in version 2.0.2.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/value_t.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/value_t.md
deleted file mode 100644
index 5fa9501fc..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/value_t.md
+++ /dev/null
@@ -1,36 +0,0 @@
-# basic_json::value_t
-
-```cpp
-enum class value_t : std::uint8_t {
-    null,
-    object,
-    array,
-    string,
-    boolean,
-    number_integer,
-    number_unsigned,
-    number_float,
-    binary,
-    discarded
-};
-```
-
-This enumeration collects the different JSON types. It is internally used to distinguish the stored values, and the
-functions [`is_null`](is_null.md), [`is_object`](is_object.md), [`is_array`](is_array.md), [`is_string`](is_string.md),
-[`is_boolean`](is_boolean.md), [`is_number`](is_number.md) (with [`is_number_integer`](is_number_integer.md),
-[`is_number_unsigned`](is_number_unsigned.md), and [`is_number_float`](is_number_float.md)),
-[`is_discarded`](is_discarded.md), [`is_binary`](is_binary.md), [`is_primitive`](is_primitive.md), and
-[`is_structured`](is_structured.md) rely on it.
-
-## Note
-
-There are three enumeration entries (number_integer, number_unsigned, and number_float), because the library
-distinguishes these three types for numbers: [`number_unsigned_t`](number_unsigned_t.md) is used for unsigned integers,
-[`number_integer_t`](number_integer_t.md) is used for signed integers, and [`number_float_t`](number_float_t.md) is used
-for floating-point numbers or to approximate integers which do not fit in the limits of their respective type.
-
-## Version history
-
-- Added in version 1.0.0.
-- Added unsigned integer type in version 2.0.0.
-- Added binary type in version 3.8.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/~basic_json.md b/external_imported/json/doc/mkdocs/docs/api/basic_json/~basic_json.md
deleted file mode 100644
index b089b0d79..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/~basic_json.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# basic_json::~basic_json
-
-```cpp
-~basic_json() noexcept
-```
-
-Destroys the JSON value and frees all allocated memory.
-
-## Exception safety
-
-No-throw guarantee: this member function never throws exceptions.
-
-## Complexity
-
-Linear.
-
-## Version history
-
-- Added in version 1.0.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/json.md b/external_imported/json/doc/mkdocs/docs/api/json.md
deleted file mode 100644
index 0aff6d2c0..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/json.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# json
-
-```cpp
-using json = basic_json<>;
-```
diff --git a/external_imported/json/doc/mkdocs/docs/api/json_pointer.md b/external_imported/json/doc/mkdocs/docs/api/json_pointer.md
deleted file mode 100644
index 5aa0399cd..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/json_pointer.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# json_pointer
-
-```cpp
-template<typename BasicJsonType>
-class json_pointer;
-```
-
-## Template parameters
-
-`BasicJsonType`
-:   a specialization of [`basic_json`](basic_json/index.md)
-
-## Member functions
-
-- (constructor)
-- **to_string** - return a string representation of the JSON pointer
-- **operator std::string**- return a string representation of the JSON pointer
-- **operator/=** - append to the end of the JSON pointer
-- **operator/** - create JSON Pointer by appending
-- **parent_pointer** - returns the parent of this JSON pointer
-- **pop_back** - remove last reference token
-- **back** - return last reference token
-- **push_back** - append an unescaped token at the end of the pointer
-- **empty** - return whether pointer points to the root document
diff --git a/external_imported/json/doc/mkdocs/docs/api/ordered_json.md b/external_imported/json/doc/mkdocs/docs/api/ordered_json.md
deleted file mode 100644
index 8ce8dfe3e..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/ordered_json.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# ordered_json
-
-```cpp
-using ordered_json = basic_json<nlohmann::ordered_map>;
-```
diff --git a/external_imported/json/doc/mkdocs/docs/api/ordered_map.md b/external_imported/json/doc/mkdocs/docs/api/ordered_map.md
deleted file mode 100644
index 1a99b636f..000000000
--- a/external_imported/json/doc/mkdocs/docs/api/ordered_map.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# ordered_map
-
-```cpp
-template<class Key, class T, class IgnoredLess = std::less<Key>,
-         class Allocator = std::allocator<std::pair<const Key, T>>>
-struct ordered_map : std::vector<std::pair<const Key, T>, Allocator>;
-```
diff --git a/external_imported/json/doc/mkdocs/docs/features/arbitrary_types.md b/external_imported/json/doc/mkdocs/docs/features/arbitrary_types.md
deleted file mode 100644
index 23913bba2..000000000
--- a/external_imported/json/doc/mkdocs/docs/features/arbitrary_types.md
+++ /dev/null
@@ -1,264 +0,0 @@
-# Arbitrary Types Conversions
-
-Every type can be serialized in JSON, not just STL containers and scalar types. Usually, you would do something along those lines:
-
-```cpp
-namespace ns {
-    // a simple struct to model a person
-    struct person {
-        std::string name;
-        std::string address;
-        int age;
-    };
-}
-
-ns::person p = {"Ned Flanders", "744 Evergreen Terrace", 60};
-
-// convert to JSON: copy each value into the JSON object
-json j;
-j["name"] = p.name;
-j["address"] = p.address;
-j["age"] = p.age;
-
-// ...
-
-// convert from JSON: copy each value from the JSON object
-ns::person p {
-    j["name"].get<std::string>(),
-    j["address"].get<std::string>(),
-    j["age"].get<int>()
-};
-```
-
-It works, but that's quite a lot of boilerplate... Fortunately, there's a better way:
-
-```cpp
-// create a person
-ns::person p {"Ned Flanders", "744 Evergreen Terrace", 60};
-
-// conversion: person -> json
-json j = p;
-
-std::cout << j << std::endl;
-// {"address":"744 Evergreen Terrace","age":60,"name":"Ned Flanders"}
-
-// conversion: json -> person
-auto p2 = j.get<ns::person>();
-
-// that's it
-assert(p == p2);
-```
-
-## Basic usage
-
-To make this work with one of your types, you only need to provide two functions:
-
-```cpp
-using nlohmann::json;
-
-namespace ns {
-    void to_json(json& j, const person& p) {
-        j = json{ {"name", p.name}, {"address", p.address}, {"age", p.age} };
-    }
-
-    void from_json(const json& j, person& p) {
-        j.at("name").get_to(p.name);
-        j.at("address").get_to(p.address);
-        j.at("age").get_to(p.age);
-    }
-} // namespace ns
-```
-
-That's all! When calling the `json` constructor with your type, your custom `to_json` method will be automatically called.
-Likewise, when calling `get<your_type>()` or `get_to(your_type&)`, the `from_json` method will be called.
-
-Some important things:
-
-* Those methods **MUST** be in your type's namespace (which can be the global namespace), or the library will not be able to locate them (in this example, they are in namespace `ns`, where `person` is defined).
-* Those methods **MUST** be available (e.g., proper headers must be included) everywhere you use these conversions. Look at [issue 1108](https://github.com/nlohmann/json/issues/1108) for errors that may occur otherwise.
-* When using `get<your_type>()`, `your_type` **MUST** be [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible). (There is a way to bypass this requirement described later.)
-* In function `from_json`, use function [`at()`](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_a93403e803947b86f4da2d1fb3345cf2c.html#a93403e803947b86f4da2d1fb3345cf2c) to access the object values rather than `operator[]`. In case a key does not exist, `at` throws an exception that you can handle, whereas `operator[]` exhibits undefined behavior.
-* You do not need to add serializers or deserializers for STL types like `std::vector`: the library already implements these.
-
-
-## Simplify your life with macros
-
-If you just want to serialize/deserialize some structs, the `to_json`/`from_json` functions can be a lot of boilerplate.
-
-There are two macros to make your life easier as long as you (1) want to use a JSON object as serialization and (2) want to use the member variable names as object keys in that object:
-
-- `NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(name, member1, member2, ...)` is to be defined inside of the namespace of the class/struct to create code for.
-- `NLOHMANN_DEFINE_TYPE_INTRUSIVE(name, member1, member2, ...)` is to be defined inside of the class/struct to create code for. This macro can also access private members.
-
-In both macros, the first parameter is the name of the class/struct, and all remaining parameters name the members.
-
-!!! note
-
-    At most 64 member variables can be passed to `NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE` or `NLOHMANN_DEFINE_TYPE_INTRUSIVE`.
-
-??? example
-
-    The `to_json`/`from_json` functions for the `person` struct above can be created with:
-    
-    ```cpp
-    namespace ns {
-        NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(person, name, address, age)
-    }
-    ```
-    
-    Here is an example with private members, where `NLOHMANN_DEFINE_TYPE_INTRUSIVE` is needed:
-    
-    ```cpp
-    namespace ns {
-        class address {
-          private:
-            std::string street;
-            int housenumber;
-            int postcode;
-            
-          public:
-            NLOHMANN_DEFINE_TYPE_INTRUSIVE(address, street, housenumber, postcode)
-        };
-    }
-    ```
-
-## How do I convert third-party types?
-
-This requires a bit more advanced technique. But first, let's see how this conversion mechanism works:
-
-The library uses **JSON Serializers** to convert types to json.
-The default serializer for `nlohmann::json` is `nlohmann::adl_serializer` (ADL means [Argument-Dependent Lookup](https://en.cppreference.com/w/cpp/language/adl)).
-
-It is implemented like this (simplified):
-
-```cpp
-template <typename T>
-struct adl_serializer {
-    static void to_json(json& j, const T& value) {
-        // calls the "to_json" method in T's namespace
-    }
-
-    static void from_json(const json& j, T& value) {
-        // same thing, but with the "from_json" method
-    }
-};
-```
-
-This serializer works fine when you have control over the type's namespace. However, what about `boost::optional` or `std::filesystem::path` (C++17)? Hijacking the `boost` namespace is pretty bad, and it's illegal to add something other than template specializations to `std`...
-
-To solve this, you need to add a specialization of `adl_serializer` to the `nlohmann` namespace, here's an example:
-
-```cpp
-// partial specialization (full specialization works too)
-namespace nlohmann {
-    template <typename T>
-    struct adl_serializer<boost::optional<T>> {
-        static void to_json(json& j, const boost::optional<T>& opt) {
-            if (opt == boost::none) {
-                j = nullptr;
-            } else {
-              j = *opt; // this will call adl_serializer<T>::to_json which will
-                        // find the free function to_json in T's namespace!
-            }
-        }
-
-        static void from_json(const json& j, boost::optional<T>& opt) {
-            if (j.is_null()) {
-                opt = boost::none;
-            } else {
-                opt = j.get<T>(); // same as above, but with
-                                  // adl_serializer<T>::from_json
-            }
-        }
-    };
-}
-```
-
-## How can I use `get()` for non-default constructible/non-copyable types?
-
-There is a way, if your type is [MoveConstructible](https://en.cppreference.com/w/cpp/named_req/MoveConstructible). You will need to specialize the `adl_serializer` as well, but with a special `from_json` overload:
-
-```cpp
-struct move_only_type {
-    move_only_type() = delete;
-    move_only_type(int ii): i(ii) {}
-    move_only_type(const move_only_type&) = delete;
-    move_only_type(move_only_type&&) = default;
-
-    int i;
-};
-
-namespace nlohmann {
-    template <>
-    struct adl_serializer<move_only_type> {
-        // note: the return type is no longer 'void', and the method only takes
-        // one argument
-        static move_only_type from_json(const json& j) {
-            return {j.get<int>()};
-        }
-
-        // Here's the catch! You must provide a to_json method! Otherwise you
-        // will not be able to convert move_only_type to json, since you fully
-        // specialized adl_serializer on that type
-        static void to_json(json& j, move_only_type t) {
-            j = t.i;
-        }
-    };
-}
-```
-
-## Can I write my own serializer? (Advanced use)
-
-Yes. You might want to take a look at [`unit-udt.cpp`](https://github.com/nlohmann/json/blob/develop/test/src/unit-udt.cpp) in the test suite, to see a few examples.
-
-If you write your own serializer, you'll need to do a few things:
-
-- use a different `basic_json` alias than `nlohmann::json` (the last template parameter of `basic_json` is the `JSONSerializer`)
-- use your `basic_json` alias (or a template parameter) in all your `to_json`/`from_json` methods
-- use `nlohmann::to_json` and `nlohmann::from_json` when you need ADL
-
-Here is an example, without simplifications, that only accepts types with a size <= 32, and uses ADL.
-
-```cpp
-// You should use void as a second template argument
-// if you don't need compile-time checks on T
-template<typename T, typename SFINAE = typename std::enable_if<sizeof(T) <= 32>::type>
-struct less_than_32_serializer {
-    template <typename BasicJsonType>
-    static void to_json(BasicJsonType& j, T value) {
-        // we want to use ADL, and call the correct to_json overload
-        using nlohmann::to_json; // this method is called by adl_serializer,
-                                 // this is where the magic happens
-        to_json(j, value);
-    }
-
-    template <typename BasicJsonType>
-    static void from_json(const BasicJsonType& j, T& value) {
-        // same thing here
-        using nlohmann::from_json;
-        from_json(j, value);
-    }
-};
-```
-
-Be **very** careful when reimplementing your serializer, you can stack overflow if you don't pay attention:
-
-```cpp
-template <typename T, void>
-struct bad_serializer
-{
-    template <typename BasicJsonType>
-    static void to_json(BasicJsonType& j, const T& value) {
-      // this calls BasicJsonType::json_serializer<T>::to_json(j, value);
-      // if BasicJsonType::json_serializer == bad_serializer ... oops!
-      j = value;
-    }
-
-    template <typename BasicJsonType>
-    static void to_json(const BasicJsonType& j, T& value) {
-      // this calls BasicJsonType::json_serializer<T>::from_json(j, value);
-      // if BasicJsonType::json_serializer == bad_serializer ... oops!
-      value = j.template get<T>(); // oops!
-    }
-};
-```
diff --git a/external_imported/json/doc/mkdocs/docs/features/binary_formats/bson.md b/external_imported/json/doc/mkdocs/docs/features/binary_formats/bson.md
deleted file mode 100644
index 0ed2a786e..000000000
--- a/external_imported/json/doc/mkdocs/docs/features/binary_formats/bson.md
+++ /dev/null
@@ -1,94 +0,0 @@
-# BSON
-
-BSON, short for Bin­ary JSON, is a bin­ary-en­coded seri­al­iz­a­tion of JSON-like doc­u­ments. Like JSON, BSON sup­ports the em­bed­ding of doc­u­ments and ar­rays with­in oth­er doc­u­ments and ar­rays. BSON also con­tains ex­ten­sions that al­low rep­res­ent­a­tion of data types that are not part of the JSON spec. For ex­ample, BSON has a Date type and a BinData type.
-
-!!! abstract "References"
-
-	- [BSON Website](http://bsonspec.org) - the main source on BSON
-	- [BSON Specification](http://bsonspec.org/spec.html) - the specification
-   
-
-## Serialization
-
-The library uses the following mapping from JSON values types to BSON types:
-
-JSON value type | value/range                       | BSON type   | marker
---------------- | --------------------------------- | ----------- | ------
-null            | `null`                            | null        | 0x0A
-boolean         | `true`, `false`                   | boolean     | 0x08
-number_integer  | -9223372036854775808..-2147483649 | int64       | 0x12
-number_integer  | -2147483648..2147483647           | int32       | 0x10
-number_integer  | 2147483648..9223372036854775807   | int64       | 0x12
-number_unsigned | 0..2147483647                     | int32       | 0x10
-number_unsigned | 2147483648..9223372036854775807   | int64       | 0x12
-number_unsigned | 9223372036854775808..18446744073709551615| --   | --
-number_float    | *any value*                       | double      | 0x01
-string          | *any value*                       | string      | 0x02
-array           | *any value*                       | document    | 0x04
-object          | *any value*                       | document    | 0x03
-binary          | *any value*                       | binary      | 0x05
-
-!!! warning "Incomplete mapping"
-
-    The mapping is **incomplete**, since only JSON-objects (and things
-    contained therein) can be serialized to BSON.
-    Also, integers larger than 9223372036854775807 cannot be serialized to BSON,
-    and the keys may not contain U+0000, since they are serialized a
-    zero-terminated c-strings.
-
-??? example
-
-    ```cpp
-    --8<-- "examples/to_bson.cpp"
-    ```
-    
-    Output:
-
-    ```c
-    --8<-- "examples/to_bson.output"
-    ```
-
-
-## Deserialization
-
-The library maps BSON record types to JSON value types as follows:
-
-BSON type       | BSON marker byte | JSON value type
---------------- | ---------------- | ---------------------------
-double          | 0x01             | number_float
-string          | 0x02             | string
-document        | 0x03             | object
-array           | 0x04             | array
-binary          | 0x05             | binary
-undefined       | 0x06             | *unsupported*
-ObjectId        | 0x07             | *unsupported*
-boolean         | 0x08             | boolean
-UTC Date-Time   | 0x09             | *unsupported*
-null            | 0x0A             | null
-Regular Expr.   | 0x0B             | *unsupported*
-DB Pointer      | 0x0C             | *unsupported*
-JavaScript Code | 0x0D             | *unsupported*
-Symbol          | 0x0E             | *unsupported*
-JavaScript Code | 0x0F             | *unsupported*
-int32           | 0x10             | number_integer
-Timestamp       | 0x11             | *unsupported*
-128-bit decimal float | 0x13       | *unsupported*
-Max Key         | 0x7F             | *unsupported*
-Min Key         | 0xFF             | *unsupported*
-
-!!! warning "Incomplete mapping"
-
-    The mapping is **incomplete**. The unsupported mappings are indicated in the table above.
-
-
-??? example
-
-    ```cpp
-    --8<-- "examples/from_bson.cpp"
-    ```
-
-    Output:
-
-    ```json
-    --8<-- "examples/from_bson.output"
-    ```
diff --git a/external_imported/json/doc/mkdocs/docs/features/binary_formats/cbor.md b/external_imported/json/doc/mkdocs/docs/features/binary_formats/cbor.md
deleted file mode 100644
index daa29be87..000000000
--- a/external_imported/json/doc/mkdocs/docs/features/binary_formats/cbor.md
+++ /dev/null
@@ -1,177 +0,0 @@
-# CBOR
-
-The Concise Binary Object Representation (CBOR) is a data format whose design goals include the possibility of extremely small code size, fairly small message size, and extensibility without the need for version negotiation.
-
-!!! abstract "References"
-
-  	- [CBOR Website](http://cbor.io) - the main source on CBOR
-    - [CBOR Playground](http://cbor.me) - an interactive webpage to translate between JSON and CBOR
-    - [RFC 7049](https://tools.ietf.org/html/rfc7049) - the CBOR specification
-
-## Serialization
-
-The library uses the following mapping from JSON values types to CBOR types according to the CBOR specification (RFC 7049):
-
-JSON value type | value/range                                | CBOR type                          | first byte
---------------- | ------------------------------------------ | ---------------------------------- | ---------------
-null            | `null`                                     | Null                               | 0xF6
-boolean         | `true`                                     | True                               | 0xF5
-boolean         | `false`                                    | False                              | 0xF4
-number_integer  | -9223372036854775808..-2147483649          | Negative integer (8 bytes follow)  | 0x3B
-number_integer  | -2147483648..-32769                        | Negative integer (4 bytes follow)  | 0x3A
-number_integer  | -32768..-129                               | Negative integer (2 bytes follow)  | 0x39
-number_integer  | -128..-25                                  | Negative integer (1 byte follow)   | 0x38
-number_integer  | -24..-1                                    | Negative integer                   | 0x20..0x37
-number_integer  | 0..23                                      | Integer                            | 0x00..0x17
-number_integer  | 24..255                                    | Unsigned integer (1 byte follow)   | 0x18
-number_integer  | 256..65535                                 | Unsigned integer (2 bytes follow)  | 0x19
-number_integer  | 65536..4294967295                          | Unsigned integer (4 bytes follow)  | 0x1A
-number_integer  | 4294967296..18446744073709551615           | Unsigned integer (8 bytes follow)  | 0x1B
-number_unsigned | 0..23                                      | Integer                            | 0x00..0x17
-number_unsigned | 24..255                                    | Unsigned integer (1 byte follow)   | 0x18
-number_unsigned | 256..65535                                 | Unsigned integer (2 bytes follow)  | 0x19
-number_unsigned | 65536..4294967295                          | Unsigned integer (4 bytes follow)  | 0x1A
-number_unsigned | 4294967296..18446744073709551615           | Unsigned integer (8 bytes follow)  | 0x1B
-number_float    | *any value representable by a float*       | Single-Precision Float             | 0xFA
-number_float    | *any value NOT representable by a float*   | Double-Precision Float             | 0xFB
-string          | *length*: 0..23                            | UTF-8 string                       | 0x60..0x77
-string          | *length*: 23..255                          | UTF-8 string (1 byte follow)       | 0x78
-string          | *length*: 256..65535                       | UTF-8 string (2 bytes follow)      | 0x79
-string          | *length*: 65536..4294967295                | UTF-8 string (4 bytes follow)      | 0x7A
-string          | *length*: 4294967296..18446744073709551615 | UTF-8 string (8 bytes follow)      | 0x7B
-array           | *size*: 0..23                              | array                              | 0x80..0x97
-array           | *size*: 23..255                            | array (1 byte follow)              | 0x98
-array           | *size*: 256..65535                         | array (2 bytes follow)             | 0x99
-array           | *size*: 65536..4294967295                  | array (4 bytes follow)             | 0x9A
-array           | *size*: 4294967296..18446744073709551615   | array (8 bytes follow)             | 0x9B
-object          | *size*: 0..23                              | map                                | 0xA0..0xB7
-object          | *size*: 23..255                            | map (1 byte follow)                | 0xB8
-object          | *size*: 256..65535                         | map (2 bytes follow)               | 0xB9
-object          | *size*: 65536..4294967295                  | map (4 bytes follow)               | 0xBA
-object          | *size*: 4294967296..18446744073709551615   | map (8 bytes follow)               | 0xBB
-binary          | *size*: 0..23                              | byte string                        | 0x40..0x57
-binary          | *size*: 23..255                            | byte string (1 byte follow)        | 0x58
-binary          | *size*: 256..65535                         | byte string (2 bytes follow)       | 0x59
-binary          | *size*: 65536..4294967295                  | byte string (4 bytes follow)       | 0x5A
-binary          | *size*: 4294967296..18446744073709551615   | byte string (8 bytes follow)       | 0x5B
-
-
-!!! success "Complete mapping"
-
-	The mapping is **complete** in the sense that any JSON value type can be converted to a CBOR value.
-
-!!! info "NaN/infinity handling"
-
-	If NaN or Infinity are stored inside a JSON number, they are serialized properly. This behavior differs from the normal JSON serialization which serializes NaN or Infinity to `null`.
-
-!!! info "Unused CBOR types"
-
-	The following CBOR types are not used in the conversion:
-
-      - UTF-8 strings terminated by "break" (0x7F)
-      - arrays terminated by "break" (0x9F)
-      - maps terminated by "break" (0xBF)
-      - byte strings terminated by "break" (0x5F)
-      - date/time (0xC0..0xC1)
-      - bignum (0xC2..0xC3)
-      - decimal fraction (0xC4)
-      - bigfloat (0xC5)
-      - expected conversions (0xD5..0xD7)
-      - simple values (0xE0..0xF3, 0xF8)
-      - undefined (0xF7)
-      - half-precision floats (0xF9)
-      - break (0xFF)
-
-!!! info "Tagged items"
-
-    Binary subtypes will be serialized as tagged items. See [binary values](../binary_values.md#cbor) for an example.
-
-??? example
-
-    ```cpp
-    --8<-- "examples/to_cbor.cpp"
-    ```
-    
-    Output:
-
-    ```c
-    --8<-- "examples/to_cbor.output"
-    ```
-
-## Deserialization
-
-The library maps CBOR types to JSON value types as follows:
-
-CBOR type              | JSON value type | first byte
----------------------- | --------------- | ----------
-Integer                | number_unsigned | 0x00..0x17
-Unsigned integer       | number_unsigned | 0x18
-Unsigned integer       | number_unsigned | 0x19
-Unsigned integer       | number_unsigned | 0x1A
-Unsigned integer       | number_unsigned | 0x1B
-Negative integer       | number_integer  | 0x20..0x37
-Negative integer       | number_integer  | 0x38
-Negative integer       | number_integer  | 0x39
-Negative integer       | number_integer  | 0x3A
-Negative integer       | number_integer  | 0x3B
-Byte string            | binary          | 0x40..0x57
-Byte string            | binary          | 0x58
-Byte string            | binary          | 0x59
-Byte string            | binary          | 0x5A
-Byte string            | binary          | 0x5B
-UTF-8 string           | string          | 0x60..0x77
-UTF-8 string           | string          | 0x78
-UTF-8 string           | string          | 0x79
-UTF-8 string           | string          | 0x7A
-UTF-8 string           | string          | 0x7B
-UTF-8 string           | string          | 0x7F
-array                  | array           | 0x80..0x97
-array                  | array           | 0x98
-array                  | array           | 0x99
-array                  | array           | 0x9A
-array                  | array           | 0x9B
-array                  | array           | 0x9F
-map                    | object          | 0xA0..0xB7
-map                    | object          | 0xB8
-map                    | object          | 0xB9
-map                    | object          | 0xBA
-map                    | object          | 0xBB
-map                    | object          | 0xBF
-False                  | `false`         | 0xF4
-True                   | `true`          | 0xF5
-Null                   | `null`          | 0xF6
-Half-Precision Float   | number_float    | 0xF9
-Single-Precision Float | number_float    | 0xFA
-Double-Precision Float | number_float    | 0xFB
-
-!!! warning "Incomplete mapping"
-
-	The mapping is **incomplete** in the sense that not all CBOR types can be converted to a JSON value. The following CBOR types are not supported and will yield parse errors:
-
-     - date/time (0xC0..0xC1)
-     - bignum (0xC2..0xC3)
-     - decimal fraction (0xC4)
-     - bigfloat (0xC5)
-     - expected conversions (0xD5..0xD7)
-     - simple values (0xE0..0xF3, 0xF8)
-     - undefined (0xF7)
-
-!!! warning "Object keys"
-
-	CBOR allows map keys of any type, whereas JSON only allows strings as keys in object values. Therefore, CBOR maps with keys other than UTF-8 strings are rejected.
-
-!!! warning "Tagged items"
-
-    Tagged items will throw a parse error by default. However, they can be ignored by passing `cbor_tag_handler_t::ignore` to function `from_cbor`.
-
-??? example
-
-    ```cpp
-    --8<-- "examples/from_cbor.cpp"
-    ```
-
-    Output:
-
-    ```json
-    --8<-- "examples/from_cbor.output"
-    ```
diff --git a/external_imported/json/doc/mkdocs/docs/features/binary_formats/index.md b/external_imported/json/doc/mkdocs/docs/features/binary_formats/index.md
deleted file mode 100644
index 55f963c2d..000000000
--- a/external_imported/json/doc/mkdocs/docs/features/binary_formats/index.md
+++ /dev/null
@@ -1,45 +0,0 @@
-# Overview
-
-Though JSON is a ubiquitous data format, it is not a very compact format suitable for data exchange, for instance over a network. Hence, the library supports
-
-- [BSON](bson.md) (Binary JSON),
-- [CBOR](cbor.md) (Concise Binary Object Representation),
-- [MessagePack](messagepack.md), and
-- [UBJSON](ubjson.md) (Universal Binary JSON)
-
-to efficiently encode JSON values to byte vectors and to decode such vectors.
-
-## Comparison
-
-### Completeness
-
-| Format      | Serialization                                 | Deserialization                              |
-| ----------- |---------------------------------------------- | -------------------------------------------- |
-| BSON        | incomplete: top-level value must be an object | incomplete, but all JSON types are supported |
-| CBOR        | complete                                      | incomplete, but all JSON types are supported |
-| MessagePack | complete                                      | complete                                     |
-| UBJSON      | complete                                      | complete                                     |
-
-### Binary values
-
-| Format      | Binary values | Binary subtypes |
-| ----------- | ------------- | --------------- |
-| BSON        | supported     | supported       |
-| CBOR        | supported     | not supported   |
-| MessagePack | supported     | supported       |
-| UBJSON      | not supported | not supported   |
-
-See [binary values](../binary_values.md) for more information.
-
-### Sizes
-
-| Format             | canada.json | twitter.json | citm_catalog.json | jeopardy.json |
-| ------------------ | ----------- | ------------ | ----------------- | ------------- |
-| BSON               | 85,8 %      | 95,2 %       | 95,8 %            | 106,7 %       |
-| CBOR               | 50,5 %      | 86,3 %       | 68,4 %            | 88,0 %        |
-| MessagePack        | 50,6 %      | 86,0 %       | 68,5 %            | 87,9 %        |
-| UBJSON             | 53,2 %      | 91,3 %       | 78,2 %            | 96,6 %        |
-| UBJSON (size)      | 58,6 %      | 92,3 %       | 86,8 %            | 97,4 %        |
-| UBJSON (size+type) | 55,9 %      | 92,3 %       | 85,0 %            | 95,0 %        |
-
-Sizes compared to minified JSON value.
diff --git a/external_imported/json/doc/mkdocs/docs/features/binary_formats/messagepack.md b/external_imported/json/doc/mkdocs/docs/features/binary_formats/messagepack.md
deleted file mode 100644
index 3e041bb70..000000000
--- a/external_imported/json/doc/mkdocs/docs/features/binary_formats/messagepack.md
+++ /dev/null
@@ -1,139 +0,0 @@
-# MessagePack
-
-MessagePack is an efficient binary serialization format. It lets you exchange data among multiple languages like JSON. But it's faster and smaller. Small integers are encoded into a single byte, and typical short strings require only one extra byte in addition to the strings themselves.
-
-!!! abstract "References"
-
-	- [MessagePack website](https://msgpack.org)
-	- [MessagePack specification](https://github.com/msgpack/msgpack/blob/master/spec.md)
-
-## Serialization
-
-The library uses the following mapping from JSON values types to MessagePack types according to the MessagePack specification:
-
-JSON value type | value/range                       | MessagePack type | first byte
---------------- | --------------------------------- | ---------------- | ----------
-null            | `null`                            | nil              | 0xC0
-boolean         | `true`                            | true             | 0xC3
-boolean         | `false`                           | false            | 0xC2
-number_integer  | -9223372036854775808..-2147483649 | int64            | 0xD3
-number_integer  | -2147483648..-32769               | int32            | 0xD2
-number_integer  | -32768..-129                      | int16            | 0xD1
-number_integer  | -128..-33                         | int8             | 0xD0
-number_integer  | -32..-1                           | negative fixint  | 0xE0..0xFF
-number_integer  | 0..127                            | positive fixint  | 0x00..0x7F
-number_integer  | 128..255                          | uint 8           | 0xCC
-number_integer  | 256..65535                        | uint 16          | 0xCD
-number_integer  | 65536..4294967295                 | uint 32          | 0xCE
-number_integer  | 4294967296..18446744073709551615  | uint 64          | 0xCF
-number_unsigned | 0..127                            | positive fixint  | 0x00..0x7F
-number_unsigned | 128..255                          | uint 8           | 0xCC
-number_unsigned | 256..65535                        | uint 16          | 0xCD
-number_unsigned | 65536..4294967295                 | uint 32          | 0xCE
-number_unsigned | 4294967296..18446744073709551615  | uint 64          | 0xCF
-number_float    | *any value representable by a float*     | float 32  | 0xCA
-number_float    | *any value NOT representable by a float* | float 64  | 0xCB
-string          | *length*: 0..31                   | fixstr           | 0xA0..0xBF
-string          | *length*: 32..255                 | str 8            | 0xD9
-string          | *length*: 256..65535              | str 16           | 0xDA
-string          | *length*: 65536..4294967295       | str 32           | 0xDB
-array           | *size*: 0..15                     | fixarray         | 0x90..0x9F
-array           | *size*: 16..65535                 | array 16         | 0xDC
-array           | *size*: 65536..4294967295         | array 32         | 0xDD
-object          | *size*: 0..15                     | fix map          | 0x80..0x8F
-object          | *size*: 16..65535                 | map 16           | 0xDE
-object          | *size*: 65536..4294967295         | map 32           | 0xDF
-binary          | *size*: 0..255                    | bin 8            | 0xC4
-binary          | *size*: 256..65535                | bin 16           | 0xC5
-binary          | *size*: 65536..4294967295         | bin 32           | 0xC6
-
-!!! success "Complete mapping"
-
-	The mapping is **complete** in the sense that any JSON value type can be converted to a MessagePack value.
-
-	Any MessagePack output created by `to_msgpack` can be successfully parsed by `from_msgpack`.
-
-!!! warning "Size constraints"
-
-	The following values can **not** be converted to a MessagePack value:
-
-	  - strings with more than 4294967295 bytes
-	  - byte strings with more than 4294967295 bytes
-	  - arrays with more than 4294967295 elements
-	  - objects with more than 4294967295 elements
-
-!!! info "NaN/infinity handling"
-
-	If NaN or Infinity are stored inside a JSON number, they are serialized properly. function which serializes NaN or Infinity to `null`.
-
-??? example
-
-    ```cpp
-    --8<-- "examples/to_msgpack.cpp"
-    ```
-    
-    Output:
-
-    ```c
-    --8<-- "examples/to_msgpack.output"
-    ```
-
-## Deserialization
-
-The library maps MessagePack types to JSON value types as follows:
-
-MessagePack type | JSON value type | first byte
----------------- | --------------- | ----------
-positive fixint  | number_unsigned | 0x00..0x7F
-fixmap           | object          | 0x80..0x8F
-fixarray         | array           | 0x90..0x9F
-fixstr           | string          | 0xA0..0xBF
-nil              | `null`          | 0xC0
-false            | `false`         | 0xC2
-true             | `true`          | 0xC3
-float 32         | number_float    | 0xCA
-float 64         | number_float    | 0xCB
-uint 8           | number_unsigned | 0xCC
-uint 16          | number_unsigned | 0xCD
-uint 32          | number_unsigned | 0xCE
-uint 64          | number_unsigned | 0xCF
-int 8            | number_integer  | 0xD0
-int 16           | number_integer  | 0xD1
-int 32           | number_integer  | 0xD2
-int 64           | number_integer  | 0xD3
-str 8            | string          | 0xD9
-str 16           | string          | 0xDA
-str 32           | string          | 0xDB
-array 16         | array           | 0xDC
-array 32         | array           | 0xDD
-map 16           | object          | 0xDE
-map 32           | object          | 0xDF
-bin 8            | binary          | 0xC4
-bin 16           | binary          | 0xC5
-bin 32           | binary          | 0xC6
-ext 8            | binary          | 0xC7
-ext 16           | binary          | 0xC8
-ext 32           | binary          | 0xC9
-fixext 1         | binary          | 0xD4
-fixext 2         | binary          | 0xD5
-fixext 4         | binary          | 0xD6
-fixext 8         | binary          | 0xD7
-fixext 16        | binary          | 0xD8
-negative fixint  | number_integer  | 0xE0-0xFF
-
-!!! info
-
-	Any MessagePack output created by `to_msgpack` can be successfully parsed by `from_msgpack`.
-
-
-??? example
-
-    ```cpp
-    --8<-- "examples/from_msgpack.cpp"
-    ```
-
-    Output:
-
-    ```json
-    --8<-- "examples/from_msgpack.output"
-    ```
diff --git a/external_imported/json/doc/mkdocs/docs/features/binary_formats/ubjson.md b/external_imported/json/doc/mkdocs/docs/features/binary_formats/ubjson.md
deleted file mode 100644
index 050b4ec59..000000000
--- a/external_imported/json/doc/mkdocs/docs/features/binary_formats/ubjson.md
+++ /dev/null
@@ -1,133 +0,0 @@
-# UBJSON
-
-Universal Binary JSON (UBJSON) is a binary form directly imitating JSON, but requiring fewer bytes of data. It aims to achieve the generality of JSON, combined with being much easier to process than JSON.
-
-!!! abstract "References"
-
-	- [UBJSON Website](http://ubjson.org)
-
-## Serialization
-
-The library uses the following mapping from JSON values types to UBJSON types according to the UBJSON specification:
-
-JSON value type | value/range                       | UBJSON type | marker
---------------- | --------------------------------- | ----------- | ------
-null            | `null`                            | null        | `Z`
-boolean         | `true`                            | true        | `T`
-boolean         | `false`                           | false       | `F`
-number_integer  | -9223372036854775808..-2147483649 | int64       | `L`
-number_integer  | -2147483648..-32769               | int32       | `l`
-number_integer  | -32768..-129                      | int16       | `I`
-number_integer  | -128..127                         | int8        | `i`
-number_integer  | 128..255                          | uint8       | `U`
-number_integer  | 256..32767                        | int16       | `I`
-number_integer  | 32768..2147483647                 | int32       | `l`
-number_integer  | 2147483648..9223372036854775807   | int64       | `L`
-number_unsigned | 0..127                            | int8        | `i`
-number_unsigned | 128..255                          | uint8       | `U`
-number_unsigned | 256..32767                        | int16       | `I`
-number_unsigned | 32768..2147483647                 | int32       | `l`
-number_unsigned | 2147483648..9223372036854775807   | int64       | `L`
-number_unsigned | 2147483649..18446744073709551615  | high-precision | `H`
-number_float    | *any value*                       | float64     | `D`
-string          | *with shortest length indicator*  | string      | `S`
-array           | *see notes on optimized format*   | array       | `[`
-object          | *see notes on optimized format*   | map         | `{`
-
-!!! success "Complete mapping"
-
-	The mapping is **complete** in the sense that any JSON value type can be converted to a UBJSON value.
-
-	Any UBJSON output created by `to_ubjson` can be successfully parsed by `from_ubjson`.
-
-!!! warning "Size constraints"
-
-	The following values can **not** be converted to a UBJSON value:
-
-      - strings with more than 9223372036854775807 bytes (theoretical)
-
-!!! info "Unused UBJSON markers"
-
-	The following markers are not used in the conversion:
-    
-    - `Z`: no-op values are not created.
-    - `C`: single-byte strings are serialized with `S` markers.
-
-!!! info "NaN/infinity handling"
-
-	If NaN or Infinity are stored inside a JSON number, they are
-    serialized properly. This behavior differs from the `dump()`
-    function which serializes NaN or Infinity to `null`.
-
-!!! info "Optimized formats"
-
-	The optimized formats for containers are supported: Parameter
-    `use_size` adds size information to the beginning of a container and
-    removes the closing marker. Parameter `use_type` further checks
-    whether all elements of a container have the same type and adds the
-    type marker to the beginning of the container. The `use_type`
-    parameter must only be used together with `use_size = true`.
-
-    Note that `use_size = true` alone may result in larger representations -
-    the benefit of this parameter is that the receiving side is
-    immediately informed on the number of elements of the container.
-
-!!! info "Binary values"
-
-	If the JSON data contains the binary type, the value stored is a list
-    of integers, as suggested by the UBJSON documentation.  In particular,
-    this means that serialization and the deserialization of a JSON
-    containing binary values into UBJSON and back will result in a
-    different JSON object.
-
-
-??? example
-
-    ```cpp
-    --8<-- "examples/to_ubjson.cpp"
-    ```
-
-    Output:
-
-    ```c
-    --8<-- "examples/to_ubjson.output"
-    ```
-
-## Deserialization
-
-The library maps UBJSON types to JSON value types as follows:
-
-UBJSON type | JSON value type                         | marker
------------ | --------------------------------------- | ------
-no-op       | *no value, next value is read*          | `N`
-null        | `null`                                  | `Z`
-false       | `false`                                 | `F`
-true        | `true`                                  | `T`
-float32     | number_float                            | `d`
-float64     | number_float                            | `D`
-uint8       | number_unsigned                         | `U`
-int8        | number_integer                          | `i`
-int16       | number_integer                          | `I`
-int32       | number_integer                          | `l`
-int64       | number_integer                          | `L`
-string      | string                                  | `S`
-char        | string                                  | `C`
-array       | array (optimized values are supported)  | `[`
-object      | object (optimized values are supported) | `{`
-
-!!! success "Complete mapping"
-
-	The mapping is **complete** in the sense that any UBJSON value can be converted to a JSON value.
-
-
-??? example
-
-    ```cpp
-    --8<-- "examples/from_ubjson.cpp"
-    ```
-
-    Output:
-
-    ```json
-    --8<-- "examples/from_ubjson.output"
-    ```
diff --git a/external_imported/json/doc/mkdocs/docs/features/binary_values.md b/external_imported/json/doc/mkdocs/docs/features/binary_values.md
deleted file mode 100644
index 4716aac7e..000000000
--- a/external_imported/json/doc/mkdocs/docs/features/binary_values.md
+++ /dev/null
@@ -1,295 +0,0 @@
-# Binary Values
-
-The library implements several [binary formats](binary_formats/index.md) that encode JSON in an efficient way. Most of these formats support binary values; that is, values that have semantics define outside the library and only define a sequence of bytes to be stored.
-
-JSON itself does not have a binary value. As such, binary values are an extension that this library implements to store values received by a binary format. Binary values are never created by the JSON parser, and are only part of a serialized JSON text if they have been created manually or via a binary format.
-
-## API for binary values
-
-```plantuml
-class json::binary_t {
-    -- setters --
-    +void set_subtype(std::uint8_t subtype)
-    +void clear_subtype()
-    -- getters --
-    +std::uint8_t subtype() const
-    +bool has_subtype() const
-}
-
-"std::vector<uint8_t>" <|-- json::binary_t
-```
-
-By default, binary values are stored as `std::vector<std::uint8_t>`. This type can be changed by providing a template parameter to the `basic_json` type. To store binary subtypes, the storage type is extended and exposed as `json::binary_t`:
-
-```cpp
-auto binary = json::binary_t({0xCA, 0xFE, 0xBA, 0xBE});
-auto binary_with_subtype = json::binary_t({0xCA, 0xFE, 0xBA, 0xBE}, 42);
-```
-
-There are several convenience functions to check and set the subtype:
-
-```cpp
-binary.has_subtype();                   // returns false
-binary_with_subtype.has_subtype();      // returns true
-
-binary_with_subtype.clear_subtype();
-binary_with_subtype.has_subtype();      // returns true
-
-binary_with_subtype.set_subtype(42);
-binary.set_subtype(23);
-
-binary.subtype();                       // returns 23
-```
-
-As `json::binary_t` is subclassing `std::vector<std::uint8_t>`, all member functions are available:
-
-```cpp
-binary.size();  // returns 4
-binary[1];      // returns 0xFE
-```
-
-JSON values can be constructed from `json::binary_t`:
-
-```cpp
-json j = binary;
-```
-
-Binary values are primitive values just like numbers or strings:
-
-```cpp
-j.is_binary();    // returns true
-j.is_primitive(); // returns true
-```
-
-Given a binary JSON value, the `binary_t` can be accessed by reference as via `get_binary()`:
-
-```cpp
-j.get_binary().has_subtype();  // returns true
-j.get_binary().size();         // returns 4
-```
-
-For convencience, binary JSON values can be constructed via `json::binary`:
-
-```cpp
-auto j2 = json::binary({0xCA, 0xFE, 0xBA, 0xBE}, 23);
-auto j3 = json::binary({0xCA, 0xFE, 0xBA, 0xBE});
-
-j2 == j;                        // returns true
-j3.get_binary().has_subtype();  // returns false
-```
-
-
-
-## Serialization
-
-Binary values are serialized differently according to the formats.
-
-### JSON
-
-JSON does not have a binary type, and this library does not introduce a new type as this would break conformance. Instead, binary values are serialized as an object with two keys: `bytes` holds an array of integers, and `subtype` is an integer or `null`.
-
-??? example
-
-    Code:
-
-    ```cpp
-    // create a binary value of subtype 42
-    json j;
-    j["binary"] = json::binary({0xCA, 0xFE, 0xBA, 0xBE}, 42);
-    
-    // serialize to standard output
-    std::cout << j.dump(2) << std::endl;
-    ```
-    
-    Output:
-    
-    ```json
-    {
-      "binary": {
-        "bytes": [202, 254, 186, 190],
-        "subtype": 42
-      }
-    }
-    ```
-
-!!! warning "No roundtrip for binary values"
-
-    The JSON parser will not parse the objects generated by binary values back to binary values. This is by design to remain standards compliant. Serializing binary values to JSON is only implemented for debugging purposes.
-
-### BSON
-
-[BSON](binary_formats/bson.md) supports binary values and subtypes. If a subtype is given, it is used and added as unsigned 8-bit integer. If no subtype is given, the generic binary subtype 0x00 is used.
-
-??? example
-
-    Code:
-    
-    ```cpp
-    // create a binary value of subtype 42
-    json j;
-    j["binary"] = json::binary({0xCA, 0xFE, 0xBA, 0xBE}, 42);
-
-    // convert to BSON
-    auto v = json::to_bson(j);      
-    ```
-            
-    `v` is a `std::vector<std::uint8t>` with the following 22 elements:
-    
-    ```c
-    0x16 0x00 0x00 0x00                         // number of bytes in the document
-        0x05                                    // binary value
-            0x62 0x69 0x6E 0x61 0x72 0x79 0x00  // key "binary" + null byte
-            0x04 0x00 0x00 0x00                 // number of bytes
-            0x2a                                // subtype
-            0xCA 0xFE 0xBA 0xBE                 // content
-    0x00                                        // end of the document
-    ```
-
-    Note that the serialization preserves the subtype, and deserializing `v` would yield the following value:
-
-    ```json
-    {
-      "binary": {
-        "bytes": [202, 254, 186, 190],
-        "subtype": 42
-      }
-    }
-    ```
-
-### CBOR
-
-[CBOR](binary_formats/cbor.md) supports binary values, but no subtypes. Subtypes will be serialized as tags. Any binary value will be serialized as byte strings. The library will choose the smallest representation using the length of the byte array.
-
-??? example
-
-    Code:
-    
-    ```cpp
-    // create a binary value of subtype 42
-    json j;
-    j["binary"] = json::binary({0xCA, 0xFE, 0xBA, 0xBE}, 42);
-
-    // convert to CBOR
-    auto v = json::to_cbor(j);      
-    ```
-            
-    `v` is a `std::vector<std::uint8t>` with the following 15 elements:
-    
-    ```c
-    0xA1                                   // map(1)
-        0x66                               // text(6)
-            0x62 0x69 0x6E 0x61 0x72 0x79  // "binary"
-        0xD8 0x2A                          // tag(42)
-        0x44                               // bytes(4)
-            0xCA 0xFE 0xBA 0xBE            // content
-    ```
-
-    Note that the subtype is serialized as tag. However, parsing tagged values yield a parse error unless `json::cbor_tag_handler_t::ignore` is passed to `json::from_cbor`.
-
-    ```json
-    {
-      "binary": {
-        "bytes": [202, 254, 186, 190],
-        "subtype": null
-      }
-    }
-    ```
-
-### MessagePack
-
-[MessagePack](binary_formats/messagepack.md) supports binary values and subtypes. If a subtype is given, the ext family is used. The library will choose the smallest representation among fixext1, fixext2, fixext4, fixext8, ext8, ext16, and ext32. The subtype is then added as singed 8-bit integer.
-
-If no subtype is given, the bin family (bin8, bin16, bin32) is used.
-
-??? example
-
-    Code:
-    
-    ```cpp
-    // create a binary value of subtype 42
-    json j;
-    j["binary"] = json::binary({0xCA, 0xFE, 0xBA, 0xBE}, 42);
-
-    // convert to MessagePack
-    auto v = json::to_msgpack(j);      
-    ```
-            
-    `v` is a `std::vector<std::uint8t>` with the following 14 elements:
-    
-    ```c
-    0x81                                   // fixmap1
-        0xA6                               // fixstr6
-            0x62 0x69 0x6E 0x61 0x72 0x79  // "binary"
-        0xD6                               // fixext4
-            0x2A                           // subtype
-            0xCA 0xFE 0xBA 0xBE            // content
-    ```
-
-    Note that the serialization preserves the subtype, and deserializing `v` would yield the following value:
-
-    ```json
-    {
-      "binary": {
-        "bytes": [202, 254, 186, 190],
-        "subtype": 42
-      }
-    }
-    ```
-
-### UBJSON
-
-[UBJSON](binary_formats/ubjson.md) neither supports binary values nor subtypes, and proposes to serialize binary values as array of uint8 values. This translation is implemented by the library.
-
-??? example
-
-    Code:
-    
-    ```cpp
-    // create a binary value of subtype 42 (will be ignored in UBJSON)
-    json j;
-    j["binary"] = json::binary({0xCA, 0xFE, 0xBA, 0xBE}, 42);
-
-    // convert to UBJSON
-    auto v = json::to_msgpack(j);      
-    ```
-            
-    `v` is a `std::vector<std::uint8t>` with the following 20 elements:
-    
-    ```c
-    0x7B                                             // '{'
-        0x69 0x06                                    // i 6 (length of the key)
-        0x62 0x69 0x6E 0x61 0x72 0x79                // "binary"
-        0x5B                                         // '['
-            0x55 0xCA 0x55 0xFE 0x55 0xBA 0x55 0xBE  // content (each byte prefixed with 'U')
-        0x5D                                         // ']'
-    0x7D                                             // '}'
-    ```
-
-    The following code uses the type and size optimization for UBJSON:
-
-    ```cpp
-    // convert to UBJSON using the size and type optimization
-    auto v = json::to_ubjson(j, true, true);
-    ```
-
-    The resulting vector has 23 elements; the optimization is not effective for examples with few values:
-
-    ```c
-    0x7B                                // '{'
-        0x24                            // '$' type of the object elements
-        0x5B                            // '[' array
-        0x23 0x69 0x01                  // '#' i 1 number of object elements
-        0x69 0x06                       // i 6 (length of the key)
-        0x62 0x69 0x6E 0x61 0x72 0x79   // "binary"
-            0x24 0x55                   // '$' 'U' type of the array elements: unsinged integers
-            0x23 0x69 0x04              // '#' i 4 number of array elements
-            0xCA 0xFE 0xBA 0xBE         // content
-    ```
-
-    Note that subtype (42) is **not** serialized and that UBJSON has **no binary type**, and deserializing `v` would yield the following value:
-
-    ```json
-    {
-      "binary": [202, 254, 186, 190]
-    }
-    ```
diff --git a/external_imported/json/doc/mkdocs/docs/features/element_access/checked_access.md b/external_imported/json/doc/mkdocs/docs/features/element_access/checked_access.md
deleted file mode 100644
index 19c75254d..000000000
--- a/external_imported/json/doc/mkdocs/docs/features/element_access/checked_access.md
+++ /dev/null
@@ -1,77 +0,0 @@
-# Checked access: at
-
-## Overview
-
-The `#!cpp at()` member function performs checked access; that is, it returns a reference to the desired value if it exists and throws a [`basic_json::out_of_range` exception](../../home/exceptions.md#out-of-range) otherwise.
-
-??? example
-
-    Consider the following JSON value:
-    
-    ```json
-    {
-        "name": "Mary Smith",
-        "age": 42,
-        "hobbies": ["hiking", "reading"]
-    }
-    ```
-    
-    Assume the value is parsed to a `json` variable `j`.
-
-    | expression | value |
-    | ---------- | ----- |
-    | `#!cpp j`  | `#!json {"name": "Mary Smith", "age": 42, "hobbies": ["hiking", "reading"]}` |
-    | `#!cpp j.at("name")`  | `#!json "Mary Smith"` |
-    | `#!cpp j.at("age")`  | `#!json 42` |
-    | `#!cpp j.at("hobbies")`  | `#!json ["hiking", "reading"]` |
-    | `#!cpp j.at("hobbies").at(0)`  | `#!json "hiking"` |
-    | `#!cpp j.at("hobbies").at(1)`  | `#!json "reading"` |
-
-The return value is a reference, so it can be modify the original value.
-
-??? example
-
-    ```cpp
-    j.at("name") = "John Smith";
-    ```
-    
-    This code produces the following JSON value:
-    
-    ```json
-    {
-        "name": "John Smith",
-        "age": 42,
-        "hobbies": ["hiking", "reading"]
-    }
-    ```
-
-When accessing an invalid index (i.e., an index greater than or equal to the array size) or the passed object key is non-existing, an exception is thrown.
-
-??? example
-
-    ```cpp
-    j.at("hobbies").at(3) = "cooking";
-    ```
-    
-    This code produces the following exception:
-    
-    ```
-    [json.exception.out_of_range.401] array index 3 is out of range
-    ```
-
-## Notes
-
-
-!!! failure "Exceptions"
-
-    - `at` can only be used with objects (with a string argument) or with arrays (with a numeric argument). For other types, a [`basic_json::type_error`](../../home/exceptions.md#jsonexceptiontype_error304) is thrown.
-    - [`basic_json::out_of_range` exception](../../home/exceptions.md#out-of-range) exceptions are thrown if the provided key is not found in an object or the provided index is invalid.
-
-## Summary
-
-| scenario | non-const value | const value |
-| -------- | ------------- | ----------- |
-| access to existing object key | reference to existing value is returned | const reference to existing value is returned |
-| access to valid array index | reference to existing value is returned | const reference to existing value is returned |
-| access to non-existing object key | `basic_json::out_of_range` exception is thrown | `basic_json::out_of_range` exception is thrown |
-| access to invalid array index | `basic_json::out_of_range` exception is thrown | `basic_json::out_of_range` exception is thrown |
diff --git a/external_imported/json/doc/mkdocs/docs/features/element_access/index.md b/external_imported/json/doc/mkdocs/docs/features/element_access/index.md
deleted file mode 100644
index 1755fe8c6..000000000
--- a/external_imported/json/doc/mkdocs/docs/features/element_access/index.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Overview
-
-There are many ways elements in a JSON value can be accessed:
-
-- unchecked access via [`operator[]`](unchecked_access.md)
-- checked access via [`at`](checked_access.md)
-- access with default value via [`value`](default_value.md)
-- iterators
-- JSON pointers
diff --git a/external_imported/json/doc/mkdocs/docs/features/element_access/unchecked_access.md b/external_imported/json/doc/mkdocs/docs/features/element_access/unchecked_access.md
deleted file mode 100644
index fff7f2b32..000000000
--- a/external_imported/json/doc/mkdocs/docs/features/element_access/unchecked_access.md
+++ /dev/null
@@ -1,102 +0,0 @@
-# Unchecked access: operator[]
-
-## Overview
-
-Elements in a JSON object and a JSON array can be accessed via `#!cpp operator[]` similar to a `#!cpp std::map` and a `#!cpp std::vector`, respectively.
-
-??? example
-
-    Consider the following JSON value:
-    
-    ```json
-    {
-        "name": "Mary Smith",
-        "age": 42,
-        "hobbies": ["hiking", "reading"]
-    }
-    ```
-    
-    Assume the value is parsed to a `json` variable `j`.
-
-    | expression | value |
-    | ---------- | ----- |
-    | `#!cpp j`  | `#!json {"name": "Mary Smith", "age": 42, "hobbies": ["hiking", "reading"]}` |
-    | `#!cpp j["name"]`  | `#!json "Mary Smith"` |
-    | `#!cpp j["age"]`  | `#!json 42` |
-    | `#!cpp j["hobbies"]`  | `#!json ["hiking", "reading"]` |
-    | `#!cpp j["hobbies"][0]`  | `#!json "hiking"` |
-    | `#!cpp j["hobbies"][1]`  | `#!json "reading"` |
-
-The return value is a reference, so it can be modify the original value. In case the passed object key is non-existing, a `#!json null` value is inserted which can be immediately be overwritten.
-
-??? example
-
-    ```cpp
-    j["name"] = "John Smith";
-    j["maidenName"] = "Jones";
-    ```
-    
-    This code produces the following JSON value:
-    
-    ```json
-    {
-        "name": "John Smith",
-        "maidenName": "Jones",
-        "age": 42,
-        "hobbies": ["hiking", "reading"]
-    }
-    ```
-
-When accessing an invalid index (i.e., an index greater than or equal to the array size), the JSON array is resized such that the passed index is the new maximal index. Intermediate values are filled with `#!json null`.
-
-??? example
-
-    ```cpp
-    j["hobbies"][0] = "running";
-    j["hobbies"][3] = "cooking";
-    ```
-    
-    This code produces the following JSON value:
-    
-    ```json
-    {
-        "name": "John Smith",
-        "maidenName": "Jones",
-        "age": 42,
-        "hobbies": ["running", "reading", null, "cooking"]
-    }
-    ```
-
-## Notes
-
-!!! info "Design rationale"
-
-    The library behaves differently to `#!cpp std::vector` and `#!cpp std::map`:
-    
-    - `#!cpp std::vector::operator[]` never inserts a new element.
-    - `#!cpp std::map::operator[]` is not available for const values.
-    
-    The type `#!cpp json` wraps all JSON value types. It would be impossible to remove `operator[]` for const objects. At the same time, inserting elements for non-const objects is really convenient as it avoids awkward `insert` calls. To this end, we decided to have an inserting non-const behavior for both arrays and objects.
-
-!!! info
-
-    The access is unchecked. In case the passed object key does not exist or the passed array index is invalid, no exception is thrown.
-
-!!! danger
-
-    - It is **undefined behavior** to access a const object with a non-existing key.
-    - It is **undefined behavior** to access a const array with an invalid index.
-    - In debug mode, an **assertion** will fire in both cases. You can disable assertions by defining the preprocessor symbol `#!cpp NDEBUG` or redefine the macro [`JSON_ASSERT(x)`](../macros.md#json_assertx).
-
-!!! failure "Exceptions"
-
-    `operator[]` can only be used with objects (with a string argument) or with arrays (with a numeric argument). For other types, a [`basic_json::type_error`](../../home/exceptions.md#jsonexceptiontype_error305) is thrown.
-
-## Summary
-
-| scenario | non-const value | const value |
-| -------- | ------------- | ----------- |
-| access to existing object key | reference to existing value is returned | const reference to existing value is returned |
-| access to valid array index | reference to existing value is returned | const reference to existing value is returned |
-| access to non-existing object key | reference to newly inserted `#!json null` value is returned | **undefined behavior**; assertion in debug mode |
-| access to invalid array index | reference to newly inserted `#!json null` value is returned; any index between previous maximal index and passed index are filled with `#!json null` | **undefined behavior**; assertion in debug mode |
diff --git a/external_imported/json/doc/mkdocs/docs/features/enum_conversion.md b/external_imported/json/doc/mkdocs/docs/features/enum_conversion.md
deleted file mode 100644
index 1c1bb8032..000000000
--- a/external_imported/json/doc/mkdocs/docs/features/enum_conversion.md
+++ /dev/null
@@ -1,53 +0,0 @@
-# Specializing enum conversion
-
-By default, enum values are serialized to JSON as integers. In some cases this could result in undesired behavior. If an enum is modified or re-ordered after data has been serialized to JSON, the later de-serialized JSON data may be undefined or a different enum value than was originally intended.
-
-It is possible to more precisely specify how a given enum is mapped to and from JSON as shown below:
-
-```cpp
-// example enum type declaration
-enum TaskState {
-    TS_STOPPED,
-    TS_RUNNING,
-    TS_COMPLETED,
-    TS_INVALID=-1,
-};
-
-// map TaskState values to JSON as strings
-NLOHMANN_JSON_SERIALIZE_ENUM( TaskState, {
-    {TS_INVALID, nullptr},
-    {TS_STOPPED, "stopped"},
-    {TS_RUNNING, "running"},
-    {TS_COMPLETED, "completed"},
-})
-```
-
-The `NLOHMANN_JSON_SERIALIZE_ENUM()` macro declares a set of `to_json()` / `from_json()` functions for type `TaskState` while avoiding repetition and boilerplate serialization code.
-
-## Usage
-
-```cpp
-// enum to JSON as string
-json j = TS_STOPPED;
-assert(j == "stopped");
-
-// json string to enum
-json j3 = "running";
-assert(j3.get<TaskState>() == TS_RUNNING);
-
-// undefined json value to enum (where the first map entry above is the default)
-json jPi = 3.14;
-assert(jPi.get<TaskState>() == TS_INVALID );
-```
-
-## Notes
-
-Just as in [Arbitrary Type Conversions](#arbitrary-types-conversions) above,
-
-- `NLOHMANN_JSON_SERIALIZE_ENUM()` MUST be declared in your enum type's namespace (which can be the global namespace), or the library will not be able to locate it and it will default to integer serialization.
-- It MUST be available (e.g., proper headers must be included) everywhere you use the conversions.
-
-Other Important points:
-
-- When using `get<ENUM_TYPE>()`, undefined JSON values will default to the first pair specified in your map. Select this default pair carefully.
-- If an enum or JSON value is specified more than once in your map, the first matching occurrence from the top of the map will be returned when converting to or from JSON.
diff --git a/external_imported/json/doc/mkdocs/docs/features/json_pointer.md b/external_imported/json/doc/mkdocs/docs/features/json_pointer.md
deleted file mode 100644
index b95c5bc02..000000000
--- a/external_imported/json/doc/mkdocs/docs/features/json_pointer.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# JSON Pointer
-
-The library supports **JSON Pointer** ([RFC 6901](https://tools.ietf.org/html/rfc6901)) as alternative means to address structured values.
-
-```cpp
-// a JSON value
-json j_original = R"({
-  "baz": ["one", "two", "three"],
-  "foo": "bar"
-})"_json;
-
-// access members with a JSON pointer (RFC 6901)
-j_original["/baz/1"_json_pointer];
-// "two"
-```
diff --git a/external_imported/json/doc/mkdocs/docs/features/macros.md b/external_imported/json/doc/mkdocs/docs/features/macros.md
deleted file mode 100644
index b468c091a..000000000
--- a/external_imported/json/doc/mkdocs/docs/features/macros.md
+++ /dev/null
@@ -1,89 +0,0 @@
-# Supported Macros
-
-Some aspects of the library can be configured by defining preprocessor macros before including the `json.hpp` header.
-
-## `JSON_ASSERT(x)`
-
-The default value is `#!cpp assert(x)`.
-
-## `JSON_CATCH_USER(exception)`
-
-This macro overrides `#!cpp catch` calls inside the library. The argument is the type of the exception to catch. As of version 3.8.0, the library only catches `std::out_of_range` exceptions internally to rethrow them as [`json::out_of_range`](../home/exceptions.md#out-of-range) exceptions. The macro is always followed by a scope.
-
-See [Switch off exceptions](../home/exceptions.md#switch-off-exceptions) for an example.
-
-## `JSON_DIAGNOSTICS`
-
-This macro enables extended diagnostics for exception messages. Possible values are `1` to enable or `0` to disable (default).
-
-When enabled, exception messages contain a [JSON Pointer](json_pointer.md) to the JSON value that triggered the exception, see [Extended diagnostic messages](../home/exceptions.md#extended-diagnostic-messages) for an example. Note that enabling this macro increases the size of every JSON value by one pointer and adds some runtime overhead.
-
-The diagnostics messages can also be controlled with the CMake option `JSON_Diagnostics` (`OFF` by default) which sets `JSON_DIAGNOSTICS` accordingly.
-
-## `JSON_NOEXCEPTION`
-
-Exceptions can be switched off by defining the symbol `JSON_NOEXCEPTION`.
-When defining `JSON_NOEXCEPTION`, `#!cpp try` is replaced by `#!cpp if (true)`, 
-`#!cpp catch` is replaced by `#!cpp if (false)`, and `#!cpp throw` is replaced by `#!cpp std::abort()`.
-
-The same effect is achieved by setting the compiler flag `-fno-exceptions`.
-
-## `JSON_SKIP_UNSUPPORTED_COMPILER_CHECK`
-
-When defined, the library will not create a compile error when a known unsupported compiler is detected. This allows to use the library with compilers that do not fully support C++11 and may only work if unsupported features are not used.
-
-## `JSON_THROW_USER(exception)`
-
-This macro overrides `#!cpp throw` calls inside the library. The argument is the exception to be thrown. Note that `JSON_THROW_USER` should leave the current scope (e.g., by throwing or aborting), as continuing after it may yield undefined behavior.
-
-See [Switch off exceptions](../home/exceptions.md#switch-off-exceptions) for an example.
-
-## `JSON_TRY_USER`
-
-This macro overrides `#!cpp try` calls inside the library. It has no arguments and is always followed by a scope.
-
-See [Switch off exceptions](../home/exceptions.md#switch-off-exceptions) for an example.
-
-## `JSON_USE_IMPLICIT_CONVERSIONS`
-
-When defined to `0`, implicit conversions are switched off. By default, implicit conversions are switched on.
-
-??? example
-
-    This is an example for an implicit conversion:
-    
-    ```cpp
-    json j = "Hello, world!";
-    std::string s = j;
-    ```
-    
-    When `JSON_USE_IMPLICIT_CONVERSIONS` is defined to `0`, the code above does no longer compile. Instead, it must be written like this:
-
-    ```cpp
-    json j = "Hello, world!";
-    auto s = j.get<std::string>();
-    ```
-
-Implicit conversions can also be controlled with the CMake option `JSON_ImplicitConversions` (`ON` by default) which sets `JSON_USE_IMPLICIT_CONVERSIONS` accordingly.
-
-## `NLOHMANN_DEFINE_TYPE_INTRUSIVE(type, member...)`
-
-This macro can be used to simplify the serialization/deserialization of types if (1) want to use a JSON object as serialization and (2) want to use the member variable names as object keys in that object.
-
-The macro is to be defined inside of the class/struct to create code for. Unlike [`NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE`](#nlohmann_define_type_non_intrusivetype-member), it can access private members.
-The first parameter is the name of the class/struct, and all remaining parameters name the members.
-
-See [Simplify your life with macros](arbitrary_types.md#simplify-your-life-with-macros) for an example.
-
-## `NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(type, member...)`
-
-This macro can be used to simplify the serialization/deserialization of types if (1) want to use a JSON object as serialization and (2) want to use the member variable names as object keys in that object.
-
-The macro is to be defined inside of the namespace of the class/struct to create code for. Private members cannot be accessed. Use [`NLOHMANN_DEFINE_TYPE_INTRUSIVE`](#nlohmann_define_type_intrusivetype-member) in these scenarios.
-The first parameter is the name of the class/struct, and all remaining parameters name the members.
-
-See [Simplify your life with macros](arbitrary_types.md#simplify-your-life-with-macros) for an example.
-
-## `NLOHMANN_JSON_SERIALIZE_ENUM(type, ...)`
-
-This macro simplifies the serialization/deserialization of enum types. See [Specializing enum conversion](enum_conversion.md) for more information.
diff --git a/external_imported/json/doc/mkdocs/docs/features/object_order.md b/external_imported/json/doc/mkdocs/docs/features/object_order.md
deleted file mode 100644
index 86bb253ba..000000000
--- a/external_imported/json/doc/mkdocs/docs/features/object_order.md
+++ /dev/null
@@ -1,67 +0,0 @@
-# Object Order
-
-The [JSON standard](https://tools.ietf.org/html/rfc8259.html) defines objects as "an unordered collection of zero or more name/value pairs". As such, an implementation does not need to preserve any specific order of object keys.
-
-The default type `nlohmann::json` uses a `std::map` to store JSON objects, and thus stores object keys **sorted alphabetically**.
-
-??? example
-
-    ```cpp
-    #include <iostream>
-    #include "json.hpp"
-    
-    using json = nlohmann::json;
-    
-    int main()
-    {
-        json j;
-        j["one"] = 1;
-        j["two"] = 2;
-        j["three"] = 3;
-        
-        std::cout << j.dump(2) << '\n';
-    }
-    ```
-    
-    Output:
-
-    ```json
-    {
-      "one": 1,
-      "three": 3,
-      "two": 2
-    }
-    ```
-
-If you do want to preserve the **insertion order**, you can try the type [`nlohmann::ordered_json`](https://github.com/nlohmann/json/issues/2179).
-
-??? example
-
-    ```cpp
-    #include <iostream>
-    #include <nlohmann/json.hpp>
-    
-    using ordered_json = nlohmann::ordered_json;
-    
-    int main()
-    {
-        ordered_json j;
-        j["one"] = 1;
-        j["two"] = 2;
-        j["three"] = 3;
-        
-        std::cout << j.dump(2) << '\n';
-    }
-    ```
-    
-    Output:
-    
-    ```json
-    {
-      "one": 1,
-      "two": 2,
-      "three": 3
-    }
-    ```
-
-Alternatively, you can use a more sophisticated ordered map like [`tsl::ordered_map`](https://github.com/Tessil/ordered-map) ([integration](https://github.com/nlohmann/json/issues/546#issuecomment-304447518)) or [`nlohmann::fifo_map`](https://github.com/nlohmann/fifo_map) ([integration](https://github.com/nlohmann/json/issues/485#issuecomment-333652309)).
diff --git a/external_imported/json/doc/mkdocs/docs/features/parsing/index.md b/external_imported/json/doc/mkdocs/docs/features/parsing/index.md
deleted file mode 100644
index 5cf59bfe9..000000000
--- a/external_imported/json/doc/mkdocs/docs/features/parsing/index.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Overview
-
-!!! note
-
-    This page is under construction.
-
-## Input
-
-## SAX vs. DOM parsing
-
-## Exceptions
-
-See [parsing and exceptions](parse_exceptions.md).
diff --git a/external_imported/json/doc/mkdocs/docs/features/parsing/parser_callbacks.md b/external_imported/json/doc/mkdocs/docs/features/parsing/parser_callbacks.md
deleted file mode 100644
index dbf88849f..000000000
--- a/external_imported/json/doc/mkdocs/docs/features/parsing/parser_callbacks.md
+++ /dev/null
@@ -1,79 +0,0 @@
-# Parser Callbacks
-
-## Overview
-
-With a parser callback function, the result of parsing a JSON text can be influenced. When passed to `parse`, it is called on certain events
-(passed as `parse_event_t` via parameter `event`) with a set recursion depth `depth` and context JSON value `parsed`. The return value of the
-callback function is a boolean indicating whether the element that emitted the callback shall be kept or not.
-
-The type of the callback function is:
-
-```cpp
-template<typename BasicJsonType>
-using parser_callback_t =
-    std::function<bool(int depth, parse_event_t event, BasicJsonType& parsed)>;
-```
-
-
-## Callback event types
-
-We distinguish six scenarios (determined by the event type) in which the callback function can be called. The following table describes the values
-of the parameters `depth`, `event`, and `parsed`.
-
-parameter `event` | description | parameter `depth` | parameter `parsed`
------------------- | ----------- | ------------------ | -------------------
-`parse_event_t::object_start` | the parser read `{` and started to process a JSON object | depth of the parent of the JSON object | a JSON value with type discarded
-`parse_event_t::key` | the parser read a key of a value in an object | depth of the currently parsed JSON object | a JSON string containing the key
-`parse_event_t::object_end` | the parser read `}` and finished processing a JSON object | depth of the parent of the JSON object | the parsed JSON object
-`parse_event_t::array_start` | the parser read `[` and started to process a JSON array | depth of the parent of the JSON array | a JSON value with type discarded
-`parse_event_t::array_end` | the parser read `]` and finished processing a JSON array | depth of the parent of the JSON array | the parsed JSON array
-`parse_event_t::value` | the parser finished reading a JSON value | depth of the value | the parsed JSON value
-
-??? example
-
-    When parsing the following JSON text,
-    
-    ```json
-    {
-        "name": "Berlin",
-        "location": [
-            52.519444,
-            13.406667
-        ]
-    }
-    ```
-    
-    these calls are made to the callback function:
-    
-    | event          | depth | parsed |
-    | -------------- | ----- | ------ |
-    | `object_start` | 0     | *discarded* |
-    | `key`          | 1     | `#!json "name"` |
-    | `value`        | 1     | `#!json "Berlin"` |
-    | `key`          | 1     | `#!json "location"` |
-    | `array_start`  | 1     | *discarded* |
-    | `value`        | 2     | `#!json 52.519444` |
-    | `value`        | 2     | `#!json 13.406667` |
-    | `array_end`    | 1     | `#!json [52.519444,13.406667]` |
-    | `object_end`   | 0     | `#!json {"location":[52.519444,13.406667],"name":"Berlin"}` |
-
-## Return value
-
-Discarding a value (i.e., returning `#!c false`) has different effects depending on the context in which function was called:
-
-- Discarded values in structured types are skipped. That is, the parser will behave as if the discarded value was never read.
-- In case a value outside a structured type is skipped, it is replaced with `#!json null`. This case happens if the top-level element is skipped.
-
-??? example
-
-    The example below demonstrates the `parse()` function with and without callback function.
-
-    ```cpp
-    --8<-- "examples/parse__string__parser_callback_t.cpp"
-    ```
-    
-    Output:
-
-    ```json
-    --8<-- "examples/parse__string__parser_callback_t.output"
-    ```
diff --git a/external_imported/json/doc/mkdocs/docs/features/types.md b/external_imported/json/doc/mkdocs/docs/features/types.md
deleted file mode 100644
index 94e40cbaf..000000000
--- a/external_imported/json/doc/mkdocs/docs/features/types.md
+++ /dev/null
@@ -1,267 +0,0 @@
-# Types
-
-This page gives an overview how JSON values are stored and how this can be configured.
-
-## Overview
-
-By default, JSON values are stored as follows:
-
-| JSON type | C++ type |
-| --------- | -------- |
-| object    | `std::map<std::string, basic_json>` |
-| array     | `std::vector<basic_json>` |
-| null      | `std::nullptr_t` |
-| string    | `std::string` |
-| boolean   | `bool` |
-| number    | `std::int64_t`, `std::uint64_t`, and `double` |
-
-Note there are three different types for numbers - when parsing JSON text, the best fitting type is chosen.
-
-## Storage
-
-```plantuml
-enum value_t {
-    null
-    object
-    array
-    string
-    boolean
-    number_integer
-    number_unsigned
-    number_float
-    binary
-    discarded
-}
-
-class json_value << (U,orchid) >> {
-    object_t* object
-    array_t* array
-    string_t* string
-    binary_t* binary
-    boolean_t boolean
-    number_integer_t number_integer
-    number_unsigned_t number_unsigned
-    number_float_t number_float
-}
-
-class basic_json {
-    -- type and value --
-    value_t m_type
-    json_value m_value
-    -- derived types --
-    + <u>typedef</u> object_t
-    + <u>typedef</u> array_t
-    + <u>typedef</u> binary_t
-    + <u>typedef</u> boolean_t
-    + <u>typedef</u> number_integer_t
-    + <u>typedef</u> number_unsigned_t
-    + <u>typedef</u> number_float_t
-}
-
-basic_json .. json_value
-basic_json .. value_t
-```
-
-## Template arguments
-
-The data types to store a JSON value are derived from the template arguments passed to class `basic_json`:
-
-```cpp
-template<
-    template<typename U, typename V, typename... Args> class ObjectType = std::map,
-    template<typename U, typename... Args> class ArrayType = std::vector,
-    class StringType = std::string,
-    class BooleanType = bool,
-    class NumberIntegerType = std::int64_t,
-    class NumberUnsignedType = std::uint64_t,
-    class NumberFloatType = double,
-    template<typename U> class AllocatorType = std::allocator,
-    template<typename T, typename SFINAE = void> class JSONSerializer = adl_serializer,
-    class BinaryType = std::vector<std::uint8_t>
->
-class basic_json;
-```
-
-Type `json` is an alias for `basic_json<>` and uses the default types.
-
-From the template arguments, the following types are derived:
-
-```cpp
-using object_comparator_t = std::less<>;
-using object_t = ObjectType<StringType, basic_json, object_comparator_t,
-                   AllocatorType<std::pair<const StringType, basic_json>>>;
-
-using array_t = ArrayType<basic_json, AllocatorType<basic_json>>;
-
-using string_t = StringType;
-
-using boolean_t = BooleanType;
-
-using number_integer_t = NumberIntegerType;
-using number_unsigned_t = NumberUnsignedType;
-using number_float_t = NumberFloatType;
-
-using binary_t = nlohmann::byte_container_with_subtype<BinaryType>;
-```
-
-
-## Objects
-
-[RFC 7159](http://rfc7159.net/rfc7159) describes JSON objects as follows:
-
-> An object is an unordered collection of zero or more name/value pairs, where a name is a string and a value is a string, number, boolean, null, object, or array.
-
-### Default type
-
-With the default values for *ObjectType* (`std::map`), *StringType* (`std::string`), and *AllocatorType* (`std::allocator`), the default value for `object_t` is:
-
-```cpp
-std::map<
-  std::string, // key_type
-  basic_json, // value_type
-  std::less<>, // key_compare
-  std::allocator<std::pair<const std::string, basic_json>> // allocator_type
->
-```
-
-### Behavior
-
-The choice of `object_t` influences the behavior of the JSON class. With the default type, objects have the following behavior:
-
-- When all names are unique, objects will be interoperable in the sense that all software implementations receiving that object will agree on the name-value mappings.
-- When the names within an object are not unique, it is unspecified which one of the values for a given key will be chosen. For instance, `#!json {"key": 2, "key": 1}` could be equal to either `#!json {"key": 1}` or `#!json {"key": 2}`.
-- Internally, name/value pairs are stored in lexicographical order of the names. Objects will also be serialized (see `dump`) in this order. For instance, both `#!json {"b": 1, "a": 2}` and `#!json {"a": 2, "b": 1}` will be stored and serialized as `#!json {"a": 2, "b": 1}`.
-- When comparing objects, the order of the name/value pairs is irrelevant. This makes objects interoperable in the sense that they will not be affected by these differences. For instance, `#!json {"b": 1, "a": 2}` and `#!json {"a": 2, "b": 1}` will be treated as equal.
-
-### Key order
-
-The order name/value pairs are added to the object is *not* preserved by the library. Therefore, iterating an object may return name/value pairs in a different order than they were originally stored. In fact, keys will be traversed in alphabetical order as `std::map` with `std::less` is used by default. Please note this behavior conforms to [RFC 7159](http://rfc7159.net/rfc7159), because any order implements the specified "unordered" nature of JSON objects.
-
-### Limits
-
-[RFC 7159](http://rfc7159.net/rfc7159) specifies:
-
-> An implementation may set limits on the maximum depth of nesting.
-
-In this class, the object's limit of nesting is not explicitly constrained. However, a maximum depth of nesting may be introduced by the compiler or runtime environment. A theoretical limit can be queried by calling the `max_size` function of a JSON object.
-
-### Storage
-
-Objects are stored as pointers in a `basic_json` type. That is, for any access to object values, a pointer of type `object_t*` must be dereferenced.
-
-
-## Arrays
-
-[RFC 7159](http://rfc7159.net/rfc7159) describes JSON arrays as follows:
-
-> An array is an ordered sequence of zero or more values.
-
-### Default type
-
-With the default values for *ArrayType* (`std::vector`) and *AllocatorType* (`std::allocator`), the default value for `array_t` is:
-
-```cpp
-std::vector<
-  basic_json, // value_type
-  std::allocator<basic_json> // allocator_type
->
-```
-
-### Limits
-
-[RFC 7159](http://rfc7159.net/rfc7159) specifies:
-
-> An implementation may set limits on the maximum depth of nesting.
-
-In this class, the array's limit of nesting is not explicitly constrained. However, a maximum depth of nesting may be introduced by the compiler or runtime environment. A theoretical limit can be queried by calling the `max_size` function of a JSON array.
-
-### Storage
-
-Arrays are stored as pointers in a `basic_json` type. That is, for any access to array values, a pointer of type `array_t*` must be dereferenced.
-
-
-## Strings
-
-[RFC 7159](http://rfc7159.net/rfc7159) describes JSON strings as follows:
-
-> A string is a sequence of zero or more Unicode characters.
-
-Unicode values are split by the JSON class into byte-sized characters during deserialization.
-
-### Default type
-
-With the default values for *StringType* (`std::string`), the default value for `string_t` is `#!cpp std::string`.
-
-### Encoding
-
-Strings are stored in UTF-8 encoding. Therefore, functions like `std::string::size()` or `std::string::length()` return the number of **bytes** in the string rather than the number of characters or glyphs.
-
-### String comparison
-
-[RFC 7159](http://rfc7159.net/rfc7159) states:
-
-> Software implementations are typically required to test names of object members for equality. Implementations that transform the textual representation into sequences of Unicode code units and then perform the comparison numerically, code unit by code unit, are interoperable in the sense that implementations will agree in all cases on equality or inequality of two strings. For example, implementations that compare strings with escaped characters unconverted may incorrectly find that `"a\\b"` and `"a\u005Cb"` are not equal.
-
-This implementation is interoperable as it does compare strings code unit by code unit.
-
-### Storage
-
-String values are stored as pointers in a `basic_json` type. That is, for any access to string values, a pointer of type `string_t*` must be dereferenced.
-
-
-## Booleans
-
-[RFC 7159](http://rfc7159.net/rfc7159) implicitly describes a boolean as a type which differentiates the two literals `true` and `false`.
-
-### Default type
-
-With the default values for *BooleanType* (`#!cpp bool`), the default value for `boolean_t` is `#!cpp bool`.
-
-### Storage
-
-Boolean values are stored directly inside a `basic_json` type.
-
-## Numbers
-
-[RFC 7159](http://rfc7159.net/rfc7159) describes numbers as follows:
-
-> The representation of numbers is similar to that used in most programming languages. A number is represented in base 10 using decimal digits. It contains an integer component that may be prefixed with an optional minus sign, which may be followed by a fraction part and/or an exponent part. Leading zeros are not allowed. (...) Numeric values that cannot be represented in the grammar below (such as Infinity and NaN) are not permitted.
-
-This description includes both integer and floating-point numbers. However, C++ allows more precise storage if it is known whether the number is a signed integer, an unsigned integer or a floating-point number. Therefore, three different types, `number_integer_t`, `number_unsigned_t`, and `number_float_t` are used.
-
-### Default types
-
-With the default values for *NumberIntegerType* (`std::int64_t`), the default value for `number_integer_t` is `std::int64_t`.
-With the default values for *NumberUnsignedType* (`std::uint64_t`), the default value for `number_unsigned_t` is `std::uint64_t`.
-With the default values for *NumberFloatType* (`#!cpp double`), the default value for `number_float_t` is `#!cpp double`.
-
-### Default behavior
-
-- The restrictions about leading zeros is not enforced in C++. Instead, leading zeros in integer literals lead to an interpretation as octal number. Internally, the value will be stored as decimal number. For instance, the C++ integer literal `#!c 010` will be serialized to `#!c 8`. During deserialization, leading zeros yield an error.
-- Not-a-number (NaN) values will be serialized to `#!json null`.
-
-### Limits
-
-[RFC 7159](http://rfc7159.net/rfc7159) specifies:
-
-> An implementation may set limits on the range and precision of numbers.
-
-When the default type is used, the maximal integer number that can be stored is `#!c 9223372036854775807` (`INT64_MAX`) and the minimal integer number that can be stored is `#!c -9223372036854775808` (`INT64_MIN`). Integer numbers that are out of range will yield over/underflow when used in a constructor. During deserialization, too large or small integer numbers will be automatically be stored as `number_unsigned_t` or `number_float_t`.
-
-When the default type is used, the maximal unsigned integer number that can be stored is `#!c 18446744073709551615` (`UINT64_MAX`) and the minimal integer number that can be stored is `#!c 0`. Integer numbers that are out of range will yield over/underflow when used in a constructor. During deserialization, too large or small integer numbers will be automatically be stored as `number_integer_t` or `number_float_t`.
-
-[RFC 7159](http://rfc7159.net/rfc7159) further states:
-
-> Note that when such software is used, numbers that are integers and are in the range $[-2^{53}+1, 2^{53}-1]$ are interoperable in the sense that implementations will agree exactly on their numeric values.
-
-As this range is a subrange of the exactly supported range [`INT64_MIN`, `INT64_MAX`], this class's integer type is interoperable.
-
-[RFC 7159](http://rfc7159.net/rfc7159) states:
-
-> This specification allows implementations to set limits on the range and precision of numbers accepted. Since software that implements IEEE 754-2008 binary64 (double precision) numbers is generally available and widely used, good interoperability can be achieved by implementations that expect no more precision or range than these provide, in the sense that implementations will approximate JSON numbers within the expected precision.
-
-This implementation does exactly follow this approach, as it uses double precision floating-point numbers. Note values smaller than `#!c -1.79769313486232e+308` and values greater than `#!c 1.79769313486232e+308` will be stored as NaN internally and be serialized to `#!json null`.
-
-### Storage
-
-Integer number values, unsigned integer number values, and floating-point number values are stored directly inside a `basic_json` type.
diff --git a/external_imported/json/doc/mkdocs/docs/home/faq.md b/external_imported/json/doc/mkdocs/docs/home/faq.md
deleted file mode 100644
index af63cfb6a..000000000
--- a/external_imported/json/doc/mkdocs/docs/home/faq.md
+++ /dev/null
@@ -1,91 +0,0 @@
-# Frequently Asked Questions (FAQ)
-
-## Limitations
-
-### Relaxed parsing
-
-!!! question
-
-	- Can you add an option to ignore trailing commas?
-
-For the same reason this library does not support [comments](#comments), this library also does not support any feature which would jeopardize interoperability.
-
-
-### Parse errors reading non-ASCII characters
-
-!!! question "Questions"
-
-	- Why is the parser complaining about a Chinese character?
-	- Does the library support Unicode?
-	- I get an exception `[json.exception.parse_error.101] parse error at line 1, column 53: syntax error while parsing value - invalid string: ill-formed UTF-8 byte; last read: '"Testé$')"`
-
-The library supports **Unicode input** as follows:
-
-- Only **UTF-8** encoded input is supported which is the default encoding for JSON according to [RFC 8259](https://tools.ietf.org/html/rfc8259.html#section-8.1).
-- `std::u16string` and `std::u32string` can be parsed, assuming UTF-16 and UTF-32 encoding, respectively. These encodings are not supported when reading from files or other input containers.
-- Other encodings such as Latin-1 or ISO 8859-1 are **not** supported and will yield parse or serialization errors.
-- [Unicode noncharacters](http://www.unicode.org/faq/private_use.html#nonchar1) will not be replaced by the library.
-- Invalid surrogates (e.g., incomplete pairs such as `\uDEAD`) will yield parse errors.
-- The strings stored in the library are UTF-8 encoded. When using the default string type (`std::string`), note that its length/size functions return the number of stored bytes rather than the number of characters or glyphs.
-- When you store strings with different encodings in the library, calling [`dump()`](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_a50ec80b02d0f3f51130d4abb5d1cfdc5.html#a50ec80b02d0f3f51130d4abb5d1cfdc5) may throw an exception unless `json::error_handler_t::replace` or `json::error_handler_t::ignore` are used as error handlers.
-
-In most cases, the parser is right to complain, because the input is not UTF-8 encoded. This is especially true for Microsoft Windows where Latin-1 or ISO 8859-1 is often the standard encoding.
-
-
-### Key name in exceptions
-
-!!! question
-
-	Can I get the key of the object item that caused an exception?
-
-No, this is not possible. See <https://github.com/nlohmann/json/issues/932> for a longer discussion.
-
-
-## Serialization issues
-
-
-### Number precision
-
-!!! question
-
-	- It seems that precision is lost when serializing a double.
-	- Can I change the precision for floating-point serialization?
-
-The library uses `std::numeric_limits<number_float_t>::digits10` (15 for IEEE `double`s) digits for serialization. This value is sufficient to guarantee roundtripping. If one uses more than this number of digits of precision, then string -> value -> string is not guaranteed to round-trip.
-
-!!! quote "[cppreference.com](https://en.cppreference.com/w/cpp/types/numeric_limits/digits10)"
-
-	The value of `std::numeric_limits<T>::digits10` is the number of base-10 digits that can be represented by the type T without change, that is, any number with this many significant decimal digits can be converted to a value of type T and back to decimal form, without change due to rounding or overflow. 
-
-!!! tip
-
-	The website https://float.exposed gives a good insight into the internal storage of floating-point numbers.
-
-
-## Compilation issues
-
-### Android SDK
-
-!!! question
-
-	Why does the code not compile with Android SDK?
-
-Android defaults to using very old compilers and C++ libraries. To fix this, add the following to your `Application.mk`. This will switch to the LLVM C++ library, the Clang compiler, and enable C++11 and other features disabled by default.
-
-```ini
-APP_STL := c++_shared
-NDK_TOOLCHAIN_VERSION := clang3.6
-APP_CPPFLAGS += -frtti -fexceptions
-```
-
-The code compiles successfully with [Android NDK](https://developer.android.com/ndk/index.html?hl=ml), Revision 9 - 11 (and possibly later) and [CrystaX's Android NDK](https://www.crystax.net/en/android/ndk) version 10.
-
-
-### Missing STL function
-
-!!! question "Questions"
-
-	- Why do I get a compilation error `'to_string' is not a member of 'std'` (or similarly, for `strtod` or `strtof`)?
-	- Why does the code not compile with MinGW or Android SDK?
-
-This is not an issue with the code,  but rather with the compiler itself. On Android, see above to build with a newer environment.  For MinGW, please refer to [this site](http://tehsausage.com/mingw-to-string) and [this discussion](https://github.com/nlohmann/json/issues/136) for information on how to fix this bug. For Android NDK using `APP_STL := gnustl_static`, please refer to [this discussion](https://github.com/nlohmann/json/issues/219).
diff --git a/external_imported/json/doc/mkdocs/docs/home/sponsors.md b/external_imported/json/doc/mkdocs/docs/home/sponsors.md
deleted file mode 100644
index e2c5d91f8..000000000
--- a/external_imported/json/doc/mkdocs/docs/home/sponsors.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Sponsors
-
-You can sponsor this library at [GitHub Sponsors](https://github.com/sponsors/nlohmann).
-
-## Named Sponsors
-
-- [Michael Hartmann](https://github.com/reFX-Mike)
-- [Stefan Hagen](https://github.com/sthagen)
-- [Steve Sperandeo](https://github.com/homer6)
-
-Thanks everyone!
diff --git a/external_imported/json/doc/mkdocs/docs/hooks.py b/external_imported/json/doc/mkdocs/docs/hooks.py
deleted file mode 100644
index 8fee83973..000000000
--- a/external_imported/json/doc/mkdocs/docs/hooks.py
+++ /dev/null
@@ -1,10 +0,0 @@
-import shutil
-import os.path
-
-
-def copy_doxygen(*args, **kwargs):
-    doxygen_dir = os.path.join(kwargs['config']['site_dir'], 'doxygen')
-    if not os.path.isdir(doxygen_dir) or not os.listdir(doxygen_dir):
-        print('Copy Doxygen files...')
-        shutil.copytree('../html', doxygen_dir)
-        print('Copy Doxygen complete')
diff --git a/external_imported/json/doc/mkdocs/docs/index.md b/external_imported/json/doc/mkdocs/docs/index.md
deleted file mode 100644
index 39c52d748..000000000
--- a/external_imported/json/doc/mkdocs/docs/index.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# JSON for Modern C++
-
-!!! note
-    
-    This page is under construction.
-
-![](images/json.gif)
diff --git a/external_imported/json/doc/mkdocs/docs/integration/cmake.md b/external_imported/json/doc/mkdocs/docs/integration/cmake.md
deleted file mode 100644
index 76f05dbe1..000000000
--- a/external_imported/json/doc/mkdocs/docs/integration/cmake.md
+++ /dev/null
@@ -1,103 +0,0 @@
-# CMake
-
-You can also use the `nlohmann_json::nlohmann_json` interface target in CMake.  This target populates the appropriate usage requirements for `INTERFACE_INCLUDE_DIRECTORIES` to point to the appropriate include directories and `INTERFACE_COMPILE_FEATURES` for the necessary C++11 flags.
-
-## External
-
-To use this library from a CMake project, you can locate it directly with `find_package()` and use the namespaced imported target from the generated package configuration:
-
-```cmake
-# CMakeLists.txt
-find_package(nlohmann_json 3.2.0 REQUIRED)
-...
-add_library(foo ...)
-...
-target_link_libraries(foo PRIVATE nlohmann_json::nlohmann_json)
-```
-
-The package configuration file, `nlohmann_jsonConfig.cmake`, can be used either from an install tree or directly out of the build tree.
-
-## Embedded
-
-To embed the library directly into an existing CMake project, place the entire source tree in a subdirectory and call `add_subdirectory()` in your `CMakeLists.txt` file:
-
-```cmake
-# Typically you don't care so much for a third party library's tests to be
-# run from your own project's code.
-set(JSON_BuildTests OFF CACHE INTERNAL "")
-
-# If you only include this third party in PRIVATE source files, you do not
-# need to install it when your main project gets installed.
-# set(JSON_Install OFF CACHE INTERNAL "")
-
-# Don't use include(nlohmann_json/CMakeLists.txt) since that carries with it
-# unintended consequences that will break the build.  It's generally
-# discouraged (although not necessarily well documented as such) to use
-# include(...) for pulling in other CMake projects anyways.
-add_subdirectory(nlohmann_json)
-...
-add_library(foo ...)
-...
-target_link_libraries(foo PRIVATE nlohmann_json::nlohmann_json)
-```
-
-## Embedded (FetchContent)
-
-Since CMake v3.11,
-[FetchContent](https://cmake.org/cmake/help/v3.11/module/FetchContent.html) can
-be used to automatically download the repository as a dependency at configure type.
-
-Example:
-```cmake
-include(FetchContent)
-
-FetchContent_Declare(json
-  GIT_REPOSITORY https://github.com/nlohmann/json
-  GIT_TAG v3.7.3)
-
-FetchContent_GetProperties(json)
-if(NOT json_POPULATED)
-  FetchContent_Populate(json)
-  add_subdirectory(${json_SOURCE_DIR} ${json_BINARY_DIR} EXCLUDE_FROM_ALL)
-endif()
-
-target_link_libraries(foo PRIVATE nlohmann_json::nlohmann_json)
-```
-
-!!! Note
-	The repository <https://github.com/nlohmann/json> download size is huge.
-	It contains all the dataset used for the benchmarks. You might want to depend on
-	a smaller repository. For instance, you might want to replace the URL above by
-	<https://github.com/ArthurSonzogni/nlohmann_json_cmake_fetchcontent>.
-
-## Supporting Both
-
-To allow your project to support either an externally supplied or an embedded JSON library, you can use a pattern akin to the following:
-
-``` cmake
-# Top level CMakeLists.txt
-project(FOO)
-...
-option(FOO_USE_EXTERNAL_JSON "Use an external JSON library" OFF)
-...
-add_subdirectory(thirdparty)
-...
-add_library(foo ...)
-...
-# Note that the namespaced target will always be available regardless of the
-# import method
-target_link_libraries(foo PRIVATE nlohmann_json::nlohmann_json)
-```
-```cmake
-# thirdparty/CMakeLists.txt
-...
-if(FOO_USE_EXTERNAL_JSON)
-  find_package(nlohmann_json 3.2.0 REQUIRED)
-else()
-  set(JSON_BuildTests OFF CACHE INTERNAL "")
-  add_subdirectory(nlohmann_json)
-endif()
-...
-```
-
-`thirdparty/nlohmann_json` is then a complete copy of this source tree.
diff --git a/external_imported/json/doc/mkdocs/docs/integration/index.md b/external_imported/json/doc/mkdocs/docs/integration/index.md
deleted file mode 100644
index 5dd8cceb7..000000000
--- a/external_imported/json/doc/mkdocs/docs/integration/index.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Integration
-
-[`json.hpp`](https://github.com/nlohmann/json/blob/develop/single_include/nlohmann/json.hpp) is the single required file in `single_include/nlohmann` or [released here](https://github.com/nlohmann/json/releases). You need to add
-
-```cpp
-#include <nlohmann/json.hpp>
-
-// for convenience
-using json = nlohmann::json;
-```
-
-to the files you want to process JSON and set the necessary switches to enable C++11 (e.g., `-std=c++11` for GCC and Clang).
-
-You can further use file [`include/nlohmann/json_fwd.hpp`](https://github.com/nlohmann/json/blob/develop/include/nlohmann/json_fwd.hpp) for forward-declarations. The installation of json_fwd.hpp (as part of cmake's install step), can be achieved by setting `-DJSON_MultipleHeaders=ON`.
diff --git a/external_imported/json/doc/mkdocs/docs/integration/package_managers.md b/external_imported/json/doc/mkdocs/docs/integration/package_managers.md
deleted file mode 100644
index 58b3eab55..000000000
--- a/external_imported/json/doc/mkdocs/docs/integration/package_managers.md
+++ /dev/null
@@ -1,143 +0,0 @@
-# Package Managers
-
-Throughout this page, we will describe how to compile the example file `example.cpp` below.
-
-```cpp
---8<-- "integration/example.cpp"
-```
-
-## Homebrew
-
-If you are using OS X and [Homebrew](http://brew.sh), just type
-
-```sh
-brew tap nlohmann/json
-brew install nlohmann-json
-```
-
-and you're set. If you want the bleeding edge rather than the latest release, use
-
-```sh
-brew tap nlohmann/json
-brew install nlohmann-json --HEAD
-```
-
-instead.
-
-!!! example
-
-	1. Create the following file:
-
-		=== "example.cpp"
-
-			```cpp
-			--8<-- "integration/example.cpp"
-			```
-
-	2. Install the package
-
-		```sh
-		brew tap nlohmann/json
-		brew install nlohmann-json
-		```
-
-	3. Determine the include path, which defaults to `/usr/local/Cellar/nlohmann-json/$version/include`, where `$version` is the version of the library, e.g. `3.7.3`. The path of the library can be determined with
-
-		```sh
-		brew list nlohmann-json
-		```
-
-	4. Compile the code. For instance, the code can be compiled using Clang with
-
-		```sh
-		clang++ example.cpp -I/usr/local/Cellar/nlohmann-json/3.7.3/include -std=c++11 -o example
-		```
-
-## Meson
-
-If you are using the [Meson Build System](http://mesonbuild.com), add this source tree as a [meson subproject](https://mesonbuild.com/Subprojects.html#using-a-subproject). You may also use the `include.zip` published in this project's [Releases](https://github.com/nlohmann/json/releases) to reduce the size of the vendored source tree. Alternatively, you can get a wrap file by downloading it from [Meson WrapDB](https://wrapdb.mesonbuild.com/nlohmann_json), or simply use `meson wrap install nlohmann_json`. Please see the meson project for any issues regarding the packaging.
-
-The provided meson.build can also be used as an alternative to cmake for installing `nlohmann_json` system-wide in which case a pkg-config file is installed. To use it, simply have your build system require the `nlohmann_json` pkg-config dependency. In Meson, it is preferred to use the [`dependency()`](https://mesonbuild.com/Reference-manual.html#dependency) object with a subproject fallback, rather than using the subproject directly.
-
-## Conan
-
-If you are using [Conan](https://www.conan.io/) to manage your dependencies, merely add `nlohmann_json/x.y.z` to your `conanfile`'s requires, where `x.y.z` is the release version you want to use. Please file issues [here](https://github.com/conan-io/conan-center-index/issues) if you experience problems with the packages.
-
-!!! example
-
-	1. Create the following files:
-
-		=== "Conanfile.txt"
-			
-			```ini
-			--8<-- "integration/conan/Conanfile.txt"
-			```
-
-		=== "CMakeLists.txt"
-
-		    ```cmake
-			--8<-- "integration/conan/CMakeLists.txt"
-		    ```
-
-		=== "example.cpp"
-
-			```cpp
-			--8<-- "integration/conan/example.cpp"
-			```
-
-
-	2. Build:
-
-		```sh
-		mkdir build
-		cd build
-		conan install ..
-		cmake ..
-		cmake --build .
-		```
-
-## Spack
-
-If you are using [Spack](https://www.spack.io/) to manage your dependencies, you can use the [`nlohmann-json` package](https://spack.readthedocs.io/en/latest/package_list.html#nlohmann-json). Please see the [spack project](https://github.com/spack/spack) for any issues regarding the packaging.
-
-## Hunter
-
-If you are using [hunter](https://github.com/cpp-pm/hunter) on your project for external dependencies, then you can use the [nlohmann_json package](https://hunter.readthedocs.io/en/latest/packages/pkg/nlohmann_json.html). Please see the hunter project for any issues regarding the packaging.
-
-## Buckaroo
-
-If you are using [Buckaroo](https://buckaroo.pm), you can install this library's module with `buckaroo add github.com/buckaroo-pm/nlohmann-json`. Please file issues [here](https://github.com/buckaroo-pm/nlohmann-json). There is a demo repo [here](https://github.com/njlr/buckaroo-nholmann-json-example).
-
-## vcpkg
-
-If you are using [vcpkg](https://github.com/Microsoft/vcpkg/) on your project for external dependencies, then you can use the [nlohmann-json package](https://github.com/Microsoft/vcpkg/tree/master/ports/nlohmann-json). Please see the vcpkg project for any issues regarding the packaging.
-
-## cget
-
-If you are using [cget](http://cget.readthedocs.io/en/latest/), you can install the latest development version with `cget install nlohmann/json`. A specific version can be installed with `cget install nlohmann/json@v3.1.0`. Also, the multiple header version can be installed by adding the `-DJSON_MultipleHeaders=ON` flag (i.e., `cget install nlohmann/json -DJSON_MultipleHeaders=ON`).
-
-
-## CocoaPods
-
-If you are using [CocoaPods](https://cocoapods.org), you can use the library by adding pod `"nlohmann_json", '~>3.1.2'` to your podfile (see [an example](https://bitbucket.org/benman/nlohmann_json-cocoapod/src/master/)). Please file issues [here](https://bitbucket.org/benman/nlohmann_json-cocoapod/issues?status=new&status=open).
-
-## NuGet
-
-If you are using [NuGet](https://www.nuget.org), you can use the package [nlohmann.json](https://www.nuget.org/packages/nlohmann.json/). Please check [this extensive description](https://github.com/nlohmann/json/issues/1132#issuecomment-452250255) on how to use the package. Please files issues [here](https://github.com/hnkb/nlohmann-json-nuget/issues).
-
-## Conda
-
-If you are using [conda](https://conda.io/), you can use the package [nlohmann_json](https://github.com/conda-forge/nlohmann_json-feedstock) from [conda-forge](https://conda-forge.org) executing `conda install -c conda-forge nlohmann_json`. Please file issues [here](https://github.com/conda-forge/nlohmann_json-feedstock/issues).
-
-## MSYS2
-
-If you are using [MSYS2](http://www.msys2.org/), your can use the [mingw-w64-nlohmann-json](https://packages.msys2.org/base/mingw-w64-nlohmann-json) package, just type `pacman -S mingw-w64-i686-nlohmann-json` or `pacman -S mingw-w64-x86_64-nlohmann-json` for installation. Please file issues [here](https://github.com/msys2/MINGW-packages/issues/new?title=%5Bnlohmann-json%5D) if you experience problems with the packages.
-
-## build2
-
-If you are using [`build2`](https://build2.org), you can use the [`nlohmann-json`](https://cppget.org/nlohmann-json) package from the public repository http://cppget.org or directly from the [package's sources repository](https://github.com/build2-packaging/nlohmann-json). In your project's `manifest` file, just add `depends: nlohmann-json` (probably with some [version constraints](https://build2.org/build2-toolchain/doc/build2-toolchain-intro.xhtml#guide-add-remove-deps)). If you are not familiar with using dependencies in `build2`, [please read this introduction](https://build2.org/build2-toolchain/doc/build2-toolchain-intro.xhtml).
-Please file issues [here](https://github.com/build2-packaging/nlohmann-json) if you experience problems with the packages.
-
-## wsjcpp
-
-If you are using [`wsjcpp`](http://wsjcpp.org), you can use the command `wsjcpp install "https://github.com/nlohmann/json:develop"` to get the latest version. Note you can change the branch ":develop" to an existing tag or another branch.
diff --git a/external_imported/json/doc/mkdocs/mkdocs.yml b/external_imported/json/doc/mkdocs/mkdocs.yml
deleted file mode 100644
index e1552d39b..000000000
--- a/external_imported/json/doc/mkdocs/mkdocs.yml
+++ /dev/null
@@ -1,242 +0,0 @@
-# Project information
-site_name: JSON for Modern C++
-site_author: Niels Lohmann
-site_url: https://json.nlohmann.me/
-
-# Repository
-repo_name: nlohmann/json
-repo_url: https://github.com/nlohmann/json
-edit_uri: edit/develop/doc/mkdocs/docs
-
-# Copyright
-copyright: Copyright &copy; 2013 - 2020 Niels Lohmann
-
-# Configuration
-theme:
-  name: material
-  language: en
-  palette:
-    primary: indigo
-    accent: indigo
-  font:
-    text: Roboto
-    code: Roboto Mono
-  features:
-    - tabs
-    - instant
-
-nav:
-  - Home:
-    - index.md
-    - home/license.md
-    - "Code of Conduct": home/code_of_conduct.md
-    - "FAQ": home/faq.md
-    - home/exceptions.md
-    - home/releases.md
-    - home/design_goals.md
-    - home/sponsors.md
-  - Features:
-    - features/arbitrary_types.md
-    - Binary Formats:
-      - features/binary_formats/index.md
-      - features/binary_formats/bson.md
-      - features/binary_formats/cbor.md
-      - features/binary_formats/messagepack.md
-      - features/binary_formats/ubjson.md
-    - features/binary_values.md
-    - features/comments.md
-    - Element Access:
-      - features/element_access/index.md
-      - features/element_access/unchecked_access.md
-      - features/element_access/checked_access.md
-      - features/element_access/default_value.md
-    - features/iterators.md
-    - features/json_pointer.md
-    - features/json_patch.md
-    - features/merge_patch.md
-    - features/object_order.md
-    - Parsing:
-        - features/parsing/index.md
-        - features/parsing/parse_exceptions.md
-        - features/parsing/parser_callbacks.md
-        - features/parsing/sax_interface.md
-    - features/enum_conversion.md
-    - features/macros.md
-    - features/types.md
-  - Integration:
-    - integration/index.md
-    - integration/cmake.md
-    - integration/package_managers.md
-  - Doxygen:
-    - doxygen/index.html
-  - API:
-      - basic_json:
-        - api/basic_json/index.md
-        - api/basic_json/accept.md
-        - api/basic_json/array.md
-        - api/basic_json/array_t.md
-        - api/basic_json/at.md
-        - api/basic_json/back.md
-        - api/basic_json/basic_json.md
-        - api/basic_json/~basic_json.md
-        - api/basic_json/begin.md
-        - api/basic_json/binary.md
-        - api/basic_json/binary_t.md
-        - api/basic_json/boolean_t.md
-        - api/basic_json/cbegin.md
-        - api/basic_json/cbor_tag_handler_t.md
-        - api/basic_json/cend.md
-        - api/basic_json/clear.md
-        - api/basic_json/contains.md
-        - api/basic_json/count.md
-        - api/basic_json/crbegin.md
-        - api/basic_json/crend.md
-        - api/basic_json/diff.md
-        - api/basic_json/dump.md
-        - api/basic_json/emplace.md
-        - api/basic_json/emplace_back.md
-        - api/basic_json/empty.md
-        - api/basic_json/end.md
-        - api/basic_json/erase.md
-        - api/basic_json/error_handler_t.md
-        - api/basic_json/exception.md
-        - api/basic_json/find.md
-        - api/basic_json/flatten.md
-        - api/basic_json/from_bson.md
-        - api/basic_json/from_cbor.md
-        - api/basic_json/from_msgpack.md
-        - api/basic_json/from_ubjson.md
-        - api/basic_json/front.md
-        - api/basic_json/get.md
-        - api/basic_json/get_allocator.md
-        - api/basic_json/get_binary.md
-        - api/basic_json/get_ptr.md
-        - api/basic_json/get_ref.md
-        - api/basic_json/get_to.md
-        - api/basic_json/input_format_t.md
-        - api/basic_json/insert.md
-        - api/basic_json/invalid_iterator.md
-        - api/basic_json/is_array.md
-        - api/basic_json/is_binary.md
-        - api/basic_json/is_boolean.md
-        - api/basic_json/is_discarded.md
-        - api/basic_json/is_null.md
-        - api/basic_json/is_number.md
-        - api/basic_json/is_number_float.md
-        - api/basic_json/is_number_integer.md
-        - api/basic_json/is_number_unsigned.md
-        - api/basic_json/is_object.md
-        - api/basic_json/is_primitive.md
-        - api/basic_json/is_string.md
-        - api/basic_json/is_structured.md
-        - api/basic_json/items.md
-        - api/basic_json/json_serializer.md
-        - api/basic_json/max_size.md
-        - api/basic_json/meta.md
-        - api/basic_json/merge_patch.md
-        - api/basic_json/number_float_t.md
-        - api/basic_json/number_integer_t.md
-        - api/basic_json/number_unsigned_t.md
-        - api/basic_json/object.md
-        - api/basic_json/object_comparator_t.md
-        - api/basic_json/object_t.md
-        - api/basic_json/operator_ValueType.md
-        - api/basic_json/operator_value_t.md
-        - api/basic_json/operator[].md
-        - api/basic_json/operator=.md
-        - api/basic_json/operator_eq.md
-        - api/basic_json/operator_ne.md
-        - api/basic_json/operator_lt.md
-        - api/basic_json/operator_le.md
-        - api/basic_json/operator_gt.md
-        - api/basic_json/operator_ge.md
-        - api/basic_json/operator+=.md
-        - api/basic_json/operator_literal_json.md
-        - api/basic_json/operator_literal_json_pointer.md
-        - api/basic_json/out_of_range.md
-        - api/basic_json/other_error.md
-        - api/basic_json/parse.md
-        - api/basic_json/parse_error.md
-        - api/basic_json/parse_event_t.md
-        - api/basic_json/parser_callback_t.md
-        - api/basic_json/patch.md
-        - api/basic_json/push_back.md
-        - api/basic_json/rbegin.md
-        - api/basic_json/rend.md
-        - api/basic_json/sax_parse.md
-        - api/basic_json/size.md
-        - api/basic_json/string_t.md
-        - api/basic_json/to_bson.md
-        - api/basic_json/to_cbor.md
-        - api/basic_json/to_msgpack.md
-        - api/basic_json/to_ubjson.md
-        - api/basic_json/type.md
-        - api/basic_json/type_error.md
-        - api/basic_json/type_name.md
-        - api/basic_json/unflatten.md
-        - api/basic_json/update.md
-        - api/basic_json/value.md
-        - api/basic_json/value_t.md
-      - api/adl_serializer.md
-      - api/json.md
-      - api/json_pointer.md
-      - api/ordered_map.md
-      - api/ordered_json.md
-
-# Extras
-extra:
-  social:
-    - icon: fontawesome/brands/github
-      link: https://github.com/nlohmann
-    - icon: fontawesome/brands/twitter
-      link: https://twitter.com/nlohmann
-    - icon: fontawesome/brands/linkedin
-      link: https://www.linkedin.com/in/nielslohmann/
-    - icon: fontawesome/brands/xing
-      link: https://www.xing.com/profile/Niels_Lohmann
-    - icon: fontawesome/brands/paypal
-      link: https://www.paypal.me/nlohmann
-
-# Extensions
-markdown_extensions:
-  - admonition
-  - def_list
-  - codehilite:
-      guess_lang: false
-  - toc:
-      permalink: true
-  - pymdownx.arithmatex
-  - pymdownx.betterem:
-      smart_enable: all
-  - pymdownx.caret
-  - pymdownx.critic
-  - pymdownx.details
-  - pymdownx.emoji:
-      emoji_index: !!python/name:materialx.emoji.twemoji
-      emoji_generator: !!python/name:materialx.emoji.to_svg
-  - pymdownx.inlinehilite
-  - pymdownx.magiclink
-  - pymdownx.mark
-  #- pymdownx.smartsymbols
-  - pymdownx.superfences
-  - pymdownx.tasklist:
-      custom_checkbox: true
-  - pymdownx.tabbed
-  - pymdownx.tilde
-  - pymdownx.snippets:
-      base_path: docs
-      check_paths: true
-  - plantuml_markdown:
-      format: svg
-
-plugins:
-    - search:
-        separator: '[\s\-\.]+'
-    - mkdocs-simple-hooks:
-        hooks:
-          on_post_build: "docs.hooks:copy_doxygen"
-    - minify:
-        minify_html: true
-
-extra_javascript:
-  - https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-MML-AM_CHTML
diff --git a/external_imported/json/doc/mkdocs/requirements.txt b/external_imported/json/doc/mkdocs/requirements.txt
deleted file mode 100644
index b64e9b873..000000000
--- a/external_imported/json/doc/mkdocs/requirements.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-click>=7.1.2
-future>=0.18.2
-htmlmin>=0.1.12
-httplib2>=0.18.1
-importlib-metadata>=1.6.0
-Jinja2>=2.11.2
-joblib>=0.15.1
-jsmin>=2.2.2
-livereload>=2.6.1
-lunr>=0.5.8
-Markdown>=3.2.2
-markdown-include>=0.5.1
-MarkupSafe>=1.1.1
-mkdocs>=1.1.2
-mkdocs-material>=5.2.1
-mkdocs-material-extensions>=1.0
-mkdocs-minify-plugin>=0.3.0
-mkdocs-simple-hooks>=0.1.1
-nltk>=3.5
-plantuml>=0.3.0
-plantuml-markdown>=3.2.2
-Pygments>=2.6.1
-pymdown-extensions>=7.1
-PyYAML>=5.3.1
-regex>=2020.5.14
-six>=1.15.0
-tornado>=6.0.4
-tqdm>=4.46.0
-zipp>=3.1.0
diff --git a/external_imported/json/doc/scripts/git-update-ghpages b/external_imported/json/doc/scripts/git-update-ghpages
deleted file mode 100755
index 393650c1c..000000000
--- a/external_imported/json/doc/scripts/git-update-ghpages
+++ /dev/null
@@ -1,193 +0,0 @@
-#!/usr/bin/env bash
-set -o errexit
-
-copy_contents() {
-  local source="$1"
-  status "Copying contents from $source"
-  if [[ ! "$dryrun" == "1" ]]; then
-    (cd "$source" >/dev/null && tar c .) | tar xv
-  else
-    _ "(cd \"$source\" >/dev/null && tar c .) | tar xv"
-  fi
-}
-
-# Sets git config
-set_config() {
-  if [ -n "$GIT_NAME" ]; then _ git config user.name "$GIT_NAME"; fi
-  if [ -n "$GIT_EMAIL" ]; then _ git config user.email "$GIT_EMAIL"; fi
-}
-
-# Runs the deployment
-run() {
-  if [ ! -d "$source" ]; then
-    echo "Source is not a directory: $source"
-    exit 1
-  fi
-
-  local tmpdir="$(mktemp -d)"
-
-  if [[ "$force" == "1" ]]; then
-    _ cd "$tmpdir"
-    _ git init
-    _ git checkout -b "$branch"
-    copy_contents "$source"
-    if [[ "$useenv" == "1" ]]; then set_config; fi
-    _ git add -A .
-    git_commit
-    git_push --force
-  else
-    _ cd "$tmpdir"
-    _ git clone "$repo" . -b "$branch" || ( \
-      _ git init && \
-      _ git checkout -b "$branch")
-    if [[ "$keep" == "0" ]]; then _ rm -rf ./*; fi
-    copy_contents "$source"
-    if [[ "$useenv" == "1" ]]; then set_config; fi
-    _ git add -A .
-    git_commit || true
-    git_push
-  fi
-  _ rm -rf "$tmpdir"
-  status_ "Done"
-}
-
-git_commit() {
-  if [ -z "$author" ]; then
-    _ git commit -m "$message"
-  else
-    _ git commit -m "$message" --author "$author"
-  fi
-}
-
-git_push() {
-  if [ -z "$GITHUB_TOKEN" ]; then
-    _ git push "${repo}" "$branch" "$@"
-  else
-    status "Pushing via \$GITHUB_TOKEN $@"
-    _ git push "https://${GITHUB_TOKEN}@github.com/${repospec}.git" "$branch" "$@" \
-      --quiet >/dev/null 2>&1 || \
-      ( status_ "Failed to push"; exit 1 )
-  fi
-}
-
-status() {
-  echo -e "\n\033[34m==>\033[0;1m" "$@\033[0m"
-}
-status_() {
-  echo -e "\033[33;1m==>\033[0m" "$@"
-}
-
-_() {
-  echo ""
-  status_ "$@"
-  if [[ ! "$dryrun" == "1" ]]; then "$@"; fi
-}
-
-help() {
-  local cmd="$(basename $0)"
-  echo 'Usage:'
-  echo "  $cmd <REPO> <SOURCE>"
-  echo ''
-  echo 'Parameters:'
-  echo "  REPO             repository to push to in 'user/repo' form"
-  echo "  SOURCE           path to upload to repository's gh-pages branch"
-  echo ''
-  echo 'Options:'
-  echo '  -h, --help       show help screen'
-  echo '  -f, --force      force push'
-  echo '  -n, --dry-run    run in simulation mode'
-  echo '  -e, --use-env    pick up arguments from environment variables'
-  echo '  -b, --branch     use this branch name (default: gh-pages)'
-  echo '  -a, --author     set the author'
-  echo '  -k, --keep       keep existing files in the repo'
-  echo ''
-  echo 'Env var options:'
-  echo '  GITHUB_TOKEN     if set, use this to push to the repo'
-  echo ''
-  echo 'Optional env vars:'
-  echo "  Run with '-e' to enable the use of these variables."
-  echo "  GIT_NAME         set this as the repos user.name"
-  echo '  GIT_EMAIL        set this as the repos user.email'
-  echo '  GITHUB_REPO      substitute as the REPO (1st argument)'
-  echo '  GIT_SOURCE       substitute as the SOURCE (2nd argument)'
-  echo '  GIT_BRANCH       use this branch name (--branch)'
-  echo ''
-  echo 'Example:'
-  echo "  $cmd rstacruz/myproject doc"
-  echo "    # pushes './doc' into the gh-pages branch of rstacruz/myproject"
-  echo ''
-  echo "  export GITHUB_REPO='xyz/abc'"
-  echo "  export GIT_SOURCE='docs'"
-  echo "  $cmd -e"
-  echo "    # pushes './doc' into the gh-pages branch of xyz/abc"
-}
-
-#
-# Defaults
-#
-
-force=0
-dryrun=0
-repospec=
-source=
-branch=
-message="Update"
-useenv=0
-author=""
-keep=0
-
-#
-# Parse args
-#
-
-while [[ "$1" =~ ^- && ! "$1" == '--' ]]; do case $1 in
-  -h | --help )
-    help
-    exit
-    ;;
-  -b | --branch )
-    shift
-    branch="$1"
-    ;;
-  -n | --dry-run )
-    dryrun=1
-    ;;
-  -e | --use-env )
-    useenv=1
-    ;;
-  -k | --keep )
-    keep=1
-    ;;
-  -a | --author)
-    shift
-    author="$1"
-    ;;
-  -f | --force )
-    force=1
-    ;;
-esac; shift; done
-if [[ "$1" == '--' ]]; then shift; fi
-
-if [[ "$useenv" == "1" ]] && [[ -n "$GIT_BRANCH" ]] && [[ -z "$branch" ]]; then
-  branch="$GIT_BRANCH"
-fi
-
-if [[ "$useenv" == "1" ]] && [[ -n "$GITHUB_REPO" ]] && [[ -n "$GIT_SOURCE" ]] && [[ -z "$2" ]]; then
-  repospec="$GITHUB_REPO"
-  source="$GIT_SOURCE"
-else
-  repospec="$1"
-  source="$2"
-fi
-
-: ${branch:="gh-pages"}
-
-if [ -z "$source" ]; then
-  help
-  exit 1
-fi
-
-source="`pwd -LP`/$source"
-repo="https://github.com/${repospec}.git"
-
-run
diff --git a/external_imported/json/doc/scripts/send_to_wandbox.py b/external_imported/json/doc/scripts/send_to_wandbox.py
deleted file mode 100755
index 112656694..000000000
--- a/external_imported/json/doc/scripts/send_to_wandbox.py
+++ /dev/null
@@ -1,120 +0,0 @@
-#! /usr/bin/env python
-
-# This script uploads a directory to Wandbox (http://melpon.org/wandbox),
-# which is an online compiler environment, and prints a permalink to the
-# uploaded code. We use this to provide a "Try it online" version of the
-# library to make the barrier to entry as low as possible.
-#
-# This script was adapted from the script proposed in
-# https://github.com/melpon/wandbox/issues/153.
-#
-# To know how to use this script: ./wandbox.py --help
-#
-# Copyright Louis Dionne 2015
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
-
-import argparse
-import fnmatch
-import json
-import os
-import re
-import urllib2
-
-
-# Strips C and C++ comments from the given string.
-#
-# Copied from https://stackoverflow.com/a/241506/627587.
-def strip_comments(text):
-    def replacer(match):
-        s = match.group(0)
-        if s.startswith('/'):
-            return " " # note: a space and not an empty string
-        else:
-            return s
-    pattern = re.compile(
-        r'//.*?$|/\*.*?\*/|\'(?:\\.|[^\\\'])*\'|"(?:\\.|[^\\"])*"',
-        re.DOTALL | re.MULTILINE
-    )
-    return re.sub(pattern, replacer, text)
-
-
-# Post the given JSON data to Wandbox's API, and return the result
-# as a JSON object.
-def upload(options):
-    request = urllib2.Request('https://melpon.org/wandbox/api/compile.json')
-    request.add_header('Content-Type', 'application/json')
-    response = urllib2.urlopen(request, json.dumps(options))
-    return json.loads(response.read())
-
-
-# Returns a list of the '.hpp' headers in the given directory and in
-# subdirectories.
-#
-# The path must be absolute, and the returned paths are all absolute too.
-def headers(path):
-    return [
-        os.path.join(dir, file)
-            for (dir, _, files) in os.walk(path)
-                for file in fnmatch.filter(files, "*.hpp")
-    ]
-
-
-def main():
-    parser = argparse.ArgumentParser(description=
-        """Upload a directory to Wandbox (http://melpon.org/wandbox).
-
-           On success, the program prints a permalink to the uploaded
-           directory on Wandbox and returns 0. On error, it prints the
-           response from the Wandbox API and returns 1.
-
-           Note that the comments are stripped from all the headers in the
-           uploaded directory.
-        """
-    )
-    parser.add_argument('directory', type=str, help=
-        """A directory to upload to Wandbox.
-
-           The path may be either absolute or relative to the current directory.
-           However, the names of the files uploaded to Wandbox will all be
-           relative to this directory. This way, one can easily specify the
-           directory to be '/some/project/include', and the uploaded files
-           will be uploaded as-if they were rooted at '/some/project/include'
-        """)
-    parser.add_argument('main', type=str, help=
-        """The main source file.
-
-           The path may be either absolute or relative to the current directory.
-        """
-    )
-    args = parser.parse_args()
-    directory = os.path.abspath(args.directory)
-    if not os.path.exists(directory):
-        raise Exception("'%s' is not a valid directory" % args.directory)
-
-    cpp = os.path.abspath(args.main)
-    if not os.path.exists(cpp):
-        raise Exception("'%s' is not a valid file name" % args.main)
-
-    response = upload({
-        'code': open(cpp).read(),
-        'codes': [{
-            'file': os.path.relpath(header, directory),
-            #'code': strip_comments(open(header).read())
-            'code': open(header).read()
-        } for header in headers(directory)],
-        'options': 'boost-nothing,c++11',
-        'compiler': 'gcc-4.9.2',
-        'save': True,
-        'compiler-option-raw': '-I.'
-    })
-
-    if 'status' in response and response['status'] == '0':
-        print response['url']
-        return 0
-    else:
-        print response
-        return 1
-
-
-exit(main())
diff --git a/external_imported/json/docs/Makefile b/external_imported/json/docs/Makefile
new file mode 100644
index 000000000..35c30daef
--- /dev/null
+++ b/external_imported/json/docs/Makefile
@@ -0,0 +1,45 @@
+SRCDIR = ../single_include
+
+all: create_output
+
+##########################################################################
+# example files
+##########################################################################
+
+# where are the example cpp files
+EXAMPLES = $(wildcard examples/*.cpp)
+
+cxx_standard = $(lastword c++11 $(filter c++%, $(subst ., ,$1)))
+
+# create output from a stand-alone example file
+%.output: %.cpp
+	@echo "standard $(call cxx_standard $(<:.cpp=))"
+	$(MAKE) $(<:.cpp=) \
+		CPPFLAGS="-I $(SRCDIR) -DJSON_USE_GLOBAL_UDLS=0" \
+		CXXFLAGS="-std=$(call cxx_standard,$(<:.cpp=)) -Wno-deprecated-declarations"
+	./$(<:.cpp=) > $@
+	rm $(<:.cpp=)
+
+# compare created output with current output of the example files
+%.test: %.cpp
+	$(MAKE) $(<:.cpp=) \
+		CPPFLAGS="-I $(SRCDIR) -DJSON_USE_GLOBAL_UDLS=0" \
+		CXXFLAGS="-std=$(call cxx_standard,$(<:.cpp=)) -Wno-deprecated-declarations"
+	./$(<:.cpp=) > $@
+	diff $@ $(<:.cpp=.output)
+	rm $(<:.cpp=) $@
+
+# create output from all stand-alone example files
+create_output: $(EXAMPLES:.cpp=.output)
+
+# check output of all stand-alone example files
+check_output: $(EXAMPLES:.cpp=.test)
+
+# check output of all stand-alone example files (exclude files with platform-dependent output.)
+# This target is used in the CI (ci_test_documentation).
+check_output_portable: $(filter-out examples/meta.test examples/max_size.test examples/std_hash.test examples/basic_json__CompatibleType.test,$(EXAMPLES:.cpp=.test))
+
+clean:
+	rm -fr $(EXAMPLES:.cpp=)
+	$(MAKE) clean -C docset
+	$(MAKE) clean -C mkdocs
diff --git a/external_imported/json/docs/README.md b/external_imported/json/docs/README.md
new file mode 100644
index 000000000..b39d54e05
--- /dev/null
+++ b/external_imported/json/docs/README.md
@@ -0,0 +1,20 @@
+# Documentation
+
+## Generate documentation
+
+Note on documentation: The source files contain links to the online documentation at https://json.nlohmann.me. This URL
+contains the most recent documentation and should also be applicable to previous versions; documentation for deprecated
+functions is not removed, but marked deprecated.
+
+If you want to see the documentation for a specific tag or commit hash, you can generate it as follows (here for tag
+`v3.10.2`):
+
+```shell
+git clone https://github.com/nlohmann/json.git
+cd json
+git checkout v3.10.2
+make install_venv serve -C docs/mkdocs
+```
+
+Open URL <http://127.0.0.1:8000/> in your browser. Replace from any URL from the source code `https://json.nlohmann.me`
+with `http://127.0.0.1:8000` to see the documentation for your tag or commit hash.
diff --git a/external_imported/json/docs/avatars.png b/external_imported/json/docs/avatars.png
new file mode 100644
index 000000000..25429f34a
Binary files /dev/null and b/external_imported/json/docs/avatars.png differ
diff --git a/external_imported/json/doc/docset/Info.plist b/external_imported/json/docs/docset/Info.plist
similarity index 100%
rename from external_imported/json/doc/docset/Info.plist
rename to external_imported/json/docs/docset/Info.plist
diff --git a/external_imported/json/docs/docset/Makefile b/external_imported/json/docs/docset/Makefile
new file mode 100644
index 000000000..eb1cfd38c
--- /dev/null
+++ b/external_imported/json/docs/docset/Makefile
@@ -0,0 +1,87 @@
+SHELL=/usr/bin/env bash
+SED ?= $(shell which gsed 2>/dev/null || which sed)
+
+MKDOCS_PAGES=$(shell cd ../mkdocs/docs/ && find * -type f -name '*.md' | sort)
+
+.PHONY: all
+all: JSON_for_Modern_C++.tgz
+
+docSet.dsidx: docSet.sql
+	# generate index
+	sqlite3 docSet.dsidx <docSet.sql
+
+JSON_for_Modern_C++.docset: Info.plist docSet.dsidx
+	rm -fr JSON_for_Modern_C++.docset JSON_for_Modern_C++.tgz
+	mkdir -p JSON_for_Modern_C++.docset/Contents/Resources/Documents/
+	cp icon*.png JSON_for_Modern_C++.docset
+	cp Info.plist JSON_for_Modern_C++.docset/Contents
+	# build and copy documentation
+	$(MAKE) build -C ../mkdocs
+	cp -r ../mkdocs/site/* JSON_for_Modern_C++.docset/Contents/Resources/Documents
+	# patch CSS to hide navigation items
+	echo -e "\n\nheader, footer, nav.md-tabs, nav.md-tabs--active, div.md-sidebar--primary, a.md-content__button { display: none; }" >> "$$(ls JSON_for_Modern_C++.docset/Contents/Resources/Documents/assets/stylesheets/main.*.min.css)"
+	# fix spacing
+	echo -e "\n\ndiv.md-sidebar div.md-sidebar--secondary, div.md-main__inner { top: 0; margin-top: 0 }" >> "$$(ls JSON_for_Modern_C++.docset/Contents/Resources/Documents/assets/stylesheets/main.*.min.css)"
+	# remove "JSON for Modern C++" from page titles (fallback)
+	find JSON_for_Modern_C++.docset/Contents/Resources/Documents -type f -exec $(SED) -i 's| - JSON for Modern C++</title>|</title>|' {} +
+	# replace page titles with name from index, if available
+	for page in $(MKDOCS_PAGES); do \
+		case "$$page" in \
+			*/index.md) path=$${page/\/index.md/} ;; \
+			*)          path=$${page/.md/}        ;; \
+		esac; \
+		title=$$(sqlite3 docSet.dsidx "SELECT name FROM searchIndex WHERE path='$$path/index.html'" | tr '\n' ',' | $(SED) -e 's/,/, /g' -e 's/, $$/\n/'); \
+		if [ "x$$title" != "x" ]; then \
+			$(SED) -i "s%<title>.*</title>%<title>$$title</title>%" "JSON_for_Modern_C++.docset/Contents/Resources/Documents/$$path/index.html"; \
+		fi \
+	done
+	# clean up
+	rm JSON_for_Modern_C++.docset/Contents/Resources/Documents/sitemap.*
+	# copy index
+	cp docSet.dsidx JSON_for_Modern_C++.docset/Contents/Resources/
+
+JSON_for_Modern_C++.tgz: JSON_for_Modern_C++.docset
+	tar --exclude='.DS_Store' -cvzf JSON_for_Modern_C++.tgz JSON_for_Modern_C++.docset
+
+# install docset for Zeal documentation browser (https://zealdocs.org/)
+.PHONY: install_docset_zeal
+install_docset_zeal: JSON_for_Modern_C++.docset
+	docset_root=$${XDG_DATA_HOME:-$$HOME/.local/share}/Zeal/Zeal/docsets; \
+	rm -rf $$docset_root/JSON_for_Modern_C++.docset; \
+	mkdir -p $$docset_root; \
+	cp -r JSON_for_Modern_C++.docset $$docset_root/
+
+# list mkdocs pages missing from the docset index
+.PHONY: list_missing_pages
+list_missing_pages: docSet.dsidx
+	@for page in $(MKDOCS_PAGES); do \
+		case "$$page" in \
+			*/index.md) path=$${page/\/index.md/} ;; \
+			*)          path=$${page/.md/}        ;; \
+		esac; \
+		if [ "x$$page" != "xindex.md" -a "x$$(sqlite3 docSet.dsidx "SELECT COUNT(*) FROM searchIndex WHERE path='$$path/index.html'")" = "x0" ]; then \
+			echo $$page; \
+		fi \
+	done
+
+# list paths in the docset index without a corresponding mkdocs page
+.PHONY: list_removed_paths
+list_removed_paths: docSet.dsidx
+	@for path in $$(sqlite3 docSet.dsidx "SELECT path FROM searchIndex"); do \
+		page=$${path/\/index.html/.md}; \
+		page_index=$${path/index.html/index.md}; \
+		page_found=0; \
+		for p in $(MKDOCS_PAGES); do \
+			if [ "x$$p" = "x$$page" -o "x$$p" = "x$$page_index" ]; then \
+				page_found=1; \
+			fi \
+		done; \
+		if [ "x$$page_found" = "x0" ]; then \
+			echo $$path; \
+		fi \
+	done
+
+.PHONY: clean
+clean:
+	rm -f docSet.dsidx
+	rm -fr JSON_for_Modern_C++.docset JSON_for_Modern_C++.tgz
diff --git a/external_imported/json/docs/docset/README.md b/external_imported/json/docs/docset/README.md
new file mode 100644
index 000000000..79a778eb8
--- /dev/null
+++ b/external_imported/json/docs/docset/README.md
@@ -0,0 +1,19 @@
+# docset
+
+The folder contains the required files to create a [docset](https://kapeli.com/docsets) which can be used in
+documentation browsers like [Dash](https://kapeli.com/dash), [Velocity](https://velocity.silverlakesoftware.com), or
+[Zeal](https://zealdocs.org).
+
+The docset can be created with
+
+```sh
+make nlohmann_json.docset
+```
+
+The generated folder `nlohmann_json.docset` can then be opened in the documentation browser.
+
+A recent version is also part of the [Dash user contributions](https://github.com/Kapeli/Dash-User-Contributions/tree/master/docsets/JSON_for_Modern_C%2B%2B).
+
+## Licenses
+
+The [JSON logo](https://commons.wikimedia.org/wiki/File:JSON_vector_logo.svg) is public domain.
diff --git a/external_imported/json/docs/docset/docSet.sql b/external_imported/json/docs/docset/docSet.sql
new file mode 100644
index 000000000..ea6b4f285
--- /dev/null
+++ b/external_imported/json/docs/docset/docSet.sql
@@ -0,0 +1,234 @@
+DROP TABLE IF EXISTS searchIndex;
+CREATE TABLE searchIndex(id INTEGER PRIMARY KEY, name TEXT, type TEXT, path TEXT);
+CREATE UNIQUE INDEX anchor ON searchIndex (name, type, path);
+
+-- API
+INSERT INTO searchIndex(name, type, path) VALUES ('adl_serializer', 'Class', 'api/adl_serializer/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('adl_serializer::from_json', 'Function', 'api/adl_serializer/from_json/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('adl_serializer::to_json', 'Function', 'api/adl_serializer/to_json/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('byte_container_with_subtype', 'Class', 'api/byte_container_with_subtype/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('byte_container_with_subtype::byte_container_with_subtype', 'Constructor', 'api/byte_container_with_subtype/byte_container_with_subtype/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('byte_container_with_subtype::clear_subtype', 'Method', 'api/byte_container_with_subtype/clear_subtype/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('byte_container_with_subtype::has_subtype', 'Method', 'api/byte_container_with_subtype/has_subtype/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('byte_container_with_subtype::set_subtype', 'Method', 'api/byte_container_with_subtype/set_subtype/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('byte_container_with_subtype::subtype', 'Method', 'api/byte_container_with_subtype/subtype/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json', 'Class', 'api/basic_json/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::accept', 'Function', 'api/basic_json/accept/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::array', 'Function', 'api/basic_json/array/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::array_t', 'Type', 'api/basic_json/array_t/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::at', 'Method', 'api/basic_json/at/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::back', 'Method', 'api/basic_json/back/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::basic_json', 'Constructor', 'api/basic_json/basic_json/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::begin', 'Method', 'api/basic_json/begin/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::binary', 'Function', 'api/basic_json/binary/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::binary_t', 'Type', 'api/basic_json/binary_t/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::boolean_t', 'Type', 'api/basic_json/boolean_t/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::cbegin', 'Method', 'api/basic_json/cbegin/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::cbor_tag_handler_t', 'Enum', 'api/basic_json/cbor_tag_handler_t/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::cend', 'Method', 'api/basic_json/cend/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::clear', 'Method', 'api/basic_json/clear/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::contains', 'Method', 'api/basic_json/contains/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::count', 'Method', 'api/basic_json/count/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::crbegin', 'Method', 'api/basic_json/crbegin/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::crend', 'Method', 'api/basic_json/crend/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::default_object_comparator_t', 'Type', 'api/basic_json/default_object_comparator_t/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::diff', 'Function', 'api/basic_json/diff/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::dump', 'Method', 'api/basic_json/dump/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::emplace', 'Method', 'api/basic_json/emplace/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::emplace_back', 'Method', 'api/basic_json/emplace_back/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::empty', 'Method', 'api/basic_json/empty/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::end', 'Method', 'api/basic_json/end/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::erase', 'Method', 'api/basic_json/erase/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::error_handler_t', 'Enum', 'api/basic_json/error_handler_t/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::exception', 'Class', 'api/basic_json/exception/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::find', 'Method', 'api/basic_json/find/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::flatten', 'Method', 'api/basic_json/flatten/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::from_bjdata', 'Function', 'api/basic_json/from_bjdata/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::from_bson', 'Function', 'api/basic_json/from_bson/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::from_cbor', 'Function', 'api/basic_json/from_cbor/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::from_msgpack', 'Function', 'api/basic_json/from_msgpack/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::from_ubjson', 'Function', 'api/basic_json/from_ubjson/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::front', 'Method', 'api/basic_json/front/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::get', 'Method', 'api/basic_json/get/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::get_allocator', 'Function', 'api/basic_json/get_allocator/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::get_binary', 'Method', 'api/basic_json/get_binary/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::get_ptr', 'Method', 'api/basic_json/get_ptr/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::get_ref', 'Method', 'api/basic_json/get_ref/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::get_to', 'Method', 'api/basic_json/get_to/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::input_format_t', 'Enum', 'api/basic_json/input_format_t/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::insert', 'Method', 'api/basic_json/insert/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::invalid_iterator', 'Class', 'api/basic_json/invalid_iterator/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::is_array', 'Method', 'api/basic_json/is_array/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::is_binary', 'Method', 'api/basic_json/is_binary/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::is_boolean', 'Method', 'api/basic_json/is_boolean/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::is_discarded', 'Method', 'api/basic_json/is_discarded/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::is_null', 'Method', 'api/basic_json/is_null/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::is_number', 'Method', 'api/basic_json/is_number/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::is_number_float', 'Method', 'api/basic_json/is_number_float/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::is_number_integer', 'Method', 'api/basic_json/is_number_integer/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::is_number_unsigned', 'Method', 'api/basic_json/is_number_unsigned/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::is_object', 'Method', 'api/basic_json/is_object/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::is_primitive', 'Method', 'api/basic_json/is_primitive/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::is_string', 'Method', 'api/basic_json/is_string/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::is_structured', 'Method', 'api/basic_json/is_structured/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::items', 'Method', 'api/basic_json/items/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::json_serializer', 'Class', 'api/basic_json/json_serializer/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::max_size', 'Method', 'api/basic_json/max_size/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::merge_patch', 'Method', 'api/basic_json/merge_patch/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::meta', 'Function', 'api/basic_json/meta/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::number_float_t', 'Type', 'api/basic_json/number_float_t/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::number_integer_t', 'Type', 'api/basic_json/number_integer_t/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::number_unsigned_t', 'Type', 'api/basic_json/number_unsigned_t/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::object', 'Function', 'api/basic_json/object/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::object_comparator_t', 'Type', 'api/basic_json/object_comparator_t/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::object_t', 'Type', 'api/basic_json/object_t/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::operator ValueType', 'Operator', 'api/basic_json/operator_ValueType/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::operator value_t', 'Operator', 'api/basic_json/operator_value_t/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::operator[]', 'Operator', 'api/basic_json/operator[]/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::operator=', 'Operator', 'api/basic_json/operator=/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::operator+=', 'Operator', 'api/basic_json/operator+=/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::operator==', 'Operator', 'api/basic_json/operator_eq/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::operator!=', 'Operator', 'api/basic_json/operator_ne/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::operator<', 'Operator', 'api/basic_json/operator_lt/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::operator<=', 'Operator', 'api/basic_json/operator_le/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::operator>', 'Operator', 'api/basic_json/operator_gt/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::operator>=', 'Operator', 'api/basic_json/operator_ge/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::operator<=>', 'Operator', 'api/basic_json/operator_spaceship/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::out_of_range', 'Class', 'api/basic_json/out_of_range/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::other_error', 'Class', 'api/basic_json/other_error/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::parse', 'Function', 'api/basic_json/parse/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::parse_error', 'Class', 'api/basic_json/parse_error/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::parse_event_t', 'Enum', 'api/basic_json/parse_event_t/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::parser_callback_t', 'Type', 'api/basic_json/parser_callback_t/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::patch', 'Method', 'api/basic_json/patch/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::patch_inplace', 'Method', 'api/basic_json/patch_inplace/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::push_back', 'Method', 'api/basic_json/push_back/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::rbegin', 'Method', 'api/basic_json/rbegin/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::rend', 'Method', 'api/basic_json/rend/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::sax_parse', 'Function', 'api/basic_json/sax_parse/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::size', 'Method', 'api/basic_json/size/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::string_t', 'Type', 'api/basic_json/string_t/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::swap', 'Method', 'api/basic_json/swap/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::type', 'Method', 'api/basic_json/type/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::type_error', 'Class', 'api/basic_json/type_error/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::type_name', 'Method', 'api/basic_json/type_name/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::unflatten', 'Method', 'api/basic_json/unflatten/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::update', 'Method', 'api/basic_json/update/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::to_bjdata', 'Function', 'api/basic_json/to_bjdata/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::to_bson', 'Function', 'api/basic_json/to_bson/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::to_cbor', 'Function', 'api/basic_json/to_cbor/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::to_msgpack', 'Function', 'api/basic_json/to_msgpack/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::to_string', 'Method', 'api/basic_json/to_string/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::to_ubjson', 'Function', 'api/basic_json/to_ubjson/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::value', 'Method', 'api/basic_json/value/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::value_t', 'Enum', 'api/basic_json/value_t/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('basic_json::~basic_json', 'Method', 'api/basic_json/~basic_json/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('json', 'Class', 'api/json/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('json_pointer', 'Class', 'api/json_pointer/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('json_pointer::back', 'Method', 'api/json_pointer/back/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('json_pointer::empty', 'Method', 'api/json_pointer/empty/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('json_pointer::json_pointer', 'Constructor', 'api/json_pointer/json_pointer/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('json_pointer::operator==', 'Operator', 'api/json_pointer/operator_eq/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('json_pointer::operator!=', 'Operator', 'api/json_pointer/operator_ne/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('json_pointer::operator/', 'Operator', 'api/json_pointer/operator_slash/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('json_pointer::operator/=', 'Operator', 'api/json_pointer/operator_slasheq/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('json_pointer::operator string_t', 'Operator', 'api/json_pointer/operator_string_t/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('json_pointer::parent_pointer', 'Method', 'api/json_pointer/parent_pointer/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('json_pointer::pop_back', 'Method', 'api/json_pointer/pop_back/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('json_pointer::push_back', 'Method', 'api/json_pointer/push_back/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('json_pointer::string_t', 'Type', 'api/json_pointer/string_t/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('json_pointer::to_string', 'Method', 'api/json_pointer/to_string/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('json_sax', 'Class', 'api/json_sax/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('json_sax::binary', 'Method', 'api/json_sax/binary/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('json_sax::boolean', 'Method', 'api/json_sax/boolean/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('json_sax::end_array', 'Method', 'api/json_sax/end_array/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('json_sax::end_object', 'Method', 'api/json_sax/end_object/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('json_sax::key', 'Method', 'api/json_sax/key/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('json_sax::null', 'Method', 'api/json_sax/null/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('json_sax::number_float', 'Method', 'api/json_sax/number_float/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('json_sax::number_integer', 'Method', 'api/json_sax/number_integer/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('json_sax::number_unsigned', 'Method', 'api/json_sax/number_unsigned/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('json_sax::parse_error', 'Method', 'api/json_sax/parse_error/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('json_sax::start_array', 'Method', 'api/json_sax/start_array/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('json_sax::start_object', 'Method', 'api/json_sax/start_object/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('json_sax::string', 'Method', 'api/json_sax/string/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('operator""_json', 'Literal', 'api/operator_literal_json/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('operator""_json_pointer', 'Literal', 'api/operator_literal_json_pointer/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('operator<<', 'Operator', 'api/operator_ltlt/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('operator>>', 'Operator', 'api/operator_gtgt/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('ordered_json', 'Class', 'api/ordered_json/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('ordered_map', 'Class', 'api/ordered_map/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('std::hash<basic_json>', 'Class', 'api/basic_json/std_hash/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('std::swap<basic_json>', 'Function', 'api/basic_json/std_swap/index.html');
+
+-- Features
+INSERT INTO searchIndex(name, type, path) VALUES ('Arbitrary Type Conversions', 'Guide', 'features/arbitrary_types/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('Binary Formats', 'Guide', 'features/binary_formats/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('Binary Formats: BJData', 'Guide', 'features/binary_formats/bjdata/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('Binary Formats: BSON', 'Guide', 'features/binary_formats/bson/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('Binary Formats: CBOR', 'Guide', 'features/binary_formats/cbor/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('Binary Formats: MessagePack', 'Guide', 'features/binary_formats/messagepack/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('Binary Formats: UBJSON', 'Guide', 'features/binary_formats/ubjson/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('Binary Values', 'Guide', 'features/binary_values/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('Comments', 'Guide', 'features/comments/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('Element Access', 'Guide', 'features/element_access/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('Element Access: Access with default value: value', 'Guide', 'features/element_access/default_value/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('Element Access: Checked access: at', 'Guide', 'features/element_access/checked_access/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('Element Access: Unchecked access: operator[]', 'Guide', 'features/element_access/unchecked_access/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('Integration: Migration Guide', 'Guide', 'integration/migration_guide/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('Integration: CMake', 'Guide', 'integration/cmake/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('Integration: Header only', 'Guide', 'integration/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('Integration: Package Managers', 'Guide', 'integration/package_managers/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('Integration: Pkg-config', 'Guide', 'integration/pkg-config/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('Iterators', 'Guide', 'features/iterators/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('JSON Merge Patch', 'Guide', 'features/merge_patch/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('JSON Patch and Diff', 'Guide', 'features/json_patch/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('JSON Pointer', 'Guide', 'features/json_pointer/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('nlohmann Namespace', 'Guide', 'features/namespace/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('Types', 'Guide', 'features/types/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('Types: Number Handling', 'Guide', 'features/types/number_handling/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('Object Order', 'Guide', 'features/object_order/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('Parsing', 'Guide', 'features/parsing/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('Parsing: JSON Lines', 'Guide', 'features/parsing/json_lines/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('Parsing: Parser Callbacks', 'Guide', 'features/parsing/parser_callbacks/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('Parsing: Parsing and Exceptions', 'Guide', 'features/parsing/parse_exceptions/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('Parsing: SAX Interface', 'Guide', 'features/parsing/sax_interface/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('Runtime Assertions', 'Guide', 'features/assertions/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('Specializing enum conversion', 'Guide', 'features/enum_conversion/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('Supported Macros', 'Guide', 'features/macros/index.html');
+
+-- Macros
+INSERT INTO searchIndex(name, type, path) VALUES ('JSON_ASSERT', 'Macro', 'api/macros/json_assert/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('JSON_CATCH_USER', 'Macro', 'api/macros/json_throw_user/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('JSON_DIAGNOSTICS', 'Macro', 'api/macros/json_diagnostics/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('JSON_DISABLE_ENUM_SERIALIZATION', 'Macro', 'api/macros/json_disable_enum_serialization/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('JSON_HAS_CPP_11', 'Macro', 'api/macros/json_has_cpp_11/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('JSON_HAS_CPP_14', 'Macro', 'api/macros/json_has_cpp_11/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('JSON_HAS_CPP_17', 'Macro', 'api/macros/json_has_cpp_11/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('JSON_HAS_CPP_20', 'Macro', 'api/macros/json_has_cpp_11/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('JSON_HAS_EXPERIMENTAL_FILESYSTEM', 'Macro', 'api/macros/json_has_filesystem/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('JSON_HAS_FILESYSTEM', 'Macro', 'api/macros/json_has_filesystem/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('JSON_HAS_RANGES', 'Macro', 'api/macros/json_has_ranges/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('JSON_HAS_THREE_WAY_COMPARISON', 'Macro', 'api/macros/json_has_three_way_comparison/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('JSON_NOEXCEPTION', 'Macro', 'api/macros/json_noexception/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('JSON_NO_IO', 'Macro', 'api/macros/json_no_io/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('JSON_SKIP_LIBRARY_VERSION_CHECK', 'Macro', 'api/macros/json_skip_library_version_check/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('JSON_SKIP_UNSUPPORTED_COMPILER_CHECK', 'Macro', 'api/macros/json_skip_unsupported_compiler_check/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('JSON_THROW_USER', 'Macro', 'api/macros/json_throw_user/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('JSON_TRY_USER', 'Macro', 'api/macros/json_throw_user/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('JSON_USE_GLOBAL_UDLS', 'Macro', 'api/macros/json_use_global_udls/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('JSON_USE_IMPLICIT_CONVERSIONS', 'Macro', 'api/macros/json_use_implicit_conversions/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON', 'Macro', 'api/macros/json_use_legacy_discarded_value_comparison/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('Macros', 'Macro', 'api/macros/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('NLOHMANN_DEFINE_TYPE_INTRUSIVE', 'Macro', 'api/macros/nlohmann_define_type_intrusive/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT', 'Macro', 'api/macros/nlohmann_define_type_intrusive/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE', 'Macro', 'api/macros/nlohmann_define_type_non_intrusive/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT', 'Macro', 'api/macros/nlohmann_define_type_non_intrusive/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('NLOHMANN_JSON_NAMESPACE', 'Macro', 'api/macros/nlohmann_json_namespace/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('NLOHMANN_JSON_NAMESPACE_BEGIN', 'Macro', 'api/macros/nlohmann_json_namespace_begin/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('NLOHMANN_JSON_NAMESPACE_END', 'Macro', 'api/macros/nlohmann_json_namespace_begin/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('NLOHMANN_JSON_NAMESPACE_NO_VERSION', 'Macro', 'api/macros/nlohmann_json_namespace_no_version/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('NLOHMANN_JSON_SERIALIZE_ENUM', 'Macro', 'api/macros/nlohmann_json_serialize_enum/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('NLOHMANN_JSON_VERSION_MAJOR', 'Macro', 'api/macros/nlohmann_json_version_major/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('NLOHMANN_JSON_VERSION_MINOR', 'Macro', 'api/macros/nlohmann_json_version_major/index.html');
+INSERT INTO searchIndex(name, type, path) VALUES ('NLOHMANN_JSON_VERSION_PATCH', 'Macro', 'api/macros/nlohmann_json_version_major/index.html');
diff --git a/external_imported/json/docs/docset/docset.json b/external_imported/json/docs/docset/docset.json
new file mode 100644
index 000000000..bc08d283d
--- /dev/null
+++ b/external_imported/json/docs/docset/docset.json
@@ -0,0 +1,10 @@
+{
+  "name": "JSON for Modern C++",
+  "version": "3.11.3",
+  "archive": "JSON_for_Modern_C++.tgz",
+  "author": {
+    "name": "Niels Lohmann",
+    "link": "https://twitter.com/nlohmann"
+  },
+  "aliases": ["nlohmann/json"]
+}
diff --git a/external_imported/json/docs/docset/icon.png b/external_imported/json/docs/docset/icon.png
new file mode 100644
index 000000000..7197d0a75
Binary files /dev/null and b/external_imported/json/docs/docset/icon.png differ
diff --git a/external_imported/json/docs/docset/icon@2x.png b/external_imported/json/docs/docset/icon@2x.png
new file mode 100644
index 000000000..5f2fac87a
Binary files /dev/null and b/external_imported/json/docs/docset/icon@2x.png differ
diff --git a/external_imported/json/doc/examples/README.cpp b/external_imported/json/docs/examples/README.cpp
similarity index 100%
rename from external_imported/json/doc/examples/README.cpp
rename to external_imported/json/docs/examples/README.cpp
diff --git a/external_imported/json/doc/examples/README.output b/external_imported/json/docs/examples/README.output
similarity index 100%
rename from external_imported/json/doc/examples/README.output
rename to external_imported/json/docs/examples/README.output
diff --git a/external_imported/json/doc/examples/accept__string.cpp b/external_imported/json/docs/examples/accept__string.cpp
similarity index 100%
rename from external_imported/json/doc/examples/accept__string.cpp
rename to external_imported/json/docs/examples/accept__string.cpp
diff --git a/external_imported/json/doc/examples/accept__string.output b/external_imported/json/docs/examples/accept__string.output
similarity index 100%
rename from external_imported/json/doc/examples/accept__string.output
rename to external_imported/json/docs/examples/accept__string.output
diff --git a/external_imported/json/doc/examples/array.cpp b/external_imported/json/docs/examples/array.cpp
similarity index 100%
rename from external_imported/json/doc/examples/array.cpp
rename to external_imported/json/docs/examples/array.cpp
diff --git a/external_imported/json/doc/examples/array.output b/external_imported/json/docs/examples/array.output
similarity index 100%
rename from external_imported/json/doc/examples/array.output
rename to external_imported/json/docs/examples/array.output
diff --git a/external_imported/json/docs/examples/array_t.cpp b/external_imported/json/docs/examples/array_t.cpp
new file mode 100644
index 000000000..0964857b7
--- /dev/null
+++ b/external_imported/json/docs/examples/array_t.cpp
@@ -0,0 +1,10 @@
+#include <iostream>
+#include <iomanip>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    std::cout << std::boolalpha << std::is_same<std::vector<json>, json::array_t>::value << std::endl;
+}
diff --git a/external_imported/json/docs/examples/array_t.output b/external_imported/json/docs/examples/array_t.output
new file mode 100644
index 000000000..27ba77dda
--- /dev/null
+++ b/external_imported/json/docs/examples/array_t.output
@@ -0,0 +1 @@
+true
diff --git a/external_imported/json/docs/examples/at__json_pointer.cpp b/external_imported/json/docs/examples/at__json_pointer.cpp
new file mode 100644
index 000000000..15e91433d
--- /dev/null
+++ b/external_imported/json/docs/examples/at__json_pointer.cpp
@@ -0,0 +1,103 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+using namespace nlohmann::literals;
+
+int main()
+{
+    // create a JSON value
+    json j =
+    {
+        {"number", 1}, {"string", "foo"}, {"array", {1, 2}}
+    };
+
+    // read-only access
+
+    // output element with JSON pointer "/number"
+    std::cout << j.at("/number"_json_pointer) << '\n';
+    // output element with JSON pointer "/string"
+    std::cout << j.at("/string"_json_pointer) << '\n';
+    // output element with JSON pointer "/array"
+    std::cout << j.at("/array"_json_pointer) << '\n';
+    // output element with JSON pointer "/array/1"
+    std::cout << j.at("/array/1"_json_pointer) << '\n';
+
+    // writing access
+
+    // change the string
+    j.at("/string"_json_pointer) = "bar";
+    // output the changed string
+    std::cout << j["string"] << '\n';
+
+    // change an array element
+    j.at("/array/1"_json_pointer) = 21;
+    // output the changed array
+    std::cout << j["array"] << '\n';
+
+    // out_of_range.106
+    try
+    {
+        // try to use an array index with leading '0'
+        json::reference ref = j.at("/array/01"_json_pointer);
+    }
+    catch (const json::parse_error& e)
+    {
+        std::cout << e.what() << '\n';
+    }
+
+    // out_of_range.109
+    try
+    {
+        // try to use an array index that is not a number
+        json::reference ref = j.at("/array/one"_json_pointer);
+    }
+    catch (const json::parse_error& e)
+    {
+        std::cout << e.what() << '\n';
+    }
+
+    // out_of_range.401
+    try
+    {
+        // try to use an invalid array index
+        json::reference ref = j.at("/array/4"_json_pointer);
+    }
+    catch (const json::out_of_range& e)
+    {
+        std::cout << e.what() << '\n';
+    }
+
+    // out_of_range.402
+    try
+    {
+        // try to use the array index '-'
+        json::reference ref = j.at("/array/-"_json_pointer);
+    }
+    catch (const json::out_of_range& e)
+    {
+        std::cout << e.what() << '\n';
+    }
+
+    // out_of_range.403
+    try
+    {
+        // try to use a JSON pointer to a nonexistent object key
+        json::const_reference ref = j.at("/foo"_json_pointer);
+    }
+    catch (const json::out_of_range& e)
+    {
+        std::cout << e.what() << '\n';
+    }
+
+    // out_of_range.404
+    try
+    {
+        // try to use a JSON pointer that cannot be resolved
+        json::reference ref = j.at("/number/foo"_json_pointer);
+    }
+    catch (const json::out_of_range& e)
+    {
+        std::cout << e.what() << '\n';
+    }
+}
diff --git a/external_imported/json/doc/examples/at_json_pointer.output b/external_imported/json/docs/examples/at__json_pointer.output
similarity index 100%
rename from external_imported/json/doc/examples/at_json_pointer.output
rename to external_imported/json/docs/examples/at__json_pointer.output
diff --git a/external_imported/json/docs/examples/at__json_pointer_const.cpp b/external_imported/json/docs/examples/at__json_pointer_const.cpp
new file mode 100644
index 000000000..ab026e078
--- /dev/null
+++ b/external_imported/json/docs/examples/at__json_pointer_const.cpp
@@ -0,0 +1,80 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+using namespace nlohmann::literals;
+
+int main()
+{
+    // create a JSON value
+    const json j =
+    {
+        {"number", 1}, {"string", "foo"}, {"array", {1, 2}}
+    };
+
+    // read-only access
+
+    // output element with JSON pointer "/number"
+    std::cout << j.at("/number"_json_pointer) << '\n';
+    // output element with JSON pointer "/string"
+    std::cout << j.at("/string"_json_pointer) << '\n';
+    // output element with JSON pointer "/array"
+    std::cout << j.at("/array"_json_pointer) << '\n';
+    // output element with JSON pointer "/array/1"
+    std::cout << j.at("/array/1"_json_pointer) << '\n';
+
+    // out_of_range.109
+    try
+    {
+        // try to use an array index that is not a number
+        json::const_reference ref = j.at("/array/one"_json_pointer);
+    }
+    catch (const json::parse_error& e)
+    {
+        std::cout << e.what() << '\n';
+    }
+
+    // out_of_range.401
+    try
+    {
+        // try to use an invalid array index
+        json::const_reference ref = j.at("/array/4"_json_pointer);
+    }
+    catch (const json::out_of_range& e)
+    {
+        std::cout << e.what() << '\n';
+    }
+
+    // out_of_range.402
+    try
+    {
+        // try to use the array index '-'
+        json::const_reference ref = j.at("/array/-"_json_pointer);
+    }
+    catch (const json::out_of_range& e)
+    {
+        std::cout << e.what() << '\n';
+    }
+
+    // out_of_range.403
+    try
+    {
+        // try to use a JSON pointer to a nonexistent object key
+        json::const_reference ref = j.at("/foo"_json_pointer);
+    }
+    catch (const json::out_of_range& e)
+    {
+        std::cout << e.what() << '\n';
+    }
+
+    // out_of_range.404
+    try
+    {
+        // try to use a JSON pointer that cannot be resolved
+        json::const_reference ref = j.at("/number/foo"_json_pointer);
+    }
+    catch (const json::out_of_range& e)
+    {
+        std::cout << e.what() << '\n';
+    }
+}
diff --git a/external_imported/json/doc/examples/at_json_pointer_const.output b/external_imported/json/docs/examples/at__json_pointer_const.output
similarity index 100%
rename from external_imported/json/doc/examples/at_json_pointer_const.output
rename to external_imported/json/docs/examples/at__json_pointer_const.output
diff --git a/external_imported/json/docs/examples/at__keytype.c++17.cpp b/external_imported/json/docs/examples/at__keytype.c++17.cpp
new file mode 100644
index 000000000..032506acd
--- /dev/null
+++ b/external_imported/json/docs/examples/at__keytype.c++17.cpp
@@ -0,0 +1,49 @@
+#include <iostream>
+#include <string_view>
+#include <nlohmann/json.hpp>
+
+using namespace std::string_view_literals;
+using json = nlohmann::json;
+
+int main()
+{
+    // create JSON object
+    json object =
+    {
+        {"the good", "il buono"},
+        {"the bad", "il cattivo"},
+        {"the ugly", "il brutto"}
+    };
+
+    // output element with key "the ugly" using string_view
+    std::cout << object.at("the ugly"sv) << '\n';
+
+    // change element with key "the bad" using string_view
+    object.at("the bad"sv) = "il cattivo";
+
+    // output changed array
+    std::cout << object << '\n';
+
+    // exception type_error.304
+    try
+    {
+        // use at() with string_view on a non-object type
+        json str = "I am a string";
+        str.at("the good"sv) = "Another string";
+    }
+    catch (const json::type_error& e)
+    {
+        std::cout << e.what() << '\n';
+    }
+
+    // exception out_of_range.401
+    try
+    {
+        // try to write at a nonexisting key using string_view
+        object.at("the fast"sv) = "il rapido";
+    }
+    catch (const json::out_of_range& e)
+    {
+        std::cout << e.what() << '\n';
+    }
+}
diff --git a/external_imported/json/doc/examples/at__object_t_key_type.output b/external_imported/json/docs/examples/at__keytype.c++17.output
similarity index 100%
rename from external_imported/json/doc/examples/at__object_t_key_type.output
rename to external_imported/json/docs/examples/at__keytype.c++17.output
diff --git a/external_imported/json/docs/examples/at__keytype_const.c++17.cpp b/external_imported/json/docs/examples/at__keytype_const.c++17.cpp
new file mode 100644
index 000000000..b08cd17b5
--- /dev/null
+++ b/external_imported/json/docs/examples/at__keytype_const.c++17.cpp
@@ -0,0 +1,43 @@
+#include <iostream>
+#include <string_view>
+#include <nlohmann/json.hpp>
+
+using namespace std::string_view_literals;
+using json = nlohmann::json;
+
+int main()
+{
+    // create JSON object
+    const json object =
+    {
+        {"the good", "il buono"},
+        {"the bad", "il cattivo"},
+        {"the ugly", "il brutto"}
+    };
+
+    // output element with key "the ugly" using string_view
+    std::cout << object.at("the ugly"sv) << '\n';
+
+    // exception type_error.304
+    try
+    {
+        // use at() with string_view on a non-object type
+        const json str = "I am a string";
+        std::cout << str.at("the good"sv) << '\n';
+    }
+    catch (const json::type_error& e)
+    {
+        std::cout << e.what() << '\n';
+    }
+
+    // exception out_of_range.401
+    try
+    {
+        // try to read from a nonexisting key using string_view
+        std::cout << object.at("the fast"sv) << '\n';
+    }
+    catch (const json::out_of_range)
+    {
+        std::cout << "out of range" << '\n';
+    }
+}
diff --git a/external_imported/json/doc/examples/at__object_t_key_type_const.output b/external_imported/json/docs/examples/at__keytype_const.c++17.output
similarity index 100%
rename from external_imported/json/doc/examples/at__object_t_key_type_const.output
rename to external_imported/json/docs/examples/at__keytype_const.c++17.output
diff --git a/external_imported/json/doc/examples/at__object_t_key_type.cpp b/external_imported/json/docs/examples/at__object_t_key_type.cpp
similarity index 92%
rename from external_imported/json/doc/examples/at__object_t_key_type.cpp
rename to external_imported/json/docs/examples/at__object_t_key_type.cpp
index 202f8a2ee..e1f33ceca 100644
--- a/external_imported/json/doc/examples/at__object_t_key_type.cpp
+++ b/external_imported/json/docs/examples/at__object_t_key_type.cpp
@@ -22,7 +22,6 @@ int main()
     // output changed array
     std::cout << object << '\n';
 
-
     // exception type_error.304
     try
     {
@@ -30,7 +29,7 @@ int main()
         json str = "I am a string";
         str.at("the good") = "Another string";
     }
-    catch (json::type_error& e)
+    catch (const json::type_error& e)
     {
         std::cout << e.what() << '\n';
     }
@@ -41,7 +40,7 @@ int main()
         // try to write at a nonexisting key
         object.at("the fast") = "il rapido";
     }
-    catch (json::out_of_range& e)
+    catch (const json::out_of_range& e)
     {
         std::cout << e.what() << '\n';
     }
diff --git a/external_imported/json/docs/examples/at__object_t_key_type.output b/external_imported/json/docs/examples/at__object_t_key_type.output
new file mode 100644
index 000000000..b544b7299
--- /dev/null
+++ b/external_imported/json/docs/examples/at__object_t_key_type.output
@@ -0,0 +1,4 @@
+"il brutto"
+{"the bad":"il cattivo","the good":"il buono","the ugly":"il brutto"}
+[json.exception.type_error.304] cannot use at() with string
+[json.exception.out_of_range.403] key 'the fast' not found
diff --git a/external_imported/json/doc/examples/at__object_t_key_type_const.cpp b/external_imported/json/docs/examples/at__object_t_key_type_const.cpp
similarity index 91%
rename from external_imported/json/doc/examples/at__object_t_key_type_const.cpp
rename to external_imported/json/docs/examples/at__object_t_key_type_const.cpp
index e5244f3f7..b37bbd489 100644
--- a/external_imported/json/doc/examples/at__object_t_key_type_const.cpp
+++ b/external_imported/json/docs/examples/at__object_t_key_type_const.cpp
@@ -16,7 +16,6 @@ int main()
     // output element with key "the ugly"
     std::cout << object.at("the ugly") << '\n';
 
-
     // exception type_error.304
     try
     {
@@ -24,7 +23,7 @@ int main()
         const json str = "I am a string";
         std::cout << str.at("the good") << '\n';
     }
-    catch (json::type_error& e)
+    catch (const json::type_error& e)
     {
         std::cout << e.what() << '\n';
     }
@@ -35,7 +34,7 @@ int main()
         // try to read from a nonexisting key
         std::cout << object.at("the fast") << '\n';
     }
-    catch (json::out_of_range)
+    catch (const json::out_of_range)
     {
         std::cout << "out of range" << '\n';
     }
diff --git a/external_imported/json/docs/examples/at__object_t_key_type_const.output b/external_imported/json/docs/examples/at__object_t_key_type_const.output
new file mode 100644
index 000000000..40ca3f09f
--- /dev/null
+++ b/external_imported/json/docs/examples/at__object_t_key_type_const.output
@@ -0,0 +1,3 @@
+"il brutto"
+[json.exception.type_error.304] cannot use at() with string
+out of range
diff --git a/external_imported/json/doc/examples/at__size_type.cpp b/external_imported/json/docs/examples/at__size_type.cpp
similarity index 91%
rename from external_imported/json/doc/examples/at__size_type.cpp
rename to external_imported/json/docs/examples/at__size_type.cpp
index 65baeddcf..6527c6b16 100644
--- a/external_imported/json/doc/examples/at__size_type.cpp
+++ b/external_imported/json/docs/examples/at__size_type.cpp
@@ -17,7 +17,6 @@ int main()
     // output changed array
     std::cout << array << '\n';
 
-
     // exception type_error.304
     try
     {
@@ -25,7 +24,7 @@ int main()
         json str = "I am a string";
         str.at(0) = "Another string";
     }
-    catch (json::type_error& e)
+    catch (const json::type_error& e)
     {
         std::cout << e.what() << '\n';
     }
@@ -36,7 +35,7 @@ int main()
         // try to write beyond the array limit
         array.at(5) = "sixth";
     }
-    catch (json::out_of_range& e)
+    catch (const json::out_of_range& e)
     {
         std::cout << e.what() << '\n';
     }
diff --git a/external_imported/json/doc/examples/at__size_type.output b/external_imported/json/docs/examples/at__size_type.output
similarity index 100%
rename from external_imported/json/doc/examples/at__size_type.output
rename to external_imported/json/docs/examples/at__size_type.output
diff --git a/external_imported/json/doc/examples/at__size_type_const.cpp b/external_imported/json/docs/examples/at__size_type_const.cpp
similarity index 89%
rename from external_imported/json/doc/examples/at__size_type_const.cpp
rename to external_imported/json/docs/examples/at__size_type_const.cpp
index faa4cffdd..2080387a3 100644
--- a/external_imported/json/doc/examples/at__size_type_const.cpp
+++ b/external_imported/json/docs/examples/at__size_type_const.cpp
@@ -11,7 +11,6 @@ int main()
     // output element at index 2 (third element)
     std::cout << array.at(2) << '\n';
 
-
     // exception type_error.304
     try
     {
@@ -19,7 +18,7 @@ int main()
         const json str = "I am a string";
         std::cout << str.at(0) << '\n';
     }
-    catch (json::type_error& e)
+    catch (const json::type_error& e)
     {
         std::cout << e.what() << '\n';
     }
@@ -30,7 +29,7 @@ int main()
         // try to read beyond the array limit
         std::cout << array.at(5) << '\n';
     }
-    catch (json::out_of_range& e)
+    catch (const json::out_of_range& e)
     {
         std::cout << e.what() << '\n';
     }
diff --git a/external_imported/json/doc/examples/at__size_type_const.output b/external_imported/json/docs/examples/at__size_type_const.output
similarity index 100%
rename from external_imported/json/doc/examples/at__size_type_const.output
rename to external_imported/json/docs/examples/at__size_type_const.output
diff --git a/external_imported/json/doc/examples/back.cpp b/external_imported/json/docs/examples/back.cpp
similarity index 95%
rename from external_imported/json/doc/examples/back.cpp
rename to external_imported/json/docs/examples/back.cpp
index 1439a8218..45342db13 100644
--- a/external_imported/json/doc/examples/back.cpp
+++ b/external_imported/json/docs/examples/back.cpp
@@ -31,7 +31,7 @@ int main()
         json j_null;
         j_null.back();
     }
-    catch (json::invalid_iterator& e)
+    catch (const json::invalid_iterator& e)
     {
         std::cout << e.what() << '\n';
     }
diff --git a/external_imported/json/doc/examples/back.output b/external_imported/json/docs/examples/back.output
similarity index 100%
rename from external_imported/json/doc/examples/back.output
rename to external_imported/json/docs/examples/back.output
diff --git a/external_imported/json/doc/examples/basic_json__CompatibleType.cpp b/external_imported/json/docs/examples/basic_json__CompatibleType.cpp
similarity index 98%
rename from external_imported/json/doc/examples/basic_json__CompatibleType.cpp
rename to external_imported/json/docs/examples/basic_json__CompatibleType.cpp
index d39fd7a43..f0d0cc1e7 100644
--- a/external_imported/json/doc/examples/basic_json__CompatibleType.cpp
+++ b/external_imported/json/docs/examples/basic_json__CompatibleType.cpp
@@ -55,7 +55,6 @@ int main()
     std::cout << j_mmap << '\n';
     std::cout << j_ummap << "\n\n";
 
-
     // ===========
     // array types
     // ===========
@@ -81,7 +80,7 @@ int main()
     json j_list(c_list);
 
     // create an array from std::forward_list
-    std::forward_list<int64_t> c_flist {12345678909876, 23456789098765, 34567890987654, 45678909876543};
+    std::forward_list<std::int64_t> c_flist {12345678909876, 23456789098765, 34567890987654, 45678909876543};
     json j_flist(c_flist);
 
     // create an array from std::array
@@ -117,7 +116,6 @@ int main()
     std::cout << j_mset << '\n';
     std::cout << j_umset << "\n\n";
 
-
     // ============
     // string types
     // ============
@@ -138,7 +136,6 @@ int main()
     std::cout << j_string_literal << '\n';
     std::cout << j_stdstring << "\n\n";
 
-
     // ============
     // number types
     // ============
@@ -203,7 +200,6 @@ int main()
     std::cout << j_float_nan << '\n';
     std::cout << j_double << "\n\n";
 
-
     // =============
     // boolean types
     // =============
diff --git a/external_imported/json/doc/examples/basic_json__CompatibleType.output b/external_imported/json/docs/examples/basic_json__CompatibleType.output
similarity index 100%
rename from external_imported/json/doc/examples/basic_json__CompatibleType.output
rename to external_imported/json/docs/examples/basic_json__CompatibleType.output
diff --git a/external_imported/json/doc/examples/basic_json__InputIt_InputIt.cpp b/external_imported/json/docs/examples/basic_json__InputIt_InputIt.cpp
similarity index 94%
rename from external_imported/json/doc/examples/basic_json__InputIt_InputIt.cpp
rename to external_imported/json/docs/examples/basic_json__InputIt_InputIt.cpp
index ed5aff9a8..dec693c80 100644
--- a/external_imported/json/doc/examples/basic_json__InputIt_InputIt.cpp
+++ b/external_imported/json/docs/examples/basic_json__InputIt_InputIt.cpp
@@ -25,7 +25,7 @@ int main()
     {
         json j_invalid(j_number.begin() + 1, j_number.end());
     }
-    catch (json::invalid_iterator& e)
+    catch (const json::invalid_iterator& e)
     {
         std::cout << e.what() << '\n';
     }
diff --git a/external_imported/json/doc/examples/basic_json__InputIt_InputIt.output b/external_imported/json/docs/examples/basic_json__InputIt_InputIt.output
similarity index 100%
rename from external_imported/json/doc/examples/basic_json__InputIt_InputIt.output
rename to external_imported/json/docs/examples/basic_json__InputIt_InputIt.output
diff --git a/external_imported/json/doc/examples/basic_json__basic_json.cpp b/external_imported/json/docs/examples/basic_json__basic_json.cpp
similarity index 100%
rename from external_imported/json/doc/examples/basic_json__basic_json.cpp
rename to external_imported/json/docs/examples/basic_json__basic_json.cpp
diff --git a/external_imported/json/doc/examples/basic_json__basic_json.output b/external_imported/json/docs/examples/basic_json__basic_json.output
similarity index 100%
rename from external_imported/json/doc/examples/basic_json__basic_json.output
rename to external_imported/json/docs/examples/basic_json__basic_json.output
diff --git a/external_imported/json/doc/examples/basic_json__copyassignment.cpp b/external_imported/json/docs/examples/basic_json__copyassignment.cpp
similarity index 100%
rename from external_imported/json/doc/examples/basic_json__copyassignment.cpp
rename to external_imported/json/docs/examples/basic_json__copyassignment.cpp
diff --git a/external_imported/json/doc/examples/basic_json__copyassignment.output b/external_imported/json/docs/examples/basic_json__copyassignment.output
similarity index 100%
rename from external_imported/json/doc/examples/basic_json__copyassignment.output
rename to external_imported/json/docs/examples/basic_json__copyassignment.output
diff --git a/external_imported/json/doc/examples/basic_json__list_init_t.cpp b/external_imported/json/docs/examples/basic_json__list_init_t.cpp
similarity index 100%
rename from external_imported/json/doc/examples/basic_json__list_init_t.cpp
rename to external_imported/json/docs/examples/basic_json__list_init_t.cpp
diff --git a/external_imported/json/doc/examples/basic_json__list_init_t.output b/external_imported/json/docs/examples/basic_json__list_init_t.output
similarity index 100%
rename from external_imported/json/doc/examples/basic_json__list_init_t.output
rename to external_imported/json/docs/examples/basic_json__list_init_t.output
diff --git a/external_imported/json/doc/examples/basic_json__moveconstructor.cpp b/external_imported/json/docs/examples/basic_json__moveconstructor.cpp
similarity index 100%
rename from external_imported/json/doc/examples/basic_json__moveconstructor.cpp
rename to external_imported/json/docs/examples/basic_json__moveconstructor.cpp
diff --git a/external_imported/json/doc/examples/basic_json__moveconstructor.output b/external_imported/json/docs/examples/basic_json__moveconstructor.output
similarity index 100%
rename from external_imported/json/doc/examples/basic_json__moveconstructor.output
rename to external_imported/json/docs/examples/basic_json__moveconstructor.output
diff --git a/external_imported/json/doc/examples/basic_json__nullptr_t.cpp b/external_imported/json/docs/examples/basic_json__nullptr_t.cpp
similarity index 100%
rename from external_imported/json/doc/examples/basic_json__nullptr_t.cpp
rename to external_imported/json/docs/examples/basic_json__nullptr_t.cpp
diff --git a/external_imported/json/doc/examples/basic_json__nullptr_t.output b/external_imported/json/docs/examples/basic_json__nullptr_t.output
similarity index 100%
rename from external_imported/json/doc/examples/basic_json__nullptr_t.output
rename to external_imported/json/docs/examples/basic_json__nullptr_t.output
diff --git a/external_imported/json/doc/examples/basic_json__size_type_basic_json.cpp b/external_imported/json/docs/examples/basic_json__size_type_basic_json.cpp
similarity index 100%
rename from external_imported/json/doc/examples/basic_json__size_type_basic_json.cpp
rename to external_imported/json/docs/examples/basic_json__size_type_basic_json.cpp
diff --git a/external_imported/json/doc/examples/basic_json__size_type_basic_json.output b/external_imported/json/docs/examples/basic_json__size_type_basic_json.output
similarity index 100%
rename from external_imported/json/doc/examples/basic_json__size_type_basic_json.output
rename to external_imported/json/docs/examples/basic_json__size_type_basic_json.output
diff --git a/external_imported/json/doc/examples/basic_json__value_t.cpp b/external_imported/json/docs/examples/basic_json__value_t.cpp
similarity index 100%
rename from external_imported/json/doc/examples/basic_json__value_t.cpp
rename to external_imported/json/docs/examples/basic_json__value_t.cpp
diff --git a/external_imported/json/doc/examples/basic_json__value_t.output b/external_imported/json/docs/examples/basic_json__value_t.output
similarity index 100%
rename from external_imported/json/doc/examples/basic_json__value_t.output
rename to external_imported/json/docs/examples/basic_json__value_t.output
diff --git a/external_imported/json/doc/examples/begin.cpp b/external_imported/json/docs/examples/begin.cpp
similarity index 100%
rename from external_imported/json/doc/examples/begin.cpp
rename to external_imported/json/docs/examples/begin.cpp
diff --git a/external_imported/json/doc/examples/begin.output b/external_imported/json/docs/examples/begin.output
similarity index 100%
rename from external_imported/json/doc/examples/begin.output
rename to external_imported/json/docs/examples/begin.output
diff --git a/external_imported/json/docs/examples/binary.cpp b/external_imported/json/docs/examples/binary.cpp
new file mode 100644
index 000000000..617ce6096
--- /dev/null
+++ b/external_imported/json/docs/examples/binary.cpp
@@ -0,0 +1,16 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    // create a binary vector
+    std::vector<std::uint8_t> vec = {0xCA, 0xFE, 0xBA, 0xBE};
+
+    // create a binary JSON value with subtype 42
+    json j = json::binary(vec, 42);
+
+    // output type and subtype
+    std::cout << "type: " << j.type_name() << ", subtype: " << j.get_binary().subtype() << std::endl;
+}
diff --git a/external_imported/json/docs/examples/binary.output b/external_imported/json/docs/examples/binary.output
new file mode 100644
index 000000000..74b05d23f
--- /dev/null
+++ b/external_imported/json/docs/examples/binary.output
@@ -0,0 +1 @@
+type: binary, subtype: 42
diff --git a/external_imported/json/docs/examples/binary_t.cpp b/external_imported/json/docs/examples/binary_t.cpp
new file mode 100644
index 000000000..bfaee5ca8
--- /dev/null
+++ b/external_imported/json/docs/examples/binary_t.cpp
@@ -0,0 +1,10 @@
+#include <iostream>
+#include <iomanip>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    std::cout << std::boolalpha << std::is_same<nlohmann::byte_container_with_subtype<std::vector<std::uint8_t>>, json::binary_t>::value << std::endl;
+}
diff --git a/external_imported/json/docs/examples/binary_t.output b/external_imported/json/docs/examples/binary_t.output
new file mode 100644
index 000000000..27ba77dda
--- /dev/null
+++ b/external_imported/json/docs/examples/binary_t.output
@@ -0,0 +1 @@
+true
diff --git a/external_imported/json/docs/examples/boolean_t.cpp b/external_imported/json/docs/examples/boolean_t.cpp
new file mode 100644
index 000000000..75b8c99f9
--- /dev/null
+++ b/external_imported/json/docs/examples/boolean_t.cpp
@@ -0,0 +1,10 @@
+#include <iostream>
+#include <iomanip>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    std::cout << std::boolalpha << std::is_same<bool, json::boolean_t>::value << std::endl;
+}
diff --git a/external_imported/json/docs/examples/boolean_t.output b/external_imported/json/docs/examples/boolean_t.output
new file mode 100644
index 000000000..27ba77dda
--- /dev/null
+++ b/external_imported/json/docs/examples/boolean_t.output
@@ -0,0 +1 @@
+true
diff --git a/external_imported/json/docs/examples/byte_container_with_subtype__byte_container_with_subtype.cpp b/external_imported/json/docs/examples/byte_container_with_subtype__byte_container_with_subtype.cpp
new file mode 100644
index 000000000..1c10be5c2
--- /dev/null
+++ b/external_imported/json/docs/examples/byte_container_with_subtype__byte_container_with_subtype.cpp
@@ -0,0 +1,23 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+// define a byte container based on std::vector
+using byte_container_with_subtype = nlohmann::byte_container_with_subtype<std::vector<std::uint8_t>>;
+
+using json = nlohmann::json;
+
+int main()
+{
+    // (1) create empty container
+    auto c1 = byte_container_with_subtype();
+
+    std::vector<std::uint8_t> bytes = {{0xca, 0xfe, 0xba, 0xbe}};
+
+    // (2) create container
+    auto c2 = byte_container_with_subtype(bytes);
+
+    // (3) create container with subtype
+    auto c3 = byte_container_with_subtype(bytes, 42);
+
+    std::cout << json(c1) << "\n" << json(c2) << "\n" << json(c3) << std::endl;
+}
diff --git a/external_imported/json/docs/examples/byte_container_with_subtype__byte_container_with_subtype.output b/external_imported/json/docs/examples/byte_container_with_subtype__byte_container_with_subtype.output
new file mode 100644
index 000000000..67ac1b2ef
--- /dev/null
+++ b/external_imported/json/docs/examples/byte_container_with_subtype__byte_container_with_subtype.output
@@ -0,0 +1,3 @@
+{"bytes":[],"subtype":null}
+{"bytes":[202,254,186,190],"subtype":null}
+{"bytes":[202,254,186,190],"subtype":42}
diff --git a/external_imported/json/docs/examples/byte_container_with_subtype__clear_subtype.cpp b/external_imported/json/docs/examples/byte_container_with_subtype__clear_subtype.cpp
new file mode 100644
index 000000000..f9ce6842b
--- /dev/null
+++ b/external_imported/json/docs/examples/byte_container_with_subtype__clear_subtype.cpp
@@ -0,0 +1,21 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+// define a byte container based on std::vector
+using byte_container_with_subtype = nlohmann::byte_container_with_subtype<std::vector<std::uint8_t>>;
+
+using json = nlohmann::json;
+
+int main()
+{
+    std::vector<std::uint8_t> bytes = {{0xca, 0xfe, 0xba, 0xbe}};
+
+    // create container with subtype
+    auto c1 = byte_container_with_subtype(bytes, 42);
+
+    std::cout << "before calling clear_subtype(): " << json(c1) << '\n';
+
+    c1.clear_subtype();
+
+    std::cout << "after calling clear_subtype(): " << json(c1) << '\n';
+}
diff --git a/external_imported/json/docs/examples/byte_container_with_subtype__clear_subtype.output b/external_imported/json/docs/examples/byte_container_with_subtype__clear_subtype.output
new file mode 100644
index 000000000..9d8212946
--- /dev/null
+++ b/external_imported/json/docs/examples/byte_container_with_subtype__clear_subtype.output
@@ -0,0 +1,2 @@
+before calling clear_subtype(): {"bytes":[202,254,186,190],"subtype":42}
+after calling clear_subtype(): {"bytes":[202,254,186,190],"subtype":null}
diff --git a/external_imported/json/docs/examples/byte_container_with_subtype__has_subtype.cpp b/external_imported/json/docs/examples/byte_container_with_subtype__has_subtype.cpp
new file mode 100644
index 000000000..61c21eaae
--- /dev/null
+++ b/external_imported/json/docs/examples/byte_container_with_subtype__has_subtype.cpp
@@ -0,0 +1,19 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+// define a byte container based on std::vector
+using byte_container_with_subtype = nlohmann::byte_container_with_subtype<std::vector<std::uint8_t>>;
+
+int main()
+{
+    std::vector<std::uint8_t> bytes = {{0xca, 0xfe, 0xba, 0xbe}};
+
+    // create container
+    auto c1 = byte_container_with_subtype(bytes);
+
+    // create container with subtype
+    auto c2 = byte_container_with_subtype(bytes, 42);
+
+    std::cout << std::boolalpha << "c1.has_subtype() = " << c1.has_subtype()
+              << "\nc2.has_subtype() = " << c2.has_subtype() << std::endl;
+}
diff --git a/external_imported/json/docs/examples/byte_container_with_subtype__has_subtype.output b/external_imported/json/docs/examples/byte_container_with_subtype__has_subtype.output
new file mode 100644
index 000000000..f4aade2a1
--- /dev/null
+++ b/external_imported/json/docs/examples/byte_container_with_subtype__has_subtype.output
@@ -0,0 +1,2 @@
+c1.has_subtype() = false
+c2.has_subtype() = true
diff --git a/external_imported/json/docs/examples/byte_container_with_subtype__set_subtype.cpp b/external_imported/json/docs/examples/byte_container_with_subtype__set_subtype.cpp
new file mode 100644
index 000000000..b2694c54d
--- /dev/null
+++ b/external_imported/json/docs/examples/byte_container_with_subtype__set_subtype.cpp
@@ -0,0 +1,22 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+// define a byte container based on std::vector
+using byte_container_with_subtype = nlohmann::byte_container_with_subtype<std::vector<std::uint8_t>>;
+
+using json = nlohmann::json;
+
+int main()
+{
+    std::vector<std::uint8_t> bytes = {{0xca, 0xfe, 0xba, 0xbe}};
+
+    // create container without subtype
+    auto c = byte_container_with_subtype(bytes);
+
+    std::cout << "before calling set_subtype(42): " << json(c) << '\n';
+
+    // set the subtype
+    c.set_subtype(42);
+
+    std::cout << "after calling set_subtype(42): " << json(c) << '\n';
+}
diff --git a/external_imported/json/docs/examples/byte_container_with_subtype__set_subtype.output b/external_imported/json/docs/examples/byte_container_with_subtype__set_subtype.output
new file mode 100644
index 000000000..648b3ef24
--- /dev/null
+++ b/external_imported/json/docs/examples/byte_container_with_subtype__set_subtype.output
@@ -0,0 +1,2 @@
+before calling set_subtype(42): {"bytes":[202,254,186,190],"subtype":null}
+after calling set_subtype(42): {"bytes":[202,254,186,190],"subtype":42}
diff --git a/external_imported/json/docs/examples/byte_container_with_subtype__subtype.cpp b/external_imported/json/docs/examples/byte_container_with_subtype__subtype.cpp
new file mode 100644
index 000000000..cd230ade1
--- /dev/null
+++ b/external_imported/json/docs/examples/byte_container_with_subtype__subtype.cpp
@@ -0,0 +1,22 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+// define a byte container based on std::vector
+using byte_container_with_subtype = nlohmann::byte_container_with_subtype<std::vector<std::uint8_t>>;
+
+int main()
+{
+    std::vector<std::uint8_t> bytes = {{0xca, 0xfe, 0xba, 0xbe}};
+
+    // create container
+    auto c1 = byte_container_with_subtype(bytes);
+
+    // create container with subtype
+    auto c2 = byte_container_with_subtype(bytes, 42);
+
+    std::cout << "c1.subtype() = " << c1.subtype()
+              << "\nc2.subtype() = " << c2.subtype() << std::endl;
+
+    // in case no subtype is set, return special value
+    assert(c1.subtype() == static_cast<byte_container_with_subtype::subtype_type>(-1));
+}
diff --git a/external_imported/json/docs/examples/byte_container_with_subtype__subtype.output b/external_imported/json/docs/examples/byte_container_with_subtype__subtype.output
new file mode 100644
index 000000000..47955277b
--- /dev/null
+++ b/external_imported/json/docs/examples/byte_container_with_subtype__subtype.output
@@ -0,0 +1,2 @@
+c1.subtype() = 18446744073709551615
+c2.subtype() = 42
diff --git a/external_imported/json/doc/examples/cbegin.cpp b/external_imported/json/docs/examples/cbegin.cpp
similarity index 100%
rename from external_imported/json/doc/examples/cbegin.cpp
rename to external_imported/json/docs/examples/cbegin.cpp
diff --git a/external_imported/json/doc/examples/cbegin.output b/external_imported/json/docs/examples/cbegin.output
similarity index 100%
rename from external_imported/json/doc/examples/cbegin.output
rename to external_imported/json/docs/examples/cbegin.output
diff --git a/external_imported/json/docs/examples/cbor_tag_handler_t.cpp b/external_imported/json/docs/examples/cbor_tag_handler_t.cpp
new file mode 100644
index 000000000..38d168ca8
--- /dev/null
+++ b/external_imported/json/docs/examples/cbor_tag_handler_t.cpp
@@ -0,0 +1,28 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    // tagged byte string
+    std::vector<std::uint8_t> vec = {{0xd8, 0x42, 0x44, 0xcA, 0xfe, 0xba, 0xbe}};
+
+    // cbor_tag_handler_t::error throws
+    try
+    {
+        auto b_throw_on_tag = json::from_cbor(vec, true, true, json::cbor_tag_handler_t::error);
+    }
+    catch (const json::parse_error& e)
+    {
+        std::cout << e.what() << std::endl;
+    }
+
+    // cbor_tag_handler_t::ignore ignores the tag
+    auto b_ignore_tag = json::from_cbor(vec, true, true, json::cbor_tag_handler_t::ignore);
+    std::cout << b_ignore_tag << std::endl;
+
+    // cbor_tag_handler_t::store stores the tag as binary subtype
+    auto b_store_tag = json::from_cbor(vec, true, true, json::cbor_tag_handler_t::store);
+    std::cout << b_store_tag << std::endl;
+}
diff --git a/external_imported/json/docs/examples/cbor_tag_handler_t.output b/external_imported/json/docs/examples/cbor_tag_handler_t.output
new file mode 100644
index 000000000..18920b137
--- /dev/null
+++ b/external_imported/json/docs/examples/cbor_tag_handler_t.output
@@ -0,0 +1,3 @@
+[json.exception.parse_error.112] parse error at byte 1: syntax error while parsing CBOR value: invalid byte: 0xD8
+{"bytes":[202,254,186,190],"subtype":null}
+{"bytes":[202,254,186,190],"subtype":66}
diff --git a/external_imported/json/doc/examples/cend.cpp b/external_imported/json/docs/examples/cend.cpp
similarity index 100%
rename from external_imported/json/doc/examples/cend.cpp
rename to external_imported/json/docs/examples/cend.cpp
diff --git a/external_imported/json/doc/examples/cend.output b/external_imported/json/docs/examples/cend.output
similarity index 100%
rename from external_imported/json/doc/examples/cend.output
rename to external_imported/json/docs/examples/cend.output
diff --git a/external_imported/json/doc/examples/clear.cpp b/external_imported/json/docs/examples/clear.cpp
similarity index 100%
rename from external_imported/json/doc/examples/clear.cpp
rename to external_imported/json/docs/examples/clear.cpp
diff --git a/external_imported/json/doc/examples/clear.output b/external_imported/json/docs/examples/clear.output
similarity index 100%
rename from external_imported/json/doc/examples/clear.output
rename to external_imported/json/docs/examples/clear.output
diff --git a/external_imported/json/docs/examples/contains__json_pointer.cpp b/external_imported/json/docs/examples/contains__json_pointer.cpp
new file mode 100644
index 000000000..14d8514b4
--- /dev/null
+++ b/external_imported/json/docs/examples/contains__json_pointer.cpp
@@ -0,0 +1,43 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+using namespace nlohmann::literals;
+
+int main()
+{
+    // create a JSON value
+    json j =
+    {
+        {"number", 1}, {"string", "foo"}, {"array", {1, 2}}
+    };
+
+    std::cout << std::boolalpha
+              << j.contains("/number"_json_pointer) << '\n'
+              << j.contains("/string"_json_pointer) << '\n'
+              << j.contains("/array"_json_pointer) << '\n'
+              << j.contains("/array/1"_json_pointer) << '\n'
+              << j.contains("/array/-"_json_pointer) << '\n'
+              << j.contains("/array/4"_json_pointer) << '\n'
+              << j.contains("/baz"_json_pointer) << std::endl;
+
+    try
+    {
+        // try to use an array index with leading '0'
+        j.contains("/array/01"_json_pointer);
+    }
+    catch (const json::parse_error& e)
+    {
+        std::cout << e.what() << '\n';
+    }
+
+    try
+    {
+        // try to use an array index that is not a number
+        j.contains("/array/one"_json_pointer);
+    }
+    catch (const json::parse_error& e)
+    {
+        std::cout << e.what() << '\n';
+    }
+}
diff --git a/external_imported/json/doc/examples/contains_json_pointer.output b/external_imported/json/docs/examples/contains__json_pointer.output
similarity index 100%
rename from external_imported/json/doc/examples/contains_json_pointer.output
rename to external_imported/json/docs/examples/contains__json_pointer.output
diff --git a/external_imported/json/docs/examples/contains__keytype.c++17.cpp b/external_imported/json/docs/examples/contains__keytype.c++17.cpp
new file mode 100644
index 000000000..43b62fab1
--- /dev/null
+++ b/external_imported/json/docs/examples/contains__keytype.c++17.cpp
@@ -0,0 +1,20 @@
+#include <iostream>
+#include <string_view>
+#include <nlohmann/json.hpp>
+
+using namespace std::string_view_literals;
+using json = nlohmann::json;
+using namespace nlohmann::literals;
+
+int main()
+{
+    // create some JSON values
+    json j_object = R"( {"key": "value"} )"_json;
+    json j_array = R"( [1, 2, 3] )"_json;
+
+    // call contains
+    std::cout << std::boolalpha <<
+              "j_object contains 'key': " << j_object.contains("key"sv) << '\n' <<
+              "j_object contains 'another': " << j_object.contains("another"sv) << '\n' <<
+              "j_array contains 'key': " << j_array.contains("key"sv) << std::endl;
+}
diff --git a/external_imported/json/doc/examples/contains.output b/external_imported/json/docs/examples/contains__keytype.c++17.output
similarity index 100%
rename from external_imported/json/doc/examples/contains.output
rename to external_imported/json/docs/examples/contains__keytype.c++17.output
diff --git a/external_imported/json/docs/examples/contains__object_t_key_type.cpp b/external_imported/json/docs/examples/contains__object_t_key_type.cpp
new file mode 100644
index 000000000..a8bc8143d
--- /dev/null
+++ b/external_imported/json/docs/examples/contains__object_t_key_type.cpp
@@ -0,0 +1,18 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+using namespace nlohmann::literals;
+
+int main()
+{
+    // create some JSON values
+    json j_object = R"( {"key": "value"} )"_json;
+    json j_array = R"( [1, 2, 3] )"_json;
+
+    // call contains
+    std::cout << std::boolalpha <<
+              "j_object contains 'key': " << j_object.contains("key") << '\n' <<
+              "j_object contains 'another': " << j_object.contains("another") << '\n' <<
+              "j_array contains 'key': " << j_array.contains("key") << std::endl;
+}
diff --git a/external_imported/json/docs/examples/contains__object_t_key_type.output b/external_imported/json/docs/examples/contains__object_t_key_type.output
new file mode 100644
index 000000000..14ad177b1
--- /dev/null
+++ b/external_imported/json/docs/examples/contains__object_t_key_type.output
@@ -0,0 +1,3 @@
+j_object contains 'key': true
+j_object contains 'another': false
+j_array contains 'key': false
diff --git a/external_imported/json/docs/examples/count__keytype.c++17.cpp b/external_imported/json/docs/examples/count__keytype.c++17.cpp
new file mode 100644
index 000000000..ec6de0607
--- /dev/null
+++ b/external_imported/json/docs/examples/count__keytype.c++17.cpp
@@ -0,0 +1,20 @@
+#include <iostream>
+#include <string_view>
+#include <nlohmann/json.hpp>
+
+using namespace std::string_view_literals;
+using json = nlohmann::json;
+
+int main()
+{
+    // create a JSON object
+    json j_object = {{"one", 1}, {"two", 2}};
+
+    // call count()
+    auto count_two = j_object.count("two"sv);
+    auto count_three = j_object.count("three"sv);
+
+    // print values
+    std::cout << "number of elements with key \"two\": " << count_two << '\n';
+    std::cout << "number of elements with key \"three\": " << count_three << '\n';
+}
diff --git a/external_imported/json/doc/examples/count.output b/external_imported/json/docs/examples/count__keytype.c++17.output
similarity index 100%
rename from external_imported/json/doc/examples/count.output
rename to external_imported/json/docs/examples/count__keytype.c++17.output
diff --git a/external_imported/json/doc/examples/count.cpp b/external_imported/json/docs/examples/count__object_t_key_type.cpp
similarity index 100%
rename from external_imported/json/doc/examples/count.cpp
rename to external_imported/json/docs/examples/count__object_t_key_type.cpp
diff --git a/external_imported/json/docs/examples/count__object_t_key_type.output b/external_imported/json/docs/examples/count__object_t_key_type.output
new file mode 100644
index 000000000..d816fcb24
--- /dev/null
+++ b/external_imported/json/docs/examples/count__object_t_key_type.output
@@ -0,0 +1,2 @@
+number of elements with key "two": 1
+number of elements with key "three": 0
diff --git a/external_imported/json/doc/examples/crbegin.cpp b/external_imported/json/docs/examples/crbegin.cpp
similarity index 100%
rename from external_imported/json/doc/examples/crbegin.cpp
rename to external_imported/json/docs/examples/crbegin.cpp
diff --git a/external_imported/json/doc/examples/crbegin.output b/external_imported/json/docs/examples/crbegin.output
similarity index 100%
rename from external_imported/json/doc/examples/crbegin.output
rename to external_imported/json/docs/examples/crbegin.output
diff --git a/external_imported/json/doc/examples/crend.cpp b/external_imported/json/docs/examples/crend.cpp
similarity index 100%
rename from external_imported/json/doc/examples/crend.cpp
rename to external_imported/json/docs/examples/crend.cpp
diff --git a/external_imported/json/doc/examples/crend.output b/external_imported/json/docs/examples/crend.output
similarity index 100%
rename from external_imported/json/doc/examples/crend.output
rename to external_imported/json/docs/examples/crend.output
diff --git a/external_imported/json/docs/examples/default_object_comparator_t.cpp b/external_imported/json/docs/examples/default_object_comparator_t.cpp
new file mode 100644
index 000000000..9f200fe6b
--- /dev/null
+++ b/external_imported/json/docs/examples/default_object_comparator_t.cpp
@@ -0,0 +1,11 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    std::cout << std::boolalpha
+              << "one < two : " << json::default_object_comparator_t{}("one", "two") << "\n"
+              << "three < four : " << json::default_object_comparator_t{}("three", "four") << std::endl;
+}
diff --git a/external_imported/json/docs/examples/default_object_comparator_t.output b/external_imported/json/docs/examples/default_object_comparator_t.output
new file mode 100644
index 000000000..b1daf3b96
--- /dev/null
+++ b/external_imported/json/docs/examples/default_object_comparator_t.output
@@ -0,0 +1,2 @@
+one < two : true
+three < four : false
diff --git a/external_imported/json/doc/examples/diagnostics_extended.cpp b/external_imported/json/docs/examples/diagnostics_extended.cpp
similarity index 90%
rename from external_imported/json/doc/examples/diagnostics_extended.cpp
rename to external_imported/json/docs/examples/diagnostics_extended.cpp
index f4c43f05e..3b9f484b7 100644
--- a/external_imported/json/doc/examples/diagnostics_extended.cpp
+++ b/external_imported/json/docs/examples/diagnostics_extended.cpp
@@ -15,7 +15,7 @@ int main()
     {
         int housenumber = j["address"]["housenumber"];
     }
-    catch (json::exception& e)
+    catch (const json::exception& e)
     {
         std::cout << e.what() << '\n';
     }
diff --git a/external_imported/json/doc/examples/diagnostics_extended.output b/external_imported/json/docs/examples/diagnostics_extended.output
similarity index 100%
rename from external_imported/json/doc/examples/diagnostics_extended.output
rename to external_imported/json/docs/examples/diagnostics_extended.output
diff --git a/external_imported/json/doc/examples/diagnostics_standard.cpp b/external_imported/json/docs/examples/diagnostics_standard.cpp
similarity index 89%
rename from external_imported/json/doc/examples/diagnostics_standard.cpp
rename to external_imported/json/docs/examples/diagnostics_standard.cpp
index 575c409eb..eae61a4a7 100644
--- a/external_imported/json/doc/examples/diagnostics_standard.cpp
+++ b/external_imported/json/docs/examples/diagnostics_standard.cpp
@@ -13,7 +13,7 @@ int main()
     {
         int housenumber = j["address"]["housenumber"];
     }
-    catch (json::exception& e)
+    catch (const json::exception& e)
     {
         std::cout << e.what() << '\n';
     }
diff --git a/external_imported/json/doc/examples/diagnostics_standard.output b/external_imported/json/docs/examples/diagnostics_standard.output
similarity index 100%
rename from external_imported/json/doc/examples/diagnostics_standard.output
rename to external_imported/json/docs/examples/diagnostics_standard.output
diff --git a/external_imported/json/doc/examples/diff.cpp b/external_imported/json/docs/examples/diff.cpp
similarity index 95%
rename from external_imported/json/doc/examples/diff.cpp
rename to external_imported/json/docs/examples/diff.cpp
index 71b19be66..ef01332a1 100644
--- a/external_imported/json/doc/examples/diff.cpp
+++ b/external_imported/json/docs/examples/diff.cpp
@@ -3,6 +3,7 @@
 #include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
+using namespace nlohmann::literals;
 
 int main()
 {
diff --git a/external_imported/json/doc/examples/diff.output b/external_imported/json/docs/examples/diff.output
similarity index 100%
rename from external_imported/json/doc/examples/diff.output
rename to external_imported/json/docs/examples/diff.output
diff --git a/external_imported/json/doc/examples/dump.cpp b/external_imported/json/docs/examples/dump.cpp
similarity index 97%
rename from external_imported/json/doc/examples/dump.cpp
rename to external_imported/json/docs/examples/dump.cpp
index eb2d71f0e..009c95fd7 100644
--- a/external_imported/json/doc/examples/dump.cpp
+++ b/external_imported/json/docs/examples/dump.cpp
@@ -35,7 +35,7 @@ int main()
     {
         std::cout << j_invalid.dump() << std::endl;
     }
-    catch (json::type_error& e)
+    catch (const json::type_error& e)
     {
         std::cout << e.what() << std::endl;
     }
diff --git a/external_imported/json/doc/examples/dump.output b/external_imported/json/docs/examples/dump.output
similarity index 100%
rename from external_imported/json/doc/examples/dump.output
rename to external_imported/json/docs/examples/dump.output
diff --git a/external_imported/json/doc/examples/emplace.cpp b/external_imported/json/docs/examples/emplace.cpp
similarity index 100%
rename from external_imported/json/doc/examples/emplace.cpp
rename to external_imported/json/docs/examples/emplace.cpp
diff --git a/external_imported/json/doc/examples/emplace.output b/external_imported/json/docs/examples/emplace.output
similarity index 100%
rename from external_imported/json/doc/examples/emplace.output
rename to external_imported/json/docs/examples/emplace.output
diff --git a/external_imported/json/doc/examples/emplace_back.cpp b/external_imported/json/docs/examples/emplace_back.cpp
similarity index 100%
rename from external_imported/json/doc/examples/emplace_back.cpp
rename to external_imported/json/docs/examples/emplace_back.cpp
diff --git a/external_imported/json/doc/examples/emplace_back.output b/external_imported/json/docs/examples/emplace_back.output
similarity index 100%
rename from external_imported/json/doc/examples/emplace_back.output
rename to external_imported/json/docs/examples/emplace_back.output
diff --git a/external_imported/json/doc/examples/empty.cpp b/external_imported/json/docs/examples/empty.cpp
similarity index 100%
rename from external_imported/json/doc/examples/empty.cpp
rename to external_imported/json/docs/examples/empty.cpp
diff --git a/external_imported/json/doc/examples/empty.output b/external_imported/json/docs/examples/empty.output
similarity index 100%
rename from external_imported/json/doc/examples/empty.output
rename to external_imported/json/docs/examples/empty.output
diff --git a/external_imported/json/doc/examples/end.cpp b/external_imported/json/docs/examples/end.cpp
similarity index 100%
rename from external_imported/json/doc/examples/end.cpp
rename to external_imported/json/docs/examples/end.cpp
diff --git a/external_imported/json/doc/examples/end.output b/external_imported/json/docs/examples/end.output
similarity index 100%
rename from external_imported/json/doc/examples/end.output
rename to external_imported/json/docs/examples/end.output
diff --git a/external_imported/json/doc/examples/erase__IteratorType.cpp b/external_imported/json/docs/examples/erase__IteratorType.cpp
similarity index 100%
rename from external_imported/json/doc/examples/erase__IteratorType.cpp
rename to external_imported/json/docs/examples/erase__IteratorType.cpp
diff --git a/external_imported/json/doc/examples/erase__IteratorType.output b/external_imported/json/docs/examples/erase__IteratorType.output
similarity index 100%
rename from external_imported/json/doc/examples/erase__IteratorType.output
rename to external_imported/json/docs/examples/erase__IteratorType.output
diff --git a/external_imported/json/doc/examples/erase__IteratorType_IteratorType.cpp b/external_imported/json/docs/examples/erase__IteratorType_IteratorType.cpp
similarity index 100%
rename from external_imported/json/doc/examples/erase__IteratorType_IteratorType.cpp
rename to external_imported/json/docs/examples/erase__IteratorType_IteratorType.cpp
diff --git a/external_imported/json/doc/examples/erase__IteratorType_IteratorType.output b/external_imported/json/docs/examples/erase__IteratorType_IteratorType.output
similarity index 100%
rename from external_imported/json/doc/examples/erase__IteratorType_IteratorType.output
rename to external_imported/json/docs/examples/erase__IteratorType_IteratorType.output
diff --git a/external_imported/json/docs/examples/erase__keytype.c++17.cpp b/external_imported/json/docs/examples/erase__keytype.c++17.cpp
new file mode 100644
index 000000000..c5e4bed5d
--- /dev/null
+++ b/external_imported/json/docs/examples/erase__keytype.c++17.cpp
@@ -0,0 +1,20 @@
+#include <iostream>
+#include <string_view>
+#include <nlohmann/json.hpp>
+
+using namespace std::string_view_literals;
+using json = nlohmann::json;
+
+int main()
+{
+    // create a JSON object
+    json j_object = {{"one", 1}, {"two", 2}};
+
+    // call erase()
+    auto count_one = j_object.erase("one"sv);
+    auto count_three = j_object.erase("three"sv);
+
+    // print values
+    std::cout << j_object << '\n';
+    std::cout << count_one << " " << count_three << '\n';
+}
diff --git a/external_imported/json/doc/examples/erase__key_type.output b/external_imported/json/docs/examples/erase__keytype.c++17.output
similarity index 100%
rename from external_imported/json/doc/examples/erase__key_type.output
rename to external_imported/json/docs/examples/erase__keytype.c++17.output
diff --git a/external_imported/json/doc/examples/erase__key_type.cpp b/external_imported/json/docs/examples/erase__object_t_key_type.cpp
similarity index 100%
rename from external_imported/json/doc/examples/erase__key_type.cpp
rename to external_imported/json/docs/examples/erase__object_t_key_type.cpp
diff --git a/external_imported/json/docs/examples/erase__object_t_key_type.output b/external_imported/json/docs/examples/erase__object_t_key_type.output
new file mode 100644
index 000000000..28d79391a
--- /dev/null
+++ b/external_imported/json/docs/examples/erase__object_t_key_type.output
@@ -0,0 +1,2 @@
+{"two":2}
+1 0
diff --git a/external_imported/json/doc/examples/erase__size_type.cpp b/external_imported/json/docs/examples/erase__size_type.cpp
similarity index 100%
rename from external_imported/json/doc/examples/erase__size_type.cpp
rename to external_imported/json/docs/examples/erase__size_type.cpp
diff --git a/external_imported/json/doc/examples/erase__size_type.output b/external_imported/json/docs/examples/erase__size_type.output
similarity index 100%
rename from external_imported/json/doc/examples/erase__size_type.output
rename to external_imported/json/docs/examples/erase__size_type.output
diff --git a/external_imported/json/docs/examples/error_handler_t.cpp b/external_imported/json/docs/examples/error_handler_t.cpp
new file mode 100644
index 000000000..b4718d7e6
--- /dev/null
+++ b/external_imported/json/docs/examples/error_handler_t.cpp
@@ -0,0 +1,24 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    // create JSON value with invalid UTF-8 byte sequence
+    json j_invalid = "ä\xA9ü";
+    try
+    {
+        std::cout << j_invalid.dump() << std::endl;
+    }
+    catch (const json::type_error& e)
+    {
+        std::cout << e.what() << std::endl;
+    }
+
+    std::cout << "string with replaced invalid characters: "
+              << j_invalid.dump(-1, ' ', false, json::error_handler_t::replace)
+              << "\nstring with ignored invalid characters: "
+              << j_invalid.dump(-1, ' ', false, json::error_handler_t::ignore)
+              << '\n';
+}
diff --git a/external_imported/json/docs/examples/error_handler_t.output b/external_imported/json/docs/examples/error_handler_t.output
new file mode 100644
index 000000000..718d62bee
--- /dev/null
+++ b/external_imported/json/docs/examples/error_handler_t.output
@@ -0,0 +1,3 @@
+[json.exception.type_error.316] invalid UTF-8 byte at index 2: 0xA9
+string with replaced invalid characters: "ä�ü"
+string with ignored invalid characters: "äü"
diff --git a/external_imported/json/doc/examples/exception.cpp b/external_imported/json/docs/examples/exception.cpp
similarity index 91%
rename from external_imported/json/doc/examples/exception.cpp
rename to external_imported/json/docs/examples/exception.cpp
index 82696e614..3e5a23b3c 100644
--- a/external_imported/json/doc/examples/exception.cpp
+++ b/external_imported/json/docs/examples/exception.cpp
@@ -11,7 +11,7 @@ int main()
         json j = {{"foo", "bar"}};
         json k = j.at("non-existing");
     }
-    catch (json::exception& e)
+    catch (const json::exception& e)
     {
         // output exception information
         std::cout << "message: " << e.what() << '\n'
diff --git a/external_imported/json/doc/examples/exception.output b/external_imported/json/docs/examples/exception.output
similarity index 100%
rename from external_imported/json/doc/examples/exception.output
rename to external_imported/json/docs/examples/exception.output
diff --git a/external_imported/json/docs/examples/find__keytype.c++17.cpp b/external_imported/json/docs/examples/find__keytype.c++17.cpp
new file mode 100644
index 000000000..da94cf0ad
--- /dev/null
+++ b/external_imported/json/docs/examples/find__keytype.c++17.cpp
@@ -0,0 +1,22 @@
+#include <iostream>
+#include <string_view>
+#include <nlohmann/json.hpp>
+
+using namespace std::string_view_literals;
+using json = nlohmann::json;
+
+int main()
+{
+    // create a JSON object
+    json j_object = {{"one", 1}, {"two", 2}};
+
+    // call find
+    auto it_two = j_object.find("two"sv);
+    auto it_three = j_object.find("three"sv);
+
+    // print values
+    std::cout << std::boolalpha;
+    std::cout << "\"two\" was found: " << (it_two != j_object.end()) << '\n';
+    std::cout << "value at key \"two\": " << *it_two << '\n';
+    std::cout << "\"three\" was found: " << (it_three != j_object.end()) << '\n';
+}
diff --git a/external_imported/json/doc/examples/find__key_type.output b/external_imported/json/docs/examples/find__keytype.c++17.output
similarity index 100%
rename from external_imported/json/doc/examples/find__key_type.output
rename to external_imported/json/docs/examples/find__keytype.c++17.output
diff --git a/external_imported/json/doc/examples/find__key_type.cpp b/external_imported/json/docs/examples/find__object_t_key_type.cpp
similarity index 100%
rename from external_imported/json/doc/examples/find__key_type.cpp
rename to external_imported/json/docs/examples/find__object_t_key_type.cpp
diff --git a/external_imported/json/docs/examples/find__object_t_key_type.output b/external_imported/json/docs/examples/find__object_t_key_type.output
new file mode 100644
index 000000000..509bb42d5
--- /dev/null
+++ b/external_imported/json/docs/examples/find__object_t_key_type.output
@@ -0,0 +1,3 @@
+"two" was found: true
+value at key "two": 2
+"three" was found: false
diff --git a/external_imported/json/doc/examples/flatten.cpp b/external_imported/json/docs/examples/flatten.cpp
similarity index 100%
rename from external_imported/json/doc/examples/flatten.cpp
rename to external_imported/json/docs/examples/flatten.cpp
diff --git a/external_imported/json/doc/examples/flatten.output b/external_imported/json/docs/examples/flatten.output
similarity index 100%
rename from external_imported/json/doc/examples/flatten.output
rename to external_imported/json/docs/examples/flatten.output
diff --git a/external_imported/json/docs/examples/from_bjdata.cpp b/external_imported/json/docs/examples/from_bjdata.cpp
new file mode 100644
index 000000000..961164c29
--- /dev/null
+++ b/external_imported/json/docs/examples/from_bjdata.cpp
@@ -0,0 +1,20 @@
+#include <iostream>
+#include <iomanip>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    // create byte vector
+    std::vector<std::uint8_t> v = {0x7B, 0x69, 0x07, 0x63, 0x6F, 0x6D, 0x70, 0x61,
+                                   0x63, 0x74, 0x54, 0x69, 0x06, 0x73, 0x63, 0x68,
+                                   0x65, 0x6D, 0x61, 0x69, 0x00, 0x7D
+                                  };
+
+    // deserialize it with BJData
+    json j = json::from_bjdata(v);
+
+    // print the deserialized JSON value
+    std::cout << std::setw(2) << j << std::endl;
+}
diff --git a/external_imported/json/doc/examples/from_bson.output b/external_imported/json/docs/examples/from_bjdata.output
similarity index 100%
rename from external_imported/json/doc/examples/from_bson.output
rename to external_imported/json/docs/examples/from_bjdata.output
diff --git a/external_imported/json/docs/examples/from_bson.cpp b/external_imported/json/docs/examples/from_bson.cpp
new file mode 100644
index 000000000..c9d9fdfa6
--- /dev/null
+++ b/external_imported/json/docs/examples/from_bson.cpp
@@ -0,0 +1,21 @@
+#include <iostream>
+#include <iomanip>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    // create byte vector
+    std::vector<std::uint8_t> v = {0x1b, 0x00, 0x00, 0x00, 0x08, 0x63, 0x6f, 0x6d,
+                                   0x70, 0x61, 0x63, 0x74, 0x00, 0x01, 0x10, 0x73,
+                                   0x63, 0x68, 0x65, 0x6d, 0x61, 0x00, 0x00, 0x00,
+                                   0x00, 0x00, 0x00
+                                  };
+
+    // deserialize it with BSON
+    json j = json::from_bson(v);
+
+    // print the deserialized JSON value
+    std::cout << std::setw(2) << j << std::endl;
+}
diff --git a/external_imported/json/doc/examples/from_cbor.output b/external_imported/json/docs/examples/from_bson.output
similarity index 100%
rename from external_imported/json/doc/examples/from_cbor.output
rename to external_imported/json/docs/examples/from_bson.output
diff --git a/external_imported/json/docs/examples/from_cbor.cpp b/external_imported/json/docs/examples/from_cbor.cpp
new file mode 100644
index 000000000..e685329ef
--- /dev/null
+++ b/external_imported/json/docs/examples/from_cbor.cpp
@@ -0,0 +1,20 @@
+#include <iostream>
+#include <iomanip>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    // create byte vector
+    std::vector<std::uint8_t> v = {0xa2, 0x67, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x63,
+                                   0x74, 0xf5, 0x66, 0x73, 0x63, 0x68, 0x65, 0x6d,
+                                   0x61, 0x00
+                                  };
+
+    // deserialize it with CBOR
+    json j = json::from_cbor(v);
+
+    // print the deserialized JSON value
+    std::cout << std::setw(2) << j << std::endl;
+}
diff --git a/external_imported/json/doc/examples/from_msgpack.output b/external_imported/json/docs/examples/from_cbor.output
similarity index 100%
rename from external_imported/json/doc/examples/from_msgpack.output
rename to external_imported/json/docs/examples/from_cbor.output
diff --git a/external_imported/json/docs/examples/from_json__default_constructible.cpp b/external_imported/json/docs/examples/from_json__default_constructible.cpp
new file mode 100644
index 000000000..07d71ac95
--- /dev/null
+++ b/external_imported/json/docs/examples/from_json__default_constructible.cpp
@@ -0,0 +1,37 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+namespace ns
+{
+// a simple struct to model a person
+struct person
+{
+    std::string name;
+    std::string address;
+    int age;
+};
+} // namespace ns
+
+namespace ns
+{
+void from_json(const json& j, person& p)
+{
+    j.at("name").get_to(p.name);
+    j.at("address").get_to(p.address);
+    j.at("age").get_to(p.age);
+}
+} // namespace ns
+
+int main()
+{
+    json j;
+    j["name"] = "Ned Flanders";
+    j["address"] = "744 Evergreen Terrace";
+    j["age"] = 60;
+
+    auto p = j.template get<ns::person>();
+
+    std::cout << p.name << " (" << p.age << ") lives in " << p.address << std::endl;
+}
diff --git a/external_imported/json/docs/examples/from_json__default_constructible.output b/external_imported/json/docs/examples/from_json__default_constructible.output
new file mode 100644
index 000000000..b92452326
--- /dev/null
+++ b/external_imported/json/docs/examples/from_json__default_constructible.output
@@ -0,0 +1 @@
+Ned Flanders (60) lives in 744 Evergreen Terrace
diff --git a/external_imported/json/docs/examples/from_json__non_default_constructible.cpp b/external_imported/json/docs/examples/from_json__non_default_constructible.cpp
new file mode 100644
index 000000000..ec8206ead
--- /dev/null
+++ b/external_imported/json/docs/examples/from_json__non_default_constructible.cpp
@@ -0,0 +1,53 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+namespace ns
+{
+// a simple struct to model a person (not default constructible)
+struct person
+{
+    person(std::string n, std::string a, int aa)
+        : name(std::move(n)), address(std::move(a)), age(aa)
+    {}
+
+    std::string name;
+    std::string address;
+    int age;
+};
+} // namespace ns
+
+namespace nlohmann
+{
+template <>
+struct adl_serializer<ns::person>
+{
+    static ns::person from_json(const json& j)
+    {
+        return {j.at("name"), j.at("address"), j.at("age")};
+    }
+
+    // Here's the catch! You must provide a to_json method! Otherwise, you
+    // will not be able to convert person to json, since you fully
+    // specialized adl_serializer on that type
+    static void to_json(json& j, ns::person p)
+    {
+        j["name"] = p.name;
+        j["address"] = p.address;
+        j["age"] = p.age;
+    }
+};
+} // namespace nlohmann
+
+int main()
+{
+    json j;
+    j["name"] = "Ned Flanders";
+    j["address"] = "744 Evergreen Terrace";
+    j["age"] = 60;
+
+    auto p = j.template get<ns::person>();
+
+    std::cout << p.name << " (" << p.age << ") lives in " << p.address << std::endl;
+}
diff --git a/external_imported/json/docs/examples/from_json__non_default_constructible.output b/external_imported/json/docs/examples/from_json__non_default_constructible.output
new file mode 100644
index 000000000..b92452326
--- /dev/null
+++ b/external_imported/json/docs/examples/from_json__non_default_constructible.output
@@ -0,0 +1 @@
+Ned Flanders (60) lives in 744 Evergreen Terrace
diff --git a/external_imported/json/docs/examples/from_msgpack.cpp b/external_imported/json/docs/examples/from_msgpack.cpp
new file mode 100644
index 000000000..5c2183f1e
--- /dev/null
+++ b/external_imported/json/docs/examples/from_msgpack.cpp
@@ -0,0 +1,20 @@
+#include <iostream>
+#include <iomanip>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    // create byte vector
+    std::vector<std::uint8_t> v = {0x82, 0xa7, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x63,
+                                   0x74, 0xc3, 0xa6, 0x73, 0x63, 0x68, 0x65, 0x6d,
+                                   0x61, 0x00
+                                  };
+
+    // deserialize it with MessagePack
+    json j = json::from_msgpack(v);
+
+    // print the deserialized JSON value
+    std::cout << std::setw(2) << j << std::endl;
+}
diff --git a/external_imported/json/doc/examples/from_ubjson.output b/external_imported/json/docs/examples/from_msgpack.output
similarity index 100%
rename from external_imported/json/doc/examples/from_ubjson.output
rename to external_imported/json/docs/examples/from_msgpack.output
diff --git a/external_imported/json/docs/examples/from_ubjson.cpp b/external_imported/json/docs/examples/from_ubjson.cpp
new file mode 100644
index 000000000..1e85e4e36
--- /dev/null
+++ b/external_imported/json/docs/examples/from_ubjson.cpp
@@ -0,0 +1,20 @@
+#include <iostream>
+#include <iomanip>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    // create byte vector
+    std::vector<std::uint8_t> v = {0x7B, 0x69, 0x07, 0x63, 0x6F, 0x6D, 0x70, 0x61,
+                                   0x63, 0x74, 0x54, 0x69, 0x06, 0x73, 0x63, 0x68,
+                                   0x65, 0x6D, 0x61, 0x69, 0x00, 0x7D
+                                  };
+
+    // deserialize it with UBJSON
+    json j = json::from_ubjson(v);
+
+    // print the deserialized JSON value
+    std::cout << std::setw(2) << j << std::endl;
+}
diff --git a/external_imported/json/docs/examples/from_ubjson.output b/external_imported/json/docs/examples/from_ubjson.output
new file mode 100644
index 000000000..259f63bd4
--- /dev/null
+++ b/external_imported/json/docs/examples/from_ubjson.output
@@ -0,0 +1,4 @@
+{
+  "compact": true,
+  "schema": 0
+}
diff --git a/external_imported/json/doc/examples/front.cpp b/external_imported/json/docs/examples/front.cpp
similarity index 100%
rename from external_imported/json/doc/examples/front.cpp
rename to external_imported/json/docs/examples/front.cpp
diff --git a/external_imported/json/doc/examples/front.output b/external_imported/json/docs/examples/front.output
similarity index 100%
rename from external_imported/json/doc/examples/front.output
rename to external_imported/json/docs/examples/front.output
diff --git a/external_imported/json/docs/examples/get__PointerType.cpp b/external_imported/json/docs/examples/get__PointerType.cpp
new file mode 100644
index 000000000..309c8deeb
--- /dev/null
+++ b/external_imported/json/docs/examples/get__PointerType.cpp
@@ -0,0 +1,21 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    // create a JSON number
+    json value = 17;
+
+    // explicitly getting pointers
+    auto p1 = value.template get<const json::number_integer_t*>();
+    auto p2 = value.template get<json::number_integer_t*>();
+    auto p3 = value.template get<json::number_integer_t* const>();
+    auto p4 = value.template get<const json::number_integer_t* const>();
+    auto p5 = value.template get<json::number_float_t*>();
+
+    // print the pointees
+    std::cout << *p1 << ' ' << *p2 << ' ' << *p3 << ' ' << *p4 << '\n';
+    std::cout << std::boolalpha << (p5 == nullptr) << '\n';
+}
diff --git a/external_imported/json/doc/examples/get__PointerType.output b/external_imported/json/docs/examples/get__PointerType.output
similarity index 100%
rename from external_imported/json/doc/examples/get__PointerType.output
rename to external_imported/json/docs/examples/get__PointerType.output
diff --git a/external_imported/json/docs/examples/get__ValueType_const.cpp b/external_imported/json/docs/examples/get__ValueType_const.cpp
new file mode 100644
index 000000000..db63791fc
--- /dev/null
+++ b/external_imported/json/docs/examples/get__ValueType_const.cpp
@@ -0,0 +1,50 @@
+#include <iostream>
+#include <unordered_map>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    // create a JSON value with different types
+    json json_types =
+    {
+        {"boolean", true},
+        {
+            "number", {
+                {"integer", 42},
+                {"floating-point", 17.23}
+            }
+        },
+        {"string", "Hello, world!"},
+        {"array", {1, 2, 3, 4, 5}},
+        {"null", nullptr}
+    };
+
+    // use explicit conversions
+    auto v1 = json_types["boolean"].template get<bool>();
+    auto v2 = json_types["number"]["integer"].template get<int>();
+    auto v3 = json_types["number"]["integer"].template get<short>();
+    auto v4 = json_types["number"]["floating-point"].template get<float>();
+    auto v5 = json_types["number"]["floating-point"].template get<int>();
+    auto v6 = json_types["string"].template get<std::string>();
+    auto v7 = json_types["array"].template get<std::vector<short>>();
+    auto v8 = json_types.template get<std::unordered_map<std::string, json>>();
+
+    // print the conversion results
+    std::cout << v1 << '\n';
+    std::cout << v2 << ' ' << v3 << '\n';
+    std::cout << v4 << ' ' << v5 << '\n';
+    std::cout << v6 << '\n';
+
+    for (auto i : v7)
+    {
+        std::cout << i << ' ';
+    }
+    std::cout << "\n\n";
+
+    for (auto i : v8)
+    {
+        std::cout << i.first << ": " << i.second << '\n';
+    }
+}
diff --git a/external_imported/json/doc/examples/get__ValueType_const.output b/external_imported/json/docs/examples/get__ValueType_const.output
similarity index 100%
rename from external_imported/json/doc/examples/get__ValueType_const.output
rename to external_imported/json/docs/examples/get__ValueType_const.output
diff --git a/external_imported/json/docs/examples/get_allocator.cpp b/external_imported/json/docs/examples/get_allocator.cpp
new file mode 100644
index 000000000..35079a10c
--- /dev/null
+++ b/external_imported/json/docs/examples/get_allocator.cpp
@@ -0,0 +1,18 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    auto alloc = json::get_allocator();
+    using traits_t = std::allocator_traits<decltype(alloc)>;
+
+    json* j = traits_t::allocate(alloc, 1);
+    traits_t::construct(alloc, j, "Hello, world!");
+
+    std::cout << *j << std::endl;
+
+    traits_t::destroy(alloc, j);
+    traits_t::deallocate(alloc, j, 1);
+}
diff --git a/external_imported/json/docs/examples/get_allocator.output b/external_imported/json/docs/examples/get_allocator.output
new file mode 100644
index 000000000..8effb3e8c
--- /dev/null
+++ b/external_imported/json/docs/examples/get_allocator.output
@@ -0,0 +1 @@
+"Hello, world!"
diff --git a/external_imported/json/docs/examples/get_binary.cpp b/external_imported/json/docs/examples/get_binary.cpp
new file mode 100644
index 000000000..617ce6096
--- /dev/null
+++ b/external_imported/json/docs/examples/get_binary.cpp
@@ -0,0 +1,16 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    // create a binary vector
+    std::vector<std::uint8_t> vec = {0xCA, 0xFE, 0xBA, 0xBE};
+
+    // create a binary JSON value with subtype 42
+    json j = json::binary(vec, 42);
+
+    // output type and subtype
+    std::cout << "type: " << j.type_name() << ", subtype: " << j.get_binary().subtype() << std::endl;
+}
diff --git a/external_imported/json/docs/examples/get_binary.output b/external_imported/json/docs/examples/get_binary.output
new file mode 100644
index 000000000..74b05d23f
--- /dev/null
+++ b/external_imported/json/docs/examples/get_binary.output
@@ -0,0 +1 @@
+type: binary, subtype: 42
diff --git a/external_imported/json/doc/examples/get_ptr.cpp b/external_imported/json/docs/examples/get_ptr.cpp
similarity index 100%
rename from external_imported/json/doc/examples/get_ptr.cpp
rename to external_imported/json/docs/examples/get_ptr.cpp
diff --git a/external_imported/json/doc/examples/get_ptr.output b/external_imported/json/docs/examples/get_ptr.output
similarity index 100%
rename from external_imported/json/doc/examples/get_ptr.output
rename to external_imported/json/docs/examples/get_ptr.output
diff --git a/external_imported/json/doc/examples/get_ref.cpp b/external_imported/json/docs/examples/get_ref.cpp
similarity index 93%
rename from external_imported/json/doc/examples/get_ref.cpp
rename to external_imported/json/docs/examples/get_ref.cpp
index ab25946bb..0183a6537 100644
--- a/external_imported/json/doc/examples/get_ref.cpp
+++ b/external_imported/json/docs/examples/get_ref.cpp
@@ -20,7 +20,7 @@ int main()
     {
         auto r3 = value.get_ref<json::number_float_t&>();
     }
-    catch (json::type_error& ex)
+    catch (const json::type_error& ex)
     {
         std::cout << ex.what() << '\n';
     }
diff --git a/external_imported/json/doc/examples/get_ref.output b/external_imported/json/docs/examples/get_ref.output
similarity index 100%
rename from external_imported/json/doc/examples/get_ref.output
rename to external_imported/json/docs/examples/get_ref.output
diff --git a/external_imported/json/doc/examples/get_to.cpp b/external_imported/json/docs/examples/get_to.cpp
similarity index 99%
rename from external_imported/json/doc/examples/get_to.cpp
rename to external_imported/json/docs/examples/get_to.cpp
index 4705b172f..358c8d43a 100644
--- a/external_imported/json/doc/examples/get_to.cpp
+++ b/external_imported/json/docs/examples/get_to.cpp
@@ -30,7 +30,6 @@ int main()
     std::vector<short> v7;
     std::unordered_map<std::string, json> v8;
 
-
     // use explicit conversions
     json_types["boolean"].get_to(v1);
     json_types["number"]["integer"].get_to(v2);
diff --git a/external_imported/json/doc/examples/get_to.output b/external_imported/json/docs/examples/get_to.output
similarity index 100%
rename from external_imported/json/doc/examples/get_to.output
rename to external_imported/json/docs/examples/get_to.output
diff --git a/external_imported/json/doc/examples/insert.cpp b/external_imported/json/docs/examples/insert.cpp
similarity index 100%
rename from external_imported/json/doc/examples/insert.cpp
rename to external_imported/json/docs/examples/insert.cpp
diff --git a/external_imported/json/doc/examples/insert.output b/external_imported/json/docs/examples/insert.output
similarity index 100%
rename from external_imported/json/doc/examples/insert.output
rename to external_imported/json/docs/examples/insert.output
diff --git a/external_imported/json/doc/examples/insert__count.cpp b/external_imported/json/docs/examples/insert__count.cpp
similarity index 100%
rename from external_imported/json/doc/examples/insert__count.cpp
rename to external_imported/json/docs/examples/insert__count.cpp
diff --git a/external_imported/json/doc/examples/insert__count.output b/external_imported/json/docs/examples/insert__count.output
similarity index 100%
rename from external_imported/json/doc/examples/insert__count.output
rename to external_imported/json/docs/examples/insert__count.output
diff --git a/external_imported/json/doc/examples/insert__ilist.cpp b/external_imported/json/docs/examples/insert__ilist.cpp
similarity index 100%
rename from external_imported/json/doc/examples/insert__ilist.cpp
rename to external_imported/json/docs/examples/insert__ilist.cpp
diff --git a/external_imported/json/doc/examples/insert__ilist.output b/external_imported/json/docs/examples/insert__ilist.output
similarity index 100%
rename from external_imported/json/doc/examples/insert__ilist.output
rename to external_imported/json/docs/examples/insert__ilist.output
diff --git a/external_imported/json/doc/examples/insert__range.cpp b/external_imported/json/docs/examples/insert__range.cpp
similarity index 100%
rename from external_imported/json/doc/examples/insert__range.cpp
rename to external_imported/json/docs/examples/insert__range.cpp
diff --git a/external_imported/json/doc/examples/insert__range.output b/external_imported/json/docs/examples/insert__range.output
similarity index 100%
rename from external_imported/json/doc/examples/insert__range.output
rename to external_imported/json/docs/examples/insert__range.output
diff --git a/external_imported/json/doc/examples/insert__range_object.cpp b/external_imported/json/docs/examples/insert__range_object.cpp
similarity index 100%
rename from external_imported/json/doc/examples/insert__range_object.cpp
rename to external_imported/json/docs/examples/insert__range_object.cpp
diff --git a/external_imported/json/doc/examples/insert__range_object.output b/external_imported/json/docs/examples/insert__range_object.output
similarity index 100%
rename from external_imported/json/doc/examples/insert__range_object.output
rename to external_imported/json/docs/examples/insert__range_object.output
diff --git a/external_imported/json/doc/examples/invalid_iterator.cpp b/external_imported/json/docs/examples/invalid_iterator.cpp
similarity index 90%
rename from external_imported/json/doc/examples/invalid_iterator.cpp
rename to external_imported/json/docs/examples/invalid_iterator.cpp
index 5d3e622e6..ecde12e62 100644
--- a/external_imported/json/doc/examples/invalid_iterator.cpp
+++ b/external_imported/json/docs/examples/invalid_iterator.cpp
@@ -12,7 +12,7 @@ int main()
         json::iterator it = j.begin();
         auto k = it.key();
     }
-    catch (json::invalid_iterator& e)
+    catch (const json::invalid_iterator& e)
     {
         // output exception information
         std::cout << "message: " << e.what() << '\n'
diff --git a/external_imported/json/doc/examples/invalid_iterator.output b/external_imported/json/docs/examples/invalid_iterator.output
similarity index 100%
rename from external_imported/json/doc/examples/invalid_iterator.output
rename to external_imported/json/docs/examples/invalid_iterator.output
diff --git a/external_imported/json/doc/examples/is_array.cpp b/external_imported/json/docs/examples/is_array.cpp
similarity index 100%
rename from external_imported/json/doc/examples/is_array.cpp
rename to external_imported/json/docs/examples/is_array.cpp
diff --git a/external_imported/json/doc/examples/is_array.output b/external_imported/json/docs/examples/is_array.output
similarity index 100%
rename from external_imported/json/doc/examples/is_array.output
rename to external_imported/json/docs/examples/is_array.output
diff --git a/external_imported/json/doc/examples/is_binary.cpp b/external_imported/json/docs/examples/is_binary.cpp
similarity index 100%
rename from external_imported/json/doc/examples/is_binary.cpp
rename to external_imported/json/docs/examples/is_binary.cpp
diff --git a/external_imported/json/doc/examples/is_binary.output b/external_imported/json/docs/examples/is_binary.output
similarity index 100%
rename from external_imported/json/doc/examples/is_binary.output
rename to external_imported/json/docs/examples/is_binary.output
diff --git a/external_imported/json/doc/examples/is_boolean.cpp b/external_imported/json/docs/examples/is_boolean.cpp
similarity index 100%
rename from external_imported/json/doc/examples/is_boolean.cpp
rename to external_imported/json/docs/examples/is_boolean.cpp
diff --git a/external_imported/json/doc/examples/is_boolean.output b/external_imported/json/docs/examples/is_boolean.output
similarity index 100%
rename from external_imported/json/doc/examples/is_boolean.output
rename to external_imported/json/docs/examples/is_boolean.output
diff --git a/external_imported/json/doc/examples/is_discarded.cpp b/external_imported/json/docs/examples/is_discarded.cpp
similarity index 100%
rename from external_imported/json/doc/examples/is_discarded.cpp
rename to external_imported/json/docs/examples/is_discarded.cpp
diff --git a/external_imported/json/doc/examples/is_discarded.output b/external_imported/json/docs/examples/is_discarded.output
similarity index 100%
rename from external_imported/json/doc/examples/is_discarded.output
rename to external_imported/json/docs/examples/is_discarded.output
diff --git a/external_imported/json/doc/examples/is_null.cpp b/external_imported/json/docs/examples/is_null.cpp
similarity index 100%
rename from external_imported/json/doc/examples/is_null.cpp
rename to external_imported/json/docs/examples/is_null.cpp
diff --git a/external_imported/json/doc/examples/is_null.output b/external_imported/json/docs/examples/is_null.output
similarity index 100%
rename from external_imported/json/doc/examples/is_null.output
rename to external_imported/json/docs/examples/is_null.output
diff --git a/external_imported/json/doc/examples/is_number.cpp b/external_imported/json/docs/examples/is_number.cpp
similarity index 100%
rename from external_imported/json/doc/examples/is_number.cpp
rename to external_imported/json/docs/examples/is_number.cpp
diff --git a/external_imported/json/doc/examples/is_number.output b/external_imported/json/docs/examples/is_number.output
similarity index 100%
rename from external_imported/json/doc/examples/is_number.output
rename to external_imported/json/docs/examples/is_number.output
diff --git a/external_imported/json/doc/examples/is_number_float.cpp b/external_imported/json/docs/examples/is_number_float.cpp
similarity index 100%
rename from external_imported/json/doc/examples/is_number_float.cpp
rename to external_imported/json/docs/examples/is_number_float.cpp
diff --git a/external_imported/json/doc/examples/is_number_float.output b/external_imported/json/docs/examples/is_number_float.output
similarity index 100%
rename from external_imported/json/doc/examples/is_number_float.output
rename to external_imported/json/docs/examples/is_number_float.output
diff --git a/external_imported/json/doc/examples/is_number_integer.cpp b/external_imported/json/docs/examples/is_number_integer.cpp
similarity index 100%
rename from external_imported/json/doc/examples/is_number_integer.cpp
rename to external_imported/json/docs/examples/is_number_integer.cpp
diff --git a/external_imported/json/doc/examples/is_number_integer.output b/external_imported/json/docs/examples/is_number_integer.output
similarity index 100%
rename from external_imported/json/doc/examples/is_number_integer.output
rename to external_imported/json/docs/examples/is_number_integer.output
diff --git a/external_imported/json/doc/examples/is_number_unsigned.cpp b/external_imported/json/docs/examples/is_number_unsigned.cpp
similarity index 100%
rename from external_imported/json/doc/examples/is_number_unsigned.cpp
rename to external_imported/json/docs/examples/is_number_unsigned.cpp
diff --git a/external_imported/json/doc/examples/is_number_unsigned.output b/external_imported/json/docs/examples/is_number_unsigned.output
similarity index 100%
rename from external_imported/json/doc/examples/is_number_unsigned.output
rename to external_imported/json/docs/examples/is_number_unsigned.output
diff --git a/external_imported/json/doc/examples/is_object.cpp b/external_imported/json/docs/examples/is_object.cpp
similarity index 100%
rename from external_imported/json/doc/examples/is_object.cpp
rename to external_imported/json/docs/examples/is_object.cpp
diff --git a/external_imported/json/doc/examples/is_object.output b/external_imported/json/docs/examples/is_object.output
similarity index 100%
rename from external_imported/json/doc/examples/is_object.output
rename to external_imported/json/docs/examples/is_object.output
diff --git a/external_imported/json/doc/examples/is_primitive.cpp b/external_imported/json/docs/examples/is_primitive.cpp
similarity index 100%
rename from external_imported/json/doc/examples/is_primitive.cpp
rename to external_imported/json/docs/examples/is_primitive.cpp
diff --git a/external_imported/json/doc/examples/is_primitive.output b/external_imported/json/docs/examples/is_primitive.output
similarity index 100%
rename from external_imported/json/doc/examples/is_primitive.output
rename to external_imported/json/docs/examples/is_primitive.output
diff --git a/external_imported/json/doc/examples/is_string.cpp b/external_imported/json/docs/examples/is_string.cpp
similarity index 100%
rename from external_imported/json/doc/examples/is_string.cpp
rename to external_imported/json/docs/examples/is_string.cpp
diff --git a/external_imported/json/doc/examples/is_string.output b/external_imported/json/docs/examples/is_string.output
similarity index 100%
rename from external_imported/json/doc/examples/is_string.output
rename to external_imported/json/docs/examples/is_string.output
diff --git a/external_imported/json/doc/examples/is_structured.cpp b/external_imported/json/docs/examples/is_structured.cpp
similarity index 100%
rename from external_imported/json/doc/examples/is_structured.cpp
rename to external_imported/json/docs/examples/is_structured.cpp
diff --git a/external_imported/json/doc/examples/is_structured.output b/external_imported/json/docs/examples/is_structured.output
similarity index 100%
rename from external_imported/json/doc/examples/is_structured.output
rename to external_imported/json/docs/examples/is_structured.output
diff --git a/external_imported/json/doc/examples/items.cpp b/external_imported/json/docs/examples/items.cpp
similarity index 100%
rename from external_imported/json/doc/examples/items.cpp
rename to external_imported/json/docs/examples/items.cpp
diff --git a/external_imported/json/doc/examples/items.output b/external_imported/json/docs/examples/items.output
similarity index 100%
rename from external_imported/json/doc/examples/items.output
rename to external_imported/json/docs/examples/items.output
diff --git a/external_imported/json/docs/examples/json_base_class_t.cpp b/external_imported/json/docs/examples/json_base_class_t.cpp
new file mode 100644
index 000000000..d993522a7
--- /dev/null
+++ b/external_imported/json/docs/examples/json_base_class_t.cpp
@@ -0,0 +1,88 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+class visitor_adaptor_with_metadata
+{
+  public:
+    template <class Fnc>
+    void visit(const Fnc& fnc) const;
+
+    int metadata = 42;
+  private:
+    template <class Ptr, class Fnc>
+    void do_visit(const Ptr& ptr, const Fnc& fnc) const;
+};
+
+using json = nlohmann::basic_json <
+             std::map,
+             std::vector,
+             std::string,
+             bool,
+             std::int64_t,
+             std::uint64_t,
+             double,
+             std::allocator,
+             nlohmann::adl_serializer,
+             std::vector<std::uint8_t>,
+             visitor_adaptor_with_metadata
+             >;
+
+template <class Fnc>
+void visitor_adaptor_with_metadata::visit(const Fnc& fnc) const
+{
+    do_visit(json::json_pointer{}, fnc);
+}
+
+template <class Ptr, class Fnc>
+void visitor_adaptor_with_metadata::do_visit(const Ptr& ptr, const Fnc& fnc) const
+{
+    using value_t = nlohmann::detail::value_t;
+    const json& j = *static_cast<const json*>(this);
+    switch (j.type())
+    {
+        case value_t::object:
+            fnc(ptr, j);
+            for (const auto& entry : j.items())
+            {
+                entry.value().do_visit(ptr / entry.key(), fnc);
+            }
+            break;
+        case value_t::array:
+            fnc(ptr, j);
+            for (std::size_t i = 0; i < j.size(); ++i)
+            {
+                j.at(i).do_visit(ptr / std::to_string(i), fnc);
+            }
+            break;
+        case value_t::null:
+        case value_t::string:
+        case value_t::boolean:
+        case value_t::number_integer:
+        case value_t::number_unsigned:
+        case value_t::number_float:
+        case value_t::binary:
+            fnc(ptr, j);
+            break;
+        case value_t::discarded:
+        default:
+            break;
+    }
+}
+
+int main()
+{
+    // create a json object
+    json j;
+    j["null"];
+    j["object"]["uint"] = 1U;
+    j["object"].metadata = 21;
+
+    // visit and output
+    j.visit(
+        [&](const json::json_pointer & p,
+            const json & j)
+    {
+        std::cout << (p.empty() ? std::string{"/"} : p.to_string())
+                  << " - metadata = " << j.metadata << " -> " << j.dump() << '\n';
+    });
+}
diff --git a/external_imported/json/docs/examples/json_base_class_t.output b/external_imported/json/docs/examples/json_base_class_t.output
new file mode 100644
index 000000000..83ce1f693
--- /dev/null
+++ b/external_imported/json/docs/examples/json_base_class_t.output
@@ -0,0 +1,4 @@
+/ - metadata = 42 -> {"null":null,"object":{"uint":1}}
+/null - metadata = 42 -> null
+/object - metadata = 21 -> {"uint":1}
+/object/uint - metadata = 42 -> 1
diff --git a/external_imported/json/docs/examples/json_lines.cpp b/external_imported/json/docs/examples/json_lines.cpp
new file mode 100644
index 000000000..233c81a4a
--- /dev/null
+++ b/external_imported/json/docs/examples/json_lines.cpp
@@ -0,0 +1,22 @@
+#include <sstream>
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    // JSON Lines (see https://jsonlines.org)
+    std::stringstream input;
+    input << R"({"name": "Gilbert", "wins": [["straight", "7♣"], ["one pair", "10♥"]]}
+{"name": "Alexa", "wins": [["two pair", "4â™ "], ["two pair", "9â™ "]]}
+{"name": "May", "wins": []}
+{"name": "Deloise", "wins": [["three of a kind", "5♣"]]}
+)";
+
+    std::string line;
+    while (std::getline(input, line))
+    {
+        std::cout << json::parse(line) << std::endl;
+    }
+}
diff --git a/external_imported/json/docs/examples/json_lines.output b/external_imported/json/docs/examples/json_lines.output
new file mode 100644
index 000000000..1b4122480
--- /dev/null
+++ b/external_imported/json/docs/examples/json_lines.output
@@ -0,0 +1,4 @@
+{"name":"Gilbert","wins":[["straight","7♣"],["one pair","10♥"]]}
+{"name":"Alexa","wins":[["two pair","4â™ "],["two pair","9â™ "]]}
+{"name":"May","wins":[]}
+{"name":"Deloise","wins":[["three of a kind","5♣"]]}
diff --git a/external_imported/json/doc/examples/json_pointer.cpp b/external_imported/json/docs/examples/json_pointer.cpp
similarity index 88%
rename from external_imported/json/doc/examples/json_pointer.cpp
rename to external_imported/json/docs/examples/json_pointer.cpp
index 75b971758..8705cf498 100644
--- a/external_imported/json/doc/examples/json_pointer.cpp
+++ b/external_imported/json/docs/examples/json_pointer.cpp
@@ -20,7 +20,7 @@ int main()
     {
         json::json_pointer p9("foo");
     }
-    catch (json::parse_error& e)
+    catch (const json::parse_error& e)
     {
         std::cout << e.what() << '\n';
     }
@@ -30,7 +30,7 @@ int main()
     {
         json::json_pointer p10("/foo/~");
     }
-    catch (json::parse_error& e)
+    catch (const json::parse_error& e)
     {
         std::cout << e.what() << '\n';
     }
@@ -40,7 +40,7 @@ int main()
     {
         json::json_pointer p11("/foo/~3");
     }
-    catch (json::parse_error& e)
+    catch (const json::parse_error& e)
     {
         std::cout << e.what() << '\n';
     }
diff --git a/external_imported/json/doc/examples/json_pointer.output b/external_imported/json/docs/examples/json_pointer.output
similarity index 100%
rename from external_imported/json/doc/examples/json_pointer.output
rename to external_imported/json/docs/examples/json_pointer.output
diff --git a/external_imported/json/docs/examples/json_pointer__back.cpp b/external_imported/json/docs/examples/json_pointer__back.cpp
new file mode 100644
index 000000000..dd3b210bf
--- /dev/null
+++ b/external_imported/json/docs/examples/json_pointer__back.cpp
@@ -0,0 +1,15 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    // different JSON Pointers
+    json::json_pointer ptr1("/foo");
+    json::json_pointer ptr2("/foo/0");
+
+    // call empty()
+    std::cout << "last reference token of \"" << ptr1 << "\" is \"" << ptr1.back() << "\"\n"
+              << "last reference token of \"" << ptr2 << "\" is \"" << ptr2.back() << "\"" << std::endl;
+}
diff --git a/external_imported/json/docs/examples/json_pointer__back.output b/external_imported/json/docs/examples/json_pointer__back.output
new file mode 100644
index 000000000..a89357b49
--- /dev/null
+++ b/external_imported/json/docs/examples/json_pointer__back.output
@@ -0,0 +1,2 @@
+last reference token of "/foo" is "foo"
+last reference token of "/foo/0" is "0"
diff --git a/external_imported/json/docs/examples/json_pointer__empty.cpp b/external_imported/json/docs/examples/json_pointer__empty.cpp
new file mode 100644
index 000000000..57257e8b1
--- /dev/null
+++ b/external_imported/json/docs/examples/json_pointer__empty.cpp
@@ -0,0 +1,20 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    // different JSON Pointers
+    json::json_pointer ptr0;
+    json::json_pointer ptr1("");
+    json::json_pointer ptr2("/foo");
+    json::json_pointer ptr3("/foo/0");
+
+    // call empty()
+    std::cout << std::boolalpha
+              << "\"" << ptr0 << "\": " << ptr0.empty() << '\n'
+              << "\"" << ptr1 << "\": " << ptr1.empty() << '\n'
+              << "\"" << ptr2 << "\": " << ptr2.empty() << '\n'
+              << "\"" << ptr3 << "\": " << ptr3.empty() << std::endl;
+}
diff --git a/external_imported/json/doc/examples/json_pointer__empty.output b/external_imported/json/docs/examples/json_pointer__empty.output
similarity index 100%
rename from external_imported/json/doc/examples/json_pointer__empty.output
rename to external_imported/json/docs/examples/json_pointer__empty.output
diff --git a/external_imported/json/docs/examples/json_pointer__operator__equal.cpp b/external_imported/json/docs/examples/json_pointer__operator__equal.cpp
new file mode 100644
index 000000000..dce6df03c
--- /dev/null
+++ b/external_imported/json/docs/examples/json_pointer__operator__equal.cpp
@@ -0,0 +1,19 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    // different JSON pointers
+    json::json_pointer ptr0;
+    json::json_pointer ptr1("");
+    json::json_pointer ptr2("/foo");
+
+    // compare JSON pointers
+    std::cout << std::boolalpha
+              << "\"" << ptr0 << "\" == \"" << ptr0 << "\": " << (ptr0 == ptr0) << '\n'
+              << "\"" << ptr0 << "\" == \"" << ptr1 << "\": " << (ptr0 == ptr1) << '\n'
+              << "\"" << ptr1 << "\" == \"" << ptr2 << "\": " << (ptr1 == ptr2) << '\n'
+              << "\"" << ptr2 << "\" == \"" << ptr2 << "\": " << (ptr2 == ptr2) << std::endl;
+}
diff --git a/external_imported/json/docs/examples/json_pointer__operator__equal.output b/external_imported/json/docs/examples/json_pointer__operator__equal.output
new file mode 100644
index 000000000..9a7612580
--- /dev/null
+++ b/external_imported/json/docs/examples/json_pointer__operator__equal.output
@@ -0,0 +1,4 @@
+"" == "": true
+"" == "": true
+"" == "/foo": false
+"/foo" == "/foo": true
diff --git a/external_imported/json/docs/examples/json_pointer__operator__equal_stringtype.cpp b/external_imported/json/docs/examples/json_pointer__operator__equal_stringtype.cpp
new file mode 100644
index 000000000..af8ec5a29
--- /dev/null
+++ b/external_imported/json/docs/examples/json_pointer__operator__equal_stringtype.cpp
@@ -0,0 +1,33 @@
+#include <exception>
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    // different JSON pointers
+    json::json_pointer ptr0;
+    json::json_pointer ptr1("");
+    json::json_pointer ptr2("/foo");
+
+    // different strings
+    std::string str0("");
+    std::string str1("/foo");
+    std::string str2("bar");
+
+    // compare JSON pointers and strings
+    std::cout << std::boolalpha
+              << "\"" << ptr0 << "\" == \"" << str0 << "\": " << (ptr0 == str0) << '\n'
+              << "\"" << str0 << "\" == \"" << ptr1 << "\": " << (str0 == ptr1) << '\n'
+              << "\"" << ptr2 << "\" == \"" << str1 << "\": " << (ptr2 == str1) << std::endl;
+
+    try
+    {
+        std::cout << "\"" << str2 << "\" == \"" << ptr2 << "\": " << (str2 == ptr2) << std::endl;
+    }
+    catch (const json::parse_error& ex)
+    {
+        std::cout << ex.what() << std::endl;
+    }
+}
diff --git a/external_imported/json/docs/examples/json_pointer__operator__equal_stringtype.output b/external_imported/json/docs/examples/json_pointer__operator__equal_stringtype.output
new file mode 100644
index 000000000..7fb299d3d
--- /dev/null
+++ b/external_imported/json/docs/examples/json_pointer__operator__equal_stringtype.output
@@ -0,0 +1,4 @@
+"" == "": true
+"" == "": true
+"/foo" == "/foo": true
+"bar" == "/foo": [json.exception.parse_error.107] parse error at byte 1: JSON pointer must be empty or begin with '/' - was: 'bar'
diff --git a/external_imported/json/docs/examples/json_pointer__operator__notequal.cpp b/external_imported/json/docs/examples/json_pointer__operator__notequal.cpp
new file mode 100644
index 000000000..9bbdd5310
--- /dev/null
+++ b/external_imported/json/docs/examples/json_pointer__operator__notequal.cpp
@@ -0,0 +1,19 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    // different JSON pointers
+    json::json_pointer ptr0;
+    json::json_pointer ptr1("");
+    json::json_pointer ptr2("/foo");
+
+    // compare JSON pointers
+    std::cout << std::boolalpha
+              << "\"" << ptr0 << "\" != \"" << ptr0 << "\": " << (ptr0 != ptr0) << '\n'
+              << "\"" << ptr0 << "\" != \"" << ptr1 << "\": " << (ptr0 != ptr1) << '\n'
+              << "\"" << ptr1 << "\" != \"" << ptr2 << "\": " << (ptr1 != ptr2) << '\n'
+              << "\"" << ptr2 << "\" != \"" << ptr2 << "\": " << (ptr2 != ptr2) << std::endl;
+}
diff --git a/external_imported/json/docs/examples/json_pointer__operator__notequal.output b/external_imported/json/docs/examples/json_pointer__operator__notequal.output
new file mode 100644
index 000000000..de891f0c6
--- /dev/null
+++ b/external_imported/json/docs/examples/json_pointer__operator__notequal.output
@@ -0,0 +1,4 @@
+"" != "": false
+"" != "": false
+"" != "/foo": true
+"/foo" != "/foo": false
diff --git a/external_imported/json/docs/examples/json_pointer__operator__notequal_stringtype.cpp b/external_imported/json/docs/examples/json_pointer__operator__notequal_stringtype.cpp
new file mode 100644
index 000000000..b9b898728
--- /dev/null
+++ b/external_imported/json/docs/examples/json_pointer__operator__notequal_stringtype.cpp
@@ -0,0 +1,32 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    // different JSON pointers
+    json::json_pointer ptr0;
+    json::json_pointer ptr1("");
+    json::json_pointer ptr2("/foo");
+
+    // different strings
+    std::string str0("");
+    std::string str1("/foo");
+    std::string str2("bar");
+
+    // compare JSON pointers and strings
+    std::cout << std::boolalpha
+              << "\"" << ptr0 << "\" != \"" << str0 << "\": " << (ptr0 != str0) << '\n'
+              << "\"" << str0 << "\" != \"" << ptr1 << "\": " << (str0 != ptr1) << '\n'
+              << "\"" << ptr2 << "\" != \"" << str1 << "\": " << (ptr2 != str1) << std::endl;
+
+    try
+    {
+        std::cout << "\"" << str2 << "\" != \"" << ptr2 << "\": " << (str2 != ptr2) << std::endl;
+    }
+    catch (const json::parse_error& ex)
+    {
+        std::cout << ex.what() << std::endl;
+    }
+}
diff --git a/external_imported/json/docs/examples/json_pointer__operator__notequal_stringtype.output b/external_imported/json/docs/examples/json_pointer__operator__notequal_stringtype.output
new file mode 100644
index 000000000..61331b752
--- /dev/null
+++ b/external_imported/json/docs/examples/json_pointer__operator__notequal_stringtype.output
@@ -0,0 +1,4 @@
+"" != "": false
+"" != "": false
+"/foo" != "/foo": false
+"bar" != "/foo": [json.exception.parse_error.107] parse error at byte 1: JSON pointer must be empty or begin with '/' - was: 'bar'
diff --git a/external_imported/json/docs/examples/json_pointer__operator_add.cpp b/external_imported/json/docs/examples/json_pointer__operator_add.cpp
new file mode 100644
index 000000000..14bd74561
--- /dev/null
+++ b/external_imported/json/docs/examples/json_pointer__operator_add.cpp
@@ -0,0 +1,23 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    // create a JSON pointer
+    json::json_pointer ptr("/foo");
+    std::cout << "\"" << ptr << "\"\n";
+
+    // append a JSON Pointer
+    ptr /= json::json_pointer("/bar/baz");
+    std::cout << "\"" << ptr << "\"\n";
+
+    // append a string
+    ptr /= "fob";
+    std::cout << "\"" << ptr << "\"\n";
+
+    // append an array index
+    ptr /= 42;
+    std::cout << "\"" << ptr << "\"" << std::endl;
+}
diff --git a/external_imported/json/doc/examples/json_pointer__operator_add.output b/external_imported/json/docs/examples/json_pointer__operator_add.output
similarity index 100%
rename from external_imported/json/doc/examples/json_pointer__operator_add.output
rename to external_imported/json/docs/examples/json_pointer__operator_add.output
diff --git a/external_imported/json/docs/examples/json_pointer__operator_add_binary.cpp b/external_imported/json/docs/examples/json_pointer__operator_add_binary.cpp
new file mode 100644
index 000000000..d26a0d171
--- /dev/null
+++ b/external_imported/json/docs/examples/json_pointer__operator_add_binary.cpp
@@ -0,0 +1,19 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    // create a JSON pointer
+    json::json_pointer ptr("/foo");
+
+    // append a JSON Pointer
+    std::cout << "\"" << ptr / json::json_pointer("/bar/baz") << "\"\n";
+
+    // append a string
+    std::cout << "\"" << ptr / "fob" << "\"\n";
+
+    // append an array index
+    std::cout << "\"" << ptr / 42 << "\"" << std::endl;
+}
diff --git a/external_imported/json/doc/examples/json_pointer__operator_add_binary.output b/external_imported/json/docs/examples/json_pointer__operator_add_binary.output
similarity index 100%
rename from external_imported/json/doc/examples/json_pointer__operator_add_binary.output
rename to external_imported/json/docs/examples/json_pointer__operator_add_binary.output
diff --git a/external_imported/json/docs/examples/json_pointer__operator_string_t.cpp b/external_imported/json/docs/examples/json_pointer__operator_string_t.cpp
new file mode 100644
index 000000000..56f213020
--- /dev/null
+++ b/external_imported/json/docs/examples/json_pointer__operator_string_t.cpp
@@ -0,0 +1,19 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    // different JSON Pointers
+    json::json_pointer ptr1("/foo/0");
+    json::json_pointer ptr2("/a~1b");
+
+    // implicit conversion to string
+    std::string s;
+    s += ptr1;
+    s += "\n";
+    s += ptr2;
+
+    std::cout << s << std::endl;
+}
diff --git a/external_imported/json/docs/examples/json_pointer__operator_string_t.output b/external_imported/json/docs/examples/json_pointer__operator_string_t.output
new file mode 100644
index 000000000..ec6aba2c2
--- /dev/null
+++ b/external_imported/json/docs/examples/json_pointer__operator_string_t.output
@@ -0,0 +1,2 @@
+/foo/0
+/a~1b
diff --git a/external_imported/json/docs/examples/json_pointer__parent_pointer.cpp b/external_imported/json/docs/examples/json_pointer__parent_pointer.cpp
new file mode 100644
index 000000000..ef9df4534
--- /dev/null
+++ b/external_imported/json/docs/examples/json_pointer__parent_pointer.cpp
@@ -0,0 +1,18 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    // different JSON Pointers
+    json::json_pointer ptr1("");
+    json::json_pointer ptr2("/foo");
+    json::json_pointer ptr3("/foo/0");
+
+    // call parent_pointer()
+    std::cout << std::boolalpha
+              << "parent of \"" << ptr1 << "\" is \"" << ptr1.parent_pointer() << "\"\n"
+              << "parent of \"" << ptr2 << "\" is \"" << ptr2.parent_pointer() << "\"\n"
+              << "parent of \"" << ptr3 << "\" is \"" << ptr3.parent_pointer() << "\"" << std::endl;
+}
diff --git a/external_imported/json/doc/examples/json_pointer__parent_pointer.output b/external_imported/json/docs/examples/json_pointer__parent_pointer.output
similarity index 100%
rename from external_imported/json/doc/examples/json_pointer__parent_pointer.output
rename to external_imported/json/docs/examples/json_pointer__parent_pointer.output
diff --git a/external_imported/json/docs/examples/json_pointer__pop_back.cpp b/external_imported/json/docs/examples/json_pointer__pop_back.cpp
new file mode 100644
index 000000000..fd077b7e9
--- /dev/null
+++ b/external_imported/json/docs/examples/json_pointer__pop_back.cpp
@@ -0,0 +1,21 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    // create empty JSON Pointer
+    json::json_pointer ptr("/foo/bar/baz");
+    std::cout << "\"" << ptr << "\"\n";
+
+    // call pop_back()
+    ptr.pop_back();
+    std::cout << "\"" << ptr << "\"\n";
+
+    ptr.pop_back();
+    std::cout << "\"" << ptr << "\"\n";
+
+    ptr.pop_back();
+    std::cout << "\"" << ptr << "\"\n";
+}
diff --git a/external_imported/json/doc/examples/json_pointer__pop_back.output b/external_imported/json/docs/examples/json_pointer__pop_back.output
similarity index 100%
rename from external_imported/json/doc/examples/json_pointer__pop_back.output
rename to external_imported/json/docs/examples/json_pointer__pop_back.output
diff --git a/external_imported/json/docs/examples/json_pointer__push_back.cpp b/external_imported/json/docs/examples/json_pointer__push_back.cpp
new file mode 100644
index 000000000..e6b59a125
--- /dev/null
+++ b/external_imported/json/docs/examples/json_pointer__push_back.cpp
@@ -0,0 +1,21 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    // create empty JSON Pointer
+    json::json_pointer ptr;
+    std::cout << "\"" << ptr << "\"\n";
+
+    // call push_back()
+    ptr.push_back("foo");
+    std::cout << "\"" << ptr << "\"\n";
+
+    ptr.push_back("0");
+    std::cout << "\"" << ptr << "\"\n";
+
+    ptr.push_back("bar");
+    std::cout << "\"" << ptr << "\"\n";
+}
diff --git a/external_imported/json/doc/examples/json_pointer__push_back.output b/external_imported/json/docs/examples/json_pointer__push_back.output
similarity index 100%
rename from external_imported/json/doc/examples/json_pointer__push_back.output
rename to external_imported/json/docs/examples/json_pointer__push_back.output
diff --git a/external_imported/json/docs/examples/json_pointer__string_t.cpp b/external_imported/json/docs/examples/json_pointer__string_t.cpp
new file mode 100644
index 000000000..fbe0f179e
--- /dev/null
+++ b/external_imported/json/docs/examples/json_pointer__string_t.cpp
@@ -0,0 +1,13 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    json::json_pointer::string_t s = "This is a string.";
+
+    std::cout << s << std::endl;
+
+    std::cout << std::boolalpha << std::is_same<json::json_pointer::string_t, json::string_t>::value << std::endl;
+}
diff --git a/external_imported/json/docs/examples/json_pointer__string_t.output b/external_imported/json/docs/examples/json_pointer__string_t.output
new file mode 100644
index 000000000..d87113724
--- /dev/null
+++ b/external_imported/json/docs/examples/json_pointer__string_t.output
@@ -0,0 +1,2 @@
+This is a string.
+true
diff --git a/external_imported/json/docs/examples/json_pointer__to_string.cpp b/external_imported/json/docs/examples/json_pointer__to_string.cpp
new file mode 100644
index 000000000..31d35a724
--- /dev/null
+++ b/external_imported/json/docs/examples/json_pointer__to_string.cpp
@@ -0,0 +1,34 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    // different JSON Pointers
+    json::json_pointer ptr1("");
+    json::json_pointer ptr2("/foo");
+    json::json_pointer ptr3("/foo/0");
+    json::json_pointer ptr4("/");
+    json::json_pointer ptr5("/a~1b");
+    json::json_pointer ptr6("/c%d");
+    json::json_pointer ptr7("/e^f");
+    json::json_pointer ptr8("/g|h");
+    json::json_pointer ptr9("/i\\j");
+    json::json_pointer ptr10("/k\"l");
+    json::json_pointer ptr11("/ ");
+    json::json_pointer ptr12("/m~0n");
+
+    std::cout << "\"" << ptr1.to_string() << "\"\n"
+              << "\"" << ptr2.to_string() << "\"\n"
+              << "\"" << ptr3.to_string() << "\"\n"
+              << "\"" << ptr4.to_string() << "\"\n"
+              << "\"" << ptr5.to_string() << "\"\n"
+              << "\"" << ptr6.to_string() << "\"\n"
+              << "\"" << ptr7.to_string() << "\"\n"
+              << "\"" << ptr8.to_string() << "\"\n"
+              << "\"" << ptr9.to_string() << "\"\n"
+              << "\"" << ptr10.to_string() << "\"\n"
+              << "\"" << ptr11.to_string() << "\"\n"
+              << "\"" << ptr12.to_string() << "\"" << std::endl;
+}
diff --git a/external_imported/json/docs/examples/json_pointer__to_string.output b/external_imported/json/docs/examples/json_pointer__to_string.output
new file mode 100644
index 000000000..3c441357e
--- /dev/null
+++ b/external_imported/json/docs/examples/json_pointer__to_string.output
@@ -0,0 +1,12 @@
+""
+"/foo"
+"/foo/0"
+"/"
+"/a~1b"
+"/c%d"
+"/e^f"
+"/g|h"
+"/i\j"
+"/k"l"
+"/ "
+"/m~0n"
diff --git a/external_imported/json/doc/examples/max_size.cpp b/external_imported/json/docs/examples/max_size.cpp
similarity index 100%
rename from external_imported/json/doc/examples/max_size.cpp
rename to external_imported/json/docs/examples/max_size.cpp
diff --git a/external_imported/json/docs/examples/max_size.output b/external_imported/json/docs/examples/max_size.output
new file mode 100644
index 000000000..b8dcb4d0c
--- /dev/null
+++ b/external_imported/json/docs/examples/max_size.output
@@ -0,0 +1,7 @@
+0
+1
+1
+1
+115292150460684697
+576460752303423487
+1
diff --git a/external_imported/json/doc/examples/merge_patch.cpp b/external_imported/json/docs/examples/merge_patch.cpp
similarity index 96%
rename from external_imported/json/doc/examples/merge_patch.cpp
rename to external_imported/json/docs/examples/merge_patch.cpp
index b8804d7c5..f3fee1ed1 100644
--- a/external_imported/json/doc/examples/merge_patch.cpp
+++ b/external_imported/json/docs/examples/merge_patch.cpp
@@ -3,6 +3,7 @@
 #include <iomanip> // for std::setw
 
 using json = nlohmann::json;
+using namespace nlohmann::literals;
 
 int main()
 {
diff --git a/external_imported/json/doc/examples/merge_patch.output b/external_imported/json/docs/examples/merge_patch.output
similarity index 100%
rename from external_imported/json/doc/examples/merge_patch.output
rename to external_imported/json/docs/examples/merge_patch.output
diff --git a/external_imported/json/doc/examples/meta.cpp b/external_imported/json/docs/examples/meta.cpp
similarity index 100%
rename from external_imported/json/doc/examples/meta.cpp
rename to external_imported/json/docs/examples/meta.cpp
diff --git a/external_imported/json/docs/examples/meta.output b/external_imported/json/docs/examples/meta.output
new file mode 100644
index 000000000..90390f96b
--- /dev/null
+++ b/external_imported/json/docs/examples/meta.output
@@ -0,0 +1,17 @@
+{
+    "compiler": {
+        "c++": "201103",
+        "family": "gcc",
+        "version": "12.3.0"
+    },
+    "copyright": "(C) 2013-2022 Niels Lohmann",
+    "name": "JSON for Modern C++",
+    "platform": "apple",
+    "url": "https://github.com/nlohmann/json",
+    "version": {
+        "major": 3,
+        "minor": 11,
+        "patch": 3,
+        "string": "3.11.3"
+    }
+}
diff --git a/external_imported/json/docs/examples/nlohmann_define_type_intrusive_explicit.cpp b/external_imported/json/docs/examples/nlohmann_define_type_intrusive_explicit.cpp
new file mode 100644
index 000000000..de79bd37c
--- /dev/null
+++ b/external_imported/json/docs/examples/nlohmann_define_type_intrusive_explicit.cpp
@@ -0,0 +1,60 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+using namespace nlohmann::literals;
+
+namespace ns
+{
+class person
+{
+  private:
+    std::string name = "John Doe";
+    std::string address = "123 Fake St";
+    int age = -1;
+
+  public:
+    person() = default;
+    person(std::string name_, std::string address_, int age_)
+        : name(std::move(name_)), address(std::move(address_)), age(age_)
+    {}
+
+    friend void to_json(nlohmann::json& nlohmann_json_j, const person& nlohmann_json_t)
+    {
+        nlohmann_json_j["name"] = nlohmann_json_t.name;
+        nlohmann_json_j["address"] = nlohmann_json_t.address;
+        nlohmann_json_j["age"] = nlohmann_json_t.age;
+    }
+
+    friend void from_json(const nlohmann::json& nlohmann_json_j, person& nlohmann_json_t)
+    {
+        nlohmann_json_t.name = nlohmann_json_j.at("name");
+        nlohmann_json_t.address = nlohmann_json_j.at("address");
+        nlohmann_json_t.age = nlohmann_json_j.at("age");
+    }
+};
+} // namespace ns
+
+int main()
+{
+    ns::person p = {"Ned Flanders", "744 Evergreen Terrace", 60};
+
+    // serialization: person -> json
+    json j = p;
+    std::cout << "serialization: " << j << std::endl;
+
+    // deserialization: json -> person
+    json j2 = R"({"address": "742 Evergreen Terrace", "age": 40, "name": "Homer Simpson"})"_json;
+    auto p2 = j2.template get<ns::person>();
+
+    // incomplete deserialization:
+    json j3 = R"({"address": "742 Evergreen Terrace", "name": "Maggie Simpson"})"_json;
+    try
+    {
+        auto p3 = j3.template get<ns::person>();
+    }
+    catch (const json::exception& e)
+    {
+        std::cout << "deserialization failed: " << e.what() << std::endl;
+    }
+}
diff --git a/external_imported/json/docs/examples/nlohmann_define_type_intrusive_explicit.output b/external_imported/json/docs/examples/nlohmann_define_type_intrusive_explicit.output
new file mode 100644
index 000000000..37f4eb414
--- /dev/null
+++ b/external_imported/json/docs/examples/nlohmann_define_type_intrusive_explicit.output
@@ -0,0 +1,2 @@
+serialization: {"address":"744 Evergreen Terrace","age":60,"name":"Ned Flanders"}
+deserialization failed: [json.exception.out_of_range.403] key 'age' not found
diff --git a/external_imported/json/docs/examples/nlohmann_define_type_intrusive_macro.cpp b/external_imported/json/docs/examples/nlohmann_define_type_intrusive_macro.cpp
new file mode 100644
index 000000000..4ecd4294f
--- /dev/null
+++ b/external_imported/json/docs/examples/nlohmann_define_type_intrusive_macro.cpp
@@ -0,0 +1,48 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+using namespace nlohmann::literals;
+
+namespace ns
+{
+class person
+{
+  private:
+    std::string name = "John Doe";
+    std::string address = "123 Fake St";
+    int age = -1;
+
+  public:
+    person() = default;
+    person(std::string name_, std::string address_, int age_)
+        : name(std::move(name_)), address(std::move(address_)), age(age_)
+    {}
+
+    NLOHMANN_DEFINE_TYPE_INTRUSIVE(person, name, address, age)
+};
+} // namespace ns
+
+int main()
+{
+    ns::person p = {"Ned Flanders", "744 Evergreen Terrace", 60};
+
+    // serialization: person -> json
+    json j = p;
+    std::cout << "serialization: " << j << std::endl;
+
+    // deserialization: json -> person
+    json j2 = R"({"address": "742 Evergreen Terrace", "age": 40, "name": "Homer Simpson"})"_json;
+    auto p2 = j2.template get<ns::person>();
+
+    // incomplete deserialization:
+    json j3 = R"({"address": "742 Evergreen Terrace", "name": "Maggie Simpson"})"_json;
+    try
+    {
+        auto p3 = j3.template get<ns::person>();
+    }
+    catch (const json::exception& e)
+    {
+        std::cout << "deserialization failed: " << e.what() << std::endl;
+    }
+}
diff --git a/external_imported/json/docs/examples/nlohmann_define_type_intrusive_macro.output b/external_imported/json/docs/examples/nlohmann_define_type_intrusive_macro.output
new file mode 100644
index 000000000..37f4eb414
--- /dev/null
+++ b/external_imported/json/docs/examples/nlohmann_define_type_intrusive_macro.output
@@ -0,0 +1,2 @@
+serialization: {"address":"744 Evergreen Terrace","age":60,"name":"Ned Flanders"}
+deserialization failed: [json.exception.out_of_range.403] key 'age' not found
diff --git a/external_imported/json/docs/examples/nlohmann_define_type_intrusive_only_serialize_explicit.cpp b/external_imported/json/docs/examples/nlohmann_define_type_intrusive_only_serialize_explicit.cpp
new file mode 100644
index 000000000..ea422beb5
--- /dev/null
+++ b/external_imported/json/docs/examples/nlohmann_define_type_intrusive_only_serialize_explicit.cpp
@@ -0,0 +1,38 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+using namespace nlohmann::literals;
+
+namespace ns
+{
+class person
+{
+  private:
+    std::string name = "John Doe";
+    std::string address = "123 Fake St";
+    int age = -1;
+
+  public:
+    // No default constructor
+    person(std::string name_, std::string address_, int age_)
+        : name(std::move(name_)), address(std::move(address_)), age(age_)
+    {}
+
+    friend void to_json(nlohmann::json& nlohmann_json_j, const person& nlohmann_json_t)
+    {
+        nlohmann_json_j["name"] = nlohmann_json_t.name;
+        nlohmann_json_j["address"] = nlohmann_json_t.address;
+        nlohmann_json_j["age"] = nlohmann_json_t.age;
+    }
+};
+} // namespace ns
+
+int main()
+{
+    ns::person p = {"Ned Flanders", "744 Evergreen Terrace", 60};
+
+    // serialization: person -> json
+    json j = p;
+    std::cout << "serialization: " << j << std::endl;
+}
diff --git a/external_imported/json/docs/examples/nlohmann_define_type_intrusive_only_serialize_explicit.output b/external_imported/json/docs/examples/nlohmann_define_type_intrusive_only_serialize_explicit.output
new file mode 100644
index 000000000..12f503307
--- /dev/null
+++ b/external_imported/json/docs/examples/nlohmann_define_type_intrusive_only_serialize_explicit.output
@@ -0,0 +1 @@
+serialization: {"address":"744 Evergreen Terrace","age":60,"name":"Ned Flanders"}
diff --git a/external_imported/json/docs/examples/nlohmann_define_type_intrusive_only_serialize_macro.cpp b/external_imported/json/docs/examples/nlohmann_define_type_intrusive_only_serialize_macro.cpp
new file mode 100644
index 000000000..8213f9063
--- /dev/null
+++ b/external_imported/json/docs/examples/nlohmann_define_type_intrusive_only_serialize_macro.cpp
@@ -0,0 +1,33 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+using namespace nlohmann::literals;
+
+namespace ns
+{
+class person
+{
+  private:
+    std::string name = "John Doe";
+    std::string address = "123 Fake St";
+    int age = -1;
+
+  public:
+    // No default constructor
+    person(std::string name_, std::string address_, int age_)
+        : name(std::move(name_)), address(std::move(address_)), age(age_)
+    {}
+
+    NLOHMANN_DEFINE_TYPE_INTRUSIVE(person, name, address, age)
+};
+} // namespace ns
+
+int main()
+{
+    ns::person p = {"Ned Flanders", "744 Evergreen Terrace", 60};
+
+    // serialization: person -> json
+    json j = p;
+    std::cout << "serialization: " << j << std::endl;
+}
diff --git a/external_imported/json/docs/examples/nlohmann_define_type_intrusive_only_serialize_macro.output b/external_imported/json/docs/examples/nlohmann_define_type_intrusive_only_serialize_macro.output
new file mode 100644
index 000000000..12f503307
--- /dev/null
+++ b/external_imported/json/docs/examples/nlohmann_define_type_intrusive_only_serialize_macro.output
@@ -0,0 +1 @@
+serialization: {"address":"744 Evergreen Terrace","age":60,"name":"Ned Flanders"}
diff --git a/external_imported/json/docs/examples/nlohmann_define_type_intrusive_with_default_explicit.cpp b/external_imported/json/docs/examples/nlohmann_define_type_intrusive_with_default_explicit.cpp
new file mode 100644
index 000000000..0fb2e1cb2
--- /dev/null
+++ b/external_imported/json/docs/examples/nlohmann_define_type_intrusive_with_default_explicit.cpp
@@ -0,0 +1,55 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+using namespace nlohmann::literals;
+
+namespace ns
+{
+class person
+{
+  private:
+    std::string name = "John Doe";
+    std::string address = "123 Fake St";
+    int age = -1;
+
+  public:
+    person() = default;
+    person(std::string name_, std::string address_, int age_)
+        : name(std::move(name_)), address(std::move(address_)), age(age_)
+    {}
+
+    friend void to_json(nlohmann::json& nlohmann_json_j, const person& nlohmann_json_t)
+    {
+        nlohmann_json_j["name"] = nlohmann_json_t.name;
+        nlohmann_json_j["address"] = nlohmann_json_t.address;
+        nlohmann_json_j["age"] = nlohmann_json_t.age;
+    }
+
+    friend void from_json(const nlohmann::json& nlohmann_json_j, person& nlohmann_json_t)
+    {
+        person nlohmann_json_default_obj;
+        nlohmann_json_t.name = nlohmann_json_j.value("name", nlohmann_json_default_obj.name);
+        nlohmann_json_t.address = nlohmann_json_j.value("address", nlohmann_json_default_obj.address);
+        nlohmann_json_t.age = nlohmann_json_j.value("age", nlohmann_json_default_obj.age);
+    }
+};
+} // namespace ns
+
+int main()
+{
+    ns::person p = {"Ned Flanders", "744 Evergreen Terrace", 60};
+
+    // serialization: person -> json
+    json j = p;
+    std::cout << "serialization: " << j << std::endl;
+
+    // deserialization: json -> person
+    json j2 = R"({"address": "742 Evergreen Terrace", "age": 40, "name": "Homer Simpson"})"_json;
+    auto p2 = j2.template get<ns::person>();
+
+    // incomplete deserialization:
+    json j3 = R"({"address": "742 Evergreen Terrace", "name": "Maggie Simpson"})"_json;
+    auto p3 = j3.template get<ns::person>();
+    std::cout << "roundtrip: " << json(p3) << std::endl;
+}
diff --git a/external_imported/json/docs/examples/nlohmann_define_type_intrusive_with_default_explicit.output b/external_imported/json/docs/examples/nlohmann_define_type_intrusive_with_default_explicit.output
new file mode 100644
index 000000000..1a255f65c
--- /dev/null
+++ b/external_imported/json/docs/examples/nlohmann_define_type_intrusive_with_default_explicit.output
@@ -0,0 +1,2 @@
+serialization: {"address":"744 Evergreen Terrace","age":60,"name":"Ned Flanders"}
+roundtrip: {"address":"742 Evergreen Terrace","age":-1,"name":"Maggie Simpson"}
diff --git a/external_imported/json/docs/examples/nlohmann_define_type_intrusive_with_default_macro.cpp b/external_imported/json/docs/examples/nlohmann_define_type_intrusive_with_default_macro.cpp
new file mode 100644
index 000000000..52668516b
--- /dev/null
+++ b/external_imported/json/docs/examples/nlohmann_define_type_intrusive_with_default_macro.cpp
@@ -0,0 +1,42 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+using namespace nlohmann::literals;
+
+namespace ns
+{
+class person
+{
+  private:
+    std::string name = "John Doe";
+    std::string address = "123 Fake St";
+    int age = -1;
+
+  public:
+    person() = default;
+    person(std::string name_, std::string address_, int age_)
+        : name(std::move(name_)), address(std::move(address_)), age(age_)
+    {}
+
+    NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(person, name, address, age)
+};
+} // namespace ns
+
+int main()
+{
+    ns::person p = {"Ned Flanders", "744 Evergreen Terrace", 60};
+
+    // serialization: person -> json
+    json j = p;
+    std::cout << "serialization: " << j << std::endl;
+
+    // deserialization: json -> person
+    json j2 = R"({"address": "742 Evergreen Terrace", "age": 40, "name": "Homer Simpson"})"_json;
+    auto p2 = j2.template get<ns::person>();
+
+    // incomplete deserialization:
+    json j3 = R"({"address": "742 Evergreen Terrace", "name": "Maggie Simpson"})"_json;
+    auto p3 = j3.template get<ns::person>();
+    std::cout << "roundtrip: " << json(p3) << std::endl;
+}
diff --git a/external_imported/json/docs/examples/nlohmann_define_type_intrusive_with_default_macro.output b/external_imported/json/docs/examples/nlohmann_define_type_intrusive_with_default_macro.output
new file mode 100644
index 000000000..1a255f65c
--- /dev/null
+++ b/external_imported/json/docs/examples/nlohmann_define_type_intrusive_with_default_macro.output
@@ -0,0 +1,2 @@
+serialization: {"address":"744 Evergreen Terrace","age":60,"name":"Ned Flanders"}
+roundtrip: {"address":"742 Evergreen Terrace","age":-1,"name":"Maggie Simpson"}
diff --git a/external_imported/json/docs/examples/nlohmann_define_type_non_intrusive_explicit.cpp b/external_imported/json/docs/examples/nlohmann_define_type_non_intrusive_explicit.cpp
new file mode 100644
index 000000000..a31a7eb8f
--- /dev/null
+++ b/external_imported/json/docs/examples/nlohmann_define_type_non_intrusive_explicit.cpp
@@ -0,0 +1,53 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+using namespace nlohmann::literals;
+
+namespace ns
+{
+struct person
+{
+    std::string name;
+    std::string address;
+    int age;
+};
+
+void to_json(nlohmann::json& nlohmann_json_j, const person& nlohmann_json_t)
+{
+    nlohmann_json_j["name"] = nlohmann_json_t.name;
+    nlohmann_json_j["address"] = nlohmann_json_t.address;
+    nlohmann_json_j["age"] = nlohmann_json_t.age;
+}
+
+void from_json(const nlohmann::json& nlohmann_json_j, person& nlohmann_json_t)
+{
+    nlohmann_json_t.name = nlohmann_json_j.at("name");
+    nlohmann_json_t.address = nlohmann_json_j.at("address");
+    nlohmann_json_t.age = nlohmann_json_j.at("age");
+}
+} // namespace ns
+
+int main()
+{
+    ns::person p = {"Ned Flanders", "744 Evergreen Terrace", 60};
+
+    // serialization: person -> json
+    json j = p;
+    std::cout << "serialization: " << j << std::endl;
+
+    // deserialization: json -> person
+    json j2 = R"({"address": "742 Evergreen Terrace", "age": 40, "name": "Homer Simpson"})"_json;
+    auto p2 = j2.template get<ns::person>();
+
+    // incomplete deserialization:
+    json j3 = R"({"address": "742 Evergreen Terrace", "name": "Maggie Simpson"})"_json;
+    try
+    {
+        auto p3 = j3.template get<ns::person>();
+    }
+    catch (const json::exception& e)
+    {
+        std::cout << "deserialization failed: " << e.what() << std::endl;
+    }
+}
diff --git a/external_imported/json/docs/examples/nlohmann_define_type_non_intrusive_explicit.output b/external_imported/json/docs/examples/nlohmann_define_type_non_intrusive_explicit.output
new file mode 100644
index 000000000..37f4eb414
--- /dev/null
+++ b/external_imported/json/docs/examples/nlohmann_define_type_non_intrusive_explicit.output
@@ -0,0 +1,2 @@
+serialization: {"address":"744 Evergreen Terrace","age":60,"name":"Ned Flanders"}
+deserialization failed: [json.exception.out_of_range.403] key 'age' not found
diff --git a/external_imported/json/docs/examples/nlohmann_define_type_non_intrusive_macro.cpp b/external_imported/json/docs/examples/nlohmann_define_type_non_intrusive_macro.cpp
new file mode 100644
index 000000000..d11691b70
--- /dev/null
+++ b/external_imported/json/docs/examples/nlohmann_define_type_non_intrusive_macro.cpp
@@ -0,0 +1,41 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+using namespace nlohmann::literals;
+
+namespace ns
+{
+struct person
+{
+    std::string name;
+    std::string address;
+    int age;
+};
+
+NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(person, name, address, age)
+} // namespace ns
+
+int main()
+{
+    ns::person p = {"Ned Flanders", "744 Evergreen Terrace", 60};
+
+    // serialization: person -> json
+    json j = p;
+    std::cout << "serialization: " << j << std::endl;
+
+    // deserialization: json -> person
+    json j2 = R"({"address": "742 Evergreen Terrace", "age": 40, "name": "Homer Simpson"})"_json;
+    auto p2 = j2.template get<ns::person>();
+
+    // incomplete deserialization:
+    json j3 = R"({"address": "742 Evergreen Terrace", "name": "Maggie Simpson"})"_json;
+    try
+    {
+        auto p3 = j3.template get<ns::person>();
+    }
+    catch (const json::exception& e)
+    {
+        std::cout << "deserialization failed: " << e.what() << std::endl;
+    }
+}
diff --git a/external_imported/json/docs/examples/nlohmann_define_type_non_intrusive_macro.output b/external_imported/json/docs/examples/nlohmann_define_type_non_intrusive_macro.output
new file mode 100644
index 000000000..37f4eb414
--- /dev/null
+++ b/external_imported/json/docs/examples/nlohmann_define_type_non_intrusive_macro.output
@@ -0,0 +1,2 @@
+serialization: {"address":"744 Evergreen Terrace","age":60,"name":"Ned Flanders"}
+deserialization failed: [json.exception.out_of_range.403] key 'age' not found
diff --git a/external_imported/json/docs/examples/nlohmann_define_type_non_intrusive_only_serialize_explicit.cpp b/external_imported/json/docs/examples/nlohmann_define_type_non_intrusive_only_serialize_explicit.cpp
new file mode 100644
index 000000000..8890e03af
--- /dev/null
+++ b/external_imported/json/docs/examples/nlohmann_define_type_non_intrusive_only_serialize_explicit.cpp
@@ -0,0 +1,31 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+using namespace nlohmann::literals;
+
+namespace ns
+{
+struct person
+{
+    std::string name;
+    std::string address;
+    int age;
+};
+
+void to_json(nlohmann::json& nlohmann_json_j, const person& nlohmann_json_t)
+{
+    nlohmann_json_j["name"] = nlohmann_json_t.name;
+    nlohmann_json_j["address"] = nlohmann_json_t.address;
+    nlohmann_json_j["age"] = nlohmann_json_t.age;
+}
+} // namespace ns
+
+int main()
+{
+    ns::person p = {"Ned Flanders", "744 Evergreen Terrace", 60};
+
+    // serialization: person -> json
+    json j = p;
+    std::cout << "serialization: " << j << std::endl;
+}
diff --git a/external_imported/json/docs/examples/nlohmann_define_type_non_intrusive_only_serialize_explicit.output b/external_imported/json/docs/examples/nlohmann_define_type_non_intrusive_only_serialize_explicit.output
new file mode 100644
index 000000000..12f503307
--- /dev/null
+++ b/external_imported/json/docs/examples/nlohmann_define_type_non_intrusive_only_serialize_explicit.output
@@ -0,0 +1 @@
+serialization: {"address":"744 Evergreen Terrace","age":60,"name":"Ned Flanders"}
diff --git a/external_imported/json/docs/examples/nlohmann_define_type_non_intrusive_only_serialize_macro.cpp b/external_imported/json/docs/examples/nlohmann_define_type_non_intrusive_only_serialize_macro.cpp
new file mode 100644
index 000000000..7aef23af6
--- /dev/null
+++ b/external_imported/json/docs/examples/nlohmann_define_type_non_intrusive_only_serialize_macro.cpp
@@ -0,0 +1,26 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+using namespace nlohmann::literals;
+
+namespace ns
+{
+struct person
+{
+    std::string name;
+    std::string address;
+    int age;
+};
+
+NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_ONLY_SERIALIZE(person, name, address, age)
+} // namespace ns
+
+int main()
+{
+    ns::person p = {"Ned Flanders", "744 Evergreen Terrace", 60};
+
+    // serialization: person -> json
+    json j = p;
+    std::cout << "serialization: " << j << std::endl;
+}
diff --git a/external_imported/json/docs/examples/nlohmann_define_type_non_intrusive_only_serialize_macro.output b/external_imported/json/docs/examples/nlohmann_define_type_non_intrusive_only_serialize_macro.output
new file mode 100644
index 000000000..12f503307
--- /dev/null
+++ b/external_imported/json/docs/examples/nlohmann_define_type_non_intrusive_only_serialize_macro.output
@@ -0,0 +1 @@
+serialization: {"address":"744 Evergreen Terrace","age":60,"name":"Ned Flanders"}
diff --git a/external_imported/json/docs/examples/nlohmann_define_type_non_intrusive_with_default_explicit.cpp b/external_imported/json/docs/examples/nlohmann_define_type_non_intrusive_with_default_explicit.cpp
new file mode 100644
index 000000000..855ab52b8
--- /dev/null
+++ b/external_imported/json/docs/examples/nlohmann_define_type_non_intrusive_with_default_explicit.cpp
@@ -0,0 +1,53 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+using namespace nlohmann::literals;
+
+namespace ns
+{
+struct person
+{
+    std::string name = "John Doe";
+    std::string address = "123 Fake St";
+    int age = -1;
+
+    person() = default;
+    person(std::string name_, std::string address_, int age_)
+        : name(std::move(name_)), address(std::move(address_)), age(age_)
+    {}
+};
+
+void to_json(nlohmann::json& nlohmann_json_j, const person& nlohmann_json_t)
+{
+    nlohmann_json_j["name"] = nlohmann_json_t.name;
+    nlohmann_json_j["address"] = nlohmann_json_t.address;
+    nlohmann_json_j["age"] = nlohmann_json_t.age;
+}
+
+void from_json(const nlohmann::json& nlohmann_json_j, person& nlohmann_json_t)
+{
+    person nlohmann_json_default_obj;
+    nlohmann_json_t.name = nlohmann_json_j.value("name", nlohmann_json_default_obj.name);
+    nlohmann_json_t.address = nlohmann_json_j.value("address", nlohmann_json_default_obj.address);
+    nlohmann_json_t.age = nlohmann_json_j.value("age", nlohmann_json_default_obj.age);
+}
+} // namespace ns
+
+int main()
+{
+    ns::person p = {"Ned Flanders", "744 Evergreen Terrace", 60};
+
+    // serialization: person -> json
+    json j = p;
+    std::cout << "serialization: " << j << std::endl;
+
+    // deserialization: json -> person
+    json j2 = R"({"address": "742 Evergreen Terrace", "age": 40, "name": "Homer Simpson"})"_json;
+    auto p2 = j2.template get<ns::person>();
+
+    // incomplete deserialization:
+    json j3 = R"({"address": "742 Evergreen Terrace", "name": "Maggie Simpson"})"_json;
+    auto p3 = j3.template get<ns::person>();
+    std::cout << "roundtrip: " << json(p3) << std::endl;
+}
diff --git a/external_imported/json/docs/examples/nlohmann_define_type_non_intrusive_with_default_explicit.output b/external_imported/json/docs/examples/nlohmann_define_type_non_intrusive_with_default_explicit.output
new file mode 100644
index 000000000..1a255f65c
--- /dev/null
+++ b/external_imported/json/docs/examples/nlohmann_define_type_non_intrusive_with_default_explicit.output
@@ -0,0 +1,2 @@
+serialization: {"address":"744 Evergreen Terrace","age":60,"name":"Ned Flanders"}
+roundtrip: {"address":"742 Evergreen Terrace","age":-1,"name":"Maggie Simpson"}
diff --git a/external_imported/json/docs/examples/nlohmann_define_type_non_intrusive_with_default_macro.cpp b/external_imported/json/docs/examples/nlohmann_define_type_non_intrusive_with_default_macro.cpp
new file mode 100644
index 000000000..8c41c65ec
--- /dev/null
+++ b/external_imported/json/docs/examples/nlohmann_define_type_non_intrusive_with_default_macro.cpp
@@ -0,0 +1,40 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+using namespace nlohmann::literals;
+
+namespace ns
+{
+struct person
+{
+    std::string name = "John Doe";
+    std::string address = "123 Fake St";
+    int age = -1;
+
+    person() = default;
+    person(std::string name_, std::string address_, int age_)
+        : name(std::move(name_)), address(std::move(address_)), age(age_)
+    {}
+};
+
+NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(person, name, address, age)
+} // namespace ns
+
+int main()
+{
+    ns::person p = {"Ned Flanders", "744 Evergreen Terrace", 60};
+
+    // serialization: person -> json
+    json j = p;
+    std::cout << "serialization: " << j << std::endl;
+
+    // deserialization: json -> person
+    json j2 = R"({"address": "742 Evergreen Terrace", "age": 40, "name": "Homer Simpson"})"_json;
+    auto p2 = j2.template get<ns::person>();
+
+    // incomplete deserialization:
+    json j3 = R"({"address": "742 Evergreen Terrace", "name": "Maggie Simpson"})"_json;
+    auto p3 = j3.template get<ns::person>();
+    std::cout << "roundtrip: " << json(p3) << std::endl;
+}
diff --git a/external_imported/json/docs/examples/nlohmann_define_type_non_intrusive_with_default_macro.output b/external_imported/json/docs/examples/nlohmann_define_type_non_intrusive_with_default_macro.output
new file mode 100644
index 000000000..1a255f65c
--- /dev/null
+++ b/external_imported/json/docs/examples/nlohmann_define_type_non_intrusive_with_default_macro.output
@@ -0,0 +1,2 @@
+serialization: {"address":"744 Evergreen Terrace","age":60,"name":"Ned Flanders"}
+roundtrip: {"address":"742 Evergreen Terrace","age":-1,"name":"Maggie Simpson"}
diff --git a/external_imported/json/docs/examples/nlohmann_json_namespace.cpp b/external_imported/json/docs/examples/nlohmann_json_namespace.cpp
new file mode 100644
index 000000000..4bad91f4b
--- /dev/null
+++ b/external_imported/json/docs/examples/nlohmann_json_namespace.cpp
@@ -0,0 +1,14 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+// possible use case: use NLOHMANN_JSON_NAMESPACE instead of nlohmann
+using json = NLOHMANN_JSON_NAMESPACE::json;
+
+// macro needed to output the NLOHMANN_JSON_NAMESPACE as string literal
+#define Q(x) #x
+#define QUOTE(x) Q(x)
+
+int main()
+{
+    std::cout << QUOTE(NLOHMANN_JSON_NAMESPACE) << std::endl;
+}
diff --git a/external_imported/json/docs/examples/nlohmann_json_namespace.output b/external_imported/json/docs/examples/nlohmann_json_namespace.output
new file mode 100644
index 000000000..5565deafd
--- /dev/null
+++ b/external_imported/json/docs/examples/nlohmann_json_namespace.output
@@ -0,0 +1 @@
+nlohmann::json_abi_v3_11_3
diff --git a/external_imported/json/docs/examples/nlohmann_json_namespace_begin.c++17.cpp b/external_imported/json/docs/examples/nlohmann_json_namespace_begin.c++17.cpp
new file mode 100644
index 000000000..9385d593d
--- /dev/null
+++ b/external_imported/json/docs/examples/nlohmann_json_namespace_begin.c++17.cpp
@@ -0,0 +1,33 @@
+#include <iostream>
+#include <optional>
+#include <nlohmann/json.hpp>
+
+// partial specialization (see https://json.nlohmann.me/features/arbitrary_types/)
+NLOHMANN_JSON_NAMESPACE_BEGIN
+template <typename T>
+struct adl_serializer<std::optional<T>>
+{
+    static void to_json(json& j, const std::optional<T>& opt)
+    {
+        if (opt == std::nullopt)
+        {
+            j = nullptr;
+        }
+        else
+        {
+            j = *opt;
+        }
+    }
+};
+NLOHMANN_JSON_NAMESPACE_END
+
+int main()
+{
+    std::optional<int> o1 = 1;
+    std::optional<int> o2 = std::nullopt;
+
+    NLOHMANN_JSON_NAMESPACE::json j;
+    j.push_back(o1);
+    j.push_back(o2);
+    std::cout << j << std::endl;
+}
diff --git a/external_imported/json/docs/examples/nlohmann_json_namespace_begin.c++17.output b/external_imported/json/docs/examples/nlohmann_json_namespace_begin.c++17.output
new file mode 100644
index 000000000..b29d3b93c
--- /dev/null
+++ b/external_imported/json/docs/examples/nlohmann_json_namespace_begin.c++17.output
@@ -0,0 +1 @@
+[1,null]
diff --git a/external_imported/json/docs/examples/nlohmann_json_namespace_no_version.cpp b/external_imported/json/docs/examples/nlohmann_json_namespace_no_version.cpp
new file mode 100644
index 000000000..97948dd7e
--- /dev/null
+++ b/external_imported/json/docs/examples/nlohmann_json_namespace_no_version.cpp
@@ -0,0 +1,13 @@
+#include <iostream>
+
+#define NLOHMANN_JSON_NAMESPACE_NO_VERSION 1
+#include <nlohmann/json.hpp>
+
+// macro needed to output the NLOHMANN_JSON_NAMESPACE as string literal
+#define Q(x) #x
+#define QUOTE(x) Q(x)
+
+int main()
+{
+    std::cout << QUOTE(NLOHMANN_JSON_NAMESPACE) << std::endl;
+}
diff --git a/external_imported/json/docs/examples/nlohmann_json_namespace_no_version.output b/external_imported/json/docs/examples/nlohmann_json_namespace_no_version.output
new file mode 100644
index 000000000..1c8f3132b
--- /dev/null
+++ b/external_imported/json/docs/examples/nlohmann_json_namespace_no_version.output
@@ -0,0 +1 @@
+nlohmann::json_abi
diff --git a/external_imported/json/docs/examples/nlohmann_json_serialize_enum.cpp b/external_imported/json/docs/examples/nlohmann_json_serialize_enum.cpp
new file mode 100644
index 000000000..a40db49ea
--- /dev/null
+++ b/external_imported/json/docs/examples/nlohmann_json_serialize_enum.cpp
@@ -0,0 +1,59 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+namespace ns
+{
+enum TaskState
+{
+    TS_STOPPED,
+    TS_RUNNING,
+    TS_COMPLETED,
+    TS_INVALID = -1
+};
+
+NLOHMANN_JSON_SERIALIZE_ENUM(TaskState,
+{
+    { TS_INVALID, nullptr },
+    { TS_STOPPED, "stopped" },
+    { TS_RUNNING, "running" },
+    { TS_COMPLETED, "completed" }
+})
+
+enum class Color
+{
+    red, green, blue, unknown
+};
+
+NLOHMANN_JSON_SERIALIZE_ENUM(Color,
+{
+    { Color::unknown, "unknown" }, { Color::red, "red" },
+    { Color::green, "green" }, { Color::blue, "blue" }
+})
+} // namespace ns
+
+int main()
+{
+    // serialization
+    json j_stopped = ns::TS_STOPPED;
+    json j_red = ns::Color::red;
+    std::cout << "ns::TS_STOPPED -> " << j_stopped
+              << ", ns::Color::red -> " << j_red << std::endl;
+
+    // deserialization
+    json j_running = "running";
+    json j_blue = "blue";
+    auto running = j_running.template get<ns::TaskState>();
+    auto blue = j_blue.template get<ns::Color>();
+    std::cout << j_running << " -> " << running
+              << ", " << j_blue << " -> " << static_cast<int>(blue) << std::endl;
+
+    // deserializing undefined JSON value to enum
+    // (where the first map entry above is the default)
+    json j_pi = 3.14;
+    auto invalid = j_pi.template get<ns::TaskState>();
+    auto unknown = j_pi.template get<ns::Color>();
+    std::cout << j_pi << " -> " << invalid << ", "
+              << j_pi << " -> " << static_cast<int>(unknown) << std::endl;
+}
diff --git a/external_imported/json/docs/examples/nlohmann_json_serialize_enum.output b/external_imported/json/docs/examples/nlohmann_json_serialize_enum.output
new file mode 100644
index 000000000..f512563dd
--- /dev/null
+++ b/external_imported/json/docs/examples/nlohmann_json_serialize_enum.output
@@ -0,0 +1,3 @@
+ns::TS_STOPPED -> "stopped", ns::Color::red -> "red"
+"running" -> 1, "blue" -> 2
+3.14 -> -1, 3.14 -> 3
diff --git a/external_imported/json/docs/examples/nlohmann_json_serialize_enum_2.cpp b/external_imported/json/docs/examples/nlohmann_json_serialize_enum_2.cpp
new file mode 100644
index 000000000..b35e94cc5
--- /dev/null
+++ b/external_imported/json/docs/examples/nlohmann_json_serialize_enum_2.cpp
@@ -0,0 +1,33 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+namespace ns
+{
+enum class Color
+{
+    red, green, blue, unknown
+};
+
+NLOHMANN_JSON_SERIALIZE_ENUM(Color,
+{
+    { Color::unknown, "unknown" }, { Color::red, "red" },
+    { Color::green, "green" }, { Color::blue, "blue" },
+    { Color::red, "rot" } // a second conversion for Color::red
+})
+}
+
+int main()
+{
+    // serialization
+    json j_red = ns::Color::red;
+    std::cout << static_cast<int>(ns::Color::red) << " -> " << j_red << std::endl;
+
+    // deserialization
+    json j_rot = "rot";
+    auto rot = j_rot.template get<ns::Color>();
+    auto red = j_red.template get<ns::Color>();
+    std::cout << j_rot << " -> " << static_cast<int>(rot) << std::endl;
+    std::cout << j_red << " -> " << static_cast<int>(red) << std::endl;
+}
diff --git a/external_imported/json/docs/examples/nlohmann_json_serialize_enum_2.output b/external_imported/json/docs/examples/nlohmann_json_serialize_enum_2.output
new file mode 100644
index 000000000..5dec31b4a
--- /dev/null
+++ b/external_imported/json/docs/examples/nlohmann_json_serialize_enum_2.output
@@ -0,0 +1,3 @@
+0 -> "red"
+"rot" -> 0
+"red" -> 0
diff --git a/external_imported/json/docs/examples/nlohmann_json_version.cpp b/external_imported/json/docs/examples/nlohmann_json_version.cpp
new file mode 100644
index 000000000..ca5f53728
--- /dev/null
+++ b/external_imported/json/docs/examples/nlohmann_json_version.cpp
@@ -0,0 +1,12 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    std::cout << "JSON for Modern C++ version "
+              << NLOHMANN_JSON_VERSION_MAJOR << "."
+              << NLOHMANN_JSON_VERSION_MINOR << "."
+              << NLOHMANN_JSON_VERSION_PATCH << std::endl;
+}
diff --git a/external_imported/json/docs/examples/nlohmann_json_version.output b/external_imported/json/docs/examples/nlohmann_json_version.output
new file mode 100644
index 000000000..75dbe8478
--- /dev/null
+++ b/external_imported/json/docs/examples/nlohmann_json_version.output
@@ -0,0 +1 @@
+JSON for Modern C++ version 3.11.3
diff --git a/external_imported/json/docs/examples/number_float_t.cpp b/external_imported/json/docs/examples/number_float_t.cpp
new file mode 100644
index 000000000..21211dc51
--- /dev/null
+++ b/external_imported/json/docs/examples/number_float_t.cpp
@@ -0,0 +1,10 @@
+#include <iostream>
+#include <iomanip>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    std::cout << std::boolalpha << std::is_same<double, json::number_float_t>::value << std::endl;
+}
diff --git a/external_imported/json/docs/examples/number_float_t.output b/external_imported/json/docs/examples/number_float_t.output
new file mode 100644
index 000000000..27ba77dda
--- /dev/null
+++ b/external_imported/json/docs/examples/number_float_t.output
@@ -0,0 +1 @@
+true
diff --git a/external_imported/json/docs/examples/number_integer_t.cpp b/external_imported/json/docs/examples/number_integer_t.cpp
new file mode 100644
index 000000000..75ee57b63
--- /dev/null
+++ b/external_imported/json/docs/examples/number_integer_t.cpp
@@ -0,0 +1,10 @@
+#include <iostream>
+#include <iomanip>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    std::cout << std::boolalpha << std::is_same<std::int64_t, json::number_integer_t>::value << std::endl;
+}
diff --git a/external_imported/json/docs/examples/number_integer_t.output b/external_imported/json/docs/examples/number_integer_t.output
new file mode 100644
index 000000000..27ba77dda
--- /dev/null
+++ b/external_imported/json/docs/examples/number_integer_t.output
@@ -0,0 +1 @@
+true
diff --git a/external_imported/json/docs/examples/number_unsigned_t.cpp b/external_imported/json/docs/examples/number_unsigned_t.cpp
new file mode 100644
index 000000000..ff3b86df8
--- /dev/null
+++ b/external_imported/json/docs/examples/number_unsigned_t.cpp
@@ -0,0 +1,10 @@
+#include <iostream>
+#include <iomanip>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    std::cout << std::boolalpha << std::is_same<std::uint64_t, json::number_unsigned_t>::value << std::endl;
+}
diff --git a/external_imported/json/docs/examples/number_unsigned_t.output b/external_imported/json/docs/examples/number_unsigned_t.output
new file mode 100644
index 000000000..27ba77dda
--- /dev/null
+++ b/external_imported/json/docs/examples/number_unsigned_t.output
@@ -0,0 +1 @@
+true
diff --git a/external_imported/json/doc/examples/object.cpp b/external_imported/json/docs/examples/object.cpp
similarity index 94%
rename from external_imported/json/doc/examples/object.cpp
rename to external_imported/json/docs/examples/object.cpp
index 733b89b53..ad167d4af 100644
--- a/external_imported/json/doc/examples/object.cpp
+++ b/external_imported/json/docs/examples/object.cpp
@@ -21,7 +21,7 @@ int main()
         // can only create an object from a list of pairs
         json j_invalid_object = json::object({{ "one", 1, 2 }});
     }
-    catch (json::type_error& e)
+    catch (const json::type_error& e)
     {
         std::cout << e.what() << '\n';
     }
diff --git a/external_imported/json/doc/examples/object.output b/external_imported/json/docs/examples/object.output
similarity index 100%
rename from external_imported/json/doc/examples/object.output
rename to external_imported/json/docs/examples/object.output
diff --git a/external_imported/json/docs/examples/object_comparator_t.cpp b/external_imported/json/docs/examples/object_comparator_t.cpp
new file mode 100644
index 000000000..6b82c7ca6
--- /dev/null
+++ b/external_imported/json/docs/examples/object_comparator_t.cpp
@@ -0,0 +1,11 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    std::cout << std::boolalpha
+              << "json::object_comparator_t(\"one\", \"two\") = " << json::object_comparator_t{}("one", "two") << "\n"
+              << "json::object_comparator_t(\"three\", \"four\") = " << json::object_comparator_t{}("three", "four") << std::endl;
+}
diff --git a/external_imported/json/docs/examples/object_comparator_t.output b/external_imported/json/docs/examples/object_comparator_t.output
new file mode 100644
index 000000000..63620edb4
--- /dev/null
+++ b/external_imported/json/docs/examples/object_comparator_t.output
@@ -0,0 +1,2 @@
+json::object_comparator_t("one", "two") = true
+json::object_comparator_t("three", "four") = false
diff --git a/external_imported/json/docs/examples/object_t.cpp b/external_imported/json/docs/examples/object_t.cpp
new file mode 100644
index 000000000..85cfa3e33
--- /dev/null
+++ b/external_imported/json/docs/examples/object_t.cpp
@@ -0,0 +1,10 @@
+#include <iostream>
+#include <iomanip>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    std::cout << std::boolalpha << std::is_same<std::map<json::string_t, json>, json::object_t>::value << std::endl;
+}
diff --git a/external_imported/json/docs/examples/object_t.output b/external_imported/json/docs/examples/object_t.output
new file mode 100644
index 000000000..27ba77dda
--- /dev/null
+++ b/external_imported/json/docs/examples/object_t.output
@@ -0,0 +1 @@
+true
diff --git a/external_imported/json/doc/examples/operator__ValueType.cpp b/external_imported/json/docs/examples/operator__ValueType.cpp
similarity index 97%
rename from external_imported/json/doc/examples/operator__ValueType.cpp
rename to external_imported/json/docs/examples/operator__ValueType.cpp
index 66fcf310e..e8a1d349d 100644
--- a/external_imported/json/doc/examples/operator__ValueType.cpp
+++ b/external_imported/json/docs/examples/operator__ValueType.cpp
@@ -53,7 +53,7 @@ int main()
     {
         bool v1 = json_types["string"];
     }
-    catch (json::type_error& e)
+    catch (const json::type_error& e)
     {
         std::cout << e.what() << '\n';
     }
diff --git a/external_imported/json/doc/examples/operator__ValueType.output b/external_imported/json/docs/examples/operator__ValueType.output
similarity index 100%
rename from external_imported/json/doc/examples/operator__ValueType.output
rename to external_imported/json/docs/examples/operator__ValueType.output
diff --git a/external_imported/json/doc/examples/operator__equal.cpp b/external_imported/json/docs/examples/operator__equal.cpp
similarity index 100%
rename from external_imported/json/doc/examples/operator__equal.cpp
rename to external_imported/json/docs/examples/operator__equal.cpp
diff --git a/external_imported/json/doc/examples/operator__equal.output b/external_imported/json/docs/examples/operator__equal.output
similarity index 100%
rename from external_imported/json/doc/examples/operator__equal.output
rename to external_imported/json/docs/examples/operator__equal.output
diff --git a/external_imported/json/doc/examples/operator__equal__nullptr_t.cpp b/external_imported/json/docs/examples/operator__equal__nullptr_t.cpp
similarity index 100%
rename from external_imported/json/doc/examples/operator__equal__nullptr_t.cpp
rename to external_imported/json/docs/examples/operator__equal__nullptr_t.cpp
diff --git a/external_imported/json/doc/examples/operator__equal__nullptr_t.output b/external_imported/json/docs/examples/operator__equal__nullptr_t.output
similarity index 100%
rename from external_imported/json/doc/examples/operator__equal__nullptr_t.output
rename to external_imported/json/docs/examples/operator__equal__nullptr_t.output
diff --git a/external_imported/json/docs/examples/operator__equal__specializations.cpp b/external_imported/json/docs/examples/operator__equal__specializations.cpp
new file mode 100644
index 000000000..97d5ecead
--- /dev/null
+++ b/external_imported/json/docs/examples/operator__equal__specializations.cpp
@@ -0,0 +1,16 @@
+#include <iostream>
+#include <iomanip>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    nlohmann::json uj1 = {{"version", 1}, {"type", "integer"}};
+    nlohmann::json uj2 = {{"type", "integer"}, {"version", 1}};
+
+    nlohmann::ordered_json oj1 = {{"version", 1}, {"type", "integer"}};
+    nlohmann::ordered_json oj2 = {{"type", "integer"}, {"version", 1}};
+
+    std::cout << std::boolalpha << (uj1 == uj2) << '\n' << (oj1 == oj2) << std::endl;
+}
diff --git a/external_imported/json/docs/examples/operator__equal__specializations.output b/external_imported/json/docs/examples/operator__equal__specializations.output
new file mode 100644
index 000000000..da29283aa
--- /dev/null
+++ b/external_imported/json/docs/examples/operator__equal__specializations.output
@@ -0,0 +1,2 @@
+true
+false
diff --git a/external_imported/json/doc/examples/operator__greater.cpp b/external_imported/json/docs/examples/operator__greater.cpp
similarity index 100%
rename from external_imported/json/doc/examples/operator__greater.cpp
rename to external_imported/json/docs/examples/operator__greater.cpp
diff --git a/external_imported/json/doc/examples/operator__greater.output b/external_imported/json/docs/examples/operator__greater.output
similarity index 100%
rename from external_imported/json/doc/examples/operator__greater.output
rename to external_imported/json/docs/examples/operator__greater.output
diff --git a/external_imported/json/doc/examples/operator__greaterequal.cpp b/external_imported/json/docs/examples/operator__greaterequal.cpp
similarity index 100%
rename from external_imported/json/doc/examples/operator__greaterequal.cpp
rename to external_imported/json/docs/examples/operator__greaterequal.cpp
diff --git a/external_imported/json/doc/examples/operator__greaterequal.output b/external_imported/json/docs/examples/operator__greaterequal.output
similarity index 100%
rename from external_imported/json/doc/examples/operator__greaterequal.output
rename to external_imported/json/docs/examples/operator__greaterequal.output
diff --git a/external_imported/json/doc/examples/operator__less.cpp b/external_imported/json/docs/examples/operator__less.cpp
similarity index 100%
rename from external_imported/json/doc/examples/operator__less.cpp
rename to external_imported/json/docs/examples/operator__less.cpp
diff --git a/external_imported/json/doc/examples/operator__less.output b/external_imported/json/docs/examples/operator__less.output
similarity index 100%
rename from external_imported/json/doc/examples/operator__less.output
rename to external_imported/json/docs/examples/operator__less.output
diff --git a/external_imported/json/doc/examples/operator__lessequal.cpp b/external_imported/json/docs/examples/operator__lessequal.cpp
similarity index 100%
rename from external_imported/json/doc/examples/operator__lessequal.cpp
rename to external_imported/json/docs/examples/operator__lessequal.cpp
diff --git a/external_imported/json/doc/examples/operator__lessequal.output b/external_imported/json/docs/examples/operator__lessequal.output
similarity index 100%
rename from external_imported/json/doc/examples/operator__lessequal.output
rename to external_imported/json/docs/examples/operator__lessequal.output
diff --git a/external_imported/json/doc/examples/operator__notequal.cpp b/external_imported/json/docs/examples/operator__notequal.cpp
similarity index 100%
rename from external_imported/json/doc/examples/operator__notequal.cpp
rename to external_imported/json/docs/examples/operator__notequal.cpp
diff --git a/external_imported/json/doc/examples/operator__notequal.output b/external_imported/json/docs/examples/operator__notequal.output
similarity index 100%
rename from external_imported/json/doc/examples/operator__notequal.output
rename to external_imported/json/docs/examples/operator__notequal.output
diff --git a/external_imported/json/doc/examples/operator__notequal__nullptr_t.cpp b/external_imported/json/docs/examples/operator__notequal__nullptr_t.cpp
similarity index 100%
rename from external_imported/json/doc/examples/operator__notequal__nullptr_t.cpp
rename to external_imported/json/docs/examples/operator__notequal__nullptr_t.cpp
diff --git a/external_imported/json/doc/examples/operator__notequal__nullptr_t.output b/external_imported/json/docs/examples/operator__notequal__nullptr_t.output
similarity index 100%
rename from external_imported/json/doc/examples/operator__notequal__nullptr_t.output
rename to external_imported/json/docs/examples/operator__notequal__nullptr_t.output
diff --git a/external_imported/json/doc/examples/operator__value_t.cpp b/external_imported/json/docs/examples/operator__value_t.cpp
similarity index 100%
rename from external_imported/json/doc/examples/operator__value_t.cpp
rename to external_imported/json/docs/examples/operator__value_t.cpp
diff --git a/external_imported/json/doc/examples/operator__value_t.output b/external_imported/json/docs/examples/operator__value_t.output
similarity index 100%
rename from external_imported/json/doc/examples/operator__value_t.output
rename to external_imported/json/docs/examples/operator__value_t.output
diff --git a/external_imported/json/docs/examples/operator_array__json_pointer.cpp b/external_imported/json/docs/examples/operator_array__json_pointer.cpp
new file mode 100644
index 000000000..0fa207f02
--- /dev/null
+++ b/external_imported/json/docs/examples/operator_array__json_pointer.cpp
@@ -0,0 +1,49 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+using namespace nlohmann::literals;
+
+int main()
+{
+    // create a JSON value
+    json j =
+    {
+        {"number", 1}, {"string", "foo"}, {"array", {1, 2}}
+    };
+
+    // read-only access
+
+    // output element with JSON pointer "/number"
+    std::cout << j["/number"_json_pointer] << '\n';
+    // output element with JSON pointer "/string"
+    std::cout << j["/string"_json_pointer] << '\n';
+    // output element with JSON pointer "/array"
+    std::cout << j["/array"_json_pointer] << '\n';
+    // output element with JSON pointer "/array/1"
+    std::cout << j["/array/1"_json_pointer] << '\n';
+
+    // writing access
+
+    // change the string
+    j["/string"_json_pointer] = "bar";
+    // output the changed string
+    std::cout << j["string"] << '\n';
+
+    // "change" a nonexisting object entry
+    j["/boolean"_json_pointer] = true;
+    // output the changed object
+    std::cout << j << '\n';
+
+    // change an array element
+    j["/array/1"_json_pointer] = 21;
+    // "change" an array element with nonexisting index
+    j["/array/4"_json_pointer] = 44;
+    // output the changed array
+    std::cout << j["array"] << '\n';
+
+    // "change" the array element past the end
+    j["/array/-"_json_pointer] = 55;
+    // output the changed array
+    std::cout << j["array"] << '\n';
+}
diff --git a/external_imported/json/doc/examples/operatorjson_pointer.output b/external_imported/json/docs/examples/operator_array__json_pointer.output
similarity index 100%
rename from external_imported/json/doc/examples/operatorjson_pointer.output
rename to external_imported/json/docs/examples/operator_array__json_pointer.output
diff --git a/external_imported/json/docs/examples/operator_array__json_pointer_const.cpp b/external_imported/json/docs/examples/operator_array__json_pointer_const.cpp
new file mode 100644
index 000000000..f40e2494a
--- /dev/null
+++ b/external_imported/json/docs/examples/operator_array__json_pointer_const.cpp
@@ -0,0 +1,25 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+using namespace nlohmann::literals;
+
+int main()
+{
+    // create a JSON value
+    const json j =
+    {
+        {"number", 1}, {"string", "foo"}, {"array", {1, 2}}
+    };
+
+    // read-only access
+
+    // output element with JSON pointer "/number"
+    std::cout << j["/number"_json_pointer] << '\n';
+    // output element with JSON pointer "/string"
+    std::cout << j["/string"_json_pointer] << '\n';
+    // output element with JSON pointer "/array"
+    std::cout << j["/array"_json_pointer] << '\n';
+    // output element with JSON pointer "/array/1"
+    std::cout << j["/array/1"_json_pointer] << '\n';
+}
diff --git a/external_imported/json/doc/examples/operatorjson_pointer_const.output b/external_imported/json/docs/examples/operator_array__json_pointer_const.output
similarity index 100%
rename from external_imported/json/doc/examples/operatorjson_pointer_const.output
rename to external_imported/json/docs/examples/operator_array__json_pointer_const.output
diff --git a/external_imported/json/docs/examples/operator_array__keytype.c++17.cpp b/external_imported/json/docs/examples/operator_array__keytype.c++17.cpp
new file mode 100644
index 000000000..7f2b41dd8
--- /dev/null
+++ b/external_imported/json/docs/examples/operator_array__keytype.c++17.cpp
@@ -0,0 +1,34 @@
+#include <iostream>
+#include <iomanip>
+#include <string_view>
+#include <nlohmann/json.hpp>
+
+using namespace std::string_view_literals;
+using json = nlohmann::json;
+
+int main()
+{
+    // create a JSON object
+    json object =
+    {
+        {"one", 1}, {"two", 2}, {"three", 2.9}
+    };
+
+    // output element with key "two"
+    std::cout << object["two"sv] << "\n\n";
+
+    // change element with key "three"
+    object["three"sv] = 3;
+
+    // output changed array
+    std::cout << std::setw(4) << object << "\n\n";
+
+    // mention nonexisting key
+    object["four"sv];
+
+    // write to nonexisting key
+    object["five"sv]["really"sv]["nested"sv] = true;
+
+    // output changed object
+    std::cout << std::setw(4) << object << '\n';
+}
diff --git a/external_imported/json/doc/examples/operatorarray__key_type.output b/external_imported/json/docs/examples/operator_array__keytype.c++17.output
similarity index 100%
rename from external_imported/json/doc/examples/operatorarray__key_type.output
rename to external_imported/json/docs/examples/operator_array__keytype.c++17.output
diff --git a/external_imported/json/docs/examples/operator_array__keytype_const.c++17.cpp b/external_imported/json/docs/examples/operator_array__keytype_const.c++17.cpp
new file mode 100644
index 000000000..2cf94f40f
--- /dev/null
+++ b/external_imported/json/docs/examples/operator_array__keytype_const.c++17.cpp
@@ -0,0 +1,18 @@
+#include <iostream>
+#include <string_view>
+#include <nlohmann/json.hpp>
+
+using namespace std::string_view_literals;
+using json = nlohmann::json;
+
+int main()
+{
+    // create a JSON object
+    const json object =
+    {
+        {"one", 1}, {"two", 2}, {"three", 2.9}
+    };
+
+    // output element with key "two"
+    std::cout << object["two"sv] << '\n';
+}
diff --git a/external_imported/json/doc/examples/operatorarray__key_type_const.output b/external_imported/json/docs/examples/operator_array__keytype_const.c++17.output
similarity index 100%
rename from external_imported/json/doc/examples/operatorarray__key_type_const.output
rename to external_imported/json/docs/examples/operator_array__keytype_const.c++17.output
diff --git a/external_imported/json/doc/examples/operatorarray__key_type.cpp b/external_imported/json/docs/examples/operator_array__object_t_key_type.cpp
similarity index 100%
rename from external_imported/json/doc/examples/operatorarray__key_type.cpp
rename to external_imported/json/docs/examples/operator_array__object_t_key_type.cpp
diff --git a/external_imported/json/docs/examples/operator_array__object_t_key_type.output b/external_imported/json/docs/examples/operator_array__object_t_key_type.output
new file mode 100644
index 000000000..b643587f1
--- /dev/null
+++ b/external_imported/json/docs/examples/operator_array__object_t_key_type.output
@@ -0,0 +1,19 @@
+2
+
+{
+    "one": 1,
+    "three": 3,
+    "two": 2
+}
+
+{
+    "five": {
+        "really": {
+            "nested": true
+        }
+    },
+    "four": null,
+    "one": 1,
+    "three": 3,
+    "two": 2
+}
diff --git a/external_imported/json/doc/examples/operatorarray__key_type_const.cpp b/external_imported/json/docs/examples/operator_array__object_t_key_type_const.cpp
similarity index 100%
rename from external_imported/json/doc/examples/operatorarray__key_type_const.cpp
rename to external_imported/json/docs/examples/operator_array__object_t_key_type_const.cpp
diff --git a/external_imported/json/docs/examples/operator_array__object_t_key_type_const.output b/external_imported/json/docs/examples/operator_array__object_t_key_type_const.output
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/external_imported/json/docs/examples/operator_array__object_t_key_type_const.output
@@ -0,0 +1 @@
+2
diff --git a/external_imported/json/doc/examples/operatorarray__size_type.cpp b/external_imported/json/docs/examples/operator_array__size_type.cpp
similarity index 100%
rename from external_imported/json/doc/examples/operatorarray__size_type.cpp
rename to external_imported/json/docs/examples/operator_array__size_type.cpp
diff --git a/external_imported/json/doc/examples/operatorarray__size_type.output b/external_imported/json/docs/examples/operator_array__size_type.output
similarity index 100%
rename from external_imported/json/doc/examples/operatorarray__size_type.output
rename to external_imported/json/docs/examples/operator_array__size_type.output
diff --git a/external_imported/json/doc/examples/operatorarray__size_type_const.cpp b/external_imported/json/docs/examples/operator_array__size_type_const.cpp
similarity index 100%
rename from external_imported/json/doc/examples/operatorarray__size_type_const.cpp
rename to external_imported/json/docs/examples/operator_array__size_type_const.cpp
diff --git a/external_imported/json/doc/examples/operatorarray__size_type_const.output b/external_imported/json/docs/examples/operator_array__size_type_const.output
similarity index 100%
rename from external_imported/json/doc/examples/operatorarray__size_type_const.output
rename to external_imported/json/docs/examples/operator_array__size_type_const.output
diff --git a/external_imported/json/doc/examples/operator_deserialize.cpp b/external_imported/json/docs/examples/operator_deserialize.cpp
similarity index 100%
rename from external_imported/json/doc/examples/operator_deserialize.cpp
rename to external_imported/json/docs/examples/operator_deserialize.cpp
diff --git a/external_imported/json/doc/examples/operator_deserialize.output b/external_imported/json/docs/examples/operator_deserialize.output
similarity index 100%
rename from external_imported/json/doc/examples/operator_deserialize.output
rename to external_imported/json/docs/examples/operator_deserialize.output
diff --git a/external_imported/json/docs/examples/operator_literal_json.cpp b/external_imported/json/docs/examples/operator_literal_json.cpp
new file mode 100644
index 000000000..84ca6297d
--- /dev/null
+++ b/external_imported/json/docs/examples/operator_literal_json.cpp
@@ -0,0 +1,13 @@
+#include <iostream>
+#include <iomanip>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+using namespace nlohmann::literals;
+
+int main()
+{
+    json j = R"( {"hello": "world", "answer": 42} )"_json;
+
+    std::cout << std::setw(2) << j << '\n';
+}
diff --git a/external_imported/json/docs/examples/operator_literal_json.output b/external_imported/json/docs/examples/operator_literal_json.output
new file mode 100644
index 000000000..6c0a7b34b
--- /dev/null
+++ b/external_imported/json/docs/examples/operator_literal_json.output
@@ -0,0 +1,4 @@
+{
+  "answer": 42,
+  "hello": "world"
+}
diff --git a/external_imported/json/docs/examples/operator_literal_json_pointer.cpp b/external_imported/json/docs/examples/operator_literal_json_pointer.cpp
new file mode 100644
index 000000000..aba93e88e
--- /dev/null
+++ b/external_imported/json/docs/examples/operator_literal_json_pointer.cpp
@@ -0,0 +1,14 @@
+#include <iostream>
+#include <iomanip>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+using namespace nlohmann::literals;
+
+int main()
+{
+    json j = R"( {"hello": "world", "answer": 42} )"_json;
+    auto val = j["/hello"_json_pointer];
+
+    std::cout << std::setw(2) << val << '\n';
+}
diff --git a/external_imported/json/docs/examples/operator_literal_json_pointer.output b/external_imported/json/docs/examples/operator_literal_json_pointer.output
new file mode 100644
index 000000000..b0fcd3479
--- /dev/null
+++ b/external_imported/json/docs/examples/operator_literal_json_pointer.output
@@ -0,0 +1 @@
+"world"
diff --git a/external_imported/json/doc/examples/operator_serialize.cpp b/external_imported/json/docs/examples/operator_ltlt__basic_json.cpp
similarity index 100%
rename from external_imported/json/doc/examples/operator_serialize.cpp
rename to external_imported/json/docs/examples/operator_ltlt__basic_json.cpp
diff --git a/external_imported/json/doc/examples/operator_serialize.output b/external_imported/json/docs/examples/operator_ltlt__basic_json.output
similarity index 100%
rename from external_imported/json/doc/examples/operator_serialize.output
rename to external_imported/json/docs/examples/operator_ltlt__basic_json.output
diff --git a/external_imported/json/docs/examples/operator_ltlt__json_pointer.cpp b/external_imported/json/docs/examples/operator_ltlt__json_pointer.cpp
new file mode 100644
index 000000000..f4fac886d
--- /dev/null
+++ b/external_imported/json/docs/examples/operator_ltlt__json_pointer.cpp
@@ -0,0 +1,13 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    // create JSON poiner
+    json::json_pointer ptr("/foo/bar/baz");
+
+    // write string representation to stream
+    std::cout << ptr << std::endl;
+}
diff --git a/external_imported/json/docs/examples/operator_ltlt__json_pointer.output b/external_imported/json/docs/examples/operator_ltlt__json_pointer.output
new file mode 100644
index 000000000..ed359432d
--- /dev/null
+++ b/external_imported/json/docs/examples/operator_ltlt__json_pointer.output
@@ -0,0 +1 @@
+/foo/bar/baz
diff --git a/external_imported/json/docs/examples/operator_spaceship__const_reference.c++20.cpp b/external_imported/json/docs/examples/operator_spaceship__const_reference.c++20.cpp
new file mode 100644
index 000000000..9e7c9e9be
--- /dev/null
+++ b/external_imported/json/docs/examples/operator_spaceship__const_reference.c++20.cpp
@@ -0,0 +1,40 @@
+#include <compare>
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+const char* to_string(const std::partial_ordering& po)
+{
+    if (std::is_lt(po))
+    {
+        return "less";
+    }
+    else if (std::is_gt(po))
+    {
+        return "greater";
+    }
+    else if (std::is_eq(po))
+    {
+        return "equivalent";
+    }
+    return "unordered";
+}
+
+int main()
+{
+    // create several JSON values
+    json array_1 = {1, 2, 3};
+    json array_2 = {1, 2, 4};
+    json object_1 = {{"A", "a"}, {"B", "b"}};
+    json object_2 = {{"B", "b"}, {"A", "a"}};
+    json number = 17;
+    json string = "foo";
+    json discarded = json(json::value_t::discarded);
+
+    // output values and comparisons
+    std::cout << array_1 << " <=> " << array_2 << " := " << to_string(array_1 <=> array_2) << '\n'; // *NOPAD*
+    std::cout << object_1 << " <=> " << object_2 << " := " << to_string(object_1 <=> object_2) << '\n'; // *NOPAD*
+    std::cout << string << " <=> " << number << " := " << to_string(string <=> number) << '\n'; // *NOPAD*
+    std::cout << string << " <=> " << discarded << " := " << to_string(string <=> discarded) << '\n'; // *NOPAD*
+}
diff --git a/external_imported/json/docs/examples/operator_spaceship__const_reference.c++20.output b/external_imported/json/docs/examples/operator_spaceship__const_reference.c++20.output
new file mode 100644
index 000000000..2e8bf9f64
--- /dev/null
+++ b/external_imported/json/docs/examples/operator_spaceship__const_reference.c++20.output
@@ -0,0 +1,4 @@
+[1,2,3] <=> [1,2,4] := less
+{"A":"a","B":"b"} <=> {"A":"a","B":"b"} := equivalent
+"foo" <=> 17 := greater
+"foo" <=> <discarded> := unordered
diff --git a/external_imported/json/docs/examples/operator_spaceship__scalartype.c++20.cpp b/external_imported/json/docs/examples/operator_spaceship__scalartype.c++20.cpp
new file mode 100644
index 000000000..ebb5b4349
--- /dev/null
+++ b/external_imported/json/docs/examples/operator_spaceship__scalartype.c++20.cpp
@@ -0,0 +1,40 @@
+#include <compare>
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+const char* to_string(const std::partial_ordering& po)
+{
+    if (std::is_lt(po))
+    {
+        return "less";
+    }
+    else if (std::is_gt(po))
+    {
+        return "greater";
+    }
+    else if (std::is_eq(po))
+    {
+        return "equivalent";
+    }
+    return "unordered";
+}
+
+int main()
+{
+    using float_limits = std::numeric_limits<json::number_float_t>;
+    constexpr auto nan = float_limits::quiet_NaN();
+
+    // create several JSON values
+    json boolean = false;
+    json number = 17;
+    json string = "17";
+
+    // output values and comparisons
+    std::cout << std::boolalpha << std::fixed;
+    std::cout << boolean << " <=> " << true << " := " << to_string(boolean <=> true) << '\n'; // *NOPAD*
+    std::cout << number << " <=> " << 17.0 << " := " << to_string(number <=> 17.0) << '\n'; // *NOPAD*
+    std::cout << number << " <=> " << nan << " := " << to_string(number <=> nan) << '\n'; // *NOPAD*
+    std::cout << string << " <=> " << 17 << " := " << to_string(string <=> 17) << '\n'; // *NOPAD*
+}
diff --git a/external_imported/json/docs/examples/operator_spaceship__scalartype.c++20.output b/external_imported/json/docs/examples/operator_spaceship__scalartype.c++20.output
new file mode 100644
index 000000000..b2939a5f5
--- /dev/null
+++ b/external_imported/json/docs/examples/operator_spaceship__scalartype.c++20.output
@@ -0,0 +1,4 @@
+false <=> true := less
+17 <=> 17.000000 := equivalent
+17 <=> nan := unordered
+"17" <=> 17 := greater
diff --git a/external_imported/json/docs/examples/ordered_json.cpp b/external_imported/json/docs/examples/ordered_json.cpp
new file mode 100644
index 000000000..effad530c
--- /dev/null
+++ b/external_imported/json/docs/examples/ordered_json.cpp
@@ -0,0 +1,14 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using ordered_json = nlohmann::ordered_json;
+
+int main()
+{
+    ordered_json j;
+    j["one"] = 1;
+    j["two"] = 2;
+    j["three"] = 3;
+
+    std::cout << j.dump(2) << '\n';
+}
diff --git a/external_imported/json/docs/examples/ordered_json.output b/external_imported/json/docs/examples/ordered_json.output
new file mode 100644
index 000000000..120cbb284
--- /dev/null
+++ b/external_imported/json/docs/examples/ordered_json.output
@@ -0,0 +1,5 @@
+{
+  "one": 1,
+  "two": 2,
+  "three": 3
+}
diff --git a/external_imported/json/docs/examples/ordered_map.cpp b/external_imported/json/docs/examples/ordered_map.cpp
new file mode 100644
index 000000000..dcc60cb52
--- /dev/null
+++ b/external_imported/json/docs/examples/ordered_map.cpp
@@ -0,0 +1,43 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+// simple output function
+template<typename Map>
+void output(const char* prefix, const Map& m)
+{
+    std::cout << prefix << " = { ";
+    for (auto& element : m)
+    {
+        std::cout << element.first << ":" << element.second << ' ';
+    }
+    std::cout << "}" << std::endl;
+}
+
+int main()
+{
+    // create and fill two maps
+    nlohmann::ordered_map<std::string, std::string> m_ordered;
+    m_ordered["one"] = "eins";
+    m_ordered["two"] = "zwei";
+    m_ordered["three"] = "drei";
+
+    std::map<std::string, std::string> m_std;
+    m_std["one"] = "eins";
+    m_std["two"] = "zwei";
+    m_std["three"] = "drei";
+
+    // output: m_ordered is ordered by insertion order, m_std is ordered by key
+    output("m_ordered", m_ordered);
+    output("m_std", m_std);
+
+    // erase and re-add "one" key
+    m_ordered.erase("one");
+    m_ordered["one"] = "eins";
+
+    m_std.erase("one");
+    m_std["one"] = "eins";
+
+    // output: m_ordered shows newly added key at the end; m_std is again ordered by key
+    output("m_ordered", m_ordered);
+    output("m_std", m_std);
+}
diff --git a/external_imported/json/docs/examples/ordered_map.output b/external_imported/json/docs/examples/ordered_map.output
new file mode 100644
index 000000000..a4ffc454a
--- /dev/null
+++ b/external_imported/json/docs/examples/ordered_map.output
@@ -0,0 +1,4 @@
+m_ordered = { one:eins two:zwei three:drei }
+m_std = { one:eins three:drei two:zwei }
+m_ordered = { two:zwei three:drei one:eins }
+m_std = { one:eins three:drei two:zwei }
diff --git a/external_imported/json/doc/examples/other_error.cpp b/external_imported/json/docs/examples/other_error.cpp
similarity index 89%
rename from external_imported/json/doc/examples/other_error.cpp
rename to external_imported/json/docs/examples/other_error.cpp
index 2e7ccfbb8..56aa8ae6b 100644
--- a/external_imported/json/doc/examples/other_error.cpp
+++ b/external_imported/json/docs/examples/other_error.cpp
@@ -2,6 +2,7 @@
 #include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
+using namespace nlohmann::literals;
 
 int main()
 {
@@ -20,7 +21,7 @@ int main()
         }])"_json;
         value.patch(patch);
     }
-    catch (json::other_error& e)
+    catch (const json::other_error& e)
     {
         // output exception information
         std::cout << "message: " << e.what() << '\n'
diff --git a/external_imported/json/doc/examples/other_error.output b/external_imported/json/docs/examples/other_error.output
similarity index 100%
rename from external_imported/json/doc/examples/other_error.output
rename to external_imported/json/docs/examples/other_error.output
diff --git a/external_imported/json/doc/examples/out_of_range.cpp b/external_imported/json/docs/examples/out_of_range.cpp
similarity index 90%
rename from external_imported/json/doc/examples/out_of_range.cpp
rename to external_imported/json/docs/examples/out_of_range.cpp
index e7116408a..03282082d 100644
--- a/external_imported/json/doc/examples/out_of_range.cpp
+++ b/external_imported/json/docs/examples/out_of_range.cpp
@@ -11,7 +11,7 @@ int main()
         json j = {1, 2, 3, 4};
         j.at(4) = 10;
     }
-    catch (json::out_of_range& e)
+    catch (const json::out_of_range& e)
     {
         // output exception information
         std::cout << "message: " << e.what() << '\n'
diff --git a/external_imported/json/doc/examples/out_of_range.output b/external_imported/json/docs/examples/out_of_range.output
similarity index 100%
rename from external_imported/json/doc/examples/out_of_range.output
rename to external_imported/json/docs/examples/out_of_range.output
diff --git a/external_imported/json/doc/examples/parse__allow_exceptions.cpp b/external_imported/json/docs/examples/parse__allow_exceptions.cpp
similarity index 94%
rename from external_imported/json/doc/examples/parse__allow_exceptions.cpp
rename to external_imported/json/docs/examples/parse__allow_exceptions.cpp
index 82449a526..f396c347e 100644
--- a/external_imported/json/doc/examples/parse__allow_exceptions.cpp
+++ b/external_imported/json/docs/examples/parse__allow_exceptions.cpp
@@ -17,7 +17,7 @@ int main()
     {
         json j = json::parse(text);
     }
-    catch (json::parse_error& e)
+    catch (const json::parse_error& e)
     {
         std::cout << e.what() << std::endl;
     }
diff --git a/external_imported/json/doc/examples/parse__allow_exceptions.output b/external_imported/json/docs/examples/parse__allow_exceptions.output
similarity index 100%
rename from external_imported/json/doc/examples/parse__allow_exceptions.output
rename to external_imported/json/docs/examples/parse__allow_exceptions.output
diff --git a/external_imported/json/doc/examples/parse__array__parser_callback_t.cpp b/external_imported/json/docs/examples/parse__array__parser_callback_t.cpp
similarity index 100%
rename from external_imported/json/doc/examples/parse__array__parser_callback_t.cpp
rename to external_imported/json/docs/examples/parse__array__parser_callback_t.cpp
diff --git a/external_imported/json/doc/examples/parse__array__parser_callback_t.output b/external_imported/json/docs/examples/parse__array__parser_callback_t.output
similarity index 100%
rename from external_imported/json/doc/examples/parse__array__parser_callback_t.output
rename to external_imported/json/docs/examples/parse__array__parser_callback_t.output
diff --git a/external_imported/json/doc/examples/parse__contiguouscontainer__parser_callback_t.cpp b/external_imported/json/docs/examples/parse__contiguouscontainer__parser_callback_t.cpp
similarity index 77%
rename from external_imported/json/doc/examples/parse__contiguouscontainer__parser_callback_t.cpp
rename to external_imported/json/docs/examples/parse__contiguouscontainer__parser_callback_t.cpp
index 14cfa2514..6eb409bba 100644
--- a/external_imported/json/doc/examples/parse__contiguouscontainer__parser_callback_t.cpp
+++ b/external_imported/json/docs/examples/parse__contiguouscontainer__parser_callback_t.cpp
@@ -7,7 +7,7 @@ using json = nlohmann::json;
 int main()
 {
     // a JSON text given as std::vector
-    std::vector<uint8_t> text = {'[', '1', ',', '2', ',', '3', ']', '\0'};
+    std::vector<std::uint8_t> text = {'[', '1', ',', '2', ',', '3', ']', '\0'};
 
     // parse and serialize JSON
     json j_complete = json::parse(text);
diff --git a/external_imported/json/doc/examples/parse__contiguouscontainer__parser_callback_t.output b/external_imported/json/docs/examples/parse__contiguouscontainer__parser_callback_t.output
similarity index 100%
rename from external_imported/json/doc/examples/parse__contiguouscontainer__parser_callback_t.output
rename to external_imported/json/docs/examples/parse__contiguouscontainer__parser_callback_t.output
diff --git a/external_imported/json/doc/examples/parse__istream__parser_callback_t.cpp b/external_imported/json/docs/examples/parse__istream__parser_callback_t.cpp
similarity index 99%
rename from external_imported/json/doc/examples/parse__istream__parser_callback_t.cpp
rename to external_imported/json/docs/examples/parse__istream__parser_callback_t.cpp
index afcaa39d0..2ef14dab2 100644
--- a/external_imported/json/doc/examples/parse__istream__parser_callback_t.cpp
+++ b/external_imported/json/docs/examples/parse__istream__parser_callback_t.cpp
@@ -33,7 +33,6 @@ int main()
     json j_complete = json::parse(ss);
     std::cout << std::setw(4) << j_complete << "\n\n";
 
-
     // define parser callback
     json::parser_callback_t cb = [](int depth, json::parse_event_t event, json & parsed)
     {
diff --git a/external_imported/json/doc/examples/parse__istream__parser_callback_t.output b/external_imported/json/docs/examples/parse__istream__parser_callback_t.output
similarity index 100%
rename from external_imported/json/doc/examples/parse__istream__parser_callback_t.output
rename to external_imported/json/docs/examples/parse__istream__parser_callback_t.output
diff --git a/external_imported/json/docs/examples/parse__iterator_pair.cpp b/external_imported/json/docs/examples/parse__iterator_pair.cpp
new file mode 100644
index 000000000..d0c30c1a5
--- /dev/null
+++ b/external_imported/json/docs/examples/parse__iterator_pair.cpp
@@ -0,0 +1,15 @@
+#include <iostream>
+#include <iomanip>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    // a JSON text given an input with other values
+    std::vector<std::uint8_t> input = {'[', '1', ',', '2', ',', '3', ']', 'o', 't', 'h', 'e', 'r'};
+
+    // parse and serialize JSON
+    json j_complete = json::parse(input.begin(), input.begin() + 7);
+    std::cout << std::setw(4) << j_complete << "\n\n";
+}
diff --git a/external_imported/json/docs/examples/parse__iterator_pair.link b/external_imported/json/docs/examples/parse__iterator_pair.link
new file mode 100644
index 000000000..f464e54c8
--- /dev/null
+++ b/external_imported/json/docs/examples/parse__iterator_pair.link
@@ -0,0 +1 @@
+<a target="_blank" href="https://wandbox.org/permlink/hUJYo1HWmfTBLMGn"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/doc/examples/parse__iteratortype__parser_callback_t.output b/external_imported/json/docs/examples/parse__iterator_pair.output
similarity index 100%
rename from external_imported/json/doc/examples/parse__iteratortype__parser_callback_t.output
rename to external_imported/json/docs/examples/parse__iterator_pair.output
diff --git a/external_imported/json/docs/examples/parse__pointers.cpp b/external_imported/json/docs/examples/parse__pointers.cpp
new file mode 100644
index 000000000..a5a16eea9
--- /dev/null
+++ b/external_imported/json/docs/examples/parse__pointers.cpp
@@ -0,0 +1,15 @@
+#include <iostream>
+#include <iomanip>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    // a JSON text given as string that is not null-terminated
+    const char* ptr = "[1,2,3]another value";
+
+    // parse and serialize JSON
+    json j_complete = json::parse(ptr, ptr + 7);
+    std::cout << std::setw(4) << j_complete << "\n\n";
+}
diff --git a/external_imported/json/docs/examples/parse__pointers.link b/external_imported/json/docs/examples/parse__pointers.link
new file mode 100644
index 000000000..9a93ef1c5
--- /dev/null
+++ b/external_imported/json/docs/examples/parse__pointers.link
@@ -0,0 +1 @@
+<a target="_blank" href="https://wandbox.org/permlink/AWbpa8e1xRV3y4MM"><b>online</b></a>
\ No newline at end of file
diff --git a/external_imported/json/docs/examples/parse__pointers.output b/external_imported/json/docs/examples/parse__pointers.output
new file mode 100644
index 000000000..74633e808
--- /dev/null
+++ b/external_imported/json/docs/examples/parse__pointers.output
@@ -0,0 +1,6 @@
+[
+    1,
+    2,
+    3
+]
+
diff --git a/external_imported/json/doc/examples/parse__string__parser_callback_t.cpp b/external_imported/json/docs/examples/parse__string__parser_callback_t.cpp
similarity index 99%
rename from external_imported/json/doc/examples/parse__string__parser_callback_t.cpp
rename to external_imported/json/docs/examples/parse__string__parser_callback_t.cpp
index 2ae4410a8..19c6c448a 100644
--- a/external_imported/json/doc/examples/parse__string__parser_callback_t.cpp
+++ b/external_imported/json/docs/examples/parse__string__parser_callback_t.cpp
@@ -28,7 +28,6 @@ int main()
     json j_complete = json::parse(text);
     std::cout << std::setw(4) << j_complete << "\n\n";
 
-
     // define parser callback
     json::parser_callback_t cb = [](int depth, json::parse_event_t event, json & parsed)
     {
diff --git a/external_imported/json/doc/examples/parse__string__parser_callback_t.output b/external_imported/json/docs/examples/parse__string__parser_callback_t.output
similarity index 100%
rename from external_imported/json/doc/examples/parse__string__parser_callback_t.output
rename to external_imported/json/docs/examples/parse__string__parser_callback_t.output
diff --git a/external_imported/json/doc/examples/parse_error.cpp b/external_imported/json/docs/examples/parse_error.cpp
similarity index 91%
rename from external_imported/json/doc/examples/parse_error.cpp
rename to external_imported/json/docs/examples/parse_error.cpp
index 9b27b58fa..ce15ebe22 100644
--- a/external_imported/json/doc/examples/parse_error.cpp
+++ b/external_imported/json/docs/examples/parse_error.cpp
@@ -10,7 +10,7 @@ int main()
         // parsing input with a syntax error
         json::parse("[1,2,3,]");
     }
-    catch (json::parse_error& e)
+    catch (const json::parse_error& e)
     {
         // output exception information
         std::cout << "message: " << e.what() << '\n'
diff --git a/external_imported/json/doc/examples/parse_error.output b/external_imported/json/docs/examples/parse_error.output
similarity index 100%
rename from external_imported/json/doc/examples/parse_error.output
rename to external_imported/json/docs/examples/parse_error.output
diff --git a/external_imported/json/doc/examples/patch.cpp b/external_imported/json/docs/examples/patch.cpp
similarity index 95%
rename from external_imported/json/doc/examples/patch.cpp
rename to external_imported/json/docs/examples/patch.cpp
index b0896c794..b7ecb8eee 100644
--- a/external_imported/json/doc/examples/patch.cpp
+++ b/external_imported/json/docs/examples/patch.cpp
@@ -3,6 +3,7 @@
 #include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
+using namespace nlohmann::literals;
 
 int main()
 {
diff --git a/external_imported/json/doc/examples/patch.output b/external_imported/json/docs/examples/patch.output
similarity index 100%
rename from external_imported/json/doc/examples/patch.output
rename to external_imported/json/docs/examples/patch.output
diff --git a/external_imported/json/docs/examples/patch_inplace.cpp b/external_imported/json/docs/examples/patch_inplace.cpp
new file mode 100644
index 000000000..061708a2d
--- /dev/null
+++ b/external_imported/json/docs/examples/patch_inplace.cpp
@@ -0,0 +1,35 @@
+#include <iostream>
+#include <iomanip>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+using namespace nlohmann::literals;
+
+int main()
+{
+    // the original document
+    json doc = R"(
+        {
+          "baz": "qux",
+          "foo": "bar"
+        }
+    )"_json;
+
+    // the patch
+    json patch = R"(
+        [
+          { "op": "replace", "path": "/baz", "value": "boo" },
+          { "op": "add", "path": "/hello", "value": ["world"] },
+          { "op": "remove", "path": "/foo"}
+        ]
+    )"_json;
+
+    // output original document
+    std::cout << "Before\n" << std::setw(4) << doc << std::endl;
+
+    // apply the patch
+    doc.patch_inplace(patch);
+
+    // output patched document
+    std::cout << "\nAfter\n" << std::setw(4) << doc << std::endl;
+}
diff --git a/external_imported/json/docs/examples/patch_inplace.output b/external_imported/json/docs/examples/patch_inplace.output
new file mode 100644
index 000000000..9d31b8ba4
--- /dev/null
+++ b/external_imported/json/docs/examples/patch_inplace.output
@@ -0,0 +1,13 @@
+Before
+{
+    "baz": "qux",
+    "foo": "bar"
+}
+
+After
+{
+    "baz": "boo",
+    "hello": [
+        "world"
+    ]
+}
diff --git a/external_imported/json/doc/examples/push_back.cpp b/external_imported/json/docs/examples/push_back.cpp
similarity index 100%
rename from external_imported/json/doc/examples/push_back.cpp
rename to external_imported/json/docs/examples/push_back.cpp
diff --git a/external_imported/json/doc/examples/push_back.output b/external_imported/json/docs/examples/push_back.output
similarity index 100%
rename from external_imported/json/doc/examples/push_back.output
rename to external_imported/json/docs/examples/push_back.output
diff --git a/external_imported/json/doc/examples/push_back__initializer_list.cpp b/external_imported/json/docs/examples/push_back__initializer_list.cpp
similarity index 100%
rename from external_imported/json/doc/examples/push_back__initializer_list.cpp
rename to external_imported/json/docs/examples/push_back__initializer_list.cpp
diff --git a/external_imported/json/doc/examples/push_back__initializer_list.output b/external_imported/json/docs/examples/push_back__initializer_list.output
similarity index 100%
rename from external_imported/json/doc/examples/push_back__initializer_list.output
rename to external_imported/json/docs/examples/push_back__initializer_list.output
diff --git a/external_imported/json/doc/examples/push_back__object_t__value.cpp b/external_imported/json/docs/examples/push_back__object_t__value.cpp
similarity index 100%
rename from external_imported/json/doc/examples/push_back__object_t__value.cpp
rename to external_imported/json/docs/examples/push_back__object_t__value.cpp
diff --git a/external_imported/json/doc/examples/push_back__object_t__value.output b/external_imported/json/docs/examples/push_back__object_t__value.output
similarity index 100%
rename from external_imported/json/doc/examples/push_back__object_t__value.output
rename to external_imported/json/docs/examples/push_back__object_t__value.output
diff --git a/external_imported/json/doc/examples/rbegin.cpp b/external_imported/json/docs/examples/rbegin.cpp
similarity index 100%
rename from external_imported/json/doc/examples/rbegin.cpp
rename to external_imported/json/docs/examples/rbegin.cpp
diff --git a/external_imported/json/doc/examples/rbegin.output b/external_imported/json/docs/examples/rbegin.output
similarity index 100%
rename from external_imported/json/doc/examples/rbegin.output
rename to external_imported/json/docs/examples/rbegin.output
diff --git a/external_imported/json/doc/examples/rend.cpp b/external_imported/json/docs/examples/rend.cpp
similarity index 100%
rename from external_imported/json/doc/examples/rend.cpp
rename to external_imported/json/docs/examples/rend.cpp
diff --git a/external_imported/json/doc/examples/rend.output b/external_imported/json/docs/examples/rend.output
similarity index 100%
rename from external_imported/json/doc/examples/rend.output
rename to external_imported/json/docs/examples/rend.output
diff --git a/external_imported/json/docs/examples/sax_parse.cpp b/external_imported/json/docs/examples/sax_parse.cpp
new file mode 100644
index 000000000..8602687e3
--- /dev/null
+++ b/external_imported/json/docs/examples/sax_parse.cpp
@@ -0,0 +1,131 @@
+#include <iostream>
+#include <iomanip>
+#include <sstream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+// a simple event consumer that collects string representations of the passed
+// values; note inheriting from json::json_sax_t is not required, but can
+// help not to forget a required function
+class sax_event_consumer : public json::json_sax_t
+{
+  public:
+    std::vector<std::string> events;
+
+    bool null() override
+    {
+        events.push_back("null()");
+        return true;
+    }
+
+    bool boolean(bool val) override
+    {
+        events.push_back("boolean(val=" + std::string(val ? "true" : "false") + ")");
+        return true;
+    }
+
+    bool number_integer(number_integer_t val) override
+    {
+        events.push_back("number_integer(val=" + std::to_string(val) + ")");
+        return true;
+    }
+
+    bool number_unsigned(number_unsigned_t val) override
+    {
+        events.push_back("number_unsigned(val=" + std::to_string(val) + ")");
+        return true;
+    }
+
+    bool number_float(number_float_t val, const string_t& s) override
+    {
+        events.push_back("number_float(val=" + std::to_string(val) + ", s=" + s + ")");
+        return true;
+    }
+
+    bool string(string_t& val) override
+    {
+        events.push_back("string(val=" + val + ")");
+        return true;
+    }
+
+    bool start_object(std::size_t elements) override
+    {
+        events.push_back("start_object(elements=" + std::to_string(elements) + ")");
+        return true;
+    }
+
+    bool end_object() override
+    {
+        events.push_back("end_object()");
+        return true;
+    }
+
+    bool start_array(std::size_t elements) override
+    {
+        events.push_back("start_array(elements=" + std::to_string(elements) + ")");
+        return true;
+    }
+
+    bool end_array() override
+    {
+        events.push_back("end_array()");
+        return true;
+    }
+
+    bool key(string_t& val) override
+    {
+        events.push_back("key(val=" + val + ")");
+        return true;
+    }
+
+    bool binary(json::binary_t& val) override
+    {
+        events.push_back("binary(val=[...])");
+        return true;
+    }
+
+    bool parse_error(std::size_t position, const std::string& last_token, const json::exception& ex) override
+    {
+        events.push_back("parse_error(position=" + std::to_string(position) + ", last_token=" + last_token + ",\n            ex=" + std::string(ex.what()) + ")");
+        return false;
+    }
+};
+
+int main()
+{
+    // a JSON text
+    auto text = R"(
+    {
+        "Image": {
+            "Width":  800,
+            "Height": 600,
+            "Title":  "View from 15th Floor",
+            "Thumbnail": {
+                "Url":    "http://www.example.com/image/481989943",
+                "Height": 125,
+                "Width":  100
+            },
+            "Animated" : false,
+            "IDs": [116, 943, 234, -38793],
+            "DeletionDate": null,
+            "Distance": 12.723374634
+        }
+    }]
+    )";
+
+    // create a SAX event consumer object
+    sax_event_consumer sec;
+
+    // parse JSON
+    bool result = json::sax_parse(text, &sec);
+
+    // output the recorded events
+    for (auto& event : sec.events)
+    {
+        std::cout << event << "\n";
+    }
+
+    // output the result of sax_parse
+    std::cout << "\nresult: " << std::boolalpha << result << std::endl;
+}
diff --git a/external_imported/json/docs/examples/sax_parse.output b/external_imported/json/docs/examples/sax_parse.output
new file mode 100644
index 000000000..dd2fc2f05
--- /dev/null
+++ b/external_imported/json/docs/examples/sax_parse.output
@@ -0,0 +1,37 @@
+start_object(elements=18446744073709551615)
+key(val=Image)
+start_object(elements=18446744073709551615)
+key(val=Width)
+number_unsigned(val=800)
+key(val=Height)
+number_unsigned(val=600)
+key(val=Title)
+string(val=View from 15th Floor)
+key(val=Thumbnail)
+start_object(elements=18446744073709551615)
+key(val=Url)
+string(val=http://www.example.com/image/481989943)
+key(val=Height)
+number_unsigned(val=125)
+key(val=Width)
+number_unsigned(val=100)
+end_object()
+key(val=Animated)
+boolean(val=false)
+key(val=IDs)
+start_array(elements=18446744073709551615)
+number_unsigned(val=116)
+number_unsigned(val=943)
+number_unsigned(val=234)
+number_integer(val=-38793)
+end_array()
+key(val=DeletionDate)
+null()
+key(val=Distance)
+number_float(val=12.723375, s=12.723374634)
+end_object()
+end_object()
+parse_error(position=460, last_token=12.723374634<U+000A>        }<U+000A>    }],
+            ex=[json.exception.parse_error.101] parse error at line 17, column 6: syntax error while parsing value - unexpected ']'; expected end of input)
+
+result: false
diff --git a/external_imported/json/docs/examples/sax_parse__binary.cpp b/external_imported/json/docs/examples/sax_parse__binary.cpp
new file mode 100644
index 000000000..08bc85df6
--- /dev/null
+++ b/external_imported/json/docs/examples/sax_parse__binary.cpp
@@ -0,0 +1,114 @@
+#include <iostream>
+#include <iomanip>
+#include <sstream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+// a simple event consumer that collects string representations of the passed
+// values; note inheriting from json::json_sax_t is not required, but can
+// help not to forget a required function
+class sax_event_consumer : public json::json_sax_t
+{
+  public:
+    std::vector<std::string> events;
+
+    bool null() override
+    {
+        events.push_back("null()");
+        return true;
+    }
+
+    bool boolean(bool val) override
+    {
+        events.push_back("boolean(val=" + std::string(val ? "true" : "false") + ")");
+        return true;
+    }
+
+    bool number_integer(number_integer_t val) override
+    {
+        events.push_back("number_integer(val=" + std::to_string(val) + ")");
+        return true;
+    }
+
+    bool number_unsigned(number_unsigned_t val) override
+    {
+        events.push_back("number_unsigned(val=" + std::to_string(val) + ")");
+        return true;
+    }
+
+    bool number_float(number_float_t val, const string_t& s) override
+    {
+        events.push_back("number_float(val=" + std::to_string(val) + ", s=" + s + ")");
+        return true;
+    }
+
+    bool string(string_t& val) override
+    {
+        events.push_back("string(val=" + val + ")");
+        return true;
+    }
+
+    bool start_object(std::size_t elements) override
+    {
+        events.push_back("start_object(elements=" + std::to_string(elements) + ")");
+        return true;
+    }
+
+    bool end_object() override
+    {
+        events.push_back("end_object()");
+        return true;
+    }
+
+    bool start_array(std::size_t elements) override
+    {
+        events.push_back("start_array(elements=" + std::to_string(elements) + ")");
+        return true;
+    }
+
+    bool end_array() override
+    {
+        events.push_back("end_array()");
+        return true;
+    }
+
+    bool key(string_t& val) override
+    {
+        events.push_back("key(val=" + val + ")");
+        return true;
+    }
+
+    bool binary(json::binary_t& val) override
+    {
+        events.push_back("binary(val=[...])");
+        return true;
+    }
+
+    bool parse_error(std::size_t position, const std::string& last_token, const json::exception& ex) override
+    {
+        events.push_back("parse_error(position=" + std::to_string(position) + ", last_token=" + last_token + ",\n            ex=" + std::string(ex.what()) + ")");
+        return false;
+    }
+};
+
+int main()
+{
+    // CBOR byte string
+    std::vector<std::uint8_t> vec = {{0x44, 0xcA, 0xfe, 0xba, 0xbe}};
+
+    // create a SAX event consumer object
+    sax_event_consumer sec;
+
+    // parse CBOR
+    bool result = json::sax_parse(vec, &sec, json::input_format_t::cbor);
+
+    // output the recorded events
+    for (auto& event : sec.events)
+    {
+        std::cout << event << "\n";
+    }
+
+    // output the result of sax_parse
+    std::cout << "\nresult: " << std::boolalpha << result << std::endl;
+}
diff --git a/external_imported/json/docs/examples/sax_parse__binary.output b/external_imported/json/docs/examples/sax_parse__binary.output
new file mode 100644
index 000000000..f88089610
--- /dev/null
+++ b/external_imported/json/docs/examples/sax_parse__binary.output
@@ -0,0 +1,3 @@
+binary(val=[...])
+
+result: true
diff --git a/external_imported/json/doc/examples/size.cpp b/external_imported/json/docs/examples/size.cpp
similarity index 100%
rename from external_imported/json/doc/examples/size.cpp
rename to external_imported/json/docs/examples/size.cpp
diff --git a/external_imported/json/doc/examples/size.output b/external_imported/json/docs/examples/size.output
similarity index 100%
rename from external_imported/json/doc/examples/size.output
rename to external_imported/json/docs/examples/size.output
diff --git a/external_imported/json/docs/examples/std_hash.cpp b/external_imported/json/docs/examples/std_hash.cpp
new file mode 100644
index 000000000..9721910eb
--- /dev/null
+++ b/external_imported/json/docs/examples/std_hash.cpp
@@ -0,0 +1,19 @@
+#include <iostream>
+#include <iomanip>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+using namespace nlohmann::literals;
+
+int main()
+{
+    std::cout << "hash(null) = " << std::hash<json> {}(json(nullptr)) << '\n'
+              << "hash(false) = " << std::hash<json> {}(json(false)) << '\n'
+              << "hash(0) = " << std::hash<json> {}(json(0)) << '\n'
+              << "hash(0U) = " << std::hash<json> {}(json(0U)) << '\n'
+              << "hash(\"\") = " << std::hash<json> {}(json("")) << '\n'
+              << "hash({}) = " << std::hash<json> {}(json::object()) << '\n'
+              << "hash([]) = " << std::hash<json> {}(json::array()) << '\n'
+              << "hash({\"hello\": \"world\"}) = " << std::hash<json> {}("{\"hello\": \"world\"}"_json)
+              << std::endl;
+}
diff --git a/external_imported/json/docs/examples/std_hash.output b/external_imported/json/docs/examples/std_hash.output
new file mode 100644
index 000000000..521d2b4b8
--- /dev/null
+++ b/external_imported/json/docs/examples/std_hash.output
@@ -0,0 +1,8 @@
+hash(null) = 2654435769
+hash(false) = 2654436030
+hash(0) = 2654436095
+hash(0U) = 2654436156
+hash("") = 6142509191626859748
+hash({}) = 2654435832
+hash([]) = 2654435899
+hash({"hello": "world"}) = 4469488738203676328
diff --git a/external_imported/json/docs/examples/std_swap.cpp b/external_imported/json/docs/examples/std_swap.cpp
new file mode 100644
index 000000000..36ab3ce6b
--- /dev/null
+++ b/external_imported/json/docs/examples/std_swap.cpp
@@ -0,0 +1,19 @@
+#include <iostream>
+#include <iomanip>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    // create JSON values
+    json j1 = {{"one", 1}, {"two", 2}};
+    json j2 = {1, 2, 4, 8, 16};
+
+    std::cout << "j1 = " << j1 << " | j2 = " << j2 << '\n';
+
+    // swap values
+    std::swap(j1, j2);
+
+    std::cout << "j1 = " << j1 << " | j2 = " << j2 << std::endl;
+}
diff --git a/external_imported/json/docs/examples/std_swap.output b/external_imported/json/docs/examples/std_swap.output
new file mode 100644
index 000000000..5ae6db780
--- /dev/null
+++ b/external_imported/json/docs/examples/std_swap.output
@@ -0,0 +1,2 @@
+j1 = {"one":1,"two":2} | j2 = [1,2,4,8,16]
+j1 = [1,2,4,8,16] | j2 = {"one":1,"two":2}
diff --git a/external_imported/json/docs/examples/string_t.cpp b/external_imported/json/docs/examples/string_t.cpp
new file mode 100644
index 000000000..77a9ea480
--- /dev/null
+++ b/external_imported/json/docs/examples/string_t.cpp
@@ -0,0 +1,10 @@
+#include <iostream>
+#include <iomanip>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    std::cout << std::boolalpha << std::is_same<std::string, json::string_t>::value << std::endl;
+}
diff --git a/external_imported/json/docs/examples/string_t.output b/external_imported/json/docs/examples/string_t.output
new file mode 100644
index 000000000..27ba77dda
--- /dev/null
+++ b/external_imported/json/docs/examples/string_t.output
@@ -0,0 +1 @@
+true
diff --git a/external_imported/json/doc/examples/swap__array_t.cpp b/external_imported/json/docs/examples/swap__array_t.cpp
similarity index 100%
rename from external_imported/json/doc/examples/swap__array_t.cpp
rename to external_imported/json/docs/examples/swap__array_t.cpp
diff --git a/external_imported/json/doc/examples/swap__array_t.output b/external_imported/json/docs/examples/swap__array_t.output
similarity index 100%
rename from external_imported/json/doc/examples/swap__array_t.output
rename to external_imported/json/docs/examples/swap__array_t.output
diff --git a/external_imported/json/doc/examples/swap__binary_t.cpp b/external_imported/json/docs/examples/swap__binary_t.cpp
similarity index 100%
rename from external_imported/json/doc/examples/swap__binary_t.cpp
rename to external_imported/json/docs/examples/swap__binary_t.cpp
diff --git a/external_imported/json/doc/examples/swap__binary_t.output b/external_imported/json/docs/examples/swap__binary_t.output
similarity index 100%
rename from external_imported/json/doc/examples/swap__binary_t.output
rename to external_imported/json/docs/examples/swap__binary_t.output
diff --git a/external_imported/json/doc/examples/swap__object_t.cpp b/external_imported/json/docs/examples/swap__object_t.cpp
similarity index 100%
rename from external_imported/json/doc/examples/swap__object_t.cpp
rename to external_imported/json/docs/examples/swap__object_t.cpp
diff --git a/external_imported/json/doc/examples/swap__object_t.output b/external_imported/json/docs/examples/swap__object_t.output
similarity index 100%
rename from external_imported/json/doc/examples/swap__object_t.output
rename to external_imported/json/docs/examples/swap__object_t.output
diff --git a/external_imported/json/doc/examples/swap__reference.cpp b/external_imported/json/docs/examples/swap__reference.cpp
similarity index 100%
rename from external_imported/json/doc/examples/swap__reference.cpp
rename to external_imported/json/docs/examples/swap__reference.cpp
diff --git a/external_imported/json/doc/examples/swap__reference.output b/external_imported/json/docs/examples/swap__reference.output
similarity index 100%
rename from external_imported/json/doc/examples/swap__reference.output
rename to external_imported/json/docs/examples/swap__reference.output
diff --git a/external_imported/json/doc/examples/swap__string_t.cpp b/external_imported/json/docs/examples/swap__string_t.cpp
similarity index 100%
rename from external_imported/json/doc/examples/swap__string_t.cpp
rename to external_imported/json/docs/examples/swap__string_t.cpp
diff --git a/external_imported/json/doc/examples/swap__string_t.output b/external_imported/json/docs/examples/swap__string_t.output
similarity index 100%
rename from external_imported/json/doc/examples/swap__string_t.output
rename to external_imported/json/docs/examples/swap__string_t.output
diff --git a/external_imported/json/docs/examples/to_bjdata.cpp b/external_imported/json/docs/examples/to_bjdata.cpp
new file mode 100644
index 000000000..9b7abac4e
--- /dev/null
+++ b/external_imported/json/docs/examples/to_bjdata.cpp
@@ -0,0 +1,64 @@
+#include <iostream>
+#include <iomanip>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+using namespace nlohmann::literals;
+
+// function to print BJData's diagnostic format
+void print_byte(uint8_t byte)
+{
+    if (32 < byte and byte < 128)
+    {
+        std::cout << (char)byte;
+    }
+    else
+    {
+        std::cout << (int)byte;
+    }
+}
+
+int main()
+{
+    // create a JSON value
+    json j = R"({"compact": true, "schema": false})"_json;
+
+    // serialize it to BJData
+    std::vector<std::uint8_t> v = json::to_bjdata(j);
+
+    // print the vector content
+    for (auto& byte : v)
+    {
+        print_byte(byte);
+    }
+    std::cout << std::endl;
+
+    // create an array of numbers
+    json array = {1, 2, 3, 4, 5, 6, 7, 8};
+
+    // serialize it to BJData using default representation
+    std::vector<std::uint8_t> v_array = json::to_bjdata(array);
+    // serialize it to BJData using size optimization
+    std::vector<std::uint8_t> v_array_size = json::to_bjdata(array, true);
+    // serialize it to BJData using type optimization
+    std::vector<std::uint8_t> v_array_size_and_type = json::to_bjdata(array, true, true);
+
+    // print the vector contents
+    for (auto& byte : v_array)
+    {
+        print_byte(byte);
+    }
+    std::cout << std::endl;
+
+    for (auto& byte : v_array_size)
+    {
+        print_byte(byte);
+    }
+    std::cout << std::endl;
+
+    for (auto& byte : v_array_size_and_type)
+    {
+        print_byte(byte);
+    }
+    std::cout << std::endl;
+}
diff --git a/external_imported/json/doc/examples/to_ubjson.output b/external_imported/json/docs/examples/to_bjdata.output
similarity index 100%
rename from external_imported/json/doc/examples/to_ubjson.output
rename to external_imported/json/docs/examples/to_bjdata.output
diff --git a/external_imported/json/doc/examples/to_bson.cpp b/external_imported/json/docs/examples/to_bson.cpp
similarity index 82%
rename from external_imported/json/doc/examples/to_bson.cpp
rename to external_imported/json/docs/examples/to_bson.cpp
index fd2884f13..3484b0b76 100644
--- a/external_imported/json/doc/examples/to_bson.cpp
+++ b/external_imported/json/docs/examples/to_bson.cpp
@@ -3,6 +3,7 @@
 #include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
+using namespace nlohmann::literals;
 
 int main()
 {
@@ -10,7 +11,7 @@ int main()
     json j = R"({"compact": true, "schema": 0})"_json;
 
     // serialize it to BSON
-    std::vector<uint8_t> v = json::to_bson(j);
+    std::vector<std::uint8_t> v = json::to_bson(j);
 
     // print the vector content
     for (auto& byte : v)
diff --git a/external_imported/json/doc/examples/to_bson.output b/external_imported/json/docs/examples/to_bson.output
similarity index 100%
rename from external_imported/json/doc/examples/to_bson.output
rename to external_imported/json/docs/examples/to_bson.output
diff --git a/external_imported/json/doc/examples/to_cbor.cpp b/external_imported/json/docs/examples/to_cbor.cpp
similarity index 82%
rename from external_imported/json/doc/examples/to_cbor.cpp
rename to external_imported/json/docs/examples/to_cbor.cpp
index 1237ca86f..3d5e04150 100644
--- a/external_imported/json/doc/examples/to_cbor.cpp
+++ b/external_imported/json/docs/examples/to_cbor.cpp
@@ -3,6 +3,7 @@
 #include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
+using namespace nlohmann::literals;
 
 int main()
 {
@@ -10,7 +11,7 @@ int main()
     json j = R"({"compact": true, "schema": 0})"_json;
 
     // serialize it to CBOR
-    std::vector<uint8_t> v = json::to_cbor(j);
+    std::vector<std::uint8_t> v = json::to_cbor(j);
 
     // print the vector content
     for (auto& byte : v)
diff --git a/external_imported/json/doc/examples/to_cbor.output b/external_imported/json/docs/examples/to_cbor.output
similarity index 100%
rename from external_imported/json/doc/examples/to_cbor.output
rename to external_imported/json/docs/examples/to_cbor.output
diff --git a/external_imported/json/docs/examples/to_json.cpp b/external_imported/json/docs/examples/to_json.cpp
new file mode 100644
index 000000000..1f82a4de4
--- /dev/null
+++ b/external_imported/json/docs/examples/to_json.cpp
@@ -0,0 +1,32 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+namespace ns
+{
+// a simple struct to model a person
+struct person
+{
+    std::string name;
+    std::string address;
+    int age;
+};
+} // namespace ns
+
+namespace ns
+{
+void to_json(json& j, const person& p)
+{
+    j = json{ {"name", p.name}, {"address", p.address}, {"age", p.age} };
+}
+} // namespace ns
+
+int main()
+{
+    ns::person p = {"Ned Flanders", "744 Evergreen Terrace", 60};
+
+    json j = p;
+
+    std::cout << j << std::endl;
+}
diff --git a/external_imported/json/docs/examples/to_json.output b/external_imported/json/docs/examples/to_json.output
new file mode 100644
index 000000000..e9c5bf381
--- /dev/null
+++ b/external_imported/json/docs/examples/to_json.output
@@ -0,0 +1 @@
+{"address":"744 Evergreen Terrace","age":60,"name":"Ned Flanders"}
diff --git a/external_imported/json/doc/examples/to_msgpack.cpp b/external_imported/json/docs/examples/to_msgpack.cpp
similarity index 82%
rename from external_imported/json/doc/examples/to_msgpack.cpp
rename to external_imported/json/docs/examples/to_msgpack.cpp
index 99cc9eda2..b29ae8c7c 100644
--- a/external_imported/json/doc/examples/to_msgpack.cpp
+++ b/external_imported/json/docs/examples/to_msgpack.cpp
@@ -3,6 +3,7 @@
 #include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
+using namespace nlohmann::literals;
 
 int main()
 {
@@ -10,7 +11,7 @@ int main()
     json j = R"({"compact": true, "schema": 0})"_json;
 
     // serialize it to MessagePack
-    std::vector<uint8_t> v = json::to_msgpack(j);
+    std::vector<std::uint8_t> v = json::to_msgpack(j);
 
     // print the vector content
     for (auto& byte : v)
diff --git a/external_imported/json/doc/examples/to_msgpack.output b/external_imported/json/docs/examples/to_msgpack.output
similarity index 100%
rename from external_imported/json/doc/examples/to_msgpack.output
rename to external_imported/json/docs/examples/to_msgpack.output
diff --git a/external_imported/json/docs/examples/to_string.cpp b/external_imported/json/docs/examples/to_string.cpp
new file mode 100644
index 000000000..ee44283f3
--- /dev/null
+++ b/external_imported/json/docs/examples/to_string.cpp
@@ -0,0 +1,20 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+using std::to_string;
+
+int main()
+{
+    // create values
+    json j = {{"one", 1}, {"two", 2}};
+    int i = 42;
+
+    // use ADL to select best to_string function
+    auto j_str = to_string(j);  // calling nlohmann::to_string
+    auto i_str = to_string(i);  // calling std::to_string
+
+    // serialize without indentation
+    std::cout << j_str << "\n\n"
+              << i_str << std::endl;
+}
diff --git a/external_imported/json/docs/examples/to_string.output b/external_imported/json/docs/examples/to_string.output
new file mode 100644
index 000000000..b261f35e3
--- /dev/null
+++ b/external_imported/json/docs/examples/to_string.output
@@ -0,0 +1,3 @@
+{"one":1,"two":2}
+
+42
diff --git a/external_imported/json/doc/examples/to_ubjson.cpp b/external_imported/json/docs/examples/to_ubjson.cpp
similarity index 78%
rename from external_imported/json/doc/examples/to_ubjson.cpp
rename to external_imported/json/docs/examples/to_ubjson.cpp
index 06b2abba8..fd267a85a 100644
--- a/external_imported/json/doc/examples/to_ubjson.cpp
+++ b/external_imported/json/docs/examples/to_ubjson.cpp
@@ -3,6 +3,7 @@
 #include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
+using namespace nlohmann::literals;
 
 // function to print UBJSON's diagnostic format
 void print_byte(uint8_t byte)
@@ -23,7 +24,7 @@ int main()
     json j = R"({"compact": true, "schema": false})"_json;
 
     // serialize it to UBJSON
-    std::vector<uint8_t> v = json::to_ubjson(j);
+    std::vector<std::uint8_t> v = json::to_ubjson(j);
 
     // print the vector content
     for (auto& byte : v)
@@ -36,11 +37,11 @@ int main()
     json array = {1, 2, 3, 4, 5, 6, 7, 8};
 
     // serialize it to UBJSON using default representation
-    std::vector<uint8_t> v_array = json::to_ubjson(array);
+    std::vector<std::uint8_t> v_array = json::to_ubjson(array);
     // serialize it to UBJSON using size optimization
-    std::vector<uint8_t> v_array_size = json::to_ubjson(array, true);
+    std::vector<std::uint8_t> v_array_size = json::to_ubjson(array, true);
     // serialize it to UBJSON using type optimization
-    std::vector<uint8_t> v_array_size_and_type = json::to_ubjson(array, true, true);
+    std::vector<std::uint8_t> v_array_size_and_type = json::to_ubjson(array, true, true);
 
     // print the vector contents
     for (auto& byte : v_array)
diff --git a/external_imported/json/docs/examples/to_ubjson.output b/external_imported/json/docs/examples/to_ubjson.output
new file mode 100644
index 000000000..087980cb9
--- /dev/null
+++ b/external_imported/json/docs/examples/to_ubjson.output
@@ -0,0 +1,4 @@
+{i7compactTi6schemaF}
+[i1i2i3i4i5i6i7i8]
+[#i8i1i2i3i4i5i6i7i8
+[$i#i812345678
diff --git a/external_imported/json/doc/examples/type.cpp b/external_imported/json/docs/examples/type.cpp
similarity index 100%
rename from external_imported/json/doc/examples/type.cpp
rename to external_imported/json/docs/examples/type.cpp
diff --git a/external_imported/json/doc/examples/type.output b/external_imported/json/docs/examples/type.output
similarity index 100%
rename from external_imported/json/doc/examples/type.output
rename to external_imported/json/docs/examples/type.output
diff --git a/external_imported/json/doc/examples/type_error.cpp b/external_imported/json/docs/examples/type_error.cpp
similarity index 91%
rename from external_imported/json/doc/examples/type_error.cpp
rename to external_imported/json/docs/examples/type_error.cpp
index d4f18b180..f520f4013 100644
--- a/external_imported/json/doc/examples/type_error.cpp
+++ b/external_imported/json/docs/examples/type_error.cpp
@@ -11,7 +11,7 @@ int main()
         json j = "string";
         j.push_back("another string");
     }
-    catch (json::type_error& e)
+    catch (const json::type_error& e)
     {
         // output exception information
         std::cout << "message: " << e.what() << '\n'
diff --git a/external_imported/json/doc/examples/type_error.output b/external_imported/json/docs/examples/type_error.output
similarity index 100%
rename from external_imported/json/doc/examples/type_error.output
rename to external_imported/json/docs/examples/type_error.output
diff --git a/external_imported/json/doc/examples/type_name.cpp b/external_imported/json/docs/examples/type_name.cpp
similarity index 100%
rename from external_imported/json/doc/examples/type_name.cpp
rename to external_imported/json/docs/examples/type_name.cpp
diff --git a/external_imported/json/doc/examples/type_name.output b/external_imported/json/docs/examples/type_name.output
similarity index 100%
rename from external_imported/json/doc/examples/type_name.output
rename to external_imported/json/docs/examples/type_name.output
diff --git a/external_imported/json/doc/examples/unflatten.cpp b/external_imported/json/docs/examples/unflatten.cpp
similarity index 100%
rename from external_imported/json/doc/examples/unflatten.cpp
rename to external_imported/json/docs/examples/unflatten.cpp
diff --git a/external_imported/json/doc/examples/unflatten.output b/external_imported/json/docs/examples/unflatten.output
similarity index 100%
rename from external_imported/json/doc/examples/unflatten.output
rename to external_imported/json/docs/examples/unflatten.output
diff --git a/external_imported/json/docs/examples/update.cpp b/external_imported/json/docs/examples/update.cpp
new file mode 100644
index 000000000..ff94b67fa
--- /dev/null
+++ b/external_imported/json/docs/examples/update.cpp
@@ -0,0 +1,24 @@
+#include <iostream>
+#include <iomanip>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+using namespace nlohmann::literals;
+
+int main()
+{
+    // create two JSON objects
+    json o1 = R"( {"color": "red", "price": 17.99, "names": {"de": "Flugzeug"}} )"_json;
+    json o2 = R"( {"color": "blue", "speed": 100, "names": {"en": "plane"}} )"_json;
+    json o3 = o1;
+
+    // add all keys from o2 to o1 (updating "color", replacing "names")
+    o1.update(o2);
+
+    // add all keys from o2 to o1 (updating "color", merging "names")
+    o3.update(o2, true);
+
+    // output updated object o1 and o3
+    std::cout << std::setw(2) << o1 << '\n';
+    std::cout << std::setw(2) << o3 << '\n';
+}
diff --git a/external_imported/json/docs/examples/update.output b/external_imported/json/docs/examples/update.output
new file mode 100644
index 000000000..c35a74513
--- /dev/null
+++ b/external_imported/json/docs/examples/update.output
@@ -0,0 +1,17 @@
+{
+  "color": "blue",
+  "names": {
+    "en": "plane"
+  },
+  "price": 17.99,
+  "speed": 100
+}
+{
+  "color": "blue",
+  "names": {
+    "de": "Flugzeug",
+    "en": "plane"
+  },
+  "price": 17.99,
+  "speed": 100
+}
diff --git a/external_imported/json/docs/examples/update__range.cpp b/external_imported/json/docs/examples/update__range.cpp
new file mode 100644
index 000000000..5b4385046
--- /dev/null
+++ b/external_imported/json/docs/examples/update__range.cpp
@@ -0,0 +1,24 @@
+#include <iostream>
+#include <iomanip>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+using namespace nlohmann::literals;
+
+int main()
+{
+    // create two JSON objects
+    json o1 = R"( {"color": "red", "price": 17.99, "names": {"de": "Flugzeug"}} )"_json;
+    json o2 = R"( {"color": "blue", "speed": 100, "names": {"en": "plane"}} )"_json;
+    json o3 = o1;
+
+    // add all keys from o2 to o1 (updating "color", replacing "names")
+    o1.update(o2.begin(), o2.end());
+
+    // add all keys from o2 to o1 (updating "color", merging "names")
+    o3.update(o2.begin(), o2.end(), true);
+
+    // output updated object o1 and o3
+    std::cout << std::setw(2) << o1 << '\n';
+    std::cout << std::setw(2) << o3 << '\n';
+}
diff --git a/external_imported/json/docs/examples/update__range.output b/external_imported/json/docs/examples/update__range.output
new file mode 100644
index 000000000..c35a74513
--- /dev/null
+++ b/external_imported/json/docs/examples/update__range.output
@@ -0,0 +1,17 @@
+{
+  "color": "blue",
+  "names": {
+    "en": "plane"
+  },
+  "price": 17.99,
+  "speed": 100
+}
+{
+  "color": "blue",
+  "names": {
+    "de": "Flugzeug",
+    "en": "plane"
+  },
+  "price": 17.99,
+  "speed": 100
+}
diff --git a/external_imported/json/docs/examples/value__json_ptr.cpp b/external_imported/json/docs/examples/value__json_ptr.cpp
new file mode 100644
index 000000000..d866ef076
--- /dev/null
+++ b/external_imported/json/docs/examples/value__json_ptr.cpp
@@ -0,0 +1,31 @@
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+using namespace nlohmann::literals;
+
+int main()
+{
+    // create a JSON object with different entry types
+    json j =
+    {
+        {"integer", 1},
+        {"floating", 42.23},
+        {"string", "hello world"},
+        {"boolean", true},
+        {"object", {{"key1", 1}, {"key2", 2}}},
+        {"array", {1, 2, 3}}
+    };
+
+    // access existing values
+    int v_integer = j.value("/integer"_json_pointer, 0);
+    double v_floating = j.value("/floating"_json_pointer, 47.11);
+
+    // access nonexisting values and rely on default value
+    std::string v_string = j.value("/nonexisting"_json_pointer, "oops");
+    bool v_boolean = j.value("/nonexisting"_json_pointer, false);
+
+    // output values
+    std::cout << std::boolalpha << v_integer << " " << v_floating
+              << " " << v_string << " " << v_boolean << "\n";
+}
diff --git a/external_imported/json/doc/examples/basic_json__value.output b/external_imported/json/docs/examples/value__json_ptr.output
similarity index 100%
rename from external_imported/json/doc/examples/basic_json__value.output
rename to external_imported/json/docs/examples/value__json_ptr.output
diff --git a/external_imported/json/docs/examples/value__keytype.c++17.cpp b/external_imported/json/docs/examples/value__keytype.c++17.cpp
new file mode 100644
index 000000000..1f6ff5c30
--- /dev/null
+++ b/external_imported/json/docs/examples/value__keytype.c++17.cpp
@@ -0,0 +1,32 @@
+#include <iostream>
+#include <string_view>
+#include <nlohmann/json.hpp>
+
+using namespace std::string_view_literals;
+using json = nlohmann::json;
+
+int main()
+{
+    // create a JSON object with different entry types
+    json j =
+    {
+        {"integer", 1},
+        {"floating", 42.23},
+        {"string", "hello world"},
+        {"boolean", true},
+        {"object", {{"key1", 1}, {"key2", 2}}},
+        {"array", {1, 2, 3}}
+    };
+
+    // access existing values
+    int v_integer = j.value("integer"sv, 0);
+    double v_floating = j.value("floating"sv, 47.11);
+
+    // access nonexisting values and rely on default value
+    std::string v_string = j.value("nonexisting"sv, "oops");
+    bool v_boolean = j.value("nonexisting"sv, false);
+
+    // output values
+    std::cout << std::boolalpha << v_integer << " " << v_floating
+              << " " << v_string << " " << v_boolean << "\n";
+}
diff --git a/external_imported/json/doc/examples/basic_json__value_ptr.output b/external_imported/json/docs/examples/value__keytype.c++17.output
similarity index 100%
rename from external_imported/json/doc/examples/basic_json__value_ptr.output
rename to external_imported/json/docs/examples/value__keytype.c++17.output
diff --git a/external_imported/json/doc/examples/basic_json__value.cpp b/external_imported/json/docs/examples/value__object_t_key_type.cpp
similarity index 100%
rename from external_imported/json/doc/examples/basic_json__value.cpp
rename to external_imported/json/docs/examples/value__object_t_key_type.cpp
diff --git a/external_imported/json/docs/examples/value__object_t_key_type.output b/external_imported/json/docs/examples/value__object_t_key_type.output
new file mode 100644
index 000000000..dfc40e58c
--- /dev/null
+++ b/external_imported/json/docs/examples/value__object_t_key_type.output
@@ -0,0 +1 @@
+1 42.23 oops false
diff --git a/external_imported/json/docs/json.gif b/external_imported/json/docs/json.gif
new file mode 100644
index 000000000..8b86b0375
Binary files /dev/null and b/external_imported/json/docs/json.gif differ
diff --git a/external_imported/json/docs/mkdocs/Makefile b/external_imported/json/docs/mkdocs/Makefile
new file mode 100644
index 000000000..d3356b820
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/Makefile
@@ -0,0 +1,37 @@
+# serve the site locally
+serve: prepare_files style_check
+	venv/bin/mkdocs serve
+
+serve_dirty: prepare_files style_check
+	venv/bin/mkdocs serve --dirtyreload
+
+build: prepare_files style_check
+	venv/bin/mkdocs build
+
+# create files that are not versioned inside the mkdocs folder (images, examples)
+prepare_files: clean
+	mkdir docs/examples
+	cp -r ../json.gif docs/images
+	cp -r ../examples/*.cpp ../examples/*.output docs/examples
+
+style_check:
+	@cd docs ; python3 ../scripts/check_structure.py
+
+# clean subfolders
+clean:
+	rm -fr docs/images/json.gif docs/examples
+
+# publish site to GitHub pages (not working in GitHub Actions; need special action)
+publish: prepare_files
+	venv/bin/mkdocs gh-deploy --clean --force
+
+# install a Python virtual environment
+install_venv: requirements.txt
+	python3 -mvenv venv
+	venv/bin/pip install --upgrade pip
+	venv/bin/pip install wheel
+	venv/bin/pip install -r requirements.txt
+
+# uninstall the virtual environment
+uninstall_venv: clean
+	rm -fr venv
diff --git a/external_imported/json/docs/mkdocs/docs/api/adl_serializer/from_json.md b/external_imported/json/docs/mkdocs/docs/api/adl_serializer/from_json.md
new file mode 100644
index 000000000..176290e24
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/adl_serializer/from_json.md
@@ -0,0 +1,73 @@
+# <small>nlohmann::adl_serializer::</small>from_json
+
+```cpp
+// (1)
+template<typename BasicJsonType, typename TargetType = ValueType>
+static auto from_json(BasicJsonType && j, TargetType& val) noexcept(
+    noexcept(::nlohmann::from_json(std::forward<BasicJsonType>(j), val)))
+-> decltype(::nlohmann::from_json(std::forward<BasicJsonType>(j), val), void())
+
+// (2)
+template<typename BasicJsonType, typename TargetType = ValueType>
+static auto from_json(BasicJsonType && j) noexcept(
+noexcept(::nlohmann::from_json(std::forward<BasicJsonType>(j), detail::identity_tag<TargetType> {})))
+-> decltype(::nlohmann::from_json(std::forward<BasicJsonType>(j), detail::identity_tag<TargetType> {}))
+```
+
+This function is usually called by the [`get()`](../basic_json/get.md) function of the [basic_json](../basic_json/index.md)
+class (either explicitly or via the conversion operators).
+
+1. This function is chosen for default-constructible value types.
+2. This function is chosen for value types which are not default-constructible.
+
+## Parameters
+
+`j` (in)
+:   JSON value to read from
+
+`val` (out)
+:   value to write to
+
+## Return value
+
+Copy of the JSON value, converted to `ValueType`
+
+## Examples
+
+??? example "Example: (1) Default-constructible type"
+
+    The example below shows how a `from_json` function can be implemented for a user-defined type. This function is
+    called by the `adl_serializer` when `template get<ns::person>()` is called.
+        
+    ```cpp
+    --8<-- "examples/from_json__default_constructible.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/from_json__default_constructible.output"
+    ```
+
+??? example "Example: (2) Non-default-constructible type"
+
+    The example below shows how a `from_json` is implemented as part of a specialization of the `adl_serializer` to
+    realize the conversion of a non-default-constructible type.
+        
+    ```cpp
+    --8<-- "examples/from_json__non_default_constructible.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/from_json__non_default_constructible.output"
+    ```
+
+## See also
+
+- [to_json](to_json.md)
+
+## Version history
+
+- Added in version 2.1.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/adl_serializer/index.md b/external_imported/json/docs/mkdocs/docs/api/adl_serializer/index.md
new file mode 100644
index 000000000..95f35cddf
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/adl_serializer/index.md
@@ -0,0 +1,35 @@
+# <small>nlohmann::</small>adl_serializer
+
+```cpp
+template<typename, typename>
+struct adl_serializer;
+```
+
+Serializer that uses ADL ([Argument-Dependent Lookup](https://en.cppreference.com/w/cpp/language/adl)) to choose
+`to_json`/`from_json` functions from the types' namespaces.
+
+It is implemented similar to
+
+```cpp
+template<typename ValueType>
+struct adl_serializer {
+    template<typename BasicJsonType>
+    static void to_json(BasicJsonType& j, const T& value) {
+        // calls the "to_json" method in T's namespace
+    }
+
+    template<typename BasicJsonType>
+    static void from_json(const BasicJsonType& j, T& value) {
+        // same thing, but with the "from_json" method
+    }
+};
+```
+
+## Member functions
+
+- [**from_json**](from_json.md) - convert a JSON value to any value type
+- [**to_json**](to_json.md) - convert any value type to a JSON value
+
+## Version history
+
+- Added in version 2.1.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/adl_serializer/to_json.md b/external_imported/json/docs/mkdocs/docs/api/adl_serializer/to_json.md
new file mode 100644
index 000000000..da9765186
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/adl_serializer/to_json.md
@@ -0,0 +1,43 @@
+# <small>nlohmann::adl_serializer::</small>to_json
+
+```cpp
+template<typename BasicJsonType, typename TargetType = ValueType>
+static auto to_json(BasicJsonType& j, TargetType && val) noexcept(
+    noexcept(::nlohmann::to_json(j, std::forward<TargetType>(val))))
+-> decltype(::nlohmann::to_json(j, std::forward<TargetType>(val)), void())
+```
+
+This function is usually called by the constructors of the [basic_json](../basic_json/index.md) class.
+
+## Parameters
+
+`j` (out)
+:   JSON value to write to
+
+`val` (in)
+:   value to read from
+
+## Examples
+
+??? example
+
+    The example below shows how a `to_json` function can be implemented for a user-defined type. This function is called
+    by the `adl_serializer` when the constructor `basic_json(ns::person)` is called.
+        
+    ```cpp
+    --8<-- "examples/to_json.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/to_json.output"
+    ```
+
+## See also
+
+- [from_json](from_json.md)
+
+## Version history
+
+- Added in version 2.1.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/accept.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/accept.md
new file mode 100644
index 000000000..1c806e82f
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/accept.md
@@ -0,0 +1,113 @@
+# <small>nlohmann::basic_json::</small>accept
+
+```cpp
+// (1)
+template<typename InputType>
+static bool accept(InputType&& i,
+                   const bool ignore_comments = false);
+
+// (2)
+template<typename IteratorType>
+static bool accept(IteratorType first, IteratorType last,
+                   const bool ignore_comments = false);
+```
+
+Checks whether the input is valid JSON.
+
+1. Reads from a compatible input.
+2. Reads from a pair of character iterators
+    
+    The value_type of the iterator must be an integral type with size of 1, 2 or 4 bytes, which will be interpreted
+    respectively as UTF-8, UTF-16 and UTF-32.
+    
+Unlike the [`parse`](parse.md) function, this function neither throws an exception in case of invalid JSON input
+(i.e., a parse error) nor creates diagnostic information.
+
+## Template parameters
+
+`InputType`
+:   A compatible input, for instance:
+    
+    - an `std::istream` object
+    - a `FILE` pointer (must not be null)
+    - a C-style array of characters
+    - a pointer to a null-terminated string of single byte characters
+    - a `std::string`
+    - an object `obj` for which `begin(obj)` and `end(obj)` produces a valid pair of iterators.
+
+`IteratorType`
+:   a compatible iterator type, for instance.
+
+    - a pair of `std::string::iterator` or `std::vector<std::uint8_t>::iterator`
+    - a pair of pointers such as `ptr` and `ptr + len`
+
+## Parameters
+
+`i` (in)
+:   Input to parse from.
+
+`ignore_comments` (in)
+:   whether comments should be ignored and treated like whitespace (`#!cpp true`) or yield a parse error
+    (`#!cpp false`); (optional, `#!cpp false` by default)
+
+`first` (in)
+:   iterator to start of character range
+
+`last` (in)
+:   iterator to end of character range
+
+## Return value
+
+Whether the input is valid JSON.
+
+## Exception safety
+
+Strong guarantee: if an exception is thrown, there are no changes in the JSON value.
+
+## Complexity
+
+Linear in the length of the input. The parser is a predictive LL(1) parser.
+
+## Notes
+
+(1) A UTF-8 byte order mark is silently ignored.
+
+!!! danger "Runtime assertion"
+
+    The precondition that a passed `#!cpp FILE` pointer must not be null is enforced with a
+    [runtime assertion](../../features/assertions.md).
+
+## Examples
+
+??? example
+
+    The example below demonstrates the `accept()` function reading from a string.
+
+    ```cpp
+    --8<-- "examples/accept__string.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/accept__string.output"
+    ```
+
+## See also
+
+- [parse](parse.md) - deserialize from a compatible input
+- [operator>>](../operator_gtgt.md) - deserialize from stream
+
+## Version history
+
+- Added in version 3.0.0.
+- Ignoring comments via `ignore_comments` added in version 3.9.0.
+
+!!! warning "Deprecation"
+
+    Overload (2) replaces calls to `accept` with a pair of iterators as their first parameter which has been
+    deprecated in version 3.8.0. This overload will be removed in version 4.0.0. Please replace all calls like
+    `#!cpp accept({ptr, ptr+len}, ...);` with `#!cpp accept(ptr, ptr+len, ...);`.
+
+    You should be warned by your compiler with a `-Wdeprecated-declarations` warning if you are using a deprecated
+    function.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/array.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/array.md
similarity index 85%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/array.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/array.md
index 89113026d..22b2ee1db 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/array.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/array.md
@@ -1,4 +1,4 @@
-# basic_json::array
+# <small>nlohmann::basic_json::</small>array
 
 ```cpp
 static basic_json array(initializer_list_t init = {});
@@ -50,6 +50,11 @@ This function is only needed to express two edge cases that cannot be realized w
     --8<-- "examples/array.output"
     ```
 
+## See also
+
+- [`basic_json(initializer_list_t)`](basic_json.md) - create a JSON value from an initializer list
+- [`object`](object.md) - create a JSON object value from an initializer list
+
 ## Version history
 
 - Added in version 1.0.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/array_t.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/array_t.md
new file mode 100644
index 000000000..dd2b901d5
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/array_t.md
@@ -0,0 +1,68 @@
+# <small>nlohmann::basic_json::</small>array_t
+
+```cpp
+using array_t = ArrayType<basic_json, AllocatorType<basic_json>>;
+```
+
+The type used to store JSON arrays.
+
+[RFC 8259](https://tools.ietf.org/html/rfc8259) describes JSON arrays as follows:
+> An array is an ordered sequence of zero or more values.
+
+To store objects in C++, a type is defined by the template parameters explained below.
+
+## Template parameters
+
+`ArrayType`
+:   container type to store arrays (e.g., `std::vector` or `std::list`)
+
+`AllocatorType`
+:   the allocator to use for objects (e.g., `std::allocator`)
+
+## Notes
+
+#### Default type
+
+With the default values for `ArrayType` (`std::vector`) and `AllocatorType` (`std::allocator`), the default value for
+`array_t` is:
+
+```cpp
+std::vector<
+  basic_json, // value_type
+  std::allocator<basic_json> // allocator_type
+>
+```
+
+#### Limits
+
+[RFC 8259](https://tools.ietf.org/html/rfc8259) specifies:
+> An implementation may set limits on the maximum depth of nesting.
+
+In this class, the array's limit of nesting is not explicitly constrained. However, a maximum depth of nesting may be
+introduced by the compiler or runtime environment. A theoretical limit can be queried by calling the
+[`max_size`](max_size.md) function of a JSON array.
+
+#### Storage
+
+Arrays are stored as pointers in a `basic_json` type. That is, for any access to array values, a pointer of type
+`#!cpp array_t*` must be dereferenced.
+
+## Examples
+
+??? example
+
+    The following code shows that `array_t` is by default, a typedef to `#!cpp std::vector<nlohmann::json>`.
+     
+    ```cpp
+    --8<-- "examples/array_t.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/array_t.output"
+    ```
+
+## Version history
+
+- Added in version 1.0.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/at.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/at.md
new file mode 100644
index 000000000..5e9504508
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/at.md
@@ -0,0 +1,226 @@
+# <small>nlohmann::basic_json::</small>at
+
+```cpp
+// (1)
+reference at(size_type idx);
+const_reference at(size_type idx) const;
+
+// (2)
+reference at(const typename object_t::key_type& key);
+const_reference at(const typename object_t::key_type& key) const;
+
+// (3)
+template<typename KeyType>
+reference at(KeyType&& key);
+template<typename KeyType>
+const_reference at(KeyType&& key) const;
+
+// (4)
+reference at(const json_pointer& ptr);
+const_reference at(const json_pointer& ptr) const;
+```
+
+1. Returns a reference to the array element at specified location `idx`, with bounds checking.
+2. Returns a reference to the object element with specified key `key`, with bounds checking.
+3. See 2. This overload is only available if `KeyType` is comparable with `#!cpp typename object_t::key_type` and
+   `#!cpp typename object_comparator_t::is_transparent` denotes a type.
+4. Returns a reference to the element at specified JSON pointer `ptr`, with bounds checking.
+
+## Template parameters
+
+`KeyType`
+:   A type for an object key other than [`json_pointer`](../json_pointer/index.md) that is comparable with
+    [`string_t`](string_t.md) using  [`object_comparator_t`](object_comparator_t.md).
+    This can also be a string view (C++17).
+
+## Parameters
+
+`idx` (in)
+:   index of the element to access
+
+`key` (in)
+:   object key of the elements to access
+
+`ptr` (in)
+:   JSON pointer to the desired element
+
+## Return value
+
+1. reference to the element at index `idx`
+2. reference to the element at key `key`
+3. reference to the element at key `key`
+4. reference to the element pointed to by `ptr`
+
+## Exception safety
+
+Strong exception safety: if an exception occurs, the original value stays intact.
+
+## Exceptions
+
+1. The function can throw the following exceptions:
+    - Throws [`type_error.304`](../../home/exceptions.md#jsonexceptiontype_error304) if the JSON value is not an array;
+      in this case, calling `at` with an index makes no sense. See example below.
+    - Throws [`out_of_range.401`](../../home/exceptions.md#jsonexceptionout_of_range401) if the index `idx` is out of
+      range of the array; that is, `idx >= size()`. See example below.
+2. The function can throw the following exceptions:
+    - Throws [`type_error.304`](../../home/exceptions.md#jsonexceptiontype_error304) if the JSON value is not an object;
+      in this case, calling `at` with a key makes no sense. See example below.
+    - Throws [`out_of_range.403`](../../home/exceptions.md#jsonexceptionout_of_range403) if the key `key` is not
+      stored in the object; that is, `find(key) == end()`. See example below.
+3. See 2.
+4. The function can throw the following exceptions:
+    - Throws [`parse_error.106`](../../home/exceptions.md#jsonexceptionparse_error106) if an array index in the passed
+      JSON pointer `ptr` begins with '0'. See example below.
+    - Throws [`parse_error.109`](../../home/exceptions.md#jsonexceptionparse_error109) if an array index in the passed
+      JSON pointer `ptr` is not a number. See example below.
+    - Throws [`out_of_range.401`](../../home/exceptions.md#jsonexceptionout_of_range401) if an array index in the passed
+      JSON pointer `ptr` is out of range. See example below.
+    - Throws [`out_of_range.402`](../../home/exceptions.md#jsonexceptionout_of_range402) if the array index '-' is used
+      in the passed JSON pointer `ptr`. As `at` provides checked access (and no elements are implicitly inserted), the
+      index '-' is always invalid. See example below.
+    - Throws [`out_of_range.403`](../../home/exceptions.md#jsonexceptionout_of_range403) if the JSON pointer describes a
+      key of an object which cannot be found. See example below.
+    - Throws [`out_of_range.404`](../../home/exceptions.md#jsonexceptionout_of_range404) if the JSON pointer `ptr` can
+      not be resolved. See example below.
+
+## Complexity
+
+1. Constant.
+2. Logarithmic in the size of the container.
+3. Logarithmic in the size of the container.
+4. Logarithmic in the size of the container.
+
+## Examples
+
+??? example "Example: (1) access specified array element with bounds checking"
+
+    The example below shows how array elements can be read and written using `at()`. It also demonstrates the different
+    exceptions that can be thrown.
+    
+    ```cpp
+    --8<-- "examples/at__size_type.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/at__size_type.output"
+    ```
+
+??? example "Example: (1) access specified array element with bounds checking"
+
+    The example below shows how array elements can be read using `at()`. It also demonstrates the different exceptions
+    that can be thrown.
+        
+    ```cpp
+    --8<-- "examples/at__size_type_const.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/at__size_type_const.output"
+    ```
+
+??? example "Example: (2) access specified object element with bounds checking"
+
+    The example below shows how object elements can be read and written using `at()`. It also demonstrates the different
+    exceptions that can be thrown.
+        
+    ```cpp
+    --8<-- "examples/at__object_t_key_type.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/at__object_t_key_type.output"
+    ```
+
+??? example "Example: (2) access specified object element with bounds checking"
+
+    The example below shows how object elements can be read using `at()`. It also demonstrates the different exceptions
+    that can be thrown.
+    
+    ```cpp
+    --8<-- "examples/at__object_t_key_type_const.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/at__object_t_key_type_const.output"
+    ```
+
+??? example "Example: (3) access specified object element using string_view with bounds checking"
+
+    The example below shows how object elements can be read and written using `at()`. It also demonstrates the different
+    exceptions that can be thrown.
+    
+    ```cpp
+    --8<-- "examples/at__keytype.c++17.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/at__keytype.c++17.output"
+    ```
+
+??? example "Example: (3) access specified object element using string_view with bounds checking"
+
+    The example below shows how object elements can be read using `at()`. It also demonstrates the different exceptions
+    that can be thrown.
+    
+    ```cpp
+    --8<-- "examples/at__keytype_const.c++17.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/at__keytype_const.c++17.output"
+    ```
+
+??? example "Example: (4) access specified element via JSON Pointer"
+
+    The example below shows how object elements can be read and written using `at()`. It also demonstrates the different
+    exceptions that can be thrown.
+        
+    ```cpp
+    --8<-- "examples/at__json_pointer.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/at__json_pointer.output"
+    ```
+
+??? example "Example: (4) access specified element via JSON Pointer"
+
+    The example below shows how object elements can be read using `at()`. It also demonstrates the different exceptions
+    that can be thrown.
+        
+    ```cpp
+    --8<-- "examples/at__json_pointer_const.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/at__json_pointer_const.output"
+    ```
+
+## See also
+
+- documentation on [checked access](../../features/element_access/checked_access.md)
+- see [`operator[]`](operator%5B%5D.md) for unchecked access by reference
+- see [`value`](value.md) for access with default value
+
+## Version history
+
+1. Added in version 1.0.0.
+2. Added in version 1.0.0.
+3. Added in version 3.11.0.
+4. Added in version 2.0.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/back.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/back.md
new file mode 100644
index 000000000..1a715284d
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/back.md
@@ -0,0 +1,65 @@
+# <small>nlohmann::basic_json::</small>back
+
+```cpp
+reference back();
+
+const_reference back() const;
+```
+
+Returns a reference to the last element in the container. For a JSON container `c`, the expression `c.back()` is
+equivalent to
+
+```cpp
+auto tmp = c.end();
+--tmp;
+return *tmp;
+```
+    
+## Return value
+
+In case of a structured type (array or object), a reference to the last element is returned. In case of number, string,
+boolean, or binary values, a reference to the value is returned.
+
+## Exception safety
+
+Strong guarantee: if an exception is thrown, there are no changes in the JSON value.
+
+## Exceptions
+
+If the JSON value is `#!json null`, exception
+[`invalid_iterator.214`](../../home/exceptions.md#jsonexceptioninvalid_iterator214) is thrown.
+
+## Complexity
+
+Constant.
+
+## Notes
+
+!!! info "Precondition"
+
+    The array or object must not be empty. Calling `back` on an empty array or object yields undefined behavior.
+
+## Examples
+
+??? example
+
+    The following code shows an example for `back()`.
+     
+    ```cpp
+    --8<-- "examples/back.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/back.output"
+    ```
+
+## See also
+
+- [front](front.md) to access the first element
+
+## Version history
+
+- Added in version 1.0.0.
+- Adjusted code to return reference to binary values in version 3.8.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/basic_json.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/basic_json.md
similarity index 88%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/basic_json.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/basic_json.md
index 9ff6fbb8d..e2e73612c 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/basic_json.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/basic_json.md
@@ -1,53 +1,55 @@
-# basic_json::basic_json
+# <small>nlohmann::basic_json::</small>basic_json
 
 ```cpp
-// 1
+// (1)
 basic_json(const value_t v);
 
-// 2
+// (2)
 basic_json(std::nullptr_t = nullptr) noexcept;
 
-// 3
+// (3)
 template<typename CompatibleType>
 basic_json(CompatibleType&& val) noexcept(noexcept(
            JSONSerializer<U>::to_json(std::declval<basic_json_t&>(),
                                       std::forward<CompatibleType>(val))));
 
-// 4
+// (4)
 template<typename BasicJsonType>
 basic_json(const BasicJsonType& val);
 
-// 5
+// (5)
 basic_json(initializer_list_t init,
            bool type_deduction = true,
            value_t manual_type = value_t::array);
 
-// 6
+// (6)
 basic_json(size_type cnt, const basic_json& val);
 
-// 7
+// (7)
 basic_json(iterator first, iterator last);
 basic_json(const_iterator first, const_iterator last);
 
-// 8
+// (8)
 basic_json(const basic_json& other);
 
-// 9
+// (9)
 basic_json(basic_json&& other) noexcept;
 ```
 
 1. Create an empty JSON value with a given type. The value will be default initialized with an empty value which depends
    on the type:
    
-    Value type  | initial value
-    ----------- | -------------
-    null        | `#!json null`
-    boolean     | `#!json false`
-    string      | `#!json ""`
-    number      | `#!json 0`
-    object      | `#!json {}`
-    array       | `#!json []`
-    binary      | empty array
+    | Value type | initial value  |
+    |------------|----------------|
+    | null       | `#!json null`  |
+    | boolean    | `#!json false` |
+    | string     | `#!json ""`    |
+    | number     | `#!json 0`     |
+    | object     | `#!json {}`    |
+    | array      | `#!json []`    |
+    | binary     | empty array    |
+
+    The postcondition of this constructor can be restored by calling [`clear()`](clear.md).
 
 2. Create a `#!json null` JSON value. It either takes a null pointer as parameter (explicitly creating `#!json null`)
    or no parameter (implicitly creating `#!json null`). The passed null pointer itself is not read -- it is only used to
@@ -104,6 +106,9 @@ basic_json(basic_json&& other) noexcept;
     
     - the empty array (`#!json []`): use `array(initializer_list_t)` with an empty initializer list in this case
     - arrays whose elements satisfy rule 2: use `array(initializer_list_t)` with the same initializer list in this case
+   
+    Function [`array()`](array.md) and [`object()`](object.md) force array and object creation from initializer lists,
+    respectively.
         
 6. Constructs a JSON array value by creating `cnt` copies of a passed value. In case `cnt` is `0`, an empty array is
    created.
@@ -142,6 +147,9 @@ basic_json(basic_json&& other) noexcept;
     - `BasicJsonType` is a `basic_json` type.
     - `BasicJsonType` has different template arguments than `basic_json_t`.
 
+`U`:
+:   `uncvref_t<CompatibleType>`
+
 ## Parameters
 
 `v` (in)
@@ -175,46 +183,46 @@ basic_json(basic_json&& other) noexcept;
 `other` (in)
 :   the JSON value to copy/move
 
+## Exception safety
+
+1. Strong guarantee: if an exception is thrown, there are no changes to any JSON value.
+2. No-throw guarantee: this constructor never throws exceptions.
+3. Depends on the called constructor. For types directly supported by the library (i.e., all types for which no
+   `to_json()` function was provided), strong guarantee holds: if an exception is thrown, there are no changes to any
+   JSON value.
+4. Depends on the called constructor. For types directly supported by the library (i.e., all types for which no
+   `to_json()` function was provided), strong guarantee holds: if an exception is thrown, there are no changes to any
+   JSON value.
+5. Strong guarantee: if an exception is thrown, there are no changes to any JSON value.
+6. Strong guarantee: if an exception is thrown, there are no changes to any JSON value.
+7. Strong guarantee: if an exception is thrown, there are no changes to any JSON value.
+8. Strong guarantee: if an exception is thrown, there are no changes to any JSON value.
+9. No-throw guarantee: this constructor never throws exceptions.
+
 ## Exceptions
 
-1. /
+1. (none)
 2. The function does not throw exceptions.
-3. /
-4. /
+3. (none)
+4. (none)
 5. The function can throw the following exceptions:
     - Throws [`type_error.301`](../../home/exceptions.md#jsonexceptiontype_error301) if `type_deduction` is
       `#!cpp false`, `manual_type` is `value_t::object`, but `init` contains an element which is not a pair whose first
       element is a string. In this case, the constructor could not create an object. If `type_deduction` would have been
       `#!cpp true`, an array would have been created. See `object(initializer_list_t)` for an example.
-6. /
+6. (none)
 7. The function can throw the following exceptions:
     - Throws [`invalid_iterator.201`](../../home/exceptions.md#jsonexceptioninvalid_iterator201) if iterators `first`
       and `last` are not compatible (i.e., do not belong to the same JSON value). In this case, the range
       `[first, last)` is undefined.
     - Throws [`invalid_iterator.204`](../../home/exceptions.md#jsonexceptioninvalid_iterator204) if iterators `first`
       and `last` belong to a primitive type (number, boolean, or string), but `first` does not point to the first
-      element any more. In this case, the range `[first, last)` is undefined. See example code below.
+      element anymore. In this case, the range `[first, last)` is undefined. See example code below.
     - Throws [`invalid_iterator.206`](../../home/exceptions.md#jsonexceptioninvalid_iterator206) if iterators `first`
       and `last` belong to a `#!json null` value. In this case, the range `[first, last)` is undefined.
-8. /
+8. (none)
 9. The function does not throw exceptions.
 
-## Exception safety
-
-1. Strong guarantee: if an exception is thrown, there are no changes to any JSON value.
-2. No-throw guarantee: this constructor never throws exceptions.
-3. Depends on the called constructor. For types directly supported by the library (i.e., all types for which no
-   `to_json()` function was provided), strong guarantee holds: if an exception is thrown, there are no changes to any
-   JSON value.
-4. Depends on the called constructor. For types directly supported by the library (i.e., all types for which no
-   `to_json()` function was provided), strong guarantee holds: if an exception is thrown, there are no changes to any
-   JSON value.
-5. Strong guarantee: if an exception is thrown, there are no changes to any JSON value.
-6. Strong guarantee: if an exception is thrown, there are no changes to any JSON value.
-7. Strong guarantee: if an exception is thrown, there are no changes to any JSON value.
-8. Strong guarantee: if an exception is thrown, there are no changes to any JSON value.
-9. No-throw guarantee: this constructor never throws exceptions.
-
 ## Complexity
 
 1. Constant.
@@ -233,7 +241,7 @@ basic_json(basic_json&& other) noexcept;
 
 - Overload 5:
 
-    !!! note
+    !!! note "Empty initializer list"
 
         When used without parentheses around an empty initializer list, `basic_json()` is called instead of this
         function, yielding the JSON `#!json null` value.
@@ -242,17 +250,15 @@ basic_json(basic_json&& other) noexcept;
 
     !!! info "Preconditions"
 
-        - Iterators `first` and `last` must be initialized. **This precondition is enforced with an assertion (see
-          warning).** If assertions are switched off, a violation of this precondition yields undefined behavior.
+        - Iterators `first` and `last` must be initialized. **This precondition is enforced with a
+          [runtime assertion](../../features/assertions.md).
         - Range `[first, last)` is valid. Usually, this precondition cannot be checked efficiently. Only certain edge
           cases are detected; see the description of the exceptions above. A violation of this precondition yields
           undefined behavior.
     
-    !!! warning
+    !!! danger "Runtime assertion"
 
-        A precondition is enforced with a runtime assertion that will result in calling `std::abort` if this
-        precondition is not met. Assertions can be disabled by defining `NDEBUG` at compile time. See
-        <https://en.cppreference.com/w/cpp/error/assert> for more information.
+        A precondition is enforced with a [runtime assertion](../../features/assertions.md).
     
 - Overload 8:
 
@@ -267,9 +273,9 @@ basic_json(basic_json&& other) noexcept;
         - `#!cpp `*this` has the same value as `other` before the call.
         - `other` is a JSON `#!json null` value
 
-## Example
+## Examples
 
-??? example
+??? example "Example: (1) create an empty value with a given type"
 
     The following code shows the constructor for different `value_t` values.
      
@@ -283,7 +289,7 @@ basic_json(basic_json&& other) noexcept;
     --8<-- "examples/basic_json__value_t.output"
     ```
 
-??? example
+??? example "Example: (2) create a `#!json null` object"
 
     The following code shows the constructor with and without a null pointer parameter.
      
@@ -297,7 +303,7 @@ basic_json(basic_json&& other) noexcept;
     --8<-- "examples/basic_json__nullptr_t.output"
     ```
 
-??? example
+??? example "Example: (3) create a JSON value from compatible types"
 
     The following code shows the constructor with several compatible types.
      
@@ -311,7 +317,9 @@ basic_json(basic_json&& other) noexcept;
     --8<-- "examples/basic_json__CompatibleType.output"
     ```
 
-??? example
+    Note the output is platform-dependent.
+
+??? example "Example: (5) create a container (array or object) from an initializer list"
 
     The example below shows how JSON values are created from initializer lists.
      
@@ -325,7 +333,7 @@ basic_json(basic_json&& other) noexcept;
     --8<-- "examples/basic_json__list_init_t.output"
     ```
 
-??? example
+??? example "Example: (6) construct an array with count copies of given value"
 
     The following code shows examples for creating arrays with several copies of a given value.
      
@@ -339,7 +347,7 @@ basic_json(basic_json&& other) noexcept;
     --8<-- "examples/basic_json__size_type_basic_json.output"
     ```
 
-??? example
+??? example "Example: (7) construct a JSON container given an iterator range"
 
     The example below shows several ways to create JSON values by specifying a subrange with iterators.
      
@@ -353,7 +361,7 @@ basic_json(basic_json&& other) noexcept;
     --8<-- "examples/basic_json__InputIt_InputIt.output"
     ```
 
-??? example
+??? example "Example: (8) copy constructor"
 
     The following code shows an example for the copy constructor.
      
@@ -367,7 +375,7 @@ basic_json(basic_json&& other) noexcept;
     --8<-- "examples/basic_json__basic_json.output"
     ```
 
-??? example
+??? example "Example: (9) move constructor"
 
     The code below shows the move constructor explicitly called via `std::move`.
      
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/begin.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/begin.md
similarity index 91%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/begin.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/begin.md
index 25d93b8f8..ef623a5ff 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/begin.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/begin.md
@@ -1,4 +1,4 @@
-# basic_json::begin
+# <small>nlohmann::basic_json::</small>begin
 
 ```cpp
 iterator begin() noexcept;
@@ -21,7 +21,7 @@ No-throw guarantee: this member function never throws exceptions.
 
 Constant.
 
-## Example
+## Examples
 
 ??? example
 
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/binary.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/binary.md
new file mode 100644
index 000000000..ce45d8a0f
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/binary.md
@@ -0,0 +1,66 @@
+# <small>nlohmann::basic_json::</small>binary
+
+```cpp
+// (1)
+static basic_json binary(const typename binary_t::container_type& init);
+static basic_json binary(typename binary_t::container_type&& init);
+
+// (2)
+static basic_json binary(const typename binary_t::container_type& init,
+                         std::uint8_t subtype);
+static basic_json binary(typename binary_t::container_type&& init,
+                         std::uint8_t subtype);
+```
+
+1. Creates a JSON binary array value from a given binary container.
+2. Creates a JSON binary array value from a given binary container with subtype.
+ 
+Binary values are part of various binary formats, such as CBOR, MessagePack, and BSON. This constructor is used to
+create a value for serialization to those formats.
+
+## Parameters
+
+`init` (in)
+:   container containing bytes to use as binary type
+
+`subtype` (in)
+:   subtype to use in CBOR, MessagePack, and BSON
+
+## Return value
+
+JSON binary array value
+
+## Exception safety
+
+Strong guarantee: if an exception is thrown, there are no changes in the JSON value.
+
+## Complexity
+
+Linear in the size of `init`; constant for `typename binary_t::container_type&& init` versions.
+
+## Notes
+
+Note, this function exists because of the difficulty in correctly specifying the correct template overload in the
+standard value ctor, as both JSON arrays and JSON binary arrays are backed with some form of a `std::vector`. Because
+JSON binary arrays are a non-standard extension it was decided that it would be best to prevent automatic initialization
+of a binary array type, for backwards compatibility and so it does not happen on accident.
+
+## Examples
+
+??? example
+
+    The following code shows how to create a binary value.
+     
+    ```cpp
+    --8<-- "examples/binary.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/binary.output"
+    ```
+
+## Version history
+
+- Added in version 3.8.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/binary_t.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/binary_t.md
new file mode 100644
index 000000000..705c92cb5
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/binary_t.md
@@ -0,0 +1,89 @@
+# <small>nlohmann::basic_json::</small>binary_t
+
+```cpp
+using binary_t = byte_container_with_subtype<BinaryType>;
+```
+
+This type is a type designed to carry binary data that appears in various serialized formats, such as CBOR's Major Type
+2, MessagePack's bin, and BSON's generic binary subtype. This type is NOT a part of standard JSON and exists solely for
+compatibility with these binary types. As such, it is simply defined as an ordered sequence of zero or more byte values.
+
+Additionally, as an implementation detail, the subtype of the binary data is carried around as a `std::uint64_t`, which
+is compatible with both of the binary data formats that use binary subtyping, (though the specific numbering is
+incompatible with each other, and it is up to the user to translate between them). The subtype is added to `BinaryType`
+via the helper type [byte_container_with_subtype](../byte_container_with_subtype/index.md).
+
+[CBOR's RFC 7049](https://tools.ietf.org/html/rfc7049) describes this type as:
+> Major type 2: a byte string. The string's length in bytes is represented following the rules for positive integers
+> (major type 0).
+
+[MessagePack's documentation on the bin type
+family](https://github.com/msgpack/msgpack/blob/master/spec.md#bin-format-family) describes this type as:
+> Bin format family stores a byte array in 2, 3, or 5 bytes of extra bytes in addition to the size of the byte array.
+
+[BSON's specifications](http://bsonspec.org/spec.html) describe several binary types; however, this type is intended to
+represent the generic binary type which has the description:
+> Generic binary subtype - This is the most commonly used binary subtype and should be the 'default' for drivers and
+> tools.
+
+None of these impose any limitations on the internal representation other than the basic unit of storage be some type of
+array whose parts are decomposable into bytes.
+
+The default representation of this binary format is a `#!cpp std::vector<std::uint8_t>`, which is a very common way to
+represent a byte array in modern C++.
+
+## Template parameters
+
+`BinaryType`
+:   container type to store arrays
+
+## Notes
+
+#### Default type
+
+The default values for `BinaryType` is `#!cpp std::vector<std::uint8_t>`.
+
+#### Storage
+
+Binary Arrays are stored as pointers in a `basic_json` type. That is, for any access to array values, a pointer of the
+type `#!cpp binary_t*` must be dereferenced.
+
+#### Notes on subtypes
+
+- CBOR
+    - Binary values are represented as byte strings. Subtypes are written as tags.
+
+- MessagePack
+    - If a subtype is given and the binary array contains exactly 1, 2, 4, 8, or 16 elements, the fixext family (fixext1,
+      fixext2, fixext4, fixext8) is used. For other sizes, the ext family (ext8, ext16, ext32) is used. The subtype is
+      then added as signed 8-bit integer.
+    - If no subtype is given, the bin family (bin8, bin16, bin32) is used.
+
+- BSON
+    - If a subtype is given, it is used and added as unsigned 8-bit integer.
+    - If no subtype is given, the generic binary subtype 0x00 is used.
+
+## Examples
+
+??? example
+
+    The following code shows that `binary_t` is by default, a typedef to
+    `#!cpp nlohmann::byte_container_with_subtype<std::vector<std::uint8_t>>`.
+     
+    ```cpp
+    --8<-- "examples/binary_t.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/binary_t.output"
+    ```
+
+## See also
+
+- [byte_container_with_subtype](../byte_container_with_subtype/index.md)
+
+## Version history
+
+- Added in version 3.8.0. Changed type of subtype to `std::uint64_t` in version 3.10.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/boolean_t.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/boolean_t.md
new file mode 100644
index 000000000..e3a783027
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/boolean_t.md
@@ -0,0 +1,42 @@
+# <small>nlohmann::basic_json::</small>boolean_t
+
+```cpp
+using boolean_t = BooleanType;
+```
+
+The type used to store JSON booleans.
+
+[RFC 8259](https://tools.ietf.org/html/rfc8259) implicitly describes a boolean as a type which differentiates the two
+literals `#!json true` and `#!json false`.
+
+To store objects in C++, a type is defined by the template parameter  `BooleanType` which chooses the type to use.
+
+## Notes
+
+#### Default type
+
+With the default values for `BooleanType` (`#!cpp bool`), the default value for `boolean_t` is `#!cpp bool`.
+
+#### Storage
+
+Boolean values are stored directly inside a `basic_json` type.
+
+## Examples
+
+??? example
+
+    The following code shows that `boolean_t` is by default, a typedef to `#!cpp bool`.
+     
+    ```cpp
+    --8<-- "examples/boolean_t.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/boolean_t.output"
+    ```
+
+## Version history
+
+- Added in version 1.0.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/cbegin.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/cbegin.md
similarity index 90%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/cbegin.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/cbegin.md
index 132934a8f..06504fee6 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/cbegin.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/cbegin.md
@@ -1,4 +1,4 @@
-# basic_json::cbegin
+# <small>nlohmann::basic_json::</small>cbegin
 
 ```cpp
 const_iterator cbegin() const noexcept;
@@ -20,7 +20,7 @@ No-throw guarantee: this member function never throws exceptions.
 
 Constant.
 
-## Example
+## Examples
 
 ??? example
 
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/cbor_tag_handler_t.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/cbor_tag_handler_t.md
new file mode 100644
index 000000000..e19c3edd9
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/cbor_tag_handler_t.md
@@ -0,0 +1,42 @@
+# <small>nlohmann::basic_json::</small>cbor_tag_handler_t
+
+```cpp
+enum class cbor_tag_handler_t
+{
+    error,
+    ignore,
+    store
+};
+```
+
+This enumeration is used in the [`from_cbor`](from_cbor.md) function to choose how to treat tags:
+
+error
+:   throw a `parse_error` exception in case of a tag
+
+ignore
+:   ignore tags
+
+store
+:   store tagged values as binary container with subtype (for bytes 0xd8..0xdb)
+
+## Examples
+
+??? example
+
+    The example below shows how the different values of the `cbor_tag_handler_t` influence the behavior of
+    [`from_cbor`](from_cbor.md) when reading a tagged byte string.
+
+    ```cpp
+    --8<-- "examples/cbor_tag_handler_t.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/cbor_tag_handler_t.output"
+    ```
+
+## Version history
+
+- Added in version 3.9.0. Added value `store` in 3.10.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/cend.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/cend.md
similarity index 91%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/cend.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/cend.md
index e5de7e94e..3f3aa949d 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/cend.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/cend.md
@@ -1,4 +1,4 @@
-# basic_json::cend
+# <small>nlohmann::basic_json::</small>cend
 
 ```cpp
 const_iterator cend() const noexcept;
@@ -20,7 +20,7 @@ No-throw guarantee: this member function never throws exceptions.
 
 Constant.
 
-## Example
+## Examples
 
 ??? example
 
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/clear.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/clear.md
new file mode 100644
index 000000000..ff04b08e6
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/clear.md
@@ -0,0 +1,58 @@
+# <small>nlohmann::basic_json::</small>clear
+
+```cpp
+void clear() noexcept;
+```
+
+Clears the content of a JSON value and resets it to the default value as if [`basic_json(value_t)`](basic_json.md) would
+have been called with the current value type from [`type()`](type.md):
+
+| Value type | initial value        |
+|------------|----------------------|
+| null       | `null`               |
+| boolean    | `false`              |
+| string     | `""`                 |
+| number     | `0`                  |
+| binary     | An empty byte vector |
+| object     | `{}`                 |
+| array      | `[]`                 |
+
+Has the same effect as calling
+
+```.cpp
+*this = basic_json(type());
+```
+
+## Exception safety
+
+No-throw guarantee: this function never throws exceptions.
+
+## Complexity
+
+Linear in the size of the JSON value.
+
+## Notes
+
+All iterators, pointers and references related to this container are invalidated.
+
+## Examples
+
+??? example
+
+    The example below shows the effect of `clear()` to different
+    JSON types.
+    
+    ```cpp
+    --8<-- "examples/clear.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/clear.output"
+    ```
+
+## Version history
+
+- Added in version 1.0.0.
+- Added support for binary types in version 3.8.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/contains.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/contains.md
new file mode 100644
index 000000000..ba2c3df2d
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/contains.md
@@ -0,0 +1,118 @@
+# <small>nlohmann::basic_json::</small>contains
+
+```cpp
+// (1)
+bool contains(const typename object_t::key_type& key) const;
+
+// (2)
+template<typename KeyType>
+bool contains(KeyType&& key) const;
+
+// (3)
+bool contains(const json_pointer& ptr) const;
+```
+
+1. Check whether an element exists in a JSON object with a key equivalent to `key`. If the element is not found or the 
+   JSON value is not an object, `#!cpp false` is returned.
+2. See 1. This overload is only available if `KeyType` is comparable with `#!cpp typename object_t::key_type` and
+   `#!cpp typename object_comparator_t::is_transparent` denotes a type.
+3. Check whether the given JSON pointer `ptr` can be resolved in the current JSON value.
+
+## Template parameters
+
+`KeyType`
+:   A type for an object key other than [`json_pointer`](../json_pointer/index.md) that is comparable with
+    [`string_t`](string_t.md) using  [`object_comparator_t`](object_comparator_t.md).
+    This can also be a string view (C++17).
+
+## Parameters
+
+`key` (in)
+:   key value to check its existence.
+
+`ptr` (in)
+:   JSON pointer to check its existence.
+
+## Return value
+
+1. `#!cpp true` if an element with specified `key` exists. If no such element with such key is found or the JSON value
+   is not an object, `#!cpp false` is returned.
+2. See 1.
+3. `#!cpp true` if the JSON pointer can be resolved to a stored value, `#!cpp false` otherwise.
+
+## Exception safety
+
+Strong exception safety: if an exception occurs, the original value stays intact.
+
+## Exceptions
+
+1. The function does not throw exceptions.
+2. The function does not throw exceptions.
+3. The function can throw the following exceptions:
+    - Throws [`parse_error.106`](../../home/exceptions.md#jsonexceptionparse_error106) if an array index begins with
+      `0`.
+    - Throws [`parse_error.109`](../../home/exceptions.md#jsonexceptionparse_error109) if an array index was not a
+      number.
+
+## Complexity
+
+Logarithmic in the size of the JSON object.
+
+## Notes
+
+- This method always returns `#!cpp false` when executed on a JSON type that is not an object.
+- This method can be executed on any JSON value type.
+
+!!! info "Postconditions"
+
+    If `#!cpp j.contains(x)` returns `#!c true` for a key or JSON pointer `x`, then it is safe to call `j[x]`.
+
+## Examples
+
+??? example "Example: (1) check with key"
+
+    The example shows how `contains()` is used.
+    
+    ```cpp
+    --8<-- "examples/contains__object_t_key_type.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/contains__object_t_key_type.output"
+    ```
+
+??? example "Example: (2) check with key using string_view"
+
+    The example shows how `contains()` is used.
+    
+    ```cpp
+    --8<-- "examples/contains__keytype.c++17.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/contains__keytype.c++17.output"
+    ```
+
+??? example "Example: (3) check with JSON pointer"
+
+    The example shows how `contains()` is used.
+    
+    ```cpp
+    --8<-- "examples/contains__json_pointer.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/contains__json_pointer.output"
+    ```
+
+## Version history
+
+1. Added in version 3.11.0.
+2. Added in version 3.6.0. Extended template `KeyType` to support comparable types in version 3.11.0.
+3. Added in version 3.7.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/count.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/count.md
new file mode 100644
index 000000000..4f3a31055
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/count.md
@@ -0,0 +1,78 @@
+# <small>nlohmann::basic_json::</small>count
+
+```cpp
+// (1)
+size_type count(const typename object_t::key_type& key) const;
+
+// (2)
+template<typename KeyType>
+size_type count(KeyType&& key) const;
+```
+
+1. Returns the number of elements with key `key`. If `ObjectType` is the default `std::map` type, the return value will
+   always be `0` (`key` was not found) or `1` (`key` was found).
+2. See 1. This overload is only available if `KeyType` is comparable with `#!cpp typename object_t::key_type` and
+   `#!cpp typename object_comparator_t::is_transparent` denotes a type.
+
+## Template parameters
+
+`KeyType`
+:   A type for an object key other than [`json_pointer`](../json_pointer/index.md) that is comparable with
+    [`string_t`](string_t.md) using  [`object_comparator_t`](object_comparator_t.md).
+    This can also be a string view (C++17).
+
+## Parameters
+
+`key` (in)
+:   key value of the element to count.
+    
+## Return value
+
+Number of elements with key `key`. If the JSON value is not an object, the return value will be `0`.
+
+## Exception safety
+
+Strong exception safety: if an exception occurs, the original value stays intact.
+
+## Complexity
+
+Logarithmic in the size of the JSON object.
+
+## Notes
+
+This method always returns `0` when executed on a JSON type that is not an object.
+
+## Examples
+
+??? example "Example: (1) count number of elements"
+
+    The example shows how `count()` is used.
+    
+    ```cpp
+    --8<-- "examples/count__object_t_key_type.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/count__object_t_key_type.output"
+    ```
+
+??? example "Example: (2) count number of elements using string_view"
+
+    The example shows how `count()` is used.
+    
+    ```cpp
+    --8<-- "examples/count__keytype.c++17.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/count__keytype.c++17.output"
+    ```
+
+## Version history
+
+1. Added in version 3.11.0.
+2. Added in version 1.0.0. Changed parameter `key` type to `KeyType&&` in version 3.11.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/crbegin.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/crbegin.md
similarity index 91%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/crbegin.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/crbegin.md
index 14196627e..7af5ecae4 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/crbegin.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/crbegin.md
@@ -1,4 +1,4 @@
-# basic_json::crbegin
+# <small>nlohmann::basic_json::</small>crbegin
 
 ```cpp
 const_reverse_iterator crbegin() const noexcept;
@@ -20,7 +20,7 @@ No-throw guarantee: this member function never throws exceptions.
 
 Constant.
 
-## Example
+## Examples
 
 ??? example
 
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/crend.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/crend.md
similarity index 92%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/crend.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/crend.md
index f98af7058..0e6bc8474 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/crend.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/crend.md
@@ -1,4 +1,4 @@
-# basic_json::rend
+# <small>nlohmann::basic_json::</small>crend
 
 ```cpp
 const_reverse_iterator crend() const noexcept;
@@ -21,7 +21,7 @@ No-throw guarantee: this member function never throws exceptions.
 
 Constant.
 
-## Example
+## Examples
 
 ??? example
 
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/default_object_comparator_t.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/default_object_comparator_t.md
new file mode 100644
index 000000000..8a237f662
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/default_object_comparator_t.md
@@ -0,0 +1,35 @@
+# <small>nlohmann::basic_json::</small>default_object_comparator_t
+
+```cpp
+using default_object_comparator_t = std::less<StringType>;  // until C++14
+
+using default_object_comparator_t = std::less<>;            // since C++14
+```
+
+The default comparator used by [`object_t`](object_t.md).
+
+Since C++14 a transparent comparator is used which prevents unnecessary string construction
+when looking up a key in an object.
+
+The actual comparator used depends on [`object_t`](object_t.md) and can be obtained via
+[`object_comparator_t`](object_comparator_t.md).
+
+## Examples
+
+??? example
+
+    The example below demonstrates the default comparator.
+
+    ```cpp
+    --8<-- "examples/default_object_comparator_t.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/default_object_comparator_t.output"
+    ```
+
+## Version history
+
+- Added in version 3.11.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/diff.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/diff.md
similarity index 88%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/diff.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/diff.md
index 736d5fb4b..4e840684e 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/diff.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/diff.md
@@ -1,4 +1,4 @@
-# basic_json::diff
+# <small>nlohmann::basic_json::</small>diff
 
 ```cpp
 static basic_json diff(const basic_json& source,
@@ -33,11 +33,11 @@ Strong guarantee: if an exception is thrown, there are no changes in the JSON va
 
 Linear in the lengths of `source` and `target`.
 
-## Note
+## Notes
 
 Currently, only `remove`, `add`, and `replace` operations are generated.
           
-## Example
+## Examples
 
 ??? example
 
@@ -53,6 +53,10 @@ Currently, only `remove`, `add`, and `replace` operations are generated.
     --8<-- "examples/diff.output"
     ```
 
+## See also
+
+- [RFC 6902 (JSON Patch)](https://tools.ietf.org/html/rfc6902)
+
 ## Version history
 
 - Added in version 2.0.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/dump.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/dump.md
new file mode 100644
index 000000000..41adb154d
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/dump.md
@@ -0,0 +1,79 @@
+# <small>nlohmann::basic_json::</small>dump
+
+```cpp
+string_t dump(const int indent = -1,
+              const char indent_char = ' ',
+              const bool ensure_ascii = false,
+              const error_handler_t error_handler = error_handler_t::strict) const;
+```
+
+Serialization function for JSON values. The function tries to mimic Python's
+[`json.dumps()` function](https://docs.python.org/2/library/json.html#json.dump), and currently  supports its `indent`
+and `ensure_ascii` parameters.
+    
+## Parameters
+
+`indent` (in)
+:   If `indent` is nonnegative, then array elements and object members will be pretty-printed with that indent level. An
+    indent level of `0` will only insert newlines. `-1` (the default) selects the most compact representation.
+
+`indent_char` (in)
+:   The character to use for indentation if `indent` is greater than `0`. The default is ` ` (space).
+
+`ensure_ascii` (in)
+:   If `ensure_ascii` is true, all non-ASCII characters in the output are escaped with `\uXXXX` sequences, and the
+    result consists of ASCII characters only.
+
+`error_handler` (in)
+:   how to react on decoding errors; there are three possible values (see [`error_handler_t`](error_handler_t.md):
+    `strict` (throws and exception in case a decoding error occurs; default), `replace` (replace invalid UTF-8 sequences
+    with U+FFFD), and `ignore` (ignore invalid UTF-8 sequences during serialization; all bytes are copied to the output
+    unchanged)).
+    
+## Return value
+
+string containing the serialization of the JSON value
+
+## Exception safety
+
+Strong guarantee: if an exception is thrown, there are no changes to any JSON value.
+
+## Exceptions
+
+Throws [`type_error.316`](../../home/exceptions.md#jsonexceptiontype_error316) if a string stored inside the JSON value
+is not UTF-8 encoded and `error_handler` is set to `strict`
+
+## Complexity
+
+Linear.
+
+## Notes
+
+Binary values are serialized as object containing two keys:
+
+- "bytes": an array of bytes as integers
+- "subtype": the subtype as integer or `#!json null` if the binary has no subtype
+
+## Examples
+
+??? example
+
+    The following example shows the effect of different `indent`, `indent_char`, and `ensure_ascii` parameters to the
+    result of the serialization.
+
+    ```cpp
+    --8<-- "examples/dump.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/dump.output"
+    ```
+
+## Version history
+
+- Added in version 1.0.0.
+- Indentation character `indent_char`, option `ensure_ascii` and exceptions added in version 3.0.0.
+- Error handlers added in version 3.4.0.
+- Serialization of binary values added in version 3.8.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/emplace.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/emplace.md
similarity index 96%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/emplace.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/emplace.md
index 50a9c92e3..6cc2c98d7 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/emplace.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/emplace.md
@@ -1,4 +1,4 @@
-# basic_json::emplace
+# <small>nlohmann::basic_json::</small>emplace
 
 ```cpp
 template<class... Args>
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/emplace_back.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/emplace_back.md
similarity index 95%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/emplace_back.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/emplace_back.md
index 8a8af0c66..597ad41e4 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/emplace_back.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/emplace_back.md
@@ -1,4 +1,4 @@
-# basic_json::emplace_back
+# <small>nlohmann::basic_json::</small>emplace_back
 
 ```cpp
 template<class... Args>
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/empty.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/empty.md
new file mode 100644
index 000000000..26bf6e9aa
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/empty.md
@@ -0,0 +1,66 @@
+# <small>nlohmann::basic_json::</small>empty
+
+```cpp
+bool empty() const noexcept;
+```
+
+Checks if a JSON value has no elements (i.e. whether its [`size()`](size.md) is `0`).
+    
+## Return value
+
+The return value depends on the different types and is defined as follows:
+
+| Value type | return value                           |
+|------------|----------------------------------------|
+| null       | `#!cpp true`                           |
+| boolean    | `#!cpp false`                          |
+| string     | `#!cpp false`                          |
+| number     | `#!cpp false`                          |
+| binary     | `#!cpp false`                          |
+| object     | result of function `object_t::empty()` |
+| array      | result of function `array_t::empty()`  |
+
+## Exception safety
+
+No-throw guarantee: this function never throws exceptions.
+
+## Complexity
+
+Constant, as long as [`array_t`](array_t.md) and [`object_t`](object_t.md) satisfy the
+[Container](https://en.cppreference.com/w/cpp/named_req/Container) concept; that is, their `empty()` functions have
+constant complexity.
+
+## Possible implementation
+
+```cpp
+bool empty() const noexcept
+{
+    return size() == 0;
+}
+```
+
+## Notes
+
+This function does not return whether a string stored as JSON value is empty -- it returns whether the JSON container
+itself is empty which is `#!cpp false` in the case of a string.
+
+## Examples
+
+??? example
+
+    The following code uses `empty()` to check if a JSON object contains any elements.
+    
+    ```cpp
+    --8<-- "examples/empty.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/empty.output"
+    ```
+
+## Version history
+
+- Added in version 1.0.0.
+- Extended to return `#!cpp false` for binary types in version 3.8.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/end.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/end.md
similarity index 91%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/end.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/end.md
index 52bfec2e3..179ce9e67 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/end.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/end.md
@@ -1,4 +1,4 @@
-# basic_json::end
+# <small>nlohmann::basic_json::</small>end
 
 ```cpp
 iterator end() noexcept;
@@ -21,7 +21,7 @@ No-throw guarantee: this member function never throws exceptions.
 
 Constant.
 
-## Example
+## Examples
 
 ??? example
 
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/erase.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/erase.md
new file mode 100644
index 000000000..1187995b6
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/erase.md
@@ -0,0 +1,211 @@
+# <small>nlohmann::basic_json::</small>erase
+
+```cpp
+// (1)
+iterator erase(iterator pos);
+const_iterator erase(const_iterator pos);
+
+// (2)
+iterator erase(iterator first, iterator last);
+const_iterator erase(const_iterator first, const_iterator last);
+
+// (3)
+size_type erase(const typename object_t::key_type& key);
+
+// (4)
+template<typename KeyType>
+size_type erase(KeyType&& key);
+
+// (5)
+void erase(const size_type idx);
+```
+
+1. Removes an element from a JSON value specified by iterator `pos`. The iterator `pos` must be valid and
+   dereferenceable. Thus, the `end()` iterator (which is valid, but is not dereferenceable) cannot be used as a value for
+   `pos`.
+   
+    If called on a primitive type other than `#!json null`, the resulting JSON value will be `#!json null`.
+
+2. Remove an element range specified by `[first; last)` from a JSON value. The iterator `first` does not need to be
+   dereferenceable if `first == last`: erasing an empty range is a no-op.
+   
+    If called on a primitive type other than `#!json null`, the resulting JSON value will be `#!json null`.
+
+3. Removes an element from a JSON object by key.
+
+4. See 3. This overload is only available if `KeyType` is comparable with `#!cpp typename object_t::key_type` and
+   `#!cpp typename object_comparator_t::is_transparent` denotes a type.
+
+5. Removes an element from a JSON array by index.
+
+## Template parameters
+
+`KeyType`
+:   A type for an object key other than [`json_pointer`](../json_pointer/index.md) that is comparable with
+    [`string_t`](string_t.md) using  [`object_comparator_t`](object_comparator_t.md).
+    This can also be a string view (C++17).
+
+## Parameters
+
+`pos` (in)
+:   iterator to the element to remove
+
+`first` (in)
+:   iterator to the beginning of the range to remove
+
+`last` (in)
+:   iterator past the end of the range to remove
+
+`key` (in)
+:   object key of the elements to remove
+    
+`idx` (in)
+:   array index of the element to remove
+    
+## Return value
+
+1. Iterator following the last removed element. If the iterator `pos` refers to the last element, the `end()` iterator
+   is returned.
+2. Iterator following the last removed element. If the iterator `last` refers to the last element, the `end()` iterator
+   is returned.
+3. Number of elements removed. If `ObjectType` is the default `std::map` type, the return value will always be `0`
+   (`key` was not found) or `1` (`key` was found).
+4. See 3.
+5. (none)
+
+## Exception safety
+
+Strong exception safety: if an exception occurs, the original value stays intact.
+
+## Exceptions
+
+1. The function can throw the following exceptions:
+    - Throws [`type_error.307`](../../home/exceptions.md#jsonexceptiontype_error307) if called on a `null` value;
+      example: `"cannot use erase() with null"`
+    - Throws [`invalid_iterator.202`](../../home/exceptions.md#jsonexceptioninvalid_iterator202) if called on an
+      iterator which does not belong to the current JSON value; example: `"iterator does not fit current value"`
+    - Throws [`invalid_iterator.205`](../../home/exceptions.md#jsonexceptioninvalid_iterator205) if called on a
+      primitive type with invalid iterator (i.e., any iterator which is not `begin()`); example: `"iterator out of
+      range"`
+2. The function can throw the following exceptions:
+    - Throws [`type_error.307`](../../home/exceptions.md#jsonexceptiontype_error307) if called on a `null` value;
+      example: `"cannot use erase() with null"`
+    - Throws [`invalid_iterator.203`](../../home/exceptions.md#jsonexceptioninvalid_iterator203) if called on iterators
+      which does not belong to the current JSON value; example: `"iterators do not fit current value"`
+    - Throws [`invalid_iterator.204`](../../home/exceptions.md#jsonexceptioninvalid_iterator204) if called on a
+      primitive type with invalid iterators (i.e., if `first != begin()` and `last != end()`); example: `"iterators out
+      of range"`
+3. The function can throw the following exceptions:
+    - Throws [`type_error.307`](../../home/exceptions.md#jsonexceptiontype_error307) when called on a type other than
+      JSON object; example: `"cannot use erase() with null"`
+4. See 3.
+5. The function can throw the following exceptions:
+    - Throws [`type_error.307`](../../home/exceptions.md#jsonexceptiontype_error307) when called on a type other than
+      JSON object; example: `"cannot use erase() with null"`
+    - Throws [`out_of_range.401`](../../home/exceptions.md#jsonexceptionout_of_range401) when `idx >= size()`; example:
+      `"array index 17 is out of range"`
+
+## Complexity
+
+1. The complexity depends on the type:
+       - objects: amortized constant
+       - arrays: linear in distance between `pos` and the end of the container
+       - strings and binary: linear in the length of the member
+       - other types: constant
+2. The complexity depends on the type:
+       - objects: `log(size()) + std::distance(first, last)`
+       - arrays: linear in the distance between `first` and `last`, plus linear
+         in the distance between `last` and end of the container
+       - strings and binary: linear in the length of the member
+       - other types: constant
+3. `log(size()) + count(key)`
+4. `log(size()) + count(key)`
+5. Linear in distance between `idx` and the end of the container.
+
+## Notes
+
+1. Invalidates iterators and references at or after the point of the `erase`, including the `end()` iterator.
+2. (none)
+3. References and iterators to the erased elements are invalidated. Other references and iterators are not affected.
+4. See 3.
+5. (none)
+
+## Examples
+
+??? example "Example: (1) remove element given an iterator"
+
+    The example shows the effect of `erase()` for different JSON types using an iterator.
+    
+    ```cpp
+    --8<-- "examples/erase__IteratorType.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/erase__IteratorType.output"
+    ```
+
+??? example "Example: (2) remove elements given an iterator range"
+
+    The example shows the effect of `erase()` for different JSON types using an iterator range.
+    
+    ```cpp
+    --8<-- "examples/erase__IteratorType_IteratorType.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/erase__IteratorType_IteratorType.output"
+    ```
+
+??? example "Example: (3) remove element from a JSON object given a key"
+
+    The example shows the effect of `erase()` for different JSON types using an object key.
+    
+    ```cpp
+    --8<-- "examples/erase__object_t_key_type.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/erase__object_t_key_type.output"
+    ```
+
+??? example "Example: (4) remove element from a JSON object given a key using string_view"
+
+    The example shows the effect of `erase()` for different JSON types using an object key.
+    
+    ```cpp
+    --8<-- "examples/erase__keytype.c++17.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/erase__keytype.c++17.output"
+    ```
+
+??? example "Example: (5) remove element from a JSON array given an index"
+
+    The example shows the effect of `erase()` using an array index.
+    
+    ```cpp
+    --8<-- "examples/erase__size_type.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/erase__size_type.output"
+    ```
+
+## Version history
+
+1. Added in version 1.0.0. Added support for binary types in version 3.8.0.
+2. Added in version 1.0.0. Added support for binary types in version 3.8.0.
+3. Added in version 1.0.0.
+4. Added in version 3.11.0.
+5. Added in version 1.0.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/error_handler_t.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/error_handler_t.md
new file mode 100644
index 000000000..dc32ced9b
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/error_handler_t.md
@@ -0,0 +1,42 @@
+# <small>nlohmann::basic_json::</small>error_handler_t
+
+```cpp
+enum class error_handler_t {
+    strict,
+    replace,
+    ignore
+};
+```
+
+This enumeration is used in the [`dump`](dump.md) function to choose how to treat decoding errors while serializing a
+`basic_json` value. Three values are differentiated:
+
+strict
+:   throw a `type_error` exception in case of invalid UTF-8
+
+replace
+:   replace invalid UTF-8 sequences with U+FFFD (� REPLACEMENT CHARACTER)
+
+ignore
+:   ignore invalid UTF-8 sequences; all bytes are copied to the output unchanged
+
+## Examples
+
+??? example
+
+    The example below shows how the different values of the `error_handler_t` influence the behavior of
+    [`dump`](dump.md) when reading serializing an invalid UTF-8 sequence.
+
+    ```cpp
+    --8<-- "examples/error_handler_t.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/error_handler_t.output"
+    ```
+
+## Version history
+
+- Added in version 3.4.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/exception.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/exception.md
similarity index 82%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/exception.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/exception.md
index deedae5a6..794b7d1e2 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/exception.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/exception.md
@@ -1,4 +1,4 @@
-# basic_json::exception
+# <small>nlohmann::basic_json::</small>exception
 
 ```cpp
 class exception : public std::exception;
@@ -44,7 +44,13 @@ Subclasses:
 
 - **id** - the id of the exception
 
-## Example
+## Notes
+
+To have nothrow-copy-constructible exceptions, we internally use `std::runtime_error` which can cope with
+arbitrary-length error messages. Intermediate strings are built with static functions and then passed to the actual
+constructor.
+
+## Examples
 
 ??? example
 
@@ -60,6 +66,10 @@ Subclasses:
     --8<-- "examples/exception.output"
     ```
 
+## See also
+
+[List of exceptions](../../home/exceptions.md)
+
 ## Version history
 
 - Since version 3.0.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/find.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/find.md
new file mode 100644
index 000000000..c64350718
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/find.md
@@ -0,0 +1,86 @@
+# <small>nlohmann::basic_json::</small>find
+
+```cpp
+// (1)
+iterator find(const typename object_t::key_type& key);
+const_iterator find(const typename object_t::key_type& key) const;
+
+// (2)
+template<typename KeyType>
+iterator find(KeyType&& key);
+template<typename KeyType>
+const_iterator find(KeyType&& key) const;
+```
+
+1. Finds an element in a JSON object with a key equivalent to `key`. If the element is not found or the
+   JSON value is not an object, `end()` is returned.
+2. See 1. This overload is only available if `KeyType` is comparable with `#!cpp typename object_t::key_type` and
+   `#!cpp typename object_comparator_t::is_transparent` denotes a type.
+
+## Template parameters
+
+`KeyType`
+:   A type for an object key other than [`json_pointer`](../json_pointer/index.md) that is comparable with
+    [`string_t`](string_t.md) using  [`object_comparator_t`](object_comparator_t.md).
+    This can also be a string view (C++17).
+
+## Parameters
+
+`key` (in)
+:   key value of the element to search for.
+    
+## Return value
+
+Iterator to an element with a key equivalent to `key`. If no such element is found or the JSON value is not an object,
+a past-the-end iterator (see `end()`) is returned.
+
+## Exception safety
+
+Strong exception safety: if an exception occurs, the original value stays intact.
+
+## Complexity
+
+Logarithmic in the size of the JSON object.
+
+## Notes
+
+This method always returns `end()` when executed on a JSON type that is not an object.
+
+## Examples
+
+??? example "Example: (1) find object element by key"
+
+    The example shows how `find()` is used.
+    
+    ```cpp
+    --8<-- "examples/find__object_t_key_type.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/find__object_t_key_type.output"
+    ```
+
+??? example "Example: (2) find object element by key using string_view"
+
+    The example shows how `find()` is used.
+    
+    ```cpp
+    --8<-- "examples/find__keytype.c++17.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/find__keytype.c++17.output"
+    ```
+
+## See also
+
+- [contains](contains.md) checks whether a key exists
+
+## Version history
+
+1. Added in version 3.11.0.
+2. Added in version 1.0.0. Changed to support comparable types in version 3.11.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/flatten.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/flatten.md
similarity index 89%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/flatten.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/flatten.md
index 1408f3809..8703e86d1 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/flatten.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/flatten.md
@@ -1,4 +1,4 @@
-# basic_json::flatten
+# <small>nlohmann::basic_json::</small>flatten
 
 ```cpp
 basic_json flatten() const;
@@ -25,7 +25,7 @@ Linear in the size the JSON value.
 Empty objects and arrays are flattened to `#!json null` and will not be reconstructed correctly by the
 [`unflatten()`](unflatten.md) function.
 
-## Example
+## Examples
 
 ??? example
 
@@ -41,6 +41,10 @@ Empty objects and arrays are flattened to `#!json null` and will not be reconstr
     --8<-- "examples/flatten.output"
     ```
 
+## See also
+
+- [unflatten](unflatten.md) the reverse function
+
 ## Version history
 
 - Added in version 2.0.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/from_bjdata.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/from_bjdata.md
new file mode 100644
index 000000000..3c5eeb351
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/from_bjdata.md
@@ -0,0 +1,93 @@
+# <small>nlohmann::basic_json::</small>from_bjdata
+
+```cpp
+// (1)
+template<typename InputType>
+static basic_json from_bjdata(InputType&& i,
+                              const bool strict = true,
+                              const bool allow_exceptions = true);
+// (2)
+template<typename IteratorType>
+static basic_json from_bjdata(IteratorType first, IteratorType last,
+                              const bool strict = true,
+                              const bool allow_exceptions = true);
+```
+
+Deserializes a given input to a JSON value using the BJData (Binary JData) serialization format.
+
+1. Reads from a compatible input.
+2. Reads from an iterator range.
+
+The exact mapping and its limitations is described on a [dedicated page](../../features/binary_formats/bjdata.md).
+
+## Template parameters
+
+`InputType`
+:   A compatible input, for instance:
+
+    - an `std::istream` object
+    - a `FILE` pointer
+    - a C-style array of characters
+    - a pointer to a null-terminated string of single byte characters
+    - an object `obj` for which `begin(obj)` and `end(obj)` produces a valid pair of iterators.
+
+`IteratorType`
+:   a compatible iterator type
+
+## Parameters
+
+`i` (in)
+:   an input in BJData format convertible to an input adapter
+
+`first` (in)
+:   iterator to start of the input
+
+`last` (in)
+:   iterator to end of the input
+
+`strict` (in)
+:   whether to expect the input to be consumed until EOF (`#!cpp true` by default)
+
+`allow_exceptions` (in)
+:   whether to throw exceptions in case of a parse error (optional, `#!cpp true` by default)
+
+## Return value
+
+deserialized JSON value; in case of a parse error and `allow_exceptions` set to `#!cpp false`, the return value will be
+`value_t::discarded`. The latter can be checked with [`is_discarded`](is_discarded.md).
+
+## Exception safety
+
+Strong guarantee: if an exception is thrown, there are no changes in the JSON value.
+
+## Exceptions
+
+- Throws [parse_error.110](../../home/exceptions.md#jsonexceptionparse_error110) if the given input ends prematurely or
+  the end of file was not reached when `strict` was set to true
+- Throws [parse_error.112](../../home/exceptions.md#jsonexceptionparse_error112) if a parse error occurs
+- Throws [parse_error.113](../../home/exceptions.md#jsonexceptionparse_error113) if a string could not be parsed
+  successfully
+
+## Complexity
+
+Linear in the size of the input.
+
+## Examples
+
+??? example
+
+    The example shows the deserialization of a byte vector in BJData format to a JSON value.
+     
+    ```cpp
+    --8<-- "examples/from_bjdata.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/from_bjdata.output"
+    ```
+
+## Version history
+
+- Added in version 3.11.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/from_bson.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/from_bson.md
new file mode 100644
index 000000000..77549370c
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/from_bson.md
@@ -0,0 +1,110 @@
+# <small>nlohmann::basic_json::</small>from_bson
+
+```cpp
+// (1)
+template<typename InputType>
+static basic_json from_bson(InputType&& i,
+                            const bool strict = true,
+                            const bool allow_exceptions = true);
+// (2)
+template<typename IteratorType>
+static basic_json from_bson(IteratorType first, IteratorType last,
+                            const bool strict = true,
+                            const bool allow_exceptions = true);
+```
+
+Deserializes a given input to a JSON value using the BSON (Binary JSON) serialization format.
+
+1. Reads from a compatible input.
+2. Reads from an iterator range.
+
+The exact mapping and its limitations is described on a [dedicated page](../../features/binary_formats/bson.md).
+
+## Template parameters
+
+`InputType`
+:   A compatible input, for instance:
+    
+    - an `std::istream` object
+    - a `FILE` pointer
+    - a C-style array of characters
+    - a pointer to a null-terminated string of single byte characters
+    - an object `obj` for which `begin(obj)` and `end(obj)` produces a valid pair of iterators.
+
+`IteratorType`
+:   a compatible iterator type
+
+## Parameters
+
+`i` (in)
+:   an input in BSON format convertible to an input adapter
+
+`first` (in)
+:   iterator to start of the input
+
+`last` (in)
+:   iterator to end of the input
+
+`strict` (in)
+:   whether to expect the input to be consumed until EOF (`#!cpp true` by default)
+
+`allow_exceptions` (in)
+:   whether to throw exceptions in case of a parse error (optional, `#!cpp true` by default)
+
+## Return value
+
+deserialized JSON value; in case of a parse error and `allow_exceptions` set to `#!cpp false`, the return value will be
+`value_t::discarded`.  The latter can be checked with [`is_discarded`](is_discarded.md).
+
+## Exception safety
+
+Strong guarantee: if an exception is thrown, there are no changes in the JSON value.
+
+## Exceptions
+
+Throws [`parse_error.114`](../../home/exceptions.md#jsonexceptionparse_error114) if an unsupported BSON record type is
+encountered.
+
+## Complexity
+
+Linear in the size of the input.
+
+## Examples
+
+??? example
+
+    The example shows the deserialization of a byte vector in BSON format to a JSON value.
+     
+    ```cpp
+    --8<-- "examples/from_bson.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/from_bson.output"
+    ```
+
+## See also
+
+- [BSON specification](http://bsonspec.org/spec.html)
+- [to_bson](to_bson.md) for the analogous serialization
+- [from_cbor](from_cbor.md) for the related CBOR format
+- [from_msgpack](from_msgpack.md) for the related MessagePack format
+- [from_ubjson](from_ubjson.md) for the related UBJSON format
+
+## Version history
+
+- Added in version 3.4.0.
+
+!!! warning "Deprecation"
+
+    - Overload (2) replaces calls to `from_bson` with a pointer and a length as first two parameters, which has been
+      deprecated in version 3.8.0. This overload will be removed in version 4.0.0. Please replace all calls like
+      `#!cpp from_bson(ptr, len, ...);` with `#!cpp from_bson(ptr, ptr+len, ...);`.
+    - Overload (2) replaces calls to `from_bson` with a pair of iterators as their first parameter, which has been
+      deprecated in version 3.8.0. This overload will be removed in version 4.0.0. Please replace all calls like
+      `#!cpp from_bson({ptr, ptr+len}, ...);` with `#!cpp from_bson(ptr, ptr+len, ...);`.
+
+    You should be warned by your compiler with a `-Wdeprecated-declarations` warning if you are using a deprecated
+    function.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/from_cbor.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/from_cbor.md
new file mode 100644
index 000000000..3aa57b9ec
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/from_cbor.md
@@ -0,0 +1,117 @@
+# <small>nlohmann::basic_json::</small>from_cbor
+
+```cpp
+// (1)
+template<typename InputType>
+static basic_json from_cbor(InputType&& i,
+                            const bool strict = true,
+                            const bool allow_exceptions = true,
+                            const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error);
+
+// (2)
+template<typename IteratorType>
+static basic_json from_cbor(IteratorType first, IteratorType last,
+                            const bool strict = true,
+                            const bool allow_exceptions = true,
+                            const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error);
+```
+
+Deserializes a given input to a JSON value using the CBOR (Concise Binary Object Representation) serialization format.
+
+1. Reads from a compatible input.
+2. Reads from an iterator range.
+
+The exact mapping and its limitations is described on a [dedicated page](../../features/binary_formats/cbor.md).
+
+## Template parameters
+
+`InputType`
+:   A compatible input, for instance:
+    
+    - an `std::istream` object
+    - a `FILE` pointer
+    - a C-style array of characters
+    - a pointer to a null-terminated string of single byte characters
+    - an object `obj` for which `begin(obj)` and `end(obj)` produces a valid pair of iterators.
+
+`IteratorType`
+:   a compatible iterator type
+
+## Parameters
+
+`i` (in)
+:   an input in CBOR format convertible to an input adapter
+
+`first` (in)
+:   iterator to start of the input
+
+`last` (in)
+:   iterator to end of the input
+
+`strict` (in)
+:   whether to expect the input to be consumed until EOF (`#!cpp true` by default)
+
+`allow_exceptions` (in)
+:   whether to throw exceptions in case of a parse error (optional, `#!cpp true` by default)
+
+`tag_handler` (in)
+:   how to treat CBOR tags (optional, `error` by default); see [`cbor_tag_handler_t`](cbor_tag_handler_t.md) for more
+    information
+
+## Return value
+
+deserialized JSON value; in case of a parse error and `allow_exceptions` set to `#!cpp false`, the return value will be
+`value_t::discarded`.  The latter can be checked with [`is_discarded`](is_discarded.md).
+
+## Exception safety
+
+Strong guarantee: if an exception is thrown, there are no changes in the JSON value.
+
+## Exceptions
+ 
+- Throws [parse_error.110](../../home/exceptions.md#jsonexceptionparse_error110) if the given input ends prematurely or
+  the end of file was not reached when `strict` was set to true
+- Throws [parse_error.112](../../home/exceptions.md#jsonexceptionparse_error112) if unsupported features from CBOR were
+  used in the given input or if the input is not valid CBOR
+- Throws [parse_error.113](../../home/exceptions.md#jsonexceptionparse_error113) if a string was expected as map key,
+  but not found
+
+## Complexity
+
+Linear in the size of the input.
+
+## Examples
+
+??? example
+
+    The example shows the deserialization of a byte vector in CBOR format to a JSON value.
+     
+    ```cpp
+    --8<-- "examples/from_cbor.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/from_cbor.output"
+    ```
+
+## Version history
+
+- Added in version 2.0.9.
+- Parameter `start_index` since version 2.1.1.
+- Changed to consume input adapters, removed `start_index` parameter, and added `strict` parameter in version 3.0.0.
+- Added `allow_exceptions` parameter in version 3.2.0.
+- Added `tag_handler` parameter in version 3.9.0.
+
+!!! warning "Deprecation"
+
+    - Overload (2) replaces calls to `from_cbor` with a pointer and a length as first two parameters, which has been
+      deprecated in version 3.8.0. This overload will be removed in version 4.0.0. Please replace all calls like
+      `#!cpp from_cbor(ptr, len, ...);` with `#!cpp from_cbor(ptr, ptr+len, ...);`.
+    - Overload (2) replaces calls to `from_cbor` with a pair of iterators as their first parameter, which has been
+      deprecated in version 3.8.0. This overload will be removed in version 4.0.0. Please replace all calls like
+      `#!cpp from_cbor({ptr, ptr+len}, ...);` with `#!cpp from_cbor(ptr, ptr+len, ...);`.
+
+    You should be warned by your compiler with a `-Wdeprecated-declarations` warning if you are using a deprecated
+    function.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/from_msgpack.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/from_msgpack.md
new file mode 100644
index 000000000..117c3865f
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/from_msgpack.md
@@ -0,0 +1,109 @@
+# <small>nlohmann::basic_json::</small>from_msgpack
+
+```cpp
+// (1)
+template<typename InputType>
+static basic_json from_msgpack(InputType&& i,
+                               const bool strict = true,
+                               const bool allow_exceptions = true);
+// (2)
+template<typename IteratorType>
+static basic_json from_msgpack(IteratorType first, IteratorType last,
+                               const bool strict = true,
+                               const bool allow_exceptions = true);
+```
+
+Deserializes a given input to a JSON value using the MessagePack serialization format.
+
+1. Reads from a compatible input.
+2. Reads from an iterator range.
+
+The exact mapping and its limitations is described on a [dedicated page](../../features/binary_formats/messagepack.md).
+
+## Template parameters
+
+`InputType`
+:   A compatible input, for instance:
+    
+    - an `std::istream` object
+    - a `FILE` pointer
+    - a C-style array of characters
+    - a pointer to a null-terminated string of single byte characters
+    - an object `obj` for which `begin(obj)` and `end(obj)` produces a valid pair of iterators.
+
+`IteratorType`
+:   a compatible iterator type
+
+## Parameters
+
+`i` (in)
+:   an input in MessagePack format convertible to an input adapter
+
+`first` (in)
+:   iterator to start of the input
+
+`last` (in)
+:   iterator to end of the input
+
+`strict` (in)
+:   whether to expect the input to be consumed until EOF (`#!cpp true` by default)
+
+`allow_exceptions` (in)
+:   whether to throw exceptions in case of a parse error (optional, `#!cpp true` by default)
+
+## Return value
+
+deserialized JSON value; in case of a parse error and `allow_exceptions` set to `#!cpp false`, the return value will be
+`value_t::discarded`.  The latter can be checked with [`is_discarded`](is_discarded.md).
+
+## Exception safety
+
+Strong guarantee: if an exception is thrown, there are no changes in the JSON value.
+
+## Exceptions
+
+- Throws [parse_error.110](../../home/exceptions.md#jsonexceptionparse_error110) if the given input ends prematurely or
+  the end of  file was not reached when `strict` was set to true
+- Throws [parse_error.112](../../home/exceptions.md#jsonexceptionparse_error112) if unsupported features from
+  MessagePack were used in the given input or if the input is not valid MessagePack
+- Throws [parse_error.113](../../home/exceptions.md#jsonexceptionparse_error113) if a string was expected as map key,
+  but not found
+
+## Complexity
+
+Linear in the size of the input.
+
+## Examples
+
+??? example
+
+    The example shows the deserialization of a byte vector in MessagePack format to a JSON value.
+     
+    ```cpp
+    --8<-- "examples/from_msgpack.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/from_msgpack.output"
+    ```
+
+## Version history
+
+- Added in version 2.0.9.
+- Parameter `start_index` since version 2.1.1.
+- Changed to consume input adapters, removed `start_index` parameter, and added `strict` parameter in version 3.0.0.
+- Added `allow_exceptions` parameter in version 3.2.0.
+
+!!! warning "Deprecation"
+
+    - Overload (2) replaces calls to `from_msgpack` with a pointer and a length as first two parameters, which has been
+      deprecated in version 3.8.0. This overload will be removed in version 4.0.0. Please replace all calls like
+      `#!cpp from_msgpack(ptr, len, ...);` with `#!cpp from_msgpack(ptr, ptr+len, ...);`.
+    - Overload (2) replaces calls to `from_cbor` with a pair of iterators as their first parameter, which has been
+      deprecated in version 3.8.0. This overload will be removed in version 4.0.0. Please replace all calls like
+      `#!cpp from_msgpack({ptr, ptr+len}, ...);` with `#!cpp from_msgpack(ptr, ptr+len, ...);`.
+
+    You should be warned by your compiler with a `-Wdeprecated-declarations` warning if you are using a deprecated
+    function.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/from_ubjson.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/from_ubjson.md
new file mode 100644
index 000000000..08117e89b
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/from_ubjson.md
@@ -0,0 +1,106 @@
+# <small>nlohmann::basic_json::</small>from_ubjson
+
+```cpp
+// (1)
+template<typename InputType>
+static basic_json from_ubjson(InputType&& i,
+                              const bool strict = true,
+                              const bool allow_exceptions = true);
+// (2)
+template<typename IteratorType>
+static basic_json from_ubjson(IteratorType first, IteratorType last,
+                              const bool strict = true,
+                              const bool allow_exceptions = true);
+```
+
+Deserializes a given input to a JSON value using the UBJSON (Universal Binary JSON) serialization format.
+
+1. Reads from a compatible input.
+2. Reads from an iterator range.
+
+The exact mapping and its limitations is described on a [dedicated page](../../features/binary_formats/ubjson.md).
+
+## Template parameters
+
+`InputType`
+:   A compatible input, for instance:
+    
+    - an `std::istream` object
+    - a `FILE` pointer
+    - a C-style array of characters
+    - a pointer to a null-terminated string of single byte characters
+    - an object `obj` for which `begin(obj)` and `end(obj)` produces a valid pair of iterators.
+
+`IteratorType`
+:   a compatible iterator type
+
+## Parameters
+
+`i` (in)
+:   an input in UBJSON format convertible to an input adapter
+
+`first` (in)
+:   iterator to start of the input
+
+`last` (in)
+:   iterator to end of the input
+
+`strict` (in)
+:   whether to expect the input to be consumed until EOF (`#!cpp true` by default)
+
+`allow_exceptions` (in)
+:   whether to throw exceptions in case of a parse error (optional, `#!cpp true` by default)
+
+## Return value
+
+deserialized JSON value; in case of a parse error and `allow_exceptions` set to `#!cpp false`, the return value will be
+`value_t::discarded`. The latter can be checked with [`is_discarded`](is_discarded.md).
+
+## Exception safety
+
+Strong guarantee: if an exception is thrown, there are no changes in the JSON value.
+
+## Exceptions
+
+- Throws [parse_error.110](../../home/exceptions.md#jsonexceptionparse_error110) if the given input ends prematurely or
+  the end of file was not reached when `strict` was set to true
+- Throws [parse_error.112](../../home/exceptions.md#jsonexceptionparse_error112) if a parse error occurs
+- Throws [parse_error.113](../../home/exceptions.md#jsonexceptionparse_error113) if a string could not be parsed 
+  successfully
+
+## Complexity
+
+Linear in the size of the input.
+
+## Examples
+
+??? example
+
+    The example shows the deserialization of a byte vector in UBJSON format to a JSON value.
+     
+    ```cpp
+    --8<-- "examples/from_ubjson.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/from_ubjson.output"
+    ```
+
+## Version history
+
+- Added in version 3.1.0.
+- Added `allow_exceptions` parameter in version 3.2.0.
+
+!!! warning "Deprecation"
+
+    - Overload (2) replaces calls to `from_ubjson` with a pointer and a length as first two parameters, which has been
+      deprecated in version 3.8.0. This overload will be removed in version 4.0.0. Please replace all calls like
+      `#!cpp from_ubjson(ptr, len, ...);` with `#!cpp from_ubjson(ptr, ptr+len, ...);`.
+    - Overload (2) replaces calls to `from_ubjson` with a pair of iterators as their first parameter, which has been
+      deprecated in version 3.8.0. This overload will be removed in version 4.0.0. Please replace all calls like
+      `#!cpp from_ubjson({ptr, ptr+len}, ...);` with `#!cpp from_ubjson(ptr, ptr+len, ...);`.
+
+    You should be warned by your compiler with a `-Wdeprecated-declarations` warning if you are using a deprecated
+    function.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/front.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/front.md
similarity index 79%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/front.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/front.md
index 55010fb85..e258c36a0 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/front.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/front.md
@@ -1,4 +1,4 @@
-# basic_json::front
+# <small>nlohmann::basic_json::</small>front
 
 ```cpp
 reference front();
@@ -13,26 +13,26 @@ Returns a reference to the first element in the container. For a JSON container
 In case of a structured type (array or object), a reference to the first element is returned. In case of number, string,
 boolean, or binary values, a reference to the value is returned.
 
+## Exception safety
+
+Strong guarantee: if an exception is thrown, there are no changes in the JSON value.
+
 ## Exceptions
 
 If the JSON value is `#!json null`, exception
 [`invalid_iterator.214`](../../home/exceptions.md#jsonexceptioninvalid_iterator214) is thrown.
 
-## Exception safety
-
-Strong guarantee: if an exception is thrown, there are no changes in the JSON value.
-
 ## Complexity
 
 Constant.
 
-## Note
+## Notes
 
-!!! danger
+!!! info "Precondition"
 
-    Calling `front` on an empty array or object is undefined behavior and is **guarded by an assertion**!
+    The array or object must not be empty. Calling `front` on an empty array or object yields undefined behavior.
 
-## Example
+## Examples
 
 ??? example
 
@@ -48,6 +48,10 @@ Constant.
     --8<-- "examples/front.output"
     ```
 
+## See also
+
+- [back](back.md) to access the last element
+
 ## Version history
 
 - Added in version 1.0.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/get.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/get.md
similarity index 96%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/get.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/get.md
index 6cd663056..96fc221da 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/get.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/get.md
@@ -1,4 +1,4 @@
-# basic_json::get
+# <small>nlohmann::basic_json::</small>get
 
 ```cpp
 // (1)
@@ -31,7 +31,7 @@ constexpr const PointerType get_ptr() const noexcept;
     return ret;
     ```
 
-    This overloads is chosen if:
+    This overload is chosen if:
     
     - `ValueType` is not `basic_json`,
     - `json_serializer<ValueType>` has a `from_json()` method of the form
@@ -48,7 +48,7 @@ constexpr const PointerType get_ptr() const noexcept;
     return JSONSerializer<ValueTypeCV>::from_json(*this);
     ``` 
    
-    This overloads is chosen if:
+    This overload is chosen if:
     
     - `ValueType` is not `basic_json` and
     - `json_serializer<ValueType>` has a `from_json()` method of the form
@@ -90,11 +90,11 @@ Depends on what `json_serializer<ValueType>` `from_json()` method throws
 
 ## Notes
 
-!!! warning
+!!! danger "Undefined behavior"
 
     Writing data to the pointee (overload 3) of the result yields an undefined state.
 
-## Example
+## Examples
 
 ??? example
 
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/get_allocator.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/get_allocator.md
new file mode 100644
index 000000000..07a4d8456
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/get_allocator.md
@@ -0,0 +1,31 @@
+# <small>nlohmann::basic_json::</small>get_allocator
+
+```cpp
+static allocator_type get_allocator();
+```
+
+Returns the allocator associated with the container.
+    
+## Return value
+
+associated allocator
+
+## Examples
+
+??? example
+
+    The example shows how `get_allocator()` is used to created `json` values.
+    
+    ```cpp
+    --8<-- "examples/get_allocator.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/get_allocator.output"
+    ```
+
+## Version history
+
+- Added in version 1.0.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/get_binary.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/get_binary.md
new file mode 100644
index 000000000..a910f3aa5
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/get_binary.md
@@ -0,0 +1,45 @@
+# <small>nlohmann::basic_json::</small>get_binary
+
+```cpp
+binary_t& get_binary();
+
+const binary_t& get_binary() const;
+```
+
+Returns a reference to the stored binary value.
+
+## Return value
+
+Reference to binary value.
+
+## Exception safety
+
+Strong exception safety: if an exception occurs, the original value stays intact.
+
+## Exceptions
+
+Throws [`type_error.302`](../../home/exceptions.md#jsonexceptiontype_error302) if the value is not binary
+
+## Complexity
+
+Constant.
+
+## Examples
+
+??? example
+
+    The following code shows how to query a binary value.
+     
+    ```cpp
+    --8<-- "examples/get_binary.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/get_binary.output"
+    ```
+
+## Version history
+
+- Added in version 3.8.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/get_ptr.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/get_ptr.md
similarity index 86%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/get_ptr.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/get_ptr.md
index c5cee307a..2441e1156 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/get_ptr.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/get_ptr.md
@@ -1,8 +1,8 @@
-# basic_json::get_ptr
+# <small>nlohmann::basic_json::</small>get_ptr
 
 ```cpp
 template<typename PointerType>
-PointerType get_ptr();
+PointerType get_ptr() noexcept;
 
 template<typename PointerType>
 constexpr const PointerType get_ptr() const noexcept;
@@ -10,7 +10,7 @@ constexpr const PointerType get_ptr() const noexcept;
 
 Implicit pointer access to the internally stored JSON value. No copies are made.
 
-## Template arguments
+## Template parameters
 
 `PointerType`
 :   pointer type; must be a pointer to [`array_t`](array_t.md), [`object_t`](object_t.md), [`string_t`](string_t.md),
@@ -25,7 +25,7 @@ otherwise
 
 ## Exception safety
 
-Strong exception safety: if an exception occurs, the original value stays intact.
+No-throw guarantee: this function never throws exceptions.
 
 ## Complexity
 
@@ -33,11 +33,11 @@ Constant.
 
 ## Notes
 
-!!! warning
+!!! danger "Undefined behavior"
 
     Writing data to the pointee of the result yields an undefined state.
 
-## Example
+## Examples
 
 ??? example
 
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/get_ref.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/get_ref.md
similarity index 91%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/get_ref.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/get_ref.md
index 102aff1ef..b1219742c 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/get_ref.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/get_ref.md
@@ -1,4 +1,4 @@
-# basic_json::get_ref
+# <small>nlohmann::basic_json::</small>get_ref
 
 ```cpp
 template<typename ReferenceType>
@@ -10,13 +10,13 @@ const ReferenceType get_ref() const;
 
 Implicit reference access to the internally stored JSON value. No copies are made.
 
-## Template arguments
+## Template parameters
 
 `ReferenceType`
 :   reference type; must be a reference to [`array_t`](array_t.md), [`object_t`](object_t.md),
     [`string_t`](string_t.md), [`boolean_t`](boolean_t.md), [`number_integer_t`](number_integer_t.md), or
     [`number_unsigned_t`](number_unsigned_t.md), [`number_float_t`](number_float_t.md), or [`binary_t`](binary_t.md).
-    Enforced by static assertion.
+    Enforced by a static assertion.
 
 ## Return value
 
@@ -38,11 +38,11 @@ Constant.
 
 ## Notes
 
-!!! warning
+!!! danger "Undefined behavior"
 
     Writing data to the referee of the result yields an undefined state.
 
-## Example
+## Examples
 
 ??? example
 
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/get_to.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/get_to.md
similarity index 90%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/get_to.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/get_to.md
index 4a4395bc8..6af6d212c 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/get_to.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/get_to.md
@@ -1,10 +1,10 @@
-# basic_json::get_to
+# <small>nlohmann::basic_json::</small>get_to
 
 ```cpp
 template<typename ValueType>
 ValueType& get_to(ValueType& v) const noexcept(
     noexcept(JSONSerializer<ValueType>::from_json(
-        std::declval<const basic_json_t&>(), v)))
+        std::declval<const basic_json_t&>(), v)));
 ```
 
 Explicit type conversion between the JSON value and a compatible value. The value is filled into the input parameter by
@@ -16,7 +16,7 @@ ValueType v;
 JSONSerializer<ValueType>::from_json(*this, v);
 ```
 
-This overloads is chosen if:
+This overload is chosen if:
 
 - `ValueType` is not `basic_json`,
 - `json_serializer<ValueType>` has a `from_json()` method of the form `void from_json(const basic_json&, ValueType&)`
@@ -34,7 +34,7 @@ the input parameter, allowing chaining calls
 
 Depends on what `json_serializer<ValueType>` `from_json()` method throws
 
-## Example
+## Examples
 
 ??? example
 
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/index.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/index.md
new file mode 100644
index 000000000..648670144
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/index.md
@@ -0,0 +1,323 @@
+# <small>nlohmann::</small>basic_json
+
+<small>Defined in header `<nlohmann/json.hpp>`</small>
+
+```cpp
+template<
+    template<typename U, typename V, typename... Args> class ObjectType = std::map,
+    template<typename U, typename... Args> class ArrayType = std::vector,
+    class StringType = std::string,
+    class BooleanType = bool,
+    class NumberIntegerType = std::int64_t,
+    class NumberUnsignedType = std::uint64_t,
+    class NumberFloatType = double,
+    template<typename U> class AllocatorType = std::allocator,
+    template<typename T, typename SFINAE = void> class JSONSerializer = adl_serializer,
+    class BinaryType = std::vector<std::uint8_t>,
+    class CustomBaseClass = void
+>
+class basic_json;
+```
+
+## Template parameters
+
+| Template parameter   | Description                                                               | Derived type                                |
+|----------------------|---------------------------------------------------------------------------|---------------------------------------------|
+| `ObjectType`         | type for JSON objects                                                     | [`object_t`](object_t.md)                   |
+| `ArrayType`          | type for JSON arrays                                                      | [`array_t`](array_t.md)                     |
+| `StringType`         | type for JSON strings and object keys                                     | [`string_t`](string_t.md)                   |
+| `BooleanType`        | type for JSON booleans                                                    | [`boolean_t`](boolean_t.md)                 |
+| `NumberIntegerType`  | type for JSON integer numbers                                             | [`number_integer_t`](number_integer_t.md)   |
+| `NumberUnsignedType` | type for JSON unsigned integer numbers                                    | [`number_unsigned_t`](number_unsigned_t.md) |
+| `NumberFloatType`    | type for JSON floating-point numbers                                      | [`number_float_t`](number_float_t.md)       |
+| `AllocatorType`      | type of the allocator to use                                              |                                             |
+| `JSONSerializer`     | the serializer to resolve internal calls to `to_json()` and `from_json()` | [`json_serializer`](json_serializer.md)     |
+| `BinaryType`         | type for binary arrays                                                    | [`binary_t`](binary_t.md)                   |
+| `CustomBaseClass`    | extension point for user code                                             | [`json_base_class_t`](json_base_class_t.md) |
+
+## Specializations
+
+- [**json**](../json.md) - default specialization
+- [**ordered_json**](../ordered_json.md) - specialization that maintains the insertion order of object keys
+
+## Iterator invalidation
+
+Todo
+
+## Requirements
+
+The class satisfies the following concept requirements:
+
+### Basic
+
+- [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible): JSON values can be default
+  constructed. The result will be a JSON null value.
+- [MoveConstructible](https://en.cppreference.com/w/cpp/named_req/MoveConstructible): A JSON value can be constructed
+  from an rvalue argument.
+- [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible): A JSON value can be
+  copy-constructed from an lvalue expression.
+- [MoveAssignable](https://en.cppreference.com/w/cpp/named_req/MoveAssignable): A JSON value can be assigned from an
+  rvalue argument.
+- [CopyAssignable](https://en.cppreference.com/w/cpp/named_req/CopyAssignable): A JSON value can be copy-assigned from
+  an lvalue expression.
+- [Destructible](https://en.cppreference.com/w/cpp/named_req/Destructible): JSON values can be destructed.
+
+### Layout
+
+- [StandardLayoutType](https://en.cppreference.com/w/cpp/named_req/StandardLayoutType): JSON values have
+  [standard layout](https://en.cppreference.com/w/cpp/language/data_members#Standard_layout): All non-static data
+  members are private and standard layout types, the class has no virtual functions or (virtual) base classes.
+
+### Library-wide
+
+- [EqualityComparable](https://en.cppreference.com/w/cpp/named_req/EqualityComparable): JSON values can be compared with
+  `==`, see [`operator==`](operator_eq.md).
+- [LessThanComparable](https://en.cppreference.com/w/cpp/named_req/LessThanComparable): JSON values can be compared with
+  `<`, see [`operator<`](operator_le.md).
+- [Swappable](https://en.cppreference.com/w/cpp/named_req/Swappable): Any JSON lvalue or rvalue of can be swapped with
+  any lvalue or rvalue of other compatible types, using unqualified function `swap`.
+- [NullablePointer](https://en.cppreference.com/w/cpp/named_req/NullablePointer): JSON values can be compared against
+  `std::nullptr_t` objects which are used to model the `null` value.
+
+### Container
+
+- [Container](https://en.cppreference.com/w/cpp/named_req/Container): JSON values can be used like STL containers and
+  provide iterator access.
+- [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer): JSON values can be used like
+  STL containers and provide reverse iterator access.
+
+## Member types
+
+- [**adl_serializer**](../adl_serializer/index.md) - the default serializer
+- [**value_t**](value_t.md) - the JSON type enumeration
+- [**json_pointer**](../json_pointer/index.md) - JSON Pointer implementation
+- [**json_serializer**](json_serializer.md) - type of the serializer to for conversions from/to JSON
+- [**error_handler_t**](error_handler_t.md) - type to choose behavior on decoding errors
+- [**cbor_tag_handler_t**](cbor_tag_handler_t.md) - type to choose how to handle CBOR tags
+- **initializer_list_t** - type for initializer lists of `basic_json` values
+- [**input_format_t**](input_format_t.md) - type to choose the format to parse
+- [**json_sax_t**](../json_sax/index.md) - type for SAX events
+
+### Exceptions
+
+- [**exception**](exception.md) - general exception of the `basic_json` class
+    - [**parse_error**](parse_error.md) - exception indicating a parse error
+    - [**invalid_iterator**](invalid_iterator.md) - exception indicating errors with iterators
+    - [**type_error**](type_error.md) - exception indicating executing a member function with a wrong type
+    - [**out_of_range**](out_of_range.md) - exception indicating access out of the defined range
+    - [**other_error**](other_error.md) - exception indicating other library errors
+
+### Container types
+
+| Type                     | Definition                                                                                                |
+|--------------------------|-----------------------------------------------------------------------------------------------------------|
+| `value_type`             | `#!cpp basic_json`                                                                                        |
+| `reference`              | `#!cpp value_type&`                                                                                       |
+| `const_reference`        | `#!cpp const value_type&`                                                                                 |
+| `difference_type`        | `#!cpp std::ptrdiff_t`                                                                                    |
+| `size_type`              | `#!cpp std::size_t`                                                                                       |
+| `allocator_type`         | `#!cpp AllocatorType<basic_json>`                                                                         |
+| `pointer`                | `#!cpp std::allocator_traits<allocator_type>::pointer`                                                    |
+| `const_pointer`          | `#!cpp std::allocator_traits<allocator_type>::const_pointer`                                              |
+| `iterator`               | [LegacyBidirectionalIterator](https://en.cppreference.com/w/cpp/named_req/BidirectionalIterator)          |
+| `const_iterator`         | constant [LegacyBidirectionalIterator](https://en.cppreference.com/w/cpp/named_req/BidirectionalIterator) |
+| `reverse_iterator`       | reverse iterator, derived from `iterator`                                                                 |
+| `const_reverse_iterator` | reverse iterator, derived from `const_iterator`                                                           |
+| `iteration_proxy`        | helper type for [`items`](items.md) function                                                              |
+
+### JSON value data types
+
+- [**array_t**](array_t.md) - type for arrays
+- [**binary_t**](binary_t.md) - type for binary arrays
+- [**boolean_t**](boolean_t.md) - type for booleans
+- [**default_object_comparator_t**](default_object_comparator_t.md) - default comparator for objects
+- [**number_float_t**](number_float_t.md) - type for numbers (floating-point)
+- [**number_integer_t**](number_integer_t.md) - type for numbers (integer)
+- [**number_unsigned_t**](number_unsigned_t.md) - type for numbers (unsigned)
+- [**object_comparator_t**](object_comparator_t.md) - comparator for objects
+- [**object_t**](object_t.md) - type for objects
+- [**string_t**](string_t.md) - type for strings
+
+### Parser callback
+
+- [**parse_event_t**](parse_event_t.md) - parser event types
+- [**parser_callback_t**](parser_callback_t.md) - per-element parser callback type
+
+## Member functions
+
+- [(constructor)](basic_json.md)
+- [(destructor)](~basic_json.md)
+- [**operator=**](operator=.md) - copy assignment
+- [**array**](array_t.md) (_static_) - explicitly create an array
+- [**binary**](binary.md) (_static_) - explicitly create a binary array
+- [**object**](object_t.md) (_static_) - explicitly create an object
+
+### Object inspection
+
+Functions to inspect the type of a JSON value.
+
+- [**type**](type.md) - return the type of the JSON value
+- [**operator value_t**](operator_value_t.md) - return the type of the JSON value
+- [**type_name**](type_name.md) - return the type as string
+- [**is_primitive**](is_primitive.md) - return whether type is primitive
+- [**is_structured**](is_structured.md) - return whether type is structured
+- [**is_null**](is_null.md) - return whether value is null
+- [**is_boolean**](is_boolean.md) - return whether value is a boolean
+- [**is_number**](is_number.md) - return whether value is a number
+- [**is_number_integer**](is_number_integer.md) - return whether value is an integer number
+- [**is_number_unsigned**](is_number_unsigned.md) - return whether value is an unsigned integer number
+- [**is_number_float**](is_number_float.md) - return whether value is a floating-point number
+- [**is_object**](is_object.md) - return whether value is an object
+- [**is_array**](is_array.md) - return whether value is an array
+- [**is_string**](is_string.md) - return whether value is a string
+- [**is_binary**](is_binary.md) - return whether value is a binary array
+- [**is_discarded**](is_discarded.md) - return whether value is discarded
+
+### Value access
+
+Direct access to the stored value of a JSON value.
+
+- [**get**](get.md) - get a value
+- [**get_to**](get_to.md) - get a value and write it to a destination
+- [**get_ptr**](get_ptr.md) - get a pointer value
+- [**get_ref**](get_ref.md) - get a reference value
+- [**operator ValueType**](operator_ValueType.md) - get a value
+- [**get_binary**](get_binary.md) - get a binary value
+
+### Element access
+
+Access to the JSON value
+
+- [**at**](at.md) - access specified element with bounds checking
+- [**operator[]**](operator[].md) - access specified element
+- [**value**](value.md) - access specified object element with default value
+- [**front**](front.md) - access the first element
+- [**back**](back.md) - access the last element
+
+### Lookup
+
+- [**find**](find.md) - find an element in a JSON object
+- [**count**](count.md) - returns the number of occurrences of a key in a JSON object
+- [**contains**](contains.md) - check the existence of an element in a JSON object
+
+### Iterators
+
+- [**begin**](begin.md) - returns an iterator to the first element
+- [**cbegin**](cbegin.md) - returns a const iterator to the first element
+- [**end**](end.md) - returns an iterator to one past the last element
+- [**cend**](cend.md) - returns a const iterator to one past the last element
+- [**rbegin**](rbegin.md) - returns an iterator to the reverse-beginning
+- [**rend**](rend.md) - returns an iterator to the reverse-end
+- [**crbegin**](crbegin.md) - returns a const iterator to the reverse-beginning
+- [**crend**](crend.md) - returns a const iterator to the reverse-end
+- [**items**](items.md) - wrapper to access iterator member functions in range-based for
+
+### Capacity
+
+- [**empty**](empty.md) - checks whether the container is empty
+- [**size**](size.md) - returns the number of elements
+- [**max_size**](max_size.md) - returns the maximum possible number of elements
+
+### Modifiers
+
+- [**clear**](clear.md) - clears the contents
+- [**push_back**](push_back.md) - add a value to an array/object
+- [**operator+=**](operator+=.md) - add a value to an array/object
+- [**emplace_back**](emplace_back.md) - add a value to an array
+- [**emplace**](emplace.md) - add a value to an object if key does not exist
+- [**erase**](erase.md) - remove elements
+- [**insert**](insert.md) - inserts elements
+- [**update**](update.md) - updates a JSON object from another object, overwriting existing keys 
+- [**swap**](swap.md) - exchanges the values
+
+### Lexicographical comparison operators
+
+- [**operator==**](operator_eq.md) - comparison: equal
+- [**operator!=**](operator_ne.md) - comparison: not equal
+- [**operator<**](operator_lt.md) - comparison: less than
+- [**operator>**](operator_gt.md) - comparison: greater than
+- [**operator<=**](operator_le.md) - comparison: less than or equal
+- [**operator>=**](operator_ge.md) - comparison: greater than or equal
+- [**operator<=>**](operator_spaceship.md) - comparison: 3-way
+
+### Serialization / Dumping
+
+- [**dump**](dump.md) - serialization
+
+### Deserialization / Parsing
+
+- [**parse**](parse.md) (_static_) - deserialize from a compatible input
+- [**accept**](accept.md) (_static_) - check if the input is valid JSON
+- [**sax_parse**](sax_parse.md) (_static_) - generate SAX events
+
+### JSON Pointer functions
+
+- [**flatten**](flatten.md) - return flattened JSON value
+- [**unflatten**](unflatten.md) - unflatten a previously flattened JSON value
+
+### JSON Patch functions
+
+- [**patch**](patch.md) - applies a JSON patch
+- [**patch_inplace**](patch_inplace.md) - applies a JSON patch in place
+- [**diff**](diff.md) (_static_) - creates a diff as a JSON patch
+
+### JSON Merge Patch functions
+
+- [**merge_patch**](merge_patch.md) - applies a JSON Merge Patch
+
+## Static functions
+
+- [**meta**](meta.md) - returns version information on the library
+- [**get_allocator**](get_allocator.md) - returns the allocator associated with the container
+
+### Binary formats
+
+- [**from_bjdata**](from_bjdata.md) (_static_) - create a JSON value from an input in BJData format
+- [**from_bson**](from_bson.md) (_static_) - create a JSON value from an input in BSON format
+- [**from_cbor**](from_cbor.md) (_static_) - create a JSON value from an input in CBOR format
+- [**from_msgpack**](from_msgpack.md) (_static_) - create a JSON value from an input in MessagePack format
+- [**from_ubjson**](from_ubjson.md) (_static_) - create a JSON value from an input in UBJSON format
+- [**to_bjdata**](to_bjdata.md) (_static_) - create a BJData serialization of a given JSON value
+- [**to_bson**](to_bson.md) (_static_) - create a BSON serialization of a given JSON value
+- [**to_cbor**](to_cbor.md) (_static_) - create a CBOR serialization of a given JSON value
+- [**to_msgpack**](to_msgpack.md) (_static_) - create a MessagePack serialization of a given JSON value
+- [**to_ubjson**](to_ubjson.md) (_static_) - create a UBJSON serialization of a given JSON value
+
+## Non-member functions
+
+- [**operator<<(std::ostream&)**](../operator_ltlt.md) - serialize to stream
+- [**operator>>(std::istream&)**](../operator_gtgt.md) - deserialize from stream
+- [**to_string**](to_string.md) - user-defined `to_string` function for JSON values
+
+## Literals
+
+- [**operator""_json**](../operator_literal_json.md) - user-defined string literal for JSON values
+
+## Helper classes
+
+- [**std::hash&lt;basic_json&gt;**](std_hash.md) - return a hash value for a JSON object
+- [**std::swap&lt;basic_json&gt;**](std_swap.md) - exchanges the values of two JSON objects
+
+## Examples
+
+??? example
+
+    The example shows how the library is used.
+    
+    ```cpp
+    --8<-- "examples/README.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/README.output"
+    ```
+
+## See also
+
+- [RFC 8259: The JavaScript Object Notation (JSON) Data Interchange Format](https://tools.ietf.org/html/rfc8259)
+
+## Version history
+
+- Added in version 1.0.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/input_format_t.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/input_format_t.md
new file mode 100644
index 000000000..a3baabab8
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/input_format_t.md
@@ -0,0 +1,52 @@
+# <small>nlohmann::basic_json::</small>input_format_t
+
+```cpp
+enum class input_format_t {
+    json,
+    cbor,
+    msgpack,
+    ubjson,
+    bson,
+    bjdata
+};
+```
+
+This enumeration is used in the [`sax_parse`](sax_parse.md) function to choose the input format to parse:
+
+json
+:   JSON (JavaScript Object Notation)
+
+cbor
+:   CBOR (Concise Binary Object Representation)
+
+msgpack
+:   MessagePack
+
+ubjson
+:   UBJSON (Universal Binary JSON)
+
+bson
+:   BSON (Binary JSON)
+
+bjdata
+:   BJData (Binary JData)
+
+## Examples
+
+??? example
+
+    The example below shows how an `input_format_t` enum value is passed to `sax_parse` to set the input format to CBOR.
+
+    ```cpp
+    --8<-- "examples/sax_parse__binary.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/sax_parse__binary.output"
+    ```
+
+## Version history
+
+- Added in version 3.2.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/insert.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/insert.md
similarity index 85%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/insert.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/insert.md
index fbd466852..2e6b29301 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/insert.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/insert.md
@@ -1,4 +1,4 @@
-# basic_json::insert
+# <small>nlohmann::basic_json::</small>insert
 
 ```cpp
 // (1)
@@ -18,11 +18,11 @@ iterator insert(const_iterator pos, initializer_list_t ilist);
 void insert(const_iterator first, const_iterator last);
 ```
 
-1. Inserts element `val` to array before iterator `pos`.
-2. Inserts `cnt` copies of `val` to array before iterator `pos`.
-3. Inserts elements from range `[first, last)` to array before iterator `pos`.
-4. Inserts elements from initializer list `ilist` to array before iterator `pos`.
-5. Inserts elements from range `[first, last)` to object.
+1. Inserts element `val` into array before iterator `pos`.
+2. Inserts `cnt` copies of `val` into array before iterator `pos`.
+3. Inserts elements from range `[first, last)` into array before iterator `pos`.
+4. Inserts elements from initializer list `ilist` into array before iterator `pos`.
+5. Inserts elements from range `[first, last)` into object.
 
 ## Parameters
 
@@ -50,7 +50,11 @@ void insert(const_iterator first, const_iterator last);
 2. iterator pointing to the first element inserted, or `pos` if `#!cpp cnt==0`
 3. iterator pointing to the first element inserted, or `pos` if `#!cpp first==last`
 4. iterator pointing to the first element inserted, or `pos` if `ilist` is empty
-5. /
+5. (none)
+
+## Exception safety
+
+Strong exception safety: if an exception occurs, the original value stays intact.
 
 ## Exceptions
 
@@ -59,12 +63,12 @@ void insert(const_iterator first, const_iterator last);
       arrays; example: `"cannot use insert() with string"`
     - Throws [`invalid_iterator.202`](../../home/exceptions.md#jsonexceptioninvalid_iterator202) if called on an
       iterator which does not belong to the current JSON value; example: `"iterator does not fit current value"`
-2. The function can throw thw following exceptions:
+2. The function can throw the following exceptions:
     - Throws [`type_error.309`](../../home/exceptions.md#jsonexceptiontype_error309) if called on JSON values other than
       arrays; example: `"cannot use insert() with string"`
     - Throws [`invalid_iterator.202`](../../home/exceptions.md#jsonexceptioninvalid_iterator202) if called on an
       iterator which does not belong to the current JSON value; example: `"iterator does not fit current value"`
-3. The function can throw thw following exceptions:
+3. The function can throw the following exceptions:
     - Throws [`type_error.309`](../../home/exceptions.md#jsonexceptiontype_error309) if called on JSON values other than
       arrays; example: `"cannot use insert() with string"`
     - Throws [`invalid_iterator.202`](../../home/exceptions.md#jsonexceptioninvalid_iterator202) if called on an
@@ -73,12 +77,12 @@ void insert(const_iterator first, const_iterator last);
       do not belong to the same JSON value; example: `"iterators do not fit"`
     - Throws [`invalid_iterator.211`](../../home/exceptions.md#jsonexceptioninvalid_iterator211) if `first` or `last`
       are iterators into container for which insert is called; example: `"passed iterators may not belong to container"`
-4. The function can throw thw following exceptions:
+4. The function can throw the following exceptions:
     - Throws [`type_error.309`](../../home/exceptions.md#jsonexceptiontype_error309) if called on JSON values other than
       arrays; example: `"cannot use insert() with string"`
     - Throws [`invalid_iterator.202`](../../home/exceptions.md#jsonexceptioninvalid_iterator202) if called on an
       iterator which does not belong to the current JSON value; example: `"iterator does not fit current value"`
-5. The function can throw thw following exceptions:
+5. The function can throw the following exceptions:
     - Throws [`type_error.309`](../../home/exceptions.md#jsonexceptiontype_error309) if called on JSON values other than
       objects; example: `"cannot use insert() with string"`
     - Throws [`invalid_iterator.202`](../../home/exceptions.md#jsonexceptioninvalid_iterator202) if called on an
@@ -86,10 +90,6 @@ void insert(const_iterator first, const_iterator last);
     - Throws [`invalid_iterator.210`](../../home/exceptions.md#jsonexceptioninvalid_iterator210) if `first` and `last`
       do not belong to the same JSON value; example: `"iterators do not fit"`
 
-## Exception safety
-
-Strong exception safety: if an exception occurs, the original value stays intact.
-
 ## Complexity
 
 1. Constant plus linear in the distance between `pos` and end of the container.
@@ -98,9 +98,9 @@ Strong exception safety: if an exception occurs, the original value stays intact
 4. Linear in `ilist.size()` plus linear in the distance between `pos` and end of the container.
 5. Logarithmic: `O(N*log(size() + N))`, where `N` is the number of elements to insert.
 
-## Example
+## Examples
 
-??? example
+??? example "Example (1): insert element into array"
 
     The example shows how `insert()` is used.
     
@@ -114,7 +114,7 @@ Strong exception safety: if an exception occurs, the original value stays intact
     --8<-- "examples/insert.output"
     ```
 
-??? example
+??? example "Example (2): insert copies of element into array"
 
     The example shows how `insert()` is used.
     
@@ -128,7 +128,7 @@ Strong exception safety: if an exception occurs, the original value stays intact
     --8<-- "examples/insert__count.output"
     ```
 
-??? example
+??? example "Example (3): insert range of elements into array"
 
     The example shows how `insert()` is used.
     
@@ -142,7 +142,7 @@ Strong exception safety: if an exception occurs, the original value stays intact
     --8<-- "examples/insert__range.output"
     ```
 
-??? example
+??? example "Example (4): insert elements from initializer list into array"
 
     The example shows how `insert()` is used.
     
@@ -156,7 +156,7 @@ Strong exception safety: if an exception occurs, the original value stays intact
     --8<-- "examples/insert__ilist.output"
     ```
 
-??? example
+??? example "Example (5): insert range of elements into object"
 
     The example shows how `insert()` is used.
     
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/invalid_iterator.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/invalid_iterator.md
new file mode 100644
index 000000000..f9fdce5b4
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/invalid_iterator.md
@@ -0,0 +1,67 @@
+# <small>nlohmann::basic_json::</small>invalid_iterator
+
+```cpp
+class invalid_iterator : public exception;
+```
+
+This exception is thrown if iterators passed to a library function do not match the expected semantics.
+
+Exceptions have ids 2xx (see [list of iterator errors](../../home/exceptions.md#iterator-errors)).
+
+```plantuml
+std::exception <|-- basic_json::exception
+basic_json::exception <|-- basic_json::parse_error
+basic_json::exception <|-- basic_json::invalid_iterator
+basic_json::exception <|-- basic_json::type_error
+basic_json::exception <|-- basic_json::out_of_range
+basic_json::exception <|-- basic_json::other_error
+
+interface std::exception {}
+
+class basic_json::exception {
+    + const int id
+    + const char* what() const
+}
+
+class basic_json::parse_error {
+    + const std::size_t byte
+}
+
+class basic_json::invalid_iterator #FFFF00 {}
+```
+
+## Member functions
+
+- **what** - returns explanatory string
+
+## Member variables
+
+- **id** - the id of the exception
+
+## Examples
+
+??? example
+
+    The following code shows how a `invalid_iterator` exception can be caught.
+    
+    ```cpp
+    --8<-- "examples/invalid_iterator.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/invalid_iterator.output"
+    ```
+
+## See also
+
+- [List of iterator errors](../../home/exceptions.md#iterator-errors)
+- [`parse_error`](parse_error.md) for exceptions indicating a parse error
+- [`type_error`](type_error.md) for exceptions indicating executing a member function with a wrong type
+- [`out_of_range`](out_of_range.md) for exceptions indicating access out of the defined range
+- [`other_error`](other_error.md) for exceptions indicating other library errors
+
+## Version history
+
+- Since version 3.0.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/is_array.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/is_array.md
similarity index 90%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/is_array.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/is_array.md
index a30379561..64468c357 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/is_array.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/is_array.md
@@ -1,4 +1,4 @@
-# basic_json::is_array
+# <small>nlohmann::basic_json::</small>is_array
 
 ```cpp
 constexpr bool is_array() const noexcept;
@@ -18,7 +18,7 @@ No-throw guarantee: this member function never throws exceptions.
 
 Constant.
 
-## Example
+## Examples
 
 ??? example
 
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/is_binary.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/is_binary.md
similarity index 90%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/is_binary.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/is_binary.md
index f2285bb59..ea48d745c 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/is_binary.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/is_binary.md
@@ -1,4 +1,4 @@
-# basic_json::is_binary
+# <small>nlohmann::basic_json::</small>is_binary
 
 ```cpp
 constexpr bool is_binary() const noexcept;
@@ -18,7 +18,7 @@ No-throw guarantee: this member function never throws exceptions.
 
 Constant.
 
-## Example
+## Examples
 
 ??? example
 
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/is_boolean.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/is_boolean.md
similarity index 91%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/is_boolean.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/is_boolean.md
index 32bb8c458..dc41d84bd 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/is_boolean.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/is_boolean.md
@@ -1,4 +1,4 @@
-# basic_json::is_boolean
+# <small>nlohmann::basic_json::</small>is_boolean
 
 ```cpp
 constexpr bool is_boolean() const noexcept;
@@ -18,7 +18,7 @@ No-throw guarantee: this member function never throws exceptions.
 
 Constant.
 
-## Example
+## Examples
 
 ??? example
 
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/is_discarded.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/is_discarded.md
similarity index 89%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/is_discarded.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/is_discarded.md
index b733f623c..663cbf889 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/is_discarded.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/is_discarded.md
@@ -1,4 +1,4 @@
-# basic_json::is_discarded
+# <small>nlohmann::basic_json::</small>is_discarded
 
 ```cpp
 constexpr bool is_discarded() const noexcept;
@@ -24,7 +24,7 @@ Constant.
 
 ## Notes
 
-!!! note
+!!! note "Comparisons"
 
     Discarded values are never compared equal with [`operator==`](operator_eq.md). That is, checking whether a JSON
     value `j` is discarded will only work via:
@@ -41,17 +41,17 @@ Constant.
     
     will always be `#!cpp false`.
 
-!!! note
+!!! note "Removal during parsing with callback functions"
 
     When a value is discarded by a callback function (see [`parser_callback_t`](parser_callback_t.md)) during parsing,
-    then it is removed when it is part of a structured value. For instance, if the second value of an array is discared,
+    then it is removed when it is part of a structured value. For instance, if the second value of an array is discarded,
     instead of `#!json [null, discarded, false]`, the array `#!json [null, false]` is returned. Only if the top-level
     value is discarded, the return value of the `parse` call is discarded.
 
 This function will always be `#!cpp false` for JSON values after parsing. That is, discarded values can only occur
 during parsing, but will be removed when inside a structured value or replaced by null in other cases.
 
-## Example
+## Examples
 
 ??? example
 
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/is_null.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/is_null.md
similarity index 91%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/is_null.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/is_null.md
index 8072642a9..d080ad32f 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/is_null.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/is_null.md
@@ -1,4 +1,4 @@
-# basic_json::is_null
+# <small>nlohmann::basic_json::</small>is_null
 
 ```cpp
 constexpr bool is_null() const noexcept;
@@ -18,7 +18,7 @@ No-throw guarantee: this member function never throws exceptions.
 
 Constant.
 
-## Example
+## Examples
 
 ??? example
 
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/is_number.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/is_number.md
new file mode 100644
index 000000000..9807911bc
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/is_number.md
@@ -0,0 +1,56 @@
+# <small>nlohmann::basic_json::</small>is_number
+
+```cpp
+constexpr bool is_number() const noexcept;
+```
+
+This function returns `#!cpp true` if and only if the JSON value is a number. This includes both integer (signed and
+unsigned) and floating-point values.
+    
+## Return value
+
+`#!cpp true` if type is number (regardless whether integer, unsigned integer or floating-type), `#!cpp false` otherwise.
+
+## Exception safety
+
+No-throw guarantee: this member function never throws exceptions.
+
+## Complexity
+
+Constant.
+
+## Possible implementation
+
+```cpp
+constexpr bool is_number() const noexcept
+{
+    return is_number_integer() || is_number_float();
+}
+```
+
+## Examples
+
+??? example
+
+    The following code exemplifies `is_number()` for all JSON types.
+    
+    ```cpp
+    --8<-- "examples/is_number.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/is_number.output"
+    ```
+
+## See also
+
+- [is_number_integer()](is_number_integer.md) check if value is an integer or unsigned integer number
+- [is_number_unsigned()](is_number_unsigned.md) check if value is an unsigned integer number
+- [is_number_float()](is_number_float.md) check if value is a floating-point number
+
+## Version history
+
+- Added in version 1.0.0.
+- Extended to also return `#!cpp true` for unsigned integers in 2.0.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/is_number_float.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/is_number_float.md
new file mode 100644
index 000000000..68d0cfb01
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/is_number_float.md
@@ -0,0 +1,46 @@
+# <small>nlohmann::basic_json::</small>is_number_float
+
+```cpp
+constexpr bool is_number_float() const noexcept;
+```
+
+This function returns `#!cpp true` if and only if the JSON value is a floating-point number. This excludes signed and
+unsigned integer values.
+    
+## Return value
+
+`#!cpp true` if type is a floating-point number, `#!cpp false` otherwise.
+
+## Exception safety
+
+No-throw guarantee: this member function never throws exceptions.
+
+## Complexity
+
+Constant.
+
+## Examples
+
+??? example
+
+    The following code exemplifies `is_number_float()` for all JSON types.
+    
+    ```cpp
+    --8<-- "examples/is_number_float.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/is_number_float.output"
+    ```
+
+## See also
+
+- [is_number()](is_number.md) check if value is a number
+- [is_number_integer()](is_number_integer.md) check if value is an integer or unsigned integer number
+- [is_number_unsigned()](is_number_unsigned.md) check if value is an unsigned integer number
+
+## Version history
+
+- Added in version 1.0.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/is_number_integer.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/is_number_integer.md
new file mode 100644
index 000000000..8ca214aed
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/is_number_integer.md
@@ -0,0 +1,47 @@
+# <small>nlohmann::basic_json::</small>is_number_integer
+
+```cpp
+constexpr bool is_number_integer() const noexcept;
+```
+
+This function returns `#!cpp true` if and only if the JSON value is a signed or unsigned integer number. This excludes
+floating-point values.
+    
+## Return value
+
+`#!cpp true` if type is an integer or unsigned integer number, `#!cpp false` otherwise.
+
+## Exception safety
+
+No-throw guarantee: this member function never throws exceptions.
+
+## Complexity
+
+Constant.
+
+## Examples
+
+??? example
+
+    The following code exemplifies `is_number_integer()` for all JSON types.
+    
+    ```cpp
+    --8<-- "examples/is_number_integer.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/is_number_integer.output"
+    ```
+
+## See also
+
+- [is_number()](is_number.md) check if value is a number
+- [is_number_unsigned()](is_number_unsigned.md) check if value is an unsigned integer number
+- [is_number_float()](is_number_float.md) check if value is a floating-point number
+
+## Version history
+
+- Added in version 1.0.0.
+- Extended to also return `#!cpp true` for unsigned integers in 2.0.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/is_number_unsigned.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/is_number_unsigned.md
new file mode 100644
index 000000000..2ac98a5f0
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/is_number_unsigned.md
@@ -0,0 +1,46 @@
+# <small>nlohmann::basic_json::</small>is_number_unsigned
+
+```cpp
+constexpr bool is_number_unsigned() const noexcept;
+```
+
+This function returns `#!cpp true` if and only if the JSON value is an unsigned integer number. This excludes
+floating-point and signed integer values.
+    
+## Return value
+
+`#!cpp true` if type is an unsigned integer number, `#!cpp false` otherwise.
+
+## Exception safety
+
+No-throw guarantee: this member function never throws exceptions.
+
+## Complexity
+
+Constant.
+
+## Examples
+
+??? example
+
+    The following code exemplifies `is_number_unsigned()` for all JSON types.
+    
+    ```cpp
+    --8<-- "examples/is_number_unsigned.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/is_number_unsigned.output"
+    ```
+
+## See also
+
+- [is_number()](is_number.md) check if value is a number
+- [is_number_integer()](is_number_integer.md) check if value is an integer or unsigned integer number
+- [is_number_float()](is_number_float.md) check if value is a floating-point number
+
+## Version history
+
+- Added in version 2.0.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/is_object.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/is_object.md
similarity index 90%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/is_object.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/is_object.md
index 22a15634c..04457013b 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/is_object.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/is_object.md
@@ -1,4 +1,4 @@
-# basic_json::is_object
+# <small>nlohmann::basic_json::</small>is_object
 
 ```cpp
 constexpr bool is_object() const noexcept;
@@ -18,7 +18,7 @@ No-throw guarantee: this member function never throws exceptions.
 
 Constant.
 
-## Example
+## Examples
 
 ??? example
 
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/is_primitive.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/is_primitive.md
new file mode 100644
index 000000000..cf6cbbd4c
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/is_primitive.md
@@ -0,0 +1,69 @@
+# <small>nlohmann::basic_json::</small>is_primitive
+
+```cpp
+constexpr bool is_primitive() const noexcept;
+```
+
+This function returns `#!cpp true` if and only if the JSON type is primitive (string, number, boolean, `#!json null`,
+binary).
+    
+## Return value
+
+`#!cpp true` if type is primitive (string, number, boolean, `#!json null`, or binary), `#!cpp false` otherwise.
+
+## Exception safety
+
+No-throw guarantee: this member function never throws exceptions.
+
+## Complexity
+
+Constant.
+
+## Possible implementation
+
+```cpp
+constexpr bool is_primitive() const noexcept
+{
+    return is_null() || is_string() || is_boolean() || is_number() || is_binary();
+}
+```
+
+## Notes
+
+The term *primitive* stems from [RFC 8259](https://tools.ietf.org/html/rfc8259):
+
+> JSON can represent four primitive types (strings, numbers, booleans, and null) and two structured types (objects and
+> arrays).
+
+This library extends primitive types to binary types, because binary types are  roughly comparable to strings. Hence,
+`is_primitive()` returns `#!cpp true` for binary values.
+
+## Examples
+
+??? example
+
+    The following code exemplifies `is_primitive()` for all JSON types.
+    
+    ```cpp
+    --8<-- "examples/is_primitive.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/is_primitive.output"
+    ```
+
+## See also
+
+- [is_structured()](is_structured.md) returns whether JSON value is structured
+- [is_null()](is_null.md) returns whether JSON value is `null`
+- [is_string()](is_string.md) returns whether JSON value is a string
+- [is_boolean()](is_boolean.md) returns whether JSON value is a boolean
+- [is_number()](is_number.md) returns whether JSON value is a number
+- [is_binary()](is_binary.md) returns whether JSON value is a binary array
+
+## Version history
+
+- Added in version 1.0.0.
+- Extended to return `#!cpp true` for binary types in version 3.8.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/is_string.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/is_string.md
similarity index 90%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/is_string.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/is_string.md
index af725fb87..b82c92465 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/is_string.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/is_string.md
@@ -1,4 +1,4 @@
-# basic_json::is_string
+# <small>nlohmann::basic_json::</small>is_string
 
 ```cpp
 constexpr bool is_string() const noexcept;
@@ -18,7 +18,7 @@ No-throw guarantee: this member function never throws exceptions.
 
 Constant.
 
-## Example
+## Examples
 
 ??? example
 
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/is_structured.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/is_structured.md
new file mode 100644
index 000000000..f8fe4dcba
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/is_structured.md
@@ -0,0 +1,63 @@
+# <small>nlohmann::basic_json::</small>is_structured
+
+```cpp
+constexpr bool is_structured() const noexcept;
+```
+
+This function returns `#!cpp true` if and only if the JSON type is structured (array or object).
+    
+## Return value
+
+`#!cpp true` if type is structured (array or object), `#!cpp false` otherwise.
+
+## Exception safety
+
+No-throw guarantee: this member function never throws exceptions.
+
+## Complexity
+
+Constant.
+
+## Possible implementation
+
+```cpp
+constexpr bool is_primitive() const noexcept
+{
+    return is_array() || is_object();
+}
+```
+
+## Notes
+
+The term *structured* stems from [RFC 8259](https://tools.ietf.org/html/rfc8259):
+
+> JSON can represent four primitive types (strings, numbers, booleans, and null) and two structured types (objects and
+> arrays).
+
+Note that though strings are containers in C++, they are treated as primitive values in JSON.
+
+## Examples
+
+??? example
+
+    The following code exemplifies `is_structured()` for all JSON types.
+    
+    ```cpp
+    --8<-- "examples/is_structured.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/is_structured.output"
+    ```
+
+## See also
+
+- [is_primitive()](is_primitive.md) returns whether JSON value is primitive
+- [is_array()](is_array.md) returns whether value is an array
+- [is_object()](is_object.md) returns whether value is an object
+
+## Version history
+
+- Added in version 1.0.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/items.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/items.md
similarity index 81%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/items.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/items.md
index d5c711364..0b34ddcba 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/items.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/items.md
@@ -1,11 +1,11 @@
-# basic_json::items
+# <small>nlohmann::basic_json::</small>items
 
 ```cpp
 iteration_proxy<iterator> items() noexcept;
 iteration_proxy<const_iterator> items() const noexcept;
 ```
 
-This function allows to access `iterator::key()` and `iterator::value()` during range-based for loops. In these loops, a
+This function allows accessing `iterator::key()` and `iterator::value()` during range-based for loops. In these loops, a
 reference to the JSON values is returned, so there is no access to the underlying iterator.
 
 For loop without `items()` function:
@@ -36,7 +36,7 @@ for (auto& el : j_object.items())
 }
 ```
 
-The `items()` function also allows to use
+The `items()` function also allows using
 [structured bindings](https://en.cppreference.com/w/cpp/language/structured_binding) (C++17):
 
 ```cpp
@@ -63,12 +63,12 @@ Constant.
 When iterating over an array, `key()` will return the index of the element as string (see example). For primitive types
 (e.g., numbers), `key()` returns an empty string.
 
-!!! warning
+!!! danger "Lifetime issues"
 
-    Using `items()` on temporary objects is dangerous. Make sure the object's lifetime exeeds the iteration. See
+    Using `items()` on temporary objects is dangerous. Make sure the object's lifetime exceeds the iteration. See
     <https://github.com/nlohmann/json/issues/2040> for more information.
 
-## Example
+## Examples
 
 ??? example
 
@@ -86,11 +86,15 @@ When iterating over an array, `key()` will return the index of the element as st
 
 ## Version history
 
-- Added in version 3.0.0.
+- Added `iterator_wrapper` in version 3.0.0.
+- Added `items` and deprecated `iterator_wrapper` in version 3.1.0.
 - Added structured binding support in version 3.5.0.
 
-!!! note
+!!! warning "Deprecation"
 
     This function replaces the static function `iterator_wrapper` which was introduced in version 1.0.0, but has been
     deprecated in version 3.1.0. Function `iterator_wrapper` will be removed in version 4.0.0. Please replace all
     occurrences of `#!cpp iterator_wrapper(j)` with `#!cpp j.items()`.
+
+    You should be warned by your compiler with a `-Wdeprecated-declarations` warning if you are using a deprecated
+    function.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/json_base_class_t.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/json_base_class_t.md
new file mode 100644
index 000000000..75752049f
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/json_base_class_t.md
@@ -0,0 +1,45 @@
+# <small>nlohmann::basic_json::</small>json_base_class_t
+
+```cpp
+using json_base_class_t = detail::json_base_class<CustomBaseClass>;
+```
+
+The base class used to inject custom functionality into each instance of `basic_json`.
+Examples of such functionality might be metadata, additional member functions (e.g., visitors), or other application-specific code.
+
+## Template parameters
+
+`CustomBaseClass`
+:   the base class to be added to `basic_json`
+
+## Notes
+
+#### Default type
+
+The default value for `CustomBaseClass` is `void`. In this case an
+[empty base class](https://en.cppreference.com/w/cpp/language/ebo) is used and no additional functionality is injected.
+
+#### Limitations
+
+The type `CustomBaseClass` has to be a default-constructible class.
+`basic_json` only supports copy/move construction/assignment if `CustomBaseClass` does so as well.
+
+## Examples
+
+??? example
+
+    The following code shows how to inject custom data and methods for each node.
+     
+    ```cpp
+    --8<-- "examples/json_base_class_t.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/json_base_class_t.output"
+    ```
+
+## Version history
+
+- Added in version 3.12.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/json_serializer.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/json_serializer.md
new file mode 100644
index 000000000..24a37735c
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/json_serializer.md
@@ -0,0 +1,41 @@
+# <small>nlohmann::basic_json::</small>json_serializer
+
+```cpp
+template<typename T, typename SFINAE>
+using json_serializer = JSONSerializer<T, SFINAE>;
+```
+
+## Template parameters
+
+`T`
+:   type to convert; will be used in the `to_json`/`from_json` functions
+
+`SFINAE`
+:   type to add compile type checks via SFINAE; usually `#!cpp void`
+
+## Notes
+
+#### Default type
+
+The default values for `json_serializer` is [`adl_serializer`](../adl_serializer/index.md).
+
+## Examples
+
+??? example
+
+    The example below shows how a conversion of a non-default-constructible type is implemented via a specialization of
+    the `adl_serializer`.
+        
+    ```cpp
+    --8<-- "examples/from_json__non_default_constructible.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/from_json__non_default_constructible.output"
+    ```
+
+## Version history
+
+- Since version 2.0.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/max_size.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/max_size.md
new file mode 100644
index 000000000..4c0c57520
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/max_size.md
@@ -0,0 +1,60 @@
+# <small>nlohmann::basic_json::</small>max_size
+
+```cpp
+size_type max_size() const noexcept;
+```
+
+Returns the maximum number of elements a JSON value is able to hold due to system or library implementation limitations,
+i.e. `std::distance(begin(), end())` for the JSON value.
+    
+## Return value
+
+The return value depends on the different types and is defined as follows:
+
+| Value type | return value                              |
+|------------|-------------------------------------------|
+| null       | `0` (same as [`size()`](size.md))         |
+| boolean    | `1` (same as [`size()`](size.md))         |
+| string     | `1` (same as [`size()`](size.md))         |
+| number     | `1` (same as [`size()`](size.md))         |
+| binary     | `1` (same as [`size()`](size.md))         |
+| object     | result of function `object_t::max_size()` |
+| array      | result of function `array_t::max_size()`  |
+
+## Exception safety
+
+No-throw guarantee: this function never throws exceptions.
+
+## Complexity
+
+Constant, as long as [`array_t`](array_t.md) and [`object_t`](object_t.md) satisfy the
+[Container](https://en.cppreference.com/w/cpp/named_req/Container) concept; that is, their `max_size()` functions have
+constant complexity.
+
+## Notes
+
+This function does not return the maximal length of a string stored as JSON value -- it returns the maximal number of
+string elements the JSON value can store which is `1`.
+
+## Examples
+
+??? example
+
+    The following code calls `max_size()` on the different value types.
+        
+    ```cpp
+    --8<-- "examples/max_size.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/max_size.output"
+    ```
+
+    Note the output is platform-dependent.
+
+## Version history
+
+- Added in version 1.0.0.
+- Extended to return `1` for binary types in version 3.8.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/merge_patch.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/merge_patch.md
similarity index 87%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/merge_patch.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/merge_patch.md
index e865e89d8..1718c9227 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/merge_patch.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/merge_patch.md
@@ -1,4 +1,4 @@
-# basic_json::merge_patch
+# <small>nlohmann::basic_json::</small>merge_patch
 
 ```cpp
 void merge_patch(const basic_json& apply_patch);
@@ -37,7 +37,7 @@ Thereby, `Target` is the current object; that is, the patch is applied to the cu
 
 Linear in the lengths of `apply_patch`.
 
-## Example
+## Examples
 
 ??? example
 
@@ -53,6 +53,11 @@ Linear in the lengths of `apply_patch`.
     --8<-- "examples/merge_patch.output"
     ```
 
+## See also
+
+- [RFC 7396 (JSON Merge Patch)](https://tools.ietf.org/html/rfc7396)
+- [patch](patch.md) apply a JSON patch
+
 ## Version history
 
 - Added in version 3.0.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/meta.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/meta.md
new file mode 100644
index 000000000..c584f9b6d
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/meta.md
@@ -0,0 +1,56 @@
+# <small>nlohmann::basic_json::</small>meta
+
+```cpp
+static basic_json meta();
+```
+
+This function returns a JSON object with information about the library, including the version number and information on
+the platform and compiler.
+    
+## Return value
+
+JSON object holding version information
+
+| key         | description                                                                                                                                                                                                                                                                    |
+|-------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `compiler`  | Information on the used compiler. It is an object with the following keys: `c++` (the used C++ standard), `family` (the compiler family; possible values are `clang`, `icc`, `gcc`, `ilecpp`, `msvc`, `pgcpp`, `sunpro`, and `unknown`), and `version` (the compiler version). |
+| `copyright` | The copyright line for the library as string.                                                                                                                                                                                                                                  |
+| `name`      | The name of the library as string.                                                                                                                                                                                                                                             |
+| `platform`  | The used platform as string. Possible values are `win32`, `linux`, `apple`, `unix`, and `unknown`.                                                                                                                                                                             |
+| `url`       | The URL of the project as string.                                                                                                                                                                                                                                              |
+| `version`   | The version of the library. It is an object with the following keys: `major`, `minor`, and `patch` as defined by [Semantic Versioning](http://semver.org), and `string` (the version string).                                                                                  |
+
+## Exception safety
+
+Strong guarantee: if an exception is thrown, there are no changes to any JSON value.
+
+## Complexity
+
+Constant.
+
+## Examples
+
+??? example
+
+    The following code shows an example output of the `meta()` function.
+    
+    ```cpp
+    --8<-- "examples/meta.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/meta.output"
+    ```
+
+    Note the output is platform-dependent.
+
+## See also
+
+- [**NLOHMANN_JSON_VERSION_MAJOR**/**NLOHMANN_JSON_VERSION_MINOR**/**NLOHMANN_JSON_VERSION_PATCH**](../macros/nlohmann_json_version_major.md)
+  \- library version information
+
+## Version history
+
+- Added in version 2.1.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/number_float_t.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/number_float_t.md
similarity index 84%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/number_float_t.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/number_float_t.md
index c6785eb26..50aa43b48 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/number_float_t.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/number_float_t.md
@@ -1,4 +1,4 @@
-# basic_json::number_float_t
+# <small>nlohmann::basic_json::</small>number_float_t
 
 ```cpp
 using number_float_t = NumberFloatType;
@@ -6,7 +6,7 @@ using number_float_t = NumberFloatType;
 
 The type used to store JSON numbers (floating-point).
 
-[RFC 7159](http://rfc7159.net/rfc7159) describes numbers as follows:
+[RFC 8259](https://tools.ietf.org/html/rfc8259) describes numbers as follows:
 > The representation of numbers is similar to that used in most programming languages. A number is represented in base
 > 10 using decimal digits. It contains an integer component that may be prefixed with an optional minus sign, which may
 > be followed by a fraction part and/or an exponent part. Leading zeros are not allowed. (...) Numeric values that
@@ -35,7 +35,7 @@ With the default values for `NumberFloatType` (`double`), the default value for
 
 #### Limits
 
-[RFC 7159](http://rfc7159.net/rfc7159) states:
+[RFC 8259](https://tools.ietf.org/html/rfc8259) states:
 > This specification allows implementations to set limits on the range and precision of numbers accepted. Since software
 > that implements IEEE 754-2008 binary64 (double precision) numbers is generally available and widely used, good
 > interoperability can be achieved by implementations that expect no more precision or range than these provide, in the
@@ -49,6 +49,22 @@ and be serialized to `null`.
 
 Floating-point number values are stored directly inside a `basic_json` type.
 
+## Examples
+
+??? example
+
+    The following code shows that `number_float_t` is by default, a typedef to `#!cpp double`.
+     
+    ```cpp
+    --8<-- "examples/number_float_t.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/number_float_t.output"
+    ```
+
 ## Version history
 
 - Added in version 1.0.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/number_integer_t.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/number_integer_t.md
similarity index 81%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/number_integer_t.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/number_integer_t.md
index c10cb7803..9bb3835a0 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/number_integer_t.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/number_integer_t.md
@@ -1,4 +1,4 @@
-# basic_json::number_integer_t
+# <small>nlohmann::basic_json::</small>number_integer_t
 
 ```cpp
 using number_integer_t = NumberIntegerType;
@@ -6,7 +6,7 @@ using number_integer_t = NumberIntegerType;
 
 The type used to store JSON numbers (integers).
 
-[RFC 7159](http://rfc7159.net/rfc7159) describes numbers as follows:
+[RFC 8259](https://tools.ietf.org/html/rfc8259) describes numbers as follows:
 > The representation of numbers is similar to that used in most programming languages. A number is represented in base
 > 10 using decimal digits. It contains an integer component that may be prefixed with an optional minus sign, which may
 > be followed by a fraction part and/or an exponent part. Leading zeros are not allowed. (...) Numeric values that
@@ -36,7 +36,7 @@ With the default values for `NumberIntegerType` (`std::int64_t`), the default va
 
 #### Limits
 
-[RFC 7159](http://rfc7159.net/rfc7159) specifies:
+[RFC 8259](https://tools.ietf.org/html/rfc8259) specifies:
 > An implementation may set limits on the range and precision of numbers.
 
 When the default type is used, the maximal integer number that can be stored is `9223372036854775807` (INT64_MAX) and
@@ -44,8 +44,8 @@ the minimal integer number that can be stored is `-9223372036854775808` (INT64_M
 range will yield over/underflow when used in a constructor. During deserialization, too large or small integer numbers
 will be automatically be stored as [`number_unsigned_t`](number_unsigned_t.md) or [`number_float_t`](number_float_t.md).
 
-[RFC 7159](http://rfc7159.net/rfc7159) further states:
-> Note that when such software is used, numbers that are integers and are in the range \f$[-2^{53}+1, 2^{53}-1]\f$ are
+[RFC 8259](https://tools.ietf.org/html/rfc8259) further states:
+> Note that when such software is used, numbers that are integers and are in the range $[-2^{53}+1, 2^{53}-1]$ are
 > interoperable in the sense that implementations will agree exactly on their numeric values.
 
 As this range is a subrange of the exactly supported range [INT64_MIN, INT64_MAX], this class's integer type is
@@ -55,6 +55,22 @@ interoperable.
 
 Integer number values are stored directly inside a `basic_json` type.
 
+## Examples
+
+??? example
+
+    The following code shows that `number_integer_t` is by default, a typedef to `#!cpp std::int64_t`.
+     
+    ```cpp
+    --8<-- "examples/number_integer_t.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/number_integer_t.output"
+    ```
+
 ## Version history
 
 - Added in version 1.0.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/number_unsigned_t.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/number_unsigned_t.md
similarity index 83%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/number_unsigned_t.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/number_unsigned_t.md
index a28e25351..8a1540a57 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/number_unsigned_t.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/number_unsigned_t.md
@@ -1,4 +1,4 @@
-# basic_json::number_unsigned_t
+# <small>nlohmann::basic_json::</small>number_unsigned_t
 
 ```cpp
 using number_unsigned_t = NumberUnsignedType;
@@ -6,7 +6,7 @@ using number_unsigned_t = NumberUnsignedType;
 
 The type used to store JSON numbers (unsigned).
 
-[RFC 7159](http://rfc7159.net/rfc7159) describes numbers as follows:
+[RFC 8259](https://tools.ietf.org/html/rfc8259) describes numbers as follows:
 > The representation of numbers is similar to that used in most programming languages. A number is represented in base
 > 10 using decimal digits. It contains an integer component that may be prefixed with an optional minus sign, which may
 > be followed by a fraction part and/or an exponent part. Leading zeros are not allowed. (...) Numeric values that
@@ -36,7 +36,7 @@ With the default values for `NumberUnsignedType` (`std::uint64_t`), the default
 
 #### Limits
 
-[RFC 7159](http://rfc7159.net/rfc7159) specifies:
+[RFC 8259](https://tools.ietf.org/html/rfc8259) specifies:
 > An implementation may set limits on the range and precision of numbers.
 
 When the default type is used, the maximal integer number that can be stored is `18446744073709551615` (UINT64_MAX) and
@@ -44,7 +44,7 @@ the minimal integer number that can be stored is `0`. Integer numbers that are o
 when used in a constructor. During deserialization, too large or small integer numbers will be automatically be stored
 as [`number_integer_t`](number_integer_t.md) or [`number_float_t`](number_float_t.md).
 
-[RFC 7159](http://rfc7159.net/rfc7159) further states:
+[RFC 8259](https://tools.ietf.org/html/rfc8259) further states:
 > Note that when such software is used, numbers that are integers and are in the range \f$[-2^{53}+1, 2^{53}-1]\f$ are
 > interoperable in the sense that implementations will agree exactly on their numeric values.
 
@@ -55,6 +55,22 @@ range [0, UINT64_MAX], this class's integer type is interoperable.
 
 Integer number values are stored directly inside a `basic_json` type.
 
+## Examples
+
+??? example
+
+    The following code shows that `number_unsigned_t` is by default, a typedef to `#!cpp std::uint64_t`.
+     
+    ```cpp
+    --8<-- "examples/number_unsigned_t.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/number_unsigned_t.output"
+    ```
+
 ## Version history
 
 - Added in version 2.0.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/object.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/object.md
similarity index 86%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/object.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/object.md
index 4aae6fe2a..9bdbddb6a 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/object.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/object.md
@@ -1,4 +1,4 @@
-# basic_json::object
+# <small>nlohmann::basic_json::</small>object
 
 ```cpp
 static basic_json object(initializer_list_t init = {});
@@ -16,6 +16,10 @@ elements must be strings. If the initializer list is empty, the empty object `#!
 
 JSON object value
 
+## Exception safety
+
+Strong guarantee: if an exception is thrown, there are no changes in the JSON value.
+
 ## Exceptions
 
 Throws [`type_error.301`](../../home/exceptions.md#jsonexceptiontype_error301) if `init` is not a list of pairs whose
@@ -23,10 +27,6 @@ first elements are strings. In this case, no object can be created. When such a
 `basic_json(initializer_list_t, bool, value_t)`, an array would have been created from the passed initializer list
 `init`. See example below.
 
-## Exception safety
-
-Strong guarantee: if an exception is thrown, there are no changes in the JSON value.
-
 ## Complexity
 
 Linear in the size of `init`.
@@ -53,6 +53,11 @@ the initializer list constructor `basic_json(initializer_list_t, bool, value_t)`
     --8<-- "examples/object.output"
     ```
 
+## See also
+
+- [`basic_json(initializer_list_t)`](basic_json.md) - create a JSON value from an initializer list
+- [`array`](array.md) - create a JSON array value from an initializer list
+
 ## Version history
 
 - Added in version 1.0.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/object_comparator_t.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/object_comparator_t.md
new file mode 100644
index 000000000..d41b98229
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/object_comparator_t.md
@@ -0,0 +1,32 @@
+# <small>nlohmann::basic_json::</small>object_comparator_t
+
+```cpp
+using object_comparator_t = typename object_t::key_compare;
+// or
+using object_comparator_t = default_object_comparator_t;
+```
+
+The comparator used by [`object_t`](object_t.md). Defined as `#!cpp typename object_t::key_compare` if available,
+and [`default_object_comparator_t`](default_object_comparator_t.md) otherwise.
+
+## Examples
+
+??? example
+
+    The example below demonstrates the used object comparator.
+
+    ```cpp
+    --8<-- "examples/object_comparator_t.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/object_comparator_t.output"
+    ```
+
+## Version history
+
+- Added in version 3.0.0.
+- Changed to be conditionally defined as `#!cpp typename object_t::key_compare` or `default_object_comparator_t` in
+  version 3.11.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/object_t.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/object_t.md
similarity index 82%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/object_t.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/object_t.md
index efc18c41f..39f68b089 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/object_t.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/object_t.md
@@ -1,15 +1,15 @@
-# basic_json::object_t
+# <small>nlohmann::basic_json::</small>object_t
 
 ```cpp
 using object_t = ObjectType<StringType,
                             basic_json,
-                            object_comparator_t,
+                            default_object_comparator_t,
                             AllocatorType<std::pair<const StringType, basic_json>>>;
 ```
 
 The type used to store JSON objects.
 
-[RFC 7159](http://rfc7159.net/rfc7159) describes JSON objects as follows:
+[RFC 8259](https://tools.ietf.org/html/rfc8259) describes JSON objects as follows:
 > An object is an unordered collection of zero or more name/value pairs, where a name is a string and a value is a
 > string, number, boolean, null, object, or array.
 
@@ -52,7 +52,7 @@ std::map<
 >
 ```
 
-See [`object_comparator_t`](object_comparator_t.md) for more information.
+See [`default_object_comparator_t`](default_object_comparator_t.md) for more information.
 
 #### Behavior
 
@@ -73,7 +73,7 @@ behavior:
 
 #### Limits
 
-[RFC 7159](http://rfc7159.net/rfc7159) specifies:
+[RFC 8259](https://tools.ietf.org/html/rfc8259) specifies:
 > An implementation may set limits on the maximum depth of nesting.
 
 In this class, the object's limit of nesting is not explicitly constrained. However, a maximum depth of nesting may be
@@ -90,7 +90,24 @@ Objects are stored as pointers in a `basic_json` type. That is, for any access t
 The order name/value pairs are added to the object is *not* preserved by the library. Therefore, iterating an object may
 return name/value pairs in a different order than they were originally stored. In fact, keys will be traversed in
 alphabetical order as `std::map` with `std::less` is used by default. Please note this behavior conforms to
-[RFC 7159](http://rfc7159.net/rfc7159), because any order implements the specified "unordered" nature of JSON objects.
+[RFC 8259](https://tools.ietf.org/html/rfc8259), because any order implements the specified "unordered" nature of JSON
+objects.
+
+## Examples
+
+??? example
+
+    The following code shows that `object_t` is by default, a typedef to `#!cpp std::map<json::string_t, json>`.
+     
+    ```cpp
+    --8<-- "examples/object_t.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/object_t.output"
+    ```
 
 ## Version history
 
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/operator+=.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/operator+=.md
similarity index 80%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/operator+=.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/operator+=.md
index 59001a58f..dc5f2ecc4 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/operator+=.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/operator+=.md
@@ -1,4 +1,4 @@
-# basic_json::operator+=
+# <small>nlohmann::basic_json::</small>operator+=
 
 ```cpp
 // (1)
@@ -18,7 +18,7 @@ reference operator+=(initializer_list_t init);
 2. Inserts the given element `val` to the JSON object. If the function is called on a JSON null value, an empty object
    is created before inserting `val`.
 
-3. This function allows to use `operator+=` with an initializer list. In case
+3. This function allows using `operator+=` with an initializer list. In case
 
     1. the current value is an object,
     2. the initializer list `init` contains only two elements, and
@@ -41,12 +41,9 @@ reference operator+=(initializer_list_t init);
 
 ## Exceptions
 
-1. The function can throw the following exceptions:
-    - Throws [`type_error.308`](../../home/exceptions.md#jsonexceptiontype_error308) when called on a type other than
-      JSON array or null; example: `"cannot use operator+=() with number"`
-2. The function can throw the following exceptions:
-    - Throws [`type_error.308`](../../home/exceptions.md#jsonexceptiontype_error308) when called on a type other than
-      JSON object or null; example: `"cannot use operator+=() with number"`
+All functions can throw the following exception:
+  - Throws [`type_error.308`](../../home/exceptions.md#jsonexceptiontype_error308) when called on a type other than
+    JSON array or null; example: `"cannot use operator+=() with number"`
 
 ## Complexity
 
@@ -62,7 +59,7 @@ interpreted as `object_t::value_type` or `std::initializer_list<basic_json>`, se
 
 ## Examples
 
-??? example
+??? example "Example: (1) add element to array"
 
     The example shows how `push_back()` and `+=` can be used to add elements to a JSON array. Note how the `null` value
     was silently converted to a JSON array.
@@ -77,7 +74,7 @@ interpreted as `object_t::value_type` or `std::initializer_list<basic_json>`, se
     --8<-- "examples/push_back.output"
     ```
 
-??? example
+??? example "Example: (2) add element to object"
 
     The example shows how `push_back()` and `+=` can be used to add elements to a JSON object. Note how the `null` value
     was silently converted to a JSON object.
@@ -92,7 +89,7 @@ interpreted as `object_t::value_type` or `std::initializer_list<basic_json>`, se
     --8<-- "examples/push_back__object_t__value.output"
     ```
 
-??? example
+??? example "Example: (3) add to object from initializer list"
 
     The example shows how initializer lists are treated as objects when possible.
 
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/operator=.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/operator=.md
similarity index 94%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/operator=.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/operator=.md
index 340f8eaf3..4e0b91446 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/operator=.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/operator=.md
@@ -1,4 +1,4 @@
-# basic_json::operator=
+# <small>nlohmann::basic_json::</small>operator=
 
 ```cpp
 basic_json& operator=(basic_json other) noexcept (
@@ -21,7 +21,7 @@ constructor, destructor, and the `swap()` member function.
 
 Linear.
 
-## Example
+## Examples
 
 ??? example
 
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/operator[].md b/external_imported/json/docs/mkdocs/docs/api/basic_json/operator[].md
new file mode 100644
index 000000000..51dd8588c
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/operator[].md
@@ -0,0 +1,241 @@
+# <small>nlohmann::basic_json::</small>operator[]
+
+```cpp
+// (1)
+reference operator[](size_type idx);
+const_reference operator[](size_type idx) const;
+
+// (2)
+reference operator[](typename object_t::key_type key);
+const_reference operator[](const typename object_t::key_type& key) const;
+
+// (3)
+template<typename KeyType>
+reference operator[](KeyType&& key);
+template<typename KeyType>
+const_reference operator[](KeyType&& key) const;
+
+// (4)
+reference operator[](const json_pointer& ptr);
+const_reference operator[](const json_pointer& ptr) const;
+```
+
+1. Returns a reference to the array element at specified location `idx`.
+2. Returns a reference to the object element with specified key `key`. The non-const qualified overload takes the key by
+   value.
+3. See 2. This overload is only available if `KeyType` is comparable with `#!cpp typename object_t::key_type` and
+   `#!cpp typename object_comparator_t::is_transparent` denotes a type.
+4. Returns a reference to the element with specified JSON pointer `ptr`.
+
+## Template parameters
+
+`KeyType`
+:   A type for an object key other than [`json_pointer`](../json_pointer/index.md) that is comparable with
+    [`string_t`](string_t.md) using  [`object_comparator_t`](object_comparator_t.md).
+    This can also be a string view (C++17).
+
+## Parameters
+
+`idx` (in)
+:   index of the element to access
+
+`key` (in)
+:   object key of the element to access
+    
+`ptr` (in)
+:   JSON pointer to the desired element
+    
+## Return value
+
+1. (const) reference to the element at index `idx`
+2. (const) reference to the element at key `key`
+3. (const) reference to the element at key `key`
+4. (const) reference to the element pointed to by `ptr`
+
+## Exception safety
+
+Strong exception safety: if an exception occurs, the original value stays intact.
+
+## Exceptions
+
+1. The function can throw the following exceptions:
+    - Throws [`type_error.305`](../../home/exceptions.md#jsonexceptiontype_error305) if the JSON value is not an array
+      or null; in that case, using the `[]` operator with an index makes no sense.
+2. The function can throw the following exceptions:
+    - Throws [`type_error.305`](../../home/exceptions.md#jsonexceptiontype_error305) if the JSON value is not an object
+      or null; in that case, using the `[]` operator with a key makes no sense.
+3. See 2.
+4. The function can throw the following exceptions:
+    - Throws [`parse_error.106`](../../home/exceptions.md#jsonexceptionparse_error106) if an array index in the passed
+      JSON pointer `ptr` begins with '0'.
+    - Throws [`parse_error.109`](../../home/exceptions.md#jsonexceptionparse_error109) if an array index in the passed
+      JSON pointer `ptr` is not a number.
+    - Throws [`out_of_range.402`](../../home/exceptions.md#jsonexceptionout_of_range402) if the array index '-' is used
+      in the passed JSON pointer `ptr` for the const version.
+    - Throws [`out_of_range.404`](../../home/exceptions.md#jsonexceptionout_of_range404) if the JSON pointer `ptr` can
+      not be resolved.
+
+## Complexity
+
+1. Constant if `idx` is in the range of the array. Otherwise, linear in `idx - size()`.
+2. Logarithmic in the size of the container.
+3. Logarithmic in the size of the container.
+4. Logarithmic in the size of the container.
+
+## Notes
+
+!!! danger "Undefined behavior and runtime assertions"
+
+    1. If the element with key `idx` does not exist, the behavior is undefined.
+    2. If the element with key `key` does not exist, the behavior is undefined and is **guarded by a
+       [runtime assertion](../../features/assertions.md)**!
+
+1. The non-const version may add values: If `idx` is beyond the range of the array (i.e., `idx >= size()`), then the
+   array is silently filled up with `#!json null` values to make `idx` a valid reference to the last stored element. In
+   case the value was `#!json null` before, it is converted to an array.
+
+2. If `key` is not found in the object, then it is silently added to the object and filled with a `#!json null` value to
+   make `key` a valid reference. In case the value was `#!json null` before, it is converted to an object.
+
+3. See 2.
+
+4. `null` values are created in arrays and objects if necessary.
+   
+    In particular:
+
+    - If the JSON pointer points to an object key that does not exist, it is created and filled with a `#!json null`
+      value before a reference to it is returned.
+    - If the JSON pointer points to an array index that does not exist, it is created and filled with a `#!json null`
+      value before a reference to it is returned. All indices between the current maximum and the given index are also
+      filled with `#!json null`.
+    - The special value `-` is treated as a synonym for the index past the end.
+
+## Examples
+
+??? example "Example: (1) access specified array element"
+
+    The example below shows how array elements can be read and written using `[]` operator. Note the addition of
+    `#!json null` values.
+        
+    ```cpp
+    --8<-- "examples/operator_array__size_type.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/operator_array__size_type.output"
+    ```
+
+??? example "Example: (1) access specified array element (const)"
+
+    The example below shows how array elements can be read using the `[]` operator.
+
+    ```cpp
+    --8<-- "examples/operator_array__size_type_const.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/operator_array__size_type_const.output"
+    ```
+
+??? example "Example: (2) access specified object element"
+
+    The example below shows how object elements can be read and written using the `[]` operator.
+    
+    ```cpp
+    --8<-- "examples/operator_array__object_t_key_type.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/operator_array__object_t_key_type.output"
+    ```
+
+??? example "Example: (2) access specified object element (const)"
+
+    The example below shows how object elements can be read using the `[]` operator.
+    
+    ```cpp
+    --8<-- "examples/operator_array__object_t_key_type_const.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/operator_array__object_t_key_type_const.output"
+    ```
+
+??? example "Example: (3) access specified object element using string_view"
+
+    The example below shows how object elements can be read using the `[]` operator.
+    
+    ```cpp
+    --8<-- "examples/operator_array__keytype.c++17.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/operator_array__keytype.c++17.output"
+    ```
+
+??? example "Example: (3) access specified object element using string_view (const)"
+
+    The example below shows how object elements can be read using the `[]` operator.
+    
+    ```cpp
+    --8<-- "examples/operator_array__keytype_const.c++17.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/operator_array__keytype_const.c++17.output"
+    ```
+
+??? example "Example: (4) access specified element via JSON Pointer"
+
+    The example below shows how values can be read and written using JSON Pointers.
+    
+    ```cpp
+    --8<-- "examples/operator_array__json_pointer.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/operator_array__json_pointer.output"
+    ```
+
+??? example "Example: (4) access specified element via JSON Pointer (const)"
+
+    The example below shows how values can be read using JSON Pointers.
+    
+    ```cpp
+    --8<-- "examples/operator_array__json_pointer_const.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/operator_array__json_pointer_const.output"
+    ```
+
+## See also
+
+- documentation on [unchecked access](../../features/element_access/unchecked_access.md)
+- documentation on [runtime assertions](../../features/assertions.md)
+- see [`at`](at.md) for access by reference with range checking
+- see [`value`](value.md) for access with default value
+
+## Version history
+
+1. Added in version 1.0.0.
+2. Added in version 1.0.0. Added overloads for `T* key` in version 1.1.0. Removed overloads for `T* key` (replaced by 3)
+   in version 3.11.0.
+3. Added in version 3.11.0.
+4. Added in version 2.0.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/operator_ValueType.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/operator_ValueType.md
new file mode 100644
index 000000000..bf38a3d21
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/operator_ValueType.md
@@ -0,0 +1,82 @@
+# <small>nlohmann::basic_json::</small>operator ValueType
+
+```cpp
+template<typename ValueType>
+JSON_EXPLICIT operator ValueType() const;
+```
+
+Implicit type conversion between the JSON value and a compatible value. The call is realized by calling
+[`get()`](get.md). See [Notes](#notes) for the meaning of `JSON_EXPLICIT`.
+
+## Template parameters
+
+`ValueType`
+:   the value type to return
+
+## Return value
+
+copy of the JSON value, converted to `ValueType`
+
+## Exceptions
+
+Depends on what `json_serializer<ValueType>` `from_json()` method throws
+
+## Complexity
+
+Linear in the size of the JSON value.
+
+## Notes
+
+!!! note "Definition of `JSON_EXPLICIT`"
+
+    By default `JSON_EXPLICIT` is defined to the empty string, so the signature is:
+    
+    ```cpp
+    template<typename ValueType>
+    operator ValueType() const;
+    ```
+    
+    If [`JSON_USE_IMPLICIT_CONVERSIONS`](../macros/json_use_implicit_conversions.md) is set to `0`,
+    `JSON_EXPLICIT` is defined to `#!cpp explicit`:
+
+    ```cpp
+    template<typename ValueType>
+    explicit operator ValueType() const;
+    ```
+    
+    That is, implicit conversions can be switched off by defining
+    [`JSON_USE_IMPLICIT_CONVERSIONS`](../macros/json_use_implicit_conversions.md) to `0`.
+
+!!! info "Future behavior change"
+
+    Implicit conversions will be switched off by default in the next major release of the library. That is,
+    `JSON_EXPLICIT` will be set to `#!cpp explicit` by default.
+
+    You can prepare existing code by already defining
+    [`JSON_USE_IMPLICIT_CONVERSIONS`](../macros/json_use_implicit_conversions.md) to `0` and replace any implicit
+    conversions with calls to [`get`](../basic_json/get.md).
+
+## Examples
+
+??? example
+
+    The example below shows several conversions from JSON values to other types. There are a few things to note: (1)
+    Floating-point numbers can be converted to integers, (2) A JSON array can be converted to a standard
+    `std::vector<short>`, (3) A JSON object can be converted to C++ associative containers such as
+    `std::unordered_map<std::string, json>`.
+        
+    ```cpp
+    --8<-- "examples/operator__ValueType.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/operator__ValueType.output"
+    ```
+
+## Version history
+
+- Since version 1.0.0.
+- Macros `JSON_EXPLICIT`/[`JSON_USE_IMPLICIT_CONVERSIONS`](../macros/json_use_implicit_conversions.md) added
+  in version 3.9.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/operator_eq.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/operator_eq.md
new file mode 100644
index 000000000..a2ce6155c
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/operator_eq.md
@@ -0,0 +1,168 @@
+# <small>nlohmann::basic_json::</small>operator==
+
+```cpp
+// until C++20
+bool operator==(const_reference lhs, const_reference rhs) noexcept;   // (1)
+
+template<typename ScalarType>
+bool operator==(const_reference lhs, const ScalarType rhs) noexcept;  // (2)
+
+template<typename ScalarType>
+bool operator==(ScalarType lhs, const const_reference rhs) noexcept;  // (2)
+
+// since C++20
+class basic_json {
+    bool operator==(const_reference rhs) const noexcept;              // (1)
+
+    template<typename ScalarType>
+    bool operator==(ScalarType rhs) const noexcept;                   // (2)
+};
+```
+
+1. Compares two JSON values for equality according to the following rules:
+    - Two JSON values are equal if (1) neither value is discarded, or (2) they are of the same type and their stored
+      values are the same according to their respective `operator==`.
+    - Integer and floating-point numbers are automatically converted before comparison.
+
+2. Compares a JSON value and a scalar or a scalar and a JSON value for equality by converting the
+   scalar to a JSON value and comparing both JSON values according to 1.
+
+## Template parameters
+
+`ScalarType`
+:   a scalar type according to `std::is_scalar<ScalarType>::value`
+
+## Parameters
+
+`lhs` (in)
+:   first value to consider 
+
+`rhs` (in)
+:   second value to consider 
+
+## Return value
+
+whether the values `lhs`/`*this` and `rhs` are equal
+
+## Exception safety
+
+No-throw guarantee: this function never throws exceptions.
+
+## Complexity
+
+Linear.
+
+## Notes
+
+!!! note "Comparing special values"
+
+    - `NaN` values are unordered within the domain of numbers.
+      The following comparisons all yield `#!cpp false`:
+        1. Comparing a `NaN` with itself.
+        2. Comparing a `NaN` with another `NaN`.
+        3. Comparing a `NaN` and any other number.
+    - JSON `#!cpp null` values are all equal.
+    - Discarded values never compare equal to themselves.
+
+!!! note "Comparing floating-point numbers"
+
+    Floating-point numbers inside JSON values numbers are compared with `json::number_float_t::operator==` which is
+    `double::operator==` by default. To compare floating-point while respecting an epsilon, an alternative
+    [comparison function](https://github.com/mariokonrad/marnav/blob/master/include/marnav/math/floatingpoint.hpp#L34-#L39)
+    could be used, for instance
+    
+    ```cpp
+    template<typename T, typename = typename std::enable_if<std::is_floating_point<T>::value, T>::type>
+    inline bool is_same(T a, T b, T epsilon = std::numeric_limits<T>::epsilon()) noexcept
+    {
+        return std::abs(a - b) <= epsilon;
+    }
+    ```
+    
+    Or you can self-defined operator equal function like this:
+    
+    ```cpp
+    bool my_equal(const_reference lhs, const_reference rhs)
+    {
+        const auto lhs_type lhs.type();
+        const auto rhs_type rhs.type();
+        if (lhs_type == rhs_type)
+        {
+            switch(lhs_type)
+                // self_defined case
+                case value_t::number_float:
+                    return std::abs(lhs - rhs) <= std::numeric_limits<float>::epsilon();
+                // other cases remain the same with the original
+                ...
+        }
+    ...
+    }
+    ```
+
+!!! note "Comparing different `basic_json` specializations"
+
+    Comparing different `basic_json` specializations can have surprising effects. For instance, the result of comparing
+    the JSON objects
+
+    ```json
+    {
+       "version": 1,
+       "type": "integer"
+    }
+    ```
+
+    and
+
+    ```json
+    {
+       "type": "integer",
+       "version": 1
+    }
+    ```
+
+    depends on whether [`nlohmann::json`](../json.md) or [`nlohmann::ordered_json`](../ordered_json.md) is used:
+
+     ```cpp
+     --8<-- "examples/operator__equal__specializations.cpp"
+     ```
+     
+     Output:
+     
+     ```json
+     --8<-- "examples/operator__equal__specializations.output"
+     ```
+
+## Examples
+
+??? example
+
+    The example demonstrates comparing several JSON types.
+        
+    ```cpp
+    --8<-- "examples/operator__equal.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/operator__equal.output"
+    ```
+
+??? example
+
+    The example demonstrates comparing several JSON types against the null pointer (JSON `#!json null`).
+        
+    ```cpp
+    --8<-- "examples/operator__equal__nullptr_t.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/operator__equal__nullptr_t.output"
+    ```
+
+## Version history
+
+1. Added in version 1.0.0. Added C++20 member functions in version 3.11.0.
+2. Added in version 1.0.0. Added C++20 member functions in version 3.11.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/operator_ge.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/operator_ge.md
new file mode 100644
index 000000000..d4e2fb4a5
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/operator_ge.md
@@ -0,0 +1,86 @@
+# <small>nlohmann::basic_json::</small>operator>=
+
+```cpp
+// until C++20
+bool operator>=(const_reference lhs, const_reference rhs) noexcept;   // (1)
+
+template<typename ScalarType>
+bool operator>=(const_reference lhs, const ScalarType rhs) noexcept;  // (2)
+
+template<typename ScalarType>
+bool operator>=(ScalarType lhs, const const_reference rhs) noexcept;  // (2)
+```
+
+1. Compares whether one JSON value `lhs` is greater than or equal to another JSON value `rhs` according to the following
+   rules:
+    - The comparison always yields `#!cpp false` if (1) either operand is discarded, or (2) either operand is `NaN` and
+      the other operand is either `NaN` or any other number.
+    - Otherwise, returns the result of `#!cpp !(lhs < rhs)` (see [**operator<**](operator_lt.md)).
+
+2. Compares whether a JSON value is greater than or equal to a scalar or a scalar is greater than or equal to a JSON
+   value by converting the scalar to a JSON value and comparing both JSON values according to 1.
+
+## Template parameters
+
+`ScalarType`
+:   a scalar type according to `std::is_scalar<ScalarType>::value`
+
+## Parameters
+
+`lhs` (in)
+:   first value to consider 
+
+`rhs` (in)
+:   second value to consider 
+
+## Return value
+
+whether `lhs` is less than or equal to `rhs`
+
+## Exception safety
+
+No-throw guarantee: this function never throws exceptions.
+
+## Complexity
+
+Linear.
+
+## Notes
+
+!!! note "Comparing `NaN`"
+
+    `NaN` values are unordered within the domain of numbers.
+    The following comparisons all yield `#!cpp false`:
+      1. Comparing a `NaN` with itself.
+      2. Comparing a `NaN` with another `NaN`.
+      3. Comparing a `NaN` and any other number.
+
+!!! note "Operator overload resolution"
+
+    Since C++20 overload resolution will consider the _rewritten candidate_ generated from
+    [`operator<=>`](operator_spaceship.md).
+
+## Examples
+
+??? example
+
+    The example demonstrates comparing several JSON types.
+        
+    ```cpp
+    --8<-- "examples/operator__greaterequal.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/operator__greaterequal.output"
+    ```
+
+## See also
+
+- [**operator<=>**](operator_spaceship.md) comparison: 3-way
+
+## Version history
+
+1. Added in version 1.0.0. Conditionally removed since C++20 in version 3.11.0.
+2. Added in version 1.0.0. Conditionally removed since C++20 in version 3.11.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/operator_gt.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/operator_gt.md
new file mode 100644
index 000000000..9516656e0
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/operator_gt.md
@@ -0,0 +1,86 @@
+# <small>nlohmann::basic_json::</small>operator>
+
+```cpp
+// until C++20
+bool operator>(const_reference lhs, const_reference rhs) noexcept;   // (1)
+
+template<typename ScalarType>
+bool operator>(const_reference lhs, const ScalarType rhs) noexcept;  // (2)
+
+template<typename ScalarType>
+bool operator>(ScalarType lhs, const const_reference rhs) noexcept;  // (2)
+```
+
+1. Compares whether one JSON value `lhs` is greater than another JSON value `rhs` according to the
+  following rules:
+    - The comparison always yields `#!cpp false` if (1) either operand is discarded, or (2) either
+      operand is `NaN` and the other operand is either `NaN` or any other number.
+    - Otherwise, returns the result of `#!cpp !(lhs <= rhs)` (see [**operator<=**](operator_le.md)).
+
+2. Compares wether a JSON value is greater than a scalar or a scalar is greater than a JSON value by
+   converting the scalar to a JSON value and comparing both JSON values according to 1.
+
+## Template parameters
+
+`ScalarType`
+:   a scalar type according to `std::is_scalar<ScalarType>::value`
+
+## Parameters
+
+`lhs` (in)
+:   first value to consider 
+
+`rhs` (in)
+:   second value to consider 
+
+## Return value
+
+whether `lhs` is greater than `rhs`
+
+## Exception safety
+
+No-throw guarantee: this function never throws exceptions.
+
+## Complexity
+
+Linear.
+
+## Notes
+
+!!! note "Comparing `NaN`"
+
+    `NaN` values are unordered within the domain of numbers.
+    The following comparisons all yield `#!cpp false`:
+      1. Comparing a `NaN` with itself.
+      2. Comparing a `NaN` with another `NaN`.
+      3. Comparing a `NaN` and any other number.
+
+!!! note "Operator overload resolution"
+
+    Since C++20 overload resolution will consider the _rewritten candidate_ generated from
+    [`operator<=>`](operator_spaceship.md).
+
+## Examples
+
+??? example
+
+    The example demonstrates comparing several JSON types.
+        
+    ```cpp
+    --8<-- "examples/operator__greater.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/operator__greater.output"
+    ```
+
+## See also
+
+- [**operator<=>**](operator_spaceship.md) comparison: 3-way
+
+## Version history
+
+1. Added in version 1.0.0. Conditionally removed since C++20 in version 3.11.0.
+2. Added in version 1.0.0. Conditionally removed since C++20 in version 3.11.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/operator_le.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/operator_le.md
new file mode 100644
index 000000000..7b648e035
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/operator_le.md
@@ -0,0 +1,87 @@
+# <small>nlohmann::basic_json::</small>operator<=
+
+```cpp
+// until C++20
+bool operator<=(const_reference lhs, const_reference rhs) noexcept;   // (1)
+
+template<typename ScalarType>
+bool operator<=(const_reference lhs, const ScalarType rhs) noexcept;  // (2)
+
+template<typename ScalarType>
+bool operator<=(ScalarType lhs, const const_reference rhs) noexcept;  // (2)
+```
+
+1. Compares whether one JSON value `lhs` is less than or equal to another JSON value `rhs`
+   according to the following rules:
+    - The comparison always yields `#!cpp false` if (1) either operand is discarded, or (2) either
+      operand is `NaN` and the other operand is either `NaN` or any other number.
+    - Otherwise, returns the result of `#!cpp !(rhs < lhs)` (see [**operator<**](operator_lt.md)).
+
+1. Compares wether a JSON value is less than or equal to a scalar or a scalar is less than or equal
+   to a JSON value by converting the scalar to a JSON value and comparing both JSON values according
+   to 1.
+
+## Template parameters
+
+`ScalarType`
+:   a scalar type according to `std::is_scalar<ScalarType>::value`
+
+## Parameters
+
+`lhs` (in)
+:   first value to consider 
+
+`rhs` (in)
+:   second value to consider 
+
+## Return value
+
+whether `lhs` is less than or equal to `rhs`
+
+## Exception safety
+
+No-throw guarantee: this function never throws exceptions.
+
+## Complexity
+
+Linear.
+
+## Notes
+
+!!! note "Comparing `NaN`"
+
+    `NaN` values are unordered within the domain of numbers.
+    The following comparisons all yield `#!cpp false`:
+      1. Comparing a `NaN` with itself.
+      2. Comparing a `NaN` with another `NaN`.
+      3. Comparing a `NaN` and any other number.
+
+!!! note "Operator overload resolution"
+
+    Since C++20 overload resolution will consider the _rewritten candidate_ generated from
+    [`operator<=>`](operator_spaceship.md).
+
+## Examples
+
+??? example
+
+    The example demonstrates comparing several JSON types.
+        
+    ```cpp
+    --8<-- "examples/operator__lessequal.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/operator__lessequal.output"
+    ```
+
+## See also
+
+- [**operator<=>**](operator_spaceship.md) comparison: 3-way
+
+## Version history
+
+1. Added in version 1.0.0. Conditionally removed since C++20 in version 3.11.0.
+2. Added in version 1.0.0. Conditionally removed since C++20 in version 3.11.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/operator_lt.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/operator_lt.md
new file mode 100644
index 000000000..b5d191ec4
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/operator_lt.md
@@ -0,0 +1,96 @@
+# <small>nlohmann::basic_json::</small>operator<
+
+```cpp
+// until C++20
+bool operator<(const_reference lhs, const_reference rhs) noexcept;   // (1)
+
+template<typename ScalarType>
+bool operator<(const_reference lhs, const ScalarType rhs) noexcept;  // (2)
+
+template<typename ScalarType>
+bool operator<(ScalarType lhs, const const_reference rhs) noexcept;  // (2)
+```
+
+1. Compares whether one JSON value `lhs` is less than another JSON value `rhs` according to the
+  following rules:
+    - If either operand is discarded, the comparison yields `#!cpp false`.
+    - If both operands have the same type, the values are compared using their respective `operator<`.
+    - Integer and floating-point numbers are automatically converted before comparison.
+    - In case `lhs` and `rhs` have different types, the values are ignored and the order of the types
+      is considered, which is:
+        1. null
+        2. boolean
+        3. number (all types)
+        4. object
+        5. array
+        6. string
+        7. binary
+      For instance, any boolean value is considered less than any string.
+
+2. Compares wether a JSON value is less than a scalar or a scalar is less than a JSON value by converting
+   the scalar to a JSON value and comparing both JSON values according to 1.
+
+## Template parameters
+
+`ScalarType`
+:   a scalar type according to `std::is_scalar<ScalarType>::value`
+
+## Parameters
+
+`lhs` (in)
+:   first value to consider 
+
+`rhs` (in)
+:   second value to consider 
+
+## Return value
+
+whether `lhs` is less than `rhs`
+
+## Exception safety
+
+No-throw guarantee: this function never throws exceptions.
+
+## Complexity
+
+Linear.
+
+## Notes
+
+!!! note "Comparing `NaN`"
+
+    `NaN` values are unordered within the domain of numbers.
+    The following comparisons all yield `#!cpp false`:
+      1. Comparing a `NaN` with itself.
+      2. Comparing a `NaN` with another `NaN`.
+      3. Comparing a `NaN` and any other number.
+
+!!! note "Operator overload resolution"
+
+    Since C++20 overload resolution will consider the _rewritten candidate_ generated from
+    [`operator<=>`](operator_spaceship.md).
+
+## Examples
+
+??? example
+
+    The example demonstrates comparing several JSON types.
+        
+    ```cpp
+    --8<-- "examples/operator__less.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/operator__less.output"
+    ```
+
+## See also
+
+- [**operator<=>**](operator_spaceship.md) comparison: 3-way
+
+## Version history
+
+1. Added in version 1.0.0. Conditionally removed since C++20 in version 3.11.0.
+2. Added in version 1.0.0. Conditionally removed since C++20 in version 3.11.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/operator_ne.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/operator_ne.md
new file mode 100644
index 000000000..982a06764
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/operator_ne.md
@@ -0,0 +1,98 @@
+# <small>nlohmann::basic_json::</small>operator!=
+
+```cpp
+// until C++20
+bool operator!=(const_reference lhs, const_reference rhs) noexcept;   // (1)
+
+template<typename ScalarType>
+bool operator!=(const_reference lhs, const ScalarType rhs) noexcept;  // (2)
+
+template<typename ScalarType>
+bool operator!=(ScalarType lhs, const const_reference rhs) noexcept;  // (2)
+
+// since C++20
+class basic_json {
+    bool operator!=(const_reference rhs) const noexcept;              // (1)
+
+    template<typename ScalarType>
+    bool operator!=(ScalarType rhs) const noexcept;                   // (2)
+};
+```
+
+1. Compares two JSON values for inequality according to the following rules:
+    - The comparison always yields `#!cpp false` if (1) either operand is discarded, or (2) either operand is `NaN` and
+      the other operand is either `NaN` or any other number.
+    - Otherwise, returns the result of `#!cpp !(lhs == rhs)` (until C++20) or `#!cpp !(*this == rhs)` (since C++20).
+
+2. Compares a JSON value and a scalar or a scalar and a JSON value for inequality by converting the scalar to a JSON
+   value and comparing both JSON values according to 1.
+
+## Template parameters
+
+`ScalarType`
+:   a scalar type according to `std::is_scalar<ScalarType>::value`
+
+## Parameters
+
+`lhs` (in)
+:   first value to consider 
+
+`rhs` (in)
+:   second value to consider 
+
+## Return value
+
+whether the values `lhs`/`*this` and `rhs` are not equal
+
+## Exception safety
+
+No-throw guarantee: this function never throws exceptions.
+
+## Complexity
+
+Linear.
+
+## Notes
+
+!!! note "Comparing `NaN`"
+
+    `NaN` values are unordered within the domain of numbers.
+    The following comparisons all yield `#!cpp false`:
+      1. Comparing a `NaN` with itself.
+      2. Comparing a `NaN` with another `NaN`.
+      3. Comparing a `NaN` and any other number.
+
+## Examples
+
+??? example
+
+    The example demonstrates comparing several JSON types.
+        
+    ```cpp
+    --8<-- "examples/operator__notequal.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/operator__notequal.output"
+    ```
+
+??? example
+
+    The example demonstrates comparing several JSON types against the null pointer (JSON `#!json null`).
+        
+    ```cpp
+    --8<-- "examples/operator__notequal__nullptr_t.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/operator__notequal__nullptr_t.output"
+    ```
+
+## Version history
+
+1. Added in version 1.0.0. Added C++20 member functions in version 3.11.0.
+2. Added in version 1.0.0. Added C++20 member functions in version 3.11.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/operator_spaceship.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/operator_spaceship.md
new file mode 100644
index 000000000..9e91d0d2d
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/operator_spaceship.md
@@ -0,0 +1,100 @@
+# <small>nlohmann::basic_json::</small>operator<=>
+
+```cpp
+// since C++20
+class basic_json {
+    std::partial_ordering operator<=>(const_reference rhs) const noexcept;  // (1)
+
+    template<typename ScalarType>
+    std::partial_ordering operator<=>(const ScalarType rhs) const noexcept; // (2)
+};
+```
+
+1. 3-way compares two JSON values producing a result of type `std::partial_ordering` according to the following rules:
+    - Two JSON values compare with a result of `std::partial_ordering::unordered` if either value is discarded.
+    - If both JSON values are of the same type, the result is produced by 3-way comparing their stored values using
+      their respective `operator<=>`.
+    - Integer and floating-point numbers are converted to their common type and then 3-way compared using their
+      respective `operator<=>`.
+      For instance, comparing an integer and a floating-point value will 3-way compare the first value converted to
+      floating-point with the second value.
+    - Otherwise, yields a result by comparing the type (see [`value_t`](value_t.md)).
+  
+2. 3-way compares a JSON value and a scalar or a scalar and a JSON value by converting the scalar to a JSON value and
+   3-way comparing both JSON values (see 1).
+
+## Template parameters
+
+`ScalarType`
+:   a scalar type according to `std::is_scalar<ScalarType>::value`
+
+## Parameters
+
+`rhs` (in)
+:   second value to consider 
+
+## Return value
+
+the `std::partial_ordering` of the 3-way comparison of `*this` and `rhs`
+
+## Exception safety
+
+No-throw guarantee: this function never throws exceptions.
+
+## Complexity
+
+Linear.
+
+## Notes
+
+!!! note "Comparing `NaN`"
+
+    - `NaN` values are unordered within the domain of numbers.
+      The following comparisons all yield `std::partial_ordering::unordered`:
+        1. Comparing a `NaN` with itself.
+        2. Comparing a `NaN` with another `NaN`.
+        3. Comparing a `NaN` and any other number.
+
+## Examples
+
+??? example "Example: (1) comparing JSON values"
+
+    The example demonstrates comparing several JSON values.
+    
+    ```cpp
+    --8<-- "examples/operator_spaceship__const_reference.c++20.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/operator_spaceship__const_reference.c++20.output"
+    ```
+
+??? example "Example: (2) comparing JSON values and scalars"
+
+    The example demonstrates comparing several JSON values and scalars.
+    
+    ```cpp
+    --8<-- "examples/operator_spaceship__scalartype.c++20.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/operator_spaceship__scalartype.c++20.output"
+    ```
+
+## See also
+
+- [**operator==**](operator_eq.md) - comparison: equal
+- [**operator!=**](operator_ne.md) - comparison: not equal
+- [**operator<**](operator_lt.md) - comparison: less than
+- [**operator<=**](operator_le.md) - comparison: less than or equal
+- [**operator>**](operator_gt.md) - comparison: greater than
+- [**operator>=**](operator_ge.md) - comparison: greater than or equal
+
+## Version history
+
+1. Added in version 3.11.0.
+2. Added in version 3.11.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/operator_value_t.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/operator_value_t.md
new file mode 100644
index 000000000..0f08f42b0
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/operator_value_t.md
@@ -0,0 +1,54 @@
+# <small>nlohmann::basic_json::</small>operator value_t
+
+```cpp
+constexpr operator value_t() const noexcept;
+```
+
+Return the type of the JSON value as a value from the [`value_t`](value_t.md) enumeration.
+    
+## Return value
+
+the type of the JSON value
+
+| Value type                | return value               |
+|---------------------------|----------------------------|
+| `#!json null`             | `value_t::null`            |
+| boolean                   | `value_t::boolean`         |
+| string                    | `value_t::string`          |
+| number (integer)          | `value_t::number_integer`  |
+| number (unsigned integer) | `value_t::number_unsigned` |
+| number (floating-point)   | `value_t::number_float`    |
+| object                    | `value_t::object`          |
+| array                     | `value_t::array`           |
+| binary                    | `value_t::binary`          |
+| discarded                 | `value_t::discarded`       |
+
+## Exception safety
+
+No-throw guarantee: this member function never throws exceptions.
+
+## Complexity
+
+Constant.
+
+## Examples
+
+??? example
+
+    The following code exemplifies `operator value_t()` for all JSON types.
+    
+    ```cpp
+    --8<-- "examples/operator__value_t.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/operator__value_t.output"
+    ```
+
+## Version history
+
+- Added in version 1.0.0.
+- Added unsigned integer type in version 2.0.0.
+- Added binary type in version 3.8.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/other_error.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/other_error.md
new file mode 100644
index 000000000..9a83340a0
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/other_error.md
@@ -0,0 +1,67 @@
+# <small>nlohmann::basic_json::</small>other_error
+
+```cpp
+class other_error : public exception;
+```
+
+This exception is thrown in case of errors that cannot be classified with the other exception types.
+
+Exceptions have ids 5xx (see [list of other errors](../../home/exceptions.md#further-exceptions)).
+
+```plantuml
+std::exception <|-- basic_json::exception
+basic_json::exception <|-- basic_json::parse_error
+basic_json::exception <|-- basic_json::invalid_iterator
+basic_json::exception <|-- basic_json::type_error
+basic_json::exception <|-- basic_json::out_of_range
+basic_json::exception <|-- basic_json::other_error
+
+interface std::exception {}
+
+class basic_json::exception {
+    + const int id
+    + const char* what() const
+}
+
+class basic_json::parse_error {
+    + const std::size_t byte
+}
+
+class basic_json::other_error #FFFF00 {}
+```
+
+## Member functions
+
+- **what** - returns explanatory string
+
+## Member variables
+
+- **id** - the id of the exception
+
+## Examples
+
+??? example
+
+    The following code shows how a `other_error` exception can be caught.
+    
+    ```cpp
+    --8<-- "examples/other_error.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/other_error.output"
+    ```
+
+## See also
+
+- [List of other errors](../../home/exceptions.md#further-exceptions)
+- [`parse_error`](parse_error.md) for exceptions indicating a parse error
+- [`invalid_iterator`](invalid_iterator.md) for exceptions indicating errors with iterators
+- [`type_error`](type_error.md) for exceptions indicating executing a member function with a wrong type
+- [`out_of_range`](out_of_range.md) for exceptions indicating access out of the defined range
+
+## Version history
+
+- Since version 3.0.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/out_of_range.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/out_of_range.md
new file mode 100644
index 000000000..6c1f0dfba
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/out_of_range.md
@@ -0,0 +1,68 @@
+# <small>nlohmann::basic_json::</small>out_of_range
+
+```cpp
+class out_of_range : public exception;
+```
+
+This exception is thrown in case a library function is called on an input parameter that exceeds the expected range, for
+instance in case of array indices or nonexisting object keys.
+
+Exceptions have ids 4xx (see [list of out-of-range errors](../../home/exceptions.md#out-of-range)).
+
+```plantuml
+std::exception <|-- basic_json::exception
+basic_json::exception <|-- basic_json::parse_error
+basic_json::exception <|-- basic_json::invalid_iterator
+basic_json::exception <|-- basic_json::type_error
+basic_json::exception <|-- basic_json::out_of_range
+basic_json::exception <|-- basic_json::other_error
+
+interface std::exception {}
+
+class basic_json::exception {
+    + const int id
+    + const char* what() const
+}
+
+class basic_json::parse_error {
+    + const std::size_t byte
+}
+
+class basic_json::out_of_range #FFFF00 {}
+```
+
+## Member functions
+
+- **what** - returns explanatory string
+
+## Member variables
+
+- **id** - the id of the exception
+
+## Examples
+
+??? example
+
+    The following code shows how a `out_of_range` exception can be caught.
+    
+    ```cpp
+    --8<-- "examples/out_of_range.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/out_of_range.output"
+    ```
+
+## See also
+
+- [List of out-of-range errors](../../home/exceptions.md#out-of-range)
+- [`parse_error`](parse_error.md) for exceptions indicating a parse error
+- [`invalid_iterator`](invalid_iterator.md) for exceptions indicating errors with iterators
+- [`type_error`](type_error.md) for exceptions indicating executing a member function with a wrong type
+- [`other_error`](other_error.md) for exceptions indicating other library errors
+
+## Version history
+
+- Since version 3.0.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/parse.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/parse.md
new file mode 100644
index 000000000..49838ad1d
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/parse.md
@@ -0,0 +1,214 @@
+# <small>nlohmann::basic_json::</small>parse
+
+```cpp
+// (1)
+template<typename InputType>
+static basic_json parse(InputType&& i,
+                        const parser_callback_t cb = nullptr,
+                        const bool allow_exceptions = true,
+                        const bool ignore_comments = false);
+
+// (2)
+template<typename IteratorType>
+static basic_json parse(IteratorType first, IteratorType last,
+                        const parser_callback_t cb = nullptr,
+                        const bool allow_exceptions = true,
+                        const bool ignore_comments = false);
+```
+
+1. Deserialize from a compatible input.
+2. Deserialize from a pair of character iterators
+    
+    The `value_type` of the iterator must be an integral type with size of 1, 2 or 4 bytes, which will be interpreted
+    respectively as UTF-8, UTF-16 and UTF-32.
+
+## Template parameters
+
+`InputType`
+:   A compatible input, for instance:
+    
+    - an `std::istream` object
+    - a `FILE` pointer (must not be null)
+    - a C-style array of characters
+    - a pointer to a null-terminated string of single byte characters
+    - a `std::string`
+    - an object `obj` for which `begin(obj)` and `end(obj)` produces a valid pair of iterators.
+
+`IteratorType`
+:   a compatible iterator type, for instance.
+
+    - a pair of `std::string::iterator` or `std::vector<std::uint8_t>::iterator`
+    - a pair of pointers such as `ptr` and `ptr + len`
+
+## Parameters
+
+`i` (in)
+:   Input to parse from.
+
+`cb` (in)
+:   a parser callback function of type [`parser_callback_t`](parser_callback_t.md) which is used to control the
+    deserialization by filtering unwanted values (optional)
+
+`allow_exceptions` (in)
+:    whether to throw exceptions in case of a parse error (optional, `#!cpp true` by default)
+
+`ignore_comments` (in)
+:   whether comments should be ignored and treated like whitespace (`#!cpp true`) or yield a parse error
+    (`#!cpp false`); (optional, `#!cpp false` by default)
+
+`first` (in)
+:   iterator to start of character range
+
+`last` (in)
+:   iterator to end of character range
+
+## Return value
+
+Deserialized JSON value; in case of a parse error and `allow_exceptions` set to `#!cpp false`, the return value will be
+`value_t::discarded`. The latter can be checked with [`is_discarded`](is_discarded.md).
+
+## Exception safety
+
+Strong guarantee: if an exception is thrown, there are no changes in the JSON value.
+
+## Exceptions
+
+- Throws [`parse_error.101`](../../home/exceptions.md#jsonexceptionparse_error101) in case of an unexpected token.
+- Throws [`parse_error.102`](../../home/exceptions.md#jsonexceptionparse_error102) if to_unicode fails or surrogate
+  error.
+- Throws [`parse_error.103`](../../home/exceptions.md#jsonexceptionparse_error103) if to_unicode fails.
+
+## Complexity
+
+Linear in the length of the input. The parser is a predictive LL(1) parser. The complexity can be higher if the parser
+callback function `cb` or reading from (1) the input `i` or (2) the iterator range [`first`, `last`] has a
+super-linear complexity.
+
+## Notes
+
+(1) A UTF-8 byte order mark is silently ignored.
+
+!!! danger "Runtime assertion"
+
+    The precondition that a passed `#!cpp FILE` pointer must not be null is enforced with a
+    [runtime assertion](../../features/assertions.md).
+
+## Examples
+
+??? example "Parsing from a character array"
+
+    The example below demonstrates the `parse()` function reading from an array.
+
+    ```cpp
+    --8<-- "examples/parse__array__parser_callback_t.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/parse__array__parser_callback_t.output"
+    ```
+
+??? example "Parsing from a string"
+
+    The example below demonstrates the `parse()` function with and without callback function.
+
+    ```cpp
+    --8<-- "examples/parse__string__parser_callback_t.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/parse__string__parser_callback_t.output"
+    ```
+
+??? example "Parsing from an input stream"
+
+    The example below demonstrates the `parse()` function with and without callback function.
+
+    ```cpp
+    --8<-- "examples/parse__istream__parser_callback_t.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/parse__istream__parser_callback_t.output"
+    ```
+
+??? example "Parsing from a contiguous container"
+
+    The example below demonstrates the `parse()` function reading from a contiguous container.
+
+    ```cpp
+    --8<-- "examples/parse__contiguouscontainer__parser_callback_t.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/parse__contiguouscontainer__parser_callback_t.output"
+    ```
+
+??? example "Parsing from a non null-terminated string"
+
+    The example below demonstrates the `parse()` function reading from a string that is not null-terminated.
+
+    ```cpp
+    --8<-- "examples/parse__pointers.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/parse__pointers.output"
+    ```
+
+??? example "Parsing from an iterator pair"
+
+    The example below demonstrates the `parse()` function reading from an iterator pair.
+
+    ```cpp
+    --8<-- "examples/parse__iterator_pair.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/parse__iterator_pair.output"
+    ```
+
+??? example "Effect of `allow_exceptions` parameter"
+
+    The example below demonstrates the effect of the `allow_exceptions` parameter in the ´parse()` function.
+
+    ```cpp
+    --8<-- "examples/parse__allow_exceptions.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/parse__allow_exceptions.output"
+    ```
+
+## See also
+
+- [accept](accept.md) - check if the input is valid JSON
+- [operator>>](../operator_gtgt.md) - deserialize from stream
+
+## Version history
+
+- Added in version 1.0.0.
+- Overload for contiguous containers (1) added in version 2.0.3.
+- Ignoring comments via `ignore_comments` added in version 3.9.0.
+
+!!! warning "Deprecation"
+
+    Overload (2) replaces calls to `parse` with a pair of iterators as their first parameter which has been
+    deprecated in version 3.8.0. This overload will be removed in version 4.0.0. Please replace all calls like
+    `#!cpp parse({ptr, ptr+len}, ...);` with `#!cpp parse(ptr, ptr+len, ...);`.
+
+    You should be warned by your compiler with a `-Wdeprecated-declarations` warning if you are using a deprecated
+    function.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/parse_error.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/parse_error.md
new file mode 100644
index 000000000..af3e1f0b3
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/parse_error.md
@@ -0,0 +1,74 @@
+# <small>nlohmann::basic_json::</small>parse_error
+
+```cpp
+class parse_error : public exception;
+```
+
+This exception is thrown by the library when a parse error occurs. Parse errors can occur during the deserialization of
+JSON text, BSON, CBOR, MessagePack, UBJSON, as well as when using JSON Patch.
+
+Member `byte` holds the byte index of the last read character in the input file (see note below).
+
+Exceptions have ids 1xx (see [list of parse errors](../../home/exceptions.md#parse-errors)).
+
+```plantuml
+std::exception <|-- basic_json::exception
+basic_json::exception <|-- basic_json::parse_error
+basic_json::exception <|-- basic_json::invalid_iterator
+basic_json::exception <|-- basic_json::type_error
+basic_json::exception <|-- basic_json::out_of_range
+basic_json::exception <|-- basic_json::other_error
+
+interface std::exception {}
+
+class basic_json::exception {
+    + const int id
+    + const char* what() const
+}
+
+class basic_json::parse_error #FFFF00 {
+    + const std::size_t byte
+}
+```
+
+## Member functions
+
+- **what** - returns explanatory string
+
+## Member variables
+
+- **id** - the id of the exception
+- **byte** - byte index of the parse error
+
+## Notes
+
+For an input with $n$ bytes, 1 is the index of the first character and $n+1$ is the index of the terminating null byte
+or the end of file. This also holds true when reading a byte vector for binary formats.
+
+## Examples
+
+??? example
+
+    The following code shows how a `parse_error` exception can be caught.
+    
+    ```cpp
+    --8<-- "examples/parse_error.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/parse_error.output"
+    ```
+
+## See also
+
+- [List of parse errors](../../home/exceptions.md#parse-errors)
+- [`invalid_iterator`](invalid_iterator.md) for exceptions indicating errors with iterators
+- [`type_error`](type_error.md) for exceptions indicating executing a member function with a wrong type
+- [`out_of_range`](out_of_range.md) for exceptions indicating access out of the defined range
+- [`other_error`](other_error.md) for exceptions indicating other library errors
+
+## Version history
+
+- Since version 3.0.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/parse_event_t.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/parse_event_t.md
similarity index 91%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/parse_event_t.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/parse_event_t.md
index 867de48bd..1a7c39038 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/parse_event_t.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/parse_event_t.md
@@ -1,4 +1,4 @@
-# basic_json::parse_event_t
+# <small>nlohmann::basic_json::</small>parse_event_t
 
 ```cpp
 enum class parse_event_t : std::uint8_t {
@@ -20,7 +20,7 @@ The parser callback distinguishes the following events:
 - `array_end`: the parser read `]` and finished processing a JSON array
 - `value`: the parser finished reading a JSON value
 
-## Example
+## Examples
 
 ![Example when certain parse events are triggered](../../images/callback_events.png)
 
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/parser_callback_t.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/parser_callback_t.md
new file mode 100644
index 000000000..e10402ea9
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/parser_callback_t.md
@@ -0,0 +1,73 @@
+# <small>nlohmann::basic_json::</small>parser_callback_t
+
+```cpp
+template<typename BasicJsonType>
+using parser_callback_t =
+    std::function<bool(int depth, parse_event_t event, BasicJsonType& parsed)>;
+```
+
+With a parser callback function, the result of parsing a JSON text can be influenced. When passed to
+[`parse`](parse.md), it is called on certain events (passed as [`parse_event_t`](parse_event_t.md) via parameter
+`event`) with a set recursion depth `depth` and context JSON value `parsed`. The return value of the callback function
+is a boolean indicating whether the element that emitted the callback shall be kept or not.
+
+We distinguish six scenarios (determined by the event type) in which the callback function can be called. The following
+table describes the values of the parameters `depth`, `event`, and `parsed`.
+
+| parameter `event`             | description                                               | parameter `depth`                         | parameter `parsed`               |
+|-------------------------------|-----------------------------------------------------------|-------------------------------------------|----------------------------------|
+| `parse_event_t::object_start` | the parser read `{` and started to process a JSON object  | depth of the parent of the JSON object    | a JSON value with type discarded |
+| `parse_event_t::key`          | the parser read a key of a value in an object             | depth of the currently parsed JSON object | a JSON string containing the key |
+| `parse_event_t::object_end`   | the parser read `}` and finished processing a JSON object | depth of the parent of the JSON object    | the parsed JSON object           |
+| `parse_event_t::array_start`  | the parser read `[` and started to process a JSON array   | depth of the parent of the JSON array     | a JSON value with type discarded |
+| `parse_event_t::array_end`    | the parser read `]` and finished processing a JSON array  | depth of the parent of the JSON array     | the parsed JSON array            |
+| `parse_event_t::value`        | the parser finished reading a JSON value                  | depth of the value                        | the parsed JSON value            |
+
+![Example when certain parse events are triggered](../../images/callback_events.png)
+
+Discarding a value (i.e., returning `#!cpp false`) has different effects depending on the context in which function was
+called:
+
+- Discarded values in structured types are skipped. That is, the parser will behave as if the discarded value was never
+  read.
+- In case a value outside a structured type is skipped, it is replaced with `null`. This case happens if the top-level
+  element is skipped.
+
+## Parameters
+
+`depth` (in)
+:   the depth of the recursion during parsing
+
+`event` (in)
+:   an event of type [`parse_event_t`](parse_event_t.md) indicating the context in
+    the callback function has been called
+
+`parsed` (in, out)
+:    the current intermediate parse result; note that
+     writing to this value has no effect for `parse_event_t::key` events
+
+## Return value
+
+Whether the JSON value which called the function during parsing should be kept (`#!cpp true`) or not (`#!cpp false`). In
+the latter case, it is either skipped completely or replaced by an empty discarded object.
+
+## Examples
+
+??? example
+
+    The example below demonstrates the `parse()` function with
+    and without callback function.
+
+    ```cpp
+    --8<-- "examples/parse__string__parser_callback_t.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/parse__string__parser_callback_t.output"
+    ```
+
+## Version history
+
+- Added in version 1.0.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/patch.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/patch.md
similarity index 80%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/patch.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/patch.md
index d73e9c0d3..deec47434 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/patch.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/patch.md
@@ -1,11 +1,11 @@
-# basic_json::patch
+# <small>nlohmann::basic_json::</small>patch
 
 ```cpp
 basic_json patch(const basic_json& json_patch) const;
 ```
 
 [JSON Patch](http://jsonpatch.com) defines a JSON document structure for expressing a sequence of operations to apply to
-a JSON) document. With this function, a JSON Patch is applied to the current JSON value by executing all operations from
+a JSON document. With this function, a JSON Patch is applied to the current JSON value by executing all operations from
 the patch.
 
 ## Parameters
@@ -17,6 +17,10 @@ the patch.
 
 patched document
 
+## Exception safety
+
+Strong guarantee: if an exception is thrown, there are no changes in the JSON value.
+
 ## Exceptions
 
 - Throws [`parse_error.104`](../../home/exceptions.md#jsonexceptionparse_error104) if the JSON patch does not consist of
@@ -31,21 +35,17 @@ patched document
 - Throws [`out_of_range.501`](../../home/exceptions.md#jsonexceptionother_error501) if "test" operation was
   unsuccessful.
 
-## Exception safety
-
-Strong guarantee: if an exception is thrown, there are no changes in the JSON value.
-
 ## Complexity
 
 Linear in the size of the JSON value and the length of the JSON patch. As usually only a fraction of the JSON value is
 affected by the patch, the complexity can usually be neglected.
 
-## Note
+## Notes
 
 The application of a patch is atomic: Either all operations succeed and the patched document is returned or an exception
 is thrown. In any case, the original value is not changed: the patch is applied to a copy of the value.
 
-## Example
+## Examples
 
 ??? example
 
@@ -61,6 +61,13 @@ is thrown. In any case, the original value is not changed: the patch is applied
     --8<-- "examples/patch.output"
     ```
 
+## See also
+
+- [RFC 6902 (JSON Patch)](https://tools.ietf.org/html/rfc6902)
+- [RFC 6901 (JSON Pointer)](https://tools.ietf.org/html/rfc6901)
+- [patch_inplace](patch_inplace.md) applies a JSON Patch without creating a copy of the document
+- [merge_patch](merge_patch.md) applies a JSON Merge Patch
+
 ## Version history
 
 - Added in version 2.0.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/patch_inplace.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/patch_inplace.md
new file mode 100644
index 000000000..e8fd176c3
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/patch_inplace.md
@@ -0,0 +1,70 @@
+# <small>nlohmann::basic_json::</small>patch_inplace
+
+```cpp
+void patch_inplace(const basic_json& json_patch) const;
+```
+
+[JSON Patch](http://jsonpatch.com) defines a JSON document structure for expressing a sequence of operations to apply to
+a JSON document. With this function, a JSON Patch is applied to the current JSON value by executing all operations from
+the patch. This function applies a JSON patch in place and returns void.
+
+## Parameters
+
+`json_patch` (in)
+:   JSON patch document
+
+## Exception safety
+
+No guarantees, value may be corrupted by an unsuccessful patch operation.
+
+## Exceptions
+
+- Throws [`parse_error.104`](../../home/exceptions.md#jsonexceptionparse_error104) if the JSON patch does not consist of
+  an array of objects.
+- Throws [`parse_error.105`](../../home/exceptions.md#jsonexceptionparse_error105) if the JSON patch is malformed (e.g.,
+  mandatory attributes are missing); example: `"operation add must have member path"`.
+- Throws [`out_of_range.401`](../../home/exceptions.md#jsonexceptionout_of_range401) if an array index is out of range.
+- Throws [`out_of_range.403`](../../home/exceptions.md#jsonexceptionout_of_range403) if a JSON pointer inside the patch
+  could not be resolved successfully in the current JSON value; example: `"key baz not found"`.
+- Throws [`out_of_range.405`](../../home/exceptions.md#jsonexceptionout_of_range405) if JSON pointer has no parent
+  ("add", "remove", "move")
+- Throws [`out_of_range.501`](../../home/exceptions.md#jsonexceptionother_error501) if "test" operation was
+  unsuccessful.
+
+## Complexity
+
+Linear in the size of the JSON value and the length of the JSON patch. As usually only a fraction of the JSON value is
+affected by the patch, the complexity can usually be neglected.
+
+## Notes
+
+Unlike [`patch`](patch.md), `patch_inplace` applies the operation "in place" and no copy of the JSON value is created.
+That makes it faster for large documents by avoiding the copy. However, the JSON value might be corrupted if the
+function throws an exception.
+
+## Examples
+
+??? example
+
+    The following code shows how a JSON patch is applied to a value.
+     
+    ```cpp
+    --8<-- "examples/patch_inplace.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/patch_inplace.output"
+    ```
+
+## See also
+
+- [RFC 6902 (JSON Patch)](https://tools.ietf.org/html/rfc6902)
+- [RFC 6901 (JSON Pointer)](https://tools.ietf.org/html/rfc6901)
+- [patch](patch.md) applies a JSON Merge Patch
+- [merge_patch](merge_patch.md) applies a JSON Merge Patch
+
+## Version history
+
+- Added in version 3.11.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/push_back.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/push_back.md
new file mode 100644
index 000000000..5c7d20dd6
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/push_back.md
@@ -0,0 +1,106 @@
+# <small>nlohmann::basic_json::</small>push_back
+
+```cpp
+// (1)
+void push_back(basic_json&& val);
+void push_back(const basic_json& val);
+
+// (2)
+void push_back(const typename object_t::value_type& val);
+
+// (3)
+void push_back(initializer_list_t init);
+```
+
+1. Appends the given element `val` to the end of the JSON array. If the function is called on a JSON null value, an
+   empty array is created before appending `val`.
+
+2. Inserts the given element `val` to the JSON object. If the function is called on a JSON null value, an empty object
+   is created before inserting `val`.
+
+3. This function allows using `push_back` with an initializer list. In case
+
+    1. the current value is an object,
+    2. the initializer list `init` contains only two elements, and
+    3. the first element of `init` is a string,
+
+    `init` is converted into an object element and added using `push_back(const typename object_t::value_type&)`.
+    Otherwise, `init` is converted to a JSON value and added using `push_back(basic_json&&)`.
+
+## Parameters
+
+`val` (in)
+:   the value to add to the JSON array/object
+
+`init` (in)
+:   an initializer list
+
+## Exceptions
+
+All functions can throw the following exception:
+  - Throws [`type_error.308`](../../home/exceptions.md#jsonexceptiontype_error308) when called on a type other than
+    JSON array or null; example: `"cannot use push_back() with number"`
+
+## Complexity
+
+1. Amortized constant.
+2. Logarithmic in the size of the container, O(log(`size()`)).
+3. Linear in the size of the initializer list `init`.
+
+## Notes
+
+(3) This function is required to resolve an ambiguous overload error, because pairs like `{"key", "value"}` can be both
+    interpreted as `object_t::value_type` or `std::initializer_list<basic_json>`, see
+    [#235](https://github.com/nlohmann/json/issues/235) for more information.
+
+## Examples
+
+??? example "Example: (1) add element to array"
+
+    The example shows how `push_back()` and `+=` can be used to add elements to a JSON array. Note how the `null` value
+    was silently converted to a JSON array.
+    
+    ```cpp
+    --8<-- "examples/push_back.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/push_back.output"
+    ```
+
+??? example "Example: (2) add element to object"
+
+    The example shows how `push_back()` and `+=` can be used to add elements to a JSON object. Note how the `null` value
+    was silently converted to a JSON object.
+
+    ```cpp
+    --8<-- "examples/push_back__object_t__value.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/push_back__object_t__value.output"
+    ```
+
+??? example "Example: (3) add to object from initializer list"
+
+    The example shows how initializer lists are treated as objects when possible.
+
+    ```cpp
+    --8<-- "examples/push_back__initializer_list.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/push_back__initializer_list.output"
+    ```
+
+## Version history
+
+1. Since version 1.0.0.
+2. Since version 1.0.0.
+2. Since version 2.0.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/rbegin.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/rbegin.md
similarity index 92%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/rbegin.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/rbegin.md
index 57957b3b4..126c47127 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/rbegin.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/rbegin.md
@@ -1,4 +1,4 @@
-# basic_json::rbegin
+# <small>nlohmann::basic_json::</small>rbegin
 
 ```cpp
 reverse_iterator rbegin() noexcept;
@@ -21,7 +21,7 @@ No-throw guarantee: this member function never throws exceptions.
 
 Constant.
 
-## Example
+## Examples
 
 ??? example
 
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/rend.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/rend.md
similarity index 93%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/rend.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/rend.md
index 5d5f21310..96da7a5f5 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/rend.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/rend.md
@@ -1,4 +1,4 @@
-# basic_json::rend
+# <small>nlohmann::basic_json::</small>rend
 
 ```cpp
 reverse_iterator rend() noexcept;
@@ -22,7 +22,7 @@ No-throw guarantee: this member function never throws exceptions.
 
 Constant.
 
-## Example
+## Examples
 
 ??? example
 
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/sax_parse.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/sax_parse.md
similarity index 81%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/sax_parse.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/sax_parse.md
index 7a6dbad3c..e2ac1b41d 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/sax_parse.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/sax_parse.md
@@ -1,4 +1,4 @@
-# basic_json::sax_parse
+# <small>nlohmann::basic_json::</small>sax_parse
 
 ```cpp
 // (1)
@@ -23,10 +23,10 @@ Read from input and generate SAX events
 1. Read from a compatible input.
 2. Read from a pair of character iterators
     
-    The value_type of the iterator must be a integral type with size of 1, 2 or 4 bytes, which will be interpreted
+    The value_type of the iterator must be an integral type with size of 1, 2 or 4 bytes, which will be interpreted
     respectively as UTF-8, UTF-16 and UTF-32.
 
-The SAX event lister must follow the interface of `json_sax`.
+The SAX event lister must follow the interface of [`json_sax`](../json_sax/index.md).
 
 ## Template parameters
 
@@ -107,3 +107,9 @@ A UTF-8 byte order mark is silently ignored.
 
 - Added in version 3.2.0.
 - Ignoring comments via `ignore_comments` added in version 3.9.0.
+
+!!! warning "Deprecation"
+
+    Overload (2) replaces calls to `sax_parse` with a pair of iterators as their first parameter which has been
+    deprecated in version 3.8.0. This overload will be removed in version 4.0.0. Please replace all calls like
+    `#!cpp sax_parse({ptr, ptr+len});` with `#!cpp sax_parse(ptr, ptr+len);`.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/size.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/size.md
new file mode 100644
index 000000000..4ff582db2
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/size.md
@@ -0,0 +1,57 @@
+# <small>nlohmann::basic_json::</small>size
+
+```cpp
+size_type size() const noexcept;
+```
+
+Returns the number of elements in a JSON value.
+    
+## Return value
+
+The return value depends on the different types and is defined as follows:
+
+| Value type | return value                        |
+|------------|-------------------------------------|
+| null       | `0`                                 |
+| boolean    | `1`                                 |
+| string     | `1`                                 |
+| number     | `1`                                 |
+| binary     | `1`                                 |
+| object     | result of function object_t::size() |
+| array      | result of function array_t::size()  |
+
+## Exception safety
+
+No-throw guarantee: this function never throws exceptions.
+
+## Complexity
+
+Constant, as long as [`array_t`](array_t.md) and [`object_t`](object_t.md) satisfy the
+[Container](https://en.cppreference.com/w/cpp/named_req/Container) concept; that is, their `size()` functions have
+constant complexity.
+
+## Notes
+
+This function does not return the length of a string stored as JSON value -- it returns the number of elements in the
+JSON value which is `1` in the case of a string.
+
+## Examples
+
+??? example
+
+    The following code calls `size()` on the different value types.
+    
+    ```cpp
+    --8<-- "examples/size.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/size.output"
+    ```
+
+## Version history
+
+- Added in version 1.0.0.
+- Extended to return `1` for binary types in version 3.8.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/std_hash.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/std_hash.md
new file mode 100644
index 000000000..b9de74f8c
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/std_hash.md
@@ -0,0 +1,34 @@
+# <small>std::</small>hash<nlohmann::basic_json\>
+
+```cpp
+namespace std {
+    struct hash<nlohmann::basic_json>;
+}
+```
+
+Return a hash value for a JSON object. The hash function tries to rely on `std::hash` where possible. Furthermore, the
+type of the JSON value is taken into account to have different hash values for `#!json null`, `#!cpp 0`, `#!cpp 0U`, and
+`#!cpp false`, etc.
+
+## Examples
+
+??? example
+
+    The example shows how to calculate hash values for different JSON values.
+     
+    ```cpp
+    --8<-- "examples/std_hash.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/std_hash.output"
+    ```
+
+    Note the output is platform-dependent.
+
+## Version history
+
+- Added in version 1.0.0.
+- Extended for arbitrary basic_json types in version 3.10.5.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/std_swap.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/std_swap.md
new file mode 100644
index 000000000..d30f3bccd
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/std_swap.md
@@ -0,0 +1,51 @@
+# std::swap<basic_json\>
+
+```cpp
+namespace std {
+    void swap(nlohmann::basic_json& j1, nlohmann::basic_json& j2);
+}
+```
+
+Exchanges the values of two JSON objects.
+
+## Parameters
+
+`j1` (in, out)
+:   value to be replaced by `j2`
+
+`j2` (in, out)
+:   value to be replaced by `j1`
+
+## Possible implementation
+
+```cpp
+void swap(nlohmann::basic_json& j1, nlohmann::basic_json& j2)
+{
+    j1.swap(j2);
+}
+```
+
+## Examples
+
+??? example
+
+    The following code shows how two values are swapped with `std::swap`.
+     
+    ```cpp
+    --8<-- "examples/std_swap.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/std_swap.output"
+    ```
+
+## See also
+
+- [swap](swap.md)
+
+## Version history
+
+- Added in version 1.0.0.
+- Extended for arbitrary basic_json types in version 3.10.5.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/string_t.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/string_t.md
new file mode 100644
index 000000000..3ab4412dd
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/string_t.md
@@ -0,0 +1,66 @@
+# <small>nlohmann::basic_json::</small>string_t
+
+```cpp
+using string_t = StringType;
+```
+
+The type used to store JSON strings.
+
+[RFC 8259](https://tools.ietf.org/html/rfc8259) describes JSON strings as follows:
+> A string is a sequence of zero or more Unicode characters.
+
+To store objects in C++, a type is defined by the template parameter described below. Unicode values are split by the
+JSON class into byte-sized characters during deserialization.
+
+## Template parameters
+
+`StringType`
+:   the container to store strings (e.g., `std::string`). Note this container is used for keys/names in objects, see
+    [object_t](object_t.md).
+
+## Notes
+
+#### Default type
+
+With the default values for `StringType` (`std::string`), the default value for `string_t` is `#!cpp std::string`.
+
+#### Encoding
+
+Strings are stored in UTF-8 encoding. Therefore, functions like `std::string::size()` or `std::string::length()` return
+the number of bytes in the string rather than the number of characters or glyphs.
+
+#### String comparison
+
+[RFC 8259](https://tools.ietf.org/html/rfc8259) states:
+> Software implementations are typically required to test names of object members for equality. Implementations that
+> transform the textual representation into sequences of Unicode code units and then perform the comparison numerically,
+> code unit by code unit, are interoperable in the sense that implementations will agree in all cases on equality or
+> inequality of two strings. For example, implementations that compare strings with escaped characters unconverted may
+> incorrectly find that `"a\\b"` and `"a\u005Cb"` are not equal.
+
+This implementation is interoperable as it does compare strings code unit by code unit.
+
+#### Storage
+
+String values are stored as pointers in a `basic_json` type. That is, for any access to string values, a pointer of type
+`string_t*` must be dereferenced.
+
+## Examples
+
+??? example
+
+    The following code shows that `string_t` is by default, a typedef to `#!cpp std::string`.
+     
+    ```cpp
+    --8<-- "examples/string_t.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/string_t.output"
+    ```
+
+## Version history
+
+- Added in version 1.0.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/swap.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/swap.md
new file mode 100644
index 000000000..a5730ffa7
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/swap.md
@@ -0,0 +1,157 @@
+# <small>nlohmann::basic_json::</small>swap
+
+```cpp
+// (1)
+void swap(reference other) noexcept;
+
+// (2)
+void swap(reference left, reference right) noexcept;
+
+// (3)
+void swap(array_t& other);
+
+// (4)
+void swap(object_t& other);
+
+// (5)
+void swap(string_t& other);
+
+// (6)
+void swap(binary_t& other);
+
+// (7)
+void swap(typename binary_t::container_type& other);
+```
+
+1. Exchanges the contents of the JSON value with those of `other`. Does not invoke any move, copy, or swap operations on
+   individual elements. All iterators and references remain valid. The past-the-end iterator is invalidated. 
+2. Exchanges the contents of the JSON value from `left` with those of `right`. Does not invoke any move, copy, or swap
+   operations on individual elements. All iterators and references remain valid. The past-the-end iterator is
+   invalidated. Implemented as a friend function callable via ADL.
+3. Exchanges the contents of a JSON array with those of `other`. Does not invoke any move, copy, or swap operations on
+   individual elements. All iterators and references remain valid. The past-the-end iterator is invalidated. 
+4. Exchanges the contents of a JSON object with those of `other`. Does not invoke any move, copy, or swap operations on
+   individual elements. All iterators and references remain valid. The past-the-end iterator is invalidated.
+5. Exchanges the contents of a JSON string with those of `other`. Does not invoke any move, copy, or swap operations on
+   individual elements. All iterators and references remain valid. The past-the-end iterator is invalidated.
+6. Exchanges the contents of a binary value with those of `other`. Does not invoke any move, copy, or swap operations on
+   individual elements. All iterators and references remain valid. The past-the-end iterator is invalidated.
+7. Exchanges the contents of a binary value with those of `other`. Does not invoke any move, copy, or swap operations on
+   individual elements. All iterators and references remain valid. The past-the-end iterator is invalidated. Unlike
+   version (6), no binary subtype is involved.
+
+## Parameters
+
+`other` (in, out)
+:   value to exchange the contents with
+
+`left` (in, out)
+:   value to exchange the contents with
+
+`right` (in, out)
+:   value to exchange the contents with
+
+## Exceptions
+
+1. No-throw guarantee: this function never throws exceptions.
+2. No-throw guarantee: this function never throws exceptions.
+3. Throws [`type_error.310`](../../home/exceptions.md#jsonexceptiontype_error310) if called on JSON values other than
+   arrays; example: `"cannot use swap() with boolean"`
+4. Throws [`type_error.310`](../../home/exceptions.md#jsonexceptiontype_error310) if called on JSON values other than
+   objects; example: `"cannot use swap() with boolean"`
+5. Throws [`type_error.310`](../../home/exceptions.md#jsonexceptiontype_error310) if called on JSON values other than
+   strings; example: `"cannot use swap() with boolean"`
+6. Throws [`type_error.310`](../../home/exceptions.md#jsonexceptiontype_error310) if called on JSON values other than
+   binaries; example: `"cannot use swap() with boolean"`
+7. Throws [`type_error.310`](../../home/exceptions.md#jsonexceptiontype_error310) if called on JSON values other than
+   binaries; example: `"cannot use swap() with boolean"`
+
+## Complexity
+
+Constant.
+
+## Examples
+
+??? example "Example: Swap JSON value (1, 2)"
+
+    The example below shows how JSON values can be swapped with `swap()`.
+    
+    ```cpp
+    --8<-- "examples/swap__reference.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/swap__reference.output"
+    ```
+
+??? example "Example: Swap array (3)"
+
+    The example below shows how arrays can be swapped with `swap()`.
+    
+    ```cpp
+    --8<-- "examples/swap__array_t.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/swap__array_t.output"
+    ```
+
+??? example "Example: Swap object (4)"
+
+    The example below shows how objects can be swapped with `swap()`.
+    
+    ```cpp
+    --8<-- "examples/swap__object_t.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/swap__object_t.output"
+    ```
+
+??? example "Example: Swap string (5)"
+
+    The example below shows how strings can be swapped with `swap()`.
+    
+    ```cpp
+    --8<-- "examples/swap__string_t.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/swap__string_t.output"
+    ```
+
+??? example "Example: Swap string (6)"
+
+    The example below shows how binary values can be swapped with `swap()`.
+    
+    ```cpp
+    --8<-- "examples/swap__binary_t.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/swap__binary_t.output"
+    ```
+
+## See also
+
+- [std::swap<basic_json\>](std_swap.md)
+
+## Version history
+
+1. Since version 1.0.0.
+2. Since version 1.0.0.
+3. Since version 1.0.0.
+4. Since version 1.0.0.
+5. Since version 1.0.0.
+6. Since version 3.8.0.
+7. Since version 3.8.0.
\ No newline at end of file
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/to_bjdata.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/to_bjdata.md
new file mode 100644
index 000000000..48598a5e6
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/to_bjdata.md
@@ -0,0 +1,70 @@
+# <small>nlohmann::basic_json::</small>to_bjdata
+
+```cpp
+// (1)
+static std::vector<std::uint8_t> to_bjdata(const basic_json& j,
+                                           const bool use_size = false,
+                                           const bool use_type = false);
+
+// (2)
+static void to_bjdata(const basic_json& j, detail::output_adapter<std::uint8_t> o,
+                      const bool use_size = false, const bool use_type = false);
+static void to_bjdata(const basic_json& j, detail::output_adapter<char> o,
+                      const bool use_size = false, const bool use_type = false);
+```
+
+Serializes a given JSON value `j` to a byte vector using the BJData (Binary JData) serialization format. BJData aims to
+be more compact than JSON itself, yet more efficient to parse.
+
+1. Returns a byte vector containing the BJData serialization.
+2. Writes the BJData serialization to an output adapter.
+
+The exact mapping and its limitations is described on a [dedicated page](../../features/binary_formats/bjdata.md).
+
+## Parameters
+
+`j` (in)
+:   JSON value to serialize
+
+`o` (in)
+:   output adapter to write serialization to
+
+`use_size` (in)
+:   whether to add size annotations to container types; optional, `#!cpp false` by default.
+
+`use_type` (in)
+:   whether to add type annotations to container types (must be combined with `#!cpp use_size = true`); optional,
+`#!cpp false` by default.
+
+## Return value
+
+1. BJData serialization as byte vector
+2. (none)
+
+## Exception safety
+
+Strong guarantee: if an exception is thrown, there are no changes in the JSON value.
+
+## Complexity
+
+Linear in the size of the JSON value `j`.
+
+## Examples
+
+??? example
+
+    The example shows the serialization of a JSON value to a byte vector in BJData format.
+     
+    ```cpp
+    --8<-- "examples/to_bjdata.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/to_bjdata.output"
+    ```
+
+## Version history
+
+- Added in version 3.11.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/to_bson.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/to_bson.md
similarity index 85%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/to_bson.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/to_bson.md
index 747a4aa31..5c4324a3f 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/to_bson.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/to_bson.md
@@ -1,4 +1,4 @@
-# basic_json::to_bson
+# <small>nlohmann::basic_json::</small>to_bson
 
 ```cpp
 // (1)
@@ -15,6 +15,8 @@ so-called document).
 1. Returns a byte vector containing the BSON serialization.
 2. Writes the BSON serialization to an output adapter.
 
+The exact mapping and its limitations is described on a [dedicated page](../../features/binary_formats/bson.md).
+
 ## Parameters
 
 `j` (in)
@@ -26,7 +28,7 @@ so-called document).
 ## Return value
 
 1. BSON serialization as byte vector
-2. /
+2. (none)
 
 ## Exception safety
 
@@ -36,7 +38,7 @@ Strong guarantee: if an exception is thrown, there are no changes in the JSON va
 
 Linear in the size of the JSON value `j`.
 
-## Example
+## Examples
 
 ??? example
 
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/to_cbor.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/to_cbor.md
similarity index 87%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/to_cbor.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/to_cbor.md
index fd0eaa1fe..0f944c481 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/to_cbor.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/to_cbor.md
@@ -1,4 +1,4 @@
-# basic_json::to_cbor
+# <small>nlohmann::basic_json::</small>to_cbor
 
 ```cpp
 // (1)
@@ -16,6 +16,8 @@ parse.
 1. Returns a byte vector containing the CBOR serialization.
 2. Writes the CBOR serialization to an output adapter.
 
+The exact mapping and its limitations is described on a [dedicated page](../../features/binary_formats/cbor.md).
+
 ## Parameters
 
 `j` (in)
@@ -27,7 +29,7 @@ parse.
 ## Return value
 
 1. CBOR serialization as byte vector
-2. /
+2. (none)
 
 ## Exception safety
 
@@ -37,7 +39,7 @@ Strong guarantee: if an exception is thrown, there are no changes in the JSON va
 
 Linear in the size of the JSON value `j`.
 
-## Example
+## Examples
 
 ??? example
 
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/to_msgpack.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/to_msgpack.md
similarity index 86%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/to_msgpack.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/to_msgpack.md
index 1d438d7cd..7d40981d5 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/to_msgpack.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/to_msgpack.md
@@ -1,4 +1,4 @@
-# basic_json::to_msgpack
+# <small>nlohmann::basic_json::</small>to_msgpack
 
 ```cpp
 // (1)
@@ -15,6 +15,8 @@ serialization format which aims to be more compact than JSON itself, yet more ef
 1. Returns a byte vector containing the MessagePack serialization.
 2. Writes the MessagePack serialization to an output adapter.
 
+The exact mapping and its limitations is described on a [dedicated page](../../features/binary_formats/messagepack.md).
+
 ## Parameters
 
 `j` (in)
@@ -26,7 +28,7 @@ serialization format which aims to be more compact than JSON itself, yet more ef
 ## Return value
 
 1. MessagePack serialization as byte vector
-2. /
+2. (none)
 
 ## Exception safety
 
@@ -36,7 +38,7 @@ Strong guarantee: if an exception is thrown, there are no changes in the JSON va
 
 Linear in the size of the JSON value `j`.
 
-## Example
+## Examples
 
 ??? example
 
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/to_string.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/to_string.md
new file mode 100644
index 000000000..2b907e217
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/to_string.md
@@ -0,0 +1,65 @@
+# to_string(basic_json)
+
+```cpp
+template <typename BasicJsonType>
+std::string to_string(const BasicJsonType& j);
+```
+
+This function implements a user-defined to_string for JSON objects.
+
+## Template parameters
+
+`BasicJsonType`
+:   a specialization of [`basic_json`](index.md)
+
+## Return value
+
+string containing the serialization of the JSON value
+
+## Exception safety
+
+Strong guarantee: if an exception is thrown, there are no changes to any JSON value.
+
+## Exceptions
+
+Throws [`type_error.316`](../../home/exceptions.md#jsonexceptiontype_error316) if a string stored inside the JSON value
+is not UTF-8 encoded
+
+## Complexity
+
+Linear.
+
+## Possible implementation
+
+```cpp
+template <typename BasicJsonType>
+std::string to_string(const BasicJsonType& j)
+{
+    return j.dump();
+}
+```
+
+## Examples
+
+??? example
+
+    The following code shows how the library's `to_string()` function integrates with others, allowing
+    argument-dependent lookup.
+     
+    ```cpp
+    --8<-- "examples/to_string.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/to_string.output"
+    ```
+
+## See also
+
+- [dump](dump.md)
+
+## Version history
+
+Added in version 3.7.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/to_ubjson.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/to_ubjson.md
similarity index 90%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/to_ubjson.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/to_ubjson.md
index a12a62555..e3cd5d62b 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/to_ubjson.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/to_ubjson.md
@@ -1,4 +1,4 @@
-# basic_json::to_ubjson
+# <small>nlohmann::basic_json::</small>to_ubjson
 
 ```cpp
 // (1)
@@ -19,6 +19,8 @@ aims to be more compact than JSON itself, yet more efficient to parse.
 1. Returns a byte vector containing the UBJSON serialization.
 2. Writes the UBJSON serialization to an output adapter.
 
+The exact mapping and its limitations is described on a [dedicated page](../../features/binary_formats/ubjson.md).
+
 ## Parameters
 
 `j` (in)
@@ -37,7 +39,7 @@ aims to be more compact than JSON itself, yet more efficient to parse.
 ## Return value
 
 1. UBJSON serialization as byte vector
-2. /
+2. (none)
 
 ## Exception safety
 
@@ -47,7 +49,7 @@ Strong guarantee: if an exception is thrown, there are no changes in the JSON va
 
 Linear in the size of the JSON value `j`.
 
-## Example
+## Examples
 
 ??? example
 
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/type.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/type.md
new file mode 100644
index 000000000..deedd6b69
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/type.md
@@ -0,0 +1,54 @@
+# <small>nlohmann::basic_json::</small>type
+
+```cpp
+constexpr value_t type() const noexcept;
+```
+
+Return the type of the JSON value as a value from the [`value_t`](value_t.md) enumeration.
+
+## Return value
+
+the type of the JSON value
+
+| Value type                | return value               |
+|---------------------------|----------------------------|
+| `#!json null`             | `value_t::null`            |
+| boolean                   | `value_t::boolean`         |
+| string                    | `value_t::string`          |
+| number (integer)          | `value_t::number_integer`  |
+| number (unsigned integer) | `value_t::number_unsigned` |
+| number (floating-point)   | `value_t::number_float`    |
+| object                    | `value_t::object`          |
+| array                     | `value_t::array`           |
+| binary                    | `value_t::binary`          |
+| discarded                 | `value_t::discarded`       |
+
+## Exception safety
+
+No-throw guarantee: this member function never throws exceptions.
+
+## Complexity
+
+Constant.
+
+## Examples
+
+??? example
+
+    The following code exemplifies `type()` for all JSON types.
+    
+    ```cpp
+    --8<-- "examples/type.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/type.output"
+    ```
+
+## Version history
+
+- Added in version 1.0.0.
+- Added unsigned integer type in version 2.0.0.
+- Added binary type in version 3.8.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/type_error.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/type_error.md
new file mode 100644
index 000000000..cda54c089
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/type_error.md
@@ -0,0 +1,68 @@
+# <small>nlohmann::basic_json::</small>type_error
+
+```cpp
+class type_error : public exception;
+```
+
+This exception is thrown in case of a type error; that is, a library function is executed on a JSON value whose type
+does not match the expected semantics.
+
+Exceptions have ids 3xx (see [list of type errors](../../home/exceptions.md#type-errors)).
+
+```plantuml
+std::exception <|-- basic_json::exception
+basic_json::exception <|-- basic_json::parse_error
+basic_json::exception <|-- basic_json::invalid_iterator
+basic_json::exception <|-- basic_json::type_error
+basic_json::exception <|-- basic_json::out_of_range
+basic_json::exception <|-- basic_json::other_error
+
+interface std::exception {}
+
+class basic_json::exception {
+    + const int id
+    + const char* what() const
+}
+
+class basic_json::parse_error {
+    + const std::size_t byte
+}
+
+class basic_json::type_error #FFFF00 {}
+```
+
+## Member functions
+
+- **what** - returns explanatory string
+
+## Member variables
+
+- **id** - the id of the exception
+
+## Examples
+
+??? example
+
+    The following code shows how a `type_error` exception can be caught.
+    
+    ```cpp
+    --8<-- "examples/type_error.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/type_error.output"
+    ```
+
+## See also
+
+- [List of type errors](../../home/exceptions.md#type-errors)
+- [`parse_error`](parse_error.md) for exceptions indicating a parse error
+- [`invalid_iterator`](invalid_iterator.md) for exceptions indicating errors with iterators
+- [`out_of_range`](out_of_range.md) for exceptions indicating access out of the defined range
+- [`other_error`](other_error.md) for exceptions indicating other library errors
+
+## Version history
+
+- Since version 3.0.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/type_name.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/type_name.md
new file mode 100644
index 000000000..389c2b1dd
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/type_name.md
@@ -0,0 +1,54 @@
+# <small>nlohmann::basic_json::</small>type_name
+
+```cpp
+const char* type_name() const noexcept;
+```
+
+Returns the type name as string to be used in error messages -- usually to indicate that a function was called on a
+wrong JSON type.
+    
+## Return value
+
+a string representation of the type ([`value_t`](value_t.md)):
+
+| Value type                                         | return value  |
+|----------------------------------------------------|---------------|
+| `#!json null`                                      | `"null"`      |
+| boolean                                            | `"boolean"`   |
+| string                                             | `"string"`    |
+| number (integer, unsigned integer, floating-point) | `"number"`    |
+| object                                             | `"object"`    |
+| array                                              | `"array"`     |
+| binary                                             | `"binary"`    |
+| discarded                                          | `"discarded"` |
+
+## Exception safety
+
+No-throw guarantee: this member function never throws exceptions.
+
+## Complexity
+
+Constant.
+
+## Examples
+
+??? example
+
+    The following code exemplifies `type_name()` for all JSON types.
+    
+    ```cpp
+    --8<-- "examples/type_name.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/type_name.output"
+    ```
+
+## Version history
+
+- Added in version 1.0.0.
+- Part of the public API version since 2.1.0.
+- Changed return value to `const char*` and added `noexcept` in version 3.0.0.
+- Added support for binary type in version 3.8.0.
diff --git a/external_imported/json/doc/mkdocs/docs/api/basic_json/unflatten.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/unflatten.md
similarity index 92%
rename from external_imported/json/doc/mkdocs/docs/api/basic_json/unflatten.md
rename to external_imported/json/docs/mkdocs/docs/api/basic_json/unflatten.md
index 379428639..d9778036c 100644
--- a/external_imported/json/doc/mkdocs/docs/api/basic_json/unflatten.md
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/unflatten.md
@@ -1,4 +1,4 @@
-# basic_json::unflatten
+# <small>nlohmann::basic_json::</small>unflatten
 
 ```cpp
 basic_json unflatten() const;
@@ -15,6 +15,10 @@ The function restores the arbitrary nesting of a JSON value that has been flatte
 
 the original JSON from a flattened version
 
+## Exception safety
+
+Strong exception safety: if an exception occurs, the original value stays intact.
+
 ## Exceptions
 
 The function can throw the following exceptions:
@@ -22,10 +26,6 @@ The function can throw the following exceptions:
 - Throws [`type_error.314`](../../home/exceptions.md#jsonexceptiontype_error314) if value is not an object
 - Throws [`type_error.315`](../../home/exceptions.md#jsonexceptiontype_error315) if object values are not primitive
 
-## Exception safety
-
-Strong exception safety: if an exception occurs, the original value stays intact.
-
 ## Complexity
 
 Linear in the size the JSON value.
@@ -36,7 +36,7 @@ Empty objects and arrays are flattened by [`flatten()`](flatten.md) to `#!json n
 their original type. Apart from this example, for a JSON value `j`, the following is always true:
 `#!cpp j == j.flatten().unflatten()`.
 
-## Example
+## Examples
 
 ??? example
 
@@ -52,6 +52,10 @@ their original type. Apart from this example, for a JSON value `j`, the followin
     --8<-- "examples/unflatten.output"
     ```
 
+## See also
+
+- [flatten](flatten.md) the reverse function
+
 ## Version history
 
 - Added in version 2.0.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/update.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/update.md
new file mode 100644
index 000000000..a594cf9d0
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/update.md
@@ -0,0 +1,142 @@
+# <small>nlohmann::basic_json::</small>update
+
+```cpp
+// (1)
+void update(const_reference j, bool merge_objects = false);
+
+// (2)
+void update(const_iterator first, const_iterator last, bool merge_objects = false);
+```
+
+1. Inserts all values from JSON object `j`.
+2. Inserts all values from range `[first, last)`
+
+When `merge_objects` is `#!c false` (default), existing keys are overwritten. When `merge_objects` is `#!c true`,
+recursively merges objects with common keys.
+
+The function is motivated by Python's [dict.update](https://docs.python.org/3.6/library/stdtypes.html#dict.update)
+function.
+
+## Parameters
+
+`j` (in)
+:   JSON object to read values from
+
+`merge_objects` (in)
+:   when `#!c true`, existing keys are not overwritten, but contents of objects are merged recursively (default:
+    `#!c false`)
+
+`first` (in)
+:   begin of the range of elements to insert
+
+`last` (in)
+:   end of the range of elements to insert
+
+## Exceptions
+
+1. The function can throw the following exceptions:
+    - Throws [`type_error.312`](../../home/exceptions.md#jsonexceptiontype_error312) if called on JSON values other than
+      objects; example: `"cannot use update() with string"`
+2. The function can throw the following exceptions:
+    - Throws [`type_error.312`](../../home/exceptions.md#jsonexceptiontype_error312) if called on JSON values other than
+      objects; example: `"cannot use update() with string"`
+    - Throws [`invalid_iterator.202`](../../home/exceptions.md#jsonexceptioninvalid_iterator202) if called on an
+      iterator which does not belong to the current JSON value; example: `"iterator does not fit current value"`
+    - Throws [`invalid_iterator.210`](../../home/exceptions.md#jsonexceptioninvalid_iterator210) if `first` and `last`
+      do not belong to the same JSON value; example: `"iterators do not fit"`
+
+## Complexity
+
+1. O(N*log(size() + N)), where N is the number of elements to insert.
+2. O(N*log(size() + N)), where N is the number of elements to insert.
+
+## Examples
+
+??? example
+
+    The example shows how `update()` is used.
+    
+    ```cpp
+    --8<-- "examples/update.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/update.output"
+    ```
+
+??? example
+
+    The example shows how `update()` is used.
+    
+    ```cpp
+    --8<-- "examples/update__range.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/update__range.output"
+    ```
+
+??? example
+
+    One common use case for this function is the handling of user settings. Assume your application can be configured in
+    some aspects:
+
+    ```json
+    {
+        "color": "red",
+        "active": true,
+        "name": {"de": "Maus", "en": "mouse"}
+    }
+    ```
+
+    The user may override the default settings selectively:
+
+    ```json
+    {
+        "color": "blue",
+        "name": {"es": "ratón"},
+    }
+    ```
+
+    Then `update` manages the merging of default settings and user settings:
+ 
+    ```cpp
+    auto user_settings = json::parse("config.json");
+    auto effective_settings = get_default_settings();
+    effective_settings.update(user_settings);
+    ```
+    
+    Now `effective_settings` contains the default settings, but those keys set by the user are overwritten:
+
+    ```json
+    {
+        "color": "blue",
+        "active": true,
+        "name": {"es": "ratón"}
+    }
+    ```
+
+    Note existing keys were just overwritten. To merge objects, `merge_objects` setting should be set to `#!c true`:
+    
+    ```cpp
+    auto user_settings = json::parse("config.json");
+    auto effective_settings = get_default_settings();
+    effective_settings.update(user_settings, true);
+    ```
+
+    ```json
+    {
+        "color": "blue",
+        "active": true,
+        "name": {"de": "Maus", "en": "mouse", "es": "ratón"}
+    }
+    ```
+
+## Version history
+
+- Added in version 3.0.0.
+- Added `merge_objects` parameter in 3.10.4.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/value.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/value.md
new file mode 100644
index 000000000..edb5406ba
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/value.md
@@ -0,0 +1,159 @@
+# <small>nlohmann::basic_json::</small>value
+
+```cpp
+// (1)
+template<class ValueType>
+ValueType value(const typename object_t::key_type& key,
+                ValueType&& default_value) const;
+
+// (2)
+template<class ValueType, class KeyType>
+ValueType value(KeyType&& key,
+                ValueType&& default_value) const;
+
+// (3)
+template<class ValueType>
+ValueType value(const json_pointer& ptr,
+                const ValueType& default_value) const;
+```
+
+1. Returns either a copy of an object's element at the specified key `key` or a given default value if no element with
+   key `key` exists.
+   
+    The function is basically equivalent to executing
+    ```cpp
+    try {
+       return at(key);
+    } catch(out_of_range) {
+       return default_value;
+    }
+    ```
+
+2. See 1. This overload is only available if `KeyType` is comparable with `#!cpp typename object_t::key_type` and
+   `#!cpp typename object_comparator_t::is_transparent` denotes a type.
+
+3. Returns either a copy of an object's element at the specified JSON pointer `ptr` or a given default value if no value
+   at `ptr` exists.
+   
+    The function is basically equivalent to executing
+    ```cpp
+    try {
+       return at(ptr);
+    } catch(out_of_range) {
+       return default_value;
+    }
+    ```
+
+!!! note "Differences to `at` and `operator[]`"
+
+    - Unlike [`at`](at.md), this function does not throw if the given `key`/`ptr` was not found.
+    - Unlike [`operator[]`](operator[].md), this function does not implicitly add an element to the position defined by
+     `key`/`ptr` key. This function is furthermore also applicable to const objects.
+
+## Template parameters
+
+`KeyType`
+:   A type for an object key other than [`json_pointer`](../json_pointer/index.md) that is comparable with
+    [`string_t`](string_t.md) using  [`object_comparator_t`](object_comparator_t.md).
+    This can also be a string view (C++17).
+`ValueType` 
+:   type compatible to JSON values, for instance `#!cpp int` for JSON integer numbers, `#!cpp bool` for JSON booleans,
+    or `#!cpp std::vector` types for JSON arrays. Note the type of the expected value at `key`/`ptr` and the default
+    value `default_value` must be compatible.
+
+## Parameters
+
+`key` (in)
+:   key of the element to access
+
+`default_value` (in)
+:   the value to return if `key`/`ptr` found no value
+
+`ptr` (in)
+:   a JSON pointer to the element to access
+
+## Return value
+
+1. copy of the element at key `key` or `default_value` if `key` is not found
+2. copy of the element at key `key` or `default_value` if `key` is not found
+3. copy of the element at JSON Pointer `ptr` or `default_value` if no value for `ptr` is found
+
+## Exception safety
+
+Strong guarantee: if an exception is thrown, there are no
+changes to any JSON value.
+
+## Exceptions
+
+1. The function can throw the following exceptions:
+    - Throws [`type_error.302`](../../home/exceptions.md#jsonexceptiontype_error302) if `default_value` does not match
+      the type of the value at `key`
+    - Throws [`type_error.306`](../../home/exceptions.md#jsonexceptiontype_error306) if the JSON value is not an object;
+      in that case, using `value()` with a key makes no sense.
+2. See 1.
+3. The function can throw the following exceptions:
+    - Throws [`type_error.302`](../../home/exceptions.md#jsonexceptiontype_error302) if `default_value` does not match
+      the type of the value at `ptr`
+    - Throws [`type_error.306`](../../home/exceptions.md#jsonexceptiontype_error306) if the JSON value is not an object;
+      in that case, using `value()` with a key makes no sense.
+
+## Complexity
+
+1. Logarithmic in the size of the container.
+2. Logarithmic in the size of the container.
+3. Logarithmic in the size of the container.
+
+## Examples
+
+??? example "Example: (1) access specified object element with default value"
+
+    The example below shows how object elements can be queried with a default value.
+    
+    ```cpp
+    --8<-- "examples/value__object_t_key_type.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/value__object_t_key_type.output"
+    ```
+
+??? example "Example: (2) access specified object element using string_view with default value"
+
+    The example below shows how object elements can be queried with a default value.
+    
+    ```cpp
+    --8<-- "examples/value__keytype.c++17.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/value__keytype.c++17.output"
+    ```
+
+??? example "Example: (3) access specified object element via JSON Pointer with default value"
+
+    The example below shows how object elements can be queried with a default value.
+    
+    ```cpp
+    --8<-- "examples/value__json_ptr.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/value__json_ptr.output"
+    ```
+
+## See also
+
+- see [`at`](at.md) for access by reference with range checking
+- see [`operator[]`](operator%5B%5D.md) for unchecked access by reference
+
+## Version history
+
+1. Added in version 1.0.0. Changed parameter `default_value` type from `const ValueType&` to `ValueType&&` in version 3.11.0.
+2. Added in version 3.11.0. Made `ValueType` the first template parameter in version 3.11.2.
+3. Added in version 2.0.2.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/value_t.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/value_t.md
new file mode 100644
index 000000000..1505e02d0
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/value_t.md
@@ -0,0 +1,81 @@
+# <small>nlohmann::basic_json::</small>value_t
+
+```cpp
+enum class value_t : std::uint8_t {
+    null,
+    object,
+    array,
+    string,
+    boolean,
+    number_integer,
+    number_unsigned,
+    number_float,
+    binary,
+    discarded
+};
+```
+
+This enumeration collects the different JSON types. It is internally used to distinguish the stored values, and the
+functions [`is_null`](is_null.md), [`is_object`](is_object.md), [`is_array`](is_array.md), [`is_string`](is_string.md),
+[`is_boolean`](is_boolean.md), [`is_number`](is_number.md) (with [`is_number_integer`](is_number_integer.md),
+[`is_number_unsigned`](is_number_unsigned.md), and [`is_number_float`](is_number_float.md)),
+[`is_discarded`](is_discarded.md), [`is_binary`](is_binary.md), [`is_primitive`](is_primitive.md), and
+[`is_structured`](is_structured.md) rely on it.
+
+## Notes
+
+!!! note "Ordering"
+
+    The order of types is as follows:
+
+    1. `null`
+    2. `boolean`
+    3. `number_integer`, `number_unsigned`, `number_float`
+    4. `object`
+    5. `array`
+    6. `string`
+    7. `binary`
+
+    `discarded` is unordered.
+
+!!! note "Types of numbers"
+
+    There are three enumerators for numbers (`number_integer`, `number_unsigned`, and `number_float`) to distinguish
+    between different types of numbers:
+
+      - [`number_unsigned_t`](number_unsigned_t.md) for unsigned integers
+      - [`number_integer_t`](number_integer_t.md) for signed integers
+      - [`number_float_t`](number_float_t.md) for floating-point numbers or to approximate integers which do not fit
+        into the limits of their respective type
+
+!!! warning "Comparison operators"
+
+    `operator<` and `operator<=>` (since C++20) are overloaded and compare according to the ordering described above.
+    Until C++20 all other relational and equality operators yield results according to the integer value of each
+    enumerator. Since C++20 some compilers consider the _rewritten candidates_ generated from `operator<=>` during
+    overload resolution, while others do not. For predictable and portable behavior use:
+
+      - `operator<` or `operator<=>` when wanting to compare according to the order described above
+      - `operator==` or `operator!=` when wanting to compare according to each enumerators integer value
+
+## Examples
+
+??? example
+
+    The following code how `type()` queries the `value_t` for all JSON types.
+    
+    ```cpp
+    --8<-- "examples/type.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/type.output"
+    ```
+
+## Version history
+
+- Added in version 1.0.0.
+- Added unsigned integer type in version 2.0.0.
+- Added binary type in version 3.8.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/basic_json/~basic_json.md b/external_imported/json/docs/mkdocs/docs/api/basic_json/~basic_json.md
new file mode 100644
index 000000000..64e944006
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/basic_json/~basic_json.md
@@ -0,0 +1,21 @@
+# <small>nlohmann::basic_json::</small>~basic_json
+
+```cpp
+~basic_json() noexcept;
+```
+
+Destroys the JSON value and frees all allocated memory.
+
+## Exception safety
+
+No-throw guarantee: this member function never throws exceptions.
+
+## Complexity
+
+Linear.
+
+<!-- NOLINT Examples -->
+
+## Version history
+
+- Added in version 1.0.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/byte_container_with_subtype/byte_container_with_subtype.md b/external_imported/json/docs/mkdocs/docs/api/byte_container_with_subtype/byte_container_with_subtype.md
new file mode 100644
index 000000000..9913a9b5c
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/byte_container_with_subtype/byte_container_with_subtype.md
@@ -0,0 +1,46 @@
+# <small>nlohmann::byte_container_with_subtype::</small>byte_container_with_subtype
+
+```cpp
+// (1)
+byte_container_with_subtype();
+
+// (2)
+byte_container_with_subtype(const container_type& container);
+byte_container_with_subtype(container_type&& container);
+
+// (3)
+byte_container_with_subtype(const container_type& container, subtype_type subtype);
+byte_container_with_subtype(container_type&& container, subtype_type subtype);
+```
+
+1. Create empty binary container without subtype.
+2. Create binary container without subtype.
+3. Create binary container with subtype.
+
+## Parameters
+
+`container` (in)
+:   binary container
+
+`subtype` (in)
+:   subtype
+
+## Examples
+
+??? example
+
+    The example below demonstrates how byte containers can be created.
+
+    ```cpp
+    --8<-- "examples/byte_container_with_subtype__byte_container_with_subtype.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/byte_container_with_subtype__byte_container_with_subtype.output"
+    ```
+
+## Version history
+
+Since version 3.8.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/byte_container_with_subtype/clear_subtype.md b/external_imported/json/docs/mkdocs/docs/api/byte_container_with_subtype/clear_subtype.md
new file mode 100644
index 000000000..c62dead36
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/byte_container_with_subtype/clear_subtype.md
@@ -0,0 +1,36 @@
+# <small>nlohmann::byte_container_with_subtype::</small>clear_subtype
+
+```cpp
+void clear_subtype() noexcept;
+```
+
+Clears the binary subtype and flags the value as not having a subtype, which has implications for serialization; for
+instance MessagePack will prefer the bin family over the ext family.
+
+## Exception safety
+
+No-throw guarantee: this function never throws exceptions.
+
+## Complexity
+
+Constant.
+
+## Examples
+
+??? example
+
+    The example below demonstrates how `clear_subtype` can remove subtypes.
+
+    ```cpp
+    --8<-- "examples/byte_container_with_subtype__clear_subtype.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/byte_container_with_subtype__clear_subtype.output"
+    ```
+
+## Version history
+
+Since version 3.8.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/byte_container_with_subtype/has_subtype.md b/external_imported/json/docs/mkdocs/docs/api/byte_container_with_subtype/has_subtype.md
new file mode 100644
index 000000000..e06286e29
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/byte_container_with_subtype/has_subtype.md
@@ -0,0 +1,39 @@
+# <small>nlohmann::byte_container_with_subtype::</small>has_subtype
+
+```cpp
+constexpr bool has_subtype() const noexcept;
+```
+
+Returns whether the value has a subtype.
+
+## Return value
+
+whether the value has a subtype
+
+## Exception safety
+
+No-throw guarantee: this function never throws exceptions.
+
+## Complexity
+
+Constant.
+
+## Examples
+
+??? example
+
+    The example below demonstrates how `has_subtype` can check whether a subtype was set.
+
+    ```cpp
+    --8<-- "examples/byte_container_with_subtype__has_subtype.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/byte_container_with_subtype__has_subtype.output"
+    ```
+
+## Version history
+
+Since version 3.8.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/byte_container_with_subtype/index.md b/external_imported/json/docs/mkdocs/docs/api/byte_container_with_subtype/index.md
new file mode 100644
index 000000000..277fffa34
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/byte_container_with_subtype/index.md
@@ -0,0 +1,35 @@
+# <small>nlohmann::</small>byte_container_with_subtype
+
+```cpp
+template<typename BinaryType>
+class byte_container_with_subtype : public BinaryType;
+```
+
+This type extends the template parameter `BinaryType` provided to [`basic_json`](../basic_json/index.md) with a subtype
+used by BSON and MessagePack. This type exists so that the user does not have to specify a type themselves with a
+specific naming scheme in  order to override the binary type.
+
+## Template parameters
+
+`BinaryType`
+:   container to store bytes (`#!cpp std::vector<std::uint8_t>` by default)
+
+## Member types
+
+- **container_type** - the type of the underlying container (`BinaryType`)
+- **subtype_type** - the type of the subtype (`#!cpp std::uint64_t`)
+
+## Member functions
+
+- [(constructor)](byte_container_with_subtype.md)
+- **operator==** - comparison: equal
+- **operator!=** - comparison: not equal
+- [**set_subtype**](subtype.md) - sets the binary subtype
+- [**subtype**](subtype.md) - return the binary subtype
+- [**has_subtype**](has_subtype.md) - return whether the value has a subtype
+- [**clear_subtype**](clear_subtype.md) - clears the binary subtype
+
+## Version history
+
+- Added in version 3.8.0.
+- Changed type of subtypes to `#!cpp std::uint64_t` in 3.10.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/byte_container_with_subtype/set_subtype.md b/external_imported/json/docs/mkdocs/docs/api/byte_container_with_subtype/set_subtype.md
new file mode 100644
index 000000000..cf21732b8
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/byte_container_with_subtype/set_subtype.md
@@ -0,0 +1,41 @@
+# <small>nlohmann::byte_container_with_subtype::</small>set_subtype
+
+```cpp
+void set_subtype(subtype_type subtype) noexcept;
+```
+
+Sets the binary subtype of the value, also flags a binary JSON value as having a subtype, which has implications for
+serialization.
+
+## Parameters
+
+`subtype` (in)
+:   subtype to set
+
+## Exception safety
+
+No-throw guarantee: this function never throws exceptions.
+
+## Complexity
+
+Constant.
+
+## Examples
+
+??? example
+
+    The example below demonstrates how a subtype can be set with `set_subtype`.
+
+    ```cpp
+    --8<-- "examples/byte_container_with_subtype__set_subtype.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/byte_container_with_subtype__set_subtype.output"
+    ```
+
+## Version history
+
+Since version 3.8.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/byte_container_with_subtype/subtype.md b/external_imported/json/docs/mkdocs/docs/api/byte_container_with_subtype/subtype.md
new file mode 100644
index 000000000..389241a79
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/byte_container_with_subtype/subtype.md
@@ -0,0 +1,42 @@
+# <small>nlohmann::byte_container_with_subtype::</small>subtype
+
+```cpp
+constexpr subtype_type subtype() const noexcept;
+```
+
+Returns the numerical subtype of the value if it has a subtype. If it does not have a subtype, this function will return
+`subtype_type(-1)` as a sentinel value.
+
+## Return value
+
+the numerical subtype of the binary value, or `subtype_type(-1)` if no subtype is set
+
+## Exception safety
+
+No-throw guarantee: this function never throws exceptions.
+
+## Complexity
+
+Constant.
+
+## Examples
+
+??? example
+
+    The example below demonstrates how the subtype can be retrieved with `subtype`. Note how `subtype_type(-1)` is
+    returned for container `c1`.
+
+    ```cpp
+    --8<-- "examples/byte_container_with_subtype__subtype.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/byte_container_with_subtype__subtype.output"
+    ```
+
+## Version history
+
+- Added in version 3.8.0
+- Fixed return value to properly return `subtype_type(-1)` as documented in version 3.10.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/json.md b/external_imported/json/docs/mkdocs/docs/api/json.md
new file mode 100644
index 000000000..36edcc2c1
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/json.md
@@ -0,0 +1,28 @@
+# <small>nlohmann::</small>json
+
+```cpp
+using json = basic_json<>;
+```
+
+This type is the default specialization of the [basic_json](basic_json/index.md) class which uses the standard template
+types.
+
+## Examples
+
+??? example
+
+    The example below demonstrates how to use the type `nlohmann::json`.
+
+    ```cpp
+    --8<-- "examples/README.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/README.output"
+    ```
+
+## Version history
+
+Since version 1.0.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/json_pointer/back.md b/external_imported/json/docs/mkdocs/docs/api/json_pointer/back.md
new file mode 100644
index 000000000..240bc6e1e
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/json_pointer/back.md
@@ -0,0 +1,40 @@
+# <small>nlohmann::json_pointer::</small>back
+
+```cpp
+const string_t& back() const;
+```
+
+Return last reference token.
+
+## Return value
+
+Last reference token.
+
+## Exceptions
+
+Throws [out_of_range.405](../../home/exceptions.md#jsonexceptionout_of_range405) if JSON pointer has no parent.
+
+## Complexity
+
+Constant.
+
+## Examples
+
+??? example
+
+    The example shows the usage of `back`.
+     
+    ```cpp
+    --8<-- "examples/json_pointer__back.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/json_pointer__back.output"
+    ```
+
+## Version history
+
+- Added in version 3.6.0.
+- Changed return type to `string_t` in version 3.11.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/json_pointer/empty.md b/external_imported/json/docs/mkdocs/docs/api/json_pointer/empty.md
new file mode 100644
index 000000000..346364ad5
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/json_pointer/empty.md
@@ -0,0 +1,39 @@
+# <small>nlohmann::json_pointer::</small>empty
+
+```cpp
+bool empty() const noexcept;
+```
+
+Return whether pointer points to the root document.
+
+## Return value
+
+`#!cpp true` iff the JSON pointer points to the root document.
+
+## Exception safety
+
+No-throw guarantee: this function never throws exceptions.
+
+## Complexity
+
+Constant.
+
+## Examples
+
+??? example
+
+    The example shows the result of `empty` for different JSON Pointers.
+     
+    ```cpp
+    --8<-- "examples/json_pointer__empty.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/json_pointer__empty.output"
+    ```
+
+## Version history
+
+Added in version 3.6.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/json_pointer/index.md b/external_imported/json/docs/mkdocs/docs/api/json_pointer/index.md
new file mode 100644
index 000000000..22e246405
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/json_pointer/index.md
@@ -0,0 +1,52 @@
+# <small>nlohmann::</small>json_pointer
+
+```cpp
+template<typename RefStringType>
+class json_pointer;
+```
+
+A JSON pointer defines a string syntax for identifying a specific value within a JSON document. It can be used with
+functions [`at`](../basic_json/at.md) and [`operator[]`](../basic_json/operator%5B%5D.md). Furthermore, JSON pointers
+are the base for JSON patches.
+
+## Template parameters
+
+`RefStringType`
+:   the string type used for the reference tokens making up the JSON pointer
+
+!!! warning "Deprecation"
+
+    For backwards compatibility `RefStringType` may also be a specialization of [`basic_json`](../basic_json/index.md)
+    in which case `string_t` will be deduced as [`basic_json::string_t`](../basic_json/string_t.md). This feature is
+    deprecated and may be removed in a future major version.
+
+## Member types
+
+- [**string_t**](string_t.md) - the string type used for the reference tokens
+
+## Member functions
+
+- [(constructor)](json_pointer.md)
+- [**to_string**](to_string.md) - return a string representation of the JSON pointer
+- [**operator string_t**](operator_string_t.md) - return a string representation of the JSON pointer
+- [**operator==**](operator_eq.md) - compare: equal
+- [**operator!=**](operator_ne.md) - compare: not equal
+- [**operator/=**](operator_slasheq.md) - append to the end of the JSON pointer
+- [**operator/**](operator_slash.md) - create JSON Pointer by appending
+- [**parent_pointer**](parent_pointer.md) - returns the parent of this JSON pointer
+- [**pop_back**](pop_back.md) - remove last reference token
+- [**back**](back.md) - return last reference token
+- [**push_back**](push_back.md) - append an unescaped token at the end of the pointer
+- [**empty**](empty.md) - return whether pointer points to the root document
+
+## Literals
+
+- [**operator""_json_pointer**](../operator_literal_json_pointer.md) - user-defined string literal for JSON pointers
+## See also
+
+- [RFC 6901](https://datatracker.ietf.org/doc/html/rfc6901)
+
+## Version history
+
+- Added in version 2.0.0.
+- Changed template parameter from `basic_json` to string type in version 3.11.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/json_pointer/json_pointer.md b/external_imported/json/docs/mkdocs/docs/api/json_pointer/json_pointer.md
new file mode 100644
index 000000000..5e7057fc9
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/json_pointer/json_pointer.md
@@ -0,0 +1,41 @@
+# <small>nlohmann::json_pointer::</small>json_pointer
+
+```cpp
+explicit json_pointer(const string_t& s = "");
+```
+
+Create a JSON pointer according to the syntax described in
+[Section 3 of RFC6901](https://tools.ietf.org/html/rfc6901#section-3).
+
+## Parameters
+
+`s` (in)
+:    string representing the JSON pointer; if omitted, the empty string is assumed which references the whole JSON value
+
+## Exceptions
+
+- Throws [parse_error.107](../../home/exceptions.md#jsonexceptionparse_error107) if the given JSON pointer `s` is 
+  nonempty and does not begin with a slash (`/`); see example below.
+- Throws [parse_error.108](../../home/exceptions.md#jsonexceptionparse_error108) if a tilde (`~`) in the given JSON
+  pointer `s` is not followed by `0` (representing `~`) or `1` (representing `/`); see example below.
+
+## Examples
+
+??? example
+
+    The example shows the construction several valid JSON pointers as well as the exceptional behavior.
+     
+    ```cpp
+    --8<-- "examples/json_pointer.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/json_pointer.output"
+    ```
+
+## Version history
+
+- Added in version 2.0.0.
+- Changed type of `s` to `string_t` in version 3.11.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/json_pointer/operator_eq.md b/external_imported/json/docs/mkdocs/docs/api/json_pointer/operator_eq.md
new file mode 100644
index 000000000..807ae1d0c
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/json_pointer/operator_eq.md
@@ -0,0 +1,113 @@
+# <small>nlohmann::json_pointer::</small>operator==
+
+```cpp
+// until C++20
+template<typename RefStringTypeLhs, typename RefStringTypeRhs>
+bool operator==(
+    const json_pointer<RefStringTypeLhs>& lhs,
+    const json_pointer<RefStringTypeRhs>& rhs) noexcept;            // (1)
+
+template<typename RefStringTypeLhs, typename StringType>
+bool operator==(
+    const json_pointer<RefStringTypeLhs>& lhs,
+    const StringType& rhs);                                         // (2)
+
+template<typename RefStringTypeRhs, typename StringType>
+bool operator==(
+    const StringType& lhs,
+    const json_pointer<RefStringTypeRhs>& rhs);                     // (2)
+
+// since C++20
+class json_pointer {
+    template<typename RefStringTypeRhs>
+    bool operator==(
+        const json_pointer<RefStringTypeRhs>& rhs) const noexcept;  // (1)
+
+    bool operator==(const string_t& rhs) const;                     // (2)
+};
+```
+
+1. Compares two JSON pointers for equality by comparing their reference tokens.
+
+2. Compares a JSON pointer and a string or a string and a JSON pointer for equality by converting the string to a JSON
+   pointer and comparing the JSON pointers according to 1.
+
+## Template parameters
+
+`RefStringTypeLhs`, `RefStringTypeRhs`
+:   the string type of the left-hand side or right-hand side JSON pointer, respectively
+
+`StringType`
+:   the string type derived from the `json_pointer` operand ([`json_pointer::string_t`](string_t.md))
+
+## Parameters
+
+`lhs` (in)
+:   first value to consider
+
+`rhs` (in)
+:   second value to consider
+
+## Return value
+
+whether the values `lhs`/`*this` and `rhs` are equal
+
+## Exception safety
+
+1. No-throw guarantee: this function never throws exceptions.
+2. Strong exception safety: if an exception occurs, the original value stays intact.
+
+## Exceptions
+
+1. (none)
+2. The function can throw the following exceptions:
+   - Throws [parse_error.107](../../home/exceptions.md#jsonexceptionparse_error107) if the given JSON pointer `s` is
+     nonempty and does not begin with a slash (`/`); see example below.
+   - Throws [parse_error.108](../../home/exceptions.md#jsonexceptionparse_error108) if a tilde (`~`) in the given JSON
+     pointer `s` is not followed by `0` (representing `~`) or `1` (representing `/`); see example below.
+
+## Complexity
+
+Constant if `lhs` and `rhs` differ in the number of reference tokens, otherwise linear in the number of reference
+tokens.
+
+## Notes
+
+!!! warning "Deprecation"
+
+    Overload 2 is deprecated and will be removed in a future major version release.
+
+## Examples
+
+??? example "Example: (1) Comparing JSON pointers"
+
+    The example demonstrates comparing JSON pointers.
+        
+    ```cpp
+    --8<-- "examples/json_pointer__operator__equal.cpp"
+    ```
+    
+    Output:
+    
+    ```
+    --8<-- "examples/json_pointer__operator__equal.output"
+    ```
+
+??? example "Example: (2) Comparing JSON pointers and strings"
+
+    The example demonstrates comparing JSON pointers and strings, and when doing so may raise an exception.
+        
+    ```cpp
+    --8<-- "examples/json_pointer__operator__equal_stringtype.cpp"
+    ```
+    
+    Output:
+    
+    ```
+    --8<-- "examples/json_pointer__operator__equal_stringtype.output"
+    ```
+
+## Version history
+
+1. Added in version 2.1.0. Added C++20 member functions in version 3.11.2.
+2. Added for backward compatibility and deprecated in version 3.11.2.
diff --git a/external_imported/json/docs/mkdocs/docs/api/json_pointer/operator_ne.md b/external_imported/json/docs/mkdocs/docs/api/json_pointer/operator_ne.md
new file mode 100644
index 000000000..1f3e3247e
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/json_pointer/operator_ne.md
@@ -0,0 +1,109 @@
+# <small>nlohmann::json_pointer::</small>operator!=
+
+```cpp
+// until C++20
+template<typename RefStringTypeLhs, typename RefStringTypeRhs>
+bool operator!=(
+    const json_pointer<RefStringTypeLhs>& lhs,
+    const json_pointer<RefStringTypeRhs>& rhs) noexcept;  // (1)
+
+template<typename RefStringTypeLhs, typename StringType>
+bool operator!=(
+    const json_pointer<RefStringTypeLhs>& lhs,
+    const StringType& rhs);                               // (2)
+
+template<typename RefStringTypeRhs, typename StringType>
+bool operator!=(
+    const StringType& lhs,
+    const json_pointer<RefStringTypeRhs>& rhs);           // (2)
+```
+
+1. Compares two JSON pointers for inequality by comparing their reference tokens.
+
+2. Compares a JSON pointer and a string or a string and a JSON pointer for inequality by converting the string to a
+   JSON pointer and comparing the JSON pointers according to 1.
+
+## Template parameters
+
+`RefStringTypeLhs`, `RefStringTypeRhs`
+:   the string type of the left-hand side or right-hand side JSON pointer, respectively
+
+`StringType`
+:   the string type derived from the `json_pointer` operand ([`json_pointer::string_t`](string_t.md))
+
+## Parameters
+
+`lhs` (in)
+:   first value to consider
+
+`rhs` (in)
+:   second value to consider
+
+## Return value
+
+whether the values `lhs`/`*this` and `rhs` are not equal
+
+## Exception safety
+
+1. No-throw guarantee: this function never throws exceptions.
+2. Strong exception safety: if an exception occurs, the original value stays intact.
+
+## Exceptions
+
+1. (none)
+2. The function can throw the following exceptions:
+   - Throws [parse_error.107](../../home/exceptions.md#jsonexceptionparse_error107) if the given JSON pointer `s` is
+     nonempty and does not begin with a slash (`/`); see example below.
+   - Throws [parse_error.108](../../home/exceptions.md#jsonexceptionparse_error108) if a tilde (`~`) in the given JSON
+     pointer `s` is not followed by `0` (representing `~`) or `1` (representing `/`); see example below.
+
+## Complexity
+
+Constant if `lhs` and `rhs` differ in the number of reference tokens, otherwise linear in the number of reference
+tokens.
+
+## Notes
+
+!!! note "Operator overload resolution"
+
+    Since C++20 overload resolution will consider the _rewritten candidate_ generated from
+    [`operator==`](operator_eq.md).
+
+!!! warning "Deprecation"
+
+    Overload 2 is deprecated and will be removed in a future major version release.
+
+## Examples
+
+??? example "Example: (1) Comparing JSON pointers"
+
+    The example demonstrates comparing JSON pointers.
+        
+    ```cpp
+    --8<-- "examples/json_pointer__operator__notequal.cpp"
+    ```
+    
+    Output:
+    
+    ```
+    --8<-- "examples/json_pointer__operator__notequal.output"
+    ```
+
+??? example "Example: (2) Comparing JSON pointers and strings"
+
+    The example demonstrates comparing JSON pointers and strings, and when doing so may raise an exception.
+        
+    ```cpp
+    --8<-- "examples/json_pointer__operator__notequal_stringtype.cpp"
+    ```
+    
+    Output:
+    
+    ```
+    --8<-- "examples/json_pointer__operator__notequal_stringtype.output"
+    ```
+
+## Version history
+
+1. Added in version 2.1.0.
+2. Added for backward compatibility and deprecated in version 3.11.2.
diff --git a/external_imported/json/docs/mkdocs/docs/api/json_pointer/operator_slash.md b/external_imported/json/docs/mkdocs/docs/api/json_pointer/operator_slash.md
new file mode 100644
index 000000000..ed77b504b
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/json_pointer/operator_slash.md
@@ -0,0 +1,64 @@
+# <small>nlohmann::json_pointer::</small>operator/
+
+```cpp
+// (1)
+json_pointer operator/(const json_pointer& lhs, const json_pointer& rhs);
+
+// (2)
+json_pointer operator/(const json_pointer& lhs, string_t token);
+
+// (3)
+json_pointer operator/(const json_pointer& lhs, std::size_t array_idx);
+```
+
+1. create a new JSON pointer by appending the right JSON pointer at the end of the left JSON pointer
+2. create a new JSON pointer by appending the unescaped token at the end of the JSON pointer
+3. create a new JSON pointer by appending the array-index-token at the end of the JSON pointer
+
+## Parameters
+
+`lhs` (in)
+:    JSON pointer
+
+`rhs` (in)
+:    JSON pointer to append
+
+`token` (in)
+:    reference token to append
+
+`array_idx` (in)
+:    array index to append
+
+## Return value
+
+1. a new JSON pointer with `rhs` appended to `lhs`
+2. a new JSON pointer with unescaped `token` appended to `lhs`
+3. a new JSON pointer with `array_idx` appended to `lhs`
+
+## Complexity
+
+1. Linear in the length of `lhs` and `rhs`.
+2. Linear in the length of `lhs`.
+3. Linear in the length of `lhs`.
+
+## Examples
+
+??? example
+
+    The example shows the usage of `operator/`.
+     
+    ```cpp
+    --8<-- "examples/json_pointer__operator_add_binary.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/json_pointer__operator_add_binary.output"
+    ```
+
+## Version history
+
+1. Added in version 3.6.0.
+2. Added in version 3.6.0. Changed type of `token` to `string_t` in version 3.11.0.
+3. Added in version 3.6.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/json_pointer/operator_slasheq.md b/external_imported/json/docs/mkdocs/docs/api/json_pointer/operator_slasheq.md
new file mode 100644
index 000000000..3518557d5
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/json_pointer/operator_slasheq.md
@@ -0,0 +1,61 @@
+# <small>nlohmann::json_pointer::</small>operator/=
+
+```cpp
+// (1)
+json_pointer& operator/=(const json_pointer& ptr);
+
+// (2)
+json_pointer& operator/=(string_t token);
+
+// (3)
+json_pointer& operator/=(std::size_t array_idx)
+```
+
+1. append another JSON pointer at the end of this JSON pointer
+2. append an unescaped reference token at the end of this JSON pointer
+3. append an array index at the end of this JSON pointer
+
+## Parameters
+
+`ptr` (in)
+:    JSON pointer to append
+
+`token` (in)
+:    reference token to append
+
+`array_idx` (in)
+:    array index to append
+
+## Return value
+
+1. JSON pointer with `ptr` appended
+2. JSON pointer with `token` appended without escaping `token`
+3. JSON pointer with `array_idx` appended
+
+## Complexity
+
+1. Linear in the length of `ptr`.
+2. Amortized constant.
+3. Amortized constant.
+
+## Examples
+
+??? example
+
+    The example shows the usage of `operator/=`.
+     
+    ```cpp
+    --8<-- "examples/json_pointer__operator_add.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/json_pointer__operator_add.output"
+    ```
+
+## Version history
+
+1. Added in version 3.6.0.
+2. Added in version 3.6.0. Changed type of `token` to `string_t` in version 3.11.0.
+3. Added in version 3.6.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/json_pointer/operator_string_t.md b/external_imported/json/docs/mkdocs/docs/api/json_pointer/operator_string_t.md
new file mode 100644
index 000000000..74105a4f1
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/json_pointer/operator_string_t.md
@@ -0,0 +1,48 @@
+# <small>nlohmann::json_pointer::</small>operator string_t
+
+```cpp
+operator string_t() const
+```
+
+Return a string representation of the JSON pointer.
+
+## Return value
+
+A string representation of the JSON pointer
+
+## Possible implementation
+
+```cpp
+operator string_t() const
+{
+    return to_string();
+}
+```
+
+## Notes
+
+!!! warning "Deprecation"
+
+    This function is deprecated in favor of [`to_string`](to_string.md) and will be removed in a future major version
+    release.
+
+## Examples
+
+??? example
+
+    The example shows how JSON Pointers can be implicitly converted to strings.
+     
+    ```cpp
+    --8<-- "examples/json_pointer__operator_string_t.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/json_pointer__operator_string_t.output"
+    ```
+
+## Version history
+
+- Since version 2.0.0.
+- Changed type to `string_t` and deprecated in version 3.11.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/json_pointer/parent_pointer.md b/external_imported/json/docs/mkdocs/docs/api/json_pointer/parent_pointer.md
new file mode 100644
index 000000000..139873072
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/json_pointer/parent_pointer.md
@@ -0,0 +1,35 @@
+# <small>nlohmann::json_pointer::</small>parent_pointer
+
+```cpp
+json_pointer parent_pointer() const;
+```
+
+Returns the parent of this JSON pointer.
+
+## Return value
+
+Parent of this JSON pointer; in case this JSON pointer is the root, the root itself is returned.
+
+## Complexity
+
+Linear in the length of the JSON pointer.
+
+## Examples
+
+??? example
+
+    The example shows the result of `parent_pointer` for different JSON Pointers.
+     
+    ```cpp
+    --8<-- "examples/json_pointer__parent_pointer.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/json_pointer__parent_pointer.output"
+    ```
+
+## Version history
+
+Added in version 3.6.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/json_pointer/pop_back.md b/external_imported/json/docs/mkdocs/docs/api/json_pointer/pop_back.md
new file mode 100644
index 000000000..3c79f3638
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/json_pointer/pop_back.md
@@ -0,0 +1,35 @@
+# <small>nlohmann::json_pointer::</small>pop_back
+
+```cpp
+void pop_back();
+```
+
+Remove last reference token.
+
+## Exceptions
+
+Throws [out_of_range.405](../../home/exceptions.md#jsonexceptionout_of_range405) if JSON pointer has no parent.
+
+## Complexity
+
+Constant.
+
+## Examples
+
+??? example
+
+    The example shows the usage of `pop_back`.
+     
+    ```cpp
+    --8<-- "examples/json_pointer__pop_back.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/json_pointer__pop_back.output"
+    ```
+
+## Version history
+
+Added in version 3.6.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/json_pointer/push_back.md b/external_imported/json/docs/mkdocs/docs/api/json_pointer/push_back.md
new file mode 100644
index 000000000..c1c19cb8d
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/json_pointer/push_back.md
@@ -0,0 +1,39 @@
+# <small>nlohmann::json_pointer::</small>push_back
+
+```cpp
+void push_back(const string_t& token);
+
+void push_back(string_t&& token);
+```
+
+Append an unescaped token at the end of the reference pointer.
+
+## Parameters
+
+`token` (in)
+:   token to add
+
+## Complexity
+
+Amortized constant.
+
+## Examples
+
+??? example
+
+    The example shows the result of `push_back` for different JSON Pointers.
+     
+    ```cpp
+    --8<-- "examples/json_pointer__push_back.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/json_pointer__push_back.output"
+    ```
+
+## Version history
+
+- Added in version 3.6.0.
+- Changed type of `token` to `string_t` in version 3.11.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/json_pointer/string_t.md b/external_imported/json/docs/mkdocs/docs/api/json_pointer/string_t.md
new file mode 100644
index 000000000..c8527bc9c
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/json_pointer/string_t.md
@@ -0,0 +1,28 @@
+# <small>nlohmann::json_pointer::</small>string_t
+```cpp
+using string_t = RefStringType;
+```
+
+The string type used for the reference tokens making up the JSON pointer.
+
+See [`basic_json::string_t`](../basic_json/string_t.md) for more information.
+
+## Examples
+
+??? example
+
+    The example shows the type `string_t` and its relation to `basic_json::string_t`.
+     
+    ```cpp
+    --8<-- "examples/json_pointer__string_t.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/json_pointer__string_t.output"
+    ```
+
+## Version history
+
+- Added in version 3.11.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/json_pointer/to_string.md b/external_imported/json/docs/mkdocs/docs/api/json_pointer/to_string.md
new file mode 100644
index 000000000..fae3abe5f
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/json_pointer/to_string.md
@@ -0,0 +1,40 @@
+# <small>nlohmann::json_pointer::</small>to_string
+
+```cpp
+string_t to_string() const;
+```
+
+Return a string representation of the JSON pointer.
+
+## Return value
+
+A string representation of the JSON pointer
+
+## Notes
+
+For each JSON pointer `ptr`, it holds:
+
+```cpp
+ptr == json_pointer(ptr.to_string());
+```
+
+## Examples
+
+??? example
+
+    The example shows the result of `to_string`.
+     
+    ```cpp
+    --8<-- "examples/json_pointer__to_string.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/json_pointer__to_string.output"
+    ```
+
+## Version history
+
+- Since version 2.0.0.
+- Changed return type to `string_t` in version 3.11.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/json_sax/binary.md b/external_imported/json/docs/mkdocs/docs/api/json_sax/binary.md
new file mode 100644
index 000000000..fc0980e20
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/json_sax/binary.md
@@ -0,0 +1,40 @@
+# <small>nlohmann::json_sax::</small>binary
+
+```cpp
+virtual bool binary(binary_t& val) = 0;
+```
+
+A binary value was read.
+
+## Parameters
+
+`val` (in)
+:   binary value
+
+## Return value
+
+Whether parsing should proceed.
+
+## Notes
+
+It is safe to move the passed binary value.
+
+## Examples
+
+??? example
+
+    The example below shows how the SAX interface is used.
+
+    ```cpp
+    --8<-- "examples/sax_parse__binary.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/sax_parse__binary.output"
+    ```
+
+## Version history
+
+- Added in version 3.8.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/json_sax/boolean.md b/external_imported/json/docs/mkdocs/docs/api/json_sax/boolean.md
new file mode 100644
index 000000000..fdf294562
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/json_sax/boolean.md
@@ -0,0 +1,36 @@
+# <small>nlohmann::json_sax::</small>boolean
+
+```cpp
+virtual bool boolean(bool val) = 0;
+```
+
+A boolean value was read.
+
+## Parameters
+
+`val` (in)
+:   boolean value
+
+## Return value
+
+Whether parsing should proceed.
+
+## Examples
+
+??? example
+
+    The example below shows how the SAX interface is used.
+
+    ```cpp
+    --8<-- "examples/sax_parse.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/sax_parse.output"
+    ```
+
+## Version history
+
+- Added in version 3.2.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/json_sax/end_array.md b/external_imported/json/docs/mkdocs/docs/api/json_sax/end_array.md
new file mode 100644
index 000000000..9c12e40a5
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/json_sax/end_array.md
@@ -0,0 +1,31 @@
+# <small>nlohmann::json_sax::</small>end_array
+
+```cpp
+virtual bool end_array() = 0;
+```
+
+The end of an array was read.
+
+## Return value
+
+Whether parsing should proceed.
+
+## Examples
+
+??? example
+
+    The example below shows how the SAX interface is used.
+
+    ```cpp
+    --8<-- "examples/sax_parse.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/sax_parse.output"
+    ```
+
+## Version history
+
+- Added in version 3.2.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/json_sax/end_object.md b/external_imported/json/docs/mkdocs/docs/api/json_sax/end_object.md
new file mode 100644
index 000000000..601c94a4a
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/json_sax/end_object.md
@@ -0,0 +1,31 @@
+# <small>nlohmann::json_sax::</small>end_object
+
+```cpp
+virtual bool end_object() = 0;
+```
+
+The end of an object was read.
+
+## Return value
+
+Whether parsing should proceed.
+
+## Examples
+
+??? example
+
+    The example below shows how the SAX interface is used.
+
+    ```cpp
+    --8<-- "examples/sax_parse.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/sax_parse.output"
+    ```
+
+## Version history
+
+- Added in version 3.2.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/json_sax/index.md b/external_imported/json/docs/mkdocs/docs/api/json_sax/index.md
new file mode 100644
index 000000000..f63e85c9a
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/json_sax/index.md
@@ -0,0 +1,44 @@
+# <small>nlohmann::</small>json_sax
+
+```cpp
+template<typename BasicJsonType>
+struct json_sax;
+```
+
+This class describes the SAX interface used by [sax_parse](../basic_json/sax_parse.md). Each function is called in
+different situations while the input is parsed. The boolean return value informs the parser whether to continue
+processing the input.
+
+## Template parameters
+
+`BasicJsonType`
+:   a specialization of [`basic_json`](../basic_json/index.md)
+
+## Member types
+
+- [**number_integer_t**](../basic_json/number_integer_t.md) - `BasicJsonType`'s type for numbers (integer)
+- [**number_unsigned_t**](../basic_json/number_unsigned_t.md) - `BasicJsonType`'s  type for numbers (unsigned)
+- [**number_float_t**](../basic_json/number_float_t.md) - `BasicJsonType`'s type for numbers (floating-point)
+- [**string_t**](../basic_json/string_t.md) - `BasicJsonType`'s type for strings
+- [**binary_t**](../basic_json/binary_t.md) - `BasicJsonType`'s type for binary arrays
+
+## Member functions
+
+- [**binary**](binary.md) (_virtual_) - a binary value was read
+- [**boolean**](boolean.md) (_virtual_) - a boolean value was read
+- [**end_array**](end_array.md) (_virtual_) - the end of an array was read
+- [**end_object**](end_object.md) (_virtual_) - the end of an object was read
+- [**key**](key.md) (_virtual_) - an object key was read
+- [**null**](null.md) (_virtual_) - a null value was read
+- [**number_float**](number_float.md) (_virtual_) - a floating-point number was read
+- [**number_integer**](number_integer.md) (_virtual_) - an integer number was read
+- [**number_unsigned**](number_unsigned.md) (_virtual_) - an unsigned integer number was read
+- [**parse_error**](parse_error.md) (_virtual_) - a parse error occurred
+- [**start_array**](start_array.md) (_virtual_) - the beginning of an array was read
+- [**start_object**](start_object.md) (_virtual_) - the beginning of an object was read
+- [**string**](string.md) (_virtual_) - a string value was read
+
+## Version history
+
+- Added in version 3.2.0.
+- Support for binary values (`binary_t`, `binary`) added in version 3.8.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/json_sax/key.md b/external_imported/json/docs/mkdocs/docs/api/json_sax/key.md
new file mode 100644
index 000000000..31fd6c1d1
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/json_sax/key.md
@@ -0,0 +1,40 @@
+# <small>nlohmann::json_sax::</small>key
+
+```cpp
+virtual bool key(string_t& val) = 0;
+```
+
+An object key was read.
+
+## Parameters
+
+`val` (in)
+:   object key
+
+## Return value
+
+Whether parsing should proceed.
+
+## Notes
+
+It is safe to move the passed object key value.
+
+## Examples
+
+??? example
+
+    The example below shows how the SAX interface is used.
+
+    ```cpp
+    --8<-- "examples/sax_parse.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/sax_parse.output"
+    ```
+
+## Version history
+
+- Added in version 3.2.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/json_sax/null.md b/external_imported/json/docs/mkdocs/docs/api/json_sax/null.md
new file mode 100644
index 000000000..9354ede6c
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/json_sax/null.md
@@ -0,0 +1,31 @@
+# <small>nlohmann::json_sax::</small>null
+
+```cpp
+virtual bool null() = 0;
+```
+
+A null value was read.
+
+## Return value
+
+Whether parsing should proceed.
+
+## Examples
+
+??? example
+
+    The example below shows how the SAX interface is used.
+
+    ```cpp
+    --8<-- "examples/sax_parse.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/sax_parse.output"
+    ```
+
+## Version history
+
+- Added in version 3.2.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/json_sax/number_float.md b/external_imported/json/docs/mkdocs/docs/api/json_sax/number_float.md
new file mode 100644
index 000000000..17799401e
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/json_sax/number_float.md
@@ -0,0 +1,39 @@
+# <small>nlohmann::json_sax::</small>number_float
+
+```cpp
+virtual bool number_float(number_float_t val, const string_t& s) = 0;
+```
+
+A floating-point number was read.
+
+## Parameters
+
+`val` (in)
+:   floating-point value
+
+`s` (in)
+:   string representation of the original input
+
+## Return value
+
+Whether parsing should proceed.
+
+## Examples
+
+??? example
+
+    The example below shows how the SAX interface is used.
+
+    ```cpp
+    --8<-- "examples/sax_parse.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/sax_parse.output"
+    ```
+
+## Version history
+
+- Added in version 3.2.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/json_sax/number_integer.md b/external_imported/json/docs/mkdocs/docs/api/json_sax/number_integer.md
new file mode 100644
index 000000000..5c3cb4f31
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/json_sax/number_integer.md
@@ -0,0 +1,36 @@
+# <small>nlohmann::json_sax::</small>number_integer
+
+```cpp
+virtual bool number_integer(number_integer_t val) = 0;
+```
+
+An integer number was read.
+
+## Parameters
+
+`val` (in)
+:   integer value
+
+## Return value
+
+Whether parsing should proceed.
+
+## Examples
+
+??? example
+
+    The example below shows how the SAX interface is used.
+
+    ```cpp
+    --8<-- "examples/sax_parse.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/sax_parse.output"
+    ```
+
+## Version history
+
+- Added in version 3.2.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/json_sax/number_unsigned.md b/external_imported/json/docs/mkdocs/docs/api/json_sax/number_unsigned.md
new file mode 100644
index 000000000..0ac250037
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/json_sax/number_unsigned.md
@@ -0,0 +1,36 @@
+# <small>nlohmann::json_sax::</small>number_unsigned
+
+```cpp
+virtual bool number_unsigned(number_unsigned_t val) = 0;
+```
+
+An unsigned integer number was read.
+
+## Parameters
+
+`val` (in)
+:   unsigned integer value
+
+## Return value
+
+Whether parsing should proceed.
+
+## Examples
+
+??? example
+
+    The example below shows how the SAX interface is used.
+
+    ```cpp
+    --8<-- "examples/sax_parse.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/sax_parse.output"
+    ```
+
+## Version history
+
+- Added in version 3.2.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/json_sax/parse_error.md b/external_imported/json/docs/mkdocs/docs/api/json_sax/parse_error.md
new file mode 100644
index 000000000..e41cb67ff
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/json_sax/parse_error.md
@@ -0,0 +1,44 @@
+# <small>nlohmann::json_sax::</small>parse_error
+
+```cpp
+virtual bool parse_error(std::size_t position,
+                         const std::string& last_token,
+                         const detail::exception& ex) = 0;
+```
+
+A parse error occurred.
+
+## Parameters
+
+`position` (in)
+:   the position in the input where the error occurs
+
+`last_token` (in)
+:   the last read token
+
+`ex` (in)
+:   an exception object describing the error
+
+## Return value
+
+Whether parsing should proceed (**must return `#!cpp false`**).
+
+## Examples
+
+??? example
+
+    The example below shows how the SAX interface is used.
+
+    ```cpp
+    --8<-- "examples/sax_parse.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/sax_parse.output"
+    ```
+
+## Version history
+
+- Added in version 3.2.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/json_sax/start_array.md b/external_imported/json/docs/mkdocs/docs/api/json_sax/start_array.md
new file mode 100644
index 000000000..cf2b8cf56
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/json_sax/start_array.md
@@ -0,0 +1,40 @@
+# <small>nlohmann::json_sax::</small>start_array
+
+```cpp
+virtual bool start_array(std::size_t elements) = 0;
+```
+
+The beginning of an array was read.
+
+## Parameters
+
+`elements` (in)
+:   number of object elements or `#!cpp -1` if unknown
+
+## Return value
+
+Whether parsing should proceed.
+
+## Notes
+
+Binary formats may report the number of elements.
+
+## Examples
+
+??? example
+
+    The example below shows how the SAX interface is used.
+
+    ```cpp
+    --8<-- "examples/sax_parse.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/sax_parse.output"
+    ```
+
+## Version history
+
+- Added in version 3.2.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/json_sax/start_object.md b/external_imported/json/docs/mkdocs/docs/api/json_sax/start_object.md
new file mode 100644
index 000000000..491815deb
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/json_sax/start_object.md
@@ -0,0 +1,40 @@
+# <small>nlohmann::json_sax::</small>start_object
+
+```cpp
+virtual bool start_object(std::size_t elements) = 0;
+```
+
+The beginning of an object was read.
+
+## Parameters
+
+`elements` (in)
+:   number of object elements or `#!cpp -1` if unknown
+
+## Return value
+
+Whether parsing should proceed.
+
+## Notes
+
+Binary formats may report the number of elements.
+
+## Examples
+
+??? example
+
+    The example below shows how the SAX interface is used.
+
+    ```cpp
+    --8<-- "examples/sax_parse.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/sax_parse.output"
+    ```
+
+## Version history
+
+- Added in version 3.2.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/json_sax/string.md b/external_imported/json/docs/mkdocs/docs/api/json_sax/string.md
new file mode 100644
index 000000000..dcffb5f61
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/json_sax/string.md
@@ -0,0 +1,40 @@
+# <small>nlohmann::json_sax::</small>string
+
+```cpp
+virtual bool string(string_t& val) = 0;
+```
+
+A string value was read.
+
+## Parameters
+
+`val` (in)
+:   string value
+
+## Return value
+
+Whether parsing should proceed.
+
+## Notes
+
+It is safe to move the passed string value.
+
+## Examples
+
+??? example
+
+    The example below shows how the SAX interface is used.
+
+    ```cpp
+    --8<-- "examples/sax_parse.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/sax_parse.output"
+    ```
+
+## Version history
+
+- Added in version 3.2.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/macros/index.md b/external_imported/json/docs/mkdocs/docs/api/macros/index.md
new file mode 100644
index 000000000..ae9eb2044
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/macros/index.md
@@ -0,0 +1,62 @@
+# Macros
+
+Some aspects of the library can be configured by defining preprocessor macros **before** including the `json.hpp`
+header. See also the [macro overview page](../../features/macros.md).
+
+## Runtime assertions
+
+- [**JSON_ASSERT(x)**](json_assert.md) - control behavior of runtime assertions
+
+## Exceptions
+
+- [**JSON_CATCH_USER(exception)**<br>**JSON_THROW_USER(exception)**<br>**JSON_TRY_USER**](json_throw_user.md) - control exceptions
+- [**JSON_DIAGNOSTICS**](json_diagnostics.md) - control extended diagnostics
+- [**JSON_NOEXCEPTION**](json_noexception.md) - switch off exceptions
+
+## Language support
+
+- [**JSON_HAS_CPP_11**<br>**JSON_HAS_CPP_14**<br>**JSON_HAS_CPP_17**<br>**JSON_HAS_CPP_20**](json_has_cpp_11.md) - set supported C++ standard
+- [**JSON_HAS_FILESYSTEM**<br>**JSON_HAS_EXPERIMENTAL_FILESYSTEM**](json_has_filesystem.md) - control `std::filesystem` support
+- [**JSON_HAS_RANGES**](json_has_ranges.md) - control `std::ranges` support
+- [**JSON_HAS_THREE_WAY_COMPARISON**](json_has_three_way_comparison.md) - control 3-way comparison support
+- [**JSON_NO_IO**](json_no_io.md) - switch off functions relying on certain C++ I/O headers
+- [**JSON_SKIP_UNSUPPORTED_COMPILER_CHECK**](json_skip_unsupported_compiler_check.md) - do not warn about unsupported compilers
+- [**JSON_USE_GLOBAL_UDLS**](json_use_global_udls.md) - place user-defined string literals (UDLs) into the global namespace
+
+## Library version
+
+- [**JSON_SKIP_LIBRARY_VERSION_CHECK**](json_skip_library_version_check.md) - skip library version check
+- [**NLOHMANN_JSON_VERSION_MAJOR**<br>**NLOHMANN_JSON_VERSION_MINOR**<br>**NLOHMANN_JSON_VERSION_PATCH**](nlohmann_json_version_major.md)
+  \- library version information
+
+## Library namespace
+
+- [**NLOHMANN_JSON_NAMESPACE**](nlohmann_json_namespace.md) - full name of the `nlohmann` namespace
+- [**NLOHMANN_JSON_NAMESPACE_BEGIN**<br>**NLOHMANN_JSON_NAMESPACE_END**](nlohmann_json_namespace_begin.md) - open and
+  close the library namespace
+- [**NLOHMANN_JSON_NAMESPACE_NO_VERSION**](nlohmann_json_namespace_no_version.md) - disable the version component of
+  the inline namespace
+
+## Type conversions
+
+- [**JSON_DISABLE_ENUM_SERIALIZATION**](json_disable_enum_serialization.md) - switch off default serialization/deserialization functions for enums
+- [**JSON_USE_IMPLICIT_CONVERSIONS**](json_use_implicit_conversions.md) - control implicit conversions
+
+<!-- comment-->
+## Comparison behavior
+
+- [**JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON**](json_use_legacy_discarded_value_comparison.md) -
+  control comparison of discarded values
+
+## Serialization/deserialization macros
+
+- [**NLOHMANN_DEFINE_TYPE_INTRUSIVE(type, member...)**<br>**NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(type, member...)**
+<br>**NLOHMANN_DEFINE_TYPE_INTRUSIVE_ONLY_SERIALIZE(type, member...)**][DefInt]
+  \- serialization/deserialization of types _with_ access to private variables
+- [**NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(type, member...)**<br>**NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(type, member...)**
+<br>**NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_ONLY_SERIALIZE(type, member...)**][DefNonInt]
+  \- serialization/deserialization of types _without_ access to private variables
+- [**NLOHMANN_JSON_SERIALIZE_ENUM(type, ...)**](nlohmann_json_serialize_enum.md) - serialization/deserialization of enum types
+
+[DefInt]: nlohmann_define_type_intrusive.md
+[DefNonInt]: nlohmann_define_type_non_intrusive.md
diff --git a/external_imported/json/docs/mkdocs/docs/api/macros/json_assert.md b/external_imported/json/docs/mkdocs/docs/api/macros/json_assert.md
new file mode 100644
index 000000000..a093341a1
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/macros/json_assert.md
@@ -0,0 +1,84 @@
+# JSON_ASSERT
+
+```cpp
+#define JSON_ASSERT(x) /* value */
+```
+
+This macro controls which code is executed for [runtime assertions](../../features/assertions.md) of the library.
+
+## Parameters
+
+`x` (in)
+:   expression of scalar type
+
+## Default definition
+
+The default value is [`#!cpp assert(x)`](https://en.cppreference.com/w/cpp/error/assert).
+
+```cpp
+#define JSON_ASSERT(x) assert(x)
+```
+
+Therefore, assertions can be switched off by defining `NDEBUG`.
+
+## Notes
+
+- The library uses numerous assertions to guarantee invariants and to abort in case of otherwise undefined behavior
+  (e.g., when calling [operator[]](../basic_json/operator%5B%5D.md) with a missing object key on a `const` object). See
+  page [runtime assertions](../../features/assertions.md) for more information.
+- Defining the macro to code that does not call `std::abort` may leave the library in an undefined state.
+- The macro is undefined outside the library.
+
+## Examples
+
+??? example "Example 1: default behavior"
+
+    The following code will trigger an assertion at runtime:
+
+    ```cpp
+    #include <nlohmann/json.hpp>
+    
+    using json = nlohmann::json;
+    
+    int main()
+    {
+        const json j = {{"key", "value"}};
+        auto v = j["missing"];
+    }
+    ```
+
+    Output:
+
+    ```
+    Assertion failed: (m_value.object->find(key) != m_value.object->end()), function operator[], file json.hpp, line 2144.
+    ```
+
+??? example "Example 2: user-defined behavior"
+
+    The assertion reporting can be changed by defining `JSON_ASSERT(x)` differently.
+
+    ```cpp
+    #include <cstdio>
+    #include <cstdlib>
+    #define JSON_ASSERT(x) if(!(x)){fprintf(stderr, "assertion error in %s\n", __FUNCTION__); std::abort();}
+    
+    #include <nlohmann/json.hpp>
+    
+    using json = nlohmann::json;
+    
+    int main()
+    {
+        const json j = {{"key", "value"}};
+        auto v = j["missing"];
+    }
+    ```
+
+    Output:
+
+    ```
+    assertion error in operator[]
+    ```
+
+## Version history
+
+- Added in version 3.9.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/macros/json_diagnostics.md b/external_imported/json/docs/mkdocs/docs/api/macros/json_diagnostics.md
new file mode 100644
index 000000000..4fc0fc38e
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/macros/json_diagnostics.md
@@ -0,0 +1,76 @@
+# JSON_DIAGNOSTICS
+
+```cpp
+#define JSON_DIAGNOSTICS /* value */
+```
+
+This macro enables [extended diagnostics for exception messages](../../home/exceptions.md#extended-diagnostic-messages).
+Possible values are `1` to enable or `0` to disable (default).
+
+When enabled, exception messages contain a [JSON Pointer](../json_pointer/json_pointer.md) to the JSON value that
+triggered the exception. Note that enabling this macro increases the size of every JSON value by one pointer and adds
+some  runtime overhead.
+
+## Default definition
+
+The default value is `0` (extended diagnostics are switched off).
+
+```cpp
+#define JSON_DIAGNOSTICS 0
+```
+
+When the macro is not defined, the library will define it to its default value.
+
+## Notes
+
+!!! note "ABI compatibility"
+
+    As of version 3.11.0, this macro is no longer required to be defined consistently throughout a codebase to avoid
+    One Definition Rule (ODR) violations, as the value of this macro is encoded in the namespace, resulting in distinct
+    symbol names. 
+    
+    This allows different parts of a codebase to use different versions or configurations of this library without
+    causing improper behavior.
+    
+    Where possible, it is still recommended that all code define this the same way for maximum interoperability.
+
+!!! hint "CMake option"
+
+    Diagnostic messages can also be controlled with the CMake option
+    [`JSON_Diagnostics`](../../integration/cmake.md#json_diagnostics) (`OFF` by default)
+    which defines `JSON_DIAGNOSTICS` accordingly.
+
+## Examples
+
+??? example "Example 1: default behavior"
+
+    ```cpp
+    --8<-- "examples/diagnostics_standard.cpp"
+    ```
+    
+    Output:
+
+    ```
+    --8<-- "examples/diagnostics_standard.output"
+    ```
+
+    This exception can be hard to debug if storing the value `#!c "12"` and accessing it is further apart.
+
+??? example "Example 2: extended diagnostic messages"
+
+    ```cpp
+    --8<-- "examples/diagnostics_extended.cpp"
+    ```
+    
+    Output:
+
+    ```
+    --8<-- "examples/diagnostics_extended.output"
+    ```
+
+    Now the exception message contains a JSON Pointer `/address/housenumber` that indicates which value has the wrong type.
+
+## Version history
+
+- Added in version 3.10.0.
+- As of version 3.11.0 the definition is allowed to vary between translation units.
diff --git a/external_imported/json/docs/mkdocs/docs/api/macros/json_disable_enum_serialization.md b/external_imported/json/docs/mkdocs/docs/api/macros/json_disable_enum_serialization.md
new file mode 100644
index 000000000..6440e34e3
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/macros/json_disable_enum_serialization.md
@@ -0,0 +1,152 @@
+# JSON_DISABLE_ENUM_SERIALIZATION
+
+```cpp
+#define JSON_DISABLE_ENUM_SERIALIZATION /* value */
+```
+
+When defined to `1`, default serialization and deserialization functions for enums are excluded and have to be provided
+by the user, for example, using [`NLOHMANN_JSON_SERIALIZE_ENUM`](nlohmann_json_serialize_enum.md) (see
+[arbitrary type conversions](../../features/arbitrary_types.md) for more details).
+
+Parsing or serializing an enum will result in a compiler error.
+
+This works for both unscoped and scoped enums.
+
+## Default definition
+
+The default value is `0`.
+
+```cpp
+#define JSON_DISABLE_ENUM_SERIALIZATION 0
+```
+
+## Notes
+
+!!! hint "CMake option"
+
+    Enum serialization can also be controlled with the CMake option
+    [`JSON_DisableEnumSerialization`](../../integration/cmake.md#json_disableenumserialization)
+    (`OFF` by default) which defines `JSON_DISABLE_ENUM_SERIALIZATION` accordingly.
+
+## Examples
+
+??? example "Example 1: Disabled behavior"
+
+    The code below forces the library **not** to create default serialization/deserialization functions `from_json` and `to_json`, meaning the code below
+    **does not** compile.
+
+    ```cpp
+    #define JSON_DISABLE_ENUM_SERIALIZATION 1
+    #include <nlohmann/json.hpp>
+
+    using json = nlohmann::json;
+
+    enum class Choice
+    {
+        first,
+        second,
+    };
+    
+    int main()
+    {
+        // normally invokes to_json serialization function but with JSON_DISABLE_ENUM_SERIALIZATION defined, it does not
+        const json j = Choice::first; 
+
+        // normally invokes from_json parse function but with JSON_DISABLE_ENUM_SERIALIZATION defined, it does not
+        Choice ch = j.template get<Choice>();
+    }
+    ```
+
+??? example "Example 2: Serialize enum macro"
+
+    The code below forces the library **not** to create default serialization/deserialization functions `from_json` and `to_json`, but uses
+    [`NLOHMANN_JSON_SERIALIZE_ENUM`](nlohmann_json_serialize_enum.md) to parse and serialize the enum.
+
+    ```cpp
+    #define JSON_DISABLE_ENUM_SERIALIZATION 1
+    #include <nlohmann/json.hpp>
+
+    using json = nlohmann::json;
+
+    enum class Choice
+    {
+        first,
+        second,
+    };
+
+    NLOHMANN_JSON_SERIALIZE_ENUM(Choice,
+    {
+        { Choice::first, "first" },
+        { Choice::second, "second" },
+    })
+    
+    int main()
+    {
+        // uses user-defined to_json function defined by macro
+        const json j = Choice::first; 
+
+        // uses user-defined from_json function defined by macro
+        Choice ch = j.template get<Choice>();
+    }
+    ```
+
+??? example "Example 3: User-defined serialization/deserialization functions"
+
+    The code below forces the library **not** to create default serialization/deserialization functions `from_json` and `to_json`, but uses user-defined
+    functions to parse and serialize the enum.
+
+    ```cpp
+    #define JSON_DISABLE_ENUM_SERIALIZATION 1
+    #include <nlohmann/json.hpp>
+
+    using json = nlohmann::json;
+
+    enum class Choice
+    {
+        first,
+        second,
+    };
+
+    void from_json(const json& j, Choice& ch)
+    {
+        auto value = j.template get<std::string>();
+        if (value == "first")
+        {
+            ch = Choice::first;
+        }
+        else if (value == "second")
+        {
+            ch = Choice::second;
+        }
+    }
+
+    void to_json(json& j, const Choice& ch)
+    {
+        auto value = j.template get<std::string>();
+        if (value == "first")
+        {
+            ch = Choice::first;
+        }
+        else if (value == "second")
+        {
+            ch = Choice::second;
+        }
+    }
+    
+    int main()
+    {
+        // uses user-defined to_json function
+        const json j = Choice::first; 
+
+        // uses user-defined from_json function
+        Choice ch = j.template get<Choice>();
+    }
+    ```
+
+## See also
+
+- [`NLOHMANN_JSON_SERIALIZE_ENUM`](nlohmann_json_serialize_enum.md)
+
+## Version history
+
+- Added in version 3.11.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/macros/json_has_cpp_11.md b/external_imported/json/docs/mkdocs/docs/api/macros/json_has_cpp_11.md
new file mode 100644
index 000000000..f3eaa585c
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/macros/json_has_cpp_11.md
@@ -0,0 +1,41 @@
+# JSON_HAS_CPP_11, JSON_HAS_CPP_14, JSON_HAS_CPP_17, JSON_HAS_CPP_20
+
+```cpp
+#define JSON_HAS_CPP_11
+#define JSON_HAS_CPP_14
+#define JSON_HAS_CPP_17
+#define JSON_HAS_CPP_20
+```
+
+The library targets C++11, but also supports some features introduced in later C++ versions (e.g., `std::string_view`
+support for C++17). For these new features, the library implements some preprocessor checks to determine the C++
+standard. By defining any of these symbols, the internal check is overridden and the provided C++ version is
+unconditionally assumed. This can be helpful for compilers that only implement parts of the standard and would be
+detected incorrectly.
+
+## Default definition
+
+The default value is detected based on preprocessor macros such as `#!cpp __cplusplus`, `#!cpp _HAS_CXX17`, or
+`#!cpp _MSVC_LANG`.
+
+## Notes
+
+- `#!cpp JSON_HAS_CPP_11` is always defined.
+- All macros are undefined outside the library.
+
+## Examples
+
+??? example
+
+    The code below forces the library to use the C++14 standard:
+
+    ```cpp
+    #define JSON_HAS_CPP_14 1
+    #include <nlohmann/json.hpp>
+
+    ...
+    ```
+
+## Version history
+
+- Added in version 3.10.5.
diff --git a/external_imported/json/docs/mkdocs/docs/api/macros/json_has_filesystem.md b/external_imported/json/docs/mkdocs/docs/api/macros/json_has_filesystem.md
new file mode 100644
index 000000000..308aea2ac
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/macros/json_has_filesystem.md
@@ -0,0 +1,43 @@
+# JSON_HAS_FILESYSTEM / JSON_HAS_EXPERIMENTAL_FILESYSTEM
+
+```cpp
+#define JSON_HAS_FILESYSTEM /* value */
+#define JSON_HAS_EXPERIMENTAL_FILESYSTEM /* value */
+```
+
+When compiling with C++17, the library provides conversions from and to
+[`std::filesystem::path`](https://en.cppreference.com/w/cpp/filesystem/path). As compiler support for filesystem is
+limited, the library tries to detect whether
+[`<filesystem>`/`std::filesystem`](https://en.cppreference.com/w/cpp/header/filesystem) (`JSON_HAS_FILESYSTEM`) or
+[`<experimental/filesystem>`/`std::experimental::filesystem`](https://en.cppreference.com/w/cpp/header/experimental/filesystem)
+(`JSON_HAS_EXPERIMENTAL_FILESYSTEM`) should be used. To override the built-in check, define `JSON_HAS_FILESYSTEM` or
+`JSON_HAS_EXPERIMENTAL_FILESYSTEM` to `1`.
+
+## Default definition
+
+The default value is detected based on the preprocessor macros `#!cpp __cpp_lib_filesystem`,
+`#!cpp __cpp_lib_experimental_filesystem`, `#!cpp __has_include(<filesystem>)`, or
+`#!cpp __has_include(<experimental/filesystem>)`.
+
+## Notes
+
+- Note that older compilers or older versions of libstd++ also require the library `stdc++fs` to be linked to for
+  filesystem support.
+- Both macros are undefined outside the library.
+
+## Examples
+
+??? example
+
+    The code below forces the library to use the header `<experimental/filesystem>`.
+
+    ```cpp
+    #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1
+    #include <nlohmann/json.hpp>
+
+    ...
+    ```
+
+## Version history
+
+- Added in version 3.10.5.
diff --git a/external_imported/json/docs/mkdocs/docs/api/macros/json_has_ranges.md b/external_imported/json/docs/mkdocs/docs/api/macros/json_has_ranges.md
new file mode 100644
index 000000000..96d51052d
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/macros/json_has_ranges.md
@@ -0,0 +1,31 @@
+# JSON_HAS_RANGES
+
+```cpp
+#define JSON_HAS_RANGES /* value */
+```
+
+This macro indicates whether the standard library has any support for ranges. Implies support for concepts.
+Possible values are `1` when supported or `0` when unsupported.
+
+## Default definition
+
+The default value is detected based on the preprocessor macro `#!cpp __cpp_lib_ranges`.
+
+When the macro is not defined, the library will define it to its default value.
+
+## Examples
+
+??? example
+
+    The code below forces the library to enable support for ranges:
+
+    ```cpp
+    #define JSON_HAS_RANGES 1
+    #include <nlohmann/json.hpp>
+
+    ...
+    ```
+
+## Version history
+
+- Added in version 3.11.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/macros/json_has_static_rtti.md b/external_imported/json/docs/mkdocs/docs/api/macros/json_has_static_rtti.md
new file mode 100644
index 000000000..780878319
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/macros/json_has_static_rtti.md
@@ -0,0 +1,31 @@
+# JSON_HAS_STATIC_RTTI
+
+```cpp
+#define JSON_HAS_STATIC_RTTI /* value */
+```
+
+This macro indicates whether the standard library has any support for RTTI (run time type information).
+Possible values are `1` when supported or `0` when unsupported.
+
+## Default definition
+
+The default value is detected based on the preprocessor macro `#!cpp _HAS_STATIC_RTTI`.
+
+When the macro is not defined, the library will define it to its default value.
+
+## Examples
+
+??? example
+
+    The code below forces the library to enable support for libraries with RTTI dependence:
+
+    ```cpp
+    #define JSON_HAS_STATIC_RTTI 1
+    #include <nlohmann/json.hpp>
+
+    ...
+    ```
+    
+## Version history
+
+- Added in version ?.
diff --git a/external_imported/json/docs/mkdocs/docs/api/macros/json_has_three_way_comparison.md b/external_imported/json/docs/mkdocs/docs/api/macros/json_has_three_way_comparison.md
new file mode 100644
index 000000000..f52070ebf
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/macros/json_has_three_way_comparison.md
@@ -0,0 +1,32 @@
+# JSON_HAS_THREE_WAY_COMPARISON
+
+```cpp
+#define JSON_HAS_THREE_WAY_COMPARISON /* value */
+```
+
+This macro indicates whether the compiler and standard library support 3-way comparison.
+Possible values are `1` when supported or `0` when unsupported.
+
+## Default definition
+
+The default value is detected based on the preprocessor macros `#!cpp __cpp_impl_three_way_comparison`
+and `#!cpp __cpp_lib_three_way_comparison`.
+
+When the macro is not defined, the library will define it to its default value.
+
+## Examples
+
+??? example
+
+    The code below forces the library to use 3-way comparison:
+
+    ```cpp
+    #define JSON_HAS_THREE_WAY_COMPARISON 1
+    #include <nlohmann/json.hpp>
+
+    ...
+    ```
+
+## Version history
+
+- Added in version 3.11.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/macros/json_no_io.md b/external_imported/json/docs/mkdocs/docs/api/macros/json_no_io.md
new file mode 100644
index 000000000..ef37384a5
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/macros/json_no_io.md
@@ -0,0 +1,35 @@
+# JSON_NO_IO
+
+```cpp
+#define JSON_NO_IO
+```
+
+When defined, headers `<cstdio>`, `<ios>`, `<iosfwd>`, `<istream>`, and `<ostream>` are not included and parse functions
+relying on these headers are excluded. This is relevant for environments where these I/O functions are disallowed for
+security reasons (e.g., Intel Software Guard Extensions (SGX)).
+
+## Default definition
+
+By default, `#!cpp JSON_NO_IO` is not defined.
+
+```cpp
+#undef JSON_NO_IO
+```
+
+## Examples
+
+??? example
+
+    The code below forces the library not to use the headers `<cstdio>`, `<ios>`, `<iosfwd>`, `<istream>`, and
+    `<ostream>`.
+
+    ```cpp
+    #define JSON_NO_IO 1
+    #include <nlohmann/json.hpp>
+
+    ...
+    ```
+
+## Version history
+
+- Added in version 3.10.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/macros/json_noexception.md b/external_imported/json/docs/mkdocs/docs/api/macros/json_noexception.md
new file mode 100644
index 000000000..c801b8567
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/macros/json_noexception.md
@@ -0,0 +1,45 @@
+# JSON_NOEXCEPTION
+
+```cpp
+#define JSON_NOEXCEPTION
+```
+
+Exceptions can be switched off by defining the symbol `JSON_NOEXCEPTION`. When defining `JSON_NOEXCEPTION`, `#!cpp try`
+is replaced by `#!cpp if (true)`, `#!cpp catch` is replaced by `#!cpp if (false)`, and `#!cpp throw` is replaced by
+`#!cpp std::abort()`.
+
+The same effect is achieved by setting the compiler flag `-fno-exceptions`.
+
+## Default definition
+
+By default, the macro is not defined.
+
+```cpp
+#undef JSON_NOEXCEPTION
+```
+
+## Notes
+
+The explanatory [`what()`](https://en.cppreference.com/w/cpp/error/exception/what) string of exceptions is not
+available for MSVC if exceptions are disabled, see [#2824](https://github.com/nlohmann/json/discussions/2824).
+
+## Examples
+
+??? example
+
+    The code below switches off exceptions in the library.
+
+    ```cpp
+    #define JSON_NOEXCEPTION 1
+    #include <nlohmann/json.hpp>
+
+    ...
+    ```
+
+## See also
+
+- [Switch off exceptions](../../home/exceptions.md#switch-off-exceptions) for more information how to switch off exceptions
+
+## Version history
+
+Added in version 2.1.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/macros/json_skip_library_version_check.md b/external_imported/json/docs/mkdocs/docs/api/macros/json_skip_library_version_check.md
new file mode 100644
index 000000000..c9a743c18
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/macros/json_skip_library_version_check.md
@@ -0,0 +1,37 @@
+# JSON_SKIP_LIBRARY_VERSION_CHECK
+
+```cpp
+#define JSON_SKIP_LIBRARY_VERSION_CHECK
+```
+
+When defined, the library will not create a compiler warning when a different version of the library was already
+included.
+
+## Default definition
+
+By default, the macro is not defined.
+
+```cpp
+#undef JSON_SKIP_LIBRARY_VERSION_CHECK
+```
+
+## Notes
+
+!!! danger "ABI compatibility"
+
+    Mixing different library versions in the same code can be a problem as the different versions may not be ABI
+    compatible.
+
+## Examples
+
+!!! example
+
+    The following warning will be shown in case a different version of the library was already included:
+
+    ```
+    Already included a different version of the library!
+    ```
+
+## Version history
+
+Added in version 3.11.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/macros/json_skip_unsupported_compiler_check.md b/external_imported/json/docs/mkdocs/docs/api/macros/json_skip_unsupported_compiler_check.md
new file mode 100644
index 000000000..374fa4c27
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/macros/json_skip_unsupported_compiler_check.md
@@ -0,0 +1,33 @@
+# JSON_SKIP_UNSUPPORTED_COMPILER_CHECK
+
+```cpp
+#define JSON_SKIP_UNSUPPORTED_COMPILER_CHECK
+```
+
+When defined, the library will not create a compile error when a known unsupported compiler is detected. This allows to
+use the library with compilers that do not fully support C++11 and may only work if unsupported features are not used.
+
+## Default definition
+
+By default, the macro is not defined.
+
+```cpp
+#undef JSON_SKIP_UNSUPPORTED_COMPILER_CHECK
+```
+
+## Examples
+
+??? example
+
+    The code below switches off the check whether the compiler is supported.
+
+    ```cpp
+    #define JSON_SKIP_UNSUPPORTED_COMPILER_CHECK 1
+    #include <nlohmann/json.hpp>
+
+    ...
+    ```
+
+## Version history
+
+Added in version 3.2.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/macros/json_throw_user.md b/external_imported/json/docs/mkdocs/docs/api/macros/json_throw_user.md
new file mode 100644
index 000000000..b02918cf8
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/macros/json_throw_user.md
@@ -0,0 +1,75 @@
+# JSON_CATCH_USER, JSON_THROW_USER, JSON_TRY_USER
+
+```cpp
+// (1)
+#define JSON_CATCH_USER(exception) /* value */
+// (2)
+#define JSON_THROW_USER(exception) /* value */
+// (3)
+#define JSON_TRY_USER /* value */
+```
+
+Controls how exceptions are handled by the library.
+
+1. This macro overrides [`#!cpp catch`](https://en.cppreference.com/w/cpp/language/try_catch) calls inside the library.
+   The argument is the type of the exception to catch. As of version 3.8.0, the library only catches `std::out_of_range`
+   exceptions internally to rethrow them as [`json::out_of_range`](../../home/exceptions.md#out-of-range) exceptions.
+   The macro is always followed by a scope.
+2. This macro overrides `#!cpp throw` calls inside the library. The argument is the exception to be thrown. Note that
+   `JSON_THROW_USER` should leave the current scope (e.g., by throwing or aborting), as continuing after it may yield
+   undefined behavior.
+3. This macro overrides `#!cpp try` calls inside the library. It has no arguments and is always followed by a scope.
+
+## Parameters
+
+`exception` (in)
+:   an exception type
+
+## Default definition
+
+By default, the macros map to their respective C++ keywords:
+
+```cpp
+#define JSON_CATCH_USER(exception) catch(exception)
+#define JSON_THROW_USER(exception) throw exception
+#define JSON_TRY_USER              try
+```
+
+When exceptions are switched off, the `#!cpp try` block is executed unconditionally, and throwing exceptions is
+replaced by calling [`std::abort`](https://en.cppreference.com/w/cpp/utility/program/abort) to make reaching the
+`#!cpp throw` branch abort the process.
+
+```cpp
+#define JSON_THROW_USER(exception) std::abort()
+#define JSON_TRY_USER              if (true)
+#define JSON_CATCH_USER(exception) if (false)
+```
+
+## Examples
+
+??? example
+
+    The code below switches off exceptions and creates a log entry with a detailed error message in case of errors.
+
+    ```cpp
+    #include <iostream>
+    
+    #define JSON_TRY_USER if(true)
+    #define JSON_CATCH_USER(exception) if(false)
+    #define JSON_THROW_USER(exception)                           \
+        {std::clog << "Error in " << __FILE__ << ":" << __LINE__ \
+                   << " (function " << __FUNCTION__ << ") - "    \
+                   << (exception).what() << std::endl;           \
+         std::abort();}
+    
+    #include <nlohmann/json.hpp>
+    ```
+
+## See also
+
+- [Switch off exceptions](../../home/exceptions.md#switch-off-exceptions) for more information how to switch off exceptions
+- [JSON_NOEXCEPTION](json_noexception.md) - switch off exceptions
+
+## Version history
+
+- Added in version 3.1.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/macros/json_use_global_udls.md b/external_imported/json/docs/mkdocs/docs/api/macros/json_use_global_udls.md
new file mode 100644
index 000000000..69db9e77c
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/macros/json_use_global_udls.md
@@ -0,0 +1,98 @@
+# JSON_USE_GLOBAL_UDLS
+
+```cpp
+#define JSON_USE_GLOBAL_UDLS /* value */
+```
+
+When defined to `1`, the user-defined string literals (UDLs) are placed into the global namespace instead of
+`nlohmann::literals::json_literals`.
+
+## Default definition
+
+The default value is `1`.
+
+```cpp
+#define JSON_USE_GLOBAL_UDLS 1
+```
+
+When the macro is not defined, the library will define it to its default value.
+
+## Notes
+
+!!! info "Future behavior change"
+
+    The user-defined string literals will be removed from the global namespace in the next major release of the library.
+
+    To prepare existing code, define `JSON_USE_GLOBAL_UDLS` to `0` and bring the string literals into scope where
+    needed. Refer to any of the [string literals](#see-also) for details.
+
+!!! hint "CMake option"
+
+    The placement of user-defined string literals can also be controlled with the CMake option
+    [`JSON_GlobalUDLs`](../../integration/cmake.md#json_globaludls) (`ON` by default) which defines
+    `JSON_USE_GLOBAL_UDLS` accordingly.
+
+## Examples
+
+??? example "Example 1: Default behavior"
+
+    The code below shows the default behavior using the `_json` UDL.
+    
+    ```cpp
+    #include <nlohmann/json.hpp>
+    
+    #include <iostream>
+    
+    int main()
+    {
+        auto j = "42"_json;
+    
+        std::cout << j << std::endl;
+    }
+    ```
+    
+    Output:
+    
+    ```json
+    42
+    ```
+
+??? example "Example 2: Namespaced UDLs"
+
+    The code below shows how UDLs need to be brought into scope before using `_json` when `JSON_USE_GLOBAL_UDLS` is
+    defined to `0`.
+    
+    ```cpp
+    #define JSON_USE_GLOBAL_UDLS 0
+    #include <nlohmann/json.hpp>
+
+    #include <iostream>
+    
+    int main()
+    {
+        // auto j = "42"_json; // This line would fail to compile,
+                               // because the UDLs are not in the global namespace
+    
+        // Bring the UDLs into scope
+        using namespace nlohmann::json_literals;
+    
+        auto j = "42"_json;
+    
+        std::cout << j << std::endl;
+    }
+    ```
+    
+    Output:
+    
+    ```json
+    42
+    ```
+
+## See also
+
+- [`operator""_json`](../operator_literal_json.md)
+- [`operator""_json_pointer`](../operator_literal_json_pointer.md)
+
+## Version history
+
+- Added in version 3.11.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/macros/json_use_implicit_conversions.md b/external_imported/json/docs/mkdocs/docs/api/macros/json_use_implicit_conversions.md
new file mode 100644
index 000000000..557dfa299
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/macros/json_use_implicit_conversions.md
@@ -0,0 +1,59 @@
+# JSON_USE_IMPLICIT_CONVERSIONS
+
+```cpp
+#define JSON_USE_IMPLICIT_CONVERSIONS /* value */
+```
+
+When defined to `0`, implicit conversions are switched off. By default, implicit conversions are switched on. The
+value directly affects [`operator ValueType`](../basic_json/operator_ValueType.md).
+
+## Default definition
+
+By default, implicit conversions are enabled.
+
+```cpp
+#define JSON_USE_IMPLICIT_CONVERSIONS 1
+```
+
+## Notes
+
+!!! info "Future behavior change"
+
+    Implicit conversions will be switched off by default in the next major release of the library.
+
+    You can prepare existing code by already defining `JSON_USE_IMPLICIT_CONVERSIONS` to `0` and replace any implicit
+    conversions with calls to [`get`](../basic_json/get.md).
+
+!!! hint "CMake option"
+
+    Implicit conversions can also be controlled with the CMake option
+    [`JSON_ImplicitConversions`](../../integration/cmake.md#json_legacydiscardedvaluecomparison)
+    (`ON` by default) which defines `JSON_USE_IMPLICIT_CONVERSIONS` accordingly.
+
+## Examples
+
+??? example
+
+    This is an example for an implicit conversion:
+
+    ```cpp
+    json j = "Hello, world!";
+    std::string s = j;
+    ```
+
+    When `JSON_USE_IMPLICIT_CONVERSIONS` is defined to `0`, the code above does no longer compile. Instead, it must be
+    written like this:
+
+    ```cpp
+    json j = "Hello, world!";
+    auto s = j.template get<std::string>();
+    ```
+
+## See also
+
+- [**operator ValueType**](../basic_json/operator_ValueType.md) - get a value (implicit)
+- [**get**](../basic_json/get.md) - get a value (explicit)
+
+## Version history
+
+- Added in version 3.9.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/macros/json_use_legacy_discarded_value_comparison.md b/external_imported/json/docs/mkdocs/docs/api/macros/json_use_legacy_discarded_value_comparison.md
new file mode 100644
index 000000000..bc1d1434a
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/macros/json_use_legacy_discarded_value_comparison.md
@@ -0,0 +1,77 @@
+# JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+
+```cpp
+#define JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON /* value */
+```
+
+This macro enables the (incorrect) legacy comparison behavior of discarded JSON values. Possible values are `1` to
+enable or `0` to disable (default).
+
+When enabled, comparisons involving at least one discarded JSON value yield results as follows:
+
+| **Operator** | **Result**    |
+|--------------|---------------|
+| `==`         | `#!cpp false` |
+| `!=`         | `#!cpp true`  |
+| `<`          | `#!cpp false` |
+| `<=`         | `#!cpp true`  |
+| `>=`         | `#!cpp true`  |
+| `>`          | `#!cpp false` |
+
+Otherwise, comparisons involving at least one discarded JSON value always yield `#!cpp false`.
+
+## Default definition
+
+The default value is `0`.
+
+```cpp
+#define JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON 0
+```
+
+When the macro is not defined, the library will define it to its default value.
+
+## Notes
+
+!!! warning "Inconsistent behavior in C++20 and beyond"
+
+    When targeting C++20 or above, enabling the legacy comparison behavior is _strongly_
+    discouraged.
+
+      - The 3-way comparison operator (`<=>`) will always give the correct result
+        (`#!cpp std::partial_ordering::unordered`) regardless of the value of
+        `JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON`.
+      - Overloads for the equality and relational operators emulate the legacy behavior.
+
+    Code outside your control may use either 3-way comparison or the equality and relational operators, resulting in
+    inconsistent and unpredictable behavior.
+
+    See [`operator<=>`](../basic_json/operator_spaceship.md) for more information on 3-way comparison.
+
+!!! warning "Deprecation"
+
+    The legacy comparison behavior is deprecated and may be removed in a future major version release.
+
+    New code should not depend on it and existing code should try to remove or rewrite expressions relying on it.
+
+!!! hint "CMake option"
+
+    Legacy comparison can also be controlled with the CMake option
+    [`JSON_LegacyDiscardedValueComparison`](../../integration/cmake.md#json_legacydiscardedvaluecomparison)
+    (`OFF` by default) which defines `JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON` accordingly.
+
+## Examples
+
+??? example
+
+    The code below switches on the legacy discarded value comparison behavior in the library.
+
+    ```cpp
+    #define JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON 1
+    #include <nlohmann/json.hpp>
+
+    ...
+    ```
+
+## Version history
+
+- Added in version 3.11.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/macros/nlohmann_define_type_intrusive.md b/external_imported/json/docs/mkdocs/docs/api/macros/nlohmann_define_type_intrusive.md
new file mode 100644
index 000000000..ad425810a
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/macros/nlohmann_define_type_intrusive.md
@@ -0,0 +1,156 @@
+# NLOHMANN_DEFINE_TYPE_INTRUSIVE, NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT, NLOHMANN_DEFINE_TYPE_INTRUSIVE_ONLY_SERIALIZE
+
+```cpp
+#define NLOHMANN_DEFINE_TYPE_INTRUSIVE(type, member...)              // (1)
+#define NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(type, member...) // (2)
+#define NLOHMANN_DEFINE_TYPE_INTRUSIVE_ONLY_SERIALIZE(type, member...) // (3)
+```
+
+These macros can be used to simplify the serialization/deserialization of types if you want to use a JSON object as
+serialization and want to use the member variable names as object keys in that object. The macro is to be defined
+**inside** the class/struct to create code for. Unlike
+[`NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE`](nlohmann_define_type_non_intrusive.md), it can access private members. The first
+parameter is the name of the class/struct, and all remaining parameters name the members.
+
+1. Will use [`at`](../basic_json/at.md) during deserialization and will throw
+  [`out_of_range.403`](../../home/exceptions.md#jsonexceptionout_of_range403) if a key is missing in the JSON object.
+2. Will use [`value`](../basic_json/value.md) during deserialization and fall back to the default value for the
+   respective type of the member variable if a key in the JSON object is missing. The generated `from_json()` function
+   default constructs an object and uses its values as the defaults when calling the `value` function.
+3. Only defines the serialization. Useful in cases when the type does not have a default constructor and only serialization in required.
+
+## Parameters
+
+`type` (in)
+:   name of the type (class, struct) to serialize/deserialize
+
+`member` (in)
+:   name of the member variable to serialize/deserialize; up to 64 members can be given as comma-separated list
+
+## Default definition
+
+The macros add two friend functions to the class which take care of the serialization and deserialization:
+
+```cpp
+friend void to_json(nlohmann::json&, const type&);
+friend void from_json(const nlohmann::json&, type&); // except (3)
+```
+
+See examples below for the concrete generated code.
+
+## Notes
+
+!!! info "Prerequisites"
+
+    1. The type `type` must be default constructible (except (3)). See [How can I use `get()` for non-default
+       constructible/non-copyable types?][GetNonDefNonCopy] for how to overcome this limitation.
+    2. The macro must be used inside the type (class/struct).
+
+[GetNonDefNonCopy]: ../../features/arbitrary_types.md#how-can-i-use-get-for-non-default-constructiblenon-copyable-types
+
+!!! warning "Implementation limits"
+
+    - The current implementation is limited to at most 64 member variables. If you want to serialize/deserialize types
+      with more than 64 member variables, you need to define the `to_json`/`from_json` functions manually.
+    - The macros only work for the [`nlohmann::json`](../json.md) type; other specializations such as
+      [`nlohmann::ordered_json`](../ordered_json.md) are currently unsupported.
+
+## Examples
+
+??? example "Example (1): NLOHMANN_DEFINE_TYPE_INTRUSIVE"
+
+    Consider the following complete example:
+
+    ```cpp hl_lines="22"
+    --8<-- "examples/nlohmann_define_type_intrusive_macro.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/nlohmann_define_type_intrusive_macro.output"
+    ```
+
+    Notes:
+
+    - `ns::person` is default-constructible. This is a requirement for using the macro.
+    - `ns::person` has private member variables. This makes `NLOHMANN_DEFINE_TYPE_INTRUSIVE` applicable, but not
+      `NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE`.
+    - The macro `NLOHMANN_DEFINE_TYPE_INTRUSIVE` is used _inside_ the class.
+    - A missing key "age" in the deserialization yields an exception. To fall back to the default value,
+      `NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT` can be used.
+
+    The macro is equivalent to:
+
+    ```cpp hl_lines="22 23 24 25 26 27 28 29 30 31 32 33 34"
+    --8<-- "examples/nlohmann_define_type_intrusive_explicit.cpp"
+    ```
+
+??? example "Example (2): NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT"
+
+    Consider the following complete example:
+
+    ```cpp hl_lines="22"
+    --8<-- "examples/nlohmann_define_type_intrusive_with_default_macro.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/nlohmann_define_type_intrusive_with_default_macro.output"
+    ```
+
+    Notes:
+
+    - `ns::person` is default-constructible. This is a requirement for using the macro.
+    - `ns::person` has private member variables. This makes `NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT` applicable,
+       but not `NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT`.
+    - The macro `NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT` is used _inside_ the class.
+    - A missing key "age" in the deserialization does not yield an exception. Instead, the default value `-1` is used.
+
+    The macro is equivalent to:
+
+    ```cpp hl_lines="22 23 24 25 26 27 28 29 30 31 32 33 34 35"
+    --8<-- "examples/nlohmann_define_type_intrusive_with_default_explicit.cpp"
+    ```
+
+    Note how a default-initialized `person` object is used in the `from_json` to fill missing values.
+
+??? example "Example (3): NLOHMANN_DEFINE_TYPE_INTRUSIVE_ONLY_SERIALIZE"
+    Consider the following complete example:
+
+    ```cpp hl_lines="22"
+    --8<-- "examples/nlohmann_define_type_intrusive_only_serialize_macro.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/nlohmann_define_type_intrusive_only_serialize_macro.output"
+    ```
+
+    Notes:
+
+    - `ns::person` is non-default-constructible. This allows this macro to be used instead of 
+      `NLOHMANN_DEFINE_TYPE_INTRUSIVE` and `NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT`.
+    - `ns::person` has private member variables. This makes `NLOHMANN_DEFINE_TYPE_INTRUSIVE_ONLY_SERIALIZE` applicable, but not
+      `NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_ONLY_SERIALIZE`.
+    - The macro `NLOHMANN_DEFINE_TYPE_INTRUSIVE_ONLY_SERIALIZE` is used _inside_ the class.
+
+    The macro is equivalent to:
+
+    ```cpp hl_lines="22 22 23 24 25 26 27"
+    --8<-- "examples/nlohmann_define_type_intrusive_only_serialize_explicit.cpp"
+    ```
+
+## See also
+
+- [NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE{_WITH_DEFAULT, _ONLY_SERIALIZE}](nlohmann_define_type_non_intrusive.md)
+  for a similar macro that can be defined _outside_ the type.
+- [Arbitrary Type Conversions](../../features/arbitrary_types.md) for an overview.
+
+## Version history
+
+1. Added in version 3.9.0.
+2. Added in version 3.11.0.
+3. Added in version TODO.
diff --git a/external_imported/json/docs/mkdocs/docs/api/macros/nlohmann_define_type_non_intrusive.md b/external_imported/json/docs/mkdocs/docs/api/macros/nlohmann_define_type_non_intrusive.md
new file mode 100644
index 000000000..5830f8ca9
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/macros/nlohmann_define_type_non_intrusive.md
@@ -0,0 +1,157 @@
+# NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE, NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT, NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_ONLY_SERIALIZE
+
+```cpp
+#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(type, member...)              // (1)
+#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(type, member...) // (2)
+#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_ONLY_SERIALIZE(type, member...) // (3)
+```
+
+These macros can be used to simplify the serialization/deserialization of types if you want to use a JSON object as
+serialization and want to use the member variable names as object keys in that object. The macro is to be defined
+**outside** the class/struct to create code for, but **inside** its namespace. Unlike
+[`NLOHMANN_DEFINE_TYPE_INTRUSIVE`](nlohmann_define_type_intrusive.md), it **cannot** access private members. The first
+parameter is the name of the class/struct, and all remaining parameters name the members.
+
+1. Will use [`at`](../basic_json/at.md) during deserialization and will throw
+   [`out_of_range.403`](../../home/exceptions.md#jsonexceptionout_of_range403) if a key is missing in the JSON object.
+2. Will use [`value`](../basic_json/value.md) during deserialization and fall back to the default value for the
+   respective type of the member variable if a key in the JSON object is missing. The generated `from_json()` function
+   default constructs an object and uses its values as the defaults when calling the `value` function.
+3. Only defines the serialization. Useful in cases when the type does not have a default constructor and only serialization in required.
+
+## Parameters
+
+`type` (in)
+:   name of the type (class, struct) to serialize/deserialize
+
+`member` (in)
+:   name of the (public) member variable to serialize/deserialize; up to 64 members can be given as comma-separated list
+
+## Default definition
+
+The macros add two functions to the namespace which take care of the serialization and deserialization:
+
+```cpp
+void to_json(nlohmann::json&, const type&);
+void from_json(const nlohmann::json&, type&); // except (3)
+```
+
+See examples below for the concrete generated code.
+
+## Notes
+
+!!! info "Prerequisites"
+
+    1. The type `type` must be default constructible (except (3). See [How can I use `get()` for non-default constructible/non-copyable types?][GetNonDefNonCopy]
+       for how to overcome this limitation.
+    2. The macro must be used outside the type (class/struct).
+    3. The passed members must be public.
+
+[GetNonDefNonCopy]: ../../features/arbitrary_types.md#how-can-i-use-get-for-non-default-constructiblenon-copyable-types
+
+!!! warning "Implementation limits"
+
+    - The current implementation is limited to at most 64 member variables. If you want to serialize/deserialize types
+      with more than 64 member variables, you need to define the `to_json`/`from_json` functions manually.
+    - The macros only work for the [`nlohmann::json`](../json.md) type; other specializations such as
+      [`nlohmann::ordered_json`](../ordered_json.md) are currently unsupported.
+
+## Examples
+
+??? example "Example (1): NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE"
+
+    Consider the following complete example:
+
+    ```cpp hl_lines="16"
+    --8<-- "examples/nlohmann_define_type_non_intrusive_macro.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/nlohmann_define_type_non_intrusive_macro.output"
+    ```
+
+    Notes:
+
+    - `ns::person` is default-constructible. This is a requirement for using the macro.
+    - `ns::person` has only public member variables. This makes `NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE` applicable.
+    - The macro `NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE` is used _outside_ the class, but _inside_ its namespace `ns`.
+    - A missing key "age" in the deserialization yields an exception. To fall back to the default value,
+      `NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT` can be used.
+
+    The macro is equivalent to:
+
+    ```cpp hl_lines="16 17 18 19 20 21 22 23 24 25 26 27 28"
+    --8<-- "examples/nlohmann_define_type_non_intrusive_explicit.cpp"
+    ```
+
+??? example "Example (2): NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT"
+
+    Consider the following complete example:
+
+    ```cpp hl_lines="22"
+    --8<-- "examples/nlohmann_define_type_non_intrusive_with_default_macro.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/nlohmann_define_type_non_intrusive_with_default_macro.output"
+    ```
+
+    Notes:
+
+    - `ns::person` is default-constructible. This is a requirement for using the macro.
+    - `ns::person` has only public member variables. This makes `NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT`
+      applicable.
+    - The macro `NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT` is used _outside_ the class, but _inside_ its
+      namespace `ns`.
+    - A missing key "age" in the deserialization does not yield an exception. Instead, the default value `-1` is used.
+
+    The macro is equivalent to:
+
+    ```cpp hl_lines="22 23 24 25 26 27 28 29 30 31 32 33 34 35"
+    --8<-- "examples/nlohmann_define_type_non_intrusive_with_default_explicit.cpp"
+    ```
+
+    Note how a default-initialized `person` object is used in the `from_json` to fill missing values.
+
+??? example "Example (3): NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_ONLY_SERIALIZE"
+
+    Consider the following complete example:
+
+    ```cpp hl_lines="16"
+    --8<-- "examples/nlohmann_define_type_non_intrusive_only_serialize_macro.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/nlohmann_define_type_non_intrusive_only_serialize_macro.output"
+    ```
+
+    Notes:
+
+    - `ns::person` is non-default-constructible. This allows this macro to be used instead of 
+      `NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE` and `NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT`.
+    - `ns::person` has only public member variables. This makes `NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_ONLY_SERIALIZE` applicable.
+    - The macro `NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_ONLY_SERIALIZE` is used _outside_ the class, but _inside_ its namespace `ns`.
+
+    The macro is equivalent to:
+
+    ```cpp hl_lines="16 17 18 19 20 21"
+    --8<-- "examples/nlohmann_define_type_non_intrusive_only_serialize_explicit.cpp"
+    ```
+
+## See also
+
+- [NLOHMANN_DEFINE_TYPE_INTRUSIVE{_WITH_DEFAULT, _ONLY_SERIALIZE}](nlohmann_define_type_intrusive.md)
+  for a similar macro that can be defined _inside_ the type.
+- [Arbitrary Type Conversions](../../features/arbitrary_types.md) for an overview.
+
+## Version history
+
+1. Added in version 3.9.0.
+2. Added in version 3.11.0.
+3. Added in version TODO.
diff --git a/external_imported/json/docs/mkdocs/docs/api/macros/nlohmann_json_namespace.md b/external_imported/json/docs/mkdocs/docs/api/macros/nlohmann_json_namespace.md
new file mode 100644
index 000000000..5c54dba52
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/macros/nlohmann_json_namespace.md
@@ -0,0 +1,41 @@
+# NLOHMANN_JSON_NAMESPACE
+
+```cpp
+#define NLOHMANN_JSON_NAMESPACE /* value */
+```
+
+This macro evaluates to the full name of the `nlohmann` namespace.
+
+## Default definition
+
+The default value consists of the root namespace (`nlohmann`) and an inline ABI namespace. See
+[`nlohmann` Namespace](../../features/namespace.md#structure) for details.
+
+When the macro is not defined, the library will define it to its default value. Overriding this value has no effect on
+the library.
+
+## Examples
+
+??? example
+
+    The example shows how to use `NLOHMANN_JSON_NAMESPACE` instead of just `nlohmann`, as well as how to output the value
+    of `NLOHMANN_JSON_NAMESPACE`.
+
+    ```cpp
+    --8<-- "examples/nlohmann_json_namespace.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/nlohmann_json_namespace.output"
+    ```
+
+## See also
+
+- [`NLOHMANN_JSON_NAMESPACE_BEGIN, NLOHMANN_JSON_NAMESPACE_END`](nlohmann_json_namespace_begin.md)
+- [`NLOHMANN_JSON_NAMESPACE_NO_VERSION`](nlohmann_json_namespace_no_version.md)
+
+## Version history
+
+- Added in version 3.11.0. Changed inline namespace name in version 3.11.2.
diff --git a/external_imported/json/docs/mkdocs/docs/api/macros/nlohmann_json_namespace_begin.md b/external_imported/json/docs/mkdocs/docs/api/macros/nlohmann_json_namespace_begin.md
new file mode 100644
index 000000000..1374264a3
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/macros/nlohmann_json_namespace_begin.md
@@ -0,0 +1,61 @@
+# NLOHMANN_JSON_NAMESPACE_BEGIN, NLOHMANN_JSON_NAMESPACE_END
+
+```cpp
+#define NLOHMANN_JSON_NAMESPACE_BEGIN /* value */  // (1)
+#define NLOHMANN_JSON_NAMESPACE_END   /* value */  // (2)
+```
+
+These macros can be used to open and close the `nlohmann` namespace. See
+[`nlohmann` Namespace](../../features/namespace.md#structure) for details.
+
+1. Opens the namespace.
+2. Closes the namespace.
+
+## Default definition
+
+The default definitions open and close the `nlohmann` namespace. The precise definition of
+[`NLOHMANN_JSON_NAMESPACE_BEGIN`] varies as described [here](../../features/namespace.md#structure).
+
+1. Default definition of `NLOHMANN_JSON_NAMESPACE_BEGIN`:
+
+    ```cpp
+    namespace nlohmann
+    {
+    inline namespace json_abi_v3_11_2
+    {
+    ```
+
+2. Default definition of `NLOHMANN_JSON_NAMESPACE_END`:
+    ```cpp
+    }  // namespace json_abi_v3_11_2
+    }  // namespace nlohmann
+    ```
+
+When these macros are not defined, the library will define them to their default definitions.
+
+## Examples
+
+??? example
+
+    The example shows how to use `NLOHMANN_JSON_NAMESPACE_BEGIN`/`NLOHMANN_JSON_NAMESPACE_END` from the
+    [How do I convert third-party types?](../../features/arbitrary_types.md#how-do-i-convert-third-party-types) page.
+
+    ```cpp
+    --8<-- "examples/nlohmann_json_namespace_begin.c++17.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/nlohmann_json_namespace_begin.c++17.output"
+    ```
+
+## See also
+
+- [`nlohmann` Namespace](../../features/namespace.md)
+- [NLOHMANN_JSON_NAMESPACE](nlohmann_json_namespace.md)
+- [`NLOHMANN_JSON_NAMESPACE_NO_VERSION`](nlohmann_json_namespace_no_version.md)
+
+## Version history
+
+- Added in version 3.11.0. Changed inline namespace name in version 3.11.2.
diff --git a/external_imported/json/docs/mkdocs/docs/api/macros/nlohmann_json_namespace_no_version.md b/external_imported/json/docs/mkdocs/docs/api/macros/nlohmann_json_namespace_no_version.md
new file mode 100644
index 000000000..9e2a52d04
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/macros/nlohmann_json_namespace_no_version.md
@@ -0,0 +1,45 @@
+# NLOHMANN_JSON_NAMESPACE_NO_VERSION
+
+```cpp
+#define NLOHMANN_JSON_NAMESPACE_NO_VERSION /* value */
+```
+
+If defined to `1`, the version component is omitted from the inline namespace. See
+[`nlohmann` Namespace](../../features/namespace.md#structure) for details.
+
+## Default definition
+
+The default value is `0`.
+
+```cpp
+#define NLOHMANN_JSON_NAMESPACE_NO_VERSION 0
+```
+
+When the macro is not defined, the library will define it to its default value.
+
+## Examples
+
+??? example
+
+    The example shows how to use `NLOHMANN_JSON_NAMESPACE_NO_VERSION` to disable the version component of the inline
+    namespace.
+    
+    ```cpp
+    --8<-- "examples/nlohmann_json_namespace_no_version.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/nlohmann_json_namespace_no_version.output"
+    ```
+
+## See also
+
+- [`nlohmann` Namespace](../../features/namespace.md)
+- [`NLOHMANN_JSON_NAMESPACE`](nlohmann_json_namespace.md)
+- [`NLOHMANN_JSON_NAMESPACE_BEGIN, NLOHMANN_JSON_NAMESPACE_END`](nlohmann_json_namespace_begin.md)
+
+## Version history
+
+- Added in version 3.11.2.
diff --git a/external_imported/json/docs/mkdocs/docs/api/macros/nlohmann_json_serialize_enum.md b/external_imported/json/docs/mkdocs/docs/api/macros/nlohmann_json_serialize_enum.md
new file mode 100644
index 000000000..dc2cc8ecb
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/macros/nlohmann_json_serialize_enum.md
@@ -0,0 +1,85 @@
+# NLOHMANN_JSON_SERIALIZE_ENUM
+
+```cpp
+#define NLOHMANN_JSON_SERIALIZE_ENUM(type, conversion...)
+```
+
+By default, enum values are serialized to JSON as integers. In some cases this could result in undesired behavior. If an
+enum is modified or re-ordered after data has been serialized to JSON, the later de-serialized JSON data may be
+undefined or a different enum value than was originally intended.
+
+The `NLOHMANN_JSON_SERIALIZE_ENUM` allows to define a user-defined serialization for every enumerator.
+
+## Parameters
+
+`type` (in)
+:   name of the enum to serialize/deserialize
+
+`conversion` (in)
+:   a pair of an enumerator and a JSON serialization; arbitrary pairs can be given as a comma-separated list
+
+## Default definition
+
+The macros add two friend functions to the class which take care of the serialization and deserialization:
+
+```cpp
+template<typename BasicJsonType>
+inline void to_json(BasicJsonType& j, const type& e);
+template<typename BasicJsonType>
+inline void from_json(const BasicJsonType& j, type& e);
+```
+
+## Notes
+
+!!! info "Prerequisites"
+
+    The macro must be used inside the namespace of the enum.
+
+!!! important "Important notes"
+
+    - When using [`template get<ENUM_TYPE>()`](../basic_json/get.md), undefined JSON values will default to the first specified
+      conversion. Select this default pair carefully. See example 1 below.
+    - If an enum or JSON value is specified in multiple conversions, the first matching conversion from the top of the
+      list will be returned when converting to or from JSON. See example 2 below.
+
+## Examples
+
+??? example "Example 1: Basic usage"
+
+    The example shows how `NLOHMANN_JSON_SERIALIZE_ENUM` can be used to serialize/deserialize both classical enums and
+    C++11 enum classes:
+
+    ```cpp hl_lines="16 17 18 19 20 21 22 29 30 31 32 33"
+    --8<-- "examples/nlohmann_json_serialize_enum.cpp"
+    ```
+
+    Output:
+    
+    ```json
+    --8<-- "examples/nlohmann_json_serialize_enum.output"
+    ```
+
+??? example "Example 2: Multiple conversions for one enumerator"
+
+    The example shows how to use multiple conversions for a single enumerator. In the example, `Color::red` will always
+    be *serialized* to `"red"`, because the first occurring conversion. The second conversion, however, offers an
+    alternative *deserialization* from `"rot"` to `Color::red`.
+
+    ```cpp hl_lines="17"
+    --8<-- "examples/nlohmann_json_serialize_enum_2.cpp"
+    ```
+
+    Output:
+    
+    ```json
+    --8<-- "examples/nlohmann_json_serialize_enum_2.output"
+    ```
+
+## See also
+
+- [Specializing enum conversion](../../features/enum_conversion.md)
+- [`JSON_DISABLE_ENUM_SERIALIZATION`](json_disable_enum_serialization.md)
+
+## Version history
+
+Added in version 3.4.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/macros/nlohmann_json_version_major.md b/external_imported/json/docs/mkdocs/docs/api/macros/nlohmann_json_version_major.md
new file mode 100644
index 000000000..d7a314276
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/macros/nlohmann_json_version_major.md
@@ -0,0 +1,40 @@
+# NLOHMANN_JSON_VERSION_MAJOR, NLOHMANN_JSON_VERSION_MINOR, NLOHMANN_JSON_VERSION_PATCH
+
+```cpp
+#define NLOHMANN_JSON_VERSION_MAJOR /* value */
+#define NLOHMANN_JSON_VERSION_MINOR /* value */
+#define NLOHMANN_JSON_VERSION_PATCH /* value */
+```
+
+These macros are defined by the library and contain the version numbers according to
+[Semantic Versioning 2.0.0](https://semver.org/spec/v2.0.0.html).
+
+## Default definition
+
+The macros are defined according to the current library version.
+
+## Examples
+
+??? example
+
+    The example below shows how `NLOHMANN_JSON_VERSION_MAJOR`, `NLOHMANN_JSON_VERSION_MINOR`, and
+    `NLOHMANN_JSON_VERSION_PATCH` are defined by the library.
+
+    ```cpp
+    --8<-- "examples/nlohmann_json_version.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/nlohmann_json_version.output"
+    ```
+
+## See also
+
+- [meta](../basic_json/meta.md) - returns version information on the library
+- [JSON_SKIP_LIBRARY_VERSION_CHECK](json_skip_library_version_check.md) - skip library version check
+
+## Version history
+
+- Added in version 3.1.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/operator_gtgt.md b/external_imported/json/docs/mkdocs/docs/api/operator_gtgt.md
new file mode 100644
index 000000000..e76cc0db7
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/operator_gtgt.md
@@ -0,0 +1,64 @@
+# <small>nlohmann::</small>operator>>(basic_json)
+
+```cpp
+std::istream& operator>>(std::istream& i, basic_json& j);
+```
+
+Deserializes an input stream to a JSON value.
+
+## Parameters
+
+`i` (in, out)
+:   input stream to read a serialized JSON value from
+
+`j` (in, out)
+:   JSON value to write the deserialized input to
+
+## Return value
+
+the stream `i`
+
+## Exceptions
+
+- Throws [`parse_error.101`](../home/exceptions.md#jsonexceptionparse_error101) in case of an unexpected token.
+- Throws [`parse_error.102`](../home/exceptions.md#jsonexceptionparse_error102) if to_unicode fails or surrogate error.
+- Throws [`parse_error.103`](../home/exceptions.md#jsonexceptionparse_error103) if to_unicode fails.
+
+## Complexity
+
+Linear in the length of the input. The parser is a predictive LL(1) parser.
+
+## Notes
+
+A UTF-8 byte order mark is silently ignored.
+
+!!! warning "Deprecation"
+
+    This function replaces function `#!cpp std::istream& operator<<(basic_json& j, std::istream& i)` which has
+    been deprecated in version 3.0.0. It will be removed in version 4.0.0. Please replace calls like `#!cpp j << i;`
+    with `#!cpp i >> j;`.
+
+## Examples
+
+??? example
+
+    The example below shows how a JSON value is constructed by reading a serialization from a stream.
+        
+    ```cpp
+    --8<-- "examples/operator_deserialize.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/operator_deserialize.output"
+    ```
+
+## See also
+
+- [accept](basic_json/accept.md) - check if the input is valid JSON
+- [parse](basic_json/parse.md) - deserialize from a compatible input
+
+## Version history
+
+- Added in version 1.0.0. Deprecated in version 3.0.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/operator_literal_json.md b/external_imported/json/docs/mkdocs/docs/api/operator_literal_json.md
new file mode 100644
index 000000000..bc2b2cfc5
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/operator_literal_json.md
@@ -0,0 +1,61 @@
+# <small>nlohmann::</small>operator""_json
+
+```cpp
+json operator ""_json(const char* s, std::size_t n);
+```
+
+This operator implements a user-defined string literal for JSON objects. It can be used by adding `#!cpp _json` to a
+string literal and returns a [`json`](json.md) object if no parse error occurred.
+
+It is recommended to bring the operator into scope using any of the following lines:
+```cpp
+using nlohmann::literals::operator ""_json;
+using namespace nlohmann::literals;
+using namespace nlohmann::json_literals;
+using namespace nlohmann::literals::json_literals;
+using namespace nlohmann;
+```
+
+This is suggested to ease migration to the next major version release of the library. See
+['JSON_USE_GLOBAL_UDLS`](macros/json_use_global_udls.md#notes) for details.
+
+## Parameters
+
+`s` (in)
+:   a string representation of a JSON object
+
+`n` (in)
+:   length of string `s`
+
+## Return value
+
+[`json`](json.md) value parsed from `s`
+
+## Exceptions
+
+The function can throw anything that [`parse(s, s+n)`](basic_json/parse.md) would throw.
+
+## Complexity
+
+Linear.
+
+## Examples
+
+??? example
+
+    The following code shows how to create JSON values from string literals.
+     
+    ```cpp
+    --8<-- "examples/operator_literal_json.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/operator_literal_json.output"
+    ```
+
+## Version history
+
+- Added in version 1.0.0.
+- Moved to namespace `nlohmann::literals::json_literals` in 3.11.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/operator_literal_json_pointer.md b/external_imported/json/docs/mkdocs/docs/api/operator_literal_json_pointer.md
new file mode 100644
index 000000000..0e12440e1
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/operator_literal_json_pointer.md
@@ -0,0 +1,64 @@
+# <small>nlohmann::</small>operator""_json_pointer
+
+```cpp
+json_pointer operator ""_json_pointer(const char* s, std::size_t n);
+```
+
+This operator implements a user-defined string literal for JSON Pointers. It can be used by adding `#!cpp _json_pointer`
+to a string literal and returns a [`json_pointer`](json_pointer/index.md) object if no parse error occurred.
+
+It is recommended to bring the operator into scope using any of the following lines:
+```cpp
+using nlohmann::literals::operator ""_json_pointer;
+using namespace nlohmann::literals;
+using namespace nlohmann::json_literals;
+using namespace nlohmann::literals::json_literals;
+using namespace nlohmann;
+```
+This is suggested to ease migration to the next major version release of the library. See
+['JSON_USE_GLOBAL_UDLS`](macros/json_use_global_udls.md#notes) for details.
+
+## Parameters
+
+`s` (in)
+:   a string representation of a JSON Pointer
+
+`n` (in)
+:   length of string `s`
+
+## Return value
+
+[`json_pointer`](json_pointer/index.md) value parsed from `s`
+
+## Exceptions
+
+The function can throw anything that [`json_pointer::json_pointer`](json_pointer/index.md) would throw.
+
+## Complexity
+
+Linear.
+
+## Examples
+
+??? example
+
+    The following code shows how to create JSON Pointers from string literals.
+     
+    ```cpp
+    --8<-- "examples/operator_literal_json_pointer.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/operator_literal_json_pointer.output"
+    ```
+
+## See also
+
+- [json_pointer](json_pointer/index.md) - type to represent JSON Pointers
+
+## Version history
+
+- Added in version 2.0.0.
+- Moved to namespace `nlohmann::literals::json_literals` in 3.11.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/operator_ltlt.md b/external_imported/json/docs/mkdocs/docs/api/operator_ltlt.md
new file mode 100644
index 000000000..1718b3c9e
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/operator_ltlt.md
@@ -0,0 +1,87 @@
+# <small>nlohmann::</small>operator<<(basic_json), <small>nlohmann::</small>operator<<(json_pointer)
+
+```cpp
+std::ostream& operator<<(std::ostream& o, const basic_json& j);      // (1)
+
+std::ostream& operator<<(std::ostream& o, const json_pointer& ptr);  // (2)
+```
+
+1. Serialize the given JSON value `j` to the output stream `o`. The JSON value will be serialized using the
+   [`dump`](basic_json/dump.md) member function.
+    - The indentation of the output can be controlled with the member variable `width` of the output stream `o`. For
+      instance, using the manipulator `std::setw(4)` on `o` sets the indentation level to `4` and the serialization
+      result is the same as calling `dump(4)`.
+    - The indentation character can be controlled with the member variable `fill` of the output stream `o`.
+      For instance, the manipulator `std::setfill('\\t')` sets indentation to use a tab character rather than the
+      default space character.
+2. Write a string representation of the given JSON pointer `ptr` to the output stream `o`. The string representation is
+   obtained using the [`to_string`](json_pointer/to_string.md) member function.
+
+## Parameters
+
+`o` (in, out)
+:   stream to write to
+
+`j` (in)
+:   JSON value to serialize
+
+`ptr` (in)
+:   JSON pointer to write
+
+## Return value
+
+the stream `o`
+
+## Exceptions
+
+1. Throws [`type_error.316`](../home/exceptions.md#jsonexceptiontype_error316) if a string stored inside the JSON
+   value is not UTF-8 encoded. Note that unlike the [`dump`](basic_json/dump.md) member functions, no `error_handler`
+   can be set.
+2. None.
+
+## Complexity
+
+Linear.
+
+## Notes
+
+!!! warning "Deprecation"
+
+    Function  `#!cpp std::ostream& operator<<(std::ostream& o, const basic_json& j)` replaces function
+    `#!cpp std::ostream& operator>>(const basic_json& j, std::ostream& o)` which has been deprecated in version 3.0.0.
+    It will be removed in version 4.0.0. Please replace calls like `#!cpp j >> o;` with `#!cpp o << j;`.
+
+## Examples
+
+??? example "Example: (1) serialize JSON value to stream"
+
+    The example below shows the serialization with different parameters to `width` to adjust the indentation level.
+    
+    ```cpp
+    --8<-- "examples/operator_ltlt__basic_json.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/operator_ltlt__basic_json.output"
+    ```
+
+??? example "Example: (2) write JSON pointer to stream"
+
+    The example below shows how to write a JSON pointer to a stream.
+    
+    ```cpp
+    --8<-- "examples/operator_ltlt__json_pointer.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/operator_ltlt__json_pointer.output"
+    ```
+## Version history
+
+1. Added in version 1.0.0. Added support for indentation character and deprecated
+   `#!cpp std::ostream& operator>>(const basic_json& j, std::ostream& o)` in version 3.0.0.
+3. Added in version 3.11.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/ordered_json.md b/external_imported/json/docs/mkdocs/docs/api/ordered_json.md
new file mode 100644
index 000000000..7cfd9f4dd
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/ordered_json.md
@@ -0,0 +1,32 @@
+# <small>nlohmann::</small>ordered_json
+
+```cpp
+using ordered_json = basic_json<ordered_map>;
+```
+
+This type preserves the insertion order of object keys.
+
+## Examples
+
+??? example
+
+    The example below demonstrates how `ordered_json` preserves the insertion order of object keys.
+
+    ```cpp
+    --8<-- "examples/ordered_json.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/ordered_json.output"
+    ```
+
+## See also
+
+- [ordered_map](ordered_map.md)
+- [Object Order](../features/object_order.md)
+
+## Version history
+
+Since version 3.9.0.
diff --git a/external_imported/json/docs/mkdocs/docs/api/ordered_map.md b/external_imported/json/docs/mkdocs/docs/api/ordered_map.md
new file mode 100644
index 000000000..160b85c28
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/api/ordered_map.md
@@ -0,0 +1,77 @@
+# <small>nlohmann::</small>ordered_map
+
+```cpp
+template<class Key, class T, class IgnoredLess = std::less<Key>,
+         class Allocator = std::allocator<std::pair<const Key, T>>>
+struct ordered_map : std::vector<std::pair<const Key, T>, Allocator>;
+```
+
+A minimal map-like container that preserves insertion order for use within [`nlohmann::ordered_json`](ordered_json.md)
+(`nlohmann::basic_json<ordered_map>`).
+
+## Template parameters
+
+`Key`
+:   key type
+
+`T`
+:   mapped type
+
+`IgnoredLess`
+:   comparison function (ignored and only added to ensure compatibility with `#!cpp std::map`)
+
+`Allocator`
+:   allocator type
+
+## Member types
+
+- **key_type** - key type (`Key`)
+- **mapped_type** - mapped type (`T`)
+- **Container** - base container type (`#!cpp std::vector<std::pair<const Key, T>, Allocator>`)
+- **iterator**
+- **const_iterator**
+- **size_type**
+- **value_type**
+- **key_compare** - key comparison function
+```cpp
+std::equal_to<Key>  // until C++14
+
+std::equal_to<>     // since C++14
+```
+
+## Member functions
+
+- (constructor)
+- (destructor)
+- **emplace**
+- **operator\[\]**
+- **at**
+- **erase**
+- **count**
+- **find**
+- **insert**
+
+## Examples
+
+??? example
+
+    The example shows the different behavior of `std::map` and `nlohmann::ordered_map`.
+     
+    ```cpp
+    --8<-- "examples/ordered_map.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/ordered_map.output"
+    ```
+
+## See also
+
+- [ordered_json](ordered_json.md)
+
+## Version history
+
+- Added in version 3.9.0 to implement [`nlohmann::ordered_json`](ordered_json.md).
+- Added **key_compare** member in version 3.11.0.
diff --git a/external_imported/json/docs/mkdocs/docs/css/custom.css b/external_imported/json/docs/mkdocs/docs/css/custom.css
new file mode 100644
index 000000000..7a1008b0b
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/css/custom.css
@@ -0,0 +1,4 @@
+/* disable ligatures in code and preformatted blocks */
+code, pre {
+    font-variant-ligatures: none;
+}
diff --git a/external_imported/json/docs/mkdocs/docs/features/arbitrary_types.md b/external_imported/json/docs/mkdocs/docs/features/arbitrary_types.md
new file mode 100644
index 000000000..9b54fcb3e
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/features/arbitrary_types.md
@@ -0,0 +1,274 @@
+# Arbitrary Type Conversions
+
+Every type can be serialized in JSON, not just STL containers and scalar types. Usually, you would do something along those lines:
+
+```cpp
+namespace ns {
+    // a simple struct to model a person
+    struct person {
+        std::string name;
+        std::string address;
+        int age;
+    };
+} // namespace ns
+
+ns::person p = {"Ned Flanders", "744 Evergreen Terrace", 60};
+
+// convert to JSON: copy each value into the JSON object
+json j;
+j["name"] = p.name;
+j["address"] = p.address;
+j["age"] = p.age;
+
+// ...
+
+// convert from JSON: copy each value from the JSON object
+ns::person p {
+    j["name"].template get<std::string>(),
+    j["address"].template get<std::string>(),
+    j["age"].template get<int>()
+};
+```
+
+It works, but that's quite a lot of boilerplate... Fortunately, there's a better way:
+
+```cpp
+// create a person
+ns::person p {"Ned Flanders", "744 Evergreen Terrace", 60};
+
+// conversion: person -> json
+json j = p;
+
+std::cout << j << std::endl;
+// {"address":"744 Evergreen Terrace","age":60,"name":"Ned Flanders"}
+
+// conversion: json -> person
+auto p2 = j.template get<ns::person>();
+
+// that's it
+assert(p == p2);
+```
+
+## Basic usage
+
+To make this work with one of your types, you only need to provide two functions:
+
+```cpp
+using json = nlohmann::json;
+
+namespace ns {
+    void to_json(json& j, const person& p) {
+        j = json{ {"name", p.name}, {"address", p.address}, {"age", p.age} };
+    }
+
+    void from_json(const json& j, person& p) {
+        j.at("name").get_to(p.name);
+        j.at("address").get_to(p.address);
+        j.at("age").get_to(p.age);
+    }
+} // namespace ns
+```
+
+That's all! When calling the `json` constructor with your type, your custom `to_json` method will be automatically called.
+Likewise, when calling `template get<your_type>()` or `get_to(your_type&)`, the `from_json` method will be called.
+
+Some important things:
+
+* Those methods **MUST** be in your type's namespace (which can be the global namespace), or the library will not be able to locate them (in this example, they are in namespace `ns`, where `person` is defined).
+* Those methods **MUST** be available (e.g., proper headers must be included) everywhere you use these conversions. Look at [issue 1108](https://github.com/nlohmann/json/issues/1108) for errors that may occur otherwise.
+* When using `template get<your_type>()`, `your_type` **MUST** be [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible). (There is a way to bypass this requirement described later.)
+* In function `from_json`, use function [`at()`](../api/basic_json/at.md) to access the object values rather than `operator[]`. In case a key does not exist, `at` throws an exception that you can handle, whereas `operator[]` exhibits undefined behavior.
+* You do not need to add serializers or deserializers for STL types like `std::vector`: the library already implements these.
+
+
+## Simplify your life with macros
+
+If you just want to serialize/deserialize some structs, the `to_json`/`from_json` functions can be a lot of boilerplate.
+
+There are four macros to make your life easier as long as you (1) want to use a JSON object as serialization and (2) want to use the member variable names as object keys in that object:
+
+- [`NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(name, member1, member2, ...)`](../api/macros/nlohmann_define_type_non_intrusive.md) is to be defined inside the namespace of the class/struct to create code for. It will throw an exception in `from_json()` due to a missing value in the JSON object.
+- [`NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(name, member1, member2, ...)`](../api/macros/nlohmann_define_type_non_intrusive.md) is to be defined inside the namespace of the class/struct to create code for. It will not throw an exception in `from_json()` due to a missing value in the JSON object, but fills in values from object which is default-constructed by the type.
+- [`NLOHMANN_DEFINE_TYPE_INTRUSIVE(name, member1, member2, ...)`](../api/macros/nlohmann_define_type_intrusive.md) is to be defined inside the class/struct to create code for. This macro can also access private members. It will throw an exception in `from_json()` due to a missing value in the JSON object.
+- [`NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(name, member1, member2, ...)`](../api/macros/nlohmann_define_type_intrusive.md) is to be defined inside the class/struct to create code for. This macro can also access private members. It will not throw an exception in `from_json()` due to a missing value in the JSON object, but fills in values from object which is default-constructed by the type.
+
+In all macros, the first parameter is the name of the class/struct, and all remaining parameters name the members. You can read more docs about them starting from [here](macros.md#nlohmann_define_type_intrusivetype-member).
+
+!!! info "Implementation limits"
+
+    - The current macro implementations are limited to at most 64 member variables. If you want to serialize/deserialize
+      types with more than 64 member variables, you need to define the `to_json`/`from_json` functions manually.
+    - The macros only work for the [`nlohmann::json`](../api/json.md) type; other specializations such as
+      [`nlohmann::ordered_json`](../api/ordered_json.md) are currently unsupported.
+
+??? example
+
+    The `to_json`/`from_json` functions for the `person` struct above can be created with:
+
+    ```cpp
+    namespace ns {
+        NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(person, name, address, age)
+    }
+    ```
+
+    Here is an example with private members, where `NLOHMANN_DEFINE_TYPE_INTRUSIVE` is needed:
+
+    ```cpp
+    namespace ns {
+        class address {
+          private:
+            std::string street;
+            int housenumber;
+            int postcode;
+
+          public:
+            NLOHMANN_DEFINE_TYPE_INTRUSIVE(address, street, housenumber, postcode)
+        };
+    }
+    ```
+
+## How do I convert third-party types?
+
+This requires a bit more advanced technique. But first, let's see how this conversion mechanism works:
+
+The library uses **JSON Serializers** to convert types to json.
+The default serializer for `nlohmann::json` is `nlohmann::adl_serializer` (ADL means [Argument-Dependent Lookup](https://en.cppreference.com/w/cpp/language/adl)).
+
+It is implemented like this (simplified):
+
+```cpp
+template <typename T>
+struct adl_serializer {
+    static void to_json(json& j, const T& value) {
+        // calls the "to_json" method in T's namespace
+    }
+
+    static void from_json(const json& j, T& value) {
+        // same thing, but with the "from_json" method
+    }
+};
+```
+
+This serializer works fine when you have control over the type's namespace. However, what about `boost::optional` or `std::filesystem::path` (C++17)? Hijacking the `boost` namespace is pretty bad, and it's illegal to add something other than template specializations to `std`...
+
+To solve this, you need to add a specialization of `adl_serializer` to the `nlohmann` namespace, here's an example:
+
+```cpp
+// partial specialization (full specialization works too)
+NLOHMANN_JSON_NAMESPACE_BEGIN
+template <typename T>
+struct adl_serializer<boost::optional<T>> {
+    static void to_json(json& j, const boost::optional<T>& opt) {
+        if (opt == boost::none) {
+            j = nullptr;
+        } else {
+            j = *opt; // this will call adl_serializer<T>::to_json which will
+                      // find the free function to_json in T's namespace!
+        }
+    }
+
+    static void from_json(const json& j, boost::optional<T>& opt) {
+        if (j.is_null()) {
+            opt = boost::none;
+        } else {
+            opt = j.template get<T>(); // same as above, but with
+                              // adl_serializer<T>::from_json
+        }
+    }
+};
+NLOHMANN_JSON_NAMESPACE_END
+```
+
+!!! note "ABI compatibility"
+
+    Use [`NLOHMANN_JSON_NAMESPACE_BEGIN`](../api/macros/nlohmann_json_namespace_begin.md) and `NLOHMANN_JSON_NAMESPACE_END`
+    instead of `#!cpp namespace nlohmann { }` in code which may be linked with different versions of this library.
+
+## How can I use `get()` for non-default constructible/non-copyable types?
+
+There is a way, if your type is [MoveConstructible](https://en.cppreference.com/w/cpp/named_req/MoveConstructible). You will need to specialize the `adl_serializer` as well, but with a special `from_json` overload:
+
+```cpp
+struct move_only_type {
+    move_only_type() = delete;
+    move_only_type(int ii): i(ii) {}
+    move_only_type(const move_only_type&) = delete;
+    move_only_type(move_only_type&&) = default;
+
+    int i;
+};
+
+namespace nlohmann {
+    template <>
+    struct adl_serializer<move_only_type> {
+        // note: the return type is no longer 'void', and the method only takes
+        // one argument
+        static move_only_type from_json(const json& j) {
+            return {j.template get<int>()};
+        }
+
+        // Here's the catch! You must provide a to_json method! Otherwise, you
+        // will not be able to convert move_only_type to json, since you fully
+        // specialized adl_serializer on that type
+        static void to_json(json& j, move_only_type t) {
+            j = t.i;
+        }
+    };
+}
+```
+
+## Can I write my own serializer? (Advanced use)
+
+Yes. You might want to take a look at [`unit-udt.cpp`](https://github.com/nlohmann/json/blob/develop/tests/src/unit-udt.cpp) in the test suite, to see a few examples.
+
+If you write your own serializer, you'll need to do a few things:
+
+- use a different `basic_json` alias than `nlohmann::json` (the last template parameter of `basic_json` is the `JSONSerializer`)
+- use your `basic_json` alias (or a template parameter) in all your `to_json`/`from_json` methods
+- use `nlohmann::to_json` and `nlohmann::from_json` when you need ADL
+
+Here is an example, without simplifications, that only accepts types with a size <= 32, and uses ADL.
+
+```cpp
+// You should use void as a second template argument
+// if you don't need compile-time checks on T
+template<typename T, typename SFINAE = typename std::enable_if<sizeof(T) <= 32>::type>
+struct less_than_32_serializer {
+    template <typename BasicJsonType>
+    static void to_json(BasicJsonType& j, T value) {
+        // we want to use ADL, and call the correct to_json overload
+        using nlohmann::to_json; // this method is called by adl_serializer,
+                                 // this is where the magic happens
+        to_json(j, value);
+    }
+
+    template <typename BasicJsonType>
+    static void from_json(const BasicJsonType& j, T& value) {
+        // same thing here
+        using nlohmann::from_json;
+        from_json(j, value);
+    }
+};
+```
+
+Be **very** careful when reimplementing your serializer, you can stack overflow if you don't pay attention:
+
+```cpp
+template <typename T, void>
+struct bad_serializer
+{
+    template <typename BasicJsonType>
+    static void to_json(BasicJsonType& j, const T& value) {
+      // this calls BasicJsonType::json_serializer<T>::to_json(j, value);
+      // if BasicJsonType::json_serializer == bad_serializer ... oops!
+      j = value;
+    }
+
+    template <typename BasicJsonType>
+    static void to_json(const BasicJsonType& j, T& value) {
+      // this calls BasicJsonType::json_serializer<T>::from_json(j, value);
+      // if BasicJsonType::json_serializer == bad_serializer ... oops!
+      value = j.template template get<T>(); // oops!
+    }
+};
+```
diff --git a/external_imported/json/docs/mkdocs/docs/features/assertions.md b/external_imported/json/docs/mkdocs/docs/features/assertions.md
new file mode 100644
index 000000000..2bad62e81
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/features/assertions.md
@@ -0,0 +1,131 @@
+# Runtime Assertions
+
+The code contains numerous debug assertions to ensure class invariants are valid or to detect undefined behavior.
+Whereas the former class invariants are nothing to be concerned of, the latter checks for undefined behavior are to
+detect bugs in client code.
+
+## Switch off runtime assertions
+
+Runtime assertions can be switched off by defining the preprocessor macro `NDEBUG` (see the
+[documentation of assert](https://en.cppreference.com/w/cpp/error/assert)) which is the default for release builds.
+
+## Change assertion behavior
+
+The behavior of runtime assertions can be changes by defining macro [`JSON_ASSERT(x)`](../api/macros/json_assert.md)
+before including the `json.hpp` header.
+
+## Function with runtime assertions
+
+### Unchecked object access to a const value
+
+Function [`operator[]`](../api/basic_json/operator%5B%5D.md) implements unchecked access for objects. Whereas a missing
+key is added in case of non-const objects, accessing a const object with a missing key is undefined behavior (think of a
+dereferenced null pointer) and yields a runtime assertion.
+
+If you are not sure whether an element in an object exists, use checked access with the
+[`at` function](../api/basic_json/at.md) or call the [`contains` function](../api/basic_json/contains.md) before.
+
+See also the documentation on [element access](element_access/index.md).
+
+??? example "Example 1: Missing object key"
+
+    The following code will trigger an assertion at runtime:
+
+    ```cpp
+    #include <nlohmann/json.hpp>
+    
+    using json = nlohmann::json;
+    
+    int main()
+    {
+        const json j = {{"key", "value"}};
+        auto v = j["missing"];
+    }
+    ```
+
+    Output:
+
+    ```
+    Assertion failed: (m_value.object->find(key) != m_value.object->end()), function operator[], file json.hpp, line 2144.
+    ```
+
+### Constructing from an uninitialized iterator range
+
+Constructing a JSON value from an iterator range (see [constructor](../api/basic_json/basic_json.md)) with an
+uninitialized iterator is undefined behavior and yields a runtime assertion.
+
+??? example "Example 2: Uninitialized iterator range"
+
+    The following code will trigger an assertion at runtime:
+
+    ```cpp
+    #include <nlohmann/json.hpp>
+    
+    using json = nlohmann::json;
+    
+    int main()
+    {
+        json::iterator it1, it2;
+        json j(it1, it2);
+    }
+    ```
+
+    Output:
+
+    ```
+    Assertion failed: (m_object != nullptr), function operator++, file iter_impl.hpp, line 368.
+    ```
+
+### Operations on uninitialized iterators
+
+Any operation on uninitialized iterators (i.e., iterators that are not associated with any JSON value) is undefined
+behavior and yields a runtime assertion.
+
+??? example "Example 3: Uninitialized iterator"
+
+    The following code will trigger an assertion at runtime:
+
+    ```cpp
+    #include <nlohmann/json.hpp>
+    
+    using json = nlohmann::json;
+    
+    int main()
+    {
+      json::iterator it;
+      ++it;
+    }
+    ```
+
+    Output:
+
+    ```
+    Assertion failed: (m_object != nullptr), function operator++, file iter_impl.hpp, line 368.
+    ```
+
+### Reading from a null `FILE` pointer
+
+Reading from a null `#!cpp FILE` pointer is undefined behavior and yields a runtime assertion. This can happen when
+calling `#!cpp std::fopen` on a nonexistent file.
+
+??? example "Example 4: Uninitialized iterator"
+
+    The following code will trigger an assertion at runtime:
+
+    ```cpp
+    #include <nlohmann/json.hpp>
+    
+    using json = nlohmann::json;
+    
+    int main()
+    {
+      std::FILE* f = std::fopen("nonexistent_file.json", "r");
+      json j = json::parse(f);
+    }
+    ```
+
+    Output:
+
+    ```
+    Assertion failed: (m_file != nullptr), function file_input_adapter, file input_adapters.hpp, line 55.
+    ```
diff --git a/external_imported/json/docs/mkdocs/docs/features/binary_formats/bjdata.md b/external_imported/json/docs/mkdocs/docs/features/binary_formats/bjdata.md
new file mode 100644
index 000000000..a89a22885
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/features/binary_formats/bjdata.md
@@ -0,0 +1,194 @@
+# BJData
+
+The [BJData format](https://neurojson.org) was derived from and improved upon
+[Universal Binary JSON(UBJSON)](https://ubjson.org) specification (Draft 12). Specifically, it introduces an optimized
+array container for efficient storage of N-dimensional packed arrays (**ND-arrays**); it also adds 4 new type markers -
+`[u] - uint16`, `[m] - uint32`, `[M] - uint64` and `[h] - float16` - to unambiguously map common binary numeric types;
+furthermore, it uses little-endian (LE) to store all numerics instead of big-endian (BE) as in UBJSON to avoid
+unnecessary conversions on commonly available platforms.
+
+Compared to other binary JSON-like formats such as MessagePack and CBOR, both BJData and UBJSON demonstrate a rare
+combination of being both binary and **quasi-human-readable**. This is because all semantic elements in BJData and
+UBJSON, including the data-type markers and name/string types are directly human-readable. Data stored in the
+BJData/UBJSON format are not only compact in size, fast to read/write, but also can be directly searched or read using
+simple processing.
+
+!!! abstract "References"
+
+    - [BJData Specification](https://neurojson.org/bjdata/draft2)
+
+## Serialization
+
+The library uses the following mapping from JSON values types to BJData types according to the BJData specification:
+
+| JSON value type | value/range                               | BJData type    | marker |
+|-----------------|-------------------------------------------|----------------|--------|
+| null            | `null`                                    | null           | `Z`    |
+| boolean         | `true`                                    | true           | `T`    |
+| boolean         | `false`                                   | false          | `F`    |
+| number_integer  | -9223372036854775808..-2147483649         | int64          | `L`    |
+| number_integer  | -2147483648..-32769                       | int32          | `l`    |
+| number_integer  | -32768..-129                              | int16          | `I`    |
+| number_integer  | -128..127                                 | int8           | `i`    |
+| number_integer  | 128..255                                  | uint8          | `U`    |
+| number_integer  | 256..32767                                | int16          | `I`    |
+| number_integer  | 32768..65535                              | uint16         | `u`    |
+| number_integer  | 65536..2147483647                         | int32          | `l`    |
+| number_integer  | 2147483648..4294967295                    | uint32         | `m`    |
+| number_integer  | 4294967296..9223372036854775807           | int64          | `L`    |
+| number_integer  | 9223372036854775808..18446744073709551615 | uint64         | `M`    |
+| number_unsigned | 0..127                                    | int8           | `i`    |
+| number_unsigned | 128..255                                  | uint8          | `U`    |
+| number_unsigned | 256..32767                                | int16          | `I`    |
+| number_unsigned | 32768..65535                              | uint16         | `u`    |
+| number_unsigned | 65536..2147483647                         | int32          | `l`    |
+| number_unsigned | 2147483648..4294967295                    | uint32         | `m`    |
+| number_unsigned | 4294967296..9223372036854775807           | int64          | `L`    |
+| number_unsigned | 9223372036854775808..18446744073709551615 | uint64         | `M`    |
+| number_float    | *any value*                               | float64        | `D`    |
+| string          | *with shortest length indicator*          | string         | `S`    |
+| array           | *see notes on optimized format/ND-array*  | array          | `[`    |
+| object          | *see notes on optimized format*           | map            | `{`    |
+
+!!! success "Complete mapping"
+
+    The mapping is **complete** in the sense that any JSON value type can be converted to a BJData value.
+
+    Any BJData output created by `to_bjdata` can be successfully parsed by `from_bjdata`.
+
+!!! warning "Size constraints"
+
+    The following values can **not** be converted to a BJData value:
+
+      - strings with more than 18446744073709551615 bytes, i.e., $2^{64}-1$ bytes (theoretical)
+
+!!! info "Unused BJData markers"
+
+    The following markers are not used in the conversion:
+
+    - `Z`: no-op values are not created.
+    - `C`: single-byte strings are serialized with `S` markers.
+
+!!! info "NaN/infinity handling"
+
+    If NaN or Infinity are stored inside a JSON number, they are serialized properly. This behavior differs from the
+    `dump()` function which serializes NaN or Infinity to `#!json null`.
+
+!!! info "Endianness"
+
+    A breaking difference between BJData and UBJSON is the endianness of numerical values. In BJData, all numerical data
+    types (integers `UiuImlML` and floating-point values `hdD`) are stored in the little-endian (LE) byte order as
+    opposed to big-endian as used by UBJSON. Adopting LE to store numeric records avoids unnecessary byte swapping on
+    most modern computers where LE is used as the default byte order.
+
+!!! info "Optimized formats"
+
+    Optimized formats for containers are supported via two parameters of
+    [`to_bjdata`](../../api/basic_json/to_bjdata.md):
+
+    - Parameter `use_size` adds size information to the beginning of a container and removes the closing marker.
+    - Parameter `use_type` further checks whether all elements of a container have the same type and adds the type
+      marker to the beginning of the container. The `use_type` parameter must only be used together with
+      `use_size = true`.
+
+    Note that `use_size = true` alone may result in larger representations - the benefit of this parameter is that the
+    receiving side is immediately informed of the number of elements in the container.
+
+!!! info "ND-array optimized format"
+
+    BJData extends UBJSON's optimized array **size** marker to support ND-arrays of uniform numerical data types
+    (referred to as *packed arrays*). For example, the 2-D `uint8` integer array `[[1,2],[3,4],[5,6]]`, stored as nested
+    optimized array in UBJSON `[ [$U#i2 1 2 [$U#i2 3 4 [$U#i2 5 6 ]`, can be further compressed in BJData to
+    `[$U#[$i#i2 2 3 1 2 3 4 5 6` or `[$U#[i2 i3] 1 2 3 4 5 6`.
+
+    To maintain type and size information, ND-arrays are converted to JSON objects following the **annotated array
+    format** (defined in the [JData specification (Draft 3)][JDataAAFmt]), when parsed using
+    [`from_bjdata`](../../api/basic_json/from_bjdata.md). For example, the above 2-D `uint8` array can be parsed and
+    accessed as
+
+    ```json
+    {
+        "_ArrayType_": "uint8",
+        "_ArraySize_": [2,3],
+        "_ArrayData_": [1,2,3,4,5,6]
+    }
+    ```
+
+    Likewise, when a JSON object in the above form is serialzed using
+    [`to_bjdata`](../../api/basic_json/to_bjdata.md), it is automatically converted into a compact BJData ND-array. The
+    only exception is, that when the 1-dimensional vector stored in `"_ArraySize_"` contains a single integer or two
+    integers with one being 1, a regular 1-D optimized array is generated.
+
+    The current version of this library does not yet support automatic detection of and conversion from a nested JSON
+    array input to a BJData ND-array.
+
+    [JDataAAFmt]: https://github.com/NeuroJSON/jdata/blob/master/JData_specification.md#annotated-storage-of-n-d-arrays)
+
+!!! info "Restrictions in optimized data types for arrays and objects"
+
+    Due to diminished space saving, hampered readability, and increased security risks, in BJData, the allowed data
+    types following the `$` marker in an optimized array and object container are restricted to
+    **non-zero-fixed-length** data types. Therefore, the valid optimized type markers can only be one of `UiuImlMLhdDC`.
+    This also means other variable (`[{SH`) or zero-length types (`TFN`) can not be used in an optimized array or object
+    in BJData.
+
+!!! info "Binary values"
+
+    If the JSON data contains the binary type, the value stored is a list of integers, as suggested by the BJData
+    documentation. In particular, this means that the serialization and the deserialization of JSON containing binary
+    values into BJData and back will result in a different JSON object.
+
+??? example
+
+    ```cpp
+    --8<-- "examples/to_bjdata.cpp"
+    ```
+
+    Output:
+
+    ```c
+    --8<-- "examples/to_bjdata.output"
+    ```
+
+## Deserialization
+
+The library maps BJData types to JSON value types as follows:
+
+| BJData type | JSON value type                         | marker |
+|-------------|-----------------------------------------|--------|
+| no-op       | *no value, next value is read*          | `N`    |
+| null        | `null`                                  | `Z`    |
+| false       | `false`                                 | `F`    |
+| true        | `true`                                  | `T`    |
+| float16     | number_float                            | `h`    |
+| float32     | number_float                            | `d`    |
+| float64     | number_float                            | `D`    |
+| uint8       | number_unsigned                         | `U`    |
+| int8        | number_integer                          | `i`    |
+| uint16      | number_unsigned                         | `u`    |
+| int16       | number_integer                          | `I`    |
+| uint32      | number_unsigned                         | `m`    |
+| int32       | number_integer                          | `l`    |
+| uint64      | number_unsigned                         | `M`    |
+| int64       | number_integer                          | `L`    |
+| string      | string                                  | `S`    |
+| char        | string                                  | `C`    |
+| array       | array (optimized values are supported)  | `[`    |
+| ND-array    | object (in JData annotated array format)|`[$.#[.`|
+| object      | object (optimized values are supported) | `{`    |
+
+!!! success "Complete mapping"
+
+    The mapping is **complete** in the sense that any BJData value can be converted to a JSON value.
+
+??? example
+
+    ```cpp
+    --8<-- "examples/from_bjdata.cpp"
+    ```
+
+    Output:
+
+    ```json
+    --8<-- "examples/from_bjdata.output"
+    ```
diff --git a/external_imported/json/docs/mkdocs/docs/features/binary_formats/bson.md b/external_imported/json/docs/mkdocs/docs/features/binary_formats/bson.md
new file mode 100644
index 000000000..f3b8cf18d
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/features/binary_formats/bson.md
@@ -0,0 +1,96 @@
+# BSON
+
+BSON, short for Binary JSON, is a binary-encoded serialization of JSON-like documents. Like JSON, BSON supports the
+embedding of documents and arrays within other documents and arrays. BSON also contains extensions that allow
+representation of data types that are not part of the JSON spec. For example, BSON has a Date type and a BinData type.
+
+!!! abstract "References"
+
+    - [BSON Website](http://bsonspec.org) - the main source on BSON
+    - [BSON Specification](http://bsonspec.org/spec.html) - the specification
+   
+
+## Serialization
+
+The library uses the following mapping from JSON values types to BSON types:
+
+| JSON value type | value/range                               | BSON type | marker |
+|-----------------|-------------------------------------------|-----------|--------|
+| null            | `null`                                    | null      | 0x0A   |
+| boolean         | `true`, `false`                           | boolean   | 0x08   |
+| number_integer  | -9223372036854775808..-2147483649         | int64     | 0x12   |
+| number_integer  | -2147483648..2147483647                   | int32     | 0x10   |
+| number_integer  | 2147483648..9223372036854775807           | int64     | 0x12   |
+| number_unsigned | 0..2147483647                             | int32     | 0x10   |
+| number_unsigned | 2147483648..9223372036854775807           | int64     | 0x12   |
+| number_unsigned | 9223372036854775808..18446744073709551615 | --        | --     |
+| number_float    | *any value*                               | double    | 0x01   |
+| string          | *any value*                               | string    | 0x02   |
+| array           | *any value*                               | document  | 0x04   |
+| object          | *any value*                               | document  | 0x03   |
+| binary          | *any value*                               | binary    | 0x05   |
+
+!!! warning "Incomplete mapping"
+
+    The mapping is **incomplete**, since only JSON-objects (and things
+    contained therein) can be serialized to BSON.
+    Also, integers larger than 9223372036854775807 cannot be serialized to BSON,
+    and the keys may not contain U+0000, since they are serialized a
+    zero-terminated c-strings.
+
+??? example
+
+    ```cpp
+    --8<-- "examples/to_bson.cpp"
+    ```
+    
+    Output:
+
+    ```c
+    --8<-- "examples/to_bson.output"
+    ```
+
+
+## Deserialization
+
+The library maps BSON record types to JSON value types as follows:
+
+| BSON type             | BSON marker byte | JSON value type |
+|-----------------------|------------------|-----------------|
+| double                | 0x01             | number_float    |
+| string                | 0x02             | string          |
+| document              | 0x03             | object          |
+| array                 | 0x04             | array           |
+| binary                | 0x05             | binary          |
+| undefined             | 0x06             | *unsupported*   |
+| ObjectId              | 0x07             | *unsupported*   |
+| boolean               | 0x08             | boolean         |
+| UTC Date-Time         | 0x09             | *unsupported*   |
+| null                  | 0x0A             | null            |
+| Regular Expr.         | 0x0B             | *unsupported*   |
+| DB Pointer            | 0x0C             | *unsupported*   |
+| JavaScript Code       | 0x0D             | *unsupported*   |
+| Symbol                | 0x0E             | *unsupported*   |
+| JavaScript Code       | 0x0F             | *unsupported*   |
+| int32                 | 0x10             | number_integer  |
+| Timestamp             | 0x11             | *unsupported*   |
+| 128-bit decimal float | 0x13             | *unsupported*   |
+| Max Key               | 0x7F             | *unsupported*   |
+| Min Key               | 0xFF             | *unsupported*   |
+
+!!! warning "Incomplete mapping"
+
+    The mapping is **incomplete**. The unsupported mappings are indicated in the table above.
+
+
+??? example
+
+    ```cpp
+    --8<-- "examples/from_bson.cpp"
+    ```
+
+    Output:
+
+    ```json
+    --8<-- "examples/from_bson.output"
+    ```
diff --git a/external_imported/json/docs/mkdocs/docs/features/binary_formats/cbor.md b/external_imported/json/docs/mkdocs/docs/features/binary_formats/cbor.md
new file mode 100644
index 000000000..2d0a1dae1
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/features/binary_formats/cbor.md
@@ -0,0 +1,181 @@
+# CBOR
+
+The Concise Binary Object Representation (CBOR) is a data format whose design goals include the possibility of extremely
+small code size, fairly small message size, and extensibility without the need for version negotiation.
+
+!!! abstract "References"
+
+      - [CBOR Website](http://cbor.io) - the main source on CBOR
+    - [CBOR Playground](http://cbor.me) - an interactive webpage to translate between JSON and CBOR
+    - [RFC 7049](https://tools.ietf.org/html/rfc7049) - the CBOR specification
+
+## Serialization
+
+The library uses the following mapping from JSON values types to CBOR types according to the CBOR specification
+([RFC 7049](https://www.rfc-editor.org/rfc/rfc7049.html)):
+
+| JSON value type | value/range                                | CBOR type                         | first byte |
+|-----------------|--------------------------------------------|-----------------------------------|------------|
+| null            | `null`                                     | Null                              | 0xF6       |
+| boolean         | `true`                                     | True                              | 0xF5       |
+| boolean         | `false`                                    | False                             | 0xF4       |
+| number_integer  | -9223372036854775808..-2147483649          | Negative integer (8 bytes follow) | 0x3B       |
+| number_integer  | -2147483648..-32769                        | Negative integer (4 bytes follow) | 0x3A       |
+| number_integer  | -32768..-129                               | Negative integer (2 bytes follow) | 0x39       |
+| number_integer  | -128..-25                                  | Negative integer (1 byte follow)  | 0x38       |
+| number_integer  | -24..-1                                    | Negative integer                  | 0x20..0x37 |
+| number_integer  | 0..23                                      | Integer                           | 0x00..0x17 |
+| number_integer  | 24..255                                    | Unsigned integer (1 byte follow)  | 0x18       |
+| number_integer  | 256..65535                                 | Unsigned integer (2 bytes follow) | 0x19       |
+| number_integer  | 65536..4294967295                          | Unsigned integer (4 bytes follow) | 0x1A       |
+| number_integer  | 4294967296..18446744073709551615           | Unsigned integer (8 bytes follow) | 0x1B       |
+| number_unsigned | 0..23                                      | Integer                           | 0x00..0x17 |
+| number_unsigned | 24..255                                    | Unsigned integer (1 byte follow)  | 0x18       |
+| number_unsigned | 256..65535                                 | Unsigned integer (2 bytes follow) | 0x19       |
+| number_unsigned | 65536..4294967295                          | Unsigned integer (4 bytes follow) | 0x1A       |
+| number_unsigned | 4294967296..18446744073709551615           | Unsigned integer (8 bytes follow) | 0x1B       |
+| number_float    | *any value representable by a float*       | Single-Precision Float            | 0xFA       |
+| number_float    | *any value NOT representable by a float*   | Double-Precision Float            | 0xFB       |
+| string          | *length*: 0..23                            | UTF-8 string                      | 0x60..0x77 |
+| string          | *length*: 23..255                          | UTF-8 string (1 byte follow)      | 0x78       |
+| string          | *length*: 256..65535                       | UTF-8 string (2 bytes follow)     | 0x79       |
+| string          | *length*: 65536..4294967295                | UTF-8 string (4 bytes follow)     | 0x7A       |
+| string          | *length*: 4294967296..18446744073709551615 | UTF-8 string (8 bytes follow)     | 0x7B       |
+| array           | *size*: 0..23                              | array                             | 0x80..0x97 |
+| array           | *size*: 23..255                            | array (1 byte follow)             | 0x98       |
+| array           | *size*: 256..65535                         | array (2 bytes follow)            | 0x99       |
+| array           | *size*: 65536..4294967295                  | array (4 bytes follow)            | 0x9A       |
+| array           | *size*: 4294967296..18446744073709551615   | array (8 bytes follow)            | 0x9B       |
+| object          | *size*: 0..23                              | map                               | 0xA0..0xB7 |
+| object          | *size*: 23..255                            | map (1 byte follow)               | 0xB8       |
+| object          | *size*: 256..65535                         | map (2 bytes follow)              | 0xB9       |
+| object          | *size*: 65536..4294967295                  | map (4 bytes follow)              | 0xBA       |
+| object          | *size*: 4294967296..18446744073709551615   | map (8 bytes follow)              | 0xBB       |
+| binary          | *size*: 0..23                              | byte string                       | 0x40..0x57 |
+| binary          | *size*: 23..255                            | byte string (1 byte follow)       | 0x58       |
+| binary          | *size*: 256..65535                         | byte string (2 bytes follow)      | 0x59       |
+| binary          | *size*: 65536..4294967295                  | byte string (4 bytes follow)      | 0x5A       |
+| binary          | *size*: 4294967296..18446744073709551615   | byte string (8 bytes follow)      | 0x5B       |
+
+Binary values with subtype are mapped to tagged values (0xD8..0xDB) depending on the subtype, followed by a byte string,
+see "binary" cells in the table above.
+
+!!! success "Complete mapping"
+
+    The mapping is **complete** in the sense that any JSON value type can be converted to a CBOR value.
+
+!!! info "NaN/infinity handling"
+
+    If NaN or Infinity are stored inside a JSON number, they are serialized properly. This behavior differs from the normal JSON serialization which serializes NaN or Infinity to `null`.
+
+!!! info "Unused CBOR types"
+
+    The following CBOR types are not used in the conversion:
+
+      - UTF-8 strings terminated by "break" (0x7F)
+      - arrays terminated by "break" (0x9F)
+      - maps terminated by "break" (0xBF)
+      - byte strings terminated by "break" (0x5F)
+      - date/time (0xC0..0xC1)
+      - bignum (0xC2..0xC3)
+      - decimal fraction (0xC4)
+      - bigfloat (0xC5)
+      - expected conversions (0xD5..0xD7)
+      - simple values (0xE0..0xF3, 0xF8)
+      - undefined (0xF7)
+      - half-precision floats (0xF9)
+      - break (0xFF)
+
+!!! info "Tagged items"
+
+    Binary subtypes will be serialized as tagged items. See [binary values](../binary_values.md#cbor) for an example.
+
+??? example
+
+    ```cpp
+    --8<-- "examples/to_cbor.cpp"
+    ```
+    
+    Output:
+
+    ```c
+    --8<-- "examples/to_cbor.output"
+    ```
+
+## Deserialization
+
+The library maps CBOR types to JSON value types as follows:
+
+| CBOR type              | JSON value type | first byte |
+|------------------------|-----------------|------------|
+| Integer                | number_unsigned | 0x00..0x17 |
+| Unsigned integer       | number_unsigned | 0x18       |
+| Unsigned integer       | number_unsigned | 0x19       |
+| Unsigned integer       | number_unsigned | 0x1A       |
+| Unsigned integer       | number_unsigned | 0x1B       |
+| Negative integer       | number_integer  | 0x20..0x37 |
+| Negative integer       | number_integer  | 0x38       |
+| Negative integer       | number_integer  | 0x39       |
+| Negative integer       | number_integer  | 0x3A       |
+| Negative integer       | number_integer  | 0x3B       |
+| Byte string            | binary          | 0x40..0x57 |
+| Byte string            | binary          | 0x58       |
+| Byte string            | binary          | 0x59       |
+| Byte string            | binary          | 0x5A       |
+| Byte string            | binary          | 0x5B       |
+| UTF-8 string           | string          | 0x60..0x77 |
+| UTF-8 string           | string          | 0x78       |
+| UTF-8 string           | string          | 0x79       |
+| UTF-8 string           | string          | 0x7A       |
+| UTF-8 string           | string          | 0x7B       |
+| UTF-8 string           | string          | 0x7F       |
+| array                  | array           | 0x80..0x97 |
+| array                  | array           | 0x98       |
+| array                  | array           | 0x99       |
+| array                  | array           | 0x9A       |
+| array                  | array           | 0x9B       |
+| array                  | array           | 0x9F       |
+| map                    | object          | 0xA0..0xB7 |
+| map                    | object          | 0xB8       |
+| map                    | object          | 0xB9       |
+| map                    | object          | 0xBA       |
+| map                    | object          | 0xBB       |
+| map                    | object          | 0xBF       |
+| False                  | `false`         | 0xF4       |
+| True                   | `true`          | 0xF5       |
+| Null                   | `null`          | 0xF6       |
+| Half-Precision Float   | number_float    | 0xF9       |
+| Single-Precision Float | number_float    | 0xFA       |
+| Double-Precision Float | number_float    | 0xFB       |
+
+!!! warning "Incomplete mapping"
+
+    The mapping is **incomplete** in the sense that not all CBOR types can be converted to a JSON value. The following CBOR types are not supported and will yield parse errors:
+
+     - date/time (0xC0..0xC1)
+     - bignum (0xC2..0xC3)
+     - decimal fraction (0xC4)
+     - bigfloat (0xC5)
+     - expected conversions (0xD5..0xD7)
+     - simple values (0xE0..0xF3, 0xF8)
+     - undefined (0xF7)
+
+!!! warning "Object keys"
+
+    CBOR allows map keys of any type, whereas JSON only allows strings as keys in object values. Therefore, CBOR maps with keys other than UTF-8 strings are rejected.
+
+!!! warning "Tagged items"
+
+    Tagged items will throw a parse error by default. They can be ignored by passing `cbor_tag_handler_t::ignore` to function `from_cbor`. They can be stored by passing `cbor_tag_handler_t::store` to function `from_cbor`.
+
+??? example
+
+    ```cpp
+    --8<-- "examples/from_cbor.cpp"
+    ```
+
+    Output:
+
+    ```json
+    --8<-- "examples/from_cbor.output"
+    ```
diff --git a/external_imported/json/docs/mkdocs/docs/features/binary_formats/index.md b/external_imported/json/docs/mkdocs/docs/features/binary_formats/index.md
new file mode 100644
index 000000000..e74290b09
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/features/binary_formats/index.md
@@ -0,0 +1,52 @@
+# Binary Formats
+
+Though JSON is a ubiquitous data format, it is not a very compact format suitable for data exchange, for instance over
+a network. Hence, the library supports
+
+- [BJData](bjdata.md) (Binary JData),
+- [BSON](bson.md) (Binary JSON),
+- [CBOR](cbor.md) (Concise Binary Object Representation),
+- [MessagePack](messagepack.md), and
+- [UBJSON](ubjson.md) (Universal Binary JSON)
+
+to efficiently encode JSON values to byte vectors and to decode such vectors.
+
+## Comparison
+
+### Completeness
+
+| Format      | Serialization                                 | Deserialization                              |
+|-------------|-----------------------------------------------|----------------------------------------------|
+| BJData      | complete                                      | complete                                     |
+| BSON        | incomplete: top-level value must be an object | incomplete, but all JSON types are supported |
+| CBOR        | complete                                      | incomplete, but all JSON types are supported |
+| MessagePack | complete                                      | complete                                     |
+| UBJSON      | complete                                      | complete                                     |
+
+### Binary values
+
+| Format      | Binary values | Binary subtypes |
+|-------------|---------------|-----------------|
+| BJData      | not supported | not supported   |
+| BSON        | supported     | supported       |
+| CBOR        | supported     | supported       |
+| MessagePack | supported     | supported       |
+| UBJSON      | not supported | not supported   |
+
+See [binary values](../binary_values.md) for more information.
+
+### Sizes
+
+| Format             | canada.json | twitter.json | citm_catalog.json | jeopardy.json |
+|--------------------|-------------|--------------|-------------------|---------------|
+| BJData             | 53.2 %      | 91.1 %       | 78.1 %            | 96.6 %        |
+| BJData (size)      | 58.6 %      | 92.1 %       | 86.7 %            | 97.4 %        |
+| BJData (size+tyoe) | 58.6 %      | 92.1 %       | 86.5 %            | 97.4 %        |
+| BSON               | 85.8 %      | 95.2 %       | 95.8 %            | 106.7 %       |
+| CBOR               | 50.5 %      | 86.3 %       | 68.4 %            | 88.0 %        |
+| MessagePack        | 50.5 %      | 86.0 %       | 68.5 %            | 87.9 %        |
+| UBJSON             | 53.2 %      | 91.3 %       | 78.2 %            | 96.6 %        |
+| UBJSON (size)      | 58.6 %      | 92.3 %       | 86.8 %            | 97.4 %        |
+| UBJSON (size+type) | 55.9 %      | 92.3 %       | 85.0 %            | 95.0 %        |
+
+Sizes compared to minified JSON value.
diff --git a/external_imported/json/docs/mkdocs/docs/features/binary_formats/messagepack.md b/external_imported/json/docs/mkdocs/docs/features/binary_formats/messagepack.md
new file mode 100644
index 000000000..b2f69f174
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/features/binary_formats/messagepack.md
@@ -0,0 +1,143 @@
+# MessagePack
+
+MessagePack is an efficient binary serialization format. It lets you exchange data among multiple languages like JSON.
+But it's faster and smaller. Small integers are encoded into a single byte, and typical short strings require only one
+extra byte in addition to the strings themselves.
+
+!!! abstract "References"
+
+    - [MessagePack website](https://msgpack.org)
+    - [MessagePack specification](https://github.com/msgpack/msgpack/blob/master/spec.md)
+
+## Serialization
+
+The library uses the following mapping from JSON values types to MessagePack types according to the MessagePack
+specification:
+
+| JSON value type | value/range                              | MessagePack type | first byte |
+|-----------------|------------------------------------------|------------------|------------|
+| null            | `null`                                   | nil              | 0xC0       |
+| boolean         | `true`                                   | true             | 0xC3       |
+| boolean         | `false`                                  | false            | 0xC2       |
+| number_integer  | -9223372036854775808..-2147483649        | int64            | 0xD3       |
+| number_integer  | -2147483648..-32769                      | int32            | 0xD2       |
+| number_integer  | -32768..-129                             | int16            | 0xD1       |
+| number_integer  | -128..-33                                | int8             | 0xD0       |
+| number_integer  | -32..-1                                  | negative fixint  | 0xE0..0xFF |
+| number_integer  | 0..127                                   | positive fixint  | 0x00..0x7F |
+| number_integer  | 128..255                                 | uint 8           | 0xCC       |
+| number_integer  | 256..65535                               | uint 16          | 0xCD       |
+| number_integer  | 65536..4294967295                        | uint 32          | 0xCE       |
+| number_integer  | 4294967296..18446744073709551615         | uint 64          | 0xCF       |
+| number_unsigned | 0..127                                   | positive fixint  | 0x00..0x7F |
+| number_unsigned | 128..255                                 | uint 8           | 0xCC       |
+| number_unsigned | 256..65535                               | uint 16          | 0xCD       |
+| number_unsigned | 65536..4294967295                        | uint 32          | 0xCE       |
+| number_unsigned | 4294967296..18446744073709551615         | uint 64          | 0xCF       |
+| number_float    | *any value representable by a float*     | float 32         | 0xCA       |
+| number_float    | *any value NOT representable by a float* | float 64         | 0xCB       |
+| string          | *length*: 0..31                          | fixstr           | 0xA0..0xBF |
+| string          | *length*: 32..255                        | str 8            | 0xD9       |
+| string          | *length*: 256..65535                     | str 16           | 0xDA       |
+| string          | *length*: 65536..4294967295              | str 32           | 0xDB       |
+| array           | *size*: 0..15                            | fixarray         | 0x90..0x9F |
+| array           | *size*: 16..65535                        | array 16         | 0xDC       |
+| array           | *size*: 65536..4294967295                | array 32         | 0xDD       |
+| object          | *size*: 0..15                            | fix map          | 0x80..0x8F |
+| object          | *size*: 16..65535                        | map 16           | 0xDE       |
+| object          | *size*: 65536..4294967295                | map 32           | 0xDF       |
+| binary          | *size*: 0..255                           | bin 8            | 0xC4       |
+| binary          | *size*: 256..65535                       | bin 16           | 0xC5       |
+| binary          | *size*: 65536..4294967295                | bin 32           | 0xC6       |
+
+!!! success "Complete mapping"
+
+    The mapping is **complete** in the sense that any JSON value type can be converted to a MessagePack value.
+
+    Any MessagePack output created by `to_msgpack` can be successfully parsed by `from_msgpack`.
+
+!!! warning "Size constraints"
+
+    The following values can **not** be converted to a MessagePack value:
+
+      - strings with more than 4294967295 bytes
+      - byte strings with more than 4294967295 bytes
+      - arrays with more than 4294967295 elements
+      - objects with more than 4294967295 elements
+
+!!! info "NaN/infinity handling"
+
+    If NaN or Infinity are stored inside a JSON number, they are serialized properly in contrast to the
+    [dump](../../api/basic_json/dump.md) function which serializes NaN or Infinity to `null`.
+
+??? example
+
+    ```cpp
+    --8<-- "examples/to_msgpack.cpp"
+    ```
+    
+    Output:
+
+    ```c
+    --8<-- "examples/to_msgpack.output"
+    ```
+
+## Deserialization
+
+The library maps MessagePack types to JSON value types as follows:
+
+| MessagePack type | JSON value type | first byte |
+|------------------|-----------------|------------|
+| positive fixint  | number_unsigned | 0x00..0x7F |
+| fixmap           | object          | 0x80..0x8F |
+| fixarray         | array           | 0x90..0x9F |
+| fixstr           | string          | 0xA0..0xBF |
+| nil              | `null`          | 0xC0       |
+| false            | `false`         | 0xC2       |
+| true             | `true`          | 0xC3       |
+| float 32         | number_float    | 0xCA       |
+| float 64         | number_float    | 0xCB       |
+| uint 8           | number_unsigned | 0xCC       |
+| uint 16          | number_unsigned | 0xCD       |
+| uint 32          | number_unsigned | 0xCE       |
+| uint 64          | number_unsigned | 0xCF       |
+| int 8            | number_integer  | 0xD0       |
+| int 16           | number_integer  | 0xD1       |
+| int 32           | number_integer  | 0xD2       |
+| int 64           | number_integer  | 0xD3       |
+| str 8            | string          | 0xD9       |
+| str 16           | string          | 0xDA       |
+| str 32           | string          | 0xDB       |
+| array 16         | array           | 0xDC       |
+| array 32         | array           | 0xDD       |
+| map 16           | object          | 0xDE       |
+| map 32           | object          | 0xDF       |
+| bin 8            | binary          | 0xC4       |
+| bin 16           | binary          | 0xC5       |
+| bin 32           | binary          | 0xC6       |
+| ext 8            | binary          | 0xC7       |
+| ext 16           | binary          | 0xC8       |
+| ext 32           | binary          | 0xC9       |
+| fixext 1         | binary          | 0xD4       |
+| fixext 2         | binary          | 0xD5       |
+| fixext 4         | binary          | 0xD6       |
+| fixext 8         | binary          | 0xD7       |
+| fixext 16        | binary          | 0xD8       |
+| negative fixint  | number_integer  | 0xE0-0xFF  |
+
+!!! info
+
+    Any MessagePack output created by `to_msgpack` can be successfully parsed by `from_msgpack`.
+
+
+??? example
+
+    ```cpp
+    --8<-- "examples/from_msgpack.cpp"
+    ```
+
+    Output:
+
+    ```json
+    --8<-- "examples/from_msgpack.output"
+    ```
diff --git a/external_imported/json/docs/mkdocs/docs/features/binary_formats/ubjson.md b/external_imported/json/docs/mkdocs/docs/features/binary_formats/ubjson.md
new file mode 100644
index 000000000..76956d60a
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/features/binary_formats/ubjson.md
@@ -0,0 +1,126 @@
+# UBJSON
+
+Universal Binary JSON (UBJSON) is a binary form directly imitating JSON, but requiring fewer bytes of data. It aims to
+achieve the generality of JSON, combined with being much easier to process than JSON.
+
+!!! abstract "References"
+
+    - [UBJSON Website](http://ubjson.org)
+
+## Serialization
+
+The library uses the following mapping from JSON values types to UBJSON types according to the UBJSON specification:
+
+| JSON value type | value/range                       | UBJSON type    | marker |
+|-----------------|-----------------------------------|----------------|--------|
+| null            | `null`                            | null           | `Z`    |
+| boolean         | `true`                            | true           | `T`    |
+| boolean         | `false`                           | false          | `F`    |
+| number_integer  | -9223372036854775808..-2147483649 | int64          | `L`    |
+| number_integer  | -2147483648..-32769               | int32          | `l`    |
+| number_integer  | -32768..-129                      | int16          | `I`    |
+| number_integer  | -128..127                         | int8           | `i`    |
+| number_integer  | 128..255                          | uint8          | `U`    |
+| number_integer  | 256..32767                        | int16          | `I`    |
+| number_integer  | 32768..2147483647                 | int32          | `l`    |
+| number_integer  | 2147483648..9223372036854775807   | int64          | `L`    |
+| number_unsigned | 0..127                            | int8           | `i`    |
+| number_unsigned | 128..255                          | uint8          | `U`    |
+| number_unsigned | 256..32767                        | int16          | `I`    |
+| number_unsigned | 32768..2147483647                 | int32          | `l`    |
+| number_unsigned | 2147483648..9223372036854775807   | int64          | `L`    |
+| number_unsigned | 2147483649..18446744073709551615  | high-precision | `H`    |
+| number_float    | *any value*                       | float64        | `D`    |
+| string          | *with shortest length indicator*  | string         | `S`    |
+| array           | *see notes on optimized format*   | array          | `[`    |
+| object          | *see notes on optimized format*   | map            | `{`    |
+
+!!! success "Complete mapping"
+
+    The mapping is **complete** in the sense that any JSON value type can be converted to a UBJSON value.
+
+    Any UBJSON output created by `to_ubjson` can be successfully parsed by `from_ubjson`.
+
+!!! warning "Size constraints"
+
+    The following values can **not** be converted to a UBJSON value:
+
+      - strings with more than 9223372036854775807 bytes (theoretical)
+
+!!! info "Unused UBJSON markers"
+
+    The following markers are not used in the conversion:
+    
+    - `Z`: no-op values are not created.
+    - `C`: single-byte strings are serialized with `S` markers.
+
+!!! info "NaN/infinity handling"
+
+    If NaN or Infinity are stored inside a JSON number, they are serialized properly. This behavior differs from the
+    `dump()` function which serializes NaN or Infinity to `null`.
+
+!!! info "Optimized formats"
+
+    The optimized formats for containers are supported: Parameter `use_size` adds size information to the beginning of a
+    container and removes the closing marker. Parameter `use_type` further checks whether all elements of a container
+    have the same type and adds the type marker to the beginning of the container. The `use_type` parameter must only be
+    used together with `use_size = true`.
+
+    Note that `use_size = true` alone may result in larger representations - the benefit of this parameter is that the
+    receiving side is immediately informed on the number of elements of the container.
+
+!!! info "Binary values"
+
+    If the JSON data contains the binary type, the value stored is a list of integers, as suggested by the UBJSON
+    documentation.  In particular, this means that serialization and the deserialization of a JSON containing binary
+    values into UBJSON and back will result in a different JSON object.
+
+??? example
+
+    ```cpp
+    --8<-- "examples/to_ubjson.cpp"
+    ```
+
+    Output:
+
+    ```c
+    --8<-- "examples/to_ubjson.output"
+    ```
+
+## Deserialization
+
+The library maps UBJSON types to JSON value types as follows:
+
+| UBJSON type | JSON value type                         | marker |
+|-------------|-----------------------------------------|--------|
+| no-op       | *no value, next value is read*          | `N`    |
+| null        | `null`                                  | `Z`    |
+| false       | `false`                                 | `F`    |
+| true        | `true`                                  | `T`    |
+| float32     | number_float                            | `d`    |
+| float64     | number_float                            | `D`    |
+| uint8       | number_unsigned                         | `U`    |
+| int8        | number_integer                          | `i`    |
+| int16       | number_integer                          | `I`    |
+| int32       | number_integer                          | `l`    |
+| int64       | number_integer                          | `L`    |
+| string      | string                                  | `S`    |
+| char        | string                                  | `C`    |
+| array       | array (optimized values are supported)  | `[`    |
+| object      | object (optimized values are supported) | `{`    |
+
+!!! success "Complete mapping"
+
+    The mapping is **complete** in the sense that any UBJSON value can be converted to a JSON value.
+
+??? example
+
+    ```cpp
+    --8<-- "examples/from_ubjson.cpp"
+    ```
+
+    Output:
+
+    ```json
+    --8<-- "examples/from_ubjson.output"
+    ```
diff --git a/external_imported/json/docs/mkdocs/docs/features/binary_values.md b/external_imported/json/docs/mkdocs/docs/features/binary_values.md
new file mode 100644
index 000000000..5ad6433cf
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/features/binary_values.md
@@ -0,0 +1,372 @@
+# Binary Values
+
+The library implements several [binary formats](binary_formats/index.md) that encode JSON in an efficient way. Most of
+these formats support binary values; that is, values that have semantics define outside the library and only define a
+sequence of bytes to be stored.
+
+JSON itself does not have a binary value. As such, binary values are an extension that this library implements to store
+values received by a binary format. Binary values are never created by the JSON parser, and are only part of a
+serialized JSON text if they have been created manually or via a binary format.
+
+## API for binary values
+
+```plantuml
+class json::binary_t {
+    -- setters --
+    +void set_subtype(std::uint64_t subtype)
+    +void clear_subtype()
+    -- getters --
+    +std::uint64_t subtype() const
+    +bool has_subtype() const
+}
+
+"std::vector<uint8_t>" <|-- json::binary_t
+```
+
+By default, binary values are stored as `std::vector<std::uint8_t>`. This type can be changed by providing a template
+parameter to the `basic_json` type. To store binary subtypes, the storage type is extended and exposed as
+`json::binary_t`:
+
+```cpp
+auto binary = json::binary_t({0xCA, 0xFE, 0xBA, 0xBE});
+auto binary_with_subtype = json::binary_t({0xCA, 0xFE, 0xBA, 0xBE}, 42);
+```
+
+There are several convenience functions to check and set the subtype:
+
+```cpp
+binary.has_subtype();                   // returns false
+binary_with_subtype.has_subtype();      // returns true
+
+binary_with_subtype.clear_subtype();
+binary_with_subtype.has_subtype();      // returns true
+
+binary_with_subtype.set_subtype(42);
+binary.set_subtype(23);
+
+binary.subtype();                       // returns 23
+```
+
+As `json::binary_t` is subclassing `std::vector<std::uint8_t>`, all member functions are available:
+
+```cpp
+binary.size();  // returns 4
+binary[1];      // returns 0xFE
+```
+
+JSON values can be constructed from `json::binary_t`:
+
+```cpp
+json j = binary;
+```
+
+Binary values are primitive values just like numbers or strings:
+
+```cpp
+j.is_binary();    // returns true
+j.is_primitive(); // returns true
+```
+
+Given a binary JSON value, the `binary_t` can be accessed by reference as via `get_binary()`:
+
+```cpp
+j.get_binary().has_subtype();  // returns true
+j.get_binary().size();         // returns 4
+```
+
+For convenience, binary JSON values can be constructed via `json::binary`:
+
+```cpp
+auto j2 = json::binary({0xCA, 0xFE, 0xBA, 0xBE}, 23);
+auto j3 = json::binary({0xCA, 0xFE, 0xBA, 0xBE});
+
+j2 == j;                        // returns true
+j3.get_binary().has_subtype();  // returns false
+j3.get_binary().subtype();      // returns std::uint64_t(-1) as j3 has no subtype
+```
+
+
+
+## Serialization
+
+Binary values are serialized differently according to the formats.
+
+### JSON
+
+JSON does not have a binary type, and this library does not introduce a new type as this would break conformance.
+Instead, binary values are serialized as an object with two keys: `bytes` holds an array of integers, and `subtype`
+is an integer or `null`.
+
+??? example
+
+    Code:
+
+    ```cpp
+    // create a binary value of subtype 42
+    json j;
+    j["binary"] = json::binary({0xCA, 0xFE, 0xBA, 0xBE}, 42);
+    
+    // serialize to standard output
+    std::cout << j.dump(2) << std::endl;
+    ```
+    
+    Output:
+    
+    ```json
+    {
+      "binary": {
+        "bytes": [202, 254, 186, 190],
+        "subtype": 42
+      }
+    }
+    ```
+
+!!! warning "No roundtrip for binary values"
+
+    The JSON parser will not parse the objects generated by binary values back to binary values. This is by design to
+    remain standards compliant. Serializing binary values to JSON is only implemented for debugging purposes.
+
+### BJData
+
+[BJData](binary_formats/bjdata.md) neither supports binary values nor subtypes, and proposes to serialize binary values
+as array of uint8 values. This translation is implemented by the library.
+
+??? example
+
+    Code:
+    
+    ```cpp
+    // create a binary value of subtype 42 (will be ignored in BJData)
+    json j;
+    j["binary"] = json::binary({0xCA, 0xFE, 0xBA, 0xBE}, 42);
+
+    // convert to BJData
+    auto v = json::to_bjdata(j);      
+    ```
+            
+    `v` is a `std::vector<std::uint8t>` with the following 20 elements:
+
+    ```c
+    0x7B                                             // '{'
+        0x69 0x06                                    // i 6 (length of the key)
+        0x62 0x69 0x6E 0x61 0x72 0x79                // "binary"
+        0x5B                                         // '['
+            0x55 0xCA 0x55 0xFE 0x55 0xBA 0x55 0xBE  // content (each byte prefixed with 'U')
+        0x5D                                         // ']'
+    0x7D                                             // '}'
+    ```
+
+    The following code uses the type and size optimization for UBJSON:
+
+    ```cpp
+    // convert to UBJSON using the size and type optimization
+    auto v = json::to_bjdata(j, true, true);
+    ```
+
+    The resulting vector has 22 elements; the optimization is not effective for examples with few values:
+
+    ```c
+    0x7B                                // '{'
+        0x23 0x69 0x01                  // '#' 'i' type of the array elements: unsigned integers
+        0x69 0x06                       // i 6 (length of the key)
+        0x62 0x69 0x6E 0x61 0x72 0x79   // "binary"
+        0x5B                            // '[' array
+            0x24 0x55                   // '$' 'U' type of the array elements: unsigned integers
+            0x23 0x69 0x04              // '#' i 4 number of array elements
+            0xCA 0xFE 0xBA 0xBE         // content
+    ```
+
+    Note that subtype (42) is **not** serialized and that UBJSON has **no binary type**, and deserializing `v` would
+    yield the following value:
+
+    ```json
+    {
+      "binary": [202, 254, 186, 190]
+    }
+    ```
+
+### BSON
+
+[BSON](binary_formats/bson.md) supports binary values and subtypes. If a subtype is given, it is used and added as
+unsigned 8-bit integer. If no subtype is given, the generic binary subtype 0x00 is used.
+
+??? example
+
+    Code:
+    
+    ```cpp
+    // create a binary value of subtype 42
+    json j;
+    j["binary"] = json::binary({0xCA, 0xFE, 0xBA, 0xBE}, 42);
+
+    // convert to BSON
+    auto v = json::to_bson(j);      
+    ```
+            
+    `v` is a `std::vector<std::uint8t>` with the following 22 elements:
+    
+    ```c
+    0x16 0x00 0x00 0x00                         // number of bytes in the document
+        0x05                                    // binary value
+            0x62 0x69 0x6E 0x61 0x72 0x79 0x00  // key "binary" + null byte
+            0x04 0x00 0x00 0x00                 // number of bytes
+            0x2a                                // subtype
+            0xCA 0xFE 0xBA 0xBE                 // content
+    0x00                                        // end of the document
+    ```
+
+    Note that the serialization preserves the subtype, and deserializing `v` would yield the following value:
+
+    ```json
+    {
+      "binary": {
+        "bytes": [202, 254, 186, 190],
+        "subtype": 42
+      }
+    }
+    ```
+
+### CBOR
+
+[CBOR](binary_formats/cbor.md) supports binary values, but no subtypes. Subtypes will be serialized as tags. Any binary
+value will be serialized as byte strings. The library will choose the smallest representation using the length of the
+byte array.
+
+??? example
+
+    Code:
+    
+    ```cpp
+    // create a binary value of subtype 42
+    json j;
+    j["binary"] = json::binary({0xCA, 0xFE, 0xBA, 0xBE}, 42);
+
+    // convert to CBOR
+    auto v = json::to_cbor(j);      
+    ```
+            
+    `v` is a `std::vector<std::uint8t>` with the following 15 elements:
+    
+    ```c
+    0xA1                                   // map(1)
+        0x66                               // text(6)
+            0x62 0x69 0x6E 0x61 0x72 0x79  // "binary"
+        0xD8 0x2A                          // tag(42)
+        0x44                               // bytes(4)
+            0xCA 0xFE 0xBA 0xBE            // content
+    ```
+
+    Note that the subtype is serialized as tag. However, parsing tagged values yield a parse error unless
+    `json::cbor_tag_handler_t::ignore` or `json::cbor_tag_handler_t::store` is passed to `json::from_cbor`.
+
+    ```json
+    {
+      "binary": {
+        "bytes": [202, 254, 186, 190],
+        "subtype": null
+      }
+    }
+    ```
+
+### MessagePack
+
+[MessagePack](binary_formats/messagepack.md) supports binary values and subtypes. If a subtype is given, the ext family
+is used. The library will choose the smallest representation among fixext1, fixext2, fixext4, fixext8, ext8, ext16, and
+ext32. The subtype is then added as signed 8-bit integer.
+
+If no subtype is given, the bin family (bin8, bin16, bin32) is used.
+
+??? example
+
+    Code:
+    
+    ```cpp
+    // create a binary value of subtype 42
+    json j;
+    j["binary"] = json::binary({0xCA, 0xFE, 0xBA, 0xBE}, 42);
+
+    // convert to MessagePack
+    auto v = json::to_msgpack(j);      
+    ```
+            
+    `v` is a `std::vector<std::uint8t>` with the following 14 elements:
+    
+    ```c
+    0x81                                   // fixmap1
+        0xA6                               // fixstr6
+            0x62 0x69 0x6E 0x61 0x72 0x79  // "binary"
+        0xD6                               // fixext4
+            0x2A                           // subtype
+            0xCA 0xFE 0xBA 0xBE            // content
+    ```
+
+    Note that the serialization preserves the subtype, and deserializing `v` would yield the following value:
+
+    ```json
+    {
+      "binary": {
+        "bytes": [202, 254, 186, 190],
+        "subtype": 42
+      }
+    }
+    ```
+
+### UBJSON
+
+[UBJSON](binary_formats/ubjson.md) neither supports binary values nor subtypes, and proposes to serialize binary values
+as array of uint8 values. This translation is implemented by the library.
+
+??? example
+
+    Code:
+    
+    ```cpp
+    // create a binary value of subtype 42 (will be ignored in UBJSON)
+    json j;
+    j["binary"] = json::binary({0xCA, 0xFE, 0xBA, 0xBE}, 42);
+
+    // convert to UBJSON
+    auto v = json::to_ubjson(j);      
+    ```
+            
+    `v` is a `std::vector<std::uint8t>` with the following 20 elements:
+    
+    ```c
+    0x7B                                             // '{'
+        0x69 0x06                                    // i 6 (length of the key)
+        0x62 0x69 0x6E 0x61 0x72 0x79                // "binary"
+        0x5B                                         // '['
+            0x55 0xCA 0x55 0xFE 0x55 0xBA 0x55 0xBE  // content (each byte prefixed with 'U')
+        0x5D                                         // ']'
+    0x7D                                             // '}'
+    ```
+
+    The following code uses the type and size optimization for UBJSON:
+
+    ```cpp
+    // convert to UBJSON using the size and type optimization
+    auto v = json::to_ubjson(j, true, true);
+    ```
+
+    The resulting vector has 23 elements; the optimization is not effective for examples with few values:
+
+    ```c
+    0x7B                                // '{'
+        0x24                            // '$' type of the object elements
+        0x5B                            // '[' array
+        0x23 0x69 0x01                  // '#' i 1 number of object elements
+        0x69 0x06                       // i 6 (length of the key)
+        0x62 0x69 0x6E 0x61 0x72 0x79   // "binary"
+            0x24 0x55                   // '$' 'U' type of the array elements: unsigned integers
+            0x23 0x69 0x04              // '#' i 4 number of array elements
+            0xCA 0xFE 0xBA 0xBE         // content
+    ```
+
+    Note that subtype (42) is **not** serialized and that UBJSON has **no binary type**, and deserializing `v` would
+    yield the following value:
+
+    ```json
+    {
+      "binary": [202, 254, 186, 190]
+    }
+    ```
diff --git a/external_imported/json/doc/mkdocs/docs/features/comments.md b/external_imported/json/docs/mkdocs/docs/features/comments.md
similarity index 78%
rename from external_imported/json/doc/mkdocs/docs/features/comments.md
rename to external_imported/json/docs/mkdocs/docs/features/comments.md
index f82029eee..61266d9ca 100644
--- a/external_imported/json/doc/mkdocs/docs/features/comments.md
+++ b/external_imported/json/docs/mkdocs/docs/features/comments.md
@@ -5,9 +5,9 @@ This library does not support comments *by default*. It does so for three reason
 1. Comments are not part of the [JSON specification](https://tools.ietf.org/html/rfc8259). You may argue that `//` or `/* */` are allowed in JavaScript, but JSON is not JavaScript.
 2. This was not an oversight: Douglas Crockford [wrote on this](https://plus.google.com/118095276221607585885/posts/RK8qyGVaGSr) in May 2012:
 
-	> 	I removed comments from JSON because I saw people were using them to hold parsing directives, a practice which would have destroyed interoperability.  I know that the lack of comments makes some people sad, but it shouldn't. 
+    >     I removed comments from JSON because I saw people were using them to hold parsing directives, a practice which would have destroyed interoperability.  I know that the lack of comments makes some people sad, but it shouldn't. 
 
-	> 	Suppose you are using JSON to keep configuration files, which you would like to annotate. Go ahead and insert all the comments you like. Then pipe it through JSMin before handing it to your JSON parser.
+    >     Suppose you are using JSON to keep configuration files, which you would like to annotate. Go ahead and insert all the comments you like. Then pipe it through JSMin before handing it to your JSON parser.
 
 3. It is dangerous for interoperability if some libraries would add comment support while others don't. Please check [The Harmful Consequences of the Robustness Principle](https://tools.ietf.org/html/draft-iab-protocol-maintenance-01) on this.
 
@@ -25,7 +25,7 @@ However, you can pass set parameter `ignore_comments` to `#!c true` in the parse
     }
     ```
     
-    When calling `parse` without additional argument, a parse error exception is thrown. If `skip_comments` is set to `#! true`, the comments are skipped during parsing:
+    When calling `parse` without additional argument, a parse error exception is thrown. If `ignore_comments` is set to `#! true`, the comments are ignored during parsing:
 
     ```cpp
     #include <iostream>
@@ -55,7 +55,7 @@ However, you can pass set parameter `ignore_comments` to `#!c true` in the parse
         json j = json::parse(s,
                              /* callback */ nullptr,
                              /* allow exceptions */ true,
-                             /* skip_comments */ true);
+                             /* ignore_comments */ true);
         std::cout << j.dump(2) << '\n';
     }
     ```
@@ -80,4 +80,4 @@ However, you can pass set parameter `ignore_comments` to `#!c true` in the parse
         "Neptune"
       ]
     }
-    ```
\ No newline at end of file
+    ```
diff --git a/external_imported/json/docs/mkdocs/docs/features/element_access/checked_access.md b/external_imported/json/docs/mkdocs/docs/features/element_access/checked_access.md
new file mode 100644
index 000000000..c4023cce5
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/features/element_access/checked_access.md
@@ -0,0 +1,91 @@
+# Checked access: at
+
+## Overview
+
+The [`at`](../../api/basic_json/at.md) member function performs checked access; that is, it returns a reference to the
+desired value if it exists and throws a [`basic_json::out_of_range` exception](../../home/exceptions.md#out-of-range)
+otherwise.
+
+??? example "Read access"
+
+    Consider the following JSON value:
+    
+    ```json
+    {
+        "name": "Mary Smith",
+        "age": 42,
+        "hobbies": ["hiking", "reading"]
+    }
+    ```
+    
+    Assume the value is parsed to a `json` variable `j`.
+
+    | expression                    | value                                                                        |
+    |-------------------------------|------------------------------------------------------------------------------|
+    | `#!cpp j`                     | `#!json {"name": "Mary Smith", "age": 42, "hobbies": ["hiking", "reading"]}` |
+    | `#!cpp j.at("name")`          | `#!json "Mary Smith"`                                                        |
+    | `#!cpp j.at("age")`           | `#!json 42`                                                                  |
+    | `#!cpp j.at("hobbies")`       | `#!json ["hiking", "reading"]`                                               |
+    | `#!cpp j.at("hobbies").at(0)` | `#!json "hiking"`                                                            |
+    | `#!cpp j.at("hobbies").at(1)` | `#!json "reading"`                                                           |
+
+The return value is a reference, so it can be modified by the original value.
+
+??? example "Write access"
+
+    ```cpp
+    j.at("name") = "John Smith";
+    ```
+    
+    This code produces the following JSON value:
+    
+    ```json
+    {
+        "name": "John Smith",
+        "age": 42,
+        "hobbies": ["hiking", "reading"]
+    }
+    ```
+
+When accessing an invalid index (i.e., an index greater than or equal to the array size) or the passed object key is
+non-existing, an exception is thrown.
+
+??? example "Accessing via invalid index or missing key"
+
+    ```cpp
+    j.at("hobbies").at(3) = "cooking";
+    ```
+    
+    This code produces the following exception:
+    
+    ```
+    [json.exception.out_of_range.401] array index 3 is out of range
+    ```
+
+    When you [extended diagnostic messages](../../home/exceptions.md#extended-diagnostic-messages) are enabled by
+    defining [`JSON_DIAGNOSTICS`](../../api/macros/json_diagnostics.md), the exception further gives information where
+    the key or index is missing or out of range.
+    
+    ```
+    [json.exception.out_of_range.401] (/hobbies) array index 3 is out of range
+    ```
+
+## Notes
+
+
+!!! failure "Exceptions"
+
+    - [`at`](../../api/basic_json/at.md) can only be used with objects (with a string argument) or with arrays (with a
+      numeric argument). For other types, a [`basic_json::type_error`](../../home/exceptions.md#jsonexceptiontype_error304)
+      is thrown.
+    - [`basic_json::out_of_range` exception](../../home/exceptions.md#out-of-range) exceptions are thrown if the
+      provided key is not found in an object or the provided index is invalid.
+
+## Summary
+
+| scenario                          | non-const value                                | const value                                    |
+|-----------------------------------|------------------------------------------------|------------------------------------------------|
+| access to existing object key     | reference to existing value is returned        | const reference to existing value is returned  |
+| access to valid array index       | reference to existing value is returned        | const reference to existing value is returned  |
+| access to non-existing object key | `basic_json::out_of_range` exception is thrown | `basic_json::out_of_range` exception is thrown |
+| access to invalid array index     | `basic_json::out_of_range` exception is thrown | `basic_json::out_of_range` exception is thrown |
diff --git a/external_imported/json/doc/mkdocs/docs/features/element_access/default_value.md b/external_imported/json/docs/mkdocs/docs/features/element_access/default_value.md
similarity index 100%
rename from external_imported/json/doc/mkdocs/docs/features/element_access/default_value.md
rename to external_imported/json/docs/mkdocs/docs/features/element_access/default_value.md
diff --git a/external_imported/json/docs/mkdocs/docs/features/element_access/index.md b/external_imported/json/docs/mkdocs/docs/features/element_access/index.md
new file mode 100644
index 000000000..0b39547ec
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/features/element_access/index.md
@@ -0,0 +1,9 @@
+# Element Access
+
+There are many ways elements in a JSON value can be accessed:
+
+- unchecked access via [`operator[]`](unchecked_access.md)
+- checked access via [`at`](checked_access.md)
+- access with default value via [`value`](default_value.md)
+- iterators
+- JSON pointers
diff --git a/external_imported/json/docs/mkdocs/docs/features/element_access/unchecked_access.md b/external_imported/json/docs/mkdocs/docs/features/element_access/unchecked_access.md
new file mode 100644
index 000000000..39f06dc9f
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/features/element_access/unchecked_access.md
@@ -0,0 +1,112 @@
+# Unchecked access: operator[]
+
+## Overview
+
+Elements in a JSON object and a JSON array can be accessed via [`operator[]`](../../api/basic_json/operator%5B%5D.md)
+similar to a `#!cpp std::map` and a `#!cpp std::vector`, respectively.
+
+??? example "Read access"
+
+    Consider the following JSON value:
+    
+    ```json
+    {
+        "name": "Mary Smith",
+        "age": 42,
+        "hobbies": ["hiking", "reading"]
+    }
+    ```
+    
+    Assume the value is parsed to a `json` variable `j`.
+
+    | expression              | value                                                                        |
+    |-------------------------|------------------------------------------------------------------------------|
+    | `#!cpp j`               | `#!json {"name": "Mary Smith", "age": 42, "hobbies": ["hiking", "reading"]}` |
+    | `#!cpp j["name"]`       | `#!json "Mary Smith"`                                                        |
+    | `#!cpp j["age"]`        | `#!json 42`                                                                  |
+    | `#!cpp j["hobbies"]`    | `#!json ["hiking", "reading"]`                                               |
+    | `#!cpp j["hobbies"][0]` | `#!json "hiking"`                                                            |
+    | `#!cpp j["hobbies"][1]` | `#!json "reading"`                                                           |
+
+The return value is a reference, so it can modify the original value. In case the passed object key is non-existing, a
+`#!json null` value is inserted which can be immediately be overwritten.
+
+??? example "Write access"
+
+    ```cpp
+    j["name"] = "John Smith";
+    j["maidenName"] = "Jones";
+    ```
+    
+    This code produces the following JSON value:
+    
+    ```json
+    {
+        "name": "John Smith",
+        "maidenName": "Jones",
+        "age": 42,
+        "hobbies": ["hiking", "reading"]
+    }
+    ```
+
+When accessing an invalid index (i.e., an index greater than or equal to the array size), the JSON array is resized such
+that the passed index is the new maximal index. Intermediate values are filled with `#!json null`.
+
+??? example "Filling up arrays with `#!json null` values"
+
+    ```cpp
+    j["hobbies"][0] = "running";
+    j["hobbies"][3] = "cooking";
+    ```
+    
+    This code produces the following JSON value:
+    
+    ```json
+    {
+        "name": "John Smith",
+        "maidenName": "Jones",
+        "age": 42,
+        "hobbies": ["running", "reading", null, "cooking"]
+    }
+    ```
+
+## Notes
+
+!!! info "Design rationale"
+
+    The library behaves differently to `#!cpp std::vector` and `#!cpp std::map`:
+    
+    - `#!cpp std::vector::operator[]` never inserts a new element.
+    - `#!cpp std::map::operator[]` is not available for const values.
+    
+    The type `#!cpp json` wraps all JSON value types. It would be impossible to remove
+    [`operator[]`](../../api/basic_json/operator%5B%5D.md) for const objects. At the same time, inserting elements for
+    non-const objects is really convenient as it avoids awkward `insert` calls. To this end, we decided to have an
+    inserting non-const behavior for both arrays and objects.
+
+!!! info
+
+    The access is unchecked. In case the passed object key does not exist or the passed array index is invalid, no
+    exception is thrown.
+
+!!! danger
+
+    - It is **undefined behavior** to access a const object with a non-existing key.
+    - It is **undefined behavior** to access a const array with an invalid index.
+    - In debug mode, an **assertion** will fire in both cases. You can disable assertions by defining the preprocessor
+      symbol `#!cpp NDEBUG` or redefine the macro [`JSON_ASSERT(x)`](../macros.md#json_assertx). See the documentation
+      on [runtime assertions](../assertions.md) for more information.
+
+!!! failure "Exceptions"
+
+    `operator[]` can only be used with objects (with a string argument) or with arrays (with a numeric argument). For
+    other types, a [`basic_json::type_error`](../../home/exceptions.md#jsonexceptiontype_error305) is thrown.
+
+## Summary
+
+| scenario                          | non-const value                                                                                                                                      | const value                                                                 |
+|-----------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------|
+| access to existing object key     | reference to existing value is returned                                                                                                              | const reference to existing value is returned                               |
+| access to valid array index       | reference to existing value is returned                                                                                                              | const reference to existing value is returned                               |
+| access to non-existing object key | reference to newly inserted `#!json null` value is returned                                                                                          | **undefined behavior**; [runtime assertion](../assertions.md) in debug mode |
+| access to invalid array index     | reference to newly inserted `#!json null` value is returned; any index between previous maximal index and passed index are filled with `#!json null` | **undefined behavior**; [runtime assertion](../assertions.md) in debug mode |
diff --git a/external_imported/json/docs/mkdocs/docs/features/enum_conversion.md b/external_imported/json/docs/mkdocs/docs/features/enum_conversion.md
new file mode 100644
index 000000000..1755bca2a
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/features/enum_conversion.md
@@ -0,0 +1,61 @@
+# Specializing enum conversion
+
+By default, enum values are serialized to JSON as integers. In some cases this could result in undesired behavior. If an
+enum is modified or re-ordered after data has been serialized to JSON, the later de-serialized JSON data may be
+undefined or a different enum value than was originally intended.
+
+It is possible to more precisely specify how a given enum is mapped to and from JSON as shown below:
+
+```cpp
+// example enum type declaration
+enum TaskState {
+    TS_STOPPED,
+    TS_RUNNING,
+    TS_COMPLETED,
+    TS_INVALID=-1,
+};
+
+// map TaskState values to JSON as strings
+NLOHMANN_JSON_SERIALIZE_ENUM( TaskState, {
+    {TS_INVALID, nullptr},
+    {TS_STOPPED, "stopped"},
+    {TS_RUNNING, "running"},
+    {TS_COMPLETED, "completed"},
+})
+```
+
+The [`NLOHMANN_JSON_SERIALIZE_ENUM()` macro](../api/macros/nlohmann_json_serialize_enum.md) declares a set of
+`to_json()` / `from_json()` functions for type `TaskState` while avoiding repetition and boilerplate serialization code.
+
+## Usage
+
+```cpp
+// enum to JSON as string
+json j = TS_STOPPED;
+assert(j == "stopped");
+
+// json string to enum
+json j3 = "running";
+assert(j3.template get<TaskState>() == TS_RUNNING);
+
+// undefined json value to enum (where the first map entry above is the default)
+json jPi = 3.14;
+assert(jPi.template get<TaskState>() == TS_INVALID );
+```
+
+## Notes
+
+Just as in [Arbitrary Type Conversions](arbitrary_types.md) above,
+
+- [`NLOHMANN_JSON_SERIALIZE_ENUM()`](../api/macros/nlohmann_json_serialize_enum.md) MUST be declared in your enum type's
+  namespace (which can be the global namespace), or the library will not be able to locate it, and it will default to
+  integer serialization.
+- It MUST be available (e.g., proper headers must be included) everywhere you use the conversions.
+
+Other Important points:
+
+- When using `template get<ENUM_TYPE>()`, undefined JSON values will default to the first pair specified in your map. Select this
+  default pair carefully.
+- If an enum or JSON value is specified more than once in your map, the first matching occurrence from the top of the
+  map will be returned when converting to or from JSON.
+- To disable the default serialization of enumerators as integers and force a compiler error instead, see [`JSON_DISABLE_ENUM_SERIALIZATION`](../api/macros/json_disable_enum_serialization.md).
diff --git a/external_imported/json/doc/mkdocs/docs/features/iterators.md b/external_imported/json/docs/mkdocs/docs/features/iterators.md
similarity index 88%
rename from external_imported/json/doc/mkdocs/docs/features/iterators.md
rename to external_imported/json/docs/mkdocs/docs/features/iterators.md
index a8b88e2d8..ce627e012 100644
--- a/external_imported/json/doc/mkdocs/docs/features/iterators.md
+++ b/external_imported/json/docs/mkdocs/docs/features/iterators.md
@@ -10,7 +10,7 @@ As for other containers, `begin()` returns an iterator to the first value and `e
 
 ### Iteration order for objects
 
-When iterating over objects, values are ordered with respect to the `object_comparator_t` type which defaults to `std::less`. See the [types documentation](types.md#key-order) for more information.
+When iterating over objects, values are ordered with respect to the `object_comparator_t` type which defaults to `std::less`. See the [types documentation](types/index.md#key-order) for more information.
 
 ??? example
 
@@ -66,7 +66,7 @@ The JSON iterators have two member functions, `key()` and `value()` to access th
 
 ### Range-based for loops
 
-C++11 allows to use range-based for loops to iterate over a container.
+C++11 allows using range-based for loops to iterate over a container.
 
 ```cpp
 for (auto it : j_object)
@@ -76,7 +76,7 @@ for (auto it : j_object)
 }
 ```
 
-For this reason, the `items()` function allows to access `iterator::key()` and `iterator::value()` during range-based for loops. In these loops, a reference to the JSON values is returned, so there is no access to the underlying iterator.
+For this reason, the `items()` function allows accessing `iterator::key()` and `iterator::value()` during range-based for loops. In these loops, a reference to the JSON values is returned, so there is no access to the underlying iterator.
 
 ```cpp
 for (auto& el : j_object.items())
@@ -85,7 +85,7 @@ for (auto& el : j_object.items())
 }
 ```
 
-The items() function also allows to use structured bindings (C++17):
+The items() function also allows using structured bindings (C++17):
 
 ```cpp
 for (auto& [key, val] : j_object.items())
@@ -100,7 +100,7 @@ for (auto& [key, val] : j_object.items())
     
 !!! warning
 
-    Using `items()` on temporary objects is dangerous. Make sure the object's lifetime exeeds the iteration. See <https://github.com/nlohmann/json/issues/2040> for more information.
+    Using `items()` on temporary objects is dangerous. Make sure the object's lifetime exceeds the iteration. See <https://github.com/nlohmann/json/issues/2040> for more information.
 
 ### Reverse iteration order
 
@@ -113,7 +113,7 @@ for (auto& [key, val] : j_object.items())
     ```cpp
     json j = {1, 2, 3, 4};
 
-    for (auto it = j.begin(); it != j.end(); ++it)
+    for (auto it = j.rbegin(); it != j.rend(); ++it)
     {
         std::cout << *it << std::endl;
     }
@@ -151,5 +151,5 @@ Note that "value" means a JSON value in this setting, not values stored in the u
 ## Iterator invalidation
 
 | Operations | invalidated iterators |
-| ---------- | --------------------- |
+|------------|-----------------------|
 | `clear`    | all                   |
diff --git a/external_imported/json/doc/mkdocs/docs/features/json_patch.md b/external_imported/json/docs/mkdocs/docs/features/json_patch.md
similarity index 78%
rename from external_imported/json/doc/mkdocs/docs/features/json_patch.md
rename to external_imported/json/docs/mkdocs/docs/features/json_patch.md
index 24cebdd98..88c731a2c 100644
--- a/external_imported/json/doc/mkdocs/docs/features/json_patch.md
+++ b/external_imported/json/docs/mkdocs/docs/features/json_patch.md
@@ -2,7 +2,9 @@
 
 ## Patches
 
-JSON Patch ([RFC 6902](https://tools.ietf.org/html/rfc6902)) defines a JSON document structure for expressing a sequence of operations to apply to a JSON) document. With the `patch` function, a JSON Patch is applied to the current JSON value by executing all operations from the patch.
+JSON Patch ([RFC 6902](https://tools.ietf.org/html/rfc6902)) defines a JSON document structure for expressing a sequence
+of operations to apply to a JSON document. With the `patch` function, a JSON Patch is applied to the current JSON value
+by executing all operations from the patch.
 
 ??? example
 
diff --git a/external_imported/json/docs/mkdocs/docs/features/json_pointer.md b/external_imported/json/docs/mkdocs/docs/features/json_pointer.md
new file mode 100644
index 000000000..04aeca504
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/features/json_pointer.md
@@ -0,0 +1,126 @@
+# JSON Pointer
+
+## Introduction
+
+The library supports **JSON Pointer** ([RFC 6901](https://tools.ietf.org/html/rfc6901)) as alternative means to address
+structured values. A JSON Pointer is a string that identifies a specific value within a JSON document.
+
+Consider the following JSON document
+
+```json
+{
+    "array": ["A", "B", "C"],
+    "nested": {
+        "one": 1,
+        "two": 2,
+        "three": [true, false]
+    }
+}
+```
+
+Then every value inside the JSON document can be identified as follows:
+
+| JSON Pointer      | JSON value                                                                       |
+|-------------------|----------------------------------------------------------------------------------|
+| ``                | `#!json {"array":["A","B","C"],"nested":{"one":1,"two":2,"three":[true,false]}}` |
+| `/array`          | `#!json ["A","B","C"]`                                                           |
+| `/array/0`        | `#!json A`                                                                       |
+| `/array/1`        | `#!json B`                                                                       |
+| `/array/2`        | `#!json C`                                                                       |
+| `/nested`         | `#!json {"one":1,"two":2,"three":[true,false]}`                                  |
+| `/nested/one`     | `#!json 1`                                                                       |
+| `/nested/two`     | `#!json 2`                                                                       |
+| `/nested/three`   | `#!json [true,false]`                                                            |
+| `/nested/three/0` | `#!json true`                                                                    |
+| `/nested/three/1` | `#!json false`                                                                   |
+
+Note `/` does not identify the root (i.e., the whole document), but an object entry with empty key `""`. See
+[RFC 6901](https://tools.ietf.org/html/rfc6901) for more information.
+
+## JSON Pointer creation
+
+JSON Pointers can be created from a string:
+
+```cpp
+json::json_pointer p = "/nested/one";
+```
+
+Furthermore, a user-defined string literal can be used to achieve the same result:
+
+```cpp
+auto p = "/nested/one"_json_pointer;
+```
+
+The escaping rules of [RFC 6901](https://tools.ietf.org/html/rfc6901) are implemented. See the
+[constructor documentation](../api/json_pointer/json_pointer.md) for more information.
+
+## Value access
+
+JSON Pointers can be used in the [`at`](../api/basic_json/at.md), [`operator[]`](../api/basic_json/operator%5B%5D.md),
+and [`value`](../api/basic_json/value.md) functions just like object keys or array indices.
+
+```cpp
+// the JSON value from above
+auto j = json::parse(R"({
+    "array": ["A", "B", "C"],
+    "nested": {
+        "one": 1,
+        "two": 2,
+        "three": [true, false]
+    }
+})");
+
+// access values
+auto val = j["/"_json_pointer];                             // {"array":["A","B","C"],...}
+auto val1 = j["/nested/one"_json_pointer];                  // 1
+auto val2 = j.at[json::json_pointer("/nested/three/1")];    // false
+auto val3 = j.value[json::json_pointer("/nested/four", 0)]; // 0
+```
+
+## Flatten / unflatten
+
+The library implements a function [`flatten`](../api/basic_json/flatten.md) to convert any JSON document into a JSON
+object where each key is a JSON Pointer and each value is a primitive JSON value (i.e., a string, boolean, number, or
+null).
+
+```cpp
+// the JSON value from above
+auto j = json::parse(R"({
+    "array": ["A", "B", "C"],
+    "nested": {
+        "one": 1,
+        "two": 2,
+        "three": [true, false]
+    }
+})");
+
+// create flattened value
+auto j_flat = j.flatten();
+```
+
+The resulting value `j_flat` is:
+
+```json
+{
+  "/array/0": "A",
+  "/array/1": "B",
+  "/array/2": "C",
+  "/nested/one": 1,
+  "/nested/two": 2,
+  "/nested/three/0": true,
+  "/nested/three/1": false
+}
+```
+
+The reverse function, [`unflatten`](../api/basic_json/unflatten.md) recreates the original value.
+
+```cpp
+auto j_original = j_flat.unflatten();
+```
+
+## See also
+
+- Class [`json_pointer`](../api/json_pointer/index.md)
+- Function [`flatten`](../api/basic_json/flatten.md)
+- Function [`unflatten`](../api/basic_json/unflatten.md)
+- [JSON Patch](json_patch.md)
diff --git a/external_imported/json/docs/mkdocs/docs/features/macros.md b/external_imported/json/docs/mkdocs/docs/features/macros.md
new file mode 100644
index 000000000..926741b09
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/features/macros.md
@@ -0,0 +1,167 @@
+# Supported Macros
+
+Some aspects of the library can be configured by defining preprocessor macros before including the `json.hpp` header.
+See also the [API documentation for macros](../api/macros/index.md) for examples and more information.
+
+## `JSON_ASSERT(x)`
+
+This macro controls which code is executed for [runtime assertions](assertions.md) of the library.
+
+See [full documentation of `JSON_ASSERT(x)`](../api/macros/json_assert.md).
+
+## `JSON_CATCH_USER(exception)`
+
+This macro overrides [`#!cpp catch`](https://en.cppreference.com/w/cpp/language/try_catch) calls inside the library.
+
+See [full documentation of `JSON_CATCH_USER(exception)`](../api/macros/json_throw_user.md).
+
+## `JSON_DIAGNOSTICS`
+
+This macro enables extended diagnostics for exception messages. Possible values are `1` to enable or `0` to disable
+(default).
+
+When enabled, exception messages contain a [JSON Pointer](json_pointer.md) to the JSON value that triggered the
+exception, see [Extended diagnostic messages](../home/exceptions.md#extended-diagnostic-messages) for an example. Note
+that enabling this macro increases the size of every JSON value by one pointer and adds some runtime overhead.
+
+The diagnostics messages can also be controlled with the CMake option `JSON_Diagnostics` (`OFF` by default) which sets
+`JSON_DIAGNOSTICS` accordingly.
+
+See [full documentation of `JSON_DIAGNOSTICS`](../api/macros/json_diagnostics.md).
+
+## `JSON_HAS_CPP_11`, `JSON_HAS_CPP_14`, `JSON_HAS_CPP_17`, `JSON_HAS_CPP_20`
+
+The library targets C++11, but also supports some features introduced in later C++ versions (e.g., `std::string_view`
+support for C++17). For these new features, the library implements some preprocessor checks to determine the C++
+standard. By defining any of these symbols, the internal check is overridden and the provided C++ version is
+unconditionally assumed. This can be helpful for compilers that only implement parts of the standard and would be
+detected incorrectly.
+
+See [full documentation of `JSON_HAS_CPP_11`, `JSON_HAS_CPP_14`, `JSON_HAS_CPP_17`, and `JSON_HAS_CPP_20`](../api/macros/json_has_cpp_11.md).
+
+## `JSON_HAS_FILESYSTEM`, `JSON_HAS_EXPERIMENTAL_FILESYSTEM`
+
+When compiling with C++17, the library provides conversions from and to `std::filesystem::path`. As compiler support
+for filesystem is limited, the library tries to detect whether `<filesystem>`/`std::filesystem` (`JSON_HAS_FILESYSTEM`)
+or `<experimental/filesystem>`/`std::experimental::filesystem` (`JSON_HAS_EXPERIMENTAL_FILESYSTEM`) should be used.
+To override the built-in check, define `JSON_HAS_FILESYSTEM` or `JSON_HAS_EXPERIMENTAL_FILESYSTEM` to `1`.
+
+See [full documentation of `JSON_HAS_FILESYSTEM` and `JSON_HAS_EXPERIMENTAL_FILESYSTEM`](../api/macros/json_has_filesystem.md).
+
+## `JSON_NOEXCEPTION`
+
+Exceptions can be switched off by defining the symbol `JSON_NOEXCEPTION`.
+
+See [full documentation of `JSON_NOEXCEPTION`](../api/macros/json_noexception.md).
+
+## `JSON_DISABLE_ENUM_SERIALIZATION`
+
+When defined, default parse and serialize functions for enums are excluded and have to be provided by the user, for example, using [`NLOHMANN_JSON_SERIALIZE_ENUM`](../api/macros/nlohmann_json_serialize_enum.md).
+
+See [full documentation of `JSON_DISABLE_ENUM_SERIALIZATION`](../api/macros/json_disable_enum_serialization.md).
+
+## `JSON_NO_IO`
+
+When defined, headers `<cstdio>`, `<ios>`, `<iosfwd>`, `<istream>`, and `<ostream>` are not included and parse functions
+relying on these headers are excluded. This is relevant for environment where these I/O functions are disallowed for
+security reasons (e.g., Intel Software Guard Extensions (SGX)).
+
+See [full documentation of `JSON_NO_IO`](../api/macros/json_no_io.md).
+
+## `JSON_SKIP_LIBRARY_VERSION_CHECK`
+
+When defined, the library will not create a compiler warning when a different version of the library was already
+included.
+
+See [full documentation of `JSON_SKIP_LIBRARY_VERSION_CHECK`](../api/macros/json_skip_library_version_check.md).
+
+## `JSON_SKIP_UNSUPPORTED_COMPILER_CHECK`
+
+When defined, the library will not create a compile error when a known unsupported compiler is detected. This allows to
+use the library with compilers that do not fully support C++11 and may only work if unsupported features are not used.
+
+See [full documentation of `JSON_SKIP_UNSUPPORTED_COMPILER_CHECK`](../api/macros/json_skip_unsupported_compiler_check.md).
+
+## `JSON_THROW_USER(exception)`
+
+This macro overrides `#!cpp throw` calls inside the library. The argument is the exception to be thrown.
+
+See [full documentation of `JSON_THROW_USER(exception)`](../api/macros/json_throw_user.md).
+
+## `JSON_TRY_USER`
+
+This macro overrides `#!cpp try` calls inside the library.
+
+See [full documentation of `JSON_TRY_USER`](../api/macros/json_throw_user.md).
+
+## `JSON_USE_IMPLICIT_CONVERSIONS`
+
+When defined to `0`, implicit conversions are switched off. By default, implicit conversions are switched on.
+
+See [full documentation of `JSON_USE_IMPLICIT_CONVERSIONS`](../api/macros/json_use_implicit_conversions.md).
+
+## `NLOHMANN_DEFINE_TYPE_INTRUSIVE(type, member...)`
+
+This macro can be used to simplify the serialization/deserialization of types if (1) want to use a JSON object as
+serialization and (2) want to use the member variable names as object keys in that object.
+
+The macro is to be defined inside the class/struct to create code for. Unlike
+[`NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE`](#nlohmann_define_type_non_intrusivetype-member), it can access private members.
+The first parameter is the name of the class/struct, and all remaining parameters name the members.
+
+See [full documentation of `NLOHMANN_DEFINE_TYPE_INTRUSIVE`](../api/macros/nlohmann_define_type_intrusive.md).
+
+## `NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(type, member...)`
+
+This macro is similar to `NLOHMANN_DEFINE_TYPE_INTRUSIVE`. It will not throw an exception in `from_json()` due to a
+missing value in the JSON object, but can throw due to a mismatched type. The `from_json()` function default constructs
+an object and uses its values as the defaults when calling the [`value`](../api/basic_json/value.md) function.
+
+See [full documentation of `NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT`](../api/macros/nlohmann_define_type_intrusive.md).
+
+## `NLOHMANN_DEFINE_TYPE_INTRUSIVE_ONLY_SERIALIZE(type, member...)`
+
+This macro is similar to `NLOHMANN_DEFINE_TYPE_INTRUSIVE` except that it defines only the serialization code. This is
+useful when the user type does not have a default constructor and only the serialization is required.
+
+See [full documentation of `NLOHMANN_DEFINE_TYPE_INTRUSIVE_ONLY_SERIALIZE`](../api/macros//nlohmann_define_type_intrusive.md).
+
+## `NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(type, member...)`
+
+This macro can be used to simplify the serialization/deserialization of types if (1) want to use a JSON object as
+serialization and (2) want to use the member variable names as object keys in that object.
+
+The macro is to be defined inside the namespace of the class/struct to create code for. Private members cannot be
+accessed. Use [`NLOHMANN_DEFINE_TYPE_INTRUSIVE`](#nlohmann_define_type_intrusivetype-member) in these scenarios. The
+first parameter is the name of the class/struct, and all remaining parameters name the members.
+
+See [full documentation of `NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE`](../api/macros/nlohmann_define_type_non_intrusive.md).
+
+## `NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(type, member...)`
+
+This macro is similar to `NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE`. It will not throw an exception in `from_json()` due to a
+missing value in the JSON object, but can throw due to a mismatched type. The `from_json()` function default constructs
+an object and uses its values as the defaults when calling the [`value`](../api/basic_json/value.md) function.
+
+See [full documentation of `NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT`](../api/macros/nlohmann_define_type_non_intrusive.md).
+
+## `NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_ONLY_SERIALIZE(type, member...)`
+
+This macro is similar to `NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE` except that it defines only the serialization code. This is
+useful when the user type does not have a default constructor and only the serialization is required.
+
+See [full documentation of `NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_ONLY_SERIALIZE`](../api/macros//nlohmann_define_type_non_intrusive.md).
+
+## `NLOHMANN_JSON_SERIALIZE_ENUM(type, ...)`
+
+This macro simplifies the serialization/deserialization of enum types. See
+[Specializing enum conversion](enum_conversion.md) for more information.
+
+See [full documentation of `NLOHMANN_JSON_SERIALIZE_ENUM`](../api/macros/nlohmann_json_serialize_enum.md).
+
+## `NLOHMANN_JSON_VERSION_MAJOR`, `NLOHMANN_JSON_VERSION_MINOR`, `NLOHMANN_JSON_VERSION_PATCH`
+
+These macros are defined by the library and contain the version numbers according to
+[Semantic Versioning 2.0.0](https://semver.org/spec/v2.0.0.html).
+
+See [full documentation of `NLOHMANN_JSON_VERSION_MAJOR`, `NLOHMANN_JSON_VERSION_MINOR`, and `NLOHMANN_JSON_VERSION_PATCH`](../api/macros/nlohmann_json_version_major.md).
diff --git a/external_imported/json/doc/mkdocs/docs/features/merge_patch.md b/external_imported/json/docs/mkdocs/docs/features/merge_patch.md
similarity index 100%
rename from external_imported/json/doc/mkdocs/docs/features/merge_patch.md
rename to external_imported/json/docs/mkdocs/docs/features/merge_patch.md
diff --git a/external_imported/json/docs/mkdocs/docs/features/namespace.md b/external_imported/json/docs/mkdocs/docs/features/namespace.md
new file mode 100644
index 000000000..8cee2ccfe
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/features/namespace.md
@@ -0,0 +1,93 @@
+# `nlohmann` Namespace
+
+The 3.11.0 release introduced an
+[inline namespace](https://en.cppreference.com/w/cpp/language/namespace#Inline_namespaces) to allow different parts of
+a codebase to safely use different versions of the JSON library as long as they never exchange instances of library
+types.
+
+## Structure
+
+The complete default namespace name is derived as follows:
+
+- The root namespace is always `nlohmann`.
+- The inline namespace starts with `json_abi` and is followed by serveral optional ABI tags according to the value of
+  these ABI-affecting macros, in order:
+    - [`JSON_DIAGNOSTICS`](../api/macros/json_diagnostics.md) defined non-zero appends `_diag`.
+    - [`JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON`](../api/macros/json_use_legacy_discarded_value_comparison.md)
+      defined non-zero appends `_ldvcmp`.
+- The inline namespace ends with the suffix `_v` followed by the 3 components of the version number separated by
+  underscores. To omit the version component, see [Disabling the version component](#disabling-the-version-component)
+  below.
+
+For example, the namespace name for version 3.11.2 with `JSON_DIAGNOSTICS` defined to `1` is:
+
+```cpp
+nlohmann::json_abi_diag_v3_11_2
+```
+
+## Purpose
+
+Several incompatibilities have been observed. Amongst the most common ones is linking code compiled with different
+definitions of [`JSON_DIAGNOSTICS`](../api/macros/json_diagnostics.md). This is illustrated in the diagram below.
+
+```plantuml
+[**nlohmann_json (v3.10.5)**\nJSON_DIAGNOSTICS=0] as [json]
+[**nlohmann_json (v3.10.5)**\nJSON_DIAGNOSTICS=1] as [json_diag]
+[**some_library**] as [library]
+[**application**] as [app]
+
+[library] ..|> [json]
+[app] ..|> [json_diag]
+[app] ..|>[library]
+```
+
+In releases prior to 3.11.0, mixing any version of the JSON library with different `JSON_DIAGNOSTICS` settings would
+result in a crashing application. If `some_library` never passes instances of JSON library types to the application,
+this scenario became safe in version 3.11.0 and above due to the inline namespace yielding distinct symbol names.
+
+## Limitations
+
+Neither the compiler nor the linker will issue as much as a warning when translation units – intended to be linked
+together and that include different versions and/or configurations of the JSON library – exchange and use library
+types.
+
+There is an exception when forward declarations are used (i.e., when including `json_fwd.hpp`) in which case the linker
+may complain about undefined references.
+
+## Disabling the version component
+
+Different versions are not necessarily ABI-incompatible, but the project does not actively track changes in the ABI and
+recommends that all parts of a codebase exchanging library types be built with the same version. Users can, **at their
+own risk**, disable the version component of the linline namespace, allowing different versions – but not
+configurations – to be used in cases where the linker would otherwise output undefined reference errors.
+
+To do so, define [`NLOHMANN_JSON_NAMESPACE_NO_VERSION`](../api/macros/nlohmann_json_namespace_no_version.md) to `1`.
+
+This applies to version 3.11.2 and above only, versions 3.11.0 and 3.11.1 can apply the technique described in the next
+section to emulate the effect of the `NLOHMANN_JSON_NAMESPACE_NO_VERSION` macro.
+
+!!! danger "Use at your own risk"
+
+    Disabling the namespace version component and mixing ABI-incompatible versions will result in crashes or incorrect
+    behavior. You have been warned!
+## Disabling the inline namespace completely
+
+When interoperability with code using a pre-3.11.0 version of the library is required, users can, **at their own risk**
+restore the old namespace layout by redefining
+[`NLOHMANN_JSON_NAMESPACE_BEGIN, NLOHMANN_JSON_NAMESPACE_END`](../api/macros/nlohmann_json_namespace_begin.md) as
+follows:
+
+```cpp
+#define NLOHMANN_JSON_NAMESPACE_BEGIN  namespace nlohmann {
+#define NLOHMANN_JSON_NAMESPACE_END    }
+```
+
+!!! danger "Use at your own risk"
+
+    Overriding the namespace and mixing ABI-incompatible versions will result in crashes or incorrect behavior. You
+    have been warned!
+
+## Version history
+
+- Introduced inline namespace (`json_v3_11_0[_abi-tag]*`) in version 3.11.0.
+- Changed structure of inline namespace in version 3.11.2.
diff --git a/external_imported/json/docs/mkdocs/docs/features/object_order.md b/external_imported/json/docs/mkdocs/docs/features/object_order.md
new file mode 100644
index 000000000..3ee16a90e
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/features/object_order.md
@@ -0,0 +1,109 @@
+# Object Order
+
+The [JSON standard](https://tools.ietf.org/html/rfc8259.html) defines objects as "an unordered collection of zero or more name/value pairs". As such, an implementation does not need to preserve any specific order of object keys.
+
+## Default behavior: sort keys
+
+The default type `nlohmann::json` uses a `std::map` to store JSON objects, and thus stores object keys **sorted alphabetically**.
+
+??? example
+
+    ```cpp
+    #include <iostream>
+    #include "json.hpp"
+    
+    using json = nlohmann::json;
+    
+    int main()
+    {
+        json j;
+        j["one"] = 1;
+        j["two"] = 2;
+        j["three"] = 3;
+        
+        std::cout << j.dump(2) << '\n';
+    }
+    ```
+    
+    Output:
+
+    ```json
+    {
+      "one": 1,
+      "three": 3,
+      "two": 2
+    }
+    ```
+
+## Alternative behavior: preserve insertion order
+
+If you do want to preserve the **insertion order**, you can try the type [`nlohmann::ordered_json`](https://github.com/nlohmann/json/issues/2179).
+
+??? example
+
+    ```cpp
+    --8<-- "examples/ordered_json.cpp"
+    ```
+    
+    Output:
+    
+    ```json
+    --8<-- "examples/ordered_json.output"
+    ```
+
+Alternatively, you can use a more sophisticated ordered map like [`tsl::ordered_map`](https://github.com/Tessil/ordered-map) ([integration](https://github.com/nlohmann/json/issues/546#issuecomment-304447518)) or [`nlohmann::fifo_map`](https://github.com/nlohmann/fifo_map) ([integration](https://github.com/nlohmann/json/issues/485#issuecomment-333652309)).
+
+### Notes on parsing
+
+Note that you also need to call the right [`parse`](../api/basic_json/parse.md) function when reading from a file.
+Assume file `input.json` contains the JSON object above:
+
+```json
+{
+  "one": 1,
+  "two": 2,
+  "three": 3
+}
+```
+
+!!! success "Right way"
+
+    The following code correctly calls the `parse` function from `nlohmann::ordered_json`:
+
+    ```cpp
+    std::ifstream i("input.json");
+    auto j = nlohmann::ordered_json::parse(i);
+    std::cout << j.dump(2) << std::endl;
+    ```
+
+    The output will be:
+
+    ```json
+    {
+      "one": 1,
+      "two": 2,
+      "three": 3
+    }
+    ```
+
+??? failure "Wrong way"
+
+    The following code incorrectly calls the `parse` function from `nlohmann::json` which does not preserve the
+    insertion order, but sorts object keys. Assigning the result to `nlohmann::ordered_json` compiles, but does not
+    restore the order from the input file.
+
+    ```cpp
+    std::ifstream i("input.json");
+    nlohmann::ordered_json j = nlohmann::json::parse(i);
+    std::cout << j.dump(2) << std::endl;
+    ```
+
+    The output will be:
+
+    ```json
+    {
+      "one": 1,
+      "three": 3
+      "two": 2,
+    }
+    ```
diff --git a/external_imported/json/docs/mkdocs/docs/features/parsing/index.md b/external_imported/json/docs/mkdocs/docs/features/parsing/index.md
new file mode 100644
index 000000000..29493520e
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/features/parsing/index.md
@@ -0,0 +1,13 @@
+# Parsing
+
+!!! note
+
+    This page is under construction.
+
+## Input
+
+## SAX vs. DOM parsing
+
+## Exceptions
+
+See [parsing and exceptions](parse_exceptions.md).
diff --git a/external_imported/json/docs/mkdocs/docs/features/parsing/json_lines.md b/external_imported/json/docs/mkdocs/docs/features/parsing/json_lines.md
new file mode 100644
index 000000000..659d31792
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/features/parsing/json_lines.md
@@ -0,0 +1,49 @@
+# JSON Lines
+
+The [JSON Lines](https://jsonlines.org) format is a text format of newline-delimited JSON. In particular:
+
+1. The input must be UTF-8 encoded.
+2. Every line must be a valid JSON value.
+3. The line separator must be `\n`. As `\r` is silently ignored, `\r\n` is also supported.
+4. The final character may be `\n`, but is not required to be one.
+
+!!! example "JSON Text example"
+
+    ```json
+    {"name": "Gilbert", "wins": [["straight", "7♣"], ["one pair", "10♥"]]}
+    {"name": "Alexa", "wins": [["two pair", "4â™ "], ["two pair", "9â™ "]]}
+    {"name": "May", "wins": []}
+    {"name": "Deloise", "wins": [["three of a kind", "5♣"]]}
+    ```
+
+JSON Lines input with more than one value is treated as invalid JSON by the [`parse`](../../api/basic_json/parse.md) or
+[`accept`](../../api/basic_json/accept.md) functions. To process it line by line, functions like
+[`std::getline`](https://en.cppreference.com/w/cpp/string/basic_string/getline) can be used:
+
+!!! example "Example: Parse JSON Text input line by line"
+
+    The example below demonstrates how JSON Lines can be processed.
+
+    ```cpp
+    --8<-- "examples/json_lines.cpp"
+    ```
+    
+    Output:
+
+    ```json
+    --8<-- "examples/json_lines.output"
+    ```
+
+!!! warning "Note"
+
+    Using [`operator>>`](../../api/operator_gtgt.md) like
+    
+    ```cpp
+    json j;
+    while (input >> j)
+    {
+        std::cout << j << std::endl;
+    }
+    ```
+    
+    with a JSON Lines input does not work, because the parser will try to parse one value after the last one.
diff --git a/external_imported/json/doc/mkdocs/docs/features/parsing/parse_exceptions.md b/external_imported/json/docs/mkdocs/docs/features/parsing/parse_exceptions.md
similarity index 76%
rename from external_imported/json/doc/mkdocs/docs/features/parsing/parse_exceptions.md
rename to external_imported/json/docs/mkdocs/docs/features/parsing/parse_exceptions.md
index b882e0b5c..61c0ff290 100644
--- a/external_imported/json/doc/mkdocs/docs/features/parsing/parse_exceptions.md
+++ b/external_imported/json/docs/mkdocs/docs/features/parsing/parse_exceptions.md
@@ -1,6 +1,10 @@
-# Parsing and exceptions
+# Parsing and Exceptions
 
-When the input is not valid JSON, an exception of type [`parse_error`](../../home/exceptions.md#parse-errors) is thrown. This exception contains the position in the input where the error occurred, together with a diagnostic message and the last read input token. The exceptions page contains a [list of examples for parse error exceptions](../../home/exceptions.md#parse-errors). In case you process untrusted input, always enclose your code with a `#!cpp try`/`#!cpp catch` block, like
+When the input is not valid JSON, an exception of type [`parse_error`](../../home/exceptions.md#parse-errors) is thrown.
+This exception contains the position in the input where the error occurred, together with a diagnostic message and the
+last read input token. The exceptions page contains a
+[list of examples for parse error exceptions](../../home/exceptions.md#parse-errors). In case you process untrusted
+input, always enclose your code with a `#!cpp try`/`#!cpp catch` block, like
 
 ```cpp
 json j;
@@ -8,7 +12,7 @@ try
 {
     j = json::parse(my_input);
 }
-catch (json::exception::parse_error& ex)
+catch (json::parse_error& ex)
 {
     std::cerr << "parse error at byte " << ex.byte << std::endl;
 }
@@ -19,7 +23,9 @@ In case exceptions are undesired or not supported by the environment, there are
 
 ## Switch off exceptions
 
-The `parse()` function accepts as last parameter a `#!cpp bool` variable `allow_exceptions` which controls whether an exception is thrown when a parse error occurs (`#!cpp true`, default) or whether a discarded value should be returned (`#!cpp false`).
+The `parse()` function accepts a `#!cpp bool` parameter `allow_exceptions` which controls whether an exception is
+thrown when a parse error occurs (`#!cpp true`, default) or whether a discarded value should be returned
+(`#!cpp false`).
 
 ```cpp
 json j = json::parse(my_input, nullptr, false);
@@ -33,7 +39,8 @@ Note there is no diagnostic information available in this scenario.
 
 ## Use accept() function
 
-Alternatively, function `accept()` can be used which does not return a `json` value, but a `#!cpp bool` indicating whether the input is valid JSON.
+Alternatively, function `accept()` can be used which does not return a `json` value, but a `#!cpp bool` indicating
+whether the input is valid JSON.
 
 ```cpp
 if (!json::accept(my_input))
diff --git a/external_imported/json/docs/mkdocs/docs/features/parsing/parser_callbacks.md b/external_imported/json/docs/mkdocs/docs/features/parsing/parser_callbacks.md
new file mode 100644
index 000000000..ef076d126
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/features/parsing/parser_callbacks.md
@@ -0,0 +1,83 @@
+# Parser Callbacks
+
+## Overview
+
+With a parser callback function, the result of parsing a JSON text can be influenced. When passed to `parse`, it is
+called on certain events (passed as `parse_event_t` via parameter `event`) with a set recursion depth `depth` and
+context JSON value `parsed`. The return value of the callback function is a boolean indicating whether the element that
+emitted the callback shall be kept or not.
+
+The type of the callback function is:
+
+```cpp
+template<typename BasicJsonType>
+using parser_callback_t =
+    std::function<bool(int depth, parse_event_t event, BasicJsonType& parsed)>;
+```
+
+
+## Callback event types
+
+We distinguish six scenarios (determined by the event type) in which the callback function can be called. The following
+table describes the values of the parameters `depth`, `event`, and `parsed`.
+
+| parameter `event`             | description                                               | parameter `depth`                         | parameter `parsed`               |
+|-------------------------------|-----------------------------------------------------------|-------------------------------------------|----------------------------------|
+| `parse_event_t::object_start` | the parser read `{` and started to process a JSON object  | depth of the parent of the JSON object    | a JSON value with type discarded |
+| `parse_event_t::key`          | the parser read a key of a value in an object             | depth of the currently parsed JSON object | a JSON string containing the key |
+| `parse_event_t::object_end`   | the parser read `}` and finished processing a JSON object | depth of the parent of the JSON object    | the parsed JSON object           |
+| `parse_event_t::array_start`  | the parser read `[` and started to process a JSON array   | depth of the parent of the JSON array     | a JSON value with type discarded |
+| `parse_event_t::array_end`    | the parser read `]` and finished processing a JSON array  | depth of the parent of the JSON array     | the parsed JSON array            |
+| `parse_event_t::value`        | the parser finished reading a JSON value                  | depth of the value                        | the parsed JSON value            |
+
+??? example
+
+    When parsing the following JSON text,
+    
+    ```json
+    {
+        "name": "Berlin",
+        "location": [
+            52.519444,
+            13.406667
+        ]
+    }
+    ```
+    
+    these calls are made to the callback function:
+    
+    | event          | depth | parsed |
+    | -------------- | ----- | ------ |
+    | `object_start` | 0     | *discarded* |
+    | `key`          | 1     | `#!json "name"` |
+    | `value`        | 1     | `#!json "Berlin"` |
+    | `key`          | 1     | `#!json "location"` |
+    | `array_start`  | 1     | *discarded* |
+    | `value`        | 2     | `#!json 52.519444` |
+    | `value`        | 2     | `#!json 13.406667` |
+    | `array_end`    | 1     | `#!json [52.519444,13.406667]` |
+    | `object_end`   | 0     | `#!json {"location":[52.519444,13.406667],"name":"Berlin"}` |
+
+## Return value
+
+Discarding a value (i.e., returning `#!c false`) has different effects depending on the context in which the function
+was called:
+
+- Discarded values in structured types are skipped. That is, the parser will behave as if the discarded value was never
+  read.
+- In case a value outside a structured type is skipped, it is replaced with `#!json null`. This case happens if the
+  top-level element is skipped.
+
+??? example
+
+    The example below demonstrates the `parse()` function with and without callback function.
+
+    ```cpp
+    --8<-- "examples/parse__string__parser_callback_t.cpp"
+    ```
+    
+    Output:
+
+    ```json
+    --8<-- "examples/parse__string__parser_callback_t.output"
+    ```
diff --git a/external_imported/json/doc/mkdocs/docs/features/parsing/sax_interface.md b/external_imported/json/docs/mkdocs/docs/features/parsing/sax_interface.md
similarity index 95%
rename from external_imported/json/doc/mkdocs/docs/features/parsing/sax_interface.md
rename to external_imported/json/docs/mkdocs/docs/features/parsing/sax_interface.md
index 731534826..0796a55f5 100644
--- a/external_imported/json/doc/mkdocs/docs/features/parsing/sax_interface.md
+++ b/external_imported/json/docs/mkdocs/docs/features/parsing/sax_interface.md
@@ -66,3 +66,8 @@ To implement your own SAX handler, proceed as follows:
 3. Call `#!cpp bool json::sax_parse(input, &my_sax);` where the first parameter can be any input like a string or an input stream and the second parameter is a pointer to your SAX interface.
 
 Note the `sax_parse` function only returns a `#!cpp bool` indicating the result of the last executed SAX event. It does not return `json` value - it is up to you to decide what to do with the SAX events. Furthermore, no exceptions are thrown in case of a parse error - it is up to you what to do with the exception object passed to your `parse_error` implementation. Internally, the SAX interface is used for the DOM parser (class `json_sax_dom_parser`) as well as the acceptor (`json_sax_acceptor`), see file `json_sax.hpp`.
+
+## See also
+
+- [json_sax](../../api/json_sax/index.md) - documentation of the SAX interface
+- [sax_parse](../../api/basic_json/sax_parse.md) - SAX parser
diff --git a/external_imported/json/docs/mkdocs/docs/features/types/index.md b/external_imported/json/docs/mkdocs/docs/features/types/index.md
new file mode 100644
index 000000000..d9dfcc29a
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/features/types/index.md
@@ -0,0 +1,269 @@
+# Types
+
+This page gives an overview how JSON values are stored and how this can be configured.
+
+## Overview
+
+By default, JSON values are stored as follows:
+
+| JSON type | C++ type                                      |
+|-----------|-----------------------------------------------|
+| object    | `std::map<std::string, basic_json>`           |
+| array     | `std::vector<basic_json>`                     |
+| null      | `std::nullptr_t`                              |
+| string    | `std::string`                                 |
+| boolean   | `bool`                                        |
+| number    | `std::int64_t`, `std::uint64_t`, and `double` |
+
+Note there are three different types for numbers - when parsing JSON text, the best fitting type is chosen.
+
+## Storage
+
+```plantuml
+enum value_t {
+    null
+    object
+    array
+    string
+    boolean
+    number_integer
+    number_unsigned
+    number_float
+    binary
+    discarded
+}
+
+class json_value << (U,orchid) >> {
+    object_t* object
+    array_t* array
+    string_t* string
+    binary_t* binary
+    boolean_t boolean
+    number_integer_t number_integer
+    number_unsigned_t number_unsigned
+    number_float_t number_float
+}
+
+class basic_json {
+    -- type and value --
+    value_t m_type
+    json_value m_value
+    -- derived types --
+    + <u>typedef</u> object_t
+    + <u>typedef</u> array_t
+    + <u>typedef</u> binary_t
+    + <u>typedef</u> boolean_t
+    + <u>typedef</u> number_integer_t
+    + <u>typedef</u> number_unsigned_t
+    + <u>typedef</u> number_float_t
+}
+
+basic_json .. json_value
+basic_json .. value_t
+```
+
+## Template arguments
+
+The data types to store a JSON value are derived from the template arguments passed to class `basic_json`:
+
+```cpp
+template<
+    template<typename U, typename V, typename... Args> class ObjectType = std::map,
+    template<typename U, typename... Args> class ArrayType = std::vector,
+    class StringType = std::string,
+    class BooleanType = bool,
+    class NumberIntegerType = std::int64_t,
+    class NumberUnsignedType = std::uint64_t,
+    class NumberFloatType = double,
+    template<typename U> class AllocatorType = std::allocator,
+    template<typename T, typename SFINAE = void> class JSONSerializer = adl_serializer,
+    class BinaryType = std::vector<std::uint8_t>
+>
+class basic_json;
+```
+
+Type `json` is an alias for `basic_json<>` and uses the default types.
+
+From the template arguments, the following types are derived:
+
+```cpp
+using object_comparator_t = std::less<>;
+using object_t = ObjectType<StringType, basic_json, object_comparator_t,
+                   AllocatorType<std::pair<const StringType, basic_json>>>;
+
+using array_t = ArrayType<basic_json, AllocatorType<basic_json>>;
+
+using string_t = StringType;
+
+using boolean_t = BooleanType;
+
+using number_integer_t = NumberIntegerType;
+using number_unsigned_t = NumberUnsignedType;
+using number_float_t = NumberFloatType;
+
+using binary_t = nlohmann::byte_container_with_subtype<BinaryType>;
+```
+
+
+## Objects
+
+[RFC 8259](https://tools.ietf.org/html/rfc8259) describes JSON objects as follows:
+
+> An object is an unordered collection of zero or more name/value pairs, where a name is a string and a value is a string, number, boolean, null, object, or array.
+
+### Default type
+
+With the default values for *ObjectType* (`std::map`), *StringType* (`std::string`), and *AllocatorType* (`std::allocator`), the default value for `object_t` is:
+
+```cpp
+std::map<
+  std::string, // key_type
+  basic_json, // value_type
+  std::less<>, // key_compare
+  std::allocator<std::pair<const std::string, basic_json>> // allocator_type
+>
+```
+
+### Behavior
+
+The choice of `object_t` influences the behavior of the JSON class. With the default type, objects have the following behavior:
+
+- When all names are unique, objects will be interoperable in the sense that all software implementations receiving that object will agree on the name-value mappings.
+- When the names within an object are not unique, it is unspecified which one of the values for a given key will be chosen. For instance, `#!json {"key": 2, "key": 1}` could be equal to either `#!json {"key": 1}` or `#!json {"key": 2}`.
+- Internally, name/value pairs are stored in lexicographical order of the names. Objects will also be serialized (see `dump`) in this order. For instance, both `#!json {"b": 1, "a": 2}` and `#!json {"a": 2, "b": 1}` will be stored and serialized as `#!json {"a": 2, "b": 1}`.
+- When comparing objects, the order of the name/value pairs is irrelevant. This makes objects interoperable in the sense that they will not be affected by these differences. For instance, `#!json {"b": 1, "a": 2}` and `#!json {"a": 2, "b": 1}` will be treated as equal.
+
+### Key order
+
+The order name/value pairs are added to the object is *not* preserved by the library. Therefore, iterating an object may return name/value pairs in a different order than they were originally stored. In fact, keys will be traversed in alphabetical order as `std::map` with `std::less` is used by default. Please note this behavior conforms to [RFC 8259](https://tools.ietf.org/html/rfc8259), because any order implements the specified "unordered" nature of JSON objects.
+
+### Limits
+
+[RFC 8259](https://tools.ietf.org/html/rfc8259) specifies:
+
+> An implementation may set limits on the maximum depth of nesting.
+
+In this class, the object's limit of nesting is not explicitly constrained. However, a maximum depth of nesting may be introduced by the compiler or runtime environment. A theoretical limit can be queried by calling the `max_size` function of a JSON object.
+
+### Storage
+
+Objects are stored as pointers in a `basic_json` type. That is, for any access to object values, a pointer of type `object_t*` must be dereferenced.
+
+
+## Arrays
+
+[RFC 8259](https://tools.ietf.org/html/rfc8259) describes JSON arrays as follows:
+
+> An array is an ordered sequence of zero or more values.
+
+### Default type
+
+With the default values for *ArrayType* (`std::vector`) and *AllocatorType* (`std::allocator`), the default value for `array_t` is:
+
+```cpp
+std::vector<
+  basic_json, // value_type
+  std::allocator<basic_json> // allocator_type
+>
+```
+
+### Limits
+
+[RFC 8259](https://tools.ietf.org/html/rfc8259) specifies:
+
+> An implementation may set limits on the maximum depth of nesting.
+
+In this class, the array's limit of nesting is not explicitly constrained. However, a maximum depth of nesting may be introduced by the compiler or runtime environment. A theoretical limit can be queried by calling the `max_size` function of a JSON array.
+
+### Storage
+
+Arrays are stored as pointers in a `basic_json` type. That is, for any access to array values, a pointer of type `array_t*` must be dereferenced.
+
+
+## Strings
+
+[RFC 8259](https://tools.ietf.org/html/rfc8259) describes JSON strings as follows:
+
+> A string is a sequence of zero or more Unicode characters.
+
+Unicode values are split by the JSON class into byte-sized characters during deserialization.
+
+### Default type
+
+With the default values for *StringType* (`std::string`), the default value for `string_t` is `#!cpp std::string`.
+
+### Encoding
+
+Strings are stored in UTF-8 encoding. Therefore, functions like `std::string::size()` or `std::string::length()` return the number of **bytes** in the string rather than the number of characters or glyphs.
+
+### String comparison
+
+[RFC 8259](https://tools.ietf.org/html/rfc8259) states:
+
+> Software implementations are typically required to test names of object members for equality. Implementations that transform the textual representation into sequences of Unicode code units and then perform the comparison numerically, code unit by code unit, are interoperable in the sense that implementations will agree in all cases on equality or inequality of two strings. For example, implementations that compare strings with escaped characters unconverted may incorrectly find that `"a\\b"` and `"a\u005Cb"` are not equal.
+
+This implementation is interoperable as it does compare strings code unit by code unit.
+
+### Storage
+
+String values are stored as pointers in a `basic_json` type. That is, for any access to string values, a pointer of type `string_t*` must be dereferenced.
+
+
+## Booleans
+
+[RFC 8259](https://tools.ietf.org/html/rfc8259) implicitly describes a boolean as a type which differentiates the two literals `true` and `false`.
+
+### Default type
+
+With the default values for *BooleanType* (`#!cpp bool`), the default value for `boolean_t` is `#!cpp bool`.
+
+### Storage
+
+Boolean values are stored directly inside a `basic_json` type.
+
+## Numbers
+
+See the [number handling](number_handling.md) article for a detailed discussion on how numbers are handled by this library.
+
+[RFC 8259](https://tools.ietf.org/html/rfc8259) describes numbers as follows:
+
+> The representation of numbers is similar to that used in most programming languages. A number is represented in base 10 using decimal digits. It contains an integer component that may be prefixed with an optional minus sign, which may be followed by a fraction part and/or an exponent part. Leading zeros are not allowed. (...) Numeric values that cannot be represented in the grammar below (such as Infinity and NaN) are not permitted.
+
+This description includes both integer and floating-point numbers. However, C++ allows more precise storage if it is known whether the number is a signed integer, an unsigned integer or a floating-point number. Therefore, three different types, `number_integer_t`, `number_unsigned_t`, and `number_float_t` are used.
+
+### Default types
+
+With the default values for *NumberIntegerType* (`std::int64_t`), the default value for `number_integer_t` is `std::int64_t`.
+With the default values for *NumberUnsignedType* (`std::uint64_t`), the default value for `number_unsigned_t` is `std::uint64_t`.
+With the default values for *NumberFloatType* (`#!cpp double`), the default value for `number_float_t` is `#!cpp double`.
+
+### Default behavior
+
+- The restrictions about leading zeros is not enforced in C++. Instead, leading zeros in integer literals lead to an interpretation as octal number. Internally, the value will be stored as decimal number. For instance, the C++ integer literal `#!c 010` will be serialized to `#!c 8`. During deserialization, leading zeros yield an error.
+- Not-a-number (NaN) values will be serialized to `#!json null`.
+
+### Limits
+
+[RFC 8259](https://tools.ietf.org/html/rfc8259) specifies:
+
+> An implementation may set limits on the range and precision of numbers.
+
+When the default type is used, the maximal integer number that can be stored is `#!c 9223372036854775807` (`INT64_MAX`) and the minimal integer number that can be stored is `#!c -9223372036854775808` (`INT64_MIN`). Integer numbers that are out of range will yield over/underflow when used in a constructor. During deserialization, too large or small integer numbers will be automatically be stored as `number_unsigned_t` or `number_float_t`.
+
+When the default type is used, the maximal unsigned integer number that can be stored is `#!c 18446744073709551615` (`UINT64_MAX`) and the minimal integer number that can be stored is `#!c 0`. Integer numbers that are out of range will yield over/underflow when used in a constructor. During deserialization, too large or small integer numbers will be automatically be stored as `number_integer_t` or `number_float_t`.
+
+[RFC 8259](https://tools.ietf.org/html/rfc8259) further states:
+
+> Note that when such software is used, numbers that are integers and are in the range $[-2^{53}+1, 2^{53}-1]$ are interoperable in the sense that implementations will agree exactly on their numeric values.
+
+As this range is a subrange of the exactly supported range [`INT64_MIN`, `INT64_MAX`], this class's integer type is interoperable.
+
+[RFC 8259](https://tools.ietf.org/html/rfc8259) states:
+
+> This specification allows implementations to set limits on the range and precision of numbers accepted. Since software that implements IEEE 754-2008 binary64 (double precision) numbers is generally available and widely used, good interoperability can be achieved by implementations that expect no more precision or range than these provide, in the sense that implementations will approximate JSON numbers within the expected precision.
+
+This implementation does exactly follow this approach, as it uses double precision floating-point numbers. Note values smaller than `#!c -1.79769313486232e+308` and values greater than `#!c 1.79769313486232e+308` will be stored as NaN internally and be serialized to `#!json null`.
+
+### Storage
+
+Integer number values, unsigned integer number values, and floating-point number values are stored directly inside a `basic_json` type.
diff --git a/external_imported/json/docs/mkdocs/docs/features/types/number_handling.md b/external_imported/json/docs/mkdocs/docs/features/types/number_handling.md
new file mode 100644
index 000000000..3dcca76a4
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/features/types/number_handling.md
@@ -0,0 +1,328 @@
+# Number Handling
+
+This document describes how the library is handling numbers.
+
+## Background
+
+This section briefly summarizes how the JSON specification describes how numbers should be handled.
+
+### JSON number syntax
+
+JSON defines the syntax of numbers as follows:
+
+!!! quote "[RFC 8259](https://tools.ietf.org/html/rfc8259#section-6), Section 6"
+
+    The representation of numbers is similar to that used in most
+    programming languages.  A number is represented in base 10 using
+    decimal digits.  It contains an integer component that may be
+    prefixed with an optional minus sign, which may be followed by a
+    fraction part and/or an exponent part.  Leading zeros are not
+    allowed.
+
+    A fraction part is a decimal point followed by one or more digits.
+    
+    An exponent part begins with the letter E in uppercase or lowercase,
+    which may be followed by a plus or minus sign.  The E and optional
+    sign are followed by one or more digits.
+
+The following railroad diagram from [json.org](https://json.org) visualizes the number syntax:
+
+![Syntax for JSON numbers](../../images/json_syntax_number.png)
+
+### Number interoperability
+
+On number interoperability, the following remarks are made:
+
+!!! quote "[RFC 8259](https://tools.ietf.org/html/rfc8259#section-6), Section 6"
+
+    This specification allows implementations to set limits on the range
+    and precision of numbers accepted.  Since software that implements
+    IEEE 754 binary64 (double precision) numbers [IEEE754] is generally
+    available and widely used, good interoperability can be achieved by
+    implementations that expect no more precision or range than these
+    provide, in the sense that implementations will approximate JSON
+    numbers within the expected precision.  A JSON number such as 1E400
+    or 3.141592653589793238462643383279 may indicate potential
+    interoperability problems, since it suggests that the software that
+    created it expects receiving software to have greater capabilities
+    for numeric magnitude and precision than is widely available.
+    
+    Note that when such software is used, numbers that are integers and
+    are in the range $[-2^{53}+1, 2^{53}-1]$ are interoperable in the
+    sense that implementations will agree exactly on their numeric
+    values.
+
+## Library implementation
+
+This section describes how the above number specification is implemented by this library.
+
+### Number storage
+
+In the default [`json`](../../api/json.md) type, numbers are stored as `#!c std::uint64_t`, `#!c std::int64_t`, and
+`#!c double`,  respectively. Thereby, `#!c std::uint64_t` and `#!c std::int64_t` are used only if they can store the 
+number without loss of  precision. If this is impossible (e.g., if the number is too large), the number is stored as
+`#!c double`.
+
+!!! info "Notes"
+
+    - Numbers with a decimal digit or scientific notation are always stored as `#!c double`.
+    - The number types can be changed, see [Template number types](#template-number-types). 
+    - As of version 3.9.1, the conversion is realized by
+      [`std::strtoull`](https://en.cppreference.com/w/cpp/string/byte/strtoul),
+      [`std::strtoll`](https://en.cppreference.com/w/cpp/string/byte/strtol), and
+      [`std::strtod`](https://en.cppreference.com/w/cpp/string/byte/strtof), respectively.
+
+!!! example "Examples"
+
+    - Integer `#!c -12345678912345789123456789` is smaller than `#!c INT64_MIN` and will be stored as floating-point
+      number `#!c -1.2345678912345788e+25`.
+    - Integer `#!c 1E3` will be stored as floating-point number `#!c 1000.0`.
+
+### Number limits
+
+- Any 64-bit signed or unsigned integer can be stored without loss of precision.
+- Numbers exceeding the limits of `#!c double` (i.e., numbers that after conversion via
+[`std::strtod`](https://en.cppreference.com/w/cpp/string/byte/strtof) are not satisfying
+[`std::isfinite`](https://en.cppreference.com/w/cpp/numeric/math/isfinite) such as `#!c 1E400`) will throw exception
+[`json.exception.out_of_range.406`](../../home/exceptions.md#jsonexceptionout_of_range406) during parsing.
+- Floating-point numbers are rounded to the next number representable as `double`. For instance
+`#!c 3.141592653589793238462643383279` is stored as [`0x400921fb54442d18`](https://float.exposed/0x400921fb54442d18).
+This is the same behavior as the code `#!c double x = 3.141592653589793238462643383279;`.
+
+!!! success "Interoperability"
+
+    - The library interoperable with respect to the specification, because its supported range $[-2^{63}, 2^{64}-1]$ is
+      larger than the described range $[-2^{53}+1, 2^{53}-1]$.
+    - All integers outside the range $[-2^{63}, 2^{64}-1]$, as well as floating-point numbers are stored as `double`.
+      This also concurs with the specification above.
+
+### Zeros
+
+The JSON number grammar allows for different ways to express zero, and this library will store zeros differently:
+
+| Literal | Stored value and type  | Serialization |
+|---------|------------------------|---------------|
+| `0`     | `#!c std::uint64_t(0)` | `0`           |
+| `-0`    | `#!c std::int64_t(0)`  | `0`           |
+| `0.0`   | `#!c double(0.0)`      | `0.0`         |
+| `-0.0`  | `#!c double(-0.0)`     | `-0.0`        |
+| `0E0`   | `#!c double(0.0)`      | `0.0`         |
+| `-0E0`  | `#!c double(-0.0)`     | `-0.0`        |
+
+That is, `-0` is stored as a signed integer, but the serialization does not reproduce the `-`.
+
+### Number serialization
+
+- Integer numbers are serialized as is; that is, no scientific notation is used.
+- Floating-point numbers are serialized as specified by the `#!c %g` printf modifier with 
+  [`std::numeric_limits<double>::max_digits10`](https://en.cppreference.com/w/cpp/types/numeric_limits/max_digits10)
+  significant digits. The rationale is to use the shortest representation while still allow round-tripping.
+
+!!! hint "Notes regarding precision of floating-point numbers"
+
+    As described above, floating-point numbers are rounded to the nearest double and serialized with the shortest
+    representation to allow round-tripping. This can yield confusing examples:
+
+    - The serialization can have fewer decimal places than the input: `#!c 2555.5599999999999` will be serialized as
+      `#!c 2555.56`. The reverse can also be true.
+    - The serialization can be in scientific notation even if the input is not: `#!c 0.0000972439793401814` will be 
+      serialized as `#!c 9.72439793401814e-05`. The reverse can also be true: `#!c 12345E-5` will be serialized as
+      `#!c 0.12345`.
+    - Conversions from `#!c float` to `#!c double` can also introduce rounding errors:
+        ```cpp
+        float f = 0.3;
+        json j = f;
+        std::cout << j << '\n';
+        ```
+        yields `#!c 0.30000001192092896`.
+
+    All examples here can be reproduced by passing the original double value to
+
+    ```cpp
+    std::printf("%.*g\n", std::numeric_limits<double>::max_digits10, double_value);
+    ```
+
+#### NaN handling
+
+NaN (not-a-number) cannot be expressed with the number syntax described above and are in fact explicitly excluded:
+
+!!! quote "[RFC 8259](https://tools.ietf.org/html/rfc8259#section-6), Section 6"
+
+    Numeric values that cannot be represented in the grammar below (such
+    as Infinity and NaN) are not permitted.
+
+That is, there is no way to *parse* a NaN value. However, NaN values can be stored in a JSON value by assignment.
+
+This library serializes NaN values  as `#!js null`. This corresponds to the behavior of JavaScript's
+[`JSON.stringify`](https://www.w3schools.com/js/js_json_stringify.asp) function.
+
+!!! example
+
+    The following example shows how a NaN value is stored in a `json` value.
+
+    ```cpp
+    int main()
+    {
+        double val = std::numeric_limits<double>::quiet_NaN();
+        std::cout << "val=" << val << std::endl;
+        json j = val;
+        std::cout << "j=" << j.dump() << std::endl;
+        val = j;
+        std::cout << "val=" << val << std::endl;
+    }
+    ```
+    
+    output:
+    
+    ```
+    val=nan
+    j=null
+    val=nan
+    ```
+
+### Number comparison
+
+Floating-point inside JSON values numbers are compared with `#!c json::number_float_t::operator==` which is
+`#!c double::operator==` by default.
+
+!!! example "Alternative comparison functions"
+
+    To compare floating-point while respecting an epsilon, an alternative
+    [comparison function](https://github.com/mariokonrad/marnav/blob/master/include/marnav/math/floatingpoint.hpp#L34-#L39)
+    could be used, for instance
+    
+    ```cpp
+    template<typename T, typename = typename std::enable_if<std::is_floating_point<T>::value, T>::type>
+    inline bool is_same(T a, T b, T epsilon = std::numeric_limits<T>::epsilon()) noexcept
+    {
+        return std::abs(a - b) <= epsilon;
+    }
+    ```
+    Or you can self-define an operator equal function like this:
+    
+    ```cpp
+    bool my_equal(const_reference lhs, const_reference rhs)
+    {
+        const auto lhs_type lhs.type();
+        const auto rhs_type rhs.type();
+        if (lhs_type == rhs_type)
+        {
+            switch(lhs_type)
+            {
+                // self_defined case
+                case value_t::number_float:
+                    return std::abs(lhs - rhs) <= std::numeric_limits<float>::epsilon();
+        
+                // other cases remain the same with the original
+                ...
+            }
+        }
+        ...
+    }
+    ```
+    
+    (see [#703](https://github.com/nlohmann/json/issues/703) for more information.)
+    
+!!! note
+
+    NaN values never compare equal to themselves or to other NaN values. See [#514](https://github.com/nlohmann/json/issues/514).
+
+### Number conversion
+
+Just like the C++ language itself, the `get` family of functions allows conversions between unsigned and signed
+integers, and  between integers and floating-point values to integers. This behavior may be surprising.
+
+!!! warning "Unconditional number conversions"
+
+    ```cpp hl_lines="3"
+    double d = 42.3;                                   // non-integer double value 42.3
+    json jd = d;                                       // stores double value 42.3
+    std::int64_t i = jd.template get<std::int64_t>();  // now i==42; no warning or error is produced
+    ```
+
+    Note the last line with throw a [`json.exception.type_error.302`](../../home/exceptions.md#jsonexceptiontype_error302)
+    exception if `jd` is not a numerical type, for instance a string.
+
+The rationale is twofold:
+
+1. JSON does not define a number type or precision (see above).
+2. C++ also allows to silently convert between number types.
+
+!!! success "Conditional number conversion"
+
+    The code above can be solved by explicitly checking the nature of the value with members such as
+    [`is_number_integer()`](../../api/basic_json/is_number_integer.md) or
+    [`is_number_unsigned()`](../../api/basic_json/is_number_unsigned.md):
+
+    ```cpp hl_lines="2"
+    // check if jd is really integer-valued
+    if (jd.is_number_integer())
+    {
+        // if so, do the conversion and use i
+        std::int64_t i = jd.template get<std::int64_t>();
+        // ...
+    }
+    else
+    {
+        // otherwise, take appropriate action
+        // ...
+    }
+    ```
+
+    Note this approach also has the advantage that it can react on non-numerical JSON value types such as strings.
+
+    (Example taken from [#777](https://github.com/nlohmann/json/issues/777#issuecomment-459968458).)
+
+### Determine number types
+
+As the example in [Number conversion](#number-conversion) shows, there are different functions to determine the type of
+the stored number:
+
+- [`is_number()`](../../api/basic_json/is_number.md) returns `#!c true` for any number type
+- [`is_number_integer()`](../../api/basic_json/is_number_integer.md) returns `#!c true` for signed and unsigned integers
+- [`is_number_unsigned()`](../../api/basic_json/is_number_unsigned.md) returns `#!c true` for unsigned integers only
+- [`is_number_float()`](../../api/basic_json/is_number_float.md) returns `#!c true` for floating-point numbers
+- [`type_name()`](../../api/basic_json/type_name.md) returns `#!c "number"` for any number type
+- [`type()`](../../api/basic_json/type.md) returns a different enumerator of
+  [`value_t`](../../api/basic_json/value_t.md) for all number types
+
+| function                                                             | unsigned integer  | signed integer   | floating-point | string         |
+|----------------------------------------------------------------------|-------------------|------------------|----------------|----------------|
+| [`is_number()`](../../api/basic_json/is_number.md)                   | `#!c true`        | `#!c true`       | `#!c true`     | `#!c false`    |
+| [`is_number_integer()`](../../api/basic_json/is_number_integer.md)   | `#!c true`        | `#!c true`       | `#!c false`    | `#!c false`    |
+| [`is_number_unsigned()`](../../api/basic_json/is_number_unsigned.md) | `#!c true`        | `#!c false`      | `#!c false`    | `#!c false`    |
+| [`is_number_float()`](../../api/basic_json/is_number_float.md)       | `#!c false`       | `#!c false`      | `#!c true`     | `#!c false`    |
+| [`type_name()`](../../api/basic_json/type_name.md)                   | `#!c "number"`    | `#!c "number"`   | `#!c "number"` | `#!c "string"` |
+| [`type()`](../../api/basic_json/type.md)                             | `number_unsigned` | `number_integer` | `number_float` | `string`       |
+
+### Template number types
+
+The number types can be changed with template parameters.
+
+| position | number type       | default type        | possible values                                |
+|----------|-------------------|---------------------|------------------------------------------------|
+| 5        | signed integers   | `#!c std::int64_t`  | `#!c std::int32_t`, `#!c std::int16_t`, etc.   |
+| 6        | unsigned integers | `#!c std::uint64_t` | `#!c std::uint32_t`, `#!c std::uint16_t`, etc. |
+| 7        | floating-point    | `#!c double`        | `#!c float`, `#!c long double`                 |
+
+!!! info "Constraints on number types"
+
+    - The type for signed integers must be convertible from `#!c long long`. The type for floating-point numbers is used
+      in case of overflow.
+    - The type for unsigned integers must be convertible from `#!c unsigned long long`.  The type for floating-point
+      numbers is used in case of overflow.
+    - The types for signed and unsigned integers must be distinct, see
+      [#2573](https://github.com/nlohmann/json/issues/2573).
+    - Only `#!c double`, `#!c float`, and `#!c long double` are supported for floating-point numbers.
+
+!!! example
+
+    A `basic_json` type that uses `#!c long double` as floating-point type.
+
+    ```cpp hl_lines="2"
+    using json_ld = nlohmann::basic_json<std::map, std::vector, std::string, bool,
+                                         std::int64_t, std::uint64_t, long double>;
+    ```
+
+    Note values should then be parsed with `json_ld::parse` rather than `json::parse` as the latter would parse
+    floating-point values to `#!c double` before then converting them to `#!c long double`.
diff --git a/external_imported/json/doc/mkdocs/docs/home/code_of_conduct.md b/external_imported/json/docs/mkdocs/docs/home/code_of_conduct.md
similarity index 100%
rename from external_imported/json/doc/mkdocs/docs/home/code_of_conduct.md
rename to external_imported/json/docs/mkdocs/docs/home/code_of_conduct.md
diff --git a/external_imported/json/doc/mkdocs/docs/home/design_goals.md b/external_imported/json/docs/mkdocs/docs/home/design_goals.md
similarity index 97%
rename from external_imported/json/doc/mkdocs/docs/home/design_goals.md
rename to external_imported/json/docs/mkdocs/docs/home/design_goals.md
index 91b387528..b80551fe9 100644
--- a/external_imported/json/doc/mkdocs/docs/home/design_goals.md
+++ b/external_imported/json/docs/mkdocs/docs/home/design_goals.md
@@ -2,7 +2,7 @@
 
 There are myriads of [JSON](https://json.org) libraries out there, and each may even have its reason to exist. Our class had these design goals:
 
-- **Intuitive syntax**. In languages such as Python, JSON feels like a first class data type. We used all the operator magic of modern C++ to achieve the same feeling in your code. Check out the [examples below](#examples) and you'll know what I mean.
+- **Intuitive syntax**. In languages such as Python, JSON feels like a first class data type. We used all the operator magic of modern C++ to achieve the same feeling in your code. Check out the [examples below](#examples), and you'll know what I mean.
 
 - **Trivial integration**. Our whole code consists of a single header file [`json.hpp`](https://github.com/nlohmann/json/blob/develop/single_include/nlohmann/json.hpp). That's it. No library, no subproject, no dependencies, no complex build system. The class is written in vanilla C++11. All in all, everything should require no adjustment of your compiler flags or project settings.
 
diff --git a/external_imported/json/doc/mkdocs/docs/home/exceptions.md b/external_imported/json/docs/mkdocs/docs/home/exceptions.md
similarity index 88%
rename from external_imported/json/doc/mkdocs/docs/home/exceptions.md
rename to external_imported/json/docs/mkdocs/docs/home/exceptions.md
index da68f2149..a0fee9e33 100644
--- a/external_imported/json/doc/mkdocs/docs/home/exceptions.md
+++ b/external_imported/json/docs/mkdocs/docs/home/exceptions.md
@@ -28,9 +28,9 @@ class json::parse_error {
 
 ### Switch off exceptions
 
-Exceptions are used widely within the library. They can, however, be switched off with either using the compiler flag `-fno-exceptions` or by defining the symbol `JSON_NOEXCEPTION`. In this case, exceptions are replaced by `abort()` calls. You can further control this behavior by defining `JSON_THROW_USER` (overriding `#!cpp throw`), `JSON_TRY_USER` (overriding `#!cpp try`), and `JSON_CATCH_USER` (overriding `#!cpp catch`).
+Exceptions are used widely within the library. They can, however, be switched off with either using the compiler flag `-fno-exceptions` or by defining the symbol [`JSON_NOEXCEPTION`](../api/macros/json_noexception.md). In this case, exceptions are replaced by `abort()` calls. You can further control this behavior by defining `JSON_THROW_USER` (overriding `#!cpp throw`), `JSON_TRY_USER` (overriding `#!cpp try`), and `JSON_CATCH_USER` (overriding `#!cpp catch`).
 
-Note that `JSON_THROW_USER` should leave the current scope (e.g., by throwing or aborting), as continuing after it may yield undefined behavior.
+Note that [`JSON_THROW_USER`](../api/macros/json_throw_user.md) should leave the current scope (e.g., by throwing or aborting), as continuing after it may yield undefined behavior.
 
 ??? example
 
@@ -50,6 +50,10 @@ Note that `JSON_THROW_USER` should leave the current scope (e.g., by throwing or
     #include <nlohmann/json.hpp>
     ```
 
+Note the explanatory [`what()`](https://en.cppreference.com/w/cpp/error/exception/what) string of exceptions is not available for MSVC if exceptions are disabled, see [#2824](https://github.com/nlohmann/json/discussions/2824).
+
+See [documentation of `JSON_TRY_USER`, `JSON_CATCH_USER` and `JSON_THROW_USER`](../api/macros/json_throw_user.md) for more information.
+
 ### Extended diagnostic messages
 
 Exceptions in the library are thrown in the local context of the JSON value they are detected. This makes detailed diagnostics messages, and hence debugging, difficult.
@@ -70,7 +74,7 @@ Exceptions in the library are thrown in the local context of the JSON value they
 
 To create better diagnostics messages, each JSON value needs a pointer to its parent value such that a global context (i.e., a path from the root value to the value that lead to the exception) can be created. That global context is provided as [JSON Pointer](../features/json_pointer.md).
 
-As this global context comes at the price of storing one additional pointer per JSON value and runtime overhead to maintain the parent relation, extended diagnostics are disabled by default. They can, however, be enabled by defining the preprocessor symbol [`JSON_DIAGNOSTICS`](../features/macros.md#json_diagnostics) to `1` before including `json.hpp`.
+As this global context comes at the price of storing one additional pointer per JSON value and runtime overhead to maintain the parent relation, extended diagnostics are disabled by default. They can, however, be enabled by defining the preprocessor symbol [`JSON_DIAGNOSTICS`](../api/macros/json_diagnostics.md) to `1` before including `json.hpp`.
 
 ??? example
 
@@ -86,6 +90,7 @@ As this global context comes at the price of storing one additional pointer per
 
     Now the exception message contains a JSON Pointer `/address/housenumber` that indicates which value has the wrong type.
 
+See [documentation of `JSON_DIAGNOSTICS`](../api/macros/json_diagnostics.md) for more information.
 
 ## Parse errors
 
@@ -134,7 +139,7 @@ This error indicates a syntax error while deserializing a JSON text. The error m
     No input:
 
     ```
-    [json.exception.parse_error.101] parse error at line 1, column 1: syntax error while parsing value - unexpected end of input; expected '[', '{', or a literal
+    [json.exception.parse_error.101] parse error at line 1, column 1: attempting to parse an empty input; check that your input string or stream contains the expected JSON
     ```
 
     Control character was not escaped:
@@ -175,12 +180,12 @@ This error indicates a syntax error while deserializing a JSON text. The error m
 
 !!! tip
 
-    - Make sure the input is correctly read. Try to write the input to standard output to check if, for instance, the input file was successfully openened.
+    - Make sure the input is correctly read. Try to write the input to standard output to check if, for instance, the input file was successfully opened.
     - Paste the input to a JSON validator like <http://jsonlint.com> or a tool like [jq](https://stedolan.github.io/jq/).
 
 ### json.exception.parse_error.102
 
-JSON uses the `\uxxxx` format to describe Unicode characters. Code points above above 0xFFFF are split into two `\uxxxx` entries ("surrogate pairs"). This error indicates that the surrogate pair is incomplete or contains an invalid code point.
+JSON uses the `\uxxxx` format to describe Unicode characters. Code points above 0xFFFF are split into two `\uxxxx` entries ("surrogate pairs"). This error indicates that the surrogate pair is incomplete or contains an invalid code point.
 
 !!! failure "Example message"
 
@@ -188,6 +193,10 @@ JSON uses the `\uxxxx` format to describe Unicode characters. Code points above
     parse error at 14: missing or wrong low surrogate
     ```
 
+!!! note
+
+    This exception is not used any more. Instead [json.exception.parse_error.101](#jsonexceptionparse_error101) with a more detailed description is used.
+
 ### json.exception.parse_error.103
 
 Unicode supports code points up to 0x10FFFF. Code points above 0x10FFFF are invalid.
@@ -198,6 +207,10 @@ Unicode supports code points up to 0x10FFFF. Code points above 0x10FFFF are inva
     parse error: code points above 0x10FFFF are invalid
     ```
 
+!!! note
+
+    This exception is not used any more. Instead [json.exception.parse_error.101](#jsonexceptionparse_error101) with a more detailed description is used.
+
 ### json.exception.parse_error.104
 
 [RFC 6902](https://tools.ietf.org/html/rfc6902) requires a JSON Patch document to be a JSON document that represents an array of objects.
@@ -258,7 +271,7 @@ In a JSON Pointer, only `~0` and `~1` are valid escape sequences.
 
 A JSON Pointer array index must be a number.
 
-!!! failure "Example message"
+!!! failure "Example messages"
 
     ```
     [json.exception.parse_error.109] parse error: array index 'one' is not a number
@@ -282,19 +295,34 @@ When parsing CBOR or MessagePack, the byte vector ends before the complete value
 
 ### json.exception.parse_error.112
 
-Not all types of CBOR or MessagePack are supported. This exception occurs if an unsupported byte was read.
+An unexpected byte was read in a [binary format](../features/binary_formats/index.md) or length information is invalid ([BSON](../features/binary_formats/bson.md)).
 
-!!! failure "Example message"
+!!! failure "Example messages"
 
     ```
     [json.exception.parse_error.112] parse error at byte 1: syntax error while parsing CBOR value: invalid byte: 0x1C
     ```
+    ```
+    [json.exception.parse_error.112] parse error at byte 1: syntax error while parsing MessagePack value: invalid byte: 0xC1
+    ```
+    ```
+    [json.exception.parse_error.112] parse error at byte 4: syntax error while parsing BJData size: expected '#' after type information; last byte: 0x02
+    ```
+    ```
+    [json.exception.parse_error.112] parse error at byte 4: syntax error while parsing UBJSON size: expected '#' after type information; last byte: 0x02
+    ```
+    ```
+    [json.exception.parse_error.112] parse error at byte 10: syntax error while parsing BSON string: string length must be at least 1, is -2147483648
+    ```
+    ```
+    [json.exception.parse_error.112] parse error at byte 15: syntax error while parsing BSON binary: byte array length cannot be negative, is -1
+    ```
 
 ### json.exception.parse_error.113
 
 While parsing a map key, a value that is not a string has been read.
 
-!!! failure "Example message"
+!!! failure "Example messages"
 
     ```
     [json.exception.parse_error.113] parse error at byte 2: syntax error while parsing CBOR string: expected length specification (0x60-0x7B) or indefinite string type (0x7F); last byte: 0xFF
@@ -359,9 +387,9 @@ The iterators passed to constructor `basic_json(InputIT first, InputIT last)` ar
 
 ### json.exception.invalid_iterator.202
 
-In an [erase](../api/basic_json/erase.md) or insert function, the passed iterator `pos` does not belong to the JSON value for which the function was called. It hence does not define a valid position for the deletion/insertion.
+In the [erase](../api/basic_json/erase.md) or insert function, the passed iterator `pos` does not belong to the JSON value for which the function was called. It hence does not define a valid position for the deletion/insertion.
 
-!!! failure "Example message"
+!!! failure "Example messages"
 
     ```
     [json.exception.invalid_iterator.202] iterator does not fit current value
@@ -525,7 +553,7 @@ To create an object from an initializer list, the initializer list must consist
 
 During implicit or explicit value conversion, the JSON type must be compatible to the target type. For instance, a JSON string can only be converted into string types, but not into numbers or boolean types.
 
-!!! failure "Example message"
+!!! failure "Example messages"
 
     ```
     [json.exception.type_error.302] type must be object, but is null
@@ -538,7 +566,7 @@ During implicit or explicit value conversion, the JSON type must be compatible t
 
 To retrieve a reference to a value stored in a `basic_json` object with `get_ref`, the type of the reference must match the value type. For instance, for a JSON array, the `ReferenceType` must be `array_t &`.
 
-!!! failure "Example message"
+!!! failure "Example messages"
 
     ```
     [json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is object
@@ -551,7 +579,7 @@ To retrieve a reference to a value stored in a `basic_json` object with `get_ref
 
 The `at()` member functions can only be executed for certain JSON types.
 
-!!! failure "Example message"
+!!! failure "Example messages"
 
     ```
     [json.exception.type_error.304] cannot use at() with string
@@ -564,7 +592,7 @@ The `at()` member functions can only be executed for certain JSON types.
 
 The `operator[]` member functions can only be executed for certain JSON types.
 
-!!! failure "Example message"
+!!! failure "Example messages"
 
     ```
     [json.exception.type_error.305] cannot use operator[] with a string argument with array
@@ -607,7 +635,7 @@ The `push_back()` and `operator+=` member functions can only be executed for cer
 
 The `insert()` member functions can only be executed for certain JSON types.
 
-!!! failure "Example message"
+!!! failure "Example messages"
 
     ```
     [json.exception.type_error.309] cannot use insert() with array
@@ -630,7 +658,7 @@ The `swap()` member functions can only be executed for certain JSON types.
 
 The `emplace()` and `emplace_back()` member functions can only be executed for certain JSON types.
 
-!!! failure "Example message"
+!!! failure "Example messages"
 
     ```
     [json.exception.type_error.311] cannot use emplace() with number
@@ -651,7 +679,7 @@ The `update()` member functions can only be executed for certain JSON types.
 
 ### json.exception.type_error.313
 
-The `unflatten` function converts an object whose keys are JSON Pointers back into an arbitrary nested JSON value. The JSON Pointers must not overlap, because then the resulting value would not be well defined.
+The `unflatten` function converts an object whose keys are JSON Pointers back into an arbitrary nested JSON value. The JSON Pointers must not overlap, because then the resulting value would not be well-defined.
 
 !!! failure "Example message"
 
@@ -705,7 +733,7 @@ The `dump()` function only works with UTF-8 encoded strings; that is, if you ass
 
 The dynamic type of the object cannot be represented in the requested serialization format (e.g. a raw `true` or `null` JSON object cannot be serialized to BSON)
 
-!!! failure "Example message"
+!!! failure "Example messages"
 
     Serializing `#!json null` to BSON:
     ```
diff --git a/external_imported/json/docs/mkdocs/docs/home/faq.md b/external_imported/json/docs/mkdocs/docs/home/faq.md
new file mode 100644
index 000000000..dd426e073
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/home/faq.md
@@ -0,0 +1,180 @@
+# Frequently Asked Questions (FAQ)
+
+## Known bugs
+
+### Brace initialization yields arrays
+
+!!! question
+
+    Why does
+
+    ```cpp
+    json j{true};
+    ```
+
+    and
+
+    ```cpp
+    json j(true);
+    ```
+
+    yield different results (`#!json [true]` vs. `#!json true`)?
+
+This is a known issue, and -- even worse -- the behavior differs between GCC and Clang. The "culprit" for this is the library's constructor overloads for initializer lists to allow syntax like
+
+```cpp
+json array = {1, 2, 3, 4};
+```
+
+for arrays and
+
+```cpp
+json object = {{"one", 1}, {"two", 2}}; 
+```
+
+for objects.
+
+!!! tip
+
+    To avoid any confusion and ensure portable code, **do not** use brace initialization with the types `basic_json`, `json`, or `ordered_json` unless you want to create an object or array as shown in the examples above.
+
+## Limitations
+
+### Relaxed parsing
+
+!!! question
+
+    Can you add an option to ignore trailing commas?
+
+This library does not support any feature which would jeopardize interoperability.
+
+
+### Parse errors reading non-ASCII characters
+
+!!! question "Questions"
+
+    - Why is the parser complaining about a Chinese character?
+    - Does the library support Unicode?
+    - I get an exception `[json.exception.parse_error.101] parse error at line 1, column 53: syntax error while parsing value - invalid string: ill-formed UTF-8 byte; last read: '"Testé$')"`
+
+The library supports **Unicode input** as follows:
+
+- Only **UTF-8** encoded input is supported which is the default encoding for JSON according to [RFC 8259](https://tools.ietf.org/html/rfc8259.html#section-8.1).
+- `std::u16string` and `std::u32string` can be parsed, assuming UTF-16 and UTF-32 encoding, respectively. These encodings are not supported when reading from files or other input containers.
+- Other encodings such as Latin-1 or ISO 8859-1 are **not** supported and will yield parse or serialization errors.
+- [Unicode noncharacters](http://www.unicode.org/faq/private_use.html#nonchar1) will not be replaced by the library.
+- Invalid surrogates (e.g., incomplete pairs such as `\uDEAD`) will yield parse errors.
+- The strings stored in the library are UTF-8 encoded. When using the default string type (`std::string`), note that its length/size functions return the number of stored bytes rather than the number of characters or glyphs.
+- When you store strings with different encodings in the library, calling [`dump()`](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_a50ec80b02d0f3f51130d4abb5d1cfdc5.html#a50ec80b02d0f3f51130d4abb5d1cfdc5) may throw an exception unless `json::error_handler_t::replace` or `json::error_handler_t::ignore` are used as error handlers.
+
+In most cases, the parser is right to complain, because the input is not UTF-8 encoded. This is especially true for Microsoft Windows where Latin-1 or ISO 8859-1 is often the standard encoding.
+
+
+### Wide string handling
+
+!!! question
+
+    Why are wide strings (e.g., `std::wstring`) dumped as arrays of numbers?
+
+As described [above](#parse-errors-reading-non-ascii-characters), the library assumes UTF-8 as encoding.  To store a wide string, you need to change the encoding.
+
+!!! example
+
+    ```cpp
+    #include <codecvt> // codecvt_utf8
+    #include <locale>  // wstring_convert
+    
+    // encoding function
+    std::string to_utf8(std::wstring& wide_string)
+    {
+        static std::wstring_convert<std::codecvt_utf8<wchar_t>> utf8_conv;
+        return utf8_conv.to_bytes(wide_string);
+    }
+    
+    json j;
+    std::wstring ws = L"車B1234 �ん���";
+    
+    j["original"] = ws;
+    j["encoded"] = to_utf8(ws);
+    
+    std::cout << j << std::endl;
+    ```
+    
+    The result is:
+    
+    ```json
+    {
+      "encoded": "車B1234 �ん���",
+      "original": [36554, 66, 49, 50, 51, 52, 32, 12371, 12435, 12395, 12385, 12399]
+    }
+    ```
+
+## Exceptions
+
+### Parsing without exceptions
+
+!!! question
+
+    Is it possible to indicate a parse error without throwing an exception?
+
+Yes, see [Parsing and exceptions](../features/parsing/parse_exceptions.md).
+
+
+### Key name in exceptions
+
+!!! question
+
+    Can I get the key of the object item that caused an exception?
+
+Yes, you can. Please define the symbol [`JSON_DIAGNOSTICS`](../api/macros/json_diagnostics.md) to get [extended diagnostics messages](exceptions.md#extended-diagnostic-messages).
+
+
+## Serialization issues
+
+
+### Number precision
+
+!!! question
+
+    - It seems that precision is lost when serializing a double.
+    - Can I change the precision for floating-point serialization?
+
+The library uses `std::numeric_limits<number_float_t>::digits10` (15 for IEEE `double`s) digits for serialization. This value is sufficient to guarantee roundtripping. If one uses more than this number of digits of precision, then string -> value -> string is not guaranteed to round-trip.
+
+!!! quote "[cppreference.com](https://en.cppreference.com/w/cpp/types/numeric_limits/digits10)"
+
+    The value of `std::numeric_limits<T>::digits10` is the number of base-10 digits that can be represented by the type T without change, that is, any number with this many significant decimal digits can be converted to a value of type T and back to decimal form, without change due to rounding or overflow. 
+
+!!! tip
+
+    The website https://float.exposed gives a good insight into the internal storage of floating-point numbers.
+
+See [this section](../features/types/number_handling.md#number-serialization) on the library's number handling for more information.
+
+## Compilation issues
+
+### Android SDK
+
+!!! question
+
+    Why does the code not compile with Android SDK?
+
+Android defaults to using very old compilers and C++ libraries. To fix this, add the following to your `Application.mk`. This will switch to the LLVM C++ library, the Clang compiler, and enable C++11 and other features disabled by default.
+
+```ini
+APP_STL := c++_shared
+NDK_TOOLCHAIN_VERSION := clang3.6
+APP_CPPFLAGS += -frtti -fexceptions
+```
+
+The code compiles successfully with [Android NDK](https://developer.android.com/ndk/index.html?hl=ml), Revision 9 - 11 (and possibly later) and [CrystaX's Android NDK](https://www.crystax.net/en/android/ndk) version 10.
+
+
+### Missing STL function
+
+!!! question "Questions"
+
+    - Why do I get a compilation error `'to_string' is not a member of 'std'` (or similarly, for `strtod` or `strtof`)?
+    - Why does the code not compile with MinGW or Android SDK?
+
+This is not an issue with the code,  but rather with the compiler itself. On Android, see above to build with a newer environment.  For MinGW, please refer to [this site](http://tehsausage.com/mingw-to-string) and [this discussion](https://github.com/nlohmann/json/issues/136) for information on how to fix this bug. For Android NDK using `APP_STL := gnustl_static`, please refer to [this discussion](https://github.com/nlohmann/json/issues/219).
diff --git a/external_imported/json/doc/mkdocs/docs/home/license.md b/external_imported/json/docs/mkdocs/docs/home/license.md
similarity index 96%
rename from external_imported/json/doc/mkdocs/docs/home/license.md
rename to external_imported/json/docs/mkdocs/docs/home/license.md
index d359468e0..baef2f51b 100644
--- a/external_imported/json/doc/mkdocs/docs/home/license.md
+++ b/external_imported/json/docs/mkdocs/docs/home/license.md
@@ -4,7 +4,7 @@
 
 The class is licensed under the [MIT License](https://opensource.org/licenses/MIT):
 
-Copyright &copy; 2013-2021 [Niels Lohmann](https://nlohmann.me)
+Copyright &copy; 2013-2022 [Niels Lohmann](https://nlohmann.me)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software�), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
diff --git a/external_imported/json/doc/mkdocs/docs/home/releases.md b/external_imported/json/docs/mkdocs/docs/home/releases.md
similarity index 99%
rename from external_imported/json/doc/mkdocs/docs/home/releases.md
rename to external_imported/json/docs/mkdocs/docs/home/releases.md
index 0cb890b0a..5237c4259 100644
--- a/external_imported/json/doc/mkdocs/docs/home/releases.md
+++ b/external_imported/json/docs/mkdocs/docs/home/releases.md
@@ -252,18 +252,18 @@ http://nlohmann.github.io/json/doxygen/classnlohmann_1_1basic__json_a0a45fc74063
 - Fixed documentation of parse function. #1473
 - Suppressed warning that cannot be fixed inside the library. #1401 #1468
 - Imroved package manager suppert:
-	- Updated Buckaroo instructions. #1495
-	- Improved Meson support. #1463
-	- Added Conda package manager documentation. #1430
-	- Added NuGet package manager documentation. #1132
+    - Updated Buckaroo instructions. #1495
+    - Improved Meson support. #1463
+    - Added Conda package manager documentation. #1430
+    - Added NuGet package manager documentation. #1132
 - Continuous Integration
-	- Removed unstable or deprecated Travis builders (Xcode 6.4 - 8.2) and added Xcode 10.1 builder.
-	- Added Clang 7 to Travis CI.
-	- Fixed AppVeyor x64 builds. #1374 #1414
+    - Removed unstable or deprecated Travis builders (Xcode 6.4 - 8.2) and added Xcode 10.1 builder.
+    - Added Clang 7 to Travis CI.
+    - Fixed AppVeyor x64 builds. #1374 #1414
 - Updated thirdparty libraries:
-	- Catch 1.12.0 -> 1.12.2
-	- Google Benchmark 1.3.0 -> 1.4.1
-	- Doxygen 1.8.15 -> 1.8.16
+    - Catch 1.12.0 -> 1.12.2
+    - Google Benchmark 1.3.0 -> 1.4.1
+    - Doxygen 1.8.15 -> 1.8.16
 
 ### :fire: Deprecated functions
 
@@ -468,7 +468,7 @@ This release further fixes several bugs in the library. All changes are backward
 - allow compare user-defined string types (#1130)
 - better support for algorithms using iterators from `items()` (#1045, #1134)
 - added parameter to avoid compilation error with MSVC 2015 debug builds (#1114)
-- re-added accidentially skipped unit tests (#1176)
+- re-added accidentally skipped unit tests (#1176)
 - fixed MSVC issue with `std::swap` (#1168)
 
 ### :zap: Improvements
@@ -1008,7 +1008,7 @@ This release fixes a few bugs in the JSON parser found in the [Parsing JSON is a
 This release fixes the semantics of `operator[]` for JSON Pointers (see below). This fix is backwards compatible.
 
 ### Changes
-- **`operator[]` for JSON Pointers** now behaves like the other versions of `operator[]` and transforms `null` values into objects or arrays if required. This allows to created nested structues like `j["/foo/bar/2"] = 17` (yielding `{"foo": "bar": [null, null, 17]}`) without problems.
+- **`operator[]` for JSON Pointers** now behaves like the other versions of `operator[]` and transforms `null` values into objects or arrays if required. This allows to created nested structures like `j["/foo/bar/2"] = 17` (yielding `{"foo": "bar": [null, null, 17]}`) without problems.
 - overworked a helper SFINAE function
 - fixed some documentation issues
 - fixed the CMake files to allow to run the test suite outside the main project directory
@@ -1093,7 +1093,7 @@ This release combines a lot of small fixes and improvements. The release is back
 ### Changes
 - The **parser** has been overworked, and a lot of small issues have been fixed:
   - Improved parser performance by avoiding recursion and using move semantics for the return value.
-  - Unescaped control charaters `\x10`-`\x1f` are not accepted any more.
+  - Unescaped control characters `\x10`-`\x1f` are not accepted any more.
   - Fixed a bug in the parser when reading from an input stream.
   - Improved test case coverage for UTF-8 parsing: now, all valid Unicode code points are tested both escaped and unescaped.
   - The precision of output streams is now preserved by the parser.
@@ -1167,7 +1167,7 @@ As `noexcept` and `constexpr` specifier have been added to several functions, th
 - Parser error messages are still very vague and contain no information on the error location.
 - The implemented `diff` function is rather primitive and does not create minimal diffs.
 - The name of function `iteration_wrapper` may change in the future and the function will be deprecated in the next release.
-- Roundtripping (i.e., parsing a JSON value from a string, serializing it, and comparing the strings) of floating-point numbers is not 100% accurate. Note that [RFC 7159](https://tools.ietf.org/html/rfc7159) defines no format to internally represent numbers and states not requirement for roundtripping. Nevertheless, benchmarks like [Native JSON Benchmark](https://github.com/miloyip/nativejson-benchmark) treat roundtripping deviations as conformance errors.
+- Roundtripping (i.e., parsing a JSON value from a string, serializing it, and comparing the strings) of floating-point numbers is not 100% accurate. Note that [RFC 8259](https://tools.ietf.org/html/rfc8259) defines no format to internally represent numbers and states not requirement for roundtripping. Nevertheless, benchmarks like [Native JSON Benchmark](https://github.com/miloyip/nativejson-benchmark) treat roundtripping deviations as conformance errors.
 
 
 ## v1.1.0
diff --git a/external_imported/json/docs/mkdocs/docs/home/sponsors.md b/external_imported/json/docs/mkdocs/docs/home/sponsors.md
new file mode 100644
index 000000000..9097049d4
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/home/sponsors.md
@@ -0,0 +1,13 @@
+# Sponsors
+
+You can sponsor this library at [GitHub Sponsors](https://github.com/sponsors/nlohmann).
+
+## Named Sponsors
+
+- [Michael Hartmann](https://github.com/reFX-Mike)
+- [Stefan Hagen](https://github.com/sthagen)
+- [Steve Sperandeo](https://github.com/homer6)
+- [Robert Jefe Lindstädt](https://github.com/eljefedelrodeodeljefe)
+- [Steve Wagner](https://github.com/ciroque)
+
+Thanks everyone!
diff --git a/external_imported/json/doc/images/callback_events.png b/external_imported/json/docs/mkdocs/docs/images/callback_events.png
similarity index 100%
rename from external_imported/json/doc/images/callback_events.png
rename to external_imported/json/docs/mkdocs/docs/images/callback_events.png
diff --git a/external_imported/json/docs/mkdocs/docs/images/json_syntax_number.png b/external_imported/json/docs/mkdocs/docs/images/json_syntax_number.png
new file mode 100644
index 000000000..be23ffa69
Binary files /dev/null and b/external_imported/json/docs/mkdocs/docs/images/json_syntax_number.png differ
diff --git a/external_imported/json/doc/images/range-begin-end.svg b/external_imported/json/docs/mkdocs/docs/images/range-begin-end.svg
similarity index 100%
rename from external_imported/json/doc/images/range-begin-end.svg
rename to external_imported/json/docs/mkdocs/docs/images/range-begin-end.svg
diff --git a/external_imported/json/doc/images/range-rbegin-rend.svg b/external_imported/json/docs/mkdocs/docs/images/range-rbegin-rend.svg
similarity index 100%
rename from external_imported/json/doc/images/range-rbegin-rend.svg
rename to external_imported/json/docs/mkdocs/docs/images/range-rbegin-rend.svg
diff --git a/external_imported/json/docs/mkdocs/docs/index.md b/external_imported/json/docs/mkdocs/docs/index.md
new file mode 100644
index 000000000..0e49c836c
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/index.md
@@ -0,0 +1,3 @@
+# JSON for Modern C++
+
+![](images/json.gif)
diff --git a/external_imported/json/docs/mkdocs/docs/integration/cmake.md b/external_imported/json/docs/mkdocs/docs/integration/cmake.md
new file mode 100644
index 000000000..545f53f30
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/integration/cmake.md
@@ -0,0 +1,172 @@
+# CMake
+
+## Integration
+
+You can use the `nlohmann_json::nlohmann_json` interface target in CMake. This target populates the appropriate usage
+requirements for [`INTERFACE_INCLUDE_DIRECTORIES`](https://cmake.org/cmake/help/latest/prop_tgt/INTERFACE_INCLUDE_DIRECTORIES.html)
+to point to the appropriate include directories and [`INTERFACE_COMPILE_FEATURES`](https://cmake.org/cmake/help/latest/prop_tgt/INTERFACE_COMPILE_FEATURES.html)
+for the necessary C++11 flags.
+
+### External
+
+To use this library from a CMake project, you can locate it directly with [`find_package()`](https://cmake.org/cmake/help/latest/command/find_package.html)
+and use the namespaced imported target from the generated package configuration:
+
+!!! example
+
+    ```cmake title="CMakeLists.txt"
+    cmake_minimum_required(VERSION 3.1)
+    project(ExampleProject LANGUAGES CXX)
+    
+    find_package(nlohmann_json 3.11.3 REQUIRED)
+    
+    add_executable(example example.cpp)
+    target_link_libraries(example PRIVATE nlohmann_json::nlohmann_json)
+    ```
+
+The package configuration file, `nlohmann_jsonConfig.cmake`, can be used either from an install tree or directly out of
+the build tree.
+
+### Embedded
+
+To embed the library directly into an existing CMake project, place the entire source tree in a subdirectory and call
+`add_subdirectory()` in your `CMakeLists.txt` file.
+
+!!! example
+
+    ```cmake title="CMakeLists.txt"
+    cmake_minimum_required(VERSION 3.1)
+    project(ExampleProject LANGUAGES CXX)
+
+    # If you only include this third party in PRIVATE source files, you do not need to install it
+    # when your main project gets installed.
+    set(JSON_Install OFF CACHE INTERNAL "")
+    
+    add_subdirectory(nlohmann_json)
+
+    add_executable(example example.cpp)
+    target_link_libraries(example PRIVATE nlohmann_json::nlohmann_json)
+    ```
+
+!!! note
+
+    Do not use `#!cmake include(nlohmann_json/CMakeLists.txt)`, since that carries with it unintended consequences that
+    will break the build. It is generally discouraged (although not necessarily well documented as such) to use
+    `#!cmake include(...)` for pulling in other CMake projects anyways.
+
+
+### Supporting Both
+
+To allow your project to support either an externally supplied or an embedded JSON library, you can use a pattern akin
+to the following.
+
+!!! example
+
+    ```cmake title="CMakeLists.txt"
+    project(ExampleProject LANGUAGES CXX)
+
+    option(EXAMPLE_USE_EXTERNAL_JSON "Use an external JSON library" OFF)
+
+    add_subdirectory(thirdparty)
+
+    add_executable(example example.cpp)
+
+    # Note that the namespaced target will always be available regardless of the import method
+    target_link_libraries(example PRIVATE nlohmann_json::nlohmann_json)
+    ```
+    
+    ```cmake title="thirdparty/CMakeLists.txt"
+    if(EXAMPLE_USE_EXTERNAL_JSON)
+        find_package(nlohmann_json 3.11.3 REQUIRED)
+    else()
+        set(JSON_BuildTests OFF CACHE INTERNAL "")
+        add_subdirectory(nlohmann_json)
+    endif()
+    ```
+    
+    `thirdparty/nlohmann_json` is then a complete copy of this source tree.
+
+
+### FetchContent
+
+Since CMake v3.11, [FetchContent](https://cmake.org/cmake/help/v3.11/module/FetchContent.html) can be used to
+automatically download a release as a dependency at configure type.
+
+!!! example
+
+    ```cmake title="CMakeLists.txt"
+    cmake_minimum_required(VERSION 3.11)
+    project(ExampleProject LANGUAGES CXX)
+
+    include(FetchContent)
+    
+    FetchContent_Declare(json URL https://github.com/nlohmann/json/releases/download/v3.11.3/json.tar.xz)
+    FetchContent_MakeAvailable(json)
+    
+    add_executable(example example.cpp)
+    target_link_libraries(example PRIVATE nlohmann_json::nlohmann_json)
+    ```
+
+!!! Note
+
+    It is recommended to use the URL approach described above which is supported as of version 3.10.0. It is also
+    possible to pass the Git repository like
+
+    ```cmake
+    FetchContent_Declare(json
+        GIT_REPOSITORY https://github.com/nlohmann/json
+        GIT_TAG v3.11.3
+    )
+    ```
+
+    However, the repository <https://github.com/nlohmann/json> download size is quite large. You might want to depend on
+    a smaller repository. For instance, you might want to replace the URL in the example by
+    <https://github.com/ArthurSonzogni/nlohmann_json_cmake_fetchcontent>.
+
+## CMake Options
+
+### `JSON_BuildTests`
+
+Build the unit tests when [`BUILD_TESTING`](https://cmake.org/cmake/help/latest/command/enable_testing.html) is enabled. This option is `ON` by default if the library's CMake project is the top project. That is, when integrating the library as described above, the test suite is not built unless explicitly switched on with this option.
+
+### `JSON_CI`
+
+Enable CI build targets. The exact targets are used during the several CI steps and are subject to change without notice. This option is `OFF` by default.
+
+### `JSON_Diagnostics`
+
+Enable [extended diagnostic messages](../home/exceptions.md#extended-diagnostic-messages) by defining macro [`JSON_DIAGNOSTICS`](../api/macros/json_diagnostics.md). This option is `OFF` by default.
+
+### `JSON_DisableEnumSerialization`
+
+Disable default `enum` serialization by defining the macro
+[`JSON_DISABLE_ENUM_SERIALIZATION`](../api/macros/json_disable_enum_serialization.md). This option is `OFF` by default.
+
+### `JSON_FastTests`
+
+Skip expensive/slow test suites. This option is `OFF` by default. Depends on `JSON_BuildTests`.
+
+### `JSON_GlobalUDLs`
+
+Place user-defined string literals in the global namespace by defining the macro
+[`JSON_USE_GLOBAL_UDLS`](../api/macros/json_use_global_udls.md). This option is `OFF` by default.
+
+### `JSON_ImplicitConversions`
+
+Enable implicit conversions by defining macro [`JSON_USE_IMPLICIT_CONVERSIONS`](../api/macros/json_use_implicit_conversions.md). This option is `ON` by default.
+
+### `JSON_Install`
+
+Install CMake targets during install step. This option is `ON` by default if the library's CMake project is the top project.
+
+### `JSON_MultipleHeaders`
+
+Use non-amalgamated version of the library. This option is `OFF` by default.
+
+### `JSON_SystemInclude`
+
+Treat the library headers like system headers (i.e., adding `SYSTEM` to the [`target_include_directories`](https://cmake.org/cmake/help/latest/command/target_include_directories.html) call) to checks for this library by tools like Clang-Tidy. This option is `OFF` by default.
+
+### `JSON_Valgrind`
+
+Execute test suite with [Valgrind](https://valgrind.org). This option is `OFF` by default. Depends on `JSON_BuildTests`.
diff --git a/external_imported/json/doc/mkdocs/docs/integration/conan/CMakeLists.txt b/external_imported/json/docs/mkdocs/docs/integration/conan/CMakeLists.txt
similarity index 100%
rename from external_imported/json/doc/mkdocs/docs/integration/conan/CMakeLists.txt
rename to external_imported/json/docs/mkdocs/docs/integration/conan/CMakeLists.txt
diff --git a/external_imported/json/doc/mkdocs/docs/integration/conan/Conanfile.txt b/external_imported/json/docs/mkdocs/docs/integration/conan/Conanfile.txt
similarity index 100%
rename from external_imported/json/doc/mkdocs/docs/integration/conan/Conanfile.txt
rename to external_imported/json/docs/mkdocs/docs/integration/conan/Conanfile.txt
diff --git a/external_imported/json/doc/mkdocs/docs/integration/conan/example.cpp b/external_imported/json/docs/mkdocs/docs/integration/conan/example.cpp
similarity index 100%
rename from external_imported/json/doc/mkdocs/docs/integration/conan/example.cpp
rename to external_imported/json/docs/mkdocs/docs/integration/conan/example.cpp
diff --git a/external_imported/json/docs/mkdocs/docs/integration/example.cpp b/external_imported/json/docs/mkdocs/docs/integration/example.cpp
new file mode 100644
index 000000000..1a7ac4de2
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/integration/example.cpp
@@ -0,0 +1,10 @@
+#include <nlohmann/json.hpp>
+#include <iostream>
+#include <iomanip>
+
+using json = nlohmann::json;
+
+int main()
+{
+    std::cout << std::setw(4) << json::meta() << std::endl;
+}
diff --git a/external_imported/json/docs/mkdocs/docs/integration/index.md b/external_imported/json/docs/mkdocs/docs/integration/index.md
new file mode 100644
index 000000000..2bbaa8604
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/integration/index.md
@@ -0,0 +1,18 @@
+# Header only
+
+[`json.hpp`](https://github.com/nlohmann/json/blob/develop/single_include/nlohmann/json.hpp) is the single required
+file in `single_include/nlohmann` or [released here](https://github.com/nlohmann/json/releases). You need to add
+
+```cpp
+#include <nlohmann/json.hpp>
+
+// for convenience
+using json = nlohmann::json;
+```
+
+to the files you want to process JSON and set the necessary switches to enable C++11 (e.g., `-std=c++11` for GCC and
+Clang).
+
+You can further use file
+[`single_include/nlohmann/json_fwd.hpp`](https://github.com/nlohmann/json/blob/develop/single_include/nlohmann/json_fwd.hpp)
+for forward declarations.
diff --git a/external_imported/json/docs/mkdocs/docs/integration/migration_guide.md b/external_imported/json/docs/mkdocs/docs/integration/migration_guide.md
new file mode 100644
index 000000000..d250f5b20
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/integration/migration_guide.md
@@ -0,0 +1,264 @@
+# Migration Guide
+
+This page collects some guidelines on how to future-proof your code for future versions of this library.
+
+## Replace deprecated functions
+
+The following functions have been deprecated and will be removed in the next major version (i.e., 4.0.0). All
+deprecations are annotated with
+[`HEDLEY_DEPRECATED_FOR`](https://nemequ.github.io/hedley/api-reference.html#HEDLEY_DEPRECATED_FOR) to report which
+function to use instead.
+
+#### Parsing
+
+- Function `friend std::istream& operator<<(basic_json&, std::istream&)` is deprecated since 3.0.0. Please use
+  [`friend std::istream&  operator>>(std::istream&, basic_json&)`](../api/operator_gtgt.md) instead.
+  
+    === "Deprecated"
+    
+        ```cpp
+        nlohmann::json j;
+        std::stringstream ss("[1,2,3]");
+        j << ss;
+        ```
+    
+    === "Future-proof"
+
+        ```cpp
+        nlohmann::json j;
+        std::stringstream ss("[1,2,3]");
+        ss >> j;
+        ```
+
+- Passing iterator pairs or pointer/length pairs to parsing functions ([`parse`](../api/basic_json/parse.md),
+  [`accept`](../api/basic_json/accept.md), [`sax_parse`](../api/basic_json/sax_parse.md),
+  [`from_cbor`](../api/basic_json/from_cbor.md), [`from_msgpack`](../api/basic_json/from_msgpack.md),
+  [`from_ubjson`](../api/basic_json/from_ubjson.md), and [`from_bson`](../api/basic_json/from_bson.md) via initializer
+  lists is deprecated since 3.8.0. Instead, pass two iterators; for instance, call `from_cbor(ptr, ptr+len)` instead of
+  `from_cbor({ptr, len})`.
+
+    === "Deprecated"
+  
+          ```cpp
+          const char* s = "[1,2,3]";
+          bool ok = nlohmann::json::accept({s, s + std::strlen(s)});
+          ```
+  
+    === "Future-proof"
+  
+          ```cpp
+          const char* s = "[1,2,3]";
+          bool ok = nlohmann::json::accept(s, s + std::strlen(s));
+          ```
+
+#### JSON Pointers
+
+- Comparing JSON Pointers with strings via [`operator==`](../api/json_pointer/operator_eq.md) and
+  [`operator!=`](../api/json_pointer/operator_ne.md) is deprecated since 3.11.2. To compare a
+  [`json_pointer`](../api/json_pointer/index.md) `p` with a string `s`, convert `s` to a `json_pointer` first and use
+  [`json_pointer::operator==`](../api/json_pointer/operator_eq.md) or
+  [`json_pointer::operator!=`](../api/json_pointer/operator_ne.md).
+    
+    === "Deprecated"
+  
+        ```cpp
+        nlohmann::json::json_pointer lhs("/foo/bar/1");
+        assert(lhs == "/foo/bar/1");
+        ```
+  
+    === "Future-proof"
+
+        ```cpp
+        nlohmann::json::json_pointer lhs("/foo/bar/1");
+        assert(lhs == nlohmann::json::json_pointer("/foo/bar/1"));
+        ```
+
+- The implicit conversion from JSON Pointers to string
+  ([`json_pointer::operator string_t`](../api/json_pointer/operator_string_t.md)) is deprecated since 3.11.0. Use
+  [`json_pointer::to_string`](../api/json_pointer/to_string.md) instead.
+  
+    === "Deprecated"
+  
+          ```cpp
+          nlohmann::json::json_pointer ptr("/foo/bar/1");
+          std::string s = ptr;
+          ```
+  
+    === "Future-proof"
+  
+          ```cpp
+          nlohmann::json::json_pointer ptr("/foo/bar/1");
+          std::string s = ptr.to_string();
+          ```
+
+- Passing a `basic_json` specialization as template parameter `RefStringType` to
+  [`json_pointer`](../api/json_pointer/index.md) is deprecated since 3.11.0. The string type can now be directly
+  provided.
+  
+    === "Deprecated"
+  
+          ```cpp
+          using my_json = nlohmann::basic_json<std::map, std::vector, my_string_type>;
+          nlohmann::json_pointer<my_json> ptr("/foo/bar/1");
+          ```
+  
+    === "Future-proof"
+  
+          ```cpp
+          nlohmann::json_pointer<my_string_type> ptr("/foo/bar/1");
+          ```
+  
+    Thereby, `nlohmann::my_json::json_pointer` is an alias for `nlohmann::json_pointer<my_string_type>` and is always an 
+    alias to the `json_pointer` with the appropriate string type for all specializations of `basic_json`.
+
+#### Miscellaneous functions
+
+- The function `iterator_wrapper` is deprecated since 3.1.0. Please use the member function
+  [`items`](../api/basic_json/items.md) instead.
+  
+    === "Deprecated"
+
+          ```cpp
+          for (auto &x : nlohmann::json::iterator_wrapper(j))
+          {
+              std::cout << x.key() << ":" << x.value() << std::endl;
+          }
+          ```
+
+    === "Future-proof"
+
+          ```cpp
+          for (auto &x : j.items())
+          {
+              std::cout << x.key() << ":" << x.value() << std::endl;
+          }
+          ```
+
+- Function `friend std::ostream& operator>>(const basic_json&, std::ostream&)` is deprecated since 3.0.0. Please use
+  [`friend operator<<(std::ostream&, const basic_json&)`](../api/operator_ltlt.md) instead.
+  
+    === "Deprecated"
+
+          ```cpp
+          j >> std::cout;
+          ```
+
+    === "Future-proof"
+
+          ```cpp
+          std::cout << j;
+          ```
+
+- The legacy comparison behavior for discarded values is deprecated since 3.11.0. It is already disabled by default and
+  can still be enabled by defining
+  [`JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON`](../api/macros/json_use_legacy_discarded_value_comparison.md) to `1`.
+  
+    === "Deprecated"
+
+          ```cpp
+          #define JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON 1
+          #include <nlohmann/json.hpp>
+          ```
+
+    === "Future-proof"
+
+          ```cpp
+          #include <nlohmann/json.hpp>
+          ```
+
+## Replace implicit conversions
+
+Implicit conversions via [`operator ValueType`](../api/basic_json/operator_ValueType.md) will be switched off by default
+in the next major release of the library.
+
+You can prepare existing code by already defining
+[`JSON_USE_IMPLICIT_CONVERSIONS`](../api/macros/json_use_implicit_conversions.md) to `0` and replace any implicit
+conversions with calls to [`get`](../api/basic_json/get.md), [`get_to`](../api/basic_json/get_to.md),
+[`get_ref`](../api/basic_json/get_ref.md), or [`get_ptr`](../api/basic_json/get_ptr.md).
+
+=== "Deprecated"
+
+      ```cpp
+      nlohmann::json j = "Hello, world!";
+      std::string s = j;
+      ```
+
+=== "Future-proof"
+
+      ```cpp
+      nlohmann::json j = "Hello, world!";
+      auto s = j.template get<std::string>();
+      ```
+
+=== "Future-proof (alternative)"
+
+      ```cpp
+      nlohmann::json j = "Hello, world!";
+      std::string s;
+      j.get_to(s);
+      ```
+
+You can prepare existing code by already defining
+[`JSON_USE_IMPLICIT_CONVERSIONS`](../api/macros/json_use_implicit_conversions.md) to `0` and replace any implicit
+conversions with calls to [`get`](../api/basic_json/get.md).
+
+## Import namespace `literals` for UDLs
+
+The user-defined string literals [`operator""_json`](../api/operator_literal_json.md) and
+[`operator""_json_pointer`](../api/operator_literal_json_pointer.md) will be removed from the global namespace in the
+next major release of the library.
+
+=== "Deprecated"
+
+      ```cpp
+      nlohmann::json j = "[1,2,3]"_json;
+      ```
+
+=== "Future-proof"
+
+      ```cpp
+      using namespace nlohmann::literals;
+      nlohmann::json j = "[1,2,3]"_json;
+      ```
+
+To prepare existing code, define [`JSON_USE_GLOBAL_UDLS`](../api/macros/json_use_global_udls.md) to `0` and bring the
+string literals into scope where needed.
+
+## Do not hard-code the complete library namespace
+
+The [`nlohmann` namespace](../features/namespace.md) contains a sub-namespace to avoid problems when different
+versions or configurations of the library are used in the same project. Always use `nlohmann` as namespace or, when the
+exact version and configuration is relevant, use macro
+[`NLOHMANN_JSON_NAMESPACE`](../api/macros/nlohmann_json_namespace.md) to denote the namespace.
+
+=== "Dangerous"
+
+      ```cpp
+      void to_json(nlohmann::json_abi_v3_11_2::json& j, const person& p)
+      {
+          j["age"] = p.age;
+      }
+      ```
+
+=== "Future-proof"
+
+      ```cpp
+      void to_json(nlohmann::json& j, const person& p)
+      {
+          j["age"] = p.age;
+      }
+      ```
+
+=== "Future-proof (alternative)"
+
+      ```cpp
+      void to_json(NLOHMANN_JSON_NAMESPACE::json& j, const person& p)
+      {
+          j["age"] = p.age;
+      }
+      ```
+
+## Do not use the `details` namespace
+
+The `details` namespace is not part of the public API of the library and can change in any version without announcement.
+Do not rely on any function or type in the `details` namespace.
diff --git a/external_imported/json/docs/mkdocs/docs/integration/package_managers.md b/external_imported/json/docs/mkdocs/docs/integration/package_managers.md
new file mode 100644
index 000000000..c9a273a50
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/integration/package_managers.md
@@ -0,0 +1,198 @@
+# Package Managers
+
+Throughout this page, we will describe how to compile the example file `example.cpp` below.
+
+```cpp
+--8<-- "integration/example.cpp"
+```
+
+When executed, this program should create output similar to
+
+```json
+--8<-- "examples/meta.output"
+```
+
+## Homebrew
+
+If you are using OS X and [Homebrew](http://brew.sh), just type
+
+```sh
+brew install nlohmann-json
+```
+
+and you're set. If you want the bleeding edge rather than the latest release, use
+
+```sh
+brew install nlohmann-json --HEAD
+```
+
+instead. See [nlohmann-json](https://formulae.brew.sh/formula/nlohmann-json) for more information.
+
+??? example
+
+    1. Create the following file:
+
+        ```cpp title="example.cpp"
+        --8<-- "integration/example.cpp"
+        ```
+
+    2. Install the package
+
+        ```sh
+        brew install nlohmann-json
+        ```
+
+    3. Determine the include path, which defaults to `/usr/local/Cellar/nlohmann-json/$version/include`, where `$version` is the version of the library, e.g. `3.7.3`. The path of the library can be determined with
+
+        ```sh
+        brew list nlohmann-json
+        ```
+
+    4. Compile the code. For instance, the code can be compiled using Clang with
+
+        ```sh
+        clang++ example.cpp -I/usr/local/Cellar/nlohmann-json/3.7.3/include -std=c++11 -o example
+        ```
+
+:material-update: The [formula](https://formulae.brew.sh/formula/nlohmann-json) is updated automatically.
+
+## Meson
+
+If you are using the [Meson Build System](http://mesonbuild.com), add this source tree as a [meson subproject](https://mesonbuild.com/Subprojects.html#using-a-subproject). You may also use the `include.zip` published in this project's [Releases](https://github.com/nlohmann/json/releases) to reduce the size of the vendored source tree. Alternatively, you can get a wrap file by downloading it from [Meson WrapDB](https://wrapdb.mesonbuild.com/nlohmann_json), or simply use `meson wrap install nlohmann_json`. Please see the meson project for any issues regarding the packaging.
+
+The provided `meson.build` can also be used as an alternative to cmake for installing `nlohmann_json` system-wide in which case a pkg-config file is installed. To use it, simply have your build system require the `nlohmann_json` pkg-config dependency. In Meson, it is preferred to use the [`dependency()`](https://mesonbuild.com/Reference-manual.html#dependency) object with a subproject fallback, rather than using the subproject directly.
+
+## Bazel
+
+This repository provides a [Bazel](https://bazel.build/) `WORKSPACE.bazel` and a corresponding `BUILD.bazel` file. Therefore, this repository can be referenced by workspace rules such as `http_archive`, `git_repository`, or `local_repository` from other Bazel workspaces. To use the library you only need to depend on the target `@nlohmann_json//:json` (e.g. via `deps` attribute).
+
+## Conan
+
+If you are using [Conan](https://www.conan.io/) to manage your dependencies, merely add `nlohmann_json/x.y.z` to your `conanfile`'s requires, where `x.y.z` is the release version you want to use. Please file issues [here](https://github.com/conan-io/conan-center-index/issues) if you experience problems with the packages.
+
+??? example
+
+    1. Create the following files:
+
+        ```ini title="Conanfile.txt"
+        --8<-- "integration/conan/Conanfile.txt"
+        ```
+
+        ```cmake title="CMakeLists.txt"
+        --8<-- "integration/conan/CMakeLists.txt"
+        ```
+
+        ```cpp title="example.cpp"
+        --8<-- "integration/conan/example.cpp"
+        ```
+
+    2. Build:
+
+        ```sh
+        mkdir build
+        cd build
+        conan install ..
+        cmake ..
+        cmake --build .
+        ```
+
+:material-update: The [package](https://conan.io/center/nlohmann_json) is updated automatically.
+
+## Spack
+
+If you are using [Spack](https://www.spack.io/) to manage your dependencies, you can use the [`nlohmann-json` package](https://spack.readthedocs.io/en/latest/package_list.html#nlohmann-json). Please see the [spack project](https://github.com/spack/spack) for any issues regarding the packaging.
+
+## Hunter
+
+If you are using [hunter](https://github.com/cpp-pm/hunter) on your project for external dependencies, then you can use the [nlohmann_json package](https://hunter.readthedocs.io/en/latest/packages/pkg/nlohmann_json.html). Please see the hunter project for any issues regarding the packaging.
+
+## Buckaroo
+
+If you are using [Buckaroo](https://buckaroo.pm), you can install this library's module with `buckaroo add github.com/buckaroo-pm/nlohmann-json`. Please file issues [here](https://github.com/buckaroo-pm/nlohmann-json). There is a demo repo [here](https://github.com/njlr/buckaroo-nholmann-json-example).
+
+## vcpkg
+
+If you are using [vcpkg](https://github.com/Microsoft/vcpkg/) on your project for external dependencies, then you can install the [nlohmann-json package](https://github.com/Microsoft/vcpkg/tree/master/ports/nlohmann-json) with `vcpkg install nlohmann-json` and follow the then displayed descriptions. Please see the vcpkg project for any issues regarding the packaging.
+
+??? example
+
+    1. Create the following files:
+
+        ```cmake title="CMakeLists.txt"
+        --8<-- "integration/vcpkg/CMakeLists.txt"
+        ```
+    
+        ```cpp title="example.cpp"
+        --8<-- "integration/vcpkg/example.cpp"
+        ```
+
+    2. Install package:
+
+        ```sh
+        vcpkg install nlohmann-json
+        ```
+
+    3. Build:
+
+        ```sh
+        mkdir build
+        cd build
+        cmake .. -DCMAKE_TOOLCHAIN_FILE=/path/to/vcpkg/scripts/buildsystems/vcpkg.cmake
+        cmake --build .
+        ```
+
+    Note you need to adjust `/path/to/vcpkg/scripts/buildsystems/vcpkg.cmake` to your system.
+
+## cget
+
+If you are using [cget](http://cget.readthedocs.io/en/latest/), you can install the latest development version with `cget install nlohmann/json`. A specific version can be installed with `cget install nlohmann/json@v3.1.0`. Also, the multiple header version can be installed by adding the `-DJSON_MultipleHeaders=ON` flag (i.e., `cget install nlohmann/json -DJSON_MultipleHeaders=ON`).
+
+:material-update: cget reads directly from the [GitHub repository](https://github.com/nlohmann/json) and is always up-to-date.
+
+## CocoaPods
+
+If you are using [CocoaPods](https://cocoapods.org), you can use the library by adding pod `"nlohmann_json", '~>3.1.2'` to your podfile (see [an example](https://bitbucket.org/benman/nlohmann_json-cocoapod/src/master/)). Please file issues [here](https://bitbucket.org/benman/nlohmann_json-cocoapod/issues?status=new&status=open).
+
+## NuGet
+
+If you are using [NuGet](https://www.nuget.org), you can use the package [nlohmann.json](https://www.nuget.org/packages/nlohmann.json/). Please check [this extensive description](https://github.com/nlohmann/json/issues/1132#issuecomment-452250255) on how to use the package. Please file issues [here](https://github.com/hnkb/nlohmann-json-nuget/issues).
+
+## Conda
+
+If you are using [conda](https://conda.io/), you can use the package [nlohmann_json](https://github.com/conda-forge/nlohmann_json-feedstock) from [conda-forge](https://conda-forge.org) executing `conda install -c conda-forge nlohmann_json`. Please file issues [here](https://github.com/conda-forge/nlohmann_json-feedstock/issues).
+
+## MSYS2
+
+If you are using [MSYS2](http://www.msys2.org/), you can use the [mingw-w64-nlohmann-json](https://packages.msys2.org/base/mingw-w64-nlohmann-json) package, just type `pacman -S mingw-w64-i686-nlohmann-json` or `pacman -S mingw-w64-x86_64-nlohmann-json` for installation. Please file issues [here](https://github.com/msys2/MINGW-packages/issues/new?title=%5Bnlohmann-json%5D) if you experience problems with the packages.
+
+:material-update: The [package](https://packages.msys2.org/base/mingw-w64-nlohmann-json) is updated automatically.
+
+## MacPorts
+
+If you are using [MacPorts](https://ports.macports.org), execute `sudo port install nlohmann-json` to install the [nlohmann-json](https://ports.macports.org/port/nlohmann-json/) package.
+
+:material-update: The [package](https://ports.macports.org/port/nlohmann-json/) is updated automatically.
+
+## build2
+
+If you are using [`build2`](https://build2.org), you can use the [`nlohmann-json`](https://cppget.org/nlohmann-json) package from the public repository <http://cppget.org> or directly from the [package's sources repository](https://github.com/build2-packaging/nlohmann-json). In your project's `manifest` file, just add `depends: nlohmann-json` (probably with some [version constraints](https://build2.org/build2-toolchain/doc/build2-toolchain-intro.xhtml#guide-add-remove-deps)). If you are not familiar with using dependencies in `build2`, [please read this introduction](https://build2.org/build2-toolchain/doc/build2-toolchain-intro.xhtml).
+Please file issues [here](https://github.com/build2-packaging/nlohmann-json) if you experience problems with the packages.
+
+:material-update: The [package](https://cppget.org/nlohmann-json) is updated automatically.
+
+## wsjcpp
+
+If you are using [`wsjcpp`](http://wsjcpp.org), you can use the command `wsjcpp install "https://github.com/nlohmann/json:develop"` to get the latest version. Note you can change the branch ":develop" to an existing tag or another branch.
+
+:material-update: wsjcpp reads directly from the [GitHub repository](https://github.com/nlohmann/json) and is always up-to-date.
+
+## CPM.cmake
+
+If you are using [`CPM.cmake`](https://github.com/TheLartians/CPM.cmake), you can check this [`example`](https://github.com/TheLartians/CPM.cmake/tree/master/examples/json). After [adding CPM script](https://github.com/TheLartians/CPM.cmake#adding-cpm) to your project, implement the following snippet to your CMake:
+
+```cmake
+CPMAddPackage(
+    NAME nlohmann_json
+    GITHUB_REPOSITORY nlohmann/json
+    VERSION 3.9.1)
+```
diff --git a/external_imported/json/docs/mkdocs/docs/integration/pkg-config.md b/external_imported/json/docs/mkdocs/docs/integration/pkg-config.md
new file mode 100644
index 000000000..429d0dea9
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/integration/pkg-config.md
@@ -0,0 +1,13 @@
+# Pkg-config
+
+If you are using bare Makefiles, you can use `pkg-config` to generate the include flags that point to where the library is installed:
+
+```sh
+pkg-config nlohmann_json --cflags
+```
+
+Users of the [Meson build system](package_managers.md#meson) will also be able to use a system-wide library, which will be found by `pkg-config`:
+
+```meson
+json = dependency('nlohmann_json', required: true)
+```
diff --git a/external_imported/json/docs/mkdocs/docs/integration/vcpkg/CMakeLists.txt b/external_imported/json/docs/mkdocs/docs/integration/vcpkg/CMakeLists.txt
new file mode 100644
index 000000000..d31f4e835
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/docs/integration/vcpkg/CMakeLists.txt
@@ -0,0 +1,7 @@
+project(json_example)
+cmake_minimum_required(VERSION 2.8.12)
+
+find_package(nlohmann_json CONFIG REQUIRED)
+
+add_executable(json_example example.cpp)
+target_link_libraries(json_example PRIVATE nlohmann_json::nlohmann_json)
diff --git a/external_imported/json/doc/mkdocs/docs/integration/example.cpp b/external_imported/json/docs/mkdocs/docs/integration/vcpkg/example.cpp
similarity index 100%
rename from external_imported/json/doc/mkdocs/docs/integration/example.cpp
rename to external_imported/json/docs/mkdocs/docs/integration/vcpkg/example.cpp
diff --git a/external_imported/json/docs/mkdocs/mkdocs.yml b/external_imported/json/docs/mkdocs/mkdocs.yml
new file mode 100644
index 000000000..5e66db596
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/mkdocs.yml
@@ -0,0 +1,366 @@
+# Project information
+site_name: JSON for Modern C++
+site_author: Niels Lohmann
+site_url: https://json.nlohmann.me/
+
+# Repository
+repo_name: nlohmann/json
+repo_url: https://github.com/nlohmann/json
+edit_uri: edit/develop/docs/mkdocs/docs
+
+# Copyright
+copyright: Copyright &copy; 2013 - 2023 Niels Lohmann
+
+# Configuration
+theme:
+  name: material
+  language: en
+  palette:
+    - media: '(prefers-color-scheme: light)'
+      scheme: default
+      primary: indigo
+      accent: indigo
+      toggle:
+        icon: material/brightness-7 
+        name: Switch to dark mode
+    - media: '(prefers-color-scheme: dark)'
+      scheme: slate
+      primary: indigo
+      accent: indigo
+      toggle:
+        icon: material/brightness-4
+        name: Switch to light mode
+
+  font:
+    text: Roboto
+    code: JetBrains Mono
+  features:
+    - navigation.instant
+    - navigation.tracking
+    - navigation.tabs
+    - navigation.indexes
+    - navigation.top
+    - content.tabs.link
+
+nav:
+  - Home:
+    - index.md
+    - home/license.md
+    - "Code of Conduct": home/code_of_conduct.md
+    - "FAQ": home/faq.md
+    - home/exceptions.md
+    - home/releases.md
+    - home/design_goals.md
+    - home/sponsors.md
+  - Features:
+    - features/arbitrary_types.md
+    - Binary Formats:
+      - features/binary_formats/index.md
+      - features/binary_formats/bjdata.md
+      - features/binary_formats/bson.md
+      - features/binary_formats/cbor.md
+      - features/binary_formats/messagepack.md
+      - features/binary_formats/ubjson.md
+    - features/binary_values.md
+    - features/comments.md
+    - Element Access:
+      - features/element_access/index.md
+      - features/element_access/unchecked_access.md
+      - features/element_access/checked_access.md
+      - features/element_access/default_value.md
+    - features/iterators.md
+    - features/json_pointer.md
+    - features/json_patch.md
+    - features/merge_patch.md
+    - 'nlohmann Namespace': features/namespace.md
+    - features/object_order.md
+    - Parsing:
+        - features/parsing/index.md
+        - features/parsing/json_lines.md
+        - features/parsing/parse_exceptions.md
+        - features/parsing/parser_callbacks.md
+        - features/parsing/sax_interface.md
+    - features/assertions.md
+    - features/enum_conversion.md
+    - features/macros.md
+    - Types:
+        - features/types/index.md
+        - features/types/number_handling.md
+  - Integration:
+    - integration/index.md
+    - integration/migration_guide.md
+    - integration/cmake.md
+    - integration/package_managers.md
+    - integration/pkg-config.md
+  - API Documentation:
+      - basic_json:
+        - 'Overview': api/basic_json/index.md
+        - '(Constructor)': api/basic_json/basic_json.md
+        - '(Destructor)': api/basic_json/~basic_json.md
+        - 'accept': api/basic_json/accept.md
+        - 'array': api/basic_json/array.md
+        - 'array_t': api/basic_json/array_t.md
+        - 'at': api/basic_json/at.md
+        - 'back': api/basic_json/back.md
+        - 'begin': api/basic_json/begin.md
+        - 'binary': api/basic_json/binary.md
+        - 'binary_t': api/basic_json/binary_t.md
+        - 'boolean_t': api/basic_json/boolean_t.md
+        - 'cbegin': api/basic_json/cbegin.md
+        - 'cbor_tag_handler_t': api/basic_json/cbor_tag_handler_t.md
+        - 'cend': api/basic_json/cend.md
+        - 'clear': api/basic_json/clear.md
+        - 'contains': api/basic_json/contains.md
+        - 'count': api/basic_json/count.md
+        - 'crbegin': api/basic_json/crbegin.md
+        - 'crend': api/basic_json/crend.md
+        - 'default_object_comparator_t': api/basic_json/default_object_comparator_t.md
+        - 'diff': api/basic_json/diff.md
+        - 'dump': api/basic_json/dump.md
+        - 'emplace': api/basic_json/emplace.md
+        - 'emplace_back': api/basic_json/emplace_back.md
+        - 'empty': api/basic_json/empty.md
+        - 'end': api/basic_json/end.md
+        - 'erase': api/basic_json/erase.md
+        - 'error_handler_t': api/basic_json/error_handler_t.md
+        - 'exception': api/basic_json/exception.md
+        - 'find': api/basic_json/find.md
+        - 'flatten': api/basic_json/flatten.md
+        - 'from_bjdata': api/basic_json/from_bjdata.md
+        - 'from_bson': api/basic_json/from_bson.md
+        - 'from_cbor': api/basic_json/from_cbor.md
+        - 'from_msgpack': api/basic_json/from_msgpack.md
+        - 'from_ubjson': api/basic_json/from_ubjson.md
+        - 'front': api/basic_json/front.md
+        - 'get': api/basic_json/get.md
+        - 'get_allocator': api/basic_json/get_allocator.md
+        - 'get_binary': api/basic_json/get_binary.md
+        - 'get_ptr': api/basic_json/get_ptr.md
+        - 'get_ref': api/basic_json/get_ref.md
+        - 'get_to': api/basic_json/get_to.md
+        - 'std::hash&lt;basic_json&gt;': api/basic_json/std_hash.md
+        - 'input_format_t': api/basic_json/input_format_t.md
+        - 'insert': api/basic_json/insert.md
+        - 'invalid_iterator': api/basic_json/invalid_iterator.md
+        - 'is_array': api/basic_json/is_array.md
+        - 'is_binary': api/basic_json/is_binary.md
+        - 'is_boolean': api/basic_json/is_boolean.md
+        - 'is_discarded': api/basic_json/is_discarded.md
+        - 'is_null': api/basic_json/is_null.md
+        - 'is_number': api/basic_json/is_number.md
+        - 'is_number_float': api/basic_json/is_number_float.md
+        - 'is_number_integer': api/basic_json/is_number_integer.md
+        - 'is_number_unsigned': api/basic_json/is_number_unsigned.md
+        - 'is_object': api/basic_json/is_object.md
+        - 'is_primitive': api/basic_json/is_primitive.md
+        - 'is_string': api/basic_json/is_string.md
+        - 'is_structured': api/basic_json/is_structured.md
+        - 'items': api/basic_json/items.md
+        - 'json_base_class_t': api/basic_json/json_base_class_t.md
+        - 'json_serializer': api/basic_json/json_serializer.md
+        - 'max_size': api/basic_json/max_size.md
+        - 'meta': api/basic_json/meta.md
+        - 'merge_patch': api/basic_json/merge_patch.md
+        - 'number_float_t': api/basic_json/number_float_t.md
+        - 'number_integer_t': api/basic_json/number_integer_t.md
+        - 'number_unsigned_t': api/basic_json/number_unsigned_t.md
+        - 'object': api/basic_json/object.md
+        - 'object_comparator_t': api/basic_json/object_comparator_t.md
+        - 'object_t': api/basic_json/object_t.md
+        - 'operator ValueType': api/basic_json/operator_ValueType.md
+        - 'operator value_t': api/basic_json/operator_value_t.md
+        - 'operator[]': api/basic_json/operator[].md
+        - 'operator=': api/basic_json/operator=.md
+        - 'operator+=': api/basic_json/operator+=.md
+        - 'operator==': api/basic_json/operator_eq.md
+        - 'operator!=': api/basic_json/operator_ne.md
+        - 'operator<': api/basic_json/operator_lt.md
+        - 'operator>': api/basic_json/operator_gt.md
+        - 'operator<=': api/basic_json/operator_le.md
+        - 'operator>=': api/basic_json/operator_ge.md
+        - 'operator<=>': api/basic_json/operator_spaceship.md
+        - 'out_of_range': api/basic_json/out_of_range.md
+        - 'other_error': api/basic_json/other_error.md
+        - 'parse': api/basic_json/parse.md
+        - 'parse_error': api/basic_json/parse_error.md
+        - 'parse_event_t': api/basic_json/parse_event_t.md
+        - 'parser_callback_t': api/basic_json/parser_callback_t.md
+        - 'patch': api/basic_json/patch.md
+        - 'patch_inplace': api/basic_json/patch_inplace.md
+        - 'push_back': api/basic_json/push_back.md
+        - 'rbegin': api/basic_json/rbegin.md
+        - 'rend': api/basic_json/rend.md
+        - 'sax_parse': api/basic_json/sax_parse.md
+        - 'size': api/basic_json/size.md
+        - 'string_t': api/basic_json/string_t.md
+        - 'swap': api/basic_json/swap.md
+        - 'std::swap&lt;basic_json&gt;': api/basic_json/std_swap.md
+        - 'to_bjdata': api/basic_json/to_bjdata.md
+        - 'to_bson': api/basic_json/to_bson.md
+        - 'to_cbor': api/basic_json/to_cbor.md
+        - 'to_msgpack': api/basic_json/to_msgpack.md
+        - 'to_string': api/basic_json/to_string.md
+        - 'to_ubjson': api/basic_json/to_ubjson.md
+        - 'type': api/basic_json/type.md
+        - 'type_error': api/basic_json/type_error.md
+        - 'type_name': api/basic_json/type_name.md
+        - 'unflatten': api/basic_json/unflatten.md
+        - 'update': api/basic_json/update.md
+        - 'value': api/basic_json/value.md
+        - 'value_t': api/basic_json/value_t.md
+      - byte_container_with_subtype:
+        - 'Overview': api/byte_container_with_subtype/index.md
+        - '(constructor)': api/byte_container_with_subtype/byte_container_with_subtype.md
+        - 'clear_subtype': api/byte_container_with_subtype/clear_subtype.md
+        - 'has_subtype': api/byte_container_with_subtype/has_subtype.md
+        - 'set_subtype': api/byte_container_with_subtype/set_subtype.md
+        - 'subtype': api/byte_container_with_subtype/subtype.md
+      - adl_serializer:
+        - 'Overview': api/adl_serializer/index.md
+        - 'from_json': api/adl_serializer/from_json.md
+        - 'to_json': api/adl_serializer/to_json.md
+      - 'json': api/json.md
+      - json_pointer:
+        - 'Overview': api/json_pointer/index.md
+        - '(Constructor)': api/json_pointer/json_pointer.md
+        - 'back': api/json_pointer/back.md
+        - 'empty': api/json_pointer/empty.md
+        - 'operator string_t': api/json_pointer/operator_string_t.md
+        - 'operator==': api/json_pointer/operator_eq.md
+        - 'operator!=': api/json_pointer/operator_ne.md
+        - 'operator/': api/json_pointer/operator_slash.md
+        - 'operator/=': api/json_pointer/operator_slasheq.md
+        - 'parent_pointer': api/json_pointer/parent_pointer.md
+        - 'pop_back': api/json_pointer/pop_back.md
+        - 'push_back': api/json_pointer/push_back.md
+        - 'string_t': api/json_pointer/string_t.md
+        - 'to_string': api/json_pointer/to_string.md
+      - json_sax:
+        - 'Overview': api/json_sax/index.md
+        - 'binary': api/json_sax/binary.md
+        - 'boolean': api/json_sax/boolean.md
+        - 'end_array': api/json_sax/end_array.md
+        - 'end_object': api/json_sax/end_object.md
+        - 'key': api/json_sax/key.md
+        - 'null': api/json_sax/null.md
+        - 'number_float': api/json_sax/number_float.md
+        - 'number_integer': api/json_sax/number_integer.md
+        - 'number_unsigned': api/json_sax/number_unsigned.md
+        - 'parse_error': api/json_sax/parse_error.md
+        - 'start_array': api/json_sax/start_array.md
+        - 'start_object': api/json_sax/start_object.md
+        - 'string': api/json_sax/string.md
+      - 'operator<<(basic_json)': api/operator_ltlt.md
+      - 'operator<<(json_pointer)': api/operator_ltlt.md
+      - 'operator>>(basic_json)': api/operator_gtgt.md
+      - 'operator""_json': api/operator_literal_json.md
+      - 'operator""_json_pointer': api/operator_literal_json_pointer.md
+      - 'ordered_json': api/ordered_json.md
+      - 'ordered_map': api/ordered_map.md
+      - macros:
+        - 'Overview': api/macros/index.md
+        - 'JSON_ASSERT': api/macros/json_assert.md
+        - 'JSON_CATCH_USER': api/macros/json_throw_user.md
+        - 'JSON_DIAGNOSTICS': api/macros/json_diagnostics.md
+        - 'JSON_DISABLE_ENUM_SERIALIZATION': api/macros/json_disable_enum_serialization.md
+        - 'JSON_HAS_CPP_11': api/macros/json_has_cpp_11.md
+        - 'JSON_HAS_CPP_14': api/macros/json_has_cpp_11.md
+        - 'JSON_HAS_CPP_17': api/macros/json_has_cpp_11.md
+        - 'JSON_HAS_CPP_20': api/macros/json_has_cpp_11.md
+        - 'JSON_HAS_EXPERIMENTAL_FILESYSTEM': api/macros/json_has_filesystem.md
+        - 'JSON_HAS_FILESYSTEM': api/macros/json_has_filesystem.md
+        - 'JSON_HAS_RANGES': api/macros/json_has_ranges.md
+        - 'JSON_HAS_STATIC_RTTI': api/macros/json_has_static_rtti.md
+        - 'JSON_HAS_THREE_WAY_COMPARISON': api/macros/json_has_three_way_comparison.md
+        - 'JSON_NOEXCEPTION': api/macros/json_noexception.md
+        - 'JSON_NO_IO': api/macros/json_no_io.md
+        - 'JSON_SKIP_LIBRARY_VERSION_CHECK': api/macros/json_skip_library_version_check.md
+        - 'JSON_SKIP_UNSUPPORTED_COMPILER_CHECK': api/macros/json_skip_unsupported_compiler_check.md
+        - 'JSON_THROW_USER': api/macros/json_throw_user.md
+        - 'JSON_TRY_USER': api/macros/json_throw_user.md
+        - 'JSON_USE_GLOBAL_UDLS': api/macros/json_use_global_udls.md
+        - 'JSON_USE_IMPLICIT_CONVERSIONS': api/macros/json_use_implicit_conversions.md
+        - 'JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON': api/macros/json_use_legacy_discarded_value_comparison.md
+        - 'NLOHMANN_DEFINE_TYPE_INTRUSIVE': api/macros/nlohmann_define_type_intrusive.md
+        - 'NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT': api/macros/nlohmann_define_type_intrusive.md
+        - 'NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE': api/macros/nlohmann_define_type_non_intrusive.md
+        - 'NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT': api/macros/nlohmann_define_type_non_intrusive.md
+        - 'NLOHMANN_JSON_NAMESPACE': api/macros/nlohmann_json_namespace.md
+        - 'NLOHMANN_JSON_NAMESPACE_BEGIN': api/macros/nlohmann_json_namespace_begin.md
+        - 'NLOHMANN_JSON_NAMESPACE_END': api/macros/nlohmann_json_namespace_begin.md
+        - 'NLOHMANN_JSON_NAMESPACE_NO_VERSION': api/macros/nlohmann_json_namespace_no_version.md
+        - 'NLOHMANN_JSON_SERIALIZE_ENUM': api/macros/nlohmann_json_serialize_enum.md
+        - 'NLOHMANN_JSON_VERSION_MAJOR': api/macros/nlohmann_json_version_major.md
+        - 'NLOHMANN_JSON_VERSION_MINOR': api/macros/nlohmann_json_version_major.md
+        - 'NLOHMANN_JSON_VERSION_PATCH': api/macros/nlohmann_json_version_major.md
+
+# Extras
+extra:
+  social:
+    - icon: fontawesome/brands/github
+      link: https://github.com/nlohmann
+    - icon: fontawesome/brands/twitter
+      link: https://twitter.com/nlohmann
+    - icon: fontawesome/brands/linkedin
+      link: https://www.linkedin.com/in/nielslohmann/
+    - icon: fontawesome/brands/xing
+      link: https://www.xing.com/profile/Niels_Lohmann
+    - icon: fontawesome/brands/paypal
+      link: https://www.paypal.me/nlohmann
+  generator: false
+
+# Extensions
+markdown_extensions:
+  - abbr
+  - admonition
+  - attr_list
+  - def_list
+  - codehilite:
+      guess_lang: false
+  - toc:
+      permalink: true
+  - pymdownx.arithmatex
+  - pymdownx.betterem:
+      smart_enable: all
+  - pymdownx.caret
+  - pymdownx.critic
+  - pymdownx.details
+  - pymdownx.emoji:
+      emoji_index: !!python/name:material.extensions.emoji.twemoji
+      emoji_generator: !!python/name:material.extensions.emoji.to_svg
+  - pymdownx.inlinehilite
+  - pymdownx.magiclink
+  - pymdownx.mark
+  #- pymdownx.smartsymbols
+  - pymdownx.superfences
+  - pymdownx.tasklist:
+      custom_checkbox: true
+  - pymdownx.tabbed:
+      alternate_style: true
+  - pymdownx.tilde
+  - pymdownx.snippets:
+      base_path: docs
+      check_paths: true
+  - plantuml_markdown:
+      format: svg
+
+plugins:
+    - search:
+        separator: '[\s\-\.]'
+        lang: en
+    - minify:
+        minify_html: true
+    - git-revision-date-localized
+    - redirects:
+        redirect_maps:
+            'api/basic_json/operator_gtgt.md': api/operator_gtgt.md
+            'api/basic_json/operator_ltlt.md': api/operator_ltlt.md
+            'api/basic_json/operator_literal_json.md': api/operator_literal_json.md
+            'api/basic_json/operator_literal_json_pointer.md': api/operator_literal_json_pointer.md
+            'api/json_pointer/operator_string.md': api/json_pointer/operator_string_t.md
+
+extra_css:
+    - css/custom.css
+
+extra_javascript:
+  - https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-MML-AM_CHTML
diff --git a/external_imported/json/docs/mkdocs/requirements.txt b/external_imported/json/docs/mkdocs/requirements.txt
new file mode 100644
index 000000000..b397d545d
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/requirements.txt
@@ -0,0 +1,49 @@
+Babel==2.13.1
+certifi==2023.7.22
+charset-normalizer==3.3.1
+click==8.1.7
+csscompressor==0.9.5
+future==0.18.3
+ghp-import==2.1.0
+gitdb==4.0.11
+GitPython==3.1.40
+htmlmin==0.1.12
+httplib2==0.22.0
+idna==3.4
+importlib-metadata==6.8.0
+Jinja2==3.1.2
+joblib==1.3.2
+jsmin==3.0.1
+livereload==2.6.3
+lunr==0.7.0.post1
+Markdown==3.5
+markdown-include==0.8.1
+MarkupSafe==2.1.3
+mergedeep==1.3.4
+mkdocs==1.5.3
+mkdocs-git-revision-date-localized-plugin==1.2.1
+mkdocs-material==9.4.7
+mkdocs-material-extensions==1.3
+mkdocs-minify-plugin==0.7.1
+mkdocs-redirects==1.2.1
+mkdocs-simple-hooks==0.1.5
+nltk==3.8.1
+packaging==23.2
+plantuml==0.3.0
+plantuml-markdown==3.9.2
+Pygments==2.16.1
+pymdown-extensions==10.3.1
+pyparsing==3.1.1
+python-dateutil==2.8.2
+pytz==2023.3.post1
+PyYAML==6.0.1
+pyyaml_env_tag==0.1
+regex==2023.10.3
+requests==2.31.0
+six==1.16.0
+smmap==5.0.1
+tornado==6.3.3
+tqdm==4.66.1
+urllib3==2.0.7
+watchdog==3.0.0
+zipp==3.17.0
diff --git a/external_imported/json/docs/mkdocs/scripts/check_structure.py b/external_imported/json/docs/mkdocs/scripts/check_structure.py
new file mode 100755
index 000000000..643482af2
--- /dev/null
+++ b/external_imported/json/docs/mkdocs/scripts/check_structure.py
@@ -0,0 +1,179 @@
+#!/usr/bin/env python
+
+import glob
+import os.path
+import re
+import sys
+
+warnings = 0
+
+
+def report(rule, location, description):
+    global warnings
+    warnings += 1
+    print(f'{warnings:3}. {location}:  {description} [{rule}]')
+
+
+def check_structure():
+    expected_sections = [
+        'Template parameters',
+        'Specializations',
+        'Iterator invalidation',
+        'Requirements',
+        'Member types',
+        'Member functions',
+        'Member variables',
+        'Static functions',
+        'Non-member functions',
+        'Literals',
+        'Helper classes',
+        'Parameters',
+        'Return value',
+        'Exception safety',
+        'Exceptions',
+        'Complexity',
+        'Possible implementation',
+        'Default definition',
+        'Notes',
+        'Examples',
+        'See also',
+        'Version history'
+    ]
+
+    required_sections = [
+        'Examples',
+        'Version history'
+    ]
+
+    files = sorted(glob.glob('api/**/*.md', recursive=True))
+    for file in files:
+        with open(file) as file_content:
+            section_idx = -1                 # the index of the current h2 section
+            existing_sections = []           # the list of h2 sections in the file
+            in_initial_code_example = False  # whether we are inside the first code example block
+            previous_line = None             # the previous read line
+            h1sections = 0                   # the number of h1 sections in the file
+            last_overload = 0                # the last seen overload number in the code example
+            documented_overloads = {}        # the overloads that have been documented in the current block
+            current_section = None           # the name of the current section
+
+            for lineno, original_line in enumerate(file_content.readlines()):
+                line = original_line.strip()
+
+                if line.startswith('# '):
+                    h1sections += 1
+
+                # there should only be one top-level title
+                if h1sections > 1:
+                    report('structure/unexpected_section', f'{file}:{lineno+1}', f'unexpected top-level title "{line}"')
+                    h1sections = 1
+
+                # Overview pages should have a better title
+                if line == '# Overview':
+                    report('style/title', f'{file}:{lineno+1}', 'overview pages should have a better title than "Overview"')
+
+                # lines longer than 160 characters are bad (unless they are tables)
+                if len(line) > 160 and '|' not in line:
+                    report('whitespace/line_length', f'{file}:{lineno+1} ({current_section})', f'line is too long ({len(line)} vs. 160 chars)')
+
+                # sections in `<!-- NOLINT -->` comments are treated as present
+                if line.startswith('<!-- NOLINT'):
+                    current_section = line.strip('<!-- NOLINT')
+                    current_section = current_section.strip(' -->')
+                    existing_sections.append(current_section)
+
+                # check if sections are correct
+                if line.startswith('## '):
+                    # before starting a new section, check if the previous one documented all overloads
+                    if current_section in documented_overloads and last_overload != 0:
+                        if len(documented_overloads[current_section]) > 0 and len(documented_overloads[current_section]) != last_overload:
+                            expected = list(range(1, last_overload+1))
+                            undocumented = [x for x in expected if x not in documented_overloads[current_section]]
+                            unexpected = [x for x in documented_overloads[current_section] if x not in expected]
+                            if len(undocumented):
+                                report('style/numbering', f'{file}:{lineno} ({current_section})', f'undocumented overloads: {", ".join([f"({x})" for x in undocumented])}')
+                            if len(unexpected):
+                                report('style/numbering', f'{file}:{lineno} ({current_section})', f'unexpected overloads: {", ".join([f"({x})" for x in unexpected])}')
+
+                    current_section = line.strip('## ')
+                    existing_sections.append(current_section)
+
+                    if current_section in expected_sections:
+                        idx = expected_sections.index(current_section)
+                        if idx <= section_idx:
+                            report('structure/section_order', f'{file}:{lineno+1}', f'section "{current_section}" is in an unexpected order (should be before "{expected_sections[section_idx]}")')
+                        section_idx = idx
+                    else:
+                        if 'index.md' not in file:  # index.md files may have a different structure
+                            report('structure/unknown_section', f'{file}:{lineno+1}', f'section "{current_section}" is not part of the expected sections')
+
+                # collect the numbered items of the current section to later check if they match the number of overloads
+                if last_overload != 0 and not in_initial_code_example:
+                    if len(original_line) and original_line[0].isdigit():
+                        number = int(re.findall(r"^(\d+).", original_line)[0])
+                        if current_section not in documented_overloads:
+                            documented_overloads[current_section] = []
+                        documented_overloads[current_section].append(number)
+
+                # code example
+                if line == '```cpp' and section_idx == -1:
+                    in_initial_code_example = True
+
+                if in_initial_code_example and line.startswith('//') and line not in ['// since C++20', '// until C++20']:
+                    # check numbering of overloads
+                    if any(map(str.isdigit, line)):
+                        number = int(re.findall(r'\d+', line)[0])
+                        if number != last_overload + 1:
+                            report('style/numbering', f'{file}:{lineno+1}', f'expected number ({number}) to be ({last_overload +1 })')
+                        last_overload = number
+
+                    if any(map(str.isdigit, line)) and '(' not in line:
+                        report('style/numbering', f'{file}:{lineno+1}', f'number should be in parentheses: {line}')
+
+                if line == '```' and in_initial_code_example:
+                    in_initial_code_example = False
+
+                # consecutive blank lines are bad
+                if line == '' and previous_line == '':
+                    report('whitespace/blank_lines', f'{file}:{lineno}-{lineno+1} ({current_section})', 'consecutive blank lines')
+
+                # check that non-example admonitions have titles
+                untitled_admonition = re.match(r'^(\?\?\?|!!!) ([^ ]+)$', line)
+                if untitled_admonition and untitled_admonition.group(2) != 'example':
+                    report('style/admonition_title', f'{file}:{lineno} ({current_section})', f'"{untitled_admonition.group(2)}" admonitions should have a title')
+
+                previous_line = line
+
+            if 'index.md' not in file:  # index.md files may have a different structure
+                for required_section in required_sections:
+                    if required_section not in existing_sections:
+                        report('structure/missing_section', f'{file}:{lineno+1}', f'required section "{required_section}" was not found')
+
+
+def check_examples():
+    example_files = sorted(glob.glob('../../examples/*.cpp'))
+    markdown_files = sorted(glob.glob('**/*.md', recursive=True))
+
+    # check if every example file is used in at least one markdown file
+    for example_file in example_files:
+        example_file = os.path.join('examples', os.path.basename(example_file))
+
+        found = False
+        for markdown_file in markdown_files:
+            content = ' '.join(open(markdown_file).readlines())
+            if example_file in content:
+                found = True
+                break
+
+        if not found:
+            report('examples/missing', f'{example_file}', 'example file is not used in any documentation file')
+
+
+if __name__ == '__main__':
+    print(120 * '-')
+    check_structure()
+    check_examples()
+    print(120 * '-')
+
+    if warnings > 0:
+        sys.exit(1)
diff --git a/external_imported/json/doc/usages/ios.png b/external_imported/json/docs/usages/ios.png
similarity index 100%
rename from external_imported/json/doc/usages/ios.png
rename to external_imported/json/docs/usages/ios.png
diff --git a/external_imported/json/doc/usages/macos.png b/external_imported/json/docs/usages/macos.png
similarity index 100%
rename from external_imported/json/doc/usages/macos.png
rename to external_imported/json/docs/usages/macos.png
diff --git a/external_imported/json/include/nlohmann/adl_serializer.hpp b/external_imported/json/include/nlohmann/adl_serializer.hpp
index 4af1c4bb1..56a606c0f 100644
--- a/external_imported/json/include/nlohmann/adl_serializer.hpp
+++ b/external_imported/json/include/nlohmann/adl_serializer.hpp
@@ -1,49 +1,55 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 #pragma once
 
 #include <utility>
 
+#include <nlohmann/detail/abi_macros.hpp>
 #include <nlohmann/detail/conversions/from_json.hpp>
 #include <nlohmann/detail/conversions/to_json.hpp>
+#include <nlohmann/detail/meta/identity_tag.hpp>
 
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 
-template<typename, typename>
+/// @sa https://json.nlohmann.me/api/adl_serializer/
+template<typename ValueType, typename>
 struct adl_serializer
 {
-    /*!
-    @brief convert a JSON value to any value type
-
-    This function is usually called by the `get()` function of the
-    @ref basic_json class (either explicit or via conversion operators).
-
-    @param[in] j        JSON value to read from
-    @param[in,out] val  value to write to
-    */
-    template<typename BasicJsonType, typename ValueType>
-    static auto from_json(BasicJsonType&& j, ValueType& val) noexcept(
+    /// @brief convert a JSON value to any value type
+    /// @sa https://json.nlohmann.me/api/adl_serializer/from_json/
+    template<typename BasicJsonType, typename TargetType = ValueType>
+    static auto from_json(BasicJsonType && j, TargetType& val) noexcept(
         noexcept(::nlohmann::from_json(std::forward<BasicJsonType>(j), val)))
     -> decltype(::nlohmann::from_json(std::forward<BasicJsonType>(j), val), void())
     {
         ::nlohmann::from_json(std::forward<BasicJsonType>(j), val);
     }
 
-    /*!
-    @brief convert any value type to a JSON value
-
-    This function is usually called by the constructors of the @ref basic_json
-    class.
+    /// @brief convert a JSON value to any value type
+    /// @sa https://json.nlohmann.me/api/adl_serializer/from_json/
+    template<typename BasicJsonType, typename TargetType = ValueType>
+    static auto from_json(BasicJsonType && j) noexcept(
+    noexcept(::nlohmann::from_json(std::forward<BasicJsonType>(j), detail::identity_tag<TargetType> {})))
+    -> decltype(::nlohmann::from_json(std::forward<BasicJsonType>(j), detail::identity_tag<TargetType> {}))
+    {
+        return ::nlohmann::from_json(std::forward<BasicJsonType>(j), detail::identity_tag<TargetType> {});
+    }
 
-    @param[in,out] j  JSON value to write to
-    @param[in] val    value to read from
-    */
-    template<typename BasicJsonType, typename ValueType>
-    static auto to_json(BasicJsonType& j, ValueType&& val) noexcept(
-        noexcept(::nlohmann::to_json(j, std::forward<ValueType>(val))))
-    -> decltype(::nlohmann::to_json(j, std::forward<ValueType>(val)), void())
+    /// @brief convert any value type to a JSON value
+    /// @sa https://json.nlohmann.me/api/adl_serializer/to_json/
+    template<typename BasicJsonType, typename TargetType = ValueType>
+    static auto to_json(BasicJsonType& j, TargetType && val) noexcept(
+        noexcept(::nlohmann::to_json(j, std::forward<TargetType>(val))))
+    -> decltype(::nlohmann::to_json(j, std::forward<TargetType>(val)), void())
     {
-        ::nlohmann::to_json(j, std::forward<ValueType>(val));
+        ::nlohmann::to_json(j, std::forward<TargetType>(val));
     }
 };
 
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
diff --git a/external_imported/json/include/nlohmann/byte_container_with_subtype.hpp b/external_imported/json/include/nlohmann/byte_container_with_subtype.hpp
index ee3ab4011..91382cd68 100644
--- a/external_imported/json/include/nlohmann/byte_container_with_subtype.hpp
+++ b/external_imported/json/include/nlohmann/byte_container_with_subtype.hpp
@@ -1,51 +1,54 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 #pragma once
 
-#include <cstdint> // uint8_t
+#include <cstdint> // uint8_t, uint64_t
 #include <tuple> // tie
 #include <utility> // move
 
-namespace nlohmann
-{
-
-/*!
-@brief an internal type for a backed binary type
-
-This type extends the template parameter @a BinaryType provided to `basic_json`
-with a subtype used by BSON and MessagePack. This type exists so that the user
-does not have to specify a type themselves with a specific naming scheme in
-order to override the binary type.
+#include <nlohmann/detail/abi_macros.hpp>
 
-@tparam BinaryType container to store bytes (`std::vector<std::uint8_t>` by
-                   default)
+NLOHMANN_JSON_NAMESPACE_BEGIN
 
-@since version 3.8.0
-*/
+/// @brief an internal type for a backed binary type
+/// @sa https://json.nlohmann.me/api/byte_container_with_subtype/
 template<typename BinaryType>
 class byte_container_with_subtype : public BinaryType
 {
   public:
-    /// the type of the underlying container
     using container_type = BinaryType;
+    using subtype_type = std::uint64_t;
 
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
     byte_container_with_subtype() noexcept(noexcept(container_type()))
         : container_type()
     {}
 
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
     byte_container_with_subtype(const container_type& b) noexcept(noexcept(container_type(b)))
         : container_type(b)
     {}
 
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
     byte_container_with_subtype(container_type&& b) noexcept(noexcept(container_type(std::move(b))))
         : container_type(std::move(b))
     {}
 
-    byte_container_with_subtype(const container_type& b, std::uint8_t subtype_) noexcept(noexcept(container_type(b)))
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
+    byte_container_with_subtype(const container_type& b, subtype_type subtype_) noexcept(noexcept(container_type(b)))
         : container_type(b)
         , m_subtype(subtype_)
         , m_has_subtype(true)
     {}
 
-    byte_container_with_subtype(container_type&& b, std::uint8_t subtype_) noexcept(noexcept(container_type(std::move(b))))
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
+    byte_container_with_subtype(container_type&& b, subtype_type subtype_) noexcept(noexcept(container_type(std::move(b))))
         : container_type(std::move(b))
         , m_subtype(subtype_)
         , m_has_subtype(true)
@@ -62,96 +65,30 @@ class byte_container_with_subtype : public BinaryType
         return !(rhs == *this);
     }
 
-    /*!
-    @brief sets the binary subtype
-
-    Sets the binary subtype of the value, also flags a binary JSON value as
-    having a subtype, which has implications for serialization.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @sa @ref subtype() -- return the binary subtype
-    @sa @ref clear_subtype() -- clears the binary subtype
-    @sa @ref has_subtype() -- returns whether or not the binary value has a
-    subtype
-
-    @since version 3.8.0
-    */
-    void set_subtype(std::uint8_t subtype_) noexcept
+    /// @brief sets the binary subtype
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/set_subtype/
+    void set_subtype(subtype_type subtype_) noexcept
     {
         m_subtype = subtype_;
         m_has_subtype = true;
     }
 
-    /*!
-    @brief return the binary subtype
-
-    Returns the numerical subtype of the value if it has a subtype. If it does
-    not have a subtype, this function will return size_t(-1) as a sentinel
-    value.
-
-    @return the numerical subtype of the binary value
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @sa @ref set_subtype() -- sets the binary subtype
-    @sa @ref clear_subtype() -- clears the binary subtype
-    @sa @ref has_subtype() -- returns whether or not the binary value has a
-    subtype
-
-    @since version 3.8.0
-    */
-    constexpr std::uint8_t subtype() const noexcept
+    /// @brief return the binary subtype
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/subtype/
+    constexpr subtype_type subtype() const noexcept
     {
-        return m_subtype;
+        return m_has_subtype ? m_subtype : static_cast<subtype_type>(-1);
     }
 
-    /*!
-    @brief return whether the value has a subtype
-
-    @return whether the value has a subtype
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @sa @ref subtype() -- return the binary subtype
-    @sa @ref set_subtype() -- sets the binary subtype
-    @sa @ref clear_subtype() -- clears the binary subtype
-
-    @since version 3.8.0
-    */
+    /// @brief return whether the value has a subtype
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/has_subtype/
     constexpr bool has_subtype() const noexcept
     {
         return m_has_subtype;
     }
 
-    /*!
-    @brief clears the binary subtype
-
-    Clears the binary subtype and flags the value as not having a subtype, which
-    has implications for serialization; for instance MessagePack will prefer the
-    bin family over the ext family.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @sa @ref subtype() -- return the binary subtype
-    @sa @ref set_subtype() -- sets the binary subtype
-    @sa @ref has_subtype() -- returns whether or not the binary value has a
-    subtype
-
-    @since version 3.8.0
-    */
+    /// @brief clears the binary subtype
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/clear_subtype/
     void clear_subtype() noexcept
     {
         m_subtype = 0;
@@ -159,8 +96,8 @@ class byte_container_with_subtype : public BinaryType
     }
 
   private:
-    std::uint8_t m_subtype = 0;
+    subtype_type m_subtype = 0;
     bool m_has_subtype = false;
 };
 
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
diff --git a/external_imported/json/include/nlohmann/detail/abi_macros.hpp b/external_imported/json/include/nlohmann/detail/abi_macros.hpp
new file mode 100644
index 000000000..f48b9eb1d
--- /dev/null
+++ b/external_imported/json/include/nlohmann/detail/abi_macros.hpp
@@ -0,0 +1,100 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#pragma once
+
+// This file contains all macro definitions affecting or depending on the ABI
+
+#ifndef JSON_SKIP_LIBRARY_VERSION_CHECK
+    #if defined(NLOHMANN_JSON_VERSION_MAJOR) && defined(NLOHMANN_JSON_VERSION_MINOR) && defined(NLOHMANN_JSON_VERSION_PATCH)
+        #if NLOHMANN_JSON_VERSION_MAJOR != 3 || NLOHMANN_JSON_VERSION_MINOR != 11 || NLOHMANN_JSON_VERSION_PATCH != 3
+            #warning "Already included a different version of the library!"
+        #endif
+    #endif
+#endif
+
+#define NLOHMANN_JSON_VERSION_MAJOR 3   // NOLINT(modernize-macro-to-enum)
+#define NLOHMANN_JSON_VERSION_MINOR 11  // NOLINT(modernize-macro-to-enum)
+#define NLOHMANN_JSON_VERSION_PATCH 3   // NOLINT(modernize-macro-to-enum)
+
+#ifndef JSON_DIAGNOSTICS
+    #define JSON_DIAGNOSTICS 0
+#endif
+
+#ifndef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+    #define JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON 0
+#endif
+
+#if JSON_DIAGNOSTICS
+    #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS _diag
+#else
+    #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS
+#endif
+
+#if JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+    #define NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON _ldvcmp
+#else
+    #define NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON
+#endif
+
+#ifndef NLOHMANN_JSON_NAMESPACE_NO_VERSION
+    #define NLOHMANN_JSON_NAMESPACE_NO_VERSION 0
+#endif
+
+// Construct the namespace ABI tags component
+#define NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b) json_abi ## a ## b
+#define NLOHMANN_JSON_ABI_TAGS_CONCAT(a, b) \
+    NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b)
+
+#define NLOHMANN_JSON_ABI_TAGS                                       \
+    NLOHMANN_JSON_ABI_TAGS_CONCAT(                                   \
+            NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS,                       \
+            NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON)
+
+// Construct the namespace version component
+#define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch) \
+    _v ## major ## _ ## minor ## _ ## patch
+#define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT(major, minor, patch) \
+    NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch)
+
+#if NLOHMANN_JSON_NAMESPACE_NO_VERSION
+#define NLOHMANN_JSON_NAMESPACE_VERSION
+#else
+#define NLOHMANN_JSON_NAMESPACE_VERSION                                 \
+    NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT(NLOHMANN_JSON_VERSION_MAJOR, \
+                                           NLOHMANN_JSON_VERSION_MINOR, \
+                                           NLOHMANN_JSON_VERSION_PATCH)
+#endif
+
+// Combine namespace components
+#define NLOHMANN_JSON_NAMESPACE_CONCAT_EX(a, b) a ## b
+#define NLOHMANN_JSON_NAMESPACE_CONCAT(a, b) \
+    NLOHMANN_JSON_NAMESPACE_CONCAT_EX(a, b)
+
+#ifndef NLOHMANN_JSON_NAMESPACE
+#define NLOHMANN_JSON_NAMESPACE               \
+    nlohmann::NLOHMANN_JSON_NAMESPACE_CONCAT( \
+            NLOHMANN_JSON_ABI_TAGS,           \
+            NLOHMANN_JSON_NAMESPACE_VERSION)
+#endif
+
+#ifndef NLOHMANN_JSON_NAMESPACE_BEGIN
+#define NLOHMANN_JSON_NAMESPACE_BEGIN                \
+    namespace nlohmann                               \
+    {                                                \
+    inline namespace NLOHMANN_JSON_NAMESPACE_CONCAT( \
+                NLOHMANN_JSON_ABI_TAGS,              \
+                NLOHMANN_JSON_NAMESPACE_VERSION)     \
+    {
+#endif
+
+#ifndef NLOHMANN_JSON_NAMESPACE_END
+#define NLOHMANN_JSON_NAMESPACE_END                                     \
+    }  /* namespace (inline namespace) NOLINT(readability/namespace) */ \
+    }  // namespace nlohmann
+#endif
diff --git a/external_imported/json/include/nlohmann/detail/conversions/from_json.hpp b/external_imported/json/include/nlohmann/detail/conversions/from_json.hpp
index f03c01815..aa2f0cbf4 100644
--- a/external_imported/json/include/nlohmann/detail/conversions/from_json.hpp
+++ b/external_imported/json/include/nlohmann/detail/conversions/from_json.hpp
@@ -1,3 +1,11 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 #pragma once
 
 #include <algorithm> // transform
@@ -15,19 +23,22 @@
 #include <nlohmann/detail/exceptions.hpp>
 #include <nlohmann/detail/macro_scope.hpp>
 #include <nlohmann/detail/meta/cpp_future.hpp>
+#include <nlohmann/detail/meta/identity_tag.hpp>
+#include <nlohmann/detail/meta/std_fs.hpp>
 #include <nlohmann/detail/meta/type_traits.hpp>
+#include <nlohmann/detail/string_concat.hpp>
 #include <nlohmann/detail/value_t.hpp>
 
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
+
 template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename std::nullptr_t& n)
+inline void from_json(const BasicJsonType& j, typename std::nullptr_t& n)
 {
     if (JSON_HEDLEY_UNLIKELY(!j.is_null()))
     {
-        JSON_THROW(type_error::create(302, "type must be null, but is " + std::string(j.type_name()), j));
+        JSON_THROW(type_error::create(302, concat("type must be null, but is ", j.type_name()), &j));
     }
     n = nullptr;
 }
@@ -57,83 +68,92 @@ void get_arithmetic_value(const BasicJsonType& j, ArithmeticType& val)
             break;
         }
 
+        case value_t::null:
+        case value_t::object:
+        case value_t::array:
+        case value_t::string:
+        case value_t::boolean:
+        case value_t::binary:
+        case value_t::discarded:
         default:
-            JSON_THROW(type_error::create(302, "type must be number, but is " + std::string(j.type_name()), j));
+            JSON_THROW(type_error::create(302, concat("type must be number, but is ", j.type_name()), &j));
     }
 }
 
 template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename BasicJsonType::boolean_t& b)
+inline void from_json(const BasicJsonType& j, typename BasicJsonType::boolean_t& b)
 {
     if (JSON_HEDLEY_UNLIKELY(!j.is_boolean()))
     {
-        JSON_THROW(type_error::create(302, "type must be boolean, but is " + std::string(j.type_name()), j));
+        JSON_THROW(type_error::create(302, concat("type must be boolean, but is ", j.type_name()), &j));
     }
     b = *j.template get_ptr<const typename BasicJsonType::boolean_t*>();
 }
 
 template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename BasicJsonType::string_t& s)
+inline void from_json(const BasicJsonType& j, typename BasicJsonType::string_t& s)
 {
     if (JSON_HEDLEY_UNLIKELY(!j.is_string()))
     {
-        JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name()), j));
+        JSON_THROW(type_error::create(302, concat("type must be string, but is ", j.type_name()), &j));
     }
     s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
 }
 
 template <
-    typename BasicJsonType, typename ConstructibleStringType,
+    typename BasicJsonType, typename StringType,
     enable_if_t <
-        is_constructible_string_type<BasicJsonType, ConstructibleStringType>::value&&
-        !std::is_same<typename BasicJsonType::string_t,
-                      ConstructibleStringType>::value,
-        int > = 0 >
-void from_json(const BasicJsonType& j, ConstructibleStringType& s)
+        std::is_assignable<StringType&, const typename BasicJsonType::string_t>::value
+        && is_detected_exact<typename BasicJsonType::string_t::value_type, value_type_t, StringType>::value
+        && !std::is_same<typename BasicJsonType::string_t, StringType>::value
+        && !is_json_ref<StringType>::value, int > = 0 >
+inline void from_json(const BasicJsonType& j, StringType& s)
 {
     if (JSON_HEDLEY_UNLIKELY(!j.is_string()))
     {
-        JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name()), j));
+        JSON_THROW(type_error::create(302, concat("type must be string, but is ", j.type_name()), &j));
     }
 
     s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
 }
 
 template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename BasicJsonType::number_float_t& val)
+inline void from_json(const BasicJsonType& j, typename BasicJsonType::number_float_t& val)
 {
     get_arithmetic_value(j, val);
 }
 
 template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename BasicJsonType::number_unsigned_t& val)
+inline void from_json(const BasicJsonType& j, typename BasicJsonType::number_unsigned_t& val)
 {
     get_arithmetic_value(j, val);
 }
 
 template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename BasicJsonType::number_integer_t& val)
+inline void from_json(const BasicJsonType& j, typename BasicJsonType::number_integer_t& val)
 {
     get_arithmetic_value(j, val);
 }
 
+#if !JSON_DISABLE_ENUM_SERIALIZATION
 template<typename BasicJsonType, typename EnumType,
          enable_if_t<std::is_enum<EnumType>::value, int> = 0>
-void from_json(const BasicJsonType& j, EnumType& e)
+inline void from_json(const BasicJsonType& j, EnumType& e)
 {
     typename std::underlying_type<EnumType>::type val;
     get_arithmetic_value(j, val);
     e = static_cast<EnumType>(val);
 }
+#endif  // JSON_DISABLE_ENUM_SERIALIZATION
 
 // forward_list doesn't have an insert method
 template<typename BasicJsonType, typename T, typename Allocator,
          enable_if_t<is_getable<BasicJsonType, T>::value, int> = 0>
-void from_json(const BasicJsonType& j, std::forward_list<T, Allocator>& l)
+inline void from_json(const BasicJsonType& j, std::forward_list<T, Allocator>& l)
 {
     if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
     {
-        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()), j));
+        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
     }
     l.clear();
     std::transform(j.rbegin(), j.rend(),
@@ -146,11 +166,11 @@ void from_json(const BasicJsonType& j, std::forward_list<T, Allocator>& l)
 // valarray doesn't have an insert method
 template<typename BasicJsonType, typename T,
          enable_if_t<is_getable<BasicJsonType, T>::value, int> = 0>
-void from_json(const BasicJsonType& j, std::valarray<T>& l)
+inline void from_json(const BasicJsonType& j, std::valarray<T>& l)
 {
     if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
     {
-        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()), j));
+        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
     }
     l.resize(j.size());
     std::transform(j.begin(), j.end(), std::begin(l),
@@ -161,7 +181,7 @@ void from_json(const BasicJsonType& j, std::valarray<T>& l)
 }
 
 template<typename BasicJsonType, typename T, std::size_t N>
-auto from_json(const BasicJsonType& j, T (&arr)[N])
+auto from_json(const BasicJsonType& j, T (&arr)[N])  // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
 -> decltype(j.template get<T>(), void())
 {
     for (std::size_t i = 0; i < N; ++i)
@@ -171,7 +191,7 @@ auto from_json(const BasicJsonType& j, T (&arr)[N])
 }
 
 template<typename BasicJsonType>
-void from_json_array_impl(const BasicJsonType& j, typename BasicJsonType::array_t& arr, priority_tag<3> /*unused*/)
+inline void from_json_array_impl(const BasicJsonType& j, typename BasicJsonType::array_t& arr, priority_tag<3> /*unused*/)
 {
     arr = *j.template get_ptr<const typename BasicJsonType::array_t*>();
 }
@@ -187,7 +207,10 @@ auto from_json_array_impl(const BasicJsonType& j, std::array<T, N>& arr,
     }
 }
 
-template<typename BasicJsonType, typename ConstructibleArrayType>
+template<typename BasicJsonType, typename ConstructibleArrayType,
+         enable_if_t<
+             std::is_assignable<ConstructibleArrayType&, ConstructibleArrayType>::value,
+             int> = 0>
 auto from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr, priority_tag<1> /*unused*/)
 -> decltype(
     arr.reserve(std::declval<typename ConstructibleArrayType::size_type>()),
@@ -208,9 +231,12 @@ auto from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr, p
     arr = std::move(ret);
 }
 
-template<typename BasicJsonType, typename ConstructibleArrayType>
-void from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr,
-                          priority_tag<0> /*unused*/)
+template<typename BasicJsonType, typename ConstructibleArrayType,
+         enable_if_t<
+             std::is_assignable<ConstructibleArrayType&, ConstructibleArrayType>::value,
+             int> = 0>
+inline void from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr,
+                                 priority_tag<0> /*unused*/)
 {
     using std::end;
 
@@ -241,18 +267,37 @@ void())
 {
     if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
     {
-        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()), j));
+        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
     }
 
     from_json_array_impl(j, arr, priority_tag<3> {});
 }
 
+template < typename BasicJsonType, typename T, std::size_t... Idx >
+std::array<T, sizeof...(Idx)> from_json_inplace_array_impl(BasicJsonType&& j,
+        identity_tag<std::array<T, sizeof...(Idx)>> /*unused*/, index_sequence<Idx...> /*unused*/)
+{
+    return { { std::forward<BasicJsonType>(j).at(Idx).template get<T>()... } };
+}
+
+template < typename BasicJsonType, typename T, std::size_t N >
+auto from_json(BasicJsonType&& j, identity_tag<std::array<T, N>> tag)
+-> decltype(from_json_inplace_array_impl(std::forward<BasicJsonType>(j), tag, make_index_sequence<N> {}))
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
+    }
+
+    return from_json_inplace_array_impl(std::forward<BasicJsonType>(j), tag, make_index_sequence<N> {});
+}
+
 template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename BasicJsonType::binary_t& bin)
+inline void from_json(const BasicJsonType& j, typename BasicJsonType::binary_t& bin)
 {
     if (JSON_HEDLEY_UNLIKELY(!j.is_binary()))
     {
-        JSON_THROW(type_error::create(302, "type must be binary, but is " + std::string(j.type_name()), j));
+        JSON_THROW(type_error::create(302, concat("type must be binary, but is ", j.type_name()), &j));
     }
 
     bin = *j.template get_ptr<const typename BasicJsonType::binary_t*>();
@@ -260,15 +305,15 @@ void from_json(const BasicJsonType& j, typename BasicJsonType::binary_t& bin)
 
 template<typename BasicJsonType, typename ConstructibleObjectType,
          enable_if_t<is_constructible_object_type<BasicJsonType, ConstructibleObjectType>::value, int> = 0>
-void from_json(const BasicJsonType& j, ConstructibleObjectType& obj)
+inline void from_json(const BasicJsonType& j, ConstructibleObjectType& obj)
 {
     if (JSON_HEDLEY_UNLIKELY(!j.is_object()))
     {
-        JSON_THROW(type_error::create(302, "type must be object, but is " + std::string(j.type_name()), j));
+        JSON_THROW(type_error::create(302, concat("type must be object, but is ", j.type_name()), &j));
     }
 
     ConstructibleObjectType ret;
-    auto inner_object = j.template get_ptr<const typename BasicJsonType::object_t*>();
+    const auto* inner_object = j.template get_ptr<const typename BasicJsonType::object_t*>();
     using value_type = typename ConstructibleObjectType::value_type;
     std::transform(
         inner_object->begin(), inner_object->end(),
@@ -292,7 +337,7 @@ template < typename BasicJsonType, typename ArithmeticType,
                !std::is_same<ArithmeticType, typename BasicJsonType::number_float_t>::value&&
                !std::is_same<ArithmeticType, typename BasicJsonType::boolean_t>::value,
                int > = 0 >
-void from_json(const BasicJsonType& j, ArithmeticType& val)
+inline void from_json(const BasicJsonType& j, ArithmeticType& val)
 {
     switch (static_cast<value_t>(j))
     {
@@ -317,44 +362,75 @@ void from_json(const BasicJsonType& j, ArithmeticType& val)
             break;
         }
 
+        case value_t::null:
+        case value_t::object:
+        case value_t::array:
+        case value_t::string:
+        case value_t::binary:
+        case value_t::discarded:
         default:
-            JSON_THROW(type_error::create(302, "type must be number, but is " + std::string(j.type_name()), j));
+            JSON_THROW(type_error::create(302, concat("type must be number, but is ", j.type_name()), &j));
     }
 }
 
+template<typename BasicJsonType, typename... Args, std::size_t... Idx>
+std::tuple<Args...> from_json_tuple_impl_base(BasicJsonType&& j, index_sequence<Idx...> /*unused*/)
+{
+    return std::make_tuple(std::forward<BasicJsonType>(j).at(Idx).template get<Args>()...);
+}
+
+template < typename BasicJsonType, class A1, class A2 >
+std::pair<A1, A2> from_json_tuple_impl(BasicJsonType&& j, identity_tag<std::pair<A1, A2>> /*unused*/, priority_tag<0> /*unused*/)
+{
+    return {std::forward<BasicJsonType>(j).at(0).template get<A1>(),
+            std::forward<BasicJsonType>(j).at(1).template get<A2>()};
+}
+
 template<typename BasicJsonType, typename A1, typename A2>
-void from_json(const BasicJsonType& j, std::pair<A1, A2>& p)
+inline void from_json_tuple_impl(BasicJsonType&& j, std::pair<A1, A2>& p, priority_tag<1> /*unused*/)
 {
-    p = {j.at(0).template get<A1>(), j.at(1).template get<A2>()};
+    p = from_json_tuple_impl(std::forward<BasicJsonType>(j), identity_tag<std::pair<A1, A2>> {}, priority_tag<0> {});
 }
 
-template<typename BasicJsonType, typename Tuple, std::size_t... Idx>
-void from_json_tuple_impl(const BasicJsonType& j, Tuple& t, index_sequence<Idx...> /*unused*/)
+template<typename BasicJsonType, typename... Args>
+std::tuple<Args...> from_json_tuple_impl(BasicJsonType&& j, identity_tag<std::tuple<Args...>> /*unused*/, priority_tag<2> /*unused*/)
 {
-    t = std::make_tuple(j.at(Idx).template get<typename std::tuple_element<Idx, Tuple>::type>()...);
+    return from_json_tuple_impl_base<BasicJsonType, Args...>(std::forward<BasicJsonType>(j), index_sequence_for<Args...> {});
 }
 
 template<typename BasicJsonType, typename... Args>
-void from_json(const BasicJsonType& j, std::tuple<Args...>& t)
+inline void from_json_tuple_impl(BasicJsonType&& j, std::tuple<Args...>& t, priority_tag<3> /*unused*/)
 {
-    from_json_tuple_impl(j, t, index_sequence_for<Args...> {});
+    t = from_json_tuple_impl_base<BasicJsonType, Args...>(std::forward<BasicJsonType>(j), index_sequence_for<Args...> {});
+}
+
+template<typename BasicJsonType, typename TupleRelated>
+auto from_json(BasicJsonType&& j, TupleRelated&& t)
+-> decltype(from_json_tuple_impl(std::forward<BasicJsonType>(j), std::forward<TupleRelated>(t), priority_tag<3> {}))
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
+    }
+
+    return from_json_tuple_impl(std::forward<BasicJsonType>(j), std::forward<TupleRelated>(t), priority_tag<3> {});
 }
 
 template < typename BasicJsonType, typename Key, typename Value, typename Compare, typename Allocator,
            typename = enable_if_t < !std::is_constructible <
                                         typename BasicJsonType::string_t, Key >::value >>
-void from_json(const BasicJsonType& j, std::map<Key, Value, Compare, Allocator>& m)
+inline void from_json(const BasicJsonType& j, std::map<Key, Value, Compare, Allocator>& m)
 {
     if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
     {
-        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()), j));
+        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
     }
     m.clear();
     for (const auto& p : j)
     {
         if (JSON_HEDLEY_UNLIKELY(!p.is_array()))
         {
-            JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(p.type_name()), j));
+            JSON_THROW(type_error::create(302, concat("type must be array, but is ", p.type_name()), &j));
         }
         m.emplace(p.at(0).template get<Key>(), p.at(1).template get<Value>());
     }
@@ -363,40 +439,59 @@ void from_json(const BasicJsonType& j, std::map<Key, Value, Compare, Allocator>&
 template < typename BasicJsonType, typename Key, typename Value, typename Hash, typename KeyEqual, typename Allocator,
            typename = enable_if_t < !std::is_constructible <
                                         typename BasicJsonType::string_t, Key >::value >>
-void from_json(const BasicJsonType& j, std::unordered_map<Key, Value, Hash, KeyEqual, Allocator>& m)
+inline void from_json(const BasicJsonType& j, std::unordered_map<Key, Value, Hash, KeyEqual, Allocator>& m)
 {
     if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
     {
-        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()), j));
+        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
     }
     m.clear();
     for (const auto& p : j)
     {
         if (JSON_HEDLEY_UNLIKELY(!p.is_array()))
         {
-            JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(p.type_name()), j));
+            JSON_THROW(type_error::create(302, concat("type must be array, but is ", p.type_name()), &j));
         }
         m.emplace(p.at(0).template get<Key>(), p.at(1).template get<Value>());
     }
 }
 
+#if JSON_HAS_FILESYSTEM || JSON_HAS_EXPERIMENTAL_FILESYSTEM
+template<typename BasicJsonType>
+inline void from_json(const BasicJsonType& j, std_fs::path& p)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_string()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be string, but is ", j.type_name()), &j));
+    }
+    p = *j.template get_ptr<const typename BasicJsonType::string_t*>();
+}
+#endif
+
 struct from_json_fn
 {
     template<typename BasicJsonType, typename T>
-    auto operator()(const BasicJsonType& j, T& val) const
-    noexcept(noexcept(from_json(j, val)))
-    -> decltype(from_json(j, val), void())
+    auto operator()(const BasicJsonType& j, T&& val) const
+    noexcept(noexcept(from_json(j, std::forward<T>(val))))
+    -> decltype(from_json(j, std::forward<T>(val)))
     {
-        return from_json(j, val);
+        return from_json(j, std::forward<T>(val));
     }
 };
+
 }  // namespace detail
 
+#ifndef JSON_HAS_CPP_17
 /// namespace to hold default `from_json` function
 /// to see why this is required:
 /// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/n4381.html
-namespace
+namespace // NOLINT(cert-dcl59-cpp,fuchsia-header-anon-namespaces,google-build-namespaces)
 {
-constexpr const auto& from_json = detail::static_const<detail::from_json_fn>::value;
-} // namespace
-} // namespace nlohmann
+#endif
+JSON_INLINE_VARIABLE constexpr const auto& from_json = // NOLINT(misc-definitions-in-headers)
+    detail::static_const<detail::from_json_fn>::value;
+#ifndef JSON_HAS_CPP_17
+}  // namespace
+#endif
+
+NLOHMANN_JSON_NAMESPACE_END
diff --git a/external_imported/json/include/nlohmann/detail/conversions/to_chars.hpp b/external_imported/json/include/nlohmann/detail/conversions/to_chars.hpp
index 49ed0f913..e10741c92 100644
--- a/external_imported/json/include/nlohmann/detail/conversions/to_chars.hpp
+++ b/external_imported/json/include/nlohmann/detail/conversions/to_chars.hpp
@@ -1,3 +1,12 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2009 Florian Loitsch <https://florian.loitsch.com/>
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 #pragma once
 
 #include <array> // array
@@ -9,8 +18,7 @@
 
 #include <nlohmann/detail/macro_scope.hpp>
 
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
 
@@ -200,7 +208,7 @@ boundaries compute_boundaries(FloatType value)
 
     using bits_type = typename std::conditional<kPrecision == 24, std::uint32_t, std::uint64_t >::type;
 
-    const std::uint64_t bits = reinterpret_bits<bits_type>(value);
+    const auto bits = static_cast<std::uint64_t>(reinterpret_bits<bits_type>(value));
     const std::uint64_t E = bits >> (kPrecision - 1);
     const std::uint64_t F = bits & (kHiddenBit - 1);
 
@@ -618,7 +626,7 @@ inline void grisu2_digit_gen(char* buffer, int& length, int& decimal_exponent,
 
     JSON_ASSERT(p1 > 0);
 
-    std::uint32_t pow10;
+    std::uint32_t pow10{};
     const int k = find_largest_pow10(p1, pow10);
 
     //      10^(k-1) <= p1 < 10^k, pow10 = 10^(k-1)
@@ -891,7 +899,7 @@ void grisu2(char* buf, int& len, int& decimal_exponent, FloatType value)
     //
     // The documentation for 'std::to_chars' (https://en.cppreference.com/w/cpp/utility/to_chars)
     // says "value is converted to a string as if by std::sprintf in the default ("C") locale"
-    // and since sprintf promotes float's to double's, I think this is exactly what 'std::to_chars'
+    // and since sprintf promotes floats to doubles, I think this is exactly what 'std::to_chars'
     // does.
     // On the other hand, the documentation for 'std::to_chars' requires that "parsing the
     // representation using the corresponding std::from_chars function recovers value exactly". That
@@ -901,7 +909,7 @@ void grisu2(char* buf, int& len, int& decimal_exponent, FloatType value)
     // NB: If the neighbors are computed for single-precision numbers, there is a single float
     //     (7.0385307e-26f) which can't be recovered using strtod. The resulting double precision
     //     value is off by 1 ulp.
-#if 0
+#if 0 // NOLINT(readability-avoid-unconditional-preprocessor-if)
     const boundaries w = compute_boundaries(static_cast<double>(value));
 #else
     const boundaries w = compute_boundaries(value);
@@ -1039,7 +1047,7 @@ inline char* format_buffer(char* buf, int len, int decimal_exponent,
     return append_exponent(buf, n - 1);
 }
 
-} // namespace dtoa_impl
+}  // namespace dtoa_impl
 
 /*!
 @brief generates a decimal representation of the floating-point number value in [first, last).
@@ -1066,6 +1074,10 @@ char* to_chars(char* first, const char* last, FloatType value)
         *first++ = '-';
     }
 
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
     if (value == 0) // +-0
     {
         *first++ = '0';
@@ -1074,6 +1086,9 @@ char* to_chars(char* first, const char* last, FloatType value)
         *first++ = '0';
         return first;
     }
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
 
     JSON_ASSERT(last - first >= std::numeric_limits<FloatType>::max_digits10);
 
@@ -1099,5 +1114,5 @@ char* to_chars(char* first, const char* last, FloatType value)
     return dtoa_impl::format_buffer(first, len, decimal_exponent, kMinExp, kMaxExp);
 }
 
-} // namespace detail
-} // namespace nlohmann
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
diff --git a/external_imported/json/include/nlohmann/detail/conversions/to_json.hpp b/external_imported/json/include/nlohmann/detail/conversions/to_json.hpp
index 228e81879..e39b7797d 100644
--- a/external_imported/json/include/nlohmann/detail/conversions/to_json.hpp
+++ b/external_imported/json/include/nlohmann/detail/conversions/to_json.hpp
@@ -1,3 +1,11 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 #pragma once
 
 #include <algorithm> // copy
@@ -10,18 +18,27 @@
 #include <vector> // vector
 
 #include <nlohmann/detail/iterators/iteration_proxy.hpp>
+#include <nlohmann/detail/macro_scope.hpp>
 #include <nlohmann/detail/meta/cpp_future.hpp>
+#include <nlohmann/detail/meta/std_fs.hpp>
 #include <nlohmann/detail/meta/type_traits.hpp>
 #include <nlohmann/detail/value_t.hpp>
 
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
+
 //////////////////
 // constructors //
 //////////////////
 
+/*
+ * Note all external_constructor<>::construct functions need to call
+ * j.m_data.m_value.destroy(j.m_data.m_type) to avoid a memory leak in case j contains an
+ * allocated value (e.g., a string). See bug issue
+ * https://github.com/nlohmann/json/issues/2865 for more information.
+ */
+
 template<value_t> struct external_constructor;
 
 template<>
@@ -30,8 +47,9 @@ struct external_constructor<value_t::boolean>
     template<typename BasicJsonType>
     static void construct(BasicJsonType& j, typename BasicJsonType::boolean_t b) noexcept
     {
-        j.m_type = value_t::boolean;
-        j.m_value = b;
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::boolean;
+        j.m_data.m_value = b;
         j.assert_invariant();
     }
 };
@@ -42,16 +60,18 @@ struct external_constructor<value_t::string>
     template<typename BasicJsonType>
     static void construct(BasicJsonType& j, const typename BasicJsonType::string_t& s)
     {
-        j.m_type = value_t::string;
-        j.m_value = s;
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::string;
+        j.m_data.m_value = s;
         j.assert_invariant();
     }
 
     template<typename BasicJsonType>
     static void construct(BasicJsonType& j, typename BasicJsonType::string_t&& s)
     {
-        j.m_type = value_t::string;
-        j.m_value = std::move(s);
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::string;
+        j.m_data.m_value = std::move(s);
         j.assert_invariant();
     }
 
@@ -60,8 +80,9 @@ struct external_constructor<value_t::string>
                              int > = 0 >
     static void construct(BasicJsonType& j, const CompatibleStringType& str)
     {
-        j.m_type = value_t::string;
-        j.m_value.string = j.template create<typename BasicJsonType::string_t>(str);
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::string;
+        j.m_data.m_value.string = j.template create<typename BasicJsonType::string_t>(str);
         j.assert_invariant();
     }
 };
@@ -72,18 +93,18 @@ struct external_constructor<value_t::binary>
     template<typename BasicJsonType>
     static void construct(BasicJsonType& j, const typename BasicJsonType::binary_t& b)
     {
-        j.m_type = value_t::binary;
-        typename BasicJsonType::binary_t value{b};
-        j.m_value = value;
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::binary;
+        j.m_data.m_value = typename BasicJsonType::binary_t(b);
         j.assert_invariant();
     }
 
     template<typename BasicJsonType>
     static void construct(BasicJsonType& j, typename BasicJsonType::binary_t&& b)
     {
-        j.m_type = value_t::binary;
-        typename BasicJsonType::binary_t value{std::move(b)};
-        j.m_value = value;
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::binary;
+        j.m_data.m_value = typename BasicJsonType::binary_t(std::move(b));
         j.assert_invariant();
     }
 };
@@ -94,8 +115,9 @@ struct external_constructor<value_t::number_float>
     template<typename BasicJsonType>
     static void construct(BasicJsonType& j, typename BasicJsonType::number_float_t val) noexcept
     {
-        j.m_type = value_t::number_float;
-        j.m_value = val;
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::number_float;
+        j.m_data.m_value = val;
         j.assert_invariant();
     }
 };
@@ -106,8 +128,9 @@ struct external_constructor<value_t::number_unsigned>
     template<typename BasicJsonType>
     static void construct(BasicJsonType& j, typename BasicJsonType::number_unsigned_t val) noexcept
     {
-        j.m_type = value_t::number_unsigned;
-        j.m_value = val;
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::number_unsigned;
+        j.m_data.m_value = val;
         j.assert_invariant();
     }
 };
@@ -118,8 +141,9 @@ struct external_constructor<value_t::number_integer>
     template<typename BasicJsonType>
     static void construct(BasicJsonType& j, typename BasicJsonType::number_integer_t val) noexcept
     {
-        j.m_type = value_t::number_integer;
-        j.m_value = val;
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::number_integer;
+        j.m_data.m_value = val;
         j.assert_invariant();
     }
 };
@@ -130,8 +154,9 @@ struct external_constructor<value_t::array>
     template<typename BasicJsonType>
     static void construct(BasicJsonType& j, const typename BasicJsonType::array_t& arr)
     {
-        j.m_type = value_t::array;
-        j.m_value = arr;
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::array;
+        j.m_data.m_value = arr;
         j.set_parents();
         j.assert_invariant();
     }
@@ -139,8 +164,9 @@ struct external_constructor<value_t::array>
     template<typename BasicJsonType>
     static void construct(BasicJsonType& j, typename BasicJsonType::array_t&& arr)
     {
-        j.m_type = value_t::array;
-        j.m_value = std::move(arr);
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::array;
+        j.m_data.m_value = std::move(arr);
         j.set_parents();
         j.assert_invariant();
     }
@@ -152,8 +178,10 @@ struct external_constructor<value_t::array>
     {
         using std::begin;
         using std::end;
-        j.m_type = value_t::array;
-        j.m_value.array = j.template create<typename BasicJsonType::array_t>(begin(arr), end(arr));
+
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::array;
+        j.m_data.m_value.array = j.template create<typename BasicJsonType::array_t>(begin(arr), end(arr));
         j.set_parents();
         j.assert_invariant();
     }
@@ -161,13 +189,14 @@ struct external_constructor<value_t::array>
     template<typename BasicJsonType>
     static void construct(BasicJsonType& j, const std::vector<bool>& arr)
     {
-        j.m_type = value_t::array;
-        j.m_value = value_t::array;
-        j.m_value.array->reserve(arr.size());
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::array;
+        j.m_data.m_value = value_t::array;
+        j.m_data.m_value.array->reserve(arr.size());
         for (const bool x : arr)
         {
-            j.m_value.array->push_back(x);
-            j.set_parent(j.m_value.array->back());
+            j.m_data.m_value.array->push_back(x);
+            j.set_parent(j.m_data.m_value.array->back());
         }
         j.assert_invariant();
     }
@@ -176,12 +205,13 @@ struct external_constructor<value_t::array>
              enable_if_t<std::is_convertible<T, BasicJsonType>::value, int> = 0>
     static void construct(BasicJsonType& j, const std::valarray<T>& arr)
     {
-        j.m_type = value_t::array;
-        j.m_value = value_t::array;
-        j.m_value.array->resize(arr.size());
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::array;
+        j.m_data.m_value = value_t::array;
+        j.m_data.m_value.array->resize(arr.size());
         if (arr.size() > 0)
         {
-            std::copy(std::begin(arr), std::end(arr), j.m_value.array->begin());
+            std::copy(std::begin(arr), std::end(arr), j.m_data.m_value.array->begin());
         }
         j.set_parents();
         j.assert_invariant();
@@ -194,8 +224,9 @@ struct external_constructor<value_t::object>
     template<typename BasicJsonType>
     static void construct(BasicJsonType& j, const typename BasicJsonType::object_t& obj)
     {
-        j.m_type = value_t::object;
-        j.m_value = obj;
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::object;
+        j.m_data.m_value = obj;
         j.set_parents();
         j.assert_invariant();
     }
@@ -203,8 +234,9 @@ struct external_constructor<value_t::object>
     template<typename BasicJsonType>
     static void construct(BasicJsonType& j, typename BasicJsonType::object_t&& obj)
     {
-        j.m_type = value_t::object;
-        j.m_value = std::move(obj);
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::object;
+        j.m_data.m_value = std::move(obj);
         j.set_parents();
         j.assert_invariant();
     }
@@ -216,8 +248,9 @@ struct external_constructor<value_t::object>
         using std::begin;
         using std::end;
 
-        j.m_type = value_t::object;
-        j.m_value.object = j.template create<typename BasicJsonType::object_t>(begin(obj), end(obj));
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::object;
+        j.m_data.m_value.object = j.template create<typename BasicJsonType::object_t>(begin(obj), end(obj));
         j.set_parents();
         j.assert_invariant();
     }
@@ -229,55 +262,70 @@ struct external_constructor<value_t::object>
 
 template<typename BasicJsonType, typename T,
          enable_if_t<std::is_same<T, typename BasicJsonType::boolean_t>::value, int> = 0>
-void to_json(BasicJsonType& j, T b) noexcept
+inline void to_json(BasicJsonType& j, T b) noexcept
 {
     external_constructor<value_t::boolean>::construct(j, b);
 }
 
+template < typename BasicJsonType, typename BoolRef,
+           enable_if_t <
+               ((std::is_same<std::vector<bool>::reference, BoolRef>::value
+                 && !std::is_same <std::vector<bool>::reference, typename BasicJsonType::boolean_t&>::value)
+                || (std::is_same<std::vector<bool>::const_reference, BoolRef>::value
+                    && !std::is_same <detail::uncvref_t<std::vector<bool>::const_reference>,
+                                      typename BasicJsonType::boolean_t >::value))
+               && std::is_convertible<const BoolRef&, typename BasicJsonType::boolean_t>::value, int > = 0 >
+inline void to_json(BasicJsonType& j, const BoolRef& b) noexcept
+{
+    external_constructor<value_t::boolean>::construct(j, static_cast<typename BasicJsonType::boolean_t>(b));
+}
+
 template<typename BasicJsonType, typename CompatibleString,
          enable_if_t<std::is_constructible<typename BasicJsonType::string_t, CompatibleString>::value, int> = 0>
-void to_json(BasicJsonType& j, const CompatibleString& s)
+inline void to_json(BasicJsonType& j, const CompatibleString& s)
 {
     external_constructor<value_t::string>::construct(j, s);
 }
 
 template<typename BasicJsonType>
-void to_json(BasicJsonType& j, typename BasicJsonType::string_t&& s)
+inline void to_json(BasicJsonType& j, typename BasicJsonType::string_t&& s)
 {
     external_constructor<value_t::string>::construct(j, std::move(s));
 }
 
 template<typename BasicJsonType, typename FloatType,
          enable_if_t<std::is_floating_point<FloatType>::value, int> = 0>
-void to_json(BasicJsonType& j, FloatType val) noexcept
+inline void to_json(BasicJsonType& j, FloatType val) noexcept
 {
     external_constructor<value_t::number_float>::construct(j, static_cast<typename BasicJsonType::number_float_t>(val));
 }
 
 template<typename BasicJsonType, typename CompatibleNumberUnsignedType,
          enable_if_t<is_compatible_integer_type<typename BasicJsonType::number_unsigned_t, CompatibleNumberUnsignedType>::value, int> = 0>
-void to_json(BasicJsonType& j, CompatibleNumberUnsignedType val) noexcept
+inline void to_json(BasicJsonType& j, CompatibleNumberUnsignedType val) noexcept
 {
     external_constructor<value_t::number_unsigned>::construct(j, static_cast<typename BasicJsonType::number_unsigned_t>(val));
 }
 
 template<typename BasicJsonType, typename CompatibleNumberIntegerType,
          enable_if_t<is_compatible_integer_type<typename BasicJsonType::number_integer_t, CompatibleNumberIntegerType>::value, int> = 0>
-void to_json(BasicJsonType& j, CompatibleNumberIntegerType val) noexcept
+inline void to_json(BasicJsonType& j, CompatibleNumberIntegerType val) noexcept
 {
     external_constructor<value_t::number_integer>::construct(j, static_cast<typename BasicJsonType::number_integer_t>(val));
 }
 
+#if !JSON_DISABLE_ENUM_SERIALIZATION
 template<typename BasicJsonType, typename EnumType,
          enable_if_t<std::is_enum<EnumType>::value, int> = 0>
-void to_json(BasicJsonType& j, EnumType e) noexcept
+inline void to_json(BasicJsonType& j, EnumType e) noexcept
 {
     using underlying_type = typename std::underlying_type<EnumType>::type;
     external_constructor<value_t::number_integer>::construct(j, static_cast<underlying_type>(e));
 }
+#endif  // JSON_DISABLE_ENUM_SERIALIZATION
 
 template<typename BasicJsonType>
-void to_json(BasicJsonType& j, const std::vector<bool>& e)
+inline void to_json(BasicJsonType& j, const std::vector<bool>& e)
 {
     external_constructor<value_t::array>::construct(j, e);
 }
@@ -290,39 +338,39 @@ template < typename BasicJsonType, typename CompatibleArrayType,
                          !std::is_same<typename BasicJsonType::binary_t, CompatibleArrayType>::value&&
                          !is_basic_json<CompatibleArrayType>::value,
                          int > = 0 >
-void to_json(BasicJsonType& j, const CompatibleArrayType& arr)
+inline void to_json(BasicJsonType& j, const CompatibleArrayType& arr)
 {
     external_constructor<value_t::array>::construct(j, arr);
 }
 
 template<typename BasicJsonType>
-void to_json(BasicJsonType& j, const typename BasicJsonType::binary_t& bin)
+inline void to_json(BasicJsonType& j, const typename BasicJsonType::binary_t& bin)
 {
     external_constructor<value_t::binary>::construct(j, bin);
 }
 
 template<typename BasicJsonType, typename T,
          enable_if_t<std::is_convertible<T, BasicJsonType>::value, int> = 0>
-void to_json(BasicJsonType& j, const std::valarray<T>& arr)
+inline void to_json(BasicJsonType& j, const std::valarray<T>& arr)
 {
     external_constructor<value_t::array>::construct(j, std::move(arr));
 }
 
 template<typename BasicJsonType>
-void to_json(BasicJsonType& j, typename BasicJsonType::array_t&& arr)
+inline void to_json(BasicJsonType& j, typename BasicJsonType::array_t&& arr)
 {
     external_constructor<value_t::array>::construct(j, std::move(arr));
 }
 
 template < typename BasicJsonType, typename CompatibleObjectType,
            enable_if_t < is_compatible_object_type<BasicJsonType, CompatibleObjectType>::value&& !is_basic_json<CompatibleObjectType>::value, int > = 0 >
-void to_json(BasicJsonType& j, const CompatibleObjectType& obj)
+inline void to_json(BasicJsonType& j, const CompatibleObjectType& obj)
 {
     external_constructor<value_t::object>::construct(j, obj);
 }
 
 template<typename BasicJsonType>
-void to_json(BasicJsonType& j, typename BasicJsonType::object_t&& obj)
+inline void to_json(BasicJsonType& j, typename BasicJsonType::object_t&& obj)
 {
     external_constructor<value_t::object>::construct(j, std::move(obj));
 }
@@ -330,15 +378,15 @@ void to_json(BasicJsonType& j, typename BasicJsonType::object_t&& obj)
 template <
     typename BasicJsonType, typename T, std::size_t N,
     enable_if_t < !std::is_constructible<typename BasicJsonType::string_t,
-                  const T(&)[N]>::value,
+                  const T(&)[N]>::value, // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
                   int > = 0 >
-void to_json(BasicJsonType& j, const T(&arr)[N])
+inline void to_json(BasicJsonType& j, const T(&arr)[N]) // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
 {
     external_constructor<value_t::array>::construct(j, arr);
 }
 
 template < typename BasicJsonType, typename T1, typename T2, enable_if_t < std::is_constructible<BasicJsonType, T1>::value&& std::is_constructible<BasicJsonType, T2>::value, int > = 0 >
-void to_json(BasicJsonType& j, const std::pair<T1, T2>& p)
+inline void to_json(BasicJsonType& j, const std::pair<T1, T2>& p)
 {
     j = { p.first, p.second };
 }
@@ -346,23 +394,31 @@ void to_json(BasicJsonType& j, const std::pair<T1, T2>& p)
 // for https://github.com/nlohmann/json/pull/1134
 template<typename BasicJsonType, typename T,
          enable_if_t<std::is_same<T, iteration_proxy_value<typename BasicJsonType::iterator>>::value, int> = 0>
-void to_json(BasicJsonType& j, const T& b)
+inline void to_json(BasicJsonType& j, const T& b)
 {
     j = { {b.key(), b.value()} };
 }
 
 template<typename BasicJsonType, typename Tuple, std::size_t... Idx>
-void to_json_tuple_impl(BasicJsonType& j, const Tuple& t, index_sequence<Idx...> /*unused*/)
+inline void to_json_tuple_impl(BasicJsonType& j, const Tuple& t, index_sequence<Idx...> /*unused*/)
 {
     j = { std::get<Idx>(t)... };
 }
 
 template<typename BasicJsonType, typename T, enable_if_t<is_constructible_tuple<BasicJsonType, T>::value, int > = 0>
-void to_json(BasicJsonType& j, const T& t)
+inline void to_json(BasicJsonType& j, const T& t)
 {
     to_json_tuple_impl(j, t, make_index_sequence<std::tuple_size<T>::value> {});
 }
 
+#if JSON_HAS_FILESYSTEM || JSON_HAS_EXPERIMENTAL_FILESYSTEM
+template<typename BasicJsonType>
+inline void to_json(BasicJsonType& j, const std_fs::path& p)
+{
+    j = p.string();
+}
+#endif
+
 struct to_json_fn
 {
     template<typename BasicJsonType, typename T>
@@ -374,9 +430,17 @@ struct to_json_fn
 };
 }  // namespace detail
 
+#ifndef JSON_HAS_CPP_17
 /// namespace to hold default `to_json` function
-namespace
+/// to see why this is required:
+/// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/n4381.html
+namespace // NOLINT(cert-dcl59-cpp,fuchsia-header-anon-namespaces,google-build-namespaces)
 {
-constexpr const auto& to_json = detail::static_const<detail::to_json_fn>::value;
-} // namespace
-} // namespace nlohmann
+#endif
+JSON_INLINE_VARIABLE constexpr const auto& to_json = // NOLINT(misc-definitions-in-headers)
+    detail::static_const<detail::to_json_fn>::value;
+#ifndef JSON_HAS_CPP_17
+}  // namespace
+#endif
+
+NLOHMANN_JSON_NAMESPACE_END
diff --git a/external_imported/json/include/nlohmann/detail/exceptions.hpp b/external_imported/json/include/nlohmann/detail/exceptions.hpp
index 5c9dce3c5..5974d7be2 100644
--- a/external_imported/json/include/nlohmann/detail/exceptions.hpp
+++ b/external_imported/json/include/nlohmann/detail/exceptions.hpp
@@ -1,86 +1,80 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 #pragma once
 
+#include <cstddef> // nullptr_t
 #include <exception> // exception
+#if JSON_DIAGNOSTICS
+    #include <numeric> // accumulate
+#endif
 #include <stdexcept> // runtime_error
 #include <string> // to_string
+#include <vector> // vector
 
 #include <nlohmann/detail/value_t.hpp>
 #include <nlohmann/detail/string_escape.hpp>
 #include <nlohmann/detail/input/position_t.hpp>
 #include <nlohmann/detail/macro_scope.hpp>
+#include <nlohmann/detail/meta/cpp_future.hpp>
+#include <nlohmann/detail/meta/type_traits.hpp>
+#include <nlohmann/detail/string_concat.hpp>
 
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
+
 ////////////////
 // exceptions //
 ////////////////
 
-/*!
-@brief general exception of the @ref basic_json class
-
-This class is an extension of `std::exception` objects with a member @a id for
-exception ids. It is used as the base class for all exceptions thrown by the
-@ref basic_json class. This class can hence be used as "wildcard" to catch
-exceptions.
-
-Subclasses:
-- @ref parse_error for exceptions indicating a parse error
-- @ref invalid_iterator for exceptions indicating errors with iterators
-- @ref type_error for exceptions indicating executing a member function with
-                  a wrong type
-- @ref out_of_range for exceptions indicating access out of the defined range
-- @ref other_error for exceptions indicating other library errors
-
-@internal
-@note To have nothrow-copy-constructible exceptions, we internally use
-      `std::runtime_error` which can cope with arbitrary-length error messages.
-      Intermediate strings are built with static functions and then passed to
-      the actual constructor.
-@endinternal
-
-@liveexample{The following code shows how arbitrary library exceptions can be
-caught.,exception}
-
-@since version 3.0.0
-*/
+/// @brief general exception of the @ref basic_json class
+/// @sa https://json.nlohmann.me/api/basic_json/exception/
 class exception : public std::exception
 {
   public:
     /// returns the explanatory string
-    JSON_HEDLEY_RETURNS_NON_NULL
     const char* what() const noexcept override
     {
         return m.what();
     }
 
     /// the id of the exception
-    const int id;
+    const int id; // NOLINT(cppcoreguidelines-non-private-member-variables-in-classes)
 
   protected:
     JSON_HEDLEY_NON_NULL(3)
-    exception(int id_, const char* what_arg) : id(id_), m(what_arg) {}
+    exception(int id_, const char* what_arg) : id(id_), m(what_arg) {} // NOLINT(bugprone-throw-keyword-missing)
 
     static std::string name(const std::string& ename, int id_)
     {
-        return "[json.exception." + ename + "." + std::to_string(id_) + "] ";
+        return concat("[json.exception.", ename, '.', std::to_string(id_), "] ");
+    }
+
+    static std::string diagnostics(std::nullptr_t /*leaf_element*/)
+    {
+        return "";
     }
 
     template<typename BasicJsonType>
-    static std::string diagnostics(const BasicJsonType& leaf_element)
+    static std::string diagnostics(const BasicJsonType* leaf_element)
     {
 #if JSON_DIAGNOSTICS
         std::vector<std::string> tokens;
-        for (const auto* current = &leaf_element; current->m_parent != nullptr; current = current->m_parent)
+        for (const auto* current = leaf_element; current != nullptr && current->m_parent != nullptr; current = current->m_parent)
         {
             switch (current->m_parent->type())
             {
                 case value_t::array:
                 {
-                    for (std::size_t i = 0; i < current->m_parent->m_value.array->size(); ++i)
+                    for (std::size_t i = 0; i < current->m_parent->m_data.m_value.array->size(); ++i)
                     {
-                        if (&current->m_parent->m_value.array->operator[](i) == current)
+                        if (&current->m_parent->m_data.m_value.array->operator[](i) == current)
                         {
                             tokens.emplace_back(std::to_string(i));
                             break;
@@ -91,7 +85,7 @@ class exception : public std::exception
 
                 case value_t::object:
                 {
-                    for (const auto& element : *current->m_parent->m_value.object)
+                    for (const auto& element : *current->m_parent->m_data.m_value.object)
                     {
                         if (&element.second == current)
                         {
@@ -102,6 +96,14 @@ class exception : public std::exception
                     break;
                 }
 
+                case value_t::null: // LCOV_EXCL_LINE
+                case value_t::string: // LCOV_EXCL_LINE
+                case value_t::boolean: // LCOV_EXCL_LINE
+                case value_t::number_integer: // LCOV_EXCL_LINE
+                case value_t::number_unsigned: // LCOV_EXCL_LINE
+                case value_t::number_float: // LCOV_EXCL_LINE
+                case value_t::binary: // LCOV_EXCL_LINE
+                case value_t::discarded: // LCOV_EXCL_LINE
                 default:   // LCOV_EXCL_LINE
                     break; // LCOV_EXCL_LINE
             }
@@ -112,12 +114,14 @@ class exception : public std::exception
             return "";
         }
 
-        return "(" + std::accumulate(tokens.rbegin(), tokens.rend(), std::string{},
-                                     [](const std::string & a, const std::string & b)
+        auto str = std::accumulate(tokens.rbegin(), tokens.rend(), std::string{},
+                                   [](const std::string & a, const std::string & b)
         {
-            return a + "/" + detail::escape(b);
-        }) + ") ";
+            return concat(a, '/', detail::escape(b));
+        });
+        return concat('(', str, ") ");
 #else
+        static_cast<void>(leaf_element);
         return "";
 #endif
     }
@@ -127,51 +131,8 @@ class exception : public std::exception
     std::runtime_error m;
 };
 
-/*!
-@brief exception indicating a parse error
-
-This exception is thrown by the library when a parse error occurs. Parse errors
-can occur during the deserialization of JSON text, CBOR, MessagePack, as well
-as when using JSON Patch.
-
-Member @a byte holds the byte index of the last read character in the input
-file.
-
-Exceptions have ids 1xx.
-
-name / id                      | example message | description
------------------------------- | --------------- | -------------------------
-json.exception.parse_error.101 | parse error at 2: unexpected end of input; expected string literal | This error indicates a syntax error while deserializing a JSON text. The error message describes that an unexpected token (character) was encountered, and the member @a byte indicates the error position.
-json.exception.parse_error.102 | parse error at 14: missing or wrong low surrogate | JSON uses the `\uxxxx` format to describe Unicode characters. Code points above above 0xFFFF are split into two `\uxxxx` entries ("surrogate pairs"). This error indicates that the surrogate pair is incomplete or contains an invalid code point.
-json.exception.parse_error.103 | parse error: code points above 0x10FFFF are invalid | Unicode supports code points up to 0x10FFFF. Code points above 0x10FFFF are invalid.
-json.exception.parse_error.104 | parse error: JSON patch must be an array of objects | [RFC 6902](https://tools.ietf.org/html/rfc6902) requires a JSON Patch document to be a JSON document that represents an array of objects.
-json.exception.parse_error.105 | parse error: operation must have string member 'op' | An operation of a JSON Patch document must contain exactly one "op" member, whose value indicates the operation to perform. Its value must be one of "add", "remove", "replace", "move", "copy", or "test"; other values are errors.
-json.exception.parse_error.106 | parse error: array index '01' must not begin with '0' | An array index in a JSON Pointer ([RFC 6901](https://tools.ietf.org/html/rfc6901)) may be `0` or any number without a leading `0`.
-json.exception.parse_error.107 | parse error: JSON pointer must be empty or begin with '/' - was: 'foo' | A JSON Pointer must be a Unicode string containing a sequence of zero or more reference tokens, each prefixed by a `/` character.
-json.exception.parse_error.108 | parse error: escape character '~' must be followed with '0' or '1' | In a JSON Pointer, only `~0` and `~1` are valid escape sequences.
-json.exception.parse_error.109 | parse error: array index 'one' is not a number | A JSON Pointer array index must be a number.
-json.exception.parse_error.110 | parse error at 1: cannot read 2 bytes from vector | When parsing CBOR or MessagePack, the byte vector ends before the complete value has been read.
-json.exception.parse_error.112 | parse error at 1: error reading CBOR; last byte: 0xF8 | Not all types of CBOR or MessagePack are supported. This exception occurs if an unsupported byte was read.
-json.exception.parse_error.113 | parse error at 2: expected a CBOR string; last byte: 0x98 | While parsing a map key, a value that is not a string has been read.
-json.exception.parse_error.114 | parse error: Unsupported BSON record type 0x0F | The parsing of the corresponding BSON record type is not implemented (yet).
-json.exception.parse_error.115 | parse error at byte 5: syntax error while parsing UBJSON high-precision number: invalid number text: 1A | A UBJSON high-precision number could not be parsed.
-
-@note For an input with n bytes, 1 is the index of the first character and n+1
-      is the index of the terminating null byte or the end of file. This also
-      holds true when reading a byte vector (CBOR or MessagePack).
-
-@liveexample{The following code shows how a `parse_error` exception can be
-caught.,parse_error}
-
-@sa - @ref exception for the base class of the library exceptions
-@sa - @ref invalid_iterator for exceptions indicating errors with iterators
-@sa - @ref type_error for exceptions indicating executing a member function with
-                    a wrong type
-@sa - @ref out_of_range for exceptions indicating access out of the defined range
-@sa - @ref other_error for exceptions indicating other library errors
-
-@since version 3.0.0
-*/
+/// @brief exception indicating a parse error
+/// @sa https://json.nlohmann.me/api/basic_json/parse_error/
 class parse_error : public exception
 {
   public:
@@ -184,21 +145,21 @@ class parse_error : public exception
     @param[in] what_arg  the explanatory string
     @return parse_error object
     */
-    template<typename BasicJsonType>
-    static parse_error create(int id_, const position_t& pos, const std::string& what_arg, const BasicJsonType& context)
+    template<typename BasicJsonContext, enable_if_t<is_basic_json_context<BasicJsonContext>::value, int> = 0>
+    static parse_error create(int id_, const position_t& pos, const std::string& what_arg, BasicJsonContext context)
     {
-        std::string w = exception::name("parse_error", id_) + "parse error" +
-                        position_string(pos) + ": " + exception::diagnostics(context) + what_arg;
-        return parse_error(id_, pos.chars_read_total, w.c_str());
+        const std::string w = concat(exception::name("parse_error", id_), "parse error",
+                                     position_string(pos), ": ", exception::diagnostics(context), what_arg);
+        return {id_, pos.chars_read_total, w.c_str()};
     }
 
-    template<typename BasicJsonType>
-    static parse_error create(int id_, std::size_t byte_, const std::string& what_arg, const BasicJsonType& context)
+    template<typename BasicJsonContext, enable_if_t<is_basic_json_context<BasicJsonContext>::value, int> = 0>
+    static parse_error create(int id_, std::size_t byte_, const std::string& what_arg, BasicJsonContext context)
     {
-        std::string w = exception::name("parse_error", id_) + "parse error" +
-                        (byte_ != 0 ? (" at byte " + std::to_string(byte_)) : "") +
-                        ": " + exception::diagnostics(context) + what_arg;
-        return parse_error(id_, byte_, w.c_str());
+        const std::string w = concat(exception::name("parse_error", id_), "parse error",
+                                     (byte_ != 0 ? (concat(" at byte ", std::to_string(byte_))) : ""),
+                                     ": ", exception::diagnostics(context), what_arg);
+        return {id_, byte_, w.c_str()};
     }
 
     /*!
@@ -218,56 +179,21 @@ class parse_error : public exception
 
     static std::string position_string(const position_t& pos)
     {
-        return " at line " + std::to_string(pos.lines_read + 1) +
-               ", column " + std::to_string(pos.chars_read_current_line);
+        return concat(" at line ", std::to_string(pos.lines_read + 1),
+                      ", column ", std::to_string(pos.chars_read_current_line));
     }
 };
 
-/*!
-@brief exception indicating errors with iterators
-
-This exception is thrown if iterators passed to a library function do not match
-the expected semantics.
-
-Exceptions have ids 2xx.
-
-name / id                           | example message | description
------------------------------------ | --------------- | -------------------------
-json.exception.invalid_iterator.201 | iterators are not compatible | The iterators passed to constructor @ref basic_json(InputIT first, InputIT last) are not compatible, meaning they do not belong to the same container. Therefore, the range (@a first, @a last) is invalid.
-json.exception.invalid_iterator.202 | iterator does not fit current value | In an erase or insert function, the passed iterator @a pos does not belong to the JSON value for which the function was called. It hence does not define a valid position for the deletion/insertion.
-json.exception.invalid_iterator.203 | iterators do not fit current value | Either iterator passed to function @ref erase(IteratorType first, IteratorType last) does not belong to the JSON value from which values shall be erased. It hence does not define a valid range to delete values from.
-json.exception.invalid_iterator.204 | iterators out of range | When an iterator range for a primitive type (number, boolean, or string) is passed to a constructor or an erase function, this range has to be exactly (@ref begin(), @ref end()), because this is the only way the single stored value is expressed. All other ranges are invalid.
-json.exception.invalid_iterator.205 | iterator out of range | When an iterator for a primitive type (number, boolean, or string) is passed to an erase function, the iterator has to be the @ref begin() iterator, because it is the only way to address the stored value. All other iterators are invalid.
-json.exception.invalid_iterator.206 | cannot construct with iterators from null | The iterators passed to constructor @ref basic_json(InputIT first, InputIT last) belong to a JSON null value and hence to not define a valid range.
-json.exception.invalid_iterator.207 | cannot use key() for non-object iterators | The key() member function can only be used on iterators belonging to a JSON object, because other types do not have a concept of a key.
-json.exception.invalid_iterator.208 | cannot use operator[] for object iterators | The operator[] to specify a concrete offset cannot be used on iterators belonging to a JSON object, because JSON objects are unordered.
-json.exception.invalid_iterator.209 | cannot use offsets with object iterators | The offset operators (+, -, +=, -=) cannot be used on iterators belonging to a JSON object, because JSON objects are unordered.
-json.exception.invalid_iterator.210 | iterators do not fit | The iterator range passed to the insert function are not compatible, meaning they do not belong to the same container. Therefore, the range (@a first, @a last) is invalid.
-json.exception.invalid_iterator.211 | passed iterators may not belong to container | The iterator range passed to the insert function must not be a subrange of the container to insert to.
-json.exception.invalid_iterator.212 | cannot compare iterators of different containers | When two iterators are compared, they must belong to the same container.
-json.exception.invalid_iterator.213 | cannot compare order of object iterators | The order of object iterators cannot be compared, because JSON objects are unordered.
-json.exception.invalid_iterator.214 | cannot get value | Cannot get value for iterator: Either the iterator belongs to a null value or it is an iterator to a primitive type (number, boolean, or string), but the iterator is different to @ref begin().
-
-@liveexample{The following code shows how an `invalid_iterator` exception can be
-caught.,invalid_iterator}
-
-@sa - @ref exception for the base class of the library exceptions
-@sa - @ref parse_error for exceptions indicating a parse error
-@sa - @ref type_error for exceptions indicating executing a member function with
-                    a wrong type
-@sa - @ref out_of_range for exceptions indicating access out of the defined range
-@sa - @ref other_error for exceptions indicating other library errors
-
-@since version 3.0.0
-*/
+/// @brief exception indicating errors with iterators
+/// @sa https://json.nlohmann.me/api/basic_json/invalid_iterator/
 class invalid_iterator : public exception
 {
   public:
-    template<typename BasicJsonType>
-    static invalid_iterator create(int id_, const std::string& what_arg, const BasicJsonType& context)
+    template<typename BasicJsonContext, enable_if_t<is_basic_json_context<BasicJsonContext>::value, int> = 0>
+    static invalid_iterator create(int id_, const std::string& what_arg, BasicJsonContext context)
     {
-        std::string w = exception::name("invalid_iterator", id_) + exception::diagnostics(context) + what_arg;
-        return invalid_iterator(id_, w.c_str());
+        const std::string w = concat(exception::name("invalid_iterator", id_), exception::diagnostics(context), what_arg);
+        return {id_, w.c_str()};
     }
 
   private:
@@ -276,53 +202,16 @@ class invalid_iterator : public exception
         : exception(id_, what_arg) {}
 };
 
-/*!
-@brief exception indicating executing a member function with a wrong type
-
-This exception is thrown in case of a type error; that is, a library function is
-executed on a JSON value whose type does not match the expected semantics.
-
-Exceptions have ids 3xx.
-
-name / id                     | example message | description
------------------------------ | --------------- | -------------------------
-json.exception.type_error.301 | cannot create object from initializer list | To create an object from an initializer list, the initializer list must consist only of a list of pairs whose first element is a string. When this constraint is violated, an array is created instead.
-json.exception.type_error.302 | type must be object, but is array | During implicit or explicit value conversion, the JSON type must be compatible to the target type. For instance, a JSON string can only be converted into string types, but not into numbers or boolean types.
-json.exception.type_error.303 | incompatible ReferenceType for get_ref, actual type is object | To retrieve a reference to a value stored in a @ref basic_json object with @ref get_ref, the type of the reference must match the value type. For instance, for a JSON array, the @a ReferenceType must be @ref array_t &.
-json.exception.type_error.304 | cannot use at() with string | The @ref at() member functions can only be executed for certain JSON types.
-json.exception.type_error.305 | cannot use operator[] with string | The @ref operator[] member functions can only be executed for certain JSON types.
-json.exception.type_error.306 | cannot use value() with string | The @ref value() member functions can only be executed for certain JSON types.
-json.exception.type_error.307 | cannot use erase() with string | The @ref erase() member functions can only be executed for certain JSON types.
-json.exception.type_error.308 | cannot use push_back() with string | The @ref push_back() and @ref operator+= member functions can only be executed for certain JSON types.
-json.exception.type_error.309 | cannot use insert() with | The @ref insert() member functions can only be executed for certain JSON types.
-json.exception.type_error.310 | cannot use swap() with number | The @ref swap() member functions can only be executed for certain JSON types.
-json.exception.type_error.311 | cannot use emplace_back() with string | The @ref emplace_back() member function can only be executed for certain JSON types.
-json.exception.type_error.312 | cannot use update() with string | The @ref update() member functions can only be executed for certain JSON types.
-json.exception.type_error.313 | invalid value to unflatten | The @ref unflatten function converts an object whose keys are JSON Pointers back into an arbitrary nested JSON value. The JSON Pointers must not overlap, because then the resulting value would not be well defined.
-json.exception.type_error.314 | only objects can be unflattened | The @ref unflatten function only works for an object whose keys are JSON Pointers.
-json.exception.type_error.315 | values in object must be primitive | The @ref unflatten function only works for an object whose keys are JSON Pointers and whose values are primitive.
-json.exception.type_error.316 | invalid UTF-8 byte at index 10: 0x7E | The @ref dump function only works with UTF-8 encoded strings; that is, if you assign a `std::string` to a JSON value, make sure it is UTF-8 encoded. |
-json.exception.type_error.317 | JSON value cannot be serialized to requested format | The dynamic type of the object cannot be represented in the requested serialization format (e.g. a raw `true` or `null` JSON object cannot be serialized to BSON) |
-
-@liveexample{The following code shows how a `type_error` exception can be
-caught.,type_error}
-
-@sa - @ref exception for the base class of the library exceptions
-@sa - @ref parse_error for exceptions indicating a parse error
-@sa - @ref invalid_iterator for exceptions indicating errors with iterators
-@sa - @ref out_of_range for exceptions indicating access out of the defined range
-@sa - @ref other_error for exceptions indicating other library errors
-
-@since version 3.0.0
-*/
+/// @brief exception indicating executing a member function with a wrong type
+/// @sa https://json.nlohmann.me/api/basic_json/type_error/
 class type_error : public exception
 {
   public:
-    template<typename BasicJsonType>
-    static type_error create(int id_, const std::string& what_arg, const BasicJsonType& context)
+    template<typename BasicJsonContext, enable_if_t<is_basic_json_context<BasicJsonContext>::value, int> = 0>
+    static type_error create(int id_, const std::string& what_arg, BasicJsonContext context)
     {
-        std::string w = exception::name("type_error", id_) + exception::diagnostics(context) + what_arg;
-        return type_error(id_, w.c_str());
+        const std::string w = concat(exception::name("type_error", id_), exception::diagnostics(context), what_arg);
+        return {id_, w.c_str()};
     }
 
   private:
@@ -330,47 +219,16 @@ class type_error : public exception
     type_error(int id_, const char* what_arg) : exception(id_, what_arg) {}
 };
 
-/*!
-@brief exception indicating access out of the defined range
-
-This exception is thrown in case a library function is called on an input
-parameter that exceeds the expected range, for instance in case of array
-indices or nonexisting object keys.
-
-Exceptions have ids 4xx.
-
-name / id                       | example message | description
-------------------------------- | --------------- | -------------------------
-json.exception.out_of_range.401 | array index 3 is out of range | The provided array index @a i is larger than @a size-1.
-json.exception.out_of_range.402 | array index '-' (3) is out of range | The special array index `-` in a JSON Pointer never describes a valid element of the array, but the index past the end. That is, it can only be used to add elements at this position, but not to read it.
-json.exception.out_of_range.403 | key 'foo' not found | The provided key was not found in the JSON object.
-json.exception.out_of_range.404 | unresolved reference token 'foo' | A reference token in a JSON Pointer could not be resolved.
-json.exception.out_of_range.405 | JSON pointer has no parent | The JSON Patch operations 'remove' and 'add' can not be applied to the root element of the JSON value.
-json.exception.out_of_range.406 | number overflow parsing '10E1000' | A parsed number could not be stored as without changing it to NaN or INF.
-json.exception.out_of_range.407 | number overflow serializing '9223372036854775808' | UBJSON and BSON only support integer numbers up to 9223372036854775807. (until version 3.8.0) |
-json.exception.out_of_range.408 | excessive array size: 8658170730974374167 | The size (following `#`) of an UBJSON array or object exceeds the maximal capacity. |
-json.exception.out_of_range.409 | BSON key cannot contain code point U+0000 (at byte 2) | Key identifiers to be serialized to BSON cannot contain code point U+0000, since the key is stored as zero-terminated c-string |
-
-@liveexample{The following code shows how an `out_of_range` exception can be
-caught.,out_of_range}
-
-@sa - @ref exception for the base class of the library exceptions
-@sa - @ref parse_error for exceptions indicating a parse error
-@sa - @ref invalid_iterator for exceptions indicating errors with iterators
-@sa - @ref type_error for exceptions indicating executing a member function with
-                    a wrong type
-@sa - @ref other_error for exceptions indicating other library errors
-
-@since version 3.0.0
-*/
+/// @brief exception indicating access out of the defined range
+/// @sa https://json.nlohmann.me/api/basic_json/out_of_range/
 class out_of_range : public exception
 {
   public:
-    template<typename BasicJsonType>
-    static out_of_range create(int id_, const std::string& what_arg, const BasicJsonType& context)
+    template<typename BasicJsonContext, enable_if_t<is_basic_json_context<BasicJsonContext>::value, int> = 0>
+    static out_of_range create(int id_, const std::string& what_arg, BasicJsonContext context)
     {
-        std::string w = exception::name("out_of_range", id_) + exception::diagnostics(context) + what_arg;
-        return out_of_range(id_, w.c_str());
+        const std::string w = concat(exception::name("out_of_range", id_), exception::diagnostics(context), what_arg);
+        return {id_, w.c_str()};
     }
 
   private:
@@ -378,43 +236,22 @@ class out_of_range : public exception
     out_of_range(int id_, const char* what_arg) : exception(id_, what_arg) {}
 };
 
-/*!
-@brief exception indicating other library errors
-
-This exception is thrown in case of errors that cannot be classified with the
-other exception types.
-
-Exceptions have ids 5xx.
-
-name / id                      | example message | description
------------------------------- | --------------- | -------------------------
-json.exception.other_error.501 | unsuccessful: {"op":"test","path":"/baz", "value":"bar"} | A JSON Patch operation 'test' failed. The unsuccessful operation is also printed.
-
-@sa - @ref exception for the base class of the library exceptions
-@sa - @ref parse_error for exceptions indicating a parse error
-@sa - @ref invalid_iterator for exceptions indicating errors with iterators
-@sa - @ref type_error for exceptions indicating executing a member function with
-                    a wrong type
-@sa - @ref out_of_range for exceptions indicating access out of the defined range
-
-@liveexample{The following code shows how an `other_error` exception can be
-caught.,other_error}
-
-@since version 3.0.0
-*/
+/// @brief exception indicating other library errors
+/// @sa https://json.nlohmann.me/api/basic_json/other_error/
 class other_error : public exception
 {
   public:
-    template<typename BasicJsonType>
-    static other_error create(int id_, const std::string& what_arg, const BasicJsonType& context)
+    template<typename BasicJsonContext, enable_if_t<is_basic_json_context<BasicJsonContext>::value, int> = 0>
+    static other_error create(int id_, const std::string& what_arg, BasicJsonContext context)
     {
-        std::string w = exception::name("other_error", id_) + exception::diagnostics(context) + what_arg;
-        return other_error(id_, w.c_str());
+        const std::string w = concat(exception::name("other_error", id_), exception::diagnostics(context), what_arg);
+        return {id_, w.c_str()};
     }
 
   private:
     JSON_HEDLEY_NON_NULL(3)
     other_error(int id_, const char* what_arg) : exception(id_, what_arg) {}
 };
+
 }  // namespace detail
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
diff --git a/external_imported/json/include/nlohmann/detail/hash.hpp b/external_imported/json/include/nlohmann/detail/hash.hpp
index c32d5535c..4464e8e67 100644
--- a/external_imported/json/include/nlohmann/detail/hash.hpp
+++ b/external_imported/json/include/nlohmann/detail/hash.hpp
@@ -1,12 +1,21 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 #pragma once
 
-#include <cstddef> // size_t, uint8_t
+#include <cstdint> // uint8_t
+#include <cstddef> // size_t
 #include <functional> // hash
 
-#include <nlohmann/detail/macro_scope.hpp>
+#include <nlohmann/detail/abi_macros.hpp>
+#include <nlohmann/detail/value_t.hpp>
 
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
 
@@ -102,7 +111,7 @@ std::size_t hash(const BasicJsonType& j)
             auto seed = combine(type, j.get_binary().size());
             const auto h = std::hash<bool> {}(j.get_binary().has_subtype());
             seed = combine(seed, h);
-            seed = combine(seed, j.get_binary().subtype());
+            seed = combine(seed, static_cast<std::size_t>(j.get_binary().subtype()));
             for (const auto byte : j.get_binary())
             {
                 seed = combine(seed, std::hash<std::uint8_t> {}(byte));
@@ -111,10 +120,10 @@ std::size_t hash(const BasicJsonType& j)
         }
 
         default:                   // LCOV_EXCL_LINE
-            JSON_ASSERT(false);    // LCOV_EXCL_LINE
+            JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
             return 0;              // LCOV_EXCL_LINE
     }
 }
 
 }  // namespace detail
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
diff --git a/external_imported/json/include/nlohmann/detail/input/binary_reader.hpp b/external_imported/json/include/nlohmann/detail/input/binary_reader.hpp
index ad7359da3..a6e100e76 100644
--- a/external_imported/json/include/nlohmann/detail/input/binary_reader.hpp
+++ b/external_imported/json/include/nlohmann/detail/input/binary_reader.hpp
@@ -1,3 +1,11 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 #pragma once
 
 #include <algorithm> // generate_n
@@ -19,18 +27,20 @@
 #include <nlohmann/detail/input/lexer.hpp>
 #include <nlohmann/detail/macro_scope.hpp>
 #include <nlohmann/detail/meta/is_sax.hpp>
+#include <nlohmann/detail/meta/type_traits.hpp>
+#include <nlohmann/detail/string_concat.hpp>
 #include <nlohmann/detail/value_t.hpp>
 
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
 
 /// how to treat CBOR tags
 enum class cbor_tag_handler_t
 {
-    error,  ///< throw a parse_error exception in case of a tag
-    ignore   ///< ignore tags
+    error,   ///< throw a parse_error exception in case of a tag
+    ignore,  ///< ignore tags
+    store    ///< store tags as binary type
 };
 
 /*!
@@ -40,12 +50,11 @@ enum class cbor_tag_handler_t
 
 @note from https://stackoverflow.com/a/1001328/266378
 */
-static inline bool little_endianess(int num = 1) noexcept
+static inline bool little_endianness(int num = 1) noexcept
 {
     return *reinterpret_cast<char*>(&num) == 1;
 }
 
-
 ///////////////////
 // binary reader //
 ///////////////////
@@ -63,7 +72,7 @@ class binary_reader
     using binary_t = typename BasicJsonType::binary_t;
     using json_sax_t = SAX;
     using char_type = typename InputAdapterType::char_type;
-    using char_int_type = typename std::char_traits<char_type>::int_type;
+    using char_int_type = typename char_traits<char_type>::int_type;
 
   public:
     /*!
@@ -71,16 +80,16 @@ class binary_reader
 
     @param[in] adapter  input adapter to read from
     */
-    explicit binary_reader(InputAdapterType&& adapter) : ia(std::move(adapter))
+    explicit binary_reader(InputAdapterType&& adapter, const input_format_t format = input_format_t::json) noexcept : ia(std::move(adapter)), input_format(format)
     {
         (void)detail::is_sax_static_asserts<SAX, BasicJsonType> {};
     }
 
     // make class move-only
     binary_reader(const binary_reader&) = delete;
-    binary_reader(binary_reader&&) = default;
+    binary_reader(binary_reader&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
     binary_reader& operator=(const binary_reader&) = delete;
-    binary_reader& operator=(binary_reader&&) = default;
+    binary_reader& operator=(binary_reader&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
     ~binary_reader() = default;
 
     /*!
@@ -89,7 +98,7 @@ class binary_reader
     @param[in] strict  whether to expect the input to be consumed completed
     @param[in] tag_handler  how to treat CBOR tags
 
-    @return
+    @return whether parsing was successful
     */
     JSON_HEDLEY_NON_NULL(3)
     bool sax_parse(const input_format_t format,
@@ -115,17 +124,19 @@ class binary_reader
                 break;
 
             case input_format_t::ubjson:
+            case input_format_t::bjdata:
                 result = parse_ubjson_internal();
                 break;
 
+            case input_format_t::json: // LCOV_EXCL_LINE
             default:            // LCOV_EXCL_LINE
-                JSON_ASSERT(false);  // LCOV_EXCL_LINE
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
         }
 
         // strict mode: next byte must be EOF
         if (result && strict)
         {
-            if (format == input_format_t::ubjson)
+            if (input_format == input_format_t::ubjson || input_format == input_format_t::bjdata)
             {
                 get_ignore_noop();
             }
@@ -134,10 +145,10 @@ class binary_reader
                 get();
             }
 
-            if (JSON_HEDLEY_UNLIKELY(current != std::char_traits<char_type>::eof()))
+            if (JSON_HEDLEY_UNLIKELY(current != char_traits<char_type>::eof()))
             {
-                return sax->parse_error(chars_read, get_token_string(),
-                                        parse_error::create(110, chars_read, exception_message(format, "expected end of input; last byte: 0x" + get_token_string(), "value"), BasicJsonType()));
+                return sax->parse_error(chars_read, get_token_string(), parse_error::create(110, chars_read,
+                                        exception_message(input_format, concat("expected end of input; last byte: 0x", get_token_string()), "value"), nullptr));
             }
         }
 
@@ -158,7 +169,7 @@ class binary_reader
         std::int32_t document_size{};
         get_number<std::int32_t, true>(input_format_t::bson, document_size);
 
-        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(std::size_t(-1))))
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(static_cast<std::size_t>(-1))))
         {
             return false;
         }
@@ -173,7 +184,7 @@ class binary_reader
 
     /*!
     @brief Parses a C-style string from the BSON input.
-    @param[in, out] result  A reference to the string variable where the read
+    @param[in,out] result  A reference to the string variable where the read
                             string is to be stored.
     @return `true` if the \x00-byte indicating the end of the string was
              encountered before the EOF; false` indicates an unexpected EOF.
@@ -201,7 +212,7 @@ class binary_reader
            input.
     @param[in] len  The length (including the zero-byte at the end) of the
                     string to be read.
-    @param[in, out] result  A reference to the string variable where the read
+    @param[in,out] result  A reference to the string variable where the read
                             string is to be stored.
     @tparam NumberType The type of the length @a len
     @pre len >= 1
@@ -213,16 +224,17 @@ class binary_reader
         if (JSON_HEDLEY_UNLIKELY(len < 1))
         {
             auto last_token = get_token_string();
-            return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::bson, "string length must be at least 1, is " + std::to_string(len), "string"), BasicJsonType()));
+            return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                    exception_message(input_format_t::bson, concat("string length must be at least 1, is ", std::to_string(len)), "string"), nullptr));
         }
 
-        return get_string(input_format_t::bson, len - static_cast<NumberType>(1), result) && get() != std::char_traits<char_type>::eof();
+        return get_string(input_format_t::bson, len - static_cast<NumberType>(1), result) && get() != char_traits<char_type>::eof();
     }
 
     /*!
     @brief Parses a byte array input of length @a len from the BSON input.
     @param[in] len  The length of the byte array to be read.
-    @param[in, out] result  A reference to the binary variable where the read
+    @param[in,out] result  A reference to the binary variable where the read
                             array is to be stored.
     @tparam NumberType The type of the length @a len
     @pre len >= 0
@@ -234,7 +246,8 @@ class binary_reader
         if (JSON_HEDLEY_UNLIKELY(len < 0))
         {
             auto last_token = get_token_string();
-            return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::bson, "byte array length cannot be negative, is " + std::to_string(len), "binary"), BasicJsonType()));
+            return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                    exception_message(input_format_t::bson, concat("byte array length cannot be negative, is ", std::to_string(len)), "binary"), nullptr));
         }
 
         // All BSON binary values have a subtype
@@ -315,8 +328,10 @@ class binary_reader
             default: // anything else not supported (yet)
             {
                 std::array<char, 3> cr{{}};
-                (std::snprintf)(cr.data(), cr.size(), "%.2hhX", static_cast<unsigned char>(element_type));
-                return sax->parse_error(element_type_parse_position, std::string(cr.data()), parse_error::create(114, element_type_parse_position, "Unsupported BSON record type 0x" + std::string(cr.data()), BasicJsonType()));
+                static_cast<void>((std::snprintf)(cr.data(), cr.size(), "%.2hhX", static_cast<unsigned char>(element_type))); // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+                const std::string cr_str{cr.data()};
+                return sax->parse_error(element_type_parse_position, cr_str,
+                                        parse_error::create(114, element_type_parse_position, concat("Unsupported BSON record type 0x", cr_str), nullptr));
             }
         }
     }
@@ -376,7 +391,7 @@ class binary_reader
         std::int32_t document_size{};
         get_number<std::int32_t, true>(input_format_t::bson, document_size);
 
-        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(std::size_t(-1))))
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(static_cast<std::size_t>(-1))))
         {
             return false;
         }
@@ -407,7 +422,7 @@ class binary_reader
         switch (get_char ? get() : current)
         {
             // EOF
-            case std::char_traits<char_type>::eof():
+            case char_traits<char_type>::eof():
                 return unexpect_eof(input_format_t::cbor, "value");
 
             // Integer 0x00..0x17 (0..23)
@@ -608,7 +623,8 @@ class binary_reader
             case 0x95:
             case 0x96:
             case 0x97:
-                return get_cbor_array(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x1Fu), tag_handler);
+                return get_cbor_array(
+                           conditional_static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x1Fu), tag_handler);
 
             case 0x98: // array (one-byte uint8_t for n follows)
             {
@@ -625,17 +641,17 @@ class binary_reader
             case 0x9A: // array (four-byte uint32_t for n follow)
             {
                 std::uint32_t len{};
-                return get_number(input_format_t::cbor, len) && get_cbor_array(static_cast<std::size_t>(len), tag_handler);
+                return get_number(input_format_t::cbor, len) && get_cbor_array(conditional_static_cast<std::size_t>(len), tag_handler);
             }
 
             case 0x9B: // array (eight-byte uint64_t for n follow)
             {
                 std::uint64_t len{};
-                return get_number(input_format_t::cbor, len) && get_cbor_array(static_cast<std::size_t>(len), tag_handler);
+                return get_number(input_format_t::cbor, len) && get_cbor_array(conditional_static_cast<std::size_t>(len), tag_handler);
             }
 
             case 0x9F: // array (indefinite length)
-                return get_cbor_array(std::size_t(-1), tag_handler);
+                return get_cbor_array(static_cast<std::size_t>(-1), tag_handler);
 
             // map (0x00..0x17 pairs of data items follow)
             case 0xA0:
@@ -662,7 +678,7 @@ class binary_reader
             case 0xB5:
             case 0xB6:
             case 0xB7:
-                return get_cbor_object(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x1Fu), tag_handler);
+                return get_cbor_object(conditional_static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x1Fu), tag_handler);
 
             case 0xB8: // map (one-byte uint8_t for n follows)
             {
@@ -679,17 +695,17 @@ class binary_reader
             case 0xBA: // map (four-byte uint32_t for n follow)
             {
                 std::uint32_t len{};
-                return get_number(input_format_t::cbor, len) && get_cbor_object(static_cast<std::size_t>(len), tag_handler);
+                return get_number(input_format_t::cbor, len) && get_cbor_object(conditional_static_cast<std::size_t>(len), tag_handler);
             }
 
             case 0xBB: // map (eight-byte uint64_t for n follow)
             {
                 std::uint64_t len{};
-                return get_number(input_format_t::cbor, len) && get_cbor_object(static_cast<std::size_t>(len), tag_handler);
+                return get_number(input_format_t::cbor, len) && get_cbor_object(conditional_static_cast<std::size_t>(len), tag_handler);
             }
 
             case 0xBF: // map (indefinite length)
-                return get_cbor_object(std::size_t(-1), tag_handler);
+                return get_cbor_object(static_cast<std::size_t>(-1), tag_handler);
 
             case 0xC6: // tagged item
             case 0xC7:
@@ -716,35 +732,37 @@ class binary_reader
                     case cbor_tag_handler_t::error:
                     {
                         auto last_token = get_token_string();
-                        return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::cbor, "invalid byte: 0x" + last_token, "value"), BasicJsonType()));
+                        return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                                exception_message(input_format_t::cbor, concat("invalid byte: 0x", last_token), "value"), nullptr));
                     }
 
                     case cbor_tag_handler_t::ignore:
                     {
+                        // ignore binary subtype
                         switch (current)
                         {
                             case 0xD8:
                             {
-                                std::uint8_t len{};
-                                get_number(input_format_t::cbor, len);
+                                std::uint8_t subtype_to_ignore{};
+                                get_number(input_format_t::cbor, subtype_to_ignore);
                                 break;
                             }
                             case 0xD9:
                             {
-                                std::uint16_t len{};
-                                get_number(input_format_t::cbor, len);
+                                std::uint16_t subtype_to_ignore{};
+                                get_number(input_format_t::cbor, subtype_to_ignore);
                                 break;
                             }
                             case 0xDA:
                             {
-                                std::uint32_t len{};
-                                get_number(input_format_t::cbor, len);
+                                std::uint32_t subtype_to_ignore{};
+                                get_number(input_format_t::cbor, subtype_to_ignore);
                                 break;
                             }
                             case 0xDB:
                             {
-                                std::uint64_t len{};
-                                get_number(input_format_t::cbor, len);
+                                std::uint64_t subtype_to_ignore{};
+                                get_number(input_format_t::cbor, subtype_to_ignore);
                                 break;
                             }
                             default:
@@ -753,8 +771,49 @@ class binary_reader
                         return parse_cbor_internal(true, tag_handler);
                     }
 
+                    case cbor_tag_handler_t::store:
+                    {
+                        binary_t b;
+                        // use binary subtype and store in binary container
+                        switch (current)
+                        {
+                            case 0xD8:
+                            {
+                                std::uint8_t subtype{};
+                                get_number(input_format_t::cbor, subtype);
+                                b.set_subtype(detail::conditional_static_cast<typename binary_t::subtype_type>(subtype));
+                                break;
+                            }
+                            case 0xD9:
+                            {
+                                std::uint16_t subtype{};
+                                get_number(input_format_t::cbor, subtype);
+                                b.set_subtype(detail::conditional_static_cast<typename binary_t::subtype_type>(subtype));
+                                break;
+                            }
+                            case 0xDA:
+                            {
+                                std::uint32_t subtype{};
+                                get_number(input_format_t::cbor, subtype);
+                                b.set_subtype(detail::conditional_static_cast<typename binary_t::subtype_type>(subtype));
+                                break;
+                            }
+                            case 0xDB:
+                            {
+                                std::uint64_t subtype{};
+                                get_number(input_format_t::cbor, subtype);
+                                b.set_subtype(detail::conditional_static_cast<typename binary_t::subtype_type>(subtype));
+                                break;
+                            }
+                            default:
+                                return parse_cbor_internal(true, tag_handler);
+                        }
+                        get();
+                        return get_cbor_binary(b) && sax->binary(b);
+                    }
+
                     default:                 // LCOV_EXCL_LINE
-                        JSON_ASSERT(false);  // LCOV_EXCL_LINE
+                        JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
                         return false;        // LCOV_EXCL_LINE
                 }
             }
@@ -831,7 +890,8 @@ class binary_reader
             default: // anything else (0xFF is handled inside the other types)
             {
                 auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::cbor, "invalid byte: 0x" + last_token, "value"), BasicJsonType()));
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                        exception_message(input_format_t::cbor, concat("invalid byte: 0x", last_token), "value"), nullptr));
             }
         }
     }
@@ -926,7 +986,8 @@ class binary_reader
             default:
             {
                 auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::cbor, "expected length specification (0x60-0x7B) or indefinite string type (0x7F); last byte: 0x" + last_token, "string"), BasicJsonType()));
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read,
+                                        exception_message(input_format_t::cbor, concat("expected length specification (0x60-0x7B) or indefinite string type (0x7F); last byte: 0x", last_token), "string"), nullptr));
             }
         }
     }
@@ -1025,13 +1086,14 @@ class binary_reader
             default:
             {
                 auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::cbor, "expected length specification (0x40-0x5B) or indefinite binary array type (0x5F); last byte: 0x" + last_token, "binary"), BasicJsonType()));
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read,
+                                        exception_message(input_format_t::cbor, concat("expected length specification (0x40-0x5B) or indefinite binary array type (0x5F); last byte: 0x", last_token), "binary"), nullptr));
             }
         }
     }
 
     /*!
-    @param[in] len  the length of the array or std::size_t(-1) for an
+    @param[in] len  the length of the array or static_cast<std::size_t>(-1) for an
                     array of indefinite size
     @param[in] tag_handler how CBOR tags should be treated
     @return whether array creation completed
@@ -1044,7 +1106,7 @@ class binary_reader
             return false;
         }
 
-        if (len != std::size_t(-1))
+        if (len != static_cast<std::size_t>(-1))
         {
             for (std::size_t i = 0; i < len; ++i)
             {
@@ -1069,7 +1131,7 @@ class binary_reader
     }
 
     /*!
-    @param[in] len  the length of the object or std::size_t(-1) for an
+    @param[in] len  the length of the object or static_cast<std::size_t>(-1) for an
                     object of indefinite size
     @param[in] tag_handler how CBOR tags should be treated
     @return whether object creation completed
@@ -1082,38 +1144,41 @@ class binary_reader
             return false;
         }
 
-        string_t key;
-        if (len != std::size_t(-1))
+        if (len != 0)
         {
-            for (std::size_t i = 0; i < len; ++i)
+            string_t key;
+            if (len != static_cast<std::size_t>(-1))
             {
-                get();
-                if (JSON_HEDLEY_UNLIKELY(!get_cbor_string(key) || !sax->key(key)))
+                for (std::size_t i = 0; i < len; ++i)
                 {
-                    return false;
-                }
+                    get();
+                    if (JSON_HEDLEY_UNLIKELY(!get_cbor_string(key) || !sax->key(key)))
+                    {
+                        return false;
+                    }
 
-                if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler)))
-                {
-                    return false;
+                    if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler)))
+                    {
+                        return false;
+                    }
+                    key.clear();
                 }
-                key.clear();
             }
-        }
-        else
-        {
-            while (get() != 0xFF)
+            else
             {
-                if (JSON_HEDLEY_UNLIKELY(!get_cbor_string(key) || !sax->key(key)))
+                while (get() != 0xFF)
                 {
-                    return false;
-                }
+                    if (JSON_HEDLEY_UNLIKELY(!get_cbor_string(key) || !sax->key(key)))
+                    {
+                        return false;
+                    }
 
-                if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler)))
-                {
-                    return false;
+                    if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler)))
+                    {
+                        return false;
+                    }
+                    key.clear();
                 }
-                key.clear();
             }
         }
 
@@ -1132,7 +1197,7 @@ class binary_reader
         switch (get())
         {
             // EOF
-            case std::char_traits<char_type>::eof():
+            case char_traits<char_type>::eof():
                 return unexpect_eof(input_format_t::msgpack, "value");
 
             // positive fixint
@@ -1283,7 +1348,7 @@ class binary_reader
             case 0x8D:
             case 0x8E:
             case 0x8F:
-                return get_msgpack_object(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x0Fu));
+                return get_msgpack_object(conditional_static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x0Fu));
 
             // fixarray
             case 0x90:
@@ -1302,7 +1367,7 @@ class binary_reader
             case 0x9D:
             case 0x9E:
             case 0x9F:
-                return get_msgpack_array(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x0Fu));
+                return get_msgpack_array(conditional_static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x0Fu));
 
             // fixstr
             case 0xA0:
@@ -1439,7 +1504,7 @@ class binary_reader
             case 0xDD: // array 32
             {
                 std::uint32_t len{};
-                return get_number(input_format_t::msgpack, len) && get_msgpack_array(static_cast<std::size_t>(len));
+                return get_number(input_format_t::msgpack, len) && get_msgpack_array(conditional_static_cast<std::size_t>(len));
             }
 
             case 0xDE: // map 16
@@ -1451,7 +1516,7 @@ class binary_reader
             case 0xDF: // map 32
             {
                 std::uint32_t len{};
-                return get_number(input_format_t::msgpack, len) && get_msgpack_object(static_cast<std::size_t>(len));
+                return get_number(input_format_t::msgpack, len) && get_msgpack_object(conditional_static_cast<std::size_t>(len));
             }
 
             // negative fixint
@@ -1492,7 +1557,8 @@ class binary_reader
             default: // anything else
             {
                 auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::msgpack, "invalid byte: 0x" + last_token, "value"), BasicJsonType()));
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                        exception_message(input_format_t::msgpack, concat("invalid byte: 0x", last_token), "value"), nullptr));
             }
         }
     }
@@ -1574,7 +1640,8 @@ class binary_reader
             default:
             {
                 auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::msgpack, "expected length specification (0xA0-0xBF, 0xD9-0xDB); last byte: 0x" + last_token, "string"), BasicJsonType()));
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read,
+                                        exception_message(input_format_t::msgpack, concat("expected length specification (0xA0-0xBF, 0xD9-0xDB); last byte: 0x", last_token), "string"), nullptr));
             }
         }
     }
@@ -1785,7 +1852,7 @@ class binary_reader
             get();  // TODO(niels): may we ignore N here?
         }
 
-        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "value")))
+        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "value")))
         {
             return false;
         }
@@ -1795,51 +1862,162 @@ class binary_reader
             case 'U':
             {
                 std::uint8_t len{};
-                return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result);
+                return get_number(input_format, len) && get_string(input_format, len, result);
             }
 
             case 'i':
             {
                 std::int8_t len{};
-                return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result);
+                return get_number(input_format, len) && get_string(input_format, len, result);
             }
 
             case 'I':
             {
                 std::int16_t len{};
-                return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result);
+                return get_number(input_format, len) && get_string(input_format, len, result);
             }
 
             case 'l':
             {
                 std::int32_t len{};
-                return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result);
+                return get_number(input_format, len) && get_string(input_format, len, result);
             }
 
             case 'L':
             {
                 std::int64_t len{};
-                return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result);
+                return get_number(input_format, len) && get_string(input_format, len, result);
+            }
+
+            case 'u':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint16_t len{};
+                return get_number(input_format, len) && get_string(input_format, len, result);
+            }
+
+            case 'm':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint32_t len{};
+                return get_number(input_format, len) && get_string(input_format, len, result);
+            }
+
+            case 'M':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint64_t len{};
+                return get_number(input_format, len) && get_string(input_format, len, result);
             }
 
             default:
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "expected length type specification (U, i, I, l, L); last byte: 0x" + last_token, "string"), BasicJsonType()));
+                break;
+        }
+        auto last_token = get_token_string();
+        std::string message;
+
+        if (input_format != input_format_t::bjdata)
+        {
+            message = "expected length type specification (U, i, I, l, L); last byte: 0x" + last_token;
         }
+        else
+        {
+            message = "expected length type specification (U, i, u, I, m, l, M, L); last byte: 0x" + last_token;
+        }
+        return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format, message, "string"), nullptr));
+    }
+
+    /*!
+    @param[out] dim  an integer vector storing the ND array dimensions
+    @return whether reading ND array size vector is successful
+    */
+    bool get_ubjson_ndarray_size(std::vector<size_t>& dim)
+    {
+        std::pair<std::size_t, char_int_type> size_and_type;
+        size_t dimlen = 0;
+        bool no_ndarray = true;
+
+        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_type(size_and_type, no_ndarray)))
+        {
+            return false;
+        }
+
+        if (size_and_type.first != npos)
+        {
+            if (size_and_type.second != 0)
+            {
+                if (size_and_type.second != 'N')
+                {
+                    for (std::size_t i = 0; i < size_and_type.first; ++i)
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_value(dimlen, no_ndarray, size_and_type.second)))
+                        {
+                            return false;
+                        }
+                        dim.push_back(dimlen);
+                    }
+                }
+            }
+            else
+            {
+                for (std::size_t i = 0; i < size_and_type.first; ++i)
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_value(dimlen, no_ndarray)))
+                    {
+                        return false;
+                    }
+                    dim.push_back(dimlen);
+                }
+            }
+        }
+        else
+        {
+            while (current != ']')
+            {
+                if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_value(dimlen, no_ndarray, current)))
+                {
+                    return false;
+                }
+                dim.push_back(dimlen);
+                get_ignore_noop();
+            }
+        }
+        return true;
     }
 
     /*!
     @param[out] result  determined size
+    @param[in,out] is_ndarray  for input, `true` means already inside an ndarray vector
+                               or ndarray dimension is not allowed; `false` means ndarray
+                               is allowed; for output, `true` means an ndarray is found;
+                               is_ndarray can only return `true` when its initial value
+                               is `false`
+    @param[in] prefix  type marker if already read, otherwise set to 0
+
     @return whether size determination completed
     */
-    bool get_ubjson_size_value(std::size_t& result)
+    bool get_ubjson_size_value(std::size_t& result, bool& is_ndarray, char_int_type prefix = 0)
     {
-        switch (get_ignore_noop())
+        if (prefix == 0)
+        {
+            prefix = get_ignore_noop();
+        }
+
+        switch (prefix)
         {
             case 'U':
             {
                 std::uint8_t number{};
-                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number)))
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
                 {
                     return false;
                 }
@@ -1850,21 +2028,31 @@ class binary_reader
             case 'i':
             {
                 std::int8_t number{};
-                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number)))
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
                 {
                     return false;
                 }
-                result = static_cast<std::size_t>(number);
+                if (number < 0)
+                {
+                    return sax->parse_error(chars_read, get_token_string(), parse_error::create(113, chars_read,
+                                            exception_message(input_format, "count in an optimized container must be positive", "size"), nullptr));
+                }
+                result = static_cast<std::size_t>(number); // NOLINT(bugprone-signed-char-misuse,cert-str34-c): number is not a char
                 return true;
             }
 
             case 'I':
             {
                 std::int16_t number{};
-                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number)))
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
                 {
                     return false;
                 }
+                if (number < 0)
+                {
+                    return sax->parse_error(chars_read, get_token_string(), parse_error::create(113, chars_read,
+                                            exception_message(input_format, "count in an optimized container must be positive", "size"), nullptr));
+                }
                 result = static_cast<std::size_t>(number);
                 return true;
             }
@@ -1872,10 +2060,15 @@ class binary_reader
             case 'l':
             {
                 std::int32_t number{};
-                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number)))
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
                 {
                     return false;
                 }
+                if (number < 0)
+                {
+                    return sax->parse_error(chars_read, get_token_string(), parse_error::create(113, chars_read,
+                                            exception_message(input_format, "count in an optimized container must be positive", "size"), nullptr));
+                }
                 result = static_cast<std::size_t>(number);
                 return true;
             }
@@ -1883,20 +2076,145 @@ class binary_reader
             case 'L':
             {
                 std::int64_t number{};
-                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number)))
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
                 {
                     return false;
                 }
+                if (number < 0)
+                {
+                    return sax->parse_error(chars_read, get_token_string(), parse_error::create(113, chars_read,
+                                            exception_message(input_format, "count in an optimized container must be positive", "size"), nullptr));
+                }
+                if (!value_in_range_of<std::size_t>(number))
+                {
+                    return sax->parse_error(chars_read, get_token_string(), out_of_range::create(408,
+                                            exception_message(input_format, "integer value overflow", "size"), nullptr));
+                }
                 result = static_cast<std::size_t>(number);
                 return true;
             }
 
-            default:
+            case 'u':
             {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "expected length type specification (U, i, I, l, L) after '#'; last byte: 0x" + last_token, "size"), BasicJsonType()));
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint16_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
+                {
+                    return false;
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'm':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint32_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
+                {
+                    return false;
+                }
+                result = conditional_static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'M':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint64_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
+                {
+                    return false;
+                }
+                if (!value_in_range_of<std::size_t>(number))
+                {
+                    return sax->parse_error(chars_read, get_token_string(), out_of_range::create(408,
+                                            exception_message(input_format, "integer value overflow", "size"), nullptr));
+                }
+                result = detail::conditional_static_cast<std::size_t>(number);
+                return true;
             }
+
+            case '[':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                if (is_ndarray) // ndarray dimensional vector can only contain integers, and can not embed another array
+                {
+                    return sax->parse_error(chars_read, get_token_string(), parse_error::create(113, chars_read, exception_message(input_format, "ndarray dimensional vector is not allowed", "size"), nullptr));
+                }
+                std::vector<size_t> dim;
+                if (JSON_HEDLEY_UNLIKELY(!get_ubjson_ndarray_size(dim)))
+                {
+                    return false;
+                }
+                if (dim.size() == 1 || (dim.size() == 2 && dim.at(0) == 1)) // return normal array size if 1D row vector
+                {
+                    result = dim.at(dim.size() - 1);
+                    return true;
+                }
+                if (!dim.empty())  // if ndarray, convert to an object in JData annotated array format
+                {
+                    for (auto i : dim) // test if any dimension in an ndarray is 0, if so, return a 1D empty container
+                    {
+                        if ( i == 0 )
+                        {
+                            result = 0;
+                            return true;
+                        }
+                    }
+
+                    string_t key = "_ArraySize_";
+                    if (JSON_HEDLEY_UNLIKELY(!sax->start_object(3) || !sax->key(key) || !sax->start_array(dim.size())))
+                    {
+                        return false;
+                    }
+                    result = 1;
+                    for (auto i : dim)
+                    {
+                        result *= i;
+                        if (result == 0 || result == npos) // because dim elements shall not have zeros, result = 0 means overflow happened; it also can't be npos as it is used to initialize size in get_ubjson_size_type()
+                        {
+                            return sax->parse_error(chars_read, get_token_string(), out_of_range::create(408, exception_message(input_format, "excessive ndarray size caused overflow", "size"), nullptr));
+                        }
+                        if (JSON_HEDLEY_UNLIKELY(!sax->number_unsigned(static_cast<number_unsigned_t>(i))))
+                        {
+                            return false;
+                        }
+                    }
+                    is_ndarray = true;
+                    return sax->end_array();
+                }
+                result = 0;
+                return true;
+            }
+
+            default:
+                break;
         }
+        auto last_token = get_token_string();
+        std::string message;
+
+        if (input_format != input_format_t::bjdata)
+        {
+            message = "expected length type specification (U, i, I, l, L) after '#'; last byte: 0x" + last_token;
+        }
+        else
+        {
+            message = "expected length type specification (U, i, u, I, m, l, M, L) after '#'; last byte: 0x" + last_token;
+        }
+        return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format, message, "size"), nullptr));
     }
 
     /*!
@@ -1906,20 +2224,30 @@ class binary_reader
     for a more compact representation.
 
     @param[out] result  pair of the size and the type
+    @param[in] inside_ndarray  whether the parser is parsing an ND array dimensional vector
 
     @return whether pair creation completed
     */
-    bool get_ubjson_size_type(std::pair<std::size_t, char_int_type>& result)
+    bool get_ubjson_size_type(std::pair<std::size_t, char_int_type>& result, bool inside_ndarray = false)
     {
-        result.first = string_t::npos; // size
+        result.first = npos; // size
         result.second = 0; // type
+        bool is_ndarray = false;
 
         get_ignore_noop();
 
         if (current == '$')
         {
             result.second = get();  // must not ignore 'N', because 'N' maybe the type
-            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "type")))
+            if (input_format == input_format_t::bjdata
+                    && JSON_HEDLEY_UNLIKELY(std::binary_search(bjd_optimized_type_markers.begin(), bjd_optimized_type_markers.end(), result.second)))
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                        exception_message(input_format, concat("marker 0x", last_token, " is not a permitted optimized array type"), "type"), nullptr));
+            }
+
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "type")))
             {
                 return false;
             }
@@ -1927,20 +2255,37 @@ class binary_reader
             get_ignore_noop();
             if (JSON_HEDLEY_UNLIKELY(current != '#'))
             {
-                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "value")))
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "value")))
                 {
                     return false;
                 }
                 auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::ubjson, "expected '#' after type information; last byte: 0x" + last_token, "size"), BasicJsonType()));
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                        exception_message(input_format, concat("expected '#' after type information; last byte: 0x", last_token), "size"), nullptr));
             }
 
-            return get_ubjson_size_value(result.first);
+            const bool is_error = get_ubjson_size_value(result.first, is_ndarray);
+            if (input_format == input_format_t::bjdata && is_ndarray)
+            {
+                if (inside_ndarray)
+                {
+                    return sax->parse_error(chars_read, get_token_string(), parse_error::create(112, chars_read,
+                                            exception_message(input_format, "ndarray can not be recursive", "size"), nullptr));
+                }
+                result.second |= (1 << 8); // use bit 8 to indicate ndarray, all UBJSON and BJData markers should be ASCII letters
+            }
+            return is_error;
         }
 
         if (current == '#')
         {
-            return get_ubjson_size_value(result.first);
+            const bool is_error = get_ubjson_size_value(result.first, is_ndarray);
+            if (input_format == input_format_t::bjdata && is_ndarray)
+            {
+                return sax->parse_error(chars_read, get_token_string(), parse_error::create(112, chars_read,
+                                        exception_message(input_format, "ndarray requires both type and size", "size"), nullptr));
+            }
+            return is_error;
         }
 
         return true;
@@ -1954,8 +2299,8 @@ class binary_reader
     {
         switch (prefix)
         {
-            case std::char_traits<char_type>::eof():  // EOF
-                return unexpect_eof(input_format_t::ubjson, "value");
+            case char_traits<char_type>::eof():  // EOF
+                return unexpect_eof(input_format, "value");
 
             case 'T':  // true
                 return sax->boolean(true);
@@ -1968,43 +2313,125 @@ class binary_reader
             case 'U':
             {
                 std::uint8_t number{};
-                return get_number(input_format_t::ubjson, number) && sax->number_unsigned(number);
+                return get_number(input_format, number) && sax->number_unsigned(number);
             }
 
             case 'i':
             {
                 std::int8_t number{};
-                return get_number(input_format_t::ubjson, number) && sax->number_integer(number);
+                return get_number(input_format, number) && sax->number_integer(number);
             }
 
             case 'I':
             {
                 std::int16_t number{};
-                return get_number(input_format_t::ubjson, number) && sax->number_integer(number);
+                return get_number(input_format, number) && sax->number_integer(number);
             }
 
             case 'l':
             {
                 std::int32_t number{};
-                return get_number(input_format_t::ubjson, number) && sax->number_integer(number);
+                return get_number(input_format, number) && sax->number_integer(number);
             }
 
             case 'L':
             {
                 std::int64_t number{};
-                return get_number(input_format_t::ubjson, number) && sax->number_integer(number);
+                return get_number(input_format, number) && sax->number_integer(number);
+            }
+
+            case 'u':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint16_t number{};
+                return get_number(input_format, number) && sax->number_unsigned(number);
+            }
+
+            case 'm':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint32_t number{};
+                return get_number(input_format, number) && sax->number_unsigned(number);
+            }
+
+            case 'M':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint64_t number{};
+                return get_number(input_format, number) && sax->number_unsigned(number);
+            }
+
+            case 'h':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                const auto byte1_raw = get();
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "number")))
+                {
+                    return false;
+                }
+                const auto byte2_raw = get();
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "number")))
+                {
+                    return false;
+                }
+
+                const auto byte1 = static_cast<unsigned char>(byte1_raw);
+                const auto byte2 = static_cast<unsigned char>(byte2_raw);
+
+                // code from RFC 7049, Appendix D, Figure 3:
+                // As half-precision floating-point numbers were only added
+                // to IEEE 754 in 2008, today's programming platforms often
+                // still only have limited support for them. It is very
+                // easy to include at least decoding support for them even
+                // without such support. An example of a small decoder for
+                // half-precision floating-point numbers in the C language
+                // is shown in Fig. 3.
+                const auto half = static_cast<unsigned int>((byte2 << 8u) + byte1);
+                const double val = [&half]
+                {
+                    const int exp = (half >> 10u) & 0x1Fu;
+                    const unsigned int mant = half & 0x3FFu;
+                    JSON_ASSERT(0 <= exp&& exp <= 32);
+                    JSON_ASSERT(mant <= 1024);
+                    switch (exp)
+                    {
+                        case 0:
+                            return std::ldexp(mant, -24);
+                        case 31:
+                            return (mant == 0)
+                            ? std::numeric_limits<double>::infinity()
+                            : std::numeric_limits<double>::quiet_NaN();
+                        default:
+                            return std::ldexp(mant + 1024, exp - 25);
+                    }
+                }();
+                return sax->number_float((half & 0x8000u) != 0
+                                         ? static_cast<number_float_t>(-val)
+                                         : static_cast<number_float_t>(val), "");
             }
 
             case 'd':
             {
                 float number{};
-                return get_number(input_format_t::ubjson, number) && sax->number_float(static_cast<number_float_t>(number), "");
+                return get_number(input_format, number) && sax->number_float(static_cast<number_float_t>(number), "");
             }
 
             case 'D':
             {
                 double number{};
-                return get_number(input_format_t::ubjson, number) && sax->number_float(static_cast<number_float_t>(number), "");
+                return get_number(input_format, number) && sax->number_float(static_cast<number_float_t>(number), "");
             }
 
             case 'H':
@@ -2015,14 +2442,15 @@ class binary_reader
             case 'C':  // char
             {
                 get();
-                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "char")))
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "char")))
                 {
                     return false;
                 }
                 if (JSON_HEDLEY_UNLIKELY(current > 127))
                 {
                     auto last_token = get_token_string();
-                    return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "byte after 'C' must be in range 0x00..0x7F; last byte: 0x" + last_token, "char"), BasicJsonType()));
+                    return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read,
+                                            exception_message(input_format, concat("byte after 'C' must be in range 0x00..0x7F; last byte: 0x", last_token), "char"), nullptr));
                 }
                 string_t s(1, static_cast<typename string_t::value_type>(current));
                 return sax->string(s);
@@ -2041,11 +2469,10 @@ class binary_reader
                 return get_ubjson_object();
 
             default: // anything else
-            {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::ubjson, "invalid byte: 0x" + last_token, "value"), BasicJsonType()));
-            }
+                break;
         }
+        auto last_token = get_token_string();
+        return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format, "invalid byte: 0x" + last_token, "value"), nullptr));
     }
 
     /*!
@@ -2059,7 +2486,53 @@ class binary_reader
             return false;
         }
 
-        if (size_and_type.first != string_t::npos)
+        // if bit-8 of size_and_type.second is set to 1, encode bjdata ndarray as an object in JData annotated array format (https://github.com/NeuroJSON/jdata):
+        // {"_ArrayType_" : "typeid", "_ArraySize_" : [n1, n2, ...], "_ArrayData_" : [v1, v2, ...]}
+
+        if (input_format == input_format_t::bjdata && size_and_type.first != npos && (size_and_type.second & (1 << 8)) != 0)
+        {
+            size_and_type.second &= ~(static_cast<char_int_type>(1) << 8);  // use bit 8 to indicate ndarray, here we remove the bit to restore the type marker
+            auto it = std::lower_bound(bjd_types_map.begin(), bjd_types_map.end(), size_and_type.second, [](const bjd_type & p, char_int_type t)
+            {
+                return p.first < t;
+            });
+            string_t key = "_ArrayType_";
+            if (JSON_HEDLEY_UNLIKELY(it == bjd_types_map.end() || it->first != size_and_type.second))
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                        exception_message(input_format, "invalid byte: 0x" + last_token, "type"), nullptr));
+            }
+
+            string_t type = it->second; // sax->string() takes a reference
+            if (JSON_HEDLEY_UNLIKELY(!sax->key(key) || !sax->string(type)))
+            {
+                return false;
+            }
+
+            if (size_and_type.second == 'C')
+            {
+                size_and_type.second = 'U';
+            }
+
+            key = "_ArrayData_";
+            if (JSON_HEDLEY_UNLIKELY(!sax->key(key) || !sax->start_array(size_and_type.first) ))
+            {
+                return false;
+            }
+
+            for (std::size_t i = 0; i < size_and_type.first; ++i)
+            {
+                if (JSON_HEDLEY_UNLIKELY(!get_ubjson_value(size_and_type.second)))
+                {
+                    return false;
+                }
+            }
+
+            return (sax->end_array() && sax->end_object());
+        }
+
+        if (size_and_type.first != npos)
         {
             if (JSON_HEDLEY_UNLIKELY(!sax->start_array(size_and_type.first)))
             {
@@ -2092,7 +2565,7 @@ class binary_reader
         }
         else
         {
-            if (JSON_HEDLEY_UNLIKELY(!sax->start_array(std::size_t(-1))))
+            if (JSON_HEDLEY_UNLIKELY(!sax->start_array(static_cast<std::size_t>(-1))))
             {
                 return false;
             }
@@ -2121,8 +2594,16 @@ class binary_reader
             return false;
         }
 
+        // do not accept ND-array size in objects in BJData
+        if (input_format == input_format_t::bjdata && size_and_type.first != npos && (size_and_type.second & (1 << 8)) != 0)
+        {
+            auto last_token = get_token_string();
+            return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                    exception_message(input_format, "BJData object does not support ND-array size in optimized format", "object"), nullptr));
+        }
+
         string_t key;
-        if (size_and_type.first != string_t::npos)
+        if (size_and_type.first != npos)
         {
             if (JSON_HEDLEY_UNLIKELY(!sax->start_object(size_and_type.first)))
             {
@@ -2162,7 +2643,7 @@ class binary_reader
         }
         else
         {
-            if (JSON_HEDLEY_UNLIKELY(!sax->start_object(std::size_t(-1))))
+            if (JSON_HEDLEY_UNLIKELY(!sax->start_object(static_cast<std::size_t>(-1))))
             {
                 return false;
             }
@@ -2192,7 +2673,8 @@ class binary_reader
     {
         // get size of following number string
         std::size_t size{};
-        auto res = get_ubjson_size_value(size);
+        bool no_ndarray = true;
+        auto res = get_ubjson_size_value(size, no_ndarray);
         if (JSON_HEDLEY_UNLIKELY(!res))
         {
             return res;
@@ -2203,7 +2685,7 @@ class binary_reader
         for (std::size_t i = 0; i < size; ++i)
         {
             get();
-            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "number")))
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "number")))
             {
                 return false;
             }
@@ -2211,8 +2693,8 @@ class binary_reader
         }
 
         // parse number string
-        auto number_ia = detail::input_adapter(std::forward<decltype(number_vector)>(number_vector));
-        auto number_lexer = detail::lexer<BasicJsonType, decltype(number_ia)>(std::move(number_ia), false);
+        using ia_type = decltype(detail::input_adapter(number_vector));
+        auto number_lexer = detail::lexer<BasicJsonType, ia_type>(detail::input_adapter(number_vector), false);
         const auto result_number = number_lexer.scan();
         const auto number_string = number_lexer.get_token_string();
         const auto result_remainder = number_lexer.scan();
@@ -2221,7 +2703,8 @@ class binary_reader
 
         if (JSON_HEDLEY_UNLIKELY(result_remainder != token_type::end_of_input))
         {
-            return sax->parse_error(chars_read, number_string, parse_error::create(115, chars_read, exception_message(input_format_t::ubjson, "invalid number text: " + number_lexer.get_token_string(), "high-precision number"), BasicJsonType()));
+            return sax->parse_error(chars_read, number_string, parse_error::create(115, chars_read,
+                                    exception_message(input_format, concat("invalid number text: ", number_lexer.get_token_string()), "high-precision number"), nullptr));
         }
 
         switch (result_number)
@@ -2232,8 +2715,23 @@ class binary_reader
                 return sax->number_unsigned(number_lexer.get_number_unsigned());
             case token_type::value_float:
                 return sax->number_float(number_lexer.get_number_float(), std::move(number_string));
+            case token_type::uninitialized:
+            case token_type::literal_true:
+            case token_type::literal_false:
+            case token_type::literal_null:
+            case token_type::value_string:
+            case token_type::begin_array:
+            case token_type::begin_object:
+            case token_type::end_array:
+            case token_type::end_object:
+            case token_type::name_separator:
+            case token_type::value_separator:
+            case token_type::parse_error:
+            case token_type::end_of_input:
+            case token_type::literal_or_value:
             default:
-                return sax->parse_error(chars_read, number_string, parse_error::create(115, chars_read, exception_message(input_format_t::ubjson, "invalid number text: " + number_lexer.get_token_string(), "high-precision number"), BasicJsonType()));
+                return sax->parse_error(chars_read, number_string, parse_error::create(115, chars_read,
+                                        exception_message(input_format, concat("invalid number text: ", number_lexer.get_token_string()), "high-precision number"), nullptr));
         }
     }
 
@@ -2246,7 +2744,7 @@ class binary_reader
 
     This function provides the interface to the used input adapter. It does
     not throw in case the input reached EOF, but returns a -'ve valued
-    `std::char_traits<char_type>::eof()` in that case.
+    `char_traits<char_type>::eof()` in that case.
 
     @return character read from the input
     */
@@ -2279,15 +2777,17 @@ class binary_reader
 
     @return whether conversion completed
 
-    @note This function needs to respect the system's endianess, because
+    @note This function needs to respect the system's endianness, because
           bytes in CBOR, MessagePack, and UBJSON are stored in network order
           (big endian) and therefore need reordering on little endian systems.
+          On the other hand, BSON and BJData use little endian and should reorder
+          on big endian systems.
     */
     template<typename NumberType, bool InputIsLittleEndian = false>
     bool get_number(const input_format_t format, NumberType& result)
     {
         // step 1: read input into array with system's byte order
-        std::array<std::uint8_t, sizeof(NumberType)> vec;
+        std::array<std::uint8_t, sizeof(NumberType)> vec{};
         for (std::size_t i = 0; i < sizeof(NumberType); ++i)
         {
             get();
@@ -2297,7 +2797,7 @@ class binary_reader
             }
 
             // reverse byte order prior to conversion if necessary
-            if (is_little_endian != InputIsLittleEndian)
+            if (is_little_endian != (InputIsLittleEndian || format == input_format_t::bjdata))
             {
                 vec[sizeof(NumberType) - i - 1] = static_cast<std::uint8_t>(current);
             }
@@ -2386,10 +2886,10 @@ class binary_reader
     JSON_HEDLEY_NON_NULL(3)
     bool unexpect_eof(const input_format_t format, const char* context) const
     {
-        if (JSON_HEDLEY_UNLIKELY(current == std::char_traits<char_type>::eof()))
+        if (JSON_HEDLEY_UNLIKELY(current == char_traits<char_type>::eof()))
         {
             return sax->parse_error(chars_read, "<end of file>",
-                                    parse_error::create(110, chars_read, exception_message(format, "unexpected end of input", context), BasicJsonType()));
+                                    parse_error::create(110, chars_read, exception_message(format, "unexpected end of input", context), nullptr));
         }
         return true;
     }
@@ -2400,7 +2900,7 @@ class binary_reader
     std::string get_token_string() const
     {
         std::array<char, 3> cr{{}};
-        (std::snprintf)(cr.data(), cr.size(), "%.2hhX", static_cast<unsigned char>(current));
+        static_cast<void>((std::snprintf)(cr.data(), cr.size(), "%.2hhX", static_cast<unsigned char>(current))); // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
         return std::string{cr.data()};
     }
 
@@ -2434,28 +2934,76 @@ class binary_reader
                 error_msg += "BSON";
                 break;
 
+            case input_format_t::bjdata:
+                error_msg += "BJData";
+                break;
+
+            case input_format_t::json: // LCOV_EXCL_LINE
             default:            // LCOV_EXCL_LINE
-                JSON_ASSERT(false);  // LCOV_EXCL_LINE
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
         }
 
-        return error_msg + " " + context + ": " + detail;
+        return concat(error_msg, ' ', context, ": ", detail);
     }
 
   private:
+    static JSON_INLINE_VARIABLE constexpr std::size_t npos = static_cast<std::size_t>(-1);
+
     /// input adapter
     InputAdapterType ia;
 
     /// the current character
-    char_int_type current = std::char_traits<char_type>::eof();
+    char_int_type current = char_traits<char_type>::eof();
 
     /// the number of characters read
     std::size_t chars_read = 0;
 
-    /// whether we can assume little endianess
-    const bool is_little_endian = little_endianess();
+    /// whether we can assume little endianness
+    const bool is_little_endian = little_endianness();
+
+    /// input format
+    const input_format_t input_format = input_format_t::json;
 
     /// the SAX parser
     json_sax_t* sax = nullptr;
+
+    // excluded markers in bjdata optimized type
+#define JSON_BINARY_READER_MAKE_BJD_OPTIMIZED_TYPE_MARKERS_ \
+    make_array<char_int_type>('F', 'H', 'N', 'S', 'T', 'Z', '[', '{')
+
+#define JSON_BINARY_READER_MAKE_BJD_TYPES_MAP_ \
+    make_array<bjd_type>(                      \
+    bjd_type{'C', "char"},                     \
+    bjd_type{'D', "double"},                   \
+    bjd_type{'I', "int16"},                    \
+    bjd_type{'L', "int64"},                    \
+    bjd_type{'M', "uint64"},                   \
+    bjd_type{'U', "uint8"},                    \
+    bjd_type{'d', "single"},                   \
+    bjd_type{'i', "int8"},                     \
+    bjd_type{'l', "int32"},                    \
+    bjd_type{'m', "uint32"},                   \
+    bjd_type{'u', "uint16"})
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    // lookup tables
+    // NOLINTNEXTLINE(cppcoreguidelines-non-private-member-variables-in-classes)
+    const decltype(JSON_BINARY_READER_MAKE_BJD_OPTIMIZED_TYPE_MARKERS_) bjd_optimized_type_markers =
+        JSON_BINARY_READER_MAKE_BJD_OPTIMIZED_TYPE_MARKERS_;
+
+    using bjd_type = std::pair<char_int_type, string_t>;
+    // NOLINTNEXTLINE(cppcoreguidelines-non-private-member-variables-in-classes)
+    const decltype(JSON_BINARY_READER_MAKE_BJD_TYPES_MAP_) bjd_types_map =
+        JSON_BINARY_READER_MAKE_BJD_TYPES_MAP_;
+
+#undef JSON_BINARY_READER_MAKE_BJD_OPTIMIZED_TYPE_MARKERS_
+#undef JSON_BINARY_READER_MAKE_BJD_TYPES_MAP_
 };
+
+#ifndef JSON_HAS_CPP_17
+    template<typename BasicJsonType, typename InputAdapterType, typename SAX>
+    constexpr std::size_t binary_reader<BasicJsonType, InputAdapterType, SAX>::npos;
+#endif
+
 }  // namespace detail
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
diff --git a/external_imported/json/include/nlohmann/detail/input/input_adapters.hpp b/external_imported/json/include/nlohmann/detail/input/input_adapters.hpp
index c437564fd..33fca3e4b 100644
--- a/external_imported/json/include/nlohmann/detail/input/input_adapters.hpp
+++ b/external_imported/json/include/nlohmann/detail/input/input_adapters.hpp
@@ -1,10 +1,16 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 #pragma once
 
 #include <array> // array
 #include <cstddef> // size_t
-#include <cstdio> //FILE *
 #include <cstring> // strlen
-#include <istream> // istream
 #include <iterator> // begin, end, iterator_traits, random_access_iterator_tag, distance, next
 #include <memory> // shared_ptr, make_shared, addressof
 #include <numeric> // accumulate
@@ -12,20 +18,27 @@
 #include <type_traits> // enable_if, is_base_of, is_pointer, is_integral, remove_pointer
 #include <utility> // pair, declval
 
+#ifndef JSON_NO_IO
+    #include <cstdio>   // FILE *
+    #include <istream>  // istream
+#endif                  // JSON_NO_IO
+
 #include <nlohmann/detail/iterators/iterator_traits.hpp>
 #include <nlohmann/detail/macro_scope.hpp>
+#include <nlohmann/detail/meta/type_traits.hpp>
 
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
+
 /// the supported input formats
-enum class input_format_t { json, cbor, msgpack, ubjson, bson };
+enum class input_format_t { json, cbor, msgpack, ubjson, bson, bjdata };
 
 ////////////////////
 // input adapters //
 ////////////////////
 
+#ifndef JSON_NO_IO
 /*!
 Input adapter for stdio file access. This adapter read only 1 byte and do not use any
  buffer. This adapter is a very low level adapter.
@@ -38,13 +51,16 @@ class file_input_adapter
     JSON_HEDLEY_NON_NULL(2)
     explicit file_input_adapter(std::FILE* f) noexcept
         : m_file(f)
-    {}
+    {
+        JSON_ASSERT(m_file != nullptr);
+    }
 
     // make class move-only
     file_input_adapter(const file_input_adapter&) = delete;
-    file_input_adapter(file_input_adapter&&) = default;
+    file_input_adapter(file_input_adapter&&) noexcept = default;
     file_input_adapter& operator=(const file_input_adapter&) = delete;
     file_input_adapter& operator=(file_input_adapter&&) = delete;
+    ~file_input_adapter() = default;
 
     std::char_traits<char>::int_type get_character() noexcept
     {
@@ -56,7 +72,6 @@ class file_input_adapter
     std::FILE* m_file;
 };
 
-
 /*!
 Input adapter for a (caching) istream. Ignores a UFT Byte Order Mark at
 beginning of input. Does not support changing the underlying std::streambuf
@@ -88,9 +103,10 @@ class input_stream_adapter
     // delete because of pointer members
     input_stream_adapter(const input_stream_adapter&) = delete;
     input_stream_adapter& operator=(input_stream_adapter&) = delete;
-    input_stream_adapter& operator=(input_stream_adapter&& rhs) = delete;
+    input_stream_adapter& operator=(input_stream_adapter&&) = delete;
 
-    input_stream_adapter(input_stream_adapter&& rhs) noexcept : is(rhs.is), sb(rhs.sb)
+    input_stream_adapter(input_stream_adapter&& rhs) noexcept
+        : is(rhs.is), sb(rhs.sb)
     {
         rhs.is = nullptr;
         rhs.sb = nullptr;
@@ -98,12 +114,12 @@ class input_stream_adapter
 
     // std::istream/std::streambuf use std::char_traits<char>::to_int_type, to
     // ensure that std::char_traits<char>::eof() and the character 0xFF do not
-    // end up as the same value, eg. 0xFFFFFFFF.
+    // end up as the same value, e.g. 0xFFFFFFFF.
     std::char_traits<char>::int_type get_character()
     {
         auto res = sb->sbumpc();
         // set eof manually, as we don't use the istream interface.
-        if (JSON_HEDLEY_UNLIKELY(res == EOF))
+        if (JSON_HEDLEY_UNLIKELY(res == std::char_traits<char>::eof()))
         {
             is->clear(is->rdstate() | std::ios::eofbit);
         }
@@ -115,6 +131,7 @@ class input_stream_adapter
     std::istream* is = nullptr;
     std::streambuf* sb = nullptr;
 };
+#endif  // JSON_NO_IO
 
 // General-purpose iterator-based adapter. It might not be as fast as
 // theoretically possible for some containers, but it is extremely versatile.
@@ -125,18 +142,19 @@ class iterator_input_adapter
     using char_type = typename std::iterator_traits<IteratorType>::value_type;
 
     iterator_input_adapter(IteratorType first, IteratorType last)
-        : current(std::move(first)), end(std::move(last)) {}
+        : current(std::move(first)), end(std::move(last))
+    {}
 
-    typename std::char_traits<char_type>::int_type get_character()
+    typename char_traits<char_type>::int_type get_character()
     {
         if (JSON_HEDLEY_LIKELY(current != end))
         {
-            auto result = std::char_traits<char_type>::to_int_type(*current);
+            auto result = char_traits<char_type>::to_int_type(*current);
             std::advance(current, 1);
             return result;
         }
 
-        return std::char_traits<char_type>::eof();
+        return char_traits<char_type>::eof();
     }
 
   private:
@@ -150,10 +168,8 @@ class iterator_input_adapter
     {
         return current == end;
     }
-
 };
 
-
 template<typename BaseInputAdapter, size_t T>
 struct wide_string_input_helper;
 
@@ -277,7 +293,7 @@ struct wide_string_input_helper<BaseInputAdapter, 2>
     }
 };
 
-// Wraps another input apdater to convert wide character types into individual bytes.
+// Wraps another input adapter to convert wide character types into individual bytes.
 template<typename BaseInputAdapter, typename WideCharType>
 class wide_string_input_adapter
 {
@@ -322,7 +338,6 @@ class wide_string_input_adapter
     std::size_t utf8_bytes_filled = 0;
 };
 
-
 template<typename IteratorType, typename Enable = void>
 struct iterator_input_adapter_factory
 {
@@ -393,7 +408,7 @@ struct container_input_adapter_factory< ContainerType,
 }
        };
 
-}
+}  // namespace container_input_adapter_factory_impl
 
 template<typename ContainerType>
 typename container_input_adapter_factory_impl::container_input_adapter_factory<ContainerType>::adapter_type input_adapter(const ContainerType& container)
@@ -401,6 +416,7 @@ typename container_input_adapter_factory_impl::container_input_adapter_factory<C
     return container_input_adapter_factory_impl::container_input_adapter_factory<ContainerType>::create(container);
 }
 
+#ifndef JSON_NO_IO
 // Special cases with fast paths
 inline file_input_adapter input_adapter(std::FILE* file)
 {
@@ -416,6 +432,7 @@ inline input_stream_adapter input_adapter(std::istream&& stream)
 {
     return input_stream_adapter(stream);
 }
+#endif  // JSON_NO_IO
 
 using contiguous_bytes_input_adapter = decltype(input_adapter(std::declval<const char*>(), std::declval<const char*>()));
 
@@ -435,13 +452,13 @@ contiguous_bytes_input_adapter input_adapter(CharT b)
 }
 
 template<typename T, std::size_t N>
-auto input_adapter(T (&array)[N]) -> decltype(input_adapter(array, array + N))
+auto input_adapter(T (&array)[N]) -> decltype(input_adapter(array, array + N)) // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
 {
     return input_adapter(array, array + N);
 }
 
 // This class only handles inputs of input_buffer_adapter type.
-// It's required so that expressions like {ptr, len} can be implicitely casted
+// It's required so that expressions like {ptr, len} can be implicitly cast
 // to the correct adapter.
 class span_input_adapter
 {
@@ -464,11 +481,12 @@ class span_input_adapter
 
     contiguous_bytes_input_adapter&& get()
     {
-        return std::move(ia);
+        return std::move(ia); // NOLINT(hicpp-move-const-arg,performance-move-const-arg)
     }
 
   private:
     contiguous_bytes_input_adapter ia;
 };
+
 }  // namespace detail
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
diff --git a/external_imported/json/include/nlohmann/detail/input/json_sax.hpp b/external_imported/json/include/nlohmann/detail/input/json_sax.hpp
index a4b7e6d08..c772521cd 100644
--- a/external_imported/json/include/nlohmann/detail/input/json_sax.hpp
+++ b/external_imported/json/include/nlohmann/detail/input/json_sax.hpp
@@ -1,3 +1,11 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 #pragma once
 
 #include <cstddef>
@@ -7,9 +15,9 @@
 
 #include <nlohmann/detail/exceptions.hpp>
 #include <nlohmann/detail/macro_scope.hpp>
+#include <nlohmann/detail/string_concat.hpp>
 
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 
 /*!
 @brief SAX interface
@@ -56,7 +64,7 @@ struct json_sax
     virtual bool number_unsigned(number_unsigned_t val) = 0;
 
     /*!
-    @brief an floating-point number was read
+    @brief a floating-point number was read
     @param[in] val  floating-point value
     @param[in] s    raw token value
     @return whether parsing should proceed
@@ -64,18 +72,18 @@ struct json_sax
     virtual bool number_float(number_float_t val, const string_t& s) = 0;
 
     /*!
-    @brief a string was read
+    @brief a string value was read
     @param[in] val  string value
     @return whether parsing should proceed
-    @note It is safe to move the passed string.
+    @note It is safe to move the passed string value.
     */
     virtual bool string(string_t& val) = 0;
 
     /*!
-    @brief a binary string was read
+    @brief a binary value was read
     @param[in] val  binary value
     @return whether parsing should proceed
-    @note It is safe to move the passed binary.
+    @note It is safe to move the passed binary value.
     */
     virtual bool binary(binary_t& val) = 0;
 
@@ -126,10 +134,14 @@ struct json_sax
                              const std::string& last_token,
                              const detail::exception& ex) = 0;
 
+    json_sax() = default;
+    json_sax(const json_sax&) = default;
+    json_sax(json_sax&&) noexcept = default;
+    json_sax& operator=(const json_sax&) = default;
+    json_sax& operator=(json_sax&&) noexcept = default;
     virtual ~json_sax() = default;
 };
 
-
 namespace detail
 {
 /*!
@@ -156,7 +168,7 @@ class json_sax_dom_parser
     using binary_t = typename BasicJsonType::binary_t;
 
     /*!
-    @param[in, out] r  reference to a JSON value that is manipulated while
+    @param[in,out] r  reference to a JSON value that is manipulated while
                        parsing
     @param[in] allow_exceptions_  whether parse errors yield exceptions
     */
@@ -166,9 +178,9 @@ class json_sax_dom_parser
 
     // make class move-only
     json_sax_dom_parser(const json_sax_dom_parser&) = delete;
-    json_sax_dom_parser(json_sax_dom_parser&&) = default;
+    json_sax_dom_parser(json_sax_dom_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
     json_sax_dom_parser& operator=(const json_sax_dom_parser&) = delete;
-    json_sax_dom_parser& operator=(json_sax_dom_parser&&) = default;
+    json_sax_dom_parser& operator=(json_sax_dom_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
     ~json_sax_dom_parser() = default;
 
     bool null()
@@ -217,9 +229,9 @@ class json_sax_dom_parser
     {
         ref_stack.push_back(handle_value(BasicJsonType::value_t::object));
 
-        if (JSON_HEDLEY_UNLIKELY(len != std::size_t(-1) && len > ref_stack.back()->max_size()))
+        if (JSON_HEDLEY_UNLIKELY(len != static_cast<std::size_t>(-1) && len > ref_stack.back()->max_size()))
         {
-            JSON_THROW(out_of_range::create(408, "excessive object size: " + std::to_string(len), *ref_stack.back()));
+            JSON_THROW(out_of_range::create(408, concat("excessive object size: ", std::to_string(len)), ref_stack.back()));
         }
 
         return true;
@@ -227,13 +239,19 @@ class json_sax_dom_parser
 
     bool key(string_t& val)
     {
+        JSON_ASSERT(!ref_stack.empty());
+        JSON_ASSERT(ref_stack.back()->is_object());
+
         // add null at given key and store the reference for later
-        object_element = &(ref_stack.back()->m_value.object->operator[](val));
+        object_element = &(ref_stack.back()->m_data.m_value.object->operator[](val));
         return true;
     }
 
     bool end_object()
     {
+        JSON_ASSERT(!ref_stack.empty());
+        JSON_ASSERT(ref_stack.back()->is_object());
+
         ref_stack.back()->set_parents();
         ref_stack.pop_back();
         return true;
@@ -243,9 +261,9 @@ class json_sax_dom_parser
     {
         ref_stack.push_back(handle_value(BasicJsonType::value_t::array));
 
-        if (JSON_HEDLEY_UNLIKELY(len != std::size_t(-1) && len > ref_stack.back()->max_size()))
+        if (JSON_HEDLEY_UNLIKELY(len != static_cast<std::size_t>(-1) && len > ref_stack.back()->max_size()))
         {
-            JSON_THROW(out_of_range::create(408, "excessive array size: " + std::to_string(len), *ref_stack.back()));
+            JSON_THROW(out_of_range::create(408, concat("excessive array size: ", std::to_string(len)), ref_stack.back()));
         }
 
         return true;
@@ -253,6 +271,9 @@ class json_sax_dom_parser
 
     bool end_array()
     {
+        JSON_ASSERT(!ref_stack.empty());
+        JSON_ASSERT(ref_stack.back()->is_array());
+
         ref_stack.back()->set_parents();
         ref_stack.pop_back();
         return true;
@@ -297,8 +318,8 @@ class json_sax_dom_parser
 
         if (ref_stack.back()->is_array())
         {
-            ref_stack.back()->m_value.array->emplace_back(std::forward<Value>(v));
-            return &(ref_stack.back()->m_value.array->back());
+            ref_stack.back()->m_data.m_value.array->emplace_back(std::forward<Value>(v));
+            return &(ref_stack.back()->m_data.m_value.array->back());
         }
 
         JSON_ASSERT(ref_stack.back()->is_object());
@@ -341,9 +362,9 @@ class json_sax_dom_callback_parser
 
     // make class move-only
     json_sax_dom_callback_parser(const json_sax_dom_callback_parser&) = delete;
-    json_sax_dom_callback_parser(json_sax_dom_callback_parser&&) = default;
+    json_sax_dom_callback_parser(json_sax_dom_callback_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
     json_sax_dom_callback_parser& operator=(const json_sax_dom_callback_parser&) = delete;
-    json_sax_dom_callback_parser& operator=(json_sax_dom_callback_parser&&) = default;
+    json_sax_dom_callback_parser& operator=(json_sax_dom_callback_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
     ~json_sax_dom_callback_parser() = default;
 
     bool null()
@@ -398,9 +419,9 @@ class json_sax_dom_callback_parser
         ref_stack.push_back(val.second);
 
         // check object limit
-        if (ref_stack.back() && JSON_HEDLEY_UNLIKELY(len != std::size_t(-1) && len > ref_stack.back()->max_size()))
+        if (ref_stack.back() && JSON_HEDLEY_UNLIKELY(len != static_cast<std::size_t>(-1) && len > ref_stack.back()->max_size()))
         {
-            JSON_THROW(out_of_range::create(408, "excessive object size: " + std::to_string(len), *ref_stack.back()));
+            JSON_THROW(out_of_range::create(408, concat("excessive object size: ", std::to_string(len)), ref_stack.back()));
         }
 
         return true;
@@ -417,7 +438,7 @@ class json_sax_dom_callback_parser
         // add discarded value at given key and store the reference for later
         if (keep && ref_stack.back())
         {
-            object_element = &(ref_stack.back()->m_value.object->operator[](val) = discarded);
+            object_element = &(ref_stack.back()->m_data.m_value.object->operator[](val) = discarded);
         }
 
         return true;
@@ -468,9 +489,9 @@ class json_sax_dom_callback_parser
         ref_stack.push_back(val.second);
 
         // check array limit
-        if (ref_stack.back() && JSON_HEDLEY_UNLIKELY(len != std::size_t(-1) && len > ref_stack.back()->max_size()))
+        if (ref_stack.back() && JSON_HEDLEY_UNLIKELY(len != static_cast<std::size_t>(-1) && len > ref_stack.back()->max_size()))
         {
-            JSON_THROW(out_of_range::create(408, "excessive array size: " + std::to_string(len), *ref_stack.back()));
+            JSON_THROW(out_of_range::create(408, concat("excessive array size: ", std::to_string(len)), ref_stack.back()));
         }
 
         return true;
@@ -502,7 +523,7 @@ class json_sax_dom_callback_parser
         // remove discarded value
         if (!keep && !ref_stack.empty() && ref_stack.back()->is_array())
         {
-            ref_stack.back()->m_value.array->pop_back();
+            ref_stack.back()->m_data.m_value.array->pop_back();
         }
 
         return true;
@@ -569,7 +590,7 @@ class json_sax_dom_callback_parser
         if (ref_stack.empty())
         {
             root = std::move(value);
-            return {true, &root};
+            return {true, & root};
         }
 
         // skip this value if we already decided to skip the parent
@@ -585,8 +606,8 @@ class json_sax_dom_callback_parser
         // array
         if (ref_stack.back()->is_array())
         {
-            ref_stack.back()->m_value.array->emplace_back(std::move(value));
-            return {true, &(ref_stack.back()->m_value.array->back())};
+            ref_stack.back()->m_data.m_value.array->emplace_back(std::move(value));
+            return {true, & (ref_stack.back()->m_data.m_value.array->back())};
         }
 
         // object
@@ -671,7 +692,7 @@ class json_sax_acceptor
         return true;
     }
 
-    bool start_object(std::size_t /*unused*/ = std::size_t(-1))
+    bool start_object(std::size_t /*unused*/ = static_cast<std::size_t>(-1))
     {
         return true;
     }
@@ -686,7 +707,7 @@ class json_sax_acceptor
         return true;
     }
 
-    bool start_array(std::size_t /*unused*/ = std::size_t(-1))
+    bool start_array(std::size_t /*unused*/ = static_cast<std::size_t>(-1))
     {
         return true;
     }
@@ -701,6 +722,6 @@ class json_sax_acceptor
         return false;
     }
 };
-}  // namespace detail
 
-}  // namespace nlohmann
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
diff --git a/external_imported/json/include/nlohmann/detail/input/lexer.hpp b/external_imported/json/include/nlohmann/detail/input/lexer.hpp
index eae82eaa3..4b3bf77d6 100644
--- a/external_imported/json/include/nlohmann/detail/input/lexer.hpp
+++ b/external_imported/json/include/nlohmann/detail/input/lexer.hpp
@@ -1,3 +1,11 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 #pragma once
 
 #include <array> // array
@@ -13,11 +21,12 @@
 #include <nlohmann/detail/input/input_adapters.hpp>
 #include <nlohmann/detail/input/position_t.hpp>
 #include <nlohmann/detail/macro_scope.hpp>
+#include <nlohmann/detail/meta/type_traits.hpp>
 
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
+
 ///////////
 // lexer //
 ///////////
@@ -107,12 +116,12 @@ class lexer : public lexer_base<BasicJsonType>
     using number_float_t = typename BasicJsonType::number_float_t;
     using string_t = typename BasicJsonType::string_t;
     using char_type = typename InputAdapterType::char_type;
-    using char_int_type = typename std::char_traits<char_type>::int_type;
+    using char_int_type = typename char_traits<char_type>::int_type;
 
   public:
     using token_type = typename lexer_base<BasicJsonType>::token_type;
 
-    explicit lexer(InputAdapterType&& adapter, bool ignore_comments_ = false)
+    explicit lexer(InputAdapterType&& adapter, bool ignore_comments_ = false) noexcept
         : ia(std::move(adapter))
         , ignore_comments(ignore_comments_)
         , decimal_point_char(static_cast<char_int_type>(get_decimal_point()))
@@ -120,9 +129,9 @@ class lexer : public lexer_base<BasicJsonType>
 
     // delete because of pointer members
     lexer(const lexer&) = delete;
-    lexer(lexer&&) = default;
+    lexer(lexer&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
     lexer& operator=(lexer&) = delete;
-    lexer& operator=(lexer&&) = default;
+    lexer& operator=(lexer&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
     ~lexer() = default;
 
   private:
@@ -214,7 +223,7 @@ class lexer : public lexer_base<BasicJsonType>
         for (auto range = ranges.begin(); range != ranges.end(); ++range)
         {
             get();
-            if (JSON_HEDLEY_LIKELY(*range <= current && current <= *(++range)))
+            if (JSON_HEDLEY_LIKELY(*range <= current && current <= *(++range))) // NOLINT(bugprone-inc-dec-in-conditions)
             {
                 add(current);
             }
@@ -231,7 +240,7 @@ class lexer : public lexer_base<BasicJsonType>
     /*!
     @brief scan a string literal
 
-    This function scans a string according to Sect. 7 of RFC 7159. While
+    This function scans a string according to Sect. 7 of RFC 8259. While
     scanning, bytes are escaped and copied into buffer token_buffer. Then the
     function returns successfully, token_buffer is *not* null-terminated (as it
     may contain \0 bytes), and token_buffer.size() is the number of bytes in the
@@ -257,7 +266,7 @@ class lexer : public lexer_base<BasicJsonType>
             switch (get())
             {
                 // end of file while parsing string
-                case std::char_traits<char_type>::eof():
+                case char_traits<char_type>::eof():
                 {
                     error_message = "invalid string: missing closing quote";
                     return token_type::parse_error;
@@ -343,7 +352,7 @@ class lexer : public lexer_base<BasicJsonType>
                                                         // low surrogate occupies the least significant 15 bits
                                                         + static_cast<unsigned int>(codepoint2)
                                                         // there is still the 0xD800, 0xDC00 and 0x10000 noise
-                                                        // in the result so we have to subtract with:
+                                                        // in the result, so we have to subtract with:
                                                         // (0xD800 << 10) + DC00 - 0x10000 = 0x35FDC00
                                                         - 0x35FDC00u);
                                     }
@@ -846,7 +855,7 @@ class lexer : public lexer_base<BasicJsonType>
                     {
                         case '\n':
                         case '\r':
-                        case std::char_traits<char_type>::eof():
+                        case char_traits<char_type>::eof():
                         case '\0':
                             return true;
 
@@ -863,7 +872,7 @@ class lexer : public lexer_base<BasicJsonType>
                 {
                     switch (get())
                     {
-                        case std::char_traits<char_type>::eof():
+                        case char_traits<char_type>::eof():
                         case '\0':
                         {
                             error_message = "invalid comment; missing closing '*/'";
@@ -921,10 +930,10 @@ class lexer : public lexer_base<BasicJsonType>
     /*!
     @brief scan a number literal
 
-    This function scans a string according to Sect. 6 of RFC 7159.
+    This function scans a string according to Sect. 6 of RFC 8259.
 
     The function is realized with a deterministic finite state machine derived
-    from the grammar described in RFC 7159. Starting in state "init", the
+    from the grammar described in RFC 8259. Starting in state "init", the
     input is read and used to determined the next state. Only state "done"
     accepts the number. State "error" is a trap state to model errors. In the
     table below, "anything" means any character but the ones listed before.
@@ -998,7 +1007,7 @@ class lexer : public lexer_base<BasicJsonType>
 
             // all other characters are rejected outside scan_number()
             default:            // LCOV_EXCL_LINE
-                JSON_ASSERT(false);  // LCOV_EXCL_LINE
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
         }
 
 scan_number_minus:
@@ -1236,7 +1245,7 @@ class lexer : public lexer_base<BasicJsonType>
         // we are done scanning a number)
         unget();
 
-        char* endptr = nullptr;
+        char* endptr = nullptr; // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
         errno = 0;
 
         // try to parse integers first and fall back to floats
@@ -1292,10 +1301,10 @@ class lexer : public lexer_base<BasicJsonType>
     token_type scan_literal(const char_type* literal_text, const std::size_t length,
                             token_type return_type)
     {
-        JSON_ASSERT(std::char_traits<char_type>::to_char_type(current) == literal_text[0]);
+        JSON_ASSERT(char_traits<char_type>::to_char_type(current) == literal_text[0]);
         for (std::size_t i = 1; i < length; ++i)
         {
-            if (JSON_HEDLEY_UNLIKELY(std::char_traits<char_type>::to_char_type(get()) != literal_text[i]))
+            if (JSON_HEDLEY_UNLIKELY(char_traits<char_type>::to_char_type(get()) != literal_text[i]))
             {
                 error_message = "invalid literal";
                 return token_type::parse_error;
@@ -1313,7 +1322,7 @@ class lexer : public lexer_base<BasicJsonType>
     {
         token_buffer.clear();
         token_string.clear();
-        token_string.push_back(std::char_traits<char_type>::to_char_type(current));
+        token_string.push_back(char_traits<char_type>::to_char_type(current));
     }
 
     /*
@@ -1321,7 +1330,7 @@ class lexer : public lexer_base<BasicJsonType>
 
     This function provides the interface to the used input adapter. It does
     not throw in case the input reached EOF, but returns a
-    `std::char_traits<char>::eof()` in that case.  Stores the scanned characters
+    `char_traits<char>::eof()` in that case.  Stores the scanned characters
     for use in error messages.
 
     @return character read from the input
@@ -1341,9 +1350,9 @@ class lexer : public lexer_base<BasicJsonType>
             current = ia.get_character();
         }
 
-        if (JSON_HEDLEY_LIKELY(current != std::char_traits<char_type>::eof()))
+        if (JSON_HEDLEY_LIKELY(current != char_traits<char_type>::eof()))
         {
-            token_string.push_back(std::char_traits<char_type>::to_char_type(current));
+            token_string.push_back(char_traits<char_type>::to_char_type(current));
         }
 
         if (current == '\n')
@@ -1382,7 +1391,7 @@ class lexer : public lexer_base<BasicJsonType>
             --position.chars_read_current_line;
         }
 
-        if (JSON_HEDLEY_LIKELY(current != std::char_traits<char_type>::eof()))
+        if (JSON_HEDLEY_LIKELY(current != char_traits<char_type>::eof()))
         {
             JSON_ASSERT(!token_string.empty());
             token_string.pop_back();
@@ -1447,7 +1456,7 @@ class lexer : public lexer_base<BasicJsonType>
             {
                 // escape control characters
                 std::array<char, 9> cs{{}};
-                (std::snprintf)(cs.data(), cs.size(), "<U+%.4X>", static_cast<unsigned char>(c));
+                static_cast<void>((std::snprintf)(cs.data(), cs.size(), "<U+%.4X>", static_cast<unsigned char>(c))); // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
                 result += cs.data();
             }
             else
@@ -1541,17 +1550,17 @@ class lexer : public lexer_base<BasicJsonType>
             // literals
             case 't':
             {
-                std::array<char_type, 4> true_literal = {{char_type('t'), char_type('r'), char_type('u'), char_type('e')}};
+                std::array<char_type, 4> true_literal = {{static_cast<char_type>('t'), static_cast<char_type>('r'), static_cast<char_type>('u'), static_cast<char_type>('e')}};
                 return scan_literal(true_literal.data(), true_literal.size(), token_type::literal_true);
             }
             case 'f':
             {
-                std::array<char_type, 5> false_literal = {{char_type('f'), char_type('a'), char_type('l'), char_type('s'), char_type('e')}};
+                std::array<char_type, 5> false_literal = {{static_cast<char_type>('f'), static_cast<char_type>('a'), static_cast<char_type>('l'), static_cast<char_type>('s'), static_cast<char_type>('e')}};
                 return scan_literal(false_literal.data(), false_literal.size(), token_type::literal_false);
             }
             case 'n':
             {
-                std::array<char_type, 4> null_literal = {{char_type('n'), char_type('u'), char_type('l'), char_type('l')}};
+                std::array<char_type, 4> null_literal = {{static_cast<char_type>('n'), static_cast<char_type>('u'), static_cast<char_type>('l'), static_cast<char_type>('l')}};
                 return scan_literal(null_literal.data(), null_literal.size(), token_type::literal_null);
             }
 
@@ -1576,7 +1585,7 @@ class lexer : public lexer_base<BasicJsonType>
             // end of input (the null byte is needed when parsing from
             // string literals)
             case '\0':
-            case std::char_traits<char_type>::eof():
+            case char_traits<char_type>::eof():
                 return token_type::end_of_input;
 
             // error
@@ -1594,7 +1603,7 @@ class lexer : public lexer_base<BasicJsonType>
     const bool ignore_comments = false;
 
     /// the current character
-    char_int_type current = std::char_traits<char_type>::eof();
+    char_int_type current = char_traits<char_type>::eof();
 
     /// whether the next get() call should just return current
     bool next_unget = false;
@@ -1619,5 +1628,6 @@ class lexer : public lexer_base<BasicJsonType>
     /// the decimal point
     const char_int_type decimal_point_char = '.';
 };
+
 }  // namespace detail
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
diff --git a/external_imported/json/include/nlohmann/detail/input/parser.hpp b/external_imported/json/include/nlohmann/detail/input/parser.hpp
index 7b5d494f8..bdf85ba29 100644
--- a/external_imported/json/include/nlohmann/detail/input/parser.hpp
+++ b/external_imported/json/include/nlohmann/detail/input/parser.hpp
@@ -1,3 +1,11 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 #pragma once
 
 #include <cmath> // isfinite
@@ -13,17 +21,17 @@
 #include <nlohmann/detail/input/lexer.hpp>
 #include <nlohmann/detail/macro_scope.hpp>
 #include <nlohmann/detail/meta/is_sax.hpp>
+#include <nlohmann/detail/string_concat.hpp>
 #include <nlohmann/detail/value_t.hpp>
 
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
 ////////////
 // parser //
 ////////////
 
-enum class parse_event_t : uint8_t
+enum class parse_event_t : std::uint8_t
 {
     /// the parser read `{` and started to process a JSON object
     object_start,
@@ -41,7 +49,7 @@ enum class parse_event_t : uint8_t
 
 template<typename BasicJsonType>
 using parser_callback_t =
-    std::function<bool(int depth, parse_event_t event, BasicJsonType& parsed)>;
+    std::function<bool(int /*depth*/, parse_event_t /*event*/, BasicJsonType& /*parsed*/)>;
 
 /*!
 @brief syntax analysis
@@ -95,7 +103,7 @@ class parser
                 sdp.parse_error(m_lexer.get_position(),
                                 m_lexer.get_token_string(),
                                 parse_error::create(101, m_lexer.get_position(),
-                                                    exception_message(token_type::end_of_input, "value"), BasicJsonType()));
+                                                    exception_message(token_type::end_of_input, "value"), nullptr));
             }
 
             // in case of an error, return discarded value
@@ -122,7 +130,7 @@ class parser
             {
                 sdp.parse_error(m_lexer.get_position(),
                                 m_lexer.get_token_string(),
-                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input, "value"), BasicJsonType()));
+                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input, "value"), nullptr));
             }
 
             // in case of an error, return discarded value
@@ -160,7 +168,7 @@ class parser
         {
             return sax->parse_error(m_lexer.get_position(),
                                     m_lexer.get_token_string(),
-                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input, "value"), BasicJsonType()));
+                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input, "value"), nullptr));
         }
 
         return result;
@@ -186,7 +194,7 @@ class parser
                 {
                     case token_type::begin_object:
                     {
-                        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(std::size_t(-1))))
+                        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(static_cast<std::size_t>(-1))))
                         {
                             return false;
                         }
@@ -206,7 +214,7 @@ class parser
                         {
                             return sax->parse_error(m_lexer.get_position(),
                                                     m_lexer.get_token_string(),
-                                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::value_string, "object key"), BasicJsonType()));
+                                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::value_string, "object key"), nullptr));
                         }
                         if (JSON_HEDLEY_UNLIKELY(!sax->key(m_lexer.get_string())))
                         {
@@ -218,7 +226,7 @@ class parser
                         {
                             return sax->parse_error(m_lexer.get_position(),
                                                     m_lexer.get_token_string(),
-                                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::name_separator, "object separator"), BasicJsonType()));
+                                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::name_separator, "object separator"), nullptr));
                         }
 
                         // remember we are now inside an object
@@ -231,7 +239,7 @@ class parser
 
                     case token_type::begin_array:
                     {
-                        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(std::size_t(-1))))
+                        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(static_cast<std::size_t>(-1))))
                         {
                             return false;
                         }
@@ -261,7 +269,7 @@ class parser
                         {
                             return sax->parse_error(m_lexer.get_position(),
                                                     m_lexer.get_token_string(),
-                                                    out_of_range::create(406, "number overflow parsing '" + m_lexer.get_token_string() + "'", BasicJsonType()));
+                                                    out_of_range::create(406, concat("number overflow parsing '", m_lexer.get_token_string(), '\''), nullptr));
                         }
 
                         if (JSON_HEDLEY_UNLIKELY(!sax->number_float(res, m_lexer.get_string())))
@@ -331,14 +339,33 @@ class parser
                         // using "uninitialized" to avoid "expected" message
                         return sax->parse_error(m_lexer.get_position(),
                                                 m_lexer.get_token_string(),
-                                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::uninitialized, "value"), BasicJsonType()));
+                                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::uninitialized, "value"), nullptr));
                     }
+                    case token_type::end_of_input:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(m_lexer.get_position().chars_read_total == 1))
+                        {
+                            return sax->parse_error(m_lexer.get_position(),
+                                                    m_lexer.get_token_string(),
+                                                    parse_error::create(101, m_lexer.get_position(),
+                                                            "attempting to parse an empty input; check that your input string or stream contains the expected JSON", nullptr));
+                        }
 
+                        return sax->parse_error(m_lexer.get_position(),
+                                                m_lexer.get_token_string(),
+                                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::literal_or_value, "value"), nullptr));
+                    }
+                    case token_type::uninitialized:
+                    case token_type::end_array:
+                    case token_type::end_object:
+                    case token_type::name_separator:
+                    case token_type::value_separator:
+                    case token_type::literal_or_value:
                     default: // the last token was unexpected
                     {
                         return sax->parse_error(m_lexer.get_position(),
                                                 m_lexer.get_token_string(),
-                                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::literal_or_value, "value"), BasicJsonType()));
+                                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::literal_or_value, "value"), nullptr));
                     }
                 }
             }
@@ -384,7 +411,7 @@ class parser
 
                 return sax->parse_error(m_lexer.get_position(),
                                         m_lexer.get_token_string(),
-                                        parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_array, "array"), BasicJsonType()));
+                                        parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_array, "array"), nullptr));
             }
 
             // states.back() is false -> object
@@ -397,7 +424,7 @@ class parser
                 {
                     return sax->parse_error(m_lexer.get_position(),
                                             m_lexer.get_token_string(),
-                                            parse_error::create(101, m_lexer.get_position(), exception_message(token_type::value_string, "object key"), BasicJsonType()));
+                                            parse_error::create(101, m_lexer.get_position(), exception_message(token_type::value_string, "object key"), nullptr));
                 }
 
                 if (JSON_HEDLEY_UNLIKELY(!sax->key(m_lexer.get_string())))
@@ -410,7 +437,7 @@ class parser
                 {
                     return sax->parse_error(m_lexer.get_position(),
                                             m_lexer.get_token_string(),
-                                            parse_error::create(101, m_lexer.get_position(), exception_message(token_type::name_separator, "object separator"), BasicJsonType()));
+                                            parse_error::create(101, m_lexer.get_position(), exception_message(token_type::name_separator, "object separator"), nullptr));
                 }
 
                 // parse values
@@ -438,7 +465,7 @@ class parser
 
             return sax->parse_error(m_lexer.get_position(),
                                     m_lexer.get_token_string(),
-                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_object, "object"), BasicJsonType()));
+                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_object, "object"), nullptr));
         }
     }
 
@@ -454,24 +481,24 @@ class parser
 
         if (!context.empty())
         {
-            error_msg += "while parsing " + context + " ";
+            error_msg += concat("while parsing ", context, ' ');
         }
 
         error_msg += "- ";
 
         if (last_token == token_type::parse_error)
         {
-            error_msg += std::string(m_lexer.get_error_message()) + "; last read: '" +
-                         m_lexer.get_token_string() + "'";
+            error_msg += concat(m_lexer.get_error_message(), "; last read: '",
+                                m_lexer.get_token_string(), '\'');
         }
         else
         {
-            error_msg += "unexpected " + std::string(lexer_t::token_type_name(last_token));
+            error_msg += concat("unexpected ", lexer_t::token_type_name(last_token));
         }
 
         if (expected != token_type::uninitialized)
         {
-            error_msg += "; expected " + std::string(lexer_t::token_type_name(expected));
+            error_msg += concat("; expected ", lexer_t::token_type_name(expected));
         }
 
         return error_msg;
@@ -487,5 +514,6 @@ class parser
     /// whether to throw exceptions in case of errors
     const bool allow_exceptions = true;
 };
+
 }  // namespace detail
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
diff --git a/external_imported/json/include/nlohmann/detail/input/position_t.hpp b/external_imported/json/include/nlohmann/detail/input/position_t.hpp
index 14e9649fb..8ac7c78cf 100644
--- a/external_imported/json/include/nlohmann/detail/input/position_t.hpp
+++ b/external_imported/json/include/nlohmann/detail/input/position_t.hpp
@@ -1,11 +1,21 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 #pragma once
 
 #include <cstddef> // size_t
 
-namespace nlohmann
-{
+#include <nlohmann/detail/abi_macros.hpp>
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
+
 /// struct to capture the start position of the current token
 struct position_t
 {
@@ -23,5 +33,5 @@ struct position_t
     }
 };
 
-} // namespace detail
-} // namespace nlohmann
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
diff --git a/external_imported/json/include/nlohmann/detail/iterators/internal_iterator.hpp b/external_imported/json/include/nlohmann/detail/iterators/internal_iterator.hpp
index 2c81f723f..2991ee693 100644
--- a/external_imported/json/include/nlohmann/detail/iterators/internal_iterator.hpp
+++ b/external_imported/json/include/nlohmann/detail/iterators/internal_iterator.hpp
@@ -1,11 +1,20 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 #pragma once
 
+#include <nlohmann/detail/abi_macros.hpp>
 #include <nlohmann/detail/iterators/primitive_iterator.hpp>
 
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
+
 /*!
 @brief an iterator value
 
@@ -21,5 +30,6 @@ template<typename BasicJsonType> struct internal_iterator
     /// generic iterator for all other types
     primitive_iterator_t primitive_iterator {};
 };
+
 }  // namespace detail
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
diff --git a/external_imported/json/include/nlohmann/detail/iterators/iter_impl.hpp b/external_imported/json/include/nlohmann/detail/iterators/iter_impl.hpp
index 118fef3f5..444709134 100644
--- a/external_imported/json/include/nlohmann/detail/iterators/iter_impl.hpp
+++ b/external_imported/json/include/nlohmann/detail/iterators/iter_impl.hpp
@@ -1,3 +1,11 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 #pragma once
 
 #include <iterator> // iterator, random_access_iterator_tag, bidirectional_iterator_tag, advance, next
@@ -11,10 +19,10 @@
 #include <nlohmann/detail/meta/type_traits.hpp>
 #include <nlohmann/detail/value_t.hpp>
 
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
+
 // forward declare, to be able to friend it later on
 template<typename IteratorType> class iteration_proxy;
 template<typename IteratorType> class iteration_proxy_value;
@@ -36,7 +44,7 @@ This class implements a both iterators (iterator and const_iterator) for the
        iterators in version 3.0.0 (see https://github.com/nlohmann/json/issues/593)
 */
 template<typename BasicJsonType>
-class iter_impl
+class iter_impl // NOLINT(cppcoreguidelines-special-member-functions,hicpp-special-member-functions)
 {
     /// the iterator with BasicJsonType of different const-ness
     using other_iter_impl = iter_impl<typename std::conditional<std::is_const<BasicJsonType>::value, typename std::remove_const<BasicJsonType>::type, const BasicJsonType>::type>;
@@ -51,9 +59,12 @@ class iter_impl
     // make sure BasicJsonType is basic_json or const basic_json
     static_assert(is_basic_json<typename std::remove_const<BasicJsonType>::type>::value,
                   "iter_impl only accepts (const) basic_json");
+    // superficial check for the LegacyBidirectionalIterator named requirement
+    static_assert(std::is_base_of<std::bidirectional_iterator_tag, std::bidirectional_iterator_tag>::value
+                  &&  std::is_base_of<std::bidirectional_iterator_tag, typename std::iterator_traits<typename array_t::iterator>::iterator_category>::value,
+                  "basic_json iterator assumes array and object type iterators satisfy the LegacyBidirectionalIterator named requirement.");
 
   public:
-
     /// The std::iterator class template (used as a base class to provide typedefs) is deprecated in C++17.
     /// The C++ Standard has never required user-defined iterators to derive from std::iterator.
     /// A user-defined iterator should provide publicly accessible typedefs named
@@ -75,8 +86,10 @@ class iter_impl
         typename BasicJsonType::const_reference,
         typename BasicJsonType::reference>::type;
 
-    /// default constructor
     iter_impl() = default;
+    ~iter_impl() = default;
+    iter_impl(iter_impl&&) noexcept = default;
+    iter_impl& operator=(iter_impl&&) noexcept = default;
 
     /*!
     @brief constructor for a given JSON instance
@@ -88,7 +101,7 @@ class iter_impl
     {
         JSON_ASSERT(m_object != nullptr);
 
-        switch (m_object->m_type)
+        switch (m_object->m_data.m_type)
         {
             case value_t::object:
             {
@@ -102,6 +115,14 @@ class iter_impl
                 break;
             }
 
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
             default:
             {
                 m_it.primitive_iterator = primitive_iterator_t();
@@ -138,8 +159,11 @@ class iter_impl
     */
     iter_impl& operator=(const iter_impl<const BasicJsonType>& other) noexcept
     {
-        m_object = other.m_object;
-        m_it = other.m_it;
+        if (&other != this)
+        {
+            m_object = other.m_object;
+            m_it = other.m_it;
+        }
         return *this;
     }
 
@@ -158,7 +182,7 @@ class iter_impl
     @return const/non-const iterator
     @note It is not checked whether @a other is initialized.
     */
-    iter_impl& operator=(const iter_impl<typename std::remove_const<BasicJsonType>::type>& other) noexcept
+    iter_impl& operator=(const iter_impl<typename std::remove_const<BasicJsonType>::type>& other) noexcept // NOLINT(cert-oop54-cpp)
     {
         m_object = other.m_object;
         m_it = other.m_it;
@@ -174,17 +198,17 @@ class iter_impl
     {
         JSON_ASSERT(m_object != nullptr);
 
-        switch (m_object->m_type)
+        switch (m_object->m_data.m_type)
         {
             case value_t::object:
             {
-                m_it.object_iterator = m_object->m_value.object->begin();
+                m_it.object_iterator = m_object->m_data.m_value.object->begin();
                 break;
             }
 
             case value_t::array:
             {
-                m_it.array_iterator = m_object->m_value.array->begin();
+                m_it.array_iterator = m_object->m_data.m_value.array->begin();
                 break;
             }
 
@@ -195,6 +219,13 @@ class iter_impl
                 break;
             }
 
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
             default:
             {
                 m_it.primitive_iterator.set_begin();
@@ -211,20 +242,28 @@ class iter_impl
     {
         JSON_ASSERT(m_object != nullptr);
 
-        switch (m_object->m_type)
+        switch (m_object->m_data.m_type)
         {
             case value_t::object:
             {
-                m_it.object_iterator = m_object->m_value.object->end();
+                m_it.object_iterator = m_object->m_data.m_value.object->end();
                 break;
             }
 
             case value_t::array:
             {
-                m_it.array_iterator = m_object->m_value.array->end();
+                m_it.array_iterator = m_object->m_data.m_value.array->end();
                 break;
             }
 
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
             default:
             {
                 m_it.primitive_iterator.set_end();
@@ -242,23 +281,30 @@ class iter_impl
     {
         JSON_ASSERT(m_object != nullptr);
 
-        switch (m_object->m_type)
+        switch (m_object->m_data.m_type)
         {
             case value_t::object:
             {
-                JSON_ASSERT(m_it.object_iterator != m_object->m_value.object->end());
+                JSON_ASSERT(m_it.object_iterator != m_object->m_data.m_value.object->end());
                 return m_it.object_iterator->second;
             }
 
             case value_t::array:
             {
-                JSON_ASSERT(m_it.array_iterator != m_object->m_value.array->end());
+                JSON_ASSERT(m_it.array_iterator != m_object->m_data.m_value.array->end());
                 return *m_it.array_iterator;
             }
 
             case value_t::null:
-                JSON_THROW(invalid_iterator::create(214, "cannot get value", *m_object));
-
+                JSON_THROW(invalid_iterator::create(214, "cannot get value", m_object));
+
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
             default:
             {
                 if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.is_begin()))
@@ -266,7 +312,7 @@ class iter_impl
                     return *m_object;
                 }
 
-                JSON_THROW(invalid_iterator::create(214, "cannot get value", *m_object));
+                JSON_THROW(invalid_iterator::create(214, "cannot get value", m_object));
             }
         }
     }
@@ -279,20 +325,28 @@ class iter_impl
     {
         JSON_ASSERT(m_object != nullptr);
 
-        switch (m_object->m_type)
+        switch (m_object->m_data.m_type)
         {
             case value_t::object:
             {
-                JSON_ASSERT(m_it.object_iterator != m_object->m_value.object->end());
+                JSON_ASSERT(m_it.object_iterator != m_object->m_data.m_value.object->end());
                 return &(m_it.object_iterator->second);
             }
 
             case value_t::array:
             {
-                JSON_ASSERT(m_it.array_iterator != m_object->m_value.array->end());
+                JSON_ASSERT(m_it.array_iterator != m_object->m_data.m_value.array->end());
                 return &*m_it.array_iterator;
             }
 
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
             default:
             {
                 if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.is_begin()))
@@ -300,7 +354,7 @@ class iter_impl
                     return m_object;
                 }
 
-                JSON_THROW(invalid_iterator::create(214, "cannot get value", *m_object));
+                JSON_THROW(invalid_iterator::create(214, "cannot get value", m_object));
             }
         }
     }
@@ -309,7 +363,7 @@ class iter_impl
     @brief post-increment (it++)
     @pre The iterator is initialized; i.e. `m_object != nullptr`.
     */
-    iter_impl const operator++(int)
+    iter_impl operator++(int)& // NOLINT(cert-dcl21-cpp)
     {
         auto result = *this;
         ++(*this);
@@ -324,7 +378,7 @@ class iter_impl
     {
         JSON_ASSERT(m_object != nullptr);
 
-        switch (m_object->m_type)
+        switch (m_object->m_data.m_type)
         {
             case value_t::object:
             {
@@ -338,6 +392,14 @@ class iter_impl
                 break;
             }
 
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
             default:
             {
                 ++m_it.primitive_iterator;
@@ -352,7 +414,7 @@ class iter_impl
     @brief post-decrement (it--)
     @pre The iterator is initialized; i.e. `m_object != nullptr`.
     */
-    iter_impl const operator--(int)
+    iter_impl operator--(int)& // NOLINT(cert-dcl21-cpp)
     {
         auto result = *this;
         --(*this);
@@ -367,7 +429,7 @@ class iter_impl
     {
         JSON_ASSERT(m_object != nullptr);
 
-        switch (m_object->m_type)
+        switch (m_object->m_data.m_type)
         {
             case value_t::object:
             {
@@ -381,6 +443,14 @@ class iter_impl
                 break;
             }
 
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
             default:
             {
                 --m_it.primitive_iterator;
@@ -401,12 +471,12 @@ class iter_impl
         // if objects are not the same, the comparison is undefined
         if (JSON_HEDLEY_UNLIKELY(m_object != other.m_object))
         {
-            JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers", *m_object));
+            JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers", m_object));
         }
 
         JSON_ASSERT(m_object != nullptr);
 
-        switch (m_object->m_type)
+        switch (m_object->m_data.m_type)
         {
             case value_t::object:
                 return (m_it.object_iterator == other.m_it.object_iterator);
@@ -414,6 +484,14 @@ class iter_impl
             case value_t::array:
                 return (m_it.array_iterator == other.m_it.array_iterator);
 
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
             default:
                 return (m_it.primitive_iterator == other.m_it.primitive_iterator);
         }
@@ -438,19 +516,27 @@ class iter_impl
         // if objects are not the same, the comparison is undefined
         if (JSON_HEDLEY_UNLIKELY(m_object != other.m_object))
         {
-            JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers", *m_object));
+            JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers", m_object));
         }
 
         JSON_ASSERT(m_object != nullptr);
 
-        switch (m_object->m_type)
+        switch (m_object->m_data.m_type)
         {
             case value_t::object:
-                JSON_THROW(invalid_iterator::create(213, "cannot compare order of object iterators", *m_object));
+                JSON_THROW(invalid_iterator::create(213, "cannot compare order of object iterators", m_object));
 
             case value_t::array:
                 return (m_it.array_iterator < other.m_it.array_iterator);
 
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
             default:
                 return (m_it.primitive_iterator < other.m_it.primitive_iterator);
         }
@@ -491,10 +577,10 @@ class iter_impl
     {
         JSON_ASSERT(m_object != nullptr);
 
-        switch (m_object->m_type)
+        switch (m_object->m_data.m_type)
         {
             case value_t::object:
-                JSON_THROW(invalid_iterator::create(209, "cannot use offsets with object iterators", *m_object));
+                JSON_THROW(invalid_iterator::create(209, "cannot use offsets with object iterators", m_object));
 
             case value_t::array:
             {
@@ -502,6 +588,14 @@ class iter_impl
                 break;
             }
 
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
             default:
             {
                 m_it.primitive_iterator += i;
@@ -562,14 +656,22 @@ class iter_impl
     {
         JSON_ASSERT(m_object != nullptr);
 
-        switch (m_object->m_type)
+        switch (m_object->m_data.m_type)
         {
             case value_t::object:
-                JSON_THROW(invalid_iterator::create(209, "cannot use offsets with object iterators", *m_object));
+                JSON_THROW(invalid_iterator::create(209, "cannot use offsets with object iterators", m_object));
 
             case value_t::array:
                 return m_it.array_iterator - other.m_it.array_iterator;
 
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
             default:
                 return m_it.primitive_iterator - other.m_it.primitive_iterator;
         }
@@ -583,17 +685,24 @@ class iter_impl
     {
         JSON_ASSERT(m_object != nullptr);
 
-        switch (m_object->m_type)
+        switch (m_object->m_data.m_type)
         {
             case value_t::object:
-                JSON_THROW(invalid_iterator::create(208, "cannot use operator[] for object iterators", *m_object));
+                JSON_THROW(invalid_iterator::create(208, "cannot use operator[] for object iterators", m_object));
 
             case value_t::array:
                 return *std::next(m_it.array_iterator, n);
 
             case value_t::null:
-                JSON_THROW(invalid_iterator::create(214, "cannot get value", *m_object));
-
+                JSON_THROW(invalid_iterator::create(214, "cannot get value", m_object));
+
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
             default:
             {
                 if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.get_value() == -n))
@@ -601,7 +710,7 @@ class iter_impl
                     return *m_object;
                 }
 
-                JSON_THROW(invalid_iterator::create(214, "cannot get value", *m_object));
+                JSON_THROW(invalid_iterator::create(214, "cannot get value", m_object));
             }
         }
     }
@@ -619,7 +728,7 @@ class iter_impl
             return m_it.object_iterator->first;
         }
 
-        JSON_THROW(invalid_iterator::create(207, "cannot use key() for non-object iterators", *m_object));
+        JSON_THROW(invalid_iterator::create(207, "cannot use key() for non-object iterators", m_object));
     }
 
     /*!
@@ -637,5 +746,6 @@ class iter_impl
     /// the actual iterator of the associated instance
     internal_iterator<typename std::remove_const<BasicJsonType>::type> m_it {};
 };
-} // namespace detail
-} // namespace nlohmann
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
diff --git a/external_imported/json/include/nlohmann/detail/iterators/iteration_proxy.hpp b/external_imported/json/include/nlohmann/detail/iterators/iteration_proxy.hpp
index 1b47faeb3..76293de22 100644
--- a/external_imported/json/include/nlohmann/detail/iterators/iteration_proxy.hpp
+++ b/external_imported/json/include/nlohmann/detail/iterators/iteration_proxy.hpp
@@ -1,17 +1,31 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 #pragma once
 
 #include <cstddef> // size_t
 #include <iterator> // input_iterator_tag
 #include <string> // string, to_string
 #include <tuple> // tuple_size, get, tuple_element
+#include <utility> // move
+
+#if JSON_HAS_RANGES
+    #include <ranges> // enable_borrowed_range
+#endif
 
+#include <nlohmann/detail/abi_macros.hpp>
 #include <nlohmann/detail/meta/type_traits.hpp>
 #include <nlohmann/detail/value_t.hpp>
 
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
+
 template<typename string_type>
 void int_to_string( string_type& target, std::size_t value )
 {
@@ -24,14 +38,14 @@ template<typename IteratorType> class iteration_proxy_value
   public:
     using difference_type = std::ptrdiff_t;
     using value_type = iteration_proxy_value;
-    using pointer = value_type * ;
-    using reference = value_type & ;
+    using pointer = value_type *;
+    using reference = value_type &;
     using iterator_category = std::input_iterator_tag;
     using string_type = typename std::remove_cv< typename std::remove_reference<decltype( std::declval<IteratorType>().key() ) >::type >::type;
 
   private:
     /// the iterator
-    IteratorType anchor;
+    IteratorType anchor{};
     /// an index for arrays (used to create key names)
     std::size_t array_index = 0;
     /// last stringified array index
@@ -39,13 +53,30 @@ template<typename IteratorType> class iteration_proxy_value
     /// a string representation of the array index
     mutable string_type array_index_str = "0";
     /// an empty string (to return a reference for primitive values)
-    const string_type empty_str{};
+    string_type empty_str{};
 
   public:
-    explicit iteration_proxy_value(IteratorType it) noexcept : anchor(it) {}
+    explicit iteration_proxy_value() = default;
+    explicit iteration_proxy_value(IteratorType it, std::size_t array_index_ = 0)
+    noexcept(std::is_nothrow_move_constructible<IteratorType>::value
+             && std::is_nothrow_default_constructible<string_type>::value)
+        : anchor(std::move(it))
+        , array_index(array_index_)
+    {}
+
+    iteration_proxy_value(iteration_proxy_value const&) = default;
+    iteration_proxy_value& operator=(iteration_proxy_value const&) = default;
+    // older GCCs are a bit fussy and require explicit noexcept specifiers on defaulted functions
+    iteration_proxy_value(iteration_proxy_value&&)
+    noexcept(std::is_nothrow_move_constructible<IteratorType>::value
+             && std::is_nothrow_move_constructible<string_type>::value) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor,cppcoreguidelines-noexcept-move-operations)
+    iteration_proxy_value& operator=(iteration_proxy_value&&)
+    noexcept(std::is_nothrow_move_assignable<IteratorType>::value
+             && std::is_nothrow_move_assignable<string_type>::value) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor,cppcoreguidelines-noexcept-move-operations)
+    ~iteration_proxy_value() = default;
 
     /// dereference operator (needed for range-based for)
-    iteration_proxy_value& operator*()
+    const iteration_proxy_value& operator*() const
     {
         return *this;
     }
@@ -59,6 +90,14 @@ template<typename IteratorType> class iteration_proxy_value
         return *this;
     }
 
+    iteration_proxy_value operator++(int)& // NOLINT(cert-dcl21-cpp)
+    {
+        auto tmp = iteration_proxy_value(anchor, array_index);
+        ++anchor;
+        ++array_index;
+        return tmp;
+    }
+
     /// equality operator (needed for InputIterator)
     bool operator==(const iteration_proxy_value& o) const
     {
@@ -94,6 +133,14 @@ template<typename IteratorType> class iteration_proxy_value
                 return anchor.key();
 
             // use an empty key for all primitive types
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
             default:
                 return empty_str;
         }
@@ -111,25 +158,34 @@ template<typename IteratorType> class iteration_proxy
 {
   private:
     /// the container to iterate
-    typename IteratorType::reference container;
+    typename IteratorType::pointer container = nullptr;
 
   public:
+    explicit iteration_proxy() = default;
+
     /// construct iteration proxy from a container
     explicit iteration_proxy(typename IteratorType::reference cont) noexcept
-        : container(cont) {}
+        : container(&cont) {}
+
+    iteration_proxy(iteration_proxy const&) = default;
+    iteration_proxy& operator=(iteration_proxy const&) = default;
+    iteration_proxy(iteration_proxy&&) noexcept = default;
+    iteration_proxy& operator=(iteration_proxy&&) noexcept = default;
+    ~iteration_proxy() = default;
 
     /// return iterator begin (needed for range-based for)
-    iteration_proxy_value<IteratorType> begin() noexcept
+    iteration_proxy_value<IteratorType> begin() const noexcept
     {
-        return iteration_proxy_value<IteratorType>(container.begin());
+        return iteration_proxy_value<IteratorType>(container->begin());
     }
 
     /// return iterator end (needed for range-based for)
-    iteration_proxy_value<IteratorType> end() noexcept
+    iteration_proxy_value<IteratorType> end() const noexcept
     {
-        return iteration_proxy_value<IteratorType>(container.end());
+        return iteration_proxy_value<IteratorType>(container->end());
     }
 };
+
 // Structured Bindings Support
 // For further reference see https://blog.tartanllama.xyz/structured-bindings/
 // And see https://github.com/nlohmann/json/pull/1391
@@ -146,8 +202,9 @@ auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decl
 {
     return i.value();
 }
+
 }  // namespace detail
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
 
 // The Addition to the STD Namespace is required to add
 // Structured Bindings Support to the iteration_proxy_value class
@@ -155,17 +212,18 @@ auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decl
 // And see https://github.com/nlohmann/json/pull/1391
 namespace std
 {
+
 #if defined(__clang__)
     // Fix: https://github.com/nlohmann/json/issues/1401
     #pragma clang diagnostic push
     #pragma clang diagnostic ignored "-Wmismatched-tags"
 #endif
 template<typename IteratorType>
-class tuple_size<::nlohmann::detail::iteration_proxy_value<IteratorType>>
+class tuple_size<::nlohmann::detail::iteration_proxy_value<IteratorType>> // NOLINT(cert-dcl58-cpp)
             : public std::integral_constant<std::size_t, 2> {};
 
 template<std::size_t N, typename IteratorType>
-class tuple_element<N, ::nlohmann::detail::iteration_proxy_value<IteratorType >>
+class tuple_element<N, ::nlohmann::detail::iteration_proxy_value<IteratorType >> // NOLINT(cert-dcl58-cpp)
 {
   public:
     using type = decltype(
@@ -175,4 +233,10 @@ class tuple_element<N, ::nlohmann::detail::iteration_proxy_value<IteratorType >>
 #if defined(__clang__)
     #pragma clang diagnostic pop
 #endif
-} // namespace std
+
+}  // namespace std
+
+#if JSON_HAS_RANGES
+    template <typename IteratorType>
+    inline constexpr bool ::std::ranges::enable_borrowed_range<::nlohmann::detail::iteration_proxy<IteratorType>> = true;
+#endif
diff --git a/external_imported/json/include/nlohmann/detail/iterators/iterator_traits.hpp b/external_imported/json/include/nlohmann/detail/iterators/iterator_traits.hpp
index da5636188..84cc27a85 100644
--- a/external_imported/json/include/nlohmann/detail/iterators/iterator_traits.hpp
+++ b/external_imported/json/include/nlohmann/detail/iterators/iterator_traits.hpp
@@ -1,14 +1,23 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 #pragma once
 
 #include <iterator> // random_access_iterator_tag
 
+#include <nlohmann/detail/abi_macros.hpp>
 #include <nlohmann/detail/meta/void_t.hpp>
 #include <nlohmann/detail/meta/cpp_future.hpp>
 
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
+
 template<typename It, typename = void>
 struct iterator_types {};
 
@@ -47,5 +56,6 @@ struct iterator_traits<T*, enable_if_t<std::is_object<T>::value>>
     using pointer = T*;
     using reference = T&;
 };
-} // namespace detail
-} // namespace nlohmann
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
diff --git a/external_imported/json/include/nlohmann/detail/iterators/json_reverse_iterator.hpp b/external_imported/json/include/nlohmann/detail/iterators/json_reverse_iterator.hpp
index f3b5b5db6..006d5499a 100644
--- a/external_imported/json/include/nlohmann/detail/iterators/json_reverse_iterator.hpp
+++ b/external_imported/json/include/nlohmann/detail/iterators/json_reverse_iterator.hpp
@@ -1,13 +1,23 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 #pragma once
 
 #include <cstddef> // ptrdiff_t
 #include <iterator> // reverse_iterator
 #include <utility> // declval
 
-namespace nlohmann
-{
+#include <nlohmann/detail/abi_macros.hpp>
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
+
 //////////////////////
 // reverse_iterator //
 //////////////////////
@@ -48,7 +58,7 @@ class json_reverse_iterator : public std::reverse_iterator<Base>
     explicit json_reverse_iterator(const base_iterator& it) noexcept : base_iterator(it) {}
 
     /// post-increment (it++)
-    json_reverse_iterator const operator++(int)
+    json_reverse_iterator operator++(int)& // NOLINT(cert-dcl21-cpp)
     {
         return static_cast<json_reverse_iterator>(base_iterator::operator++(1));
     }
@@ -60,7 +70,7 @@ class json_reverse_iterator : public std::reverse_iterator<Base>
     }
 
     /// post-decrement (it--)
-    json_reverse_iterator const operator--(int)
+    json_reverse_iterator operator--(int)& // NOLINT(cert-dcl21-cpp)
     {
         return static_cast<json_reverse_iterator>(base_iterator::operator--(1));
     }
@@ -115,5 +125,6 @@ class json_reverse_iterator : public std::reverse_iterator<Base>
         return it.operator * ();
     }
 };
+
 }  // namespace detail
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
diff --git a/external_imported/json/include/nlohmann/detail/iterators/primitive_iterator.hpp b/external_imported/json/include/nlohmann/detail/iterators/primitive_iterator.hpp
index ae7471ef5..0b6e8499e 100644
--- a/external_imported/json/include/nlohmann/detail/iterators/primitive_iterator.hpp
+++ b/external_imported/json/include/nlohmann/detail/iterators/primitive_iterator.hpp
@@ -1,3 +1,11 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 #pragma once
 
 #include <cstddef> // ptrdiff_t
@@ -5,10 +13,10 @@
 
 #include <nlohmann/detail/macro_scope.hpp>
 
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
+
 /*
 @brief an iterator for primitive JSON types
 
@@ -87,7 +95,7 @@ class primitive_iterator_t
         return *this;
     }
 
-    primitive_iterator_t const operator++(int) noexcept
+    primitive_iterator_t operator++(int)& noexcept // NOLINT(cert-dcl21-cpp)
     {
         auto result = *this;
         ++m_it;
@@ -100,7 +108,7 @@ class primitive_iterator_t
         return *this;
     }
 
-    primitive_iterator_t const operator--(int) noexcept
+    primitive_iterator_t operator--(int)& noexcept // NOLINT(cert-dcl21-cpp)
     {
         auto result = *this;
         --m_it;
@@ -119,5 +127,6 @@ class primitive_iterator_t
         return *this;
     }
 };
+
 }  // namespace detail
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
diff --git a/external_imported/json/include/nlohmann/detail/json_custom_base_class.hpp b/external_imported/json/include/nlohmann/detail/json_custom_base_class.hpp
new file mode 100644
index 000000000..d1e29162a
--- /dev/null
+++ b/external_imported/json/include/nlohmann/detail/json_custom_base_class.hpp
@@ -0,0 +1,39 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#pragma once
+
+#include <type_traits> // conditional, is_same
+
+#include <nlohmann/detail/abi_macros.hpp>
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+/*!
+@brief Default base class of the @ref basic_json class.
+
+So that the correct implementations of the copy / move ctors / assign operators
+of @ref basic_json do not require complex case distinctions
+(no base class / custom base class used as customization point),
+@ref basic_json always has a base class.
+By default, this class is used because it is empty and thus has no effect
+on the behavior of @ref basic_json.
+*/
+struct json_default_base {};
+
+template<class T>
+using json_base_class = typename std::conditional <
+                        std::is_same<T, void>::value,
+                        json_default_base,
+                        T
+                        >::type;
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
diff --git a/external_imported/json/include/nlohmann/detail/json_pointer.hpp b/external_imported/json/include/nlohmann/detail/json_pointer.hpp
index cb2ec8560..4fdcd9ad2 100644
--- a/external_imported/json/include/nlohmann/detail/json_pointer.hpp
+++ b/external_imported/json/include/nlohmann/detail/json_pointer.hpp
@@ -1,7 +1,20 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 #pragma once
 
 #include <algorithm> // all_of
 #include <cctype> // isdigit
+#include <cerrno> // errno, ERANGE
+#include <cstdlib> // strtoull
+#ifndef JSON_NO_IO
+    #include <iosfwd> // ostream
+#endif  // JSON_NO_IO
 #include <limits> // max
 #include <numeric> // accumulate
 #include <string> // string
@@ -10,90 +23,78 @@
 
 #include <nlohmann/detail/exceptions.hpp>
 #include <nlohmann/detail/macro_scope.hpp>
+#include <nlohmann/detail/string_concat.hpp>
 #include <nlohmann/detail/string_escape.hpp>
 #include <nlohmann/detail/value_t.hpp>
 
-namespace nlohmann
-{
-template<typename BasicJsonType>
+NLOHMANN_JSON_NAMESPACE_BEGIN
+
+/// @brief JSON Pointer defines a string syntax for identifying a specific value within a JSON document
+/// @sa https://json.nlohmann.me/api/json_pointer/
+template<typename RefStringType>
 class json_pointer
 {
     // allow basic_json to access private members
     NLOHMANN_BASIC_JSON_TPL_DECLARATION
     friend class basic_json;
 
-  public:
-    /*!
-    @brief create JSON pointer
+    template<typename>
+    friend class json_pointer;
 
-    Create a JSON pointer according to the syntax described in
-    [Section 3 of RFC6901](https://tools.ietf.org/html/rfc6901#section-3).
-
-    @param[in] s  string representing the JSON pointer; if omitted, the empty
-                  string is assumed which references the whole JSON value
-
-    @throw parse_error.107 if the given JSON pointer @a s is nonempty and does
-                           not begin with a slash (`/`); see example below
+    template<typename T>
+    struct string_t_helper
+    {
+        using type = T;
+    };
 
-    @throw parse_error.108 if a tilde (`~`) in the given JSON pointer @a s is
-    not followed by `0` (representing `~`) or `1` (representing `/`); see
-    example below
+    NLOHMANN_BASIC_JSON_TPL_DECLARATION
+    struct string_t_helper<NLOHMANN_BASIC_JSON_TPL>
+    {
+        using type = StringType;
+    };
 
-    @liveexample{The example shows the construction several valid JSON pointers
-    as well as the exceptional behavior.,json_pointer}
+  public:
+    // for backwards compatibility accept BasicJsonType
+    using string_t = typename string_t_helper<RefStringType>::type;
 
-    @since version 2.0.0
-    */
-    explicit json_pointer(const std::string& s = "")
+    /// @brief create JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/json_pointer/
+    explicit json_pointer(const string_t& s = "")
         : reference_tokens(split(s))
     {}
 
-    /*!
-    @brief return a string representation of the JSON pointer
-
-    @invariant For each JSON pointer `ptr`, it holds:
-    @code {.cpp}
-    ptr == json_pointer(ptr.to_string());
-    @endcode
-
-    @return a string representation of the JSON pointer
-
-    @liveexample{The example shows the result of `to_string`.,json_pointer__to_string}
-
-    @since version 2.0.0
-    */
-    std::string to_string() const
+    /// @brief return a string representation of the JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/to_string/
+    string_t to_string() const
     {
         return std::accumulate(reference_tokens.begin(), reference_tokens.end(),
-                               std::string{},
-                               [](const std::string & a, const std::string & b)
+                               string_t{},
+                               [](const string_t& a, const string_t& b)
         {
-            return a + "/" + detail::escape(b);
+            return detail::concat(a, '/', detail::escape(b));
         });
     }
 
-    /// @copydoc to_string()
-    operator std::string() const
+    /// @brief return a string representation of the JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_string/
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, to_string())
+    operator string_t() const
     {
         return to_string();
     }
 
-    /*!
-    @brief append another JSON pointer at the end of this JSON pointer
-
-    @param[in] ptr  JSON pointer to append
-    @return JSON pointer with @a ptr appended
-
-    @liveexample{The example shows the usage of `operator/=`.,json_pointer__operator_add}
-
-    @complexity Linear in the length of @a ptr.
-
-    @sa @ref operator/=(std::string) to append a reference token
-    @sa @ref operator/=(std::size_t) to append an array index
-    @sa @ref operator/(const json_pointer&, const json_pointer&) for a binary operator
+#ifndef JSON_NO_IO
+    /// @brief write string representation of the JSON pointer to stream
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ltlt/
+    friend std::ostream& operator<<(std::ostream& o, const json_pointer& ptr)
+    {
+        o << ptr.to_string();
+        return o;
+    }
+#endif
 
-    @since version 3.6.0
-    */
+    /// @brief append another JSON pointer at the end of this JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slasheq/
     json_pointer& operator/=(const json_pointer& ptr)
     {
         reference_tokens.insert(reference_tokens.end(),
@@ -102,123 +103,45 @@ class json_pointer
         return *this;
     }
 
-    /*!
-    @brief append an unescaped reference token at the end of this JSON pointer
-
-    @param[in] token  reference token to append
-    @return JSON pointer with @a token appended without escaping @a token
-
-    @liveexample{The example shows the usage of `operator/=`.,json_pointer__operator_add}
-
-    @complexity Amortized constant.
-
-    @sa @ref operator/=(const json_pointer&) to append a JSON pointer
-    @sa @ref operator/=(std::size_t) to append an array index
-    @sa @ref operator/(const json_pointer&, std::size_t) for a binary operator
-
-    @since version 3.6.0
-    */
-    json_pointer& operator/=(std::string token)
+    /// @brief append an unescaped reference token at the end of this JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slasheq/
+    json_pointer& operator/=(string_t token)
     {
         push_back(std::move(token));
         return *this;
     }
 
-    /*!
-    @brief append an array index at the end of this JSON pointer
-
-    @param[in] array_idx  array index to append
-    @return JSON pointer with @a array_idx appended
-
-    @liveexample{The example shows the usage of `operator/=`.,json_pointer__operator_add}
-
-    @complexity Amortized constant.
-
-    @sa @ref operator/=(const json_pointer&) to append a JSON pointer
-    @sa @ref operator/=(std::string) to append a reference token
-    @sa @ref operator/(const json_pointer&, std::string) for a binary operator
-
-    @since version 3.6.0
-    */
+    /// @brief append an array index at the end of this JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slasheq/
     json_pointer& operator/=(std::size_t array_idx)
     {
         return *this /= std::to_string(array_idx);
     }
 
-    /*!
-    @brief create a new JSON pointer by appending the right JSON pointer at the end of the left JSON pointer
-
-    @param[in] lhs  JSON pointer
-    @param[in] rhs  JSON pointer
-    @return a new JSON pointer with @a rhs appended to @a lhs
-
-    @liveexample{The example shows the usage of `operator/`.,json_pointer__operator_add_binary}
-
-    @complexity Linear in the length of @a lhs and @a rhs.
-
-    @sa @ref operator/=(const json_pointer&) to append a JSON pointer
-
-    @since version 3.6.0
-    */
+    /// @brief create a new JSON pointer by appending the right JSON pointer at the end of the left JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slash/
     friend json_pointer operator/(const json_pointer& lhs,
                                   const json_pointer& rhs)
     {
         return json_pointer(lhs) /= rhs;
     }
 
-    /*!
-    @brief create a new JSON pointer by appending the unescaped token at the end of the JSON pointer
-
-    @param[in] ptr  JSON pointer
-    @param[in] token  reference token
-    @return a new JSON pointer with unescaped @a token appended to @a ptr
-
-    @liveexample{The example shows the usage of `operator/`.,json_pointer__operator_add_binary}
-
-    @complexity Linear in the length of @a ptr.
-
-    @sa @ref operator/=(std::string) to append a reference token
-
-    @since version 3.6.0
-    */
-    friend json_pointer operator/(const json_pointer& ptr, std::string token)
+    /// @brief create a new JSON pointer by appending the unescaped token at the end of the JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slash/
+    friend json_pointer operator/(const json_pointer& lhs, string_t token) // NOLINT(performance-unnecessary-value-param)
     {
-        return json_pointer(ptr) /= std::move(token);
+        return json_pointer(lhs) /= std::move(token);
     }
 
-    /*!
-    @brief create a new JSON pointer by appending the array-index-token at the end of the JSON pointer
-
-    @param[in] ptr  JSON pointer
-    @param[in] array_idx  array index
-    @return a new JSON pointer with @a array_idx appended to @a ptr
-
-    @liveexample{The example shows the usage of `operator/`.,json_pointer__operator_add_binary}
-
-    @complexity Linear in the length of @a ptr.
-
-    @sa @ref operator/=(std::size_t) to append an array index
-
-    @since version 3.6.0
-    */
-    friend json_pointer operator/(const json_pointer& ptr, std::size_t array_idx)
+    /// @brief create a new JSON pointer by appending the array-index-token at the end of the JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slash/
+    friend json_pointer operator/(const json_pointer& lhs, std::size_t array_idx)
     {
-        return json_pointer(ptr) /= array_idx;
+        return json_pointer(lhs) /= array_idx;
     }
 
-    /*!
-    @brief returns the parent of this JSON pointer
-
-    @return parent of this JSON pointer; in case this JSON pointer is the root,
-            the root itself is returned
-
-    @complexity Linear in the length of the JSON pointer.
-
-    @liveexample{The example shows the result of `parent_pointer` for different
-    JSON Pointers.,json_pointer__parent_pointer}
-
-    @since version 3.6.0
-    */
+    /// @brief returns the parent of this JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/parent_pointer/
     json_pointer parent_pointer() const
     {
         if (empty())
@@ -231,90 +154,46 @@ class json_pointer
         return res;
     }
 
-    /*!
-    @brief remove last reference token
-
-    @pre not `empty()`
-
-    @liveexample{The example shows the usage of `pop_back`.,json_pointer__pop_back}
-
-    @complexity Constant.
-
-    @throw out_of_range.405 if JSON pointer has no parent
-
-    @since version 3.6.0
-    */
+    /// @brief remove last reference token
+    /// @sa https://json.nlohmann.me/api/json_pointer/pop_back/
     void pop_back()
     {
         if (JSON_HEDLEY_UNLIKELY(empty()))
         {
-            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent", BasicJsonType()));
+            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent", nullptr));
         }
 
         reference_tokens.pop_back();
     }
 
-    /*!
-    @brief return last reference token
-
-    @pre not `empty()`
-    @return last reference token
-
-    @liveexample{The example shows the usage of `back`.,json_pointer__back}
-
-    @complexity Constant.
-
-    @throw out_of_range.405 if JSON pointer has no parent
-
-    @since version 3.6.0
-    */
-    const std::string& back() const
+    /// @brief return last reference token
+    /// @sa https://json.nlohmann.me/api/json_pointer/back/
+    const string_t& back() const
     {
         if (JSON_HEDLEY_UNLIKELY(empty()))
         {
-            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent", BasicJsonType()));
+            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent", nullptr));
         }
 
         return reference_tokens.back();
     }
 
-    /*!
-    @brief append an unescaped token at the end of the reference pointer
-
-    @param[in] token  token to add
-
-    @complexity Amortized constant.
-
-    @liveexample{The example shows the result of `push_back` for different
-    JSON Pointers.,json_pointer__push_back}
-
-    @since version 3.6.0
-    */
-    void push_back(const std::string& token)
+    /// @brief append an unescaped token at the end of the reference pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/push_back/
+    void push_back(const string_t& token)
     {
         reference_tokens.push_back(token);
     }
 
-    /// @copydoc push_back(const std::string&)
-    void push_back(std::string&& token)
+    /// @brief append an unescaped token at the end of the reference pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/push_back/
+    void push_back(string_t&& token)
     {
         reference_tokens.push_back(std::move(token));
     }
 
-    /*!
-    @brief return whether pointer points to the root document
-
-    @return true iff the JSON pointer points to the root document
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @liveexample{The example shows the result of `empty` for different JSON
-    Pointers.,json_pointer__empty}
-
-    @since version 3.6.0
-    */
+    /// @brief return whether pointer points to the root document
+    /// @sa https://json.nlohmann.me/api/json_pointer/empty/
     bool empty() const noexcept
     {
         return reference_tokens.empty();
@@ -331,44 +210,39 @@ class json_pointer
     @throw out_of_range.404 if string @a s could not be converted to an integer
     @throw out_of_range.410 if an array index exceeds size_type
     */
-    static typename BasicJsonType::size_type array_index(const std::string& s)
+    template<typename BasicJsonType>
+    static typename BasicJsonType::size_type array_index(const string_t& s)
     {
         using size_type = typename BasicJsonType::size_type;
 
         // error condition (cf. RFC 6901, Sect. 4)
         if (JSON_HEDLEY_UNLIKELY(s.size() > 1 && s[0] == '0'))
         {
-            JSON_THROW(detail::parse_error::create(106, 0, "array index '" + s + "' must not begin with '0'", BasicJsonType()));
+            JSON_THROW(detail::parse_error::create(106, 0, detail::concat("array index '", s, "' must not begin with '0'"), nullptr));
         }
 
         // error condition (cf. RFC 6901, Sect. 4)
         if (JSON_HEDLEY_UNLIKELY(s.size() > 1 && !(s[0] >= '1' && s[0] <= '9')))
         {
-            JSON_THROW(detail::parse_error::create(109, 0, "array index '" + s + "' is not a number", BasicJsonType()));
-        }
-
-        std::size_t processed_chars = 0;
-        unsigned long long res = 0;
-        JSON_TRY
-        {
-            res = std::stoull(s, &processed_chars);
-        }
-        JSON_CATCH(std::out_of_range&)
-        {
-            JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + s + "'", BasicJsonType()));
+            JSON_THROW(detail::parse_error::create(109, 0, detail::concat("array index '", s, "' is not a number"), nullptr));
         }
 
-        // check if the string was completely read
-        if (JSON_HEDLEY_UNLIKELY(processed_chars != s.size()))
+        const char* p = s.c_str();
+        char* p_end = nullptr;
+        errno = 0; // strtoull doesn't reset errno
+        const unsigned long long res = std::strtoull(p, &p_end, 10); // NOLINT(runtime/int)
+        if (p == p_end // invalid input or empty string
+                || errno == ERANGE // out of range
+                || JSON_HEDLEY_UNLIKELY(static_cast<std::size_t>(p_end - p) != s.size())) // incomplete read
         {
-            JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + s + "'", BasicJsonType()));
+            JSON_THROW(detail::out_of_range::create(404, detail::concat("unresolved reference token '", s, "'"), nullptr));
         }
 
         // only triggered on special platforms (like 32bit), see also
         // https://github.com/nlohmann/json/pull/2203
-        if (res >= static_cast<unsigned long long>((std::numeric_limits<size_type>::max)()))
+        if (res >= static_cast<unsigned long long>((std::numeric_limits<size_type>::max)()))  // NOLINT(runtime/int)
         {
-            JSON_THROW(detail::out_of_range::create(410, "array index " + s + " exceeds size_type", BasicJsonType())); // LCOV_EXCL_LINE
+            JSON_THROW(detail::out_of_range::create(410, detail::concat("array index ", s, " exceeds size_type"), nullptr));   // LCOV_EXCL_LINE
         }
 
         return static_cast<size_type>(res);
@@ -379,7 +253,7 @@ class json_pointer
     {
         if (JSON_HEDLEY_UNLIKELY(empty()))
         {
-            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent", BasicJsonType()));
+            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent", nullptr));
         }
 
         json_pointer result = *this;
@@ -396,9 +270,10 @@ class json_pointer
     @throw parse_error.109 if array index is not a number
     @throw type_error.313 if value cannot be unflattened
     */
+    template<typename BasicJsonType>
     BasicJsonType& get_and_create(BasicJsonType& j) const
     {
-        auto result = &j;
+        auto* result = &j;
 
         // in case no reference tokens exist, return a reference to the JSON value
         // j which will be overwritten by a primitive value
@@ -431,7 +306,7 @@ class json_pointer
                 case detail::value_t::array:
                 {
                     // create an entry in the array
-                    result = &result->operator[](array_index(reference_token));
+                    result = &result->operator[](array_index<BasicJsonType>(reference_token));
                     break;
                 }
 
@@ -441,8 +316,15 @@ class json_pointer
                 an error situation, because primitive values may only occur as
                 single value; that is, with an empty list of reference tokens.
                 */
+                case detail::value_t::string:
+                case detail::value_t::boolean:
+                case detail::value_t::number_integer:
+                case detail::value_t::number_unsigned:
+                case detail::value_t::number_float:
+                case detail::value_t::binary:
+                case detail::value_t::discarded:
                 default:
-                    JSON_THROW(detail::type_error::create(313, "invalid value to unflatten", j));
+                    JSON_THROW(detail::type_error::create(313, "invalid value to unflatten", &j));
             }
         }
 
@@ -468,6 +350,7 @@ class json_pointer
     @throw parse_error.109   if an array index was not a number
     @throw out_of_range.404  if the JSON pointer can not be resolved
     */
+    template<typename BasicJsonType>
     BasicJsonType& get_unchecked(BasicJsonType* ptr) const
     {
         for (const auto& reference_token : reference_tokens)
@@ -503,18 +386,26 @@ class json_pointer
                     if (reference_token == "-")
                     {
                         // explicitly treat "-" as index beyond the end
-                        ptr = &ptr->operator[](ptr->m_value.array->size());
+                        ptr = &ptr->operator[](ptr->m_data.m_value.array->size());
                     }
                     else
                     {
                         // convert array index to number; unchecked access
-                        ptr = &ptr->operator[](array_index(reference_token));
+                        ptr = &ptr->operator[](array_index<BasicJsonType>(reference_token));
                     }
                     break;
                 }
 
+                case detail::value_t::null:
+                case detail::value_t::string:
+                case detail::value_t::boolean:
+                case detail::value_t::number_integer:
+                case detail::value_t::number_unsigned:
+                case detail::value_t::number_float:
+                case detail::value_t::binary:
+                case detail::value_t::discarded:
                 default:
-                    JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'", *ptr));
+                    JSON_THROW(detail::out_of_range::create(404, detail::concat("unresolved reference token '", reference_token, "'"), ptr));
             }
         }
 
@@ -527,6 +418,7 @@ class json_pointer
     @throw out_of_range.402  if the array index '-' is used
     @throw out_of_range.404  if the JSON pointer can not be resolved
     */
+    template<typename BasicJsonType>
     BasicJsonType& get_checked(BasicJsonType* ptr) const
     {
         for (const auto& reference_token : reference_tokens)
@@ -545,18 +437,26 @@ class json_pointer
                     if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
                     {
                         // "-" always fails the range check
-                        JSON_THROW(detail::out_of_range::create(402,
-                                                                "array index '-' (" + std::to_string(ptr->m_value.array->size()) +
-                                                                ") is out of range", *ptr));
+                        JSON_THROW(detail::out_of_range::create(402, detail::concat(
+                                "array index '-' (", std::to_string(ptr->m_data.m_value.array->size()),
+                                ") is out of range"), ptr));
                     }
 
                     // note: at performs range check
-                    ptr = &ptr->at(array_index(reference_token));
+                    ptr = &ptr->at(array_index<BasicJsonType>(reference_token));
                     break;
                 }
 
+                case detail::value_t::null:
+                case detail::value_t::string:
+                case detail::value_t::boolean:
+                case detail::value_t::number_integer:
+                case detail::value_t::number_unsigned:
+                case detail::value_t::number_float:
+                case detail::value_t::binary:
+                case detail::value_t::discarded:
                 default:
-                    JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'", *ptr));
+                    JSON_THROW(detail::out_of_range::create(404, detail::concat("unresolved reference token '", reference_token, "'"), ptr));
             }
         }
 
@@ -576,6 +476,7 @@ class json_pointer
     @throw out_of_range.402  if the array index '-' is used
     @throw out_of_range.404  if the JSON pointer can not be resolved
     */
+    template<typename BasicJsonType>
     const BasicJsonType& get_unchecked(const BasicJsonType* ptr) const
     {
         for (const auto& reference_token : reference_tokens)
@@ -594,16 +495,24 @@ class json_pointer
                     if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
                     {
                         // "-" cannot be used for const access
-                        JSON_THROW(detail::out_of_range::create(402, "array index '-' (" + std::to_string(ptr->m_value.array->size()) + ") is out of range", *ptr));
+                        JSON_THROW(detail::out_of_range::create(402, detail::concat("array index '-' (", std::to_string(ptr->m_data.m_value.array->size()), ") is out of range"), ptr));
                     }
 
                     // use unchecked array access
-                    ptr = &ptr->operator[](array_index(reference_token));
+                    ptr = &ptr->operator[](array_index<BasicJsonType>(reference_token));
                     break;
                 }
 
+                case detail::value_t::null:
+                case detail::value_t::string:
+                case detail::value_t::boolean:
+                case detail::value_t::number_integer:
+                case detail::value_t::number_unsigned:
+                case detail::value_t::number_float:
+                case detail::value_t::binary:
+                case detail::value_t::discarded:
                 default:
-                    JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'", *ptr));
+                    JSON_THROW(detail::out_of_range::create(404, detail::concat("unresolved reference token '", reference_token, "'"), ptr));
             }
         }
 
@@ -616,6 +525,7 @@ class json_pointer
     @throw out_of_range.402  if the array index '-' is used
     @throw out_of_range.404  if the JSON pointer can not be resolved
     */
+    template<typename BasicJsonType>
     const BasicJsonType& get_checked(const BasicJsonType* ptr) const
     {
         for (const auto& reference_token : reference_tokens)
@@ -634,18 +544,26 @@ class json_pointer
                     if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
                     {
                         // "-" always fails the range check
-                        JSON_THROW(detail::out_of_range::create(402,
-                                                                "array index '-' (" + std::to_string(ptr->m_value.array->size()) +
-                                                                ") is out of range", *ptr));
+                        JSON_THROW(detail::out_of_range::create(402, detail::concat(
+                                "array index '-' (", std::to_string(ptr->m_data.m_value.array->size()),
+                                ") is out of range"), ptr));
                     }
 
                     // note: at performs range check
-                    ptr = &ptr->at(array_index(reference_token));
+                    ptr = &ptr->at(array_index<BasicJsonType>(reference_token));
                     break;
                 }
 
+                case detail::value_t::null:
+                case detail::value_t::string:
+                case detail::value_t::boolean:
+                case detail::value_t::number_integer:
+                case detail::value_t::number_unsigned:
+                case detail::value_t::number_float:
+                case detail::value_t::binary:
+                case detail::value_t::discarded:
                 default:
-                    JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'", *ptr));
+                    JSON_THROW(detail::out_of_range::create(404, detail::concat("unresolved reference token '", reference_token, "'"), ptr));
             }
         }
 
@@ -656,6 +574,7 @@ class json_pointer
     @throw parse_error.106   if an array index begins with '0'
     @throw parse_error.109   if an array index was not a number
     */
+    template<typename BasicJsonType>
     bool contains(const BasicJsonType* ptr) const
     {
         for (const auto& reference_token : reference_tokens)
@@ -703,7 +622,7 @@ class json_pointer
                         }
                     }
 
-                    const auto idx = array_index(reference_token);
+                    const auto idx = array_index<BasicJsonType>(reference_token);
                     if (idx >= ptr->size())
                     {
                         // index out of range
@@ -714,6 +633,14 @@ class json_pointer
                     break;
                 }
 
+                case detail::value_t::null:
+                case detail::value_t::string:
+                case detail::value_t::boolean:
+                case detail::value_t::number_integer:
+                case detail::value_t::number_unsigned:
+                case detail::value_t::number_float:
+                case detail::value_t::binary:
+                case detail::value_t::discarded:
                 default:
                 {
                     // we do not expect primitive values if there is still a
@@ -736,9 +663,9 @@ class json_pointer
     @throw parse_error.107  if the pointer is not empty or begins with '/'
     @throw parse_error.108  if character '~' is not followed by '0' or '1'
     */
-    static std::vector<std::string> split(const std::string& reference_string)
+    static std::vector<string_t> split(const string_t& reference_string)
     {
-        std::vector<std::string> result;
+        std::vector<string_t> result;
 
         // special case: empty reference string -> no reference tokens
         if (reference_string.empty())
@@ -749,7 +676,7 @@ class json_pointer
         // check if nonempty reference string begins with slash
         if (JSON_HEDLEY_UNLIKELY(reference_string[0] != '/'))
         {
-            JSON_THROW(detail::parse_error::create(107, 1, "JSON pointer must be empty or begin with '/' - was: '" + reference_string + "'", BasicJsonType()));
+            JSON_THROW(detail::parse_error::create(107, 1, detail::concat("JSON pointer must be empty or begin with '/' - was: '", reference_string, "'"), nullptr));
         }
 
         // extract the reference tokens:
@@ -760,11 +687,11 @@ class json_pointer
             std::size_t slash = reference_string.find_first_of('/', 1),
             // set the beginning of the first reference token
             start = 1;
-            // we can stop if start == 0 (if slash == std::string::npos)
+            // we can stop if start == 0 (if slash == string_t::npos)
             start != 0;
             // set the beginning of the next reference token
-            // (will eventually be 0 if slash == std::string::npos)
-            start = (slash == std::string::npos) ? 0 : slash + 1,
+            // (will eventually be 0 if slash == string_t::npos)
+            start = (slash == string_t::npos) ? 0 : slash + 1,
             // find next slash
             slash = reference_string.find_first_of('/', start))
         {
@@ -774,7 +701,7 @@ class json_pointer
 
             // check reference tokens are properly escaped
             for (std::size_t pos = reference_token.find_first_of('~');
-                    pos != std::string::npos;
+                    pos != string_t::npos;
                     pos = reference_token.find_first_of('~', pos + 1))
             {
                 JSON_ASSERT(reference_token[pos] == '~');
@@ -784,7 +711,7 @@ class json_pointer
                                          (reference_token[pos + 1] != '0' &&
                                           reference_token[pos + 1] != '1')))
                 {
-                    JSON_THROW(detail::parse_error::create(108, 0, "escape character '~' must be followed with '0' or '1'", BasicJsonType()));
+                    JSON_THROW(detail::parse_error::create(108, 0, "escape character '~' must be followed with '0' or '1'", nullptr));
                 }
             }
 
@@ -804,7 +731,8 @@ class json_pointer
 
     @note Empty objects or arrays are flattened to `null`.
     */
-    static void flatten(const std::string& reference_string,
+    template<typename BasicJsonType>
+    static void flatten(const string_t& reference_string,
                         const BasicJsonType& value,
                         BasicJsonType& result)
     {
@@ -812,7 +740,7 @@ class json_pointer
         {
             case detail::value_t::array:
             {
-                if (value.m_value.array->empty())
+                if (value.m_data.m_value.array->empty())
                 {
                     // flatten empty array as null
                     result[reference_string] = nullptr;
@@ -820,10 +748,10 @@ class json_pointer
                 else
                 {
                     // iterate array and use index as reference string
-                    for (std::size_t i = 0; i < value.m_value.array->size(); ++i)
+                    for (std::size_t i = 0; i < value.m_data.m_value.array->size(); ++i)
                     {
-                        flatten(reference_string + "/" + std::to_string(i),
-                                value.m_value.array->operator[](i), result);
+                        flatten(detail::concat(reference_string, '/', std::to_string(i)),
+                                value.m_data.m_value.array->operator[](i), result);
                     }
                 }
                 break;
@@ -831,7 +759,7 @@ class json_pointer
 
             case detail::value_t::object:
             {
-                if (value.m_value.object->empty())
+                if (value.m_data.m_value.object->empty())
                 {
                     // flatten empty object as null
                     result[reference_string] = nullptr;
@@ -839,14 +767,22 @@ class json_pointer
                 else
                 {
                     // iterate object and use keys as reference string
-                    for (const auto& element : *value.m_value.object)
+                    for (const auto& element : *value.m_data.m_value.object)
                     {
-                        flatten(reference_string + "/" + detail::escape(element.first), element.second, result);
+                        flatten(detail::concat(reference_string, '/', detail::escape(element.first)), element.second, result);
                     }
                 }
                 break;
             }
 
+            case detail::value_t::null:
+            case detail::value_t::string:
+            case detail::value_t::boolean:
+            case detail::value_t::number_integer:
+            case detail::value_t::number_unsigned:
+            case detail::value_t::number_float:
+            case detail::value_t::binary:
+            case detail::value_t::discarded:
             default:
             {
                 // add primitive value with its reference string
@@ -866,22 +802,23 @@ class json_pointer
     @throw type_error.315  if object values are not primitive
     @throw type_error.313  if value cannot be unflattened
     */
+    template<typename BasicJsonType>
     static BasicJsonType
     unflatten(const BasicJsonType& value)
     {
         if (JSON_HEDLEY_UNLIKELY(!value.is_object()))
         {
-            JSON_THROW(detail::type_error::create(314, "only objects can be unflattened", value));
+            JSON_THROW(detail::type_error::create(314, "only objects can be unflattened", &value));
         }
 
         BasicJsonType result;
 
         // iterate the JSON object values
-        for (const auto& element : *value.m_value.object)
+        for (const auto& element : *value.m_data.m_value.object)
         {
             if (JSON_HEDLEY_UNLIKELY(!element.second.is_primitive()))
             {
-                JSON_THROW(detail::type_error::create(315, "values in object must be primitive", element.second));
+                JSON_THROW(detail::type_error::create(315, "values in object must be primitive", &element.second));
             }
 
             // assign value to reference pointed to by JSON pointer; Note that if
@@ -894,41 +831,158 @@ class json_pointer
         return result;
     }
 
-    /*!
-    @brief compares two JSON pointers for equality
-
-    @param[in] lhs  JSON pointer to compare
-    @param[in] rhs  JSON pointer to compare
-    @return whether @a lhs is equal to @a rhs
-
-    @complexity Linear in the length of the JSON pointer
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-    */
-    friend bool operator==(json_pointer const& lhs,
-                           json_pointer const& rhs) noexcept
+    // can't use conversion operator because of ambiguity
+    json_pointer<string_t> convert() const&
     {
-        return lhs.reference_tokens == rhs.reference_tokens;
+        json_pointer<string_t> result;
+        result.reference_tokens = reference_tokens;
+        return result;
     }
 
-    /*!
-    @brief compares two JSON pointers for inequality
+    json_pointer<string_t> convert()&&
+    {
+        json_pointer<string_t> result;
+        result.reference_tokens = std::move(reference_tokens);
+        return result;
+    }
 
-    @param[in] lhs  JSON pointer to compare
-    @param[in] rhs  JSON pointer to compare
-    @return whether @a lhs is not equal @a rhs
+  public:
+#if JSON_HAS_THREE_WAY_COMPARISON
+    /// @brief compares two JSON pointers for equality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_eq/
+    template<typename RefStringTypeRhs>
+    bool operator==(const json_pointer<RefStringTypeRhs>& rhs) const noexcept
+    {
+        return reference_tokens == rhs.reference_tokens;
+    }
 
-    @complexity Linear in the length of the JSON pointer
+    /// @brief compares JSON pointer and string for equality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_eq/
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator==(json_pointer))
+    bool operator==(const string_t& rhs) const
+    {
+        return *this == json_pointer(rhs);
+    }
 
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-    */
-    friend bool operator!=(json_pointer const& lhs,
-                           json_pointer const& rhs) noexcept
+    /// @brief 3-way compares two JSON pointers
+    template<typename RefStringTypeRhs>
+    std::strong_ordering operator<=>(const json_pointer<RefStringTypeRhs>& rhs) const noexcept // *NOPAD*
     {
-        return !(lhs == rhs);
+        return  reference_tokens <=> rhs.reference_tokens; // *NOPAD*
     }
+#else
+    /// @brief compares two JSON pointers for equality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_eq/
+    template<typename RefStringTypeLhs, typename RefStringTypeRhs>
+    // NOLINTNEXTLINE(readability-redundant-declaration)
+    friend bool operator==(const json_pointer<RefStringTypeLhs>& lhs,
+                           const json_pointer<RefStringTypeRhs>& rhs) noexcept;
+
+    /// @brief compares JSON pointer and string for equality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_eq/
+    template<typename RefStringTypeLhs, typename StringType>
+    // NOLINTNEXTLINE(readability-redundant-declaration)
+    friend bool operator==(const json_pointer<RefStringTypeLhs>& lhs,
+                           const StringType& rhs);
+
+    /// @brief compares string and JSON pointer for equality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_eq/
+    template<typename RefStringTypeRhs, typename StringType>
+    // NOLINTNEXTLINE(readability-redundant-declaration)
+    friend bool operator==(const StringType& lhs,
+                           const json_pointer<RefStringTypeRhs>& rhs);
+
+    /// @brief compares two JSON pointers for inequality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_ne/
+    template<typename RefStringTypeLhs, typename RefStringTypeRhs>
+    // NOLINTNEXTLINE(readability-redundant-declaration)
+    friend bool operator!=(const json_pointer<RefStringTypeLhs>& lhs,
+                           const json_pointer<RefStringTypeRhs>& rhs) noexcept;
+
+    /// @brief compares JSON pointer and string for inequality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_ne/
+    template<typename RefStringTypeLhs, typename StringType>
+    // NOLINTNEXTLINE(readability-redundant-declaration)
+    friend bool operator!=(const json_pointer<RefStringTypeLhs>& lhs,
+                           const StringType& rhs);
+
+    /// @brief compares string and JSON pointer for inequality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_ne/
+    template<typename RefStringTypeRhs, typename StringType>
+    // NOLINTNEXTLINE(readability-redundant-declaration)
+    friend bool operator!=(const StringType& lhs,
+                           const json_pointer<RefStringTypeRhs>& rhs);
+
+    /// @brief compares two JSON pointer for less-than
+    template<typename RefStringTypeLhs, typename RefStringTypeRhs>
+    // NOLINTNEXTLINE(readability-redundant-declaration)
+    friend bool operator<(const json_pointer<RefStringTypeLhs>& lhs,
+                          const json_pointer<RefStringTypeRhs>& rhs) noexcept;
+#endif
 
+  private:
     /// the reference tokens
-    std::vector<std::string> reference_tokens;
+    std::vector<string_t> reference_tokens;
 };
-}  // namespace nlohmann
+
+#if !JSON_HAS_THREE_WAY_COMPARISON
+// functions cannot be defined inside class due to ODR violations
+template<typename RefStringTypeLhs, typename RefStringTypeRhs>
+inline bool operator==(const json_pointer<RefStringTypeLhs>& lhs,
+                       const json_pointer<RefStringTypeRhs>& rhs) noexcept
+{
+    return lhs.reference_tokens == rhs.reference_tokens;
+}
+
+template<typename RefStringTypeLhs,
+         typename StringType = typename json_pointer<RefStringTypeLhs>::string_t>
+JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator==(json_pointer, json_pointer))
+inline bool operator==(const json_pointer<RefStringTypeLhs>& lhs,
+                       const StringType& rhs)
+{
+    return lhs == json_pointer<RefStringTypeLhs>(rhs);
+}
+
+template<typename RefStringTypeRhs,
+         typename StringType = typename json_pointer<RefStringTypeRhs>::string_t>
+JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator==(json_pointer, json_pointer))
+inline bool operator==(const StringType& lhs,
+                       const json_pointer<RefStringTypeRhs>& rhs)
+{
+    return json_pointer<RefStringTypeRhs>(lhs) == rhs;
+}
+
+template<typename RefStringTypeLhs, typename RefStringTypeRhs>
+inline bool operator!=(const json_pointer<RefStringTypeLhs>& lhs,
+                       const json_pointer<RefStringTypeRhs>& rhs) noexcept
+{
+    return !(lhs == rhs);
+}
+
+template<typename RefStringTypeLhs,
+         typename StringType = typename json_pointer<RefStringTypeLhs>::string_t>
+JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator!=(json_pointer, json_pointer))
+inline bool operator!=(const json_pointer<RefStringTypeLhs>& lhs,
+                       const StringType& rhs)
+{
+    return !(lhs == rhs);
+}
+
+template<typename RefStringTypeRhs,
+         typename StringType = typename json_pointer<RefStringTypeRhs>::string_t>
+JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator!=(json_pointer, json_pointer))
+inline bool operator!=(const StringType& lhs,
+                       const json_pointer<RefStringTypeRhs>& rhs)
+{
+    return !(lhs == rhs);
+}
+
+template<typename RefStringTypeLhs, typename RefStringTypeRhs>
+inline bool operator<(const json_pointer<RefStringTypeLhs>& lhs,
+                      const json_pointer<RefStringTypeRhs>& rhs) noexcept
+{
+    return lhs.reference_tokens < rhs.reference_tokens;
+}
+#endif
+
+NLOHMANN_JSON_NAMESPACE_END
diff --git a/external_imported/json/include/nlohmann/detail/json_ref.hpp b/external_imported/json/include/nlohmann/detail/json_ref.hpp
index 26a490382..b8bb6a76b 100644
--- a/external_imported/json/include/nlohmann/detail/json_ref.hpp
+++ b/external_imported/json/include/nlohmann/detail/json_ref.hpp
@@ -1,14 +1,23 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 #pragma once
 
 #include <initializer_list>
 #include <utility>
 
+#include <nlohmann/detail/abi_macros.hpp>
 #include <nlohmann/detail/meta/type_traits.hpp>
 
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
+
 template<typename BasicJsonType>
 class json_ref
 {
@@ -35,7 +44,7 @@ class json_ref
     {}
 
     // class should be movable only
-    json_ref(json_ref&&) = default;
+    json_ref(json_ref&&) noexcept = default;
     json_ref(const json_ref&) = delete;
     json_ref& operator=(const json_ref&) = delete;
     json_ref& operator=(json_ref&&) = delete;
@@ -64,5 +73,6 @@ class json_ref
     mutable value_type owned_value = nullptr;
     value_type const* value_ref = nullptr;
 };
+
 }  // namespace detail
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
diff --git a/external_imported/json/include/nlohmann/detail/macro_scope.hpp b/external_imported/json/include/nlohmann/detail/macro_scope.hpp
index 77acf04c7..97127a646 100644
--- a/external_imported/json/include/nlohmann/detail/macro_scope.hpp
+++ b/external_imported/json/include/nlohmann/detail/macro_scope.hpp
@@ -1,11 +1,22 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 #pragma once
 
-#include <utility> // pair
+#include <utility> // declval, pair
+#include <nlohmann/detail/meta/detected.hpp>
 #include <nlohmann/thirdparty/hedley/hedley.hpp>
 
-// This file contains all internal macro definitions
+// This file contains all internal macro definitions (except those affecting ABI)
 // You MUST include macro_unscope.hpp at the end of json.hpp to undef all of them
 
+#include <nlohmann/detail/abi_macros.hpp>
+
 // exclude unsupported compilers
 #if !defined(JSON_SKIP_UNSUPPORTED_COMPILER_CHECK)
     #if defined(__clang__)
@@ -20,30 +31,136 @@
 #endif
 
 // C++ language standard detection
-#if (defined(__cplusplus) && __cplusplus >= 202002L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 202002L)
-    #define JSON_HAS_CPP_20
-    #define JSON_HAS_CPP_17
-    #define JSON_HAS_CPP_14
-#elif (defined(__cplusplus) && __cplusplus >= 201703L) || (defined(_HAS_CXX17) && _HAS_CXX17 == 1) // fix for issue #464
-    #define JSON_HAS_CPP_17
-    #define JSON_HAS_CPP_14
-#elif (defined(__cplusplus) && __cplusplus >= 201402L) || (defined(_HAS_CXX14) && _HAS_CXX14 == 1)
-    #define JSON_HAS_CPP_14
+// if the user manually specified the used c++ version this is skipped
+#if !defined(JSON_HAS_CPP_20) && !defined(JSON_HAS_CPP_17) && !defined(JSON_HAS_CPP_14) && !defined(JSON_HAS_CPP_11)
+    #if (defined(__cplusplus) && __cplusplus >= 202002L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 202002L)
+        #define JSON_HAS_CPP_20
+        #define JSON_HAS_CPP_17
+        #define JSON_HAS_CPP_14
+    #elif (defined(__cplusplus) && __cplusplus >= 201703L) || (defined(_HAS_CXX17) && _HAS_CXX17 == 1) // fix for issue #464
+        #define JSON_HAS_CPP_17
+        #define JSON_HAS_CPP_14
+    #elif (defined(__cplusplus) && __cplusplus >= 201402L) || (defined(_HAS_CXX14) && _HAS_CXX14 == 1)
+        #define JSON_HAS_CPP_14
+    #endif
+    // the cpp 11 flag is always specified because it is the minimal required version
+    #define JSON_HAS_CPP_11
+#endif
+
+#ifdef __has_include
+    #if __has_include(<version>)
+        #include <version>
+    #endif
+#endif
+
+#if !defined(JSON_HAS_FILESYSTEM) && !defined(JSON_HAS_EXPERIMENTAL_FILESYSTEM)
+    #ifdef JSON_HAS_CPP_17
+        #if defined(__cpp_lib_filesystem)
+            #define JSON_HAS_FILESYSTEM 1
+        #elif defined(__cpp_lib_experimental_filesystem)
+            #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1
+        #elif !defined(__has_include)
+            #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1
+        #elif __has_include(<filesystem>)
+            #define JSON_HAS_FILESYSTEM 1
+        #elif __has_include(<experimental/filesystem>)
+            #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1
+        #endif
+
+        // std::filesystem does not work on MinGW GCC 8: https://sourceforge.net/p/mingw-w64/bugs/737/
+        #if defined(__MINGW32__) && defined(__GNUC__) && __GNUC__ == 8
+            #undef JSON_HAS_FILESYSTEM
+            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+        #endif
+
+        // no filesystem support before GCC 8: https://en.cppreference.com/w/cpp/compiler_support
+        #if defined(__GNUC__) && !defined(__clang__) && __GNUC__ < 8
+            #undef JSON_HAS_FILESYSTEM
+            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+        #endif
+
+        // no filesystem support before Clang 7: https://en.cppreference.com/w/cpp/compiler_support
+        #if defined(__clang_major__) && __clang_major__ < 7
+            #undef JSON_HAS_FILESYSTEM
+            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+        #endif
+
+        // no filesystem support before MSVC 19.14: https://en.cppreference.com/w/cpp/compiler_support
+        #if defined(_MSC_VER) && _MSC_VER < 1914
+            #undef JSON_HAS_FILESYSTEM
+            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+        #endif
+
+        // no filesystem support before iOS 13
+        #if defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED < 130000
+            #undef JSON_HAS_FILESYSTEM
+            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+        #endif
+
+        // no filesystem support before macOS Catalina
+        #if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500
+            #undef JSON_HAS_FILESYSTEM
+            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+        #endif
+    #endif
+#endif
+
+#ifndef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+    #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 0
 #endif
 
-// disable float-equal warnings on GCC/clang
-#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
-    #pragma GCC diagnostic push
-    #pragma GCC diagnostic ignored "-Wfloat-equal"
+#ifndef JSON_HAS_FILESYSTEM
+    #define JSON_HAS_FILESYSTEM 0
+#endif
+
+#ifndef JSON_HAS_THREE_WAY_COMPARISON
+    #if defined(__cpp_impl_three_way_comparison) && __cpp_impl_three_way_comparison >= 201907L \
+        && defined(__cpp_lib_three_way_comparison) && __cpp_lib_three_way_comparison >= 201907L
+        #define JSON_HAS_THREE_WAY_COMPARISON 1
+    #else
+        #define JSON_HAS_THREE_WAY_COMPARISON 0
+    #endif
+#endif
+
+#ifndef JSON_HAS_RANGES
+    // ranges header shipping in GCC 11.1.0 (released 2021-04-27) has syntax error
+    #if defined(__GLIBCXX__) && __GLIBCXX__ == 20210427
+        #define JSON_HAS_RANGES 0
+    #elif defined(__cpp_lib_ranges)
+        #define JSON_HAS_RANGES 1
+    #else
+        #define JSON_HAS_RANGES 0
+    #endif
+#endif
+
+#ifndef JSON_HAS_STATIC_RTTI
+    #if !defined(_HAS_STATIC_RTTI) || _HAS_STATIC_RTTI != 0
+        #define JSON_HAS_STATIC_RTTI 1
+    #else
+        #define JSON_HAS_STATIC_RTTI 0
+    #endif
+#endif
+
+#ifdef JSON_HAS_CPP_17
+    #define JSON_INLINE_VARIABLE inline
+#else
+    #define JSON_INLINE_VARIABLE
+#endif
+
+#if JSON_HEDLEY_HAS_ATTRIBUTE(no_unique_address)
+    #define JSON_NO_UNIQUE_ADDRESS [[no_unique_address]]
+#else
+    #define JSON_NO_UNIQUE_ADDRESS
 #endif
 
 // disable documentation warnings on clang
 #if defined(__clang__)
-    #pragma GCC diagnostic push
-    #pragma GCC diagnostic ignored "-Wdocumentation"
+    #pragma clang diagnostic push
+    #pragma clang diagnostic ignored "-Wdocumentation"
+    #pragma clang diagnostic ignored "-Wdocumentation-unknown-command"
 #endif
 
-// allow to disable exceptions
+// allow disabling exceptions
 #if (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)) && !defined(JSON_NOEXCEPTION)
     #define JSON_THROW(exception) throw exception
     #define JSON_TRY try
@@ -77,7 +194,7 @@
     #define JSON_INTERNAL_CATCH JSON_INTERNAL_CATCH_USER
 #endif
 
-// allow to override assert
+// allow overriding assert
 #if !defined(JSON_ASSERT)
     #include <cassert> // assert
     #define JSON_ASSERT(x) assert(x)
@@ -131,12 +248,13 @@
              class NumberUnsignedType, class NumberFloatType,              \
              template<typename> class AllocatorType,                       \
              template<typename, typename = void> class JSONSerializer,     \
-             class BinaryType>
+             class BinaryType,                                             \
+             class CustomBaseClass>
 
 #define NLOHMANN_BASIC_JSON_TPL                                            \
     basic_json<ObjectType, ArrayType, StringType, BooleanType,             \
     NumberIntegerType, NumberUnsignedType, NumberFloatType,                \
-    AllocatorType, JSONSerializer, BinaryType>
+    AllocatorType, JSONSerializer, BinaryType, CustomBaseClass>
 
 // Macros to simplify conversion from/to types
 
@@ -273,6 +391,7 @@
 
 #define NLOHMANN_JSON_TO(v1) nlohmann_json_j[#v1] = nlohmann_json_t.v1;
 #define NLOHMANN_JSON_FROM(v1) nlohmann_json_j.at(#v1).get_to(nlohmann_json_t.v1);
+#define NLOHMANN_JSON_FROM_WITH_DEFAULT(v1) nlohmann_json_t.v1 = nlohmann_json_j.value(#v1, nlohmann_json_default_obj.v1);
 
 /*!
 @brief macro
@@ -283,6 +402,13 @@
     friend void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
     friend void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) }
 
+#define NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(Type, ...)  \
+    friend void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
+    friend void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { const Type nlohmann_json_default_obj{}; NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM_WITH_DEFAULT, __VA_ARGS__)) }
+
+#define NLOHMANN_DEFINE_TYPE_INTRUSIVE_ONLY_SERIALIZE(Type, ...)  \
+    friend void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) }
+
 /*!
 @brief macro
 @def NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE
@@ -292,6 +418,51 @@
     inline void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
     inline void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) }
 
+#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_ONLY_SERIALIZE(Type, ...)  \
+    inline void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) }
+
+#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(Type, ...)  \
+    inline void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
+    inline void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { const Type nlohmann_json_default_obj{}; NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM_WITH_DEFAULT, __VA_ARGS__)) }
+
+// inspired from https://stackoverflow.com/a/26745591
+// allows to call any std function as if (e.g. with begin):
+// using std::begin; begin(x);
+//
+// it allows using the detected idiom to retrieve the return type
+// of such an expression
+#define NLOHMANN_CAN_CALL_STD_FUNC_IMPL(std_name)                                 \
+    namespace detail {                                                            \
+    using std::std_name;                                                          \
+    \
+    template<typename... T>                                                       \
+    using result_of_##std_name = decltype(std_name(std::declval<T>()...));        \
+    }                                                                             \
+    \
+    namespace detail2 {                                                           \
+    struct std_name##_tag                                                         \
+    {                                                                             \
+    };                                                                            \
+    \
+    template<typename... T>                                                       \
+    std_name##_tag std_name(T&&...);                                              \
+    \
+    template<typename... T>                                                       \
+    using result_of_##std_name = decltype(std_name(std::declval<T>()...));        \
+    \
+    template<typename... T>                                                       \
+    struct would_call_std_##std_name                                              \
+    {                                                                             \
+        static constexpr auto const value = ::nlohmann::detail::                  \
+                                            is_detected_exact<std_name##_tag, result_of_##std_name, T...>::value; \
+    };                                                                            \
+    } /* namespace detail2 */ \
+    \
+    template<typename... T>                                                       \
+    struct would_call_std_##std_name : detail2::would_call_std_##std_name<T...>   \
+    {                                                                             \
+    }
+
 #ifndef JSON_USE_IMPLICIT_CONVERSIONS
     #define JSON_USE_IMPLICIT_CONVERSIONS 1
 #endif
@@ -301,3 +472,11 @@
 #else
     #define JSON_EXPLICIT explicit
 #endif
+
+#ifndef JSON_DISABLE_ENUM_SERIALIZATION
+    #define JSON_DISABLE_ENUM_SERIALIZATION 0
+#endif
+
+#ifndef JSON_USE_GLOBAL_UDLS
+    #define JSON_USE_GLOBAL_UDLS 1
+#endif
diff --git a/external_imported/json/include/nlohmann/detail/macro_unscope.hpp b/external_imported/json/include/nlohmann/detail/macro_unscope.hpp
index 5ac66f5af..c6620d1e2 100644
--- a/external_imported/json/include/nlohmann/detail/macro_unscope.hpp
+++ b/external_imported/json/include/nlohmann/detail/macro_unscope.hpp
@@ -1,24 +1,45 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 #pragma once
 
-// restore GCC/clang diagnostic settings
-#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
-    #pragma GCC diagnostic pop
-#endif
+// restore clang diagnostic settings
 #if defined(__clang__)
-    #pragma GCC diagnostic pop
+    #pragma clang diagnostic pop
 #endif
 
 // clean up
 #undef JSON_ASSERT
 #undef JSON_INTERNAL_CATCH
-#undef JSON_CATCH
 #undef JSON_THROW
-#undef JSON_TRY
 #undef JSON_PRIVATE_UNLESS_TESTED
-#undef JSON_HAS_CPP_14
-#undef JSON_HAS_CPP_17
 #undef NLOHMANN_BASIC_JSON_TPL_DECLARATION
 #undef NLOHMANN_BASIC_JSON_TPL
 #undef JSON_EXPLICIT
+#undef NLOHMANN_CAN_CALL_STD_FUNC_IMPL
+#undef JSON_INLINE_VARIABLE
+#undef JSON_NO_UNIQUE_ADDRESS
+#undef JSON_DISABLE_ENUM_SERIALIZATION
+#undef JSON_USE_GLOBAL_UDLS
+
+#ifndef JSON_TEST_KEEP_MACROS
+    #undef JSON_CATCH
+    #undef JSON_TRY
+    #undef JSON_HAS_CPP_11
+    #undef JSON_HAS_CPP_14
+    #undef JSON_HAS_CPP_17
+    #undef JSON_HAS_CPP_20
+    #undef JSON_HAS_FILESYSTEM
+    #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+    #undef JSON_HAS_THREE_WAY_COMPARISON
+    #undef JSON_HAS_RANGES
+    #undef JSON_HAS_STATIC_RTTI
+    #undef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+#endif
 
 #include <nlohmann/thirdparty/hedley/hedley_undef.hpp>
diff --git a/external_imported/json/include/nlohmann/detail/meta/call_std/begin.hpp b/external_imported/json/include/nlohmann/detail/meta/call_std/begin.hpp
new file mode 100644
index 000000000..364cc89d8
--- /dev/null
+++ b/external_imported/json/include/nlohmann/detail/meta/call_std/begin.hpp
@@ -0,0 +1,17 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#pragma once
+
+#include <nlohmann/detail/macro_scope.hpp>
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+
+NLOHMANN_CAN_CALL_STD_FUNC_IMPL(begin);
+
+NLOHMANN_JSON_NAMESPACE_END
diff --git a/external_imported/json/include/nlohmann/detail/meta/call_std/end.hpp b/external_imported/json/include/nlohmann/detail/meta/call_std/end.hpp
new file mode 100644
index 000000000..463f07061
--- /dev/null
+++ b/external_imported/json/include/nlohmann/detail/meta/call_std/end.hpp
@@ -0,0 +1,17 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#pragma once
+
+#include <nlohmann/detail/macro_scope.hpp>
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+
+NLOHMANN_CAN_CALL_STD_FUNC_IMPL(end);
+
+NLOHMANN_JSON_NAMESPACE_END
diff --git a/external_imported/json/include/nlohmann/detail/meta/cpp_future.hpp b/external_imported/json/include/nlohmann/detail/meta/cpp_future.hpp
index 4ba1a5571..412b5aa74 100644
--- a/external_imported/json/include/nlohmann/detail/meta/cpp_future.hpp
+++ b/external_imported/json/include/nlohmann/detail/meta/cpp_future.hpp
@@ -1,13 +1,22 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-FileCopyrightText: 2018 The Abseil Authors
+// SPDX-License-Identifier: MIT
+
 #pragma once
 
+#include <array> // array
 #include <cstddef> // size_t
 #include <type_traits> // conditional, enable_if, false_type, integral_constant, is_constructible, is_integral, is_same, remove_cv, remove_reference, true_type
 #include <utility> // index_sequence, make_index_sequence, index_sequence_for
 
 #include <nlohmann/detail/macro_scope.hpp>
 
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
 
@@ -28,36 +37,112 @@ using std::index_sequence_for;
 template<bool B, typename T = void>
 using enable_if_t = typename std::enable_if<B, T>::type;
 
-// source: https://stackoverflow.com/a/32223343
-template<std::size_t... Ints>
-struct index_sequence
+// The following code is taken from https://github.com/abseil/abseil-cpp/blob/10cb35e459f5ecca5b2ff107635da0bfa41011b4/absl/utility/utility.h
+// which is part of Google Abseil (https://github.com/abseil/abseil-cpp), licensed under the Apache License 2.0.
+
+//// START OF CODE FROM GOOGLE ABSEIL
+
+// integer_sequence
+//
+// Class template representing a compile-time integer sequence. An instantiation
+// of `integer_sequence<T, Ints...>` has a sequence of integers encoded in its
+// type through its template arguments (which is a common need when
+// working with C++11 variadic templates). `absl::integer_sequence` is designed
+// to be a drop-in replacement for C++14's `std::integer_sequence`.
+//
+// Example:
+//
+//   template< class T, T... Ints >
+//   void user_function(integer_sequence<T, Ints...>);
+//
+//   int main()
+//   {
+//     // user_function's `T` will be deduced to `int` and `Ints...`
+//     // will be deduced to `0, 1, 2, 3, 4`.
+//     user_function(make_integer_sequence<int, 5>());
+//   }
+template <typename T, T... Ints>
+struct integer_sequence
 {
-    using type = index_sequence;
-    using value_type = std::size_t;
+    using value_type = T;
     static constexpr std::size_t size() noexcept
     {
         return sizeof...(Ints);
     }
 };
 
-template<class Sequence1, class Sequence2>
-struct merge_and_renumber;
+// index_sequence
+//
+// A helper template for an `integer_sequence` of `size_t`,
+// `absl::index_sequence` is designed to be a drop-in replacement for C++14's
+// `std::index_sequence`.
+template <size_t... Ints>
+using index_sequence = integer_sequence<size_t, Ints...>;
 
-template<std::size_t... I1, std::size_t... I2>
-struct merge_and_renumber<index_sequence<I1...>, index_sequence<I2...>>
-        : index_sequence < I1..., (sizeof...(I1) + I2)... > {};
+namespace utility_internal
+{
 
-template<std::size_t N>
-struct make_index_sequence
-    : merge_and_renumber < typename make_index_sequence < N / 2 >::type,
-      typename make_index_sequence < N - N / 2 >::type > {};
+template <typename Seq, size_t SeqSize, size_t Rem>
+struct Extend;
+
+// Note that SeqSize == sizeof...(Ints). It's passed explicitly for efficiency.
+template <typename T, T... Ints, size_t SeqSize>
+struct Extend<integer_sequence<T, Ints...>, SeqSize, 0>
+{
+    using type = integer_sequence < T, Ints..., (Ints + SeqSize)... >;
+};
 
-template<> struct make_index_sequence<0> : index_sequence<> {};
-template<> struct make_index_sequence<1> : index_sequence<0> {};
+template <typename T, T... Ints, size_t SeqSize>
+struct Extend<integer_sequence<T, Ints...>, SeqSize, 1>
+{
+    using type = integer_sequence < T, Ints..., (Ints + SeqSize)..., 2 * SeqSize >;
+};
 
-template<typename... Ts>
+// Recursion helper for 'make_integer_sequence<T, N>'.
+// 'Gen<T, N>::type' is an alias for 'integer_sequence<T, 0, 1, ... N-1>'.
+template <typename T, size_t N>
+struct Gen
+{
+    using type =
+        typename Extend < typename Gen < T, N / 2 >::type, N / 2, N % 2 >::type;
+};
+
+template <typename T>
+struct Gen<T, 0>
+{
+    using type = integer_sequence<T>;
+};
+
+}  // namespace utility_internal
+
+// Compile-time sequences of integers
+
+// make_integer_sequence
+//
+// This template alias is equivalent to
+// `integer_sequence<int, 0, 1, ..., N-1>`, and is designed to be a drop-in
+// replacement for C++14's `std::make_integer_sequence`.
+template <typename T, T N>
+using make_integer_sequence = typename utility_internal::Gen<T, N>::type;
+
+// make_index_sequence
+//
+// This template alias is equivalent to `index_sequence<0, 1, ..., N-1>`,
+// and is designed to be a drop-in replacement for C++14's
+// `std::make_index_sequence`.
+template <size_t N>
+using make_index_sequence = make_integer_sequence<size_t, N>;
+
+// index_sequence_for
+//
+// Converts a typename pack into an index sequence of the same length, and
+// is designed to be a drop-in replacement for C++14's
+// `std::index_sequence_for()`
+template <typename... Ts>
 using index_sequence_for = make_index_sequence<sizeof...(Ts)>;
 
+//// END OF CODE FROM GOOGLE ABSEIL
+
 #endif
 
 // dispatch utility (taken from ranges-v3)
@@ -68,11 +153,19 @@ template<> struct priority_tag<0> {};
 template<typename T>
 struct static_const
 {
-    static constexpr T value{};
+    static JSON_INLINE_VARIABLE constexpr T value{};
 };
 
-template<typename T>
-constexpr T static_const<T>::value;
+#ifndef JSON_HAS_CPP_17
+    template<typename T>
+    constexpr T static_const<T>::value;
+#endif
+
+template<typename T, typename... Args>
+inline constexpr std::array<T, sizeof...(Args)> make_array(Args&& ... args)
+{
+    return std::array<T, sizeof...(Args)> {{static_cast<T>(std::forward<Args>(args))...}};
+}
 
 }  // namespace detail
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
diff --git a/external_imported/json/include/nlohmann/detail/meta/detected.hpp b/external_imported/json/include/nlohmann/detail/meta/detected.hpp
index 7b5a00353..1db9bf9ca 100644
--- a/external_imported/json/include/nlohmann/detail/meta/detected.hpp
+++ b/external_imported/json/include/nlohmann/detail/meta/detected.hpp
@@ -1,14 +1,22 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 #pragma once
 
 #include <type_traits>
 
 #include <nlohmann/detail/meta/void_t.hpp>
 
-// https://en.cppreference.com/w/cpp/experimental/is_detected
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
+
+// https://en.cppreference.com/w/cpp/experimental/is_detected
 struct nonesuch
 {
     nonesuch() = delete;
@@ -39,6 +47,9 @@ struct detector<Default, void_t<Op<Args...>>, Op, Args...>
 template<template<class...> class Op, class... Args>
 using is_detected = typename detector<nonesuch, void, Op, Args...>::value_t;
 
+template<template<class...> class Op, class... Args>
+struct is_detected_lazy : is_detected<Op, Args...> { };
+
 template<template<class...> class Op, class... Args>
 using detected_t = typename detector<nonesuch, void, Op, Args...>::type;
 
@@ -54,5 +65,6 @@ using is_detected_exact = std::is_same<Expected, detected_t<Op, Args...>>;
 template<class To, template<class...> class Op, class... Args>
 using is_detected_convertible =
     std::is_convertible<detected_t<Op, Args...>, To>;
+
 }  // namespace detail
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
diff --git a/external_imported/json/include/nlohmann/detail/meta/identity_tag.hpp b/external_imported/json/include/nlohmann/detail/meta/identity_tag.hpp
new file mode 100644
index 000000000..269deffb2
--- /dev/null
+++ b/external_imported/json/include/nlohmann/detail/meta/identity_tag.hpp
@@ -0,0 +1,21 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#pragma once
+
+#include <nlohmann/detail/abi_macros.hpp>
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+// dispatching helper struct
+template <class T> struct identity_tag {};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
diff --git a/external_imported/json/include/nlohmann/detail/meta/is_sax.hpp b/external_imported/json/include/nlohmann/detail/meta/is_sax.hpp
index e1e48a0ba..4e02bc148 100644
--- a/external_imported/json/include/nlohmann/detail/meta/is_sax.hpp
+++ b/external_imported/json/include/nlohmann/detail/meta/is_sax.hpp
@@ -1,16 +1,25 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 #pragma once
 
 #include <cstdint> // size_t
 #include <utility> // declval
 #include <string> // string
 
+#include <nlohmann/detail/abi_macros.hpp>
 #include <nlohmann/detail/meta/detected.hpp>
 #include <nlohmann/detail/meta/type_traits.hpp>
 
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
+
 template<typename T>
 using null_function_t = decltype(std::declval<T&>().null());
 
@@ -145,5 +154,6 @@ struct is_sax_static_asserts
         "Missing/invalid function: bool parse_error(std::size_t, const "
         "std::string&, const exception&)");
 };
+
 }  // namespace detail
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
diff --git a/external_imported/json/include/nlohmann/detail/meta/std_fs.hpp b/external_imported/json/include/nlohmann/detail/meta/std_fs.hpp
new file mode 100644
index 000000000..fd1803964
--- /dev/null
+++ b/external_imported/json/include/nlohmann/detail/meta/std_fs.hpp
@@ -0,0 +1,29 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#pragma once
+
+#include <nlohmann/detail/macro_scope.hpp>
+
+#if JSON_HAS_EXPERIMENTAL_FILESYSTEM
+#include <experimental/filesystem>
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+namespace std_fs = std::experimental::filesystem;
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+#elif JSON_HAS_FILESYSTEM
+#include <filesystem>
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+namespace std_fs = std::filesystem;
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+#endif
diff --git a/external_imported/json/include/nlohmann/detail/meta/type_traits.hpp b/external_imported/json/include/nlohmann/detail/meta/type_traits.hpp
index 1706cbdc6..e1b000dcc 100644
--- a/external_imported/json/include/nlohmann/detail/meta/type_traits.hpp
+++ b/external_imported/json/include/nlohmann/detail/meta/type_traits.hpp
@@ -1,18 +1,28 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 #pragma once
 
 #include <limits> // numeric_limits
 #include <type_traits> // false_type, is_constructible, is_integral, is_same, true_type
 #include <utility> // declval
 #include <tuple> // tuple
+#include <string> // char_traits
 
 #include <nlohmann/detail/iterators/iterator_traits.hpp>
 #include <nlohmann/detail/macro_scope.hpp>
+#include <nlohmann/detail/meta/call_std/begin.hpp>
+#include <nlohmann/detail/meta/call_std/end.hpp>
 #include <nlohmann/detail/meta/cpp_future.hpp>
 #include <nlohmann/detail/meta/detected.hpp>
 #include <nlohmann/json_fwd.hpp>
 
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 /*!
 @brief detail namespace with internal helper functions
 
@@ -23,6 +33,7 @@ implementations of some @ref basic_json methods, and meta-programming helpers.
 */
 namespace detail
 {
+
 /////////////
 // helpers //
 /////////////
@@ -41,6 +52,16 @@ template<typename> struct is_basic_json : std::false_type {};
 NLOHMANN_BASIC_JSON_TPL_DECLARATION
 struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {};
 
+// used by exceptions create() member functions
+// true_type for pointer to possibly cv-qualified basic_json or std::nullptr_t
+// false_type otherwise
+template<typename BasicJsonContext>
+struct is_basic_json_context :
+    std::integral_constant < bool,
+    is_basic_json<typename std::remove_cv<typename std::remove_pointer<BasicJsonContext>::type>::type>::value
+    || std::is_same<BasicJsonContext, std::nullptr_t>::value >
+{};
+
 //////////////////////
 // json_ref helpers //
 //////////////////////
@@ -79,9 +100,6 @@ using reference_t = typename T::reference;
 template<typename T>
 using iterator_category_t = typename T::iterator_category;
 
-template<typename T>
-using iterator_t = typename T::iterator;
-
 template<typename T, typename... Args>
 using to_json_function = decltype(T::to_json(std::declval<Args>()...));
 
@@ -106,8 +124,7 @@ struct is_getable
 };
 
 template<typename BasicJsonType, typename T>
-struct has_from_json < BasicJsonType, T,
-           enable_if_t < !is_basic_json<T>::value >>
+struct has_from_json < BasicJsonType, T, enable_if_t < !is_basic_json<T>::value >>
 {
     using serializer = typename BasicJsonType::template json_serializer<T, void>;
 
@@ -146,11 +163,133 @@ struct has_to_json < BasicJsonType, T, enable_if_t < !is_basic_json<T>::value >>
         T>::value;
 };
 
+template<typename T>
+using detect_key_compare = typename T::key_compare;
+
+template<typename T>
+struct has_key_compare : std::integral_constant<bool, is_detected<detect_key_compare, T>::value> {};
+
+// obtains the actual object key comparator
+template<typename BasicJsonType>
+struct actual_object_comparator
+{
+    using object_t = typename BasicJsonType::object_t;
+    using object_comparator_t = typename BasicJsonType::default_object_comparator_t;
+    using type = typename std::conditional < has_key_compare<object_t>::value,
+          typename object_t::key_compare, object_comparator_t>::type;
+};
+
+template<typename BasicJsonType>
+using actual_object_comparator_t = typename actual_object_comparator<BasicJsonType>::type;
+
+/////////////////
+// char_traits //
+/////////////////
+
+// Primary template of char_traits calls std char_traits
+template<typename T>
+struct char_traits : std::char_traits<T>
+{};
+
+// Explicitly define char traits for unsigned char since it is not standard
+template<>
+struct char_traits<unsigned char> : std::char_traits<char>
+{
+    using char_type = unsigned char;
+    using int_type = uint64_t;
+
+    // Redefine to_int_type function
+    static int_type to_int_type(char_type c) noexcept
+    {
+        return static_cast<int_type>(c);
+    }
+
+    static char_type to_char_type(int_type i) noexcept
+    {
+        return static_cast<char_type>(i);
+    }
+
+    static constexpr int_type eof() noexcept
+    {
+        return static_cast<int_type>(EOF);
+    }
+};
+
+// Explicitly define char traits for signed char since it is not standard
+template<>
+struct char_traits<signed char> : std::char_traits<char>
+{
+    using char_type = signed char;
+    using int_type = uint64_t;
+
+    // Redefine to_int_type function
+    static int_type to_int_type(char_type c) noexcept
+    {
+        return static_cast<int_type>(c);
+    }
+
+    static char_type to_char_type(int_type i) noexcept
+    {
+        return static_cast<char_type>(i);
+    }
+
+    static constexpr int_type eof() noexcept
+    {
+        return static_cast<int_type>(EOF);
+    }
+};
 
 ///////////////////
 // is_ functions //
 ///////////////////
 
+// https://en.cppreference.com/w/cpp/types/conjunction
+template<class...> struct conjunction : std::true_type { };
+template<class B> struct conjunction<B> : B { };
+template<class B, class... Bn>
+struct conjunction<B, Bn...>
+: std::conditional<static_cast<bool>(B::value), conjunction<Bn...>, B>::type {};
+
+// https://en.cppreference.com/w/cpp/types/negation
+template<class B> struct negation : std::integral_constant < bool, !B::value > { };
+
+// Reimplementation of is_constructible and is_default_constructible, due to them being broken for
+// std::pair and std::tuple until LWG 2367 fix (see https://cplusplus.github.io/LWG/lwg-defects.html#2367).
+// This causes compile errors in e.g. clang 3.5 or gcc 4.9.
+template <typename T>
+struct is_default_constructible : std::is_default_constructible<T> {};
+
+template <typename T1, typename T2>
+struct is_default_constructible<std::pair<T1, T2>>
+            : conjunction<is_default_constructible<T1>, is_default_constructible<T2>> {};
+
+template <typename T1, typename T2>
+struct is_default_constructible<const std::pair<T1, T2>>
+            : conjunction<is_default_constructible<T1>, is_default_constructible<T2>> {};
+
+template <typename... Ts>
+struct is_default_constructible<std::tuple<Ts...>>
+            : conjunction<is_default_constructible<Ts>...> {};
+
+template <typename... Ts>
+struct is_default_constructible<const std::tuple<Ts...>>
+            : conjunction<is_default_constructible<Ts>...> {};
+
+template <typename T, typename... Args>
+struct is_constructible : std::is_constructible<T, Args...> {};
+
+template <typename T1, typename T2>
+struct is_constructible<std::pair<T1, T2>> : is_default_constructible<std::pair<T1, T2>> {};
+
+template <typename T1, typename T2>
+struct is_constructible<const std::pair<T1, T2>> : is_default_constructible<const std::pair<T1, T2>> {};
+
+template <typename... Ts>
+struct is_constructible<std::tuple<Ts...>> : is_default_constructible<std::tuple<Ts...>> {};
+
+template <typename... Ts>
+struct is_constructible<const std::tuple<Ts...>> : is_default_constructible<const std::tuple<Ts...>> {};
+
 template<typename T, typename = void>
 struct is_iterator_traits : std::false_type {};
 
@@ -169,6 +308,31 @@ struct is_iterator_traits<iterator_traits<T>>
         is_detected<reference_t, traits>::value;
 };
 
+template<typename T>
+struct is_range
+{
+  private:
+    using t_ref = typename std::add_lvalue_reference<T>::type;
+
+    using iterator = detected_t<result_of_begin, t_ref>;
+    using sentinel = detected_t<result_of_end, t_ref>;
+
+    // to be 100% correct, it should use https://en.cppreference.com/w/cpp/iterator/input_or_output_iterator
+    // and https://en.cppreference.com/w/cpp/iterator/sentinel_for
+    // but reimplementing these would be too much work, as a lot of other concepts are used underneath
+    static constexpr auto is_iterator_begin =
+        is_iterator_traits<iterator_traits<iterator>>::value;
+
+  public:
+    static constexpr bool value = !std::is_same<iterator, nonesuch>::value && !std::is_same<sentinel, nonesuch>::value && is_iterator_begin;
+};
+
+template<typename R>
+using iterator_t = enable_if_t<is_range<R>::value, result_of_begin<decltype(std::declval<R&>())>>;
+
+template<typename T>
+using range_value_t = value_type_t<iterator_traits<iterator_t<T>>>;
+
 // The following implementation of is_complete_type is taken from
 // https://blogs.msdn.microsoft.com/vcblog/2015/12/02/partial-support-for-expression-sfinae-in-vs-2015-update-1/
 // and is written by Xiang Fan who agreed to using it in this library.
@@ -193,9 +357,9 @@ struct is_compatible_object_type_impl <
 
     // macOS's is_constructible does not play well with nonesuch...
     static constexpr bool value =
-        std::is_constructible<typename object_t::key_type,
+        is_constructible<typename object_t::key_type,
         typename CompatibleObjectType::key_type>::value &&
-        std::is_constructible<typename object_t::mapped_type,
+        is_constructible<typename object_t::mapped_type,
         typename CompatibleObjectType::mapped_type>::value;
 };
 
@@ -216,10 +380,10 @@ struct is_constructible_object_type_impl <
     using object_t = typename BasicJsonType::object_t;
 
     static constexpr bool value =
-        (std::is_default_constructible<ConstructibleObjectType>::value &&
+        (is_default_constructible<ConstructibleObjectType>::value &&
          (std::is_move_assignable<ConstructibleObjectType>::value ||
           std::is_copy_assignable<ConstructibleObjectType>::value) &&
-         (std::is_constructible<typename ConstructibleObjectType::key_type,
+         (is_constructible<typename ConstructibleObjectType::key_type,
           typename object_t::key_type>::value &&
           std::is_same <
           typename object_t::mapped_type,
@@ -236,60 +400,46 @@ struct is_constructible_object_type
     : is_constructible_object_type_impl<BasicJsonType,
       ConstructibleObjectType> {};
 
-template<typename BasicJsonType, typename CompatibleStringType,
-         typename = void>
-struct is_compatible_string_type_impl : std::false_type {};
-
 template<typename BasicJsonType, typename CompatibleStringType>
-struct is_compatible_string_type_impl <
-    BasicJsonType, CompatibleStringType,
-    enable_if_t<is_detected_exact<typename BasicJsonType::string_t::value_type,
-    value_type_t, CompatibleStringType>::value >>
+struct is_compatible_string_type
 {
     static constexpr auto value =
-        std::is_constructible<typename BasicJsonType::string_t, CompatibleStringType>::value;
+        is_constructible<typename BasicJsonType::string_t, CompatibleStringType>::value;
 };
 
 template<typename BasicJsonType, typename ConstructibleStringType>
-struct is_compatible_string_type
-    : is_compatible_string_type_impl<BasicJsonType, ConstructibleStringType> {};
-
-template<typename BasicJsonType, typename ConstructibleStringType,
-         typename = void>
-struct is_constructible_string_type_impl : std::false_type {};
-
-template<typename BasicJsonType, typename ConstructibleStringType>
-struct is_constructible_string_type_impl <
-    BasicJsonType, ConstructibleStringType,
-    enable_if_t<is_detected_exact<typename BasicJsonType::string_t::value_type,
-    value_type_t, ConstructibleStringType>::value >>
+struct is_constructible_string_type
 {
+    // launder type through decltype() to fix compilation failure on ICPC
+#ifdef __INTEL_COMPILER
+    using laundered_type = decltype(std::declval<ConstructibleStringType>());
+#else
+    using laundered_type = ConstructibleStringType;
+#endif
+
     static constexpr auto value =
-        std::is_constructible<ConstructibleStringType,
-        typename BasicJsonType::string_t>::value;
+        conjunction <
+        is_constructible<laundered_type, typename BasicJsonType::string_t>,
+        is_detected_exact<typename BasicJsonType::string_t::value_type,
+        value_type_t, laundered_type >>::value;
 };
 
-template<typename BasicJsonType, typename ConstructibleStringType>
-struct is_constructible_string_type
-    : is_constructible_string_type_impl<BasicJsonType, ConstructibleStringType> {};
-
 template<typename BasicJsonType, typename CompatibleArrayType, typename = void>
 struct is_compatible_array_type_impl : std::false_type {};
 
 template<typename BasicJsonType, typename CompatibleArrayType>
 struct is_compatible_array_type_impl <
     BasicJsonType, CompatibleArrayType,
-    enable_if_t < is_detected<value_type_t, CompatibleArrayType>::value&&
+    enable_if_t <
     is_detected<iterator_t, CompatibleArrayType>::value&&
-// This is needed because json_reverse_iterator has a ::iterator type...
-// Therefore it is detected as a CompatibleArrayType.
-// The real fix would be to have an Iterable concept.
-    !is_iterator_traits <
-    iterator_traits<CompatibleArrayType >>::value >>
+    is_iterator_traits<iterator_traits<detected_t<iterator_t, CompatibleArrayType>>>::value&&
+// special case for types like std::filesystem::path whose iterator's value_type are themselves
+// c.f. https://github.com/nlohmann/json/pull/3073
+    !std::is_same<CompatibleArrayType, detected_t<range_value_t, CompatibleArrayType>>::value >>
 {
     static constexpr bool value =
-        std::is_constructible<BasicJsonType,
-        typename CompatibleArrayType::value_type>::value;
+        is_constructible<BasicJsonType,
+        range_value_t<CompatibleArrayType>>::value;
 };
 
 template<typename BasicJsonType, typename CompatibleArrayType>
@@ -311,28 +461,29 @@ struct is_constructible_array_type_impl <
     BasicJsonType, ConstructibleArrayType,
     enable_if_t < !std::is_same<ConstructibleArrayType,
     typename BasicJsonType::value_type>::value&&
-    std::is_default_constructible<ConstructibleArrayType>::value&&
+    !is_compatible_string_type<BasicJsonType, ConstructibleArrayType>::value&&
+    is_default_constructible<ConstructibleArrayType>::value&&
 (std::is_move_assignable<ConstructibleArrayType>::value ||
  std::is_copy_assignable<ConstructibleArrayType>::value)&&
-is_detected<value_type_t, ConstructibleArrayType>::value&&
 is_detected<iterator_t, ConstructibleArrayType>::value&&
-is_complete_type <
-detected_t<value_type_t, ConstructibleArrayType >>::value >>
+is_iterator_traits<iterator_traits<detected_t<iterator_t, ConstructibleArrayType>>>::value&&
+is_detected<range_value_t, ConstructibleArrayType>::value&&
+// special case for types like std::filesystem::path whose iterator's value_type are themselves
+// c.f. https://github.com/nlohmann/json/pull/3073
+!std::is_same<ConstructibleArrayType, detected_t<range_value_t, ConstructibleArrayType>>::value&&
+        is_complete_type <
+        detected_t<range_value_t, ConstructibleArrayType >>::value >>
 {
+    using value_type = range_value_t<ConstructibleArrayType>;
+
     static constexpr bool value =
-        // This is needed because json_reverse_iterator has a ::iterator type,
-        // furthermore, std::back_insert_iterator (and other iterators) have a
-        // base class `iterator`... Therefore it is detected as a
-        // ConstructibleArrayType. The real fix would be to have an Iterable
-        // concept.
-        !is_iterator_traits<iterator_traits<ConstructibleArrayType>>::value &&
-
-        (std::is_same<typename ConstructibleArrayType::value_type,
-         typename BasicJsonType::array_t::value_type>::value ||
-         has_from_json<BasicJsonType,
-         typename ConstructibleArrayType::value_type>::value ||
-         has_non_default_from_json <
-         BasicJsonType, typename ConstructibleArrayType::value_type >::value);
+        std::is_same<value_type,
+        typename BasicJsonType::array_t::value_type>::value ||
+        has_from_json<BasicJsonType,
+        value_type>::value ||
+        has_non_default_from_json <
+        BasicJsonType,
+        value_type >::value;
 };
 
 template<typename BasicJsonType, typename ConstructibleArrayType>
@@ -355,7 +506,7 @@ struct is_compatible_integer_type_impl <
     using CompatibleLimits = std::numeric_limits<CompatibleNumberIntegerType>;
 
     static constexpr auto value =
-        std::is_constructible<RealIntegerType,
+        is_constructible<RealIntegerType,
         CompatibleNumberIntegerType>::value &&
         CompatibleLimits::is_integer &&
         RealLimits::is_signed == CompatibleLimits::is_signed;
@@ -382,17 +533,263 @@ template<typename BasicJsonType, typename CompatibleType>
 struct is_compatible_type
     : is_compatible_type_impl<BasicJsonType, CompatibleType> {};
 
-// https://en.cppreference.com/w/cpp/types/conjunction
-template<class...> struct conjunction : std::true_type { };
-template<class B1> struct conjunction<B1> : B1 { };
-template<class B1, class... Bn>
-struct conjunction<B1, Bn...>
-: std::conditional<bool(B1::value), conjunction<Bn...>, B1>::type {};
-
 template<typename T1, typename T2>
 struct is_constructible_tuple : std::false_type {};
 
 template<typename T1, typename... Args>
-struct is_constructible_tuple<T1, std::tuple<Args...>> : conjunction<std::is_constructible<T1, Args>...> {};
+struct is_constructible_tuple<T1, std::tuple<Args...>> : conjunction<is_constructible<T1, Args>...> {};
+
+template<typename BasicJsonType, typename T>
+struct is_json_iterator_of : std::false_type {};
+
+template<typename BasicJsonType>
+struct is_json_iterator_of<BasicJsonType, typename BasicJsonType::iterator> : std::true_type {};
+
+template<typename BasicJsonType>
+struct is_json_iterator_of<BasicJsonType, typename BasicJsonType::const_iterator> : std::true_type
+{};
+
+// checks if a given type T is a template specialization of Primary
+template<template <typename...> class Primary, typename T>
+struct is_specialization_of : std::false_type {};
+
+template<template <typename...> class Primary, typename... Args>
+struct is_specialization_of<Primary, Primary<Args...>> : std::true_type {};
+
+template<typename T>
+using is_json_pointer = is_specialization_of<::nlohmann::json_pointer, uncvref_t<T>>;
+
+// checks if A and B are comparable using Compare functor
+template<typename Compare, typename A, typename B, typename = void>
+struct is_comparable : std::false_type {};
+
+template<typename Compare, typename A, typename B>
+struct is_comparable<Compare, A, B, void_t<
+decltype(std::declval<Compare>()(std::declval<A>(), std::declval<B>())),
+decltype(std::declval<Compare>()(std::declval<B>(), std::declval<A>()))
+>> : std::true_type {};
+
+template<typename T>
+using detect_is_transparent = typename T::is_transparent;
+
+// type trait to check if KeyType can be used as object key (without a BasicJsonType)
+// see is_usable_as_basic_json_key_type below
+template<typename Comparator, typename ObjectKeyType, typename KeyTypeCVRef, bool RequireTransparentComparator = true,
+         bool ExcludeObjectKeyType = RequireTransparentComparator, typename KeyType = uncvref_t<KeyTypeCVRef>>
+using is_usable_as_key_type = typename std::conditional <
+                              is_comparable<Comparator, ObjectKeyType, KeyTypeCVRef>::value
+                              && !(ExcludeObjectKeyType && std::is_same<KeyType,
+                                   ObjectKeyType>::value)
+                              && (!RequireTransparentComparator
+                                  || is_detected <detect_is_transparent, Comparator>::value)
+                              && !is_json_pointer<KeyType>::value,
+                              std::true_type,
+                              std::false_type >::type;
+
+// type trait to check if KeyType can be used as object key
+// true if:
+//   - KeyType is comparable with BasicJsonType::object_t::key_type
+//   - if ExcludeObjectKeyType is true, KeyType is not BasicJsonType::object_t::key_type
+//   - the comparator is transparent or RequireTransparentComparator is false
+//   - KeyType is not a JSON iterator or json_pointer
+template<typename BasicJsonType, typename KeyTypeCVRef, bool RequireTransparentComparator = true,
+         bool ExcludeObjectKeyType = RequireTransparentComparator, typename KeyType = uncvref_t<KeyTypeCVRef>>
+using is_usable_as_basic_json_key_type = typename std::conditional <
+        is_usable_as_key_type<typename BasicJsonType::object_comparator_t,
+        typename BasicJsonType::object_t::key_type, KeyTypeCVRef,
+        RequireTransparentComparator, ExcludeObjectKeyType>::value
+        && !is_json_iterator_of<BasicJsonType, KeyType>::value,
+        std::true_type,
+        std::false_type >::type;
+
+template<typename ObjectType, typename KeyType>
+using detect_erase_with_key_type = decltype(std::declval<ObjectType&>().erase(std::declval<KeyType>()));
+
+// type trait to check if object_t has an erase() member functions accepting KeyType
+template<typename BasicJsonType, typename KeyType>
+using has_erase_with_key_type = typename std::conditional <
+                                is_detected <
+                                detect_erase_with_key_type,
+                                typename BasicJsonType::object_t, KeyType >::value,
+                                std::true_type,
+                                std::false_type >::type;
+
+// a naive helper to check if a type is an ordered_map (exploits the fact that
+// ordered_map inherits capacity() from std::vector)
+template <typename T>
+struct is_ordered_map
+{
+    using one = char;
+
+    struct two
+    {
+        char x[2]; // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+    };
+
+    template <typename C> static one test( decltype(&C::capacity) ) ;
+    template <typename C> static two test(...);
+
+    enum { value = sizeof(test<T>(nullptr)) == sizeof(char) }; // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+};
+
+// to avoid useless casts (see https://github.com/nlohmann/json/issues/2893#issuecomment-889152324)
+template < typename T, typename U, enable_if_t < !std::is_same<T, U>::value, int > = 0 >
+T conditional_static_cast(U value)
+{
+    return static_cast<T>(value);
+}
+
+template<typename T, typename U, enable_if_t<std::is_same<T, U>::value, int> = 0>
+T conditional_static_cast(U value)
+{
+    return value;
+}
+
+template<typename... Types>
+using all_integral = conjunction<std::is_integral<Types>...>;
+
+template<typename... Types>
+using all_signed = conjunction<std::is_signed<Types>...>;
+
+template<typename... Types>
+using all_unsigned = conjunction<std::is_unsigned<Types>...>;
+
+// there's a disjunction trait in another PR; replace when merged
+template<typename... Types>
+using same_sign = std::integral_constant < bool,
+      all_signed<Types...>::value || all_unsigned<Types...>::value >;
+
+template<typename OfType, typename T>
+using never_out_of_range = std::integral_constant < bool,
+      (std::is_signed<OfType>::value && (sizeof(T) < sizeof(OfType)))
+      || (same_sign<OfType, T>::value && sizeof(OfType) == sizeof(T)) >;
+
+template<typename OfType, typename T,
+         bool OfTypeSigned = std::is_signed<OfType>::value,
+         bool TSigned = std::is_signed<T>::value>
+struct value_in_range_of_impl2;
+
+template<typename OfType, typename T>
+struct value_in_range_of_impl2<OfType, T, false, false>
+{
+    static constexpr bool test(T val)
+    {
+        using CommonType = typename std::common_type<OfType, T>::type;
+        return static_cast<CommonType>(val) <= static_cast<CommonType>((std::numeric_limits<OfType>::max)());
+    }
+};
+
+template<typename OfType, typename T>
+struct value_in_range_of_impl2<OfType, T, true, false>
+{
+    static constexpr bool test(T val)
+    {
+        using CommonType = typename std::common_type<OfType, T>::type;
+        return static_cast<CommonType>(val) <= static_cast<CommonType>((std::numeric_limits<OfType>::max)());
+    }
+};
+
+template<typename OfType, typename T>
+struct value_in_range_of_impl2<OfType, T, false, true>
+{
+    static constexpr bool test(T val)
+    {
+        using CommonType = typename std::common_type<OfType, T>::type;
+        return val >= 0 && static_cast<CommonType>(val) <= static_cast<CommonType>((std::numeric_limits<OfType>::max)());
+    }
+};
+
+template<typename OfType, typename T>
+struct value_in_range_of_impl2<OfType, T, true, true>
+{
+    static constexpr bool test(T val)
+    {
+        using CommonType = typename std::common_type<OfType, T>::type;
+        return static_cast<CommonType>(val) >= static_cast<CommonType>((std::numeric_limits<OfType>::min)())
+               && static_cast<CommonType>(val) <= static_cast<CommonType>((std::numeric_limits<OfType>::max)());
+    }
+};
+
+template<typename OfType, typename T,
+         bool NeverOutOfRange = never_out_of_range<OfType, T>::value,
+         typename = detail::enable_if_t<all_integral<OfType, T>::value>>
+struct value_in_range_of_impl1;
+
+template<typename OfType, typename T>
+struct value_in_range_of_impl1<OfType, T, false>
+{
+    static constexpr bool test(T val)
+    {
+        return value_in_range_of_impl2<OfType, T>::test(val);
+    }
+};
+
+template<typename OfType, typename T>
+struct value_in_range_of_impl1<OfType, T, true>
+{
+    static constexpr bool test(T /*val*/)
+    {
+        return true;
+    }
+};
+
+template<typename OfType, typename T>
+inline constexpr bool value_in_range_of(T val)
+{
+    return value_in_range_of_impl1<OfType, T>::test(val);
+}
+
+template<bool Value>
+using bool_constant = std::integral_constant<bool, Value>;
+
+///////////////////////////////////////////////////////////////////////////////
+// is_c_string
+///////////////////////////////////////////////////////////////////////////////
+
+namespace impl
+{
+
+template<typename T>
+inline constexpr bool is_c_string()
+{
+    using TUnExt = typename std::remove_extent<T>::type;
+    using TUnCVExt = typename std::remove_cv<TUnExt>::type;
+    using TUnPtr = typename std::remove_pointer<T>::type;
+    using TUnCVPtr = typename std::remove_cv<TUnPtr>::type;
+    return
+        (std::is_array<T>::value && std::is_same<TUnCVExt, char>::value)
+        || (std::is_pointer<T>::value && std::is_same<TUnCVPtr, char>::value);
+}
+
+}  // namespace impl
+
+// checks whether T is a [cv] char */[cv] char[] C string
+template<typename T>
+struct is_c_string : bool_constant<impl::is_c_string<T>()> {};
+
+template<typename T>
+using is_c_string_uncvref = is_c_string<uncvref_t<T>>;
+
+///////////////////////////////////////////////////////////////////////////////
+// is_transparent
+///////////////////////////////////////////////////////////////////////////////
+
+namespace impl
+{
+
+template<typename T>
+inline constexpr bool is_transparent()
+{
+    return is_detected<detect_is_transparent, T>::value;
+}
+
+}  // namespace impl
+
+// checks whether T has a member named is_transparent
+template<typename T>
+struct is_transparent : bool_constant<impl::is_transparent<T>()> {};
+
+///////////////////////////////////////////////////////////////////////////////
+
 }  // namespace detail
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
diff --git a/external_imported/json/include/nlohmann/detail/meta/void_t.hpp b/external_imported/json/include/nlohmann/detail/meta/void_t.hpp
index 4ee2c86f0..99615c7c5 100644
--- a/external_imported/json/include/nlohmann/detail/meta/void_t.hpp
+++ b/external_imported/json/include/nlohmann/detail/meta/void_t.hpp
@@ -1,13 +1,24 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 #pragma once
 
-namespace nlohmann
-{
+#include <nlohmann/detail/abi_macros.hpp>
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
+
 template<typename ...Ts> struct make_void
 {
     using type = void;
 };
 template<typename ...Ts> using void_t = typename make_void<Ts...>::type;
-} // namespace detail
-}  // namespace nlohmann
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
diff --git a/external_imported/json/include/nlohmann/detail/output/binary_writer.hpp b/external_imported/json/include/nlohmann/detail/output/binary_writer.hpp
index 27215f193..f475d57be 100644
--- a/external_imported/json/include/nlohmann/detail/output/binary_writer.hpp
+++ b/external_imported/json/include/nlohmann/detail/output/binary_writer.hpp
@@ -1,21 +1,33 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 #pragma once
 
 #include <algorithm> // reverse
 #include <array> // array
+#include <map> // map
+#include <cmath> // isnan, isinf
 #include <cstdint> // uint8_t, uint16_t, uint32_t, uint64_t
 #include <cstring> // memcpy
 #include <limits> // numeric_limits
 #include <string> // string
-#include <cmath> // isnan, isinf
+#include <utility> // move
+#include <vector> // vector
 
 #include <nlohmann/detail/input/binary_reader.hpp>
 #include <nlohmann/detail/macro_scope.hpp>
 #include <nlohmann/detail/output/output_adapters.hpp>
+#include <nlohmann/detail/string_concat.hpp>
 
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
+
 ///////////////////
 // binary writer //
 ///////////////////
@@ -36,7 +48,7 @@ class binary_writer
 
     @param[in] adapter  output adapter to write to
     */
-    explicit binary_writer(output_adapter_t<CharType> adapter) : oa(adapter)
+    explicit binary_writer(output_adapter_t<CharType> adapter) : oa(std::move(adapter))
     {
         JSON_ASSERT(oa);
     }
@@ -51,13 +63,22 @@ class binary_writer
         {
             case value_t::object:
             {
-                write_bson_object(*j.m_value.object);
+                write_bson_object(*j.m_data.m_value.object);
                 break;
             }
 
+            case value_t::null:
+            case value_t::array:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
             default:
             {
-                JSON_THROW(type_error::create(317, "to serialize to BSON, top-level type must be object, but is " + std::string(j.type_name()), j));;
+                JSON_THROW(type_error::create(317, concat("to serialize to BSON, top-level type must be object, but is ", j.type_name()), &j));
             }
         }
     }
@@ -77,7 +98,7 @@ class binary_writer
 
             case value_t::boolean:
             {
-                oa->write_character(j.m_value.boolean
+                oa->write_character(j.m_data.m_value.boolean
                                     ? to_char_type(0xF5)
                                     : to_char_type(0xF4));
                 break;
@@ -85,42 +106,42 @@ class binary_writer
 
             case value_t::number_integer:
             {
-                if (j.m_value.number_integer >= 0)
+                if (j.m_data.m_value.number_integer >= 0)
                 {
                     // CBOR does not differentiate between positive signed
                     // integers and unsigned integers. Therefore, we used the
                     // code from the value_t::number_unsigned case here.
-                    if (j.m_value.number_integer <= 0x17)
+                    if (j.m_data.m_value.number_integer <= 0x17)
                     {
-                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                        write_number(static_cast<std::uint8_t>(j.m_data.m_value.number_integer));
                     }
-                    else if (j.m_value.number_integer <= (std::numeric_limits<std::uint8_t>::max)())
+                    else if (j.m_data.m_value.number_integer <= (std::numeric_limits<std::uint8_t>::max)())
                     {
                         oa->write_character(to_char_type(0x18));
-                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                        write_number(static_cast<std::uint8_t>(j.m_data.m_value.number_integer));
                     }
-                    else if (j.m_value.number_integer <= (std::numeric_limits<std::uint16_t>::max)())
+                    else if (j.m_data.m_value.number_integer <= (std::numeric_limits<std::uint16_t>::max)())
                     {
                         oa->write_character(to_char_type(0x19));
-                        write_number(static_cast<std::uint16_t>(j.m_value.number_integer));
+                        write_number(static_cast<std::uint16_t>(j.m_data.m_value.number_integer));
                     }
-                    else if (j.m_value.number_integer <= (std::numeric_limits<std::uint32_t>::max)())
+                    else if (j.m_data.m_value.number_integer <= (std::numeric_limits<std::uint32_t>::max)())
                     {
                         oa->write_character(to_char_type(0x1A));
-                        write_number(static_cast<std::uint32_t>(j.m_value.number_integer));
+                        write_number(static_cast<std::uint32_t>(j.m_data.m_value.number_integer));
                     }
                     else
                     {
                         oa->write_character(to_char_type(0x1B));
-                        write_number(static_cast<std::uint64_t>(j.m_value.number_integer));
+                        write_number(static_cast<std::uint64_t>(j.m_data.m_value.number_integer));
                     }
                 }
                 else
                 {
                     // The conversions below encode the sign in the first
                     // byte, and the value is converted to a positive number.
-                    const auto positive_number = -1 - j.m_value.number_integer;
-                    if (j.m_value.number_integer >= -24)
+                    const auto positive_number = -1 - j.m_data.m_value.number_integer;
+                    if (j.m_data.m_value.number_integer >= -24)
                     {
                         write_number(static_cast<std::uint8_t>(0x20 + positive_number));
                     }
@@ -150,52 +171,52 @@ class binary_writer
 
             case value_t::number_unsigned:
             {
-                if (j.m_value.number_unsigned <= 0x17)
+                if (j.m_data.m_value.number_unsigned <= 0x17)
                 {
-                    write_number(static_cast<std::uint8_t>(j.m_value.number_unsigned));
+                    write_number(static_cast<std::uint8_t>(j.m_data.m_value.number_unsigned));
                 }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
+                else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
                 {
                     oa->write_character(to_char_type(0x18));
-                    write_number(static_cast<std::uint8_t>(j.m_value.number_unsigned));
+                    write_number(static_cast<std::uint8_t>(j.m_data.m_value.number_unsigned));
                 }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
+                else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
                 {
                     oa->write_character(to_char_type(0x19));
-                    write_number(static_cast<std::uint16_t>(j.m_value.number_unsigned));
+                    write_number(static_cast<std::uint16_t>(j.m_data.m_value.number_unsigned));
                 }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
+                else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
                 {
                     oa->write_character(to_char_type(0x1A));
-                    write_number(static_cast<std::uint32_t>(j.m_value.number_unsigned));
+                    write_number(static_cast<std::uint32_t>(j.m_data.m_value.number_unsigned));
                 }
                 else
                 {
                     oa->write_character(to_char_type(0x1B));
-                    write_number(static_cast<std::uint64_t>(j.m_value.number_unsigned));
+                    write_number(static_cast<std::uint64_t>(j.m_data.m_value.number_unsigned));
                 }
                 break;
             }
 
             case value_t::number_float:
             {
-                if (std::isnan(j.m_value.number_float))
+                if (std::isnan(j.m_data.m_value.number_float))
                 {
                     // NaN is 0xf97e00 in CBOR
                     oa->write_character(to_char_type(0xF9));
                     oa->write_character(to_char_type(0x7E));
                     oa->write_character(to_char_type(0x00));
                 }
-                else if (std::isinf(j.m_value.number_float))
+                else if (std::isinf(j.m_data.m_value.number_float))
                 {
                     // Infinity is 0xf97c00, -Infinity is 0xf9fc00
                     oa->write_character(to_char_type(0xf9));
-                    oa->write_character(j.m_value.number_float > 0 ? to_char_type(0x7C) : to_char_type(0xFC));
+                    oa->write_character(j.m_data.m_value.number_float > 0 ? to_char_type(0x7C) : to_char_type(0xFC));
                     oa->write_character(to_char_type(0x00));
                 }
                 else
                 {
-                    write_compact_float(j.m_value.number_float, detail::input_format_t::cbor);
+                    write_compact_float(j.m_data.m_value.number_float, detail::input_format_t::cbor);
                 }
                 break;
             }
@@ -203,7 +224,7 @@ class binary_writer
             case value_t::string:
             {
                 // step 1: write control byte and the string length
-                const auto N = j.m_value.string->size();
+                const auto N = j.m_data.m_value.string->size();
                 if (N <= 0x17)
                 {
                     write_number(static_cast<std::uint8_t>(0x60 + N));
@@ -233,15 +254,15 @@ class binary_writer
 
                 // step 2: write the string
                 oa->write_characters(
-                    reinterpret_cast<const CharType*>(j.m_value.string->c_str()),
-                    j.m_value.string->size());
+                    reinterpret_cast<const CharType*>(j.m_data.m_value.string->c_str()),
+                    j.m_data.m_value.string->size());
                 break;
             }
 
             case value_t::array:
             {
                 // step 1: write control byte and the array size
-                const auto N = j.m_value.array->size();
+                const auto N = j.m_data.m_value.array->size();
                 if (N <= 0x17)
                 {
                     write_number(static_cast<std::uint8_t>(0x80 + N));
@@ -270,7 +291,7 @@ class binary_writer
                 // LCOV_EXCL_STOP
 
                 // step 2: write each element
-                for (const auto& el : *j.m_value.array)
+                for (const auto& el : *j.m_data.m_value.array)
                 {
                     write_cbor(el);
                 }
@@ -279,14 +300,32 @@ class binary_writer
 
             case value_t::binary:
             {
-                if (j.m_value.binary->has_subtype())
+                if (j.m_data.m_value.binary->has_subtype())
                 {
-                    write_number(static_cast<std::uint8_t>(0xd8));
-                    write_number(j.m_value.binary->subtype());
+                    if (j.m_data.m_value.binary->subtype() <= (std::numeric_limits<std::uint8_t>::max)())
+                    {
+                        write_number(static_cast<std::uint8_t>(0xd8));
+                        write_number(static_cast<std::uint8_t>(j.m_data.m_value.binary->subtype()));
+                    }
+                    else if (j.m_data.m_value.binary->subtype() <= (std::numeric_limits<std::uint16_t>::max)())
+                    {
+                        write_number(static_cast<std::uint8_t>(0xd9));
+                        write_number(static_cast<std::uint16_t>(j.m_data.m_value.binary->subtype()));
+                    }
+                    else if (j.m_data.m_value.binary->subtype() <= (std::numeric_limits<std::uint32_t>::max)())
+                    {
+                        write_number(static_cast<std::uint8_t>(0xda));
+                        write_number(static_cast<std::uint32_t>(j.m_data.m_value.binary->subtype()));
+                    }
+                    else if (j.m_data.m_value.binary->subtype() <= (std::numeric_limits<std::uint64_t>::max)())
+                    {
+                        write_number(static_cast<std::uint8_t>(0xdb));
+                        write_number(static_cast<std::uint64_t>(j.m_data.m_value.binary->subtype()));
+                    }
                 }
 
                 // step 1: write control byte and the binary array size
-                const auto N = j.m_value.binary->size();
+                const auto N = j.m_data.m_value.binary->size();
                 if (N <= 0x17)
                 {
                     write_number(static_cast<std::uint8_t>(0x40 + N));
@@ -316,7 +355,7 @@ class binary_writer
 
                 // step 2: write each element
                 oa->write_characters(
-                    reinterpret_cast<const CharType*>(j.m_value.binary->data()),
+                    reinterpret_cast<const CharType*>(j.m_data.m_value.binary->data()),
                     N);
 
                 break;
@@ -325,7 +364,7 @@ class binary_writer
             case value_t::object:
             {
                 // step 1: write control byte and the object size
-                const auto N = j.m_value.object->size();
+                const auto N = j.m_data.m_value.object->size();
                 if (N <= 0x17)
                 {
                     write_number(static_cast<std::uint8_t>(0xA0 + N));
@@ -354,7 +393,7 @@ class binary_writer
                 // LCOV_EXCL_STOP
 
                 // step 2: write each element
-                for (const auto& el : *j.m_value.object)
+                for (const auto& el : *j.m_data.m_value.object)
                 {
                     write_cbor(el.first);
                     write_cbor(el.second);
@@ -362,6 +401,7 @@ class binary_writer
                 break;
             }
 
+            case value_t::discarded:
             default:
                 break;
         }
@@ -382,7 +422,7 @@ class binary_writer
 
             case value_t::boolean: // true and false
             {
-                oa->write_character(j.m_value.boolean
+                oa->write_character(j.m_data.m_value.boolean
                                     ? to_char_type(0xC3)
                                     : to_char_type(0xC2));
                 break;
@@ -390,75 +430,75 @@ class binary_writer
 
             case value_t::number_integer:
             {
-                if (j.m_value.number_integer >= 0)
+                if (j.m_data.m_value.number_integer >= 0)
                 {
                     // MessagePack does not differentiate between positive
                     // signed integers and unsigned integers. Therefore, we used
                     // the code from the value_t::number_unsigned case here.
-                    if (j.m_value.number_unsigned < 128)
+                    if (j.m_data.m_value.number_unsigned < 128)
                     {
                         // positive fixnum
-                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                        write_number(static_cast<std::uint8_t>(j.m_data.m_value.number_integer));
                     }
-                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
+                    else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
                     {
                         // uint 8
                         oa->write_character(to_char_type(0xCC));
-                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                        write_number(static_cast<std::uint8_t>(j.m_data.m_value.number_integer));
                     }
-                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
+                    else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
                     {
                         // uint 16
                         oa->write_character(to_char_type(0xCD));
-                        write_number(static_cast<std::uint16_t>(j.m_value.number_integer));
+                        write_number(static_cast<std::uint16_t>(j.m_data.m_value.number_integer));
                     }
-                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
+                    else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
                     {
                         // uint 32
                         oa->write_character(to_char_type(0xCE));
-                        write_number(static_cast<std::uint32_t>(j.m_value.number_integer));
+                        write_number(static_cast<std::uint32_t>(j.m_data.m_value.number_integer));
                     }
-                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint64_t>::max)())
+                    else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint64_t>::max)())
                     {
                         // uint 64
                         oa->write_character(to_char_type(0xCF));
-                        write_number(static_cast<std::uint64_t>(j.m_value.number_integer));
+                        write_number(static_cast<std::uint64_t>(j.m_data.m_value.number_integer));
                     }
                 }
                 else
                 {
-                    if (j.m_value.number_integer >= -32)
+                    if (j.m_data.m_value.number_integer >= -32)
                     {
                         // negative fixnum
-                        write_number(static_cast<std::int8_t>(j.m_value.number_integer));
+                        write_number(static_cast<std::int8_t>(j.m_data.m_value.number_integer));
                     }
-                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int8_t>::min)() &&
-                             j.m_value.number_integer <= (std::numeric_limits<std::int8_t>::max)())
+                    else if (j.m_data.m_value.number_integer >= (std::numeric_limits<std::int8_t>::min)() &&
+                             j.m_data.m_value.number_integer <= (std::numeric_limits<std::int8_t>::max)())
                     {
                         // int 8
                         oa->write_character(to_char_type(0xD0));
-                        write_number(static_cast<std::int8_t>(j.m_value.number_integer));
+                        write_number(static_cast<std::int8_t>(j.m_data.m_value.number_integer));
                     }
-                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int16_t>::min)() &&
-                             j.m_value.number_integer <= (std::numeric_limits<std::int16_t>::max)())
+                    else if (j.m_data.m_value.number_integer >= (std::numeric_limits<std::int16_t>::min)() &&
+                             j.m_data.m_value.number_integer <= (std::numeric_limits<std::int16_t>::max)())
                     {
                         // int 16
                         oa->write_character(to_char_type(0xD1));
-                        write_number(static_cast<std::int16_t>(j.m_value.number_integer));
+                        write_number(static_cast<std::int16_t>(j.m_data.m_value.number_integer));
                     }
-                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int32_t>::min)() &&
-                             j.m_value.number_integer <= (std::numeric_limits<std::int32_t>::max)())
+                    else if (j.m_data.m_value.number_integer >= (std::numeric_limits<std::int32_t>::min)() &&
+                             j.m_data.m_value.number_integer <= (std::numeric_limits<std::int32_t>::max)())
                     {
                         // int 32
                         oa->write_character(to_char_type(0xD2));
-                        write_number(static_cast<std::int32_t>(j.m_value.number_integer));
+                        write_number(static_cast<std::int32_t>(j.m_data.m_value.number_integer));
                     }
-                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int64_t>::min)() &&
-                             j.m_value.number_integer <= (std::numeric_limits<std::int64_t>::max)())
+                    else if (j.m_data.m_value.number_integer >= (std::numeric_limits<std::int64_t>::min)() &&
+                             j.m_data.m_value.number_integer <= (std::numeric_limits<std::int64_t>::max)())
                     {
                         // int 64
                         oa->write_character(to_char_type(0xD3));
-                        write_number(static_cast<std::int64_t>(j.m_value.number_integer));
+                        write_number(static_cast<std::int64_t>(j.m_data.m_value.number_integer));
                     }
                 }
                 break;
@@ -466,48 +506,48 @@ class binary_writer
 
             case value_t::number_unsigned:
             {
-                if (j.m_value.number_unsigned < 128)
+                if (j.m_data.m_value.number_unsigned < 128)
                 {
                     // positive fixnum
-                    write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                    write_number(static_cast<std::uint8_t>(j.m_data.m_value.number_integer));
                 }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
+                else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
                 {
                     // uint 8
                     oa->write_character(to_char_type(0xCC));
-                    write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                    write_number(static_cast<std::uint8_t>(j.m_data.m_value.number_integer));
                 }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
+                else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
                 {
                     // uint 16
                     oa->write_character(to_char_type(0xCD));
-                    write_number(static_cast<std::uint16_t>(j.m_value.number_integer));
+                    write_number(static_cast<std::uint16_t>(j.m_data.m_value.number_integer));
                 }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
+                else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
                 {
                     // uint 32
                     oa->write_character(to_char_type(0xCE));
-                    write_number(static_cast<std::uint32_t>(j.m_value.number_integer));
+                    write_number(static_cast<std::uint32_t>(j.m_data.m_value.number_integer));
                 }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint64_t>::max)())
+                else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint64_t>::max)())
                 {
                     // uint 64
                     oa->write_character(to_char_type(0xCF));
-                    write_number(static_cast<std::uint64_t>(j.m_value.number_integer));
+                    write_number(static_cast<std::uint64_t>(j.m_data.m_value.number_integer));
                 }
                 break;
             }
 
             case value_t::number_float:
             {
-                write_compact_float(j.m_value.number_float, detail::input_format_t::msgpack);
+                write_compact_float(j.m_data.m_value.number_float, detail::input_format_t::msgpack);
                 break;
             }
 
             case value_t::string:
             {
                 // step 1: write control byte and the string length
-                const auto N = j.m_value.string->size();
+                const auto N = j.m_data.m_value.string->size();
                 if (N <= 31)
                 {
                     // fixstr
@@ -534,15 +574,15 @@ class binary_writer
 
                 // step 2: write the string
                 oa->write_characters(
-                    reinterpret_cast<const CharType*>(j.m_value.string->c_str()),
-                    j.m_value.string->size());
+                    reinterpret_cast<const CharType*>(j.m_data.m_value.string->c_str()),
+                    j.m_data.m_value.string->size());
                 break;
             }
 
             case value_t::array:
             {
                 // step 1: write control byte and the array size
-                const auto N = j.m_value.array->size();
+                const auto N = j.m_data.m_value.array->size();
                 if (N <= 15)
                 {
                     // fixarray
@@ -562,7 +602,7 @@ class binary_writer
                 }
 
                 // step 2: write each element
-                for (const auto& el : *j.m_value.array)
+                for (const auto& el : *j.m_data.m_value.array)
                 {
                     write_msgpack(el);
                 }
@@ -573,10 +613,10 @@ class binary_writer
             {
                 // step 0: determine if the binary type has a set subtype to
                 // determine whether or not to use the ext or fixext types
-                const bool use_ext = j.m_value.binary->has_subtype();
+                const bool use_ext = j.m_data.m_value.binary->has_subtype();
 
                 // step 1: write control byte and the byte string length
-                const auto N = j.m_value.binary->size();
+                const auto N = j.m_data.m_value.binary->size();
                 if (N <= (std::numeric_limits<std::uint8_t>::max)())
                 {
                     std::uint8_t output_type{};
@@ -621,18 +661,18 @@ class binary_writer
                 }
                 else if (N <= (std::numeric_limits<std::uint16_t>::max)())
                 {
-                    std::uint8_t output_type = use_ext
-                                               ? 0xC8 // ext 16
-                                               : 0xC5; // bin 16
+                    const std::uint8_t output_type = use_ext
+                                                     ? 0xC8 // ext 16
+                                                     : 0xC5; // bin 16
 
                     oa->write_character(to_char_type(output_type));
                     write_number(static_cast<std::uint16_t>(N));
                 }
                 else if (N <= (std::numeric_limits<std::uint32_t>::max)())
                 {
-                    std::uint8_t output_type = use_ext
-                                               ? 0xC9 // ext 32
-                                               : 0xC6; // bin 32
+                    const std::uint8_t output_type = use_ext
+                                                     ? 0xC9 // ext 32
+                                                     : 0xC6; // bin 32
 
                     oa->write_character(to_char_type(output_type));
                     write_number(static_cast<std::uint32_t>(N));
@@ -641,12 +681,12 @@ class binary_writer
                 // step 1.5: if this is an ext type, write the subtype
                 if (use_ext)
                 {
-                    write_number(static_cast<std::int8_t>(j.m_value.binary->subtype()));
+                    write_number(static_cast<std::int8_t>(j.m_data.m_value.binary->subtype()));
                 }
 
                 // step 2: write the byte string
                 oa->write_characters(
-                    reinterpret_cast<const CharType*>(j.m_value.binary->data()),
+                    reinterpret_cast<const CharType*>(j.m_data.m_value.binary->data()),
                     N);
 
                 break;
@@ -655,7 +695,7 @@ class binary_writer
             case value_t::object:
             {
                 // step 1: write control byte and the object size
-                const auto N = j.m_value.object->size();
+                const auto N = j.m_data.m_value.object->size();
                 if (N <= 15)
                 {
                     // fixmap
@@ -675,7 +715,7 @@ class binary_writer
                 }
 
                 // step 2: write each element
-                for (const auto& el : *j.m_value.object)
+                for (const auto& el : *j.m_data.m_value.object)
                 {
                     write_msgpack(el.first);
                     write_msgpack(el.second);
@@ -683,6 +723,7 @@ class binary_writer
                 break;
             }
 
+            case value_t::discarded:
             default:
                 break;
         }
@@ -693,9 +734,11 @@ class binary_writer
     @param[in] use_count   whether to use '#' prefixes (optimized format)
     @param[in] use_type    whether to use '$' prefixes (optimized format)
     @param[in] add_prefix  whether prefixes need to be used for this value
+    @param[in] use_bjdata  whether write in BJData format, default is false
     */
     void write_ubjson(const BasicJsonType& j, const bool use_count,
-                      const bool use_type, const bool add_prefix = true)
+                      const bool use_type, const bool add_prefix = true,
+                      const bool use_bjdata = false)
     {
         switch (j.type())
         {
@@ -712,7 +755,7 @@ class binary_writer
             {
                 if (add_prefix)
                 {
-                    oa->write_character(j.m_value.boolean
+                    oa->write_character(j.m_data.m_value.boolean
                                         ? to_char_type('T')
                                         : to_char_type('F'));
                 }
@@ -721,19 +764,19 @@ class binary_writer
 
             case value_t::number_integer:
             {
-                write_number_with_ubjson_prefix(j.m_value.number_integer, add_prefix);
+                write_number_with_ubjson_prefix(j.m_data.m_value.number_integer, add_prefix, use_bjdata);
                 break;
             }
 
             case value_t::number_unsigned:
             {
-                write_number_with_ubjson_prefix(j.m_value.number_unsigned, add_prefix);
+                write_number_with_ubjson_prefix(j.m_data.m_value.number_unsigned, add_prefix, use_bjdata);
                 break;
             }
 
             case value_t::number_float:
             {
-                write_number_with_ubjson_prefix(j.m_value.number_float, add_prefix);
+                write_number_with_ubjson_prefix(j.m_data.m_value.number_float, add_prefix, use_bjdata);
                 break;
             }
 
@@ -743,10 +786,10 @@ class binary_writer
                 {
                     oa->write_character(to_char_type('S'));
                 }
-                write_number_with_ubjson_prefix(j.m_value.string->size(), true);
+                write_number_with_ubjson_prefix(j.m_data.m_value.string->size(), true, use_bjdata);
                 oa->write_characters(
-                    reinterpret_cast<const CharType*>(j.m_value.string->c_str()),
-                    j.m_value.string->size());
+                    reinterpret_cast<const CharType*>(j.m_data.m_value.string->c_str()),
+                    j.m_data.m_value.string->size());
                 break;
             }
 
@@ -758,17 +801,19 @@ class binary_writer
                 }
 
                 bool prefix_required = true;
-                if (use_type && !j.m_value.array->empty())
+                if (use_type && !j.m_data.m_value.array->empty())
                 {
                     JSON_ASSERT(use_count);
-                    const CharType first_prefix = ubjson_prefix(j.front());
+                    const CharType first_prefix = ubjson_prefix(j.front(), use_bjdata);
                     const bool same_prefix = std::all_of(j.begin() + 1, j.end(),
-                                                         [this, first_prefix](const BasicJsonType & v)
+                                                         [this, first_prefix, use_bjdata](const BasicJsonType & v)
                     {
-                        return ubjson_prefix(v) == first_prefix;
+                        return ubjson_prefix(v, use_bjdata) == first_prefix;
                     });
 
-                    if (same_prefix)
+                    std::vector<CharType> bjdx = {'[', '{', 'S', 'H', 'T', 'F', 'N', 'Z'}; // excluded markers in bjdata optimized type
+
+                    if (same_prefix && !(use_bjdata && std::find(bjdx.begin(), bjdx.end(), first_prefix) != bjdx.end()))
                     {
                         prefix_required = false;
                         oa->write_character(to_char_type('$'));
@@ -779,12 +824,12 @@ class binary_writer
                 if (use_count)
                 {
                     oa->write_character(to_char_type('#'));
-                    write_number_with_ubjson_prefix(j.m_value.array->size(), true);
+                    write_number_with_ubjson_prefix(j.m_data.m_value.array->size(), true, use_bjdata);
                 }
 
-                for (const auto& el : *j.m_value.array)
+                for (const auto& el : *j.m_data.m_value.array)
                 {
-                    write_ubjson(el, use_count, use_type, prefix_required);
+                    write_ubjson(el, use_count, use_type, prefix_required, use_bjdata);
                 }
 
                 if (!use_count)
@@ -802,7 +847,7 @@ class binary_writer
                     oa->write_character(to_char_type('['));
                 }
 
-                if (use_type && !j.m_value.binary->empty())
+                if (use_type && !j.m_data.m_value.binary->empty())
                 {
                     JSON_ASSERT(use_count);
                     oa->write_character(to_char_type('$'));
@@ -812,21 +857,21 @@ class binary_writer
                 if (use_count)
                 {
                     oa->write_character(to_char_type('#'));
-                    write_number_with_ubjson_prefix(j.m_value.binary->size(), true);
+                    write_number_with_ubjson_prefix(j.m_data.m_value.binary->size(), true, use_bjdata);
                 }
 
                 if (use_type)
                 {
                     oa->write_characters(
-                        reinterpret_cast<const CharType*>(j.m_value.binary->data()),
-                        j.m_value.binary->size());
+                        reinterpret_cast<const CharType*>(j.m_data.m_value.binary->data()),
+                        j.m_data.m_value.binary->size());
                 }
                 else
                 {
-                    for (size_t i = 0; i < j.m_value.binary->size(); ++i)
+                    for (size_t i = 0; i < j.m_data.m_value.binary->size(); ++i)
                     {
                         oa->write_character(to_char_type('U'));
-                        oa->write_character(j.m_value.binary->data()[i]);
+                        oa->write_character(j.m_data.m_value.binary->data()[i]);
                     }
                 }
 
@@ -840,23 +885,33 @@ class binary_writer
 
             case value_t::object:
             {
+                if (use_bjdata && j.m_data.m_value.object->size() == 3 && j.m_data.m_value.object->find("_ArrayType_") != j.m_data.m_value.object->end() && j.m_data.m_value.object->find("_ArraySize_") != j.m_data.m_value.object->end() && j.m_data.m_value.object->find("_ArrayData_") != j.m_data.m_value.object->end())
+                {
+                    if (!write_bjdata_ndarray(*j.m_data.m_value.object, use_count, use_type))  // decode bjdata ndarray in the JData format (https://github.com/NeuroJSON/jdata)
+                    {
+                        break;
+                    }
+                }
+
                 if (add_prefix)
                 {
                     oa->write_character(to_char_type('{'));
                 }
 
                 bool prefix_required = true;
-                if (use_type && !j.m_value.object->empty())
+                if (use_type && !j.m_data.m_value.object->empty())
                 {
                     JSON_ASSERT(use_count);
-                    const CharType first_prefix = ubjson_prefix(j.front());
+                    const CharType first_prefix = ubjson_prefix(j.front(), use_bjdata);
                     const bool same_prefix = std::all_of(j.begin(), j.end(),
-                                                         [this, first_prefix](const BasicJsonType & v)
+                                                         [this, first_prefix, use_bjdata](const BasicJsonType & v)
                     {
-                        return ubjson_prefix(v) == first_prefix;
+                        return ubjson_prefix(v, use_bjdata) == first_prefix;
                     });
 
-                    if (same_prefix)
+                    std::vector<CharType> bjdx = {'[', '{', 'S', 'H', 'T', 'F', 'N', 'Z'}; // excluded markers in bjdata optimized type
+
+                    if (same_prefix && !(use_bjdata && std::find(bjdx.begin(), bjdx.end(), first_prefix) != bjdx.end()))
                     {
                         prefix_required = false;
                         oa->write_character(to_char_type('$'));
@@ -867,16 +922,16 @@ class binary_writer
                 if (use_count)
                 {
                     oa->write_character(to_char_type('#'));
-                    write_number_with_ubjson_prefix(j.m_value.object->size(), true);
+                    write_number_with_ubjson_prefix(j.m_data.m_value.object->size(), true, use_bjdata);
                 }
 
-                for (const auto& el : *j.m_value.object)
+                for (const auto& el : *j.m_data.m_value.object)
                 {
-                    write_number_with_ubjson_prefix(el.first.size(), true);
+                    write_number_with_ubjson_prefix(el.first.size(), true, use_bjdata);
                     oa->write_characters(
                         reinterpret_cast<const CharType*>(el.first.c_str()),
                         el.first.size());
-                    write_ubjson(el.second, use_count, use_type, prefix_required);
+                    write_ubjson(el.second, use_count, use_type, prefix_required, use_bjdata);
                 }
 
                 if (!use_count)
@@ -887,6 +942,7 @@ class binary_writer
                 break;
             }
 
+            case value_t::discarded:
             default:
                 break;
         }
@@ -906,7 +962,8 @@ class binary_writer
         const auto it = name.find(static_cast<typename string_t::value_type>(0));
         if (JSON_HEDLEY_UNLIKELY(it != BasicJsonType::string_t::npos))
         {
-            JSON_THROW(out_of_range::create(409, "BSON key cannot contain code point U+0000 (at byte " + std::to_string(it) + ")", j));
+            JSON_THROW(out_of_range::create(409, concat("BSON key cannot contain code point U+0000 (at byte ", std::to_string(it), ")"), &j));
+            static_cast<void>(j);
         }
 
         return /*id*/ 1ul + name.size() + /*zero-terminator*/1u;
@@ -941,7 +998,7 @@ class binary_writer
                            const double value)
     {
         write_bson_entry_header(name, 0x01);
-        write_number<double, true>(value);
+        write_number<double>(value, true);
     }
 
     /*!
@@ -960,7 +1017,7 @@ class binary_writer
     {
         write_bson_entry_header(name, 0x02);
 
-        write_number<std::int32_t, true>(static_cast<std::int32_t>(value.size() + 1ul));
+        write_number<std::int32_t>(static_cast<std::int32_t>(value.size() + 1ul), true);
         oa->write_characters(
             reinterpret_cast<const CharType*>(value.c_str()),
             value.size() + 1);
@@ -993,12 +1050,12 @@ class binary_writer
         if ((std::numeric_limits<std::int32_t>::min)() <= value && value <= (std::numeric_limits<std::int32_t>::max)())
         {
             write_bson_entry_header(name, 0x10); // int32
-            write_number<std::int32_t, true>(static_cast<std::int32_t>(value));
+            write_number<std::int32_t>(static_cast<std::int32_t>(value), true);
         }
         else
         {
             write_bson_entry_header(name, 0x12); // int64
-            write_number<std::int64_t, true>(static_cast<std::int64_t>(value));
+            write_number<std::int64_t>(static_cast<std::int64_t>(value), true);
         }
     }
 
@@ -1018,19 +1075,19 @@ class binary_writer
     void write_bson_unsigned(const string_t& name,
                              const BasicJsonType& j)
     {
-        if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
+        if (j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
         {
             write_bson_entry_header(name, 0x10 /* int32 */);
-            write_number<std::int32_t, true>(static_cast<std::int32_t>(j.m_value.number_unsigned));
+            write_number<std::int32_t>(static_cast<std::int32_t>(j.m_data.m_value.number_unsigned), true);
         }
-        else if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
+        else if (j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
         {
             write_bson_entry_header(name, 0x12 /* int64 */);
-            write_number<std::int64_t, true>(static_cast<std::int64_t>(j.m_value.number_unsigned));
+            write_number<std::int64_t>(static_cast<std::int64_t>(j.m_data.m_value.number_unsigned), true);
         }
         else
         {
-            JSON_THROW(out_of_range::create(407, "integer number " + std::to_string(j.m_value.number_unsigned) + " cannot be represented by BSON as it does not fit int64", j));
+            JSON_THROW(out_of_range::create(407, concat("integer number ", std::to_string(j.m_data.m_value.number_unsigned), " cannot be represented by BSON as it does not fit int64"), &j));
         }
     }
 
@@ -1051,7 +1108,7 @@ class binary_writer
     {
         std::size_t array_index = 0ul;
 
-        const std::size_t embedded_document_size = std::accumulate(std::begin(value), std::end(value), std::size_t(0), [&array_index](std::size_t result, const typename BasicJsonType::array_t::value_type & el)
+        const std::size_t embedded_document_size = std::accumulate(std::begin(value), std::end(value), static_cast<std::size_t>(0), [&array_index](std::size_t result, const typename BasicJsonType::array_t::value_type & el)
         {
             return result + calc_bson_element_size(std::to_string(array_index++), el);
         });
@@ -1074,7 +1131,7 @@ class binary_writer
                           const typename BasicJsonType::array_t& value)
     {
         write_bson_entry_header(name, 0x04); // array
-        write_number<std::int32_t, true>(static_cast<std::int32_t>(calc_bson_array_size(value)));
+        write_number<std::int32_t>(static_cast<std::int32_t>(calc_bson_array_size(value)), true);
 
         std::size_t array_index = 0ul;
 
@@ -1094,8 +1151,8 @@ class binary_writer
     {
         write_bson_entry_header(name, 0x05);
 
-        write_number<std::int32_t, true>(static_cast<std::int32_t>(value.size()));
-        write_number(value.has_subtype() ? value.subtype() : std::uint8_t(0x00));
+        write_number<std::int32_t>(static_cast<std::int32_t>(value.size()), true);
+        write_number(value.has_subtype() ? static_cast<std::uint8_t>(value.subtype()) : static_cast<std::uint8_t>(0x00));
 
         oa->write_characters(reinterpret_cast<const CharType*>(value.data()), value.size());
     }
@@ -1111,13 +1168,13 @@ class binary_writer
         switch (j.type())
         {
             case value_t::object:
-                return header_size + calc_bson_object_size(*j.m_value.object);
+                return header_size + calc_bson_object_size(*j.m_data.m_value.object);
 
             case value_t::array:
-                return header_size + calc_bson_array_size(*j.m_value.array);
+                return header_size + calc_bson_array_size(*j.m_data.m_value.array);
 
             case value_t::binary:
-                return header_size + calc_bson_binary_size(*j.m_value.binary);
+                return header_size + calc_bson_binary_size(*j.m_data.m_value.binary);
 
             case value_t::boolean:
                 return header_size + 1ul;
@@ -1126,20 +1183,21 @@ class binary_writer
                 return header_size + 8ul;
 
             case value_t::number_integer:
-                return header_size + calc_bson_integer_size(j.m_value.number_integer);
+                return header_size + calc_bson_integer_size(j.m_data.m_value.number_integer);
 
             case value_t::number_unsigned:
-                return header_size + calc_bson_unsigned_size(j.m_value.number_unsigned);
+                return header_size + calc_bson_unsigned_size(j.m_data.m_value.number_unsigned);
 
             case value_t::string:
-                return header_size + calc_bson_string_size(*j.m_value.string);
+                return header_size + calc_bson_string_size(*j.m_data.m_value.string);
 
             case value_t::null:
                 return header_size + 0ul;
 
             // LCOV_EXCL_START
+            case value_t::discarded:
             default:
-                JSON_ASSERT(false);
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert)
                 return 0ul;
                 // LCOV_EXCL_STOP
         }
@@ -1150,7 +1208,6 @@ class binary_writer
            key @a name.
     @param name The name to associate with the JSON entity @a j within the
                 current BSON document
-    @return The size of the BSON entry
     */
     void write_bson_element(const string_t& name,
                             const BasicJsonType& j)
@@ -1158,35 +1215,36 @@ class binary_writer
         switch (j.type())
         {
             case value_t::object:
-                return write_bson_object_entry(name, *j.m_value.object);
+                return write_bson_object_entry(name, *j.m_data.m_value.object);
 
             case value_t::array:
-                return write_bson_array(name, *j.m_value.array);
+                return write_bson_array(name, *j.m_data.m_value.array);
 
             case value_t::binary:
-                return write_bson_binary(name, *j.m_value.binary);
+                return write_bson_binary(name, *j.m_data.m_value.binary);
 
             case value_t::boolean:
-                return write_bson_boolean(name, j.m_value.boolean);
+                return write_bson_boolean(name, j.m_data.m_value.boolean);
 
             case value_t::number_float:
-                return write_bson_double(name, j.m_value.number_float);
+                return write_bson_double(name, j.m_data.m_value.number_float);
 
             case value_t::number_integer:
-                return write_bson_integer(name, j.m_value.number_integer);
+                return write_bson_integer(name, j.m_data.m_value.number_integer);
 
             case value_t::number_unsigned:
                 return write_bson_unsigned(name, j);
 
             case value_t::string:
-                return write_bson_string(name, *j.m_value.string);
+                return write_bson_string(name, *j.m_data.m_value.string);
 
             case value_t::null:
                 return write_bson_null(name);
 
             // LCOV_EXCL_START
+            case value_t::discarded:
             default:
-                JSON_ASSERT(false);
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert)
                 return;
                 // LCOV_EXCL_STOP
         }
@@ -1195,13 +1253,13 @@ class binary_writer
     /*!
     @brief Calculates the size of the BSON serialization of the given
            JSON-object @a j.
-    @param[in] j  JSON value to serialize
-    @pre       j.type() == value_t::object
+    @param[in] value  JSON value to serialize
+    @pre       value.type() == value_t::object
     */
     static std::size_t calc_bson_object_size(const typename BasicJsonType::object_t& value)
     {
-        std::size_t document_size = std::accumulate(value.begin(), value.end(), std::size_t(0),
-                                    [](size_t result, const typename BasicJsonType::object_t::value_type & el)
+        const std::size_t document_size = std::accumulate(value.begin(), value.end(), static_cast<std::size_t>(0),
+                                          [](size_t result, const typename BasicJsonType::object_t::value_type & el)
         {
             return result += calc_bson_element_size(el.first, el.second);
         });
@@ -1210,12 +1268,12 @@ class binary_writer
     }
 
     /*!
-    @param[in] j  JSON value to serialize
-    @pre       j.type() == value_t::object
+    @param[in] value  JSON value to serialize
+    @pre       value.type() == value_t::object
     */
     void write_bson_object(const typename BasicJsonType::object_t& value)
     {
-        write_number<std::int32_t, true>(static_cast<std::int32_t>(calc_bson_object_size(value)));
+        write_number<std::int32_t>(static_cast<std::int32_t>(calc_bson_object_size(value)), true);
 
         for (const auto& el : value)
         {
@@ -1261,20 +1319,22 @@ class binary_writer
     template<typename NumberType, typename std::enable_if<
                  std::is_floating_point<NumberType>::value, int>::type = 0>
     void write_number_with_ubjson_prefix(const NumberType n,
-                                         const bool add_prefix)
+                                         const bool add_prefix,
+                                         const bool use_bjdata)
     {
         if (add_prefix)
         {
             oa->write_character(get_ubjson_float_prefix(n));
         }
-        write_number(n);
+        write_number(n, use_bjdata);
     }
 
     // UBJSON: write number (unsigned integer)
     template<typename NumberType, typename std::enable_if<
                  std::is_unsigned<NumberType>::value, int>::type = 0>
     void write_number_with_ubjson_prefix(const NumberType n,
-                                         const bool add_prefix)
+                                         const bool add_prefix,
+                                         const bool use_bjdata)
     {
         if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int8_t>::max)()))
         {
@@ -1282,7 +1342,7 @@ class binary_writer
             {
                 oa->write_character(to_char_type('i'));  // int8
             }
-            write_number(static_cast<std::uint8_t>(n));
+            write_number(static_cast<std::uint8_t>(n), use_bjdata);
         }
         else if (n <= (std::numeric_limits<std::uint8_t>::max)())
         {
@@ -1290,7 +1350,7 @@ class binary_writer
             {
                 oa->write_character(to_char_type('U'));  // uint8
             }
-            write_number(static_cast<std::uint8_t>(n));
+            write_number(static_cast<std::uint8_t>(n), use_bjdata);
         }
         else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int16_t>::max)()))
         {
@@ -1298,7 +1358,15 @@ class binary_writer
             {
                 oa->write_character(to_char_type('I'));  // int16
             }
-            write_number(static_cast<std::int16_t>(n));
+            write_number(static_cast<std::int16_t>(n), use_bjdata);
+        }
+        else if (use_bjdata && n <= static_cast<uint64_t>((std::numeric_limits<uint16_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('u'));  // uint16 - bjdata only
+            }
+            write_number(static_cast<std::uint16_t>(n), use_bjdata);
         }
         else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
         {
@@ -1306,7 +1374,15 @@ class binary_writer
             {
                 oa->write_character(to_char_type('l'));  // int32
             }
-            write_number(static_cast<std::int32_t>(n));
+            write_number(static_cast<std::int32_t>(n), use_bjdata);
+        }
+        else if (use_bjdata && n <= static_cast<uint64_t>((std::numeric_limits<uint32_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('m'));  // uint32 - bjdata only
+            }
+            write_number(static_cast<std::uint32_t>(n), use_bjdata);
         }
         else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
         {
@@ -1314,7 +1390,15 @@ class binary_writer
             {
                 oa->write_character(to_char_type('L'));  // int64
             }
-            write_number(static_cast<std::int64_t>(n));
+            write_number(static_cast<std::int64_t>(n), use_bjdata);
+        }
+        else if (use_bjdata && n <= (std::numeric_limits<uint64_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('M'));  // uint64 - bjdata only
+            }
+            write_number(static_cast<std::uint64_t>(n), use_bjdata);
         }
         else
         {
@@ -1324,7 +1408,7 @@ class binary_writer
             }
 
             const auto number = BasicJsonType(n).dump();
-            write_number_with_ubjson_prefix(number.size(), true);
+            write_number_with_ubjson_prefix(number.size(), true, use_bjdata);
             for (std::size_t i = 0; i < number.size(); ++i)
             {
                 oa->write_character(to_char_type(static_cast<std::uint8_t>(number[i])));
@@ -1337,7 +1421,8 @@ class binary_writer
                    std::is_signed<NumberType>::value&&
                    !std::is_floating_point<NumberType>::value, int >::type = 0 >
     void write_number_with_ubjson_prefix(const NumberType n,
-                                         const bool add_prefix)
+                                         const bool add_prefix,
+                                         const bool use_bjdata)
     {
         if ((std::numeric_limits<std::int8_t>::min)() <= n && n <= (std::numeric_limits<std::int8_t>::max)())
         {
@@ -1345,7 +1430,7 @@ class binary_writer
             {
                 oa->write_character(to_char_type('i'));  // int8
             }
-            write_number(static_cast<std::int8_t>(n));
+            write_number(static_cast<std::int8_t>(n), use_bjdata);
         }
         else if (static_cast<std::int64_t>((std::numeric_limits<std::uint8_t>::min)()) <= n && n <= static_cast<std::int64_t>((std::numeric_limits<std::uint8_t>::max)()))
         {
@@ -1353,7 +1438,7 @@ class binary_writer
             {
                 oa->write_character(to_char_type('U'));  // uint8
             }
-            write_number(static_cast<std::uint8_t>(n));
+            write_number(static_cast<std::uint8_t>(n), use_bjdata);
         }
         else if ((std::numeric_limits<std::int16_t>::min)() <= n && n <= (std::numeric_limits<std::int16_t>::max)())
         {
@@ -1361,7 +1446,15 @@ class binary_writer
             {
                 oa->write_character(to_char_type('I'));  // int16
             }
-            write_number(static_cast<std::int16_t>(n));
+            write_number(static_cast<std::int16_t>(n), use_bjdata);
+        }
+        else if (use_bjdata && (static_cast<std::int64_t>((std::numeric_limits<std::uint16_t>::min)()) <= n && n <= static_cast<std::int64_t>((std::numeric_limits<std::uint16_t>::max)())))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('u'));  // uint16 - bjdata only
+            }
+            write_number(static_cast<uint16_t>(n), use_bjdata);
         }
         else if ((std::numeric_limits<std::int32_t>::min)() <= n && n <= (std::numeric_limits<std::int32_t>::max)())
         {
@@ -1369,7 +1462,15 @@ class binary_writer
             {
                 oa->write_character(to_char_type('l'));  // int32
             }
-            write_number(static_cast<std::int32_t>(n));
+            write_number(static_cast<std::int32_t>(n), use_bjdata);
+        }
+        else if (use_bjdata && (static_cast<std::int64_t>((std::numeric_limits<std::uint32_t>::min)()) <= n && n <= static_cast<std::int64_t>((std::numeric_limits<std::uint32_t>::max)())))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('m'));  // uint32 - bjdata only
+            }
+            write_number(static_cast<uint32_t>(n), use_bjdata);
         }
         else if ((std::numeric_limits<std::int64_t>::min)() <= n && n <= (std::numeric_limits<std::int64_t>::max)())
         {
@@ -1377,7 +1478,7 @@ class binary_writer
             {
                 oa->write_character(to_char_type('L'));  // int64
             }
-            write_number(static_cast<std::int64_t>(n));
+            write_number(static_cast<std::int64_t>(n), use_bjdata);
         }
         // LCOV_EXCL_START
         else
@@ -1388,7 +1489,7 @@ class binary_writer
             }
 
             const auto number = BasicJsonType(n).dump();
-            write_number_with_ubjson_prefix(number.size(), true);
+            write_number_with_ubjson_prefix(number.size(), true, use_bjdata);
             for (std::size_t i = 0; i < number.size(); ++i)
             {
                 oa->write_character(to_char_type(static_cast<std::uint8_t>(number[i])));
@@ -1400,7 +1501,7 @@ class binary_writer
     /*!
     @brief determine the type prefix of container values
     */
-    CharType ubjson_prefix(const BasicJsonType& j) const noexcept
+    CharType ubjson_prefix(const BasicJsonType& j, const bool use_bjdata) const noexcept
     {
         switch (j.type())
         {
@@ -1408,27 +1509,35 @@ class binary_writer
                 return 'Z';
 
             case value_t::boolean:
-                return j.m_value.boolean ? 'T' : 'F';
+                return j.m_data.m_value.boolean ? 'T' : 'F';
 
             case value_t::number_integer:
             {
-                if ((std::numeric_limits<std::int8_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::int8_t>::max)())
+                if ((std::numeric_limits<std::int8_t>::min)() <= j.m_data.m_value.number_integer && j.m_data.m_value.number_integer <= (std::numeric_limits<std::int8_t>::max)())
                 {
                     return 'i';
                 }
-                if ((std::numeric_limits<std::uint8_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::uint8_t>::max)())
+                if ((std::numeric_limits<std::uint8_t>::min)() <= j.m_data.m_value.number_integer && j.m_data.m_value.number_integer <= (std::numeric_limits<std::uint8_t>::max)())
                 {
                     return 'U';
                 }
-                if ((std::numeric_limits<std::int16_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::int16_t>::max)())
+                if ((std::numeric_limits<std::int16_t>::min)() <= j.m_data.m_value.number_integer && j.m_data.m_value.number_integer <= (std::numeric_limits<std::int16_t>::max)())
                 {
                     return 'I';
                 }
-                if ((std::numeric_limits<std::int32_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::int32_t>::max)())
+                if (use_bjdata && ((std::numeric_limits<std::uint16_t>::min)() <= j.m_data.m_value.number_integer && j.m_data.m_value.number_integer <= (std::numeric_limits<std::uint16_t>::max)()))
+                {
+                    return 'u';
+                }
+                if ((std::numeric_limits<std::int32_t>::min)() <= j.m_data.m_value.number_integer && j.m_data.m_value.number_integer <= (std::numeric_limits<std::int32_t>::max)())
                 {
                     return 'l';
                 }
-                if ((std::numeric_limits<std::int64_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::int64_t>::max)())
+                if (use_bjdata && ((std::numeric_limits<std::uint32_t>::min)() <= j.m_data.m_value.number_integer && j.m_data.m_value.number_integer <= (std::numeric_limits<std::uint32_t>::max)()))
+                {
+                    return 'm';
+                }
+                if ((std::numeric_limits<std::int64_t>::min)() <= j.m_data.m_value.number_integer && j.m_data.m_value.number_integer <= (std::numeric_limits<std::int64_t>::max)())
                 {
                     return 'L';
                 }
@@ -1438,32 +1547,44 @@ class binary_writer
 
             case value_t::number_unsigned:
             {
-                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int8_t>::max)()))
+                if (j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int8_t>::max)()))
                 {
                     return 'i';
                 }
-                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::uint8_t>::max)()))
+                if (j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::uint8_t>::max)()))
                 {
                     return 'U';
                 }
-                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int16_t>::max)()))
+                if (j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int16_t>::max)()))
                 {
                     return 'I';
                 }
-                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
+                if (use_bjdata && j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::uint16_t>::max)()))
+                {
+                    return 'u';
+                }
+                if (j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
                 {
                     return 'l';
                 }
-                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
+                if (use_bjdata && j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::uint32_t>::max)()))
+                {
+                    return 'm';
+                }
+                if (j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
                 {
                     return 'L';
                 }
+                if (use_bjdata && j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    return 'M';
+                }
                 // anything else is treated as high-precision number
                 return 'H'; // LCOV_EXCL_LINE
             }
 
             case value_t::number_float:
-                return get_ubjson_float_prefix(j.m_value.number_float);
+                return get_ubjson_float_prefix(j.m_data.m_value.number_float);
 
             case value_t::string:
                 return 'S';
@@ -1475,6 +1596,7 @@ class binary_writer
             case value_t::object:
                 return '{';
 
+            case value_t::discarded:
             default:  // discarded values
                 return 'N';
         }
@@ -1490,6 +1612,118 @@ class binary_writer
         return 'D';  // float 64
     }
 
+    /*!
+    @return false if the object is successfully converted to a bjdata ndarray, true if the type or size is invalid
+    */
+    bool write_bjdata_ndarray(const typename BasicJsonType::object_t& value, const bool use_count, const bool use_type)
+    {
+        std::map<string_t, CharType> bjdtype = {{"uint8", 'U'},  {"int8", 'i'},  {"uint16", 'u'}, {"int16", 'I'},
+            {"uint32", 'm'}, {"int32", 'l'}, {"uint64", 'M'}, {"int64", 'L'}, {"single", 'd'}, {"double", 'D'}, {"char", 'C'}
+        };
+
+        string_t key = "_ArrayType_";
+        auto it = bjdtype.find(static_cast<string_t>(value.at(key)));
+        if (it == bjdtype.end())
+        {
+            return true;
+        }
+        CharType dtype = it->second;
+
+        key = "_ArraySize_";
+        std::size_t len = (value.at(key).empty() ? 0 : 1);
+        for (const auto& el : value.at(key))
+        {
+            len *= static_cast<std::size_t>(el.m_data.m_value.number_unsigned);
+        }
+
+        key = "_ArrayData_";
+        if (value.at(key).size() != len)
+        {
+            return true;
+        }
+
+        oa->write_character('[');
+        oa->write_character('$');
+        oa->write_character(dtype);
+        oa->write_character('#');
+
+        key = "_ArraySize_";
+        write_ubjson(value.at(key), use_count, use_type, true,  true);
+
+        key = "_ArrayData_";
+        if (dtype == 'U' || dtype == 'C')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::uint8_t>(el.m_data.m_value.number_unsigned), true);
+            }
+        }
+        else if (dtype == 'i')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::int8_t>(el.m_data.m_value.number_integer), true);
+            }
+        }
+        else if (dtype == 'u')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::uint16_t>(el.m_data.m_value.number_unsigned), true);
+            }
+        }
+        else if (dtype == 'I')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::int16_t>(el.m_data.m_value.number_integer), true);
+            }
+        }
+        else if (dtype == 'm')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::uint32_t>(el.m_data.m_value.number_unsigned), true);
+            }
+        }
+        else if (dtype == 'l')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::int32_t>(el.m_data.m_value.number_integer), true);
+            }
+        }
+        else if (dtype == 'M')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::uint64_t>(el.m_data.m_value.number_unsigned), true);
+            }
+        }
+        else if (dtype == 'L')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::int64_t>(el.m_data.m_value.number_integer), true);
+            }
+        }
+        else if (dtype == 'd')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<float>(el.m_data.m_value.number_float), true);
+            }
+        }
+        else if (dtype == 'D')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<double>(el.m_data.m_value.number_float), true);
+            }
+        }
+        return false;
+    }
+
     ///////////////////////
     // Utility functions //
     ///////////////////////
@@ -1497,19 +1731,21 @@ class binary_writer
     /*
     @brief write a number to output input
     @param[in] n number of type @a NumberType
-    @tparam NumberType the type of the number
-    @tparam OutputIsLittleEndian Set to true if output data is
+    @param[in] OutputIsLittleEndian Set to true if output data is
                                  required to be little endian
+    @tparam NumberType the type of the number
 
-    @note This function needs to respect the system's endianess, because bytes
+    @note This function needs to respect the system's endianness, because bytes
           in CBOR, MessagePack, and UBJSON are stored in network order (big
           endian) and therefore need reordering on little endian systems.
+          On the other hand, BSON and BJData use little endian and should reorder
+          on big endian systems.
     */
-    template<typename NumberType, bool OutputIsLittleEndian = false>
-    void write_number(const NumberType n)
+    template<typename NumberType>
+    void write_number(const NumberType n, const bool OutputIsLittleEndian = false)
     {
         // step 1: write number to array of length NumberType
-        std::array<CharType, sizeof(NumberType)> vec;
+        std::array<CharType, sizeof(NumberType)> vec{};
         std::memcpy(vec.data(), &n, sizeof(NumberType));
 
         // step 2: write array to output (with possible reordering)
@@ -1524,6 +1760,10 @@ class binary_writer
 
     void write_compact_float(const number_float_t n, detail::input_format_t format)
     {
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
         if (static_cast<double>(n) >= static_cast<double>(std::numeric_limits<float>::lowest()) &&
                 static_cast<double>(n) <= static_cast<double>((std::numeric_limits<float>::max)()) &&
                 static_cast<double>(static_cast<float>(n)) == static_cast<double>(n))
@@ -1540,6 +1780,9 @@ class binary_writer
                                 : get_msgpack_float_prefix(n));
             write_number(n);
         }
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
     }
 
   public:
@@ -1584,11 +1827,12 @@ class binary_writer
     }
 
   private:
-    /// whether we can assume little endianess
-    const bool is_little_endian = little_endianess();
+    /// whether we can assume little endianness
+    const bool is_little_endian = little_endianness();
 
     /// the output
     output_adapter_t<CharType> oa = nullptr;
 };
+
 }  // namespace detail
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
diff --git a/external_imported/json/include/nlohmann/detail/output/output_adapters.hpp b/external_imported/json/include/nlohmann/detail/output/output_adapters.hpp
index 71ca65b92..626f7c0c8 100644
--- a/external_imported/json/include/nlohmann/detail/output/output_adapters.hpp
+++ b/external_imported/json/include/nlohmann/detail/output/output_adapters.hpp
@@ -1,25 +1,43 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 #pragma once
 
 #include <algorithm> // copy
 #include <cstddef> // size_t
-#include <ios> // streamsize
 #include <iterator> // back_inserter
 #include <memory> // shared_ptr, make_shared
-#include <ostream> // basic_ostream
 #include <string> // basic_string
 #include <vector> // vector
+
+#ifndef JSON_NO_IO
+    #include <ios>      // streamsize
+    #include <ostream>  // basic_ostream
+#endif  // JSON_NO_IO
+
 #include <nlohmann/detail/macro_scope.hpp>
 
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
+
 /// abstract output adapter interface
 template<typename CharType> struct output_adapter_protocol
 {
     virtual void write_character(CharType c) = 0;
     virtual void write_characters(const CharType* s, std::size_t length) = 0;
     virtual ~output_adapter_protocol() = default;
+
+    output_adapter_protocol() = default;
+    output_adapter_protocol(const output_adapter_protocol&) = default;
+    output_adapter_protocol(output_adapter_protocol&&) noexcept = default;
+    output_adapter_protocol& operator=(const output_adapter_protocol&) = default;
+    output_adapter_protocol& operator=(output_adapter_protocol&&) noexcept = default;
 };
 
 /// a type to simplify interfaces
@@ -27,11 +45,11 @@ template<typename CharType>
 using output_adapter_t = std::shared_ptr<output_adapter_protocol<CharType>>;
 
 /// output adapter for byte vectors
-template<typename CharType>
+template<typename CharType, typename AllocatorType = std::allocator<CharType>>
 class output_vector_adapter : public output_adapter_protocol<CharType>
 {
   public:
-    explicit output_vector_adapter(std::vector<CharType>& vec) noexcept
+    explicit output_vector_adapter(std::vector<CharType, AllocatorType>& vec) noexcept
         : v(vec)
     {}
 
@@ -43,13 +61,14 @@ class output_vector_adapter : public output_adapter_protocol<CharType>
     JSON_HEDLEY_NON_NULL(2)
     void write_characters(const CharType* s, std::size_t length) override
     {
-        std::copy(s, s + length, std::back_inserter(v));
+        v.insert(v.end(), s, s + length);
     }
 
   private:
-    std::vector<CharType>& v;
+    std::vector<CharType, AllocatorType>& v;
 };
 
+#ifndef JSON_NO_IO
 /// output adapter for output streams
 template<typename CharType>
 class output_stream_adapter : public output_adapter_protocol<CharType>
@@ -73,6 +92,7 @@ class output_stream_adapter : public output_adapter_protocol<CharType>
   private:
     std::basic_ostream<CharType>& stream;
 };
+#endif  // JSON_NO_IO
 
 /// output adapter for basic_string
 template<typename CharType, typename StringType = std::basic_string<CharType>>
@@ -102,11 +122,14 @@ template<typename CharType, typename StringType = std::basic_string<CharType>>
 class output_adapter
 {
   public:
-    output_adapter(std::vector<CharType>& vec)
-        : oa(std::make_shared<output_vector_adapter<CharType>>(vec)) {}
+    template<typename AllocatorType = std::allocator<CharType>>
+    output_adapter(std::vector<CharType, AllocatorType>& vec)
+        : oa(std::make_shared<output_vector_adapter<CharType, AllocatorType>>(vec)) {}
 
+#ifndef JSON_NO_IO
     output_adapter(std::basic_ostream<CharType>& s)
         : oa(std::make_shared<output_stream_adapter<CharType>>(s)) {}
+#endif  // JSON_NO_IO
 
     output_adapter(StringType& s)
         : oa(std::make_shared<output_string_adapter<CharType, StringType>>(s)) {}
@@ -119,5 +142,6 @@ class output_adapter
   private:
     output_adapter_t<CharType> oa = nullptr;
 };
+
 }  // namespace detail
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
diff --git a/external_imported/json/include/nlohmann/detail/output/serializer.hpp b/external_imported/json/include/nlohmann/detail/output/serializer.hpp
index d9c8b22fe..ed20b0d9e 100644
--- a/external_imported/json/include/nlohmann/detail/output/serializer.hpp
+++ b/external_imported/json/include/nlohmann/detail/output/serializer.hpp
@@ -1,3 +1,12 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2008-2009 Björn Hoehrmann <bjoern@hoehrmann.de>
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 #pragma once
 
 #include <algorithm> // reverse, remove, fill, find, none_of
@@ -9,6 +18,7 @@
 #include <cstdio> // snprintf
 #include <limits> // numeric_limits
 #include <string> // string, char_traits
+#include <iomanip> // setfill, setw
 #include <type_traits> // is_same
 #include <utility> // move
 
@@ -18,12 +28,13 @@
 #include <nlohmann/detail/meta/cpp_future.hpp>
 #include <nlohmann/detail/output/binary_writer.hpp>
 #include <nlohmann/detail/output/output_adapters.hpp>
+#include <nlohmann/detail/string_concat.hpp>
 #include <nlohmann/detail/value_t.hpp>
 
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
+
 ///////////////////
 // serialization //
 ///////////////////
@@ -99,11 +110,11 @@ class serializer
               const unsigned int indent_step,
               const unsigned int current_indent = 0)
     {
-        switch (val.m_type)
+        switch (val.m_data.m_type)
         {
             case value_t::object:
             {
-                if (val.m_value.object->empty())
+                if (val.m_data.m_value.object->empty())
                 {
                     o->write_characters("{}", 2);
                     return;
@@ -121,8 +132,8 @@ class serializer
                     }
 
                     // first n-1 elements
-                    auto i = val.m_value.object->cbegin();
-                    for (std::size_t cnt = 0; cnt < val.m_value.object->size() - 1; ++cnt, ++i)
+                    auto i = val.m_data.m_value.object->cbegin();
+                    for (std::size_t cnt = 0; cnt < val.m_data.m_value.object->size() - 1; ++cnt, ++i)
                     {
                         o->write_characters(indent_string.c_str(), new_indent);
                         o->write_character('\"');
@@ -133,8 +144,8 @@ class serializer
                     }
 
                     // last element
-                    JSON_ASSERT(i != val.m_value.object->cend());
-                    JSON_ASSERT(std::next(i) == val.m_value.object->cend());
+                    JSON_ASSERT(i != val.m_data.m_value.object->cend());
+                    JSON_ASSERT(std::next(i) == val.m_data.m_value.object->cend());
                     o->write_characters(indent_string.c_str(), new_indent);
                     o->write_character('\"');
                     dump_escaped(i->first, ensure_ascii);
@@ -150,8 +161,8 @@ class serializer
                     o->write_character('{');
 
                     // first n-1 elements
-                    auto i = val.m_value.object->cbegin();
-                    for (std::size_t cnt = 0; cnt < val.m_value.object->size() - 1; ++cnt, ++i)
+                    auto i = val.m_data.m_value.object->cbegin();
+                    for (std::size_t cnt = 0; cnt < val.m_data.m_value.object->size() - 1; ++cnt, ++i)
                     {
                         o->write_character('\"');
                         dump_escaped(i->first, ensure_ascii);
@@ -161,8 +172,8 @@ class serializer
                     }
 
                     // last element
-                    JSON_ASSERT(i != val.m_value.object->cend());
-                    JSON_ASSERT(std::next(i) == val.m_value.object->cend());
+                    JSON_ASSERT(i != val.m_data.m_value.object->cend());
+                    JSON_ASSERT(std::next(i) == val.m_data.m_value.object->cend());
                     o->write_character('\"');
                     dump_escaped(i->first, ensure_ascii);
                     o->write_characters("\":", 2);
@@ -176,7 +187,7 @@ class serializer
 
             case value_t::array:
             {
-                if (val.m_value.array->empty())
+                if (val.m_data.m_value.array->empty())
                 {
                     o->write_characters("[]", 2);
                     return;
@@ -194,8 +205,8 @@ class serializer
                     }
 
                     // first n-1 elements
-                    for (auto i = val.m_value.array->cbegin();
-                            i != val.m_value.array->cend() - 1; ++i)
+                    for (auto i = val.m_data.m_value.array->cbegin();
+                            i != val.m_data.m_value.array->cend() - 1; ++i)
                     {
                         o->write_characters(indent_string.c_str(), new_indent);
                         dump(*i, true, ensure_ascii, indent_step, new_indent);
@@ -203,9 +214,9 @@ class serializer
                     }
 
                     // last element
-                    JSON_ASSERT(!val.m_value.array->empty());
+                    JSON_ASSERT(!val.m_data.m_value.array->empty());
                     o->write_characters(indent_string.c_str(), new_indent);
-                    dump(val.m_value.array->back(), true, ensure_ascii, indent_step, new_indent);
+                    dump(val.m_data.m_value.array->back(), true, ensure_ascii, indent_step, new_indent);
 
                     o->write_character('\n');
                     o->write_characters(indent_string.c_str(), current_indent);
@@ -216,16 +227,16 @@ class serializer
                     o->write_character('[');
 
                     // first n-1 elements
-                    for (auto i = val.m_value.array->cbegin();
-                            i != val.m_value.array->cend() - 1; ++i)
+                    for (auto i = val.m_data.m_value.array->cbegin();
+                            i != val.m_data.m_value.array->cend() - 1; ++i)
                     {
                         dump(*i, false, ensure_ascii, indent_step, current_indent);
                         o->write_character(',');
                     }
 
                     // last element
-                    JSON_ASSERT(!val.m_value.array->empty());
-                    dump(val.m_value.array->back(), false, ensure_ascii, indent_step, current_indent);
+                    JSON_ASSERT(!val.m_data.m_value.array->empty());
+                    dump(val.m_data.m_value.array->back(), false, ensure_ascii, indent_step, current_indent);
 
                     o->write_character(']');
                 }
@@ -236,7 +247,7 @@ class serializer
             case value_t::string:
             {
                 o->write_character('\"');
-                dump_escaped(*val.m_value.string, ensure_ascii);
+                dump_escaped(*val.m_data.m_value.string, ensure_ascii);
                 o->write_character('\"');
                 return;
             }
@@ -258,24 +269,24 @@ class serializer
 
                     o->write_characters("\"bytes\": [", 10);
 
-                    if (!val.m_value.binary->empty())
+                    if (!val.m_data.m_value.binary->empty())
                     {
-                        for (auto i = val.m_value.binary->cbegin();
-                                i != val.m_value.binary->cend() - 1; ++i)
+                        for (auto i = val.m_data.m_value.binary->cbegin();
+                                i != val.m_data.m_value.binary->cend() - 1; ++i)
                         {
                             dump_integer(*i);
                             o->write_characters(", ", 2);
                         }
-                        dump_integer(val.m_value.binary->back());
+                        dump_integer(val.m_data.m_value.binary->back());
                     }
 
                     o->write_characters("],\n", 3);
                     o->write_characters(indent_string.c_str(), new_indent);
 
                     o->write_characters("\"subtype\": ", 11);
-                    if (val.m_value.binary->has_subtype())
+                    if (val.m_data.m_value.binary->has_subtype())
                     {
-                        dump_integer(val.m_value.binary->subtype());
+                        dump_integer(val.m_data.m_value.binary->subtype());
                     }
                     else
                     {
@@ -289,21 +300,21 @@ class serializer
                 {
                     o->write_characters("{\"bytes\":[", 10);
 
-                    if (!val.m_value.binary->empty())
+                    if (!val.m_data.m_value.binary->empty())
                     {
-                        for (auto i = val.m_value.binary->cbegin();
-                                i != val.m_value.binary->cend() - 1; ++i)
+                        for (auto i = val.m_data.m_value.binary->cbegin();
+                                i != val.m_data.m_value.binary->cend() - 1; ++i)
                         {
                             dump_integer(*i);
                             o->write_character(',');
                         }
-                        dump_integer(val.m_value.binary->back());
+                        dump_integer(val.m_data.m_value.binary->back());
                     }
 
                     o->write_characters("],\"subtype\":", 12);
-                    if (val.m_value.binary->has_subtype())
+                    if (val.m_data.m_value.binary->has_subtype())
                     {
-                        dump_integer(val.m_value.binary->subtype());
+                        dump_integer(val.m_data.m_value.binary->subtype());
                         o->write_character('}');
                     }
                     else
@@ -316,7 +327,7 @@ class serializer
 
             case value_t::boolean:
             {
-                if (val.m_value.boolean)
+                if (val.m_data.m_value.boolean)
                 {
                     o->write_characters("true", 4);
                 }
@@ -329,19 +340,19 @@ class serializer
 
             case value_t::number_integer:
             {
-                dump_integer(val.m_value.number_integer);
+                dump_integer(val.m_data.m_value.number_integer);
                 return;
             }
 
             case value_t::number_unsigned:
             {
-                dump_integer(val.m_value.number_unsigned);
+                dump_integer(val.m_data.m_value.number_unsigned);
                 return;
             }
 
             case value_t::number_float:
             {
-                dump_float(val.m_value.number_float);
+                dump_float(val.m_data.m_value.number_float);
                 return;
             }
 
@@ -358,7 +369,7 @@ class serializer
             }
 
             default:            // LCOV_EXCL_LINE
-                JSON_ASSERT(false);  // LCOV_EXCL_LINE
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
         }
     }
 
@@ -379,7 +390,7 @@ class serializer
     */
     void dump_escaped(const string_t& s, const bool ensure_ascii)
     {
-        std::uint32_t codepoint;
+        std::uint32_t codepoint{};
         std::uint8_t state = UTF8_ACCEPT;
         std::size_t bytes = 0;  // number of bytes written to string_buffer
 
@@ -389,7 +400,7 @@ class serializer
 
         for (std::size_t i = 0; i < s.size(); ++i)
         {
-            const auto byte = static_cast<uint8_t>(s[i]);
+            const auto byte = static_cast<std::uint8_t>(s[i]);
 
             switch (decode(state, codepoint, byte))
             {
@@ -454,15 +465,17 @@ class serializer
                             {
                                 if (codepoint <= 0xFFFF)
                                 {
-                                    (std::snprintf)(string_buffer.data() + bytes, 7, "\\u%04x",
-                                                    static_cast<std::uint16_t>(codepoint));
+                                    // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+                                    static_cast<void>((std::snprintf)(string_buffer.data() + bytes, 7, "\\u%04x",
+                                                                      static_cast<std::uint16_t>(codepoint)));
                                     bytes += 6;
                                 }
                                 else
                                 {
-                                    (std::snprintf)(string_buffer.data() + bytes, 13, "\\u%04x\\u%04x",
-                                                    static_cast<std::uint16_t>(0xD7C0u + (codepoint >> 10u)),
-                                                    static_cast<std::uint16_t>(0xDC00u + (codepoint & 0x3FFu)));
+                                    // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+                                    static_cast<void>((std::snprintf)(string_buffer.data() + bytes, 13, "\\u%04x\\u%04x",
+                                                                      static_cast<std::uint16_t>(0xD7C0u + (codepoint >> 10u)),
+                                                                      static_cast<std::uint16_t>(0xDC00u + (codepoint & 0x3FFu))));
                                     bytes += 12;
                                 }
                             }
@@ -497,9 +510,7 @@ class serializer
                     {
                         case error_handler_t::strict:
                         {
-                            std::string sn(3, '\0');
-                            (std::snprintf)(&sn[0], sn.size(), "%.2X", byte);
-                            JSON_THROW(type_error::create(316, "invalid UTF-8 byte at index " + std::to_string(i) + ": 0x" + sn, BasicJsonType()));
+                            JSON_THROW(type_error::create(316, concat("invalid UTF-8 byte at index ", std::to_string(i), ": 0x", hex_bytes(byte | 0)), nullptr));
                         }
 
                         case error_handler_t::ignore:
@@ -557,7 +568,7 @@ class serializer
                         }
 
                         default:            // LCOV_EXCL_LINE
-                            JSON_ASSERT(false);  // LCOV_EXCL_LINE
+                            JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
                     }
                     break;
                 }
@@ -591,9 +602,7 @@ class serializer
             {
                 case error_handler_t::strict:
                 {
-                    std::string sn(3, '\0');
-                    (std::snprintf)(&sn[0], sn.size(), "%.2X", static_cast<std::uint8_t>(s.back()));
-                    JSON_THROW(type_error::create(316, "incomplete UTF-8 string; last byte: 0x" + sn, BasicJsonType()));
+                    JSON_THROW(type_error::create(316, concat("incomplete UTF-8 string; last byte: 0x", hex_bytes(static_cast<std::uint8_t>(s.back() | 0))), nullptr));
                 }
 
                 case error_handler_t::ignore:
@@ -620,7 +629,7 @@ class serializer
                 }
 
                 default:            // LCOV_EXCL_LINE
-                    JSON_ASSERT(false);  // LCOV_EXCL_LINE
+                    JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
             }
         }
     }
@@ -660,6 +669,33 @@ class serializer
         }
     }
 
+    /*!
+     * @brief convert a byte to a uppercase hex representation
+     * @param[in] byte byte to represent
+     * @return representation ("00".."FF")
+     */
+    static std::string hex_bytes(std::uint8_t byte)
+    {
+        std::string result = "FF";
+        constexpr const char* nibble_to_hex = "0123456789ABCDEF";
+        result[0] = nibble_to_hex[byte / 16];
+        result[1] = nibble_to_hex[byte % 16];
+        return result;
+    }
+
+    // templates to avoid warnings about useless casts
+    template <typename NumberType, enable_if_t<std::is_signed<NumberType>::value, int> = 0>
+    bool is_negative_number(NumberType x)
+    {
+        return x < 0;
+    }
+
+    template < typename NumberType, enable_if_t <std::is_unsigned<NumberType>::value, int > = 0 >
+    bool is_negative_number(NumberType /*unused*/)
+    {
+        return false;
+    }
+
     /*!
     @brief dump an integer
 
@@ -670,6 +706,7 @@ class serializer
     @tparam NumberType either @a number_integer_t or @a number_unsigned_t
     */
     template < typename NumberType, detail::enable_if_t <
+                   std::is_integral<NumberType>::value ||
                    std::is_same<NumberType, number_unsigned_t>::value ||
                    std::is_same<NumberType, number_integer_t>::value ||
                    std::is_same<NumberType, binary_char_t>::value,
@@ -700,14 +737,13 @@ class serializer
         }
 
         // use a pointer to fill the buffer
-        auto buffer_ptr = number_buffer.begin();
+        auto buffer_ptr = number_buffer.begin(); // NOLINT(llvm-qualified-auto,readability-qualified-auto,cppcoreguidelines-pro-type-vararg,hicpp-vararg)
 
-        const bool is_negative = std::is_same<NumberType, number_integer_t>::value && !(x >= 0); // see issue #755
         number_unsigned_t abs_value;
 
-        unsigned int n_chars;
+        unsigned int n_chars{};
 
-        if (is_negative)
+        if (is_negative_number(x))
         {
             *buffer_ptr = '-';
             abs_value = remove_sign(static_cast<number_integer_t>(x));
@@ -724,7 +760,7 @@ class serializer
         // spare 1 byte for '\0'
         JSON_ASSERT(n_chars < number_buffer.size() - 1);
 
-        // jump to the end to generate the string from backward
+        // jump to the end to generate the string from backward,
         // so we later avoid reversing the result
         buffer_ptr += n_chars;
 
@@ -783,8 +819,8 @@ class serializer
 
     void dump_float(number_float_t x, std::true_type /*is_ieee_single_or_double*/)
     {
-        char* begin = number_buffer.data();
-        char* end = ::nlohmann::detail::to_chars(begin, begin + number_buffer.size(), x);
+        auto* begin = number_buffer.data();
+        auto* end = ::nlohmann::detail::to_chars(begin, begin + number_buffer.size(), x);
 
         o->write_characters(begin, static_cast<size_t>(end - begin));
     }
@@ -795,6 +831,7 @@ class serializer
         static constexpr auto d = std::numeric_limits<number_float_t>::max_digits10;
 
         // the actual conversion
+        // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
         std::ptrdiff_t len = (std::snprintf)(number_buffer.data(), number_buffer.size(), "%.*g", d, x);
 
         // negative value indicates an error
@@ -805,8 +842,8 @@ class serializer
         // erase thousands separator
         if (thousands_sep != '\0')
         {
-            const auto end = std::remove(number_buffer.begin(),
-                                         number_buffer.begin() + len, thousands_sep);
+            // NOLINTNEXTLINE(readability-qualified-auto,llvm-qualified-auto): std::remove returns an iterator, see https://github.com/nlohmann/json/issues/3081
+            const auto end = std::remove(number_buffer.begin(), number_buffer.begin() + len, thousands_sep);
             std::fill(end, number_buffer.end(), '\0');
             JSON_ASSERT((end - number_buffer.begin()) <= len);
             len = (end - number_buffer.begin());
@@ -815,6 +852,7 @@ class serializer
         // convert decimal point to '.'
         if (decimal_point != '\0' && decimal_point != '.')
         {
+            // NOLINTNEXTLINE(readability-qualified-auto,llvm-qualified-auto): std::find returns an iterator, see https://github.com/nlohmann/json/issues/3081
             const auto dec_pos = std::find(number_buffer.begin(), number_buffer.end(), decimal_point);
             if (dec_pos != number_buffer.end())
             {
@@ -824,7 +862,7 @@ class serializer
 
         o->write_characters(number_buffer.data(), static_cast<std::size_t>(len));
 
-        // determine if need to append ".0"
+        // determine if we need to append ".0"
         const bool value_is_int_like =
             std::none_of(number_buffer.begin(), number_buffer.begin() + len + 1,
                          [](char c)
@@ -888,8 +926,8 @@ class serializer
                 ? (byte & 0x3fu) | (codep << 6u)
                 : (0xFFu >> type) & (byte);
 
-        std::size_t index = 256u + static_cast<size_t>(state) * 16u + static_cast<size_t>(type);
-        JSON_ASSERT(index < 400);
+        const std::size_t index = 256u + static_cast<size_t>(state) * 16u + static_cast<size_t>(type);
+        JSON_ASSERT(index < utf8d.size());
         state = utf8d[index];
         return state;
     }
@@ -901,7 +939,7 @@ class serializer
      */
     number_unsigned_t remove_sign(number_unsigned_t x)
     {
-        JSON_ASSERT(false); // LCOV_EXCL_LINE
+        JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
         return x; // LCOV_EXCL_LINE
     }
 
@@ -916,7 +954,7 @@ class serializer
      */
     inline number_unsigned_t remove_sign(number_integer_t x) noexcept
     {
-        JSON_ASSERT(x < 0 && x < (std::numeric_limits<number_integer_t>::max)());
+        JSON_ASSERT(x < 0 && x < (std::numeric_limits<number_integer_t>::max)()); // NOLINT(misc-redundant-expression)
         return static_cast<number_unsigned_t>(-(x + 1)) + 1;
     }
 
@@ -945,5 +983,6 @@ class serializer
     /// error_handler how to react on decoding errors
     const error_handler_t error_handler;
 };
+
 }  // namespace detail
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
diff --git a/external_imported/json/include/nlohmann/detail/string_concat.hpp b/external_imported/json/include/nlohmann/detail/string_concat.hpp
new file mode 100644
index 000000000..f49e8d215
--- /dev/null
+++ b/external_imported/json/include/nlohmann/detail/string_concat.hpp
@@ -0,0 +1,146 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#pragma once
+
+#include <cstring> // strlen
+#include <string> // string
+#include <utility> // forward
+
+#include <nlohmann/detail/meta/cpp_future.hpp>
+#include <nlohmann/detail/meta/detected.hpp>
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+inline std::size_t concat_length()
+{
+    return 0;
+}
+
+template<typename... Args>
+inline std::size_t concat_length(const char* cstr, const Args& ... rest);
+
+template<typename StringType, typename... Args>
+inline std::size_t concat_length(const StringType& str, const Args& ... rest);
+
+template<typename... Args>
+inline std::size_t concat_length(const char /*c*/, const Args& ... rest)
+{
+    return 1 + concat_length(rest...);
+}
+
+template<typename... Args>
+inline std::size_t concat_length(const char* cstr, const Args& ... rest)
+{
+    // cppcheck-suppress ignoredReturnValue
+    return ::strlen(cstr) + concat_length(rest...);
+}
+
+template<typename StringType, typename... Args>
+inline std::size_t concat_length(const StringType& str, const Args& ... rest)
+{
+    return str.size() + concat_length(rest...);
+}
+
+template<typename OutStringType>
+inline void concat_into(OutStringType& /*out*/)
+{}
+
+template<typename StringType, typename Arg>
+using string_can_append = decltype(std::declval<StringType&>().append(std::declval < Arg && > ()));
+
+template<typename StringType, typename Arg>
+using detect_string_can_append = is_detected<string_can_append, StringType, Arg>;
+
+template<typename StringType, typename Arg>
+using string_can_append_op = decltype(std::declval<StringType&>() += std::declval < Arg && > ());
+
+template<typename StringType, typename Arg>
+using detect_string_can_append_op = is_detected<string_can_append_op, StringType, Arg>;
+
+template<typename StringType, typename Arg>
+using string_can_append_iter = decltype(std::declval<StringType&>().append(std::declval<const Arg&>().begin(), std::declval<const Arg&>().end()));
+
+template<typename StringType, typename Arg>
+using detect_string_can_append_iter = is_detected<string_can_append_iter, StringType, Arg>;
+
+template<typename StringType, typename Arg>
+using string_can_append_data = decltype(std::declval<StringType&>().append(std::declval<const Arg&>().data(), std::declval<const Arg&>().size()));
+
+template<typename StringType, typename Arg>
+using detect_string_can_append_data = is_detected<string_can_append_data, StringType, Arg>;
+
+template < typename OutStringType, typename Arg, typename... Args,
+           enable_if_t < !detect_string_can_append<OutStringType, Arg>::value
+                         && detect_string_can_append_op<OutStringType, Arg>::value, int > = 0 >
+inline void concat_into(OutStringType& out, Arg && arg, Args && ... rest);
+
+template < typename OutStringType, typename Arg, typename... Args,
+           enable_if_t < !detect_string_can_append<OutStringType, Arg>::value
+                         && !detect_string_can_append_op<OutStringType, Arg>::value
+                         && detect_string_can_append_iter<OutStringType, Arg>::value, int > = 0 >
+inline void concat_into(OutStringType& out, const Arg& arg, Args && ... rest);
+
+template < typename OutStringType, typename Arg, typename... Args,
+           enable_if_t < !detect_string_can_append<OutStringType, Arg>::value
+                         && !detect_string_can_append_op<OutStringType, Arg>::value
+                         && !detect_string_can_append_iter<OutStringType, Arg>::value
+                         && detect_string_can_append_data<OutStringType, Arg>::value, int > = 0 >
+inline void concat_into(OutStringType& out, const Arg& arg, Args && ... rest);
+
+template<typename OutStringType, typename Arg, typename... Args,
+         enable_if_t<detect_string_can_append<OutStringType, Arg>::value, int> = 0>
+inline void concat_into(OutStringType& out, Arg && arg, Args && ... rest)
+{
+    out.append(std::forward<Arg>(arg));
+    concat_into(out, std::forward<Args>(rest)...);
+}
+
+template < typename OutStringType, typename Arg, typename... Args,
+           enable_if_t < !detect_string_can_append<OutStringType, Arg>::value
+                         && detect_string_can_append_op<OutStringType, Arg>::value, int > >
+inline void concat_into(OutStringType& out, Arg&& arg, Args&& ... rest)
+{
+    out += std::forward<Arg>(arg);
+    concat_into(out, std::forward<Args>(rest)...);
+}
+
+template < typename OutStringType, typename Arg, typename... Args,
+           enable_if_t < !detect_string_can_append<OutStringType, Arg>::value
+                         && !detect_string_can_append_op<OutStringType, Arg>::value
+                         && detect_string_can_append_iter<OutStringType, Arg>::value, int > >
+inline void concat_into(OutStringType& out, const Arg& arg, Args&& ... rest)
+{
+    out.append(arg.begin(), arg.end());
+    concat_into(out, std::forward<Args>(rest)...);
+}
+
+template < typename OutStringType, typename Arg, typename... Args,
+           enable_if_t < !detect_string_can_append<OutStringType, Arg>::value
+                         && !detect_string_can_append_op<OutStringType, Arg>::value
+                         && !detect_string_can_append_iter<OutStringType, Arg>::value
+                         && detect_string_can_append_data<OutStringType, Arg>::value, int > >
+inline void concat_into(OutStringType& out, const Arg& arg, Args&& ... rest)
+{
+    out.append(arg.data(), arg.size());
+    concat_into(out, std::forward<Args>(rest)...);
+}
+
+template<typename OutStringType = std::string, typename... Args>
+inline OutStringType concat(Args && ... args)
+{
+    OutStringType str;
+    str.reserve(concat_length(args...));
+    concat_into(str, std::forward<Args>(args)...);
+    return str;
+}
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
diff --git a/external_imported/json/include/nlohmann/detail/string_escape.hpp b/external_imported/json/include/nlohmann/detail/string_escape.hpp
index 84f7da52e..7f1b5c562 100644
--- a/external_imported/json/include/nlohmann/detail/string_escape.hpp
+++ b/external_imported/json/include/nlohmann/detail/string_escape.hpp
@@ -1,10 +1,16 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 #pragma once
 
-#include <string>
-#include <nlohmann/detail/macro_scope.hpp>
+#include <nlohmann/detail/abi_macros.hpp>
 
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
 
@@ -21,12 +27,13 @@ enforced with an assertion.**
 
 @since version 2.0.0
 */
-inline void replace_substring(std::string& s, const std::string& f,
-                              const std::string& t)
+template<typename StringType>
+inline void replace_substring(StringType& s, const StringType& f,
+                              const StringType& t)
 {
     JSON_ASSERT(!f.empty());
     for (auto pos = s.find(f);                // find first occurrence of f
-            pos != std::string::npos;         // make sure f was found
+            pos != StringType::npos;          // make sure f was found
             s.replace(pos, f.size(), t),      // replace with t, and
             pos = s.find(f, pos + t.size()))  // find next occurrence of f
     {}
@@ -39,10 +46,11 @@ inline void replace_substring(std::string& s, const std::string& f,
  *
  * Note the order of escaping "~" to "~0" and "/" to "~1" is important.
  */
-inline std::string escape(std::string s)
+template<typename StringType>
+inline StringType escape(StringType s)
 {
-    replace_substring(s, "~", "~0");
-    replace_substring(s, "/", "~1");
+    replace_substring(s, StringType{"~"}, StringType{"~0"});
+    replace_substring(s, StringType{"/"}, StringType{"~1"});
     return s;
 }
 
@@ -53,11 +61,12 @@ inline std::string escape(std::string s)
  *
  * Note the order of escaping "~1" to "/" and "~0" to "~" is important.
  */
-static void unescape(std::string& s)
+template<typename StringType>
+static void unescape(StringType& s)
 {
-    replace_substring(s, "~1", "/");
-    replace_substring(s, "~0", "~");
+    replace_substring(s, StringType{"~1"}, StringType{"/"});
+    replace_substring(s, StringType{"~0"}, StringType{"~"});
 }
 
-} // namespace detail
-} // namespace nlohmann
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
diff --git a/external_imported/json/include/nlohmann/detail/value_t.hpp b/external_imported/json/include/nlohmann/detail/value_t.hpp
index a98c4355a..07688fe8c 100644
--- a/external_imported/json/include/nlohmann/detail/value_t.hpp
+++ b/external_imported/json/include/nlohmann/detail/value_t.hpp
@@ -1,3 +1,11 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 #pragma once
 
 #include <array> // array
@@ -5,10 +13,15 @@
 #include <cstdint> // uint8_t
 #include <string> // string
 
-namespace nlohmann
-{
+#include <nlohmann/detail/macro_scope.hpp>
+#if JSON_HAS_THREE_WAY_COMPARISON
+    #include <compare> // partial_ordering
+#endif
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
+
 ///////////////////////////
 // JSON type enumeration //
 ///////////////////////////
@@ -64,7 +77,11 @@ Returns an ordering that is similar to Python:
 
 @since version 1.0.0
 */
-inline bool operator<(const value_t lhs, const value_t rhs) noexcept
+#if JSON_HAS_THREE_WAY_COMPARISON
+    inline std::partial_ordering operator<=>(const value_t lhs, const value_t rhs) noexcept // *NOPAD*
+#else
+    inline bool operator<(const value_t lhs, const value_t rhs) noexcept
+#endif
 {
     static constexpr std::array<std::uint8_t, 9> order = {{
             0 /* null */, 3 /* object */, 4 /* array */, 5 /* string */,
@@ -75,7 +92,27 @@ inline bool operator<(const value_t lhs, const value_t rhs) noexcept
 
     const auto l_index = static_cast<std::size_t>(lhs);
     const auto r_index = static_cast<std::size_t>(rhs);
+#if JSON_HAS_THREE_WAY_COMPARISON
+    if (l_index < order.size() && r_index < order.size())
+    {
+        return order[l_index] <=> order[r_index]; // *NOPAD*
+    }
+    return std::partial_ordering::unordered;
+#else
     return l_index < order.size() && r_index < order.size() && order[l_index] < order[r_index];
+#endif
 }
+
+// GCC selects the built-in operator< over an operator rewritten from
+// a user-defined spaceship operator
+// Clang, MSVC, and ICC select the rewritten candidate
+// (see GCC bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105200)
+#if JSON_HAS_THREE_WAY_COMPARISON && defined(__GNUC__)
+inline bool operator<(const value_t lhs, const value_t rhs) noexcept
+{
+    return std::is_lt(lhs <=> rhs); // *NOPAD*
+}
+#endif
+
 }  // namespace detail
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
diff --git a/external_imported/json/include/nlohmann/json.hpp b/external_imported/json/include/nlohmann/json.hpp
index 7b44c0ea3..95d6bf1dd 100644
--- a/external_imported/json/include/nlohmann/json.hpp
+++ b/external_imported/json/include/nlohmann/json.hpp
@@ -1,47 +1,32 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+/****************************************************************************\
+ * Note on documentation: The source files contain links to the online      *
+ * documentation of the public API at https://json.nlohmann.me. This URL    *
+ * contains the most recent documentation and should also be applicable to  *
+ * previous versions; documentation for deprecated functions is not         *
+ * removed, but marked deprecated. See "Generate documentation" section in  *
+ * file docs/README.md.                                                     *
+\****************************************************************************/
 
 #ifndef INCLUDE_NLOHMANN_JSON_HPP_
 #define INCLUDE_NLOHMANN_JSON_HPP_
 
-#define NLOHMANN_JSON_VERSION_MAJOR 3
-#define NLOHMANN_JSON_VERSION_MINOR 9
-#define NLOHMANN_JSON_VERSION_PATCH 1
-
 #include <algorithm> // all_of, find, for_each
 #include <cstddef> // nullptr_t, ptrdiff_t, size_t
 #include <functional> // hash, less
 #include <initializer_list> // initializer_list
-#include <iosfwd> // istream, ostream
+#ifndef JSON_NO_IO
+    #include <iosfwd> // istream, ostream
+#endif  // JSON_NO_IO
 #include <iterator> // random_access_iterator_tag
 #include <memory> // unique_ptr
-#include <numeric> // accumulate
 #include <string> // string, stoi, to_string
 #include <utility> // declval, forward, move, pair, swap
 #include <vector> // vector
@@ -61,9 +46,12 @@ SOFTWARE.
 #include <nlohmann/detail/iterators/iteration_proxy.hpp>
 #include <nlohmann/detail/iterators/json_reverse_iterator.hpp>
 #include <nlohmann/detail/iterators/primitive_iterator.hpp>
+#include <nlohmann/detail/json_custom_base_class.hpp>
 #include <nlohmann/detail/json_pointer.hpp>
 #include <nlohmann/detail/json_ref.hpp>
 #include <nlohmann/detail/macro_scope.hpp>
+#include <nlohmann/detail/string_concat.hpp>
+#include <nlohmann/detail/string_escape.hpp>
 #include <nlohmann/detail/meta/cpp_future.hpp>
 #include <nlohmann/detail/meta/type_traits.hpp>
 #include <nlohmann/detail/output/binary_writer.hpp>
@@ -74,6 +62,9 @@ SOFTWARE.
 #include <nlohmann/ordered_map.hpp>
 
 #if defined(JSON_HAS_CPP_17)
+    #if JSON_HAS_STATIC_RTTI
+        #include <any>
+    #endif
     #include <string_view>
 #endif
 
@@ -82,75 +73,12 @@ SOFTWARE.
 @see https://github.com/nlohmann
 @since version 1.0.0
 */
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 
 /*!
 @brief a class to store JSON values
 
-@tparam ObjectType type for JSON objects (`std::map` by default; will be used
-in @ref object_t)
-@tparam ArrayType type for JSON arrays (`std::vector` by default; will be used
-in @ref array_t)
-@tparam StringType type for JSON strings and object keys (`std::string` by
-default; will be used in @ref string_t)
-@tparam BooleanType type for JSON booleans (`bool` by default; will be used
-in @ref boolean_t)
-@tparam NumberIntegerType type for JSON integer numbers (`int64_t` by
-default; will be used in @ref number_integer_t)
-@tparam NumberUnsignedType type for JSON unsigned integer numbers (@c
-`uint64_t` by default; will be used in @ref number_unsigned_t)
-@tparam NumberFloatType type for JSON floating-point numbers (`double` by
-default; will be used in @ref number_float_t)
-@tparam BinaryType type for packed binary data for compatibility with binary
-serialization formats (`std::vector<std::uint8_t>` by default; will be used in
-@ref binary_t)
-@tparam AllocatorType type of the allocator to use (`std::allocator` by
-default)
-@tparam JSONSerializer the serializer to resolve internal calls to `to_json()`
-and `from_json()` (@ref adl_serializer by default)
-
-@requirement The class satisfies the following concept requirements:
-- Basic
- - [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible):
-   JSON values can be default constructed. The result will be a JSON null
-   value.
- - [MoveConstructible](https://en.cppreference.com/w/cpp/named_req/MoveConstructible):
-   A JSON value can be constructed from an rvalue argument.
- - [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible):
-   A JSON value can be copy-constructed from an lvalue expression.
- - [MoveAssignable](https://en.cppreference.com/w/cpp/named_req/MoveAssignable):
-   A JSON value van be assigned from an rvalue argument.
- - [CopyAssignable](https://en.cppreference.com/w/cpp/named_req/CopyAssignable):
-   A JSON value can be copy-assigned from an lvalue expression.
- - [Destructible](https://en.cppreference.com/w/cpp/named_req/Destructible):
-   JSON values can be destructed.
-- Layout
- - [StandardLayoutType](https://en.cppreference.com/w/cpp/named_req/StandardLayoutType):
-   JSON values have
-   [standard layout](https://en.cppreference.com/w/cpp/language/data_members#Standard_layout):
-   All non-static data members are private and standard layout types, the
-   class has no virtual functions or (virtual) base classes.
-- Library-wide
- - [EqualityComparable](https://en.cppreference.com/w/cpp/named_req/EqualityComparable):
-   JSON values can be compared with `==`, see @ref
-   operator==(const_reference,const_reference).
- - [LessThanComparable](https://en.cppreference.com/w/cpp/named_req/LessThanComparable):
-   JSON values can be compared with `<`, see @ref
-   operator<(const_reference,const_reference).
- - [Swappable](https://en.cppreference.com/w/cpp/named_req/Swappable):
-   Any JSON lvalue or rvalue of can be swapped with any lvalue or rvalue of
-   other compatible types, using unqualified function call @ref swap().
- - [NullablePointer](https://en.cppreference.com/w/cpp/named_req/NullablePointer):
-   JSON values can be compared against `std::nullptr_t` objects which are used
-   to model the `null` value.
-- Container
- - [Container](https://en.cppreference.com/w/cpp/named_req/Container):
-   JSON values can be used like STL containers and provide iterator access.
- - [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer);
-   JSON values can be used like STL containers and provide reverse iterator
-   access.
-
+@internal
 @invariant The member variables @a m_value and @a m_type have the following
 relationship:
 - If `m_type == value_t::object`, then `m_value.object != nullptr`.
@@ -158,23 +86,24 @@ and `from_json()` (@ref adl_serializer by default)
 - If `m_type == value_t::string`, then `m_value.string != nullptr`.
 The invariants are checked by member function assert_invariant().
 
-@internal
 @note ObjectType trick from https://stackoverflow.com/a/9860911
 @endinternal
 
-@see [RFC 7159: The JavaScript Object Notation (JSON) Data Interchange
-Format](http://rfc7159.net/rfc7159)
-
 @since version 1.0.0
 
 @nosubgrouping
 */
 NLOHMANN_BASIC_JSON_TPL_DECLARATION
-class basic_json
+class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-special-member-functions)
+    : public ::nlohmann::detail::json_base_class<CustomBaseClass>
 {
   private:
     template<detail::value_t> friend struct detail::external_constructor;
-    friend ::nlohmann::json_pointer<basic_json>;
+
+    template<typename>
+    friend class ::nlohmann::json_pointer;
+    // can be restored when json_pointer backwards compatibility is removed
+    // friend ::nlohmann::json_pointer<StringType>;
 
     template<typename BasicJsonType, typename InputType>
     friend class ::nlohmann::detail::parser;
@@ -193,6 +122,7 @@ class basic_json
 
     /// workaround type for MSVC
     using basic_json_t = NLOHMANN_BASIC_JSON_TPL;
+    using json_base_class_t = ::nlohmann::detail::json_base_class<CustomBaseClass>;
 
   JSON_PRIVATE_UNLESS_TESTED:
     // convenience aliases for types residing in namespace detail;
@@ -233,7 +163,7 @@ class basic_json
   public:
     using value_t = detail::value_t;
     /// JSON Pointer, see @ref nlohmann::json_pointer
-    using json_pointer = ::nlohmann::json_pointer<basic_json>;
+    using json_pointer = ::nlohmann::json_pointer<StringType>;
     template<typename T, typename SFINAE>
     using json_serializer = JSONSerializer<T, SFINAE>;
     /// how to treat decoding errors
@@ -255,22 +185,15 @@ class basic_json
     /// Classes to implement user-defined exceptions.
     /// @{
 
-    /// @copydoc detail::exception
     using exception = detail::exception;
-    /// @copydoc detail::parse_error
     using parse_error = detail::parse_error;
-    /// @copydoc detail::invalid_iterator
     using invalid_iterator = detail::invalid_iterator;
-    /// @copydoc detail::type_error
     using type_error = detail::type_error;
-    /// @copydoc detail::out_of_range
     using out_of_range = detail::out_of_range;
-    /// @copydoc detail::other_error
     using other_error = detail::other_error;
 
     /// @}
 
-
     /////////////////////
     // container types //
     /////////////////////
@@ -312,53 +235,27 @@ class basic_json
 
     /// @}
 
-
-    /*!
-    @brief returns the allocator associated with the container
-    */
+    /// @brief returns the allocator associated with the container
+    /// @sa https://json.nlohmann.me/api/basic_json/get_allocator/
     static allocator_type get_allocator()
     {
         return allocator_type();
     }
 
-    /*!
-    @brief returns version information on the library
-
-    This function returns a JSON object with information about the library,
-    including the version number and information on the platform and compiler.
-
-    @return JSON object holding version information
-    key         | description
-    ----------- | ---------------
-    `compiler`  | Information on the used compiler. It is an object with the following keys: `c++` (the used C++ standard), `family` (the compiler family; possible values are `clang`, `icc`, `gcc`, `ilecpp`, `msvc`, `pgcpp`, `sunpro`, and `unknown`), and `version` (the compiler version).
-    `copyright` | The copyright line for the library as string.
-    `name`      | The name of the library as string.
-    `platform`  | The used platform as string. Possible values are `win32`, `linux`, `apple`, `unix`, and `unknown`.
-    `url`       | The URL of the project as string.
-    `version`   | The version of the library. It is an object with the following keys: `major`, `minor`, and `patch` as defined by [Semantic Versioning](http://semver.org), and `string` (the version string).
-
-    @liveexample{The following code shows an example output of the `meta()`
-    function.,meta}
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes to any JSON value.
-
-    @complexity Constant.
-
-    @since 2.1.0
-    */
+    /// @brief returns version information on the library
+    /// @sa https://json.nlohmann.me/api/basic_json/meta/
     JSON_HEDLEY_WARN_UNUSED_RESULT
     static basic_json meta()
     {
         basic_json result;
 
-        result["copyright"] = "(C) 2013-2021 Niels Lohmann";
+        result["copyright"] = "(C) 2013-2023 Niels Lohmann";
         result["name"] = "JSON for Modern C++";
         result["url"] = "https://github.com/nlohmann/json";
         result["version"]["string"] =
-            std::to_string(NLOHMANN_JSON_VERSION_MAJOR) + "." +
-            std::to_string(NLOHMANN_JSON_VERSION_MINOR) + "." +
-            std::to_string(NLOHMANN_JSON_VERSION_PATCH);
+            detail::concat(std::to_string(NLOHMANN_JSON_VERSION_MAJOR), '.',
+                           std::to_string(NLOHMANN_JSON_VERSION_MINOR), '.',
+                           std::to_string(NLOHMANN_JSON_VERSION_PATCH));
         result["version"]["major"] = NLOHMANN_JSON_VERSION_MAJOR;
         result["version"]["minor"] = NLOHMANN_JSON_VERSION_MINOR;
         result["version"]["patch"] = NLOHMANN_JSON_VERSION_PATCH;
@@ -380,7 +277,12 @@ class basic_json
 #elif defined(__clang__)
         result["compiler"] = {{"family", "clang"}, {"version", __clang_version__}};
 #elif defined(__GNUC__) || defined(__GNUG__)
-        result["compiler"] = {{"family", "gcc"}, {"version", std::to_string(__GNUC__) + "." + std::to_string(__GNUC_MINOR__) + "." + std::to_string(__GNUC_PATCHLEVEL__)}};
+        result["compiler"] = {{"family", "gcc"}, {"version", detail::concat(
+                    std::to_string(__GNUC__), '.',
+                    std::to_string(__GNUC_MINOR__), '.',
+                    std::to_string(__GNUC_PATCHLEVEL__))
+            }
+        };
 #elif defined(__HP_cc) || defined(__HP_aCC)
         result["compiler"] = "hp"
 #elif defined(__IBMCPP__)
@@ -395,7 +297,9 @@ class basic_json
         result["compiler"] = {{"family", "unknown"}, {"version", "unknown"}};
 #endif
 
-#ifdef __cplusplus
+#if defined(_MSVC_LANG)
+        result["compiler"]["c++"] = std::to_string(_MSVC_LANG);
+#elif defined(__cplusplus)
         result["compiler"]["c++"] = std::to_string(__cplusplus);
 #else
         result["compiler"]["c++"] = "unknown";
@@ -403,7 +307,6 @@ class basic_json
         return result;
     }
 
-
     ///////////////////////////
     // JSON value data types //
     ///////////////////////////
@@ -413,509 +316,58 @@ class basic_json
     /// the template arguments passed to class @ref basic_json.
     /// @{
 
+    /// @brief default object key comparator type
+    /// The actual object key comparator type (@ref object_comparator_t) may be
+    /// different.
+    /// @sa https://json.nlohmann.me/api/basic_json/default_object_comparator_t/
 #if defined(JSON_HAS_CPP_14)
-    // Use transparent comparator if possible, combined with perfect forwarding
-    // on find() and count() calls prevents unnecessary string construction.
-    using object_comparator_t = std::less<>;
+    // use of transparent comparator avoids unnecessary repeated construction of temporaries
+    // in functions involving lookup by key with types other than object_t::key_type (aka. StringType)
+    using default_object_comparator_t = std::less<>;
 #else
-    using object_comparator_t = std::less<StringType>;
+    using default_object_comparator_t = std::less<StringType>;
 #endif
 
-    /*!
-    @brief a type for an object
-
-    [RFC 7159](http://rfc7159.net/rfc7159) describes JSON objects as follows:
-    > An object is an unordered collection of zero or more name/value pairs,
-    > where a name is a string and a value is a string, number, boolean, null,
-    > object, or array.
-
-    To store objects in C++, a type is defined by the template parameters
-    described below.
-
-    @tparam ObjectType  the container to store objects (e.g., `std::map` or
-    `std::unordered_map`)
-    @tparam StringType the type of the keys or names (e.g., `std::string`).
-    The comparison function `std::less<StringType>` is used to order elements
-    inside the container.
-    @tparam AllocatorType the allocator to use for objects (e.g.,
-    `std::allocator`)
-
-    #### Default type
-
-    With the default values for @a ObjectType (`std::map`), @a StringType
-    (`std::string`), and @a AllocatorType (`std::allocator`), the default
-    value for @a object_t is:
-
-    @code {.cpp}
-    std::map<
-      std::string, // key_type
-      basic_json, // value_type
-      std::less<std::string>, // key_compare
-      std::allocator<std::pair<const std::string, basic_json>> // allocator_type
-    >
-    @endcode
-
-    #### Behavior
-
-    The choice of @a object_t influences the behavior of the JSON class. With
-    the default type, objects have the following behavior:
-
-    - When all names are unique, objects will be interoperable in the sense
-      that all software implementations receiving that object will agree on
-      the name-value mappings.
-    - When the names within an object are not unique, it is unspecified which
-      one of the values for a given key will be chosen. For instance,
-      `{"key": 2, "key": 1}` could be equal to either `{"key": 1}` or
-      `{"key": 2}`.
-    - Internally, name/value pairs are stored in lexicographical order of the
-      names. Objects will also be serialized (see @ref dump) in this order.
-      For instance, `{"b": 1, "a": 2}` and `{"a": 2, "b": 1}` will be stored
-      and serialized as `{"a": 2, "b": 1}`.
-    - When comparing objects, the order of the name/value pairs is irrelevant.
-      This makes objects interoperable in the sense that they will not be
-      affected by these differences. For instance, `{"b": 1, "a": 2}` and
-      `{"a": 2, "b": 1}` will be treated as equal.
-
-    #### Limits
-
-    [RFC 7159](http://rfc7159.net/rfc7159) specifies:
-    > An implementation may set limits on the maximum depth of nesting.
-
-    In this class, the object's limit of nesting is not explicitly constrained.
-    However, a maximum depth of nesting may be introduced by the compiler or
-    runtime environment. A theoretical limit can be queried by calling the
-    @ref max_size function of a JSON object.
-
-    #### Storage
-
-    Objects are stored as pointers in a @ref basic_json type. That is, for any
-    access to object values, a pointer of type `object_t*` must be
-    dereferenced.
-
-    @sa @ref array_t -- type for an array value
-
-    @since version 1.0.0
-
-    @note The order name/value pairs are added to the object is *not*
-    preserved by the library. Therefore, iterating an object may return
-    name/value pairs in a different order than they were originally stored. In
-    fact, keys will be traversed in alphabetical order as `std::map` with
-    `std::less` is used by default. Please note this behavior conforms to [RFC
-    7159](http://rfc7159.net/rfc7159), because any order implements the
-    specified "unordered" nature of JSON objects.
-    */
+    /// @brief a type for an object
+    /// @sa https://json.nlohmann.me/api/basic_json/object_t/
     using object_t = ObjectType<StringType,
           basic_json,
-          object_comparator_t,
+          default_object_comparator_t,
           AllocatorType<std::pair<const StringType,
           basic_json>>>;
 
-    /*!
-    @brief a type for an array
-
-    [RFC 7159](http://rfc7159.net/rfc7159) describes JSON arrays as follows:
-    > An array is an ordered sequence of zero or more values.
-
-    To store objects in C++, a type is defined by the template parameters
-    explained below.
-
-    @tparam ArrayType  container type to store arrays (e.g., `std::vector` or
-    `std::list`)
-    @tparam AllocatorType allocator to use for arrays (e.g., `std::allocator`)
-
-    #### Default type
-
-    With the default values for @a ArrayType (`std::vector`) and @a
-    AllocatorType (`std::allocator`), the default value for @a array_t is:
-
-    @code {.cpp}
-    std::vector<
-      basic_json, // value_type
-      std::allocator<basic_json> // allocator_type
-    >
-    @endcode
-
-    #### Limits
-
-    [RFC 7159](http://rfc7159.net/rfc7159) specifies:
-    > An implementation may set limits on the maximum depth of nesting.
-
-    In this class, the array's limit of nesting is not explicitly constrained.
-    However, a maximum depth of nesting may be introduced by the compiler or
-    runtime environment. A theoretical limit can be queried by calling the
-    @ref max_size function of a JSON array.
-
-    #### Storage
-
-    Arrays are stored as pointers in a @ref basic_json type. That is, for any
-    access to array values, a pointer of type `array_t*` must be dereferenced.
-
-    @sa @ref object_t -- type for an object value
-
-    @since version 1.0.0
-    */
+    /// @brief a type for an array
+    /// @sa https://json.nlohmann.me/api/basic_json/array_t/
     using array_t = ArrayType<basic_json, AllocatorType<basic_json>>;
 
-    /*!
-    @brief a type for a string
-
-    [RFC 7159](http://rfc7159.net/rfc7159) describes JSON strings as follows:
-    > A string is a sequence of zero or more Unicode characters.
-
-    To store objects in C++, a type is defined by the template parameter
-    described below. Unicode values are split by the JSON class into
-    byte-sized characters during deserialization.
-
-    @tparam StringType  the container to store strings (e.g., `std::string`).
-    Note this container is used for keys/names in objects, see @ref object_t.
-
-    #### Default type
-
-    With the default values for @a StringType (`std::string`), the default
-    value for @a string_t is:
-
-    @code {.cpp}
-    std::string
-    @endcode
-
-    #### Encoding
-
-    Strings are stored in UTF-8 encoding. Therefore, functions like
-    `std::string::size()` or `std::string::length()` return the number of
-    bytes in the string rather than the number of characters or glyphs.
-
-    #### String comparison
-
-    [RFC 7159](http://rfc7159.net/rfc7159) states:
-    > Software implementations are typically required to test names of object
-    > members for equality. Implementations that transform the textual
-    > representation into sequences of Unicode code units and then perform the
-    > comparison numerically, code unit by code unit, are interoperable in the
-    > sense that implementations will agree in all cases on equality or
-    > inequality of two strings. For example, implementations that compare
-    > strings with escaped characters unconverted may incorrectly find that
-    > `"a\\b"` and `"a\u005Cb"` are not equal.
-
-    This implementation is interoperable as it does compare strings code unit
-    by code unit.
-
-    #### Storage
-
-    String values are stored as pointers in a @ref basic_json type. That is,
-    for any access to string values, a pointer of type `string_t*` must be
-    dereferenced.
-
-    @since version 1.0.0
-    */
+    /// @brief a type for a string
+    /// @sa https://json.nlohmann.me/api/basic_json/string_t/
     using string_t = StringType;
 
-    /*!
-    @brief a type for a boolean
-
-    [RFC 7159](http://rfc7159.net/rfc7159) implicitly describes a boolean as a
-    type which differentiates the two literals `true` and `false`.
-
-    To store objects in C++, a type is defined by the template parameter @a
-    BooleanType which chooses the type to use.
-
-    #### Default type
-
-    With the default values for @a BooleanType (`bool`), the default value for
-    @a boolean_t is:
-
-    @code {.cpp}
-    bool
-    @endcode
-
-    #### Storage
-
-    Boolean values are stored directly inside a @ref basic_json type.
-
-    @since version 1.0.0
-    */
+    /// @brief a type for a boolean
+    /// @sa https://json.nlohmann.me/api/basic_json/boolean_t/
     using boolean_t = BooleanType;
 
-    /*!
-    @brief a type for a number (integer)
-
-    [RFC 7159](http://rfc7159.net/rfc7159) describes numbers as follows:
-    > The representation of numbers is similar to that used in most
-    > programming languages. A number is represented in base 10 using decimal
-    > digits. It contains an integer component that may be prefixed with an
-    > optional minus sign, which may be followed by a fraction part and/or an
-    > exponent part. Leading zeros are not allowed. (...) Numeric values that
-    > cannot be represented in the grammar below (such as Infinity and NaN)
-    > are not permitted.
-
-    This description includes both integer and floating-point numbers.
-    However, C++ allows more precise storage if it is known whether the number
-    is a signed integer, an unsigned integer or a floating-point number.
-    Therefore, three different types, @ref number_integer_t, @ref
-    number_unsigned_t and @ref number_float_t are used.
-
-    To store integer numbers in C++, a type is defined by the template
-    parameter @a NumberIntegerType which chooses the type to use.
-
-    #### Default type
-
-    With the default values for @a NumberIntegerType (`int64_t`), the default
-    value for @a number_integer_t is:
-
-    @code {.cpp}
-    int64_t
-    @endcode
-
-    #### Default behavior
-
-    - The restrictions about leading zeros is not enforced in C++. Instead,
-      leading zeros in integer literals lead to an interpretation as octal
-      number. Internally, the value will be stored as decimal number. For
-      instance, the C++ integer literal `010` will be serialized to `8`.
-      During deserialization, leading zeros yield an error.
-    - Not-a-number (NaN) values will be serialized to `null`.
-
-    #### Limits
-
-    [RFC 7159](http://rfc7159.net/rfc7159) specifies:
-    > An implementation may set limits on the range and precision of numbers.
-
-    When the default type is used, the maximal integer number that can be
-    stored is `9223372036854775807` (INT64_MAX) and the minimal integer number
-    that can be stored is `-9223372036854775808` (INT64_MIN). Integer numbers
-    that are out of range will yield over/underflow when used in a
-    constructor. During deserialization, too large or small integer numbers
-    will be automatically be stored as @ref number_unsigned_t or @ref
-    number_float_t.
-
-    [RFC 7159](http://rfc7159.net/rfc7159) further states:
-    > Note that when such software is used, numbers that are integers and are
-    > in the range \f$[-2^{53}+1, 2^{53}-1]\f$ are interoperable in the sense
-    > that implementations will agree exactly on their numeric values.
-
-    As this range is a subrange of the exactly supported range [INT64_MIN,
-    INT64_MAX], this class's integer type is interoperable.
-
-    #### Storage
-
-    Integer number values are stored directly inside a @ref basic_json type.
-
-    @sa @ref number_float_t -- type for number values (floating-point)
-
-    @sa @ref number_unsigned_t -- type for number values (unsigned integer)
-
-    @since version 1.0.0
-    */
+    /// @brief a type for a number (integer)
+    /// @sa https://json.nlohmann.me/api/basic_json/number_integer_t/
     using number_integer_t = NumberIntegerType;
 
-    /*!
-    @brief a type for a number (unsigned)
-
-    [RFC 7159](http://rfc7159.net/rfc7159) describes numbers as follows:
-    > The representation of numbers is similar to that used in most
-    > programming languages. A number is represented in base 10 using decimal
-    > digits. It contains an integer component that may be prefixed with an
-    > optional minus sign, which may be followed by a fraction part and/or an
-    > exponent part. Leading zeros are not allowed. (...) Numeric values that
-    > cannot be represented in the grammar below (such as Infinity and NaN)
-    > are not permitted.
-
-    This description includes both integer and floating-point numbers.
-    However, C++ allows more precise storage if it is known whether the number
-    is a signed integer, an unsigned integer or a floating-point number.
-    Therefore, three different types, @ref number_integer_t, @ref
-    number_unsigned_t and @ref number_float_t are used.
-
-    To store unsigned integer numbers in C++, a type is defined by the
-    template parameter @a NumberUnsignedType which chooses the type to use.
-
-    #### Default type
-
-    With the default values for @a NumberUnsignedType (`uint64_t`), the
-    default value for @a number_unsigned_t is:
-
-    @code {.cpp}
-    uint64_t
-    @endcode
-
-    #### Default behavior
-
-    - The restrictions about leading zeros is not enforced in C++. Instead,
-      leading zeros in integer literals lead to an interpretation as octal
-      number. Internally, the value will be stored as decimal number. For
-      instance, the C++ integer literal `010` will be serialized to `8`.
-      During deserialization, leading zeros yield an error.
-    - Not-a-number (NaN) values will be serialized to `null`.
-
-    #### Limits
-
-    [RFC 7159](http://rfc7159.net/rfc7159) specifies:
-    > An implementation may set limits on the range and precision of numbers.
-
-    When the default type is used, the maximal integer number that can be
-    stored is `18446744073709551615` (UINT64_MAX) and the minimal integer
-    number that can be stored is `0`. Integer numbers that are out of range
-    will yield over/underflow when used in a constructor. During
-    deserialization, too large or small integer numbers will be automatically
-    be stored as @ref number_integer_t or @ref number_float_t.
-
-    [RFC 7159](http://rfc7159.net/rfc7159) further states:
-    > Note that when such software is used, numbers that are integers and are
-    > in the range \f$[-2^{53}+1, 2^{53}-1]\f$ are interoperable in the sense
-    > that implementations will agree exactly on their numeric values.
-
-    As this range is a subrange (when considered in conjunction with the
-    number_integer_t type) of the exactly supported range [0, UINT64_MAX],
-    this class's integer type is interoperable.
-
-    #### Storage
-
-    Integer number values are stored directly inside a @ref basic_json type.
-
-    @sa @ref number_float_t -- type for number values (floating-point)
-    @sa @ref number_integer_t -- type for number values (integer)
-
-    @since version 2.0.0
-    */
+    /// @brief a type for a number (unsigned)
+    /// @sa https://json.nlohmann.me/api/basic_json/number_unsigned_t/
     using number_unsigned_t = NumberUnsignedType;
 
-    /*!
-    @brief a type for a number (floating-point)
-
-    [RFC 7159](http://rfc7159.net/rfc7159) describes numbers as follows:
-    > The representation of numbers is similar to that used in most
-    > programming languages. A number is represented in base 10 using decimal
-    > digits. It contains an integer component that may be prefixed with an
-    > optional minus sign, which may be followed by a fraction part and/or an
-    > exponent part. Leading zeros are not allowed. (...) Numeric values that
-    > cannot be represented in the grammar below (such as Infinity and NaN)
-    > are not permitted.
-
-    This description includes both integer and floating-point numbers.
-    However, C++ allows more precise storage if it is known whether the number
-    is a signed integer, an unsigned integer or a floating-point number.
-    Therefore, three different types, @ref number_integer_t, @ref
-    number_unsigned_t and @ref number_float_t are used.
-
-    To store floating-point numbers in C++, a type is defined by the template
-    parameter @a NumberFloatType which chooses the type to use.
-
-    #### Default type
-
-    With the default values for @a NumberFloatType (`double`), the default
-    value for @a number_float_t is:
-
-    @code {.cpp}
-    double
-    @endcode
-
-    #### Default behavior
-
-    - The restrictions about leading zeros is not enforced in C++. Instead,
-      leading zeros in floating-point literals will be ignored. Internally,
-      the value will be stored as decimal number. For instance, the C++
-      floating-point literal `01.2` will be serialized to `1.2`. During
-      deserialization, leading zeros yield an error.
-    - Not-a-number (NaN) values will be serialized to `null`.
-
-    #### Limits
-
-    [RFC 7159](http://rfc7159.net/rfc7159) states:
-    > This specification allows implementations to set limits on the range and
-    > precision of numbers accepted. Since software that implements IEEE
-    > 754-2008 binary64 (double precision) numbers is generally available and
-    > widely used, good interoperability can be achieved by implementations
-    > that expect no more precision or range than these provide, in the sense
-    > that implementations will approximate JSON numbers within the expected
-    > precision.
-
-    This implementation does exactly follow this approach, as it uses double
-    precision floating-point numbers. Note values smaller than
-    `-1.79769313486232e+308` and values greater than `1.79769313486232e+308`
-    will be stored as NaN internally and be serialized to `null`.
-
-    #### Storage
-
-    Floating-point number values are stored directly inside a @ref basic_json
-    type.
-
-    @sa @ref number_integer_t -- type for number values (integer)
-
-    @sa @ref number_unsigned_t -- type for number values (unsigned integer)
-
-    @since version 1.0.0
-    */
+    /// @brief a type for a number (floating-point)
+    /// @sa https://json.nlohmann.me/api/basic_json/number_float_t/
     using number_float_t = NumberFloatType;
 
-    /*!
-    @brief a type for a packed binary type
-
-    This type is a type designed to carry binary data that appears in various
-    serialized formats, such as CBOR's Major Type 2, MessagePack's bin, and
-    BSON's generic binary subtype. This type is NOT a part of standard JSON and
-    exists solely for compatibility with these binary types. As such, it is
-    simply defined as an ordered sequence of zero or more byte values.
-
-    Additionally, as an implementation detail, the subtype of the binary data is
-    carried around as a `std::uint8_t`, which is compatible with both of the
-    binary data formats that use binary subtyping, (though the specific
-    numbering is incompatible with each other, and it is up to the user to
-    translate between them).
-
-    [CBOR's RFC 7049](https://tools.ietf.org/html/rfc7049) describes this type
-    as:
-    > Major type 2: a byte string. The string's length in bytes is represented
-    > following the rules for positive integers (major type 0).
-
-    [MessagePack's documentation on the bin type
-    family](https://github.com/msgpack/msgpack/blob/master/spec.md#bin-format-family)
-    describes this type as:
-    > Bin format family stores an byte array in 2, 3, or 5 bytes of extra bytes
-    > in addition to the size of the byte array.
-
-    [BSON's specifications](http://bsonspec.org/spec.html) describe several
-    binary types; however, this type is intended to represent the generic binary
-    type which has the description:
-    > Generic binary subtype - This is the most commonly used binary subtype and
-    > should be the 'default' for drivers and tools.
-
-    None of these impose any limitations on the internal representation other
-    than the basic unit of storage be some type of array whose parts are
-    decomposable into bytes.
-
-    The default representation of this binary format is a
-    `std::vector<std::uint8_t>`, which is a very common way to represent a byte
-    array in modern C++.
-
-    #### Default type
-
-    The default values for @a BinaryType is `std::vector<std::uint8_t>`
-
-    #### Storage
-
-    Binary Arrays are stored as pointers in a @ref basic_json type. That is,
-    for any access to array values, a pointer of the type `binary_t*` must be
-    dereferenced.
-
-    #### Notes on subtypes
-
-    - CBOR
-       - Binary values are represented as byte strings. No subtypes are
-         supported and will be ignored when CBOR is written.
-    - MessagePack
-       - If a subtype is given and the binary array contains exactly 1, 2, 4, 8,
-         or 16 elements, the fixext family (fixext1, fixext2, fixext4, fixext8)
-         is used. For other sizes, the ext family (ext8, ext16, ext32) is used.
-         The subtype is then added as singed 8-bit integer.
-       - If no subtype is given, the bin family (bin8, bin16, bin32) is used.
-    - BSON
-       - If a subtype is given, it is used and added as unsigned 8-bit integer.
-       - If no subtype is given, the generic binary subtype 0x00 is used.
-
-    @sa @ref binary -- create a binary array
-
-    @since version 3.8.0
-    */
+    /// @brief a type for a packed binary type
+    /// @sa https://json.nlohmann.me/api/basic_json/binary_t/
     using binary_t = nlohmann::byte_container_with_subtype<BinaryType>;
+
+    /// @brief object key comparator type
+    /// @sa https://json.nlohmann.me/api/basic_json/object_comparator_t/
+    using object_comparator_t = detail::actual_object_comparator_t<basic_json>;
+
     /// @}
 
   private:
@@ -1028,25 +480,25 @@ class basic_json
 
                 case value_t::boolean:
                 {
-                    boolean = boolean_t(false);
+                    boolean = static_cast<boolean_t>(false);
                     break;
                 }
 
                 case value_t::number_integer:
                 {
-                    number_integer = number_integer_t(0);
+                    number_integer = static_cast<number_integer_t>(0);
                     break;
                 }
 
                 case value_t::number_unsigned:
                 {
-                    number_unsigned = number_unsigned_t(0);
+                    number_unsigned = static_cast<number_unsigned_t>(0);
                     break;
                 }
 
                 case value_t::number_float:
                 {
-                    number_float = number_float_t(0.0);
+                    number_float = static_cast<number_float_t>(0.0);
                     break;
                 }
 
@@ -1056,12 +508,13 @@ class basic_json
                     break;
                 }
 
+                case value_t::discarded:
                 default:
                 {
                     object = nullptr;  // silence warning, see #821
                     if (JSON_HEDLEY_UNLIKELY(t == value_t::null))
                     {
-                        JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.9.1", basic_json())); // LCOV_EXCL_LINE
+                        JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.11.3", nullptr)); // LCOV_EXCL_LINE
                     }
                     break;
                 }
@@ -1069,112 +522,94 @@ class basic_json
         }
 
         /// constructor for strings
-        json_value(const string_t& value)
-        {
-            string = create<string_t>(value);
-        }
+        json_value(const string_t& value) : string(create<string_t>(value)) {}
 
         /// constructor for rvalue strings
-        json_value(string_t&& value)
-        {
-            string = create<string_t>(std::move(value));
-        }
+        json_value(string_t&& value) : string(create<string_t>(std::move(value))) {}
 
         /// constructor for objects
-        json_value(const object_t& value)
-        {
-            object = create<object_t>(value);
-        }
+        json_value(const object_t& value) : object(create<object_t>(value)) {}
 
         /// constructor for rvalue objects
-        json_value(object_t&& value)
-        {
-            object = create<object_t>(std::move(value));
-        }
+        json_value(object_t&& value) : object(create<object_t>(std::move(value))) {}
 
         /// constructor for arrays
-        json_value(const array_t& value)
-        {
-            array = create<array_t>(value);
-        }
+        json_value(const array_t& value) : array(create<array_t>(value)) {}
 
         /// constructor for rvalue arrays
-        json_value(array_t&& value)
-        {
-            array = create<array_t>(std::move(value));
-        }
+        json_value(array_t&& value) : array(create<array_t>(std::move(value))) {}
 
         /// constructor for binary arrays
-        json_value(const typename binary_t::container_type& value)
-        {
-            binary = create<binary_t>(value);
-        }
+        json_value(const typename binary_t::container_type& value) : binary(create<binary_t>(value)) {}
 
         /// constructor for rvalue binary arrays
-        json_value(typename binary_t::container_type&& value)
-        {
-            binary = create<binary_t>(std::move(value));
-        }
+        json_value(typename binary_t::container_type&& value) : binary(create<binary_t>(std::move(value))) {}
 
         /// constructor for binary arrays (internal type)
-        json_value(const binary_t& value)
-        {
-            binary = create<binary_t>(value);
-        }
+        json_value(const binary_t& value) : binary(create<binary_t>(value)) {}
 
         /// constructor for rvalue binary arrays (internal type)
-        json_value(binary_t&& value)
-        {
-            binary = create<binary_t>(std::move(value));
-        }
+        json_value(binary_t&& value) : binary(create<binary_t>(std::move(value))) {}
 
-        void destroy(value_t t) noexcept
+        void destroy(value_t t)
         {
-            // flatten the current json_value to a heap-allocated stack
-            std::vector<basic_json> stack;
-
-            // move the top-level items to stack
-            if (t == value_t::array)
-            {
-                stack.reserve(array->size());
-                std::move(array->begin(), array->end(), std::back_inserter(stack));
-            }
-            else if (t == value_t::object)
+            if (
+                (t == value_t::object && object == nullptr) ||
+                (t == value_t::array && array == nullptr) ||
+                (t == value_t::string && string == nullptr) ||
+                (t == value_t::binary && binary == nullptr)
+            )
             {
-                stack.reserve(object->size());
-                for (auto&& it : *object)
-                {
-                    stack.push_back(std::move(it.second));
-                }
+                //not initialized (e.g. due to exception in the ctor)
+                return;
             }
-
-            while (!stack.empty())
+            if (t == value_t::array || t == value_t::object)
             {
-                // move the last item to local variable to be processed
-                basic_json current_item(std::move(stack.back()));
-                stack.pop_back();
+                // flatten the current json_value to a heap-allocated stack
+                std::vector<basic_json> stack;
 
-                // if current_item is array/object, move
-                // its children to the stack to be processed later
-                if (current_item.is_array())
+                // move the top-level items to stack
+                if (t == value_t::array)
                 {
-                    std::move(current_item.m_value.array->begin(), current_item.m_value.array->end(),
-                              std::back_inserter(stack));
-
-                    current_item.m_value.array->clear();
+                    stack.reserve(array->size());
+                    std::move(array->begin(), array->end(), std::back_inserter(stack));
                 }
-                else if (current_item.is_object())
+                else
                 {
-                    for (auto&& it : *current_item.m_value.object)
+                    stack.reserve(object->size());
+                    for (auto&& it : *object)
                     {
                         stack.push_back(std::move(it.second));
                     }
-
-                    current_item.m_value.object->clear();
                 }
 
-                // it's now safe that current_item get destructed
-                // since it doesn't have any children
+                while (!stack.empty())
+                {
+                    // move the last item to local variable to be processed
+                    basic_json current_item(std::move(stack.back()));
+                    stack.pop_back();
+
+                    // if current_item is array/object, move
+                    // its children to the stack to be processed later
+                    if (current_item.is_array())
+                    {
+                        std::move(current_item.m_data.m_value.array->begin(), current_item.m_data.m_value.array->end(), std::back_inserter(stack));
+
+                        current_item.m_data.m_value.array->clear();
+                    }
+                    else if (current_item.is_object())
+                    {
+                        for (auto&& it : *current_item.m_data.m_value.object)
+                        {
+                            stack.push_back(std::move(it.second));
+                        }
+
+                        current_item.m_data.m_value.object->clear();
+                    }
+
+                    // it's now safe that current_item get destructed
+                    // since it doesn't have any children
+                }
             }
 
             switch (t)
@@ -1211,6 +646,12 @@ class basic_json
                     break;
                 }
 
+                case value_t::null:
+                case value_t::boolean:
+                case value_t::number_integer:
+                case value_t::number_unsigned:
+                case value_t::number_float:
+                case value_t::discarded:
                 default:
                 {
                     break;
@@ -1240,29 +681,33 @@ class basic_json
     */
     void assert_invariant(bool check_parents = true) const noexcept
     {
-        JSON_ASSERT(m_type != value_t::object || m_value.object != nullptr);
-        JSON_ASSERT(m_type != value_t::array || m_value.array != nullptr);
-        JSON_ASSERT(m_type != value_t::string || m_value.string != nullptr);
-        JSON_ASSERT(m_type != value_t::binary || m_value.binary != nullptr);
+        JSON_ASSERT(m_data.m_type != value_t::object || m_data.m_value.object != nullptr);
+        JSON_ASSERT(m_data.m_type != value_t::array || m_data.m_value.array != nullptr);
+        JSON_ASSERT(m_data.m_type != value_t::string || m_data.m_value.string != nullptr);
+        JSON_ASSERT(m_data.m_type != value_t::binary || m_data.m_value.binary != nullptr);
 
 #if JSON_DIAGNOSTICS
-        JSON_ASSERT(!check_parents || !is_structured() || std::all_of(begin(), end(), [this](const basic_json & j)
+        JSON_TRY
         {
-            return j.m_parent == this;
-        }));
-#else
-        static_cast<void>(check_parents);
+            // cppcheck-suppress assertWithSideEffect
+            JSON_ASSERT(!check_parents || !is_structured() || std::all_of(begin(), end(), [this](const basic_json & j)
+            {
+                return j.m_parent == this;
+            }));
+        }
+        JSON_CATCH(...) {} // LCOV_EXCL_LINE
 #endif
+        static_cast<void>(check_parents);
     }
 
     void set_parents()
     {
 #if JSON_DIAGNOSTICS
-        switch (m_type)
+        switch (m_data.m_type)
         {
             case value_t::array:
             {
-                for (auto& element : *m_value.array)
+                for (auto& element : *m_data.m_value.array)
                 {
                     element.m_parent = this;
                 }
@@ -1271,38 +716,74 @@ class basic_json
 
             case value_t::object:
             {
-                for (auto& element : *m_value.object)
+                for (auto& element : *m_data.m_value.object)
                 {
                     element.second.m_parent = this;
                 }
                 break;
             }
 
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
             default:
                 break;
         }
 #endif
     }
 
-    iterator set_parents(iterator it, typename iterator::difference_type count)
+    iterator set_parents(iterator it, typename iterator::difference_type count_set_parents)
     {
 #if JSON_DIAGNOSTICS
-        for (typename iterator::difference_type i = 0; i < count; ++i)
+        for (typename iterator::difference_type i = 0; i < count_set_parents; ++i)
         {
             (it + i)->m_parent = this;
         }
 #else
-        static_cast<void>(count);
+        static_cast<void>(count_set_parents);
 #endif
         return it;
     }
 
-    reference set_parent(reference j)
+    reference set_parent(reference j, std::size_t old_capacity = static_cast<std::size_t>(-1))
     {
 #if JSON_DIAGNOSTICS
+        if (old_capacity != static_cast<std::size_t>(-1))
+        {
+            // see https://github.com/nlohmann/json/issues/2838
+            JSON_ASSERT(type() == value_t::array);
+            if (JSON_HEDLEY_UNLIKELY(m_data.m_value.array->capacity() != old_capacity))
+            {
+                // capacity has changed: update all parents
+                set_parents();
+                return j;
+            }
+        }
+
+        // ordered_json uses a vector internally, so pointers could have
+        // been invalidated; see https://github.com/nlohmann/json/issues/2962
+#ifdef JSON_HEDLEY_MSVC_VERSION
+#pragma warning(push )
+#pragma warning(disable : 4127) // ignore warning to replace if with if constexpr
+#endif
+        if (detail::is_ordered_map<object_t>::value)
+        {
+            set_parents();
+            return j;
+        }
+#ifdef JSON_HEDLEY_MSVC_VERSION
+#pragma warning( pop )
+#endif
+
         j.m_parent = this;
 #else
         static_cast<void>(j);
+        static_cast<void>(old_capacity);
 #endif
         return j;
     }
@@ -1312,211 +793,46 @@ class basic_json
     // JSON parser callback //
     //////////////////////////
 
-    /*!
-    @brief parser event types
-
-    The parser callback distinguishes the following events:
-    - `object_start`: the parser read `{` and started to process a JSON object
-    - `key`: the parser read a key of a value in an object
-    - `object_end`: the parser read `}` and finished processing a JSON object
-    - `array_start`: the parser read `[` and started to process a JSON array
-    - `array_end`: the parser read `]` and finished processing a JSON array
-    - `value`: the parser finished reading a JSON value
-
-    @image html callback_events.png "Example when certain parse events are triggered"
-
-    @sa @ref parser_callback_t for more information and examples
-    */
+    /// @brief parser event types
+    /// @sa https://json.nlohmann.me/api/basic_json/parse_event_t/
     using parse_event_t = detail::parse_event_t;
 
-    /*!
-    @brief per-element parser callback type
-
-    With a parser callback function, the result of parsing a JSON text can be
-    influenced. When passed to @ref parse, it is called on certain events
-    (passed as @ref parse_event_t via parameter @a event) with a set recursion
-    depth @a depth and context JSON value @a parsed. The return value of the
-    callback function is a boolean indicating whether the element that emitted
-    the callback shall be kept or not.
+    /// @brief per-element parser callback type
+    /// @sa https://json.nlohmann.me/api/basic_json/parser_callback_t/
+    using parser_callback_t = detail::parser_callback_t<basic_json>;
 
-    We distinguish six scenarios (determined by the event type) in which the
-    callback function can be called. The following table describes the values
-    of the parameters @a depth, @a event, and @a parsed.
+    //////////////////
+    // constructors //
+    //////////////////
 
-    parameter @a event | description | parameter @a depth | parameter @a parsed
-    ------------------ | ----------- | ------------------ | -------------------
-    parse_event_t::object_start | the parser read `{` and started to process a JSON object | depth of the parent of the JSON object | a JSON value with type discarded
-    parse_event_t::key | the parser read a key of a value in an object | depth of the currently parsed JSON object | a JSON string containing the key
-    parse_event_t::object_end | the parser read `}` and finished processing a JSON object | depth of the parent of the JSON object | the parsed JSON object
-    parse_event_t::array_start | the parser read `[` and started to process a JSON array | depth of the parent of the JSON array | a JSON value with type discarded
-    parse_event_t::array_end | the parser read `]` and finished processing a JSON array | depth of the parent of the JSON array | the parsed JSON array
-    parse_event_t::value | the parser finished reading a JSON value | depth of the value | the parsed JSON value
+    /// @name constructors and destructors
+    /// Constructors of class @ref basic_json, copy/move constructor, copy
+    /// assignment, static functions creating objects, and the destructor.
+    /// @{
 
-    @image html callback_events.png "Example when certain parse events are triggered"
+    /// @brief create an empty value with a given type
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    basic_json(const value_t v)
+        : m_data(v)
+    {
+        assert_invariant();
+    }
 
-    Discarding a value (i.e., returning `false`) has different effects
-    depending on the context in which function was called:
-
-    - Discarded values in structured types are skipped. That is, the parser
-      will behave as if the discarded value was never read.
-    - In case a value outside a structured type is skipped, it is replaced
-      with `null`. This case happens if the top-level element is skipped.
-
-    @param[in] depth  the depth of the recursion during parsing
-
-    @param[in] event  an event of type parse_event_t indicating the context in
-    the callback function has been called
-
-    @param[in,out] parsed  the current intermediate parse result; note that
-    writing to this value has no effect for parse_event_t::key events
-
-    @return Whether the JSON value which called the function during parsing
-    should be kept (`true`) or not (`false`). In the latter case, it is either
-    skipped completely or replaced by an empty discarded object.
-
-    @sa @ref parse for examples
-
-    @since version 1.0.0
-    */
-    using parser_callback_t = detail::parser_callback_t<basic_json>;
-
-    //////////////////
-    // constructors //
-    //////////////////
-
-    /// @name constructors and destructors
-    /// Constructors of class @ref basic_json, copy/move constructor, copy
-    /// assignment, static functions creating objects, and the destructor.
-    /// @{
-
-    /*!
-    @brief create an empty value with a given type
-
-    Create an empty JSON value with a given type. The value will be default
-    initialized with an empty value which depends on the type:
-
-    Value type  | initial value
-    ----------- | -------------
-    null        | `null`
-    boolean     | `false`
-    string      | `""`
-    number      | `0`
-    object      | `{}`
-    array       | `[]`
-    binary      | empty array
-
-    @param[in] v  the type of the value to create
-
-    @complexity Constant.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes to any JSON value.
-
-    @liveexample{The following code shows the constructor for different @ref
-    value_t values,basic_json__value_t}
-
-    @sa @ref clear() -- restores the postcondition of this constructor
-
-    @since version 1.0.0
-    */
-    basic_json(const value_t v)
-        : m_type(v), m_value(v)
-    {
-        assert_invariant();
-    }
-
-    /*!
-    @brief create a null object
-
-    Create a `null` JSON value. It either takes a null pointer as parameter
-    (explicitly creating `null`) or no parameter (implicitly creating `null`).
-    The passed null pointer itself is not read -- it is only used to choose
-    the right constructor.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this constructor never throws
-    exceptions.
-
-    @liveexample{The following code shows the constructor with and without a
-    null pointer parameter.,basic_json__nullptr_t}
-
-    @since version 1.0.0
-    */
-    basic_json(std::nullptr_t = nullptr) noexcept
+    /// @brief create a null object
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    basic_json(std::nullptr_t = nullptr) noexcept // NOLINT(bugprone-exception-escape)
         : basic_json(value_t::null)
     {
         assert_invariant();
     }
 
-    /*!
-    @brief create a JSON value
-
-    This is a "catch all" constructor for all compatible JSON types; that is,
-    types for which a `to_json()` method exists. The constructor forwards the
-    parameter @a val to that method (to `json_serializer<U>::to_json` method
-    with `U = uncvref_t<CompatibleType>`, to be exact).
-
-    Template type @a CompatibleType includes, but is not limited to, the
-    following types:
-    - **arrays**: @ref array_t and all kinds of compatible containers such as
-      `std::vector`, `std::deque`, `std::list`, `std::forward_list`,
-      `std::array`, `std::valarray`, `std::set`, `std::unordered_set`,
-      `std::multiset`, and `std::unordered_multiset` with a `value_type` from
-      which a @ref basic_json value can be constructed.
-    - **objects**: @ref object_t and all kinds of compatible associative
-      containers such as `std::map`, `std::unordered_map`, `std::multimap`,
-      and `std::unordered_multimap` with a `key_type` compatible to
-      @ref string_t and a `value_type` from which a @ref basic_json value can
-      be constructed.
-    - **strings**: @ref string_t, string literals, and all compatible string
-      containers can be used.
-    - **numbers**: @ref number_integer_t, @ref number_unsigned_t,
-      @ref number_float_t, and all convertible number types such as `int`,
-      `size_t`, `int64_t`, `float` or `double` can be used.
-    - **boolean**: @ref boolean_t / `bool` can be used.
-    - **binary**: @ref binary_t / `std::vector<uint8_t>` may be used,
-      unfortunately because string literals cannot be distinguished from binary
-      character arrays by the C++ type system, all types compatible with `const
-      char*` will be directed to the string constructor instead.  This is both
-      for backwards compatibility, and due to the fact that a binary type is not
-      a standard JSON type.
-
-    See the examples below.
-
-    @tparam CompatibleType a type such that:
-    - @a CompatibleType is not derived from `std::istream`,
-    - @a CompatibleType is not @ref basic_json (to avoid hijacking copy/move
-         constructors),
-    - @a CompatibleType is not a different @ref basic_json type (i.e. with different template arguments)
-    - @a CompatibleType is not a @ref basic_json nested type (e.g.,
-         @ref json_pointer, @ref iterator, etc ...)
-    - @ref @ref json_serializer<U> has a
-         `to_json(basic_json_t&, CompatibleType&&)` method
-
-    @tparam U = `uncvref_t<CompatibleType>`
-
-    @param[in] val the value to be forwarded to the respective constructor
-
-    @complexity Usually linear in the size of the passed @a val, also
-                depending on the implementation of the called `to_json()`
-                method.
-
-    @exceptionsafety Depends on the called constructor. For types directly
-    supported by the library (i.e., all types for which no `to_json()` function
-    was provided), strong guarantee holds: if an exception is thrown, there are
-    no changes to any JSON value.
-
-    @liveexample{The following code shows the constructor with several
-    compatible types.,basic_json__CompatibleType}
-
-    @since version 2.1.0
-    */
+    /// @brief create a JSON value from compatible types
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
     template < typename CompatibleType,
                typename U = detail::uncvref_t<CompatibleType>,
                detail::enable_if_t <
                    !detail::is_basic_json<U>::value && detail::is_compatible_type<basic_json_t, U>::value, int > = 0 >
-    basic_json(CompatibleType && val) noexcept(noexcept(
+    basic_json(CompatibleType && val) noexcept(noexcept( // NOLINT(bugprone-forwarding-reference-overload,bugprone-exception-escape)
                 JSONSerializer<U>::to_json(std::declval<basic_json_t&>(),
                                            std::forward<CompatibleType>(val))))
     {
@@ -1525,32 +841,8 @@ class basic_json
         assert_invariant();
     }
 
-    /*!
-    @brief create a JSON value from an existing one
-
-    This is a constructor for existing @ref basic_json types.
-    It does not hijack copy/move constructors, since the parameter has different
-    template arguments than the current ones.
-
-    The constructor tries to convert the internal @ref m_value of the parameter.
-
-    @tparam BasicJsonType a type such that:
-    - @a BasicJsonType is a @ref basic_json type.
-    - @a BasicJsonType has different template arguments than @ref basic_json_t.
-
-    @param[in] val the @ref basic_json value to be converted.
-
-    @complexity Usually linear in the size of the passed @a val, also
-                depending on the implementation of the called `to_json()`
-                method.
-
-    @exceptionsafety Depends on the called constructor. For types directly
-    supported by the library (i.e., all types for which no `to_json()` function
-    was provided), strong guarantee holds: if an exception is thrown, there are
-    no changes to any JSON value.
-
-    @since version 3.2.0
-    */
+    /// @brief create a JSON value from an existing one
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
     template < typename BasicJsonType,
                detail::enable_if_t <
                    detail::is_basic_json<BasicJsonType>::value&& !std::is_same<basic_json, BasicJsonType>::value, int > = 0 >
@@ -1595,89 +887,18 @@ class basic_json
                 *this = nullptr;
                 break;
             case value_t::discarded:
-                m_type = value_t::discarded;
+                m_data.m_type = value_t::discarded;
                 break;
             default:            // LCOV_EXCL_LINE
-                JSON_ASSERT(false);  // LCOV_EXCL_LINE
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
         }
+        JSON_ASSERT(m_data.m_type == val.type());
         set_parents();
         assert_invariant();
     }
 
-    /*!
-    @brief create a container (array or object) from an initializer list
-
-    Creates a JSON value of type array or object from the passed initializer
-    list @a init. In case @a type_deduction is `true` (default), the type of
-    the JSON value to be created is deducted from the initializer list @a init
-    according to the following rules:
-
-    1. If the list is empty, an empty JSON object value `{}` is created.
-    2. If the list consists of pairs whose first element is a string, a JSON
-       object value is created where the first elements of the pairs are
-       treated as keys and the second elements are as values.
-    3. In all other cases, an array is created.
-
-    The rules aim to create the best fit between a C++ initializer list and
-    JSON values. The rationale is as follows:
-
-    1. The empty initializer list is written as `{}` which is exactly an empty
-       JSON object.
-    2. C++ has no way of describing mapped types other than to list a list of
-       pairs. As JSON requires that keys must be of type string, rule 2 is the
-       weakest constraint one can pose on initializer lists to interpret them
-       as an object.
-    3. In all other cases, the initializer list could not be interpreted as
-       JSON object type, so interpreting it as JSON array type is safe.
-
-    With the rules described above, the following JSON values cannot be
-    expressed by an initializer list:
-
-    - the empty array (`[]`): use @ref array(initializer_list_t)
-      with an empty initializer list in this case
-    - arrays whose elements satisfy rule 2: use @ref
-      array(initializer_list_t) with the same initializer list
-      in this case
-
-    @note When used without parentheses around an empty initializer list, @ref
-    basic_json() is called instead of this function, yielding the JSON null
-    value.
-
-    @param[in] init  initializer list with JSON values
-
-    @param[in] type_deduction internal parameter; when set to `true`, the type
-    of the JSON value is deducted from the initializer list @a init; when set
-    to `false`, the type provided via @a manual_type is forced. This mode is
-    used by the functions @ref array(initializer_list_t) and
-    @ref object(initializer_list_t).
-
-    @param[in] manual_type internal parameter; when @a type_deduction is set
-    to `false`, the created JSON value will use the provided type (only @ref
-    value_t::array and @ref value_t::object are valid); when @a type_deduction
-    is set to `true`, this parameter has no effect
-
-    @throw type_error.301 if @a type_deduction is `false`, @a manual_type is
-    `value_t::object`, but @a init contains an element which is not a pair
-    whose first element is a string. In this case, the constructor could not
-    create an object. If @a type_deduction would have be `true`, an array
-    would have been created. See @ref object(initializer_list_t)
-    for an example.
-
-    @complexity Linear in the size of the initializer list @a init.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes to any JSON value.
-
-    @liveexample{The example below shows how JSON values are created from
-    initializer lists.,basic_json__list_init_t}
-
-    @sa @ref array(initializer_list_t) -- create a JSON array
-    value from an initializer list
-    @sa @ref object(initializer_list_t) -- create a JSON object
-    value from an initializer list
-
-    @since version 1.0.0
-    */
+    /// @brief create a container (array or object) from an initializer list
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
     basic_json(initializer_list_t init,
                bool type_deduction = true,
                value_t manual_type = value_t::array)
@@ -1687,7 +908,10 @@ class basic_json
         bool is_an_object = std::all_of(init.begin(), init.end(),
                                         [](const detail::json_ref<basic_json>& element_ref)
         {
-            return element_ref->is_array() && element_ref->size() == 2 && (*element_ref)[0].is_string();
+            // The cast is to ensure op[size_type] is called, bearing in mind size_type may not be int;
+            // (many string types can be constructed from 0 via its null-pointer guise, so we get a
+            // broken call to op[key_type], the wrong semantics and a 4804 warning on Windows)
+            return element_ref->is_array() && element_ref->size() == 2 && (*element_ref)[static_cast<size_type>(0)].is_string();
         });
 
         // adjust type if type deduction is not wanted
@@ -1702,300 +926,106 @@ class basic_json
             // if object is wanted but impossible, throw an exception
             if (JSON_HEDLEY_UNLIKELY(manual_type == value_t::object && !is_an_object))
             {
-                JSON_THROW(type_error::create(301, "cannot create object from initializer list", basic_json()));
+                JSON_THROW(type_error::create(301, "cannot create object from initializer list", nullptr));
             }
         }
 
         if (is_an_object)
         {
             // the initializer list is a list of pairs -> create object
-            m_type = value_t::object;
-            m_value = value_t::object;
+            m_data.m_type = value_t::object;
+            m_data.m_value = value_t::object;
 
             for (auto& element_ref : init)
             {
                 auto element = element_ref.moved_or_copied();
-                m_value.object->emplace(
-                    std::move(*((*element.m_value.array)[0].m_value.string)),
-                    std::move((*element.m_value.array)[1]));
+                m_data.m_value.object->emplace(
+                    std::move(*((*element.m_data.m_value.array)[0].m_data.m_value.string)),
+                    std::move((*element.m_data.m_value.array)[1]));
             }
         }
         else
         {
             // the initializer list describes an array -> create array
-            m_type = value_t::array;
-            m_value.array = create<array_t>(init.begin(), init.end());
+            m_data.m_type = value_t::array;
+            m_data.m_value.array = create<array_t>(init.begin(), init.end());
         }
 
         set_parents();
         assert_invariant();
     }
 
-    /*!
-    @brief explicitly create a binary array (without subtype)
-
-    Creates a JSON binary array value from a given binary container. Binary
-    values are part of various binary formats, such as CBOR, MessagePack, and
-    BSON. This constructor is used to create a value for serialization to those
-    formats.
-
-    @note Note, this function exists because of the difficulty in correctly
-    specifying the correct template overload in the standard value ctor, as both
-    JSON arrays and JSON binary arrays are backed with some form of a
-    `std::vector`. Because JSON binary arrays are a non-standard extension it
-    was decided that it would be best to prevent automatic initialization of a
-    binary array type, for backwards compatibility and so it does not happen on
-    accident.
-
-    @param[in] init container containing bytes to use as binary type
-
-    @return JSON binary array value
-
-    @complexity Linear in the size of @a init.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes to any JSON value.
-
-    @since version 3.8.0
-    */
+    /// @brief explicitly create a binary array (without subtype)
+    /// @sa https://json.nlohmann.me/api/basic_json/binary/
     JSON_HEDLEY_WARN_UNUSED_RESULT
     static basic_json binary(const typename binary_t::container_type& init)
     {
         auto res = basic_json();
-        res.m_type = value_t::binary;
-        res.m_value = init;
+        res.m_data.m_type = value_t::binary;
+        res.m_data.m_value = init;
         return res;
     }
 
-    /*!
-    @brief explicitly create a binary array (with subtype)
-
-    Creates a JSON binary array value from a given binary container. Binary
-    values are part of various binary formats, such as CBOR, MessagePack, and
-    BSON. This constructor is used to create a value for serialization to those
-    formats.
-
-    @note Note, this function exists because of the difficulty in correctly
-    specifying the correct template overload in the standard value ctor, as both
-    JSON arrays and JSON binary arrays are backed with some form of a
-    `std::vector`. Because JSON binary arrays are a non-standard extension it
-    was decided that it would be best to prevent automatic initialization of a
-    binary array type, for backwards compatibility and so it does not happen on
-    accident.
-
-    @param[in] init container containing bytes to use as binary type
-    @param[in] subtype subtype to use in MessagePack and BSON
-
-    @return JSON binary array value
-
-    @complexity Linear in the size of @a init.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes to any JSON value.
-
-    @since version 3.8.0
-    */
+    /// @brief explicitly create a binary array (with subtype)
+    /// @sa https://json.nlohmann.me/api/basic_json/binary/
     JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json binary(const typename binary_t::container_type& init, std::uint8_t subtype)
+    static basic_json binary(const typename binary_t::container_type& init, typename binary_t::subtype_type subtype)
     {
         auto res = basic_json();
-        res.m_type = value_t::binary;
-        res.m_value = binary_t(init, subtype);
+        res.m_data.m_type = value_t::binary;
+        res.m_data.m_value = binary_t(init, subtype);
         return res;
     }
 
-    /// @copydoc binary(const typename binary_t::container_type&)
+    /// @brief explicitly create a binary array
+    /// @sa https://json.nlohmann.me/api/basic_json/binary/
     JSON_HEDLEY_WARN_UNUSED_RESULT
     static basic_json binary(typename binary_t::container_type&& init)
     {
         auto res = basic_json();
-        res.m_type = value_t::binary;
-        res.m_value = std::move(init);
+        res.m_data.m_type = value_t::binary;
+        res.m_data.m_value = std::move(init);
         return res;
     }
 
-    /// @copydoc binary(const typename binary_t::container_type&, std::uint8_t)
+    /// @brief explicitly create a binary array (with subtype)
+    /// @sa https://json.nlohmann.me/api/basic_json/binary/
     JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json binary(typename binary_t::container_type&& init, std::uint8_t subtype)
+    static basic_json binary(typename binary_t::container_type&& init, typename binary_t::subtype_type subtype)
     {
         auto res = basic_json();
-        res.m_type = value_t::binary;
-        res.m_value = binary_t(std::move(init), subtype);
+        res.m_data.m_type = value_t::binary;
+        res.m_data.m_value = binary_t(std::move(init), subtype);
         return res;
     }
 
-    /*!
-    @brief explicitly create an array from an initializer list
-
-    Creates a JSON array value from a given initializer list. That is, given a
-    list of values `a, b, c`, creates the JSON value `[a, b, c]`. If the
-    initializer list is empty, the empty array `[]` is created.
-
-    @note This function is only needed to express two edge cases that cannot
-    be realized with the initializer list constructor (@ref
-    basic_json(initializer_list_t, bool, value_t)). These cases
-    are:
-    1. creating an array whose elements are all pairs whose first element is a
-    string -- in this case, the initializer list constructor would create an
-    object, taking the first elements as keys
-    2. creating an empty array -- passing the empty initializer list to the
-    initializer list constructor yields an empty object
-
-    @param[in] init  initializer list with JSON values to create an array from
-    (optional)
-
-    @return JSON array value
-
-    @complexity Linear in the size of @a init.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes to any JSON value.
-
-    @liveexample{The following code shows an example for the `array`
-    function.,array}
-
-    @sa @ref basic_json(initializer_list_t, bool, value_t) --
-    create a JSON value from an initializer list
-    @sa @ref object(initializer_list_t) -- create a JSON object
-    value from an initializer list
-
-    @since version 1.0.0
-    */
+    /// @brief explicitly create an array from an initializer list
+    /// @sa https://json.nlohmann.me/api/basic_json/array/
     JSON_HEDLEY_WARN_UNUSED_RESULT
     static basic_json array(initializer_list_t init = {})
     {
         return basic_json(init, false, value_t::array);
     }
 
-    /*!
-    @brief explicitly create an object from an initializer list
-
-    Creates a JSON object value from a given initializer list. The initializer
-    lists elements must be pairs, and their first elements must be strings. If
-    the initializer list is empty, the empty object `{}` is created.
-
-    @note This function is only added for symmetry reasons. In contrast to the
-    related function @ref array(initializer_list_t), there are
-    no cases which can only be expressed by this function. That is, any
-    initializer list @a init can also be passed to the initializer list
-    constructor @ref basic_json(initializer_list_t, bool, value_t).
-
-    @param[in] init  initializer list to create an object from (optional)
-
-    @return JSON object value
-
-    @throw type_error.301 if @a init is not a list of pairs whose first
-    elements are strings. In this case, no object can be created. When such a
-    value is passed to @ref basic_json(initializer_list_t, bool, value_t),
-    an array would have been created from the passed initializer list @a init.
-    See example below.
-
-    @complexity Linear in the size of @a init.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes to any JSON value.
-
-    @liveexample{The following code shows an example for the `object`
-    function.,object}
-
-    @sa @ref basic_json(initializer_list_t, bool, value_t) --
-    create a JSON value from an initializer list
-    @sa @ref array(initializer_list_t) -- create a JSON array
-    value from an initializer list
-
-    @since version 1.0.0
-    */
+    /// @brief explicitly create an object from an initializer list
+    /// @sa https://json.nlohmann.me/api/basic_json/object/
     JSON_HEDLEY_WARN_UNUSED_RESULT
     static basic_json object(initializer_list_t init = {})
     {
         return basic_json(init, false, value_t::object);
     }
 
-    /*!
-    @brief construct an array with count copies of given value
-
-    Constructs a JSON array value by creating @a cnt copies of a passed value.
-    In case @a cnt is `0`, an empty array is created.
-
-    @param[in] cnt  the number of JSON copies of @a val to create
-    @param[in] val  the JSON value to copy
-
-    @post `std::distance(begin(),end()) == cnt` holds.
-
-    @complexity Linear in @a cnt.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes to any JSON value.
-
-    @liveexample{The following code shows examples for the @ref
-    basic_json(size_type\, const basic_json&)
-    constructor.,basic_json__size_type_basic_json}
-
-    @since version 1.0.0
-    */
-    basic_json(size_type cnt, const basic_json& val)
-        : m_type(value_t::array)
+    /// @brief construct an array with count copies of given value
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    basic_json(size_type cnt, const basic_json& val):
+        m_data{cnt, val}
     {
-        m_value.array = create<array_t>(cnt, val);
         set_parents();
         assert_invariant();
     }
 
-    /*!
-    @brief construct a JSON container given an iterator range
-
-    Constructs the JSON value with the contents of the range `[first, last)`.
-    The semantics depends on the different types a JSON value can have:
-    - In case of a null type, invalid_iterator.206 is thrown.
-    - In case of other primitive types (number, boolean, or string), @a first
-      must be `begin()` and @a last must be `end()`. In this case, the value is
-      copied. Otherwise, invalid_iterator.204 is thrown.
-    - In case of structured types (array, object), the constructor behaves as
-      similar versions for `std::vector` or `std::map`; that is, a JSON array
-      or object is constructed from the values in the range.
-
-    @tparam InputIT an input iterator type (@ref iterator or @ref
-    const_iterator)
-
-    @param[in] first begin of the range to copy from (included)
-    @param[in] last end of the range to copy from (excluded)
-
-    @pre Iterators @a first and @a last must be initialized. **This
-         precondition is enforced with an assertion (see warning).** If
-         assertions are switched off, a violation of this precondition yields
-         undefined behavior.
-
-    @pre Range `[first, last)` is valid. Usually, this precondition cannot be
-         checked efficiently. Only certain edge cases are detected; see the
-         description of the exceptions below. A violation of this precondition
-         yields undefined behavior.
-
-    @warning A precondition is enforced with a runtime assertion that will
-             result in calling `std::abort` if this precondition is not met.
-             Assertions can be disabled by defining `NDEBUG` at compile time.
-             See https://en.cppreference.com/w/cpp/error/assert for more
-             information.
-
-    @throw invalid_iterator.201 if iterators @a first and @a last are not
-    compatible (i.e., do not belong to the same JSON value). In this case,
-    the range `[first, last)` is undefined.
-    @throw invalid_iterator.204 if iterators @a first and @a last belong to a
-    primitive type (number, boolean, or string), but @a first does not point
-    to the first element any more. In this case, the range `[first, last)` is
-    undefined. See example code below.
-    @throw invalid_iterator.206 if iterators @a first and @a last belong to a
-    null value. In this case, the range `[first, last)` is undefined.
-
-    @complexity Linear in distance between @a first and @a last.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes to any JSON value.
-
-    @liveexample{The example below shows several ways to create JSON values by
-    specifying a subrange with iterators.,basic_json__InputIt_InputIt}
-
-    @since version 1.0.0
-    */
+    /// @brief construct a JSON container given an iterator range
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
     template < class InputIT, typename std::enable_if <
                    std::is_same<InputIT, typename basic_json_t::iterator>::value ||
                    std::is_same<InputIT, typename basic_json_t::const_iterator>::value, int >::type = 0 >
@@ -2007,14 +1037,14 @@ class basic_json
         // make sure iterator fits the current value
         if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
         {
-            JSON_THROW(invalid_iterator::create(201, "iterators are not compatible", basic_json()));
+            JSON_THROW(invalid_iterator::create(201, "iterators are not compatible", nullptr));
         }
 
         // copy type from first iterator
-        m_type = first.m_object->m_type;
+        m_data.m_type = first.m_object->m_data.m_type;
 
         // check if iterator range is complete for primitive values
-        switch (m_type)
+        switch (m_data.m_type)
         {
             case value_t::boolean:
             case value_t::number_float:
@@ -2025,76 +1055,82 @@ class basic_json
                 if (JSON_HEDLEY_UNLIKELY(!first.m_it.primitive_iterator.is_begin()
                                          || !last.m_it.primitive_iterator.is_end()))
                 {
-                    JSON_THROW(invalid_iterator::create(204, "iterators out of range", *first.m_object));
+                    JSON_THROW(invalid_iterator::create(204, "iterators out of range", first.m_object));
                 }
                 break;
             }
 
+            case value_t::null:
+            case value_t::object:
+            case value_t::array:
+            case value_t::binary:
+            case value_t::discarded:
             default:
                 break;
         }
 
-        switch (m_type)
+        switch (m_data.m_type)
         {
             case value_t::number_integer:
             {
-                m_value.number_integer = first.m_object->m_value.number_integer;
+                m_data.m_value.number_integer = first.m_object->m_data.m_value.number_integer;
                 break;
             }
 
             case value_t::number_unsigned:
             {
-                m_value.number_unsigned = first.m_object->m_value.number_unsigned;
+                m_data.m_value.number_unsigned = first.m_object->m_data.m_value.number_unsigned;
                 break;
             }
 
             case value_t::number_float:
             {
-                m_value.number_float = first.m_object->m_value.number_float;
+                m_data.m_value.number_float = first.m_object->m_data.m_value.number_float;
                 break;
             }
 
             case value_t::boolean:
             {
-                m_value.boolean = first.m_object->m_value.boolean;
+                m_data.m_value.boolean = first.m_object->m_data.m_value.boolean;
                 break;
             }
 
             case value_t::string:
             {
-                m_value = *first.m_object->m_value.string;
+                m_data.m_value = *first.m_object->m_data.m_value.string;
                 break;
             }
 
             case value_t::object:
             {
-                m_value.object = create<object_t>(first.m_it.object_iterator,
-                                                  last.m_it.object_iterator);
+                m_data.m_value.object = create<object_t>(first.m_it.object_iterator,
+                                        last.m_it.object_iterator);
                 break;
             }
 
             case value_t::array:
             {
-                m_value.array = create<array_t>(first.m_it.array_iterator,
-                                                last.m_it.array_iterator);
+                m_data.m_value.array = create<array_t>(first.m_it.array_iterator,
+                                                       last.m_it.array_iterator);
                 break;
             }
 
             case value_t::binary:
             {
-                m_value = *first.m_object->m_value.binary;
+                m_data.m_value = *first.m_object->m_data.m_value.binary;
                 break;
             }
 
+            case value_t::null:
+            case value_t::discarded:
             default:
-                JSON_THROW(invalid_iterator::create(206, "cannot construct with iterators from " + std::string(first.m_object->type_name()), *first.m_object));
+                JSON_THROW(invalid_iterator::create(206, detail::concat("cannot construct with iterators from ", first.m_object->type_name()), first.m_object));
         }
 
         set_parents();
         assert_invariant();
     }
 
-
     ///////////////////////////////////////
     // other constructors and destructor //
     ///////////////////////////////////////
@@ -2104,87 +1140,67 @@ class basic_json
                                  std::is_same<typename JsonRef::value_type, basic_json>>::value, int> = 0 >
     basic_json(const JsonRef& ref) : basic_json(ref.moved_or_copied()) {}
 
-    /*!
-    @brief copy constructor
-
-    Creates a copy of a given JSON value.
-
-    @param[in] other  the JSON value to copy
-
-    @post `*this == other`
-
-    @complexity Linear in the size of @a other.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes to any JSON value.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
-    requirements:
-    - The complexity is linear.
-    - As postcondition, it holds: `other == basic_json(other)`.
-
-    @liveexample{The following code shows an example for the copy
-    constructor.,basic_json__basic_json}
-
-    @since version 1.0.0
-    */
+    /// @brief copy constructor
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
     basic_json(const basic_json& other)
-        : m_type(other.m_type)
+        : json_base_class_t(other)
     {
+        m_data.m_type = other.m_data.m_type;
         // check of passed value is valid
         other.assert_invariant();
 
-        switch (m_type)
+        switch (m_data.m_type)
         {
             case value_t::object:
             {
-                m_value = *other.m_value.object;
+                m_data.m_value = *other.m_data.m_value.object;
                 break;
             }
 
             case value_t::array:
             {
-                m_value = *other.m_value.array;
+                m_data.m_value = *other.m_data.m_value.array;
                 break;
             }
 
             case value_t::string:
             {
-                m_value = *other.m_value.string;
+                m_data.m_value = *other.m_data.m_value.string;
                 break;
             }
 
             case value_t::boolean:
             {
-                m_value = other.m_value.boolean;
+                m_data.m_value = other.m_data.m_value.boolean;
                 break;
             }
 
             case value_t::number_integer:
             {
-                m_value = other.m_value.number_integer;
+                m_data.m_value = other.m_data.m_value.number_integer;
                 break;
             }
 
             case value_t::number_unsigned:
             {
-                m_value = other.m_value.number_unsigned;
+                m_data.m_value = other.m_data.m_value.number_unsigned;
                 break;
             }
 
             case value_t::number_float:
             {
-                m_value = other.m_value.number_float;
+                m_data.m_value = other.m_data.m_value.number_float;
                 break;
             }
 
             case value_t::binary:
             {
-                m_value = *other.m_value.binary;
+                m_data.m_value = *other.m_data.m_value.binary;
                 break;
             }
 
+            case value_t::null:
+            case value_t::discarded:
             default:
                 break;
         }
@@ -2193,108 +1209,51 @@ class basic_json
         assert_invariant();
     }
 
-    /*!
-    @brief move constructor
-
-    Move constructor. Constructs a JSON value with the contents of the given
-    value @a other using move semantics. It "steals" the resources from @a
-    other and leaves it as JSON null value.
-
-    @param[in,out] other  value to move to this object
-
-    @post `*this` has the same value as @a other before the call.
-    @post @a other is a JSON null value.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this constructor never throws
-    exceptions.
-
-    @requirement This function helps `basic_json` satisfying the
-    [MoveConstructible](https://en.cppreference.com/w/cpp/named_req/MoveConstructible)
-    requirements.
-
-    @liveexample{The code below shows the move constructor explicitly called
-    via std::move.,basic_json__moveconstructor}
-
-    @since version 1.0.0
-    */
+    /// @brief move constructor
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
     basic_json(basic_json&& other) noexcept
-        : m_type(std::move(other.m_type)),
-          m_value(std::move(other.m_value))
+        : json_base_class_t(std::forward<json_base_class_t>(other)),
+          m_data(std::move(other.m_data))
     {
         // check that passed value is valid
         other.assert_invariant(false);
 
         // invalidate payload
-        other.m_type = value_t::null;
-        other.m_value = {};
+        other.m_data.m_type = value_t::null;
+        other.m_data.m_value = {};
 
         set_parents();
         assert_invariant();
     }
 
-    /*!
-    @brief copy assignment
-
-    Copy assignment operator. Copies a JSON value via the "copy and swap"
-    strategy: It is expressed in terms of the copy constructor, destructor,
-    and the `swap()` member function.
-
-    @param[in] other  value to copy from
-
-    @complexity Linear.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
-    requirements:
-    - The complexity is linear.
-
-    @liveexample{The code below shows and example for the copy assignment. It
-    creates a copy of value `a` which is then swapped with `b`. Finally\, the
-    copy of `a` (which is the null value after the swap) is
-    destroyed.,basic_json__copyassignment}
-
-    @since version 1.0.0
-    */
+    /// @brief copy assignment
+    /// @sa https://json.nlohmann.me/api/basic_json/operator=/
     basic_json& operator=(basic_json other) noexcept (
         std::is_nothrow_move_constructible<value_t>::value&&
         std::is_nothrow_move_assignable<value_t>::value&&
         std::is_nothrow_move_constructible<json_value>::value&&
-        std::is_nothrow_move_assignable<json_value>::value
+        std::is_nothrow_move_assignable<json_value>::value&&
+        std::is_nothrow_move_assignable<json_base_class_t>::value
     )
     {
         // check that passed value is valid
         other.assert_invariant();
 
         using std::swap;
-        swap(m_type, other.m_type);
-        swap(m_value, other.m_value);
+        swap(m_data.m_type, other.m_data.m_type);
+        swap(m_data.m_value, other.m_data.m_value);
+        json_base_class_t::operator=(std::move(other));
 
         set_parents();
         assert_invariant();
         return *this;
     }
 
-    /*!
-    @brief destructor
-
-    Destroys the JSON value and frees all allocated memory.
-
-    @complexity Linear.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
-    requirements:
-    - The complexity is linear.
-    - All stored elements are destroyed and all memory is freed.
-
-    @since version 1.0.0
-    */
+    /// @brief destructor
+    /// @sa https://json.nlohmann.me/api/basic_json/~basic_json/
     ~basic_json() noexcept
     {
         assert_invariant(false);
-        m_value.destroy(m_type);
     }
 
     /// @}
@@ -2308,53 +1267,8 @@ class basic_json
     /// Functions to inspect the type of a JSON value.
     /// @{
 
-    /*!
-    @brief serialization
-
-    Serialization function for JSON values. The function tries to mimic
-    Python's `json.dumps()` function, and currently supports its @a indent
-    and @a ensure_ascii parameters.
-
-    @param[in] indent If indent is nonnegative, then array elements and object
-    members will be pretty-printed with that indent level. An indent level of
-    `0` will only insert newlines. `-1` (the default) selects the most compact
-    representation.
-    @param[in] indent_char The character to use for indentation if @a indent is
-    greater than `0`. The default is ` ` (space).
-    @param[in] ensure_ascii If @a ensure_ascii is true, all non-ASCII characters
-    in the output are escaped with `\uXXXX` sequences, and the result consists
-    of ASCII characters only.
-    @param[in] error_handler  how to react on decoding errors; there are three
-    possible values: `strict` (throws and exception in case a decoding error
-    occurs; default), `replace` (replace invalid UTF-8 sequences with U+FFFD),
-    and `ignore` (ignore invalid UTF-8 sequences during serialization; all
-    bytes are copied to the output unchanged).
-
-    @return string containing the serialization of the JSON value
-
-    @throw type_error.316 if a string stored inside the JSON value is not
-                          UTF-8 encoded and @a error_handler is set to strict
-
-    @note Binary values are serialized as object containing two keys:
-      - "bytes": an array of bytes as integers
-      - "subtype": the subtype as integer or "null" if the binary has no subtype
-
-    @complexity Linear.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes in the JSON value.
-
-    @liveexample{The following example shows the effect of different @a indent\,
-    @a indent_char\, and @a ensure_ascii parameters to the result of the
-    serialization.,dump}
-
-    @see https://docs.python.org/2/library/json.html#json.dump
-
-    @since version 1.0.0; indentation character @a indent_char, option
-           @a ensure_ascii and exceptions added in version 3.0.0; error
-           handlers added in version 3.4.0; serialization of binary values added
-           in version 3.8.0.
-    */
+    /// @brief serialization
+    /// @sa https://json.nlohmann.me/api/basic_json/dump/
     string_t dump(const int indent = -1,
                   const char indent_char = ' ',
                   const bool ensure_ascii = false,
@@ -2375,400 +1289,109 @@ class basic_json
         return result;
     }
 
-    /*!
-    @brief return the type of the JSON value (explicit)
-
-    Return the type of the JSON value as a value from the @ref value_t
-    enumeration.
-
-    @return the type of the JSON value
-            Value type                | return value
-            ------------------------- | -------------------------
-            null                      | value_t::null
-            boolean                   | value_t::boolean
-            string                    | value_t::string
-            number (integer)          | value_t::number_integer
-            number (unsigned integer) | value_t::number_unsigned
-            number (floating-point)   | value_t::number_float
-            object                    | value_t::object
-            array                     | value_t::array
-            binary                    | value_t::binary
-            discarded                 | value_t::discarded
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `type()` for all JSON
-    types.,type}
-
-    @sa @ref operator value_t() -- return the type of the JSON value (implicit)
-    @sa @ref type_name() -- return the type as string
-
-    @since version 1.0.0
-    */
+    /// @brief return the type of the JSON value (explicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/type/
     constexpr value_t type() const noexcept
     {
-        return m_type;
+        return m_data.m_type;
     }
 
-    /*!
-    @brief return whether type is primitive
-
-    This function returns true if and only if the JSON type is primitive
-    (string, number, boolean, or null).
-
-    @return `true` if type is primitive (string, number, boolean, or null),
-    `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_primitive()` for all JSON
-    types.,is_primitive}
-
-    @sa @ref is_structured() -- returns whether JSON value is structured
-    @sa @ref is_null() -- returns whether JSON value is `null`
-    @sa @ref is_string() -- returns whether JSON value is a string
-    @sa @ref is_boolean() -- returns whether JSON value is a boolean
-    @sa @ref is_number() -- returns whether JSON value is a number
-    @sa @ref is_binary() -- returns whether JSON value is a binary array
-
-    @since version 1.0.0
-    */
+    /// @brief return whether type is primitive
+    /// @sa https://json.nlohmann.me/api/basic_json/is_primitive/
     constexpr bool is_primitive() const noexcept
     {
         return is_null() || is_string() || is_boolean() || is_number() || is_binary();
     }
 
-    /*!
-    @brief return whether type is structured
-
-    This function returns true if and only if the JSON type is structured
-    (array or object).
-
-    @return `true` if type is structured (array or object), `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_structured()` for all JSON
-    types.,is_structured}
-
-    @sa @ref is_primitive() -- returns whether value is primitive
-    @sa @ref is_array() -- returns whether value is an array
-    @sa @ref is_object() -- returns whether value is an object
-
-    @since version 1.0.0
-    */
+    /// @brief return whether type is structured
+    /// @sa https://json.nlohmann.me/api/basic_json/is_structured/
     constexpr bool is_structured() const noexcept
     {
         return is_array() || is_object();
     }
 
-    /*!
-    @brief return whether value is null
-
-    This function returns true if and only if the JSON value is null.
-
-    @return `true` if type is null, `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_null()` for all JSON
-    types.,is_null}
-
-    @since version 1.0.0
-    */
+    /// @brief return whether value is null
+    /// @sa https://json.nlohmann.me/api/basic_json/is_null/
     constexpr bool is_null() const noexcept
     {
-        return m_type == value_t::null;
+        return m_data.m_type == value_t::null;
     }
 
-    /*!
-    @brief return whether value is a boolean
-
-    This function returns true if and only if the JSON value is a boolean.
-
-    @return `true` if type is boolean, `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_boolean()` for all JSON
-    types.,is_boolean}
-
-    @since version 1.0.0
-    */
+    /// @brief return whether value is a boolean
+    /// @sa https://json.nlohmann.me/api/basic_json/is_boolean/
     constexpr bool is_boolean() const noexcept
     {
-        return m_type == value_t::boolean;
+        return m_data.m_type == value_t::boolean;
     }
 
-    /*!
-    @brief return whether value is a number
-
-    This function returns true if and only if the JSON value is a number. This
-    includes both integer (signed and unsigned) and floating-point values.
-
-    @return `true` if type is number (regardless whether integer, unsigned
-    integer or floating-type), `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_number()` for all JSON
-    types.,is_number}
-
-    @sa @ref is_number_integer() -- check if value is an integer or unsigned
-    integer number
-    @sa @ref is_number_unsigned() -- check if value is an unsigned integer
-    number
-    @sa @ref is_number_float() -- check if value is a floating-point number
-
-    @since version 1.0.0
-    */
+    /// @brief return whether value is a number
+    /// @sa https://json.nlohmann.me/api/basic_json/is_number/
     constexpr bool is_number() const noexcept
     {
         return is_number_integer() || is_number_float();
     }
 
-    /*!
-    @brief return whether value is an integer number
-
-    This function returns true if and only if the JSON value is a signed or
-    unsigned integer number. This excludes floating-point values.
-
-    @return `true` if type is an integer or unsigned integer number, `false`
-    otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_number_integer()` for all
-    JSON types.,is_number_integer}
-
-    @sa @ref is_number() -- check if value is a number
-    @sa @ref is_number_unsigned() -- check if value is an unsigned integer
-    number
-    @sa @ref is_number_float() -- check if value is a floating-point number
-
-    @since version 1.0.0
-    */
+    /// @brief return whether value is an integer number
+    /// @sa https://json.nlohmann.me/api/basic_json/is_number_integer/
     constexpr bool is_number_integer() const noexcept
     {
-        return m_type == value_t::number_integer || m_type == value_t::number_unsigned;
+        return m_data.m_type == value_t::number_integer || m_data.m_type == value_t::number_unsigned;
     }
 
-    /*!
-    @brief return whether value is an unsigned integer number
-
-    This function returns true if and only if the JSON value is an unsigned
-    integer number. This excludes floating-point and signed integer values.
-
-    @return `true` if type is an unsigned integer number, `false` otherwise.
+    /// @brief return whether value is an unsigned integer number
+    /// @sa https://json.nlohmann.me/api/basic_json/is_number_unsigned/
+    constexpr bool is_number_unsigned() const noexcept
+    {
+        return m_data.m_type == value_t::number_unsigned;
+    }
 
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_number_unsigned()` for all
-    JSON types.,is_number_unsigned}
-
-    @sa @ref is_number() -- check if value is a number
-    @sa @ref is_number_integer() -- check if value is an integer or unsigned
-    integer number
-    @sa @ref is_number_float() -- check if value is a floating-point number
-
-    @since version 2.0.0
-    */
-    constexpr bool is_number_unsigned() const noexcept
-    {
-        return m_type == value_t::number_unsigned;
-    }
-
-    /*!
-    @brief return whether value is a floating-point number
-
-    This function returns true if and only if the JSON value is a
-    floating-point number. This excludes signed and unsigned integer values.
-
-    @return `true` if type is a floating-point number, `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_number_float()` for all
-    JSON types.,is_number_float}
-
-    @sa @ref is_number() -- check if value is number
-    @sa @ref is_number_integer() -- check if value is an integer number
-    @sa @ref is_number_unsigned() -- check if value is an unsigned integer
-    number
-
-    @since version 1.0.0
-    */
+    /// @brief return whether value is a floating-point number
+    /// @sa https://json.nlohmann.me/api/basic_json/is_number_float/
     constexpr bool is_number_float() const noexcept
     {
-        return m_type == value_t::number_float;
+        return m_data.m_type == value_t::number_float;
     }
 
-    /*!
-    @brief return whether value is an object
-
-    This function returns true if and only if the JSON value is an object.
-
-    @return `true` if type is object, `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_object()` for all JSON
-    types.,is_object}
-
-    @since version 1.0.0
-    */
+    /// @brief return whether value is an object
+    /// @sa https://json.nlohmann.me/api/basic_json/is_object/
     constexpr bool is_object() const noexcept
     {
-        return m_type == value_t::object;
+        return m_data.m_type == value_t::object;
     }
 
-    /*!
-    @brief return whether value is an array
-
-    This function returns true if and only if the JSON value is an array.
-
-    @return `true` if type is array, `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_array()` for all JSON
-    types.,is_array}
-
-    @since version 1.0.0
-    */
+    /// @brief return whether value is an array
+    /// @sa https://json.nlohmann.me/api/basic_json/is_array/
     constexpr bool is_array() const noexcept
     {
-        return m_type == value_t::array;
+        return m_data.m_type == value_t::array;
     }
 
-    /*!
-    @brief return whether value is a string
-
-    This function returns true if and only if the JSON value is a string.
-
-    @return `true` if type is string, `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_string()` for all JSON
-    types.,is_string}
-
-    @since version 1.0.0
-    */
+    /// @brief return whether value is a string
+    /// @sa https://json.nlohmann.me/api/basic_json/is_string/
     constexpr bool is_string() const noexcept
     {
-        return m_type == value_t::string;
+        return m_data.m_type == value_t::string;
     }
 
-    /*!
-    @brief return whether value is a binary array
-
-    This function returns true if and only if the JSON value is a binary array.
-
-    @return `true` if type is binary array, `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_binary()` for all JSON
-    types.,is_binary}
-
-    @since version 3.8.0
-    */
+    /// @brief return whether value is a binary array
+    /// @sa https://json.nlohmann.me/api/basic_json/is_binary/
     constexpr bool is_binary() const noexcept
     {
-        return m_type == value_t::binary;
+        return m_data.m_type == value_t::binary;
     }
 
-    /*!
-    @brief return whether value is discarded
-
-    This function returns true if and only if the JSON value was discarded
-    during parsing with a callback function (see @ref parser_callback_t).
-
-    @note This function will always be `false` for JSON values after parsing.
-    That is, discarded values can only occur during parsing, but will be
-    removed when inside a structured value or replaced by null in other cases.
-
-    @return `true` if type is discarded, `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_discarded()` for all JSON
-    types.,is_discarded}
-
-    @since version 1.0.0
-    */
+    /// @brief return whether value is discarded
+    /// @sa https://json.nlohmann.me/api/basic_json/is_discarded/
     constexpr bool is_discarded() const noexcept
     {
-        return m_type == value_t::discarded;
+        return m_data.m_type == value_t::discarded;
     }
 
-    /*!
-    @brief return the type of the JSON value (implicit)
-
-    Implicitly return the type of the JSON value as a value from the @ref
-    value_t enumeration.
-
-    @return the type of the JSON value
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies the @ref value_t operator for
-    all JSON types.,operator__value_t}
-
-    @sa @ref type() -- return the type of the JSON value (explicit)
-    @sa @ref type_name() -- return the type as string
-
-    @since version 1.0.0
-    */
+    /// @brief return the type of the JSON value (implicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_value_t/
     constexpr operator value_t() const noexcept
     {
-        return m_type;
+        return m_data.m_type;
     }
 
     /// @}
@@ -2783,106 +1406,106 @@ class basic_json
     {
         if (JSON_HEDLEY_LIKELY(is_boolean()))
         {
-            return m_value.boolean;
+            return m_data.m_value.boolean;
         }
 
-        JSON_THROW(type_error::create(302, "type must be boolean, but is " + std::string(type_name()), *this));
+        JSON_THROW(type_error::create(302, detail::concat("type must be boolean, but is ", type_name()), this));
     }
 
     /// get a pointer to the value (object)
     object_t* get_impl_ptr(object_t* /*unused*/) noexcept
     {
-        return is_object() ? m_value.object : nullptr;
+        return is_object() ? m_data.m_value.object : nullptr;
     }
 
     /// get a pointer to the value (object)
     constexpr const object_t* get_impl_ptr(const object_t* /*unused*/) const noexcept
     {
-        return is_object() ? m_value.object : nullptr;
+        return is_object() ? m_data.m_value.object : nullptr;
     }
 
     /// get a pointer to the value (array)
     array_t* get_impl_ptr(array_t* /*unused*/) noexcept
     {
-        return is_array() ? m_value.array : nullptr;
+        return is_array() ? m_data.m_value.array : nullptr;
     }
 
     /// get a pointer to the value (array)
     constexpr const array_t* get_impl_ptr(const array_t* /*unused*/) const noexcept
     {
-        return is_array() ? m_value.array : nullptr;
+        return is_array() ? m_data.m_value.array : nullptr;
     }
 
     /// get a pointer to the value (string)
     string_t* get_impl_ptr(string_t* /*unused*/) noexcept
     {
-        return is_string() ? m_value.string : nullptr;
+        return is_string() ? m_data.m_value.string : nullptr;
     }
 
     /// get a pointer to the value (string)
     constexpr const string_t* get_impl_ptr(const string_t* /*unused*/) const noexcept
     {
-        return is_string() ? m_value.string : nullptr;
+        return is_string() ? m_data.m_value.string : nullptr;
     }
 
     /// get a pointer to the value (boolean)
     boolean_t* get_impl_ptr(boolean_t* /*unused*/) noexcept
     {
-        return is_boolean() ? &m_value.boolean : nullptr;
+        return is_boolean() ? &m_data.m_value.boolean : nullptr;
     }
 
     /// get a pointer to the value (boolean)
     constexpr const boolean_t* get_impl_ptr(const boolean_t* /*unused*/) const noexcept
     {
-        return is_boolean() ? &m_value.boolean : nullptr;
+        return is_boolean() ? &m_data.m_value.boolean : nullptr;
     }
 
     /// get a pointer to the value (integer number)
     number_integer_t* get_impl_ptr(number_integer_t* /*unused*/) noexcept
     {
-        return is_number_integer() ? &m_value.number_integer : nullptr;
+        return is_number_integer() ? &m_data.m_value.number_integer : nullptr;
     }
 
     /// get a pointer to the value (integer number)
     constexpr const number_integer_t* get_impl_ptr(const number_integer_t* /*unused*/) const noexcept
     {
-        return is_number_integer() ? &m_value.number_integer : nullptr;
+        return is_number_integer() ? &m_data.m_value.number_integer : nullptr;
     }
 
     /// get a pointer to the value (unsigned number)
     number_unsigned_t* get_impl_ptr(number_unsigned_t* /*unused*/) noexcept
     {
-        return is_number_unsigned() ? &m_value.number_unsigned : nullptr;
+        return is_number_unsigned() ? &m_data.m_value.number_unsigned : nullptr;
     }
 
     /// get a pointer to the value (unsigned number)
     constexpr const number_unsigned_t* get_impl_ptr(const number_unsigned_t* /*unused*/) const noexcept
     {
-        return is_number_unsigned() ? &m_value.number_unsigned : nullptr;
+        return is_number_unsigned() ? &m_data.m_value.number_unsigned : nullptr;
     }
 
     /// get a pointer to the value (floating-point number)
     number_float_t* get_impl_ptr(number_float_t* /*unused*/) noexcept
     {
-        return is_number_float() ? &m_value.number_float : nullptr;
+        return is_number_float() ? &m_data.m_value.number_float : nullptr;
     }
 
     /// get a pointer to the value (floating-point number)
     constexpr const number_float_t* get_impl_ptr(const number_float_t* /*unused*/) const noexcept
     {
-        return is_number_float() ? &m_value.number_float : nullptr;
+        return is_number_float() ? &m_data.m_value.number_float : nullptr;
     }
 
     /// get a pointer to the value (binary)
     binary_t* get_impl_ptr(binary_t* /*unused*/) noexcept
     {
-        return is_binary() ? m_value.binary : nullptr;
+        return is_binary() ? m_data.m_value.binary : nullptr;
     }
 
     /// get a pointer to the value (binary)
     constexpr const binary_t* get_impl_ptr(const binary_t* /*unused*/) const noexcept
     {
-        return is_binary() ? m_value.binary : nullptr;
+        return is_binary() ? m_data.m_value.binary : nullptr;
     }
 
     /*!
@@ -2900,14 +1523,14 @@ class basic_json
     static ReferenceType get_ref_impl(ThisType& obj)
     {
         // delegate the call to get_ptr<>()
-        auto ptr = obj.template get_ptr<typename std::add_pointer<ReferenceType>::type>();
+        auto* ptr = obj.template get_ptr<typename std::add_pointer<ReferenceType>::type>();
 
         if (JSON_HEDLEY_LIKELY(ptr != nullptr))
         {
             return *ptr;
         }
 
-        JSON_THROW(type_error::create(303, "incompatible ReferenceType for get_ref, actual type is " + std::string(obj.type_name()), obj));
+        JSON_THROW(type_error::create(303, detail::concat("incompatible ReferenceType for get_ref, actual type is ", obj.type_name()), &obj));
     }
 
   public:
@@ -2915,51 +1538,28 @@ class basic_json
     /// Direct access to the stored value of a JSON value.
     /// @{
 
-    /*!
-    @brief get special-case overload
-
-    This overloads avoids a lot of template boilerplate, it can be seen as the
-    identity method
-
-    @tparam BasicJsonType == @ref basic_json
-
-    @return a copy of *this
-
-    @complexity Constant.
-
-    @since version 2.1.0
-    */
-    template<typename BasicJsonType, detail::enable_if_t<
-                 std::is_same<typename std::remove_const<BasicJsonType>::type, basic_json_t>::value,
-                 int> = 0>
-    basic_json get() const
+    /// @brief get a pointer value (implicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/get_ptr/
+    template<typename PointerType, typename std::enable_if<
+                 std::is_pointer<PointerType>::value, int>::type = 0>
+    auto get_ptr() noexcept -> decltype(std::declval<basic_json_t&>().get_impl_ptr(std::declval<PointerType>()))
     {
-        return *this;
+        // delegate the call to get_impl_ptr<>()
+        return get_impl_ptr(static_cast<PointerType>(nullptr));
     }
 
-    /*!
-    @brief get special-case overload
-
-    This overloads converts the current @ref basic_json in a different
-    @ref basic_json type
-
-    @tparam BasicJsonType == @ref basic_json
-
-    @return a copy of *this, converted into @tparam BasicJsonType
-
-    @complexity Depending on the implementation of the called `from_json()`
-                method.
-
-    @since version 3.2.0
-    */
-    template < typename BasicJsonType, detail::enable_if_t <
-                   !std::is_same<BasicJsonType, basic_json>::value&&
-                   detail::is_basic_json<BasicJsonType>::value, int > = 0 >
-    BasicJsonType get() const
+    /// @brief get a pointer value (implicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/get_ptr/
+    template < typename PointerType, typename std::enable_if <
+                   std::is_pointer<PointerType>::value&&
+                   std::is_const<typename std::remove_pointer<PointerType>::type>::value, int >::type = 0 >
+    constexpr auto get_ptr() const noexcept -> decltype(std::declval<const basic_json_t&>().get_impl_ptr(std::declval<PointerType>()))
     {
-        return *this;
+        // delegate the call to get_impl_ptr<>() const
+        return get_impl_ptr(static_cast<PointerType>(nullptr));
     }
 
+  private:
     /*!
     @brief get a value (explicit)
 
@@ -2983,7 +1583,6 @@ class basic_json
     - @ref json_serializer<ValueType> does not have a `from_json()` method of
       the form `ValueType from_json(const basic_json&)`
 
-    @tparam ValueTypeCV the provided value type
     @tparam ValueType the returned value type
 
     @return copy of the JSON value, converted to @a ValueType
@@ -2999,24 +1598,15 @@ class basic_json
 
     @since version 2.1.0
     */
-    template < typename ValueTypeCV, typename ValueType = detail::uncvref_t<ValueTypeCV>,
+    template < typename ValueType,
                detail::enable_if_t <
-                   !detail::is_basic_json<ValueType>::value &&
-                   detail::has_from_json<basic_json_t, ValueType>::value &&
-                   !detail::has_non_default_from_json<basic_json_t, ValueType>::value,
+                   detail::is_default_constructible<ValueType>::value&&
+                   detail::has_from_json<basic_json_t, ValueType>::value,
                    int > = 0 >
-    ValueType get() const noexcept(noexcept(
-                                       JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), std::declval<ValueType&>())))
+    ValueType get_impl(detail::priority_tag<0> /*unused*/) const noexcept(noexcept(
+                JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), std::declval<ValueType&>())))
     {
-        // we cannot static_assert on ValueTypeCV being non-const, because
-        // there is support for get<const basic_json_t>(), which is why we
-        // still need the uncvref
-        static_assert(!std::is_reference<ValueTypeCV>::value,
-                      "get() cannot be used with reference types, you might want to use get_ref()");
-        static_assert(std::is_default_constructible<ValueType>::value,
-                      "types must be DefaultConstructible when used with get()");
-
-        ValueType ret;
+        auto ret = ValueType();
         JSONSerializer<ValueType>::from_json(*this, ret);
         return ret;
     }
@@ -3032,7 +1622,7 @@ class basic_json
 
     The function is equivalent to executing
     @code {.cpp}
-    return JSONSerializer<ValueTypeCV>::from_json(*this);
+    return JSONSerializer<ValueType>::from_json(*this);
     @endcode
 
     This overloads is chosen if:
@@ -3043,7 +1633,6 @@ class basic_json
     @note If @ref json_serializer<ValueType> has both overloads of
     `from_json()`, this one is chosen.
 
-    @tparam ValueTypeCV the provided value type
     @tparam ValueType the returned value type
 
     @return copy of the JSON value, converted to @a ValueType
@@ -3052,134 +1641,116 @@ class basic_json
 
     @since version 2.1.0
     */
-    template < typename ValueTypeCV, typename ValueType = detail::uncvref_t<ValueTypeCV>,
-               detail::enable_if_t < !std::is_same<basic_json_t, ValueType>::value &&
-                                     detail::has_non_default_from_json<basic_json_t, ValueType>::value,
-                                     int > = 0 >
-    ValueType get() const noexcept(noexcept(
-                                       JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>())))
+    template < typename ValueType,
+               detail::enable_if_t <
+                   detail::has_non_default_from_json<basic_json_t, ValueType>::value,
+                   int > = 0 >
+    ValueType get_impl(detail::priority_tag<1> /*unused*/) const noexcept(noexcept(
+                JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>())))
     {
-        static_assert(!std::is_reference<ValueTypeCV>::value,
-                      "get() cannot be used with reference types, you might want to use get_ref()");
         return JSONSerializer<ValueType>::from_json(*this);
     }
 
     /*!
-    @brief get a value (explicit)
-
-    Explicit type conversion between the JSON value and a compatible value.
-    The value is filled into the input parameter by calling the @ref json_serializer<ValueType>
-    `from_json()` method.
-
-    The function is equivalent to executing
-    @code {.cpp}
-    ValueType v;
-    JSONSerializer<ValueType>::from_json(*this, v);
-    @endcode
-
-    This overloads is chosen if:
-    - @a ValueType is not @ref basic_json,
-    - @ref json_serializer<ValueType> has a `from_json()` method of the form
-      `void from_json(const basic_json&, ValueType&)`, and
+    @brief get special-case overload
 
-    @tparam ValueType the input parameter type.
+    This overloads converts the current @ref basic_json in a different
+    @ref basic_json type
 
-    @return the input parameter, allowing chaining calls.
+    @tparam BasicJsonType == @ref basic_json
 
-    @throw what @ref json_serializer<ValueType> `from_json()` method throws
+    @return a copy of *this, converted into @a BasicJsonType
 
-    @liveexample{The example below shows several conversions from JSON values
-    to other types. There a few things to note: (1) Floating-point numbers can
-    be converted to integers\, (2) A JSON array can be converted to a standard
-    `std::vector<short>`\, (3) A JSON object can be converted to C++
-    associative containers such as `std::unordered_map<std::string\,
-    json>`.,get_to}
+    @complexity Depending on the implementation of the called `from_json()`
+                method.
 
-    @since version 3.3.0
+    @since version 3.2.0
     */
-    template < typename ValueType,
+    template < typename BasicJsonType,
                detail::enable_if_t <
-                   !detail::is_basic_json<ValueType>::value&&
-                   detail::has_from_json<basic_json_t, ValueType>::value,
+                   detail::is_basic_json<BasicJsonType>::value,
                    int > = 0 >
-    ValueType & get_to(ValueType& v) const noexcept(noexcept(
-                JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), v)))
+    BasicJsonType get_impl(detail::priority_tag<2> /*unused*/) const
     {
-        JSONSerializer<ValueType>::from_json(*this, v);
-        return v;
+        return *this;
     }
 
-    // specialization to allow to call get_to with a basic_json value
-    // see https://github.com/nlohmann/json/issues/2175
-    template<typename ValueType,
-             detail::enable_if_t <
-                 detail::is_basic_json<ValueType>::value,
+    /*!
+    @brief get special-case overload
+
+    This overloads avoids a lot of template boilerplate, it can be seen as the
+    identity method
+
+    @tparam BasicJsonType == @ref basic_json
+
+    @return a copy of *this
+
+    @complexity Constant.
+
+    @since version 2.1.0
+    */
+    template<typename BasicJsonType,
+             detail::enable_if_t<
+                 std::is_same<BasicJsonType, basic_json_t>::value,
                  int> = 0>
-    ValueType & get_to(ValueType& v) const
+    basic_json get_impl(detail::priority_tag<3> /*unused*/) const
     {
-        v = *this;
-        return v;
+        return *this;
     }
 
-    template <
-        typename T, std::size_t N,
-        typename Array = T (&)[N],
-        detail::enable_if_t <
-            detail::has_from_json<basic_json_t, Array>::value, int > = 0 >
-    Array get_to(T (&v)[N]) const
-    noexcept(noexcept(JSONSerializer<Array>::from_json(
-                          std::declval<const basic_json_t&>(), v)))
+    /*!
+    @brief get a pointer value (explicit)
+    @copydoc get()
+    */
+    template<typename PointerType,
+             detail::enable_if_t<
+                 std::is_pointer<PointerType>::value,
+                 int> = 0>
+    constexpr auto get_impl(detail::priority_tag<4> /*unused*/) const noexcept
+    -> decltype(std::declval<const basic_json_t&>().template get_ptr<PointerType>())
     {
-        JSONSerializer<Array>::from_json(*this, v);
-        return v;
+        // delegate the call to get_ptr
+        return get_ptr<PointerType>();
     }
 
-
+  public:
     /*!
-    @brief get a pointer value (implicit)
+    @brief get a (pointer) value (explicit)
 
-    Implicit pointer access to the internally stored JSON value. No copies are
-    made.
+    Performs explicit type conversion between the JSON value and a compatible value if required.
 
-    @warning Writing data to the pointee of the result yields an undefined
-    state.
+    - If the requested type is a pointer to the internally stored JSON value that pointer is returned.
+    No copies are made.
 
-    @tparam PointerType pointer type; must be a pointer to @ref array_t, @ref
-    object_t, @ref string_t, @ref boolean_t, @ref number_integer_t,
-    @ref number_unsigned_t, or @ref number_float_t. Enforced by a static
-    assertion.
+    - If the requested type is the current @ref basic_json, or a different @ref basic_json convertible
+    from the current @ref basic_json.
 
-    @return pointer to the internally stored JSON value if the requested
-    pointer type @a PointerType fits to the JSON value; `nullptr` otherwise
+    - Otherwise the value is converted by calling the @ref json_serializer<ValueType> `from_json()`
+    method.
 
-    @complexity Constant.
+    @tparam ValueTypeCV the provided value type
+    @tparam ValueType the returned value type
 
-    @liveexample{The example below shows how pointers to internal values of a
-    JSON value can be requested. Note that no type conversions are made and a
-    `nullptr` is returned if the value and the requested pointer type does not
-    match.,get_ptr}
+    @return copy of the JSON value, converted to @tparam ValueType if necessary
 
-    @since version 1.0.0
-    */
-    template<typename PointerType, typename std::enable_if<
-                 std::is_pointer<PointerType>::value, int>::type = 0>
-    auto get_ptr() noexcept -> decltype(std::declval<basic_json_t&>().get_impl_ptr(std::declval<PointerType>()))
-    {
-        // delegate the call to get_impl_ptr<>()
-        return get_impl_ptr(static_cast<PointerType>(nullptr));
-    }
+    @throw what @ref json_serializer<ValueType> `from_json()` method throws if conversion is required
 
-    /*!
-    @brief get a pointer value (implicit)
-    @copydoc get_ptr()
+    @since version 2.1.0
     */
-    template < typename PointerType, typename std::enable_if <
-                   std::is_pointer<PointerType>::value&&
-                   std::is_const<typename std::remove_pointer<PointerType>::type>::value, int >::type = 0 >
-    constexpr auto get_ptr() const noexcept -> decltype(std::declval<const basic_json_t&>().get_impl_ptr(std::declval<PointerType>()))
+    template < typename ValueTypeCV, typename ValueType = detail::uncvref_t<ValueTypeCV>>
+#if defined(JSON_HAS_CPP_14)
+    constexpr
+#endif
+    auto get() const noexcept(
+    noexcept(std::declval<const basic_json_t&>().template get_impl<ValueType>(detail::priority_tag<4> {})))
+    -> decltype(std::declval<const basic_json_t&>().template get_impl<ValueType>(detail::priority_tag<4> {}))
     {
-        // delegate the call to get_impl_ptr<>() const
-        return get_impl_ptr(static_cast<PointerType>(nullptr));
+        // we cannot static_assert on ValueTypeCV being non-const, because
+        // there is support for get<const basic_json_t>(), which is why we
+        // still need the uncvref
+        static_assert(!std::is_reference<ValueTypeCV>::value,
+                      "get() cannot be used with reference types, you might want to use get_ref()");
+        return get_impl<ValueType>(detail::priority_tag<4> {});
     }
 
     /*!
@@ -3205,7 +1776,7 @@ class basic_json
     `nullptr` is returned if the value and the requested pointer type does not
     match.,get__PointerType}
 
-    @sa @ref get_ptr() for explicit pointer-member access
+    @sa see @ref get_ptr() for explicit pointer-member access
 
     @since version 1.0.0
     */
@@ -3217,44 +1788,47 @@ class basic_json
         return get_ptr<PointerType>();
     }
 
-    /*!
-    @brief get a pointer value (explicit)
-    @copydoc get()
-    */
-    template<typename PointerType, typename std::enable_if<
-                 std::is_pointer<PointerType>::value, int>::type = 0>
-    constexpr auto get() const noexcept -> decltype(std::declval<const basic_json_t&>().template get_ptr<PointerType>())
-    {
-        // delegate the call to get_ptr
-        return get_ptr<PointerType>();
+    /// @brief get a value (explicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/get_to/
+    template < typename ValueType,
+               detail::enable_if_t <
+                   !detail::is_basic_json<ValueType>::value&&
+                   detail::has_from_json<basic_json_t, ValueType>::value,
+                   int > = 0 >
+    ValueType & get_to(ValueType& v) const noexcept(noexcept(
+                JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), v)))
+    {
+        JSONSerializer<ValueType>::from_json(*this, v);
+        return v;
     }
 
-    /*!
-    @brief get a reference value (implicit)
-
-    Implicit reference access to the internally stored JSON value. No copies
-    are made.
-
-    @warning Writing data to the referee of the result yields an undefined
-    state.
-
-    @tparam ReferenceType reference type; must be a reference to @ref array_t,
-    @ref object_t, @ref string_t, @ref boolean_t, @ref number_integer_t, or
-    @ref number_float_t. Enforced by static assertion.
-
-    @return reference to the internally stored JSON value if the requested
-    reference type @a ReferenceType fits to the JSON value; throws
-    type_error.303 otherwise
-
-    @throw type_error.303 in case passed type @a ReferenceType is incompatible
-    with the stored JSON value; see example below
-
-    @complexity Constant.
+    // specialization to allow calling get_to with a basic_json value
+    // see https://github.com/nlohmann/json/issues/2175
+    template<typename ValueType,
+             detail::enable_if_t <
+                 detail::is_basic_json<ValueType>::value,
+                 int> = 0>
+    ValueType & get_to(ValueType& v) const
+    {
+        v = *this;
+        return v;
+    }
 
-    @liveexample{The example shows several calls to `get_ref()`.,get_ref}
+    template <
+        typename T, std::size_t N,
+        typename Array = T (&)[N], // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+        detail::enable_if_t <
+            detail::has_from_json<basic_json_t, Array>::value, int > = 0 >
+    Array get_to(T (&v)[N]) const // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+    noexcept(noexcept(JSONSerializer<Array>::from_json(
+                          std::declval<const basic_json_t&>(), v)))
+    {
+        JSONSerializer<Array>::from_json(*this, v);
+        return v;
+    }
 
-    @since version 1.1.0
-    */
+    /// @brief get a reference value (implicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/get_ref/
     template<typename ReferenceType, typename std::enable_if<
                  std::is_reference<ReferenceType>::value, int>::type = 0>
     ReferenceType get_ref()
@@ -3263,10 +1837,8 @@ class basic_json
         return get_ref_impl<ReferenceType>(*this);
     }
 
-    /*!
-    @brief get a reference value (implicit)
-    @copydoc get_ref()
-    */
+    /// @brief get a reference value (implicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/get_ref/
     template < typename ReferenceType, typename std::enable_if <
                    std::is_reference<ReferenceType>::value&&
                    std::is_const<typename std::remove_reference<ReferenceType>::type>::value, int >::type = 0 >
@@ -3306,47 +1878,46 @@ class basic_json
     @since version 1.0.0
     */
     template < typename ValueType, typename std::enable_if <
-                   !std::is_pointer<ValueType>::value&&
-                   !std::is_same<ValueType, detail::json_ref<basic_json>>::value&&
-                   !std::is_same<ValueType, typename string_t::value_type>::value&&
-                   !detail::is_basic_json<ValueType>::value
-                   && !std::is_same<ValueType, std::initializer_list<typename string_t::value_type>>::value
+                   detail::conjunction <
+                       detail::negation<std::is_pointer<ValueType>>,
+                       detail::negation<std::is_same<ValueType, std::nullptr_t>>,
+                       detail::negation<std::is_same<ValueType, detail::json_ref<basic_json>>>,
+                                        detail::negation<std::is_same<ValueType, typename string_t::value_type>>,
+                                        detail::negation<detail::is_basic_json<ValueType>>,
+                                        detail::negation<std::is_same<ValueType, std::initializer_list<typename string_t::value_type>>>,
 #if defined(JSON_HAS_CPP_17) && (defined(__GNUC__) || (defined(_MSC_VER) && _MSC_VER >= 1910 && _MSC_VER <= 1914))
-                   && !std::is_same<ValueType, typename std::string_view>::value
+                                                detail::negation<std::is_same<ValueType, std::string_view>>,
+#endif
+#if defined(JSON_HAS_CPP_17) && JSON_HAS_STATIC_RTTI
+                                                detail::negation<std::is_same<ValueType, std::any>>,
 #endif
-                   && detail::is_detected<detail::get_template_function, const basic_json_t&, ValueType>::value
-                   , int >::type = 0 >
-    JSON_EXPLICIT operator ValueType() const
+                                                detail::is_detected_lazy<detail::get_template_function, const basic_json_t&, ValueType>
+                                                >::value, int >::type = 0 >
+                                        JSON_EXPLICIT operator ValueType() const
     {
         // delegate the call to get<>() const
         return get<ValueType>();
     }
 
-    /*!
-    @return reference to the binary value
-
-    @throw type_error.302 if the value is not binary
-
-    @sa @ref is_binary() to check if the value is binary
-
-    @since version 3.8.0
-    */
+    /// @brief get a binary value
+    /// @sa https://json.nlohmann.me/api/basic_json/get_binary/
     binary_t& get_binary()
     {
         if (!is_binary())
         {
-            JSON_THROW(type_error::create(302, "type must be binary, but is " + std::string(type_name()), *this));
+            JSON_THROW(type_error::create(302, detail::concat("type must be binary, but is ", type_name()), this));
         }
 
         return *get_ptr<binary_t*>();
     }
 
-    /// @copydoc get_binary()
+    /// @brief get a binary value
+    /// @sa https://json.nlohmann.me/api/basic_json/get_binary/
     const binary_t& get_binary() const
     {
         if (!is_binary())
         {
-            JSON_THROW(type_error::create(302, "type must be binary, but is " + std::string(type_name()), *this));
+            JSON_THROW(type_error::create(302, detail::concat("type must be binary, but is ", type_name()), this));
         }
 
         return *get_ptr<const binary_t*>();
@@ -3354,7 +1925,6 @@ class basic_json
 
     /// @}
 
-
     ////////////////////
     // element access //
     ////////////////////
@@ -3363,32 +1933,8 @@ class basic_json
     /// Access to the JSON value.
     /// @{
 
-    /*!
-    @brief access specified array element with bounds checking
-
-    Returns a reference to the element at specified location @a idx, with
-    bounds checking.
-
-    @param[in] idx  index of the element to access
-
-    @return reference to the element at index @a idx
-
-    @throw type_error.304 if the JSON value is not an array; in this case,
-    calling `at` with an index makes no sense. See example below.
-    @throw out_of_range.401 if the index @a idx is out of range of the array;
-    that is, `idx >= size()`. See example below.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes in the JSON value.
-
-    @complexity Constant.
-
-    @since version 1.0.0
-
-    @liveexample{The example below shows how array elements can be read and
-    written using `at()`. It also demonstrates the different exceptions that
-    can be thrown.,at__size_type}
-    */
+    /// @brief access specified array element with bounds checking
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
     reference at(size_type idx)
     {
         // at only works for arrays
@@ -3396,46 +1942,22 @@ class basic_json
         {
             JSON_TRY
             {
-                return set_parent(m_value.array->at(idx));
+                return set_parent(m_data.m_value.array->at(idx));
             }
             JSON_CATCH (std::out_of_range&)
             {
                 // create better exception explanation
-                JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range", *this));
+                JSON_THROW(out_of_range::create(401, detail::concat("array index ", std::to_string(idx), " is out of range"), this));
             }
         }
         else
         {
-            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name()), *this));
+            JSON_THROW(type_error::create(304, detail::concat("cannot use at() with ", type_name()), this));
         }
     }
 
-    /*!
-    @brief access specified array element with bounds checking
-
-    Returns a const reference to the element at specified location @a idx,
-    with bounds checking.
-
-    @param[in] idx  index of the element to access
-
-    @return const reference to the element at index @a idx
-
-    @throw type_error.304 if the JSON value is not an array; in this case,
-    calling `at` with an index makes no sense. See example below.
-    @throw out_of_range.401 if the index @a idx is out of range of the array;
-    that is, `idx >= size()`. See example below.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes in the JSON value.
-
-    @complexity Constant.
-
-    @since version 1.0.0
-
-    @liveexample{The example below shows how array elements can be read using
-    `at()`. It also demonstrates the different exceptions that can be thrown.,
-    at__size_type_const}
-    */
+    /// @brief access specified array element with bounds checking
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
     const_reference at(size_type idx) const
     {
         // at only works for arrays
@@ -3443,154 +1965,105 @@ class basic_json
         {
             JSON_TRY
             {
-                return m_value.array->at(idx);
+                return m_data.m_value.array->at(idx);
             }
             JSON_CATCH (std::out_of_range&)
             {
                 // create better exception explanation
-                JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range", *this));
+                JSON_THROW(out_of_range::create(401, detail::concat("array index ", std::to_string(idx), " is out of range"), this));
             }
         }
         else
         {
-            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name()), *this));
+            JSON_THROW(type_error::create(304, detail::concat("cannot use at() with ", type_name()), this));
         }
     }
 
-    /*!
-    @brief access specified object element with bounds checking
-
-    Returns a reference to the element at with specified key @a key, with
-    bounds checking.
-
-    @param[in] key  key of the element to access
-
-    @return reference to the element at key @a key
-
-    @throw type_error.304 if the JSON value is not an object; in this case,
-    calling `at` with a key makes no sense. See example below.
-    @throw out_of_range.403 if the key @a key is is not stored in the object;
-    that is, `find(key) == end()`. See example below.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes in the JSON value.
-
-    @complexity Logarithmic in the size of the container.
-
-    @sa @ref operator[](const typename object_t::key_type&) for unchecked
-    access by reference
-    @sa @ref value() for access by value with a default value
-
-    @since version 1.0.0
-
-    @liveexample{The example below shows how object elements can be read and
-    written using `at()`. It also demonstrates the different exceptions that
-    can be thrown.,at__object_t_key_type}
-    */
+    /// @brief access specified object element with bounds checking
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
     reference at(const typename object_t::key_type& key)
     {
         // at only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
         {
-            JSON_TRY
-            {
-                return set_parent(m_value.object->at(key));
-            }
-            JSON_CATCH (std::out_of_range&)
-            {
-                // create better exception explanation
-                JSON_THROW(out_of_range::create(403, "key '" + key + "' not found", *this));
-            }
+            JSON_THROW(type_error::create(304, detail::concat("cannot use at() with ", type_name()), this));
         }
-        else
+
+        auto it = m_data.m_value.object->find(key);
+        if (it == m_data.m_value.object->end())
         {
-            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name()), *this));
+            JSON_THROW(out_of_range::create(403, detail::concat("key '", key, "' not found"), this));
         }
+        return set_parent(it->second);
     }
 
-    /*!
-    @brief access specified object element with bounds checking
-
-    Returns a const reference to the element at with specified key @a key,
-    with bounds checking.
-
-    @param[in] key  key of the element to access
-
-    @return const reference to the element at key @a key
-
-    @throw type_error.304 if the JSON value is not an object; in this case,
-    calling `at` with a key makes no sense. See example below.
-    @throw out_of_range.403 if the key @a key is is not stored in the object;
-    that is, `find(key) == end()`. See example below.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes in the JSON value.
-
-    @complexity Logarithmic in the size of the container.
-
-    @sa @ref operator[](const typename object_t::key_type&) for unchecked
-    access by reference
-    @sa @ref value() for access by value with a default value
+    /// @brief access specified object element with bounds checking
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
+    reference at(KeyType && key)
+    {
+        // at only works for objects
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(304, detail::concat("cannot use at() with ", type_name()), this));
+        }
 
-    @since version 1.0.0
+        auto it = m_data.m_value.object->find(std::forward<KeyType>(key));
+        if (it == m_data.m_value.object->end())
+        {
+            JSON_THROW(out_of_range::create(403, detail::concat("key '", string_t(std::forward<KeyType>(key)), "' not found"), this));
+        }
+        return set_parent(it->second);
+    }
 
-    @liveexample{The example below shows how object elements can be read using
-    `at()`. It also demonstrates the different exceptions that can be thrown.,
-    at__object_t_key_type_const}
-    */
+    /// @brief access specified object element with bounds checking
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
     const_reference at(const typename object_t::key_type& key) const
     {
         // at only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
         {
-            JSON_TRY
-            {
-                return m_value.object->at(key);
-            }
-            JSON_CATCH (std::out_of_range&)
-            {
-                // create better exception explanation
-                JSON_THROW(out_of_range::create(403, "key '" + key + "' not found", *this));
-            }
+            JSON_THROW(type_error::create(304, detail::concat("cannot use at() with ", type_name()), this));
         }
-        else
+
+        auto it = m_data.m_value.object->find(key);
+        if (it == m_data.m_value.object->end())
         {
-            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name()), *this));
+            JSON_THROW(out_of_range::create(403, detail::concat("key '", key, "' not found"), this));
         }
+        return it->second;
     }
 
-    /*!
-    @brief access specified array element
-
-    Returns a reference to the element at specified location @a idx.
-
-    @note If @a idx is beyond the range of the array (i.e., `idx >= size()`),
-    then the array is silently filled up with `null` values to make `idx` a
-    valid reference to the last stored element.
-
-    @param[in] idx  index of the element to access
-
-    @return reference to the element at index @a idx
-
-    @throw type_error.305 if the JSON value is not an array or null; in that
-    cases, using the [] operator with an index makes no sense.
-
-    @complexity Constant if @a idx is in the range of the array. Otherwise
-    linear in `idx - size()`.
+    /// @brief access specified object element with bounds checking
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
+    const_reference at(KeyType && key) const
+    {
+        // at only works for objects
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(304, detail::concat("cannot use at() with ", type_name()), this));
+        }
 
-    @liveexample{The example below shows how array elements can be read and
-    written using `[]` operator. Note the addition of `null`
-    values.,operatorarray__size_type}
+        auto it = m_data.m_value.object->find(std::forward<KeyType>(key));
+        if (it == m_data.m_value.object->end())
+        {
+            JSON_THROW(out_of_range::create(403, detail::concat("key '", string_t(std::forward<KeyType>(key)), "' not found"), this));
+        }
+        return it->second;
+    }
 
-    @since version 1.0.0
-    */
+    /// @brief access specified array element
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
     reference operator[](size_type idx)
     {
         // implicitly convert null value to an empty array
         if (is_null())
         {
-            m_type = value_t::array;
-            m_value.array = create<array_t>();
+            m_data.m_type = value_t::array;
+            m_data.m_value.array = create<array_t>();
             assert_invariant();
         }
 
@@ -3598,293 +2071,161 @@ class basic_json
         if (JSON_HEDLEY_LIKELY(is_array()))
         {
             // fill up array with null values if given idx is outside range
-            if (idx >= m_value.array->size())
+            if (idx >= m_data.m_value.array->size())
             {
 #if JSON_DIAGNOSTICS
-                // remember array size before resizing
-                const auto previous_size = m_value.array->size();
+                // remember array size & capacity before resizing
+                const auto old_size = m_data.m_value.array->size();
+                const auto old_capacity = m_data.m_value.array->capacity();
 #endif
-                m_value.array->resize(idx + 1);
+                m_data.m_value.array->resize(idx + 1);
 
 #if JSON_DIAGNOSTICS
-                // set parent for values added above
-                set_parents(begin() + static_cast<typename iterator::difference_type>(previous_size), static_cast<typename iterator::difference_type>(idx + 1 - previous_size));
+                if (JSON_HEDLEY_UNLIKELY(m_data.m_value.array->capacity() != old_capacity))
+                {
+                    // capacity has changed: update all parents
+                    set_parents();
+                }
+                else
+                {
+                    // set parent for values added above
+                    set_parents(begin() + static_cast<typename iterator::difference_type>(old_size), static_cast<typename iterator::difference_type>(idx + 1 - old_size));
+                }
 #endif
+                assert_invariant();
             }
 
-            return m_value.array->operator[](idx);
+            return m_data.m_value.array->operator[](idx);
         }
 
-        JSON_THROW(type_error::create(305, "cannot use operator[] with a numeric argument with " + std::string(type_name()), *this));
+        JSON_THROW(type_error::create(305, detail::concat("cannot use operator[] with a numeric argument with ", type_name()), this));
     }
 
-    /*!
-    @brief access specified array element
-
-    Returns a const reference to the element at specified location @a idx.
-
-    @param[in] idx  index of the element to access
-
-    @return const reference to the element at index @a idx
-
-    @throw type_error.305 if the JSON value is not an array; in that case,
-    using the [] operator with an index makes no sense.
-
-    @complexity Constant.
-
-    @liveexample{The example below shows how array elements can be read using
-    the `[]` operator.,operatorarray__size_type_const}
-
-    @since version 1.0.0
-    */
+    /// @brief access specified array element
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
     const_reference operator[](size_type idx) const
     {
         // const operator[] only works for arrays
         if (JSON_HEDLEY_LIKELY(is_array()))
         {
-            return m_value.array->operator[](idx);
+            return m_data.m_value.array->operator[](idx);
         }
 
-        JSON_THROW(type_error::create(305, "cannot use operator[] with a numeric argument with " + std::string(type_name()), *this));
+        JSON_THROW(type_error::create(305, detail::concat("cannot use operator[] with a numeric argument with ", type_name()), this));
     }
 
-    /*!
-    @brief access specified object element
-
-    Returns a reference to the element at with specified key @a key.
-
-    @note If @a key is not found in the object, then it is silently added to
-    the object and filled with a `null` value to make `key` a valid reference.
-    In case the value was `null` before, it is converted to an object.
-
-    @param[in] key  key of the element to access
-
-    @return reference to the element at key @a key
-
-    @throw type_error.305 if the JSON value is not an object or null; in that
-    cases, using the [] operator with a key makes no sense.
-
-    @complexity Logarithmic in the size of the container.
-
-    @liveexample{The example below shows how object elements can be read and
-    written using the `[]` operator.,operatorarray__key_type}
-
-    @sa @ref at(const typename object_t::key_type&) for access by reference
-    with range checking
-    @sa @ref value() for access by value with a default value
-
-    @since version 1.0.0
-    */
-    reference operator[](const typename object_t::key_type& key)
+    /// @brief access specified object element
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    reference operator[](typename object_t::key_type key)
     {
         // implicitly convert null value to an empty object
         if (is_null())
         {
-            m_type = value_t::object;
-            m_value.object = create<object_t>();
+            m_data.m_type = value_t::object;
+            m_data.m_value.object = create<object_t>();
             assert_invariant();
         }
 
         // operator[] only works for objects
         if (JSON_HEDLEY_LIKELY(is_object()))
         {
-            return set_parent(m_value.object->operator[](key));
+            auto result = m_data.m_value.object->emplace(std::move(key), nullptr);
+            return set_parent(result.first->second);
         }
 
-        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name()), *this));
+        JSON_THROW(type_error::create(305, detail::concat("cannot use operator[] with a string argument with ", type_name()), this));
     }
 
-    /*!
-    @brief read-only access specified object element
-
-    Returns a const reference to the element at with specified key @a key. No
-    bounds checking is performed.
-
-    @warning If the element with key @a key does not exist, the behavior is
-    undefined.
-
-    @param[in] key  key of the element to access
-
-    @return const reference to the element at key @a key
-
-    @pre The element with key @a key must exist. **This precondition is
-         enforced with an assertion.**
-
-    @throw type_error.305 if the JSON value is not an object; in that case,
-    using the [] operator with a key makes no sense.
-
-    @complexity Logarithmic in the size of the container.
-
-    @liveexample{The example below shows how object elements can be read using
-    the `[]` operator.,operatorarray__key_type_const}
-
-    @sa @ref at(const typename object_t::key_type&) for access by reference
-    with range checking
-    @sa @ref value() for access by value with a default value
-
-    @since version 1.0.0
-    */
+    /// @brief access specified object element
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
     const_reference operator[](const typename object_t::key_type& key) const
     {
         // const operator[] only works for objects
         if (JSON_HEDLEY_LIKELY(is_object()))
         {
-            JSON_ASSERT(m_value.object->find(key) != m_value.object->end());
-            return m_value.object->find(key)->second;
+            auto it = m_data.m_value.object->find(key);
+            JSON_ASSERT(it != m_data.m_value.object->end());
+            return it->second;
         }
 
-        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name()), *this));
+        JSON_THROW(type_error::create(305, detail::concat("cannot use operator[] with a string argument with ", type_name()), this));
     }
 
-    /*!
-    @brief access specified object element
-
-    Returns a reference to the element at with specified key @a key.
-
-    @note If @a key is not found in the object, then it is silently added to
-    the object and filled with a `null` value to make `key` a valid reference.
-    In case the value was `null` before, it is converted to an object.
-
-    @param[in] key  key of the element to access
-
-    @return reference to the element at key @a key
-
-    @throw type_error.305 if the JSON value is not an object or null; in that
-    cases, using the [] operator with a key makes no sense.
-
-    @complexity Logarithmic in the size of the container.
-
-    @liveexample{The example below shows how object elements can be read and
-    written using the `[]` operator.,operatorarray__key_type}
-
-    @sa @ref at(const typename object_t::key_type&) for access by reference
-    with range checking
-    @sa @ref value() for access by value with a default value
-
-    @since version 1.1.0
-    */
+    // these two functions resolve a (const) char * ambiguity affecting Clang and MSVC
+    // (they seemingly cannot be constrained to resolve the ambiguity)
     template<typename T>
-    JSON_HEDLEY_NON_NULL(2)
     reference operator[](T* key)
     {
-        // implicitly convert null to object
+        return operator[](typename object_t::key_type(key));
+    }
+
+    template<typename T>
+    const_reference operator[](T* key) const
+    {
+        return operator[](typename object_t::key_type(key));
+    }
+
+    /// @brief access specified object element
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int > = 0 >
+    reference operator[](KeyType && key)
+    {
+        // implicitly convert null value to an empty object
         if (is_null())
         {
-            m_type = value_t::object;
-            m_value = value_t::object;
+            m_data.m_type = value_t::object;
+            m_data.m_value.object = create<object_t>();
             assert_invariant();
         }
 
-        // at only works for objects
+        // operator[] only works for objects
         if (JSON_HEDLEY_LIKELY(is_object()))
         {
-            return set_parent(m_value.object->operator[](key));
+            auto result = m_data.m_value.object->emplace(std::forward<KeyType>(key), nullptr);
+            return set_parent(result.first->second);
         }
 
-        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name()), *this));
+        JSON_THROW(type_error::create(305, detail::concat("cannot use operator[] with a string argument with ", type_name()), this));
     }
 
-    /*!
-    @brief read-only access specified object element
-
-    Returns a const reference to the element at with specified key @a key. No
-    bounds checking is performed.
-
-    @warning If the element with key @a key does not exist, the behavior is
-    undefined.
-
-    @param[in] key  key of the element to access
-
-    @return const reference to the element at key @a key
-
-    @pre The element with key @a key must exist. **This precondition is
-         enforced with an assertion.**
-
-    @throw type_error.305 if the JSON value is not an object; in that case,
-    using the [] operator with a key makes no sense.
-
-    @complexity Logarithmic in the size of the container.
-
-    @liveexample{The example below shows how object elements can be read using
-    the `[]` operator.,operatorarray__key_type_const}
-
-    @sa @ref at(const typename object_t::key_type&) for access by reference
-    with range checking
-    @sa @ref value() for access by value with a default value
-
-    @since version 1.1.0
-    */
-    template<typename T>
-    JSON_HEDLEY_NON_NULL(2)
-    const_reference operator[](T* key) const
+    /// @brief access specified object element
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int > = 0 >
+    const_reference operator[](KeyType && key) const
     {
-        // at only works for objects
+        // const operator[] only works for objects
         if (JSON_HEDLEY_LIKELY(is_object()))
         {
-            JSON_ASSERT(m_value.object->find(key) != m_value.object->end());
-            return m_value.object->find(key)->second;
+            auto it = m_data.m_value.object->find(std::forward<KeyType>(key));
+            JSON_ASSERT(it != m_data.m_value.object->end());
+            return it->second;
         }
 
-        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name()), *this));
+        JSON_THROW(type_error::create(305, detail::concat("cannot use operator[] with a string argument with ", type_name()), this));
     }
 
-    /*!
-    @brief access specified object element with default value
-
-    Returns either a copy of an object's element at the specified key @a key
-    or a given default value if no element with key @a key exists.
-
-    The function is basically equivalent to executing
-    @code {.cpp}
-    try {
-        return at(key);
-    } catch(out_of_range) {
-        return default_value;
-    }
-    @endcode
-
-    @note Unlike @ref at(const typename object_t::key_type&), this function
-    does not throw if the given key @a key was not found.
-
-    @note Unlike @ref operator[](const typename object_t::key_type& key), this
-    function does not implicitly add an element to the position defined by @a
-    key. This function is furthermore also applicable to const objects.
-
-    @param[in] key  key of the element to access
-    @param[in] default_value  the value to return if @a key is not found
-
-    @tparam ValueType type compatible to JSON values, for instance `int` for
-    JSON integer numbers, `bool` for JSON booleans, or `std::vector` types for
-    JSON arrays. Note the type of the expected value at @a key and the default
-    value @a default_value must be compatible.
-
-    @return copy of the element at key @a key or @a default_value if @a key
-    is not found
-
-    @throw type_error.302 if @a default_value does not match the type of the
-    value at @a key
-    @throw type_error.306 if the JSON value is not an object; in that case,
-    using `value()` with a key makes no sense.
-
-    @complexity Logarithmic in the size of the container.
-
-    @liveexample{The example below shows how object elements can be queried
-    with a default value.,basic_json__value}
+  private:
+    template<typename KeyType>
+    using is_comparable_with_object_key = detail::is_comparable <
+        object_comparator_t, const typename object_t::key_type&, KeyType >;
 
-    @sa @ref at(const typename object_t::key_type&) for access by reference
-    with range checking
-    @sa @ref operator[](const typename object_t::key_type&) for unchecked
-    access by reference
+    template<typename ValueType>
+    using value_return_type = std::conditional <
+        detail::is_c_string_uncvref<ValueType>::value,
+        string_t, typename std::decay<ValueType>::type >;
 
-    @since version 1.0.0
-    */
-    // using std::is_convertible in a std::enable_if will fail when using explicit conversions
-    template < class ValueType, typename std::enable_if <
-                   detail::is_getable<basic_json_t, ValueType>::value
-                   && !std::is_same<value_t, ValueType>::value, int >::type = 0 >
+  public:
+    /// @brief access specified object element with default value
+    /// @sa https://json.nlohmann.me/api/basic_json/value/
+    template < class ValueType, detail::enable_if_t <
+                   !detail::is_transparent<object_comparator_t>::value
+                   && detail::is_getable<basic_json_t, ValueType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
     ValueType value(const typename object_t::key_type& key, const ValueType& default_value) const
     {
-        // at only works for objects
+        // value only works for objects
         if (JSON_HEDLEY_LIKELY(is_object()))
         {
             // if key is found, return value and given default value otherwise
@@ -3897,66 +2238,95 @@ class basic_json
             return default_value;
         }
 
-        JSON_THROW(type_error::create(306, "cannot use value() with " + std::string(type_name()), *this));
+        JSON_THROW(type_error::create(306, detail::concat("cannot use value() with ", type_name()), this));
     }
 
-    /*!
-    @brief overload for a default value of type const char*
-    @copydoc basic_json::value(const typename object_t::key_type&, const ValueType&) const
-    */
-    string_t value(const typename object_t::key_type& key, const char* default_value) const
+    /// @brief access specified object element with default value
+    /// @sa https://json.nlohmann.me/api/basic_json/value/
+    template < class ValueType, class ReturnType = typename value_return_type<ValueType>::type,
+               detail::enable_if_t <
+                   !detail::is_transparent<object_comparator_t>::value
+                   && detail::is_getable<basic_json_t, ReturnType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    ReturnType value(const typename object_t::key_type& key, ValueType && default_value) const
     {
-        return value(key, string_t(default_value));
-    }
-
-    /*!
-    @brief access specified object element via JSON Pointer with default value
+        // value only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            // if key is found, return value and given default value otherwise
+            const auto it = find(key);
+            if (it != end())
+            {
+                return it->template get<ReturnType>();
+            }
 
-    Returns either a copy of an object's element at the specified key @a key
-    or a given default value if no element with key @a key exists.
+            return std::forward<ValueType>(default_value);
+        }
 
-    The function is basically equivalent to executing
-    @code {.cpp}
-    try {
-        return at(ptr);
-    } catch(out_of_range) {
-        return default_value;
+        JSON_THROW(type_error::create(306, detail::concat("cannot use value() with ", type_name()), this));
     }
-    @endcode
-
-    @note Unlike @ref at(const json_pointer&), this function does not throw
-    if the given key @a key was not found.
-
-    @param[in] ptr  a JSON pointer to the element to access
-    @param[in] default_value  the value to return if @a ptr found no value
 
-    @tparam ValueType type compatible to JSON values, for instance `int` for
-    JSON integer numbers, `bool` for JSON booleans, or `std::vector` types for
-    JSON arrays. Note the type of the expected value at @a key and the default
-    value @a default_value must be compatible.
+    /// @brief access specified object element with default value
+    /// @sa https://json.nlohmann.me/api/basic_json/value/
+    template < class ValueType, class KeyType, detail::enable_if_t <
+                   detail::is_transparent<object_comparator_t>::value
+                   && !detail::is_json_pointer<KeyType>::value
+                   && is_comparable_with_object_key<KeyType>::value
+                   && detail::is_getable<basic_json_t, ValueType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    ValueType value(KeyType && key, const ValueType& default_value) const
+    {
+        // value only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            // if key is found, return value and given default value otherwise
+            const auto it = find(std::forward<KeyType>(key));
+            if (it != end())
+            {
+                return it->template get<ValueType>();
+            }
 
-    @return copy of the element at key @a key or @a default_value if @a key
-    is not found
+            return default_value;
+        }
 
-    @throw type_error.302 if @a default_value does not match the type of the
-    value at @a ptr
-    @throw type_error.306 if the JSON value is not an object; in that case,
-    using `value()` with a key makes no sense.
+        JSON_THROW(type_error::create(306, detail::concat("cannot use value() with ", type_name()), this));
+    }
 
-    @complexity Logarithmic in the size of the container.
+    /// @brief access specified object element via JSON Pointer with default value
+    /// @sa https://json.nlohmann.me/api/basic_json/value/
+    template < class ValueType, class KeyType, class ReturnType = typename value_return_type<ValueType>::type,
+               detail::enable_if_t <
+                   detail::is_transparent<object_comparator_t>::value
+                   && !detail::is_json_pointer<KeyType>::value
+                   && is_comparable_with_object_key<KeyType>::value
+                   && detail::is_getable<basic_json_t, ReturnType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    ReturnType value(KeyType && key, ValueType && default_value) const
+    {
+        // value only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            // if key is found, return value and given default value otherwise
+            const auto it = find(std::forward<KeyType>(key));
+            if (it != end())
+            {
+                return it->template get<ReturnType>();
+            }
 
-    @liveexample{The example below shows how object elements can be queried
-    with a default value.,basic_json__value_ptr}
+            return std::forward<ValueType>(default_value);
+        }
 
-    @sa @ref operator[](const json_pointer&) for unchecked access by reference
+        JSON_THROW(type_error::create(306, detail::concat("cannot use value() with ", type_name()), this));
+    }
 
-    @since version 2.0.2
-    */
-    template<class ValueType, typename std::enable_if<
-                 detail::is_getable<basic_json_t, ValueType>::value, int>::type = 0>
+    /// @brief access specified object element via JSON Pointer with default value
+    /// @sa https://json.nlohmann.me/api/basic_json/value/
+    template < class ValueType, detail::enable_if_t <
+                   detail::is_getable<basic_json_t, ValueType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
     ValueType value(const json_pointer& ptr, const ValueType& default_value) const
     {
-        // at only works for objects
+        // value only works for objects
         if (JSON_HEDLEY_LIKELY(is_object()))
         {
             // if pointer resolves a value, return it or use default value
@@ -3970,88 +2340,71 @@ class basic_json
             }
         }
 
-        JSON_THROW(type_error::create(306, "cannot use value() with " + std::string(type_name()), *this));
+        JSON_THROW(type_error::create(306, detail::concat("cannot use value() with ", type_name()), this));
     }
 
-    /*!
-    @brief overload for a default value of type const char*
-    @copydoc basic_json::value(const json_pointer&, ValueType) const
-    */
-    JSON_HEDLEY_NON_NULL(3)
-    string_t value(const json_pointer& ptr, const char* default_value) const
+    /// @brief access specified object element via JSON Pointer with default value
+    /// @sa https://json.nlohmann.me/api/basic_json/value/
+    template < class ValueType, class ReturnType = typename value_return_type<ValueType>::type,
+               detail::enable_if_t <
+                   detail::is_getable<basic_json_t, ReturnType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    ReturnType value(const json_pointer& ptr, ValueType && default_value) const
     {
-        return value(ptr, string_t(default_value));
-    }
-
-    /*!
-    @brief access the first element
-
-    Returns a reference to the first element in the container. For a JSON
-    container `c`, the expression `c.front()` is equivalent to `*c.begin()`.
-
-    @return In case of a structured type (array or object), a reference to the
-    first element is returned. In case of number, string, boolean, or binary
-    values, a reference to the value is returned.
-
-    @complexity Constant.
-
-    @pre The JSON value must not be `null` (would throw `std::out_of_range`)
-    or an empty array or object (undefined behavior, **guarded by
-    assertions**).
-    @post The JSON value remains unchanged.
+        // value only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            // if pointer resolves a value, return it or use default value
+            JSON_TRY
+            {
+                return ptr.get_checked(this).template get<ReturnType>();
+            }
+            JSON_INTERNAL_CATCH (out_of_range&)
+            {
+                return std::forward<ValueType>(default_value);
+            }
+        }
 
-    @throw invalid_iterator.214 when called on `null` value
+        JSON_THROW(type_error::create(306, detail::concat("cannot use value() with ", type_name()), this));
+    }
 
-    @liveexample{The following code shows an example for `front()`.,front}
+    template < class ValueType, class BasicJsonType, detail::enable_if_t <
+                   detail::is_basic_json<BasicJsonType>::value
+                   && detail::is_getable<basic_json_t, ValueType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
+    ValueType value(const ::nlohmann::json_pointer<BasicJsonType>& ptr, const ValueType& default_value) const
+    {
+        return value(ptr.convert(), default_value);
+    }
 
-    @sa @ref back() -- access the last element
+    template < class ValueType, class BasicJsonType, class ReturnType = typename value_return_type<ValueType>::type,
+               detail::enable_if_t <
+                   detail::is_basic_json<BasicJsonType>::value
+                   && detail::is_getable<basic_json_t, ReturnType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
+    ReturnType value(const ::nlohmann::json_pointer<BasicJsonType>& ptr, ValueType && default_value) const
+    {
+        return value(ptr.convert(), std::forward<ValueType>(default_value));
+    }
 
-    @since version 1.0.0
-    */
+    /// @brief access the first element
+    /// @sa https://json.nlohmann.me/api/basic_json/front/
     reference front()
     {
         return *begin();
     }
 
-    /*!
-    @copydoc basic_json::front()
-    */
+    /// @brief access the first element
+    /// @sa https://json.nlohmann.me/api/basic_json/front/
     const_reference front() const
     {
         return *cbegin();
     }
 
-    /*!
-    @brief access the last element
-
-    Returns a reference to the last element in the container. For a JSON
-    container `c`, the expression `c.back()` is equivalent to
-    @code {.cpp}
-    auto tmp = c.end();
-    --tmp;
-    return *tmp;
-    @endcode
-
-    @return In case of a structured type (array or object), a reference to the
-    last element is returned. In case of number, string, boolean, or binary
-    values, a reference to the value is returned.
-
-    @complexity Constant.
-
-    @pre The JSON value must not be `null` (would throw `std::out_of_range`)
-    or an empty array or object (undefined behavior, **guarded by
-    assertions**).
-    @post The JSON value remains unchanged.
-
-    @throw invalid_iterator.214 when called on a `null` value. See example
-    below.
-
-    @liveexample{The following code shows an example for `back()`.,back}
-
-    @sa @ref front() -- access the first element
-
-    @since version 1.0.0
-    */
+    /// @brief access the last element
+    /// @sa https://json.nlohmann.me/api/basic_json/back/
     reference back()
     {
         auto tmp = end();
@@ -4059,9 +2412,8 @@ class basic_json
         return *tmp;
     }
 
-    /*!
-    @copydoc basic_json::back()
-    */
+    /// @brief access the last element
+    /// @sa https://json.nlohmann.me/api/basic_json/back/
     const_reference back() const
     {
         auto tmp = cend();
@@ -4069,67 +2421,22 @@ class basic_json
         return *tmp;
     }
 
-    /*!
-    @brief remove element given an iterator
-
-    Removes the element specified by iterator @a pos. The iterator @a pos must
-    be valid and dereferenceable. Thus the `end()` iterator (which is valid,
-    but is not dereferenceable) cannot be used as a value for @a pos.
-
-    If called on a primitive type other than `null`, the resulting JSON value
-    will be `null`.
-
-    @param[in] pos iterator to the element to remove
-    @return Iterator following the last removed element. If the iterator @a
-    pos refers to the last element, the `end()` iterator is returned.
-
-    @tparam IteratorType an @ref iterator or @ref const_iterator
-
-    @post Invalidates iterators and references at or after the point of the
-    erase, including the `end()` iterator.
-
-    @throw type_error.307 if called on a `null` value; example: `"cannot use
-    erase() with null"`
-    @throw invalid_iterator.202 if called on an iterator which does not belong
-    to the current JSON value; example: `"iterator does not fit current
-    value"`
-    @throw invalid_iterator.205 if called on a primitive type with invalid
-    iterator (i.e., any iterator which is not `begin()`); example: `"iterator
-    out of range"`
-
-    @complexity The complexity depends on the type:
-    - objects: amortized constant
-    - arrays: linear in distance between @a pos and the end of the container
-    - strings and binary: linear in the length of the member
-    - other types: constant
-
-    @liveexample{The example shows the result of `erase()` for different JSON
-    types.,erase__IteratorType}
-
-    @sa @ref erase(IteratorType, IteratorType) -- removes the elements in
-    the given range
-    @sa @ref erase(const typename object_t::key_type&) -- removes the element
-    from an object at the given key
-    @sa @ref erase(const size_type) -- removes the element from an array at
-    the given index
-
-    @since version 1.0.0
-    */
-    template < class IteratorType, typename std::enable_if <
+    /// @brief remove element given an iterator
+    /// @sa https://json.nlohmann.me/api/basic_json/erase/
+    template < class IteratorType, detail::enable_if_t <
                    std::is_same<IteratorType, typename basic_json_t::iterator>::value ||
-                   std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int >::type
-               = 0 >
+                   std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int > = 0 >
     IteratorType erase(IteratorType pos)
     {
         // make sure iterator fits the current value
         if (JSON_HEDLEY_UNLIKELY(this != pos.m_object))
         {
-            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", *this));
+            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", this));
         }
 
         IteratorType result = end();
 
-        switch (m_type)
+        switch (m_data.m_type)
         {
             case value_t::boolean:
             case value_t::number_float:
@@ -4140,109 +2447,66 @@ class basic_json
             {
                 if (JSON_HEDLEY_UNLIKELY(!pos.m_it.primitive_iterator.is_begin()))
                 {
-                    JSON_THROW(invalid_iterator::create(205, "iterator out of range", *this));
+                    JSON_THROW(invalid_iterator::create(205, "iterator out of range", this));
                 }
 
                 if (is_string())
                 {
                     AllocatorType<string_t> alloc;
-                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.string);
-                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.string, 1);
-                    m_value.string = nullptr;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_data.m_value.string);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_data.m_value.string, 1);
+                    m_data.m_value.string = nullptr;
                 }
                 else if (is_binary())
                 {
                     AllocatorType<binary_t> alloc;
-                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.binary);
-                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.binary, 1);
-                    m_value.binary = nullptr;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_data.m_value.binary);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_data.m_value.binary, 1);
+                    m_data.m_value.binary = nullptr;
                 }
 
-                m_type = value_t::null;
+                m_data.m_type = value_t::null;
                 assert_invariant();
                 break;
             }
 
             case value_t::object:
             {
-                result.m_it.object_iterator = m_value.object->erase(pos.m_it.object_iterator);
+                result.m_it.object_iterator = m_data.m_value.object->erase(pos.m_it.object_iterator);
                 break;
             }
 
             case value_t::array:
             {
-                result.m_it.array_iterator = m_value.array->erase(pos.m_it.array_iterator);
+                result.m_it.array_iterator = m_data.m_value.array->erase(pos.m_it.array_iterator);
                 break;
             }
 
+            case value_t::null:
+            case value_t::discarded:
             default:
-                JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name()), *this));
+                JSON_THROW(type_error::create(307, detail::concat("cannot use erase() with ", type_name()), this));
         }
 
         return result;
     }
 
-    /*!
-    @brief remove elements given an iterator range
-
-    Removes the element specified by the range `[first; last)`. The iterator
-    @a first does not need to be dereferenceable if `first == last`: erasing
-    an empty range is a no-op.
-
-    If called on a primitive type other than `null`, the resulting JSON value
-    will be `null`.
-
-    @param[in] first iterator to the beginning of the range to remove
-    @param[in] last iterator past the end of the range to remove
-    @return Iterator following the last removed element. If the iterator @a
-    second refers to the last element, the `end()` iterator is returned.
-
-    @tparam IteratorType an @ref iterator or @ref const_iterator
-
-    @post Invalidates iterators and references at or after the point of the
-    erase, including the `end()` iterator.
-
-    @throw type_error.307 if called on a `null` value; example: `"cannot use
-    erase() with null"`
-    @throw invalid_iterator.203 if called on iterators which does not belong
-    to the current JSON value; example: `"iterators do not fit current value"`
-    @throw invalid_iterator.204 if called on a primitive type with invalid
-    iterators (i.e., if `first != begin()` and `last != end()`); example:
-    `"iterators out of range"`
-
-    @complexity The complexity depends on the type:
-    - objects: `log(size()) + std::distance(first, last)`
-    - arrays: linear in the distance between @a first and @a last, plus linear
-      in the distance between @a last and end of the container
-    - strings and binary: linear in the length of the member
-    - other types: constant
-
-    @liveexample{The example shows the result of `erase()` for different JSON
-    types.,erase__IteratorType_IteratorType}
-
-    @sa @ref erase(IteratorType) -- removes the element at a given position
-    @sa @ref erase(const typename object_t::key_type&) -- removes the element
-    from an object at the given key
-    @sa @ref erase(const size_type) -- removes the element from an array at
-    the given index
-
-    @since version 1.0.0
-    */
-    template < class IteratorType, typename std::enable_if <
+    /// @brief remove elements given an iterator range
+    /// @sa https://json.nlohmann.me/api/basic_json/erase/
+    template < class IteratorType, detail::enable_if_t <
                    std::is_same<IteratorType, typename basic_json_t::iterator>::value ||
-                   std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int >::type
-               = 0 >
+                   std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int > = 0 >
     IteratorType erase(IteratorType first, IteratorType last)
     {
         // make sure iterator fits the current value
         if (JSON_HEDLEY_UNLIKELY(this != first.m_object || this != last.m_object))
         {
-            JSON_THROW(invalid_iterator::create(203, "iterators do not fit current value", *this));
+            JSON_THROW(invalid_iterator::create(203, "iterators do not fit current value", this));
         }
 
         IteratorType result = end();
 
-        switch (m_type)
+        switch (m_data.m_type)
         {
             case value_t::boolean:
             case value_t::number_float:
@@ -4254,114 +2518,107 @@ class basic_json
                 if (JSON_HEDLEY_LIKELY(!first.m_it.primitive_iterator.is_begin()
                                        || !last.m_it.primitive_iterator.is_end()))
                 {
-                    JSON_THROW(invalid_iterator::create(204, "iterators out of range", *this));
+                    JSON_THROW(invalid_iterator::create(204, "iterators out of range", this));
                 }
 
                 if (is_string())
                 {
                     AllocatorType<string_t> alloc;
-                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.string);
-                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.string, 1);
-                    m_value.string = nullptr;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_data.m_value.string);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_data.m_value.string, 1);
+                    m_data.m_value.string = nullptr;
                 }
                 else if (is_binary())
                 {
                     AllocatorType<binary_t> alloc;
-                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.binary);
-                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.binary, 1);
-                    m_value.binary = nullptr;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_data.m_value.binary);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_data.m_value.binary, 1);
+                    m_data.m_value.binary = nullptr;
                 }
 
-                m_type = value_t::null;
+                m_data.m_type = value_t::null;
                 assert_invariant();
                 break;
             }
 
             case value_t::object:
             {
-                result.m_it.object_iterator = m_value.object->erase(first.m_it.object_iterator,
+                result.m_it.object_iterator = m_data.m_value.object->erase(first.m_it.object_iterator,
                                               last.m_it.object_iterator);
                 break;
             }
 
             case value_t::array:
             {
-                result.m_it.array_iterator = m_value.array->erase(first.m_it.array_iterator,
+                result.m_it.array_iterator = m_data.m_value.array->erase(first.m_it.array_iterator,
                                              last.m_it.array_iterator);
                 break;
             }
 
+            case value_t::null:
+            case value_t::discarded:
             default:
-                JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name()), *this));
+                JSON_THROW(type_error::create(307, detail::concat("cannot use erase() with ", type_name()), this));
         }
 
         return result;
     }
 
-    /*!
-    @brief remove element from a JSON object given a key
-
-    Removes elements from a JSON object with the key value @a key.
-
-    @param[in] key value of the elements to remove
-
-    @return Number of elements removed. If @a ObjectType is the default
-    `std::map` type, the return value will always be `0` (@a key was not
-    found) or `1` (@a key was found).
-
-    @post References and iterators to the erased elements are invalidated.
-    Other references and iterators are not affected.
-
-    @throw type_error.307 when called on a type other than JSON object;
-    example: `"cannot use erase() with null"`
-
-    @complexity `log(size()) + count(key)`
-
-    @liveexample{The example shows the effect of `erase()`.,erase__key_type}
-
-    @sa @ref erase(IteratorType) -- removes the element at a given position
-    @sa @ref erase(IteratorType, IteratorType) -- removes the elements in
-    the given range
-    @sa @ref erase(const size_type) -- removes the element from an array at
-    the given index
-
-    @since version 1.0.0
-    */
-    size_type erase(const typename object_t::key_type& key)
+  private:
+    template < typename KeyType, detail::enable_if_t <
+                   detail::has_erase_with_key_type<basic_json_t, KeyType>::value, int > = 0 >
+    size_type erase_internal(KeyType && key)
     {
         // this erase only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
         {
-            return m_value.object->erase(key);
+            JSON_THROW(type_error::create(307, detail::concat("cannot use erase() with ", type_name()), this));
         }
 
-        JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name()), *this));
+        return m_data.m_value.object->erase(std::forward<KeyType>(key));
     }
 
-    /*!
-    @brief remove element from a JSON array given an index
-
-    Removes element from a JSON array at the index @a idx.
-
-    @param[in] idx index of the element to remove
+    template < typename KeyType, detail::enable_if_t <
+                   !detail::has_erase_with_key_type<basic_json_t, KeyType>::value, int > = 0 >
+    size_type erase_internal(KeyType && key)
+    {
+        // this erase only works for objects
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(307, detail::concat("cannot use erase() with ", type_name()), this));
+        }
 
-    @throw type_error.307 when called on a type other than JSON object;
-    example: `"cannot use erase() with null"`
-    @throw out_of_range.401 when `idx >= size()`; example: `"array index 17
-    is out of range"`
+        const auto it = m_data.m_value.object->find(std::forward<KeyType>(key));
+        if (it != m_data.m_value.object->end())
+        {
+            m_data.m_value.object->erase(it);
+            return 1;
+        }
+        return 0;
+    }
 
-    @complexity Linear in distance between @a idx and the end of the container.
+  public:
 
-    @liveexample{The example shows the effect of `erase()`.,erase__size_type}
+    /// @brief remove element from a JSON object given a key
+    /// @sa https://json.nlohmann.me/api/basic_json/erase/
+    size_type erase(const typename object_t::key_type& key)
+    {
+        // the indirection via erase_internal() is added to avoid making this
+        // function a template and thus de-rank it during overload resolution
+        return erase_internal(key);
+    }
 
-    @sa @ref erase(IteratorType) -- removes the element at a given position
-    @sa @ref erase(IteratorType, IteratorType) -- removes the elements in
-    the given range
-    @sa @ref erase(const typename object_t::key_type&) -- removes the element
-    from an object at the given key
+    /// @brief remove element from a JSON object given a key
+    /// @sa https://json.nlohmann.me/api/basic_json/erase/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
+    size_type erase(KeyType && key)
+    {
+        return erase_internal(std::forward<KeyType>(key));
+    }
 
-    @since version 1.0.0
-    */
+    /// @brief remove element from a JSON array given an index
+    /// @sa https://json.nlohmann.me/api/basic_json/erase/
     void erase(const size_type idx)
     {
         // this erase only works for arrays
@@ -4369,20 +2626,19 @@ class basic_json
         {
             if (JSON_HEDLEY_UNLIKELY(idx >= size()))
             {
-                JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range", *this));
+                JSON_THROW(out_of_range::create(401, detail::concat("array index ", std::to_string(idx), " is out of range"), this));
             }
 
-            m_value.array->erase(m_value.array->begin() + static_cast<difference_type>(idx));
+            m_data.m_value.array->erase(m_data.m_value.array->begin() + static_cast<difference_type>(idx));
         }
         else
         {
-            JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name()), *this));
+            JSON_THROW(type_error::create(307, detail::concat("cannot use erase() with ", type_name()), this));
         }
     }
 
     /// @}
 
-
     ////////////
     // lookup //
     ////////////
@@ -4390,154 +2646,116 @@ class basic_json
     /// @name lookup
     /// @{
 
-    /*!
-    @brief find an element in a JSON object
-
-    Finds an element in a JSON object with key equivalent to @a key. If the
-    element is not found or the JSON value is not an object, end() is
-    returned.
-
-    @note This method always returns @ref end() when executed on a JSON type
-          that is not an object.
-
-    @param[in] key key value of the element to search for.
-
-    @return Iterator to an element with key equivalent to @a key. If no such
-    element is found or the JSON value is not an object, past-the-end (see
-    @ref end()) iterator is returned.
-
-    @complexity Logarithmic in the size of the JSON object.
-
-    @liveexample{The example shows how `find()` is used.,find__key_type}
-
-    @sa @ref contains(KeyT&&) const -- checks whether a key exists
-
-    @since version 1.0.0
-    */
-    template<typename KeyT>
-    iterator find(KeyT&& key)
+    /// @brief find an element in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/find/
+    iterator find(const typename object_t::key_type& key)
     {
         auto result = end();
 
         if (is_object())
         {
-            result.m_it.object_iterator = m_value.object->find(std::forward<KeyT>(key));
+            result.m_it.object_iterator = m_data.m_value.object->find(key);
         }
 
         return result;
     }
 
-    /*!
-    @brief find an element in a JSON object
-    @copydoc find(KeyT&&)
-    */
-    template<typename KeyT>
-    const_iterator find(KeyT&& key) const
+    /// @brief find an element in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/find/
+    const_iterator find(const typename object_t::key_type& key) const
     {
         auto result = cend();
 
         if (is_object())
         {
-            result.m_it.object_iterator = m_value.object->find(std::forward<KeyT>(key));
+            result.m_it.object_iterator = m_data.m_value.object->find(key);
         }
 
         return result;
     }
 
-    /*!
-    @brief returns the number of occurrences of a key in a JSON object
-
-    Returns the number of elements with key @a key. If ObjectType is the
-    default `std::map` type, the return value will always be `0` (@a key was
-    not found) or `1` (@a key was found).
+    /// @brief find an element in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/find/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
+    iterator find(KeyType && key)
+    {
+        auto result = end();
 
-    @note This method always returns `0` when executed on a JSON type that is
-          not an object.
+        if (is_object())
+        {
+            result.m_it.object_iterator = m_data.m_value.object->find(std::forward<KeyType>(key));
+        }
 
-    @param[in] key key value of the element to count
+        return result;
+    }
 
-    @return Number of elements with key @a key. If the JSON value is not an
-    object, the return value will be `0`.
+    /// @brief find an element in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/find/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
+    const_iterator find(KeyType && key) const
+    {
+        auto result = cend();
 
-    @complexity Logarithmic in the size of the JSON object.
+        if (is_object())
+        {
+            result.m_it.object_iterator = m_data.m_value.object->find(std::forward<KeyType>(key));
+        }
 
-    @liveexample{The example shows how `count()` is used.,count}
+        return result;
+    }
 
-    @since version 1.0.0
-    */
-    template<typename KeyT>
-    size_type count(KeyT&& key) const
+    /// @brief returns the number of occurrences of a key in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/count/
+    size_type count(const typename object_t::key_type& key) const
     {
         // return 0 for all nonobject types
-        return is_object() ? m_value.object->count(std::forward<KeyT>(key)) : 0;
+        return is_object() ? m_data.m_value.object->count(key) : 0;
     }
 
-    /*!
-    @brief check the existence of an element in a JSON object
-
-    Check whether an element exists in a JSON object with key equivalent to
-    @a key. If the element is not found or the JSON value is not an object,
-    false is returned.
-
-    @note This method always returns false when executed on a JSON type
-          that is not an object.
-
-    @param[in] key key value to check its existence.
-
-    @return true if an element with specified @a key exists. If no such
-    element with such key is found or the JSON value is not an object,
-    false is returned.
-
-    @complexity Logarithmic in the size of the JSON object.
-
-    @liveexample{The following code shows an example for `contains()`.,contains}
-
-    @sa @ref find(KeyT&&) -- returns an iterator to an object element
-    @sa @ref contains(const json_pointer&) const -- checks the existence for a JSON pointer
-
-    @since version 3.6.0
-    */
-    template < typename KeyT, typename std::enable_if <
-                   !std::is_same<typename std::decay<KeyT>::type, json_pointer>::value, int >::type = 0 >
-    bool contains(KeyT && key) const
+    /// @brief returns the number of occurrences of a key in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/count/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
+    size_type count(KeyType && key) const
     {
-        return is_object() && m_value.object->find(std::forward<KeyT>(key)) != m_value.object->end();
+        // return 0 for all nonobject types
+        return is_object() ? m_data.m_value.object->count(std::forward<KeyType>(key)) : 0;
     }
 
-    /*!
-    @brief check the existence of an element in a JSON object given a JSON pointer
-
-    Check whether the given JSON pointer @a ptr can be resolved in the current
-    JSON value.
-
-    @note This method can be executed on any JSON value type.
-
-    @param[in] ptr JSON pointer to check its existence.
-
-    @return true if the JSON pointer can be resolved to a stored value, false
-    otherwise.
-
-    @post If `j.contains(ptr)` returns true, it is safe to call `j[ptr]`.
-
-    @throw parse_error.106   if an array index begins with '0'
-    @throw parse_error.109   if an array index was not a number
-
-    @complexity Logarithmic in the size of the JSON object.
+    /// @brief check the existence of an element in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/contains/
+    bool contains(const typename object_t::key_type& key) const
+    {
+        return is_object() && m_data.m_value.object->find(key) != m_data.m_value.object->end();
+    }
 
-    @liveexample{The following code shows an example for `contains()`.,contains_json_pointer}
+    /// @brief check the existence of an element in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/contains/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
+    bool contains(KeyType && key) const
+    {
+        return is_object() && m_data.m_value.object->find(std::forward<KeyType>(key)) != m_data.m_value.object->end();
+    }
 
-    @sa @ref contains(KeyT &&) const -- checks the existence of a key
+    /// @brief check the existence of an element in a JSON object given a JSON pointer
+    /// @sa https://json.nlohmann.me/api/basic_json/contains/
+    bool contains(const json_pointer& ptr) const
+    {
+        return ptr.contains(this);
+    }
 
-    @since version 3.7.0
-    */
-    bool contains(const json_pointer& ptr) const
+    template<typename BasicJsonType, detail::enable_if_t<detail::is_basic_json<BasicJsonType>::value, int> = 0>
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
+    bool contains(const typename ::nlohmann::json_pointer<BasicJsonType>& ptr) const
     {
         return ptr.contains(this);
     }
 
     /// @}
 
-
     ///////////////
     // iterators //
     ///////////////
@@ -4545,30 +2763,8 @@ class basic_json
     /// @name iterators
     /// @{
 
-    /*!
-    @brief returns an iterator to the first element
-
-    Returns an iterator to the first element.
-
-    @image html range-begin-end.svg "Illustration from cppreference.com"
-
-    @return iterator to the first element
-
-    @complexity Constant.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
-    requirements:
-    - The complexity is constant.
-
-    @liveexample{The following code shows an example for `begin()`.,begin}
-
-    @sa @ref cbegin() -- returns a const iterator to the beginning
-    @sa @ref end() -- returns an iterator to the end
-    @sa @ref cend() -- returns a const iterator to the end
-
-    @since version 1.0.0
-    */
+    /// @brief returns an iterator to the first element
+    /// @sa https://json.nlohmann.me/api/basic_json/begin/
     iterator begin() noexcept
     {
         iterator result(this);
@@ -4576,39 +2772,15 @@ class basic_json
         return result;
     }
 
-    /*!
-    @copydoc basic_json::cbegin()
-    */
+    /// @brief returns an iterator to the first element
+    /// @sa https://json.nlohmann.me/api/basic_json/begin/
     const_iterator begin() const noexcept
     {
         return cbegin();
     }
 
-    /*!
-    @brief returns a const iterator to the first element
-
-    Returns a const iterator to the first element.
-
-    @image html range-begin-end.svg "Illustration from cppreference.com"
-
-    @return const iterator to the first element
-
-    @complexity Constant.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of `const_cast<const basic_json&>(*this).begin()`.
-
-    @liveexample{The following code shows an example for `cbegin()`.,cbegin}
-
-    @sa @ref begin() -- returns an iterator to the beginning
-    @sa @ref end() -- returns an iterator to the end
-    @sa @ref cend() -- returns a const iterator to the end
-
-    @since version 1.0.0
-    */
+    /// @brief returns a const iterator to the first element
+    /// @sa https://json.nlohmann.me/api/basic_json/cbegin/
     const_iterator cbegin() const noexcept
     {
         const_iterator result(this);
@@ -4616,30 +2788,8 @@ class basic_json
         return result;
     }
 
-    /*!
-    @brief returns an iterator to one past the last element
-
-    Returns an iterator to one past the last element.
-
-    @image html range-begin-end.svg "Illustration from cppreference.com"
-
-    @return iterator one past the last element
-
-    @complexity Constant.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
-    requirements:
-    - The complexity is constant.
-
-    @liveexample{The following code shows an example for `end()`.,end}
-
-    @sa @ref cend() -- returns a const iterator to the end
-    @sa @ref begin() -- returns an iterator to the beginning
-    @sa @ref cbegin() -- returns a const iterator to the beginning
-
-    @since version 1.0.0
-    */
+    /// @brief returns an iterator to one past the last element
+    /// @sa https://json.nlohmann.me/api/basic_json/end/
     iterator end() noexcept
     {
         iterator result(this);
@@ -4647,39 +2797,15 @@ class basic_json
         return result;
     }
 
-    /*!
-    @copydoc basic_json::cend()
-    */
+    /// @brief returns an iterator to one past the last element
+    /// @sa https://json.nlohmann.me/api/basic_json/end/
     const_iterator end() const noexcept
     {
         return cend();
     }
 
-    /*!
-    @brief returns a const iterator to one past the last element
-
-    Returns a const iterator to one past the last element.
-
-    @image html range-begin-end.svg "Illustration from cppreference.com"
-
-    @return const iterator one past the last element
-
-    @complexity Constant.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of `const_cast<const basic_json&>(*this).end()`.
-
-    @liveexample{The following code shows an example for `cend()`.,cend}
-
-    @sa @ref end() -- returns an iterator to the end
-    @sa @ref begin() -- returns an iterator to the beginning
-    @sa @ref cbegin() -- returns a const iterator to the beginning
-
-    @since version 1.0.0
-    */
+    /// @brief returns an iterator to one past the last element
+    /// @sa https://json.nlohmann.me/api/basic_json/cend/
     const_iterator cend() const noexcept
     {
         const_iterator result(this);
@@ -4687,286 +2813,80 @@ class basic_json
         return result;
     }
 
-    /*!
-    @brief returns an iterator to the reverse-beginning
-
-    Returns an iterator to the reverse-beginning; that is, the last element.
-
-    @image html range-rbegin-rend.svg "Illustration from cppreference.com"
-
-    @complexity Constant.
-
-    @requirement This function helps `basic_json` satisfying the
-    [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of `reverse_iterator(end())`.
-
-    @liveexample{The following code shows an example for `rbegin()`.,rbegin}
-
-    @sa @ref crbegin() -- returns a const reverse iterator to the beginning
-    @sa @ref rend() -- returns a reverse iterator to the end
-    @sa @ref crend() -- returns a const reverse iterator to the end
-
-    @since version 1.0.0
-    */
+    /// @brief returns an iterator to the reverse-beginning
+    /// @sa https://json.nlohmann.me/api/basic_json/rbegin/
     reverse_iterator rbegin() noexcept
     {
         return reverse_iterator(end());
     }
 
-    /*!
-    @copydoc basic_json::crbegin()
-    */
+    /// @brief returns an iterator to the reverse-beginning
+    /// @sa https://json.nlohmann.me/api/basic_json/rbegin/
     const_reverse_iterator rbegin() const noexcept
     {
         return crbegin();
     }
 
-    /*!
-    @brief returns an iterator to the reverse-end
-
-    Returns an iterator to the reverse-end; that is, one before the first
-    element.
-
-    @image html range-rbegin-rend.svg "Illustration from cppreference.com"
-
-    @complexity Constant.
-
-    @requirement This function helps `basic_json` satisfying the
-    [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of `reverse_iterator(begin())`.
-
-    @liveexample{The following code shows an example for `rend()`.,rend}
-
-    @sa @ref crend() -- returns a const reverse iterator to the end
-    @sa @ref rbegin() -- returns a reverse iterator to the beginning
-    @sa @ref crbegin() -- returns a const reverse iterator to the beginning
-
-    @since version 1.0.0
-    */
+    /// @brief returns an iterator to the reverse-end
+    /// @sa https://json.nlohmann.me/api/basic_json/rend/
     reverse_iterator rend() noexcept
     {
         return reverse_iterator(begin());
     }
 
-    /*!
-    @copydoc basic_json::crend()
-    */
+    /// @brief returns an iterator to the reverse-end
+    /// @sa https://json.nlohmann.me/api/basic_json/rend/
     const_reverse_iterator rend() const noexcept
     {
         return crend();
     }
 
-    /*!
-    @brief returns a const reverse iterator to the last element
-
-    Returns a const iterator to the reverse-beginning; that is, the last
-    element.
-
-    @image html range-rbegin-rend.svg "Illustration from cppreference.com"
-
-    @complexity Constant.
-
-    @requirement This function helps `basic_json` satisfying the
-    [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of `const_cast<const basic_json&>(*this).rbegin()`.
-
-    @liveexample{The following code shows an example for `crbegin()`.,crbegin}
-
-    @sa @ref rbegin() -- returns a reverse iterator to the beginning
-    @sa @ref rend() -- returns a reverse iterator to the end
-    @sa @ref crend() -- returns a const reverse iterator to the end
-
-    @since version 1.0.0
-    */
+    /// @brief returns a const reverse iterator to the last element
+    /// @sa https://json.nlohmann.me/api/basic_json/crbegin/
     const_reverse_iterator crbegin() const noexcept
     {
         return const_reverse_iterator(cend());
     }
 
-    /*!
-    @brief returns a const reverse iterator to one before the first
-
-    Returns a const reverse iterator to the reverse-end; that is, one before
-    the first element.
-
-    @image html range-rbegin-rend.svg "Illustration from cppreference.com"
-
-    @complexity Constant.
-
-    @requirement This function helps `basic_json` satisfying the
-    [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of `const_cast<const basic_json&>(*this).rend()`.
-
-    @liveexample{The following code shows an example for `crend()`.,crend}
-
-    @sa @ref rend() -- returns a reverse iterator to the end
-    @sa @ref rbegin() -- returns a reverse iterator to the beginning
-    @sa @ref crbegin() -- returns a const reverse iterator to the beginning
-
-    @since version 1.0.0
-    */
+    /// @brief returns a const reverse iterator to one before the first
+    /// @sa https://json.nlohmann.me/api/basic_json/crend/
     const_reverse_iterator crend() const noexcept
     {
         return const_reverse_iterator(cbegin());
     }
 
   public:
-    /*!
-    @brief wrapper to access iterator member functions in range-based for
-
-    This function allows to access @ref iterator::key() and @ref
-    iterator::value() during range-based for loops. In these loops, a
-    reference to the JSON values is returned, so there is no access to the
-    underlying iterator.
-
-    For loop without iterator_wrapper:
-
-    @code{cpp}
-    for (auto it = j_object.begin(); it != j_object.end(); ++it)
-    {
-        std::cout << "key: " << it.key() << ", value:" << it.value() << '\n';
-    }
-    @endcode
-
-    Range-based for loop without iterator proxy:
-
-    @code{cpp}
-    for (auto it : j_object)
-    {
-        // "it" is of type json::reference and has no key() member
-        std::cout << "value: " << it << '\n';
-    }
-    @endcode
-
-    Range-based for loop with iterator proxy:
-
-    @code{cpp}
-    for (auto it : json::iterator_wrapper(j_object))
-    {
-        std::cout << "key: " << it.key() << ", value:" << it.value() << '\n';
-    }
-    @endcode
-
-    @note When iterating over an array, `key()` will return the index of the
-          element as string (see example).
-
-    @param[in] ref  reference to a JSON value
-    @return iteration proxy object wrapping @a ref with an interface to use in
-            range-based for loops
-
-    @liveexample{The following code shows how the wrapper is used,iterator_wrapper}
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes in the JSON value.
-
-    @complexity Constant.
-
-    @note The name of this function is not yet final and may change in the
-    future.
-
-    @deprecated This stream operator is deprecated and will be removed in
-                future 4.0.0 of the library. Please use @ref items() instead;
-                that is, replace `json::iterator_wrapper(j)` with `j.items()`.
-    */
+    /// @brief wrapper to access iterator member functions in range-based for
+    /// @sa https://json.nlohmann.me/api/basic_json/items/
+    /// @deprecated This function is deprecated since 3.1.0 and will be removed in
+    ///             version 4.0.0 of the library. Please use @ref items() instead;
+    ///             that is, replace `json::iterator_wrapper(j)` with `j.items()`.
     JSON_HEDLEY_DEPRECATED_FOR(3.1.0, items())
     static iteration_proxy<iterator> iterator_wrapper(reference ref) noexcept
     {
         return ref.items();
     }
 
-    /*!
-    @copydoc iterator_wrapper(reference)
-    */
+    /// @brief wrapper to access iterator member functions in range-based for
+    /// @sa https://json.nlohmann.me/api/basic_json/items/
+    /// @deprecated This function is deprecated since 3.1.0 and will be removed in
+    ///         version 4.0.0 of the library. Please use @ref items() instead;
+    ///         that is, replace `json::iterator_wrapper(j)` with `j.items()`.
     JSON_HEDLEY_DEPRECATED_FOR(3.1.0, items())
     static iteration_proxy<const_iterator> iterator_wrapper(const_reference ref) noexcept
     {
         return ref.items();
     }
 
-    /*!
-    @brief helper to access iterator member functions in range-based for
-
-    This function allows to access @ref iterator::key() and @ref
-    iterator::value() during range-based for loops. In these loops, a
-    reference to the JSON values is returned, so there is no access to the
-    underlying iterator.
-
-    For loop without `items()` function:
-
-    @code{cpp}
-    for (auto it = j_object.begin(); it != j_object.end(); ++it)
-    {
-        std::cout << "key: " << it.key() << ", value:" << it.value() << '\n';
-    }
-    @endcode
-
-    Range-based for loop without `items()` function:
-
-    @code{cpp}
-    for (auto it : j_object)
-    {
-        // "it" is of type json::reference and has no key() member
-        std::cout << "value: " << it << '\n';
-    }
-    @endcode
-
-    Range-based for loop with `items()` function:
-
-    @code{cpp}
-    for (auto& el : j_object.items())
-    {
-        std::cout << "key: " << el.key() << ", value:" << el.value() << '\n';
-    }
-    @endcode
-
-    The `items()` function also allows to use
-    [structured bindings](https://en.cppreference.com/w/cpp/language/structured_binding)
-    (C++17):
-
-    @code{cpp}
-    for (auto& [key, val] : j_object.items())
-    {
-        std::cout << "key: " << key << ", value:" << val << '\n';
-    }
-    @endcode
-
-    @note When iterating over an array, `key()` will return the index of the
-          element as string (see example). For primitive types (e.g., numbers),
-          `key()` returns an empty string.
-
-    @warning Using `items()` on temporary objects is dangerous. Make sure the
-             object's lifetime exeeds the iteration. See
-             <https://github.com/nlohmann/json/issues/2040> for more
-             information.
-
-    @return iteration proxy object wrapping @a ref with an interface to use in
-            range-based for loops
-
-    @liveexample{The following code shows how the function is used.,items}
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes in the JSON value.
-
-    @complexity Constant.
-
-    @since version 3.1.0, structured bindings support since 3.5.0.
-    */
+    /// @brief helper to access iterator member functions in range-based for
+    /// @sa https://json.nlohmann.me/api/basic_json/items/
     iteration_proxy<iterator> items() noexcept
     {
         return iteration_proxy<iterator>(*this);
     }
 
-    /*!
-    @copydoc items()
-    */
+    /// @brief helper to access iterator member functions in range-based for
+    /// @sa https://json.nlohmann.me/api/basic_json/items/
     iteration_proxy<const_iterator> items() const noexcept
     {
         return iteration_proxy<const_iterator>(*this);
@@ -4974,7 +2894,6 @@ class basic_json
 
     /// @}
 
-
     //////////////
     // capacity //
     //////////////
@@ -4982,51 +2901,11 @@ class basic_json
     /// @name capacity
     /// @{
 
-    /*!
-    @brief checks whether the container is empty.
-
-    Checks if a JSON value has no elements (i.e. whether its @ref size is `0`).
-
-    @return The return value depends on the different types and is
-            defined as follows:
-            Value type  | return value
-            ----------- | -------------
-            null        | `true`
-            boolean     | `false`
-            string      | `false`
-            number      | `false`
-            binary      | `false`
-            object      | result of function `object_t::empty()`
-            array       | result of function `array_t::empty()`
-
-    @liveexample{The following code uses `empty()` to check if a JSON
-    object contains any elements.,empty}
-
-    @complexity Constant, as long as @ref array_t and @ref object_t satisfy
-    the Container concept; that is, their `empty()` functions have constant
-    complexity.
-
-    @iterators No changes.
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @note This function does not return whether a string stored as JSON value
-    is empty - it returns whether the JSON container itself is empty which is
-    false in the case of a string.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of `begin() == end()`.
-
-    @sa @ref size() -- returns the number of elements
-
-    @since version 1.0.0
-    */
+    /// @brief checks whether the container is empty.
+    /// @sa https://json.nlohmann.me/api/basic_json/empty/
     bool empty() const noexcept
     {
-        switch (m_type)
+        switch (m_data.m_type)
         {
             case value_t::null:
             {
@@ -5037,15 +2916,22 @@ class basic_json
             case value_t::array:
             {
                 // delegate call to array_t::empty()
-                return m_value.array->empty();
+                return m_data.m_value.array->empty();
             }
 
             case value_t::object:
             {
                 // delegate call to object_t::empty()
-                return m_value.object->empty();
+                return m_data.m_value.object->empty();
             }
 
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
             default:
             {
                 // all other types are nonempty
@@ -5054,52 +2940,11 @@ class basic_json
         }
     }
 
-    /*!
-    @brief returns the number of elements
-
-    Returns the number of elements in a JSON value.
-
-    @return The return value depends on the different types and is
-            defined as follows:
-            Value type  | return value
-            ----------- | -------------
-            null        | `0`
-            boolean     | `1`
-            string      | `1`
-            number      | `1`
-            binary      | `1`
-            object      | result of function object_t::size()
-            array       | result of function array_t::size()
-
-    @liveexample{The following code calls `size()` on the different value
-    types.,size}
-
-    @complexity Constant, as long as @ref array_t and @ref object_t satisfy
-    the Container concept; that is, their size() functions have constant
-    complexity.
-
-    @iterators No changes.
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @note This function does not return the length of a string stored as JSON
-    value - it returns the number of elements in the JSON value which is 1 in
-    the case of a string.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of `std::distance(begin(), end())`.
-
-    @sa @ref empty() -- checks whether the container is empty
-    @sa @ref max_size() -- returns the maximal number of elements
-
-    @since version 1.0.0
-    */
+    /// @brief returns the number of elements
+    /// @sa https://json.nlohmann.me/api/basic_json/size/
     size_type size() const noexcept
     {
-        switch (m_type)
+        switch (m_data.m_type)
         {
             case value_t::null:
             {
@@ -5110,15 +2955,22 @@ class basic_json
             case value_t::array:
             {
                 // delegate call to array_t::size()
-                return m_value.array->size();
+                return m_data.m_value.array->size();
             }
 
             case value_t::object:
             {
                 // delegate call to object_t::size()
-                return m_value.object->size();
+                return m_data.m_value.object->size();
             }
 
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
             default:
             {
                 // all other types have size 1
@@ -5127,63 +2979,32 @@ class basic_json
         }
     }
 
-    /*!
-    @brief returns the maximum possible number of elements
-
-    Returns the maximum number of elements a JSON value is able to hold due to
-    system or library implementation limitations, i.e. `std::distance(begin(),
-    end())` for the JSON value.
-
-    @return The return value depends on the different types and is
-            defined as follows:
-            Value type  | return value
-            ----------- | -------------
-            null        | `0` (same as `size()`)
-            boolean     | `1` (same as `size()`)
-            string      | `1` (same as `size()`)
-            number      | `1` (same as `size()`)
-            binary      | `1` (same as `size()`)
-            object      | result of function `object_t::max_size()`
-            array       | result of function `array_t::max_size()`
-
-    @liveexample{The following code calls `max_size()` on the different value
-    types. Note the output is implementation specific.,max_size}
-
-    @complexity Constant, as long as @ref array_t and @ref object_t satisfy
-    the Container concept; that is, their `max_size()` functions have constant
-    complexity.
-
-    @iterators No changes.
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of returning `b.size()` where `b` is the largest
-      possible JSON value.
-
-    @sa @ref size() -- returns the number of elements
-
-    @since version 1.0.0
-    */
+    /// @brief returns the maximum possible number of elements
+    /// @sa https://json.nlohmann.me/api/basic_json/max_size/
     size_type max_size() const noexcept
     {
-        switch (m_type)
+        switch (m_data.m_type)
         {
             case value_t::array:
             {
                 // delegate call to array_t::max_size()
-                return m_value.array->max_size();
+                return m_data.m_value.array->max_size();
             }
 
             case value_t::object:
             {
                 // delegate call to object_t::max_size()
-                return m_value.object->max_size();
+                return m_data.m_value.object->max_size();
             }
 
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
             default:
             {
                 // all other types have max_size() == size()
@@ -5194,7 +3015,6 @@ class basic_json
 
     /// @}
 
-
     ///////////////
     // modifiers //
     ///////////////
@@ -5202,263 +3022,165 @@ class basic_json
     /// @name modifiers
     /// @{
 
-    /*!
-    @brief clears the contents
-
-    Clears the content of a JSON value and resets it to the default value as
-    if @ref basic_json(value_t) would have been called with the current value
-    type from @ref type():
-
-    Value type  | initial value
-    ----------- | -------------
-    null        | `null`
-    boolean     | `false`
-    string      | `""`
-    number      | `0`
-    binary      | An empty byte vector
-    object      | `{}`
-    array       | `[]`
-
-    @post Has the same effect as calling
-    @code {.cpp}
-    *this = basic_json(type());
-    @endcode
-
-    @liveexample{The example below shows the effect of `clear()` to different
-    JSON types.,clear}
-
-    @complexity Linear in the size of the JSON value.
-
-    @iterators All iterators, pointers and references related to this container
-               are invalidated.
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @sa @ref basic_json(value_t) -- constructor that creates an object with the
-        same value than calling `clear()`
-
-    @since version 1.0.0
-    */
+    /// @brief clears the contents
+    /// @sa https://json.nlohmann.me/api/basic_json/clear/
     void clear() noexcept
     {
-        switch (m_type)
+        switch (m_data.m_type)
         {
             case value_t::number_integer:
             {
-                m_value.number_integer = 0;
+                m_data.m_value.number_integer = 0;
                 break;
             }
 
             case value_t::number_unsigned:
             {
-                m_value.number_unsigned = 0;
+                m_data.m_value.number_unsigned = 0;
                 break;
             }
 
             case value_t::number_float:
             {
-                m_value.number_float = 0.0;
+                m_data.m_value.number_float = 0.0;
                 break;
             }
 
             case value_t::boolean:
             {
-                m_value.boolean = false;
+                m_data.m_value.boolean = false;
                 break;
             }
 
             case value_t::string:
             {
-                m_value.string->clear();
+                m_data.m_value.string->clear();
                 break;
             }
 
             case value_t::binary:
             {
-                m_value.binary->clear();
+                m_data.m_value.binary->clear();
                 break;
             }
 
             case value_t::array:
             {
-                m_value.array->clear();
+                m_data.m_value.array->clear();
                 break;
             }
 
             case value_t::object:
             {
-                m_value.object->clear();
+                m_data.m_value.object->clear();
                 break;
             }
 
+            case value_t::null:
+            case value_t::discarded:
             default:
                 break;
         }
     }
 
-    /*!
-    @brief add an object to an array
-
-    Appends the given element @a val to the end of the JSON value. If the
-    function is called on a JSON null value, an empty array is created before
-    appending @a val.
-
-    @param[in] val the value to add to the JSON array
-
-    @throw type_error.308 when called on a type other than JSON array or
-    null; example: `"cannot use push_back() with number"`
-
-    @complexity Amortized constant.
-
-    @liveexample{The example shows how `push_back()` and `+=` can be used to
-    add elements to a JSON array. Note how the `null` value was silently
-    converted to a JSON array.,push_back}
-
-    @since version 1.0.0
-    */
+    /// @brief add an object to an array
+    /// @sa https://json.nlohmann.me/api/basic_json/push_back/
     void push_back(basic_json&& val)
     {
         // push_back only works for null objects or arrays
         if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_array())))
         {
-            JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name()), *this));
+            JSON_THROW(type_error::create(308, detail::concat("cannot use push_back() with ", type_name()), this));
         }
 
         // transform null object into an array
         if (is_null())
         {
-            m_type = value_t::array;
-            m_value = value_t::array;
+            m_data.m_type = value_t::array;
+            m_data.m_value = value_t::array;
             assert_invariant();
         }
 
         // add element to array (move semantics)
-        m_value.array->push_back(std::move(val));
-        set_parent(m_value.array->back());
-        // if val is moved from, basic_json move constructor marks it null so we do not call the destructor
+        const auto old_capacity = m_data.m_value.array->capacity();
+        m_data.m_value.array->push_back(std::move(val));
+        set_parent(m_data.m_value.array->back(), old_capacity);
+        // if val is moved from, basic_json move constructor marks it null, so we do not call the destructor
     }
 
-    /*!
-    @brief add an object to an array
-    @copydoc push_back(basic_json&&)
-    */
+    /// @brief add an object to an array
+    /// @sa https://json.nlohmann.me/api/basic_json/operator+=/
     reference operator+=(basic_json&& val)
     {
         push_back(std::move(val));
         return *this;
     }
 
-    /*!
-    @brief add an object to an array
-    @copydoc push_back(basic_json&&)
-    */
+    /// @brief add an object to an array
+    /// @sa https://json.nlohmann.me/api/basic_json/push_back/
     void push_back(const basic_json& val)
     {
         // push_back only works for null objects or arrays
         if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_array())))
         {
-            JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name()), *this));
+            JSON_THROW(type_error::create(308, detail::concat("cannot use push_back() with ", type_name()), this));
         }
 
         // transform null object into an array
         if (is_null())
         {
-            m_type = value_t::array;
-            m_value = value_t::array;
+            m_data.m_type = value_t::array;
+            m_data.m_value = value_t::array;
             assert_invariant();
         }
 
         // add element to array
-        m_value.array->push_back(val);
-        set_parent(m_value.array->back());
+        const auto old_capacity = m_data.m_value.array->capacity();
+        m_data.m_value.array->push_back(val);
+        set_parent(m_data.m_value.array->back(), old_capacity);
     }
-
-    /*!
-    @brief add an object to an array
-    @copydoc push_back(basic_json&&)
-    */
+
+    /// @brief add an object to an array
+    /// @sa https://json.nlohmann.me/api/basic_json/operator+=/
     reference operator+=(const basic_json& val)
     {
         push_back(val);
         return *this;
     }
 
-    /*!
-    @brief add an object to an object
-
-    Inserts the given element @a val to the JSON object. If the function is
-    called on a JSON null value, an empty object is created before inserting
-    @a val.
-
-    @param[in] val the value to add to the JSON object
-
-    @throw type_error.308 when called on a type other than JSON object or
-    null; example: `"cannot use push_back() with number"`
-
-    @complexity Logarithmic in the size of the container, O(log(`size()`)).
-
-    @liveexample{The example shows how `push_back()` and `+=` can be used to
-    add elements to a JSON object. Note how the `null` value was silently
-    converted to a JSON object.,push_back__object_t__value}
-
-    @since version 1.0.0
-    */
+    /// @brief add an object to an object
+    /// @sa https://json.nlohmann.me/api/basic_json/push_back/
     void push_back(const typename object_t::value_type& val)
     {
         // push_back only works for null objects or objects
         if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_object())))
         {
-            JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name()), *this));
+            JSON_THROW(type_error::create(308, detail::concat("cannot use push_back() with ", type_name()), this));
         }
 
         // transform null object into an object
         if (is_null())
         {
-            m_type = value_t::object;
-            m_value = value_t::object;
+            m_data.m_type = value_t::object;
+            m_data.m_value = value_t::object;
             assert_invariant();
         }
 
         // add element to object
-        auto res = m_value.object->insert(val);
+        auto res = m_data.m_value.object->insert(val);
         set_parent(res.first->second);
     }
 
-    /*!
-    @brief add an object to an object
-    @copydoc push_back(const typename object_t::value_type&)
-    */
+    /// @brief add an object to an object
+    /// @sa https://json.nlohmann.me/api/basic_json/operator+=/
     reference operator+=(const typename object_t::value_type& val)
     {
         push_back(val);
         return *this;
     }
 
-    /*!
-    @brief add an object to an object
-
-    This function allows to use `push_back` with an initializer list. In case
-
-    1. the current value is an object,
-    2. the initializer list @a init contains only two elements, and
-    3. the first element of @a init is a string,
-
-    @a init is converted into an object element and added using
-    @ref push_back(const typename object_t::value_type&). Otherwise, @a init
-    is converted to a JSON value and added using @ref push_back(basic_json&&).
-
-    @param[in] init  an initializer list
-
-    @complexity Linear in the size of the initializer list @a init.
-
-    @note This function is required to resolve an ambiguous overload error,
-          because pairs like `{"key", "value"}` can be both interpreted as
-          `object_t::value_type` or `std::initializer_list<basic_json>`, see
-          https://github.com/nlohmann/json/issues/235 for more information.
-
-    @liveexample{The example shows how initializer lists are treated as
-    objects when possible.,push_back__initializer_list}
-    */
+    /// @brief add an object to an object
+    /// @sa https://json.nlohmann.me/api/basic_json/push_back/
     void push_back(initializer_list_t init)
     {
         if (is_object() && init.size() == 2 && (*init.begin())->is_string())
@@ -5473,111 +3195,60 @@ class basic_json
         }
     }
 
-    /*!
-    @brief add an object to an object
-    @copydoc push_back(initializer_list_t)
-    */
+    /// @brief add an object to an object
+    /// @sa https://json.nlohmann.me/api/basic_json/operator+=/
     reference operator+=(initializer_list_t init)
     {
         push_back(init);
         return *this;
     }
 
-    /*!
-    @brief add an object to an array
-
-    Creates a JSON value from the passed parameters @a args to the end of the
-    JSON value. If the function is called on a JSON null value, an empty array
-    is created before appending the value created from @a args.
-
-    @param[in] args arguments to forward to a constructor of @ref basic_json
-    @tparam Args compatible types to create a @ref basic_json object
-
-    @return reference to the inserted element
-
-    @throw type_error.311 when called on a type other than JSON array or
-    null; example: `"cannot use emplace_back() with number"`
-
-    @complexity Amortized constant.
-
-    @liveexample{The example shows how `push_back()` can be used to add
-    elements to a JSON array. Note how the `null` value was silently converted
-    to a JSON array.,emplace_back}
-
-    @since version 2.0.8, returns reference since 3.7.0
-    */
+    /// @brief add an object to an array
+    /// @sa https://json.nlohmann.me/api/basic_json/emplace_back/
     template<class... Args>
     reference emplace_back(Args&& ... args)
     {
         // emplace_back only works for null objects or arrays
         if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_array())))
         {
-            JSON_THROW(type_error::create(311, "cannot use emplace_back() with " + std::string(type_name()), *this));
+            JSON_THROW(type_error::create(311, detail::concat("cannot use emplace_back() with ", type_name()), this));
         }
 
         // transform null object into an array
         if (is_null())
         {
-            m_type = value_t::array;
-            m_value = value_t::array;
+            m_data.m_type = value_t::array;
+            m_data.m_value = value_t::array;
             assert_invariant();
         }
 
         // add element to array (perfect forwarding)
-#ifdef JSON_HAS_CPP_17
-        return set_parent(m_value.array->emplace_back(std::forward<Args>(args)...));
-#else
-        m_value.array->emplace_back(std::forward<Args>(args)...);
-        return set_parent(m_value.array->back());
-#endif
+        const auto old_capacity = m_data.m_value.array->capacity();
+        m_data.m_value.array->emplace_back(std::forward<Args>(args)...);
+        return set_parent(m_data.m_value.array->back(), old_capacity);
     }
 
-    /*!
-    @brief add an object to an object if key does not exist
-
-    Inserts a new element into a JSON object constructed in-place with the
-    given @a args if there is no element with the key in the container. If the
-    function is called on a JSON null value, an empty object is created before
-    appending the value created from @a args.
-
-    @param[in] args arguments to forward to a constructor of @ref basic_json
-    @tparam Args compatible types to create a @ref basic_json object
-
-    @return a pair consisting of an iterator to the inserted element, or the
-            already-existing element if no insertion happened, and a bool
-            denoting whether the insertion took place.
-
-    @throw type_error.311 when called on a type other than JSON object or
-    null; example: `"cannot use emplace() with number"`
-
-    @complexity Logarithmic in the size of the container, O(log(`size()`)).
-
-    @liveexample{The example shows how `emplace()` can be used to add elements
-    to a JSON object. Note how the `null` value was silently converted to a
-    JSON object. Further note how no value is added if there was already one
-    value stored with the same key.,emplace}
-
-    @since version 2.0.8
-    */
+    /// @brief add an object to an object if key does not exist
+    /// @sa https://json.nlohmann.me/api/basic_json/emplace/
     template<class... Args>
     std::pair<iterator, bool> emplace(Args&& ... args)
     {
         // emplace only works for null objects or arrays
         if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_object())))
         {
-            JSON_THROW(type_error::create(311, "cannot use emplace() with " + std::string(type_name()), *this));
+            JSON_THROW(type_error::create(311, detail::concat("cannot use emplace() with ", type_name()), this));
         }
 
         // transform null object into an object
         if (is_null())
         {
-            m_type = value_t::object;
-            m_value = value_t::object;
+            m_data.m_type = value_t::object;
+            m_data.m_value = value_t::object;
             assert_invariant();
         }
 
         // add element to array (perfect forwarding)
-        auto res = m_value.object->emplace(std::forward<Args>(args)...);
+        auto res = m_data.m_value.object->emplace(std::forward<Args>(args)...);
         set_parent(res.first->second);
 
         // create result iterator and set iterator to the result of emplace
@@ -5595,41 +3266,22 @@ class basic_json
     iterator insert_iterator(const_iterator pos, Args&& ... args)
     {
         iterator result(this);
-        JSON_ASSERT(m_value.array != nullptr);
+        JSON_ASSERT(m_data.m_value.array != nullptr);
 
-        auto insert_pos = std::distance(m_value.array->begin(), pos.m_it.array_iterator);
-        m_value.array->insert(pos.m_it.array_iterator, std::forward<Args>(args)...);
-        result.m_it.array_iterator = m_value.array->begin() + insert_pos;
+        auto insert_pos = std::distance(m_data.m_value.array->begin(), pos.m_it.array_iterator);
+        m_data.m_value.array->insert(pos.m_it.array_iterator, std::forward<Args>(args)...);
+        result.m_it.array_iterator = m_data.m_value.array->begin() + insert_pos;
 
         // This could have been written as:
-        // result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, cnt, val);
+        // result.m_it.array_iterator = m_data.m_value.array->insert(pos.m_it.array_iterator, cnt, val);
         // but the return value of insert is missing in GCC 4.8, so it is written this way instead.
 
+        set_parents();
         return result;
     }
 
-    /*!
-    @brief inserts element
-
-    Inserts element @a val before iterator @a pos.
-
-    @param[in] pos iterator before which the content will be inserted; may be
-    the end() iterator
-    @param[in] val element to insert
-    @return iterator pointing to the inserted @a val.
-
-    @throw type_error.309 if called on JSON values other than arrays;
-    example: `"cannot use insert() with string"`
-    @throw invalid_iterator.202 if @a pos is not an iterator of *this;
-    example: `"iterator does not fit current value"`
-
-    @complexity Constant plus linear in the distance between @a pos and end of
-    the container.
-
-    @liveexample{The example shows how `insert()` is used.,insert}
-
-    @since version 1.0.0
-    */
+    /// @brief inserts element into array
+    /// @sa https://json.nlohmann.me/api/basic_json/insert/
     iterator insert(const_iterator pos, const basic_json& val)
     {
         // insert only works for arrays
@@ -5638,49 +3290,25 @@ class basic_json
             // check if iterator pos fits to this JSON value
             if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
             {
-                JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", *this));
+                JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", this));
             }
 
             // insert to array and return iterator
-            return set_parents(insert_iterator(pos, val), static_cast<typename iterator::difference_type>(1));
+            return insert_iterator(pos, val);
         }
 
-        JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name()), *this));
+        JSON_THROW(type_error::create(309, detail::concat("cannot use insert() with ", type_name()), this));
     }
 
-    /*!
-    @brief inserts element
-    @copydoc insert(const_iterator, const basic_json&)
-    */
+    /// @brief inserts element into array
+    /// @sa https://json.nlohmann.me/api/basic_json/insert/
     iterator insert(const_iterator pos, basic_json&& val)
     {
         return insert(pos, val);
     }
 
-    /*!
-    @brief inserts elements
-
-    Inserts @a cnt copies of @a val before iterator @a pos.
-
-    @param[in] pos iterator before which the content will be inserted; may be
-    the end() iterator
-    @param[in] cnt number of copies of @a val to insert
-    @param[in] val element to insert
-    @return iterator pointing to the first element inserted, or @a pos if
-    `cnt==0`
-
-    @throw type_error.309 if called on JSON values other than arrays; example:
-    `"cannot use insert() with string"`
-    @throw invalid_iterator.202 if @a pos is not an iterator of *this;
-    example: `"iterator does not fit current value"`
-
-    @complexity Linear in @a cnt plus linear in the distance between @a pos
-    and end of the container.
-
-    @liveexample{The example shows how `insert()` is used.,insert__count}
-
-    @since version 1.0.0
-    */
+    /// @brief inserts copies of element into array
+    /// @sa https://json.nlohmann.me/api/basic_json/insert/
     iterator insert(const_iterator pos, size_type cnt, const basic_json& val)
     {
         // insert only works for arrays
@@ -5689,476 +3317,257 @@ class basic_json
             // check if iterator pos fits to this JSON value
             if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
             {
-                JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", *this));
+                JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", this));
             }
 
             // insert to array and return iterator
-            return set_parents(insert_iterator(pos, cnt, val), static_cast<typename iterator::difference_type>(cnt));
+            return insert_iterator(pos, cnt, val);
         }
 
-        JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name()), *this));
+        JSON_THROW(type_error::create(309, detail::concat("cannot use insert() with ", type_name()), this));
     }
 
-    /*!
-    @brief inserts elements
-
-    Inserts elements from range `[first, last)` before iterator @a pos.
-
-    @param[in] pos iterator before which the content will be inserted; may be
-    the end() iterator
-    @param[in] first begin of the range of elements to insert
-    @param[in] last end of the range of elements to insert
-
-    @throw type_error.309 if called on JSON values other than arrays; example:
-    `"cannot use insert() with string"`
-    @throw invalid_iterator.202 if @a pos is not an iterator of *this;
-    example: `"iterator does not fit current value"`
-    @throw invalid_iterator.210 if @a first and @a last do not belong to the
-    same JSON value; example: `"iterators do not fit"`
-    @throw invalid_iterator.211 if @a first or @a last are iterators into
-    container for which insert is called; example: `"passed iterators may not
-    belong to container"`
-
-    @return iterator pointing to the first element inserted, or @a pos if
-    `first==last`
-
-    @complexity Linear in `std::distance(first, last)` plus linear in the
-    distance between @a pos and end of the container.
-
-    @liveexample{The example shows how `insert()` is used.,insert__range}
-
-    @since version 1.0.0
-    */
+    /// @brief inserts range of elements into array
+    /// @sa https://json.nlohmann.me/api/basic_json/insert/
     iterator insert(const_iterator pos, const_iterator first, const_iterator last)
     {
         // insert only works for arrays
         if (JSON_HEDLEY_UNLIKELY(!is_array()))
         {
-            JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name()), *this));
+            JSON_THROW(type_error::create(309, detail::concat("cannot use insert() with ", type_name()), this));
         }
 
         // check if iterator pos fits to this JSON value
         if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
         {
-            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", *this));
+            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", this));
         }
 
         // check if range iterators belong to the same JSON object
         if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
         {
-            JSON_THROW(invalid_iterator::create(210, "iterators do not fit", *this));
+            JSON_THROW(invalid_iterator::create(210, "iterators do not fit", this));
         }
 
         if (JSON_HEDLEY_UNLIKELY(first.m_object == this))
         {
-            JSON_THROW(invalid_iterator::create(211, "passed iterators may not belong to container", *this));
+            JSON_THROW(invalid_iterator::create(211, "passed iterators may not belong to container", this));
         }
 
         // insert to array and return iterator
-        return set_parents(insert_iterator(pos, first.m_it.array_iterator, last.m_it.array_iterator), std::distance(first, last));
+        return insert_iterator(pos, first.m_it.array_iterator, last.m_it.array_iterator);
     }
 
-    /*!
-    @brief inserts elements
-
-    Inserts elements from initializer list @a ilist before iterator @a pos.
-
-    @param[in] pos iterator before which the content will be inserted; may be
-    the end() iterator
-    @param[in] ilist initializer list to insert the values from
-
-    @throw type_error.309 if called on JSON values other than arrays; example:
-    `"cannot use insert() with string"`
-    @throw invalid_iterator.202 if @a pos is not an iterator of *this;
-    example: `"iterator does not fit current value"`
-
-    @return iterator pointing to the first element inserted, or @a pos if
-    `ilist` is empty
-
-    @complexity Linear in `ilist.size()` plus linear in the distance between
-    @a pos and end of the container.
-
-    @liveexample{The example shows how `insert()` is used.,insert__ilist}
-
-    @since version 1.0.0
-    */
+    /// @brief inserts elements from initializer list into array
+    /// @sa https://json.nlohmann.me/api/basic_json/insert/
     iterator insert(const_iterator pos, initializer_list_t ilist)
     {
         // insert only works for arrays
         if (JSON_HEDLEY_UNLIKELY(!is_array()))
         {
-            JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name()), *this));
+            JSON_THROW(type_error::create(309, detail::concat("cannot use insert() with ", type_name()), this));
         }
 
         // check if iterator pos fits to this JSON value
         if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
         {
-            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", *this));
+            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", this));
         }
 
         // insert to array and return iterator
-        return set_parents(insert_iterator(pos, ilist.begin(), ilist.end()), static_cast<typename iterator::difference_type>(ilist.size()));
+        return insert_iterator(pos, ilist.begin(), ilist.end());
     }
 
-    /*!
-    @brief inserts elements
-
-    Inserts elements from range `[first, last)`.
-
-    @param[in] first begin of the range of elements to insert
-    @param[in] last end of the range of elements to insert
-
-    @throw type_error.309 if called on JSON values other than objects; example:
-    `"cannot use insert() with string"`
-    @throw invalid_iterator.202 if iterator @a first or @a last does does not
-    point to an object; example: `"iterators first and last must point to
-    objects"`
-    @throw invalid_iterator.210 if @a first and @a last do not belong to the
-    same JSON value; example: `"iterators do not fit"`
-
-    @complexity Logarithmic: `O(N*log(size() + N))`, where `N` is the number
-    of elements to insert.
-
-    @liveexample{The example shows how `insert()` is used.,insert__range_object}
-
-    @since version 3.0.0
-    */
+    /// @brief inserts range of elements into object
+    /// @sa https://json.nlohmann.me/api/basic_json/insert/
     void insert(const_iterator first, const_iterator last)
     {
         // insert only works for objects
         if (JSON_HEDLEY_UNLIKELY(!is_object()))
         {
-            JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name()), *this));
+            JSON_THROW(type_error::create(309, detail::concat("cannot use insert() with ", type_name()), this));
         }
 
         // check if range iterators belong to the same JSON object
         if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
         {
-            JSON_THROW(invalid_iterator::create(210, "iterators do not fit", *this));
+            JSON_THROW(invalid_iterator::create(210, "iterators do not fit", this));
         }
 
         // passed iterators must belong to objects
         if (JSON_HEDLEY_UNLIKELY(!first.m_object->is_object()))
         {
-            JSON_THROW(invalid_iterator::create(202, "iterators first and last must point to objects", *this));
+            JSON_THROW(invalid_iterator::create(202, "iterators first and last must point to objects", this));
         }
 
-        m_value.object->insert(first.m_it.object_iterator, last.m_it.object_iterator);
+        m_data.m_value.object->insert(first.m_it.object_iterator, last.m_it.object_iterator);
     }
 
-    /*!
-    @brief updates a JSON object from another object, overwriting existing keys
-
-    Inserts all values from JSON object @a j and overwrites existing keys.
-
-    @param[in] j  JSON object to read values from
-
-    @throw type_error.312 if called on JSON values other than objects; example:
-    `"cannot use update() with string"`
-
-    @complexity O(N*log(size() + N)), where N is the number of elements to
-                insert.
-
-    @liveexample{The example shows how `update()` is used.,update}
-
-    @sa https://docs.python.org/3.6/library/stdtypes.html#dict.update
-
-    @since version 3.0.0
-    */
-    void update(const_reference j)
+    /// @brief updates a JSON object from another object, overwriting existing keys
+    /// @sa https://json.nlohmann.me/api/basic_json/update/
+    void update(const_reference j, bool merge_objects = false)
     {
-        // implicitly convert null value to an empty object
-        if (is_null())
-        {
-            m_type = value_t::object;
-            m_value.object = create<object_t>();
-            assert_invariant();
-        }
-
-        if (JSON_HEDLEY_UNLIKELY(!is_object()))
-        {
-            JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(type_name()), *this));
-        }
-        if (JSON_HEDLEY_UNLIKELY(!j.is_object()))
-        {
-            JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(j.type_name()), *this));
-        }
-
-        for (auto it = j.cbegin(); it != j.cend(); ++it)
-        {
-            m_value.object->operator[](it.key()) = it.value();
-        }
+        update(j.begin(), j.end(), merge_objects);
     }
 
-    /*!
-    @brief updates a JSON object from another object, overwriting existing keys
-
-    Inserts all values from from range `[first, last)` and overwrites existing
-    keys.
-
-    @param[in] first begin of the range of elements to insert
-    @param[in] last end of the range of elements to insert
-
-    @throw type_error.312 if called on JSON values other than objects; example:
-    `"cannot use update() with string"`
-    @throw invalid_iterator.202 if iterator @a first or @a last does does not
-    point to an object; example: `"iterators first and last must point to
-    objects"`
-    @throw invalid_iterator.210 if @a first and @a last do not belong to the
-    same JSON value; example: `"iterators do not fit"`
-
-    @complexity O(N*log(size() + N)), where N is the number of elements to
-                insert.
-
-    @liveexample{The example shows how `update()` is used__range.,update}
-
-    @sa https://docs.python.org/3.6/library/stdtypes.html#dict.update
-
-    @since version 3.0.0
-    */
-    void update(const_iterator first, const_iterator last)
+    /// @brief updates a JSON object from another object, overwriting existing keys
+    /// @sa https://json.nlohmann.me/api/basic_json/update/
+    void update(const_iterator first, const_iterator last, bool merge_objects = false)
     {
         // implicitly convert null value to an empty object
         if (is_null())
         {
-            m_type = value_t::object;
-            m_value.object = create<object_t>();
+            m_data.m_type = value_t::object;
+            m_data.m_value.object = create<object_t>();
             assert_invariant();
         }
 
         if (JSON_HEDLEY_UNLIKELY(!is_object()))
         {
-            JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(type_name()), *this));
+            JSON_THROW(type_error::create(312, detail::concat("cannot use update() with ", type_name()), this));
         }
 
         // check if range iterators belong to the same JSON object
         if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
         {
-            JSON_THROW(invalid_iterator::create(210, "iterators do not fit", *this));
+            JSON_THROW(invalid_iterator::create(210, "iterators do not fit", this));
         }
 
         // passed iterators must belong to objects
-        if (JSON_HEDLEY_UNLIKELY(!first.m_object->is_object()
-                                 || !last.m_object->is_object()))
+        if (JSON_HEDLEY_UNLIKELY(!first.m_object->is_object()))
         {
-            JSON_THROW(invalid_iterator::create(202, "iterators first and last must point to objects", *this));
+            JSON_THROW(type_error::create(312, detail::concat("cannot use update() with ", first.m_object->type_name()), first.m_object));
         }
 
         for (auto it = first; it != last; ++it)
         {
-            m_value.object->operator[](it.key()) = it.value();
+            if (merge_objects && it.value().is_object())
+            {
+                auto it2 = m_data.m_value.object->find(it.key());
+                if (it2 != m_data.m_value.object->end())
+                {
+                    it2->second.update(it.value(), true);
+                    continue;
+                }
+            }
+            m_data.m_value.object->operator[](it.key()) = it.value();
+#if JSON_DIAGNOSTICS
+            m_data.m_value.object->operator[](it.key()).m_parent = this;
+#endif
         }
     }
 
-    /*!
-    @brief exchanges the values
-
-    Exchanges the contents of the JSON value with those of @a other. Does not
-    invoke any move, copy, or swap operations on individual elements. All
-    iterators and references remain valid. The past-the-end iterator is
-    invalidated.
-
-    @param[in,out] other JSON value to exchange the contents with
-
-    @complexity Constant.
-
-    @liveexample{The example below shows how JSON values can be swapped with
-    `swap()`.,swap__reference}
-
-    @since version 1.0.0
-    */
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
     void swap(reference other) noexcept (
         std::is_nothrow_move_constructible<value_t>::value&&
         std::is_nothrow_move_assignable<value_t>::value&&
-        std::is_nothrow_move_constructible<json_value>::value&&
+        std::is_nothrow_move_constructible<json_value>::value&& // NOLINT(cppcoreguidelines-noexcept-swap,performance-noexcept-swap)
         std::is_nothrow_move_assignable<json_value>::value
     )
     {
-        std::swap(m_type, other.m_type);
-        std::swap(m_value, other.m_value);
+        std::swap(m_data.m_type, other.m_data.m_type);
+        std::swap(m_data.m_value, other.m_data.m_value);
 
         set_parents();
         other.set_parents();
         assert_invariant();
     }
 
-    /*!
-    @brief exchanges the values
-
-    Exchanges the contents of the JSON value from @a left with those of @a right. Does not
-    invoke any move, copy, or swap operations on individual elements. All
-    iterators and references remain valid. The past-the-end iterator is
-    invalidated. implemented as a friend function callable via ADL.
-
-    @param[in,out] left JSON value to exchange the contents with
-    @param[in,out] right JSON value to exchange the contents with
-
-    @complexity Constant.
-
-    @liveexample{The example below shows how JSON values can be swapped with
-    `swap()`.,swap__reference}
-
-    @since version 1.0.0
-    */
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
     friend void swap(reference left, reference right) noexcept (
         std::is_nothrow_move_constructible<value_t>::value&&
         std::is_nothrow_move_assignable<value_t>::value&&
-        std::is_nothrow_move_constructible<json_value>::value&&
+        std::is_nothrow_move_constructible<json_value>::value&& // NOLINT(cppcoreguidelines-noexcept-swap,performance-noexcept-swap)
         std::is_nothrow_move_assignable<json_value>::value
     )
     {
         left.swap(right);
     }
 
-    /*!
-    @brief exchanges the values
-
-    Exchanges the contents of a JSON array with those of @a other. Does not
-    invoke any move, copy, or swap operations on individual elements. All
-    iterators and references remain valid. The past-the-end iterator is
-    invalidated.
-
-    @param[in,out] other array to exchange the contents with
-
-    @throw type_error.310 when JSON value is not an array; example: `"cannot
-    use swap() with string"`
-
-    @complexity Constant.
-
-    @liveexample{The example below shows how arrays can be swapped with
-    `swap()`.,swap__array_t}
-
-    @since version 1.0.0
-    */
-    void swap(array_t& other)
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    void swap(array_t& other) // NOLINT(bugprone-exception-escape,cppcoreguidelines-noexcept-swap,performance-noexcept-swap)
     {
         // swap only works for arrays
         if (JSON_HEDLEY_LIKELY(is_array()))
         {
-            std::swap(*(m_value.array), other);
+            using std::swap;
+            swap(*(m_data.m_value.array), other);
         }
         else
         {
-            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name()), *this));
+            JSON_THROW(type_error::create(310, detail::concat("cannot use swap(array_t&) with ", type_name()), this));
         }
     }
 
-    /*!
-    @brief exchanges the values
-
-    Exchanges the contents of a JSON object with those of @a other. Does not
-    invoke any move, copy, or swap operations on individual elements. All
-    iterators and references remain valid. The past-the-end iterator is
-    invalidated.
-
-    @param[in,out] other object to exchange the contents with
-
-    @throw type_error.310 when JSON value is not an object; example:
-    `"cannot use swap() with string"`
-
-    @complexity Constant.
-
-    @liveexample{The example below shows how objects can be swapped with
-    `swap()`.,swap__object_t}
-
-    @since version 1.0.0
-    */
-    void swap(object_t& other)
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    void swap(object_t& other) // NOLINT(bugprone-exception-escape,cppcoreguidelines-noexcept-swap,performance-noexcept-swap)
     {
         // swap only works for objects
         if (JSON_HEDLEY_LIKELY(is_object()))
         {
-            std::swap(*(m_value.object), other);
+            using std::swap;
+            swap(*(m_data.m_value.object), other);
         }
         else
         {
-            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name()), *this));
+            JSON_THROW(type_error::create(310, detail::concat("cannot use swap(object_t&) with ", type_name()), this));
         }
     }
 
-    /*!
-    @brief exchanges the values
-
-    Exchanges the contents of a JSON string with those of @a other. Does not
-    invoke any move, copy, or swap operations on individual elements. All
-    iterators and references remain valid. The past-the-end iterator is
-    invalidated.
-
-    @param[in,out] other string to exchange the contents with
-
-    @throw type_error.310 when JSON value is not a string; example: `"cannot
-    use swap() with boolean"`
-
-    @complexity Constant.
-
-    @liveexample{The example below shows how strings can be swapped with
-    `swap()`.,swap__string_t}
-
-    @since version 1.0.0
-    */
-    void swap(string_t& other)
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    void swap(string_t& other) // NOLINT(bugprone-exception-escape,cppcoreguidelines-noexcept-swap,performance-noexcept-swap)
     {
         // swap only works for strings
         if (JSON_HEDLEY_LIKELY(is_string()))
         {
-            std::swap(*(m_value.string), other);
+            using std::swap;
+            swap(*(m_data.m_value.string), other);
         }
         else
         {
-            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name()), *this));
+            JSON_THROW(type_error::create(310, detail::concat("cannot use swap(string_t&) with ", type_name()), this));
         }
     }
 
-    /*!
-    @brief exchanges the values
-
-    Exchanges the contents of a JSON string with those of @a other. Does not
-    invoke any move, copy, or swap operations on individual elements. All
-    iterators and references remain valid. The past-the-end iterator is
-    invalidated.
-
-    @param[in,out] other binary to exchange the contents with
-
-    @throw type_error.310 when JSON value is not a string; example: `"cannot
-    use swap() with boolean"`
-
-    @complexity Constant.
-
-    @liveexample{The example below shows how strings can be swapped with
-    `swap()`.,swap__binary_t}
-
-    @since version 3.8.0
-    */
-    void swap(binary_t& other)
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    void swap(binary_t& other) // NOLINT(bugprone-exception-escape,cppcoreguidelines-noexcept-swap,performance-noexcept-swap)
     {
         // swap only works for strings
         if (JSON_HEDLEY_LIKELY(is_binary()))
         {
-            std::swap(*(m_value.binary), other);
+            using std::swap;
+            swap(*(m_data.m_value.binary), other);
         }
         else
         {
-            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name()), *this));
+            JSON_THROW(type_error::create(310, detail::concat("cannot use swap(binary_t&) with ", type_name()), this));
         }
     }
 
-    /// @copydoc swap(binary_t)
-    void swap(typename binary_t::container_type& other)
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    void swap(typename binary_t::container_type& other) // NOLINT(bugprone-exception-escape)
     {
         // swap only works for strings
         if (JSON_HEDLEY_LIKELY(is_binary()))
         {
-            std::swap(*(m_value.binary), other);
+            using std::swap;
+            swap(*(m_data.m_value.binary), other);
         }
         else
         {
-            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name()), *this));
+            JSON_THROW(type_error::create(310, detail::concat("cannot use swap(binary_t::container_type&) with ", type_name()), this));
         }
     }
 
     /// @}
 
-  public:
     //////////////////////////////////////////
     // lexicographical comparison operators //
     //////////////////////////////////////////
@@ -6166,454 +3575,391 @@ class basic_json
     /// @name lexicographical comparison operators
     /// @{
 
-    /*!
-    @brief comparison: equal
-
-    Compares two JSON values for equality according to the following rules:
-    - Two JSON values are equal if (1) they are from the same type and (2)
-      their stored values are the same according to their respective
-      `operator==`.
-    - Integer and floating-point numbers are automatically converted before
-      comparison. Note that two NaN values are always treated as unequal.
-    - Two JSON null values are equal.
-
-    @note Floating-point inside JSON values numbers are compared with
-    `json::number_float_t::operator==` which is `double::operator==` by
-    default. To compare floating-point while respecting an epsilon, an alternative
-    [comparison function](https://github.com/mariokonrad/marnav/blob/master/include/marnav/math/floatingpoint.hpp#L34-#L39)
-    could be used, for instance
-    @code {.cpp}
-    template<typename T, typename = typename std::enable_if<std::is_floating_point<T>::value, T>::type>
-    inline bool is_same(T a, T b, T epsilon = std::numeric_limits<T>::epsilon()) noexcept
-    {
-        return std::abs(a - b) <= epsilon;
-    }
-    @endcode
-    Or you can self-defined operator equal function like this:
-    @code {.cpp}
-    bool my_equal(const_reference lhs, const_reference rhs) {
-    const auto lhs_type lhs.type();
-    const auto rhs_type rhs.type();
-    if (lhs_type == rhs_type) {
-        switch(lhs_type)
-            // self_defined case
-            case value_t::number_float:
-                return std::abs(lhs - rhs) <= std::numeric_limits<float>::epsilon();
-            // other cases remain the same with the original
-            ...
-    }
-    ...
-    }
-    @endcode
-
-    @note NaN values never compare equal to themselves or to other NaN values.
-
-    @param[in] lhs  first JSON value to consider
-    @param[in] rhs  second JSON value to consider
-    @return whether the values @a lhs and @a rhs are equal
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @complexity Linear.
+    // note parentheses around operands are necessary; see
+    // https://github.com/nlohmann/json/issues/1530
+#define JSON_IMPLEMENT_OPERATOR(op, null_result, unordered_result, default_result)                       \
+    const auto lhs_type = lhs.type();                                                                    \
+    const auto rhs_type = rhs.type();                                                                    \
+    \
+    if (lhs_type == rhs_type) /* NOLINT(readability/braces) */                                           \
+    {                                                                                                    \
+        switch (lhs_type)                                                                                \
+        {                                                                                                \
+            case value_t::array:                                                                         \
+                return (*lhs.m_data.m_value.array) op (*rhs.m_data.m_value.array);                                     \
+                \
+            case value_t::object:                                                                        \
+                return (*lhs.m_data.m_value.object) op (*rhs.m_data.m_value.object);                                   \
+                \
+            case value_t::null:                                                                          \
+                return (null_result);                                                                    \
+                \
+            case value_t::string:                                                                        \
+                return (*lhs.m_data.m_value.string) op (*rhs.m_data.m_value.string);                                   \
+                \
+            case value_t::boolean:                                                                       \
+                return (lhs.m_data.m_value.boolean) op (rhs.m_data.m_value.boolean);                                   \
+                \
+            case value_t::number_integer:                                                                \
+                return (lhs.m_data.m_value.number_integer) op (rhs.m_data.m_value.number_integer);                     \
+                \
+            case value_t::number_unsigned:                                                               \
+                return (lhs.m_data.m_value.number_unsigned) op (rhs.m_data.m_value.number_unsigned);                   \
+                \
+            case value_t::number_float:                                                                  \
+                return (lhs.m_data.m_value.number_float) op (rhs.m_data.m_value.number_float);                         \
+                \
+            case value_t::binary:                                                                        \
+                return (*lhs.m_data.m_value.binary) op (*rhs.m_data.m_value.binary);                                   \
+                \
+            case value_t::discarded:                                                                     \
+            default:                                                                                     \
+                return (unordered_result);                                                               \
+        }                                                                                                \
+    }                                                                                                    \
+    else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_float)                   \
+    {                                                                                                    \
+        return static_cast<number_float_t>(lhs.m_data.m_value.number_integer) op rhs.m_data.m_value.number_float;      \
+    }                                                                                                    \
+    else if (lhs_type == value_t::number_float && rhs_type == value_t::number_integer)                   \
+    {                                                                                                    \
+        return lhs.m_data.m_value.number_float op static_cast<number_float_t>(rhs.m_data.m_value.number_integer);      \
+    }                                                                                                    \
+    else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_float)                  \
+    {                                                                                                    \
+        return static_cast<number_float_t>(lhs.m_data.m_value.number_unsigned) op rhs.m_data.m_value.number_float;     \
+    }                                                                                                    \
+    else if (lhs_type == value_t::number_float && rhs_type == value_t::number_unsigned)                  \
+    {                                                                                                    \
+        return lhs.m_data.m_value.number_float op static_cast<number_float_t>(rhs.m_data.m_value.number_unsigned);     \
+    }                                                                                                    \
+    else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_integer)                \
+    {                                                                                                    \
+        return static_cast<number_integer_t>(lhs.m_data.m_value.number_unsigned) op rhs.m_data.m_value.number_integer; \
+    }                                                                                                    \
+    else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_unsigned)                \
+    {                                                                                                    \
+        return lhs.m_data.m_value.number_integer op static_cast<number_integer_t>(rhs.m_data.m_value.number_unsigned); \
+    }                                                                                                    \
+    else if(compares_unordered(lhs, rhs))\
+    {\
+        return (unordered_result);\
+    }\
+    \
+    return (default_result);
 
-    @liveexample{The example demonstrates comparing several JSON
-    types.,operator__equal}
-
-    @since version 1.0.0
-    */
-    friend bool operator==(const_reference lhs, const_reference rhs) noexcept
+  JSON_PRIVATE_UNLESS_TESTED:
+    // returns true if:
+    // - any operand is NaN and the other operand is of number type
+    // - any operand is discarded
+    // in legacy mode, discarded values are considered ordered if
+    // an operation is computed as an odd number of inverses of others
+    static bool compares_unordered(const_reference lhs, const_reference rhs, bool inverse = false) noexcept
     {
-        const auto lhs_type = lhs.type();
-        const auto rhs_type = rhs.type();
-
-        if (lhs_type == rhs_type)
+        if ((lhs.is_number_float() && std::isnan(lhs.m_data.m_value.number_float) && rhs.is_number())
+                || (rhs.is_number_float() && std::isnan(rhs.m_data.m_value.number_float) && lhs.is_number()))
         {
-            switch (lhs_type)
-            {
-                case value_t::array:
-                    return *lhs.m_value.array == *rhs.m_value.array;
-
-                case value_t::object:
-                    return *lhs.m_value.object == *rhs.m_value.object;
-
-                case value_t::null:
-                    return true;
-
-                case value_t::string:
-                    return *lhs.m_value.string == *rhs.m_value.string;
-
-                case value_t::boolean:
-                    return lhs.m_value.boolean == rhs.m_value.boolean;
-
-                case value_t::number_integer:
-                    return lhs.m_value.number_integer == rhs.m_value.number_integer;
+            return true;
+        }
+#if JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+        return (lhs.is_discarded() || rhs.is_discarded()) && !inverse;
+#else
+        static_cast<void>(inverse);
+        return lhs.is_discarded() || rhs.is_discarded();
+#endif
+    }
 
-                case value_t::number_unsigned:
-                    return lhs.m_value.number_unsigned == rhs.m_value.number_unsigned;
+  private:
+    bool compares_unordered(const_reference rhs, bool inverse = false) const noexcept
+    {
+        return compares_unordered(*this, rhs, inverse);
+    }
 
-                case value_t::number_float:
-                    return lhs.m_value.number_float == rhs.m_value.number_float;
+  public:
+#if JSON_HAS_THREE_WAY_COMPARISON
+    /// @brief comparison: equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
+    bool operator==(const_reference rhs) const noexcept
+    {
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+        const_reference lhs = *this;
+        JSON_IMPLEMENT_OPERATOR( ==, true, false, false)
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+    }
 
-                case value_t::binary:
-                    return *lhs.m_value.binary == *rhs.m_value.binary;
+    /// @brief comparison: equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
+    template<typename ScalarType>
+    requires std::is_scalar_v<ScalarType>
+    bool operator==(ScalarType rhs) const noexcept
+    {
+        return *this == basic_json(rhs);
+    }
 
-                default:
-                    return false;
-            }
-        }
-        else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_float)
-        {
-            return static_cast<number_float_t>(lhs.m_value.number_integer) == rhs.m_value.number_float;
-        }
-        else if (lhs_type == value_t::number_float && rhs_type == value_t::number_integer)
-        {
-            return lhs.m_value.number_float == static_cast<number_float_t>(rhs.m_value.number_integer);
-        }
-        else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_float)
-        {
-            return static_cast<number_float_t>(lhs.m_value.number_unsigned) == rhs.m_value.number_float;
-        }
-        else if (lhs_type == value_t::number_float && rhs_type == value_t::number_unsigned)
+    /// @brief comparison: not equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ne/
+    bool operator!=(const_reference rhs) const noexcept
+    {
+        if (compares_unordered(rhs, true))
         {
-            return lhs.m_value.number_float == static_cast<number_float_t>(rhs.m_value.number_unsigned);
+            return false;
         }
-        else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_integer)
+        return !operator==(rhs);
+    }
+
+    /// @brief comparison: 3-way
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_spaceship/
+    std::partial_ordering operator<=>(const_reference rhs) const noexcept // *NOPAD*
+    {
+        const_reference lhs = *this;
+        // default_result is used if we cannot compare values. In that case,
+        // we compare types.
+        JSON_IMPLEMENT_OPERATOR(<=>, // *NOPAD*
+                                std::partial_ordering::equivalent,
+                                std::partial_ordering::unordered,
+                                lhs_type <=> rhs_type) // *NOPAD*
+    }
+
+    /// @brief comparison: 3-way
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_spaceship/
+    template<typename ScalarType>
+    requires std::is_scalar_v<ScalarType>
+    std::partial_ordering operator<=>(ScalarType rhs) const noexcept // *NOPAD*
+    {
+        return *this <=> basic_json(rhs); // *NOPAD*
+    }
+
+#if JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+    // all operators that are computed as an odd number of inverses of others
+    // need to be overloaded to emulate the legacy comparison behavior
+
+    /// @brief comparison: less than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, undef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON)
+    bool operator<=(const_reference rhs) const noexcept
+    {
+        if (compares_unordered(rhs, true))
         {
-            return static_cast<number_integer_t>(lhs.m_value.number_unsigned) == rhs.m_value.number_integer;
+            return false;
         }
-        else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_unsigned)
+        return !(rhs < *this);
+    }
+
+    /// @brief comparison: less than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
+    template<typename ScalarType>
+    requires std::is_scalar_v<ScalarType>
+    bool operator<=(ScalarType rhs) const noexcept
+    {
+        return *this <= basic_json(rhs);
+    }
+
+    /// @brief comparison: greater than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, undef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON)
+    bool operator>=(const_reference rhs) const noexcept
+    {
+        if (compares_unordered(rhs, true))
         {
-            return lhs.m_value.number_integer == static_cast<number_integer_t>(rhs.m_value.number_unsigned);
+            return false;
         }
+        return !(*this < rhs);
+    }
 
-        return false;
+    /// @brief comparison: greater than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
+    template<typename ScalarType>
+    requires std::is_scalar_v<ScalarType>
+    bool operator>=(ScalarType rhs) const noexcept
+    {
+        return *this >= basic_json(rhs);
+    }
+#endif
+#else
+    /// @brief comparison: equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
+    friend bool operator==(const_reference lhs, const_reference rhs) noexcept
+    {
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+        JSON_IMPLEMENT_OPERATOR( ==, true, false, false)
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
     }
 
-    /*!
-    @brief comparison: equal
-    @copydoc operator==(const_reference, const_reference)
-    */
+    /// @brief comparison: equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
     template<typename ScalarType, typename std::enable_if<
                  std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator==(const_reference lhs, const ScalarType rhs) noexcept
+    friend bool operator==(const_reference lhs, ScalarType rhs) noexcept
     {
         return lhs == basic_json(rhs);
     }
 
-    /*!
-    @brief comparison: equal
-    @copydoc operator==(const_reference, const_reference)
-    */
+    /// @brief comparison: equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
     template<typename ScalarType, typename std::enable_if<
                  std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator==(const ScalarType lhs, const_reference rhs) noexcept
+    friend bool operator==(ScalarType lhs, const_reference rhs) noexcept
     {
         return basic_json(lhs) == rhs;
     }
 
-    /*!
-    @brief comparison: not equal
-
-    Compares two JSON values for inequality by calculating `not (lhs == rhs)`.
-
-    @param[in] lhs  first JSON value to consider
-    @param[in] rhs  second JSON value to consider
-    @return whether the values @a lhs and @a rhs are not equal
-
-    @complexity Linear.
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @liveexample{The example demonstrates comparing several JSON
-    types.,operator__notequal}
-
-    @since version 1.0.0
-    */
+    /// @brief comparison: not equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ne/
     friend bool operator!=(const_reference lhs, const_reference rhs) noexcept
     {
+        if (compares_unordered(lhs, rhs, true))
+        {
+            return false;
+        }
         return !(lhs == rhs);
     }
 
-    /*!
-    @brief comparison: not equal
-    @copydoc operator!=(const_reference, const_reference)
-    */
+    /// @brief comparison: not equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ne/
     template<typename ScalarType, typename std::enable_if<
                  std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator!=(const_reference lhs, const ScalarType rhs) noexcept
+    friend bool operator!=(const_reference lhs, ScalarType rhs) noexcept
     {
         return lhs != basic_json(rhs);
     }
 
-    /*!
-    @brief comparison: not equal
-    @copydoc operator!=(const_reference, const_reference)
-    */
+    /// @brief comparison: not equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ne/
     template<typename ScalarType, typename std::enable_if<
                  std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator!=(const ScalarType lhs, const_reference rhs) noexcept
+    friend bool operator!=(ScalarType lhs, const_reference rhs) noexcept
     {
         return basic_json(lhs) != rhs;
     }
 
-    /*!
-    @brief comparison: less than
-
-    Compares whether one JSON value @a lhs is less than another JSON value @a
-    rhs according to the following rules:
-    - If @a lhs and @a rhs have the same type, the values are compared using
-      the default `<` operator.
-    - Integer and floating-point numbers are automatically converted before
-      comparison
-    - In case @a lhs and @a rhs have different types, the values are ignored
-      and the order of the types is considered, see
-      @ref operator<(const value_t, const value_t).
-
-    @param[in] lhs  first JSON value to consider
-    @param[in] rhs  second JSON value to consider
-    @return whether @a lhs is less than @a rhs
-
-    @complexity Linear.
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @liveexample{The example demonstrates comparing several JSON
-    types.,operator__less}
-
-    @since version 1.0.0
-    */
+    /// @brief comparison: less than
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_lt/
     friend bool operator<(const_reference lhs, const_reference rhs) noexcept
     {
-        const auto lhs_type = lhs.type();
-        const auto rhs_type = rhs.type();
-
-        if (lhs_type == rhs_type)
-        {
-            switch (lhs_type)
-            {
-                case value_t::array:
-                    // note parentheses are necessary, see
-                    // https://github.com/nlohmann/json/issues/1530
-                    return (*lhs.m_value.array) < (*rhs.m_value.array);
-
-                case value_t::object:
-                    return (*lhs.m_value.object) < (*rhs.m_value.object);
-
-                case value_t::null:
-                    return false;
-
-                case value_t::string:
-                    return (*lhs.m_value.string) < (*rhs.m_value.string);
-
-                case value_t::boolean:
-                    return (lhs.m_value.boolean) < (rhs.m_value.boolean);
-
-                case value_t::number_integer:
-                    return (lhs.m_value.number_integer) < (rhs.m_value.number_integer);
-
-                case value_t::number_unsigned:
-                    return (lhs.m_value.number_unsigned) < (rhs.m_value.number_unsigned);
-
-                case value_t::number_float:
-                    return (lhs.m_value.number_float) < (rhs.m_value.number_float);
-
-                case value_t::binary:
-                    return (*lhs.m_value.binary) < (*rhs.m_value.binary);
-
-                default:
-                    return false;
-            }
-        }
-        else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_float)
-        {
-            return static_cast<number_float_t>(lhs.m_value.number_integer) < rhs.m_value.number_float;
-        }
-        else if (lhs_type == value_t::number_float && rhs_type == value_t::number_integer)
-        {
-            return lhs.m_value.number_float < static_cast<number_float_t>(rhs.m_value.number_integer);
-        }
-        else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_float)
-        {
-            return static_cast<number_float_t>(lhs.m_value.number_unsigned) < rhs.m_value.number_float;
-        }
-        else if (lhs_type == value_t::number_float && rhs_type == value_t::number_unsigned)
-        {
-            return lhs.m_value.number_float < static_cast<number_float_t>(rhs.m_value.number_unsigned);
-        }
-        else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_unsigned)
-        {
-            return lhs.m_value.number_integer < static_cast<number_integer_t>(rhs.m_value.number_unsigned);
-        }
-        else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_integer)
-        {
-            return static_cast<number_integer_t>(lhs.m_value.number_unsigned) < rhs.m_value.number_integer;
-        }
-
-        // We only reach this line if we cannot compare values. In that case,
+        // default_result is used if we cannot compare values. In that case,
         // we compare types. Note we have to call the operator explicitly,
         // because MSVC has problems otherwise.
-        return operator<(lhs_type, rhs_type);
+        JSON_IMPLEMENT_OPERATOR( <, false, false, operator<(lhs_type, rhs_type))
     }
 
-    /*!
-    @brief comparison: less than
-    @copydoc operator<(const_reference, const_reference)
-    */
+    /// @brief comparison: less than
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_lt/
     template<typename ScalarType, typename std::enable_if<
                  std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator<(const_reference lhs, const ScalarType rhs) noexcept
+    friend bool operator<(const_reference lhs, ScalarType rhs) noexcept
     {
         return lhs < basic_json(rhs);
     }
 
-    /*!
-    @brief comparison: less than
-    @copydoc operator<(const_reference, const_reference)
-    */
+    /// @brief comparison: less than
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_lt/
     template<typename ScalarType, typename std::enable_if<
                  std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator<(const ScalarType lhs, const_reference rhs) noexcept
+    friend bool operator<(ScalarType lhs, const_reference rhs) noexcept
     {
         return basic_json(lhs) < rhs;
     }
 
-    /*!
-    @brief comparison: less than or equal
-
-    Compares whether one JSON value @a lhs is less than or equal to another
-    JSON value by calculating `not (rhs < lhs)`.
-
-    @param[in] lhs  first JSON value to consider
-    @param[in] rhs  second JSON value to consider
-    @return whether @a lhs is less than or equal to @a rhs
-
-    @complexity Linear.
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @liveexample{The example demonstrates comparing several JSON
-    types.,operator__greater}
-
-    @since version 1.0.0
-    */
+    /// @brief comparison: less than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
     friend bool operator<=(const_reference lhs, const_reference rhs) noexcept
     {
+        if (compares_unordered(lhs, rhs, true))
+        {
+            return false;
+        }
         return !(rhs < lhs);
     }
 
-    /*!
-    @brief comparison: less than or equal
-    @copydoc operator<=(const_reference, const_reference)
-    */
+    /// @brief comparison: less than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
     template<typename ScalarType, typename std::enable_if<
                  std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator<=(const_reference lhs, const ScalarType rhs) noexcept
+    friend bool operator<=(const_reference lhs, ScalarType rhs) noexcept
     {
         return lhs <= basic_json(rhs);
     }
 
-    /*!
-    @brief comparison: less than or equal
-    @copydoc operator<=(const_reference, const_reference)
-    */
+    /// @brief comparison: less than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
     template<typename ScalarType, typename std::enable_if<
                  std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator<=(const ScalarType lhs, const_reference rhs) noexcept
+    friend bool operator<=(ScalarType lhs, const_reference rhs) noexcept
     {
         return basic_json(lhs) <= rhs;
     }
 
-    /*!
-    @brief comparison: greater than
-
-    Compares whether one JSON value @a lhs is greater than another
-    JSON value by calculating `not (lhs <= rhs)`.
-
-    @param[in] lhs  first JSON value to consider
-    @param[in] rhs  second JSON value to consider
-    @return whether @a lhs is greater than to @a rhs
-
-    @complexity Linear.
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @liveexample{The example demonstrates comparing several JSON
-    types.,operator__lessequal}
-
-    @since version 1.0.0
-    */
+    /// @brief comparison: greater than
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_gt/
     friend bool operator>(const_reference lhs, const_reference rhs) noexcept
     {
+        // double inverse
+        if (compares_unordered(lhs, rhs))
+        {
+            return false;
+        }
         return !(lhs <= rhs);
     }
 
-    /*!
-    @brief comparison: greater than
-    @copydoc operator>(const_reference, const_reference)
-    */
+    /// @brief comparison: greater than
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_gt/
     template<typename ScalarType, typename std::enable_if<
                  std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator>(const_reference lhs, const ScalarType rhs) noexcept
+    friend bool operator>(const_reference lhs, ScalarType rhs) noexcept
     {
         return lhs > basic_json(rhs);
     }
 
-    /*!
-    @brief comparison: greater than
-    @copydoc operator>(const_reference, const_reference)
-    */
+    /// @brief comparison: greater than
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_gt/
     template<typename ScalarType, typename std::enable_if<
                  std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator>(const ScalarType lhs, const_reference rhs) noexcept
+    friend bool operator>(ScalarType lhs, const_reference rhs) noexcept
     {
         return basic_json(lhs) > rhs;
     }
 
-    /*!
-    @brief comparison: greater than or equal
-
-    Compares whether one JSON value @a lhs is greater than or equal to another
-    JSON value by calculating `not (lhs < rhs)`.
-
-    @param[in] lhs  first JSON value to consider
-    @param[in] rhs  second JSON value to consider
-    @return whether @a lhs is greater than or equal to @a rhs
-
-    @complexity Linear.
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @liveexample{The example demonstrates comparing several JSON
-    types.,operator__greaterequal}
-
-    @since version 1.0.0
-    */
+    /// @brief comparison: greater than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
     friend bool operator>=(const_reference lhs, const_reference rhs) noexcept
     {
+        if (compares_unordered(lhs, rhs, true))
+        {
+            return false;
+        }
         return !(lhs < rhs);
     }
 
-    /*!
-    @brief comparison: greater than or equal
-    @copydoc operator>=(const_reference, const_reference)
-    */
+    /// @brief comparison: greater than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
     template<typename ScalarType, typename std::enable_if<
                  std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator>=(const_reference lhs, const ScalarType rhs) noexcept
+    friend bool operator>=(const_reference lhs, ScalarType rhs) noexcept
     {
         return lhs >= basic_json(rhs);
     }
 
-    /*!
-    @brief comparison: greater than or equal
-    @copydoc operator>=(const_reference, const_reference)
-    */
+    /// @brief comparison: greater than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
     template<typename ScalarType, typename std::enable_if<
                  std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator>=(const ScalarType lhs, const_reference rhs) noexcept
+    friend bool operator>=(ScalarType lhs, const_reference rhs) noexcept
     {
         return basic_json(lhs) >= rhs;
     }
+#endif
+
+#undef JSON_IMPLEMENT_OPERATOR
 
     /// @}
 
@@ -6623,38 +3969,9 @@ class basic_json
 
     /// @name serialization
     /// @{
-
-    /*!
-    @brief serialize to stream
-
-    Serialize the given JSON value @a j to the output stream @a o. The JSON
-    value will be serialized using the @ref dump member function.
-
-    - The indentation of the output can be controlled with the member variable
-      `width` of the output stream @a o. For instance, using the manipulator
-      `std::setw(4)` on @a o sets the indentation level to `4` and the
-      serialization result is the same as calling `dump(4)`.
-
-    - The indentation character can be controlled with the member variable
-      `fill` of the output stream @a o. For instance, the manipulator
-      `std::setfill('\\t')` sets indentation to use a tab character rather than
-      the default space character.
-
-    @param[in,out] o  stream to serialize to
-    @param[in] j  JSON value to serialize
-
-    @return the stream @a o
-
-    @throw type_error.316 if a string stored inside the JSON value is not
-                          UTF-8 encoded
-
-    @complexity Linear.
-
-    @liveexample{The example below shows the serialization with different
-    parameters to `width` to adjust the indentation level.,operator_serialize}
-
-    @since version 1.0.0; indentation character added in version 3.0.0
-    */
+#ifndef JSON_NO_IO
+    /// @brief serialize to stream
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ltlt/
     friend std::ostream& operator<<(std::ostream& o, const basic_json& j)
     {
         // read width member and use it as indentation parameter if nonzero
@@ -6670,23 +3987,20 @@ class basic_json
         return o;
     }
 
-    /*!
-    @brief serialize to stream
-    @deprecated This stream operator is deprecated and will be removed in
-                future 4.0.0 of the library. Please use
-                @ref operator<<(std::ostream&, const basic_json&)
-                instead; that is, replace calls like `j >> o;` with `o << j;`.
-    @since version 1.0.0; deprecated since version 3.0.0
-    */
+    /// @brief serialize to stream
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ltlt/
+    /// @deprecated This function is deprecated since 3.0.0 and will be removed in
+    ///             version 4.0.0 of the library. Please use
+    ///             operator<<(std::ostream&, const basic_json&) instead; that is,
+    ///             replace calls like `j >> o;` with `o << j;`.
     JSON_HEDLEY_DEPRECATED_FOR(3.0.0, operator<<(std::ostream&, const basic_json&))
     friend std::ostream& operator>>(const basic_json& j, std::ostream& o)
     {
         return o << j;
     }
-
+#endif  // JSON_NO_IO
     /// @}
 
-
     /////////////////////
     // deserialization //
     /////////////////////
@@ -6694,57 +4008,8 @@ class basic_json
     /// @name deserialization
     /// @{
 
-    /*!
-    @brief deserialize from a compatible input
-
-    @tparam InputType A compatible input, for instance
-    - an std::istream object
-    - a FILE pointer
-    - a C-style array of characters
-    - a pointer to a null-terminated string of single byte characters
-    - an object obj for which begin(obj) and end(obj) produces a valid pair of
-      iterators.
-
-    @param[in] i  input to read from
-    @param[in] cb  a parser callback function of type @ref parser_callback_t
-    which is used to control the deserialization by filtering unwanted values
-    (optional)
-    @param[in] allow_exceptions  whether to throw exceptions in case of a
-    parse error (optional, true by default)
-    @param[in] ignore_comments  whether comments should be ignored and treated
-    like whitespace (true) or yield a parse error (true); (optional, false by
-    default)
-
-    @return deserialized JSON value; in case of a parse error and
-            @a allow_exceptions set to `false`, the return value will be
-            value_t::discarded.
-
-    @throw parse_error.101 if a parse error occurs; example: `""unexpected end
-    of input; expected string literal""`
-    @throw parse_error.102 if to_unicode fails or surrogate error
-    @throw parse_error.103 if to_unicode fails
-
-    @complexity Linear in the length of the input. The parser is a predictive
-    LL(1) parser. The complexity can be higher if the parser callback function
-    @a cb or reading from the input @a i has a super-linear complexity.
-
-    @note A UTF-8 byte order mark is silently ignored.
-
-    @liveexample{The example below demonstrates the `parse()` function reading
-    from an array.,parse__array__parser_callback_t}
-
-    @liveexample{The example below demonstrates the `parse()` function with
-    and without callback function.,parse__string__parser_callback_t}
-
-    @liveexample{The example below demonstrates the `parse()` function with
-    and without callback function.,parse__istream__parser_callback_t}
-
-    @liveexample{The example below demonstrates the `parse()` function reading
-    from a contiguous container.,parse__contiguouscontainer__parser_callback_t}
-
-    @since version 2.0.3 (contiguous containers); version 3.9.0 allowed to
-    ignore comments.
-    */
+    /// @brief deserialize from a compatible input
+    /// @sa https://json.nlohmann.me/api/basic_json/parse/
     template<typename InputType>
     JSON_HEDLEY_WARN_UNUSED_RESULT
     static basic_json parse(InputType&& i,
@@ -6757,32 +4022,8 @@ class basic_json
         return result;
     }
 
-    /*!
-    @brief deserialize from a pair of character iterators
-
-    The value_type of the iterator must be a integral type with size of 1, 2 or
-    4 bytes, which will be interpreted respectively as UTF-8, UTF-16 and UTF-32.
-
-    @param[in] first iterator to start of character range
-    @param[in] last  iterator to end of character range
-    @param[in] cb  a parser callback function of type @ref parser_callback_t
-    which is used to control the deserialization by filtering unwanted values
-    (optional)
-    @param[in] allow_exceptions  whether to throw exceptions in case of a
-    parse error (optional, true by default)
-    @param[in] ignore_comments  whether comments should be ignored and treated
-    like whitespace (true) or yield a parse error (true); (optional, false by
-    default)
-
-    @return deserialized JSON value; in case of a parse error and
-            @a allow_exceptions set to `false`, the return value will be
-            value_t::discarded.
-
-    @throw parse_error.101 if a parse error occurs; example: `""unexpected end
-    of input; expected string literal""`
-    @throw parse_error.102 if to_unicode fails or surrogate error
-    @throw parse_error.103 if to_unicode fails
-    */
+    /// @brief deserialize from a pair of character iterators
+    /// @sa https://json.nlohmann.me/api/basic_json/parse/
     template<typename IteratorType>
     JSON_HEDLEY_WARN_UNUSED_RESULT
     static basic_json parse(IteratorType first,
@@ -6808,36 +4049,8 @@ class basic_json
         return result;
     }
 
-    /*!
-    @brief check if the input is valid JSON
-
-    Unlike the @ref parse(InputType&&, const parser_callback_t,const bool)
-    function, this function neither throws an exception in case of invalid JSON
-    input (i.e., a parse error) nor creates diagnostic information.
-
-    @tparam InputType A compatible input, for instance
-    - an std::istream object
-    - a FILE pointer
-    - a C-style array of characters
-    - a pointer to a null-terminated string of single byte characters
-    - an object obj for which begin(obj) and end(obj) produces a valid pair of
-      iterators.
-
-    @param[in] i input to read from
-    @param[in] ignore_comments  whether comments should be ignored and treated
-    like whitespace (true) or yield a parse error (true); (optional, false by
-    default)
-
-    @return Whether the input read from @a i is valid JSON.
-
-    @complexity Linear in the length of the input. The parser is a predictive
-    LL(1) parser.
-
-    @note A UTF-8 byte order mark is silently ignored.
-
-    @liveexample{The example below demonstrates the `accept()` function reading
-    from a string.,accept__string}
-    */
+    /// @brief check if the input is valid JSON
+    /// @sa https://json.nlohmann.me/api/basic_json/accept/
     template<typename InputType>
     static bool accept(InputType&& i,
                        const bool ignore_comments = false)
@@ -6845,6 +4058,8 @@ class basic_json
         return parser(detail::input_adapter(std::forward<InputType>(i)), nullptr, false, ignore_comments).accept(true);
     }
 
+    /// @brief check if the input is valid JSON
+    /// @sa https://json.nlohmann.me/api/basic_json/accept/
     template<typename IteratorType>
     static bool accept(IteratorType first, IteratorType last,
                        const bool ignore_comments = false)
@@ -6860,46 +4075,8 @@ class basic_json
         return parser(i.get(), nullptr, false, ignore_comments).accept(true);
     }
 
-    /*!
-    @brief generate SAX events
-
-    The SAX event lister must follow the interface of @ref json_sax.
-
-    This function reads from a compatible input. Examples are:
-    - an std::istream object
-    - a FILE pointer
-    - a C-style array of characters
-    - a pointer to a null-terminated string of single byte characters
-    - an object obj for which begin(obj) and end(obj) produces a valid pair of
-      iterators.
-
-    @param[in] i  input to read from
-    @param[in,out] sax  SAX event listener
-    @param[in] format  the format to parse (JSON, CBOR, MessagePack, or UBJSON)
-    @param[in] strict  whether the input has to be consumed completely
-    @param[in] ignore_comments  whether comments should be ignored and treated
-    like whitespace (true) or yield a parse error (true); (optional, false by
-    default); only applies to the JSON file format.
-
-    @return return value of the last processed SAX event
-
-    @throw parse_error.101 if a parse error occurs; example: `""unexpected end
-    of input; expected string literal""`
-    @throw parse_error.102 if to_unicode fails or surrogate error
-    @throw parse_error.103 if to_unicode fails
-
-    @complexity Linear in the length of the input. The parser is a predictive
-    LL(1) parser. The complexity can be higher if the SAX consumer @a sax has
-    a super-linear complexity.
-
-    @note A UTF-8 byte order mark is silently ignored.
-
-    @liveexample{The example below demonstrates the `sax_parse()` function
-    reading from string and processing the events with a user-defined SAX
-    event consumer.,sax_parse}
-
-    @since version 3.2.0
-    */
+    /// @brief generate SAX events
+    /// @sa https://json.nlohmann.me/api/basic_json/sax_parse/
     template <typename InputType, typename SAX>
     JSON_HEDLEY_NON_NULL(2)
     static bool sax_parse(InputType&& i, SAX* sax,
@@ -6910,9 +4087,11 @@ class basic_json
         auto ia = detail::input_adapter(std::forward<InputType>(i));
         return format == input_format_t::json
                ? parser(std::move(ia), nullptr, true, ignore_comments).sax_parse(sax, strict)
-               : detail::binary_reader<basic_json, decltype(ia), SAX>(std::move(ia)).sax_parse(format, sax, strict);
+               : detail::binary_reader<basic_json, decltype(ia), SAX>(std::move(ia), format).sax_parse(format, sax, strict);
     }
 
+    /// @brief generate SAX events
+    /// @sa https://json.nlohmann.me/api/basic_json/sax_parse/
     template<class IteratorType, class SAX>
     JSON_HEDLEY_NON_NULL(3)
     static bool sax_parse(IteratorType first, IteratorType last, SAX* sax,
@@ -6923,9 +4102,14 @@ class basic_json
         auto ia = detail::input_adapter(std::move(first), std::move(last));
         return format == input_format_t::json
                ? parser(std::move(ia), nullptr, true, ignore_comments).sax_parse(sax, strict)
-               : detail::binary_reader<basic_json, decltype(ia), SAX>(std::move(ia)).sax_parse(format, sax, strict);
+               : detail::binary_reader<basic_json, decltype(ia), SAX>(std::move(ia), format).sax_parse(format, sax, strict);
     }
 
+    /// @brief generate SAX events
+    /// @sa https://json.nlohmann.me/api/basic_json/sax_parse/
+    /// @deprecated This function is deprecated since 3.8.0 and will be removed in
+    ///             version 4.0.0 of the library. Please use
+    ///             sax_parse(ptr, ptr + len) instead.
     template <typename SAX>
     JSON_HEDLEY_DEPRECATED_FOR(3.8.0, sax_parse(ptr, ptr + len, ...))
     JSON_HEDLEY_NON_NULL(2)
@@ -6936,129 +4120,104 @@ class basic_json
     {
         auto ia = i.get();
         return format == input_format_t::json
+               // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
                ? parser(std::move(ia), nullptr, true, ignore_comments).sax_parse(sax, strict)
-               : detail::binary_reader<basic_json, decltype(ia), SAX>(std::move(ia)).sax_parse(format, sax, strict);
-    }
-
-    /*!
-    @brief deserialize from stream
-    @deprecated This stream operator is deprecated and will be removed in
-                version 4.0.0 of the library. Please use
-                @ref operator>>(std::istream&, basic_json&)
-                instead; that is, replace calls like `j << i;` with `i >> j;`.
-    @since version 1.0.0; deprecated since version 3.0.0
-    */
+               // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
+               : detail::binary_reader<basic_json, decltype(ia), SAX>(std::move(ia), format).sax_parse(format, sax, strict);
+    }
+#ifndef JSON_NO_IO
+    /// @brief deserialize from stream
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_gtgt/
+    /// @deprecated This stream operator is deprecated since 3.0.0 and will be removed in
+    ///             version 4.0.0 of the library. Please use
+    ///             operator>>(std::istream&, basic_json&) instead; that is,
+    ///             replace calls like `j << i;` with `i >> j;`.
     JSON_HEDLEY_DEPRECATED_FOR(3.0.0, operator>>(std::istream&, basic_json&))
     friend std::istream& operator<<(basic_json& j, std::istream& i)
     {
         return operator>>(i, j);
     }
 
-    /*!
-    @brief deserialize from stream
-
-    Deserializes an input stream to a JSON value.
-
-    @param[in,out] i  input stream to read a serialized JSON value from
-    @param[in,out] j  JSON value to write the deserialized input to
-
-    @throw parse_error.101 in case of an unexpected token
-    @throw parse_error.102 if to_unicode fails or surrogate error
-    @throw parse_error.103 if to_unicode fails
-
-    @complexity Linear in the length of the input. The parser is a predictive
-    LL(1) parser.
-
-    @note A UTF-8 byte order mark is silently ignored.
-
-    @liveexample{The example below shows how a JSON value is constructed by
-    reading a serialization from a stream.,operator_deserialize}
-
-    @sa parse(std::istream&, const parser_callback_t) for a variant with a
-    parser callback function to filter values while parsing
-
-    @since version 1.0.0
-    */
+    /// @brief deserialize from stream
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_gtgt/
     friend std::istream& operator>>(std::istream& i, basic_json& j)
     {
         parser(detail::input_adapter(i)).parse(false, j);
         return i;
     }
-
+#endif  // JSON_NO_IO
     /// @}
 
     ///////////////////////////
     // convenience functions //
     ///////////////////////////
 
-    /*!
-    @brief return the type as string
-
-    Returns the type name as string to be used in error messages - usually to
-    indicate that a function was called on a wrong JSON type.
-
-    @return a string representation of a the @a m_type member:
-            Value type  | return value
-            ----------- | -------------
-            null        | `"null"`
-            boolean     | `"boolean"`
-            string      | `"string"`
-            number      | `"number"` (for all number types)
-            object      | `"object"`
-            array       | `"array"`
-            binary      | `"binary"`
-            discarded   | `"discarded"`
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @complexity Constant.
-
-    @liveexample{The following code exemplifies `type_name()` for all JSON
-    types.,type_name}
-
-    @sa @ref type() -- return the type of the JSON value
-    @sa @ref operator value_t() -- return the type of the JSON value (implicit)
-
-    @since version 1.0.0, public since 2.1.0, `const char*` and `noexcept`
-    since 3.0.0
-    */
+    /// @brief return the type as string
+    /// @sa https://json.nlohmann.me/api/basic_json/type_name/
     JSON_HEDLEY_RETURNS_NON_NULL
     const char* type_name() const noexcept
     {
+        switch (m_data.m_type)
         {
-            switch (m_type)
-            {
-                case value_t::null:
-                    return "null";
-                case value_t::object:
-                    return "object";
-                case value_t::array:
-                    return "array";
-                case value_t::string:
-                    return "string";
-                case value_t::boolean:
-                    return "boolean";
-                case value_t::binary:
-                    return "binary";
-                case value_t::discarded:
-                    return "discarded";
-                default:
-                    return "number";
-            }
+            case value_t::null:
+                return "null";
+            case value_t::object:
+                return "object";
+            case value_t::array:
+                return "array";
+            case value_t::string:
+                return "string";
+            case value_t::boolean:
+                return "boolean";
+            case value_t::binary:
+                return "binary";
+            case value_t::discarded:
+                return "discarded";
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            default:
+                return "number";
         }
     }
 
-
   JSON_PRIVATE_UNLESS_TESTED:
     //////////////////////
     // member variables //
     //////////////////////
 
-    /// the type of the current element
-    value_t m_type = value_t::null;
+    struct data
+    {
+        /// the type of the current element
+        value_t m_type = value_t::null;
+
+        /// the value of the current element
+        json_value m_value = {};
+
+        data(const value_t v)
+            : m_type(v), m_value(v)
+        {
+        }
+
+        data(size_type cnt, const basic_json& val)
+            : m_type(value_t::array)
+        {
+            m_value.array = create<array_t>(cnt, val);
+        }
+
+        data() noexcept = default;
+        data(data&&) noexcept = default;
+        data(const data&) noexcept = delete;
+        data& operator=(data&&) noexcept = delete;
+        data& operator=(const data&) noexcept = delete;
+
+        ~data() noexcept
+        {
+            m_value.destroy(m_type);
+        }
+    };
 
-    /// the value of the current element
-    json_value m_value = {};
+    data m_data = {};
 
 #if JSON_DIAGNOSTICS
     /// a pointer to a parent value (for debugging purposes)
@@ -7073,507 +4232,131 @@ class basic_json
     /// @{
 
   public:
-    /*!
-    @brief create a CBOR serialization of a given JSON value
-
-    Serializes a given JSON value @a j to a byte vector using the CBOR (Concise
-    Binary Object Representation) serialization format. CBOR is a binary
-    serialization format which aims to be more compact than JSON itself, yet
-    more efficient to parse.
-
-    The library uses the following mapping from JSON values types to
-    CBOR types according to the CBOR specification (RFC 7049):
-
-    JSON value type | value/range                                | CBOR type                          | first byte
-    --------------- | ------------------------------------------ | ---------------------------------- | ---------------
-    null            | `null`                                     | Null                               | 0xF6
-    boolean         | `true`                                     | True                               | 0xF5
-    boolean         | `false`                                    | False                              | 0xF4
-    number_integer  | -9223372036854775808..-2147483649          | Negative integer (8 bytes follow)  | 0x3B
-    number_integer  | -2147483648..-32769                        | Negative integer (4 bytes follow)  | 0x3A
-    number_integer  | -32768..-129                               | Negative integer (2 bytes follow)  | 0x39
-    number_integer  | -128..-25                                  | Negative integer (1 byte follow)   | 0x38
-    number_integer  | -24..-1                                    | Negative integer                   | 0x20..0x37
-    number_integer  | 0..23                                      | Integer                            | 0x00..0x17
-    number_integer  | 24..255                                    | Unsigned integer (1 byte follow)   | 0x18
-    number_integer  | 256..65535                                 | Unsigned integer (2 bytes follow)  | 0x19
-    number_integer  | 65536..4294967295                          | Unsigned integer (4 bytes follow)  | 0x1A
-    number_integer  | 4294967296..18446744073709551615           | Unsigned integer (8 bytes follow)  | 0x1B
-    number_unsigned | 0..23                                      | Integer                            | 0x00..0x17
-    number_unsigned | 24..255                                    | Unsigned integer (1 byte follow)   | 0x18
-    number_unsigned | 256..65535                                 | Unsigned integer (2 bytes follow)  | 0x19
-    number_unsigned | 65536..4294967295                          | Unsigned integer (4 bytes follow)  | 0x1A
-    number_unsigned | 4294967296..18446744073709551615           | Unsigned integer (8 bytes follow)  | 0x1B
-    number_float    | *any value representable by a float*       | Single-Precision Float             | 0xFA
-    number_float    | *any value NOT representable by a float*   | Double-Precision Float             | 0xFB
-    string          | *length*: 0..23                            | UTF-8 string                       | 0x60..0x77
-    string          | *length*: 23..255                          | UTF-8 string (1 byte follow)       | 0x78
-    string          | *length*: 256..65535                       | UTF-8 string (2 bytes follow)      | 0x79
-    string          | *length*: 65536..4294967295                | UTF-8 string (4 bytes follow)      | 0x7A
-    string          | *length*: 4294967296..18446744073709551615 | UTF-8 string (8 bytes follow)      | 0x7B
-    array           | *size*: 0..23                              | array                              | 0x80..0x97
-    array           | *size*: 23..255                            | array (1 byte follow)              | 0x98
-    array           | *size*: 256..65535                         | array (2 bytes follow)             | 0x99
-    array           | *size*: 65536..4294967295                  | array (4 bytes follow)             | 0x9A
-    array           | *size*: 4294967296..18446744073709551615   | array (8 bytes follow)             | 0x9B
-    object          | *size*: 0..23                              | map                                | 0xA0..0xB7
-    object          | *size*: 23..255                            | map (1 byte follow)                | 0xB8
-    object          | *size*: 256..65535                         | map (2 bytes follow)               | 0xB9
-    object          | *size*: 65536..4294967295                  | map (4 bytes follow)               | 0xBA
-    object          | *size*: 4294967296..18446744073709551615   | map (8 bytes follow)               | 0xBB
-    binary          | *size*: 0..23                              | byte string                        | 0x40..0x57
-    binary          | *size*: 23..255                            | byte string (1 byte follow)        | 0x58
-    binary          | *size*: 256..65535                         | byte string (2 bytes follow)       | 0x59
-    binary          | *size*: 65536..4294967295                  | byte string (4 bytes follow)       | 0x5A
-    binary          | *size*: 4294967296..18446744073709551615   | byte string (8 bytes follow)       | 0x5B
-
-    @note The mapping is **complete** in the sense that any JSON value type
-          can be converted to a CBOR value.
-
-    @note If NaN or Infinity are stored inside a JSON number, they are
-          serialized properly. This behavior differs from the @ref dump()
-          function which serializes NaN or Infinity to `null`.
-
-    @note The following CBOR types are not used in the conversion:
-          - UTF-8 strings terminated by "break" (0x7F)
-          - arrays terminated by "break" (0x9F)
-          - maps terminated by "break" (0xBF)
-          - byte strings terminated by "break" (0x5F)
-          - date/time (0xC0..0xC1)
-          - bignum (0xC2..0xC3)
-          - decimal fraction (0xC4)
-          - bigfloat (0xC5)
-          - expected conversions (0xD5..0xD7)
-          - simple values (0xE0..0xF3, 0xF8)
-          - undefined (0xF7)
-          - half-precision floats (0xF9)
-          - break (0xFF)
-
-    @param[in] j  JSON value to serialize
-    @return CBOR serialization as byte vector
-
-    @complexity Linear in the size of the JSON value @a j.
-
-    @liveexample{The example shows the serialization of a JSON value to a byte
-    vector in CBOR format.,to_cbor}
-
-    @sa http://cbor.io
-    @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool, const cbor_tag_handler_t) for the
-        analogous deserialization
-    @sa @ref to_msgpack(const basic_json&) for the related MessagePack format
-    @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the
-             related UBJSON format
-
-    @since version 2.0.9; compact representation of floating-point numbers
-           since version 3.8.0
-    */
-    static std::vector<uint8_t> to_cbor(const basic_json& j)
+    /// @brief create a CBOR serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_cbor/
+    static std::vector<std::uint8_t> to_cbor(const basic_json& j)
     {
-        std::vector<uint8_t> result;
+        std::vector<std::uint8_t> result;
         to_cbor(j, result);
         return result;
     }
 
-    static void to_cbor(const basic_json& j, detail::output_adapter<uint8_t> o)
+    /// @brief create a CBOR serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_cbor/
+    static void to_cbor(const basic_json& j, detail::output_adapter<std::uint8_t> o)
     {
-        binary_writer<uint8_t>(o).write_cbor(j);
+        binary_writer<std::uint8_t>(o).write_cbor(j);
     }
 
+    /// @brief create a CBOR serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_cbor/
     static void to_cbor(const basic_json& j, detail::output_adapter<char> o)
     {
         binary_writer<char>(o).write_cbor(j);
     }
 
-    /*!
-    @brief create a MessagePack serialization of a given JSON value
-
-    Serializes a given JSON value @a j to a byte vector using the MessagePack
-    serialization format. MessagePack is a binary serialization format which
-    aims to be more compact than JSON itself, yet more efficient to parse.
-
-    The library uses the following mapping from JSON values types to
-    MessagePack types according to the MessagePack specification:
-
-    JSON value type | value/range                       | MessagePack type | first byte
-    --------------- | --------------------------------- | ---------------- | ----------
-    null            | `null`                            | nil              | 0xC0
-    boolean         | `true`                            | true             | 0xC3
-    boolean         | `false`                           | false            | 0xC2
-    number_integer  | -9223372036854775808..-2147483649 | int64            | 0xD3
-    number_integer  | -2147483648..-32769               | int32            | 0xD2
-    number_integer  | -32768..-129                      | int16            | 0xD1
-    number_integer  | -128..-33                         | int8             | 0xD0
-    number_integer  | -32..-1                           | negative fixint  | 0xE0..0xFF
-    number_integer  | 0..127                            | positive fixint  | 0x00..0x7F
-    number_integer  | 128..255                          | uint 8           | 0xCC
-    number_integer  | 256..65535                        | uint 16          | 0xCD
-    number_integer  | 65536..4294967295                 | uint 32          | 0xCE
-    number_integer  | 4294967296..18446744073709551615  | uint 64          | 0xCF
-    number_unsigned | 0..127                            | positive fixint  | 0x00..0x7F
-    number_unsigned | 128..255                          | uint 8           | 0xCC
-    number_unsigned | 256..65535                        | uint 16          | 0xCD
-    number_unsigned | 65536..4294967295                 | uint 32          | 0xCE
-    number_unsigned | 4294967296..18446744073709551615  | uint 64          | 0xCF
-    number_float    | *any value representable by a float*     | float 32 | 0xCA
-    number_float    | *any value NOT representable by a float* | float 64 | 0xCB
-    string          | *length*: 0..31                   | fixstr           | 0xA0..0xBF
-    string          | *length*: 32..255                 | str 8            | 0xD9
-    string          | *length*: 256..65535              | str 16           | 0xDA
-    string          | *length*: 65536..4294967295       | str 32           | 0xDB
-    array           | *size*: 0..15                     | fixarray         | 0x90..0x9F
-    array           | *size*: 16..65535                 | array 16         | 0xDC
-    array           | *size*: 65536..4294967295         | array 32         | 0xDD
-    object          | *size*: 0..15                     | fix map          | 0x80..0x8F
-    object          | *size*: 16..65535                 | map 16           | 0xDE
-    object          | *size*: 65536..4294967295         | map 32           | 0xDF
-    binary          | *size*: 0..255                    | bin 8            | 0xC4
-    binary          | *size*: 256..65535                | bin 16           | 0xC5
-    binary          | *size*: 65536..4294967295         | bin 32           | 0xC6
-
-    @note The mapping is **complete** in the sense that any JSON value type
-          can be converted to a MessagePack value.
-
-    @note The following values can **not** be converted to a MessagePack value:
-          - strings with more than 4294967295 bytes
-          - byte strings with more than 4294967295 bytes
-          - arrays with more than 4294967295 elements
-          - objects with more than 4294967295 elements
-
-    @note Any MessagePack output created @ref to_msgpack can be successfully
-          parsed by @ref from_msgpack.
-
-    @note If NaN or Infinity are stored inside a JSON number, they are
-          serialized properly. This behavior differs from the @ref dump()
-          function which serializes NaN or Infinity to `null`.
-
-    @param[in] j  JSON value to serialize
-    @return MessagePack serialization as byte vector
-
-    @complexity Linear in the size of the JSON value @a j.
-
-    @liveexample{The example shows the serialization of a JSON value to a byte
-    vector in MessagePack format.,to_msgpack}
-
-    @sa http://msgpack.org
-    @sa @ref from_msgpack for the analogous deserialization
-    @sa @ref to_cbor(const basic_json& for the related CBOR format
-    @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the
-             related UBJSON format
-
-    @since version 2.0.9
-    */
-    static std::vector<uint8_t> to_msgpack(const basic_json& j)
+    /// @brief create a MessagePack serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_msgpack/
+    static std::vector<std::uint8_t> to_msgpack(const basic_json& j)
     {
-        std::vector<uint8_t> result;
+        std::vector<std::uint8_t> result;
         to_msgpack(j, result);
         return result;
     }
 
-    static void to_msgpack(const basic_json& j, detail::output_adapter<uint8_t> o)
+    /// @brief create a MessagePack serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_msgpack/
+    static void to_msgpack(const basic_json& j, detail::output_adapter<std::uint8_t> o)
+    {
+        binary_writer<std::uint8_t>(o).write_msgpack(j);
+    }
+
+    /// @brief create a MessagePack serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_msgpack/
+    static void to_msgpack(const basic_json& j, detail::output_adapter<char> o)
+    {
+        binary_writer<char>(o).write_msgpack(j);
+    }
+
+    /// @brief create a UBJSON serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_ubjson/
+    static std::vector<std::uint8_t> to_ubjson(const basic_json& j,
+            const bool use_size = false,
+            const bool use_type = false)
+    {
+        std::vector<std::uint8_t> result;
+        to_ubjson(j, result, use_size, use_type);
+        return result;
+    }
+
+    /// @brief create a UBJSON serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_ubjson/
+    static void to_ubjson(const basic_json& j, detail::output_adapter<std::uint8_t> o,
+                          const bool use_size = false, const bool use_type = false)
     {
-        binary_writer<uint8_t>(o).write_msgpack(j);
+        binary_writer<std::uint8_t>(o).write_ubjson(j, use_size, use_type);
     }
 
-    static void to_msgpack(const basic_json& j, detail::output_adapter<char> o)
+    /// @brief create a UBJSON serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_ubjson/
+    static void to_ubjson(const basic_json& j, detail::output_adapter<char> o,
+                          const bool use_size = false, const bool use_type = false)
     {
-        binary_writer<char>(o).write_msgpack(j);
+        binary_writer<char>(o).write_ubjson(j, use_size, use_type);
     }
 
-    /*!
-    @brief create a UBJSON serialization of a given JSON value
-
-    Serializes a given JSON value @a j to a byte vector using the UBJSON
-    (Universal Binary JSON) serialization format. UBJSON aims to be more compact
-    than JSON itself, yet more efficient to parse.
-
-    The library uses the following mapping from JSON values types to
-    UBJSON types according to the UBJSON specification:
-
-    JSON value type | value/range                       | UBJSON type | marker
-    --------------- | --------------------------------- | ----------- | ------
-    null            | `null`                            | null        | `Z`
-    boolean         | `true`                            | true        | `T`
-    boolean         | `false`                           | false       | `F`
-    number_integer  | -9223372036854775808..-2147483649 | int64       | `L`
-    number_integer  | -2147483648..-32769               | int32       | `l`
-    number_integer  | -32768..-129                      | int16       | `I`
-    number_integer  | -128..127                         | int8        | `i`
-    number_integer  | 128..255                          | uint8       | `U`
-    number_integer  | 256..32767                        | int16       | `I`
-    number_integer  | 32768..2147483647                 | int32       | `l`
-    number_integer  | 2147483648..9223372036854775807   | int64       | `L`
-    number_unsigned | 0..127                            | int8        | `i`
-    number_unsigned | 128..255                          | uint8       | `U`
-    number_unsigned | 256..32767                        | int16       | `I`
-    number_unsigned | 32768..2147483647                 | int32       | `l`
-    number_unsigned | 2147483648..9223372036854775807   | int64       | `L`
-    number_unsigned | 2147483649..18446744073709551615  | high-precision | `H`
-    number_float    | *any value*                       | float64     | `D`
-    string          | *with shortest length indicator*  | string      | `S`
-    array           | *see notes on optimized format*   | array       | `[`
-    object          | *see notes on optimized format*   | map         | `{`
-
-    @note The mapping is **complete** in the sense that any JSON value type
-          can be converted to a UBJSON value.
-
-    @note The following values can **not** be converted to a UBJSON value:
-          - strings with more than 9223372036854775807 bytes (theoretical)
-
-    @note The following markers are not used in the conversion:
-          - `Z`: no-op values are not created.
-          - `C`: single-byte strings are serialized with `S` markers.
-
-    @note Any UBJSON output created @ref to_ubjson can be successfully parsed
-          by @ref from_ubjson.
-
-    @note If NaN or Infinity are stored inside a JSON number, they are
-          serialized properly. This behavior differs from the @ref dump()
-          function which serializes NaN or Infinity to `null`.
-
-    @note The optimized formats for containers are supported: Parameter
-          @a use_size adds size information to the beginning of a container and
-          removes the closing marker. Parameter @a use_type further checks
-          whether all elements of a container have the same type and adds the
-          type marker to the beginning of the container. The @a use_type
-          parameter must only be used together with @a use_size = true. Note
-          that @a use_size = true alone may result in larger representations -
-          the benefit of this parameter is that the receiving side is
-          immediately informed on the number of elements of the container.
-
-    @note If the JSON data contains the binary type, the value stored is a list
-          of integers, as suggested by the UBJSON documentation.  In particular,
-          this means that serialization and the deserialization of a JSON
-          containing binary values into UBJSON and back will result in a
-          different JSON object.
-
-    @param[in] j  JSON value to serialize
-    @param[in] use_size  whether to add size annotations to container types
-    @param[in] use_type  whether to add type annotations to container types
-                         (must be combined with @a use_size = true)
-    @return UBJSON serialization as byte vector
-
-    @complexity Linear in the size of the JSON value @a j.
-
-    @liveexample{The example shows the serialization of a JSON value to a byte
-    vector in UBJSON format.,to_ubjson}
-
-    @sa http://ubjson.org
-    @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for the
-        analogous deserialization
-    @sa @ref to_cbor(const basic_json& for the related CBOR format
-    @sa @ref to_msgpack(const basic_json&) for the related MessagePack format
-
-    @since version 3.1.0
-    */
-    static std::vector<uint8_t> to_ubjson(const basic_json& j,
-                                          const bool use_size = false,
-                                          const bool use_type = false)
+    /// @brief create a BJData serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_bjdata/
+    static std::vector<std::uint8_t> to_bjdata(const basic_json& j,
+            const bool use_size = false,
+            const bool use_type = false)
     {
-        std::vector<uint8_t> result;
-        to_ubjson(j, result, use_size, use_type);
+        std::vector<std::uint8_t> result;
+        to_bjdata(j, result, use_size, use_type);
         return result;
     }
 
-    static void to_ubjson(const basic_json& j, detail::output_adapter<uint8_t> o,
+    /// @brief create a BJData serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_bjdata/
+    static void to_bjdata(const basic_json& j, detail::output_adapter<std::uint8_t> o,
                           const bool use_size = false, const bool use_type = false)
     {
-        binary_writer<uint8_t>(o).write_ubjson(j, use_size, use_type);
+        binary_writer<std::uint8_t>(o).write_ubjson(j, use_size, use_type, true, true);
     }
 
-    static void to_ubjson(const basic_json& j, detail::output_adapter<char> o,
+    /// @brief create a BJData serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_bjdata/
+    static void to_bjdata(const basic_json& j, detail::output_adapter<char> o,
                           const bool use_size = false, const bool use_type = false)
     {
-        binary_writer<char>(o).write_ubjson(j, use_size, use_type);
+        binary_writer<char>(o).write_ubjson(j, use_size, use_type, true, true);
     }
 
-
-    /*!
-    @brief Serializes the given JSON object `j` to BSON and returns a vector
-           containing the corresponding BSON-representation.
-
-    BSON (Binary JSON) is a binary format in which zero or more ordered key/value pairs are
-    stored as a single entity (a so-called document).
-
-    The library uses the following mapping from JSON values types to BSON types:
-
-    JSON value type | value/range                       | BSON type   | marker
-    --------------- | --------------------------------- | ----------- | ------
-    null            | `null`                            | null        | 0x0A
-    boolean         | `true`, `false`                   | boolean     | 0x08
-    number_integer  | -9223372036854775808..-2147483649 | int64       | 0x12
-    number_integer  | -2147483648..2147483647           | int32       | 0x10
-    number_integer  | 2147483648..9223372036854775807   | int64       | 0x12
-    number_unsigned | 0..2147483647                     | int32       | 0x10
-    number_unsigned | 2147483648..9223372036854775807   | int64       | 0x12
-    number_unsigned | 9223372036854775808..18446744073709551615| --   | --
-    number_float    | *any value*                       | double      | 0x01
-    string          | *any value*                       | string      | 0x02
-    array           | *any value*                       | document    | 0x04
-    object          | *any value*                       | document    | 0x03
-    binary          | *any value*                       | binary      | 0x05
-
-    @warning The mapping is **incomplete**, since only JSON-objects (and things
-    contained therein) can be serialized to BSON.
-    Also, integers larger than 9223372036854775807 cannot be serialized to BSON,
-    and the keys may not contain U+0000, since they are serialized a
-    zero-terminated c-strings.
-
-    @throw out_of_range.407  if `j.is_number_unsigned() && j.get<std::uint64_t>() > 9223372036854775807`
-    @throw out_of_range.409  if a key in `j` contains a NULL (U+0000)
-    @throw type_error.317    if `!j.is_object()`
-
-    @pre The input `j` is required to be an object: `j.is_object() == true`.
-
-    @note Any BSON output created via @ref to_bson can be successfully parsed
-          by @ref from_bson.
-
-    @param[in] j  JSON value to serialize
-    @return BSON serialization as byte vector
-
-    @complexity Linear in the size of the JSON value @a j.
-
-    @liveexample{The example shows the serialization of a JSON value to a byte
-    vector in BSON format.,to_bson}
-
-    @sa http://bsonspec.org/spec.html
-    @sa @ref from_bson(detail::input_adapter&&, const bool strict) for the
-        analogous deserialization
-    @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the
-             related UBJSON format
-    @sa @ref to_cbor(const basic_json&) for the related CBOR format
-    @sa @ref to_msgpack(const basic_json&) for the related MessagePack format
-    */
-    static std::vector<uint8_t> to_bson(const basic_json& j)
+    /// @brief create a BSON serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_bson/
+    static std::vector<std::uint8_t> to_bson(const basic_json& j)
     {
-        std::vector<uint8_t> result;
+        std::vector<std::uint8_t> result;
         to_bson(j, result);
         return result;
     }
 
-    /*!
-    @brief Serializes the given JSON object `j` to BSON and forwards the
-           corresponding BSON-representation to the given output_adapter `o`.
-    @param j The JSON object to convert to BSON.
-    @param o The output adapter that receives the binary BSON representation.
-    @pre The input `j` shall be an object: `j.is_object() == true`
-    @sa @ref to_bson(const basic_json&)
-    */
-    static void to_bson(const basic_json& j, detail::output_adapter<uint8_t> o)
+    /// @brief create a BSON serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_bson/
+    static void to_bson(const basic_json& j, detail::output_adapter<std::uint8_t> o)
     {
-        binary_writer<uint8_t>(o).write_bson(j);
+        binary_writer<std::uint8_t>(o).write_bson(j);
     }
 
-    /*!
-    @copydoc to_bson(const basic_json&, detail::output_adapter<uint8_t>)
-    */
+    /// @brief create a BSON serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_bson/
     static void to_bson(const basic_json& j, detail::output_adapter<char> o)
     {
         binary_writer<char>(o).write_bson(j);
     }
 
-
-    /*!
-    @brief create a JSON value from an input in CBOR format
-
-    Deserializes a given input @a i to a JSON value using the CBOR (Concise
-    Binary Object Representation) serialization format.
-
-    The library maps CBOR types to JSON value types as follows:
-
-    CBOR type              | JSON value type | first byte
-    ---------------------- | --------------- | ----------
-    Integer                | number_unsigned | 0x00..0x17
-    Unsigned integer       | number_unsigned | 0x18
-    Unsigned integer       | number_unsigned | 0x19
-    Unsigned integer       | number_unsigned | 0x1A
-    Unsigned integer       | number_unsigned | 0x1B
-    Negative integer       | number_integer  | 0x20..0x37
-    Negative integer       | number_integer  | 0x38
-    Negative integer       | number_integer  | 0x39
-    Negative integer       | number_integer  | 0x3A
-    Negative integer       | number_integer  | 0x3B
-    Byte string            | binary          | 0x40..0x57
-    Byte string            | binary          | 0x58
-    Byte string            | binary          | 0x59
-    Byte string            | binary          | 0x5A
-    Byte string            | binary          | 0x5B
-    UTF-8 string           | string          | 0x60..0x77
-    UTF-8 string           | string          | 0x78
-    UTF-8 string           | string          | 0x79
-    UTF-8 string           | string          | 0x7A
-    UTF-8 string           | string          | 0x7B
-    UTF-8 string           | string          | 0x7F
-    array                  | array           | 0x80..0x97
-    array                  | array           | 0x98
-    array                  | array           | 0x99
-    array                  | array           | 0x9A
-    array                  | array           | 0x9B
-    array                  | array           | 0x9F
-    map                    | object          | 0xA0..0xB7
-    map                    | object          | 0xB8
-    map                    | object          | 0xB9
-    map                    | object          | 0xBA
-    map                    | object          | 0xBB
-    map                    | object          | 0xBF
-    False                  | `false`         | 0xF4
-    True                   | `true`          | 0xF5
-    Null                   | `null`          | 0xF6
-    Half-Precision Float   | number_float    | 0xF9
-    Single-Precision Float | number_float    | 0xFA
-    Double-Precision Float | number_float    | 0xFB
-
-    @warning The mapping is **incomplete** in the sense that not all CBOR
-             types can be converted to a JSON value. The following CBOR types
-             are not supported and will yield parse errors (parse_error.112):
-             - date/time (0xC0..0xC1)
-             - bignum (0xC2..0xC3)
-             - decimal fraction (0xC4)
-             - bigfloat (0xC5)
-             - expected conversions (0xD5..0xD7)
-             - simple values (0xE0..0xF3, 0xF8)
-             - undefined (0xF7)
-
-    @warning CBOR allows map keys of any type, whereas JSON only allows
-             strings as keys in object values. Therefore, CBOR maps with keys
-             other than UTF-8 strings are rejected (parse_error.113).
-
-    @note Any CBOR output created @ref to_cbor can be successfully parsed by
-          @ref from_cbor.
-
-    @param[in] i  an input in CBOR format convertible to an input adapter
-    @param[in] strict  whether to expect the input to be consumed until EOF
-                       (true by default)
-    @param[in] allow_exceptions  whether to throw exceptions in case of a
-    parse error (optional, true by default)
-    @param[in] tag_handler how to treat CBOR tags (optional, error by default)
-
-    @return deserialized JSON value; in case of a parse error and
-            @a allow_exceptions set to `false`, the return value will be
-            value_t::discarded.
-
-    @throw parse_error.110 if the given input ends prematurely or the end of
-    file was not reached when @a strict was set to true
-    @throw parse_error.112 if unsupported features from CBOR were
-    used in the given input @a v or if the input is not valid CBOR
-    @throw parse_error.113 if a string was expected as map key, but not found
-
-    @complexity Linear in the size of the input @a i.
-
-    @liveexample{The example shows the deserialization of a byte vector in CBOR
-    format to a JSON value.,from_cbor}
-
-    @sa http://cbor.io
-    @sa @ref to_cbor(const basic_json&) for the analogous serialization
-    @sa @ref from_msgpack(detail::input_adapter&&, const bool, const bool) for the
-        related MessagePack format
-    @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for the
-        related UBJSON format
-
-    @since version 2.0.9; parameter @a start_index since 2.1.1; changed to
-           consume input adapters, removed start_index parameter, and added
-           @a strict parameter since 3.0.0; added @a allow_exceptions parameter
-           since 3.2.0; added @a tag_handler parameter since 3.9.0.
-    */
+    /// @brief create a JSON value from an input in CBOR format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_cbor/
     template<typename InputType>
     JSON_HEDLEY_WARN_UNUSED_RESULT
     static basic_json from_cbor(InputType&& i,
@@ -7584,13 +4367,12 @@ class basic_json
         basic_json result;
         detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
         auto ia = detail::input_adapter(std::forward<InputType>(i));
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler);
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::cbor).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler);
         return res ? result : basic_json(value_t::discarded);
     }
 
-    /*!
-    @copydoc from_cbor(detail::input_adapter&&, const bool, const bool, const cbor_tag_handler_t)
-    */
+    /// @brief create a JSON value from an input in CBOR format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_cbor/
     template<typename IteratorType>
     JSON_HEDLEY_WARN_UNUSED_RESULT
     static basic_json from_cbor(IteratorType first, IteratorType last,
@@ -7601,7 +4383,7 @@ class basic_json
         basic_json result;
         detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
         auto ia = detail::input_adapter(std::move(first), std::move(last));
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler);
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::cbor).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler);
         return res ? result : basic_json(value_t::discarded);
     }
 
@@ -7616,7 +4398,6 @@ class basic_json
         return from_cbor(ptr, ptr + len, strict, allow_exceptions, tag_handler);
     }
 
-
     JSON_HEDLEY_WARN_UNUSED_RESULT
     JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_cbor(ptr, ptr + len))
     static basic_json from_cbor(detail::span_input_adapter&& i,
@@ -7627,96 +4408,13 @@ class basic_json
         basic_json result;
         detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
         auto ia = i.get();
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler);
+        // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::cbor).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler);
         return res ? result : basic_json(value_t::discarded);
     }
 
-    /*!
-    @brief create a JSON value from an input in MessagePack format
-
-    Deserializes a given input @a i to a JSON value using the MessagePack
-    serialization format.
-
-    The library maps MessagePack types to JSON value types as follows:
-
-    MessagePack type | JSON value type | first byte
-    ---------------- | --------------- | ----------
-    positive fixint  | number_unsigned | 0x00..0x7F
-    fixmap           | object          | 0x80..0x8F
-    fixarray         | array           | 0x90..0x9F
-    fixstr           | string          | 0xA0..0xBF
-    nil              | `null`          | 0xC0
-    false            | `false`         | 0xC2
-    true             | `true`          | 0xC3
-    float 32         | number_float    | 0xCA
-    float 64         | number_float    | 0xCB
-    uint 8           | number_unsigned | 0xCC
-    uint 16          | number_unsigned | 0xCD
-    uint 32          | number_unsigned | 0xCE
-    uint 64          | number_unsigned | 0xCF
-    int 8            | number_integer  | 0xD0
-    int 16           | number_integer  | 0xD1
-    int 32           | number_integer  | 0xD2
-    int 64           | number_integer  | 0xD3
-    str 8            | string          | 0xD9
-    str 16           | string          | 0xDA
-    str 32           | string          | 0xDB
-    array 16         | array           | 0xDC
-    array 32         | array           | 0xDD
-    map 16           | object          | 0xDE
-    map 32           | object          | 0xDF
-    bin 8            | binary          | 0xC4
-    bin 16           | binary          | 0xC5
-    bin 32           | binary          | 0xC6
-    ext 8            | binary          | 0xC7
-    ext 16           | binary          | 0xC8
-    ext 32           | binary          | 0xC9
-    fixext 1         | binary          | 0xD4
-    fixext 2         | binary          | 0xD5
-    fixext 4         | binary          | 0xD6
-    fixext 8         | binary          | 0xD7
-    fixext 16        | binary          | 0xD8
-    negative fixint  | number_integer  | 0xE0-0xFF
-
-    @note Any MessagePack output created @ref to_msgpack can be successfully
-          parsed by @ref from_msgpack.
-
-    @param[in] i  an input in MessagePack format convertible to an input
-                  adapter
-    @param[in] strict  whether to expect the input to be consumed until EOF
-                       (true by default)
-    @param[in] allow_exceptions  whether to throw exceptions in case of a
-    parse error (optional, true by default)
-
-    @return deserialized JSON value; in case of a parse error and
-            @a allow_exceptions set to `false`, the return value will be
-            value_t::discarded.
-
-    @throw parse_error.110 if the given input ends prematurely or the end of
-    file was not reached when @a strict was set to true
-    @throw parse_error.112 if unsupported features from MessagePack were
-    used in the given input @a i or if the input is not valid MessagePack
-    @throw parse_error.113 if a string was expected as map key, but not found
-
-    @complexity Linear in the size of the input @a i.
-
-    @liveexample{The example shows the deserialization of a byte vector in
-    MessagePack format to a JSON value.,from_msgpack}
-
-    @sa http://msgpack.org
-    @sa @ref to_msgpack(const basic_json&) for the analogous serialization
-    @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool, const cbor_tag_handler_t) for the
-        related CBOR format
-    @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for
-        the related UBJSON format
-    @sa @ref from_bson(detail::input_adapter&&, const bool, const bool) for
-        the related BSON format
-
-    @since version 2.0.9; parameter @a start_index since 2.1.1; changed to
-           consume input adapters, removed start_index parameter, and added
-           @a strict parameter since 3.0.0; added @a allow_exceptions parameter
-           since 3.2.0
-    */
+    /// @brief create a JSON value from an input in MessagePack format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_msgpack/
     template<typename InputType>
     JSON_HEDLEY_WARN_UNUSED_RESULT
     static basic_json from_msgpack(InputType&& i,
@@ -7726,13 +4424,12 @@ class basic_json
         basic_json result;
         detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
         auto ia = detail::input_adapter(std::forward<InputType>(i));
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::msgpack, &sdp, strict);
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::msgpack).sax_parse(input_format_t::msgpack, &sdp, strict);
         return res ? result : basic_json(value_t::discarded);
     }
 
-    /*!
-    @copydoc from_msgpack(detail::input_adapter&&, const bool, const bool)
-    */
+    /// @brief create a JSON value from an input in MessagePack format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_msgpack/
     template<typename IteratorType>
     JSON_HEDLEY_WARN_UNUSED_RESULT
     static basic_json from_msgpack(IteratorType first, IteratorType last,
@@ -7742,11 +4439,10 @@ class basic_json
         basic_json result;
         detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
         auto ia = detail::input_adapter(std::move(first), std::move(last));
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::msgpack, &sdp, strict);
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::msgpack).sax_parse(input_format_t::msgpack, &sdp, strict);
         return res ? result : basic_json(value_t::discarded);
     }
 
-
     template<typename T>
     JSON_HEDLEY_WARN_UNUSED_RESULT
     JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_msgpack(ptr, ptr + len))
@@ -7766,73 +4462,13 @@ class basic_json
         basic_json result;
         detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
         auto ia = i.get();
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::msgpack, &sdp, strict);
+        // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::msgpack).sax_parse(input_format_t::msgpack, &sdp, strict);
         return res ? result : basic_json(value_t::discarded);
     }
 
-
-    /*!
-    @brief create a JSON value from an input in UBJSON format
-
-    Deserializes a given input @a i to a JSON value using the UBJSON (Universal
-    Binary JSON) serialization format.
-
-    The library maps UBJSON types to JSON value types as follows:
-
-    UBJSON type | JSON value type                         | marker
-    ----------- | --------------------------------------- | ------
-    no-op       | *no value, next value is read*          | `N`
-    null        | `null`                                  | `Z`
-    false       | `false`                                 | `F`
-    true        | `true`                                  | `T`
-    float32     | number_float                            | `d`
-    float64     | number_float                            | `D`
-    uint8       | number_unsigned                         | `U`
-    int8        | number_integer                          | `i`
-    int16       | number_integer                          | `I`
-    int32       | number_integer                          | `l`
-    int64       | number_integer                          | `L`
-    high-precision number | number_integer, number_unsigned, or number_float - depends on number string | 'H'
-    string      | string                                  | `S`
-    char        | string                                  | `C`
-    array       | array (optimized values are supported)  | `[`
-    object      | object (optimized values are supported) | `{`
-
-    @note The mapping is **complete** in the sense that any UBJSON value can
-          be converted to a JSON value.
-
-    @param[in] i  an input in UBJSON format convertible to an input adapter
-    @param[in] strict  whether to expect the input to be consumed until EOF
-                       (true by default)
-    @param[in] allow_exceptions  whether to throw exceptions in case of a
-    parse error (optional, true by default)
-
-    @return deserialized JSON value; in case of a parse error and
-            @a allow_exceptions set to `false`, the return value will be
-            value_t::discarded.
-
-    @throw parse_error.110 if the given input ends prematurely or the end of
-    file was not reached when @a strict was set to true
-    @throw parse_error.112 if a parse error occurs
-    @throw parse_error.113 if a string could not be parsed successfully
-
-    @complexity Linear in the size of the input @a i.
-
-    @liveexample{The example shows the deserialization of a byte vector in
-    UBJSON format to a JSON value.,from_ubjson}
-
-    @sa http://ubjson.org
-    @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the
-             analogous serialization
-    @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool, const cbor_tag_handler_t) for the
-        related CBOR format
-    @sa @ref from_msgpack(detail::input_adapter&&, const bool, const bool) for
-        the related MessagePack format
-    @sa @ref from_bson(detail::input_adapter&&, const bool, const bool) for
-        the related BSON format
-
-    @since version 3.1.0; added @a allow_exceptions parameter since 3.2.0
-    */
+    /// @brief create a JSON value from an input in UBJSON format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_ubjson/
     template<typename InputType>
     JSON_HEDLEY_WARN_UNUSED_RESULT
     static basic_json from_ubjson(InputType&& i,
@@ -7842,13 +4478,12 @@ class basic_json
         basic_json result;
         detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
         auto ia = detail::input_adapter(std::forward<InputType>(i));
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::ubjson, &sdp, strict);
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::ubjson).sax_parse(input_format_t::ubjson, &sdp, strict);
         return res ? result : basic_json(value_t::discarded);
     }
 
-    /*!
-    @copydoc from_ubjson(detail::input_adapter&&, const bool, const bool)
-    */
+    /// @brief create a JSON value from an input in UBJSON format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_ubjson/
     template<typename IteratorType>
     JSON_HEDLEY_WARN_UNUSED_RESULT
     static basic_json from_ubjson(IteratorType first, IteratorType last,
@@ -7858,7 +4493,7 @@ class basic_json
         basic_json result;
         detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
         auto ia = detail::input_adapter(std::move(first), std::move(last));
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::ubjson, &sdp, strict);
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::ubjson).sax_parse(input_format_t::ubjson, &sdp, strict);
         return res ? result : basic_json(value_t::discarded);
     }
 
@@ -7881,71 +4516,43 @@ class basic_json
         basic_json result;
         detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
         auto ia = i.get();
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::ubjson, &sdp, strict);
+        // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::ubjson).sax_parse(input_format_t::ubjson, &sdp, strict);
         return res ? result : basic_json(value_t::discarded);
     }
 
+    /// @brief create a JSON value from an input in BJData format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_bjdata/
+    template<typename InputType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_bjdata(InputType&& i,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = detail::input_adapter(std::forward<InputType>(i));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::bjdata).sax_parse(input_format_t::bjdata, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
 
-    /*!
-    @brief Create a JSON value from an input in BSON format
-
-    Deserializes a given input @a i to a JSON value using the BSON (Binary JSON)
-    serialization format.
-
-    The library maps BSON record types to JSON value types as follows:
-
-    BSON type       | BSON marker byte | JSON value type
-    --------------- | ---------------- | ---------------------------
-    double          | 0x01             | number_float
-    string          | 0x02             | string
-    document        | 0x03             | object
-    array           | 0x04             | array
-    binary          | 0x05             | binary
-    undefined       | 0x06             | still unsupported
-    ObjectId        | 0x07             | still unsupported
-    boolean         | 0x08             | boolean
-    UTC Date-Time   | 0x09             | still unsupported
-    null            | 0x0A             | null
-    Regular Expr.   | 0x0B             | still unsupported
-    DB Pointer      | 0x0C             | still unsupported
-    JavaScript Code | 0x0D             | still unsupported
-    Symbol          | 0x0E             | still unsupported
-    JavaScript Code | 0x0F             | still unsupported
-    int32           | 0x10             | number_integer
-    Timestamp       | 0x11             | still unsupported
-    128-bit decimal float | 0x13       | still unsupported
-    Max Key         | 0x7F             | still unsupported
-    Min Key         | 0xFF             | still unsupported
-
-    @warning The mapping is **incomplete**. The unsupported mappings
-             are indicated in the table above.
-
-    @param[in] i  an input in BSON format convertible to an input adapter
-    @param[in] strict  whether to expect the input to be consumed until EOF
-                       (true by default)
-    @param[in] allow_exceptions  whether to throw exceptions in case of a
-    parse error (optional, true by default)
-
-    @return deserialized JSON value; in case of a parse error and
-            @a allow_exceptions set to `false`, the return value will be
-            value_t::discarded.
-
-    @throw parse_error.114 if an unsupported BSON record type is encountered
-
-    @complexity Linear in the size of the input @a i.
-
-    @liveexample{The example shows the deserialization of a byte vector in
-    BSON format to a JSON value.,from_bson}
-
-    @sa http://bsonspec.org/spec.html
-    @sa @ref to_bson(const basic_json&) for the analogous serialization
-    @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool, const cbor_tag_handler_t) for the
-        related CBOR format
-    @sa @ref from_msgpack(detail::input_adapter&&, const bool, const bool) for
-        the related MessagePack format
-    @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for the
-        related UBJSON format
-    */
+    /// @brief create a JSON value from an input in BJData format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_bjdata/
+    template<typename IteratorType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_bjdata(IteratorType first, IteratorType last,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = detail::input_adapter(std::move(first), std::move(last));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::bjdata).sax_parse(input_format_t::bjdata, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in BSON format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_bson/
     template<typename InputType>
     JSON_HEDLEY_WARN_UNUSED_RESULT
     static basic_json from_bson(InputType&& i,
@@ -7955,13 +4562,12 @@ class basic_json
         basic_json result;
         detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
         auto ia = detail::input_adapter(std::forward<InputType>(i));
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::bson, &sdp, strict);
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::bson).sax_parse(input_format_t::bson, &sdp, strict);
         return res ? result : basic_json(value_t::discarded);
     }
 
-    /*!
-    @copydoc from_bson(detail::input_adapter&&, const bool, const bool)
-    */
+    /// @brief create a JSON value from an input in BSON format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_bson/
     template<typename IteratorType>
     JSON_HEDLEY_WARN_UNUSED_RESULT
     static basic_json from_bson(IteratorType first, IteratorType last,
@@ -7971,7 +4577,7 @@ class basic_json
         basic_json result;
         detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
         auto ia = detail::input_adapter(std::move(first), std::move(last));
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::bson, &sdp, strict);
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::bson).sax_parse(input_format_t::bson, &sdp, strict);
         return res ? result : basic_json(value_t::discarded);
     }
 
@@ -7994,7 +4600,8 @@ class basic_json
         basic_json result;
         detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
         auto ia = i.get();
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::bson, &sdp, strict);
+        // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::bson).sax_parse(input_format_t::bson, &sdp, strict);
         return res ? result : basic_json(value_t::discarded);
     }
     /// @}
@@ -8006,180 +4613,64 @@ class basic_json
     /// @name JSON Pointer functions
     /// @{
 
-    /*!
-    @brief access specified element via JSON Pointer
-
-    Uses a JSON pointer to retrieve a reference to the respective JSON value.
-    No bound checking is performed. Similar to @ref operator[](const typename
-    object_t::key_type&), `null` values are created in arrays and objects if
-    necessary.
-
-    In particular:
-    - If the JSON pointer points to an object key that does not exist, it
-      is created an filled with a `null` value before a reference to it
-      is returned.
-    - If the JSON pointer points to an array index that does not exist, it
-      is created an filled with a `null` value before a reference to it
-      is returned. All indices between the current maximum and the given
-      index are also filled with `null`.
-    - The special value `-` is treated as a synonym for the index past the
-      end.
-
-    @param[in] ptr  a JSON pointer
-
-    @return reference to the element pointed to by @a ptr
-
-    @complexity Constant.
-
-    @throw parse_error.106   if an array index begins with '0'
-    @throw parse_error.109   if an array index was not a number
-    @throw out_of_range.404  if the JSON pointer can not be resolved
-
-    @liveexample{The behavior is shown in the example.,operatorjson_pointer}
-
-    @since version 2.0.0
-    */
+    /// @brief access specified element via JSON Pointer
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
     reference operator[](const json_pointer& ptr)
     {
         return ptr.get_unchecked(this);
     }
 
-    /*!
-    @brief access specified element via JSON Pointer
-
-    Uses a JSON pointer to retrieve a reference to the respective JSON value.
-    No bound checking is performed. The function does not change the JSON
-    value; no `null` values are created. In particular, the special value
-    `-` yields an exception.
-
-    @param[in] ptr  JSON pointer to the desired element
-
-    @return const reference to the element pointed to by @a ptr
-
-    @complexity Constant.
-
-    @throw parse_error.106   if an array index begins with '0'
-    @throw parse_error.109   if an array index was not a number
-    @throw out_of_range.402  if the array index '-' is used
-    @throw out_of_range.404  if the JSON pointer can not be resolved
-
-    @liveexample{The behavior is shown in the example.,operatorjson_pointer_const}
+    template<typename BasicJsonType, detail::enable_if_t<detail::is_basic_json<BasicJsonType>::value, int> = 0>
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
+    reference operator[](const ::nlohmann::json_pointer<BasicJsonType>& ptr)
+    {
+        return ptr.get_unchecked(this);
+    }
 
-    @since version 2.0.0
-    */
+    /// @brief access specified element via JSON Pointer
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
     const_reference operator[](const json_pointer& ptr) const
     {
         return ptr.get_unchecked(this);
     }
 
-    /*!
-    @brief access specified element via JSON Pointer
-
-    Returns a reference to the element at with specified JSON pointer @a ptr,
-    with bounds checking.
-
-    @param[in] ptr  JSON pointer to the desired element
-
-    @return reference to the element pointed to by @a ptr
-
-    @throw parse_error.106 if an array index in the passed JSON pointer @a ptr
-    begins with '0'. See example below.
-
-    @throw parse_error.109 if an array index in the passed JSON pointer @a ptr
-    is not a number. See example below.
-
-    @throw out_of_range.401 if an array index in the passed JSON pointer @a ptr
-    is out of range. See example below.
-
-    @throw out_of_range.402 if the array index '-' is used in the passed JSON
-    pointer @a ptr. As `at` provides checked access (and no elements are
-    implicitly inserted), the index '-' is always invalid. See example below.
-
-    @throw out_of_range.403 if the JSON pointer describes a key of an object
-    which cannot be found. See example below.
-
-    @throw out_of_range.404 if the JSON pointer @a ptr can not be resolved.
-    See example below.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes in the JSON value.
-
-    @complexity Constant.
-
-    @since version 2.0.0
+    template<typename BasicJsonType, detail::enable_if_t<detail::is_basic_json<BasicJsonType>::value, int> = 0>
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
+    const_reference operator[](const ::nlohmann::json_pointer<BasicJsonType>& ptr) const
+    {
+        return ptr.get_unchecked(this);
+    }
 
-    @liveexample{The behavior is shown in the example.,at_json_pointer}
-    */
+    /// @brief access specified element via JSON Pointer
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
     reference at(const json_pointer& ptr)
     {
         return ptr.get_checked(this);
     }
 
-    /*!
-    @brief access specified element via JSON Pointer
-
-    Returns a const reference to the element at with specified JSON pointer @a
-    ptr, with bounds checking.
-
-    @param[in] ptr  JSON pointer to the desired element
-
-    @return reference to the element pointed to by @a ptr
-
-    @throw parse_error.106 if an array index in the passed JSON pointer @a ptr
-    begins with '0'. See example below.
-
-    @throw parse_error.109 if an array index in the passed JSON pointer @a ptr
-    is not a number. See example below.
-
-    @throw out_of_range.401 if an array index in the passed JSON pointer @a ptr
-    is out of range. See example below.
-
-    @throw out_of_range.402 if the array index '-' is used in the passed JSON
-    pointer @a ptr. As `at` provides checked access (and no elements are
-    implicitly inserted), the index '-' is always invalid. See example below.
-
-    @throw out_of_range.403 if the JSON pointer describes a key of an object
-    which cannot be found. See example below.
-
-    @throw out_of_range.404 if the JSON pointer @a ptr can not be resolved.
-    See example below.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes in the JSON value.
-
-    @complexity Constant.
-
-    @since version 2.0.0
+    template<typename BasicJsonType, detail::enable_if_t<detail::is_basic_json<BasicJsonType>::value, int> = 0>
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
+    reference at(const ::nlohmann::json_pointer<BasicJsonType>& ptr)
+    {
+        return ptr.get_checked(this);
+    }
 
-    @liveexample{The behavior is shown in the example.,at_json_pointer_const}
-    */
+    /// @brief access specified element via JSON Pointer
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
     const_reference at(const json_pointer& ptr) const
     {
         return ptr.get_checked(this);
     }
 
-    /*!
-    @brief return flattened JSON value
-
-    The function creates a JSON object whose keys are JSON pointers (see [RFC
-    6901](https://tools.ietf.org/html/rfc6901)) and whose values are all
-    primitive. The original JSON value can be restored using the @ref
-    unflatten() function.
-
-    @return an object that maps JSON pointers to primitive values
-
-    @note Empty objects and arrays are flattened to `null` and will not be
-          reconstructed correctly by the @ref unflatten() function.
-
-    @complexity Linear in the size the JSON value.
-
-    @liveexample{The following code shows how a JSON object is flattened to an
-    object whose keys consist of JSON pointers.,flatten}
-
-    @sa @ref unflatten() for the reverse function
+    template<typename BasicJsonType, detail::enable_if_t<detail::is_basic_json<BasicJsonType>::value, int> = 0>
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
+    const_reference at(const ::nlohmann::json_pointer<BasicJsonType>& ptr) const
+    {
+        return ptr.get_checked(this);
+    }
 
-    @since version 2.0.0
-    */
+    /// @brief return flattened JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/flatten/
     basic_json flatten() const
     {
         basic_json result(value_t::object);
@@ -8187,36 +4678,8 @@ class basic_json
         return result;
     }
 
-    /*!
-    @brief unflatten a previously flattened JSON value
-
-    The function restores the arbitrary nesting of a JSON value that has been
-    flattened before using the @ref flatten() function. The JSON value must
-    meet certain constraints:
-    1. The value must be an object.
-    2. The keys must be JSON pointers (see
-       [RFC 6901](https://tools.ietf.org/html/rfc6901))
-    3. The mapped values must be primitive JSON types.
-
-    @return the original JSON from a flattened version
-
-    @note Empty objects and arrays are flattened by @ref flatten() to `null`
-          values and can not unflattened to their original type. Apart from
-          this example, for a JSON value `j`, the following is always true:
-          `j == j.flatten().unflatten()`.
-
-    @complexity Linear in the size the JSON value.
-
-    @throw type_error.314  if value is not an object
-    @throw type_error.315  if object values are not primitive
-
-    @liveexample{The following code shows how a flattened JSON object is
-    unflattened into the original nested JSON object.,unflatten}
-
-    @sa @ref flatten() for the reverse function
-
-    @since version 2.0.0
-    */
+    /// @brief unflatten a previously flattened JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/unflatten/
     basic_json unflatten() const
     {
         return json_pointer::unflatten(*this);
@@ -8231,58 +4694,11 @@ class basic_json
     /// @name JSON Patch functions
     /// @{
 
-    /*!
-    @brief applies a JSON patch
-
-    [JSON Patch](http://jsonpatch.com) defines a JSON document structure for
-    expressing a sequence of operations to apply to a JSON) document. With
-    this function, a JSON Patch is applied to the current JSON value by
-    executing all operations from the patch.
-
-    @param[in] json_patch  JSON patch document
-    @return patched document
-
-    @note The application of a patch is atomic: Either all operations succeed
-          and the patched document is returned or an exception is thrown. In
-          any case, the original value is not changed: the patch is applied
-          to a copy of the value.
-
-    @throw parse_error.104 if the JSON patch does not consist of an array of
-    objects
-
-    @throw parse_error.105 if the JSON patch is malformed (e.g., mandatory
-    attributes are missing); example: `"operation add must have member path"`
-
-    @throw out_of_range.401 if an array index is out of range.
-
-    @throw out_of_range.403 if a JSON pointer inside the patch could not be
-    resolved successfully in the current JSON value; example: `"key baz not
-    found"`
-
-    @throw out_of_range.405 if JSON pointer has no parent ("add", "remove",
-    "move")
-
-    @throw other_error.501 if "test" operation was unsuccessful
-
-    @complexity Linear in the size of the JSON value and the length of the
-    JSON patch. As usually only a fraction of the JSON value is affected by
-    the patch, the complexity can usually be neglected.
-
-    @liveexample{The following code shows how a JSON patch is applied to a
-    value.,patch}
-
-    @sa @ref diff -- create a JSON patch by comparing two JSON values
-
-    @sa [RFC 6902 (JSON Patch)](https://tools.ietf.org/html/rfc6902)
-    @sa [RFC 6901 (JSON Pointer)](https://tools.ietf.org/html/rfc6901)
-
-    @since version 2.0.0
-    */
-    basic_json patch(const basic_json& json_patch) const
+    /// @brief applies a JSON patch in-place without copying the object
+    /// @sa https://json.nlohmann.me/api/basic_json/patch/
+    void patch_inplace(const basic_json& json_patch)
     {
-        // make a working copy to apply the patch to
-        basic_json result = *this;
-
+        basic_json& result = *this;
         // the valid JSON Patch operations
         enum class patch_operations {add, remove, replace, move, copy, test, invalid};
 
@@ -8327,7 +4743,7 @@ class basic_json
             }
 
             // make sure the top element of the pointer exists
-            json_pointer top_pointer = ptr.top();
+            json_pointer const top_pointer = ptr.top();
             if (top_pointer != ptr)
             {
                 result.at(top_pointer);
@@ -8336,9 +4752,10 @@ class basic_json
             // get reference to parent of JSON pointer ptr
             const auto last_path = ptr.back();
             ptr.pop_back();
-            basic_json& parent = result[ptr];
+            // parent must exist when performing patch add per RFC6902 specs
+            basic_json& parent = result.at(ptr);
 
-            switch (parent.m_type)
+            switch (parent.m_data.m_type)
             {
                 case value_t::null:
                 case value_t::object:
@@ -8357,11 +4774,11 @@ class basic_json
                     }
                     else
                     {
-                        const auto idx = json_pointer::array_index(last_path);
+                        const auto idx = json_pointer::template array_index<basic_json_t>(last_path);
                         if (JSON_HEDLEY_UNLIKELY(idx > parent.size()))
                         {
                             // avoid undefined behavior
-                            JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range", parent));
+                            JSON_THROW(out_of_range::create(401, detail::concat("array index ", std::to_string(idx), " is out of range"), &parent));
                         }
 
                         // default case: insert add offset
@@ -8371,13 +4788,20 @@ class basic_json
                 }
 
                 // if there exists a parent it cannot be primitive
+                case value_t::string: // LCOV_EXCL_LINE
+                case value_t::boolean: // LCOV_EXCL_LINE
+                case value_t::number_integer: // LCOV_EXCL_LINE
+                case value_t::number_unsigned: // LCOV_EXCL_LINE
+                case value_t::number_float: // LCOV_EXCL_LINE
+                case value_t::binary: // LCOV_EXCL_LINE
+                case value_t::discarded: // LCOV_EXCL_LINE
                 default:            // LCOV_EXCL_LINE
-                    JSON_ASSERT(false);  // LCOV_EXCL_LINE
+                    JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
             }
         };
 
         // wrapper for "remove" operation; remove value at ptr
-        const auto operation_remove = [this, &result](json_pointer & ptr)
+        const auto operation_remove = [this, & result](json_pointer & ptr)
         {
             // get reference to parent of JSON pointer ptr
             const auto last_path = ptr.back();
@@ -8395,20 +4819,20 @@ class basic_json
                 }
                 else
                 {
-                    JSON_THROW(out_of_range::create(403, "key '" + last_path + "' not found", *this));
+                    JSON_THROW(out_of_range::create(403, detail::concat("key '", last_path, "' not found"), this));
                 }
             }
             else if (parent.is_array())
             {
                 // note erase performs range check
-                parent.erase(json_pointer::array_index(last_path));
+                parent.erase(json_pointer::template array_index<basic_json_t>(last_path));
             }
         };
 
         // type check: top level value must be an array
         if (JSON_HEDLEY_UNLIKELY(!json_patch.is_array()))
         {
-            JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects", json_patch));
+            JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects", &json_patch));
         }
 
         // iterate and apply the operations
@@ -8420,21 +4844,23 @@ class basic_json
                                           bool string_type) -> basic_json &
             {
                 // find value
-                auto it = val.m_value.object->find(member);
+                auto it = val.m_data.m_value.object->find(member);
 
                 // context-sensitive error message
-                const auto error_msg = (op == "op") ? "operation" : "operation '" + op + "'";
+                const auto error_msg = (op == "op") ? "operation" : detail::concat("operation '", op, '\'');
 
                 // check if desired value is present
-                if (JSON_HEDLEY_UNLIKELY(it == val.m_value.object->end()))
+                if (JSON_HEDLEY_UNLIKELY(it == val.m_data.m_value.object->end()))
                 {
-                    JSON_THROW(parse_error::create(105, 0, error_msg + " must have member '" + member + "'", val));
+                    // NOLINTNEXTLINE(performance-inefficient-string-concatenation)
+                    JSON_THROW(parse_error::create(105, 0, detail::concat(error_msg, " must have member '", member, "'"), &val));
                 }
 
                 // check if result is of type string
                 if (JSON_HEDLEY_UNLIKELY(string_type && !it->second.is_string()))
                 {
-                    JSON_THROW(parse_error::create(105, 0, error_msg + " must have string member '" + member + "'", val));
+                    // NOLINTNEXTLINE(performance-inefficient-string-concatenation)
+                    JSON_THROW(parse_error::create(105, 0, detail::concat(error_msg, " must have string member '", member, "'"), &val));
                 }
 
                 // no error: return value
@@ -8444,7 +4870,7 @@ class basic_json
             // type check: every element of the array must be an object
             if (JSON_HEDLEY_UNLIKELY(!val.is_object()))
             {
-                JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects", val));
+                JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects", &val));
             }
 
             // collect mandatory members
@@ -8479,7 +4905,7 @@ class basic_json
                     json_pointer from_ptr(from_path);
 
                     // the "from" location must exist - use at()
-                    basic_json v = result.at(from_ptr);
+                    basic_json const v = result.at(from_ptr);
 
                     // The move operation is functionally identical to a
                     // "remove" operation on the "from" location, followed
@@ -8496,7 +4922,7 @@ class basic_json
                     const json_pointer from_ptr(from_path);
 
                     // the "from" location must exist - use at()
-                    basic_json v = result.at(from_ptr);
+                    basic_json const v = result.at(from_ptr);
 
                     // The copy is functionally identical to an "add"
                     // operation at the target location using the value
@@ -8522,57 +4948,34 @@ class basic_json
                     // throw an exception if test fails
                     if (JSON_HEDLEY_UNLIKELY(!success))
                     {
-                        JSON_THROW(other_error::create(501, "unsuccessful: " + val.dump(), val));
+                        JSON_THROW(other_error::create(501, detail::concat("unsuccessful: ", val.dump()), &val));
                     }
 
                     break;
                 }
 
+                case patch_operations::invalid:
                 default:
                 {
                     // op must be "add", "remove", "replace", "move", "copy", or
                     // "test"
-                    JSON_THROW(parse_error::create(105, 0, "operation value '" + op + "' is invalid", val));
+                    JSON_THROW(parse_error::create(105, 0, detail::concat("operation value '", op, "' is invalid"), &val));
                 }
             }
         }
+    }
 
+    /// @brief applies a JSON patch to a copy of the current object
+    /// @sa https://json.nlohmann.me/api/basic_json/patch/
+    basic_json patch(const basic_json& json_patch) const
+    {
+        basic_json result = *this;
+        result.patch_inplace(json_patch);
         return result;
     }
 
-    /*!
-    @brief creates a diff as a JSON patch
-
-    Creates a [JSON Patch](http://jsonpatch.com) so that value @a source can
-    be changed into the value @a target by calling @ref patch function.
-
-    @invariant For two JSON values @a source and @a target, the following code
-    yields always `true`:
-    @code {.cpp}
-    source.patch(diff(source, target)) == target;
-    @endcode
-
-    @note Currently, only `remove`, `add`, and `replace` operations are
-          generated.
-
-    @param[in] source  JSON value to compare from
-    @param[in] target  JSON value to compare against
-    @param[in] path    helper value to create JSON pointers
-
-    @return a JSON patch to convert the @a source to @a target
-
-    @complexity Linear in the lengths of @a source and @a target.
-
-    @liveexample{The following code shows how a JSON patch is created as a
-    diff for two JSON values.,diff}
-
-    @sa @ref patch -- apply a JSON patch
-    @sa @ref merge_patch -- apply a JSON Merge Patch
-
-    @sa [RFC 6902 (JSON Patch)](https://tools.ietf.org/html/rfc6902)
-
-    @since version 2.0.0
-    */
+    /// @brief creates a diff as a JSON patch
+    /// @sa https://json.nlohmann.me/api/basic_json/diff/
     JSON_HEDLEY_WARN_UNUSED_RESULT
     static basic_json diff(const basic_json& source, const basic_json& target,
                            const std::string& path = "")
@@ -8605,12 +5008,12 @@ class basic_json
                 while (i < source.size() && i < target.size())
                 {
                     // recursive call to compare array values at index i
-                    auto temp_diff = diff(source[i], target[i], path + "/" + std::to_string(i));
+                    auto temp_diff = diff(source[i], target[i], detail::concat(path, '/', std::to_string(i)));
                     result.insert(result.end(), temp_diff.begin(), temp_diff.end());
                     ++i;
                 }
 
-                // i now reached the end of at least one array
+                // We now reached the end of at least one array
                 // in a second pass, traverse the remaining elements
 
                 // remove my remaining elements
@@ -8622,7 +5025,7 @@ class basic_json
                     result.insert(result.begin() + end_index, object(
                     {
                         {"op", "remove"},
-                        {"path", path + "/" + std::to_string(i)}
+                        {"path", detail::concat(path, '/', std::to_string(i))}
                     }));
                     ++i;
                 }
@@ -8633,7 +5036,7 @@ class basic_json
                     result.push_back(
                     {
                         {"op", "add"},
-                        {"path", path + "/-"},
+                        {"path", detail::concat(path, "/-")},
                         {"value", target[i]}
                     });
                     ++i;
@@ -8648,12 +5051,12 @@ class basic_json
                 for (auto it = source.cbegin(); it != source.cend(); ++it)
                 {
                     // escape the key name to be used in a JSON patch
-                    const auto key = detail::escape(it.key());
+                    const auto path_key = detail::concat(path, '/', detail::escape(it.key()));
 
                     if (target.find(it.key()) != target.end())
                     {
                         // recursive call to compare object values at key it
-                        auto temp_diff = diff(it.value(), target[it.key()], path + "/" + key);
+                        auto temp_diff = diff(it.value(), target[it.key()], path_key);
                         result.insert(result.end(), temp_diff.begin(), temp_diff.end());
                     }
                     else
@@ -8661,7 +5064,7 @@ class basic_json
                         // found a key that is not in o -> remove it
                         result.push_back(object(
                         {
-                            {"op", "remove"}, {"path", path + "/" + key}
+                            {"op", "remove"}, {"path", path_key}
                         }));
                     }
                 }
@@ -8672,10 +5075,10 @@ class basic_json
                     if (source.find(it.key()) == source.end())
                     {
                         // found a key that is not in this -> add it
-                        const auto key = detail::escape(it.key());
+                        const auto path_key = detail::concat(path, '/', detail::escape(it.key()));
                         result.push_back(
                         {
-                            {"op", "add"}, {"path", path + "/" + key},
+                            {"op", "add"}, {"path", path_key},
                             {"value", it.value()}
                         });
                     }
@@ -8684,6 +5087,14 @@ class basic_json
                 break;
             }
 
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
             default:
             {
                 // both primitive type: replace value
@@ -8697,7 +5108,6 @@ class basic_json
 
         return result;
     }
-
     /// @}
 
     ////////////////////////////////
@@ -8707,48 +5117,8 @@ class basic_json
     /// @name JSON Merge Patch functions
     /// @{
 
-    /*!
-    @brief applies a JSON Merge Patch
-
-    The merge patch format is primarily intended for use with the HTTP PATCH
-    method as a means of describing a set of modifications to a target
-    resource's content. This function applies a merge patch to the current
-    JSON value.
-
-    The function implements the following algorithm from Section 2 of
-    [RFC 7396 (JSON Merge Patch)](https://tools.ietf.org/html/rfc7396):
-
-    ```
-    define MergePatch(Target, Patch):
-      if Patch is an Object:
-        if Target is not an Object:
-          Target = {} // Ignore the contents and set it to an empty Object
-        for each Name/Value pair in Patch:
-          if Value is null:
-            if Name exists in Target:
-              remove the Name/Value pair from Target
-          else:
-            Target[Name] = MergePatch(Target[Name], Value)
-        return Target
-      else:
-        return Patch
-    ```
-
-    Thereby, `Target` is the current object; that is, the patch is applied to
-    the current value.
-
-    @param[in] apply_patch  the patch to apply
-
-    @complexity Linear in the lengths of @a patch.
-
-    @liveexample{The following code shows how a JSON Merge Patch is applied to
-    a JSON document.,merge_patch}
-
-    @sa @ref patch -- apply a JSON patch
-    @sa [RFC 7396 (JSON Merge Patch)](https://tools.ietf.org/html/rfc7396)
-
-    @since version 3.0.0
-    */
+    /// @brief applies a JSON Merge Patch
+    /// @sa https://json.nlohmann.me/api/basic_json/merge_patch/
     void merge_patch(const basic_json& apply_patch)
     {
         if (apply_patch.is_object())
@@ -8778,120 +5148,110 @@ class basic_json
     /// @}
 };
 
-/*!
-@brief user-defined to_string function for JSON values
-
-This function implements a user-defined to_string  for JSON objects.
-
-@param[in] j  a JSON object
-@return a std::string object
-*/
-
+/// @brief user-defined to_string function for JSON values
+/// @sa https://json.nlohmann.me/api/basic_json/to_string/
 NLOHMANN_BASIC_JSON_TPL_DECLARATION
 std::string to_string(const NLOHMANN_BASIC_JSON_TPL& j)
 {
     return j.dump();
 }
-} // namespace nlohmann
+
+inline namespace literals
+{
+inline namespace json_literals
+{
+
+/// @brief user-defined string literal for JSON values
+/// @sa https://json.nlohmann.me/api/basic_json/operator_literal_json/
+JSON_HEDLEY_NON_NULL(1)
+#if !defined(JSON_HEDLEY_GCC_VERSION) || JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0)
+    inline nlohmann::json operator ""_json(const char* s, std::size_t n)
+#else
+    inline nlohmann::json operator "" _json(const char* s, std::size_t n)
+#endif
+{
+    return nlohmann::json::parse(s, s + n);
+}
+
+/// @brief user-defined string literal for JSON pointer
+/// @sa https://json.nlohmann.me/api/basic_json/operator_literal_json_pointer/
+JSON_HEDLEY_NON_NULL(1)
+#if !defined(JSON_HEDLEY_GCC_VERSION) || JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0)
+    inline nlohmann::json::json_pointer operator ""_json_pointer(const char* s, std::size_t n)
+#else
+    inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std::size_t n)
+#endif
+{
+    return nlohmann::json::json_pointer(std::string(s, n));
+}
+
+}  // namespace json_literals
+}  // namespace literals
+NLOHMANN_JSON_NAMESPACE_END
 
 ///////////////////////
 // nonmember support //
 ///////////////////////
 
-// specialization of std::swap, and std::hash
-namespace std
+namespace std // NOLINT(cert-dcl58-cpp)
 {
 
-/// hash value for JSON objects
-template<>
-struct hash<nlohmann::json>
+/// @brief hash value for JSON objects
+/// @sa https://json.nlohmann.me/api/basic_json/std_hash/
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+struct hash<nlohmann::NLOHMANN_BASIC_JSON_TPL> // NOLINT(cert-dcl58-cpp)
 {
-    /*!
-    @brief return a hash value for a JSON object
-
-    @since version 1.0.0
-    */
-    std::size_t operator()(const nlohmann::json& j) const
+    std::size_t operator()(const nlohmann::NLOHMANN_BASIC_JSON_TPL& j) const
     {
         return nlohmann::detail::hash(j);
     }
 };
 
-/// specialization for std::less<value_t>
-/// @note: do not remove the space after '<',
-///        see https://github.com/nlohmann/json/pull/679
+// specialization for std::less<value_t>
 template<>
-struct less<::nlohmann::detail::value_t>
+struct less< ::nlohmann::detail::value_t> // do not remove the space after '<', see https://github.com/nlohmann/json/pull/679
 {
     /*!
     @brief compare two value_t enum values
     @since version 3.0.0
     */
-    bool operator()(nlohmann::detail::value_t lhs,
-                    nlohmann::detail::value_t rhs) const noexcept
+    bool operator()(::nlohmann::detail::value_t lhs,
+                    ::nlohmann::detail::value_t rhs) const noexcept
     {
-        return nlohmann::detail::operator<(lhs, rhs);
+#if JSON_HAS_THREE_WAY_COMPARISON
+        return std::is_lt(lhs <=> rhs); // *NOPAD*
+#else
+        return ::nlohmann::detail::operator<(lhs, rhs);
+#endif
     }
 };
 
 // C++20 prohibit function specialization in the std namespace.
 #ifndef JSON_HAS_CPP_20
 
-/*!
-@brief exchanges the values of two JSON objects
-
-@since version 1.0.0
-*/
-template<>
-inline void swap<nlohmann::json>(nlohmann::json& j1, nlohmann::json& j2) noexcept(
-    is_nothrow_move_constructible<nlohmann::json>::value&&
-    is_nothrow_move_assignable<nlohmann::json>::value
-)
+/// @brief exchanges the values of two JSON objects
+/// @sa https://json.nlohmann.me/api/basic_json/std_swap/
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+inline void swap(nlohmann::NLOHMANN_BASIC_JSON_TPL& j1, nlohmann::NLOHMANN_BASIC_JSON_TPL& j2) noexcept(  // NOLINT(readability-inconsistent-declaration-parameter-name, cert-dcl58-cpp)
+    is_nothrow_move_constructible<nlohmann::NLOHMANN_BASIC_JSON_TPL>::value&&                          // NOLINT(misc-redundant-expression,cppcoreguidelines-noexcept-swap,performance-noexcept-swap)
+    is_nothrow_move_assignable<nlohmann::NLOHMANN_BASIC_JSON_TPL>::value)
 {
     j1.swap(j2);
 }
 
 #endif
 
-} // namespace std
-
-/*!
-@brief user-defined string literal for JSON values
-
-This operator implements a user-defined string literal for JSON objects. It
-can be used by adding `"_json"` to a string literal and returns a JSON object
-if no parse error occurred.
-
-@param[in] s  a string representation of a JSON object
-@param[in] n  the length of string @a s
-@return a JSON object
-
-@since version 1.0.0
-*/
-JSON_HEDLEY_NON_NULL(1)
-inline nlohmann::json operator "" _json(const char* s, std::size_t n)
-{
-    return nlohmann::json::parse(s, s + n);
-}
-
-/*!
-@brief user-defined string literal for JSON pointer
+}  // namespace std
 
-This operator implements a user-defined string literal for JSON Pointers. It
-can be used by adding `"_json_pointer"` to a string literal and returns a JSON pointer
-object if no parse error occurred.
-
-@param[in] s  a string representation of a JSON Pointer
-@param[in] n  the length of string @a s
-@return a JSON pointer object
-
-@since version 2.0.0
-*/
-JSON_HEDLEY_NON_NULL(1)
-inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std::size_t n)
-{
-    return nlohmann::json::json_pointer(std::string(s, n));
-}
+#if JSON_USE_GLOBAL_UDLS
+    #if !defined(JSON_HEDLEY_GCC_VERSION) || JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0)
+        using nlohmann::literals::json_literals::operator ""_json; // NOLINT(misc-unused-using-decls,google-global-names-in-headers)
+        using nlohmann::literals::json_literals::operator ""_json_pointer; //NOLINT(misc-unused-using-decls,google-global-names-in-headers)
+    #else
+        using nlohmann::literals::json_literals::operator "" _json; // NOLINT(misc-unused-using-decls,google-global-names-in-headers)
+        using nlohmann::literals::json_literals::operator "" _json_pointer; //NOLINT(misc-unused-using-decls,google-global-names-in-headers)
+    #endif
+#endif
 
 #include <nlohmann/detail/macro_unscope.hpp>
 
diff --git a/external_imported/json/include/nlohmann/json_fwd.hpp b/external_imported/json/include/nlohmann/json_fwd.hpp
index 332227c1b..32bde590f 100644
--- a/external_imported/json/include/nlohmann/json_fwd.hpp
+++ b/external_imported/json/include/nlohmann/json_fwd.hpp
@@ -1,3 +1,11 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 #ifndef INCLUDE_NLOHMANN_JSON_FWD_HPP_
 #define INCLUDE_NLOHMANN_JSON_FWD_HPP_
 
@@ -7,13 +15,15 @@
 #include <string> // string
 #include <vector> // vector
 
+#include <nlohmann/detail/abi_macros.hpp>
+
 /*!
 @brief namespace for Niels Lohmann
 @see https://github.com/nlohmann
 @since version 1.0.0
 */
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
+
 /*!
 @brief default JSONSerializer template argument
 
@@ -24,6 +34,8 @@ for serialization.
 template<typename T = void, typename SFINAE = void>
 struct adl_serializer;
 
+/// a class to store JSON values
+/// @sa https://json.nlohmann.me/api/basic_json/
 template<template<typename U, typename V, typename... Args> class ObjectType =
          std::map,
          template<typename U, typename... Args> class ArrayType = std::vector,
@@ -34,45 +46,30 @@ template<template<typename U, typename V, typename... Args> class ObjectType =
          template<typename U> class AllocatorType = std::allocator,
          template<typename T, typename SFINAE = void> class JSONSerializer =
          adl_serializer,
-         class BinaryType = std::vector<std::uint8_t>>
+         class BinaryType = std::vector<std::uint8_t>, // cppcheck-suppress syntaxError
+         class CustomBaseClass = void>
 class basic_json;
 
-/*!
-@brief JSON Pointer
-
-A JSON pointer defines a string syntax for identifying a specific value
-within a JSON document. It can be used with functions `at` and
-`operator[]`. Furthermore, JSON pointers are the base for JSON patches.
-
-@sa [RFC 6901](https://tools.ietf.org/html/rfc6901)
-
-@since version 2.0.0
-*/
-template<typename BasicJsonType>
+/// @brief JSON Pointer defines a string syntax for identifying a specific value within a JSON document
+/// @sa https://json.nlohmann.me/api/json_pointer/
+template<typename RefStringType>
 class json_pointer;
 
 /*!
-@brief default JSON class
-
-This type is the default specialization of the @ref basic_json class which
-uses the standard template types.
-
-@since version 1.0.0
+@brief default specialization
+@sa https://json.nlohmann.me/api/json/
 */
 using json = basic_json<>;
 
+/// @brief a minimal map-like container that preserves insertion order
+/// @sa https://json.nlohmann.me/api/ordered_map/
 template<class Key, class T, class IgnoredLess, class Allocator>
 struct ordered_map;
 
-/*!
-@brief ordered JSON class
-
-This type preserves the insertion order of object keys.
-
-@since version 3.9.0
-*/
+/// @brief specialization that maintains the insertion order of object keys
+/// @sa https://json.nlohmann.me/api/ordered_json/
 using ordered_json = basic_json<nlohmann::ordered_map>;
 
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
 
 #endif  // INCLUDE_NLOHMANN_JSON_FWD_HPP_
diff --git a/external_imported/json/include/nlohmann/ordered_map.hpp b/external_imported/json/include/nlohmann/ordered_map.hpp
index 330677c4d..39e4a50a1 100644
--- a/external_imported/json/include/nlohmann/ordered_map.hpp
+++ b/external_imported/json/include/nlohmann/ordered_map.hpp
@@ -1,14 +1,26 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 #pragma once
 
-#include <functional> // less
+#include <functional> // equal_to, less
+#include <initializer_list> // initializer_list
+#include <iterator> // input_iterator_tag, iterator_traits
 #include <memory> // allocator
+#include <stdexcept> // for out_of_range
+#include <type_traits> // enable_if, is_convertible
 #include <utility> // pair
 #include <vector> // vector
 
 #include <nlohmann/detail/macro_scope.hpp>
+#include <nlohmann/detail/meta/type_traits.hpp>
 
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 
 /// ordered_map: a minimal map-like container that preserves insertion order
 /// for use within nlohmann::basic_json<ordered_map>
@@ -19,48 +31,98 @@ template <class Key, class T, class IgnoredLess = std::less<Key>,
     using key_type = Key;
     using mapped_type = T;
     using Container = std::vector<std::pair<const Key, T>, Allocator>;
-    using typename Container::iterator;
-    using typename Container::const_iterator;
-    using typename Container::size_type;
-    using typename Container::value_type;
+    using iterator = typename Container::iterator;
+    using const_iterator = typename Container::const_iterator;
+    using size_type = typename Container::size_type;
+    using value_type = typename Container::value_type;
+#ifdef JSON_HAS_CPP_14
+    using key_compare = std::equal_to<>;
+#else
+    using key_compare = std::equal_to<Key>;
+#endif
 
     // Explicit constructors instead of `using Container::Container`
     // otherwise older compilers choke on it (GCC <= 5.5, xcode <= 9.4)
-    ordered_map(const Allocator& alloc = Allocator()) : Container{alloc} {}
+    ordered_map() noexcept(noexcept(Container())) : Container{} {}
+    explicit ordered_map(const Allocator& alloc) noexcept(noexcept(Container(alloc))) : Container{alloc} {}
     template <class It>
     ordered_map(It first, It last, const Allocator& alloc = Allocator())
         : Container{first, last, alloc} {}
-    ordered_map(std::initializer_list<T> init, const Allocator& alloc = Allocator() )
+    ordered_map(std::initializer_list<value_type> init, const Allocator& alloc = Allocator() )
         : Container{init, alloc} {}
 
     std::pair<iterator, bool> emplace(const key_type& key, T&& t)
     {
         for (auto it = this->begin(); it != this->end(); ++it)
         {
-            if (it->first == key)
+            if (m_compare(it->first, key))
             {
                 return {it, false};
             }
         }
-        Container::emplace_back(key, t);
-        return {--this->end(), true};
+        Container::emplace_back(key, std::forward<T>(t));
+        return {std::prev(this->end()), true};
+    }
+
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    std::pair<iterator, bool> emplace(KeyType && key, T && t)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return {it, false};
+            }
+        }
+        Container::emplace_back(std::forward<KeyType>(key), std::forward<T>(t));
+        return {std::prev(this->end()), true};
     }
 
-    T& operator[](const Key& key)
+    T& operator[](const key_type& key)
     {
         return emplace(key, T{}).first->second;
     }
 
-    const T& operator[](const Key& key) const
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    T & operator[](KeyType && key)
+    {
+        return emplace(std::forward<KeyType>(key), T{}).first->second;
+    }
+
+    const T& operator[](const key_type& key) const
     {
         return at(key);
     }
 
-    T& at(const Key& key)
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    const T & operator[](KeyType && key) const
+    {
+        return at(std::forward<KeyType>(key));
+    }
+
+    T& at(const key_type& key)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return it->second;
+            }
+        }
+
+        JSON_THROW(std::out_of_range("key not found"));
+    }
+
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    T & at(KeyType && key) // NOLINT(cppcoreguidelines-missing-std-forward)
     {
         for (auto it = this->begin(); it != this->end(); ++it)
         {
-            if (it->first == key)
+            if (m_compare(it->first, key))
             {
                 return it->second;
             }
@@ -69,11 +131,11 @@ template <class Key, class T, class IgnoredLess = std::less<Key>,
         JSON_THROW(std::out_of_range("key not found"));
     }
 
-    const T& at(const Key& key) const
+    const T& at(const key_type& key) const
     {
         for (auto it = this->begin(); it != this->end(); ++it)
         {
-            if (it->first == key)
+            if (m_compare(it->first, key))
             {
                 return it->second;
             }
@@ -82,11 +144,47 @@ template <class Key, class T, class IgnoredLess = std::less<Key>,
         JSON_THROW(std::out_of_range("key not found"));
     }
 
-    size_type erase(const Key& key)
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    const T & at(KeyType && key) const // NOLINT(cppcoreguidelines-missing-std-forward)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return it->second;
+            }
+        }
+
+        JSON_THROW(std::out_of_range("key not found"));
+    }
+
+    size_type erase(const key_type& key)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                // Since we cannot move const Keys, re-construct them in place
+                for (auto next = it; ++next != this->end(); ++it)
+                {
+                    it->~value_type(); // Destroy but keep allocation
+                    new (&*it) value_type{std::move(*next)};
+                }
+                Container::pop_back();
+                return 1;
+            }
+        }
+        return 0;
+    }
+
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    size_type erase(KeyType && key) // NOLINT(cppcoreguidelines-missing-std-forward)
     {
         for (auto it = this->begin(); it != this->end(); ++it)
         {
-            if (it->first == key)
+            if (m_compare(it->first, key))
             {
                 // Since we cannot move const Keys, re-construct them in place
                 for (auto next = it; ++next != this->end(); ++it)
@@ -103,23 +201,81 @@ template <class Key, class T, class IgnoredLess = std::less<Key>,
 
     iterator erase(iterator pos)
     {
-        auto it = pos;
+        return erase(pos, std::next(pos));
+    }
+
+    iterator erase(iterator first, iterator last)
+    {
+        if (first == last)
+        {
+            return first;
+        }
+
+        const auto elements_affected = std::distance(first, last);
+        const auto offset = std::distance(Container::begin(), first);
+
+        // This is the start situation. We need to delete elements_affected
+        // elements (3 in this example: e, f, g), and need to return an
+        // iterator past the last deleted element (h in this example).
+        // Note that offset is the distance from the start of the vector
+        // to first. We will need this later.
+
+        // [ a, b, c, d, e, f, g, h, i, j ]
+        //               ^        ^
+        //             first    last
+
+        // Since we cannot move const Keys, we re-construct them in place.
+        // We start at first and re-construct (viz. copy) the elements from
+        // the back of the vector. Example for first iteration:
+
+        //               ,--------.
+        //               v        |   destroy e and re-construct with h
+        // [ a, b, c, d, e, f, g, h, i, j ]
+        //               ^        ^
+        //               it       it + elements_affected
+
+        for (auto it = first; std::next(it, elements_affected) != Container::end(); ++it)
+        {
+            it->~value_type(); // destroy but keep allocation
+            new (&*it) value_type{std::move(*std::next(it, elements_affected))}; // "move" next element to it
+        }
+
+        // [ a, b, c, d, h, i, j, h, i, j ]
+        //               ^        ^
+        //             first    last
+
+        // remove the unneeded elements at the end of the vector
+        Container::resize(this->size() - static_cast<size_type>(elements_affected));
+
+        // [ a, b, c, d, h, i, j ]
+        //               ^        ^
+        //             first    last
+
+        // first is now pointing past the last deleted element, but we cannot
+        // use this iterator, because it may have been invalidated by the
+        // resize call. Instead, we can return begin() + offset.
+        return Container::begin() + offset;
+    }
 
-        // Since we cannot move const Keys, re-construct them in place
-        for (auto next = it; ++next != this->end(); ++it)
+    size_type count(const key_type& key) const
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
         {
-            it->~value_type(); // Destroy but keep allocation
-            new (&*it) value_type{std::move(*next)};
+            if (m_compare(it->first, key))
+            {
+                return 1;
+            }
         }
-        Container::pop_back();
-        return pos;
+        return 0;
     }
 
-    size_type count(const Key& key) const
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    size_type count(KeyType && key) const // NOLINT(cppcoreguidelines-missing-std-forward)
     {
         for (auto it = this->begin(); it != this->end(); ++it)
         {
-            if (it->first == key)
+            if (m_compare(it->first, key))
             {
                 return 1;
             }
@@ -127,11 +283,11 @@ template <class Key, class T, class IgnoredLess = std::less<Key>,
         return 0;
     }
 
-    iterator find(const Key& key)
+    iterator find(const key_type& key)
     {
         for (auto it = this->begin(); it != this->end(); ++it)
         {
-            if (it->first == key)
+            if (m_compare(it->first, key))
             {
                 return it;
             }
@@ -139,11 +295,25 @@ template <class Key, class T, class IgnoredLess = std::less<Key>,
         return Container::end();
     }
 
-    const_iterator find(const Key& key) const
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    iterator find(KeyType && key) // NOLINT(cppcoreguidelines-missing-std-forward)
     {
         for (auto it = this->begin(); it != this->end(); ++it)
         {
-            if (it->first == key)
+            if (m_compare(it->first, key))
+            {
+                return it;
+            }
+        }
+        return Container::end();
+    }
+
+    const_iterator find(const key_type& key) const
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
             {
                 return it;
             }
@@ -160,7 +330,7 @@ template <class Key, class T, class IgnoredLess = std::less<Key>,
     {
         for (auto it = this->begin(); it != this->end(); ++it)
         {
-            if (it->first == value.first)
+            if (m_compare(it->first, value.first))
             {
                 return {it, false};
             }
@@ -181,6 +351,9 @@ template <class Key, class T, class IgnoredLess = std::less<Key>,
             insert(*it);
         }
     }
+
+private:
+    JSON_NO_UNIQUE_ADDRESS key_compare m_compare = key_compare();
 };
 
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
diff --git a/external_imported/json/include/nlohmann/thirdparty/hedley/hedley.hpp b/external_imported/json/include/nlohmann/thirdparty/hedley/hedley.hpp
index 36f9fe81a..a1dc64f60 100644
--- a/external_imported/json/include/nlohmann/thirdparty/hedley/hedley.hpp
+++ b/external_imported/json/include/nlohmann/thirdparty/hedley/hedley.hpp
@@ -1,13 +1,16 @@
+#pragma once
+
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-FileCopyrightText: 2016-2021 Evan Nemerson <evan@nemerson.com>
+// SPDX-License-Identifier: MIT
+
 /* Hedley - https://nemequ.github.io/hedley
  * Created by Evan Nemerson <evan@nemerson.com>
- *
- * To the extent possible under law, the author(s) have dedicated all
- * copyright and related and neighboring rights to this software to
- * the public domain worldwide. This software is distributed without
- * any warranty.
- *
- * For details, see <http://creativecommons.org/publicdomain/zero/1.0/>.
- * SPDX-License-Identifier: CC0-1.0
  */
 
 #if !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < 15)
diff --git a/external_imported/json/include/nlohmann/thirdparty/hedley/hedley_undef.hpp b/external_imported/json/include/nlohmann/thirdparty/hedley/hedley_undef.hpp
index e74f4dfbf..c0aee2bb3 100644
--- a/external_imported/json/include/nlohmann/thirdparty/hedley/hedley_undef.hpp
+++ b/external_imported/json/include/nlohmann/thirdparty/hedley/hedley_undef.hpp
@@ -1,3 +1,13 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#pragma once
+
 #undef JSON_HEDLEY_ALWAYS_INLINE
 #undef JSON_HEDLEY_ARM_VERSION
 #undef JSON_HEDLEY_ARM_VERSION_CHECK
diff --git a/external_imported/json/meson.build b/external_imported/json/meson.build
index c7b2cb417..7a9c5ec85 100644
--- a/external_imported/json/meson.build
+++ b/external_imported/json/meson.build
@@ -1,6 +1,6 @@
 project('nlohmann_json',
     'cpp',
-    version : '3.9.1',
+    version : '3.11.3',
     license : 'MIT',
 )
 
@@ -14,6 +14,7 @@ nlohmann_json_multiple_headers = declare_dependency(
 
 if not meson.is_subproject()
 install_headers('single_include/nlohmann/json.hpp', subdir: 'nlohmann')
+install_headers('single_include/nlohmann/json_fwd.hpp', subdir: 'nlohmann')
 
 pkgc = import('pkgconfig')
 pkgc.generate(name: 'nlohmann_json',
diff --git a/external_imported/json/nlohmann_json.natvis b/external_imported/json/nlohmann_json.natvis
index 557717663..a831ea04b 100644
--- a/external_imported/json/nlohmann_json.natvis
+++ b/external_imported/json/nlohmann_json.natvis
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!-- * * * * * * * * AUTO-GENERATED FILE  * * * * * * * * -->
+<!-- Edit ./tools/generate_natvis/nlohmann_json.natvis.j2 -->
+<!-- * * * * * * * * AUTO-GENERATED FILE  * * * * * * * * -->
+
 <AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
+    <!-- Namespace nlohmann -->
     <Type Name="nlohmann::basic_json&lt;*&gt;">
         <DisplayString Condition="m_type == nlohmann::detail::value_t::null">null</DisplayString>
         <DisplayString Condition="m_type == nlohmann::detail::value_t::object">{*(m_value.object)}</DisplayString>
@@ -20,8 +26,8 @@
         </Expand>
     </Type>
 
-    <!--    skip the pair first/second members in the treeview while traversing a map.
-            Only works in VS 2015 Update 2 and beyond using the new visualization -->
+    <!-- Skip the pair first/second members in the treeview while traversing a map.
+         Only works in VS 2015 Update 2 and beyond using the new visualization -->
     <Type Name="std::pair&lt;*, nlohmann::basic_json&lt;*&gt;&gt;" IncludeView="MapHelper">
         <DisplayString>{second}</DisplayString>
         <Expand>
@@ -29,4 +35,244 @@
         </Expand>
     </Type>
 
+    <!-- Namespace nlohmann::json_abi -->
+    <Type Name="nlohmann::json_abi::basic_json&lt;*&gt;">
+        <DisplayString Condition="m_type == nlohmann::json_abi::detail::value_t::null">null</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi::detail::value_t::object">{*(m_value.object)}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi::detail::value_t::array">{*(m_value.array)}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi::detail::value_t::string">{*(m_value.string)}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi::detail::value_t::boolean">{m_value.boolean}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi::detail::value_t::number_integer">{m_value.number_integer}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi::detail::value_t::number_unsigned">{m_value.number_unsigned}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi::detail::value_t::number_float">{m_value.number_float}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi::detail::value_t::discarded">discarded</DisplayString>
+        <Expand>
+            <ExpandedItem Condition="m_type == nlohmann::json_abi::detail::value_t::object">
+                *(m_value.object),view(simple)
+            </ExpandedItem>
+            <ExpandedItem Condition="m_type == nlohmann::json_abi::detail::value_t::array">
+                *(m_value.array),view(simple)
+            </ExpandedItem>
+        </Expand>
+    </Type>
+
+    <!-- Skip the pair first/second members in the treeview while traversing a map.
+         Only works in VS 2015 Update 2 and beyond using the new visualization -->
+    <Type Name="std::pair&lt;*, nlohmann::json_abi::basic_json&lt;*&gt;&gt;" IncludeView="MapHelper">
+        <DisplayString>{second}</DisplayString>
+        <Expand>
+            <ExpandedItem>second</ExpandedItem>
+        </Expand>
+    </Type>
+
+    <!-- Namespace nlohmann::json_abi_v3_11_2 -->
+    <Type Name="nlohmann::json_abi_v3_11_2::basic_json&lt;*&gt;">
+        <DisplayString Condition="m_type == nlohmann::json_abi_v3_11_2::detail::value_t::null">null</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_v3_11_2::detail::value_t::object">{*(m_value.object)}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_v3_11_2::detail::value_t::array">{*(m_value.array)}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_v3_11_2::detail::value_t::string">{*(m_value.string)}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_v3_11_2::detail::value_t::boolean">{m_value.boolean}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_v3_11_2::detail::value_t::number_integer">{m_value.number_integer}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_v3_11_2::detail::value_t::number_unsigned">{m_value.number_unsigned}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_v3_11_2::detail::value_t::number_float">{m_value.number_float}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_v3_11_2::detail::value_t::discarded">discarded</DisplayString>
+        <Expand>
+            <ExpandedItem Condition="m_type == nlohmann::json_abi_v3_11_2::detail::value_t::object">
+                *(m_value.object),view(simple)
+            </ExpandedItem>
+            <ExpandedItem Condition="m_type == nlohmann::json_abi_v3_11_2::detail::value_t::array">
+                *(m_value.array),view(simple)
+            </ExpandedItem>
+        </Expand>
+    </Type>
+
+    <!-- Skip the pair first/second members in the treeview while traversing a map.
+         Only works in VS 2015 Update 2 and beyond using the new visualization -->
+    <Type Name="std::pair&lt;*, nlohmann::json_abi_v3_11_2::basic_json&lt;*&gt;&gt;" IncludeView="MapHelper">
+        <DisplayString>{second}</DisplayString>
+        <Expand>
+            <ExpandedItem>second</ExpandedItem>
+        </Expand>
+    </Type>
+
+    <!-- Namespace nlohmann::json_abi_diag -->
+    <Type Name="nlohmann::json_abi_diag::basic_json&lt;*&gt;">
+        <DisplayString Condition="m_type == nlohmann::json_abi_diag::detail::value_t::null">null</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_diag::detail::value_t::object">{*(m_value.object)}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_diag::detail::value_t::array">{*(m_value.array)}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_diag::detail::value_t::string">{*(m_value.string)}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_diag::detail::value_t::boolean">{m_value.boolean}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_diag::detail::value_t::number_integer">{m_value.number_integer}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_diag::detail::value_t::number_unsigned">{m_value.number_unsigned}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_diag::detail::value_t::number_float">{m_value.number_float}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_diag::detail::value_t::discarded">discarded</DisplayString>
+        <Expand>
+            <ExpandedItem Condition="m_type == nlohmann::json_abi_diag::detail::value_t::object">
+                *(m_value.object),view(simple)
+            </ExpandedItem>
+            <ExpandedItem Condition="m_type == nlohmann::json_abi_diag::detail::value_t::array">
+                *(m_value.array),view(simple)
+            </ExpandedItem>
+        </Expand>
+    </Type>
+
+    <!-- Skip the pair first/second members in the treeview while traversing a map.
+         Only works in VS 2015 Update 2 and beyond using the new visualization -->
+    <Type Name="std::pair&lt;*, nlohmann::json_abi_diag::basic_json&lt;*&gt;&gt;" IncludeView="MapHelper">
+        <DisplayString>{second}</DisplayString>
+        <Expand>
+            <ExpandedItem>second</ExpandedItem>
+        </Expand>
+    </Type>
+
+    <!-- Namespace nlohmann::json_abi_diag_v3_11_2 -->
+    <Type Name="nlohmann::json_abi_diag_v3_11_2::basic_json&lt;*&gt;">
+        <DisplayString Condition="m_type == nlohmann::json_abi_diag_v3_11_2::detail::value_t::null">null</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_diag_v3_11_2::detail::value_t::object">{*(m_value.object)}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_diag_v3_11_2::detail::value_t::array">{*(m_value.array)}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_diag_v3_11_2::detail::value_t::string">{*(m_value.string)}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_diag_v3_11_2::detail::value_t::boolean">{m_value.boolean}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_diag_v3_11_2::detail::value_t::number_integer">{m_value.number_integer}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_diag_v3_11_2::detail::value_t::number_unsigned">{m_value.number_unsigned}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_diag_v3_11_2::detail::value_t::number_float">{m_value.number_float}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_diag_v3_11_2::detail::value_t::discarded">discarded</DisplayString>
+        <Expand>
+            <ExpandedItem Condition="m_type == nlohmann::json_abi_diag_v3_11_2::detail::value_t::object">
+                *(m_value.object),view(simple)
+            </ExpandedItem>
+            <ExpandedItem Condition="m_type == nlohmann::json_abi_diag_v3_11_2::detail::value_t::array">
+                *(m_value.array),view(simple)
+            </ExpandedItem>
+        </Expand>
+    </Type>
+
+    <!-- Skip the pair first/second members in the treeview while traversing a map.
+         Only works in VS 2015 Update 2 and beyond using the new visualization -->
+    <Type Name="std::pair&lt;*, nlohmann::json_abi_diag_v3_11_2::basic_json&lt;*&gt;&gt;" IncludeView="MapHelper">
+        <DisplayString>{second}</DisplayString>
+        <Expand>
+            <ExpandedItem>second</ExpandedItem>
+        </Expand>
+    </Type>
+
+    <!-- Namespace nlohmann::json_abi_ldvcmp -->
+    <Type Name="nlohmann::json_abi_ldvcmp::basic_json&lt;*&gt;">
+        <DisplayString Condition="m_type == nlohmann::json_abi_ldvcmp::detail::value_t::null">null</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_ldvcmp::detail::value_t::object">{*(m_value.object)}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_ldvcmp::detail::value_t::array">{*(m_value.array)}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_ldvcmp::detail::value_t::string">{*(m_value.string)}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_ldvcmp::detail::value_t::boolean">{m_value.boolean}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_ldvcmp::detail::value_t::number_integer">{m_value.number_integer}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_ldvcmp::detail::value_t::number_unsigned">{m_value.number_unsigned}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_ldvcmp::detail::value_t::number_float">{m_value.number_float}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_ldvcmp::detail::value_t::discarded">discarded</DisplayString>
+        <Expand>
+            <ExpandedItem Condition="m_type == nlohmann::json_abi_ldvcmp::detail::value_t::object">
+                *(m_value.object),view(simple)
+            </ExpandedItem>
+            <ExpandedItem Condition="m_type == nlohmann::json_abi_ldvcmp::detail::value_t::array">
+                *(m_value.array),view(simple)
+            </ExpandedItem>
+        </Expand>
+    </Type>
+
+    <!-- Skip the pair first/second members in the treeview while traversing a map.
+         Only works in VS 2015 Update 2 and beyond using the new visualization -->
+    <Type Name="std::pair&lt;*, nlohmann::json_abi_ldvcmp::basic_json&lt;*&gt;&gt;" IncludeView="MapHelper">
+        <DisplayString>{second}</DisplayString>
+        <Expand>
+            <ExpandedItem>second</ExpandedItem>
+        </Expand>
+    </Type>
+
+    <!-- Namespace nlohmann::json_abi_ldvcmp_v3_11_2 -->
+    <Type Name="nlohmann::json_abi_ldvcmp_v3_11_2::basic_json&lt;*&gt;">
+        <DisplayString Condition="m_type == nlohmann::json_abi_ldvcmp_v3_11_2::detail::value_t::null">null</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_ldvcmp_v3_11_2::detail::value_t::object">{*(m_value.object)}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_ldvcmp_v3_11_2::detail::value_t::array">{*(m_value.array)}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_ldvcmp_v3_11_2::detail::value_t::string">{*(m_value.string)}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_ldvcmp_v3_11_2::detail::value_t::boolean">{m_value.boolean}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_ldvcmp_v3_11_2::detail::value_t::number_integer">{m_value.number_integer}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_ldvcmp_v3_11_2::detail::value_t::number_unsigned">{m_value.number_unsigned}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_ldvcmp_v3_11_2::detail::value_t::number_float">{m_value.number_float}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_ldvcmp_v3_11_2::detail::value_t::discarded">discarded</DisplayString>
+        <Expand>
+            <ExpandedItem Condition="m_type == nlohmann::json_abi_ldvcmp_v3_11_2::detail::value_t::object">
+                *(m_value.object),view(simple)
+            </ExpandedItem>
+            <ExpandedItem Condition="m_type == nlohmann::json_abi_ldvcmp_v3_11_2::detail::value_t::array">
+                *(m_value.array),view(simple)
+            </ExpandedItem>
+        </Expand>
+    </Type>
+
+    <!-- Skip the pair first/second members in the treeview while traversing a map.
+         Only works in VS 2015 Update 2 and beyond using the new visualization -->
+    <Type Name="std::pair&lt;*, nlohmann::json_abi_ldvcmp_v3_11_2::basic_json&lt;*&gt;&gt;" IncludeView="MapHelper">
+        <DisplayString>{second}</DisplayString>
+        <Expand>
+            <ExpandedItem>second</ExpandedItem>
+        </Expand>
+    </Type>
+
+    <!-- Namespace nlohmann::json_abi_diag_ldvcmp -->
+    <Type Name="nlohmann::json_abi_diag_ldvcmp::basic_json&lt;*&gt;">
+        <DisplayString Condition="m_type == nlohmann::json_abi_diag_ldvcmp::detail::value_t::null">null</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_diag_ldvcmp::detail::value_t::object">{*(m_value.object)}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_diag_ldvcmp::detail::value_t::array">{*(m_value.array)}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_diag_ldvcmp::detail::value_t::string">{*(m_value.string)}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_diag_ldvcmp::detail::value_t::boolean">{m_value.boolean}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_diag_ldvcmp::detail::value_t::number_integer">{m_value.number_integer}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_diag_ldvcmp::detail::value_t::number_unsigned">{m_value.number_unsigned}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_diag_ldvcmp::detail::value_t::number_float">{m_value.number_float}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_diag_ldvcmp::detail::value_t::discarded">discarded</DisplayString>
+        <Expand>
+            <ExpandedItem Condition="m_type == nlohmann::json_abi_diag_ldvcmp::detail::value_t::object">
+                *(m_value.object),view(simple)
+            </ExpandedItem>
+            <ExpandedItem Condition="m_type == nlohmann::json_abi_diag_ldvcmp::detail::value_t::array">
+                *(m_value.array),view(simple)
+            </ExpandedItem>
+        </Expand>
+    </Type>
+
+    <!-- Skip the pair first/second members in the treeview while traversing a map.
+         Only works in VS 2015 Update 2 and beyond using the new visualization -->
+    <Type Name="std::pair&lt;*, nlohmann::json_abi_diag_ldvcmp::basic_json&lt;*&gt;&gt;" IncludeView="MapHelper">
+        <DisplayString>{second}</DisplayString>
+        <Expand>
+            <ExpandedItem>second</ExpandedItem>
+        </Expand>
+    </Type>
+
+    <!-- Namespace nlohmann::json_abi_diag_ldvcmp_v3_11_2 -->
+    <Type Name="nlohmann::json_abi_diag_ldvcmp_v3_11_2::basic_json&lt;*&gt;">
+        <DisplayString Condition="m_type == nlohmann::json_abi_diag_ldvcmp_v3_11_2::detail::value_t::null">null</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_diag_ldvcmp_v3_11_2::detail::value_t::object">{*(m_value.object)}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_diag_ldvcmp_v3_11_2::detail::value_t::array">{*(m_value.array)}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_diag_ldvcmp_v3_11_2::detail::value_t::string">{*(m_value.string)}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_diag_ldvcmp_v3_11_2::detail::value_t::boolean">{m_value.boolean}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_diag_ldvcmp_v3_11_2::detail::value_t::number_integer">{m_value.number_integer}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_diag_ldvcmp_v3_11_2::detail::value_t::number_unsigned">{m_value.number_unsigned}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_diag_ldvcmp_v3_11_2::detail::value_t::number_float">{m_value.number_float}</DisplayString>
+        <DisplayString Condition="m_type == nlohmann::json_abi_diag_ldvcmp_v3_11_2::detail::value_t::discarded">discarded</DisplayString>
+        <Expand>
+            <ExpandedItem Condition="m_type == nlohmann::json_abi_diag_ldvcmp_v3_11_2::detail::value_t::object">
+                *(m_value.object),view(simple)
+            </ExpandedItem>
+            <ExpandedItem Condition="m_type == nlohmann::json_abi_diag_ldvcmp_v3_11_2::detail::value_t::array">
+                *(m_value.array),view(simple)
+            </ExpandedItem>
+        </Expand>
+    </Type>
+
+    <!-- Skip the pair first/second members in the treeview while traversing a map.
+         Only works in VS 2015 Update 2 and beyond using the new visualization -->
+    <Type Name="std::pair&lt;*, nlohmann::json_abi_diag_ldvcmp_v3_11_2::basic_json&lt;*&gt;&gt;" IncludeView="MapHelper">
+        <DisplayString>{second}</DisplayString>
+        <Expand>
+            <ExpandedItem>second</ExpandedItem>
+        </Expand>
+    </Type>
+
 </AutoVisualizer>
diff --git a/external_imported/json/single_include/nlohmann/json.hpp b/external_imported/json/single_include/nlohmann/json.hpp
index a83971da2..8b72ea653 100644
--- a/external_imported/json/single_include/nlohmann/json.hpp
+++ b/external_imported/json/single_include/nlohmann/json.hpp
@@ -1,57 +1,160 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+/****************************************************************************\
+ * Note on documentation: The source files contain links to the online      *
+ * documentation of the public API at https://json.nlohmann.me. This URL    *
+ * contains the most recent documentation and should also be applicable to  *
+ * previous versions; documentation for deprecated functions is not         *
+ * removed, but marked deprecated. See "Generate documentation" section in  *
+ * file docs/README.md.                                                     *
+\****************************************************************************/
 
 #ifndef INCLUDE_NLOHMANN_JSON_HPP_
 #define INCLUDE_NLOHMANN_JSON_HPP_
 
-#define NLOHMANN_JSON_VERSION_MAJOR 3
-#define NLOHMANN_JSON_VERSION_MINOR 9
-#define NLOHMANN_JSON_VERSION_PATCH 1
-
 #include <algorithm> // all_of, find, for_each
 #include <cstddef> // nullptr_t, ptrdiff_t, size_t
 #include <functional> // hash, less
 #include <initializer_list> // initializer_list
-#include <iosfwd> // istream, ostream
+#ifndef JSON_NO_IO
+    #include <iosfwd> // istream, ostream
+#endif  // JSON_NO_IO
 #include <iterator> // random_access_iterator_tag
 #include <memory> // unique_ptr
-#include <numeric> // accumulate
 #include <string> // string, stoi, to_string
 #include <utility> // declval, forward, move, pair, swap
 #include <vector> // vector
 
 // #include <nlohmann/adl_serializer.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 
 
 #include <utility>
 
+// #include <nlohmann/detail/abi_macros.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// This file contains all macro definitions affecting or depending on the ABI
+
+#ifndef JSON_SKIP_LIBRARY_VERSION_CHECK
+    #if defined(NLOHMANN_JSON_VERSION_MAJOR) && defined(NLOHMANN_JSON_VERSION_MINOR) && defined(NLOHMANN_JSON_VERSION_PATCH)
+        #if NLOHMANN_JSON_VERSION_MAJOR != 3 || NLOHMANN_JSON_VERSION_MINOR != 11 || NLOHMANN_JSON_VERSION_PATCH != 3
+            #warning "Already included a different version of the library!"
+        #endif
+    #endif
+#endif
+
+#define NLOHMANN_JSON_VERSION_MAJOR 3   // NOLINT(modernize-macro-to-enum)
+#define NLOHMANN_JSON_VERSION_MINOR 11  // NOLINT(modernize-macro-to-enum)
+#define NLOHMANN_JSON_VERSION_PATCH 3   // NOLINT(modernize-macro-to-enum)
+
+#ifndef JSON_DIAGNOSTICS
+    #define JSON_DIAGNOSTICS 0
+#endif
+
+#ifndef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+    #define JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON 0
+#endif
+
+#if JSON_DIAGNOSTICS
+    #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS _diag
+#else
+    #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS
+#endif
+
+#if JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+    #define NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON _ldvcmp
+#else
+    #define NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON
+#endif
+
+#ifndef NLOHMANN_JSON_NAMESPACE_NO_VERSION
+    #define NLOHMANN_JSON_NAMESPACE_NO_VERSION 0
+#endif
+
+// Construct the namespace ABI tags component
+#define NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b) json_abi ## a ## b
+#define NLOHMANN_JSON_ABI_TAGS_CONCAT(a, b) \
+    NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b)
+
+#define NLOHMANN_JSON_ABI_TAGS                                       \
+    NLOHMANN_JSON_ABI_TAGS_CONCAT(                                   \
+            NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS,                       \
+            NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON)
+
+// Construct the namespace version component
+#define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch) \
+    _v ## major ## _ ## minor ## _ ## patch
+#define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT(major, minor, patch) \
+    NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch)
+
+#if NLOHMANN_JSON_NAMESPACE_NO_VERSION
+#define NLOHMANN_JSON_NAMESPACE_VERSION
+#else
+#define NLOHMANN_JSON_NAMESPACE_VERSION                                 \
+    NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT(NLOHMANN_JSON_VERSION_MAJOR, \
+                                           NLOHMANN_JSON_VERSION_MINOR, \
+                                           NLOHMANN_JSON_VERSION_PATCH)
+#endif
+
+// Combine namespace components
+#define NLOHMANN_JSON_NAMESPACE_CONCAT_EX(a, b) a ## b
+#define NLOHMANN_JSON_NAMESPACE_CONCAT(a, b) \
+    NLOHMANN_JSON_NAMESPACE_CONCAT_EX(a, b)
+
+#ifndef NLOHMANN_JSON_NAMESPACE
+#define NLOHMANN_JSON_NAMESPACE               \
+    nlohmann::NLOHMANN_JSON_NAMESPACE_CONCAT( \
+            NLOHMANN_JSON_ABI_TAGS,           \
+            NLOHMANN_JSON_NAMESPACE_VERSION)
+#endif
+
+#ifndef NLOHMANN_JSON_NAMESPACE_BEGIN
+#define NLOHMANN_JSON_NAMESPACE_BEGIN                \
+    namespace nlohmann                               \
+    {                                                \
+    inline namespace NLOHMANN_JSON_NAMESPACE_CONCAT( \
+                NLOHMANN_JSON_ABI_TAGS,              \
+                NLOHMANN_JSON_NAMESPACE_VERSION)     \
+    {
+#endif
+
+#ifndef NLOHMANN_JSON_NAMESPACE_END
+#define NLOHMANN_JSON_NAMESPACE_END                                     \
+    }  /* namespace (inline namespace) NOLINT(readability/namespace) */ \
+    }  // namespace nlohmann
+#endif
+
 // #include <nlohmann/detail/conversions/from_json.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 
 
 #include <algorithm> // transform
@@ -67,13 +170,34 @@ SOFTWARE.
 #include <valarray> // valarray
 
 // #include <nlohmann/detail/exceptions.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 
 
+#include <cstddef> // nullptr_t
 #include <exception> // exception
+#if JSON_DIAGNOSTICS
+    #include <numeric> // accumulate
+#endif
 #include <stdexcept> // runtime_error
 #include <string> // to_string
+#include <vector> // vector
 
 // #include <nlohmann/detail/value_t.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 
 
 #include <array> // array
@@ -81,100 +205,130 @@ SOFTWARE.
 #include <cstdint> // uint8_t
 #include <string> // string
 
-namespace nlohmann
-{
+// #include <nlohmann/detail/macro_scope.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <utility> // declval, pair
+// #include <nlohmann/detail/meta/detected.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <type_traits>
+
+// #include <nlohmann/detail/meta/void_t.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
-///////////////////////////
-// JSON type enumeration //
-///////////////////////////
 
-/*!
-@brief the JSON type enumeration
+template<typename ...Ts> struct make_void
+{
+    using type = void;
+};
+template<typename ...Ts> using void_t = typename make_void<Ts...>::type;
 
-This enumeration collects the different JSON types. It is internally used to
-distinguish the stored values, and the functions @ref basic_json::is_null(),
-@ref basic_json::is_object(), @ref basic_json::is_array(),
-@ref basic_json::is_string(), @ref basic_json::is_boolean(),
-@ref basic_json::is_number() (with @ref basic_json::is_number_integer(),
-@ref basic_json::is_number_unsigned(), and @ref basic_json::is_number_float()),
-@ref basic_json::is_discarded(), @ref basic_json::is_primitive(), and
-@ref basic_json::is_structured() rely on it.
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
 
-@note There are three enumeration entries (number_integer, number_unsigned, and
-number_float), because the library distinguishes these three types for numbers:
-@ref basic_json::number_unsigned_t is used for unsigned integers,
-@ref basic_json::number_integer_t is used for signed integers, and
-@ref basic_json::number_float_t is used for floating-point numbers or to
-approximate integers which do not fit in the limits of their respective type.
 
-@sa see @ref basic_json::basic_json(const value_t value_type) -- create a JSON
-value with the default value for a given type
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
 
-@since version 1.0.0
-*/
-enum class value_t : std::uint8_t
+// https://en.cppreference.com/w/cpp/experimental/is_detected
+struct nonesuch
 {
-    null,             ///< null value
-    object,           ///< object (unordered set of name/value pairs)
-    array,            ///< array (ordered collection of values)
-    string,           ///< string value
-    boolean,          ///< boolean value
-    number_integer,   ///< number value (signed integer)
-    number_unsigned,  ///< number value (unsigned integer)
-    number_float,     ///< number value (floating-point)
-    binary,           ///< binary array (ordered collection of bytes)
-    discarded         ///< discarded by the parser callback function
+    nonesuch() = delete;
+    ~nonesuch() = delete;
+    nonesuch(nonesuch const&) = delete;
+    nonesuch(nonesuch const&&) = delete;
+    void operator=(nonesuch const&) = delete;
+    void operator=(nonesuch&&) = delete;
 };
 
-/*!
-@brief comparison operator for JSON types
-
-Returns an ordering that is similar to Python:
-- order: null < boolean < number < object < array < string < binary
-- furthermore, each type is not smaller than itself
-- discarded values are not comparable
-- binary is represented as a b"" string in python and directly comparable to a
-  string; however, making a binary array directly comparable with a string would
-  be surprising behavior in a JSON file.
+template<class Default,
+         class AlwaysVoid,
+         template<class...> class Op,
+         class... Args>
+struct detector
+{
+    using value_t = std::false_type;
+    using type = Default;
+};
 
-@since version 1.0.0
-*/
-inline bool operator<(const value_t lhs, const value_t rhs) noexcept
+template<class Default, template<class...> class Op, class... Args>
+struct detector<Default, void_t<Op<Args...>>, Op, Args...>
 {
-    static constexpr std::array<std::uint8_t, 9> order = {{
-            0 /* null */, 3 /* object */, 4 /* array */, 5 /* string */,
-            1 /* boolean */, 2 /* integer */, 2 /* unsigned */, 2 /* float */,
-            6 /* binary */
-        }
-    };
+    using value_t = std::true_type;
+    using type = Op<Args...>;
+};
 
-    const auto l_index = static_cast<std::size_t>(lhs);
-    const auto r_index = static_cast<std::size_t>(rhs);
-    return l_index < order.size() && r_index < order.size() && order[l_index] < order[r_index];
-}
-}  // namespace detail
-}  // namespace nlohmann
+template<template<class...> class Op, class... Args>
+using is_detected = typename detector<nonesuch, void, Op, Args...>::value_t;
 
-// #include <nlohmann/detail/string_escape.hpp>
+template<template<class...> class Op, class... Args>
+struct is_detected_lazy : is_detected<Op, Args...> { };
 
+template<template<class...> class Op, class... Args>
+using detected_t = typename detector<nonesuch, void, Op, Args...>::type;
 
-#include <string>
-// #include <nlohmann/detail/macro_scope.hpp>
+template<class Default, template<class...> class Op, class... Args>
+using detected_or = detector<Default, void, Op, Args...>;
+
+template<class Default, template<class...> class Op, class... Args>
+using detected_or_t = typename detected_or<Default, Op, Args...>::type;
 
+template<class Expected, template<class...> class Op, class... Args>
+using is_detected_exact = std::is_same<Expected, detected_t<Op, Args...>>;
+
+template<class To, template<class...> class Op, class... Args>
+using is_detected_convertible =
+    std::is_convertible<detected_t<Op, Args...>, To>;
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
 
-#include <utility> // pair
 // #include <nlohmann/thirdparty/hedley/hedley.hpp>
+
+
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-FileCopyrightText: 2016-2021 Evan Nemerson <evan@nemerson.com>
+// SPDX-License-Identifier: MIT
+
 /* Hedley - https://nemequ.github.io/hedley
  * Created by Evan Nemerson <evan@nemerson.com>
- *
- * To the extent possible under law, the author(s) have dedicated all
- * copyright and related and neighboring rights to this software to
- * the public domain worldwide. This software is distributed without
- * any warranty.
- *
- * For details, see <http://creativecommons.org/publicdomain/zero/1.0/>.
- * SPDX-License-Identifier: CC0-1.0
  */
 
 #if !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < 15)
@@ -2209,9 +2363,12 @@ JSON_HEDLEY_DIAGNOSTIC_POP
 #endif /* !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < X) */
 
 
-// This file contains all internal macro definitions
+// This file contains all internal macro definitions (except those affecting ABI)
 // You MUST include macro_unscope.hpp at the end of json.hpp to undef all of them
 
+// #include <nlohmann/detail/abi_macros.hpp>
+
+
 // exclude unsupported compilers
 #if !defined(JSON_SKIP_UNSUPPORTED_COMPILER_CHECK)
     #if defined(__clang__)
@@ -2226,30 +2383,136 @@ JSON_HEDLEY_DIAGNOSTIC_POP
 #endif
 
 // C++ language standard detection
-#if (defined(__cplusplus) && __cplusplus >= 202002L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 202002L)
-    #define JSON_HAS_CPP_20
-    #define JSON_HAS_CPP_17
-    #define JSON_HAS_CPP_14
-#elif (defined(__cplusplus) && __cplusplus >= 201703L) || (defined(_HAS_CXX17) && _HAS_CXX17 == 1) // fix for issue #464
-    #define JSON_HAS_CPP_17
-    #define JSON_HAS_CPP_14
-#elif (defined(__cplusplus) && __cplusplus >= 201402L) || (defined(_HAS_CXX14) && _HAS_CXX14 == 1)
-    #define JSON_HAS_CPP_14
+// if the user manually specified the used c++ version this is skipped
+#if !defined(JSON_HAS_CPP_20) && !defined(JSON_HAS_CPP_17) && !defined(JSON_HAS_CPP_14) && !defined(JSON_HAS_CPP_11)
+    #if (defined(__cplusplus) && __cplusplus >= 202002L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 202002L)
+        #define JSON_HAS_CPP_20
+        #define JSON_HAS_CPP_17
+        #define JSON_HAS_CPP_14
+    #elif (defined(__cplusplus) && __cplusplus >= 201703L) || (defined(_HAS_CXX17) && _HAS_CXX17 == 1) // fix for issue #464
+        #define JSON_HAS_CPP_17
+        #define JSON_HAS_CPP_14
+    #elif (defined(__cplusplus) && __cplusplus >= 201402L) || (defined(_HAS_CXX14) && _HAS_CXX14 == 1)
+        #define JSON_HAS_CPP_14
+    #endif
+    // the cpp 11 flag is always specified because it is the minimal required version
+    #define JSON_HAS_CPP_11
+#endif
+
+#ifdef __has_include
+    #if __has_include(<version>)
+        #include <version>
+    #endif
+#endif
+
+#if !defined(JSON_HAS_FILESYSTEM) && !defined(JSON_HAS_EXPERIMENTAL_FILESYSTEM)
+    #ifdef JSON_HAS_CPP_17
+        #if defined(__cpp_lib_filesystem)
+            #define JSON_HAS_FILESYSTEM 1
+        #elif defined(__cpp_lib_experimental_filesystem)
+            #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1
+        #elif !defined(__has_include)
+            #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1
+        #elif __has_include(<filesystem>)
+            #define JSON_HAS_FILESYSTEM 1
+        #elif __has_include(<experimental/filesystem>)
+            #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1
+        #endif
+
+        // std::filesystem does not work on MinGW GCC 8: https://sourceforge.net/p/mingw-w64/bugs/737/
+        #if defined(__MINGW32__) && defined(__GNUC__) && __GNUC__ == 8
+            #undef JSON_HAS_FILESYSTEM
+            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+        #endif
+
+        // no filesystem support before GCC 8: https://en.cppreference.com/w/cpp/compiler_support
+        #if defined(__GNUC__) && !defined(__clang__) && __GNUC__ < 8
+            #undef JSON_HAS_FILESYSTEM
+            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+        #endif
+
+        // no filesystem support before Clang 7: https://en.cppreference.com/w/cpp/compiler_support
+        #if defined(__clang_major__) && __clang_major__ < 7
+            #undef JSON_HAS_FILESYSTEM
+            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+        #endif
+
+        // no filesystem support before MSVC 19.14: https://en.cppreference.com/w/cpp/compiler_support
+        #if defined(_MSC_VER) && _MSC_VER < 1914
+            #undef JSON_HAS_FILESYSTEM
+            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+        #endif
+
+        // no filesystem support before iOS 13
+        #if defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED < 130000
+            #undef JSON_HAS_FILESYSTEM
+            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+        #endif
+
+        // no filesystem support before macOS Catalina
+        #if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500
+            #undef JSON_HAS_FILESYSTEM
+            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+        #endif
+    #endif
+#endif
+
+#ifndef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+    #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 0
+#endif
+
+#ifndef JSON_HAS_FILESYSTEM
+    #define JSON_HAS_FILESYSTEM 0
+#endif
+
+#ifndef JSON_HAS_THREE_WAY_COMPARISON
+    #if defined(__cpp_impl_three_way_comparison) && __cpp_impl_three_way_comparison >= 201907L \
+        && defined(__cpp_lib_three_way_comparison) && __cpp_lib_three_way_comparison >= 201907L
+        #define JSON_HAS_THREE_WAY_COMPARISON 1
+    #else
+        #define JSON_HAS_THREE_WAY_COMPARISON 0
+    #endif
+#endif
+
+#ifndef JSON_HAS_RANGES
+    // ranges header shipping in GCC 11.1.0 (released 2021-04-27) has syntax error
+    #if defined(__GLIBCXX__) && __GLIBCXX__ == 20210427
+        #define JSON_HAS_RANGES 0
+    #elif defined(__cpp_lib_ranges)
+        #define JSON_HAS_RANGES 1
+    #else
+        #define JSON_HAS_RANGES 0
+    #endif
+#endif
+
+#ifndef JSON_HAS_STATIC_RTTI
+    #if !defined(_HAS_STATIC_RTTI) || _HAS_STATIC_RTTI != 0
+        #define JSON_HAS_STATIC_RTTI 1
+    #else
+        #define JSON_HAS_STATIC_RTTI 0
+    #endif
+#endif
+
+#ifdef JSON_HAS_CPP_17
+    #define JSON_INLINE_VARIABLE inline
+#else
+    #define JSON_INLINE_VARIABLE
 #endif
 
-// disable float-equal warnings on GCC/clang
-#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
-    #pragma GCC diagnostic push
-    #pragma GCC diagnostic ignored "-Wfloat-equal"
+#if JSON_HEDLEY_HAS_ATTRIBUTE(no_unique_address)
+    #define JSON_NO_UNIQUE_ADDRESS [[no_unique_address]]
+#else
+    #define JSON_NO_UNIQUE_ADDRESS
 #endif
 
 // disable documentation warnings on clang
 #if defined(__clang__)
-    #pragma GCC diagnostic push
-    #pragma GCC diagnostic ignored "-Wdocumentation"
+    #pragma clang diagnostic push
+    #pragma clang diagnostic ignored "-Wdocumentation"
+    #pragma clang diagnostic ignored "-Wdocumentation-unknown-command"
 #endif
 
-// allow to disable exceptions
+// allow disabling exceptions
 #if (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)) && !defined(JSON_NOEXCEPTION)
     #define JSON_THROW(exception) throw exception
     #define JSON_TRY try
@@ -2283,7 +2546,7 @@ JSON_HEDLEY_DIAGNOSTIC_POP
     #define JSON_INTERNAL_CATCH JSON_INTERNAL_CATCH_USER
 #endif
 
-// allow to override assert
+// allow overriding assert
 #if !defined(JSON_ASSERT)
     #include <cassert> // assert
     #define JSON_ASSERT(x) assert(x)
@@ -2337,12 +2600,13 @@ JSON_HEDLEY_DIAGNOSTIC_POP
              class NumberUnsignedType, class NumberFloatType,              \
              template<typename> class AllocatorType,                       \
              template<typename, typename = void> class JSONSerializer,     \
-             class BinaryType>
+             class BinaryType,                                             \
+             class CustomBaseClass>
 
 #define NLOHMANN_BASIC_JSON_TPL                                            \
     basic_json<ObjectType, ArrayType, StringType, BooleanType,             \
     NumberIntegerType, NumberUnsignedType, NumberFloatType,                \
-    AllocatorType, JSONSerializer, BinaryType>
+    AllocatorType, JSONSerializer, BinaryType, CustomBaseClass>
 
 // Macros to simplify conversion from/to types
 
@@ -2479,6 +2743,7 @@ JSON_HEDLEY_DIAGNOSTIC_POP
 
 #define NLOHMANN_JSON_TO(v1) nlohmann_json_j[#v1] = nlohmann_json_t.v1;
 #define NLOHMANN_JSON_FROM(v1) nlohmann_json_j.at(#v1).get_to(nlohmann_json_t.v1);
+#define NLOHMANN_JSON_FROM_WITH_DEFAULT(v1) nlohmann_json_t.v1 = nlohmann_json_j.value(#v1, nlohmann_json_default_obj.v1);
 
 /*!
 @brief macro
@@ -2489,6 +2754,13 @@ JSON_HEDLEY_DIAGNOSTIC_POP
     friend void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
     friend void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) }
 
+#define NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(Type, ...)  \
+    friend void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
+    friend void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { const Type nlohmann_json_default_obj{}; NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM_WITH_DEFAULT, __VA_ARGS__)) }
+
+#define NLOHMANN_DEFINE_TYPE_INTRUSIVE_ONLY_SERIALIZE(Type, ...)  \
+    friend void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) }
+
 /*!
 @brief macro
 @def NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE
@@ -2498,6 +2770,51 @@ JSON_HEDLEY_DIAGNOSTIC_POP
     inline void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
     inline void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) }
 
+#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_ONLY_SERIALIZE(Type, ...)  \
+    inline void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) }
+
+#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(Type, ...)  \
+    inline void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
+    inline void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { const Type nlohmann_json_default_obj{}; NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM_WITH_DEFAULT, __VA_ARGS__)) }
+
+// inspired from https://stackoverflow.com/a/26745591
+// allows to call any std function as if (e.g. with begin):
+// using std::begin; begin(x);
+//
+// it allows using the detected idiom to retrieve the return type
+// of such an expression
+#define NLOHMANN_CAN_CALL_STD_FUNC_IMPL(std_name)                                 \
+    namespace detail {                                                            \
+    using std::std_name;                                                          \
+    \
+    template<typename... T>                                                       \
+    using result_of_##std_name = decltype(std_name(std::declval<T>()...));        \
+    }                                                                             \
+    \
+    namespace detail2 {                                                           \
+    struct std_name##_tag                                                         \
+    {                                                                             \
+    };                                                                            \
+    \
+    template<typename... T>                                                       \
+    std_name##_tag std_name(T&&...);                                              \
+    \
+    template<typename... T>                                                       \
+    using result_of_##std_name = decltype(std_name(std::declval<T>()...));        \
+    \
+    template<typename... T>                                                       \
+    struct would_call_std_##std_name                                              \
+    {                                                                             \
+        static constexpr auto const value = ::nlohmann::detail::                  \
+                                            is_detected_exact<std_name##_tag, result_of_##std_name, T...>::value; \
+    };                                                                            \
+    } /* namespace detail2 */ \
+    \
+    template<typename... T>                                                       \
+    struct would_call_std_##std_name : detail2::would_call_std_##std_name<T...>   \
+    {                                                                             \
+    }
+
 #ifndef JSON_USE_IMPLICIT_CONVERSIONS
     #define JSON_USE_IMPLICIT_CONVERSIONS 1
 #endif
@@ -2508,18 +2825,141 @@ JSON_HEDLEY_DIAGNOSTIC_POP
     #define JSON_EXPLICIT explicit
 #endif
 
+#ifndef JSON_DISABLE_ENUM_SERIALIZATION
+    #define JSON_DISABLE_ENUM_SERIALIZATION 0
+#endif
 
-namespace nlohmann
-{
+#ifndef JSON_USE_GLOBAL_UDLS
+    #define JSON_USE_GLOBAL_UDLS 1
+#endif
+
+#if JSON_HAS_THREE_WAY_COMPARISON
+    #include <compare> // partial_ordering
+#endif
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
 
+///////////////////////////
+// JSON type enumeration //
+///////////////////////////
+
 /*!
-@brief replace all occurrences of a substring by another string
+@brief the JSON type enumeration
 
-@param[in,out] s  the string to manipulate; changed so that all
-               occurrences of @a f are replaced with @a t
-@param[in]     f  the substring to replace with @a t
+This enumeration collects the different JSON types. It is internally used to
+distinguish the stored values, and the functions @ref basic_json::is_null(),
+@ref basic_json::is_object(), @ref basic_json::is_array(),
+@ref basic_json::is_string(), @ref basic_json::is_boolean(),
+@ref basic_json::is_number() (with @ref basic_json::is_number_integer(),
+@ref basic_json::is_number_unsigned(), and @ref basic_json::is_number_float()),
+@ref basic_json::is_discarded(), @ref basic_json::is_primitive(), and
+@ref basic_json::is_structured() rely on it.
+
+@note There are three enumeration entries (number_integer, number_unsigned, and
+number_float), because the library distinguishes these three types for numbers:
+@ref basic_json::number_unsigned_t is used for unsigned integers,
+@ref basic_json::number_integer_t is used for signed integers, and
+@ref basic_json::number_float_t is used for floating-point numbers or to
+approximate integers which do not fit in the limits of their respective type.
+
+@sa see @ref basic_json::basic_json(const value_t value_type) -- create a JSON
+value with the default value for a given type
+
+@since version 1.0.0
+*/
+enum class value_t : std::uint8_t
+{
+    null,             ///< null value
+    object,           ///< object (unordered set of name/value pairs)
+    array,            ///< array (ordered collection of values)
+    string,           ///< string value
+    boolean,          ///< boolean value
+    number_integer,   ///< number value (signed integer)
+    number_unsigned,  ///< number value (unsigned integer)
+    number_float,     ///< number value (floating-point)
+    binary,           ///< binary array (ordered collection of bytes)
+    discarded         ///< discarded by the parser callback function
+};
+
+/*!
+@brief comparison operator for JSON types
+
+Returns an ordering that is similar to Python:
+- order: null < boolean < number < object < array < string < binary
+- furthermore, each type is not smaller than itself
+- discarded values are not comparable
+- binary is represented as a b"" string in python and directly comparable to a
+  string; however, making a binary array directly comparable with a string would
+  be surprising behavior in a JSON file.
+
+@since version 1.0.0
+*/
+#if JSON_HAS_THREE_WAY_COMPARISON
+    inline std::partial_ordering operator<=>(const value_t lhs, const value_t rhs) noexcept // *NOPAD*
+#else
+    inline bool operator<(const value_t lhs, const value_t rhs) noexcept
+#endif
+{
+    static constexpr std::array<std::uint8_t, 9> order = {{
+            0 /* null */, 3 /* object */, 4 /* array */, 5 /* string */,
+            1 /* boolean */, 2 /* integer */, 2 /* unsigned */, 2 /* float */,
+            6 /* binary */
+        }
+    };
+
+    const auto l_index = static_cast<std::size_t>(lhs);
+    const auto r_index = static_cast<std::size_t>(rhs);
+#if JSON_HAS_THREE_WAY_COMPARISON
+    if (l_index < order.size() && r_index < order.size())
+    {
+        return order[l_index] <=> order[r_index]; // *NOPAD*
+    }
+    return std::partial_ordering::unordered;
+#else
+    return l_index < order.size() && r_index < order.size() && order[l_index] < order[r_index];
+#endif
+}
+
+// GCC selects the built-in operator< over an operator rewritten from
+// a user-defined spaceship operator
+// Clang, MSVC, and ICC select the rewritten candidate
+// (see GCC bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105200)
+#if JSON_HAS_THREE_WAY_COMPARISON && defined(__GNUC__)
+inline bool operator<(const value_t lhs, const value_t rhs) noexcept
+{
+    return std::is_lt(lhs <=> rhs); // *NOPAD*
+}
+#endif
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/string_escape.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+/*!
+@brief replace all occurrences of a substring by another string
+
+@param[in,out] s  the string to manipulate; changed so that all
+               occurrences of @a f are replaced with @a t
+@param[in]     f  the substring to replace with @a t
 @param[in]     t  the string to replace @a f
 
 @pre The search string @a f must not be empty. **This precondition is
@@ -2527,12 +2967,13 @@ enforced with an assertion.**
 
 @since version 2.0.0
 */
-inline void replace_substring(std::string& s, const std::string& f,
-                              const std::string& t)
+template<typename StringType>
+inline void replace_substring(StringType& s, const StringType& f,
+                              const StringType& t)
 {
     JSON_ASSERT(!f.empty());
     for (auto pos = s.find(f);                // find first occurrence of f
-            pos != std::string::npos;         // make sure f was found
+            pos != StringType::npos;          // make sure f was found
             s.replace(pos, f.size(), t),      // replace with t, and
             pos = s.find(f, pos + t.size()))  // find next occurrence of f
     {}
@@ -2545,10 +2986,11 @@ inline void replace_substring(std::string& s, const std::string& f,
  *
  * Note the order of escaping "~" to "~0" and "/" to "~1" is important.
  */
-inline std::string escape(std::string s)
+template<typename StringType>
+inline StringType escape(StringType s)
 {
-    replace_substring(s, "~", "~0");
-    replace_substring(s, "/", "~1");
+    replace_substring(s, StringType{"~"}, StringType{"~0"});
+    replace_substring(s, StringType{"/"}, StringType{"~1"});
     return s;
 }
 
@@ -2559,24 +3001,36 @@ inline std::string escape(std::string s)
  *
  * Note the order of escaping "~1" to "/" and "~0" to "~" is important.
  */
-static void unescape(std::string& s)
+template<typename StringType>
+static void unescape(StringType& s)
 {
-    replace_substring(s, "~1", "/");
-    replace_substring(s, "~0", "~");
+    replace_substring(s, StringType{"~1"}, StringType{"/"});
+    replace_substring(s, StringType{"~0"}, StringType{"~"});
 }
 
-} // namespace detail
-} // namespace nlohmann
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
 
 // #include <nlohmann/detail/input/position_t.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 
 
 #include <cstddef> // size_t
 
-namespace nlohmann
-{
+// #include <nlohmann/detail/abi_macros.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
+
 /// struct to capture the start position of the current token
 struct position_t
 {
@@ -2594,486 +3048,158 @@ struct position_t
     }
 };
 
-} // namespace detail
-} // namespace nlohmann
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
 
 // #include <nlohmann/detail/macro_scope.hpp>
 
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-FileCopyrightText: 2018 The Abseil Authors
+// SPDX-License-Identifier: MIT
 
-namespace nlohmann
-{
-namespace detail
-{
-////////////////
-// exceptions //
-////////////////
-
-/*!
-@brief general exception of the @ref basic_json class
 
-This class is an extension of `std::exception` objects with a member @a id for
-exception ids. It is used as the base class for all exceptions thrown by the
-@ref basic_json class. This class can hence be used as "wildcard" to catch
-exceptions.
 
-Subclasses:
-- @ref parse_error for exceptions indicating a parse error
-- @ref invalid_iterator for exceptions indicating errors with iterators
-- @ref type_error for exceptions indicating executing a member function with
-                  a wrong type
-- @ref out_of_range for exceptions indicating access out of the defined range
-- @ref other_error for exceptions indicating other library errors
+#include <array> // array
+#include <cstddef> // size_t
+#include <type_traits> // conditional, enable_if, false_type, integral_constant, is_constructible, is_integral, is_same, remove_cv, remove_reference, true_type
+#include <utility> // index_sequence, make_index_sequence, index_sequence_for
 
-@internal
-@note To have nothrow-copy-constructible exceptions, we internally use
-      `std::runtime_error` which can cope with arbitrary-length error messages.
-      Intermediate strings are built with static functions and then passed to
-      the actual constructor.
-@endinternal
+// #include <nlohmann/detail/macro_scope.hpp>
 
-@liveexample{The following code shows how arbitrary library exceptions can be
-caught.,exception}
 
-@since version 3.0.0
-*/
-class exception : public std::exception
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
 {
-  public:
-    /// returns the explanatory string
-    JSON_HEDLEY_RETURNS_NON_NULL
-    const char* what() const noexcept override
-    {
-        return m.what();
-    }
-
-    /// the id of the exception
-    const int id;
-
-  protected:
-    JSON_HEDLEY_NON_NULL(3)
-    exception(int id_, const char* what_arg) : id(id_), m(what_arg) {}
 
-    static std::string name(const std::string& ename, int id_)
-    {
-        return "[json.exception." + ename + "." + std::to_string(id_) + "] ";
-    }
+template<typename T>
+using uncvref_t = typename std::remove_cv<typename std::remove_reference<T>::type>::type;
 
-    template<typename BasicJsonType>
-    static std::string diagnostics(const BasicJsonType& leaf_element)
-    {
-#if JSON_DIAGNOSTICS
-        std::vector<std::string> tokens;
-        for (const auto* current = &leaf_element; current->m_parent != nullptr; current = current->m_parent)
-        {
-            switch (current->m_parent->type())
-            {
-                case value_t::array:
-                {
-                    for (std::size_t i = 0; i < current->m_parent->m_value.array->size(); ++i)
-                    {
-                        if (&current->m_parent->m_value.array->operator[](i) == current)
-                        {
-                            tokens.emplace_back(std::to_string(i));
-                            break;
-                        }
-                    }
-                    break;
-                }
+#ifdef JSON_HAS_CPP_14
 
-                case value_t::object:
-                {
-                    for (const auto& element : *current->m_parent->m_value.object)
-                    {
-                        if (&element.second == current)
-                        {
-                            tokens.emplace_back(element.first.c_str());
-                            break;
-                        }
-                    }
-                    break;
-                }
+// the following utilities are natively available in C++14
+using std::enable_if_t;
+using std::index_sequence;
+using std::make_index_sequence;
+using std::index_sequence_for;
 
-                default:   // LCOV_EXCL_LINE
-                    break; // LCOV_EXCL_LINE
-            }
-        }
+#else
 
-        if (tokens.empty())
-        {
-            return "";
-        }
+// alias templates to reduce boilerplate
+template<bool B, typename T = void>
+using enable_if_t = typename std::enable_if<B, T>::type;
 
-        return "(" + std::accumulate(tokens.rbegin(), tokens.rend(), std::string{},
-                                     [](const std::string & a, const std::string & b)
-        {
-            return a + "/" + detail::escape(b);
-        }) + ") ";
-#else
-        return "";
-#endif
-    }
+// The following code is taken from https://github.com/abseil/abseil-cpp/blob/10cb35e459f5ecca5b2ff107635da0bfa41011b4/absl/utility/utility.h
+// which is part of Google Abseil (https://github.com/abseil/abseil-cpp), licensed under the Apache License 2.0.
 
-  private:
-    /// an exception object as storage for error messages
-    std::runtime_error m;
-};
+//// START OF CODE FROM GOOGLE ABSEIL
 
-/*!
-@brief exception indicating a parse error
-
-This exception is thrown by the library when a parse error occurs. Parse errors
-can occur during the deserialization of JSON text, CBOR, MessagePack, as well
-as when using JSON Patch.
-
-Member @a byte holds the byte index of the last read character in the input
-file.
-
-Exceptions have ids 1xx.
-
-name / id                      | example message | description
------------------------------- | --------------- | -------------------------
-json.exception.parse_error.101 | parse error at 2: unexpected end of input; expected string literal | This error indicates a syntax error while deserializing a JSON text. The error message describes that an unexpected token (character) was encountered, and the member @a byte indicates the error position.
-json.exception.parse_error.102 | parse error at 14: missing or wrong low surrogate | JSON uses the `\uxxxx` format to describe Unicode characters. Code points above above 0xFFFF are split into two `\uxxxx` entries ("surrogate pairs"). This error indicates that the surrogate pair is incomplete or contains an invalid code point.
-json.exception.parse_error.103 | parse error: code points above 0x10FFFF are invalid | Unicode supports code points up to 0x10FFFF. Code points above 0x10FFFF are invalid.
-json.exception.parse_error.104 | parse error: JSON patch must be an array of objects | [RFC 6902](https://tools.ietf.org/html/rfc6902) requires a JSON Patch document to be a JSON document that represents an array of objects.
-json.exception.parse_error.105 | parse error: operation must have string member 'op' | An operation of a JSON Patch document must contain exactly one "op" member, whose value indicates the operation to perform. Its value must be one of "add", "remove", "replace", "move", "copy", or "test"; other values are errors.
-json.exception.parse_error.106 | parse error: array index '01' must not begin with '0' | An array index in a JSON Pointer ([RFC 6901](https://tools.ietf.org/html/rfc6901)) may be `0` or any number without a leading `0`.
-json.exception.parse_error.107 | parse error: JSON pointer must be empty or begin with '/' - was: 'foo' | A JSON Pointer must be a Unicode string containing a sequence of zero or more reference tokens, each prefixed by a `/` character.
-json.exception.parse_error.108 | parse error: escape character '~' must be followed with '0' or '1' | In a JSON Pointer, only `~0` and `~1` are valid escape sequences.
-json.exception.parse_error.109 | parse error: array index 'one' is not a number | A JSON Pointer array index must be a number.
-json.exception.parse_error.110 | parse error at 1: cannot read 2 bytes from vector | When parsing CBOR or MessagePack, the byte vector ends before the complete value has been read.
-json.exception.parse_error.112 | parse error at 1: error reading CBOR; last byte: 0xF8 | Not all types of CBOR or MessagePack are supported. This exception occurs if an unsupported byte was read.
-json.exception.parse_error.113 | parse error at 2: expected a CBOR string; last byte: 0x98 | While parsing a map key, a value that is not a string has been read.
-json.exception.parse_error.114 | parse error: Unsupported BSON record type 0x0F | The parsing of the corresponding BSON record type is not implemented (yet).
-json.exception.parse_error.115 | parse error at byte 5: syntax error while parsing UBJSON high-precision number: invalid number text: 1A | A UBJSON high-precision number could not be parsed.
-
-@note For an input with n bytes, 1 is the index of the first character and n+1
-      is the index of the terminating null byte or the end of file. This also
-      holds true when reading a byte vector (CBOR or MessagePack).
-
-@liveexample{The following code shows how a `parse_error` exception can be
-caught.,parse_error}
-
-@sa - @ref exception for the base class of the library exceptions
-@sa - @ref invalid_iterator for exceptions indicating errors with iterators
-@sa - @ref type_error for exceptions indicating executing a member function with
-                    a wrong type
-@sa - @ref out_of_range for exceptions indicating access out of the defined range
-@sa - @ref other_error for exceptions indicating other library errors
-
-@since version 3.0.0
-*/
-class parse_error : public exception
+// integer_sequence
+//
+// Class template representing a compile-time integer sequence. An instantiation
+// of `integer_sequence<T, Ints...>` has a sequence of integers encoded in its
+// type through its template arguments (which is a common need when
+// working with C++11 variadic templates). `absl::integer_sequence` is designed
+// to be a drop-in replacement for C++14's `std::integer_sequence`.
+//
+// Example:
+//
+//   template< class T, T... Ints >
+//   void user_function(integer_sequence<T, Ints...>);
+//
+//   int main()
+//   {
+//     // user_function's `T` will be deduced to `int` and `Ints...`
+//     // will be deduced to `0, 1, 2, 3, 4`.
+//     user_function(make_integer_sequence<int, 5>());
+//   }
+template <typename T, T... Ints>
+struct integer_sequence
 {
-  public:
-    /*!
-    @brief create a parse error exception
-    @param[in] id_       the id of the exception
-    @param[in] pos       the position where the error occurred (or with
-                         chars_read_total=0 if the position cannot be
-                         determined)
-    @param[in] what_arg  the explanatory string
-    @return parse_error object
-    */
-    template<typename BasicJsonType>
-    static parse_error create(int id_, const position_t& pos, const std::string& what_arg, const BasicJsonType& context)
-    {
-        std::string w = exception::name("parse_error", id_) + "parse error" +
-                        position_string(pos) + ": " + exception::diagnostics(context) + what_arg;
-        return parse_error(id_, pos.chars_read_total, w.c_str());
-    }
-
-    template<typename BasicJsonType>
-    static parse_error create(int id_, std::size_t byte_, const std::string& what_arg, const BasicJsonType& context)
+    using value_type = T;
+    static constexpr std::size_t size() noexcept
     {
-        std::string w = exception::name("parse_error", id_) + "parse error" +
-                        (byte_ != 0 ? (" at byte " + std::to_string(byte_)) : "") +
-                        ": " + exception::diagnostics(context) + what_arg;
-        return parse_error(id_, byte_, w.c_str());
+        return sizeof...(Ints);
     }
+};
 
-    /*!
-    @brief byte index of the parse error
-
-    The byte index of the last read character in the input file.
+// index_sequence
+//
+// A helper template for an `integer_sequence` of `size_t`,
+// `absl::index_sequence` is designed to be a drop-in replacement for C++14's
+// `std::index_sequence`.
+template <size_t... Ints>
+using index_sequence = integer_sequence<size_t, Ints...>;
 
-    @note For an input with n bytes, 1 is the index of the first character and
-          n+1 is the index of the terminating null byte or the end of file.
-          This also holds true when reading a byte vector (CBOR or MessagePack).
-    */
-    const std::size_t byte;
+namespace utility_internal
+{
 
-  private:
-    parse_error(int id_, std::size_t byte_, const char* what_arg)
-        : exception(id_, what_arg), byte(byte_) {}
+template <typename Seq, size_t SeqSize, size_t Rem>
+struct Extend;
 
-    static std::string position_string(const position_t& pos)
-    {
-        return " at line " + std::to_string(pos.lines_read + 1) +
-               ", column " + std::to_string(pos.chars_read_current_line);
-    }
+// Note that SeqSize == sizeof...(Ints). It's passed explicitly for efficiency.
+template <typename T, T... Ints, size_t SeqSize>
+struct Extend<integer_sequence<T, Ints...>, SeqSize, 0>
+{
+    using type = integer_sequence < T, Ints..., (Ints + SeqSize)... >;
 };
 
-/*!
-@brief exception indicating errors with iterators
-
-This exception is thrown if iterators passed to a library function do not match
-the expected semantics.
-
-Exceptions have ids 2xx.
-
-name / id                           | example message | description
------------------------------------ | --------------- | -------------------------
-json.exception.invalid_iterator.201 | iterators are not compatible | The iterators passed to constructor @ref basic_json(InputIT first, InputIT last) are not compatible, meaning they do not belong to the same container. Therefore, the range (@a first, @a last) is invalid.
-json.exception.invalid_iterator.202 | iterator does not fit current value | In an erase or insert function, the passed iterator @a pos does not belong to the JSON value for which the function was called. It hence does not define a valid position for the deletion/insertion.
-json.exception.invalid_iterator.203 | iterators do not fit current value | Either iterator passed to function @ref erase(IteratorType first, IteratorType last) does not belong to the JSON value from which values shall be erased. It hence does not define a valid range to delete values from.
-json.exception.invalid_iterator.204 | iterators out of range | When an iterator range for a primitive type (number, boolean, or string) is passed to a constructor or an erase function, this range has to be exactly (@ref begin(), @ref end()), because this is the only way the single stored value is expressed. All other ranges are invalid.
-json.exception.invalid_iterator.205 | iterator out of range | When an iterator for a primitive type (number, boolean, or string) is passed to an erase function, the iterator has to be the @ref begin() iterator, because it is the only way to address the stored value. All other iterators are invalid.
-json.exception.invalid_iterator.206 | cannot construct with iterators from null | The iterators passed to constructor @ref basic_json(InputIT first, InputIT last) belong to a JSON null value and hence to not define a valid range.
-json.exception.invalid_iterator.207 | cannot use key() for non-object iterators | The key() member function can only be used on iterators belonging to a JSON object, because other types do not have a concept of a key.
-json.exception.invalid_iterator.208 | cannot use operator[] for object iterators | The operator[] to specify a concrete offset cannot be used on iterators belonging to a JSON object, because JSON objects are unordered.
-json.exception.invalid_iterator.209 | cannot use offsets with object iterators | The offset operators (+, -, +=, -=) cannot be used on iterators belonging to a JSON object, because JSON objects are unordered.
-json.exception.invalid_iterator.210 | iterators do not fit | The iterator range passed to the insert function are not compatible, meaning they do not belong to the same container. Therefore, the range (@a first, @a last) is invalid.
-json.exception.invalid_iterator.211 | passed iterators may not belong to container | The iterator range passed to the insert function must not be a subrange of the container to insert to.
-json.exception.invalid_iterator.212 | cannot compare iterators of different containers | When two iterators are compared, they must belong to the same container.
-json.exception.invalid_iterator.213 | cannot compare order of object iterators | The order of object iterators cannot be compared, because JSON objects are unordered.
-json.exception.invalid_iterator.214 | cannot get value | Cannot get value for iterator: Either the iterator belongs to a null value or it is an iterator to a primitive type (number, boolean, or string), but the iterator is different to @ref begin().
-
-@liveexample{The following code shows how an `invalid_iterator` exception can be
-caught.,invalid_iterator}
-
-@sa - @ref exception for the base class of the library exceptions
-@sa - @ref parse_error for exceptions indicating a parse error
-@sa - @ref type_error for exceptions indicating executing a member function with
-                    a wrong type
-@sa - @ref out_of_range for exceptions indicating access out of the defined range
-@sa - @ref other_error for exceptions indicating other library errors
-
-@since version 3.0.0
-*/
-class invalid_iterator : public exception
+template <typename T, T... Ints, size_t SeqSize>
+struct Extend<integer_sequence<T, Ints...>, SeqSize, 1>
 {
-  public:
-    template<typename BasicJsonType>
-    static invalid_iterator create(int id_, const std::string& what_arg, const BasicJsonType& context)
-    {
-        std::string w = exception::name("invalid_iterator", id_) + exception::diagnostics(context) + what_arg;
-        return invalid_iterator(id_, w.c_str());
-    }
+    using type = integer_sequence < T, Ints..., (Ints + SeqSize)..., 2 * SeqSize >;
+};
 
-  private:
-    JSON_HEDLEY_NON_NULL(3)
-    invalid_iterator(int id_, const char* what_arg)
-        : exception(id_, what_arg) {}
+// Recursion helper for 'make_integer_sequence<T, N>'.
+// 'Gen<T, N>::type' is an alias for 'integer_sequence<T, 0, 1, ... N-1>'.
+template <typename T, size_t N>
+struct Gen
+{
+    using type =
+        typename Extend < typename Gen < T, N / 2 >::type, N / 2, N % 2 >::type;
 };
 
-/*!
-@brief exception indicating executing a member function with a wrong type
-
-This exception is thrown in case of a type error; that is, a library function is
-executed on a JSON value whose type does not match the expected semantics.
-
-Exceptions have ids 3xx.
-
-name / id                     | example message | description
------------------------------ | --------------- | -------------------------
-json.exception.type_error.301 | cannot create object from initializer list | To create an object from an initializer list, the initializer list must consist only of a list of pairs whose first element is a string. When this constraint is violated, an array is created instead.
-json.exception.type_error.302 | type must be object, but is array | During implicit or explicit value conversion, the JSON type must be compatible to the target type. For instance, a JSON string can only be converted into string types, but not into numbers or boolean types.
-json.exception.type_error.303 | incompatible ReferenceType for get_ref, actual type is object | To retrieve a reference to a value stored in a @ref basic_json object with @ref get_ref, the type of the reference must match the value type. For instance, for a JSON array, the @a ReferenceType must be @ref array_t &.
-json.exception.type_error.304 | cannot use at() with string | The @ref at() member functions can only be executed for certain JSON types.
-json.exception.type_error.305 | cannot use operator[] with string | The @ref operator[] member functions can only be executed for certain JSON types.
-json.exception.type_error.306 | cannot use value() with string | The @ref value() member functions can only be executed for certain JSON types.
-json.exception.type_error.307 | cannot use erase() with string | The @ref erase() member functions can only be executed for certain JSON types.
-json.exception.type_error.308 | cannot use push_back() with string | The @ref push_back() and @ref operator+= member functions can only be executed for certain JSON types.
-json.exception.type_error.309 | cannot use insert() with | The @ref insert() member functions can only be executed for certain JSON types.
-json.exception.type_error.310 | cannot use swap() with number | The @ref swap() member functions can only be executed for certain JSON types.
-json.exception.type_error.311 | cannot use emplace_back() with string | The @ref emplace_back() member function can only be executed for certain JSON types.
-json.exception.type_error.312 | cannot use update() with string | The @ref update() member functions can only be executed for certain JSON types.
-json.exception.type_error.313 | invalid value to unflatten | The @ref unflatten function converts an object whose keys are JSON Pointers back into an arbitrary nested JSON value. The JSON Pointers must not overlap, because then the resulting value would not be well defined.
-json.exception.type_error.314 | only objects can be unflattened | The @ref unflatten function only works for an object whose keys are JSON Pointers.
-json.exception.type_error.315 | values in object must be primitive | The @ref unflatten function only works for an object whose keys are JSON Pointers and whose values are primitive.
-json.exception.type_error.316 | invalid UTF-8 byte at index 10: 0x7E | The @ref dump function only works with UTF-8 encoded strings; that is, if you assign a `std::string` to a JSON value, make sure it is UTF-8 encoded. |
-json.exception.type_error.317 | JSON value cannot be serialized to requested format | The dynamic type of the object cannot be represented in the requested serialization format (e.g. a raw `true` or `null` JSON object cannot be serialized to BSON) |
-
-@liveexample{The following code shows how a `type_error` exception can be
-caught.,type_error}
-
-@sa - @ref exception for the base class of the library exceptions
-@sa - @ref parse_error for exceptions indicating a parse error
-@sa - @ref invalid_iterator for exceptions indicating errors with iterators
-@sa - @ref out_of_range for exceptions indicating access out of the defined range
-@sa - @ref other_error for exceptions indicating other library errors
-
-@since version 3.0.0
-*/
-class type_error : public exception
+template <typename T>
+struct Gen<T, 0>
 {
-  public:
-    template<typename BasicJsonType>
-    static type_error create(int id_, const std::string& what_arg, const BasicJsonType& context)
-    {
-        std::string w = exception::name("type_error", id_) + exception::diagnostics(context) + what_arg;
-        return type_error(id_, w.c_str());
-    }
+    using type = integer_sequence<T>;
+};
 
-  private:
-    JSON_HEDLEY_NON_NULL(3)
-    type_error(int id_, const char* what_arg) : exception(id_, what_arg) {}
-};
-
-/*!
-@brief exception indicating access out of the defined range
-
-This exception is thrown in case a library function is called on an input
-parameter that exceeds the expected range, for instance in case of array
-indices or nonexisting object keys.
-
-Exceptions have ids 4xx.
-
-name / id                       | example message | description
-------------------------------- | --------------- | -------------------------
-json.exception.out_of_range.401 | array index 3 is out of range | The provided array index @a i is larger than @a size-1.
-json.exception.out_of_range.402 | array index '-' (3) is out of range | The special array index `-` in a JSON Pointer never describes a valid element of the array, but the index past the end. That is, it can only be used to add elements at this position, but not to read it.
-json.exception.out_of_range.403 | key 'foo' not found | The provided key was not found in the JSON object.
-json.exception.out_of_range.404 | unresolved reference token 'foo' | A reference token in a JSON Pointer could not be resolved.
-json.exception.out_of_range.405 | JSON pointer has no parent | The JSON Patch operations 'remove' and 'add' can not be applied to the root element of the JSON value.
-json.exception.out_of_range.406 | number overflow parsing '10E1000' | A parsed number could not be stored as without changing it to NaN or INF.
-json.exception.out_of_range.407 | number overflow serializing '9223372036854775808' | UBJSON and BSON only support integer numbers up to 9223372036854775807. (until version 3.8.0) |
-json.exception.out_of_range.408 | excessive array size: 8658170730974374167 | The size (following `#`) of an UBJSON array or object exceeds the maximal capacity. |
-json.exception.out_of_range.409 | BSON key cannot contain code point U+0000 (at byte 2) | Key identifiers to be serialized to BSON cannot contain code point U+0000, since the key is stored as zero-terminated c-string |
-
-@liveexample{The following code shows how an `out_of_range` exception can be
-caught.,out_of_range}
-
-@sa - @ref exception for the base class of the library exceptions
-@sa - @ref parse_error for exceptions indicating a parse error
-@sa - @ref invalid_iterator for exceptions indicating errors with iterators
-@sa - @ref type_error for exceptions indicating executing a member function with
-                    a wrong type
-@sa - @ref other_error for exceptions indicating other library errors
-
-@since version 3.0.0
-*/
-class out_of_range : public exception
-{
-  public:
-    template<typename BasicJsonType>
-    static out_of_range create(int id_, const std::string& what_arg, const BasicJsonType& context)
-    {
-        std::string w = exception::name("out_of_range", id_) + exception::diagnostics(context) + what_arg;
-        return out_of_range(id_, w.c_str());
-    }
-
-  private:
-    JSON_HEDLEY_NON_NULL(3)
-    out_of_range(int id_, const char* what_arg) : exception(id_, what_arg) {}
-};
-
-/*!
-@brief exception indicating other library errors
-
-This exception is thrown in case of errors that cannot be classified with the
-other exception types.
-
-Exceptions have ids 5xx.
-
-name / id                      | example message | description
------------------------------- | --------------- | -------------------------
-json.exception.other_error.501 | unsuccessful: {"op":"test","path":"/baz", "value":"bar"} | A JSON Patch operation 'test' failed. The unsuccessful operation is also printed.
-
-@sa - @ref exception for the base class of the library exceptions
-@sa - @ref parse_error for exceptions indicating a parse error
-@sa - @ref invalid_iterator for exceptions indicating errors with iterators
-@sa - @ref type_error for exceptions indicating executing a member function with
-                    a wrong type
-@sa - @ref out_of_range for exceptions indicating access out of the defined range
-
-@liveexample{The following code shows how an `other_error` exception can be
-caught.,other_error}
-
-@since version 3.0.0
-*/
-class other_error : public exception
-{
-  public:
-    template<typename BasicJsonType>
-    static other_error create(int id_, const std::string& what_arg, const BasicJsonType& context)
-    {
-        std::string w = exception::name("other_error", id_) + exception::diagnostics(context) + what_arg;
-        return other_error(id_, w.c_str());
-    }
-
-  private:
-    JSON_HEDLEY_NON_NULL(3)
-    other_error(int id_, const char* what_arg) : exception(id_, what_arg) {}
-};
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/meta/cpp_future.hpp>
-
-
-#include <cstddef> // size_t
-#include <type_traits> // conditional, enable_if, false_type, integral_constant, is_constructible, is_integral, is_same, remove_cv, remove_reference, true_type
-#include <utility> // index_sequence, make_index_sequence, index_sequence_for
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-
-template<typename T>
-using uncvref_t = typename std::remove_cv<typename std::remove_reference<T>::type>::type;
-
-#ifdef JSON_HAS_CPP_14
-
-// the following utilities are natively available in C++14
-using std::enable_if_t;
-using std::index_sequence;
-using std::make_index_sequence;
-using std::index_sequence_for;
-
-#else
-
-// alias templates to reduce boilerplate
-template<bool B, typename T = void>
-using enable_if_t = typename std::enable_if<B, T>::type;
-
-// source: https://stackoverflow.com/a/32223343
-template<std::size_t... Ints>
-struct index_sequence
-{
-    using type = index_sequence;
-    using value_type = std::size_t;
-    static constexpr std::size_t size() noexcept
-    {
-        return sizeof...(Ints);
-    }
-};
+}  // namespace utility_internal
 
-template<class Sequence1, class Sequence2>
-struct merge_and_renumber;
+// Compile-time sequences of integers
 
-template<std::size_t... I1, std::size_t... I2>
-struct merge_and_renumber<index_sequence<I1...>, index_sequence<I2...>>
-        : index_sequence < I1..., (sizeof...(I1) + I2)... > {};
-
-template<std::size_t N>
-struct make_index_sequence
-    : merge_and_renumber < typename make_index_sequence < N / 2 >::type,
-      typename make_index_sequence < N - N / 2 >::type > {};
+// make_integer_sequence
+//
+// This template alias is equivalent to
+// `integer_sequence<int, 0, 1, ..., N-1>`, and is designed to be a drop-in
+// replacement for C++14's `std::make_integer_sequence`.
+template <typename T, T N>
+using make_integer_sequence = typename utility_internal::Gen<T, N>::type;
 
-template<> struct make_index_sequence<0> : index_sequence<> {};
-template<> struct make_index_sequence<1> : index_sequence<0> {};
+// make_index_sequence
+//
+// This template alias is equivalent to `index_sequence<0, 1, ..., N-1>`,
+// and is designed to be a drop-in replacement for C++14's
+// `std::make_index_sequence`.
+template <size_t N>
+using make_index_sequence = make_integer_sequence<size_t, N>;
 
-template<typename... Ts>
+// index_sequence_for
+//
+// Converts a typename pack into an index sequence of the same length, and
+// is designed to be a drop-in replacement for C++14's
+// `std::index_sequence_for()`
+template <typename... Ts>
 using index_sequence_for = make_index_sequence<sizeof...(Ts)>;
 
+//// END OF CODE FROM GOOGLE ABSEIL
+
 #endif
 
 // dispatch utility (taken from ranges-v3)
@@ -3084,50 +3210,64 @@ template<> struct priority_tag<0> {};
 template<typename T>
 struct static_const
 {
-    static constexpr T value{};
+    static JSON_INLINE_VARIABLE constexpr T value{};
 };
 
-template<typename T>
-constexpr T static_const<T>::value;
+#ifndef JSON_HAS_CPP_17
+    template<typename T>
+    constexpr T static_const<T>::value;
+#endif
+
+template<typename T, typename... Args>
+inline constexpr std::array<T, sizeof...(Args)> make_array(Args&& ... args)
+{
+    return std::array<T, sizeof...(Args)> {{static_cast<T>(std::forward<Args>(args))...}};
+}
 
 }  // namespace detail
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
 
 // #include <nlohmann/detail/meta/type_traits.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 
 
 #include <limits> // numeric_limits
 #include <type_traits> // false_type, is_constructible, is_integral, is_same, true_type
 #include <utility> // declval
 #include <tuple> // tuple
+#include <string> // char_traits
 
 // #include <nlohmann/detail/iterators/iterator_traits.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
 
 
-#include <iterator> // random_access_iterator_tag
 
-// #include <nlohmann/detail/meta/void_t.hpp>
+#include <iterator> // random_access_iterator_tag
 
+// #include <nlohmann/detail/abi_macros.hpp>
 
-namespace nlohmann
-{
-namespace detail
-{
-template<typename ...Ts> struct make_void
-{
-    using type = void;
-};
-template<typename ...Ts> using void_t = typename make_void<Ts...>::type;
-} // namespace detail
-}  // namespace nlohmann
+// #include <nlohmann/detail/meta/void_t.hpp>
 
 // #include <nlohmann/detail/meta/cpp_future.hpp>
 
 
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
+
 template<typename It, typename = void>
 struct iterator_types {};
 
@@ -3166,157 +3306,136 @@ struct iterator_traits<T*, enable_if_t<std::is_object<T>::value>>
     using pointer = T*;
     using reference = T&;
 };
-} // namespace detail
-} // namespace nlohmann
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
 
 // #include <nlohmann/detail/macro_scope.hpp>
 
-// #include <nlohmann/detail/meta/cpp_future.hpp>
+// #include <nlohmann/detail/meta/call_std/begin.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
 
-// #include <nlohmann/detail/meta/detected.hpp>
 
 
-#include <type_traits>
+// #include <nlohmann/detail/macro_scope.hpp>
 
-// #include <nlohmann/detail/meta/void_t.hpp>
 
+NLOHMANN_JSON_NAMESPACE_BEGIN
 
-// https://en.cppreference.com/w/cpp/experimental/is_detected
-namespace nlohmann
-{
-namespace detail
-{
-struct nonesuch
-{
-    nonesuch() = delete;
-    ~nonesuch() = delete;
-    nonesuch(nonesuch const&) = delete;
-    nonesuch(nonesuch const&&) = delete;
-    void operator=(nonesuch const&) = delete;
-    void operator=(nonesuch&&) = delete;
-};
+NLOHMANN_CAN_CALL_STD_FUNC_IMPL(begin);
 
-template<class Default,
-         class AlwaysVoid,
-         template<class...> class Op,
-         class... Args>
-struct detector
-{
-    using value_t = std::false_type;
-    using type = Default;
-};
+NLOHMANN_JSON_NAMESPACE_END
 
-template<class Default, template<class...> class Op, class... Args>
-struct detector<Default, void_t<Op<Args...>>, Op, Args...>
-{
-    using value_t = std::true_type;
-    using type = Op<Args...>;
-};
+// #include <nlohmann/detail/meta/call_std/end.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
 
-template<template<class...> class Op, class... Args>
-using is_detected = typename detector<nonesuch, void, Op, Args...>::value_t;
 
-template<template<class...> class Op, class... Args>
-using detected_t = typename detector<nonesuch, void, Op, Args...>::type;
 
-template<class Default, template<class...> class Op, class... Args>
-using detected_or = detector<Default, void, Op, Args...>;
+// #include <nlohmann/detail/macro_scope.hpp>
 
-template<class Default, template<class...> class Op, class... Args>
-using detected_or_t = typename detected_or<Default, Op, Args...>::type;
 
-template<class Expected, template<class...> class Op, class... Args>
-using is_detected_exact = std::is_same<Expected, detected_t<Op, Args...>>;
+NLOHMANN_JSON_NAMESPACE_BEGIN
 
-template<class To, template<class...> class Op, class... Args>
-using is_detected_convertible =
-    std::is_convertible<detected_t<Op, Args...>, To>;
-}  // namespace detail
-}  // namespace nlohmann
+NLOHMANN_CAN_CALL_STD_FUNC_IMPL(end);
 
-// #include <nlohmann/json_fwd.hpp>
-#ifndef INCLUDE_NLOHMANN_JSON_FWD_HPP_
-#define INCLUDE_NLOHMANN_JSON_FWD_HPP_
+NLOHMANN_JSON_NAMESPACE_END
 
-#include <cstdint> // int64_t, uint64_t
-#include <map> // map
-#include <memory> // allocator
-#include <string> // string
-#include <vector> // vector
+// #include <nlohmann/detail/meta/cpp_future.hpp>
 
-/*!
-@brief namespace for Niels Lohmann
-@see https://github.com/nlohmann
-@since version 1.0.0
-*/
-namespace nlohmann
-{
-/*!
-@brief default JSONSerializer template argument
+// #include <nlohmann/detail/meta/detected.hpp>
 
-This serializer ignores the template arguments and uses ADL
-([argument-dependent lookup](https://en.cppreference.com/w/cpp/language/adl))
-for serialization.
-*/
-template<typename T = void, typename SFINAE = void>
-struct adl_serializer;
-
-template<template<typename U, typename V, typename... Args> class ObjectType =
-         std::map,
-         template<typename U, typename... Args> class ArrayType = std::vector,
-         class StringType = std::string, class BooleanType = bool,
-         class NumberIntegerType = std::int64_t,
-         class NumberUnsignedType = std::uint64_t,
-         class NumberFloatType = double,
-         template<typename U> class AllocatorType = std::allocator,
-         template<typename T, typename SFINAE = void> class JSONSerializer =
-         adl_serializer,
-         class BinaryType = std::vector<std::uint8_t>>
-class basic_json;
+// #include <nlohmann/json_fwd.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
 
-/*!
-@brief JSON Pointer
+#ifndef INCLUDE_NLOHMANN_JSON_FWD_HPP_
+    #define INCLUDE_NLOHMANN_JSON_FWD_HPP_
 
-A JSON pointer defines a string syntax for identifying a specific value
-within a JSON document. It can be used with functions `at` and
-`operator[]`. Furthermore, JSON pointers are the base for JSON patches.
+    #include <cstdint> // int64_t, uint64_t
+    #include <map> // map
+    #include <memory> // allocator
+    #include <string> // string
+    #include <vector> // vector
 
-@sa [RFC 6901](https://tools.ietf.org/html/rfc6901)
+    // #include <nlohmann/detail/abi_macros.hpp>
 
-@since version 2.0.0
-*/
-template<typename BasicJsonType>
-class json_pointer;
 
-/*!
-@brief default JSON class
+    /*!
+    @brief namespace for Niels Lohmann
+    @see https://github.com/nlohmann
+    @since version 1.0.0
+    */
+    NLOHMANN_JSON_NAMESPACE_BEGIN
 
-This type is the default specialization of the @ref basic_json class which
-uses the standard template types.
+    /*!
+    @brief default JSONSerializer template argument
 
-@since version 1.0.0
-*/
-using json = basic_json<>;
+    This serializer ignores the template arguments and uses ADL
+    ([argument-dependent lookup](https://en.cppreference.com/w/cpp/language/adl))
+    for serialization.
+    */
+    template<typename T = void, typename SFINAE = void>
+    struct adl_serializer;
 
-template<class Key, class T, class IgnoredLess, class Allocator>
-struct ordered_map;
+    /// a class to store JSON values
+    /// @sa https://json.nlohmann.me/api/basic_json/
+    template<template<typename U, typename V, typename... Args> class ObjectType =
+    std::map,
+    template<typename U, typename... Args> class ArrayType = std::vector,
+    class StringType = std::string, class BooleanType = bool,
+    class NumberIntegerType = std::int64_t,
+    class NumberUnsignedType = std::uint64_t,
+    class NumberFloatType = double,
+    template<typename U> class AllocatorType = std::allocator,
+    template<typename T, typename SFINAE = void> class JSONSerializer =
+    adl_serializer,
+    class BinaryType = std::vector<std::uint8_t>, // cppcheck-suppress syntaxError
+    class CustomBaseClass = void>
+    class basic_json;
 
-/*!
-@brief ordered JSON class
+    /// @brief JSON Pointer defines a string syntax for identifying a specific value within a JSON document
+    /// @sa https://json.nlohmann.me/api/json_pointer/
+    template<typename RefStringType>
+    class json_pointer;
+
+    /*!
+    @brief default specialization
+    @sa https://json.nlohmann.me/api/json/
+    */
+    using json = basic_json<>;
 
-This type preserves the insertion order of object keys.
+    /// @brief a minimal map-like container that preserves insertion order
+    /// @sa https://json.nlohmann.me/api/ordered_map/
+    template<class Key, class T, class IgnoredLess, class Allocator>
+    struct ordered_map;
 
-@since version 3.9.0
-*/
-using ordered_json = basic_json<nlohmann::ordered_map>;
+    /// @brief specialization that maintains the insertion order of object keys
+    /// @sa https://json.nlohmann.me/api/ordered_json/
+    using ordered_json = basic_json<nlohmann::ordered_map>;
 
-}  // namespace nlohmann
+    NLOHMANN_JSON_NAMESPACE_END
 
 #endif  // INCLUDE_NLOHMANN_JSON_FWD_HPP_
 
 
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 /*!
 @brief detail namespace with internal helper functions
 
@@ -3327,6 +3446,7 @@ implementations of some @ref basic_json methods, and meta-programming helpers.
 */
 namespace detail
 {
+
 /////////////
 // helpers //
 /////////////
@@ -3345,6 +3465,16 @@ template<typename> struct is_basic_json : std::false_type {};
 NLOHMANN_BASIC_JSON_TPL_DECLARATION
 struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {};
 
+// used by exceptions create() member functions
+// true_type for pointer to possibly cv-qualified basic_json or std::nullptr_t
+// false_type otherwise
+template<typename BasicJsonContext>
+struct is_basic_json_context :
+    std::integral_constant < bool,
+    is_basic_json<typename std::remove_cv<typename std::remove_pointer<BasicJsonContext>::type>::type>::value
+    || std::is_same<BasicJsonContext, std::nullptr_t>::value >
+{};
+
 //////////////////////
 // json_ref helpers //
 //////////////////////
@@ -3383,9 +3513,6 @@ using reference_t = typename T::reference;
 template<typename T>
 using iterator_category_t = typename T::iterator_category;
 
-template<typename T>
-using iterator_t = typename T::iterator;
-
 template<typename T, typename... Args>
 using to_json_function = decltype(T::to_json(std::declval<Args>()...));
 
@@ -3410,8 +3537,7 @@ struct is_getable
 };
 
 template<typename BasicJsonType, typename T>
-struct has_from_json < BasicJsonType, T,
-           enable_if_t < !is_basic_json<T>::value >>
+struct has_from_json < BasicJsonType, T, enable_if_t < !is_basic_json<T>::value >>
 {
     using serializer = typename BasicJsonType::template json_serializer<T, void>;
 
@@ -3450,11 +3576,133 @@ struct has_to_json < BasicJsonType, T, enable_if_t < !is_basic_json<T>::value >>
         T>::value;
 };
 
+template<typename T>
+using detect_key_compare = typename T::key_compare;
+
+template<typename T>
+struct has_key_compare : std::integral_constant<bool, is_detected<detect_key_compare, T>::value> {};
+
+// obtains the actual object key comparator
+template<typename BasicJsonType>
+struct actual_object_comparator
+{
+    using object_t = typename BasicJsonType::object_t;
+    using object_comparator_t = typename BasicJsonType::default_object_comparator_t;
+    using type = typename std::conditional < has_key_compare<object_t>::value,
+          typename object_t::key_compare, object_comparator_t>::type;
+};
+
+template<typename BasicJsonType>
+using actual_object_comparator_t = typename actual_object_comparator<BasicJsonType>::type;
+
+/////////////////
+// char_traits //
+/////////////////
+
+// Primary template of char_traits calls std char_traits
+template<typename T>
+struct char_traits : std::char_traits<T>
+{};
+
+// Explicitly define char traits for unsigned char since it is not standard
+template<>
+struct char_traits<unsigned char> : std::char_traits<char>
+{
+    using char_type = unsigned char;
+    using int_type = uint64_t;
+
+    // Redefine to_int_type function
+    static int_type to_int_type(char_type c) noexcept
+    {
+        return static_cast<int_type>(c);
+    }
+
+    static char_type to_char_type(int_type i) noexcept
+    {
+        return static_cast<char_type>(i);
+    }
+
+    static constexpr int_type eof() noexcept
+    {
+        return static_cast<int_type>(EOF);
+    }
+};
+
+// Explicitly define char traits for signed char since it is not standard
+template<>
+struct char_traits<signed char> : std::char_traits<char>
+{
+    using char_type = signed char;
+    using int_type = uint64_t;
+
+    // Redefine to_int_type function
+    static int_type to_int_type(char_type c) noexcept
+    {
+        return static_cast<int_type>(c);
+    }
+
+    static char_type to_char_type(int_type i) noexcept
+    {
+        return static_cast<char_type>(i);
+    }
+
+    static constexpr int_type eof() noexcept
+    {
+        return static_cast<int_type>(EOF);
+    }
+};
 
 ///////////////////
 // is_ functions //
 ///////////////////
 
+// https://en.cppreference.com/w/cpp/types/conjunction
+template<class...> struct conjunction : std::true_type { };
+template<class B> struct conjunction<B> : B { };
+template<class B, class... Bn>
+struct conjunction<B, Bn...>
+: std::conditional<static_cast<bool>(B::value), conjunction<Bn...>, B>::type {};
+
+// https://en.cppreference.com/w/cpp/types/negation
+template<class B> struct negation : std::integral_constant < bool, !B::value > { };
+
+// Reimplementation of is_constructible and is_default_constructible, due to them being broken for
+// std::pair and std::tuple until LWG 2367 fix (see https://cplusplus.github.io/LWG/lwg-defects.html#2367).
+// This causes compile errors in e.g. clang 3.5 or gcc 4.9.
+template <typename T>
+struct is_default_constructible : std::is_default_constructible<T> {};
+
+template <typename T1, typename T2>
+struct is_default_constructible<std::pair<T1, T2>>
+            : conjunction<is_default_constructible<T1>, is_default_constructible<T2>> {};
+
+template <typename T1, typename T2>
+struct is_default_constructible<const std::pair<T1, T2>>
+            : conjunction<is_default_constructible<T1>, is_default_constructible<T2>> {};
+
+template <typename... Ts>
+struct is_default_constructible<std::tuple<Ts...>>
+            : conjunction<is_default_constructible<Ts>...> {};
+
+template <typename... Ts>
+struct is_default_constructible<const std::tuple<Ts...>>
+            : conjunction<is_default_constructible<Ts>...> {};
+
+template <typename T, typename... Args>
+struct is_constructible : std::is_constructible<T, Args...> {};
+
+template <typename T1, typename T2>
+struct is_constructible<std::pair<T1, T2>> : is_default_constructible<std::pair<T1, T2>> {};
+
+template <typename T1, typename T2>
+struct is_constructible<const std::pair<T1, T2>> : is_default_constructible<const std::pair<T1, T2>> {};
+
+template <typename... Ts>
+struct is_constructible<std::tuple<Ts...>> : is_default_constructible<std::tuple<Ts...>> {};
+
+template <typename... Ts>
+struct is_constructible<const std::tuple<Ts...>> : is_default_constructible<const std::tuple<Ts...>> {};
+
 template<typename T, typename = void>
 struct is_iterator_traits : std::false_type {};
 
@@ -3473,8 +3721,33 @@ struct is_iterator_traits<iterator_traits<T>>
         is_detected<reference_t, traits>::value;
 };
 
-// The following implementation of is_complete_type is taken from
-// https://blogs.msdn.microsoft.com/vcblog/2015/12/02/partial-support-for-expression-sfinae-in-vs-2015-update-1/
+template<typename T>
+struct is_range
+{
+  private:
+    using t_ref = typename std::add_lvalue_reference<T>::type;
+
+    using iterator = detected_t<result_of_begin, t_ref>;
+    using sentinel = detected_t<result_of_end, t_ref>;
+
+    // to be 100% correct, it should use https://en.cppreference.com/w/cpp/iterator/input_or_output_iterator
+    // and https://en.cppreference.com/w/cpp/iterator/sentinel_for
+    // but reimplementing these would be too much work, as a lot of other concepts are used underneath
+    static constexpr auto is_iterator_begin =
+        is_iterator_traits<iterator_traits<iterator>>::value;
+
+  public:
+    static constexpr bool value = !std::is_same<iterator, nonesuch>::value && !std::is_same<sentinel, nonesuch>::value && is_iterator_begin;
+};
+
+template<typename R>
+using iterator_t = enable_if_t<is_range<R>::value, result_of_begin<decltype(std::declval<R&>())>>;
+
+template<typename T>
+using range_value_t = value_type_t<iterator_traits<iterator_t<T>>>;
+
+// The following implementation of is_complete_type is taken from
+// https://blogs.msdn.microsoft.com/vcblog/2015/12/02/partial-support-for-expression-sfinae-in-vs-2015-update-1/
 // and is written by Xiang Fan who agreed to using it in this library.
 
 template<typename T, typename = void>
@@ -3497,9 +3770,9 @@ struct is_compatible_object_type_impl <
 
     // macOS's is_constructible does not play well with nonesuch...
     static constexpr bool value =
-        std::is_constructible<typename object_t::key_type,
+        is_constructible<typename object_t::key_type,
         typename CompatibleObjectType::key_type>::value &&
-        std::is_constructible<typename object_t::mapped_type,
+        is_constructible<typename object_t::mapped_type,
         typename CompatibleObjectType::mapped_type>::value;
 };
 
@@ -3520,10 +3793,10 @@ struct is_constructible_object_type_impl <
     using object_t = typename BasicJsonType::object_t;
 
     static constexpr bool value =
-        (std::is_default_constructible<ConstructibleObjectType>::value &&
+        (is_default_constructible<ConstructibleObjectType>::value &&
          (std::is_move_assignable<ConstructibleObjectType>::value ||
           std::is_copy_assignable<ConstructibleObjectType>::value) &&
-         (std::is_constructible<typename ConstructibleObjectType::key_type,
+         (is_constructible<typename ConstructibleObjectType::key_type,
           typename object_t::key_type>::value &&
           std::is_same <
           typename object_t::mapped_type,
@@ -3540,180 +3813,859 @@ struct is_constructible_object_type
     : is_constructible_object_type_impl<BasicJsonType,
       ConstructibleObjectType> {};
 
-template<typename BasicJsonType, typename CompatibleStringType,
-         typename = void>
-struct is_compatible_string_type_impl : std::false_type {};
-
 template<typename BasicJsonType, typename CompatibleStringType>
-struct is_compatible_string_type_impl <
-    BasicJsonType, CompatibleStringType,
-    enable_if_t<is_detected_exact<typename BasicJsonType::string_t::value_type,
-    value_type_t, CompatibleStringType>::value >>
+struct is_compatible_string_type
 {
     static constexpr auto value =
-        std::is_constructible<typename BasicJsonType::string_t, CompatibleStringType>::value;
+        is_constructible<typename BasicJsonType::string_t, CompatibleStringType>::value;
 };
 
 template<typename BasicJsonType, typename ConstructibleStringType>
-struct is_compatible_string_type
-    : is_compatible_string_type_impl<BasicJsonType, ConstructibleStringType> {};
+struct is_constructible_string_type
+{
+    // launder type through decltype() to fix compilation failure on ICPC
+#ifdef __INTEL_COMPILER
+    using laundered_type = decltype(std::declval<ConstructibleStringType>());
+#else
+    using laundered_type = ConstructibleStringType;
+#endif
+
+    static constexpr auto value =
+        conjunction <
+        is_constructible<laundered_type, typename BasicJsonType::string_t>,
+        is_detected_exact<typename BasicJsonType::string_t::value_type,
+        value_type_t, laundered_type >>::value;
+};
 
-template<typename BasicJsonType, typename ConstructibleStringType,
+template<typename BasicJsonType, typename CompatibleArrayType, typename = void>
+struct is_compatible_array_type_impl : std::false_type {};
+
+template<typename BasicJsonType, typename CompatibleArrayType>
+struct is_compatible_array_type_impl <
+    BasicJsonType, CompatibleArrayType,
+    enable_if_t <
+    is_detected<iterator_t, CompatibleArrayType>::value&&
+    is_iterator_traits<iterator_traits<detected_t<iterator_t, CompatibleArrayType>>>::value&&
+// special case for types like std::filesystem::path whose iterator's value_type are themselves
+// c.f. https://github.com/nlohmann/json/pull/3073
+    !std::is_same<CompatibleArrayType, detected_t<range_value_t, CompatibleArrayType>>::value >>
+{
+    static constexpr bool value =
+        is_constructible<BasicJsonType,
+        range_value_t<CompatibleArrayType>>::value;
+};
+
+template<typename BasicJsonType, typename CompatibleArrayType>
+struct is_compatible_array_type
+    : is_compatible_array_type_impl<BasicJsonType, CompatibleArrayType> {};
+
+template<typename BasicJsonType, typename ConstructibleArrayType, typename = void>
+struct is_constructible_array_type_impl : std::false_type {};
+
+template<typename BasicJsonType, typename ConstructibleArrayType>
+struct is_constructible_array_type_impl <
+    BasicJsonType, ConstructibleArrayType,
+    enable_if_t<std::is_same<ConstructibleArrayType,
+    typename BasicJsonType::value_type>::value >>
+            : std::true_type {};
+
+template<typename BasicJsonType, typename ConstructibleArrayType>
+struct is_constructible_array_type_impl <
+    BasicJsonType, ConstructibleArrayType,
+    enable_if_t < !std::is_same<ConstructibleArrayType,
+    typename BasicJsonType::value_type>::value&&
+    !is_compatible_string_type<BasicJsonType, ConstructibleArrayType>::value&&
+    is_default_constructible<ConstructibleArrayType>::value&&
+(std::is_move_assignable<ConstructibleArrayType>::value ||
+ std::is_copy_assignable<ConstructibleArrayType>::value)&&
+is_detected<iterator_t, ConstructibleArrayType>::value&&
+is_iterator_traits<iterator_traits<detected_t<iterator_t, ConstructibleArrayType>>>::value&&
+is_detected<range_value_t, ConstructibleArrayType>::value&&
+// special case for types like std::filesystem::path whose iterator's value_type are themselves
+// c.f. https://github.com/nlohmann/json/pull/3073
+!std::is_same<ConstructibleArrayType, detected_t<range_value_t, ConstructibleArrayType>>::value&&
+        is_complete_type <
+        detected_t<range_value_t, ConstructibleArrayType >>::value >>
+{
+    using value_type = range_value_t<ConstructibleArrayType>;
+
+    static constexpr bool value =
+        std::is_same<value_type,
+        typename BasicJsonType::array_t::value_type>::value ||
+        has_from_json<BasicJsonType,
+        value_type>::value ||
+        has_non_default_from_json <
+        BasicJsonType,
+        value_type >::value;
+};
+
+template<typename BasicJsonType, typename ConstructibleArrayType>
+struct is_constructible_array_type
+    : is_constructible_array_type_impl<BasicJsonType, ConstructibleArrayType> {};
+
+template<typename RealIntegerType, typename CompatibleNumberIntegerType,
          typename = void>
-struct is_constructible_string_type_impl : std::false_type {};
+struct is_compatible_integer_type_impl : std::false_type {};
+
+template<typename RealIntegerType, typename CompatibleNumberIntegerType>
+struct is_compatible_integer_type_impl <
+    RealIntegerType, CompatibleNumberIntegerType,
+    enable_if_t < std::is_integral<RealIntegerType>::value&&
+    std::is_integral<CompatibleNumberIntegerType>::value&&
+    !std::is_same<bool, CompatibleNumberIntegerType>::value >>
+{
+    // is there an assert somewhere on overflows?
+    using RealLimits = std::numeric_limits<RealIntegerType>;
+    using CompatibleLimits = std::numeric_limits<CompatibleNumberIntegerType>;
+
+    static constexpr auto value =
+        is_constructible<RealIntegerType,
+        CompatibleNumberIntegerType>::value &&
+        CompatibleLimits::is_integer &&
+        RealLimits::is_signed == CompatibleLimits::is_signed;
+};
+
+template<typename RealIntegerType, typename CompatibleNumberIntegerType>
+struct is_compatible_integer_type
+    : is_compatible_integer_type_impl<RealIntegerType,
+      CompatibleNumberIntegerType> {};
+
+template<typename BasicJsonType, typename CompatibleType, typename = void>
+struct is_compatible_type_impl: std::false_type {};
+
+template<typename BasicJsonType, typename CompatibleType>
+struct is_compatible_type_impl <
+    BasicJsonType, CompatibleType,
+    enable_if_t<is_complete_type<CompatibleType>::value >>
+{
+    static constexpr bool value =
+        has_to_json<BasicJsonType, CompatibleType>::value;
+};
+
+template<typename BasicJsonType, typename CompatibleType>
+struct is_compatible_type
+    : is_compatible_type_impl<BasicJsonType, CompatibleType> {};
+
+template<typename T1, typename T2>
+struct is_constructible_tuple : std::false_type {};
+
+template<typename T1, typename... Args>
+struct is_constructible_tuple<T1, std::tuple<Args...>> : conjunction<is_constructible<T1, Args>...> {};
+
+template<typename BasicJsonType, typename T>
+struct is_json_iterator_of : std::false_type {};
+
+template<typename BasicJsonType>
+struct is_json_iterator_of<BasicJsonType, typename BasicJsonType::iterator> : std::true_type {};
+
+template<typename BasicJsonType>
+struct is_json_iterator_of<BasicJsonType, typename BasicJsonType::const_iterator> : std::true_type
+{};
+
+// checks if a given type T is a template specialization of Primary
+template<template <typename...> class Primary, typename T>
+struct is_specialization_of : std::false_type {};
+
+template<template <typename...> class Primary, typename... Args>
+struct is_specialization_of<Primary, Primary<Args...>> : std::true_type {};
+
+template<typename T>
+using is_json_pointer = is_specialization_of<::nlohmann::json_pointer, uncvref_t<T>>;
+
+// checks if A and B are comparable using Compare functor
+template<typename Compare, typename A, typename B, typename = void>
+struct is_comparable : std::false_type {};
+
+template<typename Compare, typename A, typename B>
+struct is_comparable<Compare, A, B, void_t<
+decltype(std::declval<Compare>()(std::declval<A>(), std::declval<B>())),
+decltype(std::declval<Compare>()(std::declval<B>(), std::declval<A>()))
+>> : std::true_type {};
+
+template<typename T>
+using detect_is_transparent = typename T::is_transparent;
+
+// type trait to check if KeyType can be used as object key (without a BasicJsonType)
+// see is_usable_as_basic_json_key_type below
+template<typename Comparator, typename ObjectKeyType, typename KeyTypeCVRef, bool RequireTransparentComparator = true,
+         bool ExcludeObjectKeyType = RequireTransparentComparator, typename KeyType = uncvref_t<KeyTypeCVRef>>
+using is_usable_as_key_type = typename std::conditional <
+                              is_comparable<Comparator, ObjectKeyType, KeyTypeCVRef>::value
+                              && !(ExcludeObjectKeyType && std::is_same<KeyType,
+                                   ObjectKeyType>::value)
+                              && (!RequireTransparentComparator
+                                  || is_detected <detect_is_transparent, Comparator>::value)
+                              && !is_json_pointer<KeyType>::value,
+                              std::true_type,
+                              std::false_type >::type;
+
+// type trait to check if KeyType can be used as object key
+// true if:
+//   - KeyType is comparable with BasicJsonType::object_t::key_type
+//   - if ExcludeObjectKeyType is true, KeyType is not BasicJsonType::object_t::key_type
+//   - the comparator is transparent or RequireTransparentComparator is false
+//   - KeyType is not a JSON iterator or json_pointer
+template<typename BasicJsonType, typename KeyTypeCVRef, bool RequireTransparentComparator = true,
+         bool ExcludeObjectKeyType = RequireTransparentComparator, typename KeyType = uncvref_t<KeyTypeCVRef>>
+using is_usable_as_basic_json_key_type = typename std::conditional <
+        is_usable_as_key_type<typename BasicJsonType::object_comparator_t,
+        typename BasicJsonType::object_t::key_type, KeyTypeCVRef,
+        RequireTransparentComparator, ExcludeObjectKeyType>::value
+        && !is_json_iterator_of<BasicJsonType, KeyType>::value,
+        std::true_type,
+        std::false_type >::type;
+
+template<typename ObjectType, typename KeyType>
+using detect_erase_with_key_type = decltype(std::declval<ObjectType&>().erase(std::declval<KeyType>()));
+
+// type trait to check if object_t has an erase() member functions accepting KeyType
+template<typename BasicJsonType, typename KeyType>
+using has_erase_with_key_type = typename std::conditional <
+                                is_detected <
+                                detect_erase_with_key_type,
+                                typename BasicJsonType::object_t, KeyType >::value,
+                                std::true_type,
+                                std::false_type >::type;
+
+// a naive helper to check if a type is an ordered_map (exploits the fact that
+// ordered_map inherits capacity() from std::vector)
+template <typename T>
+struct is_ordered_map
+{
+    using one = char;
+
+    struct two
+    {
+        char x[2]; // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+    };
+
+    template <typename C> static one test( decltype(&C::capacity) ) ;
+    template <typename C> static two test(...);
+
+    enum { value = sizeof(test<T>(nullptr)) == sizeof(char) }; // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+};
+
+// to avoid useless casts (see https://github.com/nlohmann/json/issues/2893#issuecomment-889152324)
+template < typename T, typename U, enable_if_t < !std::is_same<T, U>::value, int > = 0 >
+T conditional_static_cast(U value)
+{
+    return static_cast<T>(value);
+}
+
+template<typename T, typename U, enable_if_t<std::is_same<T, U>::value, int> = 0>
+T conditional_static_cast(U value)
+{
+    return value;
+}
+
+template<typename... Types>
+using all_integral = conjunction<std::is_integral<Types>...>;
+
+template<typename... Types>
+using all_signed = conjunction<std::is_signed<Types>...>;
+
+template<typename... Types>
+using all_unsigned = conjunction<std::is_unsigned<Types>...>;
+
+// there's a disjunction trait in another PR; replace when merged
+template<typename... Types>
+using same_sign = std::integral_constant < bool,
+      all_signed<Types...>::value || all_unsigned<Types...>::value >;
+
+template<typename OfType, typename T>
+using never_out_of_range = std::integral_constant < bool,
+      (std::is_signed<OfType>::value && (sizeof(T) < sizeof(OfType)))
+      || (same_sign<OfType, T>::value && sizeof(OfType) == sizeof(T)) >;
+
+template<typename OfType, typename T,
+         bool OfTypeSigned = std::is_signed<OfType>::value,
+         bool TSigned = std::is_signed<T>::value>
+struct value_in_range_of_impl2;
+
+template<typename OfType, typename T>
+struct value_in_range_of_impl2<OfType, T, false, false>
+{
+    static constexpr bool test(T val)
+    {
+        using CommonType = typename std::common_type<OfType, T>::type;
+        return static_cast<CommonType>(val) <= static_cast<CommonType>((std::numeric_limits<OfType>::max)());
+    }
+};
+
+template<typename OfType, typename T>
+struct value_in_range_of_impl2<OfType, T, true, false>
+{
+    static constexpr bool test(T val)
+    {
+        using CommonType = typename std::common_type<OfType, T>::type;
+        return static_cast<CommonType>(val) <= static_cast<CommonType>((std::numeric_limits<OfType>::max)());
+    }
+};
+
+template<typename OfType, typename T>
+struct value_in_range_of_impl2<OfType, T, false, true>
+{
+    static constexpr bool test(T val)
+    {
+        using CommonType = typename std::common_type<OfType, T>::type;
+        return val >= 0 && static_cast<CommonType>(val) <= static_cast<CommonType>((std::numeric_limits<OfType>::max)());
+    }
+};
+
+template<typename OfType, typename T>
+struct value_in_range_of_impl2<OfType, T, true, true>
+{
+    static constexpr bool test(T val)
+    {
+        using CommonType = typename std::common_type<OfType, T>::type;
+        return static_cast<CommonType>(val) >= static_cast<CommonType>((std::numeric_limits<OfType>::min)())
+               && static_cast<CommonType>(val) <= static_cast<CommonType>((std::numeric_limits<OfType>::max)());
+    }
+};
+
+template<typename OfType, typename T,
+         bool NeverOutOfRange = never_out_of_range<OfType, T>::value,
+         typename = detail::enable_if_t<all_integral<OfType, T>::value>>
+struct value_in_range_of_impl1;
+
+template<typename OfType, typename T>
+struct value_in_range_of_impl1<OfType, T, false>
+{
+    static constexpr bool test(T val)
+    {
+        return value_in_range_of_impl2<OfType, T>::test(val);
+    }
+};
+
+template<typename OfType, typename T>
+struct value_in_range_of_impl1<OfType, T, true>
+{
+    static constexpr bool test(T /*val*/)
+    {
+        return true;
+    }
+};
+
+template<typename OfType, typename T>
+inline constexpr bool value_in_range_of(T val)
+{
+    return value_in_range_of_impl1<OfType, T>::test(val);
+}
+
+template<bool Value>
+using bool_constant = std::integral_constant<bool, Value>;
+
+///////////////////////////////////////////////////////////////////////////////
+// is_c_string
+///////////////////////////////////////////////////////////////////////////////
+
+namespace impl
+{
+
+template<typename T>
+inline constexpr bool is_c_string()
+{
+    using TUnExt = typename std::remove_extent<T>::type;
+    using TUnCVExt = typename std::remove_cv<TUnExt>::type;
+    using TUnPtr = typename std::remove_pointer<T>::type;
+    using TUnCVPtr = typename std::remove_cv<TUnPtr>::type;
+    return
+        (std::is_array<T>::value && std::is_same<TUnCVExt, char>::value)
+        || (std::is_pointer<T>::value && std::is_same<TUnCVPtr, char>::value);
+}
+
+}  // namespace impl
+
+// checks whether T is a [cv] char */[cv] char[] C string
+template<typename T>
+struct is_c_string : bool_constant<impl::is_c_string<T>()> {};
+
+template<typename T>
+using is_c_string_uncvref = is_c_string<uncvref_t<T>>;
+
+///////////////////////////////////////////////////////////////////////////////
+// is_transparent
+///////////////////////////////////////////////////////////////////////////////
+
+namespace impl
+{
+
+template<typename T>
+inline constexpr bool is_transparent()
+{
+    return is_detected<detect_is_transparent, T>::value;
+}
+
+}  // namespace impl
+
+// checks whether T has a member named is_transparent
+template<typename T>
+struct is_transparent : bool_constant<impl::is_transparent<T>()> {};
+
+///////////////////////////////////////////////////////////////////////////////
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/string_concat.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstring> // strlen
+#include <string> // string
+#include <utility> // forward
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/detected.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+inline std::size_t concat_length()
+{
+    return 0;
+}
+
+template<typename... Args>
+inline std::size_t concat_length(const char* cstr, const Args& ... rest);
+
+template<typename StringType, typename... Args>
+inline std::size_t concat_length(const StringType& str, const Args& ... rest);
+
+template<typename... Args>
+inline std::size_t concat_length(const char /*c*/, const Args& ... rest)
+{
+    return 1 + concat_length(rest...);
+}
+
+template<typename... Args>
+inline std::size_t concat_length(const char* cstr, const Args& ... rest)
+{
+    // cppcheck-suppress ignoredReturnValue
+    return ::strlen(cstr) + concat_length(rest...);
+}
+
+template<typename StringType, typename... Args>
+inline std::size_t concat_length(const StringType& str, const Args& ... rest)
+{
+    return str.size() + concat_length(rest...);
+}
+
+template<typename OutStringType>
+inline void concat_into(OutStringType& /*out*/)
+{}
+
+template<typename StringType, typename Arg>
+using string_can_append = decltype(std::declval<StringType&>().append(std::declval < Arg && > ()));
+
+template<typename StringType, typename Arg>
+using detect_string_can_append = is_detected<string_can_append, StringType, Arg>;
+
+template<typename StringType, typename Arg>
+using string_can_append_op = decltype(std::declval<StringType&>() += std::declval < Arg && > ());
+
+template<typename StringType, typename Arg>
+using detect_string_can_append_op = is_detected<string_can_append_op, StringType, Arg>;
+
+template<typename StringType, typename Arg>
+using string_can_append_iter = decltype(std::declval<StringType&>().append(std::declval<const Arg&>().begin(), std::declval<const Arg&>().end()));
+
+template<typename StringType, typename Arg>
+using detect_string_can_append_iter = is_detected<string_can_append_iter, StringType, Arg>;
+
+template<typename StringType, typename Arg>
+using string_can_append_data = decltype(std::declval<StringType&>().append(std::declval<const Arg&>().data(), std::declval<const Arg&>().size()));
+
+template<typename StringType, typename Arg>
+using detect_string_can_append_data = is_detected<string_can_append_data, StringType, Arg>;
+
+template < typename OutStringType, typename Arg, typename... Args,
+           enable_if_t < !detect_string_can_append<OutStringType, Arg>::value
+                         && detect_string_can_append_op<OutStringType, Arg>::value, int > = 0 >
+inline void concat_into(OutStringType& out, Arg && arg, Args && ... rest);
+
+template < typename OutStringType, typename Arg, typename... Args,
+           enable_if_t < !detect_string_can_append<OutStringType, Arg>::value
+                         && !detect_string_can_append_op<OutStringType, Arg>::value
+                         && detect_string_can_append_iter<OutStringType, Arg>::value, int > = 0 >
+inline void concat_into(OutStringType& out, const Arg& arg, Args && ... rest);
+
+template < typename OutStringType, typename Arg, typename... Args,
+           enable_if_t < !detect_string_can_append<OutStringType, Arg>::value
+                         && !detect_string_can_append_op<OutStringType, Arg>::value
+                         && !detect_string_can_append_iter<OutStringType, Arg>::value
+                         && detect_string_can_append_data<OutStringType, Arg>::value, int > = 0 >
+inline void concat_into(OutStringType& out, const Arg& arg, Args && ... rest);
+
+template<typename OutStringType, typename Arg, typename... Args,
+         enable_if_t<detect_string_can_append<OutStringType, Arg>::value, int> = 0>
+inline void concat_into(OutStringType& out, Arg && arg, Args && ... rest)
+{
+    out.append(std::forward<Arg>(arg));
+    concat_into(out, std::forward<Args>(rest)...);
+}
+
+template < typename OutStringType, typename Arg, typename... Args,
+           enable_if_t < !detect_string_can_append<OutStringType, Arg>::value
+                         && detect_string_can_append_op<OutStringType, Arg>::value, int > >
+inline void concat_into(OutStringType& out, Arg&& arg, Args&& ... rest)
+{
+    out += std::forward<Arg>(arg);
+    concat_into(out, std::forward<Args>(rest)...);
+}
+
+template < typename OutStringType, typename Arg, typename... Args,
+           enable_if_t < !detect_string_can_append<OutStringType, Arg>::value
+                         && !detect_string_can_append_op<OutStringType, Arg>::value
+                         && detect_string_can_append_iter<OutStringType, Arg>::value, int > >
+inline void concat_into(OutStringType& out, const Arg& arg, Args&& ... rest)
+{
+    out.append(arg.begin(), arg.end());
+    concat_into(out, std::forward<Args>(rest)...);
+}
+
+template < typename OutStringType, typename Arg, typename... Args,
+           enable_if_t < !detect_string_can_append<OutStringType, Arg>::value
+                         && !detect_string_can_append_op<OutStringType, Arg>::value
+                         && !detect_string_can_append_iter<OutStringType, Arg>::value
+                         && detect_string_can_append_data<OutStringType, Arg>::value, int > >
+inline void concat_into(OutStringType& out, const Arg& arg, Args&& ... rest)
+{
+    out.append(arg.data(), arg.size());
+    concat_into(out, std::forward<Args>(rest)...);
+}
+
+template<typename OutStringType = std::string, typename... Args>
+inline OutStringType concat(Args && ... args)
+{
+    OutStringType str;
+    str.reserve(concat_length(args...));
+    concat_into(str, std::forward<Args>(args)...);
+    return str;
+}
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+////////////////
+// exceptions //
+////////////////
+
+/// @brief general exception of the @ref basic_json class
+/// @sa https://json.nlohmann.me/api/basic_json/exception/
+class exception : public std::exception
+{
+  public:
+    /// returns the explanatory string
+    const char* what() const noexcept override
+    {
+        return m.what();
+    }
+
+    /// the id of the exception
+    const int id; // NOLINT(cppcoreguidelines-non-private-member-variables-in-classes)
+
+  protected:
+    JSON_HEDLEY_NON_NULL(3)
+    exception(int id_, const char* what_arg) : id(id_), m(what_arg) {} // NOLINT(bugprone-throw-keyword-missing)
+
+    static std::string name(const std::string& ename, int id_)
+    {
+        return concat("[json.exception.", ename, '.', std::to_string(id_), "] ");
+    }
+
+    static std::string diagnostics(std::nullptr_t /*leaf_element*/)
+    {
+        return "";
+    }
+
+    template<typename BasicJsonType>
+    static std::string diagnostics(const BasicJsonType* leaf_element)
+    {
+#if JSON_DIAGNOSTICS
+        std::vector<std::string> tokens;
+        for (const auto* current = leaf_element; current != nullptr && current->m_parent != nullptr; current = current->m_parent)
+        {
+            switch (current->m_parent->type())
+            {
+                case value_t::array:
+                {
+                    for (std::size_t i = 0; i < current->m_parent->m_data.m_value.array->size(); ++i)
+                    {
+                        if (&current->m_parent->m_data.m_value.array->operator[](i) == current)
+                        {
+                            tokens.emplace_back(std::to_string(i));
+                            break;
+                        }
+                    }
+                    break;
+                }
+
+                case value_t::object:
+                {
+                    for (const auto& element : *current->m_parent->m_data.m_value.object)
+                    {
+                        if (&element.second == current)
+                        {
+                            tokens.emplace_back(element.first.c_str());
+                            break;
+                        }
+                    }
+                    break;
+                }
+
+                case value_t::null: // LCOV_EXCL_LINE
+                case value_t::string: // LCOV_EXCL_LINE
+                case value_t::boolean: // LCOV_EXCL_LINE
+                case value_t::number_integer: // LCOV_EXCL_LINE
+                case value_t::number_unsigned: // LCOV_EXCL_LINE
+                case value_t::number_float: // LCOV_EXCL_LINE
+                case value_t::binary: // LCOV_EXCL_LINE
+                case value_t::discarded: // LCOV_EXCL_LINE
+                default:   // LCOV_EXCL_LINE
+                    break; // LCOV_EXCL_LINE
+            }
+        }
+
+        if (tokens.empty())
+        {
+            return "";
+        }
+
+        auto str = std::accumulate(tokens.rbegin(), tokens.rend(), std::string{},
+                                   [](const std::string & a, const std::string & b)
+        {
+            return concat(a, '/', detail::escape(b));
+        });
+        return concat('(', str, ") ");
+#else
+        static_cast<void>(leaf_element);
+        return "";
+#endif
+    }
+
+  private:
+    /// an exception object as storage for error messages
+    std::runtime_error m;
+};
+
+/// @brief exception indicating a parse error
+/// @sa https://json.nlohmann.me/api/basic_json/parse_error/
+class parse_error : public exception
+{
+  public:
+    /*!
+    @brief create a parse error exception
+    @param[in] id_       the id of the exception
+    @param[in] pos       the position where the error occurred (or with
+                         chars_read_total=0 if the position cannot be
+                         determined)
+    @param[in] what_arg  the explanatory string
+    @return parse_error object
+    */
+    template<typename BasicJsonContext, enable_if_t<is_basic_json_context<BasicJsonContext>::value, int> = 0>
+    static parse_error create(int id_, const position_t& pos, const std::string& what_arg, BasicJsonContext context)
+    {
+        const std::string w = concat(exception::name("parse_error", id_), "parse error",
+                                     position_string(pos), ": ", exception::diagnostics(context), what_arg);
+        return {id_, pos.chars_read_total, w.c_str()};
+    }
+
+    template<typename BasicJsonContext, enable_if_t<is_basic_json_context<BasicJsonContext>::value, int> = 0>
+    static parse_error create(int id_, std::size_t byte_, const std::string& what_arg, BasicJsonContext context)
+    {
+        const std::string w = concat(exception::name("parse_error", id_), "parse error",
+                                     (byte_ != 0 ? (concat(" at byte ", std::to_string(byte_))) : ""),
+                                     ": ", exception::diagnostics(context), what_arg);
+        return {id_, byte_, w.c_str()};
+    }
+
+    /*!
+    @brief byte index of the parse error
+
+    The byte index of the last read character in the input file.
+
+    @note For an input with n bytes, 1 is the index of the first character and
+          n+1 is the index of the terminating null byte or the end of file.
+          This also holds true when reading a byte vector (CBOR or MessagePack).
+    */
+    const std::size_t byte;
+
+  private:
+    parse_error(int id_, std::size_t byte_, const char* what_arg)
+        : exception(id_, what_arg), byte(byte_) {}
+
+    static std::string position_string(const position_t& pos)
+    {
+        return concat(" at line ", std::to_string(pos.lines_read + 1),
+                      ", column ", std::to_string(pos.chars_read_current_line));
+    }
+};
+
+/// @brief exception indicating errors with iterators
+/// @sa https://json.nlohmann.me/api/basic_json/invalid_iterator/
+class invalid_iterator : public exception
+{
+  public:
+    template<typename BasicJsonContext, enable_if_t<is_basic_json_context<BasicJsonContext>::value, int> = 0>
+    static invalid_iterator create(int id_, const std::string& what_arg, BasicJsonContext context)
+    {
+        const std::string w = concat(exception::name("invalid_iterator", id_), exception::diagnostics(context), what_arg);
+        return {id_, w.c_str()};
+    }
+
+  private:
+    JSON_HEDLEY_NON_NULL(3)
+    invalid_iterator(int id_, const char* what_arg)
+        : exception(id_, what_arg) {}
+};
+
+/// @brief exception indicating executing a member function with a wrong type
+/// @sa https://json.nlohmann.me/api/basic_json/type_error/
+class type_error : public exception
+{
+  public:
+    template<typename BasicJsonContext, enable_if_t<is_basic_json_context<BasicJsonContext>::value, int> = 0>
+    static type_error create(int id_, const std::string& what_arg, BasicJsonContext context)
+    {
+        const std::string w = concat(exception::name("type_error", id_), exception::diagnostics(context), what_arg);
+        return {id_, w.c_str()};
+    }
+
+  private:
+    JSON_HEDLEY_NON_NULL(3)
+    type_error(int id_, const char* what_arg) : exception(id_, what_arg) {}
+};
+
+/// @brief exception indicating access out of the defined range
+/// @sa https://json.nlohmann.me/api/basic_json/out_of_range/
+class out_of_range : public exception
+{
+  public:
+    template<typename BasicJsonContext, enable_if_t<is_basic_json_context<BasicJsonContext>::value, int> = 0>
+    static out_of_range create(int id_, const std::string& what_arg, BasicJsonContext context)
+    {
+        const std::string w = concat(exception::name("out_of_range", id_), exception::diagnostics(context), what_arg);
+        return {id_, w.c_str()};
+    }
+
+  private:
+    JSON_HEDLEY_NON_NULL(3)
+    out_of_range(int id_, const char* what_arg) : exception(id_, what_arg) {}
+};
 
-template<typename BasicJsonType, typename ConstructibleStringType>
-struct is_constructible_string_type_impl <
-    BasicJsonType, ConstructibleStringType,
-    enable_if_t<is_detected_exact<typename BasicJsonType::string_t::value_type,
-    value_type_t, ConstructibleStringType>::value >>
+/// @brief exception indicating other library errors
+/// @sa https://json.nlohmann.me/api/basic_json/other_error/
+class other_error : public exception
 {
-    static constexpr auto value =
-        std::is_constructible<ConstructibleStringType,
-        typename BasicJsonType::string_t>::value;
-};
+  public:
+    template<typename BasicJsonContext, enable_if_t<is_basic_json_context<BasicJsonContext>::value, int> = 0>
+    static other_error create(int id_, const std::string& what_arg, BasicJsonContext context)
+    {
+        const std::string w = concat(exception::name("other_error", id_), exception::diagnostics(context), what_arg);
+        return {id_, w.c_str()};
+    }
 
-template<typename BasicJsonType, typename ConstructibleStringType>
-struct is_constructible_string_type
-    : is_constructible_string_type_impl<BasicJsonType, ConstructibleStringType> {};
+  private:
+    JSON_HEDLEY_NON_NULL(3)
+    other_error(int id_, const char* what_arg) : exception(id_, what_arg) {}
+};
 
-template<typename BasicJsonType, typename CompatibleArrayType, typename = void>
-struct is_compatible_array_type_impl : std::false_type {};
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
 
-template<typename BasicJsonType, typename CompatibleArrayType>
-struct is_compatible_array_type_impl <
-    BasicJsonType, CompatibleArrayType,
-    enable_if_t < is_detected<value_type_t, CompatibleArrayType>::value&&
-    is_detected<iterator_t, CompatibleArrayType>::value&&
-// This is needed because json_reverse_iterator has a ::iterator type...
-// Therefore it is detected as a CompatibleArrayType.
-// The real fix would be to have an Iterable concept.
-    !is_iterator_traits <
-    iterator_traits<CompatibleArrayType >>::value >>
-{
-    static constexpr bool value =
-        std::is_constructible<BasicJsonType,
-        typename CompatibleArrayType::value_type>::value;
-};
+// #include <nlohmann/detail/macro_scope.hpp>
 
-template<typename BasicJsonType, typename CompatibleArrayType>
-struct is_compatible_array_type
-    : is_compatible_array_type_impl<BasicJsonType, CompatibleArrayType> {};
+// #include <nlohmann/detail/meta/cpp_future.hpp>
 
-template<typename BasicJsonType, typename ConstructibleArrayType, typename = void>
-struct is_constructible_array_type_impl : std::false_type {};
+// #include <nlohmann/detail/meta/identity_tag.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
 
-template<typename BasicJsonType, typename ConstructibleArrayType>
-struct is_constructible_array_type_impl <
-    BasicJsonType, ConstructibleArrayType,
-    enable_if_t<std::is_same<ConstructibleArrayType,
-    typename BasicJsonType::value_type>::value >>
-            : std::true_type {};
 
-template<typename BasicJsonType, typename ConstructibleArrayType>
-struct is_constructible_array_type_impl <
-    BasicJsonType, ConstructibleArrayType,
-    enable_if_t < !std::is_same<ConstructibleArrayType,
-    typename BasicJsonType::value_type>::value&&
-    std::is_default_constructible<ConstructibleArrayType>::value&&
-(std::is_move_assignable<ConstructibleArrayType>::value ||
- std::is_copy_assignable<ConstructibleArrayType>::value)&&
-is_detected<value_type_t, ConstructibleArrayType>::value&&
-is_detected<iterator_t, ConstructibleArrayType>::value&&
-is_complete_type <
-detected_t<value_type_t, ConstructibleArrayType >>::value >>
-{
-    static constexpr bool value =
-        // This is needed because json_reverse_iterator has a ::iterator type,
-        // furthermore, std::back_insert_iterator (and other iterators) have a
-        // base class `iterator`... Therefore it is detected as a
-        // ConstructibleArrayType. The real fix would be to have an Iterable
-        // concept.
-        !is_iterator_traits<iterator_traits<ConstructibleArrayType>>::value &&
-
-        (std::is_same<typename ConstructibleArrayType::value_type,
-         typename BasicJsonType::array_t::value_type>::value ||
-         has_from_json<BasicJsonType,
-         typename ConstructibleArrayType::value_type>::value ||
-         has_non_default_from_json <
-         BasicJsonType, typename ConstructibleArrayType::value_type >::value);
-};
 
-template<typename BasicJsonType, typename ConstructibleArrayType>
-struct is_constructible_array_type
-    : is_constructible_array_type_impl<BasicJsonType, ConstructibleArrayType> {};
+// #include <nlohmann/detail/abi_macros.hpp>
 
-template<typename RealIntegerType, typename CompatibleNumberIntegerType,
-         typename = void>
-struct is_compatible_integer_type_impl : std::false_type {};
 
-template<typename RealIntegerType, typename CompatibleNumberIntegerType>
-struct is_compatible_integer_type_impl <
-    RealIntegerType, CompatibleNumberIntegerType,
-    enable_if_t < std::is_integral<RealIntegerType>::value&&
-    std::is_integral<CompatibleNumberIntegerType>::value&&
-    !std::is_same<bool, CompatibleNumberIntegerType>::value >>
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
 {
-    // is there an assert somewhere on overflows?
-    using RealLimits = std::numeric_limits<RealIntegerType>;
-    using CompatibleLimits = std::numeric_limits<CompatibleNumberIntegerType>;
 
-    static constexpr auto value =
-        std::is_constructible<RealIntegerType,
-        CompatibleNumberIntegerType>::value &&
-        CompatibleLimits::is_integer &&
-        RealLimits::is_signed == CompatibleLimits::is_signed;
-};
+// dispatching helper struct
+template <class T> struct identity_tag {};
 
-template<typename RealIntegerType, typename CompatibleNumberIntegerType>
-struct is_compatible_integer_type
-    : is_compatible_integer_type_impl<RealIntegerType,
-      CompatibleNumberIntegerType> {};
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
 
-template<typename BasicJsonType, typename CompatibleType, typename = void>
-struct is_compatible_type_impl: std::false_type {};
+// #include <nlohmann/detail/meta/std_fs.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
 
-template<typename BasicJsonType, typename CompatibleType>
-struct is_compatible_type_impl <
-    BasicJsonType, CompatibleType,
-    enable_if_t<is_complete_type<CompatibleType>::value >>
-{
-    static constexpr bool value =
-        has_to_json<BasicJsonType, CompatibleType>::value;
-};
 
-template<typename BasicJsonType, typename CompatibleType>
-struct is_compatible_type
-    : is_compatible_type_impl<BasicJsonType, CompatibleType> {};
 
-// https://en.cppreference.com/w/cpp/types/conjunction
-template<class...> struct conjunction : std::true_type { };
-template<class B1> struct conjunction<B1> : B1 { };
-template<class B1, class... Bn>
-struct conjunction<B1, Bn...>
-: std::conditional<bool(B1::value), conjunction<Bn...>, B1>::type {};
+// #include <nlohmann/detail/macro_scope.hpp>
 
-template<typename T1, typename T2>
-struct is_constructible_tuple : std::false_type {};
 
-template<typename T1, typename... Args>
-struct is_constructible_tuple<T1, std::tuple<Args...>> : conjunction<std::is_constructible<T1, Args>...> {};
+#if JSON_HAS_EXPERIMENTAL_FILESYSTEM
+#include <experimental/filesystem>
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+namespace std_fs = std::experimental::filesystem;
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+#elif JSON_HAS_FILESYSTEM
+#include <filesystem>
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+namespace std_fs = std::filesystem;
 }  // namespace detail
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
+#endif
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/string_concat.hpp>
 
 // #include <nlohmann/detail/value_t.hpp>
 
 
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
+
 template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename std::nullptr_t& n)
+inline void from_json(const BasicJsonType& j, typename std::nullptr_t& n)
 {
     if (JSON_HEDLEY_UNLIKELY(!j.is_null()))
     {
-        JSON_THROW(type_error::create(302, "type must be null, but is " + std::string(j.type_name()), j));
+        JSON_THROW(type_error::create(302, concat("type must be null, but is ", j.type_name()), &j));
     }
     n = nullptr;
 }
@@ -3743,83 +4695,92 @@ void get_arithmetic_value(const BasicJsonType& j, ArithmeticType& val)
             break;
         }
 
+        case value_t::null:
+        case value_t::object:
+        case value_t::array:
+        case value_t::string:
+        case value_t::boolean:
+        case value_t::binary:
+        case value_t::discarded:
         default:
-            JSON_THROW(type_error::create(302, "type must be number, but is " + std::string(j.type_name()), j));
+            JSON_THROW(type_error::create(302, concat("type must be number, but is ", j.type_name()), &j));
     }
 }
 
 template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename BasicJsonType::boolean_t& b)
+inline void from_json(const BasicJsonType& j, typename BasicJsonType::boolean_t& b)
 {
     if (JSON_HEDLEY_UNLIKELY(!j.is_boolean()))
     {
-        JSON_THROW(type_error::create(302, "type must be boolean, but is " + std::string(j.type_name()), j));
+        JSON_THROW(type_error::create(302, concat("type must be boolean, but is ", j.type_name()), &j));
     }
     b = *j.template get_ptr<const typename BasicJsonType::boolean_t*>();
 }
 
 template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename BasicJsonType::string_t& s)
+inline void from_json(const BasicJsonType& j, typename BasicJsonType::string_t& s)
 {
     if (JSON_HEDLEY_UNLIKELY(!j.is_string()))
     {
-        JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name()), j));
+        JSON_THROW(type_error::create(302, concat("type must be string, but is ", j.type_name()), &j));
     }
     s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
 }
 
 template <
-    typename BasicJsonType, typename ConstructibleStringType,
+    typename BasicJsonType, typename StringType,
     enable_if_t <
-        is_constructible_string_type<BasicJsonType, ConstructibleStringType>::value&&
-        !std::is_same<typename BasicJsonType::string_t,
-                      ConstructibleStringType>::value,
-        int > = 0 >
-void from_json(const BasicJsonType& j, ConstructibleStringType& s)
+        std::is_assignable<StringType&, const typename BasicJsonType::string_t>::value
+        && is_detected_exact<typename BasicJsonType::string_t::value_type, value_type_t, StringType>::value
+        && !std::is_same<typename BasicJsonType::string_t, StringType>::value
+        && !is_json_ref<StringType>::value, int > = 0 >
+inline void from_json(const BasicJsonType& j, StringType& s)
 {
     if (JSON_HEDLEY_UNLIKELY(!j.is_string()))
     {
-        JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name()), j));
+        JSON_THROW(type_error::create(302, concat("type must be string, but is ", j.type_name()), &j));
     }
 
     s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
 }
 
 template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename BasicJsonType::number_float_t& val)
+inline void from_json(const BasicJsonType& j, typename BasicJsonType::number_float_t& val)
 {
     get_arithmetic_value(j, val);
 }
 
 template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename BasicJsonType::number_unsigned_t& val)
+inline void from_json(const BasicJsonType& j, typename BasicJsonType::number_unsigned_t& val)
 {
     get_arithmetic_value(j, val);
 }
 
 template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename BasicJsonType::number_integer_t& val)
+inline void from_json(const BasicJsonType& j, typename BasicJsonType::number_integer_t& val)
 {
     get_arithmetic_value(j, val);
 }
 
+#if !JSON_DISABLE_ENUM_SERIALIZATION
 template<typename BasicJsonType, typename EnumType,
          enable_if_t<std::is_enum<EnumType>::value, int> = 0>
-void from_json(const BasicJsonType& j, EnumType& e)
+inline void from_json(const BasicJsonType& j, EnumType& e)
 {
     typename std::underlying_type<EnumType>::type val;
     get_arithmetic_value(j, val);
     e = static_cast<EnumType>(val);
 }
+#endif  // JSON_DISABLE_ENUM_SERIALIZATION
 
 // forward_list doesn't have an insert method
 template<typename BasicJsonType, typename T, typename Allocator,
          enable_if_t<is_getable<BasicJsonType, T>::value, int> = 0>
-void from_json(const BasicJsonType& j, std::forward_list<T, Allocator>& l)
+inline void from_json(const BasicJsonType& j, std::forward_list<T, Allocator>& l)
 {
     if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
     {
-        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()), j));
+        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
     }
     l.clear();
     std::transform(j.rbegin(), j.rend(),
@@ -3832,11 +4793,11 @@ void from_json(const BasicJsonType& j, std::forward_list<T, Allocator>& l)
 // valarray doesn't have an insert method
 template<typename BasicJsonType, typename T,
          enable_if_t<is_getable<BasicJsonType, T>::value, int> = 0>
-void from_json(const BasicJsonType& j, std::valarray<T>& l)
+inline void from_json(const BasicJsonType& j, std::valarray<T>& l)
 {
     if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
     {
-        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()), j));
+        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
     }
     l.resize(j.size());
     std::transform(j.begin(), j.end(), std::begin(l),
@@ -3847,7 +4808,7 @@ void from_json(const BasicJsonType& j, std::valarray<T>& l)
 }
 
 template<typename BasicJsonType, typename T, std::size_t N>
-auto from_json(const BasicJsonType& j, T (&arr)[N])
+auto from_json(const BasicJsonType& j, T (&arr)[N])  // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
 -> decltype(j.template get<T>(), void())
 {
     for (std::size_t i = 0; i < N; ++i)
@@ -3857,7 +4818,7 @@ auto from_json(const BasicJsonType& j, T (&arr)[N])
 }
 
 template<typename BasicJsonType>
-void from_json_array_impl(const BasicJsonType& j, typename BasicJsonType::array_t& arr, priority_tag<3> /*unused*/)
+inline void from_json_array_impl(const BasicJsonType& j, typename BasicJsonType::array_t& arr, priority_tag<3> /*unused*/)
 {
     arr = *j.template get_ptr<const typename BasicJsonType::array_t*>();
 }
@@ -3873,7 +4834,10 @@ auto from_json_array_impl(const BasicJsonType& j, std::array<T, N>& arr,
     }
 }
 
-template<typename BasicJsonType, typename ConstructibleArrayType>
+template<typename BasicJsonType, typename ConstructibleArrayType,
+         enable_if_t<
+             std::is_assignable<ConstructibleArrayType&, ConstructibleArrayType>::value,
+             int> = 0>
 auto from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr, priority_tag<1> /*unused*/)
 -> decltype(
     arr.reserve(std::declval<typename ConstructibleArrayType::size_type>()),
@@ -3894,9 +4858,12 @@ auto from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr, p
     arr = std::move(ret);
 }
 
-template<typename BasicJsonType, typename ConstructibleArrayType>
-void from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr,
-                          priority_tag<0> /*unused*/)
+template<typename BasicJsonType, typename ConstructibleArrayType,
+         enable_if_t<
+             std::is_assignable<ConstructibleArrayType&, ConstructibleArrayType>::value,
+             int> = 0>
+inline void from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr,
+                                 priority_tag<0> /*unused*/)
 {
     using std::end;
 
@@ -3927,18 +4894,37 @@ void())
 {
     if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
     {
-        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()), j));
+        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
     }
 
     from_json_array_impl(j, arr, priority_tag<3> {});
 }
 
+template < typename BasicJsonType, typename T, std::size_t... Idx >
+std::array<T, sizeof...(Idx)> from_json_inplace_array_impl(BasicJsonType&& j,
+        identity_tag<std::array<T, sizeof...(Idx)>> /*unused*/, index_sequence<Idx...> /*unused*/)
+{
+    return { { std::forward<BasicJsonType>(j).at(Idx).template get<T>()... } };
+}
+
+template < typename BasicJsonType, typename T, std::size_t N >
+auto from_json(BasicJsonType&& j, identity_tag<std::array<T, N>> tag)
+-> decltype(from_json_inplace_array_impl(std::forward<BasicJsonType>(j), tag, make_index_sequence<N> {}))
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
+    }
+
+    return from_json_inplace_array_impl(std::forward<BasicJsonType>(j), tag, make_index_sequence<N> {});
+}
+
 template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename BasicJsonType::binary_t& bin)
+inline void from_json(const BasicJsonType& j, typename BasicJsonType::binary_t& bin)
 {
     if (JSON_HEDLEY_UNLIKELY(!j.is_binary()))
     {
-        JSON_THROW(type_error::create(302, "type must be binary, but is " + std::string(j.type_name()), j));
+        JSON_THROW(type_error::create(302, concat("type must be binary, but is ", j.type_name()), &j));
     }
 
     bin = *j.template get_ptr<const typename BasicJsonType::binary_t*>();
@@ -3946,15 +4932,15 @@ void from_json(const BasicJsonType& j, typename BasicJsonType::binary_t& bin)
 
 template<typename BasicJsonType, typename ConstructibleObjectType,
          enable_if_t<is_constructible_object_type<BasicJsonType, ConstructibleObjectType>::value, int> = 0>
-void from_json(const BasicJsonType& j, ConstructibleObjectType& obj)
+inline void from_json(const BasicJsonType& j, ConstructibleObjectType& obj)
 {
     if (JSON_HEDLEY_UNLIKELY(!j.is_object()))
     {
-        JSON_THROW(type_error::create(302, "type must be object, but is " + std::string(j.type_name()), j));
+        JSON_THROW(type_error::create(302, concat("type must be object, but is ", j.type_name()), &j));
     }
 
     ConstructibleObjectType ret;
-    auto inner_object = j.template get_ptr<const typename BasicJsonType::object_t*>();
+    const auto* inner_object = j.template get_ptr<const typename BasicJsonType::object_t*>();
     using value_type = typename ConstructibleObjectType::value_type;
     std::transform(
         inner_object->begin(), inner_object->end(),
@@ -3978,7 +4964,7 @@ template < typename BasicJsonType, typename ArithmeticType,
                !std::is_same<ArithmeticType, typename BasicJsonType::number_float_t>::value&&
                !std::is_same<ArithmeticType, typename BasicJsonType::boolean_t>::value,
                int > = 0 >
-void from_json(const BasicJsonType& j, ArithmeticType& val)
+inline void from_json(const BasicJsonType& j, ArithmeticType& val)
 {
     switch (static_cast<value_t>(j))
     {
@@ -4003,44 +4989,75 @@ void from_json(const BasicJsonType& j, ArithmeticType& val)
             break;
         }
 
+        case value_t::null:
+        case value_t::object:
+        case value_t::array:
+        case value_t::string:
+        case value_t::binary:
+        case value_t::discarded:
         default:
-            JSON_THROW(type_error::create(302, "type must be number, but is " + std::string(j.type_name()), j));
+            JSON_THROW(type_error::create(302, concat("type must be number, but is ", j.type_name()), &j));
     }
 }
 
+template<typename BasicJsonType, typename... Args, std::size_t... Idx>
+std::tuple<Args...> from_json_tuple_impl_base(BasicJsonType&& j, index_sequence<Idx...> /*unused*/)
+{
+    return std::make_tuple(std::forward<BasicJsonType>(j).at(Idx).template get<Args>()...);
+}
+
+template < typename BasicJsonType, class A1, class A2 >
+std::pair<A1, A2> from_json_tuple_impl(BasicJsonType&& j, identity_tag<std::pair<A1, A2>> /*unused*/, priority_tag<0> /*unused*/)
+{
+    return {std::forward<BasicJsonType>(j).at(0).template get<A1>(),
+            std::forward<BasicJsonType>(j).at(1).template get<A2>()};
+}
+
 template<typename BasicJsonType, typename A1, typename A2>
-void from_json(const BasicJsonType& j, std::pair<A1, A2>& p)
+inline void from_json_tuple_impl(BasicJsonType&& j, std::pair<A1, A2>& p, priority_tag<1> /*unused*/)
 {
-    p = {j.at(0).template get<A1>(), j.at(1).template get<A2>()};
+    p = from_json_tuple_impl(std::forward<BasicJsonType>(j), identity_tag<std::pair<A1, A2>> {}, priority_tag<0> {});
 }
 
-template<typename BasicJsonType, typename Tuple, std::size_t... Idx>
-void from_json_tuple_impl(const BasicJsonType& j, Tuple& t, index_sequence<Idx...> /*unused*/)
+template<typename BasicJsonType, typename... Args>
+std::tuple<Args...> from_json_tuple_impl(BasicJsonType&& j, identity_tag<std::tuple<Args...>> /*unused*/, priority_tag<2> /*unused*/)
 {
-    t = std::make_tuple(j.at(Idx).template get<typename std::tuple_element<Idx, Tuple>::type>()...);
+    return from_json_tuple_impl_base<BasicJsonType, Args...>(std::forward<BasicJsonType>(j), index_sequence_for<Args...> {});
 }
 
 template<typename BasicJsonType, typename... Args>
-void from_json(const BasicJsonType& j, std::tuple<Args...>& t)
+inline void from_json_tuple_impl(BasicJsonType&& j, std::tuple<Args...>& t, priority_tag<3> /*unused*/)
+{
+    t = from_json_tuple_impl_base<BasicJsonType, Args...>(std::forward<BasicJsonType>(j), index_sequence_for<Args...> {});
+}
+
+template<typename BasicJsonType, typename TupleRelated>
+auto from_json(BasicJsonType&& j, TupleRelated&& t)
+-> decltype(from_json_tuple_impl(std::forward<BasicJsonType>(j), std::forward<TupleRelated>(t), priority_tag<3> {}))
 {
-    from_json_tuple_impl(j, t, index_sequence_for<Args...> {});
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
+    }
+
+    return from_json_tuple_impl(std::forward<BasicJsonType>(j), std::forward<TupleRelated>(t), priority_tag<3> {});
 }
 
 template < typename BasicJsonType, typename Key, typename Value, typename Compare, typename Allocator,
            typename = enable_if_t < !std::is_constructible <
                                         typename BasicJsonType::string_t, Key >::value >>
-void from_json(const BasicJsonType& j, std::map<Key, Value, Compare, Allocator>& m)
+inline void from_json(const BasicJsonType& j, std::map<Key, Value, Compare, Allocator>& m)
 {
     if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
     {
-        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()), j));
+        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
     }
     m.clear();
     for (const auto& p : j)
     {
         if (JSON_HEDLEY_UNLIKELY(!p.is_array()))
         {
-            JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(p.type_name()), j));
+            JSON_THROW(type_error::create(302, concat("type must be array, but is ", p.type_name()), &j));
         }
         m.emplace(p.at(0).template get<Key>(), p.at(1).template get<Value>());
     }
@@ -4049,45 +5066,72 @@ void from_json(const BasicJsonType& j, std::map<Key, Value, Compare, Allocator>&
 template < typename BasicJsonType, typename Key, typename Value, typename Hash, typename KeyEqual, typename Allocator,
            typename = enable_if_t < !std::is_constructible <
                                         typename BasicJsonType::string_t, Key >::value >>
-void from_json(const BasicJsonType& j, std::unordered_map<Key, Value, Hash, KeyEqual, Allocator>& m)
+inline void from_json(const BasicJsonType& j, std::unordered_map<Key, Value, Hash, KeyEqual, Allocator>& m)
 {
     if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
     {
-        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()), j));
+        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
     }
     m.clear();
     for (const auto& p : j)
     {
         if (JSON_HEDLEY_UNLIKELY(!p.is_array()))
         {
-            JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(p.type_name()), j));
+            JSON_THROW(type_error::create(302, concat("type must be array, but is ", p.type_name()), &j));
         }
         m.emplace(p.at(0).template get<Key>(), p.at(1).template get<Value>());
     }
 }
 
+#if JSON_HAS_FILESYSTEM || JSON_HAS_EXPERIMENTAL_FILESYSTEM
+template<typename BasicJsonType>
+inline void from_json(const BasicJsonType& j, std_fs::path& p)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_string()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be string, but is ", j.type_name()), &j));
+    }
+    p = *j.template get_ptr<const typename BasicJsonType::string_t*>();
+}
+#endif
+
 struct from_json_fn
 {
     template<typename BasicJsonType, typename T>
-    auto operator()(const BasicJsonType& j, T& val) const
-    noexcept(noexcept(from_json(j, val)))
-    -> decltype(from_json(j, val), void())
+    auto operator()(const BasicJsonType& j, T&& val) const
+    noexcept(noexcept(from_json(j, std::forward<T>(val))))
+    -> decltype(from_json(j, std::forward<T>(val)))
     {
-        return from_json(j, val);
+        return from_json(j, std::forward<T>(val));
     }
 };
+
 }  // namespace detail
 
+#ifndef JSON_HAS_CPP_17
 /// namespace to hold default `from_json` function
 /// to see why this is required:
 /// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/n4381.html
-namespace
+namespace // NOLINT(cert-dcl59-cpp,fuchsia-header-anon-namespaces,google-build-namespaces)
 {
-constexpr const auto& from_json = detail::static_const<detail::from_json_fn>::value;
-} // namespace
-} // namespace nlohmann
+#endif
+JSON_INLINE_VARIABLE constexpr const auto& from_json = // NOLINT(misc-definitions-in-headers)
+    detail::static_const<detail::from_json_fn>::value;
+#ifndef JSON_HAS_CPP_17
+}  // namespace
+#endif
+
+NLOHMANN_JSON_NAMESPACE_END
 
 // #include <nlohmann/detail/conversions/to_json.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 
 
 #include <algorithm> // copy
@@ -4100,22 +5144,37 @@ constexpr const auto& from_json = detail::static_const<detail::from_json_fn>::va
 #include <vector> // vector
 
 // #include <nlohmann/detail/iterators/iteration_proxy.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 
 
 #include <cstddef> // size_t
 #include <iterator> // input_iterator_tag
 #include <string> // string, to_string
 #include <tuple> // tuple_size, get, tuple_element
+#include <utility> // move
+
+#if JSON_HAS_RANGES
+    #include <ranges> // enable_borrowed_range
+#endif
+
+// #include <nlohmann/detail/abi_macros.hpp>
 
 // #include <nlohmann/detail/meta/type_traits.hpp>
 
 // #include <nlohmann/detail/value_t.hpp>
 
 
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
+
 template<typename string_type>
 void int_to_string( string_type& target, std::size_t value )
 {
@@ -4128,14 +5187,14 @@ template<typename IteratorType> class iteration_proxy_value
   public:
     using difference_type = std::ptrdiff_t;
     using value_type = iteration_proxy_value;
-    using pointer = value_type * ;
-    using reference = value_type & ;
+    using pointer = value_type *;
+    using reference = value_type &;
     using iterator_category = std::input_iterator_tag;
     using string_type = typename std::remove_cv< typename std::remove_reference<decltype( std::declval<IteratorType>().key() ) >::type >::type;
 
   private:
     /// the iterator
-    IteratorType anchor;
+    IteratorType anchor{};
     /// an index for arrays (used to create key names)
     std::size_t array_index = 0;
     /// last stringified array index
@@ -4143,13 +5202,30 @@ template<typename IteratorType> class iteration_proxy_value
     /// a string representation of the array index
     mutable string_type array_index_str = "0";
     /// an empty string (to return a reference for primitive values)
-    const string_type empty_str{};
+    string_type empty_str{};
 
   public:
-    explicit iteration_proxy_value(IteratorType it) noexcept : anchor(it) {}
+    explicit iteration_proxy_value() = default;
+    explicit iteration_proxy_value(IteratorType it, std::size_t array_index_ = 0)
+    noexcept(std::is_nothrow_move_constructible<IteratorType>::value
+             && std::is_nothrow_default_constructible<string_type>::value)
+        : anchor(std::move(it))
+        , array_index(array_index_)
+    {}
+
+    iteration_proxy_value(iteration_proxy_value const&) = default;
+    iteration_proxy_value& operator=(iteration_proxy_value const&) = default;
+    // older GCCs are a bit fussy and require explicit noexcept specifiers on defaulted functions
+    iteration_proxy_value(iteration_proxy_value&&)
+    noexcept(std::is_nothrow_move_constructible<IteratorType>::value
+             && std::is_nothrow_move_constructible<string_type>::value) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor,cppcoreguidelines-noexcept-move-operations)
+    iteration_proxy_value& operator=(iteration_proxy_value&&)
+    noexcept(std::is_nothrow_move_assignable<IteratorType>::value
+             && std::is_nothrow_move_assignable<string_type>::value) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor,cppcoreguidelines-noexcept-move-operations)
+    ~iteration_proxy_value() = default;
 
     /// dereference operator (needed for range-based for)
-    iteration_proxy_value& operator*()
+    const iteration_proxy_value& operator*() const
     {
         return *this;
     }
@@ -4163,6 +5239,14 @@ template<typename IteratorType> class iteration_proxy_value
         return *this;
     }
 
+    iteration_proxy_value operator++(int)& // NOLINT(cert-dcl21-cpp)
+    {
+        auto tmp = iteration_proxy_value(anchor, array_index);
+        ++anchor;
+        ++array_index;
+        return tmp;
+    }
+
     /// equality operator (needed for InputIterator)
     bool operator==(const iteration_proxy_value& o) const
     {
@@ -4198,6 +5282,14 @@ template<typename IteratorType> class iteration_proxy_value
                 return anchor.key();
 
             // use an empty key for all primitive types
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
             default:
                 return empty_str;
         }
@@ -4215,25 +5307,34 @@ template<typename IteratorType> class iteration_proxy
 {
   private:
     /// the container to iterate
-    typename IteratorType::reference container;
+    typename IteratorType::pointer container = nullptr;
 
   public:
+    explicit iteration_proxy() = default;
+
     /// construct iteration proxy from a container
     explicit iteration_proxy(typename IteratorType::reference cont) noexcept
-        : container(cont) {}
+        : container(&cont) {}
+
+    iteration_proxy(iteration_proxy const&) = default;
+    iteration_proxy& operator=(iteration_proxy const&) = default;
+    iteration_proxy(iteration_proxy&&) noexcept = default;
+    iteration_proxy& operator=(iteration_proxy&&) noexcept = default;
+    ~iteration_proxy() = default;
 
     /// return iterator begin (needed for range-based for)
-    iteration_proxy_value<IteratorType> begin() noexcept
+    iteration_proxy_value<IteratorType> begin() const noexcept
     {
-        return iteration_proxy_value<IteratorType>(container.begin());
+        return iteration_proxy_value<IteratorType>(container->begin());
     }
 
     /// return iterator end (needed for range-based for)
-    iteration_proxy_value<IteratorType> end() noexcept
+    iteration_proxy_value<IteratorType> end() const noexcept
     {
-        return iteration_proxy_value<IteratorType>(container.end());
+        return iteration_proxy_value<IteratorType>(container->end());
     }
 };
+
 // Structured Bindings Support
 // For further reference see https://blog.tartanllama.xyz/structured-bindings/
 // And see https://github.com/nlohmann/json/pull/1391
@@ -4250,8 +5351,9 @@ auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decl
 {
     return i.value();
 }
+
 }  // namespace detail
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
 
 // The Addition to the STD Namespace is required to add
 // Structured Bindings Support to the iteration_proxy_value class
@@ -4259,17 +5361,18 @@ auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decl
 // And see https://github.com/nlohmann/json/pull/1391
 namespace std
 {
+
 #if defined(__clang__)
     // Fix: https://github.com/nlohmann/json/issues/1401
     #pragma clang diagnostic push
     #pragma clang diagnostic ignored "-Wmismatched-tags"
 #endif
 template<typename IteratorType>
-class tuple_size<::nlohmann::detail::iteration_proxy_value<IteratorType>>
+class tuple_size<::nlohmann::detail::iteration_proxy_value<IteratorType>> // NOLINT(cert-dcl58-cpp)
             : public std::integral_constant<std::size_t, 2> {};
 
 template<std::size_t N, typename IteratorType>
-class tuple_element<N, ::nlohmann::detail::iteration_proxy_value<IteratorType >>
+class tuple_element<N, ::nlohmann::detail::iteration_proxy_value<IteratorType >> // NOLINT(cert-dcl58-cpp)
 {
   public:
     using type = decltype(
@@ -4279,23 +5382,40 @@ class tuple_element<N, ::nlohmann::detail::iteration_proxy_value<IteratorType >>
 #if defined(__clang__)
     #pragma clang diagnostic pop
 #endif
-} // namespace std
+
+}  // namespace std
+
+#if JSON_HAS_RANGES
+    template <typename IteratorType>
+    inline constexpr bool ::std::ranges::enable_borrowed_range<::nlohmann::detail::iteration_proxy<IteratorType>> = true;
+#endif
+
+// #include <nlohmann/detail/macro_scope.hpp>
 
 // #include <nlohmann/detail/meta/cpp_future.hpp>
 
+// #include <nlohmann/detail/meta/std_fs.hpp>
+
 // #include <nlohmann/detail/meta/type_traits.hpp>
 
 // #include <nlohmann/detail/value_t.hpp>
 
 
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
+
 //////////////////
 // constructors //
 //////////////////
 
+/*
+ * Note all external_constructor<>::construct functions need to call
+ * j.m_data.m_value.destroy(j.m_data.m_type) to avoid a memory leak in case j contains an
+ * allocated value (e.g., a string). See bug issue
+ * https://github.com/nlohmann/json/issues/2865 for more information.
+ */
+
 template<value_t> struct external_constructor;
 
 template<>
@@ -4304,8 +5424,9 @@ struct external_constructor<value_t::boolean>
     template<typename BasicJsonType>
     static void construct(BasicJsonType& j, typename BasicJsonType::boolean_t b) noexcept
     {
-        j.m_type = value_t::boolean;
-        j.m_value = b;
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::boolean;
+        j.m_data.m_value = b;
         j.assert_invariant();
     }
 };
@@ -4316,16 +5437,18 @@ struct external_constructor<value_t::string>
     template<typename BasicJsonType>
     static void construct(BasicJsonType& j, const typename BasicJsonType::string_t& s)
     {
-        j.m_type = value_t::string;
-        j.m_value = s;
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::string;
+        j.m_data.m_value = s;
         j.assert_invariant();
     }
 
     template<typename BasicJsonType>
     static void construct(BasicJsonType& j, typename BasicJsonType::string_t&& s)
     {
-        j.m_type = value_t::string;
-        j.m_value = std::move(s);
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::string;
+        j.m_data.m_value = std::move(s);
         j.assert_invariant();
     }
 
@@ -4334,8 +5457,9 @@ struct external_constructor<value_t::string>
                              int > = 0 >
     static void construct(BasicJsonType& j, const CompatibleStringType& str)
     {
-        j.m_type = value_t::string;
-        j.m_value.string = j.template create<typename BasicJsonType::string_t>(str);
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::string;
+        j.m_data.m_value.string = j.template create<typename BasicJsonType::string_t>(str);
         j.assert_invariant();
     }
 };
@@ -4346,18 +5470,18 @@ struct external_constructor<value_t::binary>
     template<typename BasicJsonType>
     static void construct(BasicJsonType& j, const typename BasicJsonType::binary_t& b)
     {
-        j.m_type = value_t::binary;
-        typename BasicJsonType::binary_t value{b};
-        j.m_value = value;
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::binary;
+        j.m_data.m_value = typename BasicJsonType::binary_t(b);
         j.assert_invariant();
     }
 
     template<typename BasicJsonType>
     static void construct(BasicJsonType& j, typename BasicJsonType::binary_t&& b)
     {
-        j.m_type = value_t::binary;
-        typename BasicJsonType::binary_t value{std::move(b)};
-        j.m_value = value;
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::binary;
+        j.m_data.m_value = typename BasicJsonType::binary_t(std::move(b));
         j.assert_invariant();
     }
 };
@@ -4368,8 +5492,9 @@ struct external_constructor<value_t::number_float>
     template<typename BasicJsonType>
     static void construct(BasicJsonType& j, typename BasicJsonType::number_float_t val) noexcept
     {
-        j.m_type = value_t::number_float;
-        j.m_value = val;
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::number_float;
+        j.m_data.m_value = val;
         j.assert_invariant();
     }
 };
@@ -4380,8 +5505,9 @@ struct external_constructor<value_t::number_unsigned>
     template<typename BasicJsonType>
     static void construct(BasicJsonType& j, typename BasicJsonType::number_unsigned_t val) noexcept
     {
-        j.m_type = value_t::number_unsigned;
-        j.m_value = val;
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::number_unsigned;
+        j.m_data.m_value = val;
         j.assert_invariant();
     }
 };
@@ -4392,8 +5518,9 @@ struct external_constructor<value_t::number_integer>
     template<typename BasicJsonType>
     static void construct(BasicJsonType& j, typename BasicJsonType::number_integer_t val) noexcept
     {
-        j.m_type = value_t::number_integer;
-        j.m_value = val;
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::number_integer;
+        j.m_data.m_value = val;
         j.assert_invariant();
     }
 };
@@ -4404,8 +5531,9 @@ struct external_constructor<value_t::array>
     template<typename BasicJsonType>
     static void construct(BasicJsonType& j, const typename BasicJsonType::array_t& arr)
     {
-        j.m_type = value_t::array;
-        j.m_value = arr;
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::array;
+        j.m_data.m_value = arr;
         j.set_parents();
         j.assert_invariant();
     }
@@ -4413,8 +5541,9 @@ struct external_constructor<value_t::array>
     template<typename BasicJsonType>
     static void construct(BasicJsonType& j, typename BasicJsonType::array_t&& arr)
     {
-        j.m_type = value_t::array;
-        j.m_value = std::move(arr);
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::array;
+        j.m_data.m_value = std::move(arr);
         j.set_parents();
         j.assert_invariant();
     }
@@ -4426,8 +5555,10 @@ struct external_constructor<value_t::array>
     {
         using std::begin;
         using std::end;
-        j.m_type = value_t::array;
-        j.m_value.array = j.template create<typename BasicJsonType::array_t>(begin(arr), end(arr));
+
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::array;
+        j.m_data.m_value.array = j.template create<typename BasicJsonType::array_t>(begin(arr), end(arr));
         j.set_parents();
         j.assert_invariant();
     }
@@ -4435,13 +5566,14 @@ struct external_constructor<value_t::array>
     template<typename BasicJsonType>
     static void construct(BasicJsonType& j, const std::vector<bool>& arr)
     {
-        j.m_type = value_t::array;
-        j.m_value = value_t::array;
-        j.m_value.array->reserve(arr.size());
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::array;
+        j.m_data.m_value = value_t::array;
+        j.m_data.m_value.array->reserve(arr.size());
         for (const bool x : arr)
         {
-            j.m_value.array->push_back(x);
-            j.set_parent(j.m_value.array->back());
+            j.m_data.m_value.array->push_back(x);
+            j.set_parent(j.m_data.m_value.array->back());
         }
         j.assert_invariant();
     }
@@ -4450,12 +5582,13 @@ struct external_constructor<value_t::array>
              enable_if_t<std::is_convertible<T, BasicJsonType>::value, int> = 0>
     static void construct(BasicJsonType& j, const std::valarray<T>& arr)
     {
-        j.m_type = value_t::array;
-        j.m_value = value_t::array;
-        j.m_value.array->resize(arr.size());
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::array;
+        j.m_data.m_value = value_t::array;
+        j.m_data.m_value.array->resize(arr.size());
         if (arr.size() > 0)
         {
-            std::copy(std::begin(arr), std::end(arr), j.m_value.array->begin());
+            std::copy(std::begin(arr), std::end(arr), j.m_data.m_value.array->begin());
         }
         j.set_parents();
         j.assert_invariant();
@@ -4468,8 +5601,9 @@ struct external_constructor<value_t::object>
     template<typename BasicJsonType>
     static void construct(BasicJsonType& j, const typename BasicJsonType::object_t& obj)
     {
-        j.m_type = value_t::object;
-        j.m_value = obj;
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::object;
+        j.m_data.m_value = obj;
         j.set_parents();
         j.assert_invariant();
     }
@@ -4477,8 +5611,9 @@ struct external_constructor<value_t::object>
     template<typename BasicJsonType>
     static void construct(BasicJsonType& j, typename BasicJsonType::object_t&& obj)
     {
-        j.m_type = value_t::object;
-        j.m_value = std::move(obj);
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::object;
+        j.m_data.m_value = std::move(obj);
         j.set_parents();
         j.assert_invariant();
     }
@@ -4490,8 +5625,9 @@ struct external_constructor<value_t::object>
         using std::begin;
         using std::end;
 
-        j.m_type = value_t::object;
-        j.m_value.object = j.template create<typename BasicJsonType::object_t>(begin(obj), end(obj));
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::object;
+        j.m_data.m_value.object = j.template create<typename BasicJsonType::object_t>(begin(obj), end(obj));
         j.set_parents();
         j.assert_invariant();
     }
@@ -4503,55 +5639,70 @@ struct external_constructor<value_t::object>
 
 template<typename BasicJsonType, typename T,
          enable_if_t<std::is_same<T, typename BasicJsonType::boolean_t>::value, int> = 0>
-void to_json(BasicJsonType& j, T b) noexcept
+inline void to_json(BasicJsonType& j, T b) noexcept
 {
     external_constructor<value_t::boolean>::construct(j, b);
 }
 
+template < typename BasicJsonType, typename BoolRef,
+           enable_if_t <
+               ((std::is_same<std::vector<bool>::reference, BoolRef>::value
+                 && !std::is_same <std::vector<bool>::reference, typename BasicJsonType::boolean_t&>::value)
+                || (std::is_same<std::vector<bool>::const_reference, BoolRef>::value
+                    && !std::is_same <detail::uncvref_t<std::vector<bool>::const_reference>,
+                                      typename BasicJsonType::boolean_t >::value))
+               && std::is_convertible<const BoolRef&, typename BasicJsonType::boolean_t>::value, int > = 0 >
+inline void to_json(BasicJsonType& j, const BoolRef& b) noexcept
+{
+    external_constructor<value_t::boolean>::construct(j, static_cast<typename BasicJsonType::boolean_t>(b));
+}
+
 template<typename BasicJsonType, typename CompatibleString,
          enable_if_t<std::is_constructible<typename BasicJsonType::string_t, CompatibleString>::value, int> = 0>
-void to_json(BasicJsonType& j, const CompatibleString& s)
+inline void to_json(BasicJsonType& j, const CompatibleString& s)
 {
     external_constructor<value_t::string>::construct(j, s);
 }
 
 template<typename BasicJsonType>
-void to_json(BasicJsonType& j, typename BasicJsonType::string_t&& s)
+inline void to_json(BasicJsonType& j, typename BasicJsonType::string_t&& s)
 {
     external_constructor<value_t::string>::construct(j, std::move(s));
 }
 
 template<typename BasicJsonType, typename FloatType,
          enable_if_t<std::is_floating_point<FloatType>::value, int> = 0>
-void to_json(BasicJsonType& j, FloatType val) noexcept
+inline void to_json(BasicJsonType& j, FloatType val) noexcept
 {
     external_constructor<value_t::number_float>::construct(j, static_cast<typename BasicJsonType::number_float_t>(val));
 }
 
 template<typename BasicJsonType, typename CompatibleNumberUnsignedType,
          enable_if_t<is_compatible_integer_type<typename BasicJsonType::number_unsigned_t, CompatibleNumberUnsignedType>::value, int> = 0>
-void to_json(BasicJsonType& j, CompatibleNumberUnsignedType val) noexcept
+inline void to_json(BasicJsonType& j, CompatibleNumberUnsignedType val) noexcept
 {
     external_constructor<value_t::number_unsigned>::construct(j, static_cast<typename BasicJsonType::number_unsigned_t>(val));
 }
 
 template<typename BasicJsonType, typename CompatibleNumberIntegerType,
          enable_if_t<is_compatible_integer_type<typename BasicJsonType::number_integer_t, CompatibleNumberIntegerType>::value, int> = 0>
-void to_json(BasicJsonType& j, CompatibleNumberIntegerType val) noexcept
+inline void to_json(BasicJsonType& j, CompatibleNumberIntegerType val) noexcept
 {
     external_constructor<value_t::number_integer>::construct(j, static_cast<typename BasicJsonType::number_integer_t>(val));
 }
 
+#if !JSON_DISABLE_ENUM_SERIALIZATION
 template<typename BasicJsonType, typename EnumType,
          enable_if_t<std::is_enum<EnumType>::value, int> = 0>
-void to_json(BasicJsonType& j, EnumType e) noexcept
+inline void to_json(BasicJsonType& j, EnumType e) noexcept
 {
     using underlying_type = typename std::underlying_type<EnumType>::type;
     external_constructor<value_t::number_integer>::construct(j, static_cast<underlying_type>(e));
 }
+#endif  // JSON_DISABLE_ENUM_SERIALIZATION
 
 template<typename BasicJsonType>
-void to_json(BasicJsonType& j, const std::vector<bool>& e)
+inline void to_json(BasicJsonType& j, const std::vector<bool>& e)
 {
     external_constructor<value_t::array>::construct(j, e);
 }
@@ -4564,39 +5715,39 @@ template < typename BasicJsonType, typename CompatibleArrayType,
                          !std::is_same<typename BasicJsonType::binary_t, CompatibleArrayType>::value&&
                          !is_basic_json<CompatibleArrayType>::value,
                          int > = 0 >
-void to_json(BasicJsonType& j, const CompatibleArrayType& arr)
+inline void to_json(BasicJsonType& j, const CompatibleArrayType& arr)
 {
     external_constructor<value_t::array>::construct(j, arr);
 }
 
 template<typename BasicJsonType>
-void to_json(BasicJsonType& j, const typename BasicJsonType::binary_t& bin)
+inline void to_json(BasicJsonType& j, const typename BasicJsonType::binary_t& bin)
 {
     external_constructor<value_t::binary>::construct(j, bin);
 }
 
 template<typename BasicJsonType, typename T,
          enable_if_t<std::is_convertible<T, BasicJsonType>::value, int> = 0>
-void to_json(BasicJsonType& j, const std::valarray<T>& arr)
+inline void to_json(BasicJsonType& j, const std::valarray<T>& arr)
 {
     external_constructor<value_t::array>::construct(j, std::move(arr));
 }
 
 template<typename BasicJsonType>
-void to_json(BasicJsonType& j, typename BasicJsonType::array_t&& arr)
+inline void to_json(BasicJsonType& j, typename BasicJsonType::array_t&& arr)
 {
     external_constructor<value_t::array>::construct(j, std::move(arr));
 }
 
 template < typename BasicJsonType, typename CompatibleObjectType,
            enable_if_t < is_compatible_object_type<BasicJsonType, CompatibleObjectType>::value&& !is_basic_json<CompatibleObjectType>::value, int > = 0 >
-void to_json(BasicJsonType& j, const CompatibleObjectType& obj)
+inline void to_json(BasicJsonType& j, const CompatibleObjectType& obj)
 {
     external_constructor<value_t::object>::construct(j, obj);
 }
 
 template<typename BasicJsonType>
-void to_json(BasicJsonType& j, typename BasicJsonType::object_t&& obj)
+inline void to_json(BasicJsonType& j, typename BasicJsonType::object_t&& obj)
 {
     external_constructor<value_t::object>::construct(j, std::move(obj));
 }
@@ -4604,15 +5755,15 @@ void to_json(BasicJsonType& j, typename BasicJsonType::object_t&& obj)
 template <
     typename BasicJsonType, typename T, std::size_t N,
     enable_if_t < !std::is_constructible<typename BasicJsonType::string_t,
-                  const T(&)[N]>::value,
+                  const T(&)[N]>::value, // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
                   int > = 0 >
-void to_json(BasicJsonType& j, const T(&arr)[N])
+inline void to_json(BasicJsonType& j, const T(&arr)[N]) // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
 {
     external_constructor<value_t::array>::construct(j, arr);
 }
 
 template < typename BasicJsonType, typename T1, typename T2, enable_if_t < std::is_constructible<BasicJsonType, T1>::value&& std::is_constructible<BasicJsonType, T2>::value, int > = 0 >
-void to_json(BasicJsonType& j, const std::pair<T1, T2>& p)
+inline void to_json(BasicJsonType& j, const std::pair<T1, T2>& p)
 {
     j = { p.first, p.second };
 }
@@ -4620,23 +5771,31 @@ void to_json(BasicJsonType& j, const std::pair<T1, T2>& p)
 // for https://github.com/nlohmann/json/pull/1134
 template<typename BasicJsonType, typename T,
          enable_if_t<std::is_same<T, iteration_proxy_value<typename BasicJsonType::iterator>>::value, int> = 0>
-void to_json(BasicJsonType& j, const T& b)
+inline void to_json(BasicJsonType& j, const T& b)
 {
     j = { {b.key(), b.value()} };
 }
 
 template<typename BasicJsonType, typename Tuple, std::size_t... Idx>
-void to_json_tuple_impl(BasicJsonType& j, const Tuple& t, index_sequence<Idx...> /*unused*/)
+inline void to_json_tuple_impl(BasicJsonType& j, const Tuple& t, index_sequence<Idx...> /*unused*/)
 {
     j = { std::get<Idx>(t)... };
 }
 
 template<typename BasicJsonType, typename T, enable_if_t<is_constructible_tuple<BasicJsonType, T>::value, int > = 0>
-void to_json(BasicJsonType& j, const T& t)
+inline void to_json(BasicJsonType& j, const T& t)
 {
     to_json_tuple_impl(j, t, make_index_sequence<std::tuple_size<T>::value> {});
 }
 
+#if JSON_HAS_FILESYSTEM || JSON_HAS_EXPERIMENTAL_FILESYSTEM
+template<typename BasicJsonType>
+inline void to_json(BasicJsonType& j, const std_fs::path& p)
+{
+    j = p.string();
+}
+#endif
+
 struct to_json_fn
 {
     template<typename BasicJsonType, typename T>
@@ -4648,106 +5807,116 @@ struct to_json_fn
 };
 }  // namespace detail
 
+#ifndef JSON_HAS_CPP_17
 /// namespace to hold default `to_json` function
-namespace
+/// to see why this is required:
+/// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/n4381.html
+namespace // NOLINT(cert-dcl59-cpp,fuchsia-header-anon-namespaces,google-build-namespaces)
 {
-constexpr const auto& to_json = detail::static_const<detail::to_json_fn>::value;
-} // namespace
-} // namespace nlohmann
+#endif
+JSON_INLINE_VARIABLE constexpr const auto& to_json = // NOLINT(misc-definitions-in-headers)
+    detail::static_const<detail::to_json_fn>::value;
+#ifndef JSON_HAS_CPP_17
+}  // namespace
+#endif
 
+NLOHMANN_JSON_NAMESPACE_END
 
-namespace nlohmann
-{
+// #include <nlohmann/detail/meta/identity_tag.hpp>
 
-template<typename, typename>
-struct adl_serializer
-{
-    /*!
-    @brief convert a JSON value to any value type
 
-    This function is usually called by the `get()` function of the
-    @ref basic_json class (either explicit or via conversion operators).
+NLOHMANN_JSON_NAMESPACE_BEGIN
 
-    @param[in] j        JSON value to read from
-    @param[in,out] val  value to write to
-    */
-    template<typename BasicJsonType, typename ValueType>
-    static auto from_json(BasicJsonType&& j, ValueType& val) noexcept(
+/// @sa https://json.nlohmann.me/api/adl_serializer/
+template<typename ValueType, typename>
+struct adl_serializer
+{
+    /// @brief convert a JSON value to any value type
+    /// @sa https://json.nlohmann.me/api/adl_serializer/from_json/
+    template<typename BasicJsonType, typename TargetType = ValueType>
+    static auto from_json(BasicJsonType && j, TargetType& val) noexcept(
         noexcept(::nlohmann::from_json(std::forward<BasicJsonType>(j), val)))
     -> decltype(::nlohmann::from_json(std::forward<BasicJsonType>(j), val), void())
     {
         ::nlohmann::from_json(std::forward<BasicJsonType>(j), val);
     }
 
-    /*!
-    @brief convert any value type to a JSON value
-
-    This function is usually called by the constructors of the @ref basic_json
-    class.
+    /// @brief convert a JSON value to any value type
+    /// @sa https://json.nlohmann.me/api/adl_serializer/from_json/
+    template<typename BasicJsonType, typename TargetType = ValueType>
+    static auto from_json(BasicJsonType && j) noexcept(
+    noexcept(::nlohmann::from_json(std::forward<BasicJsonType>(j), detail::identity_tag<TargetType> {})))
+    -> decltype(::nlohmann::from_json(std::forward<BasicJsonType>(j), detail::identity_tag<TargetType> {}))
+    {
+        return ::nlohmann::from_json(std::forward<BasicJsonType>(j), detail::identity_tag<TargetType> {});
+    }
 
-    @param[in,out] j  JSON value to write to
-    @param[in] val    value to read from
-    */
-    template<typename BasicJsonType, typename ValueType>
-    static auto to_json(BasicJsonType& j, ValueType&& val) noexcept(
-        noexcept(::nlohmann::to_json(j, std::forward<ValueType>(val))))
-    -> decltype(::nlohmann::to_json(j, std::forward<ValueType>(val)), void())
+    /// @brief convert any value type to a JSON value
+    /// @sa https://json.nlohmann.me/api/adl_serializer/to_json/
+    template<typename BasicJsonType, typename TargetType = ValueType>
+    static auto to_json(BasicJsonType& j, TargetType && val) noexcept(
+        noexcept(::nlohmann::to_json(j, std::forward<TargetType>(val))))
+    -> decltype(::nlohmann::to_json(j, std::forward<TargetType>(val)), void())
     {
-        ::nlohmann::to_json(j, std::forward<ValueType>(val));
+        ::nlohmann::to_json(j, std::forward<TargetType>(val));
     }
 };
 
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
 
 // #include <nlohmann/byte_container_with_subtype.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
 
 
-#include <cstdint> // uint8_t
+
+#include <cstdint> // uint8_t, uint64_t
 #include <tuple> // tie
 #include <utility> // move
 
-namespace nlohmann
-{
-
-/*!
-@brief an internal type for a backed binary type
+// #include <nlohmann/detail/abi_macros.hpp>
 
-This type extends the template parameter @a BinaryType provided to `basic_json`
-with a subtype used by BSON and MessagePack. This type exists so that the user
-does not have to specify a type themselves with a specific naming scheme in
-order to override the binary type.
 
-@tparam BinaryType container to store bytes (`std::vector<std::uint8_t>` by
-                   default)
+NLOHMANN_JSON_NAMESPACE_BEGIN
 
-@since version 3.8.0
-*/
+/// @brief an internal type for a backed binary type
+/// @sa https://json.nlohmann.me/api/byte_container_with_subtype/
 template<typename BinaryType>
 class byte_container_with_subtype : public BinaryType
 {
   public:
-    /// the type of the underlying container
     using container_type = BinaryType;
+    using subtype_type = std::uint64_t;
 
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
     byte_container_with_subtype() noexcept(noexcept(container_type()))
         : container_type()
     {}
 
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
     byte_container_with_subtype(const container_type& b) noexcept(noexcept(container_type(b)))
         : container_type(b)
     {}
 
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
     byte_container_with_subtype(container_type&& b) noexcept(noexcept(container_type(std::move(b))))
         : container_type(std::move(b))
     {}
 
-    byte_container_with_subtype(const container_type& b, std::uint8_t subtype_) noexcept(noexcept(container_type(b)))
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
+    byte_container_with_subtype(const container_type& b, subtype_type subtype_) noexcept(noexcept(container_type(b)))
         : container_type(b)
         , m_subtype(subtype_)
         , m_has_subtype(true)
     {}
 
-    byte_container_with_subtype(container_type&& b, std::uint8_t subtype_) noexcept(noexcept(container_type(std::move(b))))
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
+    byte_container_with_subtype(container_type&& b, subtype_type subtype_) noexcept(noexcept(container_type(std::move(b))))
         : container_type(std::move(b))
         , m_subtype(subtype_)
         , m_has_subtype(true)
@@ -4764,96 +5933,30 @@ class byte_container_with_subtype : public BinaryType
         return !(rhs == *this);
     }
 
-    /*!
-    @brief sets the binary subtype
-
-    Sets the binary subtype of the value, also flags a binary JSON value as
-    having a subtype, which has implications for serialization.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @sa @ref subtype() -- return the binary subtype
-    @sa @ref clear_subtype() -- clears the binary subtype
-    @sa @ref has_subtype() -- returns whether or not the binary value has a
-    subtype
-
-    @since version 3.8.0
-    */
-    void set_subtype(std::uint8_t subtype_) noexcept
+    /// @brief sets the binary subtype
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/set_subtype/
+    void set_subtype(subtype_type subtype_) noexcept
     {
         m_subtype = subtype_;
         m_has_subtype = true;
     }
 
-    /*!
-    @brief return the binary subtype
-
-    Returns the numerical subtype of the value if it has a subtype. If it does
-    not have a subtype, this function will return size_t(-1) as a sentinel
-    value.
-
-    @return the numerical subtype of the binary value
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @sa @ref set_subtype() -- sets the binary subtype
-    @sa @ref clear_subtype() -- clears the binary subtype
-    @sa @ref has_subtype() -- returns whether or not the binary value has a
-    subtype
-
-    @since version 3.8.0
-    */
-    constexpr std::uint8_t subtype() const noexcept
-    {
-        return m_subtype;
-    }
-
-    /*!
-    @brief return whether the value has a subtype
-
-    @return whether the value has a subtype
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @sa @ref subtype() -- return the binary subtype
-    @sa @ref set_subtype() -- sets the binary subtype
-    @sa @ref clear_subtype() -- clears the binary subtype
-
-    @since version 3.8.0
-    */
-    constexpr bool has_subtype() const noexcept
+    /// @brief return the binary subtype
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/subtype/
+    constexpr subtype_type subtype() const noexcept
     {
-        return m_has_subtype;
+        return m_has_subtype ? m_subtype : static_cast<subtype_type>(-1);
     }
 
-    /*!
-    @brief clears the binary subtype
-
-    Clears the binary subtype and flags the value as not having a subtype, which
-    has implications for serialization; for instance MessagePack will prefer the
-    bin family over the ext family.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @sa @ref subtype() -- return the binary subtype
-    @sa @ref set_subtype() -- sets the binary subtype
-    @sa @ref has_subtype() -- returns whether or not the binary value has a
-    subtype
+    /// @brief return whether the value has a subtype
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/has_subtype/
+    constexpr bool has_subtype() const noexcept
+    {
+        return m_has_subtype;
+    }
 
-    @since version 3.8.0
-    */
+    /// @brief clears the binary subtype
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/clear_subtype/
     void clear_subtype() noexcept
     {
         m_subtype = 0;
@@ -4861,11 +5964,11 @@ class byte_container_with_subtype : public BinaryType
     }
 
   private:
-    std::uint8_t m_subtype = 0;
+    subtype_type m_subtype = 0;
     bool m_has_subtype = false;
 };
 
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
 
 // #include <nlohmann/detail/conversions/from_json.hpp>
 
@@ -4874,16 +5977,26 @@ class byte_container_with_subtype : public BinaryType
 // #include <nlohmann/detail/exceptions.hpp>
 
 // #include <nlohmann/detail/hash.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
 
 
-#include <cstddef> // size_t, uint8_t
+
+#include <cstdint> // uint8_t
+#include <cstddef> // size_t
 #include <functional> // hash
 
-// #include <nlohmann/detail/macro_scope.hpp>
+// #include <nlohmann/detail/abi_macros.hpp>
 
+// #include <nlohmann/detail/value_t.hpp>
 
-namespace nlohmann
-{
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
 
@@ -4979,7 +6092,7 @@ std::size_t hash(const BasicJsonType& j)
             auto seed = combine(type, j.get_binary().size());
             const auto h = std::hash<bool> {}(j.get_binary().has_subtype());
             seed = combine(seed, h);
-            seed = combine(seed, j.get_binary().subtype());
+            seed = combine(seed, static_cast<std::size_t>(j.get_binary().subtype()));
             for (const auto byte : j.get_binary())
             {
                 seed = combine(seed, std::hash<std::uint8_t> {}(byte));
@@ -4988,15 +6101,23 @@ std::size_t hash(const BasicJsonType& j)
         }
 
         default:                   // LCOV_EXCL_LINE
-            JSON_ASSERT(false);    // LCOV_EXCL_LINE
+            JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
             return 0;              // LCOV_EXCL_LINE
     }
 }
 
 }  // namespace detail
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
 
 // #include <nlohmann/detail/input/binary_reader.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 
 
 #include <algorithm> // generate_n
@@ -5015,13 +6136,19 @@ std::size_t hash(const BasicJsonType& j)
 // #include <nlohmann/detail/exceptions.hpp>
 
 // #include <nlohmann/detail/input/input_adapters.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 
 
 #include <array> // array
 #include <cstddef> // size_t
-#include <cstdio> //FILE *
 #include <cstring> // strlen
-#include <istream> // istream
 #include <iterator> // begin, end, iterator_traits, random_access_iterator_tag, distance, next
 #include <memory> // shared_ptr, make_shared, addressof
 #include <numeric> // accumulate
@@ -5029,22 +6156,30 @@ std::size_t hash(const BasicJsonType& j)
 #include <type_traits> // enable_if, is_base_of, is_pointer, is_integral, remove_pointer
 #include <utility> // pair, declval
 
+#ifndef JSON_NO_IO
+    #include <cstdio>   // FILE *
+    #include <istream>  // istream
+#endif                  // JSON_NO_IO
+
 // #include <nlohmann/detail/iterators/iterator_traits.hpp>
 
 // #include <nlohmann/detail/macro_scope.hpp>
 
+// #include <nlohmann/detail/meta/type_traits.hpp>
 
-namespace nlohmann
-{
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
+
 /// the supported input formats
-enum class input_format_t { json, cbor, msgpack, ubjson, bson };
+enum class input_format_t { json, cbor, msgpack, ubjson, bson, bjdata };
 
 ////////////////////
 // input adapters //
 ////////////////////
 
+#ifndef JSON_NO_IO
 /*!
 Input adapter for stdio file access. This adapter read only 1 byte and do not use any
  buffer. This adapter is a very low level adapter.
@@ -5057,13 +6192,16 @@ class file_input_adapter
     JSON_HEDLEY_NON_NULL(2)
     explicit file_input_adapter(std::FILE* f) noexcept
         : m_file(f)
-    {}
+    {
+        JSON_ASSERT(m_file != nullptr);
+    }
 
     // make class move-only
     file_input_adapter(const file_input_adapter&) = delete;
-    file_input_adapter(file_input_adapter&&) = default;
+    file_input_adapter(file_input_adapter&&) noexcept = default;
     file_input_adapter& operator=(const file_input_adapter&) = delete;
     file_input_adapter& operator=(file_input_adapter&&) = delete;
+    ~file_input_adapter() = default;
 
     std::char_traits<char>::int_type get_character() noexcept
     {
@@ -5075,7 +6213,6 @@ class file_input_adapter
     std::FILE* m_file;
 };
 
-
 /*!
 Input adapter for a (caching) istream. Ignores a UFT Byte Order Mark at
 beginning of input. Does not support changing the underlying std::streambuf
@@ -5107,9 +6244,10 @@ class input_stream_adapter
     // delete because of pointer members
     input_stream_adapter(const input_stream_adapter&) = delete;
     input_stream_adapter& operator=(input_stream_adapter&) = delete;
-    input_stream_adapter& operator=(input_stream_adapter&& rhs) = delete;
+    input_stream_adapter& operator=(input_stream_adapter&&) = delete;
 
-    input_stream_adapter(input_stream_adapter&& rhs) noexcept : is(rhs.is), sb(rhs.sb)
+    input_stream_adapter(input_stream_adapter&& rhs) noexcept
+        : is(rhs.is), sb(rhs.sb)
     {
         rhs.is = nullptr;
         rhs.sb = nullptr;
@@ -5117,12 +6255,12 @@ class input_stream_adapter
 
     // std::istream/std::streambuf use std::char_traits<char>::to_int_type, to
     // ensure that std::char_traits<char>::eof() and the character 0xFF do not
-    // end up as the same value, eg. 0xFFFFFFFF.
+    // end up as the same value, e.g. 0xFFFFFFFF.
     std::char_traits<char>::int_type get_character()
     {
         auto res = sb->sbumpc();
         // set eof manually, as we don't use the istream interface.
-        if (JSON_HEDLEY_UNLIKELY(res == EOF))
+        if (JSON_HEDLEY_UNLIKELY(res == std::char_traits<char>::eof()))
         {
             is->clear(is->rdstate() | std::ios::eofbit);
         }
@@ -5134,6 +6272,7 @@ class input_stream_adapter
     std::istream* is = nullptr;
     std::streambuf* sb = nullptr;
 };
+#endif  // JSON_NO_IO
 
 // General-purpose iterator-based adapter. It might not be as fast as
 // theoretically possible for some containers, but it is extremely versatile.
@@ -5144,18 +6283,19 @@ class iterator_input_adapter
     using char_type = typename std::iterator_traits<IteratorType>::value_type;
 
     iterator_input_adapter(IteratorType first, IteratorType last)
-        : current(std::move(first)), end(std::move(last)) {}
+        : current(std::move(first)), end(std::move(last))
+    {}
 
-    typename std::char_traits<char_type>::int_type get_character()
+    typename char_traits<char_type>::int_type get_character()
     {
         if (JSON_HEDLEY_LIKELY(current != end))
         {
-            auto result = std::char_traits<char_type>::to_int_type(*current);
+            auto result = char_traits<char_type>::to_int_type(*current);
             std::advance(current, 1);
             return result;
         }
 
-        return std::char_traits<char_type>::eof();
+        return char_traits<char_type>::eof();
     }
 
   private:
@@ -5169,10 +6309,8 @@ class iterator_input_adapter
     {
         return current == end;
     }
-
 };
 
-
 template<typename BaseInputAdapter, size_t T>
 struct wide_string_input_helper;
 
@@ -5296,7 +6434,7 @@ struct wide_string_input_helper<BaseInputAdapter, 2>
     }
 };
 
-// Wraps another input apdater to convert wide character types into individual bytes.
+// Wraps another input adapter to convert wide character types into individual bytes.
 template<typename BaseInputAdapter, typename WideCharType>
 class wide_string_input_adapter
 {
@@ -5341,7 +6479,6 @@ class wide_string_input_adapter
     std::size_t utf8_bytes_filled = 0;
 };
 
-
 template<typename IteratorType, typename Enable = void>
 struct iterator_input_adapter_factory
 {
@@ -5412,7 +6549,7 @@ struct container_input_adapter_factory< ContainerType,
 }
        };
 
-}
+}  // namespace container_input_adapter_factory_impl
 
 template<typename ContainerType>
 typename container_input_adapter_factory_impl::container_input_adapter_factory<ContainerType>::adapter_type input_adapter(const ContainerType& container)
@@ -5420,6 +6557,7 @@ typename container_input_adapter_factory_impl::container_input_adapter_factory<C
     return container_input_adapter_factory_impl::container_input_adapter_factory<ContainerType>::create(container);
 }
 
+#ifndef JSON_NO_IO
 // Special cases with fast paths
 inline file_input_adapter input_adapter(std::FILE* file)
 {
@@ -5435,6 +6573,7 @@ inline input_stream_adapter input_adapter(std::istream&& stream)
 {
     return input_stream_adapter(stream);
 }
+#endif  // JSON_NO_IO
 
 using contiguous_bytes_input_adapter = decltype(input_adapter(std::declval<const char*>(), std::declval<const char*>()));
 
@@ -5454,13 +6593,13 @@ contiguous_bytes_input_adapter input_adapter(CharT b)
 }
 
 template<typename T, std::size_t N>
-auto input_adapter(T (&array)[N]) -> decltype(input_adapter(array, array + N))
+auto input_adapter(T (&array)[N]) -> decltype(input_adapter(array, array + N)) // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
 {
     return input_adapter(array, array + N);
 }
 
 // This class only handles inputs of input_buffer_adapter type.
-// It's required so that expressions like {ptr, len} can be implicitely casted
+// It's required so that expressions like {ptr, len} can be implicitly cast
 // to the correct adapter.
 class span_input_adapter
 {
@@ -5483,16 +6622,25 @@ class span_input_adapter
 
     contiguous_bytes_input_adapter&& get()
     {
-        return std::move(ia);
+        return std::move(ia); // NOLINT(hicpp-move-const-arg,performance-move-const-arg)
     }
 
   private:
     contiguous_bytes_input_adapter ia;
 };
+
 }  // namespace detail
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
 
 // #include <nlohmann/detail/input/json_sax.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 
 
 #include <cstddef>
@@ -5504,9 +6652,10 @@ class span_input_adapter
 
 // #include <nlohmann/detail/macro_scope.hpp>
 
+// #include <nlohmann/detail/string_concat.hpp>
 
-namespace nlohmann
-{
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
 
 /*!
 @brief SAX interface
@@ -5553,7 +6702,7 @@ struct json_sax
     virtual bool number_unsigned(number_unsigned_t val) = 0;
 
     /*!
-    @brief an floating-point number was read
+    @brief a floating-point number was read
     @param[in] val  floating-point value
     @param[in] s    raw token value
     @return whether parsing should proceed
@@ -5561,18 +6710,18 @@ struct json_sax
     virtual bool number_float(number_float_t val, const string_t& s) = 0;
 
     /*!
-    @brief a string was read
+    @brief a string value was read
     @param[in] val  string value
     @return whether parsing should proceed
-    @note It is safe to move the passed string.
+    @note It is safe to move the passed string value.
     */
     virtual bool string(string_t& val) = 0;
 
     /*!
-    @brief a binary string was read
+    @brief a binary value was read
     @param[in] val  binary value
     @return whether parsing should proceed
-    @note It is safe to move the passed binary.
+    @note It is safe to move the passed binary value.
     */
     virtual bool binary(binary_t& val) = 0;
 
@@ -5623,10 +6772,14 @@ struct json_sax
                              const std::string& last_token,
                              const detail::exception& ex) = 0;
 
+    json_sax() = default;
+    json_sax(const json_sax&) = default;
+    json_sax(json_sax&&) noexcept = default;
+    json_sax& operator=(const json_sax&) = default;
+    json_sax& operator=(json_sax&&) noexcept = default;
     virtual ~json_sax() = default;
 };
 
-
 namespace detail
 {
 /*!
@@ -5653,7 +6806,7 @@ class json_sax_dom_parser
     using binary_t = typename BasicJsonType::binary_t;
 
     /*!
-    @param[in, out] r  reference to a JSON value that is manipulated while
+    @param[in,out] r  reference to a JSON value that is manipulated while
                        parsing
     @param[in] allow_exceptions_  whether parse errors yield exceptions
     */
@@ -5663,9 +6816,9 @@ class json_sax_dom_parser
 
     // make class move-only
     json_sax_dom_parser(const json_sax_dom_parser&) = delete;
-    json_sax_dom_parser(json_sax_dom_parser&&) = default;
+    json_sax_dom_parser(json_sax_dom_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
     json_sax_dom_parser& operator=(const json_sax_dom_parser&) = delete;
-    json_sax_dom_parser& operator=(json_sax_dom_parser&&) = default;
+    json_sax_dom_parser& operator=(json_sax_dom_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
     ~json_sax_dom_parser() = default;
 
     bool null()
@@ -5714,9 +6867,9 @@ class json_sax_dom_parser
     {
         ref_stack.push_back(handle_value(BasicJsonType::value_t::object));
 
-        if (JSON_HEDLEY_UNLIKELY(len != std::size_t(-1) && len > ref_stack.back()->max_size()))
+        if (JSON_HEDLEY_UNLIKELY(len != static_cast<std::size_t>(-1) && len > ref_stack.back()->max_size()))
         {
-            JSON_THROW(out_of_range::create(408, "excessive object size: " + std::to_string(len), *ref_stack.back()));
+            JSON_THROW(out_of_range::create(408, concat("excessive object size: ", std::to_string(len)), ref_stack.back()));
         }
 
         return true;
@@ -5724,13 +6877,19 @@ class json_sax_dom_parser
 
     bool key(string_t& val)
     {
+        JSON_ASSERT(!ref_stack.empty());
+        JSON_ASSERT(ref_stack.back()->is_object());
+
         // add null at given key and store the reference for later
-        object_element = &(ref_stack.back()->m_value.object->operator[](val));
+        object_element = &(ref_stack.back()->m_data.m_value.object->operator[](val));
         return true;
     }
 
     bool end_object()
     {
+        JSON_ASSERT(!ref_stack.empty());
+        JSON_ASSERT(ref_stack.back()->is_object());
+
         ref_stack.back()->set_parents();
         ref_stack.pop_back();
         return true;
@@ -5740,9 +6899,9 @@ class json_sax_dom_parser
     {
         ref_stack.push_back(handle_value(BasicJsonType::value_t::array));
 
-        if (JSON_HEDLEY_UNLIKELY(len != std::size_t(-1) && len > ref_stack.back()->max_size()))
+        if (JSON_HEDLEY_UNLIKELY(len != static_cast<std::size_t>(-1) && len > ref_stack.back()->max_size()))
         {
-            JSON_THROW(out_of_range::create(408, "excessive array size: " + std::to_string(len), *ref_stack.back()));
+            JSON_THROW(out_of_range::create(408, concat("excessive array size: ", std::to_string(len)), ref_stack.back()));
         }
 
         return true;
@@ -5750,6 +6909,9 @@ class json_sax_dom_parser
 
     bool end_array()
     {
+        JSON_ASSERT(!ref_stack.empty());
+        JSON_ASSERT(ref_stack.back()->is_array());
+
         ref_stack.back()->set_parents();
         ref_stack.pop_back();
         return true;
@@ -5794,8 +6956,8 @@ class json_sax_dom_parser
 
         if (ref_stack.back()->is_array())
         {
-            ref_stack.back()->m_value.array->emplace_back(std::forward<Value>(v));
-            return &(ref_stack.back()->m_value.array->back());
+            ref_stack.back()->m_data.m_value.array->emplace_back(std::forward<Value>(v));
+            return &(ref_stack.back()->m_data.m_value.array->back());
         }
 
         JSON_ASSERT(ref_stack.back()->is_object());
@@ -5838,9 +7000,9 @@ class json_sax_dom_callback_parser
 
     // make class move-only
     json_sax_dom_callback_parser(const json_sax_dom_callback_parser&) = delete;
-    json_sax_dom_callback_parser(json_sax_dom_callback_parser&&) = default;
+    json_sax_dom_callback_parser(json_sax_dom_callback_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
     json_sax_dom_callback_parser& operator=(const json_sax_dom_callback_parser&) = delete;
-    json_sax_dom_callback_parser& operator=(json_sax_dom_callback_parser&&) = default;
+    json_sax_dom_callback_parser& operator=(json_sax_dom_callback_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
     ~json_sax_dom_callback_parser() = default;
 
     bool null()
@@ -5895,9 +7057,9 @@ class json_sax_dom_callback_parser
         ref_stack.push_back(val.second);
 
         // check object limit
-        if (ref_stack.back() && JSON_HEDLEY_UNLIKELY(len != std::size_t(-1) && len > ref_stack.back()->max_size()))
+        if (ref_stack.back() && JSON_HEDLEY_UNLIKELY(len != static_cast<std::size_t>(-1) && len > ref_stack.back()->max_size()))
         {
-            JSON_THROW(out_of_range::create(408, "excessive object size: " + std::to_string(len), *ref_stack.back()));
+            JSON_THROW(out_of_range::create(408, concat("excessive object size: ", std::to_string(len)), ref_stack.back()));
         }
 
         return true;
@@ -5914,7 +7076,7 @@ class json_sax_dom_callback_parser
         // add discarded value at given key and store the reference for later
         if (keep && ref_stack.back())
         {
-            object_element = &(ref_stack.back()->m_value.object->operator[](val) = discarded);
+            object_element = &(ref_stack.back()->m_data.m_value.object->operator[](val) = discarded);
         }
 
         return true;
@@ -5965,9 +7127,9 @@ class json_sax_dom_callback_parser
         ref_stack.push_back(val.second);
 
         // check array limit
-        if (ref_stack.back() && JSON_HEDLEY_UNLIKELY(len != std::size_t(-1) && len > ref_stack.back()->max_size()))
+        if (ref_stack.back() && JSON_HEDLEY_UNLIKELY(len != static_cast<std::size_t>(-1) && len > ref_stack.back()->max_size()))
         {
-            JSON_THROW(out_of_range::create(408, "excessive array size: " + std::to_string(len), *ref_stack.back()));
+            JSON_THROW(out_of_range::create(408, concat("excessive array size: ", std::to_string(len)), ref_stack.back()));
         }
 
         return true;
@@ -5999,7 +7161,7 @@ class json_sax_dom_callback_parser
         // remove discarded value
         if (!keep && !ref_stack.empty() && ref_stack.back()->is_array())
         {
-            ref_stack.back()->m_value.array->pop_back();
+            ref_stack.back()->m_data.m_value.array->pop_back();
         }
 
         return true;
@@ -6066,7 +7228,7 @@ class json_sax_dom_callback_parser
         if (ref_stack.empty())
         {
             root = std::move(value);
-            return {true, &root};
+            return {true, & root};
         }
 
         // skip this value if we already decided to skip the parent
@@ -6082,8 +7244,8 @@ class json_sax_dom_callback_parser
         // array
         if (ref_stack.back()->is_array())
         {
-            ref_stack.back()->m_value.array->emplace_back(std::move(value));
-            return {true, &(ref_stack.back()->m_value.array->back())};
+            ref_stack.back()->m_data.m_value.array->emplace_back(std::move(value));
+            return {true, & (ref_stack.back()->m_data.m_value.array->back())};
         }
 
         // object
@@ -6168,7 +7330,7 @@ class json_sax_acceptor
         return true;
     }
 
-    bool start_object(std::size_t /*unused*/ = std::size_t(-1))
+    bool start_object(std::size_t /*unused*/ = static_cast<std::size_t>(-1))
     {
         return true;
     }
@@ -6183,7 +7345,7 @@ class json_sax_acceptor
         return true;
     }
 
-    bool start_array(std::size_t /*unused*/ = std::size_t(-1))
+    bool start_array(std::size_t /*unused*/ = static_cast<std::size_t>(-1))
     {
         return true;
     }
@@ -6198,11 +7360,19 @@ class json_sax_acceptor
         return false;
     }
 };
-}  // namespace detail
 
-}  // namespace nlohmann
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
 
 // #include <nlohmann/detail/input/lexer.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 
 
 #include <array> // array
@@ -6221,11 +7391,13 @@ class json_sax_acceptor
 
 // #include <nlohmann/detail/macro_scope.hpp>
 
+// #include <nlohmann/detail/meta/type_traits.hpp>
 
-namespace nlohmann
-{
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
+
 ///////////
 // lexer //
 ///////////
@@ -6315,12 +7487,12 @@ class lexer : public lexer_base<BasicJsonType>
     using number_float_t = typename BasicJsonType::number_float_t;
     using string_t = typename BasicJsonType::string_t;
     using char_type = typename InputAdapterType::char_type;
-    using char_int_type = typename std::char_traits<char_type>::int_type;
+    using char_int_type = typename char_traits<char_type>::int_type;
 
   public:
     using token_type = typename lexer_base<BasicJsonType>::token_type;
 
-    explicit lexer(InputAdapterType&& adapter, bool ignore_comments_ = false)
+    explicit lexer(InputAdapterType&& adapter, bool ignore_comments_ = false) noexcept
         : ia(std::move(adapter))
         , ignore_comments(ignore_comments_)
         , decimal_point_char(static_cast<char_int_type>(get_decimal_point()))
@@ -6328,9 +7500,9 @@ class lexer : public lexer_base<BasicJsonType>
 
     // delete because of pointer members
     lexer(const lexer&) = delete;
-    lexer(lexer&&) = default;
+    lexer(lexer&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
     lexer& operator=(lexer&) = delete;
-    lexer& operator=(lexer&&) = default;
+    lexer& operator=(lexer&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
     ~lexer() = default;
 
   private:
@@ -6422,7 +7594,7 @@ class lexer : public lexer_base<BasicJsonType>
         for (auto range = ranges.begin(); range != ranges.end(); ++range)
         {
             get();
-            if (JSON_HEDLEY_LIKELY(*range <= current && current <= *(++range)))
+            if (JSON_HEDLEY_LIKELY(*range <= current && current <= *(++range))) // NOLINT(bugprone-inc-dec-in-conditions)
             {
                 add(current);
             }
@@ -6439,7 +7611,7 @@ class lexer : public lexer_base<BasicJsonType>
     /*!
     @brief scan a string literal
 
-    This function scans a string according to Sect. 7 of RFC 7159. While
+    This function scans a string according to Sect. 7 of RFC 8259. While
     scanning, bytes are escaped and copied into buffer token_buffer. Then the
     function returns successfully, token_buffer is *not* null-terminated (as it
     may contain \0 bytes), and token_buffer.size() is the number of bytes in the
@@ -6465,7 +7637,7 @@ class lexer : public lexer_base<BasicJsonType>
             switch (get())
             {
                 // end of file while parsing string
-                case std::char_traits<char_type>::eof():
+                case char_traits<char_type>::eof():
                 {
                     error_message = "invalid string: missing closing quote";
                     return token_type::parse_error;
@@ -6551,7 +7723,7 @@ class lexer : public lexer_base<BasicJsonType>
                                                         // low surrogate occupies the least significant 15 bits
                                                         + static_cast<unsigned int>(codepoint2)
                                                         // there is still the 0xD800, 0xDC00 and 0x10000 noise
-                                                        // in the result so we have to subtract with:
+                                                        // in the result, so we have to subtract with:
                                                         // (0xD800 << 10) + DC00 - 0x10000 = 0x35FDC00
                                                         - 0x35FDC00u);
                                     }
@@ -7054,7 +8226,7 @@ class lexer : public lexer_base<BasicJsonType>
                     {
                         case '\n':
                         case '\r':
-                        case std::char_traits<char_type>::eof():
+                        case char_traits<char_type>::eof():
                         case '\0':
                             return true;
 
@@ -7071,7 +8243,7 @@ class lexer : public lexer_base<BasicJsonType>
                 {
                     switch (get())
                     {
-                        case std::char_traits<char_type>::eof():
+                        case char_traits<char_type>::eof():
                         case '\0':
                         {
                             error_message = "invalid comment; missing closing '*/'";
@@ -7129,10 +8301,10 @@ class lexer : public lexer_base<BasicJsonType>
     /*!
     @brief scan a number literal
 
-    This function scans a string according to Sect. 6 of RFC 7159.
+    This function scans a string according to Sect. 6 of RFC 8259.
 
     The function is realized with a deterministic finite state machine derived
-    from the grammar described in RFC 7159. Starting in state "init", the
+    from the grammar described in RFC 8259. Starting in state "init", the
     input is read and used to determined the next state. Only state "done"
     accepts the number. State "error" is a trap state to model errors. In the
     table below, "anything" means any character but the ones listed before.
@@ -7206,7 +8378,7 @@ class lexer : public lexer_base<BasicJsonType>
 
             // all other characters are rejected outside scan_number()
             default:            // LCOV_EXCL_LINE
-                JSON_ASSERT(false);  // LCOV_EXCL_LINE
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
         }
 
 scan_number_minus:
@@ -7444,7 +8616,7 @@ class lexer : public lexer_base<BasicJsonType>
         // we are done scanning a number)
         unget();
 
-        char* endptr = nullptr;
+        char* endptr = nullptr; // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
         errno = 0;
 
         // try to parse integers first and fall back to floats
@@ -7500,10 +8672,10 @@ class lexer : public lexer_base<BasicJsonType>
     token_type scan_literal(const char_type* literal_text, const std::size_t length,
                             token_type return_type)
     {
-        JSON_ASSERT(std::char_traits<char_type>::to_char_type(current) == literal_text[0]);
+        JSON_ASSERT(char_traits<char_type>::to_char_type(current) == literal_text[0]);
         for (std::size_t i = 1; i < length; ++i)
         {
-            if (JSON_HEDLEY_UNLIKELY(std::char_traits<char_type>::to_char_type(get()) != literal_text[i]))
+            if (JSON_HEDLEY_UNLIKELY(char_traits<char_type>::to_char_type(get()) != literal_text[i]))
             {
                 error_message = "invalid literal";
                 return token_type::parse_error;
@@ -7521,7 +8693,7 @@ class lexer : public lexer_base<BasicJsonType>
     {
         token_buffer.clear();
         token_string.clear();
-        token_string.push_back(std::char_traits<char_type>::to_char_type(current));
+        token_string.push_back(char_traits<char_type>::to_char_type(current));
     }
 
     /*
@@ -7529,7 +8701,7 @@ class lexer : public lexer_base<BasicJsonType>
 
     This function provides the interface to the used input adapter. It does
     not throw in case the input reached EOF, but returns a
-    `std::char_traits<char>::eof()` in that case.  Stores the scanned characters
+    `char_traits<char>::eof()` in that case.  Stores the scanned characters
     for use in error messages.
 
     @return character read from the input
@@ -7549,9 +8721,9 @@ class lexer : public lexer_base<BasicJsonType>
             current = ia.get_character();
         }
 
-        if (JSON_HEDLEY_LIKELY(current != std::char_traits<char_type>::eof()))
+        if (JSON_HEDLEY_LIKELY(current != char_traits<char_type>::eof()))
         {
-            token_string.push_back(std::char_traits<char_type>::to_char_type(current));
+            token_string.push_back(char_traits<char_type>::to_char_type(current));
         }
 
         if (current == '\n')
@@ -7590,7 +8762,7 @@ class lexer : public lexer_base<BasicJsonType>
             --position.chars_read_current_line;
         }
 
-        if (JSON_HEDLEY_LIKELY(current != std::char_traits<char_type>::eof()))
+        if (JSON_HEDLEY_LIKELY(current != char_traits<char_type>::eof()))
         {
             JSON_ASSERT(!token_string.empty());
             token_string.pop_back();
@@ -7655,7 +8827,7 @@ class lexer : public lexer_base<BasicJsonType>
             {
                 // escape control characters
                 std::array<char, 9> cs{{}};
-                (std::snprintf)(cs.data(), cs.size(), "<U+%.4X>", static_cast<unsigned char>(c));
+                static_cast<void>((std::snprintf)(cs.data(), cs.size(), "<U+%.4X>", static_cast<unsigned char>(c))); // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
                 result += cs.data();
             }
             else
@@ -7749,17 +8921,17 @@ class lexer : public lexer_base<BasicJsonType>
             // literals
             case 't':
             {
-                std::array<char_type, 4> true_literal = {{char_type('t'), char_type('r'), char_type('u'), char_type('e')}};
+                std::array<char_type, 4> true_literal = {{static_cast<char_type>('t'), static_cast<char_type>('r'), static_cast<char_type>('u'), static_cast<char_type>('e')}};
                 return scan_literal(true_literal.data(), true_literal.size(), token_type::literal_true);
             }
             case 'f':
             {
-                std::array<char_type, 5> false_literal = {{char_type('f'), char_type('a'), char_type('l'), char_type('s'), char_type('e')}};
+                std::array<char_type, 5> false_literal = {{static_cast<char_type>('f'), static_cast<char_type>('a'), static_cast<char_type>('l'), static_cast<char_type>('s'), static_cast<char_type>('e')}};
                 return scan_literal(false_literal.data(), false_literal.size(), token_type::literal_false);
             }
             case 'n':
             {
-                std::array<char_type, 4> null_literal = {{char_type('n'), char_type('u'), char_type('l'), char_type('l')}};
+                std::array<char_type, 4> null_literal = {{static_cast<char_type>('n'), static_cast<char_type>('u'), static_cast<char_type>('l'), static_cast<char_type>('l')}};
                 return scan_literal(null_literal.data(), null_literal.size(), token_type::literal_null);
             }
 
@@ -7784,7 +8956,7 @@ class lexer : public lexer_base<BasicJsonType>
             // end of input (the null byte is needed when parsing from
             // string literals)
             case '\0':
-            case std::char_traits<char_type>::eof():
+            case char_traits<char_type>::eof():
                 return token_type::end_of_input;
 
             // error
@@ -7802,7 +8974,7 @@ class lexer : public lexer_base<BasicJsonType>
     const bool ignore_comments = false;
 
     /// the current character
-    char_int_type current = std::char_traits<char_type>::eof();
+    char_int_type current = char_traits<char_type>::eof();
 
     /// whether the next get() call should just return current
     bool next_unget = false;
@@ -7827,27 +8999,38 @@ class lexer : public lexer_base<BasicJsonType>
     /// the decimal point
     const char_int_type decimal_point_char = '.';
 };
+
 }  // namespace detail
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
 
 // #include <nlohmann/detail/macro_scope.hpp>
 
 // #include <nlohmann/detail/meta/is_sax.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 
 
 #include <cstdint> // size_t
 #include <utility> // declval
 #include <string> // string
 
+// #include <nlohmann/detail/abi_macros.hpp>
+
 // #include <nlohmann/detail/meta/detected.hpp>
 
 // #include <nlohmann/detail/meta/type_traits.hpp>
 
 
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
+
 template<typename T>
 using null_function_t = decltype(std::declval<T&>().null());
 
@@ -7982,22 +9165,27 @@ struct is_sax_static_asserts
         "Missing/invalid function: bool parse_error(std::size_t, const "
         "std::string&, const exception&)");
 };
+
 }  // namespace detail
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/string_concat.hpp>
 
 // #include <nlohmann/detail/value_t.hpp>
 
 
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
 
 /// how to treat CBOR tags
 enum class cbor_tag_handler_t
 {
-    error,  ///< throw a parse_error exception in case of a tag
-    ignore   ///< ignore tags
+    error,   ///< throw a parse_error exception in case of a tag
+    ignore,  ///< ignore tags
+    store    ///< store tags as binary type
 };
 
 /*!
@@ -8007,12 +9195,11 @@ enum class cbor_tag_handler_t
 
 @note from https://stackoverflow.com/a/1001328/266378
 */
-static inline bool little_endianess(int num = 1) noexcept
+static inline bool little_endianness(int num = 1) noexcept
 {
     return *reinterpret_cast<char*>(&num) == 1;
 }
 
-
 ///////////////////
 // binary reader //
 ///////////////////
@@ -8030,7 +9217,7 @@ class binary_reader
     using binary_t = typename BasicJsonType::binary_t;
     using json_sax_t = SAX;
     using char_type = typename InputAdapterType::char_type;
-    using char_int_type = typename std::char_traits<char_type>::int_type;
+    using char_int_type = typename char_traits<char_type>::int_type;
 
   public:
     /*!
@@ -8038,16 +9225,16 @@ class binary_reader
 
     @param[in] adapter  input adapter to read from
     */
-    explicit binary_reader(InputAdapterType&& adapter) : ia(std::move(adapter))
+    explicit binary_reader(InputAdapterType&& adapter, const input_format_t format = input_format_t::json) noexcept : ia(std::move(adapter)), input_format(format)
     {
         (void)detail::is_sax_static_asserts<SAX, BasicJsonType> {};
     }
 
     // make class move-only
     binary_reader(const binary_reader&) = delete;
-    binary_reader(binary_reader&&) = default;
+    binary_reader(binary_reader&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
     binary_reader& operator=(const binary_reader&) = delete;
-    binary_reader& operator=(binary_reader&&) = default;
+    binary_reader& operator=(binary_reader&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
     ~binary_reader() = default;
 
     /*!
@@ -8056,7 +9243,7 @@ class binary_reader
     @param[in] strict  whether to expect the input to be consumed completed
     @param[in] tag_handler  how to treat CBOR tags
 
-    @return
+    @return whether parsing was successful
     */
     JSON_HEDLEY_NON_NULL(3)
     bool sax_parse(const input_format_t format,
@@ -8082,17 +9269,19 @@ class binary_reader
                 break;
 
             case input_format_t::ubjson:
+            case input_format_t::bjdata:
                 result = parse_ubjson_internal();
                 break;
 
+            case input_format_t::json: // LCOV_EXCL_LINE
             default:            // LCOV_EXCL_LINE
-                JSON_ASSERT(false);  // LCOV_EXCL_LINE
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
         }
 
         // strict mode: next byte must be EOF
         if (result && strict)
         {
-            if (format == input_format_t::ubjson)
+            if (input_format == input_format_t::ubjson || input_format == input_format_t::bjdata)
             {
                 get_ignore_noop();
             }
@@ -8101,10 +9290,10 @@ class binary_reader
                 get();
             }
 
-            if (JSON_HEDLEY_UNLIKELY(current != std::char_traits<char_type>::eof()))
+            if (JSON_HEDLEY_UNLIKELY(current != char_traits<char_type>::eof()))
             {
-                return sax->parse_error(chars_read, get_token_string(),
-                                        parse_error::create(110, chars_read, exception_message(format, "expected end of input; last byte: 0x" + get_token_string(), "value"), BasicJsonType()));
+                return sax->parse_error(chars_read, get_token_string(), parse_error::create(110, chars_read,
+                                        exception_message(input_format, concat("expected end of input; last byte: 0x", get_token_string()), "value"), nullptr));
             }
         }
 
@@ -8125,7 +9314,7 @@ class binary_reader
         std::int32_t document_size{};
         get_number<std::int32_t, true>(input_format_t::bson, document_size);
 
-        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(std::size_t(-1))))
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(static_cast<std::size_t>(-1))))
         {
             return false;
         }
@@ -8140,7 +9329,7 @@ class binary_reader
 
     /*!
     @brief Parses a C-style string from the BSON input.
-    @param[in, out] result  A reference to the string variable where the read
+    @param[in,out] result  A reference to the string variable where the read
                             string is to be stored.
     @return `true` if the \x00-byte indicating the end of the string was
              encountered before the EOF; false` indicates an unexpected EOF.
@@ -8168,7 +9357,7 @@ class binary_reader
            input.
     @param[in] len  The length (including the zero-byte at the end) of the
                     string to be read.
-    @param[in, out] result  A reference to the string variable where the read
+    @param[in,out] result  A reference to the string variable where the read
                             string is to be stored.
     @tparam NumberType The type of the length @a len
     @pre len >= 1
@@ -8180,16 +9369,17 @@ class binary_reader
         if (JSON_HEDLEY_UNLIKELY(len < 1))
         {
             auto last_token = get_token_string();
-            return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::bson, "string length must be at least 1, is " + std::to_string(len), "string"), BasicJsonType()));
+            return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                    exception_message(input_format_t::bson, concat("string length must be at least 1, is ", std::to_string(len)), "string"), nullptr));
         }
 
-        return get_string(input_format_t::bson, len - static_cast<NumberType>(1), result) && get() != std::char_traits<char_type>::eof();
+        return get_string(input_format_t::bson, len - static_cast<NumberType>(1), result) && get() != char_traits<char_type>::eof();
     }
 
     /*!
     @brief Parses a byte array input of length @a len from the BSON input.
     @param[in] len  The length of the byte array to be read.
-    @param[in, out] result  A reference to the binary variable where the read
+    @param[in,out] result  A reference to the binary variable where the read
                             array is to be stored.
     @tparam NumberType The type of the length @a len
     @pre len >= 0
@@ -8201,7 +9391,8 @@ class binary_reader
         if (JSON_HEDLEY_UNLIKELY(len < 0))
         {
             auto last_token = get_token_string();
-            return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::bson, "byte array length cannot be negative, is " + std::to_string(len), "binary"), BasicJsonType()));
+            return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                    exception_message(input_format_t::bson, concat("byte array length cannot be negative, is ", std::to_string(len)), "binary"), nullptr));
         }
 
         // All BSON binary values have a subtype
@@ -8282,8 +9473,10 @@ class binary_reader
             default: // anything else not supported (yet)
             {
                 std::array<char, 3> cr{{}};
-                (std::snprintf)(cr.data(), cr.size(), "%.2hhX", static_cast<unsigned char>(element_type));
-                return sax->parse_error(element_type_parse_position, std::string(cr.data()), parse_error::create(114, element_type_parse_position, "Unsupported BSON record type 0x" + std::string(cr.data()), BasicJsonType()));
+                static_cast<void>((std::snprintf)(cr.data(), cr.size(), "%.2hhX", static_cast<unsigned char>(element_type))); // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+                const std::string cr_str{cr.data()};
+                return sax->parse_error(element_type_parse_position, cr_str,
+                                        parse_error::create(114, element_type_parse_position, concat("Unsupported BSON record type 0x", cr_str), nullptr));
             }
         }
     }
@@ -8343,7 +9536,7 @@ class binary_reader
         std::int32_t document_size{};
         get_number<std::int32_t, true>(input_format_t::bson, document_size);
 
-        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(std::size_t(-1))))
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(static_cast<std::size_t>(-1))))
         {
             return false;
         }
@@ -8374,7 +9567,7 @@ class binary_reader
         switch (get_char ? get() : current)
         {
             // EOF
-            case std::char_traits<char_type>::eof():
+            case char_traits<char_type>::eof():
                 return unexpect_eof(input_format_t::cbor, "value");
 
             // Integer 0x00..0x17 (0..23)
@@ -8575,7 +9768,8 @@ class binary_reader
             case 0x95:
             case 0x96:
             case 0x97:
-                return get_cbor_array(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x1Fu), tag_handler);
+                return get_cbor_array(
+                           conditional_static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x1Fu), tag_handler);
 
             case 0x98: // array (one-byte uint8_t for n follows)
             {
@@ -8592,17 +9786,17 @@ class binary_reader
             case 0x9A: // array (four-byte uint32_t for n follow)
             {
                 std::uint32_t len{};
-                return get_number(input_format_t::cbor, len) && get_cbor_array(static_cast<std::size_t>(len), tag_handler);
+                return get_number(input_format_t::cbor, len) && get_cbor_array(conditional_static_cast<std::size_t>(len), tag_handler);
             }
 
             case 0x9B: // array (eight-byte uint64_t for n follow)
             {
                 std::uint64_t len{};
-                return get_number(input_format_t::cbor, len) && get_cbor_array(static_cast<std::size_t>(len), tag_handler);
+                return get_number(input_format_t::cbor, len) && get_cbor_array(conditional_static_cast<std::size_t>(len), tag_handler);
             }
 
             case 0x9F: // array (indefinite length)
-                return get_cbor_array(std::size_t(-1), tag_handler);
+                return get_cbor_array(static_cast<std::size_t>(-1), tag_handler);
 
             // map (0x00..0x17 pairs of data items follow)
             case 0xA0:
@@ -8629,7 +9823,7 @@ class binary_reader
             case 0xB5:
             case 0xB6:
             case 0xB7:
-                return get_cbor_object(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x1Fu), tag_handler);
+                return get_cbor_object(conditional_static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x1Fu), tag_handler);
 
             case 0xB8: // map (one-byte uint8_t for n follows)
             {
@@ -8646,17 +9840,17 @@ class binary_reader
             case 0xBA: // map (four-byte uint32_t for n follow)
             {
                 std::uint32_t len{};
-                return get_number(input_format_t::cbor, len) && get_cbor_object(static_cast<std::size_t>(len), tag_handler);
+                return get_number(input_format_t::cbor, len) && get_cbor_object(conditional_static_cast<std::size_t>(len), tag_handler);
             }
 
             case 0xBB: // map (eight-byte uint64_t for n follow)
             {
                 std::uint64_t len{};
-                return get_number(input_format_t::cbor, len) && get_cbor_object(static_cast<std::size_t>(len), tag_handler);
+                return get_number(input_format_t::cbor, len) && get_cbor_object(conditional_static_cast<std::size_t>(len), tag_handler);
             }
 
             case 0xBF: // map (indefinite length)
-                return get_cbor_object(std::size_t(-1), tag_handler);
+                return get_cbor_object(static_cast<std::size_t>(-1), tag_handler);
 
             case 0xC6: // tagged item
             case 0xC7:
@@ -8683,35 +9877,37 @@ class binary_reader
                     case cbor_tag_handler_t::error:
                     {
                         auto last_token = get_token_string();
-                        return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::cbor, "invalid byte: 0x" + last_token, "value"), BasicJsonType()));
+                        return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                                exception_message(input_format_t::cbor, concat("invalid byte: 0x", last_token), "value"), nullptr));
                     }
 
                     case cbor_tag_handler_t::ignore:
                     {
+                        // ignore binary subtype
                         switch (current)
                         {
                             case 0xD8:
                             {
-                                std::uint8_t len{};
-                                get_number(input_format_t::cbor, len);
+                                std::uint8_t subtype_to_ignore{};
+                                get_number(input_format_t::cbor, subtype_to_ignore);
                                 break;
                             }
                             case 0xD9:
                             {
-                                std::uint16_t len{};
-                                get_number(input_format_t::cbor, len);
+                                std::uint16_t subtype_to_ignore{};
+                                get_number(input_format_t::cbor, subtype_to_ignore);
                                 break;
                             }
                             case 0xDA:
                             {
-                                std::uint32_t len{};
-                                get_number(input_format_t::cbor, len);
+                                std::uint32_t subtype_to_ignore{};
+                                get_number(input_format_t::cbor, subtype_to_ignore);
                                 break;
                             }
                             case 0xDB:
                             {
-                                std::uint64_t len{};
-                                get_number(input_format_t::cbor, len);
+                                std::uint64_t subtype_to_ignore{};
+                                get_number(input_format_t::cbor, subtype_to_ignore);
                                 break;
                             }
                             default:
@@ -8720,8 +9916,49 @@ class binary_reader
                         return parse_cbor_internal(true, tag_handler);
                     }
 
+                    case cbor_tag_handler_t::store:
+                    {
+                        binary_t b;
+                        // use binary subtype and store in binary container
+                        switch (current)
+                        {
+                            case 0xD8:
+                            {
+                                std::uint8_t subtype{};
+                                get_number(input_format_t::cbor, subtype);
+                                b.set_subtype(detail::conditional_static_cast<typename binary_t::subtype_type>(subtype));
+                                break;
+                            }
+                            case 0xD9:
+                            {
+                                std::uint16_t subtype{};
+                                get_number(input_format_t::cbor, subtype);
+                                b.set_subtype(detail::conditional_static_cast<typename binary_t::subtype_type>(subtype));
+                                break;
+                            }
+                            case 0xDA:
+                            {
+                                std::uint32_t subtype{};
+                                get_number(input_format_t::cbor, subtype);
+                                b.set_subtype(detail::conditional_static_cast<typename binary_t::subtype_type>(subtype));
+                                break;
+                            }
+                            case 0xDB:
+                            {
+                                std::uint64_t subtype{};
+                                get_number(input_format_t::cbor, subtype);
+                                b.set_subtype(detail::conditional_static_cast<typename binary_t::subtype_type>(subtype));
+                                break;
+                            }
+                            default:
+                                return parse_cbor_internal(true, tag_handler);
+                        }
+                        get();
+                        return get_cbor_binary(b) && sax->binary(b);
+                    }
+
                     default:                 // LCOV_EXCL_LINE
-                        JSON_ASSERT(false);  // LCOV_EXCL_LINE
+                        JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
                         return false;        // LCOV_EXCL_LINE
                 }
             }
@@ -8798,7 +10035,8 @@ class binary_reader
             default: // anything else (0xFF is handled inside the other types)
             {
                 auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::cbor, "invalid byte: 0x" + last_token, "value"), BasicJsonType()));
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                        exception_message(input_format_t::cbor, concat("invalid byte: 0x", last_token), "value"), nullptr));
             }
         }
     }
@@ -8893,7 +10131,8 @@ class binary_reader
             default:
             {
                 auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::cbor, "expected length specification (0x60-0x7B) or indefinite string type (0x7F); last byte: 0x" + last_token, "string"), BasicJsonType()));
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read,
+                                        exception_message(input_format_t::cbor, concat("expected length specification (0x60-0x7B) or indefinite string type (0x7F); last byte: 0x", last_token), "string"), nullptr));
             }
         }
     }
@@ -8992,13 +10231,14 @@ class binary_reader
             default:
             {
                 auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::cbor, "expected length specification (0x40-0x5B) or indefinite binary array type (0x5F); last byte: 0x" + last_token, "binary"), BasicJsonType()));
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read,
+                                        exception_message(input_format_t::cbor, concat("expected length specification (0x40-0x5B) or indefinite binary array type (0x5F); last byte: 0x", last_token), "binary"), nullptr));
             }
         }
     }
 
     /*!
-    @param[in] len  the length of the array or std::size_t(-1) for an
+    @param[in] len  the length of the array or static_cast<std::size_t>(-1) for an
                     array of indefinite size
     @param[in] tag_handler how CBOR tags should be treated
     @return whether array creation completed
@@ -9011,7 +10251,7 @@ class binary_reader
             return false;
         }
 
-        if (len != std::size_t(-1))
+        if (len != static_cast<std::size_t>(-1))
         {
             for (std::size_t i = 0; i < len; ++i)
             {
@@ -9036,7 +10276,7 @@ class binary_reader
     }
 
     /*!
-    @param[in] len  the length of the object or std::size_t(-1) for an
+    @param[in] len  the length of the object or static_cast<std::size_t>(-1) for an
                     object of indefinite size
     @param[in] tag_handler how CBOR tags should be treated
     @return whether object creation completed
@@ -9049,38 +10289,41 @@ class binary_reader
             return false;
         }
 
-        string_t key;
-        if (len != std::size_t(-1))
+        if (len != 0)
         {
-            for (std::size_t i = 0; i < len; ++i)
+            string_t key;
+            if (len != static_cast<std::size_t>(-1))
             {
-                get();
-                if (JSON_HEDLEY_UNLIKELY(!get_cbor_string(key) || !sax->key(key)))
+                for (std::size_t i = 0; i < len; ++i)
                 {
-                    return false;
-                }
+                    get();
+                    if (JSON_HEDLEY_UNLIKELY(!get_cbor_string(key) || !sax->key(key)))
+                    {
+                        return false;
+                    }
 
-                if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler)))
-                {
-                    return false;
+                    if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler)))
+                    {
+                        return false;
+                    }
+                    key.clear();
                 }
-                key.clear();
             }
-        }
-        else
-        {
-            while (get() != 0xFF)
+            else
             {
-                if (JSON_HEDLEY_UNLIKELY(!get_cbor_string(key) || !sax->key(key)))
+                while (get() != 0xFF)
                 {
-                    return false;
-                }
+                    if (JSON_HEDLEY_UNLIKELY(!get_cbor_string(key) || !sax->key(key)))
+                    {
+                        return false;
+                    }
 
-                if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler)))
-                {
-                    return false;
+                    if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler)))
+                    {
+                        return false;
+                    }
+                    key.clear();
                 }
-                key.clear();
             }
         }
 
@@ -9099,7 +10342,7 @@ class binary_reader
         switch (get())
         {
             // EOF
-            case std::char_traits<char_type>::eof():
+            case char_traits<char_type>::eof():
                 return unexpect_eof(input_format_t::msgpack, "value");
 
             // positive fixint
@@ -9250,7 +10493,7 @@ class binary_reader
             case 0x8D:
             case 0x8E:
             case 0x8F:
-                return get_msgpack_object(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x0Fu));
+                return get_msgpack_object(conditional_static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x0Fu));
 
             // fixarray
             case 0x90:
@@ -9269,7 +10512,7 @@ class binary_reader
             case 0x9D:
             case 0x9E:
             case 0x9F:
-                return get_msgpack_array(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x0Fu));
+                return get_msgpack_array(conditional_static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x0Fu));
 
             // fixstr
             case 0xA0:
@@ -9406,7 +10649,7 @@ class binary_reader
             case 0xDD: // array 32
             {
                 std::uint32_t len{};
-                return get_number(input_format_t::msgpack, len) && get_msgpack_array(static_cast<std::size_t>(len));
+                return get_number(input_format_t::msgpack, len) && get_msgpack_array(conditional_static_cast<std::size_t>(len));
             }
 
             case 0xDE: // map 16
@@ -9418,7 +10661,7 @@ class binary_reader
             case 0xDF: // map 32
             {
                 std::uint32_t len{};
-                return get_number(input_format_t::msgpack, len) && get_msgpack_object(static_cast<std::size_t>(len));
+                return get_number(input_format_t::msgpack, len) && get_msgpack_object(conditional_static_cast<std::size_t>(len));
             }
 
             // negative fixint
@@ -9459,7 +10702,8 @@ class binary_reader
             default: // anything else
             {
                 auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::msgpack, "invalid byte: 0x" + last_token, "value"), BasicJsonType()));
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                        exception_message(input_format_t::msgpack, concat("invalid byte: 0x", last_token), "value"), nullptr));
             }
         }
     }
@@ -9541,7 +10785,8 @@ class binary_reader
             default:
             {
                 auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::msgpack, "expected length specification (0xA0-0xBF, 0xD9-0xDB); last byte: 0x" + last_token, "string"), BasicJsonType()));
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read,
+                                        exception_message(input_format_t::msgpack, concat("expected length specification (0xA0-0xBF, 0xD9-0xDB); last byte: 0x", last_token), "string"), nullptr));
             }
         }
     }
@@ -9752,7 +10997,7 @@ class binary_reader
             get();  // TODO(niels): may we ignore N here?
         }
 
-        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "value")))
+        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "value")))
         {
             return false;
         }
@@ -9762,51 +11007,162 @@ class binary_reader
             case 'U':
             {
                 std::uint8_t len{};
-                return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result);
+                return get_number(input_format, len) && get_string(input_format, len, result);
             }
 
             case 'i':
             {
                 std::int8_t len{};
-                return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result);
+                return get_number(input_format, len) && get_string(input_format, len, result);
             }
 
             case 'I':
             {
                 std::int16_t len{};
-                return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result);
+                return get_number(input_format, len) && get_string(input_format, len, result);
             }
 
             case 'l':
             {
                 std::int32_t len{};
-                return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result);
+                return get_number(input_format, len) && get_string(input_format, len, result);
             }
 
             case 'L':
             {
                 std::int64_t len{};
-                return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result);
+                return get_number(input_format, len) && get_string(input_format, len, result);
+            }
+
+            case 'u':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint16_t len{};
+                return get_number(input_format, len) && get_string(input_format, len, result);
+            }
+
+            case 'm':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint32_t len{};
+                return get_number(input_format, len) && get_string(input_format, len, result);
+            }
+
+            case 'M':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint64_t len{};
+                return get_number(input_format, len) && get_string(input_format, len, result);
             }
 
             default:
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "expected length type specification (U, i, I, l, L); last byte: 0x" + last_token, "string"), BasicJsonType()));
+                break;
+        }
+        auto last_token = get_token_string();
+        std::string message;
+
+        if (input_format != input_format_t::bjdata)
+        {
+            message = "expected length type specification (U, i, I, l, L); last byte: 0x" + last_token;
+        }
+        else
+        {
+            message = "expected length type specification (U, i, u, I, m, l, M, L); last byte: 0x" + last_token;
+        }
+        return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format, message, "string"), nullptr));
+    }
+
+    /*!
+    @param[out] dim  an integer vector storing the ND array dimensions
+    @return whether reading ND array size vector is successful
+    */
+    bool get_ubjson_ndarray_size(std::vector<size_t>& dim)
+    {
+        std::pair<std::size_t, char_int_type> size_and_type;
+        size_t dimlen = 0;
+        bool no_ndarray = true;
+
+        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_type(size_and_type, no_ndarray)))
+        {
+            return false;
+        }
+
+        if (size_and_type.first != npos)
+        {
+            if (size_and_type.second != 0)
+            {
+                if (size_and_type.second != 'N')
+                {
+                    for (std::size_t i = 0; i < size_and_type.first; ++i)
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_value(dimlen, no_ndarray, size_and_type.second)))
+                        {
+                            return false;
+                        }
+                        dim.push_back(dimlen);
+                    }
+                }
+            }
+            else
+            {
+                for (std::size_t i = 0; i < size_and_type.first; ++i)
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_value(dimlen, no_ndarray)))
+                    {
+                        return false;
+                    }
+                    dim.push_back(dimlen);
+                }
+            }
+        }
+        else
+        {
+            while (current != ']')
+            {
+                if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_value(dimlen, no_ndarray, current)))
+                {
+                    return false;
+                }
+                dim.push_back(dimlen);
+                get_ignore_noop();
+            }
         }
+        return true;
     }
 
     /*!
     @param[out] result  determined size
+    @param[in,out] is_ndarray  for input, `true` means already inside an ndarray vector
+                               or ndarray dimension is not allowed; `false` means ndarray
+                               is allowed; for output, `true` means an ndarray is found;
+                               is_ndarray can only return `true` when its initial value
+                               is `false`
+    @param[in] prefix  type marker if already read, otherwise set to 0
+
     @return whether size determination completed
     */
-    bool get_ubjson_size_value(std::size_t& result)
+    bool get_ubjson_size_value(std::size_t& result, bool& is_ndarray, char_int_type prefix = 0)
     {
-        switch (get_ignore_noop())
+        if (prefix == 0)
+        {
+            prefix = get_ignore_noop();
+        }
+
+        switch (prefix)
         {
             case 'U':
             {
                 std::uint8_t number{};
-                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number)))
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
                 {
                     return false;
                 }
@@ -9817,7 +11173,80 @@ class binary_reader
             case 'i':
             {
                 std::int8_t number{};
-                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number)))
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
+                {
+                    return false;
+                }
+                if (number < 0)
+                {
+                    return sax->parse_error(chars_read, get_token_string(), parse_error::create(113, chars_read,
+                                            exception_message(input_format, "count in an optimized container must be positive", "size"), nullptr));
+                }
+                result = static_cast<std::size_t>(number); // NOLINT(bugprone-signed-char-misuse,cert-str34-c): number is not a char
+                return true;
+            }
+
+            case 'I':
+            {
+                std::int16_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
+                {
+                    return false;
+                }
+                if (number < 0)
+                {
+                    return sax->parse_error(chars_read, get_token_string(), parse_error::create(113, chars_read,
+                                            exception_message(input_format, "count in an optimized container must be positive", "size"), nullptr));
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'l':
+            {
+                std::int32_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
+                {
+                    return false;
+                }
+                if (number < 0)
+                {
+                    return sax->parse_error(chars_read, get_token_string(), parse_error::create(113, chars_read,
+                                            exception_message(input_format, "count in an optimized container must be positive", "size"), nullptr));
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'L':
+            {
+                std::int64_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
+                {
+                    return false;
+                }
+                if (number < 0)
+                {
+                    return sax->parse_error(chars_read, get_token_string(), parse_error::create(113, chars_read,
+                                            exception_message(input_format, "count in an optimized container must be positive", "size"), nullptr));
+                }
+                if (!value_in_range_of<std::size_t>(number))
+                {
+                    return sax->parse_error(chars_read, get_token_string(), out_of_range::create(408,
+                                            exception_message(input_format, "integer value overflow", "size"), nullptr));
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'u':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint16_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
                 {
                     return false;
                 }
@@ -9825,45 +11254,112 @@ class binary_reader
                 return true;
             }
 
-            case 'I':
+            case 'm':
             {
-                std::int16_t number{};
-                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number)))
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint32_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
                 {
                     return false;
                 }
-                result = static_cast<std::size_t>(number);
+                result = conditional_static_cast<std::size_t>(number);
                 return true;
             }
 
-            case 'l':
+            case 'M':
             {
-                std::int32_t number{};
-                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number)))
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint64_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
                 {
                     return false;
                 }
-                result = static_cast<std::size_t>(number);
+                if (!value_in_range_of<std::size_t>(number))
+                {
+                    return sax->parse_error(chars_read, get_token_string(), out_of_range::create(408,
+                                            exception_message(input_format, "integer value overflow", "size"), nullptr));
+                }
+                result = detail::conditional_static_cast<std::size_t>(number);
                 return true;
             }
 
-            case 'L':
+            case '[':
             {
-                std::int64_t number{};
-                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number)))
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                if (is_ndarray) // ndarray dimensional vector can only contain integers, and can not embed another array
+                {
+                    return sax->parse_error(chars_read, get_token_string(), parse_error::create(113, chars_read, exception_message(input_format, "ndarray dimensional vector is not allowed", "size"), nullptr));
+                }
+                std::vector<size_t> dim;
+                if (JSON_HEDLEY_UNLIKELY(!get_ubjson_ndarray_size(dim)))
                 {
                     return false;
                 }
-                result = static_cast<std::size_t>(number);
+                if (dim.size() == 1 || (dim.size() == 2 && dim.at(0) == 1)) // return normal array size if 1D row vector
+                {
+                    result = dim.at(dim.size() - 1);
+                    return true;
+                }
+                if (!dim.empty())  // if ndarray, convert to an object in JData annotated array format
+                {
+                    for (auto i : dim) // test if any dimension in an ndarray is 0, if so, return a 1D empty container
+                    {
+                        if ( i == 0 )
+                        {
+                            result = 0;
+                            return true;
+                        }
+                    }
+
+                    string_t key = "_ArraySize_";
+                    if (JSON_HEDLEY_UNLIKELY(!sax->start_object(3) || !sax->key(key) || !sax->start_array(dim.size())))
+                    {
+                        return false;
+                    }
+                    result = 1;
+                    for (auto i : dim)
+                    {
+                        result *= i;
+                        if (result == 0 || result == npos) // because dim elements shall not have zeros, result = 0 means overflow happened; it also can't be npos as it is used to initialize size in get_ubjson_size_type()
+                        {
+                            return sax->parse_error(chars_read, get_token_string(), out_of_range::create(408, exception_message(input_format, "excessive ndarray size caused overflow", "size"), nullptr));
+                        }
+                        if (JSON_HEDLEY_UNLIKELY(!sax->number_unsigned(static_cast<number_unsigned_t>(i))))
+                        {
+                            return false;
+                        }
+                    }
+                    is_ndarray = true;
+                    return sax->end_array();
+                }
+                result = 0;
                 return true;
             }
 
             default:
-            {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "expected length type specification (U, i, I, l, L) after '#'; last byte: 0x" + last_token, "size"), BasicJsonType()));
-            }
+                break;
+        }
+        auto last_token = get_token_string();
+        std::string message;
+
+        if (input_format != input_format_t::bjdata)
+        {
+            message = "expected length type specification (U, i, I, l, L) after '#'; last byte: 0x" + last_token;
+        }
+        else
+        {
+            message = "expected length type specification (U, i, u, I, m, l, M, L) after '#'; last byte: 0x" + last_token;
         }
+        return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format, message, "size"), nullptr));
     }
 
     /*!
@@ -9873,20 +11369,30 @@ class binary_reader
     for a more compact representation.
 
     @param[out] result  pair of the size and the type
+    @param[in] inside_ndarray  whether the parser is parsing an ND array dimensional vector
 
     @return whether pair creation completed
     */
-    bool get_ubjson_size_type(std::pair<std::size_t, char_int_type>& result)
+    bool get_ubjson_size_type(std::pair<std::size_t, char_int_type>& result, bool inside_ndarray = false)
     {
-        result.first = string_t::npos; // size
+        result.first = npos; // size
         result.second = 0; // type
+        bool is_ndarray = false;
 
         get_ignore_noop();
 
         if (current == '$')
         {
             result.second = get();  // must not ignore 'N', because 'N' maybe the type
-            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "type")))
+            if (input_format == input_format_t::bjdata
+                    && JSON_HEDLEY_UNLIKELY(std::binary_search(bjd_optimized_type_markers.begin(), bjd_optimized_type_markers.end(), result.second)))
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                        exception_message(input_format, concat("marker 0x", last_token, " is not a permitted optimized array type"), "type"), nullptr));
+            }
+
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "type")))
             {
                 return false;
             }
@@ -9894,20 +11400,37 @@ class binary_reader
             get_ignore_noop();
             if (JSON_HEDLEY_UNLIKELY(current != '#'))
             {
-                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "value")))
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "value")))
                 {
                     return false;
                 }
                 auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::ubjson, "expected '#' after type information; last byte: 0x" + last_token, "size"), BasicJsonType()));
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                        exception_message(input_format, concat("expected '#' after type information; last byte: 0x", last_token), "size"), nullptr));
             }
 
-            return get_ubjson_size_value(result.first);
+            const bool is_error = get_ubjson_size_value(result.first, is_ndarray);
+            if (input_format == input_format_t::bjdata && is_ndarray)
+            {
+                if (inside_ndarray)
+                {
+                    return sax->parse_error(chars_read, get_token_string(), parse_error::create(112, chars_read,
+                                            exception_message(input_format, "ndarray can not be recursive", "size"), nullptr));
+                }
+                result.second |= (1 << 8); // use bit 8 to indicate ndarray, all UBJSON and BJData markers should be ASCII letters
+            }
+            return is_error;
         }
 
         if (current == '#')
         {
-            return get_ubjson_size_value(result.first);
+            const bool is_error = get_ubjson_size_value(result.first, is_ndarray);
+            if (input_format == input_format_t::bjdata && is_ndarray)
+            {
+                return sax->parse_error(chars_read, get_token_string(), parse_error::create(112, chars_read,
+                                        exception_message(input_format, "ndarray requires both type and size", "size"), nullptr));
+            }
+            return is_error;
         }
 
         return true;
@@ -9921,8 +11444,8 @@ class binary_reader
     {
         switch (prefix)
         {
-            case std::char_traits<char_type>::eof():  // EOF
-                return unexpect_eof(input_format_t::ubjson, "value");
+            case char_traits<char_type>::eof():  // EOF
+                return unexpect_eof(input_format, "value");
 
             case 'T':  // true
                 return sax->boolean(true);
@@ -9935,43 +11458,125 @@ class binary_reader
             case 'U':
             {
                 std::uint8_t number{};
-                return get_number(input_format_t::ubjson, number) && sax->number_unsigned(number);
+                return get_number(input_format, number) && sax->number_unsigned(number);
             }
 
             case 'i':
             {
                 std::int8_t number{};
-                return get_number(input_format_t::ubjson, number) && sax->number_integer(number);
+                return get_number(input_format, number) && sax->number_integer(number);
             }
 
             case 'I':
             {
                 std::int16_t number{};
-                return get_number(input_format_t::ubjson, number) && sax->number_integer(number);
+                return get_number(input_format, number) && sax->number_integer(number);
             }
 
             case 'l':
             {
                 std::int32_t number{};
-                return get_number(input_format_t::ubjson, number) && sax->number_integer(number);
+                return get_number(input_format, number) && sax->number_integer(number);
             }
 
             case 'L':
             {
                 std::int64_t number{};
-                return get_number(input_format_t::ubjson, number) && sax->number_integer(number);
+                return get_number(input_format, number) && sax->number_integer(number);
+            }
+
+            case 'u':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint16_t number{};
+                return get_number(input_format, number) && sax->number_unsigned(number);
+            }
+
+            case 'm':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint32_t number{};
+                return get_number(input_format, number) && sax->number_unsigned(number);
+            }
+
+            case 'M':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint64_t number{};
+                return get_number(input_format, number) && sax->number_unsigned(number);
+            }
+
+            case 'h':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                const auto byte1_raw = get();
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "number")))
+                {
+                    return false;
+                }
+                const auto byte2_raw = get();
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "number")))
+                {
+                    return false;
+                }
+
+                const auto byte1 = static_cast<unsigned char>(byte1_raw);
+                const auto byte2 = static_cast<unsigned char>(byte2_raw);
+
+                // code from RFC 7049, Appendix D, Figure 3:
+                // As half-precision floating-point numbers were only added
+                // to IEEE 754 in 2008, today's programming platforms often
+                // still only have limited support for them. It is very
+                // easy to include at least decoding support for them even
+                // without such support. An example of a small decoder for
+                // half-precision floating-point numbers in the C language
+                // is shown in Fig. 3.
+                const auto half = static_cast<unsigned int>((byte2 << 8u) + byte1);
+                const double val = [&half]
+                {
+                    const int exp = (half >> 10u) & 0x1Fu;
+                    const unsigned int mant = half & 0x3FFu;
+                    JSON_ASSERT(0 <= exp&& exp <= 32);
+                    JSON_ASSERT(mant <= 1024);
+                    switch (exp)
+                    {
+                        case 0:
+                            return std::ldexp(mant, -24);
+                        case 31:
+                            return (mant == 0)
+                            ? std::numeric_limits<double>::infinity()
+                            : std::numeric_limits<double>::quiet_NaN();
+                        default:
+                            return std::ldexp(mant + 1024, exp - 25);
+                    }
+                }();
+                return sax->number_float((half & 0x8000u) != 0
+                                         ? static_cast<number_float_t>(-val)
+                                         : static_cast<number_float_t>(val), "");
             }
 
             case 'd':
             {
                 float number{};
-                return get_number(input_format_t::ubjson, number) && sax->number_float(static_cast<number_float_t>(number), "");
+                return get_number(input_format, number) && sax->number_float(static_cast<number_float_t>(number), "");
             }
 
             case 'D':
             {
                 double number{};
-                return get_number(input_format_t::ubjson, number) && sax->number_float(static_cast<number_float_t>(number), "");
+                return get_number(input_format, number) && sax->number_float(static_cast<number_float_t>(number), "");
             }
 
             case 'H':
@@ -9982,14 +11587,15 @@ class binary_reader
             case 'C':  // char
             {
                 get();
-                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "char")))
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "char")))
                 {
                     return false;
                 }
                 if (JSON_HEDLEY_UNLIKELY(current > 127))
                 {
                     auto last_token = get_token_string();
-                    return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "byte after 'C' must be in range 0x00..0x7F; last byte: 0x" + last_token, "char"), BasicJsonType()));
+                    return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read,
+                                            exception_message(input_format, concat("byte after 'C' must be in range 0x00..0x7F; last byte: 0x", last_token), "char"), nullptr));
                 }
                 string_t s(1, static_cast<typename string_t::value_type>(current));
                 return sax->string(s);
@@ -10008,11 +11614,10 @@ class binary_reader
                 return get_ubjson_object();
 
             default: // anything else
-            {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::ubjson, "invalid byte: 0x" + last_token, "value"), BasicJsonType()));
-            }
+                break;
         }
+        auto last_token = get_token_string();
+        return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format, "invalid byte: 0x" + last_token, "value"), nullptr));
     }
 
     /*!
@@ -10026,7 +11631,53 @@ class binary_reader
             return false;
         }
 
-        if (size_and_type.first != string_t::npos)
+        // if bit-8 of size_and_type.second is set to 1, encode bjdata ndarray as an object in JData annotated array format (https://github.com/NeuroJSON/jdata):
+        // {"_ArrayType_" : "typeid", "_ArraySize_" : [n1, n2, ...], "_ArrayData_" : [v1, v2, ...]}
+
+        if (input_format == input_format_t::bjdata && size_and_type.first != npos && (size_and_type.second & (1 << 8)) != 0)
+        {
+            size_and_type.second &= ~(static_cast<char_int_type>(1) << 8);  // use bit 8 to indicate ndarray, here we remove the bit to restore the type marker
+            auto it = std::lower_bound(bjd_types_map.begin(), bjd_types_map.end(), size_and_type.second, [](const bjd_type & p, char_int_type t)
+            {
+                return p.first < t;
+            });
+            string_t key = "_ArrayType_";
+            if (JSON_HEDLEY_UNLIKELY(it == bjd_types_map.end() || it->first != size_and_type.second))
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                        exception_message(input_format, "invalid byte: 0x" + last_token, "type"), nullptr));
+            }
+
+            string_t type = it->second; // sax->string() takes a reference
+            if (JSON_HEDLEY_UNLIKELY(!sax->key(key) || !sax->string(type)))
+            {
+                return false;
+            }
+
+            if (size_and_type.second == 'C')
+            {
+                size_and_type.second = 'U';
+            }
+
+            key = "_ArrayData_";
+            if (JSON_HEDLEY_UNLIKELY(!sax->key(key) || !sax->start_array(size_and_type.first) ))
+            {
+                return false;
+            }
+
+            for (std::size_t i = 0; i < size_and_type.first; ++i)
+            {
+                if (JSON_HEDLEY_UNLIKELY(!get_ubjson_value(size_and_type.second)))
+                {
+                    return false;
+                }
+            }
+
+            return (sax->end_array() && sax->end_object());
+        }
+
+        if (size_and_type.first != npos)
         {
             if (JSON_HEDLEY_UNLIKELY(!sax->start_array(size_and_type.first)))
             {
@@ -10059,7 +11710,7 @@ class binary_reader
         }
         else
         {
-            if (JSON_HEDLEY_UNLIKELY(!sax->start_array(std::size_t(-1))))
+            if (JSON_HEDLEY_UNLIKELY(!sax->start_array(static_cast<std::size_t>(-1))))
             {
                 return false;
             }
@@ -10088,8 +11739,16 @@ class binary_reader
             return false;
         }
 
+        // do not accept ND-array size in objects in BJData
+        if (input_format == input_format_t::bjdata && size_and_type.first != npos && (size_and_type.second & (1 << 8)) != 0)
+        {
+            auto last_token = get_token_string();
+            return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                    exception_message(input_format, "BJData object does not support ND-array size in optimized format", "object"), nullptr));
+        }
+
         string_t key;
-        if (size_and_type.first != string_t::npos)
+        if (size_and_type.first != npos)
         {
             if (JSON_HEDLEY_UNLIKELY(!sax->start_object(size_and_type.first)))
             {
@@ -10129,7 +11788,7 @@ class binary_reader
         }
         else
         {
-            if (JSON_HEDLEY_UNLIKELY(!sax->start_object(std::size_t(-1))))
+            if (JSON_HEDLEY_UNLIKELY(!sax->start_object(static_cast<std::size_t>(-1))))
             {
                 return false;
             }
@@ -10159,7 +11818,8 @@ class binary_reader
     {
         // get size of following number string
         std::size_t size{};
-        auto res = get_ubjson_size_value(size);
+        bool no_ndarray = true;
+        auto res = get_ubjson_size_value(size, no_ndarray);
         if (JSON_HEDLEY_UNLIKELY(!res))
         {
             return res;
@@ -10170,7 +11830,7 @@ class binary_reader
         for (std::size_t i = 0; i < size; ++i)
         {
             get();
-            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "number")))
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "number")))
             {
                 return false;
             }
@@ -10178,8 +11838,8 @@ class binary_reader
         }
 
         // parse number string
-        auto number_ia = detail::input_adapter(std::forward<decltype(number_vector)>(number_vector));
-        auto number_lexer = detail::lexer<BasicJsonType, decltype(number_ia)>(std::move(number_ia), false);
+        using ia_type = decltype(detail::input_adapter(number_vector));
+        auto number_lexer = detail::lexer<BasicJsonType, ia_type>(detail::input_adapter(number_vector), false);
         const auto result_number = number_lexer.scan();
         const auto number_string = number_lexer.get_token_string();
         const auto result_remainder = number_lexer.scan();
@@ -10188,7 +11848,8 @@ class binary_reader
 
         if (JSON_HEDLEY_UNLIKELY(result_remainder != token_type::end_of_input))
         {
-            return sax->parse_error(chars_read, number_string, parse_error::create(115, chars_read, exception_message(input_format_t::ubjson, "invalid number text: " + number_lexer.get_token_string(), "high-precision number"), BasicJsonType()));
+            return sax->parse_error(chars_read, number_string, parse_error::create(115, chars_read,
+                                    exception_message(input_format, concat("invalid number text: ", number_lexer.get_token_string()), "high-precision number"), nullptr));
         }
 
         switch (result_number)
@@ -10199,8 +11860,23 @@ class binary_reader
                 return sax->number_unsigned(number_lexer.get_number_unsigned());
             case token_type::value_float:
                 return sax->number_float(number_lexer.get_number_float(), std::move(number_string));
+            case token_type::uninitialized:
+            case token_type::literal_true:
+            case token_type::literal_false:
+            case token_type::literal_null:
+            case token_type::value_string:
+            case token_type::begin_array:
+            case token_type::begin_object:
+            case token_type::end_array:
+            case token_type::end_object:
+            case token_type::name_separator:
+            case token_type::value_separator:
+            case token_type::parse_error:
+            case token_type::end_of_input:
+            case token_type::literal_or_value:
             default:
-                return sax->parse_error(chars_read, number_string, parse_error::create(115, chars_read, exception_message(input_format_t::ubjson, "invalid number text: " + number_lexer.get_token_string(), "high-precision number"), BasicJsonType()));
+                return sax->parse_error(chars_read, number_string, parse_error::create(115, chars_read,
+                                        exception_message(input_format, concat("invalid number text: ", number_lexer.get_token_string()), "high-precision number"), nullptr));
         }
     }
 
@@ -10213,7 +11889,7 @@ class binary_reader
 
     This function provides the interface to the used input adapter. It does
     not throw in case the input reached EOF, but returns a -'ve valued
-    `std::char_traits<char_type>::eof()` in that case.
+    `char_traits<char_type>::eof()` in that case.
 
     @return character read from the input
     */
@@ -10246,15 +11922,17 @@ class binary_reader
 
     @return whether conversion completed
 
-    @note This function needs to respect the system's endianess, because
+    @note This function needs to respect the system's endianness, because
           bytes in CBOR, MessagePack, and UBJSON are stored in network order
           (big endian) and therefore need reordering on little endian systems.
+          On the other hand, BSON and BJData use little endian and should reorder
+          on big endian systems.
     */
     template<typename NumberType, bool InputIsLittleEndian = false>
     bool get_number(const input_format_t format, NumberType& result)
     {
         // step 1: read input into array with system's byte order
-        std::array<std::uint8_t, sizeof(NumberType)> vec;
+        std::array<std::uint8_t, sizeof(NumberType)> vec{};
         for (std::size_t i = 0; i < sizeof(NumberType); ++i)
         {
             get();
@@ -10264,7 +11942,7 @@ class binary_reader
             }
 
             // reverse byte order prior to conversion if necessary
-            if (is_little_endian != InputIsLittleEndian)
+            if (is_little_endian != (InputIsLittleEndian || format == input_format_t::bjdata))
             {
                 vec[sizeof(NumberType) - i - 1] = static_cast<std::uint8_t>(current);
             }
@@ -10353,10 +12031,10 @@ class binary_reader
     JSON_HEDLEY_NON_NULL(3)
     bool unexpect_eof(const input_format_t format, const char* context) const
     {
-        if (JSON_HEDLEY_UNLIKELY(current == std::char_traits<char_type>::eof()))
+        if (JSON_HEDLEY_UNLIKELY(current == char_traits<char_type>::eof()))
         {
             return sax->parse_error(chars_read, "<end of file>",
-                                    parse_error::create(110, chars_read, exception_message(format, "unexpected end of input", context), BasicJsonType()));
+                                    parse_error::create(110, chars_read, exception_message(format, "unexpected end of input", context), nullptr));
         }
         return true;
     }
@@ -10367,7 +12045,7 @@ class binary_reader
     std::string get_token_string() const
     {
         std::array<char, 3> cr{{}};
-        (std::snprintf)(cr.data(), cr.size(), "%.2hhX", static_cast<unsigned char>(current));
+        static_cast<void>((std::snprintf)(cr.data(), cr.size(), "%.2hhX", static_cast<unsigned char>(current))); // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
         return std::string{cr.data()};
     }
 
@@ -10401,37 +12079,93 @@ class binary_reader
                 error_msg += "BSON";
                 break;
 
+            case input_format_t::bjdata:
+                error_msg += "BJData";
+                break;
+
+            case input_format_t::json: // LCOV_EXCL_LINE
             default:            // LCOV_EXCL_LINE
-                JSON_ASSERT(false);  // LCOV_EXCL_LINE
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
         }
 
-        return error_msg + " " + context + ": " + detail;
+        return concat(error_msg, ' ', context, ": ", detail);
     }
 
   private:
+    static JSON_INLINE_VARIABLE constexpr std::size_t npos = static_cast<std::size_t>(-1);
+
     /// input adapter
     InputAdapterType ia;
 
     /// the current character
-    char_int_type current = std::char_traits<char_type>::eof();
+    char_int_type current = char_traits<char_type>::eof();
 
     /// the number of characters read
     std::size_t chars_read = 0;
 
-    /// whether we can assume little endianess
-    const bool is_little_endian = little_endianess();
+    /// whether we can assume little endianness
+    const bool is_little_endian = little_endianness();
+
+    /// input format
+    const input_format_t input_format = input_format_t::json;
 
     /// the SAX parser
     json_sax_t* sax = nullptr;
+
+    // excluded markers in bjdata optimized type
+#define JSON_BINARY_READER_MAKE_BJD_OPTIMIZED_TYPE_MARKERS_ \
+    make_array<char_int_type>('F', 'H', 'N', 'S', 'T', 'Z', '[', '{')
+
+#define JSON_BINARY_READER_MAKE_BJD_TYPES_MAP_ \
+    make_array<bjd_type>(                      \
+    bjd_type{'C', "char"},                     \
+    bjd_type{'D', "double"},                   \
+    bjd_type{'I', "int16"},                    \
+    bjd_type{'L', "int64"},                    \
+    bjd_type{'M', "uint64"},                   \
+    bjd_type{'U', "uint8"},                    \
+    bjd_type{'d', "single"},                   \
+    bjd_type{'i', "int8"},                     \
+    bjd_type{'l', "int32"},                    \
+    bjd_type{'m', "uint32"},                   \
+    bjd_type{'u', "uint16"})
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    // lookup tables
+    // NOLINTNEXTLINE(cppcoreguidelines-non-private-member-variables-in-classes)
+    const decltype(JSON_BINARY_READER_MAKE_BJD_OPTIMIZED_TYPE_MARKERS_) bjd_optimized_type_markers =
+        JSON_BINARY_READER_MAKE_BJD_OPTIMIZED_TYPE_MARKERS_;
+
+    using bjd_type = std::pair<char_int_type, string_t>;
+    // NOLINTNEXTLINE(cppcoreguidelines-non-private-member-variables-in-classes)
+    const decltype(JSON_BINARY_READER_MAKE_BJD_TYPES_MAP_) bjd_types_map =
+        JSON_BINARY_READER_MAKE_BJD_TYPES_MAP_;
+
+#undef JSON_BINARY_READER_MAKE_BJD_OPTIMIZED_TYPE_MARKERS_
+#undef JSON_BINARY_READER_MAKE_BJD_TYPES_MAP_
 };
+
+#ifndef JSON_HAS_CPP_17
+    template<typename BasicJsonType, typename InputAdapterType, typename SAX>
+    constexpr std::size_t binary_reader<BasicJsonType, InputAdapterType, SAX>::npos;
+#endif
+
 }  // namespace detail
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
 
 // #include <nlohmann/detail/input/input_adapters.hpp>
 
 // #include <nlohmann/detail/input/lexer.hpp>
 
 // #include <nlohmann/detail/input/parser.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 
 
 #include <cmath> // isfinite
@@ -10453,18 +12187,19 @@ class binary_reader
 
 // #include <nlohmann/detail/meta/is_sax.hpp>
 
+// #include <nlohmann/detail/string_concat.hpp>
+
 // #include <nlohmann/detail/value_t.hpp>
 
 
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
 ////////////
 // parser //
 ////////////
 
-enum class parse_event_t : uint8_t
+enum class parse_event_t : std::uint8_t
 {
     /// the parser read `{` and started to process a JSON object
     object_start,
@@ -10482,7 +12217,7 @@ enum class parse_event_t : uint8_t
 
 template<typename BasicJsonType>
 using parser_callback_t =
-    std::function<bool(int depth, parse_event_t event, BasicJsonType& parsed)>;
+    std::function<bool(int /*depth*/, parse_event_t /*event*/, BasicJsonType& /*parsed*/)>;
 
 /*!
 @brief syntax analysis
@@ -10536,7 +12271,7 @@ class parser
                 sdp.parse_error(m_lexer.get_position(),
                                 m_lexer.get_token_string(),
                                 parse_error::create(101, m_lexer.get_position(),
-                                                    exception_message(token_type::end_of_input, "value"), BasicJsonType()));
+                                                    exception_message(token_type::end_of_input, "value"), nullptr));
             }
 
             // in case of an error, return discarded value
@@ -10563,7 +12298,7 @@ class parser
             {
                 sdp.parse_error(m_lexer.get_position(),
                                 m_lexer.get_token_string(),
-                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input, "value"), BasicJsonType()));
+                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input, "value"), nullptr));
             }
 
             // in case of an error, return discarded value
@@ -10601,7 +12336,7 @@ class parser
         {
             return sax->parse_error(m_lexer.get_position(),
                                     m_lexer.get_token_string(),
-                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input, "value"), BasicJsonType()));
+                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input, "value"), nullptr));
         }
 
         return result;
@@ -10627,7 +12362,7 @@ class parser
                 {
                     case token_type::begin_object:
                     {
-                        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(std::size_t(-1))))
+                        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(static_cast<std::size_t>(-1))))
                         {
                             return false;
                         }
@@ -10647,7 +12382,7 @@ class parser
                         {
                             return sax->parse_error(m_lexer.get_position(),
                                                     m_lexer.get_token_string(),
-                                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::value_string, "object key"), BasicJsonType()));
+                                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::value_string, "object key"), nullptr));
                         }
                         if (JSON_HEDLEY_UNLIKELY(!sax->key(m_lexer.get_string())))
                         {
@@ -10659,7 +12394,7 @@ class parser
                         {
                             return sax->parse_error(m_lexer.get_position(),
                                                     m_lexer.get_token_string(),
-                                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::name_separator, "object separator"), BasicJsonType()));
+                                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::name_separator, "object separator"), nullptr));
                         }
 
                         // remember we are now inside an object
@@ -10672,7 +12407,7 @@ class parser
 
                     case token_type::begin_array:
                     {
-                        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(std::size_t(-1))))
+                        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(static_cast<std::size_t>(-1))))
                         {
                             return false;
                         }
@@ -10702,7 +12437,7 @@ class parser
                         {
                             return sax->parse_error(m_lexer.get_position(),
                                                     m_lexer.get_token_string(),
-                                                    out_of_range::create(406, "number overflow parsing '" + m_lexer.get_token_string() + "'", BasicJsonType()));
+                                                    out_of_range::create(406, concat("number overflow parsing '", m_lexer.get_token_string(), '\''), nullptr));
                         }
 
                         if (JSON_HEDLEY_UNLIKELY(!sax->number_float(res, m_lexer.get_string())))
@@ -10772,14 +12507,33 @@ class parser
                         // using "uninitialized" to avoid "expected" message
                         return sax->parse_error(m_lexer.get_position(),
                                                 m_lexer.get_token_string(),
-                                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::uninitialized, "value"), BasicJsonType()));
+                                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::uninitialized, "value"), nullptr));
                     }
+                    case token_type::end_of_input:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(m_lexer.get_position().chars_read_total == 1))
+                        {
+                            return sax->parse_error(m_lexer.get_position(),
+                                                    m_lexer.get_token_string(),
+                                                    parse_error::create(101, m_lexer.get_position(),
+                                                            "attempting to parse an empty input; check that your input string or stream contains the expected JSON", nullptr));
+                        }
 
+                        return sax->parse_error(m_lexer.get_position(),
+                                                m_lexer.get_token_string(),
+                                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::literal_or_value, "value"), nullptr));
+                    }
+                    case token_type::uninitialized:
+                    case token_type::end_array:
+                    case token_type::end_object:
+                    case token_type::name_separator:
+                    case token_type::value_separator:
+                    case token_type::literal_or_value:
                     default: // the last token was unexpected
                     {
                         return sax->parse_error(m_lexer.get_position(),
                                                 m_lexer.get_token_string(),
-                                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::literal_or_value, "value"), BasicJsonType()));
+                                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::literal_or_value, "value"), nullptr));
                     }
                 }
             }
@@ -10825,7 +12579,7 @@ class parser
 
                 return sax->parse_error(m_lexer.get_position(),
                                         m_lexer.get_token_string(),
-                                        parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_array, "array"), BasicJsonType()));
+                                        parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_array, "array"), nullptr));
             }
 
             // states.back() is false -> object
@@ -10838,7 +12592,7 @@ class parser
                 {
                     return sax->parse_error(m_lexer.get_position(),
                                             m_lexer.get_token_string(),
-                                            parse_error::create(101, m_lexer.get_position(), exception_message(token_type::value_string, "object key"), BasicJsonType()));
+                                            parse_error::create(101, m_lexer.get_position(), exception_message(token_type::value_string, "object key"), nullptr));
                 }
 
                 if (JSON_HEDLEY_UNLIKELY(!sax->key(m_lexer.get_string())))
@@ -10851,7 +12605,7 @@ class parser
                 {
                     return sax->parse_error(m_lexer.get_position(),
                                             m_lexer.get_token_string(),
-                                            parse_error::create(101, m_lexer.get_position(), exception_message(token_type::name_separator, "object separator"), BasicJsonType()));
+                                            parse_error::create(101, m_lexer.get_position(), exception_message(token_type::name_separator, "object separator"), nullptr));
                 }
 
                 // parse values
@@ -10879,7 +12633,7 @@ class parser
 
             return sax->parse_error(m_lexer.get_position(),
                                     m_lexer.get_token_string(),
-                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_object, "object"), BasicJsonType()));
+                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_object, "object"), nullptr));
         }
     }
 
@@ -10895,24 +12649,24 @@ class parser
 
         if (!context.empty())
         {
-            error_msg += "while parsing " + context + " ";
+            error_msg += concat("while parsing ", context, ' ');
         }
 
         error_msg += "- ";
 
         if (last_token == token_type::parse_error)
         {
-            error_msg += std::string(m_lexer.get_error_message()) + "; last read: '" +
-                         m_lexer.get_token_string() + "'";
+            error_msg += concat(m_lexer.get_error_message(), "; last read: '",
+                                m_lexer.get_token_string(), '\'');
         }
         else
         {
-            error_msg += "unexpected " + std::string(lexer_t::token_type_name(last_token));
+            error_msg += concat("unexpected ", lexer_t::token_type_name(last_token));
         }
 
         if (expected != token_type::uninitialized)
         {
-            error_msg += "; expected " + std::string(lexer_t::token_type_name(expected));
+            error_msg += concat("; expected ", lexer_t::token_type_name(expected));
         }
 
         return error_msg;
@@ -10928,13 +12682,32 @@ class parser
     /// whether to throw exceptions in case of errors
     const bool allow_exceptions = true;
 };
+
 }  // namespace detail
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
 
 // #include <nlohmann/detail/iterators/internal_iterator.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 
 
+// #include <nlohmann/detail/abi_macros.hpp>
+
 // #include <nlohmann/detail/iterators/primitive_iterator.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 
 
 #include <cstddef> // ptrdiff_t
@@ -10943,10 +12716,10 @@ class parser
 // #include <nlohmann/detail/macro_scope.hpp>
 
 
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
+
 /*
 @brief an iterator for primitive JSON types
 
@@ -11025,7 +12798,7 @@ class primitive_iterator_t
         return *this;
     }
 
-    primitive_iterator_t const operator++(int) noexcept
+    primitive_iterator_t operator++(int)& noexcept // NOLINT(cert-dcl21-cpp)
     {
         auto result = *this;
         ++m_it;
@@ -11038,7 +12811,7 @@ class primitive_iterator_t
         return *this;
     }
 
-    primitive_iterator_t const operator--(int) noexcept
+    primitive_iterator_t operator--(int)& noexcept // NOLINT(cert-dcl21-cpp)
     {
         auto result = *this;
         --m_it;
@@ -11057,14 +12830,15 @@ class primitive_iterator_t
         return *this;
     }
 };
+
 }  // namespace detail
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
 
 
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
+
 /*!
 @brief an iterator value
 
@@ -11080,10 +12854,19 @@ template<typename BasicJsonType> struct internal_iterator
     /// generic iterator for all other types
     primitive_iterator_t primitive_iterator {};
 };
+
 }  // namespace detail
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
 
 // #include <nlohmann/detail/iterators/iter_impl.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 
 
 #include <iterator> // iterator, random_access_iterator_tag, bidirectional_iterator_tag, advance, next
@@ -11104,10 +12887,10 @@ template<typename BasicJsonType> struct internal_iterator
 // #include <nlohmann/detail/value_t.hpp>
 
 
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
+
 // forward declare, to be able to friend it later on
 template<typename IteratorType> class iteration_proxy;
 template<typename IteratorType> class iteration_proxy_value;
@@ -11129,7 +12912,7 @@ This class implements a both iterators (iterator and const_iterator) for the
        iterators in version 3.0.0 (see https://github.com/nlohmann/json/issues/593)
 */
 template<typename BasicJsonType>
-class iter_impl
+class iter_impl // NOLINT(cppcoreguidelines-special-member-functions,hicpp-special-member-functions)
 {
     /// the iterator with BasicJsonType of different const-ness
     using other_iter_impl = iter_impl<typename std::conditional<std::is_const<BasicJsonType>::value, typename std::remove_const<BasicJsonType>::type, const BasicJsonType>::type>;
@@ -11144,9 +12927,12 @@ class iter_impl
     // make sure BasicJsonType is basic_json or const basic_json
     static_assert(is_basic_json<typename std::remove_const<BasicJsonType>::type>::value,
                   "iter_impl only accepts (const) basic_json");
+    // superficial check for the LegacyBidirectionalIterator named requirement
+    static_assert(std::is_base_of<std::bidirectional_iterator_tag, std::bidirectional_iterator_tag>::value
+                  &&  std::is_base_of<std::bidirectional_iterator_tag, typename std::iterator_traits<typename array_t::iterator>::iterator_category>::value,
+                  "basic_json iterator assumes array and object type iterators satisfy the LegacyBidirectionalIterator named requirement.");
 
   public:
-
     /// The std::iterator class template (used as a base class to provide typedefs) is deprecated in C++17.
     /// The C++ Standard has never required user-defined iterators to derive from std::iterator.
     /// A user-defined iterator should provide publicly accessible typedefs named
@@ -11168,8 +12954,10 @@ class iter_impl
         typename BasicJsonType::const_reference,
         typename BasicJsonType::reference>::type;
 
-    /// default constructor
     iter_impl() = default;
+    ~iter_impl() = default;
+    iter_impl(iter_impl&&) noexcept = default;
+    iter_impl& operator=(iter_impl&&) noexcept = default;
 
     /*!
     @brief constructor for a given JSON instance
@@ -11181,7 +12969,7 @@ class iter_impl
     {
         JSON_ASSERT(m_object != nullptr);
 
-        switch (m_object->m_type)
+        switch (m_object->m_data.m_type)
         {
             case value_t::object:
             {
@@ -11195,6 +12983,14 @@ class iter_impl
                 break;
             }
 
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
             default:
             {
                 m_it.primitive_iterator = primitive_iterator_t();
@@ -11231,8 +13027,11 @@ class iter_impl
     */
     iter_impl& operator=(const iter_impl<const BasicJsonType>& other) noexcept
     {
-        m_object = other.m_object;
-        m_it = other.m_it;
+        if (&other != this)
+        {
+            m_object = other.m_object;
+            m_it = other.m_it;
+        }
         return *this;
     }
 
@@ -11251,7 +13050,7 @@ class iter_impl
     @return const/non-const iterator
     @note It is not checked whether @a other is initialized.
     */
-    iter_impl& operator=(const iter_impl<typename std::remove_const<BasicJsonType>::type>& other) noexcept
+    iter_impl& operator=(const iter_impl<typename std::remove_const<BasicJsonType>::type>& other) noexcept // NOLINT(cert-oop54-cpp)
     {
         m_object = other.m_object;
         m_it = other.m_it;
@@ -11267,17 +13066,17 @@ class iter_impl
     {
         JSON_ASSERT(m_object != nullptr);
 
-        switch (m_object->m_type)
+        switch (m_object->m_data.m_type)
         {
             case value_t::object:
             {
-                m_it.object_iterator = m_object->m_value.object->begin();
+                m_it.object_iterator = m_object->m_data.m_value.object->begin();
                 break;
             }
 
             case value_t::array:
             {
-                m_it.array_iterator = m_object->m_value.array->begin();
+                m_it.array_iterator = m_object->m_data.m_value.array->begin();
                 break;
             }
 
@@ -11288,6 +13087,13 @@ class iter_impl
                 break;
             }
 
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
             default:
             {
                 m_it.primitive_iterator.set_begin();
@@ -11304,20 +13110,28 @@ class iter_impl
     {
         JSON_ASSERT(m_object != nullptr);
 
-        switch (m_object->m_type)
+        switch (m_object->m_data.m_type)
         {
             case value_t::object:
             {
-                m_it.object_iterator = m_object->m_value.object->end();
+                m_it.object_iterator = m_object->m_data.m_value.object->end();
                 break;
             }
 
             case value_t::array:
             {
-                m_it.array_iterator = m_object->m_value.array->end();
+                m_it.array_iterator = m_object->m_data.m_value.array->end();
                 break;
             }
 
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
             default:
             {
                 m_it.primitive_iterator.set_end();
@@ -11335,23 +13149,30 @@ class iter_impl
     {
         JSON_ASSERT(m_object != nullptr);
 
-        switch (m_object->m_type)
+        switch (m_object->m_data.m_type)
         {
             case value_t::object:
             {
-                JSON_ASSERT(m_it.object_iterator != m_object->m_value.object->end());
+                JSON_ASSERT(m_it.object_iterator != m_object->m_data.m_value.object->end());
                 return m_it.object_iterator->second;
             }
 
             case value_t::array:
             {
-                JSON_ASSERT(m_it.array_iterator != m_object->m_value.array->end());
+                JSON_ASSERT(m_it.array_iterator != m_object->m_data.m_value.array->end());
                 return *m_it.array_iterator;
             }
 
             case value_t::null:
-                JSON_THROW(invalid_iterator::create(214, "cannot get value", *m_object));
+                JSON_THROW(invalid_iterator::create(214, "cannot get value", m_object));
 
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
             default:
             {
                 if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.is_begin()))
@@ -11359,7 +13180,7 @@ class iter_impl
                     return *m_object;
                 }
 
-                JSON_THROW(invalid_iterator::create(214, "cannot get value", *m_object));
+                JSON_THROW(invalid_iterator::create(214, "cannot get value", m_object));
             }
         }
     }
@@ -11372,20 +13193,28 @@ class iter_impl
     {
         JSON_ASSERT(m_object != nullptr);
 
-        switch (m_object->m_type)
+        switch (m_object->m_data.m_type)
         {
             case value_t::object:
             {
-                JSON_ASSERT(m_it.object_iterator != m_object->m_value.object->end());
+                JSON_ASSERT(m_it.object_iterator != m_object->m_data.m_value.object->end());
                 return &(m_it.object_iterator->second);
             }
 
             case value_t::array:
             {
-                JSON_ASSERT(m_it.array_iterator != m_object->m_value.array->end());
+                JSON_ASSERT(m_it.array_iterator != m_object->m_data.m_value.array->end());
                 return &*m_it.array_iterator;
             }
 
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
             default:
             {
                 if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.is_begin()))
@@ -11393,7 +13222,7 @@ class iter_impl
                     return m_object;
                 }
 
-                JSON_THROW(invalid_iterator::create(214, "cannot get value", *m_object));
+                JSON_THROW(invalid_iterator::create(214, "cannot get value", m_object));
             }
         }
     }
@@ -11402,7 +13231,7 @@ class iter_impl
     @brief post-increment (it++)
     @pre The iterator is initialized; i.e. `m_object != nullptr`.
     */
-    iter_impl const operator++(int)
+    iter_impl operator++(int)& // NOLINT(cert-dcl21-cpp)
     {
         auto result = *this;
         ++(*this);
@@ -11417,7 +13246,7 @@ class iter_impl
     {
         JSON_ASSERT(m_object != nullptr);
 
-        switch (m_object->m_type)
+        switch (m_object->m_data.m_type)
         {
             case value_t::object:
             {
@@ -11431,6 +13260,14 @@ class iter_impl
                 break;
             }
 
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
             default:
             {
                 ++m_it.primitive_iterator;
@@ -11445,7 +13282,7 @@ class iter_impl
     @brief post-decrement (it--)
     @pre The iterator is initialized; i.e. `m_object != nullptr`.
     */
-    iter_impl const operator--(int)
+    iter_impl operator--(int)& // NOLINT(cert-dcl21-cpp)
     {
         auto result = *this;
         --(*this);
@@ -11460,7 +13297,7 @@ class iter_impl
     {
         JSON_ASSERT(m_object != nullptr);
 
-        switch (m_object->m_type)
+        switch (m_object->m_data.m_type)
         {
             case value_t::object:
             {
@@ -11474,6 +13311,14 @@ class iter_impl
                 break;
             }
 
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
             default:
             {
                 --m_it.primitive_iterator;
@@ -11494,12 +13339,12 @@ class iter_impl
         // if objects are not the same, the comparison is undefined
         if (JSON_HEDLEY_UNLIKELY(m_object != other.m_object))
         {
-            JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers", *m_object));
+            JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers", m_object));
         }
 
         JSON_ASSERT(m_object != nullptr);
 
-        switch (m_object->m_type)
+        switch (m_object->m_data.m_type)
         {
             case value_t::object:
                 return (m_it.object_iterator == other.m_it.object_iterator);
@@ -11507,6 +13352,14 @@ class iter_impl
             case value_t::array:
                 return (m_it.array_iterator == other.m_it.array_iterator);
 
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
             default:
                 return (m_it.primitive_iterator == other.m_it.primitive_iterator);
         }
@@ -11531,19 +13384,27 @@ class iter_impl
         // if objects are not the same, the comparison is undefined
         if (JSON_HEDLEY_UNLIKELY(m_object != other.m_object))
         {
-            JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers", *m_object));
+            JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers", m_object));
         }
 
         JSON_ASSERT(m_object != nullptr);
 
-        switch (m_object->m_type)
+        switch (m_object->m_data.m_type)
         {
             case value_t::object:
-                JSON_THROW(invalid_iterator::create(213, "cannot compare order of object iterators", *m_object));
+                JSON_THROW(invalid_iterator::create(213, "cannot compare order of object iterators", m_object));
 
             case value_t::array:
                 return (m_it.array_iterator < other.m_it.array_iterator);
 
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
             default:
                 return (m_it.primitive_iterator < other.m_it.primitive_iterator);
         }
@@ -11584,10 +13445,10 @@ class iter_impl
     {
         JSON_ASSERT(m_object != nullptr);
 
-        switch (m_object->m_type)
+        switch (m_object->m_data.m_type)
         {
             case value_t::object:
-                JSON_THROW(invalid_iterator::create(209, "cannot use offsets with object iterators", *m_object));
+                JSON_THROW(invalid_iterator::create(209, "cannot use offsets with object iterators", m_object));
 
             case value_t::array:
             {
@@ -11595,6 +13456,14 @@ class iter_impl
                 break;
             }
 
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
             default:
             {
                 m_it.primitive_iterator += i;
@@ -11655,14 +13524,22 @@ class iter_impl
     {
         JSON_ASSERT(m_object != nullptr);
 
-        switch (m_object->m_type)
+        switch (m_object->m_data.m_type)
         {
             case value_t::object:
-                JSON_THROW(invalid_iterator::create(209, "cannot use offsets with object iterators", *m_object));
+                JSON_THROW(invalid_iterator::create(209, "cannot use offsets with object iterators", m_object));
 
             case value_t::array:
                 return m_it.array_iterator - other.m_it.array_iterator;
 
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
             default:
                 return m_it.primitive_iterator - other.m_it.primitive_iterator;
         }
@@ -11676,17 +13553,24 @@ class iter_impl
     {
         JSON_ASSERT(m_object != nullptr);
 
-        switch (m_object->m_type)
+        switch (m_object->m_data.m_type)
         {
             case value_t::object:
-                JSON_THROW(invalid_iterator::create(208, "cannot use operator[] for object iterators", *m_object));
+                JSON_THROW(invalid_iterator::create(208, "cannot use operator[] for object iterators", m_object));
 
             case value_t::array:
                 return *std::next(m_it.array_iterator, n);
 
             case value_t::null:
-                JSON_THROW(invalid_iterator::create(214, "cannot get value", *m_object));
+                JSON_THROW(invalid_iterator::create(214, "cannot get value", m_object));
 
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
             default:
             {
                 if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.get_value() == -n))
@@ -11694,7 +13578,7 @@ class iter_impl
                     return *m_object;
                 }
 
-                JSON_THROW(invalid_iterator::create(214, "cannot get value", *m_object));
+                JSON_THROW(invalid_iterator::create(214, "cannot get value", m_object));
             }
         }
     }
@@ -11712,7 +13596,7 @@ class iter_impl
             return m_it.object_iterator->first;
         }
 
-        JSON_THROW(invalid_iterator::create(207, "cannot use key() for non-object iterators", *m_object));
+        JSON_THROW(invalid_iterator::create(207, "cannot use key() for non-object iterators", m_object));
     }
 
     /*!
@@ -11730,22 +13614,34 @@ class iter_impl
     /// the actual iterator of the associated instance
     internal_iterator<typename std::remove_const<BasicJsonType>::type> m_it {};
 };
-} // namespace detail
-} // namespace nlohmann
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
 
 // #include <nlohmann/detail/iterators/iteration_proxy.hpp>
 
 // #include <nlohmann/detail/iterators/json_reverse_iterator.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 
 
 #include <cstddef> // ptrdiff_t
 #include <iterator> // reverse_iterator
 #include <utility> // declval
 
-namespace nlohmann
-{
+// #include <nlohmann/detail/abi_macros.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
+
 //////////////////////
 // reverse_iterator //
 //////////////////////
@@ -11786,7 +13682,7 @@ class json_reverse_iterator : public std::reverse_iterator<Base>
     explicit json_reverse_iterator(const base_iterator& it) noexcept : base_iterator(it) {}
 
     /// post-increment (it++)
-    json_reverse_iterator const operator++(int)
+    json_reverse_iterator operator++(int)& // NOLINT(cert-dcl21-cpp)
     {
         return static_cast<json_reverse_iterator>(base_iterator::operator++(1));
     }
@@ -11798,7 +13694,7 @@ class json_reverse_iterator : public std::reverse_iterator<Base>
     }
 
     /// post-decrement (it--)
-    json_reverse_iterator const operator--(int)
+    json_reverse_iterator operator--(int)& // NOLINT(cert-dcl21-cpp)
     {
         return static_cast<json_reverse_iterator>(base_iterator::operator--(1));
     }
@@ -11853,16 +13749,72 @@ class json_reverse_iterator : public std::reverse_iterator<Base>
         return it.operator * ();
     }
 };
+
 }  // namespace detail
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
 
 // #include <nlohmann/detail/iterators/primitive_iterator.hpp>
 
+// #include <nlohmann/detail/json_custom_base_class.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <type_traits> // conditional, is_same
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+/*!
+@brief Default base class of the @ref basic_json class.
+
+So that the correct implementations of the copy / move ctors / assign operators
+of @ref basic_json do not require complex case distinctions
+(no base class / custom base class used as customization point),
+@ref basic_json always has a base class.
+By default, this class is used because it is empty and thus has no effect
+on the behavior of @ref basic_json.
+*/
+struct json_default_base {};
+
+template<class T>
+using json_base_class = typename std::conditional <
+                        std::is_same<T, void>::value,
+                        json_default_base,
+                        T
+                        >::type;
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
 // #include <nlohmann/detail/json_pointer.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 
 
 #include <algorithm> // all_of
 #include <cctype> // isdigit
+#include <cerrno> // errno, ERANGE
+#include <cstdlib> // strtoull
+#ifndef JSON_NO_IO
+    #include <iosfwd> // ostream
+#endif  // JSON_NO_IO
 #include <limits> // max
 #include <numeric> // accumulate
 #include <string> // string
@@ -11873,92 +13825,81 @@ class json_reverse_iterator : public std::reverse_iterator<Base>
 
 // #include <nlohmann/detail/macro_scope.hpp>
 
+// #include <nlohmann/detail/string_concat.hpp>
+
 // #include <nlohmann/detail/string_escape.hpp>
 
 // #include <nlohmann/detail/value_t.hpp>
 
 
-namespace nlohmann
-{
-template<typename BasicJsonType>
+NLOHMANN_JSON_NAMESPACE_BEGIN
+
+/// @brief JSON Pointer defines a string syntax for identifying a specific value within a JSON document
+/// @sa https://json.nlohmann.me/api/json_pointer/
+template<typename RefStringType>
 class json_pointer
 {
     // allow basic_json to access private members
     NLOHMANN_BASIC_JSON_TPL_DECLARATION
     friend class basic_json;
 
-  public:
-    /*!
-    @brief create JSON pointer
-
-    Create a JSON pointer according to the syntax described in
-    [Section 3 of RFC6901](https://tools.ietf.org/html/rfc6901#section-3).
-
-    @param[in] s  string representing the JSON pointer; if omitted, the empty
-                  string is assumed which references the whole JSON value
+    template<typename>
+    friend class json_pointer;
 
-    @throw parse_error.107 if the given JSON pointer @a s is nonempty and does
-                           not begin with a slash (`/`); see example below
+    template<typename T>
+    struct string_t_helper
+    {
+        using type = T;
+    };
 
-    @throw parse_error.108 if a tilde (`~`) in the given JSON pointer @a s is
-    not followed by `0` (representing `~`) or `1` (representing `/`); see
-    example below
+    NLOHMANN_BASIC_JSON_TPL_DECLARATION
+    struct string_t_helper<NLOHMANN_BASIC_JSON_TPL>
+    {
+        using type = StringType;
+    };
 
-    @liveexample{The example shows the construction several valid JSON pointers
-    as well as the exceptional behavior.,json_pointer}
+  public:
+    // for backwards compatibility accept BasicJsonType
+    using string_t = typename string_t_helper<RefStringType>::type;
 
-    @since version 2.0.0
-    */
-    explicit json_pointer(const std::string& s = "")
+    /// @brief create JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/json_pointer/
+    explicit json_pointer(const string_t& s = "")
         : reference_tokens(split(s))
     {}
 
-    /*!
-    @brief return a string representation of the JSON pointer
-
-    @invariant For each JSON pointer `ptr`, it holds:
-    @code {.cpp}
-    ptr == json_pointer(ptr.to_string());
-    @endcode
-
-    @return a string representation of the JSON pointer
-
-    @liveexample{The example shows the result of `to_string`.,json_pointer__to_string}
-
-    @since version 2.0.0
-    */
-    std::string to_string() const
+    /// @brief return a string representation of the JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/to_string/
+    string_t to_string() const
     {
         return std::accumulate(reference_tokens.begin(), reference_tokens.end(),
-                               std::string{},
-                               [](const std::string & a, const std::string & b)
+                               string_t{},
+                               [](const string_t& a, const string_t& b)
         {
-            return a + "/" + detail::escape(b);
+            return detail::concat(a, '/', detail::escape(b));
         });
     }
 
-    /// @copydoc to_string()
-    operator std::string() const
+    /// @brief return a string representation of the JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_string/
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, to_string())
+    operator string_t() const
     {
         return to_string();
     }
 
-    /*!
-    @brief append another JSON pointer at the end of this JSON pointer
-
-    @param[in] ptr  JSON pointer to append
-    @return JSON pointer with @a ptr appended
-
-    @liveexample{The example shows the usage of `operator/=`.,json_pointer__operator_add}
-
-    @complexity Linear in the length of @a ptr.
-
-    @sa @ref operator/=(std::string) to append a reference token
-    @sa @ref operator/=(std::size_t) to append an array index
-    @sa @ref operator/(const json_pointer&, const json_pointer&) for a binary operator
+#ifndef JSON_NO_IO
+    /// @brief write string representation of the JSON pointer to stream
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ltlt/
+    friend std::ostream& operator<<(std::ostream& o, const json_pointer& ptr)
+    {
+        o << ptr.to_string();
+        return o;
+    }
+#endif
 
-    @since version 3.6.0
-    */
+    /// @brief append another JSON pointer at the end of this JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slasheq/
     json_pointer& operator/=(const json_pointer& ptr)
     {
         reference_tokens.insert(reference_tokens.end(),
@@ -11967,123 +13908,45 @@ class json_pointer
         return *this;
     }
 
-    /*!
-    @brief append an unescaped reference token at the end of this JSON pointer
-
-    @param[in] token  reference token to append
-    @return JSON pointer with @a token appended without escaping @a token
-
-    @liveexample{The example shows the usage of `operator/=`.,json_pointer__operator_add}
-
-    @complexity Amortized constant.
-
-    @sa @ref operator/=(const json_pointer&) to append a JSON pointer
-    @sa @ref operator/=(std::size_t) to append an array index
-    @sa @ref operator/(const json_pointer&, std::size_t) for a binary operator
-
-    @since version 3.6.0
-    */
-    json_pointer& operator/=(std::string token)
+    /// @brief append an unescaped reference token at the end of this JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slasheq/
+    json_pointer& operator/=(string_t token)
     {
         push_back(std::move(token));
         return *this;
     }
 
-    /*!
-    @brief append an array index at the end of this JSON pointer
-
-    @param[in] array_idx  array index to append
-    @return JSON pointer with @a array_idx appended
-
-    @liveexample{The example shows the usage of `operator/=`.,json_pointer__operator_add}
-
-    @complexity Amortized constant.
-
-    @sa @ref operator/=(const json_pointer&) to append a JSON pointer
-    @sa @ref operator/=(std::string) to append a reference token
-    @sa @ref operator/(const json_pointer&, std::string) for a binary operator
-
-    @since version 3.6.0
-    */
+    /// @brief append an array index at the end of this JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slasheq/
     json_pointer& operator/=(std::size_t array_idx)
     {
         return *this /= std::to_string(array_idx);
     }
 
-    /*!
-    @brief create a new JSON pointer by appending the right JSON pointer at the end of the left JSON pointer
-
-    @param[in] lhs  JSON pointer
-    @param[in] rhs  JSON pointer
-    @return a new JSON pointer with @a rhs appended to @a lhs
-
-    @liveexample{The example shows the usage of `operator/`.,json_pointer__operator_add_binary}
-
-    @complexity Linear in the length of @a lhs and @a rhs.
-
-    @sa @ref operator/=(const json_pointer&) to append a JSON pointer
-
-    @since version 3.6.0
-    */
+    /// @brief create a new JSON pointer by appending the right JSON pointer at the end of the left JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slash/
     friend json_pointer operator/(const json_pointer& lhs,
                                   const json_pointer& rhs)
     {
         return json_pointer(lhs) /= rhs;
     }
 
-    /*!
-    @brief create a new JSON pointer by appending the unescaped token at the end of the JSON pointer
-
-    @param[in] ptr  JSON pointer
-    @param[in] token  reference token
-    @return a new JSON pointer with unescaped @a token appended to @a ptr
-
-    @liveexample{The example shows the usage of `operator/`.,json_pointer__operator_add_binary}
-
-    @complexity Linear in the length of @a ptr.
-
-    @sa @ref operator/=(std::string) to append a reference token
-
-    @since version 3.6.0
-    */
-    friend json_pointer operator/(const json_pointer& ptr, std::string token)
+    /// @brief create a new JSON pointer by appending the unescaped token at the end of the JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slash/
+    friend json_pointer operator/(const json_pointer& lhs, string_t token) // NOLINT(performance-unnecessary-value-param)
     {
-        return json_pointer(ptr) /= std::move(token);
+        return json_pointer(lhs) /= std::move(token);
     }
 
-    /*!
-    @brief create a new JSON pointer by appending the array-index-token at the end of the JSON pointer
-
-    @param[in] ptr  JSON pointer
-    @param[in] array_idx  array index
-    @return a new JSON pointer with @a array_idx appended to @a ptr
-
-    @liveexample{The example shows the usage of `operator/`.,json_pointer__operator_add_binary}
-
-    @complexity Linear in the length of @a ptr.
-
-    @sa @ref operator/=(std::size_t) to append an array index
-
-    @since version 3.6.0
-    */
-    friend json_pointer operator/(const json_pointer& ptr, std::size_t array_idx)
+    /// @brief create a new JSON pointer by appending the array-index-token at the end of the JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slash/
+    friend json_pointer operator/(const json_pointer& lhs, std::size_t array_idx)
     {
-        return json_pointer(ptr) /= array_idx;
+        return json_pointer(lhs) /= array_idx;
     }
 
-    /*!
-    @brief returns the parent of this JSON pointer
-
-    @return parent of this JSON pointer; in case this JSON pointer is the root,
-            the root itself is returned
-
-    @complexity Linear in the length of the JSON pointer.
-
-    @liveexample{The example shows the result of `parent_pointer` for different
-    JSON Pointers.,json_pointer__parent_pointer}
-
-    @since version 3.6.0
-    */
+    /// @brief returns the parent of this JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/parent_pointer/
     json_pointer parent_pointer() const
     {
         if (empty())
@@ -12096,90 +13959,46 @@ class json_pointer
         return res;
     }
 
-    /*!
-    @brief remove last reference token
-
-    @pre not `empty()`
-
-    @liveexample{The example shows the usage of `pop_back`.,json_pointer__pop_back}
-
-    @complexity Constant.
-
-    @throw out_of_range.405 if JSON pointer has no parent
-
-    @since version 3.6.0
-    */
+    /// @brief remove last reference token
+    /// @sa https://json.nlohmann.me/api/json_pointer/pop_back/
     void pop_back()
     {
         if (JSON_HEDLEY_UNLIKELY(empty()))
         {
-            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent", BasicJsonType()));
+            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent", nullptr));
         }
 
         reference_tokens.pop_back();
     }
 
-    /*!
-    @brief return last reference token
-
-    @pre not `empty()`
-    @return last reference token
-
-    @liveexample{The example shows the usage of `back`.,json_pointer__back}
-
-    @complexity Constant.
-
-    @throw out_of_range.405 if JSON pointer has no parent
-
-    @since version 3.6.0
-    */
-    const std::string& back() const
+    /// @brief return last reference token
+    /// @sa https://json.nlohmann.me/api/json_pointer/back/
+    const string_t& back() const
     {
         if (JSON_HEDLEY_UNLIKELY(empty()))
         {
-            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent", BasicJsonType()));
+            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent", nullptr));
         }
 
         return reference_tokens.back();
     }
 
-    /*!
-    @brief append an unescaped token at the end of the reference pointer
-
-    @param[in] token  token to add
-
-    @complexity Amortized constant.
-
-    @liveexample{The example shows the result of `push_back` for different
-    JSON Pointers.,json_pointer__push_back}
-
-    @since version 3.6.0
-    */
-    void push_back(const std::string& token)
+    /// @brief append an unescaped token at the end of the reference pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/push_back/
+    void push_back(const string_t& token)
     {
         reference_tokens.push_back(token);
     }
 
-    /// @copydoc push_back(const std::string&)
-    void push_back(std::string&& token)
+    /// @brief append an unescaped token at the end of the reference pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/push_back/
+    void push_back(string_t&& token)
     {
         reference_tokens.push_back(std::move(token));
     }
 
-    /*!
-    @brief return whether pointer points to the root document
-
-    @return true iff the JSON pointer points to the root document
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @liveexample{The example shows the result of `empty` for different JSON
-    Pointers.,json_pointer__empty}
-
-    @since version 3.6.0
-    */
+    /// @brief return whether pointer points to the root document
+    /// @sa https://json.nlohmann.me/api/json_pointer/empty/
     bool empty() const noexcept
     {
         return reference_tokens.empty();
@@ -12196,44 +14015,39 @@ class json_pointer
     @throw out_of_range.404 if string @a s could not be converted to an integer
     @throw out_of_range.410 if an array index exceeds size_type
     */
-    static typename BasicJsonType::size_type array_index(const std::string& s)
+    template<typename BasicJsonType>
+    static typename BasicJsonType::size_type array_index(const string_t& s)
     {
         using size_type = typename BasicJsonType::size_type;
 
         // error condition (cf. RFC 6901, Sect. 4)
         if (JSON_HEDLEY_UNLIKELY(s.size() > 1 && s[0] == '0'))
         {
-            JSON_THROW(detail::parse_error::create(106, 0, "array index '" + s + "' must not begin with '0'", BasicJsonType()));
+            JSON_THROW(detail::parse_error::create(106, 0, detail::concat("array index '", s, "' must not begin with '0'"), nullptr));
         }
 
         // error condition (cf. RFC 6901, Sect. 4)
         if (JSON_HEDLEY_UNLIKELY(s.size() > 1 && !(s[0] >= '1' && s[0] <= '9')))
         {
-            JSON_THROW(detail::parse_error::create(109, 0, "array index '" + s + "' is not a number", BasicJsonType()));
-        }
-
-        std::size_t processed_chars = 0;
-        unsigned long long res = 0;
-        JSON_TRY
-        {
-            res = std::stoull(s, &processed_chars);
-        }
-        JSON_CATCH(std::out_of_range&)
-        {
-            JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + s + "'", BasicJsonType()));
+            JSON_THROW(detail::parse_error::create(109, 0, detail::concat("array index '", s, "' is not a number"), nullptr));
         }
 
-        // check if the string was completely read
-        if (JSON_HEDLEY_UNLIKELY(processed_chars != s.size()))
+        const char* p = s.c_str();
+        char* p_end = nullptr;
+        errno = 0; // strtoull doesn't reset errno
+        const unsigned long long res = std::strtoull(p, &p_end, 10); // NOLINT(runtime/int)
+        if (p == p_end // invalid input or empty string
+                || errno == ERANGE // out of range
+                || JSON_HEDLEY_UNLIKELY(static_cast<std::size_t>(p_end - p) != s.size())) // incomplete read
         {
-            JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + s + "'", BasicJsonType()));
+            JSON_THROW(detail::out_of_range::create(404, detail::concat("unresolved reference token '", s, "'"), nullptr));
         }
 
         // only triggered on special platforms (like 32bit), see also
         // https://github.com/nlohmann/json/pull/2203
-        if (res >= static_cast<unsigned long long>((std::numeric_limits<size_type>::max)()))
+        if (res >= static_cast<unsigned long long>((std::numeric_limits<size_type>::max)()))  // NOLINT(runtime/int)
         {
-            JSON_THROW(detail::out_of_range::create(410, "array index " + s + " exceeds size_type", BasicJsonType())); // LCOV_EXCL_LINE
+            JSON_THROW(detail::out_of_range::create(410, detail::concat("array index ", s, " exceeds size_type"), nullptr));   // LCOV_EXCL_LINE
         }
 
         return static_cast<size_type>(res);
@@ -12244,7 +14058,7 @@ class json_pointer
     {
         if (JSON_HEDLEY_UNLIKELY(empty()))
         {
-            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent", BasicJsonType()));
+            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent", nullptr));
         }
 
         json_pointer result = *this;
@@ -12261,9 +14075,10 @@ class json_pointer
     @throw parse_error.109 if array index is not a number
     @throw type_error.313 if value cannot be unflattened
     */
+    template<typename BasicJsonType>
     BasicJsonType& get_and_create(BasicJsonType& j) const
     {
-        auto result = &j;
+        auto* result = &j;
 
         // in case no reference tokens exist, return a reference to the JSON value
         // j which will be overwritten by a primitive value
@@ -12296,7 +14111,7 @@ class json_pointer
                 case detail::value_t::array:
                 {
                     // create an entry in the array
-                    result = &result->operator[](array_index(reference_token));
+                    result = &result->operator[](array_index<BasicJsonType>(reference_token));
                     break;
                 }
 
@@ -12306,8 +14121,15 @@ class json_pointer
                 an error situation, because primitive values may only occur as
                 single value; that is, with an empty list of reference tokens.
                 */
+                case detail::value_t::string:
+                case detail::value_t::boolean:
+                case detail::value_t::number_integer:
+                case detail::value_t::number_unsigned:
+                case detail::value_t::number_float:
+                case detail::value_t::binary:
+                case detail::value_t::discarded:
                 default:
-                    JSON_THROW(detail::type_error::create(313, "invalid value to unflatten", j));
+                    JSON_THROW(detail::type_error::create(313, "invalid value to unflatten", &j));
             }
         }
 
@@ -12333,6 +14155,7 @@ class json_pointer
     @throw parse_error.109   if an array index was not a number
     @throw out_of_range.404  if the JSON pointer can not be resolved
     */
+    template<typename BasicJsonType>
     BasicJsonType& get_unchecked(BasicJsonType* ptr) const
     {
         for (const auto& reference_token : reference_tokens)
@@ -12368,18 +14191,26 @@ class json_pointer
                     if (reference_token == "-")
                     {
                         // explicitly treat "-" as index beyond the end
-                        ptr = &ptr->operator[](ptr->m_value.array->size());
+                        ptr = &ptr->operator[](ptr->m_data.m_value.array->size());
                     }
                     else
                     {
                         // convert array index to number; unchecked access
-                        ptr = &ptr->operator[](array_index(reference_token));
+                        ptr = &ptr->operator[](array_index<BasicJsonType>(reference_token));
                     }
                     break;
                 }
 
+                case detail::value_t::null:
+                case detail::value_t::string:
+                case detail::value_t::boolean:
+                case detail::value_t::number_integer:
+                case detail::value_t::number_unsigned:
+                case detail::value_t::number_float:
+                case detail::value_t::binary:
+                case detail::value_t::discarded:
                 default:
-                    JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'", *ptr));
+                    JSON_THROW(detail::out_of_range::create(404, detail::concat("unresolved reference token '", reference_token, "'"), ptr));
             }
         }
 
@@ -12392,6 +14223,7 @@ class json_pointer
     @throw out_of_range.402  if the array index '-' is used
     @throw out_of_range.404  if the JSON pointer can not be resolved
     */
+    template<typename BasicJsonType>
     BasicJsonType& get_checked(BasicJsonType* ptr) const
     {
         for (const auto& reference_token : reference_tokens)
@@ -12410,18 +14242,26 @@ class json_pointer
                     if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
                     {
                         // "-" always fails the range check
-                        JSON_THROW(detail::out_of_range::create(402,
-                                                                "array index '-' (" + std::to_string(ptr->m_value.array->size()) +
-                                                                ") is out of range", *ptr));
+                        JSON_THROW(detail::out_of_range::create(402, detail::concat(
+                                "array index '-' (", std::to_string(ptr->m_data.m_value.array->size()),
+                                ") is out of range"), ptr));
                     }
 
                     // note: at performs range check
-                    ptr = &ptr->at(array_index(reference_token));
+                    ptr = &ptr->at(array_index<BasicJsonType>(reference_token));
                     break;
                 }
 
+                case detail::value_t::null:
+                case detail::value_t::string:
+                case detail::value_t::boolean:
+                case detail::value_t::number_integer:
+                case detail::value_t::number_unsigned:
+                case detail::value_t::number_float:
+                case detail::value_t::binary:
+                case detail::value_t::discarded:
                 default:
-                    JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'", *ptr));
+                    JSON_THROW(detail::out_of_range::create(404, detail::concat("unresolved reference token '", reference_token, "'"), ptr));
             }
         }
 
@@ -12441,6 +14281,7 @@ class json_pointer
     @throw out_of_range.402  if the array index '-' is used
     @throw out_of_range.404  if the JSON pointer can not be resolved
     */
+    template<typename BasicJsonType>
     const BasicJsonType& get_unchecked(const BasicJsonType* ptr) const
     {
         for (const auto& reference_token : reference_tokens)
@@ -12459,16 +14300,24 @@ class json_pointer
                     if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
                     {
                         // "-" cannot be used for const access
-                        JSON_THROW(detail::out_of_range::create(402, "array index '-' (" + std::to_string(ptr->m_value.array->size()) + ") is out of range", *ptr));
+                        JSON_THROW(detail::out_of_range::create(402, detail::concat("array index '-' (", std::to_string(ptr->m_data.m_value.array->size()), ") is out of range"), ptr));
                     }
 
                     // use unchecked array access
-                    ptr = &ptr->operator[](array_index(reference_token));
+                    ptr = &ptr->operator[](array_index<BasicJsonType>(reference_token));
                     break;
                 }
 
+                case detail::value_t::null:
+                case detail::value_t::string:
+                case detail::value_t::boolean:
+                case detail::value_t::number_integer:
+                case detail::value_t::number_unsigned:
+                case detail::value_t::number_float:
+                case detail::value_t::binary:
+                case detail::value_t::discarded:
                 default:
-                    JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'", *ptr));
+                    JSON_THROW(detail::out_of_range::create(404, detail::concat("unresolved reference token '", reference_token, "'"), ptr));
             }
         }
 
@@ -12481,6 +14330,7 @@ class json_pointer
     @throw out_of_range.402  if the array index '-' is used
     @throw out_of_range.404  if the JSON pointer can not be resolved
     */
+    template<typename BasicJsonType>
     const BasicJsonType& get_checked(const BasicJsonType* ptr) const
     {
         for (const auto& reference_token : reference_tokens)
@@ -12499,18 +14349,26 @@ class json_pointer
                     if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
                     {
                         // "-" always fails the range check
-                        JSON_THROW(detail::out_of_range::create(402,
-                                                                "array index '-' (" + std::to_string(ptr->m_value.array->size()) +
-                                                                ") is out of range", *ptr));
+                        JSON_THROW(detail::out_of_range::create(402, detail::concat(
+                                "array index '-' (", std::to_string(ptr->m_data.m_value.array->size()),
+                                ") is out of range"), ptr));
                     }
 
                     // note: at performs range check
-                    ptr = &ptr->at(array_index(reference_token));
+                    ptr = &ptr->at(array_index<BasicJsonType>(reference_token));
                     break;
                 }
 
+                case detail::value_t::null:
+                case detail::value_t::string:
+                case detail::value_t::boolean:
+                case detail::value_t::number_integer:
+                case detail::value_t::number_unsigned:
+                case detail::value_t::number_float:
+                case detail::value_t::binary:
+                case detail::value_t::discarded:
                 default:
-                    JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'", *ptr));
+                    JSON_THROW(detail::out_of_range::create(404, detail::concat("unresolved reference token '", reference_token, "'"), ptr));
             }
         }
 
@@ -12521,6 +14379,7 @@ class json_pointer
     @throw parse_error.106   if an array index begins with '0'
     @throw parse_error.109   if an array index was not a number
     */
+    template<typename BasicJsonType>
     bool contains(const BasicJsonType* ptr) const
     {
         for (const auto& reference_token : reference_tokens)
@@ -12568,7 +14427,7 @@ class json_pointer
                         }
                     }
 
-                    const auto idx = array_index(reference_token);
+                    const auto idx = array_index<BasicJsonType>(reference_token);
                     if (idx >= ptr->size())
                     {
                         // index out of range
@@ -12579,6 +14438,14 @@ class json_pointer
                     break;
                 }
 
+                case detail::value_t::null:
+                case detail::value_t::string:
+                case detail::value_t::boolean:
+                case detail::value_t::number_integer:
+                case detail::value_t::number_unsigned:
+                case detail::value_t::number_float:
+                case detail::value_t::binary:
+                case detail::value_t::discarded:
                 default:
                 {
                     // we do not expect primitive values if there is still a
@@ -12601,9 +14468,9 @@ class json_pointer
     @throw parse_error.107  if the pointer is not empty or begins with '/'
     @throw parse_error.108  if character '~' is not followed by '0' or '1'
     */
-    static std::vector<std::string> split(const std::string& reference_string)
+    static std::vector<string_t> split(const string_t& reference_string)
     {
-        std::vector<std::string> result;
+        std::vector<string_t> result;
 
         // special case: empty reference string -> no reference tokens
         if (reference_string.empty())
@@ -12614,7 +14481,7 @@ class json_pointer
         // check if nonempty reference string begins with slash
         if (JSON_HEDLEY_UNLIKELY(reference_string[0] != '/'))
         {
-            JSON_THROW(detail::parse_error::create(107, 1, "JSON pointer must be empty or begin with '/' - was: '" + reference_string + "'", BasicJsonType()));
+            JSON_THROW(detail::parse_error::create(107, 1, detail::concat("JSON pointer must be empty or begin with '/' - was: '", reference_string, "'"), nullptr));
         }
 
         // extract the reference tokens:
@@ -12625,11 +14492,11 @@ class json_pointer
             std::size_t slash = reference_string.find_first_of('/', 1),
             // set the beginning of the first reference token
             start = 1;
-            // we can stop if start == 0 (if slash == std::string::npos)
+            // we can stop if start == 0 (if slash == string_t::npos)
             start != 0;
             // set the beginning of the next reference token
-            // (will eventually be 0 if slash == std::string::npos)
-            start = (slash == std::string::npos) ? 0 : slash + 1,
+            // (will eventually be 0 if slash == string_t::npos)
+            start = (slash == string_t::npos) ? 0 : slash + 1,
             // find next slash
             slash = reference_string.find_first_of('/', start))
         {
@@ -12639,7 +14506,7 @@ class json_pointer
 
             // check reference tokens are properly escaped
             for (std::size_t pos = reference_token.find_first_of('~');
-                    pos != std::string::npos;
+                    pos != string_t::npos;
                     pos = reference_token.find_first_of('~', pos + 1))
             {
                 JSON_ASSERT(reference_token[pos] == '~');
@@ -12649,7 +14516,7 @@ class json_pointer
                                          (reference_token[pos + 1] != '0' &&
                                           reference_token[pos + 1] != '1')))
                 {
-                    JSON_THROW(detail::parse_error::create(108, 0, "escape character '~' must be followed with '0' or '1'", BasicJsonType()));
+                    JSON_THROW(detail::parse_error::create(108, 0, "escape character '~' must be followed with '0' or '1'", nullptr));
                 }
             }
 
@@ -12669,7 +14536,8 @@ class json_pointer
 
     @note Empty objects or arrays are flattened to `null`.
     */
-    static void flatten(const std::string& reference_string,
+    template<typename BasicJsonType>
+    static void flatten(const string_t& reference_string,
                         const BasicJsonType& value,
                         BasicJsonType& result)
     {
@@ -12677,7 +14545,7 @@ class json_pointer
         {
             case detail::value_t::array:
             {
-                if (value.m_value.array->empty())
+                if (value.m_data.m_value.array->empty())
                 {
                     // flatten empty array as null
                     result[reference_string] = nullptr;
@@ -12685,10 +14553,10 @@ class json_pointer
                 else
                 {
                     // iterate array and use index as reference string
-                    for (std::size_t i = 0; i < value.m_value.array->size(); ++i)
+                    for (std::size_t i = 0; i < value.m_data.m_value.array->size(); ++i)
                     {
-                        flatten(reference_string + "/" + std::to_string(i),
-                                value.m_value.array->operator[](i), result);
+                        flatten(detail::concat(reference_string, '/', std::to_string(i)),
+                                value.m_data.m_value.array->operator[](i), result);
                     }
                 }
                 break;
@@ -12696,7 +14564,7 @@ class json_pointer
 
             case detail::value_t::object:
             {
-                if (value.m_value.object->empty())
+                if (value.m_data.m_value.object->empty())
                 {
                     // flatten empty object as null
                     result[reference_string] = nullptr;
@@ -12704,14 +14572,22 @@ class json_pointer
                 else
                 {
                     // iterate object and use keys as reference string
-                    for (const auto& element : *value.m_value.object)
+                    for (const auto& element : *value.m_data.m_value.object)
                     {
-                        flatten(reference_string + "/" + detail::escape(element.first), element.second, result);
+                        flatten(detail::concat(reference_string, '/', detail::escape(element.first)), element.second, result);
                     }
                 }
                 break;
             }
 
+            case detail::value_t::null:
+            case detail::value_t::string:
+            case detail::value_t::boolean:
+            case detail::value_t::number_integer:
+            case detail::value_t::number_unsigned:
+            case detail::value_t::number_float:
+            case detail::value_t::binary:
+            case detail::value_t::discarded:
             default:
             {
                 // add primitive value with its reference string
@@ -12731,22 +14607,23 @@ class json_pointer
     @throw type_error.315  if object values are not primitive
     @throw type_error.313  if value cannot be unflattened
     */
+    template<typename BasicJsonType>
     static BasicJsonType
     unflatten(const BasicJsonType& value)
     {
         if (JSON_HEDLEY_UNLIKELY(!value.is_object()))
         {
-            JSON_THROW(detail::type_error::create(314, "only objects can be unflattened", value));
+            JSON_THROW(detail::type_error::create(314, "only objects can be unflattened", &value));
         }
 
         BasicJsonType result;
 
         // iterate the JSON object values
-        for (const auto& element : *value.m_value.object)
+        for (const auto& element : *value.m_data.m_value.object)
         {
             if (JSON_HEDLEY_UNLIKELY(!element.second.is_primitive()))
             {
-                JSON_THROW(detail::type_error::create(315, "values in object must be primitive", element.second));
+                JSON_THROW(detail::type_error::create(315, "values in object must be primitive", &element.second));
             }
 
             // assign value to reference pointed to by JSON pointer; Note that if
@@ -12759,58 +14636,185 @@ class json_pointer
         return result;
     }
 
-    /*!
-    @brief compares two JSON pointers for equality
+    // can't use conversion operator because of ambiguity
+    json_pointer<string_t> convert() const&
+    {
+        json_pointer<string_t> result;
+        result.reference_tokens = reference_tokens;
+        return result;
+    }
 
-    @param[in] lhs  JSON pointer to compare
-    @param[in] rhs  JSON pointer to compare
-    @return whether @a lhs is equal to @a rhs
+    json_pointer<string_t> convert()&&
+    {
+        json_pointer<string_t> result;
+        result.reference_tokens = std::move(reference_tokens);
+        return result;
+    }
 
-    @complexity Linear in the length of the JSON pointer
+  public:
+#if JSON_HAS_THREE_WAY_COMPARISON
+    /// @brief compares two JSON pointers for equality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_eq/
+    template<typename RefStringTypeRhs>
+    bool operator==(const json_pointer<RefStringTypeRhs>& rhs) const noexcept
+    {
+        return reference_tokens == rhs.reference_tokens;
+    }
 
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-    */
-    friend bool operator==(json_pointer const& lhs,
-                           json_pointer const& rhs) noexcept
+    /// @brief compares JSON pointer and string for equality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_eq/
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator==(json_pointer))
+    bool operator==(const string_t& rhs) const
     {
-        return lhs.reference_tokens == rhs.reference_tokens;
+        return *this == json_pointer(rhs);
     }
 
-    /*!
-    @brief compares two JSON pointers for inequality
+    /// @brief 3-way compares two JSON pointers
+    template<typename RefStringTypeRhs>
+    std::strong_ordering operator<=>(const json_pointer<RefStringTypeRhs>& rhs) const noexcept // *NOPAD*
+    {
+        return  reference_tokens <=> rhs.reference_tokens; // *NOPAD*
+    }
+#else
+    /// @brief compares two JSON pointers for equality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_eq/
+    template<typename RefStringTypeLhs, typename RefStringTypeRhs>
+    // NOLINTNEXTLINE(readability-redundant-declaration)
+    friend bool operator==(const json_pointer<RefStringTypeLhs>& lhs,
+                           const json_pointer<RefStringTypeRhs>& rhs) noexcept;
+
+    /// @brief compares JSON pointer and string for equality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_eq/
+    template<typename RefStringTypeLhs, typename StringType>
+    // NOLINTNEXTLINE(readability-redundant-declaration)
+    friend bool operator==(const json_pointer<RefStringTypeLhs>& lhs,
+                           const StringType& rhs);
+
+    /// @brief compares string and JSON pointer for equality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_eq/
+    template<typename RefStringTypeRhs, typename StringType>
+    // NOLINTNEXTLINE(readability-redundant-declaration)
+    friend bool operator==(const StringType& lhs,
+                           const json_pointer<RefStringTypeRhs>& rhs);
+
+    /// @brief compares two JSON pointers for inequality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_ne/
+    template<typename RefStringTypeLhs, typename RefStringTypeRhs>
+    // NOLINTNEXTLINE(readability-redundant-declaration)
+    friend bool operator!=(const json_pointer<RefStringTypeLhs>& lhs,
+                           const json_pointer<RefStringTypeRhs>& rhs) noexcept;
+
+    /// @brief compares JSON pointer and string for inequality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_ne/
+    template<typename RefStringTypeLhs, typename StringType>
+    // NOLINTNEXTLINE(readability-redundant-declaration)
+    friend bool operator!=(const json_pointer<RefStringTypeLhs>& lhs,
+                           const StringType& rhs);
+
+    /// @brief compares string and JSON pointer for inequality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_ne/
+    template<typename RefStringTypeRhs, typename StringType>
+    // NOLINTNEXTLINE(readability-redundant-declaration)
+    friend bool operator!=(const StringType& lhs,
+                           const json_pointer<RefStringTypeRhs>& rhs);
+
+    /// @brief compares two JSON pointer for less-than
+    template<typename RefStringTypeLhs, typename RefStringTypeRhs>
+    // NOLINTNEXTLINE(readability-redundant-declaration)
+    friend bool operator<(const json_pointer<RefStringTypeLhs>& lhs,
+                          const json_pointer<RefStringTypeRhs>& rhs) noexcept;
+#endif
+
+  private:
+    /// the reference tokens
+    std::vector<string_t> reference_tokens;
+};
 
-    @param[in] lhs  JSON pointer to compare
-    @param[in] rhs  JSON pointer to compare
-    @return whether @a lhs is not equal @a rhs
+#if !JSON_HAS_THREE_WAY_COMPARISON
+// functions cannot be defined inside class due to ODR violations
+template<typename RefStringTypeLhs, typename RefStringTypeRhs>
+inline bool operator==(const json_pointer<RefStringTypeLhs>& lhs,
+                       const json_pointer<RefStringTypeRhs>& rhs) noexcept
+{
+    return lhs.reference_tokens == rhs.reference_tokens;
+}
+
+template<typename RefStringTypeLhs,
+         typename StringType = typename json_pointer<RefStringTypeLhs>::string_t>
+JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator==(json_pointer, json_pointer))
+inline bool operator==(const json_pointer<RefStringTypeLhs>& lhs,
+                       const StringType& rhs)
+{
+    return lhs == json_pointer<RefStringTypeLhs>(rhs);
+}
+
+template<typename RefStringTypeRhs,
+         typename StringType = typename json_pointer<RefStringTypeRhs>::string_t>
+JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator==(json_pointer, json_pointer))
+inline bool operator==(const StringType& lhs,
+                       const json_pointer<RefStringTypeRhs>& rhs)
+{
+    return json_pointer<RefStringTypeRhs>(lhs) == rhs;
+}
 
-    @complexity Linear in the length of the JSON pointer
+template<typename RefStringTypeLhs, typename RefStringTypeRhs>
+inline bool operator!=(const json_pointer<RefStringTypeLhs>& lhs,
+                       const json_pointer<RefStringTypeRhs>& rhs) noexcept
+{
+    return !(lhs == rhs);
+}
+
+template<typename RefStringTypeLhs,
+         typename StringType = typename json_pointer<RefStringTypeLhs>::string_t>
+JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator!=(json_pointer, json_pointer))
+inline bool operator!=(const json_pointer<RefStringTypeLhs>& lhs,
+                       const StringType& rhs)
+{
+    return !(lhs == rhs);
+}
+
+template<typename RefStringTypeRhs,
+         typename StringType = typename json_pointer<RefStringTypeRhs>::string_t>
+JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator!=(json_pointer, json_pointer))
+inline bool operator!=(const StringType& lhs,
+                       const json_pointer<RefStringTypeRhs>& rhs)
+{
+    return !(lhs == rhs);
+}
 
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-    */
-    friend bool operator!=(json_pointer const& lhs,
-                           json_pointer const& rhs) noexcept
-    {
-        return !(lhs == rhs);
-    }
+template<typename RefStringTypeLhs, typename RefStringTypeRhs>
+inline bool operator<(const json_pointer<RefStringTypeLhs>& lhs,
+                      const json_pointer<RefStringTypeRhs>& rhs) noexcept
+{
+    return lhs.reference_tokens < rhs.reference_tokens;
+}
+#endif
 
-    /// the reference tokens
-    std::vector<std::string> reference_tokens;
-};
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
 
 // #include <nlohmann/detail/json_ref.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 
 
 #include <initializer_list>
 #include <utility>
 
+// #include <nlohmann/detail/abi_macros.hpp>
+
 // #include <nlohmann/detail/meta/type_traits.hpp>
 
 
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
+
 template<typename BasicJsonType>
 class json_ref
 {
@@ -12837,7 +14841,7 @@ class json_ref
     {}
 
     // class should be movable only
-    json_ref(json_ref&&) = default;
+    json_ref(json_ref&&) noexcept = default;
     json_ref(const json_ref&) = delete;
     json_ref& operator=(const json_ref&) = delete;
     json_ref& operator=(json_ref&&) = delete;
@@ -12866,54 +14870,88 @@ class json_ref
     mutable value_type owned_value = nullptr;
     value_type const* value_ref = nullptr;
 };
+
 }  // namespace detail
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
 
 // #include <nlohmann/detail/macro_scope.hpp>
 
+// #include <nlohmann/detail/string_concat.hpp>
+
+// #include <nlohmann/detail/string_escape.hpp>
+
 // #include <nlohmann/detail/meta/cpp_future.hpp>
 
 // #include <nlohmann/detail/meta/type_traits.hpp>
 
 // #include <nlohmann/detail/output/binary_writer.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 
 
 #include <algorithm> // reverse
 #include <array> // array
+#include <map> // map
+#include <cmath> // isnan, isinf
 #include <cstdint> // uint8_t, uint16_t, uint32_t, uint64_t
 #include <cstring> // memcpy
 #include <limits> // numeric_limits
 #include <string> // string
-#include <cmath> // isnan, isinf
+#include <utility> // move
+#include <vector> // vector
 
 // #include <nlohmann/detail/input/binary_reader.hpp>
 
 // #include <nlohmann/detail/macro_scope.hpp>
 
 // #include <nlohmann/detail/output/output_adapters.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 
 
 #include <algorithm> // copy
 #include <cstddef> // size_t
-#include <ios> // streamsize
 #include <iterator> // back_inserter
 #include <memory> // shared_ptr, make_shared
-#include <ostream> // basic_ostream
 #include <string> // basic_string
 #include <vector> // vector
+
+#ifndef JSON_NO_IO
+    #include <ios>      // streamsize
+    #include <ostream>  // basic_ostream
+#endif  // JSON_NO_IO
+
 // #include <nlohmann/detail/macro_scope.hpp>
 
 
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
+
 /// abstract output adapter interface
 template<typename CharType> struct output_adapter_protocol
 {
     virtual void write_character(CharType c) = 0;
     virtual void write_characters(const CharType* s, std::size_t length) = 0;
     virtual ~output_adapter_protocol() = default;
+
+    output_adapter_protocol() = default;
+    output_adapter_protocol(const output_adapter_protocol&) = default;
+    output_adapter_protocol(output_adapter_protocol&&) noexcept = default;
+    output_adapter_protocol& operator=(const output_adapter_protocol&) = default;
+    output_adapter_protocol& operator=(output_adapter_protocol&&) noexcept = default;
 };
 
 /// a type to simplify interfaces
@@ -12921,11 +14959,11 @@ template<typename CharType>
 using output_adapter_t = std::shared_ptr<output_adapter_protocol<CharType>>;
 
 /// output adapter for byte vectors
-template<typename CharType>
+template<typename CharType, typename AllocatorType = std::allocator<CharType>>
 class output_vector_adapter : public output_adapter_protocol<CharType>
 {
   public:
-    explicit output_vector_adapter(std::vector<CharType>& vec) noexcept
+    explicit output_vector_adapter(std::vector<CharType, AllocatorType>& vec) noexcept
         : v(vec)
     {}
 
@@ -12937,13 +14975,14 @@ class output_vector_adapter : public output_adapter_protocol<CharType>
     JSON_HEDLEY_NON_NULL(2)
     void write_characters(const CharType* s, std::size_t length) override
     {
-        std::copy(s, s + length, std::back_inserter(v));
+        v.insert(v.end(), s, s + length);
     }
 
   private:
-    std::vector<CharType>& v;
+    std::vector<CharType, AllocatorType>& v;
 };
 
+#ifndef JSON_NO_IO
 /// output adapter for output streams
 template<typename CharType>
 class output_stream_adapter : public output_adapter_protocol<CharType>
@@ -12967,6 +15006,7 @@ class output_stream_adapter : public output_adapter_protocol<CharType>
   private:
     std::basic_ostream<CharType>& stream;
 };
+#endif  // JSON_NO_IO
 
 /// output adapter for basic_string
 template<typename CharType, typename StringType = std::basic_string<CharType>>
@@ -12996,11 +15036,14 @@ template<typename CharType, typename StringType = std::basic_string<CharType>>
 class output_adapter
 {
   public:
-    output_adapter(std::vector<CharType>& vec)
-        : oa(std::make_shared<output_vector_adapter<CharType>>(vec)) {}
+    template<typename AllocatorType = std::allocator<CharType>>
+    output_adapter(std::vector<CharType, AllocatorType>& vec)
+        : oa(std::make_shared<output_vector_adapter<CharType, AllocatorType>>(vec)) {}
 
+#ifndef JSON_NO_IO
     output_adapter(std::basic_ostream<CharType>& s)
         : oa(std::make_shared<output_stream_adapter<CharType>>(s)) {}
+#endif  // JSON_NO_IO
 
     output_adapter(StringType& s)
         : oa(std::make_shared<output_string_adapter<CharType, StringType>>(s)) {}
@@ -13013,14 +15056,17 @@ class output_adapter
   private:
     output_adapter_t<CharType> oa = nullptr;
 };
+
 }  // namespace detail
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
 
+// #include <nlohmann/detail/string_concat.hpp>
 
-namespace nlohmann
-{
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
+
 ///////////////////
 // binary writer //
 ///////////////////
@@ -13041,7 +15087,7 @@ class binary_writer
 
     @param[in] adapter  output adapter to write to
     */
-    explicit binary_writer(output_adapter_t<CharType> adapter) : oa(adapter)
+    explicit binary_writer(output_adapter_t<CharType> adapter) : oa(std::move(adapter))
     {
         JSON_ASSERT(oa);
     }
@@ -13056,13 +15102,22 @@ class binary_writer
         {
             case value_t::object:
             {
-                write_bson_object(*j.m_value.object);
+                write_bson_object(*j.m_data.m_value.object);
                 break;
             }
 
+            case value_t::null:
+            case value_t::array:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
             default:
             {
-                JSON_THROW(type_error::create(317, "to serialize to BSON, top-level type must be object, but is " + std::string(j.type_name()), j));;
+                JSON_THROW(type_error::create(317, concat("to serialize to BSON, top-level type must be object, but is ", j.type_name()), &j));
             }
         }
     }
@@ -13082,7 +15137,7 @@ class binary_writer
 
             case value_t::boolean:
             {
-                oa->write_character(j.m_value.boolean
+                oa->write_character(j.m_data.m_value.boolean
                                     ? to_char_type(0xF5)
                                     : to_char_type(0xF4));
                 break;
@@ -13090,42 +15145,42 @@ class binary_writer
 
             case value_t::number_integer:
             {
-                if (j.m_value.number_integer >= 0)
+                if (j.m_data.m_value.number_integer >= 0)
                 {
                     // CBOR does not differentiate between positive signed
                     // integers and unsigned integers. Therefore, we used the
                     // code from the value_t::number_unsigned case here.
-                    if (j.m_value.number_integer <= 0x17)
+                    if (j.m_data.m_value.number_integer <= 0x17)
                     {
-                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                        write_number(static_cast<std::uint8_t>(j.m_data.m_value.number_integer));
                     }
-                    else if (j.m_value.number_integer <= (std::numeric_limits<std::uint8_t>::max)())
+                    else if (j.m_data.m_value.number_integer <= (std::numeric_limits<std::uint8_t>::max)())
                     {
                         oa->write_character(to_char_type(0x18));
-                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                        write_number(static_cast<std::uint8_t>(j.m_data.m_value.number_integer));
                     }
-                    else if (j.m_value.number_integer <= (std::numeric_limits<std::uint16_t>::max)())
+                    else if (j.m_data.m_value.number_integer <= (std::numeric_limits<std::uint16_t>::max)())
                     {
                         oa->write_character(to_char_type(0x19));
-                        write_number(static_cast<std::uint16_t>(j.m_value.number_integer));
+                        write_number(static_cast<std::uint16_t>(j.m_data.m_value.number_integer));
                     }
-                    else if (j.m_value.number_integer <= (std::numeric_limits<std::uint32_t>::max)())
+                    else if (j.m_data.m_value.number_integer <= (std::numeric_limits<std::uint32_t>::max)())
                     {
                         oa->write_character(to_char_type(0x1A));
-                        write_number(static_cast<std::uint32_t>(j.m_value.number_integer));
+                        write_number(static_cast<std::uint32_t>(j.m_data.m_value.number_integer));
                     }
                     else
                     {
                         oa->write_character(to_char_type(0x1B));
-                        write_number(static_cast<std::uint64_t>(j.m_value.number_integer));
+                        write_number(static_cast<std::uint64_t>(j.m_data.m_value.number_integer));
                     }
                 }
                 else
                 {
                     // The conversions below encode the sign in the first
                     // byte, and the value is converted to a positive number.
-                    const auto positive_number = -1 - j.m_value.number_integer;
-                    if (j.m_value.number_integer >= -24)
+                    const auto positive_number = -1 - j.m_data.m_value.number_integer;
+                    if (j.m_data.m_value.number_integer >= -24)
                     {
                         write_number(static_cast<std::uint8_t>(0x20 + positive_number));
                     }
@@ -13155,52 +15210,52 @@ class binary_writer
 
             case value_t::number_unsigned:
             {
-                if (j.m_value.number_unsigned <= 0x17)
+                if (j.m_data.m_value.number_unsigned <= 0x17)
                 {
-                    write_number(static_cast<std::uint8_t>(j.m_value.number_unsigned));
+                    write_number(static_cast<std::uint8_t>(j.m_data.m_value.number_unsigned));
                 }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
+                else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
                 {
                     oa->write_character(to_char_type(0x18));
-                    write_number(static_cast<std::uint8_t>(j.m_value.number_unsigned));
+                    write_number(static_cast<std::uint8_t>(j.m_data.m_value.number_unsigned));
                 }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
+                else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
                 {
                     oa->write_character(to_char_type(0x19));
-                    write_number(static_cast<std::uint16_t>(j.m_value.number_unsigned));
+                    write_number(static_cast<std::uint16_t>(j.m_data.m_value.number_unsigned));
                 }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
+                else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
                 {
                     oa->write_character(to_char_type(0x1A));
-                    write_number(static_cast<std::uint32_t>(j.m_value.number_unsigned));
+                    write_number(static_cast<std::uint32_t>(j.m_data.m_value.number_unsigned));
                 }
                 else
                 {
                     oa->write_character(to_char_type(0x1B));
-                    write_number(static_cast<std::uint64_t>(j.m_value.number_unsigned));
+                    write_number(static_cast<std::uint64_t>(j.m_data.m_value.number_unsigned));
                 }
                 break;
             }
 
             case value_t::number_float:
             {
-                if (std::isnan(j.m_value.number_float))
+                if (std::isnan(j.m_data.m_value.number_float))
                 {
                     // NaN is 0xf97e00 in CBOR
                     oa->write_character(to_char_type(0xF9));
                     oa->write_character(to_char_type(0x7E));
                     oa->write_character(to_char_type(0x00));
                 }
-                else if (std::isinf(j.m_value.number_float))
+                else if (std::isinf(j.m_data.m_value.number_float))
                 {
                     // Infinity is 0xf97c00, -Infinity is 0xf9fc00
                     oa->write_character(to_char_type(0xf9));
-                    oa->write_character(j.m_value.number_float > 0 ? to_char_type(0x7C) : to_char_type(0xFC));
+                    oa->write_character(j.m_data.m_value.number_float > 0 ? to_char_type(0x7C) : to_char_type(0xFC));
                     oa->write_character(to_char_type(0x00));
                 }
                 else
                 {
-                    write_compact_float(j.m_value.number_float, detail::input_format_t::cbor);
+                    write_compact_float(j.m_data.m_value.number_float, detail::input_format_t::cbor);
                 }
                 break;
             }
@@ -13208,7 +15263,7 @@ class binary_writer
             case value_t::string:
             {
                 // step 1: write control byte and the string length
-                const auto N = j.m_value.string->size();
+                const auto N = j.m_data.m_value.string->size();
                 if (N <= 0x17)
                 {
                     write_number(static_cast<std::uint8_t>(0x60 + N));
@@ -13238,15 +15293,15 @@ class binary_writer
 
                 // step 2: write the string
                 oa->write_characters(
-                    reinterpret_cast<const CharType*>(j.m_value.string->c_str()),
-                    j.m_value.string->size());
+                    reinterpret_cast<const CharType*>(j.m_data.m_value.string->c_str()),
+                    j.m_data.m_value.string->size());
                 break;
             }
 
             case value_t::array:
             {
                 // step 1: write control byte and the array size
-                const auto N = j.m_value.array->size();
+                const auto N = j.m_data.m_value.array->size();
                 if (N <= 0x17)
                 {
                     write_number(static_cast<std::uint8_t>(0x80 + N));
@@ -13275,7 +15330,7 @@ class binary_writer
                 // LCOV_EXCL_STOP
 
                 // step 2: write each element
-                for (const auto& el : *j.m_value.array)
+                for (const auto& el : *j.m_data.m_value.array)
                 {
                     write_cbor(el);
                 }
@@ -13284,14 +15339,32 @@ class binary_writer
 
             case value_t::binary:
             {
-                if (j.m_value.binary->has_subtype())
+                if (j.m_data.m_value.binary->has_subtype())
                 {
-                    write_number(static_cast<std::uint8_t>(0xd8));
-                    write_number(j.m_value.binary->subtype());
+                    if (j.m_data.m_value.binary->subtype() <= (std::numeric_limits<std::uint8_t>::max)())
+                    {
+                        write_number(static_cast<std::uint8_t>(0xd8));
+                        write_number(static_cast<std::uint8_t>(j.m_data.m_value.binary->subtype()));
+                    }
+                    else if (j.m_data.m_value.binary->subtype() <= (std::numeric_limits<std::uint16_t>::max)())
+                    {
+                        write_number(static_cast<std::uint8_t>(0xd9));
+                        write_number(static_cast<std::uint16_t>(j.m_data.m_value.binary->subtype()));
+                    }
+                    else if (j.m_data.m_value.binary->subtype() <= (std::numeric_limits<std::uint32_t>::max)())
+                    {
+                        write_number(static_cast<std::uint8_t>(0xda));
+                        write_number(static_cast<std::uint32_t>(j.m_data.m_value.binary->subtype()));
+                    }
+                    else if (j.m_data.m_value.binary->subtype() <= (std::numeric_limits<std::uint64_t>::max)())
+                    {
+                        write_number(static_cast<std::uint8_t>(0xdb));
+                        write_number(static_cast<std::uint64_t>(j.m_data.m_value.binary->subtype()));
+                    }
                 }
 
                 // step 1: write control byte and the binary array size
-                const auto N = j.m_value.binary->size();
+                const auto N = j.m_data.m_value.binary->size();
                 if (N <= 0x17)
                 {
                     write_number(static_cast<std::uint8_t>(0x40 + N));
@@ -13321,7 +15394,7 @@ class binary_writer
 
                 // step 2: write each element
                 oa->write_characters(
-                    reinterpret_cast<const CharType*>(j.m_value.binary->data()),
+                    reinterpret_cast<const CharType*>(j.m_data.m_value.binary->data()),
                     N);
 
                 break;
@@ -13330,7 +15403,7 @@ class binary_writer
             case value_t::object:
             {
                 // step 1: write control byte and the object size
-                const auto N = j.m_value.object->size();
+                const auto N = j.m_data.m_value.object->size();
                 if (N <= 0x17)
                 {
                     write_number(static_cast<std::uint8_t>(0xA0 + N));
@@ -13359,7 +15432,7 @@ class binary_writer
                 // LCOV_EXCL_STOP
 
                 // step 2: write each element
-                for (const auto& el : *j.m_value.object)
+                for (const auto& el : *j.m_data.m_value.object)
                 {
                     write_cbor(el.first);
                     write_cbor(el.second);
@@ -13367,6 +15440,7 @@ class binary_writer
                 break;
             }
 
+            case value_t::discarded:
             default:
                 break;
         }
@@ -13387,7 +15461,7 @@ class binary_writer
 
             case value_t::boolean: // true and false
             {
-                oa->write_character(j.m_value.boolean
+                oa->write_character(j.m_data.m_value.boolean
                                     ? to_char_type(0xC3)
                                     : to_char_type(0xC2));
                 break;
@@ -13395,75 +15469,75 @@ class binary_writer
 
             case value_t::number_integer:
             {
-                if (j.m_value.number_integer >= 0)
+                if (j.m_data.m_value.number_integer >= 0)
                 {
                     // MessagePack does not differentiate between positive
                     // signed integers and unsigned integers. Therefore, we used
                     // the code from the value_t::number_unsigned case here.
-                    if (j.m_value.number_unsigned < 128)
+                    if (j.m_data.m_value.number_unsigned < 128)
                     {
                         // positive fixnum
-                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                        write_number(static_cast<std::uint8_t>(j.m_data.m_value.number_integer));
                     }
-                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
+                    else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
                     {
                         // uint 8
                         oa->write_character(to_char_type(0xCC));
-                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                        write_number(static_cast<std::uint8_t>(j.m_data.m_value.number_integer));
                     }
-                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
+                    else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
                     {
                         // uint 16
                         oa->write_character(to_char_type(0xCD));
-                        write_number(static_cast<std::uint16_t>(j.m_value.number_integer));
+                        write_number(static_cast<std::uint16_t>(j.m_data.m_value.number_integer));
                     }
-                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
+                    else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
                     {
                         // uint 32
                         oa->write_character(to_char_type(0xCE));
-                        write_number(static_cast<std::uint32_t>(j.m_value.number_integer));
+                        write_number(static_cast<std::uint32_t>(j.m_data.m_value.number_integer));
                     }
-                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint64_t>::max)())
+                    else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint64_t>::max)())
                     {
                         // uint 64
                         oa->write_character(to_char_type(0xCF));
-                        write_number(static_cast<std::uint64_t>(j.m_value.number_integer));
+                        write_number(static_cast<std::uint64_t>(j.m_data.m_value.number_integer));
                     }
                 }
                 else
                 {
-                    if (j.m_value.number_integer >= -32)
+                    if (j.m_data.m_value.number_integer >= -32)
                     {
                         // negative fixnum
-                        write_number(static_cast<std::int8_t>(j.m_value.number_integer));
+                        write_number(static_cast<std::int8_t>(j.m_data.m_value.number_integer));
                     }
-                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int8_t>::min)() &&
-                             j.m_value.number_integer <= (std::numeric_limits<std::int8_t>::max)())
+                    else if (j.m_data.m_value.number_integer >= (std::numeric_limits<std::int8_t>::min)() &&
+                             j.m_data.m_value.number_integer <= (std::numeric_limits<std::int8_t>::max)())
                     {
                         // int 8
                         oa->write_character(to_char_type(0xD0));
-                        write_number(static_cast<std::int8_t>(j.m_value.number_integer));
+                        write_number(static_cast<std::int8_t>(j.m_data.m_value.number_integer));
                     }
-                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int16_t>::min)() &&
-                             j.m_value.number_integer <= (std::numeric_limits<std::int16_t>::max)())
+                    else if (j.m_data.m_value.number_integer >= (std::numeric_limits<std::int16_t>::min)() &&
+                             j.m_data.m_value.number_integer <= (std::numeric_limits<std::int16_t>::max)())
                     {
                         // int 16
                         oa->write_character(to_char_type(0xD1));
-                        write_number(static_cast<std::int16_t>(j.m_value.number_integer));
+                        write_number(static_cast<std::int16_t>(j.m_data.m_value.number_integer));
                     }
-                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int32_t>::min)() &&
-                             j.m_value.number_integer <= (std::numeric_limits<std::int32_t>::max)())
+                    else if (j.m_data.m_value.number_integer >= (std::numeric_limits<std::int32_t>::min)() &&
+                             j.m_data.m_value.number_integer <= (std::numeric_limits<std::int32_t>::max)())
                     {
                         // int 32
                         oa->write_character(to_char_type(0xD2));
-                        write_number(static_cast<std::int32_t>(j.m_value.number_integer));
+                        write_number(static_cast<std::int32_t>(j.m_data.m_value.number_integer));
                     }
-                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int64_t>::min)() &&
-                             j.m_value.number_integer <= (std::numeric_limits<std::int64_t>::max)())
+                    else if (j.m_data.m_value.number_integer >= (std::numeric_limits<std::int64_t>::min)() &&
+                             j.m_data.m_value.number_integer <= (std::numeric_limits<std::int64_t>::max)())
                     {
                         // int 64
                         oa->write_character(to_char_type(0xD3));
-                        write_number(static_cast<std::int64_t>(j.m_value.number_integer));
+                        write_number(static_cast<std::int64_t>(j.m_data.m_value.number_integer));
                     }
                 }
                 break;
@@ -13471,48 +15545,48 @@ class binary_writer
 
             case value_t::number_unsigned:
             {
-                if (j.m_value.number_unsigned < 128)
+                if (j.m_data.m_value.number_unsigned < 128)
                 {
                     // positive fixnum
-                    write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                    write_number(static_cast<std::uint8_t>(j.m_data.m_value.number_integer));
                 }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
+                else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
                 {
                     // uint 8
                     oa->write_character(to_char_type(0xCC));
-                    write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                    write_number(static_cast<std::uint8_t>(j.m_data.m_value.number_integer));
                 }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
+                else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
                 {
                     // uint 16
                     oa->write_character(to_char_type(0xCD));
-                    write_number(static_cast<std::uint16_t>(j.m_value.number_integer));
+                    write_number(static_cast<std::uint16_t>(j.m_data.m_value.number_integer));
                 }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
+                else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
                 {
                     // uint 32
                     oa->write_character(to_char_type(0xCE));
-                    write_number(static_cast<std::uint32_t>(j.m_value.number_integer));
+                    write_number(static_cast<std::uint32_t>(j.m_data.m_value.number_integer));
                 }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint64_t>::max)())
+                else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint64_t>::max)())
                 {
                     // uint 64
                     oa->write_character(to_char_type(0xCF));
-                    write_number(static_cast<std::uint64_t>(j.m_value.number_integer));
+                    write_number(static_cast<std::uint64_t>(j.m_data.m_value.number_integer));
                 }
                 break;
             }
 
             case value_t::number_float:
             {
-                write_compact_float(j.m_value.number_float, detail::input_format_t::msgpack);
+                write_compact_float(j.m_data.m_value.number_float, detail::input_format_t::msgpack);
                 break;
             }
 
             case value_t::string:
             {
                 // step 1: write control byte and the string length
-                const auto N = j.m_value.string->size();
+                const auto N = j.m_data.m_value.string->size();
                 if (N <= 31)
                 {
                     // fixstr
@@ -13539,15 +15613,15 @@ class binary_writer
 
                 // step 2: write the string
                 oa->write_characters(
-                    reinterpret_cast<const CharType*>(j.m_value.string->c_str()),
-                    j.m_value.string->size());
+                    reinterpret_cast<const CharType*>(j.m_data.m_value.string->c_str()),
+                    j.m_data.m_value.string->size());
                 break;
             }
 
             case value_t::array:
             {
                 // step 1: write control byte and the array size
-                const auto N = j.m_value.array->size();
+                const auto N = j.m_data.m_value.array->size();
                 if (N <= 15)
                 {
                     // fixarray
@@ -13567,7 +15641,7 @@ class binary_writer
                 }
 
                 // step 2: write each element
-                for (const auto& el : *j.m_value.array)
+                for (const auto& el : *j.m_data.m_value.array)
                 {
                     write_msgpack(el);
                 }
@@ -13578,10 +15652,10 @@ class binary_writer
             {
                 // step 0: determine if the binary type has a set subtype to
                 // determine whether or not to use the ext or fixext types
-                const bool use_ext = j.m_value.binary->has_subtype();
+                const bool use_ext = j.m_data.m_value.binary->has_subtype();
 
                 // step 1: write control byte and the byte string length
-                const auto N = j.m_value.binary->size();
+                const auto N = j.m_data.m_value.binary->size();
                 if (N <= (std::numeric_limits<std::uint8_t>::max)())
                 {
                     std::uint8_t output_type{};
@@ -13626,18 +15700,18 @@ class binary_writer
                 }
                 else if (N <= (std::numeric_limits<std::uint16_t>::max)())
                 {
-                    std::uint8_t output_type = use_ext
-                                               ? 0xC8 // ext 16
-                                               : 0xC5; // bin 16
+                    const std::uint8_t output_type = use_ext
+                                                     ? 0xC8 // ext 16
+                                                     : 0xC5; // bin 16
 
                     oa->write_character(to_char_type(output_type));
                     write_number(static_cast<std::uint16_t>(N));
                 }
                 else if (N <= (std::numeric_limits<std::uint32_t>::max)())
                 {
-                    std::uint8_t output_type = use_ext
-                                               ? 0xC9 // ext 32
-                                               : 0xC6; // bin 32
+                    const std::uint8_t output_type = use_ext
+                                                     ? 0xC9 // ext 32
+                                                     : 0xC6; // bin 32
 
                     oa->write_character(to_char_type(output_type));
                     write_number(static_cast<std::uint32_t>(N));
@@ -13646,12 +15720,12 @@ class binary_writer
                 // step 1.5: if this is an ext type, write the subtype
                 if (use_ext)
                 {
-                    write_number(static_cast<std::int8_t>(j.m_value.binary->subtype()));
+                    write_number(static_cast<std::int8_t>(j.m_data.m_value.binary->subtype()));
                 }
 
                 // step 2: write the byte string
                 oa->write_characters(
-                    reinterpret_cast<const CharType*>(j.m_value.binary->data()),
+                    reinterpret_cast<const CharType*>(j.m_data.m_value.binary->data()),
                     N);
 
                 break;
@@ -13660,7 +15734,7 @@ class binary_writer
             case value_t::object:
             {
                 // step 1: write control byte and the object size
-                const auto N = j.m_value.object->size();
+                const auto N = j.m_data.m_value.object->size();
                 if (N <= 15)
                 {
                     // fixmap
@@ -13680,7 +15754,7 @@ class binary_writer
                 }
 
                 // step 2: write each element
-                for (const auto& el : *j.m_value.object)
+                for (const auto& el : *j.m_data.m_value.object)
                 {
                     write_msgpack(el.first);
                     write_msgpack(el.second);
@@ -13688,6 +15762,7 @@ class binary_writer
                 break;
             }
 
+            case value_t::discarded:
             default:
                 break;
         }
@@ -13698,9 +15773,11 @@ class binary_writer
     @param[in] use_count   whether to use '#' prefixes (optimized format)
     @param[in] use_type    whether to use '$' prefixes (optimized format)
     @param[in] add_prefix  whether prefixes need to be used for this value
+    @param[in] use_bjdata  whether write in BJData format, default is false
     */
     void write_ubjson(const BasicJsonType& j, const bool use_count,
-                      const bool use_type, const bool add_prefix = true)
+                      const bool use_type, const bool add_prefix = true,
+                      const bool use_bjdata = false)
     {
         switch (j.type())
         {
@@ -13717,7 +15794,7 @@ class binary_writer
             {
                 if (add_prefix)
                 {
-                    oa->write_character(j.m_value.boolean
+                    oa->write_character(j.m_data.m_value.boolean
                                         ? to_char_type('T')
                                         : to_char_type('F'));
                 }
@@ -13726,19 +15803,19 @@ class binary_writer
 
             case value_t::number_integer:
             {
-                write_number_with_ubjson_prefix(j.m_value.number_integer, add_prefix);
+                write_number_with_ubjson_prefix(j.m_data.m_value.number_integer, add_prefix, use_bjdata);
                 break;
             }
 
             case value_t::number_unsigned:
             {
-                write_number_with_ubjson_prefix(j.m_value.number_unsigned, add_prefix);
+                write_number_with_ubjson_prefix(j.m_data.m_value.number_unsigned, add_prefix, use_bjdata);
                 break;
             }
 
             case value_t::number_float:
             {
-                write_number_with_ubjson_prefix(j.m_value.number_float, add_prefix);
+                write_number_with_ubjson_prefix(j.m_data.m_value.number_float, add_prefix, use_bjdata);
                 break;
             }
 
@@ -13748,10 +15825,10 @@ class binary_writer
                 {
                     oa->write_character(to_char_type('S'));
                 }
-                write_number_with_ubjson_prefix(j.m_value.string->size(), true);
+                write_number_with_ubjson_prefix(j.m_data.m_value.string->size(), true, use_bjdata);
                 oa->write_characters(
-                    reinterpret_cast<const CharType*>(j.m_value.string->c_str()),
-                    j.m_value.string->size());
+                    reinterpret_cast<const CharType*>(j.m_data.m_value.string->c_str()),
+                    j.m_data.m_value.string->size());
                 break;
             }
 
@@ -13763,17 +15840,19 @@ class binary_writer
                 }
 
                 bool prefix_required = true;
-                if (use_type && !j.m_value.array->empty())
+                if (use_type && !j.m_data.m_value.array->empty())
                 {
                     JSON_ASSERT(use_count);
-                    const CharType first_prefix = ubjson_prefix(j.front());
+                    const CharType first_prefix = ubjson_prefix(j.front(), use_bjdata);
                     const bool same_prefix = std::all_of(j.begin() + 1, j.end(),
-                                                         [this, first_prefix](const BasicJsonType & v)
+                                                         [this, first_prefix, use_bjdata](const BasicJsonType & v)
                     {
-                        return ubjson_prefix(v) == first_prefix;
+                        return ubjson_prefix(v, use_bjdata) == first_prefix;
                     });
 
-                    if (same_prefix)
+                    std::vector<CharType> bjdx = {'[', '{', 'S', 'H', 'T', 'F', 'N', 'Z'}; // excluded markers in bjdata optimized type
+
+                    if (same_prefix && !(use_bjdata && std::find(bjdx.begin(), bjdx.end(), first_prefix) != bjdx.end()))
                     {
                         prefix_required = false;
                         oa->write_character(to_char_type('$'));
@@ -13784,12 +15863,12 @@ class binary_writer
                 if (use_count)
                 {
                     oa->write_character(to_char_type('#'));
-                    write_number_with_ubjson_prefix(j.m_value.array->size(), true);
+                    write_number_with_ubjson_prefix(j.m_data.m_value.array->size(), true, use_bjdata);
                 }
 
-                for (const auto& el : *j.m_value.array)
+                for (const auto& el : *j.m_data.m_value.array)
                 {
-                    write_ubjson(el, use_count, use_type, prefix_required);
+                    write_ubjson(el, use_count, use_type, prefix_required, use_bjdata);
                 }
 
                 if (!use_count)
@@ -13807,7 +15886,7 @@ class binary_writer
                     oa->write_character(to_char_type('['));
                 }
 
-                if (use_type && !j.m_value.binary->empty())
+                if (use_type && !j.m_data.m_value.binary->empty())
                 {
                     JSON_ASSERT(use_count);
                     oa->write_character(to_char_type('$'));
@@ -13817,21 +15896,21 @@ class binary_writer
                 if (use_count)
                 {
                     oa->write_character(to_char_type('#'));
-                    write_number_with_ubjson_prefix(j.m_value.binary->size(), true);
+                    write_number_with_ubjson_prefix(j.m_data.m_value.binary->size(), true, use_bjdata);
                 }
 
                 if (use_type)
                 {
                     oa->write_characters(
-                        reinterpret_cast<const CharType*>(j.m_value.binary->data()),
-                        j.m_value.binary->size());
+                        reinterpret_cast<const CharType*>(j.m_data.m_value.binary->data()),
+                        j.m_data.m_value.binary->size());
                 }
                 else
                 {
-                    for (size_t i = 0; i < j.m_value.binary->size(); ++i)
+                    for (size_t i = 0; i < j.m_data.m_value.binary->size(); ++i)
                     {
                         oa->write_character(to_char_type('U'));
-                        oa->write_character(j.m_value.binary->data()[i]);
+                        oa->write_character(j.m_data.m_value.binary->data()[i]);
                     }
                 }
 
@@ -13845,23 +15924,33 @@ class binary_writer
 
             case value_t::object:
             {
+                if (use_bjdata && j.m_data.m_value.object->size() == 3 && j.m_data.m_value.object->find("_ArrayType_") != j.m_data.m_value.object->end() && j.m_data.m_value.object->find("_ArraySize_") != j.m_data.m_value.object->end() && j.m_data.m_value.object->find("_ArrayData_") != j.m_data.m_value.object->end())
+                {
+                    if (!write_bjdata_ndarray(*j.m_data.m_value.object, use_count, use_type))  // decode bjdata ndarray in the JData format (https://github.com/NeuroJSON/jdata)
+                    {
+                        break;
+                    }
+                }
+
                 if (add_prefix)
                 {
                     oa->write_character(to_char_type('{'));
                 }
 
                 bool prefix_required = true;
-                if (use_type && !j.m_value.object->empty())
+                if (use_type && !j.m_data.m_value.object->empty())
                 {
                     JSON_ASSERT(use_count);
-                    const CharType first_prefix = ubjson_prefix(j.front());
+                    const CharType first_prefix = ubjson_prefix(j.front(), use_bjdata);
                     const bool same_prefix = std::all_of(j.begin(), j.end(),
-                                                         [this, first_prefix](const BasicJsonType & v)
+                                                         [this, first_prefix, use_bjdata](const BasicJsonType & v)
                     {
-                        return ubjson_prefix(v) == first_prefix;
+                        return ubjson_prefix(v, use_bjdata) == first_prefix;
                     });
 
-                    if (same_prefix)
+                    std::vector<CharType> bjdx = {'[', '{', 'S', 'H', 'T', 'F', 'N', 'Z'}; // excluded markers in bjdata optimized type
+
+                    if (same_prefix && !(use_bjdata && std::find(bjdx.begin(), bjdx.end(), first_prefix) != bjdx.end()))
                     {
                         prefix_required = false;
                         oa->write_character(to_char_type('$'));
@@ -13872,16 +15961,16 @@ class binary_writer
                 if (use_count)
                 {
                     oa->write_character(to_char_type('#'));
-                    write_number_with_ubjson_prefix(j.m_value.object->size(), true);
+                    write_number_with_ubjson_prefix(j.m_data.m_value.object->size(), true, use_bjdata);
                 }
 
-                for (const auto& el : *j.m_value.object)
+                for (const auto& el : *j.m_data.m_value.object)
                 {
-                    write_number_with_ubjson_prefix(el.first.size(), true);
+                    write_number_with_ubjson_prefix(el.first.size(), true, use_bjdata);
                     oa->write_characters(
                         reinterpret_cast<const CharType*>(el.first.c_str()),
                         el.first.size());
-                    write_ubjson(el.second, use_count, use_type, prefix_required);
+                    write_ubjson(el.second, use_count, use_type, prefix_required, use_bjdata);
                 }
 
                 if (!use_count)
@@ -13892,6 +15981,7 @@ class binary_writer
                 break;
             }
 
+            case value_t::discarded:
             default:
                 break;
         }
@@ -13911,7 +16001,8 @@ class binary_writer
         const auto it = name.find(static_cast<typename string_t::value_type>(0));
         if (JSON_HEDLEY_UNLIKELY(it != BasicJsonType::string_t::npos))
         {
-            JSON_THROW(out_of_range::create(409, "BSON key cannot contain code point U+0000 (at byte " + std::to_string(it) + ")", j));
+            JSON_THROW(out_of_range::create(409, concat("BSON key cannot contain code point U+0000 (at byte ", std::to_string(it), ")"), &j));
+            static_cast<void>(j);
         }
 
         return /*id*/ 1ul + name.size() + /*zero-terminator*/1u;
@@ -13946,7 +16037,7 @@ class binary_writer
                            const double value)
     {
         write_bson_entry_header(name, 0x01);
-        write_number<double, true>(value);
+        write_number<double>(value, true);
     }
 
     /*!
@@ -13965,7 +16056,7 @@ class binary_writer
     {
         write_bson_entry_header(name, 0x02);
 
-        write_number<std::int32_t, true>(static_cast<std::int32_t>(value.size() + 1ul));
+        write_number<std::int32_t>(static_cast<std::int32_t>(value.size() + 1ul), true);
         oa->write_characters(
             reinterpret_cast<const CharType*>(value.c_str()),
             value.size() + 1);
@@ -13998,12 +16089,12 @@ class binary_writer
         if ((std::numeric_limits<std::int32_t>::min)() <= value && value <= (std::numeric_limits<std::int32_t>::max)())
         {
             write_bson_entry_header(name, 0x10); // int32
-            write_number<std::int32_t, true>(static_cast<std::int32_t>(value));
+            write_number<std::int32_t>(static_cast<std::int32_t>(value), true);
         }
         else
         {
             write_bson_entry_header(name, 0x12); // int64
-            write_number<std::int64_t, true>(static_cast<std::int64_t>(value));
+            write_number<std::int64_t>(static_cast<std::int64_t>(value), true);
         }
     }
 
@@ -14023,19 +16114,19 @@ class binary_writer
     void write_bson_unsigned(const string_t& name,
                              const BasicJsonType& j)
     {
-        if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
+        if (j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
         {
             write_bson_entry_header(name, 0x10 /* int32 */);
-            write_number<std::int32_t, true>(static_cast<std::int32_t>(j.m_value.number_unsigned));
+            write_number<std::int32_t>(static_cast<std::int32_t>(j.m_data.m_value.number_unsigned), true);
         }
-        else if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
+        else if (j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
         {
             write_bson_entry_header(name, 0x12 /* int64 */);
-            write_number<std::int64_t, true>(static_cast<std::int64_t>(j.m_value.number_unsigned));
+            write_number<std::int64_t>(static_cast<std::int64_t>(j.m_data.m_value.number_unsigned), true);
         }
         else
         {
-            JSON_THROW(out_of_range::create(407, "integer number " + std::to_string(j.m_value.number_unsigned) + " cannot be represented by BSON as it does not fit int64", j));
+            JSON_THROW(out_of_range::create(407, concat("integer number ", std::to_string(j.m_data.m_value.number_unsigned), " cannot be represented by BSON as it does not fit int64"), &j));
         }
     }
 
@@ -14056,7 +16147,7 @@ class binary_writer
     {
         std::size_t array_index = 0ul;
 
-        const std::size_t embedded_document_size = std::accumulate(std::begin(value), std::end(value), std::size_t(0), [&array_index](std::size_t result, const typename BasicJsonType::array_t::value_type & el)
+        const std::size_t embedded_document_size = std::accumulate(std::begin(value), std::end(value), static_cast<std::size_t>(0), [&array_index](std::size_t result, const typename BasicJsonType::array_t::value_type & el)
         {
             return result + calc_bson_element_size(std::to_string(array_index++), el);
         });
@@ -14079,7 +16170,7 @@ class binary_writer
                           const typename BasicJsonType::array_t& value)
     {
         write_bson_entry_header(name, 0x04); // array
-        write_number<std::int32_t, true>(static_cast<std::int32_t>(calc_bson_array_size(value)));
+        write_number<std::int32_t>(static_cast<std::int32_t>(calc_bson_array_size(value)), true);
 
         std::size_t array_index = 0ul;
 
@@ -14099,8 +16190,8 @@ class binary_writer
     {
         write_bson_entry_header(name, 0x05);
 
-        write_number<std::int32_t, true>(static_cast<std::int32_t>(value.size()));
-        write_number(value.has_subtype() ? value.subtype() : std::uint8_t(0x00));
+        write_number<std::int32_t>(static_cast<std::int32_t>(value.size()), true);
+        write_number(value.has_subtype() ? static_cast<std::uint8_t>(value.subtype()) : static_cast<std::uint8_t>(0x00));
 
         oa->write_characters(reinterpret_cast<const CharType*>(value.data()), value.size());
     }
@@ -14116,13 +16207,13 @@ class binary_writer
         switch (j.type())
         {
             case value_t::object:
-                return header_size + calc_bson_object_size(*j.m_value.object);
+                return header_size + calc_bson_object_size(*j.m_data.m_value.object);
 
             case value_t::array:
-                return header_size + calc_bson_array_size(*j.m_value.array);
+                return header_size + calc_bson_array_size(*j.m_data.m_value.array);
 
             case value_t::binary:
-                return header_size + calc_bson_binary_size(*j.m_value.binary);
+                return header_size + calc_bson_binary_size(*j.m_data.m_value.binary);
 
             case value_t::boolean:
                 return header_size + 1ul;
@@ -14131,20 +16222,21 @@ class binary_writer
                 return header_size + 8ul;
 
             case value_t::number_integer:
-                return header_size + calc_bson_integer_size(j.m_value.number_integer);
+                return header_size + calc_bson_integer_size(j.m_data.m_value.number_integer);
 
             case value_t::number_unsigned:
-                return header_size + calc_bson_unsigned_size(j.m_value.number_unsigned);
+                return header_size + calc_bson_unsigned_size(j.m_data.m_value.number_unsigned);
 
             case value_t::string:
-                return header_size + calc_bson_string_size(*j.m_value.string);
+                return header_size + calc_bson_string_size(*j.m_data.m_value.string);
 
             case value_t::null:
                 return header_size + 0ul;
 
             // LCOV_EXCL_START
+            case value_t::discarded:
             default:
-                JSON_ASSERT(false);
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert)
                 return 0ul;
                 // LCOV_EXCL_STOP
         }
@@ -14155,7 +16247,6 @@ class binary_writer
            key @a name.
     @param name The name to associate with the JSON entity @a j within the
                 current BSON document
-    @return The size of the BSON entry
     */
     void write_bson_element(const string_t& name,
                             const BasicJsonType& j)
@@ -14163,35 +16254,36 @@ class binary_writer
         switch (j.type())
         {
             case value_t::object:
-                return write_bson_object_entry(name, *j.m_value.object);
+                return write_bson_object_entry(name, *j.m_data.m_value.object);
 
             case value_t::array:
-                return write_bson_array(name, *j.m_value.array);
+                return write_bson_array(name, *j.m_data.m_value.array);
 
             case value_t::binary:
-                return write_bson_binary(name, *j.m_value.binary);
+                return write_bson_binary(name, *j.m_data.m_value.binary);
 
             case value_t::boolean:
-                return write_bson_boolean(name, j.m_value.boolean);
+                return write_bson_boolean(name, j.m_data.m_value.boolean);
 
             case value_t::number_float:
-                return write_bson_double(name, j.m_value.number_float);
+                return write_bson_double(name, j.m_data.m_value.number_float);
 
             case value_t::number_integer:
-                return write_bson_integer(name, j.m_value.number_integer);
+                return write_bson_integer(name, j.m_data.m_value.number_integer);
 
             case value_t::number_unsigned:
                 return write_bson_unsigned(name, j);
 
             case value_t::string:
-                return write_bson_string(name, *j.m_value.string);
+                return write_bson_string(name, *j.m_data.m_value.string);
 
             case value_t::null:
                 return write_bson_null(name);
 
             // LCOV_EXCL_START
+            case value_t::discarded:
             default:
-                JSON_ASSERT(false);
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert)
                 return;
                 // LCOV_EXCL_STOP
         }
@@ -14200,13 +16292,13 @@ class binary_writer
     /*!
     @brief Calculates the size of the BSON serialization of the given
            JSON-object @a j.
-    @param[in] j  JSON value to serialize
-    @pre       j.type() == value_t::object
+    @param[in] value  JSON value to serialize
+    @pre       value.type() == value_t::object
     */
     static std::size_t calc_bson_object_size(const typename BasicJsonType::object_t& value)
     {
-        std::size_t document_size = std::accumulate(value.begin(), value.end(), std::size_t(0),
-                                    [](size_t result, const typename BasicJsonType::object_t::value_type & el)
+        const std::size_t document_size = std::accumulate(value.begin(), value.end(), static_cast<std::size_t>(0),
+                                          [](size_t result, const typename BasicJsonType::object_t::value_type & el)
         {
             return result += calc_bson_element_size(el.first, el.second);
         });
@@ -14215,12 +16307,12 @@ class binary_writer
     }
 
     /*!
-    @param[in] j  JSON value to serialize
-    @pre       j.type() == value_t::object
+    @param[in] value  JSON value to serialize
+    @pre       value.type() == value_t::object
     */
     void write_bson_object(const typename BasicJsonType::object_t& value)
     {
-        write_number<std::int32_t, true>(static_cast<std::int32_t>(calc_bson_object_size(value)));
+        write_number<std::int32_t>(static_cast<std::int32_t>(calc_bson_object_size(value)), true);
 
         for (const auto& el : value)
         {
@@ -14266,20 +16358,22 @@ class binary_writer
     template<typename NumberType, typename std::enable_if<
                  std::is_floating_point<NumberType>::value, int>::type = 0>
     void write_number_with_ubjson_prefix(const NumberType n,
-                                         const bool add_prefix)
+                                         const bool add_prefix,
+                                         const bool use_bjdata)
     {
         if (add_prefix)
         {
             oa->write_character(get_ubjson_float_prefix(n));
         }
-        write_number(n);
+        write_number(n, use_bjdata);
     }
 
     // UBJSON: write number (unsigned integer)
     template<typename NumberType, typename std::enable_if<
                  std::is_unsigned<NumberType>::value, int>::type = 0>
     void write_number_with_ubjson_prefix(const NumberType n,
-                                         const bool add_prefix)
+                                         const bool add_prefix,
+                                         const bool use_bjdata)
     {
         if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int8_t>::max)()))
         {
@@ -14287,7 +16381,7 @@ class binary_writer
             {
                 oa->write_character(to_char_type('i'));  // int8
             }
-            write_number(static_cast<std::uint8_t>(n));
+            write_number(static_cast<std::uint8_t>(n), use_bjdata);
         }
         else if (n <= (std::numeric_limits<std::uint8_t>::max)())
         {
@@ -14295,7 +16389,7 @@ class binary_writer
             {
                 oa->write_character(to_char_type('U'));  // uint8
             }
-            write_number(static_cast<std::uint8_t>(n));
+            write_number(static_cast<std::uint8_t>(n), use_bjdata);
         }
         else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int16_t>::max)()))
         {
@@ -14303,7 +16397,15 @@ class binary_writer
             {
                 oa->write_character(to_char_type('I'));  // int16
             }
-            write_number(static_cast<std::int16_t>(n));
+            write_number(static_cast<std::int16_t>(n), use_bjdata);
+        }
+        else if (use_bjdata && n <= static_cast<uint64_t>((std::numeric_limits<uint16_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('u'));  // uint16 - bjdata only
+            }
+            write_number(static_cast<std::uint16_t>(n), use_bjdata);
         }
         else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
         {
@@ -14311,7 +16413,15 @@ class binary_writer
             {
                 oa->write_character(to_char_type('l'));  // int32
             }
-            write_number(static_cast<std::int32_t>(n));
+            write_number(static_cast<std::int32_t>(n), use_bjdata);
+        }
+        else if (use_bjdata && n <= static_cast<uint64_t>((std::numeric_limits<uint32_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('m'));  // uint32 - bjdata only
+            }
+            write_number(static_cast<std::uint32_t>(n), use_bjdata);
         }
         else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
         {
@@ -14319,7 +16429,15 @@ class binary_writer
             {
                 oa->write_character(to_char_type('L'));  // int64
             }
-            write_number(static_cast<std::int64_t>(n));
+            write_number(static_cast<std::int64_t>(n), use_bjdata);
+        }
+        else if (use_bjdata && n <= (std::numeric_limits<uint64_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('M'));  // uint64 - bjdata only
+            }
+            write_number(static_cast<std::uint64_t>(n), use_bjdata);
         }
         else
         {
@@ -14329,7 +16447,7 @@ class binary_writer
             }
 
             const auto number = BasicJsonType(n).dump();
-            write_number_with_ubjson_prefix(number.size(), true);
+            write_number_with_ubjson_prefix(number.size(), true, use_bjdata);
             for (std::size_t i = 0; i < number.size(); ++i)
             {
                 oa->write_character(to_char_type(static_cast<std::uint8_t>(number[i])));
@@ -14342,7 +16460,8 @@ class binary_writer
                    std::is_signed<NumberType>::value&&
                    !std::is_floating_point<NumberType>::value, int >::type = 0 >
     void write_number_with_ubjson_prefix(const NumberType n,
-                                         const bool add_prefix)
+                                         const bool add_prefix,
+                                         const bool use_bjdata)
     {
         if ((std::numeric_limits<std::int8_t>::min)() <= n && n <= (std::numeric_limits<std::int8_t>::max)())
         {
@@ -14350,7 +16469,7 @@ class binary_writer
             {
                 oa->write_character(to_char_type('i'));  // int8
             }
-            write_number(static_cast<std::int8_t>(n));
+            write_number(static_cast<std::int8_t>(n), use_bjdata);
         }
         else if (static_cast<std::int64_t>((std::numeric_limits<std::uint8_t>::min)()) <= n && n <= static_cast<std::int64_t>((std::numeric_limits<std::uint8_t>::max)()))
         {
@@ -14358,7 +16477,7 @@ class binary_writer
             {
                 oa->write_character(to_char_type('U'));  // uint8
             }
-            write_number(static_cast<std::uint8_t>(n));
+            write_number(static_cast<std::uint8_t>(n), use_bjdata);
         }
         else if ((std::numeric_limits<std::int16_t>::min)() <= n && n <= (std::numeric_limits<std::int16_t>::max)())
         {
@@ -14366,7 +16485,15 @@ class binary_writer
             {
                 oa->write_character(to_char_type('I'));  // int16
             }
-            write_number(static_cast<std::int16_t>(n));
+            write_number(static_cast<std::int16_t>(n), use_bjdata);
+        }
+        else if (use_bjdata && (static_cast<std::int64_t>((std::numeric_limits<std::uint16_t>::min)()) <= n && n <= static_cast<std::int64_t>((std::numeric_limits<std::uint16_t>::max)())))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('u'));  // uint16 - bjdata only
+            }
+            write_number(static_cast<uint16_t>(n), use_bjdata);
         }
         else if ((std::numeric_limits<std::int32_t>::min)() <= n && n <= (std::numeric_limits<std::int32_t>::max)())
         {
@@ -14374,7 +16501,15 @@ class binary_writer
             {
                 oa->write_character(to_char_type('l'));  // int32
             }
-            write_number(static_cast<std::int32_t>(n));
+            write_number(static_cast<std::int32_t>(n), use_bjdata);
+        }
+        else if (use_bjdata && (static_cast<std::int64_t>((std::numeric_limits<std::uint32_t>::min)()) <= n && n <= static_cast<std::int64_t>((std::numeric_limits<std::uint32_t>::max)())))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('m'));  // uint32 - bjdata only
+            }
+            write_number(static_cast<uint32_t>(n), use_bjdata);
         }
         else if ((std::numeric_limits<std::int64_t>::min)() <= n && n <= (std::numeric_limits<std::int64_t>::max)())
         {
@@ -14382,7 +16517,7 @@ class binary_writer
             {
                 oa->write_character(to_char_type('L'));  // int64
             }
-            write_number(static_cast<std::int64_t>(n));
+            write_number(static_cast<std::int64_t>(n), use_bjdata);
         }
         // LCOV_EXCL_START
         else
@@ -14393,7 +16528,7 @@ class binary_writer
             }
 
             const auto number = BasicJsonType(n).dump();
-            write_number_with_ubjson_prefix(number.size(), true);
+            write_number_with_ubjson_prefix(number.size(), true, use_bjdata);
             for (std::size_t i = 0; i < number.size(); ++i)
             {
                 oa->write_character(to_char_type(static_cast<std::uint8_t>(number[i])));
@@ -14405,7 +16540,7 @@ class binary_writer
     /*!
     @brief determine the type prefix of container values
     */
-    CharType ubjson_prefix(const BasicJsonType& j) const noexcept
+    CharType ubjson_prefix(const BasicJsonType& j, const bool use_bjdata) const noexcept
     {
         switch (j.type())
         {
@@ -14413,27 +16548,35 @@ class binary_writer
                 return 'Z';
 
             case value_t::boolean:
-                return j.m_value.boolean ? 'T' : 'F';
+                return j.m_data.m_value.boolean ? 'T' : 'F';
 
             case value_t::number_integer:
             {
-                if ((std::numeric_limits<std::int8_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::int8_t>::max)())
+                if ((std::numeric_limits<std::int8_t>::min)() <= j.m_data.m_value.number_integer && j.m_data.m_value.number_integer <= (std::numeric_limits<std::int8_t>::max)())
                 {
                     return 'i';
                 }
-                if ((std::numeric_limits<std::uint8_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::uint8_t>::max)())
+                if ((std::numeric_limits<std::uint8_t>::min)() <= j.m_data.m_value.number_integer && j.m_data.m_value.number_integer <= (std::numeric_limits<std::uint8_t>::max)())
                 {
                     return 'U';
                 }
-                if ((std::numeric_limits<std::int16_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::int16_t>::max)())
+                if ((std::numeric_limits<std::int16_t>::min)() <= j.m_data.m_value.number_integer && j.m_data.m_value.number_integer <= (std::numeric_limits<std::int16_t>::max)())
                 {
                     return 'I';
                 }
-                if ((std::numeric_limits<std::int32_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::int32_t>::max)())
+                if (use_bjdata && ((std::numeric_limits<std::uint16_t>::min)() <= j.m_data.m_value.number_integer && j.m_data.m_value.number_integer <= (std::numeric_limits<std::uint16_t>::max)()))
+                {
+                    return 'u';
+                }
+                if ((std::numeric_limits<std::int32_t>::min)() <= j.m_data.m_value.number_integer && j.m_data.m_value.number_integer <= (std::numeric_limits<std::int32_t>::max)())
                 {
                     return 'l';
                 }
-                if ((std::numeric_limits<std::int64_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::int64_t>::max)())
+                if (use_bjdata && ((std::numeric_limits<std::uint32_t>::min)() <= j.m_data.m_value.number_integer && j.m_data.m_value.number_integer <= (std::numeric_limits<std::uint32_t>::max)()))
+                {
+                    return 'm';
+                }
+                if ((std::numeric_limits<std::int64_t>::min)() <= j.m_data.m_value.number_integer && j.m_data.m_value.number_integer <= (std::numeric_limits<std::int64_t>::max)())
                 {
                     return 'L';
                 }
@@ -14443,32 +16586,44 @@ class binary_writer
 
             case value_t::number_unsigned:
             {
-                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int8_t>::max)()))
+                if (j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int8_t>::max)()))
                 {
                     return 'i';
                 }
-                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::uint8_t>::max)()))
+                if (j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::uint8_t>::max)()))
                 {
                     return 'U';
                 }
-                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int16_t>::max)()))
+                if (j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int16_t>::max)()))
                 {
                     return 'I';
                 }
-                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
+                if (use_bjdata && j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::uint16_t>::max)()))
+                {
+                    return 'u';
+                }
+                if (j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
                 {
                     return 'l';
                 }
-                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
+                if (use_bjdata && j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::uint32_t>::max)()))
+                {
+                    return 'm';
+                }
+                if (j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
                 {
                     return 'L';
                 }
+                if (use_bjdata && j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    return 'M';
+                }
                 // anything else is treated as high-precision number
                 return 'H'; // LCOV_EXCL_LINE
             }
 
             case value_t::number_float:
-                return get_ubjson_float_prefix(j.m_value.number_float);
+                return get_ubjson_float_prefix(j.m_data.m_value.number_float);
 
             case value_t::string:
                 return 'S';
@@ -14480,6 +16635,7 @@ class binary_writer
             case value_t::object:
                 return '{';
 
+            case value_t::discarded:
             default:  // discarded values
                 return 'N';
         }
@@ -14495,6 +16651,118 @@ class binary_writer
         return 'D';  // float 64
     }
 
+    /*!
+    @return false if the object is successfully converted to a bjdata ndarray, true if the type or size is invalid
+    */
+    bool write_bjdata_ndarray(const typename BasicJsonType::object_t& value, const bool use_count, const bool use_type)
+    {
+        std::map<string_t, CharType> bjdtype = {{"uint8", 'U'},  {"int8", 'i'},  {"uint16", 'u'}, {"int16", 'I'},
+            {"uint32", 'm'}, {"int32", 'l'}, {"uint64", 'M'}, {"int64", 'L'}, {"single", 'd'}, {"double", 'D'}, {"char", 'C'}
+        };
+
+        string_t key = "_ArrayType_";
+        auto it = bjdtype.find(static_cast<string_t>(value.at(key)));
+        if (it == bjdtype.end())
+        {
+            return true;
+        }
+        CharType dtype = it->second;
+
+        key = "_ArraySize_";
+        std::size_t len = (value.at(key).empty() ? 0 : 1);
+        for (const auto& el : value.at(key))
+        {
+            len *= static_cast<std::size_t>(el.m_data.m_value.number_unsigned);
+        }
+
+        key = "_ArrayData_";
+        if (value.at(key).size() != len)
+        {
+            return true;
+        }
+
+        oa->write_character('[');
+        oa->write_character('$');
+        oa->write_character(dtype);
+        oa->write_character('#');
+
+        key = "_ArraySize_";
+        write_ubjson(value.at(key), use_count, use_type, true,  true);
+
+        key = "_ArrayData_";
+        if (dtype == 'U' || dtype == 'C')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::uint8_t>(el.m_data.m_value.number_unsigned), true);
+            }
+        }
+        else if (dtype == 'i')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::int8_t>(el.m_data.m_value.number_integer), true);
+            }
+        }
+        else if (dtype == 'u')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::uint16_t>(el.m_data.m_value.number_unsigned), true);
+            }
+        }
+        else if (dtype == 'I')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::int16_t>(el.m_data.m_value.number_integer), true);
+            }
+        }
+        else if (dtype == 'm')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::uint32_t>(el.m_data.m_value.number_unsigned), true);
+            }
+        }
+        else if (dtype == 'l')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::int32_t>(el.m_data.m_value.number_integer), true);
+            }
+        }
+        else if (dtype == 'M')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::uint64_t>(el.m_data.m_value.number_unsigned), true);
+            }
+        }
+        else if (dtype == 'L')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::int64_t>(el.m_data.m_value.number_integer), true);
+            }
+        }
+        else if (dtype == 'd')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<float>(el.m_data.m_value.number_float), true);
+            }
+        }
+        else if (dtype == 'D')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<double>(el.m_data.m_value.number_float), true);
+            }
+        }
+        return false;
+    }
+
     ///////////////////////
     // Utility functions //
     ///////////////////////
@@ -14502,19 +16770,21 @@ class binary_writer
     /*
     @brief write a number to output input
     @param[in] n number of type @a NumberType
-    @tparam NumberType the type of the number
-    @tparam OutputIsLittleEndian Set to true if output data is
+    @param[in] OutputIsLittleEndian Set to true if output data is
                                  required to be little endian
+    @tparam NumberType the type of the number
 
-    @note This function needs to respect the system's endianess, because bytes
+    @note This function needs to respect the system's endianness, because bytes
           in CBOR, MessagePack, and UBJSON are stored in network order (big
           endian) and therefore need reordering on little endian systems.
+          On the other hand, BSON and BJData use little endian and should reorder
+          on big endian systems.
     */
-    template<typename NumberType, bool OutputIsLittleEndian = false>
-    void write_number(const NumberType n)
+    template<typename NumberType>
+    void write_number(const NumberType n, const bool OutputIsLittleEndian = false)
     {
         // step 1: write number to array of length NumberType
-        std::array<CharType, sizeof(NumberType)> vec;
+        std::array<CharType, sizeof(NumberType)> vec{};
         std::memcpy(vec.data(), &n, sizeof(NumberType));
 
         // step 2: write array to output (with possible reordering)
@@ -14529,6 +16799,10 @@ class binary_writer
 
     void write_compact_float(const number_float_t n, detail::input_format_t format)
     {
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
         if (static_cast<double>(n) >= static_cast<double>(std::numeric_limits<float>::lowest()) &&
                 static_cast<double>(n) <= static_cast<double>((std::numeric_limits<float>::max)()) &&
                 static_cast<double>(static_cast<float>(n)) == static_cast<double>(n))
@@ -14545,6 +16819,9 @@ class binary_writer
                                 : get_msgpack_float_prefix(n));
             write_number(n);
         }
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
     }
 
   public:
@@ -14589,18 +16866,28 @@ class binary_writer
     }
 
   private:
-    /// whether we can assume little endianess
-    const bool is_little_endian = little_endianess();
+    /// whether we can assume little endianness
+    const bool is_little_endian = little_endianness();
 
     /// the output
     output_adapter_t<CharType> oa = nullptr;
 };
+
 }  // namespace detail
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
 
 // #include <nlohmann/detail/output/output_adapters.hpp>
 
 // #include <nlohmann/detail/output/serializer.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2008-2009 Björn Hoehrmann <bjoern@hoehrmann.de>
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 
 
 #include <algorithm> // reverse, remove, fill, find, none_of
@@ -14612,10 +16899,20 @@ class binary_writer
 #include <cstdio> // snprintf
 #include <limits> // numeric_limits
 #include <string> // string, char_traits
+#include <iomanip> // setfill, setw
 #include <type_traits> // is_same
 #include <utility> // move
 
 // #include <nlohmann/detail/conversions/to_chars.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2009 Florian Loitsch <https://florian.loitsch.com/>
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
 
 
 #include <array> // array
@@ -14628,8 +16925,7 @@ class binary_writer
 // #include <nlohmann/detail/macro_scope.hpp>
 
 
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
 
@@ -14819,7 +17115,7 @@ boundaries compute_boundaries(FloatType value)
 
     using bits_type = typename std::conditional<kPrecision == 24, std::uint32_t, std::uint64_t >::type;
 
-    const std::uint64_t bits = reinterpret_bits<bits_type>(value);
+    const auto bits = static_cast<std::uint64_t>(reinterpret_bits<bits_type>(value));
     const std::uint64_t E = bits >> (kPrecision - 1);
     const std::uint64_t F = bits & (kHiddenBit - 1);
 
@@ -15237,7 +17533,7 @@ inline void grisu2_digit_gen(char* buffer, int& length, int& decimal_exponent,
 
     JSON_ASSERT(p1 > 0);
 
-    std::uint32_t pow10;
+    std::uint32_t pow10{};
     const int k = find_largest_pow10(p1, pow10);
 
     //      10^(k-1) <= p1 < 10^k, pow10 = 10^(k-1)
@@ -15510,7 +17806,7 @@ void grisu2(char* buf, int& len, int& decimal_exponent, FloatType value)
     //
     // The documentation for 'std::to_chars' (https://en.cppreference.com/w/cpp/utility/to_chars)
     // says "value is converted to a string as if by std::sprintf in the default ("C") locale"
-    // and since sprintf promotes float's to double's, I think this is exactly what 'std::to_chars'
+    // and since sprintf promotes floats to doubles, I think this is exactly what 'std::to_chars'
     // does.
     // On the other hand, the documentation for 'std::to_chars' requires that "parsing the
     // representation using the corresponding std::from_chars function recovers value exactly". That
@@ -15520,7 +17816,7 @@ void grisu2(char* buf, int& len, int& decimal_exponent, FloatType value)
     // NB: If the neighbors are computed for single-precision numbers, there is a single float
     //     (7.0385307e-26f) which can't be recovered using strtod. The resulting double precision
     //     value is off by 1 ulp.
-#if 0
+#if 0 // NOLINT(readability-avoid-unconditional-preprocessor-if)
     const boundaries w = compute_boundaries(static_cast<double>(value));
 #else
     const boundaries w = compute_boundaries(value);
@@ -15658,7 +17954,7 @@ inline char* format_buffer(char* buf, int len, int decimal_exponent,
     return append_exponent(buf, n - 1);
 }
 
-} // namespace dtoa_impl
+}  // namespace dtoa_impl
 
 /*!
 @brief generates a decimal representation of the floating-point number value in [first, last).
@@ -15685,6 +17981,10 @@ char* to_chars(char* first, const char* last, FloatType value)
         *first++ = '-';
     }
 
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
     if (value == 0) // +-0
     {
         *first++ = '0';
@@ -15693,6 +17993,9 @@ char* to_chars(char* first, const char* last, FloatType value)
         *first++ = '0';
         return first;
     }
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
 
     JSON_ASSERT(last - first >= std::numeric_limits<FloatType>::max_digits10);
 
@@ -15718,8 +18021,8 @@ char* to_chars(char* first, const char* last, FloatType value)
     return dtoa_impl::format_buffer(first, len, decimal_exponent, kMinExp, kMaxExp);
 }
 
-} // namespace detail
-} // namespace nlohmann
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
 
 // #include <nlohmann/detail/exceptions.hpp>
 
@@ -15731,13 +18034,15 @@ char* to_chars(char* first, const char* last, FloatType value)
 
 // #include <nlohmann/detail/output/output_adapters.hpp>
 
+// #include <nlohmann/detail/string_concat.hpp>
+
 // #include <nlohmann/detail/value_t.hpp>
 
 
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 namespace detail
 {
+
 ///////////////////
 // serialization //
 ///////////////////
@@ -15813,11 +18118,11 @@ class serializer
               const unsigned int indent_step,
               const unsigned int current_indent = 0)
     {
-        switch (val.m_type)
+        switch (val.m_data.m_type)
         {
             case value_t::object:
             {
-                if (val.m_value.object->empty())
+                if (val.m_data.m_value.object->empty())
                 {
                     o->write_characters("{}", 2);
                     return;
@@ -15835,8 +18140,8 @@ class serializer
                     }
 
                     // first n-1 elements
-                    auto i = val.m_value.object->cbegin();
-                    for (std::size_t cnt = 0; cnt < val.m_value.object->size() - 1; ++cnt, ++i)
+                    auto i = val.m_data.m_value.object->cbegin();
+                    for (std::size_t cnt = 0; cnt < val.m_data.m_value.object->size() - 1; ++cnt, ++i)
                     {
                         o->write_characters(indent_string.c_str(), new_indent);
                         o->write_character('\"');
@@ -15847,8 +18152,8 @@ class serializer
                     }
 
                     // last element
-                    JSON_ASSERT(i != val.m_value.object->cend());
-                    JSON_ASSERT(std::next(i) == val.m_value.object->cend());
+                    JSON_ASSERT(i != val.m_data.m_value.object->cend());
+                    JSON_ASSERT(std::next(i) == val.m_data.m_value.object->cend());
                     o->write_characters(indent_string.c_str(), new_indent);
                     o->write_character('\"');
                     dump_escaped(i->first, ensure_ascii);
@@ -15864,8 +18169,8 @@ class serializer
                     o->write_character('{');
 
                     // first n-1 elements
-                    auto i = val.m_value.object->cbegin();
-                    for (std::size_t cnt = 0; cnt < val.m_value.object->size() - 1; ++cnt, ++i)
+                    auto i = val.m_data.m_value.object->cbegin();
+                    for (std::size_t cnt = 0; cnt < val.m_data.m_value.object->size() - 1; ++cnt, ++i)
                     {
                         o->write_character('\"');
                         dump_escaped(i->first, ensure_ascii);
@@ -15875,8 +18180,8 @@ class serializer
                     }
 
                     // last element
-                    JSON_ASSERT(i != val.m_value.object->cend());
-                    JSON_ASSERT(std::next(i) == val.m_value.object->cend());
+                    JSON_ASSERT(i != val.m_data.m_value.object->cend());
+                    JSON_ASSERT(std::next(i) == val.m_data.m_value.object->cend());
                     o->write_character('\"');
                     dump_escaped(i->first, ensure_ascii);
                     o->write_characters("\":", 2);
@@ -15890,7 +18195,7 @@ class serializer
 
             case value_t::array:
             {
-                if (val.m_value.array->empty())
+                if (val.m_data.m_value.array->empty())
                 {
                     o->write_characters("[]", 2);
                     return;
@@ -15908,8 +18213,8 @@ class serializer
                     }
 
                     // first n-1 elements
-                    for (auto i = val.m_value.array->cbegin();
-                            i != val.m_value.array->cend() - 1; ++i)
+                    for (auto i = val.m_data.m_value.array->cbegin();
+                            i != val.m_data.m_value.array->cend() - 1; ++i)
                     {
                         o->write_characters(indent_string.c_str(), new_indent);
                         dump(*i, true, ensure_ascii, indent_step, new_indent);
@@ -15917,9 +18222,9 @@ class serializer
                     }
 
                     // last element
-                    JSON_ASSERT(!val.m_value.array->empty());
+                    JSON_ASSERT(!val.m_data.m_value.array->empty());
                     o->write_characters(indent_string.c_str(), new_indent);
-                    dump(val.m_value.array->back(), true, ensure_ascii, indent_step, new_indent);
+                    dump(val.m_data.m_value.array->back(), true, ensure_ascii, indent_step, new_indent);
 
                     o->write_character('\n');
                     o->write_characters(indent_string.c_str(), current_indent);
@@ -15930,16 +18235,16 @@ class serializer
                     o->write_character('[');
 
                     // first n-1 elements
-                    for (auto i = val.m_value.array->cbegin();
-                            i != val.m_value.array->cend() - 1; ++i)
+                    for (auto i = val.m_data.m_value.array->cbegin();
+                            i != val.m_data.m_value.array->cend() - 1; ++i)
                     {
                         dump(*i, false, ensure_ascii, indent_step, current_indent);
                         o->write_character(',');
                     }
 
                     // last element
-                    JSON_ASSERT(!val.m_value.array->empty());
-                    dump(val.m_value.array->back(), false, ensure_ascii, indent_step, current_indent);
+                    JSON_ASSERT(!val.m_data.m_value.array->empty());
+                    dump(val.m_data.m_value.array->back(), false, ensure_ascii, indent_step, current_indent);
 
                     o->write_character(']');
                 }
@@ -15950,7 +18255,7 @@ class serializer
             case value_t::string:
             {
                 o->write_character('\"');
-                dump_escaped(*val.m_value.string, ensure_ascii);
+                dump_escaped(*val.m_data.m_value.string, ensure_ascii);
                 o->write_character('\"');
                 return;
             }
@@ -15972,24 +18277,24 @@ class serializer
 
                     o->write_characters("\"bytes\": [", 10);
 
-                    if (!val.m_value.binary->empty())
+                    if (!val.m_data.m_value.binary->empty())
                     {
-                        for (auto i = val.m_value.binary->cbegin();
-                                i != val.m_value.binary->cend() - 1; ++i)
+                        for (auto i = val.m_data.m_value.binary->cbegin();
+                                i != val.m_data.m_value.binary->cend() - 1; ++i)
                         {
                             dump_integer(*i);
                             o->write_characters(", ", 2);
                         }
-                        dump_integer(val.m_value.binary->back());
+                        dump_integer(val.m_data.m_value.binary->back());
                     }
 
                     o->write_characters("],\n", 3);
                     o->write_characters(indent_string.c_str(), new_indent);
 
                     o->write_characters("\"subtype\": ", 11);
-                    if (val.m_value.binary->has_subtype())
+                    if (val.m_data.m_value.binary->has_subtype())
                     {
-                        dump_integer(val.m_value.binary->subtype());
+                        dump_integer(val.m_data.m_value.binary->subtype());
                     }
                     else
                     {
@@ -16003,21 +18308,21 @@ class serializer
                 {
                     o->write_characters("{\"bytes\":[", 10);
 
-                    if (!val.m_value.binary->empty())
+                    if (!val.m_data.m_value.binary->empty())
                     {
-                        for (auto i = val.m_value.binary->cbegin();
-                                i != val.m_value.binary->cend() - 1; ++i)
+                        for (auto i = val.m_data.m_value.binary->cbegin();
+                                i != val.m_data.m_value.binary->cend() - 1; ++i)
                         {
                             dump_integer(*i);
                             o->write_character(',');
                         }
-                        dump_integer(val.m_value.binary->back());
+                        dump_integer(val.m_data.m_value.binary->back());
                     }
 
                     o->write_characters("],\"subtype\":", 12);
-                    if (val.m_value.binary->has_subtype())
+                    if (val.m_data.m_value.binary->has_subtype())
                     {
-                        dump_integer(val.m_value.binary->subtype());
+                        dump_integer(val.m_data.m_value.binary->subtype());
                         o->write_character('}');
                     }
                     else
@@ -16030,7 +18335,7 @@ class serializer
 
             case value_t::boolean:
             {
-                if (val.m_value.boolean)
+                if (val.m_data.m_value.boolean)
                 {
                     o->write_characters("true", 4);
                 }
@@ -16043,19 +18348,19 @@ class serializer
 
             case value_t::number_integer:
             {
-                dump_integer(val.m_value.number_integer);
+                dump_integer(val.m_data.m_value.number_integer);
                 return;
             }
 
             case value_t::number_unsigned:
             {
-                dump_integer(val.m_value.number_unsigned);
+                dump_integer(val.m_data.m_value.number_unsigned);
                 return;
             }
 
             case value_t::number_float:
             {
-                dump_float(val.m_value.number_float);
+                dump_float(val.m_data.m_value.number_float);
                 return;
             }
 
@@ -16072,7 +18377,7 @@ class serializer
             }
 
             default:            // LCOV_EXCL_LINE
-                JSON_ASSERT(false);  // LCOV_EXCL_LINE
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
         }
     }
 
@@ -16093,7 +18398,7 @@ class serializer
     */
     void dump_escaped(const string_t& s, const bool ensure_ascii)
     {
-        std::uint32_t codepoint;
+        std::uint32_t codepoint{};
         std::uint8_t state = UTF8_ACCEPT;
         std::size_t bytes = 0;  // number of bytes written to string_buffer
 
@@ -16103,7 +18408,7 @@ class serializer
 
         for (std::size_t i = 0; i < s.size(); ++i)
         {
-            const auto byte = static_cast<uint8_t>(s[i]);
+            const auto byte = static_cast<std::uint8_t>(s[i]);
 
             switch (decode(state, codepoint, byte))
             {
@@ -16168,15 +18473,17 @@ class serializer
                             {
                                 if (codepoint <= 0xFFFF)
                                 {
-                                    (std::snprintf)(string_buffer.data() + bytes, 7, "\\u%04x",
-                                                    static_cast<std::uint16_t>(codepoint));
+                                    // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+                                    static_cast<void>((std::snprintf)(string_buffer.data() + bytes, 7, "\\u%04x",
+                                                                      static_cast<std::uint16_t>(codepoint)));
                                     bytes += 6;
                                 }
                                 else
                                 {
-                                    (std::snprintf)(string_buffer.data() + bytes, 13, "\\u%04x\\u%04x",
-                                                    static_cast<std::uint16_t>(0xD7C0u + (codepoint >> 10u)),
-                                                    static_cast<std::uint16_t>(0xDC00u + (codepoint & 0x3FFu)));
+                                    // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+                                    static_cast<void>((std::snprintf)(string_buffer.data() + bytes, 13, "\\u%04x\\u%04x",
+                                                                      static_cast<std::uint16_t>(0xD7C0u + (codepoint >> 10u)),
+                                                                      static_cast<std::uint16_t>(0xDC00u + (codepoint & 0x3FFu))));
                                     bytes += 12;
                                 }
                             }
@@ -16211,9 +18518,7 @@ class serializer
                     {
                         case error_handler_t::strict:
                         {
-                            std::string sn(3, '\0');
-                            (std::snprintf)(&sn[0], sn.size(), "%.2X", byte);
-                            JSON_THROW(type_error::create(316, "invalid UTF-8 byte at index " + std::to_string(i) + ": 0x" + sn, BasicJsonType()));
+                            JSON_THROW(type_error::create(316, concat("invalid UTF-8 byte at index ", std::to_string(i), ": 0x", hex_bytes(byte | 0)), nullptr));
                         }
 
                         case error_handler_t::ignore:
@@ -16271,7 +18576,7 @@ class serializer
                         }
 
                         default:            // LCOV_EXCL_LINE
-                            JSON_ASSERT(false);  // LCOV_EXCL_LINE
+                            JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
                     }
                     break;
                 }
@@ -16305,9 +18610,7 @@ class serializer
             {
                 case error_handler_t::strict:
                 {
-                    std::string sn(3, '\0');
-                    (std::snprintf)(&sn[0], sn.size(), "%.2X", static_cast<std::uint8_t>(s.back()));
-                    JSON_THROW(type_error::create(316, "incomplete UTF-8 string; last byte: 0x" + sn, BasicJsonType()));
+                    JSON_THROW(type_error::create(316, concat("incomplete UTF-8 string; last byte: 0x", hex_bytes(static_cast<std::uint8_t>(s.back() | 0))), nullptr));
                 }
 
                 case error_handler_t::ignore:
@@ -16334,7 +18637,7 @@ class serializer
                 }
 
                 default:            // LCOV_EXCL_LINE
-                    JSON_ASSERT(false);  // LCOV_EXCL_LINE
+                    JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
             }
         }
     }
@@ -16374,6 +18677,33 @@ class serializer
         }
     }
 
+    /*!
+     * @brief convert a byte to a uppercase hex representation
+     * @param[in] byte byte to represent
+     * @return representation ("00".."FF")
+     */
+    static std::string hex_bytes(std::uint8_t byte)
+    {
+        std::string result = "FF";
+        constexpr const char* nibble_to_hex = "0123456789ABCDEF";
+        result[0] = nibble_to_hex[byte / 16];
+        result[1] = nibble_to_hex[byte % 16];
+        return result;
+    }
+
+    // templates to avoid warnings about useless casts
+    template <typename NumberType, enable_if_t<std::is_signed<NumberType>::value, int> = 0>
+    bool is_negative_number(NumberType x)
+    {
+        return x < 0;
+    }
+
+    template < typename NumberType, enable_if_t <std::is_unsigned<NumberType>::value, int > = 0 >
+    bool is_negative_number(NumberType /*unused*/)
+    {
+        return false;
+    }
+
     /*!
     @brief dump an integer
 
@@ -16384,6 +18714,7 @@ class serializer
     @tparam NumberType either @a number_integer_t or @a number_unsigned_t
     */
     template < typename NumberType, detail::enable_if_t <
+                   std::is_integral<NumberType>::value ||
                    std::is_same<NumberType, number_unsigned_t>::value ||
                    std::is_same<NumberType, number_integer_t>::value ||
                    std::is_same<NumberType, binary_char_t>::value,
@@ -16414,14 +18745,13 @@ class serializer
         }
 
         // use a pointer to fill the buffer
-        auto buffer_ptr = number_buffer.begin();
+        auto buffer_ptr = number_buffer.begin(); // NOLINT(llvm-qualified-auto,readability-qualified-auto,cppcoreguidelines-pro-type-vararg,hicpp-vararg)
 
-        const bool is_negative = std::is_same<NumberType, number_integer_t>::value && !(x >= 0); // see issue #755
         number_unsigned_t abs_value;
 
-        unsigned int n_chars;
+        unsigned int n_chars{};
 
-        if (is_negative)
+        if (is_negative_number(x))
         {
             *buffer_ptr = '-';
             abs_value = remove_sign(static_cast<number_integer_t>(x));
@@ -16438,7 +18768,7 @@ class serializer
         // spare 1 byte for '\0'
         JSON_ASSERT(n_chars < number_buffer.size() - 1);
 
-        // jump to the end to generate the string from backward
+        // jump to the end to generate the string from backward,
         // so we later avoid reversing the result
         buffer_ptr += n_chars;
 
@@ -16497,8 +18827,8 @@ class serializer
 
     void dump_float(number_float_t x, std::true_type /*is_ieee_single_or_double*/)
     {
-        char* begin = number_buffer.data();
-        char* end = ::nlohmann::detail::to_chars(begin, begin + number_buffer.size(), x);
+        auto* begin = number_buffer.data();
+        auto* end = ::nlohmann::detail::to_chars(begin, begin + number_buffer.size(), x);
 
         o->write_characters(begin, static_cast<size_t>(end - begin));
     }
@@ -16509,6 +18839,7 @@ class serializer
         static constexpr auto d = std::numeric_limits<number_float_t>::max_digits10;
 
         // the actual conversion
+        // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
         std::ptrdiff_t len = (std::snprintf)(number_buffer.data(), number_buffer.size(), "%.*g", d, x);
 
         // negative value indicates an error
@@ -16519,8 +18850,8 @@ class serializer
         // erase thousands separator
         if (thousands_sep != '\0')
         {
-            const auto end = std::remove(number_buffer.begin(),
-                                         number_buffer.begin() + len, thousands_sep);
+            // NOLINTNEXTLINE(readability-qualified-auto,llvm-qualified-auto): std::remove returns an iterator, see https://github.com/nlohmann/json/issues/3081
+            const auto end = std::remove(number_buffer.begin(), number_buffer.begin() + len, thousands_sep);
             std::fill(end, number_buffer.end(), '\0');
             JSON_ASSERT((end - number_buffer.begin()) <= len);
             len = (end - number_buffer.begin());
@@ -16529,6 +18860,7 @@ class serializer
         // convert decimal point to '.'
         if (decimal_point != '\0' && decimal_point != '.')
         {
+            // NOLINTNEXTLINE(readability-qualified-auto,llvm-qualified-auto): std::find returns an iterator, see https://github.com/nlohmann/json/issues/3081
             const auto dec_pos = std::find(number_buffer.begin(), number_buffer.end(), decimal_point);
             if (dec_pos != number_buffer.end())
             {
@@ -16538,7 +18870,7 @@ class serializer
 
         o->write_characters(number_buffer.data(), static_cast<std::size_t>(len));
 
-        // determine if need to append ".0"
+        // determine if we need to append ".0"
         const bool value_is_int_like =
             std::none_of(number_buffer.begin(), number_buffer.begin() + len + 1,
                          [](char c)
@@ -16602,8 +18934,8 @@ class serializer
                 ? (byte & 0x3fu) | (codep << 6u)
                 : (0xFFu >> type) & (byte);
 
-        std::size_t index = 256u + static_cast<size_t>(state) * 16u + static_cast<size_t>(type);
-        JSON_ASSERT(index < 400);
+        const std::size_t index = 256u + static_cast<size_t>(state) * 16u + static_cast<size_t>(type);
+        JSON_ASSERT(index < utf8d.size());
         state = utf8d[index];
         return state;
     }
@@ -16615,7 +18947,7 @@ class serializer
      */
     number_unsigned_t remove_sign(number_unsigned_t x)
     {
-        JSON_ASSERT(false); // LCOV_EXCL_LINE
+        JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
         return x; // LCOV_EXCL_LINE
     }
 
@@ -16630,7 +18962,7 @@ class serializer
      */
     inline number_unsigned_t remove_sign(number_integer_t x) noexcept
     {
-        JSON_ASSERT(x < 0 && x < (std::numeric_limits<number_integer_t>::max)());
+        JSON_ASSERT(x < 0 && x < (std::numeric_limits<number_integer_t>::max)()); // NOLINT(misc-redundant-expression)
         return static_cast<number_unsigned_t>(-(x + 1)) + 1;
     }
 
@@ -16659,26 +18991,40 @@ class serializer
     /// error_handler how to react on decoding errors
     const error_handler_t error_handler;
 };
+
 }  // namespace detail
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
 
 // #include <nlohmann/detail/value_t.hpp>
 
 // #include <nlohmann/json_fwd.hpp>
 
 // #include <nlohmann/ordered_map.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
 
 
-#include <functional> // less
+
+#include <functional> // equal_to, less
+#include <initializer_list> // initializer_list
+#include <iterator> // input_iterator_tag, iterator_traits
 #include <memory> // allocator
+#include <stdexcept> // for out_of_range
+#include <type_traits> // enable_if, is_convertible
 #include <utility> // pair
 #include <vector> // vector
 
 // #include <nlohmann/detail/macro_scope.hpp>
 
+// #include <nlohmann/detail/meta/type_traits.hpp>
 
-namespace nlohmann
-{
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
 
 /// ordered_map: a minimal map-like container that preserves insertion order
 /// for use within nlohmann::basic_json<ordered_map>
@@ -16689,48 +19035,126 @@ template <class Key, class T, class IgnoredLess = std::less<Key>,
     using key_type = Key;
     using mapped_type = T;
     using Container = std::vector<std::pair<const Key, T>, Allocator>;
-    using typename Container::iterator;
-    using typename Container::const_iterator;
-    using typename Container::size_type;
-    using typename Container::value_type;
+    using iterator = typename Container::iterator;
+    using const_iterator = typename Container::const_iterator;
+    using size_type = typename Container::size_type;
+    using value_type = typename Container::value_type;
+#ifdef JSON_HAS_CPP_14
+    using key_compare = std::equal_to<>;
+#else
+    using key_compare = std::equal_to<Key>;
+#endif
 
     // Explicit constructors instead of `using Container::Container`
     // otherwise older compilers choke on it (GCC <= 5.5, xcode <= 9.4)
-    ordered_map(const Allocator& alloc = Allocator()) : Container{alloc} {}
+    ordered_map() noexcept(noexcept(Container())) : Container{} {}
+    explicit ordered_map(const Allocator& alloc) noexcept(noexcept(Container(alloc))) : Container{alloc} {}
     template <class It>
     ordered_map(It first, It last, const Allocator& alloc = Allocator())
         : Container{first, last, alloc} {}
-    ordered_map(std::initializer_list<T> init, const Allocator& alloc = Allocator() )
+    ordered_map(std::initializer_list<value_type> init, const Allocator& alloc = Allocator() )
         : Container{init, alloc} {}
 
     std::pair<iterator, bool> emplace(const key_type& key, T&& t)
     {
         for (auto it = this->begin(); it != this->end(); ++it)
         {
-            if (it->first == key)
+            if (m_compare(it->first, key))
             {
                 return {it, false};
             }
         }
-        Container::emplace_back(key, t);
-        return {--this->end(), true};
+        Container::emplace_back(key, std::forward<T>(t));
+        return {std::prev(this->end()), true};
+    }
+
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    std::pair<iterator, bool> emplace(KeyType && key, T && t)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return {it, false};
+            }
+        }
+        Container::emplace_back(std::forward<KeyType>(key), std::forward<T>(t));
+        return {std::prev(this->end()), true};
     }
 
-    T& operator[](const Key& key)
+    T& operator[](const key_type& key)
     {
         return emplace(key, T{}).first->second;
     }
 
-    const T& operator[](const Key& key) const
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    T & operator[](KeyType && key)
+    {
+        return emplace(std::forward<KeyType>(key), T{}).first->second;
+    }
+
+    const T& operator[](const key_type& key) const
     {
         return at(key);
     }
 
-    T& at(const Key& key)
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    const T & operator[](KeyType && key) const
+    {
+        return at(std::forward<KeyType>(key));
+    }
+
+    T& at(const key_type& key)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return it->second;
+            }
+        }
+
+        JSON_THROW(std::out_of_range("key not found"));
+    }
+
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    T & at(KeyType && key) // NOLINT(cppcoreguidelines-missing-std-forward)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return it->second;
+            }
+        }
+
+        JSON_THROW(std::out_of_range("key not found"));
+    }
+
+    const T& at(const key_type& key) const
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return it->second;
+            }
+        }
+
+        JSON_THROW(std::out_of_range("key not found"));
+    }
+
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    const T & at(KeyType && key) const // NOLINT(cppcoreguidelines-missing-std-forward)
     {
         for (auto it = this->begin(); it != this->end(); ++it)
         {
-            if (it->first == key)
+            if (m_compare(it->first, key))
             {
                 return it->second;
             }
@@ -16739,24 +19163,32 @@ template <class Key, class T, class IgnoredLess = std::less<Key>,
         JSON_THROW(std::out_of_range("key not found"));
     }
 
-    const T& at(const Key& key) const
+    size_type erase(const key_type& key)
     {
         for (auto it = this->begin(); it != this->end(); ++it)
         {
-            if (it->first == key)
+            if (m_compare(it->first, key))
             {
-                return it->second;
+                // Since we cannot move const Keys, re-construct them in place
+                for (auto next = it; ++next != this->end(); ++it)
+                {
+                    it->~value_type(); // Destroy but keep allocation
+                    new (&*it) value_type{std::move(*next)};
+                }
+                Container::pop_back();
+                return 1;
             }
         }
-
-        JSON_THROW(std::out_of_range("key not found"));
+        return 0;
     }
 
-    size_type erase(const Key& key)
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    size_type erase(KeyType && key) // NOLINT(cppcoreguidelines-missing-std-forward)
     {
         for (auto it = this->begin(); it != this->end(); ++it)
         {
-            if (it->first == key)
+            if (m_compare(it->first, key))
             {
                 // Since we cannot move const Keys, re-construct them in place
                 for (auto next = it; ++next != this->end(); ++it)
@@ -16773,23 +19205,81 @@ template <class Key, class T, class IgnoredLess = std::less<Key>,
 
     iterator erase(iterator pos)
     {
-        auto it = pos;
+        return erase(pos, std::next(pos));
+    }
+
+    iterator erase(iterator first, iterator last)
+    {
+        if (first == last)
+        {
+            return first;
+        }
+
+        const auto elements_affected = std::distance(first, last);
+        const auto offset = std::distance(Container::begin(), first);
+
+        // This is the start situation. We need to delete elements_affected
+        // elements (3 in this example: e, f, g), and need to return an
+        // iterator past the last deleted element (h in this example).
+        // Note that offset is the distance from the start of the vector
+        // to first. We will need this later.
+
+        // [ a, b, c, d, e, f, g, h, i, j ]
+        //               ^        ^
+        //             first    last
+
+        // Since we cannot move const Keys, we re-construct them in place.
+        // We start at first and re-construct (viz. copy) the elements from
+        // the back of the vector. Example for first iteration:
+
+        //               ,--------.
+        //               v        |   destroy e and re-construct with h
+        // [ a, b, c, d, e, f, g, h, i, j ]
+        //               ^        ^
+        //               it       it + elements_affected
+
+        for (auto it = first; std::next(it, elements_affected) != Container::end(); ++it)
+        {
+            it->~value_type(); // destroy but keep allocation
+            new (&*it) value_type{std::move(*std::next(it, elements_affected))}; // "move" next element to it
+        }
+
+        // [ a, b, c, d, h, i, j, h, i, j ]
+        //               ^        ^
+        //             first    last
+
+        // remove the unneeded elements at the end of the vector
+        Container::resize(this->size() - static_cast<size_type>(elements_affected));
 
-        // Since we cannot move const Keys, re-construct them in place
-        for (auto next = it; ++next != this->end(); ++it)
+        // [ a, b, c, d, h, i, j ]
+        //               ^        ^
+        //             first    last
+
+        // first is now pointing past the last deleted element, but we cannot
+        // use this iterator, because it may have been invalidated by the
+        // resize call. Instead, we can return begin() + offset.
+        return Container::begin() + offset;
+    }
+
+    size_type count(const key_type& key) const
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
         {
-            it->~value_type(); // Destroy but keep allocation
-            new (&*it) value_type{std::move(*next)};
+            if (m_compare(it->first, key))
+            {
+                return 1;
+            }
         }
-        Container::pop_back();
-        return pos;
+        return 0;
     }
 
-    size_type count(const Key& key) const
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    size_type count(KeyType && key) const // NOLINT(cppcoreguidelines-missing-std-forward)
     {
         for (auto it = this->begin(); it != this->end(); ++it)
         {
-            if (it->first == key)
+            if (m_compare(it->first, key))
             {
                 return 1;
             }
@@ -16797,11 +19287,25 @@ template <class Key, class T, class IgnoredLess = std::less<Key>,
         return 0;
     }
 
-    iterator find(const Key& key)
+    iterator find(const key_type& key)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return it;
+            }
+        }
+        return Container::end();
+    }
+
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    iterator find(KeyType && key) // NOLINT(cppcoreguidelines-missing-std-forward)
     {
         for (auto it = this->begin(); it != this->end(); ++it)
         {
-            if (it->first == key)
+            if (m_compare(it->first, key))
             {
                 return it;
             }
@@ -16809,11 +19313,11 @@ template <class Key, class T, class IgnoredLess = std::less<Key>,
         return Container::end();
     }
 
-    const_iterator find(const Key& key) const
+    const_iterator find(const key_type& key) const
     {
         for (auto it = this->begin(); it != this->end(); ++it)
         {
-            if (it->first == key)
+            if (m_compare(it->first, key))
             {
                 return it;
             }
@@ -16830,7 +19334,7 @@ template <class Key, class T, class IgnoredLess = std::less<Key>,
     {
         for (auto it = this->begin(); it != this->end(); ++it)
         {
-            if (it->first == value.first)
+            if (m_compare(it->first, value.first))
             {
                 return {it, false};
             }
@@ -16851,12 +19355,18 @@ template <class Key, class T, class IgnoredLess = std::less<Key>,
             insert(*it);
         }
     }
+
+private:
+    JSON_NO_UNIQUE_ADDRESS key_compare m_compare = key_compare();
 };
 
-}  // namespace nlohmann
+NLOHMANN_JSON_NAMESPACE_END
 
 
 #if defined(JSON_HAS_CPP_17)
+    #if JSON_HAS_STATIC_RTTI
+        #include <any>
+    #endif
     #include <string_view>
 #endif
 
@@ -16865,75 +19375,12 @@ template <class Key, class T, class IgnoredLess = std::less<Key>,
 @see https://github.com/nlohmann
 @since version 1.0.0
 */
-namespace nlohmann
-{
+NLOHMANN_JSON_NAMESPACE_BEGIN
 
 /*!
 @brief a class to store JSON values
 
-@tparam ObjectType type for JSON objects (`std::map` by default; will be used
-in @ref object_t)
-@tparam ArrayType type for JSON arrays (`std::vector` by default; will be used
-in @ref array_t)
-@tparam StringType type for JSON strings and object keys (`std::string` by
-default; will be used in @ref string_t)
-@tparam BooleanType type for JSON booleans (`bool` by default; will be used
-in @ref boolean_t)
-@tparam NumberIntegerType type for JSON integer numbers (`int64_t` by
-default; will be used in @ref number_integer_t)
-@tparam NumberUnsignedType type for JSON unsigned integer numbers (@c
-`uint64_t` by default; will be used in @ref number_unsigned_t)
-@tparam NumberFloatType type for JSON floating-point numbers (`double` by
-default; will be used in @ref number_float_t)
-@tparam BinaryType type for packed binary data for compatibility with binary
-serialization formats (`std::vector<std::uint8_t>` by default; will be used in
-@ref binary_t)
-@tparam AllocatorType type of the allocator to use (`std::allocator` by
-default)
-@tparam JSONSerializer the serializer to resolve internal calls to `to_json()`
-and `from_json()` (@ref adl_serializer by default)
-
-@requirement The class satisfies the following concept requirements:
-- Basic
- - [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible):
-   JSON values can be default constructed. The result will be a JSON null
-   value.
- - [MoveConstructible](https://en.cppreference.com/w/cpp/named_req/MoveConstructible):
-   A JSON value can be constructed from an rvalue argument.
- - [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible):
-   A JSON value can be copy-constructed from an lvalue expression.
- - [MoveAssignable](https://en.cppreference.com/w/cpp/named_req/MoveAssignable):
-   A JSON value van be assigned from an rvalue argument.
- - [CopyAssignable](https://en.cppreference.com/w/cpp/named_req/CopyAssignable):
-   A JSON value can be copy-assigned from an lvalue expression.
- - [Destructible](https://en.cppreference.com/w/cpp/named_req/Destructible):
-   JSON values can be destructed.
-- Layout
- - [StandardLayoutType](https://en.cppreference.com/w/cpp/named_req/StandardLayoutType):
-   JSON values have
-   [standard layout](https://en.cppreference.com/w/cpp/language/data_members#Standard_layout):
-   All non-static data members are private and standard layout types, the
-   class has no virtual functions or (virtual) base classes.
-- Library-wide
- - [EqualityComparable](https://en.cppreference.com/w/cpp/named_req/EqualityComparable):
-   JSON values can be compared with `==`, see @ref
-   operator==(const_reference,const_reference).
- - [LessThanComparable](https://en.cppreference.com/w/cpp/named_req/LessThanComparable):
-   JSON values can be compared with `<`, see @ref
-   operator<(const_reference,const_reference).
- - [Swappable](https://en.cppreference.com/w/cpp/named_req/Swappable):
-   Any JSON lvalue or rvalue of can be swapped with any lvalue or rvalue of
-   other compatible types, using unqualified function call @ref swap().
- - [NullablePointer](https://en.cppreference.com/w/cpp/named_req/NullablePointer):
-   JSON values can be compared against `std::nullptr_t` objects which are used
-   to model the `null` value.
-- Container
- - [Container](https://en.cppreference.com/w/cpp/named_req/Container):
-   JSON values can be used like STL containers and provide iterator access.
- - [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer);
-   JSON values can be used like STL containers and provide reverse iterator
-   access.
-
+@internal
 @invariant The member variables @a m_value and @a m_type have the following
 relationship:
 - If `m_type == value_t::object`, then `m_value.object != nullptr`.
@@ -16941,23 +19388,24 @@ and `from_json()` (@ref adl_serializer by default)
 - If `m_type == value_t::string`, then `m_value.string != nullptr`.
 The invariants are checked by member function assert_invariant().
 
-@internal
 @note ObjectType trick from https://stackoverflow.com/a/9860911
 @endinternal
 
-@see [RFC 7159: The JavaScript Object Notation (JSON) Data Interchange
-Format](http://rfc7159.net/rfc7159)
-
 @since version 1.0.0
 
 @nosubgrouping
 */
 NLOHMANN_BASIC_JSON_TPL_DECLARATION
-class basic_json
+class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-special-member-functions)
+    : public ::nlohmann::detail::json_base_class<CustomBaseClass>
 {
   private:
     template<detail::value_t> friend struct detail::external_constructor;
-    friend ::nlohmann::json_pointer<basic_json>;
+
+    template<typename>
+    friend class ::nlohmann::json_pointer;
+    // can be restored when json_pointer backwards compatibility is removed
+    // friend ::nlohmann::json_pointer<StringType>;
 
     template<typename BasicJsonType, typename InputType>
     friend class ::nlohmann::detail::parser;
@@ -16976,6 +19424,7 @@ class basic_json
 
     /// workaround type for MSVC
     using basic_json_t = NLOHMANN_BASIC_JSON_TPL;
+    using json_base_class_t = ::nlohmann::detail::json_base_class<CustomBaseClass>;
 
   JSON_PRIVATE_UNLESS_TESTED:
     // convenience aliases for types residing in namespace detail;
@@ -17016,7 +19465,7 @@ class basic_json
   public:
     using value_t = detail::value_t;
     /// JSON Pointer, see @ref nlohmann::json_pointer
-    using json_pointer = ::nlohmann::json_pointer<basic_json>;
+    using json_pointer = ::nlohmann::json_pointer<StringType>;
     template<typename T, typename SFINAE>
     using json_serializer = JSONSerializer<T, SFINAE>;
     /// how to treat decoding errors
@@ -17038,22 +19487,15 @@ class basic_json
     /// Classes to implement user-defined exceptions.
     /// @{
 
-    /// @copydoc detail::exception
     using exception = detail::exception;
-    /// @copydoc detail::parse_error
     using parse_error = detail::parse_error;
-    /// @copydoc detail::invalid_iterator
     using invalid_iterator = detail::invalid_iterator;
-    /// @copydoc detail::type_error
     using type_error = detail::type_error;
-    /// @copydoc detail::out_of_range
     using out_of_range = detail::out_of_range;
-    /// @copydoc detail::other_error
     using other_error = detail::other_error;
 
     /// @}
 
-
     /////////////////////
     // container types //
     /////////////////////
@@ -17095,610 +19537,139 @@ class basic_json
 
     /// @}
 
-
-    /*!
-    @brief returns the allocator associated with the container
-    */
+    /// @brief returns the allocator associated with the container
+    /// @sa https://json.nlohmann.me/api/basic_json/get_allocator/
     static allocator_type get_allocator()
     {
         return allocator_type();
     }
 
-    /*!
-    @brief returns version information on the library
-
-    This function returns a JSON object with information about the library,
-    including the version number and information on the platform and compiler.
-
-    @return JSON object holding version information
-    key         | description
-    ----------- | ---------------
-    `compiler`  | Information on the used compiler. It is an object with the following keys: `c++` (the used C++ standard), `family` (the compiler family; possible values are `clang`, `icc`, `gcc`, `ilecpp`, `msvc`, `pgcpp`, `sunpro`, and `unknown`), and `version` (the compiler version).
-    `copyright` | The copyright line for the library as string.
-    `name`      | The name of the library as string.
-    `platform`  | The used platform as string. Possible values are `win32`, `linux`, `apple`, `unix`, and `unknown`.
-    `url`       | The URL of the project as string.
-    `version`   | The version of the library. It is an object with the following keys: `major`, `minor`, and `patch` as defined by [Semantic Versioning](http://semver.org), and `string` (the version string).
-
-    @liveexample{The following code shows an example output of the `meta()`
-    function.,meta}
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes to any JSON value.
-
-    @complexity Constant.
-
-    @since 2.1.0
-    */
+    /// @brief returns version information on the library
+    /// @sa https://json.nlohmann.me/api/basic_json/meta/
     JSON_HEDLEY_WARN_UNUSED_RESULT
     static basic_json meta()
     {
         basic_json result;
 
-        result["copyright"] = "(C) 2013-2021 Niels Lohmann";
+        result["copyright"] = "(C) 2013-2023 Niels Lohmann";
         result["name"] = "JSON for Modern C++";
         result["url"] = "https://github.com/nlohmann/json";
         result["version"]["string"] =
-            std::to_string(NLOHMANN_JSON_VERSION_MAJOR) + "." +
-            std::to_string(NLOHMANN_JSON_VERSION_MINOR) + "." +
-            std::to_string(NLOHMANN_JSON_VERSION_PATCH);
+            detail::concat(std::to_string(NLOHMANN_JSON_VERSION_MAJOR), '.',
+                           std::to_string(NLOHMANN_JSON_VERSION_MINOR), '.',
+                           std::to_string(NLOHMANN_JSON_VERSION_PATCH));
         result["version"]["major"] = NLOHMANN_JSON_VERSION_MAJOR;
         result["version"]["minor"] = NLOHMANN_JSON_VERSION_MINOR;
         result["version"]["patch"] = NLOHMANN_JSON_VERSION_PATCH;
 
 #ifdef _WIN32
         result["platform"] = "win32";
-#elif defined __linux__
-        result["platform"] = "linux";
-#elif defined __APPLE__
-        result["platform"] = "apple";
-#elif defined __unix__
-        result["platform"] = "unix";
-#else
-        result["platform"] = "unknown";
-#endif
-
-#if defined(__ICC) || defined(__INTEL_COMPILER)
-        result["compiler"] = {{"family", "icc"}, {"version", __INTEL_COMPILER}};
-#elif defined(__clang__)
-        result["compiler"] = {{"family", "clang"}, {"version", __clang_version__}};
-#elif defined(__GNUC__) || defined(__GNUG__)
-        result["compiler"] = {{"family", "gcc"}, {"version", std::to_string(__GNUC__) + "." + std::to_string(__GNUC_MINOR__) + "." + std::to_string(__GNUC_PATCHLEVEL__)}};
-#elif defined(__HP_cc) || defined(__HP_aCC)
-        result["compiler"] = "hp"
-#elif defined(__IBMCPP__)
-        result["compiler"] = {{"family", "ilecpp"}, {"version", __IBMCPP__}};
-#elif defined(_MSC_VER)
-        result["compiler"] = {{"family", "msvc"}, {"version", _MSC_VER}};
-#elif defined(__PGI)
-        result["compiler"] = {{"family", "pgcpp"}, {"version", __PGI}};
-#elif defined(__SUNPRO_CC)
-        result["compiler"] = {{"family", "sunpro"}, {"version", __SUNPRO_CC}};
-#else
-        result["compiler"] = {{"family", "unknown"}, {"version", "unknown"}};
-#endif
-
-#ifdef __cplusplus
-        result["compiler"]["c++"] = std::to_string(__cplusplus);
-#else
-        result["compiler"]["c++"] = "unknown";
-#endif
-        return result;
-    }
-
-
-    ///////////////////////////
-    // JSON value data types //
-    ///////////////////////////
-
-    /// @name JSON value data types
-    /// The data types to store a JSON value. These types are derived from
-    /// the template arguments passed to class @ref basic_json.
-    /// @{
-
-#if defined(JSON_HAS_CPP_14)
-    // Use transparent comparator if possible, combined with perfect forwarding
-    // on find() and count() calls prevents unnecessary string construction.
-    using object_comparator_t = std::less<>;
-#else
-    using object_comparator_t = std::less<StringType>;
-#endif
-
-    /*!
-    @brief a type for an object
-
-    [RFC 7159](http://rfc7159.net/rfc7159) describes JSON objects as follows:
-    > An object is an unordered collection of zero or more name/value pairs,
-    > where a name is a string and a value is a string, number, boolean, null,
-    > object, or array.
-
-    To store objects in C++, a type is defined by the template parameters
-    described below.
-
-    @tparam ObjectType  the container to store objects (e.g., `std::map` or
-    `std::unordered_map`)
-    @tparam StringType the type of the keys or names (e.g., `std::string`).
-    The comparison function `std::less<StringType>` is used to order elements
-    inside the container.
-    @tparam AllocatorType the allocator to use for objects (e.g.,
-    `std::allocator`)
-
-    #### Default type
-
-    With the default values for @a ObjectType (`std::map`), @a StringType
-    (`std::string`), and @a AllocatorType (`std::allocator`), the default
-    value for @a object_t is:
-
-    @code {.cpp}
-    std::map<
-      std::string, // key_type
-      basic_json, // value_type
-      std::less<std::string>, // key_compare
-      std::allocator<std::pair<const std::string, basic_json>> // allocator_type
-    >
-    @endcode
-
-    #### Behavior
-
-    The choice of @a object_t influences the behavior of the JSON class. With
-    the default type, objects have the following behavior:
-
-    - When all names are unique, objects will be interoperable in the sense
-      that all software implementations receiving that object will agree on
-      the name-value mappings.
-    - When the names within an object are not unique, it is unspecified which
-      one of the values for a given key will be chosen. For instance,
-      `{"key": 2, "key": 1}` could be equal to either `{"key": 1}` or
-      `{"key": 2}`.
-    - Internally, name/value pairs are stored in lexicographical order of the
-      names. Objects will also be serialized (see @ref dump) in this order.
-      For instance, `{"b": 1, "a": 2}` and `{"a": 2, "b": 1}` will be stored
-      and serialized as `{"a": 2, "b": 1}`.
-    - When comparing objects, the order of the name/value pairs is irrelevant.
-      This makes objects interoperable in the sense that they will not be
-      affected by these differences. For instance, `{"b": 1, "a": 2}` and
-      `{"a": 2, "b": 1}` will be treated as equal.
-
-    #### Limits
-
-    [RFC 7159](http://rfc7159.net/rfc7159) specifies:
-    > An implementation may set limits on the maximum depth of nesting.
-
-    In this class, the object's limit of nesting is not explicitly constrained.
-    However, a maximum depth of nesting may be introduced by the compiler or
-    runtime environment. A theoretical limit can be queried by calling the
-    @ref max_size function of a JSON object.
-
-    #### Storage
-
-    Objects are stored as pointers in a @ref basic_json type. That is, for any
-    access to object values, a pointer of type `object_t*` must be
-    dereferenced.
-
-    @sa @ref array_t -- type for an array value
-
-    @since version 1.0.0
-
-    @note The order name/value pairs are added to the object is *not*
-    preserved by the library. Therefore, iterating an object may return
-    name/value pairs in a different order than they were originally stored. In
-    fact, keys will be traversed in alphabetical order as `std::map` with
-    `std::less` is used by default. Please note this behavior conforms to [RFC
-    7159](http://rfc7159.net/rfc7159), because any order implements the
-    specified "unordered" nature of JSON objects.
-    */
-    using object_t = ObjectType<StringType,
-          basic_json,
-          object_comparator_t,
-          AllocatorType<std::pair<const StringType,
-          basic_json>>>;
-
-    /*!
-    @brief a type for an array
-
-    [RFC 7159](http://rfc7159.net/rfc7159) describes JSON arrays as follows:
-    > An array is an ordered sequence of zero or more values.
-
-    To store objects in C++, a type is defined by the template parameters
-    explained below.
-
-    @tparam ArrayType  container type to store arrays (e.g., `std::vector` or
-    `std::list`)
-    @tparam AllocatorType allocator to use for arrays (e.g., `std::allocator`)
-
-    #### Default type
-
-    With the default values for @a ArrayType (`std::vector`) and @a
-    AllocatorType (`std::allocator`), the default value for @a array_t is:
-
-    @code {.cpp}
-    std::vector<
-      basic_json, // value_type
-      std::allocator<basic_json> // allocator_type
-    >
-    @endcode
-
-    #### Limits
-
-    [RFC 7159](http://rfc7159.net/rfc7159) specifies:
-    > An implementation may set limits on the maximum depth of nesting.
-
-    In this class, the array's limit of nesting is not explicitly constrained.
-    However, a maximum depth of nesting may be introduced by the compiler or
-    runtime environment. A theoretical limit can be queried by calling the
-    @ref max_size function of a JSON array.
-
-    #### Storage
-
-    Arrays are stored as pointers in a @ref basic_json type. That is, for any
-    access to array values, a pointer of type `array_t*` must be dereferenced.
-
-    @sa @ref object_t -- type for an object value
-
-    @since version 1.0.0
-    */
-    using array_t = ArrayType<basic_json, AllocatorType<basic_json>>;
-
-    /*!
-    @brief a type for a string
-
-    [RFC 7159](http://rfc7159.net/rfc7159) describes JSON strings as follows:
-    > A string is a sequence of zero or more Unicode characters.
-
-    To store objects in C++, a type is defined by the template parameter
-    described below. Unicode values are split by the JSON class into
-    byte-sized characters during deserialization.
-
-    @tparam StringType  the container to store strings (e.g., `std::string`).
-    Note this container is used for keys/names in objects, see @ref object_t.
-
-    #### Default type
-
-    With the default values for @a StringType (`std::string`), the default
-    value for @a string_t is:
-
-    @code {.cpp}
-    std::string
-    @endcode
-
-    #### Encoding
-
-    Strings are stored in UTF-8 encoding. Therefore, functions like
-    `std::string::size()` or `std::string::length()` return the number of
-    bytes in the string rather than the number of characters or glyphs.
-
-    #### String comparison
-
-    [RFC 7159](http://rfc7159.net/rfc7159) states:
-    > Software implementations are typically required to test names of object
-    > members for equality. Implementations that transform the textual
-    > representation into sequences of Unicode code units and then perform the
-    > comparison numerically, code unit by code unit, are interoperable in the
-    > sense that implementations will agree in all cases on equality or
-    > inequality of two strings. For example, implementations that compare
-    > strings with escaped characters unconverted may incorrectly find that
-    > `"a\\b"` and `"a\u005Cb"` are not equal.
-
-    This implementation is interoperable as it does compare strings code unit
-    by code unit.
-
-    #### Storage
-
-    String values are stored as pointers in a @ref basic_json type. That is,
-    for any access to string values, a pointer of type `string_t*` must be
-    dereferenced.
-
-    @since version 1.0.0
-    */
-    using string_t = StringType;
-
-    /*!
-    @brief a type for a boolean
-
-    [RFC 7159](http://rfc7159.net/rfc7159) implicitly describes a boolean as a
-    type which differentiates the two literals `true` and `false`.
-
-    To store objects in C++, a type is defined by the template parameter @a
-    BooleanType which chooses the type to use.
-
-    #### Default type
-
-    With the default values for @a BooleanType (`bool`), the default value for
-    @a boolean_t is:
-
-    @code {.cpp}
-    bool
-    @endcode
-
-    #### Storage
-
-    Boolean values are stored directly inside a @ref basic_json type.
-
-    @since version 1.0.0
-    */
-    using boolean_t = BooleanType;
-
-    /*!
-    @brief a type for a number (integer)
-
-    [RFC 7159](http://rfc7159.net/rfc7159) describes numbers as follows:
-    > The representation of numbers is similar to that used in most
-    > programming languages. A number is represented in base 10 using decimal
-    > digits. It contains an integer component that may be prefixed with an
-    > optional minus sign, which may be followed by a fraction part and/or an
-    > exponent part. Leading zeros are not allowed. (...) Numeric values that
-    > cannot be represented in the grammar below (such as Infinity and NaN)
-    > are not permitted.
-
-    This description includes both integer and floating-point numbers.
-    However, C++ allows more precise storage if it is known whether the number
-    is a signed integer, an unsigned integer or a floating-point number.
-    Therefore, three different types, @ref number_integer_t, @ref
-    number_unsigned_t and @ref number_float_t are used.
-
-    To store integer numbers in C++, a type is defined by the template
-    parameter @a NumberIntegerType which chooses the type to use.
-
-    #### Default type
-
-    With the default values for @a NumberIntegerType (`int64_t`), the default
-    value for @a number_integer_t is:
-
-    @code {.cpp}
-    int64_t
-    @endcode
-
-    #### Default behavior
-
-    - The restrictions about leading zeros is not enforced in C++. Instead,
-      leading zeros in integer literals lead to an interpretation as octal
-      number. Internally, the value will be stored as decimal number. For
-      instance, the C++ integer literal `010` will be serialized to `8`.
-      During deserialization, leading zeros yield an error.
-    - Not-a-number (NaN) values will be serialized to `null`.
-
-    #### Limits
-
-    [RFC 7159](http://rfc7159.net/rfc7159) specifies:
-    > An implementation may set limits on the range and precision of numbers.
-
-    When the default type is used, the maximal integer number that can be
-    stored is `9223372036854775807` (INT64_MAX) and the minimal integer number
-    that can be stored is `-9223372036854775808` (INT64_MIN). Integer numbers
-    that are out of range will yield over/underflow when used in a
-    constructor. During deserialization, too large or small integer numbers
-    will be automatically be stored as @ref number_unsigned_t or @ref
-    number_float_t.
-
-    [RFC 7159](http://rfc7159.net/rfc7159) further states:
-    > Note that when such software is used, numbers that are integers and are
-    > in the range \f$[-2^{53}+1, 2^{53}-1]\f$ are interoperable in the sense
-    > that implementations will agree exactly on their numeric values.
-
-    As this range is a subrange of the exactly supported range [INT64_MIN,
-    INT64_MAX], this class's integer type is interoperable.
-
-    #### Storage
-
-    Integer number values are stored directly inside a @ref basic_json type.
-
-    @sa @ref number_float_t -- type for number values (floating-point)
-
-    @sa @ref number_unsigned_t -- type for number values (unsigned integer)
-
-    @since version 1.0.0
-    */
-    using number_integer_t = NumberIntegerType;
-
-    /*!
-    @brief a type for a number (unsigned)
-
-    [RFC 7159](http://rfc7159.net/rfc7159) describes numbers as follows:
-    > The representation of numbers is similar to that used in most
-    > programming languages. A number is represented in base 10 using decimal
-    > digits. It contains an integer component that may be prefixed with an
-    > optional minus sign, which may be followed by a fraction part and/or an
-    > exponent part. Leading zeros are not allowed. (...) Numeric values that
-    > cannot be represented in the grammar below (such as Infinity and NaN)
-    > are not permitted.
-
-    This description includes both integer and floating-point numbers.
-    However, C++ allows more precise storage if it is known whether the number
-    is a signed integer, an unsigned integer or a floating-point number.
-    Therefore, three different types, @ref number_integer_t, @ref
-    number_unsigned_t and @ref number_float_t are used.
-
-    To store unsigned integer numbers in C++, a type is defined by the
-    template parameter @a NumberUnsignedType which chooses the type to use.
-
-    #### Default type
-
-    With the default values for @a NumberUnsignedType (`uint64_t`), the
-    default value for @a number_unsigned_t is:
-
-    @code {.cpp}
-    uint64_t
-    @endcode
-
-    #### Default behavior
-
-    - The restrictions about leading zeros is not enforced in C++. Instead,
-      leading zeros in integer literals lead to an interpretation as octal
-      number. Internally, the value will be stored as decimal number. For
-      instance, the C++ integer literal `010` will be serialized to `8`.
-      During deserialization, leading zeros yield an error.
-    - Not-a-number (NaN) values will be serialized to `null`.
-
-    #### Limits
-
-    [RFC 7159](http://rfc7159.net/rfc7159) specifies:
-    > An implementation may set limits on the range and precision of numbers.
-
-    When the default type is used, the maximal integer number that can be
-    stored is `18446744073709551615` (UINT64_MAX) and the minimal integer
-    number that can be stored is `0`. Integer numbers that are out of range
-    will yield over/underflow when used in a constructor. During
-    deserialization, too large or small integer numbers will be automatically
-    be stored as @ref number_integer_t or @ref number_float_t.
-
-    [RFC 7159](http://rfc7159.net/rfc7159) further states:
-    > Note that when such software is used, numbers that are integers and are
-    > in the range \f$[-2^{53}+1, 2^{53}-1]\f$ are interoperable in the sense
-    > that implementations will agree exactly on their numeric values.
-
-    As this range is a subrange (when considered in conjunction with the
-    number_integer_t type) of the exactly supported range [0, UINT64_MAX],
-    this class's integer type is interoperable.
-
-    #### Storage
-
-    Integer number values are stored directly inside a @ref basic_json type.
-
-    @sa @ref number_float_t -- type for number values (floating-point)
-    @sa @ref number_integer_t -- type for number values (integer)
-
-    @since version 2.0.0
-    */
-    using number_unsigned_t = NumberUnsignedType;
-
-    /*!
-    @brief a type for a number (floating-point)
-
-    [RFC 7159](http://rfc7159.net/rfc7159) describes numbers as follows:
-    > The representation of numbers is similar to that used in most
-    > programming languages. A number is represented in base 10 using decimal
-    > digits. It contains an integer component that may be prefixed with an
-    > optional minus sign, which may be followed by a fraction part and/or an
-    > exponent part. Leading zeros are not allowed. (...) Numeric values that
-    > cannot be represented in the grammar below (such as Infinity and NaN)
-    > are not permitted.
-
-    This description includes both integer and floating-point numbers.
-    However, C++ allows more precise storage if it is known whether the number
-    is a signed integer, an unsigned integer or a floating-point number.
-    Therefore, three different types, @ref number_integer_t, @ref
-    number_unsigned_t and @ref number_float_t are used.
-
-    To store floating-point numbers in C++, a type is defined by the template
-    parameter @a NumberFloatType which chooses the type to use.
-
-    #### Default type
+#elif defined __linux__
+        result["platform"] = "linux";
+#elif defined __APPLE__
+        result["platform"] = "apple";
+#elif defined __unix__
+        result["platform"] = "unix";
+#else
+        result["platform"] = "unknown";
+#endif
 
-    With the default values for @a NumberFloatType (`double`), the default
-    value for @a number_float_t is:
+#if defined(__ICC) || defined(__INTEL_COMPILER)
+        result["compiler"] = {{"family", "icc"}, {"version", __INTEL_COMPILER}};
+#elif defined(__clang__)
+        result["compiler"] = {{"family", "clang"}, {"version", __clang_version__}};
+#elif defined(__GNUC__) || defined(__GNUG__)
+        result["compiler"] = {{"family", "gcc"}, {"version", detail::concat(
+                    std::to_string(__GNUC__), '.',
+                    std::to_string(__GNUC_MINOR__), '.',
+                    std::to_string(__GNUC_PATCHLEVEL__))
+            }
+        };
+#elif defined(__HP_cc) || defined(__HP_aCC)
+        result["compiler"] = "hp"
+#elif defined(__IBMCPP__)
+        result["compiler"] = {{"family", "ilecpp"}, {"version", __IBMCPP__}};
+#elif defined(_MSC_VER)
+        result["compiler"] = {{"family", "msvc"}, {"version", _MSC_VER}};
+#elif defined(__PGI)
+        result["compiler"] = {{"family", "pgcpp"}, {"version", __PGI}};
+#elif defined(__SUNPRO_CC)
+        result["compiler"] = {{"family", "sunpro"}, {"version", __SUNPRO_CC}};
+#else
+        result["compiler"] = {{"family", "unknown"}, {"version", "unknown"}};
+#endif
 
-    @code {.cpp}
-    double
-    @endcode
+#if defined(_MSVC_LANG)
+        result["compiler"]["c++"] = std::to_string(_MSVC_LANG);
+#elif defined(__cplusplus)
+        result["compiler"]["c++"] = std::to_string(__cplusplus);
+#else
+        result["compiler"]["c++"] = "unknown";
+#endif
+        return result;
+    }
 
-    #### Default behavior
+    ///////////////////////////
+    // JSON value data types //
+    ///////////////////////////
 
-    - The restrictions about leading zeros is not enforced in C++. Instead,
-      leading zeros in floating-point literals will be ignored. Internally,
-      the value will be stored as decimal number. For instance, the C++
-      floating-point literal `01.2` will be serialized to `1.2`. During
-      deserialization, leading zeros yield an error.
-    - Not-a-number (NaN) values will be serialized to `null`.
+    /// @name JSON value data types
+    /// The data types to store a JSON value. These types are derived from
+    /// the template arguments passed to class @ref basic_json.
+    /// @{
 
-    #### Limits
+    /// @brief default object key comparator type
+    /// The actual object key comparator type (@ref object_comparator_t) may be
+    /// different.
+    /// @sa https://json.nlohmann.me/api/basic_json/default_object_comparator_t/
+#if defined(JSON_HAS_CPP_14)
+    // use of transparent comparator avoids unnecessary repeated construction of temporaries
+    // in functions involving lookup by key with types other than object_t::key_type (aka. StringType)
+    using default_object_comparator_t = std::less<>;
+#else
+    using default_object_comparator_t = std::less<StringType>;
+#endif
 
-    [RFC 7159](http://rfc7159.net/rfc7159) states:
-    > This specification allows implementations to set limits on the range and
-    > precision of numbers accepted. Since software that implements IEEE
-    > 754-2008 binary64 (double precision) numbers is generally available and
-    > widely used, good interoperability can be achieved by implementations
-    > that expect no more precision or range than these provide, in the sense
-    > that implementations will approximate JSON numbers within the expected
-    > precision.
+    /// @brief a type for an object
+    /// @sa https://json.nlohmann.me/api/basic_json/object_t/
+    using object_t = ObjectType<StringType,
+          basic_json,
+          default_object_comparator_t,
+          AllocatorType<std::pair<const StringType,
+          basic_json>>>;
 
-    This implementation does exactly follow this approach, as it uses double
-    precision floating-point numbers. Note values smaller than
-    `-1.79769313486232e+308` and values greater than `1.79769313486232e+308`
-    will be stored as NaN internally and be serialized to `null`.
+    /// @brief a type for an array
+    /// @sa https://json.nlohmann.me/api/basic_json/array_t/
+    using array_t = ArrayType<basic_json, AllocatorType<basic_json>>;
 
-    #### Storage
+    /// @brief a type for a string
+    /// @sa https://json.nlohmann.me/api/basic_json/string_t/
+    using string_t = StringType;
 
-    Floating-point number values are stored directly inside a @ref basic_json
-    type.
+    /// @brief a type for a boolean
+    /// @sa https://json.nlohmann.me/api/basic_json/boolean_t/
+    using boolean_t = BooleanType;
 
-    @sa @ref number_integer_t -- type for number values (integer)
+    /// @brief a type for a number (integer)
+    /// @sa https://json.nlohmann.me/api/basic_json/number_integer_t/
+    using number_integer_t = NumberIntegerType;
 
-    @sa @ref number_unsigned_t -- type for number values (unsigned integer)
+    /// @brief a type for a number (unsigned)
+    /// @sa https://json.nlohmann.me/api/basic_json/number_unsigned_t/
+    using number_unsigned_t = NumberUnsignedType;
 
-    @since version 1.0.0
-    */
+    /// @brief a type for a number (floating-point)
+    /// @sa https://json.nlohmann.me/api/basic_json/number_float_t/
     using number_float_t = NumberFloatType;
 
-    /*!
-    @brief a type for a packed binary type
-
-    This type is a type designed to carry binary data that appears in various
-    serialized formats, such as CBOR's Major Type 2, MessagePack's bin, and
-    BSON's generic binary subtype. This type is NOT a part of standard JSON and
-    exists solely for compatibility with these binary types. As such, it is
-    simply defined as an ordered sequence of zero or more byte values.
-
-    Additionally, as an implementation detail, the subtype of the binary data is
-    carried around as a `std::uint8_t`, which is compatible with both of the
-    binary data formats that use binary subtyping, (though the specific
-    numbering is incompatible with each other, and it is up to the user to
-    translate between them).
-
-    [CBOR's RFC 7049](https://tools.ietf.org/html/rfc7049) describes this type
-    as:
-    > Major type 2: a byte string. The string's length in bytes is represented
-    > following the rules for positive integers (major type 0).
-
-    [MessagePack's documentation on the bin type
-    family](https://github.com/msgpack/msgpack/blob/master/spec.md#bin-format-family)
-    describes this type as:
-    > Bin format family stores an byte array in 2, 3, or 5 bytes of extra bytes
-    > in addition to the size of the byte array.
-
-    [BSON's specifications](http://bsonspec.org/spec.html) describe several
-    binary types; however, this type is intended to represent the generic binary
-    type which has the description:
-    > Generic binary subtype - This is the most commonly used binary subtype and
-    > should be the 'default' for drivers and tools.
-
-    None of these impose any limitations on the internal representation other
-    than the basic unit of storage be some type of array whose parts are
-    decomposable into bytes.
-
-    The default representation of this binary format is a
-    `std::vector<std::uint8_t>`, which is a very common way to represent a byte
-    array in modern C++.
-
-    #### Default type
-
-    The default values for @a BinaryType is `std::vector<std::uint8_t>`
-
-    #### Storage
-
-    Binary Arrays are stored as pointers in a @ref basic_json type. That is,
-    for any access to array values, a pointer of the type `binary_t*` must be
-    dereferenced.
-
-    #### Notes on subtypes
-
-    - CBOR
-       - Binary values are represented as byte strings. No subtypes are
-         supported and will be ignored when CBOR is written.
-    - MessagePack
-       - If a subtype is given and the binary array contains exactly 1, 2, 4, 8,
-         or 16 elements, the fixext family (fixext1, fixext2, fixext4, fixext8)
-         is used. For other sizes, the ext family (ext8, ext16, ext32) is used.
-         The subtype is then added as singed 8-bit integer.
-       - If no subtype is given, the bin family (bin8, bin16, bin32) is used.
-    - BSON
-       - If a subtype is given, it is used and added as unsigned 8-bit integer.
-       - If no subtype is given, the generic binary subtype 0x00 is used.
-
-    @sa @ref binary -- create a binary array
-
-    @since version 3.8.0
-    */
+    /// @brief a type for a packed binary type
+    /// @sa https://json.nlohmann.me/api/basic_json/binary_t/
     using binary_t = nlohmann::byte_container_with_subtype<BinaryType>;
+
+    /// @brief object key comparator type
+    /// @sa https://json.nlohmann.me/api/basic_json/object_comparator_t/
+    using object_comparator_t = detail::actual_object_comparator_t<basic_json>;
+
     /// @}
 
   private:
@@ -17811,25 +19782,25 @@ class basic_json
 
                 case value_t::boolean:
                 {
-                    boolean = boolean_t(false);
+                    boolean = static_cast<boolean_t>(false);
                     break;
                 }
 
                 case value_t::number_integer:
                 {
-                    number_integer = number_integer_t(0);
+                    number_integer = static_cast<number_integer_t>(0);
                     break;
                 }
 
                 case value_t::number_unsigned:
                 {
-                    number_unsigned = number_unsigned_t(0);
+                    number_unsigned = static_cast<number_unsigned_t>(0);
                     break;
                 }
 
                 case value_t::number_float:
                 {
-                    number_float = number_float_t(0.0);
+                    number_float = static_cast<number_float_t>(0.0);
                     break;
                 }
 
@@ -17839,12 +19810,13 @@ class basic_json
                     break;
                 }
 
+                case value_t::discarded:
                 default:
                 {
                     object = nullptr;  // silence warning, see #821
                     if (JSON_HEDLEY_UNLIKELY(t == value_t::null))
                     {
-                        JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.9.1", basic_json())); // LCOV_EXCL_LINE
+                        JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.11.3", nullptr)); // LCOV_EXCL_LINE
                     }
                     break;
                 }
@@ -17852,112 +19824,94 @@ class basic_json
         }
 
         /// constructor for strings
-        json_value(const string_t& value)
-        {
-            string = create<string_t>(value);
-        }
+        json_value(const string_t& value) : string(create<string_t>(value)) {}
 
         /// constructor for rvalue strings
-        json_value(string_t&& value)
-        {
-            string = create<string_t>(std::move(value));
-        }
+        json_value(string_t&& value) : string(create<string_t>(std::move(value))) {}
 
         /// constructor for objects
-        json_value(const object_t& value)
-        {
-            object = create<object_t>(value);
-        }
+        json_value(const object_t& value) : object(create<object_t>(value)) {}
 
         /// constructor for rvalue objects
-        json_value(object_t&& value)
-        {
-            object = create<object_t>(std::move(value));
-        }
+        json_value(object_t&& value) : object(create<object_t>(std::move(value))) {}
 
         /// constructor for arrays
-        json_value(const array_t& value)
-        {
-            array = create<array_t>(value);
-        }
+        json_value(const array_t& value) : array(create<array_t>(value)) {}
 
         /// constructor for rvalue arrays
-        json_value(array_t&& value)
-        {
-            array = create<array_t>(std::move(value));
-        }
+        json_value(array_t&& value) : array(create<array_t>(std::move(value))) {}
 
         /// constructor for binary arrays
-        json_value(const typename binary_t::container_type& value)
-        {
-            binary = create<binary_t>(value);
-        }
+        json_value(const typename binary_t::container_type& value) : binary(create<binary_t>(value)) {}
 
         /// constructor for rvalue binary arrays
-        json_value(typename binary_t::container_type&& value)
-        {
-            binary = create<binary_t>(std::move(value));
-        }
+        json_value(typename binary_t::container_type&& value) : binary(create<binary_t>(std::move(value))) {}
 
         /// constructor for binary arrays (internal type)
-        json_value(const binary_t& value)
-        {
-            binary = create<binary_t>(value);
-        }
+        json_value(const binary_t& value) : binary(create<binary_t>(value)) {}
 
         /// constructor for rvalue binary arrays (internal type)
-        json_value(binary_t&& value)
-        {
-            binary = create<binary_t>(std::move(value));
-        }
+        json_value(binary_t&& value) : binary(create<binary_t>(std::move(value))) {}
 
-        void destroy(value_t t) noexcept
+        void destroy(value_t t)
         {
-            // flatten the current json_value to a heap-allocated stack
-            std::vector<basic_json> stack;
-
-            // move the top-level items to stack
-            if (t == value_t::array)
+            if (
+                (t == value_t::object && object == nullptr) ||
+                (t == value_t::array && array == nullptr) ||
+                (t == value_t::string && string == nullptr) ||
+                (t == value_t::binary && binary == nullptr)
+            )
             {
-                stack.reserve(array->size());
-                std::move(array->begin(), array->end(), std::back_inserter(stack));
-            }
-            else if (t == value_t::object)
-            {
-                stack.reserve(object->size());
-                for (auto&& it : *object)
-                {
-                    stack.push_back(std::move(it.second));
-                }
+                //not initialized (e.g. due to exception in the ctor)
+                return;
             }
-
-            while (!stack.empty())
+            if (t == value_t::array || t == value_t::object)
             {
-                // move the last item to local variable to be processed
-                basic_json current_item(std::move(stack.back()));
-                stack.pop_back();
+                // flatten the current json_value to a heap-allocated stack
+                std::vector<basic_json> stack;
 
-                // if current_item is array/object, move
-                // its children to the stack to be processed later
-                if (current_item.is_array())
+                // move the top-level items to stack
+                if (t == value_t::array)
                 {
-                    std::move(current_item.m_value.array->begin(), current_item.m_value.array->end(),
-                              std::back_inserter(stack));
-
-                    current_item.m_value.array->clear();
+                    stack.reserve(array->size());
+                    std::move(array->begin(), array->end(), std::back_inserter(stack));
                 }
-                else if (current_item.is_object())
+                else
                 {
-                    for (auto&& it : *current_item.m_value.object)
+                    stack.reserve(object->size());
+                    for (auto&& it : *object)
                     {
                         stack.push_back(std::move(it.second));
                     }
-
-                    current_item.m_value.object->clear();
                 }
 
-                // it's now safe that current_item get destructed
-                // since it doesn't have any children
+                while (!stack.empty())
+                {
+                    // move the last item to local variable to be processed
+                    basic_json current_item(std::move(stack.back()));
+                    stack.pop_back();
+
+                    // if current_item is array/object, move
+                    // its children to the stack to be processed later
+                    if (current_item.is_array())
+                    {
+                        std::move(current_item.m_data.m_value.array->begin(), current_item.m_data.m_value.array->end(), std::back_inserter(stack));
+
+                        current_item.m_data.m_value.array->clear();
+                    }
+                    else if (current_item.is_object())
+                    {
+                        for (auto&& it : *current_item.m_data.m_value.object)
+                        {
+                            stack.push_back(std::move(it.second));
+                        }
+
+                        current_item.m_data.m_value.object->clear();
+                    }
+
+                    // it's now safe that current_item get destructed
+                    // since it doesn't have any children
+                }
             }
 
             switch (t)
@@ -17994,6 +19948,12 @@ class basic_json
                     break;
                 }
 
+                case value_t::null:
+                case value_t::boolean:
+                case value_t::number_integer:
+                case value_t::number_unsigned:
+                case value_t::number_float:
+                case value_t::discarded:
                 default:
                 {
                     break;
@@ -18023,29 +19983,33 @@ class basic_json
     */
     void assert_invariant(bool check_parents = true) const noexcept
     {
-        JSON_ASSERT(m_type != value_t::object || m_value.object != nullptr);
-        JSON_ASSERT(m_type != value_t::array || m_value.array != nullptr);
-        JSON_ASSERT(m_type != value_t::string || m_value.string != nullptr);
-        JSON_ASSERT(m_type != value_t::binary || m_value.binary != nullptr);
+        JSON_ASSERT(m_data.m_type != value_t::object || m_data.m_value.object != nullptr);
+        JSON_ASSERT(m_data.m_type != value_t::array || m_data.m_value.array != nullptr);
+        JSON_ASSERT(m_data.m_type != value_t::string || m_data.m_value.string != nullptr);
+        JSON_ASSERT(m_data.m_type != value_t::binary || m_data.m_value.binary != nullptr);
 
 #if JSON_DIAGNOSTICS
-        JSON_ASSERT(!check_parents || !is_structured() || std::all_of(begin(), end(), [this](const basic_json & j)
+        JSON_TRY
         {
-            return j.m_parent == this;
-        }));
-#else
-        static_cast<void>(check_parents);
+            // cppcheck-suppress assertWithSideEffect
+            JSON_ASSERT(!check_parents || !is_structured() || std::all_of(begin(), end(), [this](const basic_json & j)
+            {
+                return j.m_parent == this;
+            }));
+        }
+        JSON_CATCH(...) {} // LCOV_EXCL_LINE
 #endif
+        static_cast<void>(check_parents);
     }
 
     void set_parents()
     {
 #if JSON_DIAGNOSTICS
-        switch (m_type)
+        switch (m_data.m_type)
         {
             case value_t::array:
             {
-                for (auto& element : *m_value.array)
+                for (auto& element : *m_data.m_value.array)
                 {
                     element.m_parent = this;
                 }
@@ -18054,38 +20018,74 @@ class basic_json
 
             case value_t::object:
             {
-                for (auto& element : *m_value.object)
+                for (auto& element : *m_data.m_value.object)
                 {
                     element.second.m_parent = this;
                 }
                 break;
             }
 
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
             default:
                 break;
         }
 #endif
     }
 
-    iterator set_parents(iterator it, typename iterator::difference_type count)
+    iterator set_parents(iterator it, typename iterator::difference_type count_set_parents)
     {
 #if JSON_DIAGNOSTICS
-        for (typename iterator::difference_type i = 0; i < count; ++i)
+        for (typename iterator::difference_type i = 0; i < count_set_parents; ++i)
         {
             (it + i)->m_parent = this;
         }
 #else
-        static_cast<void>(count);
+        static_cast<void>(count_set_parents);
 #endif
         return it;
     }
 
-    reference set_parent(reference j)
+    reference set_parent(reference j, std::size_t old_capacity = static_cast<std::size_t>(-1))
     {
 #if JSON_DIAGNOSTICS
+        if (old_capacity != static_cast<std::size_t>(-1))
+        {
+            // see https://github.com/nlohmann/json/issues/2838
+            JSON_ASSERT(type() == value_t::array);
+            if (JSON_HEDLEY_UNLIKELY(m_data.m_value.array->capacity() != old_capacity))
+            {
+                // capacity has changed: update all parents
+                set_parents();
+                return j;
+            }
+        }
+
+        // ordered_json uses a vector internally, so pointers could have
+        // been invalidated; see https://github.com/nlohmann/json/issues/2962
+#ifdef JSON_HEDLEY_MSVC_VERSION
+#pragma warning(push )
+#pragma warning(disable : 4127) // ignore warning to replace if with if constexpr
+#endif
+        if (detail::is_ordered_map<object_t>::value)
+        {
+            set_parents();
+            return j;
+        }
+#ifdef JSON_HEDLEY_MSVC_VERSION
+#pragma warning( pop )
+#endif
+
         j.m_parent = this;
 #else
         static_cast<void>(j);
+        static_cast<void>(old_capacity);
 #endif
         return j;
     }
@@ -18095,72 +20095,12 @@ class basic_json
     // JSON parser callback //
     //////////////////////////
 
-    /*!
-    @brief parser event types
-
-    The parser callback distinguishes the following events:
-    - `object_start`: the parser read `{` and started to process a JSON object
-    - `key`: the parser read a key of a value in an object
-    - `object_end`: the parser read `}` and finished processing a JSON object
-    - `array_start`: the parser read `[` and started to process a JSON array
-    - `array_end`: the parser read `]` and finished processing a JSON array
-    - `value`: the parser finished reading a JSON value
-
-    @image html callback_events.png "Example when certain parse events are triggered"
-
-    @sa @ref parser_callback_t for more information and examples
-    */
+    /// @brief parser event types
+    /// @sa https://json.nlohmann.me/api/basic_json/parse_event_t/
     using parse_event_t = detail::parse_event_t;
 
-    /*!
-    @brief per-element parser callback type
-
-    With a parser callback function, the result of parsing a JSON text can be
-    influenced. When passed to @ref parse, it is called on certain events
-    (passed as @ref parse_event_t via parameter @a event) with a set recursion
-    depth @a depth and context JSON value @a parsed. The return value of the
-    callback function is a boolean indicating whether the element that emitted
-    the callback shall be kept or not.
-
-    We distinguish six scenarios (determined by the event type) in which the
-    callback function can be called. The following table describes the values
-    of the parameters @a depth, @a event, and @a parsed.
-
-    parameter @a event | description | parameter @a depth | parameter @a parsed
-    ------------------ | ----------- | ------------------ | -------------------
-    parse_event_t::object_start | the parser read `{` and started to process a JSON object | depth of the parent of the JSON object | a JSON value with type discarded
-    parse_event_t::key | the parser read a key of a value in an object | depth of the currently parsed JSON object | a JSON string containing the key
-    parse_event_t::object_end | the parser read `}` and finished processing a JSON object | depth of the parent of the JSON object | the parsed JSON object
-    parse_event_t::array_start | the parser read `[` and started to process a JSON array | depth of the parent of the JSON array | a JSON value with type discarded
-    parse_event_t::array_end | the parser read `]` and finished processing a JSON array | depth of the parent of the JSON array | the parsed JSON array
-    parse_event_t::value | the parser finished reading a JSON value | depth of the value | the parsed JSON value
-
-    @image html callback_events.png "Example when certain parse events are triggered"
-
-    Discarding a value (i.e., returning `false`) has different effects
-    depending on the context in which function was called:
-
-    - Discarded values in structured types are skipped. That is, the parser
-      will behave as if the discarded value was never read.
-    - In case a value outside a structured type is skipped, it is replaced
-      with `null`. This case happens if the top-level element is skipped.
-
-    @param[in] depth  the depth of the recursion during parsing
-
-    @param[in] event  an event of type parse_event_t indicating the context in
-    the callback function has been called
-
-    @param[in,out] parsed  the current intermediate parse result; note that
-    writing to this value has no effect for parse_event_t::key events
-
-    @return Whether the JSON value which called the function during parsing
-    should be kept (`true`) or not (`false`). In the latter case, it is either
-    skipped completely or replaced by an empty discarded object.
-
-    @sa @ref parse for examples
-
-    @since version 1.0.0
-    */
+    /// @brief per-element parser callback type
+    /// @sa https://json.nlohmann.me/api/basic_json/parser_callback_t/
     using parser_callback_t = detail::parser_callback_t<basic_json>;
 
     //////////////////
@@ -18172,134 +20112,29 @@ class basic_json
     /// assignment, static functions creating objects, and the destructor.
     /// @{
 
-    /*!
-    @brief create an empty value with a given type
-
-    Create an empty JSON value with a given type. The value will be default
-    initialized with an empty value which depends on the type:
-
-    Value type  | initial value
-    ----------- | -------------
-    null        | `null`
-    boolean     | `false`
-    string      | `""`
-    number      | `0`
-    object      | `{}`
-    array       | `[]`
-    binary      | empty array
-
-    @param[in] v  the type of the value to create
-
-    @complexity Constant.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes to any JSON value.
-
-    @liveexample{The following code shows the constructor for different @ref
-    value_t values,basic_json__value_t}
-
-    @sa @ref clear() -- restores the postcondition of this constructor
-
-    @since version 1.0.0
-    */
+    /// @brief create an empty value with a given type
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
     basic_json(const value_t v)
-        : m_type(v), m_value(v)
+        : m_data(v)
     {
         assert_invariant();
     }
 
-    /*!
-    @brief create a null object
-
-    Create a `null` JSON value. It either takes a null pointer as parameter
-    (explicitly creating `null`) or no parameter (implicitly creating `null`).
-    The passed null pointer itself is not read -- it is only used to choose
-    the right constructor.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this constructor never throws
-    exceptions.
-
-    @liveexample{The following code shows the constructor with and without a
-    null pointer parameter.,basic_json__nullptr_t}
-
-    @since version 1.0.0
-    */
-    basic_json(std::nullptr_t = nullptr) noexcept
+    /// @brief create a null object
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    basic_json(std::nullptr_t = nullptr) noexcept // NOLINT(bugprone-exception-escape)
         : basic_json(value_t::null)
     {
         assert_invariant();
     }
 
-    /*!
-    @brief create a JSON value
-
-    This is a "catch all" constructor for all compatible JSON types; that is,
-    types for which a `to_json()` method exists. The constructor forwards the
-    parameter @a val to that method (to `json_serializer<U>::to_json` method
-    with `U = uncvref_t<CompatibleType>`, to be exact).
-
-    Template type @a CompatibleType includes, but is not limited to, the
-    following types:
-    - **arrays**: @ref array_t and all kinds of compatible containers such as
-      `std::vector`, `std::deque`, `std::list`, `std::forward_list`,
-      `std::array`, `std::valarray`, `std::set`, `std::unordered_set`,
-      `std::multiset`, and `std::unordered_multiset` with a `value_type` from
-      which a @ref basic_json value can be constructed.
-    - **objects**: @ref object_t and all kinds of compatible associative
-      containers such as `std::map`, `std::unordered_map`, `std::multimap`,
-      and `std::unordered_multimap` with a `key_type` compatible to
-      @ref string_t and a `value_type` from which a @ref basic_json value can
-      be constructed.
-    - **strings**: @ref string_t, string literals, and all compatible string
-      containers can be used.
-    - **numbers**: @ref number_integer_t, @ref number_unsigned_t,
-      @ref number_float_t, and all convertible number types such as `int`,
-      `size_t`, `int64_t`, `float` or `double` can be used.
-    - **boolean**: @ref boolean_t / `bool` can be used.
-    - **binary**: @ref binary_t / `std::vector<uint8_t>` may be used,
-      unfortunately because string literals cannot be distinguished from binary
-      character arrays by the C++ type system, all types compatible with `const
-      char*` will be directed to the string constructor instead.  This is both
-      for backwards compatibility, and due to the fact that a binary type is not
-      a standard JSON type.
-
-    See the examples below.
-
-    @tparam CompatibleType a type such that:
-    - @a CompatibleType is not derived from `std::istream`,
-    - @a CompatibleType is not @ref basic_json (to avoid hijacking copy/move
-         constructors),
-    - @a CompatibleType is not a different @ref basic_json type (i.e. with different template arguments)
-    - @a CompatibleType is not a @ref basic_json nested type (e.g.,
-         @ref json_pointer, @ref iterator, etc ...)
-    - @ref @ref json_serializer<U> has a
-         `to_json(basic_json_t&, CompatibleType&&)` method
-
-    @tparam U = `uncvref_t<CompatibleType>`
-
-    @param[in] val the value to be forwarded to the respective constructor
-
-    @complexity Usually linear in the size of the passed @a val, also
-                depending on the implementation of the called `to_json()`
-                method.
-
-    @exceptionsafety Depends on the called constructor. For types directly
-    supported by the library (i.e., all types for which no `to_json()` function
-    was provided), strong guarantee holds: if an exception is thrown, there are
-    no changes to any JSON value.
-
-    @liveexample{The following code shows the constructor with several
-    compatible types.,basic_json__CompatibleType}
-
-    @since version 2.1.0
-    */
+    /// @brief create a JSON value from compatible types
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
     template < typename CompatibleType,
                typename U = detail::uncvref_t<CompatibleType>,
                detail::enable_if_t <
                    !detail::is_basic_json<U>::value && detail::is_compatible_type<basic_json_t, U>::value, int > = 0 >
-    basic_json(CompatibleType && val) noexcept(noexcept(
+    basic_json(CompatibleType && val) noexcept(noexcept( // NOLINT(bugprone-forwarding-reference-overload,bugprone-exception-escape)
                 JSONSerializer<U>::to_json(std::declval<basic_json_t&>(),
                                            std::forward<CompatibleType>(val))))
     {
@@ -18308,32 +20143,8 @@ class basic_json
         assert_invariant();
     }
 
-    /*!
-    @brief create a JSON value from an existing one
-
-    This is a constructor for existing @ref basic_json types.
-    It does not hijack copy/move constructors, since the parameter has different
-    template arguments than the current ones.
-
-    The constructor tries to convert the internal @ref m_value of the parameter.
-
-    @tparam BasicJsonType a type such that:
-    - @a BasicJsonType is a @ref basic_json type.
-    - @a BasicJsonType has different template arguments than @ref basic_json_t.
-
-    @param[in] val the @ref basic_json value to be converted.
-
-    @complexity Usually linear in the size of the passed @a val, also
-                depending on the implementation of the called `to_json()`
-                method.
-
-    @exceptionsafety Depends on the called constructor. For types directly
-    supported by the library (i.e., all types for which no `to_json()` function
-    was provided), strong guarantee holds: if an exception is thrown, there are
-    no changes to any JSON value.
-
-    @since version 3.2.0
-    */
+    /// @brief create a JSON value from an existing one
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
     template < typename BasicJsonType,
                detail::enable_if_t <
                    detail::is_basic_json<BasicJsonType>::value&& !std::is_same<basic_json, BasicJsonType>::value, int > = 0 >
@@ -18378,89 +20189,18 @@ class basic_json
                 *this = nullptr;
                 break;
             case value_t::discarded:
-                m_type = value_t::discarded;
+                m_data.m_type = value_t::discarded;
                 break;
             default:            // LCOV_EXCL_LINE
-                JSON_ASSERT(false);  // LCOV_EXCL_LINE
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
         }
+        JSON_ASSERT(m_data.m_type == val.type());
         set_parents();
         assert_invariant();
     }
 
-    /*!
-    @brief create a container (array or object) from an initializer list
-
-    Creates a JSON value of type array or object from the passed initializer
-    list @a init. In case @a type_deduction is `true` (default), the type of
-    the JSON value to be created is deducted from the initializer list @a init
-    according to the following rules:
-
-    1. If the list is empty, an empty JSON object value `{}` is created.
-    2. If the list consists of pairs whose first element is a string, a JSON
-       object value is created where the first elements of the pairs are
-       treated as keys and the second elements are as values.
-    3. In all other cases, an array is created.
-
-    The rules aim to create the best fit between a C++ initializer list and
-    JSON values. The rationale is as follows:
-
-    1. The empty initializer list is written as `{}` which is exactly an empty
-       JSON object.
-    2. C++ has no way of describing mapped types other than to list a list of
-       pairs. As JSON requires that keys must be of type string, rule 2 is the
-       weakest constraint one can pose on initializer lists to interpret them
-       as an object.
-    3. In all other cases, the initializer list could not be interpreted as
-       JSON object type, so interpreting it as JSON array type is safe.
-
-    With the rules described above, the following JSON values cannot be
-    expressed by an initializer list:
-
-    - the empty array (`[]`): use @ref array(initializer_list_t)
-      with an empty initializer list in this case
-    - arrays whose elements satisfy rule 2: use @ref
-      array(initializer_list_t) with the same initializer list
-      in this case
-
-    @note When used without parentheses around an empty initializer list, @ref
-    basic_json() is called instead of this function, yielding the JSON null
-    value.
-
-    @param[in] init  initializer list with JSON values
-
-    @param[in] type_deduction internal parameter; when set to `true`, the type
-    of the JSON value is deducted from the initializer list @a init; when set
-    to `false`, the type provided via @a manual_type is forced. This mode is
-    used by the functions @ref array(initializer_list_t) and
-    @ref object(initializer_list_t).
-
-    @param[in] manual_type internal parameter; when @a type_deduction is set
-    to `false`, the created JSON value will use the provided type (only @ref
-    value_t::array and @ref value_t::object are valid); when @a type_deduction
-    is set to `true`, this parameter has no effect
-
-    @throw type_error.301 if @a type_deduction is `false`, @a manual_type is
-    `value_t::object`, but @a init contains an element which is not a pair
-    whose first element is a string. In this case, the constructor could not
-    create an object. If @a type_deduction would have be `true`, an array
-    would have been created. See @ref object(initializer_list_t)
-    for an example.
-
-    @complexity Linear in the size of the initializer list @a init.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes to any JSON value.
-
-    @liveexample{The example below shows how JSON values are created from
-    initializer lists.,basic_json__list_init_t}
-
-    @sa @ref array(initializer_list_t) -- create a JSON array
-    value from an initializer list
-    @sa @ref object(initializer_list_t) -- create a JSON object
-    value from an initializer list
-
-    @since version 1.0.0
-    */
+    /// @brief create a container (array or object) from an initializer list
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
     basic_json(initializer_list_t init,
                bool type_deduction = true,
                value_t manual_type = value_t::array)
@@ -18470,7 +20210,10 @@ class basic_json
         bool is_an_object = std::all_of(init.begin(), init.end(),
                                         [](const detail::json_ref<basic_json>& element_ref)
         {
-            return element_ref->is_array() && element_ref->size() == 2 && (*element_ref)[0].is_string();
+            // The cast is to ensure op[size_type] is called, bearing in mind size_type may not be int;
+            // (many string types can be constructed from 0 via its null-pointer guise, so we get a
+            // broken call to op[key_type], the wrong semantics and a 4804 warning on Windows)
+            return element_ref->is_array() && element_ref->size() == 2 && (*element_ref)[static_cast<size_type>(0)].is_string();
         });
 
         // adjust type if type deduction is not wanted
@@ -18485,300 +20228,106 @@ class basic_json
             // if object is wanted but impossible, throw an exception
             if (JSON_HEDLEY_UNLIKELY(manual_type == value_t::object && !is_an_object))
             {
-                JSON_THROW(type_error::create(301, "cannot create object from initializer list", basic_json()));
+                JSON_THROW(type_error::create(301, "cannot create object from initializer list", nullptr));
             }
         }
 
         if (is_an_object)
         {
             // the initializer list is a list of pairs -> create object
-            m_type = value_t::object;
-            m_value = value_t::object;
+            m_data.m_type = value_t::object;
+            m_data.m_value = value_t::object;
 
             for (auto& element_ref : init)
             {
                 auto element = element_ref.moved_or_copied();
-                m_value.object->emplace(
-                    std::move(*((*element.m_value.array)[0].m_value.string)),
-                    std::move((*element.m_value.array)[1]));
+                m_data.m_value.object->emplace(
+                    std::move(*((*element.m_data.m_value.array)[0].m_data.m_value.string)),
+                    std::move((*element.m_data.m_value.array)[1]));
             }
         }
         else
         {
             // the initializer list describes an array -> create array
-            m_type = value_t::array;
-            m_value.array = create<array_t>(init.begin(), init.end());
+            m_data.m_type = value_t::array;
+            m_data.m_value.array = create<array_t>(init.begin(), init.end());
         }
 
         set_parents();
         assert_invariant();
     }
 
-    /*!
-    @brief explicitly create a binary array (without subtype)
-
-    Creates a JSON binary array value from a given binary container. Binary
-    values are part of various binary formats, such as CBOR, MessagePack, and
-    BSON. This constructor is used to create a value for serialization to those
-    formats.
-
-    @note Note, this function exists because of the difficulty in correctly
-    specifying the correct template overload in the standard value ctor, as both
-    JSON arrays and JSON binary arrays are backed with some form of a
-    `std::vector`. Because JSON binary arrays are a non-standard extension it
-    was decided that it would be best to prevent automatic initialization of a
-    binary array type, for backwards compatibility and so it does not happen on
-    accident.
-
-    @param[in] init container containing bytes to use as binary type
-
-    @return JSON binary array value
-
-    @complexity Linear in the size of @a init.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes to any JSON value.
-
-    @since version 3.8.0
-    */
+    /// @brief explicitly create a binary array (without subtype)
+    /// @sa https://json.nlohmann.me/api/basic_json/binary/
     JSON_HEDLEY_WARN_UNUSED_RESULT
     static basic_json binary(const typename binary_t::container_type& init)
     {
         auto res = basic_json();
-        res.m_type = value_t::binary;
-        res.m_value = init;
+        res.m_data.m_type = value_t::binary;
+        res.m_data.m_value = init;
         return res;
     }
 
-    /*!
-    @brief explicitly create a binary array (with subtype)
-
-    Creates a JSON binary array value from a given binary container. Binary
-    values are part of various binary formats, such as CBOR, MessagePack, and
-    BSON. This constructor is used to create a value for serialization to those
-    formats.
-
-    @note Note, this function exists because of the difficulty in correctly
-    specifying the correct template overload in the standard value ctor, as both
-    JSON arrays and JSON binary arrays are backed with some form of a
-    `std::vector`. Because JSON binary arrays are a non-standard extension it
-    was decided that it would be best to prevent automatic initialization of a
-    binary array type, for backwards compatibility and so it does not happen on
-    accident.
-
-    @param[in] init container containing bytes to use as binary type
-    @param[in] subtype subtype to use in MessagePack and BSON
-
-    @return JSON binary array value
-
-    @complexity Linear in the size of @a init.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes to any JSON value.
-
-    @since version 3.8.0
-    */
+    /// @brief explicitly create a binary array (with subtype)
+    /// @sa https://json.nlohmann.me/api/basic_json/binary/
     JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json binary(const typename binary_t::container_type& init, std::uint8_t subtype)
+    static basic_json binary(const typename binary_t::container_type& init, typename binary_t::subtype_type subtype)
     {
         auto res = basic_json();
-        res.m_type = value_t::binary;
-        res.m_value = binary_t(init, subtype);
+        res.m_data.m_type = value_t::binary;
+        res.m_data.m_value = binary_t(init, subtype);
         return res;
     }
 
-    /// @copydoc binary(const typename binary_t::container_type&)
+    /// @brief explicitly create a binary array
+    /// @sa https://json.nlohmann.me/api/basic_json/binary/
     JSON_HEDLEY_WARN_UNUSED_RESULT
     static basic_json binary(typename binary_t::container_type&& init)
     {
         auto res = basic_json();
-        res.m_type = value_t::binary;
-        res.m_value = std::move(init);
+        res.m_data.m_type = value_t::binary;
+        res.m_data.m_value = std::move(init);
         return res;
     }
 
-    /// @copydoc binary(const typename binary_t::container_type&, std::uint8_t)
+    /// @brief explicitly create a binary array (with subtype)
+    /// @sa https://json.nlohmann.me/api/basic_json/binary/
     JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json binary(typename binary_t::container_type&& init, std::uint8_t subtype)
+    static basic_json binary(typename binary_t::container_type&& init, typename binary_t::subtype_type subtype)
     {
         auto res = basic_json();
-        res.m_type = value_t::binary;
-        res.m_value = binary_t(std::move(init), subtype);
+        res.m_data.m_type = value_t::binary;
+        res.m_data.m_value = binary_t(std::move(init), subtype);
         return res;
     }
 
-    /*!
-    @brief explicitly create an array from an initializer list
-
-    Creates a JSON array value from a given initializer list. That is, given a
-    list of values `a, b, c`, creates the JSON value `[a, b, c]`. If the
-    initializer list is empty, the empty array `[]` is created.
-
-    @note This function is only needed to express two edge cases that cannot
-    be realized with the initializer list constructor (@ref
-    basic_json(initializer_list_t, bool, value_t)). These cases
-    are:
-    1. creating an array whose elements are all pairs whose first element is a
-    string -- in this case, the initializer list constructor would create an
-    object, taking the first elements as keys
-    2. creating an empty array -- passing the empty initializer list to the
-    initializer list constructor yields an empty object
-
-    @param[in] init  initializer list with JSON values to create an array from
-    (optional)
-
-    @return JSON array value
-
-    @complexity Linear in the size of @a init.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes to any JSON value.
-
-    @liveexample{The following code shows an example for the `array`
-    function.,array}
-
-    @sa @ref basic_json(initializer_list_t, bool, value_t) --
-    create a JSON value from an initializer list
-    @sa @ref object(initializer_list_t) -- create a JSON object
-    value from an initializer list
-
-    @since version 1.0.0
-    */
+    /// @brief explicitly create an array from an initializer list
+    /// @sa https://json.nlohmann.me/api/basic_json/array/
     JSON_HEDLEY_WARN_UNUSED_RESULT
     static basic_json array(initializer_list_t init = {})
     {
         return basic_json(init, false, value_t::array);
     }
 
-    /*!
-    @brief explicitly create an object from an initializer list
-
-    Creates a JSON object value from a given initializer list. The initializer
-    lists elements must be pairs, and their first elements must be strings. If
-    the initializer list is empty, the empty object `{}` is created.
-
-    @note This function is only added for symmetry reasons. In contrast to the
-    related function @ref array(initializer_list_t), there are
-    no cases which can only be expressed by this function. That is, any
-    initializer list @a init can also be passed to the initializer list
-    constructor @ref basic_json(initializer_list_t, bool, value_t).
-
-    @param[in] init  initializer list to create an object from (optional)
-
-    @return JSON object value
-
-    @throw type_error.301 if @a init is not a list of pairs whose first
-    elements are strings. In this case, no object can be created. When such a
-    value is passed to @ref basic_json(initializer_list_t, bool, value_t),
-    an array would have been created from the passed initializer list @a init.
-    See example below.
-
-    @complexity Linear in the size of @a init.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes to any JSON value.
-
-    @liveexample{The following code shows an example for the `object`
-    function.,object}
-
-    @sa @ref basic_json(initializer_list_t, bool, value_t) --
-    create a JSON value from an initializer list
-    @sa @ref array(initializer_list_t) -- create a JSON array
-    value from an initializer list
-
-    @since version 1.0.0
-    */
+    /// @brief explicitly create an object from an initializer list
+    /// @sa https://json.nlohmann.me/api/basic_json/object/
     JSON_HEDLEY_WARN_UNUSED_RESULT
     static basic_json object(initializer_list_t init = {})
     {
         return basic_json(init, false, value_t::object);
     }
 
-    /*!
-    @brief construct an array with count copies of given value
-
-    Constructs a JSON array value by creating @a cnt copies of a passed value.
-    In case @a cnt is `0`, an empty array is created.
-
-    @param[in] cnt  the number of JSON copies of @a val to create
-    @param[in] val  the JSON value to copy
-
-    @post `std::distance(begin(),end()) == cnt` holds.
-
-    @complexity Linear in @a cnt.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes to any JSON value.
-
-    @liveexample{The following code shows examples for the @ref
-    basic_json(size_type\, const basic_json&)
-    constructor.,basic_json__size_type_basic_json}
-
-    @since version 1.0.0
-    */
-    basic_json(size_type cnt, const basic_json& val)
-        : m_type(value_t::array)
+    /// @brief construct an array with count copies of given value
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    basic_json(size_type cnt, const basic_json& val):
+        m_data{cnt, val}
     {
-        m_value.array = create<array_t>(cnt, val);
         set_parents();
         assert_invariant();
     }
 
-    /*!
-    @brief construct a JSON container given an iterator range
-
-    Constructs the JSON value with the contents of the range `[first, last)`.
-    The semantics depends on the different types a JSON value can have:
-    - In case of a null type, invalid_iterator.206 is thrown.
-    - In case of other primitive types (number, boolean, or string), @a first
-      must be `begin()` and @a last must be `end()`. In this case, the value is
-      copied. Otherwise, invalid_iterator.204 is thrown.
-    - In case of structured types (array, object), the constructor behaves as
-      similar versions for `std::vector` or `std::map`; that is, a JSON array
-      or object is constructed from the values in the range.
-
-    @tparam InputIT an input iterator type (@ref iterator or @ref
-    const_iterator)
-
-    @param[in] first begin of the range to copy from (included)
-    @param[in] last end of the range to copy from (excluded)
-
-    @pre Iterators @a first and @a last must be initialized. **This
-         precondition is enforced with an assertion (see warning).** If
-         assertions are switched off, a violation of this precondition yields
-         undefined behavior.
-
-    @pre Range `[first, last)` is valid. Usually, this precondition cannot be
-         checked efficiently. Only certain edge cases are detected; see the
-         description of the exceptions below. A violation of this precondition
-         yields undefined behavior.
-
-    @warning A precondition is enforced with a runtime assertion that will
-             result in calling `std::abort` if this precondition is not met.
-             Assertions can be disabled by defining `NDEBUG` at compile time.
-             See https://en.cppreference.com/w/cpp/error/assert for more
-             information.
-
-    @throw invalid_iterator.201 if iterators @a first and @a last are not
-    compatible (i.e., do not belong to the same JSON value). In this case,
-    the range `[first, last)` is undefined.
-    @throw invalid_iterator.204 if iterators @a first and @a last belong to a
-    primitive type (number, boolean, or string), but @a first does not point
-    to the first element any more. In this case, the range `[first, last)` is
-    undefined. See example code below.
-    @throw invalid_iterator.206 if iterators @a first and @a last belong to a
-    null value. In this case, the range `[first, last)` is undefined.
-
-    @complexity Linear in distance between @a first and @a last.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes to any JSON value.
-
-    @liveexample{The example below shows several ways to create JSON values by
-    specifying a subrange with iterators.,basic_json__InputIt_InputIt}
-
-    @since version 1.0.0
-    */
+    /// @brief construct a JSON container given an iterator range
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
     template < class InputIT, typename std::enable_if <
                    std::is_same<InputIT, typename basic_json_t::iterator>::value ||
                    std::is_same<InputIT, typename basic_json_t::const_iterator>::value, int >::type = 0 >
@@ -18790,14 +20339,14 @@ class basic_json
         // make sure iterator fits the current value
         if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
         {
-            JSON_THROW(invalid_iterator::create(201, "iterators are not compatible", basic_json()));
+            JSON_THROW(invalid_iterator::create(201, "iterators are not compatible", nullptr));
         }
 
         // copy type from first iterator
-        m_type = first.m_object->m_type;
+        m_data.m_type = first.m_object->m_data.m_type;
 
         // check if iterator range is complete for primitive values
-        switch (m_type)
+        switch (m_data.m_type)
         {
             case value_t::boolean:
             case value_t::number_float:
@@ -18808,76 +20357,82 @@ class basic_json
                 if (JSON_HEDLEY_UNLIKELY(!first.m_it.primitive_iterator.is_begin()
                                          || !last.m_it.primitive_iterator.is_end()))
                 {
-                    JSON_THROW(invalid_iterator::create(204, "iterators out of range", *first.m_object));
+                    JSON_THROW(invalid_iterator::create(204, "iterators out of range", first.m_object));
                 }
                 break;
             }
 
+            case value_t::null:
+            case value_t::object:
+            case value_t::array:
+            case value_t::binary:
+            case value_t::discarded:
             default:
                 break;
         }
 
-        switch (m_type)
+        switch (m_data.m_type)
         {
             case value_t::number_integer:
             {
-                m_value.number_integer = first.m_object->m_value.number_integer;
+                m_data.m_value.number_integer = first.m_object->m_data.m_value.number_integer;
                 break;
             }
 
             case value_t::number_unsigned:
             {
-                m_value.number_unsigned = first.m_object->m_value.number_unsigned;
+                m_data.m_value.number_unsigned = first.m_object->m_data.m_value.number_unsigned;
                 break;
             }
 
             case value_t::number_float:
             {
-                m_value.number_float = first.m_object->m_value.number_float;
+                m_data.m_value.number_float = first.m_object->m_data.m_value.number_float;
                 break;
             }
 
             case value_t::boolean:
             {
-                m_value.boolean = first.m_object->m_value.boolean;
+                m_data.m_value.boolean = first.m_object->m_data.m_value.boolean;
                 break;
             }
 
             case value_t::string:
             {
-                m_value = *first.m_object->m_value.string;
+                m_data.m_value = *first.m_object->m_data.m_value.string;
                 break;
             }
 
             case value_t::object:
             {
-                m_value.object = create<object_t>(first.m_it.object_iterator,
-                                                  last.m_it.object_iterator);
+                m_data.m_value.object = create<object_t>(first.m_it.object_iterator,
+                                        last.m_it.object_iterator);
                 break;
             }
 
             case value_t::array:
             {
-                m_value.array = create<array_t>(first.m_it.array_iterator,
-                                                last.m_it.array_iterator);
+                m_data.m_value.array = create<array_t>(first.m_it.array_iterator,
+                                                       last.m_it.array_iterator);
                 break;
             }
 
             case value_t::binary:
             {
-                m_value = *first.m_object->m_value.binary;
+                m_data.m_value = *first.m_object->m_data.m_value.binary;
                 break;
             }
 
+            case value_t::null:
+            case value_t::discarded:
             default:
-                JSON_THROW(invalid_iterator::create(206, "cannot construct with iterators from " + std::string(first.m_object->type_name()), *first.m_object));
+                JSON_THROW(invalid_iterator::create(206, detail::concat("cannot construct with iterators from ", first.m_object->type_name()), first.m_object));
         }
 
         set_parents();
         assert_invariant();
     }
 
-
     ///////////////////////////////////////
     // other constructors and destructor //
     ///////////////////////////////////////
@@ -18887,87 +20442,67 @@ class basic_json
                                  std::is_same<typename JsonRef::value_type, basic_json>>::value, int> = 0 >
     basic_json(const JsonRef& ref) : basic_json(ref.moved_or_copied()) {}
 
-    /*!
-    @brief copy constructor
-
-    Creates a copy of a given JSON value.
-
-    @param[in] other  the JSON value to copy
-
-    @post `*this == other`
-
-    @complexity Linear in the size of @a other.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes to any JSON value.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
-    requirements:
-    - The complexity is linear.
-    - As postcondition, it holds: `other == basic_json(other)`.
-
-    @liveexample{The following code shows an example for the copy
-    constructor.,basic_json__basic_json}
-
-    @since version 1.0.0
-    */
+    /// @brief copy constructor
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
     basic_json(const basic_json& other)
-        : m_type(other.m_type)
+        : json_base_class_t(other)
     {
+        m_data.m_type = other.m_data.m_type;
         // check of passed value is valid
         other.assert_invariant();
 
-        switch (m_type)
+        switch (m_data.m_type)
         {
             case value_t::object:
             {
-                m_value = *other.m_value.object;
+                m_data.m_value = *other.m_data.m_value.object;
                 break;
             }
 
             case value_t::array:
             {
-                m_value = *other.m_value.array;
+                m_data.m_value = *other.m_data.m_value.array;
                 break;
             }
 
             case value_t::string:
             {
-                m_value = *other.m_value.string;
+                m_data.m_value = *other.m_data.m_value.string;
                 break;
             }
 
             case value_t::boolean:
             {
-                m_value = other.m_value.boolean;
+                m_data.m_value = other.m_data.m_value.boolean;
                 break;
             }
 
             case value_t::number_integer:
             {
-                m_value = other.m_value.number_integer;
+                m_data.m_value = other.m_data.m_value.number_integer;
                 break;
             }
 
             case value_t::number_unsigned:
             {
-                m_value = other.m_value.number_unsigned;
+                m_data.m_value = other.m_data.m_value.number_unsigned;
                 break;
             }
 
             case value_t::number_float:
             {
-                m_value = other.m_value.number_float;
+                m_data.m_value = other.m_data.m_value.number_float;
                 break;
             }
 
             case value_t::binary:
             {
-                m_value = *other.m_value.binary;
+                m_data.m_value = *other.m_data.m_value.binary;
                 break;
             }
 
+            case value_t::null:
+            case value_t::discarded:
             default:
                 break;
         }
@@ -18976,108 +20511,51 @@ class basic_json
         assert_invariant();
     }
 
-    /*!
-    @brief move constructor
-
-    Move constructor. Constructs a JSON value with the contents of the given
-    value @a other using move semantics. It "steals" the resources from @a
-    other and leaves it as JSON null value.
-
-    @param[in,out] other  value to move to this object
-
-    @post `*this` has the same value as @a other before the call.
-    @post @a other is a JSON null value.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this constructor never throws
-    exceptions.
-
-    @requirement This function helps `basic_json` satisfying the
-    [MoveConstructible](https://en.cppreference.com/w/cpp/named_req/MoveConstructible)
-    requirements.
-
-    @liveexample{The code below shows the move constructor explicitly called
-    via std::move.,basic_json__moveconstructor}
-
-    @since version 1.0.0
-    */
+    /// @brief move constructor
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
     basic_json(basic_json&& other) noexcept
-        : m_type(std::move(other.m_type)),
-          m_value(std::move(other.m_value))
+        : json_base_class_t(std::forward<json_base_class_t>(other)),
+          m_data(std::move(other.m_data))
     {
         // check that passed value is valid
         other.assert_invariant(false);
 
         // invalidate payload
-        other.m_type = value_t::null;
-        other.m_value = {};
+        other.m_data.m_type = value_t::null;
+        other.m_data.m_value = {};
 
         set_parents();
         assert_invariant();
     }
 
-    /*!
-    @brief copy assignment
-
-    Copy assignment operator. Copies a JSON value via the "copy and swap"
-    strategy: It is expressed in terms of the copy constructor, destructor,
-    and the `swap()` member function.
-
-    @param[in] other  value to copy from
-
-    @complexity Linear.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
-    requirements:
-    - The complexity is linear.
-
-    @liveexample{The code below shows and example for the copy assignment. It
-    creates a copy of value `a` which is then swapped with `b`. Finally\, the
-    copy of `a` (which is the null value after the swap) is
-    destroyed.,basic_json__copyassignment}
-
-    @since version 1.0.0
-    */
+    /// @brief copy assignment
+    /// @sa https://json.nlohmann.me/api/basic_json/operator=/
     basic_json& operator=(basic_json other) noexcept (
         std::is_nothrow_move_constructible<value_t>::value&&
         std::is_nothrow_move_assignable<value_t>::value&&
         std::is_nothrow_move_constructible<json_value>::value&&
-        std::is_nothrow_move_assignable<json_value>::value
+        std::is_nothrow_move_assignable<json_value>::value&&
+        std::is_nothrow_move_assignable<json_base_class_t>::value
     )
     {
         // check that passed value is valid
         other.assert_invariant();
 
         using std::swap;
-        swap(m_type, other.m_type);
-        swap(m_value, other.m_value);
+        swap(m_data.m_type, other.m_data.m_type);
+        swap(m_data.m_value, other.m_data.m_value);
+        json_base_class_t::operator=(std::move(other));
 
         set_parents();
         assert_invariant();
         return *this;
     }
 
-    /*!
-    @brief destructor
-
-    Destroys the JSON value and frees all allocated memory.
-
-    @complexity Linear.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
-    requirements:
-    - The complexity is linear.
-    - All stored elements are destroyed and all memory is freed.
-
-    @since version 1.0.0
-    */
+    /// @brief destructor
+    /// @sa https://json.nlohmann.me/api/basic_json/~basic_json/
     ~basic_json() noexcept
     {
         assert_invariant(false);
-        m_value.destroy(m_type);
     }
 
     /// @}
@@ -19091,53 +20569,8 @@ class basic_json
     /// Functions to inspect the type of a JSON value.
     /// @{
 
-    /*!
-    @brief serialization
-
-    Serialization function for JSON values. The function tries to mimic
-    Python's `json.dumps()` function, and currently supports its @a indent
-    and @a ensure_ascii parameters.
-
-    @param[in] indent If indent is nonnegative, then array elements and object
-    members will be pretty-printed with that indent level. An indent level of
-    `0` will only insert newlines. `-1` (the default) selects the most compact
-    representation.
-    @param[in] indent_char The character to use for indentation if @a indent is
-    greater than `0`. The default is ` ` (space).
-    @param[in] ensure_ascii If @a ensure_ascii is true, all non-ASCII characters
-    in the output are escaped with `\uXXXX` sequences, and the result consists
-    of ASCII characters only.
-    @param[in] error_handler  how to react on decoding errors; there are three
-    possible values: `strict` (throws and exception in case a decoding error
-    occurs; default), `replace` (replace invalid UTF-8 sequences with U+FFFD),
-    and `ignore` (ignore invalid UTF-8 sequences during serialization; all
-    bytes are copied to the output unchanged).
-
-    @return string containing the serialization of the JSON value
-
-    @throw type_error.316 if a string stored inside the JSON value is not
-                          UTF-8 encoded and @a error_handler is set to strict
-
-    @note Binary values are serialized as object containing two keys:
-      - "bytes": an array of bytes as integers
-      - "subtype": the subtype as integer or "null" if the binary has no subtype
-
-    @complexity Linear.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes in the JSON value.
-
-    @liveexample{The following example shows the effect of different @a indent\,
-    @a indent_char\, and @a ensure_ascii parameters to the result of the
-    serialization.,dump}
-
-    @see https://docs.python.org/2/library/json.html#json.dump
-
-    @since version 1.0.0; indentation character @a indent_char, option
-           @a ensure_ascii and exceptions added in version 3.0.0; error
-           handlers added in version 3.4.0; serialization of binary values added
-           in version 3.8.0.
-    */
+    /// @brief serialization
+    /// @sa https://json.nlohmann.me/api/basic_json/dump/
     string_t dump(const int indent = -1,
                   const char indent_char = ' ',
                   const bool ensure_ascii = false,
@@ -19158,400 +20591,109 @@ class basic_json
         return result;
     }
 
-    /*!
-    @brief return the type of the JSON value (explicit)
-
-    Return the type of the JSON value as a value from the @ref value_t
-    enumeration.
-
-    @return the type of the JSON value
-            Value type                | return value
-            ------------------------- | -------------------------
-            null                      | value_t::null
-            boolean                   | value_t::boolean
-            string                    | value_t::string
-            number (integer)          | value_t::number_integer
-            number (unsigned integer) | value_t::number_unsigned
-            number (floating-point)   | value_t::number_float
-            object                    | value_t::object
-            array                     | value_t::array
-            binary                    | value_t::binary
-            discarded                 | value_t::discarded
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `type()` for all JSON
-    types.,type}
-
-    @sa @ref operator value_t() -- return the type of the JSON value (implicit)
-    @sa @ref type_name() -- return the type as string
-
-    @since version 1.0.0
-    */
+    /// @brief return the type of the JSON value (explicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/type/
     constexpr value_t type() const noexcept
     {
-        return m_type;
+        return m_data.m_type;
     }
 
-    /*!
-    @brief return whether type is primitive
-
-    This function returns true if and only if the JSON type is primitive
-    (string, number, boolean, or null).
-
-    @return `true` if type is primitive (string, number, boolean, or null),
-    `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_primitive()` for all JSON
-    types.,is_primitive}
-
-    @sa @ref is_structured() -- returns whether JSON value is structured
-    @sa @ref is_null() -- returns whether JSON value is `null`
-    @sa @ref is_string() -- returns whether JSON value is a string
-    @sa @ref is_boolean() -- returns whether JSON value is a boolean
-    @sa @ref is_number() -- returns whether JSON value is a number
-    @sa @ref is_binary() -- returns whether JSON value is a binary array
-
-    @since version 1.0.0
-    */
+    /// @brief return whether type is primitive
+    /// @sa https://json.nlohmann.me/api/basic_json/is_primitive/
     constexpr bool is_primitive() const noexcept
     {
         return is_null() || is_string() || is_boolean() || is_number() || is_binary();
     }
 
-    /*!
-    @brief return whether type is structured
-
-    This function returns true if and only if the JSON type is structured
-    (array or object).
-
-    @return `true` if type is structured (array or object), `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_structured()` for all JSON
-    types.,is_structured}
-
-    @sa @ref is_primitive() -- returns whether value is primitive
-    @sa @ref is_array() -- returns whether value is an array
-    @sa @ref is_object() -- returns whether value is an object
-
-    @since version 1.0.0
-    */
+    /// @brief return whether type is structured
+    /// @sa https://json.nlohmann.me/api/basic_json/is_structured/
     constexpr bool is_structured() const noexcept
     {
         return is_array() || is_object();
     }
 
-    /*!
-    @brief return whether value is null
-
-    This function returns true if and only if the JSON value is null.
-
-    @return `true` if type is null, `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_null()` for all JSON
-    types.,is_null}
-
-    @since version 1.0.0
-    */
+    /// @brief return whether value is null
+    /// @sa https://json.nlohmann.me/api/basic_json/is_null/
     constexpr bool is_null() const noexcept
     {
-        return m_type == value_t::null;
+        return m_data.m_type == value_t::null;
     }
 
-    /*!
-    @brief return whether value is a boolean
-
-    This function returns true if and only if the JSON value is a boolean.
-
-    @return `true` if type is boolean, `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_boolean()` for all JSON
-    types.,is_boolean}
-
-    @since version 1.0.0
-    */
+    /// @brief return whether value is a boolean
+    /// @sa https://json.nlohmann.me/api/basic_json/is_boolean/
     constexpr bool is_boolean() const noexcept
     {
-        return m_type == value_t::boolean;
+        return m_data.m_type == value_t::boolean;
     }
 
-    /*!
-    @brief return whether value is a number
-
-    This function returns true if and only if the JSON value is a number. This
-    includes both integer (signed and unsigned) and floating-point values.
-
-    @return `true` if type is number (regardless whether integer, unsigned
-    integer or floating-type), `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_number()` for all JSON
-    types.,is_number}
-
-    @sa @ref is_number_integer() -- check if value is an integer or unsigned
-    integer number
-    @sa @ref is_number_unsigned() -- check if value is an unsigned integer
-    number
-    @sa @ref is_number_float() -- check if value is a floating-point number
-
-    @since version 1.0.0
-    */
+    /// @brief return whether value is a number
+    /// @sa https://json.nlohmann.me/api/basic_json/is_number/
     constexpr bool is_number() const noexcept
     {
         return is_number_integer() || is_number_float();
     }
 
-    /*!
-    @brief return whether value is an integer number
-
-    This function returns true if and only if the JSON value is a signed or
-    unsigned integer number. This excludes floating-point values.
-
-    @return `true` if type is an integer or unsigned integer number, `false`
-    otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_number_integer()` for all
-    JSON types.,is_number_integer}
-
-    @sa @ref is_number() -- check if value is a number
-    @sa @ref is_number_unsigned() -- check if value is an unsigned integer
-    number
-    @sa @ref is_number_float() -- check if value is a floating-point number
-
-    @since version 1.0.0
-    */
+    /// @brief return whether value is an integer number
+    /// @sa https://json.nlohmann.me/api/basic_json/is_number_integer/
     constexpr bool is_number_integer() const noexcept
     {
-        return m_type == value_t::number_integer || m_type == value_t::number_unsigned;
+        return m_data.m_type == value_t::number_integer || m_data.m_type == value_t::number_unsigned;
     }
 
-    /*!
-    @brief return whether value is an unsigned integer number
-
-    This function returns true if and only if the JSON value is an unsigned
-    integer number. This excludes floating-point and signed integer values.
-
-    @return `true` if type is an unsigned integer number, `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_number_unsigned()` for all
-    JSON types.,is_number_unsigned}
-
-    @sa @ref is_number() -- check if value is a number
-    @sa @ref is_number_integer() -- check if value is an integer or unsigned
-    integer number
-    @sa @ref is_number_float() -- check if value is a floating-point number
-
-    @since version 2.0.0
-    */
+    /// @brief return whether value is an unsigned integer number
+    /// @sa https://json.nlohmann.me/api/basic_json/is_number_unsigned/
     constexpr bool is_number_unsigned() const noexcept
     {
-        return m_type == value_t::number_unsigned;
+        return m_data.m_type == value_t::number_unsigned;
     }
 
-    /*!
-    @brief return whether value is a floating-point number
-
-    This function returns true if and only if the JSON value is a
-    floating-point number. This excludes signed and unsigned integer values.
-
-    @return `true` if type is a floating-point number, `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_number_float()` for all
-    JSON types.,is_number_float}
-
-    @sa @ref is_number() -- check if value is number
-    @sa @ref is_number_integer() -- check if value is an integer number
-    @sa @ref is_number_unsigned() -- check if value is an unsigned integer
-    number
-
-    @since version 1.0.0
-    */
+    /// @brief return whether value is a floating-point number
+    /// @sa https://json.nlohmann.me/api/basic_json/is_number_float/
     constexpr bool is_number_float() const noexcept
     {
-        return m_type == value_t::number_float;
+        return m_data.m_type == value_t::number_float;
     }
 
-    /*!
-    @brief return whether value is an object
-
-    This function returns true if and only if the JSON value is an object.
-
-    @return `true` if type is object, `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_object()` for all JSON
-    types.,is_object}
-
-    @since version 1.0.0
-    */
+    /// @brief return whether value is an object
+    /// @sa https://json.nlohmann.me/api/basic_json/is_object/
     constexpr bool is_object() const noexcept
     {
-        return m_type == value_t::object;
+        return m_data.m_type == value_t::object;
     }
 
-    /*!
-    @brief return whether value is an array
-
-    This function returns true if and only if the JSON value is an array.
-
-    @return `true` if type is array, `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_array()` for all JSON
-    types.,is_array}
-
-    @since version 1.0.0
-    */
+    /// @brief return whether value is an array
+    /// @sa https://json.nlohmann.me/api/basic_json/is_array/
     constexpr bool is_array() const noexcept
     {
-        return m_type == value_t::array;
+        return m_data.m_type == value_t::array;
     }
 
-    /*!
-    @brief return whether value is a string
-
-    This function returns true if and only if the JSON value is a string.
-
-    @return `true` if type is string, `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_string()` for all JSON
-    types.,is_string}
-
-    @since version 1.0.0
-    */
+    /// @brief return whether value is a string
+    /// @sa https://json.nlohmann.me/api/basic_json/is_string/
     constexpr bool is_string() const noexcept
     {
-        return m_type == value_t::string;
+        return m_data.m_type == value_t::string;
     }
 
-    /*!
-    @brief return whether value is a binary array
-
-    This function returns true if and only if the JSON value is a binary array.
-
-    @return `true` if type is binary array, `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_binary()` for all JSON
-    types.,is_binary}
-
-    @since version 3.8.0
-    */
+    /// @brief return whether value is a binary array
+    /// @sa https://json.nlohmann.me/api/basic_json/is_binary/
     constexpr bool is_binary() const noexcept
     {
-        return m_type == value_t::binary;
+        return m_data.m_type == value_t::binary;
     }
 
-    /*!
-    @brief return whether value is discarded
-
-    This function returns true if and only if the JSON value was discarded
-    during parsing with a callback function (see @ref parser_callback_t).
-
-    @note This function will always be `false` for JSON values after parsing.
-    That is, discarded values can only occur during parsing, but will be
-    removed when inside a structured value or replaced by null in other cases.
-
-    @return `true` if type is discarded, `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_discarded()` for all JSON
-    types.,is_discarded}
-
-    @since version 1.0.0
-    */
+    /// @brief return whether value is discarded
+    /// @sa https://json.nlohmann.me/api/basic_json/is_discarded/
     constexpr bool is_discarded() const noexcept
     {
-        return m_type == value_t::discarded;
+        return m_data.m_type == value_t::discarded;
     }
 
-    /*!
-    @brief return the type of the JSON value (implicit)
-
-    Implicitly return the type of the JSON value as a value from the @ref
-    value_t enumeration.
-
-    @return the type of the JSON value
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies the @ref value_t operator for
-    all JSON types.,operator__value_t}
-
-    @sa @ref type() -- return the type of the JSON value (explicit)
-    @sa @ref type_name() -- return the type as string
-
-    @since version 1.0.0
-    */
+    /// @brief return the type of the JSON value (implicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_value_t/
     constexpr operator value_t() const noexcept
     {
-        return m_type;
+        return m_data.m_type;
     }
 
     /// @}
@@ -19566,106 +20708,106 @@ class basic_json
     {
         if (JSON_HEDLEY_LIKELY(is_boolean()))
         {
-            return m_value.boolean;
+            return m_data.m_value.boolean;
         }
 
-        JSON_THROW(type_error::create(302, "type must be boolean, but is " + std::string(type_name()), *this));
+        JSON_THROW(type_error::create(302, detail::concat("type must be boolean, but is ", type_name()), this));
     }
 
     /// get a pointer to the value (object)
     object_t* get_impl_ptr(object_t* /*unused*/) noexcept
     {
-        return is_object() ? m_value.object : nullptr;
+        return is_object() ? m_data.m_value.object : nullptr;
     }
 
     /// get a pointer to the value (object)
     constexpr const object_t* get_impl_ptr(const object_t* /*unused*/) const noexcept
     {
-        return is_object() ? m_value.object : nullptr;
+        return is_object() ? m_data.m_value.object : nullptr;
     }
 
     /// get a pointer to the value (array)
     array_t* get_impl_ptr(array_t* /*unused*/) noexcept
     {
-        return is_array() ? m_value.array : nullptr;
+        return is_array() ? m_data.m_value.array : nullptr;
     }
 
     /// get a pointer to the value (array)
     constexpr const array_t* get_impl_ptr(const array_t* /*unused*/) const noexcept
     {
-        return is_array() ? m_value.array : nullptr;
+        return is_array() ? m_data.m_value.array : nullptr;
     }
 
     /// get a pointer to the value (string)
     string_t* get_impl_ptr(string_t* /*unused*/) noexcept
     {
-        return is_string() ? m_value.string : nullptr;
+        return is_string() ? m_data.m_value.string : nullptr;
     }
 
     /// get a pointer to the value (string)
     constexpr const string_t* get_impl_ptr(const string_t* /*unused*/) const noexcept
     {
-        return is_string() ? m_value.string : nullptr;
+        return is_string() ? m_data.m_value.string : nullptr;
     }
 
     /// get a pointer to the value (boolean)
     boolean_t* get_impl_ptr(boolean_t* /*unused*/) noexcept
     {
-        return is_boolean() ? &m_value.boolean : nullptr;
+        return is_boolean() ? &m_data.m_value.boolean : nullptr;
     }
 
     /// get a pointer to the value (boolean)
     constexpr const boolean_t* get_impl_ptr(const boolean_t* /*unused*/) const noexcept
     {
-        return is_boolean() ? &m_value.boolean : nullptr;
+        return is_boolean() ? &m_data.m_value.boolean : nullptr;
     }
 
     /// get a pointer to the value (integer number)
     number_integer_t* get_impl_ptr(number_integer_t* /*unused*/) noexcept
     {
-        return is_number_integer() ? &m_value.number_integer : nullptr;
+        return is_number_integer() ? &m_data.m_value.number_integer : nullptr;
     }
 
     /// get a pointer to the value (integer number)
     constexpr const number_integer_t* get_impl_ptr(const number_integer_t* /*unused*/) const noexcept
     {
-        return is_number_integer() ? &m_value.number_integer : nullptr;
+        return is_number_integer() ? &m_data.m_value.number_integer : nullptr;
     }
 
     /// get a pointer to the value (unsigned number)
     number_unsigned_t* get_impl_ptr(number_unsigned_t* /*unused*/) noexcept
     {
-        return is_number_unsigned() ? &m_value.number_unsigned : nullptr;
+        return is_number_unsigned() ? &m_data.m_value.number_unsigned : nullptr;
     }
 
     /// get a pointer to the value (unsigned number)
     constexpr const number_unsigned_t* get_impl_ptr(const number_unsigned_t* /*unused*/) const noexcept
     {
-        return is_number_unsigned() ? &m_value.number_unsigned : nullptr;
+        return is_number_unsigned() ? &m_data.m_value.number_unsigned : nullptr;
     }
 
     /// get a pointer to the value (floating-point number)
     number_float_t* get_impl_ptr(number_float_t* /*unused*/) noexcept
     {
-        return is_number_float() ? &m_value.number_float : nullptr;
+        return is_number_float() ? &m_data.m_value.number_float : nullptr;
     }
 
     /// get a pointer to the value (floating-point number)
     constexpr const number_float_t* get_impl_ptr(const number_float_t* /*unused*/) const noexcept
     {
-        return is_number_float() ? &m_value.number_float : nullptr;
+        return is_number_float() ? &m_data.m_value.number_float : nullptr;
     }
 
     /// get a pointer to the value (binary)
     binary_t* get_impl_ptr(binary_t* /*unused*/) noexcept
     {
-        return is_binary() ? m_value.binary : nullptr;
+        return is_binary() ? m_data.m_value.binary : nullptr;
     }
 
     /// get a pointer to the value (binary)
     constexpr const binary_t* get_impl_ptr(const binary_t* /*unused*/) const noexcept
     {
-        return is_binary() ? m_value.binary : nullptr;
+        return is_binary() ? m_data.m_value.binary : nullptr;
     }
 
     /*!
@@ -19683,14 +20825,14 @@ class basic_json
     static ReferenceType get_ref_impl(ThisType& obj)
     {
         // delegate the call to get_ptr<>()
-        auto ptr = obj.template get_ptr<typename std::add_pointer<ReferenceType>::type>();
+        auto* ptr = obj.template get_ptr<typename std::add_pointer<ReferenceType>::type>();
 
         if (JSON_HEDLEY_LIKELY(ptr != nullptr))
         {
             return *ptr;
         }
 
-        JSON_THROW(type_error::create(303, "incompatible ReferenceType for get_ref, actual type is " + std::string(obj.type_name()), obj));
+        JSON_THROW(type_error::create(303, detail::concat("incompatible ReferenceType for get_ref, actual type is ", obj.type_name()), &obj));
     }
 
   public:
@@ -19698,51 +20840,28 @@ class basic_json
     /// Direct access to the stored value of a JSON value.
     /// @{
 
-    /*!
-    @brief get special-case overload
-
-    This overloads avoids a lot of template boilerplate, it can be seen as the
-    identity method
-
-    @tparam BasicJsonType == @ref basic_json
-
-    @return a copy of *this
-
-    @complexity Constant.
-
-    @since version 2.1.0
-    */
-    template<typename BasicJsonType, detail::enable_if_t<
-                 std::is_same<typename std::remove_const<BasicJsonType>::type, basic_json_t>::value,
-                 int> = 0>
-    basic_json get() const
+    /// @brief get a pointer value (implicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/get_ptr/
+    template<typename PointerType, typename std::enable_if<
+                 std::is_pointer<PointerType>::value, int>::type = 0>
+    auto get_ptr() noexcept -> decltype(std::declval<basic_json_t&>().get_impl_ptr(std::declval<PointerType>()))
     {
-        return *this;
+        // delegate the call to get_impl_ptr<>()
+        return get_impl_ptr(static_cast<PointerType>(nullptr));
     }
 
-    /*!
-    @brief get special-case overload
-
-    This overloads converts the current @ref basic_json in a different
-    @ref basic_json type
-
-    @tparam BasicJsonType == @ref basic_json
-
-    @return a copy of *this, converted into @tparam BasicJsonType
-
-    @complexity Depending on the implementation of the called `from_json()`
-                method.
-
-    @since version 3.2.0
-    */
-    template < typename BasicJsonType, detail::enable_if_t <
-                   !std::is_same<BasicJsonType, basic_json>::value&&
-                   detail::is_basic_json<BasicJsonType>::value, int > = 0 >
-    BasicJsonType get() const
+    /// @brief get a pointer value (implicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/get_ptr/
+    template < typename PointerType, typename std::enable_if <
+                   std::is_pointer<PointerType>::value&&
+                   std::is_const<typename std::remove_pointer<PointerType>::type>::value, int >::type = 0 >
+    constexpr auto get_ptr() const noexcept -> decltype(std::declval<const basic_json_t&>().get_impl_ptr(std::declval<PointerType>()))
     {
-        return *this;
+        // delegate the call to get_impl_ptr<>() const
+        return get_impl_ptr(static_cast<PointerType>(nullptr));
     }
 
+  private:
     /*!
     @brief get a value (explicit)
 
@@ -19766,7 +20885,6 @@ class basic_json
     - @ref json_serializer<ValueType> does not have a `from_json()` method of
       the form `ValueType from_json(const basic_json&)`
 
-    @tparam ValueTypeCV the provided value type
     @tparam ValueType the returned value type
 
     @return copy of the JSON value, converted to @a ValueType
@@ -19782,24 +20900,15 @@ class basic_json
 
     @since version 2.1.0
     */
-    template < typename ValueTypeCV, typename ValueType = detail::uncvref_t<ValueTypeCV>,
+    template < typename ValueType,
                detail::enable_if_t <
-                   !detail::is_basic_json<ValueType>::value &&
-                   detail::has_from_json<basic_json_t, ValueType>::value &&
-                   !detail::has_non_default_from_json<basic_json_t, ValueType>::value,
+                   detail::is_default_constructible<ValueType>::value&&
+                   detail::has_from_json<basic_json_t, ValueType>::value,
                    int > = 0 >
-    ValueType get() const noexcept(noexcept(
-                                       JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), std::declval<ValueType&>())))
+    ValueType get_impl(detail::priority_tag<0> /*unused*/) const noexcept(noexcept(
+                JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), std::declval<ValueType&>())))
     {
-        // we cannot static_assert on ValueTypeCV being non-const, because
-        // there is support for get<const basic_json_t>(), which is why we
-        // still need the uncvref
-        static_assert(!std::is_reference<ValueTypeCV>::value,
-                      "get() cannot be used with reference types, you might want to use get_ref()");
-        static_assert(std::is_default_constructible<ValueType>::value,
-                      "types must be DefaultConstructible when used with get()");
-
-        ValueType ret;
+        auto ret = ValueType();
         JSONSerializer<ValueType>::from_json(*this, ret);
         return ret;
     }
@@ -19815,7 +20924,7 @@ class basic_json
 
     The function is equivalent to executing
     @code {.cpp}
-    return JSONSerializer<ValueTypeCV>::from_json(*this);
+    return JSONSerializer<ValueType>::from_json(*this);
     @endcode
 
     This overloads is chosen if:
@@ -19826,7 +20935,6 @@ class basic_json
     @note If @ref json_serializer<ValueType> has both overloads of
     `from_json()`, this one is chosen.
 
-    @tparam ValueTypeCV the provided value type
     @tparam ValueType the returned value type
 
     @return copy of the JSON value, converted to @a ValueType
@@ -19835,134 +20943,116 @@ class basic_json
 
     @since version 2.1.0
     */
-    template < typename ValueTypeCV, typename ValueType = detail::uncvref_t<ValueTypeCV>,
-               detail::enable_if_t < !std::is_same<basic_json_t, ValueType>::value &&
-                                     detail::has_non_default_from_json<basic_json_t, ValueType>::value,
-                                     int > = 0 >
-    ValueType get() const noexcept(noexcept(
-                                       JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>())))
+    template < typename ValueType,
+               detail::enable_if_t <
+                   detail::has_non_default_from_json<basic_json_t, ValueType>::value,
+                   int > = 0 >
+    ValueType get_impl(detail::priority_tag<1> /*unused*/) const noexcept(noexcept(
+                JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>())))
     {
-        static_assert(!std::is_reference<ValueTypeCV>::value,
-                      "get() cannot be used with reference types, you might want to use get_ref()");
         return JSONSerializer<ValueType>::from_json(*this);
     }
 
     /*!
-    @brief get a value (explicit)
-
-    Explicit type conversion between the JSON value and a compatible value.
-    The value is filled into the input parameter by calling the @ref json_serializer<ValueType>
-    `from_json()` method.
-
-    The function is equivalent to executing
-    @code {.cpp}
-    ValueType v;
-    JSONSerializer<ValueType>::from_json(*this, v);
-    @endcode
-
-    This overloads is chosen if:
-    - @a ValueType is not @ref basic_json,
-    - @ref json_serializer<ValueType> has a `from_json()` method of the form
-      `void from_json(const basic_json&, ValueType&)`, and
+    @brief get special-case overload
 
-    @tparam ValueType the input parameter type.
+    This overloads converts the current @ref basic_json in a different
+    @ref basic_json type
 
-    @return the input parameter, allowing chaining calls.
+    @tparam BasicJsonType == @ref basic_json
 
-    @throw what @ref json_serializer<ValueType> `from_json()` method throws
+    @return a copy of *this, converted into @a BasicJsonType
 
-    @liveexample{The example below shows several conversions from JSON values
-    to other types. There a few things to note: (1) Floating-point numbers can
-    be converted to integers\, (2) A JSON array can be converted to a standard
-    `std::vector<short>`\, (3) A JSON object can be converted to C++
-    associative containers such as `std::unordered_map<std::string\,
-    json>`.,get_to}
+    @complexity Depending on the implementation of the called `from_json()`
+                method.
 
-    @since version 3.3.0
+    @since version 3.2.0
     */
-    template < typename ValueType,
+    template < typename BasicJsonType,
                detail::enable_if_t <
-                   !detail::is_basic_json<ValueType>::value&&
-                   detail::has_from_json<basic_json_t, ValueType>::value,
+                   detail::is_basic_json<BasicJsonType>::value,
                    int > = 0 >
-    ValueType & get_to(ValueType& v) const noexcept(noexcept(
-                JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), v)))
+    BasicJsonType get_impl(detail::priority_tag<2> /*unused*/) const
     {
-        JSONSerializer<ValueType>::from_json(*this, v);
-        return v;
+        return *this;
     }
 
-    // specialization to allow to call get_to with a basic_json value
-    // see https://github.com/nlohmann/json/issues/2175
-    template<typename ValueType,
-             detail::enable_if_t <
-                 detail::is_basic_json<ValueType>::value,
+    /*!
+    @brief get special-case overload
+
+    This overloads avoids a lot of template boilerplate, it can be seen as the
+    identity method
+
+    @tparam BasicJsonType == @ref basic_json
+
+    @return a copy of *this
+
+    @complexity Constant.
+
+    @since version 2.1.0
+    */
+    template<typename BasicJsonType,
+             detail::enable_if_t<
+                 std::is_same<BasicJsonType, basic_json_t>::value,
                  int> = 0>
-    ValueType & get_to(ValueType& v) const
+    basic_json get_impl(detail::priority_tag<3> /*unused*/) const
     {
-        v = *this;
-        return v;
+        return *this;
     }
 
-    template <
-        typename T, std::size_t N,
-        typename Array = T (&)[N],
-        detail::enable_if_t <
-            detail::has_from_json<basic_json_t, Array>::value, int > = 0 >
-    Array get_to(T (&v)[N]) const
-    noexcept(noexcept(JSONSerializer<Array>::from_json(
-                          std::declval<const basic_json_t&>(), v)))
+    /*!
+    @brief get a pointer value (explicit)
+    @copydoc get()
+    */
+    template<typename PointerType,
+             detail::enable_if_t<
+                 std::is_pointer<PointerType>::value,
+                 int> = 0>
+    constexpr auto get_impl(detail::priority_tag<4> /*unused*/) const noexcept
+    -> decltype(std::declval<const basic_json_t&>().template get_ptr<PointerType>())
     {
-        JSONSerializer<Array>::from_json(*this, v);
-        return v;
+        // delegate the call to get_ptr
+        return get_ptr<PointerType>();
     }
 
-
+  public:
     /*!
-    @brief get a pointer value (implicit)
+    @brief get a (pointer) value (explicit)
 
-    Implicit pointer access to the internally stored JSON value. No copies are
-    made.
+    Performs explicit type conversion between the JSON value and a compatible value if required.
 
-    @warning Writing data to the pointee of the result yields an undefined
-    state.
+    - If the requested type is a pointer to the internally stored JSON value that pointer is returned.
+    No copies are made.
 
-    @tparam PointerType pointer type; must be a pointer to @ref array_t, @ref
-    object_t, @ref string_t, @ref boolean_t, @ref number_integer_t,
-    @ref number_unsigned_t, or @ref number_float_t. Enforced by a static
-    assertion.
+    - If the requested type is the current @ref basic_json, or a different @ref basic_json convertible
+    from the current @ref basic_json.
 
-    @return pointer to the internally stored JSON value if the requested
-    pointer type @a PointerType fits to the JSON value; `nullptr` otherwise
+    - Otherwise the value is converted by calling the @ref json_serializer<ValueType> `from_json()`
+    method.
 
-    @complexity Constant.
+    @tparam ValueTypeCV the provided value type
+    @tparam ValueType the returned value type
 
-    @liveexample{The example below shows how pointers to internal values of a
-    JSON value can be requested. Note that no type conversions are made and a
-    `nullptr` is returned if the value and the requested pointer type does not
-    match.,get_ptr}
+    @return copy of the JSON value, converted to @tparam ValueType if necessary
 
-    @since version 1.0.0
-    */
-    template<typename PointerType, typename std::enable_if<
-                 std::is_pointer<PointerType>::value, int>::type = 0>
-    auto get_ptr() noexcept -> decltype(std::declval<basic_json_t&>().get_impl_ptr(std::declval<PointerType>()))
-    {
-        // delegate the call to get_impl_ptr<>()
-        return get_impl_ptr(static_cast<PointerType>(nullptr));
-    }
+    @throw what @ref json_serializer<ValueType> `from_json()` method throws if conversion is required
 
-    /*!
-    @brief get a pointer value (implicit)
-    @copydoc get_ptr()
+    @since version 2.1.0
     */
-    template < typename PointerType, typename std::enable_if <
-                   std::is_pointer<PointerType>::value&&
-                   std::is_const<typename std::remove_pointer<PointerType>::type>::value, int >::type = 0 >
-    constexpr auto get_ptr() const noexcept -> decltype(std::declval<const basic_json_t&>().get_impl_ptr(std::declval<PointerType>()))
+    template < typename ValueTypeCV, typename ValueType = detail::uncvref_t<ValueTypeCV>>
+#if defined(JSON_HAS_CPP_14)
+    constexpr
+#endif
+    auto get() const noexcept(
+    noexcept(std::declval<const basic_json_t&>().template get_impl<ValueType>(detail::priority_tag<4> {})))
+    -> decltype(std::declval<const basic_json_t&>().template get_impl<ValueType>(detail::priority_tag<4> {}))
     {
-        // delegate the call to get_impl_ptr<>() const
-        return get_impl_ptr(static_cast<PointerType>(nullptr));
+        // we cannot static_assert on ValueTypeCV being non-const, because
+        // there is support for get<const basic_json_t>(), which is why we
+        // still need the uncvref
+        static_assert(!std::is_reference<ValueTypeCV>::value,
+                      "get() cannot be used with reference types, you might want to use get_ref()");
+        return get_impl<ValueType>(detail::priority_tag<4> {});
     }
 
     /*!
@@ -19988,7 +21078,7 @@ class basic_json
     `nullptr` is returned if the value and the requested pointer type does not
     match.,get__PointerType}
 
-    @sa @ref get_ptr() for explicit pointer-member access
+    @sa see @ref get_ptr() for explicit pointer-member access
 
     @since version 1.0.0
     */
@@ -20000,44 +21090,47 @@ class basic_json
         return get_ptr<PointerType>();
     }
 
-    /*!
-    @brief get a pointer value (explicit)
-    @copydoc get()
-    */
-    template<typename PointerType, typename std::enable_if<
-                 std::is_pointer<PointerType>::value, int>::type = 0>
-    constexpr auto get() const noexcept -> decltype(std::declval<const basic_json_t&>().template get_ptr<PointerType>())
+    /// @brief get a value (explicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/get_to/
+    template < typename ValueType,
+               detail::enable_if_t <
+                   !detail::is_basic_json<ValueType>::value&&
+                   detail::has_from_json<basic_json_t, ValueType>::value,
+                   int > = 0 >
+    ValueType & get_to(ValueType& v) const noexcept(noexcept(
+                JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), v)))
     {
-        // delegate the call to get_ptr
-        return get_ptr<PointerType>();
+        JSONSerializer<ValueType>::from_json(*this, v);
+        return v;
     }
 
-    /*!
-    @brief get a reference value (implicit)
-
-    Implicit reference access to the internally stored JSON value. No copies
-    are made.
-
-    @warning Writing data to the referee of the result yields an undefined
-    state.
-
-    @tparam ReferenceType reference type; must be a reference to @ref array_t,
-    @ref object_t, @ref string_t, @ref boolean_t, @ref number_integer_t, or
-    @ref number_float_t. Enforced by static assertion.
-
-    @return reference to the internally stored JSON value if the requested
-    reference type @a ReferenceType fits to the JSON value; throws
-    type_error.303 otherwise
-
-    @throw type_error.303 in case passed type @a ReferenceType is incompatible
-    with the stored JSON value; see example below
-
-    @complexity Constant.
+    // specialization to allow calling get_to with a basic_json value
+    // see https://github.com/nlohmann/json/issues/2175
+    template<typename ValueType,
+             detail::enable_if_t <
+                 detail::is_basic_json<ValueType>::value,
+                 int> = 0>
+    ValueType & get_to(ValueType& v) const
+    {
+        v = *this;
+        return v;
+    }
 
-    @liveexample{The example shows several calls to `get_ref()`.,get_ref}
+    template <
+        typename T, std::size_t N,
+        typename Array = T (&)[N], // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+        detail::enable_if_t <
+            detail::has_from_json<basic_json_t, Array>::value, int > = 0 >
+    Array get_to(T (&v)[N]) const // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+    noexcept(noexcept(JSONSerializer<Array>::from_json(
+                          std::declval<const basic_json_t&>(), v)))
+    {
+        JSONSerializer<Array>::from_json(*this, v);
+        return v;
+    }
 
-    @since version 1.1.0
-    */
+    /// @brief get a reference value (implicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/get_ref/
     template<typename ReferenceType, typename std::enable_if<
                  std::is_reference<ReferenceType>::value, int>::type = 0>
     ReferenceType get_ref()
@@ -20046,10 +21139,8 @@ class basic_json
         return get_ref_impl<ReferenceType>(*this);
     }
 
-    /*!
-    @brief get a reference value (implicit)
-    @copydoc get_ref()
-    */
+    /// @brief get a reference value (implicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/get_ref/
     template < typename ReferenceType, typename std::enable_if <
                    std::is_reference<ReferenceType>::value&&
                    std::is_const<typename std::remove_reference<ReferenceType>::type>::value, int >::type = 0 >
@@ -20089,47 +21180,46 @@ class basic_json
     @since version 1.0.0
     */
     template < typename ValueType, typename std::enable_if <
-                   !std::is_pointer<ValueType>::value&&
-                   !std::is_same<ValueType, detail::json_ref<basic_json>>::value&&
-                   !std::is_same<ValueType, typename string_t::value_type>::value&&
-                   !detail::is_basic_json<ValueType>::value
-                   && !std::is_same<ValueType, std::initializer_list<typename string_t::value_type>>::value
+                   detail::conjunction <
+                       detail::negation<std::is_pointer<ValueType>>,
+                       detail::negation<std::is_same<ValueType, std::nullptr_t>>,
+                       detail::negation<std::is_same<ValueType, detail::json_ref<basic_json>>>,
+                                        detail::negation<std::is_same<ValueType, typename string_t::value_type>>,
+                                        detail::negation<detail::is_basic_json<ValueType>>,
+                                        detail::negation<std::is_same<ValueType, std::initializer_list<typename string_t::value_type>>>,
 #if defined(JSON_HAS_CPP_17) && (defined(__GNUC__) || (defined(_MSC_VER) && _MSC_VER >= 1910 && _MSC_VER <= 1914))
-                   && !std::is_same<ValueType, typename std::string_view>::value
+                                                detail::negation<std::is_same<ValueType, std::string_view>>,
+#endif
+#if defined(JSON_HAS_CPP_17) && JSON_HAS_STATIC_RTTI
+                                                detail::negation<std::is_same<ValueType, std::any>>,
 #endif
-                   && detail::is_detected<detail::get_template_function, const basic_json_t&, ValueType>::value
-                   , int >::type = 0 >
-    JSON_EXPLICIT operator ValueType() const
+                                                detail::is_detected_lazy<detail::get_template_function, const basic_json_t&, ValueType>
+                                                >::value, int >::type = 0 >
+                                        JSON_EXPLICIT operator ValueType() const
     {
         // delegate the call to get<>() const
         return get<ValueType>();
     }
 
-    /*!
-    @return reference to the binary value
-
-    @throw type_error.302 if the value is not binary
-
-    @sa @ref is_binary() to check if the value is binary
-
-    @since version 3.8.0
-    */
+    /// @brief get a binary value
+    /// @sa https://json.nlohmann.me/api/basic_json/get_binary/
     binary_t& get_binary()
     {
         if (!is_binary())
         {
-            JSON_THROW(type_error::create(302, "type must be binary, but is " + std::string(type_name()), *this));
+            JSON_THROW(type_error::create(302, detail::concat("type must be binary, but is ", type_name()), this));
         }
 
         return *get_ptr<binary_t*>();
     }
 
-    /// @copydoc get_binary()
+    /// @brief get a binary value
+    /// @sa https://json.nlohmann.me/api/basic_json/get_binary/
     const binary_t& get_binary() const
     {
         if (!is_binary())
         {
-            JSON_THROW(type_error::create(302, "type must be binary, but is " + std::string(type_name()), *this));
+            JSON_THROW(type_error::create(302, detail::concat("type must be binary, but is ", type_name()), this));
         }
 
         return *get_ptr<const binary_t*>();
@@ -20137,7 +21227,6 @@ class basic_json
 
     /// @}
 
-
     ////////////////////
     // element access //
     ////////////////////
@@ -20146,32 +21235,8 @@ class basic_json
     /// Access to the JSON value.
     /// @{
 
-    /*!
-    @brief access specified array element with bounds checking
-
-    Returns a reference to the element at specified location @a idx, with
-    bounds checking.
-
-    @param[in] idx  index of the element to access
-
-    @return reference to the element at index @a idx
-
-    @throw type_error.304 if the JSON value is not an array; in this case,
-    calling `at` with an index makes no sense. See example below.
-    @throw out_of_range.401 if the index @a idx is out of range of the array;
-    that is, `idx >= size()`. See example below.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes in the JSON value.
-
-    @complexity Constant.
-
-    @since version 1.0.0
-
-    @liveexample{The example below shows how array elements can be read and
-    written using `at()`. It also demonstrates the different exceptions that
-    can be thrown.,at__size_type}
-    */
+    /// @brief access specified array element with bounds checking
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
     reference at(size_type idx)
     {
         // at only works for arrays
@@ -20179,46 +21244,22 @@ class basic_json
         {
             JSON_TRY
             {
-                return set_parent(m_value.array->at(idx));
+                return set_parent(m_data.m_value.array->at(idx));
             }
             JSON_CATCH (std::out_of_range&)
             {
                 // create better exception explanation
-                JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range", *this));
+                JSON_THROW(out_of_range::create(401, detail::concat("array index ", std::to_string(idx), " is out of range"), this));
             }
         }
         else
         {
-            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name()), *this));
+            JSON_THROW(type_error::create(304, detail::concat("cannot use at() with ", type_name()), this));
         }
     }
 
-    /*!
-    @brief access specified array element with bounds checking
-
-    Returns a const reference to the element at specified location @a idx,
-    with bounds checking.
-
-    @param[in] idx  index of the element to access
-
-    @return const reference to the element at index @a idx
-
-    @throw type_error.304 if the JSON value is not an array; in this case,
-    calling `at` with an index makes no sense. See example below.
-    @throw out_of_range.401 if the index @a idx is out of range of the array;
-    that is, `idx >= size()`. See example below.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes in the JSON value.
-
-    @complexity Constant.
-
-    @since version 1.0.0
-
-    @liveexample{The example below shows how array elements can be read using
-    `at()`. It also demonstrates the different exceptions that can be thrown.,
-    at__size_type_const}
-    */
+    /// @brief access specified array element with bounds checking
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
     const_reference at(size_type idx) const
     {
         // at only works for arrays
@@ -20226,154 +21267,105 @@ class basic_json
         {
             JSON_TRY
             {
-                return m_value.array->at(idx);
+                return m_data.m_value.array->at(idx);
             }
             JSON_CATCH (std::out_of_range&)
             {
                 // create better exception explanation
-                JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range", *this));
+                JSON_THROW(out_of_range::create(401, detail::concat("array index ", std::to_string(idx), " is out of range"), this));
             }
         }
         else
         {
-            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name()), *this));
+            JSON_THROW(type_error::create(304, detail::concat("cannot use at() with ", type_name()), this));
         }
     }
 
-    /*!
-    @brief access specified object element with bounds checking
-
-    Returns a reference to the element at with specified key @a key, with
-    bounds checking.
-
-    @param[in] key  key of the element to access
-
-    @return reference to the element at key @a key
-
-    @throw type_error.304 if the JSON value is not an object; in this case,
-    calling `at` with a key makes no sense. See example below.
-    @throw out_of_range.403 if the key @a key is is not stored in the object;
-    that is, `find(key) == end()`. See example below.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes in the JSON value.
-
-    @complexity Logarithmic in the size of the container.
-
-    @sa @ref operator[](const typename object_t::key_type&) for unchecked
-    access by reference
-    @sa @ref value() for access by value with a default value
-
-    @since version 1.0.0
-
-    @liveexample{The example below shows how object elements can be read and
-    written using `at()`. It also demonstrates the different exceptions that
-    can be thrown.,at__object_t_key_type}
-    */
+    /// @brief access specified object element with bounds checking
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
     reference at(const typename object_t::key_type& key)
     {
         // at only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
         {
-            JSON_TRY
-            {
-                return set_parent(m_value.object->at(key));
-            }
-            JSON_CATCH (std::out_of_range&)
-            {
-                // create better exception explanation
-                JSON_THROW(out_of_range::create(403, "key '" + key + "' not found", *this));
-            }
+            JSON_THROW(type_error::create(304, detail::concat("cannot use at() with ", type_name()), this));
         }
-        else
+
+        auto it = m_data.m_value.object->find(key);
+        if (it == m_data.m_value.object->end())
         {
-            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name()), *this));
+            JSON_THROW(out_of_range::create(403, detail::concat("key '", key, "' not found"), this));
         }
+        return set_parent(it->second);
     }
 
-    /*!
-    @brief access specified object element with bounds checking
-
-    Returns a const reference to the element at with specified key @a key,
-    with bounds checking.
-
-    @param[in] key  key of the element to access
-
-    @return const reference to the element at key @a key
-
-    @throw type_error.304 if the JSON value is not an object; in this case,
-    calling `at` with a key makes no sense. See example below.
-    @throw out_of_range.403 if the key @a key is is not stored in the object;
-    that is, `find(key) == end()`. See example below.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes in the JSON value.
-
-    @complexity Logarithmic in the size of the container.
-
-    @sa @ref operator[](const typename object_t::key_type&) for unchecked
-    access by reference
-    @sa @ref value() for access by value with a default value
+    /// @brief access specified object element with bounds checking
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
+    reference at(KeyType && key)
+    {
+        // at only works for objects
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(304, detail::concat("cannot use at() with ", type_name()), this));
+        }
 
-    @since version 1.0.0
+        auto it = m_data.m_value.object->find(std::forward<KeyType>(key));
+        if (it == m_data.m_value.object->end())
+        {
+            JSON_THROW(out_of_range::create(403, detail::concat("key '", string_t(std::forward<KeyType>(key)), "' not found"), this));
+        }
+        return set_parent(it->second);
+    }
 
-    @liveexample{The example below shows how object elements can be read using
-    `at()`. It also demonstrates the different exceptions that can be thrown.,
-    at__object_t_key_type_const}
-    */
+    /// @brief access specified object element with bounds checking
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
     const_reference at(const typename object_t::key_type& key) const
     {
         // at only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(304, detail::concat("cannot use at() with ", type_name()), this));
+        }
+
+        auto it = m_data.m_value.object->find(key);
+        if (it == m_data.m_value.object->end())
+        {
+            JSON_THROW(out_of_range::create(403, detail::concat("key '", key, "' not found"), this));
+        }
+        return it->second;
+    }
+
+    /// @brief access specified object element with bounds checking
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
+    const_reference at(KeyType && key) const
+    {
+        // at only works for objects
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
         {
-            JSON_TRY
-            {
-                return m_value.object->at(key);
-            }
-            JSON_CATCH (std::out_of_range&)
-            {
-                // create better exception explanation
-                JSON_THROW(out_of_range::create(403, "key '" + key + "' not found", *this));
-            }
+            JSON_THROW(type_error::create(304, detail::concat("cannot use at() with ", type_name()), this));
         }
-        else
+
+        auto it = m_data.m_value.object->find(std::forward<KeyType>(key));
+        if (it == m_data.m_value.object->end())
         {
-            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name()), *this));
+            JSON_THROW(out_of_range::create(403, detail::concat("key '", string_t(std::forward<KeyType>(key)), "' not found"), this));
         }
+        return it->second;
     }
 
-    /*!
-    @brief access specified array element
-
-    Returns a reference to the element at specified location @a idx.
-
-    @note If @a idx is beyond the range of the array (i.e., `idx >= size()`),
-    then the array is silently filled up with `null` values to make `idx` a
-    valid reference to the last stored element.
-
-    @param[in] idx  index of the element to access
-
-    @return reference to the element at index @a idx
-
-    @throw type_error.305 if the JSON value is not an array or null; in that
-    cases, using the [] operator with an index makes no sense.
-
-    @complexity Constant if @a idx is in the range of the array. Otherwise
-    linear in `idx - size()`.
-
-    @liveexample{The example below shows how array elements can be read and
-    written using `[]` operator. Note the addition of `null`
-    values.,operatorarray__size_type}
-
-    @since version 1.0.0
-    */
+    /// @brief access specified array element
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
     reference operator[](size_type idx)
     {
         // implicitly convert null value to an empty array
         if (is_null())
         {
-            m_type = value_t::array;
-            m_value.array = create<array_t>();
+            m_data.m_type = value_t::array;
+            m_data.m_value.array = create<array_t>();
             assert_invariant();
         }
 
@@ -20381,293 +21373,161 @@ class basic_json
         if (JSON_HEDLEY_LIKELY(is_array()))
         {
             // fill up array with null values if given idx is outside range
-            if (idx >= m_value.array->size())
+            if (idx >= m_data.m_value.array->size())
             {
 #if JSON_DIAGNOSTICS
-                // remember array size before resizing
-                const auto previous_size = m_value.array->size();
+                // remember array size & capacity before resizing
+                const auto old_size = m_data.m_value.array->size();
+                const auto old_capacity = m_data.m_value.array->capacity();
 #endif
-                m_value.array->resize(idx + 1);
+                m_data.m_value.array->resize(idx + 1);
 
 #if JSON_DIAGNOSTICS
-                // set parent for values added above
-                set_parents(begin() + static_cast<typename iterator::difference_type>(previous_size), static_cast<typename iterator::difference_type>(idx + 1 - previous_size));
+                if (JSON_HEDLEY_UNLIKELY(m_data.m_value.array->capacity() != old_capacity))
+                {
+                    // capacity has changed: update all parents
+                    set_parents();
+                }
+                else
+                {
+                    // set parent for values added above
+                    set_parents(begin() + static_cast<typename iterator::difference_type>(old_size), static_cast<typename iterator::difference_type>(idx + 1 - old_size));
+                }
 #endif
+                assert_invariant();
             }
 
-            return m_value.array->operator[](idx);
+            return m_data.m_value.array->operator[](idx);
         }
 
-        JSON_THROW(type_error::create(305, "cannot use operator[] with a numeric argument with " + std::string(type_name()), *this));
+        JSON_THROW(type_error::create(305, detail::concat("cannot use operator[] with a numeric argument with ", type_name()), this));
     }
 
-    /*!
-    @brief access specified array element
-
-    Returns a const reference to the element at specified location @a idx.
-
-    @param[in] idx  index of the element to access
-
-    @return const reference to the element at index @a idx
-
-    @throw type_error.305 if the JSON value is not an array; in that case,
-    using the [] operator with an index makes no sense.
-
-    @complexity Constant.
-
-    @liveexample{The example below shows how array elements can be read using
-    the `[]` operator.,operatorarray__size_type_const}
-
-    @since version 1.0.0
-    */
+    /// @brief access specified array element
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
     const_reference operator[](size_type idx) const
     {
         // const operator[] only works for arrays
         if (JSON_HEDLEY_LIKELY(is_array()))
         {
-            return m_value.array->operator[](idx);
+            return m_data.m_value.array->operator[](idx);
         }
 
-        JSON_THROW(type_error::create(305, "cannot use operator[] with a numeric argument with " + std::string(type_name()), *this));
+        JSON_THROW(type_error::create(305, detail::concat("cannot use operator[] with a numeric argument with ", type_name()), this));
     }
 
-    /*!
-    @brief access specified object element
-
-    Returns a reference to the element at with specified key @a key.
-
-    @note If @a key is not found in the object, then it is silently added to
-    the object and filled with a `null` value to make `key` a valid reference.
-    In case the value was `null` before, it is converted to an object.
-
-    @param[in] key  key of the element to access
-
-    @return reference to the element at key @a key
-
-    @throw type_error.305 if the JSON value is not an object or null; in that
-    cases, using the [] operator with a key makes no sense.
-
-    @complexity Logarithmic in the size of the container.
-
-    @liveexample{The example below shows how object elements can be read and
-    written using the `[]` operator.,operatorarray__key_type}
-
-    @sa @ref at(const typename object_t::key_type&) for access by reference
-    with range checking
-    @sa @ref value() for access by value with a default value
-
-    @since version 1.0.0
-    */
-    reference operator[](const typename object_t::key_type& key)
+    /// @brief access specified object element
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    reference operator[](typename object_t::key_type key)
     {
         // implicitly convert null value to an empty object
         if (is_null())
         {
-            m_type = value_t::object;
-            m_value.object = create<object_t>();
+            m_data.m_type = value_t::object;
+            m_data.m_value.object = create<object_t>();
             assert_invariant();
         }
 
         // operator[] only works for objects
         if (JSON_HEDLEY_LIKELY(is_object()))
         {
-            return set_parent(m_value.object->operator[](key));
+            auto result = m_data.m_value.object->emplace(std::move(key), nullptr);
+            return set_parent(result.first->second);
         }
 
-        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name()), *this));
+        JSON_THROW(type_error::create(305, detail::concat("cannot use operator[] with a string argument with ", type_name()), this));
     }
 
-    /*!
-    @brief read-only access specified object element
-
-    Returns a const reference to the element at with specified key @a key. No
-    bounds checking is performed.
-
-    @warning If the element with key @a key does not exist, the behavior is
-    undefined.
-
-    @param[in] key  key of the element to access
-
-    @return const reference to the element at key @a key
-
-    @pre The element with key @a key must exist. **This precondition is
-         enforced with an assertion.**
-
-    @throw type_error.305 if the JSON value is not an object; in that case,
-    using the [] operator with a key makes no sense.
-
-    @complexity Logarithmic in the size of the container.
-
-    @liveexample{The example below shows how object elements can be read using
-    the `[]` operator.,operatorarray__key_type_const}
-
-    @sa @ref at(const typename object_t::key_type&) for access by reference
-    with range checking
-    @sa @ref value() for access by value with a default value
-
-    @since version 1.0.0
-    */
+    /// @brief access specified object element
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
     const_reference operator[](const typename object_t::key_type& key) const
     {
         // const operator[] only works for objects
         if (JSON_HEDLEY_LIKELY(is_object()))
         {
-            JSON_ASSERT(m_value.object->find(key) != m_value.object->end());
-            return m_value.object->find(key)->second;
+            auto it = m_data.m_value.object->find(key);
+            JSON_ASSERT(it != m_data.m_value.object->end());
+            return it->second;
         }
 
-        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name()), *this));
+        JSON_THROW(type_error::create(305, detail::concat("cannot use operator[] with a string argument with ", type_name()), this));
     }
 
-    /*!
-    @brief access specified object element
-
-    Returns a reference to the element at with specified key @a key.
-
-    @note If @a key is not found in the object, then it is silently added to
-    the object and filled with a `null` value to make `key` a valid reference.
-    In case the value was `null` before, it is converted to an object.
-
-    @param[in] key  key of the element to access
-
-    @return reference to the element at key @a key
-
-    @throw type_error.305 if the JSON value is not an object or null; in that
-    cases, using the [] operator with a key makes no sense.
-
-    @complexity Logarithmic in the size of the container.
-
-    @liveexample{The example below shows how object elements can be read and
-    written using the `[]` operator.,operatorarray__key_type}
-
-    @sa @ref at(const typename object_t::key_type&) for access by reference
-    with range checking
-    @sa @ref value() for access by value with a default value
-
-    @since version 1.1.0
-    */
+    // these two functions resolve a (const) char * ambiguity affecting Clang and MSVC
+    // (they seemingly cannot be constrained to resolve the ambiguity)
     template<typename T>
-    JSON_HEDLEY_NON_NULL(2)
     reference operator[](T* key)
     {
-        // implicitly convert null to object
+        return operator[](typename object_t::key_type(key));
+    }
+
+    template<typename T>
+    const_reference operator[](T* key) const
+    {
+        return operator[](typename object_t::key_type(key));
+    }
+
+    /// @brief access specified object element
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int > = 0 >
+    reference operator[](KeyType && key)
+    {
+        // implicitly convert null value to an empty object
         if (is_null())
         {
-            m_type = value_t::object;
-            m_value = value_t::object;
+            m_data.m_type = value_t::object;
+            m_data.m_value.object = create<object_t>();
             assert_invariant();
         }
 
-        // at only works for objects
+        // operator[] only works for objects
         if (JSON_HEDLEY_LIKELY(is_object()))
         {
-            return set_parent(m_value.object->operator[](key));
+            auto result = m_data.m_value.object->emplace(std::forward<KeyType>(key), nullptr);
+            return set_parent(result.first->second);
         }
 
-        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name()), *this));
+        JSON_THROW(type_error::create(305, detail::concat("cannot use operator[] with a string argument with ", type_name()), this));
     }
 
-    /*!
-    @brief read-only access specified object element
-
-    Returns a const reference to the element at with specified key @a key. No
-    bounds checking is performed.
-
-    @warning If the element with key @a key does not exist, the behavior is
-    undefined.
-
-    @param[in] key  key of the element to access
-
-    @return const reference to the element at key @a key
-
-    @pre The element with key @a key must exist. **This precondition is
-         enforced with an assertion.**
-
-    @throw type_error.305 if the JSON value is not an object; in that case,
-    using the [] operator with a key makes no sense.
-
-    @complexity Logarithmic in the size of the container.
-
-    @liveexample{The example below shows how object elements can be read using
-    the `[]` operator.,operatorarray__key_type_const}
-
-    @sa @ref at(const typename object_t::key_type&) for access by reference
-    with range checking
-    @sa @ref value() for access by value with a default value
-
-    @since version 1.1.0
-    */
-    template<typename T>
-    JSON_HEDLEY_NON_NULL(2)
-    const_reference operator[](T* key) const
+    /// @brief access specified object element
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int > = 0 >
+    const_reference operator[](KeyType && key) const
     {
-        // at only works for objects
+        // const operator[] only works for objects
         if (JSON_HEDLEY_LIKELY(is_object()))
         {
-            JSON_ASSERT(m_value.object->find(key) != m_value.object->end());
-            return m_value.object->find(key)->second;
+            auto it = m_data.m_value.object->find(std::forward<KeyType>(key));
+            JSON_ASSERT(it != m_data.m_value.object->end());
+            return it->second;
         }
 
-        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name()), *this));
-    }
-
-    /*!
-    @brief access specified object element with default value
-
-    Returns either a copy of an object's element at the specified key @a key
-    or a given default value if no element with key @a key exists.
-
-    The function is basically equivalent to executing
-    @code {.cpp}
-    try {
-        return at(key);
-    } catch(out_of_range) {
-        return default_value;
+        JSON_THROW(type_error::create(305, detail::concat("cannot use operator[] with a string argument with ", type_name()), this));
     }
-    @endcode
-
-    @note Unlike @ref at(const typename object_t::key_type&), this function
-    does not throw if the given key @a key was not found.
-
-    @note Unlike @ref operator[](const typename object_t::key_type& key), this
-    function does not implicitly add an element to the position defined by @a
-    key. This function is furthermore also applicable to const objects.
-
-    @param[in] key  key of the element to access
-    @param[in] default_value  the value to return if @a key is not found
-
-    @tparam ValueType type compatible to JSON values, for instance `int` for
-    JSON integer numbers, `bool` for JSON booleans, or `std::vector` types for
-    JSON arrays. Note the type of the expected value at @a key and the default
-    value @a default_value must be compatible.
-
-    @return copy of the element at key @a key or @a default_value if @a key
-    is not found
-
-    @throw type_error.302 if @a default_value does not match the type of the
-    value at @a key
-    @throw type_error.306 if the JSON value is not an object; in that case,
-    using `value()` with a key makes no sense.
-
-    @complexity Logarithmic in the size of the container.
 
-    @liveexample{The example below shows how object elements can be queried
-    with a default value.,basic_json__value}
+  private:
+    template<typename KeyType>
+    using is_comparable_with_object_key = detail::is_comparable <
+        object_comparator_t, const typename object_t::key_type&, KeyType >;
 
-    @sa @ref at(const typename object_t::key_type&) for access by reference
-    with range checking
-    @sa @ref operator[](const typename object_t::key_type&) for unchecked
-    access by reference
+    template<typename ValueType>
+    using value_return_type = std::conditional <
+        detail::is_c_string_uncvref<ValueType>::value,
+        string_t, typename std::decay<ValueType>::type >;
 
-    @since version 1.0.0
-    */
-    // using std::is_convertible in a std::enable_if will fail when using explicit conversions
-    template < class ValueType, typename std::enable_if <
-                   detail::is_getable<basic_json_t, ValueType>::value
-                   && !std::is_same<value_t, ValueType>::value, int >::type = 0 >
+  public:
+    /// @brief access specified object element with default value
+    /// @sa https://json.nlohmann.me/api/basic_json/value/
+    template < class ValueType, detail::enable_if_t <
+                   !detail::is_transparent<object_comparator_t>::value
+                   && detail::is_getable<basic_json_t, ValueType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
     ValueType value(const typename object_t::key_type& key, const ValueType& default_value) const
     {
-        // at only works for objects
+        // value only works for objects
         if (JSON_HEDLEY_LIKELY(is_object()))
         {
             // if key is found, return value and given default value otherwise
@@ -20680,66 +21540,95 @@ class basic_json
             return default_value;
         }
 
-        JSON_THROW(type_error::create(306, "cannot use value() with " + std::string(type_name()), *this));
+        JSON_THROW(type_error::create(306, detail::concat("cannot use value() with ", type_name()), this));
     }
 
-    /*!
-    @brief overload for a default value of type const char*
-    @copydoc basic_json::value(const typename object_t::key_type&, const ValueType&) const
-    */
-    string_t value(const typename object_t::key_type& key, const char* default_value) const
+    /// @brief access specified object element with default value
+    /// @sa https://json.nlohmann.me/api/basic_json/value/
+    template < class ValueType, class ReturnType = typename value_return_type<ValueType>::type,
+               detail::enable_if_t <
+                   !detail::is_transparent<object_comparator_t>::value
+                   && detail::is_getable<basic_json_t, ReturnType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    ReturnType value(const typename object_t::key_type& key, ValueType && default_value) const
     {
-        return value(key, string_t(default_value));
-    }
-
-    /*!
-    @brief access specified object element via JSON Pointer with default value
+        // value only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            // if key is found, return value and given default value otherwise
+            const auto it = find(key);
+            if (it != end())
+            {
+                return it->template get<ReturnType>();
+            }
 
-    Returns either a copy of an object's element at the specified key @a key
-    or a given default value if no element with key @a key exists.
+            return std::forward<ValueType>(default_value);
+        }
 
-    The function is basically equivalent to executing
-    @code {.cpp}
-    try {
-        return at(ptr);
-    } catch(out_of_range) {
-        return default_value;
+        JSON_THROW(type_error::create(306, detail::concat("cannot use value() with ", type_name()), this));
     }
-    @endcode
-
-    @note Unlike @ref at(const json_pointer&), this function does not throw
-    if the given key @a key was not found.
-
-    @param[in] ptr  a JSON pointer to the element to access
-    @param[in] default_value  the value to return if @a ptr found no value
 
-    @tparam ValueType type compatible to JSON values, for instance `int` for
-    JSON integer numbers, `bool` for JSON booleans, or `std::vector` types for
-    JSON arrays. Note the type of the expected value at @a key and the default
-    value @a default_value must be compatible.
+    /// @brief access specified object element with default value
+    /// @sa https://json.nlohmann.me/api/basic_json/value/
+    template < class ValueType, class KeyType, detail::enable_if_t <
+                   detail::is_transparent<object_comparator_t>::value
+                   && !detail::is_json_pointer<KeyType>::value
+                   && is_comparable_with_object_key<KeyType>::value
+                   && detail::is_getable<basic_json_t, ValueType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    ValueType value(KeyType && key, const ValueType& default_value) const
+    {
+        // value only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            // if key is found, return value and given default value otherwise
+            const auto it = find(std::forward<KeyType>(key));
+            if (it != end())
+            {
+                return it->template get<ValueType>();
+            }
 
-    @return copy of the element at key @a key or @a default_value if @a key
-    is not found
+            return default_value;
+        }
 
-    @throw type_error.302 if @a default_value does not match the type of the
-    value at @a ptr
-    @throw type_error.306 if the JSON value is not an object; in that case,
-    using `value()` with a key makes no sense.
+        JSON_THROW(type_error::create(306, detail::concat("cannot use value() with ", type_name()), this));
+    }
 
-    @complexity Logarithmic in the size of the container.
+    /// @brief access specified object element via JSON Pointer with default value
+    /// @sa https://json.nlohmann.me/api/basic_json/value/
+    template < class ValueType, class KeyType, class ReturnType = typename value_return_type<ValueType>::type,
+               detail::enable_if_t <
+                   detail::is_transparent<object_comparator_t>::value
+                   && !detail::is_json_pointer<KeyType>::value
+                   && is_comparable_with_object_key<KeyType>::value
+                   && detail::is_getable<basic_json_t, ReturnType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    ReturnType value(KeyType && key, ValueType && default_value) const
+    {
+        // value only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            // if key is found, return value and given default value otherwise
+            const auto it = find(std::forward<KeyType>(key));
+            if (it != end())
+            {
+                return it->template get<ReturnType>();
+            }
 
-    @liveexample{The example below shows how object elements can be queried
-    with a default value.,basic_json__value_ptr}
+            return std::forward<ValueType>(default_value);
+        }
 
-    @sa @ref operator[](const json_pointer&) for unchecked access by reference
+        JSON_THROW(type_error::create(306, detail::concat("cannot use value() with ", type_name()), this));
+    }
 
-    @since version 2.0.2
-    */
-    template<class ValueType, typename std::enable_if<
-                 detail::is_getable<basic_json_t, ValueType>::value, int>::type = 0>
+    /// @brief access specified object element via JSON Pointer with default value
+    /// @sa https://json.nlohmann.me/api/basic_json/value/
+    template < class ValueType, detail::enable_if_t <
+                   detail::is_getable<basic_json_t, ValueType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
     ValueType value(const json_pointer& ptr, const ValueType& default_value) const
     {
-        // at only works for objects
+        // value only works for objects
         if (JSON_HEDLEY_LIKELY(is_object()))
         {
             // if pointer resolves a value, return it or use default value
@@ -20753,88 +21642,71 @@ class basic_json
             }
         }
 
-        JSON_THROW(type_error::create(306, "cannot use value() with " + std::string(type_name()), *this));
+        JSON_THROW(type_error::create(306, detail::concat("cannot use value() with ", type_name()), this));
     }
 
-    /*!
-    @brief overload for a default value of type const char*
-    @copydoc basic_json::value(const json_pointer&, ValueType) const
-    */
-    JSON_HEDLEY_NON_NULL(3)
-    string_t value(const json_pointer& ptr, const char* default_value) const
+    /// @brief access specified object element via JSON Pointer with default value
+    /// @sa https://json.nlohmann.me/api/basic_json/value/
+    template < class ValueType, class ReturnType = typename value_return_type<ValueType>::type,
+               detail::enable_if_t <
+                   detail::is_getable<basic_json_t, ReturnType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    ReturnType value(const json_pointer& ptr, ValueType && default_value) const
     {
-        return value(ptr, string_t(default_value));
-    }
-
-    /*!
-    @brief access the first element
-
-    Returns a reference to the first element in the container. For a JSON
-    container `c`, the expression `c.front()` is equivalent to `*c.begin()`.
-
-    @return In case of a structured type (array or object), a reference to the
-    first element is returned. In case of number, string, boolean, or binary
-    values, a reference to the value is returned.
-
-    @complexity Constant.
-
-    @pre The JSON value must not be `null` (would throw `std::out_of_range`)
-    or an empty array or object (undefined behavior, **guarded by
-    assertions**).
-    @post The JSON value remains unchanged.
+        // value only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            // if pointer resolves a value, return it or use default value
+            JSON_TRY
+            {
+                return ptr.get_checked(this).template get<ReturnType>();
+            }
+            JSON_INTERNAL_CATCH (out_of_range&)
+            {
+                return std::forward<ValueType>(default_value);
+            }
+        }
 
-    @throw invalid_iterator.214 when called on `null` value
+        JSON_THROW(type_error::create(306, detail::concat("cannot use value() with ", type_name()), this));
+    }
 
-    @liveexample{The following code shows an example for `front()`.,front}
+    template < class ValueType, class BasicJsonType, detail::enable_if_t <
+                   detail::is_basic_json<BasicJsonType>::value
+                   && detail::is_getable<basic_json_t, ValueType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
+    ValueType value(const ::nlohmann::json_pointer<BasicJsonType>& ptr, const ValueType& default_value) const
+    {
+        return value(ptr.convert(), default_value);
+    }
 
-    @sa @ref back() -- access the last element
+    template < class ValueType, class BasicJsonType, class ReturnType = typename value_return_type<ValueType>::type,
+               detail::enable_if_t <
+                   detail::is_basic_json<BasicJsonType>::value
+                   && detail::is_getable<basic_json_t, ReturnType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
+    ReturnType value(const ::nlohmann::json_pointer<BasicJsonType>& ptr, ValueType && default_value) const
+    {
+        return value(ptr.convert(), std::forward<ValueType>(default_value));
+    }
 
-    @since version 1.0.0
-    */
+    /// @brief access the first element
+    /// @sa https://json.nlohmann.me/api/basic_json/front/
     reference front()
     {
         return *begin();
     }
 
-    /*!
-    @copydoc basic_json::front()
-    */
+    /// @brief access the first element
+    /// @sa https://json.nlohmann.me/api/basic_json/front/
     const_reference front() const
     {
         return *cbegin();
     }
 
-    /*!
-    @brief access the last element
-
-    Returns a reference to the last element in the container. For a JSON
-    container `c`, the expression `c.back()` is equivalent to
-    @code {.cpp}
-    auto tmp = c.end();
-    --tmp;
-    return *tmp;
-    @endcode
-
-    @return In case of a structured type (array or object), a reference to the
-    last element is returned. In case of number, string, boolean, or binary
-    values, a reference to the value is returned.
-
-    @complexity Constant.
-
-    @pre The JSON value must not be `null` (would throw `std::out_of_range`)
-    or an empty array or object (undefined behavior, **guarded by
-    assertions**).
-    @post The JSON value remains unchanged.
-
-    @throw invalid_iterator.214 when called on a `null` value. See example
-    below.
-
-    @liveexample{The following code shows an example for `back()`.,back}
-
-    @sa @ref front() -- access the first element
-
-    @since version 1.0.0
-    */
+    /// @brief access the last element
+    /// @sa https://json.nlohmann.me/api/basic_json/back/
     reference back()
     {
         auto tmp = end();
@@ -20842,9 +21714,8 @@ class basic_json
         return *tmp;
     }
 
-    /*!
-    @copydoc basic_json::back()
-    */
+    /// @brief access the last element
+    /// @sa https://json.nlohmann.me/api/basic_json/back/
     const_reference back() const
     {
         auto tmp = cend();
@@ -20852,67 +21723,22 @@ class basic_json
         return *tmp;
     }
 
-    /*!
-    @brief remove element given an iterator
-
-    Removes the element specified by iterator @a pos. The iterator @a pos must
-    be valid and dereferenceable. Thus the `end()` iterator (which is valid,
-    but is not dereferenceable) cannot be used as a value for @a pos.
-
-    If called on a primitive type other than `null`, the resulting JSON value
-    will be `null`.
-
-    @param[in] pos iterator to the element to remove
-    @return Iterator following the last removed element. If the iterator @a
-    pos refers to the last element, the `end()` iterator is returned.
-
-    @tparam IteratorType an @ref iterator or @ref const_iterator
-
-    @post Invalidates iterators and references at or after the point of the
-    erase, including the `end()` iterator.
-
-    @throw type_error.307 if called on a `null` value; example: `"cannot use
-    erase() with null"`
-    @throw invalid_iterator.202 if called on an iterator which does not belong
-    to the current JSON value; example: `"iterator does not fit current
-    value"`
-    @throw invalid_iterator.205 if called on a primitive type with invalid
-    iterator (i.e., any iterator which is not `begin()`); example: `"iterator
-    out of range"`
-
-    @complexity The complexity depends on the type:
-    - objects: amortized constant
-    - arrays: linear in distance between @a pos and the end of the container
-    - strings and binary: linear in the length of the member
-    - other types: constant
-
-    @liveexample{The example shows the result of `erase()` for different JSON
-    types.,erase__IteratorType}
-
-    @sa @ref erase(IteratorType, IteratorType) -- removes the elements in
-    the given range
-    @sa @ref erase(const typename object_t::key_type&) -- removes the element
-    from an object at the given key
-    @sa @ref erase(const size_type) -- removes the element from an array at
-    the given index
-
-    @since version 1.0.0
-    */
-    template < class IteratorType, typename std::enable_if <
+    /// @brief remove element given an iterator
+    /// @sa https://json.nlohmann.me/api/basic_json/erase/
+    template < class IteratorType, detail::enable_if_t <
                    std::is_same<IteratorType, typename basic_json_t::iterator>::value ||
-                   std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int >::type
-               = 0 >
+                   std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int > = 0 >
     IteratorType erase(IteratorType pos)
     {
         // make sure iterator fits the current value
         if (JSON_HEDLEY_UNLIKELY(this != pos.m_object))
         {
-            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", *this));
+            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", this));
         }
 
         IteratorType result = end();
 
-        switch (m_type)
+        switch (m_data.m_type)
         {
             case value_t::boolean:
             case value_t::number_float:
@@ -20923,109 +21749,66 @@ class basic_json
             {
                 if (JSON_HEDLEY_UNLIKELY(!pos.m_it.primitive_iterator.is_begin()))
                 {
-                    JSON_THROW(invalid_iterator::create(205, "iterator out of range", *this));
+                    JSON_THROW(invalid_iterator::create(205, "iterator out of range", this));
                 }
 
                 if (is_string())
                 {
                     AllocatorType<string_t> alloc;
-                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.string);
-                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.string, 1);
-                    m_value.string = nullptr;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_data.m_value.string);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_data.m_value.string, 1);
+                    m_data.m_value.string = nullptr;
                 }
                 else if (is_binary())
                 {
                     AllocatorType<binary_t> alloc;
-                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.binary);
-                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.binary, 1);
-                    m_value.binary = nullptr;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_data.m_value.binary);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_data.m_value.binary, 1);
+                    m_data.m_value.binary = nullptr;
                 }
 
-                m_type = value_t::null;
+                m_data.m_type = value_t::null;
                 assert_invariant();
                 break;
             }
 
             case value_t::object:
             {
-                result.m_it.object_iterator = m_value.object->erase(pos.m_it.object_iterator);
+                result.m_it.object_iterator = m_data.m_value.object->erase(pos.m_it.object_iterator);
                 break;
             }
 
             case value_t::array:
             {
-                result.m_it.array_iterator = m_value.array->erase(pos.m_it.array_iterator);
+                result.m_it.array_iterator = m_data.m_value.array->erase(pos.m_it.array_iterator);
                 break;
             }
 
+            case value_t::null:
+            case value_t::discarded:
             default:
-                JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name()), *this));
+                JSON_THROW(type_error::create(307, detail::concat("cannot use erase() with ", type_name()), this));
         }
 
         return result;
     }
 
-    /*!
-    @brief remove elements given an iterator range
-
-    Removes the element specified by the range `[first; last)`. The iterator
-    @a first does not need to be dereferenceable if `first == last`: erasing
-    an empty range is a no-op.
-
-    If called on a primitive type other than `null`, the resulting JSON value
-    will be `null`.
-
-    @param[in] first iterator to the beginning of the range to remove
-    @param[in] last iterator past the end of the range to remove
-    @return Iterator following the last removed element. If the iterator @a
-    second refers to the last element, the `end()` iterator is returned.
-
-    @tparam IteratorType an @ref iterator or @ref const_iterator
-
-    @post Invalidates iterators and references at or after the point of the
-    erase, including the `end()` iterator.
-
-    @throw type_error.307 if called on a `null` value; example: `"cannot use
-    erase() with null"`
-    @throw invalid_iterator.203 if called on iterators which does not belong
-    to the current JSON value; example: `"iterators do not fit current value"`
-    @throw invalid_iterator.204 if called on a primitive type with invalid
-    iterators (i.e., if `first != begin()` and `last != end()`); example:
-    `"iterators out of range"`
-
-    @complexity The complexity depends on the type:
-    - objects: `log(size()) + std::distance(first, last)`
-    - arrays: linear in the distance between @a first and @a last, plus linear
-      in the distance between @a last and end of the container
-    - strings and binary: linear in the length of the member
-    - other types: constant
-
-    @liveexample{The example shows the result of `erase()` for different JSON
-    types.,erase__IteratorType_IteratorType}
-
-    @sa @ref erase(IteratorType) -- removes the element at a given position
-    @sa @ref erase(const typename object_t::key_type&) -- removes the element
-    from an object at the given key
-    @sa @ref erase(const size_type) -- removes the element from an array at
-    the given index
-
-    @since version 1.0.0
-    */
-    template < class IteratorType, typename std::enable_if <
+    /// @brief remove elements given an iterator range
+    /// @sa https://json.nlohmann.me/api/basic_json/erase/
+    template < class IteratorType, detail::enable_if_t <
                    std::is_same<IteratorType, typename basic_json_t::iterator>::value ||
-                   std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int >::type
-               = 0 >
+                   std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int > = 0 >
     IteratorType erase(IteratorType first, IteratorType last)
     {
         // make sure iterator fits the current value
         if (JSON_HEDLEY_UNLIKELY(this != first.m_object || this != last.m_object))
         {
-            JSON_THROW(invalid_iterator::create(203, "iterators do not fit current value", *this));
+            JSON_THROW(invalid_iterator::create(203, "iterators do not fit current value", this));
         }
 
         IteratorType result = end();
 
-        switch (m_type)
+        switch (m_data.m_type)
         {
             case value_t::boolean:
             case value_t::number_float:
@@ -21037,114 +21820,107 @@ class basic_json
                 if (JSON_HEDLEY_LIKELY(!first.m_it.primitive_iterator.is_begin()
                                        || !last.m_it.primitive_iterator.is_end()))
                 {
-                    JSON_THROW(invalid_iterator::create(204, "iterators out of range", *this));
+                    JSON_THROW(invalid_iterator::create(204, "iterators out of range", this));
                 }
 
                 if (is_string())
                 {
                     AllocatorType<string_t> alloc;
-                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.string);
-                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.string, 1);
-                    m_value.string = nullptr;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_data.m_value.string);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_data.m_value.string, 1);
+                    m_data.m_value.string = nullptr;
                 }
                 else if (is_binary())
                 {
                     AllocatorType<binary_t> alloc;
-                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.binary);
-                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.binary, 1);
-                    m_value.binary = nullptr;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_data.m_value.binary);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_data.m_value.binary, 1);
+                    m_data.m_value.binary = nullptr;
                 }
 
-                m_type = value_t::null;
+                m_data.m_type = value_t::null;
                 assert_invariant();
                 break;
             }
 
             case value_t::object:
             {
-                result.m_it.object_iterator = m_value.object->erase(first.m_it.object_iterator,
+                result.m_it.object_iterator = m_data.m_value.object->erase(first.m_it.object_iterator,
                                               last.m_it.object_iterator);
                 break;
             }
 
             case value_t::array:
             {
-                result.m_it.array_iterator = m_value.array->erase(first.m_it.array_iterator,
+                result.m_it.array_iterator = m_data.m_value.array->erase(first.m_it.array_iterator,
                                              last.m_it.array_iterator);
                 break;
             }
 
+            case value_t::null:
+            case value_t::discarded:
             default:
-                JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name()), *this));
+                JSON_THROW(type_error::create(307, detail::concat("cannot use erase() with ", type_name()), this));
         }
 
         return result;
-    }
-
-    /*!
-    @brief remove element from a JSON object given a key
-
-    Removes elements from a JSON object with the key value @a key.
-
-    @param[in] key value of the elements to remove
-
-    @return Number of elements removed. If @a ObjectType is the default
-    `std::map` type, the return value will always be `0` (@a key was not
-    found) or `1` (@a key was found).
-
-    @post References and iterators to the erased elements are invalidated.
-    Other references and iterators are not affected.
-
-    @throw type_error.307 when called on a type other than JSON object;
-    example: `"cannot use erase() with null"`
-
-    @complexity `log(size()) + count(key)`
-
-    @liveexample{The example shows the effect of `erase()`.,erase__key_type}
-
-    @sa @ref erase(IteratorType) -- removes the element at a given position
-    @sa @ref erase(IteratorType, IteratorType) -- removes the elements in
-    the given range
-    @sa @ref erase(const size_type) -- removes the element from an array at
-    the given index
+    }
 
-    @since version 1.0.0
-    */
-    size_type erase(const typename object_t::key_type& key)
+  private:
+    template < typename KeyType, detail::enable_if_t <
+                   detail::has_erase_with_key_type<basic_json_t, KeyType>::value, int > = 0 >
+    size_type erase_internal(KeyType && key)
     {
         // this erase only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
         {
-            return m_value.object->erase(key);
+            JSON_THROW(type_error::create(307, detail::concat("cannot use erase() with ", type_name()), this));
         }
 
-        JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name()), *this));
+        return m_data.m_value.object->erase(std::forward<KeyType>(key));
     }
 
-    /*!
-    @brief remove element from a JSON array given an index
-
-    Removes element from a JSON array at the index @a idx.
-
-    @param[in] idx index of the element to remove
+    template < typename KeyType, detail::enable_if_t <
+                   !detail::has_erase_with_key_type<basic_json_t, KeyType>::value, int > = 0 >
+    size_type erase_internal(KeyType && key)
+    {
+        // this erase only works for objects
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(307, detail::concat("cannot use erase() with ", type_name()), this));
+        }
 
-    @throw type_error.307 when called on a type other than JSON object;
-    example: `"cannot use erase() with null"`
-    @throw out_of_range.401 when `idx >= size()`; example: `"array index 17
-    is out of range"`
+        const auto it = m_data.m_value.object->find(std::forward<KeyType>(key));
+        if (it != m_data.m_value.object->end())
+        {
+            m_data.m_value.object->erase(it);
+            return 1;
+        }
+        return 0;
+    }
 
-    @complexity Linear in distance between @a idx and the end of the container.
+  public:
 
-    @liveexample{The example shows the effect of `erase()`.,erase__size_type}
+    /// @brief remove element from a JSON object given a key
+    /// @sa https://json.nlohmann.me/api/basic_json/erase/
+    size_type erase(const typename object_t::key_type& key)
+    {
+        // the indirection via erase_internal() is added to avoid making this
+        // function a template and thus de-rank it during overload resolution
+        return erase_internal(key);
+    }
 
-    @sa @ref erase(IteratorType) -- removes the element at a given position
-    @sa @ref erase(IteratorType, IteratorType) -- removes the elements in
-    the given range
-    @sa @ref erase(const typename object_t::key_type&) -- removes the element
-    from an object at the given key
+    /// @brief remove element from a JSON object given a key
+    /// @sa https://json.nlohmann.me/api/basic_json/erase/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
+    size_type erase(KeyType && key)
+    {
+        return erase_internal(std::forward<KeyType>(key));
+    }
 
-    @since version 1.0.0
-    */
+    /// @brief remove element from a JSON array given an index
+    /// @sa https://json.nlohmann.me/api/basic_json/erase/
     void erase(const size_type idx)
     {
         // this erase only works for arrays
@@ -21152,20 +21928,19 @@ class basic_json
         {
             if (JSON_HEDLEY_UNLIKELY(idx >= size()))
             {
-                JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range", *this));
+                JSON_THROW(out_of_range::create(401, detail::concat("array index ", std::to_string(idx), " is out of range"), this));
             }
 
-            m_value.array->erase(m_value.array->begin() + static_cast<difference_type>(idx));
+            m_data.m_value.array->erase(m_data.m_value.array->begin() + static_cast<difference_type>(idx));
         }
         else
         {
-            JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name()), *this));
+            JSON_THROW(type_error::create(307, detail::concat("cannot use erase() with ", type_name()), this));
         }
     }
 
     /// @}
 
-
     ////////////
     // lookup //
     ////////////
@@ -21173,153 +21948,115 @@ class basic_json
     /// @name lookup
     /// @{
 
-    /*!
-    @brief find an element in a JSON object
-
-    Finds an element in a JSON object with key equivalent to @a key. If the
-    element is not found or the JSON value is not an object, end() is
-    returned.
-
-    @note This method always returns @ref end() when executed on a JSON type
-          that is not an object.
-
-    @param[in] key key value of the element to search for.
-
-    @return Iterator to an element with key equivalent to @a key. If no such
-    element is found or the JSON value is not an object, past-the-end (see
-    @ref end()) iterator is returned.
-
-    @complexity Logarithmic in the size of the JSON object.
-
-    @liveexample{The example shows how `find()` is used.,find__key_type}
-
-    @sa @ref contains(KeyT&&) const -- checks whether a key exists
-
-    @since version 1.0.0
-    */
-    template<typename KeyT>
-    iterator find(KeyT&& key)
+    /// @brief find an element in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/find/
+    iterator find(const typename object_t::key_type& key)
     {
         auto result = end();
 
         if (is_object())
         {
-            result.m_it.object_iterator = m_value.object->find(std::forward<KeyT>(key));
+            result.m_it.object_iterator = m_data.m_value.object->find(key);
         }
 
         return result;
     }
 
-    /*!
-    @brief find an element in a JSON object
-    @copydoc find(KeyT&&)
-    */
-    template<typename KeyT>
-    const_iterator find(KeyT&& key) const
+    /// @brief find an element in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/find/
+    const_iterator find(const typename object_t::key_type& key) const
     {
         auto result = cend();
 
         if (is_object())
         {
-            result.m_it.object_iterator = m_value.object->find(std::forward<KeyT>(key));
+            result.m_it.object_iterator = m_data.m_value.object->find(key);
         }
 
         return result;
     }
 
-    /*!
-    @brief returns the number of occurrences of a key in a JSON object
-
-    Returns the number of elements with key @a key. If ObjectType is the
-    default `std::map` type, the return value will always be `0` (@a key was
-    not found) or `1` (@a key was found).
+    /// @brief find an element in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/find/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
+    iterator find(KeyType && key)
+    {
+        auto result = end();
 
-    @note This method always returns `0` when executed on a JSON type that is
-          not an object.
+        if (is_object())
+        {
+            result.m_it.object_iterator = m_data.m_value.object->find(std::forward<KeyType>(key));
+        }
 
-    @param[in] key key value of the element to count
+        return result;
+    }
 
-    @return Number of elements with key @a key. If the JSON value is not an
-    object, the return value will be `0`.
+    /// @brief find an element in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/find/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
+    const_iterator find(KeyType && key) const
+    {
+        auto result = cend();
 
-    @complexity Logarithmic in the size of the JSON object.
+        if (is_object())
+        {
+            result.m_it.object_iterator = m_data.m_value.object->find(std::forward<KeyType>(key));
+        }
 
-    @liveexample{The example shows how `count()` is used.,count}
+        return result;
+    }
 
-    @since version 1.0.0
-    */
-    template<typename KeyT>
-    size_type count(KeyT&& key) const
+    /// @brief returns the number of occurrences of a key in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/count/
+    size_type count(const typename object_t::key_type& key) const
     {
         // return 0 for all nonobject types
-        return is_object() ? m_value.object->count(std::forward<KeyT>(key)) : 0;
+        return is_object() ? m_data.m_value.object->count(key) : 0;
     }
 
-    /*!
-    @brief check the existence of an element in a JSON object
-
-    Check whether an element exists in a JSON object with key equivalent to
-    @a key. If the element is not found or the JSON value is not an object,
-    false is returned.
-
-    @note This method always returns false when executed on a JSON type
-          that is not an object.
-
-    @param[in] key key value to check its existence.
-
-    @return true if an element with specified @a key exists. If no such
-    element with such key is found or the JSON value is not an object,
-    false is returned.
-
-    @complexity Logarithmic in the size of the JSON object.
-
-    @liveexample{The following code shows an example for `contains()`.,contains}
-
-    @sa @ref find(KeyT&&) -- returns an iterator to an object element
-    @sa @ref contains(const json_pointer&) const -- checks the existence for a JSON pointer
-
-    @since version 3.6.0
-    */
-    template < typename KeyT, typename std::enable_if <
-                   !std::is_same<typename std::decay<KeyT>::type, json_pointer>::value, int >::type = 0 >
-    bool contains(KeyT && key) const
+    /// @brief returns the number of occurrences of a key in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/count/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
+    size_type count(KeyType && key) const
     {
-        return is_object() && m_value.object->find(std::forward<KeyT>(key)) != m_value.object->end();
+        // return 0 for all nonobject types
+        return is_object() ? m_data.m_value.object->count(std::forward<KeyType>(key)) : 0;
     }
 
-    /*!
-    @brief check the existence of an element in a JSON object given a JSON pointer
-
-    Check whether the given JSON pointer @a ptr can be resolved in the current
-    JSON value.
-
-    @note This method can be executed on any JSON value type.
-
-    @param[in] ptr JSON pointer to check its existence.
-
-    @return true if the JSON pointer can be resolved to a stored value, false
-    otherwise.
-
-    @post If `j.contains(ptr)` returns true, it is safe to call `j[ptr]`.
-
-    @throw parse_error.106   if an array index begins with '0'
-    @throw parse_error.109   if an array index was not a number
-
-    @complexity Logarithmic in the size of the JSON object.
-
-    @liveexample{The following code shows an example for `contains()`.,contains_json_pointer}
+    /// @brief check the existence of an element in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/contains/
+    bool contains(const typename object_t::key_type& key) const
+    {
+        return is_object() && m_data.m_value.object->find(key) != m_data.m_value.object->end();
+    }
 
-    @sa @ref contains(KeyT &&) const -- checks the existence of a key
+    /// @brief check the existence of an element in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/contains/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
+    bool contains(KeyType && key) const
+    {
+        return is_object() && m_data.m_value.object->find(std::forward<KeyType>(key)) != m_data.m_value.object->end();
+    }
 
-    @since version 3.7.0
-    */
+    /// @brief check the existence of an element in a JSON object given a JSON pointer
+    /// @sa https://json.nlohmann.me/api/basic_json/contains/
     bool contains(const json_pointer& ptr) const
     {
         return ptr.contains(this);
     }
 
-    /// @}
+    template<typename BasicJsonType, detail::enable_if_t<detail::is_basic_json<BasicJsonType>::value, int> = 0>
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
+    bool contains(const typename ::nlohmann::json_pointer<BasicJsonType>& ptr) const
+    {
+        return ptr.contains(this);
+    }
 
+    /// @}
 
     ///////////////
     // iterators //
@@ -21328,30 +22065,8 @@ class basic_json
     /// @name iterators
     /// @{
 
-    /*!
-    @brief returns an iterator to the first element
-
-    Returns an iterator to the first element.
-
-    @image html range-begin-end.svg "Illustration from cppreference.com"
-
-    @return iterator to the first element
-
-    @complexity Constant.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
-    requirements:
-    - The complexity is constant.
-
-    @liveexample{The following code shows an example for `begin()`.,begin}
-
-    @sa @ref cbegin() -- returns a const iterator to the beginning
-    @sa @ref end() -- returns an iterator to the end
-    @sa @ref cend() -- returns a const iterator to the end
-
-    @since version 1.0.0
-    */
+    /// @brief returns an iterator to the first element
+    /// @sa https://json.nlohmann.me/api/basic_json/begin/
     iterator begin() noexcept
     {
         iterator result(this);
@@ -21359,39 +22074,15 @@ class basic_json
         return result;
     }
 
-    /*!
-    @copydoc basic_json::cbegin()
-    */
+    /// @brief returns an iterator to the first element
+    /// @sa https://json.nlohmann.me/api/basic_json/begin/
     const_iterator begin() const noexcept
     {
         return cbegin();
     }
 
-    /*!
-    @brief returns a const iterator to the first element
-
-    Returns a const iterator to the first element.
-
-    @image html range-begin-end.svg "Illustration from cppreference.com"
-
-    @return const iterator to the first element
-
-    @complexity Constant.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of `const_cast<const basic_json&>(*this).begin()`.
-
-    @liveexample{The following code shows an example for `cbegin()`.,cbegin}
-
-    @sa @ref begin() -- returns an iterator to the beginning
-    @sa @ref end() -- returns an iterator to the end
-    @sa @ref cend() -- returns a const iterator to the end
-
-    @since version 1.0.0
-    */
+    /// @brief returns a const iterator to the first element
+    /// @sa https://json.nlohmann.me/api/basic_json/cbegin/
     const_iterator cbegin() const noexcept
     {
         const_iterator result(this);
@@ -21399,30 +22090,8 @@ class basic_json
         return result;
     }
 
-    /*!
-    @brief returns an iterator to one past the last element
-
-    Returns an iterator to one past the last element.
-
-    @image html range-begin-end.svg "Illustration from cppreference.com"
-
-    @return iterator one past the last element
-
-    @complexity Constant.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
-    requirements:
-    - The complexity is constant.
-
-    @liveexample{The following code shows an example for `end()`.,end}
-
-    @sa @ref cend() -- returns a const iterator to the end
-    @sa @ref begin() -- returns an iterator to the beginning
-    @sa @ref cbegin() -- returns a const iterator to the beginning
-
-    @since version 1.0.0
-    */
+    /// @brief returns an iterator to one past the last element
+    /// @sa https://json.nlohmann.me/api/basic_json/end/
     iterator end() noexcept
     {
         iterator result(this);
@@ -21430,39 +22099,15 @@ class basic_json
         return result;
     }
 
-    /*!
-    @copydoc basic_json::cend()
-    */
+    /// @brief returns an iterator to one past the last element
+    /// @sa https://json.nlohmann.me/api/basic_json/end/
     const_iterator end() const noexcept
     {
         return cend();
     }
 
-    /*!
-    @brief returns a const iterator to one past the last element
-
-    Returns a const iterator to one past the last element.
-
-    @image html range-begin-end.svg "Illustration from cppreference.com"
-
-    @return const iterator one past the last element
-
-    @complexity Constant.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of `const_cast<const basic_json&>(*this).end()`.
-
-    @liveexample{The following code shows an example for `cend()`.,cend}
-
-    @sa @ref end() -- returns an iterator to the end
-    @sa @ref begin() -- returns an iterator to the beginning
-    @sa @ref cbegin() -- returns a const iterator to the beginning
-
-    @since version 1.0.0
-    */
+    /// @brief returns an iterator to one past the last element
+    /// @sa https://json.nlohmann.me/api/basic_json/cend/
     const_iterator cend() const noexcept
     {
         const_iterator result(this);
@@ -21470,286 +22115,80 @@ class basic_json
         return result;
     }
 
-    /*!
-    @brief returns an iterator to the reverse-beginning
-
-    Returns an iterator to the reverse-beginning; that is, the last element.
-
-    @image html range-rbegin-rend.svg "Illustration from cppreference.com"
-
-    @complexity Constant.
-
-    @requirement This function helps `basic_json` satisfying the
-    [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of `reverse_iterator(end())`.
-
-    @liveexample{The following code shows an example for `rbegin()`.,rbegin}
-
-    @sa @ref crbegin() -- returns a const reverse iterator to the beginning
-    @sa @ref rend() -- returns a reverse iterator to the end
-    @sa @ref crend() -- returns a const reverse iterator to the end
-
-    @since version 1.0.0
-    */
+    /// @brief returns an iterator to the reverse-beginning
+    /// @sa https://json.nlohmann.me/api/basic_json/rbegin/
     reverse_iterator rbegin() noexcept
     {
         return reverse_iterator(end());
     }
 
-    /*!
-    @copydoc basic_json::crbegin()
-    */
+    /// @brief returns an iterator to the reverse-beginning
+    /// @sa https://json.nlohmann.me/api/basic_json/rbegin/
     const_reverse_iterator rbegin() const noexcept
     {
         return crbegin();
     }
 
-    /*!
-    @brief returns an iterator to the reverse-end
-
-    Returns an iterator to the reverse-end; that is, one before the first
-    element.
-
-    @image html range-rbegin-rend.svg "Illustration from cppreference.com"
-
-    @complexity Constant.
-
-    @requirement This function helps `basic_json` satisfying the
-    [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of `reverse_iterator(begin())`.
-
-    @liveexample{The following code shows an example for `rend()`.,rend}
-
-    @sa @ref crend() -- returns a const reverse iterator to the end
-    @sa @ref rbegin() -- returns a reverse iterator to the beginning
-    @sa @ref crbegin() -- returns a const reverse iterator to the beginning
-
-    @since version 1.0.0
-    */
-    reverse_iterator rend() noexcept
-    {
-        return reverse_iterator(begin());
-    }
-
-    /*!
-    @copydoc basic_json::crend()
-    */
-    const_reverse_iterator rend() const noexcept
-    {
-        return crend();
-    }
-
-    /*!
-    @brief returns a const reverse iterator to the last element
-
-    Returns a const iterator to the reverse-beginning; that is, the last
-    element.
-
-    @image html range-rbegin-rend.svg "Illustration from cppreference.com"
-
-    @complexity Constant.
-
-    @requirement This function helps `basic_json` satisfying the
-    [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of `const_cast<const basic_json&>(*this).rbegin()`.
-
-    @liveexample{The following code shows an example for `crbegin()`.,crbegin}
-
-    @sa @ref rbegin() -- returns a reverse iterator to the beginning
-    @sa @ref rend() -- returns a reverse iterator to the end
-    @sa @ref crend() -- returns a const reverse iterator to the end
-
-    @since version 1.0.0
-    */
-    const_reverse_iterator crbegin() const noexcept
-    {
-        return const_reverse_iterator(cend());
-    }
-
-    /*!
-    @brief returns a const reverse iterator to one before the first
-
-    Returns a const reverse iterator to the reverse-end; that is, one before
-    the first element.
-
-    @image html range-rbegin-rend.svg "Illustration from cppreference.com"
-
-    @complexity Constant.
-
-    @requirement This function helps `basic_json` satisfying the
-    [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of `const_cast<const basic_json&>(*this).rend()`.
-
-    @liveexample{The following code shows an example for `crend()`.,crend}
-
-    @sa @ref rend() -- returns a reverse iterator to the end
-    @sa @ref rbegin() -- returns a reverse iterator to the beginning
-    @sa @ref crbegin() -- returns a const reverse iterator to the beginning
-
-    @since version 1.0.0
-    */
-    const_reverse_iterator crend() const noexcept
-    {
-        return const_reverse_iterator(cbegin());
-    }
-
-  public:
-    /*!
-    @brief wrapper to access iterator member functions in range-based for
-
-    This function allows to access @ref iterator::key() and @ref
-    iterator::value() during range-based for loops. In these loops, a
-    reference to the JSON values is returned, so there is no access to the
-    underlying iterator.
-
-    For loop without iterator_wrapper:
-
-    @code{cpp}
-    for (auto it = j_object.begin(); it != j_object.end(); ++it)
-    {
-        std::cout << "key: " << it.key() << ", value:" << it.value() << '\n';
-    }
-    @endcode
-
-    Range-based for loop without iterator proxy:
-
-    @code{cpp}
-    for (auto it : j_object)
-    {
-        // "it" is of type json::reference and has no key() member
-        std::cout << "value: " << it << '\n';
-    }
-    @endcode
-
-    Range-based for loop with iterator proxy:
-
-    @code{cpp}
-    for (auto it : json::iterator_wrapper(j_object))
-    {
-        std::cout << "key: " << it.key() << ", value:" << it.value() << '\n';
-    }
-    @endcode
-
-    @note When iterating over an array, `key()` will return the index of the
-          element as string (see example).
-
-    @param[in] ref  reference to a JSON value
-    @return iteration proxy object wrapping @a ref with an interface to use in
-            range-based for loops
-
-    @liveexample{The following code shows how the wrapper is used,iterator_wrapper}
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes in the JSON value.
-
-    @complexity Constant.
-
-    @note The name of this function is not yet final and may change in the
-    future.
-
-    @deprecated This stream operator is deprecated and will be removed in
-                future 4.0.0 of the library. Please use @ref items() instead;
-                that is, replace `json::iterator_wrapper(j)` with `j.items()`.
-    */
-    JSON_HEDLEY_DEPRECATED_FOR(3.1.0, items())
-    static iteration_proxy<iterator> iterator_wrapper(reference ref) noexcept
-    {
-        return ref.items();
-    }
-
-    /*!
-    @copydoc iterator_wrapper(reference)
-    */
-    JSON_HEDLEY_DEPRECATED_FOR(3.1.0, items())
-    static iteration_proxy<const_iterator> iterator_wrapper(const_reference ref) noexcept
-    {
-        return ref.items();
-    }
-
-    /*!
-    @brief helper to access iterator member functions in range-based for
-
-    This function allows to access @ref iterator::key() and @ref
-    iterator::value() during range-based for loops. In these loops, a
-    reference to the JSON values is returned, so there is no access to the
-    underlying iterator.
-
-    For loop without `items()` function:
-
-    @code{cpp}
-    for (auto it = j_object.begin(); it != j_object.end(); ++it)
+    /// @brief returns an iterator to the reverse-end
+    /// @sa https://json.nlohmann.me/api/basic_json/rend/
+    reverse_iterator rend() noexcept
     {
-        std::cout << "key: " << it.key() << ", value:" << it.value() << '\n';
+        return reverse_iterator(begin());
     }
-    @endcode
-
-    Range-based for loop without `items()` function:
 
-    @code{cpp}
-    for (auto it : j_object)
+    /// @brief returns an iterator to the reverse-end
+    /// @sa https://json.nlohmann.me/api/basic_json/rend/
+    const_reverse_iterator rend() const noexcept
     {
-        // "it" is of type json::reference and has no key() member
-        std::cout << "value: " << it << '\n';
+        return crend();
     }
-    @endcode
-
-    Range-based for loop with `items()` function:
 
-    @code{cpp}
-    for (auto& el : j_object.items())
+    /// @brief returns a const reverse iterator to the last element
+    /// @sa https://json.nlohmann.me/api/basic_json/crbegin/
+    const_reverse_iterator crbegin() const noexcept
     {
-        std::cout << "key: " << el.key() << ", value:" << el.value() << '\n';
+        return const_reverse_iterator(cend());
     }
-    @endcode
-
-    The `items()` function also allows to use
-    [structured bindings](https://en.cppreference.com/w/cpp/language/structured_binding)
-    (C++17):
 
-    @code{cpp}
-    for (auto& [key, val] : j_object.items())
+    /// @brief returns a const reverse iterator to one before the first
+    /// @sa https://json.nlohmann.me/api/basic_json/crend/
+    const_reverse_iterator crend() const noexcept
     {
-        std::cout << "key: " << key << ", value:" << val << '\n';
+        return const_reverse_iterator(cbegin());
     }
-    @endcode
-
-    @note When iterating over an array, `key()` will return the index of the
-          element as string (see example). For primitive types (e.g., numbers),
-          `key()` returns an empty string.
 
-    @warning Using `items()` on temporary objects is dangerous. Make sure the
-             object's lifetime exeeds the iteration. See
-             <https://github.com/nlohmann/json/issues/2040> for more
-             information.
-
-    @return iteration proxy object wrapping @a ref with an interface to use in
-            range-based for loops
-
-    @liveexample{The following code shows how the function is used.,items}
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes in the JSON value.
+  public:
+    /// @brief wrapper to access iterator member functions in range-based for
+    /// @sa https://json.nlohmann.me/api/basic_json/items/
+    /// @deprecated This function is deprecated since 3.1.0 and will be removed in
+    ///             version 4.0.0 of the library. Please use @ref items() instead;
+    ///             that is, replace `json::iterator_wrapper(j)` with `j.items()`.
+    JSON_HEDLEY_DEPRECATED_FOR(3.1.0, items())
+    static iteration_proxy<iterator> iterator_wrapper(reference ref) noexcept
+    {
+        return ref.items();
+    }
 
-    @complexity Constant.
+    /// @brief wrapper to access iterator member functions in range-based for
+    /// @sa https://json.nlohmann.me/api/basic_json/items/
+    /// @deprecated This function is deprecated since 3.1.0 and will be removed in
+    ///         version 4.0.0 of the library. Please use @ref items() instead;
+    ///         that is, replace `json::iterator_wrapper(j)` with `j.items()`.
+    JSON_HEDLEY_DEPRECATED_FOR(3.1.0, items())
+    static iteration_proxy<const_iterator> iterator_wrapper(const_reference ref) noexcept
+    {
+        return ref.items();
+    }
 
-    @since version 3.1.0, structured bindings support since 3.5.0.
-    */
+    /// @brief helper to access iterator member functions in range-based for
+    /// @sa https://json.nlohmann.me/api/basic_json/items/
     iteration_proxy<iterator> items() noexcept
     {
         return iteration_proxy<iterator>(*this);
     }
 
-    /*!
-    @copydoc items()
-    */
+    /// @brief helper to access iterator member functions in range-based for
+    /// @sa https://json.nlohmann.me/api/basic_json/items/
     iteration_proxy<const_iterator> items() const noexcept
     {
         return iteration_proxy<const_iterator>(*this);
@@ -21757,7 +22196,6 @@ class basic_json
 
     /// @}
 
-
     //////////////
     // capacity //
     //////////////
@@ -21765,51 +22203,11 @@ class basic_json
     /// @name capacity
     /// @{
 
-    /*!
-    @brief checks whether the container is empty.
-
-    Checks if a JSON value has no elements (i.e. whether its @ref size is `0`).
-
-    @return The return value depends on the different types and is
-            defined as follows:
-            Value type  | return value
-            ----------- | -------------
-            null        | `true`
-            boolean     | `false`
-            string      | `false`
-            number      | `false`
-            binary      | `false`
-            object      | result of function `object_t::empty()`
-            array       | result of function `array_t::empty()`
-
-    @liveexample{The following code uses `empty()` to check if a JSON
-    object contains any elements.,empty}
-
-    @complexity Constant, as long as @ref array_t and @ref object_t satisfy
-    the Container concept; that is, their `empty()` functions have constant
-    complexity.
-
-    @iterators No changes.
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @note This function does not return whether a string stored as JSON value
-    is empty - it returns whether the JSON container itself is empty which is
-    false in the case of a string.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of `begin() == end()`.
-
-    @sa @ref size() -- returns the number of elements
-
-    @since version 1.0.0
-    */
+    /// @brief checks whether the container is empty.
+    /// @sa https://json.nlohmann.me/api/basic_json/empty/
     bool empty() const noexcept
     {
-        switch (m_type)
+        switch (m_data.m_type)
         {
             case value_t::null:
             {
@@ -21820,15 +22218,22 @@ class basic_json
             case value_t::array:
             {
                 // delegate call to array_t::empty()
-                return m_value.array->empty();
+                return m_data.m_value.array->empty();
             }
 
             case value_t::object:
             {
                 // delegate call to object_t::empty()
-                return m_value.object->empty();
+                return m_data.m_value.object->empty();
             }
 
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
             default:
             {
                 // all other types are nonempty
@@ -21837,52 +22242,11 @@ class basic_json
         }
     }
 
-    /*!
-    @brief returns the number of elements
-
-    Returns the number of elements in a JSON value.
-
-    @return The return value depends on the different types and is
-            defined as follows:
-            Value type  | return value
-            ----------- | -------------
-            null        | `0`
-            boolean     | `1`
-            string      | `1`
-            number      | `1`
-            binary      | `1`
-            object      | result of function object_t::size()
-            array       | result of function array_t::size()
-
-    @liveexample{The following code calls `size()` on the different value
-    types.,size}
-
-    @complexity Constant, as long as @ref array_t and @ref object_t satisfy
-    the Container concept; that is, their size() functions have constant
-    complexity.
-
-    @iterators No changes.
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @note This function does not return the length of a string stored as JSON
-    value - it returns the number of elements in the JSON value which is 1 in
-    the case of a string.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of `std::distance(begin(), end())`.
-
-    @sa @ref empty() -- checks whether the container is empty
-    @sa @ref max_size() -- returns the maximal number of elements
-
-    @since version 1.0.0
-    */
+    /// @brief returns the number of elements
+    /// @sa https://json.nlohmann.me/api/basic_json/size/
     size_type size() const noexcept
     {
-        switch (m_type)
+        switch (m_data.m_type)
         {
             case value_t::null:
             {
@@ -21893,15 +22257,22 @@ class basic_json
             case value_t::array:
             {
                 // delegate call to array_t::size()
-                return m_value.array->size();
+                return m_data.m_value.array->size();
             }
 
             case value_t::object:
             {
                 // delegate call to object_t::size()
-                return m_value.object->size();
+                return m_data.m_value.object->size();
             }
 
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
             default:
             {
                 // all other types have size 1
@@ -21910,63 +22281,32 @@ class basic_json
         }
     }
 
-    /*!
-    @brief returns the maximum possible number of elements
-
-    Returns the maximum number of elements a JSON value is able to hold due to
-    system or library implementation limitations, i.e. `std::distance(begin(),
-    end())` for the JSON value.
-
-    @return The return value depends on the different types and is
-            defined as follows:
-            Value type  | return value
-            ----------- | -------------
-            null        | `0` (same as `size()`)
-            boolean     | `1` (same as `size()`)
-            string      | `1` (same as `size()`)
-            number      | `1` (same as `size()`)
-            binary      | `1` (same as `size()`)
-            object      | result of function `object_t::max_size()`
-            array       | result of function `array_t::max_size()`
-
-    @liveexample{The following code calls `max_size()` on the different value
-    types. Note the output is implementation specific.,max_size}
-
-    @complexity Constant, as long as @ref array_t and @ref object_t satisfy
-    the Container concept; that is, their `max_size()` functions have constant
-    complexity.
-
-    @iterators No changes.
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of returning `b.size()` where `b` is the largest
-      possible JSON value.
-
-    @sa @ref size() -- returns the number of elements
-
-    @since version 1.0.0
-    */
+    /// @brief returns the maximum possible number of elements
+    /// @sa https://json.nlohmann.me/api/basic_json/max_size/
     size_type max_size() const noexcept
     {
-        switch (m_type)
+        switch (m_data.m_type)
         {
             case value_t::array:
             {
                 // delegate call to array_t::max_size()
-                return m_value.array->max_size();
+                return m_data.m_value.array->max_size();
             }
 
             case value_t::object:
             {
                 // delegate call to object_t::max_size()
-                return m_value.object->max_size();
+                return m_data.m_value.object->max_size();
             }
 
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
             default:
             {
                 // all other types have max_size() == size()
@@ -21977,7 +22317,6 @@ class basic_json
 
     /// @}
 
-
     ///////////////
     // modifiers //
     ///////////////
@@ -21985,263 +22324,165 @@ class basic_json
     /// @name modifiers
     /// @{
 
-    /*!
-    @brief clears the contents
-
-    Clears the content of a JSON value and resets it to the default value as
-    if @ref basic_json(value_t) would have been called with the current value
-    type from @ref type():
-
-    Value type  | initial value
-    ----------- | -------------
-    null        | `null`
-    boolean     | `false`
-    string      | `""`
-    number      | `0`
-    binary      | An empty byte vector
-    object      | `{}`
-    array       | `[]`
-
-    @post Has the same effect as calling
-    @code {.cpp}
-    *this = basic_json(type());
-    @endcode
-
-    @liveexample{The example below shows the effect of `clear()` to different
-    JSON types.,clear}
-
-    @complexity Linear in the size of the JSON value.
-
-    @iterators All iterators, pointers and references related to this container
-               are invalidated.
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @sa @ref basic_json(value_t) -- constructor that creates an object with the
-        same value than calling `clear()`
-
-    @since version 1.0.0
-    */
+    /// @brief clears the contents
+    /// @sa https://json.nlohmann.me/api/basic_json/clear/
     void clear() noexcept
     {
-        switch (m_type)
+        switch (m_data.m_type)
         {
             case value_t::number_integer:
             {
-                m_value.number_integer = 0;
+                m_data.m_value.number_integer = 0;
                 break;
             }
 
             case value_t::number_unsigned:
             {
-                m_value.number_unsigned = 0;
+                m_data.m_value.number_unsigned = 0;
                 break;
             }
 
             case value_t::number_float:
             {
-                m_value.number_float = 0.0;
+                m_data.m_value.number_float = 0.0;
                 break;
             }
 
             case value_t::boolean:
             {
-                m_value.boolean = false;
+                m_data.m_value.boolean = false;
                 break;
             }
 
             case value_t::string:
             {
-                m_value.string->clear();
+                m_data.m_value.string->clear();
                 break;
             }
 
             case value_t::binary:
             {
-                m_value.binary->clear();
+                m_data.m_value.binary->clear();
                 break;
             }
 
             case value_t::array:
             {
-                m_value.array->clear();
+                m_data.m_value.array->clear();
                 break;
             }
 
             case value_t::object:
             {
-                m_value.object->clear();
+                m_data.m_value.object->clear();
                 break;
             }
 
+            case value_t::null:
+            case value_t::discarded:
             default:
                 break;
         }
     }
 
-    /*!
-    @brief add an object to an array
-
-    Appends the given element @a val to the end of the JSON value. If the
-    function is called on a JSON null value, an empty array is created before
-    appending @a val.
-
-    @param[in] val the value to add to the JSON array
-
-    @throw type_error.308 when called on a type other than JSON array or
-    null; example: `"cannot use push_back() with number"`
-
-    @complexity Amortized constant.
-
-    @liveexample{The example shows how `push_back()` and `+=` can be used to
-    add elements to a JSON array. Note how the `null` value was silently
-    converted to a JSON array.,push_back}
-
-    @since version 1.0.0
-    */
+    /// @brief add an object to an array
+    /// @sa https://json.nlohmann.me/api/basic_json/push_back/
     void push_back(basic_json&& val)
     {
         // push_back only works for null objects or arrays
         if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_array())))
         {
-            JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name()), *this));
+            JSON_THROW(type_error::create(308, detail::concat("cannot use push_back() with ", type_name()), this));
         }
 
         // transform null object into an array
         if (is_null())
         {
-            m_type = value_t::array;
-            m_value = value_t::array;
+            m_data.m_type = value_t::array;
+            m_data.m_value = value_t::array;
             assert_invariant();
         }
 
         // add element to array (move semantics)
-        m_value.array->push_back(std::move(val));
-        set_parent(m_value.array->back());
-        // if val is moved from, basic_json move constructor marks it null so we do not call the destructor
+        const auto old_capacity = m_data.m_value.array->capacity();
+        m_data.m_value.array->push_back(std::move(val));
+        set_parent(m_data.m_value.array->back(), old_capacity);
+        // if val is moved from, basic_json move constructor marks it null, so we do not call the destructor
     }
 
-    /*!
-    @brief add an object to an array
-    @copydoc push_back(basic_json&&)
-    */
+    /// @brief add an object to an array
+    /// @sa https://json.nlohmann.me/api/basic_json/operator+=/
     reference operator+=(basic_json&& val)
     {
         push_back(std::move(val));
         return *this;
     }
 
-    /*!
-    @brief add an object to an array
-    @copydoc push_back(basic_json&&)
-    */
+    /// @brief add an object to an array
+    /// @sa https://json.nlohmann.me/api/basic_json/push_back/
     void push_back(const basic_json& val)
     {
         // push_back only works for null objects or arrays
         if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_array())))
         {
-            JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name()), *this));
+            JSON_THROW(type_error::create(308, detail::concat("cannot use push_back() with ", type_name()), this));
         }
 
         // transform null object into an array
         if (is_null())
         {
-            m_type = value_t::array;
-            m_value = value_t::array;
+            m_data.m_type = value_t::array;
+            m_data.m_value = value_t::array;
             assert_invariant();
         }
 
         // add element to array
-        m_value.array->push_back(val);
-        set_parent(m_value.array->back());
+        const auto old_capacity = m_data.m_value.array->capacity();
+        m_data.m_value.array->push_back(val);
+        set_parent(m_data.m_value.array->back(), old_capacity);
     }
 
-    /*!
-    @brief add an object to an array
-    @copydoc push_back(basic_json&&)
-    */
+    /// @brief add an object to an array
+    /// @sa https://json.nlohmann.me/api/basic_json/operator+=/
     reference operator+=(const basic_json& val)
     {
         push_back(val);
         return *this;
     }
 
-    /*!
-    @brief add an object to an object
-
-    Inserts the given element @a val to the JSON object. If the function is
-    called on a JSON null value, an empty object is created before inserting
-    @a val.
-
-    @param[in] val the value to add to the JSON object
-
-    @throw type_error.308 when called on a type other than JSON object or
-    null; example: `"cannot use push_back() with number"`
-
-    @complexity Logarithmic in the size of the container, O(log(`size()`)).
-
-    @liveexample{The example shows how `push_back()` and `+=` can be used to
-    add elements to a JSON object. Note how the `null` value was silently
-    converted to a JSON object.,push_back__object_t__value}
-
-    @since version 1.0.0
-    */
+    /// @brief add an object to an object
+    /// @sa https://json.nlohmann.me/api/basic_json/push_back/
     void push_back(const typename object_t::value_type& val)
     {
         // push_back only works for null objects or objects
         if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_object())))
         {
-            JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name()), *this));
+            JSON_THROW(type_error::create(308, detail::concat("cannot use push_back() with ", type_name()), this));
         }
 
         // transform null object into an object
         if (is_null())
         {
-            m_type = value_t::object;
-            m_value = value_t::object;
+            m_data.m_type = value_t::object;
+            m_data.m_value = value_t::object;
             assert_invariant();
         }
 
         // add element to object
-        auto res = m_value.object->insert(val);
+        auto res = m_data.m_value.object->insert(val);
         set_parent(res.first->second);
     }
 
-    /*!
-    @brief add an object to an object
-    @copydoc push_back(const typename object_t::value_type&)
-    */
+    /// @brief add an object to an object
+    /// @sa https://json.nlohmann.me/api/basic_json/operator+=/
     reference operator+=(const typename object_t::value_type& val)
     {
         push_back(val);
         return *this;
     }
 
-    /*!
-    @brief add an object to an object
-
-    This function allows to use `push_back` with an initializer list. In case
-
-    1. the current value is an object,
-    2. the initializer list @a init contains only two elements, and
-    3. the first element of @a init is a string,
-
-    @a init is converted into an object element and added using
-    @ref push_back(const typename object_t::value_type&). Otherwise, @a init
-    is converted to a JSON value and added using @ref push_back(basic_json&&).
-
-    @param[in] init  an initializer list
-
-    @complexity Linear in the size of the initializer list @a init.
-
-    @note This function is required to resolve an ambiguous overload error,
-          because pairs like `{"key", "value"}` can be both interpreted as
-          `object_t::value_type` or `std::initializer_list<basic_json>`, see
-          https://github.com/nlohmann/json/issues/235 for more information.
-
-    @liveexample{The example shows how initializer lists are treated as
-    objects when possible.,push_back__initializer_list}
-    */
+    /// @brief add an object to an object
+    /// @sa https://json.nlohmann.me/api/basic_json/push_back/
     void push_back(initializer_list_t init)
     {
         if (is_object() && init.size() == 2 && (*init.begin())->is_string())
@@ -22256,111 +22497,60 @@ class basic_json
         }
     }
 
-    /*!
-    @brief add an object to an object
-    @copydoc push_back(initializer_list_t)
-    */
+    /// @brief add an object to an object
+    /// @sa https://json.nlohmann.me/api/basic_json/operator+=/
     reference operator+=(initializer_list_t init)
     {
         push_back(init);
         return *this;
     }
 
-    /*!
-    @brief add an object to an array
-
-    Creates a JSON value from the passed parameters @a args to the end of the
-    JSON value. If the function is called on a JSON null value, an empty array
-    is created before appending the value created from @a args.
-
-    @param[in] args arguments to forward to a constructor of @ref basic_json
-    @tparam Args compatible types to create a @ref basic_json object
-
-    @return reference to the inserted element
-
-    @throw type_error.311 when called on a type other than JSON array or
-    null; example: `"cannot use emplace_back() with number"`
-
-    @complexity Amortized constant.
-
-    @liveexample{The example shows how `push_back()` can be used to add
-    elements to a JSON array. Note how the `null` value was silently converted
-    to a JSON array.,emplace_back}
-
-    @since version 2.0.8, returns reference since 3.7.0
-    */
+    /// @brief add an object to an array
+    /// @sa https://json.nlohmann.me/api/basic_json/emplace_back/
     template<class... Args>
     reference emplace_back(Args&& ... args)
     {
         // emplace_back only works for null objects or arrays
         if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_array())))
         {
-            JSON_THROW(type_error::create(311, "cannot use emplace_back() with " + std::string(type_name()), *this));
+            JSON_THROW(type_error::create(311, detail::concat("cannot use emplace_back() with ", type_name()), this));
         }
 
         // transform null object into an array
         if (is_null())
         {
-            m_type = value_t::array;
-            m_value = value_t::array;
+            m_data.m_type = value_t::array;
+            m_data.m_value = value_t::array;
             assert_invariant();
         }
 
         // add element to array (perfect forwarding)
-#ifdef JSON_HAS_CPP_17
-        return set_parent(m_value.array->emplace_back(std::forward<Args>(args)...));
-#else
-        m_value.array->emplace_back(std::forward<Args>(args)...);
-        return set_parent(m_value.array->back());
-#endif
+        const auto old_capacity = m_data.m_value.array->capacity();
+        m_data.m_value.array->emplace_back(std::forward<Args>(args)...);
+        return set_parent(m_data.m_value.array->back(), old_capacity);
     }
 
-    /*!
-    @brief add an object to an object if key does not exist
-
-    Inserts a new element into a JSON object constructed in-place with the
-    given @a args if there is no element with the key in the container. If the
-    function is called on a JSON null value, an empty object is created before
-    appending the value created from @a args.
-
-    @param[in] args arguments to forward to a constructor of @ref basic_json
-    @tparam Args compatible types to create a @ref basic_json object
-
-    @return a pair consisting of an iterator to the inserted element, or the
-            already-existing element if no insertion happened, and a bool
-            denoting whether the insertion took place.
-
-    @throw type_error.311 when called on a type other than JSON object or
-    null; example: `"cannot use emplace() with number"`
-
-    @complexity Logarithmic in the size of the container, O(log(`size()`)).
-
-    @liveexample{The example shows how `emplace()` can be used to add elements
-    to a JSON object. Note how the `null` value was silently converted to a
-    JSON object. Further note how no value is added if there was already one
-    value stored with the same key.,emplace}
-
-    @since version 2.0.8
-    */
+    /// @brief add an object to an object if key does not exist
+    /// @sa https://json.nlohmann.me/api/basic_json/emplace/
     template<class... Args>
     std::pair<iterator, bool> emplace(Args&& ... args)
     {
         // emplace only works for null objects or arrays
         if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_object())))
         {
-            JSON_THROW(type_error::create(311, "cannot use emplace() with " + std::string(type_name()), *this));
+            JSON_THROW(type_error::create(311, detail::concat("cannot use emplace() with ", type_name()), this));
         }
 
         // transform null object into an object
         if (is_null())
         {
-            m_type = value_t::object;
-            m_value = value_t::object;
+            m_data.m_type = value_t::object;
+            m_data.m_value = value_t::object;
             assert_invariant();
         }
 
         // add element to array (perfect forwarding)
-        auto res = m_value.object->emplace(std::forward<Args>(args)...);
+        auto res = m_data.m_value.object->emplace(std::forward<Args>(args)...);
         set_parent(res.first->second);
 
         // create result iterator and set iterator to the result of emplace
@@ -22378,41 +22568,22 @@ class basic_json
     iterator insert_iterator(const_iterator pos, Args&& ... args)
     {
         iterator result(this);
-        JSON_ASSERT(m_value.array != nullptr);
+        JSON_ASSERT(m_data.m_value.array != nullptr);
 
-        auto insert_pos = std::distance(m_value.array->begin(), pos.m_it.array_iterator);
-        m_value.array->insert(pos.m_it.array_iterator, std::forward<Args>(args)...);
-        result.m_it.array_iterator = m_value.array->begin() + insert_pos;
+        auto insert_pos = std::distance(m_data.m_value.array->begin(), pos.m_it.array_iterator);
+        m_data.m_value.array->insert(pos.m_it.array_iterator, std::forward<Args>(args)...);
+        result.m_it.array_iterator = m_data.m_value.array->begin() + insert_pos;
 
         // This could have been written as:
-        // result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, cnt, val);
+        // result.m_it.array_iterator = m_data.m_value.array->insert(pos.m_it.array_iterator, cnt, val);
         // but the return value of insert is missing in GCC 4.8, so it is written this way instead.
 
+        set_parents();
         return result;
     }
 
-    /*!
-    @brief inserts element
-
-    Inserts element @a val before iterator @a pos.
-
-    @param[in] pos iterator before which the content will be inserted; may be
-    the end() iterator
-    @param[in] val element to insert
-    @return iterator pointing to the inserted @a val.
-
-    @throw type_error.309 if called on JSON values other than arrays;
-    example: `"cannot use insert() with string"`
-    @throw invalid_iterator.202 if @a pos is not an iterator of *this;
-    example: `"iterator does not fit current value"`
-
-    @complexity Constant plus linear in the distance between @a pos and end of
-    the container.
-
-    @liveexample{The example shows how `insert()` is used.,insert}
-
-    @since version 1.0.0
-    */
+    /// @brief inserts element into array
+    /// @sa https://json.nlohmann.me/api/basic_json/insert/
     iterator insert(const_iterator pos, const basic_json& val)
     {
         // insert only works for arrays
@@ -22421,49 +22592,25 @@ class basic_json
             // check if iterator pos fits to this JSON value
             if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
             {
-                JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", *this));
+                JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", this));
             }
 
             // insert to array and return iterator
-            return set_parents(insert_iterator(pos, val), static_cast<typename iterator::difference_type>(1));
+            return insert_iterator(pos, val);
         }
 
-        JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name()), *this));
+        JSON_THROW(type_error::create(309, detail::concat("cannot use insert() with ", type_name()), this));
     }
 
-    /*!
-    @brief inserts element
-    @copydoc insert(const_iterator, const basic_json&)
-    */
+    /// @brief inserts element into array
+    /// @sa https://json.nlohmann.me/api/basic_json/insert/
     iterator insert(const_iterator pos, basic_json&& val)
     {
         return insert(pos, val);
     }
 
-    /*!
-    @brief inserts elements
-
-    Inserts @a cnt copies of @a val before iterator @a pos.
-
-    @param[in] pos iterator before which the content will be inserted; may be
-    the end() iterator
-    @param[in] cnt number of copies of @a val to insert
-    @param[in] val element to insert
-    @return iterator pointing to the first element inserted, or @a pos if
-    `cnt==0`
-
-    @throw type_error.309 if called on JSON values other than arrays; example:
-    `"cannot use insert() with string"`
-    @throw invalid_iterator.202 if @a pos is not an iterator of *this;
-    example: `"iterator does not fit current value"`
-
-    @complexity Linear in @a cnt plus linear in the distance between @a pos
-    and end of the container.
-
-    @liveexample{The example shows how `insert()` is used.,insert__count}
-
-    @since version 1.0.0
-    */
+    /// @brief inserts copies of element into array
+    /// @sa https://json.nlohmann.me/api/basic_json/insert/
     iterator insert(const_iterator pos, size_type cnt, const basic_json& val)
     {
         // insert only works for arrays
@@ -22472,476 +22619,257 @@ class basic_json
             // check if iterator pos fits to this JSON value
             if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
             {
-                JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", *this));
+                JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", this));
             }
 
             // insert to array and return iterator
-            return set_parents(insert_iterator(pos, cnt, val), static_cast<typename iterator::difference_type>(cnt));
+            return insert_iterator(pos, cnt, val);
         }
 
-        JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name()), *this));
+        JSON_THROW(type_error::create(309, detail::concat("cannot use insert() with ", type_name()), this));
     }
 
-    /*!
-    @brief inserts elements
-
-    Inserts elements from range `[first, last)` before iterator @a pos.
-
-    @param[in] pos iterator before which the content will be inserted; may be
-    the end() iterator
-    @param[in] first begin of the range of elements to insert
-    @param[in] last end of the range of elements to insert
-
-    @throw type_error.309 if called on JSON values other than arrays; example:
-    `"cannot use insert() with string"`
-    @throw invalid_iterator.202 if @a pos is not an iterator of *this;
-    example: `"iterator does not fit current value"`
-    @throw invalid_iterator.210 if @a first and @a last do not belong to the
-    same JSON value; example: `"iterators do not fit"`
-    @throw invalid_iterator.211 if @a first or @a last are iterators into
-    container for which insert is called; example: `"passed iterators may not
-    belong to container"`
-
-    @return iterator pointing to the first element inserted, or @a pos if
-    `first==last`
-
-    @complexity Linear in `std::distance(first, last)` plus linear in the
-    distance between @a pos and end of the container.
-
-    @liveexample{The example shows how `insert()` is used.,insert__range}
-
-    @since version 1.0.0
-    */
+    /// @brief inserts range of elements into array
+    /// @sa https://json.nlohmann.me/api/basic_json/insert/
     iterator insert(const_iterator pos, const_iterator first, const_iterator last)
     {
         // insert only works for arrays
         if (JSON_HEDLEY_UNLIKELY(!is_array()))
         {
-            JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name()), *this));
+            JSON_THROW(type_error::create(309, detail::concat("cannot use insert() with ", type_name()), this));
         }
 
         // check if iterator pos fits to this JSON value
         if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
         {
-            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", *this));
+            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", this));
         }
 
         // check if range iterators belong to the same JSON object
         if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
         {
-            JSON_THROW(invalid_iterator::create(210, "iterators do not fit", *this));
+            JSON_THROW(invalid_iterator::create(210, "iterators do not fit", this));
         }
 
         if (JSON_HEDLEY_UNLIKELY(first.m_object == this))
         {
-            JSON_THROW(invalid_iterator::create(211, "passed iterators may not belong to container", *this));
+            JSON_THROW(invalid_iterator::create(211, "passed iterators may not belong to container", this));
         }
 
         // insert to array and return iterator
-        return set_parents(insert_iterator(pos, first.m_it.array_iterator, last.m_it.array_iterator), std::distance(first, last));
+        return insert_iterator(pos, first.m_it.array_iterator, last.m_it.array_iterator);
     }
 
-    /*!
-    @brief inserts elements
-
-    Inserts elements from initializer list @a ilist before iterator @a pos.
-
-    @param[in] pos iterator before which the content will be inserted; may be
-    the end() iterator
-    @param[in] ilist initializer list to insert the values from
-
-    @throw type_error.309 if called on JSON values other than arrays; example:
-    `"cannot use insert() with string"`
-    @throw invalid_iterator.202 if @a pos is not an iterator of *this;
-    example: `"iterator does not fit current value"`
-
-    @return iterator pointing to the first element inserted, or @a pos if
-    `ilist` is empty
-
-    @complexity Linear in `ilist.size()` plus linear in the distance between
-    @a pos and end of the container.
-
-    @liveexample{The example shows how `insert()` is used.,insert__ilist}
-
-    @since version 1.0.0
-    */
+    /// @brief inserts elements from initializer list into array
+    /// @sa https://json.nlohmann.me/api/basic_json/insert/
     iterator insert(const_iterator pos, initializer_list_t ilist)
     {
         // insert only works for arrays
         if (JSON_HEDLEY_UNLIKELY(!is_array()))
         {
-            JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name()), *this));
+            JSON_THROW(type_error::create(309, detail::concat("cannot use insert() with ", type_name()), this));
         }
 
         // check if iterator pos fits to this JSON value
         if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
         {
-            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", *this));
-        }
-
-        // insert to array and return iterator
-        return set_parents(insert_iterator(pos, ilist.begin(), ilist.end()), static_cast<typename iterator::difference_type>(ilist.size()));
-    }
-
-    /*!
-    @brief inserts elements
-
-    Inserts elements from range `[first, last)`.
-
-    @param[in] first begin of the range of elements to insert
-    @param[in] last end of the range of elements to insert
-
-    @throw type_error.309 if called on JSON values other than objects; example:
-    `"cannot use insert() with string"`
-    @throw invalid_iterator.202 if iterator @a first or @a last does does not
-    point to an object; example: `"iterators first and last must point to
-    objects"`
-    @throw invalid_iterator.210 if @a first and @a last do not belong to the
-    same JSON value; example: `"iterators do not fit"`
-
-    @complexity Logarithmic: `O(N*log(size() + N))`, where `N` is the number
-    of elements to insert.
-
-    @liveexample{The example shows how `insert()` is used.,insert__range_object}
-
-    @since version 3.0.0
-    */
-    void insert(const_iterator first, const_iterator last)
-    {
-        // insert only works for objects
-        if (JSON_HEDLEY_UNLIKELY(!is_object()))
-        {
-            JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name()), *this));
-        }
-
-        // check if range iterators belong to the same JSON object
-        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
-        {
-            JSON_THROW(invalid_iterator::create(210, "iterators do not fit", *this));
-        }
-
-        // passed iterators must belong to objects
-        if (JSON_HEDLEY_UNLIKELY(!first.m_object->is_object()))
-        {
-            JSON_THROW(invalid_iterator::create(202, "iterators first and last must point to objects", *this));
-        }
-
-        m_value.object->insert(first.m_it.object_iterator, last.m_it.object_iterator);
-    }
-
-    /*!
-    @brief updates a JSON object from another object, overwriting existing keys
-
-    Inserts all values from JSON object @a j and overwrites existing keys.
-
-    @param[in] j  JSON object to read values from
-
-    @throw type_error.312 if called on JSON values other than objects; example:
-    `"cannot use update() with string"`
-
-    @complexity O(N*log(size() + N)), where N is the number of elements to
-                insert.
-
-    @liveexample{The example shows how `update()` is used.,update}
-
-    @sa https://docs.python.org/3.6/library/stdtypes.html#dict.update
-
-    @since version 3.0.0
-    */
-    void update(const_reference j)
-    {
-        // implicitly convert null value to an empty object
-        if (is_null())
-        {
-            m_type = value_t::object;
-            m_value.object = create<object_t>();
-            assert_invariant();
+            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", this));
         }
 
+        // insert to array and return iterator
+        return insert_iterator(pos, ilist.begin(), ilist.end());
+    }
+
+    /// @brief inserts range of elements into object
+    /// @sa https://json.nlohmann.me/api/basic_json/insert/
+    void insert(const_iterator first, const_iterator last)
+    {
+        // insert only works for objects
         if (JSON_HEDLEY_UNLIKELY(!is_object()))
         {
-            JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(type_name()), *this));
+            JSON_THROW(type_error::create(309, detail::concat("cannot use insert() with ", type_name()), this));
         }
-        if (JSON_HEDLEY_UNLIKELY(!j.is_object()))
+
+        // check if range iterators belong to the same JSON object
+        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
         {
-            JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(j.type_name()), *this));
+            JSON_THROW(invalid_iterator::create(210, "iterators do not fit", this));
         }
 
-        for (auto it = j.cbegin(); it != j.cend(); ++it)
+        // passed iterators must belong to objects
+        if (JSON_HEDLEY_UNLIKELY(!first.m_object->is_object()))
         {
-            m_value.object->operator[](it.key()) = it.value();
+            JSON_THROW(invalid_iterator::create(202, "iterators first and last must point to objects", this));
         }
-    }
-
-    /*!
-    @brief updates a JSON object from another object, overwriting existing keys
-
-    Inserts all values from from range `[first, last)` and overwrites existing
-    keys.
 
-    @param[in] first begin of the range of elements to insert
-    @param[in] last end of the range of elements to insert
-
-    @throw type_error.312 if called on JSON values other than objects; example:
-    `"cannot use update() with string"`
-    @throw invalid_iterator.202 if iterator @a first or @a last does does not
-    point to an object; example: `"iterators first and last must point to
-    objects"`
-    @throw invalid_iterator.210 if @a first and @a last do not belong to the
-    same JSON value; example: `"iterators do not fit"`
-
-    @complexity O(N*log(size() + N)), where N is the number of elements to
-                insert.
-
-    @liveexample{The example shows how `update()` is used__range.,update}
+        m_data.m_value.object->insert(first.m_it.object_iterator, last.m_it.object_iterator);
+    }
 
-    @sa https://docs.python.org/3.6/library/stdtypes.html#dict.update
+    /// @brief updates a JSON object from another object, overwriting existing keys
+    /// @sa https://json.nlohmann.me/api/basic_json/update/
+    void update(const_reference j, bool merge_objects = false)
+    {
+        update(j.begin(), j.end(), merge_objects);
+    }
 
-    @since version 3.0.0
-    */
-    void update(const_iterator first, const_iterator last)
+    /// @brief updates a JSON object from another object, overwriting existing keys
+    /// @sa https://json.nlohmann.me/api/basic_json/update/
+    void update(const_iterator first, const_iterator last, bool merge_objects = false)
     {
         // implicitly convert null value to an empty object
         if (is_null())
         {
-            m_type = value_t::object;
-            m_value.object = create<object_t>();
+            m_data.m_type = value_t::object;
+            m_data.m_value.object = create<object_t>();
             assert_invariant();
         }
 
         if (JSON_HEDLEY_UNLIKELY(!is_object()))
         {
-            JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(type_name()), *this));
+            JSON_THROW(type_error::create(312, detail::concat("cannot use update() with ", type_name()), this));
         }
 
         // check if range iterators belong to the same JSON object
         if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
         {
-            JSON_THROW(invalid_iterator::create(210, "iterators do not fit", *this));
+            JSON_THROW(invalid_iterator::create(210, "iterators do not fit", this));
         }
 
         // passed iterators must belong to objects
-        if (JSON_HEDLEY_UNLIKELY(!first.m_object->is_object()
-                                 || !last.m_object->is_object()))
+        if (JSON_HEDLEY_UNLIKELY(!first.m_object->is_object()))
         {
-            JSON_THROW(invalid_iterator::create(202, "iterators first and last must point to objects", *this));
+            JSON_THROW(type_error::create(312, detail::concat("cannot use update() with ", first.m_object->type_name()), first.m_object));
         }
 
         for (auto it = first; it != last; ++it)
         {
-            m_value.object->operator[](it.key()) = it.value();
+            if (merge_objects && it.value().is_object())
+            {
+                auto it2 = m_data.m_value.object->find(it.key());
+                if (it2 != m_data.m_value.object->end())
+                {
+                    it2->second.update(it.value(), true);
+                    continue;
+                }
+            }
+            m_data.m_value.object->operator[](it.key()) = it.value();
+#if JSON_DIAGNOSTICS
+            m_data.m_value.object->operator[](it.key()).m_parent = this;
+#endif
         }
     }
 
-    /*!
-    @brief exchanges the values
-
-    Exchanges the contents of the JSON value with those of @a other. Does not
-    invoke any move, copy, or swap operations on individual elements. All
-    iterators and references remain valid. The past-the-end iterator is
-    invalidated.
-
-    @param[in,out] other JSON value to exchange the contents with
-
-    @complexity Constant.
-
-    @liveexample{The example below shows how JSON values can be swapped with
-    `swap()`.,swap__reference}
-
-    @since version 1.0.0
-    */
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
     void swap(reference other) noexcept (
         std::is_nothrow_move_constructible<value_t>::value&&
         std::is_nothrow_move_assignable<value_t>::value&&
-        std::is_nothrow_move_constructible<json_value>::value&&
+        std::is_nothrow_move_constructible<json_value>::value&& // NOLINT(cppcoreguidelines-noexcept-swap,performance-noexcept-swap)
         std::is_nothrow_move_assignable<json_value>::value
     )
     {
-        std::swap(m_type, other.m_type);
-        std::swap(m_value, other.m_value);
+        std::swap(m_data.m_type, other.m_data.m_type);
+        std::swap(m_data.m_value, other.m_data.m_value);
 
         set_parents();
         other.set_parents();
         assert_invariant();
     }
 
-    /*!
-    @brief exchanges the values
-
-    Exchanges the contents of the JSON value from @a left with those of @a right. Does not
-    invoke any move, copy, or swap operations on individual elements. All
-    iterators and references remain valid. The past-the-end iterator is
-    invalidated. implemented as a friend function callable via ADL.
-
-    @param[in,out] left JSON value to exchange the contents with
-    @param[in,out] right JSON value to exchange the contents with
-
-    @complexity Constant.
-
-    @liveexample{The example below shows how JSON values can be swapped with
-    `swap()`.,swap__reference}
-
-    @since version 1.0.0
-    */
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
     friend void swap(reference left, reference right) noexcept (
         std::is_nothrow_move_constructible<value_t>::value&&
         std::is_nothrow_move_assignable<value_t>::value&&
-        std::is_nothrow_move_constructible<json_value>::value&&
+        std::is_nothrow_move_constructible<json_value>::value&& // NOLINT(cppcoreguidelines-noexcept-swap,performance-noexcept-swap)
         std::is_nothrow_move_assignable<json_value>::value
     )
     {
         left.swap(right);
     }
 
-    /*!
-    @brief exchanges the values
-
-    Exchanges the contents of a JSON array with those of @a other. Does not
-    invoke any move, copy, or swap operations on individual elements. All
-    iterators and references remain valid. The past-the-end iterator is
-    invalidated.
-
-    @param[in,out] other array to exchange the contents with
-
-    @throw type_error.310 when JSON value is not an array; example: `"cannot
-    use swap() with string"`
-
-    @complexity Constant.
-
-    @liveexample{The example below shows how arrays can be swapped with
-    `swap()`.,swap__array_t}
-
-    @since version 1.0.0
-    */
-    void swap(array_t& other)
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    void swap(array_t& other) // NOLINT(bugprone-exception-escape,cppcoreguidelines-noexcept-swap,performance-noexcept-swap)
     {
         // swap only works for arrays
         if (JSON_HEDLEY_LIKELY(is_array()))
         {
-            std::swap(*(m_value.array), other);
+            using std::swap;
+            swap(*(m_data.m_value.array), other);
         }
         else
         {
-            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name()), *this));
+            JSON_THROW(type_error::create(310, detail::concat("cannot use swap(array_t&) with ", type_name()), this));
         }
     }
 
-    /*!
-    @brief exchanges the values
-
-    Exchanges the contents of a JSON object with those of @a other. Does not
-    invoke any move, copy, or swap operations on individual elements. All
-    iterators and references remain valid. The past-the-end iterator is
-    invalidated.
-
-    @param[in,out] other object to exchange the contents with
-
-    @throw type_error.310 when JSON value is not an object; example:
-    `"cannot use swap() with string"`
-
-    @complexity Constant.
-
-    @liveexample{The example below shows how objects can be swapped with
-    `swap()`.,swap__object_t}
-
-    @since version 1.0.0
-    */
-    void swap(object_t& other)
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    void swap(object_t& other) // NOLINT(bugprone-exception-escape,cppcoreguidelines-noexcept-swap,performance-noexcept-swap)
     {
         // swap only works for objects
         if (JSON_HEDLEY_LIKELY(is_object()))
         {
-            std::swap(*(m_value.object), other);
+            using std::swap;
+            swap(*(m_data.m_value.object), other);
         }
         else
         {
-            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name()), *this));
+            JSON_THROW(type_error::create(310, detail::concat("cannot use swap(object_t&) with ", type_name()), this));
         }
     }
 
-    /*!
-    @brief exchanges the values
-
-    Exchanges the contents of a JSON string with those of @a other. Does not
-    invoke any move, copy, or swap operations on individual elements. All
-    iterators and references remain valid. The past-the-end iterator is
-    invalidated.
-
-    @param[in,out] other string to exchange the contents with
-
-    @throw type_error.310 when JSON value is not a string; example: `"cannot
-    use swap() with boolean"`
-
-    @complexity Constant.
-
-    @liveexample{The example below shows how strings can be swapped with
-    `swap()`.,swap__string_t}
-
-    @since version 1.0.0
-    */
-    void swap(string_t& other)
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    void swap(string_t& other) // NOLINT(bugprone-exception-escape,cppcoreguidelines-noexcept-swap,performance-noexcept-swap)
     {
         // swap only works for strings
         if (JSON_HEDLEY_LIKELY(is_string()))
         {
-            std::swap(*(m_value.string), other);
+            using std::swap;
+            swap(*(m_data.m_value.string), other);
         }
         else
         {
-            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name()), *this));
+            JSON_THROW(type_error::create(310, detail::concat("cannot use swap(string_t&) with ", type_name()), this));
         }
     }
 
-    /*!
-    @brief exchanges the values
-
-    Exchanges the contents of a JSON string with those of @a other. Does not
-    invoke any move, copy, or swap operations on individual elements. All
-    iterators and references remain valid. The past-the-end iterator is
-    invalidated.
-
-    @param[in,out] other binary to exchange the contents with
-
-    @throw type_error.310 when JSON value is not a string; example: `"cannot
-    use swap() with boolean"`
-
-    @complexity Constant.
-
-    @liveexample{The example below shows how strings can be swapped with
-    `swap()`.,swap__binary_t}
-
-    @since version 3.8.0
-    */
-    void swap(binary_t& other)
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    void swap(binary_t& other) // NOLINT(bugprone-exception-escape,cppcoreguidelines-noexcept-swap,performance-noexcept-swap)
     {
         // swap only works for strings
         if (JSON_HEDLEY_LIKELY(is_binary()))
         {
-            std::swap(*(m_value.binary), other);
+            using std::swap;
+            swap(*(m_data.m_value.binary), other);
         }
         else
         {
-            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name()), *this));
+            JSON_THROW(type_error::create(310, detail::concat("cannot use swap(binary_t&) with ", type_name()), this));
         }
     }
 
-    /// @copydoc swap(binary_t)
-    void swap(typename binary_t::container_type& other)
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    void swap(typename binary_t::container_type& other) // NOLINT(bugprone-exception-escape)
     {
         // swap only works for strings
         if (JSON_HEDLEY_LIKELY(is_binary()))
         {
-            std::swap(*(m_value.binary), other);
+            using std::swap;
+            swap(*(m_data.m_value.binary), other);
         }
         else
         {
-            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name()), *this));
+            JSON_THROW(type_error::create(310, detail::concat("cannot use swap(binary_t::container_type&) with ", type_name()), this));
         }
     }
 
     /// @}
 
-  public:
     //////////////////////////////////////////
     // lexicographical comparison operators //
     //////////////////////////////////////////
@@ -22949,454 +22877,391 @@ class basic_json
     /// @name lexicographical comparison operators
     /// @{
 
-    /*!
-    @brief comparison: equal
+    // note parentheses around operands are necessary; see
+    // https://github.com/nlohmann/json/issues/1530
+#define JSON_IMPLEMENT_OPERATOR(op, null_result, unordered_result, default_result)                       \
+    const auto lhs_type = lhs.type();                                                                    \
+    const auto rhs_type = rhs.type();                                                                    \
+    \
+    if (lhs_type == rhs_type) /* NOLINT(readability/braces) */                                           \
+    {                                                                                                    \
+        switch (lhs_type)                                                                                \
+        {                                                                                                \
+            case value_t::array:                                                                         \
+                return (*lhs.m_data.m_value.array) op (*rhs.m_data.m_value.array);                                     \
+                \
+            case value_t::object:                                                                        \
+                return (*lhs.m_data.m_value.object) op (*rhs.m_data.m_value.object);                                   \
+                \
+            case value_t::null:                                                                          \
+                return (null_result);                                                                    \
+                \
+            case value_t::string:                                                                        \
+                return (*lhs.m_data.m_value.string) op (*rhs.m_data.m_value.string);                                   \
+                \
+            case value_t::boolean:                                                                       \
+                return (lhs.m_data.m_value.boolean) op (rhs.m_data.m_value.boolean);                                   \
+                \
+            case value_t::number_integer:                                                                \
+                return (lhs.m_data.m_value.number_integer) op (rhs.m_data.m_value.number_integer);                     \
+                \
+            case value_t::number_unsigned:                                                               \
+                return (lhs.m_data.m_value.number_unsigned) op (rhs.m_data.m_value.number_unsigned);                   \
+                \
+            case value_t::number_float:                                                                  \
+                return (lhs.m_data.m_value.number_float) op (rhs.m_data.m_value.number_float);                         \
+                \
+            case value_t::binary:                                                                        \
+                return (*lhs.m_data.m_value.binary) op (*rhs.m_data.m_value.binary);                                   \
+                \
+            case value_t::discarded:                                                                     \
+            default:                                                                                     \
+                return (unordered_result);                                                               \
+        }                                                                                                \
+    }                                                                                                    \
+    else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_float)                   \
+    {                                                                                                    \
+        return static_cast<number_float_t>(lhs.m_data.m_value.number_integer) op rhs.m_data.m_value.number_float;      \
+    }                                                                                                    \
+    else if (lhs_type == value_t::number_float && rhs_type == value_t::number_integer)                   \
+    {                                                                                                    \
+        return lhs.m_data.m_value.number_float op static_cast<number_float_t>(rhs.m_data.m_value.number_integer);      \
+    }                                                                                                    \
+    else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_float)                  \
+    {                                                                                                    \
+        return static_cast<number_float_t>(lhs.m_data.m_value.number_unsigned) op rhs.m_data.m_value.number_float;     \
+    }                                                                                                    \
+    else if (lhs_type == value_t::number_float && rhs_type == value_t::number_unsigned)                  \
+    {                                                                                                    \
+        return lhs.m_data.m_value.number_float op static_cast<number_float_t>(rhs.m_data.m_value.number_unsigned);     \
+    }                                                                                                    \
+    else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_integer)                \
+    {                                                                                                    \
+        return static_cast<number_integer_t>(lhs.m_data.m_value.number_unsigned) op rhs.m_data.m_value.number_integer; \
+    }                                                                                                    \
+    else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_unsigned)                \
+    {                                                                                                    \
+        return lhs.m_data.m_value.number_integer op static_cast<number_integer_t>(rhs.m_data.m_value.number_unsigned); \
+    }                                                                                                    \
+    else if(compares_unordered(lhs, rhs))\
+    {\
+        return (unordered_result);\
+    }\
+    \
+    return (default_result);
 
-    Compares two JSON values for equality according to the following rules:
-    - Two JSON values are equal if (1) they are from the same type and (2)
-      their stored values are the same according to their respective
-      `operator==`.
-    - Integer and floating-point numbers are automatically converted before
-      comparison. Note that two NaN values are always treated as unequal.
-    - Two JSON null values are equal.
-
-    @note Floating-point inside JSON values numbers are compared with
-    `json::number_float_t::operator==` which is `double::operator==` by
-    default. To compare floating-point while respecting an epsilon, an alternative
-    [comparison function](https://github.com/mariokonrad/marnav/blob/master/include/marnav/math/floatingpoint.hpp#L34-#L39)
-    could be used, for instance
-    @code {.cpp}
-    template<typename T, typename = typename std::enable_if<std::is_floating_point<T>::value, T>::type>
-    inline bool is_same(T a, T b, T epsilon = std::numeric_limits<T>::epsilon()) noexcept
+  JSON_PRIVATE_UNLESS_TESTED:
+    // returns true if:
+    // - any operand is NaN and the other operand is of number type
+    // - any operand is discarded
+    // in legacy mode, discarded values are considered ordered if
+    // an operation is computed as an odd number of inverses of others
+    static bool compares_unordered(const_reference lhs, const_reference rhs, bool inverse = false) noexcept
     {
-        return std::abs(a - b) <= epsilon;
-    }
-    @endcode
-    Or you can self-defined operator equal function like this:
-    @code {.cpp}
-    bool my_equal(const_reference lhs, const_reference rhs) {
-    const auto lhs_type lhs.type();
-    const auto rhs_type rhs.type();
-    if (lhs_type == rhs_type) {
-        switch(lhs_type)
-            // self_defined case
-            case value_t::number_float:
-                return std::abs(lhs - rhs) <= std::numeric_limits<float>::epsilon();
-            // other cases remain the same with the original
-            ...
-    }
-    ...
+        if ((lhs.is_number_float() && std::isnan(lhs.m_data.m_value.number_float) && rhs.is_number())
+                || (rhs.is_number_float() && std::isnan(rhs.m_data.m_value.number_float) && lhs.is_number()))
+        {
+            return true;
+        }
+#if JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+        return (lhs.is_discarded() || rhs.is_discarded()) && !inverse;
+#else
+        static_cast<void>(inverse);
+        return lhs.is_discarded() || rhs.is_discarded();
+#endif
     }
-    @endcode
-
-    @note NaN values never compare equal to themselves or to other NaN values.
 
-    @param[in] lhs  first JSON value to consider
-    @param[in] rhs  second JSON value to consider
-    @return whether the values @a lhs and @a rhs are equal
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @complexity Linear.
+  private:
+    bool compares_unordered(const_reference rhs, bool inverse = false) const noexcept
+    {
+        return compares_unordered(*this, rhs, inverse);
+    }
 
-    @liveexample{The example demonstrates comparing several JSON
-    types.,operator__equal}
+  public:
+#if JSON_HAS_THREE_WAY_COMPARISON
+    /// @brief comparison: equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
+    bool operator==(const_reference rhs) const noexcept
+    {
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+        const_reference lhs = *this;
+        JSON_IMPLEMENT_OPERATOR( ==, true, false, false)
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+    }
 
-    @since version 1.0.0
-    */
-    friend bool operator==(const_reference lhs, const_reference rhs) noexcept
+    /// @brief comparison: equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
+    template<typename ScalarType>
+    requires std::is_scalar_v<ScalarType>
+    bool operator==(ScalarType rhs) const noexcept
     {
-        const auto lhs_type = lhs.type();
-        const auto rhs_type = rhs.type();
+        return *this == basic_json(rhs);
+    }
 
-        if (lhs_type == rhs_type)
+    /// @brief comparison: not equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ne/
+    bool operator!=(const_reference rhs) const noexcept
+    {
+        if (compares_unordered(rhs, true))
         {
-            switch (lhs_type)
-            {
-                case value_t::array:
-                    return *lhs.m_value.array == *rhs.m_value.array;
-
-                case value_t::object:
-                    return *lhs.m_value.object == *rhs.m_value.object;
-
-                case value_t::null:
-                    return true;
-
-                case value_t::string:
-                    return *lhs.m_value.string == *rhs.m_value.string;
-
-                case value_t::boolean:
-                    return lhs.m_value.boolean == rhs.m_value.boolean;
-
-                case value_t::number_integer:
-                    return lhs.m_value.number_integer == rhs.m_value.number_integer;
+            return false;
+        }
+        return !operator==(rhs);
+    }
 
-                case value_t::number_unsigned:
-                    return lhs.m_value.number_unsigned == rhs.m_value.number_unsigned;
+    /// @brief comparison: 3-way
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_spaceship/
+    std::partial_ordering operator<=>(const_reference rhs) const noexcept // *NOPAD*
+    {
+        const_reference lhs = *this;
+        // default_result is used if we cannot compare values. In that case,
+        // we compare types.
+        JSON_IMPLEMENT_OPERATOR(<=>, // *NOPAD*
+                                std::partial_ordering::equivalent,
+                                std::partial_ordering::unordered,
+                                lhs_type <=> rhs_type) // *NOPAD*
+    }
 
-                case value_t::number_float:
-                    return lhs.m_value.number_float == rhs.m_value.number_float;
+    /// @brief comparison: 3-way
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_spaceship/
+    template<typename ScalarType>
+    requires std::is_scalar_v<ScalarType>
+    std::partial_ordering operator<=>(ScalarType rhs) const noexcept // *NOPAD*
+    {
+        return *this <=> basic_json(rhs); // *NOPAD*
+    }
 
-                case value_t::binary:
-                    return *lhs.m_value.binary == *rhs.m_value.binary;
+#if JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+    // all operators that are computed as an odd number of inverses of others
+    // need to be overloaded to emulate the legacy comparison behavior
 
-                default:
-                    return false;
-            }
-        }
-        else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_float)
-        {
-            return static_cast<number_float_t>(lhs.m_value.number_integer) == rhs.m_value.number_float;
-        }
-        else if (lhs_type == value_t::number_float && rhs_type == value_t::number_integer)
-        {
-            return lhs.m_value.number_float == static_cast<number_float_t>(rhs.m_value.number_integer);
-        }
-        else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_float)
-        {
-            return static_cast<number_float_t>(lhs.m_value.number_unsigned) == rhs.m_value.number_float;
-        }
-        else if (lhs_type == value_t::number_float && rhs_type == value_t::number_unsigned)
-        {
-            return lhs.m_value.number_float == static_cast<number_float_t>(rhs.m_value.number_unsigned);
-        }
-        else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_integer)
-        {
-            return static_cast<number_integer_t>(lhs.m_value.number_unsigned) == rhs.m_value.number_integer;
-        }
-        else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_unsigned)
+    /// @brief comparison: less than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, undef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON)
+    bool operator<=(const_reference rhs) const noexcept
+    {
+        if (compares_unordered(rhs, true))
         {
-            return lhs.m_value.number_integer == static_cast<number_integer_t>(rhs.m_value.number_unsigned);
+            return false;
         }
-
-        return false;
+        return !(rhs < *this);
     }
 
-    /*!
-    @brief comparison: equal
-    @copydoc operator==(const_reference, const_reference)
-    */
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator==(const_reference lhs, const ScalarType rhs) noexcept
+    /// @brief comparison: less than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
+    template<typename ScalarType>
+    requires std::is_scalar_v<ScalarType>
+    bool operator<=(ScalarType rhs) const noexcept
     {
-        return lhs == basic_json(rhs);
+        return *this <= basic_json(rhs);
     }
 
-    /*!
-    @brief comparison: equal
-    @copydoc operator==(const_reference, const_reference)
-    */
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator==(const ScalarType lhs, const_reference rhs) noexcept
+    /// @brief comparison: greater than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, undef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON)
+    bool operator>=(const_reference rhs) const noexcept
     {
-        return basic_json(lhs) == rhs;
+        if (compares_unordered(rhs, true))
+        {
+            return false;
+        }
+        return !(*this < rhs);
     }
 
-    /*!
-    @brief comparison: not equal
-
-    Compares two JSON values for inequality by calculating `not (lhs == rhs)`.
-
-    @param[in] lhs  first JSON value to consider
-    @param[in] rhs  second JSON value to consider
-    @return whether the values @a lhs and @a rhs are not equal
-
-    @complexity Linear.
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @liveexample{The example demonstrates comparing several JSON
-    types.,operator__notequal}
-
-    @since version 1.0.0
-    */
-    friend bool operator!=(const_reference lhs, const_reference rhs) noexcept
+    /// @brief comparison: greater than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
+    template<typename ScalarType>
+    requires std::is_scalar_v<ScalarType>
+    bool operator>=(ScalarType rhs) const noexcept
     {
-        return !(lhs == rhs);
+        return *this >= basic_json(rhs);
     }
-
-    /*!
-    @brief comparison: not equal
-    @copydoc operator!=(const_reference, const_reference)
-    */
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator!=(const_reference lhs, const ScalarType rhs) noexcept
+#endif
+#else
+    /// @brief comparison: equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
+    friend bool operator==(const_reference lhs, const_reference rhs) noexcept
     {
-        return lhs != basic_json(rhs);
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+        JSON_IMPLEMENT_OPERATOR( ==, true, false, false)
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
     }
 
-    /*!
-    @brief comparison: not equal
-    @copydoc operator!=(const_reference, const_reference)
-    */
+    /// @brief comparison: equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
     template<typename ScalarType, typename std::enable_if<
                  std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator!=(const ScalarType lhs, const_reference rhs) noexcept
-    {
-        return basic_json(lhs) != rhs;
-    }
-
-    /*!
-    @brief comparison: less than
-
-    Compares whether one JSON value @a lhs is less than another JSON value @a
-    rhs according to the following rules:
-    - If @a lhs and @a rhs have the same type, the values are compared using
-      the default `<` operator.
-    - Integer and floating-point numbers are automatically converted before
-      comparison
-    - In case @a lhs and @a rhs have different types, the values are ignored
-      and the order of the types is considered, see
-      @ref operator<(const value_t, const value_t).
-
-    @param[in] lhs  first JSON value to consider
-    @param[in] rhs  second JSON value to consider
-    @return whether @a lhs is less than @a rhs
-
-    @complexity Linear.
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @liveexample{The example demonstrates comparing several JSON
-    types.,operator__less}
-
-    @since version 1.0.0
-    */
-    friend bool operator<(const_reference lhs, const_reference rhs) noexcept
+    friend bool operator==(const_reference lhs, ScalarType rhs) noexcept
     {
-        const auto lhs_type = lhs.type();
-        const auto rhs_type = rhs.type();
-
-        if (lhs_type == rhs_type)
-        {
-            switch (lhs_type)
-            {
-                case value_t::array:
-                    // note parentheses are necessary, see
-                    // https://github.com/nlohmann/json/issues/1530
-                    return (*lhs.m_value.array) < (*rhs.m_value.array);
-
-                case value_t::object:
-                    return (*lhs.m_value.object) < (*rhs.m_value.object);
-
-                case value_t::null:
-                    return false;
-
-                case value_t::string:
-                    return (*lhs.m_value.string) < (*rhs.m_value.string);
-
-                case value_t::boolean:
-                    return (lhs.m_value.boolean) < (rhs.m_value.boolean);
-
-                case value_t::number_integer:
-                    return (lhs.m_value.number_integer) < (rhs.m_value.number_integer);
-
-                case value_t::number_unsigned:
-                    return (lhs.m_value.number_unsigned) < (rhs.m_value.number_unsigned);
-
-                case value_t::number_float:
-                    return (lhs.m_value.number_float) < (rhs.m_value.number_float);
-
-                case value_t::binary:
-                    return (*lhs.m_value.binary) < (*rhs.m_value.binary);
-
-                default:
-                    return false;
-            }
-        }
-        else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_float)
-        {
-            return static_cast<number_float_t>(lhs.m_value.number_integer) < rhs.m_value.number_float;
-        }
-        else if (lhs_type == value_t::number_float && rhs_type == value_t::number_integer)
-        {
-            return lhs.m_value.number_float < static_cast<number_float_t>(rhs.m_value.number_integer);
-        }
-        else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_float)
-        {
-            return static_cast<number_float_t>(lhs.m_value.number_unsigned) < rhs.m_value.number_float;
-        }
-        else if (lhs_type == value_t::number_float && rhs_type == value_t::number_unsigned)
-        {
-            return lhs.m_value.number_float < static_cast<number_float_t>(rhs.m_value.number_unsigned);
-        }
-        else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_unsigned)
-        {
-            return lhs.m_value.number_integer < static_cast<number_integer_t>(rhs.m_value.number_unsigned);
-        }
-        else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_integer)
+        return lhs == basic_json(rhs);
+    }
+
+    /// @brief comparison: equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator==(ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) == rhs;
+    }
+
+    /// @brief comparison: not equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ne/
+    friend bool operator!=(const_reference lhs, const_reference rhs) noexcept
+    {
+        if (compares_unordered(lhs, rhs, true))
         {
-            return static_cast<number_integer_t>(lhs.m_value.number_unsigned) < rhs.m_value.number_integer;
+            return false;
         }
+        return !(lhs == rhs);
+    }
+
+    /// @brief comparison: not equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ne/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator!=(const_reference lhs, ScalarType rhs) noexcept
+    {
+        return lhs != basic_json(rhs);
+    }
+
+    /// @brief comparison: not equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ne/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator!=(ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) != rhs;
+    }
 
-        // We only reach this line if we cannot compare values. In that case,
+    /// @brief comparison: less than
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_lt/
+    friend bool operator<(const_reference lhs, const_reference rhs) noexcept
+    {
+        // default_result is used if we cannot compare values. In that case,
         // we compare types. Note we have to call the operator explicitly,
         // because MSVC has problems otherwise.
-        return operator<(lhs_type, rhs_type);
+        JSON_IMPLEMENT_OPERATOR( <, false, false, operator<(lhs_type, rhs_type))
     }
 
-    /*!
-    @brief comparison: less than
-    @copydoc operator<(const_reference, const_reference)
-    */
+    /// @brief comparison: less than
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_lt/
     template<typename ScalarType, typename std::enable_if<
                  std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator<(const_reference lhs, const ScalarType rhs) noexcept
+    friend bool operator<(const_reference lhs, ScalarType rhs) noexcept
     {
         return lhs < basic_json(rhs);
     }
 
-    /*!
-    @brief comparison: less than
-    @copydoc operator<(const_reference, const_reference)
-    */
+    /// @brief comparison: less than
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_lt/
     template<typename ScalarType, typename std::enable_if<
                  std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator<(const ScalarType lhs, const_reference rhs) noexcept
+    friend bool operator<(ScalarType lhs, const_reference rhs) noexcept
     {
         return basic_json(lhs) < rhs;
     }
 
-    /*!
-    @brief comparison: less than or equal
-
-    Compares whether one JSON value @a lhs is less than or equal to another
-    JSON value by calculating `not (rhs < lhs)`.
-
-    @param[in] lhs  first JSON value to consider
-    @param[in] rhs  second JSON value to consider
-    @return whether @a lhs is less than or equal to @a rhs
-
-    @complexity Linear.
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @liveexample{The example demonstrates comparing several JSON
-    types.,operator__greater}
-
-    @since version 1.0.0
-    */
+    /// @brief comparison: less than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
     friend bool operator<=(const_reference lhs, const_reference rhs) noexcept
     {
+        if (compares_unordered(lhs, rhs, true))
+        {
+            return false;
+        }
         return !(rhs < lhs);
     }
 
-    /*!
-    @brief comparison: less than or equal
-    @copydoc operator<=(const_reference, const_reference)
-    */
+    /// @brief comparison: less than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
     template<typename ScalarType, typename std::enable_if<
                  std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator<=(const_reference lhs, const ScalarType rhs) noexcept
+    friend bool operator<=(const_reference lhs, ScalarType rhs) noexcept
     {
         return lhs <= basic_json(rhs);
     }
 
-    /*!
-    @brief comparison: less than or equal
-    @copydoc operator<=(const_reference, const_reference)
-    */
+    /// @brief comparison: less than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
     template<typename ScalarType, typename std::enable_if<
                  std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator<=(const ScalarType lhs, const_reference rhs) noexcept
+    friend bool operator<=(ScalarType lhs, const_reference rhs) noexcept
     {
         return basic_json(lhs) <= rhs;
     }
 
-    /*!
-    @brief comparison: greater than
-
-    Compares whether one JSON value @a lhs is greater than another
-    JSON value by calculating `not (lhs <= rhs)`.
-
-    @param[in] lhs  first JSON value to consider
-    @param[in] rhs  second JSON value to consider
-    @return whether @a lhs is greater than to @a rhs
-
-    @complexity Linear.
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @liveexample{The example demonstrates comparing several JSON
-    types.,operator__lessequal}
-
-    @since version 1.0.0
-    */
+    /// @brief comparison: greater than
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_gt/
     friend bool operator>(const_reference lhs, const_reference rhs) noexcept
     {
+        // double inverse
+        if (compares_unordered(lhs, rhs))
+        {
+            return false;
+        }
         return !(lhs <= rhs);
     }
 
-    /*!
-    @brief comparison: greater than
-    @copydoc operator>(const_reference, const_reference)
-    */
+    /// @brief comparison: greater than
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_gt/
     template<typename ScalarType, typename std::enable_if<
                  std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator>(const_reference lhs, const ScalarType rhs) noexcept
+    friend bool operator>(const_reference lhs, ScalarType rhs) noexcept
     {
         return lhs > basic_json(rhs);
     }
 
-    /*!
-    @brief comparison: greater than
-    @copydoc operator>(const_reference, const_reference)
-    */
+    /// @brief comparison: greater than
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_gt/
     template<typename ScalarType, typename std::enable_if<
                  std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator>(const ScalarType lhs, const_reference rhs) noexcept
+    friend bool operator>(ScalarType lhs, const_reference rhs) noexcept
     {
         return basic_json(lhs) > rhs;
     }
 
-    /*!
-    @brief comparison: greater than or equal
-
-    Compares whether one JSON value @a lhs is greater than or equal to another
-    JSON value by calculating `not (lhs < rhs)`.
-
-    @param[in] lhs  first JSON value to consider
-    @param[in] rhs  second JSON value to consider
-    @return whether @a lhs is greater than or equal to @a rhs
-
-    @complexity Linear.
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @liveexample{The example demonstrates comparing several JSON
-    types.,operator__greaterequal}
-
-    @since version 1.0.0
-    */
+    /// @brief comparison: greater than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
     friend bool operator>=(const_reference lhs, const_reference rhs) noexcept
     {
+        if (compares_unordered(lhs, rhs, true))
+        {
+            return false;
+        }
         return !(lhs < rhs);
     }
 
-    /*!
-    @brief comparison: greater than or equal
-    @copydoc operator>=(const_reference, const_reference)
-    */
+    /// @brief comparison: greater than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
     template<typename ScalarType, typename std::enable_if<
                  std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator>=(const_reference lhs, const ScalarType rhs) noexcept
+    friend bool operator>=(const_reference lhs, ScalarType rhs) noexcept
     {
         return lhs >= basic_json(rhs);
     }
 
-    /*!
-    @brief comparison: greater than or equal
-    @copydoc operator>=(const_reference, const_reference)
-    */
+    /// @brief comparison: greater than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
     template<typename ScalarType, typename std::enable_if<
                  std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator>=(const ScalarType lhs, const_reference rhs) noexcept
+    friend bool operator>=(ScalarType lhs, const_reference rhs) noexcept
     {
         return basic_json(lhs) >= rhs;
     }
+#endif
+
+#undef JSON_IMPLEMENT_OPERATOR
 
     /// @}
 
@@ -23406,38 +23271,9 @@ class basic_json
 
     /// @name serialization
     /// @{
-
-    /*!
-    @brief serialize to stream
-
-    Serialize the given JSON value @a j to the output stream @a o. The JSON
-    value will be serialized using the @ref dump member function.
-
-    - The indentation of the output can be controlled with the member variable
-      `width` of the output stream @a o. For instance, using the manipulator
-      `std::setw(4)` on @a o sets the indentation level to `4` and the
-      serialization result is the same as calling `dump(4)`.
-
-    - The indentation character can be controlled with the member variable
-      `fill` of the output stream @a o. For instance, the manipulator
-      `std::setfill('\\t')` sets indentation to use a tab character rather than
-      the default space character.
-
-    @param[in,out] o  stream to serialize to
-    @param[in] j  JSON value to serialize
-
-    @return the stream @a o
-
-    @throw type_error.316 if a string stored inside the JSON value is not
-                          UTF-8 encoded
-
-    @complexity Linear.
-
-    @liveexample{The example below shows the serialization with different
-    parameters to `width` to adjust the indentation level.,operator_serialize}
-
-    @since version 1.0.0; indentation character added in version 3.0.0
-    */
+#ifndef JSON_NO_IO
+    /// @brief serialize to stream
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ltlt/
     friend std::ostream& operator<<(std::ostream& o, const basic_json& j)
     {
         // read width member and use it as indentation parameter if nonzero
@@ -23453,23 +23289,20 @@ class basic_json
         return o;
     }
 
-    /*!
-    @brief serialize to stream
-    @deprecated This stream operator is deprecated and will be removed in
-                future 4.0.0 of the library. Please use
-                @ref operator<<(std::ostream&, const basic_json&)
-                instead; that is, replace calls like `j >> o;` with `o << j;`.
-    @since version 1.0.0; deprecated since version 3.0.0
-    */
+    /// @brief serialize to stream
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ltlt/
+    /// @deprecated This function is deprecated since 3.0.0 and will be removed in
+    ///             version 4.0.0 of the library. Please use
+    ///             operator<<(std::ostream&, const basic_json&) instead; that is,
+    ///             replace calls like `j >> o;` with `o << j;`.
     JSON_HEDLEY_DEPRECATED_FOR(3.0.0, operator<<(std::ostream&, const basic_json&))
     friend std::ostream& operator>>(const basic_json& j, std::ostream& o)
     {
         return o << j;
     }
-
+#endif  // JSON_NO_IO
     /// @}
 
-
     /////////////////////
     // deserialization //
     /////////////////////
@@ -23477,57 +23310,8 @@ class basic_json
     /// @name deserialization
     /// @{
 
-    /*!
-    @brief deserialize from a compatible input
-
-    @tparam InputType A compatible input, for instance
-    - an std::istream object
-    - a FILE pointer
-    - a C-style array of characters
-    - a pointer to a null-terminated string of single byte characters
-    - an object obj for which begin(obj) and end(obj) produces a valid pair of
-      iterators.
-
-    @param[in] i  input to read from
-    @param[in] cb  a parser callback function of type @ref parser_callback_t
-    which is used to control the deserialization by filtering unwanted values
-    (optional)
-    @param[in] allow_exceptions  whether to throw exceptions in case of a
-    parse error (optional, true by default)
-    @param[in] ignore_comments  whether comments should be ignored and treated
-    like whitespace (true) or yield a parse error (true); (optional, false by
-    default)
-
-    @return deserialized JSON value; in case of a parse error and
-            @a allow_exceptions set to `false`, the return value will be
-            value_t::discarded.
-
-    @throw parse_error.101 if a parse error occurs; example: `""unexpected end
-    of input; expected string literal""`
-    @throw parse_error.102 if to_unicode fails or surrogate error
-    @throw parse_error.103 if to_unicode fails
-
-    @complexity Linear in the length of the input. The parser is a predictive
-    LL(1) parser. The complexity can be higher if the parser callback function
-    @a cb or reading from the input @a i has a super-linear complexity.
-
-    @note A UTF-8 byte order mark is silently ignored.
-
-    @liveexample{The example below demonstrates the `parse()` function reading
-    from an array.,parse__array__parser_callback_t}
-
-    @liveexample{The example below demonstrates the `parse()` function with
-    and without callback function.,parse__string__parser_callback_t}
-
-    @liveexample{The example below demonstrates the `parse()` function with
-    and without callback function.,parse__istream__parser_callback_t}
-
-    @liveexample{The example below demonstrates the `parse()` function reading
-    from a contiguous container.,parse__contiguouscontainer__parser_callback_t}
-
-    @since version 2.0.3 (contiguous containers); version 3.9.0 allowed to
-    ignore comments.
-    */
+    /// @brief deserialize from a compatible input
+    /// @sa https://json.nlohmann.me/api/basic_json/parse/
     template<typename InputType>
     JSON_HEDLEY_WARN_UNUSED_RESULT
     static basic_json parse(InputType&& i,
@@ -23540,32 +23324,8 @@ class basic_json
         return result;
     }
 
-    /*!
-    @brief deserialize from a pair of character iterators
-
-    The value_type of the iterator must be a integral type with size of 1, 2 or
-    4 bytes, which will be interpreted respectively as UTF-8, UTF-16 and UTF-32.
-
-    @param[in] first iterator to start of character range
-    @param[in] last  iterator to end of character range
-    @param[in] cb  a parser callback function of type @ref parser_callback_t
-    which is used to control the deserialization by filtering unwanted values
-    (optional)
-    @param[in] allow_exceptions  whether to throw exceptions in case of a
-    parse error (optional, true by default)
-    @param[in] ignore_comments  whether comments should be ignored and treated
-    like whitespace (true) or yield a parse error (true); (optional, false by
-    default)
-
-    @return deserialized JSON value; in case of a parse error and
-            @a allow_exceptions set to `false`, the return value will be
-            value_t::discarded.
-
-    @throw parse_error.101 if a parse error occurs; example: `""unexpected end
-    of input; expected string literal""`
-    @throw parse_error.102 if to_unicode fails or surrogate error
-    @throw parse_error.103 if to_unicode fails
-    */
+    /// @brief deserialize from a pair of character iterators
+    /// @sa https://json.nlohmann.me/api/basic_json/parse/
     template<typename IteratorType>
     JSON_HEDLEY_WARN_UNUSED_RESULT
     static basic_json parse(IteratorType first,
@@ -23591,36 +23351,8 @@ class basic_json
         return result;
     }
 
-    /*!
-    @brief check if the input is valid JSON
-
-    Unlike the @ref parse(InputType&&, const parser_callback_t,const bool)
-    function, this function neither throws an exception in case of invalid JSON
-    input (i.e., a parse error) nor creates diagnostic information.
-
-    @tparam InputType A compatible input, for instance
-    - an std::istream object
-    - a FILE pointer
-    - a C-style array of characters
-    - a pointer to a null-terminated string of single byte characters
-    - an object obj for which begin(obj) and end(obj) produces a valid pair of
-      iterators.
-
-    @param[in] i input to read from
-    @param[in] ignore_comments  whether comments should be ignored and treated
-    like whitespace (true) or yield a parse error (true); (optional, false by
-    default)
-
-    @return Whether the input read from @a i is valid JSON.
-
-    @complexity Linear in the length of the input. The parser is a predictive
-    LL(1) parser.
-
-    @note A UTF-8 byte order mark is silently ignored.
-
-    @liveexample{The example below demonstrates the `accept()` function reading
-    from a string.,accept__string}
-    */
+    /// @brief check if the input is valid JSON
+    /// @sa https://json.nlohmann.me/api/basic_json/accept/
     template<typename InputType>
     static bool accept(InputType&& i,
                        const bool ignore_comments = false)
@@ -23628,6 +23360,8 @@ class basic_json
         return parser(detail::input_adapter(std::forward<InputType>(i)), nullptr, false, ignore_comments).accept(true);
     }
 
+    /// @brief check if the input is valid JSON
+    /// @sa https://json.nlohmann.me/api/basic_json/accept/
     template<typename IteratorType>
     static bool accept(IteratorType first, IteratorType last,
                        const bool ignore_comments = false)
@@ -23643,46 +23377,8 @@ class basic_json
         return parser(i.get(), nullptr, false, ignore_comments).accept(true);
     }
 
-    /*!
-    @brief generate SAX events
-
-    The SAX event lister must follow the interface of @ref json_sax.
-
-    This function reads from a compatible input. Examples are:
-    - an std::istream object
-    - a FILE pointer
-    - a C-style array of characters
-    - a pointer to a null-terminated string of single byte characters
-    - an object obj for which begin(obj) and end(obj) produces a valid pair of
-      iterators.
-
-    @param[in] i  input to read from
-    @param[in,out] sax  SAX event listener
-    @param[in] format  the format to parse (JSON, CBOR, MessagePack, or UBJSON)
-    @param[in] strict  whether the input has to be consumed completely
-    @param[in] ignore_comments  whether comments should be ignored and treated
-    like whitespace (true) or yield a parse error (true); (optional, false by
-    default); only applies to the JSON file format.
-
-    @return return value of the last processed SAX event
-
-    @throw parse_error.101 if a parse error occurs; example: `""unexpected end
-    of input; expected string literal""`
-    @throw parse_error.102 if to_unicode fails or surrogate error
-    @throw parse_error.103 if to_unicode fails
-
-    @complexity Linear in the length of the input. The parser is a predictive
-    LL(1) parser. The complexity can be higher if the SAX consumer @a sax has
-    a super-linear complexity.
-
-    @note A UTF-8 byte order mark is silently ignored.
-
-    @liveexample{The example below demonstrates the `sax_parse()` function
-    reading from string and processing the events with a user-defined SAX
-    event consumer.,sax_parse}
-
-    @since version 3.2.0
-    */
+    /// @brief generate SAX events
+    /// @sa https://json.nlohmann.me/api/basic_json/sax_parse/
     template <typename InputType, typename SAX>
     JSON_HEDLEY_NON_NULL(2)
     static bool sax_parse(InputType&& i, SAX* sax,
@@ -23693,9 +23389,11 @@ class basic_json
         auto ia = detail::input_adapter(std::forward<InputType>(i));
         return format == input_format_t::json
                ? parser(std::move(ia), nullptr, true, ignore_comments).sax_parse(sax, strict)
-               : detail::binary_reader<basic_json, decltype(ia), SAX>(std::move(ia)).sax_parse(format, sax, strict);
+               : detail::binary_reader<basic_json, decltype(ia), SAX>(std::move(ia), format).sax_parse(format, sax, strict);
     }
 
+    /// @brief generate SAX events
+    /// @sa https://json.nlohmann.me/api/basic_json/sax_parse/
     template<class IteratorType, class SAX>
     JSON_HEDLEY_NON_NULL(3)
     static bool sax_parse(IteratorType first, IteratorType last, SAX* sax,
@@ -23706,9 +23404,14 @@ class basic_json
         auto ia = detail::input_adapter(std::move(first), std::move(last));
         return format == input_format_t::json
                ? parser(std::move(ia), nullptr, true, ignore_comments).sax_parse(sax, strict)
-               : detail::binary_reader<basic_json, decltype(ia), SAX>(std::move(ia)).sax_parse(format, sax, strict);
+               : detail::binary_reader<basic_json, decltype(ia), SAX>(std::move(ia), format).sax_parse(format, sax, strict);
     }
 
+    /// @brief generate SAX events
+    /// @sa https://json.nlohmann.me/api/basic_json/sax_parse/
+    /// @deprecated This function is deprecated since 3.8.0 and will be removed in
+    ///             version 4.0.0 of the library. Please use
+    ///             sax_parse(ptr, ptr + len) instead.
     template <typename SAX>
     JSON_HEDLEY_DEPRECATED_FOR(3.8.0, sax_parse(ptr, ptr + len, ...))
     JSON_HEDLEY_NON_NULL(2)
@@ -23719,129 +23422,104 @@ class basic_json
     {
         auto ia = i.get();
         return format == input_format_t::json
+               // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
                ? parser(std::move(ia), nullptr, true, ignore_comments).sax_parse(sax, strict)
-               : detail::binary_reader<basic_json, decltype(ia), SAX>(std::move(ia)).sax_parse(format, sax, strict);
-    }
-
-    /*!
-    @brief deserialize from stream
-    @deprecated This stream operator is deprecated and will be removed in
-                version 4.0.0 of the library. Please use
-                @ref operator>>(std::istream&, basic_json&)
-                instead; that is, replace calls like `j << i;` with `i >> j;`.
-    @since version 1.0.0; deprecated since version 3.0.0
-    */
+               // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
+               : detail::binary_reader<basic_json, decltype(ia), SAX>(std::move(ia), format).sax_parse(format, sax, strict);
+    }
+#ifndef JSON_NO_IO
+    /// @brief deserialize from stream
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_gtgt/
+    /// @deprecated This stream operator is deprecated since 3.0.0 and will be removed in
+    ///             version 4.0.0 of the library. Please use
+    ///             operator>>(std::istream&, basic_json&) instead; that is,
+    ///             replace calls like `j << i;` with `i >> j;`.
     JSON_HEDLEY_DEPRECATED_FOR(3.0.0, operator>>(std::istream&, basic_json&))
     friend std::istream& operator<<(basic_json& j, std::istream& i)
     {
         return operator>>(i, j);
     }
 
-    /*!
-    @brief deserialize from stream
-
-    Deserializes an input stream to a JSON value.
-
-    @param[in,out] i  input stream to read a serialized JSON value from
-    @param[in,out] j  JSON value to write the deserialized input to
-
-    @throw parse_error.101 in case of an unexpected token
-    @throw parse_error.102 if to_unicode fails or surrogate error
-    @throw parse_error.103 if to_unicode fails
-
-    @complexity Linear in the length of the input. The parser is a predictive
-    LL(1) parser.
-
-    @note A UTF-8 byte order mark is silently ignored.
-
-    @liveexample{The example below shows how a JSON value is constructed by
-    reading a serialization from a stream.,operator_deserialize}
-
-    @sa parse(std::istream&, const parser_callback_t) for a variant with a
-    parser callback function to filter values while parsing
-
-    @since version 1.0.0
-    */
+    /// @brief deserialize from stream
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_gtgt/
     friend std::istream& operator>>(std::istream& i, basic_json& j)
     {
         parser(detail::input_adapter(i)).parse(false, j);
         return i;
     }
-
+#endif  // JSON_NO_IO
     /// @}
 
     ///////////////////////////
     // convenience functions //
     ///////////////////////////
 
-    /*!
-    @brief return the type as string
-
-    Returns the type name as string to be used in error messages - usually to
-    indicate that a function was called on a wrong JSON type.
-
-    @return a string representation of a the @a m_type member:
-            Value type  | return value
-            ----------- | -------------
-            null        | `"null"`
-            boolean     | `"boolean"`
-            string      | `"string"`
-            number      | `"number"` (for all number types)
-            object      | `"object"`
-            array       | `"array"`
-            binary      | `"binary"`
-            discarded   | `"discarded"`
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @complexity Constant.
-
-    @liveexample{The following code exemplifies `type_name()` for all JSON
-    types.,type_name}
-
-    @sa @ref type() -- return the type of the JSON value
-    @sa @ref operator value_t() -- return the type of the JSON value (implicit)
-
-    @since version 1.0.0, public since 2.1.0, `const char*` and `noexcept`
-    since 3.0.0
-    */
+    /// @brief return the type as string
+    /// @sa https://json.nlohmann.me/api/basic_json/type_name/
     JSON_HEDLEY_RETURNS_NON_NULL
     const char* type_name() const noexcept
     {
+        switch (m_data.m_type)
         {
-            switch (m_type)
-            {
-                case value_t::null:
-                    return "null";
-                case value_t::object:
-                    return "object";
-                case value_t::array:
-                    return "array";
-                case value_t::string:
-                    return "string";
-                case value_t::boolean:
-                    return "boolean";
-                case value_t::binary:
-                    return "binary";
-                case value_t::discarded:
-                    return "discarded";
-                default:
-                    return "number";
-            }
+            case value_t::null:
+                return "null";
+            case value_t::object:
+                return "object";
+            case value_t::array:
+                return "array";
+            case value_t::string:
+                return "string";
+            case value_t::boolean:
+                return "boolean";
+            case value_t::binary:
+                return "binary";
+            case value_t::discarded:
+                return "discarded";
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            default:
+                return "number";
         }
     }
 
-
   JSON_PRIVATE_UNLESS_TESTED:
     //////////////////////
     // member variables //
     //////////////////////
 
-    /// the type of the current element
-    value_t m_type = value_t::null;
+    struct data
+    {
+        /// the type of the current element
+        value_t m_type = value_t::null;
+
+        /// the value of the current element
+        json_value m_value = {};
+
+        data(const value_t v)
+            : m_type(v), m_value(v)
+        {
+        }
+
+        data(size_type cnt, const basic_json& val)
+            : m_type(value_t::array)
+        {
+            m_value.array = create<array_t>(cnt, val);
+        }
 
-    /// the value of the current element
-    json_value m_value = {};
+        data() noexcept = default;
+        data(data&&) noexcept = default;
+        data(const data&) noexcept = delete;
+        data& operator=(data&&) noexcept = delete;
+        data& operator=(const data&) noexcept = delete;
+
+        ~data() noexcept
+        {
+            m_value.destroy(m_type);
+        }
+    };
+
+    data m_data = {};
 
 #if JSON_DIAGNOSTICS
     /// a pointer to a parent value (for debugging purposes)
@@ -23856,507 +23534,131 @@ class basic_json
     /// @{
 
   public:
-    /*!
-    @brief create a CBOR serialization of a given JSON value
-
-    Serializes a given JSON value @a j to a byte vector using the CBOR (Concise
-    Binary Object Representation) serialization format. CBOR is a binary
-    serialization format which aims to be more compact than JSON itself, yet
-    more efficient to parse.
-
-    The library uses the following mapping from JSON values types to
-    CBOR types according to the CBOR specification (RFC 7049):
-
-    JSON value type | value/range                                | CBOR type                          | first byte
-    --------------- | ------------------------------------------ | ---------------------------------- | ---------------
-    null            | `null`                                     | Null                               | 0xF6
-    boolean         | `true`                                     | True                               | 0xF5
-    boolean         | `false`                                    | False                              | 0xF4
-    number_integer  | -9223372036854775808..-2147483649          | Negative integer (8 bytes follow)  | 0x3B
-    number_integer  | -2147483648..-32769                        | Negative integer (4 bytes follow)  | 0x3A
-    number_integer  | -32768..-129                               | Negative integer (2 bytes follow)  | 0x39
-    number_integer  | -128..-25                                  | Negative integer (1 byte follow)   | 0x38
-    number_integer  | -24..-1                                    | Negative integer                   | 0x20..0x37
-    number_integer  | 0..23                                      | Integer                            | 0x00..0x17
-    number_integer  | 24..255                                    | Unsigned integer (1 byte follow)   | 0x18
-    number_integer  | 256..65535                                 | Unsigned integer (2 bytes follow)  | 0x19
-    number_integer  | 65536..4294967295                          | Unsigned integer (4 bytes follow)  | 0x1A
-    number_integer  | 4294967296..18446744073709551615           | Unsigned integer (8 bytes follow)  | 0x1B
-    number_unsigned | 0..23                                      | Integer                            | 0x00..0x17
-    number_unsigned | 24..255                                    | Unsigned integer (1 byte follow)   | 0x18
-    number_unsigned | 256..65535                                 | Unsigned integer (2 bytes follow)  | 0x19
-    number_unsigned | 65536..4294967295                          | Unsigned integer (4 bytes follow)  | 0x1A
-    number_unsigned | 4294967296..18446744073709551615           | Unsigned integer (8 bytes follow)  | 0x1B
-    number_float    | *any value representable by a float*       | Single-Precision Float             | 0xFA
-    number_float    | *any value NOT representable by a float*   | Double-Precision Float             | 0xFB
-    string          | *length*: 0..23                            | UTF-8 string                       | 0x60..0x77
-    string          | *length*: 23..255                          | UTF-8 string (1 byte follow)       | 0x78
-    string          | *length*: 256..65535                       | UTF-8 string (2 bytes follow)      | 0x79
-    string          | *length*: 65536..4294967295                | UTF-8 string (4 bytes follow)      | 0x7A
-    string          | *length*: 4294967296..18446744073709551615 | UTF-8 string (8 bytes follow)      | 0x7B
-    array           | *size*: 0..23                              | array                              | 0x80..0x97
-    array           | *size*: 23..255                            | array (1 byte follow)              | 0x98
-    array           | *size*: 256..65535                         | array (2 bytes follow)             | 0x99
-    array           | *size*: 65536..4294967295                  | array (4 bytes follow)             | 0x9A
-    array           | *size*: 4294967296..18446744073709551615   | array (8 bytes follow)             | 0x9B
-    object          | *size*: 0..23                              | map                                | 0xA0..0xB7
-    object          | *size*: 23..255                            | map (1 byte follow)                | 0xB8
-    object          | *size*: 256..65535                         | map (2 bytes follow)               | 0xB9
-    object          | *size*: 65536..4294967295                  | map (4 bytes follow)               | 0xBA
-    object          | *size*: 4294967296..18446744073709551615   | map (8 bytes follow)               | 0xBB
-    binary          | *size*: 0..23                              | byte string                        | 0x40..0x57
-    binary          | *size*: 23..255                            | byte string (1 byte follow)        | 0x58
-    binary          | *size*: 256..65535                         | byte string (2 bytes follow)       | 0x59
-    binary          | *size*: 65536..4294967295                  | byte string (4 bytes follow)       | 0x5A
-    binary          | *size*: 4294967296..18446744073709551615   | byte string (8 bytes follow)       | 0x5B
-
-    @note The mapping is **complete** in the sense that any JSON value type
-          can be converted to a CBOR value.
-
-    @note If NaN or Infinity are stored inside a JSON number, they are
-          serialized properly. This behavior differs from the @ref dump()
-          function which serializes NaN or Infinity to `null`.
-
-    @note The following CBOR types are not used in the conversion:
-          - UTF-8 strings terminated by "break" (0x7F)
-          - arrays terminated by "break" (0x9F)
-          - maps terminated by "break" (0xBF)
-          - byte strings terminated by "break" (0x5F)
-          - date/time (0xC0..0xC1)
-          - bignum (0xC2..0xC3)
-          - decimal fraction (0xC4)
-          - bigfloat (0xC5)
-          - expected conversions (0xD5..0xD7)
-          - simple values (0xE0..0xF3, 0xF8)
-          - undefined (0xF7)
-          - half-precision floats (0xF9)
-          - break (0xFF)
-
-    @param[in] j  JSON value to serialize
-    @return CBOR serialization as byte vector
-
-    @complexity Linear in the size of the JSON value @a j.
-
-    @liveexample{The example shows the serialization of a JSON value to a byte
-    vector in CBOR format.,to_cbor}
-
-    @sa http://cbor.io
-    @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool, const cbor_tag_handler_t) for the
-        analogous deserialization
-    @sa @ref to_msgpack(const basic_json&) for the related MessagePack format
-    @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the
-             related UBJSON format
-
-    @since version 2.0.9; compact representation of floating-point numbers
-           since version 3.8.0
-    */
-    static std::vector<uint8_t> to_cbor(const basic_json& j)
+    /// @brief create a CBOR serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_cbor/
+    static std::vector<std::uint8_t> to_cbor(const basic_json& j)
     {
-        std::vector<uint8_t> result;
+        std::vector<std::uint8_t> result;
         to_cbor(j, result);
         return result;
     }
 
-    static void to_cbor(const basic_json& j, detail::output_adapter<uint8_t> o)
+    /// @brief create a CBOR serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_cbor/
+    static void to_cbor(const basic_json& j, detail::output_adapter<std::uint8_t> o)
     {
-        binary_writer<uint8_t>(o).write_cbor(j);
+        binary_writer<std::uint8_t>(o).write_cbor(j);
     }
 
+    /// @brief create a CBOR serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_cbor/
     static void to_cbor(const basic_json& j, detail::output_adapter<char> o)
     {
         binary_writer<char>(o).write_cbor(j);
     }
 
-    /*!
-    @brief create a MessagePack serialization of a given JSON value
-
-    Serializes a given JSON value @a j to a byte vector using the MessagePack
-    serialization format. MessagePack is a binary serialization format which
-    aims to be more compact than JSON itself, yet more efficient to parse.
-
-    The library uses the following mapping from JSON values types to
-    MessagePack types according to the MessagePack specification:
-
-    JSON value type | value/range                       | MessagePack type | first byte
-    --------------- | --------------------------------- | ---------------- | ----------
-    null            | `null`                            | nil              | 0xC0
-    boolean         | `true`                            | true             | 0xC3
-    boolean         | `false`                           | false            | 0xC2
-    number_integer  | -9223372036854775808..-2147483649 | int64            | 0xD3
-    number_integer  | -2147483648..-32769               | int32            | 0xD2
-    number_integer  | -32768..-129                      | int16            | 0xD1
-    number_integer  | -128..-33                         | int8             | 0xD0
-    number_integer  | -32..-1                           | negative fixint  | 0xE0..0xFF
-    number_integer  | 0..127                            | positive fixint  | 0x00..0x7F
-    number_integer  | 128..255                          | uint 8           | 0xCC
-    number_integer  | 256..65535                        | uint 16          | 0xCD
-    number_integer  | 65536..4294967295                 | uint 32          | 0xCE
-    number_integer  | 4294967296..18446744073709551615  | uint 64          | 0xCF
-    number_unsigned | 0..127                            | positive fixint  | 0x00..0x7F
-    number_unsigned | 128..255                          | uint 8           | 0xCC
-    number_unsigned | 256..65535                        | uint 16          | 0xCD
-    number_unsigned | 65536..4294967295                 | uint 32          | 0xCE
-    number_unsigned | 4294967296..18446744073709551615  | uint 64          | 0xCF
-    number_float    | *any value representable by a float*     | float 32 | 0xCA
-    number_float    | *any value NOT representable by a float* | float 64 | 0xCB
-    string          | *length*: 0..31                   | fixstr           | 0xA0..0xBF
-    string          | *length*: 32..255                 | str 8            | 0xD9
-    string          | *length*: 256..65535              | str 16           | 0xDA
-    string          | *length*: 65536..4294967295       | str 32           | 0xDB
-    array           | *size*: 0..15                     | fixarray         | 0x90..0x9F
-    array           | *size*: 16..65535                 | array 16         | 0xDC
-    array           | *size*: 65536..4294967295         | array 32         | 0xDD
-    object          | *size*: 0..15                     | fix map          | 0x80..0x8F
-    object          | *size*: 16..65535                 | map 16           | 0xDE
-    object          | *size*: 65536..4294967295         | map 32           | 0xDF
-    binary          | *size*: 0..255                    | bin 8            | 0xC4
-    binary          | *size*: 256..65535                | bin 16           | 0xC5
-    binary          | *size*: 65536..4294967295         | bin 32           | 0xC6
-
-    @note The mapping is **complete** in the sense that any JSON value type
-          can be converted to a MessagePack value.
-
-    @note The following values can **not** be converted to a MessagePack value:
-          - strings with more than 4294967295 bytes
-          - byte strings with more than 4294967295 bytes
-          - arrays with more than 4294967295 elements
-          - objects with more than 4294967295 elements
-
-    @note Any MessagePack output created @ref to_msgpack can be successfully
-          parsed by @ref from_msgpack.
-
-    @note If NaN or Infinity are stored inside a JSON number, they are
-          serialized properly. This behavior differs from the @ref dump()
-          function which serializes NaN or Infinity to `null`.
-
-    @param[in] j  JSON value to serialize
-    @return MessagePack serialization as byte vector
-
-    @complexity Linear in the size of the JSON value @a j.
-
-    @liveexample{The example shows the serialization of a JSON value to a byte
-    vector in MessagePack format.,to_msgpack}
-
-    @sa http://msgpack.org
-    @sa @ref from_msgpack for the analogous deserialization
-    @sa @ref to_cbor(const basic_json& for the related CBOR format
-    @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the
-             related UBJSON format
-
-    @since version 2.0.9
-    */
-    static std::vector<uint8_t> to_msgpack(const basic_json& j)
+    /// @brief create a MessagePack serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_msgpack/
+    static std::vector<std::uint8_t> to_msgpack(const basic_json& j)
     {
-        std::vector<uint8_t> result;
+        std::vector<std::uint8_t> result;
         to_msgpack(j, result);
         return result;
     }
 
-    static void to_msgpack(const basic_json& j, detail::output_adapter<uint8_t> o)
+    /// @brief create a MessagePack serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_msgpack/
+    static void to_msgpack(const basic_json& j, detail::output_adapter<std::uint8_t> o)
     {
-        binary_writer<uint8_t>(o).write_msgpack(j);
+        binary_writer<std::uint8_t>(o).write_msgpack(j);
     }
 
+    /// @brief create a MessagePack serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_msgpack/
     static void to_msgpack(const basic_json& j, detail::output_adapter<char> o)
     {
         binary_writer<char>(o).write_msgpack(j);
     }
 
-    /*!
-    @brief create a UBJSON serialization of a given JSON value
-
-    Serializes a given JSON value @a j to a byte vector using the UBJSON
-    (Universal Binary JSON) serialization format. UBJSON aims to be more compact
-    than JSON itself, yet more efficient to parse.
-
-    The library uses the following mapping from JSON values types to
-    UBJSON types according to the UBJSON specification:
-
-    JSON value type | value/range                       | UBJSON type | marker
-    --------------- | --------------------------------- | ----------- | ------
-    null            | `null`                            | null        | `Z`
-    boolean         | `true`                            | true        | `T`
-    boolean         | `false`                           | false       | `F`
-    number_integer  | -9223372036854775808..-2147483649 | int64       | `L`
-    number_integer  | -2147483648..-32769               | int32       | `l`
-    number_integer  | -32768..-129                      | int16       | `I`
-    number_integer  | -128..127                         | int8        | `i`
-    number_integer  | 128..255                          | uint8       | `U`
-    number_integer  | 256..32767                        | int16       | `I`
-    number_integer  | 32768..2147483647                 | int32       | `l`
-    number_integer  | 2147483648..9223372036854775807   | int64       | `L`
-    number_unsigned | 0..127                            | int8        | `i`
-    number_unsigned | 128..255                          | uint8       | `U`
-    number_unsigned | 256..32767                        | int16       | `I`
-    number_unsigned | 32768..2147483647                 | int32       | `l`
-    number_unsigned | 2147483648..9223372036854775807   | int64       | `L`
-    number_unsigned | 2147483649..18446744073709551615  | high-precision | `H`
-    number_float    | *any value*                       | float64     | `D`
-    string          | *with shortest length indicator*  | string      | `S`
-    array           | *see notes on optimized format*   | array       | `[`
-    object          | *see notes on optimized format*   | map         | `{`
-
-    @note The mapping is **complete** in the sense that any JSON value type
-          can be converted to a UBJSON value.
-
-    @note The following values can **not** be converted to a UBJSON value:
-          - strings with more than 9223372036854775807 bytes (theoretical)
-
-    @note The following markers are not used in the conversion:
-          - `Z`: no-op values are not created.
-          - `C`: single-byte strings are serialized with `S` markers.
-
-    @note Any UBJSON output created @ref to_ubjson can be successfully parsed
-          by @ref from_ubjson.
-
-    @note If NaN or Infinity are stored inside a JSON number, they are
-          serialized properly. This behavior differs from the @ref dump()
-          function which serializes NaN or Infinity to `null`.
-
-    @note The optimized formats for containers are supported: Parameter
-          @a use_size adds size information to the beginning of a container and
-          removes the closing marker. Parameter @a use_type further checks
-          whether all elements of a container have the same type and adds the
-          type marker to the beginning of the container. The @a use_type
-          parameter must only be used together with @a use_size = true. Note
-          that @a use_size = true alone may result in larger representations -
-          the benefit of this parameter is that the receiving side is
-          immediately informed on the number of elements of the container.
-
-    @note If the JSON data contains the binary type, the value stored is a list
-          of integers, as suggested by the UBJSON documentation.  In particular,
-          this means that serialization and the deserialization of a JSON
-          containing binary values into UBJSON and back will result in a
-          different JSON object.
-
-    @param[in] j  JSON value to serialize
-    @param[in] use_size  whether to add size annotations to container types
-    @param[in] use_type  whether to add type annotations to container types
-                         (must be combined with @a use_size = true)
-    @return UBJSON serialization as byte vector
-
-    @complexity Linear in the size of the JSON value @a j.
-
-    @liveexample{The example shows the serialization of a JSON value to a byte
-    vector in UBJSON format.,to_ubjson}
-
-    @sa http://ubjson.org
-    @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for the
-        analogous deserialization
-    @sa @ref to_cbor(const basic_json& for the related CBOR format
-    @sa @ref to_msgpack(const basic_json&) for the related MessagePack format
-
-    @since version 3.1.0
-    */
-    static std::vector<uint8_t> to_ubjson(const basic_json& j,
-                                          const bool use_size = false,
-                                          const bool use_type = false)
+    /// @brief create a UBJSON serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_ubjson/
+    static std::vector<std::uint8_t> to_ubjson(const basic_json& j,
+            const bool use_size = false,
+            const bool use_type = false)
     {
-        std::vector<uint8_t> result;
+        std::vector<std::uint8_t> result;
         to_ubjson(j, result, use_size, use_type);
         return result;
     }
 
-    static void to_ubjson(const basic_json& j, detail::output_adapter<uint8_t> o,
+    /// @brief create a UBJSON serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_ubjson/
+    static void to_ubjson(const basic_json& j, detail::output_adapter<std::uint8_t> o,
                           const bool use_size = false, const bool use_type = false)
     {
-        binary_writer<uint8_t>(o).write_ubjson(j, use_size, use_type);
+        binary_writer<std::uint8_t>(o).write_ubjson(j, use_size, use_type);
     }
 
+    /// @brief create a UBJSON serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_ubjson/
     static void to_ubjson(const basic_json& j, detail::output_adapter<char> o,
                           const bool use_size = false, const bool use_type = false)
     {
         binary_writer<char>(o).write_ubjson(j, use_size, use_type);
     }
 
+    /// @brief create a BJData serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_bjdata/
+    static std::vector<std::uint8_t> to_bjdata(const basic_json& j,
+            const bool use_size = false,
+            const bool use_type = false)
+    {
+        std::vector<std::uint8_t> result;
+        to_bjdata(j, result, use_size, use_type);
+        return result;
+    }
 
-    /*!
-    @brief Serializes the given JSON object `j` to BSON and returns a vector
-           containing the corresponding BSON-representation.
-
-    BSON (Binary JSON) is a binary format in which zero or more ordered key/value pairs are
-    stored as a single entity (a so-called document).
-
-    The library uses the following mapping from JSON values types to BSON types:
-
-    JSON value type | value/range                       | BSON type   | marker
-    --------------- | --------------------------------- | ----------- | ------
-    null            | `null`                            | null        | 0x0A
-    boolean         | `true`, `false`                   | boolean     | 0x08
-    number_integer  | -9223372036854775808..-2147483649 | int64       | 0x12
-    number_integer  | -2147483648..2147483647           | int32       | 0x10
-    number_integer  | 2147483648..9223372036854775807   | int64       | 0x12
-    number_unsigned | 0..2147483647                     | int32       | 0x10
-    number_unsigned | 2147483648..9223372036854775807   | int64       | 0x12
-    number_unsigned | 9223372036854775808..18446744073709551615| --   | --
-    number_float    | *any value*                       | double      | 0x01
-    string          | *any value*                       | string      | 0x02
-    array           | *any value*                       | document    | 0x04
-    object          | *any value*                       | document    | 0x03
-    binary          | *any value*                       | binary      | 0x05
-
-    @warning The mapping is **incomplete**, since only JSON-objects (and things
-    contained therein) can be serialized to BSON.
-    Also, integers larger than 9223372036854775807 cannot be serialized to BSON,
-    and the keys may not contain U+0000, since they are serialized a
-    zero-terminated c-strings.
-
-    @throw out_of_range.407  if `j.is_number_unsigned() && j.get<std::uint64_t>() > 9223372036854775807`
-    @throw out_of_range.409  if a key in `j` contains a NULL (U+0000)
-    @throw type_error.317    if `!j.is_object()`
-
-    @pre The input `j` is required to be an object: `j.is_object() == true`.
-
-    @note Any BSON output created via @ref to_bson can be successfully parsed
-          by @ref from_bson.
-
-    @param[in] j  JSON value to serialize
-    @return BSON serialization as byte vector
-
-    @complexity Linear in the size of the JSON value @a j.
+    /// @brief create a BJData serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_bjdata/
+    static void to_bjdata(const basic_json& j, detail::output_adapter<std::uint8_t> o,
+                          const bool use_size = false, const bool use_type = false)
+    {
+        binary_writer<std::uint8_t>(o).write_ubjson(j, use_size, use_type, true, true);
+    }
 
-    @liveexample{The example shows the serialization of a JSON value to a byte
-    vector in BSON format.,to_bson}
+    /// @brief create a BJData serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_bjdata/
+    static void to_bjdata(const basic_json& j, detail::output_adapter<char> o,
+                          const bool use_size = false, const bool use_type = false)
+    {
+        binary_writer<char>(o).write_ubjson(j, use_size, use_type, true, true);
+    }
 
-    @sa http://bsonspec.org/spec.html
-    @sa @ref from_bson(detail::input_adapter&&, const bool strict) for the
-        analogous deserialization
-    @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the
-             related UBJSON format
-    @sa @ref to_cbor(const basic_json&) for the related CBOR format
-    @sa @ref to_msgpack(const basic_json&) for the related MessagePack format
-    */
-    static std::vector<uint8_t> to_bson(const basic_json& j)
+    /// @brief create a BSON serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_bson/
+    static std::vector<std::uint8_t> to_bson(const basic_json& j)
     {
-        std::vector<uint8_t> result;
+        std::vector<std::uint8_t> result;
         to_bson(j, result);
         return result;
     }
 
-    /*!
-    @brief Serializes the given JSON object `j` to BSON and forwards the
-           corresponding BSON-representation to the given output_adapter `o`.
-    @param j The JSON object to convert to BSON.
-    @param o The output adapter that receives the binary BSON representation.
-    @pre The input `j` shall be an object: `j.is_object() == true`
-    @sa @ref to_bson(const basic_json&)
-    */
-    static void to_bson(const basic_json& j, detail::output_adapter<uint8_t> o)
+    /// @brief create a BSON serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_bson/
+    static void to_bson(const basic_json& j, detail::output_adapter<std::uint8_t> o)
     {
-        binary_writer<uint8_t>(o).write_bson(j);
+        binary_writer<std::uint8_t>(o).write_bson(j);
     }
 
-    /*!
-    @copydoc to_bson(const basic_json&, detail::output_adapter<uint8_t>)
-    */
+    /// @brief create a BSON serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_bson/
     static void to_bson(const basic_json& j, detail::output_adapter<char> o)
     {
         binary_writer<char>(o).write_bson(j);
     }
 
-
-    /*!
-    @brief create a JSON value from an input in CBOR format
-
-    Deserializes a given input @a i to a JSON value using the CBOR (Concise
-    Binary Object Representation) serialization format.
-
-    The library maps CBOR types to JSON value types as follows:
-
-    CBOR type              | JSON value type | first byte
-    ---------------------- | --------------- | ----------
-    Integer                | number_unsigned | 0x00..0x17
-    Unsigned integer       | number_unsigned | 0x18
-    Unsigned integer       | number_unsigned | 0x19
-    Unsigned integer       | number_unsigned | 0x1A
-    Unsigned integer       | number_unsigned | 0x1B
-    Negative integer       | number_integer  | 0x20..0x37
-    Negative integer       | number_integer  | 0x38
-    Negative integer       | number_integer  | 0x39
-    Negative integer       | number_integer  | 0x3A
-    Negative integer       | number_integer  | 0x3B
-    Byte string            | binary          | 0x40..0x57
-    Byte string            | binary          | 0x58
-    Byte string            | binary          | 0x59
-    Byte string            | binary          | 0x5A
-    Byte string            | binary          | 0x5B
-    UTF-8 string           | string          | 0x60..0x77
-    UTF-8 string           | string          | 0x78
-    UTF-8 string           | string          | 0x79
-    UTF-8 string           | string          | 0x7A
-    UTF-8 string           | string          | 0x7B
-    UTF-8 string           | string          | 0x7F
-    array                  | array           | 0x80..0x97
-    array                  | array           | 0x98
-    array                  | array           | 0x99
-    array                  | array           | 0x9A
-    array                  | array           | 0x9B
-    array                  | array           | 0x9F
-    map                    | object          | 0xA0..0xB7
-    map                    | object          | 0xB8
-    map                    | object          | 0xB9
-    map                    | object          | 0xBA
-    map                    | object          | 0xBB
-    map                    | object          | 0xBF
-    False                  | `false`         | 0xF4
-    True                   | `true`          | 0xF5
-    Null                   | `null`          | 0xF6
-    Half-Precision Float   | number_float    | 0xF9
-    Single-Precision Float | number_float    | 0xFA
-    Double-Precision Float | number_float    | 0xFB
-
-    @warning The mapping is **incomplete** in the sense that not all CBOR
-             types can be converted to a JSON value. The following CBOR types
-             are not supported and will yield parse errors (parse_error.112):
-             - date/time (0xC0..0xC1)
-             - bignum (0xC2..0xC3)
-             - decimal fraction (0xC4)
-             - bigfloat (0xC5)
-             - expected conversions (0xD5..0xD7)
-             - simple values (0xE0..0xF3, 0xF8)
-             - undefined (0xF7)
-
-    @warning CBOR allows map keys of any type, whereas JSON only allows
-             strings as keys in object values. Therefore, CBOR maps with keys
-             other than UTF-8 strings are rejected (parse_error.113).
-
-    @note Any CBOR output created @ref to_cbor can be successfully parsed by
-          @ref from_cbor.
-
-    @param[in] i  an input in CBOR format convertible to an input adapter
-    @param[in] strict  whether to expect the input to be consumed until EOF
-                       (true by default)
-    @param[in] allow_exceptions  whether to throw exceptions in case of a
-    parse error (optional, true by default)
-    @param[in] tag_handler how to treat CBOR tags (optional, error by default)
-
-    @return deserialized JSON value; in case of a parse error and
-            @a allow_exceptions set to `false`, the return value will be
-            value_t::discarded.
-
-    @throw parse_error.110 if the given input ends prematurely or the end of
-    file was not reached when @a strict was set to true
-    @throw parse_error.112 if unsupported features from CBOR were
-    used in the given input @a v or if the input is not valid CBOR
-    @throw parse_error.113 if a string was expected as map key, but not found
-
-    @complexity Linear in the size of the input @a i.
-
-    @liveexample{The example shows the deserialization of a byte vector in CBOR
-    format to a JSON value.,from_cbor}
-
-    @sa http://cbor.io
-    @sa @ref to_cbor(const basic_json&) for the analogous serialization
-    @sa @ref from_msgpack(detail::input_adapter&&, const bool, const bool) for the
-        related MessagePack format
-    @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for the
-        related UBJSON format
-
-    @since version 2.0.9; parameter @a start_index since 2.1.1; changed to
-           consume input adapters, removed start_index parameter, and added
-           @a strict parameter since 3.0.0; added @a allow_exceptions parameter
-           since 3.2.0; added @a tag_handler parameter since 3.9.0.
-    */
+    /// @brief create a JSON value from an input in CBOR format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_cbor/
     template<typename InputType>
     JSON_HEDLEY_WARN_UNUSED_RESULT
     static basic_json from_cbor(InputType&& i,
@@ -24367,13 +23669,12 @@ class basic_json
         basic_json result;
         detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
         auto ia = detail::input_adapter(std::forward<InputType>(i));
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler);
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::cbor).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler);
         return res ? result : basic_json(value_t::discarded);
     }
 
-    /*!
-    @copydoc from_cbor(detail::input_adapter&&, const bool, const bool, const cbor_tag_handler_t)
-    */
+    /// @brief create a JSON value from an input in CBOR format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_cbor/
     template<typename IteratorType>
     JSON_HEDLEY_WARN_UNUSED_RESULT
     static basic_json from_cbor(IteratorType first, IteratorType last,
@@ -24384,7 +23685,7 @@ class basic_json
         basic_json result;
         detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
         auto ia = detail::input_adapter(std::move(first), std::move(last));
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler);
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::cbor).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler);
         return res ? result : basic_json(value_t::discarded);
     }
 
@@ -24399,7 +23700,6 @@ class basic_json
         return from_cbor(ptr, ptr + len, strict, allow_exceptions, tag_handler);
     }
 
-
     JSON_HEDLEY_WARN_UNUSED_RESULT
     JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_cbor(ptr, ptr + len))
     static basic_json from_cbor(detail::span_input_adapter&& i,
@@ -24410,96 +23710,13 @@ class basic_json
         basic_json result;
         detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
         auto ia = i.get();
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler);
+        // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::cbor).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler);
         return res ? result : basic_json(value_t::discarded);
     }
-
-    /*!
-    @brief create a JSON value from an input in MessagePack format
-
-    Deserializes a given input @a i to a JSON value using the MessagePack
-    serialization format.
-
-    The library maps MessagePack types to JSON value types as follows:
-
-    MessagePack type | JSON value type | first byte
-    ---------------- | --------------- | ----------
-    positive fixint  | number_unsigned | 0x00..0x7F
-    fixmap           | object          | 0x80..0x8F
-    fixarray         | array           | 0x90..0x9F
-    fixstr           | string          | 0xA0..0xBF
-    nil              | `null`          | 0xC0
-    false            | `false`         | 0xC2
-    true             | `true`          | 0xC3
-    float 32         | number_float    | 0xCA
-    float 64         | number_float    | 0xCB
-    uint 8           | number_unsigned | 0xCC
-    uint 16          | number_unsigned | 0xCD
-    uint 32          | number_unsigned | 0xCE
-    uint 64          | number_unsigned | 0xCF
-    int 8            | number_integer  | 0xD0
-    int 16           | number_integer  | 0xD1
-    int 32           | number_integer  | 0xD2
-    int 64           | number_integer  | 0xD3
-    str 8            | string          | 0xD9
-    str 16           | string          | 0xDA
-    str 32           | string          | 0xDB
-    array 16         | array           | 0xDC
-    array 32         | array           | 0xDD
-    map 16           | object          | 0xDE
-    map 32           | object          | 0xDF
-    bin 8            | binary          | 0xC4
-    bin 16           | binary          | 0xC5
-    bin 32           | binary          | 0xC6
-    ext 8            | binary          | 0xC7
-    ext 16           | binary          | 0xC8
-    ext 32           | binary          | 0xC9
-    fixext 1         | binary          | 0xD4
-    fixext 2         | binary          | 0xD5
-    fixext 4         | binary          | 0xD6
-    fixext 8         | binary          | 0xD7
-    fixext 16        | binary          | 0xD8
-    negative fixint  | number_integer  | 0xE0-0xFF
-
-    @note Any MessagePack output created @ref to_msgpack can be successfully
-          parsed by @ref from_msgpack.
-
-    @param[in] i  an input in MessagePack format convertible to an input
-                  adapter
-    @param[in] strict  whether to expect the input to be consumed until EOF
-                       (true by default)
-    @param[in] allow_exceptions  whether to throw exceptions in case of a
-    parse error (optional, true by default)
-
-    @return deserialized JSON value; in case of a parse error and
-            @a allow_exceptions set to `false`, the return value will be
-            value_t::discarded.
-
-    @throw parse_error.110 if the given input ends prematurely or the end of
-    file was not reached when @a strict was set to true
-    @throw parse_error.112 if unsupported features from MessagePack were
-    used in the given input @a i or if the input is not valid MessagePack
-    @throw parse_error.113 if a string was expected as map key, but not found
-
-    @complexity Linear in the size of the input @a i.
-
-    @liveexample{The example shows the deserialization of a byte vector in
-    MessagePack format to a JSON value.,from_msgpack}
-
-    @sa http://msgpack.org
-    @sa @ref to_msgpack(const basic_json&) for the analogous serialization
-    @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool, const cbor_tag_handler_t) for the
-        related CBOR format
-    @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for
-        the related UBJSON format
-    @sa @ref from_bson(detail::input_adapter&&, const bool, const bool) for
-        the related BSON format
-
-    @since version 2.0.9; parameter @a start_index since 2.1.1; changed to
-           consume input adapters, removed start_index parameter, and added
-           @a strict parameter since 3.0.0; added @a allow_exceptions parameter
-           since 3.2.0
-    */
+
+    /// @brief create a JSON value from an input in MessagePack format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_msgpack/
     template<typename InputType>
     JSON_HEDLEY_WARN_UNUSED_RESULT
     static basic_json from_msgpack(InputType&& i,
@@ -24509,13 +23726,12 @@ class basic_json
         basic_json result;
         detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
         auto ia = detail::input_adapter(std::forward<InputType>(i));
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::msgpack, &sdp, strict);
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::msgpack).sax_parse(input_format_t::msgpack, &sdp, strict);
         return res ? result : basic_json(value_t::discarded);
     }
 
-    /*!
-    @copydoc from_msgpack(detail::input_adapter&&, const bool, const bool)
-    */
+    /// @brief create a JSON value from an input in MessagePack format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_msgpack/
     template<typename IteratorType>
     JSON_HEDLEY_WARN_UNUSED_RESULT
     static basic_json from_msgpack(IteratorType first, IteratorType last,
@@ -24525,11 +23741,10 @@ class basic_json
         basic_json result;
         detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
         auto ia = detail::input_adapter(std::move(first), std::move(last));
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::msgpack, &sdp, strict);
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::msgpack).sax_parse(input_format_t::msgpack, &sdp, strict);
         return res ? result : basic_json(value_t::discarded);
     }
 
-
     template<typename T>
     JSON_HEDLEY_WARN_UNUSED_RESULT
     JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_msgpack(ptr, ptr + len))
@@ -24549,73 +23764,13 @@ class basic_json
         basic_json result;
         detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
         auto ia = i.get();
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::msgpack, &sdp, strict);
+        // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::msgpack).sax_parse(input_format_t::msgpack, &sdp, strict);
         return res ? result : basic_json(value_t::discarded);
     }
 
-
-    /*!
-    @brief create a JSON value from an input in UBJSON format
-
-    Deserializes a given input @a i to a JSON value using the UBJSON (Universal
-    Binary JSON) serialization format.
-
-    The library maps UBJSON types to JSON value types as follows:
-
-    UBJSON type | JSON value type                         | marker
-    ----------- | --------------------------------------- | ------
-    no-op       | *no value, next value is read*          | `N`
-    null        | `null`                                  | `Z`
-    false       | `false`                                 | `F`
-    true        | `true`                                  | `T`
-    float32     | number_float                            | `d`
-    float64     | number_float                            | `D`
-    uint8       | number_unsigned                         | `U`
-    int8        | number_integer                          | `i`
-    int16       | number_integer                          | `I`
-    int32       | number_integer                          | `l`
-    int64       | number_integer                          | `L`
-    high-precision number | number_integer, number_unsigned, or number_float - depends on number string | 'H'
-    string      | string                                  | `S`
-    char        | string                                  | `C`
-    array       | array (optimized values are supported)  | `[`
-    object      | object (optimized values are supported) | `{`
-
-    @note The mapping is **complete** in the sense that any UBJSON value can
-          be converted to a JSON value.
-
-    @param[in] i  an input in UBJSON format convertible to an input adapter
-    @param[in] strict  whether to expect the input to be consumed until EOF
-                       (true by default)
-    @param[in] allow_exceptions  whether to throw exceptions in case of a
-    parse error (optional, true by default)
-
-    @return deserialized JSON value; in case of a parse error and
-            @a allow_exceptions set to `false`, the return value will be
-            value_t::discarded.
-
-    @throw parse_error.110 if the given input ends prematurely or the end of
-    file was not reached when @a strict was set to true
-    @throw parse_error.112 if a parse error occurs
-    @throw parse_error.113 if a string could not be parsed successfully
-
-    @complexity Linear in the size of the input @a i.
-
-    @liveexample{The example shows the deserialization of a byte vector in
-    UBJSON format to a JSON value.,from_ubjson}
-
-    @sa http://ubjson.org
-    @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the
-             analogous serialization
-    @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool, const cbor_tag_handler_t) for the
-        related CBOR format
-    @sa @ref from_msgpack(detail::input_adapter&&, const bool, const bool) for
-        the related MessagePack format
-    @sa @ref from_bson(detail::input_adapter&&, const bool, const bool) for
-        the related BSON format
-
-    @since version 3.1.0; added @a allow_exceptions parameter since 3.2.0
-    */
+    /// @brief create a JSON value from an input in UBJSON format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_ubjson/
     template<typename InputType>
     JSON_HEDLEY_WARN_UNUSED_RESULT
     static basic_json from_ubjson(InputType&& i,
@@ -24625,13 +23780,12 @@ class basic_json
         basic_json result;
         detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
         auto ia = detail::input_adapter(std::forward<InputType>(i));
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::ubjson, &sdp, strict);
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::ubjson).sax_parse(input_format_t::ubjson, &sdp, strict);
         return res ? result : basic_json(value_t::discarded);
     }
 
-    /*!
-    @copydoc from_ubjson(detail::input_adapter&&, const bool, const bool)
-    */
+    /// @brief create a JSON value from an input in UBJSON format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_ubjson/
     template<typename IteratorType>
     JSON_HEDLEY_WARN_UNUSED_RESULT
     static basic_json from_ubjson(IteratorType first, IteratorType last,
@@ -24641,7 +23795,7 @@ class basic_json
         basic_json result;
         detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
         auto ia = detail::input_adapter(std::move(first), std::move(last));
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::ubjson, &sdp, strict);
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::ubjson).sax_parse(input_format_t::ubjson, &sdp, strict);
         return res ? result : basic_json(value_t::discarded);
     }
 
@@ -24664,71 +23818,43 @@ class basic_json
         basic_json result;
         detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
         auto ia = i.get();
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::ubjson, &sdp, strict);
+        // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::ubjson).sax_parse(input_format_t::ubjson, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in BJData format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_bjdata/
+    template<typename InputType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_bjdata(InputType&& i,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = detail::input_adapter(std::forward<InputType>(i));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::bjdata).sax_parse(input_format_t::bjdata, &sdp, strict);
         return res ? result : basic_json(value_t::discarded);
     }
 
+    /// @brief create a JSON value from an input in BJData format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_bjdata/
+    template<typename IteratorType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_bjdata(IteratorType first, IteratorType last,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = detail::input_adapter(std::move(first), std::move(last));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::bjdata).sax_parse(input_format_t::bjdata, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
 
-    /*!
-    @brief Create a JSON value from an input in BSON format
-
-    Deserializes a given input @a i to a JSON value using the BSON (Binary JSON)
-    serialization format.
-
-    The library maps BSON record types to JSON value types as follows:
-
-    BSON type       | BSON marker byte | JSON value type
-    --------------- | ---------------- | ---------------------------
-    double          | 0x01             | number_float
-    string          | 0x02             | string
-    document        | 0x03             | object
-    array           | 0x04             | array
-    binary          | 0x05             | binary
-    undefined       | 0x06             | still unsupported
-    ObjectId        | 0x07             | still unsupported
-    boolean         | 0x08             | boolean
-    UTC Date-Time   | 0x09             | still unsupported
-    null            | 0x0A             | null
-    Regular Expr.   | 0x0B             | still unsupported
-    DB Pointer      | 0x0C             | still unsupported
-    JavaScript Code | 0x0D             | still unsupported
-    Symbol          | 0x0E             | still unsupported
-    JavaScript Code | 0x0F             | still unsupported
-    int32           | 0x10             | number_integer
-    Timestamp       | 0x11             | still unsupported
-    128-bit decimal float | 0x13       | still unsupported
-    Max Key         | 0x7F             | still unsupported
-    Min Key         | 0xFF             | still unsupported
-
-    @warning The mapping is **incomplete**. The unsupported mappings
-             are indicated in the table above.
-
-    @param[in] i  an input in BSON format convertible to an input adapter
-    @param[in] strict  whether to expect the input to be consumed until EOF
-                       (true by default)
-    @param[in] allow_exceptions  whether to throw exceptions in case of a
-    parse error (optional, true by default)
-
-    @return deserialized JSON value; in case of a parse error and
-            @a allow_exceptions set to `false`, the return value will be
-            value_t::discarded.
-
-    @throw parse_error.114 if an unsupported BSON record type is encountered
-
-    @complexity Linear in the size of the input @a i.
-
-    @liveexample{The example shows the deserialization of a byte vector in
-    BSON format to a JSON value.,from_bson}
-
-    @sa http://bsonspec.org/spec.html
-    @sa @ref to_bson(const basic_json&) for the analogous serialization
-    @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool, const cbor_tag_handler_t) for the
-        related CBOR format
-    @sa @ref from_msgpack(detail::input_adapter&&, const bool, const bool) for
-        the related MessagePack format
-    @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for the
-        related UBJSON format
-    */
+    /// @brief create a JSON value from an input in BSON format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_bson/
     template<typename InputType>
     JSON_HEDLEY_WARN_UNUSED_RESULT
     static basic_json from_bson(InputType&& i,
@@ -24738,13 +23864,12 @@ class basic_json
         basic_json result;
         detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
         auto ia = detail::input_adapter(std::forward<InputType>(i));
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::bson, &sdp, strict);
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::bson).sax_parse(input_format_t::bson, &sdp, strict);
         return res ? result : basic_json(value_t::discarded);
     }
 
-    /*!
-    @copydoc from_bson(detail::input_adapter&&, const bool, const bool)
-    */
+    /// @brief create a JSON value from an input in BSON format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_bson/
     template<typename IteratorType>
     JSON_HEDLEY_WARN_UNUSED_RESULT
     static basic_json from_bson(IteratorType first, IteratorType last,
@@ -24754,7 +23879,7 @@ class basic_json
         basic_json result;
         detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
         auto ia = detail::input_adapter(std::move(first), std::move(last));
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::bson, &sdp, strict);
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::bson).sax_parse(input_format_t::bson, &sdp, strict);
         return res ? result : basic_json(value_t::discarded);
     }
 
@@ -24777,7 +23902,8 @@ class basic_json
         basic_json result;
         detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
         auto ia = i.get();
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::bson, &sdp, strict);
+        // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::bson).sax_parse(input_format_t::bson, &sdp, strict);
         return res ? result : basic_json(value_t::discarded);
     }
     /// @}
@@ -24789,180 +23915,64 @@ class basic_json
     /// @name JSON Pointer functions
     /// @{
 
-    /*!
-    @brief access specified element via JSON Pointer
-
-    Uses a JSON pointer to retrieve a reference to the respective JSON value.
-    No bound checking is performed. Similar to @ref operator[](const typename
-    object_t::key_type&), `null` values are created in arrays and objects if
-    necessary.
-
-    In particular:
-    - If the JSON pointer points to an object key that does not exist, it
-      is created an filled with a `null` value before a reference to it
-      is returned.
-    - If the JSON pointer points to an array index that does not exist, it
-      is created an filled with a `null` value before a reference to it
-      is returned. All indices between the current maximum and the given
-      index are also filled with `null`.
-    - The special value `-` is treated as a synonym for the index past the
-      end.
-
-    @param[in] ptr  a JSON pointer
-
-    @return reference to the element pointed to by @a ptr
-
-    @complexity Constant.
-
-    @throw parse_error.106   if an array index begins with '0'
-    @throw parse_error.109   if an array index was not a number
-    @throw out_of_range.404  if the JSON pointer can not be resolved
-
-    @liveexample{The behavior is shown in the example.,operatorjson_pointer}
-
-    @since version 2.0.0
-    */
+    /// @brief access specified element via JSON Pointer
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
     reference operator[](const json_pointer& ptr)
     {
         return ptr.get_unchecked(this);
     }
 
-    /*!
-    @brief access specified element via JSON Pointer
-
-    Uses a JSON pointer to retrieve a reference to the respective JSON value.
-    No bound checking is performed. The function does not change the JSON
-    value; no `null` values are created. In particular, the special value
-    `-` yields an exception.
-
-    @param[in] ptr  JSON pointer to the desired element
-
-    @return const reference to the element pointed to by @a ptr
-
-    @complexity Constant.
-
-    @throw parse_error.106   if an array index begins with '0'
-    @throw parse_error.109   if an array index was not a number
-    @throw out_of_range.402  if the array index '-' is used
-    @throw out_of_range.404  if the JSON pointer can not be resolved
-
-    @liveexample{The behavior is shown in the example.,operatorjson_pointer_const}
+    template<typename BasicJsonType, detail::enable_if_t<detail::is_basic_json<BasicJsonType>::value, int> = 0>
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
+    reference operator[](const ::nlohmann::json_pointer<BasicJsonType>& ptr)
+    {
+        return ptr.get_unchecked(this);
+    }
 
-    @since version 2.0.0
-    */
+    /// @brief access specified element via JSON Pointer
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
     const_reference operator[](const json_pointer& ptr) const
     {
         return ptr.get_unchecked(this);
     }
 
-    /*!
-    @brief access specified element via JSON Pointer
-
-    Returns a reference to the element at with specified JSON pointer @a ptr,
-    with bounds checking.
-
-    @param[in] ptr  JSON pointer to the desired element
-
-    @return reference to the element pointed to by @a ptr
-
-    @throw parse_error.106 if an array index in the passed JSON pointer @a ptr
-    begins with '0'. See example below.
-
-    @throw parse_error.109 if an array index in the passed JSON pointer @a ptr
-    is not a number. See example below.
-
-    @throw out_of_range.401 if an array index in the passed JSON pointer @a ptr
-    is out of range. See example below.
-
-    @throw out_of_range.402 if the array index '-' is used in the passed JSON
-    pointer @a ptr. As `at` provides checked access (and no elements are
-    implicitly inserted), the index '-' is always invalid. See example below.
-
-    @throw out_of_range.403 if the JSON pointer describes a key of an object
-    which cannot be found. See example below.
-
-    @throw out_of_range.404 if the JSON pointer @a ptr can not be resolved.
-    See example below.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes in the JSON value.
-
-    @complexity Constant.
-
-    @since version 2.0.0
+    template<typename BasicJsonType, detail::enable_if_t<detail::is_basic_json<BasicJsonType>::value, int> = 0>
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
+    const_reference operator[](const ::nlohmann::json_pointer<BasicJsonType>& ptr) const
+    {
+        return ptr.get_unchecked(this);
+    }
 
-    @liveexample{The behavior is shown in the example.,at_json_pointer}
-    */
+    /// @brief access specified element via JSON Pointer
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
     reference at(const json_pointer& ptr)
     {
         return ptr.get_checked(this);
     }
 
-    /*!
-    @brief access specified element via JSON Pointer
-
-    Returns a const reference to the element at with specified JSON pointer @a
-    ptr, with bounds checking.
-
-    @param[in] ptr  JSON pointer to the desired element
-
-    @return reference to the element pointed to by @a ptr
-
-    @throw parse_error.106 if an array index in the passed JSON pointer @a ptr
-    begins with '0'. See example below.
-
-    @throw parse_error.109 if an array index in the passed JSON pointer @a ptr
-    is not a number. See example below.
-
-    @throw out_of_range.401 if an array index in the passed JSON pointer @a ptr
-    is out of range. See example below.
-
-    @throw out_of_range.402 if the array index '-' is used in the passed JSON
-    pointer @a ptr. As `at` provides checked access (and no elements are
-    implicitly inserted), the index '-' is always invalid. See example below.
-
-    @throw out_of_range.403 if the JSON pointer describes a key of an object
-    which cannot be found. See example below.
-
-    @throw out_of_range.404 if the JSON pointer @a ptr can not be resolved.
-    See example below.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes in the JSON value.
-
-    @complexity Constant.
-
-    @since version 2.0.0
+    template<typename BasicJsonType, detail::enable_if_t<detail::is_basic_json<BasicJsonType>::value, int> = 0>
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
+    reference at(const ::nlohmann::json_pointer<BasicJsonType>& ptr)
+    {
+        return ptr.get_checked(this);
+    }
 
-    @liveexample{The behavior is shown in the example.,at_json_pointer_const}
-    */
+    /// @brief access specified element via JSON Pointer
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
     const_reference at(const json_pointer& ptr) const
     {
         return ptr.get_checked(this);
     }
 
-    /*!
-    @brief return flattened JSON value
-
-    The function creates a JSON object whose keys are JSON pointers (see [RFC
-    6901](https://tools.ietf.org/html/rfc6901)) and whose values are all
-    primitive. The original JSON value can be restored using the @ref
-    unflatten() function.
-
-    @return an object that maps JSON pointers to primitive values
-
-    @note Empty objects and arrays are flattened to `null` and will not be
-          reconstructed correctly by the @ref unflatten() function.
-
-    @complexity Linear in the size the JSON value.
-
-    @liveexample{The following code shows how a JSON object is flattened to an
-    object whose keys consist of JSON pointers.,flatten}
-
-    @sa @ref unflatten() for the reverse function
+    template<typename BasicJsonType, detail::enable_if_t<detail::is_basic_json<BasicJsonType>::value, int> = 0>
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
+    const_reference at(const ::nlohmann::json_pointer<BasicJsonType>& ptr) const
+    {
+        return ptr.get_checked(this);
+    }
 
-    @since version 2.0.0
-    */
+    /// @brief return flattened JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/flatten/
     basic_json flatten() const
     {
         basic_json result(value_t::object);
@@ -24970,36 +23980,8 @@ class basic_json
         return result;
     }
 
-    /*!
-    @brief unflatten a previously flattened JSON value
-
-    The function restores the arbitrary nesting of a JSON value that has been
-    flattened before using the @ref flatten() function. The JSON value must
-    meet certain constraints:
-    1. The value must be an object.
-    2. The keys must be JSON pointers (see
-       [RFC 6901](https://tools.ietf.org/html/rfc6901))
-    3. The mapped values must be primitive JSON types.
-
-    @return the original JSON from a flattened version
-
-    @note Empty objects and arrays are flattened by @ref flatten() to `null`
-          values and can not unflattened to their original type. Apart from
-          this example, for a JSON value `j`, the following is always true:
-          `j == j.flatten().unflatten()`.
-
-    @complexity Linear in the size the JSON value.
-
-    @throw type_error.314  if value is not an object
-    @throw type_error.315  if object values are not primitive
-
-    @liveexample{The following code shows how a flattened JSON object is
-    unflattened into the original nested JSON object.,unflatten}
-
-    @sa @ref flatten() for the reverse function
-
-    @since version 2.0.0
-    */
+    /// @brief unflatten a previously flattened JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/unflatten/
     basic_json unflatten() const
     {
         return json_pointer::unflatten(*this);
@@ -25014,58 +23996,11 @@ class basic_json
     /// @name JSON Patch functions
     /// @{
 
-    /*!
-    @brief applies a JSON patch
-
-    [JSON Patch](http://jsonpatch.com) defines a JSON document structure for
-    expressing a sequence of operations to apply to a JSON) document. With
-    this function, a JSON Patch is applied to the current JSON value by
-    executing all operations from the patch.
-
-    @param[in] json_patch  JSON patch document
-    @return patched document
-
-    @note The application of a patch is atomic: Either all operations succeed
-          and the patched document is returned or an exception is thrown. In
-          any case, the original value is not changed: the patch is applied
-          to a copy of the value.
-
-    @throw parse_error.104 if the JSON patch does not consist of an array of
-    objects
-
-    @throw parse_error.105 if the JSON patch is malformed (e.g., mandatory
-    attributes are missing); example: `"operation add must have member path"`
-
-    @throw out_of_range.401 if an array index is out of range.
-
-    @throw out_of_range.403 if a JSON pointer inside the patch could not be
-    resolved successfully in the current JSON value; example: `"key baz not
-    found"`
-
-    @throw out_of_range.405 if JSON pointer has no parent ("add", "remove",
-    "move")
-
-    @throw other_error.501 if "test" operation was unsuccessful
-
-    @complexity Linear in the size of the JSON value and the length of the
-    JSON patch. As usually only a fraction of the JSON value is affected by
-    the patch, the complexity can usually be neglected.
-
-    @liveexample{The following code shows how a JSON patch is applied to a
-    value.,patch}
-
-    @sa @ref diff -- create a JSON patch by comparing two JSON values
-
-    @sa [RFC 6902 (JSON Patch)](https://tools.ietf.org/html/rfc6902)
-    @sa [RFC 6901 (JSON Pointer)](https://tools.ietf.org/html/rfc6901)
-
-    @since version 2.0.0
-    */
-    basic_json patch(const basic_json& json_patch) const
+    /// @brief applies a JSON patch in-place without copying the object
+    /// @sa https://json.nlohmann.me/api/basic_json/patch/
+    void patch_inplace(const basic_json& json_patch)
     {
-        // make a working copy to apply the patch to
-        basic_json result = *this;
-
+        basic_json& result = *this;
         // the valid JSON Patch operations
         enum class patch_operations {add, remove, replace, move, copy, test, invalid};
 
@@ -25110,7 +24045,7 @@ class basic_json
             }
 
             // make sure the top element of the pointer exists
-            json_pointer top_pointer = ptr.top();
+            json_pointer const top_pointer = ptr.top();
             if (top_pointer != ptr)
             {
                 result.at(top_pointer);
@@ -25119,9 +24054,10 @@ class basic_json
             // get reference to parent of JSON pointer ptr
             const auto last_path = ptr.back();
             ptr.pop_back();
-            basic_json& parent = result[ptr];
+            // parent must exist when performing patch add per RFC6902 specs
+            basic_json& parent = result.at(ptr);
 
-            switch (parent.m_type)
+            switch (parent.m_data.m_type)
             {
                 case value_t::null:
                 case value_t::object:
@@ -25140,11 +24076,11 @@ class basic_json
                     }
                     else
                     {
-                        const auto idx = json_pointer::array_index(last_path);
+                        const auto idx = json_pointer::template array_index<basic_json_t>(last_path);
                         if (JSON_HEDLEY_UNLIKELY(idx > parent.size()))
                         {
                             // avoid undefined behavior
-                            JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range", parent));
+                            JSON_THROW(out_of_range::create(401, detail::concat("array index ", std::to_string(idx), " is out of range"), &parent));
                         }
 
                         // default case: insert add offset
@@ -25154,13 +24090,20 @@ class basic_json
                 }
 
                 // if there exists a parent it cannot be primitive
+                case value_t::string: // LCOV_EXCL_LINE
+                case value_t::boolean: // LCOV_EXCL_LINE
+                case value_t::number_integer: // LCOV_EXCL_LINE
+                case value_t::number_unsigned: // LCOV_EXCL_LINE
+                case value_t::number_float: // LCOV_EXCL_LINE
+                case value_t::binary: // LCOV_EXCL_LINE
+                case value_t::discarded: // LCOV_EXCL_LINE
                 default:            // LCOV_EXCL_LINE
-                    JSON_ASSERT(false);  // LCOV_EXCL_LINE
+                    JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
             }
         };
 
         // wrapper for "remove" operation; remove value at ptr
-        const auto operation_remove = [this, &result](json_pointer & ptr)
+        const auto operation_remove = [this, & result](json_pointer & ptr)
         {
             // get reference to parent of JSON pointer ptr
             const auto last_path = ptr.back();
@@ -25178,20 +24121,20 @@ class basic_json
                 }
                 else
                 {
-                    JSON_THROW(out_of_range::create(403, "key '" + last_path + "' not found", *this));
+                    JSON_THROW(out_of_range::create(403, detail::concat("key '", last_path, "' not found"), this));
                 }
             }
             else if (parent.is_array())
             {
                 // note erase performs range check
-                parent.erase(json_pointer::array_index(last_path));
+                parent.erase(json_pointer::template array_index<basic_json_t>(last_path));
             }
         };
 
         // type check: top level value must be an array
         if (JSON_HEDLEY_UNLIKELY(!json_patch.is_array()))
         {
-            JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects", json_patch));
+            JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects", &json_patch));
         }
 
         // iterate and apply the operations
@@ -25203,21 +24146,23 @@ class basic_json
                                           bool string_type) -> basic_json &
             {
                 // find value
-                auto it = val.m_value.object->find(member);
+                auto it = val.m_data.m_value.object->find(member);
 
                 // context-sensitive error message
-                const auto error_msg = (op == "op") ? "operation" : "operation '" + op + "'";
+                const auto error_msg = (op == "op") ? "operation" : detail::concat("operation '", op, '\'');
 
                 // check if desired value is present
-                if (JSON_HEDLEY_UNLIKELY(it == val.m_value.object->end()))
+                if (JSON_HEDLEY_UNLIKELY(it == val.m_data.m_value.object->end()))
                 {
-                    JSON_THROW(parse_error::create(105, 0, error_msg + " must have member '" + member + "'", val));
+                    // NOLINTNEXTLINE(performance-inefficient-string-concatenation)
+                    JSON_THROW(parse_error::create(105, 0, detail::concat(error_msg, " must have member '", member, "'"), &val));
                 }
 
                 // check if result is of type string
                 if (JSON_HEDLEY_UNLIKELY(string_type && !it->second.is_string()))
                 {
-                    JSON_THROW(parse_error::create(105, 0, error_msg + " must have string member '" + member + "'", val));
+                    // NOLINTNEXTLINE(performance-inefficient-string-concatenation)
+                    JSON_THROW(parse_error::create(105, 0, detail::concat(error_msg, " must have string member '", member, "'"), &val));
                 }
 
                 // no error: return value
@@ -25227,7 +24172,7 @@ class basic_json
             // type check: every element of the array must be an object
             if (JSON_HEDLEY_UNLIKELY(!val.is_object()))
             {
-                JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects", val));
+                JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects", &val));
             }
 
             // collect mandatory members
@@ -25262,7 +24207,7 @@ class basic_json
                     json_pointer from_ptr(from_path);
 
                     // the "from" location must exist - use at()
-                    basic_json v = result.at(from_ptr);
+                    basic_json const v = result.at(from_ptr);
 
                     // The move operation is functionally identical to a
                     // "remove" operation on the "from" location, followed
@@ -25279,7 +24224,7 @@ class basic_json
                     const json_pointer from_ptr(from_path);
 
                     // the "from" location must exist - use at()
-                    basic_json v = result.at(from_ptr);
+                    basic_json const v = result.at(from_ptr);
 
                     // The copy is functionally identical to an "add"
                     // operation at the target location using the value
@@ -25305,57 +24250,34 @@ class basic_json
                     // throw an exception if test fails
                     if (JSON_HEDLEY_UNLIKELY(!success))
                     {
-                        JSON_THROW(other_error::create(501, "unsuccessful: " + val.dump(), val));
+                        JSON_THROW(other_error::create(501, detail::concat("unsuccessful: ", val.dump()), &val));
                     }
 
                     break;
                 }
 
+                case patch_operations::invalid:
                 default:
                 {
                     // op must be "add", "remove", "replace", "move", "copy", or
                     // "test"
-                    JSON_THROW(parse_error::create(105, 0, "operation value '" + op + "' is invalid", val));
+                    JSON_THROW(parse_error::create(105, 0, detail::concat("operation value '", op, "' is invalid"), &val));
                 }
             }
         }
+    }
 
+    /// @brief applies a JSON patch to a copy of the current object
+    /// @sa https://json.nlohmann.me/api/basic_json/patch/
+    basic_json patch(const basic_json& json_patch) const
+    {
+        basic_json result = *this;
+        result.patch_inplace(json_patch);
         return result;
     }
 
-    /*!
-    @brief creates a diff as a JSON patch
-
-    Creates a [JSON Patch](http://jsonpatch.com) so that value @a source can
-    be changed into the value @a target by calling @ref patch function.
-
-    @invariant For two JSON values @a source and @a target, the following code
-    yields always `true`:
-    @code {.cpp}
-    source.patch(diff(source, target)) == target;
-    @endcode
-
-    @note Currently, only `remove`, `add`, and `replace` operations are
-          generated.
-
-    @param[in] source  JSON value to compare from
-    @param[in] target  JSON value to compare against
-    @param[in] path    helper value to create JSON pointers
-
-    @return a JSON patch to convert the @a source to @a target
-
-    @complexity Linear in the lengths of @a source and @a target.
-
-    @liveexample{The following code shows how a JSON patch is created as a
-    diff for two JSON values.,diff}
-
-    @sa @ref patch -- apply a JSON patch
-    @sa @ref merge_patch -- apply a JSON Merge Patch
-
-    @sa [RFC 6902 (JSON Patch)](https://tools.ietf.org/html/rfc6902)
-
-    @since version 2.0.0
-    */
+    /// @brief creates a diff as a JSON patch
+    /// @sa https://json.nlohmann.me/api/basic_json/diff/
     JSON_HEDLEY_WARN_UNUSED_RESULT
     static basic_json diff(const basic_json& source, const basic_json& target,
                            const std::string& path = "")
@@ -25388,12 +24310,12 @@ class basic_json
                 while (i < source.size() && i < target.size())
                 {
                     // recursive call to compare array values at index i
-                    auto temp_diff = diff(source[i], target[i], path + "/" + std::to_string(i));
+                    auto temp_diff = diff(source[i], target[i], detail::concat(path, '/', std::to_string(i)));
                     result.insert(result.end(), temp_diff.begin(), temp_diff.end());
                     ++i;
                 }
 
-                // i now reached the end of at least one array
+                // We now reached the end of at least one array
                 // in a second pass, traverse the remaining elements
 
                 // remove my remaining elements
@@ -25405,7 +24327,7 @@ class basic_json
                     result.insert(result.begin() + end_index, object(
                     {
                         {"op", "remove"},
-                        {"path", path + "/" + std::to_string(i)}
+                        {"path", detail::concat(path, '/', std::to_string(i))}
                     }));
                     ++i;
                 }
@@ -25416,7 +24338,7 @@ class basic_json
                     result.push_back(
                     {
                         {"op", "add"},
-                        {"path", path + "/-"},
+                        {"path", detail::concat(path, "/-")},
                         {"value", target[i]}
                     });
                     ++i;
@@ -25431,12 +24353,12 @@ class basic_json
                 for (auto it = source.cbegin(); it != source.cend(); ++it)
                 {
                     // escape the key name to be used in a JSON patch
-                    const auto key = detail::escape(it.key());
+                    const auto path_key = detail::concat(path, '/', detail::escape(it.key()));
 
                     if (target.find(it.key()) != target.end())
                     {
                         // recursive call to compare object values at key it
-                        auto temp_diff = diff(it.value(), target[it.key()], path + "/" + key);
+                        auto temp_diff = diff(it.value(), target[it.key()], path_key);
                         result.insert(result.end(), temp_diff.begin(), temp_diff.end());
                     }
                     else
@@ -25444,7 +24366,7 @@ class basic_json
                         // found a key that is not in o -> remove it
                         result.push_back(object(
                         {
-                            {"op", "remove"}, {"path", path + "/" + key}
+                            {"op", "remove"}, {"path", path_key}
                         }));
                     }
                 }
@@ -25455,10 +24377,10 @@ class basic_json
                     if (source.find(it.key()) == source.end())
                     {
                         // found a key that is not in this -> add it
-                        const auto key = detail::escape(it.key());
+                        const auto path_key = detail::concat(path, '/', detail::escape(it.key()));
                         result.push_back(
                         {
-                            {"op", "add"}, {"path", path + "/" + key},
+                            {"op", "add"}, {"path", path_key},
                             {"value", it.value()}
                         });
                     }
@@ -25467,6 +24389,14 @@ class basic_json
                 break;
             }
 
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
             default:
             {
                 // both primitive type: replace value
@@ -25480,7 +24410,6 @@ class basic_json
 
         return result;
     }
-
     /// @}
 
     ////////////////////////////////
@@ -25490,48 +24419,8 @@ class basic_json
     /// @name JSON Merge Patch functions
     /// @{
 
-    /*!
-    @brief applies a JSON Merge Patch
-
-    The merge patch format is primarily intended for use with the HTTP PATCH
-    method as a means of describing a set of modifications to a target
-    resource's content. This function applies a merge patch to the current
-    JSON value.
-
-    The function implements the following algorithm from Section 2 of
-    [RFC 7396 (JSON Merge Patch)](https://tools.ietf.org/html/rfc7396):
-
-    ```
-    define MergePatch(Target, Patch):
-      if Patch is an Object:
-        if Target is not an Object:
-          Target = {} // Ignore the contents and set it to an empty Object
-        for each Name/Value pair in Patch:
-          if Value is null:
-            if Name exists in Target:
-              remove the Name/Value pair from Target
-          else:
-            Target[Name] = MergePatch(Target[Name], Value)
-        return Target
-      else:
-        return Patch
-    ```
-
-    Thereby, `Target` is the current object; that is, the patch is applied to
-    the current value.
-
-    @param[in] apply_patch  the patch to apply
-
-    @complexity Linear in the lengths of @a patch.
-
-    @liveexample{The following code shows how a JSON Merge Patch is applied to
-    a JSON document.,merge_patch}
-
-    @sa @ref patch -- apply a JSON patch
-    @sa [RFC 7396 (JSON Merge Patch)](https://tools.ietf.org/html/rfc7396)
-
-    @since version 3.0.0
-    */
+    /// @brief applies a JSON Merge Patch
+    /// @sa https://json.nlohmann.me/api/basic_json/merge_patch/
     void merge_patch(const basic_json& apply_patch)
     {
         if (apply_patch.is_object())
@@ -25561,146 +24450,167 @@ class basic_json
     /// @}
 };
 
-/*!
-@brief user-defined to_string function for JSON values
-
-This function implements a user-defined to_string  for JSON objects.
-
-@param[in] j  a JSON object
-@return a std::string object
-*/
-
+/// @brief user-defined to_string function for JSON values
+/// @sa https://json.nlohmann.me/api/basic_json/to_string/
 NLOHMANN_BASIC_JSON_TPL_DECLARATION
 std::string to_string(const NLOHMANN_BASIC_JSON_TPL& j)
 {
     return j.dump();
 }
-} // namespace nlohmann
+
+inline namespace literals
+{
+inline namespace json_literals
+{
+
+/// @brief user-defined string literal for JSON values
+/// @sa https://json.nlohmann.me/api/basic_json/operator_literal_json/
+JSON_HEDLEY_NON_NULL(1)
+#if !defined(JSON_HEDLEY_GCC_VERSION) || JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0)
+    inline nlohmann::json operator ""_json(const char* s, std::size_t n)
+#else
+    inline nlohmann::json operator "" _json(const char* s, std::size_t n)
+#endif
+{
+    return nlohmann::json::parse(s, s + n);
+}
+
+/// @brief user-defined string literal for JSON pointer
+/// @sa https://json.nlohmann.me/api/basic_json/operator_literal_json_pointer/
+JSON_HEDLEY_NON_NULL(1)
+#if !defined(JSON_HEDLEY_GCC_VERSION) || JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0)
+    inline nlohmann::json::json_pointer operator ""_json_pointer(const char* s, std::size_t n)
+#else
+    inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std::size_t n)
+#endif
+{
+    return nlohmann::json::json_pointer(std::string(s, n));
+}
+
+}  // namespace json_literals
+}  // namespace literals
+NLOHMANN_JSON_NAMESPACE_END
 
 ///////////////////////
 // nonmember support //
 ///////////////////////
 
-// specialization of std::swap, and std::hash
-namespace std
+namespace std // NOLINT(cert-dcl58-cpp)
 {
 
-/// hash value for JSON objects
-template<>
-struct hash<nlohmann::json>
+/// @brief hash value for JSON objects
+/// @sa https://json.nlohmann.me/api/basic_json/std_hash/
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+struct hash<nlohmann::NLOHMANN_BASIC_JSON_TPL> // NOLINT(cert-dcl58-cpp)
 {
-    /*!
-    @brief return a hash value for a JSON object
-
-    @since version 1.0.0
-    */
-    std::size_t operator()(const nlohmann::json& j) const
+    std::size_t operator()(const nlohmann::NLOHMANN_BASIC_JSON_TPL& j) const
     {
         return nlohmann::detail::hash(j);
     }
 };
 
-/// specialization for std::less<value_t>
-/// @note: do not remove the space after '<',
-///        see https://github.com/nlohmann/json/pull/679
+// specialization for std::less<value_t>
 template<>
-struct less<::nlohmann::detail::value_t>
+struct less< ::nlohmann::detail::value_t> // do not remove the space after '<', see https://github.com/nlohmann/json/pull/679
 {
     /*!
     @brief compare two value_t enum values
     @since version 3.0.0
     */
-    bool operator()(nlohmann::detail::value_t lhs,
-                    nlohmann::detail::value_t rhs) const noexcept
+    bool operator()(::nlohmann::detail::value_t lhs,
+                    ::nlohmann::detail::value_t rhs) const noexcept
     {
-        return nlohmann::detail::operator<(lhs, rhs);
+#if JSON_HAS_THREE_WAY_COMPARISON
+        return std::is_lt(lhs <=> rhs); // *NOPAD*
+#else
+        return ::nlohmann::detail::operator<(lhs, rhs);
+#endif
     }
 };
 
 // C++20 prohibit function specialization in the std namespace.
 #ifndef JSON_HAS_CPP_20
 
-/*!
-@brief exchanges the values of two JSON objects
-
-@since version 1.0.0
-*/
-template<>
-inline void swap<nlohmann::json>(nlohmann::json& j1, nlohmann::json& j2) noexcept(
-    is_nothrow_move_constructible<nlohmann::json>::value&&
-    is_nothrow_move_assignable<nlohmann::json>::value
-                              )
+/// @brief exchanges the values of two JSON objects
+/// @sa https://json.nlohmann.me/api/basic_json/std_swap/
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+inline void swap(nlohmann::NLOHMANN_BASIC_JSON_TPL& j1, nlohmann::NLOHMANN_BASIC_JSON_TPL& j2) noexcept(  // NOLINT(readability-inconsistent-declaration-parameter-name, cert-dcl58-cpp)
+    is_nothrow_move_constructible<nlohmann::NLOHMANN_BASIC_JSON_TPL>::value&&                          // NOLINT(misc-redundant-expression,cppcoreguidelines-noexcept-swap,performance-noexcept-swap)
+    is_nothrow_move_assignable<nlohmann::NLOHMANN_BASIC_JSON_TPL>::value)
 {
     j1.swap(j2);
 }
 
 #endif
 
-} // namespace std
-
-/*!
-@brief user-defined string literal for JSON values
-
-This operator implements a user-defined string literal for JSON objects. It
-can be used by adding `"_json"` to a string literal and returns a JSON object
-if no parse error occurred.
-
-@param[in] s  a string representation of a JSON object
-@param[in] n  the length of string @a s
-@return a JSON object
+}  // namespace std
 
-@since version 1.0.0
-*/
-JSON_HEDLEY_NON_NULL(1)
-inline nlohmann::json operator "" _json(const char* s, std::size_t n)
-{
-    return nlohmann::json::parse(s, s + n);
-}
-
-/*!
-@brief user-defined string literal for JSON pointer
-
-This operator implements a user-defined string literal for JSON Pointers. It
-can be used by adding `"_json_pointer"` to a string literal and returns a JSON pointer
-object if no parse error occurred.
-
-@param[in] s  a string representation of a JSON Pointer
-@param[in] n  the length of string @a s
-@return a JSON pointer object
-
-@since version 2.0.0
-*/
-JSON_HEDLEY_NON_NULL(1)
-inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std::size_t n)
-{
-    return nlohmann::json::json_pointer(std::string(s, n));
-}
+#if JSON_USE_GLOBAL_UDLS
+    #if !defined(JSON_HEDLEY_GCC_VERSION) || JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0)
+        using nlohmann::literals::json_literals::operator ""_json; // NOLINT(misc-unused-using-decls,google-global-names-in-headers)
+        using nlohmann::literals::json_literals::operator ""_json_pointer; //NOLINT(misc-unused-using-decls,google-global-names-in-headers)
+    #else
+        using nlohmann::literals::json_literals::operator "" _json; // NOLINT(misc-unused-using-decls,google-global-names-in-headers)
+        using nlohmann::literals::json_literals::operator "" _json_pointer; //NOLINT(misc-unused-using-decls,google-global-names-in-headers)
+    #endif
+#endif
 
 // #include <nlohmann/detail/macro_unscope.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
 
 
-// restore GCC/clang diagnostic settings
-#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
-    #pragma GCC diagnostic pop
-#endif
+
+// restore clang diagnostic settings
 #if defined(__clang__)
-    #pragma GCC diagnostic pop
+    #pragma clang diagnostic pop
 #endif
 
 // clean up
 #undef JSON_ASSERT
 #undef JSON_INTERNAL_CATCH
-#undef JSON_CATCH
 #undef JSON_THROW
-#undef JSON_TRY
 #undef JSON_PRIVATE_UNLESS_TESTED
-#undef JSON_HAS_CPP_14
-#undef JSON_HAS_CPP_17
 #undef NLOHMANN_BASIC_JSON_TPL_DECLARATION
 #undef NLOHMANN_BASIC_JSON_TPL
 #undef JSON_EXPLICIT
+#undef NLOHMANN_CAN_CALL_STD_FUNC_IMPL
+#undef JSON_INLINE_VARIABLE
+#undef JSON_NO_UNIQUE_ADDRESS
+#undef JSON_DISABLE_ENUM_SERIALIZATION
+#undef JSON_USE_GLOBAL_UDLS
+
+#ifndef JSON_TEST_KEEP_MACROS
+    #undef JSON_CATCH
+    #undef JSON_TRY
+    #undef JSON_HAS_CPP_11
+    #undef JSON_HAS_CPP_14
+    #undef JSON_HAS_CPP_17
+    #undef JSON_HAS_CPP_20
+    #undef JSON_HAS_FILESYSTEM
+    #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+    #undef JSON_HAS_THREE_WAY_COMPARISON
+    #undef JSON_HAS_RANGES
+    #undef JSON_HAS_STATIC_RTTI
+    #undef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+#endif
 
 // #include <nlohmann/thirdparty/hedley/hedley_undef.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
 #undef JSON_HEDLEY_ALWAYS_INLINE
 #undef JSON_HEDLEY_ARM_VERSION
 #undef JSON_HEDLEY_ARM_VERSION_CHECK
diff --git a/external_imported/json/single_include/nlohmann/json_fwd.hpp b/external_imported/json/single_include/nlohmann/json_fwd.hpp
new file mode 100644
index 000000000..29a6036d7
--- /dev/null
+++ b/external_imported/json/single_include/nlohmann/json_fwd.hpp
@@ -0,0 +1,176 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#ifndef INCLUDE_NLOHMANN_JSON_FWD_HPP_
+#define INCLUDE_NLOHMANN_JSON_FWD_HPP_
+
+#include <cstdint> // int64_t, uint64_t
+#include <map> // map
+#include <memory> // allocator
+#include <string> // string
+#include <vector> // vector
+
+// #include <nlohmann/detail/abi_macros.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// This file contains all macro definitions affecting or depending on the ABI
+
+#ifndef JSON_SKIP_LIBRARY_VERSION_CHECK
+    #if defined(NLOHMANN_JSON_VERSION_MAJOR) && defined(NLOHMANN_JSON_VERSION_MINOR) && defined(NLOHMANN_JSON_VERSION_PATCH)
+        #if NLOHMANN_JSON_VERSION_MAJOR != 3 || NLOHMANN_JSON_VERSION_MINOR != 11 || NLOHMANN_JSON_VERSION_PATCH != 3
+            #warning "Already included a different version of the library!"
+        #endif
+    #endif
+#endif
+
+#define NLOHMANN_JSON_VERSION_MAJOR 3   // NOLINT(modernize-macro-to-enum)
+#define NLOHMANN_JSON_VERSION_MINOR 11  // NOLINT(modernize-macro-to-enum)
+#define NLOHMANN_JSON_VERSION_PATCH 3   // NOLINT(modernize-macro-to-enum)
+
+#ifndef JSON_DIAGNOSTICS
+    #define JSON_DIAGNOSTICS 0
+#endif
+
+#ifndef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+    #define JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON 0
+#endif
+
+#if JSON_DIAGNOSTICS
+    #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS _diag
+#else
+    #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS
+#endif
+
+#if JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+    #define NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON _ldvcmp
+#else
+    #define NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON
+#endif
+
+#ifndef NLOHMANN_JSON_NAMESPACE_NO_VERSION
+    #define NLOHMANN_JSON_NAMESPACE_NO_VERSION 0
+#endif
+
+// Construct the namespace ABI tags component
+#define NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b) json_abi ## a ## b
+#define NLOHMANN_JSON_ABI_TAGS_CONCAT(a, b) \
+    NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b)
+
+#define NLOHMANN_JSON_ABI_TAGS                                       \
+    NLOHMANN_JSON_ABI_TAGS_CONCAT(                                   \
+            NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS,                       \
+            NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON)
+
+// Construct the namespace version component
+#define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch) \
+    _v ## major ## _ ## minor ## _ ## patch
+#define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT(major, minor, patch) \
+    NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch)
+
+#if NLOHMANN_JSON_NAMESPACE_NO_VERSION
+#define NLOHMANN_JSON_NAMESPACE_VERSION
+#else
+#define NLOHMANN_JSON_NAMESPACE_VERSION                                 \
+    NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT(NLOHMANN_JSON_VERSION_MAJOR, \
+                                           NLOHMANN_JSON_VERSION_MINOR, \
+                                           NLOHMANN_JSON_VERSION_PATCH)
+#endif
+
+// Combine namespace components
+#define NLOHMANN_JSON_NAMESPACE_CONCAT_EX(a, b) a ## b
+#define NLOHMANN_JSON_NAMESPACE_CONCAT(a, b) \
+    NLOHMANN_JSON_NAMESPACE_CONCAT_EX(a, b)
+
+#ifndef NLOHMANN_JSON_NAMESPACE
+#define NLOHMANN_JSON_NAMESPACE               \
+    nlohmann::NLOHMANN_JSON_NAMESPACE_CONCAT( \
+            NLOHMANN_JSON_ABI_TAGS,           \
+            NLOHMANN_JSON_NAMESPACE_VERSION)
+#endif
+
+#ifndef NLOHMANN_JSON_NAMESPACE_BEGIN
+#define NLOHMANN_JSON_NAMESPACE_BEGIN                \
+    namespace nlohmann                               \
+    {                                                \
+    inline namespace NLOHMANN_JSON_NAMESPACE_CONCAT( \
+                NLOHMANN_JSON_ABI_TAGS,              \
+                NLOHMANN_JSON_NAMESPACE_VERSION)     \
+    {
+#endif
+
+#ifndef NLOHMANN_JSON_NAMESPACE_END
+#define NLOHMANN_JSON_NAMESPACE_END                                     \
+    }  /* namespace (inline namespace) NOLINT(readability/namespace) */ \
+    }  // namespace nlohmann
+#endif
+
+
+/*!
+@brief namespace for Niels Lohmann
+@see https://github.com/nlohmann
+@since version 1.0.0
+*/
+NLOHMANN_JSON_NAMESPACE_BEGIN
+
+/*!
+@brief default JSONSerializer template argument
+
+This serializer ignores the template arguments and uses ADL
+([argument-dependent lookup](https://en.cppreference.com/w/cpp/language/adl))
+for serialization.
+*/
+template<typename T = void, typename SFINAE = void>
+struct adl_serializer;
+
+/// a class to store JSON values
+/// @sa https://json.nlohmann.me/api/basic_json/
+template<template<typename U, typename V, typename... Args> class ObjectType =
+         std::map,
+         template<typename U, typename... Args> class ArrayType = std::vector,
+         class StringType = std::string, class BooleanType = bool,
+         class NumberIntegerType = std::int64_t,
+         class NumberUnsignedType = std::uint64_t,
+         class NumberFloatType = double,
+         template<typename U> class AllocatorType = std::allocator,
+         template<typename T, typename SFINAE = void> class JSONSerializer =
+         adl_serializer,
+         class BinaryType = std::vector<std::uint8_t>, // cppcheck-suppress syntaxError
+         class CustomBaseClass = void>
+class basic_json;
+
+/// @brief JSON Pointer defines a string syntax for identifying a specific value within a JSON document
+/// @sa https://json.nlohmann.me/api/json_pointer/
+template<typename RefStringType>
+class json_pointer;
+
+/*!
+@brief default specialization
+@sa https://json.nlohmann.me/api/json/
+*/
+using json = basic_json<>;
+
+/// @brief a minimal map-like container that preserves insertion order
+/// @sa https://json.nlohmann.me/api/ordered_map/
+template<class Key, class T, class IgnoredLess, class Allocator>
+struct ordered_map;
+
+/// @brief specialization that maintains the insertion order of object keys
+/// @sa https://json.nlohmann.me/api/ordered_json/
+using ordered_json = basic_json<nlohmann::ordered_map>;
+
+NLOHMANN_JSON_NAMESPACE_END
+
+#endif  // INCLUDE_NLOHMANN_JSON_FWD_HPP_
diff --git a/external_imported/json/test/CMakeLists.txt b/external_imported/json/test/CMakeLists.txt
deleted file mode 100644
index e5484fc73..000000000
--- a/external_imported/json/test/CMakeLists.txt
+++ /dev/null
@@ -1,199 +0,0 @@
-option(JSON_Sanitizer "Build test suite with Clang sanitizer" OFF)
-option(JSON_Valgrind "Execute test suite with Valgrind" OFF)
-option(JSON_NoExceptions "Build test suite without exceptions" OFF)
-option(JSON_Coverage "Build test suite with coverage information" OFF)
-
-# download test data
-include(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/download_test_data.cmake)
-
-# test fixture to download test data
-add_test(NAME "download_test_data" COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target download_test_data)
-set_tests_properties(download_test_data PROPERTIES FIXTURES_SETUP TEST_DATA)
-
-if(JSON_Sanitizer)
-    message(STATUS "Building test suite with Clang sanitizer")
-    if(NOT MSVC)
-        set(CMAKE_CXX_FLAGS "-g -O0 -fsanitize=address -fsanitize=undefined -fsanitize=integer -fsanitize=nullability -fno-omit-frame-pointer -fno-sanitize-recover=all -fsanitize-recover=unsigned-integer-overflow")
-    endif()
-endif()
-
-if(JSON_Valgrind)
-    find_program(CMAKE_MEMORYCHECK_COMMAND valgrind)
-    message(STATUS "Executing test suite with Valgrind (${CMAKE_MEMORYCHECK_COMMAND})")
-    set(memcheck_command "${CMAKE_MEMORYCHECK_COMMAND} ${CMAKE_MEMORYCHECK_COMMAND_OPTIONS} --error-exitcode=1 --leak-check=full")
-    separate_arguments(memcheck_command)
-endif()
-
-if(JSON_NoExceptions)
-    message(STATUS "Building test suite without exceptions")
-    if(NOT MSVC)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DJSON_NOEXCEPTION")
-    endif()
-    set(DOCTEST_TEST_FILTER --no-throw)
-endif()
-
-if(JSON_Coverage)
-    message(STATUS "Building test suite with coverage information")
-
-    # from https://github.com/RWTH-HPC/CMake-codecov/blob/master/cmake/FindGcov.cmake
-    get_filename_component(COMPILER_PATH "${CMAKE_CXX_COMPILER}" PATH)
-    string(REGEX MATCH "^[0-9]+" GCC_VERSION "${CMAKE_CXX_COMPILER_VERSION}")
-    find_program(GCOV_BIN NAMES gcov-${GCC_VERSION} gcov HINTS ${COMPILER_PATH})
-
-    # collect all source files from the chosen include dir
-    file(GLOB_RECURSE SOURCE_FILES ${NLOHMANN_JSON_INCLUDE_BUILD_DIR}*.hpp)
-
-    # add target to collect coverage information and generate HTML file
-    # (filter script from https://stackoverflow.com/a/43726240/266378)
-    add_custom_target(lcov_html
-        COMMAND lcov --directory . --capture --output-file json.info --rc lcov_branch_coverage=1
-        COMMAND lcov -e json.info ${SOURCE_FILES} --output-file json.info.filtered --gcov-tool ${GCOV_BIN} --rc lcov_branch_coverage=1
-        COMMAND ${CMAKE_SOURCE_DIR}/test/thirdparty/imapdl/filterbr.py json.info.filtered > json.info.filtered.noexcept
-        COMMAND genhtml --title "JSON for Modern C++" --legend --demangle-cpp --output-directory html --show-details --branch-coverage json.info.filtered.noexcept
-        COMMENT "Generating HTML report test/html/index.html"
-    )
-endif()
-
-#############################################################################
-# doctest library with the main function to speed up build
-#############################################################################
-
-add_library(doctest_main OBJECT src/unit.cpp)
-set_target_properties(doctest_main PROPERTIES
-    COMPILE_DEFINITIONS "$<$<CXX_COMPILER_ID:MSVC>:_SCL_SECURE_NO_WARNINGS>"
-    COMPILE_OPTIONS "$<$<CXX_COMPILER_ID:MSVC>:/EHsc;$<$<CONFIG:Release>:/Od>>"
-)
-if (${CMAKE_VERSION} VERSION_LESS "3.8.0")
-    target_compile_features(doctest_main PUBLIC cxx_range_for)
-else()
-    target_compile_features(doctest_main PUBLIC cxx_std_11)
-endif()
-target_include_directories(doctest_main PRIVATE "thirdparty/doctest")
-
-# https://stackoverflow.com/questions/2368811/how-to-set-warning-level-in-cmake
-if(MSVC)
-    # Force to always compile with W4
-    if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
-        string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-    else()
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
-    endif()
-
-	# Disable warning C4566: character represented by universal-character-name '\uFF01' cannot be represented in the current code page (1252)
-	# Disable warning C4996: 'nlohmann::basic_json<std::map,std::vector,std::string,bool,int64_t,uint64_t,double,std::allocator,nlohmann::adl_serializer>::operator <<': was declared deprecated
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4566 /wd4996")
-
-	# https://github.com/nlohmann/json/issues/1114
-	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /bigobj")
-endif()
-
-#############################################################################
-# one executable for each unit test file
-#############################################################################
-
-set(files
-    src/unit-algorithms.cpp
-    src/unit-allocator.cpp
-    src/unit-alt-string.cpp
-    src/unit-assert_macro.cpp
-    src/unit-bson.cpp
-    src/unit-capacity.cpp
-    src/unit-cbor.cpp
-    src/unit-class_const_iterator.cpp
-    src/unit-class_iterator.cpp
-    src/unit-class_lexer.cpp
-    src/unit-class_parser.cpp
-    src/unit-comparison.cpp
-    src/unit-concepts.cpp
-    src/unit-constructor1.cpp
-    src/unit-constructor2.cpp
-    src/unit-convenience.cpp
-    src/unit-conversions.cpp
-    src/unit-deserialization.cpp
-    src/unit-diagnostics.cpp
-    src/unit-element_access1.cpp
-    src/unit-element_access2.cpp
-    src/unit-hash.cpp
-    src/unit-inspection.cpp
-    src/unit-items.cpp
-    src/unit-iterators1.cpp
-    src/unit-iterators2.cpp
-    src/unit-json_patch.cpp
-    src/unit-json_pointer.cpp
-    src/unit-large_json.cpp
-    src/unit-merge_patch.cpp
-    src/unit-meta.cpp
-    src/unit-modifiers.cpp
-    src/unit-msgpack.cpp
-    src/unit-noexcept.cpp
-    src/unit-ordered_json.cpp
-    src/unit-ordered_map.cpp
-    src/unit-pointer_access.cpp
-    src/unit-readme.cpp
-    src/unit-reference_access.cpp
-    src/unit-regression1.cpp
-    src/unit-regression2.cpp
-    src/unit-serialization.cpp
-    src/unit-testsuites.cpp
-    src/unit-to_chars.cpp
-    src/unit-ubjson.cpp
-    src/unit-udt.cpp
-    src/unit-udt_macro.cpp
-    src/unit-unicode.cpp
-    src/unit-user_defined_input.cpp
-    src/unit-wstring.cpp)
-
-foreach(file ${files})
-    get_filename_component(file_basename ${file} NAME_WE)
-    string(REGEX REPLACE "unit-([^$]+)" "test-\\1" testcase ${file_basename})
-
-    add_executable(${testcase} $<TARGET_OBJECTS:doctest_main> ${file})
-    target_compile_definitions(${testcase} PRIVATE DOCTEST_CONFIG_SUPER_FAST_ASSERTS)
-    target_compile_options(${testcase} PRIVATE
-        $<$<CXX_COMPILER_ID:MSVC>:/EHsc;$<$<CONFIG:Release>:/Od>>
-        $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wno-deprecated;-Wno-float-equal>
-        $<$<CXX_COMPILER_ID:GNU>:-Wno-deprecated-declarations>
-    )
-    target_include_directories(${testcase} PRIVATE ${CMAKE_BINARY_DIR}/include thirdparty/doctest thirdparty/fifo_map)
-    target_link_libraries(${testcase} PRIVATE ${NLOHMANN_JSON_TARGET_NAME})
-
-    if (JSON_Coverage)
-        target_compile_options(${testcase} PRIVATE --coverage)
-        target_link_libraries(${testcase} PRIVATE --coverage)
-    endif()
-
-    add_test(NAME "${testcase}"
-        COMMAND ${testcase} ${DOCTEST_TEST_FILTER} --no-skip
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    )
-    set_tests_properties("${testcase}" PROPERTIES LABELS "all" FIXTURES_REQUIRED TEST_DATA)
-
-    if(JSON_Valgrind)
-        add_test(NAME "${testcase}_valgrind"
-            COMMAND ${memcheck_command} ${CMAKE_CURRENT_BINARY_DIR}/${testcase} ${DOCTEST_TEST_FILTER}
-            WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-        )
-        set_tests_properties("${testcase}_valgrind" PROPERTIES LABELS "valgrind")
-    endif()
-endforeach()
-
-add_executable(json_unit EXCLUDE_FROM_ALL $<TARGET_OBJECTS:doctest_main> ${files})
-target_compile_definitions(json_unit PRIVATE DOCTEST_CONFIG_SUPER_FAST_ASSERTS)
-target_compile_options(json_unit PRIVATE
-    $<$<CXX_COMPILER_ID:MSVC>:/EHsc;$<$<CONFIG:Release>:/Od>>
-    $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wno-deprecated;-Wno-float-equal>
-    $<$<CXX_COMPILER_ID:GNU>:-Wno-deprecated-declarations>
-)
-target_include_directories(json_unit PRIVATE ${CMAKE_BINARY_DIR}/include thirdparty/doctest thirdparty/fifo_map)
-target_link_libraries(json_unit ${NLOHMANN_JSON_TARGET_NAME})
-add_dependencies(json_unit download_test_data)
-
-#############################################################################
-# Test the generated build configs
-#############################################################################
-
-add_subdirectory(cmake_import)
-add_subdirectory(cmake_import_minver)
-add_subdirectory(cmake_add_subdirectory)
-add_subdirectory(cmake_fetch_content)
-add_subdirectory(cmake_target_include_directories)
diff --git a/external_imported/json/test/Makefile b/external_imported/json/test/Makefile
deleted file mode 100644
index 2d08a8f7b..000000000
--- a/external_imported/json/test/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-##############################################################################
-# OSS-Fuzz
-##############################################################################
-
-# The following targets realize the integration to OSS-Fuzz.
-# See <https://github.com/google/oss-fuzz/blob/master/projects/json/build.sh> for more information.
-
-# additional flags
-CXXFLAGS += -std=c++11
-CPPFLAGS += -I ../single_include
-
-FUZZER_ENGINE = src/fuzzer-driver_afl.cpp
-FUZZERS = parse_afl_fuzzer parse_bson_fuzzer parse_cbor_fuzzer parse_msgpack_fuzzer parse_ubjson_fuzzer
-fuzzers: $(FUZZERS)
-
-parse_afl_fuzzer:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(FUZZER_ENGINE) src/fuzzer-parse_json.cpp -o $@
-
-parse_bson_fuzzer:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(FUZZER_ENGINE) src/fuzzer-parse_bson.cpp -o $@
-
-parse_cbor_fuzzer:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(FUZZER_ENGINE) src/fuzzer-parse_cbor.cpp -o $@
-
-parse_msgpack_fuzzer:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(FUZZER_ENGINE) src/fuzzer-parse_msgpack.cpp -o $@
-
-parse_ubjson_fuzzer:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(FUZZER_ENGINE) src/fuzzer-parse_ubjson.cpp -o $@
diff --git a/external_imported/json/test/cmake_add_subdirectory/project/CMakeLists.txt b/external_imported/json/test/cmake_add_subdirectory/project/CMakeLists.txt
deleted file mode 100644
index caab6c4e1..000000000
--- a/external_imported/json/test/cmake_add_subdirectory/project/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-cmake_minimum_required(VERSION 3.1)
-
-project(DummyImport CXX)
-
-set(JSON_BuildTests OFF CACHE INTERNAL "")
-add_subdirectory(${nlohmann_json_source}
-   ${CMAKE_CURRENT_BINARY_DIR}/nlohmann_json)
-
-add_executable(with_namespace_target main.cpp)
-target_link_libraries(with_namespace_target nlohmann_json::nlohmann_json)
-
-add_executable(without_namespace_target main.cpp)
-target_link_libraries(without_namespace_target nlohmann_json)
-
-if(NOT MSVC)
-    add_executable(without_exceptions main.cpp)
-    target_link_libraries(without_exceptions nlohmann_json::nlohmann_json)
-    target_compile_definitions(without_exceptions PRIVATE JSON_NOEXCEPTION)
-    target_compile_options(without_exceptions PRIVATE -fno-exceptions)
-endif()
diff --git a/external_imported/json/test/cmake_add_subdirectory/project/main.cpp b/external_imported/json/test/cmake_add_subdirectory/project/main.cpp
deleted file mode 100644
index d2d118b85..000000000
--- a/external_imported/json/test/cmake_add_subdirectory/project/main.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <nlohmann/json.hpp>
-
-int main(int argc, char **argv)
-{
-    nlohmann::json j;
-
-    return 0;
-}
diff --git a/external_imported/json/test/cmake_fetch_content/project/CMakeLists.txt b/external_imported/json/test/cmake_fetch_content/project/CMakeLists.txt
deleted file mode 100644
index fd8fbdd5f..000000000
--- a/external_imported/json/test/cmake_fetch_content/project/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-cmake_minimum_required(VERSION 3.11)
-
-project(DummyImport CXX)
-
-include(FetchContent)
-
-get_filename_component(GIT_REPOSITORY_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../.. ABSOLUTE)
-FetchContent_Declare(json GIT_REPOSITORY ${GIT_REPOSITORY_DIRECTORY} GIT_TAG HEAD)
-
-FetchContent_GetProperties(json)
-if(NOT json_POPULATED)
-  FetchContent_Populate(json)
-  add_subdirectory(${json_SOURCE_DIR} ${json_BINARY_DIR} EXCLUDE_FROM_ALL)
-endif()
-
-add_executable(with_namespace_target main.cpp)
-target_link_libraries(with_namespace_target nlohmann_json::nlohmann_json)
-
-add_executable(without_namespace_target main.cpp)
-target_link_libraries(without_namespace_target nlohmann_json)
diff --git a/external_imported/json/test/cmake_fetch_content/project/main.cpp b/external_imported/json/test/cmake_fetch_content/project/main.cpp
deleted file mode 100644
index d2d118b85..000000000
--- a/external_imported/json/test/cmake_fetch_content/project/main.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <nlohmann/json.hpp>
-
-int main(int argc, char **argv)
-{
-    nlohmann::json j;
-
-    return 0;
-}
diff --git a/external_imported/json/test/cmake_import/project/CMakeLists.txt b/external_imported/json/test/cmake_import/project/CMakeLists.txt
deleted file mode 100644
index fe892fc1f..000000000
--- a/external_imported/json/test/cmake_import/project/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-cmake_minimum_required(VERSION 3.1)
-
-project(DummyImport CXX)
-
-find_package(nlohmann_json REQUIRED)
-
-add_executable(with_namespace_target main.cpp)
-target_link_libraries(with_namespace_target nlohmann_json::nlohmann_json)
-
-add_executable(without_namespace_target main.cpp)
-target_link_libraries(without_namespace_target nlohmann_json)
-
diff --git a/external_imported/json/test/cmake_import/project/main.cpp b/external_imported/json/test/cmake_import/project/main.cpp
deleted file mode 100644
index d2d118b85..000000000
--- a/external_imported/json/test/cmake_import/project/main.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <nlohmann/json.hpp>
-
-int main(int argc, char **argv)
-{
-    nlohmann::json j;
-
-    return 0;
-}
diff --git a/external_imported/json/test/cmake_import_minver/project/CMakeLists.txt b/external_imported/json/test/cmake_import_minver/project/CMakeLists.txt
deleted file mode 100644
index 29056bdc5..000000000
--- a/external_imported/json/test/cmake_import_minver/project/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-cmake_minimum_required(VERSION 3.1)
-
-project(DummyImportMinVer CXX)
-
-find_package(nlohmann_json 3.2.0 REQUIRED)
-
-add_executable(with_namespace_target main.cpp)
-target_link_libraries(with_namespace_target nlohmann_json::nlohmann_json)
diff --git a/external_imported/json/test/cmake_import_minver/project/main.cpp b/external_imported/json/test/cmake_import_minver/project/main.cpp
deleted file mode 100644
index d2d118b85..000000000
--- a/external_imported/json/test/cmake_import_minver/project/main.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <nlohmann/json.hpp>
-
-int main(int argc, char **argv)
-{
-    nlohmann::json j;
-
-    return 0;
-}
diff --git a/external_imported/json/test/cmake_target_include_directories/project/Bar.cpp b/external_imported/json/test/cmake_target_include_directories/project/Bar.cpp
deleted file mode 100644
index ed39e284c..000000000
--- a/external_imported/json/test/cmake_target_include_directories/project/Bar.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "Bar.hpp"
-
-class Bar;
diff --git a/external_imported/json/test/cmake_target_include_directories/project/Bar.hpp b/external_imported/json/test/cmake_target_include_directories/project/Bar.hpp
deleted file mode 100644
index bdb1d9b5c..000000000
--- a/external_imported/json/test/cmake_target_include_directories/project/Bar.hpp
+++ /dev/null
@@ -1,4 +0,0 @@
-#include <nlohmann/json.hpp>
-#include "Foo.hpp"
-
-class Bar : public Foo{};
diff --git a/external_imported/json/test/cmake_target_include_directories/project/CMakeLists.txt b/external_imported/json/test/cmake_target_include_directories/project/CMakeLists.txt
deleted file mode 100644
index f56786c09..000000000
--- a/external_imported/json/test/cmake_target_include_directories/project/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-cmake_minimum_required(VERSION 3.1)
-
-project(DummyImport CXX)
-
-add_executable(with_private_target main.cpp)
-target_include_directories(with_private_target PRIVATE ${nlohmann_json_source}/include)
-set_target_properties(with_private_target PROPERTIES CXX_STANDARD 11)
-
-add_executable(with_private_system_target main.cpp)
-target_include_directories(with_private_system_target PRIVATE SYSTEM ${nlohmann_json_source}/include)
-set_target_properties(with_private_system_target PROPERTIES CXX_STANDARD 11)
-
-# regression from https://github.com/nlohmann/json/discussions/2281
-add_library(Foo STATIC Foo.cpp Bar.cpp)
-target_include_directories(Foo PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${nlohmann_json_source}/include)
-set_target_properties(Foo PROPERTIES CXX_STANDARD 11)
-
-add_library(Bar STATIC Bar.cpp)
-target_link_libraries(Bar PRIVATE Foo)
-target_include_directories(Bar PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${nlohmann_json_source}/include)
-set_target_properties(Bar PROPERTIES CXX_STANDARD 11)
diff --git a/external_imported/json/test/cmake_target_include_directories/project/Foo.cpp b/external_imported/json/test/cmake_target_include_directories/project/Foo.cpp
deleted file mode 100644
index 6a2ff91ac..000000000
--- a/external_imported/json/test/cmake_target_include_directories/project/Foo.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "Foo.hpp"
-
-class Foo;
diff --git a/external_imported/json/test/cmake_target_include_directories/project/Foo.hpp b/external_imported/json/test/cmake_target_include_directories/project/Foo.hpp
deleted file mode 100644
index fd6b1ffac..000000000
--- a/external_imported/json/test/cmake_target_include_directories/project/Foo.hpp
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-#include <nlohmann/json.hpp>
-
-class Foo{};
diff --git a/external_imported/json/test/cmake_target_include_directories/project/main.cpp b/external_imported/json/test/cmake_target_include_directories/project/main.cpp
deleted file mode 100644
index d2d118b85..000000000
--- a/external_imported/json/test/cmake_target_include_directories/project/main.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <nlohmann/json.hpp>
-
-int main(int argc, char **argv)
-{
-    nlohmann::json j;
-
-    return 0;
-}
diff --git a/external_imported/json/test/src/UBSAN.supp b/external_imported/json/test/src/UBSAN.supp
deleted file mode 100644
index b19f04369..000000000
--- a/external_imported/json/test/src/UBSAN.supp
+++ /dev/null
@@ -1 +0,0 @@
-unsigned-integer-overflow:stl_bvector.h
diff --git a/external_imported/json/test/src/fuzzer-driver_afl.cpp b/external_imported/json/test/src/fuzzer-driver_afl.cpp
deleted file mode 100644
index 06ac3af99..000000000
--- a/external_imported/json/test/src/fuzzer-driver_afl.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (fuzz test support)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-This file implements a driver for American Fuzzy Lop (afl-fuzz). It relies on
-an implementation of the `LLVMFuzzerTestOneInput` function which processes a
-passed byte array.
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-*/
-
-#include <vector>    // for vector
-#include <cstdint>   // for uint8_t
-#include <iostream>  // for cin
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size);
-
-int main()
-{
-#ifdef __AFL_HAVE_MANUAL_CONTROL
-    while (__AFL_LOOP(1000))
-    {
-#endif
-        // copy stdin to byte vector
-        std::vector<uint8_t> vec;
-        char c;
-        while (std::cin.get(c))
-        {
-            vec.push_back(static_cast<uint8_t>(c));
-        }
-
-        LLVMFuzzerTestOneInput(vec.data(), vec.size());
-#ifdef __AFL_HAVE_MANUAL_CONTROL
-    }
-#endif
-}
diff --git a/external_imported/json/test/src/fuzzer-parse_bson.cpp b/external_imported/json/test/src/fuzzer-parse_bson.cpp
deleted file mode 100644
index 8ebb1f10c..000000000
--- a/external_imported/json/test/src/fuzzer-parse_bson.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (fuzz test support)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-This file implements a parser test suitable for fuzz testing. Given a byte
-array data, it performs the following steps:
-
-- j1 = from_bson(data)
-- vec = to_bson(j1)
-- j2 = from_bson(vec)
-- assert(j1 == j2)
-
-The provided function `LLVMFuzzerTestOneInput` can be used in different fuzzer
-drivers.
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-*/
-
-#include <iostream>
-#include <sstream>
-#include <nlohmann/json.hpp>
-
-using json = nlohmann::json;
-
-// see http://llvm.org/docs/LibFuzzer.html
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
-{
-    try
-    {
-        // step 1: parse input
-        std::vector<uint8_t> vec1(data, data + size);
-        json j1 = json::from_bson(vec1);
-
-        if (j1.is_discarded())
-        {
-            return 0;
-        }
-
-        try
-        {
-            // step 2: round trip
-            std::vector<uint8_t> vec2 = json::to_bson(j1);
-
-            // parse serialization
-            json j2 = json::from_bson(vec2);
-
-            // serializations must match
-            assert(json::to_bson(j2) == vec2);
-        }
-        catch (const json::parse_error&)
-        {
-            // parsing a BSON serialization must not fail
-            assert(false);
-        }
-    }
-    catch (const json::parse_error&)
-    {
-        // parse errors are ok, because input may be random bytes
-    }
-    catch (const json::type_error&)
-    {
-        // type errors can occur during parsing, too
-    }
-    catch (const json::out_of_range&)
-    {
-        // out of range errors can occur during parsing, too
-    }
-
-    // return 0 - non-zero return values are reserved for future use
-    return 0;
-}
diff --git a/external_imported/json/test/src/fuzzer-parse_cbor.cpp b/external_imported/json/test/src/fuzzer-parse_cbor.cpp
deleted file mode 100644
index 8f2e59697..000000000
--- a/external_imported/json/test/src/fuzzer-parse_cbor.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (fuzz test support)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-This file implements a parser test suitable for fuzz testing. Given a byte
-array data, it performs the following steps:
-
-- j1 = from_cbor(data)
-- vec = to_cbor(j1)
-- j2 = from_cbor(vec)
-- assert(j1 == j2)
-
-The provided function `LLVMFuzzerTestOneInput` can be used in different fuzzer
-drivers.
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-*/
-
-#include <iostream>
-#include <sstream>
-#include <nlohmann/json.hpp>
-
-using json = nlohmann::json;
-
-// see http://llvm.org/docs/LibFuzzer.html
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
-{
-    try
-    {
-        // step 1: parse input
-        std::vector<uint8_t> vec1(data, data + size);
-        json j1 = json::from_cbor(vec1);
-
-        try
-        {
-            // step 2: round trip
-            std::vector<uint8_t> vec2 = json::to_cbor(j1);
-
-            // parse serialization
-            json j2 = json::from_cbor(vec2);
-
-            // serializations must match
-            assert(json::to_cbor(j2) == vec2);
-        }
-        catch (const json::parse_error&)
-        {
-            // parsing a CBOR serialization must not fail
-            assert(false);
-        }
-    }
-    catch (const json::parse_error&)
-    {
-        // parse errors are ok, because input may be random bytes
-    }
-    catch (const json::type_error&)
-    {
-        // type errors can occur during parsing, too
-    }
-    catch (const json::out_of_range&)
-    {
-        // out of range errors can occur during parsing, too
-    }
-
-    // return 0 - non-zero return values are reserved for future use
-    return 0;
-}
diff --git a/external_imported/json/test/src/fuzzer-parse_json.cpp b/external_imported/json/test/src/fuzzer-parse_json.cpp
deleted file mode 100644
index 803152d0d..000000000
--- a/external_imported/json/test/src/fuzzer-parse_json.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (fuzz test support)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-This file implements a parser test suitable for fuzz testing. Given a byte
-array data, it performs the following steps:
-
-- j1 = parse(data)
-- s1 = serialize(j1)
-- j2 = parse(s1)
-- s2 = serialize(j2)
-- assert(s1 == s2)
-
-The provided function `LLVMFuzzerTestOneInput` can be used in different fuzzer
-drivers.
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-*/
-
-#include <iostream>
-#include <sstream>
-#include <nlohmann/json.hpp>
-
-using json = nlohmann::json;
-
-// see http://llvm.org/docs/LibFuzzer.html
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
-{
-    try
-    {
-        // step 1: parse input
-        json j1 = json::parse(data, data + size);
-
-        try
-        {
-            // step 2: round trip
-
-            // first serialization
-            std::string s1 = j1.dump();
-
-            // parse serialization
-            json j2 = json::parse(s1);
-
-            // second serialization
-            std::string s2 = j2.dump();
-
-            // serializations must match
-            assert(s1 == s2);
-        }
-        catch (const json::parse_error&)
-        {
-            // parsing a JSON serialization must not fail
-            assert(false);
-        }
-    }
-    catch (const json::parse_error&)
-    {
-        // parse errors are ok, because input may be random bytes
-    }
-    catch (const json::out_of_range&)
-    {
-        // out of range errors may happen if provided sizes are excessive
-    }
-
-    // return 0 - non-zero return values are reserved for future use
-    return 0;
-}
diff --git a/external_imported/json/test/src/fuzzer-parse_msgpack.cpp b/external_imported/json/test/src/fuzzer-parse_msgpack.cpp
deleted file mode 100644
index 32366c2a8..000000000
--- a/external_imported/json/test/src/fuzzer-parse_msgpack.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (fuzz test support)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-This file implements a parser test suitable for fuzz testing. Given a byte
-array data, it performs the following steps:
-
-- j1 = from_msgpack(data)
-- vec = to_msgpack(j1)
-- j2 = from_msgpack(vec)
-- assert(j1 == j2)
-
-The provided function `LLVMFuzzerTestOneInput` can be used in different fuzzer
-drivers.
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-*/
-
-#include <iostream>
-#include <sstream>
-#include <nlohmann/json.hpp>
-
-using json = nlohmann::json;
-
-// see http://llvm.org/docs/LibFuzzer.html
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
-{
-    try
-    {
-        // step 1: parse input
-        std::vector<uint8_t> vec1(data, data + size);
-        json j1 = json::from_msgpack(vec1);
-
-        try
-        {
-            // step 2: round trip
-            std::vector<uint8_t> vec2 = json::to_msgpack(j1);
-
-            // parse serialization
-            json j2 = json::from_msgpack(vec2);
-
-            // serializations must match
-            assert(json::to_msgpack(j2) == vec2);
-        }
-        catch (const json::parse_error&)
-        {
-            // parsing a MessagePack serialization must not fail
-            assert(false);
-        }
-    }
-    catch (const json::parse_error&)
-    {
-        // parse errors are ok, because input may be random bytes
-    }
-    catch (const json::type_error&)
-    {
-        // type errors can occur during parsing, too
-    }
-    catch (const json::out_of_range&)
-    {
-        // out of range errors may happen if provided sizes are excessive
-    }
-
-    // return 0 - non-zero return values are reserved for future use
-    return 0;
-}
diff --git a/external_imported/json/test/src/fuzzer-parse_ubjson.cpp b/external_imported/json/test/src/fuzzer-parse_ubjson.cpp
deleted file mode 100644
index 4ec69c322..000000000
--- a/external_imported/json/test/src/fuzzer-parse_ubjson.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (fuzz test support)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-This file implements a parser test suitable for fuzz testing. Given a byte
-array data, it performs the following steps:
-
-- j1 = from_ubjson(data)
-- vec = to_ubjson(j1)
-- j2 = from_ubjson(vec)
-- assert(j1 == j2)
-- vec2 = to_ubjson(j1, use_size = true, use_type = false)
-- j3 = from_ubjson(vec2)
-- assert(j1 == j3)
-- vec3 = to_ubjson(j1, use_size = true, use_type = true)
-- j4 = from_ubjson(vec3)
-- assert(j1 == j4)
-
-The provided function `LLVMFuzzerTestOneInput` can be used in different fuzzer
-drivers.
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-*/
-
-#include <iostream>
-#include <sstream>
-#include <nlohmann/json.hpp>
-
-using json = nlohmann::json;
-
-// see http://llvm.org/docs/LibFuzzer.html
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
-{
-    try
-    {
-        // step 1: parse input
-        std::vector<uint8_t> vec1(data, data + size);
-        json j1 = json::from_ubjson(vec1);
-
-        try
-        {
-            // step 2.1: round trip without adding size annotations to container types
-            std::vector<uint8_t> vec2 = json::to_ubjson(j1, false, false);
-
-            // step 2.2: round trip with adding size annotations but without adding type annonations to container types
-            std::vector<uint8_t> vec3 = json::to_ubjson(j1, true, false);
-
-            // step 2.3: round trip with adding size as well as type annotations to container types
-            std::vector<uint8_t> vec4 = json::to_ubjson(j1, true, true);
-
-            // parse serialization
-            json j2 = json::from_ubjson(vec2);
-            json j3 = json::from_ubjson(vec3);
-            json j4 = json::from_ubjson(vec4);
-
-            // serializations must match
-            assert(json::to_ubjson(j2, false, false) == vec2);
-            assert(json::to_ubjson(j3, true, false) == vec3);
-            assert(json::to_ubjson(j4, true, true) == vec4);
-        }
-        catch (const json::parse_error&)
-        {
-            // parsing a UBJSON serialization must not fail
-            assert(false);
-        }
-    }
-    catch (const json::parse_error&)
-    {
-        // parse errors are ok, because input may be random bytes
-    }
-    catch (const json::type_error&)
-    {
-        // type errors can occur during parsing, too
-    }
-    catch (const json::out_of_range&)
-    {
-        // out of range errors may happen if provided sizes are excessive
-    }
-
-    // return 0 - non-zero return values are reserved for future use
-    return 0;
-}
diff --git a/external_imported/json/test/src/test_utils.hpp b/external_imported/json/test/src/test_utils.hpp
deleted file mode 100644
index 12c260e7b..000000000
--- a/external_imported/json/test/src/test_utils.hpp
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-
-#include <cstdint> // uint8_t
-#include <fstream> // ifstream, istreambuf_iterator, ios
-#include <vector> // vector
-
-namespace utils
-{
-
-inline std::vector<std::uint8_t> read_binary_file(const std::string& filename)
-{
-    std::ifstream file(filename, std::ios::binary);
-    file.unsetf(std::ios::skipws);
-
-    file.seekg(0, std::ios::end);
-    const auto size = file.tellg();
-    file.seekg(0, std::ios::beg);
-
-    std::vector<std::uint8_t> byte_vector;
-    byte_vector.reserve(static_cast<std::size_t>(size));
-    byte_vector.insert(byte_vector.begin(), std::istream_iterator<std::uint8_t>(file), std::istream_iterator<std::uint8_t>());
-    return byte_vector;
-}
-
-} // namespace utils
diff --git a/external_imported/json/test/src/unit-alt-string.cpp b/external_imported/json/test/src/unit-alt-string.cpp
deleted file mode 100644
index b51a5a91d..000000000
--- a/external_imported/json/test/src/unit-alt-string.cpp
+++ /dev/null
@@ -1,299 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2018 Vitaliy Manushkin <agri@akamo.info>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include "doctest_compatibility.h"
-
-#include <nlohmann/json.hpp>
-
-#include <string>
-#include <utility>
-
-
-/* forward declarations */
-class alt_string;
-bool operator<(const char* op1, const alt_string& op2);
-void int_to_string(alt_string& target, std::size_t value);
-
-/*
- * This is virtually a string class.
- * It covers std::string under the hood.
- */
-class alt_string
-{
-  public:
-    using value_type = std::string::value_type;
-
-    alt_string(const char* str): str_impl(str) {}
-    alt_string(const char* str, std::size_t count): str_impl(str, count) {}
-    alt_string(size_t count, char chr): str_impl(count, chr) {}
-    alt_string() = default;
-
-    template <typename...TParams>
-    alt_string& append(TParams&& ...params)
-    {
-        str_impl.append(std::forward<TParams>(params)...);
-        return *this;
-    }
-
-    void push_back(char c)
-    {
-        str_impl.push_back(c);
-    }
-
-    template <typename op_type>
-    bool operator==(const op_type& op) const
-    {
-        return str_impl == op;
-    }
-
-    bool operator==(const alt_string& op) const
-    {
-        return str_impl == op.str_impl;
-    }
-
-    template <typename op_type>
-    bool operator!=(const op_type& op) const
-    {
-        return str_impl != op;
-    }
-
-    bool operator!=(const alt_string& op) const
-    {
-        return str_impl != op.str_impl;
-    }
-
-    std::size_t size() const noexcept
-    {
-        return str_impl.size();
-    }
-
-    void resize (std::size_t n)
-    {
-        str_impl.resize(n);
-    }
-
-    void resize (std::size_t n, char c)
-    {
-        str_impl.resize(n, c);
-    }
-
-    template <typename op_type>
-    bool operator<(const op_type& op) const
-    {
-        return str_impl < op;
-    }
-
-    bool operator<(const alt_string& op) const
-    {
-        return str_impl < op.str_impl;
-    }
-
-    const char* c_str() const
-    {
-        return str_impl.c_str();
-    }
-
-    char& operator[](std::size_t index)
-    {
-        return str_impl[index];
-    }
-
-    const char& operator[](std::size_t index) const
-    {
-        return str_impl[index];
-    }
-
-    char& back()
-    {
-        return str_impl.back();
-    }
-
-    const char& back() const
-    {
-        return str_impl.back();
-    }
-
-    void clear()
-    {
-        str_impl.clear();
-    }
-
-    const value_type* data()
-    {
-        return str_impl.data();
-    }
-
-  private:
-    std::string str_impl {};
-
-    friend bool ::operator<(const char*, const alt_string&);
-};
-
-void int_to_string(alt_string& target, std::size_t value)
-{
-    target = std::to_string(value).c_str();
-}
-
-using alt_json = nlohmann::basic_json <
-                 std::map,
-                 std::vector,
-                 alt_string,
-                 bool,
-                 std::int64_t,
-                 std::uint64_t,
-                 double,
-                 std::allocator,
-                 nlohmann::adl_serializer >;
-
-
-bool operator<(const char* op1, const alt_string& op2)
-{
-    return op1 < op2.str_impl;
-}
-
-TEST_CASE("alternative string type")
-{
-    SECTION("dump")
-    {
-        {
-            alt_json doc;
-            doc["pi"] = 3.141;
-            alt_string dump = doc.dump();
-            CHECK(dump == R"({"pi":3.141})");
-        }
-
-        {
-            alt_json doc;
-            doc["happy"] = true;
-            alt_string dump = doc.dump();
-            CHECK(dump == R"({"happy":true})");
-        }
-
-        {
-            alt_json doc;
-            doc["name"] = "I'm Batman";
-            alt_string dump = doc.dump();
-            CHECK(dump == R"({"name":"I'm Batman"})");
-        }
-
-        {
-            alt_json doc;
-            doc["nothing"] = nullptr;
-            alt_string dump = doc.dump();
-            CHECK(dump == R"({"nothing":null})");
-        }
-
-        {
-            alt_json doc;
-            doc["answer"]["everything"] = 42;
-            alt_string dump = doc.dump();
-            CHECK(dump == R"({"answer":{"everything":42}})");
-        }
-
-        {
-            alt_json doc;
-            doc["list"] = { 1, 0, 2 };
-            alt_string dump = doc.dump();
-            CHECK(dump == R"({"list":[1,0,2]})");
-        }
-
-        {
-            alt_json doc;
-            doc["object"] = { {"currency", "USD"}, {"value", 42.99} };
-            alt_string dump = doc.dump();
-            CHECK(dump == R"({"object":{"currency":"USD","value":42.99}})");
-        }
-    }
-
-    SECTION("parse")
-    {
-        auto doc = alt_json::parse("{\"foo\": \"bar\"}");
-        alt_string dump = doc.dump();
-        CHECK(dump == R"({"foo":"bar"})");
-    }
-
-    SECTION("items")
-    {
-        auto doc = alt_json::parse("{\"foo\": \"bar\"}");
-
-        for ( auto item : doc.items() )
-        {
-            CHECK( item.key() == "foo" );
-            CHECK( item.value() == "bar" );
-        }
-
-        auto doc_array = alt_json::parse("[\"foo\", \"bar\"]");
-
-        for ( auto item : doc_array.items() )
-        {
-            if (item.key() == "0" )
-            {
-                CHECK( item.value() == "foo" );
-            }
-            else if (item.key() == "1" )
-            {
-                CHECK( item.value() == "bar" );
-            }
-            else
-            {
-                CHECK( false );
-            }
-        }
-    }
-
-    SECTION("equality")
-    {
-        alt_json doc;
-        doc["Who are you?"] = "I'm Batman";
-
-        CHECK("I'm Batman" == doc["Who are you?"]);
-        CHECK(doc["Who are you?"]  == "I'm Batman");
-        CHECK_FALSE("I'm Batman" != doc["Who are you?"]);
-        CHECK_FALSE(doc["Who are you?"]  != "I'm Batman");
-
-        CHECK("I'm Bruce Wayne" != doc["Who are you?"]);
-        CHECK(doc["Who are you?"]  != "I'm Bruce Wayne");
-        CHECK_FALSE("I'm Bruce Wayne" == doc["Who are you?"]);
-        CHECK_FALSE(doc["Who are you?"]  == "I'm Bruce Wayne");
-
-        {
-            const alt_json& const_doc = doc;
-
-            CHECK("I'm Batman" == const_doc["Who are you?"]);
-            CHECK(const_doc["Who are you?"] == "I'm Batman");
-            CHECK_FALSE("I'm Batman" != const_doc["Who are you?"]);
-            CHECK_FALSE(const_doc["Who are you?"] != "I'm Batman");
-
-            CHECK("I'm Bruce Wayne" != const_doc["Who are you?"]);
-            CHECK(const_doc["Who are you?"] != "I'm Bruce Wayne");
-            CHECK_FALSE("I'm Bruce Wayne" == const_doc["Who are you?"]);
-            CHECK_FALSE(const_doc["Who are you?"] == "I'm Bruce Wayne");
-        }
-    }
-}
diff --git a/external_imported/json/test/src/unit-assert_macro.cpp b/external_imported/json/test/src/unit-assert_macro.cpp
deleted file mode 100644
index 826638fe6..000000000
--- a/external_imported/json/test/src/unit-assert_macro.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-// avoid warning when assert does not abort
-#if defined(__GNUC__)
-    #pragma GCC diagnostic ignored "-Wstrict-overflow"
-#endif
-
-#include "doctest_compatibility.h"
-
-/// global variable to record side effect of assert calls
-static int assert_counter;
-
-/// set failure variable to true instead of calling assert(x)
-#define JSON_ASSERT(x) {if (!(x)) ++assert_counter; }
-
-#include <nlohmann/json.hpp>
-using nlohmann::json;
-
-// the test assumes exceptions to work
-#if !defined(JSON_NOEXCEPTION)
-TEST_CASE("JSON_ASSERT(x)")
-{
-    SECTION("basic_json(first, second)")
-    {
-        assert_counter = 0;
-        CHECK(assert_counter == 0);
-
-        json::iterator it;
-        json j;
-
-        // in case assertions do not abort execution, an exception is thrown
-        CHECK_THROWS_WITH_AS(json(it, j.end()), "[json.exception.invalid_iterator.201] iterators are not compatible", json::invalid_iterator);
-
-        // check that assertion actually happened
-        CHECK(assert_counter == 1);
-    }
-}
-#endif
diff --git a/external_imported/json/test/src/unit-cbor.cpp b/external_imported/json/test/src/unit-cbor.cpp
deleted file mode 100644
index 9ed80c8f1..000000000
--- a/external_imported/json/test/src/unit-cbor.cpp
+++ /dev/null
@@ -1,2741 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include "doctest_compatibility.h"
-DOCTEST_GCC_SUPPRESS_WARNING("-Wfloat-equal")
-
-#include <nlohmann/json.hpp>
-using nlohmann::json;
-
-#include <fstream>
-#include <sstream>
-#include <iomanip>
-#include <iostream>
-#include <set>
-#include <test_data.hpp>
-#include "test_utils.hpp"
-
-namespace
-{
-class SaxCountdown
-{
-  public:
-    explicit SaxCountdown(const int count) : events_left(count)
-    {}
-
-    bool null()
-    {
-        return events_left-- > 0;
-    }
-
-    bool boolean(bool)
-    {
-        return events_left-- > 0;
-    }
-
-    bool number_integer(json::number_integer_t)
-    {
-        return events_left-- > 0;
-    }
-
-    bool number_unsigned(json::number_unsigned_t)
-    {
-        return events_left-- > 0;
-    }
-
-    bool number_float(json::number_float_t, const std::string&)
-    {
-        return events_left-- > 0;
-    }
-
-    bool string(std::string&)
-    {
-        return events_left-- > 0;
-    }
-
-    bool binary(std::vector<std::uint8_t>&)
-    {
-        return events_left-- > 0;
-    }
-
-    bool start_object(std::size_t)
-    {
-        return events_left-- > 0;
-    }
-
-    bool key(std::string&)
-    {
-        return events_left-- > 0;
-    }
-
-    bool end_object()
-    {
-        return events_left-- > 0;
-    }
-
-    bool start_array(std::size_t)
-    {
-        return events_left-- > 0;
-    }
-
-    bool end_array()
-    {
-        return events_left-- > 0;
-    }
-
-    bool parse_error(std::size_t, const std::string&, const json::exception&)
-    {
-        return false;
-    }
-
-  private:
-    int events_left = 0;
-};
-}
-
-TEST_CASE("CBOR")
-{
-    SECTION("individual values")
-    {
-        SECTION("discarded")
-        {
-            // discarded values are not serialized
-            json j = json::value_t::discarded;
-            const auto result = json::to_cbor(j);
-            CHECK(result.empty());
-        }
-
-        SECTION("NaN")
-        {
-            // NaN value
-            json j = std::numeric_limits<json::number_float_t>::quiet_NaN();
-            std::vector<uint8_t> expected = {0xf9, 0x7e, 0x00};
-            const auto result = json::to_cbor(j);
-            CHECK(result == expected);
-        }
-
-        SECTION("Infinity")
-        {
-            // Infinity value
-            json j = std::numeric_limits<json::number_float_t>::infinity();
-            std::vector<uint8_t> expected = {0xf9, 0x7c, 0x00};
-            const auto result = json::to_cbor(j);
-            CHECK(result == expected);
-        }
-
-        SECTION("null")
-        {
-            json j = nullptr;
-            std::vector<uint8_t> expected = {0xf6};
-            const auto result = json::to_cbor(j);
-            CHECK(result == expected);
-
-            // roundtrip
-            CHECK(json::from_cbor(result) == j);
-            CHECK(json::from_cbor(result, true, false) == j);
-        }
-
-        SECTION("boolean")
-        {
-            SECTION("true")
-            {
-                json j = true;
-                std::vector<uint8_t> expected = {0xf5};
-                const auto result = json::to_cbor(j);
-                CHECK(result == expected);
-
-                // roundtrip
-                CHECK(json::from_cbor(result) == j);
-                CHECK(json::from_cbor(result, true, false) == j);
-            }
-
-            SECTION("false")
-            {
-                json j = false;
-                std::vector<uint8_t> expected = {0xf4};
-                const auto result = json::to_cbor(j);
-                CHECK(result == expected);
-
-                // roundtrip
-                CHECK(json::from_cbor(result) == j);
-                CHECK(json::from_cbor(result, true, false) == j);
-            }
-        }
-
-        SECTION("number")
-        {
-            SECTION("signed")
-            {
-                SECTION("-9223372036854775808..-4294967297")
-                {
-                    std::vector<int64_t> numbers;
-                    numbers.push_back(INT64_MIN);
-                    numbers.push_back(-1000000000000000000);
-                    numbers.push_back(-100000000000000000);
-                    numbers.push_back(-10000000000000000);
-                    numbers.push_back(-1000000000000000);
-                    numbers.push_back(-100000000000000);
-                    numbers.push_back(-10000000000000);
-                    numbers.push_back(-1000000000000);
-                    numbers.push_back(-100000000000);
-                    numbers.push_back(-10000000000);
-                    numbers.push_back(-4294967297);
-                    for (auto i : numbers)
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with integer number
-                        json j = i;
-
-                        // check type
-                        CHECK(j.is_number_integer());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back(static_cast<uint8_t>(0x3b));
-                        uint64_t positive = static_cast<uint64_t>(-1 - i);
-                        expected.push_back(static_cast<uint8_t>((positive >> 56) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((positive >> 48) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((positive >> 40) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((positive >> 32) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((positive >> 24) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((positive >> 16) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((positive >> 8) & 0xff));
-                        expected.push_back(static_cast<uint8_t>(positive & 0xff));
-
-                        // compare result + size
-                        const auto result = json::to_cbor(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 9);
-
-                        // check individual bytes
-                        CHECK(result[0] == 0x3b);
-                        uint64_t restored = (static_cast<uint64_t>(result[1]) << 070) +
-                                            (static_cast<uint64_t>(result[2]) << 060) +
-                                            (static_cast<uint64_t>(result[3]) << 050) +
-                                            (static_cast<uint64_t>(result[4]) << 040) +
-                                            (static_cast<uint64_t>(result[5]) << 030) +
-                                            (static_cast<uint64_t>(result[6]) << 020) +
-                                            (static_cast<uint64_t>(result[7]) << 010) +
-                                            static_cast<uint64_t>(result[8]);
-                        CHECK(restored == positive);
-                        CHECK(-1 - static_cast<int64_t>(restored) == i);
-
-                        // roundtrip
-                        CHECK(json::from_cbor(result) == j);
-                        CHECK(json::from_cbor(result, true, false) == j);
-                    }
-                }
-
-                SECTION("-4294967296..-65537")
-                {
-                    std::vector<int64_t> numbers;
-                    numbers.push_back(-65537);
-                    numbers.push_back(-100000);
-                    numbers.push_back(-1000000);
-                    numbers.push_back(-10000000);
-                    numbers.push_back(-100000000);
-                    numbers.push_back(-1000000000);
-                    numbers.push_back(-4294967296);
-                    for (auto i : numbers)
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with integer number
-                        json j = i;
-
-                        // check type
-                        CHECK(j.is_number_integer());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back(static_cast<uint8_t>(0x3a));
-                        uint32_t positive = static_cast<uint32_t>(static_cast<uint64_t>(-1 - i) & 0x00000000ffffffff);
-                        expected.push_back(static_cast<uint8_t>((positive >> 24) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((positive >> 16) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((positive >> 8) & 0xff));
-                        expected.push_back(static_cast<uint8_t>(positive & 0xff));
-
-                        // compare result + size
-                        const auto result = json::to_cbor(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 5);
-
-                        // check individual bytes
-                        CHECK(result[0] == 0x3a);
-                        uint32_t restored = (static_cast<uint32_t>(result[1]) << 030) +
-                                            (static_cast<uint32_t>(result[2]) << 020) +
-                                            (static_cast<uint32_t>(result[3]) << 010) +
-                                            static_cast<uint32_t>(result[4]);
-                        CHECK(restored == positive);
-                        CHECK(-1ll - restored == i);
-
-                        // roundtrip
-                        CHECK(json::from_cbor(result) == j);
-                        CHECK(json::from_cbor(result, true, false) == j);
-                    }
-                }
-
-                SECTION("-65536..-257")
-                {
-                    for (int32_t i = -65536; i <= -257; ++i)
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with integer number
-                        json j = i;
-
-                        // check type
-                        CHECK(j.is_number_integer());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back(static_cast<uint8_t>(0x39));
-                        uint16_t positive = static_cast<uint16_t>(-1 - i);
-                        expected.push_back(static_cast<uint8_t>((positive >> 8) & 0xff));
-                        expected.push_back(static_cast<uint8_t>(positive & 0xff));
-
-                        // compare result + size
-                        const auto result = json::to_cbor(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 3);
-
-                        // check individual bytes
-                        CHECK(result[0] == 0x39);
-                        uint16_t restored = static_cast<uint16_t>(static_cast<uint8_t>(result[1]) * 256 + static_cast<uint8_t>(result[2]));
-                        CHECK(restored == positive);
-                        CHECK(-1 - restored == i);
-
-                        // roundtrip
-                        CHECK(json::from_cbor(result) == j);
-                        CHECK(json::from_cbor(result, true, false) == j);
-                    }
-                }
-
-                SECTION("-9263 (int 16)")
-                {
-                    json j = -9263;
-                    std::vector<uint8_t> expected = {0x39, 0x24, 0x2e};
-
-                    const auto result = json::to_cbor(j);
-                    CHECK(result == expected);
-
-                    int16_t restored = static_cast<int16_t>(-1 - ((result[1] << 8) + result[2]));
-                    CHECK(restored == -9263);
-
-                    // roundtrip
-                    CHECK(json::from_cbor(result) == j);
-                    CHECK(json::from_cbor(result, true, false) == j);
-                }
-
-                SECTION("-256..-24")
-                {
-                    for (auto i = -256; i < -24; ++i)
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with integer number
-                        json j = i;
-
-                        // check type
-                        CHECK(j.is_number_integer());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back(0x38);
-                        expected.push_back(static_cast<uint8_t>(-1 - i));
-
-                        // compare result + size
-                        const auto result = json::to_cbor(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 2);
-
-                        // check individual bytes
-                        CHECK(result[0] == 0x38);
-                        CHECK(static_cast<int16_t>(-1 - result[1]) == i);
-
-                        // roundtrip
-                        CHECK(json::from_cbor(result) == j);
-                        CHECK(json::from_cbor(result, true, false) == j);
-                    }
-                }
-
-                SECTION("-24..-1")
-                {
-                    for (auto i = -24; i <= -1; ++i)
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with integer number
-                        json j = i;
-
-                        // check type
-                        CHECK(j.is_number_integer());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back(static_cast<uint8_t>(0x20 - 1 - static_cast<uint8_t>(i)));
-
-                        // compare result + size
-                        const auto result = json::to_cbor(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 1);
-
-                        // check individual bytes
-                        CHECK(static_cast<int8_t>(0x20 - 1 - result[0]) == i);
-
-                        // roundtrip
-                        CHECK(json::from_cbor(result) == j);
-                        CHECK(json::from_cbor(result, true, false) == j);
-                    }
-                }
-
-                SECTION("0..23")
-                {
-                    for (size_t i = 0; i <= 23; ++i)
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with integer number
-                        json j = -1;
-                        j.get_ref<json::number_integer_t&>() = static_cast<json::number_integer_t>(i);
-
-                        // check type
-                        CHECK(j.is_number_integer());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back(static_cast<uint8_t>(i));
-
-                        // compare result + size
-                        const auto result = json::to_cbor(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 1);
-
-                        // check individual bytes
-                        CHECK(result[0] == i);
-
-                        // roundtrip
-                        CHECK(json::from_cbor(result) == j);
-                        CHECK(json::from_cbor(result, true, false) == j);
-                    }
-                }
-
-                SECTION("24..255")
-                {
-                    for (size_t i = 24; i <= 255; ++i)
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with integer number
-                        json j = -1;
-                        j.get_ref<json::number_integer_t&>() = static_cast<json::number_integer_t>(i);
-
-                        // check type
-                        CHECK(j.is_number_integer());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back(static_cast<uint8_t>(0x18));
-                        expected.push_back(static_cast<uint8_t>(i));
-
-                        // compare result + size
-                        const auto result = json::to_cbor(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 2);
-
-                        // check individual bytes
-                        CHECK(result[0] == 0x18);
-                        CHECK(result[1] == i);
-
-                        // roundtrip
-                        CHECK(json::from_cbor(result) == j);
-                        CHECK(json::from_cbor(result, true, false) == j);
-                    }
-                }
-
-                SECTION("256..65535")
-                {
-                    for (size_t i = 256; i <= 65535; ++i)
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with integer number
-                        json j = -1;
-                        j.get_ref<json::number_integer_t&>() = static_cast<json::number_integer_t>(i);
-
-                        // check type
-                        CHECK(j.is_number_integer());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back(static_cast<uint8_t>(0x19));
-                        expected.push_back(static_cast<uint8_t>((i >> 8) & 0xff));
-                        expected.push_back(static_cast<uint8_t>(i & 0xff));
-
-                        // compare result + size
-                        const auto result = json::to_cbor(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 3);
-
-                        // check individual bytes
-                        CHECK(result[0] == 0x19);
-                        uint16_t restored = static_cast<uint16_t>(static_cast<uint8_t>(result[1]) * 256 + static_cast<uint8_t>(result[2]));
-                        CHECK(restored == i);
-
-                        // roundtrip
-                        CHECK(json::from_cbor(result) == j);
-                        CHECK(json::from_cbor(result, true, false) == j);
-                    }
-                }
-
-                SECTION("65536..4294967295")
-                {
-                    for (uint32_t i :
-                            {
-                                65536u, 77777u, 1048576u
-                            })
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with integer number
-                        json j = -1;
-                        j.get_ref<json::number_integer_t&>() = static_cast<json::number_integer_t>(i);
-
-                        // check type
-                        CHECK(j.is_number_integer());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back(0x1a);
-                        expected.push_back(static_cast<uint8_t>((i >> 24) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 16) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 8) & 0xff));
-                        expected.push_back(static_cast<uint8_t>(i & 0xff));
-
-                        // compare result + size
-                        const auto result = json::to_cbor(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 5);
-
-                        // check individual bytes
-                        CHECK(result[0] == 0x1a);
-                        uint32_t restored = (static_cast<uint32_t>(result[1]) << 030) +
-                                            (static_cast<uint32_t>(result[2]) << 020) +
-                                            (static_cast<uint32_t>(result[3]) << 010) +
-                                            static_cast<uint32_t>(result[4]);
-                        CHECK(restored == i);
-
-                        // roundtrip
-                        CHECK(json::from_cbor(result) == j);
-                        CHECK(json::from_cbor(result, true, false) == j);
-                    }
-                }
-
-                SECTION("4294967296..4611686018427387903")
-                {
-                    for (uint64_t i :
-                            {
-                                4294967296ul, 4611686018427387903ul
-                            })
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with integer number
-                        json j = -1;
-                        j.get_ref<json::number_integer_t&>() = static_cast<json::number_integer_t>(i);
-
-                        // check type
-                        CHECK(j.is_number_integer());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back(0x1b);
-                        expected.push_back(static_cast<uint8_t>((i >> 070) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 060) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 050) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 040) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 030) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 020) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 010) & 0xff));
-                        expected.push_back(static_cast<uint8_t>(i & 0xff));
-
-                        // compare result + size
-                        const auto result = json::to_cbor(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 9);
-
-                        // check individual bytes
-                        CHECK(result[0] == 0x1b);
-                        uint64_t restored = (static_cast<uint64_t>(result[1]) << 070) +
-                                            (static_cast<uint64_t>(result[2]) << 060) +
-                                            (static_cast<uint64_t>(result[3]) << 050) +
-                                            (static_cast<uint64_t>(result[4]) << 040) +
-                                            (static_cast<uint64_t>(result[5]) << 030) +
-                                            (static_cast<uint64_t>(result[6]) << 020) +
-                                            (static_cast<uint64_t>(result[7]) << 010) +
-                                            static_cast<uint64_t>(result[8]);
-                        CHECK(restored == i);
-
-                        // roundtrip
-                        CHECK(json::from_cbor(result) == j);
-                        CHECK(json::from_cbor(result, true, false) == j);
-                    }
-                }
-
-                SECTION("-32768..-129 (int 16)")
-                {
-                    for (int16_t i = -32768; i <= -129; ++i)
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with integer number
-                        json j = i;
-
-                        // check type
-                        CHECK(j.is_number_integer());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back(0xd1);
-                        expected.push_back(static_cast<uint8_t>((i >> 8) & 0xff));
-                        expected.push_back(static_cast<uint8_t>(i & 0xff));
-
-                        // compare result + size
-                        const auto result = json::to_msgpack(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 3);
-
-                        // check individual bytes
-                        CHECK(result[0] == 0xd1);
-                        int16_t restored = static_cast<int16_t>((result[1] << 8) + result[2]);
-                        CHECK(restored == i);
-
-                        // roundtrip
-                        CHECK(json::from_msgpack(result) == j);
-                    }
-                }
-            }
-
-            SECTION("unsigned")
-            {
-                SECTION("0..23 (Integer)")
-                {
-                    for (size_t i = 0; i <= 23; ++i)
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with unsigned integer number
-                        json j = i;
-
-                        // check type
-                        CHECK(j.is_number_unsigned());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back(static_cast<uint8_t>(i));
-
-                        // compare result + size
-                        const auto result = json::to_cbor(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 1);
-
-                        // check individual bytes
-                        CHECK(result[0] == i);
-
-                        // roundtrip
-                        CHECK(json::from_cbor(result) == j);
-                        CHECK(json::from_cbor(result, true, false) == j);
-                    }
-                }
-
-                SECTION("24..255 (one-byte uint8_t)")
-                {
-                    for (size_t i = 24; i <= 255; ++i)
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with unsigned integer number
-                        json j = i;
-
-                        // check type
-                        CHECK(j.is_number_unsigned());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back(0x18);
-                        expected.push_back(static_cast<uint8_t>(i));
-
-                        // compare result + size
-                        const auto result = json::to_cbor(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 2);
-
-                        // check individual bytes
-                        CHECK(result[0] == 0x18);
-                        uint8_t restored = static_cast<uint8_t>(result[1]);
-                        CHECK(restored == i);
-
-                        // roundtrip
-                        CHECK(json::from_cbor(result) == j);
-                        CHECK(json::from_cbor(result, true, false) == j);
-                    }
-                }
-
-                SECTION("256..65535 (two-byte uint16_t)")
-                {
-                    for (size_t i = 256; i <= 65535; ++i)
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with unsigned integer number
-                        json j = i;
-
-                        // check type
-                        CHECK(j.is_number_unsigned());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back(0x19);
-                        expected.push_back(static_cast<uint8_t>((i >> 8) & 0xff));
-                        expected.push_back(static_cast<uint8_t>(i & 0xff));
-
-                        // compare result + size
-                        const auto result = json::to_cbor(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 3);
-
-                        // check individual bytes
-                        CHECK(result[0] == 0x19);
-                        uint16_t restored = static_cast<uint16_t>(static_cast<uint8_t>(result[1]) * 256 + static_cast<uint8_t>(result[2]));
-                        CHECK(restored == i);
-
-                        // roundtrip
-                        CHECK(json::from_cbor(result) == j);
-                        CHECK(json::from_cbor(result, true, false) == j);
-                    }
-                }
-
-                SECTION("65536..4294967295 (four-byte uint32_t)")
-                {
-                    for (uint32_t i :
-                            {
-                                65536u, 77777u, 1048576u
-                            })
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with unsigned integer number
-                        json j = i;
-
-                        // check type
-                        CHECK(j.is_number_unsigned());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back(0x1a);
-                        expected.push_back(static_cast<uint8_t>((i >> 24) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 16) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 8) & 0xff));
-                        expected.push_back(static_cast<uint8_t>(i & 0xff));
-
-                        // compare result + size
-                        const auto result = json::to_cbor(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 5);
-
-                        // check individual bytes
-                        CHECK(result[0] == 0x1a);
-                        uint32_t restored = (static_cast<uint32_t>(result[1]) << 030) +
-                                            (static_cast<uint32_t>(result[2]) << 020) +
-                                            (static_cast<uint32_t>(result[3]) << 010) +
-                                            static_cast<uint32_t>(result[4]);
-                        CHECK(restored == i);
-
-                        // roundtrip
-                        CHECK(json::from_cbor(result) == j);
-                        CHECK(json::from_cbor(result, true, false) == j);
-                    }
-                }
-
-                SECTION("4294967296..4611686018427387903 (eight-byte uint64_t)")
-                {
-                    for (uint64_t i :
-                            {
-                                4294967296ul, 4611686018427387903ul
-                            })
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with integer number
-                        json j = i;
-
-                        // check type
-                        CHECK(j.is_number_unsigned());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back(0x1b);
-                        expected.push_back(static_cast<uint8_t>((i >> 070) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 060) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 050) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 040) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 030) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 020) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 010) & 0xff));
-                        expected.push_back(static_cast<uint8_t>(i & 0xff));
-
-                        // compare result + size
-                        const auto result = json::to_cbor(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 9);
-
-                        // check individual bytes
-                        CHECK(result[0] == 0x1b);
-                        uint64_t restored = (static_cast<uint64_t>(result[1]) << 070) +
-                                            (static_cast<uint64_t>(result[2]) << 060) +
-                                            (static_cast<uint64_t>(result[3]) << 050) +
-                                            (static_cast<uint64_t>(result[4]) << 040) +
-                                            (static_cast<uint64_t>(result[5]) << 030) +
-                                            (static_cast<uint64_t>(result[6]) << 020) +
-                                            (static_cast<uint64_t>(result[7]) << 010) +
-                                            static_cast<uint64_t>(result[8]);
-                        CHECK(restored == i);
-
-                        // roundtrip
-                        CHECK(json::from_cbor(result) == j);
-                        CHECK(json::from_cbor(result, true, false) == j);
-                    }
-                }
-            }
-
-            SECTION("double-precision float")
-            {
-                SECTION("3.1415925")
-                {
-                    double v = 3.1415925;
-                    json j = v;
-                    std::vector<uint8_t> expected =
-                    {
-                        0xfb, 0x40, 0x09, 0x21, 0xfb, 0x3f, 0xa6, 0xde, 0xfc
-                    };
-                    const auto result = json::to_cbor(j);
-                    CHECK(result == expected);
-
-                    // roundtrip
-                    CHECK(json::from_cbor(result) == j);
-                    CHECK(json::from_cbor(result) == v);
-
-                    CHECK(json::from_cbor(result, true, false) == j);
-                }
-            }
-
-            SECTION("single-precision float")
-            {
-                SECTION("0.5")
-                {
-                    double v = 0.5;
-                    json j = v;
-                    // its double-precision float binary value is
-                    // {0xfb, 0x3f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
-                    // but to save memory, we can store it as single-precision float.
-                    std::vector<uint8_t> expected = {0xfa, 0x3f, 0x00, 0x00, 0x00};
-                    const auto result = json::to_cbor(j);
-                    CHECK(result == expected);
-                    // roundtrip
-                    CHECK(json::from_cbor(result) == j);
-                    CHECK(json::from_cbor(result) == v);
-                }
-                SECTION("0.0")
-                {
-                    double v = 0.0;
-                    json j = v;
-                    // its double-precision binary value is:
-                    // {0xfb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
-                    std::vector<uint8_t> expected = {0xfa, 0x00, 0x00, 0x00, 0x00};
-                    const auto result = json::to_cbor(j);
-                    CHECK(result == expected);
-                    // roundtrip
-                    CHECK(json::from_cbor(result) == j);
-                    CHECK(json::from_cbor(result) == v);
-                }
-                SECTION("-0.0")
-                {
-                    double v = -0.0;
-                    json j = v;
-                    // its double-precision binary value is:
-                    // {0xfb, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
-                    std::vector<uint8_t> expected = {0xfa, 0x80, 0x00, 0x00, 0x00};
-                    const auto result = json::to_cbor(j);
-                    CHECK(result == expected);
-                    // roundtrip
-                    CHECK(json::from_cbor(result) == j);
-                    CHECK(json::from_cbor(result) == v);
-                }
-                SECTION("100.0")
-                {
-                    double v = 100.0;
-                    json j = v;
-                    // its double-precision binary value is:
-                    // {0xfb, 0x40, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
-                    std::vector<uint8_t> expected = {0xfa, 0x42, 0xc8, 0x00, 0x00};
-                    const auto result = json::to_cbor(j);
-                    CHECK(result == expected);
-                    // roundtrip
-                    CHECK(json::from_cbor(result) == j);
-                    CHECK(json::from_cbor(result) == v);
-                }
-                SECTION("200.0")
-                {
-                    double v = 200.0;
-                    json j = v;
-                    // its double-precision binary value is:
-                    // {0xfb, 0x40, 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
-                    std::vector<uint8_t> expected = {0xfa, 0x43, 0x48, 0x00, 0x00};
-                    const auto result = json::to_cbor(j);
-                    CHECK(result == expected);
-                    // roundtrip
-                    CHECK(json::from_cbor(result) == j);
-                    CHECK(json::from_cbor(result) == v);
-                }
-                SECTION("3.40282e+38(max float)")
-                {
-                    float v = (std::numeric_limits<float>::max)();
-                    json j = v;
-                    std::vector<uint8_t> expected =
-                    {
-                        0xfa, 0x7f, 0x7f, 0xff, 0xff
-                    };
-                    const auto result = json::to_cbor(j);
-                    CHECK(result == expected);
-                    // roundtrip
-                    CHECK(json::from_cbor(result) == j);
-                    CHECK(json::from_cbor(result) == v);
-                }
-                SECTION("-3.40282e+38(lowest float)")
-                {
-                    double v = static_cast<double>(std::numeric_limits<float>::lowest());
-                    json j = v;
-                    std::vector<uint8_t> expected =
-                    {
-                        0xfa, 0xff, 0x7f, 0xff, 0xff
-                    };
-                    const auto result = json::to_cbor(j);
-                    CHECK(result == expected);
-                    // roundtrip
-                    CHECK(json::from_cbor(result) == j);
-                    CHECK(json::from_cbor(result) == v);
-                }
-                SECTION("1 + 3.40282e+38(more than max float)")
-                {
-                    double v = static_cast<double>((std::numeric_limits<float>::max)()) + 0.1e+34;
-                    json j = v;
-                    std::vector<uint8_t> expected =
-                    {
-                        0xfb, 0x47, 0xf0, 0x00, 0x03, 0x04, 0xdc, 0x64, 0x49
-                    };
-                    // double
-                    const auto result = json::to_cbor(j);
-                    CHECK(result == expected);
-                    // roundtrip
-                    CHECK(json::from_cbor(result) == j);
-                    CHECK(json::from_cbor(result) == v);
-                }
-                SECTION("-1 - 3.40282e+38(less than lowest float)")
-                {
-                    double v = static_cast<double>(std::numeric_limits<float>::lowest()) - 1.0;
-                    json j = v;
-                    std::vector<uint8_t> expected =
-                    {
-                        0xfa, 0xff, 0x7f, 0xff, 0xff
-                    };
-                    // the same with lowest float
-                    const auto result = json::to_cbor(j);
-                    CHECK(result == expected);
-                    // roundtrip
-                    CHECK(json::from_cbor(result) == j);
-                    CHECK(json::from_cbor(result) == v);
-                }
-
-            }
-
-            SECTION("half-precision float (edge cases)")
-            {
-                SECTION("errors")
-                {
-                    SECTION("no byte follows")
-                    {
-                        json _;
-                        CHECK_THROWS_AS(_ = json::from_cbor(std::vector<uint8_t>({0xf9})), json::parse_error&);
-                        CHECK_THROWS_WITH(_ = json::from_cbor(std::vector<uint8_t>({0xf9})),
-                                          "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing CBOR number: unexpected end of input");
-                        CHECK(json::from_cbor(std::vector<uint8_t>({0xf9}), true, false).is_discarded());
-                    }
-                    SECTION("only one byte follows")
-                    {
-                        json _;
-                        CHECK_THROWS_AS(_ = json::from_cbor(std::vector<uint8_t>({0xf9, 0x7c})), json::parse_error&);
-                        CHECK_THROWS_WITH(_ = json::from_cbor(std::vector<uint8_t>({0xf9, 0x7c})),
-                                          "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing CBOR number: unexpected end of input");
-                        CHECK(json::from_cbor(std::vector<uint8_t>({0xf9, 0x7c}), true, false).is_discarded());
-                    }
-                }
-
-                SECTION("exp = 0b00000")
-                {
-                    SECTION("0 (0 00000 0000000000)")
-                    {
-                        json j = json::from_cbor(std::vector<uint8_t>({0xf9, 0x00, 0x00}));
-                        json::number_float_t d{j};
-                        CHECK(d == 0.0);
-                    }
-
-                    SECTION("-0 (1 00000 0000000000)")
-                    {
-                        json j = json::from_cbor(std::vector<uint8_t>({0xf9, 0x80, 0x00}));
-                        json::number_float_t d{j};
-                        CHECK(d == -0.0);
-                    }
-
-                    SECTION("2**-24 (0 00000 0000000001)")
-                    {
-                        json j = json::from_cbor(std::vector<uint8_t>({0xf9, 0x00, 0x01}));
-                        json::number_float_t d{j};
-                        CHECK(d == std::pow(2.0, -24.0));
-                    }
-                }
-
-                SECTION("exp = 0b11111")
-                {
-                    SECTION("infinity (0 11111 0000000000)")
-                    {
-                        json j = json::from_cbor(std::vector<uint8_t>({0xf9, 0x7c, 0x00}));
-                        json::number_float_t d{j};
-                        CHECK(d == std::numeric_limits<json::number_float_t>::infinity());
-                        CHECK(j.dump() == "null");
-                    }
-
-                    SECTION("-infinity (1 11111 0000000000)")
-                    {
-                        json j = json::from_cbor(std::vector<uint8_t>({0xf9, 0xfc, 0x00}));
-                        json::number_float_t d{j};
-                        CHECK(d == -std::numeric_limits<json::number_float_t>::infinity());
-                        CHECK(j.dump() == "null");
-                    }
-                }
-
-                SECTION("other values from https://en.wikipedia.org/wiki/Half-precision_floating-point_format")
-                {
-                    SECTION("1 (0 01111 0000000000)")
-                    {
-                        json j = json::from_cbor(std::vector<uint8_t>({0xf9, 0x3c, 0x00}));
-                        json::number_float_t d{j};
-                        CHECK(d == 1);
-                    }
-
-                    SECTION("-2 (1 10000 0000000000)")
-                    {
-                        json j = json::from_cbor(std::vector<uint8_t>({0xf9, 0xc0, 0x00}));
-                        json::number_float_t d{j};
-                        CHECK(d == -2);
-                    }
-
-                    SECTION("65504 (0 11110 1111111111)")
-                    {
-                        json j = json::from_cbor(std::vector<uint8_t>({0xf9, 0x7b, 0xff}));
-                        json::number_float_t d{j};
-                        CHECK(d == 65504);
-                    }
-                }
-
-                SECTION("infinity")
-                {
-                    json j = json::from_cbor(std::vector<uint8_t>({0xf9, 0x7c, 0x00}));
-                    json::number_float_t d{j};
-                    CHECK(!std::isfinite(d));
-                    CHECK(j.dump() == "null");
-                }
-
-                SECTION("NaN")
-                {
-                    json j = json::from_cbor(std::vector<uint8_t>({0xf9, 0x7e, 0x00}));
-                    json::number_float_t d{j};
-                    CHECK(std::isnan(d));
-                    CHECK(j.dump() == "null");
-                }
-            }
-        }
-
-        SECTION("string")
-        {
-            SECTION("N = 0..23")
-            {
-                for (size_t N = 0; N <= 0x17; ++N)
-                {
-                    CAPTURE(N)
-
-                    // create JSON value with string containing of N * 'x'
-                    const auto s = std::string(N, 'x');
-                    json j = s;
-
-                    // create expected byte vector
-                    std::vector<uint8_t> expected;
-                    expected.push_back(static_cast<uint8_t>(0x60 + N));
-                    for (size_t i = 0; i < N; ++i)
-                    {
-                        expected.push_back('x');
-                    }
-
-                    // compare result + size
-                    const auto result = json::to_cbor(j);
-                    CHECK(result == expected);
-                    CHECK(result.size() == N + 1);
-                    // check that no null byte is appended
-                    if (N > 0)
-                    {
-                        CHECK(result.back() != '\x00');
-                    }
-
-                    // roundtrip
-                    CHECK(json::from_cbor(result) == j);
-                    CHECK(json::from_cbor(result, true, false) == j);
-                }
-            }
-
-            SECTION("N = 24..255")
-            {
-                for (size_t N = 24; N <= 255; ++N)
-                {
-                    CAPTURE(N)
-
-                    // create JSON value with string containing of N * 'x'
-                    const auto s = std::string(N, 'x');
-                    json j = s;
-
-                    // create expected byte vector
-                    std::vector<uint8_t> expected;
-                    expected.push_back(0x78);
-                    expected.push_back(static_cast<uint8_t>(N));
-                    for (size_t i = 0; i < N; ++i)
-                    {
-                        expected.push_back('x');
-                    }
-
-                    // compare result + size
-                    const auto result = json::to_cbor(j);
-                    CHECK(result == expected);
-                    CHECK(result.size() == N + 2);
-                    // check that no null byte is appended
-                    CHECK(result.back() != '\x00');
-
-                    // roundtrip
-                    CHECK(json::from_cbor(result) == j);
-                    CHECK(json::from_cbor(result, true, false) == j);
-                }
-            }
-
-            SECTION("N = 256..65535")
-            {
-                for (size_t N :
-                        {
-                            256u, 999u, 1025u, 3333u, 2048u, 65535u
-                        })
-                {
-                    CAPTURE(N)
-
-                    // create JSON value with string containing of N * 'x'
-                    const auto s = std::string(N, 'x');
-                    json j = s;
-
-                    // create expected byte vector (hack: create string first)
-                    std::vector<uint8_t> expected(N, 'x');
-                    // reverse order of commands, because we insert at begin()
-                    expected.insert(expected.begin(), static_cast<uint8_t>(N & 0xff));
-                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 8) & 0xff));
-                    expected.insert(expected.begin(), 0x79);
-
-                    // compare result + size
-                    const auto result = json::to_cbor(j);
-                    CHECK(result == expected);
-                    CHECK(result.size() == N + 3);
-                    // check that no null byte is appended
-                    CHECK(result.back() != '\x00');
-
-                    // roundtrip
-                    CHECK(json::from_cbor(result) == j);
-                    CHECK(json::from_cbor(result, true, false) == j);
-                }
-            }
-
-            SECTION("N = 65536..4294967295")
-            {
-                for (size_t N :
-                        {
-                            65536u, 77777u, 1048576u
-                        })
-                {
-                    CAPTURE(N)
-
-                    // create JSON value with string containing of N * 'x'
-                    const auto s = std::string(N, 'x');
-                    json j = s;
-
-                    // create expected byte vector (hack: create string first)
-                    std::vector<uint8_t> expected(N, 'x');
-                    // reverse order of commands, because we insert at begin()
-                    expected.insert(expected.begin(), static_cast<uint8_t>(N & 0xff));
-                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 8) & 0xff));
-                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 16) & 0xff));
-                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 24) & 0xff));
-                    expected.insert(expected.begin(), 0x7a);
-
-                    // compare result + size
-                    const auto result = json::to_cbor(j);
-                    CHECK(result == expected);
-                    CHECK(result.size() == N + 5);
-                    // check that no null byte is appended
-                    CHECK(result.back() != '\x00');
-
-                    // roundtrip
-                    CHECK(json::from_cbor(result) == j);
-                    CHECK(json::from_cbor(result, true, false) == j);
-                }
-            }
-        }
-
-        SECTION("array")
-        {
-            SECTION("empty")
-            {
-                json j = json::array();
-                std::vector<uint8_t> expected = {0x80};
-                const auto result = json::to_cbor(j);
-                CHECK(result == expected);
-
-                // roundtrip
-                CHECK(json::from_cbor(result) == j);
-                CHECK(json::from_cbor(result, true, false) == j);
-            }
-
-            SECTION("[null]")
-            {
-                json j = {nullptr};
-                std::vector<uint8_t> expected = {0x81, 0xf6};
-                const auto result = json::to_cbor(j);
-                CHECK(result == expected);
-
-                // roundtrip
-                CHECK(json::from_cbor(result) == j);
-                CHECK(json::from_cbor(result, true, false) == j);
-            }
-
-            SECTION("[1,2,3,4,5]")
-            {
-                json j = json::parse("[1,2,3,4,5]");
-                std::vector<uint8_t> expected = {0x85, 0x01, 0x02, 0x03, 0x04, 0x05};
-                const auto result = json::to_cbor(j);
-                CHECK(result == expected);
-
-                // roundtrip
-                CHECK(json::from_cbor(result) == j);
-                CHECK(json::from_cbor(result, true, false) == j);
-            }
-
-            SECTION("[[[[]]]]")
-            {
-                json j = json::parse("[[[[]]]]");
-                std::vector<uint8_t> expected = {0x81, 0x81, 0x81, 0x80};
-                const auto result = json::to_cbor(j);
-                CHECK(result == expected);
-
-                // roundtrip
-                CHECK(json::from_cbor(result) == j);
-                CHECK(json::from_cbor(result, true, false) == j);
-            }
-
-            SECTION("array with uint16_t elements")
-            {
-                json j(257, nullptr);
-                std::vector<uint8_t> expected(j.size() + 3, 0xf6); // all null
-                expected[0] = 0x99; // array 16 bit
-                expected[1] = 0x01; // size (0x0101), byte 0
-                expected[2] = 0x01; // size (0x0101), byte 1
-                const auto result = json::to_cbor(j);
-                CHECK(result == expected);
-
-                // roundtrip
-                CHECK(json::from_cbor(result) == j);
-                CHECK(json::from_cbor(result, true, false) == j);
-            }
-
-            SECTION("array with uint32_t elements")
-            {
-                json j(65793, nullptr);
-                std::vector<uint8_t> expected(j.size() + 5, 0xf6); // all null
-                expected[0] = 0x9a; // array 32 bit
-                expected[1] = 0x00; // size (0x00010101), byte 0
-                expected[2] = 0x01; // size (0x00010101), byte 1
-                expected[3] = 0x01; // size (0x00010101), byte 2
-                expected[4] = 0x01; // size (0x00010101), byte 3
-                const auto result = json::to_cbor(j);
-                CHECK(result == expected);
-
-                // roundtrip
-                CHECK(json::from_cbor(result) == j);
-                CHECK(json::from_cbor(result, true, false) == j);
-            }
-        }
-
-        SECTION("object")
-        {
-            SECTION("empty")
-            {
-                json j = json::object();
-                std::vector<uint8_t> expected = {0xa0};
-                const auto result = json::to_cbor(j);
-                CHECK(result == expected);
-
-                // roundtrip
-                CHECK(json::from_cbor(result) == j);
-                CHECK(json::from_cbor(result, true, false) == j);
-            }
-
-            SECTION("{\"\":null}")
-            {
-                json j = {{"", nullptr}};
-                std::vector<uint8_t> expected = {0xa1, 0x60, 0xf6};
-                const auto result = json::to_cbor(j);
-                CHECK(result == expected);
-
-                // roundtrip
-                CHECK(json::from_cbor(result) == j);
-                CHECK(json::from_cbor(result, true, false) == j);
-            }
-
-            SECTION("{\"a\": {\"b\": {\"c\": {}}}}")
-            {
-                json j = json::parse("{\"a\": {\"b\": {\"c\": {}}}}");
-                std::vector<uint8_t> expected =
-                {
-                    0xa1, 0x61, 0x61, 0xa1, 0x61, 0x62, 0xa1, 0x61, 0x63, 0xa0
-                };
-                const auto result = json::to_cbor(j);
-                CHECK(result == expected);
-
-                // roundtrip
-                CHECK(json::from_cbor(result) == j);
-                CHECK(json::from_cbor(result, true, false) == j);
-            }
-
-            SECTION("object with uint8_t elements")
-            {
-                json j;
-                for (auto i = 0; i < 255; ++i)
-                {
-                    // format i to a fixed width of 5
-                    // each entry will need 7 bytes: 6 for string, 1 for null
-                    std::stringstream ss;
-                    ss << std::setw(5) << std::setfill('0') << i;
-                    j.emplace(ss.str(), nullptr);
-                }
-
-                const auto result = json::to_cbor(j);
-
-                // Checking against an expected vector byte by byte is
-                // difficult, because no assumption on the order of key/value
-                // pairs are made. We therefore only check the prefix (type and
-                // size and the overall size. The rest is then handled in the
-                // roundtrip check.
-                CHECK(result.size() == 1787); // 1 type, 1 size, 255*7 content
-                CHECK(result[0] == 0xb8); // map 8 bit
-                CHECK(result[1] == 0xff); // size byte (0xff)
-                // roundtrip
-                CHECK(json::from_cbor(result) == j);
-                CHECK(json::from_cbor(result, true, false) == j);
-            }
-
-            SECTION("object with uint16_t elements")
-            {
-                json j;
-                for (auto i = 0; i < 256; ++i)
-                {
-                    // format i to a fixed width of 5
-                    // each entry will need 7 bytes: 6 for string, 1 for null
-                    std::stringstream ss;
-                    ss << std::setw(5) << std::setfill('0') << i;
-                    j.emplace(ss.str(), nullptr);
-                }
-
-                const auto result = json::to_cbor(j);
-
-                // Checking against an expected vector byte by byte is
-                // difficult, because no assumption on the order of key/value
-                // pairs are made. We therefore only check the prefix (type and
-                // size and the overall size. The rest is then handled in the
-                // roundtrip check.
-                CHECK(result.size() == 1795); // 1 type, 2 size, 256*7 content
-                CHECK(result[0] == 0xb9); // map 16 bit
-                CHECK(result[1] == 0x01); // byte 0 of size (0x0100)
-                CHECK(result[2] == 0x00); // byte 1 of size (0x0100)
-
-                // roundtrip
-                CHECK(json::from_cbor(result) == j);
-                CHECK(json::from_cbor(result, true, false) == j);
-            }
-
-            SECTION("object with uint32_t elements")
-            {
-                json j;
-                for (auto i = 0; i < 65536; ++i)
-                {
-                    // format i to a fixed width of 5
-                    // each entry will need 7 bytes: 6 for string, 1 for null
-                    std::stringstream ss;
-                    ss << std::setw(5) << std::setfill('0') << i;
-                    j.emplace(ss.str(), nullptr);
-                }
-
-                const auto result = json::to_cbor(j);
-
-                // Checking against an expected vector byte by byte is
-                // difficult, because no assumption on the order of key/value
-                // pairs are made. We therefore only check the prefix (type and
-                // size and the overall size. The rest is then handled in the
-                // roundtrip check.
-                CHECK(result.size() == 458757); // 1 type, 4 size, 65536*7 content
-                CHECK(result[0] == 0xba); // map 32 bit
-                CHECK(result[1] == 0x00); // byte 0 of size (0x00010000)
-                CHECK(result[2] == 0x01); // byte 1 of size (0x00010000)
-                CHECK(result[3] == 0x00); // byte 2 of size (0x00010000)
-                CHECK(result[4] == 0x00); // byte 3 of size (0x00010000)
-
-                // roundtrip
-                CHECK(json::from_cbor(result) == j);
-                CHECK(json::from_cbor(result, true, false) == j);
-            }
-        }
-
-        SECTION("binary")
-        {
-            SECTION("N = 0..23")
-            {
-                for (size_t N = 0; N <= 0x17; ++N)
-                {
-                    CAPTURE(N)
-
-                    // create JSON value with byte array containing of N * 'x'
-                    const auto s = std::vector<uint8_t>(N, 'x');
-                    json j = json::binary(s);
-
-                    // create expected byte vector
-                    std::vector<uint8_t> expected;
-                    expected.push_back(static_cast<uint8_t>(0x40 + N));
-                    for (size_t i = 0; i < N; ++i)
-                    {
-                        expected.push_back(0x78);
-                    }
-
-                    // compare result + size
-                    const auto result = json::to_cbor(j);
-                    CHECK(result == expected);
-                    CHECK(result.size() == N + 1);
-                    // check that no null byte is appended
-                    if (N > 0)
-                    {
-                        CHECK(result.back() != '\x00');
-                    }
-
-                    // roundtrip
-                    CHECK(json::from_cbor(result) == j);
-                    CHECK(json::from_cbor(result, true, false) == j);
-                }
-            }
-
-            SECTION("N = 24..255")
-            {
-                for (size_t N = 24; N <= 255; ++N)
-                {
-                    CAPTURE(N)
-
-                    // create JSON value with string containing of N * 'x'
-                    const auto s = std::vector<uint8_t>(N, 'x');
-                    json j = json::binary(s);
-
-                    // create expected byte vector
-                    std::vector<uint8_t> expected;
-                    expected.push_back(0x58);
-                    expected.push_back(static_cast<uint8_t>(N));
-                    for (size_t i = 0; i < N; ++i)
-                    {
-                        expected.push_back('x');
-                    }
-
-                    // compare result + size
-                    const auto result = json::to_cbor(j);
-                    CHECK(result == expected);
-                    CHECK(result.size() == N + 2);
-                    // check that no null byte is appended
-                    CHECK(result.back() != '\x00');
-
-                    // roundtrip
-                    CHECK(json::from_cbor(result) == j);
-                    CHECK(json::from_cbor(result, true, false) == j);
-                }
-            }
-
-            SECTION("N = 256..65535")
-            {
-                for (size_t N :
-                        {
-                            256u, 999u, 1025u, 3333u, 2048u, 65535u
-                        })
-                {
-                    CAPTURE(N)
-
-                    // create JSON value with string containing of N * 'x'
-                    const auto s = std::vector<uint8_t>(N, 'x');
-                    json j = json::binary(s);
-
-                    // create expected byte vector (hack: create string first)
-                    std::vector<uint8_t> expected(N, 'x');
-                    // reverse order of commands, because we insert at begin()
-                    expected.insert(expected.begin(), static_cast<uint8_t>(N & 0xff));
-                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 8) & 0xff));
-                    expected.insert(expected.begin(), 0x59);
-
-                    // compare result + size
-                    const auto result = json::to_cbor(j);
-                    CHECK(result == expected);
-                    CHECK(result.size() == N + 3);
-                    // check that no null byte is appended
-                    CHECK(result.back() != '\x00');
-
-                    // roundtrip
-                    CHECK(json::from_cbor(result) == j);
-                    CHECK(json::from_cbor(result, true, false) == j);
-                }
-            }
-
-            SECTION("N = 65536..4294967295")
-            {
-                for (size_t N :
-                        {
-                            65536u, 77777u, 1048576u
-                        })
-                {
-                    CAPTURE(N)
-
-                    // create JSON value with string containing of N * 'x'
-                    const auto s = std::vector<uint8_t>(N, 'x');
-                    json j = json::binary(s);
-
-                    // create expected byte vector (hack: create string first)
-                    std::vector<uint8_t> expected(N, 'x');
-                    // reverse order of commands, because we insert at begin()
-                    expected.insert(expected.begin(), static_cast<uint8_t>(N & 0xff));
-                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 8) & 0xff));
-                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 16) & 0xff));
-                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 24) & 0xff));
-                    expected.insert(expected.begin(), 0x5a);
-
-                    // compare result + size
-                    const auto result = json::to_cbor(j);
-                    CHECK(result == expected);
-                    CHECK(result.size() == N + 5);
-                    // check that no null byte is appended
-                    CHECK(result.back() != '\x00');
-
-                    // roundtrip
-                    CHECK(json::from_cbor(result) == j);
-                    CHECK(json::from_cbor(result, true, false) == j);
-                }
-            }
-
-            SECTION("indefinite size")
-            {
-                std::vector<std::uint8_t> input = {0x5F, 0x44, 0xaa, 0xbb, 0xcc, 0xdd, 0x43, 0xee, 0xff, 0x99, 0xFF};
-                auto j = json::from_cbor(input);
-                CHECK(j.is_binary());
-                auto k = json::binary({0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff, 0x99});
-                CAPTURE(j.dump(0, ' ', false, json::error_handler_t::strict))
-                CHECK(j == k);
-            }
-
-            SECTION("binary in array")
-            {
-                // array with three empty byte strings
-                std::vector<std::uint8_t> input = {0x83, 0x40, 0x40, 0x40};
-                json _;
-                CHECK_NOTHROW(_ = json::from_cbor(input));
-            }
-
-            SECTION("binary in object")
-            {
-                // object mapping "foo" to empty byte string
-                std::vector<std::uint8_t> input = {0xA1, 0x63, 0x66, 0x6F, 0x6F, 0x40};
-                json _;
-                CHECK_NOTHROW(_ = json::from_cbor(input));
-            }
-
-            SECTION("SAX callback with binary")
-            {
-                // object mapping "foo" to byte string
-                std::vector<std::uint8_t> input = {0xA1, 0x63, 0x66, 0x6F, 0x6F, 0x41, 0x00};
-
-                // callback to set binary_seen to true if a binary value was seen
-                bool binary_seen = false;
-                auto callback = [&binary_seen](int /*depth*/, json::parse_event_t /*event*/, json & parsed)
-                {
-                    if (parsed.is_binary())
-                    {
-                        binary_seen = true;
-                    }
-                    return true;
-                };
-
-                json j;
-                auto cbp = nlohmann::detail::json_sax_dom_callback_parser<json>(j, callback, true);
-                CHECK(json::sax_parse(input, &cbp, json::input_format_t::cbor));
-                CHECK(j.at("foo").is_binary());
-                CHECK(binary_seen);
-            }
-        }
-    }
-
-    SECTION("additional deserialization")
-    {
-        SECTION("0x5b (byte array)")
-        {
-            std::vector<uint8_t> given = {0x5b, 0x00, 0x00, 0x00, 0x00,
-                                          0x00, 0x00, 0x00, 0x01, 0x61
-                                         };
-            json j = json::from_cbor(given);
-            CHECK(j == json::binary(std::vector<uint8_t> {'a'}));
-        }
-
-        SECTION("0x7b (string)")
-        {
-            std::vector<uint8_t> given = {0x7b, 0x00, 0x00, 0x00, 0x00,
-                                          0x00, 0x00, 0x00, 0x01, 0x61
-                                         };
-            json j = json::from_cbor(given);
-            CHECK(j == "a");
-        }
-
-        SECTION("0x9b (array)")
-        {
-            std::vector<uint8_t> given = {0x9b, 0x00, 0x00, 0x00, 0x00,
-                                          0x00, 0x00, 0x00, 0x01, 0xf4
-                                         };
-            json j = json::from_cbor(given);
-            CHECK(j == json::parse("[false]"));
-        }
-
-        SECTION("0xbb (map)")
-        {
-            std::vector<uint8_t> given = {0xbb, 0x00, 0x00, 0x00, 0x00,
-                                          0x00, 0x00, 0x00, 0x01, 0x60, 0xf4
-                                         };
-            json j = json::from_cbor(given);
-            CHECK(j == json::parse("{\"\": false}"));
-        }
-    }
-
-    SECTION("errors")
-    {
-        SECTION("empty byte vector")
-        {
-            json _;
-            CHECK_THROWS_AS(_ = json::from_cbor(std::vector<uint8_t>()), json::parse_error&);
-            CHECK_THROWS_WITH(_ = json::from_cbor(std::vector<uint8_t>()),
-                              "[json.exception.parse_error.110] parse error at byte 1: syntax error while parsing CBOR value: unexpected end of input");
-            CHECK(json::from_cbor(std::vector<uint8_t>(), true, false).is_discarded());
-        }
-
-        SECTION("too short byte vector")
-        {
-            json _;
-            CHECK_THROWS_AS(_ = json::from_cbor(std::vector<uint8_t>({0x18})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_cbor(std::vector<uint8_t>({0x19})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_cbor(std::vector<uint8_t>({0x19, 0x00})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_cbor(std::vector<uint8_t>({0x1a})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_cbor(std::vector<uint8_t>({0x1a, 0x00})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_cbor(std::vector<uint8_t>({0x1a, 0x00, 0x00})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_cbor(std::vector<uint8_t>({0x1a, 0x00, 0x00, 0x00})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_cbor(std::vector<uint8_t>({0x1b})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_cbor(std::vector<uint8_t>({0x1b, 0x00})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_cbor(std::vector<uint8_t>({0x1b, 0x00, 0x00})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_cbor(std::vector<uint8_t>({0x1b, 0x00, 0x00, 0x00})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_cbor(std::vector<uint8_t>({0x1b, 0x00, 0x00, 0x00, 0x00})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_cbor(std::vector<uint8_t>({0x1b, 0x00, 0x00, 0x00, 0x00, 0x00})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_cbor(std::vector<uint8_t>({0x1b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_cbor(std::vector<uint8_t>({0x1b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_cbor(std::vector<uint8_t>({0x62})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_cbor(std::vector<uint8_t>({0x62, 0x60})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_cbor(std::vector<uint8_t>({0x7F})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_cbor(std::vector<uint8_t>({0x7F, 0x60})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_cbor(std::vector<uint8_t>({0x82, 0x01})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_cbor(std::vector<uint8_t>({0x9F, 0x01})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_cbor(std::vector<uint8_t>({0xBF, 0x61, 0x61, 0xF5})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_cbor(std::vector<uint8_t>({0xA1, 0x61, 0X61})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_cbor(std::vector<uint8_t>({0xBF, 0x61, 0X61})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_cbor(std::vector<uint8_t>({0x5F})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_cbor(std::vector<uint8_t>({0x5F, 0x00})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_cbor(std::vector<uint8_t>({0x41})), json::parse_error&);
-
-            CHECK_THROWS_WITH(_ = json::from_cbor(std::vector<uint8_t>({0x18})),
-                              "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing CBOR number: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_cbor(std::vector<uint8_t>({0x19})),
-                              "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing CBOR number: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_cbor(std::vector<uint8_t>({0x19, 0x00})),
-                              "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing CBOR number: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_cbor(std::vector<uint8_t>({0x1a})),
-                              "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing CBOR number: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_cbor(std::vector<uint8_t>({0x1a, 0x00})),
-                              "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing CBOR number: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_cbor(std::vector<uint8_t>({0x1a, 0x00, 0x00})),
-                              "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing CBOR number: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_cbor(std::vector<uint8_t>({0x1a, 0x00, 0x00, 0x00})),
-                              "[json.exception.parse_error.110] parse error at byte 5: syntax error while parsing CBOR number: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_cbor(std::vector<uint8_t>({0x1b})),
-                              "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing CBOR number: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_cbor(std::vector<uint8_t>({0x1b, 0x00})),
-                              "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing CBOR number: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_cbor(std::vector<uint8_t>({0x1b, 0x00, 0x00})),
-                              "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing CBOR number: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_cbor(std::vector<uint8_t>({0x1b, 0x00, 0x00, 0x00})),
-                              "[json.exception.parse_error.110] parse error at byte 5: syntax error while parsing CBOR number: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_cbor(std::vector<uint8_t>({0x1b, 0x00, 0x00, 0x00, 0x00})),
-                              "[json.exception.parse_error.110] parse error at byte 6: syntax error while parsing CBOR number: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_cbor(std::vector<uint8_t>({0x1b, 0x00, 0x00, 0x00, 0x00, 0x00})),
-                              "[json.exception.parse_error.110] parse error at byte 7: syntax error while parsing CBOR number: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_cbor(std::vector<uint8_t>({0x1b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00})),
-                              "[json.exception.parse_error.110] parse error at byte 8: syntax error while parsing CBOR number: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_cbor(std::vector<uint8_t>({0x1b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00})),
-                              "[json.exception.parse_error.110] parse error at byte 9: syntax error while parsing CBOR number: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_cbor(std::vector<uint8_t>({0x62})),
-                              "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing CBOR string: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_cbor(std::vector<uint8_t>({0x62, 0x60})),
-                              "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing CBOR string: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_cbor(std::vector<uint8_t>({0x7F})),
-                              "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing CBOR string: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_cbor(std::vector<uint8_t>({0x7F, 0x60})),
-                              "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing CBOR string: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_cbor(std::vector<uint8_t>({0x82, 0x01})),
-                              "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing CBOR value: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_cbor(std::vector<uint8_t>({0x9F, 0x01})),
-                              "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing CBOR value: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_cbor(std::vector<uint8_t>({0xBF, 0x61, 0x61, 0xF5})),
-                              "[json.exception.parse_error.110] parse error at byte 5: syntax error while parsing CBOR string: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_cbor(std::vector<uint8_t>({0xA1, 0x61, 0x61})),
-                              "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing CBOR value: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_cbor(std::vector<uint8_t>({0xBF, 0x61, 0x61})),
-                              "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing CBOR value: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_cbor(std::vector<uint8_t>({0x5F})),
-                              "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing CBOR binary: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_cbor(std::vector<uint8_t>({0x5F, 0x00})),
-                              "[json.exception.parse_error.113] parse error at byte 2: syntax error while parsing CBOR binary: expected length specification (0x40-0x5B) or indefinite binary array type (0x5F); last byte: 0x00");
-            CHECK_THROWS_WITH(_ = json::from_cbor(std::vector<uint8_t>({0x41})),
-                              "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing CBOR binary: unexpected end of input");
-
-            CHECK(json::from_cbor(std::vector<uint8_t>({0x18}), true, false).is_discarded());
-            CHECK(json::from_cbor(std::vector<uint8_t>({0x19}), true, false).is_discarded());
-            CHECK(json::from_cbor(std::vector<uint8_t>({0x19, 0x00}), true, false).is_discarded());
-            CHECK(json::from_cbor(std::vector<uint8_t>({0x1a}), true, false).is_discarded());
-            CHECK(json::from_cbor(std::vector<uint8_t>({0x1a, 0x00}), true, false).is_discarded());
-            CHECK(json::from_cbor(std::vector<uint8_t>({0x1a, 0x00, 0x00}), true, false).is_discarded());
-            CHECK(json::from_cbor(std::vector<uint8_t>({0x1a, 0x00, 0x00, 0x00}), true, false).is_discarded());
-            CHECK(json::from_cbor(std::vector<uint8_t>({0x1b}), true, false).is_discarded());
-            CHECK(json::from_cbor(std::vector<uint8_t>({0x1b, 0x00}), true, false).is_discarded());
-            CHECK(json::from_cbor(std::vector<uint8_t>({0x1b, 0x00, 0x00}), true, false).is_discarded());
-            CHECK(json::from_cbor(std::vector<uint8_t>({0x1b, 0x00, 0x00, 0x00}), true, false).is_discarded());
-            CHECK(json::from_cbor(std::vector<uint8_t>({0x1b, 0x00, 0x00, 0x00, 0x00}), true, false).is_discarded());
-            CHECK(json::from_cbor(std::vector<uint8_t>({0x1b, 0x00, 0x00, 0x00, 0x00, 0x00}), true, false).is_discarded());
-            CHECK(json::from_cbor(std::vector<uint8_t>({0x1b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}), true, false).is_discarded());
-            CHECK(json::from_cbor(std::vector<uint8_t>({0x1b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}), true, false).is_discarded());
-            CHECK(json::from_cbor(std::vector<uint8_t>({0x62}), true, false).is_discarded());
-            CHECK(json::from_cbor(std::vector<uint8_t>({0x62, 0x60}), true, false).is_discarded());
-            CHECK(json::from_cbor(std::vector<uint8_t>({0x7F}), true, false).is_discarded());
-            CHECK(json::from_cbor(std::vector<uint8_t>({0x7F, 0x60}), true, false).is_discarded());
-            CHECK(json::from_cbor(std::vector<uint8_t>({0x82, 0x01}), true, false).is_discarded());
-            CHECK(json::from_cbor(std::vector<uint8_t>({0x9F, 0x01}), true, false).is_discarded());
-            CHECK(json::from_cbor(std::vector<uint8_t>({0xBF, 0x61, 0x61, 0xF5}), true, false).is_discarded());
-            CHECK(json::from_cbor(std::vector<uint8_t>({0xA1, 0x61, 0x61}), true, false).is_discarded());
-            CHECK(json::from_cbor(std::vector<uint8_t>({0xBF, 0x61, 0x61}), true, false).is_discarded());
-            CHECK(json::from_cbor(std::vector<uint8_t>({0x5F}), true, false).is_discarded());
-            CHECK(json::from_cbor(std::vector<uint8_t>({0x5F, 0x00}), true, false).is_discarded());
-            CHECK(json::from_cbor(std::vector<uint8_t>({0x41}), true, false).is_discarded());
-        }
-
-        SECTION("unsupported bytes")
-        {
-            SECTION("concrete examples")
-            {
-                json _;
-                CHECK_THROWS_AS(_ = json::from_cbor(std::vector<uint8_t>({0x1c})), json::parse_error&);
-                CHECK_THROWS_WITH(_ = json::from_cbor(std::vector<uint8_t>({0x1c})),
-                                  "[json.exception.parse_error.112] parse error at byte 1: syntax error while parsing CBOR value: invalid byte: 0x1C");
-                CHECK(json::from_cbor(std::vector<uint8_t>({0x1c}), true, false).is_discarded());
-
-                CHECK_THROWS_AS(_ = json::from_cbor(std::vector<uint8_t>({0xf8})), json::parse_error&);
-                CHECK_THROWS_WITH(_ = json::from_cbor(std::vector<uint8_t>({0xf8})),
-                                  "[json.exception.parse_error.112] parse error at byte 1: syntax error while parsing CBOR value: invalid byte: 0xF8");
-                CHECK(json::from_cbor(std::vector<uint8_t>({0xf8}), true, false).is_discarded());
-            }
-
-            SECTION("all unsupported bytes")
-            {
-                for (auto byte :
-                        {
-                            // ?
-                            0x1c, 0x1d, 0x1e, 0x1f,
-                            // ?
-                            0x3c, 0x3d, 0x3e, 0x3f,
-                            // ?
-                            0x5c, 0x5d, 0x5e,
-                            // ?
-                            0x7c, 0x7d, 0x7e,
-                            // ?
-                            0x9c, 0x9d, 0x9e,
-                            // ?
-                            0xbc, 0xbd, 0xbe,
-                            // date/time
-                            0xc0, 0xc1,
-                            // bignum
-                            0xc2, 0xc3,
-                            // fraction
-                            0xc4,
-                            // bigfloat
-                            0xc5,
-                            // tagged item
-                            0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,
-                            // expected conversion
-                            0xd5, 0xd6, 0xd7,
-                            // more tagged items
-                            0xd8, 0xd9, 0xda, 0xdb,
-                            // ?
-                            0xdc, 0xdd, 0xde, 0xdf,
-                            // (simple value)
-                            0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xf0, 0xf1, 0xf2, 0xf3,
-                            // undefined
-                            0xf7,
-                            // simple value
-                            0xf8
-                        })
-                {
-                    json _;
-                    CHECK_THROWS_AS(_ = json::from_cbor(std::vector<uint8_t>({static_cast<uint8_t>(byte)})), json::parse_error&);
-                    CHECK(json::from_cbor(std::vector<uint8_t>({static_cast<uint8_t>(byte)}), true, false).is_discarded());
-                }
-            }
-        }
-
-        SECTION("invalid string in map")
-        {
-            json _;
-            CHECK_THROWS_AS(_ = json::from_cbor(std::vector<uint8_t>({0xa1, 0xff, 0x01})), json::parse_error&);
-            CHECK_THROWS_WITH(_ = json::from_cbor(std::vector<uint8_t>({0xa1, 0xff, 0x01})),
-                              "[json.exception.parse_error.113] parse error at byte 2: syntax error while parsing CBOR string: expected length specification (0x60-0x7B) or indefinite string type (0x7F); last byte: 0xFF");
-            CHECK(json::from_cbor(std::vector<uint8_t>({0xa1, 0xff, 0x01}), true, false).is_discarded());
-        }
-
-        SECTION("strict mode")
-        {
-            std::vector<uint8_t> vec = {0xf6, 0xf6};
-            SECTION("non-strict mode")
-            {
-                const auto result = json::from_cbor(vec, false);
-                CHECK(result == json());
-                CHECK(!json::from_cbor(vec, false, false).is_discarded());
-            }
-
-            SECTION("strict mode")
-            {
-                json _;
-                CHECK_THROWS_AS(_ = json::from_cbor(vec), json::parse_error&);
-                CHECK_THROWS_WITH(_ = json::from_cbor(vec),
-                                  "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing CBOR value: expected end of input; last byte: 0xF6");
-                CHECK(json::from_cbor(vec, true, false).is_discarded());
-            }
-        }
-    }
-
-    SECTION("SAX aborts")
-    {
-        SECTION("start_array(len)")
-        {
-            std::vector<uint8_t> v = {0x83, 0x01, 0x02, 0x03};
-            SaxCountdown scp(0);
-            CHECK(!json::sax_parse(v, &scp, json::input_format_t::cbor));
-        }
-
-        SECTION("start_object(len)")
-        {
-            std::vector<uint8_t> v = {0xA1, 0x63, 0x66, 0x6F, 0x6F, 0xF4};
-            SaxCountdown scp(0);
-            CHECK(!json::sax_parse(v, &scp, json::input_format_t::cbor));
-        }
-
-        SECTION("key()")
-        {
-            std::vector<uint8_t> v = {0xA1, 0x63, 0x66, 0x6F, 0x6F, 0xF4};
-            SaxCountdown scp(1);
-            CHECK(!json::sax_parse(v, &scp, json::input_format_t::cbor));
-        }
-    }
-}
-
-// use this testcase outside [hide] to run it with Valgrind
-TEST_CASE("single CBOR roundtrip")
-{
-    SECTION("sample.json")
-    {
-        std::string filename = TEST_DATA_DIRECTORY "/json_testsuite/sample.json";
-
-        // parse JSON file
-        std::ifstream f_json(filename);
-        json j1 = json::parse(f_json);
-
-        // parse CBOR file
-        auto packed = utils::read_binary_file(filename + ".cbor");
-        json j2;
-        CHECK_NOTHROW(j2 = json::from_cbor(packed));
-
-        // compare parsed JSON values
-        CHECK(j1 == j2);
-
-        SECTION("roundtrips")
-        {
-            SECTION("std::ostringstream")
-            {
-                std::basic_ostringstream<std::uint8_t> ss;
-                json::to_cbor(j1, ss);
-                json j3 = json::from_cbor(ss.str());
-                CHECK(j1 == j3);
-            }
-
-            SECTION("std::string")
-            {
-                std::string s;
-                json::to_cbor(j1, s);
-                json j3 = json::from_cbor(s);
-                CHECK(j1 == j3);
-            }
-        }
-
-        // check with different start index
-        packed.insert(packed.begin(), 5, 0xff);
-        CHECK(j1 == json::from_cbor(packed.begin() + 5, packed.end()));
-    }
-}
-
-#if !defined(JSON_NOEXCEPTION)
-TEST_CASE("CBOR regressions")
-{
-    SECTION("fuzz test results")
-    {
-        /*
-        The following test cases were found during a two-day session with
-        AFL-Fuzz. As a result, empty byte vectors and excessive lengths are
-        detected.
-        */
-        for (std::string filename :
-                {
-                    TEST_DATA_DIRECTORY "/cbor_regression/test01",
-                    TEST_DATA_DIRECTORY "/cbor_regression/test02",
-                    TEST_DATA_DIRECTORY "/cbor_regression/test03",
-                    TEST_DATA_DIRECTORY "/cbor_regression/test04",
-                    TEST_DATA_DIRECTORY "/cbor_regression/test05",
-                    TEST_DATA_DIRECTORY "/cbor_regression/test06",
-                    TEST_DATA_DIRECTORY "/cbor_regression/test07",
-                    TEST_DATA_DIRECTORY "/cbor_regression/test08",
-                    TEST_DATA_DIRECTORY "/cbor_regression/test09",
-                    TEST_DATA_DIRECTORY "/cbor_regression/test10",
-                    TEST_DATA_DIRECTORY "/cbor_regression/test11",
-                    TEST_DATA_DIRECTORY "/cbor_regression/test12",
-                    TEST_DATA_DIRECTORY "/cbor_regression/test13",
-                    TEST_DATA_DIRECTORY "/cbor_regression/test14",
-                    TEST_DATA_DIRECTORY "/cbor_regression/test15",
-                    TEST_DATA_DIRECTORY "/cbor_regression/test16",
-                    TEST_DATA_DIRECTORY "/cbor_regression/test17",
-                    TEST_DATA_DIRECTORY "/cbor_regression/test18",
-                    TEST_DATA_DIRECTORY "/cbor_regression/test19",
-                    TEST_DATA_DIRECTORY "/cbor_regression/test20",
-                    TEST_DATA_DIRECTORY "/cbor_regression/test21"
-                })
-        {
-            CAPTURE(filename)
-
-            try
-            {
-                // parse CBOR file
-                auto vec1 = utils::read_binary_file(filename);
-                json j1 = json::from_cbor(vec1);
-
-                try
-                {
-                    // step 2: round trip
-                    std::vector<uint8_t> vec2 = json::to_cbor(j1);
-
-                    // parse serialization
-                    json j2 = json::from_cbor(vec2);
-
-                    // deserializations must match
-                    CHECK(j1 == j2);
-                }
-                catch (const json::parse_error&)
-                {
-                    // parsing a CBOR serialization must not fail
-                    CHECK(false);
-                }
-            }
-            catch (const json::parse_error&)
-            {
-                // parse errors are ok, because input may be random bytes
-            }
-        }
-    }
-}
-#endif
-
-TEST_CASE("CBOR roundtrips" * doctest::skip())
-{
-    SECTION("input from flynn")
-    {
-        // most of these are excluded due to differences in key order (not a real problem)
-        auto exclude_packed = std::set<std::string>
-        {
-            TEST_DATA_DIRECTORY "/json.org/1.json",
-            TEST_DATA_DIRECTORY "/json.org/2.json",
-            TEST_DATA_DIRECTORY "/json.org/3.json",
-            TEST_DATA_DIRECTORY "/json.org/4.json",
-            TEST_DATA_DIRECTORY "/json.org/5.json",
-            TEST_DATA_DIRECTORY "/json_testsuite/sample.json", // kills AppVeyor
-            TEST_DATA_DIRECTORY "/json_tests/pass1.json",
-            TEST_DATA_DIRECTORY "/regression/working_file.json",
-            TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object.json",
-            TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_duplicated_key.json",
-            TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_long_strings.json",
-        };
-
-        for (std::string filename :
-                {
-                    TEST_DATA_DIRECTORY "/json_nlohmann_tests/all_unicode.json",
-                    TEST_DATA_DIRECTORY "/json.org/1.json",
-                    TEST_DATA_DIRECTORY "/json.org/2.json",
-                    TEST_DATA_DIRECTORY "/json.org/3.json",
-                    TEST_DATA_DIRECTORY "/json.org/4.json",
-                    TEST_DATA_DIRECTORY "/json.org/5.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip01.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip02.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip03.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip04.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip05.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip06.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip07.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip08.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip09.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip10.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip11.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip12.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip13.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip14.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip15.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip16.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip17.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip18.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip19.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip20.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip21.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip22.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip23.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip24.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip25.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip26.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip27.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip28.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip29.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip30.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip31.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip32.json",
-                    TEST_DATA_DIRECTORY "/json_testsuite/sample.json", // kills AppVeyor
-                    TEST_DATA_DIRECTORY "/json_tests/pass1.json",
-                    TEST_DATA_DIRECTORY "/json_tests/pass2.json",
-                    TEST_DATA_DIRECTORY "/json_tests/pass3.json",
-                    TEST_DATA_DIRECTORY "/regression/floats.json",
-                    TEST_DATA_DIRECTORY "/regression/signed_ints.json",
-                    TEST_DATA_DIRECTORY "/regression/unsigned_ints.json",
-                    TEST_DATA_DIRECTORY "/regression/working_file.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_arraysWithSpaces.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_empty-string.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_empty.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_ending_with_newline.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_false.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_heterogeneous.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_null.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_with_1_and_newline.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_with_leading_space.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_with_several_null.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_with_trailing_space.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_0e+1.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_0e1.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_after_space.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_double_close_to_zero.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_double_huge_neg_exp.json",
-                    //TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_huge_exp.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_int_with_exp.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_minus_zero.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_negative_int.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_negative_one.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_negative_zero.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_real_capital_e.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_real_capital_e_neg_exp.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_real_capital_e_pos_exp.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_real_exponent.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_real_fraction_exponent.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_real_neg_exp.json",
-                    //TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_real_neg_overflow.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_real_pos_exponent.json",
-                    //TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_real_pos_overflow.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_real_underflow.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_simple_int.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_simple_real.json",
-                    //TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_too_big_neg_int.json",
-                    //TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_too_big_pos_int.json",
-                    //TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_very_big_negative_int.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_basic.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_duplicated_key.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_duplicated_key_and_value.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_empty.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_empty_key.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_escaped_null_in_key.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_extreme_numbers.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_long_strings.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_simple.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_string_unicode.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_with_newlines.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_1_2_3_bytes_UTF-8_sequences.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_UTF-16_Surrogates_U+1D11E_MUSICAL_SYMBOL_G_CLEF.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_accepted_surrogate_pair.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_accepted_surrogate_pairs.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_allowed_escapes.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_backslash_and_u_escaped_zero.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_backslash_doublequotes.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_comments.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_double_escape_a.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_double_escape_n.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_escaped_control_character.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_escaped_noncharacter.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_in_array.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_in_array_with_leading_space.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_last_surrogates_1_and_2.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_newline_uescaped.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_nonCharacterInUTF-8_U+10FFFF.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_nonCharacterInUTF-8_U+1FFFF.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_nonCharacterInUTF-8_U+FFFF.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_null_escape.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_one-byte-utf-8.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_pi.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_simple_ascii.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_space.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_three-byte-utf-8.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_two-byte-utf-8.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_u+2028_line_sep.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_u+2029_par_sep.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_uEscape.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_unescaped_char_delete.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_unicode.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_unicodeEscapedBackslash.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_unicode_2.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_unicode_U+200B_ZERO_WIDTH_SPACE.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_unicode_U+2064_invisible_plus.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_unicode_escaped_double_quote.json",
-                    // TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_utf16.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_utf8.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_with_del_character.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_structure_lonely_false.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_structure_lonely_int.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_structure_lonely_negative_real.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_structure_lonely_null.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_structure_lonely_string.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_structure_lonely_true.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_structure_string_empty.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_structure_trailing_newline.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_structure_true_in_array.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_structure_whitespace_array.json"
-                })
-        {
-            CAPTURE(filename)
-
-            {
-                INFO_WITH_TEMP(filename + ": std::vector<uint8_t>");
-                // parse JSON file
-                std::ifstream f_json(filename);
-                json j1 = json::parse(f_json);
-
-                // parse CBOR file
-                auto packed = utils::read_binary_file(filename + ".cbor");
-                json j2;
-                CHECK_NOTHROW(j2 = json::from_cbor(packed));
-
-                // compare parsed JSON values
-                CHECK(j1 == j2);
-            }
-
-            {
-                INFO_WITH_TEMP(filename + ": std::ifstream");
-                // parse JSON file
-                std::ifstream f_json(filename);
-                json j1 = json::parse(f_json);
-
-                // parse CBOR file
-                std::ifstream f_cbor(filename + ".cbor", std::ios::binary);
-                json j2;
-                CHECK_NOTHROW(j2 = json::from_cbor(f_cbor));
-
-                // compare parsed JSON values
-                CHECK(j1 == j2);
-            }
-
-            {
-                INFO_WITH_TEMP(filename + ": uint8_t* and size");
-                // parse JSON file
-                std::ifstream f_json(filename);
-                json j1 = json::parse(f_json);
-
-                // parse CBOR file
-                auto packed = utils::read_binary_file(filename + ".cbor");
-                json j2;
-                CHECK_NOTHROW(j2 = json::from_cbor({packed.data(), packed.size()}));
-
-                // compare parsed JSON values
-                CHECK(j1 == j2);
-            }
-
-            {
-                INFO_WITH_TEMP(filename + ": output to output adapters");
-                // parse JSON file
-                std::ifstream f_json(filename);
-                json j1 = json::parse(f_json);
-
-                // parse CBOR file
-                auto packed = utils::read_binary_file(filename + ".cbor");
-
-                if (!exclude_packed.count(filename))
-                {
-                    {
-                        INFO_WITH_TEMP(filename + ": output adapters: std::vector<uint8_t>");
-                        std::vector<uint8_t> vec;
-                        json::to_cbor(j1, vec);
-                        CHECK(vec == packed);
-                    }
-                }
-            }
-        }
-    }
-}
-
-#if !defined(JSON_NOEXCEPTION)
-TEST_CASE("all CBOR first bytes")
-{
-    // these bytes will fail immediately with exception parse_error.112
-    std::set<uint8_t> unsupported =
-    {
-        //// types not supported by this library
-
-        // date/time
-        0xc0, 0xc1,
-        // bignum
-        0xc2, 0xc3,
-        // decimal fracion
-        0xc4,
-        // bigfloat
-        0xc5,
-        // tagged item
-        0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd,
-        0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd8,
-        0xd9, 0xda, 0xdb,
-        // expected conversion
-        0xd5, 0xd6, 0xd7,
-        // simple value
-        0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7,
-        0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xef, 0xf0,
-        0xf1, 0xf2, 0xf3,
-        0xf8,
-        // undefined
-        0xf7,
-
-        //// bytes not specified by CBOR
-
-        0x1c, 0x1d, 0x1e, 0x1f,
-        0x3c, 0x3d, 0x3e, 0x3f,
-        0x5c, 0x5d, 0x5e,
-        0x7c, 0x7d, 0x7e,
-        0x9c, 0x9d, 0x9e,
-        0xbc, 0xbd, 0xbe,
-        0xdc, 0xdd, 0xde, 0xdf,
-        0xee,
-        0xfc, 0xfe, 0xfd,
-
-        /// break cannot be the first byte
-
-        0xff
-    };
-
-    for (auto i = 0; i < 256; ++i)
-    {
-        const auto byte = static_cast<uint8_t>(i);
-
-        try
-        {
-            auto res = json::from_cbor(std::vector<uint8_t>(1, byte));
-        }
-        catch (const json::parse_error& e)
-        {
-            // check that parse_error.112 is only thrown if the
-            // first byte is in the unsupported set
-            INFO_WITH_TEMP(e.what());
-            if (std::find(unsupported.begin(), unsupported.end(), byte) != unsupported.end())
-            {
-                CHECK(e.id == 112);
-            }
-            else
-            {
-                CHECK(e.id != 112);
-            }
-        }
-    }
-}
-#endif
-
-TEST_CASE("examples from RFC 7049 Appendix A")
-{
-    SECTION("numbers")
-    {
-        CHECK(json::to_cbor(json::parse("0")) == std::vector<uint8_t>({0x00}));
-        CHECK(json::parse("0") == json::from_cbor(std::vector<uint8_t>({0x00})));
-
-        CHECK(json::to_cbor(json::parse("1")) == std::vector<uint8_t>({0x01}));
-        CHECK(json::parse("1") == json::from_cbor(std::vector<uint8_t>({0x01})));
-
-        CHECK(json::to_cbor(json::parse("10")) == std::vector<uint8_t>({0x0a}));
-        CHECK(json::parse("10") == json::from_cbor(std::vector<uint8_t>({0x0a})));
-
-        CHECK(json::to_cbor(json::parse("23")) == std::vector<uint8_t>({0x17}));
-        CHECK(json::parse("23") == json::from_cbor(std::vector<uint8_t>({0x17})));
-
-        CHECK(json::to_cbor(json::parse("24")) == std::vector<uint8_t>({0x18, 0x18}));
-        CHECK(json::parse("24") == json::from_cbor(std::vector<uint8_t>({0x18, 0x18})));
-
-        CHECK(json::to_cbor(json::parse("25")) == std::vector<uint8_t>({0x18, 0x19}));
-        CHECK(json::parse("25") == json::from_cbor(std::vector<uint8_t>({0x18, 0x19})));
-
-        CHECK(json::to_cbor(json::parse("100")) == std::vector<uint8_t>({0x18, 0x64}));
-        CHECK(json::parse("100") == json::from_cbor(std::vector<uint8_t>({0x18, 0x64})));
-
-        CHECK(json::to_cbor(json::parse("1000")) == std::vector<uint8_t>({0x19, 0x03, 0xe8}));
-        CHECK(json::parse("1000") == json::from_cbor(std::vector<uint8_t>({0x19, 0x03, 0xe8})));
-
-        CHECK(json::to_cbor(json::parse("1000000")) == std::vector<uint8_t>({0x1a, 0x00, 0x0f, 0x42, 0x40}));
-        CHECK(json::parse("1000000") == json::from_cbor(std::vector<uint8_t>({0x1a, 0x00, 0x0f, 0x42, 0x40})));
-
-        CHECK(json::to_cbor(json::parse("1000000000000")) == std::vector<uint8_t>({0x1b, 0x00, 0x00, 0x00, 0xe8, 0xd4, 0xa5, 0x10, 0x00}));
-        CHECK(json::parse("1000000000000") == json::from_cbor(std::vector<uint8_t>({0x1b, 0x00, 0x00, 0x00, 0xe8, 0xd4, 0xa5, 0x10, 0x00})));
-
-        CHECK(json::to_cbor(json::parse("18446744073709551615")) == std::vector<uint8_t>({0x1b, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}));
-        CHECK(json::parse("18446744073709551615") == json::from_cbor(std::vector<uint8_t>({0x1b, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff})));
-
-        // positive bignum is not supported
-        //CHECK(json::to_cbor(json::parse("18446744073709551616")) == std::vector<uint8_t>({0xc2, 0x49, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}));
-        //CHECK(json::parse("18446744073709551616") == json::from_cbor(std::vector<uint8_t>({0xc2, 0x49, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00})));
-
-        //CHECK(json::to_cbor(json::parse("-18446744073709551616")) == std::vector<uint8_t>({0x3b, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}));
-        //CHECK(json::parse("-18446744073709551616") == json::from_cbor(std::vector<uint8_t>({0x3b, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff})));
-
-        // negative bignum is not supported
-        //CHECK(json::to_cbor(json::parse("-18446744073709551617")) == std::vector<uint8_t>({0xc3, 0x49, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}));
-        //CHECK(json::parse("-18446744073709551617") == json::from_cbor(std::vector<uint8_t>({0xc3, 0x49, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00})));
-
-        CHECK(json::to_cbor(json::parse("-1")) == std::vector<uint8_t>({0x20}));
-        CHECK(json::parse("-1") == json::from_cbor(std::vector<uint8_t>({0x20})));
-
-        CHECK(json::to_cbor(json::parse("-10")) == std::vector<uint8_t>({0x29}));
-        CHECK(json::parse("-10") == json::from_cbor(std::vector<uint8_t>({0x29})));
-
-        CHECK(json::to_cbor(json::parse("-100")) == std::vector<uint8_t>({0x38, 0x63}));
-        CHECK(json::parse("-100") == json::from_cbor(std::vector<uint8_t>({0x38, 0x63})));
-
-        CHECK(json::to_cbor(json::parse("-1000")) == std::vector<uint8_t>({0x39, 0x03, 0xe7}));
-        CHECK(json::parse("-1000") == json::from_cbor(std::vector<uint8_t>({0x39, 0x03, 0xe7})));
-
-        // half-precision float
-        //CHECK(json::to_cbor(json::parse("0.0")) == std::vector<uint8_t>({0xf9, 0x00, 0x00}));
-        CHECK(json::parse("0.0") == json::from_cbor(std::vector<uint8_t>({0xf9, 0x00, 0x00})));
-
-        // half-precision float
-        //CHECK(json::to_cbor(json::parse("-0.0")) == std::vector<uint8_t>({0xf9, 0x80, 0x00}));
-        CHECK(json::parse("-0.0") == json::from_cbor(std::vector<uint8_t>({0xf9, 0x80, 0x00})));
-
-        // half-precision float
-        //CHECK(json::to_cbor(json::parse("1.0")) == std::vector<uint8_t>({0xf9, 0x3c, 0x00}));
-        CHECK(json::parse("1.0") == json::from_cbor(std::vector<uint8_t>({0xf9, 0x3c, 0x00})));
-
-        CHECK(json::to_cbor(json::parse("1.1")) == std::vector<uint8_t>({0xfb, 0x3f, 0xf1, 0x99, 0x99, 0x99, 0x99, 0x99, 0x9a}));
-        CHECK(json::parse("1.1") == json::from_cbor(std::vector<uint8_t>({0xfb, 0x3f, 0xf1, 0x99, 0x99, 0x99, 0x99, 0x99, 0x9a})));
-
-        // half-precision float
-        //CHECK(json::to_cbor(json::parse("1.5")) == std::vector<uint8_t>({0xf9, 0x3e, 0x00}));
-        CHECK(json::parse("1.5") == json::from_cbor(std::vector<uint8_t>({0xf9, 0x3e, 0x00})));
-
-        // half-precision float
-        //CHECK(json::to_cbor(json::parse("65504.0")) == std::vector<uint8_t>({0xf9, 0x7b, 0xff}));
-        CHECK(json::parse("65504.0") == json::from_cbor(std::vector<uint8_t>({0xf9, 0x7b, 0xff})));
-
-        //CHECK(json::to_cbor(json::parse("100000.0")) == std::vector<uint8_t>({0xfa, 0x47, 0xc3, 0x50, 0x00}));
-        CHECK(json::parse("100000.0") == json::from_cbor(std::vector<uint8_t>({0xfa, 0x47, 0xc3, 0x50, 0x00})));
-
-        //CHECK(json::to_cbor(json::parse("3.4028234663852886e+38")) == std::vector<uint8_t>({0xfa, 0x7f, 0x7f, 0xff, 0xff}));
-        CHECK(json::parse("3.4028234663852886e+38") == json::from_cbor(std::vector<uint8_t>({0xfa, 0x7f, 0x7f, 0xff, 0xff})));
-
-        CHECK(json::to_cbor(json::parse("1.0e+300")) == std::vector<uint8_t>({0xfb, 0x7e, 0x37, 0xe4, 0x3c, 0x88, 0x00, 0x75, 0x9c}));
-        CHECK(json::parse("1.0e+300") == json::from_cbor(std::vector<uint8_t>({0xfb, 0x7e, 0x37, 0xe4, 0x3c, 0x88, 0x00, 0x75, 0x9c})));
-
-        // half-precision float
-        //CHECK(json::to_cbor(json::parse("5.960464477539063e-8")) == std::vector<uint8_t>({0xf9, 0x00, 0x01}));
-        CHECK(json::parse("-4.0") == json::from_cbor(std::vector<uint8_t>({0xf9, 0xc4, 0x00})));
-
-        // half-precision float
-        //CHECK(json::to_cbor(json::parse("0.00006103515625")) == std::vector<uint8_t>({0xf9, 0x04, 0x00}));
-        CHECK(json::parse("-4.0") == json::from_cbor(std::vector<uint8_t>({0xf9, 0xc4, 0x00})));
-
-        // half-precision float
-        //CHECK(json::to_cbor(json::parse("-4.0")) == std::vector<uint8_t>({0xf9, 0xc4, 0x00}));
-        CHECK(json::parse("-4.0") == json::from_cbor(std::vector<uint8_t>({0xf9, 0xc4, 0x00})));
-
-        CHECK(json::to_cbor(json::parse("-4.1")) == std::vector<uint8_t>({0xfb, 0xc0, 0x10, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66}));
-        CHECK(json::parse("-4.1") == json::from_cbor(std::vector<uint8_t>({0xfb, 0xc0, 0x10, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66})));
-    }
-
-    SECTION("simple values")
-    {
-        CHECK(json::to_cbor(json::parse("false")) == std::vector<uint8_t>({0xf4}));
-        CHECK(json::parse("false") == json::from_cbor(std::vector<uint8_t>({0xf4})));
-
-        CHECK(json::to_cbor(json::parse("true")) == std::vector<uint8_t>({0xf5}));
-        CHECK(json::parse("true") == json::from_cbor(std::vector<uint8_t>({0xf5})));
-
-        CHECK(json::to_cbor(json::parse("true")) == std::vector<uint8_t>({0xf5}));
-        CHECK(json::parse("true") == json::from_cbor(std::vector<uint8_t>({0xf5})));
-    }
-
-    SECTION("strings")
-    {
-        CHECK(json::to_cbor(json::parse("\"\"")) == std::vector<uint8_t>({0x60}));
-        CHECK(json::parse("\"\"") == json::from_cbor(std::vector<uint8_t>({0x60})));
-
-        CHECK(json::to_cbor(json::parse("\"a\"")) == std::vector<uint8_t>({0x61, 0x61}));
-        CHECK(json::parse("\"a\"") == json::from_cbor(std::vector<uint8_t>({0x61, 0x61})));
-
-        CHECK(json::to_cbor(json::parse("\"IETF\"")) == std::vector<uint8_t>({0x64, 0x49, 0x45, 0x54, 0x46}));
-        CHECK(json::parse("\"IETF\"") == json::from_cbor(std::vector<uint8_t>({0x64, 0x49, 0x45, 0x54, 0x46})));
-
-        CHECK(json::to_cbor(json::parse("\"\\u00fc\"")) == std::vector<uint8_t>({0x62, 0xc3, 0xbc}));
-        CHECK(json::parse("\"\\u00fc\"") == json::from_cbor(std::vector<uint8_t>({0x62, 0xc3, 0xbc})));
-
-        CHECK(json::to_cbor(json::parse("\"\\u6c34\"")) == std::vector<uint8_t>({0x63, 0xe6, 0xb0, 0xb4}));
-        CHECK(json::parse("\"\\u6c34\"") == json::from_cbor(std::vector<uint8_t>({0x63, 0xe6, 0xb0, 0xb4})));
-
-        CHECK(json::to_cbor(json::parse("\"\\ud800\\udd51\"")) == std::vector<uint8_t>({0x64, 0xf0, 0x90, 0x85, 0x91}));
-        CHECK(json::parse("\"\\ud800\\udd51\"") == json::from_cbor(std::vector<uint8_t>({0x64, 0xf0, 0x90, 0x85, 0x91})));
-
-        // indefinite length strings
-        CHECK(json::parse("\"streaming\"") == json::from_cbor(std::vector<uint8_t>({0x7f, 0x65, 0x73, 0x74, 0x72, 0x65, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x67, 0xff})));
-    }
-
-    SECTION("byte arrays")
-    {
-        auto packed = utils::read_binary_file(TEST_DATA_DIRECTORY "/binary_data/cbor_binary.cbor");
-        json j;
-        CHECK_NOTHROW(j = json::from_cbor(packed));
-
-        auto expected = utils::read_binary_file(TEST_DATA_DIRECTORY "/binary_data/cbor_binary.out");
-        CHECK(j == json::binary(expected));
-
-        CHECK(json::to_cbor(json::binary(std::vector<uint8_t> {}, 0x42)) == std::vector<uint8_t> {0xd8, 0x42, 0x40});
-    }
-
-    SECTION("arrays")
-    {
-        CHECK(json::to_cbor(json::parse("[]")) == std::vector<uint8_t>({0x80}));
-        CHECK(json::parse("[]") == json::from_cbor(std::vector<uint8_t>({0x80})));
-
-        CHECK(json::to_cbor(json::parse("[1, 2, 3]")) == std::vector<uint8_t>({0x83, 0x01, 0x02, 0x03}));
-        CHECK(json::parse("[1, 2, 3]") == json::from_cbor(std::vector<uint8_t>({0x83, 0x01, 0x02, 0x03})));
-
-        CHECK(json::to_cbor(json::parse("[1, [2, 3], [4, 5]]")) == std::vector<uint8_t>({0x83, 0x01, 0x82, 0x02, 0x03, 0x82, 0x04, 0x05}));
-        CHECK(json::parse("[1, [2, 3], [4, 5]]") == json::from_cbor(std::vector<uint8_t>({0x83, 0x01, 0x82, 0x02, 0x03, 0x82, 0x04, 0x05})));
-
-        CHECK(json::to_cbor(json::parse("[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25]")) == std::vector<uint8_t>({0x98, 0x19, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x18, 0x18, 0x19}));
-        CHECK(json::parse("[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25]") == json::from_cbor(std::vector<uint8_t>({0x98, 0x19, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x18, 0x18, 0x19})));
-
-        // indefinite length arrays
-        CHECK(json::parse("[]") == json::from_cbor(std::vector<uint8_t>({0x9f, 0xff})));
-        CHECK(json::parse("[1, [2, 3], [4, 5]] ") == json::from_cbor(std::vector<uint8_t>({0x9f, 0x01, 0x82, 0x02, 0x03, 0x9f, 0x04, 0x05, 0xff, 0xff})));
-        CHECK(json::parse("[1, [2, 3], [4, 5]]") == json::from_cbor(std::vector<uint8_t>({0x9f, 0x01, 0x82, 0x02, 0x03, 0x82, 0x04, 0x05, 0xff})));
-        CHECK(json::parse("[1, [2, 3], [4, 5]]") == json::from_cbor(std::vector<uint8_t>({0x83, 0x01, 0x82, 0x02, 0x03, 0x9f, 0x04, 0x05, 0xff})));
-        CHECK(json::parse("[1, [2, 3], [4, 5]]") == json::from_cbor(std::vector<uint8_t>({0x83, 0x01, 0x9f, 0x02, 0x03, 0xff, 0x82, 0x04, 0x05})));
-        CHECK(json::parse("[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25]") == json::from_cbor(std::vector<uint8_t>({0x9f, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x18, 0x18, 0x19, 0xff})));
-    }
-
-    SECTION("objects")
-    {
-        CHECK(json::to_cbor(json::parse("{}")) == std::vector<uint8_t>({0xa0}));
-        CHECK(json::parse("{}") == json::from_cbor(std::vector<uint8_t>({0xa0})));
-
-        CHECK(json::to_cbor(json::parse("{\"a\": 1, \"b\": [2, 3]}")) == std::vector<uint8_t>({0xa2, 0x61, 0x61, 0x01, 0x61, 0x62, 0x82, 0x02, 0x03}));
-        CHECK(json::parse("{\"a\": 1, \"b\": [2, 3]}") == json::from_cbor(std::vector<uint8_t>({0xa2, 0x61, 0x61, 0x01, 0x61, 0x62, 0x82, 0x02, 0x03})));
-
-        CHECK(json::to_cbor(json::parse("[\"a\", {\"b\": \"c\"}]")) == std::vector<uint8_t>({0x82, 0x61, 0x61, 0xa1, 0x61, 0x62, 0x61, 0x63}));
-        CHECK(json::parse("[\"a\", {\"b\": \"c\"}]") == json::from_cbor(std::vector<uint8_t>({0x82, 0x61, 0x61, 0xa1, 0x61, 0x62, 0x61, 0x63})));
-
-        CHECK(json::to_cbor(json::parse("{\"a\": \"A\", \"b\": \"B\", \"c\": \"C\", \"d\": \"D\", \"e\": \"E\"}")) == std::vector<uint8_t>({0xa5, 0x61, 0x61, 0x61, 0x41, 0x61, 0x62, 0x61, 0x42, 0x61, 0x63, 0x61, 0x43, 0x61, 0x64, 0x61, 0x44, 0x61, 0x65, 0x61, 0x45}));
-        CHECK(json::parse("{\"a\": \"A\", \"b\": \"B\", \"c\": \"C\", \"d\": \"D\", \"e\": \"E\"}") == json::from_cbor(std::vector<uint8_t>({0xa5, 0x61, 0x61, 0x61, 0x41, 0x61, 0x62, 0x61, 0x42, 0x61, 0x63, 0x61, 0x43, 0x61, 0x64, 0x61, 0x44, 0x61, 0x65, 0x61, 0x45})));
-
-        // indefinite length objects
-        CHECK(json::parse("{\"a\": 1, \"b\": [2, 3]}") == json::from_cbor(std::vector<uint8_t>({0xbf, 0x61, 0x61, 0x01, 0x61, 0x62, 0x9f, 0x02, 0x03, 0xff, 0xff})));
-        CHECK(json::parse("[\"a\", {\"b\": \"c\"}]") == json::from_cbor(std::vector<uint8_t>({0x82, 0x61, 0x61, 0xbf, 0x61, 0x62, 0x61, 0x63, 0xff})));
-        CHECK(json::parse("{\"Fun\": true, \"Amt\": -2}") == json::from_cbor(std::vector<uint8_t>({0xbf, 0x63, 0x46, 0x75, 0x6e, 0xf5, 0x63, 0x41, 0x6d, 0x74, 0x21, 0xff})));
-    }
-}
-
-TEST_CASE("Tagged values")
-{
-    json j = "s";
-    auto v = json::to_cbor(j);
-
-    SECTION("0xC6..0xD4")
-    {
-        for (auto b : std::vector<std::uint8_t>
-    {
-        0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4
-    })
-        {
-            // add tag to value
-            auto v_tagged = v;
-            v_tagged.insert(v_tagged.begin(), b);
-
-            // check that parsing fails in error mode
-            json _;
-            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged), json::parse_error);
-            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged, true, true, json::cbor_tag_handler_t::error), json::parse_error);
-
-            // check that parsing succeeds and gets original value in ignore mode
-            auto j_tagged = json::from_cbor(v_tagged, true, true, json::cbor_tag_handler_t::ignore);
-            CHECK(j_tagged == j);
-        }
-    }
-
-    SECTION("0xD8 - 1 byte follows")
-    {
-        SECTION("success")
-        {
-            // add tag to value
-            auto v_tagged = v;
-            v_tagged.insert(v_tagged.begin(), 0x42); // 1 byte
-            v_tagged.insert(v_tagged.begin(), 0xD8); // tag
-
-            // check that parsing fails in error mode
-            json _;
-            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged), json::parse_error);
-            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged, true, true, json::cbor_tag_handler_t::error), json::parse_error);
-
-            // check that parsing succeeds and gets original value in ignore mode
-            auto j_tagged = json::from_cbor(v_tagged, true, true, json::cbor_tag_handler_t::ignore);
-            CHECK(j_tagged == j);
-        }
-
-        SECTION("missing byte after tag")
-        {
-            // add tag to value
-            auto v_tagged = v;
-            v_tagged.insert(v_tagged.begin(), 0xD8); // tag
-
-            // check that parsing fails in all modes
-            json _;
-            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged), json::parse_error);
-            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged, true, true, json::cbor_tag_handler_t::error), json::parse_error);
-            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged, true, true, json::cbor_tag_handler_t::ignore), json::parse_error);
-        }
-    }
-
-    SECTION("0xD9 - 2 byte follow")
-    {
-        SECTION("success")
-        {
-            // add tag to value
-            auto v_tagged = v;
-            v_tagged.insert(v_tagged.begin(), 0x42); // 1 byte
-            v_tagged.insert(v_tagged.begin(), 0x23); // 1 byte
-            v_tagged.insert(v_tagged.begin(), 0xD9); // tag
-
-            // check that parsing fails in error mode
-            json _;
-            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged), json::parse_error);
-            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged, true, true, json::cbor_tag_handler_t::error), json::parse_error);
-
-            // check that parsing succeeds and gets original value in ignore mode
-            auto j_tagged = json::from_cbor(v_tagged, true, true, json::cbor_tag_handler_t::ignore);
-            CHECK(j_tagged == j);
-        }
-
-        SECTION("missing byte after tag")
-        {
-            // add tag to value
-            auto v_tagged = v;
-            v_tagged.insert(v_tagged.begin(), 0x23); // 1 byte
-            v_tagged.insert(v_tagged.begin(), 0xD9); // tag
-
-            // check that parsing fails in all modes
-            json _;
-            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged), json::parse_error);
-            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged, true, true, json::cbor_tag_handler_t::error), json::parse_error);
-            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged, true, true, json::cbor_tag_handler_t::ignore), json::parse_error);
-        }
-    }
-
-    SECTION("0xDA - 4 bytes follow")
-    {
-        SECTION("success")
-        {
-            // add tag to value
-            auto v_tagged = v;
-            v_tagged.insert(v_tagged.begin(), 0x42); // 1 byte
-            v_tagged.insert(v_tagged.begin(), 0x23); // 1 byte
-            v_tagged.insert(v_tagged.begin(), 0x22); // 1 byte
-            v_tagged.insert(v_tagged.begin(), 0x11); // 1 byte
-            v_tagged.insert(v_tagged.begin(), 0xDA); // tag
-
-            // check that parsing fails in error mode
-            json _;
-            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged), json::parse_error);
-            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged, true, true, json::cbor_tag_handler_t::error), json::parse_error);
-
-            // check that parsing succeeds and gets original value in ignore mode
-            auto j_tagged = json::from_cbor(v_tagged, true, true, json::cbor_tag_handler_t::ignore);
-            CHECK(j_tagged == j);
-        }
-
-        SECTION("missing bytes after tag")
-        {
-            // add tag to value
-            auto v_tagged = v;
-            v_tagged.insert(v_tagged.begin(), 0x23); // 1 byte
-            v_tagged.insert(v_tagged.begin(), 0x22); // 1 byte
-            v_tagged.insert(v_tagged.begin(), 0x11); // 1 byte
-            v_tagged.insert(v_tagged.begin(), 0xDA); // tag
-
-            // check that parsing fails in all modes
-            json _;
-            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged), json::parse_error);
-            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged, true, true, json::cbor_tag_handler_t::error), json::parse_error);
-            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged, true, true, json::cbor_tag_handler_t::ignore), json::parse_error);
-        }
-    }
-
-    SECTION("0xDB - 8 bytes follow")
-    {
-        SECTION("success")
-        {
-            // add tag to value
-            auto v_tagged = v;
-            v_tagged.insert(v_tagged.begin(), 0x42); // 1 byte
-            v_tagged.insert(v_tagged.begin(), 0x23); // 1 byte
-            v_tagged.insert(v_tagged.begin(), 0x22); // 1 byte
-            v_tagged.insert(v_tagged.begin(), 0x11); // 1 byte
-            v_tagged.insert(v_tagged.begin(), 0x42); // 1 byte
-            v_tagged.insert(v_tagged.begin(), 0x23); // 1 byte
-            v_tagged.insert(v_tagged.begin(), 0x22); // 1 byte
-            v_tagged.insert(v_tagged.begin(), 0x11); // 1 byte
-            v_tagged.insert(v_tagged.begin(), 0xDB); // tag
-
-            // check that parsing fails in error mode
-            json _;
-            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged), json::parse_error);
-            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged, true, true, json::cbor_tag_handler_t::error), json::parse_error);
-
-            // check that parsing succeeds and gets original value in ignore mode
-            auto j_tagged = json::from_cbor(v_tagged, true, true, json::cbor_tag_handler_t::ignore);
-            CHECK(j_tagged == j);
-        }
-
-        SECTION("missing byte after tag")
-        {
-            // add tag to value
-            auto v_tagged = v;
-            v_tagged.insert(v_tagged.begin(), 0x42); // 1 byte
-            v_tagged.insert(v_tagged.begin(), 0x23); // 1 byte
-            v_tagged.insert(v_tagged.begin(), 0x22); // 1 byte
-            v_tagged.insert(v_tagged.begin(), 0x11); // 1 byte
-            v_tagged.insert(v_tagged.begin(), 0x23); // 1 byte
-            v_tagged.insert(v_tagged.begin(), 0x22); // 1 byte
-            v_tagged.insert(v_tagged.begin(), 0x11); // 1 byte
-            v_tagged.insert(v_tagged.begin(), 0xDB); // tag
-
-            // check that parsing fails in all modes
-            json _;
-            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged), json::parse_error);
-            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged, true, true, json::cbor_tag_handler_t::error), json::parse_error);
-            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged, true, true, json::cbor_tag_handler_t::ignore), json::parse_error);
-        }
-    }
-
-    SECTION("tagged binary")
-    {
-        // create a binary value of subtype 42
-        json j_binary;
-        j_binary["binary"] = json::binary({0xCA, 0xFE, 0xBA, 0xBE}, 42);
-
-        // convert to CBOR
-        const auto vec = json::to_cbor(j_binary);
-        CHECK(vec == std::vector<std::uint8_t> {0xA1, 0x66, 0x62, 0x69, 0x6E, 0x61, 0x72, 0x79, 0xD8, 0x2A, 0x44, 0xCA, 0xFE, 0xBA, 0xBE});
-
-        // parse error when parsing tagged value
-        json _;
-        CHECK_THROWS_AS(_ = json::from_cbor(vec), json::parse_error);
-        CHECK_THROWS_WITH(_ = json::from_cbor(vec), "[json.exception.parse_error.112] parse error at byte 9: syntax error while parsing CBOR value: invalid byte: 0xD8");
-
-        // binary without subtype when tags are ignored
-        json jb = json::from_cbor(vec, true, true, json::cbor_tag_handler_t::ignore);
-        CHECK(jb.is_object());
-        CHECK(jb["binary"].is_binary());
-        CHECK(!jb["binary"].get_binary().has_subtype());
-    }
-}
diff --git a/external_imported/json/test/src/unit-class_const_iterator.cpp b/external_imported/json/test/src/unit-class_const_iterator.cpp
deleted file mode 100644
index a972fd4c7..000000000
--- a/external_imported/json/test/src/unit-class_const_iterator.cpp
+++ /dev/null
@@ -1,418 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include "doctest_compatibility.h"
-
-#define JSON_TESTS_PRIVATE
-#include <nlohmann/json.hpp>
-using nlohmann::json;
-
-TEST_CASE("const_iterator class")
-{
-    SECTION("construction")
-    {
-        SECTION("constructor")
-        {
-            SECTION("null")
-            {
-                json j(json::value_t::null);
-                json::const_iterator it(&j);
-            }
-
-            SECTION("object")
-            {
-                json j(json::value_t::object);
-                json::const_iterator it(&j);
-            }
-
-            SECTION("array")
-            {
-                json j(json::value_t::array);
-                json::const_iterator it(&j);
-            }
-        }
-
-        SECTION("copy assignment")
-        {
-            json j(json::value_t::null);
-            json::const_iterator it(&j);
-            json::const_iterator it2(&j);
-            it2 = it;
-        }
-
-        SECTION("copy constructor from non-const iterator")
-        {
-            SECTION("create from uninitialized iterator")
-            {
-                const json::iterator it {};
-                json::const_iterator cit(it);
-            }
-
-            SECTION("create from initialized iterator")
-            {
-                json j;
-                const json::iterator it = j.begin();
-                json::const_iterator cit(it);
-            }
-        }
-    }
-
-    SECTION("initialization")
-    {
-        SECTION("set_begin")
-        {
-            SECTION("null")
-            {
-                json j(json::value_t::null);
-                json::const_iterator it(&j);
-                it.set_begin();
-                CHECK((it == j.cbegin()));
-            }
-
-            SECTION("object")
-            {
-                json j(json::value_t::object);
-                json::const_iterator it(&j);
-                it.set_begin();
-                CHECK((it == j.cbegin()));
-            }
-
-            SECTION("array")
-            {
-                json j(json::value_t::array);
-                json::const_iterator it(&j);
-                it.set_begin();
-                CHECK((it == j.cbegin()));
-            }
-        }
-
-        SECTION("set_end")
-        {
-            SECTION("null")
-            {
-                json j(json::value_t::null);
-                json::const_iterator it(&j);
-                it.set_end();
-                CHECK((it == j.cend()));
-            }
-
-            SECTION("object")
-            {
-                json j(json::value_t::object);
-                json::const_iterator it(&j);
-                it.set_end();
-                CHECK((it == j.cend()));
-            }
-
-            SECTION("array")
-            {
-                json j(json::value_t::array);
-                json::const_iterator it(&j);
-                it.set_end();
-                CHECK((it == j.cend()));
-            }
-        }
-    }
-
-    SECTION("element access")
-    {
-        SECTION("operator*")
-        {
-            SECTION("null")
-            {
-                json j(json::value_t::null);
-                json::const_iterator it = j.cbegin();
-                CHECK_THROWS_AS(*it, json::invalid_iterator&);
-                CHECK_THROWS_WITH(*it, "[json.exception.invalid_iterator.214] cannot get value");
-            }
-
-            SECTION("number")
-            {
-                json j(17);
-                json::const_iterator it = j.cbegin();
-                CHECK(*it == json(17));
-                it = j.cend();
-                CHECK_THROWS_AS(*it, json::invalid_iterator&);
-                CHECK_THROWS_WITH(*it, "[json.exception.invalid_iterator.214] cannot get value");
-            }
-
-            SECTION("object")
-            {
-                json j({{"foo", "bar"}});
-                json::const_iterator it = j.cbegin();
-                CHECK(*it == json("bar"));
-            }
-
-            SECTION("array")
-            {
-                json j({1, 2, 3, 4});
-                json::const_iterator it = j.cbegin();
-                CHECK(*it == json(1));
-            }
-        }
-
-        SECTION("operator->")
-        {
-            SECTION("null")
-            {
-                json j(json::value_t::null);
-                json::const_iterator it = j.cbegin();
-                CHECK_THROWS_AS(std::string(it->type_name()), json::invalid_iterator&);
-                CHECK_THROWS_WITH(std::string(it->type_name()), "[json.exception.invalid_iterator.214] cannot get value");
-            }
-
-            SECTION("number")
-            {
-                json j(17);
-                json::const_iterator it = j.cbegin();
-                CHECK(std::string(it->type_name()) == "number");
-                it = j.cend();
-                CHECK_THROWS_AS(std::string(it->type_name()), json::invalid_iterator&);
-                CHECK_THROWS_WITH(std::string(it->type_name()), "[json.exception.invalid_iterator.214] cannot get value");
-            }
-
-            SECTION("object")
-            {
-                json j({{"foo", "bar"}});
-                json::const_iterator it = j.cbegin();
-                CHECK(std::string(it->type_name()) == "string");
-            }
-
-            SECTION("array")
-            {
-                json j({1, 2, 3, 4});
-                json::const_iterator it = j.cbegin();
-                CHECK(std::string(it->type_name()) == "number");
-            }
-        }
-    }
-
-    SECTION("increment/decrement")
-    {
-        SECTION("post-increment")
-        {
-            SECTION("null")
-            {
-                json j(json::value_t::null);
-                json::const_iterator it = j.cbegin();
-                CHECK((it.m_it.primitive_iterator.m_it == 1));
-                it++;
-                CHECK((it.m_it.primitive_iterator.m_it != 0 && it.m_it.primitive_iterator.m_it != 1));
-            }
-
-            SECTION("number")
-            {
-                json j(17);
-                json::const_iterator it = j.cbegin();
-                CHECK((it.m_it.primitive_iterator.m_it == 0));
-                it++;
-                CHECK((it.m_it.primitive_iterator.m_it == 1));
-                it++;
-                CHECK((it.m_it.primitive_iterator.m_it != 0 && it.m_it.primitive_iterator.m_it != 1));
-            }
-
-            SECTION("object")
-            {
-                json j({{"foo", "bar"}});
-                json::const_iterator it = j.cbegin();
-                CHECK((it.m_it.object_iterator == it.m_object->m_value.object->begin()));
-                it++;
-                CHECK((it.m_it.object_iterator == it.m_object->m_value.object->end()));
-            }
-
-            SECTION("array")
-            {
-                json j({1, 2, 3, 4});
-                json::const_iterator it = j.cbegin();
-                CHECK((it.m_it.array_iterator == it.m_object->m_value.array->begin()));
-                it++;
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->begin()));
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->end()));
-                it++;
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->begin()));
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->end()));
-                it++;
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->begin()));
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->end()));
-                it++;
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->begin()));
-                CHECK((it.m_it.array_iterator == it.m_object->m_value.array->end()));
-            }
-        }
-
-        SECTION("pre-increment")
-        {
-            SECTION("null")
-            {
-                json j(json::value_t::null);
-                json::const_iterator it = j.cbegin();
-                CHECK((it.m_it.primitive_iterator.m_it == 1));
-                ++it;
-                CHECK((it.m_it.primitive_iterator.m_it != 0 && it.m_it.primitive_iterator.m_it != 1));
-            }
-
-            SECTION("number")
-            {
-                json j(17);
-                json::const_iterator it = j.cbegin();
-                CHECK((it.m_it.primitive_iterator.m_it == 0));
-                ++it;
-                CHECK((it.m_it.primitive_iterator.m_it == 1));
-                ++it;
-                CHECK((it.m_it.primitive_iterator.m_it != 0 && it.m_it.primitive_iterator.m_it != 1));
-            }
-
-            SECTION("object")
-            {
-                json j({{"foo", "bar"}});
-                json::const_iterator it = j.cbegin();
-                CHECK((it.m_it.object_iterator == it.m_object->m_value.object->begin()));
-                ++it;
-                CHECK((it.m_it.object_iterator == it.m_object->m_value.object->end()));
-            }
-
-            SECTION("array")
-            {
-                json j({1, 2, 3, 4});
-                json::const_iterator it = j.cbegin();
-                CHECK((it.m_it.array_iterator == it.m_object->m_value.array->begin()));
-                ++it;
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->begin()));
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->end()));
-                ++it;
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->begin()));
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->end()));
-                ++it;
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->begin()));
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->end()));
-                ++it;
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->begin()));
-                CHECK((it.m_it.array_iterator == it.m_object->m_value.array->end()));
-            }
-        }
-
-        SECTION("post-decrement")
-        {
-            SECTION("null")
-            {
-                json j(json::value_t::null);
-                json::const_iterator it = j.cend();
-                CHECK((it.m_it.primitive_iterator.m_it == 1));
-            }
-
-            SECTION("number")
-            {
-                json j(17);
-                json::const_iterator it = j.cend();
-                CHECK((it.m_it.primitive_iterator.m_it == 1));
-                it--;
-                CHECK((it.m_it.primitive_iterator.m_it == 0));
-                it--;
-                CHECK((it.m_it.primitive_iterator.m_it != 0 && it.m_it.primitive_iterator.m_it != 1));
-            }
-
-            SECTION("object")
-            {
-                json j({{"foo", "bar"}});
-                json::const_iterator it = j.cend();
-                CHECK((it.m_it.object_iterator == it.m_object->m_value.object->end()));
-                it--;
-                CHECK((it.m_it.object_iterator == it.m_object->m_value.object->begin()));
-            }
-
-            SECTION("array")
-            {
-                json j({1, 2, 3, 4});
-                json::const_iterator it = j.cend();
-                CHECK((it.m_it.array_iterator == it.m_object->m_value.array->end()));
-                it--;
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->begin()));
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->end()));
-                it--;
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->begin()));
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->end()));
-                it--;
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->begin()));
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->end()));
-                it--;
-                CHECK((it.m_it.array_iterator == it.m_object->m_value.array->begin()));
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->end()));
-            }
-        }
-
-        SECTION("pre-decrement")
-        {
-            SECTION("null")
-            {
-                json j(json::value_t::null);
-                json::const_iterator it = j.cend();
-                CHECK((it.m_it.primitive_iterator.m_it == 1));
-            }
-
-            SECTION("number")
-            {
-                json j(17);
-                json::const_iterator it = j.cend();
-                CHECK((it.m_it.primitive_iterator.m_it == 1));
-                --it;
-                CHECK((it.m_it.primitive_iterator.m_it == 0));
-                --it;
-                CHECK((it.m_it.primitive_iterator.m_it != 0 && it.m_it.primitive_iterator.m_it != 1));
-            }
-
-            SECTION("object")
-            {
-                json j({{"foo", "bar"}});
-                json::const_iterator it = j.cend();
-                CHECK((it.m_it.object_iterator == it.m_object->m_value.object->end()));
-                --it;
-                CHECK((it.m_it.object_iterator == it.m_object->m_value.object->begin()));
-            }
-
-            SECTION("array")
-            {
-                json j({1, 2, 3, 4});
-                json::const_iterator it = j.cend();
-                CHECK((it.m_it.array_iterator == it.m_object->m_value.array->end()));
-                --it;
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->begin()));
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->end()));
-                --it;
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->begin()));
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->end()));
-                --it;
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->begin()));
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->end()));
-                --it;
-                CHECK((it.m_it.array_iterator == it.m_object->m_value.array->begin()));
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->end()));
-            }
-        }
-    }
-}
diff --git a/external_imported/json/test/src/unit-class_iterator.cpp b/external_imported/json/test/src/unit-class_iterator.cpp
deleted file mode 100644
index b4ef11e43..000000000
--- a/external_imported/json/test/src/unit-class_iterator.cpp
+++ /dev/null
@@ -1,402 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include "doctest_compatibility.h"
-
-#define JSON_TESTS_PRIVATE
-#include <nlohmann/json.hpp>
-using nlohmann::json;
-
-TEST_CASE("iterator class")
-{
-    SECTION("construction")
-    {
-        SECTION("constructor")
-        {
-            SECTION("null")
-            {
-                json j(json::value_t::null);
-                json::iterator it(&j);
-            }
-
-            SECTION("object")
-            {
-                json j(json::value_t::object);
-                json::iterator it(&j);
-            }
-
-            SECTION("array")
-            {
-                json j(json::value_t::array);
-                json::iterator it(&j);
-            }
-        }
-
-        SECTION("copy assignment")
-        {
-            json j(json::value_t::null);
-            json::iterator it(&j);
-            json::iterator it2(&j);
-            it2 = it;
-        }
-    }
-
-    SECTION("initialization")
-    {
-        SECTION("set_begin")
-        {
-            SECTION("null")
-            {
-                json j(json::value_t::null);
-                json::iterator it(&j);
-                it.set_begin();
-                CHECK((it == j.begin()));
-            }
-
-            SECTION("object")
-            {
-                json j(json::value_t::object);
-                json::iterator it(&j);
-                it.set_begin();
-                CHECK((it == j.begin()));
-            }
-
-            SECTION("array")
-            {
-                json j(json::value_t::array);
-                json::iterator it(&j);
-                it.set_begin();
-                CHECK((it == j.begin()));
-            }
-        }
-
-        SECTION("set_end")
-        {
-            SECTION("null")
-            {
-                json j(json::value_t::null);
-                json::iterator it(&j);
-                it.set_end();
-                CHECK((it == j.end()));
-            }
-
-            SECTION("object")
-            {
-                json j(json::value_t::object);
-                json::iterator it(&j);
-                it.set_end();
-                CHECK((it == j.end()));
-            }
-
-            SECTION("array")
-            {
-                json j(json::value_t::array);
-                json::iterator it(&j);
-                it.set_end();
-                CHECK((it == j.end()));
-            }
-        }
-    }
-
-    SECTION("element access")
-    {
-        SECTION("operator*")
-        {
-            SECTION("null")
-            {
-                json j(json::value_t::null);
-                json::iterator it = j.begin();
-                CHECK_THROWS_AS(*it, json::invalid_iterator&);
-                CHECK_THROWS_WITH(*it, "[json.exception.invalid_iterator.214] cannot get value");
-            }
-
-            SECTION("number")
-            {
-                json j(17);
-                json::iterator it = j.begin();
-                CHECK(*it == json(17));
-                it = j.end();
-                CHECK_THROWS_AS(*it, json::invalid_iterator&);
-                CHECK_THROWS_WITH(*it, "[json.exception.invalid_iterator.214] cannot get value");
-            }
-
-            SECTION("object")
-            {
-                json j({{"foo", "bar"}});
-                json::iterator it = j.begin();
-                CHECK(*it == json("bar"));
-            }
-
-            SECTION("array")
-            {
-                json j({1, 2, 3, 4});
-                json::iterator it = j.begin();
-                CHECK(*it == json(1));
-            }
-        }
-
-        SECTION("operator->")
-        {
-            SECTION("null")
-            {
-                json j(json::value_t::null);
-                json::iterator it = j.begin();
-                CHECK_THROWS_AS(std::string(it->type_name()), json::invalid_iterator&);
-                CHECK_THROWS_WITH(std::string(it->type_name()), "[json.exception.invalid_iterator.214] cannot get value");
-            }
-
-            SECTION("number")
-            {
-                json j(17);
-                json::iterator it = j.begin();
-                CHECK(std::string(it->type_name()) == "number");
-                it = j.end();
-                CHECK_THROWS_AS(std::string(it->type_name()), json::invalid_iterator&);
-                CHECK_THROWS_WITH(std::string(it->type_name()), "[json.exception.invalid_iterator.214] cannot get value");
-            }
-
-            SECTION("object")
-            {
-                json j({{"foo", "bar"}});
-                json::iterator it = j.begin();
-                CHECK(std::string(it->type_name()) == "string");
-            }
-
-            SECTION("array")
-            {
-                json j({1, 2, 3, 4});
-                json::iterator it = j.begin();
-                CHECK(std::string(it->type_name()) == "number");
-            }
-        }
-    }
-
-    SECTION("increment/decrement")
-    {
-        SECTION("post-increment")
-        {
-            SECTION("null")
-            {
-                json j(json::value_t::null);
-                json::iterator it = j.begin();
-                CHECK((it.m_it.primitive_iterator.m_it == 1));
-                it++;
-                CHECK((it.m_it.primitive_iterator.m_it != 0 && it.m_it.primitive_iterator.m_it != 1));
-            }
-
-            SECTION("number")
-            {
-                json j(17);
-                json::iterator it = j.begin();
-                CHECK((it.m_it.primitive_iterator.m_it == 0));
-                it++;
-                CHECK((it.m_it.primitive_iterator.m_it == 1));
-                it++;
-                CHECK((it.m_it.primitive_iterator.m_it != 0 && it.m_it.primitive_iterator.m_it != 1));
-            }
-
-            SECTION("object")
-            {
-                json j({{"foo", "bar"}});
-                json::iterator it = j.begin();
-                CHECK((it.m_it.object_iterator == it.m_object->m_value.object->begin()));
-                it++;
-                CHECK((it.m_it.object_iterator == it.m_object->m_value.object->end()));
-            }
-
-            SECTION("array")
-            {
-                json j({1, 2, 3, 4});
-                json::iterator it = j.begin();
-                CHECK((it.m_it.array_iterator == it.m_object->m_value.array->begin()));
-                it++;
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->begin()));
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->end()));
-                it++;
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->begin()));
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->end()));
-                it++;
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->begin()));
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->end()));
-                it++;
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->begin()));
-                CHECK((it.m_it.array_iterator == it.m_object->m_value.array->end()));
-            }
-        }
-
-        SECTION("pre-increment")
-        {
-            SECTION("null")
-            {
-                json j(json::value_t::null);
-                json::iterator it = j.begin();
-                CHECK((it.m_it.primitive_iterator.m_it == 1));
-                ++it;
-                CHECK((it.m_it.primitive_iterator.m_it != 0 && it.m_it.primitive_iterator.m_it != 1));
-            }
-
-            SECTION("number")
-            {
-                json j(17);
-                json::iterator it = j.begin();
-                CHECK((it.m_it.primitive_iterator.m_it == 0));
-                ++it;
-                CHECK((it.m_it.primitive_iterator.m_it == 1));
-                ++it;
-                CHECK((it.m_it.primitive_iterator.m_it != 0 && it.m_it.primitive_iterator.m_it != 1));
-            }
-
-            SECTION("object")
-            {
-                json j({{"foo", "bar"}});
-                json::iterator it = j.begin();
-                CHECK((it.m_it.object_iterator == it.m_object->m_value.object->begin()));
-                ++it;
-                CHECK((it.m_it.object_iterator == it.m_object->m_value.object->end()));
-            }
-
-            SECTION("array")
-            {
-                json j({1, 2, 3, 4});
-                json::iterator it = j.begin();
-                CHECK((it.m_it.array_iterator == it.m_object->m_value.array->begin()));
-                ++it;
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->begin()));
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->end()));
-                ++it;
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->begin()));
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->end()));
-                ++it;
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->begin()));
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->end()));
-                ++it;
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->begin()));
-                CHECK((it.m_it.array_iterator == it.m_object->m_value.array->end()));
-            }
-        }
-
-        SECTION("post-decrement")
-        {
-            SECTION("null")
-            {
-                json j(json::value_t::null);
-                json::iterator it = j.end();
-                CHECK((it.m_it.primitive_iterator.m_it == 1));
-            }
-
-            SECTION("number")
-            {
-                json j(17);
-                json::iterator it = j.end();
-                CHECK((it.m_it.primitive_iterator.m_it == 1));
-                it--;
-                CHECK((it.m_it.primitive_iterator.m_it == 0));
-                it--;
-                CHECK((it.m_it.primitive_iterator.m_it != 0 && it.m_it.primitive_iterator.m_it != 1));
-            }
-
-            SECTION("object")
-            {
-                json j({{"foo", "bar"}});
-                json::iterator it = j.end();
-                CHECK((it.m_it.object_iterator == it.m_object->m_value.object->end()));
-                it--;
-                CHECK((it.m_it.object_iterator == it.m_object->m_value.object->begin()));
-            }
-
-            SECTION("array")
-            {
-                json j({1, 2, 3, 4});
-                json::iterator it = j.end();
-                CHECK((it.m_it.array_iterator == it.m_object->m_value.array->end()));
-                it--;
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->begin()));
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->end()));
-                it--;
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->begin()));
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->end()));
-                it--;
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->begin()));
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->end()));
-                it--;
-                CHECK((it.m_it.array_iterator == it.m_object->m_value.array->begin()));
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->end()));
-            }
-        }
-
-        SECTION("pre-decrement")
-        {
-            SECTION("null")
-            {
-                json j(json::value_t::null);
-                json::iterator it = j.end();
-                CHECK((it.m_it.primitive_iterator.m_it == 1));
-            }
-
-            SECTION("number")
-            {
-                json j(17);
-                json::iterator it = j.end();
-                CHECK((it.m_it.primitive_iterator.m_it == 1));
-                --it;
-                CHECK((it.m_it.primitive_iterator.m_it == 0));
-                --it;
-                CHECK((it.m_it.primitive_iterator.m_it != 0 && it.m_it.primitive_iterator.m_it != 1));
-            }
-
-            SECTION("object")
-            {
-                json j({{"foo", "bar"}});
-                json::iterator it = j.end();
-                CHECK((it.m_it.object_iterator == it.m_object->m_value.object->end()));
-                --it;
-                CHECK((it.m_it.object_iterator == it.m_object->m_value.object->begin()));
-            }
-
-            SECTION("array")
-            {
-                json j({1, 2, 3, 4});
-                json::iterator it = j.end();
-                CHECK((it.m_it.array_iterator == it.m_object->m_value.array->end()));
-                --it;
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->begin()));
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->end()));
-                --it;
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->begin()));
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->end()));
-                --it;
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->begin()));
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->end()));
-                --it;
-                CHECK((it.m_it.array_iterator == it.m_object->m_value.array->begin()));
-                CHECK((it.m_it.array_iterator != it.m_object->m_value.array->end()));
-            }
-        }
-    }
-}
diff --git a/external_imported/json/test/src/unit-class_parser.cpp b/external_imported/json/test/src/unit-class_parser.cpp
deleted file mode 100644
index 2df07d6d4..000000000
--- a/external_imported/json/test/src/unit-class_parser.cpp
+++ /dev/null
@@ -1,1886 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include "doctest_compatibility.h"
-
-#define JSON_TESTS_PRIVATE
-#include <nlohmann/json.hpp>
-using nlohmann::json;
-
-#include <valarray>
-
-namespace
-{
-class SaxEventLogger
-{
-  public:
-    bool null()
-    {
-        events.push_back("null()");
-        return true;
-    }
-
-    bool boolean(bool val)
-    {
-        events.push_back(val ? "boolean(true)" : "boolean(false)");
-        return true;
-    }
-
-    bool number_integer(json::number_integer_t val)
-    {
-        events.push_back("number_integer(" + std::to_string(val) + ")");
-        return true;
-    }
-
-    bool number_unsigned(json::number_unsigned_t val)
-    {
-        events.push_back("number_unsigned(" + std::to_string(val) + ")");
-        return true;
-    }
-
-    bool number_float(json::number_float_t, const std::string& s)
-    {
-        events.push_back("number_float(" + s + ")");
-        return true;
-    }
-
-    bool string(std::string& val)
-    {
-        events.push_back("string(" + val + ")");
-        return true;
-    }
-
-    bool binary(json::binary_t& val)
-    {
-        std::string binary_contents = "binary(";
-        std::string comma_space = "";
-        for (auto b : val)
-        {
-            binary_contents.append(comma_space);
-            binary_contents.append(std::to_string(static_cast<int>(b)));
-            comma_space = ", ";
-        }
-        binary_contents.append(")");
-        events.push_back(binary_contents);
-        return true;
-    }
-
-    bool start_object(std::size_t elements)
-    {
-        if (elements == std::size_t(-1))
-        {
-            events.push_back("start_object()");
-        }
-        else
-        {
-            events.push_back("start_object(" + std::to_string(elements) + ")");
-        }
-        return true;
-    }
-
-    bool key(std::string& val)
-    {
-        events.push_back("key(" + val + ")");
-        return true;
-    }
-
-    bool end_object()
-    {
-        events.push_back("end_object()");
-        return true;
-    }
-
-    bool start_array(std::size_t elements)
-    {
-        if (elements == std::size_t(-1))
-        {
-            events.push_back("start_array()");
-        }
-        else
-        {
-            events.push_back("start_array(" + std::to_string(elements) + ")");
-        }
-        return true;
-    }
-
-    bool end_array()
-    {
-        events.push_back("end_array()");
-        return true;
-    }
-
-    bool parse_error(std::size_t position, const std::string&, const json::exception&)
-    {
-        errored = true;
-        events.push_back("parse_error(" + std::to_string(position) + ")");
-        return false;
-    }
-
-    std::vector<std::string> events {};
-    bool errored = false;
-};
-
-class SaxCountdown : public nlohmann::json::json_sax_t
-{
-  public:
-    explicit SaxCountdown(const int count) : events_left(count)
-    {}
-
-    bool null() override
-    {
-        return events_left-- > 0;
-    }
-
-    bool boolean(bool) override
-    {
-        return events_left-- > 0;
-    }
-
-    bool number_integer(json::number_integer_t) override
-    {
-        return events_left-- > 0;
-    }
-
-    bool number_unsigned(json::number_unsigned_t) override
-    {
-        return events_left-- > 0;
-    }
-
-    bool number_float(json::number_float_t, const std::string&) override
-    {
-        return events_left-- > 0;
-    }
-
-    bool string(std::string&) override
-    {
-        return events_left-- > 0;
-    }
-
-    bool binary(json::binary_t&) override
-    {
-        return events_left-- > 0;
-    }
-
-    bool start_object(std::size_t) override
-    {
-        return events_left-- > 0;
-    }
-
-    bool key(std::string&) override
-    {
-        return events_left-- > 0;
-    }
-
-    bool end_object() override
-    {
-        return events_left-- > 0;
-    }
-
-    bool start_array(std::size_t) override
-    {
-        return events_left-- > 0;
-    }
-
-    bool end_array() override
-    {
-        return events_left-- > 0;
-    }
-
-    bool parse_error(std::size_t, const std::string&, const json::exception&) override
-    {
-        return false;
-    }
-
-  private:
-    int events_left = 0;
-};
-
-json parser_helper(const std::string& s);
-bool accept_helper(const std::string& s);
-void comments_helper(const std::string& s);
-
-json parser_helper(const std::string& s)
-{
-    json j;
-    json::parser(nlohmann::detail::input_adapter(s)).parse(true, j);
-
-    // if this line was reached, no exception occurred
-    // -> check if result is the same without exceptions
-    json j_nothrow;
-    CHECK_NOTHROW(json::parser(nlohmann::detail::input_adapter(s), nullptr, false).parse(true, j_nothrow));
-    CHECK(j_nothrow == j);
-
-    json j_sax;
-    nlohmann::detail::json_sax_dom_parser<json> sdp(j_sax);
-    json::sax_parse(s, &sdp);
-    CHECK(j_sax == j);
-
-    comments_helper(s);
-
-    return j;
-}
-
-bool accept_helper(const std::string& s)
-{
-    CAPTURE(s)
-
-    // 1. parse s without exceptions
-    json j;
-    CHECK_NOTHROW(json::parser(nlohmann::detail::input_adapter(s), nullptr, false).parse(true, j));
-    const bool ok_noexcept = !j.is_discarded();
-
-    // 2. accept s
-    const bool ok_accept = json::parser(nlohmann::detail::input_adapter(s)).accept(true);
-
-    // 3. check if both approaches come to the same result
-    CHECK(ok_noexcept == ok_accept);
-
-    // 4. parse with SAX (compare with relaxed accept result)
-    SaxEventLogger el;
-    CHECK_NOTHROW(json::sax_parse(s, &el, json::input_format_t::json, false));
-    CHECK(json::parser(nlohmann::detail::input_adapter(s)).accept(false) == !el.errored);
-
-    // 5. parse with simple callback
-    json::parser_callback_t cb = [](int, json::parse_event_t, json&)
-    {
-        return true;
-    };
-    json j_cb = json::parse(s, cb, false);
-    const bool ok_noexcept_cb = !j_cb.is_discarded();
-
-    // 6. check if this approach came to the same result
-    CHECK(ok_noexcept == ok_noexcept_cb);
-
-    // 7. check if comments are properly ignored
-    if (ok_accept)
-    {
-        comments_helper(s);
-    }
-
-    // 8. return result
-    return ok_accept;
-}
-
-void comments_helper(const std::string& s)
-{
-    json _;
-
-    // parse/accept with default parser
-    CHECK_NOTHROW(_ = json::parse(s));
-    CHECK(json::accept(s));
-
-    // parse/accept while skipping comments
-    CHECK_NOTHROW(_ = json::parse(s, nullptr, false, true));
-    CHECK(json::accept(s, true));
-
-    std::vector<std::string> json_with_comments;
-
-    // start with a comment
-    json_with_comments.push_back(std::string("// this is a comment\n") + s);
-    json_with_comments.push_back(std::string("/* this is a comment */") + s);
-    // end with a comment
-    json_with_comments.push_back(s + "// this is a comment");
-    json_with_comments.push_back(s + "/* this is a comment */");
-
-    // check all strings
-    for (const auto& json_with_comment : json_with_comments)
-    {
-        CAPTURE(json_with_comment)
-        CHECK_THROWS_AS(_ = json::parse(json_with_comment), json::parse_error);
-        CHECK(!json::accept(json_with_comment));
-
-        CHECK_NOTHROW(_ = json::parse(json_with_comment, nullptr, true, true));
-        CHECK(json::accept(json_with_comment, true));
-    }
-}
-
-} // namespace
-
-TEST_CASE("parser class")
-{
-    SECTION("parse")
-    {
-        SECTION("null")
-        {
-            CHECK(parser_helper("null") == json(nullptr));
-        }
-
-        SECTION("true")
-        {
-            CHECK(parser_helper("true") == json(true));
-        }
-
-        SECTION("false")
-        {
-            CHECK(parser_helper("false") == json(false));
-        }
-
-        SECTION("array")
-        {
-            SECTION("empty array")
-            {
-                CHECK(parser_helper("[]") == json(json::value_t::array));
-                CHECK(parser_helper("[ ]") == json(json::value_t::array));
-            }
-
-            SECTION("nonempty array")
-            {
-                CHECK(parser_helper("[true, false, null]") == json({true, false, nullptr}));
-            }
-        }
-
-        SECTION("object")
-        {
-            SECTION("empty object")
-            {
-                CHECK(parser_helper("{}") == json(json::value_t::object));
-                CHECK(parser_helper("{ }") == json(json::value_t::object));
-            }
-
-            SECTION("nonempty object")
-            {
-                CHECK(parser_helper("{\"\": true, \"one\": 1, \"two\": null}") == json({{"", true}, {"one", 1}, {"two", nullptr}}));
-            }
-        }
-
-        SECTION("string")
-        {
-            // empty string
-            CHECK(parser_helper("\"\"") == json(json::value_t::string));
-
-            SECTION("errors")
-            {
-                // error: tab in string
-                CHECK_THROWS_AS(parser_helper("\"\t\""), json::parse_error&);
-                CHECK_THROWS_WITH(parser_helper("\"\t\""),
-                                  "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0009 (HT) must be escaped to \\u0009 or \\t; last read: '\"<U+0009>'");
-                // error: newline in string
-                CHECK_THROWS_AS(parser_helper("\"\n\""), json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("\"\r\""), json::parse_error&);
-                CHECK_THROWS_WITH(parser_helper("\"\n\""),
-                                  "[json.exception.parse_error.101] parse error at line 2, column 0: syntax error while parsing value - invalid string: control character U+000A (LF) must be escaped to \\u000A or \\n; last read: '\"<U+000A>'");
-                CHECK_THROWS_WITH(parser_helper("\"\r\""),
-                                  "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+000D (CR) must be escaped to \\u000D or \\r; last read: '\"<U+000D>'");
-                // error: backspace in string
-                CHECK_THROWS_AS(parser_helper("\"\b\""), json::parse_error&);
-                CHECK_THROWS_WITH(parser_helper("\"\b\""),
-                                  "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0008 (BS) must be escaped to \\u0008 or \\b; last read: '\"<U+0008>'");
-                // improve code coverage
-                CHECK_THROWS_AS(parser_helper("\uFF01"), json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("[-4:1,]"), json::parse_error&);
-                // unescaped control characters
-                CHECK_THROWS_AS(parser_helper("\"\x00\""), json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("\"\x01\""), json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("\"\x02\""), json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("\"\x03\""), json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("\"\x04\""), json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("\"\x05\""), json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("\"\x06\""), json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("\"\x07\""), json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("\"\x08\""), json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("\"\x09\""), json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("\"\x0a\""), json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("\"\x0b\""), json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("\"\x0c\""), json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("\"\x0d\""), json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("\"\x0e\""), json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("\"\x0f\""), json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("\"\x10\""), json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("\"\x11\""), json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("\"\x12\""), json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("\"\x13\""), json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("\"\x14\""), json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("\"\x15\""), json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("\"\x16\""), json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("\"\x17\""), json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("\"\x18\""), json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("\"\x19\""), json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("\"\x1a\""), json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("\"\x1b\""), json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("\"\x1c\""), json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("\"\x1d\""), json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("\"\x1e\""), json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("\"\x1f\""), json::parse_error&);
-                CHECK_THROWS_WITH(parser_helper("\"\x00\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: missing closing quote; last read: '\"'");
-                CHECK_THROWS_WITH(parser_helper("\"\x01\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0001 (SOH) must be escaped to \\u0001; last read: '\"<U+0001>'");
-                CHECK_THROWS_WITH(parser_helper("\"\x02\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0002 (STX) must be escaped to \\u0002; last read: '\"<U+0002>'");
-                CHECK_THROWS_WITH(parser_helper("\"\x03\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0003 (ETX) must be escaped to \\u0003; last read: '\"<U+0003>'");
-                CHECK_THROWS_WITH(parser_helper("\"\x04\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0004 (EOT) must be escaped to \\u0004; last read: '\"<U+0004>'");
-                CHECK_THROWS_WITH(parser_helper("\"\x05\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0005 (ENQ) must be escaped to \\u0005; last read: '\"<U+0005>'");
-                CHECK_THROWS_WITH(parser_helper("\"\x06\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0006 (ACK) must be escaped to \\u0006; last read: '\"<U+0006>'");
-                CHECK_THROWS_WITH(parser_helper("\"\x07\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0007 (BEL) must be escaped to \\u0007; last read: '\"<U+0007>'");
-                CHECK_THROWS_WITH(parser_helper("\"\x08\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0008 (BS) must be escaped to \\u0008 or \\b; last read: '\"<U+0008>'");
-                CHECK_THROWS_WITH(parser_helper("\"\x09\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0009 (HT) must be escaped to \\u0009 or \\t; last read: '\"<U+0009>'");
-                CHECK_THROWS_WITH(parser_helper("\"\x0a\""), "[json.exception.parse_error.101] parse error at line 2, column 0: syntax error while parsing value - invalid string: control character U+000A (LF) must be escaped to \\u000A or \\n; last read: '\"<U+000A>'");
-                CHECK_THROWS_WITH(parser_helper("\"\x0b\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+000B (VT) must be escaped to \\u000B; last read: '\"<U+000B>'");
-                CHECK_THROWS_WITH(parser_helper("\"\x0c\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+000C (FF) must be escaped to \\u000C or \\f; last read: '\"<U+000C>'");
-                CHECK_THROWS_WITH(parser_helper("\"\x0d\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+000D (CR) must be escaped to \\u000D or \\r; last read: '\"<U+000D>'");
-                CHECK_THROWS_WITH(parser_helper("\"\x0e\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+000E (SO) must be escaped to \\u000E; last read: '\"<U+000E>'");
-                CHECK_THROWS_WITH(parser_helper("\"\x0f\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+000F (SI) must be escaped to \\u000F; last read: '\"<U+000F>'");
-                CHECK_THROWS_WITH(parser_helper("\"\x10\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0010 (DLE) must be escaped to \\u0010; last read: '\"<U+0010>'");
-                CHECK_THROWS_WITH(parser_helper("\"\x11\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0011 (DC1) must be escaped to \\u0011; last read: '\"<U+0011>'");
-                CHECK_THROWS_WITH(parser_helper("\"\x12\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0012 (DC2) must be escaped to \\u0012; last read: '\"<U+0012>'");
-                CHECK_THROWS_WITH(parser_helper("\"\x13\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0013 (DC3) must be escaped to \\u0013; last read: '\"<U+0013>'");
-                CHECK_THROWS_WITH(parser_helper("\"\x14\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0014 (DC4) must be escaped to \\u0014; last read: '\"<U+0014>'");
-                CHECK_THROWS_WITH(parser_helper("\"\x15\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0015 (NAK) must be escaped to \\u0015; last read: '\"<U+0015>'");
-                CHECK_THROWS_WITH(parser_helper("\"\x16\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0016 (SYN) must be escaped to \\u0016; last read: '\"<U+0016>'");
-                CHECK_THROWS_WITH(parser_helper("\"\x17\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0017 (ETB) must be escaped to \\u0017; last read: '\"<U+0017>'");
-                CHECK_THROWS_WITH(parser_helper("\"\x18\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0018 (CAN) must be escaped to \\u0018; last read: '\"<U+0018>'");
-                CHECK_THROWS_WITH(parser_helper("\"\x19\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0019 (EM) must be escaped to \\u0019; last read: '\"<U+0019>'");
-                CHECK_THROWS_WITH(parser_helper("\"\x1a\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+001A (SUB) must be escaped to \\u001A; last read: '\"<U+001A>'");
-                CHECK_THROWS_WITH(parser_helper("\"\x1b\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+001B (ESC) must be escaped to \\u001B; last read: '\"<U+001B>'");
-                CHECK_THROWS_WITH(parser_helper("\"\x1c\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+001C (FS) must be escaped to \\u001C; last read: '\"<U+001C>'");
-                CHECK_THROWS_WITH(parser_helper("\"\x1d\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+001D (GS) must be escaped to \\u001D; last read: '\"<U+001D>'");
-                CHECK_THROWS_WITH(parser_helper("\"\x1e\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+001E (RS) must be escaped to \\u001E; last read: '\"<U+001E>'");
-                CHECK_THROWS_WITH(parser_helper("\"\x1f\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+001F (US) must be escaped to \\u001F; last read: '\"<U+001F>'");
-
-                SECTION("additional test for null byte")
-                {
-                    // The test above for the null byte is wrong, because passing
-                    // a string to the parser only reads int until it encounters
-                    // a null byte. This test inserts the null byte later on and
-                    // uses an iterator range.
-                    std::string s = "\"1\"";
-                    s[1] = '\0';
-                    json _;
-                    CHECK_THROWS_AS(_ = json::parse(s.begin(), s.end()), json::parse_error&);
-                    CHECK_THROWS_WITH(_ = json::parse(s.begin(), s.end()), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0000 (NUL) must be escaped to \\u0000; last read: '\"<U+0000>'");
-                }
-            }
-
-            SECTION("escaped")
-            {
-                // quotation mark "\""
-                auto r1 = R"("\"")"_json;
-                CHECK(parser_helper("\"\\\"\"") == r1);
-                // reverse solidus "\\"
-                auto r2 = R"("\\")"_json;
-                CHECK(parser_helper("\"\\\\\"") == r2);
-                // solidus
-                CHECK(parser_helper("\"\\/\"") == R"("/")"_json);
-                // backspace
-                CHECK(parser_helper("\"\\b\"") == json("\b"));
-                // formfeed
-                CHECK(parser_helper("\"\\f\"") == json("\f"));
-                // newline
-                CHECK(parser_helper("\"\\n\"") == json("\n"));
-                // carriage return
-                CHECK(parser_helper("\"\\r\"") == json("\r"));
-                // horizontal tab
-                CHECK(parser_helper("\"\\t\"") == json("\t"));
-
-                CHECK(parser_helper("\"\\u0001\"").get<json::string_t>() == "\x01");
-                CHECK(parser_helper("\"\\u000a\"").get<json::string_t>() == "\n");
-                CHECK(parser_helper("\"\\u00b0\"").get<json::string_t>() == "°");
-                CHECK(parser_helper("\"\\u0c00\"").get<json::string_t>() == "à°€");
-                CHECK(parser_helper("\"\\ud000\"").get<json::string_t>() == "퀀");
-                CHECK(parser_helper("\"\\u000E\"").get<json::string_t>() == "\x0E");
-                CHECK(parser_helper("\"\\u00F0\"").get<json::string_t>() == "ð");
-                CHECK(parser_helper("\"\\u0100\"").get<json::string_t>() == "Ä€");
-                CHECK(parser_helper("\"\\u2000\"").get<json::string_t>() == " ");
-                CHECK(parser_helper("\"\\uFFFF\"").get<json::string_t>() == "ï¿¿");
-                CHECK(parser_helper("\"\\u20AC\"").get<json::string_t>() == "€");
-                CHECK(parser_helper("\"€\"").get<json::string_t>() == "€");
-                CHECK(parser_helper("\"🎈\"").get<json::string_t>() == "🎈");
-
-                CHECK(parser_helper("\"\\ud80c\\udc60\"").get<json::string_t>() == "\xf0\x93\x81\xa0");
-                CHECK(parser_helper("\"\\ud83c\\udf1e\"").get<json::string_t>() == "🌞");
-            }
-        }
-
-        SECTION("number")
-        {
-            SECTION("integers")
-            {
-                SECTION("without exponent")
-                {
-                    CHECK(parser_helper("-128") == json(-128));
-                    CHECK(parser_helper("-0") == json(-0));
-                    CHECK(parser_helper("0") == json(0));
-                    CHECK(parser_helper("128") == json(128));
-                }
-
-                SECTION("with exponent")
-                {
-                    CHECK(parser_helper("0e1") == json(0e1));
-                    CHECK(parser_helper("0E1") == json(0e1));
-
-                    CHECK(parser_helper("10000E-4") == json(10000e-4));
-                    CHECK(parser_helper("10000E-3") == json(10000e-3));
-                    CHECK(parser_helper("10000E-2") == json(10000e-2));
-                    CHECK(parser_helper("10000E-1") == json(10000e-1));
-                    CHECK(parser_helper("10000E0") == json(10000e0));
-                    CHECK(parser_helper("10000E1") == json(10000e1));
-                    CHECK(parser_helper("10000E2") == json(10000e2));
-                    CHECK(parser_helper("10000E3") == json(10000e3));
-                    CHECK(parser_helper("10000E4") == json(10000e4));
-
-                    CHECK(parser_helper("10000e-4") == json(10000e-4));
-                    CHECK(parser_helper("10000e-3") == json(10000e-3));
-                    CHECK(parser_helper("10000e-2") == json(10000e-2));
-                    CHECK(parser_helper("10000e-1") == json(10000e-1));
-                    CHECK(parser_helper("10000e0") == json(10000e0));
-                    CHECK(parser_helper("10000e1") == json(10000e1));
-                    CHECK(parser_helper("10000e2") == json(10000e2));
-                    CHECK(parser_helper("10000e3") == json(10000e3));
-                    CHECK(parser_helper("10000e4") == json(10000e4));
-
-                    CHECK(parser_helper("-0e1") == json(-0e1));
-                    CHECK(parser_helper("-0E1") == json(-0e1));
-                    CHECK(parser_helper("-0E123") == json(-0e123));
-
-                    // numbers after exponent
-                    CHECK(parser_helper("10E0") == json(10e0));
-                    CHECK(parser_helper("10E1") == json(10e1));
-                    CHECK(parser_helper("10E2") == json(10e2));
-                    CHECK(parser_helper("10E3") == json(10e3));
-                    CHECK(parser_helper("10E4") == json(10e4));
-                    CHECK(parser_helper("10E5") == json(10e5));
-                    CHECK(parser_helper("10E6") == json(10e6));
-                    CHECK(parser_helper("10E7") == json(10e7));
-                    CHECK(parser_helper("10E8") == json(10e8));
-                    CHECK(parser_helper("10E9") == json(10e9));
-                    CHECK(parser_helper("10E+0") == json(10e0));
-                    CHECK(parser_helper("10E+1") == json(10e1));
-                    CHECK(parser_helper("10E+2") == json(10e2));
-                    CHECK(parser_helper("10E+3") == json(10e3));
-                    CHECK(parser_helper("10E+4") == json(10e4));
-                    CHECK(parser_helper("10E+5") == json(10e5));
-                    CHECK(parser_helper("10E+6") == json(10e6));
-                    CHECK(parser_helper("10E+7") == json(10e7));
-                    CHECK(parser_helper("10E+8") == json(10e8));
-                    CHECK(parser_helper("10E+9") == json(10e9));
-                    CHECK(parser_helper("10E-1") == json(10e-1));
-                    CHECK(parser_helper("10E-2") == json(10e-2));
-                    CHECK(parser_helper("10E-3") == json(10e-3));
-                    CHECK(parser_helper("10E-4") == json(10e-4));
-                    CHECK(parser_helper("10E-5") == json(10e-5));
-                    CHECK(parser_helper("10E-6") == json(10e-6));
-                    CHECK(parser_helper("10E-7") == json(10e-7));
-                    CHECK(parser_helper("10E-8") == json(10e-8));
-                    CHECK(parser_helper("10E-9") == json(10e-9));
-                }
-
-                SECTION("edge cases")
-                {
-                    // From RFC7159, Section 6:
-                    // Note that when such software is used, numbers that are
-                    // integers and are in the range [-(2**53)+1, (2**53)-1]
-                    // are interoperable in the sense that implementations will
-                    // agree exactly on their numeric values.
-
-                    // -(2**53)+1
-                    CHECK(parser_helper("-9007199254740991").get<int64_t>() == -9007199254740991);
-                    // (2**53)-1
-                    CHECK(parser_helper("9007199254740991").get<int64_t>() == 9007199254740991);
-                }
-
-                SECTION("over the edge cases")  // issue #178 - Integer conversion to unsigned (incorrect handling of 64 bit integers)
-                {
-                    // While RFC7159, Section 6 specifies a preference for support
-                    // for ranges in range of IEEE 754-2008 binary64 (double precision)
-                    // this does not accommodate 64 bit integers without loss of accuracy.
-                    // As 64 bit integers are now widely used in software, it is desirable
-                    // to expand support to to the full 64 bit (signed and unsigned) range
-                    // i.e. -(2**63) -> (2**64)-1.
-
-                    // -(2**63)    ** Note: compilers see negative literals as negated positive numbers (hence the -1))
-                    CHECK(parser_helper("-9223372036854775808").get<int64_t>() == -9223372036854775807 - 1);
-                    // (2**63)-1
-                    CHECK(parser_helper("9223372036854775807").get<int64_t>() == 9223372036854775807);
-                    // (2**64)-1
-                    CHECK(parser_helper("18446744073709551615").get<uint64_t>() == 18446744073709551615u);
-                }
-            }
-
-            SECTION("floating-point")
-            {
-                SECTION("without exponent")
-                {
-                    CHECK(parser_helper("-128.5") == json(-128.5));
-                    CHECK(parser_helper("0.999") == json(0.999));
-                    CHECK(parser_helper("128.5") == json(128.5));
-                    CHECK(parser_helper("-0.0") == json(-0.0));
-                }
-
-                SECTION("with exponent")
-                {
-                    CHECK(parser_helper("-128.5E3") == json(-128.5E3));
-                    CHECK(parser_helper("-128.5E-3") == json(-128.5E-3));
-                    CHECK(parser_helper("-0.0e1") == json(-0.0e1));
-                    CHECK(parser_helper("-0.0E1") == json(-0.0e1));
-                }
-            }
-
-            SECTION("overflow")
-            {
-                // overflows during parsing yield an exception
-                CHECK_THROWS_AS(parser_helper("1.18973e+4932") == json(), json::out_of_range&);
-                CHECK_THROWS_WITH(parser_helper("1.18973e+4932") == json(),
-                                  "[json.exception.out_of_range.406] number overflow parsing '1.18973e+4932'");
-            }
-
-            SECTION("invalid numbers")
-            {
-                CHECK_THROWS_AS(parser_helper("01"),      json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("--1"),     json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("1."),      json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("1E"),      json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("1E-"),     json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("1.E1"),    json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("-1E"),     json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("-0E#"),    json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("-0E-#"),   json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("-0#"),     json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("-0.0:"),   json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("-0.0Z"),   json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("-0E123:"), json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("-0e0-:"),  json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("-0e-:"),   json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("-0f"),     json::parse_error&);
-
-                // numbers must not begin with "+"
-                CHECK_THROWS_AS(parser_helper("+1"), json::parse_error&);
-                CHECK_THROWS_AS(parser_helper("+0"), json::parse_error&);
-
-                CHECK_THROWS_WITH(parser_helper("01"),
-                                  "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - unexpected number literal; expected end of input");
-                CHECK_THROWS_WITH(parser_helper("-01"),
-                                  "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - unexpected number literal; expected end of input");
-                CHECK_THROWS_WITH(parser_helper("--1"),
-                                  "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid number; expected digit after '-'; last read: '--'");
-                CHECK_THROWS_WITH(parser_helper("1."),
-                                  "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid number; expected digit after '.'; last read: '1.'");
-                CHECK_THROWS_WITH(parser_helper("1E"),
-                                  "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid number; expected '+', '-', or digit after exponent; last read: '1E'");
-                CHECK_THROWS_WITH(parser_helper("1E-"),
-                                  "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid number; expected digit after exponent sign; last read: '1E-'");
-                CHECK_THROWS_WITH(parser_helper("1.E1"),
-                                  "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid number; expected digit after '.'; last read: '1.E'");
-                CHECK_THROWS_WITH(parser_helper("-1E"),
-                                  "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid number; expected '+', '-', or digit after exponent; last read: '-1E'");
-                CHECK_THROWS_WITH(parser_helper("-0E#"),
-                                  "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid number; expected '+', '-', or digit after exponent; last read: '-0E#'");
-                CHECK_THROWS_WITH(parser_helper("-0E-#"),
-                                  "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error while parsing value - invalid number; expected digit after exponent sign; last read: '-0E-#'");
-                CHECK_THROWS_WITH(parser_helper("-0#"),
-                                  "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid literal; last read: '-0#'; expected end of input");
-                CHECK_THROWS_WITH(parser_helper("-0.0:"),
-                                  "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error while parsing value - unexpected ':'; expected end of input");
-                CHECK_THROWS_WITH(parser_helper("-0.0Z"),
-                                  "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error while parsing value - invalid literal; last read: '-0.0Z'; expected end of input");
-                CHECK_THROWS_WITH(parser_helper("-0E123:"),
-                                  "[json.exception.parse_error.101] parse error at line 1, column 7: syntax error while parsing value - unexpected ':'; expected end of input");
-                CHECK_THROWS_WITH(parser_helper("-0e0-:"),
-                                  "[json.exception.parse_error.101] parse error at line 1, column 6: syntax error while parsing value - invalid number; expected digit after '-'; last read: '-:'; expected end of input");
-                CHECK_THROWS_WITH(parser_helper("-0e-:"),
-                                  "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error while parsing value - invalid number; expected digit after exponent sign; last read: '-0e-:'");
-                CHECK_THROWS_WITH(parser_helper("-0f"),
-                                  "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid literal; last read: '-0f'; expected end of input");
-            }
-        }
-    }
-
-    SECTION("accept")
-    {
-        SECTION("null")
-        {
-            CHECK(accept_helper("null"));
-        }
-
-        SECTION("true")
-        {
-            CHECK(accept_helper("true"));
-        }
-
-        SECTION("false")
-        {
-            CHECK(accept_helper("false"));
-        }
-
-        SECTION("array")
-        {
-            SECTION("empty array")
-            {
-                CHECK(accept_helper("[]"));
-                CHECK(accept_helper("[ ]"));
-            }
-
-            SECTION("nonempty array")
-            {
-                CHECK(accept_helper("[true, false, null]"));
-            }
-        }
-
-        SECTION("object")
-        {
-            SECTION("empty object")
-            {
-                CHECK(accept_helper("{}"));
-                CHECK(accept_helper("{ }"));
-            }
-
-            SECTION("nonempty object")
-            {
-                CHECK(accept_helper("{\"\": true, \"one\": 1, \"two\": null}"));
-            }
-        }
-
-        SECTION("string")
-        {
-            // empty string
-            CHECK(accept_helper("\"\""));
-
-            SECTION("errors")
-            {
-                // error: tab in string
-                CHECK(accept_helper("\"\t\"") == false);
-                // error: newline in string
-                CHECK(accept_helper("\"\n\"") == false);
-                CHECK(accept_helper("\"\r\"") == false);
-                // error: backspace in string
-                CHECK(accept_helper("\"\b\"") == false);
-                // improve code coverage
-                CHECK(accept_helper("\uFF01") == false);
-                CHECK(accept_helper("[-4:1,]") == false);
-                // unescaped control characters
-                CHECK(accept_helper("\"\x00\"") == false);
-                CHECK(accept_helper("\"\x01\"") == false);
-                CHECK(accept_helper("\"\x02\"") == false);
-                CHECK(accept_helper("\"\x03\"") == false);
-                CHECK(accept_helper("\"\x04\"") == false);
-                CHECK(accept_helper("\"\x05\"") == false);
-                CHECK(accept_helper("\"\x06\"") == false);
-                CHECK(accept_helper("\"\x07\"") == false);
-                CHECK(accept_helper("\"\x08\"") == false);
-                CHECK(accept_helper("\"\x09\"") == false);
-                CHECK(accept_helper("\"\x0a\"") == false);
-                CHECK(accept_helper("\"\x0b\"") == false);
-                CHECK(accept_helper("\"\x0c\"") == false);
-                CHECK(accept_helper("\"\x0d\"") == false);
-                CHECK(accept_helper("\"\x0e\"") == false);
-                CHECK(accept_helper("\"\x0f\"") == false);
-                CHECK(accept_helper("\"\x10\"") == false);
-                CHECK(accept_helper("\"\x11\"") == false);
-                CHECK(accept_helper("\"\x12\"") == false);
-                CHECK(accept_helper("\"\x13\"") == false);
-                CHECK(accept_helper("\"\x14\"") == false);
-                CHECK(accept_helper("\"\x15\"") == false);
-                CHECK(accept_helper("\"\x16\"") == false);
-                CHECK(accept_helper("\"\x17\"") == false);
-                CHECK(accept_helper("\"\x18\"") == false);
-                CHECK(accept_helper("\"\x19\"") == false);
-                CHECK(accept_helper("\"\x1a\"") == false);
-                CHECK(accept_helper("\"\x1b\"") == false);
-                CHECK(accept_helper("\"\x1c\"") == false);
-                CHECK(accept_helper("\"\x1d\"") == false);
-                CHECK(accept_helper("\"\x1e\"") == false);
-                CHECK(accept_helper("\"\x1f\"") == false);
-            }
-
-            SECTION("escaped")
-            {
-                // quotation mark "\""
-                auto r1 = R"("\"")"_json;
-                CHECK(accept_helper("\"\\\"\""));
-                // reverse solidus "\\"
-                auto r2 = R"("\\")"_json;
-                CHECK(accept_helper("\"\\\\\""));
-                // solidus
-                CHECK(accept_helper("\"\\/\""));
-                // backspace
-                CHECK(accept_helper("\"\\b\""));
-                // formfeed
-                CHECK(accept_helper("\"\\f\""));
-                // newline
-                CHECK(accept_helper("\"\\n\""));
-                // carriage return
-                CHECK(accept_helper("\"\\r\""));
-                // horizontal tab
-                CHECK(accept_helper("\"\\t\""));
-
-                CHECK(accept_helper("\"\\u0001\""));
-                CHECK(accept_helper("\"\\u000a\""));
-                CHECK(accept_helper("\"\\u00b0\""));
-                CHECK(accept_helper("\"\\u0c00\""));
-                CHECK(accept_helper("\"\\ud000\""));
-                CHECK(accept_helper("\"\\u000E\""));
-                CHECK(accept_helper("\"\\u00F0\""));
-                CHECK(accept_helper("\"\\u0100\""));
-                CHECK(accept_helper("\"\\u2000\""));
-                CHECK(accept_helper("\"\\uFFFF\""));
-                CHECK(accept_helper("\"\\u20AC\""));
-                CHECK(accept_helper("\"€\""));
-                CHECK(accept_helper("\"🎈\""));
-
-                CHECK(accept_helper("\"\\ud80c\\udc60\""));
-                CHECK(accept_helper("\"\\ud83c\\udf1e\""));
-            }
-        }
-
-        SECTION("number")
-        {
-            SECTION("integers")
-            {
-                SECTION("without exponent")
-                {
-                    CHECK(accept_helper("-128"));
-                    CHECK(accept_helper("-0"));
-                    CHECK(accept_helper("0"));
-                    CHECK(accept_helper("128"));
-                }
-
-                SECTION("with exponent")
-                {
-                    CHECK(accept_helper("0e1"));
-                    CHECK(accept_helper("0E1"));
-
-                    CHECK(accept_helper("10000E-4"));
-                    CHECK(accept_helper("10000E-3"));
-                    CHECK(accept_helper("10000E-2"));
-                    CHECK(accept_helper("10000E-1"));
-                    CHECK(accept_helper("10000E0"));
-                    CHECK(accept_helper("10000E1"));
-                    CHECK(accept_helper("10000E2"));
-                    CHECK(accept_helper("10000E3"));
-                    CHECK(accept_helper("10000E4"));
-
-                    CHECK(accept_helper("10000e-4"));
-                    CHECK(accept_helper("10000e-3"));
-                    CHECK(accept_helper("10000e-2"));
-                    CHECK(accept_helper("10000e-1"));
-                    CHECK(accept_helper("10000e0"));
-                    CHECK(accept_helper("10000e1"));
-                    CHECK(accept_helper("10000e2"));
-                    CHECK(accept_helper("10000e3"));
-                    CHECK(accept_helper("10000e4"));
-
-                    CHECK(accept_helper("-0e1"));
-                    CHECK(accept_helper("-0E1"));
-                    CHECK(accept_helper("-0E123"));
-                }
-
-                SECTION("edge cases")
-                {
-                    // From RFC7159, Section 6:
-                    // Note that when such software is used, numbers that are
-                    // integers and are in the range [-(2**53)+1, (2**53)-1]
-                    // are interoperable in the sense that implementations will
-                    // agree exactly on their numeric values.
-
-                    // -(2**53)+1
-                    CHECK(accept_helper("-9007199254740991"));
-                    // (2**53)-1
-                    CHECK(accept_helper("9007199254740991"));
-                }
-
-                SECTION("over the edge cases")  // issue #178 - Integer conversion to unsigned (incorrect handling of 64 bit integers)
-                {
-                    // While RFC7159, Section 6 specifies a preference for support
-                    // for ranges in range of IEEE 754-2008 binary64 (double precision)
-                    // this does not accommodate 64 bit integers without loss of accuracy.
-                    // As 64 bit integers are now widely used in software, it is desirable
-                    // to expand support to to the full 64 bit (signed and unsigned) range
-                    // i.e. -(2**63) -> (2**64)-1.
-
-                    // -(2**63)    ** Note: compilers see negative literals as negated positive numbers (hence the -1))
-                    CHECK(accept_helper("-9223372036854775808"));
-                    // (2**63)-1
-                    CHECK(accept_helper("9223372036854775807"));
-                    // (2**64)-1
-                    CHECK(accept_helper("18446744073709551615"));
-                }
-            }
-
-            SECTION("floating-point")
-            {
-                SECTION("without exponent")
-                {
-                    CHECK(accept_helper("-128.5"));
-                    CHECK(accept_helper("0.999"));
-                    CHECK(accept_helper("128.5"));
-                    CHECK(accept_helper("-0.0"));
-                }
-
-                SECTION("with exponent")
-                {
-                    CHECK(accept_helper("-128.5E3"));
-                    CHECK(accept_helper("-128.5E-3"));
-                    CHECK(accept_helper("-0.0e1"));
-                    CHECK(accept_helper("-0.0E1"));
-                }
-            }
-
-            SECTION("overflow")
-            {
-                // overflows during parsing
-                CHECK(!accept_helper("1.18973e+4932"));
-            }
-
-            SECTION("invalid numbers")
-            {
-                CHECK(accept_helper("01") == false);
-                CHECK(accept_helper("--1") == false);
-                CHECK(accept_helper("1.") == false);
-                CHECK(accept_helper("1E") == false);
-                CHECK(accept_helper("1E-") == false);
-                CHECK(accept_helper("1.E1") == false);
-                CHECK(accept_helper("-1E") == false);
-                CHECK(accept_helper("-0E#") == false);
-                CHECK(accept_helper("-0E-#") == false);
-                CHECK(accept_helper("-0#") == false);
-                CHECK(accept_helper("-0.0:") == false);
-                CHECK(accept_helper("-0.0Z") == false);
-                CHECK(accept_helper("-0E123:") == false);
-                CHECK(accept_helper("-0e0-:") == false);
-                CHECK(accept_helper("-0e-:") == false);
-                CHECK(accept_helper("-0f") == false);
-
-                // numbers must not begin with "+"
-                CHECK(accept_helper("+1") == false);
-                CHECK(accept_helper("+0") == false);
-            }
-        }
-    }
-
-    SECTION("parse errors")
-    {
-        // unexpected end of number
-        CHECK_THROWS_AS(parser_helper("0."),  json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("-"),   json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("--"),  json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("-0."), json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("-."),  json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("-:"),  json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("0.:"), json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("e."),  json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("1e."), json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("1e/"), json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("1e:"), json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("1E."), json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("1E/"), json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("1E:"), json::parse_error&);
-        CHECK_THROWS_WITH(parser_helper("0."),
-                          "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid number; expected digit after '.'; last read: '0.'");
-        CHECK_THROWS_WITH(parser_helper("-"),
-                          "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid number; expected digit after '-'; last read: '-'");
-        CHECK_THROWS_WITH(parser_helper("--"),
-                          "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid number; expected digit after '-'; last read: '--'");
-        CHECK_THROWS_WITH(parser_helper("-0."),
-                          "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid number; expected digit after '.'; last read: '-0.'");
-        CHECK_THROWS_WITH(parser_helper("-."),
-                          "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid number; expected digit after '-'; last read: '-.'");
-        CHECK_THROWS_WITH(parser_helper("-:"),
-                          "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid number; expected digit after '-'; last read: '-:'");
-        CHECK_THROWS_WITH(parser_helper("0.:"),
-                          "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid number; expected digit after '.'; last read: '0.:'");
-        CHECK_THROWS_WITH(parser_helper("e."),
-                          "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error while parsing value - invalid literal; last read: 'e'");
-        CHECK_THROWS_WITH(parser_helper("1e."),
-                          "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid number; expected '+', '-', or digit after exponent; last read: '1e.'");
-        CHECK_THROWS_WITH(parser_helper("1e/"),
-                          "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid number; expected '+', '-', or digit after exponent; last read: '1e/'");
-        CHECK_THROWS_WITH(parser_helper("1e:"),
-                          "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid number; expected '+', '-', or digit after exponent; last read: '1e:'");
-        CHECK_THROWS_WITH(parser_helper("1E."),
-                          "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid number; expected '+', '-', or digit after exponent; last read: '1E.'");
-        CHECK_THROWS_WITH(parser_helper("1E/"),
-                          "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid number; expected '+', '-', or digit after exponent; last read: '1E/'");
-        CHECK_THROWS_WITH(parser_helper("1E:"),
-                          "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid number; expected '+', '-', or digit after exponent; last read: '1E:'");
-
-        // unexpected end of null
-        CHECK_THROWS_AS(parser_helper("n"), json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("nu"), json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("nul"), json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("nulk"), json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("nulm"), json::parse_error&);
-        CHECK_THROWS_WITH(parser_helper("n"),
-                          "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid literal; last read: 'n'");
-        CHECK_THROWS_WITH(parser_helper("nu"),
-                          "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid literal; last read: 'nu'");
-        CHECK_THROWS_WITH(parser_helper("nul"),
-                          "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid literal; last read: 'nul'");
-        CHECK_THROWS_WITH(parser_helper("nulk"),
-                          "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid literal; last read: 'nulk'");
-        CHECK_THROWS_WITH(parser_helper("nulm"),
-                          "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid literal; last read: 'nulm'");
-
-        // unexpected end of true
-        CHECK_THROWS_AS(parser_helper("t"), json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("tr"), json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("tru"), json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("trud"), json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("truf"), json::parse_error&);
-        CHECK_THROWS_WITH(parser_helper("t"),
-                          "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid literal; last read: 't'");
-        CHECK_THROWS_WITH(parser_helper("tr"),
-                          "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid literal; last read: 'tr'");
-        CHECK_THROWS_WITH(parser_helper("tru"),
-                          "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid literal; last read: 'tru'");
-        CHECK_THROWS_WITH(parser_helper("trud"),
-                          "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid literal; last read: 'trud'");
-        CHECK_THROWS_WITH(parser_helper("truf"),
-                          "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid literal; last read: 'truf'");
-
-        // unexpected end of false
-        CHECK_THROWS_AS(parser_helper("f"), json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("fa"), json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("fal"), json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("fals"), json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("falsd"), json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("falsf"), json::parse_error&);
-        CHECK_THROWS_WITH(parser_helper("f"),
-                          "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid literal; last read: 'f'");
-        CHECK_THROWS_WITH(parser_helper("fa"),
-                          "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid literal; last read: 'fa'");
-        CHECK_THROWS_WITH(parser_helper("fal"),
-                          "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid literal; last read: 'fal'");
-        CHECK_THROWS_WITH(parser_helper("fals"),
-                          "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error while parsing value - invalid literal; last read: 'fals'");
-        CHECK_THROWS_WITH(parser_helper("falsd"),
-                          "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error while parsing value - invalid literal; last read: 'falsd'");
-        CHECK_THROWS_WITH(parser_helper("falsf"),
-                          "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error while parsing value - invalid literal; last read: 'falsf'");
-
-        // missing/unexpected end of array
-        CHECK_THROWS_AS(parser_helper("["), json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("[1"), json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("[1,"), json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("[1,]"), json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("]"), json::parse_error&);
-        CHECK_THROWS_WITH(parser_helper("["),
-                          "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - unexpected end of input; expected '[', '{', or a literal");
-        CHECK_THROWS_WITH(parser_helper("[1"),
-                          "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing array - unexpected end of input; expected ']'");
-        CHECK_THROWS_WITH(parser_helper("[1,"),
-                          "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - unexpected end of input; expected '[', '{', or a literal");
-        CHECK_THROWS_WITH(parser_helper("[1,]"),
-                          "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - unexpected ']'; expected '[', '{', or a literal");
-        CHECK_THROWS_WITH(parser_helper("]"),
-                          "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error while parsing value - unexpected ']'; expected '[', '{', or a literal");
-
-        // missing/unexpected end of object
-        CHECK_THROWS_AS(parser_helper("{"), json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("{\"foo\""), json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("{\"foo\":"), json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("{\"foo\":}"), json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("{\"foo\":1,}"), json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("}"), json::parse_error&);
-        CHECK_THROWS_WITH(parser_helper("{"),
-                          "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing object key - unexpected end of input; expected string literal");
-        CHECK_THROWS_WITH(parser_helper("{\"foo\""),
-                          "[json.exception.parse_error.101] parse error at line 1, column 7: syntax error while parsing object separator - unexpected end of input; expected ':'");
-        CHECK_THROWS_WITH(parser_helper("{\"foo\":"),
-                          "[json.exception.parse_error.101] parse error at line 1, column 8: syntax error while parsing value - unexpected end of input; expected '[', '{', or a literal");
-        CHECK_THROWS_WITH(parser_helper("{\"foo\":}"),
-                          "[json.exception.parse_error.101] parse error at line 1, column 8: syntax error while parsing value - unexpected '}'; expected '[', '{', or a literal");
-        CHECK_THROWS_WITH(parser_helper("{\"foo\":1,}"),
-                          "[json.exception.parse_error.101] parse error at line 1, column 10: syntax error while parsing object key - unexpected '}'; expected string literal");
-        CHECK_THROWS_WITH(parser_helper("}"),
-                          "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error while parsing value - unexpected '}'; expected '[', '{', or a literal");
-
-        // missing/unexpected end of string
-        CHECK_THROWS_AS(parser_helper("\""), json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("\"\\\""), json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("\"\\u\""), json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("\"\\u0\""), json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("\"\\u01\""), json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("\"\\u012\""), json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("\"\\u"), json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("\"\\u0"), json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("\"\\u01"), json::parse_error&);
-        CHECK_THROWS_AS(parser_helper("\"\\u012"), json::parse_error&);
-        CHECK_THROWS_WITH(parser_helper("\""),
-                          "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: missing closing quote; last read: '\"'");
-        CHECK_THROWS_WITH(parser_helper("\"\\\""),
-                          "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid string: missing closing quote; last read: '\"\\\"'");
-        CHECK_THROWS_WITH(parser_helper("\"\\u\""),
-                          "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u\"'");
-        CHECK_THROWS_WITH(parser_helper("\"\\u0\""),
-                          "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error while parsing value - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u0\"'");
-        CHECK_THROWS_WITH(parser_helper("\"\\u01\""),
-                          "[json.exception.parse_error.101] parse error at line 1, column 6: syntax error while parsing value - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u01\"'");
-        CHECK_THROWS_WITH(parser_helper("\"\\u012\""),
-                          "[json.exception.parse_error.101] parse error at line 1, column 7: syntax error while parsing value - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u012\"'");
-        CHECK_THROWS_WITH(parser_helper("\"\\u"),
-                          "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u'");
-        CHECK_THROWS_WITH(parser_helper("\"\\u0"),
-                          "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error while parsing value - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u0'");
-        CHECK_THROWS_WITH(parser_helper("\"\\u01"),
-                          "[json.exception.parse_error.101] parse error at line 1, column 6: syntax error while parsing value - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u01'");
-        CHECK_THROWS_WITH(parser_helper("\"\\u012"),
-                          "[json.exception.parse_error.101] parse error at line 1, column 7: syntax error while parsing value - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u012'");
-
-        // invalid escapes
-        for (int c = 1; c < 128; ++c)
-        {
-            auto s = std::string("\"\\") + std::string(1, static_cast<char>(c)) + "\"";
-
-            switch (c)
-            {
-                // valid escapes
-                case ('"'):
-                case ('\\'):
-                case ('/'):
-                case ('b'):
-                case ('f'):
-                case ('n'):
-                case ('r'):
-                case ('t'):
-                {
-                    CHECK_NOTHROW(parser_helper(s.c_str()));
-                    break;
-                }
-
-                // \u must be followed with four numbers, so we skip it here
-                case ('u'):
-                {
-                    break;
-                }
-
-                // any other combination of backslash and character is invalid
-                default:
-                {
-                    CHECK_THROWS_AS(parser_helper(s.c_str()), json::parse_error&);
-                    // only check error message if c is not a control character
-                    if (c > 0x1f)
-                    {
-                        CHECK_THROWS_WITH_STD_STR(parser_helper(s.c_str()),
-                                                  "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid string: forbidden character after backslash; last read: '\"\\" + std::string(1, static_cast<char>(c)) + "'");
-                    }
-                    break;
-                }
-            }
-        }
-
-        // invalid \uxxxx escapes
-        {
-            // check whether character is a valid hex character
-            const auto valid = [](int c)
-            {
-                switch (c)
-                {
-                    case ('0'):
-                    case ('1'):
-                    case ('2'):
-                    case ('3'):
-                    case ('4'):
-                    case ('5'):
-                    case ('6'):
-                    case ('7'):
-                    case ('8'):
-                    case ('9'):
-                    case ('a'):
-                    case ('b'):
-                    case ('c'):
-                    case ('d'):
-                    case ('e'):
-                    case ('f'):
-                    case ('A'):
-                    case ('B'):
-                    case ('C'):
-                    case ('D'):
-                    case ('E'):
-                    case ('F'):
-                    {
-                        return true;
-                    }
-
-                    default:
-                    {
-                        return false;
-                    }
-                }
-            };
-
-            for (int c = 1; c < 128; ++c)
-            {
-                std::string s = "\"\\u";
-
-                // create a string with the iterated character at each position
-                auto s1 = s + "000" + std::string(1, static_cast<char>(c)) + "\"";
-                auto s2 = s + "00" + std::string(1, static_cast<char>(c)) + "0\"";
-                auto s3 = s + "0" + std::string(1, static_cast<char>(c)) + "00\"";
-                auto s4 = s + std::string(1, static_cast<char>(c)) + "000\"";
-
-                if (valid(c))
-                {
-                    CAPTURE(s1)
-                    CHECK_NOTHROW(parser_helper(s1.c_str()));
-                    CAPTURE(s2)
-                    CHECK_NOTHROW(parser_helper(s2.c_str()));
-                    CAPTURE(s3)
-                    CHECK_NOTHROW(parser_helper(s3.c_str()));
-                    CAPTURE(s4)
-                    CHECK_NOTHROW(parser_helper(s4.c_str()));
-                }
-                else
-                {
-                    CAPTURE(s1)
-                    CHECK_THROWS_AS(parser_helper(s1.c_str()), json::parse_error&);
-                    // only check error message if c is not a control character
-                    if (c > 0x1f)
-                    {
-                        CHECK_THROWS_WITH_STD_STR(parser_helper(s1.c_str()),
-                                                  "[json.exception.parse_error.101] parse error at line 1, column 7: syntax error while parsing value - invalid string: '\\u' must be followed by 4 hex digits; last read: '" + s1.substr(0, 7) + "'");
-                    }
-
-                    CAPTURE(s2)
-                    CHECK_THROWS_AS(parser_helper(s2.c_str()), json::parse_error&);
-                    // only check error message if c is not a control character
-                    if (c > 0x1f)
-                    {
-                        CHECK_THROWS_WITH_STD_STR(parser_helper(s2.c_str()),
-                                                  "[json.exception.parse_error.101] parse error at line 1, column 6: syntax error while parsing value - invalid string: '\\u' must be followed by 4 hex digits; last read: '" + s2.substr(0, 6) + "'");
-                    }
-
-                    CAPTURE(s3)
-                    CHECK_THROWS_AS(parser_helper(s3.c_str()), json::parse_error&);
-                    // only check error message if c is not a control character
-                    if (c > 0x1f)
-                    {
-                        CHECK_THROWS_WITH_STD_STR(parser_helper(s3.c_str()),
-                                                  "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error while parsing value - invalid string: '\\u' must be followed by 4 hex digits; last read: '" + s3.substr(0, 5) + "'");
-                    }
-
-                    CAPTURE(s4)
-                    CHECK_THROWS_AS(parser_helper(s4.c_str()), json::parse_error&);
-                    // only check error message if c is not a control character
-                    if (c > 0x1f)
-                    {
-                        CHECK_THROWS_WITH_STD_STR(parser_helper(s4.c_str()),
-                                                  "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid string: '\\u' must be followed by 4 hex digits; last read: '" + s4.substr(0, 4) + "'");
-                    }
-                }
-            }
-        }
-
-        json _;
-
-        // missing part of a surrogate pair
-        CHECK_THROWS_AS(_ = json::parse("\"\\uD80C\""), json::parse_error&);
-        CHECK_THROWS_WITH(_ = json::parse("\"\\uD80C\""),
-                          "[json.exception.parse_error.101] parse error at line 1, column 8: syntax error while parsing value - invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD80C\"'");
-        // invalid surrogate pair
-        CHECK_THROWS_AS(_ = json::parse("\"\\uD80C\\uD80C\""), json::parse_error&);
-        CHECK_THROWS_AS(_ = json::parse("\"\\uD80C\\u0000\""), json::parse_error&);
-        CHECK_THROWS_AS(_ = json::parse("\"\\uD80C\\uFFFF\""), json::parse_error&);
-        CHECK_THROWS_WITH(_ = json::parse("\"\\uD80C\\uD80C\""),
-                          "[json.exception.parse_error.101] parse error at line 1, column 13: syntax error while parsing value - invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD80C\\uD80C'");
-        CHECK_THROWS_WITH(_ = json::parse("\"\\uD80C\\u0000\""),
-                          "[json.exception.parse_error.101] parse error at line 1, column 13: syntax error while parsing value - invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD80C\\u0000'");
-        CHECK_THROWS_WITH(_ = json::parse("\"\\uD80C\\uFFFF\""),
-                          "[json.exception.parse_error.101] parse error at line 1, column 13: syntax error while parsing value - invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD80C\\uFFFF'");
-    }
-
-    SECTION("parse errors (accept)")
-    {
-        // unexpected end of number
-        CHECK(accept_helper("0.") == false);
-        CHECK(accept_helper("-") == false);
-        CHECK(accept_helper("--") == false);
-        CHECK(accept_helper("-0.") == false);
-        CHECK(accept_helper("-.") == false);
-        CHECK(accept_helper("-:") == false);
-        CHECK(accept_helper("0.:") == false);
-        CHECK(accept_helper("e.") == false);
-        CHECK(accept_helper("1e.") == false);
-        CHECK(accept_helper("1e/") == false);
-        CHECK(accept_helper("1e:") == false);
-        CHECK(accept_helper("1E.") == false);
-        CHECK(accept_helper("1E/") == false);
-        CHECK(accept_helper("1E:") == false);
-
-        // unexpected end of null
-        CHECK(accept_helper("n") == false);
-        CHECK(accept_helper("nu") == false);
-        CHECK(accept_helper("nul") == false);
-
-        // unexpected end of true
-        CHECK(accept_helper("t") == false);
-        CHECK(accept_helper("tr") == false);
-        CHECK(accept_helper("tru") == false);
-
-        // unexpected end of false
-        CHECK(accept_helper("f") == false);
-        CHECK(accept_helper("fa") == false);
-        CHECK(accept_helper("fal") == false);
-        CHECK(accept_helper("fals") == false);
-
-        // missing/unexpected end of array
-        CHECK(accept_helper("[") == false);
-        CHECK(accept_helper("[1") == false);
-        CHECK(accept_helper("[1,") == false);
-        CHECK(accept_helper("[1,]") == false);
-        CHECK(accept_helper("]") == false);
-
-        // missing/unexpected end of object
-        CHECK(accept_helper("{") == false);
-        CHECK(accept_helper("{\"foo\"") == false);
-        CHECK(accept_helper("{\"foo\":") == false);
-        CHECK(accept_helper("{\"foo\":}") == false);
-        CHECK(accept_helper("{\"foo\":1,}") == false);
-        CHECK(accept_helper("}") == false);
-
-        // missing/unexpected end of string
-        CHECK(accept_helper("\"") == false);
-        CHECK(accept_helper("\"\\\"") == false);
-        CHECK(accept_helper("\"\\u\"") == false);
-        CHECK(accept_helper("\"\\u0\"") == false);
-        CHECK(accept_helper("\"\\u01\"") == false);
-        CHECK(accept_helper("\"\\u012\"") == false);
-        CHECK(accept_helper("\"\\u") == false);
-        CHECK(accept_helper("\"\\u0") == false);
-        CHECK(accept_helper("\"\\u01") == false);
-        CHECK(accept_helper("\"\\u012") == false);
-
-        // unget of newline
-        CHECK(parser_helper("\n123\n") == 123);
-
-        // invalid escapes
-        for (int c = 1; c < 128; ++c)
-        {
-            auto s = std::string("\"\\") + std::string(1, static_cast<char>(c)) + "\"";
-
-            switch (c)
-            {
-                // valid escapes
-                case ('"'):
-                case ('\\'):
-                case ('/'):
-                case ('b'):
-                case ('f'):
-                case ('n'):
-                case ('r'):
-                case ('t'):
-                {
-                    CHECK(json::parser(nlohmann::detail::input_adapter(std::string(s.c_str()))).accept());
-                    break;
-                }
-
-                // \u must be followed with four numbers, so we skip it here
-                case ('u'):
-                {
-                    break;
-                }
-
-                // any other combination of backslash and character is invalid
-                default:
-                {
-                    CHECK(json::parser(nlohmann::detail::input_adapter(std::string(s.c_str()))).accept() == false);
-                    break;
-                }
-            }
-        }
-
-        // invalid \uxxxx escapes
-        {
-            // check whether character is a valid hex character
-            const auto valid = [](int c)
-            {
-                switch (c)
-                {
-                    case ('0'):
-                    case ('1'):
-                    case ('2'):
-                    case ('3'):
-                    case ('4'):
-                    case ('5'):
-                    case ('6'):
-                    case ('7'):
-                    case ('8'):
-                    case ('9'):
-                    case ('a'):
-                    case ('b'):
-                    case ('c'):
-                    case ('d'):
-                    case ('e'):
-                    case ('f'):
-                    case ('A'):
-                    case ('B'):
-                    case ('C'):
-                    case ('D'):
-                    case ('E'):
-                    case ('F'):
-                    {
-                        return true;
-                    }
-
-                    default:
-                    {
-                        return false;
-                    }
-                }
-            };
-
-            for (int c = 1; c < 128; ++c)
-            {
-                std::string s = "\"\\u";
-
-                // create a string with the iterated character at each position
-                auto s1 = s + "000" + std::string(1, static_cast<char>(c)) + "\"";
-                auto s2 = s + "00" + std::string(1, static_cast<char>(c)) + "0\"";
-                auto s3 = s + "0" + std::string(1, static_cast<char>(c)) + "00\"";
-                auto s4 = s + std::string(1, static_cast<char>(c)) + "000\"";
-
-                if (valid(c))
-                {
-                    CAPTURE(s1)
-                    CHECK(json::parser(nlohmann::detail::input_adapter(std::string(s1.c_str()))).accept());
-                    CAPTURE(s2)
-                    CHECK(json::parser(nlohmann::detail::input_adapter(std::string(s2.c_str()))).accept());
-                    CAPTURE(s3)
-                    CHECK(json::parser(nlohmann::detail::input_adapter(std::string(s3.c_str()))).accept());
-                    CAPTURE(s4)
-                    CHECK(json::parser(nlohmann::detail::input_adapter(std::string(s4.c_str()))).accept());
-                }
-                else
-                {
-                    CAPTURE(s1)
-                    CHECK(json::parser(nlohmann::detail::input_adapter(std::string(s1.c_str()))).accept() == false);
-
-                    CAPTURE(s2)
-                    CHECK(json::parser(nlohmann::detail::input_adapter(std::string(s2.c_str()))).accept() == false);
-
-                    CAPTURE(s3)
-                    CHECK(json::parser(nlohmann::detail::input_adapter(std::string(s3.c_str()))).accept() == false);
-
-                    CAPTURE(s4)
-                    CHECK(json::parser(nlohmann::detail::input_adapter(std::string(s4.c_str()))).accept() == false);
-                }
-            }
-        }
-
-        // missing part of a surrogate pair
-        CHECK(accept_helper("\"\\uD80C\"") == false);
-        // invalid surrogate pair
-        CHECK(accept_helper("\"\\uD80C\\uD80C\"") == false);
-        CHECK(accept_helper("\"\\uD80C\\u0000\"") == false);
-        CHECK(accept_helper("\"\\uD80C\\uFFFF\"") == false);
-    }
-
-    SECTION("tests found by mutate++")
-    {
-        // test case to make sure no comma precedes the first key
-        CHECK_THROWS_AS(parser_helper("{,\"key\": false}"), json::parse_error&);
-        CHECK_THROWS_WITH(parser_helper("{,\"key\": false}"),
-                          "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing object key - unexpected ','; expected string literal");
-        // test case to make sure an object is properly closed
-        CHECK_THROWS_AS(parser_helper("[{\"key\": false true]"), json::parse_error&);
-        CHECK_THROWS_WITH(parser_helper("[{\"key\": false true]"),
-                          "[json.exception.parse_error.101] parse error at line 1, column 19: syntax error while parsing object - unexpected true literal; expected '}'");
-
-        // test case to make sure the callback is properly evaluated after reading a key
-        {
-            json::parser_callback_t cb = [](int, json::parse_event_t event, json&)
-            {
-                if (event == json::parse_event_t::key)
-                {
-                    return false;
-                }
-                else
-                {
-                    return true;
-                }
-            };
-
-            json x = json::parse("{\"key\": false}", cb);
-            CHECK(x == json::object());
-        }
-    }
-
-    SECTION("callback function")
-    {
-        auto s_object = R"(
-            {
-                "foo": 2,
-                "bar": {
-                    "baz": 1
-                }
-            }
-        )";
-
-        auto s_array = R"(
-            [1,2,[3,4,5],4,5]
-        )";
-
-        auto structured_array = R"(
-            [
-                1,
-                {
-                     "foo": "bar"
-                },
-                {
-                     "qux": "baz"
-                }
-            ]
-        )";
-
-        SECTION("filter nothing")
-        {
-            json j_object = json::parse(s_object, [](int, json::parse_event_t, const json&)
-            {
-                return true;
-            });
-
-            CHECK (j_object == json({{"foo", 2}, {"bar", {{"baz", 1}}}}));
-
-            json j_array = json::parse(s_array, [](int, json::parse_event_t, const json&)
-            {
-                return true;
-            });
-
-            CHECK (j_array == json({1, 2, {3, 4, 5}, 4, 5}));
-        }
-
-        SECTION("filter everything")
-        {
-            json j_object = json::parse(s_object, [](int, json::parse_event_t, const json&)
-            {
-                return false;
-            });
-
-            // the top-level object will be discarded, leaving a null
-            CHECK (j_object.is_null());
-
-            json j_array = json::parse(s_array, [](int, json::parse_event_t, const json&)
-            {
-                return false;
-            });
-
-            // the top-level array will be discarded, leaving a null
-            CHECK (j_array.is_null());
-        }
-
-        SECTION("filter specific element")
-        {
-            json j_object = json::parse(s_object, [](int, json::parse_event_t, const json & j)
-            {
-                // filter all number(2) elements
-                if (j == json(2))
-                {
-                    return false;
-                }
-                else
-                {
-                    return true;
-                }
-            });
-
-            CHECK (j_object == json({{"bar", {{"baz", 1}}}}));
-
-            json j_array = json::parse(s_array, [](int, json::parse_event_t, const json & j)
-            {
-                if (j == json(2))
-                {
-                    return false;
-                }
-                else
-                {
-                    return true;
-                }
-            });
-
-            CHECK (j_array == json({1, {3, 4, 5}, 4, 5}));
-        }
-
-        SECTION("filter object in array")
-        {
-            json j_filtered1 = json::parse(structured_array, [](int, json::parse_event_t e, const json & parsed)
-            {
-                if (e == json::parse_event_t::object_end && parsed.contains("foo"))
-                {
-                    return false;
-                }
-                else
-                {
-                    return true;
-                }
-            });
-
-            // the specified object will be discarded, and removed.
-            CHECK (j_filtered1.size() == 2);
-            CHECK (j_filtered1 == json({1, {{"qux", "baz"}}}));
-
-            json j_filtered2 = json::parse(structured_array, [](int, json::parse_event_t e, const json& /*parsed*/)
-            {
-                if (e == json::parse_event_t::object_end)
-                {
-                    return false;
-                }
-                else
-                {
-                    return true;
-                }
-            });
-
-            // removed all objects in array.
-            CHECK (j_filtered2.size() == 1);
-            CHECK (j_filtered2 == json({1}));
-        }
-
-        SECTION("filter specific events")
-        {
-            SECTION("first closing event")
-            {
-                {
-                    json j_object = json::parse(s_object, [](int, json::parse_event_t e, const json&)
-                    {
-                        static bool first = true;
-                        if (e == json::parse_event_t::object_end && first)
-                        {
-                            first = false;
-                            return false;
-                        }
-                        else
-                        {
-                            return true;
-                        }
-                    });
-
-                    // the first completed object will be discarded
-                    CHECK (j_object == json({{"foo", 2}}));
-                }
-
-                {
-                    json j_array = json::parse(s_array, [](int, json::parse_event_t e, const json&)
-                    {
-                        static bool first = true;
-                        if (e == json::parse_event_t::array_end && first)
-                        {
-                            first = false;
-                            return false;
-                        }
-                        else
-                        {
-                            return true;
-                        }
-                    });
-
-                    // the first completed array will be discarded
-                    CHECK (j_array == json({1, 2, 4, 5}));
-                }
-            }
-        }
-
-        SECTION("special cases")
-        {
-            // the following test cases cover the situation in which an empty
-            // object and array is discarded only after the closing character
-            // has been read
-
-            json j_empty_object = json::parse("{}", [](int, json::parse_event_t e, const json&)
-            {
-                if (e == json::parse_event_t::object_end)
-                {
-                    return false;
-                }
-                else
-                {
-                    return true;
-                }
-            });
-            CHECK(j_empty_object == json());
-
-            json j_empty_array = json::parse("[]", [](int, json::parse_event_t e, const json&)
-            {
-                if (e == json::parse_event_t::array_end)
-                {
-                    return false;
-                }
-                else
-                {
-                    return true;
-                }
-            });
-            CHECK(j_empty_array == json());
-        }
-    }
-
-    SECTION("constructing from contiguous containers")
-    {
-        SECTION("from std::vector")
-        {
-            std::vector<uint8_t> v = {'t', 'r', 'u', 'e'};
-            json j;
-            json::parser(nlohmann::detail::input_adapter(std::begin(v), std::end(v))).parse(true, j);
-            CHECK(j == json(true));
-        }
-
-        SECTION("from std::array")
-        {
-            std::array<uint8_t, 5> v { {'t', 'r', 'u', 'e'} };
-            json j;
-            json::parser(nlohmann::detail::input_adapter(std::begin(v), std::end(v))).parse(true, j);
-            CHECK(j == json(true));
-        }
-
-        SECTION("from array")
-        {
-            uint8_t v[] = {'t', 'r', 'u', 'e'};
-            json j;
-            json::parser(nlohmann::detail::input_adapter(std::begin(v), std::end(v))).parse(true, j);
-            CHECK(j == json(true));
-        }
-
-        SECTION("from char literal")
-        {
-            CHECK(parser_helper("true") == json(true));
-        }
-
-        SECTION("from std::string")
-        {
-            std::string v = {'t', 'r', 'u', 'e'};
-            json j;
-            json::parser(nlohmann::detail::input_adapter(std::begin(v), std::end(v))).parse(true, j);
-            CHECK(j == json(true));
-        }
-
-        SECTION("from std::initializer_list")
-        {
-            std::initializer_list<uint8_t> v = {'t', 'r', 'u', 'e'};
-            json j;
-            json::parser(nlohmann::detail::input_adapter(std::begin(v), std::end(v))).parse(true, j);
-            CHECK(j == json(true));
-        }
-
-        SECTION("from std::valarray")
-        {
-            std::valarray<uint8_t> v = {'t', 'r', 'u', 'e'};
-            json j;
-            json::parser(nlohmann::detail::input_adapter(std::begin(v), std::end(v))).parse(true, j);
-            CHECK(j == json(true));
-        }
-    }
-
-    SECTION("improve test coverage")
-    {
-        SECTION("parser with callback")
-        {
-            json::parser_callback_t cb = [](int, json::parse_event_t, json&)
-            {
-                return true;
-            };
-
-            CHECK(json::parse("{\"foo\": true:", cb, false).is_discarded());
-
-            json _;
-            CHECK_THROWS_AS(_ = json::parse("{\"foo\": true:", cb), json::parse_error&);
-            CHECK_THROWS_WITH(_ = json::parse("{\"foo\": true:", cb),
-                              "[json.exception.parse_error.101] parse error at line 1, column 13: syntax error while parsing object - unexpected ':'; expected '}'");
-
-            CHECK_THROWS_AS(_ = json::parse("1.18973e+4932", cb), json::out_of_range&);
-            CHECK_THROWS_WITH(_ = json::parse("1.18973e+4932", cb),
-                              "[json.exception.out_of_range.406] number overflow parsing '1.18973e+4932'");
-        }
-
-        SECTION("SAX parser")
-        {
-            SECTION("} without value")
-            {
-                SaxCountdown s(1);
-                CHECK(json::sax_parse("{}", &s) == false);
-            }
-
-            SECTION("} with value")
-            {
-                SaxCountdown s(3);
-                CHECK(json::sax_parse("{\"k1\": true}", &s) == false);
-            }
-
-            SECTION("second key")
-            {
-                SaxCountdown s(3);
-                CHECK(json::sax_parse("{\"k1\": true, \"k2\": false}", &s) == false);
-            }
-
-            SECTION("] without value")
-            {
-                SaxCountdown s(1);
-                CHECK(json::sax_parse("[]", &s) == false);
-            }
-
-            SECTION("] with value")
-            {
-                SaxCountdown s(2);
-                CHECK(json::sax_parse("[1]", &s) == false);
-            }
-
-            SECTION("float")
-            {
-                SaxCountdown s(0);
-                CHECK(json::sax_parse("3.14", &s) == false);
-            }
-
-            SECTION("false")
-            {
-                SaxCountdown s(0);
-                CHECK(json::sax_parse("false", &s) == false);
-            }
-
-            SECTION("null")
-            {
-                SaxCountdown s(0);
-                CHECK(json::sax_parse("null", &s) == false);
-            }
-
-            SECTION("true")
-            {
-                SaxCountdown s(0);
-                CHECK(json::sax_parse("true", &s) == false);
-            }
-
-            SECTION("unsigned")
-            {
-                SaxCountdown s(0);
-                CHECK(json::sax_parse("12", &s) == false);
-            }
-
-            SECTION("integer")
-            {
-                SaxCountdown s(0);
-                CHECK(json::sax_parse("-12", &s) == false);
-            }
-
-            SECTION("string")
-            {
-                SaxCountdown s(0);
-                CHECK(json::sax_parse("\"foo\"", &s) == false);
-            }
-        }
-    }
-
-    SECTION("error messages for comments")
-    {
-        json _;
-        CHECK_THROWS_WITH_AS(_ = json::parse("/a", nullptr, true, true), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid comment; expecting '/' or '*' after '/'; last read: '/a'", json::parse_error);
-        CHECK_THROWS_WITH_AS(_ = json::parse("/*", nullptr, true, true), "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid comment; missing closing '*/'; last read: '/*<U+0000>'", json::parse_error);
-    }
-}
diff --git a/external_imported/json/test/src/unit-comparison.cpp b/external_imported/json/test/src/unit-comparison.cpp
deleted file mode 100644
index e375feca4..000000000
--- a/external_imported/json/test/src/unit-comparison.cpp
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include "doctest_compatibility.h"
-
-#include <nlohmann/json.hpp>
-using nlohmann::json;
-
-namespace
-{
-// helper function to check std::less<json::value_t>
-// see https://en.cppreference.com/w/cpp/utility/functional/less
-template <typename A, typename B, typename U = std::less<json::value_t>>
-bool f(A a, B b, U u = U())
-{
-    return u(a, b);
-}
-}
-
-TEST_CASE("lexicographical comparison operators")
-{
-    SECTION("types")
-    {
-        std::vector<json::value_t> j_types =
-        {
-            json::value_t::null,
-            json::value_t::boolean,
-            json::value_t::number_integer,
-            json::value_t::number_unsigned,
-            json::value_t::number_float,
-            json::value_t::object,
-            json::value_t::array,
-            json::value_t::string,
-            json::value_t::binary
-        };
-
-        SECTION("comparison: less")
-        {
-            std::vector<std::vector<bool>> expected =
-            {
-                {false, true, true, true, true, true, true, true, true},
-                {false, false, true, true, true, true, true, true, true},
-                {false, false, false, false, false, true, true, true, true},
-                {false, false, false, false, false, true, true, true, true},
-                {false, false, false, false, false, true, true, true, true},
-                {false, false, false, false, false, false, true, true, true},
-                {false, false, false, false, false, false, false, true, true},
-                {false, false, false, false, false, false, false, false, true},
-                {false, false, false, false, false, false, false, false, false}
-            };
-
-            for (size_t i = 0; i < j_types.size(); ++i)
-            {
-                for (size_t j = 0; j < j_types.size(); ++j)
-                {
-                    CAPTURE(i)
-                    CAPTURE(j)
-                    // check precomputed values
-                    CHECK(operator<(j_types[i], j_types[j]) == expected[i][j]);
-                    CHECK(f(j_types[i], j_types[j]) == expected[i][j]);
-                }
-            }
-        }
-    }
-
-    SECTION("values")
-    {
-        json j_values =
-        {
-            nullptr, nullptr,
-            -17, 42,
-            8u, 13u,
-            3.14159, 23.42,
-            "foo", "bar",
-            true, false,
-            {1, 2, 3}, {"one", "two", "three"},
-            {{"first", 1}, {"second", 2}}, {{"a", "A"}, {"b", {"B"}}},
-            json::binary({1, 2, 3}), json::binary({1, 2, 4})
-        };
-
-        SECTION("comparison: equal")
-        {
-            std::vector<std::vector<bool>> expected =
-            {
-                {true, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},
-                {true, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},
-                {false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},
-                {false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false},
-                {false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false},
-                {false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false},
-                {false, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false},
-                {false, false, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false},
-                {false, false, false, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false},
-                {false, false, false, false, false, false, false, false, false, true, false, false, false, false, false, false, false, false},
-                {false, false, false, false, false, false, false, false, false, false, true, false, false, false, false, false, false, false},
-                {false, false, false, false, false, false, false, false, false, false, false, true, false, false, false, false, false, false},
-                {false, false, false, false, false, false, false, false, false, false, false, false, true, false, false, false, false, false},
-                {false, false, false, false, false, false, false, false, false, false, false, false, false, true, false, false, false, false},
-                {false, false, false, false, false, false, false, false, false, false, false, false, false, false, true, false, false, false},
-                {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, true, false, false},
-                {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, true, false},
-                {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, true}
-            };
-
-            for (size_t i = 0; i < j_values.size(); ++i)
-            {
-                for (size_t j = 0; j < j_values.size(); ++j)
-                {
-                    CAPTURE(i)
-                    CAPTURE(j)
-                    CAPTURE(j_values[i])
-                    CAPTURE(j_values[j])
-                    // check precomputed values
-                    CHECK( (j_values[i] == j_values[j]) == expected[i][j] );
-                }
-            }
-
-            // comparison with discarded elements
-            json j_discarded(json::value_t::discarded);
-            for (size_t i = 0; i < j_values.size(); ++i)
-            {
-                CHECK( (j_values[i] == j_discarded) == false);
-                CHECK( (j_discarded == j_values[i]) == false);
-                CHECK( (j_discarded == j_discarded) == false);
-            }
-
-            // compare with null pointer
-            json j_null;
-            CHECK(j_null == nullptr);
-            CHECK(nullptr == j_null);
-        }
-
-        SECTION("comparison: not equal")
-        {
-            for (size_t i = 0; i < j_values.size(); ++i)
-            {
-                for (size_t j = 0; j < j_values.size(); ++j)
-                {
-                    CAPTURE(i)
-                    CAPTURE(j)
-                    // check definition
-                    CHECK( (j_values[i] != j_values[j]) == !(j_values[i] == j_values[j]) );
-                }
-            }
-
-            // compare with null pointer
-            json j_null;
-            CHECK( (j_null != nullptr) == false);
-            CHECK( (nullptr != j_null) == false);
-            CHECK( (j_null != nullptr) == !(j_null == nullptr));
-            CHECK( (nullptr != j_null) == !(nullptr == j_null));
-        }
-
-        SECTION("comparison: less")
-        {
-            std::vector<std::vector<bool>> expected =
-            {
-                {false, false, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true},
-                {false, false, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true},
-                {false, false, false, true, true, true, true, true, true, true, false, false, true, true, true, true, true, true},
-                {false, false, false, false, false, false, false, false, true, true, false, false, true, true, true, true, true, true},
-                {false, false, false, true, false, true, false, true, true, true, false, false, true, true, true, true, true, true},
-                {false, false, false, true, false, false, false, true, true, true, false, false, true, true, true, true, true, true},
-                {false, false, false, true, true, true, false, true, true, true, false, false, true, true, true, true, true, true},
-                {false, false, false, true, false, false, false, false, true, true, false, false, true, true, true, true, true, true},
-                {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, true, true},
-                {false, false, false, false, false, false, false, false, true, false, false, false, false, false, false, false, true, true},
-                {false, false, true, true, true, true, true, true, true, true, false, false, true, true, true, true, true, true},
-                {false, false, true, true, true, true, true, true, true, true, true, false, true, true, true, true, true, true},
-                {false, false, false, false, false, false, false, false, true, true, false, false, false, true, false, false, true, true},
-                {false, false, false, false, false, false, false, false, true, true, false, false, false, false, false, false, true, true},
-                {false, false, false, false, false, false, false, false, true, true, false, false, true, true, false, false, true, true},
-                {false, false, false, false, false, false, false, false, true, true, false, false, true, true, true, false, true, true},
-                {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, true},
-                {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false}
-            };
-
-            for (size_t i = 0; i < j_values.size(); ++i)
-            {
-                for (size_t j = 0; j < j_values.size(); ++j)
-                {
-                    CAPTURE(i)
-                    CAPTURE(j)
-                    CAPTURE(j_values[i])
-                    CAPTURE(j_values[j])
-                    // check precomputed values
-                    CHECK( (j_values[i] < j_values[j]) == expected[i][j] );
-                }
-            }
-
-            // comparison with discarded elements
-            json j_discarded(json::value_t::discarded);
-            for (size_t i = 0; i < j_values.size(); ++i)
-            {
-                CAPTURE(i)
-                CHECK( (j_values[i] < j_discarded) == false);
-                CHECK( (j_discarded < j_values[i]) == false);
-                CHECK( (j_discarded < j_discarded) == false);
-            }
-        }
-
-        SECTION("comparison: less than or equal equal")
-        {
-            for (size_t i = 0; i < j_values.size(); ++i)
-            {
-                for (size_t j = 0; j < j_values.size(); ++j)
-                {
-                    CAPTURE(i)
-                    CAPTURE(j)
-                    // check definition
-                    CHECK( (j_values[i] <= j_values[j]) == !(j_values[j] < j_values[i]) );
-                }
-            }
-        }
-
-        SECTION("comparison: greater than")
-        {
-            for (size_t i = 0; i < j_values.size(); ++i)
-            {
-                for (size_t j = 0; j < j_values.size(); ++j)
-                {
-                    CAPTURE(i)
-                    CAPTURE(j)
-                    // check definition
-                    CHECK( (j_values[i] > j_values[j]) == (j_values[j] < j_values[i]) );
-                }
-            }
-        }
-
-        SECTION("comparison: greater than or equal")
-        {
-            for (size_t i = 0; i < j_values.size(); ++i)
-            {
-                for (size_t j = 0; j < j_values.size(); ++j)
-                {
-                    CAPTURE(i)
-                    CAPTURE(j)
-                    // check definition
-                    CHECK( (j_values[i] >= j_values[j]) == !(j_values[i] < j_values[j]) );
-                }
-            }
-        }
-    }
-}
diff --git a/external_imported/json/test/src/unit-constructor1.cpp b/external_imported/json/test/src/unit-constructor1.cpp
deleted file mode 100644
index 70b3e4047..000000000
--- a/external_imported/json/test/src/unit-constructor1.cpp
+++ /dev/null
@@ -1,1590 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include "doctest_compatibility.h"
-DOCTEST_GCC_SUPPRESS_WARNING("-Wfloat-equal")
-
-#define JSON_TESTS_PRIVATE
-#include <nlohmann/json.hpp>
-using nlohmann::json;
-
-#include <deque>
-#include <forward_list>
-#include <fstream>
-#include <list>
-#include <set>
-#include <unordered_map>
-#include <unordered_set>
-#include <valarray>
-
-TEST_CASE("constructors")
-{
-    SECTION("create an empty value with a given type")
-    {
-        SECTION("null")
-        {
-            auto t = json::value_t::null;
-            json j(t);
-            CHECK(j.type() == t);
-        }
-
-        SECTION("discarded")
-        {
-            auto t = json::value_t::discarded;
-            json j(t);
-            CHECK(j.type() == t);
-        }
-
-        SECTION("object")
-        {
-            auto t = json::value_t::object;
-            json j(t);
-            CHECK(j.type() == t);
-        }
-
-        SECTION("array")
-        {
-            auto t = json::value_t::array;
-            json j(t);
-            CHECK(j.type() == t);
-        }
-
-        SECTION("boolean")
-        {
-            auto t = json::value_t::boolean;
-            json j(t);
-            CHECK(j.type() == t);
-            CHECK(j == false);
-        }
-
-        SECTION("string")
-        {
-            auto t = json::value_t::string;
-            json j(t);
-            CHECK(j.type() == t);
-            CHECK(j == "");
-        }
-
-        SECTION("number_integer")
-        {
-            auto t = json::value_t::number_integer;
-            json j(t);
-            CHECK(j.type() == t);
-            CHECK(j == 0);
-        }
-
-        SECTION("number_unsigned")
-        {
-            auto t = json::value_t::number_unsigned;
-            json j(t);
-            CHECK(j.type() == t);
-            CHECK(j == 0);
-        }
-
-        SECTION("number_float")
-        {
-            auto t = json::value_t::number_float;
-            json j(t);
-            CHECK(j.type() == t);
-            CHECK(j == 0.0);
-        }
-
-        SECTION("binary")
-        {
-            auto t = json::value_t::binary;
-            json j(t);
-            CHECK(j.type() == t);
-            CHECK(j == json::binary({}));
-        }
-    }
-
-    SECTION("create a null object (implicitly)")
-    {
-        SECTION("no parameter")
-        {
-            json j{};
-            CHECK(j.type() == json::value_t::null);
-        }
-    }
-
-    SECTION("create a null object (explicitly)")
-    {
-        SECTION("parameter")
-        {
-            json j(nullptr);
-            CHECK(j.type() == json::value_t::null);
-        }
-    }
-
-    SECTION("create an object (explicit)")
-    {
-        SECTION("empty object")
-        {
-            json::object_t o;
-            json j(o);
-            CHECK(j.type() == json::value_t::object);
-        }
-
-        SECTION("filled object")
-        {
-            json::object_t o {{"a", json(1)}, {"b", json(1u)}, {"c", json(2.2)}, {"d", json(false)}, {"e", json("string")}, {"f", json()}};
-            json j(o);
-            CHECK(j.type() == json::value_t::object);
-        }
-    }
-
-    SECTION("create an object (implicit)")
-    {
-        // reference object
-        json::object_t o_reference {{"a", json(1)}, {"b", json(1u)}, {"c", json(2.2)}, {"d", json(false)}, {"e", json("string")}, {"f", json()}};
-        json j_reference(o_reference);
-
-        SECTION("std::map<json::string_t, json>")
-        {
-            std::map<json::string_t, json> o {{"a", json(1)}, {"b", json(1u)}, {"c", json(2.2)}, {"d", json(false)}, {"e", json("string")}, {"f", json()}};
-            json j(o);
-            CHECK(j.type() == json::value_t::object);
-            CHECK(j == j_reference);
-        }
-
-        SECTION("std::map<std::string, std::string> #600")
-        {
-            std::map<std::string, std::string> m;
-            m["a"] = "b";
-            m["c"] = "d";
-            m["e"] = "f";
-
-            json j(m);
-            CHECK((j.get<decltype(m)>() == m));
-        }
-
-        SECTION("std::map<const char*, json>")
-        {
-            std::map<const char*, json> o {{"a", json(1)}, {"b", json(1u)}, {"c", json(2.2)}, {"d", json(false)}, {"e", json("string")}, {"f", json()}};
-            json j(o);
-            CHECK(j.type() == json::value_t::object);
-            CHECK(j == j_reference);
-        }
-
-
-        SECTION("std::multimap<json::string_t, json>")
-        {
-            std::multimap<json::string_t, json> o {{"a", json(1)}, {"b", json(1u)}, {"c", json(2.2)}, {"d", json(false)}, {"e", json("string")}, {"f", json()}};
-            json j(o);
-            CHECK(j.type() == json::value_t::object);
-            CHECK(j == j_reference);
-        }
-
-        SECTION("std::unordered_map<json::string_t, json>")
-        {
-            std::unordered_map<json::string_t, json> o {{"a", json(1)}, {"b", json(1u)}, {"c", json(2.2)}, {"d", json(false)}, {"e", json("string")}, {"f", json()}};
-            json j(o);
-            CHECK(j.type() == json::value_t::object);
-            CHECK(j == j_reference);
-        }
-
-        SECTION("std::unordered_multimap<json::string_t, json>")
-        {
-            std::unordered_multimap<json::string_t, json> o {{"a", json(1)}, {"b", json(1u)}, {"c", json(2.2)}, {"d", json(false)}, {"e", json("string")}, {"f", json()}};
-            json j(o);
-            CHECK(j.type() == json::value_t::object);
-            CHECK(j == j_reference);
-        }
-
-        SECTION("associative container literal")
-        {
-            json j({{"a", json(1)}, {"b", json(1u)}, {"c", json(2.2)}, {"d", json(false)}, {"e", json("string")}, {"f", json()}});
-            CHECK(j.type() == json::value_t::object);
-            CHECK(j == j_reference);
-        }
-    }
-
-    SECTION("create an array (explicit)")
-    {
-        SECTION("empty array")
-        {
-            json::array_t a;
-            json j(a);
-            CHECK(j.type() == json::value_t::array);
-        }
-
-        SECTION("filled array")
-        {
-            json::array_t a {json(1), json(1u), json(2.2), json(false), json("string"), json()};
-            json j(a);
-            CHECK(j.type() == json::value_t::array);
-        }
-    }
-
-    SECTION("create an array (implicit)")
-    {
-        // reference array
-        json::array_t a_reference {json(1), json(1u), json(2.2), json(false), json("string"), json()};
-        json j_reference(a_reference);
-
-        SECTION("std::list<json>")
-        {
-            std::list<json> a {json(1), json(1u), json(2.2), json(false), json("string"), json()};
-            json j(a);
-            CHECK(j.type() == json::value_t::array);
-            CHECK(j == j_reference);
-        }
-
-        SECTION("std::pair")
-        {
-            std::pair<float, std::string> p{1.0f, "string"};
-            json j(p);
-
-            CHECK(j.type() == json::value_t::array);
-            CHECK(j.get<decltype(p)>() == p);
-            REQUIRE(j.size() == 2);
-            CHECK(j[0] == std::get<0>(p));
-            CHECK(j[1] == std::get<1>(p));
-        }
-
-        SECTION("std::pair with discarded values")
-        {
-            json j{1, 2.0, "string"};
-
-            const auto p = j.get<std::pair<int, float>>();
-            CHECK(p.first == j[0]);
-            CHECK(p.second == j[1]);
-        }
-
-        SECTION("std::tuple")
-        {
-            const auto t = std::make_tuple(1.0, std::string{"string"}, 42, std::vector<int> {0, 1});
-            json j(t);
-
-            CHECK(j.type() == json::value_t::array);
-            REQUIRE(j.size() == 4);
-            CHECK(j.get<decltype(t)>() == t);
-            CHECK(j[0] == std::get<0>(t));
-            CHECK(j[1] == std::get<1>(t));
-            CHECK(j[2] == std::get<2>(t));
-            CHECK(j[3][0] == 0);
-            CHECK(j[3][1] == 1);
-        }
-
-        SECTION("std::tuple with discarded values")
-        {
-            json j{1, 2.0, "string", 42};
-
-            const auto t = j.get<std::tuple<int, float, std::string>>();
-            CHECK(std::get<0>(t) == j[0]);
-            CHECK(std::get<1>(t) == j[1]);
-            CHECK(std::get<2>(t) == j[2]);
-        }
-
-        SECTION("std::pair/tuple/array failures")
-        {
-            json j{1};
-
-            CHECK_THROWS_AS((j.get<std::pair<int, int>>()), json::out_of_range&);
-            CHECK_THROWS_WITH((j.get<std::pair<int, int>>()), "[json.exception.out_of_range.401] array index 1 is out of range");
-            CHECK_THROWS_AS((j.get<std::tuple<int, int>>()), json::out_of_range&);
-            CHECK_THROWS_WITH((j.get<std::tuple<int, int>>()), "[json.exception.out_of_range.401] array index 1 is out of range");
-            CHECK_THROWS_AS((j.get<std::array<int, 3>>()), json::out_of_range&);
-            CHECK_THROWS_WITH((j.get<std::array<int, 3>>()), "[json.exception.out_of_range.401] array index 1 is out of range");
-        }
-
-        SECTION("std::forward_list<json>")
-        {
-            std::forward_list<json> a {json(1), json(1u), json(2.2), json(false), json("string"), json()};
-            json j(a);
-            CHECK(j.type() == json::value_t::array);
-            CHECK(j == j_reference);
-        }
-
-        SECTION("std::array<json, 6>")
-        {
-            std::array<json, 6> a {{json(1), json(1u), json(2.2), json(false), json("string"), json()}};
-            json j(a);
-            CHECK(j.type() == json::value_t::array);
-            CHECK(j == j_reference);
-
-            const auto a2 = j.get<std::array<json, 6>>();
-            CHECK(a2 == a);
-        }
-
-        SECTION("std::valarray<int>")
-        {
-            std::valarray<int> va = {1, 2, 3, 4, 5};
-            json j(va);
-            CHECK(j.type() == json::value_t::array);
-            CHECK(j == json({1, 2, 3, 4, 5}));
-
-            auto jva = j.get<std::valarray<int>>();
-            CHECK(jva.size() == va.size());
-            for (size_t i = 0; i < jva.size(); ++i)
-            {
-                CHECK(va[i] == jva[i]);
-            }
-        }
-
-        SECTION("std::valarray<double>")
-        {
-            std::valarray<double> va = {1.2, 2.3, 3.4, 4.5, 5.6};
-            json j(va);
-            CHECK(j.type() == json::value_t::array);
-            CHECK(j == json({1.2, 2.3, 3.4, 4.5, 5.6}));
-
-            auto jva = j.get<std::valarray<double>>();
-            CHECK(jva.size() == va.size());
-            for (size_t i = 0; i < jva.size(); ++i)
-            {
-                CHECK(va[i] == jva[i]);
-            }
-        }
-
-        SECTION("std::vector<json>")
-        {
-            std::vector<json> a {json(1), json(1u), json(2.2), json(false), json("string"), json()};
-            json j(a);
-            CHECK(j.type() == json::value_t::array);
-            CHECK(j == j_reference);
-        }
-
-        SECTION("std::deque<json>")
-        {
-            std::deque<json> a {json(1), json(1u), json(2.2), json(false), json("string"), json()};
-            json j(a);
-            CHECK(j.type() == json::value_t::array);
-            CHECK(j == j_reference);
-        }
-
-        SECTION("std::set<json>")
-        {
-            std::set<json> a {json(1), json(1u), json(2.2), json(false), json("string"), json()};
-            json j(a);
-            CHECK(j.type() == json::value_t::array);
-            // we cannot really check for equality here
-        }
-
-        SECTION("std::unordered_set<json>")
-        {
-            std::unordered_set<json> a {json(1), json(1u), json(2.2), json(false), json("string"), json()};
-            json j(a);
-            CHECK(j.type() == json::value_t::array);
-            // we cannot really check for equality here
-        }
-
-        SECTION("sequence container literal")
-        {
-            json j({json(1), json(1u), json(2.2), json(false), json("string"), json()});
-            CHECK(j.type() == json::value_t::array);
-            CHECK(j == j_reference);
-        }
-    }
-
-    SECTION("create a string (explicit)")
-    {
-        SECTION("empty string")
-        {
-            json::string_t s;
-            json j(s);
-            CHECK(j.type() == json::value_t::string);
-        }
-
-        SECTION("filled string")
-        {
-            json::string_t s {"Hello world"};
-            json j(s);
-            CHECK(j.type() == json::value_t::string);
-        }
-    }
-
-    SECTION("create a string (implicit)")
-    {
-        // reference string
-        json::string_t s_reference {"Hello world"};
-        json j_reference(s_reference);
-
-        SECTION("std::string")
-        {
-            std::string s {"Hello world"};
-            json j(s);
-            CHECK(j.type() == json::value_t::string);
-            CHECK(j == j_reference);
-        }
-
-        SECTION("char[]")
-        {
-            char s[] {"Hello world"};
-            json j(s);
-            CHECK(j.type() == json::value_t::string);
-            CHECK(j == j_reference);
-        }
-
-        SECTION("const char*")
-        {
-            const char* s {"Hello world"};
-            json j(s);
-            CHECK(j.type() == json::value_t::string);
-            CHECK(j == j_reference);
-        }
-
-        SECTION("string literal")
-        {
-            json j("Hello world");
-            CHECK(j.type() == json::value_t::string);
-            CHECK(j == j_reference);
-        }
-    }
-
-    SECTION("create a boolean (explicit)")
-    {
-        SECTION("empty boolean")
-        {
-            json::boolean_t b{};
-            json j(b);
-            CHECK(j.type() == json::value_t::boolean);
-        }
-
-        SECTION("filled boolean (true)")
-        {
-            json j(true);
-            CHECK(j.type() == json::value_t::boolean);
-        }
-
-        SECTION("filled boolean (false)")
-        {
-            json j(false);
-            CHECK(j.type() == json::value_t::boolean);
-        }
-    }
-
-    SECTION("create a binary (explicit)")
-    {
-        SECTION("empty binary")
-        {
-            json::binary_t b{};
-            json j(b);
-            CHECK(j.type() == json::value_t::binary);
-        }
-
-        SECTION("filled binary")
-        {
-            json::binary_t b({1, 2, 3});
-            json j(b);
-            CHECK(j.type() == json::value_t::binary);
-        }
-    }
-
-    SECTION("create an integer number (explicit)")
-    {
-        SECTION("uninitialized value")
-        {
-            json::number_integer_t n{};
-            json j(n);
-            CHECK(j.type() == json::value_t::number_integer);
-        }
-
-        SECTION("initialized value")
-        {
-            json::number_integer_t n(42);
-            json j(n);
-            CHECK(j.type() == json::value_t::number_integer);
-        }
-    }
-
-    SECTION("create an integer number (implicit)")
-    {
-        // reference objects
-        json::number_integer_t n_reference = 42;
-        json j_reference(n_reference);
-        json::number_unsigned_t n_unsigned_reference = 42;
-        json j_unsigned_reference(n_unsigned_reference);
-
-        SECTION("short")
-        {
-            short n = 42;
-            json j(n);
-            CHECK(j.type() == json::value_t::number_integer);
-            CHECK(j == j_reference);
-        }
-
-        SECTION("unsigned short")
-        {
-            unsigned short n = 42;
-            json j(n);
-            CHECK(j.type() == json::value_t::number_unsigned);
-            CHECK(j == j_unsigned_reference);
-        }
-
-        SECTION("int")
-        {
-            int n = 42;
-            json j(n);
-            CHECK(j.type() == json::value_t::number_integer);
-            CHECK(j == j_reference);
-        }
-
-        SECTION("unsigned int")
-        {
-            unsigned int n = 42;
-            json j(n);
-            CHECK(j.type() == json::value_t::number_unsigned);
-            CHECK(j == j_unsigned_reference);
-        }
-
-        SECTION("long")
-        {
-            long n = 42;
-            json j(n);
-            CHECK(j.type() == json::value_t::number_integer);
-            CHECK(j == j_reference);
-        }
-
-        SECTION("unsigned long")
-        {
-            unsigned long n = 42;
-            json j(n);
-            CHECK(j.type() == json::value_t::number_unsigned);
-            CHECK(j == j_unsigned_reference);
-        }
-
-        SECTION("long long")
-        {
-            long long n = 42;
-            json j(n);
-            CHECK(j.type() == json::value_t::number_integer);
-            CHECK(j == j_reference);
-        }
-
-        SECTION("unsigned long long")
-        {
-            unsigned long long n = 42;
-            json j(n);
-            CHECK(j.type() == json::value_t::number_unsigned);
-            CHECK(j == j_unsigned_reference);
-        }
-
-        SECTION("int8_t")
-        {
-            int8_t n = 42;
-            json j(n);
-            CHECK(j.type() == json::value_t::number_integer);
-            CHECK(j == j_reference);
-        }
-
-        SECTION("int16_t")
-        {
-            int16_t n = 42;
-            json j(n);
-            CHECK(j.type() == json::value_t::number_integer);
-            CHECK(j == j_reference);
-        }
-
-        SECTION("int32_t")
-        {
-            int32_t n = 42;
-            json j(n);
-            CHECK(j.type() == json::value_t::number_integer);
-            CHECK(j == j_reference);
-        }
-
-        SECTION("int64_t")
-        {
-            int64_t n = 42;
-            json j(n);
-            CHECK(j.type() == json::value_t::number_integer);
-            CHECK(j == j_reference);
-        }
-
-        SECTION("int_fast8_t")
-        {
-            int_fast8_t n = 42;
-            json j(n);
-            CHECK(j.type() == json::value_t::number_integer);
-            CHECK(j == j_reference);
-        }
-
-        SECTION("int_fast16_t")
-        {
-            int_fast16_t n = 42;
-            json j(n);
-            CHECK(j.type() == json::value_t::number_integer);
-            CHECK(j == j_reference);
-        }
-
-        SECTION("int_fast32_t")
-        {
-            int_fast32_t n = 42;
-            json j(n);
-            CHECK(j.type() == json::value_t::number_integer);
-            CHECK(j == j_reference);
-        }
-
-        SECTION("int_fast64_t")
-        {
-            int_fast64_t n = 42;
-            json j(n);
-            CHECK(j.type() == json::value_t::number_integer);
-            CHECK(j == j_reference);
-        }
-
-        SECTION("int_least8_t")
-        {
-            int_least8_t n = 42;
-            json j(n);
-            CHECK(j.type() == json::value_t::number_integer);
-            CHECK(j == j_reference);
-        }
-
-        SECTION("int_least16_t")
-        {
-            int_least16_t n = 42;
-            json j(n);
-            CHECK(j.type() == json::value_t::number_integer);
-            CHECK(j == j_reference);
-        }
-
-        SECTION("int_least32_t")
-        {
-            int_least32_t n = 42;
-            json j(n);
-            CHECK(j.type() == json::value_t::number_integer);
-            CHECK(j == j_reference);
-        }
-
-        SECTION("int_least64_t")
-        {
-            int_least64_t n = 42;
-            json j(n);
-            CHECK(j.type() == json::value_t::number_integer);
-            CHECK(j == j_reference);
-        }
-
-        SECTION("uint8_t")
-        {
-            uint8_t n = 42;
-            json j(n);
-            CHECK(j.type() == json::value_t::number_unsigned);
-            CHECK(j == j_unsigned_reference);
-        }
-
-        SECTION("uint16_t")
-        {
-            uint16_t n = 42;
-            json j(n);
-            CHECK(j.type() == json::value_t::number_unsigned);
-            CHECK(j == j_unsigned_reference);
-        }
-
-        SECTION("uint32_t")
-        {
-            uint32_t n = 42;
-            json j(n);
-            CHECK(j.type() == json::value_t::number_unsigned);
-            CHECK(j == j_unsigned_reference);
-        }
-
-        SECTION("uint64_t")
-        {
-            uint64_t n = 42;
-            json j(n);
-            CHECK(j.type() == json::value_t::number_unsigned);
-            CHECK(j == j_unsigned_reference);
-        }
-
-        SECTION("uint_fast8_t")
-        {
-            uint_fast8_t n = 42;
-            json j(n);
-            CHECK(j.type() == json::value_t::number_unsigned);
-            CHECK(j == j_unsigned_reference);
-        }
-
-        SECTION("uint_fast16_t")
-        {
-            uint_fast16_t n = 42;
-            json j(n);
-            CHECK(j.type() == json::value_t::number_unsigned);
-            CHECK(j == j_unsigned_reference);
-        }
-
-        SECTION("uint_fast32_t")
-        {
-            uint_fast32_t n = 42;
-            json j(n);
-            CHECK(j.type() == json::value_t::number_unsigned);
-            CHECK(j == j_unsigned_reference);
-        }
-
-        SECTION("uint_fast64_t")
-        {
-            uint_fast64_t n = 42;
-            json j(n);
-            CHECK(j.type() == json::value_t::number_unsigned);
-            CHECK(j == j_unsigned_reference);
-        }
-
-        SECTION("uint_least8_t")
-        {
-            uint_least8_t n = 42;
-            json j(n);
-            CHECK(j.type() == json::value_t::number_unsigned);
-            CHECK(j == j_unsigned_reference);
-        }
-
-        SECTION("uint_least16_t")
-        {
-            uint_least16_t n = 42;
-            json j(n);
-            CHECK(j.type() == json::value_t::number_unsigned);
-            CHECK(j == j_unsigned_reference);
-        }
-
-        SECTION("uint_least32_t")
-        {
-            uint_least32_t n = 42;
-            json j(n);
-            CHECK(j.type() == json::value_t::number_unsigned);
-            CHECK(j == j_unsigned_reference);
-        }
-
-        SECTION("uint_least64_t")
-        {
-            uint_least64_t n = 42;
-            json j(n);
-            CHECK(j.type() == json::value_t::number_unsigned);
-            CHECK(j == j_unsigned_reference);
-        }
-
-        SECTION("integer literal without suffix")
-        {
-            json j(42);
-            CHECK(j.type() == json::value_t::number_integer);
-            CHECK(j == j_reference);
-        }
-
-        SECTION("integer literal with u suffix")
-        {
-            json j(42u);
-            CHECK(j.type() == json::value_t::number_unsigned);
-            CHECK(j == j_unsigned_reference);
-        }
-
-        SECTION("integer literal with l suffix")
-        {
-            json j(42l);
-            CHECK(j.type() == json::value_t::number_integer);
-            CHECK(j == j_reference);
-        }
-
-        SECTION("integer literal with ul suffix")
-        {
-            json j(42ul);
-            CHECK(j.type() == json::value_t::number_unsigned);
-            CHECK(j == j_unsigned_reference);
-        }
-
-        SECTION("integer literal with ll suffix")
-        {
-            json j(42ll);
-            CHECK(j.type() == json::value_t::number_integer);
-            CHECK(j == j_reference);
-        }
-
-        SECTION("integer literal with ull suffix")
-        {
-            json j(42ull);
-            CHECK(j.type() == json::value_t::number_unsigned);
-            CHECK(j == j_unsigned_reference);
-        }
-    }
-
-    SECTION("create a floating-point number (explicit)")
-    {
-        SECTION("uninitialized value")
-        {
-            json::number_float_t n{};
-            json j(n);
-            CHECK(j.type() == json::value_t::number_float);
-        }
-
-        SECTION("initialized value")
-        {
-            json::number_float_t n(42.23);
-            json j(n);
-            CHECK(j.type() == json::value_t::number_float);
-        }
-
-        SECTION("NaN")
-        {
-            // NaN is stored properly, but serialized to null
-            json::number_float_t n(std::numeric_limits<json::number_float_t>::quiet_NaN());
-            json j(n);
-            CHECK(j.type() == json::value_t::number_float);
-
-            // check round trip of NaN
-            json::number_float_t d{j};
-            CHECK((std::isnan(d) && std::isnan(n)) == true);
-
-            // check that NaN is serialized to null
-            CHECK(j.dump() == "null");
-        }
-
-        SECTION("infinity")
-        {
-            // infinity is stored properly, but serialized to null
-            json::number_float_t n(std::numeric_limits<json::number_float_t>::infinity());
-            json j(n);
-            CHECK(j.type() == json::value_t::number_float);
-
-            // check round trip of infinity
-            json::number_float_t d{j};
-            CHECK(d == n);
-
-            // check that inf is serialized to null
-            CHECK(j.dump() == "null");
-        }
-    }
-
-    SECTION("create a floating-point number (implicit)")
-    {
-        // reference object
-        json::number_float_t n_reference = 42.23;
-        json j_reference(n_reference);
-
-        SECTION("float")
-        {
-            float n = 42.23f;
-            json j(n);
-            CHECK(j.type() == json::value_t::number_float);
-            CHECK(j.m_value.number_float == Approx(j_reference.m_value.number_float));
-        }
-
-        SECTION("double")
-        {
-            double n = 42.23;
-            json j(n);
-            CHECK(j.type() == json::value_t::number_float);
-            CHECK(j.m_value.number_float == Approx(j_reference.m_value.number_float));
-        }
-
-        SECTION("long double")
-        {
-            long double n = 42.23l;
-            json j(n);
-            CHECK(j.type() == json::value_t::number_float);
-            CHECK(j.m_value.number_float == Approx(j_reference.m_value.number_float));
-        }
-
-        SECTION("floating-point literal without suffix")
-        {
-            json j(42.23);
-            CHECK(j.type() == json::value_t::number_float);
-            CHECK(j.m_value.number_float == Approx(j_reference.m_value.number_float));
-        }
-
-        SECTION("integer literal with f suffix")
-        {
-            json j(42.23f);
-            CHECK(j.type() == json::value_t::number_float);
-            CHECK(j.m_value.number_float == Approx(j_reference.m_value.number_float));
-        }
-
-        SECTION("integer literal with l suffix")
-        {
-            json j(42.23l);
-            CHECK(j.type() == json::value_t::number_float);
-            CHECK(j.m_value.number_float == Approx(j_reference.m_value.number_float));
-        }
-    }
-
-    SECTION("create a container (array or object) from an initializer list")
-    {
-        SECTION("empty initializer list")
-        {
-            SECTION("explicit")
-            {
-                json j(json::initializer_list_t {});
-                CHECK(j.type() == json::value_t::object);
-            }
-
-            SECTION("implicit")
-            {
-                json j {};
-                CHECK(j.type() == json::value_t::null);
-            }
-        }
-
-        SECTION("one element")
-        {
-            SECTION("array")
-            {
-                SECTION("explicit")
-                {
-                    json j(json::initializer_list_t {json(json::array_t())});
-                    CHECK(j.type() == json::value_t::array);
-                }
-
-                SECTION("implicit")
-                {
-                    json j {json::array_t()};
-                    CHECK(j.type() == json::value_t::array);
-                }
-            }
-
-            SECTION("object")
-            {
-                SECTION("explicit")
-                {
-                    json j(json::initializer_list_t {json(json::object_t())});
-                    CHECK(j.type() == json::value_t::array);
-                }
-
-                SECTION("implicit")
-                {
-                    json j {json::object_t()};
-                    CHECK(j.type() == json::value_t::array);
-                }
-            }
-
-            SECTION("string")
-            {
-                SECTION("explicit")
-                {
-                    json j(json::initializer_list_t {json("Hello world")});
-                    CHECK(j.type() == json::value_t::array);
-                }
-
-                SECTION("implicit")
-                {
-                    json j {"Hello world"};
-                    CHECK(j.type() == json::value_t::array);
-                }
-            }
-
-            SECTION("boolean")
-            {
-                SECTION("explicit")
-                {
-                    json j(json::initializer_list_t {json(true)});
-                    CHECK(j.type() == json::value_t::array);
-                }
-
-                SECTION("implicit")
-                {
-                    json j {true};
-                    CHECK(j.type() == json::value_t::array);
-                }
-            }
-
-            SECTION("number (integer)")
-            {
-                SECTION("explicit")
-                {
-                    json j(json::initializer_list_t {json(1)});
-                    CHECK(j.type() == json::value_t::array);
-                }
-
-                SECTION("implicit")
-                {
-                    json j {1};
-                    CHECK(j.type() == json::value_t::array);
-                }
-            }
-
-            SECTION("number (unsigned)")
-            {
-                SECTION("explicit")
-                {
-                    json j(json::initializer_list_t {json(1u)});
-                    CHECK(j.type() == json::value_t::array);
-                }
-
-                SECTION("implicit")
-                {
-                    json j {1u};
-                    CHECK(j.type() == json::value_t::array);
-                }
-            }
-
-            SECTION("number (floating-point)")
-            {
-                SECTION("explicit")
-                {
-                    json j(json::initializer_list_t {json(42.23)});
-                    CHECK(j.type() == json::value_t::array);
-                }
-
-                SECTION("implicit")
-                {
-                    json j {42.23};
-                    CHECK(j.type() == json::value_t::array);
-                }
-            }
-        }
-
-        SECTION("more elements")
-        {
-            SECTION("explicit")
-            {
-                json j(json::initializer_list_t {1, 1u, 42.23, true, nullptr, json::object_t(), json::array_t()});
-                CHECK(j.type() == json::value_t::array);
-            }
-
-            SECTION("implicit")
-            {
-                json j {1, 1u, 42.23, true, nullptr, json::object_t(), json::array_t()};
-                CHECK(j.type() == json::value_t::array);
-            }
-        }
-
-        SECTION("implicit type deduction")
-        {
-            SECTION("object")
-            {
-                json j { {"one", 1}, {"two", 1u}, {"three", 2.2}, {"four", false} };
-                CHECK(j.type() == json::value_t::object);
-            }
-
-            SECTION("array")
-            {
-                json j { {"one", 1}, {"two", 1u}, {"three", 2.2}, {"four", false}, 13 };
-                CHECK(j.type() == json::value_t::array);
-            }
-        }
-
-        SECTION("explicit type deduction")
-        {
-            SECTION("empty object")
-            {
-                json j = json::object();
-                CHECK(j.type() == json::value_t::object);
-            }
-
-            SECTION("object")
-            {
-                json j = json::object({ {"one", 1}, {"two", 1u}, {"three", 2.2}, {"four", false} });
-                CHECK(j.type() == json::value_t::object);
-            }
-
-            SECTION("object with error")
-            {
-                json _;
-                CHECK_THROWS_AS(_ = json::object({ {"one", 1}, {"two", 1u}, {"three", 2.2}, {"four", false}, 13 }),
-                json::type_error&);
-                CHECK_THROWS_WITH(_ = json::object({ {"one", 1}, {"two", 1u}, {"three", 2.2}, {"four", false}, 13 }),
-                "[json.exception.type_error.301] cannot create object from initializer list");
-            }
-
-            SECTION("empty array")
-            {
-                json j = json::array();
-                CHECK(j.type() == json::value_t::array);
-            }
-
-            SECTION("array")
-            {
-                json j = json::array({ {"one", 1}, {"two", 1u}, {"three", 2.2}, {"four", false} });
-                CHECK(j.type() == json::value_t::array);
-            }
-        }
-
-        SECTION("move from initializer_list")
-        {
-            SECTION("string")
-            {
-                // This should break through any short string optimization in std::string
-                std::string source(1024, '!');
-                const char* source_addr = source.data();
-
-                SECTION("constructor with implicit types (array)")
-                {
-                    json j = {std::move(source)};
-                    CHECK(j[0].get_ref<std::string const&>().data() == source_addr);
-                }
-
-                SECTION("constructor with implicit types (object)")
-                {
-                    json j = {{"key", std::move(source)}};
-                    CHECK(j["key"].get_ref<std::string const&>().data() == source_addr);
-                }
-
-                SECTION("constructor with implicit types (object key)")
-                {
-                    json j = {{std::move(source), 42}};
-                    CHECK(j.get_ref<json::object_t&>().begin()->first.data() == source_addr);
-                }
-            }
-
-            SECTION("array")
-            {
-                json::array_t source = {1, 2, 3};
-                const json* source_addr = source.data();
-
-                SECTION("constructor with implicit types (array)")
-                {
-                    json j {std::move(source)};
-                    CHECK(j[0].get_ref<json::array_t const&>().data() == source_addr);
-                }
-
-                SECTION("constructor with implicit types (object)")
-                {
-                    json j {{"key", std::move(source)}};
-                    CHECK(j["key"].get_ref<json::array_t const&>().data() == source_addr);
-                }
-
-                SECTION("assignment with implicit types (array)")
-                {
-                    json j = {std::move(source)};
-                    CHECK(j[0].get_ref<json::array_t const&>().data() == source_addr);
-                }
-
-                SECTION("assignment with implicit types (object)")
-                {
-                    json j = {{"key", std::move(source)}};
-                    CHECK(j["key"].get_ref<json::array_t const&>().data() == source_addr);
-                }
-            }
-
-            SECTION("object")
-            {
-                json::object_t source = {{"hello", "world"}};
-                const json* source_addr = &source.at("hello");
-
-                SECTION("constructor with implicit types (array)")
-                {
-                    json j {std::move(source)};
-                    CHECK(&(j[0].get_ref<json::object_t const&>().at("hello")) == source_addr);
-                }
-
-                SECTION("constructor with implicit types (object)")
-                {
-                    json j {{"key", std::move(source)}};
-                    CHECK(&(j["key"].get_ref<json::object_t const&>().at("hello")) == source_addr);
-                }
-
-                SECTION("assignment with implicit types (array)")
-                {
-                    json j = {std::move(source)};
-                    CHECK(&(j[0].get_ref<json::object_t const&>().at("hello")) == source_addr);
-                }
-
-                SECTION("assignment with implicit types (object)")
-                {
-                    json j = {{"key", std::move(source)}};
-                    CHECK(&(j["key"].get_ref<json::object_t const&>().at("hello")) == source_addr);
-                }
-            }
-
-            SECTION("json")
-            {
-                json source {1, 2, 3};
-                const json* source_addr = &source[0];
-
-                SECTION("constructor with implicit types (array)")
-                {
-                    json j {std::move(source), {}};
-                    CHECK(&j[0][0] == source_addr);
-                }
-
-                SECTION("constructor with implicit types (object)")
-                {
-                    json j {{"key", std::move(source)}};
-                    CHECK(&j["key"][0] == source_addr);
-                }
-
-                SECTION("assignment with implicit types (array)")
-                {
-                    json j = {std::move(source), {}};
-                    CHECK(&j[0][0] == source_addr);
-                }
-
-                SECTION("assignment with implicit types (object)")
-                {
-                    json j = {{"key", std::move(source)}};
-                    CHECK(&j["key"][0] == source_addr);
-                }
-            }
-
-        }
-    }
-
-    SECTION("create an array of n copies of a given value")
-    {
-        SECTION("cnt = 0")
-        {
-            json v = {1, "foo", 34.23, {1, 2, 3}, {{"A", 1}, {"B", 2u}}};
-            json arr(0, v);
-            CHECK(arr.size() == 0);
-        }
-
-        SECTION("cnt = 1")
-        {
-            json v = {1, "foo", 34.23, {1, 2, 3}, {{"A", 1}, {"B", 2u}}};
-            json arr(1, v);
-            CHECK(arr.size() == 1);
-            for (auto& x : arr)
-            {
-                CHECK(x == v);
-            }
-        }
-
-        SECTION("cnt = 3")
-        {
-            json v = {1, "foo", 34.23, {1, 2, 3}, {{"A", 1}, {"B", 2u}}};
-            json arr(3, v);
-            CHECK(arr.size() == 3);
-            for (auto& x : arr)
-            {
-                CHECK(x == v);
-            }
-        }
-    }
-
-    SECTION("create a JSON container from an iterator range")
-    {
-        SECTION("object")
-        {
-            SECTION("json(begin(), end())")
-            {
-                {
-                    json jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}};
-                    json j_new(jobject.begin(), jobject.end());
-                    CHECK(j_new == jobject);
-                }
-                {
-                    json jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}};
-                    json j_new(jobject.cbegin(), jobject.cend());
-                    CHECK(j_new == jobject);
-                }
-            }
-
-            SECTION("json(begin(), begin())")
-            {
-                {
-                    json jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}};
-                    json j_new(jobject.begin(), jobject.begin());
-                    CHECK(j_new == json::object());
-                }
-                {
-                    json jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}};
-                    json j_new(jobject.cbegin(), jobject.cbegin());
-                    CHECK(j_new == json::object());
-                }
-            }
-
-            SECTION("construct from subrange")
-            {
-                json jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}, {"d", false}, {"e", true}};
-                json j_new(jobject.find("b"), jobject.find("e"));
-                CHECK(j_new == json({{"b", 1}, {"c", 17u}, {"d", false}}));
-            }
-
-            SECTION("incompatible iterators")
-            {
-                {
-                    json jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}, {"d", false}, {"e", true}};
-                    json jobject2 = {{"a", "a"}, {"b", 1}, {"c", 17u}};
-                    CHECK_THROWS_AS(json(jobject.begin(), jobject2.end()), json::invalid_iterator&);
-                    CHECK_THROWS_AS(json(jobject2.begin(), jobject.end()), json::invalid_iterator&);
-                    CHECK_THROWS_WITH(json(jobject.begin(), jobject2.end()), "[json.exception.invalid_iterator.201] iterators are not compatible");
-                    CHECK_THROWS_WITH(json(jobject2.begin(), jobject.end()), "[json.exception.invalid_iterator.201] iterators are not compatible");
-                }
-                {
-                    json jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}, {"d", false}, {"e", true}};
-                    json jobject2 = {{"a", "a"}, {"b", 1}, {"c", 17u}};
-                    CHECK_THROWS_AS(json(jobject.cbegin(), jobject2.cend()), json::invalid_iterator&);
-                    CHECK_THROWS_AS(json(jobject2.cbegin(), jobject.cend()), json::invalid_iterator&);
-                    CHECK_THROWS_WITH(json(jobject.cbegin(), jobject2.cend()), "[json.exception.invalid_iterator.201] iterators are not compatible");
-                    CHECK_THROWS_WITH(json(jobject2.cbegin(), jobject.cend()), "[json.exception.invalid_iterator.201] iterators are not compatible");
-                }
-            }
-        }
-
-        SECTION("array")
-        {
-            SECTION("json(begin(), end())")
-            {
-                {
-                    json jarray = {1, 2, 3, 4, 5};
-                    json j_new(jarray.begin(), jarray.end());
-                    CHECK(j_new == jarray);
-                }
-                {
-                    json jarray = {1, 2, 3, 4, 5};
-                    json j_new(jarray.cbegin(), jarray.cend());
-                    CHECK(j_new == jarray);
-                }
-            }
-
-            SECTION("json(begin(), begin())")
-            {
-                {
-                    json jarray = {1, 2, 3, 4, 5};
-                    json j_new(jarray.begin(), jarray.begin());
-                    CHECK(j_new == json::array());
-                }
-                {
-                    json jarray = {1, 2, 3, 4, 5};
-                    json j_new(jarray.cbegin(), jarray.cbegin());
-                    CHECK(j_new == json::array());
-                }
-            }
-
-            SECTION("construct from subrange")
-            {
-                {
-                    json jarray = {1, 2, 3, 4, 5};
-                    json j_new(jarray.begin() + 1, jarray.begin() + 3);
-                    CHECK(j_new == json({2, 3}));
-                }
-                {
-                    json jarray = {1, 2, 3, 4, 5};
-                    json j_new(jarray.cbegin() + 1, jarray.cbegin() + 3);
-                    CHECK(j_new == json({2, 3}));
-                }
-            }
-
-            SECTION("incompatible iterators")
-            {
-                {
-                    json jarray = {1, 2, 3, 4};
-                    json jarray2 = {2, 3, 4, 5};
-                    CHECK_THROWS_AS(json(jarray.begin(), jarray2.end()), json::invalid_iterator&);
-                    CHECK_THROWS_AS(json(jarray2.begin(), jarray.end()), json::invalid_iterator&);
-                    CHECK_THROWS_WITH(json(jarray.begin(), jarray2.end()), "[json.exception.invalid_iterator.201] iterators are not compatible");
-                    CHECK_THROWS_WITH(json(jarray2.begin(), jarray.end()), "[json.exception.invalid_iterator.201] iterators are not compatible");
-                }
-                {
-                    json jarray = {1, 2, 3, 4};
-                    json jarray2 = {2, 3, 4, 5};
-                    CHECK_THROWS_AS(json(jarray.cbegin(), jarray2.cend()), json::invalid_iterator&);
-                    CHECK_THROWS_AS(json(jarray2.cbegin(), jarray.cend()), json::invalid_iterator&);
-                    CHECK_THROWS_WITH(json(jarray.cbegin(), jarray2.cend()), "[json.exception.invalid_iterator.201] iterators are not compatible");
-                    CHECK_THROWS_WITH(json(jarray2.cbegin(), jarray.cend()), "[json.exception.invalid_iterator.201] iterators are not compatible");
-                }
-            }
-        }
-
-        SECTION("other values")
-        {
-            SECTION("construct with two valid iterators")
-            {
-                SECTION("null")
-                {
-                    {
-                        json j;
-                        CHECK_THROWS_AS(json(j.begin(), j.end()), json::invalid_iterator&);
-                        CHECK_THROWS_WITH(json(j.begin(), j.end()),
-                                          "[json.exception.invalid_iterator.206] cannot construct with iterators from null");
-                    }
-                    {
-                        json j;
-                        CHECK_THROWS_AS(json(j.cbegin(), j.cend()), json::invalid_iterator&);
-                        CHECK_THROWS_WITH(json(j.cbegin(), j.cend()),
-                                          "[json.exception.invalid_iterator.206] cannot construct with iterators from null");
-                    }
-                }
-
-                SECTION("string")
-                {
-                    {
-                        json j = "foo";
-                        json j_new(j.begin(), j.end());
-                        CHECK(j == j_new);
-                    }
-                    {
-                        json j = "bar";
-                        json j_new(j.cbegin(), j.cend());
-                        CHECK(j == j_new);
-                    }
-                }
-
-                SECTION("number (boolean)")
-                {
-                    {
-                        json j = false;
-                        json j_new(j.begin(), j.end());
-                        CHECK(j == j_new);
-                    }
-                    {
-                        json j = true;
-                        json j_new(j.cbegin(), j.cend());
-                        CHECK(j == j_new);
-                    }
-                }
-
-                SECTION("number (integer)")
-                {
-                    {
-                        json j = 17;
-                        json j_new(j.begin(), j.end());
-                        CHECK(j == j_new);
-                    }
-                    {
-                        json j = 17;
-                        json j_new(j.cbegin(), j.cend());
-                        CHECK(j == j_new);
-                    }
-                }
-
-                SECTION("number (unsigned)")
-                {
-                    {
-                        json j = 17u;
-                        json j_new(j.begin(), j.end());
-                        CHECK(j == j_new);
-                    }
-                    {
-                        json j = 17u;
-                        json j_new(j.cbegin(), j.cend());
-                        CHECK(j == j_new);
-                    }
-                }
-
-                SECTION("number (floating point)")
-                {
-                    {
-                        json j = 23.42;
-                        json j_new(j.begin(), j.end());
-                        CHECK(j == j_new);
-                    }
-                    {
-                        json j = 23.42;
-                        json j_new(j.cbegin(), j.cend());
-                        CHECK(j == j_new);
-                    }
-                }
-
-                SECTION("binary")
-                {
-                    {
-                        json j = json::binary({1, 2, 3});
-                        json j_new(j.begin(), j.end());
-                        CHECK((j == j_new));
-                    }
-                    {
-                        json j = json::binary({1, 2, 3});
-                        json j_new(j.cbegin(), j.cend());
-                        CHECK((j == j_new));
-                    }
-                }
-            }
-
-            SECTION("construct with two invalid iterators")
-            {
-                SECTION("string")
-                {
-                    {
-                        json j = "foo";
-                        CHECK_THROWS_AS(json(j.end(), j.end()), json::invalid_iterator&);
-                        CHECK_THROWS_AS(json(j.begin(), j.begin()), json::invalid_iterator&);
-                        CHECK_THROWS_WITH(json(j.end(), j.end()), "[json.exception.invalid_iterator.204] iterators out of range");
-                        CHECK_THROWS_WITH(json(j.begin(), j.begin()), "[json.exception.invalid_iterator.204] iterators out of range");
-                    }
-                    {
-                        json j = "bar";
-                        CHECK_THROWS_AS(json(j.cend(), j.cend()), json::invalid_iterator&);
-                        CHECK_THROWS_AS(json(j.cbegin(), j.cbegin()), json::invalid_iterator&);
-                        CHECK_THROWS_WITH(json(j.cend(), j.cend()), "[json.exception.invalid_iterator.204] iterators out of range");
-                        CHECK_THROWS_WITH(json(j.cbegin(), j.cbegin()), "[json.exception.invalid_iterator.204] iterators out of range");
-                    }
-                }
-
-                SECTION("number (boolean)")
-                {
-                    {
-                        json j = false;
-                        CHECK_THROWS_AS(json(j.end(), j.end()), json::invalid_iterator&);
-                        CHECK_THROWS_AS(json(j.begin(), j.begin()), json::invalid_iterator&);
-                        CHECK_THROWS_WITH(json(j.end(), j.end()), "[json.exception.invalid_iterator.204] iterators out of range");
-                        CHECK_THROWS_WITH(json(j.begin(), j.begin()), "[json.exception.invalid_iterator.204] iterators out of range");
-                    }
-                    {
-                        json j = true;
-                        CHECK_THROWS_AS(json(j.cend(), j.cend()), json::invalid_iterator&);
-                        CHECK_THROWS_AS(json(j.cbegin(), j.cbegin()), json::invalid_iterator&);
-                        CHECK_THROWS_WITH(json(j.cend(), j.cend()), "[json.exception.invalid_iterator.204] iterators out of range");
-                        CHECK_THROWS_WITH(json(j.cbegin(), j.cbegin()), "[json.exception.invalid_iterator.204] iterators out of range");
-                    }
-                }
-
-                SECTION("number (integer)")
-                {
-                    {
-                        json j = 17;
-                        CHECK_THROWS_AS(json(j.end(), j.end()), json::invalid_iterator&);
-                        CHECK_THROWS_AS(json(j.begin(), j.begin()), json::invalid_iterator&);
-                        CHECK_THROWS_WITH(json(j.end(), j.end()), "[json.exception.invalid_iterator.204] iterators out of range");
-                        CHECK_THROWS_WITH(json(j.begin(), j.begin()), "[json.exception.invalid_iterator.204] iterators out of range");
-                    }
-                    {
-                        json j = 17;
-                        CHECK_THROWS_AS(json(j.cend(), j.cend()), json::invalid_iterator&);
-                        CHECK_THROWS_AS(json(j.cbegin(), j.cbegin()), json::invalid_iterator&);
-                        CHECK_THROWS_WITH(json(j.cend(), j.cend()), "[json.exception.invalid_iterator.204] iterators out of range");
-                        CHECK_THROWS_WITH(json(j.cbegin(), j.cbegin()), "[json.exception.invalid_iterator.204] iterators out of range");
-                    }
-                }
-
-                SECTION("number (integer)")
-                {
-                    {
-                        json j = 17u;
-                        CHECK_THROWS_AS(json(j.end(), j.end()), json::invalid_iterator&);
-                        CHECK_THROWS_AS(json(j.begin(), j.begin()), json::invalid_iterator&);
-                        CHECK_THROWS_WITH(json(j.end(), j.end()), "[json.exception.invalid_iterator.204] iterators out of range");
-                        CHECK_THROWS_WITH(json(j.begin(), j.begin()), "[json.exception.invalid_iterator.204] iterators out of range");
-                    }
-                    {
-                        json j = 17u;
-                        CHECK_THROWS_AS(json(j.cend(), j.cend()), json::invalid_iterator&);
-                        CHECK_THROWS_AS(json(j.cbegin(), j.cbegin()), json::invalid_iterator&);
-                        CHECK_THROWS_WITH(json(j.cend(), j.cend()), "[json.exception.invalid_iterator.204] iterators out of range");
-                        CHECK_THROWS_WITH(json(j.cbegin(), j.cbegin()), "[json.exception.invalid_iterator.204] iterators out of range");
-                    }
-                }
-
-                SECTION("number (floating point)")
-                {
-                    {
-                        json j = 23.42;
-                        CHECK_THROWS_AS(json(j.end(), j.end()), json::invalid_iterator&);
-                        CHECK_THROWS_AS(json(j.begin(), j.begin()), json::invalid_iterator&);
-                        CHECK_THROWS_WITH(json(j.end(), j.end()), "[json.exception.invalid_iterator.204] iterators out of range");
-                        CHECK_THROWS_WITH(json(j.begin(), j.begin()), "[json.exception.invalid_iterator.204] iterators out of range");
-                    }
-                    {
-                        json j = 23.42;
-                        CHECK_THROWS_AS(json(j.cend(), j.cend()), json::invalid_iterator&);
-                        CHECK_THROWS_AS(json(j.cbegin(), j.cbegin()), json::invalid_iterator&);
-                        CHECK_THROWS_WITH(json(j.cend(), j.cend()), "[json.exception.invalid_iterator.204] iterators out of range");
-                        CHECK_THROWS_WITH(json(j.cbegin(), j.cbegin()), "[json.exception.invalid_iterator.204] iterators out of range");
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/external_imported/json/test/src/unit-constructor2.cpp b/external_imported/json/test/src/unit-constructor2.cpp
deleted file mode 100644
index 27f4dfdcb..000000000
--- a/external_imported/json/test/src/unit-constructor2.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include "doctest_compatibility.h"
-
-#include <nlohmann/json.hpp>
-using nlohmann::json;
-
-TEST_CASE("other constructors and destructor")
-{
-    SECTION("copy constructor")
-    {
-        SECTION("object")
-        {
-            json j {{"foo", 1}, {"bar", false}};
-            json k(j);
-            CHECK(j == k);
-        }
-
-        SECTION("array")
-        {
-            json j {"foo", 1, 42.23, false};
-            json k(j);
-            CHECK(j == k);
-        }
-
-        SECTION("null")
-        {
-            json j(nullptr);
-            json k(j);
-            CHECK(j == k);
-        }
-
-        SECTION("boolean")
-        {
-            json j(true);
-            json k(j);
-            CHECK(j == k);
-        }
-
-        SECTION("string")
-        {
-            json j("Hello world");
-            json k(j);
-            CHECK(j == k);
-        }
-
-        SECTION("number (integer)")
-        {
-            json j(42);
-            json k(j);
-            CHECK(j == k);
-        }
-
-        SECTION("number (unsigned)")
-        {
-            json j(42u);
-            json k(j);
-            CHECK(j == k);
-        }
-
-        SECTION("number (floating-point)")
-        {
-            json j(42.23);
-            json k(j);
-            CHECK(j == k);
-        }
-
-        SECTION("binary")
-        {
-            json j = json::binary({1, 2, 3});
-            json k(j);
-            CHECK(j == k);
-        }
-    }
-
-    SECTION("move constructor")
-    {
-        json j {{"foo", "bar"}, {"baz", {1, 2, 3, 4}}, {"a", 42u}, {"b", 42.23}, {"c", nullptr}};
-        CHECK(j.type() == json::value_t::object);
-        json k(std::move(j));
-        CHECK(k.type() == json::value_t::object);
-        CHECK(j.type() == json::value_t::null);
-    }
-
-    SECTION("copy assignment")
-    {
-        SECTION("object")
-        {
-            json j {{"foo", 1}, {"bar", false}};
-            json k;
-            k = j;
-            CHECK(j == k);
-        }
-
-        SECTION("array")
-        {
-            json j {"foo", 1, 42.23, false};
-            json k;
-            k = j;
-            CHECK(j == k);
-        }
-
-        SECTION("null")
-        {
-            json j(nullptr);
-            json k;
-            k = j;
-            CHECK(j == k);
-        }
-
-        SECTION("boolean")
-        {
-            json j(true);
-            json k;
-            k = j;
-            CHECK(j == k);
-        }
-
-        SECTION("string")
-        {
-            json j("Hello world");
-            json k;
-            k = j;
-            CHECK(j == k);
-        }
-
-        SECTION("number (integer)")
-        {
-            json j(42);
-            json k;
-            k = j;
-            CHECK(j == k);
-        }
-
-        SECTION("number (unsigned)")
-        {
-            json j(42u);
-            json k;
-            k = j;
-            CHECK(j == k);
-        }
-
-        SECTION("number (floating-point)")
-        {
-            json j(42.23);
-            json k;
-            k = j;
-            CHECK(j == k);
-        }
-
-        SECTION("binary")
-        {
-            json j = json::binary({1, 2, 3});
-            json k;
-            k = j;
-            CHECK(j == k);
-        }
-    }
-
-    SECTION("destructor")
-    {
-        SECTION("object")
-        {
-            auto j = new json {{"foo", 1}, {"bar", false}};
-            delete j;
-        }
-
-        SECTION("array")
-        {
-            auto j = new json {"foo", 1, 1u, false, 23.42};
-            delete j;
-        }
-
-        SECTION("string")
-        {
-            auto j = new json("Hello world");
-            delete j;
-        }
-    }
-}
diff --git a/external_imported/json/test/src/unit-convenience.cpp b/external_imported/json/test/src/unit-convenience.cpp
deleted file mode 100644
index c75edac4e..000000000
--- a/external_imported/json/test/src/unit-convenience.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include "doctest_compatibility.h"
-
-#define JSON_TESTS_PRIVATE
-#include <nlohmann/json.hpp>
-using nlohmann::json;
-
-#include <sstream>
-
-namespace
-{
-void check_escaped(const char* original, const char* escaped = "", const bool ensure_ascii = false);
-void check_escaped(const char* original, const char* escaped, const bool ensure_ascii)
-{
-    std::stringstream ss;
-    json::serializer s(nlohmann::detail::output_adapter<char>(ss), ' ');
-    s.dump_escaped(original, ensure_ascii);
-    CHECK(ss.str() == escaped);
-}
-}
-
-TEST_CASE("convenience functions")
-{
-    SECTION("type name as string")
-    {
-        CHECK(std::string(json(json::value_t::null).type_name()) == "null");
-        CHECK(std::string(json(json::value_t::object).type_name()) == "object");
-        CHECK(std::string(json(json::value_t::array).type_name()) == "array");
-        CHECK(std::string(json(json::value_t::number_integer).type_name()) == "number");
-        CHECK(std::string(json(json::value_t::number_unsigned).type_name()) == "number");
-        CHECK(std::string(json(json::value_t::number_float).type_name()) == "number");
-        CHECK(std::string(json(json::value_t::binary).type_name()) == "binary");
-        CHECK(std::string(json(json::value_t::boolean).type_name()) == "boolean");
-        CHECK(std::string(json(json::value_t::string).type_name()) == "string");
-        CHECK(std::string(json(json::value_t::discarded).type_name()) == "discarded");
-    }
-
-    SECTION("string escape")
-    {
-        check_escaped("\"", "\\\"");
-        check_escaped("\\", "\\\\");
-        check_escaped("\b", "\\b");
-        check_escaped("\f", "\\f");
-        check_escaped("\n", "\\n");
-        check_escaped("\r", "\\r");
-        check_escaped("\t", "\\t");
-
-        check_escaped("\x01", "\\u0001");
-        check_escaped("\x02", "\\u0002");
-        check_escaped("\x03", "\\u0003");
-        check_escaped("\x04", "\\u0004");
-        check_escaped("\x05", "\\u0005");
-        check_escaped("\x06", "\\u0006");
-        check_escaped("\x07", "\\u0007");
-        check_escaped("\x08", "\\b");
-        check_escaped("\x09", "\\t");
-        check_escaped("\x0a", "\\n");
-        check_escaped("\x0b", "\\u000b");
-        check_escaped("\x0c", "\\f");
-        check_escaped("\x0d", "\\r");
-        check_escaped("\x0e", "\\u000e");
-        check_escaped("\x0f", "\\u000f");
-        check_escaped("\x10", "\\u0010");
-        check_escaped("\x11", "\\u0011");
-        check_escaped("\x12", "\\u0012");
-        check_escaped("\x13", "\\u0013");
-        check_escaped("\x14", "\\u0014");
-        check_escaped("\x15", "\\u0015");
-        check_escaped("\x16", "\\u0016");
-        check_escaped("\x17", "\\u0017");
-        check_escaped("\x18", "\\u0018");
-        check_escaped("\x19", "\\u0019");
-        check_escaped("\x1a", "\\u001a");
-        check_escaped("\x1b", "\\u001b");
-        check_escaped("\x1c", "\\u001c");
-        check_escaped("\x1d", "\\u001d");
-        check_escaped("\x1e", "\\u001e");
-        check_escaped("\x1f", "\\u001f");
-
-        // invalid UTF-8 characters
-        CHECK_THROWS_AS(check_escaped("ä\xA9ü"), json::type_error&);
-        CHECK_THROWS_WITH(check_escaped("ä\xA9ü"),
-                          "[json.exception.type_error.316] invalid UTF-8 byte at index 2: 0xA9");
-
-        CHECK_THROWS_AS(check_escaped("\xC2"), json::type_error&);
-        CHECK_THROWS_WITH(check_escaped("\xC2"),
-                          "[json.exception.type_error.316] incomplete UTF-8 string; last byte: 0xC2");
-    }
-}
diff --git a/external_imported/json/test/src/unit-conversions.cpp b/external_imported/json/test/src/unit-conversions.cpp
deleted file mode 100644
index 7f59c63ec..000000000
--- a/external_imported/json/test/src/unit-conversions.cpp
+++ /dev/null
@@ -1,1712 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include "doctest_compatibility.h"
-
-#define JSON_TESTS_PRIVATE
-#include <nlohmann/json.hpp>
-using nlohmann::json;
-
-#include <deque>
-#include <forward_list>
-#include <list>
-#include <set>
-#include <unordered_map>
-#include <unordered_set>
-#include <valarray>
-
-#if (defined(__cplusplus) && __cplusplus >= 201703L) || (defined(_HAS_CXX17) && _HAS_CXX17 == 1) // fix for issue #464
-    #define JSON_HAS_CPP_17
-    #define JSON_HAS_CPP_14
-#elif (defined(__cplusplus) && __cplusplus >= 201402L) || (defined(_HAS_CXX14) && _HAS_CXX14 == 1)
-    #define JSON_HAS_CPP_14
-#endif
-
-TEST_CASE("value conversion")
-{
-    SECTION("get an object (explicit)")
-    {
-        json::object_t o_reference = {{"object", json::object()},
-            {"array", {1, 2, 3, 4}},
-            {"number", 42},
-            {"boolean", false},
-            {"null", nullptr},
-            {"string", "Hello world"}
-        };
-        json j(o_reference);
-
-        SECTION("json::object_t")
-        {
-            json::object_t o = j.get<json::object_t>();
-            CHECK(json(o) == j);
-        }
-
-        SECTION("std::map<json::string_t, json>")
-        {
-            std::map<json::string_t, json> o =
-                j.get<std::map<json::string_t, json>>();
-            CHECK(json(o) == j);
-        }
-
-        SECTION("std::multimap<json::string_t, json>")
-        {
-            std::multimap<json::string_t, json> o =
-                j.get<std::multimap<json::string_t, json>>();
-            CHECK(json(o) == j);
-        }
-
-        SECTION("std::unordered_map<json::string_t, json>")
-        {
-            std::unordered_map<json::string_t, json> o =
-                j.get<std::unordered_map<json::string_t, json>>();
-            CHECK(json(o) == j);
-        }
-
-        SECTION("std::unordered_multimap<json::string_t, json>")
-        {
-            std::unordered_multimap<json::string_t, json> o =
-                j.get<std::unordered_multimap<json::string_t, json>>();
-            CHECK(json(o) == j);
-        }
-
-        SECTION("exception in case of a non-object type")
-        {
-            CHECK_THROWS_AS(json(json::value_t::null).get<json::object_t>(),
-                            json::type_error&);
-            CHECK_THROWS_AS(json(json::value_t::array).get<json::object_t>(),
-                            json::type_error&);
-            CHECK_THROWS_AS(json(json::value_t::string).get<json::object_t>(),
-                            json::type_error&);
-            CHECK_THROWS_AS(json(json::value_t::boolean).get<json::object_t>(),
-                            json::type_error&);
-            CHECK_THROWS_AS(json(json::value_t::number_integer).get<json::object_t>(),
-                            json::type_error&);
-            CHECK_THROWS_AS(
-                json(json::value_t::number_unsigned).get<json::object_t>(),
-                json::type_error&);
-            CHECK_THROWS_AS(json(json::value_t::number_float).get<json::object_t>(),
-                            json::type_error&);
-
-            CHECK_THROWS_WITH(
-                json(json::value_t::null).get<json::object_t>(),
-                "[json.exception.type_error.302] type must be object, but is null");
-            CHECK_THROWS_WITH(
-                json(json::value_t::array).get<json::object_t>(),
-                "[json.exception.type_error.302] type must be object, but is array");
-            CHECK_THROWS_WITH(
-                json(json::value_t::string).get<json::object_t>(),
-                "[json.exception.type_error.302] type must be object, but is string");
-            CHECK_THROWS_WITH(json(json::value_t::boolean).get<json::object_t>(),
-                              "[json.exception.type_error.302] type must be object, "
-                              "but is boolean");
-            CHECK_THROWS_WITH(
-                json(json::value_t::number_integer).get<json::object_t>(),
-                "[json.exception.type_error.302] type must be object, but is number");
-            CHECK_THROWS_WITH(
-                json(json::value_t::number_unsigned).get<json::object_t>(),
-                "[json.exception.type_error.302] type must be object, but is number");
-            CHECK_THROWS_WITH(
-                json(json::value_t::number_float).get<json::object_t>(),
-                "[json.exception.type_error.302] type must be object, but is number");
-        }
-    }
-
-    SECTION("get an object (explicit, get_to)")
-    {
-        json::object_t o_reference = {{"object", json::object()},
-            {"array", {1, 2, 3, 4}},
-            {"number", 42},
-            {"boolean", false},
-            {"null", nullptr},
-            {"string", "Hello world"}
-        };
-        json j(o_reference);
-
-        SECTION("json::object_t")
-        {
-            json::object_t o = {{"previous", "value"}};
-            j.get_to(o);
-            CHECK(json(o) == j);
-        }
-
-        SECTION("std::map<json::string_t, json>")
-        {
-            std::map<json::string_t, json> o{{"previous", "value"}};
-            j.get_to(o);
-            CHECK(json(o) == j);
-        }
-
-        SECTION("std::multimap<json::string_t, json>")
-        {
-            std::multimap<json::string_t, json> o{{"previous", "value"}};
-            j.get_to(o);
-            CHECK(json(o) == j);
-        }
-
-        SECTION("std::unordered_map<json::string_t, json>")
-        {
-            std::unordered_map<json::string_t, json> o{{"previous", "value"}};
-            j.get_to(o);
-            CHECK(json(o) == j);
-        }
-
-        SECTION("std::unordered_multimap<json::string_t, json>")
-        {
-            std::unordered_multimap<json::string_t, json> o{{"previous", "value"}};
-            j.get_to(o);
-            CHECK(json(o) == j);
-        }
-    }
-
-#if JSON_USE_IMPLICIT_CONVERSIONS
-    SECTION("get an object (implicit)")
-    {
-        json::object_t o_reference = {{"object", json::object()},
-            {"array", {1, 2, 3, 4}},
-            {"number", 42},
-            {"boolean", false},
-            {"null", nullptr},
-            {"string", "Hello world"}
-        };
-        json j(o_reference);
-
-        SECTION("json::object_t")
-        {
-            json::object_t o = j;
-            CHECK(json(o) == j);
-        }
-
-        SECTION("std::map<json::string_t, json>")
-        {
-            std::map<json::string_t, json> o = j;
-            CHECK(json(o) == j);
-        }
-
-        SECTION("std::multimap<json::string_t, json>")
-        {
-            std::multimap<json::string_t, json> o = j;
-            CHECK(json(o) == j);
-        }
-
-        SECTION("std::unordered_map<json::string_t, json>")
-        {
-            std::unordered_map<json::string_t, json> o = j;
-            CHECK(json(o) == j);
-        }
-
-        SECTION("std::unordered_multimap<json::string_t, json>")
-        {
-            std::unordered_multimap<json::string_t, json> o = j;
-            CHECK(json(o) == j);
-        }
-    }
-#endif
-
-    SECTION("get an array (explicit)")
-    {
-        json::array_t a_reference{json(1),     json(1u),       json(2.2),
-                                  json(false), json("string"), json()};
-        json j(a_reference);
-
-        SECTION("json::array_t")
-        {
-            json::array_t a = j.get<json::array_t>();
-            CHECK(json(a) == j);
-        }
-
-        SECTION("std::list<json>")
-        {
-            std::list<json> a = j.get<std::list<json>>();
-            CHECK(json(a) == j);
-        }
-
-        SECTION("std::forward_list<json>")
-        {
-            std::forward_list<json> a = j.get<std::forward_list<json>>();
-            CHECK(json(a) == j);
-
-            CHECK_THROWS_AS(json(json::value_t::null).get<std::forward_list<json>>(),
-                            json::type_error&);
-            CHECK_THROWS_WITH(
-                json(json::value_t::null).get<std::forward_list<json>>(),
-                "[json.exception.type_error.302] type must be array, but is null");
-        }
-
-        SECTION("std::vector<json>")
-        {
-            std::vector<json> a = j.get<std::vector<json>>();
-            CHECK(json(a) == j);
-
-            CHECK_THROWS_AS(json(json::value_t::null).get<std::vector<json>>(),
-                            json::type_error&);
-            CHECK_THROWS_WITH(
-                json(json::value_t::null).get<std::vector<json>>(),
-                "[json.exception.type_error.302] type must be array, but is null");
-
-#if !defined(JSON_NOEXCEPTION)
-            SECTION("reserve is called on containers that supports it")
-            {
-                // make sure all values are properly copied
-                json j2({1, 2, 3, 4, 5, 6, 7, 8, 9, 10});
-                auto v2 = j2.get<std::vector<int>>();
-                CHECK(v2.size() == 10);
-            }
-#endif
-        }
-
-        SECTION("built-in arrays")
-        {
-            const char str[] = "a string";
-            const int nbs[] = {0, 1, 2};
-
-            json j2 = nbs;
-            json j3 = str;
-
-            auto v = j2.get<std::vector<int>>();
-            auto s = j3.get<std::string>();
-            CHECK(std::equal(v.begin(), v.end(), std::begin(nbs)));
-            CHECK(s == str);
-        }
-
-        SECTION("std::deque<json>")
-        {
-            std::deque<json> a = j.get<std::deque<json>>();
-            CHECK(json(a) == j);
-        }
-
-        SECTION("exception in case of a non-array type")
-        {
-            CHECK_THROWS_AS(json(json::value_t::null).get<json::array_t>(),
-                            json::type_error&);
-            CHECK_THROWS_AS(json(json::value_t::object).get<json::array_t>(),
-                            json::type_error&);
-            CHECK_THROWS_AS(json(json::value_t::string).get<json::array_t>(),
-                            json::type_error&);
-            CHECK_THROWS_AS(json(json::value_t::boolean).get<json::array_t>(),
-                            json::type_error&);
-            CHECK_THROWS_AS(json(json::value_t::number_integer).get<json::array_t>(),
-                            json::type_error&);
-            CHECK_THROWS_AS(json(json::value_t::number_unsigned).get<json::array_t>(),
-                            json::type_error&);
-            CHECK_THROWS_AS(json(json::value_t::number_float).get<json::array_t>(),
-                            json::type_error&);
-
-            CHECK_THROWS_WITH(
-                json(json::value_t::object).get<std::vector<int>>(),
-                "[json.exception.type_error.302] type must be array, but is object");
-            CHECK_THROWS_WITH(
-                json(json::value_t::null).get<json::array_t>(),
-                "[json.exception.type_error.302] type must be array, but is null");
-            CHECK_THROWS_WITH(
-                json(json::value_t::object).get<json::array_t>(),
-                "[json.exception.type_error.302] type must be array, but is object");
-            CHECK_THROWS_WITH(
-                json(json::value_t::string).get<json::array_t>(),
-                "[json.exception.type_error.302] type must be array, but is string");
-            CHECK_THROWS_WITH(
-                json(json::value_t::boolean).get<json::array_t>(),
-                "[json.exception.type_error.302] type must be array, but is boolean");
-            CHECK_THROWS_WITH(
-                json(json::value_t::number_integer).get<json::array_t>(),
-                "[json.exception.type_error.302] type must be array, but is number");
-            CHECK_THROWS_WITH(
-                json(json::value_t::number_unsigned).get<json::array_t>(),
-                "[json.exception.type_error.302] type must be array, but is number");
-            CHECK_THROWS_WITH(
-                json(json::value_t::number_float).get<json::array_t>(),
-                "[json.exception.type_error.302] type must be array, but is number");
-        }
-    }
-
-    SECTION("get an array (explicit, get_to)")
-    {
-        json::array_t a_reference{json(1),     json(1u),       json(2.2),
-                                  json(false), json("string"), json()};
-        json j(a_reference);
-
-        SECTION("json::array_t")
-        {
-            json::array_t a{"previous", "value"};
-            j.get_to(a);
-            CHECK(json(a) == j);
-        }
-
-        SECTION("std::valarray<json>")
-        {
-            std::valarray<json> a{"previous", "value"};
-            j.get_to(a);
-            CHECK(json(a) == j);
-        }
-
-        SECTION("std::list<json>")
-        {
-            std::list<json> a{"previous", "value"};
-            j.get_to(a);
-            CHECK(json(a) == j);
-        }
-
-        SECTION("std::forward_list<json>")
-        {
-            std::forward_list<json> a{"previous", "value"};
-            j.get_to(a);
-            CHECK(json(a) == j);
-        }
-
-        SECTION("std::vector<json>")
-        {
-            std::vector<json> a{"previous", "value"};
-            j.get_to(a);
-            CHECK(json(a) == j);
-        }
-
-        SECTION("built-in arrays")
-        {
-            const int nbs[] = {0, 1, 2};
-            int nbs2[] = {0, 0, 0};
-
-            json j2 = nbs;
-            j2.get_to(nbs2);
-            CHECK(std::equal(std::begin(nbs), std::end(nbs), std::begin(nbs2)));
-        }
-
-        SECTION("std::deque<json>")
-        {
-            std::deque<json> a{"previous", "value"};
-            j.get_to(a);
-            CHECK(json(a) == j);
-        }
-    }
-
-#if JSON_USE_IMPLICIT_CONVERSIONS
-    SECTION("get an array (implicit)")
-    {
-        json::array_t a_reference{json(1),     json(1u),       json(2.2),
-                                  json(false), json("string"), json()};
-        json j(a_reference);
-
-        SECTION("json::array_t")
-        {
-            json::array_t a = j;
-            CHECK(json(a) == j);
-        }
-
-        SECTION("std::list<json>")
-        {
-            std::list<json> a = j;
-            CHECK(json(a) == j);
-        }
-
-        SECTION("std::forward_list<json>")
-        {
-            std::forward_list<json> a = j;
-            CHECK(json(a) == j);
-        }
-
-        SECTION("std::vector<json>")
-        {
-            std::vector<json> a = j;
-            CHECK(json(a) == j);
-        }
-
-        SECTION("std::deque<json>")
-        {
-            std::deque<json> a = j;
-            CHECK(json(a) == j);
-        }
-    }
-#endif
-
-    SECTION("get a string (explicit)")
-    {
-        json::string_t s_reference{"Hello world"};
-        json j(s_reference);
-
-        SECTION("string_t")
-        {
-            json::string_t s = j.get<json::string_t>();
-            CHECK(json(s) == j);
-        }
-
-        SECTION("std::string")
-        {
-            std::string s = j.get<std::string>();
-            CHECK(json(s) == j);
-        }
-#if defined(JSON_HAS_CPP_17)
-        SECTION("std::string_view")
-        {
-            std::string_view s = j.get<std::string_view>();
-            CHECK(json(s) == j);
-        }
-#endif
-
-        SECTION("exception in case of a non-string type")
-        {
-            CHECK_THROWS_AS(json(json::value_t::null).get<json::string_t>(),
-                            json::type_error&);
-            CHECK_THROWS_AS(json(json::value_t::object).get<json::string_t>(),
-                            json::type_error&);
-            CHECK_THROWS_AS(json(json::value_t::array).get<json::string_t>(),
-                            json::type_error&);
-            CHECK_THROWS_AS(json(json::value_t::boolean).get<json::string_t>(),
-                            json::type_error&);
-            CHECK_THROWS_AS(json(json::value_t::number_integer).get<json::string_t>(),
-                            json::type_error&);
-            CHECK_THROWS_AS(
-                json(json::value_t::number_unsigned).get<json::string_t>(),
-                json::type_error&);
-            CHECK_THROWS_AS(json(json::value_t::number_float).get<json::string_t>(),
-                            json::type_error&);
-
-            CHECK_THROWS_WITH(
-                json(json::value_t::null).get<json::string_t>(),
-                "[json.exception.type_error.302] type must be string, but is null");
-            CHECK_THROWS_WITH(
-                json(json::value_t::object).get<json::string_t>(),
-                "[json.exception.type_error.302] type must be string, but is object");
-            CHECK_THROWS_WITH(
-                json(json::value_t::array).get<json::string_t>(),
-                "[json.exception.type_error.302] type must be string, but is array");
-            CHECK_THROWS_WITH(json(json::value_t::boolean).get<json::string_t>(),
-                              "[json.exception.type_error.302] type must be string, "
-                              "but is boolean");
-            CHECK_THROWS_WITH(
-                json(json::value_t::number_integer).get<json::string_t>(),
-                "[json.exception.type_error.302] type must be string, but is number");
-            CHECK_THROWS_WITH(
-                json(json::value_t::number_unsigned).get<json::string_t>(),
-                "[json.exception.type_error.302] type must be string, but is number");
-            CHECK_THROWS_WITH(
-                json(json::value_t::number_float).get<json::string_t>(),
-                "[json.exception.type_error.302] type must be string, but is number");
-        }
-
-#if defined(JSON_HAS_CPP_17)
-        SECTION("exception in case of a non-string type using string_view")
-        {
-            CHECK_THROWS_AS(json(json::value_t::null).get<std::string_view>(), json::type_error&);
-            CHECK_THROWS_AS(json(json::value_t::object).get<std::string_view>(), json::type_error&);
-            CHECK_THROWS_AS(json(json::value_t::array).get<std::string_view>(), json::type_error&);
-            CHECK_THROWS_AS(json(json::value_t::boolean).get<std::string_view>(), json::type_error&);
-            CHECK_THROWS_AS(json(json::value_t::number_integer).get<std::string_view>(), json::type_error&);
-            CHECK_THROWS_AS(json(json::value_t::number_unsigned).get<std::string_view>(), json::type_error&);
-            CHECK_THROWS_AS(json(json::value_t::number_float).get<std::string_view>(), json::type_error&);
-
-            CHECK_THROWS_WITH(json(json::value_t::null).get<std::string_view>(),
-                              "[json.exception.type_error.302] type must be string, but is null");
-            CHECK_THROWS_WITH(json(json::value_t::object).get<std::string_view>(),
-                              "[json.exception.type_error.302] type must be string, but is object");
-            CHECK_THROWS_WITH(json(json::value_t::array).get<std::string_view>(),
-                              "[json.exception.type_error.302] type must be string, but is array");
-            CHECK_THROWS_WITH(json(json::value_t::boolean).get<std::string_view>(),
-                              "[json.exception.type_error.302] type must be string, but is boolean");
-            CHECK_THROWS_WITH(json(json::value_t::number_integer).get<std::string_view>(),
-                              "[json.exception.type_error.302] type must be string, but is number");
-            CHECK_THROWS_WITH(json(json::value_t::number_unsigned).get<std::string_view>(),
-                              "[json.exception.type_error.302] type must be string, but is number");
-            CHECK_THROWS_WITH(json(json::value_t::number_float).get<std::string_view>(),
-                              "[json.exception.type_error.302] type must be string, but is number");
-        }
-#endif
-    }
-
-    SECTION("get a string (explicit, get_to)")
-    {
-        json::string_t s_reference{"Hello world"};
-        json j(s_reference);
-
-        SECTION("string_t")
-        {
-            json::string_t s = "previous value";
-            j.get_to(s);
-            CHECK(json(s) == j);
-        }
-
-        SECTION("std::string")
-        {
-            std::string s = "previous value";
-            j.get_to(s);
-            CHECK(json(s) == j);
-        }
-#if defined(JSON_HAS_CPP_17)
-        SECTION("std::string_view")
-        {
-            std::string s = "previous value";
-            std::string_view sv = s;
-            j.get_to(sv);
-            CHECK(json(sv) == j);
-        }
-#endif
-    }
-
-    SECTION("get null (explicit)")
-    {
-        std::nullptr_t n = nullptr;
-        json j(n);
-
-        auto n2 = j.get<std::nullptr_t>();
-        CHECK(n2 == n);
-
-        CHECK_THROWS_AS(json(json::value_t::string).get<std::nullptr_t>(), json::type_error&);
-        CHECK_THROWS_AS(json(json::value_t::object).get<std::nullptr_t>(), json::type_error&);
-        CHECK_THROWS_AS(json(json::value_t::array).get<std::nullptr_t>(), json::type_error&);
-        CHECK_THROWS_AS(json(json::value_t::boolean).get<std::nullptr_t>(), json::type_error&);
-        CHECK_THROWS_AS(json(json::value_t::number_integer).get<std::nullptr_t>(), json::type_error&);
-        CHECK_THROWS_AS(json(json::value_t::number_unsigned).get<std::nullptr_t>(), json::type_error&);
-        CHECK_THROWS_AS(json(json::value_t::number_float).get<std::nullptr_t>(), json::type_error&);
-
-        CHECK_THROWS_WITH(json(json::value_t::string).get<std::nullptr_t>(),
-                          "[json.exception.type_error.302] type must be null, but is string");
-        CHECK_THROWS_WITH(json(json::value_t::object).get<std::nullptr_t>(),
-                          "[json.exception.type_error.302] type must be null, but is object");
-        CHECK_THROWS_WITH(json(json::value_t::array).get<std::nullptr_t>(),
-                          "[json.exception.type_error.302] type must be null, but is array");
-        CHECK_THROWS_WITH(json(json::value_t::boolean).get<std::nullptr_t>(),
-                          "[json.exception.type_error.302] type must be null, but is boolean");
-        CHECK_THROWS_WITH(json(json::value_t::number_integer).get<std::nullptr_t>(),
-                          "[json.exception.type_error.302] type must be null, but is number");
-        CHECK_THROWS_WITH(json(json::value_t::number_unsigned).get<std::nullptr_t>(),
-                          "[json.exception.type_error.302] type must be null, but is number");
-        CHECK_THROWS_WITH(json(json::value_t::number_float).get<std::nullptr_t>(),
-                          "[json.exception.type_error.302] type must be null, but is number");
-
-    }
-
-#if JSON_USE_IMPLICIT_CONVERSIONS
-    SECTION("get a string (implicit)")
-    {
-        json::string_t s_reference{"Hello world"};
-        json j(s_reference);
-
-        SECTION("string_t")
-        {
-            json::string_t s = j;
-            CHECK(json(s) == j);
-        }
-
-#if defined(JSON_HAS_CPP_17)
-        SECTION("std::string_view")
-        {
-            std::string_view s = j.get<std::string_view>();
-            CHECK(json(s) == j);
-        }
-#endif
-
-        SECTION("std::string")
-        {
-            std::string s = j;
-            CHECK(json(s) == j);
-        }
-    }
-#endif
-
-    SECTION("get a boolean (explicit)")
-    {
-        json::boolean_t b_reference{true};
-        json j(b_reference);
-
-        SECTION("boolean_t")
-        {
-            json::boolean_t b = j.get<json::boolean_t>();
-            CHECK(json(b) == j);
-        }
-
-        SECTION("uint8_t")
-        {
-            auto n = j.get<uint8_t>();
-            CHECK(n == 1);
-        }
-
-        SECTION("bool")
-        {
-            bool b = j.get<bool>();
-            CHECK(json(b) == j);
-        }
-
-        SECTION("exception in case of a non-number type")
-        {
-            CHECK_THROWS_AS(json(json::value_t::null).get<json::boolean_t>(),
-                            json::type_error&);
-            CHECK_THROWS_AS(json(json::value_t::object).get<json::boolean_t>(),
-                            json::type_error&);
-            CHECK_THROWS_AS(json(json::value_t::array).get<json::boolean_t>(),
-                            json::type_error&);
-            CHECK_THROWS_AS(json(json::value_t::string).get<json::boolean_t>(),
-                            json::type_error&);
-            CHECK_THROWS_AS(json(json::value_t::string).get<uint8_t>(),
-                            json::type_error&);
-            CHECK_THROWS_AS(
-                json(json::value_t::number_integer).get<json::boolean_t>(),
-                json::type_error&);
-            CHECK_THROWS_AS(
-                json(json::value_t::number_unsigned).get<json::boolean_t>(),
-                json::type_error&);
-            CHECK_THROWS_AS(json(json::value_t::number_float).get<json::boolean_t>(),
-                            json::type_error&);
-
-            CHECK_THROWS_WITH(
-                json(json::value_t::null).get<json::boolean_t>(),
-                "[json.exception.type_error.302] type must be boolean, but is null");
-            CHECK_THROWS_WITH(json(json::value_t::object).get<json::boolean_t>(),
-                              "[json.exception.type_error.302] type must be boolean, "
-                              "but is object");
-            CHECK_THROWS_WITH(
-                json(json::value_t::array).get<json::boolean_t>(),
-                "[json.exception.type_error.302] type must be boolean, but is array");
-            CHECK_THROWS_WITH(json(json::value_t::string).get<json::boolean_t>(),
-                              "[json.exception.type_error.302] type must be boolean, "
-                              "but is string");
-            CHECK_THROWS_WITH(
-                json(json::value_t::number_integer).get<json::boolean_t>(),
-                "[json.exception.type_error.302] type must be boolean, but is "
-                "number");
-            CHECK_THROWS_WITH(
-                json(json::value_t::number_unsigned).get<json::boolean_t>(),
-                "[json.exception.type_error.302] type must be boolean, but is "
-                "number");
-            CHECK_THROWS_WITH(
-                json(json::value_t::number_float).get<json::boolean_t>(),
-                "[json.exception.type_error.302] type must be boolean, but is "
-                "number");
-        }
-    }
-
-#if JSON_USE_IMPLICIT_CONVERSIONS
-    SECTION("get a boolean (implicit)")
-    {
-        json::boolean_t b_reference{true};
-        json j(b_reference);
-
-        SECTION("boolean_t")
-        {
-            json::boolean_t b = j;
-            CHECK(json(b) == j);
-        }
-
-        SECTION("bool")
-        {
-            bool b = j;
-            CHECK(json(b) == j);
-        }
-    }
-#endif
-
-    SECTION("get an integer number (explicit)")
-    {
-        json::number_integer_t n_reference{42};
-        json j(n_reference);
-        json::number_unsigned_t n_unsigned_reference{42u};
-        json j_unsigned(n_unsigned_reference);
-
-        SECTION("number_integer_t")
-        {
-            json::number_integer_t n = j.get<json::number_integer_t>();
-            CHECK(json(n) == j);
-        }
-
-        SECTION("number_unsigned_t")
-        {
-            json::number_unsigned_t n = j_unsigned.get<json::number_unsigned_t>();
-            CHECK(json(n) == j_unsigned);
-        }
-
-        SECTION("short")
-        {
-            short n = j.get<short>();
-            CHECK(json(n) == j);
-        }
-
-        SECTION("unsigned short")
-        {
-            unsigned short n = j.get<unsigned short>();
-            CHECK(json(n) == j);
-        }
-
-        SECTION("int")
-        {
-            int n = j.get<int>();
-            CHECK(json(n) == j);
-        }
-
-        SECTION("unsigned int")
-        {
-            unsigned int n = j.get<unsigned int>();
-            CHECK(json(n) == j);
-        }
-
-        SECTION("long")
-        {
-            long n = j.get<long>();
-            CHECK(json(n) == j);
-        }
-
-        SECTION("unsigned long")
-        {
-            unsigned long n = j.get<unsigned long>();
-            CHECK(json(n) == j);
-        }
-
-        SECTION("long long")
-        {
-            long long n = j.get<long long>();
-            CHECK(json(n) == j);
-        }
-
-        SECTION("unsigned long long")
-        {
-            unsigned long long n = j.get<unsigned long long>();
-            CHECK(json(n) == j);
-        }
-
-        SECTION("int8_t")
-        {
-            int8_t n = j.get<int8_t>();
-            CHECK(json(n) == j);
-        }
-
-        SECTION("int16_t")
-        {
-            int16_t n = j.get<int16_t>();
-            CHECK(json(n) == j);
-        }
-
-        SECTION("int32_t")
-        {
-            int32_t n = j.get<int32_t>();
-            CHECK(json(n) == j);
-        }
-
-        SECTION("int64_t")
-        {
-            int64_t n = j.get<int64_t>();
-            CHECK(json(n) == j);
-        }
-
-        SECTION("int8_fast_t")
-        {
-            int_fast8_t n = j.get<int_fast8_t>();
-            CHECK(json(n) == j);
-        }
-
-        SECTION("int16_fast_t")
-        {
-            int_fast16_t n = j.get<int_fast16_t>();
-            CHECK(json(n) == j);
-        }
-
-        SECTION("int32_fast_t")
-        {
-            int_fast32_t n = j.get<int_fast32_t>();
-            CHECK(json(n) == j);
-        }
-
-        SECTION("int64_fast_t")
-        {
-            int_fast64_t n = j.get<int_fast64_t>();
-            CHECK(json(n) == j);
-        }
-
-        SECTION("int8_least_t")
-        {
-            int_least8_t n = j.get<int_least8_t>();
-            CHECK(json(n) == j);
-        }
-
-        SECTION("int16_least_t")
-        {
-            int_least16_t n = j.get<int_least16_t>();
-            CHECK(json(n) == j);
-        }
-
-        SECTION("int32_least_t")
-        {
-            int_least32_t n = j.get<int_least32_t>();
-            CHECK(json(n) == j);
-        }
-
-        SECTION("int64_least_t")
-        {
-            int_least64_t n = j.get<int_least64_t>();
-            CHECK(json(n) == j);
-        }
-
-        SECTION("uint8_t")
-        {
-            uint8_t n = j.get<uint8_t>();
-            CHECK(json(n) == j);
-        }
-
-        SECTION("uint16_t")
-        {
-            uint16_t n = j.get<uint16_t>();
-            CHECK(json(n) == j);
-        }
-
-        SECTION("uint32_t")
-        {
-            uint32_t n = j.get<uint32_t>();
-            CHECK(json(n) == j);
-        }
-
-        SECTION("uint64_t")
-        {
-            uint64_t n = j.get<uint64_t>();
-            CHECK(json(n) == j);
-        }
-
-        SECTION("uint8_fast_t")
-        {
-            uint_fast8_t n = j.get<uint_fast8_t>();
-            CHECK(json(n) == j);
-        }
-
-        SECTION("uint16_fast_t")
-        {
-            uint_fast16_t n = j.get<uint_fast16_t>();
-            CHECK(json(n) == j);
-        }
-
-        SECTION("uint32_fast_t")
-        {
-            uint_fast32_t n = j.get<uint_fast32_t>();
-            CHECK(json(n) == j);
-        }
-
-        SECTION("uint64_fast_t")
-        {
-            uint_fast64_t n = j.get<uint_fast64_t>();
-            CHECK(json(n) == j);
-        }
-
-        SECTION("uint8_least_t")
-        {
-            uint_least8_t n = j.get<uint_least8_t>();
-            CHECK(json(n) == j);
-        }
-
-        SECTION("uint16_least_t")
-        {
-            uint_least16_t n = j.get<uint_least16_t>();
-            CHECK(json(n) == j);
-        }
-
-        SECTION("uint32_least_t")
-        {
-            uint_least32_t n = j.get<uint_least32_t>();
-            CHECK(json(n) == j);
-        }
-
-        SECTION("uint64_least_t")
-        {
-            uint_least64_t n = j.get<uint_least64_t>();
-            CHECK(json(n) == j);
-        }
-
-        SECTION("exception in case of a non-number type")
-        {
-            CHECK_THROWS_AS(json(json::value_t::null).get<json::number_integer_t>(),
-                            json::type_error&);
-            CHECK_THROWS_AS(json(json::value_t::object).get<json::number_integer_t>(),
-                            json::type_error&);
-            CHECK_THROWS_AS(json(json::value_t::array).get<json::number_integer_t>(),
-                            json::type_error&);
-            CHECK_THROWS_AS(json(json::value_t::string).get<json::number_integer_t>(),
-                            json::type_error&);
-            CHECK_THROWS_AS(
-                json(json::value_t::boolean).get<json::number_integer_t>(),
-                json::type_error&);
-
-            CHECK_THROWS_WITH(
-                json(json::value_t::null).get<json::number_integer_t>(),
-                "[json.exception.type_error.302] type must be number, but is null");
-            CHECK_THROWS_WITH(
-                json(json::value_t::object).get<json::number_integer_t>(),
-                "[json.exception.type_error.302] type must be number, but is object");
-            CHECK_THROWS_WITH(
-                json(json::value_t::array).get<json::number_integer_t>(),
-                "[json.exception.type_error.302] type must be number, but is array");
-            CHECK_THROWS_WITH(
-                json(json::value_t::string).get<json::number_integer_t>(),
-                "[json.exception.type_error.302] type must be number, but is string");
-            CHECK_THROWS_WITH(
-                json(json::value_t::boolean).get<json::number_integer_t>(),
-                "[json.exception.type_error.302] type must be number, but is "
-                "boolean");
-
-            CHECK_NOTHROW(
-                json(json::value_t::number_float).get<json::number_integer_t>());
-            CHECK_NOTHROW(
-                json(json::value_t::number_float).get<json::number_unsigned_t>());
-        }
-    }
-
-#if JSON_USE_IMPLICIT_CONVERSIONS
-    SECTION("get an integer number (implicit)")
-    {
-        json::number_integer_t n_reference{42};
-        json j(n_reference);
-        json::number_unsigned_t n_unsigned_reference{42u};
-        json j_unsigned(n_unsigned_reference);
-
-        SECTION("number_integer_t")
-        {
-            json::number_integer_t n = j.get<json::number_integer_t>();
-            CHECK(json(n) == j);
-        }
-
-        SECTION("number_unsigned_t")
-        {
-            json::number_unsigned_t n = j_unsigned.get<json::number_unsigned_t>();
-            CHECK(json(n) == j_unsigned);
-        }
-
-        SECTION("short")
-        {
-            short n = j;
-            CHECK(json(n) == j);
-        }
-
-        SECTION("unsigned short")
-        {
-            unsigned short n = j_unsigned;
-            CHECK(json(n) == j_unsigned);
-        }
-
-        SECTION("int")
-        {
-            int n = j;
-            CHECK(json(n) == j);
-        }
-
-        SECTION("unsigned int")
-        {
-            unsigned int n = j_unsigned;
-            CHECK(json(n) == j_unsigned);
-        }
-
-        SECTION("long")
-        {
-            long n = j;
-            CHECK(json(n) == j);
-        }
-
-        SECTION("unsigned long")
-        {
-            unsigned long n = j_unsigned;
-            CHECK(json(n) == j_unsigned);
-        }
-
-        SECTION("long long")
-        {
-            long long n = j;
-            CHECK(json(n) == j);
-        }
-
-        SECTION("unsigned long long")
-        {
-            unsigned long long n = j_unsigned;
-            CHECK(json(n) == j_unsigned);
-        }
-
-        SECTION("int8_t")
-        {
-            int8_t n = j;
-            CHECK(json(n) == j);
-        }
-
-        SECTION("int16_t")
-        {
-            int16_t n = j;
-            CHECK(json(n) == j);
-        }
-
-        SECTION("int32_t")
-        {
-            int32_t n = j;
-            CHECK(json(n) == j);
-        }
-
-        SECTION("int64_t")
-        {
-            int64_t n = j;
-            CHECK(json(n) == j);
-        }
-
-        SECTION("int8_fast_t")
-        {
-            int_fast8_t n = j;
-            CHECK(json(n) == j);
-        }
-
-        SECTION("int16_fast_t")
-        {
-            int_fast16_t n = j;
-            CHECK(json(n) == j);
-        }
-
-        SECTION("int32_fast_t")
-        {
-            int_fast32_t n = j;
-            CHECK(json(n) == j);
-        }
-
-        SECTION("int64_fast_t")
-        {
-            int_fast64_t n = j;
-            CHECK(json(n) == j);
-        }
-
-        SECTION("int8_least_t")
-        {
-            int_least8_t n = j;
-            CHECK(json(n) == j);
-        }
-
-        SECTION("int16_least_t")
-        {
-            int_least16_t n = j;
-            CHECK(json(n) == j);
-        }
-
-        SECTION("int32_least_t")
-        {
-            int_least32_t n = j;
-            CHECK(json(n) == j);
-        }
-
-        SECTION("int64_least_t")
-        {
-            int_least64_t n = j;
-            CHECK(json(n) == j);
-        }
-
-        SECTION("uint8_t")
-        {
-            uint8_t n = j_unsigned;
-            CHECK(json(n) == j_unsigned);
-        }
-
-        SECTION("uint16_t")
-        {
-            uint16_t n = j_unsigned;
-            CHECK(json(n) == j_unsigned);
-        }
-
-        SECTION("uint32_t")
-        {
-            uint32_t n = j_unsigned;
-            CHECK(json(n) == j_unsigned);
-        }
-
-        SECTION("uint64_t")
-        {
-            uint64_t n = j_unsigned;
-            CHECK(json(n) == j_unsigned);
-        }
-
-        SECTION("uint8_fast_t")
-        {
-            uint_fast8_t n = j_unsigned;
-            CHECK(json(n) == j_unsigned);
-        }
-
-        SECTION("uint16_fast_t")
-        {
-            uint_fast16_t n = j_unsigned;
-            CHECK(json(n) == j_unsigned);
-        }
-
-        SECTION("uint32_fast_t")
-        {
-            uint_fast32_t n = j_unsigned;
-            CHECK(json(n) == j_unsigned);
-        }
-
-        SECTION("uint64_fast_t")
-        {
-            uint_fast64_t n = j_unsigned;
-            CHECK(json(n) == j_unsigned);
-        }
-
-        SECTION("uint8_least_t")
-        {
-            uint_least8_t n = j_unsigned;
-            CHECK(json(n) == j_unsigned);
-        }
-
-        SECTION("uint16_least_t")
-        {
-            uint_least16_t n = j_unsigned;
-            CHECK(json(n) == j_unsigned);
-        }
-
-        SECTION("uint32_least_t")
-        {
-            uint_least32_t n = j_unsigned;
-            CHECK(json(n) == j_unsigned);
-        }
-
-        SECTION("uint64_least_t")
-        {
-            uint_least64_t n = j_unsigned;
-            CHECK(json(n) == j_unsigned);
-        }
-    }
-#endif
-
-    SECTION("get a floating-point number (explicit)")
-    {
-        json::number_float_t n_reference{42.23};
-        json j(n_reference);
-
-        SECTION("number_float_t")
-        {
-            json::number_float_t n = j.get<json::number_float_t>();
-            CHECK(json(n).m_value.number_float == Approx(j.m_value.number_float));
-        }
-
-        SECTION("float")
-        {
-            float n = j.get<float>();
-            CHECK(json(n).m_value.number_float == Approx(j.m_value.number_float));
-        }
-
-        SECTION("double")
-        {
-            double n = j.get<double>();
-            CHECK(json(n).m_value.number_float == Approx(j.m_value.number_float));
-        }
-
-        SECTION("exception in case of a non-string type")
-        {
-            CHECK_THROWS_AS(json(json::value_t::null).get<json::number_float_t>(),
-                            json::type_error&);
-            CHECK_THROWS_AS(json(json::value_t::object).get<json::number_float_t>(),
-                            json::type_error&);
-            CHECK_THROWS_AS(json(json::value_t::array).get<json::number_float_t>(),
-                            json::type_error&);
-            CHECK_THROWS_AS(json(json::value_t::string).get<json::number_float_t>(),
-                            json::type_error&);
-            CHECK_THROWS_AS(json(json::value_t::boolean).get<json::number_float_t>(),
-                            json::type_error&);
-
-            CHECK_THROWS_WITH(
-                json(json::value_t::null).get<json::number_float_t>(),
-                "[json.exception.type_error.302] type must be number, but is null");
-            CHECK_THROWS_WITH(
-                json(json::value_t::object).get<json::number_float_t>(),
-                "[json.exception.type_error.302] type must be number, but is object");
-            CHECK_THROWS_WITH(
-                json(json::value_t::array).get<json::number_float_t>(),
-                "[json.exception.type_error.302] type must be number, but is array");
-            CHECK_THROWS_WITH(
-                json(json::value_t::string).get<json::number_float_t>(),
-                "[json.exception.type_error.302] type must be number, but is string");
-            CHECK_THROWS_WITH(
-                json(json::value_t::boolean).get<json::number_float_t>(),
-                "[json.exception.type_error.302] type must be number, but is "
-                "boolean");
-
-            CHECK_NOTHROW(
-                json(json::value_t::number_integer).get<json::number_float_t>());
-            CHECK_NOTHROW(
-                json(json::value_t::number_unsigned).get<json::number_float_t>());
-        }
-    }
-
-#if JSON_USE_IMPLICIT_CONVERSIONS
-    SECTION("get a floating-point number (implicit)")
-    {
-        json::number_float_t n_reference{42.23};
-        json j(n_reference);
-
-        SECTION("number_float_t")
-        {
-            json::number_float_t n = j;
-            CHECK(json(n).m_value.number_float == Approx(j.m_value.number_float));
-        }
-
-        SECTION("float")
-        {
-            float n = j;
-            CHECK(json(n).m_value.number_float == Approx(j.m_value.number_float));
-        }
-
-        SECTION("double")
-        {
-            double n = j;
-            CHECK(json(n).m_value.number_float == Approx(j.m_value.number_float));
-        }
-    }
-#endif
-
-    SECTION("get a binary value (explicit)")
-    {
-        json::binary_t n_reference{{1, 2, 3}};
-        json j(n_reference);
-
-        SECTION("binary_t")
-        {
-            json::binary_t b = j.get<json::binary_t>();
-            CHECK(*json(b).m_value.binary == *j.m_value.binary);
-        }
-
-        SECTION("get_binary()")
-        {
-            SECTION("non-const")
-            {
-                auto& b = j.get_binary();
-                CHECK(*json(b).m_value.binary == *j.m_value.binary);
-            }
-
-            SECTION("non-const")
-            {
-                const json j_const = j;
-                const auto& b = j_const.get_binary();
-                CHECK(*json(b).m_value.binary == *j.m_value.binary);
-            }
-        }
-
-        SECTION("exception in case of a non-string type")
-        {
-            json j_null(json::value_t::null);
-            json j_object(json::value_t::object);
-            json j_array(json::value_t::array);
-            json j_string(json::value_t::string);
-            json j_boolean(json::value_t::boolean);
-            const json j_null_const(json::value_t::null);
-            const json j_object_const(json::value_t::object);
-            const json j_array_const(json::value_t::array);
-            const json j_string_const(json::value_t::string);
-            const json j_boolean_const(json::value_t::boolean);
-
-            CHECK_THROWS_WITH_AS(j_null.get<json::binary_t>(),
-                                 "[json.exception.type_error.302] type must be binary, but is null",
-                                 json::type_error&);
-            CHECK_THROWS_WITH_AS(j_object.get<json::binary_t>(),
-                                 "[json.exception.type_error.302] type must be binary, but is object",
-                                 json::type_error&);
-            CHECK_THROWS_WITH_AS(j_array.get<json::binary_t>(),
-                                 "[json.exception.type_error.302] type must be binary, but is array",
-                                 json::type_error&);
-            CHECK_THROWS_WITH_AS(j_string.get<json::binary_t>(),
-                                 "[json.exception.type_error.302] type must be binary, but is string",
-                                 json::type_error&);
-            CHECK_THROWS_WITH_AS(j_boolean.get<json::binary_t>(),
-                                 "[json.exception.type_error.302] type must be binary, but is boolean",
-                                 json::type_error&);
-
-            CHECK_THROWS_WITH_AS(j_null_const.get<json::binary_t>(),
-                                 "[json.exception.type_error.302] type must be binary, but is null",
-                                 json::type_error&);
-            CHECK_THROWS_WITH_AS(j_object_const.get<json::binary_t>(),
-                                 "[json.exception.type_error.302] type must be binary, but is object",
-                                 json::type_error&);
-            CHECK_THROWS_WITH_AS(j_array_const.get<json::binary_t>(),
-                                 "[json.exception.type_error.302] type must be binary, but is array",
-                                 json::type_error&);
-            CHECK_THROWS_WITH_AS(j_string_const.get<json::binary_t>(),
-                                 "[json.exception.type_error.302] type must be binary, but is string",
-                                 json::type_error&);
-            CHECK_THROWS_WITH_AS(j_boolean_const.get<json::binary_t>(),
-                                 "[json.exception.type_error.302] type must be binary, but is boolean",
-                                 json::type_error&);
-
-            CHECK_THROWS_WITH_AS(j_null.get_binary(),
-                                 "[json.exception.type_error.302] type must be binary, but is null",
-                                 json::type_error&);
-            CHECK_THROWS_WITH_AS(j_object.get_binary(),
-                                 "[json.exception.type_error.302] type must be binary, but is object",
-                                 json::type_error&);
-            CHECK_THROWS_WITH_AS(j_array.get_binary(),
-                                 "[json.exception.type_error.302] type must be binary, but is array",
-                                 json::type_error&);
-            CHECK_THROWS_WITH_AS(j_string.get_binary(),
-                                 "[json.exception.type_error.302] type must be binary, but is string",
-                                 json::type_error&);
-            CHECK_THROWS_WITH_AS(j_boolean.get_binary(),
-                                 "[json.exception.type_error.302] type must be binary, but is boolean",
-                                 json::type_error&);
-
-            CHECK_THROWS_WITH_AS(j_null_const.get_binary(),
-                                 "[json.exception.type_error.302] type must be binary, but is null",
-                                 json::type_error&);
-            CHECK_THROWS_WITH_AS(j_object_const.get_binary(),
-                                 "[json.exception.type_error.302] type must be binary, but is object",
-                                 json::type_error&);
-            CHECK_THROWS_WITH_AS(j_array_const.get_binary(),
-                                 "[json.exception.type_error.302] type must be binary, but is array",
-                                 json::type_error&);
-            CHECK_THROWS_WITH_AS(j_string_const.get_binary(),
-                                 "[json.exception.type_error.302] type must be binary, but is string",
-                                 json::type_error&);
-            CHECK_THROWS_WITH_AS(j_boolean_const.get_binary(),
-                                 "[json.exception.type_error.302] type must be binary, but is boolean",
-                                 json::type_error&);
-        }
-    }
-
-#if JSON_USE_IMPLICIT_CONVERSIONS
-    SECTION("get a binary value (implicit)")
-    {
-        json::binary_t n_reference{{1, 2, 3}};
-        json j(n_reference);
-
-        SECTION("binary_t")
-        {
-            json::binary_t b = j;
-            CHECK(*json(b).m_value.binary == *j.m_value.binary);
-        }
-    }
-#endif
-
-    SECTION("get an enum")
-    {
-        enum c_enum { value_1, value_2 };
-        enum class cpp_enum { value_1, value_2 };
-
-        CHECK(json(value_1).get<c_enum>() == value_1);
-        CHECK(json(cpp_enum::value_1).get<cpp_enum>() == cpp_enum::value_1);
-    }
-
-    SECTION("more involved conversions")
-    {
-        SECTION("object-like STL containers")
-        {
-            json j1 = {{"one", 1}, {"two", 2}, {"three", 3}};
-            json j2 = {{"one", 1u}, {"two", 2u}, {"three", 3u}};
-            json j3 = {{"one", 1.1}, {"two", 2.2}, {"three", 3.3}};
-            json j4 = {{"one", true}, {"two", false}, {"three", true}};
-            json j5 = {{"one", "eins"}, {"two", "zwei"}, {"three", "drei"}};
-
-            SECTION("std::map")
-            {
-                j1.get<std::map<std::string, int>>();
-                j2.get<std::map<std::string, unsigned int>>();
-                j3.get<std::map<std::string, double>>();
-                j4.get<std::map<std::string, bool>>();
-                j5.get<std::map<std::string, std::string>>();
-            }
-
-            SECTION("std::unordered_map")
-            {
-                j1.get<std::unordered_map<std::string, int>>();
-                j2.get<std::unordered_map<std::string, unsigned int>>();
-                j3.get<std::unordered_map<std::string, double>>();
-                j4.get<std::unordered_map<std::string, bool>>();
-                j5.get<std::unordered_map<std::string, std::string>>();
-                // CHECK(m5["one"] == "eins");
-            }
-
-            SECTION("std::multimap")
-            {
-                j1.get<std::multimap<std::string, int>>();
-                j2.get<std::multimap<std::string, unsigned int>>();
-                j3.get<std::multimap<std::string, double>>();
-                j4.get<std::multimap<std::string, bool>>();
-                j5.get<std::multimap<std::string, std::string>>();
-                // CHECK(m5["one"] == "eins");
-            }
-
-            SECTION("std::unordered_multimap")
-            {
-                j1.get<std::unordered_multimap<std::string, int>>();
-                j2.get<std::unordered_multimap<std::string, unsigned int>>();
-                j3.get<std::unordered_multimap<std::string, double>>();
-                j4.get<std::unordered_multimap<std::string, bool>>();
-                j5.get<std::unordered_multimap<std::string, std::string>>();
-                // CHECK(m5["one"] == "eins");
-            }
-
-            SECTION("exception in case of a non-object type")
-            {
-                CHECK_THROWS_AS((json().get<std::map<std::string, int>>()),
-                                json::type_error&);
-                CHECK_THROWS_WITH(
-                    (json().get<std::map<std::string, int>>()),
-                    "[json.exception.type_error.302] type must be object, but is null");
-            }
-        }
-
-        SECTION("array-like STL containers")
-        {
-            json j1 = {1, 2, 3, 4};
-            json j2 = {1u, 2u, 3u, 4u};
-            json j3 = {1.2, 2.3, 3.4, 4.5};
-            json j4 = {true, false, true};
-            json j5 = {"one", "two", "three"};
-
-            SECTION("std::list")
-            {
-                j1.get<std::list<int>>();
-                j2.get<std::list<unsigned int>>();
-                j3.get<std::list<double>>();
-                j4.get<std::list<bool>>();
-                j5.get<std::list<std::string>>();
-            }
-
-            SECTION("std::forward_list")
-            {
-                j1.get<std::forward_list<int>>();
-                j2.get<std::forward_list<unsigned int>>();
-                j3.get<std::forward_list<double>>();
-                j4.get<std::forward_list<bool>>();
-                j5.get<std::forward_list<std::string>>();
-            }
-
-            SECTION("std::array")
-            {
-                j1.get<std::array<int, 4>>();
-                j2.get<std::array<unsigned int, 3>>();
-                j3.get<std::array<double, 4>>();
-                j4.get<std::array<bool, 3>>();
-                j5.get<std::array<std::string, 3>>();
-
-                SECTION("std::array is larger than JSON")
-                {
-                    std::array<int, 6> arr6 = {{1, 2, 3, 4, 5, 6}};
-                    CHECK_THROWS_AS(j1.get_to(arr6), json::out_of_range&);
-                    CHECK_THROWS_WITH(j1.get_to(arr6), "[json.exception.out_of_range.401] "
-                                      "array index 4 is out of range");
-                }
-
-                SECTION("std::array is smaller than JSON")
-                {
-                    std::array<int, 2> arr2 = {{8, 9}};
-                    j1.get_to(arr2);
-                    CHECK(arr2[0] == 1);
-                    CHECK(arr2[1] == 2);
-                }
-            }
-
-            SECTION("std::valarray")
-            {
-                j1.get<std::valarray<int>>();
-                j2.get<std::valarray<unsigned int>>();
-                j3.get<std::valarray<double>>();
-                j4.get<std::valarray<bool>>();
-                j5.get<std::valarray<std::string>>();
-            }
-
-            SECTION("std::vector")
-            {
-                j1.get<std::vector<int>>();
-                j2.get<std::vector<unsigned int>>();
-                j3.get<std::vector<double>>();
-                j4.get<std::vector<bool>>();
-                j5.get<std::vector<std::string>>();
-            }
-
-            SECTION("std::deque")
-            {
-                j1.get<std::deque<int>>();
-                j2.get<std::deque<unsigned int>>();
-                j2.get<std::deque<double>>();
-                j4.get<std::deque<bool>>();
-                j5.get<std::deque<std::string>>();
-            }
-
-            SECTION("std::set")
-            {
-                j1.get<std::set<int>>();
-                j2.get<std::set<unsigned int>>();
-                j3.get<std::set<double>>();
-                j4.get<std::set<bool>>();
-                j5.get<std::set<std::string>>();
-            }
-
-            SECTION("std::unordered_set")
-            {
-                j1.get<std::unordered_set<int>>();
-                j2.get<std::unordered_set<unsigned int>>();
-                j3.get<std::unordered_set<double>>();
-                j4.get<std::unordered_set<bool>>();
-                j5.get<std::unordered_set<std::string>>();
-            }
-
-            SECTION("std::map (array of pairs)")
-            {
-                std::map<int, int> m{{0, 1}, {1, 2}, {2, 3}};
-                json j6 = m;
-
-                auto m2 = j6.get<std::map<int, int>>();
-                CHECK(m == m2);
-
-                json j7 = {0, 1, 2, 3};
-                json j8 = 2;
-                CHECK_THROWS_AS((j7.get<std::map<int, int>>()), json::type_error&);
-                CHECK_THROWS_AS((j8.get<std::map<int, int>>()), json::type_error&);
-                CHECK_THROWS_WITH((j7.get<std::map<int, int>>()),
-                                  "[json.exception.type_error.302] type must be array, "
-                                  "but is number");
-                CHECK_THROWS_WITH((j8.get<std::map<int, int>>()),
-                                  "[json.exception.type_error.302] type must be array, "
-                                  "but is number");
-
-                SECTION("superfluous entries")
-                {
-                    json j9 = {{0, 1, 2}, {1, 2, 3}, {2, 3, 4}};
-                    m2 = j9.get<std::map<int, int>>();
-                    CHECK(m == m2);
-                }
-            }
-
-            SECTION("std::unordered_map (array of pairs)")
-            {
-                std::unordered_map<int, int> m{{0, 1}, {1, 2}, {2, 3}};
-                json j6 = m;
-
-                auto m2 = j6.get<std::unordered_map<int, int>>();
-                CHECK(m == m2);
-
-                json j7 = {0, 1, 2, 3};
-                json j8 = 2;
-                CHECK_THROWS_AS((j7.get<std::unordered_map<int, int>>()), json::type_error&);
-                CHECK_THROWS_AS((j8.get<std::unordered_map<int, int>>()), json::type_error&);
-                CHECK_THROWS_WITH((j7.get<std::unordered_map<int, int>>()),
-                                  "[json.exception.type_error.302] type must be array, "
-                                  "but is number");
-                CHECK_THROWS_WITH((j8.get<std::unordered_map<int, int>>()),
-                                  "[json.exception.type_error.302] type must be array, "
-                                  "but is number");
-
-                SECTION("superfluous entries")
-                {
-                    json j9{{0, 1, 2}, {1, 2, 3}, {2, 3, 4}};
-                    m2 = j9.get<std::unordered_map<int, int>>();
-                    CHECK(m == m2);
-                }
-            }
-
-            SECTION("exception in case of a non-object type")
-            {
-                CHECK_THROWS_AS((json().get<std::list<int>>()), json::type_error&);
-                CHECK_THROWS_AS((json().get<std::vector<int>>()), json::type_error&);
-                CHECK_THROWS_AS((json().get<std::vector<json>>()), json::type_error&);
-                CHECK_THROWS_AS((json().get<std::list<json>>()), json::type_error&);
-                CHECK_THROWS_AS((json().get<std::valarray<int>>()), json::type_error&);
-
-                // does type really must be an array? or it rather must not be null?
-                // that's what I thought when other test like this one broke
-                CHECK_THROWS_WITH(
-                    (json().get<std::list<int>>()),
-                    "[json.exception.type_error.302] type must be array, but is null");
-                CHECK_THROWS_WITH(
-                    (json().get<std::vector<int>>()),
-                    "[json.exception.type_error.302] type must be array, but is null");
-                CHECK_THROWS_WITH(
-                    (json().get<std::vector<json>>()),
-                    "[json.exception.type_error.302] type must be array, but is null");
-                CHECK_THROWS_WITH(
-                    (json().get<std::list<json>>()),
-                    "[json.exception.type_error.302] type must be array, but is null");
-                CHECK_THROWS_WITH(
-                    (json().get<std::valarray<int>>()),
-                    "[json.exception.type_error.302] type must be array, but is null");
-                CHECK_THROWS_WITH(
-                    (json().get<std::map<int, int>>()),
-                    "[json.exception.type_error.302] type must be array, but is null");
-            }
-        }
-    }
-}
-
-enum class cards {kreuz, pik, herz, karo};
-
-NLOHMANN_JSON_SERIALIZE_ENUM(cards,
-{
-    {cards::kreuz, "kreuz"},
-    {cards::pik, "pik"},
-    {cards::pik, "puk"},  // second entry for cards::puk; will not be used
-    {cards::herz, "herz"},
-    {cards::karo, "karo"}
-})
-
-enum TaskState
-{
-    TS_STOPPED,
-    TS_RUNNING,
-    TS_COMPLETED,
-    TS_INVALID = -1,
-};
-
-NLOHMANN_JSON_SERIALIZE_ENUM(TaskState,
-{
-    {TS_INVALID, nullptr},
-    {TS_STOPPED, "stopped"},
-    {TS_RUNNING, "running"},
-    {TS_COMPLETED, "completed"},
-})
-
-TEST_CASE("JSON to enum mapping")
-{
-    SECTION("enum class")
-    {
-        // enum -> json
-        CHECK(json(cards::kreuz) == "kreuz");
-        CHECK(json(cards::pik) == "pik");
-        CHECK(json(cards::herz) == "herz");
-        CHECK(json(cards::karo) == "karo");
-
-        // json -> enum
-        CHECK(cards::kreuz == json("kreuz"));
-        CHECK(cards::pik == json("pik"));
-        CHECK(cards::herz == json("herz"));
-        CHECK(cards::karo == json("karo"));
-
-        // invalid json -> first enum
-        CHECK(cards::kreuz == json("what?").get<cards>());
-    }
-
-    SECTION("traditional enum")
-    {
-        // enum -> json
-        CHECK(json(TS_STOPPED) == "stopped");
-        CHECK(json(TS_RUNNING) == "running");
-        CHECK(json(TS_COMPLETED) == "completed");
-        CHECK(json(TS_INVALID) == json());
-
-        // json -> enum
-        CHECK(TS_STOPPED == json("stopped"));
-        CHECK(TS_RUNNING == json("running"));
-        CHECK(TS_COMPLETED == json("completed"));
-        CHECK(TS_INVALID == json());
-
-        // invalid json -> first enum
-        CHECK(TS_INVALID == json("what?").get<TaskState>());
-    }
-}
-
-#ifdef JSON_HAS_CPP_17
-    #undef JSON_HAS_CPP_17
-#endif
-
-#ifdef JSON_HAS_CPP_14
-    #undef JSON_HAS_CPP_14
-#endif
diff --git a/external_imported/json/test/src/unit-deserialization.cpp b/external_imported/json/test/src/unit-deserialization.cpp
deleted file mode 100644
index d2db7e80c..000000000
--- a/external_imported/json/test/src/unit-deserialization.cpp
+++ /dev/null
@@ -1,1114 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include "doctest_compatibility.h"
-
-#include <nlohmann/json.hpp>
-using nlohmann::json;
-
-#include <iostream>
-#include <sstream>
-#include <valarray>
-
-namespace
-{
-struct SaxEventLogger : public nlohmann::json_sax<json>
-{
-    bool null() override
-    {
-        events.push_back("null()");
-        return true;
-    }
-
-    bool boolean(bool val) override
-    {
-        events.push_back(val ? "boolean(true)" : "boolean(false)");
-        return true;
-    }
-
-    bool number_integer(json::number_integer_t val) override
-    {
-        events.push_back("number_integer(" + std::to_string(val) + ")");
-        return true;
-    }
-
-    bool number_unsigned(json::number_unsigned_t val) override
-    {
-        events.push_back("number_unsigned(" + std::to_string(val) + ")");
-        return true;
-    }
-
-    bool number_float(json::number_float_t, const std::string& s) override
-    {
-        events.push_back("number_float(" + s + ")");
-        return true;
-    }
-
-    bool string(std::string& val) override
-    {
-        events.push_back("string(" + val + ")");
-        return true;
-    }
-
-    bool binary(json::binary_t& val) override
-    {
-        std::string binary_contents = "binary(";
-        std::string comma_space = "";
-        for (auto b : val)
-        {
-            binary_contents.append(comma_space);
-            binary_contents.append(std::to_string(static_cast<int>(b)));
-            comma_space = ", ";
-        }
-        binary_contents.append(")");
-        events.push_back(binary_contents);
-        return true;
-    }
-
-    bool start_object(std::size_t elements) override
-    {
-        if (elements == std::size_t(-1))
-        {
-            events.push_back("start_object()");
-        }
-        else
-        {
-            events.push_back("start_object(" + std::to_string(elements) + ")");
-        }
-        return true;
-    }
-
-    bool key(std::string& val) override
-    {
-        events.push_back("key(" + val + ")");
-        return true;
-    }
-
-    bool end_object() override
-    {
-        events.push_back("end_object()");
-        return true;
-    }
-
-    bool start_array(std::size_t elements) override
-    {
-        if (elements == std::size_t(-1))
-        {
-            events.push_back("start_array()");
-        }
-        else
-        {
-            events.push_back("start_array(" + std::to_string(elements) + ")");
-        }
-        return true;
-    }
-
-    bool end_array() override
-    {
-        events.push_back("end_array()");
-        return true;
-    }
-
-    bool parse_error(std::size_t position, const std::string&, const json::exception&) override
-    {
-        events.push_back("parse_error(" + std::to_string(position) + ")");
-        return false;
-    }
-
-    std::vector<std::string> events {};
-};
-
-struct SaxEventLoggerExitAfterStartObject : public SaxEventLogger
-{
-    bool start_object(std::size_t elements) override
-    {
-        if (elements == std::size_t(-1))
-        {
-            events.push_back("start_object()");
-        }
-        else
-        {
-            events.push_back("start_object(" + std::to_string(elements) + ")");
-        }
-        return false;
-    }
-};
-
-struct SaxEventLoggerExitAfterKey : public SaxEventLogger
-{
-    bool key(std::string& val) override
-    {
-        events.push_back("key(" + val + ")");
-        return false;
-    }
-};
-
-struct SaxEventLoggerExitAfterStartArray : public SaxEventLogger
-{
-    bool start_array(std::size_t elements) override
-    {
-        if (elements == std::size_t(-1))
-        {
-            events.push_back("start_array()");
-        }
-        else
-        {
-            events.push_back("start_array(" + std::to_string(elements) + ")");
-        }
-        return false;
-    }
-};
-}
-
-TEST_CASE("deserialization")
-{
-    SECTION("successful deserialization")
-    {
-        SECTION("stream")
-        {
-            std::stringstream ss1, ss2, ss3;
-            ss1 << "[\"foo\",1,2,3,false,{\"one\":1}]";
-            ss2 << "[\"foo\",1,2,3,false,{\"one\":1}]";
-            ss3 << "[\"foo\",1,2,3,false,{\"one\":1}]";
-            json j = json::parse(ss1);
-            CHECK(json::accept(ss2));
-            CHECK(j == json({"foo", 1, 2, 3, false, {{"one", 1}}}));
-
-            SaxEventLogger l;
-            CHECK(json::sax_parse(ss3, &l));
-            CHECK(l.events.size() == 11);
-            CHECK(l.events == std::vector<std::string>(
-            {
-                "start_array()", "string(foo)", "number_unsigned(1)",
-                "number_unsigned(2)", "number_unsigned(3)", "boolean(false)",
-                "start_object()", "key(one)", "number_unsigned(1)",
-                "end_object()", "end_array()"
-            }));
-        }
-
-        SECTION("string literal")
-        {
-            auto s = "[\"foo\",1,2,3,false,{\"one\":1}]";
-            json j = json::parse(s);
-            CHECK(json::accept(s));
-            CHECK(j == json({"foo", 1, 2, 3, false, {{"one", 1}}}));
-
-            SaxEventLogger l;
-            CHECK(json::sax_parse(s, &l));
-            CHECK(l.events.size() == 11);
-            CHECK(l.events == std::vector<std::string>(
-            {
-                "start_array()", "string(foo)", "number_unsigned(1)",
-                "number_unsigned(2)", "number_unsigned(3)", "boolean(false)",
-                "start_object()", "key(one)", "number_unsigned(1)",
-                "end_object()", "end_array()"
-            }));
-        }
-
-        SECTION("string_t")
-        {
-            json::string_t s = "[\"foo\",1,2,3,false,{\"one\":1}]";
-            json j = json::parse(s);
-            CHECK(json::accept(s));
-            CHECK(j == json({"foo", 1, 2, 3, false, {{"one", 1}}}));
-
-            SaxEventLogger l;
-            CHECK(json::sax_parse(s, &l));
-            CHECK(l.events.size() == 11);
-            CHECK(l.events == std::vector<std::string>(
-            {
-                "start_array()", "string(foo)", "number_unsigned(1)",
-                "number_unsigned(2)", "number_unsigned(3)", "boolean(false)",
-                "start_object()", "key(one)", "number_unsigned(1)",
-                "end_object()", "end_array()"
-            }));
-        }
-
-        SECTION("operator<<")
-        {
-            std::stringstream ss;
-            ss << "[\"foo\",1,2,3,false,{\"one\":1}]";
-            json j;
-            j << ss;
-            CHECK(j == json({"foo", 1, 2, 3, false, {{"one", 1}}}));
-        }
-
-        SECTION("operator>>")
-        {
-            std::stringstream ss;
-            ss << "[\"foo\",1,2,3,false,{\"one\":1}]";
-            json j;
-            ss >> j;
-            CHECK(j == json({"foo", 1, 2, 3, false, {{"one", 1}}}));
-        }
-
-        SECTION("user-defined string literal")
-        {
-            CHECK("[\"foo\",1,2,3,false,{\"one\":1}]"_json == json({"foo", 1, 2, 3, false, {{"one", 1}}}));
-        }
-    }
-
-    SECTION("unsuccessful deserialization")
-    {
-        SECTION("stream")
-        {
-            std::stringstream ss1, ss2, ss3, ss4, ss5;
-            ss1 << "[\"foo\",1,2,3,false,{\"one\":1}";
-            ss2 << "[\"foo\",1,2,3,false,{\"one\":1}";
-            ss3 << "[\"foo\",1,2,3,false,{\"one\":1}";
-            ss4 << "[\"foo\",1,2,3,false,{\"one\":1}";
-            ss5 << "[\"foo\",1,2,3,false,{\"one\":1}";
-
-            json _;
-            CHECK_THROWS_AS(_ = json::parse(ss1), json::parse_error&);
-            CHECK_THROWS_WITH(_ = json::parse(ss2),
-                              "[json.exception.parse_error.101] parse error at line 1, column 29: syntax error while parsing array - unexpected end of input; expected ']'");
-            CHECK(!json::accept(ss3));
-
-            json j_error;
-            CHECK_NOTHROW(j_error = json::parse(ss4, nullptr, false));
-            CHECK(j_error.is_discarded());
-
-            SaxEventLogger l;
-            CHECK(!json::sax_parse(ss5, &l));
-            CHECK(l.events.size() == 11);
-            CHECK(l.events == std::vector<std::string>(
-            {
-                "start_array()", "string(foo)", "number_unsigned(1)",
-                "number_unsigned(2)", "number_unsigned(3)", "boolean(false)",
-                "start_object()", "key(one)", "number_unsigned(1)",
-                "end_object()", "parse_error(29)"
-            }));
-        }
-
-        SECTION("string")
-        {
-            json::string_t s = "[\"foo\",1,2,3,false,{\"one\":1}";
-            json _;
-            CHECK_THROWS_AS(_ = json::parse(s), json::parse_error&);
-            CHECK_THROWS_WITH(_ = json::parse(s),
-                              "[json.exception.parse_error.101] parse error at line 1, column 29: syntax error while parsing array - unexpected end of input; expected ']'");
-            CHECK(!json::accept(s));
-
-            json j_error;
-            CHECK_NOTHROW(j_error = json::parse(s, nullptr, false));
-            CHECK(j_error.is_discarded());
-
-            SaxEventLogger l;
-            CHECK(!json::sax_parse(s, &l));
-            CHECK(l.events.size() == 11);
-            CHECK(l.events == std::vector<std::string>(
-            {
-                "start_array()", "string(foo)", "number_unsigned(1)",
-                "number_unsigned(2)", "number_unsigned(3)", "boolean(false)",
-                "start_object()", "key(one)", "number_unsigned(1)",
-                "end_object()", "parse_error(29)"
-            }));
-        }
-
-        SECTION("operator<<")
-        {
-            std::stringstream ss1, ss2;
-            ss1 << "[\"foo\",1,2,3,false,{\"one\":1}";
-            ss2 << "[\"foo\",1,2,3,false,{\"one\":1}";
-            json j;
-            CHECK_THROWS_AS(j << ss1, json::parse_error&);
-            CHECK_THROWS_WITH(j << ss2,
-                              "[json.exception.parse_error.101] parse error at line 1, column 29: syntax error while parsing array - unexpected end of input; expected ']'");
-        }
-
-        SECTION("operator>>")
-        {
-            std::stringstream ss1, ss2;
-            ss1 << "[\"foo\",1,2,3,false,{\"one\":1}";
-            ss2 << "[\"foo\",1,2,3,false,{\"one\":1}";
-            json j;
-            CHECK_THROWS_AS(ss1 >> j, json::parse_error&);
-            CHECK_THROWS_WITH(ss2 >> j,
-                              "[json.exception.parse_error.101] parse error at line 1, column 29: syntax error while parsing array - unexpected end of input; expected ']'");
-        }
-
-        SECTION("user-defined string literal")
-        {
-            CHECK_THROWS_AS("[\"foo\",1,2,3,false,{\"one\":1}"_json, json::parse_error&);
-            CHECK_THROWS_WITH("[\"foo\",1,2,3,false,{\"one\":1}"_json,
-                              "[json.exception.parse_error.101] parse error at line 1, column 29: syntax error while parsing array - unexpected end of input; expected ']'");
-        }
-    }
-
-    SECTION("contiguous containers")
-    {
-        SECTION("directly")
-        {
-            SECTION("from std::vector")
-            {
-                std::vector<uint8_t> v = {'t', 'r', 'u', 'e'};
-                CHECK(json::parse(v) == json(true));
-                CHECK(json::accept(v));
-
-                SaxEventLogger l;
-                CHECK(json::sax_parse(v, &l));
-                CHECK(l.events.size() == 1);
-                CHECK(l.events == std::vector<std::string>({"boolean(true)"}));
-            }
-
-            SECTION("from std::array")
-            {
-                std::array<uint8_t, 5> v { {'t', 'r', 'u', 'e'} };
-                CHECK(json::parse(v) == json(true));
-                CHECK(json::accept(v));
-
-                SaxEventLogger l;
-                CHECK(json::sax_parse(v, &l));
-                CHECK(l.events.size() == 1);
-                CHECK(l.events == std::vector<std::string>({"boolean(true)"}));
-            }
-
-            SECTION("from array")
-            {
-                uint8_t v[] = {'t', 'r', 'u', 'e'};
-                CHECK(json::parse(v) == json(true));
-                CHECK(json::accept(v));
-
-                SaxEventLogger l;
-                CHECK(json::sax_parse(v, &l));
-                CHECK(l.events.size() == 1);
-                CHECK(l.events == std::vector<std::string>({"boolean(true)"}));
-            }
-
-            SECTION("from chars")
-            {
-                uint8_t* v = new uint8_t[5];
-                v[0] = 't';
-                v[1] = 'r';
-                v[2] = 'u';
-                v[3] = 'e';
-                v[4] = '\0';
-                CHECK(json::parse(v) == json(true));
-                CHECK(json::accept(v));
-
-                SaxEventLogger l;
-                CHECK(json::sax_parse(v, &l));
-                CHECK(l.events.size() == 1);
-                CHECK(l.events == std::vector<std::string>({"boolean(true)"}));
-
-                delete[] v;
-            }
-
-            SECTION("from std::string")
-            {
-                std::string v = {'t', 'r', 'u', 'e'};
-                CHECK(json::parse(v) == json(true));
-                CHECK(json::accept(v));
-
-                SaxEventLogger l;
-                CHECK(json::sax_parse(v, &l));
-                CHECK(l.events.size() == 1);
-                CHECK(l.events == std::vector<std::string>({"boolean(true)"}));
-            }
-
-            SECTION("from std::initializer_list")
-            {
-                std::initializer_list<uint8_t> v = {'t', 'r', 'u', 'e'};
-                CHECK(json::parse(v) == json(true));
-                CHECK(json::accept(v));
-
-                SaxEventLogger l;
-                CHECK(json::sax_parse(v, &l));
-                CHECK(l.events.size() == 1);
-                CHECK(l.events == std::vector<std::string>({"boolean(true)"}));
-            }
-
-            SECTION("empty container")
-            {
-                std::vector<uint8_t> v;
-                json _;
-                CHECK_THROWS_AS(_ = json::parse(v), json::parse_error&);
-                CHECK(!json::accept(v));
-
-                SaxEventLogger l;
-                CHECK(!json::sax_parse(v, &l));
-                CHECK(l.events.size() == 1);
-                CHECK(l.events == std::vector<std::string>({"parse_error(1)"}));
-            }
-        }
-
-        SECTION("via iterator range")
-        {
-            SECTION("from std::vector")
-            {
-                std::vector<uint8_t> v = {'t', 'r', 'u', 'e'};
-                CHECK(json::parse(std::begin(v), std::end(v)) == json(true));
-                CHECK(json::accept(std::begin(v), std::end(v)));
-
-                SaxEventLogger l;
-                CHECK(json::sax_parse(std::begin(v), std::end(v), &l));
-                CHECK(l.events.size() == 1);
-                CHECK(l.events == std::vector<std::string>({"boolean(true)"}));
-
-            }
-
-            SECTION("from std::array")
-            {
-                std::array<uint8_t, 5> v { {'t', 'r', 'u', 'e'} };
-                CHECK(json::parse(std::begin(v), std::end(v)) == json(true));
-                CHECK(json::accept(std::begin(v), std::end(v)));
-
-                SaxEventLogger l;
-                CHECK(json::sax_parse(std::begin(v), std::end(v), &l));
-                CHECK(l.events.size() == 1);
-                CHECK(l.events == std::vector<std::string>({"boolean(true)"}));
-            }
-
-            SECTION("from array")
-            {
-                uint8_t v[] = {'t', 'r', 'u', 'e'};
-                CHECK(json::parse(std::begin(v), std::end(v)) == json(true));
-                CHECK(json::accept(std::begin(v), std::end(v)));
-
-                SaxEventLogger l;
-                CHECK(json::sax_parse(std::begin(v), std::end(v), &l));
-                CHECK(l.events.size() == 1);
-                CHECK(l.events == std::vector<std::string>({"boolean(true)"}));
-            }
-
-            SECTION("from std::string")
-            {
-                std::string v = {'t', 'r', 'u', 'e'};
-                CHECK(json::parse(std::begin(v), std::end(v)) == json(true));
-                CHECK(json::accept(std::begin(v), std::end(v)));
-
-                SaxEventLogger l;
-                CHECK(json::sax_parse(std::begin(v), std::end(v), &l));
-                CHECK(l.events.size() == 1);
-                CHECK(l.events == std::vector<std::string>({"boolean(true)"}));
-            }
-
-            SECTION("from std::initializer_list")
-            {
-                std::initializer_list<uint8_t> v = {'t', 'r', 'u', 'e'};
-                CHECK(json::parse(std::begin(v), std::end(v)) == json(true));
-                CHECK(json::accept(std::begin(v), std::end(v)));
-
-                SaxEventLogger l;
-                CHECK(json::sax_parse(std::begin(v), std::end(v), &l));
-                CHECK(l.events.size() == 1);
-                CHECK(l.events == std::vector<std::string>({"boolean(true)"}));
-            }
-
-            SECTION("from std::valarray")
-            {
-                std::valarray<uint8_t> v = {'t', 'r', 'u', 'e'};
-                CHECK(json::parse(std::begin(v), std::end(v)) == json(true));
-                CHECK(json::accept(std::begin(v), std::end(v)));
-
-                SaxEventLogger l;
-                CHECK(json::sax_parse(std::begin(v), std::end(v), &l));
-                CHECK(l.events.size() == 1);
-                CHECK(l.events == std::vector<std::string>({"boolean(true)"}));
-            }
-
-            SECTION("with empty range")
-            {
-                std::vector<uint8_t> v;
-                json _;
-                CHECK_THROWS_AS(_ = json::parse(std::begin(v), std::end(v)), json::parse_error&);
-                CHECK(!json::accept(std::begin(v), std::end(v)));
-
-                SaxEventLogger l;
-                CHECK(!json::sax_parse(std::begin(v), std::end(v), &l));
-                CHECK(l.events.size() == 1);
-                CHECK(l.events == std::vector<std::string>({"parse_error(1)"}));
-            }
-        }
-
-        // these cases are required for 100% line coverage
-        SECTION("error cases")
-        {
-            SECTION("case 1")
-            {
-                uint8_t v[] = {'\"', 'a', 'a', 'a', 'a', 'a', 'a', '\\', 'u'};
-                json _;
-                CHECK_THROWS_AS(_ = json::parse(std::begin(v), std::end(v)), json::parse_error&);
-                CHECK(!json::accept(std::begin(v), std::end(v)));
-
-                json j_error;
-                CHECK_NOTHROW(j_error = json::parse(std::begin(v), std::end(v), nullptr, false));
-                CHECK(j_error.is_discarded());
-
-                SaxEventLogger l;
-                CHECK(!json::sax_parse(std::begin(v), std::end(v), &l));
-                CHECK(l.events.size() == 1);
-                CHECK(l.events == std::vector<std::string>({"parse_error(10)"}));
-            }
-
-            SECTION("case 2")
-            {
-                uint8_t v[] = {'\"', 'a', 'a', 'a', 'a', 'a', 'a', '\\', 'u', '1'};
-                json _;
-                CHECK_THROWS_AS(_ = json::parse(std::begin(v), std::end(v)), json::parse_error&);
-                CHECK(!json::accept(std::begin(v), std::end(v)));
-
-                json j_error;
-                CHECK_NOTHROW(j_error = json::parse(std::begin(v), std::end(v), nullptr, false));
-                CHECK(j_error.is_discarded());
-
-                SaxEventLogger l;
-                CHECK(!json::sax_parse(std::begin(v), std::end(v), &l));
-                CHECK(l.events.size() == 1);
-                CHECK(l.events == std::vector<std::string>({"parse_error(11)"}));
-            }
-
-            SECTION("case 3")
-            {
-                uint8_t v[] = {'\"', 'a', 'a', 'a', 'a', 'a', 'a', '\\', 'u', '1', '1', '1', '1', '1', '1', '1', '1'};
-                json _;
-                CHECK_THROWS_AS(_ = json::parse(std::begin(v), std::end(v)), json::parse_error&);
-                CHECK(!json::accept(std::begin(v), std::end(v)));
-
-                json j_error;
-                CHECK_NOTHROW(j_error = json::parse(std::begin(v), std::end(v), nullptr, false));
-                CHECK(j_error.is_discarded());
-
-                SaxEventLogger l;
-                CHECK(!json::sax_parse(std::begin(v), std::end(v), &l));
-                CHECK(l.events.size() == 1);
-                CHECK(l.events == std::vector<std::string>({"parse_error(18)"}));
-            }
-
-            SECTION("case 4")
-            {
-                uint8_t v[] = {'\"', 'a', 'a', 'a', 'a', 'a', 'a', 'u', '1', '1', '1', '1', '1', '1', '1', '1', '\\'};
-                json _;
-                CHECK_THROWS_AS(_ = json::parse(std::begin(v), std::end(v)), json::parse_error&);
-                CHECK(!json::accept(std::begin(v), std::end(v)));
-
-                json j_error;
-                CHECK_NOTHROW(j_error = json::parse(std::begin(v), std::end(v), nullptr, false));
-                CHECK(j_error.is_discarded());
-
-                SaxEventLogger l;
-                CHECK(!json::sax_parse(std::begin(v), std::end(v), &l));
-                CHECK(l.events.size() == 1);
-                CHECK(l.events == std::vector<std::string>({"parse_error(18)"}));
-            }
-
-            SECTION("case 5")
-            {
-                uint8_t v[] = {'\"', 0x7F, 0xC1};
-                json _;
-                CHECK_THROWS_AS(_ = json::parse(std::begin(v), std::end(v)), json::parse_error&);
-                CHECK(!json::accept(std::begin(v), std::end(v)));
-
-                json j_error;
-                CHECK_NOTHROW(j_error = json::parse(std::begin(v), std::end(v), nullptr, false));
-                CHECK(j_error.is_discarded());
-
-                SaxEventLogger l;
-                CHECK(!json::sax_parse(std::begin(v), std::end(v), &l));
-                CHECK(l.events.size() == 1);
-                CHECK(l.events == std::vector<std::string>({"parse_error(3)"}));
-            }
-
-            SECTION("case 6")
-            {
-                uint8_t v[] = {'\"', 0x7F, 0xDF, 0x7F};
-                json _;
-                CHECK_THROWS_AS(_ = json::parse(std::begin(v), std::end(v)), json::parse_error&);
-                CHECK_THROWS_WITH(_ = json::parse(std::begin(v), std::end(v)),
-                                  "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid string: ill-formed UTF-8 byte; last read: '\"\x7f\xdf\x7f'");
-                CHECK(!json::accept(std::begin(v), std::end(v)));
-
-                json j_error;
-                CHECK_NOTHROW(j_error = json::parse(std::begin(v), std::end(v), nullptr, false));
-                CHECK(j_error.is_discarded());
-
-                SaxEventLogger l;
-                CHECK(!json::sax_parse(std::begin(v), std::end(v), &l));
-                CHECK(l.events.size() == 1);
-                CHECK(l.events == std::vector<std::string>({"parse_error(4)"}));
-            }
-
-            SECTION("case 7")
-            {
-                uint8_t v[] = {'\"', 0x7F, 0xDF, 0xC0};
-                json _;
-                CHECK_THROWS_AS(_ = json::parse(std::begin(v), std::end(v)), json::parse_error&);
-                CHECK(!json::accept(std::begin(v), std::end(v)));
-
-                json j_error;
-                CHECK_NOTHROW(j_error = json::parse(std::begin(v), std::end(v), nullptr, false));
-                CHECK(j_error.is_discarded());
-
-                SaxEventLogger l;
-                CHECK(!json::sax_parse(std::begin(v), std::end(v), &l));
-                CHECK(l.events.size() == 1);
-                CHECK(l.events == std::vector<std::string>({"parse_error(4)"}));
-            }
-
-            SECTION("case 8")
-            {
-                uint8_t v[] = {'\"', 0x7F, 0xE0, 0x9F};
-                json _;
-                CHECK_THROWS_AS(_ = json::parse(std::begin(v), std::end(v)), json::parse_error&);
-                CHECK(!json::accept(std::begin(v), std::end(v)));
-
-                json j_error;
-                CHECK_NOTHROW(j_error = json::parse(std::begin(v), std::end(v), nullptr, false));
-                CHECK(j_error.is_discarded());
-
-                SaxEventLogger l;
-                CHECK(!json::sax_parse(std::begin(v), std::end(v), &l));
-                CHECK(l.events.size() == 1);
-                CHECK(l.events == std::vector<std::string>({"parse_error(4)"}));
-            }
-
-            SECTION("case 9")
-            {
-                uint8_t v[] = {'\"', 0x7F, 0xEF, 0xC0};
-                json _;
-                CHECK_THROWS_AS(_ = json::parse(std::begin(v), std::end(v)), json::parse_error&);
-                CHECK(!json::accept(std::begin(v), std::end(v)));
-
-                json j_error;
-                CHECK_NOTHROW(j_error = json::parse(std::begin(v), std::end(v), nullptr, false));
-                CHECK(j_error.is_discarded());
-
-                SaxEventLogger l;
-                CHECK(!json::sax_parse(std::begin(v), std::end(v), &l));
-                CHECK(l.events.size() == 1);
-                CHECK(l.events == std::vector<std::string>({"parse_error(4)"}));
-            }
-
-            SECTION("case 10")
-            {
-                uint8_t v[] = {'\"', 0x7F, 0xED, 0x7F};
-                json _;
-                CHECK_THROWS_AS(_ = json::parse(std::begin(v), std::end(v)), json::parse_error&);
-                CHECK(!json::accept(std::begin(v), std::end(v)));
-
-                json j_error;
-                CHECK_NOTHROW(j_error = json::parse(std::begin(v), std::end(v), nullptr, false));
-                CHECK(j_error.is_discarded());
-
-                SaxEventLogger l;
-                CHECK(!json::sax_parse(std::begin(v), std::end(v), &l));
-                CHECK(l.events.size() == 1);
-                CHECK(l.events == std::vector<std::string>({"parse_error(4)"}));
-            }
-
-            SECTION("case 11")
-            {
-                uint8_t v[] = {'\"', 0x7F, 0xF0, 0x8F};
-                json _;
-                CHECK_THROWS_AS(_ = json::parse(std::begin(v), std::end(v)), json::parse_error&);
-                CHECK(!json::accept(std::begin(v), std::end(v)));
-
-                json j_error;
-                CHECK_NOTHROW(j_error = json::parse(std::begin(v), std::end(v), nullptr, false));
-                CHECK(j_error.is_discarded());
-
-                SaxEventLogger l;
-                CHECK(!json::sax_parse(std::begin(v), std::end(v), &l));
-                CHECK(l.events.size() == 1);
-                CHECK(l.events == std::vector<std::string>({"parse_error(4)"}));
-            }
-
-            SECTION("case 12")
-            {
-                uint8_t v[] = {'\"', 0x7F, 0xF0, 0xC0};
-                json _;
-                CHECK_THROWS_AS(_ = json::parse(std::begin(v), std::end(v)), json::parse_error&);
-                CHECK(!json::accept(std::begin(v), std::end(v)));
-
-                json j_error;
-                CHECK_NOTHROW(j_error = json::parse(std::begin(v), std::end(v), nullptr, false));
-                CHECK(j_error.is_discarded());
-
-                SaxEventLogger l;
-                CHECK(!json::sax_parse(std::begin(v), std::end(v), &l));
-                CHECK(l.events.size() == 1);
-                CHECK(l.events == std::vector<std::string>({"parse_error(4)"}));
-            }
-
-            SECTION("case 13")
-            {
-                uint8_t v[] = {'\"', 0x7F, 0xF3, 0x7F};
-                json _;
-                CHECK_THROWS_AS(_ = json::parse(std::begin(v), std::end(v)), json::parse_error&);
-                CHECK(!json::accept(std::begin(v), std::end(v)));
-
-                json j_error;
-                CHECK_NOTHROW(j_error = json::parse(std::begin(v), std::end(v), nullptr, false));
-                CHECK(j_error.is_discarded());
-
-                SaxEventLogger l;
-                CHECK(!json::sax_parse(std::begin(v), std::end(v), &l));
-                CHECK(l.events.size() == 1);
-                CHECK(l.events == std::vector<std::string>({"parse_error(4)"}));
-            }
-
-            SECTION("case 14")
-            {
-                uint8_t v[] = {'\"', 0x7F, 0xF3, 0xC0};
-                json _;
-                CHECK_THROWS_AS(_ = json::parse(std::begin(v), std::end(v)), json::parse_error&);
-                CHECK(!json::accept(std::begin(v), std::end(v)));
-
-                json j_error;
-                CHECK_NOTHROW(j_error = json::parse(std::begin(v), std::end(v), nullptr, false));
-                CHECK(j_error.is_discarded());
-
-                SaxEventLogger l;
-                CHECK(!json::sax_parse(std::begin(v), std::end(v), &l));
-                CHECK(l.events.size() == 1);
-                CHECK(l.events == std::vector<std::string>({"parse_error(4)"}));
-            }
-
-            SECTION("case 15")
-            {
-                uint8_t v[] = {'\"', 0x7F, 0xF4, 0x7F};
-                json _;
-                CHECK_THROWS_AS(_ = json::parse(std::begin(v), std::end(v)), json::parse_error&);
-                CHECK(!json::accept(std::begin(v), std::end(v)));
-
-                json j_error;
-                CHECK_NOTHROW(j_error = json::parse(std::begin(v), std::end(v), nullptr, false));
-                CHECK(j_error.is_discarded());
-
-                SaxEventLogger l;
-                CHECK(!json::sax_parse(std::begin(v), std::end(v), &l));
-                CHECK(l.events.size() == 1);
-                CHECK(l.events == std::vector<std::string>({"parse_error(4)"}));
-            }
-
-            SECTION("case 16")
-            {
-                uint8_t v[] = {'{', '\"', '\"', ':', '1', '1'};
-                json _;
-                CHECK_THROWS_AS(_ = json::parse(std::begin(v), std::end(v)), json::parse_error&);
-                CHECK(!json::accept(std::begin(v), std::end(v)));
-
-                json j_error;
-                CHECK_NOTHROW(j_error = json::parse(std::begin(v), std::end(v), nullptr, false));
-                CHECK(j_error.is_discarded());
-
-                SaxEventLogger l;
-                CHECK(!json::sax_parse(std::begin(v), std::end(v), &l));
-                CHECK(l.events.size() == 4);
-                CHECK(l.events == std::vector<std::string>(
-                {
-                    "start_object()", "key()", "number_unsigned(11)",
-                    "parse_error(7)"
-                }));
-            }
-        }
-    }
-
-    SECTION("ignoring byte-order marks")
-    {
-        std::string bom = "\xEF\xBB\xBF";
-
-        SECTION("BOM only")
-        {
-            json _;
-            CHECK_THROWS_AS(_ = json::parse(bom), json::parse_error&);
-            CHECK_THROWS_WITH(_ = json::parse(bom),
-                              "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - unexpected end of input; expected '[', '{', or a literal");
-
-            CHECK_THROWS_AS(_ = json::parse(std::istringstream(bom)), json::parse_error&);
-            CHECK_THROWS_WITH(_ = json::parse(std::istringstream(bom)),
-                              "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - unexpected end of input; expected '[', '{', or a literal");
-
-            SaxEventLogger l;
-            CHECK(!json::sax_parse(bom, &l));
-            CHECK(l.events.size() == 1);
-            CHECK(l.events == std::vector<std::string>(
-            {
-                "parse_error(4)"
-            }));
-        }
-
-        SECTION("BOM and content")
-        {
-            CHECK(json::parse(bom + "1") == 1);
-            CHECK(json::parse(std::istringstream(bom + "1")) == 1);
-
-            SaxEventLogger l1, l2;
-            CHECK(json::sax_parse(std::istringstream(bom + "1"), &l1));
-            CHECK(json::sax_parse(bom + "1", &l2));
-            CHECK(l1.events.size() == 1);
-            CHECK(l1.events == std::vector<std::string>(
-            {
-                "number_unsigned(1)"
-            }));
-            CHECK(l2.events.size() == 1);
-            CHECK(l2.events == std::vector<std::string>(
-            {
-                "number_unsigned(1)"
-            }));
-        }
-
-        SECTION("2 byte of BOM")
-        {
-            json _;
-            CHECK_THROWS_AS(_ = json::parse(bom.substr(0, 2)), json::parse_error&);
-            CHECK_THROWS_WITH(_ = json::parse(bom.substr(0, 2)),
-                              "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid BOM; must be 0xEF 0xBB 0xBF if given; last read: '\xEF\xBB'");
-
-            CHECK_THROWS_AS(_ = json::parse(std::istringstream(bom.substr(0, 2))), json::parse_error&);
-            CHECK_THROWS_WITH(_ = json::parse(std::istringstream(bom.substr(0, 2))),
-                              "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid BOM; must be 0xEF 0xBB 0xBF if given; last read: '\xEF\xBB'");
-
-            SaxEventLogger l1, l2;
-            CHECK(!json::sax_parse(std::istringstream(bom.substr(0, 2)), &l1));
-            CHECK(!json::sax_parse(bom.substr(0, 2), &l2));
-            CHECK(l1.events.size() == 1);
-            CHECK(l1.events == std::vector<std::string>(
-            {
-                "parse_error(3)"
-            }));
-            CHECK(l2.events.size() == 1);
-            CHECK(l2.events == std::vector<std::string>(
-            {
-                "parse_error(3)"
-            }));
-        }
-
-        SECTION("1 byte of BOM")
-        {
-            json _;
-            CHECK_THROWS_AS(_ = json::parse(bom.substr(0, 1)), json::parse_error&);
-            CHECK_THROWS_WITH(_ = json::parse(bom.substr(0, 1)),
-                              "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid BOM; must be 0xEF 0xBB 0xBF if given; last read: '\xEF'");
-
-            CHECK_THROWS_AS(_ = json::parse(std::istringstream(bom.substr(0, 1))), json::parse_error&);
-            CHECK_THROWS_WITH(_ = json::parse(std::istringstream(bom.substr(0, 1))),
-                              "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid BOM; must be 0xEF 0xBB 0xBF if given; last read: '\xEF'");
-
-            SaxEventLogger l1, l2;
-            CHECK(!json::sax_parse(std::istringstream(bom.substr(0, 1)), &l1));
-            CHECK(!json::sax_parse(bom.substr(0, 1), &l2));
-            CHECK(l1.events.size() == 1);
-            CHECK(l1.events == std::vector<std::string>(
-            {
-                "parse_error(2)"
-            }));
-            CHECK(l2.events.size() == 1);
-            CHECK(l2.events == std::vector<std::string>(
-            {
-                "parse_error(2)"
-            }));
-        }
-
-        SECTION("variations")
-        {
-            // calculate variations of each byte of the BOM to make sure
-            // that the BOM and only the BOM is skipped
-            for (int i0 = -1; i0 < 2; ++i0)
-            {
-                for (int i1 = -1; i1 < 2; ++i1)
-                {
-                    for (int i2 = -1; i2 < 2; ++i2)
-                    {
-                        // debug output for the variations
-                        CAPTURE(i0)
-                        CAPTURE(i1)
-                        CAPTURE(i2)
-
-                        std::string s = "";
-                        s.push_back(static_cast<char>(bom[0] + i0));
-                        s.push_back(static_cast<char>(bom[1] + i1));
-                        s.push_back(static_cast<char>(bom[2] + i2));
-
-                        if (i0 == 0 && i1 == 0 && i2 == 0)
-                        {
-                            // without any variation, we skip the BOM
-                            CHECK(json::parse(s + "null") == json());
-                            CHECK(json::parse(std::istringstream(s + "null")) == json());
-
-                            SaxEventLogger l;
-                            CHECK(json::sax_parse(s + "null", &l));
-                            CHECK(l.events.size() == 1);
-                            CHECK(l.events == std::vector<std::string>(
-                            {
-                                "null()"
-                            }));
-                        }
-                        else
-                        {
-                            // any variation is an error
-                            json _;
-                            CHECK_THROWS_AS(_ = json::parse(s + "null"), json::parse_error&);
-                            CHECK_THROWS_AS(_ = json::parse(std::istringstream(s + "null")), json::parse_error&);
-
-                            SaxEventLogger l;
-                            CHECK(!json::sax_parse(s + "null", &l));
-                            CHECK(l.events.size() == 1);
-
-                            if (i0 != 0)
-                            {
-                                CHECK(l.events == std::vector<std::string>(
-                                {
-                                    "parse_error(1)"
-                                }));
-                            }
-                            else if (i1 != 0)
-                            {
-                                CHECK(l.events == std::vector<std::string>(
-                                {
-                                    "parse_error(2)"
-                                }));
-                            }
-                            else
-                            {
-                                CHECK(l.events == std::vector<std::string>(
-                                {
-                                    "parse_error(3)"
-                                }));
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        SECTION("preserve state after parsing")
-        {
-            std::istringstream s(bom + "123 456");
-            json j;
-            j << s;
-            CHECK(j == 123);
-            j << s;
-            CHECK(j == 456);
-        }
-    }
-
-    SECTION("SAX and early abort")
-    {
-        std::string s = "[1, [\"string\", 43.12], null, {\"key1\": true, \"key2\": false}]";
-
-        SaxEventLogger default_logger;
-        SaxEventLoggerExitAfterStartObject exit_after_start_object;
-        SaxEventLoggerExitAfterKey exit_after_key;
-        SaxEventLoggerExitAfterStartArray exit_after_start_array;
-
-        json::sax_parse(s, &default_logger);
-        CHECK(default_logger.events.size() == 14);
-        CHECK(default_logger.events == std::vector<std::string>(
-        {
-            "start_array()", "number_unsigned(1)", "start_array()",
-            "string(string)", "number_float(43.12)", "end_array()", "null()",
-            "start_object()", "key(key1)", "boolean(true)", "key(key2)",
-            "boolean(false)", "end_object()", "end_array()"
-        }));
-
-        json::sax_parse(s, &exit_after_start_object);
-        CHECK(exit_after_start_object.events.size() == 8);
-        CHECK(exit_after_start_object.events == std::vector<std::string>(
-        {
-            "start_array()", "number_unsigned(1)", "start_array()",
-            "string(string)", "number_float(43.12)", "end_array()", "null()",
-            "start_object()"
-        }));
-
-        json::sax_parse(s, &exit_after_key);
-        CHECK(exit_after_key.events.size() == 9);
-        CHECK(exit_after_key.events == std::vector<std::string>(
-        {
-            "start_array()", "number_unsigned(1)", "start_array()",
-            "string(string)", "number_float(43.12)", "end_array()", "null()",
-            "start_object()", "key(key1)"
-        }));
-
-        json::sax_parse(s, &exit_after_start_array);
-        CHECK(exit_after_start_array.events.size() == 1);
-        CHECK(exit_after_start_array.events == std::vector<std::string>(
-        {
-            "start_array()"
-        }));
-    }
-}
-
-TEST_CASE_TEMPLATE("deserialization of different character types (ASCII)", T,
-                   char, unsigned char, signed char,
-                   wchar_t,
-                   char16_t, char32_t,
-                   std::uint8_t, std::int8_t,
-                   std::int16_t, std::uint16_t,
-                   std::int32_t, std::uint32_t)
-{
-    std::vector<T> v = {'t', 'r', 'u', 'e'};
-    CHECK(json::parse(v) == json(true));
-    CHECK(json::accept(v));
-
-    SaxEventLogger l;
-    CHECK(json::sax_parse(v, &l));
-    CHECK(l.events.size() == 1);
-    CHECK(l.events == std::vector<std::string>({"boolean(true)"}));
-}
-
-TEST_CASE_TEMPLATE("deserialization of different character types (UTF-8)", T,
-                   char, unsigned char, std::uint8_t)
-{
-    // a star emoji
-    std::vector<T> v = {'"', static_cast<T>(0xe2), static_cast<T>(0xad), static_cast<T>(0x90), static_cast<T>(0xef), static_cast<T>(0xb8), static_cast<T>(0x8f), '"'};
-    CHECK(json::parse(v).dump(-1, ' ', true) == "\"\\u2b50\\ufe0f\"");
-    CHECK(json::accept(v));
-
-    SaxEventLogger l;
-    CHECK(json::sax_parse(v, &l));
-    CHECK(l.events.size() == 1);
-}
-
-TEST_CASE_TEMPLATE("deserialization of different character types (UTF-16)", T,
-                   char16_t, std::uint16_t)
-{
-    // a star emoji
-    std::vector<T> v = {static_cast<T>('"'), static_cast<T>(0x2b50), static_cast<T>(0xfe0f), static_cast<T>('"')};
-    CHECK(json::parse(v).dump(-1, ' ', true) == "\"\\u2b50\\ufe0f\"");
-    CHECK(json::accept(v));
-
-    SaxEventLogger l;
-    CHECK(json::sax_parse(v, &l));
-    CHECK(l.events.size() == 1);
-}
-
-TEST_CASE_TEMPLATE("deserialization of different character types (UTF-32)", T,
-                   char32_t, std::uint32_t)
-{
-    // a star emoji
-    std::vector<T> v = {static_cast<T>('"'), static_cast<T>(0x2b50), static_cast<T>(0xfe0f), static_cast<T>('"')};
-    CHECK(json::parse(v).dump(-1, ' ', true) == "\"\\u2b50\\ufe0f\"");
-    CHECK(json::accept(v));
-
-    SaxEventLogger l;
-    CHECK(json::sax_parse(v, &l));
-    CHECK(l.events.size() == 1);
-}
diff --git a/external_imported/json/test/src/unit-diagnostics.cpp b/external_imported/json/test/src/unit-diagnostics.cpp
deleted file mode 100644
index 1cea374a7..000000000
--- a/external_imported/json/test/src/unit-diagnostics.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include "doctest_compatibility.h"
-
-#ifdef JSON_DIAGNOSTICS
-    #undef JSON_DIAGNOSTICS
-#endif
-
-#define JSON_DIAGNOSTICS 1
-
-#include <nlohmann/json.hpp>
-using nlohmann::json;
-
-TEST_CASE("Better diagnostics")
-{
-    SECTION("empty JSON Pointer")
-    {
-        json j = 1;
-        std::string s;
-        CHECK_THROWS_WITH_AS(s = j.get<std::string>(), "[json.exception.type_error.302] type must be string, but is number", json::type_error);
-    }
-
-    SECTION("invalid type")
-    {
-        json j;
-        j["a"]["b"]["c"] = 1;
-        std::string s;
-        CHECK_THROWS_WITH_AS(s = j["a"]["b"]["c"].get<std::string>(), "[json.exception.type_error.302] (/a/b/c) type must be string, but is number", json::type_error);
-    }
-
-    SECTION("missing key")
-    {
-        json j;
-        j["object"]["object"] = true;
-        CHECK_THROWS_WITH_AS(j["object"].at("not_found"), "[json.exception.out_of_range.403] (/object) key 'not_found' not found", json::out_of_range);
-    }
-
-    SECTION("array index out of range")
-    {
-        json j;
-        j["array"][4] = true;
-        CHECK_THROWS_WITH_AS(j["array"].at(5), "[json.exception.out_of_range.401] (/array) array index 5 is out of range", json::out_of_range);
-    }
-
-    SECTION("array index at wrong type")
-    {
-        json j;
-        j["array"][4] = true;
-        CHECK_THROWS_WITH_AS(j["array"][4][5], "[json.exception.type_error.305] (/array/4) cannot use operator[] with a numeric argument with boolean", json::type_error);
-    }
-
-    SECTION("wrong iterator")
-    {
-        json j;
-        j["array"] = json::array();
-        CHECK_THROWS_WITH_AS(j["array"].erase(j.begin()), "[json.exception.invalid_iterator.202] (/array) iterator does not fit current value", json::invalid_iterator);
-    }
-
-    SECTION("JSON Pointer escaping")
-    {
-        json j;
-        j["a/b"]["m~n"] = 1;
-        std::string s;
-        CHECK_THROWS_WITH_AS(s = j["a/b"]["m~n"].get<std::string>(), "[json.exception.type_error.302] (/a~1b/m~0n) type must be string, but is number", json::type_error);
-    }
-
-    SECTION("Parse error")
-    {
-        CHECK_THROWS_WITH_AS(json::parse(""), "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error while parsing value - unexpected end of input; expected '[', '{', or a literal", json::parse_error);
-    }
-
-    SECTION("Regression test for https://github.com/nlohmann/json/pull/2562#pullrequestreview-574858448")
-    {
-        CHECK_THROWS_WITH_AS(json({"0", "0"})[1].get<int>(), "[json.exception.type_error.302] (/1) type must be number, but is string", json::type_error);
-        CHECK_THROWS_WITH_AS(json({"0", "1"})[1].get<int>(), "[json.exception.type_error.302] (/1) type must be number, but is string", json::type_error);
-    }
-
-    SECTION("Regression test for https://github.com/nlohmann/json/pull/2562/files/380a613f2b5d32425021129cd1f371ddcfd54ddf#r563259793")
-    {
-        json j;
-        j["/foo"] = {1, 2, 3};
-        CHECK_THROWS_WITH_AS(j.unflatten(), "[json.exception.type_error.315] (/~1foo) values in object must be primitive", json::type_error);
-    }
-}
diff --git a/external_imported/json/test/src/unit-element_access1.cpp b/external_imported/json/test/src/unit-element_access1.cpp
deleted file mode 100644
index e3f06302b..000000000
--- a/external_imported/json/test/src/unit-element_access1.cpp
+++ /dev/null
@@ -1,1006 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include "doctest_compatibility.h"
-
-#include <nlohmann/json.hpp>
-using nlohmann::json;
-
-TEST_CASE("element access 1")
-{
-    SECTION("array")
-    {
-        json j = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
-        const json j_const = j;
-
-        SECTION("access specified element with bounds checking")
-        {
-            SECTION("access within bounds")
-            {
-                CHECK(j.at(0) == json(1));
-                CHECK(j.at(1) == json(1u));
-                CHECK(j.at(2) == json(true));
-                CHECK(j.at(3) == json(nullptr));
-                CHECK(j.at(4) == json("string"));
-                CHECK(j.at(5) == json(42.23));
-                CHECK(j.at(6) == json::object());
-                CHECK(j.at(7) == json({1, 2, 3}));
-
-                CHECK(j_const.at(0) == json(1));
-                CHECK(j_const.at(1) == json(1u));
-                CHECK(j_const.at(2) == json(true));
-                CHECK(j_const.at(3) == json(nullptr));
-                CHECK(j_const.at(4) == json("string"));
-                CHECK(j_const.at(5) == json(42.23));
-                CHECK(j_const.at(6) == json::object());
-                CHECK(j_const.at(7) == json({1, 2, 3}));
-            }
-
-            SECTION("access outside bounds")
-            {
-                CHECK_THROWS_AS(j.at(8), json::out_of_range&);
-                CHECK_THROWS_AS(j_const.at(8), json::out_of_range&);
-
-                CHECK_THROWS_WITH(j.at(8),
-                                  "[json.exception.out_of_range.401] array index 8 is out of range");
-                CHECK_THROWS_WITH(j_const.at(8),
-                                  "[json.exception.out_of_range.401] array index 8 is out of range");
-            }
-
-            SECTION("access on non-array type")
-            {
-                SECTION("null")
-                {
-                    json j_nonarray(json::value_t::null);
-                    const json j_nonarray_const(j_nonarray);
-                    CHECK_THROWS_AS(j_nonarray.at(0), json::type_error&);
-                    CHECK_THROWS_AS(j_nonarray_const.at(0), json::type_error&);
-
-                    CHECK_THROWS_WITH(j_nonarray.at(0), "[json.exception.type_error.304] cannot use at() with null");
-                    CHECK_THROWS_WITH(j_nonarray_const.at(0), "[json.exception.type_error.304] cannot use at() with null");
-                }
-
-                SECTION("boolean")
-                {
-                    json j_nonarray(json::value_t::boolean);
-                    const json j_nonarray_const(j_nonarray);
-                    CHECK_THROWS_AS(j_nonarray.at(0), json::type_error&);
-                    CHECK_THROWS_AS(j_nonarray_const.at(0), json::type_error&);
-
-                    CHECK_THROWS_WITH(j_nonarray.at(0), "[json.exception.type_error.304] cannot use at() with boolean");
-                    CHECK_THROWS_WITH(j_nonarray_const.at(0), "[json.exception.type_error.304] cannot use at() with boolean");
-                }
-
-                SECTION("string")
-                {
-                    json j_nonarray(json::value_t::string);
-                    const json j_nonarray_const(j_nonarray);
-                    CHECK_THROWS_AS(j_nonarray.at(0), json::type_error&);
-                    CHECK_THROWS_AS(j_nonarray_const.at(0), json::type_error&);
-
-                    CHECK_THROWS_WITH(j_nonarray.at(0), "[json.exception.type_error.304] cannot use at() with string");
-                    CHECK_THROWS_WITH(j_nonarray_const.at(0), "[json.exception.type_error.304] cannot use at() with string");
-                }
-
-                SECTION("object")
-                {
-                    json j_nonarray(json::value_t::object);
-                    const json j_nonarray_const(j_nonarray);
-                    CHECK_THROWS_AS(j_nonarray.at(0), json::type_error&);
-                    CHECK_THROWS_AS(j_nonarray_const.at(0), json::type_error&);
-
-                    CHECK_THROWS_WITH(j_nonarray.at(0), "[json.exception.type_error.304] cannot use at() with object");
-                    CHECK_THROWS_WITH(j_nonarray_const.at(0), "[json.exception.type_error.304] cannot use at() with object");
-                }
-
-                SECTION("number (integer)")
-                {
-                    json j_nonarray(json::value_t::number_integer);
-                    const json j_nonarray_const(j_nonarray);
-                    CHECK_THROWS_AS(j_nonarray.at(0), json::type_error&);
-                    CHECK_THROWS_AS(j_nonarray_const.at(0), json::type_error&);
-
-                    CHECK_THROWS_WITH(j_nonarray.at(0), "[json.exception.type_error.304] cannot use at() with number");
-                    CHECK_THROWS_WITH(j_nonarray_const.at(0), "[json.exception.type_error.304] cannot use at() with number");
-                }
-
-                SECTION("number (unsigned)")
-                {
-                    json j_nonarray(json::value_t::number_unsigned);
-                    const json j_nonarray_const(j_nonarray);
-                    CHECK_THROWS_AS(j_nonarray.at(0), json::type_error&);
-                    CHECK_THROWS_AS(j_nonarray_const.at(0), json::type_error&);
-
-                    CHECK_THROWS_WITH(j_nonarray.at(0), "[json.exception.type_error.304] cannot use at() with number");
-                    CHECK_THROWS_WITH(j_nonarray_const.at(0), "[json.exception.type_error.304] cannot use at() with number");
-                }
-
-                SECTION("number (floating-point)")
-                {
-                    json j_nonarray(json::value_t::number_float);
-                    const json j_nonarray_const(j_nonarray);
-                    CHECK_THROWS_AS(j_nonarray.at(0), json::type_error&);
-                    CHECK_THROWS_AS(j_nonarray_const.at(0), json::type_error&);
-
-                    CHECK_THROWS_WITH(j_nonarray.at(0), "[json.exception.type_error.304] cannot use at() with number");
-                    CHECK_THROWS_WITH(j_nonarray_const.at(0), "[json.exception.type_error.304] cannot use at() with number");
-                }
-            }
-        }
-
-        SECTION("front and back")
-        {
-            CHECK(j.front() == json(1));
-            CHECK(j_const.front() == json(1));
-            CHECK(j.back() == json({1, 2, 3}));
-            CHECK(j_const.back() == json({1, 2, 3}));
-        }
-
-        SECTION("access specified element")
-        {
-            SECTION("access within bounds")
-            {
-                CHECK(j[0] == json(1));
-                CHECK(j[1] == json(1u));
-                CHECK(j[2] == json(true));
-                CHECK(j[3] == json(nullptr));
-                CHECK(j[4] == json("string"));
-                CHECK(j[5] == json(42.23));
-                CHECK(j[6] == json::object());
-                CHECK(j[7] == json({1, 2, 3}));
-
-                CHECK(j_const[0] == json(1));
-                CHECK(j_const[1] == json(1u));
-                CHECK(j_const[2] == json(true));
-                CHECK(j_const[3] == json(nullptr));
-                CHECK(j_const[4] == json("string"));
-                CHECK(j_const[5] == json(42.23));
-                CHECK(j_const[6] == json::object());
-                CHECK(j_const[7] == json({1, 2, 3}));
-            }
-
-            SECTION("access on non-array type")
-            {
-                SECTION("null")
-                {
-                    SECTION("standard tests")
-                    {
-                        json j_nonarray(json::value_t::null);
-                        const json j_nonarray_const(j_nonarray);
-                        CHECK_NOTHROW(j_nonarray[0]);
-                        CHECK_THROWS_AS(j_nonarray_const[0], json::type_error&);
-                        CHECK_THROWS_WITH(j_nonarray_const[0], "[json.exception.type_error.305] cannot use operator[] with a numeric argument with null");
-                    }
-
-                    SECTION("implicit transformation to properly filled array")
-                    {
-                        json j_nonarray;
-                        j_nonarray[3] = 42;
-                        CHECK(j_nonarray == json({nullptr, nullptr, nullptr, 42}));
-                    }
-                }
-
-                SECTION("boolean")
-                {
-                    json j_nonarray(json::value_t::boolean);
-                    const json j_nonarray_const(j_nonarray);
-                    CHECK_THROWS_AS(j_nonarray[0], json::type_error&);
-                    CHECK_THROWS_AS(j_nonarray_const[0], json::type_error&);
-                    CHECK_THROWS_WITH(j_nonarray[0], "[json.exception.type_error.305] cannot use operator[] with a numeric argument with boolean");
-                    CHECK_THROWS_WITH(j_nonarray_const[0], "[json.exception.type_error.305] cannot use operator[] with a numeric argument with boolean");
-                }
-
-                SECTION("string")
-                {
-                    json j_nonarray(json::value_t::string);
-                    const json j_nonarray_const(j_nonarray);
-                    CHECK_THROWS_AS(j_nonarray[0], json::type_error&);
-                    CHECK_THROWS_AS(j_nonarray_const[0], json::type_error&);
-                    CHECK_THROWS_WITH(j_nonarray[0], "[json.exception.type_error.305] cannot use operator[] with a numeric argument with string");
-                    CHECK_THROWS_WITH(j_nonarray_const[0], "[json.exception.type_error.305] cannot use operator[] with a numeric argument with string");
-                }
-
-                SECTION("object")
-                {
-                    json j_nonarray(json::value_t::object);
-                    const json j_nonarray_const(j_nonarray);
-                    CHECK_THROWS_AS(j_nonarray[0], json::type_error&);
-                    CHECK_THROWS_AS(j_nonarray_const[0], json::type_error&);
-                    CHECK_THROWS_WITH(j_nonarray[0], "[json.exception.type_error.305] cannot use operator[] with a numeric argument with object");
-                    CHECK_THROWS_WITH(j_nonarray_const[0], "[json.exception.type_error.305] cannot use operator[] with a numeric argument with object");
-                }
-
-                SECTION("number (integer)")
-                {
-                    json j_nonarray(json::value_t::number_integer);
-                    const json j_nonarray_const(j_nonarray);
-                    CHECK_THROWS_AS(j_nonarray[0], json::type_error&);
-                    CHECK_THROWS_AS(j_nonarray_const[0], json::type_error&);
-                    CHECK_THROWS_WITH(j_nonarray[0], "[json.exception.type_error.305] cannot use operator[] with a numeric argument with number");
-                    CHECK_THROWS_WITH(j_nonarray_const[0], "[json.exception.type_error.305] cannot use operator[] with a numeric argument with number");
-                }
-
-                SECTION("number (unsigned)")
-                {
-                    json j_nonarray(json::value_t::number_unsigned);
-                    const json j_nonarray_const(j_nonarray);
-                    CHECK_THROWS_AS(j_nonarray[0], json::type_error&);
-                    CHECK_THROWS_AS(j_nonarray_const[0], json::type_error&);
-                    CHECK_THROWS_WITH(j_nonarray[0], "[json.exception.type_error.305] cannot use operator[] with a numeric argument with number");
-                    CHECK_THROWS_WITH(j_nonarray_const[0], "[json.exception.type_error.305] cannot use operator[] with a numeric argument with number");
-                }
-
-                SECTION("number (floating-point)")
-                {
-                    json j_nonarray(json::value_t::number_float);
-                    const json j_nonarray_const(j_nonarray);
-                    CHECK_THROWS_AS(j_nonarray[0], json::type_error&);
-                    CHECK_THROWS_AS(j_nonarray_const[0], json::type_error&);
-                    CHECK_THROWS_WITH(j_nonarray[0], "[json.exception.type_error.305] cannot use operator[] with a numeric argument with number");
-                    CHECK_THROWS_WITH(j_nonarray_const[0], "[json.exception.type_error.305] cannot use operator[] with a numeric argument with number");
-                }
-            }
-        }
-
-        SECTION("remove specified element")
-        {
-            SECTION("remove element by index")
-            {
-                {
-                    json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
-                    jarray.erase(0);
-                    CHECK(jarray == json({1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}}));
-                }
-                {
-                    json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
-                    jarray.erase(1);
-                    CHECK(jarray == json({1, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}}));
-                }
-                {
-                    json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
-                    jarray.erase(2);
-                    CHECK(jarray == json({1, 1u, nullptr, "string", 42.23, json::object(), {1, 2, 3}}));
-                }
-                {
-                    json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
-                    jarray.erase(3);
-                    CHECK(jarray == json({1, 1u, true, "string", 42.23, json::object(), {1, 2, 3}}));
-                }
-                {
-                    json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
-                    jarray.erase(4);
-                    CHECK(jarray == json({1, 1u, true, nullptr, 42.23, json::object(), {1, 2, 3}}));
-                }
-                {
-                    json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
-                    jarray.erase(5);
-                    CHECK(jarray == json({1, 1u, true, nullptr, "string", json::object(), {1, 2, 3}}));
-                }
-                {
-                    json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
-                    jarray.erase(6);
-                    CHECK(jarray == json({1, 1u, true, nullptr, "string", 42.23, {1, 2, 3}}));
-                }
-                {
-                    json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
-                    jarray.erase(7);
-                    CHECK(jarray == json({1, 1u, true, nullptr, "string", 42.23, json::object()}));
-                }
-                {
-                    json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
-                    CHECK_THROWS_AS(jarray.erase(8), json::out_of_range&);
-                    CHECK_THROWS_WITH(jarray.erase(8),
-                                      "[json.exception.out_of_range.401] array index 8 is out of range");
-                }
-            }
-
-            SECTION("remove element by iterator")
-            {
-                SECTION("erase(begin())")
-                {
-                    {
-                        json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
-                        json::iterator it2 = jarray.erase(jarray.begin());
-                        CHECK(jarray == json({1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}}));
-                        CHECK(*it2 == json(1u));
-                    }
-                    {
-                        json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
-                        json::const_iterator it2 = jarray.erase(jarray.cbegin());
-                        CHECK(jarray == json({1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}}));
-                        CHECK(*it2 == json(1u));
-                    }
-                }
-
-                SECTION("erase(begin(), end())")
-                {
-                    {
-                        json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
-                        json::iterator it2 = jarray.erase(jarray.begin(), jarray.end());
-                        CHECK(jarray == json::array());
-                        CHECK(it2 == jarray.end());
-                    }
-                    {
-                        json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
-                        json::const_iterator it2 = jarray.erase(jarray.cbegin(), jarray.cend());
-                        CHECK(jarray == json::array());
-                        CHECK(it2 == jarray.cend());
-                    }
-                }
-
-                SECTION("erase(begin(), begin())")
-                {
-                    {
-                        json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
-                        json::iterator it2 = jarray.erase(jarray.begin(), jarray.begin());
-                        CHECK(jarray == json({1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}}));
-                        CHECK(*it2 == json(1));
-                    }
-                    {
-                        json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
-                        json::const_iterator it2 = jarray.erase(jarray.cbegin(), jarray.cbegin());
-                        CHECK(jarray == json({1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}}));
-                        CHECK(*it2 == json(1));
-                    }
-                }
-
-                SECTION("erase at offset")
-                {
-                    {
-                        json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
-                        json::iterator it = jarray.begin() + 4;
-                        json::iterator it2 = jarray.erase(it);
-                        CHECK(jarray == json({1, 1u, true, nullptr, 42.23, json::object(), {1, 2, 3}}));
-                        CHECK(*it2 == json(42.23));
-                    }
-                    {
-                        json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
-                        json::const_iterator it = jarray.cbegin() + 4;
-                        json::const_iterator it2 = jarray.erase(it);
-                        CHECK(jarray == json({1, 1u, true, nullptr, 42.23, json::object(), {1, 2, 3}}));
-                        CHECK(*it2 == json(42.23));
-                    }
-                }
-
-                SECTION("erase subrange")
-                {
-                    {
-                        json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
-                        json::iterator it2 = jarray.erase(jarray.begin() + 3, jarray.begin() + 6);
-                        CHECK(jarray == json({1, 1u, true, json::object(), {1, 2, 3}}));
-                        CHECK(*it2 == json::object());
-                    }
-                    {
-                        json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
-                        json::const_iterator it2 = jarray.erase(jarray.cbegin() + 3, jarray.cbegin() + 6);
-                        CHECK(jarray == json({1, 1u, true, json::object(), {1, 2, 3}}));
-                        CHECK(*it2 == json::object());
-                    }
-                }
-
-                SECTION("different arrays")
-                {
-                    {
-                        json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
-                        json jarray2 = {"foo", "bar"};
-                        CHECK_THROWS_AS(jarray.erase(jarray2.begin()), json::invalid_iterator&);
-                        CHECK_THROWS_AS(jarray.erase(jarray.begin(), jarray2.end()), json::invalid_iterator&);
-                        CHECK_THROWS_AS(jarray.erase(jarray2.begin(), jarray.end()), json::invalid_iterator&);
-                        CHECK_THROWS_AS(jarray.erase(jarray2.begin(), jarray2.end()), json::invalid_iterator&);
-
-                        CHECK_THROWS_WITH(jarray.erase(jarray2.begin()),
-                                          "[json.exception.invalid_iterator.202] iterator does not fit current value");
-                        CHECK_THROWS_WITH(jarray.erase(jarray.begin(), jarray2.end()),
-                                          "[json.exception.invalid_iterator.203] iterators do not fit current value");
-                        CHECK_THROWS_WITH(jarray.erase(jarray2.begin(), jarray.end()),
-                                          "[json.exception.invalid_iterator.203] iterators do not fit current value");
-                        CHECK_THROWS_WITH(jarray.erase(jarray2.begin(), jarray2.end()),
-                                          "[json.exception.invalid_iterator.203] iterators do not fit current value");
-                    }
-                    {
-                        json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
-                        json jarray2 = {"foo", "bar"};
-                        CHECK_THROWS_AS(jarray.erase(jarray2.cbegin()), json::invalid_iterator&);
-                        CHECK_THROWS_AS(jarray.erase(jarray.cbegin(), jarray2.cend()), json::invalid_iterator&);
-                        CHECK_THROWS_AS(jarray.erase(jarray2.cbegin(), jarray.cend()), json::invalid_iterator&);
-                        CHECK_THROWS_AS(jarray.erase(jarray2.cbegin(), jarray2.cend()), json::invalid_iterator&);
-
-                        CHECK_THROWS_WITH(jarray.erase(jarray2.cbegin()),
-                                          "[json.exception.invalid_iterator.202] iterator does not fit current value");
-                        CHECK_THROWS_WITH(jarray.erase(jarray.cbegin(), jarray2.cend()),
-                                          "[json.exception.invalid_iterator.203] iterators do not fit current value");
-                        CHECK_THROWS_WITH(jarray.erase(jarray2.cbegin(), jarray.cend()),
-                                          "[json.exception.invalid_iterator.203] iterators do not fit current value");
-                        CHECK_THROWS_WITH(jarray.erase(jarray2.cbegin(), jarray2.cend()),
-                                          "[json.exception.invalid_iterator.203] iterators do not fit current value");
-                    }
-                }
-            }
-
-            SECTION("remove element by index in non-array type")
-            {
-                SECTION("null")
-                {
-                    json j_nonobject(json::value_t::null);
-                    CHECK_THROWS_AS(j_nonobject.erase(0), json::type_error&);
-                    CHECK_THROWS_WITH(j_nonobject.erase(0),
-                                      "[json.exception.type_error.307] cannot use erase() with null");
-                }
-
-                SECTION("boolean")
-                {
-                    json j_nonobject(json::value_t::boolean);
-                    CHECK_THROWS_AS(j_nonobject.erase(0), json::type_error&);
-                    CHECK_THROWS_WITH(j_nonobject.erase(0),
-                                      "[json.exception.type_error.307] cannot use erase() with boolean");
-                }
-
-                SECTION("string")
-                {
-                    json j_nonobject(json::value_t::string);
-                    CHECK_THROWS_AS(j_nonobject.erase(0), json::type_error&);
-                    CHECK_THROWS_WITH(j_nonobject.erase(0),
-                                      "[json.exception.type_error.307] cannot use erase() with string");
-                }
-
-                SECTION("object")
-                {
-                    json j_nonobject(json::value_t::object);
-                    CHECK_THROWS_AS(j_nonobject.erase(0), json::type_error&);
-                    CHECK_THROWS_WITH(j_nonobject.erase(0),
-                                      "[json.exception.type_error.307] cannot use erase() with object");
-                }
-
-                SECTION("number (integer)")
-                {
-                    json j_nonobject(json::value_t::number_integer);
-                    CHECK_THROWS_AS(j_nonobject.erase(0), json::type_error&);
-                    CHECK_THROWS_WITH(j_nonobject.erase(0),
-                                      "[json.exception.type_error.307] cannot use erase() with number");
-                }
-
-                SECTION("number (unsigned)")
-                {
-                    json j_nonobject(json::value_t::number_unsigned);
-                    CHECK_THROWS_AS(j_nonobject.erase(0), json::type_error&);
-                    CHECK_THROWS_WITH(j_nonobject.erase(0),
-                                      "[json.exception.type_error.307] cannot use erase() with number");
-                }
-
-                SECTION("number (floating-point)")
-                {
-                    json j_nonobject(json::value_t::number_float);
-                    CHECK_THROWS_AS(j_nonobject.erase(0), json::type_error&);
-                    CHECK_THROWS_WITH(j_nonobject.erase(0),
-                                      "[json.exception.type_error.307] cannot use erase() with number");
-                }
-            }
-        }
-    }
-
-    SECTION("other values")
-    {
-        SECTION("front and back")
-        {
-            SECTION("null")
-            {
-                {
-                    json j;
-                    CHECK_THROWS_AS(j.front(), json::invalid_iterator&);
-                    CHECK_THROWS_AS(j.back(), json::invalid_iterator&);
-                    CHECK_THROWS_WITH(j.front(), "[json.exception.invalid_iterator.214] cannot get value");
-                    CHECK_THROWS_WITH(j.back(), "[json.exception.invalid_iterator.214] cannot get value");
-                }
-                {
-                    const json j{};
-                    CHECK_THROWS_AS(j.front(), json::invalid_iterator&);
-                    CHECK_THROWS_AS(j.back(), json::invalid_iterator&);
-                    CHECK_THROWS_WITH(j.front(), "[json.exception.invalid_iterator.214] cannot get value");
-                    CHECK_THROWS_WITH(j.back(), "[json.exception.invalid_iterator.214] cannot get value");
-                }
-            }
-
-            SECTION("string")
-            {
-                {
-                    json j = "foo";
-                    CHECK(j.front() == j);
-                    CHECK(j.back() == j);
-                }
-                {
-                    const json j = "bar";
-                    CHECK(j.front() == j);
-                    CHECK(j.back() == j);
-                }
-            }
-
-            SECTION("number (boolean)")
-            {
-                {
-                    json j = false;
-                    CHECK(j.front() == j);
-                    CHECK(j.back() == j);
-                }
-                {
-                    const json j = true;
-                    CHECK(j.front() == j);
-                    CHECK(j.back() == j);
-                }
-            }
-
-            SECTION("number (integer)")
-            {
-                {
-                    json j = 17;
-                    CHECK(j.front() == j);
-                    CHECK(j.back() == j);
-                }
-                {
-                    const json j = 17;
-                    CHECK(j.front() == j);
-                    CHECK(j.back() == j);
-                }
-            }
-
-            SECTION("number (unsigned)")
-            {
-                {
-                    json j = 17u;
-                    CHECK(j.front() == j);
-                    CHECK(j.back() == j);
-                }
-                {
-                    const json j = 17u;
-                    CHECK(j.front() == j);
-                    CHECK(j.back() == j);
-                }
-            }
-
-            SECTION("number (floating point)")
-            {
-                {
-                    json j = 23.42;
-                    CHECK(j.front() == j);
-                    CHECK(j.back() == j);
-                }
-                {
-                    const json j = 23.42;
-                    CHECK(j.front() == j);
-                    CHECK(j.back() == j);
-                }
-            }
-        }
-
-        SECTION("erase with one valid iterator")
-        {
-            SECTION("null")
-            {
-                {
-                    json j;
-                    CHECK_THROWS_AS(j.erase(j.begin()), json::type_error&);
-                    CHECK_THROWS_WITH(j.erase(j.begin()),
-                                      "[json.exception.type_error.307] cannot use erase() with null");
-                }
-                {
-                    json j;
-                    CHECK_THROWS_AS(j.erase(j.cbegin()), json::type_error&);
-                    CHECK_THROWS_WITH(j.erase(j.begin()),
-                                      "[json.exception.type_error.307] cannot use erase() with null");
-                }
-            }
-
-            SECTION("string")
-            {
-                {
-                    json j = "foo";
-                    json::iterator it = j.erase(j.begin());
-                    CHECK(j.type() == json::value_t::null);
-                    CHECK(it == j.end());
-                }
-                {
-                    json j = "bar";
-                    json::const_iterator it = j.erase(j.cbegin());
-                    CHECK(j.type() == json::value_t::null);
-                    CHECK(it == j.end());
-                }
-            }
-
-            SECTION("number (boolean)")
-            {
-                {
-                    json j = false;
-                    json::iterator it = j.erase(j.begin());
-                    CHECK(j.type() == json::value_t::null);
-                    CHECK(it == j.end());
-                }
-                {
-                    json j = true;
-                    json::const_iterator it = j.erase(j.cbegin());
-                    CHECK(j.type() == json::value_t::null);
-                    CHECK(it == j.end());
-                }
-            }
-
-            SECTION("number (integer)")
-            {
-                {
-                    json j = 17;
-                    json::iterator it = j.erase(j.begin());
-                    CHECK(j.type() == json::value_t::null);
-                    CHECK(it == j.end());
-                }
-                {
-                    json j = 17;
-                    json::const_iterator it = j.erase(j.cbegin());
-                    CHECK(j.type() == json::value_t::null);
-                    CHECK(it == j.end());
-                }
-            }
-
-            SECTION("number (unsigned)")
-            {
-                {
-                    json j = 17u;
-                    json::iterator it = j.erase(j.begin());
-                    CHECK(j.type() == json::value_t::null);
-                    CHECK(it == j.end());
-                }
-                {
-                    json j = 17u;
-                    json::const_iterator it = j.erase(j.cbegin());
-                    CHECK(j.type() == json::value_t::null);
-                    CHECK(it == j.end());
-                }
-            }
-
-            SECTION("number (floating point)")
-            {
-                {
-                    json j = 23.42;
-                    json::iterator it = j.erase(j.begin());
-                    CHECK(j.type() == json::value_t::null);
-                    CHECK(it == j.end());
-                }
-                {
-                    json j = 23.42;
-                    json::const_iterator it = j.erase(j.cbegin());
-                    CHECK(j.type() == json::value_t::null);
-                    CHECK(it == j.end());
-                }
-            }
-
-            SECTION("binary")
-            {
-                {
-                    json j = json::binary({1, 2, 3});
-                    json::iterator it = j.erase(j.begin());
-                    CHECK(j.type() == json::value_t::null);
-                    CHECK(it == j.end());
-                }
-                {
-                    json j = json::binary({1, 2, 3});
-                    json::const_iterator it = j.erase(j.cbegin());
-                    CHECK(j.type() == json::value_t::null);
-                    CHECK(it == j.end());
-                }
-            }
-        }
-
-        SECTION("erase with one invalid iterator")
-        {
-            SECTION("string")
-            {
-                {
-                    json j = "foo";
-                    CHECK_THROWS_AS(j.erase(j.end()), json::invalid_iterator&);
-                    CHECK_THROWS_WITH(j.erase(j.end()),
-                                      "[json.exception.invalid_iterator.205] iterator out of range");
-                }
-                {
-                    json j = "bar";
-                    CHECK_THROWS_AS(j.erase(j.cend()), json::invalid_iterator&);
-                    CHECK_THROWS_WITH(j.erase(j.cend()),
-                                      "[json.exception.invalid_iterator.205] iterator out of range");
-                }
-            }
-
-            SECTION("number (boolean)")
-            {
-                {
-                    json j = false;
-                    CHECK_THROWS_AS(j.erase(j.end()), json::invalid_iterator&);
-                    CHECK_THROWS_WITH(j.erase(j.end()),
-                                      "[json.exception.invalid_iterator.205] iterator out of range");
-                }
-                {
-                    json j = true;
-                    CHECK_THROWS_AS(j.erase(j.cend()), json::invalid_iterator&);
-                    CHECK_THROWS_WITH(j.erase(j.cend()),
-                                      "[json.exception.invalid_iterator.205] iterator out of range");
-                }
-            }
-
-            SECTION("number (integer)")
-            {
-                {
-                    json j = 17;
-                    CHECK_THROWS_AS(j.erase(j.end()), json::invalid_iterator&);
-                    CHECK_THROWS_WITH(j.erase(j.end()),
-                                      "[json.exception.invalid_iterator.205] iterator out of range");
-                }
-                {
-                    json j = 17;
-                    CHECK_THROWS_AS(j.erase(j.cend()), json::invalid_iterator&);
-                    CHECK_THROWS_WITH(j.erase(j.cend()),
-                                      "[json.exception.invalid_iterator.205] iterator out of range");
-                }
-            }
-
-            SECTION("number (unsigned)")
-            {
-                {
-                    json j = 17u;
-                    CHECK_THROWS_AS(j.erase(j.end()), json::invalid_iterator&);
-                    CHECK_THROWS_WITH(j.erase(j.end()),
-                                      "[json.exception.invalid_iterator.205] iterator out of range");
-                }
-                {
-                    json j = 17u;
-                    CHECK_THROWS_AS(j.erase(j.cend()), json::invalid_iterator&);
-                    CHECK_THROWS_WITH(j.erase(j.cend()),
-                                      "[json.exception.invalid_iterator.205] iterator out of range");
-                }
-            }
-
-            SECTION("number (floating point)")
-            {
-                {
-                    json j = 23.42;
-                    CHECK_THROWS_AS(j.erase(j.end()), json::invalid_iterator&);
-                    CHECK_THROWS_WITH(j.erase(j.end()),
-                                      "[json.exception.invalid_iterator.205] iterator out of range");
-                }
-                {
-                    json j = 23.42;
-                    CHECK_THROWS_AS(j.erase(j.cend()), json::invalid_iterator&);
-                    CHECK_THROWS_WITH(j.erase(j.cend()),
-                                      "[json.exception.invalid_iterator.205] iterator out of range");
-                }
-            }
-        }
-
-        SECTION("erase with two valid iterators")
-        {
-            SECTION("null")
-            {
-                {
-                    json j;
-                    CHECK_THROWS_AS(j.erase(j.begin(), j.end()), json::type_error&);
-                    CHECK_THROWS_WITH(j.erase(j.begin(), j.end()),
-                                      "[json.exception.type_error.307] cannot use erase() with null");
-                }
-                {
-                    json j;
-                    CHECK_THROWS_AS(j.erase(j.cbegin(), j.cend()), json::type_error&);
-                    CHECK_THROWS_WITH(j.erase(j.cbegin(), j.cend()),
-                                      "[json.exception.type_error.307] cannot use erase() with null");
-                }
-            }
-
-            SECTION("string")
-            {
-                {
-                    json j = "foo";
-                    json::iterator it = j.erase(j.begin(), j.end());
-                    CHECK(j.type() == json::value_t::null);
-                    CHECK(it == j.end());
-                }
-                {
-                    json j = "bar";
-                    json::const_iterator it = j.erase(j.cbegin(), j.cend());
-                    CHECK(j.type() == json::value_t::null);
-                    CHECK(it == j.end());
-                }
-            }
-
-            SECTION("number (boolean)")
-            {
-                {
-                    json j = false;
-                    json::iterator it = j.erase(j.begin(), j.end());
-                    CHECK(j.type() == json::value_t::null);
-                    CHECK(it == j.end());
-                }
-                {
-                    json j = true;
-                    json::const_iterator it = j.erase(j.cbegin(), j.cend());
-                    CHECK(j.type() == json::value_t::null);
-                    CHECK(it == j.end());
-                }
-            }
-
-            SECTION("number (integer)")
-            {
-                {
-                    json j = 17;
-                    json::iterator it = j.erase(j.begin(), j.end());
-                    CHECK(j.type() == json::value_t::null);
-                    CHECK(it == j.end());
-                }
-                {
-                    json j = 17;
-                    json::const_iterator it = j.erase(j.cbegin(), j.cend());
-                    CHECK(j.type() == json::value_t::null);
-                    CHECK(it == j.end());
-                }
-            }
-
-            SECTION("number (unsigned)")
-            {
-                {
-                    json j = 17u;
-                    json::iterator it = j.erase(j.begin(), j.end());
-                    CHECK(j.type() == json::value_t::null);
-                    CHECK(it == j.end());
-                }
-                {
-                    json j = 17u;
-                    json::const_iterator it = j.erase(j.cbegin(), j.cend());
-                    CHECK(j.type() == json::value_t::null);
-                    CHECK(it == j.end());
-                }
-            }
-
-            SECTION("number (floating point)")
-            {
-                {
-                    json j = 23.42;
-                    json::iterator it = j.erase(j.begin(), j.end());
-                    CHECK(j.type() == json::value_t::null);
-                    CHECK(it == j.end());
-                }
-                {
-                    json j = 23.42;
-                    json::const_iterator it = j.erase(j.cbegin(), j.cend());
-                    CHECK(j.type() == json::value_t::null);
-                    CHECK(it == j.end());
-                }
-            }
-
-            SECTION("binary")
-            {
-                {
-                    json j = json::binary({1, 2, 3});
-                    json::iterator it = j.erase(j.begin(), j.end());
-                    CHECK(j.type() == json::value_t::null);
-                    CHECK(it == j.end());
-                }
-                {
-                    json j = json::binary({1, 2, 3});
-                    json::const_iterator it = j.erase(j.cbegin(), j.cend());
-                    CHECK(j.type() == json::value_t::null);
-                    CHECK(it == j.end());
-                }
-            }
-        }
-
-        SECTION("erase with two invalid iterators")
-        {
-            SECTION("string")
-            {
-                {
-                    json j = "foo";
-                    CHECK_THROWS_AS(j.erase(j.end(), j.end()), json::invalid_iterator&);
-                    CHECK_THROWS_AS(j.erase(j.begin(), j.begin()), json::invalid_iterator&);
-                    CHECK_THROWS_WITH(j.erase(j.end(), j.end()), "[json.exception.invalid_iterator.204] iterators out of range");
-                    CHECK_THROWS_WITH(j.erase(j.begin(), j.begin()), "[json.exception.invalid_iterator.204] iterators out of range");
-                }
-                {
-                    json j = "bar";
-                    CHECK_THROWS_AS(j.erase(j.cend(), j.cend()), json::invalid_iterator&);
-                    CHECK_THROWS_AS(j.erase(j.cbegin(), j.cbegin()), json::invalid_iterator&);
-                    CHECK_THROWS_WITH(j.erase(j.cend(), j.cend()), "[json.exception.invalid_iterator.204] iterators out of range");
-                    CHECK_THROWS_WITH(j.erase(j.cbegin(), j.cbegin()), "[json.exception.invalid_iterator.204] iterators out of range");
-                }
-            }
-
-            SECTION("number (boolean)")
-            {
-                {
-                    json j = false;
-                    CHECK_THROWS_AS(j.erase(j.end(), j.end()), json::invalid_iterator&);
-                    CHECK_THROWS_AS(j.erase(j.begin(), j.begin()), json::invalid_iterator&);
-                    CHECK_THROWS_WITH(j.erase(j.end(), j.end()), "[json.exception.invalid_iterator.204] iterators out of range");
-                    CHECK_THROWS_WITH(j.erase(j.begin(), j.begin()), "[json.exception.invalid_iterator.204] iterators out of range");
-                }
-                {
-                    json j = true;
-                    CHECK_THROWS_AS(j.erase(j.cend(), j.cend()), json::invalid_iterator&);
-                    CHECK_THROWS_AS(j.erase(j.cbegin(), j.cbegin()), json::invalid_iterator&);
-                    CHECK_THROWS_WITH(j.erase(j.cend(), j.cend()), "[json.exception.invalid_iterator.204] iterators out of range");
-                    CHECK_THROWS_WITH(j.erase(j.cbegin(), j.cbegin()), "[json.exception.invalid_iterator.204] iterators out of range");
-                }
-            }
-
-            SECTION("number (integer)")
-            {
-                {
-                    json j = 17;
-                    CHECK_THROWS_AS(j.erase(j.end(), j.end()), json::invalid_iterator&);
-                    CHECK_THROWS_AS(j.erase(j.begin(), j.begin()), json::invalid_iterator&);
-                    CHECK_THROWS_WITH(j.erase(j.end(), j.end()), "[json.exception.invalid_iterator.204] iterators out of range");
-                    CHECK_THROWS_WITH(j.erase(j.begin(), j.begin()), "[json.exception.invalid_iterator.204] iterators out of range");
-                }
-                {
-                    json j = 17;
-                    CHECK_THROWS_AS(j.erase(j.cend(), j.cend()), json::invalid_iterator&);
-                    CHECK_THROWS_AS(j.erase(j.cbegin(), j.cbegin()), json::invalid_iterator&);
-                    CHECK_THROWS_WITH(j.erase(j.cend(), j.cend()), "[json.exception.invalid_iterator.204] iterators out of range");
-                    CHECK_THROWS_WITH(j.erase(j.cbegin(), j.cbegin()), "[json.exception.invalid_iterator.204] iterators out of range");
-                }
-            }
-
-            SECTION("number (unsigned)")
-            {
-                {
-                    json j = 17u;
-                    CHECK_THROWS_AS(j.erase(j.end(), j.end()), json::invalid_iterator&);
-                    CHECK_THROWS_AS(j.erase(j.begin(), j.begin()), json::invalid_iterator&);
-                    CHECK_THROWS_WITH(j.erase(j.end(), j.end()), "[json.exception.invalid_iterator.204] iterators out of range");
-                    CHECK_THROWS_WITH(j.erase(j.begin(), j.begin()), "[json.exception.invalid_iterator.204] iterators out of range");
-                }
-                {
-                    json j = 17u;
-                    CHECK_THROWS_AS(j.erase(j.cend(), j.cend()), json::invalid_iterator&);
-                    CHECK_THROWS_AS(j.erase(j.cbegin(), j.cbegin()), json::invalid_iterator&);
-                    CHECK_THROWS_WITH(j.erase(j.cend(), j.cend()), "[json.exception.invalid_iterator.204] iterators out of range");
-                    CHECK_THROWS_WITH(j.erase(j.cbegin(), j.cbegin()), "[json.exception.invalid_iterator.204] iterators out of range");
-                }
-            }
-
-            SECTION("number (floating point)")
-            {
-                {
-                    json j = 23.42;
-                    CHECK_THROWS_AS(j.erase(j.end(), j.end()), json::invalid_iterator&);
-                    CHECK_THROWS_AS(j.erase(j.begin(), j.begin()), json::invalid_iterator&);
-                    CHECK_THROWS_WITH(j.erase(j.end(), j.end()), "[json.exception.invalid_iterator.204] iterators out of range");
-                    CHECK_THROWS_WITH(j.erase(j.begin(), j.begin()), "[json.exception.invalid_iterator.204] iterators out of range");
-                }
-                {
-                    json j = 23.42;
-                    CHECK_THROWS_AS(j.erase(j.cend(), j.cend()), json::invalid_iterator&);
-                    CHECK_THROWS_AS(j.erase(j.cbegin(), j.cbegin()), json::invalid_iterator&);
-                    CHECK_THROWS_WITH(j.erase(j.cend(), j.cend()), "[json.exception.invalid_iterator.204] iterators out of range");
-                    CHECK_THROWS_WITH(j.erase(j.cbegin(), j.cbegin()), "[json.exception.invalid_iterator.204] iterators out of range");
-                }
-            }
-        }
-    }
-}
diff --git a/external_imported/json/test/src/unit-element_access2.cpp b/external_imported/json/test/src/unit-element_access2.cpp
deleted file mode 100644
index 18fc6a20c..000000000
--- a/external_imported/json/test/src/unit-element_access2.cpp
+++ /dev/null
@@ -1,1109 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include "doctest_compatibility.h"
-
-#include <nlohmann/json.hpp>
-using nlohmann::json;
-
-TEST_CASE("element access 2")
-{
-    SECTION("object")
-    {
-        json j = {{"integer", 1}, {"unsigned", 1u}, {"floating", 42.23}, {"null", nullptr}, {"string", "hello world"}, {"boolean", true}, {"object", json::object()}, {"array", {1, 2, 3}}};
-        const json j_const = j;
-
-        SECTION("access specified element with bounds checking")
-        {
-            SECTION("access within bounds")
-            {
-                CHECK(j.at("integer") == json(1));
-                CHECK(j.at("unsigned") == json(1u));
-                CHECK(j.at("boolean") == json(true));
-                CHECK(j.at("null") == json(nullptr));
-                CHECK(j.at("string") == json("hello world"));
-                CHECK(j.at("floating") == json(42.23));
-                CHECK(j.at("object") == json::object());
-                CHECK(j.at("array") == json({1, 2, 3}));
-
-                CHECK(j_const.at("integer") == json(1));
-                CHECK(j_const.at("unsigned") == json(1u));
-                CHECK(j_const.at("boolean") == json(true));
-                CHECK(j_const.at("null") == json(nullptr));
-                CHECK(j_const.at("string") == json("hello world"));
-                CHECK(j_const.at("floating") == json(42.23));
-                CHECK(j_const.at("object") == json::object());
-                CHECK(j_const.at("array") == json({1, 2, 3}));
-            }
-
-            SECTION("access outside bounds")
-            {
-                CHECK_THROWS_AS(j.at("foo"), json::out_of_range&);
-                CHECK_THROWS_AS(j_const.at("foo"), json::out_of_range&);
-                CHECK_THROWS_WITH(j.at("foo"),
-                                  "[json.exception.out_of_range.403] key 'foo' not found");
-                CHECK_THROWS_WITH(j_const.at("foo"),
-                                  "[json.exception.out_of_range.403] key 'foo' not found");
-            }
-
-            SECTION("access on non-object type")
-            {
-                SECTION("null")
-                {
-                    json j_nonobject(json::value_t::null);
-                    const json j_nonobject_const(j_nonobject);
-                    CHECK_THROWS_AS(j_nonobject.at("foo"), json::type_error&);
-                    CHECK_THROWS_AS(j_nonobject_const.at("foo"), json::type_error&);
-                    CHECK_THROWS_WITH(j_nonobject.at("foo"), "[json.exception.type_error.304] cannot use at() with null");
-                    CHECK_THROWS_WITH(j_nonobject_const.at("foo"), "[json.exception.type_error.304] cannot use at() with null");
-                }
-
-                SECTION("boolean")
-                {
-                    json j_nonobject(json::value_t::boolean);
-                    const json j_nonobject_const(j_nonobject);
-                    CHECK_THROWS_AS(j_nonobject.at("foo"), json::type_error&);
-                    CHECK_THROWS_AS(j_nonobject_const.at("foo"), json::type_error&);
-                    CHECK_THROWS_WITH(j_nonobject.at("foo"), "[json.exception.type_error.304] cannot use at() with boolean");
-                    CHECK_THROWS_WITH(j_nonobject_const.at("foo"), "[json.exception.type_error.304] cannot use at() with boolean");
-                }
-
-                SECTION("string")
-                {
-                    json j_nonobject(json::value_t::string);
-                    const json j_nonobject_const(j_nonobject);
-                    CHECK_THROWS_AS(j_nonobject.at("foo"), json::type_error&);
-                    CHECK_THROWS_AS(j_nonobject_const.at("foo"), json::type_error&);
-                    CHECK_THROWS_WITH(j_nonobject.at("foo"), "[json.exception.type_error.304] cannot use at() with string");
-                    CHECK_THROWS_WITH(j_nonobject_const.at("foo"), "[json.exception.type_error.304] cannot use at() with string");
-                }
-
-                SECTION("array")
-                {
-                    json j_nonobject(json::value_t::array);
-                    const json j_nonobject_const(j_nonobject);
-                    CHECK_THROWS_AS(j_nonobject.at("foo"), json::type_error&);
-                    CHECK_THROWS_AS(j_nonobject_const.at("foo"), json::type_error&);
-                    CHECK_THROWS_WITH(j_nonobject.at("foo"), "[json.exception.type_error.304] cannot use at() with array");
-                    CHECK_THROWS_WITH(j_nonobject_const.at("foo"), "[json.exception.type_error.304] cannot use at() with array");
-                }
-
-                SECTION("number (integer)")
-                {
-                    json j_nonobject(json::value_t::number_integer);
-                    const json j_nonobject_const(j_nonobject);
-                    CHECK_THROWS_AS(j_nonobject.at("foo"), json::type_error&);
-                    CHECK_THROWS_AS(j_nonobject_const.at("foo"), json::type_error&);
-                    CHECK_THROWS_WITH(j_nonobject.at("foo"), "[json.exception.type_error.304] cannot use at() with number");
-                    CHECK_THROWS_WITH(j_nonobject_const.at("foo"), "[json.exception.type_error.304] cannot use at() with number");
-                }
-
-                SECTION("number (unsigned)")
-                {
-                    json j_nonobject(json::value_t::number_unsigned);
-                    const json j_nonobject_const(j_nonobject);
-                    CHECK_THROWS_AS(j_nonobject.at("foo"), json::type_error&);
-                    CHECK_THROWS_AS(j_nonobject_const.at("foo"), json::type_error&);
-                    CHECK_THROWS_WITH(j_nonobject.at("foo"), "[json.exception.type_error.304] cannot use at() with number");
-                    CHECK_THROWS_WITH(j_nonobject_const.at("foo"), "[json.exception.type_error.304] cannot use at() with number");
-                }
-
-                SECTION("number (floating-point)")
-                {
-                    json j_nonobject(json::value_t::number_float);
-                    const json j_nonobject_const(j_nonobject);
-                    CHECK_THROWS_AS(j_nonobject.at("foo"), json::type_error&);
-                    CHECK_THROWS_AS(j_nonobject_const.at("foo"), json::type_error&);
-                    CHECK_THROWS_WITH(j_nonobject.at("foo"), "[json.exception.type_error.304] cannot use at() with number");
-                    CHECK_THROWS_WITH(j_nonobject_const.at("foo"), "[json.exception.type_error.304] cannot use at() with number");
-                }
-            }
-        }
-
-        SECTION("access specified element with default value")
-        {
-            SECTION("given a key")
-            {
-                SECTION("access existing value")
-                {
-                    CHECK(j.value("integer", 2) == 1);
-                    CHECK(j.value("integer", 1.0) == Approx(1));
-                    CHECK(j.value("unsigned", 2) == 1u);
-                    CHECK(j.value("unsigned", 1.0) == Approx(1u));
-                    CHECK(j.value("null", json(1)) == json());
-                    CHECK(j.value("boolean", false) == true);
-                    CHECK(j.value("string", "bar") == "hello world");
-                    CHECK(j.value("string", std::string("bar")) == "hello world");
-                    CHECK(j.value("floating", 12.34) == Approx(42.23));
-                    CHECK(j.value("floating", 12) == 42);
-                    CHECK(j.value("object", json({{"foo", "bar"}})) == json::object());
-                    CHECK(j.value("array", json({10, 100})) == json({1, 2, 3}));
-
-                    CHECK(j_const.value("integer", 2) == 1);
-                    CHECK(j_const.value("integer", 1.0) == Approx(1));
-                    CHECK(j_const.value("unsigned", 2) == 1u);
-                    CHECK(j_const.value("unsigned", 1.0) == Approx(1u));
-                    CHECK(j_const.value("boolean", false) == true);
-                    CHECK(j_const.value("string", "bar") == "hello world");
-                    CHECK(j_const.value("string", std::string("bar")) == "hello world");
-                    CHECK(j_const.value("floating", 12.34) == Approx(42.23));
-                    CHECK(j_const.value("floating", 12) == 42);
-                    CHECK(j_const.value("object", json({{"foo", "bar"}})) == json::object());
-                    CHECK(j_const.value("array", json({10, 100})) == json({1, 2, 3}));
-                }
-
-                SECTION("access non-existing value")
-                {
-                    CHECK(j.value("_", 2) == 2);
-                    CHECK(j.value("_", 2u) == 2u);
-                    CHECK(j.value("_", false) == false);
-                    CHECK(j.value("_", "bar") == "bar");
-                    CHECK(j.value("_", 12.34) == Approx(12.34));
-                    CHECK(j.value("_", json({{"foo", "bar"}})) == json({{"foo", "bar"}}));
-                    CHECK(j.value("_", json({10, 100})) == json({10, 100}));
-
-                    CHECK(j_const.value("_", 2) == 2);
-                    CHECK(j_const.value("_", 2u) == 2u);
-                    CHECK(j_const.value("_", false) == false);
-                    CHECK(j_const.value("_", "bar") == "bar");
-                    CHECK(j_const.value("_", 12.34) == Approx(12.34));
-                    CHECK(j_const.value("_", json({{"foo", "bar"}})) == json({{"foo", "bar"}}));
-                    CHECK(j_const.value("_", json({10, 100})) == json({10, 100}));
-                }
-
-                SECTION("access on non-object type")
-                {
-                    SECTION("null")
-                    {
-                        json j_nonobject(json::value_t::null);
-                        const json j_nonobject_const(j_nonobject);
-                        CHECK_THROWS_AS(j_nonobject.value("foo", 1), json::type_error&);
-                        CHECK_THROWS_AS(j_nonobject_const.value("foo", 1), json::type_error&);
-                        CHECK_THROWS_WITH(j_nonobject.value("foo", 1),
-                                          "[json.exception.type_error.306] cannot use value() with null");
-                        CHECK_THROWS_WITH(j_nonobject_const.value("foo", 1),
-                                          "[json.exception.type_error.306] cannot use value() with null");
-                    }
-
-                    SECTION("boolean")
-                    {
-                        json j_nonobject(json::value_t::boolean);
-                        const json j_nonobject_const(j_nonobject);
-                        CHECK_THROWS_AS(j_nonobject.value("foo", 1), json::type_error&);
-                        CHECK_THROWS_AS(j_nonobject_const.value("foo", 1), json::type_error&);
-                        CHECK_THROWS_WITH(j_nonobject.value("foo", 1),
-                                          "[json.exception.type_error.306] cannot use value() with boolean");
-                        CHECK_THROWS_WITH(j_nonobject_const.value("foo", 1),
-                                          "[json.exception.type_error.306] cannot use value() with boolean");
-                    }
-
-                    SECTION("string")
-                    {
-                        json j_nonobject(json::value_t::string);
-                        const json j_nonobject_const(j_nonobject);
-                        CHECK_THROWS_AS(j_nonobject.value("foo", 1), json::type_error&);
-                        CHECK_THROWS_AS(j_nonobject_const.value("foo", 1), json::type_error&);
-                        CHECK_THROWS_WITH(j_nonobject.value("foo", 1),
-                                          "[json.exception.type_error.306] cannot use value() with string");
-                        CHECK_THROWS_WITH(j_nonobject_const.value("foo", 1),
-                                          "[json.exception.type_error.306] cannot use value() with string");
-                    }
-
-                    SECTION("array")
-                    {
-                        json j_nonobject(json::value_t::array);
-                        const json j_nonobject_const(j_nonobject);
-                        CHECK_THROWS_AS(j_nonobject.value("foo", 1), json::type_error&);
-                        CHECK_THROWS_AS(j_nonobject_const.value("foo", 1), json::type_error&);
-                        CHECK_THROWS_WITH(j_nonobject.value("foo", 1),
-                                          "[json.exception.type_error.306] cannot use value() with array");
-                        CHECK_THROWS_WITH(j_nonobject_const.value("foo", 1),
-                                          "[json.exception.type_error.306] cannot use value() with array");
-                    }
-
-                    SECTION("number (integer)")
-                    {
-                        json j_nonobject(json::value_t::number_integer);
-                        const json j_nonobject_const(j_nonobject);
-                        CHECK_THROWS_AS(j_nonobject.value("foo", 1), json::type_error&);
-                        CHECK_THROWS_AS(j_nonobject_const.value("foo", 1), json::type_error&);
-                        CHECK_THROWS_WITH(j_nonobject.value("foo", 1),
-                                          "[json.exception.type_error.306] cannot use value() with number");
-                        CHECK_THROWS_WITH(j_nonobject_const.value("foo", 1),
-                                          "[json.exception.type_error.306] cannot use value() with number");
-                    }
-
-                    SECTION("number (unsigned)")
-                    {
-                        json j_nonobject(json::value_t::number_unsigned);
-                        const json j_nonobject_const(j_nonobject);
-                        CHECK_THROWS_AS(j_nonobject.value("foo", 1), json::type_error&);
-                        CHECK_THROWS_AS(j_nonobject_const.value("foo", 1), json::type_error&);
-                        CHECK_THROWS_WITH(j_nonobject.value("foo", 1),
-                                          "[json.exception.type_error.306] cannot use value() with number");
-                        CHECK_THROWS_WITH(j_nonobject_const.value("foo", 1),
-                                          "[json.exception.type_error.306] cannot use value() with number");
-                    }
-
-                    SECTION("number (floating-point)")
-                    {
-                        json j_nonobject(json::value_t::number_float);
-                        const json j_nonobject_const(j_nonobject);
-                        CHECK_THROWS_AS(j_nonobject.value("foo", 1), json::type_error&);
-                        CHECK_THROWS_AS(j_nonobject_const.value("foo", 1), json::type_error&);
-                        CHECK_THROWS_WITH(j_nonobject.value("foo", 1),
-                                          "[json.exception.type_error.306] cannot use value() with number");
-                        CHECK_THROWS_WITH(j_nonobject_const.value("foo", 1),
-                                          "[json.exception.type_error.306] cannot use value() with number");
-                    }
-                }
-            }
-
-            SECTION("given a JSON pointer")
-            {
-                SECTION("access existing value")
-                {
-                    CHECK(j.value("/integer"_json_pointer, 2) == 1);
-                    CHECK(j.value("/integer"_json_pointer, 1.0) == Approx(1));
-                    CHECK(j.value("/unsigned"_json_pointer, 2) == 1u);
-                    CHECK(j.value("/unsigned"_json_pointer, 1.0) == Approx(1u));
-                    CHECK(j.value("/null"_json_pointer, json(1)) == json());
-                    CHECK(j.value("/boolean"_json_pointer, false) == true);
-                    CHECK(j.value("/string"_json_pointer, "bar") == "hello world");
-                    CHECK(j.value("/string"_json_pointer, std::string("bar")) == "hello world");
-                    CHECK(j.value("/floating"_json_pointer, 12.34) == Approx(42.23));
-                    CHECK(j.value("/floating"_json_pointer, 12) == 42);
-                    CHECK(j.value("/object"_json_pointer, json({{"foo", "bar"}})) == json::object());
-                    CHECK(j.value("/array"_json_pointer, json({10, 100})) == json({1, 2, 3}));
-
-                    CHECK(j_const.value("/integer"_json_pointer, 2) == 1);
-                    CHECK(j_const.value("/integer"_json_pointer, 1.0) == Approx(1));
-                    CHECK(j_const.value("/unsigned"_json_pointer, 2) == 1u);
-                    CHECK(j_const.value("/unsigned"_json_pointer, 1.0) == Approx(1u));
-                    CHECK(j_const.value("/boolean"_json_pointer, false) == true);
-                    CHECK(j_const.value("/string"_json_pointer, "bar") == "hello world");
-                    CHECK(j_const.value("/string"_json_pointer, std::string("bar")) == "hello world");
-                    CHECK(j_const.value("/floating"_json_pointer, 12.34) == Approx(42.23));
-                    CHECK(j_const.value("/floating"_json_pointer, 12) == 42);
-                    CHECK(j_const.value("/object"_json_pointer, json({{"foo", "bar"}})) == json::object());
-                    CHECK(j_const.value("/array"_json_pointer, json({10, 100})) == json({1, 2, 3}));
-                }
-
-                SECTION("access on non-object type")
-                {
-                    SECTION("null")
-                    {
-                        json j_nonobject(json::value_t::null);
-                        const json j_nonobject_const(j_nonobject);
-                        CHECK_THROWS_AS(j_nonobject.value("/foo"_json_pointer, 1), json::type_error&);
-                        CHECK_THROWS_AS(j_nonobject_const.value("/foo"_json_pointer, 1), json::type_error&);
-                        CHECK_THROWS_WITH(j_nonobject.value("/foo"_json_pointer, 1),
-                                          "[json.exception.type_error.306] cannot use value() with null");
-                        CHECK_THROWS_WITH(j_nonobject_const.value("/foo"_json_pointer, 1),
-                                          "[json.exception.type_error.306] cannot use value() with null");
-                    }
-
-                    SECTION("boolean")
-                    {
-                        json j_nonobject(json::value_t::boolean);
-                        const json j_nonobject_const(j_nonobject);
-                        CHECK_THROWS_AS(j_nonobject.value("/foo"_json_pointer, 1), json::type_error&);
-                        CHECK_THROWS_AS(j_nonobject_const.value("/foo"_json_pointer, 1), json::type_error&);
-                        CHECK_THROWS_WITH(j_nonobject.value("/foo"_json_pointer, 1),
-                                          "[json.exception.type_error.306] cannot use value() with boolean");
-                        CHECK_THROWS_WITH(j_nonobject_const.value("/foo"_json_pointer, 1),
-                                          "[json.exception.type_error.306] cannot use value() with boolean");
-                    }
-
-                    SECTION("string")
-                    {
-                        json j_nonobject(json::value_t::string);
-                        const json j_nonobject_const(j_nonobject);
-                        CHECK_THROWS_AS(j_nonobject.value("/foo"_json_pointer, 1), json::type_error&);
-                        CHECK_THROWS_AS(j_nonobject_const.value("/foo"_json_pointer, 1), json::type_error&);
-                        CHECK_THROWS_WITH(j_nonobject.value("/foo"_json_pointer, 1),
-                                          "[json.exception.type_error.306] cannot use value() with string");
-                        CHECK_THROWS_WITH(j_nonobject_const.value("/foo"_json_pointer, 1),
-                                          "[json.exception.type_error.306] cannot use value() with string");
-                    }
-
-                    SECTION("array")
-                    {
-                        json j_nonobject(json::value_t::array);
-                        const json j_nonobject_const(j_nonobject);
-                        CHECK_THROWS_AS(j_nonobject.value("/foo"_json_pointer, 1), json::type_error&);
-                        CHECK_THROWS_AS(j_nonobject_const.value("/foo"_json_pointer, 1), json::type_error&);
-                        CHECK_THROWS_WITH(j_nonobject.value("/foo"_json_pointer, 1),
-                                          "[json.exception.type_error.306] cannot use value() with array");
-                        CHECK_THROWS_WITH(j_nonobject_const.value("/foo"_json_pointer, 1),
-                                          "[json.exception.type_error.306] cannot use value() with array");
-                    }
-
-                    SECTION("number (integer)")
-                    {
-                        json j_nonobject(json::value_t::number_integer);
-                        const json j_nonobject_const(j_nonobject);
-                        CHECK_THROWS_AS(j_nonobject.value("/foo"_json_pointer, 1), json::type_error&);
-                        CHECK_THROWS_AS(j_nonobject_const.value("/foo"_json_pointer, 1), json::type_error&);
-                        CHECK_THROWS_WITH(j_nonobject.value("/foo"_json_pointer, 1),
-                                          "[json.exception.type_error.306] cannot use value() with number");
-                        CHECK_THROWS_WITH(j_nonobject_const.value("/foo"_json_pointer, 1),
-                                          "[json.exception.type_error.306] cannot use value() with number");
-                    }
-
-                    SECTION("number (unsigned)")
-                    {
-                        json j_nonobject(json::value_t::number_unsigned);
-                        const json j_nonobject_const(j_nonobject);
-                        CHECK_THROWS_AS(j_nonobject.value("/foo"_json_pointer, 1), json::type_error&);
-                        CHECK_THROWS_AS(j_nonobject_const.value("/foo"_json_pointer, 1), json::type_error&);
-                        CHECK_THROWS_WITH(j_nonobject.value("/foo"_json_pointer, 1),
-                                          "[json.exception.type_error.306] cannot use value() with number");
-                        CHECK_THROWS_WITH(j_nonobject_const.value("/foo"_json_pointer, 1),
-                                          "[json.exception.type_error.306] cannot use value() with number");
-                    }
-
-                    SECTION("number (floating-point)")
-                    {
-                        json j_nonobject(json::value_t::number_float);
-                        const json j_nonobject_const(j_nonobject);
-                        CHECK_THROWS_AS(j_nonobject.value("/foo"_json_pointer, 1), json::type_error&);
-                        CHECK_THROWS_AS(j_nonobject_const.value("/foo"_json_pointer, 1), json::type_error&);
-                        CHECK_THROWS_WITH(j_nonobject.value("/foo"_json_pointer, 1),
-                                          "[json.exception.type_error.306] cannot use value() with number");
-                        CHECK_THROWS_WITH(j_nonobject_const.value("/foo"_json_pointer, 1),
-                                          "[json.exception.type_error.306] cannot use value() with number");
-                    }
-                }
-            }
-        }
-
-        SECTION("front and back")
-        {
-            // "array" is the smallest key
-            CHECK(j.front() == json({1, 2, 3}));
-            CHECK(j_const.front() == json({1, 2, 3}));
-            // "unsigned" is the largest key
-            CHECK(j.back() == json(1u));
-            CHECK(j_const.back() == json(1u));
-        }
-
-        SECTION("access specified element")
-        {
-            SECTION("access within bounds")
-            {
-                CHECK(j["integer"] == json(1));
-                CHECK(j[json::object_t::key_type("integer")] == j["integer"]);
-
-                CHECK(j["unsigned"] == json(1u));
-                CHECK(j[json::object_t::key_type("unsigned")] == j["unsigned"]);
-
-                CHECK(j["boolean"] == json(true));
-                CHECK(j[json::object_t::key_type("boolean")] == j["boolean"]);
-
-                CHECK(j["null"] == json(nullptr));
-                CHECK(j[json::object_t::key_type("null")] == j["null"]);
-
-                CHECK(j["string"] == json("hello world"));
-                CHECK(j[json::object_t::key_type("string")] == j["string"]);
-
-                CHECK(j["floating"] == json(42.23));
-                CHECK(j[json::object_t::key_type("floating")] == j["floating"]);
-
-                CHECK(j["object"] == json::object());
-                CHECK(j[json::object_t::key_type("object")] == j["object"]);
-
-                CHECK(j["array"] == json({1, 2, 3}));
-                CHECK(j[json::object_t::key_type("array")] == j["array"]);
-
-                CHECK(j_const["integer"] == json(1));
-                CHECK(j_const[json::object_t::key_type("integer")] == j["integer"]);
-
-                CHECK(j_const["boolean"] == json(true));
-                CHECK(j_const[json::object_t::key_type("boolean")] == j["boolean"]);
-
-                CHECK(j_const["null"] == json(nullptr));
-                CHECK(j_const[json::object_t::key_type("null")] == j["null"]);
-
-                CHECK(j_const["string"] == json("hello world"));
-                CHECK(j_const[json::object_t::key_type("string")] == j["string"]);
-
-                CHECK(j_const["floating"] == json(42.23));
-                CHECK(j_const[json::object_t::key_type("floating")] == j["floating"]);
-
-                CHECK(j_const["object"] == json::object());
-                CHECK(j_const[json::object_t::key_type("object")] == j["object"]);
-
-                CHECK(j_const["array"] == json({1, 2, 3}));
-                CHECK(j_const[json::object_t::key_type("array")] == j["array"]);
-            }
-
-            SECTION("access on non-object type")
-            {
-                SECTION("null")
-                {
-                    json j_nonobject(json::value_t::null);
-                    json j_nonobject2(json::value_t::null);
-                    const json j_const_nonobject(j_nonobject);
-                    CHECK_NOTHROW(j_nonobject["foo"]);
-                    CHECK_NOTHROW(j_nonobject2[json::object_t::key_type("foo")]);
-                    CHECK_THROWS_AS(j_const_nonobject["foo"], json::type_error&);
-                    CHECK_THROWS_AS(j_const_nonobject[json::object_t::key_type("foo")], json::type_error&);
-                    CHECK_THROWS_WITH(j_const_nonobject["foo"], "[json.exception.type_error.305] cannot use operator[] with a string argument with null");
-                    CHECK_THROWS_WITH(j_const_nonobject[json::object_t::key_type("foo")],
-                                      "[json.exception.type_error.305] cannot use operator[] with a string argument with null");
-                }
-
-                SECTION("boolean")
-                {
-                    json j_nonobject(json::value_t::boolean);
-                    const json j_const_nonobject(j_nonobject);
-                    CHECK_THROWS_AS(j_nonobject["foo"], json::type_error&);
-                    CHECK_THROWS_AS(j_nonobject[json::object_t::key_type("foo")], json::type_error&);
-                    CHECK_THROWS_AS(j_const_nonobject["foo"], json::type_error&);
-                    CHECK_THROWS_AS(j_const_nonobject[json::object_t::key_type("foo")], json::type_error&);
-                    CHECK_THROWS_WITH(j_nonobject["foo"],
-                                      "[json.exception.type_error.305] cannot use operator[] with a string argument with boolean");
-                    CHECK_THROWS_WITH(j_nonobject[json::object_t::key_type("foo")],
-                                      "[json.exception.type_error.305] cannot use operator[] with a string argument with boolean");
-                    CHECK_THROWS_WITH(j_const_nonobject["foo"],
-                                      "[json.exception.type_error.305] cannot use operator[] with a string argument with boolean");
-                    CHECK_THROWS_WITH(j_const_nonobject[json::object_t::key_type("foo")],
-                                      "[json.exception.type_error.305] cannot use operator[] with a string argument with boolean");
-                }
-
-                SECTION("string")
-                {
-                    json j_nonobject(json::value_t::string);
-                    const json j_const_nonobject(j_nonobject);
-                    CHECK_THROWS_AS(j_nonobject["foo"], json::type_error&);
-                    CHECK_THROWS_AS(j_nonobject[json::object_t::key_type("foo")], json::type_error&);
-                    CHECK_THROWS_AS(j_const_nonobject["foo"], json::type_error&);
-                    CHECK_THROWS_AS(j_const_nonobject[json::object_t::key_type("foo")], json::type_error&);
-                    CHECK_THROWS_WITH(j_nonobject["foo"],
-                                      "[json.exception.type_error.305] cannot use operator[] with a string argument with string");
-                    CHECK_THROWS_WITH(j_nonobject[json::object_t::key_type("foo")],
-                                      "[json.exception.type_error.305] cannot use operator[] with a string argument with string");
-                    CHECK_THROWS_WITH(j_const_nonobject["foo"],
-                                      "[json.exception.type_error.305] cannot use operator[] with a string argument with string");
-                    CHECK_THROWS_WITH(j_const_nonobject[json::object_t::key_type("foo")],
-                                      "[json.exception.type_error.305] cannot use operator[] with a string argument with string");
-                }
-
-                SECTION("array")
-                {
-                    json j_nonobject(json::value_t::array);
-                    const json j_const_nonobject(j_nonobject);
-                    CHECK_THROWS_AS(j_nonobject["foo"], json::type_error&);
-                    CHECK_THROWS_AS(j_nonobject[json::object_t::key_type("foo")], json::type_error&);
-                    CHECK_THROWS_AS(j_const_nonobject["foo"], json::type_error&);
-                    CHECK_THROWS_AS(j_const_nonobject[json::object_t::key_type("foo")], json::type_error&);
-                    CHECK_THROWS_WITH(j_nonobject["foo"],
-                                      "[json.exception.type_error.305] cannot use operator[] with a string argument with array");
-                    CHECK_THROWS_WITH(j_nonobject[json::object_t::key_type("foo")], "[json.exception.type_error.305] cannot use operator[] with a string argument with array");
-                    CHECK_THROWS_WITH(j_const_nonobject["foo"],
-                                      "[json.exception.type_error.305] cannot use operator[] with a string argument with array");
-                    CHECK_THROWS_WITH(j_const_nonobject[json::object_t::key_type("foo")],
-                                      "[json.exception.type_error.305] cannot use operator[] with a string argument with array");
-                }
-
-                SECTION("number (integer)")
-                {
-                    json j_nonobject(json::value_t::number_integer);
-                    const json j_const_nonobject(j_nonobject);
-                    CHECK_THROWS_AS(j_nonobject["foo"], json::type_error&);
-                    CHECK_THROWS_AS(j_nonobject[json::object_t::key_type("foo")], json::type_error&);
-                    CHECK_THROWS_AS(j_const_nonobject["foo"], json::type_error&);
-                    CHECK_THROWS_AS(j_const_nonobject[json::object_t::key_type("foo")], json::type_error&);
-                    CHECK_THROWS_WITH(j_nonobject["foo"],
-                                      "[json.exception.type_error.305] cannot use operator[] with a string argument with number");
-                    CHECK_THROWS_WITH(j_nonobject[json::object_t::key_type("foo")],
-                                      "[json.exception.type_error.305] cannot use operator[] with a string argument with number");
-                    CHECK_THROWS_WITH(j_const_nonobject["foo"],
-                                      "[json.exception.type_error.305] cannot use operator[] with a string argument with number");
-                    CHECK_THROWS_WITH(j_const_nonobject[json::object_t::key_type("foo")],
-                                      "[json.exception.type_error.305] cannot use operator[] with a string argument with number");
-                }
-
-                SECTION("number (unsigned)")
-                {
-                    json j_nonobject(json::value_t::number_unsigned);
-                    const json j_const_nonobject(j_nonobject);
-                    CHECK_THROWS_AS(j_nonobject["foo"], json::type_error&);
-                    CHECK_THROWS_AS(j_nonobject[json::object_t::key_type("foo")], json::type_error&);
-                    CHECK_THROWS_AS(j_const_nonobject["foo"], json::type_error&);
-                    CHECK_THROWS_AS(j_const_nonobject[json::object_t::key_type("foo")], json::type_error&);
-                    CHECK_THROWS_WITH(j_nonobject["foo"],
-                                      "[json.exception.type_error.305] cannot use operator[] with a string argument with number");
-                    CHECK_THROWS_WITH(j_nonobject[json::object_t::key_type("foo")],
-                                      "[json.exception.type_error.305] cannot use operator[] with a string argument with number");
-                    CHECK_THROWS_WITH(j_const_nonobject["foo"],
-                                      "[json.exception.type_error.305] cannot use operator[] with a string argument with number");
-                    CHECK_THROWS_WITH(j_const_nonobject[json::object_t::key_type("foo")],
-                                      "[json.exception.type_error.305] cannot use operator[] with a string argument with number");
-                }
-
-                SECTION("number (floating-point)")
-                {
-                    json j_nonobject(json::value_t::number_float);
-                    const json j_const_nonobject(j_nonobject);
-                    CHECK_THROWS_AS(j_nonobject["foo"], json::type_error&);
-                    CHECK_THROWS_AS(j_nonobject[json::object_t::key_type("foo")], json::type_error&);
-                    CHECK_THROWS_AS(j_const_nonobject["foo"], json::type_error&);
-                    CHECK_THROWS_AS(j_const_nonobject[json::object_t::key_type("foo")], json::type_error&);
-                    CHECK_THROWS_WITH(j_nonobject["foo"],
-                                      "[json.exception.type_error.305] cannot use operator[] with a string argument with number");
-                    CHECK_THROWS_WITH(j_nonobject[json::object_t::key_type("foo")],
-                                      "[json.exception.type_error.305] cannot use operator[] with a string argument with number");
-                    CHECK_THROWS_WITH(j_const_nonobject["foo"],
-                                      "[json.exception.type_error.305] cannot use operator[] with a string argument with number");
-                    CHECK_THROWS_WITH(j_const_nonobject[json::object_t::key_type("foo")],
-                                      "[json.exception.type_error.305] cannot use operator[] with a string argument with number");
-                }
-            }
-        }
-
-        SECTION("remove specified element")
-        {
-            SECTION("remove element by key")
-            {
-                CHECK(j.find("integer") != j.end());
-                CHECK(j.erase("integer") == 1);
-                CHECK(j.find("integer") == j.end());
-                CHECK(j.erase("integer") == 0);
-
-                CHECK(j.find("unsigned") != j.end());
-                CHECK(j.erase("unsigned") == 1);
-                CHECK(j.find("unsigned") == j.end());
-                CHECK(j.erase("unsigned") == 0);
-
-                CHECK(j.find("boolean") != j.end());
-                CHECK(j.erase("boolean") == 1);
-                CHECK(j.find("boolean") == j.end());
-                CHECK(j.erase("boolean") == 0);
-
-                CHECK(j.find("null") != j.end());
-                CHECK(j.erase("null") == 1);
-                CHECK(j.find("null") == j.end());
-                CHECK(j.erase("null") == 0);
-
-                CHECK(j.find("string") != j.end());
-                CHECK(j.erase("string") == 1);
-                CHECK(j.find("string") == j.end());
-                CHECK(j.erase("string") == 0);
-
-                CHECK(j.find("floating") != j.end());
-                CHECK(j.erase("floating") == 1);
-                CHECK(j.find("floating") == j.end());
-                CHECK(j.erase("floating") == 0);
-
-                CHECK(j.find("object") != j.end());
-                CHECK(j.erase("object") == 1);
-                CHECK(j.find("object") == j.end());
-                CHECK(j.erase("object") == 0);
-
-                CHECK(j.find("array") != j.end());
-                CHECK(j.erase("array") == 1);
-                CHECK(j.find("array") == j.end());
-                CHECK(j.erase("array") == 0);
-            }
-
-            SECTION("remove element by iterator")
-            {
-                SECTION("erase(begin())")
-                {
-                    {
-                        json jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}};
-                        json::iterator it2 = jobject.erase(jobject.begin());
-                        CHECK(jobject == json({{"b", 1}, {"c", 17u}}));
-                        CHECK(*it2 == json(1));
-                    }
-                    {
-                        json jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}};
-                        json::const_iterator it2 = jobject.erase(jobject.cbegin());
-                        CHECK(jobject == json({{"b", 1}, {"c", 17u}}));
-                        CHECK(*it2 == json(1));
-                    }
-                }
-
-                SECTION("erase(begin(), end())")
-                {
-                    {
-                        json jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}};
-                        json::iterator it2 = jobject.erase(jobject.begin(), jobject.end());
-                        CHECK(jobject == json::object());
-                        CHECK(it2 == jobject.end());
-                    }
-                    {
-                        json jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}};
-                        json::const_iterator it2 = jobject.erase(jobject.cbegin(), jobject.cend());
-                        CHECK(jobject == json::object());
-                        CHECK(it2 == jobject.cend());
-                    }
-                }
-
-                SECTION("erase(begin(), begin())")
-                {
-                    {
-                        json jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}};
-                        json::iterator it2 = jobject.erase(jobject.begin(), jobject.begin());
-                        CHECK(jobject == json({{"a", "a"}, {"b", 1}, {"c", 17u}}));
-                        CHECK(*it2 == json("a"));
-                    }
-                    {
-                        json jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}};
-                        json::const_iterator it2 = jobject.erase(jobject.cbegin(), jobject.cbegin());
-                        CHECK(jobject == json({{"a", "a"}, {"b", 1}, {"c", 17u}}));
-                        CHECK(*it2 == json("a"));
-                    }
-                }
-
-                SECTION("erase at offset")
-                {
-                    {
-                        json jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}};
-                        json::iterator it = jobject.find("b");
-                        json::iterator it2 = jobject.erase(it);
-                        CHECK(jobject == json({{"a", "a"}, {"c", 17u}}));
-                        CHECK(*it2 == json(17));
-                    }
-                    {
-                        json jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}};
-                        json::const_iterator it = jobject.find("b");
-                        json::const_iterator it2 = jobject.erase(it);
-                        CHECK(jobject == json({{"a", "a"}, {"c", 17u}}));
-                        CHECK(*it2 == json(17));
-                    }
-                }
-
-                SECTION("erase subrange")
-                {
-                    {
-                        json jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}, {"d", false}, {"e", true}};
-                        json::iterator it2 = jobject.erase(jobject.find("b"), jobject.find("e"));
-                        CHECK(jobject == json({{"a", "a"}, {"e", true}}));
-                        CHECK(*it2 == json(true));
-                    }
-                    {
-                        json jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}, {"d", false}, {"e", true}};
-                        json::const_iterator it2 = jobject.erase(jobject.find("b"), jobject.find("e"));
-                        CHECK(jobject == json({{"a", "a"}, {"e", true}}));
-                        CHECK(*it2 == json(true));
-                    }
-                }
-
-                SECTION("different objects")
-                {
-                    {
-                        json jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}, {"d", false}, {"e", true}};
-                        json jobject2 = {{"a", "a"}, {"b", 1}, {"c", 17u}};
-                        CHECK_THROWS_AS(jobject.erase(jobject2.begin()), json::invalid_iterator&);
-                        CHECK_THROWS_AS(jobject.erase(jobject.begin(), jobject2.end()), json::invalid_iterator&);
-                        CHECK_THROWS_AS(jobject.erase(jobject2.begin(), jobject.end()), json::invalid_iterator&);
-                        CHECK_THROWS_AS(jobject.erase(jobject2.begin(), jobject2.end()), json::invalid_iterator&);
-                        CHECK_THROWS_WITH(jobject.erase(jobject2.begin()),
-                                          "[json.exception.invalid_iterator.202] iterator does not fit current value");
-                        CHECK_THROWS_WITH(jobject.erase(jobject.begin(), jobject2.end()),
-                                          "[json.exception.invalid_iterator.203] iterators do not fit current value");
-                        CHECK_THROWS_WITH(jobject.erase(jobject2.begin(), jobject.end()),
-                                          "[json.exception.invalid_iterator.203] iterators do not fit current value");
-                        CHECK_THROWS_WITH(jobject.erase(jobject2.begin(), jobject2.end()),
-                                          "[json.exception.invalid_iterator.203] iterators do not fit current value");
-                    }
-                    {
-                        json jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}, {"d", false}, {"e", true}};
-                        json jobject2 = {{"a", "a"}, {"b", 1}, {"c", 17u}};
-                        CHECK_THROWS_AS(jobject.erase(jobject2.cbegin()), json::invalid_iterator&);
-                        CHECK_THROWS_AS(jobject.erase(jobject.cbegin(), jobject2.cend()), json::invalid_iterator&);
-                        CHECK_THROWS_AS(jobject.erase(jobject2.cbegin(), jobject.cend()), json::invalid_iterator&);
-                        CHECK_THROWS_AS(jobject.erase(jobject2.cbegin(), jobject2.cend()), json::invalid_iterator&);
-                        CHECK_THROWS_WITH(jobject.erase(jobject2.cbegin()),
-                                          "[json.exception.invalid_iterator.202] iterator does not fit current value");
-                        CHECK_THROWS_WITH(jobject.erase(jobject.cbegin(), jobject2.cend()),
-                                          "[json.exception.invalid_iterator.203] iterators do not fit current value");
-                        CHECK_THROWS_WITH(jobject.erase(jobject2.cbegin(), jobject.cend()),
-                                          "[json.exception.invalid_iterator.203] iterators do not fit current value");
-                        CHECK_THROWS_WITH(jobject.erase(jobject2.cbegin(), jobject2.cend()),
-                                          "[json.exception.invalid_iterator.203] iterators do not fit current value");
-                    }
-                }
-            }
-
-            SECTION("remove element by key in non-object type")
-            {
-                SECTION("null")
-                {
-                    json j_nonobject(json::value_t::null);
-                    CHECK_THROWS_AS(j_nonobject.erase("foo"), json::type_error&);
-                    CHECK_THROWS_WITH(j_nonobject.erase("foo"),
-                                      "[json.exception.type_error.307] cannot use erase() with null");
-                }
-
-                SECTION("boolean")
-                {
-                    json j_nonobject(json::value_t::boolean);
-                    CHECK_THROWS_AS(j_nonobject.erase("foo"), json::type_error&);
-                    CHECK_THROWS_WITH(j_nonobject.erase("foo"),
-                                      "[json.exception.type_error.307] cannot use erase() with boolean");
-                }
-
-                SECTION("string")
-                {
-                    json j_nonobject(json::value_t::string);
-                    CHECK_THROWS_AS(j_nonobject.erase("foo"), json::type_error&);
-                    CHECK_THROWS_WITH(j_nonobject.erase("foo"),
-                                      "[json.exception.type_error.307] cannot use erase() with string");
-                }
-
-                SECTION("array")
-                {
-                    json j_nonobject(json::value_t::array);
-                    CHECK_THROWS_AS(j_nonobject.erase("foo"), json::type_error&);
-                    CHECK_THROWS_WITH(j_nonobject.erase("foo"),
-                                      "[json.exception.type_error.307] cannot use erase() with array");
-                }
-
-                SECTION("number (integer)")
-                {
-                    json j_nonobject(json::value_t::number_integer);
-                    CHECK_THROWS_AS(j_nonobject.erase("foo"), json::type_error&);
-                    CHECK_THROWS_WITH(j_nonobject.erase("foo"),
-                                      "[json.exception.type_error.307] cannot use erase() with number");
-                }
-
-                SECTION("number (floating-point)")
-                {
-                    json j_nonobject(json::value_t::number_float);
-                    CHECK_THROWS_AS(j_nonobject.erase("foo"), json::type_error&);
-                    CHECK_THROWS_WITH(j_nonobject.erase("foo"),
-                                      "[json.exception.type_error.307] cannot use erase() with number");
-                }
-            }
-        }
-
-        SECTION("find an element in an object")
-        {
-            SECTION("existing element")
-            {
-                for (auto key :
-                        {"integer", "unsigned", "floating", "null", "string", "boolean", "object", "array"
-                        })
-                {
-                    CHECK(j.find(key) != j.end());
-                    CHECK(*j.find(key) == j.at(key));
-                    CHECK(j_const.find(key) != j_const.end());
-                    CHECK(*j_const.find(key) == j_const.at(key));
-                }
-            }
-
-            SECTION("nonexisting element")
-            {
-                CHECK(j.find("foo") == j.end());
-                CHECK(j_const.find("foo") == j_const.end());
-            }
-
-            SECTION("all types")
-            {
-                SECTION("null")
-                {
-                    json j_nonarray(json::value_t::null);
-                    const json j_nonarray_const(j_nonarray);
-                    CHECK(j_nonarray.find("foo") == j_nonarray.end());
-                    CHECK(j_nonarray_const.find("foo") == j_nonarray_const.end());
-                }
-
-                SECTION("string")
-                {
-                    json j_nonarray(json::value_t::string);
-                    const json j_nonarray_const(j_nonarray);
-                    CHECK(j_nonarray.find("foo") == j_nonarray.end());
-                    CHECK(j_nonarray_const.find("foo") == j_nonarray_const.end());
-                }
-
-                SECTION("object")
-                {
-                    json j_nonarray(json::value_t::object);
-                    const json j_nonarray_const(j_nonarray);
-                    CHECK(j_nonarray.find("foo") == j_nonarray.end());
-                    CHECK(j_nonarray_const.find("foo") == j_nonarray_const.end());
-                }
-
-                SECTION("array")
-                {
-                    json j_nonarray(json::value_t::array);
-                    const json j_nonarray_const(j_nonarray);
-                    CHECK(j_nonarray.find("foo") == j_nonarray.end());
-                    CHECK(j_nonarray_const.find("foo") == j_nonarray_const.end());
-                }
-
-                SECTION("boolean")
-                {
-                    json j_nonarray(json::value_t::boolean);
-                    const json j_nonarray_const(j_nonarray);
-                    CHECK(j_nonarray.find("foo") == j_nonarray.end());
-                    CHECK(j_nonarray_const.find("foo") == j_nonarray_const.end());
-                }
-
-                SECTION("number (integer)")
-                {
-                    json j_nonarray(json::value_t::number_integer);
-                    const json j_nonarray_const(j_nonarray);
-                    CHECK(j_nonarray.find("foo") == j_nonarray.end());
-                    CHECK(j_nonarray_const.find("foo") == j_nonarray_const.end());
-                }
-
-                SECTION("number (unsigned)")
-                {
-                    json j_nonarray(json::value_t::number_unsigned);
-                    const json j_nonarray_const(j_nonarray);
-                    CHECK(j_nonarray.find("foo") == j_nonarray.end());
-                    CHECK(j_nonarray_const.find("foo") == j_nonarray_const.end());
-                }
-
-                SECTION("number (floating-point)")
-                {
-                    json j_nonarray(json::value_t::number_float);
-                    const json j_nonarray_const(j_nonarray);
-                    CHECK(j_nonarray.find("foo") == j_nonarray.end());
-                    CHECK(j_nonarray_const.find("foo") == j_nonarray_const.end());
-                }
-            }
-        }
-
-        SECTION("count keys in an object")
-        {
-            SECTION("existing element")
-            {
-                for (auto key :
-                        {"integer", "unsigned", "floating", "null", "string", "boolean", "object", "array"
-                        })
-                {
-                    CHECK(j.count(key) == 1);
-                    CHECK(j_const.count(key) == 1);
-                }
-            }
-
-            SECTION("nonexisting element")
-            {
-                CHECK(j.count("foo") == 0);
-                CHECK(j_const.count("foo") == 0);
-            }
-
-            SECTION("all types")
-            {
-                SECTION("null")
-                {
-                    json j_nonobject(json::value_t::null);
-                    const json j_nonobject_const(j_nonobject);
-                    CHECK(j_nonobject.count("foo") == 0);
-                    CHECK(j_nonobject_const.count("foo") == 0);
-                }
-
-                SECTION("string")
-                {
-                    json j_nonobject(json::value_t::string);
-                    const json j_nonobject_const(j_nonobject);
-                    CHECK(j_nonobject.count("foo") == 0);
-                    CHECK(j_nonobject_const.count("foo") == 0);
-                }
-
-                SECTION("object")
-                {
-                    json j_nonobject(json::value_t::object);
-                    const json j_nonobject_const(j_nonobject);
-                    CHECK(j_nonobject.count("foo") == 0);
-                    CHECK(j_nonobject_const.count("foo") == 0);
-                }
-
-                SECTION("array")
-                {
-                    json j_nonobject(json::value_t::array);
-                    const json j_nonobject_const(j_nonobject);
-                    CHECK(j_nonobject.count("foo") == 0);
-                    CHECK(j_nonobject_const.count("foo") == 0);
-                }
-
-                SECTION("boolean")
-                {
-                    json j_nonobject(json::value_t::boolean);
-                    const json j_nonobject_const(j_nonobject);
-                    CHECK(j_nonobject.count("foo") == 0);
-                    CHECK(j_nonobject_const.count("foo") == 0);
-                }
-
-                SECTION("number (integer)")
-                {
-                    json j_nonobject(json::value_t::number_integer);
-                    const json j_nonobject_const(j_nonobject);
-                    CHECK(j_nonobject.count("foo") == 0);
-                    CHECK(j_nonobject_const.count("foo") == 0);
-                }
-
-                SECTION("number (unsigned)")
-                {
-                    json j_nonobject(json::value_t::number_unsigned);
-                    const json j_nonobject_const(j_nonobject);
-                    CHECK(j_nonobject.count("foo") == 0);
-                    CHECK(j_nonobject_const.count("foo") == 0);
-                }
-
-                SECTION("number (floating-point)")
-                {
-                    json j_nonobject(json::value_t::number_float);
-                    const json j_nonobject_const(j_nonobject);
-                    CHECK(j_nonobject.count("foo") == 0);
-                    CHECK(j_nonobject_const.count("foo") == 0);
-                }
-            }
-        }
-
-        SECTION("check existence of key in an object")
-        {
-            SECTION("existing element")
-            {
-                for (auto key :
-                        {"integer", "unsigned", "floating", "null", "string", "boolean", "object", "array"
-                        })
-                {
-                    CHECK(j.contains(key) == true);
-                    CHECK(j_const.contains(key) == true);
-                }
-            }
-
-            SECTION("nonexisting element")
-            {
-                CHECK(j.contains("foo") == false);
-                CHECK(j_const.contains("foo") == false);
-            }
-
-            SECTION("all types")
-            {
-                SECTION("null")
-                {
-                    json j_nonobject(json::value_t::null);
-                    const json j_nonobject_const(j_nonobject);
-                    CHECK(j_nonobject.contains("foo") == false);
-                    CHECK(j_nonobject_const.contains("foo") == false);
-                }
-
-                SECTION("string")
-                {
-                    json j_nonobject(json::value_t::string);
-                    const json j_nonobject_const(j_nonobject);
-                    CHECK(j_nonobject.contains("foo") == false);
-                    CHECK(j_nonobject_const.contains("foo") == false);
-                }
-
-                SECTION("object")
-                {
-                    json j_nonobject(json::value_t::object);
-                    const json j_nonobject_const(j_nonobject);
-                    CHECK(j_nonobject.contains("foo") == false);
-                    CHECK(j_nonobject_const.contains("foo") == false);
-                }
-
-                SECTION("array")
-                {
-                    json j_nonobject(json::value_t::array);
-                    const json j_nonobject_const(j_nonobject);
-                    CHECK(j_nonobject.contains("foo") == false);
-                    CHECK(j_nonobject_const.contains("foo") == false);
-                }
-
-                SECTION("boolean")
-                {
-                    json j_nonobject(json::value_t::boolean);
-                    const json j_nonobject_const(j_nonobject);
-                    CHECK(j_nonobject.contains("foo") == false);
-                    CHECK(j_nonobject_const.contains("foo") == false);
-                }
-
-                SECTION("number (integer)")
-                {
-                    json j_nonobject(json::value_t::number_integer);
-                    const json j_nonobject_const(j_nonobject);
-                    CHECK(j_nonobject.contains("foo") == false);
-                    CHECK(j_nonobject_const.contains("foo") == false);
-                }
-
-                SECTION("number (unsigned)")
-                {
-                    json j_nonobject(json::value_t::number_unsigned);
-                    const json j_nonobject_const(j_nonobject);
-                    CHECK(j_nonobject.contains("foo") == false);
-                    CHECK(j_nonobject_const.contains("foo") == false);
-                }
-
-                SECTION("number (floating-point)")
-                {
-                    json j_nonobject(json::value_t::number_float);
-                    const json j_nonobject_const(j_nonobject);
-                    CHECK(j_nonobject.contains("foo") == false);
-                    CHECK(j_nonobject_const.contains("foo") == false);
-                }
-            }
-        }
-    }
-}
-
-#if !defined(JSON_NOEXCEPTION)
-TEST_CASE("element access 2 (throwing tests)")
-{
-    SECTION("object")
-    {
-        json j = {{"integer", 1}, {"unsigned", 1u}, {"floating", 42.23}, {"null", nullptr}, {"string", "hello world"}, {"boolean", true}, {"object", json::object()}, {"array", {1, 2, 3}}};
-        const json j_const = j;
-
-        SECTION("access specified element with default value")
-        {
-            SECTION("given a JSON pointer")
-            {
-                SECTION("access non-existing value")
-                {
-                    CHECK(j.value("/not/existing"_json_pointer, 2) == 2);
-                    CHECK(j.value("/not/existing"_json_pointer, 2u) == 2u);
-                    CHECK(j.value("/not/existing"_json_pointer, false) == false);
-                    CHECK(j.value("/not/existing"_json_pointer, "bar") == "bar");
-                    CHECK(j.value("/not/existing"_json_pointer, 12.34) == Approx(12.34));
-                    CHECK(j.value("/not/existing"_json_pointer, json({{"foo", "bar"}})) == json({{"foo", "bar"}}));
-                    CHECK(j.value("/not/existing"_json_pointer, json({10, 100})) == json({10, 100}));
-
-                    CHECK(j_const.value("/not/existing"_json_pointer, 2) == 2);
-                    CHECK(j_const.value("/not/existing"_json_pointer, 2u) == 2u);
-                    CHECK(j_const.value("/not/existing"_json_pointer, false) == false);
-                    CHECK(j_const.value("/not/existing"_json_pointer, "bar") == "bar");
-                    CHECK(j_const.value("/not/existing"_json_pointer, 12.34) == Approx(12.34));
-                    CHECK(j_const.value("/not/existing"_json_pointer, json({{"foo", "bar"}})) == json({{"foo", "bar"}}));
-                    CHECK(j_const.value("/not/existing"_json_pointer, json({10, 100})) == json({10, 100}));
-                }
-            }
-        }
-    }
-}
-#endif
diff --git a/external_imported/json/test/src/unit-hash.cpp b/external_imported/json/test/src/unit-hash.cpp
deleted file mode 100644
index b74990d75..000000000
--- a/external_imported/json/test/src/unit-hash.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include "doctest_compatibility.h"
-
-#include <nlohmann/json.hpp>
-using json = nlohmann::json;
-
-#include <set>
-
-TEST_CASE("hash")
-{
-    // Collect hashes for different JSON values and make sure that they are distinct
-    // We cannot compare against fixed values, because the implementation of
-    // std::hash may differ between compilers.
-
-    std::set<std::size_t> hashes;
-
-    // null
-    hashes.insert(std::hash<json> {}(json(nullptr)));
-
-    // boolean
-    hashes.insert(std::hash<json> {}(json(true)));
-    hashes.insert(std::hash<json> {}(json(false)));
-
-    // string
-    hashes.insert(std::hash<json> {}(json("")));
-    hashes.insert(std::hash<json> {}(json("foo")));
-
-    // number
-    hashes.insert(std::hash<json> {}(json(0)));
-    hashes.insert(std::hash<json> {}(json(unsigned(0))));
-
-    hashes.insert(std::hash<json> {}(json(-1)));
-    hashes.insert(std::hash<json> {}(json(0.0)));
-    hashes.insert(std::hash<json> {}(json(42.23)));
-
-    // array
-    hashes.insert(std::hash<json> {}(json::array()));
-    hashes.insert(std::hash<json> {}(json::array({1, 2, 3})));
-
-    // object
-    hashes.insert(std::hash<json> {}(json::object()));
-    hashes.insert(std::hash<json> {}(json::object({{"foo", "bar"}})));
-
-    // binary
-    hashes.insert(std::hash<json> {}(json::binary({})));
-    hashes.insert(std::hash<json> {}(json::binary({}, 0)));
-    hashes.insert(std::hash<json> {}(json::binary({}, 42)));
-    hashes.insert(std::hash<json> {}(json::binary({1, 2, 3})));
-    hashes.insert(std::hash<json> {}(json::binary({1, 2, 3}, 0)));
-    hashes.insert(std::hash<json> {}(json::binary({1, 2, 3}, 42)));
-
-    // discarded
-    hashes.insert(std::hash<json> {}(json(json::value_t::discarded)));
-
-    CHECK(hashes.size() == 21);
-}
diff --git a/external_imported/json/test/src/unit-iterators2.cpp b/external_imported/json/test/src/unit-iterators2.cpp
deleted file mode 100644
index c17084c16..000000000
--- a/external_imported/json/test/src/unit-iterators2.cpp
+++ /dev/null
@@ -1,1000 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include "doctest_compatibility.h"
-
-#include <nlohmann/json.hpp>
-using nlohmann::json;
-
-TEST_CASE("iterators 2")
-{
-    SECTION("iterator comparisons")
-    {
-        json j_values = {nullptr, true, 42, 42u, 23.23, {{"one", 1}, {"two", 2}}, {1, 2, 3, 4, 5}, "Hello, world"};
-
-        for (json& j : j_values)
-        {
-            auto it1 = j.begin();
-            auto it2 = j.begin();
-            auto it3 = j.begin();
-            ++it2;
-            ++it3;
-            ++it3;
-            auto it1_c = j.cbegin();
-            auto it2_c = j.cbegin();
-            auto it3_c = j.cbegin();
-            ++it2_c;
-            ++it3_c;
-            ++it3_c;
-
-            // comparison: equal
-            {
-                CHECK(it1 == it1);
-                CHECK(!(it1 == it2));
-                CHECK(!(it1 == it3));
-                CHECK(!(it2 == it3));
-                CHECK(it1_c == it1_c);
-                CHECK(!(it1_c == it2_c));
-                CHECK(!(it1_c == it3_c));
-                CHECK(!(it2_c == it3_c));
-            }
-
-            // comparison: not equal
-            {
-                // check definition
-                CHECK( (it1 != it1) == !(it1 == it1) );
-                CHECK( (it1 != it2) == !(it1 == it2) );
-                CHECK( (it1 != it3) == !(it1 == it3) );
-                CHECK( (it2 != it3) == !(it2 == it3) );
-                CHECK( (it1_c != it1_c) == !(it1_c == it1_c) );
-                CHECK( (it1_c != it2_c) == !(it1_c == it2_c) );
-                CHECK( (it1_c != it3_c) == !(it1_c == it3_c) );
-                CHECK( (it2_c != it3_c) == !(it2_c == it3_c) );
-            }
-
-            // comparison: smaller
-            {
-                if (j.type() == json::value_t::object)
-                {
-                    CHECK_THROWS_AS(it1 < it1, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it1 < it2, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it2 < it3, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it1 < it3, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it1_c < it1_c, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it1_c < it2_c, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it2_c < it3_c, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it1_c < it3_c, json::invalid_iterator&);
-#if JSON_DIAGNOSTICS
-                    CHECK_THROWS_WITH(it1 < it1, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1 < it2, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it2 < it3, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1 < it3, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c < it1_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c < it2_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it2_c < it3_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c < it3_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-#else
-                    CHECK_THROWS_WITH(it1 < it1, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1 < it2, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it2 < it3, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1 < it3, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c < it1_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c < it2_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it2_c < it3_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c < it3_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-#endif
-                }
-                else
-                {
-                    CHECK(!(it1 < it1));
-                    CHECK(it1 < it2);
-                    CHECK(it1 < it3);
-                    CHECK(it2 < it3);
-                    CHECK(!(it1_c < it1_c));
-                    CHECK(it1_c < it2_c);
-                    CHECK(it1_c < it3_c);
-                    CHECK(it2_c < it3_c);
-                }
-            }
-
-            // comparison: less than or equal
-            {
-                if (j.type() == json::value_t::object)
-                {
-                    CHECK_THROWS_AS(it1 <= it1, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it1 <= it2, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it2 <= it3, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it1 <= it3, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it1_c <= it1_c, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it1_c <= it2_c, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it2_c <= it3_c, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it1_c <= it3_c, json::invalid_iterator&);
-#if JSON_DIAGNOSTICS
-                    CHECK_THROWS_WITH(it1 <= it1, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1 <= it2, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it2 <= it3, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1 <= it3, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c <= it1_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c <= it2_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it2_c <= it3_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c <= it3_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-#else
-                    CHECK_THROWS_WITH(it1 <= it1, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1 <= it2, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it2 <= it3, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1 <= it3, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c <= it1_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c <= it2_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it2_c <= it3_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c <= it3_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-#endif
-                }
-                else
-                {
-                    // check definition
-                    CHECK( (it1 <= it1) == !(it1 < it1) );
-                    CHECK( (it1 <= it2) == !(it2 < it1) );
-                    CHECK( (it1 <= it3) == !(it3 < it1) );
-                    CHECK( (it2 <= it3) == !(it3 < it2) );
-                    CHECK( (it1_c <= it1_c) == !(it1_c < it1_c) );
-                    CHECK( (it1_c <= it2_c) == !(it2_c < it1_c) );
-                    CHECK( (it1_c <= it3_c) == !(it3_c < it1_c) );
-                    CHECK( (it2_c <= it3_c) == !(it3_c < it2_c) );
-                }
-            }
-
-            // comparison: greater than
-            {
-                if (j.type() == json::value_t::object)
-                {
-                    CHECK_THROWS_AS(it1 > it1, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it1 > it2, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it2 > it3, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it1 > it3, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it1_c > it1_c, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it1_c > it2_c, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it2_c > it3_c, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it1_c > it3_c, json::invalid_iterator&);
-#if JSON_DIAGNOSTICS
-                    CHECK_THROWS_WITH(it1 > it1, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1 > it2, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it2 > it3, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1 > it3, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c > it1_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c > it2_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it2_c > it3_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c > it3_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-#else
-                    CHECK_THROWS_WITH(it1 > it1, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1 > it2, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it2 > it3, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1 > it3, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c > it1_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c > it2_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it2_c > it3_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c > it3_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-#endif
-                }
-                else
-                {
-                    // check definition
-                    CHECK( (it1 > it1) == (it1 < it1) );
-                    CHECK( (it1 > it2) == (it2 < it1) );
-                    CHECK( (it1 > it3) == (it3 < it1) );
-                    CHECK( (it2 > it3) == (it3 < it2) );
-                    CHECK( (it1_c > it1_c) == (it1_c < it1_c) );
-                    CHECK( (it1_c > it2_c) == (it2_c < it1_c) );
-                    CHECK( (it1_c > it3_c) == (it3_c < it1_c) );
-                    CHECK( (it2_c > it3_c) == (it3_c < it2_c) );
-                }
-            }
-
-            // comparison: greater than or equal
-            {
-                if (j.type() == json::value_t::object)
-                {
-                    CHECK_THROWS_AS(it1 >= it1, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it1 >= it2, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it2 >= it3, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it1 >= it3, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it1_c >= it1_c, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it1_c >= it2_c, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it2_c >= it3_c, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it1_c >= it3_c, json::invalid_iterator&);
-#if JSON_DIAGNOSTICS
-                    CHECK_THROWS_WITH(it1 >= it1, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1 >= it2, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it2 >= it3, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1 >= it3, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c >= it1_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c >= it2_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it2_c >= it3_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c >= it3_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-#else
-                    CHECK_THROWS_WITH(it1 >= it1, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1 >= it2, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it2 >= it3, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1 >= it3, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c >= it1_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c >= it2_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it2_c >= it3_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c >= it3_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-#endif
-                }
-                else
-                {
-                    // check definition
-                    CHECK( (it1 >= it1) == !(it1 < it1) );
-                    CHECK( (it1 >= it2) == !(it1 < it2) );
-                    CHECK( (it1 >= it3) == !(it1 < it3) );
-                    CHECK( (it2 >= it3) == !(it2 < it3) );
-                    CHECK( (it1_c >= it1_c) == !(it1_c < it1_c) );
-                    CHECK( (it1_c >= it2_c) == !(it1_c < it2_c) );
-                    CHECK( (it1_c >= it3_c) == !(it1_c < it3_c) );
-                    CHECK( (it2_c >= it3_c) == !(it2_c < it3_c) );
-                }
-            }
-        }
-
-        // check exceptions if different objects are compared
-        for (auto j : j_values)
-        {
-            for (auto k : j_values)
-            {
-                if (j != k)
-                {
-                    CHECK_THROWS_AS(j.begin() == k.begin(), json::invalid_iterator&);
-                    CHECK_THROWS_AS(j.cbegin() == k.cbegin(), json::invalid_iterator&);
-                    CHECK_THROWS_AS(j.begin() < k.begin(), json::invalid_iterator&);
-                    CHECK_THROWS_AS(j.cbegin() < k.cbegin(), json::invalid_iterator&);
-#if JSON_DIAGNOSTICS
-                    // the output differs in each loop, so we cannot fix a string for the expected exception
-#else
-                    CHECK_THROWS_WITH(j.begin() == k.begin(), "[json.exception.invalid_iterator.212] cannot compare iterators of different containers");
-                    CHECK_THROWS_WITH(j.cbegin() == k.cbegin(), "[json.exception.invalid_iterator.212] cannot compare iterators of different containers");
-                    CHECK_THROWS_WITH(j.begin() < k.begin(), "[json.exception.invalid_iterator.212] cannot compare iterators of different containers");
-                    CHECK_THROWS_WITH(j.cbegin() < k.cbegin(), "[json.exception.invalid_iterator.212] cannot compare iterators of different containers");
-#endif
-                }
-            }
-        }
-    }
-
-    SECTION("iterator arithmetic")
-    {
-        json j_object = {{"one", 1}, {"two", 2}, {"three", 3}};
-        json j_array = {1, 2, 3, 4, 5, 6};
-        json j_null = nullptr;
-        json j_value = 42;
-
-        SECTION("addition and subtraction")
-        {
-            SECTION("object")
-            {
-                {
-                    auto it = j_object.begin();
-                    CHECK_THROWS_AS(it += 1, json::invalid_iterator&);
-                    CHECK_THROWS_WITH(it += 1, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators");
-                }
-                {
-                    auto it = j_object.cbegin();
-                    CHECK_THROWS_AS(it += 1, json::invalid_iterator&);
-                    CHECK_THROWS_WITH(it += 1, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators");
-                }
-                {
-                    auto it = j_object.begin();
-                    CHECK_THROWS_AS(it + 1, json::invalid_iterator&);
-                    CHECK_THROWS_WITH(it + 1, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators");
-                }
-                {
-                    auto it = j_object.cbegin();
-                    CHECK_THROWS_AS(it + 1, json::invalid_iterator&);
-                    CHECK_THROWS_WITH(it + 1, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators");
-                }
-                {
-                    auto it = j_object.begin();
-                    CHECK_THROWS_AS(1 + it, json::invalid_iterator&);
-                    CHECK_THROWS_WITH(1 + it, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators");
-                }
-                {
-                    auto it = j_object.cbegin();
-                    CHECK_THROWS_AS(1 + it, json::invalid_iterator&);
-                    CHECK_THROWS_WITH(1 + it, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators");
-                }
-                {
-                    auto it = j_object.begin();
-                    CHECK_THROWS_AS(it -= 1, json::invalid_iterator&);
-                    CHECK_THROWS_WITH(it -= 1, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators");
-                }
-                {
-                    auto it = j_object.cbegin();
-                    CHECK_THROWS_AS(it -= 1, json::invalid_iterator&);
-                    CHECK_THROWS_WITH(it -= 1, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators");
-                }
-                {
-                    auto it = j_object.begin();
-                    CHECK_THROWS_AS(it - 1, json::invalid_iterator&);
-                    CHECK_THROWS_WITH(it - 1, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators");
-                }
-                {
-                    auto it = j_object.cbegin();
-                    CHECK_THROWS_AS(it - 1, json::invalid_iterator&);
-                    CHECK_THROWS_WITH(it - 1, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators");
-                }
-                {
-                    auto it = j_object.begin();
-                    CHECK_THROWS_AS(it - it, json::invalid_iterator&);
-                    CHECK_THROWS_WITH(it - it, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators");
-                }
-                {
-                    auto it = j_object.cbegin();
-                    CHECK_THROWS_AS(it - it, json::invalid_iterator&);
-                    CHECK_THROWS_WITH(it - it, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators");
-                }
-            }
-
-            SECTION("array")
-            {
-                {
-                    auto it = j_array.begin();
-                    it += 3;
-                    CHECK((j_array.begin() + 3) == it);
-                    CHECK((3 + j_array.begin()) == it);
-                    CHECK((it - 3) == j_array.begin());
-                    CHECK((it - j_array.begin()) == 3);
-                    CHECK(*it == json(4));
-                    it -= 2;
-                    CHECK(*it == json(2));
-                }
-                {
-                    auto it = j_array.cbegin();
-                    it += 3;
-                    CHECK((j_array.cbegin() + 3) == it);
-                    CHECK((3 + j_array.cbegin()) == it);
-                    CHECK((it - 3) == j_array.cbegin());
-                    CHECK((it - j_array.cbegin()) == 3);
-                    CHECK(*it == json(4));
-                    it -= 2;
-                    CHECK(*it == json(2));
-                }
-            }
-
-            SECTION("null")
-            {
-                {
-                    auto it = j_null.begin();
-                    it += 3;
-                    CHECK((j_null.begin() + 3) == it);
-                    CHECK((3 + j_null.begin()) == it);
-                    CHECK((it - 3) == j_null.begin());
-                    CHECK((it - j_null.begin()) == 3);
-                    CHECK(it != j_null.end());
-                    it -= 3;
-                    CHECK(it == j_null.end());
-                }
-                {
-                    auto it = j_null.cbegin();
-                    it += 3;
-                    CHECK((j_null.cbegin() + 3) == it);
-                    CHECK((3 + j_null.cbegin()) == it);
-                    CHECK((it - 3) == j_null.cbegin());
-                    CHECK((it - j_null.cbegin()) == 3);
-                    CHECK(it != j_null.cend());
-                    it -= 3;
-                    CHECK(it == j_null.cend());
-                }
-            }
-
-            SECTION("value")
-            {
-                {
-                    auto it = j_value.begin();
-                    it += 3;
-                    CHECK((j_value.begin() + 3) == it);
-                    CHECK((3 + j_value.begin()) == it);
-                    CHECK((it - 3) == j_value.begin());
-                    CHECK((it - j_value.begin()) == 3);
-                    CHECK(it != j_value.end());
-                    it -= 3;
-                    CHECK(*it == json(42));
-                }
-                {
-                    auto it = j_value.cbegin();
-                    it += 3;
-                    CHECK((j_value.cbegin() + 3) == it);
-                    CHECK((3 + j_value.cbegin()) == it);
-                    CHECK((it - 3) == j_value.cbegin());
-                    CHECK((it - j_value.cbegin()) == 3);
-                    CHECK(it != j_value.cend());
-                    it -= 3;
-                    CHECK(*it == json(42));
-                }
-            }
-        }
-
-        SECTION("subscript operator")
-        {
-            SECTION("object")
-            {
-                {
-                    auto it = j_object.begin();
-                    CHECK_THROWS_AS(it[0], json::invalid_iterator&);
-                    CHECK_THROWS_AS(it[1], json::invalid_iterator&);
-                    CHECK_THROWS_WITH(it[0], "[json.exception.invalid_iterator.208] cannot use operator[] for object iterators");
-                    CHECK_THROWS_WITH(it[1], "[json.exception.invalid_iterator.208] cannot use operator[] for object iterators");
-                }
-                {
-                    auto it = j_object.cbegin();
-                    CHECK_THROWS_AS(it[0], json::invalid_iterator&);
-                    CHECK_THROWS_AS(it[1], json::invalid_iterator&);
-                    CHECK_THROWS_WITH(it[0], "[json.exception.invalid_iterator.208] cannot use operator[] for object iterators");
-                    CHECK_THROWS_WITH(it[1], "[json.exception.invalid_iterator.208] cannot use operator[] for object iterators");
-                }
-            }
-
-            SECTION("array")
-            {
-                {
-                    auto it = j_array.begin();
-                    CHECK(it[0] == json(1));
-                    CHECK(it[1] == json(2));
-                    CHECK(it[2] == json(3));
-                    CHECK(it[3] == json(4));
-                    CHECK(it[4] == json(5));
-                    CHECK(it[5] == json(6));
-                }
-                {
-                    auto it = j_array.cbegin();
-                    CHECK(it[0] == json(1));
-                    CHECK(it[1] == json(2));
-                    CHECK(it[2] == json(3));
-                    CHECK(it[3] == json(4));
-                    CHECK(it[4] == json(5));
-                    CHECK(it[5] == json(6));
-                }
-            }
-
-            SECTION("null")
-            {
-                {
-                    auto it = j_null.begin();
-                    CHECK_THROWS_AS(it[0], json::invalid_iterator&);
-                    CHECK_THROWS_AS(it[1], json::invalid_iterator&);
-                    CHECK_THROWS_WITH(it[0], "[json.exception.invalid_iterator.214] cannot get value");
-                    CHECK_THROWS_WITH(it[1], "[json.exception.invalid_iterator.214] cannot get value");
-                }
-                {
-                    auto it = j_null.cbegin();
-                    CHECK_THROWS_AS(it[0], json::invalid_iterator&);
-                    CHECK_THROWS_AS(it[1], json::invalid_iterator&);
-                    CHECK_THROWS_WITH(it[0], "[json.exception.invalid_iterator.214] cannot get value");
-                    CHECK_THROWS_WITH(it[1], "[json.exception.invalid_iterator.214] cannot get value");
-                }
-            }
-
-            SECTION("value")
-            {
-                {
-                    auto it = j_value.begin();
-                    CHECK(it[0] == json(42));
-                    CHECK_THROWS_AS(it[1], json::invalid_iterator&);
-                    CHECK_THROWS_WITH(it[1], "[json.exception.invalid_iterator.214] cannot get value");
-                }
-                {
-                    auto it = j_value.cbegin();
-                    CHECK(it[0] == json(42));
-                    CHECK_THROWS_AS(it[1], json::invalid_iterator&);
-                    CHECK_THROWS_WITH(it[1], "[json.exception.invalid_iterator.214] cannot get value");
-                }
-            }
-        }
-    }
-
-    SECTION("reverse iterator comparisons")
-    {
-        json j_values = {nullptr, true, 42, 42u, 23.23, {{"one", 1}, {"two", 2}}, {1, 2, 3, 4, 5}, "Hello, world"};
-
-        for (json& j : j_values)
-        {
-            auto it1 = j.rbegin();
-            auto it2 = j.rbegin();
-            auto it3 = j.rbegin();
-            ++it2;
-            ++it3;
-            ++it3;
-            auto it1_c = j.crbegin();
-            auto it2_c = j.crbegin();
-            auto it3_c = j.crbegin();
-            ++it2_c;
-            ++it3_c;
-            ++it3_c;
-
-            // comparison: equal
-            {
-                CHECK(it1 == it1);
-                CHECK(!(it1 == it2));
-                CHECK(!(it1 == it3));
-                CHECK(!(it2 == it3));
-                CHECK(it1_c == it1_c);
-                CHECK(!(it1_c == it2_c));
-                CHECK(!(it1_c == it3_c));
-                CHECK(!(it2_c == it3_c));
-            }
-
-            // comparison: not equal
-            {
-                // check definition
-                CHECK( (it1 != it1) == !(it1 == it1) );
-                CHECK( (it1 != it2) == !(it1 == it2) );
-                CHECK( (it1 != it3) == !(it1 == it3) );
-                CHECK( (it2 != it3) == !(it2 == it3) );
-                CHECK( (it1_c != it1_c) == !(it1_c == it1_c) );
-                CHECK( (it1_c != it2_c) == !(it1_c == it2_c) );
-                CHECK( (it1_c != it3_c) == !(it1_c == it3_c) );
-                CHECK( (it2_c != it3_c) == !(it2_c == it3_c) );
-            }
-
-            // comparison: smaller
-            {
-                if (j.type() == json::value_t::object)
-                {
-                    CHECK_THROWS_AS(it1 < it1, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it1 < it2, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it2 < it3, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it1 < it3, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it1_c < it1_c, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it1_c < it2_c, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it2_c < it3_c, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it1_c < it3_c, json::invalid_iterator&);
-#if JSON_DIAGNOSTICS
-                    CHECK_THROWS_WITH(it1 < it1, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1 < it2, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it2 < it3, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1 < it3, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c < it1_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c < it2_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it2_c < it3_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c < it3_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-#else
-                    CHECK_THROWS_WITH(it1 < it1, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1 < it2, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it2 < it3, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1 < it3, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c < it1_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c < it2_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it2_c < it3_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c < it3_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-#endif
-                }
-                else
-                {
-                    CHECK(!(it1 < it1));
-                    CHECK(it1 < it2);
-                    CHECK(it1 < it3);
-                    CHECK(it2 < it3);
-                    CHECK(!(it1_c < it1_c));
-                    CHECK(it1_c < it2_c);
-                    CHECK(it1_c < it3_c);
-                    CHECK(it2_c < it3_c);
-                }
-            }
-
-            // comparison: less than or equal
-            {
-                if (j.type() == json::value_t::object)
-                {
-                    CHECK_THROWS_AS(it1 <= it1, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it1 <= it2, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it2 <= it3, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it1 <= it3, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it1_c <= it1_c, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it1_c <= it2_c, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it2_c <= it3_c, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it1_c <= it3_c, json::invalid_iterator&);
-#if JSON_DIAGNOSTICS
-                    CHECK_THROWS_WITH(it1 <= it1, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1 <= it2, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it2 <= it3, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1 <= it3, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c <= it1_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c <= it2_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it2_c <= it3_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c <= it3_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-#else
-                    CHECK_THROWS_WITH(it1 <= it1, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1 <= it2, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it2 <= it3, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1 <= it3, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c <= it1_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c <= it2_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it2_c <= it3_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c <= it3_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-#endif
-                }
-                else
-                {
-                    // check definition
-                    CHECK( (it1 <= it1) == !(it1 < it1) );
-                    CHECK( (it1 <= it2) == !(it2 < it1) );
-                    CHECK( (it1 <= it3) == !(it3 < it1) );
-                    CHECK( (it2 <= it3) == !(it3 < it2) );
-                    CHECK( (it1_c <= it1_c) == !(it1_c < it1_c) );
-                    CHECK( (it1_c <= it2_c) == !(it2_c < it1_c) );
-                    CHECK( (it1_c <= it3_c) == !(it3_c < it1_c) );
-                    CHECK( (it2_c <= it3_c) == !(it3_c < it2_c) );
-                }
-            }
-
-            // comparison: greater than
-            {
-                if (j.type() == json::value_t::object)
-                {
-                    CHECK_THROWS_AS(it1 > it1, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it1 > it2, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it2 > it3, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it1 > it3, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it1_c > it1_c, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it1_c > it2_c, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it2_c > it3_c, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it1_c > it3_c, json::invalid_iterator&);
-#if JSON_DIAGNOSTICS
-                    CHECK_THROWS_WITH(it1 > it1, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1 > it2, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it2 > it3, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1 > it3, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c > it1_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c > it2_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it2_c > it3_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c > it3_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-#else
-                    CHECK_THROWS_WITH(it1 > it1, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1 > it2, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it2 > it3, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1 > it3, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c > it1_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c > it2_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it2_c > it3_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c > it3_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-#endif
-                }
-                else
-                {
-                    // check definition
-                    CHECK( (it1 > it1) == (it1 < it1) );
-                    CHECK( (it1 > it2) == (it2 < it1) );
-                    CHECK( (it1 > it3) == (it3 < it1) );
-                    CHECK( (it2 > it3) == (it3 < it2) );
-                    CHECK( (it1_c > it1_c) == (it1_c < it1_c) );
-                    CHECK( (it1_c > it2_c) == (it2_c < it1_c) );
-                    CHECK( (it1_c > it3_c) == (it3_c < it1_c) );
-                    CHECK( (it2_c > it3_c) == (it3_c < it2_c) );
-                }
-            }
-
-            // comparison: greater than or equal
-            {
-                if (j.type() == json::value_t::object)
-                {
-                    CHECK_THROWS_AS(it1 >= it1, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it1 >= it2, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it2 >= it3, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it1 >= it3, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it1_c >= it1_c, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it1_c >= it2_c, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it2_c >= it3_c, json::invalid_iterator&);
-                    CHECK_THROWS_AS(it1_c >= it3_c, json::invalid_iterator&);
-#if JSON_DIAGNOSTICS
-                    CHECK_THROWS_WITH(it1 >= it1, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1 >= it2, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it2 >= it3, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1 >= it3, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c >= it1_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c >= it2_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it2_c >= it3_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c >= it3_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators");
-#else
-                    CHECK_THROWS_WITH(it1 >= it1, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1 >= it2, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it2 >= it3, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1 >= it3, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c >= it1_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c >= it2_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it2_c >= it3_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-                    CHECK_THROWS_WITH(it1_c >= it3_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators");
-#endif
-                }
-                else
-                {
-                    // check definition
-                    CHECK( (it1 >= it1) == !(it1 < it1) );
-                    CHECK( (it1 >= it2) == !(it1 < it2) );
-                    CHECK( (it1 >= it3) == !(it1 < it3) );
-                    CHECK( (it2 >= it3) == !(it2 < it3) );
-                    CHECK( (it1_c >= it1_c) == !(it1_c < it1_c) );
-                    CHECK( (it1_c >= it2_c) == !(it1_c < it2_c) );
-                    CHECK( (it1_c >= it3_c) == !(it1_c < it3_c) );
-                    CHECK( (it2_c >= it3_c) == !(it2_c < it3_c) );
-                }
-            }
-        }
-
-        // check exceptions if different objects are compared
-        for (auto j : j_values)
-        {
-            for (auto k : j_values)
-            {
-                if (j != k)
-                {
-                    CHECK_THROWS_AS(j.rbegin() == k.rbegin(), json::invalid_iterator&);
-                    CHECK_THROWS_AS(j.crbegin() == k.crbegin(), json::invalid_iterator&);
-                    CHECK_THROWS_AS(j.rbegin() < k.rbegin(), json::invalid_iterator&);
-                    CHECK_THROWS_AS(j.crbegin() < k.crbegin(), json::invalid_iterator&);
-#if JSON_DIAGNOSTICS
-                    // the output differs in each loop, so we cannot fix a string for the expected exception
-#else
-                    CHECK_THROWS_WITH(j.rbegin() == k.rbegin(), "[json.exception.invalid_iterator.212] cannot compare iterators of different containers");
-                    CHECK_THROWS_WITH(j.crbegin() == k.crbegin(), "[json.exception.invalid_iterator.212] cannot compare iterators of different containers");
-                    CHECK_THROWS_WITH(j.rbegin() < k.rbegin(), "[json.exception.invalid_iterator.212] cannot compare iterators of different containers");
-                    CHECK_THROWS_WITH(j.crbegin() < k.crbegin(), "[json.exception.invalid_iterator.212] cannot compare iterators of different containers");
-#endif
-                }
-            }
-        }
-    }
-
-    SECTION("reverse iterator arithmetic")
-    {
-        json j_object = {{"one", 1}, {"two", 2}, {"three", 3}};
-        json j_array = {1, 2, 3, 4, 5, 6};
-        json j_null = nullptr;
-        json j_value = 42;
-
-        SECTION("addition and subtraction")
-        {
-            SECTION("object")
-            {
-                {
-                    auto it = j_object.rbegin();
-                    CHECK_THROWS_AS(it += 1, json::invalid_iterator&);
-                    CHECK_THROWS_WITH(it += 1, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators");
-                }
-                {
-                    auto it = j_object.crbegin();
-                    CHECK_THROWS_AS(it += 1, json::invalid_iterator&);
-                    CHECK_THROWS_WITH(it += 1, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators");
-                }
-                {
-                    auto it = j_object.rbegin();
-                    CHECK_THROWS_AS(it + 1, json::invalid_iterator&);
-                    CHECK_THROWS_WITH(it + 1, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators");
-                }
-                {
-                    auto it = j_object.crbegin();
-                    CHECK_THROWS_AS(it + 1, json::invalid_iterator&);
-                    CHECK_THROWS_WITH(it + 1, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators");
-                }
-                {
-                    auto it = j_object.rbegin();
-                    CHECK_THROWS_AS(1 + it, json::invalid_iterator&);
-                    CHECK_THROWS_WITH(1 + it, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators");
-                }
-                {
-                    auto it = j_object.crbegin();
-                    CHECK_THROWS_AS(1 + it, json::invalid_iterator&);
-                    CHECK_THROWS_WITH(1 + it, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators");
-                }
-                {
-                    auto it = j_object.rbegin();
-                    CHECK_THROWS_AS(it -= 1, json::invalid_iterator&);
-                    CHECK_THROWS_WITH(it -= 1, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators");
-                }
-                {
-                    auto it = j_object.crbegin();
-                    CHECK_THROWS_AS(it -= 1, json::invalid_iterator&);
-                    CHECK_THROWS_WITH(it -= 1, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators");
-                }
-                {
-                    auto it = j_object.rbegin();
-                    CHECK_THROWS_AS(it - 1, json::invalid_iterator&);
-                    CHECK_THROWS_WITH(it - 1, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators");
-                }
-                {
-                    auto it = j_object.crbegin();
-                    CHECK_THROWS_AS(it - 1, json::invalid_iterator&);
-                    CHECK_THROWS_WITH(it - 1, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators");
-                }
-                {
-                    auto it = j_object.rbegin();
-                    CHECK_THROWS_AS(it - it, json::invalid_iterator&);
-                    CHECK_THROWS_WITH(it - it, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators");
-                }
-                {
-                    auto it = j_object.crbegin();
-                    CHECK_THROWS_AS(it - it, json::invalid_iterator&);
-                    CHECK_THROWS_WITH(it - it, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators");
-                }
-            }
-
-            SECTION("array")
-            {
-                {
-                    auto it = j_array.rbegin();
-                    it += 3;
-                    CHECK((j_array.rbegin() + 3) == it);
-                    CHECK(json::reverse_iterator(3 + j_array.rbegin()) == it);
-                    CHECK((it - 3) == j_array.rbegin());
-                    CHECK((it - j_array.rbegin()) == 3);
-                    CHECK(*it == json(3));
-                    it -= 2;
-                    CHECK(*it == json(5));
-                }
-                {
-                    auto it = j_array.crbegin();
-                    it += 3;
-                    CHECK((j_array.crbegin() + 3) == it);
-                    CHECK(json::const_reverse_iterator(3 + j_array.crbegin()) == it);
-                    CHECK((it - 3) == j_array.crbegin());
-                    CHECK((it - j_array.crbegin()) == 3);
-                    CHECK(*it == json(3));
-                    it -= 2;
-                    CHECK(*it == json(5));
-                }
-            }
-
-            SECTION("null")
-            {
-                {
-                    auto it = j_null.rbegin();
-                    it += 3;
-                    CHECK((j_null.rbegin() + 3) == it);
-                    CHECK(json::reverse_iterator(3 + j_null.rbegin()) == it);
-                    CHECK((it - 3) == j_null.rbegin());
-                    CHECK((it - j_null.rbegin()) == 3);
-                    CHECK(it != j_null.rend());
-                    it -= 3;
-                    CHECK(it == j_null.rend());
-                }
-                {
-                    auto it = j_null.crbegin();
-                    it += 3;
-                    CHECK((j_null.crbegin() + 3) == it);
-                    CHECK(json::const_reverse_iterator(3 + j_null.crbegin()) == it);
-                    CHECK((it - 3) == j_null.crbegin());
-                    CHECK((it - j_null.crbegin()) == 3);
-                    CHECK(it != j_null.crend());
-                    it -= 3;
-                    CHECK(it == j_null.crend());
-                }
-            }
-
-            SECTION("value")
-            {
-                {
-                    auto it = j_value.rbegin();
-                    it += 3;
-                    CHECK((j_value.rbegin() + 3) == it);
-                    CHECK(json::reverse_iterator(3 + j_value.rbegin()) == it);
-                    CHECK((it - 3) == j_value.rbegin());
-                    CHECK((it - j_value.rbegin()) == 3);
-                    CHECK(it != j_value.rend());
-                    it -= 3;
-                    CHECK(*it == json(42));
-                }
-                {
-                    auto it = j_value.crbegin();
-                    it += 3;
-                    CHECK((j_value.crbegin() + 3) == it);
-                    CHECK(json::const_reverse_iterator(3 + j_value.crbegin()) == it);
-                    CHECK((it - 3) == j_value.crbegin());
-                    CHECK((it - j_value.crbegin()) == 3);
-                    CHECK(it != j_value.crend());
-                    it -= 3;
-                    CHECK(*it == json(42));
-                }
-            }
-        }
-
-        SECTION("subscript operator")
-        {
-            SECTION("object")
-            {
-                {
-                    auto it = j_object.rbegin();
-                    CHECK_THROWS_AS(it[0], json::invalid_iterator&);
-                    CHECK_THROWS_AS(it[1], json::invalid_iterator&);
-                    CHECK_THROWS_WITH(it[0], "[json.exception.invalid_iterator.209] cannot use offsets with object iterators");
-                    CHECK_THROWS_WITH(it[1], "[json.exception.invalid_iterator.209] cannot use offsets with object iterators");
-                }
-                {
-                    auto it = j_object.crbegin();
-                    CHECK_THROWS_AS(it[0], json::invalid_iterator&);
-                    CHECK_THROWS_AS(it[1], json::invalid_iterator&);
-                    CHECK_THROWS_WITH(it[0], "[json.exception.invalid_iterator.209] cannot use offsets with object iterators");
-                    CHECK_THROWS_WITH(it[1], "[json.exception.invalid_iterator.209] cannot use offsets with object iterators");
-                }
-            }
-
-            SECTION("array")
-            {
-                {
-                    auto it = j_array.rbegin();
-                    CHECK(it[0] == json(6));
-                    CHECK(it[1] == json(5));
-                    CHECK(it[2] == json(4));
-                    CHECK(it[3] == json(3));
-                    CHECK(it[4] == json(2));
-                    CHECK(it[5] == json(1));
-                }
-                {
-                    auto it = j_array.crbegin();
-                    CHECK(it[0] == json(6));
-                    CHECK(it[1] == json(5));
-                    CHECK(it[2] == json(4));
-                    CHECK(it[3] == json(3));
-                    CHECK(it[4] == json(2));
-                    CHECK(it[5] == json(1));
-                }
-            }
-
-            SECTION("null")
-            {
-                {
-                    auto it = j_null.rbegin();
-                    CHECK_THROWS_AS(it[0], json::invalid_iterator&);
-                    CHECK_THROWS_AS(it[1], json::invalid_iterator&);
-                    CHECK_THROWS_WITH(it[0], "[json.exception.invalid_iterator.214] cannot get value");
-                    CHECK_THROWS_WITH(it[1], "[json.exception.invalid_iterator.214] cannot get value");
-                }
-                {
-                    auto it = j_null.crbegin();
-                    CHECK_THROWS_AS(it[0], json::invalid_iterator&);
-                    CHECK_THROWS_AS(it[1], json::invalid_iterator&);
-                    CHECK_THROWS_WITH(it[0], "[json.exception.invalid_iterator.214] cannot get value");
-                    CHECK_THROWS_WITH(it[1], "[json.exception.invalid_iterator.214] cannot get value");
-                }
-            }
-
-            SECTION("value")
-            {
-                {
-                    auto it = j_value.rbegin();
-                    CHECK(it[0] == json(42));
-                    CHECK_THROWS_AS(it[1], json::invalid_iterator&);
-                    CHECK_THROWS_WITH(it[1], "[json.exception.invalid_iterator.214] cannot get value");
-                }
-                {
-                    auto it = j_value.crbegin();
-                    CHECK(it[0] == json(42));
-                    CHECK_THROWS_AS(it[1], json::invalid_iterator&);
-                    CHECK_THROWS_WITH(it[1], "[json.exception.invalid_iterator.214] cannot get value");
-                }
-            }
-        }
-    }
-}
diff --git a/external_imported/json/test/src/unit-json_patch.cpp b/external_imported/json/test/src/unit-json_patch.cpp
deleted file mode 100644
index af44e4232..000000000
--- a/external_imported/json/test/src/unit-json_patch.cpp
+++ /dev/null
@@ -1,1378 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include "doctest_compatibility.h"
-
-#include <nlohmann/json.hpp>
-using nlohmann::json;
-
-#include <fstream>
-#include <test_data.hpp>
-
-TEST_CASE("JSON patch")
-{
-    SECTION("examples from RFC 6902")
-    {
-        SECTION("4. Operations")
-        {
-            // the ordering of members in JSON objects is not significant:
-            json op1 = R"({ "op": "add", "path": "/a/b/c", "value": "foo" })"_json;
-            json op2 = R"({ "path": "/a/b/c", "op": "add", "value": "foo" })"_json;
-            json op3 = R"({ "value": "foo", "path": "/a/b/c", "op": "add" })"_json;
-
-            // check if the operation objects are equivalent
-            CHECK(op1 == op2);
-            CHECK(op1 == op3);
-        }
-
-        SECTION("4.1 add")
-        {
-            json patch = R"([{ "op": "add", "path": "/a/b/c", "value": [ "foo", "bar" ] }])"_json;
-
-            // However, the object itself or an array containing it does need
-            // to exist, and it remains an error for that not to be the case.
-            // For example, an "add" with a target location of "/a/b" starting
-            // with this document
-            json doc1 = R"({ "a": { "foo": 1 } })"_json;
-
-            // is not an error, because "a" exists, and "b" will be added to
-            // its value.
-            CHECK_NOTHROW(doc1.patch(patch));
-            auto doc1_ans = R"(
-                {
-                    "a": {
-                        "foo": 1,
-                        "b": {
-                            "c": [ "foo", "bar" ]
-                        }
-                    }
-                }
-            )"_json;
-            CHECK(doc1.patch(patch) == doc1_ans);
-
-            // It is an error in this document:
-            json doc2 = R"({ "q": { "bar": 2 } })"_json;
-
-            // because "a" does not exist.
-            CHECK_THROWS_AS(doc2.patch(patch), json::out_of_range&);
-            CHECK_THROWS_WITH(doc2.patch(patch),
-                              "[json.exception.out_of_range.403] key 'a' not found");
-        }
-
-        SECTION("4.2 remove")
-        {
-            // If removing an element from an array, any elements above the
-            // specified index are shifted one position to the left.
-            json doc = {1, 2, 3, 4};
-            json patch = {{{"op", "remove"}, {"path", "/1"}}};
-            CHECK(doc.patch(patch) == json({1, 3, 4}));
-        }
-
-        SECTION("A.1. Adding an Object Member")
-        {
-            // An example target JSON document:
-            json doc = R"(
-                    { "foo": "bar"}
-                )"_json;
-
-            // A JSON Patch document:
-            json patch = R"(
-                    [
-                        { "op": "add", "path": "/baz", "value": "qux" }
-                    ]
-                )"_json;
-
-            // The resulting JSON document:
-            json expected = R"(
-                    {
-                        "baz": "qux",
-                        "foo": "bar"
-                    }
-                )"_json;
-
-            // check if patched value is as expected
-            CHECK(doc.patch(patch) == expected);
-
-            // check roundtrip
-            CHECK(doc.patch(json::diff(doc, expected)) == expected);
-        }
-
-        SECTION("A.2. Adding an Array Element")
-        {
-            // An example target JSON document:
-            json doc = R"(
-                    { "foo": [ "bar", "baz" ] }
-                )"_json;
-
-            // A JSON Patch document:
-            json patch = R"(
-                    [
-                        { "op": "add", "path": "/foo/1", "value": "qux" }
-                    ]
-                )"_json;
-
-            // The resulting JSON document:
-            json expected = R"(
-                    { "foo": [ "bar", "qux", "baz" ] }
-                )"_json;
-
-            // check if patched value is as expected
-            CHECK(doc.patch(patch) == expected);
-
-            // check roundtrip
-            CHECK(doc.patch(json::diff(doc, expected)) == expected);
-        }
-
-        SECTION("A.3. Removing an Object Member")
-        {
-            // An example target JSON document:
-            json doc = R"(
-                    {
-                        "baz": "qux",
-                        "foo": "bar"
-                    }
-                )"_json;
-
-            // A JSON Patch document:
-            json patch = R"(
-                    [
-                        { "op": "remove", "path": "/baz" }
-                    ]
-                )"_json;
-
-            // The resulting JSON document:
-            json expected = R"(
-                    { "foo": "bar" }
-                )"_json;
-
-            // check if patched value is as expected
-            CHECK(doc.patch(patch) == expected);
-
-            // check roundtrip
-            CHECK(doc.patch(json::diff(doc, expected)) == expected);
-        }
-
-        SECTION("A.4. Removing an Array Element")
-        {
-            // An example target JSON document:
-            json doc = R"(
-                    { "foo": [ "bar", "qux", "baz" ] }
-                )"_json;
-
-            // A JSON Patch document:
-            json patch = R"(
-                    [
-                        { "op": "remove", "path": "/foo/1" }
-                    ]
-                )"_json;
-
-            // The resulting JSON document:
-            json expected = R"(
-                    { "foo": [ "bar", "baz" ] }
-                )"_json;
-
-            // check if patched value is as expected
-            CHECK(doc.patch(patch) == expected);
-
-            // check roundtrip
-            CHECK(doc.patch(json::diff(doc, expected)) == expected);
-        }
-
-        SECTION("A.5. Replacing a Value")
-        {
-            // An example target JSON document:
-            json doc = R"(
-                    {
-                        "baz": "qux",
-                        "foo": "bar"
-                    }
-                )"_json;
-
-            // A JSON Patch document:
-            json patch = R"(
-                    [
-                        { "op": "replace", "path": "/baz", "value": "boo" }
-                    ]
-                )"_json;
-
-            json expected = R"(
-                    {
-                        "baz": "boo",
-                        "foo": "bar"
-                    }
-                )"_json;
-
-            // check if patched value is as expected
-            CHECK(doc.patch(patch) == expected);
-
-            // check roundtrip
-            CHECK(doc.patch(json::diff(doc, expected)) == expected);
-        }
-
-        SECTION("A.6. Moving a Value")
-        {
-            // An example target JSON document:
-            json doc = R"(
-                    {
-                        "foo": {
-                           "bar": "baz",
-                            "waldo": "fred"
-                        },
-                        "qux": {
-                            "corge": "grault"
-                        }
-                    }
-                )"_json;
-
-            // A JSON Patch document:
-            json patch = R"(
-                    [
-                        { "op": "move", "from": "/foo/waldo", "path": "/qux/thud" }
-                    ]
-                )"_json;
-
-            // The resulting JSON document:
-            json expected = R"(
-                    {
-                        "foo": {
-                           "bar": "baz"
-                        },
-                        "qux": {
-                            "corge": "grault",
-                            "thud": "fred"
-                        }
-                    }
-                )"_json;
-
-            // check if patched value is as expected
-            CHECK(doc.patch(patch) == expected);
-
-            // check roundtrip
-            CHECK(doc.patch(json::diff(doc, expected)) == expected);
-        }
-
-        SECTION("A.7. Moving a Value")
-        {
-            // An example target JSON document:
-            json doc = R"(
-                    { "foo": [ "all", "grass", "cows", "eat" ] }
-                )"_json;
-
-            // A JSON Patch document:
-            json patch = R"(
-                    [
-                        { "op": "move", "from": "/foo/1", "path": "/foo/3" }
-                    ]
-                )"_json;
-
-            // The resulting JSON document:
-            json expected = R"(
-                    { "foo": [ "all", "cows", "eat", "grass" ] }
-                )"_json;
-
-            // check if patched value is as expected
-            CHECK(doc.patch(patch) == expected);
-
-            // check roundtrip
-            CHECK(doc.patch(json::diff(doc, expected)) == expected);
-        }
-
-        SECTION("A.8. Testing a Value: Success")
-        {
-            // An example target JSON document:
-            json doc = R"(
-                    {
-                         "baz": "qux",
-                         "foo": [ "a", 2, "c" ]
-                    }
-                )"_json;
-
-            // A JSON Patch document that will result in successful evaluation:
-            json patch = R"(
-                    [
-                        { "op": "test", "path": "/baz", "value": "qux" },
-                        { "op": "test", "path": "/foo/1", "value": 2 }
-                    ]
-                )"_json;
-
-            // check if evaluation does not throw
-            CHECK_NOTHROW(doc.patch(patch));
-            // check if patched document is unchanged
-            CHECK(doc.patch(patch) == doc);
-        }
-
-        SECTION("A.9. Testing a Value: Error")
-        {
-            // An example target JSON document:
-            json doc = R"(
-                    { "baz": "qux" }
-                )"_json;
-
-            // A JSON Patch document that will result in an error condition:
-            json patch = R"(
-                    [
-                        { "op": "test", "path": "/baz", "value": "bar" }
-                    ]
-                )"_json;
-
-            // check that evaluation throws
-            CHECK_THROWS_AS(doc.patch(patch), json::other_error&);
-#if JSON_DIAGNOSTICS
-            CHECK_THROWS_WITH_STD_STR(doc.patch(patch), "[json.exception.other_error.501] (/0) unsuccessful: " + patch[0].dump());
-#else
-            CHECK_THROWS_WITH_STD_STR(doc.patch(patch), "[json.exception.other_error.501] unsuccessful: " + patch[0].dump());
-#endif
-        }
-
-        SECTION("A.10. Adding a Nested Member Object")
-        {
-            // An example target JSON document:
-            json doc = R"(
-                    { "foo": "bar" }
-                )"_json;
-
-            // A JSON Patch document:
-            json patch = R"(
-                    [
-                        { "op": "add", "path": "/child", "value": { "grandchild": { } } }
-                    ]
-                )"_json;
-
-            // The resulting JSON document:
-            json expected = R"(
-                {
-                    "foo": "bar",
-                    "child": {
-                        "grandchild": {
-                        }
-                    }
-                }
-                )"_json;
-
-            // check if patched value is as expected
-            CHECK(doc.patch(patch) == expected);
-
-            // check roundtrip
-            CHECK(doc.patch(json::diff(doc, expected)) == expected);
-        }
-
-        SECTION("A.11. Ignoring Unrecognized Elements")
-        {
-            // An example target JSON document:
-            json doc = R"(
-                    { "foo": "bar" }
-                )"_json;
-
-            // A JSON Patch document:
-            json patch = R"(
-                    [
-                        { "op": "add", "path": "/baz", "value": "qux", "xyz": 123 }
-                    ]
-                )"_json;
-
-            json expected = R"(
-                    {
-                        "foo": "bar",
-                        "baz": "qux"
-                    } 
-                )"_json;
-
-            // check if patched value is as expected
-            CHECK(doc.patch(patch) == expected);
-
-            // check roundtrip
-            CHECK(doc.patch(json::diff(doc, expected)) == expected);
-        }
-
-        SECTION("A.12. Adding to a Nonexistent Target")
-        {
-            // An example target JSON document:
-            json doc = R"(
-                    { "foo": "bar" }
-                )"_json;
-
-            // A JSON Patch document:
-            json patch = R"(
-                    [
-                        { "op": "add", "path": "/baz/bat", "value": "qux" }
-                    ]
-                )"_json;
-
-            // This JSON Patch document, applied to the target JSON document
-            // above, would result in an error (therefore, it would not be
-            // applied), because the "add" operation's target location that
-            // references neither the root of the document, nor a member of
-            // an existing object, nor a member of an existing array.
-
-            CHECK_THROWS_AS(doc.patch(patch), json::out_of_range&);
-            CHECK_THROWS_WITH(doc.patch(patch),
-                              "[json.exception.out_of_range.403] key 'baz' not found");
-        }
-
-        // A.13. Invalid JSON Patch Document
-        // not applicable
-
-        SECTION("A.14. Escape Ordering")
-        {
-            // An example target JSON document:
-            json doc = R"(
-                    {
-                        "/": 9,
-                        "~1": 10
-                    }
-                )"_json;
-
-            // A JSON Patch document:
-            json patch = R"(
-                    [
-                        {"op": "test", "path": "/~01", "value": 10}
-                    ]
-                )"_json;
-
-            json expected = R"(
-                    {
-                        "/": 9,
-                        "~1": 10
-                    } 
-                )"_json;
-
-            // check if patched value is as expected
-            CHECK(doc.patch(patch) == expected);
-
-            // check roundtrip
-            CHECK(doc.patch(json::diff(doc, expected)) == expected);
-        }
-
-        SECTION("A.15. Comparing Strings and Numbers")
-        {
-            // An example target JSON document:
-            json doc = R"(
-                    {
-                        "/": 9,
-                        "~1": 10
-                    } 
-                )"_json;
-
-            // A JSON Patch document that will result in an error condition:
-            json patch = R"(
-                    [
-                        {"op": "test", "path": "/~01", "value": "10"}
-                    ]
-                )"_json;
-
-            // check that evaluation throws
-            CHECK_THROWS_AS(doc.patch(patch), json::other_error&);
-#if JSON_DIAGNOSTICS
-            CHECK_THROWS_WITH_STD_STR(doc.patch(patch), "[json.exception.other_error.501] (/0) unsuccessful: " + patch[0].dump());
-#else
-            CHECK_THROWS_WITH_STD_STR(doc.patch(patch), "[json.exception.other_error.501] unsuccessful: " + patch[0].dump());
-#endif
-        }
-
-        SECTION("A.16. Adding an Array Value")
-        {
-            // An example target JSON document:
-            json doc = R"(
-                    { "foo": ["bar"] }
-                )"_json;
-
-            // A JSON Patch document:
-            json patch = R"(
-                    [
-                        { "op": "add", "path": "/foo/-", "value": ["abc", "def"] }
-                    ]
-                )"_json;
-
-            // The resulting JSON document:
-            json expected = R"(
-                    { "foo": ["bar", ["abc", "def"]] }
-                )"_json;
-
-            // check if patched value is as expected
-            CHECK(doc.patch(patch) == expected);
-
-            // check roundtrip
-            CHECK(doc.patch(json::diff(doc, expected)) == expected);
-        }
-    }
-
-    SECTION("own examples")
-    {
-        SECTION("add")
-        {
-            SECTION("add to the root element")
-            {
-                // If the path is the root of the target document - the
-                // specified value becomes the entire content of the target
-                // document.
-
-                // An example target JSON document:
-                json doc = 17;
-
-                // A JSON Patch document:
-                json patch = R"(
-                        [
-                            { "op": "add", "path": "", "value": [1,2,3] }
-                        ]
-                    )"_json;
-
-                // The resulting JSON document:
-                json expected = {1, 2, 3};
-
-                // check if patched value is as expected
-                CHECK(doc.patch(patch) == expected);
-
-                // check roundtrip
-                CHECK(doc.patch(json::diff(doc, expected)) == expected);
-            }
-
-            SECTION("add to end of the array")
-            {
-                // The specified index MUST NOT be greater than the number of
-                // elements in the array. The example below uses and index of
-                // exactly the number of elements in the array which is legal.
-
-                // An example target JSON document:
-                json doc = {0, 1, 2};
-
-                // A JSON Patch document:
-                json patch = R"(
-                    [
-                        { "op": "add", "path": "/3", "value": 3 }
-                    ]
-                )"_json;
-
-                // The resulting JSON document:
-                json expected = {0, 1, 2, 3};
-
-                // check if patched value is as expected
-                CHECK(doc.patch(patch) == expected);
-
-                // check roundtrip
-                CHECK(doc.patch(json::diff(doc, expected)) == expected);
-            }
-        }
-
-        SECTION("copy")
-        {
-            // An example target JSON document:
-            json doc = R"(
-                {
-                    "foo": {
-                        "bar": "baz",
-                        "waldo": "fred"
-                    },
-                    "qux": {
-                       "corge": "grault"
-                    }
-                }
-            )"_json;
-
-            // A JSON Patch document:
-            json patch = R"(
-                [
-                    { "op": "copy", "from": "/foo/waldo", "path": "/qux/thud" }
-                ]
-            )"_json;
-
-            // The resulting JSON document:
-            json expected = R"(
-                {
-                    "foo": {
-                        "bar": "baz",
-                        "waldo": "fred"
-                    },
-                    "qux": {
-                       "corge": "grault",
-                       "thud": "fred"
-                    }
-                }
-            )"_json;
-
-            // check if patched value is as expected
-            CHECK(doc.patch(patch) == expected);
-
-            // check roundtrip
-            CHECK(doc.patch(json::diff(doc, expected)) == expected);
-        }
-
-        SECTION("replace")
-        {
-            json j = "string";
-            json patch = {{{"op", "replace"}, {"path", ""}, {"value", 1}}};
-            CHECK(j.patch(patch) == json(1));
-        }
-
-        SECTION("documentation GIF")
-        {
-            {
-                // a JSON patch
-                json p1 = R"(
-                     [{"op": "add", "path": "/GB", "value": "London"}]
-                    )"_json;
-
-                // a JSON value
-                json source = R"(
-                      {"D": "Berlin", "F": "Paris"}
-                    )"_json;
-
-                // apply the patch
-                json target = source.patch(p1);
-                // target = { "D": "Berlin", "F": "Paris", "GB": "London" }
-                CHECK(target == R"({ "D": "Berlin", "F": "Paris", "GB": "London" })"_json);
-
-                // create a diff from two JSONs
-                json p2 = json::diff(target, source);
-                // p2 = [{"op": "delete", "path": "/GB"}]
-                CHECK(p2 == R"([{"op":"remove","path":"/GB"}])"_json);
-            }
-            {
-                // a JSON value
-                json j = {"good", "bad", "ugly"};
-
-                // a JSON pointer
-                auto ptr = json::json_pointer("/2");
-
-                // use to access elements
-                j[ptr] = {{"it", "cattivo"}};
-                CHECK(j == R"(["good","bad",{"it":"cattivo"}])"_json);
-
-                // use user-defined string literal
-                j["/2/en"_json_pointer] = "ugly";
-                CHECK(j == R"(["good","bad",{"en":"ugly","it":"cattivo"}])"_json);
-
-                json flat = j.flatten();
-                CHECK(flat == R"({"/0":"good","/1":"bad","/2/en":"ugly","/2/it":"cattivo"})"_json);
-            }
-        }
-    }
-
-    SECTION("errors")
-    {
-        SECTION("unknown operation")
-        {
-            SECTION("not an array")
-            {
-                json j;
-                json patch = {{"op", "add"}, {"path", ""}, {"value", 1}};
-                CHECK_THROWS_AS(j.patch(patch), json::parse_error&);
-                CHECK_THROWS_WITH(j.patch(patch),
-                                  "[json.exception.parse_error.104] parse error: JSON patch must be an array of objects");
-            }
-
-            SECTION("not an array of objects")
-            {
-                json j;
-                json patch = {"op", "add", "path", "", "value", 1};
-                CHECK_THROWS_AS(j.patch(patch), json::parse_error&);
-#if JSON_DIAGNOSTICS
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.104] parse error: (/0) JSON patch must be an array of objects");
-#else
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.104] parse error: JSON patch must be an array of objects");
-#endif
-            }
-
-            SECTION("missing 'op'")
-            {
-                json j;
-                json patch = {{{"foo", "bar"}}};
-                CHECK_THROWS_AS(j.patch(patch), json::parse_error&);
-#if JSON_DIAGNOSTICS
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation must have member 'op'");
-#else
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: operation must have member 'op'");
-#endif
-            }
-
-            SECTION("non-string 'op'")
-            {
-                json j;
-                json patch = {{{"op", 1}}};
-                CHECK_THROWS_AS(j.patch(patch), json::parse_error&);
-#if JSON_DIAGNOSTICS
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation must have string member 'op'");
-#else
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: operation must have string member 'op'");
-#endif
-            }
-
-            SECTION("invalid operation")
-            {
-                json j;
-                json patch = {{{"op", "foo"}, {"path", ""}}};
-                CHECK_THROWS_AS(j.patch(patch), json::parse_error&);
-#if JSON_DIAGNOSTICS
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation value 'foo' is invalid");
-#else
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: operation value 'foo' is invalid");
-#endif
-            }
-        }
-
-        SECTION("add")
-        {
-            SECTION("missing 'path'")
-            {
-                json j;
-                json patch = {{{"op", "add"}}};
-                CHECK_THROWS_AS(j.patch(patch), json::parse_error&);
-#if JSON_DIAGNOSTICS
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation 'add' must have member 'path'");
-#else
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: operation 'add' must have member 'path'");
-#endif
-            }
-
-            SECTION("non-string 'path'")
-            {
-                json j;
-                json patch = {{{"op", "add"}, {"path", 1}}};
-                CHECK_THROWS_AS(j.patch(patch), json::parse_error&);
-#if JSON_DIAGNOSTICS
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation 'add' must have string member 'path'");
-#else
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: operation 'add' must have string member 'path'");
-#endif
-            }
-
-            SECTION("missing 'value'")
-            {
-                json j;
-                json patch = {{{"op", "add"}, {"path", ""}}};
-                CHECK_THROWS_AS(j.patch(patch), json::parse_error&);
-#if JSON_DIAGNOSTICS
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation 'add' must have member 'value'");
-#else
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: operation 'add' must have member 'value'");
-#endif
-            }
-
-            SECTION("invalid array index")
-            {
-                json j = {1, 2};
-                json patch = {{{"op", "add"}, {"path", "/4"}, {"value", 4}}};
-                CHECK_THROWS_AS(j.patch(patch), json::out_of_range&);
-                CHECK_THROWS_WITH(j.patch(patch),
-                                  "[json.exception.out_of_range.401] array index 4 is out of range");
-            }
-        }
-
-        SECTION("remove")
-        {
-            SECTION("missing 'path'")
-            {
-                json j;
-                json patch = {{{"op", "remove"}}};
-                CHECK_THROWS_AS(j.patch(patch), json::parse_error&);
-#if JSON_DIAGNOSTICS
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation 'remove' must have member 'path'");
-#else
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: operation 'remove' must have member 'path'");
-#endif
-            }
-
-            SECTION("non-string 'path'")
-            {
-                json j;
-                json patch = {{{"op", "remove"}, {"path", 1}}};
-                CHECK_THROWS_AS(j.patch(patch), json::parse_error&);
-#if JSON_DIAGNOSTICS
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation 'remove' must have string member 'path'");
-#else
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: operation 'remove' must have string member 'path'");
-#endif
-            }
-
-            SECTION("nonexisting target location (array)")
-            {
-                json j = {1, 2, 3};
-                json patch = {{{"op", "remove"}, {"path", "/17"}}};
-                CHECK_THROWS_AS(j.patch(patch), json::out_of_range&);
-                CHECK_THROWS_WITH(j.patch(patch),
-                                  "[json.exception.out_of_range.401] array index 17 is out of range");
-            }
-
-            SECTION("nonexisting target location (object)")
-            {
-                json j = {{"foo", 1}, {"bar", 2}};
-                json patch = {{{"op", "remove"}, {"path", "/baz"}}};
-                CHECK_THROWS_AS(j.patch(patch), json::out_of_range&);
-                CHECK_THROWS_WITH(j.patch(patch),
-                                  "[json.exception.out_of_range.403] key 'baz' not found");
-            }
-
-            SECTION("root element as target location")
-            {
-                json j = "string";
-                json patch = {{{"op", "remove"}, {"path", ""}}};
-                CHECK_THROWS_AS(j.patch(patch), json::out_of_range&);
-                CHECK_THROWS_WITH(j.patch(patch),
-                                  "[json.exception.out_of_range.405] JSON pointer has no parent");
-            }
-        }
-
-        SECTION("replace")
-        {
-            SECTION("missing 'path'")
-            {
-                json j;
-                json patch = {{{"op", "replace"}}};
-                CHECK_THROWS_AS(j.patch(patch), json::parse_error&);
-#if JSON_DIAGNOSTICS
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation 'replace' must have member 'path'");
-#else
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: operation 'replace' must have member 'path'");
-#endif
-            }
-
-            SECTION("non-string 'path'")
-            {
-                json j;
-                json patch = {{{"op", "replace"}, {"path", 1}}};
-                CHECK_THROWS_AS(j.patch(patch), json::parse_error&);
-#if JSON_DIAGNOSTICS
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation 'replace' must have string member 'path'");
-#else
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: operation 'replace' must have string member 'path'");
-#endif
-            }
-
-            SECTION("missing 'value'")
-            {
-                json j;
-                json patch = {{{"op", "replace"}, {"path", ""}}};
-                CHECK_THROWS_AS(j.patch(patch), json::parse_error&);
-#if JSON_DIAGNOSTICS
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation 'replace' must have member 'value'");
-#else
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: operation 'replace' must have member 'value'");
-#endif
-            }
-
-            SECTION("nonexisting target location (array)")
-            {
-                json j = {1, 2, 3};
-                json patch = {{{"op", "replace"}, {"path", "/17"}, {"value", 19}}};
-                CHECK_THROWS_AS(j.patch(patch), json::out_of_range&);
-                CHECK_THROWS_WITH(j.patch(patch),
-                                  "[json.exception.out_of_range.401] array index 17 is out of range");
-            }
-
-            SECTION("nonexisting target location (object)")
-            {
-                json j = {{"foo", 1}, {"bar", 2}};
-                json patch = {{{"op", "replace"}, {"path", "/baz"}, {"value", 3}}};
-                CHECK_THROWS_AS(j.patch(patch), json::out_of_range&);
-                CHECK_THROWS_WITH(j.patch(patch),
-                                  "[json.exception.out_of_range.403] key 'baz' not found");
-            }
-        }
-
-        SECTION("move")
-        {
-            SECTION("missing 'path'")
-            {
-                json j;
-                json patch = {{{"op", "move"}}};
-                CHECK_THROWS_AS(j.patch(patch), json::parse_error&);
-#if JSON_DIAGNOSTICS
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation 'move' must have member 'path'");
-#else
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: operation 'move' must have member 'path'");
-#endif
-            }
-
-            SECTION("non-string 'path'")
-            {
-                json j;
-                json patch = {{{"op", "move"}, {"path", 1}}};
-                CHECK_THROWS_AS(j.patch(patch), json::parse_error&);
-#if JSON_DIAGNOSTICS
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation 'move' must have string member 'path'");
-#else
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: operation 'move' must have string member 'path'");
-#endif
-            }
-
-            SECTION("missing 'from'")
-            {
-                json j;
-                json patch = {{{"op", "move"}, {"path", ""}}};
-                CHECK_THROWS_AS(j.patch(patch), json::parse_error&);
-#if JSON_DIAGNOSTICS
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation 'move' must have member 'from'");
-#else
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: operation 'move' must have member 'from'");
-#endif
-            }
-
-            SECTION("non-string 'from'")
-            {
-                json j;
-                json patch = {{{"op", "move"}, {"path", ""}, {"from", 1}}};
-                CHECK_THROWS_AS(j.patch(patch), json::parse_error&);
-#if JSON_DIAGNOSTICS
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation 'move' must have string member 'from'");
-#else
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: operation 'move' must have string member 'from'");
-#endif
-            }
-
-            SECTION("nonexisting from location (array)")
-            {
-                json j = {1, 2, 3};
-                json patch = {{{"op", "move"}, {"path", "/0"}, {"from", "/5"}}};
-                CHECK_THROWS_AS(j.patch(patch), json::out_of_range&);
-                CHECK_THROWS_WITH(j.patch(patch),
-                                  "[json.exception.out_of_range.401] array index 5 is out of range");
-            }
-
-            SECTION("nonexisting from location (object)")
-            {
-                json j = {{"foo", 1}, {"bar", 2}};
-                json patch = {{{"op", "move"}, {"path", "/baz"}, {"from", "/baz"}}};
-                CHECK_THROWS_AS(j.patch(patch), json::out_of_range&);
-                CHECK_THROWS_WITH(j.patch(patch),
-                                  "[json.exception.out_of_range.403] key 'baz' not found");
-            }
-        }
-
-        SECTION("copy")
-        {
-            SECTION("missing 'path'")
-            {
-                json j;
-                json patch = {{{"op", "copy"}}};
-                CHECK_THROWS_AS(j.patch(patch), json::parse_error&);
-#if JSON_DIAGNOSTICS
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation 'copy' must have member 'path'");
-#else
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: operation 'copy' must have member 'path'");
-#endif
-            }
-
-            SECTION("non-string 'path'")
-            {
-                json j;
-                json patch = {{{"op", "copy"}, {"path", 1}}};
-                CHECK_THROWS_AS(j.patch(patch), json::parse_error&);
-#if JSON_DIAGNOSTICS
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation 'copy' must have string member 'path'");
-#else
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: operation 'copy' must have string member 'path'");
-#endif
-            }
-
-            SECTION("missing 'from'")
-            {
-                json j;
-                json patch = {{{"op", "copy"}, {"path", ""}}};
-                CHECK_THROWS_AS(j.patch(patch), json::parse_error&);
-#if JSON_DIAGNOSTICS
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation 'copy' must have member 'from'");
-#else
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: operation 'copy' must have member 'from'");
-#endif
-            }
-
-            SECTION("non-string 'from'")
-            {
-                json j;
-                json patch = {{{"op", "copy"}, {"path", ""}, {"from", 1}}};
-                CHECK_THROWS_AS(j.patch(patch), json::parse_error&);
-#if JSON_DIAGNOSTICS
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation 'copy' must have string member 'from'");
-#else
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: operation 'copy' must have string member 'from'");
-#endif
-            }
-
-            SECTION("nonexisting from location (array)")
-            {
-                json j = {1, 2, 3};
-                json patch = {{{"op", "copy"}, {"path", "/0"}, {"from", "/5"}}};
-                CHECK_THROWS_AS(j.patch(patch), json::out_of_range&);
-                CHECK_THROWS_WITH(j.patch(patch),
-                                  "[json.exception.out_of_range.401] array index 5 is out of range");
-            }
-
-            SECTION("nonexisting from location (object)")
-            {
-                json j = {{"foo", 1}, {"bar", 2}};
-                json patch = {{{"op", "copy"}, {"path", "/fob"}, {"from", "/baz"}}};
-                CHECK_THROWS_AS(j.patch(patch), json::out_of_range&);
-                CHECK_THROWS_WITH(j.patch(patch),
-                                  "[json.exception.out_of_range.403] key 'baz' not found");
-            }
-        }
-
-        SECTION("test")
-        {
-            SECTION("missing 'path'")
-            {
-                json j;
-                json patch = {{{"op", "test"}}};
-                CHECK_THROWS_AS(j.patch(patch), json::parse_error&);
-#if JSON_DIAGNOSTICS
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation 'test' must have member 'path'");
-#else
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: operation 'test' must have member 'path'");
-#endif
-            }
-
-            SECTION("non-string 'path'")
-            {
-                json j;
-                json patch = {{{"op", "test"}, {"path", 1}}};
-                CHECK_THROWS_AS(j.patch(patch), json::parse_error&);
-#if JSON_DIAGNOSTICS
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation 'test' must have string member 'path'");
-#else
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: operation 'test' must have string member 'path'");
-#endif
-            }
-
-            SECTION("missing 'value'")
-            {
-                json j;
-                json patch = {{{"op", "test"}, {"path", ""}}};
-                CHECK_THROWS_AS(j.patch(patch), json::parse_error&);
-#if JSON_DIAGNOSTICS
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation 'test' must have member 'value'");
-#else
-                CHECK_THROWS_WITH(j.patch(patch), "[json.exception.parse_error.105] parse error: operation 'test' must have member 'value'");
-#endif
-            }
-        }
-    }
-
-    SECTION("Examples from jsonpatch.com")
-    {
-        SECTION("Simple Example")
-        {
-            // The original document
-            json doc = R"(
-                {
-                  "baz": "qux",
-                  "foo": "bar"
-                }
-            )"_json;
-
-            // The patch
-            json patch = R"(
-                [
-                  { "op": "replace", "path": "/baz", "value": "boo" },
-                  { "op": "add", "path": "/hello", "value": ["world"] },
-                  { "op": "remove", "path": "/foo"}
-                ]
-            )"_json;
-
-            // The result
-            json result = R"(
-                {
-                   "baz": "boo",
-                   "hello": ["world"]
-                }
-            )"_json;
-
-            // check if patched value is as expected
-            CHECK(doc.patch(patch) == result);
-
-            // check roundtrip
-            CHECK(doc.patch(json::diff(doc, result)) == result);
-        }
-
-        SECTION("Operations")
-        {
-            // The original document
-            json doc = R"(
-                {
-                  "biscuits": [
-                    {"name":"Digestive"},
-                    {"name": "Choco Liebniz"}
-                  ]
-                }
-            )"_json;
-
-            SECTION("add")
-            {
-                // The patch
-                json patch = R"(
-                    [
-                        {"op": "add", "path": "/biscuits/1", "value": {"name": "Ginger Nut"}}
-                    ]
-                )"_json;
-
-                // The result
-                json result = R"(
-                    {
-                      "biscuits": [
-                        {"name": "Digestive"},
-                        {"name": "Ginger Nut"},
-                        {"name": "Choco Liebniz"}
-                      ]
-                    }
-                )"_json;
-
-                // check if patched value is as expected
-                CHECK(doc.patch(patch) == result);
-
-                // check roundtrip
-                CHECK(doc.patch(json::diff(doc, result)) == result);
-            }
-
-            SECTION("remove")
-            {
-                // The patch
-                json patch = R"(
-                    [
-                        {"op": "remove", "path": "/biscuits"}
-                    ]
-                )"_json;
-
-                // The result
-                json result = R"(
-                    {}
-                )"_json;
-
-                // check if patched value is as expected
-                CHECK(doc.patch(patch) == result);
-
-                // check roundtrip
-                CHECK(doc.patch(json::diff(doc, result)) == result);
-            }
-
-            SECTION("replace")
-            {
-                // The patch
-                json patch = R"(
-                    [
-                        {"op": "replace", "path": "/biscuits/0/name", "value": "Chocolate Digestive"}
-                    ]
-                )"_json;
-
-                // The result
-                json result = R"(
-                    {
-                      "biscuits": [
-                        {"name": "Chocolate Digestive"},
-                        {"name": "Choco Liebniz"}
-                      ]
-                    }
-                )"_json;
-
-                // check if patched value is as expected
-                CHECK(doc.patch(patch) == result);
-
-                // check roundtrip
-                CHECK(doc.patch(json::diff(doc, result)) == result);
-            }
-
-            SECTION("copy")
-            {
-                // The patch
-                json patch = R"(
-                    [
-                        {"op": "copy", "from": "/biscuits/0", "path": "/best_biscuit"}
-                    ]
-                )"_json;
-
-                // The result
-                json result = R"(
-                    {
-                      "biscuits": [
-                        {"name": "Digestive"},
-                        {"name": "Choco Liebniz"}
-                      ],
-                      "best_biscuit": {
-                        "name": "Digestive"
-                      }
-                    }
-                )"_json;
-
-                // check if patched value is as expected
-                CHECK(doc.patch(patch) == result);
-
-                // check roundtrip
-                CHECK(doc.patch(json::diff(doc, result)) == result);
-            }
-
-            SECTION("move")
-            {
-                // The patch
-                json patch = R"(
-                    [
-                        {"op": "move", "from": "/biscuits", "path": "/cookies"}
-                    ]
-                )"_json;
-
-                // The result
-                json result = R"(
-                    {
-                      "cookies": [
-                        {"name": "Digestive"},
-                        {"name": "Choco Liebniz"}
-                      ]
-                    }
-                )"_json;
-
-                // check if patched value is as expected
-                CHECK(doc.patch(patch) == result);
-
-                // check roundtrip
-                CHECK(doc.patch(json::diff(doc, result)) == result);
-            }
-
-            SECTION("test")
-            {
-                // The patch
-                json patch = R"(
-                    [
-                        {"op": "test", "path": "/best_biscuit/name", "value": "Choco Liebniz"}
-                    ]
-                )"_json;
-
-                // the test will fail
-                CHECK_THROWS_AS(doc.patch(patch), json::other_error&);
-#if JSON_DIAGNOSTICS
-                CHECK_THROWS_WITH_STD_STR(doc.patch(patch), "[json.exception.other_error.501] (/0) unsuccessful: " + patch[0].dump());
-#else
-                CHECK_THROWS_WITH_STD_STR(doc.patch(patch), "[json.exception.other_error.501] unsuccessful: " + patch[0].dump());
-#endif
-            }
-        }
-    }
-
-    SECTION("Examples from bruth.github.io/jsonpatch-js")
-    {
-        SECTION("add")
-        {
-            CHECK(R"( {} )"_json.patch(
-                      R"( [{"op": "add", "path": "/foo", "value": "bar"}] )"_json
-                  ) == R"( {"foo": "bar"} )"_json);
-
-            CHECK(R"( {"foo": [1, 3]} )"_json.patch(
-                      R"( [{"op": "add", "path": "/foo", "value": "bar"}] )"_json
-                  ) == R"( {"foo": "bar"} )"_json);
-
-            CHECK(R"( {"foo": [{}]} )"_json.patch(
-                      R"( [{"op": "add", "path": "/foo/0/bar", "value": "baz"}] )"_json
-                  ) == R"( {"foo": [{"bar": "baz"}]} )"_json);
-        }
-
-        SECTION("remove")
-        {
-            CHECK(R"( {"foo": "bar"} )"_json.patch(
-                      R"( [{"op": "remove", "path": "/foo"}] )"_json
-                  ) == R"( {} )"_json);
-
-            CHECK(R"( {"foo": [1, 2, 3]} )"_json.patch(
-                      R"( [{"op": "remove", "path": "/foo/1"}] )"_json
-                  ) == R"( {"foo": [1, 3]} )"_json);
-
-            CHECK(R"( {"foo": [{"bar": "baz"}]} )"_json.patch(
-                      R"( [{"op": "remove", "path": "/foo/0/bar"}] )"_json
-                  ) == R"( {"foo": [{}]} )"_json);
-        }
-
-        SECTION("replace")
-        {
-            CHECK(R"( {"foo": "bar"} )"_json.patch(
-                      R"( [{"op": "replace", "path": "/foo", "value": 1}] )"_json
-                  ) == R"( {"foo": 1} )"_json);
-
-            CHECK(R"( {"foo": [1, 2, 3]} )"_json.patch(
-                      R"( [{"op": "replace", "path": "/foo/1", "value": 4}] )"_json
-                  ) == R"( {"foo": [1, 4, 3]} )"_json);
-
-            CHECK(R"( {"foo": [{"bar": "baz"}]} )"_json.patch(
-                      R"( [{"op": "replace", "path": "/foo/0/bar", "value": 1}] )"_json
-                  ) == R"( {"foo": [{"bar": 1}]} )"_json);
-        }
-
-        SECTION("move")
-        {
-            CHECK(R"( {"foo": [1, 2, 3]} )"_json.patch(
-                      R"( [{"op": "move", "from": "/foo", "path": "/bar"}] )"_json
-                  ) == R"( {"bar": [1, 2, 3]} )"_json);
-        }
-
-        SECTION("copy")
-        {
-            CHECK(R"( {"foo": [1, 2, 3]} )"_json.patch(
-                      R"( [{"op": "copy", "from": "/foo/1", "path": "/bar"}] )"_json
-                  ) == R"( {"foo": [1, 2, 3], "bar": 2} )"_json);
-        }
-
-        SECTION("copy")
-        {
-            CHECK_NOTHROW(R"( {"foo": "bar"} )"_json.patch(
-                              R"( [{"op": "test", "path": "/foo", "value": "bar"}] )"_json));
-        }
-    }
-
-    SECTION("Tests from github.com/json-patch/json-patch-tests")
-    {
-        for (auto filename :
-                {
-                    TEST_DATA_DIRECTORY "/json-patch-tests/spec_tests.json",
-                    TEST_DATA_DIRECTORY "/json-patch-tests/tests.json"
-                })
-        {
-            CAPTURE(filename)
-            std::ifstream f(filename);
-            json suite = json::parse(f);
-
-            for (const auto& test : suite)
-            {
-                INFO_WITH_TEMP(test.value("comment", ""));
-
-                // skip tests marked as disabled
-                if (test.value("disabled", false))
-                {
-                    continue;
-                }
-
-                const auto& doc = test["doc"];
-                const auto& patch = test["patch"];
-
-                if (test.count("error") == 0)
-                {
-                    // if an expected value is given, use it; use doc otherwise
-                    const auto& expected = test.value("expected", doc);
-                    CHECK(doc.patch(patch) == expected);
-                }
-                else
-                {
-                    CHECK_THROWS(doc.patch(patch));
-                }
-            }
-        }
-    }
-}
diff --git a/external_imported/json/test/src/unit-json_pointer.cpp b/external_imported/json/test/src/unit-json_pointer.cpp
deleted file mode 100644
index 52a798fd2..000000000
--- a/external_imported/json/test/src/unit-json_pointer.cpp
+++ /dev/null
@@ -1,697 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include "doctest_compatibility.h"
-
-#define JSON_TESTS_PRIVATE
-#include <nlohmann/json.hpp>
-using nlohmann::json;
-
-TEST_CASE("JSON pointers")
-{
-    SECTION("errors")
-    {
-        CHECK_THROWS_AS(json::json_pointer("foo"), json::parse_error&);
-        CHECK_THROWS_WITH(json::json_pointer("foo"),
-                          "[json.exception.parse_error.107] parse error at byte 1: JSON pointer must be empty or begin with '/' - was: 'foo'");
-
-        CHECK_THROWS_AS(json::json_pointer("/~~"), json::parse_error&);
-        CHECK_THROWS_WITH(json::json_pointer("/~~"),
-                          "[json.exception.parse_error.108] parse error: escape character '~' must be followed with '0' or '1'");
-
-        CHECK_THROWS_AS(json::json_pointer("/~"), json::parse_error&);
-        CHECK_THROWS_WITH(json::json_pointer("/~"),
-                          "[json.exception.parse_error.108] parse error: escape character '~' must be followed with '0' or '1'");
-
-        json::json_pointer p;
-        CHECK_THROWS_AS(p.top(), json::out_of_range&);
-        CHECK_THROWS_WITH(p.top(),
-                          "[json.exception.out_of_range.405] JSON pointer has no parent");
-        CHECK_THROWS_AS(p.pop_back(), json::out_of_range&);
-        CHECK_THROWS_WITH(p.pop_back(),
-                          "[json.exception.out_of_range.405] JSON pointer has no parent");
-
-        SECTION("array index error")
-        {
-            json v = {1, 2, 3, 4};
-            json::json_pointer ptr("/10e");
-            CHECK_THROWS_AS(v[ptr], json::out_of_range&);
-            CHECK_THROWS_WITH(v[ptr],
-                              "[json.exception.out_of_range.404] unresolved reference token '10e'");
-        }
-    }
-
-    SECTION("examples from RFC 6901")
-    {
-        SECTION("nonconst access")
-        {
-            json j = R"(
-            {
-                "foo": ["bar", "baz"],
-                "": 0,
-                "a/b": 1,
-                "c%d": 2,
-                "e^f": 3,
-                "g|h": 4,
-                "i\\j": 5,
-                "k\"l": 6,
-                " ": 7,
-                "m~n": 8
-            }
-            )"_json;
-
-            // the whole document
-            CHECK(j[json::json_pointer()] == j);
-            CHECK(j[json::json_pointer("")] == j);
-            CHECK(j.contains(json::json_pointer()));
-            CHECK(j.contains(json::json_pointer("")));
-
-            // array access
-            CHECK(j[json::json_pointer("/foo")] == j["foo"]);
-            CHECK(j.contains(json::json_pointer("/foo")));
-            CHECK(j[json::json_pointer("/foo/0")] == j["foo"][0]);
-            CHECK(j[json::json_pointer("/foo/1")] == j["foo"][1]);
-            CHECK(j["/foo/1"_json_pointer] == j["foo"][1]);
-            CHECK(j.contains(json::json_pointer("/foo/0")));
-            CHECK(j.contains(json::json_pointer("/foo/1")));
-            CHECK(!j.contains(json::json_pointer("/foo/3")));
-            CHECK(!j.contains(json::json_pointer("/foo/+")));
-            CHECK(!j.contains(json::json_pointer("/foo/1+2")));
-            CHECK(!j.contains(json::json_pointer("/foo/-")));
-
-            // checked array access
-            CHECK(j.at(json::json_pointer("/foo/0")) == j["foo"][0]);
-            CHECK(j.at(json::json_pointer("/foo/1")) == j["foo"][1]);
-
-            // empty string access
-            CHECK(j[json::json_pointer("/")] == j[""]);
-            CHECK(j.contains(json::json_pointer("")));
-            CHECK(j.contains(json::json_pointer("/")));
-
-            // other cases
-            CHECK(j[json::json_pointer("/ ")] == j[" "]);
-            CHECK(j[json::json_pointer("/c%d")] == j["c%d"]);
-            CHECK(j[json::json_pointer("/e^f")] == j["e^f"]);
-            CHECK(j[json::json_pointer("/g|h")] == j["g|h"]);
-            CHECK(j[json::json_pointer("/i\\j")] == j["i\\j"]);
-            CHECK(j[json::json_pointer("/k\"l")] == j["k\"l"]);
-
-            // contains
-            CHECK(j.contains(json::json_pointer("/ ")));
-            CHECK(j.contains(json::json_pointer("/c%d")));
-            CHECK(j.contains(json::json_pointer("/e^f")));
-            CHECK(j.contains(json::json_pointer("/g|h")));
-            CHECK(j.contains(json::json_pointer("/i\\j")));
-            CHECK(j.contains(json::json_pointer("/k\"l")));
-
-            // checked access
-            CHECK(j.at(json::json_pointer("/ ")) == j[" "]);
-            CHECK(j.at(json::json_pointer("/c%d")) == j["c%d"]);
-            CHECK(j.at(json::json_pointer("/e^f")) == j["e^f"]);
-            CHECK(j.at(json::json_pointer("/g|h")) == j["g|h"]);
-            CHECK(j.at(json::json_pointer("/i\\j")) == j["i\\j"]);
-            CHECK(j.at(json::json_pointer("/k\"l")) == j["k\"l"]);
-
-            // escaped access
-            CHECK(j[json::json_pointer("/a~1b")] == j["a/b"]);
-            CHECK(j[json::json_pointer("/m~0n")] == j["m~n"]);
-            CHECK(j.contains(json::json_pointer("/a~1b")));
-            CHECK(j.contains(json::json_pointer("/m~0n")));
-
-            // unescaped access
-            // access to nonexisting values yield object creation
-            CHECK(!j.contains(json::json_pointer("/a/b")));
-            CHECK_NOTHROW(j[json::json_pointer("/a/b")] = 42);
-            CHECK(j.contains(json::json_pointer("/a/b")));
-            CHECK(j["a"]["b"] == json(42));
-
-            CHECK(!j.contains(json::json_pointer("/a/c/1")));
-            CHECK_NOTHROW(j[json::json_pointer("/a/c/1")] = 42);
-            CHECK(j["a"]["c"] == json({nullptr, 42}));
-            CHECK(j.contains(json::json_pointer("/a/c/1")));
-
-            CHECK(!j.contains(json::json_pointer("/a/d/-")));
-            CHECK_NOTHROW(j[json::json_pointer("/a/d/-")] = 42);
-            CHECK(!j.contains(json::json_pointer("/a/d/-")));
-            CHECK(j["a"]["d"] == json::array({42}));
-            // "/a/b" works for JSON {"a": {"b": 42}}
-            CHECK(json({{"a", {{"b", 42}}}})[json::json_pointer("/a/b")] == json(42));
-
-            // unresolved access
-            json j_primitive = 1;
-            CHECK_THROWS_AS(j_primitive["/foo"_json_pointer], json::out_of_range&);
-            CHECK_THROWS_WITH(j_primitive["/foo"_json_pointer],
-                              "[json.exception.out_of_range.404] unresolved reference token 'foo'");
-            CHECK_THROWS_AS(j_primitive.at("/foo"_json_pointer), json::out_of_range&);
-            CHECK_THROWS_WITH(j_primitive.at("/foo"_json_pointer),
-                              "[json.exception.out_of_range.404] unresolved reference token 'foo'");
-            CHECK(!j_primitive.contains(json::json_pointer("/foo")));
-        }
-
-        SECTION("const access")
-        {
-            const json j = R"(
-            {
-                "foo": ["bar", "baz"],
-                "": 0,
-                "a/b": 1,
-                "c%d": 2,
-                "e^f": 3,
-                "g|h": 4,
-                "i\\j": 5,
-                "k\"l": 6,
-                " ": 7,
-                "m~n": 8
-            }
-            )"_json;
-
-            // the whole document
-            CHECK(j[json::json_pointer()] == j);
-            CHECK(j[json::json_pointer("")] == j);
-
-            // array access
-            CHECK(j[json::json_pointer("/foo")] == j["foo"]);
-            CHECK(j[json::json_pointer("/foo/0")] == j["foo"][0]);
-            CHECK(j[json::json_pointer("/foo/1")] == j["foo"][1]);
-            CHECK(j["/foo/1"_json_pointer] == j["foo"][1]);
-
-            // checked array access
-            CHECK(j.at(json::json_pointer("/foo/0")) == j["foo"][0]);
-            CHECK(j.at(json::json_pointer("/foo/1")) == j["foo"][1]);
-
-            // empty string access
-            CHECK(j[json::json_pointer("/")] == j[""]);
-
-            // other cases
-            CHECK(j[json::json_pointer("/ ")] == j[" "]);
-            CHECK(j[json::json_pointer("/c%d")] == j["c%d"]);
-            CHECK(j[json::json_pointer("/e^f")] == j["e^f"]);
-            CHECK(j[json::json_pointer("/g|h")] == j["g|h"]);
-            CHECK(j[json::json_pointer("/i\\j")] == j["i\\j"]);
-            CHECK(j[json::json_pointer("/k\"l")] == j["k\"l"]);
-
-            // checked access
-            CHECK(j.at(json::json_pointer("/ ")) == j[" "]);
-            CHECK(j.at(json::json_pointer("/c%d")) == j["c%d"]);
-            CHECK(j.at(json::json_pointer("/e^f")) == j["e^f"]);
-            CHECK(j.at(json::json_pointer("/g|h")) == j["g|h"]);
-            CHECK(j.at(json::json_pointer("/i\\j")) == j["i\\j"]);
-            CHECK(j.at(json::json_pointer("/k\"l")) == j["k\"l"]);
-
-            // escaped access
-            CHECK(j[json::json_pointer("/a~1b")] == j["a/b"]);
-            CHECK(j[json::json_pointer("/m~0n")] == j["m~n"]);
-
-            // unescaped access
-            CHECK_THROWS_AS(j.at(json::json_pointer("/a/b")), json::out_of_range&);
-            CHECK_THROWS_WITH(j.at(json::json_pointer("/a/b")),
-                              "[json.exception.out_of_range.403] key 'a' not found");
-
-            // unresolved access
-            const json j_primitive = 1;
-            CHECK_THROWS_AS(j_primitive["/foo"_json_pointer], json::out_of_range&);
-            CHECK_THROWS_WITH(j_primitive["/foo"_json_pointer],
-                              "[json.exception.out_of_range.404] unresolved reference token 'foo'");
-            CHECK_THROWS_AS(j_primitive.at("/foo"_json_pointer), json::out_of_range&);
-            CHECK_THROWS_WITH(j_primitive.at("/foo"_json_pointer),
-                              "[json.exception.out_of_range.404] unresolved reference token 'foo'");
-        }
-
-        SECTION("user-defined string literal")
-        {
-            json j = R"(
-            {
-                "foo": ["bar", "baz"],
-                "": 0,
-                "a/b": 1,
-                "c%d": 2,
-                "e^f": 3,
-                "g|h": 4,
-                "i\\j": 5,
-                "k\"l": 6,
-                " ": 7,
-                "m~n": 8
-            }
-            )"_json;
-
-            // the whole document
-            CHECK(j[""_json_pointer] == j);
-            CHECK(j.contains(""_json_pointer));
-
-            // array access
-            CHECK(j["/foo"_json_pointer] == j["foo"]);
-            CHECK(j["/foo/0"_json_pointer] == j["foo"][0]);
-            CHECK(j["/foo/1"_json_pointer] == j["foo"][1]);
-            CHECK(j.contains("/foo"_json_pointer));
-            CHECK(j.contains("/foo/0"_json_pointer));
-            CHECK(j.contains("/foo/1"_json_pointer));
-            CHECK(!j.contains("/foo/-"_json_pointer));
-        }
-    }
-
-    SECTION("array access")
-    {
-        SECTION("nonconst access")
-        {
-            json j = {1, 2, 3};
-            const json j_const = j;
-
-            // check reading access
-            CHECK(j["/0"_json_pointer] == j[0]);
-            CHECK(j["/1"_json_pointer] == j[1]);
-            CHECK(j["/2"_json_pointer] == j[2]);
-
-            // assign to existing index
-            j["/1"_json_pointer] = 13;
-            CHECK(j[1] == json(13));
-
-            // assign to nonexisting index
-            j["/3"_json_pointer] = 33;
-            CHECK(j[3] == json(33));
-
-            // assign to nonexisting index (with gap)
-            j["/5"_json_pointer] = 55;
-            CHECK(j == json({1, 13, 3, 33, nullptr, 55}));
-
-            // error with leading 0
-            CHECK_THROWS_AS(j["/01"_json_pointer], json::parse_error&);
-            CHECK_THROWS_WITH(j["/01"_json_pointer],
-                              "[json.exception.parse_error.106] parse error: array index '01' must not begin with '0'");
-            CHECK_THROWS_AS(j_const["/01"_json_pointer], json::parse_error&);
-            CHECK_THROWS_WITH(j_const["/01"_json_pointer],
-                              "[json.exception.parse_error.106] parse error: array index '01' must not begin with '0'");
-            CHECK_THROWS_AS(j.at("/01"_json_pointer), json::parse_error&);
-            CHECK_THROWS_WITH(j.at("/01"_json_pointer),
-                              "[json.exception.parse_error.106] parse error: array index '01' must not begin with '0'");
-            CHECK_THROWS_AS(j_const.at("/01"_json_pointer), json::parse_error&);
-            CHECK_THROWS_WITH(j_const.at("/01"_json_pointer),
-                              "[json.exception.parse_error.106] parse error: array index '01' must not begin with '0'");
-
-            CHECK(!j.contains("/01"_json_pointer));
-            CHECK(!j.contains("/01"_json_pointer));
-            CHECK(!j_const.contains("/01"_json_pointer));
-            CHECK(!j_const.contains("/01"_json_pointer));
-
-            // error with incorrect numbers
-            CHECK_THROWS_AS(j["/one"_json_pointer] = 1, json::parse_error&);
-            CHECK_THROWS_WITH(j["/one"_json_pointer] = 1,
-                              "[json.exception.parse_error.109] parse error: array index 'one' is not a number");
-            CHECK_THROWS_AS(j_const["/one"_json_pointer] == 1, json::parse_error&);
-            CHECK_THROWS_WITH(j_const["/one"_json_pointer] == 1,
-                              "[json.exception.parse_error.109] parse error: array index 'one' is not a number");
-
-            CHECK_THROWS_AS(j.at("/one"_json_pointer) = 1, json::parse_error&);
-            CHECK_THROWS_WITH(j.at("/one"_json_pointer) = 1,
-                              "[json.exception.parse_error.109] parse error: array index 'one' is not a number");
-            CHECK_THROWS_AS(j_const.at("/one"_json_pointer) == 1, json::parse_error&);
-            CHECK_THROWS_WITH(j_const.at("/one"_json_pointer) == 1,
-                              "[json.exception.parse_error.109] parse error: array index 'one' is not a number");
-
-            CHECK_THROWS_AS(j["/+1"_json_pointer] = 1, json::parse_error&);
-            CHECK_THROWS_WITH(j["/+1"_json_pointer] = 1,
-                              "[json.exception.parse_error.109] parse error: array index '+1' is not a number");
-            CHECK_THROWS_AS(j_const["/+1"_json_pointer] == 1, json::parse_error&);
-            CHECK_THROWS_WITH(j_const["/+1"_json_pointer] == 1,
-                              "[json.exception.parse_error.109] parse error: array index '+1' is not a number");
-
-            CHECK_THROWS_AS(j["/1+1"_json_pointer] = 1, json::out_of_range&);
-            CHECK_THROWS_WITH(j["/1+1"_json_pointer] = 1,
-                              "[json.exception.out_of_range.404] unresolved reference token '1+1'");
-            CHECK_THROWS_AS(j_const["/1+1"_json_pointer] == 1, json::out_of_range&);
-            CHECK_THROWS_WITH(j_const["/1+1"_json_pointer] == 1,
-                              "[json.exception.out_of_range.404] unresolved reference token '1+1'");
-
-            {
-                auto too_large_index = std::to_string((std::numeric_limits<unsigned long long>::max)()) + "1";
-                json::json_pointer jp(std::string("/") + too_large_index);
-                std::string throw_msg = std::string("[json.exception.out_of_range.404] unresolved reference token '") + too_large_index + "'";
-
-                CHECK_THROWS_AS(j[jp] = 1, json::out_of_range&);
-                CHECK_THROWS_WITH(j[jp] = 1, throw_msg.c_str());
-                CHECK_THROWS_AS(j_const[jp] == 1, json::out_of_range&);
-                CHECK_THROWS_WITH(j_const[jp] == 1, throw_msg.c_str());
-            }
-
-            if (sizeof(typename json::size_type) < sizeof(unsigned long long))
-            {
-                auto size_type_max_uul = static_cast<unsigned long long>((std::numeric_limits<json::size_type>::max)());
-                auto too_large_index = std::to_string(size_type_max_uul);
-                json::json_pointer jp(std::string("/") + too_large_index);
-                std::string throw_msg = std::string("[json.exception.out_of_range.410] array index ") + too_large_index + " exceeds size_type";
-
-                CHECK_THROWS_AS(j[jp] = 1, json::out_of_range&);
-                CHECK_THROWS_WITH(j[jp] = 1, throw_msg.c_str());
-                CHECK_THROWS_AS(j_const[jp] == 1, json::out_of_range&);
-                CHECK_THROWS_WITH(j_const[jp] == 1, throw_msg.c_str());
-            }
-
-            CHECK_THROWS_AS(j.at("/one"_json_pointer) = 1, json::parse_error&);
-            CHECK_THROWS_WITH(j.at("/one"_json_pointer) = 1,
-                              "[json.exception.parse_error.109] parse error: array index 'one' is not a number");
-            CHECK_THROWS_AS(j_const.at("/one"_json_pointer) == 1, json::parse_error&);
-            CHECK_THROWS_WITH(j_const.at("/one"_json_pointer) == 1,
-                              "[json.exception.parse_error.109] parse error: array index 'one' is not a number");
-
-            CHECK(!j.contains("/one"_json_pointer));
-            CHECK(!j.contains("/one"_json_pointer));
-            CHECK(!j_const.contains("/one"_json_pointer));
-            CHECK(!j_const.contains("/one"_json_pointer));
-
-            CHECK_THROWS_AS(json({{"/list/0", 1}, {"/list/1", 2}, {"/list/three", 3}}).unflatten(), json::parse_error&);
-            CHECK_THROWS_WITH(json({{"/list/0", 1}, {"/list/1", 2}, {"/list/three", 3}}).unflatten(),
-            "[json.exception.parse_error.109] parse error: array index 'three' is not a number");
-
-            // assign to "-"
-            j["/-"_json_pointer] = 99;
-            CHECK(j == json({1, 13, 3, 33, nullptr, 55, 99}));
-
-            // error when using "-" in const object
-            CHECK_THROWS_AS(j_const["/-"_json_pointer], json::out_of_range&);
-            CHECK_THROWS_WITH(j_const["/-"_json_pointer],
-                              "[json.exception.out_of_range.402] array index '-' (3) is out of range");
-            CHECK(!j_const.contains("/-"_json_pointer));
-
-            // error when using "-" with at
-            CHECK_THROWS_AS(j.at("/-"_json_pointer), json::out_of_range&);
-            CHECK_THROWS_WITH(j.at("/-"_json_pointer),
-                              "[json.exception.out_of_range.402] array index '-' (7) is out of range");
-            CHECK_THROWS_AS(j_const.at("/-"_json_pointer), json::out_of_range&);
-            CHECK_THROWS_WITH(j_const.at("/-"_json_pointer),
-                              "[json.exception.out_of_range.402] array index '-' (3) is out of range");
-            CHECK(!j_const.contains("/-"_json_pointer));
-        }
-
-        SECTION("const access")
-        {
-            const json j = {1, 2, 3};
-
-            // check reading access
-            CHECK(j["/0"_json_pointer] == j[0]);
-            CHECK(j["/1"_json_pointer] == j[1]);
-            CHECK(j["/2"_json_pointer] == j[2]);
-
-            // assign to nonexisting index
-            CHECK_THROWS_AS(j.at("/3"_json_pointer), json::out_of_range&);
-            CHECK_THROWS_WITH(j.at("/3"_json_pointer),
-                              "[json.exception.out_of_range.401] array index 3 is out of range");
-            CHECK(!j.contains("/3"_json_pointer));
-
-            // assign to nonexisting index (with gap)
-            CHECK_THROWS_AS(j.at("/5"_json_pointer), json::out_of_range&);
-            CHECK_THROWS_WITH(j.at("/5"_json_pointer),
-                              "[json.exception.out_of_range.401] array index 5 is out of range");
-            CHECK(!j.contains("/5"_json_pointer));
-
-            // assign to "-"
-            CHECK_THROWS_AS(j["/-"_json_pointer], json::out_of_range&);
-            CHECK_THROWS_WITH(j["/-"_json_pointer],
-                              "[json.exception.out_of_range.402] array index '-' (3) is out of range");
-            CHECK_THROWS_AS(j.at("/-"_json_pointer), json::out_of_range&);
-            CHECK_THROWS_WITH(j.at("/-"_json_pointer),
-                              "[json.exception.out_of_range.402] array index '-' (3) is out of range");
-            CHECK(!j.contains("/-"_json_pointer));
-        }
-    }
-
-    SECTION("flatten")
-    {
-        json j =
-        {
-            {"pi", 3.141},
-            {"happy", true},
-            {"name", "Niels"},
-            {"nothing", nullptr},
-            {
-                "answer", {
-                    {"everything", 42}
-                }
-            },
-            {"list", {1, 0, 2}},
-            {
-                "object", {
-                    {"currency", "USD"},
-                    {"value", 42.99},
-                    {"", "empty string"},
-                    {"/", "slash"},
-                    {"~", "tilde"},
-                    {"~1", "tilde1"}
-                }
-            }
-        };
-
-        json j_flatten =
-        {
-            {"/pi", 3.141},
-            {"/happy", true},
-            {"/name", "Niels"},
-            {"/nothing", nullptr},
-            {"/answer/everything", 42},
-            {"/list/0", 1},
-            {"/list/1", 0},
-            {"/list/2", 2},
-            {"/object/currency", "USD"},
-            {"/object/value", 42.99},
-            {"/object/", "empty string"},
-            {"/object/~1", "slash"},
-            {"/object/~0", "tilde"},
-            {"/object/~01", "tilde1"}
-        };
-
-        // check if flattened result is as expected
-        CHECK(j.flatten() == j_flatten);
-
-        // check if unflattened result is as expected
-        CHECK(j_flatten.unflatten() == j);
-
-        // error for nonobjects
-        CHECK_THROWS_AS(json(1).unflatten(), json::type_error&);
-        CHECK_THROWS_WITH(json(1).unflatten(),
-                          "[json.exception.type_error.314] only objects can be unflattened");
-
-        // error for nonprimitve values
-        CHECK_THROWS_AS(json({{"/1", {1, 2, 3}}}).unflatten(), json::type_error&);
-#if JSON_DIAGNOSTICS
-        CHECK_THROWS_WITH(json({{"/1", {1, 2, 3}}}).unflatten(), "[json.exception.type_error.315] (/~11) values in object must be primitive");
-#else
-        CHECK_THROWS_WITH(json({{"/1", {1, 2, 3}}}).unflatten(), "[json.exception.type_error.315] values in object must be primitive");
-#endif
-
-        // error for conflicting values
-        json j_error = {{"", 42}, {"/foo", 17}};
-        CHECK_THROWS_AS(j_error.unflatten(), json::type_error&);
-        CHECK_THROWS_WITH(j_error.unflatten(),
-                          "[json.exception.type_error.313] invalid value to unflatten");
-
-        // explicit roundtrip check
-        CHECK(j.flatten().unflatten() == j);
-
-        // roundtrip for primitive values
-        json j_null;
-        CHECK(j_null.flatten().unflatten() == j_null);
-        json j_number = 42;
-        CHECK(j_number.flatten().unflatten() == j_number);
-        json j_boolean = false;
-        CHECK(j_boolean.flatten().unflatten() == j_boolean);
-        json j_string = "foo";
-        CHECK(j_string.flatten().unflatten() == j_string);
-
-        // roundtrip for empty structured values (will be unflattened to null)
-        json j_array(json::value_t::array);
-        CHECK(j_array.flatten().unflatten() == json());
-        json j_object(json::value_t::object);
-        CHECK(j_object.flatten().unflatten() == json());
-    }
-
-    SECTION("string representation")
-    {
-        for (auto ptr :
-                {"", "/foo", "/foo/0", "/", "/a~1b", "/c%d", "/e^f", "/g|h", "/i\\j", "/k\"l", "/ ", "/m~0n"
-                })
-        {
-            CHECK(json::json_pointer(ptr).to_string() == ptr);
-            CHECK(std::string(json::json_pointer(ptr)) == ptr);
-        }
-    }
-
-    SECTION("conversion")
-    {
-        SECTION("array")
-        {
-            json j;
-            // all numbers -> array
-            j["/12"_json_pointer] = 0;
-            CHECK(j.is_array());
-        }
-
-        SECTION("object")
-        {
-            json j;
-            // contains a number, but is not a number -> object
-            j["/a12"_json_pointer] = 0;
-            CHECK(j.is_object());
-        }
-    }
-
-    SECTION("empty, push, pop and parent")
-    {
-        const json j =
-        {
-            {"", "Hello"},
-            {"pi", 3.141},
-            {"happy", true},
-            {"name", "Niels"},
-            {"nothing", nullptr},
-            {
-                "answer", {
-                    {"everything", 42}
-                }
-            },
-            {"list", {1, 0, 2}},
-            {
-                "object", {
-                    {"currency", "USD"},
-                    {"value", 42.99},
-                    {"", "empty string"},
-                    {"/", "slash"},
-                    {"~", "tilde"},
-                    {"~1", "tilde1"}
-                }
-            }
-        };
-
-        // empty json_pointer returns the root JSON-object
-        auto ptr = ""_json_pointer;
-        CHECK(ptr.empty());
-        CHECK(j[ptr] == j);
-
-        // simple field access
-        ptr.push_back("pi");
-        CHECK(!ptr.empty());
-        CHECK(j[ptr] == j["pi"]);
-
-        ptr.pop_back();
-        CHECK(ptr.empty());
-        CHECK(j[ptr] == j);
-
-        // object and children access
-        const std::string answer("answer");
-        ptr.push_back(answer);
-        ptr.push_back("everything");
-        CHECK(!ptr.empty());
-        CHECK(j[ptr] == j["answer"]["everything"]);
-
-        // check access via const pointer
-        const auto cptr = ptr;
-        CHECK(cptr.back() == "everything");
-
-        ptr.pop_back();
-        ptr.pop_back();
-        CHECK(ptr.empty());
-        CHECK(j[ptr] == j);
-
-        // push key which has to be encoded
-        ptr.push_back("object");
-        ptr.push_back("/");
-        CHECK(j[ptr] == j["object"]["/"]);
-        CHECK(ptr.to_string() == "/object/~1");
-
-        CHECK(j[ptr.parent_pointer()] == j["object"]);
-        ptr = ptr.parent_pointer().parent_pointer();
-        CHECK(ptr.empty());
-        CHECK(j[ptr] == j);
-        // parent-pointer of the empty json_pointer is empty
-        ptr = ptr.parent_pointer();
-        CHECK(ptr.empty());
-        CHECK(j[ptr] == j);
-
-        CHECK_THROWS_WITH(ptr.pop_back(),
-                          "[json.exception.out_of_range.405] JSON pointer has no parent");
-    }
-
-    SECTION("operators")
-    {
-        const json j =
-        {
-            {"", "Hello"},
-            {"pi", 3.141},
-            {"happy", true},
-            {"name", "Niels"},
-            {"nothing", nullptr},
-            {
-                "answer", {
-                    {"everything", 42}
-                }
-            },
-            {"list", {1, 0, 2}},
-            {
-                "object", {
-                    {"currency", "USD"},
-                    {"value", 42.99},
-                    {"", "empty string"},
-                    {"/", "slash"},
-                    {"~", "tilde"},
-                    {"~1", "tilde1"}
-                }
-            }
-        };
-
-        // empty json_pointer returns the root JSON-object
-        auto ptr = ""_json_pointer;
-        CHECK(j[ptr] == j);
-
-        // simple field access
-        ptr = ptr / "pi";
-        CHECK(j[ptr] == j["pi"]);
-
-        ptr.pop_back();
-        CHECK(j[ptr] == j);
-
-        // object and children access
-        const std::string answer("answer");
-        ptr /= answer;
-        ptr = ptr / "everything";
-        CHECK(j[ptr] == j["answer"]["everything"]);
-
-        ptr.pop_back();
-        ptr.pop_back();
-        CHECK(j[ptr] == j);
-
-        CHECK(ptr / ""_json_pointer == ptr);
-        CHECK(j["/answer"_json_pointer / "/everything"_json_pointer] == j["answer"]["everything"]);
-
-        // list children access
-        CHECK(j["/list"_json_pointer / 1] == j["list"][1]);
-
-        // push key which has to be encoded
-        ptr /= "object";
-        ptr = ptr / "/";
-        CHECK(j[ptr] == j["object"]["/"]);
-        CHECK(ptr.to_string() == "/object/~1");
-    }
-}
diff --git a/external_imported/json/test/src/unit-large_json.cpp b/external_imported/json/test/src/unit-large_json.cpp
deleted file mode 100644
index 600a99150..000000000
--- a/external_imported/json/test/src/unit-large_json.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include "doctest_compatibility.h"
-
-#include <nlohmann/json.hpp>
-using nlohmann::json;
-
-#include <algorithm>
-
-TEST_CASE("tests on very large JSONs")
-{
-    SECTION("issue #1419 - Segmentation fault (stack overflow) due to unbounded recursion")
-    {
-        const auto depth = 5000000;
-
-        std::string s(2 * depth, '[');
-        std::fill(s.begin() + depth, s.end(), ']');
-
-        json _;
-        CHECK_NOTHROW(_ = nlohmann::json::parse(s));
-    }
-}
-
diff --git a/external_imported/json/test/src/unit-merge_patch.cpp b/external_imported/json/test/src/unit-merge_patch.cpp
deleted file mode 100644
index 34551c752..000000000
--- a/external_imported/json/test/src/unit-merge_patch.cpp
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include "doctest_compatibility.h"
-
-#include <nlohmann/json.hpp>
-using nlohmann::json;
-
-TEST_CASE("JSON Merge Patch")
-{
-    SECTION("examples from RFC 7396")
-    {
-        SECTION("Section 1")
-        {
-            json document = R"({
-                "a": "b",
-                "c": {
-                    "d": "e",
-                    "f": "g"
-                }
-            })"_json;
-
-            json patch = R"({
-                "a": "z",
-                "c": {
-                    "f": null
-                }
-            })"_json;
-
-            json expected = R"({
-                "a": "z",
-                "c": {
-                    "d": "e"
-                }
-            })"_json;
-
-            document.merge_patch(patch);
-            CHECK(document == expected);
-        }
-
-        SECTION("Section 3")
-        {
-            json document = R"({
-                "title": "Goodbye!",
-                "author": {
-                    "givenName": "John",
-                    "familyName": "Doe"
-                },
-                "tags": [
-                    "example",
-                    "sample"
-                ],
-                "content": "This will be unchanged"
-            })"_json;
-
-            json patch = R"({
-                "title": "Hello!",
-                "phoneNumber": "+01-123-456-7890",
-                "author": {
-                    "familyName": null
-                },
-                "tags": [
-                    "example"
-                ]
-            })"_json;
-
-            json expected = R"({
-                "title": "Hello!",
-                "author": {
-                    "givenName": "John"
-                },
-                "tags": [
-                    "example"
-                ],
-                "content": "This will be unchanged",
-                "phoneNumber": "+01-123-456-7890"
-            })"_json;
-
-            document.merge_patch(patch);
-            CHECK(document == expected);
-        }
-
-        SECTION("Appendix A")
-        {
-            SECTION("Example 1")
-            {
-                json original = R"({"a":"b"})"_json;
-                json patch = R"({"a":"c"})"_json;
-                json result = R"({"a":"c"})"_json;
-
-                original.merge_patch(patch);
-                CHECK(original == result);
-            }
-
-            SECTION("Example 2")
-            {
-                json original = R"({"a":"b"})"_json;
-                json patch = R"({"b":"c"})"_json;
-                json result = R"({"a":"b", "b":"c"})"_json;
-
-                original.merge_patch(patch);
-                CHECK(original == result);
-            }
-
-            SECTION("Example 3")
-            {
-                json original = R"({"a":"b"})"_json;
-                json patch = R"({"a":null})"_json;
-                json result = R"({})"_json;
-
-                original.merge_patch(patch);
-                CHECK(original == result);
-            }
-
-            SECTION("Example 4")
-            {
-                json original = R"({"a":"b","b":"c"})"_json;
-                json patch = R"({"a":null})"_json;
-                json result = R"({"b":"c"})"_json;
-
-                original.merge_patch(patch);
-                CHECK(original == result);
-            }
-
-            SECTION("Example 5")
-            {
-                json original = R"({"a":["b"]})"_json;
-                json patch = R"({"a":"c"})"_json;
-                json result = R"({"a":"c"})"_json;
-
-                original.merge_patch(patch);
-                CHECK(original == result);
-            }
-
-            SECTION("Example 6")
-            {
-                json original = R"({"a":"c"})"_json;
-                json patch = R"({"a":["b"]})"_json;
-                json result = R"({"a":["b"]})"_json;
-
-                original.merge_patch(patch);
-                CHECK(original == result);
-            }
-
-            SECTION("Example 7")
-            {
-                json original = R"({"a":{"b": "c"}})"_json;
-                json patch = R"({"a":{"b":"d","c":null}})"_json;
-                json result = R"({"a": {"b": "d"}})"_json;
-
-                original.merge_patch(patch);
-                CHECK(original == result);
-            }
-
-            SECTION("Example 8")
-            {
-                json original = R"({"a":[{"b":"c"}]})"_json;
-                json patch = R"({"a":[1]})"_json;
-                json result = R"({"a":[1]})"_json;
-
-                original.merge_patch(patch);
-                CHECK(original == result);
-            }
-
-            SECTION("Example 9")
-            {
-                json original = R"(["a","b"])"_json;
-                json patch = R"(["c","d"])"_json;
-                json result = R"(["c","d"])"_json;
-
-                original.merge_patch(patch);
-                CHECK(original == result);
-            }
-
-            SECTION("Example 10")
-            {
-                json original = R"({"a":"b"})"_json;
-                json patch = R"(["c"])"_json;
-                json result = R"(["c"])"_json;
-
-                original.merge_patch(patch);
-                CHECK(original == result);
-            }
-
-            SECTION("Example 11")
-            {
-                json original = R"({"a":"foo"})"_json;
-                json patch = R"(null)"_json;
-                json result = R"(null)"_json;
-
-                original.merge_patch(patch);
-                CHECK(original == result);
-            }
-
-            SECTION("Example 12")
-            {
-                json original = R"({"a":"foo"})"_json;
-                json patch = R"("bar")"_json;
-                json result = R"("bar")"_json;
-
-                original.merge_patch(patch);
-                CHECK(original == result);
-            }
-
-            SECTION("Example 13")
-            {
-                json original = R"({"e":null})"_json;
-                json patch = R"({"a":1})"_json;
-                json result = R"({"e":null,"a":1})"_json;
-
-                original.merge_patch(patch);
-                CHECK(original == result);
-            }
-
-            SECTION("Example 14")
-            {
-                json original = R"([1,2])"_json;
-                json patch = R"({"a":"b","c":null})"_json;
-                json result = R"({"a":"b"})"_json;
-
-                original.merge_patch(patch);
-                CHECK(original == result);
-            }
-
-            SECTION("Example 15")
-            {
-                json original = R"({})"_json;
-                json patch = R"({"a":{"bb":{"ccc":null}}})"_json;
-                json result = R"({"a":{"bb":{}}})"_json;
-
-                original.merge_patch(patch);
-                CHECK(original == result);
-            }
-        }
-    }
-}
diff --git a/external_imported/json/test/src/unit-meta.cpp b/external_imported/json/test/src/unit-meta.cpp
deleted file mode 100644
index c35ca79b9..000000000
--- a/external_imported/json/test/src/unit-meta.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include "doctest_compatibility.h"
-
-#include <nlohmann/json.hpp>
-using nlohmann::json;
-
-TEST_CASE("version information")
-{
-    SECTION("meta()")
-    {
-        json j = json::meta();
-
-        CHECK(j["name"] == "JSON for Modern C++");
-        CHECK(j["copyright"] == "(C) 2013-2021 Niels Lohmann");
-        CHECK(j["url"] == "https://github.com/nlohmann/json");
-        CHECK(j["version"] == json(
-        {
-            {"string", "3.9.1"},
-            {"major", 3},
-            {"minor", 9},
-            {"patch", 1}
-        }));
-
-        CHECK(j.find("platform") != j.end());
-        CHECK(j.at("compiler").find("family") != j.at("compiler").end());
-        CHECK(j.at("compiler").find("version") != j.at("compiler").end());
-        CHECK(j.at("compiler").find("c++") != j.at("compiler").end());
-    }
-}
diff --git a/external_imported/json/test/src/unit-modifiers.cpp b/external_imported/json/test/src/unit-modifiers.cpp
deleted file mode 100644
index d66621d84..000000000
--- a/external_imported/json/test/src/unit-modifiers.cpp
+++ /dev/null
@@ -1,1008 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include "doctest_compatibility.h"
-
-#include <nlohmann/json.hpp>
-using nlohmann::json;
-
-TEST_CASE("modifiers")
-{
-    SECTION("clear()")
-    {
-        SECTION("boolean")
-        {
-            json j = true;
-            json k = j;
-
-            j.clear();
-            CHECK(j == json(json::value_t::boolean));
-            CHECK(j == json(k.type()));
-        }
-
-        SECTION("string")
-        {
-            json j = "hello world";
-            json k = j;
-
-            j.clear();
-            CHECK(j == json(json::value_t::string));
-            CHECK(j == json(k.type()));
-        }
-
-        SECTION("array")
-        {
-            SECTION("empty array")
-            {
-                json j = json::array();
-                json k = j;
-
-                j.clear();
-                CHECK(j.empty());
-                CHECK(j == json(json::value_t::array));
-                CHECK(j == json(k.type()));
-            }
-
-            SECTION("filled array")
-            {
-                json j = {1, 2, 3};
-                json k = j;
-
-                j.clear();
-                CHECK(j.empty());
-                CHECK(j == json(json::value_t::array));
-                CHECK(j == json(k.type()));
-            }
-        }
-
-        SECTION("object")
-        {
-            SECTION("empty object")
-            {
-                json j = json::object();
-                json k = j;
-
-                j.clear();
-                CHECK(j.empty());
-                CHECK(j == json(json::value_t::object));
-                CHECK(j == json(k.type()));
-            }
-
-            SECTION("filled object")
-            {
-                json j = {{"one", 1}, {"two", 2}, {"three", 3}};
-                json k = j;
-
-                j.clear();
-                CHECK(j.empty());
-                CHECK(j == json(json::value_t::object));
-                CHECK(j == json(k.type()));
-            }
-        }
-
-        SECTION("binary")
-        {
-            SECTION("empty binary")
-            {
-                json j = json::binary({});
-                json k = j;
-
-                j.clear();
-                CHECK(!j.empty());
-                CHECK(j == json(json::value_t::binary));
-                CHECK(j == json(k.type()));
-            }
-
-            SECTION("filled binary")
-            {
-                json j = json::binary({1, 2, 3, 4, 5});
-                json k = j;
-
-                j.clear();
-                CHECK(!j.empty());
-                CHECK(j == json(json::value_t::binary));
-                CHECK(j == json(k.type()));
-            }
-        }
-
-        SECTION("number (integer)")
-        {
-            json j = 23;
-            json k = j;
-
-            j.clear();
-            CHECK(j == json(json::value_t::number_integer));
-            CHECK(j == json(k.type()));
-        }
-
-        SECTION("number (unsigned)")
-        {
-            json j = 23u;
-            json k = j;
-
-            j.clear();
-            CHECK(j == json(json::value_t::number_integer));
-            CHECK(j == json(k.type()));
-        }
-
-        SECTION("number (float)")
-        {
-            json j = 23.42;
-            json k = j;
-
-            j.clear();
-            CHECK(j == json(json::value_t::number_float));
-            CHECK(j == json(k.type()));
-        }
-
-        SECTION("null")
-        {
-            json j = nullptr;
-            json k = j;
-
-            j.clear();
-            CHECK(j == json(json::value_t::null));
-            CHECK(j == json(k.type()));
-        }
-    }
-
-    SECTION("push_back()")
-    {
-        SECTION("to array")
-        {
-            SECTION("json&&")
-            {
-                SECTION("null")
-                {
-                    json j;
-                    j.push_back(1);
-                    j.push_back(2);
-                    CHECK(j.type() == json::value_t::array);
-                    CHECK(j == json({1, 2}));
-                }
-
-                SECTION("array")
-                {
-                    json j = {1, 2, 3};
-                    j.push_back("Hello");
-                    CHECK(j.type() == json::value_t::array);
-                    CHECK(j == json({1, 2, 3, "Hello"}));
-                }
-
-                SECTION("other type")
-                {
-                    json j = 1;
-                    CHECK_THROWS_AS(j.push_back("Hello"), json::type_error&);
-                    CHECK_THROWS_WITH(j.push_back("Hello"), "[json.exception.type_error.308] cannot use push_back() with number");
-                }
-            }
-
-            SECTION("const json&")
-            {
-                SECTION("null")
-                {
-                    json j;
-                    json k(1);
-                    j.push_back(k);
-                    j.push_back(k);
-                    CHECK(j.type() == json::value_t::array);
-                    CHECK(j == json({1, 1}));
-                }
-
-                SECTION("array")
-                {
-                    json j = {1, 2, 3};
-                    json k("Hello");
-                    j.push_back(k);
-                    CHECK(j.type() == json::value_t::array);
-                    CHECK(j == json({1, 2, 3, "Hello"}));
-                }
-
-                SECTION("other type")
-                {
-                    json j = 1;
-                    json k("Hello");
-                    CHECK_THROWS_AS(j.push_back(k), json::type_error&);
-                    CHECK_THROWS_WITH(j.push_back(k), "[json.exception.type_error.308] cannot use push_back() with number");
-                }
-            }
-        }
-
-        SECTION("to object")
-        {
-            SECTION("null")
-            {
-                json j;
-                j.push_back(json::object_t::value_type({"one", 1}));
-                j.push_back(json::object_t::value_type({"two", 2}));
-                CHECK(j.type() == json::value_t::object);
-                CHECK(j.size() == 2);
-                CHECK(j["one"] == json(1));
-                CHECK(j["two"] == json(2));
-            }
-
-            SECTION("object")
-            {
-                json j(json::value_t::object);
-                j.push_back(json::object_t::value_type({"one", 1}));
-                j.push_back(json::object_t::value_type({"two", 2}));
-                CHECK(j.size() == 2);
-                CHECK(j["one"] == json(1));
-                CHECK(j["two"] == json(2));
-            }
-
-            SECTION("other type")
-            {
-                json j = 1;
-                json k("Hello");
-                CHECK_THROWS_AS(j.push_back(json::object_t::value_type({"one", 1})), json::type_error&);
-                CHECK_THROWS_WITH(j.push_back(json::object_t::value_type({"one", 1})),
-                                  "[json.exception.type_error.308] cannot use push_back() with number");
-            }
-        }
-
-        SECTION("with initializer_list")
-        {
-            SECTION("null")
-            {
-                json j;
-                j.push_back({"foo", "bar"});
-                CHECK(j == json::array({{"foo", "bar"}}));
-
-                json k;
-                k.push_back({1, 2, 3});
-                CHECK(k == json::array({{1, 2, 3}}));
-            }
-
-            SECTION("array")
-            {
-                json j = {1, 2, 3};
-                j.push_back({"foo", "bar"});
-                CHECK(j == json({1, 2, 3, {"foo", "bar"}}));
-
-                json k = {1, 2, 3};
-                k.push_back({1, 2, 3});
-                CHECK(k == json({1, 2, 3, {1, 2, 3}}));
-            }
-
-            SECTION("object")
-            {
-                json j = {{"key1", 1}};
-                j.push_back({"key2", "bar"});
-                CHECK(j == json({{"key1", 1}, {"key2", "bar"}}));
-
-                // invalid values (no string/val pair)
-                CHECK_THROWS_AS(j.push_back({1}), json::type_error&);
-                CHECK_THROWS_WITH(j.push_back({1}), "[json.exception.type_error.308] cannot use push_back() with object");
-                CHECK_THROWS_AS(j.push_back({1, 2}), json::type_error&);
-                CHECK_THROWS_WITH(j.push_back({1, 2}), "[json.exception.type_error.308] cannot use push_back() with object");
-                CHECK_THROWS_AS(j.push_back({1, 2, 3, 4}), json::type_error&);
-                CHECK_THROWS_WITH(j.push_back({1, 2, 3, 4}), "[json.exception.type_error.308] cannot use push_back() with object");
-            }
-        }
-    }
-
-    SECTION("emplace_back()")
-    {
-        SECTION("to array")
-        {
-            SECTION("null")
-            {
-                json j;
-                auto& x1 = j.emplace_back(1);
-                CHECK(x1 == 1);
-                auto& x2 = j.emplace_back(2);
-                CHECK(x2 == 2);
-                CHECK(j.type() == json::value_t::array);
-                CHECK(j == json({1, 2}));
-            }
-
-            SECTION("array")
-            {
-                json j = {1, 2, 3};
-                auto& x = j.emplace_back("Hello");
-                CHECK(x == "Hello");
-                CHECK(j.type() == json::value_t::array);
-                CHECK(j == json({1, 2, 3, "Hello"}));
-            }
-
-            SECTION("multiple values")
-            {
-                json j;
-                auto& x = j.emplace_back(3, "foo");
-                CHECK(x == json({"foo", "foo", "foo"}));
-                CHECK(j.type() == json::value_t::array);
-                CHECK(j == json({{"foo", "foo", "foo"}}));
-            }
-        }
-
-        SECTION("other type")
-        {
-            json j = 1;
-            CHECK_THROWS_AS(j.emplace_back("Hello"), json::type_error&);
-            CHECK_THROWS_WITH(j.emplace_back("Hello"),
-                              "[json.exception.type_error.311] cannot use emplace_back() with number");
-        }
-    }
-
-    SECTION("emplace()")
-    {
-        SECTION("to object")
-        {
-            SECTION("null")
-            {
-                // start with a null value
-                json j;
-
-                // add a new key
-                auto res1 = j.emplace("foo", "bar");
-                CHECK(res1.second == true);
-                CHECK(*res1.first == "bar");
-
-                // the null value is changed to an object
-                CHECK(j.type() == json::value_t::object);
-
-                // add a new key
-                auto res2 = j.emplace("baz", "bam");
-                CHECK(res2.second == true);
-                CHECK(*res2.first == "bam");
-
-                // we try to insert at given key - no change
-                auto res3 = j.emplace("baz", "bad");
-                CHECK(res3.second == false);
-                CHECK(*res3.first == "bam");
-
-                // the final object
-                CHECK(j == json({{"baz", "bam"}, {"foo", "bar"}}));
-            }
-
-            SECTION("object")
-            {
-                // start with an object
-                json j = {{"foo", "bar"}};
-
-                // add a new key
-                auto res1 = j.emplace("baz", "bam");
-                CHECK(res1.second == true);
-                CHECK(*res1.first == "bam");
-
-                // add an existing key
-                auto res2 = j.emplace("foo", "bad");
-                CHECK(res2.second == false);
-                CHECK(*res2.first == "bar");
-
-                // check final object
-                CHECK(j == json({{"baz", "bam"}, {"foo", "bar"}}));
-            }
-        }
-
-        SECTION("other type")
-        {
-            json j = 1;
-            CHECK_THROWS_AS(j.emplace("foo", "bar"), json::type_error&);
-            CHECK_THROWS_WITH(j.emplace("foo", "bar"),
-                              "[json.exception.type_error.311] cannot use emplace() with number");
-        }
-    }
-
-    SECTION("operator+=")
-    {
-        SECTION("to array")
-        {
-            SECTION("json&&")
-            {
-                SECTION("null")
-                {
-                    json j;
-                    j += 1;
-                    j += 2;
-                    CHECK(j.type() == json::value_t::array);
-                    CHECK(j == json({1, 2}));
-                }
-
-                SECTION("array")
-                {
-                    json j = {1, 2, 3};
-                    j += "Hello";
-                    CHECK(j.type() == json::value_t::array);
-                    CHECK(j == json({1, 2, 3, "Hello"}));
-                }
-
-                SECTION("other type")
-                {
-                    json j = 1;
-                    CHECK_THROWS_AS(j += "Hello", json::type_error&);
-                    CHECK_THROWS_WITH(j += "Hello", "[json.exception.type_error.308] cannot use push_back() with number");
-                }
-            }
-
-            SECTION("const json&")
-            {
-                SECTION("null")
-                {
-                    json j;
-                    json k(1);
-                    j += k;
-                    j += k;
-                    CHECK(j.type() == json::value_t::array);
-                    CHECK(j == json({1, 1}));
-                }
-
-                SECTION("array")
-                {
-                    json j = {1, 2, 3};
-                    json k("Hello");
-                    j += k;
-                    CHECK(j.type() == json::value_t::array);
-                    CHECK(j == json({1, 2, 3, "Hello"}));
-                }
-
-                SECTION("other type")
-                {
-                    json j = 1;
-                    json k("Hello");
-                    CHECK_THROWS_AS(j += k, json::type_error&);
-                    CHECK_THROWS_WITH(j += k, "[json.exception.type_error.308] cannot use push_back() with number");
-                }
-            }
-        }
-
-        SECTION("to object")
-        {
-            SECTION("null")
-            {
-                json j;
-                j += json::object_t::value_type({"one", 1});
-                j += json::object_t::value_type({"two", 2});
-                CHECK(j.type() == json::value_t::object);
-                CHECK(j.size() == 2);
-                CHECK(j["one"] == json(1));
-                CHECK(j["two"] == json(2));
-            }
-
-            SECTION("object")
-            {
-                json j(json::value_t::object);
-                j += json::object_t::value_type({"one", 1});
-                j += json::object_t::value_type({"two", 2});
-                CHECK(j.size() == 2);
-                CHECK(j["one"] == json(1));
-                CHECK(j["two"] == json(2));
-            }
-
-            SECTION("other type")
-            {
-                json j = 1;
-                json k("Hello");
-                CHECK_THROWS_AS(j += json::object_t::value_type({"one", 1}), json::type_error&);
-                CHECK_THROWS_WITH(j += json::object_t::value_type({"one", 1}),
-                                  "[json.exception.type_error.308] cannot use push_back() with number");
-            }
-        }
-
-        SECTION("with initializer_list")
-        {
-            SECTION("null")
-            {
-                json j;
-                j += {"foo", "bar"};
-                CHECK(j == json::array({{"foo", "bar"}}));
-
-                json k;
-                k += {1, 2, 3};
-                CHECK(k == json::array({{1, 2, 3}}));
-            }
-
-            SECTION("array")
-            {
-                json j = {1, 2, 3};
-                j += {"foo", "bar"};
-                CHECK(j == json({1, 2, 3, {"foo", "bar"}}));
-
-                json k = {1, 2, 3};
-                k += {1, 2, 3};
-                CHECK(k == json({1, 2, 3, {1, 2, 3}}));
-            }
-
-            SECTION("object")
-            {
-                json j = {{"key1", 1}};
-                j += {"key2", "bar"};
-                CHECK(j == json({{"key1", 1}, {"key2", "bar"}}));
-
-                json k = {{"key1", 1}};
-                CHECK_THROWS_AS((k += {1, 2, 3, 4}), json::type_error&);
-                CHECK_THROWS_WITH((k += {1, 2, 3, 4}), "[json.exception.type_error.308] cannot use push_back() with object");
-            }
-        }
-    }
-
-    SECTION("insert()")
-    {
-        json j_array = {1, 2, 3, 4};
-        json j_value = 5;
-
-        SECTION("value at position")
-        {
-            SECTION("insert before begin()")
-            {
-                auto it = j_array.insert(j_array.begin(), j_value);
-                CHECK(j_array.size() == 5);
-                CHECK(*it == j_value);
-                CHECK(j_array.begin() == it);
-                CHECK(j_array == json({5, 1, 2, 3, 4}));
-            }
-
-            SECTION("insert in the middle")
-            {
-                auto it = j_array.insert(j_array.begin() + 2, j_value);
-                CHECK(j_array.size() == 5);
-                CHECK(*it == j_value);
-                CHECK((it - j_array.begin()) == 2);
-                CHECK(j_array == json({1, 2, 5, 3, 4}));
-            }
-
-            SECTION("insert before end()")
-            {
-                auto it = j_array.insert(j_array.end(), j_value);
-                CHECK(j_array.size() == 5);
-                CHECK(*it == j_value);
-                CHECK((j_array.end() - it) == 1);
-                CHECK(j_array == json({1, 2, 3, 4, 5}));
-            }
-        }
-
-        SECTION("rvalue at position")
-        {
-            SECTION("insert before begin()")
-            {
-                auto it = j_array.insert(j_array.begin(), 5);
-                CHECK(j_array.size() == 5);
-                CHECK(*it == j_value);
-                CHECK(j_array.begin() == it);
-                CHECK(j_array == json({5, 1, 2, 3, 4}));
-            }
-
-            SECTION("insert in the middle")
-            {
-                auto it = j_array.insert(j_array.begin() + 2, 5);
-                CHECK(j_array.size() == 5);
-                CHECK(*it == j_value);
-                CHECK((it - j_array.begin()) == 2);
-                CHECK(j_array == json({1, 2, 5, 3, 4}));
-            }
-
-            SECTION("insert before end()")
-            {
-                auto it = j_array.insert(j_array.end(), 5);
-                CHECK(j_array.size() == 5);
-                CHECK(*it == j_value);
-                CHECK((j_array.end() - it) == 1);
-                CHECK(j_array == json({1, 2, 3, 4, 5}));
-            }
-        }
-
-        SECTION("copies at position")
-        {
-            SECTION("insert before begin()")
-            {
-                auto it = j_array.insert(j_array.begin(), 3, 5);
-                CHECK(j_array.size() == 7);
-                CHECK(*it == j_value);
-                CHECK(j_array.begin() == it);
-                CHECK(j_array == json({5, 5, 5, 1, 2, 3, 4}));
-            }
-
-            SECTION("insert in the middle")
-            {
-                auto it = j_array.insert(j_array.begin() + 2, 3, 5);
-                CHECK(j_array.size() == 7);
-                CHECK(*it == j_value);
-                CHECK((it - j_array.begin()) == 2);
-                CHECK(j_array == json({1, 2, 5, 5, 5, 3, 4}));
-            }
-
-            SECTION("insert before end()")
-            {
-                auto it = j_array.insert(j_array.end(), 3, 5);
-                CHECK(j_array.size() == 7);
-                CHECK(*it == j_value);
-                CHECK((j_array.end() - it) == 3);
-                CHECK(j_array == json({1, 2, 3, 4, 5, 5, 5}));
-            }
-
-            SECTION("insert nothing (count = 0)")
-            {
-                auto it = j_array.insert(j_array.end(), 0, 5);
-                CHECK(j_array.size() == 4);
-                // the returned iterator points to the first inserted element;
-                // there were 4 elements, so it should point to the 5th
-                CHECK(it == j_array.begin() + 4);
-                CHECK(j_array == json({1, 2, 3, 4}));
-            }
-        }
-
-        SECTION("range for array")
-        {
-            json j_other_array = {"first", "second"};
-
-            SECTION("proper usage")
-            {
-                auto it = j_array.insert(j_array.end(), j_other_array.begin(), j_other_array.end());
-                CHECK(j_array.size() == 6);
-                CHECK(*it == *j_other_array.begin());
-                CHECK((j_array.end() - it) == 2);
-                CHECK(j_array == json({1, 2, 3, 4, "first", "second"}));
-            }
-
-            SECTION("empty range")
-            {
-                auto it = j_array.insert(j_array.end(), j_other_array.begin(), j_other_array.begin());
-                CHECK(j_array.size() == 4);
-                CHECK(it == j_array.end());
-                CHECK(j_array == json({1, 2, 3, 4}));
-            }
-
-            SECTION("invalid iterators")
-            {
-                json j_other_array2 = {"first", "second"};
-
-                CHECK_THROWS_AS(j_array.insert(j_array.end(), j_array.begin(), j_array.end()),
-                                json::invalid_iterator&);
-                CHECK_THROWS_AS(j_array.insert(j_array.end(), j_other_array.begin(), j_other_array2.end()),
-                                json::invalid_iterator&);
-
-                CHECK_THROWS_WITH(j_array.insert(j_array.end(), j_array.begin(), j_array.end()),
-                                  "[json.exception.invalid_iterator.211] passed iterators may not belong to container");
-                CHECK_THROWS_WITH(j_array.insert(j_array.end(), j_other_array.begin(), j_other_array2.end()),
-                                  "[json.exception.invalid_iterator.210] iterators do not fit");
-            }
-        }
-
-        SECTION("range for object")
-        {
-            json j_object1 = {{"one", "eins"}, {"two", "zwei"}};
-            json j_object2 = {{"eleven", "elf"}, {"seventeen", "siebzehn"}};
-
-            SECTION("proper usage")
-            {
-                j_object1.insert(j_object2.begin(), j_object2.end());
-                CHECK(j_object1.size() == 4);
-            }
-
-            SECTION("empty range")
-            {
-                j_object1.insert(j_object2.begin(), j_object2.begin());
-                CHECK(j_object1.size() == 2);
-            }
-
-            SECTION("invalid iterators")
-            {
-                json j_other_array2 = {"first", "second"};
-
-                CHECK_THROWS_AS(j_array.insert(j_object2.begin(), j_object2.end()), json::type_error&);
-                CHECK_THROWS_AS(j_object1.insert(j_object1.begin(), j_object2.end()), json::invalid_iterator&);
-                CHECK_THROWS_AS(j_object1.insert(j_array.begin(), j_array.end()), json::invalid_iterator&);
-
-                CHECK_THROWS_WITH(j_array.insert(j_object2.begin(), j_object2.end()),
-                                  "[json.exception.type_error.309] cannot use insert() with array");
-                CHECK_THROWS_WITH(j_object1.insert(j_object1.begin(), j_object2.end()),
-                                  "[json.exception.invalid_iterator.210] iterators do not fit");
-                CHECK_THROWS_WITH(j_object1.insert(j_array.begin(), j_array.end()),
-                                  "[json.exception.invalid_iterator.202] iterators first and last must point to objects");
-            }
-        }
-
-        SECTION("initializer list at position")
-        {
-            SECTION("insert before begin()")
-            {
-                auto it = j_array.insert(j_array.begin(), {7, 8, 9});
-                CHECK(j_array.size() == 7);
-                CHECK(*it == json(7));
-                CHECK(j_array.begin() == it);
-                CHECK(j_array == json({7, 8, 9, 1, 2, 3, 4}));
-            }
-
-            SECTION("insert in the middle")
-            {
-                auto it = j_array.insert(j_array.begin() + 2, {7, 8, 9});
-                CHECK(j_array.size() == 7);
-                CHECK(*it == json(7));
-                CHECK((it - j_array.begin()) == 2);
-                CHECK(j_array == json({1, 2, 7, 8, 9, 3, 4}));
-            }
-
-            SECTION("insert before end()")
-            {
-                auto it = j_array.insert(j_array.end(), {7, 8, 9});
-                CHECK(j_array.size() == 7);
-                CHECK(*it == json(7));
-                CHECK((j_array.end() - it) == 3);
-                CHECK(j_array == json({1, 2, 3, 4, 7, 8, 9}));
-            }
-        }
-
-        SECTION("invalid iterator")
-        {
-            // pass iterator to a different array
-            json j_another_array = {1, 2};
-            json j_yet_another_array = {"first", "second"};
-            CHECK_THROWS_AS(j_array.insert(j_another_array.end(), 10), json::invalid_iterator&);
-            CHECK_THROWS_AS(j_array.insert(j_another_array.end(), j_value), json::invalid_iterator&);
-            CHECK_THROWS_AS(j_array.insert(j_another_array.end(), 10, 11), json::invalid_iterator&);
-            CHECK_THROWS_AS(j_array.insert(j_another_array.end(), j_yet_another_array.begin(), j_yet_another_array.end()), json::invalid_iterator&);
-            CHECK_THROWS_AS(j_array.insert(j_another_array.end(), {1, 2, 3, 4}), json::invalid_iterator&);
-
-            CHECK_THROWS_WITH(j_array.insert(j_another_array.end(), 10),
-                              "[json.exception.invalid_iterator.202] iterator does not fit current value");
-            CHECK_THROWS_WITH(j_array.insert(j_another_array.end(), j_value),
-                              "[json.exception.invalid_iterator.202] iterator does not fit current value");
-            CHECK_THROWS_WITH(j_array.insert(j_another_array.end(), 10, 11),
-                              "[json.exception.invalid_iterator.202] iterator does not fit current value");
-            CHECK_THROWS_WITH(j_array.insert(j_another_array.end(), j_yet_another_array.begin(), j_yet_another_array.end()),
-                              "[json.exception.invalid_iterator.202] iterator does not fit current value");
-            CHECK_THROWS_WITH(j_array.insert(j_another_array.end(), {1, 2, 3, 4}),
-                              "[json.exception.invalid_iterator.202] iterator does not fit current value");
-        }
-
-        SECTION("non-array type")
-        {
-            // call insert on a non-array type
-            json j_nonarray = 3;
-            json j_yet_another_array = {"first", "second"};
-            CHECK_THROWS_AS(j_nonarray.insert(j_nonarray.end(), 10), json::type_error&);
-            CHECK_THROWS_AS(j_nonarray.insert(j_nonarray.end(), j_value), json::type_error&);
-            CHECK_THROWS_AS(j_nonarray.insert(j_nonarray.end(), 10, 11), json::type_error&);
-            CHECK_THROWS_AS(j_nonarray.insert(j_nonarray.end(), j_yet_another_array.begin(),
-                                              j_yet_another_array.end()), json::type_error&);
-            CHECK_THROWS_AS(j_nonarray.insert(j_nonarray.end(), {1, 2, 3, 4}), json::type_error&);
-
-            CHECK_THROWS_WITH(j_nonarray.insert(j_nonarray.end(), 10), "[json.exception.type_error.309] cannot use insert() with number");
-            CHECK_THROWS_WITH(j_nonarray.insert(j_nonarray.end(), j_value), "[json.exception.type_error.309] cannot use insert() with number");
-            CHECK_THROWS_WITH(j_nonarray.insert(j_nonarray.end(), 10, 11), "[json.exception.type_error.309] cannot use insert() with number");
-            CHECK_THROWS_WITH(j_nonarray.insert(j_nonarray.end(), j_yet_another_array.begin(),
-                                                j_yet_another_array.end()), "[json.exception.type_error.309] cannot use insert() with number");
-            CHECK_THROWS_WITH(j_nonarray.insert(j_nonarray.end(), {1, 2, 3, 4}),
-                              "[json.exception.type_error.309] cannot use insert() with number");
-        }
-    }
-
-    SECTION("update()")
-    {
-        json j_object1 = {{"one", "eins"}, {"two", "zwei"}};
-        json j_object2 = {{"three", "drei"}, {"two", "zwo"}};
-        json j_array = {1, 2, 3, 4};
-
-        SECTION("const reference")
-        {
-            SECTION("proper usage")
-            {
-                j_object1.update(j_object2);
-                CHECK(j_object1 == json({{"one", "eins"}, {"two", "zwo"}, {"three", "drei"}}));
-
-                json j_null;
-                j_null.update(j_object2);
-                CHECK(j_null == j_object2);
-            }
-
-            SECTION("wrong types")
-            {
-                CHECK_THROWS_AS(j_array.update(j_object1), json::type_error&);
-                CHECK_THROWS_WITH(j_array.update(j_object1), "[json.exception.type_error.312] cannot use update() with array");
-
-                CHECK_THROWS_AS(j_object1.update(j_array), json::type_error&);
-                CHECK_THROWS_WITH(j_object1.update(j_array), "[json.exception.type_error.312] cannot use update() with array");
-            }
-        }
-
-        SECTION("iterator range")
-        {
-            SECTION("proper usage")
-            {
-                j_object1.update(j_object2.begin(), j_object2.end());
-                CHECK(j_object1 == json({{"one", "eins"}, {"two", "zwo"}, {"three", "drei"}}));
-
-                json j_null;
-                j_null.update(j_object2.begin(), j_object2.end());
-                CHECK(j_null == j_object2);
-            }
-
-            SECTION("empty range")
-            {
-                j_object1.update(j_object2.begin(), j_object2.begin());
-                CHECK(j_object1 == json({{"one", "eins"}, {"two", "zwei"}}));
-            }
-
-            SECTION("invalid iterators")
-            {
-                json j_other_array2 = {"first", "second"};
-
-                CHECK_THROWS_AS(j_array.update(j_object2.begin(), j_object2.end()), json::type_error&);
-                CHECK_THROWS_AS(j_object1.update(j_object1.begin(), j_object2.end()), json::invalid_iterator&);
-                CHECK_THROWS_AS(j_object1.update(j_array.begin(), j_array.end()), json::invalid_iterator&);
-
-                CHECK_THROWS_WITH(j_array.update(j_object2.begin(), j_object2.end()),
-                                  "[json.exception.type_error.312] cannot use update() with array");
-                CHECK_THROWS_WITH(j_object1.update(j_object1.begin(), j_object2.end()),
-                                  "[json.exception.invalid_iterator.210] iterators do not fit");
-                CHECK_THROWS_WITH(j_object1.update(j_array.begin(), j_array.end()),
-                                  "[json.exception.invalid_iterator.202] iterators first and last must point to objects");
-            }
-        }
-    }
-
-    SECTION("swap()")
-    {
-        SECTION("json")
-        {
-            SECTION("member swap")
-            {
-                json j("hello world");
-                json k(42.23);
-
-                j.swap(k);
-
-                CHECK(j == json(42.23));
-                CHECK(k == json("hello world"));
-            }
-
-            SECTION("nonmember swap")
-            {
-                json j("hello world");
-                json k(42.23);
-
-                using std::swap;
-                swap(j, k);
-
-                CHECK(j == json(42.23));
-                CHECK(k == json("hello world"));
-            }
-        }
-
-        SECTION("array_t")
-        {
-            SECTION("array_t type")
-            {
-                json j = {1, 2, 3, 4};
-                json::array_t a = {"foo", "bar", "baz"};
-
-                j.swap(a);
-
-                CHECK(j == json({"foo", "bar", "baz"}));
-
-                j.swap(a);
-
-                CHECK(j == json({1, 2, 3, 4}));
-            }
-
-            SECTION("non-array_t type")
-            {
-                json j = 17;
-                json::array_t a = {"foo", "bar", "baz"};
-
-                CHECK_THROWS_AS(j.swap(a), json::type_error&);
-                CHECK_THROWS_WITH(j.swap(a), "[json.exception.type_error.310] cannot use swap() with number");
-            }
-        }
-
-        SECTION("object_t")
-        {
-            SECTION("object_t type")
-            {
-                json j = {{"one", 1}, {"two", 2}};
-                json::object_t o = {{"cow", "Kuh"}, {"chicken", "Huhn"}};
-
-                j.swap(o);
-
-                CHECK(j == json({{"cow", "Kuh"}, {"chicken", "Huhn"}}));
-
-                j.swap(o);
-
-                CHECK(j == json({{"one", 1}, {"two", 2}}));
-            }
-
-            SECTION("non-object_t type")
-            {
-                json j = 17;
-                json::object_t o = {{"cow", "Kuh"}, {"chicken", "Huhn"}};
-
-                CHECK_THROWS_AS(j.swap(o), json::type_error&);
-                CHECK_THROWS_WITH(j.swap(o), "[json.exception.type_error.310] cannot use swap() with number");
-            }
-        }
-
-        SECTION("string_t")
-        {
-            SECTION("string_t type")
-            {
-                json j = "Hello world";
-                json::string_t s = "Hallo Welt";
-
-                j.swap(s);
-
-                CHECK(j == json("Hallo Welt"));
-
-                j.swap(s);
-
-                CHECK(j == json("Hello world"));
-            }
-
-            SECTION("non-string_t type")
-            {
-                json j = 17;
-                json::string_t s = "Hallo Welt";
-
-                CHECK_THROWS_AS(j.swap(s), json::type_error&);
-                CHECK_THROWS_WITH(j.swap(s), "[json.exception.type_error.310] cannot use swap() with number");
-            }
-        }
-
-        SECTION("binary_t")
-        {
-            SECTION("binary_t type")
-            {
-                json j = json::binary({1, 2, 3, 4});
-                json::binary_t s = {{5, 6, 7, 8}};
-
-                j.swap(s);
-
-                CHECK(j == json::binary({5, 6, 7, 8}));
-
-                j.swap(s);
-
-                CHECK(j == json::binary({1, 2, 3, 4}));
-            }
-
-            SECTION("binary_t::container_type type")
-            {
-                json j = json::binary({1, 2, 3, 4});
-                std::vector<std::uint8_t> s = {{5, 6, 7, 8}};
-
-                j.swap(s);
-
-                CHECK(j == json::binary({5, 6, 7, 8}));
-
-                j.swap(s);
-
-                CHECK(j == json::binary({1, 2, 3, 4}));
-            }
-
-            SECTION("non-binary_t type")
-            {
-                json j = 17;
-                json::binary_t s1 = {{1, 2, 3, 4}};
-                std::vector<std::uint8_t> s2 = {{5, 6, 7, 8}};
-
-                CHECK_THROWS_WITH_AS(j.swap(s1), "[json.exception.type_error.310] cannot use swap() with number", json::type_error);
-                CHECK_THROWS_WITH_AS(j.swap(s2), "[json.exception.type_error.310] cannot use swap() with number", json::type_error);
-            }
-        }
-    }
-}
diff --git a/external_imported/json/test/src/unit-msgpack.cpp b/external_imported/json/test/src/unit-msgpack.cpp
deleted file mode 100644
index e49a4203c..000000000
--- a/external_imported/json/test/src/unit-msgpack.cpp
+++ /dev/null
@@ -1,1885 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include "doctest_compatibility.h"
-
-#include <nlohmann/json.hpp>
-using nlohmann::json;
-
-#include <fstream>
-#include <sstream>
-#include <iomanip>
-#include <set>
-#include <test_data.hpp>
-#include "test_utils.hpp"
-
-namespace
-{
-class SaxCountdown
-{
-  public:
-    explicit SaxCountdown(const int count) : events_left(count)
-    {}
-
-    bool null()
-    {
-        return events_left-- > 0;
-    }
-
-    bool boolean(bool)
-    {
-        return events_left-- > 0;
-    }
-
-    bool number_integer(json::number_integer_t)
-    {
-        return events_left-- > 0;
-    }
-
-    bool number_unsigned(json::number_unsigned_t)
-    {
-        return events_left-- > 0;
-    }
-
-    bool number_float(json::number_float_t, const std::string&)
-    {
-        return events_left-- > 0;
-    }
-
-    bool string(std::string&)
-    {
-        return events_left-- > 0;
-    }
-
-    bool binary(std::vector<std::uint8_t>&)
-    {
-        return events_left-- > 0;
-    }
-
-    bool start_object(std::size_t)
-    {
-        return events_left-- > 0;
-    }
-
-    bool key(std::string&)
-    {
-        return events_left-- > 0;
-    }
-
-    bool end_object()
-    {
-        return events_left-- > 0;
-    }
-
-    bool start_array(std::size_t)
-    {
-        return events_left-- > 0;
-    }
-
-    bool end_array()
-    {
-        return events_left-- > 0;
-    }
-
-    bool parse_error(std::size_t, const std::string&, const json::exception&)
-    {
-        return false;
-    }
-
-  private:
-    int events_left = 0;
-};
-}
-
-TEST_CASE("MessagePack")
-{
-    SECTION("individual values")
-    {
-        SECTION("discarded")
-        {
-            // discarded values are not serialized
-            json j = json::value_t::discarded;
-            const auto result = json::to_msgpack(j);
-            CHECK(result.empty());
-        }
-
-        SECTION("null")
-        {
-            json j = nullptr;
-            std::vector<uint8_t> expected = {0xc0};
-            const auto result = json::to_msgpack(j);
-            CHECK(result == expected);
-
-            // roundtrip
-            CHECK(json::from_msgpack(result) == j);
-            CHECK(json::from_msgpack(result, true, false) == j);
-        }
-
-        SECTION("boolean")
-        {
-            SECTION("true")
-            {
-                json j = true;
-                std::vector<uint8_t> expected = {0xc3};
-                const auto result = json::to_msgpack(j);
-                CHECK(result == expected);
-
-                // roundtrip
-                CHECK(json::from_msgpack(result) == j);
-                CHECK(json::from_msgpack(result, true, false) == j);
-            }
-
-            SECTION("false")
-            {
-                json j = false;
-                std::vector<uint8_t> expected = {0xc2};
-                const auto result = json::to_msgpack(j);
-                CHECK(result == expected);
-
-                // roundtrip
-                CHECK(json::from_msgpack(result) == j);
-                CHECK(json::from_msgpack(result, true, false) == j);
-            }
-        }
-
-        SECTION("number")
-        {
-            SECTION("signed")
-            {
-                SECTION("-32..-1 (negative fixnum)")
-                {
-                    for (auto i = -32; i <= -1; ++i)
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with integer number
-                        json j = i;
-
-                        // check type
-                        CHECK(j.is_number_integer());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back(static_cast<uint8_t>(i));
-
-                        // compare result + size
-                        const auto result = json::to_msgpack(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 1);
-
-                        // check individual bytes
-                        CHECK(static_cast<int8_t>(result[0]) == i);
-
-                        // roundtrip
-                        CHECK(json::from_msgpack(result) == j);
-                        CHECK(json::from_msgpack(result, true, false) == j);
-                    }
-                }
-
-                SECTION("0..127 (positive fixnum)")
-                {
-                    for (size_t i = 0; i <= 127; ++i)
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with integer number
-                        json j = -1;
-                        j.get_ref<json::number_integer_t&>() = static_cast<json::number_integer_t>(i);
-
-                        // check type
-                        CHECK(j.is_number_integer());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back(static_cast<uint8_t>(i));
-
-                        // compare result + size
-                        const auto result = json::to_msgpack(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 1);
-
-                        // check individual bytes
-                        CHECK(result[0] == i);
-
-                        // roundtrip
-                        CHECK(json::from_msgpack(result) == j);
-                        CHECK(json::from_msgpack(result, true, false) == j);
-                    }
-                }
-
-                SECTION("128..255 (int 8)")
-                {
-                    for (size_t i = 128; i <= 255; ++i)
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with integer number
-                        json j = -1;
-                        j.get_ref<json::number_integer_t&>() = static_cast<json::number_integer_t>(i);
-
-                        // check type
-                        CHECK(j.is_number_integer());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back(0xcc);
-                        expected.push_back(static_cast<uint8_t>(i));
-
-                        // compare result + size
-                        const auto result = json::to_msgpack(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 2);
-
-                        // check individual bytes
-                        CHECK(result[0] == 0xcc);
-                        uint8_t restored = static_cast<uint8_t>(result[1]);
-                        CHECK(restored == i);
-
-                        // roundtrip
-                        CHECK(json::from_msgpack(result) == j);
-                        CHECK(json::from_msgpack(result, true, false) == j);
-                    }
-                }
-
-                SECTION("256..65535 (int 16)")
-                {
-                    for (size_t i = 256; i <= 65535; ++i)
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with integer number
-                        json j = -1;
-                        j.get_ref<json::number_integer_t&>() = static_cast<json::number_integer_t>(i);
-
-                        // check type
-                        CHECK(j.is_number_integer());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back(0xcd);
-                        expected.push_back(static_cast<uint8_t>((i >> 8) & 0xff));
-                        expected.push_back(static_cast<uint8_t>(i & 0xff));
-
-                        // compare result + size
-                        const auto result = json::to_msgpack(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 3);
-
-                        // check individual bytes
-                        CHECK(result[0] == 0xcd);
-                        uint16_t restored = static_cast<uint16_t>(static_cast<uint8_t>(result[1]) * 256 + static_cast<uint8_t>(result[2]));
-                        CHECK(restored == i);
-
-                        // roundtrip
-                        CHECK(json::from_msgpack(result) == j);
-                        CHECK(json::from_msgpack(result, true, false) == j);
-                    }
-                }
-
-                SECTION("65536..4294967295 (int 32)")
-                {
-                    for (uint32_t i :
-                            {
-                                65536u, 77777u, 1048576u, 4294967295u
-                            })
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with integer number
-                        json j = -1;
-                        j.get_ref<json::number_integer_t&>() = static_cast<json::number_integer_t>(i);
-
-                        // check type
-                        CHECK(j.is_number_integer());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back(0xce);
-                        expected.push_back(static_cast<uint8_t>((i >> 24) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 16) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 8) & 0xff));
-                        expected.push_back(static_cast<uint8_t>(i & 0xff));
-
-                        // compare result + size
-                        const auto result = json::to_msgpack(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 5);
-
-                        // check individual bytes
-                        CHECK(result[0] == 0xce);
-                        uint32_t restored = (static_cast<uint32_t>(result[1]) << 030) +
-                                            (static_cast<uint32_t>(result[2]) << 020) +
-                                            (static_cast<uint32_t>(result[3]) << 010) +
-                                            static_cast<uint32_t>(result[4]);
-                        CHECK(restored == i);
-
-                        // roundtrip
-                        CHECK(json::from_msgpack(result) == j);
-                        CHECK(json::from_msgpack(result, true, false) == j);
-                    }
-                }
-
-                SECTION("4294967296..9223372036854775807 (int 64)")
-                {
-                    for (uint64_t i :
-                            {
-                                4294967296lu, 9223372036854775807lu
-                            })
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with integer number
-                        json j = -1;
-                        j.get_ref<json::number_integer_t&>() = static_cast<json::number_integer_t>(i);
-
-                        // check type
-                        CHECK(j.is_number_integer());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back(0xcf);
-                        expected.push_back(static_cast<uint8_t>((i >> 070) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 060) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 050) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 040) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 030) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 020) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 010) & 0xff));
-                        expected.push_back(static_cast<uint8_t>(i & 0xff));
-
-                        // compare result + size
-                        const auto result = json::to_msgpack(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 9);
-
-                        // check individual bytes
-                        CHECK(result[0] == 0xcf);
-                        uint64_t restored = (static_cast<uint64_t>(result[1]) << 070) +
-                                            (static_cast<uint64_t>(result[2]) << 060) +
-                                            (static_cast<uint64_t>(result[3]) << 050) +
-                                            (static_cast<uint64_t>(result[4]) << 040) +
-                                            (static_cast<uint64_t>(result[5]) << 030) +
-                                            (static_cast<uint64_t>(result[6]) << 020) +
-                                            (static_cast<uint64_t>(result[7]) << 010) +
-                                            static_cast<uint64_t>(result[8]);
-                        CHECK(restored == i);
-
-                        // roundtrip
-                        CHECK(json::from_msgpack(result) == j);
-                        CHECK(json::from_msgpack(result, true, false) == j);
-                    }
-                }
-
-                SECTION("-128..-33 (int 8)")
-                {
-                    for (auto i = -128; i <= -33; ++i)
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with integer number
-                        json j = i;
-
-                        // check type
-                        CHECK(j.is_number_integer());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back(0xd0);
-                        expected.push_back(static_cast<uint8_t>(i));
-
-                        // compare result + size
-                        const auto result = json::to_msgpack(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 2);
-
-                        // check individual bytes
-                        CHECK(result[0] == 0xd0);
-                        CHECK(static_cast<int8_t>(result[1]) == i);
-
-                        // roundtrip
-                        CHECK(json::from_msgpack(result) == j);
-                        CHECK(json::from_msgpack(result, true, false) == j);
-                    }
-                }
-
-                SECTION("-9263 (int 16)")
-                {
-                    json j = -9263;
-                    std::vector<uint8_t> expected = {0xd1, 0xdb, 0xd1};
-
-                    const auto result = json::to_msgpack(j);
-                    CHECK(result == expected);
-
-                    int16_t restored = static_cast<int16_t>((result[1] << 8) + result[2]);
-                    CHECK(restored == -9263);
-
-                    // roundtrip
-                    CHECK(json::from_msgpack(result) == j);
-                    CHECK(json::from_msgpack(result, true, false) == j);
-                }
-
-                SECTION("-32768..-129 (int 16)")
-                {
-                    for (int16_t i = -32768; i <= -129; ++i)
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with integer number
-                        json j = i;
-
-                        // check type
-                        CHECK(j.is_number_integer());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back(0xd1);
-                        expected.push_back(static_cast<uint8_t>((i >> 8) & 0xff));
-                        expected.push_back(static_cast<uint8_t>(i & 0xff));
-
-                        // compare result + size
-                        const auto result = json::to_msgpack(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 3);
-
-                        // check individual bytes
-                        CHECK(result[0] == 0xd1);
-                        int16_t restored = static_cast<int16_t>((result[1] << 8) + result[2]);
-                        CHECK(restored == i);
-
-                        // roundtrip
-                        CHECK(json::from_msgpack(result) == j);
-                        CHECK(json::from_msgpack(result, true, false) == j);
-                    }
-                }
-
-                SECTION("-32769..-2147483648")
-                {
-                    std::vector<int32_t> numbers;
-                    numbers.push_back(-32769);
-                    numbers.push_back(-65536);
-                    numbers.push_back(-77777);
-                    numbers.push_back(-1048576);
-                    numbers.push_back(-2147483648ll);
-                    for (auto i : numbers)
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with integer number
-                        json j = i;
-
-                        // check type
-                        CHECK(j.is_number_integer());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back(0xd2);
-                        expected.push_back(static_cast<uint8_t>((i >> 24) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 16) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 8) & 0xff));
-                        expected.push_back(static_cast<uint8_t>(i & 0xff));
-
-                        // compare result + size
-                        const auto result = json::to_msgpack(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 5);
-
-                        // check individual bytes
-                        CHECK(result[0] == 0xd2);
-                        uint32_t restored = (static_cast<uint32_t>(result[1]) << 030) +
-                                            (static_cast<uint32_t>(result[2]) << 020) +
-                                            (static_cast<uint32_t>(result[3]) << 010) +
-                                            static_cast<uint32_t>(result[4]);
-                        CHECK(static_cast<std::int32_t>(restored) == i);
-
-                        // roundtrip
-                        CHECK(json::from_msgpack(result) == j);
-                        CHECK(json::from_msgpack(result, true, false) == j);
-                    }
-                }
-
-                SECTION("-9223372036854775808..-2147483649 (int 64)")
-                {
-                    std::vector<int64_t> numbers;
-                    numbers.push_back(INT64_MIN);
-                    numbers.push_back(-2147483649ll);
-                    for (auto i : numbers)
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with unsigned integer number
-                        json j = i;
-
-                        // check type
-                        CHECK(j.is_number_integer());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back(0xd3);
-                        expected.push_back(static_cast<uint8_t>((i >> 070) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 060) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 050) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 040) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 030) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 020) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 010) & 0xff));
-                        expected.push_back(static_cast<uint8_t>(i & 0xff));
-
-                        // compare result + size
-                        const auto result = json::to_msgpack(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 9);
-
-                        // check individual bytes
-                        CHECK(result[0] == 0xd3);
-                        int64_t restored = (static_cast<int64_t>(result[1]) << 070) +
-                                           (static_cast<int64_t>(result[2]) << 060) +
-                                           (static_cast<int64_t>(result[3]) << 050) +
-                                           (static_cast<int64_t>(result[4]) << 040) +
-                                           (static_cast<int64_t>(result[5]) << 030) +
-                                           (static_cast<int64_t>(result[6]) << 020) +
-                                           (static_cast<int64_t>(result[7]) << 010) +
-                                           static_cast<int64_t>(result[8]);
-                        CHECK(restored == i);
-
-                        // roundtrip
-                        CHECK(json::from_msgpack(result) == j);
-                        CHECK(json::from_msgpack(result, true, false) == j);
-                    }
-                }
-            }
-
-            SECTION("unsigned")
-            {
-                SECTION("0..127 (positive fixnum)")
-                {
-                    for (size_t i = 0; i <= 127; ++i)
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with unsigned integer number
-                        json j = i;
-
-                        // check type
-                        CHECK(j.is_number_unsigned());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back(static_cast<uint8_t>(i));
-
-                        // compare result + size
-                        const auto result = json::to_msgpack(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 1);
-
-                        // check individual bytes
-                        CHECK(result[0] == i);
-
-                        // roundtrip
-                        CHECK(json::from_msgpack(result) == j);
-                        CHECK(json::from_msgpack(result, true, false) == j);
-                    }
-                }
-
-                SECTION("128..255 (uint 8)")
-                {
-                    for (size_t i = 128; i <= 255; ++i)
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with unsigned integer number
-                        json j = i;
-
-                        // check type
-                        CHECK(j.is_number_unsigned());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back(0xcc);
-                        expected.push_back(static_cast<uint8_t>(i));
-
-                        // compare result + size
-                        const auto result = json::to_msgpack(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 2);
-
-                        // check individual bytes
-                        CHECK(result[0] == 0xcc);
-                        uint8_t restored = static_cast<uint8_t>(result[1]);
-                        CHECK(restored == i);
-
-                        // roundtrip
-                        CHECK(json::from_msgpack(result) == j);
-                        CHECK(json::from_msgpack(result, true, false) == j);
-                    }
-                }
-
-                SECTION("256..65535 (uint 16)")
-                {
-                    for (size_t i = 256; i <= 65535; ++i)
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with unsigned integer number
-                        json j = i;
-
-                        // check type
-                        CHECK(j.is_number_unsigned());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back(0xcd);
-                        expected.push_back(static_cast<uint8_t>((i >> 8) & 0xff));
-                        expected.push_back(static_cast<uint8_t>(i & 0xff));
-
-                        // compare result + size
-                        const auto result = json::to_msgpack(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 3);
-
-                        // check individual bytes
-                        CHECK(result[0] == 0xcd);
-                        uint16_t restored = static_cast<uint16_t>(static_cast<uint8_t>(result[1]) * 256 + static_cast<uint8_t>(result[2]));
-                        CHECK(restored == i);
-
-                        // roundtrip
-                        CHECK(json::from_msgpack(result) == j);
-                        CHECK(json::from_msgpack(result, true, false) == j);
-                    }
-                }
-
-                SECTION("65536..4294967295 (uint 32)")
-                {
-                    for (uint32_t i :
-                            {
-                                65536u, 77777u, 1048576u, 4294967295u
-                            })
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with unsigned integer number
-                        json j = i;
-
-                        // check type
-                        CHECK(j.is_number_unsigned());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back(0xce);
-                        expected.push_back(static_cast<uint8_t>((i >> 24) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 16) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 8) & 0xff));
-                        expected.push_back(static_cast<uint8_t>(i & 0xff));
-
-                        // compare result + size
-                        const auto result = json::to_msgpack(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 5);
-
-                        // check individual bytes
-                        CHECK(result[0] == 0xce);
-                        uint32_t restored = (static_cast<uint32_t>(result[1]) << 030) +
-                                            (static_cast<uint32_t>(result[2]) << 020) +
-                                            (static_cast<uint32_t>(result[3]) << 010) +
-                                            static_cast<uint32_t>(result[4]);
-                        CHECK(restored == i);
-
-                        // roundtrip
-                        CHECK(json::from_msgpack(result) == j);
-                        CHECK(json::from_msgpack(result, true, false) == j);
-                    }
-                }
-
-                SECTION("4294967296..18446744073709551615 (uint 64)")
-                {
-                    for (uint64_t i :
-                            {
-                                4294967296lu, 18446744073709551615lu
-                            })
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with unsigned integer number
-                        json j = i;
-
-                        // check type
-                        CHECK(j.is_number_unsigned());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back(0xcf);
-                        expected.push_back(static_cast<uint8_t>((i >> 070) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 060) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 050) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 040) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 030) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 020) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 010) & 0xff));
-                        expected.push_back(static_cast<uint8_t>(i & 0xff));
-
-                        // compare result + size
-                        const auto result = json::to_msgpack(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 9);
-
-                        // check individual bytes
-                        CHECK(result[0] == 0xcf);
-                        uint64_t restored = (static_cast<uint64_t>(result[1]) << 070) +
-                                            (static_cast<uint64_t>(result[2]) << 060) +
-                                            (static_cast<uint64_t>(result[3]) << 050) +
-                                            (static_cast<uint64_t>(result[4]) << 040) +
-                                            (static_cast<uint64_t>(result[5]) << 030) +
-                                            (static_cast<uint64_t>(result[6]) << 020) +
-                                            (static_cast<uint64_t>(result[7]) << 010) +
-                                            static_cast<uint64_t>(result[8]);
-                        CHECK(restored == i);
-
-                        // roundtrip
-                        CHECK(json::from_msgpack(result) == j);
-                        CHECK(json::from_msgpack(result, true, false) == j);
-                    }
-                }
-            }
-
-            SECTION("float")
-            {
-                SECTION("3.1415925")
-                {
-                    double v = 3.1415925;
-                    json j = v;
-                    std::vector<uint8_t> expected =
-                    {
-                        0xcb, 0x40, 0x09, 0x21, 0xfb, 0x3f, 0xa6, 0xde, 0xfc
-                    };
-                    const auto result = json::to_msgpack(j);
-                    CHECK(result == expected);
-
-                    // roundtrip
-                    CHECK(json::from_msgpack(result) == j);
-                    CHECK(json::from_msgpack(result) == v);
-                    CHECK(json::from_msgpack(result, true, false) == j);
-                }
-
-                SECTION("1.0")
-                {
-                    double v = 1.0;
-                    json j = v;
-                    std::vector<uint8_t> expected =
-                    {
-                        0xca, 0x3f, 0x80, 0x00, 0x00
-                    };
-                    const auto result = json::to_msgpack(j);
-                    CHECK(result == expected);
-
-                    // roundtrip
-                    CHECK(json::from_msgpack(result) == j);
-                    CHECK(json::from_msgpack(result) == v);
-                    CHECK(json::from_msgpack(result, true, false) == j);
-                }
-
-                SECTION("128.128")
-                {
-                    double v = 128.1280059814453125;
-                    json j = v;
-                    std::vector<uint8_t> expected =
-                    {
-                        0xca, 0x43, 0x00, 0x20, 0xc5
-                    };
-                    const auto result = json::to_msgpack(j);
-                    CHECK(result == expected);
-
-                    // roundtrip
-                    CHECK(json::from_msgpack(result) == j);
-                    CHECK(json::from_msgpack(result) == v);
-                    CHECK(json::from_msgpack(result, true, false) == j);
-                }
-            }
-        }
-
-        SECTION("string")
-        {
-            SECTION("N = 0..31")
-            {
-                // explicitly enumerate the first byte for all 32 strings
-                const std::vector<uint8_t> first_bytes =
-                {
-                    0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8,
-                    0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1,
-                    0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba,
-                    0xbb, 0xbc, 0xbd, 0xbe, 0xbf
-                };
-
-                for (size_t N = 0; N < first_bytes.size(); ++N)
-                {
-                    CAPTURE(N)
-
-                    // create JSON value with string containing of N * 'x'
-                    const auto s = std::string(N, 'x');
-                    json j = s;
-
-                    // create expected byte vector
-                    std::vector<uint8_t> expected;
-                    expected.push_back(first_bytes[N]);
-                    for (size_t i = 0; i < N; ++i)
-                    {
-                        expected.push_back('x');
-                    }
-
-                    // check first byte
-                    CHECK((first_bytes[N] & 0x1f) == N);
-
-                    // compare result + size
-                    const auto result = json::to_msgpack(j);
-                    CHECK(result == expected);
-                    CHECK(result.size() == N + 1);
-                    // check that no null byte is appended
-                    if (N > 0)
-                    {
-                        CHECK(result.back() != '\x00');
-                    }
-
-                    // roundtrip
-                    CHECK(json::from_msgpack(result) == j);
-                    CHECK(json::from_msgpack(result, true, false) == j);
-                }
-            }
-
-            SECTION("N = 32..255")
-            {
-                for (size_t N = 32; N <= 255; ++N)
-                {
-                    CAPTURE(N)
-
-                    // create JSON value with string containing of N * 'x'
-                    const auto s = std::string(N, 'x');
-                    json j = s;
-
-                    // create expected byte vector
-                    std::vector<uint8_t> expected;
-                    expected.push_back(0xd9);
-                    expected.push_back(static_cast<uint8_t>(N));
-                    for (size_t i = 0; i < N; ++i)
-                    {
-                        expected.push_back('x');
-                    }
-
-                    // compare result + size
-                    const auto result = json::to_msgpack(j);
-                    CHECK(result == expected);
-                    CHECK(result.size() == N + 2);
-                    // check that no null byte is appended
-                    CHECK(result.back() != '\x00');
-
-                    // roundtrip
-                    CHECK(json::from_msgpack(result) == j);
-                    CHECK(json::from_msgpack(result, true, false) == j);
-                }
-            }
-
-            SECTION("N = 256..65535")
-            {
-                for (size_t N :
-                        {
-                            256u, 999u, 1025u, 3333u, 2048u, 65535u
-                        })
-                {
-                    CAPTURE(N)
-
-                    // create JSON value with string containing of N * 'x'
-                    const auto s = std::string(N, 'x');
-                    json j = s;
-
-                    // create expected byte vector (hack: create string first)
-                    std::vector<uint8_t> expected(N, 'x');
-                    // reverse order of commands, because we insert at begin()
-                    expected.insert(expected.begin(), static_cast<uint8_t>(N & 0xff));
-                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 8) & 0xff));
-                    expected.insert(expected.begin(), 0xda);
-
-                    // compare result + size
-                    const auto result = json::to_msgpack(j);
-                    CHECK(result == expected);
-                    CHECK(result.size() == N + 3);
-                    // check that no null byte is appended
-                    CHECK(result.back() != '\x00');
-
-                    // roundtrip
-                    CHECK(json::from_msgpack(result) == j);
-                    CHECK(json::from_msgpack(result, true, false) == j);
-                }
-            }
-
-            SECTION("N = 65536..4294967295")
-            {
-                for (size_t N :
-                        {
-                            65536u, 77777u, 1048576u
-                        })
-                {
-                    CAPTURE(N)
-
-                    // create JSON value with string containing of N * 'x'
-                    const auto s = std::string(N, 'x');
-                    json j = s;
-
-                    // create expected byte vector (hack: create string first)
-                    std::vector<uint8_t> expected(N, 'x');
-                    // reverse order of commands, because we insert at begin()
-                    expected.insert(expected.begin(), static_cast<uint8_t>(N & 0xff));
-                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 8) & 0xff));
-                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 16) & 0xff));
-                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 24) & 0xff));
-                    expected.insert(expected.begin(), 0xdb);
-
-                    // compare result + size
-                    const auto result = json::to_msgpack(j);
-                    CHECK(result == expected);
-                    CHECK(result.size() == N + 5);
-                    // check that no null byte is appended
-                    CHECK(result.back() != '\x00');
-
-                    // roundtrip
-                    CHECK(json::from_msgpack(result) == j);
-                    CHECK(json::from_msgpack(result, true, false) == j);
-                }
-            }
-        }
-
-        SECTION("array")
-        {
-            SECTION("empty")
-            {
-                json j = json::array();
-                std::vector<uint8_t> expected = {0x90};
-                const auto result = json::to_msgpack(j);
-                CHECK(result == expected);
-
-                // roundtrip
-                CHECK(json::from_msgpack(result) == j);
-                CHECK(json::from_msgpack(result, true, false) == j);
-            }
-
-            SECTION("[null]")
-            {
-                json j = {nullptr};
-                std::vector<uint8_t> expected = {0x91, 0xc0};
-                const auto result = json::to_msgpack(j);
-                CHECK(result == expected);
-
-                // roundtrip
-                CHECK(json::from_msgpack(result) == j);
-                CHECK(json::from_msgpack(result, true, false) == j);
-            }
-
-            SECTION("[1,2,3,4,5]")
-            {
-                json j = json::parse("[1,2,3,4,5]");
-                std::vector<uint8_t> expected = {0x95, 0x01, 0x02, 0x03, 0x04, 0x05};
-                const auto result = json::to_msgpack(j);
-                CHECK(result == expected);
-
-                // roundtrip
-                CHECK(json::from_msgpack(result) == j);
-                CHECK(json::from_msgpack(result, true, false) == j);
-            }
-
-            SECTION("[[[[]]]]")
-            {
-                json j = json::parse("[[[[]]]]");
-                std::vector<uint8_t> expected = {0x91, 0x91, 0x91, 0x90};
-                const auto result = json::to_msgpack(j);
-                CHECK(result == expected);
-
-                // roundtrip
-                CHECK(json::from_msgpack(result) == j);
-                CHECK(json::from_msgpack(result, true, false) == j);
-            }
-
-            SECTION("array 16")
-            {
-                json j(16, nullptr);
-                std::vector<uint8_t> expected(j.size() + 3, 0xc0); // all null
-                expected[0] = 0xdc; // array 16
-                expected[1] = 0x00; // size (0x0010), byte 0
-                expected[2] = 0x10; // size (0x0010), byte 1
-                const auto result = json::to_msgpack(j);
-                CHECK(result == expected);
-
-                // roundtrip
-                CHECK(json::from_msgpack(result) == j);
-                CHECK(json::from_msgpack(result, true, false) == j);
-            }
-
-            SECTION("array 32")
-            {
-                json j(65536, nullptr);
-                std::vector<uint8_t> expected(j.size() + 5, 0xc0); // all null
-                expected[0] = 0xdd; // array 32
-                expected[1] = 0x00; // size (0x00100000), byte 0
-                expected[2] = 0x01; // size (0x00100000), byte 1
-                expected[3] = 0x00; // size (0x00100000), byte 2
-                expected[4] = 0x00; // size (0x00100000), byte 3
-                const auto result = json::to_msgpack(j);
-                //CHECK(result == expected);
-
-                CHECK(result.size() == expected.size());
-                for (size_t i = 0; i < expected.size(); ++i)
-                {
-                    CAPTURE(i)
-                    CHECK(result[i] == expected[i]);
-                }
-
-                // roundtrip
-                CHECK(json::from_msgpack(result) == j);
-                CHECK(json::from_msgpack(result, true, false) == j);
-            }
-        }
-
-        SECTION("object")
-        {
-            SECTION("empty")
-            {
-                json j = json::object();
-                std::vector<uint8_t> expected = {0x80};
-                const auto result = json::to_msgpack(j);
-                CHECK(result == expected);
-
-                // roundtrip
-                CHECK(json::from_msgpack(result) == j);
-                CHECK(json::from_msgpack(result, true, false) == j);
-            }
-
-            SECTION("{\"\":null}")
-            {
-                json j = {{"", nullptr}};
-                std::vector<uint8_t> expected = {0x81, 0xa0, 0xc0};
-                const auto result = json::to_msgpack(j);
-                CHECK(result == expected);
-
-                // roundtrip
-                CHECK(json::from_msgpack(result) == j);
-                CHECK(json::from_msgpack(result, true, false) == j);
-            }
-
-            SECTION("{\"a\": {\"b\": {\"c\": {}}}}")
-            {
-                json j = json::parse("{\"a\": {\"b\": {\"c\": {}}}}");
-                std::vector<uint8_t> expected =
-                {
-                    0x81, 0xa1, 0x61, 0x81, 0xa1, 0x62, 0x81, 0xa1, 0x63, 0x80
-                };
-                const auto result = json::to_msgpack(j);
-                CHECK(result == expected);
-
-                // roundtrip
-                CHECK(json::from_msgpack(result) == j);
-                CHECK(json::from_msgpack(result, true, false) == j);
-            }
-
-            SECTION("map 16")
-            {
-                json j = R"({"00": null, "01": null, "02": null, "03": null,
-                             "04": null, "05": null, "06": null, "07": null,
-                             "08": null, "09": null, "10": null, "11": null,
-                             "12": null, "13": null, "14": null, "15": null})"_json;
-
-                const auto result = json::to_msgpack(j);
-
-                // Checking against an expected vector byte by byte is
-                // difficult, because no assumption on the order of key/value
-                // pairs are made. We therefore only check the prefix (type and
-                // size and the overall size. The rest is then handled in the
-                // roundtrip check.
-                CHECK(result.size() == 67); // 1 type, 2 size, 16*4 content
-                CHECK(result[0] == 0xde); // map 16
-                CHECK(result[1] == 0x00); // byte 0 of size (0x0010)
-                CHECK(result[2] == 0x10); // byte 1 of size (0x0010)
-
-                // roundtrip
-                CHECK(json::from_msgpack(result) == j);
-                CHECK(json::from_msgpack(result, true, false) == j);
-            }
-
-            SECTION("map 32")
-            {
-                json j;
-                for (auto i = 0; i < 65536; ++i)
-                {
-                    // format i to a fixed width of 5
-                    // each entry will need 7 bytes: 6 for fixstr, 1 for null
-                    std::stringstream ss;
-                    ss << std::setw(5) << std::setfill('0') << i;
-                    j.emplace(ss.str(), nullptr);
-                }
-
-                const auto result = json::to_msgpack(j);
-
-                // Checking against an expected vector byte by byte is
-                // difficult, because no assumption on the order of key/value
-                // pairs are made. We therefore only check the prefix (type and
-                // size and the overall size. The rest is then handled in the
-                // roundtrip check.
-                CHECK(result.size() == 458757); // 1 type, 4 size, 65536*7 content
-                CHECK(result[0] == 0xdf); // map 32
-                CHECK(result[1] == 0x00); // byte 0 of size (0x00010000)
-                CHECK(result[2] == 0x01); // byte 1 of size (0x00010000)
-                CHECK(result[3] == 0x00); // byte 2 of size (0x00010000)
-                CHECK(result[4] == 0x00); // byte 3 of size (0x00010000)
-
-                // roundtrip
-                CHECK(json::from_msgpack(result) == j);
-                CHECK(json::from_msgpack(result, true, false) == j);
-            }
-        }
-
-        SECTION("extension")
-        {
-            SECTION("N = 0..255")
-            {
-                for (size_t N = 0; N <= 0xFF; ++N)
-                {
-                    CAPTURE(N)
-
-                    // create JSON value with byte array containing of N * 'x'
-                    const auto s = std::vector<uint8_t>(N, 'x');
-                    json j = json::binary(s);
-                    std::uint8_t subtype = 42;
-                    j.get_binary().set_subtype(subtype);
-
-                    // create expected byte vector
-                    std::vector<uint8_t> expected;
-                    switch (N)
-                    {
-                        case 1:
-                            expected.push_back(static_cast<std::uint8_t>(0xD4));
-                            break;
-                        case 2:
-                            expected.push_back(static_cast<std::uint8_t>(0xD5));
-                            break;
-                        case 4:
-                            expected.push_back(static_cast<std::uint8_t>(0xD6));
-                            break;
-                        case 8:
-                            expected.push_back(static_cast<std::uint8_t>(0xD7));
-                            break;
-                        case 16:
-                            expected.push_back(static_cast<std::uint8_t>(0xD8));
-                            break;
-                        default:
-                            expected.push_back(static_cast<std::uint8_t>(0xC7));
-                            expected.push_back(static_cast<std::uint8_t>(N));
-                            break;
-                    }
-                    expected.push_back(subtype);
-
-                    for (size_t i = 0; i < N; ++i)
-                    {
-                        expected.push_back(0x78);
-                    }
-
-                    // compare result + size
-                    const auto result = json::to_msgpack(j);
-                    CHECK(result == expected);
-                    switch (N)
-                    {
-                        case 1:
-                        case 2:
-                        case 4:
-                        case 8:
-                        case 16:
-                            CHECK(result.size() == N + 2);
-                            break;
-                        default:
-                            CHECK(result.size() == N + 3);
-                            break;
-                    }
-
-                    // check that no null byte is appended
-                    if (N > 0)
-                    {
-                        CHECK(result.back() != '\x00');
-                    }
-
-                    // roundtrip
-                    CHECK(json::from_msgpack(result) == j);
-                    CHECK(json::from_msgpack(result, true, false) == j);
-                }
-            }
-
-            SECTION("N = 256..65535")
-            {
-                for (std::size_t N :
-                        {
-                            256u, 999u, 1025u, 3333u, 2048u, 65535u
-                        })
-                {
-                    CAPTURE(N)
-
-                    // create JSON value with string containing of N * 'x'
-                    const auto s = std::vector<uint8_t>(N, 'x');
-                    json j = json::binary(s);
-                    std::uint8_t subtype = 42;
-                    j.get_binary().set_subtype(subtype);
-
-                    // create expected byte vector (hack: create string first)
-                    std::vector<uint8_t> expected(N, 'x');
-                    // reverse order of commands, because we insert at begin()
-                    expected.insert(expected.begin(), subtype);
-                    expected.insert(expected.begin(), static_cast<uint8_t>(N & 0xff));
-                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 8) & 0xff));
-                    expected.insert(expected.begin(), 0xC8);
-
-                    // compare result + size
-                    const auto result = json::to_msgpack(j);
-                    CHECK(result == expected);
-                    CHECK(result.size() == N + 4);
-                    // check that no null byte is appended
-                    CHECK(result.back() != '\x00');
-
-                    // roundtrip
-                    CHECK(json::from_msgpack(result) == j);
-                    CHECK(json::from_msgpack(result, true, false) == j);
-                }
-            }
-
-            SECTION("N = 65536..4294967295")
-            {
-                for (std::size_t N :
-                        {
-                            65536u, 77777u, 1048576u
-                        })
-                {
-                    CAPTURE(N)
-
-                    // create JSON value with string containing of N * 'x'
-                    const auto s = std::vector<uint8_t>(N, 'x');
-                    json j = json::binary(s);
-                    std::uint8_t subtype = 42;
-                    j.get_binary().set_subtype(subtype);
-
-                    // create expected byte vector (hack: create string first)
-                    std::vector<uint8_t> expected(N, 'x');
-                    // reverse order of commands, because we insert at begin()
-                    expected.insert(expected.begin(), subtype);
-                    expected.insert(expected.begin(), static_cast<uint8_t>(N & 0xff));
-                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 8) & 0xff));
-                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 16) & 0xff));
-                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 24) & 0xff));
-                    expected.insert(expected.begin(), 0xC9);
-
-                    // compare result + size
-                    const auto result = json::to_msgpack(j);
-                    CHECK(result == expected);
-                    CHECK(result.size() == N + 6);
-                    // check that no null byte is appended
-                    CHECK(result.back() != '\x00');
-
-                    // roundtrip
-                    CHECK(json::from_msgpack(result) == j);
-                    CHECK(json::from_msgpack(result, true, false) == j);
-                }
-            }
-        }
-
-        SECTION("binary")
-        {
-            SECTION("N = 0..255")
-            {
-                for (std::size_t N = 0; N <= 0xFF; ++N)
-                {
-                    CAPTURE(N)
-
-                    // create JSON value with byte array containing of N * 'x'
-                    const auto s = std::vector<uint8_t>(N, 'x');
-                    json j = json::binary(s);
-
-                    // create expected byte vector
-                    std::vector<std::uint8_t> expected;
-                    expected.push_back(static_cast<std::uint8_t>(0xC4));
-                    expected.push_back(static_cast<std::uint8_t>(N));
-                    for (size_t i = 0; i < N; ++i)
-                    {
-                        expected.push_back(0x78);
-                    }
-
-                    // compare result + size
-                    const auto result = json::to_msgpack(j);
-                    CHECK(result == expected);
-                    CHECK(result.size() == N + 2);
-                    // check that no null byte is appended
-                    if (N > 0)
-                    {
-                        CHECK(result.back() != '\x00');
-                    }
-
-                    // roundtrip
-                    CHECK(json::from_msgpack(result) == j);
-                    CHECK(json::from_msgpack(result, true, false) == j);
-                }
-            }
-
-            SECTION("N = 256..65535")
-            {
-                for (std::size_t N :
-                        {
-                            256u, 999u, 1025u, 3333u, 2048u, 65535u
-                        })
-                {
-                    CAPTURE(N)
-
-                    // create JSON value with string containing of N * 'x'
-                    const auto s = std::vector<std::uint8_t>(N, 'x');
-                    json j = json::binary(s);
-
-                    // create expected byte vector (hack: create string first)
-                    std::vector<std::uint8_t> expected(N, 'x');
-                    // reverse order of commands, because we insert at begin()
-                    expected.insert(expected.begin(), static_cast<std::uint8_t>(N & 0xff));
-                    expected.insert(expected.begin(), static_cast<std::uint8_t>((N >> 8) & 0xff));
-                    expected.insert(expected.begin(), 0xC5);
-
-                    // compare result + size
-                    const auto result = json::to_msgpack(j);
-                    CHECK(result == expected);
-                    CHECK(result.size() == N + 3);
-                    // check that no null byte is appended
-                    CHECK(result.back() != '\x00');
-
-                    // roundtrip
-                    CHECK(json::from_msgpack(result) == j);
-                    CHECK(json::from_msgpack(result, true, false) == j);
-                }
-            }
-
-            SECTION("N = 65536..4294967295")
-            {
-                for (std::size_t N :
-                        {
-                            65536u, 77777u, 1048576u
-                        })
-                {
-                    CAPTURE(N)
-
-                    // create JSON value with string containing of N * 'x'
-                    const auto s = std::vector<std::uint8_t>(N, 'x');
-                    json j = json::binary(s);
-
-                    // create expected byte vector (hack: create string first)
-                    std::vector<uint8_t> expected(N, 'x');
-                    // reverse order of commands, because we insert at begin()
-                    expected.insert(expected.begin(), static_cast<std::uint8_t>(N & 0xff));
-                    expected.insert(expected.begin(), static_cast<std::uint8_t>((N >> 8) & 0xff));
-                    expected.insert(expected.begin(), static_cast<std::uint8_t>((N >> 16) & 0xff));
-                    expected.insert(expected.begin(), static_cast<std::uint8_t>((N >> 24) & 0xff));
-                    expected.insert(expected.begin(), 0xC6);
-
-                    // compare result + size
-                    const auto result = json::to_msgpack(j);
-                    CHECK(result == expected);
-                    CHECK(result.size() == N + 5);
-                    // check that no null byte is appended
-                    CHECK(result.back() != '\x00');
-
-                    // roundtrip
-                    CHECK(json::from_msgpack(result) == j);
-                    CHECK(json::from_msgpack(result, true, false) == j);
-                }
-            }
-        }
-    }
-
-    SECTION("from float32")
-    {
-        auto given = std::vector<uint8_t>({0xca, 0x41, 0xc8, 0x00, 0x01});
-        json j = json::from_msgpack(given);
-        CHECK(j.get<double>() == Approx(25.0000019073486));
-    }
-
-    SECTION("errors")
-    {
-        SECTION("empty byte vector")
-        {
-            json _;
-            CHECK_THROWS_AS(_ = json::from_msgpack(std::vector<uint8_t>()), json::parse_error&);
-            CHECK_THROWS_WITH(_ = json::from_msgpack(std::vector<uint8_t>()),
-                              "[json.exception.parse_error.110] parse error at byte 1: syntax error while parsing MessagePack value: unexpected end of input");
-            CHECK(json::from_msgpack(std::vector<uint8_t>(), true, false).is_discarded());
-        }
-
-        SECTION("too short byte vector")
-        {
-            json _;
-            CHECK_THROWS_AS(_ = json::from_msgpack(std::vector<uint8_t>({0x87})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_msgpack(std::vector<uint8_t>({0xcc})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_msgpack(std::vector<uint8_t>({0xcd})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_msgpack(std::vector<uint8_t>({0xcd, 0x00})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_msgpack(std::vector<uint8_t>({0xce})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_msgpack(std::vector<uint8_t>({0xce, 0x00})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_msgpack(std::vector<uint8_t>({0xce, 0x00, 0x00})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_msgpack(std::vector<uint8_t>({0xce, 0x00, 0x00, 0x00})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_msgpack(std::vector<uint8_t>({0xcf})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_msgpack(std::vector<uint8_t>({0xcf, 0x00})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_msgpack(std::vector<uint8_t>({0xcf, 0x00, 0x00})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_msgpack(std::vector<uint8_t>({0xcf, 0x00, 0x00, 0x00})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_msgpack(std::vector<uint8_t>({0xcf, 0x00, 0x00, 0x00, 0x00})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_msgpack(std::vector<uint8_t>({0xcf, 0x00, 0x00, 0x00, 0x00, 0x00})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_msgpack(std::vector<uint8_t>({0xcf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_msgpack(std::vector<uint8_t>({0xcf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_msgpack(std::vector<uint8_t>({0xa5, 0x68, 0x65})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_msgpack(std::vector<uint8_t>({0x92, 0x01})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_msgpack(std::vector<uint8_t>({0x81, 0xa1, 0x61})), json::parse_error&);
-            CHECK_THROWS_AS(_ = json::from_msgpack(std::vector<uint8_t>({0xc4, 0x02})), json::parse_error&);
-
-            CHECK_THROWS_WITH(_ = json::from_msgpack(std::vector<uint8_t>({0x87})),
-                              "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing MessagePack string: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_msgpack(std::vector<uint8_t>({0xcc})),
-                              "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing MessagePack number: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_msgpack(std::vector<uint8_t>({0xcd})),
-                              "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing MessagePack number: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_msgpack(std::vector<uint8_t>({0xcd, 0x00})),
-                              "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing MessagePack number: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_msgpack(std::vector<uint8_t>({0xce})),
-                              "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing MessagePack number: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_msgpack(std::vector<uint8_t>({0xce, 0x00})),
-                              "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing MessagePack number: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_msgpack(std::vector<uint8_t>({0xce, 0x00, 0x00})),
-                              "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing MessagePack number: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_msgpack(std::vector<uint8_t>({0xce, 0x00, 0x00, 0x00})),
-                              "[json.exception.parse_error.110] parse error at byte 5: syntax error while parsing MessagePack number: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_msgpack(std::vector<uint8_t>({0xcf})),
-                              "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing MessagePack number: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_msgpack(std::vector<uint8_t>({0xcf, 0x00})),
-                              "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing MessagePack number: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_msgpack(std::vector<uint8_t>({0xcf, 0x00, 0x00})),
-                              "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing MessagePack number: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_msgpack(std::vector<uint8_t>({0xcf, 0x00, 0x00, 0x00})),
-                              "[json.exception.parse_error.110] parse error at byte 5: syntax error while parsing MessagePack number: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_msgpack(std::vector<uint8_t>({0xcf, 0x00, 0x00, 0x00, 0x00})),
-                              "[json.exception.parse_error.110] parse error at byte 6: syntax error while parsing MessagePack number: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_msgpack(std::vector<uint8_t>({0xcf, 0x00, 0x00, 0x00, 0x00, 0x00})),
-                              "[json.exception.parse_error.110] parse error at byte 7: syntax error while parsing MessagePack number: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_msgpack(std::vector<uint8_t>({0xcf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00})),
-                              "[json.exception.parse_error.110] parse error at byte 8: syntax error while parsing MessagePack number: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_msgpack(std::vector<uint8_t>({0xcf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00})),
-                              "[json.exception.parse_error.110] parse error at byte 9: syntax error while parsing MessagePack number: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_msgpack(std::vector<uint8_t>({0xa5, 0x68, 0x65})),
-                              "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing MessagePack string: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_msgpack(std::vector<uint8_t>({0x92, 0x01})),
-                              "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing MessagePack value: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_msgpack(std::vector<uint8_t>({0x81, 0xa1, 0x61})),
-                              "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing MessagePack value: unexpected end of input");
-            CHECK_THROWS_WITH(_ = json::from_msgpack(std::vector<uint8_t>({0xc4, 0x02})),
-                              "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing MessagePack binary: unexpected end of input");
-
-            CHECK(json::from_msgpack(std::vector<uint8_t>({0x87}), true, false).is_discarded());
-            CHECK(json::from_msgpack(std::vector<uint8_t>({0xcc}), true, false).is_discarded());
-            CHECK(json::from_msgpack(std::vector<uint8_t>({0xcd}), true, false).is_discarded());
-            CHECK(json::from_msgpack(std::vector<uint8_t>({0xcd, 0x00}), true, false).is_discarded());
-            CHECK(json::from_msgpack(std::vector<uint8_t>({0xce}), true, false).is_discarded());
-            CHECK(json::from_msgpack(std::vector<uint8_t>({0xce, 0x00}), true, false).is_discarded());
-            CHECK(json::from_msgpack(std::vector<uint8_t>({0xce, 0x00, 0x00}), true, false).is_discarded());
-            CHECK(json::from_msgpack(std::vector<uint8_t>({0xce, 0x00, 0x00, 0x00}), true, false).is_discarded());
-            CHECK(json::from_msgpack(std::vector<uint8_t>({0xcf}), true, false).is_discarded());
-            CHECK(json::from_msgpack(std::vector<uint8_t>({0xcf, 0x00}), true, false).is_discarded());
-            CHECK(json::from_msgpack(std::vector<uint8_t>({0xcf, 0x00, 0x00}), true, false).is_discarded());
-            CHECK(json::from_msgpack(std::vector<uint8_t>({0xcf, 0x00, 0x00, 0x00}), true, false).is_discarded());
-            CHECK(json::from_msgpack(std::vector<uint8_t>({0xcf, 0x00, 0x00, 0x00, 0x00}), true, false).is_discarded());
-            CHECK(json::from_msgpack(std::vector<uint8_t>({0xcf, 0x00, 0x00, 0x00, 0x00, 0x00}), true, false).is_discarded());
-            CHECK(json::from_msgpack(std::vector<uint8_t>({0xcf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}), true, false).is_discarded());
-            CHECK(json::from_msgpack(std::vector<uint8_t>({0xcf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}), true, false).is_discarded());
-            CHECK(json::from_msgpack(std::vector<uint8_t>({0xa5, 0x68, 0x65}), true, false).is_discarded());
-            CHECK(json::from_msgpack(std::vector<uint8_t>({0x92, 0x01}), true, false).is_discarded());
-            CHECK(json::from_msgpack(std::vector<uint8_t>({0x81, 0xA1, 0x61}), true, false).is_discarded());
-            CHECK(json::from_msgpack(std::vector<uint8_t>({0xc4, 0x02}), true, false).is_discarded());
-            CHECK(json::from_msgpack(std::vector<uint8_t>({0xc4}), true, false).is_discarded());
-        }
-
-        SECTION("unsupported bytes")
-        {
-            SECTION("concrete examples")
-            {
-                json _;
-                CHECK_THROWS_AS(_ = json::from_msgpack(std::vector<uint8_t>({0xc1})), json::parse_error&);
-                CHECK_THROWS_WITH(_ = json::from_msgpack(std::vector<uint8_t>({0xc1})),
-                                  "[json.exception.parse_error.112] parse error at byte 1: syntax error while parsing MessagePack value: invalid byte: 0xC1");
-            }
-
-            SECTION("all unsupported bytes")
-            {
-                for (auto byte :
-                        {
-                            // never used
-                            0xc1
-                        })
-                {
-                    json _;
-                    CHECK_THROWS_AS(_ = json::from_msgpack(std::vector<uint8_t>({static_cast<uint8_t>(byte)})), json::parse_error&);
-                    CHECK(json::from_msgpack(std::vector<uint8_t>({static_cast<uint8_t>(byte)}), true, false).is_discarded());
-                }
-            }
-        }
-
-        SECTION("invalid string in map")
-        {
-            json _;
-            CHECK_THROWS_AS(_ = json::from_msgpack(std::vector<uint8_t>({0x81, 0xff, 0x01})), json::parse_error&);
-            CHECK_THROWS_WITH(_ = json::from_msgpack(std::vector<uint8_t>({0x81, 0xff, 0x01})),
-                              "[json.exception.parse_error.113] parse error at byte 2: syntax error while parsing MessagePack string: expected length specification (0xA0-0xBF, 0xD9-0xDB); last byte: 0xFF");
-            CHECK(json::from_msgpack(std::vector<uint8_t>({0x81, 0xff, 0x01}), true, false).is_discarded());
-        }
-
-        SECTION("strict mode")
-        {
-            std::vector<uint8_t> vec = {0xc0, 0xc0};
-            SECTION("non-strict mode")
-            {
-                const auto result = json::from_msgpack(vec, false);
-                CHECK(result == json());
-            }
-
-            SECTION("strict mode")
-            {
-                json _;
-                CHECK_THROWS_AS(_ = json::from_msgpack(vec), json::parse_error&);
-                CHECK_THROWS_WITH(_ = json::from_msgpack(vec),
-                                  "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing MessagePack value: expected end of input; last byte: 0xC0");
-                CHECK(json::from_msgpack(vec, true, false).is_discarded());
-            }
-        }
-    }
-
-    SECTION("SAX aborts")
-    {
-        SECTION("start_array(len)")
-        {
-            std::vector<uint8_t> v = {0x93, 0x01, 0x02, 0x03};
-            SaxCountdown scp(0);
-            CHECK(!json::sax_parse(v, &scp, json::input_format_t::msgpack));
-        }
-
-        SECTION("start_object(len)")
-        {
-            std::vector<uint8_t> v = {0x81, 0xa3, 0x66, 0x6F, 0x6F, 0xc2};
-            SaxCountdown scp(0);
-            CHECK(!json::sax_parse(v, &scp, json::input_format_t::msgpack));
-        }
-
-        SECTION("key()")
-        {
-            std::vector<uint8_t> v = {0x81, 0xa3, 0x66, 0x6F, 0x6F, 0xc2};
-            SaxCountdown scp(1);
-            CHECK(!json::sax_parse(v, &scp, json::input_format_t::msgpack));
-        }
-    }
-}
-
-// use this testcase outside [hide] to run it with Valgrind
-TEST_CASE("single MessagePack roundtrip")
-{
-    SECTION("sample.json")
-    {
-        std::string filename = TEST_DATA_DIRECTORY "/json_testsuite/sample.json";
-
-        // parse JSON file
-        std::ifstream f_json(filename);
-        json j1 = json::parse(f_json);
-
-        // parse MessagePack file
-        auto packed = utils::read_binary_file(filename + ".msgpack");
-        json j2;
-        CHECK_NOTHROW(j2 = json::from_msgpack(packed));
-
-        // compare parsed JSON values
-        CHECK(j1 == j2);
-
-        SECTION("roundtrips")
-        {
-            SECTION("std::ostringstream")
-            {
-                std::basic_ostringstream<std::uint8_t> ss;
-                json::to_msgpack(j1, ss);
-                json j3 = json::from_msgpack(ss.str());
-                CHECK(j1 == j3);
-            }
-
-            SECTION("std::string")
-            {
-                std::string s;
-                json::to_msgpack(j1, s);
-                json j3 = json::from_msgpack(s);
-                CHECK(j1 == j3);
-            }
-        }
-
-        // check with different start index
-        packed.insert(packed.begin(), 5, 0xff);
-        CHECK(j1 == json::from_msgpack(packed.begin() + 5, packed.end()));
-    }
-}
-
-TEST_CASE("MessagePack roundtrips" * doctest::skip())
-{
-    SECTION("input from msgpack-python")
-    {
-        // most of these are excluded due to differences in key order (not a real problem)
-        auto exclude_packed = std::set<std::string>
-        {
-            TEST_DATA_DIRECTORY "/json.org/1.json",
-            TEST_DATA_DIRECTORY "/json.org/2.json",
-            TEST_DATA_DIRECTORY "/json.org/3.json",
-            TEST_DATA_DIRECTORY "/json.org/4.json",
-            TEST_DATA_DIRECTORY "/json.org/5.json",
-            TEST_DATA_DIRECTORY "/json_testsuite/sample.json", // kills AppVeyor
-            TEST_DATA_DIRECTORY "/json_tests/pass1.json",
-            TEST_DATA_DIRECTORY "/regression/working_file.json",
-            TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object.json",
-            TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_basic.json",
-            TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_duplicated_key.json",
-            TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_long_strings.json",
-            TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_simple.json",
-            TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_string_unicode.json",
-        };
-
-        for (std::string filename :
-                {
-                    TEST_DATA_DIRECTORY "/json_nlohmann_tests/all_unicode.json",
-                    TEST_DATA_DIRECTORY "/json.org/1.json",
-                    TEST_DATA_DIRECTORY "/json.org/2.json",
-                    TEST_DATA_DIRECTORY "/json.org/3.json",
-                    TEST_DATA_DIRECTORY "/json.org/4.json",
-                    TEST_DATA_DIRECTORY "/json.org/5.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip01.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip02.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip03.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip04.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip05.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip06.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip07.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip08.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip09.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip10.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip11.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip12.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip13.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip14.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip15.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip16.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip17.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip18.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip19.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip20.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip21.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip22.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip23.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip24.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip25.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip26.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip27.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip28.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip29.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip30.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip31.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip32.json",
-                    TEST_DATA_DIRECTORY "/json_testsuite/sample.json", // kills AppVeyor
-                    TEST_DATA_DIRECTORY "/json_tests/pass1.json",
-                    TEST_DATA_DIRECTORY "/json_tests/pass2.json",
-                    TEST_DATA_DIRECTORY "/json_tests/pass3.json",
-                    TEST_DATA_DIRECTORY "/regression/floats.json",
-                    TEST_DATA_DIRECTORY "/regression/signed_ints.json",
-                    TEST_DATA_DIRECTORY "/regression/unsigned_ints.json",
-                    TEST_DATA_DIRECTORY "/regression/working_file.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_arraysWithSpaces.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_empty-string.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_empty.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_ending_with_newline.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_false.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_heterogeneous.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_null.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_with_1_and_newline.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_with_leading_space.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_with_several_null.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_with_trailing_space.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_0e+1.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_0e1.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_after_space.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_double_close_to_zero.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_double_huge_neg_exp.json",
-                    //TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_huge_exp.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_int_with_exp.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_minus_zero.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_negative_int.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_negative_one.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_negative_zero.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_real_capital_e.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_real_capital_e_neg_exp.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_real_capital_e_pos_exp.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_real_exponent.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_real_fraction_exponent.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_real_neg_exp.json",
-                    //TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_real_neg_overflow.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_real_pos_exponent.json",
-                    //TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_real_pos_overflow.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_real_underflow.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_simple_int.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_simple_real.json",
-                    //TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_too_big_neg_int.json",
-                    //TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_too_big_pos_int.json",
-                    //TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_very_big_negative_int.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_basic.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_duplicated_key.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_duplicated_key_and_value.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_empty.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_empty_key.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_escaped_null_in_key.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_extreme_numbers.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_long_strings.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_simple.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_string_unicode.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_with_newlines.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_1_2_3_bytes_UTF-8_sequences.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_UTF-16_Surrogates_U+1D11E_MUSICAL_SYMBOL_G_CLEF.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_accepted_surrogate_pair.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_accepted_surrogate_pairs.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_allowed_escapes.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_backslash_and_u_escaped_zero.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_backslash_doublequotes.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_comments.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_double_escape_a.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_double_escape_n.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_escaped_control_character.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_escaped_noncharacter.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_in_array.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_in_array_with_leading_space.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_last_surrogates_1_and_2.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_newline_uescaped.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_nonCharacterInUTF-8_U+10FFFF.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_nonCharacterInUTF-8_U+1FFFF.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_nonCharacterInUTF-8_U+FFFF.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_null_escape.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_one-byte-utf-8.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_pi.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_simple_ascii.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_space.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_three-byte-utf-8.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_two-byte-utf-8.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_u+2028_line_sep.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_u+2029_par_sep.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_uEscape.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_unescaped_char_delete.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_unicode.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_unicodeEscapedBackslash.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_unicode_2.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_unicode_U+200B_ZERO_WIDTH_SPACE.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_unicode_U+2064_invisible_plus.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_unicode_escaped_double_quote.json",
-                    // TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_utf16.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_utf8.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_with_del_character.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_structure_lonely_false.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_structure_lonely_int.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_structure_lonely_negative_real.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_structure_lonely_null.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_structure_lonely_string.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_structure_lonely_true.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_structure_string_empty.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_structure_trailing_newline.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_structure_true_in_array.json",
-                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_structure_whitespace_array.json"
-                })
-        {
-            CAPTURE(filename)
-
-            {
-                INFO_WITH_TEMP(filename + ": std::vector<uint8_t>");
-                // parse JSON file
-                std::ifstream f_json(filename);
-                json j1 = json::parse(f_json);
-
-                // parse MessagePack file
-                auto packed = utils::read_binary_file(filename + ".msgpack");
-                json j2;
-                CHECK_NOTHROW(j2 = json::from_msgpack(packed));
-
-                // compare parsed JSON values
-                CHECK(j1 == j2);
-            }
-
-            {
-                INFO_WITH_TEMP(filename + ": std::ifstream");
-                // parse JSON file
-                std::ifstream f_json(filename);
-                json j1 = json::parse(f_json);
-
-                // parse MessagePack file
-                std::ifstream f_msgpack(filename + ".msgpack", std::ios::binary);
-                json j2;
-                CHECK_NOTHROW(j2 = json::from_msgpack(f_msgpack));
-
-                // compare parsed JSON values
-                CHECK(j1 == j2);
-            }
-
-            {
-                INFO_WITH_TEMP(filename + ": uint8_t* and size");
-                // parse JSON file
-                std::ifstream f_json(filename);
-                json j1 = json::parse(f_json);
-
-                // parse MessagePack file
-                auto packed = utils::read_binary_file(filename + ".msgpack");
-                json j2;
-                CHECK_NOTHROW(j2 = json::from_msgpack({packed.data(), packed.size()}));
-
-                // compare parsed JSON values
-                CHECK(j1 == j2);
-            }
-
-            {
-                INFO_WITH_TEMP(filename + ": output to output adapters");
-                // parse JSON file
-                std::ifstream f_json(filename);
-                json j1 = json::parse(f_json);
-
-                // parse MessagePack file
-                auto packed = utils::read_binary_file(filename + ".msgpack");
-
-                if (!exclude_packed.count(filename))
-                {
-                    {
-                        INFO_WITH_TEMP(filename + ": output adapters: std::vector<uint8_t>");
-                        std::vector<uint8_t> vec;
-                        json::to_msgpack(j1, vec);
-                        CHECK(vec == packed);
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/external_imported/json/test/src/unit-noexcept.cpp b/external_imported/json/test/src/unit-noexcept.cpp
deleted file mode 100644
index 7e657bf9f..000000000
--- a/external_imported/json/test/src/unit-noexcept.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include "doctest_compatibility.h"
-
-#include <nlohmann/json.hpp>
-
-using nlohmann::json;
-
-namespace
-{
-enum test
-{
-};
-
-struct pod {};
-struct pod_bis {};
-
-void to_json(json&, pod) noexcept;
-void to_json(json&, pod_bis);
-void from_json(const json&, pod) noexcept;
-void from_json(const json&, pod_bis);
-void to_json(json&, pod) noexcept {}
-void to_json(json&, pod_bis) {}
-void from_json(const json&, pod) noexcept {}
-void from_json(const json&, pod_bis) {}
-
-static json* j = nullptr;
-
-static_assert(noexcept(json{}), "");
-static_assert(noexcept(nlohmann::to_json(*j, 2)), "");
-static_assert(noexcept(nlohmann::to_json(*j, 2.5)), "");
-static_assert(noexcept(nlohmann::to_json(*j, true)), "");
-static_assert(noexcept(nlohmann::to_json(*j, test{})), "");
-static_assert(noexcept(nlohmann::to_json(*j, pod{})), "");
-static_assert(!noexcept(nlohmann::to_json(*j, pod_bis{})), "");
-static_assert(noexcept(json(2)), "");
-static_assert(noexcept(json(test{})), "");
-static_assert(noexcept(json(pod{})), "");
-static_assert(noexcept(j->get<pod>()), "");
-static_assert(!noexcept(j->get<pod_bis>()), "");
-static_assert(noexcept(json(pod{})), "");
-}
-
-TEST_CASE("runtime checks")
-{
-    SECTION("nothrow-copy-constructible exceptions")
-    {
-        // for ERR60-CPP (https://github.com/nlohmann/json/issues/531):
-        // Exceptions should be nothrow-copy-constructible. However, compilers
-        // treat std::runtime_exception differently in this regard. Therefore,
-        // we can only demand nothrow-copy-constructibility for our exceptions
-        // if std::runtime_exception is.
-        CHECK(std::is_nothrow_copy_constructible<json::exception>::value == std::is_nothrow_copy_constructible<std::runtime_error>::value);
-        CHECK(std::is_nothrow_copy_constructible<json::parse_error>::value == std::is_nothrow_copy_constructible<std::runtime_error>::value);
-        CHECK(std::is_nothrow_copy_constructible<json::invalid_iterator>::value == std::is_nothrow_copy_constructible<std::runtime_error>::value);
-        CHECK(std::is_nothrow_copy_constructible<json::type_error>::value == std::is_nothrow_copy_constructible<std::runtime_error>::value);
-        CHECK(std::is_nothrow_copy_constructible<json::out_of_range>::value == std::is_nothrow_copy_constructible<std::runtime_error>::value);
-        CHECK(std::is_nothrow_copy_constructible<json::other_error>::value == std::is_nothrow_copy_constructible<std::runtime_error>::value);
-    }
-
-    SECTION("silence -Wunneeded-internal-declaration errors")
-    {
-        j = nullptr;
-        json j2;
-        to_json(j2, pod());
-        to_json(j2, pod_bis());
-        from_json(j2, pod());
-        from_json(j2, pod_bis());
-    }
-}
diff --git a/external_imported/json/test/src/unit-ordered_json.cpp b/external_imported/json/test/src/unit-ordered_json.cpp
deleted file mode 100644
index 9bd1187e4..000000000
--- a/external_imported/json/test/src/unit-ordered_json.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include "doctest_compatibility.h"
-
-#include <nlohmann/json.hpp>
-using nlohmann::json;
-using nlohmann::ordered_json;
-
-
-TEST_CASE("ordered_json")
-{
-    json j;
-    ordered_json oj;
-
-    j["element3"] = 3;
-    j["element1"] = 1;
-    j["element2"] = 2;
-
-    oj["element3"] = 3;
-    oj["element1"] = 1;
-    oj["element2"] = 2;
-
-    CHECK(j.dump() == "{\"element1\":1,\"element2\":2,\"element3\":3}");
-    CHECK(oj.dump() == "{\"element3\":3,\"element1\":1,\"element2\":2}");
-
-    CHECK(j == json(oj));
-    CHECK(ordered_json(json(oj)) == ordered_json(j));
-
-    j.erase("element1");
-    oj.erase("element1");
-
-    CHECK(j.dump() == "{\"element2\":2,\"element3\":3}");
-    CHECK(oj.dump() == "{\"element3\":3,\"element2\":2}");
-
-    // remove again and nothing changes
-    j.erase("element1");
-    oj.erase("element1");
-
-    CHECK(j.dump() == "{\"element2\":2,\"element3\":3}");
-    CHECK(oj.dump() == "{\"element3\":3,\"element2\":2}");
-
-    // There are no dup keys cause constructor calls emplace...
-    json multi {{"z", 1}, {"m", 2}, {"m", 3}, {"y", 4}, {"m", 5}};
-    CHECK(multi.size() == 3);
-    CHECK(multi.dump() == "{\"m\":2,\"y\":4,\"z\":1}");
-
-    ordered_json multi_ordered {{"z", 1}, {"m", 2}, {"m", 3}, {"y", 4}, {"m", 5}};
-    CHECK(multi_ordered.size() == 3);
-    CHECK(multi_ordered.dump() == "{\"z\":1,\"m\":2,\"y\":4}");
-    CHECK(multi_ordered.erase("m") == 1);
-    CHECK(multi_ordered.dump() == "{\"z\":1,\"y\":4}");
-
-    // Ranged insert test.
-    // It seems that values shouldn't be overwritten. Only new values are added
-    json j1 {{"c", 1}, {"b", 2}, {"a", 3}};
-    const json j2 {{"c", 77}, {"d", 42}, {"a", 4}};
-    j1.insert( j2.cbegin(), j2.cend() );
-    CHECK(j1.size() == 4);
-    CHECK(j1.dump() == "{\"a\":3,\"b\":2,\"c\":1,\"d\":42}");
-
-    ordered_json oj1 {{"c", 1}, {"b", 2}, {"a", 3}};
-    const ordered_json oj2 {{"c", 77}, {"d", 42}, {"a", 4}};
-    oj1.insert( oj2.cbegin(), oj2.cend() );
-    CHECK(oj1.size() == 4);
-    CHECK(oj1.dump() == "{\"c\":1,\"b\":2,\"a\":3,\"d\":42}");
-}
diff --git a/external_imported/json/test/src/unit-readme.cpp b/external_imported/json/test/src/unit-readme.cpp
deleted file mode 100644
index ed2a4dcee..000000000
--- a/external_imported/json/test/src/unit-readme.cpp
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include "doctest_compatibility.h"
-DOCTEST_GCC_SUPPRESS_WARNING("-Wfloat-equal")
-
-#include <nlohmann/json.hpp>
-using nlohmann::json;
-
-#include <deque>
-#include <forward_list>
-#include <list>
-#include <set>
-#include <unordered_map>
-#include <unordered_set>
-#include <iostream>
-#include <sstream>
-#include <iomanip>
-
-#if defined(_MSC_VER)
-    #pragma warning (push)
-    #pragma warning (disable : 4189) // local variable is initialized but not referenced
-#endif
-
-TEST_CASE("README" * doctest::skip())
-{
-    {
-        // redirect std::cout for the README file
-        auto old_cout_buffer = std::cout.rdbuf();
-        std::ostringstream new_stream;
-        std::cout.rdbuf(new_stream.rdbuf());
-        {
-            // create an empty structure (null)
-            json j;
-
-            // add a number that is stored as double (note the implicit conversion of j to an object)
-            j["pi"] = 3.141;
-
-            // add a Boolean that is stored as bool
-            j["happy"] = true;
-
-            // add a string that is stored as std::string
-            j["name"] = "Niels";
-
-            // add another null object by passing nullptr
-            j["nothing"] = nullptr;
-
-            // add an object inside the object
-            j["answer"]["everything"] = 42;
-
-            // add an array that is stored as std::vector (using an initializer list)
-            j["list"] = { 1, 0, 2 };
-
-            // add another object (using an initializer list of pairs)
-            j["object"] = { {"currency", "USD"}, {"value", 42.99} };
-
-            // instead, you could also write (which looks very similar to the JSON above)
-            json j2 =
-            {
-                {"pi", 3.141},
-                {"happy", true},
-                {"name", "Niels"},
-                {"nothing", nullptr},
-                {
-                    "answer", {
-                        {"everything", 42}
-                    }
-                },
-                {"list", {1, 0, 2}},
-                {
-                    "object", {
-                        {"currency", "USD"},
-                        {"value", 42.99}
-                    }
-                }
-            };
-        }
-
-        {
-            // ways to express the empty array []
-            json empty_array_implicit = {{}};
-            CHECK(empty_array_implicit.is_array());
-            json empty_array_explicit = json::array();
-            CHECK(empty_array_explicit.is_array());
-
-            // a way to express the empty object {}
-            json empty_object_explicit = json::object();
-            CHECK(empty_object_explicit.is_object());
-
-            // a way to express an _array_ of key/value pairs [["currency", "USD"], ["value", 42.99]]
-            json array_not_object = json::array({ {"currency", "USD"}, {"value", 42.99} });
-            CHECK(array_not_object.is_array());
-            CHECK(array_not_object.size() == 2);
-            CHECK(array_not_object[0].is_array());
-            CHECK(array_not_object[1].is_array());
-        }
-
-        {
-            // create object from string literal
-            json j = "{ \"happy\": true, \"pi\": 3.141 }"_json;
-
-            // or even nicer with a raw string literal
-            auto j2 = R"(
-          {
-            "happy": true,
-            "pi": 3.141
-          }
-        )"_json;
-
-            // or explicitly
-            auto j3 = json::parse("{ \"happy\": true, \"pi\": 3.141 }");
-
-            // explicit conversion to string
-            std::string s = j.dump();    // {\"happy\":true,\"pi\":3.141}
-
-            // serialization with pretty printing
-            // pass in the amount of spaces to indent
-            std::cout << j.dump(4) << std::endl;
-            // {
-            //     "happy": true,
-            //     "pi": 3.141
-            // }
-
-            std::cout << std::setw(2) << j << std::endl;
-        }
-
-        {
-            // create an array using push_back
-            json j;
-            j.push_back("foo");
-            j.push_back(1);
-            j.push_back(true);
-
-            // comparison
-            bool x = (j == "[\"foo\", 1, true]"_json);  // true
-            CHECK(x == true);
-
-            // iterate the array
-            for (json::iterator it = j.begin(); it != j.end(); ++it)
-            {
-                std::cout << *it << '\n';
-            }
-
-            // range-based for
-            for (auto element : j)
-            {
-                std::cout << element << '\n';
-            }
-
-            // getter/setter
-            const auto tmp = j[0].get<std::string>();
-            j[1] = 42;
-            bool foo{j.at(2)};
-            CHECK(foo == true);
-
-            // other stuff
-            j.size();     // 3 entries
-            j.empty();    // false
-            j.type();     // json::value_t::array
-            j.clear();    // the array is empty again
-
-            // create an object
-            json o;
-            o["foo"] = 23;
-            o["bar"] = false;
-            o["baz"] = 3.141;
-
-            // find an entry
-            if (o.find("foo") != o.end())
-            {
-                // there is an entry with key "foo"
-            }
-        }
-
-        {
-            std::vector<int> c_vector {1, 2, 3, 4};
-            json j_vec(c_vector);
-            // [1, 2, 3, 4]
-
-            std::deque<float> c_deque {1.2f, 2.3f, 3.4f, 5.6f};
-            json j_deque(c_deque);
-            // [1.2, 2.3, 3.4, 5.6]
-
-            std::list<bool> c_list {true, true, false, true};
-            json j_list(c_list);
-            // [true, true, false, true]
-
-            std::forward_list<int64_t> c_flist {12345678909876, 23456789098765, 34567890987654, 45678909876543};
-            json j_flist(c_flist);
-            // [12345678909876, 23456789098765, 34567890987654, 45678909876543]
-
-            std::array<unsigned long, 4> c_array {{1, 2, 3, 4}};
-            json j_array(c_array);
-            // [1, 2, 3, 4]
-
-            std::set<std::string> c_set {"one", "two", "three", "four", "one"};
-            json j_set(c_set); // only one entry for "one" is used
-            // ["four", "one", "three", "two"]
-
-            std::unordered_set<std::string> c_uset {"one", "two", "three", "four", "one"};
-            json j_uset(c_uset); // only one entry for "one" is used
-            // maybe ["two", "three", "four", "one"]
-
-            std::multiset<std::string> c_mset {"one", "two", "one", "four"};
-            json j_mset(c_mset); // both entries for "one" are used
-            // maybe ["one", "two", "one", "four"]
-
-            std::unordered_multiset<std::string> c_umset {"one", "two", "one", "four"};
-            json j_umset(c_umset); // both entries for "one" are used
-            // maybe ["one", "two", "one", "four"]
-        }
-
-        {
-            std::map<std::string, int> c_map { {"one", 1}, {"two", 2}, {"three", 3} };
-            json j_map(c_map);
-            // {"one": 1, "two": 2, "three": 3}
-
-            std::unordered_map<const char*, float> c_umap { {"one", 1.2f}, {"two", 2.3f}, {"three", 3.4f} };
-            json j_umap(c_umap);
-            // {"one": 1.2, "two": 2.3, "three": 3.4}
-
-            std::multimap<std::string, bool> c_mmap { {"one", true}, {"two", true}, {"three", false}, {"three", true} };
-            json j_mmap(c_mmap); // only one entry for key "three" is used
-            // maybe {"one": true, "two": true, "three": true}
-
-            std::unordered_multimap<std::string, bool> c_ummap { {"one", true}, {"two", true}, {"three", false}, {"three", true} };
-            json j_ummap(c_ummap); // only one entry for key "three" is used
-            // maybe {"one": true, "two": true, "three": true}
-        }
-
-        {
-            // strings
-            std::string s1 = "Hello, world!";
-            json js = s1;
-            auto s2 = js.get<std::string>();
-
-            // Booleans
-            bool b1 = true;
-            json jb = b1;
-            bool b2{jb};
-            CHECK(b2 == true);
-
-            // numbers
-            int i = 42;
-            json jn = i;
-            double f{jn};
-            CHECK(f == 42);
-
-            // etc.
-
-            std::string vs = js.get<std::string>();
-            bool vb = jb.get<bool>();
-            CHECK(vb == true);
-            int vi = jn.get<int>();
-            CHECK(vi == 42);
-
-            // etc.
-        }
-
-        {
-            // a JSON value
-            json j_original = R"({
-          "baz": ["one", "two", "three"],
-          "foo": "bar"
-        })"_json;
-
-            // access members with a JSON pointer (RFC 6901)
-            j_original["/baz/1"_json_pointer];
-            // "two"
-
-            // a JSON patch (RFC 6902)
-            json j_patch = R"([
-          { "op": "replace", "path": "/baz", "value": "boo" },
-          { "op": "add", "path": "/hello", "value": ["world"] },
-          { "op": "remove", "path": "/foo"}
-        ])"_json;
-
-            // apply the patch
-            json j_result = j_original.patch(j_patch);
-            // {
-            //    "baz": "boo",
-            //    "hello": ["world"]
-            // }
-
-            // calculate a JSON patch from two JSON values
-            auto res = json::diff(j_result, j_original);
-            // [
-            //   { "op":" replace", "path": "/baz", "value": ["one", "two", "three"] },
-            //   { "op":"remove","path":"/hello" },
-            //   { "op":"add","path":"/foo","value":"bar" }
-            // ]
-        }
-
-        // restore old std::cout
-        std::cout.rdbuf(old_cout_buffer);
-    }
-}
-
-#if defined(_MSC_VER)
-    #pragma warning (pop)
-#endif
diff --git a/external_imported/json/test/src/unit-reference_access.cpp b/external_imported/json/test/src/unit-reference_access.cpp
deleted file mode 100644
index c98367765..000000000
--- a/external_imported/json/test/src/unit-reference_access.cpp
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include "doctest_compatibility.h"
-DOCTEST_GCC_SUPPRESS_WARNING("-Wfloat-equal")
-
-#include <nlohmann/json.hpp>
-using nlohmann::json;
-
-TEST_CASE("reference access")
-{
-    // create a JSON value with different types
-    json json_types =
-    {
-        {"boolean", true},
-        {
-            "number", {
-                {"integer", 42},
-                {"floating-point", 17.23}
-            }
-        },
-        {"string", "Hello, world!"},
-        {"array", {1, 2, 3, 4, 5}},
-        {"null", nullptr}
-    };
-
-    SECTION("reference access to object_t")
-    {
-        using test_type = json::object_t;
-        json value = {{"one", 1}, {"two", 2}};
-
-        // check if references are returned correctly
-        test_type& p1 = value.get_ref<test_type&>();
-        CHECK(&p1 == value.get_ptr<test_type*>());
-        CHECK(p1 == value.get<test_type>());
-
-        const test_type& p2 = value.get_ref<const test_type&>();
-        CHECK(&p2 == value.get_ptr<const test_type*>());
-        CHECK(p2 == value.get<test_type>());
-
-        // check if mismatching references throw correctly
-        CHECK_NOTHROW(value.get_ref<json::object_t&>());
-        CHECK_THROWS_AS(value.get_ref<json::array_t&>(), json::type_error&);
-        CHECK_THROWS_WITH(value.get_ref<json::array_t&>(),
-                          "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is object");
-        CHECK_THROWS_AS(value.get_ref<json::string_t&>(), json::type_error&);
-        CHECK_THROWS_WITH(value.get_ref<json::string_t&>(),
-                          "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is object");
-        CHECK_THROWS_AS(value.get_ref<json::boolean_t&>(), json::type_error&);
-        CHECK_THROWS_WITH(value.get_ref<json::boolean_t&>(),
-                          "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is object");
-        CHECK_THROWS_AS(value.get_ref<json::number_integer_t&>(), json::type_error&);
-        CHECK_THROWS_WITH(value.get_ref<json::number_integer_t&>(),
-                          "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is object");
-        CHECK_THROWS_AS(value.get_ref<json::number_unsigned_t&>(), json::type_error&);
-        CHECK_THROWS_WITH(value.get_ref<json::number_unsigned_t&>(),
-                          "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is object");
-        CHECK_THROWS_AS(value.get_ref<json::number_float_t&>(), json::type_error&);
-        CHECK_THROWS_WITH(value.get_ref<json::number_float_t&>(),
-                          "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is object");
-    }
-
-    SECTION("const reference access to const object_t")
-    {
-        using test_type = json::object_t;
-        const json value = {{"one", 1}, {"two", 2}};
-
-        // this should not compile
-        // test_type& p1 = value.get_ref<test_type&>();
-
-        // check if references are returned correctly
-        const test_type& p2 = value.get_ref<const test_type&>();
-        CHECK(&p2 == value.get_ptr<const test_type*>());
-        CHECK(p2 == value.get<test_type>());
-    }
-
-    SECTION("reference access to array_t")
-    {
-        using test_type = json::array_t;
-        json value = {1, 2, 3, 4};
-
-        // check if references are returned correctly
-        test_type& p1 = value.get_ref<test_type&>();
-        CHECK(&p1 == value.get_ptr<test_type*>());
-        CHECK(p1 == value.get<test_type>());
-
-        const test_type& p2 = value.get_ref<const test_type&>();
-        CHECK(&p2 == value.get_ptr<const test_type*>());
-        CHECK(p2 == value.get<test_type>());
-
-        // check if mismatching references throw correctly
-        CHECK_THROWS_AS(value.get_ref<json::object_t&>(), json::type_error&);
-        CHECK_THROWS_WITH(value.get_ref<json::object_t&>(),
-                          "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is array");
-        CHECK_NOTHROW(value.get_ref<json::array_t&>());
-        CHECK_THROWS_AS(value.get_ref<json::string_t&>(), json::type_error&);
-        CHECK_THROWS_WITH(value.get_ref<json::string_t&>(),
-                          "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is array");
-        CHECK_THROWS_AS(value.get_ref<json::boolean_t&>(), json::type_error&);
-        CHECK_THROWS_WITH(value.get_ref<json::boolean_t&>(),
-                          "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is array");
-        CHECK_THROWS_AS(value.get_ref<json::number_integer_t&>(), json::type_error&);
-        CHECK_THROWS_WITH(value.get_ref<json::number_integer_t&>(),
-                          "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is array");
-        CHECK_THROWS_AS(value.get_ref<json::number_unsigned_t&>(), json::type_error&);
-        CHECK_THROWS_WITH(value.get_ref<json::number_unsigned_t&>(),
-                          "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is array");
-        CHECK_THROWS_AS(value.get_ref<json::number_float_t&>(), json::type_error&);
-        CHECK_THROWS_WITH(value.get_ref<json::number_float_t&>(),
-                          "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is array");
-    }
-
-    SECTION("reference access to string_t")
-    {
-        using test_type = json::string_t;
-        json value = "hello";
-
-        // check if references are returned correctly
-        test_type& p1 = value.get_ref<test_type&>();
-        CHECK(&p1 == value.get_ptr<test_type*>());
-        CHECK(p1 == value.get<test_type>());
-
-        const test_type& p2 = value.get_ref<const test_type&>();
-        CHECK(&p2 == value.get_ptr<const test_type*>());
-        CHECK(p2 == value.get<test_type>());
-
-        // check if mismatching references throw correctly
-        CHECK_THROWS_AS(value.get_ref<json::object_t&>(), json::type_error&);
-        CHECK_THROWS_WITH(value.get_ref<json::object_t&>(),
-                          "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is string");
-        CHECK_THROWS_AS(value.get_ref<json::array_t&>(), json::type_error&);
-        CHECK_THROWS_WITH(value.get_ref<json::array_t&>(),
-                          "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is string");
-        CHECK_NOTHROW(value.get_ref<json::string_t&>());
-        CHECK_THROWS_AS(value.get_ref<json::boolean_t&>(), json::type_error&);
-        CHECK_THROWS_WITH(value.get_ref<json::boolean_t&>(),
-                          "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is string");
-        CHECK_THROWS_AS(value.get_ref<json::number_integer_t&>(), json::type_error&);
-        CHECK_THROWS_WITH(value.get_ref<json::number_integer_t&>(),
-                          "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is string");
-        CHECK_THROWS_AS(value.get_ref<json::number_unsigned_t&>(), json::type_error&);
-        CHECK_THROWS_WITH(value.get_ref<json::number_unsigned_t&>(),
-                          "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is string");
-        CHECK_THROWS_AS(value.get_ref<json::number_float_t&>(), json::type_error&);
-        CHECK_THROWS_WITH(value.get_ref<json::number_float_t&>(),
-                          "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is string");
-    }
-
-    SECTION("reference access to boolean_t")
-    {
-        using test_type = json::boolean_t;
-        json value = false;
-
-        // check if references are returned correctly
-        test_type& p1 = value.get_ref<test_type&>();
-        CHECK(&p1 == value.get_ptr<test_type*>());
-        CHECK(p1 == value.get<test_type>());
-
-        const test_type& p2 = value.get_ref<const test_type&>();
-        CHECK(&p2 == value.get_ptr<const test_type*>());
-        CHECK(p2 == value.get<test_type>());
-
-        // check if mismatching references throw correctly
-        CHECK_THROWS_AS(value.get_ref<json::object_t&>(), json::type_error&);
-        CHECK_THROWS_WITH(value.get_ref<json::object_t&>(),
-                          "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is boolean");
-        CHECK_THROWS_AS(value.get_ref<json::array_t&>(), json::type_error&);
-        CHECK_THROWS_WITH(value.get_ref<json::array_t&>(),
-                          "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is boolean");
-        CHECK_THROWS_AS(value.get_ref<json::string_t&>(), json::type_error&);
-        CHECK_THROWS_WITH(value.get_ref<json::string_t&>(),
-                          "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is boolean");
-        CHECK_NOTHROW(value.get_ref<json::boolean_t&>());
-        CHECK_THROWS_AS(value.get_ref<json::number_integer_t&>(), json::type_error&);
-        CHECK_THROWS_WITH(value.get_ref<json::number_integer_t&>(),
-                          "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is boolean");
-        CHECK_THROWS_AS(value.get_ref<json::number_unsigned_t&>(), json::type_error&);
-        CHECK_THROWS_WITH(value.get_ref<json::number_unsigned_t&>(),
-                          "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is boolean");
-        CHECK_THROWS_AS(value.get_ref<json::number_float_t&>(), json::type_error&);
-        CHECK_THROWS_WITH(value.get_ref<json::number_float_t&>(),
-                          "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is boolean");
-    }
-
-    SECTION("reference access to number_integer_t")
-    {
-        using test_type = json::number_integer_t;
-        json value = -23;
-
-        // check if references are returned correctly
-        test_type& p1 = value.get_ref<test_type&>();
-        CHECK(&p1 == value.get_ptr<test_type*>());
-        CHECK(p1 == value.get<test_type>());
-
-        const test_type& p2 = value.get_ref<const test_type&>();
-        CHECK(&p2 == value.get_ptr<const test_type*>());
-        CHECK(p2 == value.get<test_type>());
-
-        // check if mismatching references throw correctly
-        CHECK_THROWS_AS(value.get_ref<json::object_t&>(), json::type_error&);
-        CHECK_THROWS_WITH(value.get_ref<json::object_t&>(),
-                          "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is number");
-        CHECK_THROWS_AS(value.get_ref<json::array_t&>(), json::type_error&);
-        CHECK_THROWS_WITH(value.get_ref<json::array_t&>(),
-                          "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is number");
-        CHECK_THROWS_AS(value.get_ref<json::string_t&>(), json::type_error&);
-        CHECK_THROWS_WITH(value.get_ref<json::string_t&>(),
-                          "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is number");
-        CHECK_THROWS_AS(value.get_ref<json::boolean_t&>(), json::type_error&);
-        CHECK_THROWS_WITH(value.get_ref<json::boolean_t&>(),
-                          "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is number");
-        CHECK_NOTHROW(value.get_ref<json::number_integer_t&>());
-        CHECK_THROWS_AS(value.get_ref<json::number_unsigned_t&>(), json::type_error&);
-        CHECK_THROWS_WITH(value.get_ref<json::number_unsigned_t&>(),
-                          "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is number");
-        CHECK_THROWS_AS(value.get_ref<json::number_float_t&>(), json::type_error&);
-        CHECK_THROWS_WITH(value.get_ref<json::number_float_t&>(),
-                          "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is number");
-    }
-
-    SECTION("reference access to number_unsigned_t")
-    {
-        using test_type = json::number_unsigned_t;
-        json value = 23u;
-
-        // check if references are returned correctly
-        test_type& p1 = value.get_ref<test_type&>();
-        CHECK(&p1 == value.get_ptr<test_type*>());
-        CHECK(p1 == value.get<test_type>());
-
-        const test_type& p2 = value.get_ref<const test_type&>();
-        CHECK(&p2 == value.get_ptr<const test_type*>());
-        CHECK(p2 == value.get<test_type>());
-
-        // check if mismatching references throw correctly
-        CHECK_THROWS_AS(value.get_ref<json::object_t&>(), json::type_error&);
-        CHECK_THROWS_WITH(value.get_ref<json::object_t&>(),
-                          "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is number");
-        CHECK_THROWS_AS(value.get_ref<json::array_t&>(), json::type_error&);
-        CHECK_THROWS_WITH(value.get_ref<json::array_t&>(),
-                          "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is number");
-        CHECK_THROWS_AS(value.get_ref<json::string_t&>(), json::type_error&);
-        CHECK_THROWS_WITH(value.get_ref<json::string_t&>(),
-                          "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is number");
-        CHECK_THROWS_AS(value.get_ref<json::boolean_t&>(), json::type_error&);
-        CHECK_THROWS_WITH(value.get_ref<json::boolean_t&>(),
-                          "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is number");
-        //CHECK_THROWS_AS(value.get_ref<json::number_integer_t&>(), json::type_error&);
-        //CHECK_THROWS_WITH(value.get_ref<json::number_integer_t&>(),
-        //    "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is number");
-        CHECK_NOTHROW(value.get_ref<json::number_unsigned_t&>());
-        CHECK_THROWS_AS(value.get_ref<json::number_float_t&>(), json::type_error&);
-        CHECK_THROWS_WITH(value.get_ref<json::number_float_t&>(),
-                          "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is number");
-    }
-
-    SECTION("reference access to number_float_t")
-    {
-        using test_type = json::number_float_t;
-        json value = 42.23;
-
-        // check if references are returned correctly
-        test_type& p1 = value.get_ref<test_type&>();
-        CHECK(&p1 == value.get_ptr<test_type*>());
-        CHECK(p1 == value.get<test_type>());
-
-        const test_type& p2 = value.get_ref<const test_type&>();
-        CHECK(&p2 == value.get_ptr<const test_type*>());
-        CHECK(p2 == value.get<test_type>());
-
-        // check if mismatching references throw correctly
-        CHECK_THROWS_AS(value.get_ref<json::object_t&>(), json::type_error&);
-        CHECK_THROWS_WITH(value.get_ref<json::object_t&>(),
-                          "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is number");
-        CHECK_THROWS_AS(value.get_ref<json::array_t&>(), json::type_error&);
-        CHECK_THROWS_WITH(value.get_ref<json::array_t&>(),
-                          "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is number");
-        CHECK_THROWS_AS(value.get_ref<json::string_t&>(), json::type_error&);
-        CHECK_THROWS_WITH(value.get_ref<json::string_t&>(),
-                          "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is number");
-        CHECK_THROWS_AS(value.get_ref<json::boolean_t&>(), json::type_error&);
-        CHECK_THROWS_WITH(value.get_ref<json::boolean_t&>(),
-                          "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is number");
-        CHECK_THROWS_AS(value.get_ref<json::number_integer_t&>(), json::type_error&);
-        CHECK_THROWS_WITH(value.get_ref<json::number_integer_t&>(),
-                          "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is number");
-        CHECK_THROWS_AS(value.get_ref<json::number_unsigned_t&>(), json::type_error&);
-        CHECK_THROWS_WITH(value.get_ref<json::number_unsigned_t&>(),
-                          "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is number");
-        CHECK_NOTHROW(value.get_ref<json::number_float_t&>());
-    }
-}
diff --git a/external_imported/json/test/src/unit-regression1.cpp b/external_imported/json/test/src/unit-regression1.cpp
deleted file mode 100644
index bcb34ca87..000000000
--- a/external_imported/json/test/src/unit-regression1.cpp
+++ /dev/null
@@ -1,1613 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include "doctest_compatibility.h"
-DOCTEST_GCC_SUPPRESS_WARNING("-Wfloat-equal")
-
-// for some reason including this after the json header leads to linker errors with VS 2017...
-#include <locale>
-
-#define JSON_TESTS_PRIVATE
-#include <nlohmann/json.hpp>
-using nlohmann::json;
-
-#include <fstream>
-#include <sstream>
-#include <list>
-#include <cstdio>
-#include <test_data.hpp>
-
-#if (defined(__cplusplus) && __cplusplus >= 201703L) || (defined(_HAS_CXX17) && _HAS_CXX17 == 1) // fix for issue #464
-    #define JSON_HAS_CPP_17
-#endif
-
-#ifdef JSON_HAS_CPP_17
-    #include <variant>
-#endif
-
-#include "fifo_map.hpp"
-
-/////////////////////////////////////////////////////////////////////
-// for #972
-/////////////////////////////////////////////////////////////////////
-
-template<class K, class V, class dummy_compare, class A>
-using my_workaround_fifo_map = nlohmann::fifo_map<K, V, nlohmann::fifo_map_compare<K>, A>;
-using my_json = nlohmann::basic_json<my_workaround_fifo_map>;
-
-/////////////////////////////////////////////////////////////////////
-// for #977
-/////////////////////////////////////////////////////////////////////
-
-namespace ns
-{
-struct foo
-{
-    int x;
-};
-
-template <typename, typename SFINAE = void>
-struct foo_serializer;
-
-template<typename T>
-struct foo_serializer<T, typename std::enable_if<std::is_same<foo, T>::value>::type>
-{
-    template <typename BasicJsonType>
-    static void to_json(BasicJsonType& j, const T& value)
-    {
-        j = BasicJsonType{{"x", value.x}};
-    }
-    template <typename BasicJsonType>
-    static void from_json(const BasicJsonType& j, T& value)     // !!!
-    {
-        nlohmann::from_json(j.at("x"), value.x);
-    }
-};
-
-template<typename T>
-struct foo_serializer < T, typename std::enable_if < !std::is_same<foo, T>::value >::type >
-{
-    template <typename BasicJsonType>
-    static void to_json(BasicJsonType& j, const T& value) noexcept
-    {
-        ::nlohmann::to_json(j, value);
-    }
-    template <typename BasicJsonType>
-    static void from_json(const BasicJsonType& j, T& value)   //!!!
-    {
-        ::nlohmann::from_json(j, value);
-    }
-};
-}
-
-using foo_json = nlohmann::basic_json<std::map, std::vector, std::string, bool, std::int64_t,
-      std::uint64_t, double, std::allocator, ns::foo_serializer, std::vector<std::uint8_t>>;
-
-/////////////////////////////////////////////////////////////////////
-// for #805
-/////////////////////////////////////////////////////////////////////
-
-namespace
-{
-struct nocopy
-{
-    nocopy() = default;
-    nocopy(const nocopy&) = delete;
-
-    int val = 0;
-
-    friend void to_json(json& j, const nocopy& n)
-    {
-        j = {{"val", n.val}};
-    }
-};
-}
-
-TEST_CASE("regression tests 1")
-{
-    SECTION("issue #60 - Double quotation mark is not parsed correctly")
-    {
-        SECTION("escape_doublequote")
-        {
-            auto s = "[\"\\\"foo\\\"\"]";
-            json j = json::parse(s);
-            auto expected = R"(["\"foo\""])"_json;
-            CHECK(j == expected);
-        }
-    }
-
-    SECTION("issue #70 - Handle infinity and NaN cases")
-    {
-        // previously, NAN/INFINITY created a null value; now, the values are
-        // properly stored, but are dumped as "null"
-        SECTION("NAN value")
-        {
-            CHECK(json(NAN).dump() == "null");
-            CHECK(json(json::number_float_t(NAN)).dump() == "null");
-        }
-
-        SECTION("infinity")
-        {
-            CHECK(json(INFINITY).dump() == "null");
-            CHECK(json(json::number_float_t(INFINITY)).dump() == "null");
-        }
-
-        // With 3.0.0, the semantics of this changed: NAN and infinity are
-        // stored properly inside the JSON value (no exception or conversion
-        // to null), but are serialized as null.
-        SECTION("NAN value")
-        {
-            json j1 = NAN;
-            CHECK(j1.is_number_float());
-            json::number_float_t f1{j1};
-            CHECK(std::isnan(f1));
-
-            json j2 = json::number_float_t(NAN);
-            CHECK(j2.is_number_float());
-            json::number_float_t f2{j2};
-            CHECK(std::isnan(f2));
-        }
-
-        SECTION("infinity")
-        {
-            json j1 = INFINITY;
-            CHECK(j1.is_number_float());
-            json::number_float_t f1{j1};
-            CHECK(!std::isfinite(f1));
-
-            json j2 = json::number_float_t(INFINITY);
-            CHECK(j2.is_number_float());
-            json::number_float_t f2{j2};
-            CHECK(!std::isfinite(f2));
-        }
-    }
-
-    SECTION("pull request #71 - handle enum type")
-    {
-        enum { t = 0, u = 102};
-        json j = json::array();
-        j.push_back(t);
-
-        // maybe this is not the place to test this?
-        json j2 = u;
-
-        auto anon_enum_value = j2.get<decltype(u)>();
-        CHECK(u == anon_enum_value);
-
-        // check if the actual value was stored
-        CHECK(j2 == 102);
-
-        static_assert(std::is_same<decltype(anon_enum_value), decltype(u)>::value, "");
-
-        j.push_back(json::object(
-        {
-            {"game_type", t}
-        }));
-    }
-
-    SECTION("issue #76 - dump() / parse() not idempotent")
-    {
-        // create JSON object
-        json fields;
-        fields["one"] = std::string("one");
-        fields["two"] = std::string("two three");
-        fields["three"] = std::string("three \"four\"");
-
-        // create another JSON object by deserializing the serialization
-        std::string payload = fields.dump();
-        json parsed_fields = json::parse(payload);
-
-        // check individual fields to match both objects
-        CHECK(parsed_fields["one"] == fields["one"]);
-        CHECK(parsed_fields["two"] == fields["two"]);
-        CHECK(parsed_fields["three"] == fields["three"]);
-
-        // check individual fields to match original input
-        CHECK(parsed_fields["one"] == std::string("one"));
-        CHECK(parsed_fields["two"] == std::string("two three"));
-        CHECK(parsed_fields["three"] == std::string("three \"four\""));
-
-        // check equality of the objects
-        CHECK(parsed_fields == fields);
-
-        // check equality of the serialized objects
-        CHECK(fields.dump() == parsed_fields.dump());
-
-        // check everything in one line
-        CHECK(fields == json::parse(fields.dump()));
-    }
-
-    SECTION("issue #82 - lexer::get_number return NAN")
-    {
-        const auto content = R"(
-        {
-            "Test":"Test1",
-            "Number":100,
-            "Foo":42.42
-        })";
-
-        std::stringstream ss;
-        ss << content;
-        json j;
-        ss >> j;
-
-        auto test = j["Test"].get<std::string>();
-        CHECK(test == "Test1");
-        int number{j["Number"]};
-        CHECK(number == 100);
-        float foo{j["Foo"]};
-        CHECK(static_cast<double>(foo) == Approx(42.42));
-    }
-
-    SECTION("issue #89 - nonstandard integer type")
-    {
-        // create JSON class with nonstandard integer number type
-        using custom_json =
-            nlohmann::basic_json<std::map, std::vector, std::string, bool, int32_t, uint32_t, float>;
-        custom_json j;
-        j["int_1"] = 1;
-        CHECK(j["int_1"] == 1);
-
-        // tests for correct handling of non-standard integers that overflow the type selected by the user
-
-        // unsigned integer object creation - expected to wrap and still be stored as an integer
-        j = 4294967296U; // 2^32
-        CHECK(static_cast<int>(j.type()) == static_cast<int>(custom_json::value_t::number_unsigned));
-        CHECK(j.get<uint32_t>() == 0);  // Wrap
-
-        // unsigned integer parsing - expected to overflow and be stored as a float
-        j = custom_json::parse("4294967296"); // 2^32
-        CHECK(static_cast<int>(j.type()) == static_cast<int>(custom_json::value_t::number_float));
-        CHECK(j.get<float>() == 4294967296.0f);
-
-        // integer object creation - expected to wrap and still be stored as an integer
-        j = -2147483649LL; // -2^31-1
-        CHECK(static_cast<int>(j.type()) == static_cast<int>(custom_json::value_t::number_integer));
-        CHECK(j.get<int32_t>() == 2147483647);  // Wrap
-
-        // integer parsing - expected to overflow and be stored as a float with rounding
-        j = custom_json::parse("-2147483649"); // -2^31
-        CHECK(static_cast<int>(j.type()) == static_cast<int>(custom_json::value_t::number_float));
-        CHECK(j.get<float>() == -2147483650.0f);
-    }
-
-    SECTION("issue #93 reverse_iterator operator inheritance problem")
-    {
-        {
-            json a = {1, 2, 3};
-            json::reverse_iterator rit = a.rbegin();
-            ++rit;
-            CHECK(*rit == json(2));
-            CHECK(rit.value() == json(2));
-        }
-        {
-            json a = {1, 2, 3};
-            json::reverse_iterator rit = ++a.rbegin();
-            CHECK(*rit == json(2));
-            CHECK(rit.value() == json(2));
-        }
-        {
-            json a = {1, 2, 3};
-            json::reverse_iterator rit = a.rbegin();
-            ++rit;
-            json b = {0, 0, 0};
-            std::transform(rit, a.rend(), b.rbegin(), [](json el)
-            {
-                return el;
-            });
-            CHECK(b == json({0, 1, 2}));
-        }
-        {
-            json a = {1, 2, 3};
-            json b = {0, 0, 0};
-            std::transform(++a.rbegin(), a.rend(), b.rbegin(), [](json el)
-            {
-                return el;
-            });
-            CHECK(b == json({0, 1, 2}));
-        }
-    }
-
-    SECTION("issue #100 - failed to iterator json object with reverse_iterator")
-    {
-        json config =
-        {
-            { "111", 111 },
-            { "112", 112 },
-            { "113", 113 }
-        };
-
-        std::stringstream ss;
-
-        for (auto it = config.begin(); it != config.end(); ++it)
-        {
-            ss << it.key() << ": " << it.value() << '\n';
-        }
-
-        for (auto it = config.rbegin(); it != config.rend(); ++it)
-        {
-            ss << it.key() << ": " << it.value() << '\n';
-        }
-
-        CHECK(ss.str() == "111: 111\n112: 112\n113: 113\n113: 113\n112: 112\n111: 111\n");
-    }
-
-    SECTION("issue #101 - binary string causes numbers to be dumped as hex")
-    {
-        int64_t number = 10;
-        std::string bytes{"\x00" "asdf\n", 6};
-        json j;
-        j["int64"] = number;
-        j["binary string"] = bytes;
-        // make sure the number is really printed as decimal "10" and not as
-        // hexadecimal "a"
-        CHECK(j.dump() == "{\"binary string\":\"\\u0000asdf\\n\",\"int64\":10}");
-    }
-
-    SECTION("issue #111 - subsequent unicode chars")
-    {
-        std::string bytes{0x7, 0x7};
-        json j;
-        j["string"] = bytes;
-        CHECK(j["string"] == "\u0007\u0007");
-    }
-
-#if JSON_USE_IMPLICIT_CONVERSIONS
-    SECTION("issue #144 - implicit assignment to std::string fails")
-    {
-        json o = {{"name", "value"}};
-
-        std::string s1 = o["name"];
-        CHECK(s1 == "value");
-
-        std::string s2;
-        s2 = o["name"];
-
-        CHECK(s2 == "value");
-
-        // improve coverage
-        o["int"] = 1;
-        CHECK_THROWS_AS(s2 = o["int"], json::type_error);
-#if JSON_DIAGNOSTICS
-        CHECK_THROWS_WITH(s2 = o["int"], "[json.exception.type_error.302] (/int) type must be string, but is number");
-#else
-        CHECK_THROWS_WITH(s2 = o["int"], "[json.exception.type_error.302] type must be string, but is number");
-#endif
-    }
-#endif
-
-    SECTION("issue #146 - character following a surrogate pair is skipped")
-    {
-        CHECK(json::parse("\"\\ud80c\\udc60abc\"").get<json::string_t>() == "\xf0\x93\x81\xa0\x61\x62\x63");
-    }
-
-    SECTION("issue #171 - Cannot index by key of type static constexpr const char*")
-    {
-        json j;
-
-        // Non-const access with key as "char []"
-        char array_key[] = "Key1";
-        CHECK_NOTHROW(j[array_key] = 1);
-        CHECK(j[array_key] == json(1));
-
-        // Non-const access with key as "const char[]"
-        const char const_array_key[] = "Key2";
-        CHECK_NOTHROW(j[const_array_key] = 2);
-        CHECK(j[const_array_key] == json(2));
-
-        // Non-const access with key as "char *"
-        char _ptr_key[] = "Key3";
-        char* ptr_key = &_ptr_key[0];
-        CHECK_NOTHROW(j[ptr_key] = 3);
-        CHECK(j[ptr_key] == json(3));
-
-        // Non-const access with key as "const char *"
-        const char* const_ptr_key = "Key4";
-        CHECK_NOTHROW(j[const_ptr_key] = 4);
-        CHECK(j[const_ptr_key] == json(4));
-
-        // Non-const access with key as "static constexpr const char *"
-        static constexpr const char* constexpr_ptr_key = "Key5";
-        CHECK_NOTHROW(j[constexpr_ptr_key] = 5);
-        CHECK(j[constexpr_ptr_key] == json(5));
-
-        const json j_const = j;
-
-        // Const access with key as "char []"
-        CHECK(j_const[array_key] == json(1));
-
-        // Const access with key as "const char[]"
-        CHECK(j_const[const_array_key] == json(2));
-
-        // Const access with key as "char *"
-        CHECK(j_const[ptr_key] == json(3));
-
-        // Const access with key as "const char *"
-        CHECK(j_const[const_ptr_key] == json(4));
-
-        // Const access with key as "static constexpr const char *"
-        CHECK(j_const[constexpr_ptr_key] == json(5));
-    }
-
-    SECTION("issue #186 miloyip/nativejson-benchmark: floating-point parsing")
-    {
-        json j;
-
-        j = json::parse("-0.0");
-        CHECK(j.get<double>() == -0.0);
-
-        j = json::parse("2.22507385850720113605740979670913197593481954635164564e-308");
-        CHECK(j.get<double>() == 2.2250738585072009e-308);
-
-        j = json::parse("0.999999999999999944488848768742172978818416595458984374");
-        CHECK(j.get<double>() == 0.99999999999999989);
-
-        j = json::parse("1.00000000000000011102230246251565404236316680908203126");
-        CHECK(j.get<double>() == 1.00000000000000022);
-
-        j = json::parse("7205759403792793199999e-5");
-        CHECK(j.get<double>() == 72057594037927928.0);
-
-        j = json::parse("922337203685477529599999e-5");
-        CHECK(j.get<double>() == 9223372036854774784.0);
-
-        j = json::parse("1014120480182583464902367222169599999e-5");
-        CHECK(j.get<double>() == 10141204801825834086073718800384.0);
-
-        j = json::parse("5708990770823839207320493820740630171355185151999e-3");
-        CHECK(j.get<double>() == 5708990770823838890407843763683279797179383808.0);
-
-        // create JSON class with nonstandard float number type
-
-        // float
-        nlohmann::basic_json<std::map, std::vector, std::string, bool, int32_t, uint32_t, float> j_float =
-            1.23e25f;
-        CHECK(j_float.get<float>() == 1.23e25f);
-
-        // double
-        nlohmann::basic_json<std::map, std::vector, std::string, bool, int64_t, uint64_t, double> j_double =
-            1.23e35;
-        CHECK(j_double.get<double>() == 1.23e35);
-
-        // long double
-        nlohmann::basic_json<std::map, std::vector, std::string, bool, int64_t, uint64_t, long double>
-        j_long_double = 1.23e45L;
-        CHECK(j_long_double.get<long double>() == 1.23e45L);
-    }
-
-    SECTION("issue #228 - double values are serialized with commas as decimal points")
-    {
-        json j1a = 2312.42;
-        json j1b = json::parse("2312.42");
-
-        json j2a = 2342e-2;
-        //issue #230
-        //json j2b = json::parse("2342e-2");
-
-        json j3a = 10E3;
-        json j3b = json::parse("10E3");
-        json j3c = json::parse("10e3");
-
-        // class to create a locale that would use a comma for decimals
-        class CommaDecimalSeparator : public std::numpunct<char>
-        {
-          protected:
-            char do_decimal_point() const override
-            {
-                return ',';
-            }
-
-            char do_thousands_sep() const override
-            {
-                return '.';
-            }
-
-            std::string do_grouping() const override
-            {
-                return "\03";
-            }
-        };
-
-        // change locale to mess with decimal points
-        auto orig_locale = std::locale::global(std::locale(std::locale(), new CommaDecimalSeparator));
-
-        CHECK(j1a.dump() == "2312.42");
-        CHECK(j1b.dump() == "2312.42");
-
-        // check if locale is properly reset
-        std::stringstream ss;
-        ss.imbue(std::locale(std::locale(), new CommaDecimalSeparator));
-        ss << 4712.11;
-        CHECK(ss.str() == "4.712,11");
-        ss << j1a;
-        CHECK(ss.str() == "4.712,112312.42");
-        ss << 47.11;
-        CHECK(ss.str() == "4.712,112312.4247,11");
-
-        CHECK(j2a.dump() == "23.42");
-        //issue #230
-        //CHECK(j2b.dump() == "23.42");
-
-        CHECK(j3a.dump() == "10000.0");
-        CHECK(j3b.dump() == "10000.0");
-        CHECK(j3c.dump() == "10000.0");
-        //CHECK(j3b.dump() == "1E04"); // roundtrip error
-        //CHECK(j3c.dump() == "1e04"); // roundtrip error
-
-        std::locale::global(orig_locale);
-    }
-
-    SECTION("issue #378 - locale-independent num-to-str")
-    {
-        setlocale(LC_NUMERIC, "de_DE.UTF-8");
-
-        // verify that dumped correctly with '.' and no grouping
-        const json j1 = 12345.67;
-        CHECK(json(12345.67).dump() == "12345.67");
-        setlocale(LC_NUMERIC, "C");
-    }
-
-    SECTION("issue #379 - locale-independent str-to-num")
-    {
-        setlocale(LC_NUMERIC, "de_DE.UTF-8");
-
-        // verify that parsed correctly despite using strtod internally
-        CHECK(json::parse("3.14").get<double>() == 3.14);
-
-        // check a different code path
-        CHECK(json::parse("1.000000000000000000000000000000000000000000000000000000000000000000000000").get<double>() == 1.0);
-    }
-
-    SECTION("issue #233 - Can't use basic_json::iterator as a base iterator for std::move_iterator")
-    {
-        json source = {"a", "b", "c"};
-        json expected = {"a", "b"};
-        json dest;
-
-        std::copy_n(std::make_move_iterator(source.begin()), 2, std::back_inserter(dest));
-
-        CHECK(dest == expected);
-    }
-
-    SECTION("issue #235 - ambiguous overload for 'push_back' and 'operator+='")
-    {
-        json data = {{"key", "value"}};
-        data.push_back({"key2", "value2"});
-        data += {"key3", "value3"};
-
-        CHECK(data == json({{"key", "value"}, {"key2", "value2"}, {"key3", "value3"}}));
-    }
-
-    SECTION("issue #269 - diff generates incorrect patch when removing multiple array elements")
-    {
-        json doc = R"( { "arr1": [1, 2, 3, 4] } )"_json;
-        json expected = R"( { "arr1": [1, 2] } )"_json;
-
-        // check roundtrip
-        CHECK(doc.patch(json::diff(doc, expected)) == expected);
-    }
-
-    SECTION("issue #283 - value() does not work with _json_pointer types")
-    {
-        json j =
-        {
-            {"object", {{"key1", 1}, {"key2", 2}}},
-        };
-
-        int at_integer{j.at("/object/key2"_json_pointer)};
-        int val_integer = j.value("/object/key2"_json_pointer, 0);
-
-        CHECK(at_integer == val_integer);
-    }
-
-    SECTION("issue #304 - Unused variable warning")
-    {
-        // code triggered a "warning: unused variable" warning and is left
-        // here to avoid the warning in the future
-        json object;
-        json patch = json::array();
-        object = object.patch(patch);
-    }
-
-    SECTION("issue #306 - Parsing fails without space at end of file")
-    {
-        for (auto filename :
-                {
-                    TEST_DATA_DIRECTORY "/regression/broken_file.json",
-                    TEST_DATA_DIRECTORY "/regression/working_file.json"
-                })
-        {
-            CAPTURE(filename)
-            json j;
-            std::ifstream f(filename);
-            CHECK_NOTHROW(f >> j);
-        }
-    }
-
-    SECTION("issue #310 - make json_benchmarks no longer working in 2.0.4")
-    {
-        for (auto filename :
-                {
-                    TEST_DATA_DIRECTORY "/regression/floats.json",
-                    TEST_DATA_DIRECTORY "/regression/signed_ints.json",
-                    TEST_DATA_DIRECTORY "/regression/unsigned_ints.json",
-                    TEST_DATA_DIRECTORY "/regression/small_signed_ints.json"
-                })
-        {
-            CAPTURE(filename)
-            json j;
-            std::ifstream f(filename);
-            CHECK_NOTHROW(f >> j);
-        }
-    }
-
-    SECTION("issue #323 - add nested object capabilities to pointers")
-    {
-        json j;
-        j["/this/that/2"_json_pointer] = 27;
-        CHECK(j == json({{"this", {{"that", {nullptr, nullptr, 27}}}}}));
-    }
-
-    SECTION("issue #329 - serialized value not always can be parsed")
-    {
-        json _;
-        CHECK_THROWS_AS(_ = json::parse("22e2222"), json::out_of_range&);
-        CHECK_THROWS_WITH(_ = json::parse("22e2222"),
-                          "[json.exception.out_of_range.406] number overflow parsing '22e2222'");
-    }
-
-    SECTION("issue #360 - Loss of precision when serializing <double>")
-    {
-        auto check_roundtrip = [](double number)
-        {
-            CAPTURE(number)
-
-            json j = number;
-            CHECK(j.is_number_float());
-
-            std::stringstream ss;
-            ss << j;
-
-            CHECK_NOTHROW(ss >> j);
-            CHECK(j.is_number_float());
-            CHECK(j.get<json::number_float_t>() == number);
-        };
-
-        check_roundtrip(100000000000.1236);
-        check_roundtrip((std::numeric_limits<json::number_float_t>::max)());
-
-        // Some more numbers which fail to roundtrip when serialized with digits10 significand digits (instead of max_digits10)
-        check_roundtrip(1.541888611948064e-17);
-        check_roundtrip(5.418771028591015e-16);
-        check_roundtrip(9.398685592608595e-15);
-        check_roundtrip(8.826843952762347e-14);
-        check_roundtrip(8.143291313475335e-13);
-        check_roundtrip(4.851328172762508e-12);
-        check_roundtrip(6.677850998084358e-11);
-        check_roundtrip(3.995398518174525e-10);
-        check_roundtrip(1.960452605645124e-9);
-        check_roundtrip(3.551812586302883e-8);
-        check_roundtrip(2.947988411689261e-7);
-        check_roundtrip(8.210166748056192e-6);
-        check_roundtrip(6.104889704266753e-5);
-        check_roundtrip(0.0008629954631330876);
-        check_roundtrip(0.004936993881051611);
-        check_roundtrip(0.08309725102608073);
-        check_roundtrip(0.5210494268499783);
-        check_roundtrip(6.382927930939767);
-        check_roundtrip(59.94947245358671);
-        check_roundtrip(361.0838651266122);
-        check_roundtrip(4678.354596181877);
-        check_roundtrip(61412.17658956043);
-        check_roundtrip(725696.0799057782);
-        check_roundtrip(2811732.583399828);
-        check_roundtrip(30178351.07533605);
-        check_roundtrip(689684880.3235844);
-        check_roundtrip(5714887673.555147);
-        check_roundtrip(84652038821.18808);
-        check_roundtrip(156510583431.7721);
-        check_roundtrip(5938450569021.732);
-        check_roundtrip(83623297654460.33);
-        check_roundtrip(701466573254773.6);
-        check_roundtrip(1369013370304513);
-        check_roundtrip(96963648023094720);
-        check_roundtrip(3.478237409280108e+17);
-    }
-
-    SECTION("issue #366 - json::parse on failed stream gets stuck")
-    {
-        std::ifstream f("file_not_found.json");
-        json _;
-        CHECK_THROWS_AS(_ = json::parse(f), json::parse_error&);
-        CHECK_THROWS_WITH(_ = json::parse(f), "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error while parsing value - unexpected end of input; expected '[', '{', or a literal");
-    }
-
-    SECTION("issue #367 - calling stream at EOF")
-    {
-        std::stringstream ss;
-        json j;
-        ss << "123";
-        CHECK_NOTHROW(ss >> j);
-
-        // see https://github.com/nlohmann/json/issues/367#issuecomment-262841893:
-        // ss is not at EOF; this yielded an error before the fix
-        // (threw basic_string::append). No, it should just throw
-        // a parse error because of the EOF.
-        CHECK_THROWS_AS(ss >> j, json::parse_error&);
-        CHECK_THROWS_WITH(ss >> j,
-                          "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error while parsing value - unexpected end of input; expected '[', '{', or a literal");
-    }
-
-    SECTION("issue #367 - behavior of operator>> should more closely resemble that of built-in overloads")
-    {
-        SECTION("(empty)")
-        {
-            std::stringstream ss;
-            json j;
-            CHECK_THROWS_AS(ss >> j, json::parse_error&);
-            CHECK_THROWS_WITH(ss >> j,
-                              "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error while parsing value - unexpected end of input; expected '[', '{', or a literal");
-        }
-
-        SECTION("(whitespace)")
-        {
-            std::stringstream ss;
-            ss << "   ";
-            json j;
-            CHECK_THROWS_AS(ss >> j, json::parse_error&);
-            CHECK_THROWS_WITH(ss >> j,
-                              "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error while parsing value - unexpected end of input; expected '[', '{', or a literal");
-        }
-
-        SECTION("one value")
-        {
-            std::stringstream ss;
-            ss << "111";
-            json j;
-            CHECK_NOTHROW(ss >> j);
-            CHECK(j == 111);
-
-            CHECK_THROWS_AS(ss >> j, json::parse_error&);
-            CHECK_THROWS_WITH(ss >> j,
-                              "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error while parsing value - unexpected end of input; expected '[', '{', or a literal");
-        }
-
-        SECTION("one value + whitespace")
-        {
-            std::stringstream ss;
-            ss << "222 \t\n";
-            json j;
-            CHECK_NOTHROW(ss >> j);
-            CHECK(j == 222);
-
-            CHECK_THROWS_AS(ss >> j, json::parse_error&);
-            CHECK_THROWS_WITH(ss >> j,
-                              "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error while parsing value - unexpected end of input; expected '[', '{', or a literal");
-        }
-
-        SECTION("whitespace + one value")
-        {
-            std::stringstream ss;
-            ss << "\n\t 333";
-            json j;
-            CHECK_NOTHROW(ss >> j);
-            CHECK(j == 333);
-
-            CHECK_THROWS_AS(ss >> j, json::parse_error&);
-            CHECK_THROWS_WITH(ss >> j,
-                              "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error while parsing value - unexpected end of input; expected '[', '{', or a literal");
-        }
-
-        SECTION("three values")
-        {
-            std::stringstream ss;
-            ss << " 111 \n222\n \n  333";
-            json j;
-            CHECK_NOTHROW(ss >> j);
-            CHECK(j == 111);
-            CHECK_NOTHROW(ss >> j);
-            CHECK(j == 222);
-            CHECK_NOTHROW(ss >> j);
-            CHECK(j == 333);
-
-            CHECK_THROWS_AS(ss >> j, json::parse_error&);
-            CHECK_THROWS_WITH(ss >> j,
-                              "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error while parsing value - unexpected end of input; expected '[', '{', or a literal");
-        }
-
-        SECTION("literals without whitespace")
-        {
-            std::stringstream ss;
-            ss << "truefalsenull\"\"";
-            json j;
-            CHECK_NOTHROW(ss >> j);
-            CHECK(j == true);
-            CHECK_NOTHROW(ss >> j);
-            CHECK(j == false);
-            CHECK_NOTHROW(ss >> j);
-            CHECK(j == nullptr);
-            CHECK_NOTHROW(ss >> j);
-            CHECK(j == "");
-
-            CHECK_THROWS_AS(ss >> j, json::parse_error&);
-            CHECK_THROWS_WITH(ss >> j,
-                              "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error while parsing value - unexpected end of input; expected '[', '{', or a literal");
-        }
-
-        SECTION("example from #529")
-        {
-            std::stringstream ss;
-            ss << "{\n    \"one\"   : 1,\n    \"two\"   : 2\n}\n{\n    \"three\" : 3\n}";
-            json j;
-            CHECK_NOTHROW(ss >> j);
-            CHECK(j == json({{"one", 1}, {"two", 2}}));
-            CHECK_NOTHROW(ss >> j);
-            CHECK(j == json({{"three", 3}}));
-
-            CHECK_THROWS_AS(ss >> j, json::parse_error&);
-            CHECK_THROWS_WITH(ss >> j,
-                              "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error while parsing value - unexpected end of input; expected '[', '{', or a literal");
-        }
-
-        SECTION("second example from #529")
-        {
-            std::string str = "{\n\"one\"   : 1,\n\"two\"   : 2\n}\n{\n\"three\" : 3\n}";
-
-            {
-                std::ofstream file("test.json");
-                file << str;
-            }
-
-            std::ifstream stream("test.json", std::ifstream::in);
-            json val;
-
-            size_t i = 0;
-            while (stream.peek() != EOF)
-            {
-                CAPTURE(i)
-                CHECK_NOTHROW(stream >> val);
-
-                CHECK(i < 2);
-
-                if (i == 0)
-                {
-                    CHECK(val == json({{"one", 1}, {"two", 2}}));
-                }
-
-                if (i == 1)
-                {
-                    CHECK(val == json({{"three", 3}}));
-                }
-
-                ++i;
-            }
-
-            std::remove("test.json");
-        }
-    }
-
-    SECTION("issue #389 - Integer-overflow (OSS-Fuzz issue 267)")
-    {
-        // original test case
-        json j1 = json::parse("-9223372036854775808");
-        CHECK(j1.is_number_integer());
-        CHECK(j1.get<json::number_integer_t>() == INT64_MIN);
-
-        // edge case (+1; still an integer)
-        json j2 = json::parse("-9223372036854775807");
-        CHECK(j2.is_number_integer());
-        CHECK(j2.get<json::number_integer_t>() == INT64_MIN + 1);
-
-        // edge case (-1; overflow -> floats)
-        json j3 = json::parse("-9223372036854775809");
-        CHECK(j3.is_number_float());
-    }
-
-    SECTION("issue #380 - bug in overflow detection when parsing integers")
-    {
-        json j = json::parse("166020696663385964490");
-        CHECK(j.is_number_float());
-        CHECK(j.get<json::number_float_t>() == 166020696663385964490.0);
-    }
-
-    SECTION("issue #405 - Heap-buffer-overflow (OSS-Fuzz issue 342)")
-    {
-        // original test case
-        std::vector<uint8_t> vec {0x65, 0xf5, 0x0a, 0x48, 0x21};
-        json _;
-        CHECK_THROWS_AS(_ = json::from_cbor(vec), json::parse_error&);
-        CHECK_THROWS_WITH(_ = json::from_cbor(vec),
-                          "[json.exception.parse_error.110] parse error at byte 6: syntax error while parsing CBOR string: unexpected end of input");
-    }
-
-    SECTION("issue #407 - Heap-buffer-overflow (OSS-Fuzz issue 343)")
-    {
-        json _;
-
-        // original test case: incomplete float64
-        std::vector<uint8_t> vec1 {0xcb, 0x8f, 0x0a};
-        CHECK_THROWS_AS(_ = json::from_msgpack(vec1), json::parse_error&);
-        CHECK_THROWS_WITH(_ = json::from_msgpack(vec1),
-                          "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing MessagePack number: unexpected end of input");
-
-        // related test case: incomplete float32
-        std::vector<uint8_t> vec2 {0xca, 0x8f, 0x0a};
-        CHECK_THROWS_AS(_ = json::from_msgpack(vec2), json::parse_error&);
-        CHECK_THROWS_WITH(_ = json::from_msgpack(vec2),
-                          "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing MessagePack number: unexpected end of input");
-
-        // related test case: incomplete Half-Precision Float (CBOR)
-        std::vector<uint8_t> vec3 {0xf9, 0x8f};
-        CHECK_THROWS_AS(_ = json::from_cbor(vec3), json::parse_error&);
-        CHECK_THROWS_WITH(_ = json::from_cbor(vec3),
-                          "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing CBOR number: unexpected end of input");
-
-        // related test case: incomplete Single-Precision Float (CBOR)
-        std::vector<uint8_t> vec4 {0xfa, 0x8f, 0x0a};
-        CHECK_THROWS_AS(_ = json::from_cbor(vec4), json::parse_error&);
-        CHECK_THROWS_WITH(_ = json::from_cbor(vec4),
-                          "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing CBOR number: unexpected end of input");
-
-        // related test case: incomplete Double-Precision Float (CBOR)
-        std::vector<uint8_t> vec5 {0xfb, 0x8f, 0x0a};
-        CHECK_THROWS_AS(_ = json::from_cbor(vec5), json::parse_error&);
-        CHECK_THROWS_WITH(_ = json::from_cbor(vec5),
-                          "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing CBOR number: unexpected end of input");
-    }
-
-    SECTION("issue #408 - Heap-buffer-overflow (OSS-Fuzz issue 344)")
-    {
-        json _;
-
-        // original test case
-        std::vector<uint8_t> vec1 {0x87};
-        CHECK_THROWS_AS(_ = json::from_msgpack(vec1), json::parse_error&);
-        CHECK_THROWS_WITH(_ = json::from_msgpack(vec1),
-                          "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing MessagePack string: unexpected end of input");
-
-        // more test cases for MessagePack
-        for (auto b :
-                {
-                    0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, // fixmap
-                    0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, // fixarray
-                    0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, // fixstr
-                    0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf
-                })
-        {
-            std::vector<uint8_t> vec(1, static_cast<uint8_t>(b));
-            CHECK_THROWS_AS(_ = json::from_msgpack(vec), json::parse_error&);
-        }
-
-        // more test cases for CBOR
-        for (auto b :
-                {
-                    0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
-                    0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, // UTF-8 string
-                    0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
-                    0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, // array
-                    0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
-                    0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7 // map
-                })
-        {
-            std::vector<uint8_t> vec(1, static_cast<uint8_t>(b));
-            CHECK_THROWS_AS(_ = json::from_cbor(vec), json::parse_error&);
-        }
-
-        // special case: empty input
-        std::vector<uint8_t> vec2;
-        CHECK_THROWS_AS(_ = json::from_cbor(vec2), json::parse_error&);
-        CHECK_THROWS_WITH(_ = json::from_cbor(vec2),
-                          "[json.exception.parse_error.110] parse error at byte 1: syntax error while parsing CBOR value: unexpected end of input");
-        CHECK_THROWS_AS(_ = json::from_msgpack(vec2), json::parse_error&);
-        CHECK_THROWS_WITH(_ = json::from_msgpack(vec2),
-                          "[json.exception.parse_error.110] parse error at byte 1: syntax error while parsing MessagePack value: unexpected end of input");
-    }
-
-    SECTION("issue #411 - Heap-buffer-overflow (OSS-Fuzz issue 366)")
-    {
-        json _;
-
-        // original test case: empty UTF-8 string (indefinite length)
-        std::vector<uint8_t> vec1 {0x7f};
-        CHECK_THROWS_AS(_ = json::from_cbor(vec1), json::parse_error&);
-        CHECK_THROWS_WITH(_ = json::from_cbor(vec1),
-                          "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing CBOR string: unexpected end of input");
-
-        // related test case: empty array (indefinite length)
-        std::vector<uint8_t> vec2 {0x9f};
-        CHECK_THROWS_AS(_ = json::from_cbor(vec2), json::parse_error&);
-        CHECK_THROWS_WITH(_ = json::from_cbor(vec2),
-                          "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing CBOR value: unexpected end of input");
-
-        // related test case: empty map (indefinite length)
-        std::vector<uint8_t> vec3 {0xbf};
-        CHECK_THROWS_AS(_ = json::from_cbor(vec3), json::parse_error&);
-        CHECK_THROWS_WITH(_ = json::from_cbor(vec3),
-                          "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing CBOR string: unexpected end of input");
-    }
-
-    SECTION("issue #412 - Heap-buffer-overflow (OSS-Fuzz issue 367)")
-    {
-        // original test case
-        std::vector<uint8_t> vec
-        {
-            0xab, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98,
-            0x98, 0x98, 0x98, 0x98, 0x98, 0x00, 0x00, 0x00,
-            0x60, 0xab, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98,
-            0x98, 0x98, 0x98, 0x98, 0x98, 0x00, 0x00, 0x00,
-            0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60,
-            0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60,
-            0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60,
-            0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60,
-            0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60,
-            0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60,
-            0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0xa0, 0x9f,
-            0x9f, 0x97, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60,
-            0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60,
-            0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60,
-            0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60,
-            0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60,
-            0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60
-        };
-
-        json _;
-        CHECK_THROWS_AS(_ = json::from_cbor(vec), json::parse_error&);
-        CHECK_THROWS_WITH(_ = json::from_cbor(vec),
-                          "[json.exception.parse_error.113] parse error at byte 2: syntax error while parsing CBOR string: expected length specification (0x60-0x7B) or indefinite string type (0x7F); last byte: 0x98");
-
-        // related test case: nonempty UTF-8 string (indefinite length)
-        std::vector<uint8_t> vec1 {0x7f, 0x61, 0x61};
-        CHECK_THROWS_AS(_ = json::from_cbor(vec1), json::parse_error&);
-        CHECK_THROWS_WITH(_ = json::from_cbor(vec1),
-                          "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing CBOR string: unexpected end of input");
-
-        // related test case: nonempty array (indefinite length)
-        std::vector<uint8_t> vec2 {0x9f, 0x01};
-        CHECK_THROWS_AS(_ = json::from_cbor(vec2), json::parse_error&);
-        CHECK_THROWS_WITH(_ = json::from_cbor(vec2),
-                          "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing CBOR value: unexpected end of input");
-
-        // related test case: nonempty map (indefinite length)
-        std::vector<uint8_t> vec3 {0xbf, 0x61, 0x61, 0x01};
-        CHECK_THROWS_AS(_ = json::from_cbor(vec3), json::parse_error&);
-        CHECK_THROWS_WITH(_ = json::from_cbor(vec3),
-                          "[json.exception.parse_error.110] parse error at byte 5: syntax error while parsing CBOR string: unexpected end of input");
-    }
-
-    SECTION("issue #414 - compare with literal 0)")
-    {
-#define CHECK_TYPE(v) \
-    CHECK((json(v) == v));\
-    CHECK((v == json(v)));\
-    CHECK_FALSE((json(v) != v));\
-    CHECK_FALSE((v != json(v)));
-
-        CHECK_TYPE(nullptr)
-        CHECK_TYPE(0)
-        CHECK_TYPE(0u)
-        CHECK_TYPE(0L)
-        CHECK_TYPE(0.0)
-        CHECK_TYPE("")
-
-#undef CHECK_TYPE
-    }
-
-    SECTION("issue #416 - Use-of-uninitialized-value (OSS-Fuzz issue 377)")
-    {
-        // original test case
-        std::vector<uint8_t> vec1
-        {
-            0x94, 0xfa, 0xfa, 0xfa, 0xfa, 0xfa, 0xfa, 0xfa,
-            0x3a, 0x96, 0x96, 0xb4, 0xb4, 0xb4, 0xb4, 0xb4,
-            0xb4, 0xb4, 0xb4, 0xb4, 0xb4, 0xb4, 0xb4, 0x71,
-            0xb4, 0xb4, 0xfa, 0xfa, 0xfa, 0xfa, 0xfa, 0x3a,
-            0x96, 0x96, 0xb4, 0xb4, 0xfa, 0x94, 0x94, 0x61,
-            0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0xfa
-        };
-
-        json _;
-        CHECK_THROWS_AS(_ = json::from_cbor(vec1), json::parse_error&);
-        CHECK_THROWS_WITH(_ = json::from_cbor(vec1),
-                          "[json.exception.parse_error.113] parse error at byte 13: syntax error while parsing CBOR string: expected length specification (0x60-0x7B) or indefinite string type (0x7F); last byte: 0xB4");
-
-        // related test case: double-precision
-        std::vector<uint8_t> vec2
-        {
-            0x94, 0xfa, 0xfa, 0xfa, 0xfa, 0xfa, 0xfa, 0xfa,
-            0x3a, 0x96, 0x96, 0xb4, 0xb4, 0xb4, 0xb4, 0xb4,
-            0xb4, 0xb4, 0xb4, 0xb4, 0xb4, 0xb4, 0xb4, 0x71,
-            0xb4, 0xb4, 0xfa, 0xfa, 0xfa, 0xfa, 0xfa, 0x3a,
-            0x96, 0x96, 0xb4, 0xb4, 0xfa, 0x94, 0x94, 0x61,
-            0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0xfb
-        };
-        CHECK_THROWS_AS(_ = json::from_cbor(vec2), json::parse_error&);
-        CHECK_THROWS_WITH(_ = json::from_cbor(vec2),
-                          "[json.exception.parse_error.113] parse error at byte 13: syntax error while parsing CBOR string: expected length specification (0x60-0x7B) or indefinite string type (0x7F); last byte: 0xB4");
-    }
-
-    SECTION("issue #452 - Heap-buffer-overflow (OSS-Fuzz issue 585)")
-    {
-        std::vector<uint8_t> vec = {'-', '0', '1', '2', '2', '7', '4'};
-        json _;
-        CHECK_THROWS_AS(_ = json::parse(vec), json::parse_error&);
-    }
-
-    SECTION("issue #454 - doubles are printed as integers")
-    {
-        json j = R"({"bool_value":true,"double_value":2.0,"int_value":10,"level1":{"list_value":[3,"hi",false],"tmp":5.0},"string_value":"hello"})"_json;
-        CHECK(j["double_value"].is_number_float());
-    }
-
-#if JSON_USE_IMPLICIT_CONVERSIONS
-    SECTION("issue #464 - VS2017 implicit to std::string conversion fix")
-    {
-        json v = "test";
-        std::string test;
-        test = v;
-        CHECK(v == "test");
-    }
-#endif
-
-    SECTION("issue #465 - roundtrip error while parsing 1000000000000000010E5")
-    {
-        json j1 = json::parse("1000000000000000010E5");
-        std::string s1 = j1.dump();
-        json j2 = json::parse(s1);
-        std::string s2 = j2.dump();
-        CHECK(s1 == s2);
-    }
-
-#if JSON_USE_IMPLICIT_CONVERSIONS
-    SECTION("issue #473 - inconsistent behavior in conversion to array type")
-    {
-        json j_array = {1, 2, 3, 4};
-        json j_number = 42;
-        json j_null = nullptr;
-
-        SECTION("std::vector")
-        {
-            auto create = [](const json & j)
-            {
-                std::vector<int> v = j;
-            };
-
-            CHECK_NOTHROW(create(j_array));
-            CHECK_THROWS_AS(create(j_number), json::type_error&);
-            CHECK_THROWS_WITH(create(j_number), "[json.exception.type_error.302] type must be array, but is number");
-            CHECK_THROWS_AS(create(j_null), json::type_error&);
-            CHECK_THROWS_WITH(create(j_null), "[json.exception.type_error.302] type must be array, but is null");
-        }
-
-        SECTION("std::list")
-        {
-            auto create = [](const json & j)
-            {
-                std::list<int> v = j;
-            };
-
-            CHECK_NOTHROW(create(j_array));
-            CHECK_THROWS_AS(create(j_number), json::type_error&);
-            CHECK_THROWS_WITH(create(j_number), "[json.exception.type_error.302] type must be array, but is number");
-            CHECK_THROWS_AS(create(j_null), json::type_error&);
-            CHECK_THROWS_WITH(create(j_null), "[json.exception.type_error.302] type must be array, but is null");
-        }
-
-        SECTION("std::forward_list")
-        {
-            auto create = [](const json & j)
-            {
-                std::forward_list<int> v = j;
-            };
-
-            CHECK_NOTHROW(create(j_array));
-            CHECK_THROWS_AS(create(j_number), json::type_error&);
-            CHECK_THROWS_WITH(create(j_number), "[json.exception.type_error.302] type must be array, but is number");
-            CHECK_THROWS_AS(create(j_null), json::type_error&);
-            CHECK_THROWS_WITH(create(j_null), "[json.exception.type_error.302] type must be array, but is null");
-        }
-    }
-#endif
-
-    SECTION("issue #486 - json::value_t can't be a map's key type in VC++ 2015")
-    {
-        // the code below must compile with MSVC
-        std::map<json::value_t, std::string> jsonTypes ;
-        jsonTypes[json::value_t::array] = "array";
-    }
-
-    SECTION("issue #494 - conversion from vector<bool> to json fails to build")
-    {
-        std::vector<bool> boolVector = {false, true, false, false};
-        json j;
-        j["bool_vector"] = boolVector;
-
-        CHECK(j["bool_vector"].dump() == "[false,true,false,false]");
-    }
-
-    SECTION("issue #504 - assertion error (OSS-Fuzz 856)")
-    {
-        std::vector<uint8_t> vec1 = {0xf9, 0xff, 0xff, 0x4a, 0x3a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x37, 0x02, 0x38};
-        json j1 = json::from_cbor(vec1, false);
-
-        // step 2: round trip
-        std::vector<uint8_t> vec2 = json::to_cbor(j1);
-
-        // parse serialization
-        json j2 = json::from_cbor(vec2);
-
-        // NaN is dumped to "null"
-        CHECK(j2.is_number_float());
-        CHECK(std::isnan(j2.get<json::number_float_t>()));
-        CHECK(j2.dump() == "null");
-
-        // check if serializations match
-        CHECK(json::to_cbor(j2) == vec2);
-    }
-
-    SECTION("issue #512 - use of overloaded operator '<=' is ambiguous")
-    {
-        json j;
-        j["a"] = 5;
-
-        // json op scalar
-        CHECK(j["a"] == 5);
-        CHECK(j["a"] != 4);
-
-        CHECK(j["a"] <= 7);
-        CHECK(j["a"] <  7);
-        CHECK(j["a"] >= 3);
-        CHECK(j["a"] >  3);
-
-
-        CHECK(!(j["a"] <= 4));
-        CHECK(!(j["a"] <  4));
-        CHECK(!(j["a"] >= 6));
-        CHECK(!(j["a"] >  6));
-
-        // scalar op json
-        CHECK(5 == j["a"]);
-        CHECK(4 != j["a"]);
-
-        CHECK(7 >= j["a"]);
-        CHECK(7 >  j["a"]);
-        CHECK(3 <= j["a"]);
-        CHECK(3 <  j["a"]);
-
-        CHECK(!(4 >= j["a"]));
-        CHECK(!(4 >  j["a"]));
-        CHECK(!(6 <= j["a"]));
-        CHECK(!(6 <  j["a"]));
-    }
-
-    SECTION("issue #575 - heap-buffer-overflow (OSS-Fuzz 1400)")
-    {
-        json _;
-        std::vector<uint8_t> vec = {'"', '\\', '"', 'X', '"', '"'};
-        CHECK_THROWS_AS(_ = json::parse(vec), json::parse_error&);
-    }
-
-#if JSON_USE_IMPLICIT_CONVERSIONS
-    SECTION("issue #600 - how does one convert a map in Json back to std::map?")
-    {
-        SECTION("example 1")
-        {
-            // create a map
-            std::map<std::string, int> m1 {{"key", 1}};
-
-            // create and print a JSON from the map
-            json j = m1;
-
-            // get the map out of JSON
-            std::map<std::string, int> m2 = j;
-
-            // make sure the roundtrip succeeds
-            CHECK(m1 == m2);
-        }
-
-        SECTION("example 2")
-        {
-            // create a map
-            std::map<std::string, std::string> m1 {{"key", "val"}};
-
-            // create and print a JSON from the map
-            json j = m1;
-
-            // get the map out of JSON
-            std::map<std::string, std::string> m2 = j;
-
-            // make sure the roundtrip succeeds
-            CHECK(m1 == m2);
-        }
-    }
-#endif
-
-    SECTION("issue #602 - BOM not skipped when using json:parse(iterator)")
-    {
-        std::string i = "\xef\xbb\xbf{\n   \"foo\": true\n}";
-        json _;
-        CHECK_NOTHROW(_ = json::parse(i.begin(), i.end()));
-    }
-
-#if JSON_USE_IMPLICIT_CONVERSIONS
-    SECTION("issue #702 - conversion from valarray<double> to json fails to build")
-    {
-        SECTION("original example")
-        {
-            std::valarray<double> v;
-            nlohmann::json j;
-            j["test"] = v;
-        }
-
-        SECTION("full example")
-        {
-            std::valarray<double> v = {1.2, 2.3, 3.4, 4.5};
-            json j = v;
-            std::valarray<double> vj = j;
-
-            CHECK(j == json(vj));
-            CHECK(v.size() == vj.size());
-            for (size_t i = 0; i < v.size(); ++i)
-            {
-                CHECK(v[i] == vj[i]);
-                CHECK(v[i] == j[i]);
-            }
-
-            CHECK_THROWS_AS(json().get<std::valarray<double>>(), json::type_error&);
-            CHECK_THROWS_WITH(json().get<std::valarray<double>>(),
-                              "[json.exception.type_error.302] type must be array, but is null");
-        }
-    }
-#endif
-
-    SECTION("issue #367 - Behavior of operator>> should more closely resemble that of built-in overloads.")
-    {
-        SECTION("example 1")
-        {
-            std::istringstream i1_2_3( "{\"first\": \"one\" }{\"second\": \"two\"}3" );
-            json j1, j2, j3;
-            i1_2_3 >> j1;
-            i1_2_3 >> j2;
-            i1_2_3 >> j3;
-
-            auto m1 = j1.get<std::map<std::string, std::string>>();
-            auto m2 = j2.get<std::map<std::string, std::string>>();
-            int i3{j3};
-
-            CHECK( m1 == ( std::map<std::string, std::string> {{ "first",  "one" }} ));
-            CHECK( m2 == ( std::map<std::string, std::string> {{ "second", "two" }} ));
-            CHECK( i3 == 3 );
-        }
-    }
-
-    SECTION("issue #714 - throw std::ios_base::failure exception when failbit set to true")
-    {
-        {
-            std::ifstream is;
-            is.exceptions(
-                is.exceptions()
-                | std::ios_base::failbit
-                | std::ios_base::badbit
-            ); // handle different exceptions as 'file not found', 'permission denied'
-
-            is.open(TEST_DATA_DIRECTORY "/regression/working_file.json");
-            json _;
-            CHECK_NOTHROW(_ = nlohmann::json::parse(is));
-        }
-
-        {
-            std::ifstream is;
-            is.exceptions(
-                is.exceptions()
-                | std::ios_base::failbit
-                | std::ios_base::badbit
-            ); // handle different exceptions as 'file not found', 'permission denied'
-
-            is.open(TEST_DATA_DIRECTORY "/json_nlohmann_tests/all_unicode.json.cbor",
-                    std::ios_base::in | std::ios_base::binary);
-            json _;
-            CHECK_NOTHROW(_ = nlohmann::json::from_cbor(is));
-        }
-    }
-
-    SECTION("issue #805 - copy constructor is used with std::initializer_list constructor.")
-    {
-        nocopy n;
-        json j;
-        j = {{"nocopy", n}};
-        CHECK(j["nocopy"]["val"] == 0);
-    }
-
-    SECTION("issue #838 - incorrect parse error with binary data in keys")
-    {
-        uint8_t key1[] = { 103, 92, 117, 48, 48, 48, 55, 92, 114, 215, 126, 214, 95, 92, 34, 174, 40, 71, 38, 174, 40, 71, 38, 223, 134, 247, 127, 0 };
-        std::string key1_str(reinterpret_cast<char*>(key1));
-        json j = key1_str;
-        CHECK_THROWS_AS(j.dump(), json::type_error&);
-        CHECK_THROWS_WITH(j.dump(), "[json.exception.type_error.316] invalid UTF-8 byte at index 10: 0x7E");
-    }
-
-#if JSON_USE_IMPLICIT_CONVERSIONS
-    SECTION("issue #843 - converting to array not working")
-    {
-        json j;
-        std::array<int, 4> ar = {{1, 1, 1, 1}};
-        j = ar;
-        ar = j;
-    }
-#endif
-
-    SECTION("issue #894 - invalid RFC6902 copy operation succeeds")
-    {
-        auto model = R"({
-            "one": {
-                "two": {
-                    "three": "hello",
-                    "four": 42
-                }
-            }
-        })"_json;
-
-        auto p1 = R"([{"op": "move",
-                       "from": "/one/two/three",
-                       "path": "/a/b/c"}])"_json;
-        CHECK_THROWS_AS(model.patch(p1), json::out_of_range&);
-
-        auto p2 = R"([{"op": "move",
-                       "from": "/one/two/three",
-                       "path": "/a/b/c"}])"_json;
-        CHECK_THROWS_WITH(model.patch(p2),
-                          "[json.exception.out_of_range.403] key 'a' not found");
-
-        auto p3 = R"([{"op": "copy",
-                       "from": "/one/two/three",
-                       "path": "/a/b/c"}])"_json;
-        CHECK_THROWS_AS(model.patch(p3), json::out_of_range&);
-
-        auto p4 = R"([{"op": "copy",
-                                 "from": "/one/two/three",
-                                 "path": "/a/b/c"}])"_json;
-        CHECK_THROWS_WITH(model.patch(p4),
-                          "[json.exception.out_of_range.403] key 'a' not found");
-    }
-
-    SECTION("issue #961 - incorrect parsing of indefinite length CBOR strings")
-    {
-        std::vector<uint8_t> v_cbor =
-        {
-            0x7F,
-            0x64,
-            'a', 'b', 'c', 'd',
-            0x63,
-            '1', '2', '3',
-            0xFF
-        };
-        json j = json::from_cbor(v_cbor);
-        CHECK(j == "abcd123");
-    }
-
-    SECTION("issue #962 - Timeout (OSS-Fuzz 6034)")
-    {
-        json _;
-        std::vector<uint8_t> v_ubjson = {'[', '$', 'Z', '#', 'L', 0x78, 0x28, 0x00, 0x68, 0x28, 0x69, 0x69, 0x17};
-        CHECK_THROWS_AS(_ = json::from_ubjson(v_ubjson), json::out_of_range&);
-        //CHECK_THROWS_WITH(json::from_ubjson(v_ubjson),
-        //                  "[json.exception.out_of_range.408] excessive array size: 8658170730974374167");
-
-        v_ubjson[0] = '{';
-        CHECK_THROWS_AS(_ = json::from_ubjson(v_ubjson), json::out_of_range&);
-        //CHECK_THROWS_WITH(json::from_ubjson(v_ubjson),
-        //                  "[json.exception.out_of_range.408] excessive object size: 8658170730974374167");
-    }
-
-    SECTION("issue #971 - Add a SAX parser - late bug")
-    {
-        // a JSON text
-        auto text = R"(
-    {
-        "Image": {
-            "Width":  800,
-            "Height": 600,
-            "Title":  "View from 15th Floor",
-            "Thumbnail": {
-                "Url":    "http://www.example.com/image/481989943",
-                "Height": 125,
-                "Width":  100
-            },
-            "Animated" : false,
-            "IDs": [116, 943, 234, 38793]
-        }
-    }
-    )";
-
-        // define parser callback
-        json::parser_callback_t cb = [](int /*depth*/, json::parse_event_t event, json & parsed)
-        {
-            // skip object elements with key "Thumbnail"
-            if (event == json::parse_event_t::key && parsed == json("Thumbnail"))
-            {
-                return false;
-            }
-            else
-            {
-                return true;
-            }
-        };
-
-        // parse (with callback) and serialize JSON
-        json j_filtered = json::parse(text, cb);
-
-        CHECK(j_filtered == R"({"Image":{"Animated":false,"Height":600,"IDs":[116,943,234,38793], "Title":"View from 15th Floor","Width":800}})"_json);
-    }
-
-    SECTION("issue #972 - Segmentation fault on G++ when trying to assign json string literal to custom json type")
-    {
-        my_json foo = R"([1, 2, 3])"_json;
-    }
-
-    SECTION("issue #977 - Assigning between different json types")
-    {
-        foo_json lj = ns::foo{3};
-        ns::foo ff(lj);
-        CHECK(lj.is_object());
-        CHECK(lj.size() == 1);
-        CHECK(lj["x"] == 3);
-        CHECK(ff.x == 3);
-        nlohmann::json nj = lj;                // This line works as expected
-    }
-}
-
-#if !defined(JSON_NOEXCEPTION)
-TEST_CASE("regression tests, exceptions dependent")
-{
-    SECTION("issue #1340 - eof not set on exhausted input stream")
-    {
-        std::stringstream s("{}{}");
-        json j;
-        s >> j;
-        s >> j;
-        CHECK_THROWS_AS(s >> j, json::parse_error const&);
-        CHECK(s.eof());
-    }
-}
-#endif
-
-/////////////////////////////////////////////////////////////////////
-// for #1642
-/////////////////////////////////////////////////////////////////////
-
-// the code below fails with Clang on Windows, so we need to exclude it there
-#if defined(__clang__) && (defined(WIN32) || defined(_WIN32) || defined(__WIN32) && !defined(__CYGWIN__))
-#else
-template <typename T> class array {};
-template <typename T> class object {};
-template <typename T> class string {};
-template <typename T> class number_integer {};
-template <typename T> class number_unsigned {};
-template <typename T> class number_float {};
-#endif
diff --git a/external_imported/json/test/src/unit-regression2.cpp b/external_imported/json/test/src/unit-regression2.cpp
deleted file mode 100644
index 1e8c4922a..000000000
--- a/external_imported/json/test/src/unit-regression2.cpp
+++ /dev/null
@@ -1,501 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include "doctest_compatibility.h"
-DOCTEST_GCC_SUPPRESS_WARNING("-Wfloat-equal")
-
-// for some reason including this after the json header leads to linker errors with VS 2017...
-#include <locale>
-
-#define JSON_TESTS_PRIVATE
-#include <nlohmann/json.hpp>
-using nlohmann::json;
-
-#include <fstream>
-#include <sstream>
-#include <list>
-#include <cstdio>
-#include <test_data.hpp>
-
-#if (defined(__cplusplus) && __cplusplus >= 201703L) || (defined(_HAS_CXX17) && _HAS_CXX17 == 1) // fix for issue #464
-    #define JSON_HAS_CPP_17
-#endif
-
-#ifdef JSON_HAS_CPP_17
-    #include <variant>
-#endif
-
-#ifdef JSON_HAS_CPP_20
-    #include <span>
-#endif
-
-/////////////////////////////////////////////////////////////////////
-// for #1021
-/////////////////////////////////////////////////////////////////////
-
-using float_json = nlohmann::basic_json<std::map, std::vector, std::string, bool, std::int64_t, std::uint64_t, float>;
-
-/////////////////////////////////////////////////////////////////////
-// for #1647
-/////////////////////////////////////////////////////////////////////
-namespace
-{
-struct NonDefaultFromJsonStruct { };
-
-inline bool operator== (NonDefaultFromJsonStruct const&, NonDefaultFromJsonStruct const&)
-{
-    return true;
-}
-
-enum class for_1647 { one, two };
-
-NLOHMANN_JSON_SERIALIZE_ENUM(for_1647,
-{
-    {for_1647::one, "one"},
-    {for_1647::two, "two"},
-})
-}
-
-/////////////////////////////////////////////////////////////////////
-// for #1299
-/////////////////////////////////////////////////////////////////////
-
-struct Data
-{
-    Data() = default;
-    Data(const std::string& a_, const std::string b_) : a(a_), b(b_) {}
-    std::string a {};
-    std::string b {};
-};
-
-void from_json(const json& j, Data& data)
-{
-    j["a"].get_to(data.a);
-    j["b"].get_to(data.b);
-}
-
-bool operator==(Data const& lhs, Data const& rhs)
-{
-    return lhs.a == rhs.a && lhs.b == rhs.b;
-}
-
-//bool operator!=(Data const& lhs, Data const& rhs)
-//{
-//    return !(lhs == rhs);
-//}
-
-namespace nlohmann
-{
-template <>
-struct adl_serializer<NonDefaultFromJsonStruct>
-{
-    static NonDefaultFromJsonStruct from_json (json const&) noexcept
-    {
-        return {};
-    }
-};
-}
-
-/////////////////////////////////////////////////////////////////////
-// for #1805
-/////////////////////////////////////////////////////////////////////
-
-struct NotSerializableData
-{
-    int mydata;
-    float myfloat;
-};
-
-
-TEST_CASE("regression tests 2")
-{
-    SECTION("issue #1001 - Fix memory leak during parser callback")
-    {
-        auto geojsonExample = R"(
-          { "type": "FeatureCollection",
-            "features": [
-              { "type": "Feature",
-                "geometry": {"type": "Point", "coordinates": [102.0, 0.5]},
-                "properties": {"prop0": "value0"}
-                },
-              { "type": "Feature",
-                "geometry": {
-                  "type": "LineString",
-                  "coordinates": [
-                    [102.0, 0.0], [103.0, 1.0], [104.0, 0.0], [105.0, 1.0]
-                    ]
-                  },
-                "properties": {
-                  "prop0": "value0",
-                  "prop1": 0.0
-                  }
-                },
-              { "type": "Feature",
-                 "geometry": {
-                   "type": "Polygon",
-                   "coordinates": [
-                     [ [100.0, 0.0], [101.0, 0.0], [101.0, 1.0],
-                       [100.0, 1.0], [100.0, 0.0] ]
-                     ]
-                 },
-                 "properties": {
-                   "prop0": "value0",
-                   "prop1": {"this": "that"}
-                   }
-                 }
-               ]
-             })";
-
-        json::parser_callback_t cb = [&](int, json::parse_event_t event, json & parsed)
-        {
-            // skip uninteresting events
-            if (event == json::parse_event_t::value && !parsed.is_primitive())
-            {
-                return false;
-            }
-
-            switch (event)
-            {
-                case json::parse_event_t::key:
-                {
-                    return true;
-                }
-                case json::parse_event_t::value:
-                {
-                    return false;
-                }
-                case json::parse_event_t::object_start:
-                {
-                    return true;
-                }
-                case json::parse_event_t::object_end:
-                {
-                    return false;
-                }
-                case json::parse_event_t::array_start:
-                {
-                    return true;
-                }
-                case json::parse_event_t::array_end:
-                {
-                    return false;
-                }
-
-                default:
-                {
-                    return true;
-                }
-            }
-        };
-
-        auto j = json::parse(geojsonExample, cb, true);
-        CHECK(j == json());
-    }
-
-    SECTION("issue #1021 - to/from_msgpack only works with standard typization")
-    {
-        float_json j = 1000.0;
-        CHECK(float_json::from_cbor(float_json::to_cbor(j)) == j);
-        CHECK(float_json::from_msgpack(float_json::to_msgpack(j)) == j);
-        CHECK(float_json::from_ubjson(float_json::to_ubjson(j)) == j);
-
-        float_json j2 = {1000.0, 2000.0, 3000.0};
-        CHECK(float_json::from_ubjson(float_json::to_ubjson(j2, true, true)) == j2);
-    }
-
-    SECTION("issue #1045 - Using STL algorithms with JSON containers with expected results?")
-    {
-        json diffs = nlohmann::json::array();
-        json m1{{"key1", 42}};
-        json m2{{"key2", 42}};
-        auto p1 = m1.items();
-        auto p2 = m2.items();
-
-        using it_type = decltype(p1.begin());
-
-        std::set_difference(
-            p1.begin(), p1.end(),
-            p2.begin(), p2.end(),
-            std::inserter(diffs, diffs.end()), [&](const it_type & e1, const it_type & e2) -> bool
-        {
-            using comper_pair = std::pair<std::string, decltype(e1.value())>; // Trying to avoid unneeded copy
-            return comper_pair(e1.key(), e1.value()) < comper_pair(e2.key(), e2.value()); // Using pair comper
-        });
-
-        CHECK(diffs.size() == 1); // Note the change here, was 2
-    }
-
-#ifdef JSON_HAS_CPP_17
-    SECTION("issue #1292 - Serializing std::variant causes stack overflow")
-    {
-        static_assert(
-            !std::is_constructible<json, std::variant<int, float>>::value, "");
-    }
-#endif
-
-    SECTION("issue #1299 - compile error in from_json converting to container "
-            "with std::pair")
-    {
-        json j =
-        {
-            {"1", {{"a", "testa_1"}, {"b", "testb_1"}}},
-            {"2", {{"a", "testa_2"}, {"b", "testb_2"}}},
-            {"3", {{"a", "testa_3"}, {"b", "testb_3"}}},
-        };
-
-        std::map<std::string, Data> expected
-        {
-            {"1", {"testa_1", "testb_1"}},
-            {"2", {"testa_2", "testb_2"}},
-            {"3", {"testa_3", "testb_3"}},
-        };
-        const auto data = j.get<decltype(expected)>();
-        CHECK(expected == data);
-    }
-
-    SECTION("issue #1445 - buffer overflow in dumping invalid utf-8 strings")
-    {
-        SECTION("a bunch of -1, ensure_ascii=true")
-        {
-            const auto length = 300;
-
-            json dump_test;
-            dump_test["1"] = std::string(length, -1);
-
-            std::string expected = "{\"1\":\"";
-            for (int i = 0; i < length; ++i)
-            {
-                expected += "\\ufffd";
-            }
-            expected += "\"}";
-
-            auto s = dump_test.dump(-1, ' ', true, nlohmann::json::error_handler_t::replace);
-            CHECK(s == expected);
-        }
-        SECTION("a bunch of -2, ensure_ascii=false")
-        {
-            const auto length = 500;
-
-            json dump_test;
-            dump_test["1"] = std::string(length, -2);
-
-            std::string expected = "{\"1\":\"";
-            for (int i = 0; i < length; ++i)
-            {
-                expected += "\xEF\xBF\xBD";
-            }
-            expected += "\"}";
-
-            auto s = dump_test.dump(-1, ' ', false, nlohmann::json::error_handler_t::replace);
-            CHECK(s == expected);
-        }
-        SECTION("test case in issue #1445")
-        {
-            nlohmann::json dump_test;
-            const int data[] =
-            {
-                109,  108,  103,  125,  -122, -53,  115,
-                18,   3,    0,    102,  19,   1,    15,
-                -110, 13,   -3,   -1,   -81,  32,   2,
-                0,    0,    0,    0,    0,    0,    0,
-                8,    0,    0,    0,    0,    0,    0,
-                0,    0,    0,    0,    0,    -80,  2,
-                0,    0,    96,   -118, 46,   -116, 46,
-                109,  -84,  -87,  108,  14,   109,  -24,
-                -83,  13,   -18,  -51,  -83,  -52,  -115,
-                14,   6,    32,   0,    0,    0,    0,
-                0,    0,    0,    0,    0,    0,    0,
-                64,   3,    0,    0,    0,    35,   -74,
-                -73,  55,   57,   -128, 0,    0,    0,
-                0,    0,    0,    0,    0,    0,    0,
-                0,    0,    33,   0,    0,    0,    -96,
-                -54,  -28,  -26
-            };
-            std::string s;
-            for (unsigned i = 0; i < sizeof(data) / sizeof(int); i++)
-            {
-                s += static_cast<char>(data[i]);
-            }
-            dump_test["1"] = s;
-            dump_test.dump(-1, ' ', true, nlohmann::json::error_handler_t::replace);
-        }
-    }
-
-    SECTION("issue #1447 - Integer Overflow (OSS-Fuzz 12506)")
-    {
-        json j = json::parse("[-9223372036854775808]");
-        CHECK(j.dump() == "[-9223372036854775808]");
-    }
-
-    SECTION("issue #1708 - minimum value of int64_t can be outputted")
-    {
-        constexpr auto smallest = (std::numeric_limits<int64_t>::min)();
-        json j = smallest;
-        CHECK(j.dump() == std::to_string(smallest));
-    }
-
-    SECTION("issue #1727 - Contains with non-const lvalue json_pointer picks the wrong overload")
-    {
-        json j = {{"root", {{"settings", {{"logging", true}}}}}};
-
-        auto jptr1 = "/root/settings/logging"_json_pointer;
-        auto jptr2 = json::json_pointer{"/root/settings/logging"};
-
-        CHECK(j.contains(jptr1));
-        CHECK(j.contains(jptr2));
-    }
-
-    SECTION("issue #1647 - compile error when deserializing enum if both non-default from_json and non-member operator== exists for other type")
-    {
-        {
-            json j;
-            NonDefaultFromJsonStruct x(j);
-            NonDefaultFromJsonStruct y;
-            CHECK(x == y);
-        }
-
-        auto val = nlohmann::json("one").get<for_1647>();
-        CHECK(val == for_1647::one);
-        json j = val;
-    }
-
-    SECTION("issue #1715 - json::from_cbor does not respect allow_exceptions = false when input is string literal")
-    {
-        SECTION("string literal")
-        {
-            json cbor = json::from_cbor("B", true, false);
-            CHECK(cbor.is_discarded());
-        }
-
-        SECTION("string array")
-        {
-            const char input[] = { 'B', 0x00 };
-            json cbor = json::from_cbor(input, true, false);
-            CHECK(cbor.is_discarded());
-        }
-
-        SECTION("std::string")
-        {
-            json cbor = json::from_cbor(std::string("B"), true, false);
-            CHECK(cbor.is_discarded());
-        }
-    }
-
-    SECTION("issue #1805 - A pair<T1, T2> is json constructible only if T1 and T2 are json constructible")
-    {
-        static_assert(!std::is_constructible<json, std::pair<std::string, NotSerializableData>>::value, "");
-        static_assert(!std::is_constructible<json, std::pair<NotSerializableData, std::string>>::value, "");
-        static_assert(std::is_constructible<json, std::pair<int, std::string>>::value, "");
-    }
-    SECTION("issue #1825 - A tuple<Args..> is json constructible only if all T in Args are json constructible")
-    {
-        static_assert(!std::is_constructible<json, std::tuple<std::string, NotSerializableData>>::value, "");
-        static_assert(!std::is_constructible<json, std::tuple<NotSerializableData, std::string>>::value, "");
-        static_assert(std::is_constructible<json, std::tuple<int, std::string>>::value, "");
-    }
-
-    SECTION("issue #1983 - JSON patch diff for op=add formation is not as per standard (RFC 6902)")
-    {
-        const auto source = R"({ "foo": [ "1", "2" ] })"_json;
-        const auto target = R"({"foo": [ "1", "2", "3" ]})"_json;
-        const auto result = json::diff(source, target);
-        CHECK(result.dump() == R"([{"op":"add","path":"/foo/-","value":"3"}])");
-    }
-
-    SECTION("issue #2067 - cannot serialize binary data to text JSON")
-    {
-        const unsigned char data[] = {0x81, 0xA4, 0x64, 0x61, 0x74, 0x61, 0xC4, 0x0F, 0x33, 0x30, 0x30, 0x32, 0x33, 0x34, 0x30, 0x31, 0x30, 0x37, 0x30, 0x35, 0x30, 0x31, 0x30};
-        json j = json::from_msgpack(data, sizeof(data) / sizeof(data[0]));
-        CHECK_NOTHROW(
-            j.dump(4,                              // Indent
-                   ' ',                            // Indent char
-                   false,                          // Ensure ascii
-                   json::error_handler_t::strict  // Error
-                  )
-        );
-    }
-
-    SECTION("PR #2181 - regression bug with lvalue")
-    {
-        // see https://github.com/nlohmann/json/pull/2181#issuecomment-653326060
-        json j{{"x", "test"}};
-        std::string defval = "default value";
-        auto val = j.value("x", defval);
-        auto val2 = j.value("y", defval);
-    }
-
-    SECTION("issue #2293 - eof doesnt cause parsing to stop")
-    {
-        std::vector<uint8_t> data =
-        {
-            0x7B, 0x6F, 0x62, 0x6A, 0x65, 0x63, 0x74, 0x20, 0x4F, 0x42
-        };
-        json result = json::from_cbor(data, true, false);
-        CHECK(result.is_discarded());
-    }
-
-    SECTION("issue #2315 - json.update and vector<pair>does not work with ordered_json")
-    {
-        nlohmann::ordered_json jsonAnimals = {{"animal", "dog"}};
-        nlohmann::ordered_json jsonCat = {{"animal", "cat"}};
-        jsonAnimals.update(jsonCat);
-        CHECK(jsonAnimals["animal"] == "cat");
-
-        auto jsonAnimals_parsed = nlohmann::ordered_json::parse(jsonAnimals.dump());
-        CHECK(jsonAnimals == jsonAnimals_parsed);
-
-        std::vector<std::pair<std::string, int64_t>> intData = {std::make_pair("aaaa", 11),
-                                                                std::make_pair("bbb", 222)
-                                                               };
-        nlohmann::ordered_json jsonObj;
-        for (const auto& data : intData)
-        {
-            jsonObj[data.first] = data.second;
-        }
-        CHECK(jsonObj["aaaa"] == 11);
-        CHECK(jsonObj["bbb"] == 222);
-    }
-
-    SECTION("issue #2330 - ignore_comment=true fails on multiple consecutive lines starting with comments")
-    {
-        std::string ss = "//\n//\n{\n}\n";
-        json j = json::parse(ss, nullptr, true, true);
-        CHECK(j.dump() == "{}");
-    }
-
-#ifdef JSON_HAS_CPP_20
-    SECTION("issue #2546 - parsing containers of std::byte")
-    {
-        const char DATA[] = R"("Hello, world!")";
-        const auto s = std::as_bytes(std::span(DATA));
-        json j = json::parse(s);
-        CHECK(j.dump() == "\"Hello, world!\"");
-    }
-#endif
-}
diff --git a/external_imported/json/test/src/unit-serialization.cpp b/external_imported/json/test/src/unit-serialization.cpp
deleted file mode 100644
index 3a733d2ff..000000000
--- a/external_imported/json/test/src/unit-serialization.cpp
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include "doctest_compatibility.h"
-
-#include <nlohmann/json.hpp>
-using nlohmann::json;
-
-#include <sstream>
-#include <iomanip>
-
-TEST_CASE("serialization")
-{
-    SECTION("operator<<")
-    {
-        SECTION("no given width")
-        {
-            std::stringstream ss;
-            json j = {"foo", 1, 2, 3, false, {{"one", 1}}};
-            ss << j;
-            CHECK(ss.str() == "[\"foo\",1,2,3,false,{\"one\":1}]");
-        }
-
-        SECTION("given width")
-        {
-            std::stringstream ss;
-            json j = {"foo", 1, 2, 3, false, {{"one", 1}}};
-            ss << std::setw(4) << j;
-            CHECK(ss.str() ==
-                  "[\n    \"foo\",\n    1,\n    2,\n    3,\n    false,\n    {\n        \"one\": 1\n    }\n]");
-        }
-
-        SECTION("given fill")
-        {
-            std::stringstream ss;
-            json j = {"foo", 1, 2, 3, false, {{"one", 1}}};
-            ss << std::setw(1) << std::setfill('\t') << j;
-            CHECK(ss.str() ==
-                  "[\n\t\"foo\",\n\t1,\n\t2,\n\t3,\n\tfalse,\n\t{\n\t\t\"one\": 1\n\t}\n]");
-        }
-    }
-
-    SECTION("operator>>")
-    {
-        SECTION("no given width")
-        {
-            std::stringstream ss;
-            json j = {"foo", 1, 2, 3, false, {{"one", 1}}};
-            j >> ss;
-            CHECK(ss.str() == "[\"foo\",1,2,3,false,{\"one\":1}]");
-        }
-
-        SECTION("given width")
-        {
-            std::stringstream ss;
-            json j = {"foo", 1, 2, 3, false, {{"one", 1}}};
-            ss.width(4);
-            j >> ss;
-            CHECK(ss.str() ==
-                  "[\n    \"foo\",\n    1,\n    2,\n    3,\n    false,\n    {\n        \"one\": 1\n    }\n]");
-        }
-
-        SECTION("given fill")
-        {
-            std::stringstream ss;
-            json j = {"foo", 1, 2, 3, false, {{"one", 1}}};
-            ss.width(1);
-            ss.fill('\t');
-            j >> ss;
-            CHECK(ss.str() ==
-                  "[\n\t\"foo\",\n\t1,\n\t2,\n\t3,\n\tfalse,\n\t{\n\t\t\"one\": 1\n\t}\n]");
-        }
-    }
-
-    SECTION("dump")
-    {
-        SECTION("invalid character")
-        {
-            json j = "ä\xA9ü";
-
-            CHECK_THROWS_AS(j.dump(), json::type_error&);
-            CHECK_THROWS_WITH(j.dump(), "[json.exception.type_error.316] invalid UTF-8 byte at index 2: 0xA9");
-            CHECK_THROWS_AS(j.dump(1, ' ', false, json::error_handler_t::strict), json::type_error&);
-            CHECK_THROWS_WITH(j.dump(1, ' ', false, json::error_handler_t::strict), "[json.exception.type_error.316] invalid UTF-8 byte at index 2: 0xA9");
-            CHECK(j.dump(-1, ' ', false, json::error_handler_t::ignore) == "\"äü\"");
-            CHECK(j.dump(-1, ' ', false, json::error_handler_t::replace) == "\"ä\xEF\xBF\xBDü\"");
-            CHECK(j.dump(-1, ' ', true, json::error_handler_t::replace) == "\"\\u00e4\\ufffd\\u00fc\"");
-        }
-
-        SECTION("ending with incomplete character")
-        {
-            json j = "123\xC2";
-
-            CHECK_THROWS_AS(j.dump(), json::type_error&);
-            CHECK_THROWS_WITH(j.dump(), "[json.exception.type_error.316] incomplete UTF-8 string; last byte: 0xC2");
-            CHECK_THROWS_AS(j.dump(1, ' ', false, json::error_handler_t::strict), json::type_error&);
-            CHECK(j.dump(-1, ' ', false, json::error_handler_t::ignore) == "\"123\"");
-            CHECK(j.dump(-1, ' ', false, json::error_handler_t::replace) == "\"123\xEF\xBF\xBD\"");
-            CHECK(j.dump(-1, ' ', true, json::error_handler_t::replace) == "\"123\\ufffd\"");
-        }
-
-        SECTION("unexpected character")
-        {
-            json j = "123\xF1\xB0\x34\x35\x36";
-
-            CHECK_THROWS_AS(j.dump(), json::type_error&);
-            CHECK_THROWS_WITH(j.dump(), "[json.exception.type_error.316] invalid UTF-8 byte at index 5: 0x34");
-            CHECK_THROWS_AS(j.dump(1, ' ', false, json::error_handler_t::strict), json::type_error&);
-            CHECK(j.dump(-1, ' ', false, json::error_handler_t::ignore) == "\"123456\"");
-            CHECK(j.dump(-1, ' ', false, json::error_handler_t::replace) == "\"123\xEF\xBF\xBD\x34\x35\x36\"");
-            CHECK(j.dump(-1, ' ', true, json::error_handler_t::replace) == "\"123\\ufffd456\"");
-        }
-
-        SECTION("U+FFFD Substitution of Maximal Subparts")
-        {
-            // Some tests (mostly) from
-            // https://www.unicode.org/versions/Unicode11.0.0/ch03.pdf
-            // Section 3.9 -- U+FFFD Substitution of Maximal Subparts
-
-            auto test = [&](std::string const & input, std::string const & expected)
-            {
-                json j = input;
-                CHECK(j.dump(-1, ' ', true, json::error_handler_t::replace) == "\"" + expected + "\"");
-            };
-
-            test("\xC2", "\\ufffd");
-            test("\xC2\x41\x42", "\\ufffd" "\x41" "\x42");
-            test("\xC2\xF4", "\\ufffd" "\\ufffd");
-
-            test("\xF0\x80\x80\x41", "\\ufffd" "\\ufffd" "\\ufffd" "\x41");
-            test("\xF1\x80\x80\x41", "\\ufffd" "\x41");
-            test("\xF2\x80\x80\x41", "\\ufffd" "\x41");
-            test("\xF3\x80\x80\x41", "\\ufffd" "\x41");
-            test("\xF4\x80\x80\x41", "\\ufffd" "\x41");
-            test("\xF5\x80\x80\x41", "\\ufffd" "\\ufffd" "\\ufffd" "\x41");
-
-            test("\xF0\x90\x80\x41", "\\ufffd" "\x41");
-            test("\xF1\x90\x80\x41", "\\ufffd" "\x41");
-            test("\xF2\x90\x80\x41", "\\ufffd" "\x41");
-            test("\xF3\x90\x80\x41", "\\ufffd" "\x41");
-            test("\xF4\x90\x80\x41", "\\ufffd" "\\ufffd" "\\ufffd" "\x41");
-            test("\xF5\x90\x80\x41", "\\ufffd" "\\ufffd" "\\ufffd" "\x41");
-
-            test("\xC0\xAF\xE0\x80\xBF\xF0\x81\x82\x41", "\\ufffd" "\\ufffd" "\\ufffd" "\\ufffd" "\\ufffd" "\\ufffd" "\\ufffd" "\\ufffd" "\x41");
-            test("\xED\xA0\x80\xED\xBF\xBF\xED\xAF\x41", "\\ufffd" "\\ufffd" "\\ufffd" "\\ufffd" "\\ufffd" "\\ufffd" "\\ufffd" "\\ufffd" "\x41");
-            test("\xF4\x91\x92\x93\xFF\x41\x80\xBF\x42", "\\ufffd" "\\ufffd" "\\ufffd" "\\ufffd" "\\ufffd" "\x41" "\\ufffd""\\ufffd" "\x42");
-            test("\xE1\x80\xE2\xF0\x91\x92\xF1\xBF\x41", "\\ufffd" "\\ufffd" "\\ufffd" "\\ufffd" "\x41");
-        }
-    }
-
-    SECTION("to_string")
-    {
-        auto test = [&](std::string const & input, std::string const & expected)
-        {
-            using std::to_string;
-            json j = input;
-            CHECK(to_string(j) == "\"" + expected + "\"");
-        };
-
-        test("{\"x\":5,\"y\":6}", "{\\\"x\\\":5,\\\"y\\\":6}");
-        test("{\"x\":[10,null,null,null]}", "{\\\"x\\\":[10,null,null,null]}");
-        test("test", "test");
-        test("[3,\"false\",false]", "[3,\\\"false\\\",false]");
-    }
-}
-
-TEST_CASE_TEMPLATE("serialization for extreme integer values", T, int32_t, uint32_t, int64_t, uint64_t)
-{
-    SECTION("minimum")
-    {
-        constexpr auto minimum = (std::numeric_limits<T>::min)();
-        json j = minimum;
-        CHECK(j.dump() == std::to_string(minimum));
-    }
-
-    SECTION("maximum")
-    {
-        constexpr auto maximum = (std::numeric_limits<T>::max)();
-        json j = maximum;
-        CHECK(j.dump() == std::to_string(maximum));
-    }
-}
-
-TEST_CASE("dump with binary values")
-{
-    auto binary = json::binary({1, 2, 3, 4});
-    auto binary_empty = json::binary({});
-    auto binary_with_subtype = json::binary({1, 2, 3, 4}, 128);
-    auto binary_empty_with_subtype = json::binary({}, 128);
-
-    json object = {{"key", binary}};
-    json object_empty = {{"key", binary_empty}};
-    json object_with_subtype = {{"key", binary_with_subtype}};
-    json object_empty_with_subtype = {{"key", binary_empty_with_subtype}};
-
-    json array = {"value", 1, binary};
-    json array_empty = {"value", 1, binary_empty};
-    json array_with_subtype = {"value", 1, binary_with_subtype};
-    json array_empty_with_subtype = {"value", 1, binary_empty_with_subtype};
-
-    SECTION("normal")
-    {
-        CHECK(binary.dump() == "{\"bytes\":[1,2,3,4],\"subtype\":null}");
-        CHECK(binary_empty.dump() == "{\"bytes\":[],\"subtype\":null}");
-        CHECK(binary_with_subtype.dump() == "{\"bytes\":[1,2,3,4],\"subtype\":128}");
-        CHECK(binary_empty_with_subtype.dump() == "{\"bytes\":[],\"subtype\":128}");
-
-        CHECK(object.dump() == "{\"key\":{\"bytes\":[1,2,3,4],\"subtype\":null}}");
-        CHECK(object_empty.dump() == "{\"key\":{\"bytes\":[],\"subtype\":null}}");
-        CHECK(object_with_subtype.dump() == "{\"key\":{\"bytes\":[1,2,3,4],\"subtype\":128}}");
-        CHECK(object_empty_with_subtype.dump() == "{\"key\":{\"bytes\":[],\"subtype\":128}}");
-
-        CHECK(array.dump() == "[\"value\",1,{\"bytes\":[1,2,3,4],\"subtype\":null}]");
-        CHECK(array_empty.dump() == "[\"value\",1,{\"bytes\":[],\"subtype\":null}]");
-        CHECK(array_with_subtype.dump() == "[\"value\",1,{\"bytes\":[1,2,3,4],\"subtype\":128}]");
-        CHECK(array_empty_with_subtype.dump() == "[\"value\",1,{\"bytes\":[],\"subtype\":128}]");
-    }
-
-    SECTION("pretty-printed")
-    {
-        CHECK(binary.dump(4) == "{\n"
-              "    \"bytes\": [1, 2, 3, 4],\n"
-              "    \"subtype\": null\n"
-              "}");
-        CHECK(binary_empty.dump(4) == "{\n"
-              "    \"bytes\": [],\n"
-              "    \"subtype\": null\n"
-              "}");
-        CHECK(binary_with_subtype.dump(4) == "{\n"
-              "    \"bytes\": [1, 2, 3, 4],\n"
-              "    \"subtype\": 128\n"
-              "}");
-        CHECK(binary_empty_with_subtype.dump(4) == "{\n"
-              "    \"bytes\": [],\n"
-              "    \"subtype\": 128\n"
-              "}");
-
-        CHECK(object.dump(4) == "{\n"
-              "    \"key\": {\n"
-              "        \"bytes\": [1, 2, 3, 4],\n"
-              "        \"subtype\": null\n"
-              "    }\n"
-              "}");
-        CHECK(object_empty.dump(4) == "{\n"
-              "    \"key\": {\n"
-              "        \"bytes\": [],\n"
-              "        \"subtype\": null\n"
-              "    }\n"
-              "}");
-        CHECK(object_with_subtype.dump(4) == "{\n"
-              "    \"key\": {\n"
-              "        \"bytes\": [1, 2, 3, 4],\n"
-              "        \"subtype\": 128\n"
-              "    }\n"
-              "}");
-        CHECK(object_empty_with_subtype.dump(4) == "{\n"
-              "    \"key\": {\n"
-              "        \"bytes\": [],\n"
-              "        \"subtype\": 128\n"
-              "    }\n"
-              "}");
-
-        CHECK(array.dump(4) == "[\n"
-              "    \"value\",\n"
-              "    1,\n"
-              "    {\n"
-              "        \"bytes\": [1, 2, 3, 4],\n"
-              "        \"subtype\": null\n"
-              "    }\n"
-              "]");
-        CHECK(array_empty.dump(4) == "[\n"
-              "    \"value\",\n"
-              "    1,\n"
-              "    {\n"
-              "        \"bytes\": [],\n"
-              "        \"subtype\": null\n"
-              "    }\n"
-              "]");
-        CHECK(array_with_subtype.dump(4) == "[\n"
-              "    \"value\",\n"
-              "    1,\n"
-              "    {\n"
-              "        \"bytes\": [1, 2, 3, 4],\n"
-              "        \"subtype\": 128\n"
-              "    }\n"
-              "]");
-        CHECK(array_empty_with_subtype.dump(4) == "[\n"
-              "    \"value\",\n"
-              "    1,\n"
-              "    {\n"
-              "        \"bytes\": [],\n"
-              "        \"subtype\": 128\n"
-              "    }\n"
-              "]");
-    }
-}
diff --git a/external_imported/json/test/src/unit-ubjson.cpp b/external_imported/json/test/src/unit-ubjson.cpp
deleted file mode 100644
index f60477a82..000000000
--- a/external_imported/json/test/src/unit-ubjson.cpp
+++ /dev/null
@@ -1,2570 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include "doctest_compatibility.h"
-
-#include <nlohmann/json.hpp>
-using nlohmann::json;
-
-#include <iostream>
-#include <fstream>
-#include <set>
-#include <test_data.hpp>
-#include "test_utils.hpp"
-
-namespace
-{
-class SaxCountdown
-{
-  public:
-    explicit SaxCountdown(const int count) : events_left(count)
-    {}
-
-    bool null()
-    {
-        return events_left-- > 0;
-    }
-
-    bool boolean(bool)
-    {
-        return events_left-- > 0;
-    }
-
-    bool number_integer(json::number_integer_t)
-    {
-        return events_left-- > 0;
-    }
-
-    bool number_unsigned(json::number_unsigned_t)
-    {
-        return events_left-- > 0;
-    }
-
-    bool number_float(json::number_float_t, const std::string&)
-    {
-        return events_left-- > 0;
-    }
-
-    bool string(std::string&)
-    {
-        return events_left-- > 0;
-    }
-
-    bool binary(std::vector<std::uint8_t>&)
-    {
-        return events_left-- > 0;
-    }
-
-    bool start_object(std::size_t)
-    {
-        return events_left-- > 0;
-    }
-
-    bool key(std::string&)
-    {
-        return events_left-- > 0;
-    }
-
-    bool end_object()
-    {
-        return events_left-- > 0;
-    }
-
-    bool start_array(std::size_t)
-    {
-        return events_left-- > 0;
-    }
-
-    bool end_array()
-    {
-        return events_left-- > 0;
-    }
-
-    bool parse_error(std::size_t, const std::string&, const json::exception&)
-    {
-        return false;
-    }
-
-  private:
-    int events_left = 0;
-};
-}
-
-TEST_CASE("UBJSON")
-{
-    SECTION("individual values")
-    {
-        SECTION("discarded")
-        {
-            // discarded values are not serialized
-            json j = json::value_t::discarded;
-            const auto result = json::to_ubjson(j);
-            CHECK(result.empty());
-        }
-
-        SECTION("null")
-        {
-            json j = nullptr;
-            std::vector<uint8_t> expected = {'Z'};
-            const auto result = json::to_ubjson(j);
-            CHECK(result == expected);
-
-            // roundtrip
-            CHECK(json::from_ubjson(result) == j);
-            CHECK(json::from_ubjson(result, true, false) == j);
-        }
-
-        SECTION("boolean")
-        {
-            SECTION("true")
-            {
-                json j = true;
-                std::vector<uint8_t> expected = {'T'};
-                const auto result = json::to_ubjson(j);
-                CHECK(result == expected);
-
-                // roundtrip
-                CHECK(json::from_ubjson(result) == j);
-                CHECK(json::from_ubjson(result, true, false) == j);
-            }
-
-            SECTION("false")
-            {
-                json j = false;
-                std::vector<uint8_t> expected = {'F'};
-                const auto result = json::to_ubjson(j);
-                CHECK(result == expected);
-
-                // roundtrip
-                CHECK(json::from_ubjson(result) == j);
-                CHECK(json::from_ubjson(result, true, false) == j);
-            }
-        }
-
-        SECTION("number")
-        {
-            SECTION("signed")
-            {
-                SECTION("-9223372036854775808..-2147483649 (int64)")
-                {
-                    std::vector<int64_t> numbers;
-                    numbers.push_back((std::numeric_limits<int64_t>::min)());
-                    numbers.push_back(-1000000000000000000ll);
-                    numbers.push_back(-100000000000000000ll);
-                    numbers.push_back(-10000000000000000ll);
-                    numbers.push_back(-1000000000000000ll);
-                    numbers.push_back(-100000000000000ll);
-                    numbers.push_back(-10000000000000ll);
-                    numbers.push_back(-1000000000000ll);
-                    numbers.push_back(-100000000000ll);
-                    numbers.push_back(-10000000000ll);
-                    numbers.push_back(-2147483649ll);
-                    for (auto i : numbers)
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with integer number
-                        json j = i;
-
-                        // check type
-                        CHECK(j.is_number_integer());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back(static_cast<uint8_t>('L'));
-                        expected.push_back(static_cast<uint8_t>((i >> 56) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 48) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 40) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 32) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 24) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 16) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 8) & 0xff));
-                        expected.push_back(static_cast<uint8_t>(i & 0xff));
-
-                        // compare result + size
-                        const auto result = json::to_ubjson(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 9);
-
-                        // check individual bytes
-                        CHECK(result[0] == 'L');
-                        int64_t restored = (static_cast<int64_t>(result[1]) << 070) +
-                                           (static_cast<int64_t>(result[2]) << 060) +
-                                           (static_cast<int64_t>(result[3]) << 050) +
-                                           (static_cast<int64_t>(result[4]) << 040) +
-                                           (static_cast<int64_t>(result[5]) << 030) +
-                                           (static_cast<int64_t>(result[6]) << 020) +
-                                           (static_cast<int64_t>(result[7]) << 010) +
-                                           static_cast<int64_t>(result[8]);
-                        CHECK(restored == i);
-
-                        // roundtrip
-                        CHECK(json::from_ubjson(result) == j);
-                        CHECK(json::from_ubjson(result, true, false) == j);
-                    }
-                }
-
-                SECTION("-2147483648..-32769 (int32)")
-                {
-                    std::vector<int32_t> numbers;
-                    numbers.push_back(-32769);
-                    numbers.push_back(-100000);
-                    numbers.push_back(-1000000);
-                    numbers.push_back(-10000000);
-                    numbers.push_back(-100000000);
-                    numbers.push_back(-1000000000);
-                    numbers.push_back(-2147483647 - 1); // https://stackoverflow.com/a/29356002/266378
-                    for (auto i : numbers)
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with integer number
-                        json j = i;
-
-                        // check type
-                        CHECK(j.is_number_integer());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back(static_cast<uint8_t>('l'));
-                        expected.push_back(static_cast<uint8_t>((i >> 24) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 16) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 8) & 0xff));
-                        expected.push_back(static_cast<uint8_t>(i & 0xff));
-
-                        // compare result + size
-                        const auto result = json::to_ubjson(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 5);
-
-                        // check individual bytes
-                        CHECK(result[0] == 'l');
-                        int32_t restored = (static_cast<int32_t>(result[1]) << 030) +
-                                           (static_cast<int32_t>(result[2]) << 020) +
-                                           (static_cast<int32_t>(result[3]) << 010) +
-                                           static_cast<int32_t>(result[4]);
-                        CHECK(restored == i);
-
-                        // roundtrip
-                        CHECK(json::from_ubjson(result) == j);
-                        CHECK(json::from_ubjson(result, true, false) == j);
-                    }
-                }
-
-                SECTION("-32768..-129 (int16)")
-                {
-                    for (int32_t i = -32768; i <= -129; ++i)
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with integer number
-                        json j = i;
-
-                        // check type
-                        CHECK(j.is_number_integer());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back(static_cast<uint8_t>('I'));
-                        expected.push_back(static_cast<uint8_t>((i >> 8) & 0xff));
-                        expected.push_back(static_cast<uint8_t>(i & 0xff));
-
-                        // compare result + size
-                        const auto result = json::to_ubjson(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 3);
-
-                        // check individual bytes
-                        CHECK(result[0] == 'I');
-                        int16_t restored = static_cast<int16_t>(((result[1] << 8) + result[2]));
-                        CHECK(restored == i);
-
-                        // roundtrip
-                        CHECK(json::from_ubjson(result) == j);
-                        CHECK(json::from_ubjson(result, true, false) == j);
-                    }
-                }
-
-                SECTION("-9263 (int16)")
-                {
-                    json j = -9263;
-                    std::vector<uint8_t> expected = {'I', 0xdb, 0xd1};
-
-                    // compare result + size
-                    const auto result = json::to_ubjson(j);
-                    CHECK(result == expected);
-                    CHECK(result.size() == 3);
-
-                    // check individual bytes
-                    CHECK(result[0] == 'I');
-                    int16_t restored = static_cast<int16_t>(((result[1] << 8) + result[2]));
-                    CHECK(restored == -9263);
-
-                    // roundtrip
-                    CHECK(json::from_ubjson(result) == j);
-                    CHECK(json::from_ubjson(result, true, false) == j);
-                }
-
-                SECTION("-128..-1 (int8)")
-                {
-                    for (auto i = -128; i <= -1; ++i)
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with integer number
-                        json j = i;
-
-                        // check type
-                        CHECK(j.is_number_integer());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back('i');
-                        expected.push_back(static_cast<uint8_t>(i));
-
-                        // compare result + size
-                        const auto result = json::to_ubjson(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 2);
-
-                        // check individual bytes
-                        CHECK(result[0] == 'i');
-                        CHECK(static_cast<int8_t>(result[1]) == i);
-
-                        // roundtrip
-                        CHECK(json::from_ubjson(result) == j);
-                        CHECK(json::from_ubjson(result, true, false) == j);
-                    }
-                }
-
-                SECTION("0..127 (int8)")
-                {
-                    for (size_t i = 0; i <= 127; ++i)
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with integer number
-                        json j = -1;
-                        j.get_ref<json::number_integer_t&>() = static_cast<json::number_integer_t>(i);
-
-                        // check type
-                        CHECK(j.is_number_integer());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back(static_cast<uint8_t>('i'));
-                        expected.push_back(static_cast<uint8_t>(i));
-
-                        // compare result + size
-                        const auto result = json::to_ubjson(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 2);
-
-                        // check individual bytes
-                        CHECK(result[0] == 'i');
-                        CHECK(result[1] == i);
-
-                        // roundtrip
-                        CHECK(json::from_ubjson(result) == j);
-                        CHECK(json::from_ubjson(result, true, false) == j);
-                    }
-                }
-
-                SECTION("128..255 (uint8)")
-                {
-                    for (size_t i = 128; i <= 255; ++i)
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with integer number
-                        json j = -1;
-                        j.get_ref<json::number_integer_t&>() = static_cast<json::number_integer_t>(i);
-
-                        // check type
-                        CHECK(j.is_number_integer());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back(static_cast<uint8_t>('U'));
-                        expected.push_back(static_cast<uint8_t>(i));
-
-                        // compare result + size
-                        const auto result = json::to_ubjson(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 2);
-
-                        // check individual bytes
-                        CHECK(result[0] == 'U');
-                        CHECK(result[1] == i);
-
-                        // roundtrip
-                        CHECK(json::from_ubjson(result) == j);
-                        CHECK(json::from_ubjson(result, true, false) == j);
-                    }
-                }
-
-                SECTION("256..32767 (int16)")
-                {
-                    for (size_t i = 256; i <= 32767; ++i)
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with integer number
-                        json j = -1;
-                        j.get_ref<json::number_integer_t&>() = static_cast<json::number_integer_t>(i);
-
-                        // check type
-                        CHECK(j.is_number_integer());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back(static_cast<uint8_t>('I'));
-                        expected.push_back(static_cast<uint8_t>((i >> 8) & 0xff));
-                        expected.push_back(static_cast<uint8_t>(i & 0xff));
-
-                        // compare result + size
-                        const auto result = json::to_ubjson(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 3);
-
-                        // check individual bytes
-                        CHECK(result[0] == 'I');
-                        uint16_t restored = static_cast<uint16_t>(static_cast<uint8_t>(result[1]) * 256 + static_cast<uint8_t>(result[2]));
-                        CHECK(restored == i);
-
-                        // roundtrip
-                        CHECK(json::from_ubjson(result) == j);
-                        CHECK(json::from_ubjson(result, true, false) == j);
-                    }
-                }
-
-                SECTION("65536..2147483647 (int32)")
-                {
-                    for (uint32_t i :
-                            {
-                                65536u, 77777u, 1048576u
-                            })
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with integer number
-                        json j = -1;
-                        j.get_ref<json::number_integer_t&>() = static_cast<json::number_integer_t>(i);
-
-                        // check type
-                        CHECK(j.is_number_integer());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back('l');
-                        expected.push_back(static_cast<uint8_t>((i >> 24) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 16) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 8) & 0xff));
-                        expected.push_back(static_cast<uint8_t>(i & 0xff));
-
-                        // compare result + size
-                        const auto result = json::to_ubjson(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 5);
-
-                        // check individual bytes
-                        CHECK(result[0] == 'l');
-                        uint32_t restored = (static_cast<uint32_t>(result[1]) << 030) +
-                                            (static_cast<uint32_t>(result[2]) << 020) +
-                                            (static_cast<uint32_t>(result[3]) << 010) +
-                                            static_cast<uint32_t>(result[4]);
-                        CHECK(restored == i);
-
-                        // roundtrip
-                        CHECK(json::from_ubjson(result) == j);
-                        CHECK(json::from_ubjson(result, true, false) == j);
-                    }
-                }
-
-                SECTION("2147483648..9223372036854775807 (int64)")
-                {
-                    std::vector<uint64_t> v = {2147483648ul, 9223372036854775807ul};
-                    for (uint64_t i : v)
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with integer number
-                        json j = -1;
-                        j.get_ref<json::number_integer_t&>() = static_cast<json::number_integer_t>(i);
-
-                        // check type
-                        CHECK(j.is_number_integer());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back('L');
-                        expected.push_back(static_cast<uint8_t>((i >> 070) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 060) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 050) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 040) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 030) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 020) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 010) & 0xff));
-                        expected.push_back(static_cast<uint8_t>(i & 0xff));
-
-                        // compare result + size
-                        const auto result = json::to_ubjson(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 9);
-
-                        // check individual bytes
-                        CHECK(result[0] == 'L');
-                        uint64_t restored = (static_cast<uint64_t>(result[1]) << 070) +
-                                            (static_cast<uint64_t>(result[2]) << 060) +
-                                            (static_cast<uint64_t>(result[3]) << 050) +
-                                            (static_cast<uint64_t>(result[4]) << 040) +
-                                            (static_cast<uint64_t>(result[5]) << 030) +
-                                            (static_cast<uint64_t>(result[6]) << 020) +
-                                            (static_cast<uint64_t>(result[7]) << 010) +
-                                            static_cast<uint64_t>(result[8]);
-                        CHECK(restored == i);
-
-                        // roundtrip
-                        CHECK(json::from_ubjson(result) == j);
-                        CHECK(json::from_ubjson(result, true, false) == j);
-                    }
-                }
-            }
-
-            SECTION("unsigned")
-            {
-                SECTION("0..127 (int8)")
-                {
-                    for (size_t i = 0; i <= 127; ++i)
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with unsigned integer number
-                        json j = i;
-
-                        // check type
-                        CHECK(j.is_number_unsigned());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back('i');
-                        expected.push_back(static_cast<uint8_t>(i));
-
-                        // compare result + size
-                        const auto result = json::to_ubjson(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 2);
-
-                        // check individual bytes
-                        CHECK(result[0] == 'i');
-                        uint8_t restored = static_cast<uint8_t>(result[1]);
-                        CHECK(restored == i);
-
-                        // roundtrip
-                        CHECK(json::from_ubjson(result) == j);
-                        CHECK(json::from_ubjson(result, true, false) == j);
-                    }
-                }
-
-                SECTION("128..255 (uint8)")
-                {
-                    for (size_t i = 128; i <= 255; ++i)
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with unsigned integer number
-                        json j = i;
-
-                        // check type
-                        CHECK(j.is_number_unsigned());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back('U');
-                        expected.push_back(static_cast<uint8_t>(i));
-
-                        // compare result + size
-                        const auto result = json::to_ubjson(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 2);
-
-                        // check individual bytes
-                        CHECK(result[0] == 'U');
-                        uint8_t restored = static_cast<uint8_t>(result[1]);
-                        CHECK(restored == i);
-
-                        // roundtrip
-                        CHECK(json::from_ubjson(result) == j);
-                        CHECK(json::from_ubjson(result, true, false) == j);
-                    }
-                }
-
-                SECTION("256..32767 (int16)")
-                {
-                    for (size_t i = 256; i <= 32767; ++i)
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with unsigned integer number
-                        json j = i;
-
-                        // check type
-                        CHECK(j.is_number_unsigned());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back('I');
-                        expected.push_back(static_cast<uint8_t>((i >> 8) & 0xff));
-                        expected.push_back(static_cast<uint8_t>(i & 0xff));
-
-                        // compare result + size
-                        const auto result = json::to_ubjson(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 3);
-
-                        // check individual bytes
-                        CHECK(result[0] == 'I');
-                        uint16_t restored = static_cast<uint16_t>(static_cast<uint8_t>(result[1]) * 256 + static_cast<uint8_t>(result[2]));
-                        CHECK(restored == i);
-
-                        // roundtrip
-                        CHECK(json::from_ubjson(result) == j);
-                        CHECK(json::from_ubjson(result, true, false) == j);
-                    }
-                }
-
-                SECTION("65536..2147483647 (int32)")
-                {
-                    for (uint32_t i :
-                            {
-                                65536u, 77777u, 1048576u
-                            })
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with unsigned integer number
-                        json j = i;
-
-                        // check type
-                        CHECK(j.is_number_unsigned());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back('l');
-                        expected.push_back(static_cast<uint8_t>((i >> 24) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 16) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 8) & 0xff));
-                        expected.push_back(static_cast<uint8_t>(i & 0xff));
-
-                        // compare result + size
-                        const auto result = json::to_ubjson(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 5);
-
-                        // check individual bytes
-                        CHECK(result[0] == 'l');
-                        uint32_t restored = (static_cast<uint32_t>(result[1]) << 030) +
-                                            (static_cast<uint32_t>(result[2]) << 020) +
-                                            (static_cast<uint32_t>(result[3]) << 010) +
-                                            static_cast<uint32_t>(result[4]);
-                        CHECK(restored == i);
-
-                        // roundtrip
-                        CHECK(json::from_ubjson(result) == j);
-                        CHECK(json::from_ubjson(result, true, false) == j);
-                    }
-                }
-
-                SECTION("2147483648..9223372036854775807 (int64)")
-                {
-                    std::vector<uint64_t> v = {2147483648ul, 9223372036854775807ul};
-                    for (uint64_t i : v)
-                    {
-                        CAPTURE(i)
-
-                        // create JSON value with integer number
-                        json j = i;
-
-                        // check type
-                        CHECK(j.is_number_unsigned());
-
-                        // create expected byte vector
-                        std::vector<uint8_t> expected;
-                        expected.push_back('L');
-                        expected.push_back(static_cast<uint8_t>((i >> 070) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 060) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 050) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 040) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 030) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 020) & 0xff));
-                        expected.push_back(static_cast<uint8_t>((i >> 010) & 0xff));
-                        expected.push_back(static_cast<uint8_t>(i & 0xff));
-
-                        // compare result + size
-                        const auto result = json::to_ubjson(j);
-                        CHECK(result == expected);
-                        CHECK(result.size() == 9);
-
-                        // check individual bytes
-                        CHECK(result[0] == 'L');
-                        uint64_t restored = (static_cast<uint64_t>(result[1]) << 070) +
-                                            (static_cast<uint64_t>(result[2]) << 060) +
-                                            (static_cast<uint64_t>(result[3]) << 050) +
-                                            (static_cast<uint64_t>(result[4]) << 040) +
-                                            (static_cast<uint64_t>(result[5]) << 030) +
-                                            (static_cast<uint64_t>(result[6]) << 020) +
-                                            (static_cast<uint64_t>(result[7]) << 010) +
-                                            static_cast<uint64_t>(result[8]);
-                        CHECK(restored == i);
-
-                        // roundtrip
-                        CHECK(json::from_ubjson(result) == j);
-                        CHECK(json::from_ubjson(result, true, false) == j);
-                    }
-                }
-            }
-
-            SECTION("float64")
-            {
-                SECTION("3.1415925")
-                {
-                    double v = 3.1415925;
-                    json j = v;
-                    std::vector<uint8_t> expected =
-                    {
-                        'D', 0x40, 0x09, 0x21, 0xfb, 0x3f, 0xa6, 0xde, 0xfc
-                    };
-                    const auto result = json::to_ubjson(j);
-                    CHECK(result == expected);
-
-                    // roundtrip
-                    CHECK(json::from_ubjson(result) == j);
-                    CHECK(json::from_ubjson(result) == v);
-                    CHECK(json::from_ubjson(result, true, false) == j);
-                }
-            }
-
-            SECTION("high-precision number")
-            {
-                SECTION("unsigned integer number")
-                {
-                    std::vector<uint8_t> vec = {'H', 'i', 0x14, '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0'};
-                    const auto j = json::from_ubjson(vec);
-                    CHECK(j.is_number_unsigned());
-                    CHECK(j.dump() == "12345678901234567890");
-                }
-
-                SECTION("signed integer number")
-                {
-                    std::vector<uint8_t> vec = {'H', 'i', 0x13, '-', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '1', '2', '3', '4', '5', '6', '7', '8'};
-                    const auto j = json::from_ubjson(vec);
-                    CHECK(j.is_number_integer());
-                    CHECK(j.dump() == "-123456789012345678");
-                }
-
-                SECTION("floating-point number")
-                {
-                    std::vector<uint8_t> vec = {'H', 'i', 0x16, '3', '.', '1', '4', '1', '5', '9',  '2', '6', '5', '3', '5', '8', '9',  '7', '9', '3', '2', '3', '8', '4',  '6'};
-                    const auto j = json::from_ubjson(vec);
-                    CHECK(j.is_number_float());
-                    CHECK(j.dump() == "3.141592653589793");
-                }
-
-                SECTION("errors")
-                {
-                    // error while parsing length
-                    std::vector<uint8_t> vec0 = {'H', 'i'};
-                    CHECK(json::from_ubjson(vec0, true, false).is_discarded());
-                    // error while parsing string
-                    std::vector<uint8_t> vec1 = {'H', 'i', '1'};
-                    CHECK(json::from_ubjson(vec1, true, false).is_discarded());
-
-                    json _;
-                    std::vector<uint8_t> vec2 = {'H', 'i', 2, '1', 'A', '3'};
-                    CHECK_THROWS_WITH_AS(_ = json::from_ubjson(vec2), "[json.exception.parse_error.115] parse error at byte 5: syntax error while parsing UBJSON high-precision number: invalid number text: 1A", json::parse_error);
-                    std::vector<uint8_t> vec3 = {'H', 'i', 2, '1', '.'};
-                    CHECK_THROWS_WITH_AS(_ = json::from_ubjson(vec3), "[json.exception.parse_error.115] parse error at byte 5: syntax error while parsing UBJSON high-precision number: invalid number text: 1.", json::parse_error);
-                    std::vector<uint8_t> vec4 = {'H', 2, '1', '0'};
-                    CHECK_THROWS_WITH_AS(_ = json::from_ubjson(vec4), "[json.exception.parse_error.113] parse error at byte 2: syntax error while parsing UBJSON size: expected length type specification (U, i, I, l, L) after '#'; last byte: 0x02", json::parse_error);
-                }
-
-                SECTION("serialization")
-                {
-                    // number that does not fit int64
-                    json j = 11111111111111111111ULL;
-                    CHECK(j.is_number_unsigned());
-
-                    // number will be serialized to high-precision number
-                    const auto vec = json::to_ubjson(j);
-                    std::vector<uint8_t> expected = {'H', 'i', 0x14, '1',  '1',  '1',  '1',  '1', '1',  '1',  '1',  '1',  '1', '1',  '1',  '1',  '1',  '1', '1',  '1',  '1',  '1',  '1'};
-                    CHECK(vec == expected);
-
-                    // roundtrip
-                    CHECK(json::from_ubjson(vec) == j);
-                }
-            }
-        }
-
-        SECTION("string")
-        {
-            SECTION("N = 0..127")
-            {
-                for (size_t N = 0; N <= 127; ++N)
-                {
-                    CAPTURE(N)
-
-                    // create JSON value with string containing of N * 'x'
-                    const auto s = std::string(N, 'x');
-                    json j = s;
-
-                    // create expected byte vector
-                    std::vector<uint8_t> expected;
-                    expected.push_back('S');
-                    expected.push_back('i');
-                    expected.push_back(static_cast<uint8_t>(N));
-                    for (size_t i = 0; i < N; ++i)
-                    {
-                        expected.push_back('x');
-                    }
-
-                    // compare result + size
-                    const auto result = json::to_ubjson(j);
-                    CHECK(result == expected);
-                    CHECK(result.size() == N + 3);
-                    // check that no null byte is appended
-                    if (N > 0)
-                    {
-                        CHECK(result.back() != '\x00');
-                    }
-
-                    // roundtrip
-                    CHECK(json::from_ubjson(result) == j);
-                    CHECK(json::from_ubjson(result, true, false) == j);
-                }
-            }
-
-            SECTION("N = 128..255")
-            {
-                for (size_t N = 128; N <= 255; ++N)
-                {
-                    CAPTURE(N)
-
-                    // create JSON value with string containing of N * 'x'
-                    const auto s = std::string(N, 'x');
-                    json j = s;
-
-                    // create expected byte vector
-                    std::vector<uint8_t> expected;
-                    expected.push_back('S');
-                    expected.push_back('U');
-                    expected.push_back(static_cast<uint8_t>(N));
-                    for (size_t i = 0; i < N; ++i)
-                    {
-                        expected.push_back('x');
-                    }
-
-                    // compare result + size
-                    const auto result = json::to_ubjson(j);
-                    CHECK(result == expected);
-                    CHECK(result.size() == N + 3);
-                    // check that no null byte is appended
-                    CHECK(result.back() != '\x00');
-
-                    // roundtrip
-                    CHECK(json::from_ubjson(result) == j);
-                    CHECK(json::from_ubjson(result, true, false) == j);
-                }
-            }
-
-            SECTION("N = 256..32767")
-            {
-                for (size_t N :
-                        {
-                            256u, 999u, 1025u, 3333u, 2048u, 32767u
-                        })
-                {
-                    CAPTURE(N)
-
-                    // create JSON value with string containing of N * 'x'
-                    const auto s = std::string(N, 'x');
-                    json j = s;
-
-                    // create expected byte vector (hack: create string first)
-                    std::vector<uint8_t> expected(N, 'x');
-                    // reverse order of commands, because we insert at begin()
-                    expected.insert(expected.begin(), static_cast<uint8_t>(N & 0xff));
-                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 8) & 0xff));
-                    expected.insert(expected.begin(), 'I');
-                    expected.insert(expected.begin(), 'S');
-
-                    // compare result + size
-                    const auto result = json::to_ubjson(j);
-                    CHECK(result == expected);
-                    CHECK(result.size() == N + 4);
-                    // check that no null byte is appended
-                    CHECK(result.back() != '\x00');
-
-                    // roundtrip
-                    CHECK(json::from_ubjson(result) == j);
-                    CHECK(json::from_ubjson(result, true, false) == j);
-                }
-            }
-
-            SECTION("N = 65536..2147483647")
-            {
-                for (size_t N :
-                        {
-                            65536u, 77777u, 1048576u
-                        })
-                {
-                    CAPTURE(N)
-
-                    // create JSON value with string containing of N * 'x'
-                    const auto s = std::string(N, 'x');
-                    json j = s;
-
-                    // create expected byte vector (hack: create string first)
-                    std::vector<uint8_t> expected(N, 'x');
-                    // reverse order of commands, because we insert at begin()
-                    expected.insert(expected.begin(), static_cast<uint8_t>(N & 0xff));
-                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 8) & 0xff));
-                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 16) & 0xff));
-                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 24) & 0xff));
-                    expected.insert(expected.begin(), 'l');
-                    expected.insert(expected.begin(), 'S');
-
-                    // compare result + size
-                    const auto result = json::to_ubjson(j);
-                    CHECK(result == expected);
-                    CHECK(result.size() == N + 6);
-                    // check that no null byte is appended
-                    CHECK(result.back() != '\x00');
-
-                    // roundtrip
-                    CHECK(json::from_ubjson(result) == j);
-                    CHECK(json::from_ubjson(result, true, false) == j);
-                }
-            }
-        }
-
-        SECTION("binary")
-        {
-            SECTION("N = 0..127")
-            {
-                for (std::size_t N = 0; N <= 127; ++N)
-                {
-                    CAPTURE(N)
-
-                    // create JSON value with byte array containing of N * 'x'
-                    const auto s = std::vector<std::uint8_t>(N, 'x');
-                    json j = json::binary(s);
-
-                    // create expected byte vector
-                    std::vector<std::uint8_t> expected;
-                    expected.push_back(static_cast<std::uint8_t>('['));
-                    if (N != 0)
-                    {
-                        expected.push_back(static_cast<std::uint8_t>('$'));
-                        expected.push_back(static_cast<std::uint8_t>('U'));
-                    }
-                    expected.push_back(static_cast<std::uint8_t>('#'));
-                    expected.push_back(static_cast<std::uint8_t>('i'));
-                    expected.push_back(static_cast<std::uint8_t>(N));
-                    for (size_t i = 0; i < N; ++i)
-                    {
-                        expected.push_back(0x78);
-                    }
-
-                    // compare result + size
-                    const auto result = json::to_ubjson(j, true, true);
-                    CHECK(result == expected);
-                    if (N == 0)
-                    {
-                        CHECK(result.size() == N + 4);
-                    }
-                    else
-                    {
-                        CHECK(result.size() == N + 6);
-                    }
-
-                    // check that no null byte is appended
-                    if (N > 0)
-                    {
-                        CHECK(result.back() != '\x00');
-                    }
-
-                    // roundtrip only works to an array of numbers
-                    json j_out = s;
-                    CHECK(json::from_ubjson(result) == j_out);
-                    CHECK(json::from_ubjson(result, true, false) == j_out);
-                }
-            }
-
-            SECTION("N = 128..255")
-            {
-                for (std::size_t N = 128; N <= 255; ++N)
-                {
-                    CAPTURE(N)
-
-                    // create JSON value with byte array containing of N * 'x'
-                    const auto s = std::vector<std::uint8_t>(N, 'x');
-                    json j = json::binary(s);
-
-                    // create expected byte vector
-                    std::vector<uint8_t> expected;
-                    expected.push_back(static_cast<std::uint8_t>('['));
-                    expected.push_back(static_cast<std::uint8_t>('$'));
-                    expected.push_back(static_cast<std::uint8_t>('U'));
-                    expected.push_back(static_cast<std::uint8_t>('#'));
-                    expected.push_back(static_cast<std::uint8_t>('U'));
-                    expected.push_back(static_cast<std::uint8_t>(N));
-                    for (size_t i = 0; i < N; ++i)
-                    {
-                        expected.push_back(0x78);
-                    }
-
-                    // compare result + size
-                    const auto result = json::to_ubjson(j, true, true);
-                    CHECK(result == expected);
-                    CHECK(result.size() == N + 6);
-                    // check that no null byte is appended
-                    CHECK(result.back() != '\x00');
-
-                    // roundtrip only works to an array of numbers
-                    json j_out = s;
-                    CHECK(json::from_ubjson(result) == j_out);
-                    CHECK(json::from_ubjson(result, true, false) == j_out);
-                }
-            }
-
-            SECTION("N = 256..32767")
-            {
-                for (std::size_t N :
-                        {
-                            256u, 999u, 1025u, 3333u, 2048u, 32767u
-                        })
-                {
-                    CAPTURE(N)
-
-                    // create JSON value with byte array containing of N * 'x'
-                    const auto s = std::vector<std::uint8_t>(N, 'x');
-                    json j = json::binary(s);
-
-                    // create expected byte vector
-                    std::vector<std::uint8_t> expected(N + 7, 'x');
-                    expected[0] = '[';
-                    expected[1] = '$';
-                    expected[2] = 'U';
-                    expected[3] = '#';
-                    expected[4] = 'I';
-                    expected[5] = static_cast<std::uint8_t>((N >> 8) & 0xFF);
-                    expected[6] = static_cast<std::uint8_t>(N & 0xFF);
-
-                    // compare result + size
-                    const auto result = json::to_ubjson(j, true, true);
-                    CHECK(result == expected);
-                    CHECK(result.size() == N + 7);
-                    // check that no null byte is appended
-                    CHECK(result.back() != '\x00');
-
-                    // roundtrip only works to an array of numbers
-                    json j_out = s;
-                    CHECK(json::from_ubjson(result) == j_out);
-                    CHECK(json::from_ubjson(result, true, false) == j_out);
-                }
-            }
-
-            SECTION("N = 32768..2147483647")
-            {
-                for (std::size_t N :
-                        {
-                            32768u, 77777u, 1048576u
-                        })
-                {
-                    CAPTURE(N)
-
-                    // create JSON value with byte array containing of N * 'x'
-                    const auto s = std::vector<std::uint8_t>(N, 'x');
-                    json j = json::binary(s);
-
-                    // create expected byte vector
-                    std::vector<std::uint8_t> expected(N + 9, 'x');
-                    expected[0] = '[';
-                    expected[1] = '$';
-                    expected[2] = 'U';
-                    expected[3] = '#';
-                    expected[4] = 'l';
-                    expected[5] = static_cast<std::uint8_t>((N >> 24) & 0xFF);
-                    expected[6] = static_cast<std::uint8_t>((N >> 16) & 0xFF);
-                    expected[7] = static_cast<std::uint8_t>((N >> 8) & 0xFF);
-                    expected[8] = static_cast<std::uint8_t>(N & 0xFF);
-
-                    // compare result + size
-                    const auto result = json::to_ubjson(j, true, true);
-                    CHECK(result == expected);
-                    CHECK(result.size() == N + 9);
-                    // check that no null byte is appended
-                    CHECK(result.back() != '\x00');
-
-                    // roundtrip only works to an array of numbers
-                    json j_out = s;
-                    CHECK(json::from_ubjson(result) == j_out);
-                    CHECK(json::from_ubjson(result, true, false) == j_out);
-                }
-            }
-
-            SECTION("Other Serializations")
-            {
-                const std::size_t N = 10;
-                const auto s = std::vector<std::uint8_t>(N, 'x');
-                json j = json::binary(s);
-
-                SECTION("No Count No Type")
-                {
-                    std::vector<uint8_t> expected;
-                    expected.push_back(static_cast<std::uint8_t>('['));
-                    for (std::size_t i = 0; i < N; ++i)
-                    {
-                        expected.push_back(static_cast<std::uint8_t>('U'));
-                        expected.push_back(static_cast<std::uint8_t>(0x78));
-                    }
-                    expected.push_back(static_cast<std::uint8_t>(']'));
-
-                    // compare result + size
-                    const auto result = json::to_ubjson(j, false, false);
-                    CHECK(result == expected);
-                    CHECK(result.size() == N + 12);
-                    // check that no null byte is appended
-                    CHECK(result.back() != '\x00');
-
-                    // roundtrip only works to an array of numbers
-                    json j_out = s;
-                    CHECK(json::from_ubjson(result) == j_out);
-                    CHECK(json::from_ubjson(result, true, false) == j_out);
-                }
-
-                SECTION("Yes Count No Type")
-                {
-                    std::vector<std::uint8_t> expected;
-                    expected.push_back(static_cast<std::uint8_t>('['));
-                    expected.push_back(static_cast<std::uint8_t>('#'));
-                    expected.push_back(static_cast<std::uint8_t>('i'));
-                    expected.push_back(static_cast<std::uint8_t>(N));
-
-                    for (size_t i = 0; i < N; ++i)
-                    {
-                        expected.push_back(static_cast<std::uint8_t>('U'));
-                        expected.push_back(static_cast<std::uint8_t>(0x78));
-                    }
-
-                    // compare result + size
-                    const auto result = json::to_ubjson(j, true, false);
-                    CHECK(result == expected);
-                    CHECK(result.size() == N + 14);
-                    // check that no null byte is appended
-                    CHECK(result.back() != '\x00');
-
-                    // roundtrip only works to an array of numbers
-                    json j_out = s;
-                    CHECK(json::from_ubjson(result) == j_out);
-                    CHECK(json::from_ubjson(result, true, false) == j_out);
-                }
-            }
-        }
-
-        SECTION("array")
-        {
-            SECTION("empty")
-            {
-                SECTION("size=false type=false")
-                {
-                    json j = json::array();
-                    std::vector<uint8_t> expected = {'[', ']'};
-                    const auto result = json::to_ubjson(j);
-                    CHECK(result == expected);
-
-                    // roundtrip
-                    CHECK(json::from_ubjson(result) == j);
-                    CHECK(json::from_ubjson(result, true, false) == j);
-                }
-
-                SECTION("size=true type=false")
-                {
-                    json j = json::array();
-                    std::vector<uint8_t> expected = {'[', '#', 'i', 0};
-                    const auto result = json::to_ubjson(j, true);
-                    CHECK(result == expected);
-
-                    // roundtrip
-                    CHECK(json::from_ubjson(result) == j);
-                    CHECK(json::from_ubjson(result, true, false) == j);
-                }
-
-                SECTION("size=true type=true")
-                {
-                    json j = json::array();
-                    std::vector<uint8_t> expected = {'[', '#', 'i', 0};
-                    const auto result = json::to_ubjson(j, true, true);
-                    CHECK(result == expected);
-
-                    // roundtrip
-                    CHECK(json::from_ubjson(result) == j);
-                    CHECK(json::from_ubjson(result, true, false) == j);
-                }
-            }
-
-            SECTION("[null]")
-            {
-                SECTION("size=false type=false")
-                {
-                    json j = {nullptr};
-                    std::vector<uint8_t> expected = {'[', 'Z', ']'};
-                    const auto result = json::to_ubjson(j);
-                    CHECK(result == expected);
-
-                    // roundtrip
-                    CHECK(json::from_ubjson(result) == j);
-                    CHECK(json::from_ubjson(result, true, false) == j);
-                }
-
-                SECTION("size=true type=false")
-                {
-                    json j = {nullptr};
-                    std::vector<uint8_t> expected = {'[', '#', 'i', 1, 'Z'};
-                    const auto result = json::to_ubjson(j, true);
-                    CHECK(result == expected);
-
-                    // roundtrip
-                    CHECK(json::from_ubjson(result) == j);
-                    CHECK(json::from_ubjson(result, true, false) == j);
-                }
-
-                SECTION("size=true type=true")
-                {
-                    json j = {nullptr};
-                    std::vector<uint8_t> expected = {'[', '$', 'Z', '#', 'i', 1};
-                    const auto result = json::to_ubjson(j, true, true);
-                    CHECK(result == expected);
-
-                    // roundtrip
-                    CHECK(json::from_ubjson(result) == j);
-                    CHECK(json::from_ubjson(result, true, false) == j);
-                }
-            }
-
-            SECTION("[1,2,3,4,5]")
-            {
-                SECTION("size=false type=false")
-                {
-                    json j = json::parse("[1,2,3,4,5]");
-                    std::vector<uint8_t> expected = {'[', 'i', 1, 'i', 2, 'i', 3, 'i', 4, 'i', 5, ']'};
-                    const auto result = json::to_ubjson(j);
-                    CHECK(result == expected);
-
-                    // roundtrip
-                    CHECK(json::from_ubjson(result) == j);
-                    CHECK(json::from_ubjson(result, true, false) == j);
-                }
-
-                SECTION("size=true type=false")
-                {
-                    json j = json::parse("[1,2,3,4,5]");
-                    std::vector<uint8_t> expected = {'[', '#', 'i', 5, 'i', 1, 'i', 2, 'i', 3, 'i', 4, 'i', 5};
-                    const auto result = json::to_ubjson(j, true);
-                    CHECK(result == expected);
-
-                    // roundtrip
-                    CHECK(json::from_ubjson(result) == j);
-                    CHECK(json::from_ubjson(result, true, false) == j);
-                }
-
-                SECTION("size=true type=true")
-                {
-                    json j = json::parse("[1,2,3,4,5]");
-                    std::vector<uint8_t> expected = {'[', '$', 'i', '#', 'i', 5, 1, 2, 3, 4, 5};
-                    const auto result = json::to_ubjson(j, true, true);
-                    CHECK(result == expected);
-
-                    // roundtrip
-                    CHECK(json::from_ubjson(result) == j);
-                    CHECK(json::from_ubjson(result, true, false) == j);
-                }
-            }
-
-            SECTION("[[[[]]]]")
-            {
-                SECTION("size=false type=false")
-                {
-                    json j = json::parse("[[[[]]]]");
-                    std::vector<uint8_t> expected = {'[', '[', '[', '[', ']', ']', ']', ']'};
-                    const auto result = json::to_ubjson(j);
-                    CHECK(result == expected);
-
-                    // roundtrip
-                    CHECK(json::from_ubjson(result) == j);
-                    CHECK(json::from_ubjson(result, true, false) == j);
-                }
-
-                SECTION("size=true type=false")
-                {
-                    json j = json::parse("[[[[]]]]");
-                    std::vector<uint8_t> expected = {'[', '#', 'i', 1, '[', '#', 'i', 1, '[', '#', 'i', 1, '[', '#', 'i', 0};
-                    const auto result = json::to_ubjson(j, true);
-                    CHECK(result == expected);
-
-                    // roundtrip
-                    CHECK(json::from_ubjson(result) == j);
-                    CHECK(json::from_ubjson(result, true, false) == j);
-                }
-
-                SECTION("size=true type=true")
-                {
-                    json j = json::parse("[[[[]]]]");
-                    std::vector<uint8_t> expected = {'[', '$', '[', '#', 'i', 1, '$', '[', '#', 'i', 1, '$', '[', '#', 'i', 1, '#', 'i', 0};
-                    const auto result = json::to_ubjson(j, true, true);
-                    CHECK(result == expected);
-
-                    // roundtrip
-                    CHECK(json::from_ubjson(result) == j);
-                    CHECK(json::from_ubjson(result, true, false) == j);
-                }
-            }
-
-            SECTION("array with uint16_t elements")
-            {
-                SECTION("size=false type=false")
-                {
-                    json j(257, nullptr);
-                    std::vector<uint8_t> expected(j.size() + 2, 'Z'); // all null
-                    expected[0] = '['; // opening array
-                    expected[258] = ']'; // closing array
-                    const auto result = json::to_ubjson(j);
-                    CHECK(result == expected);
-
-                    // roundtrip
-                    CHECK(json::from_ubjson(result) == j);
-                    CHECK(json::from_ubjson(result, true, false) == j);
-                }
-
-                SECTION("size=true type=false")
-                {
-                    json j(257, nullptr);
-                    std::vector<uint8_t> expected(j.size() + 5, 'Z'); // all null
-                    expected[0] = '['; // opening array
-                    expected[1] = '#'; // array size
-                    expected[2] = 'I'; // int16
-                    expected[3] = 0x01; // 0x0101, first byte
-                    expected[4] = 0x01; // 0x0101, second byte
-                    const auto result = json::to_ubjson(j, true);
-                    CHECK(result == expected);
-
-                    // roundtrip
-                    CHECK(json::from_ubjson(result) == j);
-                    CHECK(json::from_ubjson(result, true, false) == j);
-                }
-
-                SECTION("size=true type=true")
-                {
-                    json j(257, nullptr);
-                    std::vector<uint8_t> expected = {'[', '$', 'Z', '#', 'I', 0x01, 0x01};
-                    const auto result = json::to_ubjson(j, true, true);
-                    CHECK(result == expected);
-
-                    // roundtrip
-                    CHECK(json::from_ubjson(result) == j);
-                    CHECK(json::from_ubjson(result, true, false) == j);
-                }
-            }
-
-            SECTION("array with uint32_t elements")
-            {
-                SECTION("size=false type=false")
-                {
-                    json j(65793, nullptr);
-                    std::vector<uint8_t> expected(j.size() + 2, 'Z'); // all null
-                    expected[0] = '['; // opening array
-                    expected[65794] = ']'; // closing array
-                    const auto result = json::to_ubjson(j);
-                    CHECK(result == expected);
-
-                    // roundtrip
-                    CHECK(json::from_ubjson(result) == j);
-                    CHECK(json::from_ubjson(result, true, false) == j);
-                }
-
-                SECTION("size=true type=false")
-                {
-                    json j(65793, nullptr);
-                    std::vector<uint8_t> expected(j.size() + 7, 'Z'); // all null
-                    expected[0] = '['; // opening array
-                    expected[1] = '#'; // array size
-                    expected[2] = 'l'; // int32
-                    expected[3] = 0x00; // 0x00010101, first byte
-                    expected[4] = 0x01; // 0x00010101, second byte
-                    expected[5] = 0x01; // 0x00010101, third byte
-                    expected[6] = 0x01; // 0x00010101, fourth byte
-                    const auto result = json::to_ubjson(j, true);
-                    CHECK(result == expected);
-
-                    // roundtrip
-                    CHECK(json::from_ubjson(result) == j);
-                    CHECK(json::from_ubjson(result, true, false) == j);
-                }
-
-                SECTION("size=true type=true")
-                {
-                    json j(65793, nullptr);
-                    std::vector<uint8_t> expected = {'[', '$', 'Z', '#', 'l', 0x00, 0x01, 0x01, 0x01};
-                    const auto result = json::to_ubjson(j, true, true);
-                    CHECK(result == expected);
-
-                    // roundtrip
-                    CHECK(json::from_ubjson(result) == j);
-                    CHECK(json::from_ubjson(result, true, false) == j);
-                }
-            }
-        }
-
-        SECTION("object")
-        {
-            SECTION("empty")
-            {
-                SECTION("size=false type=false")
-                {
-                    json j = json::object();
-                    std::vector<uint8_t> expected = {'{', '}'};
-                    const auto result = json::to_ubjson(j);
-                    CHECK(result == expected);
-
-                    // roundtrip
-                    CHECK(json::from_ubjson(result) == j);
-                    CHECK(json::from_ubjson(result, true, false) == j);
-                }
-
-                SECTION("size=true type=false")
-                {
-                    json j = json::object();
-                    std::vector<uint8_t> expected = {'{', '#', 'i', 0};
-                    const auto result = json::to_ubjson(j, true);
-                    CHECK(result == expected);
-
-                    // roundtrip
-                    CHECK(json::from_ubjson(result) == j);
-                    CHECK(json::from_ubjson(result, true, false) == j);
-                }
-
-                SECTION("size=true type=true")
-                {
-                    json j = json::object();
-                    std::vector<uint8_t> expected = {'{', '#', 'i', 0};
-                    const auto result = json::to_ubjson(j, true, true);
-                    CHECK(result == expected);
-
-                    // roundtrip
-                    CHECK(json::from_ubjson(result) == j);
-                    CHECK(json::from_ubjson(result, true, false) == j);
-                }
-            }
-
-            SECTION("{\"\":null}")
-            {
-                SECTION("size=false type=false")
-                {
-                    json j = {{"", nullptr}};
-                    std::vector<uint8_t> expected = {'{', 'i', 0, 'Z', '}'};
-                    const auto result = json::to_ubjson(j);
-                    CHECK(result == expected);
-
-                    // roundtrip
-                    CHECK(json::from_ubjson(result) == j);
-                    CHECK(json::from_ubjson(result, true, false) == j);
-                }
-
-                SECTION("size=true type=false")
-                {
-                    json j = {{"", nullptr}};
-                    std::vector<uint8_t> expected = {'{', '#', 'i', 1, 'i', 0, 'Z'};
-                    const auto result = json::to_ubjson(j, true);
-                    CHECK(result == expected);
-
-                    // roundtrip
-                    CHECK(json::from_ubjson(result) == j);
-                    CHECK(json::from_ubjson(result, true, false) == j);
-                }
-
-                SECTION("size=true type=true")
-                {
-                    json j = {{"", nullptr}};
-                    std::vector<uint8_t> expected = {'{', '$', 'Z', '#', 'i', 1, 'i', 0};
-                    const auto result = json::to_ubjson(j, true, true);
-                    CHECK(result == expected);
-
-                    // roundtrip
-                    CHECK(json::from_ubjson(result) == j);
-                    CHECK(json::from_ubjson(result, true, false) == j);
-                }
-            }
-
-            SECTION("{\"a\": {\"b\": {\"c\": {}}}}")
-            {
-                SECTION("size=false type=false")
-                {
-                    json j = json::parse("{\"a\": {\"b\": {\"c\": {}}}}");
-                    std::vector<uint8_t> expected =
-                    {
-                        '{', 'i', 1, 'a', '{', 'i', 1, 'b', '{', 'i', 1, 'c', '{', '}', '}', '}', '}'
-                    };
-                    const auto result = json::to_ubjson(j);
-                    CHECK(result == expected);
-
-                    // roundtrip
-                    CHECK(json::from_ubjson(result) == j);
-                    CHECK(json::from_ubjson(result, true, false) == j);
-                }
-
-                SECTION("size=true type=false")
-                {
-                    json j = json::parse("{\"a\": {\"b\": {\"c\": {}}}}");
-                    std::vector<uint8_t> expected =
-                    {
-                        '{', '#', 'i', 1, 'i', 1, 'a', '{', '#', 'i', 1, 'i', 1, 'b', '{', '#', 'i', 1, 'i', 1, 'c', '{', '#', 'i', 0
-                    };
-                    const auto result = json::to_ubjson(j, true);
-                    CHECK(result == expected);
-
-                    // roundtrip
-                    CHECK(json::from_ubjson(result) == j);
-                    CHECK(json::from_ubjson(result, true, false) == j);
-                }
-
-                SECTION("size=true type=true")
-                {
-                    json j = json::parse("{\"a\": {\"b\": {\"c\": {}}}}");
-                    std::vector<uint8_t> expected =
-                    {
-                        '{', '$', '{', '#', 'i', 1, 'i', 1, 'a', '$', '{', '#', 'i', 1, 'i', 1, 'b', '$', '{', '#', 'i', 1, 'i', 1, 'c', '#', 'i', 0
-                    };
-                    const auto result = json::to_ubjson(j, true, true);
-                    CHECK(result == expected);
-
-                    // roundtrip
-                    CHECK(json::from_ubjson(result) == j);
-                    CHECK(json::from_ubjson(result, true, false) == j);
-                }
-            }
-        }
-    }
-
-    SECTION("errors")
-    {
-        SECTION("strict mode")
-        {
-            std::vector<uint8_t> vec = {'Z', 'Z'};
-            SECTION("non-strict mode")
-            {
-                const auto result = json::from_ubjson(vec, false);
-                CHECK(result == json());
-            }
-
-            SECTION("strict mode")
-            {
-                json _;
-                CHECK_THROWS_AS(_ = json::from_ubjson(vec), json::parse_error&);
-                CHECK_THROWS_WITH(_ = json::from_ubjson(vec),
-                                  "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing UBJSON value: expected end of input; last byte: 0x5A");
-            }
-        }
-
-        SECTION("excessive size")
-        {
-            SECTION("array")
-            {
-                std::vector<uint8_t> v_ubjson = {'[', '$', 'Z', '#', 'L', 0x78, 0x28, 0x00, 0x68, 0x28, 0x69, 0x69, 0x17};
-                json _;
-                CHECK_THROWS_AS(_ = json::from_ubjson(v_ubjson), json::out_of_range&);
-
-                json j;
-                nlohmann::detail::json_sax_dom_callback_parser<json> scp(j, [](int, json::parse_event_t, const json&)
-                {
-                    return true;
-                });
-                CHECK_THROWS_AS(_ = json::sax_parse(v_ubjson, &scp, json::input_format_t::ubjson), json::out_of_range&);
-            }
-
-            SECTION("object")
-            {
-                std::vector<uint8_t> v_ubjson = {'{', '$', 'Z', '#', 'L', 0x78, 0x28, 0x00, 0x68, 0x28, 0x69, 0x69, 0x17};
-                json _;
-                CHECK_THROWS_AS(_ = json::from_ubjson(v_ubjson), json::out_of_range&);
-
-                json j;
-                nlohmann::detail::json_sax_dom_callback_parser<json> scp(j, [](int, json::parse_event_t, const json&)
-                {
-                    return true;
-                });
-                CHECK_THROWS_AS(_ = json::sax_parse(v_ubjson, &scp, json::input_format_t::ubjson), json::out_of_range&);
-            }
-        }
-    }
-
-    SECTION("SAX aborts")
-    {
-        SECTION("start_array()")
-        {
-            std::vector<uint8_t> v = {'[', 'T', 'F', ']'};
-            SaxCountdown scp(0);
-            CHECK(!json::sax_parse(v, &scp, json::input_format_t::ubjson));
-        }
-
-        SECTION("start_object()")
-        {
-            std::vector<uint8_t> v = {'{', 'i', 3, 'f', 'o', 'o', 'F', '}'};
-            SaxCountdown scp(0);
-            CHECK(!json::sax_parse(v, &scp, json::input_format_t::ubjson));
-        }
-
-        SECTION("key() in object")
-        {
-            std::vector<uint8_t> v = {'{', 'i', 3, 'f', 'o', 'o', 'F', '}'};
-            SaxCountdown scp(1);
-            CHECK(!json::sax_parse(v, &scp, json::input_format_t::ubjson));
-        }
-
-        SECTION("start_array(len)")
-        {
-            std::vector<uint8_t> v = {'[', '#', 'i', '2', 'T', 'F'};
-            SaxCountdown scp(0);
-            CHECK(!json::sax_parse(v, &scp, json::input_format_t::ubjson));
-        }
-
-        SECTION("start_object(len)")
-        {
-            std::vector<uint8_t> v = {'{', '#', 'i', '1', 3, 'f', 'o', 'o', 'F'};
-            SaxCountdown scp(0);
-            CHECK(!json::sax_parse(v, &scp, json::input_format_t::ubjson));
-        }
-
-        SECTION("key() in object with length")
-        {
-            std::vector<uint8_t> v = {'{', 'i', 3, 'f', 'o', 'o', 'F', '}'};
-            SaxCountdown scp(1);
-            CHECK(!json::sax_parse(v, &scp, json::input_format_t::ubjson));
-        }
-    }
-
-    SECTION("parsing values")
-    {
-        SECTION("strings")
-        {
-            // create a single-character string for all number types
-            std::vector<uint8_t> s_i = {'S', 'i', 1, 'a'};
-            std::vector<uint8_t> s_U = {'S', 'U', 1, 'a'};
-            std::vector<uint8_t> s_I = {'S', 'I', 0, 1, 'a'};
-            std::vector<uint8_t> s_l = {'S', 'l', 0, 0, 0, 1, 'a'};
-            std::vector<uint8_t> s_L = {'S', 'L', 0, 0, 0, 0, 0, 0, 0, 1, 'a'};
-
-            // check if string is parsed correctly to "a"
-            CHECK(json::from_ubjson(s_i) == "a");
-            CHECK(json::from_ubjson(s_U) == "a");
-            CHECK(json::from_ubjson(s_I) == "a");
-            CHECK(json::from_ubjson(s_l) == "a");
-            CHECK(json::from_ubjson(s_L) == "a");
-
-            // roundtrip: output should be optimized
-            CHECK(json::to_ubjson(json::from_ubjson(s_i)) == s_i);
-            CHECK(json::to_ubjson(json::from_ubjson(s_U)) == s_i);
-            CHECK(json::to_ubjson(json::from_ubjson(s_I)) == s_i);
-            CHECK(json::to_ubjson(json::from_ubjson(s_l)) == s_i);
-            CHECK(json::to_ubjson(json::from_ubjson(s_L)) == s_i);
-        }
-
-        SECTION("number")
-        {
-            SECTION("float")
-            {
-                // float32
-                std::vector<uint8_t> v_d = {'d', 0x40, 0x49, 0x0f, 0xd0};
-                CHECK(json::from_ubjson(v_d) == 3.14159f);
-
-                // float64
-                std::vector<uint8_t> v_D = {'D', 0x40, 0x09, 0x21, 0xf9, 0xf0, 0x1b, 0x86, 0x6e};
-                CHECK(json::from_ubjson(v_D) == 3.14159);
-
-                // float32 is serialized as float64 as the library does not support float32
-                CHECK(json::to_ubjson(json::from_ubjson(v_d)) == json::to_ubjson(3.14159f));
-            }
-        }
-
-        SECTION("array")
-        {
-            SECTION("optimized version (length only)")
-            {
-                // create vector with two elements of the same type
-                std::vector<uint8_t> v_TU = {'[', '#', 'U', 2, 'T', 'T'};
-                std::vector<uint8_t> v_T = {'[', '#', 'i', 2, 'T', 'T'};
-                std::vector<uint8_t> v_F = {'[', '#', 'i', 2, 'F', 'F'};
-                std::vector<uint8_t> v_Z = {'[', '#', 'i', 2, 'Z', 'Z'};
-                std::vector<uint8_t> v_i = {'[', '#', 'i', 2, 'i', 0x7F, 'i', 0x7F};
-                std::vector<uint8_t> v_U = {'[', '#', 'i', 2, 'U', 0xFF, 'U', 0xFF};
-                std::vector<uint8_t> v_I = {'[', '#', 'i', 2, 'I', 0x7F, 0xFF, 'I', 0x7F, 0xFF};
-                std::vector<uint8_t> v_l = {'[', '#', 'i', 2, 'l', 0x7F, 0xFF, 0xFF, 0xFF, 'l', 0x7F, 0xFF, 0xFF, 0xFF};
-                std::vector<uint8_t> v_L = {'[', '#', 'i', 2, 'L', 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 'L', 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
-                std::vector<uint8_t> v_D = {'[', '#', 'i', 2, 'D', 0x40, 0x09, 0x21, 0xfb, 0x4d, 0x12, 0xd8, 0x4a, 'D', 0x40, 0x09, 0x21, 0xfb, 0x4d, 0x12, 0xd8, 0x4a};
-                std::vector<uint8_t> v_S = {'[', '#', 'i', 2, 'S', 'i', 1, 'a', 'S', 'i', 1, 'a'};
-                std::vector<uint8_t> v_C = {'[', '#', 'i', 2, 'C', 'a', 'C', 'a'};
-
-                // check if vector is parsed correctly
-                CHECK(json::from_ubjson(v_TU) == json({true, true}));
-                CHECK(json::from_ubjson(v_T) == json({true, true}));
-                CHECK(json::from_ubjson(v_F) == json({false, false}));
-                CHECK(json::from_ubjson(v_Z) == json({nullptr, nullptr}));
-                CHECK(json::from_ubjson(v_i) == json({127, 127}));
-                CHECK(json::from_ubjson(v_U) == json({255, 255}));
-                CHECK(json::from_ubjson(v_I) == json({32767, 32767}));
-                CHECK(json::from_ubjson(v_l) == json({2147483647, 2147483647}));
-                CHECK(json::from_ubjson(v_L) == json({9223372036854775807, 9223372036854775807}));
-                CHECK(json::from_ubjson(v_D) == json({3.1415926, 3.1415926}));
-                CHECK(json::from_ubjson(v_S) == json({"a", "a"}));
-                CHECK(json::from_ubjson(v_C) == json({"a", "a"}));
-
-                // roundtrip: output should be optimized
-                CHECK(json::to_ubjson(json::from_ubjson(v_T), true) == v_T);
-                CHECK(json::to_ubjson(json::from_ubjson(v_F), true) == v_F);
-                CHECK(json::to_ubjson(json::from_ubjson(v_Z), true) == v_Z);
-                CHECK(json::to_ubjson(json::from_ubjson(v_i), true) == v_i);
-                CHECK(json::to_ubjson(json::from_ubjson(v_U), true) == v_U);
-                CHECK(json::to_ubjson(json::from_ubjson(v_I), true) == v_I);
-                CHECK(json::to_ubjson(json::from_ubjson(v_l), true) == v_l);
-                CHECK(json::to_ubjson(json::from_ubjson(v_L), true) == v_L);
-                CHECK(json::to_ubjson(json::from_ubjson(v_D), true) == v_D);
-                CHECK(json::to_ubjson(json::from_ubjson(v_S), true) == v_S);
-                CHECK(json::to_ubjson(json::from_ubjson(v_C), true) == v_S); // char is serialized to string
-            }
-
-            SECTION("optimized version (type and length)")
-            {
-                // create vector with two elements of the same type
-                std::vector<uint8_t> v_N = {'[', '$', 'N', '#', 'i', 2};
-                std::vector<uint8_t> v_T = {'[', '$', 'T', '#', 'i', 2};
-                std::vector<uint8_t> v_F = {'[', '$', 'F', '#', 'i', 2};
-                std::vector<uint8_t> v_Z = {'[', '$', 'Z', '#', 'i', 2};
-                std::vector<uint8_t> v_i = {'[', '$', 'i', '#', 'i', 2, 0x7F, 0x7F};
-                std::vector<uint8_t> v_U = {'[', '$', 'U', '#', 'i', 2, 0xFF, 0xFF};
-                std::vector<uint8_t> v_I = {'[', '$', 'I', '#', 'i', 2, 0x7F, 0xFF, 0x7F, 0xFF};
-                std::vector<uint8_t> v_l = {'[', '$', 'l', '#', 'i', 2, 0x7F, 0xFF, 0xFF, 0xFF, 0x7F, 0xFF, 0xFF, 0xFF};
-                std::vector<uint8_t> v_L = {'[', '$', 'L', '#', 'i', 2, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
-                std::vector<uint8_t> v_D = {'[', '$', 'D', '#', 'i', 2, 0x40, 0x09, 0x21, 0xfb, 0x4d, 0x12, 0xd8, 0x4a, 0x40, 0x09, 0x21, 0xfb, 0x4d, 0x12, 0xd8, 0x4a};
-                std::vector<uint8_t> v_S = {'[', '$', 'S', '#', 'i', 2, 'i', 1, 'a', 'i', 1, 'a'};
-                std::vector<uint8_t> v_C = {'[', '$', 'C', '#', 'i', 2, 'a', 'a'};
-
-                // check if vector is parsed correctly
-                CHECK(json::from_ubjson(v_N) == json::array());
-                CHECK(json::from_ubjson(v_T) == json({true, true}));
-                CHECK(json::from_ubjson(v_F) == json({false, false}));
-                CHECK(json::from_ubjson(v_Z) == json({nullptr, nullptr}));
-                CHECK(json::from_ubjson(v_i) == json({127, 127}));
-                CHECK(json::from_ubjson(v_U) == json({255, 255}));
-                CHECK(json::from_ubjson(v_I) == json({32767, 32767}));
-                CHECK(json::from_ubjson(v_l) == json({2147483647, 2147483647}));
-                CHECK(json::from_ubjson(v_L) == json({9223372036854775807, 9223372036854775807}));
-                CHECK(json::from_ubjson(v_D) == json({3.1415926, 3.1415926}));
-                CHECK(json::from_ubjson(v_S) == json({"a", "a"}));
-                CHECK(json::from_ubjson(v_C) == json({"a", "a"}));
-
-                // roundtrip: output should be optimized
-                std::vector<uint8_t> v_empty = {'[', '#', 'i', 0};
-                CHECK(json::to_ubjson(json::from_ubjson(v_N), true, true) == v_empty);
-                CHECK(json::to_ubjson(json::from_ubjson(v_T), true, true) == v_T);
-                CHECK(json::to_ubjson(json::from_ubjson(v_F), true, true) == v_F);
-                CHECK(json::to_ubjson(json::from_ubjson(v_Z), true, true) == v_Z);
-                CHECK(json::to_ubjson(json::from_ubjson(v_i), true, true) == v_i);
-                CHECK(json::to_ubjson(json::from_ubjson(v_U), true, true) == v_U);
-                CHECK(json::to_ubjson(json::from_ubjson(v_I), true, true) == v_I);
-                CHECK(json::to_ubjson(json::from_ubjson(v_l), true, true) == v_l);
-                CHECK(json::to_ubjson(json::from_ubjson(v_L), true, true) == v_L);
-                CHECK(json::to_ubjson(json::from_ubjson(v_D), true, true) == v_D);
-                CHECK(json::to_ubjson(json::from_ubjson(v_S), true, true) == v_S);
-                CHECK(json::to_ubjson(json::from_ubjson(v_C), true, true) == v_S); // char is serialized to string
-            }
-        }
-    }
-
-    SECTION("parse errors")
-    {
-        SECTION("empty byte vector")
-        {
-            json _;
-            CHECK_THROWS_AS(_ = json::from_ubjson(std::vector<uint8_t>()), json::parse_error&);
-            CHECK_THROWS_WITH(_ = json::from_ubjson(std::vector<uint8_t>()),
-                              "[json.exception.parse_error.110] parse error at byte 1: syntax error while parsing UBJSON value: unexpected end of input");
-        }
-
-        SECTION("char")
-        {
-            SECTION("eof after C byte")
-            {
-                std::vector<uint8_t> v = {'C'};
-                json _;
-                CHECK_THROWS_AS(_ = json::from_ubjson(v), json::parse_error&);
-                CHECK_THROWS_WITH(_ = json::from_ubjson(v), "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing UBJSON char: unexpected end of input");
-            }
-
-            SECTION("byte out of range")
-            {
-                std::vector<uint8_t> v = {'C', 130};
-                json _;
-                CHECK_THROWS_AS(_ = json::from_ubjson(v), json::parse_error&);
-                CHECK_THROWS_WITH(_ = json::from_ubjson(v), "[json.exception.parse_error.113] parse error at byte 2: syntax error while parsing UBJSON char: byte after 'C' must be in range 0x00..0x7F; last byte: 0x82");
-            }
-        }
-
-        SECTION("strings")
-        {
-            SECTION("eof after S byte")
-            {
-                std::vector<uint8_t> v = {'S'};
-                json _;
-                CHECK_THROWS_AS(_ = json::from_ubjson(v), json::parse_error&);
-                CHECK_THROWS_WITH(_ = json::from_ubjson(v), "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing UBJSON value: unexpected end of input");
-            }
-
-            SECTION("invalid byte")
-            {
-                std::vector<uint8_t> v = {'S', '1', 'a'};
-                json _;
-                CHECK_THROWS_AS(_ = json::from_ubjson(v), json::parse_error&);
-                CHECK_THROWS_WITH(_ = json::from_ubjson(v), "[json.exception.parse_error.113] parse error at byte 2: syntax error while parsing UBJSON string: expected length type specification (U, i, I, l, L); last byte: 0x31");
-            }
-        }
-
-        SECTION("array")
-        {
-            SECTION("optimized array: no size following type")
-            {
-                std::vector<uint8_t> v = {'[', '$', 'i', 2};
-                json _;
-                CHECK_THROWS_AS(_ = json::from_ubjson(v), json::parse_error&);
-                CHECK_THROWS_WITH(_ = json::from_ubjson(v), "[json.exception.parse_error.112] parse error at byte 4: syntax error while parsing UBJSON size: expected '#' after type information; last byte: 0x02");
-            }
-        }
-
-        SECTION("strings")
-        {
-            std::vector<uint8_t> vS = {'S'};
-            json _;
-            CHECK_THROWS_AS(_ = json::from_ubjson(vS), json::parse_error&);
-            CHECK_THROWS_WITH(_ = json::from_ubjson(vS), "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing UBJSON value: unexpected end of input");
-            CHECK(json::from_ubjson(vS, true, false).is_discarded());
-
-            std::vector<uint8_t> v = {'S', 'i', '2', 'a'};
-            CHECK_THROWS_AS(_ = json::from_ubjson(v), json::parse_error&);
-            CHECK_THROWS_WITH(_ = json::from_ubjson(v), "[json.exception.parse_error.110] parse error at byte 5: syntax error while parsing UBJSON string: unexpected end of input");
-            CHECK(json::from_ubjson(v, true, false).is_discarded());
-
-            std::vector<uint8_t> vC = {'C'};
-            CHECK_THROWS_AS(_ = json::from_ubjson(vC), json::parse_error&);
-            CHECK_THROWS_WITH(_ = json::from_ubjson(vC), "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing UBJSON char: unexpected end of input");
-            CHECK(json::from_ubjson(vC, true, false).is_discarded());
-        }
-
-        SECTION("sizes")
-        {
-            std::vector<uint8_t> vU = {'[', '#', 'U'};
-            json _;
-            CHECK_THROWS_AS(_ = json::from_ubjson(vU), json::parse_error&);
-            CHECK_THROWS_WITH(_ = json::from_ubjson(vU), "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing UBJSON number: unexpected end of input");
-            CHECK(json::from_ubjson(vU, true, false).is_discarded());
-
-            std::vector<uint8_t> vi = {'[', '#', 'i'};
-            CHECK_THROWS_AS(_ = json::from_ubjson(vi), json::parse_error&);
-            CHECK_THROWS_WITH(_ = json::from_ubjson(vi), "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing UBJSON number: unexpected end of input");
-            CHECK(json::from_ubjson(vi, true, false).is_discarded());
-
-            std::vector<uint8_t> vI = {'[', '#', 'I'};
-            CHECK_THROWS_AS(_ = json::from_ubjson(vI), json::parse_error&);
-            CHECK_THROWS_WITH(_ = json::from_ubjson(vI), "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing UBJSON number: unexpected end of input");
-            CHECK(json::from_ubjson(vI, true, false).is_discarded());
-
-            std::vector<uint8_t> vl = {'[', '#', 'l'};
-            CHECK_THROWS_AS(_ = json::from_ubjson(vl), json::parse_error&);
-            CHECK_THROWS_WITH(_ = json::from_ubjson(vl), "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing UBJSON number: unexpected end of input");
-            CHECK(json::from_ubjson(vl, true, false).is_discarded());
-
-            std::vector<uint8_t> vL = {'[', '#', 'L'};
-            CHECK_THROWS_AS(_ = json::from_ubjson(vL), json::parse_error&);
-            CHECK_THROWS_WITH(_ = json::from_ubjson(vL), "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing UBJSON number: unexpected end of input");
-            CHECK(json::from_ubjson(vL, true, false).is_discarded());
-
-            std::vector<uint8_t> v0 = {'[', '#', 'T', ']'};
-            CHECK_THROWS_AS(_ = json::from_ubjson(v0), json::parse_error&);
-            CHECK_THROWS_WITH(_ = json::from_ubjson(v0), "[json.exception.parse_error.113] parse error at byte 3: syntax error while parsing UBJSON size: expected length type specification (U, i, I, l, L) after '#'; last byte: 0x54");
-            CHECK(json::from_ubjson(v0, true, false).is_discarded());
-        }
-
-        SECTION("types")
-        {
-            std::vector<uint8_t> v0 = {'[', '$'};
-            json _;
-            CHECK_THROWS_AS(_ = json::from_ubjson(v0), json::parse_error&);
-            CHECK_THROWS_WITH(_ = json::from_ubjson(v0), "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing UBJSON type: unexpected end of input");
-            CHECK(json::from_ubjson(v0, true, false).is_discarded());
-
-            std::vector<uint8_t> vi = {'[', '$', '#'};
-            CHECK_THROWS_AS(_ = json::from_ubjson(vi), json::parse_error&);
-            CHECK_THROWS_WITH(_ = json::from_ubjson(vi), "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing UBJSON value: unexpected end of input");
-            CHECK(json::from_ubjson(vi, true, false).is_discarded());
-
-            std::vector<uint8_t> vT = {'[', '$', 'T'};
-            CHECK_THROWS_AS(_ = json::from_ubjson(vT), json::parse_error&);
-            CHECK_THROWS_WITH(_ = json::from_ubjson(vT), "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing UBJSON value: unexpected end of input");
-            CHECK(json::from_ubjson(vT, true, false).is_discarded());
-        }
-
-        SECTION("arrays")
-        {
-            std::vector<uint8_t> vST = {'[', '$', 'i', '#', 'i', 2, 1};
-            json _;
-            CHECK_THROWS_AS(_ = json::from_ubjson(vST), json::parse_error&);
-            CHECK_THROWS_WITH(_ = json::from_ubjson(vST), "[json.exception.parse_error.110] parse error at byte 8: syntax error while parsing UBJSON number: unexpected end of input");
-            CHECK(json::from_ubjson(vST, true, false).is_discarded());
-
-            std::vector<uint8_t> vS = {'[', '#', 'i', 2, 'i', 1};
-            CHECK_THROWS_AS(_ = json::from_ubjson(vS), json::parse_error&);
-            CHECK_THROWS_WITH(_ = json::from_ubjson(vS), "[json.exception.parse_error.110] parse error at byte 7: syntax error while parsing UBJSON value: unexpected end of input");
-            CHECK(json::from_ubjson(vS, true, false).is_discarded());
-
-            std::vector<uint8_t> v = {'[', 'i', 2, 'i', 1};
-            CHECK_THROWS_AS(_ = json::from_ubjson(v), json::parse_error&);
-            CHECK_THROWS_WITH(_ = json::from_ubjson(v), "[json.exception.parse_error.110] parse error at byte 6: syntax error while parsing UBJSON value: unexpected end of input");
-            CHECK(json::from_ubjson(v, true, false).is_discarded());
-        }
-
-        SECTION("objects")
-        {
-            std::vector<uint8_t> vST = {'{', '$', 'i', '#', 'i', 2, 'i', 1, 'a', 1};
-            json _;
-            CHECK_THROWS_AS(_ = json::from_ubjson(vST), json::parse_error&);
-            CHECK_THROWS_WITH(_ = json::from_ubjson(vST), "[json.exception.parse_error.110] parse error at byte 11: syntax error while parsing UBJSON value: unexpected end of input");
-            CHECK(json::from_ubjson(vST, true, false).is_discarded());
-
-            std::vector<uint8_t> vT = {'{', '$', 'i', 'i', 1, 'a', 1};
-            CHECK_THROWS_AS(_ = json::from_ubjson(vT), json::parse_error&);
-            CHECK_THROWS_WITH(_ = json::from_ubjson(vT), "[json.exception.parse_error.112] parse error at byte 4: syntax error while parsing UBJSON size: expected '#' after type information; last byte: 0x69");
-            CHECK(json::from_ubjson(vT, true, false).is_discarded());
-
-            std::vector<uint8_t> vS = {'{', '#', 'i', 2, 'i', 1, 'a', 'i', 1};
-            CHECK_THROWS_AS(_ = json::from_ubjson(vS), json::parse_error&);
-            CHECK_THROWS_WITH(_ = json::from_ubjson(vS), "[json.exception.parse_error.110] parse error at byte 10: syntax error while parsing UBJSON value: unexpected end of input");
-            CHECK(json::from_ubjson(vS, true, false).is_discarded());
-
-            std::vector<uint8_t> v = {'{', 'i', 1, 'a', 'i', 1};
-            CHECK_THROWS_AS(_ = json::from_ubjson(v), json::parse_error&);
-            CHECK_THROWS_WITH(_ = json::from_ubjson(v), "[json.exception.parse_error.110] parse error at byte 7: syntax error while parsing UBJSON value: unexpected end of input");
-            CHECK(json::from_ubjson(v, true, false).is_discarded());
-
-            std::vector<uint8_t> v2 = {'{', 'i', 1, 'a', 'i', 1, 'i'};
-            CHECK_THROWS_AS(_ = json::from_ubjson(v2), json::parse_error&);
-            CHECK_THROWS_WITH(_ = json::from_ubjson(v2), "[json.exception.parse_error.110] parse error at byte 8: syntax error while parsing UBJSON number: unexpected end of input");
-            CHECK(json::from_ubjson(v2, true, false).is_discarded());
-
-            std::vector<uint8_t> v3 = {'{', 'i', 1, 'a'};
-            CHECK_THROWS_AS(_ = json::from_ubjson(v3), json::parse_error&);
-            CHECK_THROWS_WITH(_ = json::from_ubjson(v3), "[json.exception.parse_error.110] parse error at byte 5: syntax error while parsing UBJSON value: unexpected end of input");
-            CHECK(json::from_ubjson(v3, true, false).is_discarded());
-
-            std::vector<uint8_t> vST1 = {'{', '$', 'd', '#', 'i', 2, 'i', 1, 'a'};
-            CHECK_THROWS_AS(_ = json::from_ubjson(vST1), json::parse_error&);
-            CHECK_THROWS_WITH(_ = json::from_ubjson(vST1), "[json.exception.parse_error.110] parse error at byte 10: syntax error while parsing UBJSON number: unexpected end of input");
-            CHECK(json::from_ubjson(vST1, true, false).is_discarded());
-
-            std::vector<uint8_t> vST2 = {'{', '#', 'i', 2, 'i', 1, 'a'};
-            CHECK_THROWS_AS(_ = json::from_ubjson(vST2), json::parse_error&);
-            CHECK_THROWS_WITH(_ = json::from_ubjson(vST2), "[json.exception.parse_error.110] parse error at byte 8: syntax error while parsing UBJSON value: unexpected end of input");
-            CHECK(json::from_ubjson(vST2, true, false).is_discarded());
-        }
-    }
-
-    SECTION("writing optimized values")
-    {
-        SECTION("integer")
-        {
-            SECTION("array of i")
-            {
-                json j = {1, -1};
-                std::vector<uint8_t> expected = {'[', '$', 'i', '#', 'i', 2, 1, 0xff};
-                CHECK(json::to_ubjson(j, true, true) == expected);
-            }
-
-            SECTION("array of U")
-            {
-                json j = {200, 201};
-                std::vector<uint8_t> expected = {'[', '$', 'U', '#', 'i', 2, 0xC8, 0xC9};
-                CHECK(json::to_ubjson(j, true, true) == expected);
-            }
-
-            SECTION("array of I")
-            {
-                json j = {30000, -30000};
-                std::vector<uint8_t> expected = {'[', '$', 'I', '#', 'i', 2, 0x75, 0x30, 0x8a, 0xd0};
-                CHECK(json::to_ubjson(j, true, true) == expected);
-            }
-
-            SECTION("array of l")
-            {
-                json j = {70000, -70000};
-                std::vector<uint8_t> expected = {'[', '$', 'l', '#', 'i', 2, 0x00, 0x01, 0x11, 0x70, 0xFF, 0xFE, 0xEE, 0x90};
-                CHECK(json::to_ubjson(j, true, true) == expected);
-            }
-
-            SECTION("array of L")
-            {
-                json j = {5000000000, -5000000000};
-                std::vector<uint8_t> expected = {'[', '$', 'L', '#', 'i', 2, 0x00, 0x00, 0x00, 0x01, 0x2A, 0x05, 0xF2, 0x00, 0xFF, 0xFF, 0xFF, 0xFE, 0xD5, 0xFA, 0x0E, 0x00};
-                CHECK(json::to_ubjson(j, true, true) == expected);
-            }
-        }
-
-        SECTION("unsigned integer")
-        {
-            SECTION("array of i")
-            {
-                json j = {1u, 2u};
-                std::vector<uint8_t> expected = {'[', '$', 'i', '#', 'i', 2, 1, 2};
-                std::vector<uint8_t> expected_size = {'[', '#', 'i', 2, 'i', 1, 'i', 2};
-                CHECK(json::to_ubjson(j, true, true) == expected);
-                CHECK(json::to_ubjson(j, true) == expected_size);
-            }
-
-            SECTION("array of U")
-            {
-                json j = {200u, 201u};
-                std::vector<uint8_t> expected = {'[', '$', 'U', '#', 'i', 2, 0xC8, 0xC9};
-                std::vector<uint8_t> expected_size = {'[', '#', 'i', 2, 'U', 0xC8, 'U', 0xC9};
-                CHECK(json::to_ubjson(j, true, true) == expected);
-                CHECK(json::to_ubjson(j, true) == expected_size);
-            }
-
-            SECTION("array of I")
-            {
-                json j = {30000u, 30001u};
-                std::vector<uint8_t> expected = {'[', '$', 'I', '#', 'i', 2, 0x75, 0x30, 0x75, 0x31};
-                std::vector<uint8_t> expected_size = {'[', '#', 'i', 2, 'I', 0x75, 0x30, 'I', 0x75, 0x31};
-                CHECK(json::to_ubjson(j, true, true) == expected);
-                CHECK(json::to_ubjson(j, true) == expected_size);
-            }
-
-            SECTION("array of l")
-            {
-                json j = {70000u, 70001u};
-                std::vector<uint8_t> expected = {'[', '$', 'l', '#', 'i', 2, 0x00, 0x01, 0x11, 0x70, 0x00, 0x01, 0x11, 0x71};
-                std::vector<uint8_t> expected_size = {'[', '#', 'i', 2, 'l', 0x00, 0x01, 0x11, 0x70, 'l', 0x00, 0x01, 0x11, 0x71};
-                CHECK(json::to_ubjson(j, true, true) == expected);
-                CHECK(json::to_ubjson(j, true) == expected_size);
-            }
-
-            SECTION("array of L")
-            {
-                json j = {5000000000u, 5000000001u};
-                std::vector<uint8_t> expected = {'[', '$', 'L', '#', 'i', 2, 0x00, 0x00, 0x00, 0x01, 0x2A, 0x05, 0xF2, 0x00, 0x00, 0x00, 0x00, 0x01, 0x2A, 0x05, 0xF2, 0x01};
-                std::vector<uint8_t> expected_size = {'[', '#', 'i', 2, 'L', 0x00, 0x00, 0x00, 0x01, 0x2A, 0x05, 0xF2, 0x00, 'L', 0x00, 0x00, 0x00, 0x01, 0x2A, 0x05, 0xF2, 0x01};
-                CHECK(json::to_ubjson(j, true, true) == expected);
-                CHECK(json::to_ubjson(j, true) == expected_size);
-            }
-        }
-
-        SECTION("discarded")
-        {
-            json j = {json::value_t::discarded, json::value_t::discarded};
-            std::vector<uint8_t> expected = {'[', '$', 'N', '#', 'i', 2};
-            CHECK(json::to_ubjson(j, true, true) == expected);
-        }
-    }
-}
-
-TEST_CASE("Universal Binary JSON Specification Examples 1")
-{
-    SECTION("Null Value")
-    {
-        json j = {{"passcode", nullptr}};
-        std::vector<uint8_t> v = {'{', 'i', 8, 'p', 'a', 's', 's', 'c', 'o', 'd', 'e', 'Z', '}'};
-        CHECK(json::to_ubjson(j) == v);
-        CHECK(json::from_ubjson(v) == j);
-    }
-
-    SECTION("No-Op Value")
-    {
-        json j = {"foo", "bar", "baz"};
-        std::vector<uint8_t> v = {'[', 'S', 'i', 3, 'f', 'o', 'o',
-                                  'S', 'i', 3, 'b', 'a', 'r',
-                                  'S', 'i', 3, 'b', 'a', 'z', ']'
-                                 };
-        std::vector<uint8_t> v2 = {'[', 'S', 'i', 3, 'f', 'o', 'o', 'N',
-                                   'S', 'i', 3, 'b', 'a', 'r', 'N', 'N', 'N',
-                                   'S', 'i', 3, 'b', 'a', 'z', 'N', 'N', ']'
-                                  };
-        CHECK(json::to_ubjson(j) == v);
-        CHECK(json::from_ubjson(v) == j);
-        CHECK(json::from_ubjson(v2) == j);
-    }
-
-    SECTION("Boolean Types")
-    {
-        json j = {{"authorized", true}, {"verified", false}};
-        std::vector<uint8_t> v = {'{', 'i', 10, 'a', 'u', 't', 'h', 'o', 'r', 'i', 'z', 'e', 'd', 'T',
-                                  'i', 8, 'v', 'e', 'r', 'i', 'f', 'i', 'e', 'd', 'F', '}'
-                                 };
-        CHECK(json::to_ubjson(j) == v);
-        CHECK(json::from_ubjson(v) == j);
-    }
-
-    SECTION("Numeric Types")
-    {
-        json j =
-        {
-            {"int8", 16},
-            {"uint8", 255},
-            {"int16", 32767},
-            {"int32", 2147483647},
-            {"int64", 9223372036854775807},
-            {"float64", 113243.7863123}
-        };
-        std::vector<uint8_t> v = {'{',
-                                  'i', 7, 'f', 'l', 'o', 'a', 't', '6', '4', 'D', 0x40, 0xfb, 0xa5, 0xbc, 0x94, 0xbc, 0x34, 0xcf,
-                                  'i', 5, 'i', 'n', 't', '1', '6', 'I', 0x7f, 0xff,
-                                  'i', 5, 'i', 'n', 't', '3', '2', 'l', 0x7f, 0xff, 0xff, 0xff,
-                                  'i', 5, 'i', 'n', 't', '6', '4', 'L', 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                                  'i', 4, 'i', 'n', 't', '8', 'i', 16,
-                                  'i', 5, 'u', 'i', 'n', 't', '8', 'U', 0xff,
-                                  '}'
-                                 };
-        CHECK(json::to_ubjson(j) == v);
-        CHECK(json::from_ubjson(v) == j);
-    }
-
-    SECTION("Char Type")
-    {
-        json j = {{"rolecode", "a"}, {"delim", ";"}};
-        std::vector<uint8_t> v = {'{', 'i', 5, 'd', 'e', 'l', 'i', 'm', 'C', ';', 'i', 8, 'r', 'o', 'l', 'e', 'c', 'o', 'd', 'e', 'C', 'a', '}'};
-        //CHECK(json::to_ubjson(j) == v);
-        CHECK(json::from_ubjson(v) == j);
-    }
-
-    SECTION("String Type")
-    {
-        SECTION("English")
-        {
-            json j = "hello";
-            std::vector<uint8_t> v = {'S', 'i', 5, 'h', 'e', 'l', 'l', 'o'};
-            CHECK(json::to_ubjson(j) == v);
-            CHECK(json::from_ubjson(v) == j);
-        }
-
-        SECTION("Russian")
-        {
-            json j = "привет";
-            std::vector<uint8_t> v = {'S', 'i', 12, 0xD0, 0xBF, 0xD1, 0x80, 0xD0, 0xB8, 0xD0, 0xB2, 0xD0, 0xB5, 0xD1, 0x82};
-            CHECK(json::to_ubjson(j) == v);
-            CHECK(json::from_ubjson(v) == j);
-        }
-
-        SECTION("Russian")
-        {
-            json j = "مرحبا";
-            std::vector<uint8_t> v = {'S', 'i', 10, 0xD9, 0x85, 0xD8, 0xB1, 0xD8, 0xAD, 0xD8, 0xA8, 0xD8, 0xA7};
-            CHECK(json::to_ubjson(j) == v);
-            CHECK(json::from_ubjson(v) == j);
-        }
-    }
-
-    SECTION("Array Type")
-    {
-        SECTION("size=false type=false")
-        {
-            // note the float has been replaced by a double
-            json j = {nullptr, true, false, 4782345193, 153.132, "ham"};
-            std::vector<uint8_t> v = {'[', 'Z', 'T', 'F', 'L', 0x00, 0x00, 0x00, 0x01, 0x1D, 0x0C, 0xCB, 0xE9, 'D', 0x40, 0x63, 0x24, 0x39, 0x58, 0x10, 0x62, 0x4e, 'S', 'i', 3, 'h', 'a', 'm', ']'};
-            CHECK(json::to_ubjson(j) == v);
-            CHECK(json::from_ubjson(v) == j);
-        }
-
-        SECTION("size=true type=false")
-        {
-            // note the float has been replaced by a double
-            json j = {nullptr, true, false, 4782345193, 153.132, "ham"};
-            std::vector<uint8_t> v = {'[', '#', 'i', 6, 'Z', 'T', 'F', 'L', 0x00, 0x00, 0x00, 0x01, 0x1D, 0x0C, 0xCB, 0xE9, 'D', 0x40, 0x63, 0x24, 0x39, 0x58, 0x10, 0x62, 0x4e, 'S', 'i', 3, 'h', 'a', 'm'};
-            CHECK(json::to_ubjson(j, true) == v);
-            CHECK(json::from_ubjson(v) == j);
-        }
-
-        SECTION("size=true type=true")
-        {
-            // note the float has been replaced by a double
-            json j = {nullptr, true, false, 4782345193, 153.132, "ham"};
-            std::vector<uint8_t> v = {'[', '#', 'i', 6, 'Z', 'T', 'F', 'L', 0x00, 0x00, 0x00, 0x01, 0x1D, 0x0C, 0xCB, 0xE9, 'D', 0x40, 0x63, 0x24, 0x39, 0x58, 0x10, 0x62, 0x4e, 'S', 'i', 3, 'h', 'a', 'm'};
-            CHECK(json::to_ubjson(j, true, true) == v);
-            CHECK(json::from_ubjson(v) == j);
-        }
-    }
-
-    SECTION("Object Type")
-    {
-        SECTION("size=false type=false")
-        {
-            json j =
-            {
-                {
-                    "post", {
-                        {"id", 1137},
-                        {"author", "rkalla"},
-                        {"timestamp", 1364482090592},
-                        {"body", "I totally agree!"}
-                    }
-                }
-            };
-            std::vector<uint8_t> v = {'{', 'i', 4, 'p', 'o', 's', 't', '{',
-                                      'i', 6, 'a', 'u', 't', 'h', 'o', 'r', 'S', 'i', 6, 'r', 'k', 'a', 'l', 'l', 'a',
-                                      'i', 4, 'b', 'o', 'd', 'y', 'S', 'i', 16, 'I', ' ', 't', 'o', 't', 'a', 'l', 'l', 'y', ' ', 'a', 'g', 'r', 'e', 'e', '!',
-                                      'i', 2, 'i', 'd', 'I', 0x04, 0x71,
-                                      'i', 9, 't', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', 'L', 0x00, 0x00, 0x01, 0x3D, 0xB1, 0x78, 0x66, 0x60,
-                                      '}', '}'
-                                     };
-            CHECK(json::to_ubjson(j) == v);
-            CHECK(json::from_ubjson(v) == j);
-        }
-
-        SECTION("size=true type=false")
-        {
-            json j =
-            {
-                {
-                    "post", {
-                        {"id", 1137},
-                        {"author", "rkalla"},
-                        {"timestamp", 1364482090592},
-                        {"body", "I totally agree!"}
-                    }
-                }
-            };
-            std::vector<uint8_t> v = {'{', '#', 'i', 1, 'i', 4, 'p', 'o', 's', 't', '{', '#', 'i', 4,
-                                      'i', 6, 'a', 'u', 't', 'h', 'o', 'r', 'S', 'i', 6, 'r', 'k', 'a', 'l', 'l', 'a',
-                                      'i', 4, 'b', 'o', 'd', 'y', 'S', 'i', 16, 'I', ' ', 't', 'o', 't', 'a', 'l', 'l', 'y', ' ', 'a', 'g', 'r', 'e', 'e', '!',
-                                      'i', 2, 'i', 'd', 'I', 0x04, 0x71,
-                                      'i', 9, 't', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', 'L', 0x00, 0x00, 0x01, 0x3D, 0xB1, 0x78, 0x66, 0x60
-                                     };
-            CHECK(json::to_ubjson(j, true) == v);
-            CHECK(json::from_ubjson(v) == j);
-        }
-
-        SECTION("size=true type=true")
-        {
-            json j =
-            {
-                {
-                    "post", {
-                        {"id", 1137},
-                        {"author", "rkalla"},
-                        {"timestamp", 1364482090592},
-                        {"body", "I totally agree!"}
-                    }
-                }
-            };
-            std::vector<uint8_t> v = {'{', '$', '{', '#', 'i', 1, 'i', 4, 'p', 'o', 's', 't', '#', 'i', 4,
-                                      'i', 6, 'a', 'u', 't', 'h', 'o', 'r', 'S', 'i', 6, 'r', 'k', 'a', 'l', 'l', 'a',
-                                      'i', 4, 'b', 'o', 'd', 'y', 'S', 'i', 16, 'I', ' ', 't', 'o', 't', 'a', 'l', 'l', 'y', ' ', 'a', 'g', 'r', 'e', 'e', '!',
-                                      'i', 2, 'i', 'd', 'I', 0x04, 0x71,
-                                      'i', 9, 't', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', 'L', 0x00, 0x00, 0x01, 0x3D, 0xB1, 0x78, 0x66, 0x60
-                                     };
-            CHECK(json::to_ubjson(j, true, true) == v);
-            CHECK(json::from_ubjson(v) == j);
-        }
-    }
-
-    SECTION("Optimized Format")
-    {
-        SECTION("Array Example")
-        {
-            SECTION("No Optimization")
-            {
-                // note the floats have been replaced by doubles
-                json j = {29.97, 31.13, 67.0, 2.113, 23.888};
-                std::vector<uint8_t> v = {'[',
-                                          'D', 0x40, 0x3d, 0xf8, 0x51, 0xeb, 0x85, 0x1e, 0xb8,
-                                          'D', 0x40, 0x3f, 0x21, 0x47, 0xae, 0x14, 0x7a, 0xe1,
-                                          'D', 0x40, 0x50, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                          'D', 0x40, 0x00, 0xe7, 0x6c, 0x8b, 0x43, 0x95, 0x81,
-                                          'D', 0x40, 0x37, 0xe3, 0x53, 0xf7, 0xce, 0xd9, 0x17,
-                                          ']'
-                                         };
-                CHECK(json::to_ubjson(j) == v);
-                CHECK(json::from_ubjson(v) == j);
-            }
-
-            SECTION("Optimized with count")
-            {
-                // note the floats have been replaced by doubles
-                json j = {29.97, 31.13, 67.0, 2.113, 23.888};
-                std::vector<uint8_t> v = {'[', '#', 'i', 5,
-                                          'D', 0x40, 0x3d, 0xf8, 0x51, 0xeb, 0x85, 0x1e, 0xb8,
-                                          'D', 0x40, 0x3f, 0x21, 0x47, 0xae, 0x14, 0x7a, 0xe1,
-                                          'D', 0x40, 0x50, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                          'D', 0x40, 0x00, 0xe7, 0x6c, 0x8b, 0x43, 0x95, 0x81,
-                                          'D', 0x40, 0x37, 0xe3, 0x53, 0xf7, 0xce, 0xd9, 0x17
-                                         };
-                CHECK(json::to_ubjson(j, true) == v);
-                CHECK(json::from_ubjson(v) == j);
-            }
-
-            SECTION("Optimized with type & count")
-            {
-                // note the floats have been replaced by doubles
-                json j = {29.97, 31.13, 67.0, 2.113, 23.888};
-                std::vector<uint8_t> v = {'[', '$', 'D', '#', 'i', 5,
-                                          0x40, 0x3d, 0xf8, 0x51, 0xeb, 0x85, 0x1e, 0xb8,
-                                          0x40, 0x3f, 0x21, 0x47, 0xae, 0x14, 0x7a, 0xe1,
-                                          0x40, 0x50, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                          0x40, 0x00, 0xe7, 0x6c, 0x8b, 0x43, 0x95, 0x81,
-                                          0x40, 0x37, 0xe3, 0x53, 0xf7, 0xce, 0xd9, 0x17
-                                         };
-                CHECK(json::to_ubjson(j, true, true) == v);
-                CHECK(json::from_ubjson(v) == j);
-            }
-        }
-
-        SECTION("Object Example")
-        {
-            SECTION("No Optimization")
-            {
-                // note the floats have been replaced by doubles
-                json j = { {"lat", 29.976}, {"long", 31.131}, {"alt", 67.0} };
-                std::vector<uint8_t> v = {'{',
-                                          'i', 3, 'a', 'l', 't', 'D', 0x40, 0x50, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                          'i', 3, 'l', 'a', 't', 'D', 0x40, 0x3d, 0xf9, 0xdb, 0x22, 0xd0, 0xe5, 0x60,
-                                          'i', 4, 'l', 'o', 'n', 'g', 'D', 0x40, 0x3f, 0x21, 0x89, 0x37, 0x4b, 0xc6, 0xa8,
-                                          '}'
-                                         };
-                CHECK(json::to_ubjson(j) == v);
-                CHECK(json::from_ubjson(v) == j);
-            }
-
-            SECTION("Optimized with count")
-            {
-                // note the floats have been replaced by doubles
-                json j = { {"lat", 29.976}, {"long", 31.131}, {"alt", 67.0} };
-                std::vector<uint8_t> v = {'{', '#', 'i', 3,
-                                          'i', 3, 'a', 'l', 't', 'D', 0x40, 0x50, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                          'i', 3, 'l', 'a', 't', 'D', 0x40, 0x3d, 0xf9, 0xdb, 0x22, 0xd0, 0xe5, 0x60,
-                                          'i', 4, 'l', 'o', 'n', 'g', 'D', 0x40, 0x3f, 0x21, 0x89, 0x37, 0x4b, 0xc6, 0xa8
-                                         };
-                CHECK(json::to_ubjson(j, true) == v);
-                CHECK(json::from_ubjson(v) == j);
-            }
-
-            SECTION("Optimized with type & count")
-            {
-                // note the floats have been replaced by doubles
-                json j = { {"lat", 29.976}, {"long", 31.131}, {"alt", 67.0} };
-                std::vector<uint8_t> v = {'{', '$', 'D', '#', 'i', 3,
-                                          'i', 3, 'a', 'l', 't', 0x40, 0x50, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                          'i', 3, 'l', 'a', 't', 0x40, 0x3d, 0xf9, 0xdb, 0x22, 0xd0, 0xe5, 0x60,
-                                          'i', 4, 'l', 'o', 'n', 'g', 0x40, 0x3f, 0x21, 0x89, 0x37, 0x4b, 0xc6, 0xa8
-                                         };
-                CHECK(json::to_ubjson(j, true, true) == v);
-                CHECK(json::from_ubjson(v) == j);
-            }
-        }
-
-        SECTION("Special Cases (Null, No-Op and Boolean)")
-        {
-            SECTION("Array")
-            {
-                std::vector<uint8_t> v = {'[', '$', 'N', '#', 'I', 0x02, 0x00};
-                CHECK(json::from_ubjson(v) == json::array());
-            }
-
-            SECTION("Object")
-            {
-                std::vector<uint8_t> v = {'{', '$', 'Z', '#', 'i', 3, 'i', 4, 'n', 'a', 'm', 'e', 'i', 8, 'p', 'a', 's', 's', 'w', 'o', 'r', 'd', 'i', 5, 'e', 'm', 'a', 'i', 'l'};
-                CHECK(json::from_ubjson(v) == json({ {"name", nullptr}, {"password", nullptr}, {"email", nullptr} }));
-            }
-        }
-    }
-}
-
-#if !defined(JSON_NOEXCEPTION)
-TEST_CASE("all UBJSON first bytes")
-{
-    // these bytes will fail immediately with exception parse_error.112
-    std::set<uint8_t> supported =
-    {
-        'T', 'F', 'Z', 'U', 'i', 'I', 'l', 'L', 'd', 'D', 'C', 'S', '[', '{', 'N', 'H'
-    };
-
-    for (auto i = 0; i < 256; ++i)
-    {
-        const auto byte = static_cast<uint8_t>(i);
-        CAPTURE(byte)
-
-        try
-        {
-            auto res = json::from_ubjson(std::vector<uint8_t>(1, byte));
-        }
-        catch (const json::parse_error& e)
-        {
-            // check that parse_error.112 is only thrown if the
-            // first byte is not in the supported set
-            INFO_WITH_TEMP(e.what());
-            if (std::find(supported.begin(), supported.end(), byte) == supported.end())
-            {
-                CHECK(e.id == 112);
-            }
-            else
-            {
-                CHECK(e.id != 112);
-            }
-        }
-    }
-}
-#endif
-
-TEST_CASE("UBJSON roundtrips" * doctest::skip())
-{
-    SECTION("input from self-generated UBJSON files")
-    {
-        for (std::string filename :
-                {
-                    TEST_DATA_DIRECTORY "/json_nlohmann_tests/all_unicode.json",
-                    TEST_DATA_DIRECTORY "/json.org/1.json",
-                    TEST_DATA_DIRECTORY "/json.org/2.json",
-                    TEST_DATA_DIRECTORY "/json.org/3.json",
-                    TEST_DATA_DIRECTORY "/json.org/4.json",
-                    TEST_DATA_DIRECTORY "/json.org/5.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip01.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip02.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip03.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip04.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip05.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip06.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip07.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip08.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip09.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip10.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip11.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip12.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip13.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip14.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip15.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip16.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip17.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip18.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip19.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip20.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip21.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip22.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip23.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip24.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip25.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip26.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip27.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip28.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip29.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip30.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip31.json",
-                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip32.json",
-                    TEST_DATA_DIRECTORY "/json_testsuite/sample.json",
-                    TEST_DATA_DIRECTORY "/json_tests/pass1.json",
-                    TEST_DATA_DIRECTORY "/json_tests/pass2.json",
-                    TEST_DATA_DIRECTORY "/json_tests/pass3.json"
-                })
-        {
-            CAPTURE(filename)
-
-            {
-                INFO_WITH_TEMP(filename + ": std::vector<uint8_t>");
-                // parse JSON file
-                std::ifstream f_json(filename);
-                json j1 = json::parse(f_json);
-
-                // parse UBJSON file
-                auto packed = utils::read_binary_file(filename + ".ubjson");
-                json j2;
-                CHECK_NOTHROW(j2 = json::from_ubjson(packed));
-
-                // compare parsed JSON values
-                CHECK(j1 == j2);
-            }
-
-            {
-                INFO_WITH_TEMP(filename + ": std::ifstream");
-                // parse JSON file
-                std::ifstream f_json(filename);
-                json j1 = json::parse(f_json);
-
-                // parse UBJSON file
-                std::ifstream f_ubjson(filename + ".ubjson", std::ios::binary);
-                json j2;
-                CHECK_NOTHROW(j2 = json::from_ubjson(f_ubjson));
-
-                // compare parsed JSON values
-                CHECK(j1 == j2);
-            }
-
-            {
-                INFO_WITH_TEMP(filename + ": uint8_t* and size");
-                // parse JSON file
-                std::ifstream f_json(filename);
-                json j1 = json::parse(f_json);
-
-                // parse UBJSON file
-                auto packed = utils::read_binary_file(filename + ".ubjson");
-                json j2;
-                CHECK_NOTHROW(j2 = json::from_ubjson({packed.data(), packed.size()}));
-
-                // compare parsed JSON values
-                CHECK(j1 == j2);
-            }
-
-            {
-                INFO_WITH_TEMP(filename + ": output to output adapters");
-                // parse JSON file
-                std::ifstream f_json(filename);
-                json j1 = json::parse(f_json);
-
-                // parse UBJSON file
-                auto packed = utils::read_binary_file(filename + ".ubjson");
-
-                {
-                    INFO_WITH_TEMP(filename + ": output adapters: std::vector<uint8_t>");
-                    std::vector<uint8_t> vec;
-                    json::to_ubjson(j1, vec);
-                    CHECK(vec == packed);
-                }
-            }
-        }
-    }
-}
diff --git a/external_imported/json/test/src/unit-udt_macro.cpp b/external_imported/json/test/src/unit-udt_macro.cpp
deleted file mode 100644
index a13ac006b..000000000
--- a/external_imported/json/test/src/unit-udt_macro.cpp
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include <string>
-#include <vector>
-#include "doctest_compatibility.h"
-
-#include <nlohmann/json.hpp>
-using nlohmann::json;
-
-namespace persons
-{
-class person_with_private_data
-{
-  private:
-    std::string name = "";
-    int age = 0;
-    json metadata = nullptr;
-
-  public:
-    bool operator==(const person_with_private_data& rhs) const
-    {
-        return name == rhs.name && age == rhs.age && metadata == rhs.metadata;
-    }
-
-    person_with_private_data() = default;
-    person_with_private_data(std::string name_, int age_, json metadata_)
-        : name(std::move(name_))
-        , age(age_)
-        , metadata(std::move(metadata_))
-    {}
-
-    NLOHMANN_DEFINE_TYPE_INTRUSIVE(person_with_private_data, age, name, metadata)
-};
-
-class person_without_private_data_1
-{
-  public:
-    std::string name = "";
-    int age = 0;
-    json metadata = nullptr;
-
-    bool operator==(const person_without_private_data_1& rhs) const
-    {
-        return name == rhs.name && age == rhs.age && metadata == rhs.metadata;
-    }
-
-    person_without_private_data_1() = default;
-    person_without_private_data_1(std::string name_, int age_, json metadata_)
-        : name(std::move(name_))
-        , age(age_)
-        , metadata(std::move(metadata_))
-    {}
-
-    NLOHMANN_DEFINE_TYPE_INTRUSIVE(person_without_private_data_1, age, name, metadata)
-};
-
-class person_without_private_data_2
-{
-  public:
-    std::string name = "";
-    int age = 0;
-    json metadata = nullptr;
-
-    bool operator==(const person_without_private_data_2& rhs) const
-    {
-        return name == rhs.name && age == rhs.age && metadata == rhs.metadata;
-    }
-
-    person_without_private_data_2() = default;
-    person_without_private_data_2(std::string name_, int age_, json metadata_)
-        : name(std::move(name_))
-        , age(age_)
-        , metadata(std::move(metadata_))
-    {}
-};
-
-NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(person_without_private_data_2, age, name, metadata)
-
-class person_with_private_alphabet
-{
-  public:
-    bool operator==(const person_with_private_alphabet& other) const
-    {
-        return  a == other.a &&
-                b == other.b &&
-                c == other.c &&
-                d == other.d &&
-                e == other.e &&
-                f == other.f &&
-                g == other.g &&
-                h == other.h &&
-                i == other.i &&
-                j == other.j &&
-                k == other.k &&
-                l == other.l &&
-                m == other.m &&
-                n == other.n &&
-                o == other.o &&
-                p == other.p &&
-                q == other.q &&
-                r == other.r &&
-                s == other.s &&
-                t == other.t &&
-                u == other.u &&
-                v == other.v &&
-                w == other.w &&
-                x == other.x &&
-                y == other.y &&
-                z == other.z;
-    }
-
-  private:
-    int a = 0;
-    int b = 0;
-    int c = 0;
-    int d = 0;
-    int e = 0;
-    int f = 0;
-    int g = 0;
-    int h = 0;
-    int i = 0;
-    int j = 0;
-    int k = 0;
-    int l = 0;
-    int m = 0;
-    int n = 0;
-    int o = 0;
-    int p = 0;
-    int q = 0;
-    int r = 0;
-    int s = 0;
-    int t = 0;
-    int u = 0;
-    int v = 0;
-    int w = 0;
-    int x = 0;
-    int y = 0;
-    int z = 0;
-    NLOHMANN_DEFINE_TYPE_INTRUSIVE(person_with_private_alphabet, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z)
-};
-
-class person_with_public_alphabet
-{
-  public:
-    bool operator==(const person_with_public_alphabet& other) const
-    {
-        return  a == other.a &&
-                b == other.b &&
-                c == other.c &&
-                d == other.d &&
-                e == other.e &&
-                f == other.f &&
-                g == other.g &&
-                h == other.h &&
-                i == other.i &&
-                j == other.j &&
-                k == other.k &&
-                l == other.l &&
-                m == other.m &&
-                n == other.n &&
-                o == other.o &&
-                p == other.p &&
-                q == other.q &&
-                r == other.r &&
-                s == other.s &&
-                t == other.t &&
-                u == other.u &&
-                v == other.v &&
-                w == other.w &&
-                x == other.x &&
-                y == other.y &&
-                z == other.z;
-    }
-
-    int a = 0;
-    int b = 0;
-    int c = 0;
-    int d = 0;
-    int e = 0;
-    int f = 0;
-    int g = 0;
-    int h = 0;
-    int i = 0;
-    int j = 0;
-    int k = 0;
-    int l = 0;
-    int m = 0;
-    int n = 0;
-    int o = 0;
-    int p = 0;
-    int q = 0;
-    int r = 0;
-    int s = 0;
-    int t = 0;
-    int u = 0;
-    int v = 0;
-    int w = 0;
-    int x = 0;
-    int y = 0;
-    int z = 0;
-};
-
-NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(person_with_public_alphabet, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z)
-
-} // namespace persons
-
-TEST_CASE_TEMPLATE("Serialization/deserialization via NLOHMANN_DEFINE_TYPE_INTRUSIVE", T,
-                   persons::person_with_private_data,
-                   persons::person_without_private_data_1,
-                   persons::person_without_private_data_2)
-{
-    SECTION("person")
-    {
-        // serialization
-        T p1("Erik", 1, {{"haircuts", 2}});
-        CHECK(json(p1).dump() == "{\"age\":1,\"metadata\":{\"haircuts\":2},\"name\":\"Erik\"}");
-
-        // deserialization
-        auto p2 = json(p1).get<T>();
-        CHECK(p2 == p1);
-
-        // roundtrip
-        CHECK(T(json(p1)) == p1);
-        CHECK(json(T(json(p1))) == json(p1));
-
-        // check exception in case of missing field
-        json j = json(p1);
-        j.erase("age");
-        CHECK_THROWS_WITH_AS(j.get<T>(), "[json.exception.out_of_range.403] key 'age' not found", json::out_of_range);
-    }
-}
-
-TEST_CASE_TEMPLATE("Serialization/deserialization of classes with 26 public/private member variables via NLOHMANN_DEFINE_TYPE_INTRUSIVE and NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE", T,
-                   persons::person_with_private_alphabet,
-                   persons::person_with_public_alphabet)
-{
-    SECTION("alphabet")
-    {
-        {
-            T obj1;
-            nlohmann::json j = obj1; //via json object
-            T obj2;
-            j.get_to(obj2);
-            bool ok = (obj1 == obj2);
-            CHECK(ok);
-        }
-
-        {
-            T obj1;
-            nlohmann::json j1 = obj1; //via json string
-            std::string s = j1.dump();
-            nlohmann::json j2 = nlohmann::json::parse(s);
-            T obj2;
-            j2.get_to(obj2);
-            bool ok = (obj1 == obj2);
-            CHECK(ok);
-        }
-
-        {
-            T obj1;
-            nlohmann::json j1 = obj1; //via msgpack
-            std::vector<uint8_t> buf = nlohmann::json::to_msgpack(j1);
-            nlohmann::json j2 = nlohmann::json::from_msgpack(buf);
-            T obj2;
-            j2.get_to(obj2);
-            bool ok = (obj1 == obj2);
-            CHECK(ok);
-        }
-
-        {
-            T obj1;
-            nlohmann::json j1 = obj1; //via bson
-            std::vector<uint8_t> buf = nlohmann::json::to_bson(j1);
-            nlohmann::json j2 = nlohmann::json::from_bson(buf);
-            T obj2;
-            j2.get_to(obj2);
-            bool ok = (obj1 == obj2);
-            CHECK(ok);
-        }
-
-        {
-            T obj1;
-            nlohmann::json j1 = obj1; //via cbor
-            std::vector<uint8_t> buf = nlohmann::json::to_cbor(j1);
-            nlohmann::json j2 = nlohmann::json::from_cbor(buf);
-            T obj2;
-            j2.get_to(obj2);
-            bool ok = (obj1 == obj2);
-            CHECK(ok);
-        }
-
-        {
-            T obj1;
-            nlohmann::json j1 = obj1; //via ubjson
-            std::vector<uint8_t> buf = nlohmann::json::to_ubjson(j1);
-            nlohmann::json j2 = nlohmann::json::from_ubjson(buf);
-            T obj2;
-            j2.get_to(obj2);
-            bool ok = (obj1 == obj2);
-            CHECK(ok);
-        }
-    }
-}
diff --git a/external_imported/json/test/src/unit-unicode.cpp b/external_imported/json/test/src/unit-unicode.cpp
deleted file mode 100644
index 654c48c2a..000000000
--- a/external_imported/json/test/src/unit-unicode.cpp
+++ /dev/null
@@ -1,1611 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include "doctest_compatibility.h"
-
-// for some reason including this after the json header leads to linker errors with VS 2017...
-#include <locale>
-
-#define JSON_TESTS_PRIVATE
-#include <nlohmann/json.hpp>
-using nlohmann::json;
-
-#include <fstream>
-#include <sstream>
-#include <iostream>
-#include <iomanip>
-#include <test_data.hpp>
-
-namespace
-{
-extern size_t calls;
-size_t calls = 0;
-
-void check_utf8dump(bool success_expected, int byte1, int byte2, int byte3, int byte4);
-
-void check_utf8dump(bool success_expected, int byte1, int byte2 = -1, int byte3 = -1, int byte4 = -1)
-{
-    std::string json_string;
-
-    CAPTURE(byte1)
-    CAPTURE(byte2)
-    CAPTURE(byte3)
-    CAPTURE(byte4)
-
-    json_string += std::string(1, static_cast<char>(byte1));
-
-    if (byte2 != -1)
-    {
-        json_string += std::string(1, static_cast<char>(byte2));
-    }
-
-    if (byte3 != -1)
-    {
-        json_string += std::string(1, static_cast<char>(byte3));
-    }
-
-    if (byte4 != -1)
-    {
-        json_string += std::string(1, static_cast<char>(byte4));
-    }
-
-    CAPTURE(json_string)
-
-    // store the string in a JSON value
-    json j = json_string;
-    json j2 = "abc" + json_string + "xyz";
-
-    // dumping with ignore/replace must not throw in any case
-    auto s_ignored = j.dump(-1, ' ', false, json::error_handler_t::ignore);
-    auto s_ignored2 = j2.dump(-1, ' ', false, json::error_handler_t::ignore);
-    auto s_ignored_ascii = j.dump(-1, ' ', true, json::error_handler_t::ignore);
-    auto s_ignored2_ascii = j2.dump(-1, ' ', true, json::error_handler_t::ignore);
-    auto s_replaced = j.dump(-1, ' ', false, json::error_handler_t::replace);
-    auto s_replaced2 = j2.dump(-1, ' ', false, json::error_handler_t::replace);
-    auto s_replaced_ascii = j.dump(-1, ' ', true, json::error_handler_t::replace);
-    auto s_replaced2_ascii = j2.dump(-1, ' ', true, json::error_handler_t::replace);
-
-    if (success_expected)
-    {
-        // strict mode must not throw if success is expected
-        auto s_strict = j.dump();
-        // all dumps should agree on the string
-        CHECK(s_strict == s_ignored);
-        CHECK(s_strict == s_replaced);
-    }
-    else
-    {
-        // strict mode must throw if success is not expected
-        CHECK_THROWS_AS(j.dump(), json::type_error&);
-        // ignore and replace must create different dumps
-        CHECK(s_ignored != s_replaced);
-
-        // check that replace string contains a replacement character
-        CHECK(s_replaced.find("\xEF\xBF\xBD") != std::string::npos);
-    }
-
-    // check that prefix and suffix are preserved
-    CHECK(s_ignored2.substr(1, 3) == "abc");
-    CHECK(s_ignored2.substr(s_ignored2.size() - 4, 3) == "xyz");
-    CHECK(s_ignored2_ascii.substr(1, 3) == "abc");
-    CHECK(s_ignored2_ascii.substr(s_ignored2_ascii.size() - 4, 3) == "xyz");
-    CHECK(s_replaced2.substr(1, 3) == "abc");
-    CHECK(s_replaced2.substr(s_replaced2.size() - 4, 3) == "xyz");
-    CHECK(s_replaced2_ascii.substr(1, 3) == "abc");
-    CHECK(s_replaced2_ascii.substr(s_replaced2_ascii.size() - 4, 3) == "xyz");
-}
-
-void check_utf8string(bool success_expected, int byte1, int byte2, int byte3, int byte4);
-
-// create and check a JSON string with up to four UTF-8 bytes
-void check_utf8string(bool success_expected, int byte1, int byte2 = -1, int byte3 = -1, int byte4 = -1)
-{
-    if (++calls % 100000 == 0)
-    {
-        std::cout << calls << " of 8860608 UTF-8 strings checked" << std::endl;
-    }
-
-    std::string json_string = "\"";
-
-    CAPTURE(byte1)
-    json_string += std::string(1, static_cast<char>(byte1));
-
-    if (byte2 != -1)
-    {
-        CAPTURE(byte2)
-        json_string += std::string(1, static_cast<char>(byte2));
-    }
-
-    if (byte3 != -1)
-    {
-        CAPTURE(byte3)
-        json_string += std::string(1, static_cast<char>(byte3));
-    }
-
-    if (byte4 != -1)
-    {
-        CAPTURE(byte4)
-        json_string += std::string(1, static_cast<char>(byte4));
-    }
-
-    json_string += "\"";
-
-    CAPTURE(json_string)
-
-    json _;
-    if (success_expected)
-    {
-        CHECK_NOTHROW(_ = json::parse(json_string));
-    }
-    else
-    {
-        CHECK_THROWS_AS(_ = json::parse(json_string), json::parse_error&);
-    }
-}
-}
-
-TEST_CASE("Unicode" * doctest::skip())
-{
-    SECTION("RFC 3629")
-    {
-        /*
-        RFC 3629 describes in Sect. 4 the syntax of UTF-8 byte sequences as
-        follows:
-
-            A UTF-8 string is a sequence of octets representing a sequence of UCS
-            characters.  An octet sequence is valid UTF-8 only if it matches the
-            following syntax, which is derived from the rules for encoding UTF-8
-            and is expressed in the ABNF of [RFC2234].
-
-            UTF8-octets = *( UTF8-char )
-            UTF8-char   = UTF8-1 / UTF8-2 / UTF8-3 / UTF8-4
-            UTF8-1      = %x00-7F
-            UTF8-2      = %xC2-DF UTF8-tail
-            UTF8-3      = %xE0 %xA0-BF UTF8-tail / %xE1-EC 2( UTF8-tail ) /
-                          %xED %x80-9F UTF8-tail / %xEE-EF 2( UTF8-tail )
-            UTF8-4      = %xF0 %x90-BF 2( UTF8-tail ) / %xF1-F3 3( UTF8-tail ) /
-                          %xF4 %x80-8F 2( UTF8-tail )
-            UTF8-tail   = %x80-BF
-        */
-
-        SECTION("ill-formed first byte")
-        {
-            for (int byte1 = 0x80; byte1 <= 0xC1; ++byte1)
-            {
-                check_utf8string(false, byte1);
-                check_utf8dump(false, byte1);
-            }
-
-            for (int byte1 = 0xF5; byte1 <= 0xFF; ++byte1)
-            {
-                check_utf8string(false, byte1);
-                check_utf8dump(false, byte1);
-            }
-        }
-
-        SECTION("UTF8-1 (x00-x7F)")
-        {
-            SECTION("well-formed")
-            {
-                for (int byte1 = 0x00; byte1 <= 0x7F; ++byte1)
-                {
-                    // unescaped control characters are parse errors in JSON
-                    if (0x00 <= byte1 && byte1 <= 0x1F)
-                    {
-                        check_utf8string(false, byte1);
-                        continue;
-                    }
-
-                    // a single quote is a parse error in JSON
-                    if (byte1 == 0x22)
-                    {
-                        check_utf8string(false, byte1);
-                        continue;
-                    }
-
-                    // a single backslash is a parse error in JSON
-                    if (byte1 == 0x5C)
-                    {
-                        check_utf8string(false, byte1);
-                        continue;
-                    }
-
-                    // all other characters are OK
-                    check_utf8string(true, byte1);
-                    check_utf8dump(true, byte1);
-                }
-            }
-        }
-
-        SECTION("UTF8-2 (xC2-xDF UTF8-tail)")
-        {
-            SECTION("well-formed")
-            {
-                for (int byte1 = 0xC2; byte1 <= 0xDF; ++byte1)
-                {
-                    for (int byte2 = 0x80; byte2 <= 0xBF; ++byte2)
-                    {
-                        check_utf8string(true, byte1, byte2);
-                        check_utf8dump(true, byte1, byte2);
-                    }
-                }
-            }
-
-            SECTION("ill-formed: missing second byte")
-            {
-                for (int byte1 = 0xC2; byte1 <= 0xDF; ++byte1)
-                {
-                    check_utf8string(false, byte1);
-                    check_utf8dump(false, byte1);
-                }
-            }
-
-            SECTION("ill-formed: wrong second byte")
-            {
-                for (int byte1 = 0xC2; byte1 <= 0xDF; ++byte1)
-                {
-                    for (int byte2 = 0x00; byte2 <= 0xFF; ++byte2)
-                    {
-                        // skip correct second byte
-                        if (0x80 <= byte2 && byte2 <= 0xBF)
-                        {
-                            continue;
-                        }
-
-                        check_utf8string(false, byte1, byte2);
-                        check_utf8dump(false, byte1, byte2);
-                    }
-                }
-            }
-        }
-
-        SECTION("UTF8-3 (xE0 xA0-BF UTF8-tail)")
-        {
-            SECTION("well-formed")
-            {
-                for (int byte1 = 0xE0; byte1 <= 0xE0; ++byte1)
-                {
-                    for (int byte2 = 0xA0; byte2 <= 0xBF; ++byte2)
-                    {
-                        for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3)
-                        {
-                            check_utf8string(true, byte1, byte2, byte3);
-                            check_utf8dump(true, byte1, byte2, byte3);
-                        }
-                    }
-                }
-            }
-
-            SECTION("ill-formed: missing second byte")
-            {
-                for (int byte1 = 0xE0; byte1 <= 0xE0; ++byte1)
-                {
-                    check_utf8string(false, byte1);
-                    check_utf8dump(false, byte1);
-                }
-            }
-
-            SECTION("ill-formed: missing third byte")
-            {
-                for (int byte1 = 0xE0; byte1 <= 0xE0; ++byte1)
-                {
-                    for (int byte2 = 0xA0; byte2 <= 0xBF; ++byte2)
-                    {
-                        check_utf8string(false, byte1, byte2);
-                        check_utf8dump(false, byte1, byte2);
-                    }
-                }
-            }
-
-            SECTION("ill-formed: wrong second byte")
-            {
-                for (int byte1 = 0xE0; byte1 <= 0xE0; ++byte1)
-                {
-                    for (int byte2 = 0x00; byte2 <= 0xFF; ++byte2)
-                    {
-                        // skip correct second byte
-                        if (0xA0 <= byte2 && byte2 <= 0xBF)
-                        {
-                            continue;
-                        }
-
-                        for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3)
-                        {
-                            check_utf8string(false, byte1, byte2, byte3);
-                            check_utf8dump(false, byte1, byte2, byte3);
-                        }
-                    }
-                }
-            }
-
-            SECTION("ill-formed: wrong third byte")
-            {
-                for (int byte1 = 0xE0; byte1 <= 0xE0; ++byte1)
-                {
-                    for (int byte2 = 0xA0; byte2 <= 0xBF; ++byte2)
-                    {
-                        for (int byte3 = 0x00; byte3 <= 0xFF; ++byte3)
-                        {
-                            // skip correct third byte
-                            if (0x80 <= byte3 && byte3 <= 0xBF)
-                            {
-                                continue;
-                            }
-
-                            check_utf8string(false, byte1, byte2, byte3);
-                            check_utf8dump(false, byte1, byte2, byte3);
-                        }
-                    }
-                }
-            }
-        }
-
-        SECTION("UTF8-3 (xE1-xEC UTF8-tail UTF8-tail)")
-        {
-            SECTION("well-formed")
-            {
-                for (int byte1 = 0xE1; byte1 <= 0xEC; ++byte1)
-                {
-                    for (int byte2 = 0x80; byte2 <= 0xBF; ++byte2)
-                    {
-                        for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3)
-                        {
-                            check_utf8string(true, byte1, byte2, byte3);
-                            check_utf8dump(true, byte1, byte2, byte3);
-                        }
-                    }
-                }
-            }
-
-            SECTION("ill-formed: missing second byte")
-            {
-                for (int byte1 = 0xE1; byte1 <= 0xEC; ++byte1)
-                {
-                    check_utf8string(false, byte1);
-                    check_utf8dump(false, byte1);
-                }
-            }
-
-            SECTION("ill-formed: missing third byte")
-            {
-                for (int byte1 = 0xE1; byte1 <= 0xEC; ++byte1)
-                {
-                    for (int byte2 = 0x80; byte2 <= 0xBF; ++byte2)
-                    {
-                        check_utf8string(false, byte1, byte2);
-                        check_utf8dump(false, byte1, byte2);
-                    }
-                }
-            }
-
-            SECTION("ill-formed: wrong second byte")
-            {
-                for (int byte1 = 0xE1; byte1 <= 0xEC; ++byte1)
-                {
-                    for (int byte2 = 0x00; byte2 <= 0xFF; ++byte2)
-                    {
-                        // skip correct second byte
-                        if (0x80 <= byte2 && byte2 <= 0xBF)
-                        {
-                            continue;
-                        }
-
-                        for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3)
-                        {
-                            check_utf8string(false, byte1, byte2, byte3);
-                            check_utf8dump(false, byte1, byte2, byte3);
-                        }
-                    }
-                }
-            }
-
-            SECTION("ill-formed: wrong third byte")
-            {
-                for (int byte1 = 0xE1; byte1 <= 0xEC; ++byte1)
-                {
-                    for (int byte2 = 0x80; byte2 <= 0xBF; ++byte2)
-                    {
-                        for (int byte3 = 0x00; byte3 <= 0xFF; ++byte3)
-                        {
-                            // skip correct third byte
-                            if (0x80 <= byte3 && byte3 <= 0xBF)
-                            {
-                                continue;
-                            }
-
-                            check_utf8string(false, byte1, byte2, byte3);
-                            check_utf8dump(false, byte1, byte2, byte3);
-                        }
-                    }
-                }
-            }
-        }
-
-        SECTION("UTF8-3 (xED x80-9F UTF8-tail)")
-        {
-            SECTION("well-formed")
-            {
-                for (int byte1 = 0xED; byte1 <= 0xED; ++byte1)
-                {
-                    for (int byte2 = 0x80; byte2 <= 0x9F; ++byte2)
-                    {
-                        for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3)
-                        {
-                            check_utf8string(true, byte1, byte2, byte3);
-                            check_utf8dump(true, byte1, byte2, byte3);
-                        }
-                    }
-                }
-            }
-
-            SECTION("ill-formed: missing second byte")
-            {
-                for (int byte1 = 0xED; byte1 <= 0xED; ++byte1)
-                {
-                    check_utf8string(false, byte1);
-                    check_utf8dump(false, byte1);
-                }
-            }
-
-            SECTION("ill-formed: missing third byte")
-            {
-                for (int byte1 = 0xED; byte1 <= 0xED; ++byte1)
-                {
-                    for (int byte2 = 0x80; byte2 <= 0x9F; ++byte2)
-                    {
-                        check_utf8string(false, byte1, byte2);
-                        check_utf8dump(false, byte1, byte2);
-                    }
-                }
-            }
-
-            SECTION("ill-formed: wrong second byte")
-            {
-                for (int byte1 = 0xED; byte1 <= 0xED; ++byte1)
-                {
-                    for (int byte2 = 0x00; byte2 <= 0xFF; ++byte2)
-                    {
-                        // skip correct second byte
-                        if (0x80 <= byte2 && byte2 <= 0x9F)
-                        {
-                            continue;
-                        }
-
-                        for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3)
-                        {
-                            check_utf8string(false, byte1, byte2, byte3);
-                            check_utf8dump(false, byte1, byte2, byte3);
-                        }
-                    }
-                }
-            }
-
-            SECTION("ill-formed: wrong third byte")
-            {
-                for (int byte1 = 0xED; byte1 <= 0xED; ++byte1)
-                {
-                    for (int byte2 = 0x80; byte2 <= 0x9F; ++byte2)
-                    {
-                        for (int byte3 = 0x00; byte3 <= 0xFF; ++byte3)
-                        {
-                            // skip correct third byte
-                            if (0x80 <= byte3 && byte3 <= 0xBF)
-                            {
-                                continue;
-                            }
-
-                            check_utf8string(false, byte1, byte2, byte3);
-                            check_utf8dump(false, byte1, byte2, byte3);
-                        }
-                    }
-                }
-            }
-        }
-
-        SECTION("UTF8-3 (xEE-xEF UTF8-tail UTF8-tail)")
-        {
-            SECTION("well-formed")
-            {
-                for (int byte1 = 0xEE; byte1 <= 0xEF; ++byte1)
-                {
-                    for (int byte2 = 0x80; byte2 <= 0xBF; ++byte2)
-                    {
-                        for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3)
-                        {
-                            check_utf8string(true, byte1, byte2, byte3);
-                            check_utf8dump(true, byte1, byte2, byte3);
-                        }
-                    }
-                }
-            }
-
-            SECTION("ill-formed: missing second byte")
-            {
-                for (int byte1 = 0xEE; byte1 <= 0xEF; ++byte1)
-                {
-                    check_utf8string(false, byte1);
-                    check_utf8dump(false, byte1);
-                }
-            }
-
-            SECTION("ill-formed: missing third byte")
-            {
-                for (int byte1 = 0xEE; byte1 <= 0xEF; ++byte1)
-                {
-                    for (int byte2 = 0x80; byte2 <= 0xBF; ++byte2)
-                    {
-                        check_utf8string(false, byte1, byte2);
-                        check_utf8dump(false, byte1, byte2);
-                    }
-                }
-            }
-
-            SECTION("ill-formed: wrong second byte")
-            {
-                for (int byte1 = 0xEE; byte1 <= 0xEF; ++byte1)
-                {
-                    for (int byte2 = 0x00; byte2 <= 0xFF; ++byte2)
-                    {
-                        // skip correct second byte
-                        if (0x80 <= byte2 && byte2 <= 0xBF)
-                        {
-                            continue;
-                        }
-
-                        for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3)
-                        {
-                            check_utf8string(false, byte1, byte2, byte3);
-                            check_utf8dump(false, byte1, byte2, byte3);
-                        }
-                    }
-                }
-            }
-
-            SECTION("ill-formed: wrong third byte")
-            {
-                for (int byte1 = 0xEE; byte1 <= 0xEF; ++byte1)
-                {
-                    for (int byte2 = 0x80; byte2 <= 0xBF; ++byte2)
-                    {
-                        for (int byte3 = 0x00; byte3 <= 0xFF; ++byte3)
-                        {
-                            // skip correct third byte
-                            if (0x80 <= byte3 && byte3 <= 0xBF)
-                            {
-                                continue;
-                            }
-
-                            check_utf8string(false, byte1, byte2, byte3);
-                            check_utf8dump(false, byte1, byte2, byte3);
-                        }
-                    }
-                }
-            }
-        }
-
-        SECTION("UTF8-4 (xF0 x90-BF UTF8-tail UTF8-tail)")
-        {
-            SECTION("well-formed")
-            {
-                for (int byte1 = 0xF0; byte1 <= 0xF0; ++byte1)
-                {
-                    for (int byte2 = 0x90; byte2 <= 0xBF; ++byte2)
-                    {
-                        for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3)
-                        {
-                            for (int byte4 = 0x80; byte4 <= 0xBF; ++byte4)
-                            {
-                                check_utf8string(true, byte1, byte2, byte3, byte4);
-                                check_utf8dump(true, byte1, byte2, byte3, byte4);
-                            }
-                        }
-                    }
-                }
-            }
-
-            SECTION("ill-formed: missing second byte")
-            {
-                for (int byte1 = 0xF0; byte1 <= 0xF0; ++byte1)
-                {
-                    check_utf8string(false, byte1);
-                    check_utf8dump(false, byte1);
-                }
-            }
-
-            SECTION("ill-formed: missing third byte")
-            {
-                for (int byte1 = 0xF0; byte1 <= 0xF0; ++byte1)
-                {
-                    for (int byte2 = 0x90; byte2 <= 0xBF; ++byte2)
-                    {
-                        check_utf8string(false, byte1, byte2);
-                        check_utf8dump(false, byte1, byte2);
-                    }
-                }
-            }
-
-            SECTION("ill-formed: missing fourth byte")
-            {
-                for (int byte1 = 0xF0; byte1 <= 0xF0; ++byte1)
-                {
-                    for (int byte2 = 0x90; byte2 <= 0xBF; ++byte2)
-                    {
-                        for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3)
-                        {
-                            check_utf8string(false, byte1, byte2, byte3);
-                            check_utf8dump(false, byte1, byte2, byte3);
-                        }
-                    }
-                }
-            }
-
-            SECTION("ill-formed: wrong second byte")
-            {
-                for (int byte1 = 0xF0; byte1 <= 0xF0; ++byte1)
-                {
-                    for (int byte2 = 0x00; byte2 <= 0xFF; ++byte2)
-                    {
-                        // skip correct second byte
-                        if (0x90 <= byte2 && byte2 <= 0xBF)
-                        {
-                            continue;
-                        }
-
-                        for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3)
-                        {
-                            for (int byte4 = 0x80; byte4 <= 0xBF; ++byte4)
-                            {
-                                check_utf8string(false, byte1, byte2, byte3, byte4);
-                                check_utf8dump(false, byte1, byte2, byte3, byte4);
-                            }
-                        }
-                    }
-                }
-            }
-
-            SECTION("ill-formed: wrong third byte")
-            {
-                for (int byte1 = 0xF0; byte1 <= 0xF0; ++byte1)
-                {
-                    for (int byte2 = 0x90; byte2 <= 0xBF; ++byte2)
-                    {
-                        for (int byte3 = 0x00; byte3 <= 0xFF; ++byte3)
-                        {
-                            // skip correct third byte
-                            if (0x80 <= byte3 && byte3 <= 0xBF)
-                            {
-                                continue;
-                            }
-
-                            for (int byte4 = 0x80; byte4 <= 0xBF; ++byte4)
-                            {
-                                check_utf8string(false, byte1, byte2, byte3, byte4);
-                                check_utf8dump(false, byte1, byte2, byte3, byte4);
-                            }
-                        }
-                    }
-                }
-            }
-
-            SECTION("ill-formed: wrong fourth byte")
-            {
-                for (int byte1 = 0xF0; byte1 <= 0xF0; ++byte1)
-                {
-                    for (int byte2 = 0x90; byte2 <= 0xBF; ++byte2)
-                    {
-                        for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3)
-                        {
-                            for (int byte4 = 0x00; byte4 <= 0xFF; ++byte4)
-                            {
-                                // skip fourth second byte
-                                if (0x80 <= byte3 && byte3 <= 0xBF)
-                                {
-                                    continue;
-                                }
-
-                                check_utf8string(false, byte1, byte2, byte3, byte4);
-                                check_utf8dump(false, byte1, byte2, byte3, byte4);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        SECTION("UTF8-4 (xF1-F3 UTF8-tail UTF8-tail UTF8-tail)")
-        {
-            SECTION("well-formed")
-            {
-                for (int byte1 = 0xF1; byte1 <= 0xF3; ++byte1)
-                {
-                    for (int byte2 = 0x80; byte2 <= 0xBF; ++byte2)
-                    {
-                        for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3)
-                        {
-                            for (int byte4 = 0x80; byte4 <= 0xBF; ++byte4)
-                            {
-                                check_utf8string(true, byte1, byte2, byte3, byte4);
-                                check_utf8dump(true, byte1, byte2, byte3, byte4);
-                            }
-                        }
-                    }
-                }
-            }
-
-            SECTION("ill-formed: missing second byte")
-            {
-                for (int byte1 = 0xF1; byte1 <= 0xF3; ++byte1)
-                {
-                    check_utf8string(false, byte1);
-                    check_utf8dump(false, byte1);
-                }
-            }
-
-            SECTION("ill-formed: missing third byte")
-            {
-                for (int byte1 = 0xF1; byte1 <= 0xF3; ++byte1)
-                {
-                    for (int byte2 = 0x80; byte2 <= 0xBF; ++byte2)
-                    {
-                        check_utf8string(false, byte1, byte2);
-                        check_utf8dump(false, byte1, byte2);
-                    }
-                }
-            }
-
-            SECTION("ill-formed: missing fourth byte")
-            {
-                for (int byte1 = 0xF1; byte1 <= 0xF3; ++byte1)
-                {
-                    for (int byte2 = 0x80; byte2 <= 0xBF; ++byte2)
-                    {
-                        for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3)
-                        {
-                            check_utf8string(false, byte1, byte2, byte3);
-                            check_utf8dump(false, byte1, byte2, byte3);
-                        }
-                    }
-                }
-            }
-
-            SECTION("ill-formed: wrong second byte")
-            {
-                for (int byte1 = 0xF1; byte1 <= 0xF3; ++byte1)
-                {
-                    for (int byte2 = 0x00; byte2 <= 0xFF; ++byte2)
-                    {
-                        // skip correct second byte
-                        if (0x80 <= byte2 && byte2 <= 0xBF)
-                        {
-                            continue;
-                        }
-
-                        for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3)
-                        {
-                            for (int byte4 = 0x80; byte4 <= 0xBF; ++byte4)
-                            {
-                                check_utf8string(false, byte1, byte2, byte3, byte4);
-                                check_utf8dump(false, byte1, byte2, byte3, byte4);
-                            }
-                        }
-                    }
-                }
-            }
-
-            SECTION("ill-formed: wrong third byte")
-            {
-                for (int byte1 = 0xF1; byte1 <= 0xF3; ++byte1)
-                {
-                    for (int byte2 = 0x80; byte2 <= 0xBF; ++byte2)
-                    {
-                        for (int byte3 = 0x00; byte3 <= 0xFF; ++byte3)
-                        {
-                            // skip correct third byte
-                            if (0x80 <= byte3 && byte3 <= 0xBF)
-                            {
-                                continue;
-                            }
-
-                            for (int byte4 = 0x80; byte4 <= 0xBF; ++byte4)
-                            {
-                                check_utf8string(false, byte1, byte2, byte3, byte4);
-                                check_utf8dump(false, byte1, byte2, byte3, byte4);
-                            }
-                        }
-                    }
-                }
-            }
-
-            SECTION("ill-formed: wrong fourth byte")
-            {
-                for (int byte1 = 0xF1; byte1 <= 0xF3; ++byte1)
-                {
-                    for (int byte2 = 0x80; byte2 <= 0xBF; ++byte2)
-                    {
-                        for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3)
-                        {
-                            for (int byte4 = 0x00; byte4 <= 0xFF; ++byte4)
-                            {
-                                // skip correct fourth byte
-                                if (0x80 <= byte3 && byte3 <= 0xBF)
-                                {
-                                    continue;
-                                }
-
-                                check_utf8string(false, byte1, byte2, byte3, byte4);
-                                check_utf8dump(false, byte1, byte2, byte3, byte4);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        SECTION("UTF8-4 (xF4 x80-8F UTF8-tail UTF8-tail)")
-        {
-            SECTION("well-formed")
-            {
-                for (int byte1 = 0xF4; byte1 <= 0xF4; ++byte1)
-                {
-                    for (int byte2 = 0x80; byte2 <= 0x8F; ++byte2)
-                    {
-                        for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3)
-                        {
-                            for (int byte4 = 0x80; byte4 <= 0xBF; ++byte4)
-                            {
-                                check_utf8string(true, byte1, byte2, byte3, byte4);
-                                check_utf8dump(true, byte1, byte2, byte3, byte4);
-                            }
-                        }
-                    }
-                }
-            }
-
-            SECTION("ill-formed: missing second byte")
-            {
-                for (int byte1 = 0xF4; byte1 <= 0xF4; ++byte1)
-                {
-                    check_utf8string(false, byte1);
-                    check_utf8dump(false, byte1);
-                }
-            }
-
-            SECTION("ill-formed: missing third byte")
-            {
-                for (int byte1 = 0xF4; byte1 <= 0xF4; ++byte1)
-                {
-                    for (int byte2 = 0x80; byte2 <= 0x8F; ++byte2)
-                    {
-                        check_utf8string(false, byte1, byte2);
-                        check_utf8dump(false, byte1, byte2);
-                    }
-                }
-            }
-
-            SECTION("ill-formed: missing fourth byte")
-            {
-                for (int byte1 = 0xF4; byte1 <= 0xF4; ++byte1)
-                {
-                    for (int byte2 = 0x80; byte2 <= 0x8F; ++byte2)
-                    {
-                        for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3)
-                        {
-                            check_utf8string(false, byte1, byte2, byte3);
-                            check_utf8dump(false, byte1, byte2, byte3);
-                        }
-                    }
-                }
-            }
-
-            SECTION("ill-formed: wrong second byte")
-            {
-                for (int byte1 = 0xF4; byte1 <= 0xF4; ++byte1)
-                {
-                    for (int byte2 = 0x00; byte2 <= 0xFF; ++byte2)
-                    {
-                        // skip correct second byte
-                        if (0x80 <= byte2 && byte2 <= 0x8F)
-                        {
-                            continue;
-                        }
-
-                        for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3)
-                        {
-                            for (int byte4 = 0x80; byte4 <= 0xBF; ++byte4)
-                            {
-                                check_utf8string(false, byte1, byte2, byte3, byte4);
-                                check_utf8dump(false, byte1, byte2, byte3, byte4);
-                            }
-                        }
-                    }
-                }
-            }
-
-            SECTION("ill-formed: wrong third byte")
-            {
-                for (int byte1 = 0xF4; byte1 <= 0xF4; ++byte1)
-                {
-                    for (int byte2 = 0x80; byte2 <= 0x8F; ++byte2)
-                    {
-                        for (int byte3 = 0x00; byte3 <= 0xFF; ++byte3)
-                        {
-                            // skip correct third byte
-                            if (0x80 <= byte3 && byte3 <= 0xBF)
-                            {
-                                continue;
-                            }
-
-                            for (int byte4 = 0x80; byte4 <= 0xBF; ++byte4)
-                            {
-                                check_utf8string(false, byte1, byte2, byte3, byte4);
-                                check_utf8dump(false, byte1, byte2, byte3, byte4);
-                            }
-                        }
-                    }
-                }
-            }
-
-            SECTION("ill-formed: wrong fourth byte")
-            {
-                for (int byte1 = 0xF4; byte1 <= 0xF4; ++byte1)
-                {
-                    for (int byte2 = 0x80; byte2 <= 0x8F; ++byte2)
-                    {
-                        for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3)
-                        {
-                            for (int byte4 = 0x00; byte4 <= 0xFF; ++byte4)
-                            {
-                                // skip correct fourth byte
-                                if (0x80 <= byte3 && byte3 <= 0xBF)
-                                {
-                                    continue;
-                                }
-
-                                check_utf8string(false, byte1, byte2, byte3, byte4);
-                                check_utf8dump(false, byte1, byte2, byte3, byte4);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    SECTION("\\uxxxx sequences")
-    {
-        // create an escaped string from a code point
-        const auto codepoint_to_unicode = [](std::size_t cp)
-        {
-            // code points are represented as a six-character sequence: a
-            // reverse solidus, followed by the lowercase letter u, followed
-            // by four hexadecimal digits that encode the character's code
-            // point
-            std::stringstream ss;
-            ss << "\\u" << std::setw(4) << std::setfill('0') << std::hex << cp;
-            return ss.str();
-        };
-
-        SECTION("correct sequences")
-        {
-            // generate all UTF-8 code points; in total, 1112064 code points are
-            // generated: 0x1FFFFF code points - 2048 invalid values between
-            // 0xD800 and 0xDFFF.
-            for (std::size_t cp = 0; cp <= 0x10FFFFu; ++cp)
-            {
-                // string to store the code point as in \uxxxx format
-                std::string json_text = "\"";
-
-                // decide whether to use one or two \uxxxx sequences
-                if (cp < 0x10000u)
-                {
-                    // The Unicode standard permanently reserves these code point
-                    // values for UTF-16 encoding of the high and low surrogates, and
-                    // they will never be assigned a character, so there should be no
-                    // reason to encode them. The official Unicode standard says that
-                    // no UTF forms, including UTF-16, can encode these code points.
-                    if (cp >= 0xD800u && cp <= 0xDFFFu)
-                    {
-                        // if we would not skip these code points, we would get a
-                        // "missing low surrogate" exception
-                        continue;
-                    }
-
-                    // code points in the Basic Multilingual Plane can be
-                    // represented with one \uxxxx sequence
-                    json_text += codepoint_to_unicode(cp);
-                }
-                else
-                {
-                    // To escape an extended character that is not in the Basic
-                    // Multilingual Plane, the character is represented as a
-                    // 12-character sequence, encoding the UTF-16 surrogate pair
-                    const auto codepoint1 = 0xd800u + (((cp - 0x10000u) >> 10) & 0x3ffu);
-                    const auto codepoint2 = 0xdc00u + ((cp - 0x10000u) & 0x3ffu);
-                    json_text += codepoint_to_unicode(codepoint1) + codepoint_to_unicode(codepoint2);
-                }
-
-                json_text += "\"";
-                CAPTURE(json_text)
-                json _;
-                CHECK_NOTHROW(_ = json::parse(json_text));
-            }
-        }
-
-        SECTION("incorrect sequences")
-        {
-            SECTION("incorrect surrogate values")
-            {
-                json _;
-
-                CHECK_THROWS_AS(_ = json::parse("\"\\uDC00\\uDC00\""), json::parse_error&);
-                CHECK_THROWS_WITH(_ = json::parse("\"\\uDC00\\uDC00\""),
-                                  "[json.exception.parse_error.101] parse error at line 1, column 7: syntax error while parsing value - invalid string: surrogate U+DC00..U+DFFF must follow U+D800..U+DBFF; last read: '\"\\uDC00'");
-
-                CHECK_THROWS_AS(_ = json::parse("\"\\uD7FF\\uDC00\""), json::parse_error&);
-                CHECK_THROWS_WITH(_ = json::parse("\"\\uD7FF\\uDC00\""),
-                                  "[json.exception.parse_error.101] parse error at line 1, column 13: syntax error while parsing value - invalid string: surrogate U+DC00..U+DFFF must follow U+D800..U+DBFF; last read: '\"\\uD7FF\\uDC00'");
-
-                CHECK_THROWS_AS(_ = json::parse("\"\\uD800]\""), json::parse_error&);
-                CHECK_THROWS_WITH(_ = json::parse("\"\\uD800]\""),
-                                  "[json.exception.parse_error.101] parse error at line 1, column 8: syntax error while parsing value - invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD800]'");
-
-                CHECK_THROWS_AS(_ = json::parse("\"\\uD800\\v\""), json::parse_error&);
-                CHECK_THROWS_WITH(_ = json::parse("\"\\uD800\\v\""),
-                                  "[json.exception.parse_error.101] parse error at line 1, column 9: syntax error while parsing value - invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD800\\v'");
-
-                CHECK_THROWS_AS(_ = json::parse("\"\\uD800\\u123\""), json::parse_error&);
-                CHECK_THROWS_WITH(_ = json::parse("\"\\uD800\\u123\""),
-                                  "[json.exception.parse_error.101] parse error at line 1, column 13: syntax error while parsing value - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\uD800\\u123\"'");
-
-                CHECK_THROWS_AS(_ = json::parse("\"\\uD800\\uDBFF\""), json::parse_error&);
-                CHECK_THROWS_WITH(_ = json::parse("\"\\uD800\\uDBFF\""),
-                                  "[json.exception.parse_error.101] parse error at line 1, column 13: syntax error while parsing value - invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD800\\uDBFF'");
-
-                CHECK_THROWS_AS(_ = json::parse("\"\\uD800\\uE000\""), json::parse_error&);
-                CHECK_THROWS_WITH(_ = json::parse("\"\\uD800\\uE000\""),
-                                  "[json.exception.parse_error.101] parse error at line 1, column 13: syntax error while parsing value - invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD800\\uE000'");
-            }
-        }
-
-#if 0
-        SECTION("incorrect sequences")
-        {
-            SECTION("high surrogate without low surrogate")
-            {
-                // D800..DBFF are high surrogates and must be followed by low
-                // surrogates DC00..DFFF; here, nothing follows
-                for (std::size_t cp = 0xD800u; cp <= 0xDBFFu; ++cp)
-                {
-                    std::string json_text = "\"" + codepoint_to_unicode(cp) + "\"";
-                    CAPTURE(json_text)
-                    CHECK_THROWS_AS(json::parse(json_text), json::parse_error&);
-                }
-            }
-
-            SECTION("high surrogate with wrong low surrogate")
-            {
-                // D800..DBFF are high surrogates and must be followed by low
-                // surrogates DC00..DFFF; here a different sequence follows
-                for (std::size_t cp1 = 0xD800u; cp1 <= 0xDBFFu; ++cp1)
-                {
-                    for (std::size_t cp2 = 0x0000u; cp2 <= 0xFFFFu; ++cp2)
-                    {
-                        if (0xDC00u <= cp2 && cp2 <= 0xDFFFu)
-                        {
-                            continue;
-                        }
-
-                        std::string json_text = "\"" + codepoint_to_unicode(cp1) + codepoint_to_unicode(cp2) + "\"";
-                        CAPTURE(json_text)
-                        CHECK_THROWS_AS(json::parse(json_text), json::parse_error&);
-                    }
-                }
-            }
-
-            SECTION("low surrogate without high surrogate")
-            {
-                // low surrogates DC00..DFFF must follow high surrogates; here,
-                // they occur alone
-                for (std::size_t cp = 0xDC00u; cp <= 0xDFFFu; ++cp)
-                {
-                    std::string json_text = "\"" + codepoint_to_unicode(cp) + "\"";
-                    CAPTURE(json_text)
-                    CHECK_THROWS_AS(json::parse(json_text), json::parse_error&);
-                }
-            }
-
-        }
-#endif
-    }
-
-    SECTION("read all unicode characters")
-    {
-        // read a file with all unicode characters stored as single-character
-        // strings in a JSON array
-        std::ifstream f(TEST_DATA_DIRECTORY "/json_nlohmann_tests/all_unicode.json");
-        json j;
-        CHECK_NOTHROW(f >> j);
-
-        // the array has 1112064 + 1 elements (a terminating "null" value)
-        // Note: 1112064 = 0x1FFFFF code points - 2048 invalid values between
-        // 0xD800 and 0xDFFF.
-        CHECK(j.size() == 1112065);
-
-        SECTION("check JSON Pointers")
-        {
-            for (auto s : j)
-            {
-                // skip non-string JSON values
-                if (!s.is_string())
-                {
-                    continue;
-                }
-
-                auto ptr = s.get<std::string>();
-
-                // tilde must be followed by 0 or 1
-                if (ptr == "~")
-                {
-                    ptr += "0";
-                }
-
-                // JSON Pointers must begin with "/"
-                ptr = "/" + ptr;
-
-                CHECK_NOTHROW(json::json_pointer("/" + ptr));
-
-                // check escape/unescape roundtrip
-                auto escaped = nlohmann::detail::escape(ptr);
-                nlohmann::detail::unescape(escaped);
-                CHECK(escaped == ptr);
-            }
-        }
-    }
-
-    SECTION("ignore byte-order-mark")
-    {
-        SECTION("in a stream")
-        {
-            // read a file with a UTF-8 BOM
-            std::ifstream f(TEST_DATA_DIRECTORY "/json_nlohmann_tests/bom.json");
-            json j;
-            CHECK_NOTHROW(f >> j);
-        }
-
-        SECTION("with an iterator")
-        {
-            std::string i = "\xef\xbb\xbf{\n   \"foo\": true\n}";
-            json _;
-            CHECK_NOTHROW(_ = json::parse(i.begin(), i.end()));
-        }
-    }
-
-    SECTION("error for incomplete/wrong BOM")
-    {
-        json _;
-        CHECK_THROWS_AS(_ = json::parse("\xef\xbb"), json::parse_error&);
-        CHECK_THROWS_AS(_ = json::parse("\xef\xbb\xbb"), json::parse_error&);
-    }
-}
-
-namespace
-{
-void roundtrip(bool success_expected, const std::string& s);
-
-void roundtrip(bool success_expected, const std::string& s)
-{
-    CAPTURE(s)
-    json _;
-
-    // create JSON string value
-    json j = s;
-    // create JSON text
-    std::string ps = std::string("\"") + s + "\"";
-
-    if (success_expected)
-    {
-        // serialization succeeds
-        CHECK_NOTHROW(j.dump());
-
-        // exclude parse test for U+0000
-        if (s[0] != '\0')
-        {
-            // parsing JSON text succeeds
-            CHECK_NOTHROW(_ = json::parse(ps));
-        }
-
-        // roundtrip succeeds
-        CHECK_NOTHROW(_ = json::parse(j.dump()));
-
-        // after roundtrip, the same string is stored
-        json jr = json::parse(j.dump());
-        CHECK(jr.get<std::string>() == s);
-    }
-    else
-    {
-        // serialization fails
-        CHECK_THROWS_AS(j.dump(), json::type_error&);
-
-        // parsing JSON text fails
-        CHECK_THROWS_AS(_ = json::parse(ps), json::parse_error&);
-    }
-}
-}
-
-TEST_CASE("Markus Kuhn's UTF-8 decoder capability and stress test")
-{
-    // Markus Kuhn <http://www.cl.cam.ac.uk/~mgk25/> - 2015-08-28 - CC BY 4.0
-    // http://www.cl.cam.ac.uk/~mgk25/ucs/examples/UTF-8-test.txt
-
-    SECTION("1  Some correct UTF-8 text")
-    {
-        roundtrip(true, "κόσμε");
-    }
-
-    SECTION("2  Boundary condition test cases")
-    {
-        SECTION("2.1  First possible sequence of a certain length")
-        {
-            // 2.1.1  1 byte  (U-00000000)
-            roundtrip(true, std::string("\0", 1));
-            // 2.1.2  2 bytes (U-00000080)
-            roundtrip(true, "\xc2\x80");
-            // 2.1.3  3 bytes (U-00000800)
-            roundtrip(true, "\xe0\xa0\x80");
-            // 2.1.4  4 bytes (U-00010000)
-            roundtrip(true, "\xf0\x90\x80\x80");
-
-            // 2.1.5  5 bytes (U-00200000)
-            roundtrip(false, "\xF8\x88\x80\x80\x80");
-            // 2.1.6  6 bytes (U-04000000)
-            roundtrip(false, "\xFC\x84\x80\x80\x80\x80");
-        }
-
-        SECTION("2.2  Last possible sequence of a certain length")
-        {
-            // 2.2.1  1 byte  (U-0000007F)
-            roundtrip(true, "\x7f");
-            // 2.2.2  2 bytes (U-000007FF)
-            roundtrip(true, "\xdf\xbf");
-            // 2.2.3  3 bytes (U-0000FFFF)
-            roundtrip(true, "\xef\xbf\xbf");
-
-            // 2.2.4  4 bytes (U-001FFFFF)
-            roundtrip(false, "\xF7\xBF\xBF\xBF");
-            // 2.2.5  5 bytes (U-03FFFFFF)
-            roundtrip(false, "\xFB\xBF\xBF\xBF\xBF");
-            // 2.2.6  6 bytes (U-7FFFFFFF)
-            roundtrip(false, "\xFD\xBF\xBF\xBF\xBF\xBF");
-        }
-
-        SECTION("2.3  Other boundary conditions")
-        {
-            // 2.3.1  U-0000D7FF = ed 9f bf
-            roundtrip(true, "\xed\x9f\xbf");
-            // 2.3.2  U-0000E000 = ee 80 80
-            roundtrip(true, "\xee\x80\x80");
-            // 2.3.3  U-0000FFFD = ef bf bd
-            roundtrip(true, "\xef\xbf\xbd");
-            // 2.3.4  U-0010FFFF = f4 8f bf bf
-            roundtrip(true, "\xf4\x8f\xbf\xbf");
-
-            // 2.3.5  U-00110000 = f4 90 80 80
-            roundtrip(false, "\xf4\x90\x80\x80");
-        }
-    }
-
-    SECTION("3  Malformed sequences")
-    {
-        SECTION("3.1  Unexpected continuation bytes")
-        {
-            // Each unexpected continuation byte should be separately signalled as a
-            // malformed sequence of its own.
-
-            // 3.1.1  First continuation byte 0x80
-            roundtrip(false, "\x80");
-            // 3.1.2  Last  continuation byte 0xbf
-            roundtrip(false, "\xbf");
-
-            // 3.1.3  2 continuation bytes
-            roundtrip(false, "\x80\xbf");
-            // 3.1.4  3 continuation bytes
-            roundtrip(false, "\x80\xbf\x80");
-            // 3.1.5  4 continuation bytes
-            roundtrip(false, "\x80\xbf\x80\xbf");
-            // 3.1.6  5 continuation bytes
-            roundtrip(false, "\x80\xbf\x80\xbf\x80");
-            // 3.1.7  6 continuation bytes
-            roundtrip(false, "\x80\xbf\x80\xbf\x80\xbf");
-            // 3.1.8  7 continuation bytes
-            roundtrip(false, "\x80\xbf\x80\xbf\x80\xbf\x80");
-
-            // 3.1.9  Sequence of all 64 possible continuation bytes (0x80-0xbf)
-            roundtrip(false, "\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf");
-        }
-
-        SECTION("3.2  Lonely start characters")
-        {
-            // 3.2.1  All 32 first bytes of 2-byte sequences (0xc0-0xdf)
-            roundtrip(false, "\xc0 \xc1 \xc2 \xc3 \xc4 \xc5 \xc6 \xc7 \xc8 \xc9 \xca \xcb \xcc \xcd \xce \xcf \xd0 \xd1 \xd2 \xd3 \xd4 \xd5 \xd6 \xd7 \xd8 \xd9 \xda \xdb \xdc \xdd \xde \xdf");
-            // 3.2.2  All 16 first bytes of 3-byte sequences (0xe0-0xef)
-            roundtrip(false, "\xe0 \xe1 \xe2 \xe3 \xe4 \xe5 \xe6 \xe7 \xe8 \xe9 \xea \xeb \xec \xed \xee \xef");
-            // 3.2.3  All 8 first bytes of 4-byte sequences (0xf0-0xf7)
-            roundtrip(false, "\xf0 \xf1 \xf2 \xf3 \xf4 \xf5 \xf6 \xf7");
-            // 3.2.4  All 4 first bytes of 5-byte sequences (0xf8-0xfb)
-            roundtrip(false, "\xf8 \xf9 \xfa \xfb");
-            // 3.2.5  All 2 first bytes of 6-byte sequences (0xfc-0xfd)
-            roundtrip(false, "\xfc \xfd");
-        }
-
-        SECTION("3.3  Sequences with last continuation byte missing")
-        {
-            // All bytes of an incomplete sequence should be signalled as a single
-            // malformed sequence, i.e., you should see only a single replacement
-            // character in each of the next 10 tests. (Characters as in section 2)
-
-            // 3.3.1  2-byte sequence with last byte missing (U+0000)
-            roundtrip(false, "\xc0");
-            // 3.3.2  3-byte sequence with last byte missing (U+0000)
-            roundtrip(false, "\xe0\x80");
-            // 3.3.3  4-byte sequence with last byte missing (U+0000)
-            roundtrip(false, "\xf0\x80\x80");
-            // 3.3.4  5-byte sequence with last byte missing (U+0000)
-            roundtrip(false, "\xf8\x80\x80\x80");
-            // 3.3.5  6-byte sequence with last byte missing (U+0000)
-            roundtrip(false, "\xfc\x80\x80\x80\x80");
-            // 3.3.6  2-byte sequence with last byte missing (U-000007FF)
-            roundtrip(false, "\xdf");
-            // 3.3.7  3-byte sequence with last byte missing (U-0000FFFF)
-            roundtrip(false, "\xef\xbf");
-            // 3.3.8  4-byte sequence with last byte missing (U-001FFFFF)
-            roundtrip(false, "\xf7\xbf\xbf");
-            // 3.3.9  5-byte sequence with last byte missing (U-03FFFFFF)
-            roundtrip(false, "\xfb\xbf\xbf\xbf");
-            // 3.3.10 6-byte sequence with last byte missing (U-7FFFFFFF)
-            roundtrip(false, "\xfd\xbf\xbf\xbf\xbf");
-        }
-
-        SECTION("3.4  Concatenation of incomplete sequences")
-        {
-            // All the 10 sequences of 3.3 concatenated, you should see 10 malformed
-            // sequences being signalled:
-            roundtrip(false, "\xc0\xe0\x80\xf0\x80\x80\xf8\x80\x80\x80\xfc\x80\x80\x80\x80\xdf\xef\xbf\xf7\xbf\xbf\xfb\xbf\xbf\xbf\xfd\xbf\xbf\xbf\xbf");
-        }
-
-        SECTION("3.5  Impossible bytes")
-        {
-            // The following two bytes cannot appear in a correct UTF-8 string
-
-            // 3.5.1  fe
-            roundtrip(false, "\xfe");
-            // 3.5.2  ff
-            roundtrip(false, "\xff");
-            // 3.5.3  fe fe ff ff
-            roundtrip(false, "\xfe\xfe\xff\xff");
-        }
-    }
-
-    SECTION("4  Overlong sequences")
-    {
-        // The following sequences are not malformed according to the letter of
-        // the Unicode 2.0 standard. However, they are longer then necessary and
-        // a correct UTF-8 encoder is not allowed to produce them. A "safe UTF-8
-        // decoder" should reject them just like malformed sequences for two
-        // reasons: (1) It helps to debug applications if overlong sequences are
-        // not treated as valid representations of characters, because this helps
-        // to spot problems more quickly. (2) Overlong sequences provide
-        // alternative representations of characters, that could maliciously be
-        // used to bypass filters that check only for ASCII characters. For
-        // instance, a 2-byte encoded line feed (LF) would not be caught by a
-        // line counter that counts only 0x0a bytes, but it would still be
-        // processed as a line feed by an unsafe UTF-8 decoder later in the
-        // pipeline. From a security point of view, ASCII compatibility of UTF-8
-        // sequences means also, that ASCII characters are *only* allowed to be
-        // represented by ASCII bytes in the range 0x00-0x7f. To ensure this
-        // aspect of ASCII compatibility, use only "safe UTF-8 decoders" that
-        // reject overlong UTF-8 sequences for which a shorter encoding exists.
-
-        SECTION("4.1  Examples of an overlong ASCII character")
-        {
-            // With a safe UTF-8 decoder, all of the following five overlong
-            // representations of the ASCII character slash ("/") should be rejected
-            // like a malformed UTF-8 sequence, for instance by substituting it with
-            // a replacement character. If you see a slash below, you do not have a
-            // safe UTF-8 decoder!
-
-            // 4.1.1 U+002F = c0 af
-            roundtrip(false, "\xc0\xaf");
-            // 4.1.2 U+002F = e0 80 af
-            roundtrip(false, "\xe0\x80\xaf");
-            // 4.1.3 U+002F = f0 80 80 af
-            roundtrip(false, "\xf0\x80\x80\xaf");
-            // 4.1.4 U+002F = f8 80 80 80 af
-            roundtrip(false, "\xf8\x80\x80\x80\xaf");
-            // 4.1.5 U+002F = fc 80 80 80 80 af
-            roundtrip(false, "\xfc\x80\x80\x80\x80\xaf");
-        }
-
-        SECTION("4.2  Maximum overlong sequences")
-        {
-            // Below you see the highest Unicode value that is still resulting in an
-            // overlong sequence if represented with the given number of bytes. This
-            // is a boundary test for safe UTF-8 decoders. All five characters should
-            // be rejected like malformed UTF-8 sequences.
-
-            // 4.2.1  U-0000007F = c1 bf
-            roundtrip(false, "\xc1\xbf");
-            // 4.2.2  U-000007FF = e0 9f bf
-            roundtrip(false, "\xe0\x9f\xbf");
-            // 4.2.3  U-0000FFFF = f0 8f bf bf
-            roundtrip(false, "\xf0\x8f\xbf\xbf");
-            // 4.2.4  U-001FFFFF = f8 87 bf bf bf
-            roundtrip(false, "\xf8\x87\xbf\xbf\xbf");
-            // 4.2.5  U-03FFFFFF = fc 83 bf bf bf bf
-            roundtrip(false, "\xfc\x83\xbf\xbf\xbf\xbf");
-        }
-
-        SECTION("4.3  Overlong representation of the NUL character")
-        {
-            // The following five sequences should also be rejected like malformed
-            // UTF-8 sequences and should not be treated like the ASCII NUL
-            // character.
-
-            // 4.3.1  U+0000 = c0 80
-            roundtrip(false, "\xc0\x80");
-            // 4.3.2  U+0000 = e0 80 80
-            roundtrip(false, "\xe0\x80\x80");
-            // 4.3.3  U+0000 = f0 80 80 80
-            roundtrip(false, "\xf0\x80\x80\x80");
-            // 4.3.4  U+0000 = f8 80 80 80 80
-            roundtrip(false, "\xf8\x80\x80\x80\x80");
-            // 4.3.5  U+0000 = fc 80 80 80 80 80
-            roundtrip(false, "\xfc\x80\x80\x80\x80\x80");
-        }
-    }
-
-    SECTION("5  Illegal code positions")
-    {
-        // The following UTF-8 sequences should be rejected like malformed
-        // sequences, because they never represent valid ISO 10646 characters and
-        // a UTF-8 decoder that accepts them might introduce security problems
-        // comparable to overlong UTF-8 sequences.
-
-        SECTION("5.1 Single UTF-16 surrogates")
-        {
-            // 5.1.1  U+D800 = ed a0 80
-            roundtrip(false, "\xed\xa0\x80");
-            // 5.1.2  U+DB7F = ed ad bf
-            roundtrip(false, "\xed\xad\xbf");
-            // 5.1.3  U+DB80 = ed ae 80
-            roundtrip(false, "\xed\xae\x80");
-            // 5.1.4  U+DBFF = ed af bf
-            roundtrip(false, "\xed\xaf\xbf");
-            // 5.1.5  U+DC00 = ed b0 80
-            roundtrip(false, "\xed\xb0\x80");
-            // 5.1.6  U+DF80 = ed be 80
-            roundtrip(false, "\xed\xbe\x80");
-            // 5.1.7  U+DFFF = ed bf bf
-            roundtrip(false, "\xed\xbf\xbf");
-        }
-
-        SECTION("5.2 Paired UTF-16 surrogates")
-        {
-            // 5.2.1  U+D800 U+DC00 = ed a0 80 ed b0 80
-            roundtrip(false, "\xed\xa0\x80\xed\xb0\x80");
-            // 5.2.2  U+D800 U+DFFF = ed a0 80 ed bf bf
-            roundtrip(false, "\xed\xa0\x80\xed\xbf\xbf");
-            // 5.2.3  U+DB7F U+DC00 = ed ad bf ed b0 80
-            roundtrip(false, "\xed\xad\xbf\xed\xb0\x80");
-            // 5.2.4  U+DB7F U+DFFF = ed ad bf ed bf bf
-            roundtrip(false, "\xed\xad\xbf\xed\xbf\xbf");
-            // 5.2.5  U+DB80 U+DC00 = ed ae 80 ed b0 80
-            roundtrip(false, "\xed\xae\x80\xed\xb0\x80");
-            // 5.2.6  U+DB80 U+DFFF = ed ae 80 ed bf bf
-            roundtrip(false, "\xed\xae\x80\xed\xbf\xbf");
-            // 5.2.7  U+DBFF U+DC00 = ed af bf ed b0 80
-            roundtrip(false, "\xed\xaf\xbf\xed\xb0\x80");
-            // 5.2.8  U+DBFF U+DFFF = ed af bf ed bf bf
-            roundtrip(false, "\xed\xaf\xbf\xed\xbf\xbf");
-        }
-
-        SECTION("5.3 Noncharacter code positions")
-        {
-            // The following "noncharacters" are "reserved for internal use" by
-            // applications, and according to older versions of the Unicode Standard
-            // "should never be interchanged". Unicode Corrigendum #9 dropped the
-            // latter restriction. Nevertheless, their presence in incoming UTF-8 data
-            // can remain a potential security risk, depending on what use is made of
-            // these codes subsequently. Examples of such internal use:
-            //
-            //  - Some file APIs with 16-bit characters may use the integer value -1
-            //    = U+FFFF to signal an end-of-file (EOF) or error condition.
-            //
-            //  - In some UTF-16 receivers, code point U+FFFE might trigger a
-            //    byte-swap operation (to convert between UTF-16LE and UTF-16BE).
-            //
-            // With such internal use of noncharacters, it may be desirable and safer
-            // to block those code points in UTF-8 decoders, as they should never
-            // occur legitimately in incoming UTF-8 data, and could trigger unsafe
-            // behaviour in subsequent processing.
-
-            // Particularly problematic noncharacters in 16-bit applications:
-
-            // 5.3.1  U+FFFE = ef bf be
-            roundtrip(true, "\xef\xbf\xbe");
-            // 5.3.2  U+FFFF = ef bf bf
-            roundtrip(true, "\xef\xbf\xbf");
-
-            // 5.3.3  U+FDD0 .. U+FDEF
-            roundtrip(true, "\xEF\xB7\x90");
-            roundtrip(true, "\xEF\xB7\x91");
-            roundtrip(true, "\xEF\xB7\x92");
-            roundtrip(true, "\xEF\xB7\x93");
-            roundtrip(true, "\xEF\xB7\x94");
-            roundtrip(true, "\xEF\xB7\x95");
-            roundtrip(true, "\xEF\xB7\x96");
-            roundtrip(true, "\xEF\xB7\x97");
-            roundtrip(true, "\xEF\xB7\x98");
-            roundtrip(true, "\xEF\xB7\x99");
-            roundtrip(true, "\xEF\xB7\x9A");
-            roundtrip(true, "\xEF\xB7\x9B");
-            roundtrip(true, "\xEF\xB7\x9C");
-            roundtrip(true, "\xEF\xB7\x9D");
-            roundtrip(true, "\xEF\xB7\x9E");
-            roundtrip(true, "\xEF\xB7\x9F");
-            roundtrip(true, "\xEF\xB7\xA0");
-            roundtrip(true, "\xEF\xB7\xA1");
-            roundtrip(true, "\xEF\xB7\xA2");
-            roundtrip(true, "\xEF\xB7\xA3");
-            roundtrip(true, "\xEF\xB7\xA4");
-            roundtrip(true, "\xEF\xB7\xA5");
-            roundtrip(true, "\xEF\xB7\xA6");
-            roundtrip(true, "\xEF\xB7\xA7");
-            roundtrip(true, "\xEF\xB7\xA8");
-            roundtrip(true, "\xEF\xB7\xA9");
-            roundtrip(true, "\xEF\xB7\xAA");
-            roundtrip(true, "\xEF\xB7\xAB");
-            roundtrip(true, "\xEF\xB7\xAC");
-            roundtrip(true, "\xEF\xB7\xAD");
-            roundtrip(true, "\xEF\xB7\xAE");
-            roundtrip(true, "\xEF\xB7\xAF");
-
-            // 5.3.4  U+nFFFE U+nFFFF (for n = 1..10)
-            roundtrip(true, "\xF0\x9F\xBF\xBF");
-            roundtrip(true, "\xF0\xAF\xBF\xBF");
-            roundtrip(true, "\xF0\xBF\xBF\xBF");
-            roundtrip(true, "\xF1\x8F\xBF\xBF");
-            roundtrip(true, "\xF1\x9F\xBF\xBF");
-            roundtrip(true, "\xF1\xAF\xBF\xBF");
-            roundtrip(true, "\xF1\xBF\xBF\xBF");
-            roundtrip(true, "\xF2\x8F\xBF\xBF");
-            roundtrip(true, "\xF2\x9F\xBF\xBF");
-            roundtrip(true, "\xF2\xAF\xBF\xBF");
-        }
-    }
-}
diff --git a/external_imported/json/test/src/unit-user_defined_input.cpp b/external_imported/json/test/src/unit-user_defined_input.cpp
deleted file mode 100644
index 4b84e8e71..000000000
--- a/external_imported/json/test/src/unit-user_defined_input.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include "doctest_compatibility.h"
-
-#include <nlohmann/json.hpp>
-using nlohmann::json;
-
-#include <list>
-
-namespace
-{
-TEST_CASE("Use arbitrary stdlib container")
-{
-    std::string raw_data = "[1,2,3,4]";
-    std::list<char> data(raw_data.begin(), raw_data.end());
-
-    json as_json = json::parse(data.begin(), data.end());
-    CHECK(as_json.at(0) == 1);
-    CHECK(as_json.at(1) == 2);
-    CHECK(as_json.at(2) == 3);
-    CHECK(as_json.at(3) == 4);
-}
-
-struct MyContainer
-{
-    const char* data;
-};
-
-const char* begin(const MyContainer& c)
-{
-    return c.data;
-}
-
-const char* end(const MyContainer& c)
-{
-    return c.data + strlen(c.data);
-}
-
-TEST_CASE("Custom container non-member begin/end")
-{
-
-    MyContainer data{"[1,2,3,4]"};
-    json as_json = json::parse(data);
-    CHECK(as_json.at(0) == 1);
-    CHECK(as_json.at(1) == 2);
-    CHECK(as_json.at(2) == 3);
-    CHECK(as_json.at(3) == 4);
-
-}
-
-TEST_CASE("Custom container member begin/end")
-{
-    struct MyContainer2
-    {
-        const char* data;
-
-        const char* begin() const
-        {
-            return data;
-        }
-
-        const char* end() const
-        {
-            return data + strlen(data);
-        }
-    };
-
-    MyContainer2 data{"[1,2,3,4]"};
-    json as_json = json::parse(data);
-    CHECK(as_json.at(0) == 1);
-    CHECK(as_json.at(1) == 2);
-    CHECK(as_json.at(2) == 3);
-    CHECK(as_json.at(3) == 4);
-}
-
-TEST_CASE("Custom iterator")
-{
-    const char* raw_data = "[1,2,3,4]";
-
-    struct MyIterator
-    {
-        using difference_type = std::size_t;
-        using value_type = char;
-        using pointer = const char*;
-        using reference = const char&;
-        using iterator_category = std::input_iterator_tag;
-
-        MyIterator& operator++()
-        {
-            ++ptr;
-            return *this;
-        }
-
-        reference operator*() const
-        {
-            return *ptr;
-        }
-
-        bool operator!=(const MyIterator& rhs) const
-        {
-            return ptr != rhs.ptr;
-        }
-
-        const char* ptr;
-    };
-
-    MyIterator begin{raw_data};
-    MyIterator end{raw_data + strlen(raw_data)};
-
-    json as_json = json::parse(begin, end);
-    CHECK(as_json.at(0) == 1);
-    CHECK(as_json.at(1) == 2);
-    CHECK(as_json.at(2) == 3);
-    CHECK(as_json.at(3) == 4);
-}
-
-} // namespace
diff --git a/external_imported/json/test/src/unit-wstring.cpp b/external_imported/json/test/src/unit-wstring.cpp
deleted file mode 100644
index a5b80be74..000000000
--- a/external_imported/json/test/src/unit-wstring.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include "doctest_compatibility.h"
-
-#include <nlohmann/json.hpp>
-using nlohmann::json;
-
-namespace
-{
-bool wstring_is_utf16();
-bool wstring_is_utf16()
-{
-    return (std::wstring(L"💩") == std::wstring(L"\U0001F4A9"));
-}
-
-bool u16string_is_utf16();
-bool u16string_is_utf16()
-{
-    return (std::u16string(u"💩") == std::u16string(u"\U0001F4A9"));
-}
-
-bool u32string_is_utf32();
-bool u32string_is_utf32()
-{
-    return (std::u32string(U"💩") == std::u32string(U"\U0001F4A9"));
-}
-}
-
-TEST_CASE("wide strings")
-{
-    SECTION("std::wstring")
-    {
-        if (wstring_is_utf16())
-        {
-            std::wstring w = L"[12.2,\"Ⴥaäö💤🧢\"]";
-            json j = json::parse(w);
-            CHECK(j.dump() == "[12.2,\"Ⴥaäö💤🧢\"]");
-        }
-    }
-
-    SECTION("invalid std::wstring")
-    {
-        if (wstring_is_utf16())
-        {
-            std::wstring w = L"\"\xDBFF";
-            json _;
-            CHECK_THROWS_AS(_ = json::parse(w), json::parse_error&);
-        }
-    }
-
-    SECTION("std::u16string")
-    {
-        if (u16string_is_utf16())
-        {
-            std::u16string w = u"[12.2,\"Ⴥaäö💤🧢\"]";
-            json j = json::parse(w);
-            CHECK(j.dump() == "[12.2,\"Ⴥaäö💤🧢\"]");
-        }
-    }
-
-    SECTION("invalid std::u16string")
-    {
-        if (wstring_is_utf16())
-        {
-            std::u16string w = u"\"\xDBFF";
-            json _;
-            CHECK_THROWS_AS(_ = json::parse(w), json::parse_error&);
-        }
-    }
-
-    SECTION("std::u32string")
-    {
-        if (u32string_is_utf32())
-        {
-            std::u32string w = U"[12.2,\"Ⴥaäö💤🧢\"]";
-            json j = json::parse(w);
-            CHECK(j.dump() == "[12.2,\"Ⴥaäö💤🧢\"]");
-        }
-    }
-
-    SECTION("invalid std::u32string")
-    {
-        if (u32string_is_utf32())
-        {
-            std::u32string w = U"\"\x110000";
-            json _;
-            CHECK_THROWS_AS(_ = json::parse(w), json::parse_error&);
-        }
-    }
-}
diff --git a/external_imported/json/test/src/unit.cpp b/external_imported/json/test/src/unit.cpp
deleted file mode 100644
index f54819e17..000000000
--- a/external_imported/json/test/src/unit.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "doctest_compatibility.h"
diff --git a/external_imported/json/test/thirdparty/doctest/LICENSE.txt b/external_imported/json/test/thirdparty/doctest/LICENSE.txt
deleted file mode 100755
index 155dbe942..000000000
--- a/external_imported/json/test/thirdparty/doctest/LICENSE.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2016-2020 Viktor Kirilov
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
diff --git a/external_imported/json/test/thirdparty/doctest/doctest.h b/external_imported/json/test/thirdparty/doctest/doctest.h
deleted file mode 100644
index ae9c4d410..000000000
--- a/external_imported/json/test/thirdparty/doctest/doctest.h
+++ /dev/null
@@ -1,6330 +0,0 @@
-// ====================================================================== lgtm [cpp/missing-header-guard]
-// == DO NOT MODIFY THIS FILE BY HAND - IT IS AUTO GENERATED BY CMAKE! ==
-// ======================================================================
-//
-// doctest.h - the lightest feature-rich C++ single-header testing framework for unit tests and TDD
-//
-// Copyright (c) 2016-2020 Viktor Kirilov
-//
-// Distributed under the MIT Software License
-// See accompanying file LICENSE.txt or copy at
-// https://opensource.org/licenses/MIT
-//
-// The documentation can be found at the library's page:
-// https://github.com/onqtam/doctest/blob/master/doc/markdown/readme.md
-//
-// =================================================================================================
-// =================================================================================================
-// =================================================================================================
-//
-// The library is heavily influenced by Catch - https://github.com/catchorg/Catch2
-// which uses the Boost Software License - Version 1.0
-// see here - https://github.com/catchorg/Catch2/blob/master/LICENSE.txt
-//
-// The concept of subcases (sections in Catch) and expression decomposition are from there.
-// Some parts of the code are taken directly:
-// - stringification - the detection of "ostream& operator<<(ostream&, const T&)" and StringMaker<>
-// - the Approx() helper class for floating point comparison
-// - colors in the console
-// - breaking into a debugger
-// - signal / SEH handling
-// - timer
-// - XmlWriter class - thanks to Phil Nash for allowing the direct reuse (AKA copy/paste)
-//
-// The expression decomposing templates are taken from lest - https://github.com/martinmoene/lest
-// which uses the Boost Software License - Version 1.0
-// see here - https://github.com/martinmoene/lest/blob/master/LICENSE.txt
-//
-// =================================================================================================
-// =================================================================================================
-// =================================================================================================
-
-#ifndef DOCTEST_LIBRARY_INCLUDED
-#define DOCTEST_LIBRARY_INCLUDED
-
-// =================================================================================================
-// == VERSION ======================================================================================
-// =================================================================================================
-
-#define DOCTEST_VERSION_MAJOR 2
-#define DOCTEST_VERSION_MINOR 4
-#define DOCTEST_VERSION_PATCH 3
-#define DOCTEST_VERSION_STR "2.4.3"
-
-#define DOCTEST_VERSION                                                                            \
-    (DOCTEST_VERSION_MAJOR * 10000 + DOCTEST_VERSION_MINOR * 100 + DOCTEST_VERSION_PATCH)
-
-// =================================================================================================
-// == COMPILER VERSION =============================================================================
-// =================================================================================================
-
-// ideas for the version stuff are taken from here: https://github.com/cxxstuff/cxx_detect
-
-#define DOCTEST_COMPILER(MAJOR, MINOR, PATCH) ((MAJOR)*10000000 + (MINOR)*100000 + (PATCH))
-
-// GCC/Clang and GCC/MSVC are mutually exclusive, but Clang/MSVC are not because of clang-cl...
-#if defined(_MSC_VER) && defined(_MSC_FULL_VER)
-#if _MSC_VER == _MSC_FULL_VER / 10000
-#define DOCTEST_MSVC DOCTEST_COMPILER(_MSC_VER / 100, _MSC_VER % 100, _MSC_FULL_VER % 10000)
-#else // MSVC
-#define DOCTEST_MSVC                                                                               \
-    DOCTEST_COMPILER(_MSC_VER / 100, (_MSC_FULL_VER / 100000) % 100, _MSC_FULL_VER % 100000)
-#endif // MSVC
-#endif // MSVC
-#if defined(__clang__) && defined(__clang_minor__)
-#define DOCTEST_CLANG DOCTEST_COMPILER(__clang_major__, __clang_minor__, __clang_patchlevel__)
-#elif defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__GNUC_PATCHLEVEL__) &&              \
-        !defined(__INTEL_COMPILER)
-#define DOCTEST_GCC DOCTEST_COMPILER(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
-#endif // GCC
-
-#ifndef DOCTEST_MSVC
-#define DOCTEST_MSVC 0
-#endif // DOCTEST_MSVC
-#ifndef DOCTEST_CLANG
-#define DOCTEST_CLANG 0
-#endif // DOCTEST_CLANG
-#ifndef DOCTEST_GCC
-#define DOCTEST_GCC 0
-#endif // DOCTEST_GCC
-
-// =================================================================================================
-// == COMPILER WARNINGS HELPERS ====================================================================
-// =================================================================================================
-
-#if DOCTEST_CLANG
-#define DOCTEST_PRAGMA_TO_STR(x) _Pragma(#x)
-#define DOCTEST_CLANG_SUPPRESS_WARNING_PUSH _Pragma("clang diagnostic push")
-#define DOCTEST_CLANG_SUPPRESS_WARNING(w) DOCTEST_PRAGMA_TO_STR(clang diagnostic ignored w)
-#define DOCTEST_CLANG_SUPPRESS_WARNING_POP _Pragma("clang diagnostic pop")
-#define DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH(w)                                                \
-    DOCTEST_CLANG_SUPPRESS_WARNING_PUSH DOCTEST_CLANG_SUPPRESS_WARNING(w)
-#else // DOCTEST_CLANG
-#define DOCTEST_CLANG_SUPPRESS_WARNING_PUSH
-#define DOCTEST_CLANG_SUPPRESS_WARNING(w)
-#define DOCTEST_CLANG_SUPPRESS_WARNING_POP
-#define DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH(w)
-#endif // DOCTEST_CLANG
-
-#if DOCTEST_GCC
-#define DOCTEST_PRAGMA_TO_STR(x) _Pragma(#x)
-#define DOCTEST_GCC_SUPPRESS_WARNING_PUSH _Pragma("GCC diagnostic push")
-#define DOCTEST_GCC_SUPPRESS_WARNING(w) DOCTEST_PRAGMA_TO_STR(GCC diagnostic ignored w)
-#define DOCTEST_GCC_SUPPRESS_WARNING_POP _Pragma("GCC diagnostic pop")
-#define DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH(w)                                                  \
-    DOCTEST_GCC_SUPPRESS_WARNING_PUSH DOCTEST_GCC_SUPPRESS_WARNING(w)
-#else // DOCTEST_GCC
-#define DOCTEST_GCC_SUPPRESS_WARNING_PUSH
-#define DOCTEST_GCC_SUPPRESS_WARNING(w)
-#define DOCTEST_GCC_SUPPRESS_WARNING_POP
-#define DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH(w)
-#endif // DOCTEST_GCC
-
-#if DOCTEST_MSVC
-#define DOCTEST_MSVC_SUPPRESS_WARNING_PUSH __pragma(warning(push))
-#define DOCTEST_MSVC_SUPPRESS_WARNING(w) __pragma(warning(disable : w))
-#define DOCTEST_MSVC_SUPPRESS_WARNING_POP __pragma(warning(pop))
-#define DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(w)                                                 \
-    DOCTEST_MSVC_SUPPRESS_WARNING_PUSH DOCTEST_MSVC_SUPPRESS_WARNING(w)
-#else // DOCTEST_MSVC
-#define DOCTEST_MSVC_SUPPRESS_WARNING_PUSH
-#define DOCTEST_MSVC_SUPPRESS_WARNING(w)
-#define DOCTEST_MSVC_SUPPRESS_WARNING_POP
-#define DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(w)
-#endif // DOCTEST_MSVC
-
-// =================================================================================================
-// == COMPILER WARNINGS ============================================================================
-// =================================================================================================
-
-DOCTEST_CLANG_SUPPRESS_WARNING_PUSH
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wunknown-pragmas")
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wnon-virtual-dtor")
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wweak-vtables")
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wpadded")
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wdeprecated")
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wmissing-prototypes")
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wunused-local-typedef")
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wc++98-compat")
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wc++98-compat-pedantic")
-
-DOCTEST_GCC_SUPPRESS_WARNING_PUSH
-DOCTEST_GCC_SUPPRESS_WARNING("-Wunknown-pragmas")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wpragmas")
-DOCTEST_GCC_SUPPRESS_WARNING("-Weffc++")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wstrict-overflow")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wstrict-aliasing")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wctor-dtor-privacy")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wmissing-declarations")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wnon-virtual-dtor")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wunused-local-typedefs")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wuseless-cast")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wnoexcept")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wsign-promo")
-
-DOCTEST_MSVC_SUPPRESS_WARNING_PUSH
-DOCTEST_MSVC_SUPPRESS_WARNING(4616) // invalid compiler warning
-DOCTEST_MSVC_SUPPRESS_WARNING(4619) // invalid compiler warning
-DOCTEST_MSVC_SUPPRESS_WARNING(4996) // The compiler encountered a deprecated declaration
-DOCTEST_MSVC_SUPPRESS_WARNING(4706) // assignment within conditional expression
-DOCTEST_MSVC_SUPPRESS_WARNING(4512) // 'class' : assignment operator could not be generated
-DOCTEST_MSVC_SUPPRESS_WARNING(4127) // conditional expression is constant
-DOCTEST_MSVC_SUPPRESS_WARNING(4820) // padding
-DOCTEST_MSVC_SUPPRESS_WARNING(4625) // copy constructor was implicitly defined as deleted
-DOCTEST_MSVC_SUPPRESS_WARNING(4626) // assignment operator was implicitly defined as deleted
-DOCTEST_MSVC_SUPPRESS_WARNING(5027) // move assignment operator was implicitly defined as deleted
-DOCTEST_MSVC_SUPPRESS_WARNING(5026) // move constructor was implicitly defined as deleted
-DOCTEST_MSVC_SUPPRESS_WARNING(4623) // default constructor was implicitly defined as deleted
-DOCTEST_MSVC_SUPPRESS_WARNING(4640) // construction of local static object is not thread-safe
-// static analysis
-DOCTEST_MSVC_SUPPRESS_WARNING(26439) // This kind of function may not throw. Declare it 'noexcept'
-DOCTEST_MSVC_SUPPRESS_WARNING(26495) // Always initialize a member variable
-DOCTEST_MSVC_SUPPRESS_WARNING(26451) // Arithmetic overflow ...
-DOCTEST_MSVC_SUPPRESS_WARNING(26444) // Avoid unnamed objects with custom construction and dtr...
-DOCTEST_MSVC_SUPPRESS_WARNING(26812) // Prefer 'enum class' over 'enum'
-
-// 4548 - expression before comma has no effect; expected expression with side - effect
-// 4265 - class has virtual functions, but destructor is not virtual
-// 4986 - exception specification does not match previous declaration
-// 4350 - behavior change: 'member1' called instead of 'member2'
-// 4668 - 'x' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif'
-// 4365 - conversion from 'int' to 'unsigned long', signed/unsigned mismatch
-// 4774 - format string expected in argument 'x' is not a string literal
-// 4820 - padding in structs
-
-// only 4 should be disabled globally:
-// - 4514 # unreferenced inline function has been removed
-// - 4571 # SEH related
-// - 4710 # function not inlined
-// - 4711 # function 'x' selected for automatic inline expansion
-
-#define DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_BEGIN                                 \
-    DOCTEST_MSVC_SUPPRESS_WARNING_PUSH                                                             \
-    DOCTEST_MSVC_SUPPRESS_WARNING(4548)                                                            \
-    DOCTEST_MSVC_SUPPRESS_WARNING(4265)                                                            \
-    DOCTEST_MSVC_SUPPRESS_WARNING(4986)                                                            \
-    DOCTEST_MSVC_SUPPRESS_WARNING(4350)                                                            \
-    DOCTEST_MSVC_SUPPRESS_WARNING(4668)                                                            \
-    DOCTEST_MSVC_SUPPRESS_WARNING(4365)                                                            \
-    DOCTEST_MSVC_SUPPRESS_WARNING(4774)                                                            \
-    DOCTEST_MSVC_SUPPRESS_WARNING(4820)                                                            \
-    DOCTEST_MSVC_SUPPRESS_WARNING(4625)                                                            \
-    DOCTEST_MSVC_SUPPRESS_WARNING(4626)                                                            \
-    DOCTEST_MSVC_SUPPRESS_WARNING(5027)                                                            \
-    DOCTEST_MSVC_SUPPRESS_WARNING(5026)                                                            \
-    DOCTEST_MSVC_SUPPRESS_WARNING(4623)                                                            \
-    DOCTEST_MSVC_SUPPRESS_WARNING(5039)                                                            \
-    DOCTEST_MSVC_SUPPRESS_WARNING(5045)                                                            \
-    DOCTEST_MSVC_SUPPRESS_WARNING(5105)
-
-#define DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_END DOCTEST_MSVC_SUPPRESS_WARNING_POP
-
-// =================================================================================================
-// == FEATURE DETECTION ============================================================================
-// =================================================================================================
-
-// general compiler feature support table: https://en.cppreference.com/w/cpp/compiler_support
-// MSVC C++11 feature support table: https://msdn.microsoft.com/en-us/library/hh567368.aspx
-// GCC C++11 feature support table: https://gcc.gnu.org/projects/cxx-status.html
-// MSVC version table:
-// https://en.wikipedia.org/wiki/Microsoft_Visual_C%2B%2B#Internal_version_numbering
-// MSVC++ 14.2 (16) _MSC_VER == 1920 (Visual Studio 2019)
-// MSVC++ 14.1 (15) _MSC_VER == 1910 (Visual Studio 2017)
-// MSVC++ 14.0      _MSC_VER == 1900 (Visual Studio 2015)
-// MSVC++ 12.0      _MSC_VER == 1800 (Visual Studio 2013)
-// MSVC++ 11.0      _MSC_VER == 1700 (Visual Studio 2012)
-// MSVC++ 10.0      _MSC_VER == 1600 (Visual Studio 2010)
-// MSVC++ 9.0       _MSC_VER == 1500 (Visual Studio 2008)
-// MSVC++ 8.0       _MSC_VER == 1400 (Visual Studio 2005)
-
-#if DOCTEST_MSVC && !defined(DOCTEST_CONFIG_WINDOWS_SEH)
-#define DOCTEST_CONFIG_WINDOWS_SEH
-#endif // MSVC
-#if defined(DOCTEST_CONFIG_NO_WINDOWS_SEH) && defined(DOCTEST_CONFIG_WINDOWS_SEH)
-#undef DOCTEST_CONFIG_WINDOWS_SEH
-#endif // DOCTEST_CONFIG_NO_WINDOWS_SEH
-
-#if !defined(_WIN32) && !defined(__QNX__) && !defined(DOCTEST_CONFIG_POSIX_SIGNALS) &&             \
-        !defined(__EMSCRIPTEN__)
-#define DOCTEST_CONFIG_POSIX_SIGNALS
-#endif // _WIN32
-#if defined(DOCTEST_CONFIG_NO_POSIX_SIGNALS) && defined(DOCTEST_CONFIG_POSIX_SIGNALS)
-#undef DOCTEST_CONFIG_POSIX_SIGNALS
-#endif // DOCTEST_CONFIG_NO_POSIX_SIGNALS
-
-#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS
-#if !defined(__cpp_exceptions) && !defined(__EXCEPTIONS) && !defined(_CPPUNWIND)
-#define DOCTEST_CONFIG_NO_EXCEPTIONS
-#endif // no exceptions
-#endif // DOCTEST_CONFIG_NO_EXCEPTIONS
-
-#ifdef DOCTEST_CONFIG_NO_EXCEPTIONS_BUT_WITH_ALL_ASSERTS
-#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS
-#define DOCTEST_CONFIG_NO_EXCEPTIONS
-#endif // DOCTEST_CONFIG_NO_EXCEPTIONS
-#endif // DOCTEST_CONFIG_NO_EXCEPTIONS_BUT_WITH_ALL_ASSERTS
-
-#if defined(DOCTEST_CONFIG_NO_EXCEPTIONS) && !defined(DOCTEST_CONFIG_NO_TRY_CATCH_IN_ASSERTS)
-#define DOCTEST_CONFIG_NO_TRY_CATCH_IN_ASSERTS
-#endif // DOCTEST_CONFIG_NO_EXCEPTIONS && !DOCTEST_CONFIG_NO_TRY_CATCH_IN_ASSERTS
-
-#if defined(DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN) && !defined(DOCTEST_CONFIG_IMPLEMENT)
-#define DOCTEST_CONFIG_IMPLEMENT
-#endif // DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-
-#if defined(_WIN32) || defined(__CYGWIN__)
-#if DOCTEST_MSVC
-#define DOCTEST_SYMBOL_EXPORT __declspec(dllexport)
-#define DOCTEST_SYMBOL_IMPORT __declspec(dllimport)
-#else // MSVC
-#define DOCTEST_SYMBOL_EXPORT __attribute__((dllexport))
-#define DOCTEST_SYMBOL_IMPORT __attribute__((dllimport))
-#endif // MSVC
-#else  // _WIN32
-#define DOCTEST_SYMBOL_EXPORT __attribute__((visibility("default")))
-#define DOCTEST_SYMBOL_IMPORT
-#endif // _WIN32
-
-#ifdef DOCTEST_CONFIG_IMPLEMENTATION_IN_DLL
-#ifdef DOCTEST_CONFIG_IMPLEMENT
-#define DOCTEST_INTERFACE DOCTEST_SYMBOL_EXPORT
-#else // DOCTEST_CONFIG_IMPLEMENT
-#define DOCTEST_INTERFACE DOCTEST_SYMBOL_IMPORT
-#endif // DOCTEST_CONFIG_IMPLEMENT
-#else  // DOCTEST_CONFIG_IMPLEMENTATION_IN_DLL
-#define DOCTEST_INTERFACE
-#endif // DOCTEST_CONFIG_IMPLEMENTATION_IN_DLL
-
-#define DOCTEST_EMPTY
-
-#if DOCTEST_MSVC
-#define DOCTEST_NOINLINE __declspec(noinline)
-#define DOCTEST_UNUSED
-#define DOCTEST_ALIGNMENT(x)
-#elif DOCTEST_CLANG && DOCTEST_CLANG < DOCTEST_COMPILER(3, 5, 0)
-#define DOCTEST_NOINLINE
-#define DOCTEST_UNUSED
-#define DOCTEST_ALIGNMENT(x)
-#else
-#define DOCTEST_NOINLINE __attribute__((noinline))
-#define DOCTEST_UNUSED __attribute__((unused))
-#define DOCTEST_ALIGNMENT(x) __attribute__((aligned(x)))
-#endif
-
-#ifndef DOCTEST_NORETURN
-#define DOCTEST_NORETURN [[noreturn]]
-#endif // DOCTEST_NORETURN
-
-#ifndef DOCTEST_NOEXCEPT
-#define DOCTEST_NOEXCEPT noexcept
-#endif // DOCTEST_NOEXCEPT
-
-// =================================================================================================
-// == FEATURE DETECTION END ========================================================================
-// =================================================================================================
-
-// internal macros for string concatenation and anonymous variable name generation
-#define DOCTEST_CAT_IMPL(s1, s2) s1##s2
-#define DOCTEST_CAT(s1, s2) DOCTEST_CAT_IMPL(s1, s2)
-#ifdef __COUNTER__ // not standard and may be missing for some compilers
-#define DOCTEST_ANONYMOUS(x) DOCTEST_CAT(x, __COUNTER__)
-#else // __COUNTER__
-#define DOCTEST_ANONYMOUS(x) DOCTEST_CAT(x, __LINE__)
-#endif // __COUNTER__
-
-#define DOCTEST_TOSTR(x) #x
-
-#ifndef DOCTEST_CONFIG_ASSERTION_PARAMETERS_BY_VALUE
-#define DOCTEST_REF_WRAP(x) x&
-#else // DOCTEST_CONFIG_ASSERTION_PARAMETERS_BY_VALUE
-#define DOCTEST_REF_WRAP(x) x
-#endif // DOCTEST_CONFIG_ASSERTION_PARAMETERS_BY_VALUE
-
-// not using __APPLE__ because... this is how Catch does it
-#ifdef __MAC_OS_X_VERSION_MIN_REQUIRED
-#define DOCTEST_PLATFORM_MAC
-#elif defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
-#define DOCTEST_PLATFORM_IPHONE
-#elif defined(_WIN32)
-#define DOCTEST_PLATFORM_WINDOWS
-#else // DOCTEST_PLATFORM
-#define DOCTEST_PLATFORM_LINUX
-#endif // DOCTEST_PLATFORM
-
-#define DOCTEST_GLOBAL_NO_WARNINGS(var)                                                            \
-    DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wglobal-constructors")                              \
-    DOCTEST_CLANG_SUPPRESS_WARNING("-Wunused-variable")                                            \
-    static int var DOCTEST_UNUSED // NOLINT(fuchsia-statically-constructed-objects,cert-err58-cpp)
-#define DOCTEST_GLOBAL_NO_WARNINGS_END() DOCTEST_CLANG_SUPPRESS_WARNING_POP
-
-#ifndef DOCTEST_BREAK_INTO_DEBUGGER
-// should probably take a look at https://github.com/scottt/debugbreak
-#ifdef DOCTEST_PLATFORM_LINUX
-#if defined(__GNUC__) && (defined(__i386) || defined(__x86_64))
-// Break at the location of the failing check if possible
-#define DOCTEST_BREAK_INTO_DEBUGGER() __asm__("int $3\n" : :)
-#else
-#include <signal.h>
-#define DOCTEST_BREAK_INTO_DEBUGGER() raise(SIGTRAP)
-#endif
-#elif defined(DOCTEST_PLATFORM_MAC)
-#if defined(__x86_64) || defined(__x86_64__) || defined(__amd64__) || defined(__i386)
-#define DOCTEST_BREAK_INTO_DEBUGGER() __asm__("int $3\n" : :)
-#else
-#define DOCTEST_BREAK_INTO_DEBUGGER() __asm__("brk #0");
-#endif
-#elif DOCTEST_MSVC
-#define DOCTEST_BREAK_INTO_DEBUGGER() __debugbreak()
-#elif defined(__MINGW32__)
-DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH("-Wredundant-decls")
-extern "C" __declspec(dllimport) void __stdcall DebugBreak();
-DOCTEST_GCC_SUPPRESS_WARNING_POP
-#define DOCTEST_BREAK_INTO_DEBUGGER() ::DebugBreak()
-#else // linux
-#define DOCTEST_BREAK_INTO_DEBUGGER() (static_cast<void>(0))
-#endif // linux
-#endif // DOCTEST_BREAK_INTO_DEBUGGER
-
-// this is kept here for backwards compatibility since the config option was changed
-#ifdef DOCTEST_CONFIG_USE_IOSFWD
-#define DOCTEST_CONFIG_USE_STD_HEADERS
-#endif // DOCTEST_CONFIG_USE_IOSFWD
-
-#ifdef DOCTEST_CONFIG_USE_STD_HEADERS
-#ifndef DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
-#define DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
-#endif // DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
-#include <iosfwd>
-#include <cstddef>
-#include <ostream>
-#else // DOCTEST_CONFIG_USE_STD_HEADERS
-
-#if DOCTEST_CLANG
-// to detect if libc++ is being used with clang (the _LIBCPP_VERSION identifier)
-#include <ciso646>
-#endif // clang
-
-#ifdef _LIBCPP_VERSION
-#define DOCTEST_STD_NAMESPACE_BEGIN _LIBCPP_BEGIN_NAMESPACE_STD
-#define DOCTEST_STD_NAMESPACE_END _LIBCPP_END_NAMESPACE_STD
-#else // _LIBCPP_VERSION
-#define DOCTEST_STD_NAMESPACE_BEGIN namespace std {
-#define DOCTEST_STD_NAMESPACE_END }
-#endif // _LIBCPP_VERSION
-
-// Forward declaring 'X' in namespace std is not permitted by the C++ Standard.
-DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4643)
-
-DOCTEST_STD_NAMESPACE_BEGIN // NOLINT (cert-dcl58-cpp)
-typedef decltype(nullptr) nullptr_t;
-template <class charT>
-struct char_traits;
-template <>
-struct char_traits<char>;
-template <class charT, class traits>
-class basic_ostream;
-typedef basic_ostream<char, char_traits<char>> ostream;
-template <class... Types>
-class tuple;
-#if DOCTEST_MSVC >= DOCTEST_COMPILER(19, 20, 0)
-// see this issue on why this is needed: https://github.com/onqtam/doctest/issues/183
-template <class _Ty>
-class allocator;
-template <class _Elem, class _Traits, class _Alloc>
-class basic_string;
-using string = basic_string<char, char_traits<char>, allocator<char>>;
-#endif // VS 2019
-DOCTEST_STD_NAMESPACE_END
-
-DOCTEST_MSVC_SUPPRESS_WARNING_POP
-
-#endif // DOCTEST_CONFIG_USE_STD_HEADERS
-
-#ifdef DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
-#include <type_traits>
-#endif // DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
-
-namespace doctest {
-
-DOCTEST_INTERFACE extern bool is_running_in_test;
-
-// A 24 byte string class (can be as small as 17 for x64 and 13 for x86) that can hold strings with length
-// of up to 23 chars on the stack before going on the heap - the last byte of the buffer is used for:
-// - "is small" bit - the highest bit - if "0" then it is small - otherwise its "1" (128)
-// - if small - capacity left before going on the heap - using the lowest 5 bits
-// - if small - 2 bits are left unused - the second and third highest ones
-// - if small - acts as a null terminator if strlen() is 23 (24 including the null terminator)
-//              and the "is small" bit remains "0" ("as well as the capacity left") so its OK
-// Idea taken from this lecture about the string implementation of facebook/folly - fbstring
-// https://www.youtube.com/watch?v=kPR8h4-qZdk
-// TODO:
-// - optimizations - like not deleting memory unnecessarily in operator= and etc.
-// - resize/reserve/clear
-// - substr
-// - replace
-// - back/front
-// - iterator stuff
-// - find & friends
-// - push_back/pop_back
-// - assign/insert/erase
-// - relational operators as free functions - taking const char* as one of the params
-class DOCTEST_INTERFACE String
-{
-    static const unsigned len  = 24;      //!OCLINT avoid private static members
-    static const unsigned last = len - 1; //!OCLINT avoid private static members
-
-    struct view // len should be more than sizeof(view) - because of the final byte for flags
-    {
-        char*    ptr;
-        unsigned size;
-        unsigned capacity;
-    };
-
-    union
-    {
-        char buf[len];
-        view data;
-    };
-
-    bool isOnStack() const { return (buf[last] & 128) == 0; }
-    void setOnHeap();
-    void setLast(unsigned in = last);
-
-    void copy(const String& other);
-
-public:
-    String();
-    ~String();
-
-    // cppcheck-suppress noExplicitConstructor
-    String(const char* in);
-    String(const char* in, unsigned in_size);
-
-    String(const String& other);
-    String& operator=(const String& other);
-
-    String& operator+=(const String& other);
-    String  operator+(const String& other) const;
-
-    String(String&& other);
-    String& operator=(String&& other);
-
-    char  operator[](unsigned i) const;
-    char& operator[](unsigned i);
-
-    // the only functions I'm willing to leave in the interface - available for inlining
-    const char* c_str() const { return const_cast<String*>(this)->c_str(); } // NOLINT
-    char*       c_str() {
-        if(isOnStack())
-            return reinterpret_cast<char*>(buf);
-        return data.ptr;
-    }
-
-    unsigned size() const;
-    unsigned capacity() const;
-
-    int compare(const char* other, bool no_case = false) const;
-    int compare(const String& other, bool no_case = false) const;
-};
-
-DOCTEST_INTERFACE bool operator==(const String& lhs, const String& rhs);
-DOCTEST_INTERFACE bool operator!=(const String& lhs, const String& rhs);
-DOCTEST_INTERFACE bool operator<(const String& lhs, const String& rhs);
-DOCTEST_INTERFACE bool operator>(const String& lhs, const String& rhs);
-DOCTEST_INTERFACE bool operator<=(const String& lhs, const String& rhs);
-DOCTEST_INTERFACE bool operator>=(const String& lhs, const String& rhs);
-
-DOCTEST_INTERFACE std::ostream& operator<<(std::ostream& s, const String& in);
-
-namespace Color {
-    enum Enum
-    {
-        None = 0,
-        White,
-        Red,
-        Green,
-        Blue,
-        Cyan,
-        Yellow,
-        Grey,
-
-        Bright = 0x10,
-
-        BrightRed   = Bright | Red,
-        BrightGreen = Bright | Green,
-        LightGrey   = Bright | Grey,
-        BrightWhite = Bright | White
-    };
-
-    DOCTEST_INTERFACE std::ostream& operator<<(std::ostream& s, Color::Enum code);
-} // namespace Color
-
-namespace assertType {
-    enum Enum
-    {
-        // macro traits
-
-        is_warn    = 1,
-        is_check   = 2 * is_warn,
-        is_require = 2 * is_check,
-
-        is_normal      = 2 * is_require,
-        is_throws      = 2 * is_normal,
-        is_throws_as   = 2 * is_throws,
-        is_throws_with = 2 * is_throws_as,
-        is_nothrow     = 2 * is_throws_with,
-
-        is_false = 2 * is_nothrow,
-        is_unary = 2 * is_false, // not checked anywhere - used just to distinguish the types
-
-        is_eq = 2 * is_unary,
-        is_ne = 2 * is_eq,
-
-        is_lt = 2 * is_ne,
-        is_gt = 2 * is_lt,
-
-        is_ge = 2 * is_gt,
-        is_le = 2 * is_ge,
-
-        // macro types
-
-        DT_WARN    = is_normal | is_warn,
-        DT_CHECK   = is_normal | is_check,
-        DT_REQUIRE = is_normal | is_require,
-
-        DT_WARN_FALSE    = is_normal | is_false | is_warn,
-        DT_CHECK_FALSE   = is_normal | is_false | is_check,
-        DT_REQUIRE_FALSE = is_normal | is_false | is_require,
-
-        DT_WARN_THROWS    = is_throws | is_warn,
-        DT_CHECK_THROWS   = is_throws | is_check,
-        DT_REQUIRE_THROWS = is_throws | is_require,
-
-        DT_WARN_THROWS_AS    = is_throws_as | is_warn,
-        DT_CHECK_THROWS_AS   = is_throws_as | is_check,
-        DT_REQUIRE_THROWS_AS = is_throws_as | is_require,
-
-        DT_WARN_THROWS_WITH    = is_throws_with | is_warn,
-        DT_CHECK_THROWS_WITH   = is_throws_with | is_check,
-        DT_REQUIRE_THROWS_WITH = is_throws_with | is_require,
-        
-        DT_WARN_THROWS_WITH_AS    = is_throws_with | is_throws_as | is_warn,
-        DT_CHECK_THROWS_WITH_AS   = is_throws_with | is_throws_as | is_check,
-        DT_REQUIRE_THROWS_WITH_AS = is_throws_with | is_throws_as | is_require,
-
-        DT_WARN_NOTHROW    = is_nothrow | is_warn,
-        DT_CHECK_NOTHROW   = is_nothrow | is_check,
-        DT_REQUIRE_NOTHROW = is_nothrow | is_require,
-
-        DT_WARN_EQ    = is_normal | is_eq | is_warn,
-        DT_CHECK_EQ   = is_normal | is_eq | is_check,
-        DT_REQUIRE_EQ = is_normal | is_eq | is_require,
-
-        DT_WARN_NE    = is_normal | is_ne | is_warn,
-        DT_CHECK_NE   = is_normal | is_ne | is_check,
-        DT_REQUIRE_NE = is_normal | is_ne | is_require,
-
-        DT_WARN_GT    = is_normal | is_gt | is_warn,
-        DT_CHECK_GT   = is_normal | is_gt | is_check,
-        DT_REQUIRE_GT = is_normal | is_gt | is_require,
-
-        DT_WARN_LT    = is_normal | is_lt | is_warn,
-        DT_CHECK_LT   = is_normal | is_lt | is_check,
-        DT_REQUIRE_LT = is_normal | is_lt | is_require,
-
-        DT_WARN_GE    = is_normal | is_ge | is_warn,
-        DT_CHECK_GE   = is_normal | is_ge | is_check,
-        DT_REQUIRE_GE = is_normal | is_ge | is_require,
-
-        DT_WARN_LE    = is_normal | is_le | is_warn,
-        DT_CHECK_LE   = is_normal | is_le | is_check,
-        DT_REQUIRE_LE = is_normal | is_le | is_require,
-
-        DT_WARN_UNARY    = is_normal | is_unary | is_warn,
-        DT_CHECK_UNARY   = is_normal | is_unary | is_check,
-        DT_REQUIRE_UNARY = is_normal | is_unary | is_require,
-
-        DT_WARN_UNARY_FALSE    = is_normal | is_false | is_unary | is_warn,
-        DT_CHECK_UNARY_FALSE   = is_normal | is_false | is_unary | is_check,
-        DT_REQUIRE_UNARY_FALSE = is_normal | is_false | is_unary | is_require,
-    };
-} // namespace assertType
-
-DOCTEST_INTERFACE const char* assertString(assertType::Enum at);
-DOCTEST_INTERFACE const char* failureString(assertType::Enum at);
-DOCTEST_INTERFACE const char* skipPathFromFilename(const char* file);
-
-struct DOCTEST_INTERFACE TestCaseData
-{
-    String      m_file;       // the file in which the test was registered
-    unsigned    m_line;       // the line where the test was registered
-    const char* m_name;       // name of the test case
-    const char* m_test_suite; // the test suite in which the test was added
-    const char* m_description;
-    bool        m_skip;
-    bool        m_may_fail;
-    bool        m_should_fail;
-    int         m_expected_failures;
-    double      m_timeout;
-};
-
-struct DOCTEST_INTERFACE AssertData
-{
-    // common - for all asserts
-    const TestCaseData* m_test_case;
-    assertType::Enum    m_at;
-    const char*         m_file;
-    int                 m_line;
-    const char*         m_expr;
-    bool                m_failed;
-
-    // exception-related - for all asserts
-    bool   m_threw;
-    String m_exception;
-
-    // for normal asserts
-    String m_decomp;
-
-    // for specific exception-related asserts
-    bool        m_threw_as;
-    const char* m_exception_type;
-    const char* m_exception_string;
-};
-
-struct DOCTEST_INTERFACE MessageData
-{
-    String           m_string;
-    const char*      m_file;
-    int              m_line;
-    assertType::Enum m_severity;
-};
-
-struct DOCTEST_INTERFACE SubcaseSignature
-{
-    String      m_name;
-    const char* m_file;
-    int         m_line;
-
-    bool operator<(const SubcaseSignature& other) const;
-};
-
-struct DOCTEST_INTERFACE IContextScope
-{
-    IContextScope();
-    virtual ~IContextScope();
-    virtual void stringify(std::ostream*) const = 0;
-};
-
-struct ContextOptions //!OCLINT too many fields
-{
-    std::ostream* cout;        // stdout stream - std::cout by default
-    std::ostream* cerr;        // stderr stream - std::cerr by default
-    String        binary_name; // the test binary name
-
-    // == parameters from the command line
-    String   out;       // output filename
-    String   order_by;  // how tests should be ordered
-    unsigned rand_seed; // the seed for rand ordering
-
-    unsigned first; // the first (matching) test to be executed
-    unsigned last;  // the last (matching) test to be executed
-
-    int abort_after;           // stop tests after this many failed assertions
-    int subcase_filter_levels; // apply the subcase filters for the first N levels
-
-    bool success;              // include successful assertions in output
-    bool case_sensitive;       // if filtering should be case sensitive
-    bool exit;                 // if the program should be exited after the tests are ran/whatever
-    bool duration;             // print the time duration of each test case
-    bool no_throw;             // to skip exceptions-related assertion macros
-    bool no_exitcode;          // if the framework should return 0 as the exitcode
-    bool no_run;               // to not run the tests at all (can be done with an "*" exclude)
-    bool no_version;           // to not print the version of the framework
-    bool no_colors;            // if output to the console should be colorized
-    bool force_colors;         // forces the use of colors even when a tty cannot be detected
-    bool no_breaks;            // to not break into the debugger
-    bool no_skip;              // don't skip test cases which are marked to be skipped
-    bool gnu_file_line;        // if line numbers should be surrounded with :x: and not (x):
-    bool no_path_in_filenames; // if the path to files should be removed from the output
-    bool no_line_numbers;      // if source code line numbers should be omitted from the output
-    bool no_debug_output;      // no output in the debug console when a debugger is attached
-    bool no_skipped_summary;   // don't print "skipped" in the summary !!! UNDOCUMENTED !!!
-    bool no_time_in_output;    // omit any time/timestamps from output !!! UNDOCUMENTED !!!
-
-    bool help;             // to print the help
-    bool version;          // to print the version
-    bool count;            // if only the count of matching tests is to be retrieved
-    bool list_test_cases;  // to list all tests matching the filters
-    bool list_test_suites; // to list all suites matching the filters
-    bool list_reporters;   // lists all registered reporters
-};
-
-namespace detail {
-    template <bool CONDITION, typename TYPE = void>
-    struct enable_if
-    {};
-
-    template <typename TYPE>
-    struct enable_if<true, TYPE>
-    { typedef TYPE type; };
-
-    // clang-format off
-    template<class T> struct remove_reference      { typedef T type; };
-    template<class T> struct remove_reference<T&>  { typedef T type; };
-    template<class T> struct remove_reference<T&&> { typedef T type; };
-
-    template<class T> struct remove_const          { typedef T type; };
-    template<class T> struct remove_const<const T> { typedef T type; };
-#ifdef DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
-    template<class T> struct is_enum : public std::is_enum<T> {};
-    template<class T> struct underlying_type : public std::underlying_type<T> {};
-#else
-    // Use compiler intrinsics
-    template<class T> struct is_enum { constexpr static bool value = __is_enum(T); };
-    template<class T> struct underlying_type { typedef __underlying_type(T) type; };
-#endif
-    // clang-format on
-
-    template <typename T>
-    struct deferred_false
-    // cppcheck-suppress unusedStructMember
-    { static const bool value = false; };
-
-    namespace has_insertion_operator_impl {
-        std::ostream &os();
-        template<class T>
-        DOCTEST_REF_WRAP(T) val();
-
-        template<class, class = void>
-        struct check {
-            static constexpr bool value = false;
-        };
-
-        template<class T>
-        struct check<T, decltype(os() << val<T>(), void())> {
-            static constexpr bool value = true;
-        };
-    } // namespace has_insertion_operator_impl
-
-    template<class T>
-    using has_insertion_operator = has_insertion_operator_impl::check<const T>;
-
-    DOCTEST_INTERFACE void my_memcpy(void* dest, const void* src, unsigned num);
-
-    DOCTEST_INTERFACE std::ostream* getTlsOss(); // returns a thread-local ostringstream
-    DOCTEST_INTERFACE String getTlsOssResult();
-
-    template <bool C>
-    struct StringMakerBase
-    {
-        template <typename T>
-        static String convert(const DOCTEST_REF_WRAP(T)) {
-            return "{?}";
-        }
-    };
-
-    template <>
-    struct StringMakerBase<true>
-    {
-        template <typename T>
-        static String convert(const DOCTEST_REF_WRAP(T) in) {
-            *getTlsOss() << in;
-            return getTlsOssResult();
-        }
-    };
-
-    DOCTEST_INTERFACE String rawMemoryToString(const void* object, unsigned size);
-
-    template <typename T>
-    String rawMemoryToString(const DOCTEST_REF_WRAP(T) object) {
-        return rawMemoryToString(&object, sizeof(object));
-    }
-
-    template <typename T>
-    const char* type_to_string() {
-        return "<>";
-    }
-} // namespace detail
-
-template <typename T>
-struct StringMaker : public detail::StringMakerBase<detail::has_insertion_operator<T>::value>
-{};
-
-template <typename T>
-struct StringMaker<T*>
-{
-    template <typename U>
-    static String convert(U* p) {
-        if(p)
-            return detail::rawMemoryToString(p);
-        return "NULL";
-    }
-};
-
-template <typename R, typename C>
-struct StringMaker<R C::*>
-{
-    static String convert(R C::*p) {
-        if(p)
-            return detail::rawMemoryToString(p);
-        return "NULL";
-    }
-};
-
-template <typename T, typename detail::enable_if<!detail::is_enum<T>::value, bool>::type = true>
-String toString(const DOCTEST_REF_WRAP(T) value) {
-    return StringMaker<T>::convert(value);
-}
-
-#ifdef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-DOCTEST_INTERFACE String toString(char* in);
-DOCTEST_INTERFACE String toString(const char* in);
-#endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-DOCTEST_INTERFACE String toString(bool in);
-DOCTEST_INTERFACE String toString(float in);
-DOCTEST_INTERFACE String toString(double in);
-DOCTEST_INTERFACE String toString(double long in);
-
-DOCTEST_INTERFACE String toString(char in);
-DOCTEST_INTERFACE String toString(char signed in);
-DOCTEST_INTERFACE String toString(char unsigned in);
-DOCTEST_INTERFACE String toString(int short in);
-DOCTEST_INTERFACE String toString(int short unsigned in);
-DOCTEST_INTERFACE String toString(int in);
-DOCTEST_INTERFACE String toString(int unsigned in);
-DOCTEST_INTERFACE String toString(int long in);
-DOCTEST_INTERFACE String toString(int long unsigned in);
-DOCTEST_INTERFACE String toString(int long long in);
-DOCTEST_INTERFACE String toString(int long long unsigned in);
-DOCTEST_INTERFACE String toString(std::nullptr_t in);
-
-template <typename T, typename detail::enable_if<detail::is_enum<T>::value, bool>::type = true>
-String toString(const DOCTEST_REF_WRAP(T) value) {
-    typedef typename detail::underlying_type<T>::type UT;
-    return toString(static_cast<UT>(value));
-}
-
-#if DOCTEST_MSVC >= DOCTEST_COMPILER(19, 20, 0)
-// see this issue on why this is needed: https://github.com/onqtam/doctest/issues/183
-DOCTEST_INTERFACE String toString(const std::string& in);
-#endif // VS 2019
-
-class DOCTEST_INTERFACE Approx
-{
-public:
-    explicit Approx(double value);
-
-    Approx operator()(double value) const;
-
-#ifdef DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
-    template <typename T>
-    explicit Approx(const T& value,
-                    typename detail::enable_if<std::is_constructible<double, T>::value>::type* =
-                            static_cast<T*>(nullptr)) {
-        *this = Approx(static_cast<double>(value));
-    }
-#endif // DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
-
-    Approx& epsilon(double newEpsilon);
-
-#ifdef DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
-    template <typename T>
-    typename detail::enable_if<std::is_constructible<double, T>::value, Approx&>::type epsilon(
-            const T& newEpsilon) {
-        m_epsilon = static_cast<double>(newEpsilon);
-        return *this;
-    }
-#endif //  DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
-
-    Approx& scale(double newScale);
-
-#ifdef DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
-    template <typename T>
-    typename detail::enable_if<std::is_constructible<double, T>::value, Approx&>::type scale(
-            const T& newScale) {
-        m_scale = static_cast<double>(newScale);
-        return *this;
-    }
-#endif // DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
-
-    // clang-format off
-    DOCTEST_INTERFACE friend bool operator==(double lhs, const Approx & rhs);
-    DOCTEST_INTERFACE friend bool operator==(const Approx & lhs, double rhs);
-    DOCTEST_INTERFACE friend bool operator!=(double lhs, const Approx & rhs);
-    DOCTEST_INTERFACE friend bool operator!=(const Approx & lhs, double rhs);
-    DOCTEST_INTERFACE friend bool operator<=(double lhs, const Approx & rhs);
-    DOCTEST_INTERFACE friend bool operator<=(const Approx & lhs, double rhs);
-    DOCTEST_INTERFACE friend bool operator>=(double lhs, const Approx & rhs);
-    DOCTEST_INTERFACE friend bool operator>=(const Approx & lhs, double rhs);
-    DOCTEST_INTERFACE friend bool operator< (double lhs, const Approx & rhs);
-    DOCTEST_INTERFACE friend bool operator< (const Approx & lhs, double rhs);
-    DOCTEST_INTERFACE friend bool operator> (double lhs, const Approx & rhs);
-    DOCTEST_INTERFACE friend bool operator> (const Approx & lhs, double rhs);
-
-    DOCTEST_INTERFACE friend String toString(const Approx& in);
-
-#ifdef DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
-#define DOCTEST_APPROX_PREFIX \
-    template <typename T> friend typename detail::enable_if<std::is_constructible<double, T>::value, bool>::type
-
-    DOCTEST_APPROX_PREFIX operator==(const T& lhs, const Approx& rhs) { return operator==(double(lhs), rhs); }
-    DOCTEST_APPROX_PREFIX operator==(const Approx& lhs, const T& rhs) { return operator==(rhs, lhs); }
-    DOCTEST_APPROX_PREFIX operator!=(const T& lhs, const Approx& rhs) { return !operator==(lhs, rhs); }
-    DOCTEST_APPROX_PREFIX operator!=(const Approx& lhs, const T& rhs) { return !operator==(rhs, lhs); }
-    DOCTEST_APPROX_PREFIX operator<=(const T& lhs, const Approx& rhs) { return double(lhs) < rhs.m_value || lhs == rhs; }
-    DOCTEST_APPROX_PREFIX operator<=(const Approx& lhs, const T& rhs) { return lhs.m_value < double(rhs) || lhs == rhs; }
-    DOCTEST_APPROX_PREFIX operator>=(const T& lhs, const Approx& rhs) { return double(lhs) > rhs.m_value || lhs == rhs; }
-    DOCTEST_APPROX_PREFIX operator>=(const Approx& lhs, const T& rhs) { return lhs.m_value > double(rhs) || lhs == rhs; }
-    DOCTEST_APPROX_PREFIX operator< (const T& lhs, const Approx& rhs) { return double(lhs) < rhs.m_value && lhs != rhs; }
-    DOCTEST_APPROX_PREFIX operator< (const Approx& lhs, const T& rhs) { return lhs.m_value < double(rhs) && lhs != rhs; }
-    DOCTEST_APPROX_PREFIX operator> (const T& lhs, const Approx& rhs) { return double(lhs) > rhs.m_value && lhs != rhs; }
-    DOCTEST_APPROX_PREFIX operator> (const Approx& lhs, const T& rhs) { return lhs.m_value > double(rhs) && lhs != rhs; }
-#undef DOCTEST_APPROX_PREFIX
-#endif // DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
-
-    // clang-format on
-
-private:
-    double m_epsilon;
-    double m_scale;
-    double m_value;
-};
-
-DOCTEST_INTERFACE String toString(const Approx& in);
-
-DOCTEST_INTERFACE const ContextOptions* getContextOptions();
-
-#if !defined(DOCTEST_CONFIG_DISABLE)
-
-namespace detail {
-    // clang-format off
-#ifdef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-    template<class T>               struct decay_array       { typedef T type; };
-    template<class T, unsigned N>   struct decay_array<T[N]> { typedef T* type; };
-    template<class T>               struct decay_array<T[]>  { typedef T* type; };
-
-    template<class T>   struct not_char_pointer              { enum { value = 1 }; };
-    template<>          struct not_char_pointer<char*>       { enum { value = 0 }; };
-    template<>          struct not_char_pointer<const char*> { enum { value = 0 }; };
-
-    template<class T> struct can_use_op : public not_char_pointer<typename decay_array<T>::type> {};
-#endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-    // clang-format on
-
-    struct DOCTEST_INTERFACE TestFailureException
-    {
-    };
-
-    DOCTEST_INTERFACE bool checkIfShouldThrow(assertType::Enum at);
-
-#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS
-    DOCTEST_NORETURN
-#endif // DOCTEST_CONFIG_NO_EXCEPTIONS
-    DOCTEST_INTERFACE void throwException();
-
-    struct DOCTEST_INTERFACE Subcase
-    {
-        SubcaseSignature m_signature;
-        bool             m_entered = false;
-
-        Subcase(const String& name, const char* file, int line);
-        ~Subcase();
-
-        operator bool() const;
-    };
-
-    template <typename L, typename R>
-    String stringifyBinaryExpr(const DOCTEST_REF_WRAP(L) lhs, const char* op,
-                               const DOCTEST_REF_WRAP(R) rhs) {
-        // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks)
-        return toString(lhs) + op + toString(rhs);
-    }
-
-#define DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(op, op_str, op_macro)                              \
-    template <typename R>                                                                          \
-    DOCTEST_NOINLINE Result operator op(const DOCTEST_REF_WRAP(R) rhs) {                           \
-        bool res = op_macro(lhs, rhs);                                                             \
-        if(m_at & assertType::is_false)                                                            \
-            res = !res;                                                                            \
-        if(!res || doctest::getContextOptions()->success)                                          \
-            return Result(res, stringifyBinaryExpr(lhs, op_str, rhs));                             \
-        return Result(res);                                                                        \
-    }
-
-    // more checks could be added - like in Catch:
-    // https://github.com/catchorg/Catch2/pull/1480/files
-    // https://github.com/catchorg/Catch2/pull/1481/files
-#define DOCTEST_FORBIT_EXPRESSION(rt, op)                                                          \
-    template <typename R>                                                                          \
-    rt& operator op(const R&) {                                                                    \
-        static_assert(deferred_false<R>::value,                                                    \
-                      "Expression Too Complex Please Rewrite As Binary Comparison!");              \
-        return *this;                                                                              \
-    }
-
-    struct DOCTEST_INTERFACE Result
-    {
-        bool   m_passed;
-        String m_decomp;
-
-        Result(bool passed, const String& decomposition = String());
-
-        // forbidding some expressions based on this table: https://en.cppreference.com/w/cpp/language/operator_precedence
-        DOCTEST_FORBIT_EXPRESSION(Result, &)
-        DOCTEST_FORBIT_EXPRESSION(Result, ^)
-        DOCTEST_FORBIT_EXPRESSION(Result, |)
-        DOCTEST_FORBIT_EXPRESSION(Result, &&)
-        DOCTEST_FORBIT_EXPRESSION(Result, ||)
-        DOCTEST_FORBIT_EXPRESSION(Result, ==)
-        DOCTEST_FORBIT_EXPRESSION(Result, !=)
-        DOCTEST_FORBIT_EXPRESSION(Result, <)
-        DOCTEST_FORBIT_EXPRESSION(Result, >)
-        DOCTEST_FORBIT_EXPRESSION(Result, <=)
-        DOCTEST_FORBIT_EXPRESSION(Result, >=)
-        DOCTEST_FORBIT_EXPRESSION(Result, =)
-        DOCTEST_FORBIT_EXPRESSION(Result, +=)
-        DOCTEST_FORBIT_EXPRESSION(Result, -=)
-        DOCTEST_FORBIT_EXPRESSION(Result, *=)
-        DOCTEST_FORBIT_EXPRESSION(Result, /=)
-        DOCTEST_FORBIT_EXPRESSION(Result, %=)
-        DOCTEST_FORBIT_EXPRESSION(Result, <<=)
-        DOCTEST_FORBIT_EXPRESSION(Result, >>=)
-        DOCTEST_FORBIT_EXPRESSION(Result, &=)
-        DOCTEST_FORBIT_EXPRESSION(Result, ^=)
-        DOCTEST_FORBIT_EXPRESSION(Result, |=)
-    };
-
-#ifndef DOCTEST_CONFIG_NO_COMPARISON_WARNING_SUPPRESSION
-
-    DOCTEST_CLANG_SUPPRESS_WARNING_PUSH
-    DOCTEST_CLANG_SUPPRESS_WARNING("-Wsign-conversion")
-    DOCTEST_CLANG_SUPPRESS_WARNING("-Wsign-compare")
-    //DOCTEST_CLANG_SUPPRESS_WARNING("-Wdouble-promotion")
-    //DOCTEST_CLANG_SUPPRESS_WARNING("-Wconversion")
-    //DOCTEST_CLANG_SUPPRESS_WARNING("-Wfloat-equal")
-
-    DOCTEST_GCC_SUPPRESS_WARNING_PUSH
-    DOCTEST_GCC_SUPPRESS_WARNING("-Wsign-conversion")
-    DOCTEST_GCC_SUPPRESS_WARNING("-Wsign-compare")
-    //DOCTEST_GCC_SUPPRESS_WARNING("-Wdouble-promotion")
-    //DOCTEST_GCC_SUPPRESS_WARNING("-Wconversion")
-    //DOCTEST_GCC_SUPPRESS_WARNING("-Wfloat-equal")
-
-    DOCTEST_MSVC_SUPPRESS_WARNING_PUSH
-    // https://stackoverflow.com/questions/39479163 what's the difference between 4018 and 4389
-    DOCTEST_MSVC_SUPPRESS_WARNING(4388) // signed/unsigned mismatch
-    DOCTEST_MSVC_SUPPRESS_WARNING(4389) // 'operator' : signed/unsigned mismatch
-    DOCTEST_MSVC_SUPPRESS_WARNING(4018) // 'expression' : signed/unsigned mismatch
-    //DOCTEST_MSVC_SUPPRESS_WARNING(4805) // 'operation' : unsafe mix of type 'type' and type 'type' in operation
-
-#endif // DOCTEST_CONFIG_NO_COMPARISON_WARNING_SUPPRESSION
-
-    // clang-format off
-#ifndef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-#define DOCTEST_COMPARISON_RETURN_TYPE bool
-#else // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-#define DOCTEST_COMPARISON_RETURN_TYPE typename enable_if<can_use_op<L>::value || can_use_op<R>::value, bool>::type
-    // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks)
-    inline bool eq(const char* lhs, const char* rhs) { return String(lhs) == String(rhs); }
-    inline bool ne(const char* lhs, const char* rhs) { return String(lhs) != String(rhs); }
-    inline bool lt(const char* lhs, const char* rhs) { return String(lhs) <  String(rhs); }
-    inline bool gt(const char* lhs, const char* rhs) { return String(lhs) >  String(rhs); }
-    inline bool le(const char* lhs, const char* rhs) { return String(lhs) <= String(rhs); }
-    inline bool ge(const char* lhs, const char* rhs) { return String(lhs) >= String(rhs); }
-#endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-    // clang-format on
-
-#define DOCTEST_RELATIONAL_OP(name, op)                                                            \
-    template <typename L, typename R>                                                              \
-    DOCTEST_COMPARISON_RETURN_TYPE name(const DOCTEST_REF_WRAP(L) lhs,                             \
-                                        const DOCTEST_REF_WRAP(R) rhs) {                           \
-        return lhs op rhs;                                                                         \
-    }
-
-    DOCTEST_RELATIONAL_OP(eq, ==)
-    DOCTEST_RELATIONAL_OP(ne, !=)
-    DOCTEST_RELATIONAL_OP(lt, <)
-    DOCTEST_RELATIONAL_OP(gt, >)
-    DOCTEST_RELATIONAL_OP(le, <=)
-    DOCTEST_RELATIONAL_OP(ge, >=)
-
-#ifndef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-#define DOCTEST_CMP_EQ(l, r) l == r
-#define DOCTEST_CMP_NE(l, r) l != r
-#define DOCTEST_CMP_GT(l, r) l > r
-#define DOCTEST_CMP_LT(l, r) l < r
-#define DOCTEST_CMP_GE(l, r) l >= r
-#define DOCTEST_CMP_LE(l, r) l <= r
-#else // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-#define DOCTEST_CMP_EQ(l, r) eq(l, r)
-#define DOCTEST_CMP_NE(l, r) ne(l, r)
-#define DOCTEST_CMP_GT(l, r) gt(l, r)
-#define DOCTEST_CMP_LT(l, r) lt(l, r)
-#define DOCTEST_CMP_GE(l, r) ge(l, r)
-#define DOCTEST_CMP_LE(l, r) le(l, r)
-#endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-
-    template <typename L>
-    // cppcheck-suppress copyCtorAndEqOperator
-    struct Expression_lhs
-    {
-        L                lhs;
-        assertType::Enum m_at;
-
-        explicit Expression_lhs(L in, assertType::Enum at)
-                : lhs(in)
-                , m_at(at) {}
-
-        DOCTEST_NOINLINE operator Result() {
-            bool res = !!lhs;
-            if(m_at & assertType::is_false) //!OCLINT bitwise operator in conditional
-                res = !res;
-
-            if(!res || getContextOptions()->success)
-                return Result(res, toString(lhs));
-            return Result(res);
-        }
-
-        // clang-format off
-        DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(==, " == ", DOCTEST_CMP_EQ) //!OCLINT bitwise operator in conditional
-        DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(!=, " != ", DOCTEST_CMP_NE) //!OCLINT bitwise operator in conditional
-        DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(>,  " >  ", DOCTEST_CMP_GT) //!OCLINT bitwise operator in conditional
-        DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(<,  " <  ", DOCTEST_CMP_LT) //!OCLINT bitwise operator in conditional
-        DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(>=, " >= ", DOCTEST_CMP_GE) //!OCLINT bitwise operator in conditional
-        DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(<=, " <= ", DOCTEST_CMP_LE) //!OCLINT bitwise operator in conditional
-        // clang-format on
-
-        // forbidding some expressions based on this table: https://en.cppreference.com/w/cpp/language/operator_precedence
-        DOCTEST_FORBIT_EXPRESSION(Expression_lhs, &)
-        DOCTEST_FORBIT_EXPRESSION(Expression_lhs, ^)
-        DOCTEST_FORBIT_EXPRESSION(Expression_lhs, |)
-        DOCTEST_FORBIT_EXPRESSION(Expression_lhs, &&)
-        DOCTEST_FORBIT_EXPRESSION(Expression_lhs, ||)
-        DOCTEST_FORBIT_EXPRESSION(Expression_lhs, =)
-        DOCTEST_FORBIT_EXPRESSION(Expression_lhs, +=)
-        DOCTEST_FORBIT_EXPRESSION(Expression_lhs, -=)
-        DOCTEST_FORBIT_EXPRESSION(Expression_lhs, *=)
-        DOCTEST_FORBIT_EXPRESSION(Expression_lhs, /=)
-        DOCTEST_FORBIT_EXPRESSION(Expression_lhs, %=)
-        DOCTEST_FORBIT_EXPRESSION(Expression_lhs, <<=)
-        DOCTEST_FORBIT_EXPRESSION(Expression_lhs, >>=)
-        DOCTEST_FORBIT_EXPRESSION(Expression_lhs, &=)
-        DOCTEST_FORBIT_EXPRESSION(Expression_lhs, ^=)
-        DOCTEST_FORBIT_EXPRESSION(Expression_lhs, |=)
-        // these 2 are unfortunate because they should be allowed - they have higher precedence over the comparisons, but the
-        // ExpressionDecomposer class uses the left shift operator to capture the left operand of the binary expression...
-        DOCTEST_FORBIT_EXPRESSION(Expression_lhs, <<)
-        DOCTEST_FORBIT_EXPRESSION(Expression_lhs, >>)
-    };
-
-#ifndef DOCTEST_CONFIG_NO_COMPARISON_WARNING_SUPPRESSION
-
-    DOCTEST_CLANG_SUPPRESS_WARNING_POP
-    DOCTEST_MSVC_SUPPRESS_WARNING_POP
-    DOCTEST_GCC_SUPPRESS_WARNING_POP
-
-#endif // DOCTEST_CONFIG_NO_COMPARISON_WARNING_SUPPRESSION
-
-    struct DOCTEST_INTERFACE ExpressionDecomposer
-    {
-        assertType::Enum m_at;
-
-        ExpressionDecomposer(assertType::Enum at);
-
-        // The right operator for capturing expressions is "<=" instead of "<<" (based on the operator precedence table)
-        // but then there will be warnings from GCC about "-Wparentheses" and since "_Pragma()" is problematic this will stay for now...
-        // https://github.com/catchorg/Catch2/issues/870
-        // https://github.com/catchorg/Catch2/issues/565
-        template <typename L>
-        Expression_lhs<const DOCTEST_REF_WRAP(L)> operator<<(const DOCTEST_REF_WRAP(L) operand) {
-            return Expression_lhs<const DOCTEST_REF_WRAP(L)>(operand, m_at);
-        }
-    };
-
-    struct DOCTEST_INTERFACE TestSuite
-    {
-        const char* m_test_suite;
-        const char* m_description;
-        bool        m_skip;
-        bool        m_may_fail;
-        bool        m_should_fail;
-        int         m_expected_failures;
-        double      m_timeout;
-
-        TestSuite& operator*(const char* in);
-
-        template <typename T>
-        TestSuite& operator*(const T& in) {
-            in.fill(*this);
-            return *this;
-        }
-    };
-
-    typedef void (*funcType)();
-
-    struct DOCTEST_INTERFACE TestCase : public TestCaseData
-    {
-        funcType m_test; // a function pointer to the test case
-
-        const char* m_type; // for templated test cases - gets appended to the real name
-        int m_template_id; // an ID used to distinguish between the different versions of a templated test case
-        String m_full_name; // contains the name (only for templated test cases!) + the template type
-
-        TestCase(funcType test, const char* file, unsigned line, const TestSuite& test_suite,
-                 const char* type = "", int template_id = -1);
-
-        TestCase(const TestCase& other);
-
-        DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(26434) // hides a non-virtual function
-        TestCase& operator=(const TestCase& other);
-        DOCTEST_MSVC_SUPPRESS_WARNING_POP
-
-        TestCase& operator*(const char* in);
-
-        template <typename T>
-        TestCase& operator*(const T& in) {
-            in.fill(*this);
-            return *this;
-        }
-
-        bool operator<(const TestCase& other) const;
-    };
-
-    // forward declarations of functions used by the macros
-    DOCTEST_INTERFACE int  regTest(const TestCase& tc);
-    DOCTEST_INTERFACE int  setTestSuite(const TestSuite& ts);
-    DOCTEST_INTERFACE bool isDebuggerActive();
-
-    template<typename T>
-    int instantiationHelper(const T&) { return 0; }
-
-    namespace binaryAssertComparison {
-        enum Enum
-        {
-            eq = 0,
-            ne,
-            gt,
-            lt,
-            ge,
-            le
-        };
-    } // namespace binaryAssertComparison
-
-    // clang-format off
-    template <int, class L, class R> struct RelationalComparator     { bool operator()(const DOCTEST_REF_WRAP(L),     const DOCTEST_REF_WRAP(R)    ) const { return false;        } };
-
-#define DOCTEST_BINARY_RELATIONAL_OP(n, op) \
-    template <class L, class R> struct RelationalComparator<n, L, R> { bool operator()(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) const { return op(lhs, rhs); } };
-    // clang-format on
-
-    DOCTEST_BINARY_RELATIONAL_OP(0, doctest::detail::eq)
-    DOCTEST_BINARY_RELATIONAL_OP(1, doctest::detail::ne)
-    DOCTEST_BINARY_RELATIONAL_OP(2, doctest::detail::gt)
-    DOCTEST_BINARY_RELATIONAL_OP(3, doctest::detail::lt)
-    DOCTEST_BINARY_RELATIONAL_OP(4, doctest::detail::ge)
-    DOCTEST_BINARY_RELATIONAL_OP(5, doctest::detail::le)
-
-    struct DOCTEST_INTERFACE ResultBuilder : public AssertData
-    {
-        ResultBuilder(assertType::Enum at, const char* file, int line, const char* expr,
-                      const char* exception_type = "", const char* exception_string = "");
-
-        void setResult(const Result& res);
-
-        template <int comparison, typename L, typename R>
-        DOCTEST_NOINLINE void binary_assert(const DOCTEST_REF_WRAP(L) lhs,
-                                            const DOCTEST_REF_WRAP(R) rhs) {
-            m_failed = !RelationalComparator<comparison, L, R>()(lhs, rhs);
-            if(m_failed || getContextOptions()->success)
-                m_decomp = stringifyBinaryExpr(lhs, ", ", rhs);
-        }
-
-        template <typename L>
-        DOCTEST_NOINLINE void unary_assert(const DOCTEST_REF_WRAP(L) val) {
-            m_failed = !val;
-
-            if(m_at & assertType::is_false) //!OCLINT bitwise operator in conditional
-                m_failed = !m_failed;
-
-            if(m_failed || getContextOptions()->success)
-                m_decomp = toString(val);
-        }
-
-        void translateException();
-
-        bool log();
-        void react() const;
-    };
-
-    namespace assertAction {
-        enum Enum
-        {
-            nothing     = 0,
-            dbgbreak    = 1,
-            shouldthrow = 2
-        };
-    } // namespace assertAction
-
-    DOCTEST_INTERFACE void failed_out_of_a_testing_context(const AssertData& ad);
-
-    DOCTEST_INTERFACE void decomp_assert(assertType::Enum at, const char* file, int line,
-                                         const char* expr, Result result);
-
-#define DOCTEST_ASSERT_OUT_OF_TESTS(decomp)                                                        \
-    do {                                                                                           \
-        if(!is_running_in_test) {                                                                  \
-            if(failed) {                                                                           \
-                ResultBuilder rb(at, file, line, expr);                                            \
-                rb.m_failed = failed;                                                              \
-                rb.m_decomp = decomp;                                                              \
-                failed_out_of_a_testing_context(rb);                                               \
-                if(isDebuggerActive() && !getContextOptions()->no_breaks)                          \
-                    DOCTEST_BREAK_INTO_DEBUGGER();                                                 \
-                if(checkIfShouldThrow(at))                                                         \
-                    throwException();                                                              \
-            }                                                                                      \
-            return;                                                                                \
-        }                                                                                          \
-    } while(false)
-
-#define DOCTEST_ASSERT_IN_TESTS(decomp)                                                            \
-    ResultBuilder rb(at, file, line, expr);                                                        \
-    rb.m_failed = failed;                                                                          \
-    if(rb.m_failed || getContextOptions()->success)                                                \
-        rb.m_decomp = decomp;                                                                      \
-    if(rb.log())                                                                                   \
-        DOCTEST_BREAK_INTO_DEBUGGER();                                                             \
-    if(rb.m_failed && checkIfShouldThrow(at))                                                      \
-    throwException()
-
-    template <int comparison, typename L, typename R>
-    DOCTEST_NOINLINE void binary_assert(assertType::Enum at, const char* file, int line,
-                                        const char* expr, const DOCTEST_REF_WRAP(L) lhs,
-                                        const DOCTEST_REF_WRAP(R) rhs) {
-        bool failed = !RelationalComparator<comparison, L, R>()(lhs, rhs);
-
-        // ###################################################################################
-        // IF THE DEBUGGER BREAKS HERE - GO 1 LEVEL UP IN THE CALLSTACK FOR THE FAILING ASSERT
-        // THIS IS THE EFFECT OF HAVING 'DOCTEST_CONFIG_SUPER_FAST_ASSERTS' DEFINED
-        // ###################################################################################
-        DOCTEST_ASSERT_OUT_OF_TESTS(stringifyBinaryExpr(lhs, ", ", rhs));
-        DOCTEST_ASSERT_IN_TESTS(stringifyBinaryExpr(lhs, ", ", rhs));
-    }
-
-    template <typename L>
-    DOCTEST_NOINLINE void unary_assert(assertType::Enum at, const char* file, int line,
-                                       const char* expr, const DOCTEST_REF_WRAP(L) val) {
-        bool failed = !val;
-
-        if(at & assertType::is_false) //!OCLINT bitwise operator in conditional
-            failed = !failed;
-
-        // ###################################################################################
-        // IF THE DEBUGGER BREAKS HERE - GO 1 LEVEL UP IN THE CALLSTACK FOR THE FAILING ASSERT
-        // THIS IS THE EFFECT OF HAVING 'DOCTEST_CONFIG_SUPER_FAST_ASSERTS' DEFINED
-        // ###################################################################################
-        DOCTEST_ASSERT_OUT_OF_TESTS(toString(val));
-        DOCTEST_ASSERT_IN_TESTS(toString(val));
-    }
-
-    struct DOCTEST_INTERFACE IExceptionTranslator
-    {
-        IExceptionTranslator();
-        virtual ~IExceptionTranslator();
-        virtual bool translate(String&) const = 0;
-    };
-
-    template <typename T>
-    class ExceptionTranslator : public IExceptionTranslator //!OCLINT destructor of virtual class
-    {
-    public:
-        explicit ExceptionTranslator(String (*translateFunction)(T))
-                : m_translateFunction(translateFunction) {}
-
-        bool translate(String& res) const override {
-#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS
-            try {
-                throw; // lgtm [cpp/rethrow-no-exception]
-                // cppcheck-suppress catchExceptionByValue
-            } catch(T ex) {                    // NOLINT
-                res = m_translateFunction(ex); //!OCLINT parameter reassignment
-                return true;
-            } catch(...) {}         //!OCLINT -  empty catch statement
-#endif                              // DOCTEST_CONFIG_NO_EXCEPTIONS
-            static_cast<void>(res); // to silence -Wunused-parameter
-            return false;
-        }
-
-    private:
-        String (*m_translateFunction)(T);
-    };
-
-    DOCTEST_INTERFACE void registerExceptionTranslatorImpl(const IExceptionTranslator* et);
-
-    template <bool C>
-    struct StringStreamBase
-    {
-        template <typename T>
-        static void convert(std::ostream* s, const T& in) {
-            *s << toString(in);
-        }
-
-        // always treat char* as a string in this context - no matter
-        // if DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING is defined
-        static void convert(std::ostream* s, const char* in) { *s << String(in); }
-    };
-
-    template <>
-    struct StringStreamBase<true>
-    {
-        template <typename T>
-        static void convert(std::ostream* s, const T& in) {
-            *s << in;
-        }
-    };
-
-    template <typename T>
-    struct StringStream : public StringStreamBase<has_insertion_operator<T>::value>
-    {};
-
-    template <typename T>
-    void toStream(std::ostream* s, const T& value) {
-        StringStream<T>::convert(s, value);
-    }
-
-#ifdef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-    DOCTEST_INTERFACE void toStream(std::ostream* s, char* in);
-    DOCTEST_INTERFACE void toStream(std::ostream* s, const char* in);
-#endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-    DOCTEST_INTERFACE void toStream(std::ostream* s, bool in);
-    DOCTEST_INTERFACE void toStream(std::ostream* s, float in);
-    DOCTEST_INTERFACE void toStream(std::ostream* s, double in);
-    DOCTEST_INTERFACE void toStream(std::ostream* s, double long in);
-
-    DOCTEST_INTERFACE void toStream(std::ostream* s, char in);
-    DOCTEST_INTERFACE void toStream(std::ostream* s, char signed in);
-    DOCTEST_INTERFACE void toStream(std::ostream* s, char unsigned in);
-    DOCTEST_INTERFACE void toStream(std::ostream* s, int short in);
-    DOCTEST_INTERFACE void toStream(std::ostream* s, int short unsigned in);
-    DOCTEST_INTERFACE void toStream(std::ostream* s, int in);
-    DOCTEST_INTERFACE void toStream(std::ostream* s, int unsigned in);
-    DOCTEST_INTERFACE void toStream(std::ostream* s, int long in);
-    DOCTEST_INTERFACE void toStream(std::ostream* s, int long unsigned in);
-    DOCTEST_INTERFACE void toStream(std::ostream* s, int long long in);
-    DOCTEST_INTERFACE void toStream(std::ostream* s, int long long unsigned in);
-
-    // ContextScope base class used to allow implementing methods of ContextScope 
-    // that don't depend on the template parameter in doctest.cpp.
-    class DOCTEST_INTERFACE ContextScopeBase : public IContextScope {
-    protected:
-        ContextScopeBase();
-
-        void destroy();
-    };
-
-    template <typename L> class ContextScope : public ContextScopeBase
-    {
-        const L &lambda_;
-
-    public:
-        explicit ContextScope(const L &lambda) : lambda_(lambda) {}
-
-        ContextScope(ContextScope &&other) : lambda_(other.lambda_) {}
-
-        void stringify(std::ostream* s) const override { lambda_(s); }
-
-        ~ContextScope() override { destroy(); }
-    };
-
-    struct DOCTEST_INTERFACE MessageBuilder : public MessageData
-    {
-        std::ostream* m_stream;
-
-        MessageBuilder(const char* file, int line, assertType::Enum severity);
-        MessageBuilder() = delete;
-        ~MessageBuilder();
-
-        // the preferred way of chaining parameters for stringification
-        template <typename T>
-        MessageBuilder& operator,(const T& in) {
-            toStream(m_stream, in);
-            return *this;
-        }
-
-        // kept here just for backwards-compatibility - the comma operator should be preferred now
-        template <typename T>
-        MessageBuilder& operator<<(const T& in) { return this->operator,(in); }
-
-        // the `,` operator has the lowest operator precedence - if `<<` is used by the user then
-        // the `,` operator will be called last which is not what we want and thus the `*` operator
-        // is used first (has higher operator precedence compared to `<<`) so that we guarantee that
-        // an operator of the MessageBuilder class is called first before the rest of the parameters
-        template <typename T>
-        MessageBuilder& operator*(const T& in) { return this->operator,(in); }
-
-        bool log();
-        void react();
-    };
-    
-    template <typename L>
-    ContextScope<L> MakeContextScope(const L &lambda) {
-        return ContextScope<L>(lambda);
-    }
-} // namespace detail
-
-#define DOCTEST_DEFINE_DECORATOR(name, type, def)                                                  \
-    struct name                                                                                    \
-    {                                                                                              \
-        type data;                                                                                 \
-        name(type in = def)                                                                        \
-                : data(in) {}                                                                      \
-        void fill(detail::TestCase& state) const { state.DOCTEST_CAT(m_, name) = data; }           \
-        void fill(detail::TestSuite& state) const { state.DOCTEST_CAT(m_, name) = data; }          \
-    }
-
-DOCTEST_DEFINE_DECORATOR(test_suite, const char*, "");
-DOCTEST_DEFINE_DECORATOR(description, const char*, "");
-DOCTEST_DEFINE_DECORATOR(skip, bool, true);
-DOCTEST_DEFINE_DECORATOR(timeout, double, 0);
-DOCTEST_DEFINE_DECORATOR(may_fail, bool, true);
-DOCTEST_DEFINE_DECORATOR(should_fail, bool, true);
-DOCTEST_DEFINE_DECORATOR(expected_failures, int, 0);
-
-template <typename T>
-int registerExceptionTranslator(String (*translateFunction)(T)) {
-    DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wexit-time-destructors")
-    static detail::ExceptionTranslator<T> exceptionTranslator(translateFunction);
-    DOCTEST_CLANG_SUPPRESS_WARNING_POP
-    detail::registerExceptionTranslatorImpl(&exceptionTranslator);
-    return 0;
-}
-
-} // namespace doctest
-
-// in a separate namespace outside of doctest because the DOCTEST_TEST_SUITE macro
-// introduces an anonymous namespace in which getCurrentTestSuite gets overridden
-namespace doctest_detail_test_suite_ns {
-DOCTEST_INTERFACE doctest::detail::TestSuite& getCurrentTestSuite();
-} // namespace doctest_detail_test_suite_ns
-
-namespace doctest {
-#else  // DOCTEST_CONFIG_DISABLE
-template <typename T>
-int registerExceptionTranslator(String (*)(T)) {
-    return 0;
-}
-#endif // DOCTEST_CONFIG_DISABLE
-
-namespace detail {
-    typedef void (*assert_handler)(const AssertData&);
-    struct ContextState;
-} // namespace detail
-
-class DOCTEST_INTERFACE Context
-{
-    detail::ContextState* p;
-
-    void parseArgs(int argc, const char* const* argv, bool withDefaults = false);
-
-public:
-    explicit Context(int argc = 0, const char* const* argv = nullptr);
-
-    ~Context();
-
-    void applyCommandLine(int argc, const char* const* argv);
-
-    void addFilter(const char* filter, const char* value);
-    void clearFilters();
-    void setOption(const char* option, int value);
-    void setOption(const char* option, const char* value);
-
-    bool shouldExit();
-
-    void setAsDefaultForAssertsOutOfTestCases();
-
-    void setAssertHandler(detail::assert_handler ah);
-
-    int run();
-};
-
-namespace TestCaseFailureReason {
-    enum Enum
-    {
-        None                     = 0,
-        AssertFailure            = 1,   // an assertion has failed in the test case
-        Exception                = 2,   // test case threw an exception
-        Crash                    = 4,   // a crash...
-        TooManyFailedAsserts     = 8,   // the abort-after option
-        Timeout                  = 16,  // see the timeout decorator
-        ShouldHaveFailedButDidnt = 32,  // see the should_fail decorator
-        ShouldHaveFailedAndDid   = 64,  // see the should_fail decorator
-        DidntFailExactlyNumTimes = 128, // see the expected_failures decorator
-        FailedExactlyNumTimes    = 256, // see the expected_failures decorator
-        CouldHaveFailedAndDid    = 512  // see the may_fail decorator
-    };
-} // namespace TestCaseFailureReason
-
-struct DOCTEST_INTERFACE CurrentTestCaseStats
-{
-    int    numAssertsCurrentTest;
-    int    numAssertsFailedCurrentTest;
-    double seconds;
-    int    failure_flags; // use TestCaseFailureReason::Enum
-};
-
-struct DOCTEST_INTERFACE TestCaseException
-{
-    String error_string;
-    bool   is_crash;
-};
-
-struct DOCTEST_INTERFACE TestRunStats
-{
-    unsigned numTestCases;
-    unsigned numTestCasesPassingFilters;
-    unsigned numTestSuitesPassingFilters;
-    unsigned numTestCasesFailed;
-    int      numAsserts;
-    int      numAssertsFailed;
-};
-
-struct QueryData
-{
-    const TestRunStats*  run_stats = nullptr;
-    const TestCaseData** data      = nullptr;
-    unsigned             num_data  = 0;
-};
-
-struct DOCTEST_INTERFACE IReporter
-{
-    // The constructor has to accept "const ContextOptions&" as a single argument
-    // which has most of the options for the run + a pointer to the stdout stream
-    // Reporter(const ContextOptions& in)
-
-    // called when a query should be reported (listing test cases, printing the version, etc.)
-    virtual void report_query(const QueryData&) = 0;
-
-    // called when the whole test run starts
-    virtual void test_run_start() = 0;
-    // called when the whole test run ends (caching a pointer to the input doesn't make sense here)
-    virtual void test_run_end(const TestRunStats&) = 0;
-
-    // called when a test case is started (safe to cache a pointer to the input)
-    virtual void test_case_start(const TestCaseData&) = 0;
-    // called when a test case is reentered because of unfinished subcases (safe to cache a pointer to the input)
-    virtual void test_case_reenter(const TestCaseData&) = 0;
-    // called when a test case has ended
-    virtual void test_case_end(const CurrentTestCaseStats&) = 0;
-
-    // called when an exception is thrown from the test case (or it crashes)
-    virtual void test_case_exception(const TestCaseException&) = 0;
-
-    // called whenever a subcase is entered (don't cache pointers to the input)
-    virtual void subcase_start(const SubcaseSignature&) = 0;
-    // called whenever a subcase is exited (don't cache pointers to the input)
-    virtual void subcase_end() = 0;
-
-    // called for each assert (don't cache pointers to the input)
-    virtual void log_assert(const AssertData&) = 0;
-    // called for each message (don't cache pointers to the input)
-    virtual void log_message(const MessageData&) = 0;
-
-    // called when a test case is skipped either because it doesn't pass the filters, has a skip decorator
-    // or isn't in the execution range (between first and last) (safe to cache a pointer to the input)
-    virtual void test_case_skipped(const TestCaseData&) = 0;
-
-    // doctest will not be managing the lifetimes of reporters given to it but this would still be nice to have
-    virtual ~IReporter();
-
-    // can obtain all currently active contexts and stringify them if one wishes to do so
-    static int                         get_num_active_contexts();
-    static const IContextScope* const* get_active_contexts();
-
-    // can iterate through contexts which have been stringified automatically in their destructors when an exception has been thrown
-    static int           get_num_stringified_contexts();
-    static const String* get_stringified_contexts();
-};
-
-namespace detail {
-    typedef IReporter* (*reporterCreatorFunc)(const ContextOptions&);
-
-    DOCTEST_INTERFACE void registerReporterImpl(const char* name, int prio, reporterCreatorFunc c, bool isReporter);
-
-    template <typename Reporter>
-    IReporter* reporterCreator(const ContextOptions& o) {
-        return new Reporter(o);
-    }
-} // namespace detail
-
-template <typename Reporter>
-int registerReporter(const char* name, int priority, bool isReporter) {
-    detail::registerReporterImpl(name, priority, detail::reporterCreator<Reporter>, isReporter);
-    return 0;
-}
-} // namespace doctest
-
-// if registering is not disabled
-#if !defined(DOCTEST_CONFIG_DISABLE)
-
-// common code in asserts - for convenience
-#define DOCTEST_ASSERT_LOG_AND_REACT(b)                                                            \
-    if(b.log())                                                                                    \
-        DOCTEST_BREAK_INTO_DEBUGGER();                                                             \
-    b.react()
-
-#ifdef DOCTEST_CONFIG_NO_TRY_CATCH_IN_ASSERTS
-#define DOCTEST_WRAP_IN_TRY(x) x;
-#else // DOCTEST_CONFIG_NO_TRY_CATCH_IN_ASSERTS
-#define DOCTEST_WRAP_IN_TRY(x)                                                                     \
-    try {                                                                                          \
-        x;                                                                                         \
-    } catch(...) { _DOCTEST_RB.translateException(); }
-#endif // DOCTEST_CONFIG_NO_TRY_CATCH_IN_ASSERTS
-
-#ifdef DOCTEST_CONFIG_VOID_CAST_EXPRESSIONS
-#define DOCTEST_CAST_TO_VOID(...)                                                                  \
-    DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH("-Wuseless-cast")                                       \
-    static_cast<void>(__VA_ARGS__);                                                                \
-    DOCTEST_GCC_SUPPRESS_WARNING_POP
-#else // DOCTEST_CONFIG_VOID_CAST_EXPRESSIONS
-#define DOCTEST_CAST_TO_VOID(...) __VA_ARGS__;
-#endif // DOCTEST_CONFIG_VOID_CAST_EXPRESSIONS
-
-// registers the test by initializing a dummy var with a function
-#define DOCTEST_REGISTER_FUNCTION(global_prefix, f, decorators)                                    \
-    global_prefix DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_ANONYMOUS(_DOCTEST_ANON_VAR_)) =              \
-            doctest::detail::regTest(                                                              \
-                    doctest::detail::TestCase(                                                     \
-                            f, __FILE__, __LINE__,                                                 \
-                            doctest_detail_test_suite_ns::getCurrentTestSuite()) *                 \
-                    decorators);                                                                   \
-    DOCTEST_GLOBAL_NO_WARNINGS_END()
-
-#define DOCTEST_IMPLEMENT_FIXTURE(der, base, func, decorators)                                     \
-    namespace {                                                                                    \
-        struct der : public base                                                                   \
-        {                                                                                          \
-            void f();                                                                              \
-        };                                                                                         \
-        static void func() {                                                                       \
-            der v;                                                                                 \
-            v.f();                                                                                 \
-        }                                                                                          \
-        DOCTEST_REGISTER_FUNCTION(DOCTEST_EMPTY, func, decorators)                                 \
-    }                                                                                              \
-    inline DOCTEST_NOINLINE void der::f()
-
-#define DOCTEST_CREATE_AND_REGISTER_FUNCTION(f, decorators)                                        \
-    static void f();                                                                               \
-    DOCTEST_REGISTER_FUNCTION(DOCTEST_EMPTY, f, decorators)                                        \
-    static void f()
-
-#define DOCTEST_CREATE_AND_REGISTER_FUNCTION_IN_CLASS(f, proxy, decorators)                        \
-    static doctest::detail::funcType proxy() { return f; }                                         \
-    DOCTEST_REGISTER_FUNCTION(inline const, proxy(), decorators)                                   \
-    static void f()
-
-// for registering tests
-#define DOCTEST_TEST_CASE(decorators)                                                              \
-    DOCTEST_CREATE_AND_REGISTER_FUNCTION(DOCTEST_ANONYMOUS(_DOCTEST_ANON_FUNC_), decorators)
-
-// for registering tests in classes - requires C++17 for inline variables!
-#if __cplusplus >= 201703L || (DOCTEST_MSVC >= DOCTEST_COMPILER(19, 12, 0) && _MSVC_LANG >= 201703L)
-#define DOCTEST_TEST_CASE_CLASS(decorators)                                                        \
-    DOCTEST_CREATE_AND_REGISTER_FUNCTION_IN_CLASS(DOCTEST_ANONYMOUS(_DOCTEST_ANON_FUNC_),          \
-                                                  DOCTEST_ANONYMOUS(_DOCTEST_ANON_PROXY_),         \
-                                                  decorators)
-#else // DOCTEST_TEST_CASE_CLASS
-#define DOCTEST_TEST_CASE_CLASS(...)                                                               \
-    TEST_CASES_CAN_BE_REGISTERED_IN_CLASSES_ONLY_IN_CPP17_MODE_OR_WITH_VS_2017_OR_NEWER
-#endif // DOCTEST_TEST_CASE_CLASS
-
-// for registering tests with a fixture
-#define DOCTEST_TEST_CASE_FIXTURE(c, decorators)                                                   \
-    DOCTEST_IMPLEMENT_FIXTURE(DOCTEST_ANONYMOUS(_DOCTEST_ANON_CLASS_), c,                          \
-                              DOCTEST_ANONYMOUS(_DOCTEST_ANON_FUNC_), decorators)
-
-// for converting types to strings without the <typeinfo> header and demangling
-#define DOCTEST_TYPE_TO_STRING_IMPL(...)                                                           \
-    template <>                                                                                    \
-    inline const char* type_to_string<__VA_ARGS__>() {                                             \
-        return "<" #__VA_ARGS__ ">";                                                               \
-    }
-#define DOCTEST_TYPE_TO_STRING(...)                                                                \
-    namespace doctest { namespace detail {                                                         \
-            DOCTEST_TYPE_TO_STRING_IMPL(__VA_ARGS__)                                               \
-        }                                                                                          \
-    }                                                                                              \
-    typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
-
-#define DOCTEST_TEST_CASE_TEMPLATE_DEFINE_IMPL(dec, T, iter, func)                                 \
-    template <typename T>                                                                          \
-    static void func();                                                                            \
-    namespace {                                                                                    \
-        template <typename Tuple>                                                                  \
-        struct iter;                                                                               \
-        template <typename Type, typename... Rest>                                                 \
-        struct iter<std::tuple<Type, Rest...>>                                                     \
-        {                                                                                          \
-            iter(const char* file, unsigned line, int index) {                                     \
-                doctest::detail::regTest(doctest::detail::TestCase(func<Type>, file, line,         \
-                                            doctest_detail_test_suite_ns::getCurrentTestSuite(),   \
-                                            doctest::detail::type_to_string<Type>(),               \
-                                            int(line) * 1000 + index)                              \
-                                         * dec);                                                   \
-                iter<std::tuple<Rest...>>(file, line, index + 1);                                  \
-            }                                                                                      \
-        };                                                                                         \
-        template <>                                                                                \
-        struct iter<std::tuple<>>                                                                  \
-        {                                                                                          \
-            iter(const char*, unsigned, int) {}                                                    \
-        };                                                                                         \
-    }                                                                                              \
-    template <typename T>                                                                          \
-    static void func()
-
-#define DOCTEST_TEST_CASE_TEMPLATE_DEFINE(dec, T, id)                                              \
-    DOCTEST_TEST_CASE_TEMPLATE_DEFINE_IMPL(dec, T, DOCTEST_CAT(id, ITERATOR),                      \
-                                           DOCTEST_ANONYMOUS(_DOCTEST_ANON_TMP_))
-
-#define DOCTEST_TEST_CASE_TEMPLATE_INSTANTIATE_IMPL(id, anon, ...)                                 \
-    DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_CAT(anon, DUMMY)) =                                         \
-        doctest::detail::instantiationHelper(DOCTEST_CAT(id, ITERATOR)<__VA_ARGS__>(__FILE__, __LINE__, 0));\
-    DOCTEST_GLOBAL_NO_WARNINGS_END()
-
-#define DOCTEST_TEST_CASE_TEMPLATE_INVOKE(id, ...)                                                 \
-    DOCTEST_TEST_CASE_TEMPLATE_INSTANTIATE_IMPL(id, DOCTEST_ANONYMOUS(_DOCTEST_ANON_TMP_), std::tuple<__VA_ARGS__>) \
-    typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
-
-#define DOCTEST_TEST_CASE_TEMPLATE_APPLY(id, ...)                                                  \
-    DOCTEST_TEST_CASE_TEMPLATE_INSTANTIATE_IMPL(id, DOCTEST_ANONYMOUS(_DOCTEST_ANON_TMP_), __VA_ARGS__) \
-    typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
-
-#define DOCTEST_TEST_CASE_TEMPLATE_IMPL(dec, T, anon, ...)                                         \
-    DOCTEST_TEST_CASE_TEMPLATE_DEFINE_IMPL(dec, T, DOCTEST_CAT(anon, ITERATOR), anon);             \
-    DOCTEST_TEST_CASE_TEMPLATE_INSTANTIATE_IMPL(anon, anon, std::tuple<__VA_ARGS__>)               \
-    template <typename T>                                                                          \
-    static void anon()
-
-#define DOCTEST_TEST_CASE_TEMPLATE(dec, T, ...)                                                    \
-    DOCTEST_TEST_CASE_TEMPLATE_IMPL(dec, T, DOCTEST_ANONYMOUS(_DOCTEST_ANON_TMP_), __VA_ARGS__)
-
-// for subcases
-#define DOCTEST_SUBCASE(name)                                                                      \
-    if(const doctest::detail::Subcase & DOCTEST_ANONYMOUS(_DOCTEST_ANON_SUBCASE_) DOCTEST_UNUSED = \
-               doctest::detail::Subcase(name, __FILE__, __LINE__))
-
-// for grouping tests in test suites by using code blocks
-#define DOCTEST_TEST_SUITE_IMPL(decorators, ns_name)                                               \
-    namespace ns_name { namespace doctest_detail_test_suite_ns {                                   \
-            static DOCTEST_NOINLINE doctest::detail::TestSuite& getCurrentTestSuite() {            \
-                DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4640)                                      \
-                DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wexit-time-destructors")                \
-                static doctest::detail::TestSuite data;                                            \
-                static bool                       inited = false;                                  \
-                DOCTEST_MSVC_SUPPRESS_WARNING_POP                                                  \
-                DOCTEST_CLANG_SUPPRESS_WARNING_POP                                                 \
-                if(!inited) {                                                                      \
-                    data* decorators;                                                              \
-                    inited = true;                                                                 \
-                }                                                                                  \
-                return data;                                                                       \
-            }                                                                                      \
-        }                                                                                          \
-    }                                                                                              \
-    namespace ns_name
-
-#define DOCTEST_TEST_SUITE(decorators)                                                             \
-    DOCTEST_TEST_SUITE_IMPL(decorators, DOCTEST_ANONYMOUS(_DOCTEST_ANON_SUITE_))
-
-// for starting a testsuite block
-#define DOCTEST_TEST_SUITE_BEGIN(decorators)                                                       \
-    DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_ANONYMOUS(_DOCTEST_ANON_VAR_)) =                            \
-            doctest::detail::setTestSuite(doctest::detail::TestSuite() * decorators);              \
-    DOCTEST_GLOBAL_NO_WARNINGS_END()                                                               \
-    typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
-
-// for ending a testsuite block
-#define DOCTEST_TEST_SUITE_END                                                                     \
-    DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_ANONYMOUS(_DOCTEST_ANON_VAR_)) =                            \
-            doctest::detail::setTestSuite(doctest::detail::TestSuite() * "");                      \
-    DOCTEST_GLOBAL_NO_WARNINGS_END()                                                               \
-    typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
-
-// for registering exception translators
-#define DOCTEST_REGISTER_EXCEPTION_TRANSLATOR_IMPL(translatorName, signature)                      \
-    inline doctest::String translatorName(signature);                                              \
-    DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_ANONYMOUS(_DOCTEST_ANON_TRANSLATOR_)) =                     \
-            doctest::registerExceptionTranslator(translatorName);                                  \
-    DOCTEST_GLOBAL_NO_WARNINGS_END()                                                               \
-    doctest::String translatorName(signature)
-
-#define DOCTEST_REGISTER_EXCEPTION_TRANSLATOR(signature)                                           \
-    DOCTEST_REGISTER_EXCEPTION_TRANSLATOR_IMPL(DOCTEST_ANONYMOUS(_DOCTEST_ANON_TRANSLATOR_),       \
-                                               signature)
-
-// for registering reporters
-#define DOCTEST_REGISTER_REPORTER(name, priority, reporter)                                        \
-    DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_ANONYMOUS(_DOCTEST_ANON_REPORTER_)) =                       \
-            doctest::registerReporter<reporter>(name, priority, true);                             \
-    DOCTEST_GLOBAL_NO_WARNINGS_END() typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
-
-// for registering listeners
-#define DOCTEST_REGISTER_LISTENER(name, priority, reporter)                                        \
-    DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_ANONYMOUS(_DOCTEST_ANON_REPORTER_)) =                       \
-            doctest::registerReporter<reporter>(name, priority, false);                            \
-    DOCTEST_GLOBAL_NO_WARNINGS_END() typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
-
-// for logging
-#define DOCTEST_INFO(...)                                                                          \
-    DOCTEST_INFO_IMPL(DOCTEST_ANONYMOUS(_DOCTEST_CAPTURE_), DOCTEST_ANONYMOUS(_DOCTEST_CAPTURE_),  \
-                      DOCTEST_ANONYMOUS(_DOCTEST_CAPTURE_), __VA_ARGS__)
-
-#define DOCTEST_INFO_IMPL(lambda_name, mb_name, s_name, ...)                                       \
-    DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4626)                                                  \
-    auto lambda_name = [&](std::ostream* s_name) {                                                 \
-        doctest::detail::MessageBuilder mb_name(__FILE__, __LINE__, doctest::assertType::is_warn); \
-        mb_name.m_stream = s_name;                                                                 \
-        mb_name * __VA_ARGS__;                                                                     \
-    };                                                                                             \
-    DOCTEST_MSVC_SUPPRESS_WARNING_POP                                                              \
-    auto DOCTEST_ANONYMOUS(_DOCTEST_CAPTURE_) = doctest::detail::MakeContextScope(lambda_name)
-
-#define DOCTEST_CAPTURE(x) DOCTEST_INFO(#x " := ", x)
-
-#define DOCTEST_ADD_AT_IMPL(type, file, line, mb, ...)                                             \
-    do {                                                                                           \
-        doctest::detail::MessageBuilder mb(file, line, doctest::assertType::type);                 \
-        mb * __VA_ARGS__;                                                                          \
-        DOCTEST_ASSERT_LOG_AND_REACT(mb);                                                          \
-    } while(false)
-
-// clang-format off
-#define DOCTEST_ADD_MESSAGE_AT(file, line, ...) DOCTEST_ADD_AT_IMPL(is_warn, file, line, DOCTEST_ANONYMOUS(_DOCTEST_MESSAGE_), __VA_ARGS__)
-#define DOCTEST_ADD_FAIL_CHECK_AT(file, line, ...) DOCTEST_ADD_AT_IMPL(is_check, file, line, DOCTEST_ANONYMOUS(_DOCTEST_MESSAGE_), __VA_ARGS__)
-#define DOCTEST_ADD_FAIL_AT(file, line, ...) DOCTEST_ADD_AT_IMPL(is_require, file, line, DOCTEST_ANONYMOUS(_DOCTEST_MESSAGE_), __VA_ARGS__)
-// clang-format on
-
-#define DOCTEST_MESSAGE(...) DOCTEST_ADD_MESSAGE_AT(__FILE__, __LINE__, __VA_ARGS__)
-#define DOCTEST_FAIL_CHECK(...) DOCTEST_ADD_FAIL_CHECK_AT(__FILE__, __LINE__, __VA_ARGS__)
-#define DOCTEST_FAIL(...) DOCTEST_ADD_FAIL_AT(__FILE__, __LINE__, __VA_ARGS__)
-
-#define DOCTEST_TO_LVALUE(...) __VA_ARGS__ // Not removed to keep backwards compatibility.
-
-#ifndef DOCTEST_CONFIG_SUPER_FAST_ASSERTS
-
-#define DOCTEST_ASSERT_IMPLEMENT_2(assert_type, ...)                                               \
-    DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Woverloaded-shift-op-parentheses")                  \
-    doctest::detail::ResultBuilder _DOCTEST_RB(doctest::assertType::assert_type, __FILE__,         \
-                                               __LINE__, #__VA_ARGS__);                            \
-    DOCTEST_WRAP_IN_TRY(_DOCTEST_RB.setResult(                                                     \
-            doctest::detail::ExpressionDecomposer(doctest::assertType::assert_type)                \
-            << __VA_ARGS__))                                                                       \
-    DOCTEST_ASSERT_LOG_AND_REACT(_DOCTEST_RB)                                                      \
-    DOCTEST_CLANG_SUPPRESS_WARNING_POP
-
-#define DOCTEST_ASSERT_IMPLEMENT_1(assert_type, ...)                                               \
-    do {                                                                                           \
-        DOCTEST_ASSERT_IMPLEMENT_2(assert_type, __VA_ARGS__);                                      \
-    } while(false)
-
-#else // DOCTEST_CONFIG_SUPER_FAST_ASSERTS
-
-// necessary for <ASSERT>_MESSAGE
-#define DOCTEST_ASSERT_IMPLEMENT_2 DOCTEST_ASSERT_IMPLEMENT_1
-
-#define DOCTEST_ASSERT_IMPLEMENT_1(assert_type, ...)                                               \
-    DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Woverloaded-shift-op-parentheses")                  \
-    doctest::detail::decomp_assert(                                                                \
-            doctest::assertType::assert_type, __FILE__, __LINE__, #__VA_ARGS__,                    \
-            doctest::detail::ExpressionDecomposer(doctest::assertType::assert_type)                \
-                    << __VA_ARGS__) DOCTEST_CLANG_SUPPRESS_WARNING_POP
-
-#endif // DOCTEST_CONFIG_SUPER_FAST_ASSERTS
-
-#define DOCTEST_WARN(...) DOCTEST_ASSERT_IMPLEMENT_1(DT_WARN, __VA_ARGS__)
-#define DOCTEST_CHECK(...) DOCTEST_ASSERT_IMPLEMENT_1(DT_CHECK, __VA_ARGS__)
-#define DOCTEST_REQUIRE(...) DOCTEST_ASSERT_IMPLEMENT_1(DT_REQUIRE, __VA_ARGS__)
-#define DOCTEST_WARN_FALSE(...) DOCTEST_ASSERT_IMPLEMENT_1(DT_WARN_FALSE, __VA_ARGS__)
-#define DOCTEST_CHECK_FALSE(...) DOCTEST_ASSERT_IMPLEMENT_1(DT_CHECK_FALSE, __VA_ARGS__)
-#define DOCTEST_REQUIRE_FALSE(...) DOCTEST_ASSERT_IMPLEMENT_1(DT_REQUIRE_FALSE, __VA_ARGS__)
-
-// clang-format off
-#define DOCTEST_WARN_MESSAGE(cond, ...) do { DOCTEST_INFO(__VA_ARGS__); DOCTEST_ASSERT_IMPLEMENT_2(DT_WARN, cond); } while(false)
-#define DOCTEST_CHECK_MESSAGE(cond, ...) do { DOCTEST_INFO(__VA_ARGS__); DOCTEST_ASSERT_IMPLEMENT_2(DT_CHECK, cond); } while(false)
-#define DOCTEST_REQUIRE_MESSAGE(cond, ...) do { DOCTEST_INFO(__VA_ARGS__); DOCTEST_ASSERT_IMPLEMENT_2(DT_REQUIRE, cond); } while(false)
-#define DOCTEST_WARN_FALSE_MESSAGE(cond, ...) do { DOCTEST_INFO(__VA_ARGS__); DOCTEST_ASSERT_IMPLEMENT_2(DT_WARN_FALSE, cond); } while(false)
-#define DOCTEST_CHECK_FALSE_MESSAGE(cond, ...) do { DOCTEST_INFO(__VA_ARGS__); DOCTEST_ASSERT_IMPLEMENT_2(DT_CHECK_FALSE, cond); } while(false)
-#define DOCTEST_REQUIRE_FALSE_MESSAGE(cond, ...) do { DOCTEST_INFO(__VA_ARGS__); DOCTEST_ASSERT_IMPLEMENT_2(DT_REQUIRE_FALSE, cond); } while(false)
-// clang-format on
-
-#define DOCTEST_ASSERT_THROWS_AS(expr, assert_type, message, ...)                                  \
-    do {                                                                                           \
-        if(!doctest::getContextOptions()->no_throw) {                                              \
-            doctest::detail::ResultBuilder _DOCTEST_RB(doctest::assertType::assert_type, __FILE__, \
-                                                       __LINE__, #expr, #__VA_ARGS__, message);    \
-            try {                                                                                  \
-                DOCTEST_CAST_TO_VOID(expr)                                                         \
-            } catch(const typename doctest::detail::remove_const<                                  \
-                    typename doctest::detail::remove_reference<__VA_ARGS__>::type>::type&) {       \
-                _DOCTEST_RB.translateException();                                                  \
-                _DOCTEST_RB.m_threw_as = true;                                                     \
-            } catch(...) { _DOCTEST_RB.translateException(); }                                     \
-            DOCTEST_ASSERT_LOG_AND_REACT(_DOCTEST_RB);                                             \
-        }                                                                                          \
-    } while(false)
-
-#define DOCTEST_ASSERT_THROWS_WITH(expr, expr_str, assert_type, ...)                               \
-    do {                                                                                           \
-        if(!doctest::getContextOptions()->no_throw) {                                              \
-            doctest::detail::ResultBuilder _DOCTEST_RB(doctest::assertType::assert_type, __FILE__, \
-                                                       __LINE__, expr_str, "", __VA_ARGS__);       \
-            try {                                                                                  \
-                DOCTEST_CAST_TO_VOID(expr)                                                         \
-            } catch(...) { _DOCTEST_RB.translateException(); }                                     \
-            DOCTEST_ASSERT_LOG_AND_REACT(_DOCTEST_RB);                                             \
-        }                                                                                          \
-    } while(false)
-
-#define DOCTEST_ASSERT_NOTHROW(assert_type, ...)                                                   \
-    do {                                                                                           \
-        doctest::detail::ResultBuilder _DOCTEST_RB(doctest::assertType::assert_type, __FILE__,     \
-                                                   __LINE__, #__VA_ARGS__);                        \
-        try {                                                                                      \
-            DOCTEST_CAST_TO_VOID(__VA_ARGS__)                                                      \
-        } catch(...) { _DOCTEST_RB.translateException(); }                                         \
-        DOCTEST_ASSERT_LOG_AND_REACT(_DOCTEST_RB);                                                 \
-    } while(false)
-
-// clang-format off
-#define DOCTEST_WARN_THROWS(...) DOCTEST_ASSERT_THROWS_WITH((__VA_ARGS__), #__VA_ARGS__, DT_WARN_THROWS, "")
-#define DOCTEST_CHECK_THROWS(...) DOCTEST_ASSERT_THROWS_WITH((__VA_ARGS__), #__VA_ARGS__, DT_CHECK_THROWS, "")
-#define DOCTEST_REQUIRE_THROWS(...) DOCTEST_ASSERT_THROWS_WITH((__VA_ARGS__), #__VA_ARGS__, DT_REQUIRE_THROWS, "")
-
-#define DOCTEST_WARN_THROWS_AS(expr, ...) DOCTEST_ASSERT_THROWS_AS(expr, DT_WARN_THROWS_AS, "", __VA_ARGS__)
-#define DOCTEST_CHECK_THROWS_AS(expr, ...) DOCTEST_ASSERT_THROWS_AS(expr, DT_CHECK_THROWS_AS, "", __VA_ARGS__)
-#define DOCTEST_REQUIRE_THROWS_AS(expr, ...) DOCTEST_ASSERT_THROWS_AS(expr, DT_REQUIRE_THROWS_AS, "", __VA_ARGS__)
-
-#define DOCTEST_WARN_THROWS_WITH(expr, ...) DOCTEST_ASSERT_THROWS_WITH(expr, #expr, DT_WARN_THROWS_WITH, __VA_ARGS__)
-#define DOCTEST_CHECK_THROWS_WITH(expr, ...) DOCTEST_ASSERT_THROWS_WITH(expr, #expr, DT_CHECK_THROWS_WITH, __VA_ARGS__)
-#define DOCTEST_REQUIRE_THROWS_WITH(expr, ...) DOCTEST_ASSERT_THROWS_WITH(expr, #expr, DT_REQUIRE_THROWS_WITH, __VA_ARGS__)
-
-#define DOCTEST_WARN_THROWS_WITH_AS(expr, message, ...) DOCTEST_ASSERT_THROWS_AS(expr, DT_WARN_THROWS_WITH_AS, message, __VA_ARGS__)
-#define DOCTEST_CHECK_THROWS_WITH_AS(expr, message, ...) DOCTEST_ASSERT_THROWS_AS(expr, DT_CHECK_THROWS_WITH_AS, message, __VA_ARGS__)
-#define DOCTEST_REQUIRE_THROWS_WITH_AS(expr, message, ...) DOCTEST_ASSERT_THROWS_AS(expr, DT_REQUIRE_THROWS_WITH_AS, message, __VA_ARGS__)
-
-#define DOCTEST_WARN_NOTHROW(...) DOCTEST_ASSERT_NOTHROW(DT_WARN_NOTHROW, __VA_ARGS__)
-#define DOCTEST_CHECK_NOTHROW(...) DOCTEST_ASSERT_NOTHROW(DT_CHECK_NOTHROW, __VA_ARGS__)
-#define DOCTEST_REQUIRE_NOTHROW(...) DOCTEST_ASSERT_NOTHROW(DT_REQUIRE_NOTHROW, __VA_ARGS__)
-
-#define DOCTEST_WARN_THROWS_MESSAGE(expr, ...) do { DOCTEST_INFO(__VA_ARGS__); DOCTEST_WARN_THROWS(expr); } while(false)
-#define DOCTEST_CHECK_THROWS_MESSAGE(expr, ...) do { DOCTEST_INFO(__VA_ARGS__); DOCTEST_CHECK_THROWS(expr); } while(false)
-#define DOCTEST_REQUIRE_THROWS_MESSAGE(expr, ...) do { DOCTEST_INFO(__VA_ARGS__); DOCTEST_REQUIRE_THROWS(expr); } while(false)
-#define DOCTEST_WARN_THROWS_AS_MESSAGE(expr, ex, ...) do { DOCTEST_INFO(__VA_ARGS__); DOCTEST_WARN_THROWS_AS(expr, ex); } while(false)
-#define DOCTEST_CHECK_THROWS_AS_MESSAGE(expr, ex, ...) do { DOCTEST_INFO(__VA_ARGS__); DOCTEST_CHECK_THROWS_AS(expr, ex); } while(false)
-#define DOCTEST_REQUIRE_THROWS_AS_MESSAGE(expr, ex, ...) do { DOCTEST_INFO(__VA_ARGS__); DOCTEST_REQUIRE_THROWS_AS(expr, ex); } while(false)
-#define DOCTEST_WARN_THROWS_WITH_MESSAGE(expr, with, ...) do { DOCTEST_INFO(__VA_ARGS__); DOCTEST_WARN_THROWS_WITH(expr, with); } while(false)
-#define DOCTEST_CHECK_THROWS_WITH_MESSAGE(expr, with, ...) do { DOCTEST_INFO(__VA_ARGS__); DOCTEST_CHECK_THROWS_WITH(expr, with); } while(false)
-#define DOCTEST_REQUIRE_THROWS_WITH_MESSAGE(expr, with, ...) do { DOCTEST_INFO(__VA_ARGS__); DOCTEST_REQUIRE_THROWS_WITH(expr, with); } while(false)
-#define DOCTEST_WARN_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) do { DOCTEST_INFO(__VA_ARGS__); DOCTEST_WARN_THROWS_WITH_AS(expr, with, ex); } while(false)
-#define DOCTEST_CHECK_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) do { DOCTEST_INFO(__VA_ARGS__); DOCTEST_CHECK_THROWS_WITH_AS(expr, with, ex); } while(false)
-#define DOCTEST_REQUIRE_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) do { DOCTEST_INFO(__VA_ARGS__); DOCTEST_REQUIRE_THROWS_WITH_AS(expr, with, ex); } while(false)
-#define DOCTEST_WARN_NOTHROW_MESSAGE(expr, ...) do { DOCTEST_INFO(__VA_ARGS__); DOCTEST_WARN_NOTHROW(expr); } while(false)
-#define DOCTEST_CHECK_NOTHROW_MESSAGE(expr, ...) do { DOCTEST_INFO(__VA_ARGS__); DOCTEST_CHECK_NOTHROW(expr); } while(false)
-#define DOCTEST_REQUIRE_NOTHROW_MESSAGE(expr, ...) do { DOCTEST_INFO(__VA_ARGS__); DOCTEST_REQUIRE_NOTHROW(expr); } while(false)
-// clang-format on
-
-#ifndef DOCTEST_CONFIG_SUPER_FAST_ASSERTS
-
-#define DOCTEST_BINARY_ASSERT(assert_type, comp, ...)                                              \
-    do {                                                                                           \
-        doctest::detail::ResultBuilder _DOCTEST_RB(doctest::assertType::assert_type, __FILE__,     \
-                                                   __LINE__, #__VA_ARGS__);                        \
-        DOCTEST_WRAP_IN_TRY(                                                                       \
-                _DOCTEST_RB.binary_assert<doctest::detail::binaryAssertComparison::comp>(          \
-                        __VA_ARGS__))                                                              \
-        DOCTEST_ASSERT_LOG_AND_REACT(_DOCTEST_RB);                                                 \
-    } while(false)
-
-#define DOCTEST_UNARY_ASSERT(assert_type, ...)                                                     \
-    do {                                                                                           \
-        doctest::detail::ResultBuilder _DOCTEST_RB(doctest::assertType::assert_type, __FILE__,     \
-                                                   __LINE__, #__VA_ARGS__);                        \
-        DOCTEST_WRAP_IN_TRY(_DOCTEST_RB.unary_assert(__VA_ARGS__))                                 \
-        DOCTEST_ASSERT_LOG_AND_REACT(_DOCTEST_RB);                                                 \
-    } while(false)
-
-#else // DOCTEST_CONFIG_SUPER_FAST_ASSERTS
-
-#define DOCTEST_BINARY_ASSERT(assert_type, comparison, ...)                                        \
-    doctest::detail::binary_assert<doctest::detail::binaryAssertComparison::comparison>(           \
-            doctest::assertType::assert_type, __FILE__, __LINE__, #__VA_ARGS__, __VA_ARGS__)
-
-#define DOCTEST_UNARY_ASSERT(assert_type, ...)                                                     \
-    doctest::detail::unary_assert(doctest::assertType::assert_type, __FILE__, __LINE__,            \
-                                  #__VA_ARGS__, __VA_ARGS__)
-
-#endif // DOCTEST_CONFIG_SUPER_FAST_ASSERTS
-
-#define DOCTEST_WARN_EQ(...) DOCTEST_BINARY_ASSERT(DT_WARN_EQ, eq, __VA_ARGS__)
-#define DOCTEST_CHECK_EQ(...) DOCTEST_BINARY_ASSERT(DT_CHECK_EQ, eq, __VA_ARGS__)
-#define DOCTEST_REQUIRE_EQ(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_EQ, eq, __VA_ARGS__)
-#define DOCTEST_WARN_NE(...) DOCTEST_BINARY_ASSERT(DT_WARN_NE, ne, __VA_ARGS__)
-#define DOCTEST_CHECK_NE(...) DOCTEST_BINARY_ASSERT(DT_CHECK_NE, ne, __VA_ARGS__)
-#define DOCTEST_REQUIRE_NE(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_NE, ne, __VA_ARGS__)
-#define DOCTEST_WARN_GT(...) DOCTEST_BINARY_ASSERT(DT_WARN_GT, gt, __VA_ARGS__)
-#define DOCTEST_CHECK_GT(...) DOCTEST_BINARY_ASSERT(DT_CHECK_GT, gt, __VA_ARGS__)
-#define DOCTEST_REQUIRE_GT(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_GT, gt, __VA_ARGS__)
-#define DOCTEST_WARN_LT(...) DOCTEST_BINARY_ASSERT(DT_WARN_LT, lt, __VA_ARGS__)
-#define DOCTEST_CHECK_LT(...) DOCTEST_BINARY_ASSERT(DT_CHECK_LT, lt, __VA_ARGS__)
-#define DOCTEST_REQUIRE_LT(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_LT, lt, __VA_ARGS__)
-#define DOCTEST_WARN_GE(...) DOCTEST_BINARY_ASSERT(DT_WARN_GE, ge, __VA_ARGS__)
-#define DOCTEST_CHECK_GE(...) DOCTEST_BINARY_ASSERT(DT_CHECK_GE, ge, __VA_ARGS__)
-#define DOCTEST_REQUIRE_GE(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_GE, ge, __VA_ARGS__)
-#define DOCTEST_WARN_LE(...) DOCTEST_BINARY_ASSERT(DT_WARN_LE, le, __VA_ARGS__)
-#define DOCTEST_CHECK_LE(...) DOCTEST_BINARY_ASSERT(DT_CHECK_LE, le, __VA_ARGS__)
-#define DOCTEST_REQUIRE_LE(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_LE, le, __VA_ARGS__)
-
-#define DOCTEST_WARN_UNARY(...) DOCTEST_UNARY_ASSERT(DT_WARN_UNARY, __VA_ARGS__)
-#define DOCTEST_CHECK_UNARY(...) DOCTEST_UNARY_ASSERT(DT_CHECK_UNARY, __VA_ARGS__)
-#define DOCTEST_REQUIRE_UNARY(...) DOCTEST_UNARY_ASSERT(DT_REQUIRE_UNARY, __VA_ARGS__)
-#define DOCTEST_WARN_UNARY_FALSE(...) DOCTEST_UNARY_ASSERT(DT_WARN_UNARY_FALSE, __VA_ARGS__)
-#define DOCTEST_CHECK_UNARY_FALSE(...) DOCTEST_UNARY_ASSERT(DT_CHECK_UNARY_FALSE, __VA_ARGS__)
-#define DOCTEST_REQUIRE_UNARY_FALSE(...) DOCTEST_UNARY_ASSERT(DT_REQUIRE_UNARY_FALSE, __VA_ARGS__)
-
-#ifdef DOCTEST_CONFIG_NO_EXCEPTIONS
-
-#undef DOCTEST_WARN_THROWS
-#undef DOCTEST_CHECK_THROWS
-#undef DOCTEST_REQUIRE_THROWS
-#undef DOCTEST_WARN_THROWS_AS
-#undef DOCTEST_CHECK_THROWS_AS
-#undef DOCTEST_REQUIRE_THROWS_AS
-#undef DOCTEST_WARN_THROWS_WITH
-#undef DOCTEST_CHECK_THROWS_WITH
-#undef DOCTEST_REQUIRE_THROWS_WITH
-#undef DOCTEST_WARN_THROWS_WITH_AS
-#undef DOCTEST_CHECK_THROWS_WITH_AS
-#undef DOCTEST_REQUIRE_THROWS_WITH_AS
-#undef DOCTEST_WARN_NOTHROW
-#undef DOCTEST_CHECK_NOTHROW
-#undef DOCTEST_REQUIRE_NOTHROW
-
-#undef DOCTEST_WARN_THROWS_MESSAGE
-#undef DOCTEST_CHECK_THROWS_MESSAGE
-#undef DOCTEST_REQUIRE_THROWS_MESSAGE
-#undef DOCTEST_WARN_THROWS_AS_MESSAGE
-#undef DOCTEST_CHECK_THROWS_AS_MESSAGE
-#undef DOCTEST_REQUIRE_THROWS_AS_MESSAGE
-#undef DOCTEST_WARN_THROWS_WITH_MESSAGE
-#undef DOCTEST_CHECK_THROWS_WITH_MESSAGE
-#undef DOCTEST_REQUIRE_THROWS_WITH_MESSAGE
-#undef DOCTEST_WARN_THROWS_WITH_AS_MESSAGE
-#undef DOCTEST_CHECK_THROWS_WITH_AS_MESSAGE
-#undef DOCTEST_REQUIRE_THROWS_WITH_AS_MESSAGE
-#undef DOCTEST_WARN_NOTHROW_MESSAGE
-#undef DOCTEST_CHECK_NOTHROW_MESSAGE
-#undef DOCTEST_REQUIRE_NOTHROW_MESSAGE
-
-#ifdef DOCTEST_CONFIG_NO_EXCEPTIONS_BUT_WITH_ALL_ASSERTS
-
-#define DOCTEST_WARN_THROWS(...) (static_cast<void>(0))
-#define DOCTEST_CHECK_THROWS(...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_THROWS(...) (static_cast<void>(0))
-#define DOCTEST_WARN_THROWS_AS(expr, ...) (static_cast<void>(0))
-#define DOCTEST_CHECK_THROWS_AS(expr, ...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_THROWS_AS(expr, ...) (static_cast<void>(0))
-#define DOCTEST_WARN_THROWS_WITH(expr, ...) (static_cast<void>(0))
-#define DOCTEST_CHECK_THROWS_WITH(expr, ...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_THROWS_WITH(expr, ...) (static_cast<void>(0))
-#define DOCTEST_WARN_THROWS_WITH_AS(expr, with, ...) (static_cast<void>(0))
-#define DOCTEST_CHECK_THROWS_WITH_AS(expr, with, ...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_THROWS_WITH_AS(expr, with, ...) (static_cast<void>(0))
-#define DOCTEST_WARN_NOTHROW(...) (static_cast<void>(0))
-#define DOCTEST_CHECK_NOTHROW(...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_NOTHROW(...) (static_cast<void>(0))
-
-#define DOCTEST_WARN_THROWS_MESSAGE(expr, ...) (static_cast<void>(0))
-#define DOCTEST_CHECK_THROWS_MESSAGE(expr, ...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_THROWS_MESSAGE(expr, ...) (static_cast<void>(0))
-#define DOCTEST_WARN_THROWS_AS_MESSAGE(expr, ex, ...) (static_cast<void>(0))
-#define DOCTEST_CHECK_THROWS_AS_MESSAGE(expr, ex, ...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_THROWS_AS_MESSAGE(expr, ex, ...) (static_cast<void>(0))
-#define DOCTEST_WARN_THROWS_WITH_MESSAGE(expr, with, ...) (static_cast<void>(0))
-#define DOCTEST_CHECK_THROWS_WITH_MESSAGE(expr, with, ...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_THROWS_WITH_MESSAGE(expr, with, ...) (static_cast<void>(0))
-#define DOCTEST_WARN_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) (static_cast<void>(0))
-#define DOCTEST_CHECK_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) (static_cast<void>(0))
-#define DOCTEST_WARN_NOTHROW_MESSAGE(expr, ...) (static_cast<void>(0))
-#define DOCTEST_CHECK_NOTHROW_MESSAGE(expr, ...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_NOTHROW_MESSAGE(expr, ...) (static_cast<void>(0))
-
-#else // DOCTEST_CONFIG_NO_EXCEPTIONS_BUT_WITH_ALL_ASSERTS
-
-#undef DOCTEST_REQUIRE
-#undef DOCTEST_REQUIRE_FALSE
-#undef DOCTEST_REQUIRE_MESSAGE
-#undef DOCTEST_REQUIRE_FALSE_MESSAGE
-#undef DOCTEST_REQUIRE_EQ
-#undef DOCTEST_REQUIRE_NE
-#undef DOCTEST_REQUIRE_GT
-#undef DOCTEST_REQUIRE_LT
-#undef DOCTEST_REQUIRE_GE
-#undef DOCTEST_REQUIRE_LE
-#undef DOCTEST_REQUIRE_UNARY
-#undef DOCTEST_REQUIRE_UNARY_FALSE
-
-#endif // DOCTEST_CONFIG_NO_EXCEPTIONS_BUT_WITH_ALL_ASSERTS
-
-#endif // DOCTEST_CONFIG_NO_EXCEPTIONS
-
-// =================================================================================================
-// == WHAT FOLLOWS IS VERSIONS OF THE MACROS THAT DO NOT DO ANY REGISTERING!                      ==
-// == THIS CAN BE ENABLED BY DEFINING DOCTEST_CONFIG_DISABLE GLOBALLY!                            ==
-// =================================================================================================
-#else // DOCTEST_CONFIG_DISABLE
-
-#define DOCTEST_IMPLEMENT_FIXTURE(der, base, func, name)                                           \
-    namespace {                                                                                    \
-        template <typename DOCTEST_UNUSED_TEMPLATE_TYPE>                                           \
-        struct der : public base                                                                   \
-        { void f(); };                                                                             \
-    }                                                                                              \
-    template <typename DOCTEST_UNUSED_TEMPLATE_TYPE>                                               \
-    inline void der<DOCTEST_UNUSED_TEMPLATE_TYPE>::f()
-
-#define DOCTEST_CREATE_AND_REGISTER_FUNCTION(f, name)                                              \
-    template <typename DOCTEST_UNUSED_TEMPLATE_TYPE>                                               \
-    static inline void f()
-
-// for registering tests
-#define DOCTEST_TEST_CASE(name)                                                                    \
-    DOCTEST_CREATE_AND_REGISTER_FUNCTION(DOCTEST_ANONYMOUS(_DOCTEST_ANON_FUNC_), name)
-
-// for registering tests in classes
-#define DOCTEST_TEST_CASE_CLASS(name)                                                              \
-    DOCTEST_CREATE_AND_REGISTER_FUNCTION(DOCTEST_ANONYMOUS(_DOCTEST_ANON_FUNC_), name)
-
-// for registering tests with a fixture
-#define DOCTEST_TEST_CASE_FIXTURE(x, name)                                                         \
-    DOCTEST_IMPLEMENT_FIXTURE(DOCTEST_ANONYMOUS(_DOCTEST_ANON_CLASS_), x,                          \
-                              DOCTEST_ANONYMOUS(_DOCTEST_ANON_FUNC_), name)
-
-// for converting types to strings without the <typeinfo> header and demangling
-#define DOCTEST_TYPE_TO_STRING(...) typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
-#define DOCTEST_TYPE_TO_STRING_IMPL(...)
-
-// for typed tests
-#define DOCTEST_TEST_CASE_TEMPLATE(name, type, ...)                                                \
-    template <typename type>                                                                       \
-    inline void DOCTEST_ANONYMOUS(_DOCTEST_ANON_TMP_)()
-
-#define DOCTEST_TEST_CASE_TEMPLATE_DEFINE(name, type, id)                                          \
-    template <typename type>                                                                       \
-    inline void DOCTEST_ANONYMOUS(_DOCTEST_ANON_TMP_)()
-
-#define DOCTEST_TEST_CASE_TEMPLATE_INVOKE(id, ...)                                                 \
-    typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
-
-#define DOCTEST_TEST_CASE_TEMPLATE_APPLY(id, ...)                                                  \
-    typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
-
-// for subcases
-#define DOCTEST_SUBCASE(name)
-
-// for a testsuite block
-#define DOCTEST_TEST_SUITE(name) namespace
-
-// for starting a testsuite block
-#define DOCTEST_TEST_SUITE_BEGIN(name) typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
-
-// for ending a testsuite block
-#define DOCTEST_TEST_SUITE_END typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
-
-#define DOCTEST_REGISTER_EXCEPTION_TRANSLATOR(signature)                                           \
-    template <typename DOCTEST_UNUSED_TEMPLATE_TYPE>                                               \
-    static inline doctest::String DOCTEST_ANONYMOUS(_DOCTEST_ANON_TRANSLATOR_)(signature)
-
-#define DOCTEST_REGISTER_REPORTER(name, priority, reporter)
-#define DOCTEST_REGISTER_LISTENER(name, priority, reporter)
-
-#define DOCTEST_INFO(...) (static_cast<void>(0))
-#define DOCTEST_CAPTURE(x) (static_cast<void>(0))
-#define DOCTEST_ADD_MESSAGE_AT(file, line, ...) (static_cast<void>(0))
-#define DOCTEST_ADD_FAIL_CHECK_AT(file, line, ...) (static_cast<void>(0))
-#define DOCTEST_ADD_FAIL_AT(file, line, ...) (static_cast<void>(0))
-#define DOCTEST_MESSAGE(...) (static_cast<void>(0))
-#define DOCTEST_FAIL_CHECK(...) (static_cast<void>(0))
-#define DOCTEST_FAIL(...) (static_cast<void>(0))
-
-#define DOCTEST_WARN(...) (static_cast<void>(0))
-#define DOCTEST_CHECK(...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE(...) (static_cast<void>(0))
-#define DOCTEST_WARN_FALSE(...) (static_cast<void>(0))
-#define DOCTEST_CHECK_FALSE(...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_FALSE(...) (static_cast<void>(0))
-
-#define DOCTEST_WARN_MESSAGE(cond, ...) (static_cast<void>(0))
-#define DOCTEST_CHECK_MESSAGE(cond, ...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_MESSAGE(cond, ...) (static_cast<void>(0))
-#define DOCTEST_WARN_FALSE_MESSAGE(cond, ...) (static_cast<void>(0))
-#define DOCTEST_CHECK_FALSE_MESSAGE(cond, ...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_FALSE_MESSAGE(cond, ...) (static_cast<void>(0))
-
-#define DOCTEST_WARN_THROWS(...) (static_cast<void>(0))
-#define DOCTEST_CHECK_THROWS(...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_THROWS(...) (static_cast<void>(0))
-#define DOCTEST_WARN_THROWS_AS(expr, ...) (static_cast<void>(0))
-#define DOCTEST_CHECK_THROWS_AS(expr, ...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_THROWS_AS(expr, ...) (static_cast<void>(0))
-#define DOCTEST_WARN_THROWS_WITH(expr, ...) (static_cast<void>(0))
-#define DOCTEST_CHECK_THROWS_WITH(expr, ...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_THROWS_WITH(expr, ...) (static_cast<void>(0))
-#define DOCTEST_WARN_THROWS_WITH_AS(expr, with, ...) (static_cast<void>(0))
-#define DOCTEST_CHECK_THROWS_WITH_AS(expr, with, ...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_THROWS_WITH_AS(expr, with, ...) (static_cast<void>(0))
-#define DOCTEST_WARN_NOTHROW(...) (static_cast<void>(0))
-#define DOCTEST_CHECK_NOTHROW(...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_NOTHROW(...) (static_cast<void>(0))
-
-#define DOCTEST_WARN_THROWS_MESSAGE(expr, ...) (static_cast<void>(0))
-#define DOCTEST_CHECK_THROWS_MESSAGE(expr, ...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_THROWS_MESSAGE(expr, ...) (static_cast<void>(0))
-#define DOCTEST_WARN_THROWS_AS_MESSAGE(expr, ex, ...) (static_cast<void>(0))
-#define DOCTEST_CHECK_THROWS_AS_MESSAGE(expr, ex, ...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_THROWS_AS_MESSAGE(expr, ex, ...) (static_cast<void>(0))
-#define DOCTEST_WARN_THROWS_WITH_MESSAGE(expr, with, ...) (static_cast<void>(0))
-#define DOCTEST_CHECK_THROWS_WITH_MESSAGE(expr, with, ...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_THROWS_WITH_MESSAGE(expr, with, ...) (static_cast<void>(0))
-#define DOCTEST_WARN_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) (static_cast<void>(0))
-#define DOCTEST_CHECK_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) (static_cast<void>(0))
-#define DOCTEST_WARN_NOTHROW_MESSAGE(expr, ...) (static_cast<void>(0))
-#define DOCTEST_CHECK_NOTHROW_MESSAGE(expr, ...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_NOTHROW_MESSAGE(expr, ...) (static_cast<void>(0))
-
-#define DOCTEST_WARN_EQ(...) (static_cast<void>(0))
-#define DOCTEST_CHECK_EQ(...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_EQ(...) (static_cast<void>(0))
-#define DOCTEST_WARN_NE(...) (static_cast<void>(0))
-#define DOCTEST_CHECK_NE(...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_NE(...) (static_cast<void>(0))
-#define DOCTEST_WARN_GT(...) (static_cast<void>(0))
-#define DOCTEST_CHECK_GT(...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_GT(...) (static_cast<void>(0))
-#define DOCTEST_WARN_LT(...) (static_cast<void>(0))
-#define DOCTEST_CHECK_LT(...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_LT(...) (static_cast<void>(0))
-#define DOCTEST_WARN_GE(...) (static_cast<void>(0))
-#define DOCTEST_CHECK_GE(...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_GE(...) (static_cast<void>(0))
-#define DOCTEST_WARN_LE(...) (static_cast<void>(0))
-#define DOCTEST_CHECK_LE(...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_LE(...) (static_cast<void>(0))
-
-#define DOCTEST_WARN_UNARY(...) (static_cast<void>(0))
-#define DOCTEST_CHECK_UNARY(...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_UNARY(...) (static_cast<void>(0))
-#define DOCTEST_WARN_UNARY_FALSE(...) (static_cast<void>(0))
-#define DOCTEST_CHECK_UNARY_FALSE(...) (static_cast<void>(0))
-#define DOCTEST_REQUIRE_UNARY_FALSE(...) (static_cast<void>(0))
-
-#endif // DOCTEST_CONFIG_DISABLE
-
-// clang-format off
-// KEPT FOR BACKWARDS COMPATIBILITY - FORWARDING TO THE RIGHT MACROS
-#define DOCTEST_FAST_WARN_EQ             DOCTEST_WARN_EQ
-#define DOCTEST_FAST_CHECK_EQ            DOCTEST_CHECK_EQ
-#define DOCTEST_FAST_REQUIRE_EQ          DOCTEST_REQUIRE_EQ
-#define DOCTEST_FAST_WARN_NE             DOCTEST_WARN_NE
-#define DOCTEST_FAST_CHECK_NE            DOCTEST_CHECK_NE
-#define DOCTEST_FAST_REQUIRE_NE          DOCTEST_REQUIRE_NE
-#define DOCTEST_FAST_WARN_GT             DOCTEST_WARN_GT
-#define DOCTEST_FAST_CHECK_GT            DOCTEST_CHECK_GT
-#define DOCTEST_FAST_REQUIRE_GT          DOCTEST_REQUIRE_GT
-#define DOCTEST_FAST_WARN_LT             DOCTEST_WARN_LT
-#define DOCTEST_FAST_CHECK_LT            DOCTEST_CHECK_LT
-#define DOCTEST_FAST_REQUIRE_LT          DOCTEST_REQUIRE_LT
-#define DOCTEST_FAST_WARN_GE             DOCTEST_WARN_GE
-#define DOCTEST_FAST_CHECK_GE            DOCTEST_CHECK_GE
-#define DOCTEST_FAST_REQUIRE_GE          DOCTEST_REQUIRE_GE
-#define DOCTEST_FAST_WARN_LE             DOCTEST_WARN_LE
-#define DOCTEST_FAST_CHECK_LE            DOCTEST_CHECK_LE
-#define DOCTEST_FAST_REQUIRE_LE          DOCTEST_REQUIRE_LE
-
-#define DOCTEST_FAST_WARN_UNARY          DOCTEST_WARN_UNARY
-#define DOCTEST_FAST_CHECK_UNARY         DOCTEST_CHECK_UNARY
-#define DOCTEST_FAST_REQUIRE_UNARY       DOCTEST_REQUIRE_UNARY
-#define DOCTEST_FAST_WARN_UNARY_FALSE    DOCTEST_WARN_UNARY_FALSE
-#define DOCTEST_FAST_CHECK_UNARY_FALSE   DOCTEST_CHECK_UNARY_FALSE
-#define DOCTEST_FAST_REQUIRE_UNARY_FALSE DOCTEST_REQUIRE_UNARY_FALSE
-
-#define DOCTEST_TEST_CASE_TEMPLATE_INSTANTIATE DOCTEST_TEST_CASE_TEMPLATE_INVOKE
-// clang-format on
-
-// BDD style macros
-// clang-format off
-#define DOCTEST_SCENARIO(name) DOCTEST_TEST_CASE("  Scenario: " name)
-#define DOCTEST_SCENARIO_CLASS(name) DOCTEST_TEST_CASE_CLASS("  Scenario: " name)
-#define DOCTEST_SCENARIO_TEMPLATE(name, T, ...)  DOCTEST_TEST_CASE_TEMPLATE("  Scenario: " name, T, __VA_ARGS__)
-#define DOCTEST_SCENARIO_TEMPLATE_DEFINE(name, T, id) DOCTEST_TEST_CASE_TEMPLATE_DEFINE("  Scenario: " name, T, id)
-
-#define DOCTEST_GIVEN(name)     DOCTEST_SUBCASE("   Given: " name)
-#define DOCTEST_WHEN(name)      DOCTEST_SUBCASE("    When: " name)
-#define DOCTEST_AND_WHEN(name)  DOCTEST_SUBCASE("And when: " name)
-#define DOCTEST_THEN(name)      DOCTEST_SUBCASE("    Then: " name)
-#define DOCTEST_AND_THEN(name)  DOCTEST_SUBCASE("     And: " name)
-// clang-format on
-
-// == SHORT VERSIONS OF THE MACROS
-#if !defined(DOCTEST_CONFIG_NO_SHORT_MACRO_NAMES)
-
-#define TEST_CASE DOCTEST_TEST_CASE
-#define TEST_CASE_CLASS DOCTEST_TEST_CASE_CLASS
-#define TEST_CASE_FIXTURE DOCTEST_TEST_CASE_FIXTURE
-#define TYPE_TO_STRING DOCTEST_TYPE_TO_STRING
-#define TEST_CASE_TEMPLATE DOCTEST_TEST_CASE_TEMPLATE
-#define TEST_CASE_TEMPLATE_DEFINE DOCTEST_TEST_CASE_TEMPLATE_DEFINE
-#define TEST_CASE_TEMPLATE_INVOKE DOCTEST_TEST_CASE_TEMPLATE_INVOKE
-#define TEST_CASE_TEMPLATE_APPLY DOCTEST_TEST_CASE_TEMPLATE_APPLY
-#define SUBCASE DOCTEST_SUBCASE
-#define TEST_SUITE DOCTEST_TEST_SUITE
-#define TEST_SUITE_BEGIN DOCTEST_TEST_SUITE_BEGIN
-#define TEST_SUITE_END DOCTEST_TEST_SUITE_END
-#define REGISTER_EXCEPTION_TRANSLATOR DOCTEST_REGISTER_EXCEPTION_TRANSLATOR
-#define REGISTER_REPORTER DOCTEST_REGISTER_REPORTER
-#define REGISTER_LISTENER DOCTEST_REGISTER_LISTENER
-#define INFO DOCTEST_INFO
-#define CAPTURE DOCTEST_CAPTURE
-#define ADD_MESSAGE_AT DOCTEST_ADD_MESSAGE_AT
-#define ADD_FAIL_CHECK_AT DOCTEST_ADD_FAIL_CHECK_AT
-#define ADD_FAIL_AT DOCTEST_ADD_FAIL_AT
-#define MESSAGE DOCTEST_MESSAGE
-#define FAIL_CHECK DOCTEST_FAIL_CHECK
-#define FAIL DOCTEST_FAIL
-#define TO_LVALUE DOCTEST_TO_LVALUE
-
-#define WARN DOCTEST_WARN
-#define WARN_FALSE DOCTEST_WARN_FALSE
-#define WARN_THROWS DOCTEST_WARN_THROWS
-#define WARN_THROWS_AS DOCTEST_WARN_THROWS_AS
-#define WARN_THROWS_WITH DOCTEST_WARN_THROWS_WITH
-#define WARN_THROWS_WITH_AS DOCTEST_WARN_THROWS_WITH_AS
-#define WARN_NOTHROW DOCTEST_WARN_NOTHROW
-#define CHECK DOCTEST_CHECK
-#define CHECK_FALSE DOCTEST_CHECK_FALSE
-#define CHECK_THROWS DOCTEST_CHECK_THROWS
-#define CHECK_THROWS_AS DOCTEST_CHECK_THROWS_AS
-#define CHECK_THROWS_WITH DOCTEST_CHECK_THROWS_WITH
-#define CHECK_THROWS_WITH_AS DOCTEST_CHECK_THROWS_WITH_AS
-#define CHECK_NOTHROW DOCTEST_CHECK_NOTHROW
-#define REQUIRE DOCTEST_REQUIRE
-#define REQUIRE_FALSE DOCTEST_REQUIRE_FALSE
-#define REQUIRE_THROWS DOCTEST_REQUIRE_THROWS
-#define REQUIRE_THROWS_AS DOCTEST_REQUIRE_THROWS_AS
-#define REQUIRE_THROWS_WITH DOCTEST_REQUIRE_THROWS_WITH
-#define REQUIRE_THROWS_WITH_AS DOCTEST_REQUIRE_THROWS_WITH_AS
-#define REQUIRE_NOTHROW DOCTEST_REQUIRE_NOTHROW
-
-#define WARN_MESSAGE DOCTEST_WARN_MESSAGE
-#define WARN_FALSE_MESSAGE DOCTEST_WARN_FALSE_MESSAGE
-#define WARN_THROWS_MESSAGE DOCTEST_WARN_THROWS_MESSAGE
-#define WARN_THROWS_AS_MESSAGE DOCTEST_WARN_THROWS_AS_MESSAGE
-#define WARN_THROWS_WITH_MESSAGE DOCTEST_WARN_THROWS_WITH_MESSAGE
-#define WARN_THROWS_WITH_AS_MESSAGE DOCTEST_WARN_THROWS_WITH_AS_MESSAGE
-#define WARN_NOTHROW_MESSAGE DOCTEST_WARN_NOTHROW_MESSAGE
-#define CHECK_MESSAGE DOCTEST_CHECK_MESSAGE
-#define CHECK_FALSE_MESSAGE DOCTEST_CHECK_FALSE_MESSAGE
-#define CHECK_THROWS_MESSAGE DOCTEST_CHECK_THROWS_MESSAGE
-#define CHECK_THROWS_AS_MESSAGE DOCTEST_CHECK_THROWS_AS_MESSAGE
-#define CHECK_THROWS_WITH_MESSAGE DOCTEST_CHECK_THROWS_WITH_MESSAGE
-#define CHECK_THROWS_WITH_AS_MESSAGE DOCTEST_CHECK_THROWS_WITH_AS_MESSAGE
-#define CHECK_NOTHROW_MESSAGE DOCTEST_CHECK_NOTHROW_MESSAGE
-#define REQUIRE_MESSAGE DOCTEST_REQUIRE_MESSAGE
-#define REQUIRE_FALSE_MESSAGE DOCTEST_REQUIRE_FALSE_MESSAGE
-#define REQUIRE_THROWS_MESSAGE DOCTEST_REQUIRE_THROWS_MESSAGE
-#define REQUIRE_THROWS_AS_MESSAGE DOCTEST_REQUIRE_THROWS_AS_MESSAGE
-#define REQUIRE_THROWS_WITH_MESSAGE DOCTEST_REQUIRE_THROWS_WITH_MESSAGE
-#define REQUIRE_THROWS_WITH_AS_MESSAGE DOCTEST_REQUIRE_THROWS_WITH_AS_MESSAGE
-#define REQUIRE_NOTHROW_MESSAGE DOCTEST_REQUIRE_NOTHROW_MESSAGE
-
-#define SCENARIO DOCTEST_SCENARIO
-#define SCENARIO_CLASS DOCTEST_SCENARIO_CLASS
-#define SCENARIO_TEMPLATE DOCTEST_SCENARIO_TEMPLATE
-#define SCENARIO_TEMPLATE_DEFINE DOCTEST_SCENARIO_TEMPLATE_DEFINE
-#define GIVEN DOCTEST_GIVEN
-#define WHEN DOCTEST_WHEN
-#define AND_WHEN DOCTEST_AND_WHEN
-#define THEN DOCTEST_THEN
-#define AND_THEN DOCTEST_AND_THEN
-
-#define WARN_EQ DOCTEST_WARN_EQ
-#define CHECK_EQ DOCTEST_CHECK_EQ
-#define REQUIRE_EQ DOCTEST_REQUIRE_EQ
-#define WARN_NE DOCTEST_WARN_NE
-#define CHECK_NE DOCTEST_CHECK_NE
-#define REQUIRE_NE DOCTEST_REQUIRE_NE
-#define WARN_GT DOCTEST_WARN_GT
-#define CHECK_GT DOCTEST_CHECK_GT
-#define REQUIRE_GT DOCTEST_REQUIRE_GT
-#define WARN_LT DOCTEST_WARN_LT
-#define CHECK_LT DOCTEST_CHECK_LT
-#define REQUIRE_LT DOCTEST_REQUIRE_LT
-#define WARN_GE DOCTEST_WARN_GE
-#define CHECK_GE DOCTEST_CHECK_GE
-#define REQUIRE_GE DOCTEST_REQUIRE_GE
-#define WARN_LE DOCTEST_WARN_LE
-#define CHECK_LE DOCTEST_CHECK_LE
-#define REQUIRE_LE DOCTEST_REQUIRE_LE
-#define WARN_UNARY DOCTEST_WARN_UNARY
-#define CHECK_UNARY DOCTEST_CHECK_UNARY
-#define REQUIRE_UNARY DOCTEST_REQUIRE_UNARY
-#define WARN_UNARY_FALSE DOCTEST_WARN_UNARY_FALSE
-#define CHECK_UNARY_FALSE DOCTEST_CHECK_UNARY_FALSE
-#define REQUIRE_UNARY_FALSE DOCTEST_REQUIRE_UNARY_FALSE
-
-// KEPT FOR BACKWARDS COMPATIBILITY
-#define FAST_WARN_EQ DOCTEST_FAST_WARN_EQ
-#define FAST_CHECK_EQ DOCTEST_FAST_CHECK_EQ
-#define FAST_REQUIRE_EQ DOCTEST_FAST_REQUIRE_EQ
-#define FAST_WARN_NE DOCTEST_FAST_WARN_NE
-#define FAST_CHECK_NE DOCTEST_FAST_CHECK_NE
-#define FAST_REQUIRE_NE DOCTEST_FAST_REQUIRE_NE
-#define FAST_WARN_GT DOCTEST_FAST_WARN_GT
-#define FAST_CHECK_GT DOCTEST_FAST_CHECK_GT
-#define FAST_REQUIRE_GT DOCTEST_FAST_REQUIRE_GT
-#define FAST_WARN_LT DOCTEST_FAST_WARN_LT
-#define FAST_CHECK_LT DOCTEST_FAST_CHECK_LT
-#define FAST_REQUIRE_LT DOCTEST_FAST_REQUIRE_LT
-#define FAST_WARN_GE DOCTEST_FAST_WARN_GE
-#define FAST_CHECK_GE DOCTEST_FAST_CHECK_GE
-#define FAST_REQUIRE_GE DOCTEST_FAST_REQUIRE_GE
-#define FAST_WARN_LE DOCTEST_FAST_WARN_LE
-#define FAST_CHECK_LE DOCTEST_FAST_CHECK_LE
-#define FAST_REQUIRE_LE DOCTEST_FAST_REQUIRE_LE
-
-#define FAST_WARN_UNARY DOCTEST_FAST_WARN_UNARY
-#define FAST_CHECK_UNARY DOCTEST_FAST_CHECK_UNARY
-#define FAST_REQUIRE_UNARY DOCTEST_FAST_REQUIRE_UNARY
-#define FAST_WARN_UNARY_FALSE DOCTEST_FAST_WARN_UNARY_FALSE
-#define FAST_CHECK_UNARY_FALSE DOCTEST_FAST_CHECK_UNARY_FALSE
-#define FAST_REQUIRE_UNARY_FALSE DOCTEST_FAST_REQUIRE_UNARY_FALSE
-
-#define TEST_CASE_TEMPLATE_INSTANTIATE DOCTEST_TEST_CASE_TEMPLATE_INSTANTIATE
-
-#endif // DOCTEST_CONFIG_NO_SHORT_MACRO_NAMES
-
-#if !defined(DOCTEST_CONFIG_DISABLE)
-
-// this is here to clear the 'current test suite' for the current translation unit - at the top
-DOCTEST_TEST_SUITE_END();
-
-// add stringification for primitive/fundamental types
-namespace doctest { namespace detail {
-    DOCTEST_TYPE_TO_STRING_IMPL(bool)
-    DOCTEST_TYPE_TO_STRING_IMPL(float)
-    DOCTEST_TYPE_TO_STRING_IMPL(double)
-    DOCTEST_TYPE_TO_STRING_IMPL(long double)
-    DOCTEST_TYPE_TO_STRING_IMPL(char)
-    DOCTEST_TYPE_TO_STRING_IMPL(signed char)
-    DOCTEST_TYPE_TO_STRING_IMPL(unsigned char)
-#if !DOCTEST_MSVC || defined(_NATIVE_WCHAR_T_DEFINED)
-    DOCTEST_TYPE_TO_STRING_IMPL(wchar_t)
-#endif // not MSVC or wchar_t support enabled
-    DOCTEST_TYPE_TO_STRING_IMPL(short int)
-    DOCTEST_TYPE_TO_STRING_IMPL(unsigned short int)
-    DOCTEST_TYPE_TO_STRING_IMPL(int)
-    DOCTEST_TYPE_TO_STRING_IMPL(unsigned int)
-    DOCTEST_TYPE_TO_STRING_IMPL(long int)
-    DOCTEST_TYPE_TO_STRING_IMPL(unsigned long int)
-    DOCTEST_TYPE_TO_STRING_IMPL(long long int)
-    DOCTEST_TYPE_TO_STRING_IMPL(unsigned long long int)
-}} // namespace doctest::detail
-
-#endif // DOCTEST_CONFIG_DISABLE
-
-DOCTEST_CLANG_SUPPRESS_WARNING_POP
-DOCTEST_MSVC_SUPPRESS_WARNING_POP
-DOCTEST_GCC_SUPPRESS_WARNING_POP
-
-#endif // DOCTEST_LIBRARY_INCLUDED
-
-#ifndef DOCTEST_SINGLE_HEADER
-#define DOCTEST_SINGLE_HEADER
-#endif // DOCTEST_SINGLE_HEADER
-
-#if defined(DOCTEST_CONFIG_IMPLEMENT) || !defined(DOCTEST_SINGLE_HEADER)
-
-#ifndef DOCTEST_SINGLE_HEADER
-#include "doctest_fwd.h"
-#endif // DOCTEST_SINGLE_HEADER
-
-DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wunused-macros")
-
-#ifndef DOCTEST_LIBRARY_IMPLEMENTATION
-#define DOCTEST_LIBRARY_IMPLEMENTATION
-
-DOCTEST_CLANG_SUPPRESS_WARNING_POP
-
-DOCTEST_CLANG_SUPPRESS_WARNING_PUSH
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wunknown-pragmas")
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wpadded")
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wweak-vtables")
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wglobal-constructors")
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wexit-time-destructors")
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wmissing-prototypes")
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wsign-conversion")
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wshorten-64-to-32")
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wmissing-variable-declarations")
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wswitch")
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wswitch-enum")
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wcovered-switch-default")
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wmissing-noreturn")
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wunused-local-typedef")
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wdisabled-macro-expansion")
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wmissing-braces")
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wmissing-field-initializers")
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wc++98-compat")
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wc++98-compat-pedantic")
-DOCTEST_CLANG_SUPPRESS_WARNING("-Wunused-member-function")
-
-DOCTEST_GCC_SUPPRESS_WARNING_PUSH
-DOCTEST_GCC_SUPPRESS_WARNING("-Wunknown-pragmas")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wpragmas")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wconversion")
-DOCTEST_GCC_SUPPRESS_WARNING("-Weffc++")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wsign-conversion")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wstrict-overflow")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wstrict-aliasing")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wmissing-field-initializers")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wmissing-braces")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wmissing-declarations")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wswitch")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wswitch-enum")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wswitch-default")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wunsafe-loop-optimizations")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wold-style-cast")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wunused-local-typedefs")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wuseless-cast")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wunused-function")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wmultiple-inheritance")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wnoexcept")
-DOCTEST_GCC_SUPPRESS_WARNING("-Wsuggest-attribute")
-
-DOCTEST_MSVC_SUPPRESS_WARNING_PUSH
-DOCTEST_MSVC_SUPPRESS_WARNING(4616) // invalid compiler warning
-DOCTEST_MSVC_SUPPRESS_WARNING(4619) // invalid compiler warning
-DOCTEST_MSVC_SUPPRESS_WARNING(4996) // The compiler encountered a deprecated declaration
-DOCTEST_MSVC_SUPPRESS_WARNING(4267) // 'var' : conversion from 'x' to 'y', possible loss of data
-DOCTEST_MSVC_SUPPRESS_WARNING(4706) // assignment within conditional expression
-DOCTEST_MSVC_SUPPRESS_WARNING(4512) // 'class' : assignment operator could not be generated
-DOCTEST_MSVC_SUPPRESS_WARNING(4127) // conditional expression is constant
-DOCTEST_MSVC_SUPPRESS_WARNING(4530) // C++ exception handler used, but unwind semantics not enabled
-DOCTEST_MSVC_SUPPRESS_WARNING(4577) // 'noexcept' used with no exception handling mode specified
-DOCTEST_MSVC_SUPPRESS_WARNING(4774) // format string expected in argument is not a string literal
-DOCTEST_MSVC_SUPPRESS_WARNING(4365) // conversion from 'int' to 'unsigned', signed/unsigned mismatch
-DOCTEST_MSVC_SUPPRESS_WARNING(4820) // padding in structs
-DOCTEST_MSVC_SUPPRESS_WARNING(4640) // construction of local static object is not thread-safe
-DOCTEST_MSVC_SUPPRESS_WARNING(5039) // pointer to potentially throwing function passed to extern C
-DOCTEST_MSVC_SUPPRESS_WARNING(5045) // Spectre mitigation stuff
-DOCTEST_MSVC_SUPPRESS_WARNING(4626) // assignment operator was implicitly defined as deleted
-DOCTEST_MSVC_SUPPRESS_WARNING(5027) // move assignment operator was implicitly defined as deleted
-DOCTEST_MSVC_SUPPRESS_WARNING(5026) // move constructor was implicitly defined as deleted
-DOCTEST_MSVC_SUPPRESS_WARNING(4625) // copy constructor was implicitly defined as deleted
-DOCTEST_MSVC_SUPPRESS_WARNING(4800) // forcing value to bool 'true' or 'false' (performance warning)
-// static analysis
-DOCTEST_MSVC_SUPPRESS_WARNING(26439) // This kind of function may not throw. Declare it 'noexcept'
-DOCTEST_MSVC_SUPPRESS_WARNING(26495) // Always initialize a member variable
-DOCTEST_MSVC_SUPPRESS_WARNING(26451) // Arithmetic overflow ...
-DOCTEST_MSVC_SUPPRESS_WARNING(26444) // Avoid unnamed objects with custom construction and dtor...
-DOCTEST_MSVC_SUPPRESS_WARNING(26812) // Prefer 'enum class' over 'enum'
-
-DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_BEGIN
-
-// required includes - will go only in one translation unit!
-#include <ctime>
-#include <cmath>
-#include <climits>
-// borland (Embarcadero) compiler requires math.h and not cmath - https://github.com/onqtam/doctest/pull/37
-#ifdef __BORLANDC__
-#include <math.h>
-#endif // __BORLANDC__
-#include <new>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <limits>
-#include <utility>
-#include <fstream>
-#include <sstream>
-#include <iostream>
-#include <algorithm>
-#include <iomanip>
-#include <vector>
-#include <atomic>
-#include <mutex>
-#include <set>
-#include <map>
-#include <exception>
-#include <stdexcept>
-#include <csignal>
-#include <cfloat>
-#include <cctype>
-#include <cstdint>
-
-#ifdef DOCTEST_PLATFORM_MAC
-#include <sys/types.h>
-#include <unistd.h>
-#include <sys/sysctl.h>
-#endif // DOCTEST_PLATFORM_MAC
-
-#ifdef DOCTEST_PLATFORM_WINDOWS
-
-// defines for a leaner windows.h
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif // WIN32_LEAN_AND_MEAN
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif // NOMINMAX
-
-// not sure what AfxWin.h is for - here I do what Catch does
-#ifdef __AFXDLL
-#include <AfxWin.h>
-#else
-#if defined(__MINGW32__) || defined(__MINGW64__)
-#include <windows.h>
-#else // MINGW
-#include <Windows.h>
-#endif // MINGW
-#endif
-#include <io.h>
-
-#else // DOCTEST_PLATFORM_WINDOWS
-
-#include <sys/time.h>
-#include <unistd.h>
-
-#endif // DOCTEST_PLATFORM_WINDOWS
-
-// this is a fix for https://github.com/onqtam/doctest/issues/348
-// https://mail.gnome.org/archives/xml/2012-January/msg00000.html
-#if !defined(HAVE_UNISTD_H) && !defined(STDOUT_FILENO)
-#define STDOUT_FILENO fileno(stdout)
-#endif // HAVE_UNISTD_H
-
-DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_END
-
-// counts the number of elements in a C array
-#define DOCTEST_COUNTOF(x) (sizeof(x) / sizeof(x[0]))
-
-#ifdef DOCTEST_CONFIG_DISABLE
-#define DOCTEST_BRANCH_ON_DISABLED(if_disabled, if_not_disabled) if_disabled
-#else // DOCTEST_CONFIG_DISABLE
-#define DOCTEST_BRANCH_ON_DISABLED(if_disabled, if_not_disabled) if_not_disabled
-#endif // DOCTEST_CONFIG_DISABLE
-
-#ifndef DOCTEST_CONFIG_OPTIONS_PREFIX
-#define DOCTEST_CONFIG_OPTIONS_PREFIX "dt-"
-#endif
-
-#ifndef DOCTEST_THREAD_LOCAL
-#define DOCTEST_THREAD_LOCAL thread_local
-#endif
-
-#ifdef DOCTEST_CONFIG_NO_UNPREFIXED_OPTIONS
-#define DOCTEST_OPTIONS_PREFIX_DISPLAY DOCTEST_CONFIG_OPTIONS_PREFIX
-#else
-#define DOCTEST_OPTIONS_PREFIX_DISPLAY ""
-#endif
-
-namespace doctest {
-
-bool is_running_in_test = false;
-
-namespace {
-    using namespace detail;
-    // case insensitive strcmp
-    int stricmp(const char* a, const char* b) {
-        for(;; a++, b++) {
-            const int d = tolower(*a) - tolower(*b);
-            if(d != 0 || !*a)
-                return d;
-        }
-    }
-
-    template <typename T>
-    String fpToString(T value, int precision) {
-        std::ostringstream oss;
-        oss << std::setprecision(precision) << std::fixed << value;
-        std::string d = oss.str();
-        size_t      i = d.find_last_not_of('0');
-        if(i != std::string::npos && i != d.size() - 1) {
-            if(d[i] == '.')
-                i++;
-            d = d.substr(0, i + 1);
-        }
-        return d.c_str();
-    }
-
-    struct Endianness
-    {
-        enum Arch
-        {
-            Big,
-            Little
-        };
-
-        static Arch which() {
-            int x = 1;
-            // casting any data pointer to char* is allowed
-            auto ptr = reinterpret_cast<char*>(&x);
-            if(*ptr)
-                return Little;
-            return Big;
-        }
-    };
-} // namespace
-
-namespace detail {
-    void my_memcpy(void* dest, const void* src, unsigned num) { memcpy(dest, src, num); }
-
-    String rawMemoryToString(const void* object, unsigned size) {
-        // Reverse order for little endian architectures
-        int i = 0, end = static_cast<int>(size), inc = 1;
-        if(Endianness::which() == Endianness::Little) {
-            i   = end - 1;
-            end = inc = -1;
-        }
-
-        unsigned const char* bytes = static_cast<unsigned const char*>(object);
-        std::ostringstream   oss;
-        oss << "0x" << std::setfill('0') << std::hex;
-        for(; i != end; i += inc)
-            oss << std::setw(2) << static_cast<unsigned>(bytes[i]);
-        return oss.str().c_str();
-    }
-
-    DOCTEST_THREAD_LOCAL std::ostringstream g_oss; // NOLINT(cert-err58-cpp)
-
-    std::ostream* getTlsOss() {
-        g_oss.clear(); // there shouldn't be anything worth clearing in the flags
-        g_oss.str(""); // the slow way of resetting a string stream
-        //g_oss.seekp(0); // optimal reset - as seen here: https://stackoverflow.com/a/624291/3162383
-        return &g_oss;
-    }
-
-    String getTlsOssResult() {
-        //g_oss << std::ends; // needed - as shown here: https://stackoverflow.com/a/624291/3162383
-        return g_oss.str().c_str();
-    }
-
-#ifndef DOCTEST_CONFIG_DISABLE
-
-namespace timer_large_integer
-{
-    
-#if defined(DOCTEST_PLATFORM_WINDOWS)
-    typedef ULONGLONG type;
-#else // DOCTEST_PLATFORM_WINDOWS
-    using namespace std;
-    typedef uint64_t type;
-#endif // DOCTEST_PLATFORM_WINDOWS
-}
-
-typedef timer_large_integer::type ticks_t;
-
-#ifdef DOCTEST_CONFIG_GETCURRENTTICKS
-    ticks_t getCurrentTicks() { return DOCTEST_CONFIG_GETCURRENTTICKS(); }
-#elif defined(DOCTEST_PLATFORM_WINDOWS)
-    ticks_t getCurrentTicks() {
-        static LARGE_INTEGER hz = {0}, hzo = {0};
-        if(!hz.QuadPart) {
-            QueryPerformanceFrequency(&hz);
-            QueryPerformanceCounter(&hzo);
-        }
-        LARGE_INTEGER t;
-        QueryPerformanceCounter(&t);
-        return ((t.QuadPart - hzo.QuadPart) * LONGLONG(1000000)) / hz.QuadPart;
-    }
-#else  // DOCTEST_PLATFORM_WINDOWS
-    ticks_t getCurrentTicks() {
-        timeval t;
-        gettimeofday(&t, nullptr);
-        return static_cast<ticks_t>(t.tv_sec) * 1000000 + static_cast<ticks_t>(t.tv_usec);
-    }
-#endif // DOCTEST_PLATFORM_WINDOWS
-
-    struct Timer
-    {
-        void         start() { m_ticks = getCurrentTicks(); }
-        unsigned int getElapsedMicroseconds() const {
-            return static_cast<unsigned int>(getCurrentTicks() - m_ticks);
-        }
-        //unsigned int getElapsedMilliseconds() const {
-        //    return static_cast<unsigned int>(getElapsedMicroseconds() / 1000);
-        //}
-        double getElapsedSeconds() const { return static_cast<double>(getCurrentTicks() - m_ticks) / 1000000.0; }
-
-    private:
-        ticks_t m_ticks = 0;
-    };
-
-    // this holds both parameters from the command line and runtime data for tests
-    struct ContextState : ContextOptions, TestRunStats, CurrentTestCaseStats
-    {
-        std::atomic<int> numAssertsCurrentTest_atomic;
-        std::atomic<int> numAssertsFailedCurrentTest_atomic;
-
-        std::vector<std::vector<String>> filters = decltype(filters)(9); // 9 different filters
-
-        std::vector<IReporter*> reporters_currently_used;
-
-        const TestCase* currentTest = nullptr;
-
-        assert_handler ah = nullptr;
-
-        Timer timer;
-
-        std::vector<String> stringifiedContexts; // logging from INFO() due to an exception
-
-        // stuff for subcases
-        std::vector<SubcaseSignature>     subcasesStack;
-        std::set<decltype(subcasesStack)> subcasesPassed;
-        int                               subcasesCurrentMaxLevel;
-        bool                              should_reenter;
-        std::atomic<bool>                 shouldLogCurrentException;
-
-        void resetRunData() {
-            numTestCases                = 0;
-            numTestCasesPassingFilters  = 0;
-            numTestSuitesPassingFilters = 0;
-            numTestCasesFailed          = 0;
-            numAsserts                  = 0;
-            numAssertsFailed            = 0;
-            numAssertsCurrentTest       = 0;
-            numAssertsFailedCurrentTest = 0;
-        }
-
-        void finalizeTestCaseData() {
-            seconds = timer.getElapsedSeconds();
-
-            // update the non-atomic counters
-            numAsserts += numAssertsCurrentTest_atomic;
-            numAssertsFailed += numAssertsFailedCurrentTest_atomic;
-            numAssertsCurrentTest       = numAssertsCurrentTest_atomic;
-            numAssertsFailedCurrentTest = numAssertsFailedCurrentTest_atomic;
-
-            if(numAssertsFailedCurrentTest)
-                failure_flags |= TestCaseFailureReason::AssertFailure;
-
-            if(Approx(currentTest->m_timeout).epsilon(DBL_EPSILON) != 0 &&
-               Approx(seconds).epsilon(DBL_EPSILON) > currentTest->m_timeout)
-                failure_flags |= TestCaseFailureReason::Timeout;
-
-            if(currentTest->m_should_fail) {
-                if(failure_flags) {
-                    failure_flags |= TestCaseFailureReason::ShouldHaveFailedAndDid;
-                } else {
-                    failure_flags |= TestCaseFailureReason::ShouldHaveFailedButDidnt;
-                }
-            } else if(failure_flags && currentTest->m_may_fail) {
-                failure_flags |= TestCaseFailureReason::CouldHaveFailedAndDid;
-            } else if(currentTest->m_expected_failures > 0) {
-                if(numAssertsFailedCurrentTest == currentTest->m_expected_failures) {
-                    failure_flags |= TestCaseFailureReason::FailedExactlyNumTimes;
-                } else {
-                    failure_flags |= TestCaseFailureReason::DidntFailExactlyNumTimes;
-                }
-            }
-
-            bool ok_to_fail = (TestCaseFailureReason::ShouldHaveFailedAndDid & failure_flags) ||
-                              (TestCaseFailureReason::CouldHaveFailedAndDid & failure_flags) ||
-                              (TestCaseFailureReason::FailedExactlyNumTimes & failure_flags);
-
-            // if any subcase has failed - the whole test case has failed
-            if(failure_flags && !ok_to_fail)
-                numTestCasesFailed++;
-        }
-    };
-
-    ContextState* g_cs = nullptr;
-
-    // used to avoid locks for the debug output
-    // TODO: figure out if this is indeed necessary/correct - seems like either there still
-    // could be a race or that there wouldn't be a race even if using the context directly
-    DOCTEST_THREAD_LOCAL bool g_no_colors;
-
-#endif // DOCTEST_CONFIG_DISABLE
-} // namespace detail
-
-void String::setOnHeap() { *reinterpret_cast<unsigned char*>(&buf[last]) = 128; }
-void String::setLast(unsigned in) { buf[last] = char(in); }
-
-void String::copy(const String& other) {
-    using namespace std;
-    if(other.isOnStack()) {
-        memcpy(buf, other.buf, len);
-    } else {
-        setOnHeap();
-        data.size     = other.data.size;
-        data.capacity = data.size + 1;
-        data.ptr      = new char[data.capacity];
-        memcpy(data.ptr, other.data.ptr, data.size + 1);
-    }
-}
-
-String::String() {
-    buf[0] = '\0';
-    setLast();
-}
-
-String::~String() {
-    if(!isOnStack())
-        delete[] data.ptr;
-    // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks)
-}
-
-String::String(const char* in)
-        : String(in, strlen(in)) {}
-
-String::String(const char* in, unsigned in_size) {
-    using namespace std;
-    if(in_size <= last) {
-        memcpy(buf, in, in_size + 1);
-        setLast(last - in_size);
-    } else {
-        setOnHeap();
-        data.size     = in_size;
-        data.capacity = data.size + 1;
-        data.ptr      = new char[data.capacity];
-        memcpy(data.ptr, in, in_size + 1);
-    }
-}
-
-String::String(const String& other) { copy(other); }
-
-String& String::operator=(const String& other) {
-    if(this != &other) {
-        if(!isOnStack())
-            delete[] data.ptr;
-
-        copy(other);
-    }
-
-    return *this;
-}
-
-String& String::operator+=(const String& other) {
-    const unsigned my_old_size = size();
-    const unsigned other_size  = other.size();
-    const unsigned total_size  = my_old_size + other_size;
-    using namespace std;
-    if(isOnStack()) {
-        if(total_size < len) {
-            // append to the current stack space
-            memcpy(buf + my_old_size, other.c_str(), other_size + 1);
-            // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks)
-            setLast(last - total_size);
-        } else {
-            // alloc new chunk
-            char* temp = new char[total_size + 1];
-            // copy current data to new location before writing in the union
-            memcpy(temp, buf, my_old_size); // skip the +1 ('\0') for speed
-            // update data in union
-            setOnHeap();
-            data.size     = total_size;
-            data.capacity = data.size + 1;
-            data.ptr      = temp;
-            // transfer the rest of the data
-            memcpy(data.ptr + my_old_size, other.c_str(), other_size + 1);
-        }
-    } else {
-        if(data.capacity > total_size) {
-            // append to the current heap block
-            data.size = total_size;
-            memcpy(data.ptr + my_old_size, other.c_str(), other_size + 1);
-        } else {
-            // resize
-            data.capacity *= 2;
-            if(data.capacity <= total_size)
-                data.capacity = total_size + 1;
-            // alloc new chunk
-            char* temp = new char[data.capacity];
-            // copy current data to new location before releasing it
-            memcpy(temp, data.ptr, my_old_size); // skip the +1 ('\0') for speed
-            // release old chunk
-            delete[] data.ptr;
-            // update the rest of the union members
-            data.size = total_size;
-            data.ptr  = temp;
-            // transfer the rest of the data
-            memcpy(data.ptr + my_old_size, other.c_str(), other_size + 1);
-        }
-    }
-
-    return *this;
-}
-
-// NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks)
-String String::operator+(const String& other) const { return String(*this) += other; }
-
-String::String(String&& other) {
-    using namespace std;
-    memcpy(buf, other.buf, len);
-    other.buf[0] = '\0';
-    other.setLast();
-}
-
-String& String::operator=(String&& other) {
-    using namespace std;
-    if(this != &other) {
-        if(!isOnStack())
-            delete[] data.ptr;
-        memcpy(buf, other.buf, len);
-        other.buf[0] = '\0';
-        other.setLast();
-    }
-    return *this;
-}
-
-char String::operator[](unsigned i) const {
-    return const_cast<String*>(this)->operator[](i); // NOLINT
-}
-
-char& String::operator[](unsigned i) {
-    if(isOnStack())
-        return reinterpret_cast<char*>(buf)[i];
-    return data.ptr[i];
-}
-
-DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH("-Wmaybe-uninitialized")
-unsigned String::size() const {
-    if(isOnStack())
-        return last - (unsigned(buf[last]) & 31); // using "last" would work only if "len" is 32
-    return data.size;
-}
-DOCTEST_GCC_SUPPRESS_WARNING_POP
-
-unsigned String::capacity() const {
-    if(isOnStack())
-        return len;
-    return data.capacity;
-}
-
-int String::compare(const char* other, bool no_case) const {
-    if(no_case)
-        return doctest::stricmp(c_str(), other);
-    return std::strcmp(c_str(), other);
-}
-
-int String::compare(const String& other, bool no_case) const {
-    return compare(other.c_str(), no_case);
-}
-
-// clang-format off
-bool operator==(const String& lhs, const String& rhs) { return lhs.compare(rhs) == 0; }
-bool operator!=(const String& lhs, const String& rhs) { return lhs.compare(rhs) != 0; }
-bool operator< (const String& lhs, const String& rhs) { return lhs.compare(rhs) < 0; }
-bool operator> (const String& lhs, const String& rhs) { return lhs.compare(rhs) > 0; }
-bool operator<=(const String& lhs, const String& rhs) { return (lhs != rhs) ? lhs.compare(rhs) < 0 : true; }
-bool operator>=(const String& lhs, const String& rhs) { return (lhs != rhs) ? lhs.compare(rhs) > 0 : true; }
-// clang-format on
-
-std::ostream& operator<<(std::ostream& s, const String& in) { return s << in.c_str(); }
-
-namespace {
-    void color_to_stream(std::ostream&, Color::Enum) DOCTEST_BRANCH_ON_DISABLED({}, ;)
-} // namespace
-
-namespace Color {
-    std::ostream& operator<<(std::ostream& s, Color::Enum code) {
-        color_to_stream(s, code);
-        return s;
-    }
-} // namespace Color
-
-// clang-format off
-const char* assertString(assertType::Enum at) {
-    DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4062) // enum 'x' in switch of enum 'y' is not handled
-    switch(at) {  //!OCLINT missing default in switch statements
-        case assertType::DT_WARN                    : return "WARN";
-        case assertType::DT_CHECK                   : return "CHECK";
-        case assertType::DT_REQUIRE                 : return "REQUIRE";
-
-        case assertType::DT_WARN_FALSE              : return "WARN_FALSE";
-        case assertType::DT_CHECK_FALSE             : return "CHECK_FALSE";
-        case assertType::DT_REQUIRE_FALSE           : return "REQUIRE_FALSE";
-
-        case assertType::DT_WARN_THROWS             : return "WARN_THROWS";
-        case assertType::DT_CHECK_THROWS            : return "CHECK_THROWS";
-        case assertType::DT_REQUIRE_THROWS          : return "REQUIRE_THROWS";
-
-        case assertType::DT_WARN_THROWS_AS          : return "WARN_THROWS_AS";
-        case assertType::DT_CHECK_THROWS_AS         : return "CHECK_THROWS_AS";
-        case assertType::DT_REQUIRE_THROWS_AS       : return "REQUIRE_THROWS_AS";
-
-        case assertType::DT_WARN_THROWS_WITH        : return "WARN_THROWS_WITH";
-        case assertType::DT_CHECK_THROWS_WITH       : return "CHECK_THROWS_WITH";
-        case assertType::DT_REQUIRE_THROWS_WITH     : return "REQUIRE_THROWS_WITH";
-
-        case assertType::DT_WARN_THROWS_WITH_AS     : return "WARN_THROWS_WITH_AS";
-        case assertType::DT_CHECK_THROWS_WITH_AS    : return "CHECK_THROWS_WITH_AS";
-        case assertType::DT_REQUIRE_THROWS_WITH_AS  : return "REQUIRE_THROWS_WITH_AS";
-
-        case assertType::DT_WARN_NOTHROW            : return "WARN_NOTHROW";
-        case assertType::DT_CHECK_NOTHROW           : return "CHECK_NOTHROW";
-        case assertType::DT_REQUIRE_NOTHROW         : return "REQUIRE_NOTHROW";
-
-        case assertType::DT_WARN_EQ                 : return "WARN_EQ";
-        case assertType::DT_CHECK_EQ                : return "CHECK_EQ";
-        case assertType::DT_REQUIRE_EQ              : return "REQUIRE_EQ";
-        case assertType::DT_WARN_NE                 : return "WARN_NE";
-        case assertType::DT_CHECK_NE                : return "CHECK_NE";
-        case assertType::DT_REQUIRE_NE              : return "REQUIRE_NE";
-        case assertType::DT_WARN_GT                 : return "WARN_GT";
-        case assertType::DT_CHECK_GT                : return "CHECK_GT";
-        case assertType::DT_REQUIRE_GT              : return "REQUIRE_GT";
-        case assertType::DT_WARN_LT                 : return "WARN_LT";
-        case assertType::DT_CHECK_LT                : return "CHECK_LT";
-        case assertType::DT_REQUIRE_LT              : return "REQUIRE_LT";
-        case assertType::DT_WARN_GE                 : return "WARN_GE";
-        case assertType::DT_CHECK_GE                : return "CHECK_GE";
-        case assertType::DT_REQUIRE_GE              : return "REQUIRE_GE";
-        case assertType::DT_WARN_LE                 : return "WARN_LE";
-        case assertType::DT_CHECK_LE                : return "CHECK_LE";
-        case assertType::DT_REQUIRE_LE              : return "REQUIRE_LE";
-
-        case assertType::DT_WARN_UNARY              : return "WARN_UNARY";
-        case assertType::DT_CHECK_UNARY             : return "CHECK_UNARY";
-        case assertType::DT_REQUIRE_UNARY           : return "REQUIRE_UNARY";
-        case assertType::DT_WARN_UNARY_FALSE        : return "WARN_UNARY_FALSE";
-        case assertType::DT_CHECK_UNARY_FALSE       : return "CHECK_UNARY_FALSE";
-        case assertType::DT_REQUIRE_UNARY_FALSE     : return "REQUIRE_UNARY_FALSE";
-    }
-    DOCTEST_MSVC_SUPPRESS_WARNING_POP
-    return "";
-}
-// clang-format on
-
-const char* failureString(assertType::Enum at) {
-    if(at & assertType::is_warn) //!OCLINT bitwise operator in conditional
-        return "WARNING";
-    if(at & assertType::is_check) //!OCLINT bitwise operator in conditional
-        return "ERROR";
-    if(at & assertType::is_require) //!OCLINT bitwise operator in conditional
-        return "FATAL ERROR";
-    return "";
-}
-
-DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wnull-dereference")
-DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH("-Wnull-dereference")
-// depending on the current options this will remove the path of filenames
-const char* skipPathFromFilename(const char* file) {
-#ifndef DOCTEST_CONFIG_DISABLE
-    if(getContextOptions()->no_path_in_filenames) {
-        auto back    = std::strrchr(file, '\\');
-        auto forward = std::strrchr(file, '/');
-        if(back || forward) {
-            if(back > forward)
-                forward = back;
-            return forward + 1;
-        }
-    }
-#endif // DOCTEST_CONFIG_DISABLE
-    return file;
-}
-DOCTEST_CLANG_SUPPRESS_WARNING_POP
-DOCTEST_GCC_SUPPRESS_WARNING_POP
-
-bool SubcaseSignature::operator<(const SubcaseSignature& other) const {
-    if(m_line != other.m_line)
-        return m_line < other.m_line;
-    if(std::strcmp(m_file, other.m_file) != 0)
-        return std::strcmp(m_file, other.m_file) < 0;
-    return m_name.compare(other.m_name) < 0;
-}
-
-IContextScope::IContextScope()  = default;
-IContextScope::~IContextScope() = default;
-
-#ifdef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-String toString(char* in) { return toString(static_cast<const char*>(in)); }
-// NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks)
-String toString(const char* in) { return String("\"") + (in ? in : "{null string}") + "\""; }
-#endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-String toString(bool in) { return in ? "true" : "false"; }
-String toString(float in) { return fpToString(in, 5) + "f"; }
-String toString(double in) { return fpToString(in, 10); }
-String toString(double long in) { return fpToString(in, 15); }
-
-#define DOCTEST_TO_STRING_OVERLOAD(type, fmt)                                                      \
-    String toString(type in) {                                                                     \
-        char buf[64];                                                                              \
-        std::sprintf(buf, fmt, in);                                                                \
-        return buf;                                                                                \
-    }
-
-DOCTEST_TO_STRING_OVERLOAD(char, "%d")
-DOCTEST_TO_STRING_OVERLOAD(char signed, "%d")
-DOCTEST_TO_STRING_OVERLOAD(char unsigned, "%u")
-DOCTEST_TO_STRING_OVERLOAD(int short, "%d")
-DOCTEST_TO_STRING_OVERLOAD(int short unsigned, "%u")
-DOCTEST_TO_STRING_OVERLOAD(int, "%d")
-DOCTEST_TO_STRING_OVERLOAD(unsigned, "%u")
-DOCTEST_TO_STRING_OVERLOAD(int long, "%ld")
-DOCTEST_TO_STRING_OVERLOAD(int long unsigned, "%lu")
-DOCTEST_TO_STRING_OVERLOAD(int long long, "%lld")
-DOCTEST_TO_STRING_OVERLOAD(int long long unsigned, "%llu")
-
-String toString(std::nullptr_t) { return "NULL"; }
-
-#if DOCTEST_MSVC >= DOCTEST_COMPILER(19, 20, 0)
-// see this issue on why this is needed: https://github.com/onqtam/doctest/issues/183
-String toString(const std::string& in) { return in.c_str(); }
-#endif // VS 2019
-
-Approx::Approx(double value)
-        : m_epsilon(static_cast<double>(std::numeric_limits<float>::epsilon()) * 100)
-        , m_scale(1.0)
-        , m_value(value) {}
-
-Approx Approx::operator()(double value) const {
-    Approx approx(value);
-    approx.epsilon(m_epsilon);
-    approx.scale(m_scale);
-    return approx;
-}
-
-Approx& Approx::epsilon(double newEpsilon) {
-    m_epsilon = newEpsilon;
-    return *this;
-}
-Approx& Approx::scale(double newScale) {
-    m_scale = newScale;
-    return *this;
-}
-
-bool operator==(double lhs, const Approx& rhs) {
-    // Thanks to Richard Harris for his help refining this formula
-    return std::fabs(lhs - rhs.m_value) <
-           rhs.m_epsilon * (rhs.m_scale + std::max<double>(std::fabs(lhs), std::fabs(rhs.m_value)));
-}
-bool operator==(const Approx& lhs, double rhs) { return operator==(rhs, lhs); }
-bool operator!=(double lhs, const Approx& rhs) { return !operator==(lhs, rhs); }
-bool operator!=(const Approx& lhs, double rhs) { return !operator==(rhs, lhs); }
-bool operator<=(double lhs, const Approx& rhs) { return lhs < rhs.m_value || lhs == rhs; }
-bool operator<=(const Approx& lhs, double rhs) { return lhs.m_value < rhs || lhs == rhs; }
-bool operator>=(double lhs, const Approx& rhs) { return lhs > rhs.m_value || lhs == rhs; }
-bool operator>=(const Approx& lhs, double rhs) { return lhs.m_value > rhs || lhs == rhs; }
-bool operator<(double lhs, const Approx& rhs) { return lhs < rhs.m_value && lhs != rhs; }
-bool operator<(const Approx& lhs, double rhs) { return lhs.m_value < rhs && lhs != rhs; }
-bool operator>(double lhs, const Approx& rhs) { return lhs > rhs.m_value && lhs != rhs; }
-bool operator>(const Approx& lhs, double rhs) { return lhs.m_value > rhs && lhs != rhs; }
-
-String toString(const Approx& in) {
-    // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks)
-    return String("Approx( ") + doctest::toString(in.m_value) + " )";
-}
-const ContextOptions* getContextOptions() { return DOCTEST_BRANCH_ON_DISABLED(nullptr, g_cs); }
-
-} // namespace doctest
-
-#ifdef DOCTEST_CONFIG_DISABLE
-namespace doctest {
-Context::Context(int, const char* const*) {}
-Context::~Context() = default;
-void Context::applyCommandLine(int, const char* const*) {}
-void Context::addFilter(const char*, const char*) {}
-void Context::clearFilters() {}
-void Context::setOption(const char*, int) {}
-void Context::setOption(const char*, const char*) {}
-bool Context::shouldExit() { return false; }
-void Context::setAsDefaultForAssertsOutOfTestCases() {}
-void Context::setAssertHandler(detail::assert_handler) {}
-int  Context::run() { return 0; }
-
-IReporter::~IReporter() = default;
-
-int                         IReporter::get_num_active_contexts() { return 0; }
-const IContextScope* const* IReporter::get_active_contexts() { return nullptr; }
-int                         IReporter::get_num_stringified_contexts() { return 0; }
-const String*               IReporter::get_stringified_contexts() { return nullptr; }
-
-int registerReporter(const char*, int, IReporter*) { return 0; }
-
-} // namespace doctest
-#else // DOCTEST_CONFIG_DISABLE
-
-#if !defined(DOCTEST_CONFIG_COLORS_NONE)
-#if !defined(DOCTEST_CONFIG_COLORS_WINDOWS) && !defined(DOCTEST_CONFIG_COLORS_ANSI)
-#ifdef DOCTEST_PLATFORM_WINDOWS
-#define DOCTEST_CONFIG_COLORS_WINDOWS
-#else // linux
-#define DOCTEST_CONFIG_COLORS_ANSI
-#endif // platform
-#endif // DOCTEST_CONFIG_COLORS_WINDOWS && DOCTEST_CONFIG_COLORS_ANSI
-#endif // DOCTEST_CONFIG_COLORS_NONE
-
-namespace doctest_detail_test_suite_ns {
-// holds the current test suite
-doctest::detail::TestSuite& getCurrentTestSuite() {
-    static doctest::detail::TestSuite data;
-    return data;
-}
-} // namespace doctest_detail_test_suite_ns
-
-namespace doctest {
-namespace {
-    // the int (priority) is part of the key for automatic sorting - sadly one can register a
-    // reporter with a duplicate name and a different priority but hopefully that won't happen often :|
-    typedef std::map<std::pair<int, String>, reporterCreatorFunc> reporterMap;
-
-    reporterMap& getReporters() {
-        static reporterMap data;
-        return data;
-    }
-    reporterMap& getListeners() {
-        static reporterMap data;
-        return data;
-    }
-} // namespace
-namespace detail {
-#define DOCTEST_ITERATE_THROUGH_REPORTERS(function, ...)                                           \
-    for(auto& curr_rep : g_cs->reporters_currently_used)                                           \
-    curr_rep->function(__VA_ARGS__)
-
-    bool checkIfShouldThrow(assertType::Enum at) {
-        if(at & assertType::is_require) //!OCLINT bitwise operator in conditional
-            return true;
-
-        if((at & assertType::is_check) //!OCLINT bitwise operator in conditional
-           && getContextOptions()->abort_after > 0 &&
-           (g_cs->numAssertsFailed + g_cs->numAssertsFailedCurrentTest_atomic) >=
-                   getContextOptions()->abort_after)
-            return true;
-
-        return false;
-    }
-
-#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS
-    DOCTEST_NORETURN void throwException() {
-        g_cs->shouldLogCurrentException = false;
-        throw TestFailureException();
-    } // NOLINT(cert-err60-cpp)
-#else // DOCTEST_CONFIG_NO_EXCEPTIONS
-    void throwException() {}
-#endif // DOCTEST_CONFIG_NO_EXCEPTIONS
-} // namespace detail
-
-namespace {
-    using namespace detail;
-    // matching of a string against a wildcard mask (case sensitivity configurable) taken from
-    // https://www.codeproject.com/Articles/1088/Wildcard-string-compare-globbing
-    int wildcmp(const char* str, const char* wild, bool caseSensitive) {
-        const char* cp = str;
-        const char* mp = wild;
-
-        while((*str) && (*wild != '*')) {
-            if((caseSensitive ? (*wild != *str) : (tolower(*wild) != tolower(*str))) &&
-               (*wild != '?')) {
-                return 0;
-            }
-            wild++;
-            str++;
-        }
-
-        while(*str) {
-            if(*wild == '*') {
-                if(!*++wild) {
-                    return 1;
-                }
-                mp = wild;
-                cp = str + 1;
-            } else if((caseSensitive ? (*wild == *str) : (tolower(*wild) == tolower(*str))) ||
-                      (*wild == '?')) {
-                wild++;
-                str++;
-            } else {
-                wild = mp;   //!OCLINT parameter reassignment
-                str  = cp++; //!OCLINT parameter reassignment
-            }
-        }
-
-        while(*wild == '*') {
-            wild++;
-        }
-        return !*wild;
-    }
-
-    //// C string hash function (djb2) - taken from http://www.cse.yorku.ca/~oz/hash.html
-    //unsigned hashStr(unsigned const char* str) {
-    //    unsigned long hash = 5381;
-    //    char          c;
-    //    while((c = *str++))
-    //        hash = ((hash << 5) + hash) + c; // hash * 33 + c
-    //    return hash;
-    //}
-
-    // checks if the name matches any of the filters (and can be configured what to do when empty)
-    bool matchesAny(const char* name, const std::vector<String>& filters, bool matchEmpty,
-                    bool caseSensitive) {
-        if(filters.empty() && matchEmpty)
-            return true;
-        for(auto& curr : filters)
-            if(wildcmp(name, curr.c_str(), caseSensitive))
-                return true;
-        return false;
-    }
-} // namespace
-namespace detail {
-
-    Subcase::Subcase(const String& name, const char* file, int line)
-            : m_signature({name, file, line}) {
-        ContextState* s = g_cs;
-
-        // check subcase filters
-        if(s->subcasesStack.size() < size_t(s->subcase_filter_levels)) {
-            if(!matchesAny(m_signature.m_name.c_str(), s->filters[6], true, s->case_sensitive))
-                return;
-            if(matchesAny(m_signature.m_name.c_str(), s->filters[7], false, s->case_sensitive))
-                return;
-        }
-        
-        // if a Subcase on the same level has already been entered
-        if(s->subcasesStack.size() < size_t(s->subcasesCurrentMaxLevel)) {
-            s->should_reenter = true;
-            return;
-        }
-
-        // push the current signature to the stack so we can check if the
-        // current stack + the current new subcase have been traversed
-        s->subcasesStack.push_back(m_signature);
-        if(s->subcasesPassed.count(s->subcasesStack) != 0) {
-            // pop - revert to previous stack since we've already passed this
-            s->subcasesStack.pop_back();
-            return;
-        }
-
-        s->subcasesCurrentMaxLevel = s->subcasesStack.size();
-        m_entered = true;
-
-        DOCTEST_ITERATE_THROUGH_REPORTERS(subcase_start, m_signature);
-    }
-
-    DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4996) // std::uncaught_exception is deprecated in C++17	
-    DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH("-Wdeprecated-declarations")	
-    DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wdeprecated-declarations")
-
-    Subcase::~Subcase() {
-        if(m_entered) {
-            // only mark the subcase stack as passed if no subcases have been skipped
-            if(g_cs->should_reenter == false)
-                g_cs->subcasesPassed.insert(g_cs->subcasesStack);
-            g_cs->subcasesStack.pop_back();
-
-#if defined(__cpp_lib_uncaught_exceptions) && __cpp_lib_uncaught_exceptions >= 201411L
-            if(std::uncaught_exceptions() > 0
-#else
-            if(std::uncaught_exception()
-#endif
-            && g_cs->shouldLogCurrentException) {
-                DOCTEST_ITERATE_THROUGH_REPORTERS(
-                        test_case_exception, {"exception thrown in subcase - will translate later "
-                                              "when the whole test case has been exited (cannot "
-                                              "translate while there is an active exception)",
-                                              false});
-                g_cs->shouldLogCurrentException = false;
-            }
-            DOCTEST_ITERATE_THROUGH_REPORTERS(subcase_end, DOCTEST_EMPTY);
-        }
-    }
-
-    DOCTEST_CLANG_SUPPRESS_WARNING_POP	
-    DOCTEST_GCC_SUPPRESS_WARNING_POP	
-    DOCTEST_MSVC_SUPPRESS_WARNING_POP
-
-    Subcase::operator bool() const { return m_entered; }
-
-    Result::Result(bool passed, const String& decomposition)
-            : m_passed(passed)
-            , m_decomp(decomposition) {}
-
-    ExpressionDecomposer::ExpressionDecomposer(assertType::Enum at)
-            : m_at(at) {}
-
-    TestSuite& TestSuite::operator*(const char* in) {
-        m_test_suite = in;
-        // clear state
-        m_description       = nullptr;
-        m_skip              = false;
-        m_may_fail          = false;
-        m_should_fail       = false;
-        m_expected_failures = 0;
-        m_timeout           = 0;
-        return *this;
-    }
-
-    TestCase::TestCase(funcType test, const char* file, unsigned line, const TestSuite& test_suite,
-                       const char* type, int template_id) {
-        m_file              = file;
-        m_line              = line;
-        m_name              = nullptr; // will be later overridden in operator*
-        m_test_suite        = test_suite.m_test_suite;
-        m_description       = test_suite.m_description;
-        m_skip              = test_suite.m_skip;
-        m_may_fail          = test_suite.m_may_fail;
-        m_should_fail       = test_suite.m_should_fail;
-        m_expected_failures = test_suite.m_expected_failures;
-        m_timeout           = test_suite.m_timeout;
-
-        m_test        = test;
-        m_type        = type;
-        m_template_id = template_id;
-    }
-
-    TestCase::TestCase(const TestCase& other)
-            : TestCaseData() {
-        *this = other;
-    }
-
-    DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(26434) // hides a non-virtual function
-    DOCTEST_MSVC_SUPPRESS_WARNING(26437)           // Do not slice
-    TestCase& TestCase::operator=(const TestCase& other) {
-        static_cast<TestCaseData&>(*this) = static_cast<const TestCaseData&>(other);
-
-        m_test        = other.m_test;
-        m_type        = other.m_type;
-        m_template_id = other.m_template_id;
-        m_full_name   = other.m_full_name;
-
-        if(m_template_id != -1)
-            m_name = m_full_name.c_str();
-        return *this;
-    }
-    DOCTEST_MSVC_SUPPRESS_WARNING_POP
-
-    TestCase& TestCase::operator*(const char* in) {
-        m_name = in;
-        // make a new name with an appended type for templated test case
-        if(m_template_id != -1) {
-            m_full_name = String(m_name) + m_type;
-            // redirect the name to point to the newly constructed full name
-            m_name = m_full_name.c_str();
-        }
-        return *this;
-    }
-
-    bool TestCase::operator<(const TestCase& other) const {
-        if(m_line != other.m_line)
-            return m_line < other.m_line;
-        const int file_cmp = m_file.compare(other.m_file);
-        if(file_cmp != 0)
-            return file_cmp < 0;
-        const int name_cmp = strcmp(m_name, other.m_name);
-        if(name_cmp != 0)
-            return name_cmp < 0;
-        return m_template_id < other.m_template_id;
-    }
-} // namespace detail
-namespace {
-    using namespace detail;
-    // for sorting tests by file/line
-    bool fileOrderComparator(const TestCase* lhs, const TestCase* rhs) {
-        // this is needed because MSVC gives different case for drive letters
-        // for __FILE__ when evaluated in a header and a source file
-        const int res = lhs->m_file.compare(rhs->m_file, bool(DOCTEST_MSVC));
-        if(res != 0)
-            return res < 0;
-        if(lhs->m_line != rhs->m_line)
-            return lhs->m_line < rhs->m_line;
-        return lhs->m_template_id < rhs->m_template_id;
-    }
-
-    // for sorting tests by suite/file/line
-    bool suiteOrderComparator(const TestCase* lhs, const TestCase* rhs) {
-        const int res = std::strcmp(lhs->m_test_suite, rhs->m_test_suite);
-        if(res != 0)
-            return res < 0;
-        return fileOrderComparator(lhs, rhs);
-    }
-
-    // for sorting tests by name/suite/file/line
-    bool nameOrderComparator(const TestCase* lhs, const TestCase* rhs) {
-        const int res = std::strcmp(lhs->m_name, rhs->m_name);
-        if(res != 0)
-            return res < 0;
-        return suiteOrderComparator(lhs, rhs);
-    }
-
-    // all the registered tests
-    std::set<TestCase>& getRegisteredTests() {
-        static std::set<TestCase> data;
-        return data;
-    }
-
-#ifdef DOCTEST_CONFIG_COLORS_WINDOWS
-    HANDLE g_stdoutHandle;
-    WORD   g_origFgAttrs;
-    WORD   g_origBgAttrs;
-    bool   g_attrsInitted = false;
-
-    int colors_init() {
-        if(!g_attrsInitted) {
-            g_stdoutHandle = GetStdHandle(STD_OUTPUT_HANDLE);
-            g_attrsInitted = true;
-            CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
-            GetConsoleScreenBufferInfo(g_stdoutHandle, &csbiInfo);
-            g_origFgAttrs = csbiInfo.wAttributes & ~(BACKGROUND_GREEN | BACKGROUND_RED |
-                                                     BACKGROUND_BLUE | BACKGROUND_INTENSITY);
-            g_origBgAttrs = csbiInfo.wAttributes & ~(FOREGROUND_GREEN | FOREGROUND_RED |
-                                                     FOREGROUND_BLUE | FOREGROUND_INTENSITY);
-        }
-        return 0;
-    }
-
-    int dumy_init_console_colors = colors_init();
-#endif // DOCTEST_CONFIG_COLORS_WINDOWS
-
-    DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wdeprecated-declarations")
-    void color_to_stream(std::ostream& s, Color::Enum code) {
-        static_cast<void>(s);    // for DOCTEST_CONFIG_COLORS_NONE or DOCTEST_CONFIG_COLORS_WINDOWS
-        static_cast<void>(code); // for DOCTEST_CONFIG_COLORS_NONE
-#ifdef DOCTEST_CONFIG_COLORS_ANSI
-        if(g_no_colors ||
-           (isatty(STDOUT_FILENO) == false && getContextOptions()->force_colors == false))
-            return;
-
-        auto col = "";
-        // clang-format off
-            switch(code) { //!OCLINT missing break in switch statement / unnecessary default statement in covered switch statement
-                case Color::Red:         col = "[0;31m"; break;
-                case Color::Green:       col = "[0;32m"; break;
-                case Color::Blue:        col = "[0;34m"; break;
-                case Color::Cyan:        col = "[0;36m"; break;
-                case Color::Yellow:      col = "[0;33m"; break;
-                case Color::Grey:        col = "[1;30m"; break;
-                case Color::LightGrey:   col = "[0;37m"; break;
-                case Color::BrightRed:   col = "[1;31m"; break;
-                case Color::BrightGreen: col = "[1;32m"; break;
-                case Color::BrightWhite: col = "[1;37m"; break;
-                case Color::Bright: // invalid
-                case Color::None:
-                case Color::White:
-                default:                 col = "[0m";
-            }
-        // clang-format on
-        s << "\033" << col;
-#endif // DOCTEST_CONFIG_COLORS_ANSI
-
-#ifdef DOCTEST_CONFIG_COLORS_WINDOWS
-        if(g_no_colors ||
-           (isatty(fileno(stdout)) == false && getContextOptions()->force_colors == false))
-            return;
-
-#define DOCTEST_SET_ATTR(x) SetConsoleTextAttribute(g_stdoutHandle, x | g_origBgAttrs)
-
-        // clang-format off
-        switch (code) {
-            case Color::White:       DOCTEST_SET_ATTR(FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE); break;
-            case Color::Red:         DOCTEST_SET_ATTR(FOREGROUND_RED);                                      break;
-            case Color::Green:       DOCTEST_SET_ATTR(FOREGROUND_GREEN);                                    break;
-            case Color::Blue:        DOCTEST_SET_ATTR(FOREGROUND_BLUE);                                     break;
-            case Color::Cyan:        DOCTEST_SET_ATTR(FOREGROUND_BLUE | FOREGROUND_GREEN);                  break;
-            case Color::Yellow:      DOCTEST_SET_ATTR(FOREGROUND_RED | FOREGROUND_GREEN);                   break;
-            case Color::Grey:        DOCTEST_SET_ATTR(0);                                                   break;
-            case Color::LightGrey:   DOCTEST_SET_ATTR(FOREGROUND_INTENSITY);                                break;
-            case Color::BrightRed:   DOCTEST_SET_ATTR(FOREGROUND_INTENSITY | FOREGROUND_RED);               break;
-            case Color::BrightGreen: DOCTEST_SET_ATTR(FOREGROUND_INTENSITY | FOREGROUND_GREEN);             break;
-            case Color::BrightWhite: DOCTEST_SET_ATTR(FOREGROUND_INTENSITY | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE); break;
-            case Color::None:
-            case Color::Bright: // invalid
-            default:                 DOCTEST_SET_ATTR(g_origFgAttrs);
-        }
-            // clang-format on
-#endif // DOCTEST_CONFIG_COLORS_WINDOWS
-    }
-    DOCTEST_CLANG_SUPPRESS_WARNING_POP
-
-    std::vector<const IExceptionTranslator*>& getExceptionTranslators() {
-        static std::vector<const IExceptionTranslator*> data;
-        return data;
-    }
-
-    String translateActiveException() {
-#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS
-        String res;
-        auto&  translators = getExceptionTranslators();
-        for(auto& curr : translators)
-            if(curr->translate(res))
-                return res;
-        // clang-format off
-        DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH("-Wcatch-value")
-        try {
-            throw;
-        } catch(std::exception& ex) {
-            return ex.what();
-        } catch(std::string& msg) {
-            return msg.c_str();
-        } catch(const char* msg) {
-            return msg;
-        } catch(...) {
-            return "unknown exception";
-        }
-        DOCTEST_GCC_SUPPRESS_WARNING_POP
-// clang-format on
-#else  // DOCTEST_CONFIG_NO_EXCEPTIONS
-        return "";
-#endif // DOCTEST_CONFIG_NO_EXCEPTIONS
-    }
-} // namespace
-
-namespace detail {
-    // used by the macros for registering tests
-    int regTest(const TestCase& tc) {
-        getRegisteredTests().insert(tc);
-        return 0;
-    }
-
-    // sets the current test suite
-    int setTestSuite(const TestSuite& ts) {
-        doctest_detail_test_suite_ns::getCurrentTestSuite() = ts;
-        return 0;
-    }
-
-#ifdef DOCTEST_IS_DEBUGGER_ACTIVE
-    bool isDebuggerActive() { return DOCTEST_IS_DEBUGGER_ACTIVE(); }
-#else // DOCTEST_IS_DEBUGGER_ACTIVE
-#ifdef DOCTEST_PLATFORM_LINUX
-    class ErrnoGuard {
-    public:
-        ErrnoGuard() : m_oldErrno(errno) {}
-        ~ErrnoGuard() { errno = m_oldErrno; }
-    private:
-        int m_oldErrno;
-    };
-    // See the comments in Catch2 for the reasoning behind this implementation:
-    // https://github.com/catchorg/Catch2/blob/v2.13.1/include/internal/catch_debugger.cpp#L79-L102
-    bool isDebuggerActive() {
-        ErrnoGuard guard;
-        std::ifstream in("/proc/self/status");
-        for(std::string line; std::getline(in, line);) {
-            static const int PREFIX_LEN = 11;
-            if(line.compare(0, PREFIX_LEN, "TracerPid:\t") == 0) {
-                return line.length() > PREFIX_LEN && line[PREFIX_LEN] != '0';
-            }
-        }
-        return false;
-    }
-#elif defined(DOCTEST_PLATFORM_MAC)
-    // The following function is taken directly from the following technical note:
-    // https://developer.apple.com/library/archive/qa/qa1361/_index.html
-    // Returns true if the current process is being debugged (either
-    // running under the debugger or has a debugger attached post facto).
-    bool isDebuggerActive() {
-        int        mib[4];
-        kinfo_proc info;
-        size_t     size;
-        // Initialize the flags so that, if sysctl fails for some bizarre
-        // reason, we get a predictable result.
-        info.kp_proc.p_flag = 0;
-        // Initialize mib, which tells sysctl the info we want, in this case
-        // we're looking for information about a specific process ID.
-        mib[0] = CTL_KERN;
-        mib[1] = KERN_PROC;
-        mib[2] = KERN_PROC_PID;
-        mib[3] = getpid();
-        // Call sysctl.
-        size = sizeof(info);
-        if(sysctl(mib, DOCTEST_COUNTOF(mib), &info, &size, 0, 0) != 0) {
-            std::cerr << "\nCall to sysctl failed - unable to determine if debugger is active **\n";
-            return false;
-        }
-        // We're being debugged if the P_TRACED flag is set.
-        return ((info.kp_proc.p_flag & P_TRACED) != 0);
-    }
-#elif DOCTEST_MSVC || defined(__MINGW32__) || defined(__MINGW64__)
-    bool isDebuggerActive() { return ::IsDebuggerPresent() != 0; }
-#else
-    bool isDebuggerActive() { return false; }
-#endif // Platform
-#endif // DOCTEST_IS_DEBUGGER_ACTIVE
-
-    void registerExceptionTranslatorImpl(const IExceptionTranslator* et) {
-        if(std::find(getExceptionTranslators().begin(), getExceptionTranslators().end(), et) ==
-           getExceptionTranslators().end())
-            getExceptionTranslators().push_back(et);
-    }
-
-#ifdef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-    void toStream(std::ostream* s, char* in) { *s << in; }
-    void toStream(std::ostream* s, const char* in) { *s << in; }
-#endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-    void toStream(std::ostream* s, bool in) { *s << std::boolalpha << in << std::noboolalpha; }
-    void toStream(std::ostream* s, float in) { *s << in; }
-    void toStream(std::ostream* s, double in) { *s << in; }
-    void toStream(std::ostream* s, double long in) { *s << in; }
-
-    void toStream(std::ostream* s, char in) { *s << in; }
-    void toStream(std::ostream* s, char signed in) { *s << in; }
-    void toStream(std::ostream* s, char unsigned in) { *s << in; }
-    void toStream(std::ostream* s, int short in) { *s << in; }
-    void toStream(std::ostream* s, int short unsigned in) { *s << in; }
-    void toStream(std::ostream* s, int in) { *s << in; }
-    void toStream(std::ostream* s, int unsigned in) { *s << in; }
-    void toStream(std::ostream* s, int long in) { *s << in; }
-    void toStream(std::ostream* s, int long unsigned in) { *s << in; }
-    void toStream(std::ostream* s, int long long in) { *s << in; }
-    void toStream(std::ostream* s, int long long unsigned in) { *s << in; }
-
-    DOCTEST_THREAD_LOCAL std::vector<IContextScope*> g_infoContexts; // for logging with INFO()
-
-    ContextScopeBase::ContextScopeBase() {
-        g_infoContexts.push_back(this);
-    }
-
-    DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4996) // std::uncaught_exception is deprecated in C++17	
-    DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH("-Wdeprecated-declarations")	
-    DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wdeprecated-declarations")
-
-    // destroy cannot be inlined into the destructor because that would mean calling stringify after
-    // ContextScope has been destroyed (base class destructors run after derived class destructors).
-    // Instead, ContextScope calls this method directly from its destructor.
-    void ContextScopeBase::destroy() {
-#if defined(__cpp_lib_uncaught_exceptions) && __cpp_lib_uncaught_exceptions >= 201411L
-        if(std::uncaught_exceptions() > 0) {
-#else
-        if(std::uncaught_exception()) {
-#endif
-            std::ostringstream s;
-            this->stringify(&s);
-            g_cs->stringifiedContexts.push_back(s.str().c_str());
-        }
-        g_infoContexts.pop_back();
-    }
-
-    DOCTEST_CLANG_SUPPRESS_WARNING_POP	
-    DOCTEST_GCC_SUPPRESS_WARNING_POP	
-    DOCTEST_MSVC_SUPPRESS_WARNING_POP
-} // namespace detail
-namespace {
-    using namespace detail;
-
-#if !defined(DOCTEST_CONFIG_POSIX_SIGNALS) && !defined(DOCTEST_CONFIG_WINDOWS_SEH)
-    struct FatalConditionHandler
-    {
-        void reset() {}
-    };
-#else // DOCTEST_CONFIG_POSIX_SIGNALS || DOCTEST_CONFIG_WINDOWS_SEH
-
-    void reportFatal(const std::string&);
-
-#ifdef DOCTEST_PLATFORM_WINDOWS
-
-    struct SignalDefs
-    {
-        DWORD id;
-        const char* name;
-    };
-    // There is no 1-1 mapping between signals and windows exceptions.
-    // Windows can easily distinguish between SO and SigSegV,
-    // but SigInt, SigTerm, etc are handled differently.
-    SignalDefs signalDefs[] = {
-            {static_cast<DWORD>(EXCEPTION_ILLEGAL_INSTRUCTION),
-             "SIGILL - Illegal instruction signal"},
-            {static_cast<DWORD>(EXCEPTION_STACK_OVERFLOW), "SIGSEGV - Stack overflow"},
-            {static_cast<DWORD>(EXCEPTION_ACCESS_VIOLATION),
-             "SIGSEGV - Segmentation violation signal"},
-            {static_cast<DWORD>(EXCEPTION_INT_DIVIDE_BY_ZERO), "Divide by zero error"},
-    };
-
-    struct FatalConditionHandler
-    {
-        static LONG CALLBACK handleException(PEXCEPTION_POINTERS ExceptionInfo) {
-            for(size_t i = 0; i < DOCTEST_COUNTOF(signalDefs); ++i) {
-                if(ExceptionInfo->ExceptionRecord->ExceptionCode == signalDefs[i].id) {
-                    reportFatal(signalDefs[i].name);
-                    break;
-                }
-            }
-            // If its not an exception we care about, pass it along.
-            // This stops us from eating debugger breaks etc.
-            return EXCEPTION_CONTINUE_SEARCH;
-        }
-
-        FatalConditionHandler() {
-            isSet = true;
-            // 32k seems enough for doctest to handle stack overflow,
-            // but the value was found experimentally, so there is no strong guarantee
-            guaranteeSize = 32 * 1024;
-            // Register an unhandled exception filter
-            previousTop = SetUnhandledExceptionFilter(handleException);
-            // Pass in guarantee size to be filled
-            SetThreadStackGuarantee(&guaranteeSize);
-
-            // On Windows uncaught exceptions from another thread, exceptions from
-            // destructors, or calls to std::terminate are not a SEH exception
-
-            // The terminal handler gets called when:
-            // - std::terminate is called FROM THE TEST RUNNER THREAD
-            // - an exception is thrown from a destructor FROM THE TEST RUNNER THREAD
-            original_terminate_handler = std::get_terminate();
-            std::set_terminate([]() noexcept {
-                reportFatal("Terminate handler called");
-                std::exit(EXIT_FAILURE); // explicitly exit - otherwise the SIGABRT handler may be called as well
-            });
-
-            // SIGABRT is raised when:
-            // - std::terminate is called FROM A DIFFERENT THREAD
-            // - an exception is thrown from a destructor FROM A DIFFERENT THREAD
-            // - an uncaught exception is thrown FROM A DIFFERENT THREAD
-            prev_sigabrt_handler = std::signal(SIGABRT, [](int signal) noexcept {
-                if(signal == SIGABRT) {
-                    reportFatal("SIGABRT - Abort (abnormal termination) signal");
-                }
-            });
-        }
-
-        static void reset() {
-            if(isSet) {
-                // Unregister handler and restore the old guarantee
-                SetUnhandledExceptionFilter(previousTop);
-                SetThreadStackGuarantee(&guaranteeSize);
-                previousTop = nullptr;
-                isSet = false;
-                std::set_terminate(original_terminate_handler);
-                std::signal(SIGABRT, prev_sigabrt_handler);
-            }
-        }
-
-        ~FatalConditionHandler() { reset(); }
-
-    private:
-        static void (*prev_sigabrt_handler)(int);
-        static std::terminate_handler original_terminate_handler;
-        static bool isSet;
-        static ULONG guaranteeSize;
-        static LPTOP_LEVEL_EXCEPTION_FILTER previousTop;
-    };
-
-    void (*FatalConditionHandler::prev_sigabrt_handler)(int);
-    std::terminate_handler FatalConditionHandler::original_terminate_handler;
-    bool FatalConditionHandler::isSet = false;
-    ULONG FatalConditionHandler::guaranteeSize = 0;
-    LPTOP_LEVEL_EXCEPTION_FILTER FatalConditionHandler::previousTop = nullptr;
-
-#else // DOCTEST_PLATFORM_WINDOWS
-
-    struct SignalDefs
-    {
-        int         id;
-        const char* name;
-    };
-    SignalDefs signalDefs[] = {{SIGINT, "SIGINT - Terminal interrupt signal"},
-                               {SIGILL, "SIGILL - Illegal instruction signal"},
-                               {SIGFPE, "SIGFPE - Floating point error signal"},
-                               {SIGSEGV, "SIGSEGV - Segmentation violation signal"},
-                               {SIGTERM, "SIGTERM - Termination request signal"},
-                               {SIGABRT, "SIGABRT - Abort (abnormal termination) signal"}};
-
-    struct FatalConditionHandler
-    {
-        static bool             isSet;
-        static struct sigaction oldSigActions[DOCTEST_COUNTOF(signalDefs)];
-        static stack_t          oldSigStack;
-        static char             altStackMem[4 * SIGSTKSZ];
-
-        static void handleSignal(int sig) {
-            const char* name = "<unknown signal>";
-            for(std::size_t i = 0; i < DOCTEST_COUNTOF(signalDefs); ++i) {
-                SignalDefs& def = signalDefs[i];
-                if(sig == def.id) {
-                    name = def.name;
-                    break;
-                }
-            }
-            reset();
-            reportFatal(name);
-            raise(sig);
-        }
-
-        FatalConditionHandler() {
-            isSet = true;
-            stack_t sigStack;
-            sigStack.ss_sp    = altStackMem;
-            sigStack.ss_size  = sizeof(altStackMem);
-            sigStack.ss_flags = 0;
-            sigaltstack(&sigStack, &oldSigStack);
-            struct sigaction sa = {};
-            sa.sa_handler       = handleSignal; // NOLINT
-            sa.sa_flags         = SA_ONSTACK;
-            for(std::size_t i = 0; i < DOCTEST_COUNTOF(signalDefs); ++i) {
-                sigaction(signalDefs[i].id, &sa, &oldSigActions[i]);
-            }
-        }
-
-        ~FatalConditionHandler() { reset(); }
-        static void reset() {
-            if(isSet) {
-                // Set signals back to previous values -- hopefully nobody overwrote them in the meantime
-                for(std::size_t i = 0; i < DOCTEST_COUNTOF(signalDefs); ++i) {
-                    sigaction(signalDefs[i].id, &oldSigActions[i], nullptr);
-                }
-                // Return the old stack
-                sigaltstack(&oldSigStack, nullptr);
-                isSet = false;
-            }
-        }
-    };
-
-    bool             FatalConditionHandler::isSet                                      = false;
-    struct sigaction FatalConditionHandler::oldSigActions[DOCTEST_COUNTOF(signalDefs)] = {};
-    stack_t          FatalConditionHandler::oldSigStack                                = {};
-    char             FatalConditionHandler::altStackMem[]                              = {};
-
-#endif // DOCTEST_PLATFORM_WINDOWS
-#endif // DOCTEST_CONFIG_POSIX_SIGNALS || DOCTEST_CONFIG_WINDOWS_SEH
-
-} // namespace
-
-namespace {
-    using namespace detail;
-
-#ifdef DOCTEST_PLATFORM_WINDOWS
-#define DOCTEST_OUTPUT_DEBUG_STRING(text) ::OutputDebugStringA(text)
-#else
-    // TODO: integration with XCode and other IDEs
-#define DOCTEST_OUTPUT_DEBUG_STRING(text) // NOLINT(clang-diagnostic-unused-macros)
-#endif // Platform
-
-    void addAssert(assertType::Enum at) {
-        if((at & assertType::is_warn) == 0) //!OCLINT bitwise operator in conditional
-            g_cs->numAssertsCurrentTest_atomic++;
-    }
-
-    void addFailedAssert(assertType::Enum at) {
-        if((at & assertType::is_warn) == 0) //!OCLINT bitwise operator in conditional
-            g_cs->numAssertsFailedCurrentTest_atomic++;
-    }
-
-#if defined(DOCTEST_CONFIG_POSIX_SIGNALS) || defined(DOCTEST_CONFIG_WINDOWS_SEH)
-    void reportFatal(const std::string& message) {
-        g_cs->failure_flags |= TestCaseFailureReason::Crash;
-
-        DOCTEST_ITERATE_THROUGH_REPORTERS(test_case_exception, {message.c_str(), true});
-
-        while(g_cs->subcasesStack.size()) {
-            g_cs->subcasesStack.pop_back();
-            DOCTEST_ITERATE_THROUGH_REPORTERS(subcase_end, DOCTEST_EMPTY);
-        }
-
-        g_cs->finalizeTestCaseData();
-
-        DOCTEST_ITERATE_THROUGH_REPORTERS(test_case_end, *g_cs);
-
-        DOCTEST_ITERATE_THROUGH_REPORTERS(test_run_end, *g_cs);
-    }
-#endif // DOCTEST_CONFIG_POSIX_SIGNALS || DOCTEST_CONFIG_WINDOWS_SEH
-} // namespace
-namespace detail {
-
-    ResultBuilder::ResultBuilder(assertType::Enum at, const char* file, int line, const char* expr,
-                                 const char* exception_type, const char* exception_string) {
-        m_test_case        = g_cs->currentTest;
-        m_at               = at;
-        m_file             = file;
-        m_line             = line;
-        m_expr             = expr;
-        m_failed           = true;
-        m_threw            = false;
-        m_threw_as         = false;
-        m_exception_type   = exception_type;
-        m_exception_string = exception_string;
-#if DOCTEST_MSVC
-        if(m_expr[0] == ' ') // this happens when variadic macros are disabled under MSVC
-            ++m_expr;
-#endif // MSVC
-    }
-
-    void ResultBuilder::setResult(const Result& res) {
-        m_decomp = res.m_decomp;
-        m_failed = !res.m_passed;
-    }
-
-    void ResultBuilder::translateException() {
-        m_threw     = true;
-        m_exception = translateActiveException();
-    }
-
-    bool ResultBuilder::log() {
-        if(m_at & assertType::is_throws) { //!OCLINT bitwise operator in conditional
-            m_failed = !m_threw;
-        } else if((m_at & assertType::is_throws_as) && (m_at & assertType::is_throws_with)) { //!OCLINT
-            m_failed = !m_threw_as || (m_exception != m_exception_string);
-        } else if(m_at & assertType::is_throws_as) { //!OCLINT bitwise operator in conditional
-            m_failed = !m_threw_as;
-        } else if(m_at & assertType::is_throws_with) { //!OCLINT bitwise operator in conditional
-            m_failed = m_exception != m_exception_string;
-        } else if(m_at & assertType::is_nothrow) { //!OCLINT bitwise operator in conditional
-            m_failed = m_threw;
-        }
-
-        if(m_exception.size())
-            m_exception = String("\"") + m_exception + "\"";
-
-        if(is_running_in_test) {
-            addAssert(m_at);
-            DOCTEST_ITERATE_THROUGH_REPORTERS(log_assert, *this);
-
-            if(m_failed)
-                addFailedAssert(m_at);
-        } else if(m_failed) {
-            failed_out_of_a_testing_context(*this);
-        }
-
-        return m_failed && isDebuggerActive() &&
-               !getContextOptions()->no_breaks; // break into debugger
-    }
-
-    void ResultBuilder::react() const {
-        if(m_failed && checkIfShouldThrow(m_at))
-            throwException();
-    }
-
-    void failed_out_of_a_testing_context(const AssertData& ad) {
-        if(g_cs->ah)
-            g_cs->ah(ad);
-        else
-            std::abort();
-    }
-
-    void decomp_assert(assertType::Enum at, const char* file, int line, const char* expr,
-                       Result result) {
-        bool failed = !result.m_passed;
-
-        // ###################################################################################
-        // IF THE DEBUGGER BREAKS HERE - GO 1 LEVEL UP IN THE CALLSTACK FOR THE FAILING ASSERT
-        // THIS IS THE EFFECT OF HAVING 'DOCTEST_CONFIG_SUPER_FAST_ASSERTS' DEFINED
-        // ###################################################################################
-        DOCTEST_ASSERT_OUT_OF_TESTS(result.m_decomp);
-        DOCTEST_ASSERT_IN_TESTS(result.m_decomp);
-        // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks)
-    }
-
-    MessageBuilder::MessageBuilder(const char* file, int line, assertType::Enum severity) {
-        m_stream   = getTlsOss();
-        m_file     = file;
-        m_line     = line;
-        m_severity = severity;
-    }
-
-    IExceptionTranslator::IExceptionTranslator()  = default;
-    IExceptionTranslator::~IExceptionTranslator() = default;
-
-    bool MessageBuilder::log() {
-        m_string = getTlsOssResult();
-        DOCTEST_ITERATE_THROUGH_REPORTERS(log_message, *this);
-
-        const bool isWarn = m_severity & assertType::is_warn;
-
-        // warn is just a message in this context so we don't treat it as an assert
-        if(!isWarn) {
-            addAssert(m_severity);
-            addFailedAssert(m_severity);
-        }
-
-        return isDebuggerActive() && !getContextOptions()->no_breaks && !isWarn; // break
-    }
-
-    void MessageBuilder::react() {
-        if(m_severity & assertType::is_require) //!OCLINT bitwise operator in conditional
-            throwException();
-    }
-
-    MessageBuilder::~MessageBuilder() = default;
-} // namespace detail
-namespace {
-    using namespace detail;
-
-    template <typename Ex>
-    DOCTEST_NORETURN void throw_exception(Ex const& e) {
-#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS
-        throw e;
-#else  // DOCTEST_CONFIG_NO_EXCEPTIONS
-        std::cerr << "doctest will terminate because it needed to throw an exception.\n"
-                  << "The message was: " << e.what() << '\n';
-        std::terminate();
-#endif // DOCTEST_CONFIG_NO_EXCEPTIONS
-    }
-
-#ifndef DOCTEST_INTERNAL_ERROR
-#define DOCTEST_INTERNAL_ERROR(msg)                                                                \
-    throw_exception(std::logic_error(                                                              \
-            __FILE__ ":" DOCTEST_TOSTR(__LINE__) ": Internal doctest error: " msg))
-#endif // DOCTEST_INTERNAL_ERROR
-
-    // clang-format off
-
-// =================================================================================================
-// The following code has been taken verbatim from Catch2/include/internal/catch_xmlwriter.h/cpp
-// This is done so cherry-picking bug fixes is trivial - even the style/formatting is untouched.
-// =================================================================================================
-
-    class XmlEncode {
-    public:
-        enum ForWhat { ForTextNodes, ForAttributes };
-
-        XmlEncode( std::string const& str, ForWhat forWhat = ForTextNodes );
-
-        void encodeTo( std::ostream& os ) const;
-
-        friend std::ostream& operator << ( std::ostream& os, XmlEncode const& xmlEncode );
-
-    private:
-        std::string m_str;
-        ForWhat m_forWhat;
-    };
-
-    class XmlWriter {
-    public:
-
-        class ScopedElement {
-        public:
-            ScopedElement( XmlWriter* writer );
-
-            ScopedElement( ScopedElement&& other ) DOCTEST_NOEXCEPT;
-            ScopedElement& operator=( ScopedElement&& other ) DOCTEST_NOEXCEPT;
-
-            ~ScopedElement();
-
-            ScopedElement& writeText( std::string const& text, bool indent = true );
-
-            template<typename T>
-            ScopedElement& writeAttribute( std::string const& name, T const& attribute ) {
-                m_writer->writeAttribute( name, attribute );
-                return *this;
-            }
-
-        private:
-            mutable XmlWriter* m_writer = nullptr;
-        };
-
-        XmlWriter( std::ostream& os = std::cout );
-        ~XmlWriter();
-
-        XmlWriter( XmlWriter const& ) = delete;
-        XmlWriter& operator=( XmlWriter const& ) = delete;
-
-        XmlWriter& startElement( std::string const& name );
-
-        ScopedElement scopedElement( std::string const& name );
-
-        XmlWriter& endElement();
-
-        XmlWriter& writeAttribute( std::string const& name, std::string const& attribute );
-
-        XmlWriter& writeAttribute( std::string const& name, const char* attribute );
-
-        XmlWriter& writeAttribute( std::string const& name, bool attribute );
-
-        template<typename T>
-        XmlWriter& writeAttribute( std::string const& name, T const& attribute ) {
-        std::stringstream rss;
-            rss << attribute;
-            return writeAttribute( name, rss.str() );
-        }
-
-        XmlWriter& writeText( std::string const& text, bool indent = true );
-
-        //XmlWriter& writeComment( std::string const& text );
-
-        //void writeStylesheetRef( std::string const& url );
-
-        //XmlWriter& writeBlankLine();
-
-        void ensureTagClosed();
-
-    private:
-
-        void writeDeclaration();
-
-        void newlineIfNecessary();
-
-        bool m_tagIsOpen = false;
-        bool m_needsNewline = false;
-        std::vector<std::string> m_tags;
-        std::string m_indent;
-        std::ostream& m_os;
-    };
-
-// =================================================================================================
-// The following code has been taken verbatim from Catch2/include/internal/catch_xmlwriter.h/cpp
-// This is done so cherry-picking bug fixes is trivial - even the style/formatting is untouched.
-// =================================================================================================
-
-using uchar = unsigned char;
-
-namespace {
-
-    size_t trailingBytes(unsigned char c) {
-        if ((c & 0xE0) == 0xC0) {
-            return 2;
-        }
-        if ((c & 0xF0) == 0xE0) {
-            return 3;
-        }
-        if ((c & 0xF8) == 0xF0) {
-            return 4;
-        }
-        DOCTEST_INTERNAL_ERROR("Invalid multibyte utf-8 start byte encountered");
-    }
-
-    uint32_t headerValue(unsigned char c) {
-        if ((c & 0xE0) == 0xC0) {
-            return c & 0x1F;
-        }
-        if ((c & 0xF0) == 0xE0) {
-            return c & 0x0F;
-        }
-        if ((c & 0xF8) == 0xF0) {
-            return c & 0x07;
-        }
-        DOCTEST_INTERNAL_ERROR("Invalid multibyte utf-8 start byte encountered");
-    }
-
-    void hexEscapeChar(std::ostream& os, unsigned char c) {
-        std::ios_base::fmtflags f(os.flags());
-        os << "\\x"
-            << std::uppercase << std::hex << std::setfill('0') << std::setw(2)
-            << static_cast<int>(c);
-        os.flags(f);
-    }
-
-} // anonymous namespace
-
-    XmlEncode::XmlEncode( std::string const& str, ForWhat forWhat )
-    :   m_str( str ),
-        m_forWhat( forWhat )
-    {}
-
-    void XmlEncode::encodeTo( std::ostream& os ) const {
-        // Apostrophe escaping not necessary if we always use " to write attributes
-        // (see: https://www.w3.org/TR/xml/#syntax)
-
-        for( std::size_t idx = 0; idx < m_str.size(); ++ idx ) {
-            uchar c = m_str[idx];
-            switch (c) {
-            case '<':   os << "&lt;"; break;
-            case '&':   os << "&amp;"; break;
-
-            case '>':
-                // See: https://www.w3.org/TR/xml/#syntax
-                if (idx > 2 && m_str[idx - 1] == ']' && m_str[idx - 2] == ']')
-                    os << "&gt;";
-                else
-                    os << c;
-                break;
-
-            case '\"':
-                if (m_forWhat == ForAttributes)
-                    os << "&quot;";
-                else
-                    os << c;
-                break;
-
-            default:
-                // Check for control characters and invalid utf-8
-
-                // Escape control characters in standard ascii
-                // see https://stackoverflow.com/questions/404107/why-are-control-characters-illegal-in-xml-1-0
-                if (c < 0x09 || (c > 0x0D && c < 0x20) || c == 0x7F) {
-                    hexEscapeChar(os, c);
-                    break;
-                }
-
-                // Plain ASCII: Write it to stream
-                if (c < 0x7F) {
-                    os << c;
-                    break;
-                }
-
-                // UTF-8 territory
-                // Check if the encoding is valid and if it is not, hex escape bytes.
-                // Important: We do not check the exact decoded values for validity, only the encoding format
-                // First check that this bytes is a valid lead byte:
-                // This means that it is not encoded as 1111 1XXX
-                // Or as 10XX XXXX
-                if (c <  0xC0 ||
-                    c >= 0xF8) {
-                    hexEscapeChar(os, c);
-                    break;
-                }
-
-                auto encBytes = trailingBytes(c);
-                // Are there enough bytes left to avoid accessing out-of-bounds memory?
-                if (idx + encBytes - 1 >= m_str.size()) {
-                    hexEscapeChar(os, c);
-                    break;
-                }
-                // The header is valid, check data
-                // The next encBytes bytes must together be a valid utf-8
-                // This means: bitpattern 10XX XXXX and the extracted value is sane (ish)
-                bool valid = true;
-                uint32_t value = headerValue(c);
-                for (std::size_t n = 1; n < encBytes; ++n) {
-                    uchar nc = m_str[idx + n];
-                    valid &= ((nc & 0xC0) == 0x80);
-                    value = (value << 6) | (nc & 0x3F);
-                }
-
-                if (
-                    // Wrong bit pattern of following bytes
-                    (!valid) ||
-                    // Overlong encodings
-                    (value < 0x80) ||
-                    (                 value < 0x800   && encBytes > 2) || // removed "0x80 <= value &&" because redundant
-                    (0x800 < value && value < 0x10000 && encBytes > 3) ||
-                    // Encoded value out of range
-                    (value >= 0x110000)
-                    ) {
-                    hexEscapeChar(os, c);
-                    break;
-                }
-
-                // If we got here, this is in fact a valid(ish) utf-8 sequence
-                for (std::size_t n = 0; n < encBytes; ++n) {
-                    os << m_str[idx + n];
-                }
-                idx += encBytes - 1;
-                break;
-            }
-        }
-    }
-
-    std::ostream& operator << ( std::ostream& os, XmlEncode const& xmlEncode ) {
-        xmlEncode.encodeTo( os );
-        return os;
-    }
-
-    XmlWriter::ScopedElement::ScopedElement( XmlWriter* writer )
-    :   m_writer( writer )
-    {}
-
-    XmlWriter::ScopedElement::ScopedElement( ScopedElement&& other ) DOCTEST_NOEXCEPT
-    :   m_writer( other.m_writer ){
-        other.m_writer = nullptr;
-    }
-    XmlWriter::ScopedElement& XmlWriter::ScopedElement::operator=( ScopedElement&& other ) DOCTEST_NOEXCEPT {
-        if ( m_writer ) {
-            m_writer->endElement();
-        }
-        m_writer = other.m_writer;
-        other.m_writer = nullptr;
-        return *this;
-    }
-
-
-    XmlWriter::ScopedElement::~ScopedElement() {
-        if( m_writer )
-            m_writer->endElement();
-    }
-
-    XmlWriter::ScopedElement& XmlWriter::ScopedElement::writeText( std::string const& text, bool indent ) {
-        m_writer->writeText( text, indent );
-        return *this;
-    }
-
-    XmlWriter::XmlWriter( std::ostream& os ) : m_os( os )
-    {
-        writeDeclaration();
-    }
-
-    XmlWriter::~XmlWriter() {
-        while( !m_tags.empty() )
-            endElement();
-    }
-
-    XmlWriter& XmlWriter::startElement( std::string const& name ) {
-        ensureTagClosed();
-        newlineIfNecessary();
-        m_os << m_indent << '<' << name;
-        m_tags.push_back( name );
-        m_indent += "  ";
-        m_tagIsOpen = true;
-        return *this;
-    }
-
-    XmlWriter::ScopedElement XmlWriter::scopedElement( std::string const& name ) {
-        ScopedElement scoped( this );
-        startElement( name );
-        return scoped;
-    }
-
-    XmlWriter& XmlWriter::endElement() {
-        newlineIfNecessary();
-        m_indent = m_indent.substr( 0, m_indent.size()-2 );
-        if( m_tagIsOpen ) {
-            m_os << "/>";
-            m_tagIsOpen = false;
-        }
-        else {
-            m_os << m_indent << "</" << m_tags.back() << ">";
-        }
-        m_os << std::endl;
-        m_tags.pop_back();
-        return *this;
-    }
-
-    XmlWriter& XmlWriter::writeAttribute( std::string const& name, std::string const& attribute ) {
-        if( !name.empty() && !attribute.empty() )
-            m_os << ' ' << name << "=\"" << XmlEncode( attribute, XmlEncode::ForAttributes ) << '"';
-        return *this;
-    }
-
-    XmlWriter& XmlWriter::writeAttribute( std::string const& name, const char* attribute ) {
-        if( !name.empty() && attribute && attribute[0] != '\0' )
-            m_os << ' ' << name << "=\"" << XmlEncode( attribute, XmlEncode::ForAttributes ) << '"';
-        return *this;
-    }
-
-    XmlWriter& XmlWriter::writeAttribute( std::string const& name, bool attribute ) {
-        m_os << ' ' << name << "=\"" << ( attribute ? "true" : "false" ) << '"';
-        return *this;
-    }
-
-    XmlWriter& XmlWriter::writeText( std::string const& text, bool indent ) {
-        if( !text.empty() ){
-            bool tagWasOpen = m_tagIsOpen;
-            ensureTagClosed();
-            if( tagWasOpen && indent )
-                m_os << m_indent;
-            m_os << XmlEncode( text );
-            m_needsNewline = true;
-        }
-        return *this;
-    }
-
-    //XmlWriter& XmlWriter::writeComment( std::string const& text ) {
-    //    ensureTagClosed();
-    //    m_os << m_indent << "<!--" << text << "-->";
-    //    m_needsNewline = true;
-    //    return *this;
-    //}
-
-    //void XmlWriter::writeStylesheetRef( std::string const& url ) {
-    //    m_os << "<?xml-stylesheet type=\"text/xsl\" href=\"" << url << "\"?>\n";
-    //}
-
-    //XmlWriter& XmlWriter::writeBlankLine() {
-    //    ensureTagClosed();
-    //    m_os << '\n';
-    //    return *this;
-    //}
-
-    void XmlWriter::ensureTagClosed() {
-        if( m_tagIsOpen ) {
-            m_os << ">" << std::endl;
-            m_tagIsOpen = false;
-        }
-    }
-
-    void XmlWriter::writeDeclaration() {
-        m_os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
-    }
-
-    void XmlWriter::newlineIfNecessary() {
-        if( m_needsNewline ) {
-            m_os << std::endl;
-            m_needsNewline = false;
-        }
-    }
-
-// =================================================================================================
-// End of copy-pasted code from Catch
-// =================================================================================================
-
-    // clang-format on
-
-    struct XmlReporter : public IReporter
-    {
-        XmlWriter  xml;
-        std::mutex mutex;
-
-        // caching pointers/references to objects of these types - safe to do
-        const ContextOptions& opt;
-        const TestCaseData*   tc = nullptr;
-
-        XmlReporter(const ContextOptions& co)
-                : xml(*co.cout)
-                , opt(co) {}
-
-        void log_contexts() {
-            int num_contexts = get_num_active_contexts();
-            if(num_contexts) {
-                auto              contexts = get_active_contexts();
-                std::stringstream ss;
-                for(int i = 0; i < num_contexts; ++i) {
-                    contexts[i]->stringify(&ss);
-                    xml.scopedElement("Info").writeText(ss.str());
-                    ss.str("");
-                }
-            }
-        }
-
-        unsigned line(unsigned l) const { return opt.no_line_numbers ? 0 : l; }
-
-        void test_case_start_impl(const TestCaseData& in) {
-            bool open_ts_tag = false;
-            if(tc != nullptr) { // we have already opened a test suite
-                if(std::strcmp(tc->m_test_suite, in.m_test_suite) != 0) {
-                    xml.endElement();
-                    open_ts_tag = true;
-                }
-            }
-            else {
-                open_ts_tag = true; // first test case ==> first test suite
-            }
-
-            if(open_ts_tag) {
-                xml.startElement("TestSuite");
-                xml.writeAttribute("name", in.m_test_suite);
-            }
-
-            tc = &in;
-            xml.startElement("TestCase")
-                    .writeAttribute("name", in.m_name)
-                    .writeAttribute("filename", skipPathFromFilename(in.m_file.c_str()))
-                    .writeAttribute("line", line(in.m_line))
-                    .writeAttribute("description", in.m_description);
-
-            if(Approx(in.m_timeout) != 0)
-                xml.writeAttribute("timeout", in.m_timeout);
-            if(in.m_may_fail)
-                xml.writeAttribute("may_fail", true);
-            if(in.m_should_fail)
-                xml.writeAttribute("should_fail", true);
-        }
-
-        // =========================================================================================
-        // WHAT FOLLOWS ARE OVERRIDES OF THE VIRTUAL METHODS OF THE REPORTER INTERFACE
-        // =========================================================================================
-
-        void report_query(const QueryData& in) override {
-            test_run_start();
-            if(opt.list_reporters) {
-                for(auto& curr : getListeners())
-                    xml.scopedElement("Listener")
-                            .writeAttribute("priority", curr.first.first)
-                            .writeAttribute("name", curr.first.second);
-                for(auto& curr : getReporters())
-                    xml.scopedElement("Reporter")
-                            .writeAttribute("priority", curr.first.first)
-                            .writeAttribute("name", curr.first.second);
-            } else if(opt.count || opt.list_test_cases) {
-                for(unsigned i = 0; i < in.num_data; ++i) {
-                    xml.scopedElement("TestCase").writeAttribute("name", in.data[i]->m_name)
-                        .writeAttribute("testsuite", in.data[i]->m_test_suite)
-                        .writeAttribute("filename", skipPathFromFilename(in.data[i]->m_file.c_str()))
-                        .writeAttribute("line", line(in.data[i]->m_line));
-                }
-                xml.scopedElement("OverallResultsTestCases")
-                        .writeAttribute("unskipped", in.run_stats->numTestCasesPassingFilters);
-            } else if(opt.list_test_suites) {
-                for(unsigned i = 0; i < in.num_data; ++i)
-                    xml.scopedElement("TestSuite").writeAttribute("name", in.data[i]->m_test_suite);
-                xml.scopedElement("OverallResultsTestCases")
-                        .writeAttribute("unskipped", in.run_stats->numTestCasesPassingFilters);
-                xml.scopedElement("OverallResultsTestSuites")
-                        .writeAttribute("unskipped", in.run_stats->numTestSuitesPassingFilters);
-            }
-            xml.endElement();
-        }
-
-        void test_run_start() override {
-            // remove .exe extension - mainly to have the same output on UNIX and Windows
-            std::string binary_name = skipPathFromFilename(opt.binary_name.c_str());
-#ifdef DOCTEST_PLATFORM_WINDOWS
-            if(binary_name.rfind(".exe") != std::string::npos)
-                binary_name = binary_name.substr(0, binary_name.length() - 4);
-#endif // DOCTEST_PLATFORM_WINDOWS
-
-            xml.startElement("doctest").writeAttribute("binary", binary_name);
-            if(opt.no_version == false)
-                xml.writeAttribute("version", DOCTEST_VERSION_STR);
-
-            // only the consequential ones (TODO: filters)
-            xml.scopedElement("Options")
-                    .writeAttribute("order_by", opt.order_by.c_str())
-                    .writeAttribute("rand_seed", opt.rand_seed)
-                    .writeAttribute("first", opt.first)
-                    .writeAttribute("last", opt.last)
-                    .writeAttribute("abort_after", opt.abort_after)
-                    .writeAttribute("subcase_filter_levels", opt.subcase_filter_levels)
-                    .writeAttribute("case_sensitive", opt.case_sensitive)
-                    .writeAttribute("no_throw", opt.no_throw)
-                    .writeAttribute("no_skip", opt.no_skip);
-        }
-
-        void test_run_end(const TestRunStats& p) override {
-            if(tc) // the TestSuite tag - only if there has been at least 1 test case
-                xml.endElement();
-
-            xml.scopedElement("OverallResultsAsserts")
-                    .writeAttribute("successes", p.numAsserts - p.numAssertsFailed)
-                    .writeAttribute("failures", p.numAssertsFailed);
-
-            xml.startElement("OverallResultsTestCases")
-                    .writeAttribute("successes",
-                                    p.numTestCasesPassingFilters - p.numTestCasesFailed)
-                    .writeAttribute("failures", p.numTestCasesFailed);
-            if(opt.no_skipped_summary == false)
-                xml.writeAttribute("skipped", p.numTestCases - p.numTestCasesPassingFilters);
-            xml.endElement();
-
-            xml.endElement();
-        }
-
-        void test_case_start(const TestCaseData& in) override {
-            test_case_start_impl(in);
-            xml.ensureTagClosed();
-        }
-        
-        void test_case_reenter(const TestCaseData&) override {}
-
-        void test_case_end(const CurrentTestCaseStats& st) override {
-            xml.startElement("OverallResultsAsserts")
-                    .writeAttribute("successes",
-                                    st.numAssertsCurrentTest - st.numAssertsFailedCurrentTest)
-                    .writeAttribute("failures", st.numAssertsFailedCurrentTest);
-            if(opt.duration)
-                xml.writeAttribute("duration", st.seconds);
-            if(tc->m_expected_failures)
-                xml.writeAttribute("expected_failures", tc->m_expected_failures);
-            xml.endElement();
-
-            xml.endElement();
-        }
-
-        void test_case_exception(const TestCaseException& e) override {
-            std::lock_guard<std::mutex> lock(mutex);
-
-            xml.scopedElement("Exception")
-                    .writeAttribute("crash", e.is_crash)
-                    .writeText(e.error_string.c_str());
-        }
-
-        void subcase_start(const SubcaseSignature& in) override {
-            std::lock_guard<std::mutex> lock(mutex);
-
-            xml.startElement("SubCase")
-                    .writeAttribute("name", in.m_name)
-                    .writeAttribute("filename", skipPathFromFilename(in.m_file))
-                    .writeAttribute("line", line(in.m_line));
-            xml.ensureTagClosed();
-        }
-
-        void subcase_end() override { xml.endElement(); }
-
-        void log_assert(const AssertData& rb) override {
-            if(!rb.m_failed && !opt.success)
-                return;
-
-            std::lock_guard<std::mutex> lock(mutex);
-
-            xml.startElement("Expression")
-                    .writeAttribute("success", !rb.m_failed)
-                    .writeAttribute("type", assertString(rb.m_at))
-                    .writeAttribute("filename", skipPathFromFilename(rb.m_file))
-                    .writeAttribute("line", line(rb.m_line));
-
-            xml.scopedElement("Original").writeText(rb.m_expr);
-
-            if(rb.m_threw)
-                xml.scopedElement("Exception").writeText(rb.m_exception.c_str());
-
-            if(rb.m_at & assertType::is_throws_as)
-                xml.scopedElement("ExpectedException").writeText(rb.m_exception_type);
-            if(rb.m_at & assertType::is_throws_with)
-                xml.scopedElement("ExpectedExceptionString").writeText(rb.m_exception_string);
-            if((rb.m_at & assertType::is_normal) && !rb.m_threw)
-                xml.scopedElement("Expanded").writeText(rb.m_decomp.c_str());
-
-            log_contexts();
-
-            xml.endElement();
-        }
-
-        void log_message(const MessageData& mb) override {
-            std::lock_guard<std::mutex> lock(mutex);
-
-            xml.startElement("Message")
-                    .writeAttribute("type", failureString(mb.m_severity))
-                    .writeAttribute("filename", skipPathFromFilename(mb.m_file))
-                    .writeAttribute("line", line(mb.m_line));
-
-            xml.scopedElement("Text").writeText(mb.m_string.c_str());
-
-            log_contexts();
-
-            xml.endElement();
-        }
-
-        void test_case_skipped(const TestCaseData& in) override {
-            if(opt.no_skipped_summary == false) {
-                test_case_start_impl(in);
-                xml.writeAttribute("skipped", "true");
-                xml.endElement();
-            }
-        }
-    };
-
-    DOCTEST_REGISTER_REPORTER("xml", 0, XmlReporter);
-
-    void fulltext_log_assert_to_stream(std::ostream& s, const AssertData& rb) {
-        if((rb.m_at & (assertType::is_throws_as | assertType::is_throws_with)) ==
-            0) //!OCLINT bitwise operator in conditional
-            s << Color::Cyan << assertString(rb.m_at) << "( " << rb.m_expr << " ) "
-                << Color::None;
-
-        if(rb.m_at & assertType::is_throws) { //!OCLINT bitwise operator in conditional
-            s << (rb.m_threw ? "threw as expected!" : "did NOT throw at all!") << "\n";
-        } else if((rb.m_at & assertType::is_throws_as) &&
-                    (rb.m_at & assertType::is_throws_with)) { //!OCLINT
-            s << Color::Cyan << assertString(rb.m_at) << "( " << rb.m_expr << ", \""
-                << rb.m_exception_string << "\", " << rb.m_exception_type << " ) " << Color::None;
-            if(rb.m_threw) {
-                if(!rb.m_failed) {
-                    s << "threw as expected!\n";
-                } else {
-                    s << "threw a DIFFERENT exception! (contents: " << rb.m_exception << ")\n";
-                }
-            } else {
-                s << "did NOT throw at all!\n";
-            }
-        } else if(rb.m_at &
-                    assertType::is_throws_as) { //!OCLINT bitwise operator in conditional
-            s << Color::Cyan << assertString(rb.m_at) << "( " << rb.m_expr << ", "
-                << rb.m_exception_type << " ) " << Color::None
-                << (rb.m_threw ? (rb.m_threw_as ? "threw as expected!" :
-                                                "threw a DIFFERENT exception: ") :
-                                "did NOT throw at all!")
-                << Color::Cyan << rb.m_exception << "\n";
-        } else if(rb.m_at &
-                    assertType::is_throws_with) { //!OCLINT bitwise operator in conditional
-            s << Color::Cyan << assertString(rb.m_at) << "( " << rb.m_expr << ", \""
-                << rb.m_exception_string << "\" ) " << Color::None
-                << (rb.m_threw ? (!rb.m_failed ? "threw as expected!" :
-                                                "threw a DIFFERENT exception: ") :
-                                "did NOT throw at all!")
-                << Color::Cyan << rb.m_exception << "\n";
-        } else if(rb.m_at & assertType::is_nothrow) { //!OCLINT bitwise operator in conditional
-            s << (rb.m_threw ? "THREW exception: " : "didn't throw!") << Color::Cyan
-                << rb.m_exception << "\n";
-        } else {
-            s << (rb.m_threw ? "THREW exception: " :
-                                (!rb.m_failed ? "is correct!\n" : "is NOT correct!\n"));
-            if(rb.m_threw)
-                s << rb.m_exception << "\n";
-            else
-                s << "  values: " << assertString(rb.m_at) << "( " << rb.m_decomp << " )\n";
-        }
-    }
-
-    // TODO:
-    // - log_message()
-    // - respond to queries
-    // - honor remaining options
-    // - more attributes in tags
-    struct JUnitReporter : public IReporter
-    {
-        XmlWriter  xml;
-        std::mutex mutex;
-        Timer timer;
-        std::vector<String> deepestSubcaseStackNames;
-
-        struct JUnitTestCaseData
-        {
-DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wdeprecated-declarations") // gmtime
-            static std::string getCurrentTimestamp() {
-                // Beware, this is not reentrant because of backward compatibility issues
-                // Also, UTC only, again because of backward compatibility (%z is C++11)
-                time_t rawtime;
-                std::time(&rawtime);
-                auto const timeStampSize = sizeof("2017-01-16T17:06:45Z");
-
-                std::tm* timeInfo;
-                timeInfo = std::gmtime(&rawtime);
-
-                char timeStamp[timeStampSize];
-                const char* const fmt = "%Y-%m-%dT%H:%M:%SZ";
-
-                std::strftime(timeStamp, timeStampSize, fmt, timeInfo);
-                return std::string(timeStamp);
-            }
-DOCTEST_CLANG_SUPPRESS_WARNING_POP
-
-            struct JUnitTestMessage
-            {
-                JUnitTestMessage(const std::string& _message, const std::string& _type, const std::string& _details)
-                    : message(_message), type(_type), details(_details) {}
-
-                JUnitTestMessage(const std::string& _message, const std::string& _details)
-                    : message(_message), type(), details(_details) {}
-
-                std::string message, type, details;
-            };
-
-            struct JUnitTestCase
-            {
-                JUnitTestCase(const std::string& _classname, const std::string& _name)
-                    : classname(_classname), name(_name), time(0), failures() {}
-
-                std::string classname, name;
-                double time;
-                std::vector<JUnitTestMessage> failures, errors;
-            };
-
-            void add(const std::string& classname, const std::string& name) {
-                testcases.emplace_back(classname, name);
-            }
-
-            void appendSubcaseNamesToLastTestcase(std::vector<String> nameStack) {
-                for(auto& curr: nameStack)
-                    if(curr.size())
-                        testcases.back().name += std::string("/") + curr.c_str();
-            }
-
-            void addTime(double time) {
-                if(time < 1e-4)
-                    time = 0;
-                testcases.back().time = time;
-                totalSeconds += time;
-            }
-
-            void addFailure(const std::string& message, const std::string& type, const std::string& details) {
-                testcases.back().failures.emplace_back(message, type, details);
-                ++totalFailures;
-            }
-
-            void addError(const std::string& message, const std::string& details) {
-                testcases.back().errors.emplace_back(message, details);
-                ++totalErrors;
-            }
-
-            std::vector<JUnitTestCase> testcases;
-            double totalSeconds = 0;
-            int totalErrors = 0, totalFailures = 0;
-        };
-
-        JUnitTestCaseData testCaseData;
-
-        // caching pointers/references to objects of these types - safe to do
-        const ContextOptions& opt;
-        const TestCaseData*   tc = nullptr;
-
-        JUnitReporter(const ContextOptions& co)
-                : xml(*co.cout)
-                , opt(co) {}
-
-        unsigned line(unsigned l) const { return opt.no_line_numbers ? 0 : l; }
-
-        // =========================================================================================
-        // WHAT FOLLOWS ARE OVERRIDES OF THE VIRTUAL METHODS OF THE REPORTER INTERFACE
-        // =========================================================================================
-
-        void report_query(const QueryData&) override {}
-
-        void test_run_start() override {}
-
-        void test_run_end(const TestRunStats& p) override {
-            // remove .exe extension - mainly to have the same output on UNIX and Windows
-            std::string binary_name = skipPathFromFilename(opt.binary_name.c_str());
-#ifdef DOCTEST_PLATFORM_WINDOWS
-            if(binary_name.rfind(".exe") != std::string::npos)
-                binary_name = binary_name.substr(0, binary_name.length() - 4);
-#endif // DOCTEST_PLATFORM_WINDOWS
-            xml.startElement("testsuites");
-            xml.startElement("testsuite").writeAttribute("name", binary_name)
-                    .writeAttribute("errors", testCaseData.totalErrors)
-                    .writeAttribute("failures", testCaseData.totalFailures)
-                    .writeAttribute("tests", p.numAsserts);
-            if(opt.no_time_in_output == false) {
-                xml.writeAttribute("time", testCaseData.totalSeconds);
-                xml.writeAttribute("timestamp", JUnitTestCaseData::getCurrentTimestamp());
-            }
-            if(opt.no_version == false)
-                xml.writeAttribute("doctest_version", DOCTEST_VERSION_STR);
-
-            for(const auto& testCase : testCaseData.testcases) {
-                xml.startElement("testcase")
-                    .writeAttribute("classname", testCase.classname)
-                    .writeAttribute("name", testCase.name);
-                if(opt.no_time_in_output == false)
-                    xml.writeAttribute("time", testCase.time);
-                // This is not ideal, but it should be enough to mimic gtest's junit output.
-                xml.writeAttribute("status", "run");
-
-                for(const auto& failure : testCase.failures) {
-                    xml.scopedElement("failure")
-                        .writeAttribute("message", failure.message)
-                        .writeAttribute("type", failure.type)
-                        .writeText(failure.details, false);
-                }
-
-                for(const auto& error : testCase.errors) {
-                    xml.scopedElement("error")
-                        .writeAttribute("message", error.message)
-                        .writeText(error.details);
-                }
-
-                xml.endElement();
-            }
-            xml.endElement();
-            xml.endElement();
-        }
-
-        void test_case_start(const TestCaseData& in) override {
-            testCaseData.add(skipPathFromFilename(in.m_file.c_str()), in.m_name);
-            timer.start();
-        }
-
-        void test_case_reenter(const TestCaseData& in) override {
-            testCaseData.addTime(timer.getElapsedSeconds());
-            testCaseData.appendSubcaseNamesToLastTestcase(deepestSubcaseStackNames);
-            deepestSubcaseStackNames.clear();
-
-            timer.start();
-            testCaseData.add(skipPathFromFilename(in.m_file.c_str()), in.m_name);
-        }
-
-        void test_case_end(const CurrentTestCaseStats&) override {
-            testCaseData.addTime(timer.getElapsedSeconds());
-            testCaseData.appendSubcaseNamesToLastTestcase(deepestSubcaseStackNames);
-            deepestSubcaseStackNames.clear();
-        }
-
-        void test_case_exception(const TestCaseException& e) override {
-            std::lock_guard<std::mutex> lock(mutex);
-            testCaseData.addError("exception", e.error_string.c_str());
-        }
-
-        void subcase_start(const SubcaseSignature& in) override {
-            std::lock_guard<std::mutex> lock(mutex);
-            deepestSubcaseStackNames.push_back(in.m_name);
-        }
-
-        void subcase_end() override {}
-
-        void log_assert(const AssertData& rb) override {
-            if(!rb.m_failed) // report only failures & ignore the `success` option
-                return;
-
-            std::lock_guard<std::mutex> lock(mutex);
-
-            std::ostringstream os;
-            os << skipPathFromFilename(rb.m_file) << (opt.gnu_file_line ? ":" : "(")
-              << line(rb.m_line) << (opt.gnu_file_line ? ":" : "):") << std::endl;
-
-            fulltext_log_assert_to_stream(os, rb);
-            log_contexts(os);
-            testCaseData.addFailure(rb.m_decomp.c_str(), assertString(rb.m_at), os.str());
-        }
-
-        void log_message(const MessageData&) override {}
-
-        void test_case_skipped(const TestCaseData&) override {}
-
-        void log_contexts(std::ostringstream& s) {
-            int num_contexts = get_num_active_contexts();
-            if(num_contexts) {
-                auto contexts = get_active_contexts();
-
-                s << "  logged: ";
-                for(int i = 0; i < num_contexts; ++i) {
-                    s << (i == 0 ? "" : "          ");
-                    contexts[i]->stringify(&s);
-                    s << std::endl;
-                }
-            }
-        }
-    };
-
-    DOCTEST_REGISTER_REPORTER("junit", 0, JUnitReporter);
-
-    struct Whitespace
-    {
-        int nrSpaces;
-        explicit Whitespace(int nr)
-                : nrSpaces(nr) {}
-    };
-
-    std::ostream& operator<<(std::ostream& out, const Whitespace& ws) {
-        if(ws.nrSpaces != 0)
-            out << std::setw(ws.nrSpaces) << ' ';
-        return out;
-    }
-
-    struct ConsoleReporter : public IReporter
-    {
-        std::ostream&                 s;
-        bool                          hasLoggedCurrentTestStart;
-        std::vector<SubcaseSignature> subcasesStack;
-        size_t                        currentSubcaseLevel;
-        std::mutex                    mutex;
-
-        // caching pointers/references to objects of these types - safe to do
-        const ContextOptions& opt;
-        const TestCaseData*   tc;
-
-        ConsoleReporter(const ContextOptions& co)
-                : s(*co.cout)
-                , opt(co) {}
-
-        ConsoleReporter(const ContextOptions& co, std::ostream& ostr)
-                : s(ostr)
-                , opt(co) {}
-
-        // =========================================================================================
-        // WHAT FOLLOWS ARE HELPERS USED BY THE OVERRIDES OF THE VIRTUAL METHODS OF THE INTERFACE
-        // =========================================================================================
-
-        void separator_to_stream() {
-            s << Color::Yellow
-              << "==============================================================================="
-                 "\n";
-        }
-
-        const char* getSuccessOrFailString(bool success, assertType::Enum at,
-                                           const char* success_str) {
-            if(success)
-                return success_str;
-            return failureString(at);
-        }
-
-        Color::Enum getSuccessOrFailColor(bool success, assertType::Enum at) {
-            return success ? Color::BrightGreen :
-                             (at & assertType::is_warn) ? Color::Yellow : Color::Red;
-        }
-
-        void successOrFailColoredStringToStream(bool success, assertType::Enum at,
-                                                const char* success_str = "SUCCESS") {
-            s << getSuccessOrFailColor(success, at)
-              << getSuccessOrFailString(success, at, success_str) << ": ";
-        }
-
-        void log_contexts() {
-            int num_contexts = get_num_active_contexts();
-            if(num_contexts) {
-                auto contexts = get_active_contexts();
-
-                s << Color::None << "  logged: ";
-                for(int i = 0; i < num_contexts; ++i) {
-                    s << (i == 0 ? "" : "          ");
-                    contexts[i]->stringify(&s);
-                    s << "\n";
-                }
-            }
-
-            s << "\n";
-        }
-
-        // this was requested to be made virtual so users could override it
-        virtual void file_line_to_stream(const char* file, int line,
-                                        const char* tail = "") {
-            s << Color::LightGrey << skipPathFromFilename(file) << (opt.gnu_file_line ? ":" : "(")
-            << (opt.no_line_numbers ? 0 : line) // 0 or the real num depending on the option
-            << (opt.gnu_file_line ? ":" : "):") << tail;
-        }
-
-        void logTestStart() {
-            if(hasLoggedCurrentTestStart)
-                return;
-
-            separator_to_stream();
-            file_line_to_stream(tc->m_file.c_str(), tc->m_line, "\n");
-            if(tc->m_description)
-                s << Color::Yellow << "DESCRIPTION: " << Color::None << tc->m_description << "\n";
-            if(tc->m_test_suite && tc->m_test_suite[0] != '\0')
-                s << Color::Yellow << "TEST SUITE: " << Color::None << tc->m_test_suite << "\n";
-            if(strncmp(tc->m_name, "  Scenario:", 11) != 0)
-                s << Color::Yellow << "TEST CASE:  ";
-            s << Color::None << tc->m_name << "\n";
-
-            for(size_t i = 0; i < currentSubcaseLevel; ++i) {
-                if(subcasesStack[i].m_name[0] != '\0')
-                    s << "  " << subcasesStack[i].m_name << "\n";
-            }
-
-            if(currentSubcaseLevel != subcasesStack.size()) {
-                s << Color::Yellow << "\nDEEPEST SUBCASE STACK REACHED (DIFFERENT FROM THE CURRENT ONE):\n" << Color::None;
-                for(size_t i = 0; i < subcasesStack.size(); ++i) {
-                    if(subcasesStack[i].m_name[0] != '\0')
-                        s << "  " << subcasesStack[i].m_name << "\n";
-                }
-            }
-
-            s << "\n";
-
-            hasLoggedCurrentTestStart = true;
-        }
-
-        void printVersion() {
-            if(opt.no_version == false)
-                s << Color::Cyan << "[doctest] " << Color::None << "doctest version is \""
-                  << DOCTEST_VERSION_STR << "\"\n";
-        }
-
-        void printIntro() {
-            printVersion();
-            s << Color::Cyan << "[doctest] " << Color::None
-              << "run with \"--" DOCTEST_OPTIONS_PREFIX_DISPLAY "help\" for options\n";
-        }
-
-        void printHelp() {
-            int sizePrefixDisplay = static_cast<int>(strlen(DOCTEST_OPTIONS_PREFIX_DISPLAY));
-            printVersion();
-            // clang-format off
-            s << Color::Cyan << "[doctest]\n" << Color::None;
-            s << Color::Cyan << "[doctest] " << Color::None;
-            s << "boolean values: \"1/on/yes/true\" or \"0/off/no/false\"\n";
-            s << Color::Cyan << "[doctest] " << Color::None;
-            s << "filter  values: \"str1,str2,str3\" (comma separated strings)\n";
-            s << Color::Cyan << "[doctest]\n" << Color::None;
-            s << Color::Cyan << "[doctest] " << Color::None;
-            s << "filters use wildcards for matching strings\n";
-            s << Color::Cyan << "[doctest] " << Color::None;
-            s << "something passes a filter if any of the strings in a filter matches\n";
-#ifndef DOCTEST_CONFIG_NO_UNPREFIXED_OPTIONS
-            s << Color::Cyan << "[doctest]\n" << Color::None;
-            s << Color::Cyan << "[doctest] " << Color::None;
-            s << "ALL FLAGS, OPTIONS AND FILTERS ALSO AVAILABLE WITH A \"" DOCTEST_CONFIG_OPTIONS_PREFIX "\" PREFIX!!!\n";
-#endif
-            s << Color::Cyan << "[doctest]\n" << Color::None;
-            s << Color::Cyan << "[doctest] " << Color::None;
-            s << "Query flags - the program quits after them. Available:\n\n";
-            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "?,   --" DOCTEST_OPTIONS_PREFIX_DISPLAY "help, -" DOCTEST_OPTIONS_PREFIX_DISPLAY "h                      "
-              << Whitespace(sizePrefixDisplay*0) <<  "prints this message\n";
-            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "v,   --" DOCTEST_OPTIONS_PREFIX_DISPLAY "version                       "
-              << Whitespace(sizePrefixDisplay*1) << "prints the version\n";
-            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "c,   --" DOCTEST_OPTIONS_PREFIX_DISPLAY "count                         "
-              << Whitespace(sizePrefixDisplay*1) << "prints the number of matching tests\n";
-            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "ltc, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "list-test-cases               "
-              << Whitespace(sizePrefixDisplay*1) << "lists all matching tests by name\n";
-            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "lts, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "list-test-suites              "
-              << Whitespace(sizePrefixDisplay*1) << "lists all matching test suites\n";
-            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "lr,  --" DOCTEST_OPTIONS_PREFIX_DISPLAY "list-reporters                "
-              << Whitespace(sizePrefixDisplay*1) << "lists all registered reporters\n\n";
-            // ================================================================================== << 79
-            s << Color::Cyan << "[doctest] " << Color::None;
-            s << "The available <int>/<string> options/filters are:\n\n";
-            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "tc,  --" DOCTEST_OPTIONS_PREFIX_DISPLAY "test-case=<filters>           "
-              << Whitespace(sizePrefixDisplay*1) << "filters     tests by their name\n";
-            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "tce, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "test-case-exclude=<filters>   "
-              << Whitespace(sizePrefixDisplay*1) << "filters OUT tests by their name\n";
-            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "sf,  --" DOCTEST_OPTIONS_PREFIX_DISPLAY "source-file=<filters>         "
-              << Whitespace(sizePrefixDisplay*1) << "filters     tests by their file\n";
-            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "sfe, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "source-file-exclude=<filters> "
-              << Whitespace(sizePrefixDisplay*1) << "filters OUT tests by their file\n";
-            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "ts,  --" DOCTEST_OPTIONS_PREFIX_DISPLAY "test-suite=<filters>          "
-              << Whitespace(sizePrefixDisplay*1) << "filters     tests by their test suite\n";
-            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "tse, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "test-suite-exclude=<filters>  "
-              << Whitespace(sizePrefixDisplay*1) << "filters OUT tests by their test suite\n";
-            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "sc,  --" DOCTEST_OPTIONS_PREFIX_DISPLAY "subcase=<filters>             "
-              << Whitespace(sizePrefixDisplay*1) << "filters     subcases by their name\n";
-            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "sce, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "subcase-exclude=<filters>     "
-              << Whitespace(sizePrefixDisplay*1) << "filters OUT subcases by their name\n";
-            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "r,   --" DOCTEST_OPTIONS_PREFIX_DISPLAY "reporters=<filters>           "
-              << Whitespace(sizePrefixDisplay*1) << "reporters to use (console is default)\n";
-            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "o,   --" DOCTEST_OPTIONS_PREFIX_DISPLAY "out=<string>                  "
-              << Whitespace(sizePrefixDisplay*1) << "output filename\n";
-            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "ob,  --" DOCTEST_OPTIONS_PREFIX_DISPLAY "order-by=<string>             "
-              << Whitespace(sizePrefixDisplay*1) << "how the tests should be ordered\n";
-            s << Whitespace(sizePrefixDisplay*3) << "                                       <string> - by [file/suite/name/rand]\n";
-            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "rs,  --" DOCTEST_OPTIONS_PREFIX_DISPLAY "rand-seed=<int>               "
-              << Whitespace(sizePrefixDisplay*1) << "seed for random ordering\n";
-            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "f,   --" DOCTEST_OPTIONS_PREFIX_DISPLAY "first=<int>                   "
-              << Whitespace(sizePrefixDisplay*1) << "the first test passing the filters to\n";
-            s << Whitespace(sizePrefixDisplay*3) << "                                       execute - for range-based execution\n";
-            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "l,   --" DOCTEST_OPTIONS_PREFIX_DISPLAY "last=<int>                    "
-              << Whitespace(sizePrefixDisplay*1) << "the last test passing the filters to\n";
-            s << Whitespace(sizePrefixDisplay*3) << "                                       execute - for range-based execution\n";
-            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "aa,  --" DOCTEST_OPTIONS_PREFIX_DISPLAY "abort-after=<int>             "
-              << Whitespace(sizePrefixDisplay*1) << "stop after <int> failed assertions\n";
-            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "scfl,--" DOCTEST_OPTIONS_PREFIX_DISPLAY "subcase-filter-levels=<int>   "
-              << Whitespace(sizePrefixDisplay*1) << "apply filters for the first <int> levels\n";
-            s << Color::Cyan << "\n[doctest] " << Color::None;
-            s << "Bool options - can be used like flags and true is assumed. Available:\n\n";
-            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "s,   --" DOCTEST_OPTIONS_PREFIX_DISPLAY "success=<bool>                "
-              << Whitespace(sizePrefixDisplay*1) << "include successful assertions in output\n";
-            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "cs,  --" DOCTEST_OPTIONS_PREFIX_DISPLAY "case-sensitive=<bool>         "
-              << Whitespace(sizePrefixDisplay*1) << "filters being treated as case sensitive\n";
-            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "e,   --" DOCTEST_OPTIONS_PREFIX_DISPLAY "exit=<bool>                   "
-              << Whitespace(sizePrefixDisplay*1) << "exits after the tests finish\n";
-            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "d,   --" DOCTEST_OPTIONS_PREFIX_DISPLAY "duration=<bool>               "
-              << Whitespace(sizePrefixDisplay*1) << "prints the time duration of each test\n";
-            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "nt,  --" DOCTEST_OPTIONS_PREFIX_DISPLAY "no-throw=<bool>               "
-              << Whitespace(sizePrefixDisplay*1) << "skips exceptions-related assert checks\n";
-            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "ne,  --" DOCTEST_OPTIONS_PREFIX_DISPLAY "no-exitcode=<bool>            "
-              << Whitespace(sizePrefixDisplay*1) << "returns (or exits) always with success\n";
-            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "nr,  --" DOCTEST_OPTIONS_PREFIX_DISPLAY "no-run=<bool>                 "
-              << Whitespace(sizePrefixDisplay*1) << "skips all runtime doctest operations\n";
-            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "nv,  --" DOCTEST_OPTIONS_PREFIX_DISPLAY "no-version=<bool>             "
-              << Whitespace(sizePrefixDisplay*1) << "omit the framework version in the output\n";
-            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "nc,  --" DOCTEST_OPTIONS_PREFIX_DISPLAY "no-colors=<bool>              "
-              << Whitespace(sizePrefixDisplay*1) << "disables colors in output\n";
-            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "fc,  --" DOCTEST_OPTIONS_PREFIX_DISPLAY "force-colors=<bool>           "
-              << Whitespace(sizePrefixDisplay*1) << "use colors even when not in a tty\n";
-            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "nb,  --" DOCTEST_OPTIONS_PREFIX_DISPLAY "no-breaks=<bool>              "
-              << Whitespace(sizePrefixDisplay*1) << "disables breakpoints in debuggers\n";
-            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "ns,  --" DOCTEST_OPTIONS_PREFIX_DISPLAY "no-skip=<bool>                "
-              << Whitespace(sizePrefixDisplay*1) << "don't skip test cases marked as skip\n";
-            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "gfl, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "gnu-file-line=<bool>          "
-              << Whitespace(sizePrefixDisplay*1) << ":n: vs (n): for line numbers in output\n";
-            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "npf, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "no-path-filenames=<bool>      "
-              << Whitespace(sizePrefixDisplay*1) << "only filenames and no paths in output\n";
-            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "nln, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "no-line-numbers=<bool>        "
-              << Whitespace(sizePrefixDisplay*1) << "0 instead of real line numbers in output\n";
-            // ================================================================================== << 79
-            // clang-format on
-
-            s << Color::Cyan << "\n[doctest] " << Color::None;
-            s << "for more information visit the project documentation\n\n";
-        }
-
-        void printRegisteredReporters() {
-            printVersion();
-            auto printReporters = [this] (const reporterMap& reporters, const char* type) {
-                if(reporters.size()) {
-                    s << Color::Cyan << "[doctest] " << Color::None << "listing all registered " << type << "\n";
-                    for(auto& curr : reporters)
-                        s << "priority: " << std::setw(5) << curr.first.first
-                          << " name: " << curr.first.second << "\n";
-                }
-            };
-            printReporters(getListeners(), "listeners");
-            printReporters(getReporters(), "reporters");
-        }
-
-        void list_query_results() {
-            separator_to_stream();
-            if(opt.count || opt.list_test_cases) {
-                s << Color::Cyan << "[doctest] " << Color::None
-                  << "unskipped test cases passing the current filters: "
-                  << g_cs->numTestCasesPassingFilters << "\n";
-            } else if(opt.list_test_suites) {
-                s << Color::Cyan << "[doctest] " << Color::None
-                  << "unskipped test cases passing the current filters: "
-                  << g_cs->numTestCasesPassingFilters << "\n";
-                s << Color::Cyan << "[doctest] " << Color::None
-                  << "test suites with unskipped test cases passing the current filters: "
-                  << g_cs->numTestSuitesPassingFilters << "\n";
-            }
-        }
-
-        // =========================================================================================
-        // WHAT FOLLOWS ARE OVERRIDES OF THE VIRTUAL METHODS OF THE REPORTER INTERFACE
-        // =========================================================================================
-
-        void report_query(const QueryData& in) override {
-            if(opt.version) {
-                printVersion();
-            } else if(opt.help) {
-                printHelp();
-            } else if(opt.list_reporters) {
-                printRegisteredReporters();
-            } else if(opt.count || opt.list_test_cases) {
-                if(opt.list_test_cases) {
-                    s << Color::Cyan << "[doctest] " << Color::None
-                      << "listing all test case names\n";
-                    separator_to_stream();
-                }
-
-                for(unsigned i = 0; i < in.num_data; ++i)
-                    s << Color::None << in.data[i]->m_name << "\n";
-
-                separator_to_stream();
-
-                s << Color::Cyan << "[doctest] " << Color::None
-                  << "unskipped test cases passing the current filters: "
-                  << g_cs->numTestCasesPassingFilters << "\n";
-
-            } else if(opt.list_test_suites) {
-                s << Color::Cyan << "[doctest] " << Color::None << "listing all test suites\n";
-                separator_to_stream();
-
-                for(unsigned i = 0; i < in.num_data; ++i)
-                    s << Color::None << in.data[i]->m_test_suite << "\n";
-
-                separator_to_stream();
-
-                s << Color::Cyan << "[doctest] " << Color::None
-                  << "unskipped test cases passing the current filters: "
-                  << g_cs->numTestCasesPassingFilters << "\n";
-                s << Color::Cyan << "[doctest] " << Color::None
-                  << "test suites with unskipped test cases passing the current filters: "
-                  << g_cs->numTestSuitesPassingFilters << "\n";
-            }
-        }
-
-        void test_run_start() override { printIntro(); }
-
-        void test_run_end(const TestRunStats& p) override {
-            separator_to_stream();
-            s << std::dec;
-
-            auto totwidth = int(std::ceil(log10((std::max(p.numTestCasesPassingFilters, static_cast<unsigned>(p.numAsserts))) + 1)));
-            auto passwidth = int(std::ceil(log10((std::max(p.numTestCasesPassingFilters - p.numTestCasesFailed, static_cast<unsigned>(p.numAsserts - p.numAssertsFailed))) + 1)));
-            auto failwidth = int(std::ceil(log10((std::max(p.numTestCasesFailed, static_cast<unsigned>(p.numAssertsFailed))) + 1)));
-            const bool anythingFailed = p.numTestCasesFailed > 0 || p.numAssertsFailed > 0;
-            s << Color::Cyan << "[doctest] " << Color::None << "test cases: " << std::setw(totwidth)
-              << p.numTestCasesPassingFilters << " | "
-              << ((p.numTestCasesPassingFilters == 0 || anythingFailed) ? Color::None :
-                                                                          Color::Green)
-              << std::setw(passwidth) << p.numTestCasesPassingFilters - p.numTestCasesFailed << " passed"
-              << Color::None << " | " << (p.numTestCasesFailed > 0 ? Color::Red : Color::None)
-              << std::setw(failwidth) << p.numTestCasesFailed << " failed" << Color::None << " |";
-            if(opt.no_skipped_summary == false) {
-                const int numSkipped = p.numTestCases - p.numTestCasesPassingFilters;
-                s << " " << (numSkipped == 0 ? Color::None : Color::Yellow) << numSkipped
-                  << " skipped" << Color::None;
-            }
-            s << "\n";
-            s << Color::Cyan << "[doctest] " << Color::None << "assertions: " << std::setw(totwidth)
-              << p.numAsserts << " | "
-              << ((p.numAsserts == 0 || anythingFailed) ? Color::None : Color::Green)
-              << std::setw(passwidth) << (p.numAsserts - p.numAssertsFailed) << " passed" << Color::None
-              << " | " << (p.numAssertsFailed > 0 ? Color::Red : Color::None) << std::setw(failwidth)
-              << p.numAssertsFailed << " failed" << Color::None << " |\n";
-            s << Color::Cyan << "[doctest] " << Color::None
-              << "Status: " << (p.numTestCasesFailed > 0 ? Color::Red : Color::Green)
-              << ((p.numTestCasesFailed > 0) ? "FAILURE!" : "SUCCESS!") << Color::None << std::endl;
-        }
-
-        void test_case_start(const TestCaseData& in) override {
-            hasLoggedCurrentTestStart = false;
-            tc                        = &in;
-            subcasesStack.clear();
-            currentSubcaseLevel = 0;
-        }
-        
-        void test_case_reenter(const TestCaseData&) override {
-            subcasesStack.clear();
-        }
-
-        void test_case_end(const CurrentTestCaseStats& st) override {
-            // log the preamble of the test case only if there is something
-            // else to print - something other than that an assert has failed
-            if(opt.duration ||
-               (st.failure_flags && st.failure_flags != TestCaseFailureReason::AssertFailure))
-                logTestStart();
-
-            if(opt.duration)
-                s << Color::None << std::setprecision(6) << std::fixed << st.seconds
-                  << " s: " << tc->m_name << "\n";
-
-            if(st.failure_flags & TestCaseFailureReason::Timeout)
-                s << Color::Red << "Test case exceeded time limit of " << std::setprecision(6)
-                  << std::fixed << tc->m_timeout << "!\n";
-
-            if(st.failure_flags & TestCaseFailureReason::ShouldHaveFailedButDidnt) {
-                s << Color::Red << "Should have failed but didn't! Marking it as failed!\n";
-            } else if(st.failure_flags & TestCaseFailureReason::ShouldHaveFailedAndDid) {
-                s << Color::Yellow << "Failed as expected so marking it as not failed\n";
-            } else if(st.failure_flags & TestCaseFailureReason::CouldHaveFailedAndDid) {
-                s << Color::Yellow << "Allowed to fail so marking it as not failed\n";
-            } else if(st.failure_flags & TestCaseFailureReason::DidntFailExactlyNumTimes) {
-                s << Color::Red << "Didn't fail exactly " << tc->m_expected_failures
-                  << " times so marking it as failed!\n";
-            } else if(st.failure_flags & TestCaseFailureReason::FailedExactlyNumTimes) {
-                s << Color::Yellow << "Failed exactly " << tc->m_expected_failures
-                  << " times as expected so marking it as not failed!\n";
-            }
-            if(st.failure_flags & TestCaseFailureReason::TooManyFailedAsserts) {
-                s << Color::Red << "Aborting - too many failed asserts!\n";
-            }
-            s << Color::None; // lgtm [cpp/useless-expression]
-        }
-
-        void test_case_exception(const TestCaseException& e) override {
-            logTestStart();
-
-            file_line_to_stream(tc->m_file.c_str(), tc->m_line, " ");
-            successOrFailColoredStringToStream(false, e.is_crash ? assertType::is_require :
-                                                                   assertType::is_check);
-            s << Color::Red << (e.is_crash ? "test case CRASHED: " : "test case THREW exception: ")
-              << Color::Cyan << e.error_string << "\n";
-
-            int num_stringified_contexts = get_num_stringified_contexts();
-            if(num_stringified_contexts) {
-                auto stringified_contexts = get_stringified_contexts();
-                s << Color::None << "  logged: ";
-                for(int i = num_stringified_contexts; i > 0; --i) {
-                    s << (i == num_stringified_contexts ? "" : "          ")
-                      << stringified_contexts[i - 1] << "\n";
-                }
-            }
-            s << "\n" << Color::None;
-        }
-
-        void subcase_start(const SubcaseSignature& subc) override {
-            std::lock_guard<std::mutex> lock(mutex);
-            subcasesStack.push_back(subc);
-            ++currentSubcaseLevel;
-            hasLoggedCurrentTestStart = false;
-        }
-
-        void subcase_end() override {
-            std::lock_guard<std::mutex> lock(mutex);
-            --currentSubcaseLevel;
-            hasLoggedCurrentTestStart = false;
-        }
-
-        void log_assert(const AssertData& rb) override {
-            if(!rb.m_failed && !opt.success)
-                return;
-
-            std::lock_guard<std::mutex> lock(mutex);
-
-            logTestStart();
-
-            file_line_to_stream(rb.m_file, rb.m_line, " ");
-            successOrFailColoredStringToStream(!rb.m_failed, rb.m_at);
-
-            fulltext_log_assert_to_stream(s, rb);
-
-            log_contexts();
-        }
-
-        void log_message(const MessageData& mb) override {
-            std::lock_guard<std::mutex> lock(mutex);
-
-            logTestStart();
-
-            file_line_to_stream(mb.m_file, mb.m_line, " ");
-            s << getSuccessOrFailColor(false, mb.m_severity)
-              << getSuccessOrFailString(mb.m_severity & assertType::is_warn, mb.m_severity,
-                                        "MESSAGE") << ": ";
-            s << Color::None << mb.m_string << "\n";
-            log_contexts();
-        }
-
-        void test_case_skipped(const TestCaseData&) override {}
-    };
-
-    DOCTEST_REGISTER_REPORTER("console", 0, ConsoleReporter);
-
-#ifdef DOCTEST_PLATFORM_WINDOWS
-    struct DebugOutputWindowReporter : public ConsoleReporter
-    {
-        DOCTEST_THREAD_LOCAL static std::ostringstream oss;
-
-        DebugOutputWindowReporter(const ContextOptions& co)
-                : ConsoleReporter(co, oss) {}
-
-#define DOCTEST_DEBUG_OUTPUT_REPORTER_OVERRIDE(func, type, arg)                                    \
-    void func(type arg) override {                                                                 \
-        bool with_col = g_no_colors;                                                               \
-        g_no_colors   = false;                                                                     \
-        ConsoleReporter::func(arg);                                                                \
-        DOCTEST_OUTPUT_DEBUG_STRING(oss.str().c_str());                                            \
-        oss.str("");                                                                               \
-        g_no_colors = with_col;                                                                    \
-    }
-
-        DOCTEST_DEBUG_OUTPUT_REPORTER_OVERRIDE(test_run_start, DOCTEST_EMPTY, DOCTEST_EMPTY)
-        DOCTEST_DEBUG_OUTPUT_REPORTER_OVERRIDE(test_run_end, const TestRunStats&, in)
-        DOCTEST_DEBUG_OUTPUT_REPORTER_OVERRIDE(test_case_start, const TestCaseData&, in)
-        DOCTEST_DEBUG_OUTPUT_REPORTER_OVERRIDE(test_case_reenter, const TestCaseData&, in)
-        DOCTEST_DEBUG_OUTPUT_REPORTER_OVERRIDE(test_case_end, const CurrentTestCaseStats&, in)
-        DOCTEST_DEBUG_OUTPUT_REPORTER_OVERRIDE(test_case_exception, const TestCaseException&, in)
-        DOCTEST_DEBUG_OUTPUT_REPORTER_OVERRIDE(subcase_start, const SubcaseSignature&, in)
-        DOCTEST_DEBUG_OUTPUT_REPORTER_OVERRIDE(subcase_end, DOCTEST_EMPTY, DOCTEST_EMPTY)
-        DOCTEST_DEBUG_OUTPUT_REPORTER_OVERRIDE(log_assert, const AssertData&, in)
-        DOCTEST_DEBUG_OUTPUT_REPORTER_OVERRIDE(log_message, const MessageData&, in)
-        DOCTEST_DEBUG_OUTPUT_REPORTER_OVERRIDE(test_case_skipped, const TestCaseData&, in)
-    };
-
-    DOCTEST_THREAD_LOCAL std::ostringstream DebugOutputWindowReporter::oss;
-#endif // DOCTEST_PLATFORM_WINDOWS
-
-    // the implementation of parseOption()
-    bool parseOptionImpl(int argc, const char* const* argv, const char* pattern, String* value) {
-        // going from the end to the beginning and stopping on the first occurrence from the end
-        for(int i = argc; i > 0; --i) {
-            auto index = i - 1;
-            auto temp = std::strstr(argv[index], pattern);
-            if(temp && (value || strlen(temp) == strlen(pattern))) { //!OCLINT prefer early exits and continue
-                // eliminate matches in which the chars before the option are not '-'
-                bool noBadCharsFound = true;
-                auto curr            = argv[index];
-                while(curr != temp) {
-                    if(*curr++ != '-') {
-                        noBadCharsFound = false;
-                        break;
-                    }
-                }
-                if(noBadCharsFound && argv[index][0] == '-') {
-                    if(value) {
-                        // parsing the value of an option
-                        temp += strlen(pattern);
-                        const unsigned len = strlen(temp);
-                        if(len) {
-                            *value = temp;
-                            return true;
-                        }
-                    } else {
-                        // just a flag - no value
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    // parses an option and returns the string after the '=' character
-    bool parseOption(int argc, const char* const* argv, const char* pattern, String* value = nullptr,
-                     const String& defaultVal = String()) {
-        if(value)
-            *value = defaultVal;
-#ifndef DOCTEST_CONFIG_NO_UNPREFIXED_OPTIONS
-        // offset (normally 3 for "dt-") to skip prefix
-        if(parseOptionImpl(argc, argv, pattern + strlen(DOCTEST_CONFIG_OPTIONS_PREFIX), value))
-            return true;
-#endif // DOCTEST_CONFIG_NO_UNPREFIXED_OPTIONS
-        return parseOptionImpl(argc, argv, pattern, value);
-    }
-
-    // locates a flag on the command line
-    bool parseFlag(int argc, const char* const* argv, const char* pattern) {
-        return parseOption(argc, argv, pattern);
-    }
-
-    // parses a comma separated list of words after a pattern in one of the arguments in argv
-    bool parseCommaSepArgs(int argc, const char* const* argv, const char* pattern,
-                           std::vector<String>& res) {
-        String filtersString;
-        if(parseOption(argc, argv, pattern, &filtersString)) {
-            // tokenize with "," as a separator
-            // cppcheck-suppress strtokCalled
-            DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wdeprecated-declarations")
-            auto pch = std::strtok(filtersString.c_str(), ","); // modifies the string
-            while(pch != nullptr) {
-                if(strlen(pch))
-                    res.push_back(pch);
-                // uses the strtok() internal state to go to the next token
-                // cppcheck-suppress strtokCalled
-                pch = std::strtok(nullptr, ",");
-            }
-            DOCTEST_CLANG_SUPPRESS_WARNING_POP
-            return true;
-        }
-        return false;
-    }
-
-    enum optionType
-    {
-        option_bool,
-        option_int
-    };
-
-    // parses an int/bool option from the command line
-    bool parseIntOption(int argc, const char* const* argv, const char* pattern, optionType type,
-                        int& res) {
-        String parsedValue;
-        if(!parseOption(argc, argv, pattern, &parsedValue))
-            return false;
-
-        if(type == 0) {
-            // boolean
-            const char positive[][5] = {"1", "true", "on", "yes"};  // 5 - strlen("true") + 1
-            const char negative[][6] = {"0", "false", "off", "no"}; // 6 - strlen("false") + 1
-
-            // if the value matches any of the positive/negative possibilities
-            for(unsigned i = 0; i < 4; i++) {
-                if(parsedValue.compare(positive[i], true) == 0) {
-                    res = 1; //!OCLINT parameter reassignment
-                    return true;
-                }
-                if(parsedValue.compare(negative[i], true) == 0) {
-                    res = 0; //!OCLINT parameter reassignment
-                    return true;
-                }
-            }
-        } else {
-            // integer
-            // TODO: change this to use std::stoi or something else! currently it uses undefined behavior - assumes '0' on failed parse...
-            int theInt = std::atoi(parsedValue.c_str()); // NOLINT
-            if(theInt != 0) {
-                res = theInt; //!OCLINT parameter reassignment
-                return true;
-            }
-        }
-        return false;
-    }
-} // namespace
-
-Context::Context(int argc, const char* const* argv)
-        : p(new detail::ContextState) {
-    parseArgs(argc, argv, true);
-    if(argc)
-        p->binary_name = argv[0];
-}
-
-Context::~Context() {
-    if(g_cs == p)
-        g_cs = nullptr;
-    delete p;
-}
-
-void Context::applyCommandLine(int argc, const char* const* argv) {
-    parseArgs(argc, argv);
-    if(argc)
-        p->binary_name = argv[0];
-}
-
-// parses args
-void Context::parseArgs(int argc, const char* const* argv, bool withDefaults) {
-    using namespace detail;
-
-    // clang-format off
-    parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "source-file=",        p->filters[0]);
-    parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "sf=",                 p->filters[0]);
-    parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "source-file-exclude=",p->filters[1]);
-    parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "sfe=",                p->filters[1]);
-    parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "test-suite=",         p->filters[2]);
-    parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "ts=",                 p->filters[2]);
-    parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "test-suite-exclude=", p->filters[3]);
-    parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "tse=",                p->filters[3]);
-    parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "test-case=",          p->filters[4]);
-    parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "tc=",                 p->filters[4]);
-    parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "test-case-exclude=",  p->filters[5]);
-    parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "tce=",                p->filters[5]);
-    parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "subcase=",            p->filters[6]);
-    parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "sc=",                 p->filters[6]);
-    parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "subcase-exclude=",    p->filters[7]);
-    parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "sce=",                p->filters[7]);
-    parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "reporters=",          p->filters[8]);
-    parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "r=",                  p->filters[8]);
-    // clang-format on
-
-    int    intRes = 0;
-    String strRes;
-
-#define DOCTEST_PARSE_AS_BOOL_OR_FLAG(name, sname, var, default)                                   \
-    if(parseIntOption(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX name "=", option_bool, intRes) ||  \
-       parseIntOption(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX sname "=", option_bool, intRes))   \
-        p->var = !!intRes;                                                                         \
-    else if(parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX name) ||                           \
-            parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX sname))                            \
-        p->var = true;                                                                             \
-    else if(withDefaults)                                                                          \
-    p->var = default
-
-#define DOCTEST_PARSE_INT_OPTION(name, sname, var, default)                                        \
-    if(parseIntOption(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX name "=", option_int, intRes) ||   \
-       parseIntOption(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX sname "=", option_int, intRes))    \
-        p->var = intRes;                                                                           \
-    else if(withDefaults)                                                                          \
-    p->var = default
-
-#define DOCTEST_PARSE_STR_OPTION(name, sname, var, default)                                        \
-    if(parseOption(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX name "=", &strRes, default) ||        \
-       parseOption(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX sname "=", &strRes, default) ||       \
-       withDefaults)                                                                               \
-    p->var = strRes
-
-    // clang-format off
-    DOCTEST_PARSE_STR_OPTION("out", "o", out, "");
-    DOCTEST_PARSE_STR_OPTION("order-by", "ob", order_by, "file");
-    DOCTEST_PARSE_INT_OPTION("rand-seed", "rs", rand_seed, 0);
-
-    DOCTEST_PARSE_INT_OPTION("first", "f", first, 0);
-    DOCTEST_PARSE_INT_OPTION("last", "l", last, UINT_MAX);
-
-    DOCTEST_PARSE_INT_OPTION("abort-after", "aa", abort_after, 0);
-    DOCTEST_PARSE_INT_OPTION("subcase-filter-levels", "scfl", subcase_filter_levels, INT_MAX);
-
-    DOCTEST_PARSE_AS_BOOL_OR_FLAG("success", "s", success, false);
-    DOCTEST_PARSE_AS_BOOL_OR_FLAG("case-sensitive", "cs", case_sensitive, false);
-    DOCTEST_PARSE_AS_BOOL_OR_FLAG("exit", "e", exit, false);
-    DOCTEST_PARSE_AS_BOOL_OR_FLAG("duration", "d", duration, false);
-    DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-throw", "nt", no_throw, false);
-    DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-exitcode", "ne", no_exitcode, false);
-    DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-run", "nr", no_run, false);
-    DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-version", "nv", no_version, false);
-    DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-colors", "nc", no_colors, false);
-    DOCTEST_PARSE_AS_BOOL_OR_FLAG("force-colors", "fc", force_colors, false);
-    DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-breaks", "nb", no_breaks, false);
-    DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-skip", "ns", no_skip, false);
-    DOCTEST_PARSE_AS_BOOL_OR_FLAG("gnu-file-line", "gfl", gnu_file_line, !bool(DOCTEST_MSVC));
-    DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-path-filenames", "npf", no_path_in_filenames, false);
-    DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-line-numbers", "nln", no_line_numbers, false);
-    DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-debug-output", "ndo", no_debug_output, false);
-    DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-skipped-summary", "nss", no_skipped_summary, false);
-    DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-time-in-output", "ntio", no_time_in_output, false);
-    // clang-format on
-
-    if(withDefaults) {
-        p->help             = false;
-        p->version          = false;
-        p->count            = false;
-        p->list_test_cases  = false;
-        p->list_test_suites = false;
-        p->list_reporters   = false;
-    }
-    if(parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "help") ||
-       parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "h") ||
-       parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "?")) {
-        p->help = true;
-        p->exit = true;
-    }
-    if(parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "version") ||
-       parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "v")) {
-        p->version = true;
-        p->exit    = true;
-    }
-    if(parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "count") ||
-       parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "c")) {
-        p->count = true;
-        p->exit  = true;
-    }
-    if(parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "list-test-cases") ||
-       parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "ltc")) {
-        p->list_test_cases = true;
-        p->exit            = true;
-    }
-    if(parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "list-test-suites") ||
-       parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "lts")) {
-        p->list_test_suites = true;
-        p->exit             = true;
-    }
-    if(parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "list-reporters") ||
-       parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "lr")) {
-        p->list_reporters = true;
-        p->exit           = true;
-    }
-}
-
-// allows the user to add procedurally to the filters from the command line
-void Context::addFilter(const char* filter, const char* value) { setOption(filter, value); }
-
-// allows the user to clear all filters from the command line
-void Context::clearFilters() {
-    for(auto& curr : p->filters)
-        curr.clear();
-}
-
-// allows the user to override procedurally the int/bool options from the command line
-void Context::setOption(const char* option, int value) {
-    setOption(option, toString(value).c_str());
-    // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks)
-}
-
-// allows the user to override procedurally the string options from the command line
-void Context::setOption(const char* option, const char* value) {
-    auto argv   = String("-") + option + "=" + value;
-    auto lvalue = argv.c_str();
-    parseArgs(1, &lvalue);
-}
-
-// users should query this in their main() and exit the program if true
-bool Context::shouldExit() { return p->exit; }
-
-void Context::setAsDefaultForAssertsOutOfTestCases() { g_cs = p; }
-
-void Context::setAssertHandler(detail::assert_handler ah) { p->ah = ah; }
-
-// the main function that does all the filtering and test running
-int Context::run() {
-    using namespace detail;
-
-    // save the old context state in case such was setup - for using asserts out of a testing context
-    auto old_cs = g_cs;
-    // this is the current contest
-    g_cs               = p;
-    is_running_in_test = true;
-
-    g_no_colors = p->no_colors;
-    p->resetRunData();
-
-    // stdout by default
-    p->cout = &std::cout;
-    p->cerr = &std::cerr;
-
-    // or to a file if specified
-    std::fstream fstr;
-    if(p->out.size()) {
-        fstr.open(p->out.c_str(), std::fstream::out);
-        p->cout = &fstr;
-    }
-
-    auto cleanup_and_return = [&]() {
-        if(fstr.is_open())
-            fstr.close();
-
-        // restore context
-        g_cs               = old_cs;
-        is_running_in_test = false;
-
-        // we have to free the reporters which were allocated when the run started
-        for(auto& curr : p->reporters_currently_used)
-            delete curr;
-        p->reporters_currently_used.clear();
-
-        if(p->numTestCasesFailed && !p->no_exitcode)
-            return EXIT_FAILURE;
-        return EXIT_SUCCESS;
-    };
-
-    // setup default reporter if none is given through the command line
-    if(p->filters[8].empty())
-        p->filters[8].push_back("console");
-
-    // check to see if any of the registered reporters has been selected
-    for(auto& curr : getReporters()) {
-        if(matchesAny(curr.first.second.c_str(), p->filters[8], false, p->case_sensitive))
-            p->reporters_currently_used.push_back(curr.second(*g_cs));
-    }
-
-    // TODO: check if there is nothing in reporters_currently_used
-
-    // prepend all listeners
-    for(auto& curr : getListeners())
-        p->reporters_currently_used.insert(p->reporters_currently_used.begin(), curr.second(*g_cs));
-
-#ifdef DOCTEST_PLATFORM_WINDOWS
-    if(isDebuggerActive() && p->no_debug_output == false)
-        p->reporters_currently_used.push_back(new DebugOutputWindowReporter(*g_cs));
-#endif // DOCTEST_PLATFORM_WINDOWS
-
-    // handle version, help and no_run
-    if(p->no_run || p->version || p->help || p->list_reporters) {
-        DOCTEST_ITERATE_THROUGH_REPORTERS(report_query, QueryData());
-
-        return cleanup_and_return();
-    }
-
-    std::vector<const TestCase*> testArray;
-    for(auto& curr : getRegisteredTests())
-        testArray.push_back(&curr);
-    p->numTestCases = testArray.size();
-
-    // sort the collected records
-    if(!testArray.empty()) {
-        if(p->order_by.compare("file", true) == 0) {
-            std::sort(testArray.begin(), testArray.end(), fileOrderComparator);
-        } else if(p->order_by.compare("suite", true) == 0) {
-            std::sort(testArray.begin(), testArray.end(), suiteOrderComparator);
-        } else if(p->order_by.compare("name", true) == 0) {
-            std::sort(testArray.begin(), testArray.end(), nameOrderComparator);
-        } else if(p->order_by.compare("rand", true) == 0) {
-            std::srand(p->rand_seed);
-
-            // random_shuffle implementation
-            const auto first = &testArray[0];
-            for(size_t i = testArray.size() - 1; i > 0; --i) {
-                int idxToSwap = std::rand() % (i + 1); // NOLINT
-
-                const auto temp = first[i];
-
-                first[i]         = first[idxToSwap];
-                first[idxToSwap] = temp;
-            }
-        }
-    }
-
-    std::set<String> testSuitesPassingFilt;
-
-    bool                             query_mode = p->count || p->list_test_cases || p->list_test_suites;
-    std::vector<const TestCaseData*> queryResults;
-
-    if(!query_mode)
-        DOCTEST_ITERATE_THROUGH_REPORTERS(test_run_start, DOCTEST_EMPTY);
-
-    // invoke the registered functions if they match the filter criteria (or just count them)
-    for(auto& curr : testArray) {
-        const auto& tc = *curr;
-
-        bool skip_me = false;
-        if(tc.m_skip && !p->no_skip)
-            skip_me = true;
-
-        if(!matchesAny(tc.m_file.c_str(), p->filters[0], true, p->case_sensitive))
-            skip_me = true;
-        if(matchesAny(tc.m_file.c_str(), p->filters[1], false, p->case_sensitive))
-            skip_me = true;
-        if(!matchesAny(tc.m_test_suite, p->filters[2], true, p->case_sensitive))
-            skip_me = true;
-        if(matchesAny(tc.m_test_suite, p->filters[3], false, p->case_sensitive))
-            skip_me = true;
-        if(!matchesAny(tc.m_name, p->filters[4], true, p->case_sensitive))
-            skip_me = true;
-        if(matchesAny(tc.m_name, p->filters[5], false, p->case_sensitive))
-            skip_me = true;
-
-        if(!skip_me)
-            p->numTestCasesPassingFilters++;
-
-        // skip the test if it is not in the execution range
-        if((p->last < p->numTestCasesPassingFilters && p->first <= p->last) ||
-           (p->first > p->numTestCasesPassingFilters))
-            skip_me = true;
-
-        if(skip_me) {
-            if(!query_mode)
-                DOCTEST_ITERATE_THROUGH_REPORTERS(test_case_skipped, tc);
-            continue;
-        }
-
-        // do not execute the test if we are to only count the number of filter passing tests
-        if(p->count)
-            continue;
-
-        // print the name of the test and don't execute it
-        if(p->list_test_cases) {
-            queryResults.push_back(&tc);
-            continue;
-        }
-
-        // print the name of the test suite if not done already and don't execute it
-        if(p->list_test_suites) {
-            if((testSuitesPassingFilt.count(tc.m_test_suite) == 0) && tc.m_test_suite[0] != '\0') {
-                queryResults.push_back(&tc);
-                testSuitesPassingFilt.insert(tc.m_test_suite);
-                p->numTestSuitesPassingFilters++;
-            }
-            continue;
-        }
-
-        // execute the test if it passes all the filtering
-        {
-            p->currentTest = &tc;
-
-            p->failure_flags = TestCaseFailureReason::None;
-            p->seconds       = 0;
-
-            // reset atomic counters
-            p->numAssertsFailedCurrentTest_atomic = 0;
-            p->numAssertsCurrentTest_atomic       = 0;
-
-            p->subcasesPassed.clear();
-
-            DOCTEST_ITERATE_THROUGH_REPORTERS(test_case_start, tc);
-
-            p->timer.start();
-            
-            bool run_test = true;
-
-            do {
-                // reset some of the fields for subcases (except for the set of fully passed ones)
-                p->should_reenter          = false;
-                p->subcasesCurrentMaxLevel = 0;
-                p->subcasesStack.clear();
-
-                p->shouldLogCurrentException = true;
-
-                // reset stuff for logging with INFO()
-                p->stringifiedContexts.clear();
-
-#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS
-                try {
-#endif // DOCTEST_CONFIG_NO_EXCEPTIONS
-                    FatalConditionHandler fatalConditionHandler; // Handle signals
-                    // execute the test
-                    tc.m_test();
-                    fatalConditionHandler.reset();
-#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS
-                } catch(const TestFailureException&) {
-                    p->failure_flags |= TestCaseFailureReason::AssertFailure;
-                } catch(...) {
-                    DOCTEST_ITERATE_THROUGH_REPORTERS(test_case_exception,
-                                                      {translateActiveException(), false});
-                    p->failure_flags |= TestCaseFailureReason::Exception;
-                }
-#endif // DOCTEST_CONFIG_NO_EXCEPTIONS
-
-                // exit this loop if enough assertions have failed - even if there are more subcases
-                if(p->abort_after > 0 &&
-                   p->numAssertsFailed + p->numAssertsFailedCurrentTest_atomic >= p->abort_after) {
-                    run_test = false;
-                    p->failure_flags |= TestCaseFailureReason::TooManyFailedAsserts;
-                }
-                
-                if(p->should_reenter && run_test)
-                    DOCTEST_ITERATE_THROUGH_REPORTERS(test_case_reenter, tc);
-                if(!p->should_reenter)
-                    run_test = false;
-            } while(run_test);
-
-            p->finalizeTestCaseData();
-
-            DOCTEST_ITERATE_THROUGH_REPORTERS(test_case_end, *g_cs);
-
-            p->currentTest = nullptr;
-
-            // stop executing tests if enough assertions have failed
-            if(p->abort_after > 0 && p->numAssertsFailed >= p->abort_after)
-                break;
-        }
-    }
-
-    if(!query_mode) {
-        DOCTEST_ITERATE_THROUGH_REPORTERS(test_run_end, *g_cs);
-    } else {
-        QueryData qdata;
-        qdata.run_stats = g_cs;
-        qdata.data      = queryResults.data();
-        qdata.num_data  = unsigned(queryResults.size());
-        DOCTEST_ITERATE_THROUGH_REPORTERS(report_query, qdata);
-    }
-
-    // see these issues on the reasoning for this:
-    // - https://github.com/onqtam/doctest/issues/143#issuecomment-414418903
-    // - https://github.com/onqtam/doctest/issues/126
-    auto DOCTEST_FIX_FOR_MACOS_LIBCPP_IOSFWD_STRING_LINK_ERRORS = []() DOCTEST_NOINLINE
-        { std::cout << std::string(); };
-    DOCTEST_FIX_FOR_MACOS_LIBCPP_IOSFWD_STRING_LINK_ERRORS();
-
-    return cleanup_and_return();
-}
-
-IReporter::~IReporter() = default;
-
-int IReporter::get_num_active_contexts() { return detail::g_infoContexts.size(); }
-const IContextScope* const* IReporter::get_active_contexts() {
-    return get_num_active_contexts() ? &detail::g_infoContexts[0] : nullptr;
-}
-
-int IReporter::get_num_stringified_contexts() { return detail::g_cs->stringifiedContexts.size(); }
-const String* IReporter::get_stringified_contexts() {
-    return get_num_stringified_contexts() ? &detail::g_cs->stringifiedContexts[0] : nullptr;
-}
-
-namespace detail {
-    void registerReporterImpl(const char* name, int priority, reporterCreatorFunc c, bool isReporter) {
-        if(isReporter)
-            getReporters().insert(reporterMap::value_type(reporterMap::key_type(priority, name), c));
-        else
-            getListeners().insert(reporterMap::value_type(reporterMap::key_type(priority, name), c));
-    }
-} // namespace detail
-
-} // namespace doctest
-
-#endif // DOCTEST_CONFIG_DISABLE
-
-#ifdef DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4007) // 'function' : must be 'attribute' - see issue #182
-int main(int argc, char** argv) { return doctest::Context(argc, argv).run(); }
-DOCTEST_MSVC_SUPPRESS_WARNING_POP
-#endif // DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-
-DOCTEST_CLANG_SUPPRESS_WARNING_POP
-DOCTEST_MSVC_SUPPRESS_WARNING_POP
-DOCTEST_GCC_SUPPRESS_WARNING_POP
-
-#endif // DOCTEST_LIBRARY_IMPLEMENTATION
-#endif // DOCTEST_CONFIG_IMPLEMENT
diff --git a/external_imported/json/test/thirdparty/fifo_map/LICENSE.MIT b/external_imported/json/test/thirdparty/fifo_map/LICENSE.MIT
deleted file mode 100644
index 8c59cdf21..000000000
--- a/external_imported/json/test/thirdparty/fifo_map/LICENSE.MIT
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License 
-
-Copyright (c) 2015-2017 Niels Lohmann
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/external_imported/json/test/thirdparty/imapdl/gpl-3.0.txt b/external_imported/json/test/thirdparty/imapdl/gpl-3.0.txt
deleted file mode 100644
index f288702d2..000000000
--- a/external_imported/json/test/thirdparty/imapdl/gpl-3.0.txt
+++ /dev/null
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/external_imported/json/tests/CMakeLists.txt b/external_imported/json/tests/CMakeLists.txt
new file mode 100644
index 000000000..a153a6924
--- /dev/null
+++ b/external_imported/json/tests/CMakeLists.txt
@@ -0,0 +1,184 @@
+cmake_minimum_required(VERSION 3.13...3.14)
+
+option(JSON_Valgrind    "Execute test suite with Valgrind." OFF)
+option(JSON_FastTests   "Skip expensive/slow tests." OFF)
+
+set(JSON_32bitTest     AUTO CACHE STRING "Enable the 32bit unit test (ON/OFF/AUTO/ONLY).")
+set(JSON_TestStandards "" CACHE STRING "The list of standards to test explicitly.")
+
+# using an env var, since this will also affect targets executing cmake (such as "ci_test_compiler_default")
+set(JSON_FORCED_GLOBAL_COMPILE_OPTIONS $ENV{JSON_FORCED_GLOBAL_COMPILE_OPTIONS})
+if (NOT "" STREQUAL "$ENV{JSON_FORCED_GLOBAL_COMPILE_OPTIONS}")
+    add_compile_options($ENV{JSON_FORCED_GLOBAL_COMPILE_OPTIONS})
+endif()
+if (NOT "" STREQUAL "$ENV{JSON_FORCED_GLOBAL_LINK_OPTIONS}")
+    add_link_options($ENV{JSON_FORCED_GLOBAL_LINK_OPTIONS})
+endif()
+
+include(test)
+
+#############################################################################
+# override standard support
+#############################################################################
+
+# Clang only supports C++17 starting from Clang 5.0
+if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
+    unset(compiler_supports_cpp_17)
+endif()
+# MSVC 2015 (14.0) does not support C++17
+if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.1)
+    unset(compiler_supports_cpp_17)
+endif()
+
+# Clang C++20 support appears insufficient prior to Clang 9.0 (based on CI build failure)
+if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0)
+    unset(compiler_supports_cpp_20)
+endif()
+# GCC started supporting C++20 features in 8.0 but a test for #3070 segfaults prior to 9.0
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0)
+    unset(compiler_supports_cpp_20)
+endif()
+
+#############################################################################
+# test_main library with shared code to speed up build and common settings
+#############################################################################
+
+add_library(test_main OBJECT src/unit.cpp)
+target_compile_definitions(test_main PUBLIC
+    DOCTEST_CONFIG_SUPER_FAST_ASSERTS
+    JSON_TEST_KEEP_MACROS
+    JSON_TEST_USING_MULTIPLE_HEADERS=$<BOOL:${JSON_MultipleHeaders}>)
+target_compile_features(test_main PRIVATE cxx_std_11)
+target_compile_options(test_main PUBLIC
+    $<$<CXX_COMPILER_ID:MSVC>:/EHsc;$<$<CONFIG:Release>:/Od>>
+    # MSVC: Force to always compile with W4
+    #       Disable warning C4566: character represented by universal-character-name '\uFF01'
+    #                              cannot be represented in the current code page (1252)
+    #       Disable warning C4996: 'nlohmann::basic_json<...>::operator <<': was declared deprecated
+    $<$<CXX_COMPILER_ID:MSVC>:/W4 /wd4566 /wd4996>
+    # https://github.com/nlohmann/json/issues/1114
+    $<$<CXX_COMPILER_ID:MSVC>:/bigobj> $<$<BOOL:${MINGW}>:-Wa,-mbig-obj>
+
+    # https://github.com/nlohmann/json/pull/3229
+    $<$<CXX_COMPILER_ID:Intel>:-diag-disable=2196>
+
+    $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wno-deprecated;-Wno-float-equal>
+    $<$<CXX_COMPILER_ID:GNU>:-Wno-deprecated-declarations>
+    $<$<CXX_COMPILER_ID:Intel>:-diag-disable=1786>)
+target_include_directories(test_main PUBLIC
+    thirdparty/doctest
+    thirdparty/fifo_map
+    ${PROJECT_BINARY_DIR}/include)
+target_link_libraries(test_main PUBLIC ${NLOHMANN_JSON_TARGET_NAME})
+
+#############################################################################
+# define test- and standard-specific build settings
+#############################################################################
+
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
+    AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0
+    AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0 AND NOT MINGW)
+    # fix for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90050
+    json_test_set_test_options(all CXX_STANDARDS 17 LINK_LIBRARIES stdc++fs)
+endif()
+
+if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+    # avoid stack overflow, see https://github.com/nlohmann/json/issues/2955
+    json_test_set_test_options("test-cbor;test-msgpack;test-ubjson;test-bjdata;test-binary_formats" LINK_OPTIONS /STACK:4000000)
+endif()
+
+# disable exceptions for test-disabled_exceptions
+json_test_set_test_options(test-disabled_exceptions
+    COMPILE_DEFINITIONS
+        JSON_NOEXCEPTION
+        # disabled due to https://github.com/nlohmann/json/discussions/2824
+        #$<$<CXX_COMPILER_ID:MSVC>:_HAS_EXCEPTIONS=0>
+    COMPILE_OPTIONS
+        $<$<CXX_COMPILER_ID:AppleClang>:-fno-exceptions> $<$<CXX_COMPILER_ID:Clang>:-fno-exceptions>
+        $<$<CXX_COMPILER_ID:GNU>:-fno-exceptions>
+        $<$<CXX_COMPILER_ID:Intel>:-fno-exceptions> $<$<CXX_COMPILER_ID:IntelLLVM>:-fno-exceptions>
+        # disabled due to https://github.com/nlohmann/json/discussions/2824
+        #$<$<CXX_COMPILER_ID:MSVC>:/EH>
+)
+
+# raise timeout of expensive Unicode test
+json_test_set_test_options(test-unicode4 TEST_PROPERTIES TIMEOUT 3000)
+
+#############################################################################
+# add unit tests
+#############################################################################
+
+if("${JSON_TestStandards}" STREQUAL "")
+    set(test_cxx_standards 11 14 17 20 23)
+    unset(test_force)
+else()
+    set(test_cxx_standards ${JSON_TestStandards})
+    set(test_force FORCE)
+endif()
+
+# Print selected standards marking unavailable ones with brackets
+set(msg_standards "")
+foreach(cxx_standard ${test_cxx_standards})
+    if(compiler_supports_cpp_${cxx_standard})
+        list(APPEND msg_standards ${cxx_standard})
+    else()
+        list(APPEND msg_standards [${cxx_standard}])
+    endif()
+endforeach()
+string(JOIN " " msg_standards ${msg_standards})
+set(msg "Testing standards: ${msg_standards}")
+if(test_force)
+    string(APPEND msg " (forced)")
+endif()
+message(STATUS "${msg}")
+
+# *DO* use json_test_set_test_options() above this line
+
+json_test_should_build_32bit_test(json_32bit_test json_32bit_test_only "${JSON_32bitTest}")
+file(GLOB files src/unit-*.cpp)
+if(json_32bit_test_only)
+    set(files src/unit-32bit.cpp)    
+elseif(NOT json_32bit_test)
+    list(FILTER files EXCLUDE REGEX src/unit-32bit.cpp)
+endif()
+
+foreach(file ${files})
+    json_test_add_test_for(${file} MAIN test_main CXX_STANDARDS ${test_cxx_standards} ${test_force})
+endforeach()
+
+if(json_32bit_test_only)
+    # Skip all other tests in this file
+    return()
+endif()
+
+# test legacy comparison of discarded values
+json_test_set_test_options(test-comparison_legacy
+    COMPILE_DEFINITIONS JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON=1
+)
+json_test_add_test_for(src/unit-comparison.cpp
+    NAME test-comparison_legacy
+    MAIN test_main CXX_STANDARDS ${test_cxx_standards} ${test_force}
+)
+
+# *DO NOT* use json_test_set_test_options() below this line
+
+#############################################################################
+# test ABI compatibility
+#############################################################################
+
+add_subdirectory(abi)
+
+#############################################################################
+# Test the generated build configs
+#############################################################################
+
+# these tests depend on the generated file nlohmann_jsonConfig.cmake
+if (JSON_Install)
+    add_subdirectory(cmake_import)
+    add_subdirectory(cmake_import_minver)
+endif()
+
+add_subdirectory(cmake_add_subdirectory)
+add_subdirectory(cmake_fetch_content)
+add_subdirectory(cmake_fetch_content2)
+add_subdirectory(cmake_target_include_directories)
diff --git a/external_imported/json/tests/Makefile b/external_imported/json/tests/Makefile
new file mode 100644
index 000000000..3a11ce7dd
--- /dev/null
+++ b/external_imported/json/tests/Makefile
@@ -0,0 +1,32 @@
+##############################################################################
+# OSS-Fuzz
+##############################################################################
+
+# The following targets realize the integration to OSS-Fuzz.
+# See <https://github.com/google/oss-fuzz/blob/master/projects/json/build.sh> for more information.
+
+# additional flags
+CXXFLAGS += -std=c++11
+CPPFLAGS += -I ../single_include
+
+FUZZER_ENGINE = src/fuzzer-driver_afl.cpp
+FUZZERS = parse_afl_fuzzer parse_bson_fuzzer parse_cbor_fuzzer parse_msgpack_fuzzer parse_ubjson_fuzzer parse_bjdata_fuzzer
+fuzzers: $(FUZZERS)
+
+parse_afl_fuzzer:
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(FUZZER_ENGINE) src/fuzzer-parse_json.cpp -o $@
+
+parse_bson_fuzzer:
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(FUZZER_ENGINE) src/fuzzer-parse_bson.cpp -o $@
+
+parse_cbor_fuzzer:
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(FUZZER_ENGINE) src/fuzzer-parse_cbor.cpp -o $@
+
+parse_msgpack_fuzzer:
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(FUZZER_ENGINE) src/fuzzer-parse_msgpack.cpp -o $@
+
+parse_ubjson_fuzzer:
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(FUZZER_ENGINE) src/fuzzer-parse_ubjson.cpp -o $@
+
+parse_bjdata_fuzzer:
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(FUZZER_ENGINE) src/fuzzer-parse_bjdata.cpp -o $@
diff --git a/external_imported/json/tests/abi/CMakeLists.txt b/external_imported/json/tests/abi/CMakeLists.txt
new file mode 100644
index 000000000..ba90837cb
--- /dev/null
+++ b/external_imported/json/tests/abi/CMakeLists.txt
@@ -0,0 +1,30 @@
+# common build settings
+add_library(abi_compat_common INTERFACE)
+target_compile_definitions(abi_compat_common INTERFACE
+    DOCTEST_CONFIG_SUPER_FAST_ASSERTS
+    JSON_TEST_KEEP_MACROS)
+target_compile_features(abi_compat_common INTERFACE cxx_std_11)
+target_compile_options(abi_compat_common INTERFACE
+    $<$<CXX_COMPILER_ID:MSVC>:/EHsc;$<$<CONFIG:Release>:/Od>>
+    # MSVC: Force to always compile with W4
+    $<$<CXX_COMPILER_ID:MSVC>:/W4>
+
+    # https://github.com/nlohmann/json/pull/3229
+    $<$<CXX_COMPILER_ID:Intel>:-diag-disable=2196>
+
+    $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wno-deprecated;-Wno-float-equal>
+    $<$<CXX_COMPILER_ID:GNU>:-Wno-deprecated-declarations>
+    $<$<CXX_COMPILER_ID:Intel>:-diag-disable=1786>)
+target_include_directories(abi_compat_common SYSTEM INTERFACE
+    ../thirdparty/doctest
+    include)
+target_link_libraries(abi_compat_common INTERFACE ${NLOHMANN_JSON_TARGET_NAME})
+
+# shared main()
+add_library(abi_compat_main STATIC main.cpp)
+target_link_libraries(abi_compat_main PUBLIC abi_compat_common)
+
+# add individual tests
+add_subdirectory(config)
+add_subdirectory(diag)
+add_subdirectory(inline_ns)
diff --git a/external_imported/json/tests/abi/config/CMakeLists.txt b/external_imported/json/tests/abi/config/CMakeLists.txt
new file mode 100644
index 000000000..3a8367690
--- /dev/null
+++ b/external_imported/json/tests/abi/config/CMakeLists.txt
@@ -0,0 +1,22 @@
+# test the different options to change the namespace
+
+# test default namespace
+add_executable(abi_config_default default.cpp)
+target_link_libraries(abi_config_default PRIVATE abi_compat_main)
+add_test(
+    NAME test-abi_config_default
+    COMMAND abi_config_default ${DOCTEST_TEST_FILTER})
+
+# test no version namespace
+add_executable(abi_config_noversion noversion.cpp)
+target_link_libraries(abi_config_noversion PRIVATE abi_compat_main)
+add_test(
+    NAME test-abi_config_noversion
+    COMMAND abi_config_noversion ${DOCTEST_TEST_FILTER})
+
+# test custom namespace
+add_executable(abi_config_custom custom.cpp)
+target_link_libraries(abi_config_custom PRIVATE abi_compat_main)
+add_test(
+    NAME test-abi_config_custom
+    COMMAND abi_config_custom ${DOCTEST_TEST_FILTER})
diff --git a/external_imported/json/tests/abi/config/config.hpp b/external_imported/json/tests/abi/config/config.hpp
new file mode 100644
index 000000000..8762b2a6b
--- /dev/null
+++ b/external_imported/json/tests/abi/config/config.hpp
@@ -0,0 +1,35 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#pragma once
+
+#include "doctest.h"
+
+#include <iostream>
+#include <regex>
+#include <string>
+
+#define STRINGIZE_EX(x) #x
+#define STRINGIZE(x) STRINGIZE_EX(x)
+
+template<typename T>
+std::string namespace_name(std::string ns, T* /*unused*/ = nullptr) // NOLINT(performance-unnecessary-value-param)
+{
+#if DOCTEST_MSVC && !DOCTEST_CLANG
+    ns = __FUNCSIG__;
+#elif !DOCTEST_CLANG
+    ns = __PRETTY_FUNCTION__;
+#endif
+    std::smatch m;
+
+    // extract the true namespace name from the function signature
+    CAPTURE(ns);
+    CHECK(std::regex_search(ns, m, std::regex("nlohmann(::[a-zA-Z0-9_]+)*::basic_json")));
+
+    return m.str();
+}
diff --git a/external_imported/json/tests/abi/config/custom.cpp b/external_imported/json/tests/abi/config/custom.cpp
new file mode 100644
index 000000000..9e5bb8980
--- /dev/null
+++ b/external_imported/json/tests/abi/config/custom.cpp
@@ -0,0 +1,33 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+#include "config.hpp"
+
+// define custom namespace
+#define NLOHMANN_JSON_NAMESPACE nlohmann // this line may be omitted
+#define NLOHMANN_JSON_NAMESPACE_BEGIN namespace nlohmann {
+#define NLOHMANN_JSON_NAMESPACE_END }
+#include <nlohmann/json_fwd.hpp>
+
+TEST_CASE("custom namespace")
+{
+    // GCC 4.8 fails with regex_error
+#if !DOCTEST_GCC || DOCTEST_GCC >= DOCTEST_COMPILER(4, 9, 0)
+    SECTION("namespace matches expectation")
+    {
+        std::string expected = "nlohmann::basic_json";
+
+        // fallback for Clang
+        const std::string ns{STRINGIZE(NLOHMANN_JSON_NAMESPACE) "::basic_json"};
+
+        CHECK(namespace_name<nlohmann::json>(ns) == expected);
+    }
+#endif
+}
diff --git a/external_imported/json/tests/abi/config/default.cpp b/external_imported/json/tests/abi/config/default.cpp
new file mode 100644
index 000000000..d54ca6ff3
--- /dev/null
+++ b/external_imported/json/tests/abi/config/default.cpp
@@ -0,0 +1,41 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+#include "config.hpp"
+
+#include <nlohmann/json_fwd.hpp>
+
+TEST_CASE("default namespace")
+{
+    // GCC 4.8 fails with regex_error
+#if !DOCTEST_GCC || DOCTEST_GCC >= DOCTEST_COMPILER(4, 9, 0)
+    SECTION("namespace matches expectation")
+    {
+        std::string expected = "nlohmann::json_abi";
+
+#if JSON_DIAGNOSTICS
+        expected += "_diag";
+#endif
+
+#if JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+        expected += "_ldvcmp";
+#endif
+
+        expected += "_v" STRINGIZE(NLOHMANN_JSON_VERSION_MAJOR);
+        expected += "_" STRINGIZE(NLOHMANN_JSON_VERSION_MINOR);
+        expected += "_" STRINGIZE(NLOHMANN_JSON_VERSION_PATCH) "::basic_json";
+
+        // fallback for Clang
+        const std::string ns{STRINGIZE(NLOHMANN_JSON_NAMESPACE) "::basic_json"};
+
+        CHECK(namespace_name<nlohmann::json>(ns) == expected);
+    }
+#endif
+}
diff --git a/external_imported/json/tests/abi/config/noversion.cpp b/external_imported/json/tests/abi/config/noversion.cpp
new file mode 100644
index 000000000..2a7c277d7
--- /dev/null
+++ b/external_imported/json/tests/abi/config/noversion.cpp
@@ -0,0 +1,40 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+#include "config.hpp"
+
+#define NLOHMANN_JSON_NAMESPACE_NO_VERSION 1
+#include <nlohmann/json_fwd.hpp>
+
+TEST_CASE("default namespace without version component")
+{
+    // GCC 4.8 fails with regex_error
+#if !DOCTEST_GCC || DOCTEST_GCC >= DOCTEST_COMPILER(4, 9, 0)
+    SECTION("namespace matches expectation")
+    {
+        std::string expected = "nlohmann::json_abi";
+
+#if JSON_DIAGNOSTICS
+        expected += "_diag";
+#endif
+
+#if JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+        expected += "_ldvcmp";
+#endif
+
+        expected += "::basic_json";
+
+        // fallback for Clang
+        const std::string ns{STRINGIZE(NLOHMANN_JSON_NAMESPACE) "::basic_json"};
+
+        CHECK(namespace_name<nlohmann::json>(ns) == expected);
+    }
+#endif
+}
diff --git a/external_imported/json/tests/abi/diag/CMakeLists.txt b/external_imported/json/tests/abi/diag/CMakeLists.txt
new file mode 100644
index 000000000..3935ff1d9
--- /dev/null
+++ b/external_imported/json/tests/abi/diag/CMakeLists.txt
@@ -0,0 +1,19 @@
+# test linking library built with different JSON_DIAGNOSTICS setting
+# into the same executable
+
+# compile code using JSON_DIAGNOSTICS=1
+add_library(abi_compat_diag_on STATIC diag_on.cpp)
+target_link_libraries(abi_compat_diag_on PUBLIC abi_compat_common)
+
+# compile code using JSON_DIAGNOSTICS=0
+add_library(abi_compat_diag_off STATIC diag_off.cpp)
+target_link_libraries(abi_compat_diag_off PUBLIC abi_compat_common)
+
+# build test executable and add test
+add_executable(abi_compat_diag diag.cpp)
+target_link_libraries(abi_compat_diag PRIVATE
+    abi_compat_main abi_compat_diag_on abi_compat_diag_off)
+
+add_test(
+    NAME test-abi_compat_diag
+    COMMAND abi_compat_diag ${DOCTEST_TEST_FILTER})
diff --git a/external_imported/json/tests/abi/diag/diag.cpp b/external_imported/json/tests/abi/diag/diag.cpp
new file mode 100644
index 000000000..286f75dbe
--- /dev/null
+++ b/external_imported/json/tests/abi/diag/diag.cpp
@@ -0,0 +1,29 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+#include "diag.hpp"
+
+TEST_CASE("ABI compatible diagnostics")
+{
+    SECTION("basic_json size")
+    {
+        // basic_json with diagnostics is larger because of added data members
+        CHECK(json_sizeof_diag_on() == json_sizeof_diag_on_explicit());
+        CHECK(json_sizeof_diag_off() == json_sizeof_diag_off_explicit());
+        CHECK(json_sizeof_diag_on() > json_sizeof_diag_off());
+    }
+
+    SECTION("basic_json at")
+    {
+        // accessing a nonexistent key throws different exception with diagnostics
+        CHECK_THROWS_WITH(json_at_diag_on(), "[json.exception.out_of_range.403] (/foo) key 'bar' not found");
+        CHECK_THROWS_WITH(json_at_diag_off(), "[json.exception.out_of_range.403] key 'bar' not found");
+    }
+}
diff --git a/external_imported/json/tests/abi/diag/diag.hpp b/external_imported/json/tests/abi/diag/diag.hpp
new file mode 100644
index 000000000..1d4d49e9a
--- /dev/null
+++ b/external_imported/json/tests/abi/diag/diag.hpp
@@ -0,0 +1,20 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#pragma once
+
+#include <cstddef>
+
+std::size_t json_sizeof_diag_on();
+std::size_t json_sizeof_diag_on_explicit();
+
+std::size_t json_sizeof_diag_off();
+std::size_t json_sizeof_diag_off_explicit();
+
+void json_at_diag_on();
+void json_at_diag_off();
diff --git a/external_imported/json/tests/abi/diag/diag_off.cpp b/external_imported/json/tests/abi/diag/diag_off.cpp
new file mode 100644
index 000000000..cd0d178f7
--- /dev/null
+++ b/external_imported/json/tests/abi/diag/diag_off.cpp
@@ -0,0 +1,30 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#undef JSON_DIAGNOSTICS
+#define JSON_DIAGNOSTICS 0
+#include <nlohmann/json.hpp>
+
+#include "diag.hpp"
+
+std::size_t json_sizeof_diag_off()
+{
+    return sizeof(nlohmann::json);
+}
+
+std::size_t json_sizeof_diag_off_explicit()
+{
+    return sizeof(::NLOHMANN_JSON_NAMESPACE::json);
+}
+
+void json_at_diag_off()
+{
+    using nlohmann::json;
+    json j = json{{"foo", json::object()}};
+    j.at(json::json_pointer("/foo/bar"));
+}
diff --git a/external_imported/json/tests/abi/diag/diag_on.cpp b/external_imported/json/tests/abi/diag/diag_on.cpp
new file mode 100644
index 000000000..197a2c0c6
--- /dev/null
+++ b/external_imported/json/tests/abi/diag/diag_on.cpp
@@ -0,0 +1,30 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#undef JSON_DIAGNOSTICS
+#define JSON_DIAGNOSTICS 1
+#include <nlohmann/json.hpp>
+
+#include "diag.hpp"
+
+std::size_t json_sizeof_diag_on()
+{
+    return sizeof(nlohmann::json);
+}
+
+std::size_t json_sizeof_diag_on_explicit()
+{
+    return sizeof(::NLOHMANN_JSON_NAMESPACE::json);
+}
+
+void json_at_diag_on()
+{
+    using nlohmann::json;
+    json j = json{{"foo", json::object()}};
+    j.at(json::json_pointer("/foo/bar"));
+}
diff --git a/external_imported/json/tests/abi/include/nlohmann/json_v3_10_5.hpp b/external_imported/json/tests/abi/include/nlohmann/json_v3_10_5.hpp
new file mode 100644
index 000000000..1f8cdcb50
--- /dev/null
+++ b/external_imported/json/tests/abi/include/nlohmann/json_v3_10_5.hpp
@@ -0,0 +1,22091 @@
+/*
+    __ _____ _____ _____
+ __|  |   __|     |   | |  JSON for Modern C++
+|  |  |__   |  |  | | | |  version 3.10.5
+|_____|_____|_____|_|___|  https://github.com/nlohmann/json
+
+Licensed under the MIT License <http://opensource.org/licenses/MIT>.
+SPDX-License-Identifier: MIT
+Copyright (c) 2013-2022 Niels Lohmann <http://nlohmann.me>.
+
+Permission is hereby  granted, free of charge, to any  person obtaining a copy
+of this software and associated  documentation files (the "Software"), to deal
+in the Software  without restriction, including without  limitation the rights
+to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
+copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
+IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
+FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
+AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
+LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+/****************************************************************************\
+ * Note on documentation: The source files contain links to the online      *
+ * documentation of the public API at https://json.nlohmann.me. This URL    *
+ * contains the most recent documentation and should also be applicable to  *
+ * previous versions; documentation for deprecated functions is not         *
+ * removed, but marked deprecated. See "Generate documentation" section in  *
+ * file doc/README.md.                                                      *
+\****************************************************************************/
+
+#ifndef INCLUDE_NLOHMANN_JSON_V3_10_5_HPP_
+#define INCLUDE_NLOHMANN_JSON_V3_10_5_HPP_
+
+#define NLOHMANN_JSON_VERSION_MAJOR 3
+#define NLOHMANN_JSON_VERSION_MINOR 10
+#define NLOHMANN_JSON_VERSION_PATCH 5
+
+#include <algorithm> // all_of, find, for_each
+#include <cstddef> // nullptr_t, ptrdiff_t, size_t
+#include <functional> // hash, less
+#include <initializer_list> // initializer_list
+#ifndef JSON_NO_IO
+    #include <iosfwd> // istream, ostream
+#endif  // JSON_NO_IO
+#include <iterator> // random_access_iterator_tag
+#include <memory> // unique_ptr
+#include <numeric> // accumulate
+#include <string> // string, stoi, to_string
+#include <utility> // declval, forward, move, pair, swap
+#include <vector> // vector
+
+// #include <nlohmann/adl_serializer.hpp>
+
+
+#include <type_traits>
+#include <utility>
+
+// #include <nlohmann/detail/conversions/from_json.hpp>
+
+
+#include <algorithm> // transform
+#include <array> // array
+#include <forward_list> // forward_list
+#include <iterator> // inserter, front_inserter, end
+#include <map> // map
+#include <string> // string
+#include <tuple> // tuple, make_tuple
+#include <type_traits> // is_arithmetic, is_same, is_enum, underlying_type, is_convertible
+#include <unordered_map> // unordered_map
+#include <utility> // pair, declval
+#include <valarray> // valarray
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+
+#include <exception> // exception
+#include <stdexcept> // runtime_error
+#include <string> // to_string
+#include <vector> // vector
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+#include <array> // array
+#include <cstddef> // size_t
+#include <cstdint> // uint8_t
+#include <string> // string
+
+namespace nlohmann
+{
+namespace detail
+{
+///////////////////////////
+// JSON type enumeration //
+///////////////////////////
+
+/*!
+@brief the JSON type enumeration
+
+This enumeration collects the different JSON types. It is internally used to
+distinguish the stored values, and the functions @ref basic_json::is_null(),
+@ref basic_json::is_object(), @ref basic_json::is_array(),
+@ref basic_json::is_string(), @ref basic_json::is_boolean(),
+@ref basic_json::is_number() (with @ref basic_json::is_number_integer(),
+@ref basic_json::is_number_unsigned(), and @ref basic_json::is_number_float()),
+@ref basic_json::is_discarded(), @ref basic_json::is_primitive(), and
+@ref basic_json::is_structured() rely on it.
+
+@note There are three enumeration entries (number_integer, number_unsigned, and
+number_float), because the library distinguishes these three types for numbers:
+@ref basic_json::number_unsigned_t is used for unsigned integers,
+@ref basic_json::number_integer_t is used for signed integers, and
+@ref basic_json::number_float_t is used for floating-point numbers or to
+approximate integers which do not fit in the limits of their respective type.
+
+@sa see @ref basic_json::basic_json(const value_t value_type) -- create a JSON
+value with the default value for a given type
+
+@since version 1.0.0
+*/
+enum class value_t : std::uint8_t
+{
+    null,             ///< null value
+    object,           ///< object (unordered set of name/value pairs)
+    array,            ///< array (ordered collection of values)
+    string,           ///< string value
+    boolean,          ///< boolean value
+    number_integer,   ///< number value (signed integer)
+    number_unsigned,  ///< number value (unsigned integer)
+    number_float,     ///< number value (floating-point)
+    binary,           ///< binary array (ordered collection of bytes)
+    discarded         ///< discarded by the parser callback function
+};
+
+/*!
+@brief comparison operator for JSON types
+
+Returns an ordering that is similar to Python:
+- order: null < boolean < number < object < array < string < binary
+- furthermore, each type is not smaller than itself
+- discarded values are not comparable
+- binary is represented as a b"" string in python and directly comparable to a
+  string; however, making a binary array directly comparable with a string would
+  be surprising behavior in a JSON file.
+
+@since version 1.0.0
+*/
+inline bool operator<(const value_t lhs, const value_t rhs) noexcept
+{
+    static constexpr std::array<std::uint8_t, 9> order = {{
+            0 /* null */, 3 /* object */, 4 /* array */, 5 /* string */,
+            1 /* boolean */, 2 /* integer */, 2 /* unsigned */, 2 /* float */,
+            6 /* binary */
+        }
+    };
+
+    const auto l_index = static_cast<std::size_t>(lhs);
+    const auto r_index = static_cast<std::size_t>(rhs);
+    return l_index < order.size() && r_index < order.size() && order[l_index] < order[r_index];
+}
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/string_escape.hpp>
+
+
+#include <string>
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+#include <utility> // declval, pair
+// #include <nlohmann/thirdparty/hedley/hedley.hpp>
+
+
+/* Hedley - https://nemequ.github.io/hedley
+ * Created by Evan Nemerson <evan@nemerson.com>
+ *
+ * To the extent possible under law, the author(s) have dedicated all
+ * copyright and related and neighboring rights to this software to
+ * the public domain worldwide. This software is distributed without
+ * any warranty.
+ *
+ * For details, see <http://creativecommons.org/publicdomain/zero/1.0/>.
+ * SPDX-License-Identifier: CC0-1.0
+ */
+
+#if !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < 15)
+#if defined(JSON_HEDLEY_VERSION)
+    #undef JSON_HEDLEY_VERSION
+#endif
+#define JSON_HEDLEY_VERSION 15
+
+#if defined(JSON_HEDLEY_STRINGIFY_EX)
+    #undef JSON_HEDLEY_STRINGIFY_EX
+#endif
+#define JSON_HEDLEY_STRINGIFY_EX(x) #x
+
+#if defined(JSON_HEDLEY_STRINGIFY)
+    #undef JSON_HEDLEY_STRINGIFY
+#endif
+#define JSON_HEDLEY_STRINGIFY(x) JSON_HEDLEY_STRINGIFY_EX(x)
+
+#if defined(JSON_HEDLEY_CONCAT_EX)
+    #undef JSON_HEDLEY_CONCAT_EX
+#endif
+#define JSON_HEDLEY_CONCAT_EX(a,b) a##b
+
+#if defined(JSON_HEDLEY_CONCAT)
+    #undef JSON_HEDLEY_CONCAT
+#endif
+#define JSON_HEDLEY_CONCAT(a,b) JSON_HEDLEY_CONCAT_EX(a,b)
+
+#if defined(JSON_HEDLEY_CONCAT3_EX)
+    #undef JSON_HEDLEY_CONCAT3_EX
+#endif
+#define JSON_HEDLEY_CONCAT3_EX(a,b,c) a##b##c
+
+#if defined(JSON_HEDLEY_CONCAT3)
+    #undef JSON_HEDLEY_CONCAT3
+#endif
+#define JSON_HEDLEY_CONCAT3(a,b,c) JSON_HEDLEY_CONCAT3_EX(a,b,c)
+
+#if defined(JSON_HEDLEY_VERSION_ENCODE)
+    #undef JSON_HEDLEY_VERSION_ENCODE
+#endif
+#define JSON_HEDLEY_VERSION_ENCODE(major,minor,revision) (((major) * 1000000) + ((minor) * 1000) + (revision))
+
+#if defined(JSON_HEDLEY_VERSION_DECODE_MAJOR)
+    #undef JSON_HEDLEY_VERSION_DECODE_MAJOR
+#endif
+#define JSON_HEDLEY_VERSION_DECODE_MAJOR(version) ((version) / 1000000)
+
+#if defined(JSON_HEDLEY_VERSION_DECODE_MINOR)
+    #undef JSON_HEDLEY_VERSION_DECODE_MINOR
+#endif
+#define JSON_HEDLEY_VERSION_DECODE_MINOR(version) (((version) % 1000000) / 1000)
+
+#if defined(JSON_HEDLEY_VERSION_DECODE_REVISION)
+    #undef JSON_HEDLEY_VERSION_DECODE_REVISION
+#endif
+#define JSON_HEDLEY_VERSION_DECODE_REVISION(version) ((version) % 1000)
+
+#if defined(JSON_HEDLEY_GNUC_VERSION)
+    #undef JSON_HEDLEY_GNUC_VERSION
+#endif
+#if defined(__GNUC__) && defined(__GNUC_PATCHLEVEL__)
+    #define JSON_HEDLEY_GNUC_VERSION JSON_HEDLEY_VERSION_ENCODE(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
+#elif defined(__GNUC__)
+    #define JSON_HEDLEY_GNUC_VERSION JSON_HEDLEY_VERSION_ENCODE(__GNUC__, __GNUC_MINOR__, 0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_VERSION_CHECK)
+    #undef JSON_HEDLEY_GNUC_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_GNUC_VERSION)
+    #define JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_GNUC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_MSVC_VERSION)
+    #undef JSON_HEDLEY_MSVC_VERSION
+#endif
+#if defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 140000000) && !defined(__ICL)
+    #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_FULL_VER / 10000000, (_MSC_FULL_VER % 10000000) / 100000, (_MSC_FULL_VER % 100000) / 100)
+#elif defined(_MSC_FULL_VER) && !defined(__ICL)
+    #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_FULL_VER / 1000000, (_MSC_FULL_VER % 1000000) / 10000, (_MSC_FULL_VER % 10000) / 10)
+#elif defined(_MSC_VER) && !defined(__ICL)
+    #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_VER / 100, _MSC_VER % 100, 0)
+#endif
+
+#if defined(JSON_HEDLEY_MSVC_VERSION_CHECK)
+    #undef JSON_HEDLEY_MSVC_VERSION_CHECK
+#endif
+#if !defined(JSON_HEDLEY_MSVC_VERSION)
+    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (0)
+#elif defined(_MSC_VER) && (_MSC_VER >= 1400)
+    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_FULL_VER >= ((major * 10000000) + (minor * 100000) + (patch)))
+#elif defined(_MSC_VER) && (_MSC_VER >= 1200)
+    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_FULL_VER >= ((major * 1000000) + (minor * 10000) + (patch)))
+#else
+    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_VER >= ((major * 100) + (minor)))
+#endif
+
+#if defined(JSON_HEDLEY_INTEL_VERSION)
+    #undef JSON_HEDLEY_INTEL_VERSION
+#endif
+#if defined(__INTEL_COMPILER) && defined(__INTEL_COMPILER_UPDATE) && !defined(__ICL)
+    #define JSON_HEDLEY_INTEL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, __INTEL_COMPILER_UPDATE)
+#elif defined(__INTEL_COMPILER) && !defined(__ICL)
+    #define JSON_HEDLEY_INTEL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, 0)
+#endif
+
+#if defined(JSON_HEDLEY_INTEL_VERSION_CHECK)
+    #undef JSON_HEDLEY_INTEL_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_INTEL_VERSION)
+    #define JSON_HEDLEY_INTEL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_INTEL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_INTEL_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_INTEL_CL_VERSION)
+    #undef JSON_HEDLEY_INTEL_CL_VERSION
+#endif
+#if defined(__INTEL_COMPILER) && defined(__INTEL_COMPILER_UPDATE) && defined(__ICL)
+    #define JSON_HEDLEY_INTEL_CL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER, __INTEL_COMPILER_UPDATE, 0)
+#endif
+
+#if defined(JSON_HEDLEY_INTEL_CL_VERSION_CHECK)
+    #undef JSON_HEDLEY_INTEL_CL_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_INTEL_CL_VERSION)
+    #define JSON_HEDLEY_INTEL_CL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_INTEL_CL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_INTEL_CL_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_PGI_VERSION)
+    #undef JSON_HEDLEY_PGI_VERSION
+#endif
+#if defined(__PGI) && defined(__PGIC__) && defined(__PGIC_MINOR__) && defined(__PGIC_PATCHLEVEL__)
+    #define JSON_HEDLEY_PGI_VERSION JSON_HEDLEY_VERSION_ENCODE(__PGIC__, __PGIC_MINOR__, __PGIC_PATCHLEVEL__)
+#endif
+
+#if defined(JSON_HEDLEY_PGI_VERSION_CHECK)
+    #undef JSON_HEDLEY_PGI_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_PGI_VERSION)
+    #define JSON_HEDLEY_PGI_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_PGI_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_PGI_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_SUNPRO_VERSION)
+    #undef JSON_HEDLEY_SUNPRO_VERSION
+#endif
+#if defined(__SUNPRO_C) && (__SUNPRO_C > 0x1000)
+    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((((__SUNPRO_C >> 16) & 0xf) * 10) + ((__SUNPRO_C >> 12) & 0xf), (((__SUNPRO_C >> 8) & 0xf) * 10) + ((__SUNPRO_C >> 4) & 0xf), (__SUNPRO_C & 0xf) * 10)
+#elif defined(__SUNPRO_C)
+    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((__SUNPRO_C >> 8) & 0xf, (__SUNPRO_C >> 4) & 0xf, (__SUNPRO_C) & 0xf)
+#elif defined(__SUNPRO_CC) && (__SUNPRO_CC > 0x1000)
+    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((((__SUNPRO_CC >> 16) & 0xf) * 10) + ((__SUNPRO_CC >> 12) & 0xf), (((__SUNPRO_CC >> 8) & 0xf) * 10) + ((__SUNPRO_CC >> 4) & 0xf), (__SUNPRO_CC & 0xf) * 10)
+#elif defined(__SUNPRO_CC)
+    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((__SUNPRO_CC >> 8) & 0xf, (__SUNPRO_CC >> 4) & 0xf, (__SUNPRO_CC) & 0xf)
+#endif
+
+#if defined(JSON_HEDLEY_SUNPRO_VERSION_CHECK)
+    #undef JSON_HEDLEY_SUNPRO_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_SUNPRO_VERSION)
+    #define JSON_HEDLEY_SUNPRO_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_SUNPRO_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_SUNPRO_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION)
+    #undef JSON_HEDLEY_EMSCRIPTEN_VERSION
+#endif
+#if defined(__EMSCRIPTEN__)
+    #define JSON_HEDLEY_EMSCRIPTEN_VERSION JSON_HEDLEY_VERSION_ENCODE(__EMSCRIPTEN_major__, __EMSCRIPTEN_minor__, __EMSCRIPTEN_tiny__)
+#endif
+
+#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK)
+    #undef JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION)
+    #define JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_EMSCRIPTEN_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_ARM_VERSION)
+    #undef JSON_HEDLEY_ARM_VERSION
+#endif
+#if defined(__CC_ARM) && defined(__ARMCOMPILER_VERSION)
+    #define JSON_HEDLEY_ARM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ARMCOMPILER_VERSION / 1000000, (__ARMCOMPILER_VERSION % 1000000) / 10000, (__ARMCOMPILER_VERSION % 10000) / 100)
+#elif defined(__CC_ARM) && defined(__ARMCC_VERSION)
+    #define JSON_HEDLEY_ARM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ARMCC_VERSION / 1000000, (__ARMCC_VERSION % 1000000) / 10000, (__ARMCC_VERSION % 10000) / 100)
+#endif
+
+#if defined(JSON_HEDLEY_ARM_VERSION_CHECK)
+    #undef JSON_HEDLEY_ARM_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_ARM_VERSION)
+    #define JSON_HEDLEY_ARM_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_ARM_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_ARM_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_IBM_VERSION)
+    #undef JSON_HEDLEY_IBM_VERSION
+#endif
+#if defined(__ibmxl__)
+    #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ibmxl_version__, __ibmxl_release__, __ibmxl_modification__)
+#elif defined(__xlC__) && defined(__xlC_ver__)
+    #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__xlC__ >> 8, __xlC__ & 0xff, (__xlC_ver__ >> 8) & 0xff)
+#elif defined(__xlC__)
+    #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__xlC__ >> 8, __xlC__ & 0xff, 0)
+#endif
+
+#if defined(JSON_HEDLEY_IBM_VERSION_CHECK)
+    #undef JSON_HEDLEY_IBM_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_IBM_VERSION)
+    #define JSON_HEDLEY_IBM_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_IBM_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_IBM_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_VERSION)
+    #undef JSON_HEDLEY_TI_VERSION
+#endif
+#if \
+    defined(__TI_COMPILER_VERSION__) && \
+    ( \
+      defined(__TMS470__) || defined(__TI_ARM__) || \
+      defined(__MSP430__) || \
+      defined(__TMS320C2000__) \
+    )
+#if (__TI_COMPILER_VERSION__ >= 16000000)
+    #define JSON_HEDLEY_TI_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+#endif
+
+#if defined(JSON_HEDLEY_TI_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_VERSION)
+    #define JSON_HEDLEY_TI_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL2000_VERSION)
+    #undef JSON_HEDLEY_TI_CL2000_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && defined(__TMS320C2000__)
+    #define JSON_HEDLEY_TI_CL2000_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL2000_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_CL2000_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_CL2000_VERSION)
+    #define JSON_HEDLEY_TI_CL2000_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL2000_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_CL2000_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL430_VERSION)
+    #undef JSON_HEDLEY_TI_CL430_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && defined(__MSP430__)
+    #define JSON_HEDLEY_TI_CL430_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL430_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_CL430_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_CL430_VERSION)
+    #define JSON_HEDLEY_TI_CL430_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL430_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_CL430_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_ARMCL_VERSION)
+    #undef JSON_HEDLEY_TI_ARMCL_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && (defined(__TMS470__) || defined(__TI_ARM__))
+    #define JSON_HEDLEY_TI_ARMCL_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_ARMCL_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_ARMCL_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_ARMCL_VERSION)
+    #define JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_ARMCL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL6X_VERSION)
+    #undef JSON_HEDLEY_TI_CL6X_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && defined(__TMS320C6X__)
+    #define JSON_HEDLEY_TI_CL6X_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL6X_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_CL6X_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_CL6X_VERSION)
+    #define JSON_HEDLEY_TI_CL6X_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL6X_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_CL6X_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL7X_VERSION)
+    #undef JSON_HEDLEY_TI_CL7X_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && defined(__C7000__)
+    #define JSON_HEDLEY_TI_CL7X_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL7X_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_CL7X_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_CL7X_VERSION)
+    #define JSON_HEDLEY_TI_CL7X_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL7X_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_CL7X_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_CLPRU_VERSION)
+    #undef JSON_HEDLEY_TI_CLPRU_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && defined(__PRU__)
+    #define JSON_HEDLEY_TI_CLPRU_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_CLPRU_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_CLPRU_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_CLPRU_VERSION)
+    #define JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CLPRU_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_CRAY_VERSION)
+    #undef JSON_HEDLEY_CRAY_VERSION
+#endif
+#if defined(_CRAYC)
+    #if defined(_RELEASE_PATCHLEVEL)
+        #define JSON_HEDLEY_CRAY_VERSION JSON_HEDLEY_VERSION_ENCODE(_RELEASE_MAJOR, _RELEASE_MINOR, _RELEASE_PATCHLEVEL)
+    #else
+        #define JSON_HEDLEY_CRAY_VERSION JSON_HEDLEY_VERSION_ENCODE(_RELEASE_MAJOR, _RELEASE_MINOR, 0)
+    #endif
+#endif
+
+#if defined(JSON_HEDLEY_CRAY_VERSION_CHECK)
+    #undef JSON_HEDLEY_CRAY_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_CRAY_VERSION)
+    #define JSON_HEDLEY_CRAY_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_CRAY_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_CRAY_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_IAR_VERSION)
+    #undef JSON_HEDLEY_IAR_VERSION
+#endif
+#if defined(__IAR_SYSTEMS_ICC__)
+    #if __VER__ > 1000
+        #define JSON_HEDLEY_IAR_VERSION JSON_HEDLEY_VERSION_ENCODE((__VER__ / 1000000), ((__VER__ / 1000) % 1000), (__VER__ % 1000))
+    #else
+        #define JSON_HEDLEY_IAR_VERSION JSON_HEDLEY_VERSION_ENCODE(__VER__ / 100, __VER__ % 100, 0)
+    #endif
+#endif
+
+#if defined(JSON_HEDLEY_IAR_VERSION_CHECK)
+    #undef JSON_HEDLEY_IAR_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_IAR_VERSION)
+    #define JSON_HEDLEY_IAR_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_IAR_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_IAR_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TINYC_VERSION)
+    #undef JSON_HEDLEY_TINYC_VERSION
+#endif
+#if defined(__TINYC__)
+    #define JSON_HEDLEY_TINYC_VERSION JSON_HEDLEY_VERSION_ENCODE(__TINYC__ / 1000, (__TINYC__ / 100) % 10, __TINYC__ % 100)
+#endif
+
+#if defined(JSON_HEDLEY_TINYC_VERSION_CHECK)
+    #undef JSON_HEDLEY_TINYC_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TINYC_VERSION)
+    #define JSON_HEDLEY_TINYC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TINYC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TINYC_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_DMC_VERSION)
+    #undef JSON_HEDLEY_DMC_VERSION
+#endif
+#if defined(__DMC__)
+    #define JSON_HEDLEY_DMC_VERSION JSON_HEDLEY_VERSION_ENCODE(__DMC__ >> 8, (__DMC__ >> 4) & 0xf, __DMC__ & 0xf)
+#endif
+
+#if defined(JSON_HEDLEY_DMC_VERSION_CHECK)
+    #undef JSON_HEDLEY_DMC_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_DMC_VERSION)
+    #define JSON_HEDLEY_DMC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_DMC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_DMC_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_COMPCERT_VERSION)
+    #undef JSON_HEDLEY_COMPCERT_VERSION
+#endif
+#if defined(__COMPCERT_VERSION__)
+    #define JSON_HEDLEY_COMPCERT_VERSION JSON_HEDLEY_VERSION_ENCODE(__COMPCERT_VERSION__ / 10000, (__COMPCERT_VERSION__ / 100) % 100, __COMPCERT_VERSION__ % 100)
+#endif
+
+#if defined(JSON_HEDLEY_COMPCERT_VERSION_CHECK)
+    #undef JSON_HEDLEY_COMPCERT_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_COMPCERT_VERSION)
+    #define JSON_HEDLEY_COMPCERT_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_COMPCERT_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_COMPCERT_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_PELLES_VERSION)
+    #undef JSON_HEDLEY_PELLES_VERSION
+#endif
+#if defined(__POCC__)
+    #define JSON_HEDLEY_PELLES_VERSION JSON_HEDLEY_VERSION_ENCODE(__POCC__ / 100, __POCC__ % 100, 0)
+#endif
+
+#if defined(JSON_HEDLEY_PELLES_VERSION_CHECK)
+    #undef JSON_HEDLEY_PELLES_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_PELLES_VERSION)
+    #define JSON_HEDLEY_PELLES_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_PELLES_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_PELLES_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_MCST_LCC_VERSION)
+    #undef JSON_HEDLEY_MCST_LCC_VERSION
+#endif
+#if defined(__LCC__) && defined(__LCC_MINOR__)
+    #define JSON_HEDLEY_MCST_LCC_VERSION JSON_HEDLEY_VERSION_ENCODE(__LCC__ / 100, __LCC__ % 100, __LCC_MINOR__)
+#endif
+
+#if defined(JSON_HEDLEY_MCST_LCC_VERSION_CHECK)
+    #undef JSON_HEDLEY_MCST_LCC_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_MCST_LCC_VERSION)
+    #define JSON_HEDLEY_MCST_LCC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_MCST_LCC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_MCST_LCC_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_VERSION)
+    #undef JSON_HEDLEY_GCC_VERSION
+#endif
+#if \
+    defined(JSON_HEDLEY_GNUC_VERSION) && \
+    !defined(__clang__) && \
+    !defined(JSON_HEDLEY_INTEL_VERSION) && \
+    !defined(JSON_HEDLEY_PGI_VERSION) && \
+    !defined(JSON_HEDLEY_ARM_VERSION) && \
+    !defined(JSON_HEDLEY_CRAY_VERSION) && \
+    !defined(JSON_HEDLEY_TI_VERSION) && \
+    !defined(JSON_HEDLEY_TI_ARMCL_VERSION) && \
+    !defined(JSON_HEDLEY_TI_CL430_VERSION) && \
+    !defined(JSON_HEDLEY_TI_CL2000_VERSION) && \
+    !defined(JSON_HEDLEY_TI_CL6X_VERSION) && \
+    !defined(JSON_HEDLEY_TI_CL7X_VERSION) && \
+    !defined(JSON_HEDLEY_TI_CLPRU_VERSION) && \
+    !defined(__COMPCERT__) && \
+    !defined(JSON_HEDLEY_MCST_LCC_VERSION)
+    #define JSON_HEDLEY_GCC_VERSION JSON_HEDLEY_GNUC_VERSION
+#endif
+
+#if defined(JSON_HEDLEY_GCC_VERSION_CHECK)
+    #undef JSON_HEDLEY_GCC_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_GCC_VERSION)
+    #define JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_GCC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_ATTRIBUTE)
+    #undef JSON_HEDLEY_HAS_ATTRIBUTE
+#endif
+#if \
+  defined(__has_attribute) && \
+  ( \
+    (!defined(JSON_HEDLEY_IAR_VERSION) || JSON_HEDLEY_IAR_VERSION_CHECK(8,5,9)) \
+  )
+#  define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) __has_attribute(attribute)
+#else
+#  define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_ATTRIBUTE)
+    #undef JSON_HEDLEY_GNUC_HAS_ATTRIBUTE
+#endif
+#if defined(__has_attribute)
+    #define JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_HAS_ATTRIBUTE(attribute)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_ATTRIBUTE)
+    #undef JSON_HEDLEY_GCC_HAS_ATTRIBUTE
+#endif
+#if defined(__has_attribute)
+    #define JSON_HEDLEY_GCC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_HAS_ATTRIBUTE(attribute)
+#else
+    #define JSON_HEDLEY_GCC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_CPP_ATTRIBUTE)
+    #undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE
+#endif
+#if \
+    defined(__has_cpp_attribute) && \
+    defined(__cplusplus) && \
+    (!defined(JSON_HEDLEY_SUNPRO_VERSION) || JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0))
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute) __has_cpp_attribute(attribute)
+#else
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute) (0)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS)
+    #undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS
+#endif
+#if !defined(__cplusplus) || !defined(__has_cpp_attribute)
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) (0)
+#elif \
+    !defined(JSON_HEDLEY_PGI_VERSION) && \
+    !defined(JSON_HEDLEY_IAR_VERSION) && \
+    (!defined(JSON_HEDLEY_SUNPRO_VERSION) || JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0)) && \
+    (!defined(JSON_HEDLEY_MSVC_VERSION) || JSON_HEDLEY_MSVC_VERSION_CHECK(19,20,0))
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) JSON_HEDLEY_HAS_CPP_ATTRIBUTE(ns::attribute)
+#else
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE)
+    #undef JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE
+#endif
+#if defined(__has_cpp_attribute) && defined(__cplusplus)
+    #define JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) __has_cpp_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE)
+    #undef JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE
+#endif
+#if defined(__has_cpp_attribute) && defined(__cplusplus)
+    #define JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) __has_cpp_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_BUILTIN)
+    #undef JSON_HEDLEY_HAS_BUILTIN
+#endif
+#if defined(__has_builtin)
+    #define JSON_HEDLEY_HAS_BUILTIN(builtin) __has_builtin(builtin)
+#else
+    #define JSON_HEDLEY_HAS_BUILTIN(builtin) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_BUILTIN)
+    #undef JSON_HEDLEY_GNUC_HAS_BUILTIN
+#endif
+#if defined(__has_builtin)
+    #define JSON_HEDLEY_GNUC_HAS_BUILTIN(builtin,major,minor,patch) __has_builtin(builtin)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_BUILTIN(builtin,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_BUILTIN)
+    #undef JSON_HEDLEY_GCC_HAS_BUILTIN
+#endif
+#if defined(__has_builtin)
+    #define JSON_HEDLEY_GCC_HAS_BUILTIN(builtin,major,minor,patch) __has_builtin(builtin)
+#else
+    #define JSON_HEDLEY_GCC_HAS_BUILTIN(builtin,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_FEATURE)
+    #undef JSON_HEDLEY_HAS_FEATURE
+#endif
+#if defined(__has_feature)
+    #define JSON_HEDLEY_HAS_FEATURE(feature) __has_feature(feature)
+#else
+    #define JSON_HEDLEY_HAS_FEATURE(feature) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_FEATURE)
+    #undef JSON_HEDLEY_GNUC_HAS_FEATURE
+#endif
+#if defined(__has_feature)
+    #define JSON_HEDLEY_GNUC_HAS_FEATURE(feature,major,minor,patch) __has_feature(feature)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_FEATURE(feature,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_FEATURE)
+    #undef JSON_HEDLEY_GCC_HAS_FEATURE
+#endif
+#if defined(__has_feature)
+    #define JSON_HEDLEY_GCC_HAS_FEATURE(feature,major,minor,patch) __has_feature(feature)
+#else
+    #define JSON_HEDLEY_GCC_HAS_FEATURE(feature,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_EXTENSION)
+    #undef JSON_HEDLEY_HAS_EXTENSION
+#endif
+#if defined(__has_extension)
+    #define JSON_HEDLEY_HAS_EXTENSION(extension) __has_extension(extension)
+#else
+    #define JSON_HEDLEY_HAS_EXTENSION(extension) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_EXTENSION)
+    #undef JSON_HEDLEY_GNUC_HAS_EXTENSION
+#endif
+#if defined(__has_extension)
+    #define JSON_HEDLEY_GNUC_HAS_EXTENSION(extension,major,minor,patch) __has_extension(extension)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_EXTENSION(extension,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_EXTENSION)
+    #undef JSON_HEDLEY_GCC_HAS_EXTENSION
+#endif
+#if defined(__has_extension)
+    #define JSON_HEDLEY_GCC_HAS_EXTENSION(extension,major,minor,patch) __has_extension(extension)
+#else
+    #define JSON_HEDLEY_GCC_HAS_EXTENSION(extension,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE)
+    #undef JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE
+#endif
+#if defined(__has_declspec_attribute)
+    #define JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute) __has_declspec_attribute(attribute)
+#else
+    #define JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE)
+    #undef JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE
+#endif
+#if defined(__has_declspec_attribute)
+    #define JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) __has_declspec_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE)
+    #undef JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE
+#endif
+#if defined(__has_declspec_attribute)
+    #define JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) __has_declspec_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_WARNING)
+    #undef JSON_HEDLEY_HAS_WARNING
+#endif
+#if defined(__has_warning)
+    #define JSON_HEDLEY_HAS_WARNING(warning) __has_warning(warning)
+#else
+    #define JSON_HEDLEY_HAS_WARNING(warning) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_WARNING)
+    #undef JSON_HEDLEY_GNUC_HAS_WARNING
+#endif
+#if defined(__has_warning)
+    #define JSON_HEDLEY_GNUC_HAS_WARNING(warning,major,minor,patch) __has_warning(warning)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_WARNING(warning,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_WARNING)
+    #undef JSON_HEDLEY_GCC_HAS_WARNING
+#endif
+#if defined(__has_warning)
+    #define JSON_HEDLEY_GCC_HAS_WARNING(warning,major,minor,patch) __has_warning(warning)
+#else
+    #define JSON_HEDLEY_GCC_HAS_WARNING(warning,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if \
+    (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || \
+    defined(__clang__) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(18,4,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,7,0) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(2,0,1) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,1,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,0,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_CRAY_VERSION_CHECK(5,0,0) || \
+    JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,17) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(8,0,0) || \
+    (JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) && defined(__C99_PRAGMA_OPERATOR))
+    #define JSON_HEDLEY_PRAGMA(value) _Pragma(#value)
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
+    #define JSON_HEDLEY_PRAGMA(value) __pragma(value)
+#else
+    #define JSON_HEDLEY_PRAGMA(value)
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_PUSH)
+    #undef JSON_HEDLEY_DIAGNOSTIC_PUSH
+#endif
+#if defined(JSON_HEDLEY_DIAGNOSTIC_POP)
+    #undef JSON_HEDLEY_DIAGNOSTIC_POP
+#endif
+#if defined(__clang__)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("clang diagnostic push")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("clang diagnostic pop")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("GCC diagnostic push")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("GCC diagnostic pop")
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH __pragma(warning(push))
+    #define JSON_HEDLEY_DIAGNOSTIC_POP __pragma(warning(pop))
+#elif JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("push")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("pop")
+#elif \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,4,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,1,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("diag_push")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("diag_pop")
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,90,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH
+    #define JSON_HEDLEY_DIAGNOSTIC_POP
+#endif
+
+/* JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_ is for
+   HEDLEY INTERNAL USE ONLY.  API subject to change without notice. */
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_
+#endif
+#if defined(__cplusplus)
+#  if JSON_HEDLEY_HAS_WARNING("-Wc++98-compat")
+#    if JSON_HEDLEY_HAS_WARNING("-Wc++17-extensions")
+#      if JSON_HEDLEY_HAS_WARNING("-Wc++1z-extensions")
+#        define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \
+    _Pragma("clang diagnostic ignored \"-Wc++17-extensions\"") \
+    _Pragma("clang diagnostic ignored \"-Wc++1z-extensions\"") \
+    xpr \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#      else
+#        define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \
+    _Pragma("clang diagnostic ignored \"-Wc++17-extensions\"") \
+    xpr \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#      endif
+#    else
+#      define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \
+    xpr \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#    endif
+#  endif
+#endif
+#if !defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(x) x
+#endif
+
+#if defined(JSON_HEDLEY_CONST_CAST)
+    #undef JSON_HEDLEY_CONST_CAST
+#endif
+#if defined(__cplusplus)
+#  define JSON_HEDLEY_CONST_CAST(T, expr) (const_cast<T>(expr))
+#elif \
+  JSON_HEDLEY_HAS_WARNING("-Wcast-qual") || \
+  JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+#  define JSON_HEDLEY_CONST_CAST(T, expr) (__extension__ ({ \
+        JSON_HEDLEY_DIAGNOSTIC_PUSH \
+        JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL \
+        ((T) (expr)); \
+        JSON_HEDLEY_DIAGNOSTIC_POP \
+    }))
+#else
+#  define JSON_HEDLEY_CONST_CAST(T, expr) ((T) (expr))
+#endif
+
+#if defined(JSON_HEDLEY_REINTERPRET_CAST)
+    #undef JSON_HEDLEY_REINTERPRET_CAST
+#endif
+#if defined(__cplusplus)
+    #define JSON_HEDLEY_REINTERPRET_CAST(T, expr) (reinterpret_cast<T>(expr))
+#else
+    #define JSON_HEDLEY_REINTERPRET_CAST(T, expr) ((T) (expr))
+#endif
+
+#if defined(JSON_HEDLEY_STATIC_CAST)
+    #undef JSON_HEDLEY_STATIC_CAST
+#endif
+#if defined(__cplusplus)
+    #define JSON_HEDLEY_STATIC_CAST(T, expr) (static_cast<T>(expr))
+#else
+    #define JSON_HEDLEY_STATIC_CAST(T, expr) ((T) (expr))
+#endif
+
+#if defined(JSON_HEDLEY_CPP_CAST)
+    #undef JSON_HEDLEY_CPP_CAST
+#endif
+#if defined(__cplusplus)
+#  if JSON_HEDLEY_HAS_WARNING("-Wold-style-cast")
+#    define JSON_HEDLEY_CPP_CAST(T, expr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wold-style-cast\"") \
+    ((T) (expr)) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#  elif JSON_HEDLEY_IAR_VERSION_CHECK(8,3,0)
+#    define JSON_HEDLEY_CPP_CAST(T, expr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("diag_suppress=Pe137") \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#  else
+#    define JSON_HEDLEY_CPP_CAST(T, expr) ((T) (expr))
+#  endif
+#else
+#  define JSON_HEDLEY_CPP_CAST(T, expr) (expr)
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wdeprecated-declarations")
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("warning(disable:1478 1786)")
+#elif JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED __pragma(warning(disable:1478 1786))
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(20,7,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1216,1444,1445")
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1444")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED __pragma(warning(disable:4996))
+#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1444")
+#elif \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1291,1718")
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) && !defined(__cplusplus)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("error_messages(off,E_DEPRECATED_ATT,E_DEPRECATED_ATT_MESS)")
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) && defined(__cplusplus)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("error_messages(off,symdeprecated,symdeprecated2)")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress=Pe1444,Pe1215")
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,90,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("warn(disable:2241)")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas")
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("clang diagnostic ignored \"-Wunknown-pragmas\"")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("warning(disable:161)")
+#elif JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS __pragma(warning(disable:161))
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 1675")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("GCC diagnostic ignored \"-Wunknown-pragmas\"")
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS __pragma(warning(disable:4068))
+#elif \
+    JSON_HEDLEY_TI_VERSION_CHECK(16,9,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,3,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 163")
+#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 163")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress=Pe161")
+#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 161")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wunknown-attributes")
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("clang diagnostic ignored \"-Wunknown-attributes\"")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(17,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("warning(disable:1292)")
+#elif JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES __pragma(warning(disable:1292))
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(19,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES __pragma(warning(disable:5030))
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(20,7,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097,1098")
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097")
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,14,0) && defined(__cplusplus)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("error_messages(off,attrskipunsup)")
+#elif \
+    JSON_HEDLEY_TI_VERSION_CHECK(18,1,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,3,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1173")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress=Pe1097")
+#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wcast-qual")
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("clang diagnostic ignored \"-Wcast-qual\"")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("warning(disable:2203 2331)")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("GCC diagnostic ignored \"-Wcast-qual\"")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wunused-function")
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION _Pragma("clang diagnostic ignored \"-Wunused-function\"")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION _Pragma("GCC diagnostic ignored \"-Wunused-function\"")
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(1,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION __pragma(warning(disable:4505))
+#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION _Pragma("diag_suppress 3142")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION
+#endif
+
+#if defined(JSON_HEDLEY_DEPRECATED)
+    #undef JSON_HEDLEY_DEPRECATED
+#endif
+#if defined(JSON_HEDLEY_DEPRECATED_FOR)
+    #undef JSON_HEDLEY_DEPRECATED_FOR
+#endif
+#if \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_DEPRECATED(since) __declspec(deprecated("Since " # since))
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __declspec(deprecated("Since " #since "; use " #replacement))
+#elif \
+    (JSON_HEDLEY_HAS_EXTENSION(attribute_deprecated_with_message) && !defined(JSON_HEDLEY_IAR_VERSION)) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(18,1,0) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(18,1,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,3,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,3,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_DEPRECATED(since) __attribute__((__deprecated__("Since " #since)))
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __attribute__((__deprecated__("Since " #since "; use " #replacement)))
+#elif defined(__cplusplus) && (__cplusplus >= 201402L)
+    #define JSON_HEDLEY_DEPRECATED(since) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since)]])
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since "; use " #replacement)]])
+#elif \
+    JSON_HEDLEY_HAS_ATTRIBUTE(deprecated) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) || \
+    JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0)
+    #define JSON_HEDLEY_DEPRECATED(since) __attribute__((__deprecated__))
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __attribute__((__deprecated__))
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \
+    JSON_HEDLEY_PELLES_VERSION_CHECK(6,50,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_DEPRECATED(since) __declspec(deprecated)
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __declspec(deprecated)
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DEPRECATED(since) _Pragma("deprecated")
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) _Pragma("deprecated")
+#else
+    #define JSON_HEDLEY_DEPRECATED(since)
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement)
+#endif
+
+#if defined(JSON_HEDLEY_UNAVAILABLE)
+    #undef JSON_HEDLEY_UNAVAILABLE
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(warning) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_UNAVAILABLE(available_since) __attribute__((__warning__("Not available until " #available_since)))
+#else
+    #define JSON_HEDLEY_UNAVAILABLE(available_since)
+#endif
+
+#if defined(JSON_HEDLEY_WARN_UNUSED_RESULT)
+    #undef JSON_HEDLEY_WARN_UNUSED_RESULT
+#endif
+#if defined(JSON_HEDLEY_WARN_UNUSED_RESULT_MSG)
+    #undef JSON_HEDLEY_WARN_UNUSED_RESULT_MSG
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(warn_unused_result) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0) && defined(__cplusplus)) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT __attribute__((__warn_unused_result__))
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) __attribute__((__warn_unused_result__))
+#elif (JSON_HEDLEY_HAS_CPP_ATTRIBUTE(nodiscard) >= 201907L)
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]])
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard(msg)]])
+#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE(nodiscard)
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]])
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]])
+#elif defined(_Check_return_) /* SAL */
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT _Check_return_
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) _Check_return_
+#else
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg)
+#endif
+
+#if defined(JSON_HEDLEY_SENTINEL)
+    #undef JSON_HEDLEY_SENTINEL
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(sentinel) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(5,4,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_SENTINEL(position) __attribute__((__sentinel__(position)))
+#else
+    #define JSON_HEDLEY_SENTINEL(position)
+#endif
+
+#if defined(JSON_HEDLEY_NO_RETURN)
+    #undef JSON_HEDLEY_NO_RETURN
+#endif
+#if JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_NO_RETURN __noreturn
+#elif \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_NO_RETURN __attribute__((__noreturn__))
+#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
+    #define JSON_HEDLEY_NO_RETURN _Noreturn
+#elif defined(__cplusplus) && (__cplusplus >= 201103L)
+    #define JSON_HEDLEY_NO_RETURN JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[noreturn]])
+#elif \
+    JSON_HEDLEY_HAS_ATTRIBUTE(noreturn) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,2,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0)
+    #define JSON_HEDLEY_NO_RETURN __attribute__((__noreturn__))
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
+    #define JSON_HEDLEY_NO_RETURN _Pragma("does_not_return")
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_NO_RETURN __declspec(noreturn)
+#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,0,0) && defined(__cplusplus)
+    #define JSON_HEDLEY_NO_RETURN _Pragma("FUNC_NEVER_RETURNS;")
+#elif JSON_HEDLEY_COMPCERT_VERSION_CHECK(3,2,0)
+    #define JSON_HEDLEY_NO_RETURN __attribute((noreturn))
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(9,0,0)
+    #define JSON_HEDLEY_NO_RETURN __declspec(noreturn)
+#else
+    #define JSON_HEDLEY_NO_RETURN
+#endif
+
+#if defined(JSON_HEDLEY_NO_ESCAPE)
+    #undef JSON_HEDLEY_NO_ESCAPE
+#endif
+#if JSON_HEDLEY_HAS_ATTRIBUTE(noescape)
+    #define JSON_HEDLEY_NO_ESCAPE __attribute__((__noescape__))
+#else
+    #define JSON_HEDLEY_NO_ESCAPE
+#endif
+
+#if defined(JSON_HEDLEY_UNREACHABLE)
+    #undef JSON_HEDLEY_UNREACHABLE
+#endif
+#if defined(JSON_HEDLEY_UNREACHABLE_RETURN)
+    #undef JSON_HEDLEY_UNREACHABLE_RETURN
+#endif
+#if defined(JSON_HEDLEY_ASSUME)
+    #undef JSON_HEDLEY_ASSUME
+#endif
+#if \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_ASSUME(expr) __assume(expr)
+#elif JSON_HEDLEY_HAS_BUILTIN(__builtin_assume)
+    #define JSON_HEDLEY_ASSUME(expr) __builtin_assume(expr)
+#elif \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0)
+    #if defined(__cplusplus)
+        #define JSON_HEDLEY_ASSUME(expr) std::_nassert(expr)
+    #else
+        #define JSON_HEDLEY_ASSUME(expr) _nassert(expr)
+    #endif
+#endif
+#if \
+    (JSON_HEDLEY_HAS_BUILTIN(__builtin_unreachable) && (!defined(JSON_HEDLEY_ARM_VERSION))) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(18,10,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(13,1,5) || \
+    JSON_HEDLEY_CRAY_VERSION_CHECK(10,0,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_UNREACHABLE() __builtin_unreachable()
+#elif defined(JSON_HEDLEY_ASSUME)
+    #define JSON_HEDLEY_UNREACHABLE() JSON_HEDLEY_ASSUME(0)
+#endif
+#if !defined(JSON_HEDLEY_ASSUME)
+    #if defined(JSON_HEDLEY_UNREACHABLE)
+        #define JSON_HEDLEY_ASSUME(expr) JSON_HEDLEY_STATIC_CAST(void, ((expr) ? 1 : (JSON_HEDLEY_UNREACHABLE(), 1)))
+    #else
+        #define JSON_HEDLEY_ASSUME(expr) JSON_HEDLEY_STATIC_CAST(void, expr)
+    #endif
+#endif
+#if defined(JSON_HEDLEY_UNREACHABLE)
+    #if  \
+        JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \
+        JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0)
+        #define JSON_HEDLEY_UNREACHABLE_RETURN(value) return (JSON_HEDLEY_STATIC_CAST(void, JSON_HEDLEY_ASSUME(0)), (value))
+    #else
+        #define JSON_HEDLEY_UNREACHABLE_RETURN(value) JSON_HEDLEY_UNREACHABLE()
+    #endif
+#else
+    #define JSON_HEDLEY_UNREACHABLE_RETURN(value) return (value)
+#endif
+#if !defined(JSON_HEDLEY_UNREACHABLE)
+    #define JSON_HEDLEY_UNREACHABLE() JSON_HEDLEY_ASSUME(0)
+#endif
+
+JSON_HEDLEY_DIAGNOSTIC_PUSH
+#if JSON_HEDLEY_HAS_WARNING("-Wpedantic")
+    #pragma clang diagnostic ignored "-Wpedantic"
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wc++98-compat-pedantic") && defined(__cplusplus)
+    #pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
+#endif
+#if JSON_HEDLEY_GCC_HAS_WARNING("-Wvariadic-macros",4,0,0)
+    #if defined(__clang__)
+        #pragma clang diagnostic ignored "-Wvariadic-macros"
+    #elif defined(JSON_HEDLEY_GCC_VERSION)
+        #pragma GCC diagnostic ignored "-Wvariadic-macros"
+    #endif
+#endif
+#if defined(JSON_HEDLEY_NON_NULL)
+    #undef JSON_HEDLEY_NON_NULL
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(nonnull) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0)
+    #define JSON_HEDLEY_NON_NULL(...) __attribute__((__nonnull__(__VA_ARGS__)))
+#else
+    #define JSON_HEDLEY_NON_NULL(...)
+#endif
+JSON_HEDLEY_DIAGNOSTIC_POP
+
+#if defined(JSON_HEDLEY_PRINTF_FORMAT)
+    #undef JSON_HEDLEY_PRINTF_FORMAT
+#endif
+#if defined(__MINGW32__) && JSON_HEDLEY_GCC_HAS_ATTRIBUTE(format,4,4,0) && !defined(__USE_MINGW_ANSI_STDIO)
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(ms_printf, string_idx, first_to_check)))
+#elif defined(__MINGW32__) && JSON_HEDLEY_GCC_HAS_ATTRIBUTE(format,4,4,0) && defined(__USE_MINGW_ANSI_STDIO)
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(gnu_printf, string_idx, first_to_check)))
+#elif \
+    JSON_HEDLEY_HAS_ATTRIBUTE(format) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(__printf__, string_idx, first_to_check)))
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(6,0,0)
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __declspec(vaformat(printf,string_idx,first_to_check))
+#else
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check)
+#endif
+
+#if defined(JSON_HEDLEY_CONSTEXPR)
+    #undef JSON_HEDLEY_CONSTEXPR
+#endif
+#if defined(__cplusplus)
+    #if __cplusplus >= 201103L
+        #define JSON_HEDLEY_CONSTEXPR JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(constexpr)
+    #endif
+#endif
+#if !defined(JSON_HEDLEY_CONSTEXPR)
+    #define JSON_HEDLEY_CONSTEXPR
+#endif
+
+#if defined(JSON_HEDLEY_PREDICT)
+    #undef JSON_HEDLEY_PREDICT
+#endif
+#if defined(JSON_HEDLEY_LIKELY)
+    #undef JSON_HEDLEY_LIKELY
+#endif
+#if defined(JSON_HEDLEY_UNLIKELY)
+    #undef JSON_HEDLEY_UNLIKELY
+#endif
+#if defined(JSON_HEDLEY_UNPREDICTABLE)
+    #undef JSON_HEDLEY_UNPREDICTABLE
+#endif
+#if JSON_HEDLEY_HAS_BUILTIN(__builtin_unpredictable)
+    #define JSON_HEDLEY_UNPREDICTABLE(expr) __builtin_unpredictable((expr))
+#endif
+#if \
+  (JSON_HEDLEY_HAS_BUILTIN(__builtin_expect_with_probability) && !defined(JSON_HEDLEY_PGI_VERSION)) || \
+  JSON_HEDLEY_GCC_VERSION_CHECK(9,0,0) || \
+  JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+#  define JSON_HEDLEY_PREDICT(expr, value, probability) __builtin_expect_with_probability(  (expr), (value), (probability))
+#  define JSON_HEDLEY_PREDICT_TRUE(expr, probability)   __builtin_expect_with_probability(!!(expr),    1   , (probability))
+#  define JSON_HEDLEY_PREDICT_FALSE(expr, probability)  __builtin_expect_with_probability(!!(expr),    0   , (probability))
+#  define JSON_HEDLEY_LIKELY(expr)                      __builtin_expect                 (!!(expr),    1                  )
+#  define JSON_HEDLEY_UNLIKELY(expr)                    __builtin_expect                 (!!(expr),    0                  )
+#elif \
+  (JSON_HEDLEY_HAS_BUILTIN(__builtin_expect) && !defined(JSON_HEDLEY_INTEL_CL_VERSION)) || \
+  JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+  (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0) && defined(__cplusplus)) || \
+  JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+  JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+  JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+  JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,7,0) || \
+  JSON_HEDLEY_TI_CL430_VERSION_CHECK(3,1,0) || \
+  JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,1,0) || \
+  JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \
+  JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+  JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+  JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,27) || \
+  JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \
+  JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+#  define JSON_HEDLEY_PREDICT(expr, expected, probability) \
+    (((probability) >= 0.9) ? __builtin_expect((expr), (expected)) : (JSON_HEDLEY_STATIC_CAST(void, expected), (expr)))
+#  define JSON_HEDLEY_PREDICT_TRUE(expr, probability) \
+    (__extension__ ({ \
+        double hedley_probability_ = (probability); \
+        ((hedley_probability_ >= 0.9) ? __builtin_expect(!!(expr), 1) : ((hedley_probability_ <= 0.1) ? __builtin_expect(!!(expr), 0) : !!(expr))); \
+    }))
+#  define JSON_HEDLEY_PREDICT_FALSE(expr, probability) \
+    (__extension__ ({ \
+        double hedley_probability_ = (probability); \
+        ((hedley_probability_ >= 0.9) ? __builtin_expect(!!(expr), 0) : ((hedley_probability_ <= 0.1) ? __builtin_expect(!!(expr), 1) : !!(expr))); \
+    }))
+#  define JSON_HEDLEY_LIKELY(expr)   __builtin_expect(!!(expr), 1)
+#  define JSON_HEDLEY_UNLIKELY(expr) __builtin_expect(!!(expr), 0)
+#else
+#  define JSON_HEDLEY_PREDICT(expr, expected, probability) (JSON_HEDLEY_STATIC_CAST(void, expected), (expr))
+#  define JSON_HEDLEY_PREDICT_TRUE(expr, probability) (!!(expr))
+#  define JSON_HEDLEY_PREDICT_FALSE(expr, probability) (!!(expr))
+#  define JSON_HEDLEY_LIKELY(expr) (!!(expr))
+#  define JSON_HEDLEY_UNLIKELY(expr) (!!(expr))
+#endif
+#if !defined(JSON_HEDLEY_UNPREDICTABLE)
+    #define JSON_HEDLEY_UNPREDICTABLE(expr) JSON_HEDLEY_PREDICT(expr, 1, 0.5)
+#endif
+
+#if defined(JSON_HEDLEY_MALLOC)
+    #undef JSON_HEDLEY_MALLOC
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(malloc) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(12,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_MALLOC __attribute__((__malloc__))
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
+    #define JSON_HEDLEY_MALLOC _Pragma("returns_new_memory")
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_MALLOC __declspec(restrict)
+#else
+    #define JSON_HEDLEY_MALLOC
+#endif
+
+#if defined(JSON_HEDLEY_PURE)
+    #undef JSON_HEDLEY_PURE
+#endif
+#if \
+  JSON_HEDLEY_HAS_ATTRIBUTE(pure) || \
+  JSON_HEDLEY_GCC_VERSION_CHECK(2,96,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+  JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+  JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+  JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+  JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+  (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+  (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+  (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+  (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+  JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+  JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+  JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
+  JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+#  define JSON_HEDLEY_PURE __attribute__((__pure__))
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
+#  define JSON_HEDLEY_PURE _Pragma("does_not_write_global_data")
+#elif defined(__cplusplus) && \
+    ( \
+      JSON_HEDLEY_TI_CL430_VERSION_CHECK(2,0,1) || \
+      JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0) || \
+      JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) \
+    )
+#  define JSON_HEDLEY_PURE _Pragma("FUNC_IS_PURE;")
+#else
+#  define JSON_HEDLEY_PURE
+#endif
+
+#if defined(JSON_HEDLEY_CONST)
+    #undef JSON_HEDLEY_CONST
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(const) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(2,5,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_CONST __attribute__((__const__))
+#elif \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
+    #define JSON_HEDLEY_CONST _Pragma("no_side_effect")
+#else
+    #define JSON_HEDLEY_CONST JSON_HEDLEY_PURE
+#endif
+
+#if defined(JSON_HEDLEY_RESTRICT)
+    #undef JSON_HEDLEY_RESTRICT
+#endif
+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && !defined(__cplusplus)
+    #define JSON_HEDLEY_RESTRICT restrict
+#elif \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,4) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,1,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,14,0) && defined(__cplusplus)) || \
+    JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) || \
+    defined(__clang__) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_RESTRICT __restrict
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,3,0) && !defined(__cplusplus)
+    #define JSON_HEDLEY_RESTRICT _Restrict
+#else
+    #define JSON_HEDLEY_RESTRICT
+#endif
+
+#if defined(JSON_HEDLEY_INLINE)
+    #undef JSON_HEDLEY_INLINE
+#endif
+#if \
+    (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || \
+    (defined(__cplusplus) && (__cplusplus >= 199711L))
+    #define JSON_HEDLEY_INLINE inline
+#elif \
+    defined(JSON_HEDLEY_GCC_VERSION) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(6,2,0)
+    #define JSON_HEDLEY_INLINE __inline__
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(12,0,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,1,0) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_INLINE __inline
+#else
+    #define JSON_HEDLEY_INLINE
+#endif
+
+#if defined(JSON_HEDLEY_ALWAYS_INLINE)
+    #undef JSON_HEDLEY_ALWAYS_INLINE
+#endif
+#if \
+  JSON_HEDLEY_HAS_ATTRIBUTE(always_inline) || \
+  JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+  JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+  JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+  JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+  JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+  (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+  (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+  (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+  (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+  JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+  JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+  JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) || \
+  JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0)
+#  define JSON_HEDLEY_ALWAYS_INLINE __attribute__((__always_inline__)) JSON_HEDLEY_INLINE
+#elif \
+  JSON_HEDLEY_MSVC_VERSION_CHECK(12,0,0) || \
+  JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+#  define JSON_HEDLEY_ALWAYS_INLINE __forceinline
+#elif defined(__cplusplus) && \
+    ( \
+      JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+      JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+      JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+      JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \
+      JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+      JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) \
+    )
+#  define JSON_HEDLEY_ALWAYS_INLINE _Pragma("FUNC_ALWAYS_INLINE;")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+#  define JSON_HEDLEY_ALWAYS_INLINE _Pragma("inline=forced")
+#else
+#  define JSON_HEDLEY_ALWAYS_INLINE JSON_HEDLEY_INLINE
+#endif
+
+#if defined(JSON_HEDLEY_NEVER_INLINE)
+    #undef JSON_HEDLEY_NEVER_INLINE
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(noinline) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) || \
+    JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0)
+    #define JSON_HEDLEY_NEVER_INLINE __attribute__((__noinline__))
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_NEVER_INLINE __declspec(noinline)
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(10,2,0)
+    #define JSON_HEDLEY_NEVER_INLINE _Pragma("noinline")
+#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,0,0) && defined(__cplusplus)
+    #define JSON_HEDLEY_NEVER_INLINE _Pragma("FUNC_CANNOT_INLINE;")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_NEVER_INLINE _Pragma("inline=never")
+#elif JSON_HEDLEY_COMPCERT_VERSION_CHECK(3,2,0)
+    #define JSON_HEDLEY_NEVER_INLINE __attribute((noinline))
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(9,0,0)
+    #define JSON_HEDLEY_NEVER_INLINE __declspec(noinline)
+#else
+    #define JSON_HEDLEY_NEVER_INLINE
+#endif
+
+#if defined(JSON_HEDLEY_PRIVATE)
+    #undef JSON_HEDLEY_PRIVATE
+#endif
+#if defined(JSON_HEDLEY_PUBLIC)
+    #undef JSON_HEDLEY_PUBLIC
+#endif
+#if defined(JSON_HEDLEY_IMPORT)
+    #undef JSON_HEDLEY_IMPORT
+#endif
+#if defined(_WIN32) || defined(__CYGWIN__)
+#  define JSON_HEDLEY_PRIVATE
+#  define JSON_HEDLEY_PUBLIC   __declspec(dllexport)
+#  define JSON_HEDLEY_IMPORT   __declspec(dllimport)
+#else
+#  if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(visibility) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \
+    ( \
+      defined(__TI_EABI__) && \
+      ( \
+        (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+        JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) \
+      ) \
+    ) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+#    define JSON_HEDLEY_PRIVATE __attribute__((__visibility__("hidden")))
+#    define JSON_HEDLEY_PUBLIC  __attribute__((__visibility__("default")))
+#  else
+#    define JSON_HEDLEY_PRIVATE
+#    define JSON_HEDLEY_PUBLIC
+#  endif
+#  define JSON_HEDLEY_IMPORT    extern
+#endif
+
+#if defined(JSON_HEDLEY_NO_THROW)
+    #undef JSON_HEDLEY_NO_THROW
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(nothrow) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_NO_THROW __attribute__((__nothrow__))
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(13,1,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0)
+    #define JSON_HEDLEY_NO_THROW __declspec(nothrow)
+#else
+    #define JSON_HEDLEY_NO_THROW
+#endif
+
+#if defined(JSON_HEDLEY_FALL_THROUGH)
+    #undef JSON_HEDLEY_FALL_THROUGH
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(fallthrough) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(7,0,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_FALL_THROUGH __attribute__((__fallthrough__))
+#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(clang,fallthrough)
+    #define JSON_HEDLEY_FALL_THROUGH JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[clang::fallthrough]])
+#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE(fallthrough)
+    #define JSON_HEDLEY_FALL_THROUGH JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[fallthrough]])
+#elif defined(__fallthrough) /* SAL */
+    #define JSON_HEDLEY_FALL_THROUGH __fallthrough
+#else
+    #define JSON_HEDLEY_FALL_THROUGH
+#endif
+
+#if defined(JSON_HEDLEY_RETURNS_NON_NULL)
+    #undef JSON_HEDLEY_RETURNS_NON_NULL
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(returns_nonnull) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_RETURNS_NON_NULL __attribute__((__returns_nonnull__))
+#elif defined(_Ret_notnull_) /* SAL */
+    #define JSON_HEDLEY_RETURNS_NON_NULL _Ret_notnull_
+#else
+    #define JSON_HEDLEY_RETURNS_NON_NULL
+#endif
+
+#if defined(JSON_HEDLEY_ARRAY_PARAM)
+    #undef JSON_HEDLEY_ARRAY_PARAM
+#endif
+#if \
+    defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && \
+    !defined(__STDC_NO_VLA__) && \
+    !defined(__cplusplus) && \
+    !defined(JSON_HEDLEY_PGI_VERSION) && \
+    !defined(JSON_HEDLEY_TINYC_VERSION)
+    #define JSON_HEDLEY_ARRAY_PARAM(name) (name)
+#else
+    #define JSON_HEDLEY_ARRAY_PARAM(name)
+#endif
+
+#if defined(JSON_HEDLEY_IS_CONSTANT)
+    #undef JSON_HEDLEY_IS_CONSTANT
+#endif
+#if defined(JSON_HEDLEY_REQUIRE_CONSTEXPR)
+    #undef JSON_HEDLEY_REQUIRE_CONSTEXPR
+#endif
+/* JSON_HEDLEY_IS_CONSTEXPR_ is for
+   HEDLEY INTERNAL USE ONLY.  API subject to change without notice. */
+#if defined(JSON_HEDLEY_IS_CONSTEXPR_)
+    #undef JSON_HEDLEY_IS_CONSTEXPR_
+#endif
+#if \
+    JSON_HEDLEY_HAS_BUILTIN(__builtin_constant_p) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,19) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \
+    (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) && !defined(__cplusplus)) || \
+    JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_IS_CONSTANT(expr) __builtin_constant_p(expr)
+#endif
+#if !defined(__cplusplus)
+#  if \
+       JSON_HEDLEY_HAS_BUILTIN(__builtin_types_compatible_p) || \
+       JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \
+       JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+       JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \
+       JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \
+       JSON_HEDLEY_ARM_VERSION_CHECK(5,4,0) || \
+       JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,24)
+#if defined(__INTPTR_TYPE__)
+    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) __builtin_types_compatible_p(__typeof__((1 ? (void*) ((__INTPTR_TYPE__) ((expr) * 0)) : (int*) 0)), int*)
+#else
+    #include <stdint.h>
+    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) __builtin_types_compatible_p(__typeof__((1 ? (void*) ((intptr_t) ((expr) * 0)) : (int*) 0)), int*)
+#endif
+#  elif \
+       ( \
+          defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) && \
+          !defined(JSON_HEDLEY_SUNPRO_VERSION) && \
+          !defined(JSON_HEDLEY_PGI_VERSION) && \
+          !defined(JSON_HEDLEY_IAR_VERSION)) || \
+       (JSON_HEDLEY_HAS_EXTENSION(c_generic_selections) && !defined(JSON_HEDLEY_IAR_VERSION)) || \
+       JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0) || \
+       JSON_HEDLEY_INTEL_VERSION_CHECK(17,0,0) || \
+       JSON_HEDLEY_IBM_VERSION_CHECK(12,1,0) || \
+       JSON_HEDLEY_ARM_VERSION_CHECK(5,3,0)
+#if defined(__INTPTR_TYPE__)
+    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) _Generic((1 ? (void*) ((__INTPTR_TYPE__) ((expr) * 0)) : (int*) 0), int*: 1, void*: 0)
+#else
+    #include <stdint.h>
+    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) _Generic((1 ? (void*) ((intptr_t) * 0) : (int*) 0), int*: 1, void*: 0)
+#endif
+#  elif \
+       defined(JSON_HEDLEY_GCC_VERSION) || \
+       defined(JSON_HEDLEY_INTEL_VERSION) || \
+       defined(JSON_HEDLEY_TINYC_VERSION) || \
+       defined(JSON_HEDLEY_TI_ARMCL_VERSION) || \
+       JSON_HEDLEY_TI_CL430_VERSION_CHECK(18,12,0) || \
+       defined(JSON_HEDLEY_TI_CL2000_VERSION) || \
+       defined(JSON_HEDLEY_TI_CL6X_VERSION) || \
+       defined(JSON_HEDLEY_TI_CL7X_VERSION) || \
+       defined(JSON_HEDLEY_TI_CLPRU_VERSION) || \
+       defined(__clang__)
+#    define JSON_HEDLEY_IS_CONSTEXPR_(expr) ( \
+        sizeof(void) != \
+        sizeof(*( \
+                  1 ? \
+                  ((void*) ((expr) * 0L) ) : \
+((struct { char v[sizeof(void) * 2]; } *) 1) \
+                ) \
+              ) \
+                                            )
+#  endif
+#endif
+#if defined(JSON_HEDLEY_IS_CONSTEXPR_)
+    #if !defined(JSON_HEDLEY_IS_CONSTANT)
+        #define JSON_HEDLEY_IS_CONSTANT(expr) JSON_HEDLEY_IS_CONSTEXPR_(expr)
+    #endif
+    #define JSON_HEDLEY_REQUIRE_CONSTEXPR(expr) (JSON_HEDLEY_IS_CONSTEXPR_(expr) ? (expr) : (-1))
+#else
+    #if !defined(JSON_HEDLEY_IS_CONSTANT)
+        #define JSON_HEDLEY_IS_CONSTANT(expr) (0)
+    #endif
+    #define JSON_HEDLEY_REQUIRE_CONSTEXPR(expr) (expr)
+#endif
+
+#if defined(JSON_HEDLEY_BEGIN_C_DECLS)
+    #undef JSON_HEDLEY_BEGIN_C_DECLS
+#endif
+#if defined(JSON_HEDLEY_END_C_DECLS)
+    #undef JSON_HEDLEY_END_C_DECLS
+#endif
+#if defined(JSON_HEDLEY_C_DECL)
+    #undef JSON_HEDLEY_C_DECL
+#endif
+#if defined(__cplusplus)
+    #define JSON_HEDLEY_BEGIN_C_DECLS extern "C" {
+    #define JSON_HEDLEY_END_C_DECLS }
+    #define JSON_HEDLEY_C_DECL extern "C"
+#else
+    #define JSON_HEDLEY_BEGIN_C_DECLS
+    #define JSON_HEDLEY_END_C_DECLS
+    #define JSON_HEDLEY_C_DECL
+#endif
+
+#if defined(JSON_HEDLEY_STATIC_ASSERT)
+    #undef JSON_HEDLEY_STATIC_ASSERT
+#endif
+#if \
+  !defined(__cplusplus) && ( \
+      (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)) || \
+      (JSON_HEDLEY_HAS_FEATURE(c_static_assert) && !defined(JSON_HEDLEY_INTEL_CL_VERSION)) || \
+      JSON_HEDLEY_GCC_VERSION_CHECK(6,0,0) || \
+      JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+      defined(_Static_assert) \
+    )
+#  define JSON_HEDLEY_STATIC_ASSERT(expr, message) _Static_assert(expr, message)
+#elif \
+  (defined(__cplusplus) && (__cplusplus >= 201103L)) || \
+  JSON_HEDLEY_MSVC_VERSION_CHECK(16,0,0) || \
+  JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+#  define JSON_HEDLEY_STATIC_ASSERT(expr, message) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(static_assert(expr, message))
+#else
+#  define JSON_HEDLEY_STATIC_ASSERT(expr, message)
+#endif
+
+#if defined(JSON_HEDLEY_NULL)
+    #undef JSON_HEDLEY_NULL
+#endif
+#if defined(__cplusplus)
+    #if __cplusplus >= 201103L
+        #define JSON_HEDLEY_NULL JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(nullptr)
+    #elif defined(NULL)
+        #define JSON_HEDLEY_NULL NULL
+    #else
+        #define JSON_HEDLEY_NULL JSON_HEDLEY_STATIC_CAST(void*, 0)
+    #endif
+#elif defined(NULL)
+    #define JSON_HEDLEY_NULL NULL
+#else
+    #define JSON_HEDLEY_NULL ((void*) 0)
+#endif
+
+#if defined(JSON_HEDLEY_MESSAGE)
+    #undef JSON_HEDLEY_MESSAGE
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas")
+#  define JSON_HEDLEY_MESSAGE(msg) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS \
+    JSON_HEDLEY_PRAGMA(message msg) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#elif \
+  JSON_HEDLEY_GCC_VERSION_CHECK(4,4,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message msg)
+#elif JSON_HEDLEY_CRAY_VERSION_CHECK(5,0,0)
+#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(_CRI message msg)
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message(msg))
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,0,0)
+#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message(msg))
+#else
+#  define JSON_HEDLEY_MESSAGE(msg)
+#endif
+
+#if defined(JSON_HEDLEY_WARNING)
+    #undef JSON_HEDLEY_WARNING
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas")
+#  define JSON_HEDLEY_WARNING(msg) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS \
+    JSON_HEDLEY_PRAGMA(clang warning msg) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#elif \
+  JSON_HEDLEY_GCC_VERSION_CHECK(4,8,0) || \
+  JSON_HEDLEY_PGI_VERSION_CHECK(18,4,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+#  define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_PRAGMA(GCC warning msg)
+#elif \
+  JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) || \
+  JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+#  define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_PRAGMA(message(msg))
+#else
+#  define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_MESSAGE(msg)
+#endif
+
+#if defined(JSON_HEDLEY_REQUIRE)
+    #undef JSON_HEDLEY_REQUIRE
+#endif
+#if defined(JSON_HEDLEY_REQUIRE_MSG)
+    #undef JSON_HEDLEY_REQUIRE_MSG
+#endif
+#if JSON_HEDLEY_HAS_ATTRIBUTE(diagnose_if)
+#  if JSON_HEDLEY_HAS_WARNING("-Wgcc-compat")
+#    define JSON_HEDLEY_REQUIRE(expr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wgcc-compat\"") \
+    __attribute__((diagnose_if(!(expr), #expr, "error"))) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#    define JSON_HEDLEY_REQUIRE_MSG(expr,msg) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wgcc-compat\"") \
+    __attribute__((diagnose_if(!(expr), msg, "error"))) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#  else
+#    define JSON_HEDLEY_REQUIRE(expr) __attribute__((diagnose_if(!(expr), #expr, "error")))
+#    define JSON_HEDLEY_REQUIRE_MSG(expr,msg) __attribute__((diagnose_if(!(expr), msg, "error")))
+#  endif
+#else
+#  define JSON_HEDLEY_REQUIRE(expr)
+#  define JSON_HEDLEY_REQUIRE_MSG(expr,msg)
+#endif
+
+#if defined(JSON_HEDLEY_FLAGS)
+    #undef JSON_HEDLEY_FLAGS
+#endif
+#if JSON_HEDLEY_HAS_ATTRIBUTE(flag_enum) && (!defined(__cplusplus) || JSON_HEDLEY_HAS_WARNING("-Wbitfield-enum-conversion"))
+    #define JSON_HEDLEY_FLAGS __attribute__((__flag_enum__))
+#else
+    #define JSON_HEDLEY_FLAGS
+#endif
+
+#if defined(JSON_HEDLEY_FLAGS_CAST)
+    #undef JSON_HEDLEY_FLAGS_CAST
+#endif
+#if JSON_HEDLEY_INTEL_VERSION_CHECK(19,0,0)
+#  define JSON_HEDLEY_FLAGS_CAST(T, expr) (__extension__ ({ \
+        JSON_HEDLEY_DIAGNOSTIC_PUSH \
+        _Pragma("warning(disable:188)") \
+        ((T) (expr)); \
+        JSON_HEDLEY_DIAGNOSTIC_POP \
+    }))
+#else
+#  define JSON_HEDLEY_FLAGS_CAST(T, expr) JSON_HEDLEY_STATIC_CAST(T, expr)
+#endif
+
+#if defined(JSON_HEDLEY_EMPTY_BASES)
+    #undef JSON_HEDLEY_EMPTY_BASES
+#endif
+#if \
+    (JSON_HEDLEY_MSVC_VERSION_CHECK(19,0,23918) && !JSON_HEDLEY_MSVC_VERSION_CHECK(20,0,0)) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_EMPTY_BASES __declspec(empty_bases)
+#else
+    #define JSON_HEDLEY_EMPTY_BASES
+#endif
+
+/* Remaining macros are deprecated. */
+
+#if defined(JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK)
+    #undef JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK
+#endif
+#if defined(__clang__)
+    #define JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK(major,minor,patch) (0)
+#else
+    #define JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK(major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_CLANG_HAS_ATTRIBUTE)
+    #undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE
+#endif
+#define JSON_HEDLEY_CLANG_HAS_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_ATTRIBUTE(attribute)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE)
+    #undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE
+#endif
+#define JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_BUILTIN)
+    #undef JSON_HEDLEY_CLANG_HAS_BUILTIN
+#endif
+#define JSON_HEDLEY_CLANG_HAS_BUILTIN(builtin) JSON_HEDLEY_HAS_BUILTIN(builtin)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_FEATURE)
+    #undef JSON_HEDLEY_CLANG_HAS_FEATURE
+#endif
+#define JSON_HEDLEY_CLANG_HAS_FEATURE(feature) JSON_HEDLEY_HAS_FEATURE(feature)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_EXTENSION)
+    #undef JSON_HEDLEY_CLANG_HAS_EXTENSION
+#endif
+#define JSON_HEDLEY_CLANG_HAS_EXTENSION(extension) JSON_HEDLEY_HAS_EXTENSION(extension)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE)
+    #undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE
+#endif
+#define JSON_HEDLEY_CLANG_HAS_DECLSPEC_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_WARNING)
+    #undef JSON_HEDLEY_CLANG_HAS_WARNING
+#endif
+#define JSON_HEDLEY_CLANG_HAS_WARNING(warning) JSON_HEDLEY_HAS_WARNING(warning)
+
+#endif /* !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < X) */
+
+// #include <nlohmann/detail/meta/detected.hpp>
+
+
+#include <type_traits>
+
+// #include <nlohmann/detail/meta/void_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+template<typename ...Ts> struct make_void
+{
+    using type = void;
+};
+template<typename ...Ts> using void_t = typename make_void<Ts...>::type;
+} // namespace detail
+}  // namespace nlohmann
+
+
+// https://en.cppreference.com/w/cpp/experimental/is_detected
+namespace nlohmann
+{
+namespace detail
+{
+struct nonesuch
+{
+    nonesuch() = delete;
+    ~nonesuch() = delete;
+    nonesuch(nonesuch const&) = delete;
+    nonesuch(nonesuch const&&) = delete;
+    void operator=(nonesuch const&) = delete;
+    void operator=(nonesuch&&) = delete;
+};
+
+template<class Default,
+         class AlwaysVoid,
+         template<class...> class Op,
+         class... Args>
+struct detector
+{
+    using value_t = std::false_type;
+    using type = Default;
+};
+
+template<class Default, template<class...> class Op, class... Args>
+struct detector<Default, void_t<Op<Args...>>, Op, Args...>
+{
+    using value_t = std::true_type;
+    using type = Op<Args...>;
+};
+
+template<template<class...> class Op, class... Args>
+using is_detected = typename detector<nonesuch, void, Op, Args...>::value_t;
+
+template<template<class...> class Op, class... Args>
+struct is_detected_lazy : is_detected<Op, Args...> { };
+
+template<template<class...> class Op, class... Args>
+using detected_t = typename detector<nonesuch, void, Op, Args...>::type;
+
+template<class Default, template<class...> class Op, class... Args>
+using detected_or = detector<Default, void, Op, Args...>;
+
+template<class Default, template<class...> class Op, class... Args>
+using detected_or_t = typename detected_or<Default, Op, Args...>::type;
+
+template<class Expected, template<class...> class Op, class... Args>
+using is_detected_exact = std::is_same<Expected, detected_t<Op, Args...>>;
+
+template<class To, template<class...> class Op, class... Args>
+using is_detected_convertible =
+    std::is_convertible<detected_t<Op, Args...>, To>;
+}  // namespace detail
+}  // namespace nlohmann
+
+
+// This file contains all internal macro definitions
+// You MUST include macro_unscope.hpp at the end of json.hpp to undef all of them
+
+// exclude unsupported compilers
+#if !defined(JSON_SKIP_UNSUPPORTED_COMPILER_CHECK)
+    #if defined(__clang__)
+        #if (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__) < 30400
+            #error "unsupported Clang version - see https://github.com/nlohmann/json#supported-compilers"
+        #endif
+    #elif defined(__GNUC__) && !(defined(__ICC) || defined(__INTEL_COMPILER))
+        #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40800
+            #error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers"
+        #endif
+    #endif
+#endif
+
+// C++ language standard detection
+// if the user manually specified the used c++ version this is skipped
+#if !defined(JSON_HAS_CPP_20) && !defined(JSON_HAS_CPP_17) && !defined(JSON_HAS_CPP_14) && !defined(JSON_HAS_CPP_11)
+    #if (defined(__cplusplus) && __cplusplus >= 202002L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 202002L)
+        #define JSON_HAS_CPP_20
+        #define JSON_HAS_CPP_17
+        #define JSON_HAS_CPP_14
+    #elif (defined(__cplusplus) && __cplusplus >= 201703L) || (defined(_HAS_CXX17) && _HAS_CXX17 == 1) // fix for issue #464
+        #define JSON_HAS_CPP_17
+        #define JSON_HAS_CPP_14
+    #elif (defined(__cplusplus) && __cplusplus >= 201402L) || (defined(_HAS_CXX14) && _HAS_CXX14 == 1)
+        #define JSON_HAS_CPP_14
+    #endif
+    // the cpp 11 flag is always specified because it is the minimal required version
+    #define JSON_HAS_CPP_11
+#endif
+
+#if !defined(JSON_HAS_FILESYSTEM) && !defined(JSON_HAS_EXPERIMENTAL_FILESYSTEM)
+    #ifdef JSON_HAS_CPP_17
+        #if defined(__cpp_lib_filesystem)
+            #define JSON_HAS_FILESYSTEM 1
+        #elif defined(__cpp_lib_experimental_filesystem)
+            #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1
+        #elif !defined(__has_include)
+            #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1
+        #elif __has_include(<filesystem>)
+            #define JSON_HAS_FILESYSTEM 1
+        #elif __has_include(<experimental/filesystem>)
+            #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1
+        #endif
+
+        // std::filesystem does not work on MinGW GCC 8: https://sourceforge.net/p/mingw-w64/bugs/737/
+        #if defined(__MINGW32__) && defined(__GNUC__) && __GNUC__ == 8
+            #undef JSON_HAS_FILESYSTEM
+            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+        #endif
+
+        // no filesystem support before GCC 8: https://en.cppreference.com/w/cpp/compiler_support
+        #if defined(__GNUC__) && !defined(__clang__) && __GNUC__ < 8
+            #undef JSON_HAS_FILESYSTEM
+            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+        #endif
+
+        // no filesystem support before Clang 7: https://en.cppreference.com/w/cpp/compiler_support
+        #if defined(__clang_major__) && __clang_major__ < 7
+            #undef JSON_HAS_FILESYSTEM
+            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+        #endif
+
+        // no filesystem support before MSVC 19.14: https://en.cppreference.com/w/cpp/compiler_support
+        #if defined(_MSC_VER) && _MSC_VER < 1940
+            #undef JSON_HAS_FILESYSTEM
+            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+        #endif
+
+        // no filesystem support before iOS 13
+        #if defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED < 130000
+            #undef JSON_HAS_FILESYSTEM
+            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+        #endif
+
+        // no filesystem support before macOS Catalina
+        #if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500
+            #undef JSON_HAS_FILESYSTEM
+            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+        #endif
+    #endif
+#endif
+
+#ifndef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+    #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 0
+#endif
+
+#ifndef JSON_HAS_FILESYSTEM
+    #define JSON_HAS_FILESYSTEM 0
+#endif
+
+// disable documentation warnings on clang
+#if defined(__clang__)
+    #pragma clang diagnostic push
+    #pragma clang diagnostic ignored "-Wdocumentation"
+    #pragma clang diagnostic ignored "-Wdocumentation-unknown-command"
+#endif
+
+// allow disabling exceptions
+#if (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)) && !defined(JSON_NOEXCEPTION)
+    #define JSON_THROW(exception) throw exception
+    #define JSON_TRY try
+    #define JSON_CATCH(exception) catch(exception)
+    #define JSON_INTERNAL_CATCH(exception) catch(exception)
+#else
+    #include <cstdlib>
+    #define JSON_THROW(exception) std::abort()
+    #define JSON_TRY if(true)
+    #define JSON_CATCH(exception) if(false)
+    #define JSON_INTERNAL_CATCH(exception) if(false)
+#endif
+
+// override exception macros
+#if defined(JSON_THROW_USER)
+    #undef JSON_THROW
+    #define JSON_THROW JSON_THROW_USER
+#endif
+#if defined(JSON_TRY_USER)
+    #undef JSON_TRY
+    #define JSON_TRY JSON_TRY_USER
+#endif
+#if defined(JSON_CATCH_USER)
+    #undef JSON_CATCH
+    #define JSON_CATCH JSON_CATCH_USER
+    #undef JSON_INTERNAL_CATCH
+    #define JSON_INTERNAL_CATCH JSON_CATCH_USER
+#endif
+#if defined(JSON_INTERNAL_CATCH_USER)
+    #undef JSON_INTERNAL_CATCH
+    #define JSON_INTERNAL_CATCH JSON_INTERNAL_CATCH_USER
+#endif
+
+// allow overriding assert
+#if !defined(JSON_ASSERT)
+    #include <cassert> // assert
+    #define JSON_ASSERT(x) assert(x)
+#endif
+
+// allow to access some private functions (needed by the test suite)
+#if defined(JSON_TESTS_PRIVATE)
+    #define JSON_PRIVATE_UNLESS_TESTED public
+#else
+    #define JSON_PRIVATE_UNLESS_TESTED private
+#endif
+
+/*!
+@brief macro to briefly define a mapping between an enum and JSON
+@def NLOHMANN_JSON_SERIALIZE_ENUM
+@since version 3.4.0
+*/
+#define NLOHMANN_JSON_SERIALIZE_ENUM(ENUM_TYPE, ...)                                            \
+    template<typename BasicJsonType>                                                            \
+    inline void to_json(BasicJsonType& j, const ENUM_TYPE& e)                                   \
+    {                                                                                           \
+        static_assert(std::is_enum<ENUM_TYPE>::value, #ENUM_TYPE " must be an enum!");          \
+        static const std::pair<ENUM_TYPE, BasicJsonType> m[] = __VA_ARGS__;                     \
+        auto it = std::find_if(std::begin(m), std::end(m),                                      \
+                               [e](const std::pair<ENUM_TYPE, BasicJsonType>& ej_pair) -> bool  \
+        {                                                                                       \
+            return ej_pair.first == e;                                                          \
+        });                                                                                     \
+        j = ((it != std::end(m)) ? it : std::begin(m))->second;                                 \
+    }                                                                                           \
+    template<typename BasicJsonType>                                                            \
+    inline void from_json(const BasicJsonType& j, ENUM_TYPE& e)                                 \
+    {                                                                                           \
+        static_assert(std::is_enum<ENUM_TYPE>::value, #ENUM_TYPE " must be an enum!");          \
+        static const std::pair<ENUM_TYPE, BasicJsonType> m[] = __VA_ARGS__;                     \
+        auto it = std::find_if(std::begin(m), std::end(m),                                      \
+                               [&j](const std::pair<ENUM_TYPE, BasicJsonType>& ej_pair) -> bool \
+        {                                                                                       \
+            return ej_pair.second == j;                                                         \
+        });                                                                                     \
+        e = ((it != std::end(m)) ? it : std::begin(m))->first;                                  \
+    }
+
+// Ugly macros to avoid uglier copy-paste when specializing basic_json. They
+// may be removed in the future once the class is split.
+
+#define NLOHMANN_BASIC_JSON_TPL_DECLARATION                                \
+    template<template<typename, typename, typename...> class ObjectType,   \
+             template<typename, typename...> class ArrayType,              \
+             class StringType, class BooleanType, class NumberIntegerType, \
+             class NumberUnsignedType, class NumberFloatType,              \
+             template<typename> class AllocatorType,                       \
+             template<typename, typename = void> class JSONSerializer,     \
+             class BinaryType>
+
+#define NLOHMANN_BASIC_JSON_TPL                                            \
+    basic_json<ObjectType, ArrayType, StringType, BooleanType,             \
+    NumberIntegerType, NumberUnsignedType, NumberFloatType,                \
+    AllocatorType, JSONSerializer, BinaryType>
+
+// Macros to simplify conversion from/to types
+
+#define NLOHMANN_JSON_EXPAND( x ) x
+#define NLOHMANN_JSON_GET_MACRO(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63, _64, NAME,...) NAME
+#define NLOHMANN_JSON_PASTE(...) NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_GET_MACRO(__VA_ARGS__, \
+        NLOHMANN_JSON_PASTE64, \
+        NLOHMANN_JSON_PASTE63, \
+        NLOHMANN_JSON_PASTE62, \
+        NLOHMANN_JSON_PASTE61, \
+        NLOHMANN_JSON_PASTE60, \
+        NLOHMANN_JSON_PASTE59, \
+        NLOHMANN_JSON_PASTE58, \
+        NLOHMANN_JSON_PASTE57, \
+        NLOHMANN_JSON_PASTE56, \
+        NLOHMANN_JSON_PASTE55, \
+        NLOHMANN_JSON_PASTE54, \
+        NLOHMANN_JSON_PASTE53, \
+        NLOHMANN_JSON_PASTE52, \
+        NLOHMANN_JSON_PASTE51, \
+        NLOHMANN_JSON_PASTE50, \
+        NLOHMANN_JSON_PASTE49, \
+        NLOHMANN_JSON_PASTE48, \
+        NLOHMANN_JSON_PASTE47, \
+        NLOHMANN_JSON_PASTE46, \
+        NLOHMANN_JSON_PASTE45, \
+        NLOHMANN_JSON_PASTE44, \
+        NLOHMANN_JSON_PASTE43, \
+        NLOHMANN_JSON_PASTE42, \
+        NLOHMANN_JSON_PASTE41, \
+        NLOHMANN_JSON_PASTE40, \
+        NLOHMANN_JSON_PASTE39, \
+        NLOHMANN_JSON_PASTE38, \
+        NLOHMANN_JSON_PASTE37, \
+        NLOHMANN_JSON_PASTE36, \
+        NLOHMANN_JSON_PASTE35, \
+        NLOHMANN_JSON_PASTE34, \
+        NLOHMANN_JSON_PASTE33, \
+        NLOHMANN_JSON_PASTE32, \
+        NLOHMANN_JSON_PASTE31, \
+        NLOHMANN_JSON_PASTE30, \
+        NLOHMANN_JSON_PASTE29, \
+        NLOHMANN_JSON_PASTE28, \
+        NLOHMANN_JSON_PASTE27, \
+        NLOHMANN_JSON_PASTE26, \
+        NLOHMANN_JSON_PASTE25, \
+        NLOHMANN_JSON_PASTE24, \
+        NLOHMANN_JSON_PASTE23, \
+        NLOHMANN_JSON_PASTE22, \
+        NLOHMANN_JSON_PASTE21, \
+        NLOHMANN_JSON_PASTE20, \
+        NLOHMANN_JSON_PASTE19, \
+        NLOHMANN_JSON_PASTE18, \
+        NLOHMANN_JSON_PASTE17, \
+        NLOHMANN_JSON_PASTE16, \
+        NLOHMANN_JSON_PASTE15, \
+        NLOHMANN_JSON_PASTE14, \
+        NLOHMANN_JSON_PASTE13, \
+        NLOHMANN_JSON_PASTE12, \
+        NLOHMANN_JSON_PASTE11, \
+        NLOHMANN_JSON_PASTE10, \
+        NLOHMANN_JSON_PASTE9, \
+        NLOHMANN_JSON_PASTE8, \
+        NLOHMANN_JSON_PASTE7, \
+        NLOHMANN_JSON_PASTE6, \
+        NLOHMANN_JSON_PASTE5, \
+        NLOHMANN_JSON_PASTE4, \
+        NLOHMANN_JSON_PASTE3, \
+        NLOHMANN_JSON_PASTE2, \
+        NLOHMANN_JSON_PASTE1)(__VA_ARGS__))
+#define NLOHMANN_JSON_PASTE2(func, v1) func(v1)
+#define NLOHMANN_JSON_PASTE3(func, v1, v2) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE2(func, v2)
+#define NLOHMANN_JSON_PASTE4(func, v1, v2, v3) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE3(func, v2, v3)
+#define NLOHMANN_JSON_PASTE5(func, v1, v2, v3, v4) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE4(func, v2, v3, v4)
+#define NLOHMANN_JSON_PASTE6(func, v1, v2, v3, v4, v5) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE5(func, v2, v3, v4, v5)
+#define NLOHMANN_JSON_PASTE7(func, v1, v2, v3, v4, v5, v6) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE6(func, v2, v3, v4, v5, v6)
+#define NLOHMANN_JSON_PASTE8(func, v1, v2, v3, v4, v5, v6, v7) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE7(func, v2, v3, v4, v5, v6, v7)
+#define NLOHMANN_JSON_PASTE9(func, v1, v2, v3, v4, v5, v6, v7, v8) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE8(func, v2, v3, v4, v5, v6, v7, v8)
+#define NLOHMANN_JSON_PASTE10(func, v1, v2, v3, v4, v5, v6, v7, v8, v9) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE9(func, v2, v3, v4, v5, v6, v7, v8, v9)
+#define NLOHMANN_JSON_PASTE11(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE10(func, v2, v3, v4, v5, v6, v7, v8, v9, v10)
+#define NLOHMANN_JSON_PASTE12(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE11(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11)
+#define NLOHMANN_JSON_PASTE13(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE12(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12)
+#define NLOHMANN_JSON_PASTE14(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE13(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13)
+#define NLOHMANN_JSON_PASTE15(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE14(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14)
+#define NLOHMANN_JSON_PASTE16(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE15(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15)
+#define NLOHMANN_JSON_PASTE17(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE16(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16)
+#define NLOHMANN_JSON_PASTE18(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE17(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17)
+#define NLOHMANN_JSON_PASTE19(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE18(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18)
+#define NLOHMANN_JSON_PASTE20(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE19(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19)
+#define NLOHMANN_JSON_PASTE21(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE20(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20)
+#define NLOHMANN_JSON_PASTE22(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE21(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21)
+#define NLOHMANN_JSON_PASTE23(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE22(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22)
+#define NLOHMANN_JSON_PASTE24(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE23(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23)
+#define NLOHMANN_JSON_PASTE25(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE24(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24)
+#define NLOHMANN_JSON_PASTE26(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE25(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25)
+#define NLOHMANN_JSON_PASTE27(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE26(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26)
+#define NLOHMANN_JSON_PASTE28(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE27(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27)
+#define NLOHMANN_JSON_PASTE29(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE28(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28)
+#define NLOHMANN_JSON_PASTE30(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE29(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29)
+#define NLOHMANN_JSON_PASTE31(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE30(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30)
+#define NLOHMANN_JSON_PASTE32(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE31(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31)
+#define NLOHMANN_JSON_PASTE33(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE32(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32)
+#define NLOHMANN_JSON_PASTE34(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE33(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33)
+#define NLOHMANN_JSON_PASTE35(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE34(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34)
+#define NLOHMANN_JSON_PASTE36(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE35(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35)
+#define NLOHMANN_JSON_PASTE37(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE36(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36)
+#define NLOHMANN_JSON_PASTE38(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE37(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37)
+#define NLOHMANN_JSON_PASTE39(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE38(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38)
+#define NLOHMANN_JSON_PASTE40(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE39(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39)
+#define NLOHMANN_JSON_PASTE41(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE40(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40)
+#define NLOHMANN_JSON_PASTE42(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE41(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41)
+#define NLOHMANN_JSON_PASTE43(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE42(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42)
+#define NLOHMANN_JSON_PASTE44(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE43(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43)
+#define NLOHMANN_JSON_PASTE45(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE44(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44)
+#define NLOHMANN_JSON_PASTE46(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE45(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45)
+#define NLOHMANN_JSON_PASTE47(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE46(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46)
+#define NLOHMANN_JSON_PASTE48(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE47(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47)
+#define NLOHMANN_JSON_PASTE49(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE48(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48)
+#define NLOHMANN_JSON_PASTE50(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE49(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49)
+#define NLOHMANN_JSON_PASTE51(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE50(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50)
+#define NLOHMANN_JSON_PASTE52(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE51(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51)
+#define NLOHMANN_JSON_PASTE53(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE52(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52)
+#define NLOHMANN_JSON_PASTE54(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE53(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53)
+#define NLOHMANN_JSON_PASTE55(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE54(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54)
+#define NLOHMANN_JSON_PASTE56(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE55(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55)
+#define NLOHMANN_JSON_PASTE57(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE56(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56)
+#define NLOHMANN_JSON_PASTE58(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE57(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57)
+#define NLOHMANN_JSON_PASTE59(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE58(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58)
+#define NLOHMANN_JSON_PASTE60(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE59(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59)
+#define NLOHMANN_JSON_PASTE61(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE60(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60)
+#define NLOHMANN_JSON_PASTE62(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE61(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61)
+#define NLOHMANN_JSON_PASTE63(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE62(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62)
+#define NLOHMANN_JSON_PASTE64(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62, v63) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE63(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62, v63)
+
+#define NLOHMANN_JSON_TO(v1) nlohmann_json_j[#v1] = nlohmann_json_t.v1;
+#define NLOHMANN_JSON_FROM(v1) nlohmann_json_j.at(#v1).get_to(nlohmann_json_t.v1);
+
+/*!
+@brief macro
+@def NLOHMANN_DEFINE_TYPE_INTRUSIVE
+@since version 3.9.0
+*/
+#define NLOHMANN_DEFINE_TYPE_INTRUSIVE(Type, ...)  \
+    friend void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
+    friend void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) }
+
+/*!
+@brief macro
+@def NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE
+@since version 3.9.0
+*/
+#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(Type, ...)  \
+    inline void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
+    inline void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) }
+
+
+// inspired from https://stackoverflow.com/a/26745591
+// allows to call any std function as if (e.g. with begin):
+// using std::begin; begin(x);
+//
+// it allows using the detected idiom to retrieve the return type
+// of such an expression
+#define NLOHMANN_CAN_CALL_STD_FUNC_IMPL(std_name)                                 \
+    namespace detail {                                                            \
+    using std::std_name;                                                          \
+    \
+    template<typename... T>                                                       \
+    using result_of_##std_name = decltype(std_name(std::declval<T>()...));        \
+    }                                                                             \
+    \
+    namespace detail2 {                                                           \
+    struct std_name##_tag                                                         \
+    {                                                                             \
+    };                                                                            \
+    \
+    template<typename... T>                                                       \
+    std_name##_tag std_name(T&&...);                                              \
+    \
+    template<typename... T>                                                       \
+    using result_of_##std_name = decltype(std_name(std::declval<T>()...));        \
+    \
+    template<typename... T>                                                       \
+    struct would_call_std_##std_name                                              \
+    {                                                                             \
+        static constexpr auto const value = ::nlohmann::detail::                  \
+                                            is_detected_exact<std_name##_tag, result_of_##std_name, T...>::value; \
+    };                                                                            \
+    } /* namespace detail2 */ \
+    \
+    template<typename... T>                                                       \
+    struct would_call_std_##std_name : detail2::would_call_std_##std_name<T...>   \
+    {                                                                             \
+    }
+
+#ifndef JSON_USE_IMPLICIT_CONVERSIONS
+    #define JSON_USE_IMPLICIT_CONVERSIONS 1
+#endif
+
+#if JSON_USE_IMPLICIT_CONVERSIONS
+    #define JSON_EXPLICIT
+#else
+    #define JSON_EXPLICIT explicit
+#endif
+
+#ifndef JSON_DIAGNOSTICS
+    #define JSON_DIAGNOSTICS 0
+#endif
+
+
+namespace nlohmann
+{
+namespace detail
+{
+
+/*!
+@brief replace all occurrences of a substring by another string
+
+@param[in,out] s  the string to manipulate; changed so that all
+               occurrences of @a f are replaced with @a t
+@param[in]     f  the substring to replace with @a t
+@param[in]     t  the string to replace @a f
+
+@pre The search string @a f must not be empty. **This precondition is
+enforced with an assertion.**
+
+@since version 2.0.0
+*/
+inline void replace_substring(std::string& s, const std::string& f,
+                              const std::string& t)
+{
+    JSON_ASSERT(!f.empty());
+    for (auto pos = s.find(f);                // find first occurrence of f
+            pos != std::string::npos;         // make sure f was found
+            s.replace(pos, f.size(), t),      // replace with t, and
+            pos = s.find(f, pos + t.size()))  // find next occurrence of f
+    {}
+}
+
+/*!
+ * @brief string escaping as described in RFC 6901 (Sect. 4)
+ * @param[in] s string to escape
+ * @return    escaped string
+ *
+ * Note the order of escaping "~" to "~0" and "/" to "~1" is important.
+ */
+inline std::string escape(std::string s)
+{
+    replace_substring(s, "~", "~0");
+    replace_substring(s, "/", "~1");
+    return s;
+}
+
+/*!
+ * @brief string unescaping as described in RFC 6901 (Sect. 4)
+ * @param[in] s string to unescape
+ * @return    unescaped string
+ *
+ * Note the order of escaping "~1" to "/" and "~0" to "~" is important.
+ */
+static void unescape(std::string& s)
+{
+    replace_substring(s, "~1", "/");
+    replace_substring(s, "~0", "~");
+}
+
+} // namespace detail
+} // namespace nlohmann
+
+// #include <nlohmann/detail/input/position_t.hpp>
+
+
+#include <cstddef> // size_t
+
+namespace nlohmann
+{
+namespace detail
+{
+/// struct to capture the start position of the current token
+struct position_t
+{
+    /// the total number of characters read
+    std::size_t chars_read_total = 0;
+    /// the number of characters read in the current line
+    std::size_t chars_read_current_line = 0;
+    /// the number of lines read
+    std::size_t lines_read = 0;
+
+    /// conversion to size_t to preserve SAX interface
+    constexpr operator size_t() const
+    {
+        return chars_read_total;
+    }
+};
+
+} // namespace detail
+} // namespace nlohmann
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+////////////////
+// exceptions //
+////////////////
+
+/// @brief general exception of the @ref basic_json class
+/// @sa https://json.nlohmann.me/api/basic_json/exception/
+class exception : public std::exception
+{
+  public:
+    /// returns the explanatory string
+    const char* what() const noexcept override
+    {
+        return m.what();
+    }
+
+    /// the id of the exception
+    const int id; // NOLINT(cppcoreguidelines-non-private-member-variables-in-classes)
+
+  protected:
+    JSON_HEDLEY_NON_NULL(3)
+    exception(int id_, const char* what_arg) : id(id_), m(what_arg) {} // NOLINT(bugprone-throw-keyword-missing)
+
+    static std::string name(const std::string& ename, int id_)
+    {
+        return "[json.exception." + ename + "." + std::to_string(id_) + "] ";
+    }
+
+    template<typename BasicJsonType>
+    static std::string diagnostics(const BasicJsonType& leaf_element)
+    {
+#if JSON_DIAGNOSTICS
+        std::vector<std::string> tokens;
+        for (const auto* current = &leaf_element; current->m_parent != nullptr; current = current->m_parent)
+        {
+            switch (current->m_parent->type())
+            {
+                case value_t::array:
+                {
+                    for (std::size_t i = 0; i < current->m_parent->m_value.array->size(); ++i)
+                    {
+                        if (&current->m_parent->m_value.array->operator[](i) == current)
+                        {
+                            tokens.emplace_back(std::to_string(i));
+                            break;
+                        }
+                    }
+                    break;
+                }
+
+                case value_t::object:
+                {
+                    for (const auto& element : *current->m_parent->m_value.object)
+                    {
+                        if (&element.second == current)
+                        {
+                            tokens.emplace_back(element.first.c_str());
+                            break;
+                        }
+                    }
+                    break;
+                }
+
+                case value_t::null: // LCOV_EXCL_LINE
+                case value_t::string: // LCOV_EXCL_LINE
+                case value_t::boolean: // LCOV_EXCL_LINE
+                case value_t::number_integer: // LCOV_EXCL_LINE
+                case value_t::number_unsigned: // LCOV_EXCL_LINE
+                case value_t::number_float: // LCOV_EXCL_LINE
+                case value_t::binary: // LCOV_EXCL_LINE
+                case value_t::discarded: // LCOV_EXCL_LINE
+                default:   // LCOV_EXCL_LINE
+                    break; // LCOV_EXCL_LINE
+            }
+        }
+
+        if (tokens.empty())
+        {
+            return "";
+        }
+
+        return "(" + std::accumulate(tokens.rbegin(), tokens.rend(), std::string{},
+                                     [](const std::string & a, const std::string & b)
+        {
+            return a + "/" + detail::escape(b);
+        }) + ") ";
+#else
+        static_cast<void>(leaf_element);
+        return "";
+#endif
+    }
+
+  private:
+    /// an exception object as storage for error messages
+    std::runtime_error m;
+};
+
+/// @brief exception indicating a parse error
+/// @sa https://json.nlohmann.me/api/basic_json/parse_error/
+class parse_error : public exception
+{
+  public:
+    /*!
+    @brief create a parse error exception
+    @param[in] id_       the id of the exception
+    @param[in] pos       the position where the error occurred (or with
+                         chars_read_total=0 if the position cannot be
+                         determined)
+    @param[in] what_arg  the explanatory string
+    @return parse_error object
+    */
+    template<typename BasicJsonType>
+    static parse_error create(int id_, const position_t& pos, const std::string& what_arg, const BasicJsonType& context)
+    {
+        std::string w = exception::name("parse_error", id_) + "parse error" +
+                        position_string(pos) + ": " + exception::diagnostics(context) + what_arg;
+        return {id_, pos.chars_read_total, w.c_str()};
+    }
+
+    template<typename BasicJsonType>
+    static parse_error create(int id_, std::size_t byte_, const std::string& what_arg, const BasicJsonType& context)
+    {
+        std::string w = exception::name("parse_error", id_) + "parse error" +
+                        (byte_ != 0 ? (" at byte " + std::to_string(byte_)) : "") +
+                        ": " + exception::diagnostics(context) + what_arg;
+        return {id_, byte_, w.c_str()};
+    }
+
+    /*!
+    @brief byte index of the parse error
+
+    The byte index of the last read character in the input file.
+
+    @note For an input with n bytes, 1 is the index of the first character and
+          n+1 is the index of the terminating null byte or the end of file.
+          This also holds true when reading a byte vector (CBOR or MessagePack).
+    */
+    const std::size_t byte;
+
+  private:
+    parse_error(int id_, std::size_t byte_, const char* what_arg)
+        : exception(id_, what_arg), byte(byte_) {}
+
+    static std::string position_string(const position_t& pos)
+    {
+        return " at line " + std::to_string(pos.lines_read + 1) +
+               ", column " + std::to_string(pos.chars_read_current_line);
+    }
+};
+
+/// @brief exception indicating errors with iterators
+/// @sa https://json.nlohmann.me/api/basic_json/invalid_iterator/
+class invalid_iterator : public exception
+{
+  public:
+    template<typename BasicJsonType>
+    static invalid_iterator create(int id_, const std::string& what_arg, const BasicJsonType& context)
+    {
+        std::string w = exception::name("invalid_iterator", id_) + exception::diagnostics(context) + what_arg;
+        return {id_, w.c_str()};
+    }
+
+  private:
+    JSON_HEDLEY_NON_NULL(3)
+    invalid_iterator(int id_, const char* what_arg)
+        : exception(id_, what_arg) {}
+};
+
+/// @brief exception indicating executing a member function with a wrong type
+/// @sa https://json.nlohmann.me/api/basic_json/type_error/
+class type_error : public exception
+{
+  public:
+    template<typename BasicJsonType>
+    static type_error create(int id_, const std::string& what_arg, const BasicJsonType& context)
+    {
+        std::string w = exception::name("type_error", id_) + exception::diagnostics(context) + what_arg;
+        return {id_, w.c_str()};
+    }
+
+  private:
+    JSON_HEDLEY_NON_NULL(3)
+    type_error(int id_, const char* what_arg) : exception(id_, what_arg) {}
+};
+
+/// @brief exception indicating access out of the defined range
+/// @sa https://json.nlohmann.me/api/basic_json/out_of_range/
+class out_of_range : public exception
+{
+  public:
+    template<typename BasicJsonType>
+    static out_of_range create(int id_, const std::string& what_arg, const BasicJsonType& context)
+    {
+        std::string w = exception::name("out_of_range", id_) + exception::diagnostics(context) + what_arg;
+        return {id_, w.c_str()};
+    }
+
+  private:
+    JSON_HEDLEY_NON_NULL(3)
+    out_of_range(int id_, const char* what_arg) : exception(id_, what_arg) {}
+};
+
+/// @brief exception indicating other library errors
+/// @sa https://json.nlohmann.me/api/basic_json/other_error/
+class other_error : public exception
+{
+  public:
+    template<typename BasicJsonType>
+    static other_error create(int id_, const std::string& what_arg, const BasicJsonType& context)
+    {
+        std::string w = exception::name("other_error", id_) + exception::diagnostics(context) + what_arg;
+        return {id_, w.c_str()};
+    }
+
+  private:
+    JSON_HEDLEY_NON_NULL(3)
+    other_error(int id_, const char* what_arg) : exception(id_, what_arg) {}
+};
+
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+
+#include <cstddef> // size_t
+#include <type_traits> // conditional, enable_if, false_type, integral_constant, is_constructible, is_integral, is_same, remove_cv, remove_reference, true_type
+#include <utility> // index_sequence, make_index_sequence, index_sequence_for
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+
+template<typename T>
+using uncvref_t = typename std::remove_cv<typename std::remove_reference<T>::type>::type;
+
+#ifdef JSON_HAS_CPP_14
+
+// the following utilities are natively available in C++14
+using std::enable_if_t;
+using std::index_sequence;
+using std::make_index_sequence;
+using std::index_sequence_for;
+
+#else
+
+// alias templates to reduce boilerplate
+template<bool B, typename T = void>
+using enable_if_t = typename std::enable_if<B, T>::type;
+
+// The following code is taken from https://github.com/abseil/abseil-cpp/blob/10cb35e459f5ecca5b2ff107635da0bfa41011b4/absl/utility/utility.h
+// which is part of Google Abseil (https://github.com/abseil/abseil-cpp), licensed under the Apache License 2.0.
+
+//// START OF CODE FROM GOOGLE ABSEIL
+
+// integer_sequence
+//
+// Class template representing a compile-time integer sequence. An instantiation
+// of `integer_sequence<T, Ints...>` has a sequence of integers encoded in its
+// type through its template arguments (which is a common need when
+// working with C++11 variadic templates). `absl::integer_sequence` is designed
+// to be a drop-in replacement for C++14's `std::integer_sequence`.
+//
+// Example:
+//
+//   template< class T, T... Ints >
+//   void user_function(integer_sequence<T, Ints...>);
+//
+//   int main()
+//   {
+//     // user_function's `T` will be deduced to `int` and `Ints...`
+//     // will be deduced to `0, 1, 2, 3, 4`.
+//     user_function(make_integer_sequence<int, 5>());
+//   }
+template <typename T, T... Ints>
+struct integer_sequence
+{
+    using value_type = T;
+    static constexpr std::size_t size() noexcept
+    {
+        return sizeof...(Ints);
+    }
+};
+
+// index_sequence
+//
+// A helper template for an `integer_sequence` of `size_t`,
+// `absl::index_sequence` is designed to be a drop-in replacement for C++14's
+// `std::index_sequence`.
+template <size_t... Ints>
+using index_sequence = integer_sequence<size_t, Ints...>;
+
+namespace utility_internal
+{
+
+template <typename Seq, size_t SeqSize, size_t Rem>
+struct Extend;
+
+// Note that SeqSize == sizeof...(Ints). It's passed explicitly for efficiency.
+template <typename T, T... Ints, size_t SeqSize>
+struct Extend<integer_sequence<T, Ints...>, SeqSize, 0>
+{
+    using type = integer_sequence < T, Ints..., (Ints + SeqSize)... >;
+};
+
+template <typename T, T... Ints, size_t SeqSize>
+struct Extend<integer_sequence<T, Ints...>, SeqSize, 1>
+{
+    using type = integer_sequence < T, Ints..., (Ints + SeqSize)..., 2 * SeqSize >;
+};
+
+// Recursion helper for 'make_integer_sequence<T, N>'.
+// 'Gen<T, N>::type' is an alias for 'integer_sequence<T, 0, 1, ... N-1>'.
+template <typename T, size_t N>
+struct Gen
+{
+    using type =
+        typename Extend < typename Gen < T, N / 2 >::type, N / 2, N % 2 >::type;
+};
+
+template <typename T>
+struct Gen<T, 0>
+{
+    using type = integer_sequence<T>;
+};
+
+}  // namespace utility_internal
+
+// Compile-time sequences of integers
+
+// make_integer_sequence
+//
+// This template alias is equivalent to
+// `integer_sequence<int, 0, 1, ..., N-1>`, and is designed to be a drop-in
+// replacement for C++14's `std::make_integer_sequence`.
+template <typename T, T N>
+using make_integer_sequence = typename utility_internal::Gen<T, N>::type;
+
+// make_index_sequence
+//
+// This template alias is equivalent to `index_sequence<0, 1, ..., N-1>`,
+// and is designed to be a drop-in replacement for C++14's
+// `std::make_index_sequence`.
+template <size_t N>
+using make_index_sequence = make_integer_sequence<size_t, N>;
+
+// index_sequence_for
+//
+// Converts a typename pack into an index sequence of the same length, and
+// is designed to be a drop-in replacement for C++14's
+// `std::index_sequence_for()`
+template <typename... Ts>
+using index_sequence_for = make_index_sequence<sizeof...(Ts)>;
+
+//// END OF CODE FROM GOOGLE ABSEIL
+
+#endif
+
+// dispatch utility (taken from ranges-v3)
+template<unsigned N> struct priority_tag : priority_tag < N - 1 > {};
+template<> struct priority_tag<0> {};
+
+// taken from ranges-v3
+template<typename T>
+struct static_const
+{
+    static constexpr T value{};
+};
+
+template<typename T>
+constexpr T static_const<T>::value; // NOLINT(readability-redundant-declaration)
+
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/meta/identity_tag.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+// dispatching helper struct
+template <class T> struct identity_tag {};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+
+#include <limits> // numeric_limits
+#include <type_traits> // false_type, is_constructible, is_integral, is_same, true_type
+#include <utility> // declval
+#include <tuple> // tuple
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+// #include <nlohmann/detail/iterators/iterator_traits.hpp>
+
+
+#include <iterator> // random_access_iterator_tag
+
+// #include <nlohmann/detail/meta/void_t.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+template<typename It, typename = void>
+struct iterator_types {};
+
+template<typename It>
+struct iterator_types <
+    It,
+    void_t<typename It::difference_type, typename It::value_type, typename It::pointer,
+    typename It::reference, typename It::iterator_category >>
+{
+    using difference_type = typename It::difference_type;
+    using value_type = typename It::value_type;
+    using pointer = typename It::pointer;
+    using reference = typename It::reference;
+    using iterator_category = typename It::iterator_category;
+};
+
+// This is required as some compilers implement std::iterator_traits in a way that
+// doesn't work with SFINAE. See https://github.com/nlohmann/json/issues/1341.
+template<typename T, typename = void>
+struct iterator_traits
+{
+};
+
+template<typename T>
+struct iterator_traits < T, enable_if_t < !std::is_pointer<T>::value >>
+            : iterator_types<T>
+{
+};
+
+template<typename T>
+struct iterator_traits<T*, enable_if_t<std::is_object<T>::value>>
+{
+    using iterator_category = std::random_access_iterator_tag;
+    using value_type = T;
+    using difference_type = ptrdiff_t;
+    using pointer = T*;
+    using reference = T&;
+};
+} // namespace detail
+} // namespace nlohmann
+
+// #include <nlohmann/detail/meta/call_std/begin.hpp>
+
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+namespace nlohmann
+{
+NLOHMANN_CAN_CALL_STD_FUNC_IMPL(begin);
+} // namespace nlohmann
+
+// #include <nlohmann/detail/meta/call_std/end.hpp>
+
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+namespace nlohmann
+{
+NLOHMANN_CAN_CALL_STD_FUNC_IMPL(end);
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/detected.hpp>
+
+// #include <nlohmann/json_fwd.hpp>
+#ifndef INCLUDE_NLOHMANN_JSON_FWD_HPP_
+#define INCLUDE_NLOHMANN_JSON_FWD_HPP_
+
+#include <cstdint> // int64_t, uint64_t
+#include <map> // map
+#include <memory> // allocator
+#include <string> // string
+#include <vector> // vector
+
+/*!
+@brief namespace for Niels Lohmann
+@see https://github.com/nlohmann
+@since version 1.0.0
+*/
+namespace nlohmann
+{
+/*!
+@brief default JSONSerializer template argument
+
+This serializer ignores the template arguments and uses ADL
+([argument-dependent lookup](https://en.cppreference.com/w/cpp/language/adl))
+for serialization.
+*/
+template<typename T = void, typename SFINAE = void>
+struct adl_serializer;
+
+/// a class to store JSON values
+/// @sa https://json.nlohmann.me/api/basic_json/
+template<template<typename U, typename V, typename... Args> class ObjectType =
+         std::map,
+         template<typename U, typename... Args> class ArrayType = std::vector,
+         class StringType = std::string, class BooleanType = bool,
+         class NumberIntegerType = std::int64_t,
+         class NumberUnsignedType = std::uint64_t,
+         class NumberFloatType = double,
+         template<typename U> class AllocatorType = std::allocator,
+         template<typename T, typename SFINAE = void> class JSONSerializer =
+         adl_serializer,
+         class BinaryType = std::vector<std::uint8_t>>
+class basic_json;
+
+/// @brief JSON Pointer defines a string syntax for identifying a specific value within a JSON document
+/// @sa https://json.nlohmann.me/api/json_pointer/
+template<typename BasicJsonType>
+class json_pointer;
+
+/*!
+@brief default specialization
+@sa https://json.nlohmann.me/api/json/
+*/
+using json = basic_json<>;
+
+/// @brief a minimal map-like container that preserves insertion order
+/// @sa https://json.nlohmann.me/api/ordered_map/
+template<class Key, class T, class IgnoredLess, class Allocator>
+struct ordered_map;
+
+/// @brief specialization that maintains the insertion order of object keys
+/// @sa https://json.nlohmann.me/api/ordered_json/
+using ordered_json = basic_json<nlohmann::ordered_map>;
+
+}  // namespace nlohmann
+
+#endif  // INCLUDE_NLOHMANN_JSON_FWD_HPP_
+
+
+namespace nlohmann
+{
+/*!
+@brief detail namespace with internal helper functions
+
+This namespace collects functions that should not be exposed,
+implementations of some @ref basic_json methods, and meta-programming helpers.
+
+@since version 2.1.0
+*/
+namespace detail
+{
+/////////////
+// helpers //
+/////////////
+
+// Note to maintainers:
+//
+// Every trait in this file expects a non CV-qualified type.
+// The only exceptions are in the 'aliases for detected' section
+// (i.e. those of the form: decltype(T::member_function(std::declval<T>())))
+//
+// In this case, T has to be properly CV-qualified to constraint the function arguments
+// (e.g. to_json(BasicJsonType&, const T&))
+
+template<typename> struct is_basic_json : std::false_type {};
+
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {};
+
+//////////////////////
+// json_ref helpers //
+//////////////////////
+
+template<typename>
+class json_ref;
+
+template<typename>
+struct is_json_ref : std::false_type {};
+
+template<typename T>
+struct is_json_ref<json_ref<T>> : std::true_type {};
+
+//////////////////////////
+// aliases for detected //
+//////////////////////////
+
+template<typename T>
+using mapped_type_t = typename T::mapped_type;
+
+template<typename T>
+using key_type_t = typename T::key_type;
+
+template<typename T>
+using value_type_t = typename T::value_type;
+
+template<typename T>
+using difference_type_t = typename T::difference_type;
+
+template<typename T>
+using pointer_t = typename T::pointer;
+
+template<typename T>
+using reference_t = typename T::reference;
+
+template<typename T>
+using iterator_category_t = typename T::iterator_category;
+
+template<typename T, typename... Args>
+using to_json_function = decltype(T::to_json(std::declval<Args>()...));
+
+template<typename T, typename... Args>
+using from_json_function = decltype(T::from_json(std::declval<Args>()...));
+
+template<typename T, typename U>
+using get_template_function = decltype(std::declval<T>().template get<U>());
+
+// trait checking if JSONSerializer<T>::from_json(json const&, udt&) exists
+template<typename BasicJsonType, typename T, typename = void>
+struct has_from_json : std::false_type {};
+
+// trait checking if j.get<T> is valid
+// use this trait instead of std::is_constructible or std::is_convertible,
+// both rely on, or make use of implicit conversions, and thus fail when T
+// has several constructors/operator= (see https://github.com/nlohmann/json/issues/958)
+template <typename BasicJsonType, typename T>
+struct is_getable
+{
+    static constexpr bool value = is_detected<get_template_function, const BasicJsonType&, T>::value;
+};
+
+template<typename BasicJsonType, typename T>
+struct has_from_json < BasicJsonType, T, enable_if_t < !is_basic_json<T>::value >>
+{
+    using serializer = typename BasicJsonType::template json_serializer<T, void>;
+
+    static constexpr bool value =
+        is_detected_exact<void, from_json_function, serializer,
+        const BasicJsonType&, T&>::value;
+};
+
+// This trait checks if JSONSerializer<T>::from_json(json const&) exists
+// this overload is used for non-default-constructible user-defined-types
+template<typename BasicJsonType, typename T, typename = void>
+struct has_non_default_from_json : std::false_type {};
+
+template<typename BasicJsonType, typename T>
+struct has_non_default_from_json < BasicJsonType, T, enable_if_t < !is_basic_json<T>::value >>
+{
+    using serializer = typename BasicJsonType::template json_serializer<T, void>;
+
+    static constexpr bool value =
+        is_detected_exact<T, from_json_function, serializer,
+        const BasicJsonType&>::value;
+};
+
+// This trait checks if BasicJsonType::json_serializer<T>::to_json exists
+// Do not evaluate the trait when T is a basic_json type, to avoid template instantiation infinite recursion.
+template<typename BasicJsonType, typename T, typename = void>
+struct has_to_json : std::false_type {};
+
+template<typename BasicJsonType, typename T>
+struct has_to_json < BasicJsonType, T, enable_if_t < !is_basic_json<T>::value >>
+{
+    using serializer = typename BasicJsonType::template json_serializer<T, void>;
+
+    static constexpr bool value =
+        is_detected_exact<void, to_json_function, serializer, BasicJsonType&,
+        T>::value;
+};
+
+
+///////////////////
+// is_ functions //
+///////////////////
+
+// https://en.cppreference.com/w/cpp/types/conjunction
+template<class...> struct conjunction : std::true_type { };
+template<class B1> struct conjunction<B1> : B1 { };
+template<class B1, class... Bn>
+struct conjunction<B1, Bn...>
+: std::conditional<bool(B1::value), conjunction<Bn...>, B1>::type {};
+
+// https://en.cppreference.com/w/cpp/types/negation
+template<class B> struct negation : std::integral_constant < bool, !B::value > { };
+
+// Reimplementation of is_constructible and is_default_constructible, due to them being broken for
+// std::pair and std::tuple until LWG 2367 fix (see https://cplusplus.github.io/LWG/lwg-defects.html#2367).
+// This causes compile errors in e.g. clang 3.5 or gcc 4.9.
+template <typename T>
+struct is_default_constructible : std::is_default_constructible<T> {};
+
+template <typename T1, typename T2>
+struct is_default_constructible<std::pair<T1, T2>>
+            : conjunction<is_default_constructible<T1>, is_default_constructible<T2>> {};
+
+template <typename T1, typename T2>
+struct is_default_constructible<const std::pair<T1, T2>>
+            : conjunction<is_default_constructible<T1>, is_default_constructible<T2>> {};
+
+template <typename... Ts>
+struct is_default_constructible<std::tuple<Ts...>>
+            : conjunction<is_default_constructible<Ts>...> {};
+
+template <typename... Ts>
+struct is_default_constructible<const std::tuple<Ts...>>
+            : conjunction<is_default_constructible<Ts>...> {};
+
+
+template <typename T, typename... Args>
+struct is_constructible : std::is_constructible<T, Args...> {};
+
+template <typename T1, typename T2>
+struct is_constructible<std::pair<T1, T2>> : is_default_constructible<std::pair<T1, T2>> {};
+
+template <typename T1, typename T2>
+struct is_constructible<const std::pair<T1, T2>> : is_default_constructible<const std::pair<T1, T2>> {};
+
+template <typename... Ts>
+struct is_constructible<std::tuple<Ts...>> : is_default_constructible<std::tuple<Ts...>> {};
+
+template <typename... Ts>
+struct is_constructible<const std::tuple<Ts...>> : is_default_constructible<const std::tuple<Ts...>> {};
+
+
+template<typename T, typename = void>
+struct is_iterator_traits : std::false_type {};
+
+template<typename T>
+struct is_iterator_traits<iterator_traits<T>>
+{
+  private:
+    using traits = iterator_traits<T>;
+
+  public:
+    static constexpr auto value =
+        is_detected<value_type_t, traits>::value &&
+        is_detected<difference_type_t, traits>::value &&
+        is_detected<pointer_t, traits>::value &&
+        is_detected<iterator_category_t, traits>::value &&
+        is_detected<reference_t, traits>::value;
+};
+
+template<typename T>
+struct is_range
+{
+  private:
+    using t_ref = typename std::add_lvalue_reference<T>::type;
+
+    using iterator = detected_t<result_of_begin, t_ref>;
+    using sentinel = detected_t<result_of_end, t_ref>;
+
+    // to be 100% correct, it should use https://en.cppreference.com/w/cpp/iterator/input_or_output_iterator
+    // and https://en.cppreference.com/w/cpp/iterator/sentinel_for
+    // but reimplementing these would be too much work, as a lot of other concepts are used underneath
+    static constexpr auto is_iterator_begin =
+        is_iterator_traits<iterator_traits<iterator>>::value;
+
+  public:
+    static constexpr bool value = !std::is_same<iterator, nonesuch>::value && !std::is_same<sentinel, nonesuch>::value && is_iterator_begin;
+};
+
+template<typename R>
+using iterator_t = enable_if_t<is_range<R>::value, result_of_begin<decltype(std::declval<R&>())>>;
+
+template<typename T>
+using range_value_t = value_type_t<iterator_traits<iterator_t<T>>>;
+
+// The following implementation of is_complete_type is taken from
+// https://blogs.msdn.microsoft.com/vcblog/2015/12/02/partial-support-for-expression-sfinae-in-vs-2015-update-1/
+// and is written by Xiang Fan who agreed to using it in this library.
+
+template<typename T, typename = void>
+struct is_complete_type : std::false_type {};
+
+template<typename T>
+struct is_complete_type<T, decltype(void(sizeof(T)))> : std::true_type {};
+
+template<typename BasicJsonType, typename CompatibleObjectType,
+         typename = void>
+struct is_compatible_object_type_impl : std::false_type {};
+
+template<typename BasicJsonType, typename CompatibleObjectType>
+struct is_compatible_object_type_impl <
+    BasicJsonType, CompatibleObjectType,
+    enable_if_t < is_detected<mapped_type_t, CompatibleObjectType>::value&&
+    is_detected<key_type_t, CompatibleObjectType>::value >>
+{
+    using object_t = typename BasicJsonType::object_t;
+
+    // macOS's is_constructible does not play well with nonesuch...
+    static constexpr bool value =
+        is_constructible<typename object_t::key_type,
+        typename CompatibleObjectType::key_type>::value &&
+        is_constructible<typename object_t::mapped_type,
+        typename CompatibleObjectType::mapped_type>::value;
+};
+
+template<typename BasicJsonType, typename CompatibleObjectType>
+struct is_compatible_object_type
+    : is_compatible_object_type_impl<BasicJsonType, CompatibleObjectType> {};
+
+template<typename BasicJsonType, typename ConstructibleObjectType,
+         typename = void>
+struct is_constructible_object_type_impl : std::false_type {};
+
+template<typename BasicJsonType, typename ConstructibleObjectType>
+struct is_constructible_object_type_impl <
+    BasicJsonType, ConstructibleObjectType,
+    enable_if_t < is_detected<mapped_type_t, ConstructibleObjectType>::value&&
+    is_detected<key_type_t, ConstructibleObjectType>::value >>
+{
+    using object_t = typename BasicJsonType::object_t;
+
+    static constexpr bool value =
+        (is_default_constructible<ConstructibleObjectType>::value &&
+         (std::is_move_assignable<ConstructibleObjectType>::value ||
+          std::is_copy_assignable<ConstructibleObjectType>::value) &&
+         (is_constructible<typename ConstructibleObjectType::key_type,
+          typename object_t::key_type>::value &&
+          std::is_same <
+          typename object_t::mapped_type,
+          typename ConstructibleObjectType::mapped_type >::value)) ||
+        (has_from_json<BasicJsonType,
+         typename ConstructibleObjectType::mapped_type>::value ||
+         has_non_default_from_json <
+         BasicJsonType,
+         typename ConstructibleObjectType::mapped_type >::value);
+};
+
+template<typename BasicJsonType, typename ConstructibleObjectType>
+struct is_constructible_object_type
+    : is_constructible_object_type_impl<BasicJsonType,
+      ConstructibleObjectType> {};
+
+template<typename BasicJsonType, typename CompatibleStringType>
+struct is_compatible_string_type
+{
+    static constexpr auto value =
+        is_constructible<typename BasicJsonType::string_t, CompatibleStringType>::value;
+};
+
+template<typename BasicJsonType, typename ConstructibleStringType>
+struct is_constructible_string_type
+{
+    static constexpr auto value =
+        is_constructible<ConstructibleStringType,
+        typename BasicJsonType::string_t>::value;
+};
+
+template<typename BasicJsonType, typename CompatibleArrayType, typename = void>
+struct is_compatible_array_type_impl : std::false_type {};
+
+template<typename BasicJsonType, typename CompatibleArrayType>
+struct is_compatible_array_type_impl <
+    BasicJsonType, CompatibleArrayType,
+    enable_if_t <
+    is_detected<iterator_t, CompatibleArrayType>::value&&
+    is_iterator_traits<iterator_traits<detected_t<iterator_t, CompatibleArrayType>>>::value&&
+// special case for types like std::filesystem::path whose iterator's value_type are themselves
+// c.f. https://github.com/nlohmann/json/pull/3073
+    !std::is_same<CompatibleArrayType, detected_t<range_value_t, CompatibleArrayType>>::value >>
+{
+    static constexpr bool value =
+        is_constructible<BasicJsonType,
+        range_value_t<CompatibleArrayType>>::value;
+};
+
+template<typename BasicJsonType, typename CompatibleArrayType>
+struct is_compatible_array_type
+    : is_compatible_array_type_impl<BasicJsonType, CompatibleArrayType> {};
+
+template<typename BasicJsonType, typename ConstructibleArrayType, typename = void>
+struct is_constructible_array_type_impl : std::false_type {};
+
+template<typename BasicJsonType, typename ConstructibleArrayType>
+struct is_constructible_array_type_impl <
+    BasicJsonType, ConstructibleArrayType,
+    enable_if_t<std::is_same<ConstructibleArrayType,
+    typename BasicJsonType::value_type>::value >>
+            : std::true_type {};
+
+template<typename BasicJsonType, typename ConstructibleArrayType>
+struct is_constructible_array_type_impl <
+    BasicJsonType, ConstructibleArrayType,
+    enable_if_t < !std::is_same<ConstructibleArrayType,
+    typename BasicJsonType::value_type>::value&&
+    !is_compatible_string_type<BasicJsonType, ConstructibleArrayType>::value&&
+    is_default_constructible<ConstructibleArrayType>::value&&
+(std::is_move_assignable<ConstructibleArrayType>::value ||
+ std::is_copy_assignable<ConstructibleArrayType>::value)&&
+is_detected<iterator_t, ConstructibleArrayType>::value&&
+is_iterator_traits<iterator_traits<detected_t<iterator_t, ConstructibleArrayType>>>::value&&
+is_detected<range_value_t, ConstructibleArrayType>::value&&
+// special case for types like std::filesystem::path whose iterator's value_type are themselves
+// c.f. https://github.com/nlohmann/json/pull/3073
+!std::is_same<ConstructibleArrayType, detected_t<range_value_t, ConstructibleArrayType>>::value&&
+        is_complete_type <
+        detected_t<range_value_t, ConstructibleArrayType >>::value >>
+{
+    using value_type = range_value_t<ConstructibleArrayType>;
+
+    static constexpr bool value =
+        std::is_same<value_type,
+        typename BasicJsonType::array_t::value_type>::value ||
+        has_from_json<BasicJsonType,
+        value_type>::value ||
+        has_non_default_from_json <
+        BasicJsonType,
+        value_type >::value;
+};
+
+template<typename BasicJsonType, typename ConstructibleArrayType>
+struct is_constructible_array_type
+    : is_constructible_array_type_impl<BasicJsonType, ConstructibleArrayType> {};
+
+template<typename RealIntegerType, typename CompatibleNumberIntegerType,
+         typename = void>
+struct is_compatible_integer_type_impl : std::false_type {};
+
+template<typename RealIntegerType, typename CompatibleNumberIntegerType>
+struct is_compatible_integer_type_impl <
+    RealIntegerType, CompatibleNumberIntegerType,
+    enable_if_t < std::is_integral<RealIntegerType>::value&&
+    std::is_integral<CompatibleNumberIntegerType>::value&&
+    !std::is_same<bool, CompatibleNumberIntegerType>::value >>
+{
+    // is there an assert somewhere on overflows?
+    using RealLimits = std::numeric_limits<RealIntegerType>;
+    using CompatibleLimits = std::numeric_limits<CompatibleNumberIntegerType>;
+
+    static constexpr auto value =
+        is_constructible<RealIntegerType,
+        CompatibleNumberIntegerType>::value &&
+        CompatibleLimits::is_integer &&
+        RealLimits::is_signed == CompatibleLimits::is_signed;
+};
+
+template<typename RealIntegerType, typename CompatibleNumberIntegerType>
+struct is_compatible_integer_type
+    : is_compatible_integer_type_impl<RealIntegerType,
+      CompatibleNumberIntegerType> {};
+
+template<typename BasicJsonType, typename CompatibleType, typename = void>
+struct is_compatible_type_impl: std::false_type {};
+
+template<typename BasicJsonType, typename CompatibleType>
+struct is_compatible_type_impl <
+    BasicJsonType, CompatibleType,
+    enable_if_t<is_complete_type<CompatibleType>::value >>
+{
+    static constexpr bool value =
+        has_to_json<BasicJsonType, CompatibleType>::value;
+};
+
+template<typename BasicJsonType, typename CompatibleType>
+struct is_compatible_type
+    : is_compatible_type_impl<BasicJsonType, CompatibleType> {};
+
+template<typename T1, typename T2>
+struct is_constructible_tuple : std::false_type {};
+
+template<typename T1, typename... Args>
+struct is_constructible_tuple<T1, std::tuple<Args...>> : conjunction<is_constructible<T1, Args>...> {};
+
+// a naive helper to check if a type is an ordered_map (exploits the fact that
+// ordered_map inherits capacity() from std::vector)
+template <typename T>
+struct is_ordered_map
+{
+    using one = char;
+
+    struct two
+    {
+        char x[2]; // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+    };
+
+    template <typename C> static one test( decltype(&C::capacity) ) ;
+    template <typename C> static two test(...);
+
+    enum { value = sizeof(test<T>(nullptr)) == sizeof(char) }; // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+};
+
+// to avoid useless casts (see https://github.com/nlohmann/json/issues/2893#issuecomment-889152324)
+template < typename T, typename U, enable_if_t < !std::is_same<T, U>::value, int > = 0 >
+T conditional_static_cast(U value)
+{
+    return static_cast<T>(value);
+}
+
+template<typename T, typename U, enable_if_t<std::is_same<T, U>::value, int> = 0>
+T conditional_static_cast(U value)
+{
+    return value;
+}
+
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+#if JSON_HAS_EXPERIMENTAL_FILESYSTEM
+#include <experimental/filesystem>
+namespace nlohmann::detail
+{
+namespace std_fs = std::experimental::filesystem;
+} // namespace nlohmann::detail
+#elif JSON_HAS_FILESYSTEM
+#include <filesystem>
+namespace nlohmann::detail
+{
+namespace std_fs = std::filesystem;
+} // namespace nlohmann::detail
+#endif
+
+namespace nlohmann
+{
+namespace detail
+{
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename std::nullptr_t& n)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_null()))
+    {
+        JSON_THROW(type_error::create(302, "type must be null, but is " + std::string(j.type_name()), j));
+    }
+    n = nullptr;
+}
+
+// overloads for basic_json template parameters
+template < typename BasicJsonType, typename ArithmeticType,
+           enable_if_t < std::is_arithmetic<ArithmeticType>::value&&
+                         !std::is_same<ArithmeticType, typename BasicJsonType::boolean_t>::value,
+                         int > = 0 >
+void get_arithmetic_value(const BasicJsonType& j, ArithmeticType& val)
+{
+    switch (static_cast<value_t>(j))
+    {
+        case value_t::number_unsigned:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_unsigned_t*>());
+            break;
+        }
+        case value_t::number_integer:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_integer_t*>());
+            break;
+        }
+        case value_t::number_float:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_float_t*>());
+            break;
+        }
+
+        case value_t::null:
+        case value_t::object:
+        case value_t::array:
+        case value_t::string:
+        case value_t::boolean:
+        case value_t::binary:
+        case value_t::discarded:
+        default:
+            JSON_THROW(type_error::create(302, "type must be number, but is " + std::string(j.type_name()), j));
+    }
+}
+
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename BasicJsonType::boolean_t& b)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_boolean()))
+    {
+        JSON_THROW(type_error::create(302, "type must be boolean, but is " + std::string(j.type_name()), j));
+    }
+    b = *j.template get_ptr<const typename BasicJsonType::boolean_t*>();
+}
+
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename BasicJsonType::string_t& s)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_string()))
+    {
+        JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name()), j));
+    }
+    s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
+}
+
+template <
+    typename BasicJsonType, typename ConstructibleStringType,
+    enable_if_t <
+        is_constructible_string_type<BasicJsonType, ConstructibleStringType>::value&&
+        !std::is_same<typename BasicJsonType::string_t,
+                      ConstructibleStringType>::value,
+        int > = 0 >
+void from_json(const BasicJsonType& j, ConstructibleStringType& s)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_string()))
+    {
+        JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name()), j));
+    }
+
+    s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
+}
+
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename BasicJsonType::number_float_t& val)
+{
+    get_arithmetic_value(j, val);
+}
+
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename BasicJsonType::number_unsigned_t& val)
+{
+    get_arithmetic_value(j, val);
+}
+
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename BasicJsonType::number_integer_t& val)
+{
+    get_arithmetic_value(j, val);
+}
+
+template<typename BasicJsonType, typename EnumType,
+         enable_if_t<std::is_enum<EnumType>::value, int> = 0>
+void from_json(const BasicJsonType& j, EnumType& e)
+{
+    typename std::underlying_type<EnumType>::type val;
+    get_arithmetic_value(j, val);
+    e = static_cast<EnumType>(val);
+}
+
+// forward_list doesn't have an insert method
+template<typename BasicJsonType, typename T, typename Allocator,
+         enable_if_t<is_getable<BasicJsonType, T>::value, int> = 0>
+void from_json(const BasicJsonType& j, std::forward_list<T, Allocator>& l)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()), j));
+    }
+    l.clear();
+    std::transform(j.rbegin(), j.rend(),
+                   std::front_inserter(l), [](const BasicJsonType & i)
+    {
+        return i.template get<T>();
+    });
+}
+
+// valarray doesn't have an insert method
+template<typename BasicJsonType, typename T,
+         enable_if_t<is_getable<BasicJsonType, T>::value, int> = 0>
+void from_json(const BasicJsonType& j, std::valarray<T>& l)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()), j));
+    }
+    l.resize(j.size());
+    std::transform(j.begin(), j.end(), std::begin(l),
+                   [](const BasicJsonType & elem)
+    {
+        return elem.template get<T>();
+    });
+}
+
+template<typename BasicJsonType, typename T, std::size_t N>
+auto from_json(const BasicJsonType& j, T (&arr)[N])  // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+-> decltype(j.template get<T>(), void())
+{
+    for (std::size_t i = 0; i < N; ++i)
+    {
+        arr[i] = j.at(i).template get<T>();
+    }
+}
+
+template<typename BasicJsonType>
+void from_json_array_impl(const BasicJsonType& j, typename BasicJsonType::array_t& arr, priority_tag<3> /*unused*/)
+{
+    arr = *j.template get_ptr<const typename BasicJsonType::array_t*>();
+}
+
+template<typename BasicJsonType, typename T, std::size_t N>
+auto from_json_array_impl(const BasicJsonType& j, std::array<T, N>& arr,
+                          priority_tag<2> /*unused*/)
+-> decltype(j.template get<T>(), void())
+{
+    for (std::size_t i = 0; i < N; ++i)
+    {
+        arr[i] = j.at(i).template get<T>();
+    }
+}
+
+template<typename BasicJsonType, typename ConstructibleArrayType,
+         enable_if_t<
+             std::is_assignable<ConstructibleArrayType&, ConstructibleArrayType>::value,
+             int> = 0>
+auto from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr, priority_tag<1> /*unused*/)
+-> decltype(
+    arr.reserve(std::declval<typename ConstructibleArrayType::size_type>()),
+    j.template get<typename ConstructibleArrayType::value_type>(),
+    void())
+{
+    using std::end;
+
+    ConstructibleArrayType ret;
+    ret.reserve(j.size());
+    std::transform(j.begin(), j.end(),
+                   std::inserter(ret, end(ret)), [](const BasicJsonType & i)
+    {
+        // get<BasicJsonType>() returns *this, this won't call a from_json
+        // method when value_type is BasicJsonType
+        return i.template get<typename ConstructibleArrayType::value_type>();
+    });
+    arr = std::move(ret);
+}
+
+template<typename BasicJsonType, typename ConstructibleArrayType,
+         enable_if_t<
+             std::is_assignable<ConstructibleArrayType&, ConstructibleArrayType>::value,
+             int> = 0>
+void from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr,
+                          priority_tag<0> /*unused*/)
+{
+    using std::end;
+
+    ConstructibleArrayType ret;
+    std::transform(
+        j.begin(), j.end(), std::inserter(ret, end(ret)),
+        [](const BasicJsonType & i)
+    {
+        // get<BasicJsonType>() returns *this, this won't call a from_json
+        // method when value_type is BasicJsonType
+        return i.template get<typename ConstructibleArrayType::value_type>();
+    });
+    arr = std::move(ret);
+}
+
+template < typename BasicJsonType, typename ConstructibleArrayType,
+           enable_if_t <
+               is_constructible_array_type<BasicJsonType, ConstructibleArrayType>::value&&
+               !is_constructible_object_type<BasicJsonType, ConstructibleArrayType>::value&&
+               !is_constructible_string_type<BasicJsonType, ConstructibleArrayType>::value&&
+               !std::is_same<ConstructibleArrayType, typename BasicJsonType::binary_t>::value&&
+               !is_basic_json<ConstructibleArrayType>::value,
+               int > = 0 >
+auto from_json(const BasicJsonType& j, ConstructibleArrayType& arr)
+-> decltype(from_json_array_impl(j, arr, priority_tag<3> {}),
+j.template get<typename ConstructibleArrayType::value_type>(),
+void())
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()), j));
+    }
+
+    from_json_array_impl(j, arr, priority_tag<3> {});
+}
+
+template < typename BasicJsonType, typename T, std::size_t... Idx >
+std::array<T, sizeof...(Idx)> from_json_inplace_array_impl(BasicJsonType&& j,
+        identity_tag<std::array<T, sizeof...(Idx)>> /*unused*/, index_sequence<Idx...> /*unused*/)
+{
+    return { { std::forward<BasicJsonType>(j).at(Idx).template get<T>()... } };
+}
+
+template < typename BasicJsonType, typename T, std::size_t N >
+auto from_json(BasicJsonType&& j, identity_tag<std::array<T, N>> tag)
+-> decltype(from_json_inplace_array_impl(std::forward<BasicJsonType>(j), tag, make_index_sequence<N> {}))
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()), j));
+    }
+
+    return from_json_inplace_array_impl(std::forward<BasicJsonType>(j), tag, make_index_sequence<N> {});
+}
+
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename BasicJsonType::binary_t& bin)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_binary()))
+    {
+        JSON_THROW(type_error::create(302, "type must be binary, but is " + std::string(j.type_name()), j));
+    }
+
+    bin = *j.template get_ptr<const typename BasicJsonType::binary_t*>();
+}
+
+template<typename BasicJsonType, typename ConstructibleObjectType,
+         enable_if_t<is_constructible_object_type<BasicJsonType, ConstructibleObjectType>::value, int> = 0>
+void from_json(const BasicJsonType& j, ConstructibleObjectType& obj)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_object()))
+    {
+        JSON_THROW(type_error::create(302, "type must be object, but is " + std::string(j.type_name()), j));
+    }
+
+    ConstructibleObjectType ret;
+    const auto* inner_object = j.template get_ptr<const typename BasicJsonType::object_t*>();
+    using value_type = typename ConstructibleObjectType::value_type;
+    std::transform(
+        inner_object->begin(), inner_object->end(),
+        std::inserter(ret, ret.begin()),
+        [](typename BasicJsonType::object_t::value_type const & p)
+    {
+        return value_type(p.first, p.second.template get<typename ConstructibleObjectType::mapped_type>());
+    });
+    obj = std::move(ret);
+}
+
+// overload for arithmetic types, not chosen for basic_json template arguments
+// (BooleanType, etc..); note: Is it really necessary to provide explicit
+// overloads for boolean_t etc. in case of a custom BooleanType which is not
+// an arithmetic type?
+template < typename BasicJsonType, typename ArithmeticType,
+           enable_if_t <
+               std::is_arithmetic<ArithmeticType>::value&&
+               !std::is_same<ArithmeticType, typename BasicJsonType::number_unsigned_t>::value&&
+               !std::is_same<ArithmeticType, typename BasicJsonType::number_integer_t>::value&&
+               !std::is_same<ArithmeticType, typename BasicJsonType::number_float_t>::value&&
+               !std::is_same<ArithmeticType, typename BasicJsonType::boolean_t>::value,
+               int > = 0 >
+void from_json(const BasicJsonType& j, ArithmeticType& val)
+{
+    switch (static_cast<value_t>(j))
+    {
+        case value_t::number_unsigned:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_unsigned_t*>());
+            break;
+        }
+        case value_t::number_integer:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_integer_t*>());
+            break;
+        }
+        case value_t::number_float:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_float_t*>());
+            break;
+        }
+        case value_t::boolean:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::boolean_t*>());
+            break;
+        }
+
+        case value_t::null:
+        case value_t::object:
+        case value_t::array:
+        case value_t::string:
+        case value_t::binary:
+        case value_t::discarded:
+        default:
+            JSON_THROW(type_error::create(302, "type must be number, but is " + std::string(j.type_name()), j));
+    }
+}
+
+template<typename BasicJsonType, typename... Args, std::size_t... Idx>
+std::tuple<Args...> from_json_tuple_impl_base(BasicJsonType&& j, index_sequence<Idx...> /*unused*/)
+{
+    return std::make_tuple(std::forward<BasicJsonType>(j).at(Idx).template get<Args>()...);
+}
+
+template < typename BasicJsonType, class A1, class A2 >
+std::pair<A1, A2> from_json_tuple_impl(BasicJsonType&& j, identity_tag<std::pair<A1, A2>> /*unused*/, priority_tag<0> /*unused*/)
+{
+    return {std::forward<BasicJsonType>(j).at(0).template get<A1>(),
+            std::forward<BasicJsonType>(j).at(1).template get<A2>()};
+}
+
+template<typename BasicJsonType, typename A1, typename A2>
+void from_json_tuple_impl(BasicJsonType&& j, std::pair<A1, A2>& p, priority_tag<1> /*unused*/)
+{
+    p = from_json_tuple_impl(std::forward<BasicJsonType>(j), identity_tag<std::pair<A1, A2>> {}, priority_tag<0> {});
+}
+
+template<typename BasicJsonType, typename... Args>
+std::tuple<Args...> from_json_tuple_impl(BasicJsonType&& j, identity_tag<std::tuple<Args...>> /*unused*/, priority_tag<2> /*unused*/)
+{
+    return from_json_tuple_impl_base<BasicJsonType, Args...>(std::forward<BasicJsonType>(j), index_sequence_for<Args...> {});
+}
+
+template<typename BasicJsonType, typename... Args>
+void from_json_tuple_impl(BasicJsonType&& j, std::tuple<Args...>& t, priority_tag<3> /*unused*/)
+{
+    t = from_json_tuple_impl_base<BasicJsonType, Args...>(std::forward<BasicJsonType>(j), index_sequence_for<Args...> {});
+}
+
+template<typename BasicJsonType, typename TupleRelated>
+auto from_json(BasicJsonType&& j, TupleRelated&& t)
+-> decltype(from_json_tuple_impl(std::forward<BasicJsonType>(j), std::forward<TupleRelated>(t), priority_tag<3> {}))
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()), j));
+    }
+
+    return from_json_tuple_impl(std::forward<BasicJsonType>(j), std::forward<TupleRelated>(t), priority_tag<3> {});
+}
+
+template < typename BasicJsonType, typename Key, typename Value, typename Compare, typename Allocator,
+           typename = enable_if_t < !std::is_constructible <
+                                        typename BasicJsonType::string_t, Key >::value >>
+void from_json(const BasicJsonType& j, std::map<Key, Value, Compare, Allocator>& m)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()), j));
+    }
+    m.clear();
+    for (const auto& p : j)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!p.is_array()))
+        {
+            JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(p.type_name()), j));
+        }
+        m.emplace(p.at(0).template get<Key>(), p.at(1).template get<Value>());
+    }
+}
+
+template < typename BasicJsonType, typename Key, typename Value, typename Hash, typename KeyEqual, typename Allocator,
+           typename = enable_if_t < !std::is_constructible <
+                                        typename BasicJsonType::string_t, Key >::value >>
+void from_json(const BasicJsonType& j, std::unordered_map<Key, Value, Hash, KeyEqual, Allocator>& m)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()), j));
+    }
+    m.clear();
+    for (const auto& p : j)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!p.is_array()))
+        {
+            JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(p.type_name()), j));
+        }
+        m.emplace(p.at(0).template get<Key>(), p.at(1).template get<Value>());
+    }
+}
+
+#if JSON_HAS_FILESYSTEM || JSON_HAS_EXPERIMENTAL_FILESYSTEM
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, std_fs::path& p)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_string()))
+    {
+        JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name()), j));
+    }
+    p = *j.template get_ptr<const typename BasicJsonType::string_t*>();
+}
+#endif
+
+struct from_json_fn
+{
+    template<typename BasicJsonType, typename T>
+    auto operator()(const BasicJsonType& j, T&& val) const
+    noexcept(noexcept(from_json(j, std::forward<T>(val))))
+    -> decltype(from_json(j, std::forward<T>(val)))
+    {
+        return from_json(j, std::forward<T>(val));
+    }
+};
+}  // namespace detail
+
+/// namespace to hold default `from_json` function
+/// to see why this is required:
+/// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/n4381.html
+namespace // NOLINT(cert-dcl59-cpp,fuchsia-header-anon-namespaces,google-build-namespaces)
+{
+constexpr const auto& from_json = detail::static_const<detail::from_json_fn>::value; // NOLINT(misc-definitions-in-headers)
+} // namespace
+} // namespace nlohmann
+
+// #include <nlohmann/detail/conversions/to_json.hpp>
+
+
+#include <algorithm> // copy
+#include <iterator> // begin, end
+#include <string> // string
+#include <tuple> // tuple, get
+#include <type_traits> // is_same, is_constructible, is_floating_point, is_enum, underlying_type
+#include <utility> // move, forward, declval, pair
+#include <valarray> // valarray
+#include <vector> // vector
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/iterators/iteration_proxy.hpp>
+
+
+#include <cstddef> // size_t
+#include <iterator> // input_iterator_tag
+#include <string> // string, to_string
+#include <tuple> // tuple_size, get, tuple_element
+#include <utility> // move
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+template<typename string_type>
+void int_to_string( string_type& target, std::size_t value )
+{
+    // For ADL
+    using std::to_string;
+    target = to_string(value);
+}
+template<typename IteratorType> class iteration_proxy_value
+{
+  public:
+    using difference_type = std::ptrdiff_t;
+    using value_type = iteration_proxy_value;
+    using pointer = value_type * ;
+    using reference = value_type & ;
+    using iterator_category = std::input_iterator_tag;
+    using string_type = typename std::remove_cv< typename std::remove_reference<decltype( std::declval<IteratorType>().key() ) >::type >::type;
+
+  private:
+    /// the iterator
+    IteratorType anchor;
+    /// an index for arrays (used to create key names)
+    std::size_t array_index = 0;
+    /// last stringified array index
+    mutable std::size_t array_index_last = 0;
+    /// a string representation of the array index
+    mutable string_type array_index_str = "0";
+    /// an empty string (to return a reference for primitive values)
+    const string_type empty_str{};
+
+  public:
+    explicit iteration_proxy_value(IteratorType it) noexcept
+        : anchor(std::move(it))
+    {}
+
+    /// dereference operator (needed for range-based for)
+    iteration_proxy_value& operator*()
+    {
+        return *this;
+    }
+
+    /// increment operator (needed for range-based for)
+    iteration_proxy_value& operator++()
+    {
+        ++anchor;
+        ++array_index;
+
+        return *this;
+    }
+
+    /// equality operator (needed for InputIterator)
+    bool operator==(const iteration_proxy_value& o) const
+    {
+        return anchor == o.anchor;
+    }
+
+    /// inequality operator (needed for range-based for)
+    bool operator!=(const iteration_proxy_value& o) const
+    {
+        return anchor != o.anchor;
+    }
+
+    /// return key of the iterator
+    const string_type& key() const
+    {
+        JSON_ASSERT(anchor.m_object != nullptr);
+
+        switch (anchor.m_object->type())
+        {
+            // use integer array index as key
+            case value_t::array:
+            {
+                if (array_index != array_index_last)
+                {
+                    int_to_string( array_index_str, array_index );
+                    array_index_last = array_index;
+                }
+                return array_index_str;
+            }
+
+            // use key from the object
+            case value_t::object:
+                return anchor.key();
+
+            // use an empty key for all primitive types
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+                return empty_str;
+        }
+    }
+
+    /// return value of the iterator
+    typename IteratorType::reference value() const
+    {
+        return anchor.value();
+    }
+};
+
+/// proxy class for the items() function
+template<typename IteratorType> class iteration_proxy
+{
+  private:
+    /// the container to iterate
+    typename IteratorType::reference container;
+
+  public:
+    /// construct iteration proxy from a container
+    explicit iteration_proxy(typename IteratorType::reference cont) noexcept
+        : container(cont) {}
+
+    /// return iterator begin (needed for range-based for)
+    iteration_proxy_value<IteratorType> begin() noexcept
+    {
+        return iteration_proxy_value<IteratorType>(container.begin());
+    }
+
+    /// return iterator end (needed for range-based for)
+    iteration_proxy_value<IteratorType> end() noexcept
+    {
+        return iteration_proxy_value<IteratorType>(container.end());
+    }
+};
+// Structured Bindings Support
+// For further reference see https://blog.tartanllama.xyz/structured-bindings/
+// And see https://github.com/nlohmann/json/pull/1391
+template<std::size_t N, typename IteratorType, enable_if_t<N == 0, int> = 0>
+auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decltype(i.key())
+{
+    return i.key();
+}
+// Structured Bindings Support
+// For further reference see https://blog.tartanllama.xyz/structured-bindings/
+// And see https://github.com/nlohmann/json/pull/1391
+template<std::size_t N, typename IteratorType, enable_if_t<N == 1, int> = 0>
+auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decltype(i.value())
+{
+    return i.value();
+}
+}  // namespace detail
+}  // namespace nlohmann
+
+// The Addition to the STD Namespace is required to add
+// Structured Bindings Support to the iteration_proxy_value class
+// For further reference see https://blog.tartanllama.xyz/structured-bindings/
+// And see https://github.com/nlohmann/json/pull/1391
+namespace std
+{
+#if defined(__clang__)
+    // Fix: https://github.com/nlohmann/json/issues/1401
+    #pragma clang diagnostic push
+    #pragma clang diagnostic ignored "-Wmismatched-tags"
+#endif
+template<typename IteratorType>
+class tuple_size<::nlohmann::detail::iteration_proxy_value<IteratorType>>
+            : public std::integral_constant<std::size_t, 2> {};
+
+template<std::size_t N, typename IteratorType>
+class tuple_element<N, ::nlohmann::detail::iteration_proxy_value<IteratorType >>
+{
+  public:
+    using type = decltype(
+                     get<N>(std::declval <
+                            ::nlohmann::detail::iteration_proxy_value<IteratorType >> ()));
+};
+#if defined(__clang__)
+    #pragma clang diagnostic pop
+#endif
+} // namespace std
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+#if JSON_HAS_EXPERIMENTAL_FILESYSTEM
+#include <experimental/filesystem>
+namespace nlohmann::detail
+{
+namespace std_fs = std::experimental::filesystem;
+} // namespace nlohmann::detail
+#elif JSON_HAS_FILESYSTEM
+#include <filesystem>
+namespace nlohmann::detail
+{
+namespace std_fs = std::filesystem;
+} // namespace nlohmann::detail
+#endif
+
+namespace nlohmann
+{
+namespace detail
+{
+//////////////////
+// constructors //
+//////////////////
+
+/*
+ * Note all external_constructor<>::construct functions need to call
+ * j.m_value.destroy(j.m_type) to avoid a memory leak in case j contains an
+ * allocated value (e.g., a string). See bug issue
+ * https://github.com/nlohmann/json/issues/2865 for more information.
+ */
+
+template<value_t> struct external_constructor;
+
+template<>
+struct external_constructor<value_t::boolean>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::boolean_t b) noexcept
+    {
+        j.m_value.destroy(j.m_type);
+        j.m_type = value_t::boolean;
+        j.m_value = b;
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::string>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const typename BasicJsonType::string_t& s)
+    {
+        j.m_value.destroy(j.m_type);
+        j.m_type = value_t::string;
+        j.m_value = s;
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::string_t&& s)
+    {
+        j.m_value.destroy(j.m_type);
+        j.m_type = value_t::string;
+        j.m_value = std::move(s);
+        j.assert_invariant();
+    }
+
+    template < typename BasicJsonType, typename CompatibleStringType,
+               enable_if_t < !std::is_same<CompatibleStringType, typename BasicJsonType::string_t>::value,
+                             int > = 0 >
+    static void construct(BasicJsonType& j, const CompatibleStringType& str)
+    {
+        j.m_value.destroy(j.m_type);
+        j.m_type = value_t::string;
+        j.m_value.string = j.template create<typename BasicJsonType::string_t>(str);
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::binary>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const typename BasicJsonType::binary_t& b)
+    {
+        j.m_value.destroy(j.m_type);
+        j.m_type = value_t::binary;
+        j.m_value = typename BasicJsonType::binary_t(b);
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::binary_t&& b)
+    {
+        j.m_value.destroy(j.m_type);
+        j.m_type = value_t::binary;
+        j.m_value = typename BasicJsonType::binary_t(std::move(b));
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::number_float>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::number_float_t val) noexcept
+    {
+        j.m_value.destroy(j.m_type);
+        j.m_type = value_t::number_float;
+        j.m_value = val;
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::number_unsigned>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::number_unsigned_t val) noexcept
+    {
+        j.m_value.destroy(j.m_type);
+        j.m_type = value_t::number_unsigned;
+        j.m_value = val;
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::number_integer>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::number_integer_t val) noexcept
+    {
+        j.m_value.destroy(j.m_type);
+        j.m_type = value_t::number_integer;
+        j.m_value = val;
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::array>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const typename BasicJsonType::array_t& arr)
+    {
+        j.m_value.destroy(j.m_type);
+        j.m_type = value_t::array;
+        j.m_value = arr;
+        j.set_parents();
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::array_t&& arr)
+    {
+        j.m_value.destroy(j.m_type);
+        j.m_type = value_t::array;
+        j.m_value = std::move(arr);
+        j.set_parents();
+        j.assert_invariant();
+    }
+
+    template < typename BasicJsonType, typename CompatibleArrayType,
+               enable_if_t < !std::is_same<CompatibleArrayType, typename BasicJsonType::array_t>::value,
+                             int > = 0 >
+    static void construct(BasicJsonType& j, const CompatibleArrayType& arr)
+    {
+        using std::begin;
+        using std::end;
+
+        j.m_value.destroy(j.m_type);
+        j.m_type = value_t::array;
+        j.m_value.array = j.template create<typename BasicJsonType::array_t>(begin(arr), end(arr));
+        j.set_parents();
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const std::vector<bool>& arr)
+    {
+        j.m_value.destroy(j.m_type);
+        j.m_type = value_t::array;
+        j.m_value = value_t::array;
+        j.m_value.array->reserve(arr.size());
+        for (const bool x : arr)
+        {
+            j.m_value.array->push_back(x);
+            j.set_parent(j.m_value.array->back());
+        }
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType, typename T,
+             enable_if_t<std::is_convertible<T, BasicJsonType>::value, int> = 0>
+    static void construct(BasicJsonType& j, const std::valarray<T>& arr)
+    {
+        j.m_value.destroy(j.m_type);
+        j.m_type = value_t::array;
+        j.m_value = value_t::array;
+        j.m_value.array->resize(arr.size());
+        if (arr.size() > 0)
+        {
+            std::copy(std::begin(arr), std::end(arr), j.m_value.array->begin());
+        }
+        j.set_parents();
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::object>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const typename BasicJsonType::object_t& obj)
+    {
+        j.m_value.destroy(j.m_type);
+        j.m_type = value_t::object;
+        j.m_value = obj;
+        j.set_parents();
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::object_t&& obj)
+    {
+        j.m_value.destroy(j.m_type);
+        j.m_type = value_t::object;
+        j.m_value = std::move(obj);
+        j.set_parents();
+        j.assert_invariant();
+    }
+
+    template < typename BasicJsonType, typename CompatibleObjectType,
+               enable_if_t < !std::is_same<CompatibleObjectType, typename BasicJsonType::object_t>::value, int > = 0 >
+    static void construct(BasicJsonType& j, const CompatibleObjectType& obj)
+    {
+        using std::begin;
+        using std::end;
+
+        j.m_value.destroy(j.m_type);
+        j.m_type = value_t::object;
+        j.m_value.object = j.template create<typename BasicJsonType::object_t>(begin(obj), end(obj));
+        j.set_parents();
+        j.assert_invariant();
+    }
+};
+
+/////////////
+// to_json //
+/////////////
+
+template<typename BasicJsonType, typename T,
+         enable_if_t<std::is_same<T, typename BasicJsonType::boolean_t>::value, int> = 0>
+void to_json(BasicJsonType& j, T b) noexcept
+{
+    external_constructor<value_t::boolean>::construct(j, b);
+}
+
+template<typename BasicJsonType, typename CompatibleString,
+         enable_if_t<std::is_constructible<typename BasicJsonType::string_t, CompatibleString>::value, int> = 0>
+void to_json(BasicJsonType& j, const CompatibleString& s)
+{
+    external_constructor<value_t::string>::construct(j, s);
+}
+
+template<typename BasicJsonType>
+void to_json(BasicJsonType& j, typename BasicJsonType::string_t&& s)
+{
+    external_constructor<value_t::string>::construct(j, std::move(s));
+}
+
+template<typename BasicJsonType, typename FloatType,
+         enable_if_t<std::is_floating_point<FloatType>::value, int> = 0>
+void to_json(BasicJsonType& j, FloatType val) noexcept
+{
+    external_constructor<value_t::number_float>::construct(j, static_cast<typename BasicJsonType::number_float_t>(val));
+}
+
+template<typename BasicJsonType, typename CompatibleNumberUnsignedType,
+         enable_if_t<is_compatible_integer_type<typename BasicJsonType::number_unsigned_t, CompatibleNumberUnsignedType>::value, int> = 0>
+void to_json(BasicJsonType& j, CompatibleNumberUnsignedType val) noexcept
+{
+    external_constructor<value_t::number_unsigned>::construct(j, static_cast<typename BasicJsonType::number_unsigned_t>(val));
+}
+
+template<typename BasicJsonType, typename CompatibleNumberIntegerType,
+         enable_if_t<is_compatible_integer_type<typename BasicJsonType::number_integer_t, CompatibleNumberIntegerType>::value, int> = 0>
+void to_json(BasicJsonType& j, CompatibleNumberIntegerType val) noexcept
+{
+    external_constructor<value_t::number_integer>::construct(j, static_cast<typename BasicJsonType::number_integer_t>(val));
+}
+
+template<typename BasicJsonType, typename EnumType,
+         enable_if_t<std::is_enum<EnumType>::value, int> = 0>
+void to_json(BasicJsonType& j, EnumType e) noexcept
+{
+    using underlying_type = typename std::underlying_type<EnumType>::type;
+    external_constructor<value_t::number_integer>::construct(j, static_cast<underlying_type>(e));
+}
+
+template<typename BasicJsonType>
+void to_json(BasicJsonType& j, const std::vector<bool>& e)
+{
+    external_constructor<value_t::array>::construct(j, e);
+}
+
+template < typename BasicJsonType, typename CompatibleArrayType,
+           enable_if_t < is_compatible_array_type<BasicJsonType,
+                         CompatibleArrayType>::value&&
+                         !is_compatible_object_type<BasicJsonType, CompatibleArrayType>::value&&
+                         !is_compatible_string_type<BasicJsonType, CompatibleArrayType>::value&&
+                         !std::is_same<typename BasicJsonType::binary_t, CompatibleArrayType>::value&&
+                         !is_basic_json<CompatibleArrayType>::value,
+                         int > = 0 >
+void to_json(BasicJsonType& j, const CompatibleArrayType& arr)
+{
+    external_constructor<value_t::array>::construct(j, arr);
+}
+
+template<typename BasicJsonType>
+void to_json(BasicJsonType& j, const typename BasicJsonType::binary_t& bin)
+{
+    external_constructor<value_t::binary>::construct(j, bin);
+}
+
+template<typename BasicJsonType, typename T,
+         enable_if_t<std::is_convertible<T, BasicJsonType>::value, int> = 0>
+void to_json(BasicJsonType& j, const std::valarray<T>& arr)
+{
+    external_constructor<value_t::array>::construct(j, std::move(arr));
+}
+
+template<typename BasicJsonType>
+void to_json(BasicJsonType& j, typename BasicJsonType::array_t&& arr)
+{
+    external_constructor<value_t::array>::construct(j, std::move(arr));
+}
+
+template < typename BasicJsonType, typename CompatibleObjectType,
+           enable_if_t < is_compatible_object_type<BasicJsonType, CompatibleObjectType>::value&& !is_basic_json<CompatibleObjectType>::value, int > = 0 >
+void to_json(BasicJsonType& j, const CompatibleObjectType& obj)
+{
+    external_constructor<value_t::object>::construct(j, obj);
+}
+
+template<typename BasicJsonType>
+void to_json(BasicJsonType& j, typename BasicJsonType::object_t&& obj)
+{
+    external_constructor<value_t::object>::construct(j, std::move(obj));
+}
+
+template <
+    typename BasicJsonType, typename T, std::size_t N,
+    enable_if_t < !std::is_constructible<typename BasicJsonType::string_t,
+                  const T(&)[N]>::value, // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+                  int > = 0 >
+void to_json(BasicJsonType& j, const T(&arr)[N]) // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+{
+    external_constructor<value_t::array>::construct(j, arr);
+}
+
+template < typename BasicJsonType, typename T1, typename T2, enable_if_t < std::is_constructible<BasicJsonType, T1>::value&& std::is_constructible<BasicJsonType, T2>::value, int > = 0 >
+void to_json(BasicJsonType& j, const std::pair<T1, T2>& p)
+{
+    j = { p.first, p.second };
+}
+
+// for https://github.com/nlohmann/json/pull/1134
+template<typename BasicJsonType, typename T,
+         enable_if_t<std::is_same<T, iteration_proxy_value<typename BasicJsonType::iterator>>::value, int> = 0>
+void to_json(BasicJsonType& j, const T& b)
+{
+    j = { {b.key(), b.value()} };
+}
+
+template<typename BasicJsonType, typename Tuple, std::size_t... Idx>
+void to_json_tuple_impl(BasicJsonType& j, const Tuple& t, index_sequence<Idx...> /*unused*/)
+{
+    j = { std::get<Idx>(t)... };
+}
+
+template<typename BasicJsonType, typename T, enable_if_t<is_constructible_tuple<BasicJsonType, T>::value, int > = 0>
+void to_json(BasicJsonType& j, const T& t)
+{
+    to_json_tuple_impl(j, t, make_index_sequence<std::tuple_size<T>::value> {});
+}
+
+#if JSON_HAS_FILESYSTEM || JSON_HAS_EXPERIMENTAL_FILESYSTEM
+template<typename BasicJsonType>
+void to_json(BasicJsonType& j, const std_fs::path& p)
+{
+    j = p.string();
+}
+#endif
+
+struct to_json_fn
+{
+    template<typename BasicJsonType, typename T>
+    auto operator()(BasicJsonType& j, T&& val) const noexcept(noexcept(to_json(j, std::forward<T>(val))))
+    -> decltype(to_json(j, std::forward<T>(val)), void())
+    {
+        return to_json(j, std::forward<T>(val));
+    }
+};
+}  // namespace detail
+
+/// namespace to hold default `to_json` function
+/// to see why this is required:
+/// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/n4381.html
+namespace // NOLINT(cert-dcl59-cpp,fuchsia-header-anon-namespaces,google-build-namespaces)
+{
+constexpr const auto& to_json = detail::static_const<detail::to_json_fn>::value; // NOLINT(misc-definitions-in-headers)
+} // namespace
+} // namespace nlohmann
+
+// #include <nlohmann/detail/meta/identity_tag.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+
+namespace nlohmann
+{
+
+/// @sa https://json.nlohmann.me/api/adl_serializer/
+template<typename ValueType, typename>
+struct adl_serializer
+{
+    /// @brief convert a JSON value to any value type
+    /// @sa https://json.nlohmann.me/api/adl_serializer/from_json/
+    template<typename BasicJsonType, typename TargetType = ValueType>
+    static auto from_json(BasicJsonType && j, TargetType& val) noexcept(
+        noexcept(::nlohmann::from_json(std::forward<BasicJsonType>(j), val)))
+    -> decltype(::nlohmann::from_json(std::forward<BasicJsonType>(j), val), void())
+    {
+        ::nlohmann::from_json(std::forward<BasicJsonType>(j), val);
+    }
+
+    /// @brief convert a JSON value to any value type
+    /// @sa https://json.nlohmann.me/api/adl_serializer/from_json/
+    template<typename BasicJsonType, typename TargetType = ValueType>
+    static auto from_json(BasicJsonType && j) noexcept(
+    noexcept(::nlohmann::from_json(std::forward<BasicJsonType>(j), detail::identity_tag<TargetType> {})))
+    -> decltype(::nlohmann::from_json(std::forward<BasicJsonType>(j), detail::identity_tag<TargetType> {}))
+    {
+        return ::nlohmann::from_json(std::forward<BasicJsonType>(j), detail::identity_tag<TargetType> {});
+    }
+
+    /// @brief convert any value type to a JSON value
+    /// @sa https://json.nlohmann.me/api/adl_serializer/to_json/
+    template<typename BasicJsonType, typename TargetType = ValueType>
+    static auto to_json(BasicJsonType& j, TargetType && val) noexcept(
+        noexcept(::nlohmann::to_json(j, std::forward<TargetType>(val))))
+    -> decltype(::nlohmann::to_json(j, std::forward<TargetType>(val)), void())
+    {
+        ::nlohmann::to_json(j, std::forward<TargetType>(val));
+    }
+};
+}  // namespace nlohmann
+
+// #include <nlohmann/byte_container_with_subtype.hpp>
+
+
+#include <cstdint> // uint8_t, uint64_t
+#include <tuple> // tie
+#include <utility> // move
+
+namespace nlohmann
+{
+
+/// @brief an internal type for a backed binary type
+/// @sa https://json.nlohmann.me/api/byte_container_with_subtype/
+template<typename BinaryType>
+class byte_container_with_subtype : public BinaryType
+{
+  public:
+    using container_type = BinaryType;
+    using subtype_type = std::uint64_t;
+
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
+    byte_container_with_subtype() noexcept(noexcept(container_type()))
+        : container_type()
+    {}
+
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
+    byte_container_with_subtype(const container_type& b) noexcept(noexcept(container_type(b)))
+        : container_type(b)
+    {}
+
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
+    byte_container_with_subtype(container_type&& b) noexcept(noexcept(container_type(std::move(b))))
+        : container_type(std::move(b))
+    {}
+
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
+    byte_container_with_subtype(const container_type& b, subtype_type subtype_) noexcept(noexcept(container_type(b)))
+        : container_type(b)
+        , m_subtype(subtype_)
+        , m_has_subtype(true)
+    {}
+
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
+    byte_container_with_subtype(container_type&& b, subtype_type subtype_) noexcept(noexcept(container_type(std::move(b))))
+        : container_type(std::move(b))
+        , m_subtype(subtype_)
+        , m_has_subtype(true)
+    {}
+
+    bool operator==(const byte_container_with_subtype& rhs) const
+    {
+        return std::tie(static_cast<const BinaryType&>(*this), m_subtype, m_has_subtype) ==
+               std::tie(static_cast<const BinaryType&>(rhs), rhs.m_subtype, rhs.m_has_subtype);
+    }
+
+    bool operator!=(const byte_container_with_subtype& rhs) const
+    {
+        return !(rhs == *this);
+    }
+
+    /// @brief sets the binary subtype
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/set_subtype/
+    void set_subtype(subtype_type subtype_) noexcept
+    {
+        m_subtype = subtype_;
+        m_has_subtype = true;
+    }
+
+    /// @brief return the binary subtype
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/subtype/
+    constexpr subtype_type subtype() const noexcept
+    {
+        return m_has_subtype ? m_subtype : static_cast<subtype_type>(-1);
+    }
+
+    /// @brief return whether the value has a subtype
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/has_subtype/
+    constexpr bool has_subtype() const noexcept
+    {
+        return m_has_subtype;
+    }
+
+    /// @brief clears the binary subtype
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/clear_subtype/
+    void clear_subtype() noexcept
+    {
+        m_subtype = 0;
+        m_has_subtype = false;
+    }
+
+  private:
+    subtype_type m_subtype = 0;
+    bool m_has_subtype = false;
+};
+
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/conversions/from_json.hpp>
+
+// #include <nlohmann/detail/conversions/to_json.hpp>
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/hash.hpp>
+
+
+#include <cstdint> // uint8_t
+#include <cstddef> // size_t
+#include <functional> // hash
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+
+// boost::hash_combine
+inline std::size_t combine(std::size_t seed, std::size_t h) noexcept
+{
+    seed ^= h + 0x9e3779b9 + (seed << 6U) + (seed >> 2U);
+    return seed;
+}
+
+/*!
+@brief hash a JSON value
+
+The hash function tries to rely on std::hash where possible. Furthermore, the
+type of the JSON value is taken into account to have different hash values for
+null, 0, 0U, and false, etc.
+
+@tparam BasicJsonType basic_json specialization
+@param j JSON value to hash
+@return hash value of j
+*/
+template<typename BasicJsonType>
+std::size_t hash(const BasicJsonType& j)
+{
+    using string_t = typename BasicJsonType::string_t;
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+
+    const auto type = static_cast<std::size_t>(j.type());
+    switch (j.type())
+    {
+        case BasicJsonType::value_t::null:
+        case BasicJsonType::value_t::discarded:
+        {
+            return combine(type, 0);
+        }
+
+        case BasicJsonType::value_t::object:
+        {
+            auto seed = combine(type, j.size());
+            for (const auto& element : j.items())
+            {
+                const auto h = std::hash<string_t> {}(element.key());
+                seed = combine(seed, h);
+                seed = combine(seed, hash(element.value()));
+            }
+            return seed;
+        }
+
+        case BasicJsonType::value_t::array:
+        {
+            auto seed = combine(type, j.size());
+            for (const auto& element : j)
+            {
+                seed = combine(seed, hash(element));
+            }
+            return seed;
+        }
+
+        case BasicJsonType::value_t::string:
+        {
+            const auto h = std::hash<string_t> {}(j.template get_ref<const string_t&>());
+            return combine(type, h);
+        }
+
+        case BasicJsonType::value_t::boolean:
+        {
+            const auto h = std::hash<bool> {}(j.template get<bool>());
+            return combine(type, h);
+        }
+
+        case BasicJsonType::value_t::number_integer:
+        {
+            const auto h = std::hash<number_integer_t> {}(j.template get<number_integer_t>());
+            return combine(type, h);
+        }
+
+        case BasicJsonType::value_t::number_unsigned:
+        {
+            const auto h = std::hash<number_unsigned_t> {}(j.template get<number_unsigned_t>());
+            return combine(type, h);
+        }
+
+        case BasicJsonType::value_t::number_float:
+        {
+            const auto h = std::hash<number_float_t> {}(j.template get<number_float_t>());
+            return combine(type, h);
+        }
+
+        case BasicJsonType::value_t::binary:
+        {
+            auto seed = combine(type, j.get_binary().size());
+            const auto h = std::hash<bool> {}(j.get_binary().has_subtype());
+            seed = combine(seed, h);
+            seed = combine(seed, static_cast<std::size_t>(j.get_binary().subtype()));
+            for (const auto byte : j.get_binary())
+            {
+                seed = combine(seed, std::hash<std::uint8_t> {}(byte));
+            }
+            return seed;
+        }
+
+        default:                   // LCOV_EXCL_LINE
+            JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+            return 0;              // LCOV_EXCL_LINE
+    }
+}
+
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/input/binary_reader.hpp>
+
+
+#include <algorithm> // generate_n
+#include <array> // array
+#include <cmath> // ldexp
+#include <cstddef> // size_t
+#include <cstdint> // uint8_t, uint16_t, uint32_t, uint64_t
+#include <cstdio> // snprintf
+#include <cstring> // memcpy
+#include <iterator> // back_inserter
+#include <limits> // numeric_limits
+#include <string> // char_traits, string
+#include <utility> // make_pair, move
+#include <vector> // vector
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/input/input_adapters.hpp>
+
+
+#include <array> // array
+#include <cstddef> // size_t
+#include <cstring> // strlen
+#include <iterator> // begin, end, iterator_traits, random_access_iterator_tag, distance, next
+#include <memory> // shared_ptr, make_shared, addressof
+#include <numeric> // accumulate
+#include <string> // string, char_traits
+#include <type_traits> // enable_if, is_base_of, is_pointer, is_integral, remove_pointer
+#include <utility> // pair, declval
+
+#ifndef JSON_NO_IO
+    #include <cstdio>   // FILE *
+    #include <istream>  // istream
+#endif                  // JSON_NO_IO
+
+// #include <nlohmann/detail/iterators/iterator_traits.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+/// the supported input formats
+enum class input_format_t { json, cbor, msgpack, ubjson, bson };
+
+////////////////////
+// input adapters //
+////////////////////
+
+#ifndef JSON_NO_IO
+/*!
+Input adapter for stdio file access. This adapter read only 1 byte and do not use any
+ buffer. This adapter is a very low level adapter.
+*/
+class file_input_adapter
+{
+  public:
+    using char_type = char;
+
+    JSON_HEDLEY_NON_NULL(2)
+    explicit file_input_adapter(std::FILE* f) noexcept
+        : m_file(f)
+    {}
+
+    // make class move-only
+    file_input_adapter(const file_input_adapter&) = delete;
+    file_input_adapter(file_input_adapter&&) noexcept = default;
+    file_input_adapter& operator=(const file_input_adapter&) = delete;
+    file_input_adapter& operator=(file_input_adapter&&) = delete;
+    ~file_input_adapter() = default;
+
+    std::char_traits<char>::int_type get_character() noexcept
+    {
+        return std::fgetc(m_file);
+    }
+
+  private:
+    /// the file pointer to read from
+    std::FILE* m_file;
+};
+
+
+/*!
+Input adapter for a (caching) istream. Ignores a UFT Byte Order Mark at
+beginning of input. Does not support changing the underlying std::streambuf
+in mid-input. Maintains underlying std::istream and std::streambuf to support
+subsequent use of standard std::istream operations to process any input
+characters following those used in parsing the JSON input.  Clears the
+std::istream flags; any input errors (e.g., EOF) will be detected by the first
+subsequent call for input from the std::istream.
+*/
+class input_stream_adapter
+{
+  public:
+    using char_type = char;
+
+    ~input_stream_adapter()
+    {
+        // clear stream flags; we use underlying streambuf I/O, do not
+        // maintain ifstream flags, except eof
+        if (is != nullptr)
+        {
+            is->clear(is->rdstate() & std::ios::eofbit);
+        }
+    }
+
+    explicit input_stream_adapter(std::istream& i)
+        : is(&i), sb(i.rdbuf())
+    {}
+
+    // delete because of pointer members
+    input_stream_adapter(const input_stream_adapter&) = delete;
+    input_stream_adapter& operator=(input_stream_adapter&) = delete;
+    input_stream_adapter& operator=(input_stream_adapter&&) = delete;
+
+    input_stream_adapter(input_stream_adapter&& rhs) noexcept
+        : is(rhs.is), sb(rhs.sb)
+    {
+        rhs.is = nullptr;
+        rhs.sb = nullptr;
+    }
+
+    // std::istream/std::streambuf use std::char_traits<char>::to_int_type, to
+    // ensure that std::char_traits<char>::eof() and the character 0xFF do not
+    // end up as the same value, e.g. 0xFFFFFFFF.
+    std::char_traits<char>::int_type get_character()
+    {
+        auto res = sb->sbumpc();
+        // set eof manually, as we don't use the istream interface.
+        if (JSON_HEDLEY_UNLIKELY(res == std::char_traits<char>::eof()))
+        {
+            is->clear(is->rdstate() | std::ios::eofbit);
+        }
+        return res;
+    }
+
+  private:
+    /// the associated input stream
+    std::istream* is = nullptr;
+    std::streambuf* sb = nullptr;
+};
+#endif  // JSON_NO_IO
+
+// General-purpose iterator-based adapter. It might not be as fast as
+// theoretically possible for some containers, but it is extremely versatile.
+template<typename IteratorType>
+class iterator_input_adapter
+{
+  public:
+    using char_type = typename std::iterator_traits<IteratorType>::value_type;
+
+    iterator_input_adapter(IteratorType first, IteratorType last)
+        : current(std::move(first)), end(std::move(last))
+    {}
+
+    typename std::char_traits<char_type>::int_type get_character()
+    {
+        if (JSON_HEDLEY_LIKELY(current != end))
+        {
+            auto result = std::char_traits<char_type>::to_int_type(*current);
+            std::advance(current, 1);
+            return result;
+        }
+
+        return std::char_traits<char_type>::eof();
+    }
+
+  private:
+    IteratorType current;
+    IteratorType end;
+
+    template<typename BaseInputAdapter, size_t T>
+    friend struct wide_string_input_helper;
+
+    bool empty() const
+    {
+        return current == end;
+    }
+};
+
+
+template<typename BaseInputAdapter, size_t T>
+struct wide_string_input_helper;
+
+template<typename BaseInputAdapter>
+struct wide_string_input_helper<BaseInputAdapter, 4>
+{
+    // UTF-32
+    static void fill_buffer(BaseInputAdapter& input,
+                            std::array<std::char_traits<char>::int_type, 4>& utf8_bytes,
+                            size_t& utf8_bytes_index,
+                            size_t& utf8_bytes_filled)
+    {
+        utf8_bytes_index = 0;
+
+        if (JSON_HEDLEY_UNLIKELY(input.empty()))
+        {
+            utf8_bytes[0] = std::char_traits<char>::eof();
+            utf8_bytes_filled = 1;
+        }
+        else
+        {
+            // get the current character
+            const auto wc = input.get_character();
+
+            // UTF-32 to UTF-8 encoding
+            if (wc < 0x80)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
+                utf8_bytes_filled = 1;
+            }
+            else if (wc <= 0x7FF)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xC0u | ((static_cast<unsigned int>(wc) >> 6u) & 0x1Fu));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
+                utf8_bytes_filled = 2;
+            }
+            else if (wc <= 0xFFFF)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xE0u | ((static_cast<unsigned int>(wc) >> 12u) & 0x0Fu));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((static_cast<unsigned int>(wc) >> 6u) & 0x3Fu));
+                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
+                utf8_bytes_filled = 3;
+            }
+            else if (wc <= 0x10FFFF)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xF0u | ((static_cast<unsigned int>(wc) >> 18u) & 0x07u));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((static_cast<unsigned int>(wc) >> 12u) & 0x3Fu));
+                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | ((static_cast<unsigned int>(wc) >> 6u) & 0x3Fu));
+                utf8_bytes[3] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
+                utf8_bytes_filled = 4;
+            }
+            else
+            {
+                // unknown character
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
+                utf8_bytes_filled = 1;
+            }
+        }
+    }
+};
+
+template<typename BaseInputAdapter>
+struct wide_string_input_helper<BaseInputAdapter, 2>
+{
+    // UTF-16
+    static void fill_buffer(BaseInputAdapter& input,
+                            std::array<std::char_traits<char>::int_type, 4>& utf8_bytes,
+                            size_t& utf8_bytes_index,
+                            size_t& utf8_bytes_filled)
+    {
+        utf8_bytes_index = 0;
+
+        if (JSON_HEDLEY_UNLIKELY(input.empty()))
+        {
+            utf8_bytes[0] = std::char_traits<char>::eof();
+            utf8_bytes_filled = 1;
+        }
+        else
+        {
+            // get the current character
+            const auto wc = input.get_character();
+
+            // UTF-16 to UTF-8 encoding
+            if (wc < 0x80)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
+                utf8_bytes_filled = 1;
+            }
+            else if (wc <= 0x7FF)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xC0u | ((static_cast<unsigned int>(wc) >> 6u)));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
+                utf8_bytes_filled = 2;
+            }
+            else if (0xD800 > wc || wc >= 0xE000)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xE0u | ((static_cast<unsigned int>(wc) >> 12u)));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((static_cast<unsigned int>(wc) >> 6u) & 0x3Fu));
+                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
+                utf8_bytes_filled = 3;
+            }
+            else
+            {
+                if (JSON_HEDLEY_UNLIKELY(!input.empty()))
+                {
+                    const auto wc2 = static_cast<unsigned int>(input.get_character());
+                    const auto charcode = 0x10000u + (((static_cast<unsigned int>(wc) & 0x3FFu) << 10u) | (wc2 & 0x3FFu));
+                    utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xF0u | (charcode >> 18u));
+                    utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((charcode >> 12u) & 0x3Fu));
+                    utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | ((charcode >> 6u) & 0x3Fu));
+                    utf8_bytes[3] = static_cast<std::char_traits<char>::int_type>(0x80u | (charcode & 0x3Fu));
+                    utf8_bytes_filled = 4;
+                }
+                else
+                {
+                    utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
+                    utf8_bytes_filled = 1;
+                }
+            }
+        }
+    }
+};
+
+// Wraps another input adapter to convert wide character types into individual bytes.
+template<typename BaseInputAdapter, typename WideCharType>
+class wide_string_input_adapter
+{
+  public:
+    using char_type = char;
+
+    wide_string_input_adapter(BaseInputAdapter base)
+        : base_adapter(base) {}
+
+    typename std::char_traits<char>::int_type get_character() noexcept
+    {
+        // check if buffer needs to be filled
+        if (utf8_bytes_index == utf8_bytes_filled)
+        {
+            fill_buffer<sizeof(WideCharType)>();
+
+            JSON_ASSERT(utf8_bytes_filled > 0);
+            JSON_ASSERT(utf8_bytes_index == 0);
+        }
+
+        // use buffer
+        JSON_ASSERT(utf8_bytes_filled > 0);
+        JSON_ASSERT(utf8_bytes_index < utf8_bytes_filled);
+        return utf8_bytes[utf8_bytes_index++];
+    }
+
+  private:
+    BaseInputAdapter base_adapter;
+
+    template<size_t T>
+    void fill_buffer()
+    {
+        wide_string_input_helper<BaseInputAdapter, T>::fill_buffer(base_adapter, utf8_bytes, utf8_bytes_index, utf8_bytes_filled);
+    }
+
+    /// a buffer for UTF-8 bytes
+    std::array<std::char_traits<char>::int_type, 4> utf8_bytes = {{0, 0, 0, 0}};
+
+    /// index to the utf8_codes array for the next valid byte
+    std::size_t utf8_bytes_index = 0;
+    /// number of valid bytes in the utf8_codes array
+    std::size_t utf8_bytes_filled = 0;
+};
+
+
+template<typename IteratorType, typename Enable = void>
+struct iterator_input_adapter_factory
+{
+    using iterator_type = IteratorType;
+    using char_type = typename std::iterator_traits<iterator_type>::value_type;
+    using adapter_type = iterator_input_adapter<iterator_type>;
+
+    static adapter_type create(IteratorType first, IteratorType last)
+    {
+        return adapter_type(std::move(first), std::move(last));
+    }
+};
+
+template<typename T>
+struct is_iterator_of_multibyte
+{
+    using value_type = typename std::iterator_traits<T>::value_type;
+    enum
+    {
+        value = sizeof(value_type) > 1
+    };
+};
+
+template<typename IteratorType>
+struct iterator_input_adapter_factory<IteratorType, enable_if_t<is_iterator_of_multibyte<IteratorType>::value>>
+{
+    using iterator_type = IteratorType;
+    using char_type = typename std::iterator_traits<iterator_type>::value_type;
+    using base_adapter_type = iterator_input_adapter<iterator_type>;
+    using adapter_type = wide_string_input_adapter<base_adapter_type, char_type>;
+
+    static adapter_type create(IteratorType first, IteratorType last)
+    {
+        return adapter_type(base_adapter_type(std::move(first), std::move(last)));
+    }
+};
+
+// General purpose iterator-based input
+template<typename IteratorType>
+typename iterator_input_adapter_factory<IteratorType>::adapter_type input_adapter(IteratorType first, IteratorType last)
+{
+    using factory_type = iterator_input_adapter_factory<IteratorType>;
+    return factory_type::create(first, last);
+}
+
+// Convenience shorthand from container to iterator
+// Enables ADL on begin(container) and end(container)
+// Encloses the using declarations in namespace for not to leak them to outside scope
+
+namespace container_input_adapter_factory_impl
+{
+
+using std::begin;
+using std::end;
+
+template<typename ContainerType, typename Enable = void>
+struct container_input_adapter_factory {};
+
+template<typename ContainerType>
+struct container_input_adapter_factory< ContainerType,
+       void_t<decltype(begin(std::declval<ContainerType>()), end(std::declval<ContainerType>()))>>
+       {
+           using adapter_type = decltype(input_adapter(begin(std::declval<ContainerType>()), end(std::declval<ContainerType>())));
+
+           static adapter_type create(const ContainerType& container)
+{
+    return input_adapter(begin(container), end(container));
+}
+       };
+
+} // namespace container_input_adapter_factory_impl
+
+template<typename ContainerType>
+typename container_input_adapter_factory_impl::container_input_adapter_factory<ContainerType>::adapter_type input_adapter(const ContainerType& container)
+{
+    return container_input_adapter_factory_impl::container_input_adapter_factory<ContainerType>::create(container);
+}
+
+#ifndef JSON_NO_IO
+// Special cases with fast paths
+inline file_input_adapter input_adapter(std::FILE* file)
+{
+    return file_input_adapter(file);
+}
+
+inline input_stream_adapter input_adapter(std::istream& stream)
+{
+    return input_stream_adapter(stream);
+}
+
+inline input_stream_adapter input_adapter(std::istream&& stream)
+{
+    return input_stream_adapter(stream);
+}
+#endif  // JSON_NO_IO
+
+using contiguous_bytes_input_adapter = decltype(input_adapter(std::declval<const char*>(), std::declval<const char*>()));
+
+// Null-delimited strings, and the like.
+template < typename CharT,
+           typename std::enable_if <
+               std::is_pointer<CharT>::value&&
+               !std::is_array<CharT>::value&&
+               std::is_integral<typename std::remove_pointer<CharT>::type>::value&&
+               sizeof(typename std::remove_pointer<CharT>::type) == 1,
+               int >::type = 0 >
+contiguous_bytes_input_adapter input_adapter(CharT b)
+{
+    auto length = std::strlen(reinterpret_cast<const char*>(b));
+    const auto* ptr = reinterpret_cast<const char*>(b);
+    return input_adapter(ptr, ptr + length);
+}
+
+template<typename T, std::size_t N>
+auto input_adapter(T (&array)[N]) -> decltype(input_adapter(array, array + N)) // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+{
+    return input_adapter(array, array + N);
+}
+
+// This class only handles inputs of input_buffer_adapter type.
+// It's required so that expressions like {ptr, len} can be implicitly cast
+// to the correct adapter.
+class span_input_adapter
+{
+  public:
+    template < typename CharT,
+               typename std::enable_if <
+                   std::is_pointer<CharT>::value&&
+                   std::is_integral<typename std::remove_pointer<CharT>::type>::value&&
+                   sizeof(typename std::remove_pointer<CharT>::type) == 1,
+                   int >::type = 0 >
+    span_input_adapter(CharT b, std::size_t l)
+        : ia(reinterpret_cast<const char*>(b), reinterpret_cast<const char*>(b) + l) {}
+
+    template<class IteratorType,
+             typename std::enable_if<
+                 std::is_same<typename iterator_traits<IteratorType>::iterator_category, std::random_access_iterator_tag>::value,
+                 int>::type = 0>
+    span_input_adapter(IteratorType first, IteratorType last)
+        : ia(input_adapter(first, last)) {}
+
+    contiguous_bytes_input_adapter&& get()
+    {
+        return std::move(ia); // NOLINT(hicpp-move-const-arg,performance-move-const-arg)
+    }
+
+  private:
+    contiguous_bytes_input_adapter ia;
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/input/json_sax.hpp>
+
+
+#include <cstddef>
+#include <string> // string
+#include <utility> // move
+#include <vector> // vector
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+namespace nlohmann
+{
+
+/*!
+@brief SAX interface
+
+This class describes the SAX interface used by @ref nlohmann::json::sax_parse.
+Each function is called in different situations while the input is parsed. The
+boolean return value informs the parser whether to continue processing the
+input.
+*/
+template<typename BasicJsonType>
+struct json_sax
+{
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+
+    /*!
+    @brief a null value was read
+    @return whether parsing should proceed
+    */
+    virtual bool null() = 0;
+
+    /*!
+    @brief a boolean value was read
+    @param[in] val  boolean value
+    @return whether parsing should proceed
+    */
+    virtual bool boolean(bool val) = 0;
+
+    /*!
+    @brief an integer number was read
+    @param[in] val  integer value
+    @return whether parsing should proceed
+    */
+    virtual bool number_integer(number_integer_t val) = 0;
+
+    /*!
+    @brief an unsigned integer number was read
+    @param[in] val  unsigned integer value
+    @return whether parsing should proceed
+    */
+    virtual bool number_unsigned(number_unsigned_t val) = 0;
+
+    /*!
+    @brief a floating-point number was read
+    @param[in] val  floating-point value
+    @param[in] s    raw token value
+    @return whether parsing should proceed
+    */
+    virtual bool number_float(number_float_t val, const string_t& s) = 0;
+
+    /*!
+    @brief a string value was read
+    @param[in] val  string value
+    @return whether parsing should proceed
+    @note It is safe to move the passed string value.
+    */
+    virtual bool string(string_t& val) = 0;
+
+    /*!
+    @brief a binary value was read
+    @param[in] val  binary value
+    @return whether parsing should proceed
+    @note It is safe to move the passed binary value.
+    */
+    virtual bool binary(binary_t& val) = 0;
+
+    /*!
+    @brief the beginning of an object was read
+    @param[in] elements  number of object elements or -1 if unknown
+    @return whether parsing should proceed
+    @note binary formats may report the number of elements
+    */
+    virtual bool start_object(std::size_t elements) = 0;
+
+    /*!
+    @brief an object key was read
+    @param[in] val  object key
+    @return whether parsing should proceed
+    @note It is safe to move the passed string.
+    */
+    virtual bool key(string_t& val) = 0;
+
+    /*!
+    @brief the end of an object was read
+    @return whether parsing should proceed
+    */
+    virtual bool end_object() = 0;
+
+    /*!
+    @brief the beginning of an array was read
+    @param[in] elements  number of array elements or -1 if unknown
+    @return whether parsing should proceed
+    @note binary formats may report the number of elements
+    */
+    virtual bool start_array(std::size_t elements) = 0;
+
+    /*!
+    @brief the end of an array was read
+    @return whether parsing should proceed
+    */
+    virtual bool end_array() = 0;
+
+    /*!
+    @brief a parse error occurred
+    @param[in] position    the position in the input where the error occurs
+    @param[in] last_token  the last read token
+    @param[in] ex          an exception object describing the error
+    @return whether parsing should proceed (must return false)
+    */
+    virtual bool parse_error(std::size_t position,
+                             const std::string& last_token,
+                             const detail::exception& ex) = 0;
+
+    json_sax() = default;
+    json_sax(const json_sax&) = default;
+    json_sax(json_sax&&) noexcept = default;
+    json_sax& operator=(const json_sax&) = default;
+    json_sax& operator=(json_sax&&) noexcept = default;
+    virtual ~json_sax() = default;
+};
+
+
+namespace detail
+{
+/*!
+@brief SAX implementation to create a JSON value from SAX events
+
+This class implements the @ref json_sax interface and processes the SAX events
+to create a JSON value which makes it basically a DOM parser. The structure or
+hierarchy of the JSON value is managed by the stack `ref_stack` which contains
+a pointer to the respective array or object for each recursion depth.
+
+After successful parsing, the value that is passed by reference to the
+constructor contains the parsed value.
+
+@tparam BasicJsonType  the JSON type
+*/
+template<typename BasicJsonType>
+class json_sax_dom_parser
+{
+  public:
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+
+    /*!
+    @param[in,out] r  reference to a JSON value that is manipulated while
+                       parsing
+    @param[in] allow_exceptions_  whether parse errors yield exceptions
+    */
+    explicit json_sax_dom_parser(BasicJsonType& r, const bool allow_exceptions_ = true)
+        : root(r), allow_exceptions(allow_exceptions_)
+    {}
+
+    // make class move-only
+    json_sax_dom_parser(const json_sax_dom_parser&) = delete;
+    json_sax_dom_parser(json_sax_dom_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+    json_sax_dom_parser& operator=(const json_sax_dom_parser&) = delete;
+    json_sax_dom_parser& operator=(json_sax_dom_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+    ~json_sax_dom_parser() = default;
+
+    bool null()
+    {
+        handle_value(nullptr);
+        return true;
+    }
+
+    bool boolean(bool val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_integer(number_integer_t val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_unsigned(number_unsigned_t val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_float(number_float_t val, const string_t& /*unused*/)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool string(string_t& val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool binary(binary_t& val)
+    {
+        handle_value(std::move(val));
+        return true;
+    }
+
+    bool start_object(std::size_t len)
+    {
+        ref_stack.push_back(handle_value(BasicJsonType::value_t::object));
+
+        if (JSON_HEDLEY_UNLIKELY(len != static_cast<std::size_t>(-1) && len > ref_stack.back()->max_size()))
+        {
+            JSON_THROW(out_of_range::create(408, "excessive object size: " + std::to_string(len), *ref_stack.back()));
+        }
+
+        return true;
+    }
+
+    bool key(string_t& val)
+    {
+        // add null at given key and store the reference for later
+        object_element = &(ref_stack.back()->m_value.object->operator[](val));
+        return true;
+    }
+
+    bool end_object()
+    {
+        ref_stack.back()->set_parents();
+        ref_stack.pop_back();
+        return true;
+    }
+
+    bool start_array(std::size_t len)
+    {
+        ref_stack.push_back(handle_value(BasicJsonType::value_t::array));
+
+        if (JSON_HEDLEY_UNLIKELY(len != static_cast<std::size_t>(-1) && len > ref_stack.back()->max_size()))
+        {
+            JSON_THROW(out_of_range::create(408, "excessive array size: " + std::to_string(len), *ref_stack.back()));
+        }
+
+        return true;
+    }
+
+    bool end_array()
+    {
+        ref_stack.back()->set_parents();
+        ref_stack.pop_back();
+        return true;
+    }
+
+    template<class Exception>
+    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/,
+                     const Exception& ex)
+    {
+        errored = true;
+        static_cast<void>(ex);
+        if (allow_exceptions)
+        {
+            JSON_THROW(ex);
+        }
+        return false;
+    }
+
+    constexpr bool is_errored() const
+    {
+        return errored;
+    }
+
+  private:
+    /*!
+    @invariant If the ref stack is empty, then the passed value will be the new
+               root.
+    @invariant If the ref stack contains a value, then it is an array or an
+               object to which we can add elements
+    */
+    template<typename Value>
+    JSON_HEDLEY_RETURNS_NON_NULL
+    BasicJsonType* handle_value(Value&& v)
+    {
+        if (ref_stack.empty())
+        {
+            root = BasicJsonType(std::forward<Value>(v));
+            return &root;
+        }
+
+        JSON_ASSERT(ref_stack.back()->is_array() || ref_stack.back()->is_object());
+
+        if (ref_stack.back()->is_array())
+        {
+            ref_stack.back()->m_value.array->emplace_back(std::forward<Value>(v));
+            return &(ref_stack.back()->m_value.array->back());
+        }
+
+        JSON_ASSERT(ref_stack.back()->is_object());
+        JSON_ASSERT(object_element);
+        *object_element = BasicJsonType(std::forward<Value>(v));
+        return object_element;
+    }
+
+    /// the parsed JSON value
+    BasicJsonType& root;
+    /// stack to model hierarchy of values
+    std::vector<BasicJsonType*> ref_stack {};
+    /// helper to hold the reference for the next object element
+    BasicJsonType* object_element = nullptr;
+    /// whether a syntax error occurred
+    bool errored = false;
+    /// whether to throw exceptions in case of errors
+    const bool allow_exceptions = true;
+};
+
+template<typename BasicJsonType>
+class json_sax_dom_callback_parser
+{
+  public:
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+    using parser_callback_t = typename BasicJsonType::parser_callback_t;
+    using parse_event_t = typename BasicJsonType::parse_event_t;
+
+    json_sax_dom_callback_parser(BasicJsonType& r,
+                                 const parser_callback_t cb,
+                                 const bool allow_exceptions_ = true)
+        : root(r), callback(cb), allow_exceptions(allow_exceptions_)
+    {
+        keep_stack.push_back(true);
+    }
+
+    // make class move-only
+    json_sax_dom_callback_parser(const json_sax_dom_callback_parser&) = delete;
+    json_sax_dom_callback_parser(json_sax_dom_callback_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+    json_sax_dom_callback_parser& operator=(const json_sax_dom_callback_parser&) = delete;
+    json_sax_dom_callback_parser& operator=(json_sax_dom_callback_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+    ~json_sax_dom_callback_parser() = default;
+
+    bool null()
+    {
+        handle_value(nullptr);
+        return true;
+    }
+
+    bool boolean(bool val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_integer(number_integer_t val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_unsigned(number_unsigned_t val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_float(number_float_t val, const string_t& /*unused*/)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool string(string_t& val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool binary(binary_t& val)
+    {
+        handle_value(std::move(val));
+        return true;
+    }
+
+    bool start_object(std::size_t len)
+    {
+        // check callback for object start
+        const bool keep = callback(static_cast<int>(ref_stack.size()), parse_event_t::object_start, discarded);
+        keep_stack.push_back(keep);
+
+        auto val = handle_value(BasicJsonType::value_t::object, true);
+        ref_stack.push_back(val.second);
+
+        // check object limit
+        if (ref_stack.back() && JSON_HEDLEY_UNLIKELY(len != static_cast<std::size_t>(-1) && len > ref_stack.back()->max_size()))
+        {
+            JSON_THROW(out_of_range::create(408, "excessive object size: " + std::to_string(len), *ref_stack.back()));
+        }
+
+        return true;
+    }
+
+    bool key(string_t& val)
+    {
+        BasicJsonType k = BasicJsonType(val);
+
+        // check callback for key
+        const bool keep = callback(static_cast<int>(ref_stack.size()), parse_event_t::key, k);
+        key_keep_stack.push_back(keep);
+
+        // add discarded value at given key and store the reference for later
+        if (keep && ref_stack.back())
+        {
+            object_element = &(ref_stack.back()->m_value.object->operator[](val) = discarded);
+        }
+
+        return true;
+    }
+
+    bool end_object()
+    {
+        if (ref_stack.back())
+        {
+            if (!callback(static_cast<int>(ref_stack.size()) - 1, parse_event_t::object_end, *ref_stack.back()))
+            {
+                // discard object
+                *ref_stack.back() = discarded;
+            }
+            else
+            {
+                ref_stack.back()->set_parents();
+            }
+        }
+
+        JSON_ASSERT(!ref_stack.empty());
+        JSON_ASSERT(!keep_stack.empty());
+        ref_stack.pop_back();
+        keep_stack.pop_back();
+
+        if (!ref_stack.empty() && ref_stack.back() && ref_stack.back()->is_structured())
+        {
+            // remove discarded value
+            for (auto it = ref_stack.back()->begin(); it != ref_stack.back()->end(); ++it)
+            {
+                if (it->is_discarded())
+                {
+                    ref_stack.back()->erase(it);
+                    break;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    bool start_array(std::size_t len)
+    {
+        const bool keep = callback(static_cast<int>(ref_stack.size()), parse_event_t::array_start, discarded);
+        keep_stack.push_back(keep);
+
+        auto val = handle_value(BasicJsonType::value_t::array, true);
+        ref_stack.push_back(val.second);
+
+        // check array limit
+        if (ref_stack.back() && JSON_HEDLEY_UNLIKELY(len != static_cast<std::size_t>(-1) && len > ref_stack.back()->max_size()))
+        {
+            JSON_THROW(out_of_range::create(408, "excessive array size: " + std::to_string(len), *ref_stack.back()));
+        }
+
+        return true;
+    }
+
+    bool end_array()
+    {
+        bool keep = true;
+
+        if (ref_stack.back())
+        {
+            keep = callback(static_cast<int>(ref_stack.size()) - 1, parse_event_t::array_end, *ref_stack.back());
+            if (keep)
+            {
+                ref_stack.back()->set_parents();
+            }
+            else
+            {
+                // discard array
+                *ref_stack.back() = discarded;
+            }
+        }
+
+        JSON_ASSERT(!ref_stack.empty());
+        JSON_ASSERT(!keep_stack.empty());
+        ref_stack.pop_back();
+        keep_stack.pop_back();
+
+        // remove discarded value
+        if (!keep && !ref_stack.empty() && ref_stack.back()->is_array())
+        {
+            ref_stack.back()->m_value.array->pop_back();
+        }
+
+        return true;
+    }
+
+    template<class Exception>
+    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/,
+                     const Exception& ex)
+    {
+        errored = true;
+        static_cast<void>(ex);
+        if (allow_exceptions)
+        {
+            JSON_THROW(ex);
+        }
+        return false;
+    }
+
+    constexpr bool is_errored() const
+    {
+        return errored;
+    }
+
+  private:
+    /*!
+    @param[in] v  value to add to the JSON value we build during parsing
+    @param[in] skip_callback  whether we should skip calling the callback
+               function; this is required after start_array() and
+               start_object() SAX events, because otherwise we would call the
+               callback function with an empty array or object, respectively.
+
+    @invariant If the ref stack is empty, then the passed value will be the new
+               root.
+    @invariant If the ref stack contains a value, then it is an array or an
+               object to which we can add elements
+
+    @return pair of boolean (whether value should be kept) and pointer (to the
+            passed value in the ref_stack hierarchy; nullptr if not kept)
+    */
+    template<typename Value>
+    std::pair<bool, BasicJsonType*> handle_value(Value&& v, const bool skip_callback = false)
+    {
+        JSON_ASSERT(!keep_stack.empty());
+
+        // do not handle this value if we know it would be added to a discarded
+        // container
+        if (!keep_stack.back())
+        {
+            return {false, nullptr};
+        }
+
+        // create value
+        auto value = BasicJsonType(std::forward<Value>(v));
+
+        // check callback
+        const bool keep = skip_callback || callback(static_cast<int>(ref_stack.size()), parse_event_t::value, value);
+
+        // do not handle this value if we just learnt it shall be discarded
+        if (!keep)
+        {
+            return {false, nullptr};
+        }
+
+        if (ref_stack.empty())
+        {
+            root = std::move(value);
+            return {true, &root};
+        }
+
+        // skip this value if we already decided to skip the parent
+        // (https://github.com/nlohmann/json/issues/971#issuecomment-413678360)
+        if (!ref_stack.back())
+        {
+            return {false, nullptr};
+        }
+
+        // we now only expect arrays and objects
+        JSON_ASSERT(ref_stack.back()->is_array() || ref_stack.back()->is_object());
+
+        // array
+        if (ref_stack.back()->is_array())
+        {
+            ref_stack.back()->m_value.array->emplace_back(std::move(value));
+            return {true, &(ref_stack.back()->m_value.array->back())};
+        }
+
+        // object
+        JSON_ASSERT(ref_stack.back()->is_object());
+        // check if we should store an element for the current key
+        JSON_ASSERT(!key_keep_stack.empty());
+        const bool store_element = key_keep_stack.back();
+        key_keep_stack.pop_back();
+
+        if (!store_element)
+        {
+            return {false, nullptr};
+        }
+
+        JSON_ASSERT(object_element);
+        *object_element = std::move(value);
+        return {true, object_element};
+    }
+
+    /// the parsed JSON value
+    BasicJsonType& root;
+    /// stack to model hierarchy of values
+    std::vector<BasicJsonType*> ref_stack {};
+    /// stack to manage which values to keep
+    std::vector<bool> keep_stack {};
+    /// stack to manage which object keys to keep
+    std::vector<bool> key_keep_stack {};
+    /// helper to hold the reference for the next object element
+    BasicJsonType* object_element = nullptr;
+    /// whether a syntax error occurred
+    bool errored = false;
+    /// callback function
+    const parser_callback_t callback = nullptr;
+    /// whether to throw exceptions in case of errors
+    const bool allow_exceptions = true;
+    /// a discarded value for the callback
+    BasicJsonType discarded = BasicJsonType::value_t::discarded;
+};
+
+template<typename BasicJsonType>
+class json_sax_acceptor
+{
+  public:
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+
+    bool null()
+    {
+        return true;
+    }
+
+    bool boolean(bool /*unused*/)
+    {
+        return true;
+    }
+
+    bool number_integer(number_integer_t /*unused*/)
+    {
+        return true;
+    }
+
+    bool number_unsigned(number_unsigned_t /*unused*/)
+    {
+        return true;
+    }
+
+    bool number_float(number_float_t /*unused*/, const string_t& /*unused*/)
+    {
+        return true;
+    }
+
+    bool string(string_t& /*unused*/)
+    {
+        return true;
+    }
+
+    bool binary(binary_t& /*unused*/)
+    {
+        return true;
+    }
+
+    bool start_object(std::size_t /*unused*/ = static_cast<std::size_t>(-1))
+    {
+        return true;
+    }
+
+    bool key(string_t& /*unused*/)
+    {
+        return true;
+    }
+
+    bool end_object()
+    {
+        return true;
+    }
+
+    bool start_array(std::size_t /*unused*/ = static_cast<std::size_t>(-1))
+    {
+        return true;
+    }
+
+    bool end_array()
+    {
+        return true;
+    }
+
+    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/, const detail::exception& /*unused*/)
+    {
+        return false;
+    }
+};
+}  // namespace detail
+
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/input/lexer.hpp>
+
+
+#include <array> // array
+#include <clocale> // localeconv
+#include <cstddef> // size_t
+#include <cstdio> // snprintf
+#include <cstdlib> // strtof, strtod, strtold, strtoll, strtoull
+#include <initializer_list> // initializer_list
+#include <string> // char_traits, string
+#include <utility> // move
+#include <vector> // vector
+
+// #include <nlohmann/detail/input/input_adapters.hpp>
+
+// #include <nlohmann/detail/input/position_t.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+///////////
+// lexer //
+///////////
+
+template<typename BasicJsonType>
+class lexer_base
+{
+  public:
+    /// token types for the parser
+    enum class token_type
+    {
+        uninitialized,    ///< indicating the scanner is uninitialized
+        literal_true,     ///< the `true` literal
+        literal_false,    ///< the `false` literal
+        literal_null,     ///< the `null` literal
+        value_string,     ///< a string -- use get_string() for actual value
+        value_unsigned,   ///< an unsigned integer -- use get_number_unsigned() for actual value
+        value_integer,    ///< a signed integer -- use get_number_integer() for actual value
+        value_float,      ///< an floating point number -- use get_number_float() for actual value
+        begin_array,      ///< the character for array begin `[`
+        begin_object,     ///< the character for object begin `{`
+        end_array,        ///< the character for array end `]`
+        end_object,       ///< the character for object end `}`
+        name_separator,   ///< the name separator `:`
+        value_separator,  ///< the value separator `,`
+        parse_error,      ///< indicating a parse error
+        end_of_input,     ///< indicating the end of the input buffer
+        literal_or_value  ///< a literal or the begin of a value (only for diagnostics)
+    };
+
+    /// return name of values of type token_type (only used for errors)
+    JSON_HEDLEY_RETURNS_NON_NULL
+    JSON_HEDLEY_CONST
+    static const char* token_type_name(const token_type t) noexcept
+    {
+        switch (t)
+        {
+            case token_type::uninitialized:
+                return "<uninitialized>";
+            case token_type::literal_true:
+                return "true literal";
+            case token_type::literal_false:
+                return "false literal";
+            case token_type::literal_null:
+                return "null literal";
+            case token_type::value_string:
+                return "string literal";
+            case token_type::value_unsigned:
+            case token_type::value_integer:
+            case token_type::value_float:
+                return "number literal";
+            case token_type::begin_array:
+                return "'['";
+            case token_type::begin_object:
+                return "'{'";
+            case token_type::end_array:
+                return "']'";
+            case token_type::end_object:
+                return "'}'";
+            case token_type::name_separator:
+                return "':'";
+            case token_type::value_separator:
+                return "','";
+            case token_type::parse_error:
+                return "<parse error>";
+            case token_type::end_of_input:
+                return "end of input";
+            case token_type::literal_or_value:
+                return "'[', '{', or a literal";
+            // LCOV_EXCL_START
+            default: // catch non-enum values
+                return "unknown token";
+                // LCOV_EXCL_STOP
+        }
+    }
+};
+/*!
+@brief lexical analysis
+
+This class organizes the lexical analysis during JSON deserialization.
+*/
+template<typename BasicJsonType, typename InputAdapterType>
+class lexer : public lexer_base<BasicJsonType>
+{
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using char_type = typename InputAdapterType::char_type;
+    using char_int_type = typename std::char_traits<char_type>::int_type;
+
+  public:
+    using token_type = typename lexer_base<BasicJsonType>::token_type;
+
+    explicit lexer(InputAdapterType&& adapter, bool ignore_comments_ = false) noexcept
+        : ia(std::move(adapter))
+        , ignore_comments(ignore_comments_)
+        , decimal_point_char(static_cast<char_int_type>(get_decimal_point()))
+    {}
+
+    // delete because of pointer members
+    lexer(const lexer&) = delete;
+    lexer(lexer&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+    lexer& operator=(lexer&) = delete;
+    lexer& operator=(lexer&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+    ~lexer() = default;
+
+  private:
+    /////////////////////
+    // locales
+    /////////////////////
+
+    /// return the locale-dependent decimal point
+    JSON_HEDLEY_PURE
+    static char get_decimal_point() noexcept
+    {
+        const auto* loc = localeconv();
+        JSON_ASSERT(loc != nullptr);
+        return (loc->decimal_point == nullptr) ? '.' : *(loc->decimal_point);
+    }
+
+    /////////////////////
+    // scan functions
+    /////////////////////
+
+    /*!
+    @brief get codepoint from 4 hex characters following `\u`
+
+    For input "\u c1 c2 c3 c4" the codepoint is:
+      (c1 * 0x1000) + (c2 * 0x0100) + (c3 * 0x0010) + c4
+    = (c1 << 12) + (c2 << 8) + (c3 << 4) + (c4 << 0)
+
+    Furthermore, the possible characters '0'..'9', 'A'..'F', and 'a'..'f'
+    must be converted to the integers 0x0..0x9, 0xA..0xF, 0xA..0xF, resp. The
+    conversion is done by subtracting the offset (0x30, 0x37, and 0x57)
+    between the ASCII value of the character and the desired integer value.
+
+    @return codepoint (0x0000..0xFFFF) or -1 in case of an error (e.g. EOF or
+            non-hex character)
+    */
+    int get_codepoint()
+    {
+        // this function only makes sense after reading `\u`
+        JSON_ASSERT(current == 'u');
+        int codepoint = 0;
+
+        const auto factors = { 12u, 8u, 4u, 0u };
+        for (const auto factor : factors)
+        {
+            get();
+
+            if (current >= '0' && current <= '9')
+            {
+                codepoint += static_cast<int>((static_cast<unsigned int>(current) - 0x30u) << factor);
+            }
+            else if (current >= 'A' && current <= 'F')
+            {
+                codepoint += static_cast<int>((static_cast<unsigned int>(current) - 0x37u) << factor);
+            }
+            else if (current >= 'a' && current <= 'f')
+            {
+                codepoint += static_cast<int>((static_cast<unsigned int>(current) - 0x57u) << factor);
+            }
+            else
+            {
+                return -1;
+            }
+        }
+
+        JSON_ASSERT(0x0000 <= codepoint && codepoint <= 0xFFFF);
+        return codepoint;
+    }
+
+    /*!
+    @brief check if the next byte(s) are inside a given range
+
+    Adds the current byte and, for each passed range, reads a new byte and
+    checks if it is inside the range. If a violation was detected, set up an
+    error message and return false. Otherwise, return true.
+
+    @param[in] ranges  list of integers; interpreted as list of pairs of
+                       inclusive lower and upper bound, respectively
+
+    @pre The passed list @a ranges must have 2, 4, or 6 elements; that is,
+         1, 2, or 3 pairs. This precondition is enforced by an assertion.
+
+    @return true if and only if no range violation was detected
+    */
+    bool next_byte_in_range(std::initializer_list<char_int_type> ranges)
+    {
+        JSON_ASSERT(ranges.size() == 2 || ranges.size() == 4 || ranges.size() == 6);
+        add(current);
+
+        for (auto range = ranges.begin(); range != ranges.end(); ++range)
+        {
+            get();
+            if (JSON_HEDLEY_LIKELY(*range <= current && current <= *(++range)))
+            {
+                add(current);
+            }
+            else
+            {
+                error_message = "invalid string: ill-formed UTF-8 byte";
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /*!
+    @brief scan a string literal
+
+    This function scans a string according to Sect. 7 of RFC 8259. While
+    scanning, bytes are escaped and copied into buffer token_buffer. Then the
+    function returns successfully, token_buffer is *not* null-terminated (as it
+    may contain \0 bytes), and token_buffer.size() is the number of bytes in the
+    string.
+
+    @return token_type::value_string if string could be successfully scanned,
+            token_type::parse_error otherwise
+
+    @note In case of errors, variable error_message contains a textual
+          description.
+    */
+    token_type scan_string()
+    {
+        // reset token_buffer (ignore opening quote)
+        reset();
+
+        // we entered the function by reading an open quote
+        JSON_ASSERT(current == '\"');
+
+        while (true)
+        {
+            // get next character
+            switch (get())
+            {
+                // end of file while parsing string
+                case std::char_traits<char_type>::eof():
+                {
+                    error_message = "invalid string: missing closing quote";
+                    return token_type::parse_error;
+                }
+
+                // closing quote
+                case '\"':
+                {
+                    return token_type::value_string;
+                }
+
+                // escapes
+                case '\\':
+                {
+                    switch (get())
+                    {
+                        // quotation mark
+                        case '\"':
+                            add('\"');
+                            break;
+                        // reverse solidus
+                        case '\\':
+                            add('\\');
+                            break;
+                        // solidus
+                        case '/':
+                            add('/');
+                            break;
+                        // backspace
+                        case 'b':
+                            add('\b');
+                            break;
+                        // form feed
+                        case 'f':
+                            add('\f');
+                            break;
+                        // line feed
+                        case 'n':
+                            add('\n');
+                            break;
+                        // carriage return
+                        case 'r':
+                            add('\r');
+                            break;
+                        // tab
+                        case 't':
+                            add('\t');
+                            break;
+
+                        // unicode escapes
+                        case 'u':
+                        {
+                            const int codepoint1 = get_codepoint();
+                            int codepoint = codepoint1; // start with codepoint1
+
+                            if (JSON_HEDLEY_UNLIKELY(codepoint1 == -1))
+                            {
+                                error_message = "invalid string: '\\u' must be followed by 4 hex digits";
+                                return token_type::parse_error;
+                            }
+
+                            // check if code point is a high surrogate
+                            if (0xD800 <= codepoint1 && codepoint1 <= 0xDBFF)
+                            {
+                                // expect next \uxxxx entry
+                                if (JSON_HEDLEY_LIKELY(get() == '\\' && get() == 'u'))
+                                {
+                                    const int codepoint2 = get_codepoint();
+
+                                    if (JSON_HEDLEY_UNLIKELY(codepoint2 == -1))
+                                    {
+                                        error_message = "invalid string: '\\u' must be followed by 4 hex digits";
+                                        return token_type::parse_error;
+                                    }
+
+                                    // check if codepoint2 is a low surrogate
+                                    if (JSON_HEDLEY_LIKELY(0xDC00 <= codepoint2 && codepoint2 <= 0xDFFF))
+                                    {
+                                        // overwrite codepoint
+                                        codepoint = static_cast<int>(
+                                                        // high surrogate occupies the most significant 22 bits
+                                                        (static_cast<unsigned int>(codepoint1) << 10u)
+                                                        // low surrogate occupies the least significant 15 bits
+                                                        + static_cast<unsigned int>(codepoint2)
+                                                        // there is still the 0xD800, 0xDC00 and 0x10000 noise
+                                                        // in the result, so we have to subtract with:
+                                                        // (0xD800 << 10) + DC00 - 0x10000 = 0x35FDC00
+                                                        - 0x35FDC00u);
+                                    }
+                                    else
+                                    {
+                                        error_message = "invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF";
+                                        return token_type::parse_error;
+                                    }
+                                }
+                                else
+                                {
+                                    error_message = "invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF";
+                                    return token_type::parse_error;
+                                }
+                            }
+                            else
+                            {
+                                if (JSON_HEDLEY_UNLIKELY(0xDC00 <= codepoint1 && codepoint1 <= 0xDFFF))
+                                {
+                                    error_message = "invalid string: surrogate U+DC00..U+DFFF must follow U+D800..U+DBFF";
+                                    return token_type::parse_error;
+                                }
+                            }
+
+                            // result of the above calculation yields a proper codepoint
+                            JSON_ASSERT(0x00 <= codepoint && codepoint <= 0x10FFFF);
+
+                            // translate codepoint into bytes
+                            if (codepoint < 0x80)
+                            {
+                                // 1-byte characters: 0xxxxxxx (ASCII)
+                                add(static_cast<char_int_type>(codepoint));
+                            }
+                            else if (codepoint <= 0x7FF)
+                            {
+                                // 2-byte characters: 110xxxxx 10xxxxxx
+                                add(static_cast<char_int_type>(0xC0u | (static_cast<unsigned int>(codepoint) >> 6u)));
+                                add(static_cast<char_int_type>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
+                            }
+                            else if (codepoint <= 0xFFFF)
+                            {
+                                // 3-byte characters: 1110xxxx 10xxxxxx 10xxxxxx
+                                add(static_cast<char_int_type>(0xE0u | (static_cast<unsigned int>(codepoint) >> 12u)));
+                                add(static_cast<char_int_type>(0x80u | ((static_cast<unsigned int>(codepoint) >> 6u) & 0x3Fu)));
+                                add(static_cast<char_int_type>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
+                            }
+                            else
+                            {
+                                // 4-byte characters: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
+                                add(static_cast<char_int_type>(0xF0u | (static_cast<unsigned int>(codepoint) >> 18u)));
+                                add(static_cast<char_int_type>(0x80u | ((static_cast<unsigned int>(codepoint) >> 12u) & 0x3Fu)));
+                                add(static_cast<char_int_type>(0x80u | ((static_cast<unsigned int>(codepoint) >> 6u) & 0x3Fu)));
+                                add(static_cast<char_int_type>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
+                            }
+
+                            break;
+                        }
+
+                        // other characters after escape
+                        default:
+                            error_message = "invalid string: forbidden character after backslash";
+                            return token_type::parse_error;
+                    }
+
+                    break;
+                }
+
+                // invalid control characters
+                case 0x00:
+                {
+                    error_message = "invalid string: control character U+0000 (NUL) must be escaped to \\u0000";
+                    return token_type::parse_error;
+                }
+
+                case 0x01:
+                {
+                    error_message = "invalid string: control character U+0001 (SOH) must be escaped to \\u0001";
+                    return token_type::parse_error;
+                }
+
+                case 0x02:
+                {
+                    error_message = "invalid string: control character U+0002 (STX) must be escaped to \\u0002";
+                    return token_type::parse_error;
+                }
+
+                case 0x03:
+                {
+                    error_message = "invalid string: control character U+0003 (ETX) must be escaped to \\u0003";
+                    return token_type::parse_error;
+                }
+
+                case 0x04:
+                {
+                    error_message = "invalid string: control character U+0004 (EOT) must be escaped to \\u0004";
+                    return token_type::parse_error;
+                }
+
+                case 0x05:
+                {
+                    error_message = "invalid string: control character U+0005 (ENQ) must be escaped to \\u0005";
+                    return token_type::parse_error;
+                }
+
+                case 0x06:
+                {
+                    error_message = "invalid string: control character U+0006 (ACK) must be escaped to \\u0006";
+                    return token_type::parse_error;
+                }
+
+                case 0x07:
+                {
+                    error_message = "invalid string: control character U+0007 (BEL) must be escaped to \\u0007";
+                    return token_type::parse_error;
+                }
+
+                case 0x08:
+                {
+                    error_message = "invalid string: control character U+0008 (BS) must be escaped to \\u0008 or \\b";
+                    return token_type::parse_error;
+                }
+
+                case 0x09:
+                {
+                    error_message = "invalid string: control character U+0009 (HT) must be escaped to \\u0009 or \\t";
+                    return token_type::parse_error;
+                }
+
+                case 0x0A:
+                {
+                    error_message = "invalid string: control character U+000A (LF) must be escaped to \\u000A or \\n";
+                    return token_type::parse_error;
+                }
+
+                case 0x0B:
+                {
+                    error_message = "invalid string: control character U+000B (VT) must be escaped to \\u000B";
+                    return token_type::parse_error;
+                }
+
+                case 0x0C:
+                {
+                    error_message = "invalid string: control character U+000C (FF) must be escaped to \\u000C or \\f";
+                    return token_type::parse_error;
+                }
+
+                case 0x0D:
+                {
+                    error_message = "invalid string: control character U+000D (CR) must be escaped to \\u000D or \\r";
+                    return token_type::parse_error;
+                }
+
+                case 0x0E:
+                {
+                    error_message = "invalid string: control character U+000E (SO) must be escaped to \\u000E";
+                    return token_type::parse_error;
+                }
+
+                case 0x0F:
+                {
+                    error_message = "invalid string: control character U+000F (SI) must be escaped to \\u000F";
+                    return token_type::parse_error;
+                }
+
+                case 0x10:
+                {
+                    error_message = "invalid string: control character U+0010 (DLE) must be escaped to \\u0010";
+                    return token_type::parse_error;
+                }
+
+                case 0x11:
+                {
+                    error_message = "invalid string: control character U+0011 (DC1) must be escaped to \\u0011";
+                    return token_type::parse_error;
+                }
+
+                case 0x12:
+                {
+                    error_message = "invalid string: control character U+0012 (DC2) must be escaped to \\u0012";
+                    return token_type::parse_error;
+                }
+
+                case 0x13:
+                {
+                    error_message = "invalid string: control character U+0013 (DC3) must be escaped to \\u0013";
+                    return token_type::parse_error;
+                }
+
+                case 0x14:
+                {
+                    error_message = "invalid string: control character U+0014 (DC4) must be escaped to \\u0014";
+                    return token_type::parse_error;
+                }
+
+                case 0x15:
+                {
+                    error_message = "invalid string: control character U+0015 (NAK) must be escaped to \\u0015";
+                    return token_type::parse_error;
+                }
+
+                case 0x16:
+                {
+                    error_message = "invalid string: control character U+0016 (SYN) must be escaped to \\u0016";
+                    return token_type::parse_error;
+                }
+
+                case 0x17:
+                {
+                    error_message = "invalid string: control character U+0017 (ETB) must be escaped to \\u0017";
+                    return token_type::parse_error;
+                }
+
+                case 0x18:
+                {
+                    error_message = "invalid string: control character U+0018 (CAN) must be escaped to \\u0018";
+                    return token_type::parse_error;
+                }
+
+                case 0x19:
+                {
+                    error_message = "invalid string: control character U+0019 (EM) must be escaped to \\u0019";
+                    return token_type::parse_error;
+                }
+
+                case 0x1A:
+                {
+                    error_message = "invalid string: control character U+001A (SUB) must be escaped to \\u001A";
+                    return token_type::parse_error;
+                }
+
+                case 0x1B:
+                {
+                    error_message = "invalid string: control character U+001B (ESC) must be escaped to \\u001B";
+                    return token_type::parse_error;
+                }
+
+                case 0x1C:
+                {
+                    error_message = "invalid string: control character U+001C (FS) must be escaped to \\u001C";
+                    return token_type::parse_error;
+                }
+
+                case 0x1D:
+                {
+                    error_message = "invalid string: control character U+001D (GS) must be escaped to \\u001D";
+                    return token_type::parse_error;
+                }
+
+                case 0x1E:
+                {
+                    error_message = "invalid string: control character U+001E (RS) must be escaped to \\u001E";
+                    return token_type::parse_error;
+                }
+
+                case 0x1F:
+                {
+                    error_message = "invalid string: control character U+001F (US) must be escaped to \\u001F";
+                    return token_type::parse_error;
+                }
+
+                // U+0020..U+007F (except U+0022 (quote) and U+005C (backspace))
+                case 0x20:
+                case 0x21:
+                case 0x23:
+                case 0x24:
+                case 0x25:
+                case 0x26:
+                case 0x27:
+                case 0x28:
+                case 0x29:
+                case 0x2A:
+                case 0x2B:
+                case 0x2C:
+                case 0x2D:
+                case 0x2E:
+                case 0x2F:
+                case 0x30:
+                case 0x31:
+                case 0x32:
+                case 0x33:
+                case 0x34:
+                case 0x35:
+                case 0x36:
+                case 0x37:
+                case 0x38:
+                case 0x39:
+                case 0x3A:
+                case 0x3B:
+                case 0x3C:
+                case 0x3D:
+                case 0x3E:
+                case 0x3F:
+                case 0x40:
+                case 0x41:
+                case 0x42:
+                case 0x43:
+                case 0x44:
+                case 0x45:
+                case 0x46:
+                case 0x47:
+                case 0x48:
+                case 0x49:
+                case 0x4A:
+                case 0x4B:
+                case 0x4C:
+                case 0x4D:
+                case 0x4E:
+                case 0x4F:
+                case 0x50:
+                case 0x51:
+                case 0x52:
+                case 0x53:
+                case 0x54:
+                case 0x55:
+                case 0x56:
+                case 0x57:
+                case 0x58:
+                case 0x59:
+                case 0x5A:
+                case 0x5B:
+                case 0x5D:
+                case 0x5E:
+                case 0x5F:
+                case 0x60:
+                case 0x61:
+                case 0x62:
+                case 0x63:
+                case 0x64:
+                case 0x65:
+                case 0x66:
+                case 0x67:
+                case 0x68:
+                case 0x69:
+                case 0x6A:
+                case 0x6B:
+                case 0x6C:
+                case 0x6D:
+                case 0x6E:
+                case 0x6F:
+                case 0x70:
+                case 0x71:
+                case 0x72:
+                case 0x73:
+                case 0x74:
+                case 0x75:
+                case 0x76:
+                case 0x77:
+                case 0x78:
+                case 0x79:
+                case 0x7A:
+                case 0x7B:
+                case 0x7C:
+                case 0x7D:
+                case 0x7E:
+                case 0x7F:
+                {
+                    add(current);
+                    break;
+                }
+
+                // U+0080..U+07FF: bytes C2..DF 80..BF
+                case 0xC2:
+                case 0xC3:
+                case 0xC4:
+                case 0xC5:
+                case 0xC6:
+                case 0xC7:
+                case 0xC8:
+                case 0xC9:
+                case 0xCA:
+                case 0xCB:
+                case 0xCC:
+                case 0xCD:
+                case 0xCE:
+                case 0xCF:
+                case 0xD0:
+                case 0xD1:
+                case 0xD2:
+                case 0xD3:
+                case 0xD4:
+                case 0xD5:
+                case 0xD6:
+                case 0xD7:
+                case 0xD8:
+                case 0xD9:
+                case 0xDA:
+                case 0xDB:
+                case 0xDC:
+                case 0xDD:
+                case 0xDE:
+                case 0xDF:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!next_byte_in_range({0x80, 0xBF})))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+0800..U+0FFF: bytes E0 A0..BF 80..BF
+                case 0xE0:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0xA0, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+1000..U+CFFF: bytes E1..EC 80..BF 80..BF
+                // U+E000..U+FFFF: bytes EE..EF 80..BF 80..BF
+                case 0xE1:
+                case 0xE2:
+                case 0xE3:
+                case 0xE4:
+                case 0xE5:
+                case 0xE6:
+                case 0xE7:
+                case 0xE8:
+                case 0xE9:
+                case 0xEA:
+                case 0xEB:
+                case 0xEC:
+                case 0xEE:
+                case 0xEF:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+D000..U+D7FF: bytes ED 80..9F 80..BF
+                case 0xED:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0x9F, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+10000..U+3FFFF F0 90..BF 80..BF 80..BF
+                case 0xF0:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x90, 0xBF, 0x80, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+40000..U+FFFFF F1..F3 80..BF 80..BF 80..BF
+                case 0xF1:
+                case 0xF2:
+                case 0xF3:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0xBF, 0x80, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+100000..U+10FFFF F4 80..8F 80..BF 80..BF
+                case 0xF4:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0x8F, 0x80, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // remaining bytes (80..C1 and F5..FF) are ill-formed
+                default:
+                {
+                    error_message = "invalid string: ill-formed UTF-8 byte";
+                    return token_type::parse_error;
+                }
+            }
+        }
+    }
+
+    /*!
+     * @brief scan a comment
+     * @return whether comment could be scanned successfully
+     */
+    bool scan_comment()
+    {
+        switch (get())
+        {
+            // single-line comments skip input until a newline or EOF is read
+            case '/':
+            {
+                while (true)
+                {
+                    switch (get())
+                    {
+                        case '\n':
+                        case '\r':
+                        case std::char_traits<char_type>::eof():
+                        case '\0':
+                            return true;
+
+                        default:
+                            break;
+                    }
+                }
+            }
+
+            // multi-line comments skip input until */ is read
+            case '*':
+            {
+                while (true)
+                {
+                    switch (get())
+                    {
+                        case std::char_traits<char_type>::eof():
+                        case '\0':
+                        {
+                            error_message = "invalid comment; missing closing '*/'";
+                            return false;
+                        }
+
+                        case '*':
+                        {
+                            switch (get())
+                            {
+                                case '/':
+                                    return true;
+
+                                default:
+                                {
+                                    unget();
+                                    continue;
+                                }
+                            }
+                        }
+
+                        default:
+                            continue;
+                    }
+                }
+            }
+
+            // unexpected character after reading '/'
+            default:
+            {
+                error_message = "invalid comment; expecting '/' or '*' after '/'";
+                return false;
+            }
+        }
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    static void strtof(float& f, const char* str, char** endptr) noexcept
+    {
+        f = std::strtof(str, endptr);
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    static void strtof(double& f, const char* str, char** endptr) noexcept
+    {
+        f = std::strtod(str, endptr);
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    static void strtof(long double& f, const char* str, char** endptr) noexcept
+    {
+        f = std::strtold(str, endptr);
+    }
+
+    /*!
+    @brief scan a number literal
+
+    This function scans a string according to Sect. 6 of RFC 8259.
+
+    The function is realized with a deterministic finite state machine derived
+    from the grammar described in RFC 8259. Starting in state "init", the
+    input is read and used to determined the next state. Only state "done"
+    accepts the number. State "error" is a trap state to model errors. In the
+    table below, "anything" means any character but the ones listed before.
+
+    state    | 0        | 1-9      | e E      | +       | -       | .        | anything
+    ---------|----------|----------|----------|---------|---------|----------|-----------
+    init     | zero     | any1     | [error]  | [error] | minus   | [error]  | [error]
+    minus    | zero     | any1     | [error]  | [error] | [error] | [error]  | [error]
+    zero     | done     | done     | exponent | done    | done    | decimal1 | done
+    any1     | any1     | any1     | exponent | done    | done    | decimal1 | done
+    decimal1 | decimal2 | decimal2 | [error]  | [error] | [error] | [error]  | [error]
+    decimal2 | decimal2 | decimal2 | exponent | done    | done    | done     | done
+    exponent | any2     | any2     | [error]  | sign    | sign    | [error]  | [error]
+    sign     | any2     | any2     | [error]  | [error] | [error] | [error]  | [error]
+    any2     | any2     | any2     | done     | done    | done    | done     | done
+
+    The state machine is realized with one label per state (prefixed with
+    "scan_number_") and `goto` statements between them. The state machine
+    contains cycles, but any cycle can be left when EOF is read. Therefore,
+    the function is guaranteed to terminate.
+
+    During scanning, the read bytes are stored in token_buffer. This string is
+    then converted to a signed integer, an unsigned integer, or a
+    floating-point number.
+
+    @return token_type::value_unsigned, token_type::value_integer, or
+            token_type::value_float if number could be successfully scanned,
+            token_type::parse_error otherwise
+
+    @note The scanner is independent of the current locale. Internally, the
+          locale's decimal point is used instead of `.` to work with the
+          locale-dependent converters.
+    */
+    token_type scan_number()  // lgtm [cpp/use-of-goto]
+    {
+        // reset token_buffer to store the number's bytes
+        reset();
+
+        // the type of the parsed number; initially set to unsigned; will be
+        // changed if minus sign, decimal point or exponent is read
+        token_type number_type = token_type::value_unsigned;
+
+        // state (init): we just found out we need to scan a number
+        switch (current)
+        {
+            case '-':
+            {
+                add(current);
+                goto scan_number_minus;
+            }
+
+            case '0':
+            {
+                add(current);
+                goto scan_number_zero;
+            }
+
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any1;
+            }
+
+            // all other characters are rejected outside scan_number()
+            default:            // LCOV_EXCL_LINE
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+        }
+
+scan_number_minus:
+        // state: we just parsed a leading minus sign
+        number_type = token_type::value_integer;
+        switch (get())
+        {
+            case '0':
+            {
+                add(current);
+                goto scan_number_zero;
+            }
+
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any1;
+            }
+
+            default:
+            {
+                error_message = "invalid number; expected digit after '-'";
+                return token_type::parse_error;
+            }
+        }
+
+scan_number_zero:
+        // state: we just parse a zero (maybe with a leading minus sign)
+        switch (get())
+        {
+            case '.':
+            {
+                add(decimal_point_char);
+                goto scan_number_decimal1;
+            }
+
+            case 'e':
+            case 'E':
+            {
+                add(current);
+                goto scan_number_exponent;
+            }
+
+            default:
+                goto scan_number_done;
+        }
+
+scan_number_any1:
+        // state: we just parsed a number 0-9 (maybe with a leading minus sign)
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any1;
+            }
+
+            case '.':
+            {
+                add(decimal_point_char);
+                goto scan_number_decimal1;
+            }
+
+            case 'e':
+            case 'E':
+            {
+                add(current);
+                goto scan_number_exponent;
+            }
+
+            default:
+                goto scan_number_done;
+        }
+
+scan_number_decimal1:
+        // state: we just parsed a decimal point
+        number_type = token_type::value_float;
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_decimal2;
+            }
+
+            default:
+            {
+                error_message = "invalid number; expected digit after '.'";
+                return token_type::parse_error;
+            }
+        }
+
+scan_number_decimal2:
+        // we just parsed at least one number after a decimal point
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_decimal2;
+            }
+
+            case 'e':
+            case 'E':
+            {
+                add(current);
+                goto scan_number_exponent;
+            }
+
+            default:
+                goto scan_number_done;
+        }
+
+scan_number_exponent:
+        // we just parsed an exponent
+        number_type = token_type::value_float;
+        switch (get())
+        {
+            case '+':
+            case '-':
+            {
+                add(current);
+                goto scan_number_sign;
+            }
+
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any2;
+            }
+
+            default:
+            {
+                error_message =
+                    "invalid number; expected '+', '-', or digit after exponent";
+                return token_type::parse_error;
+            }
+        }
+
+scan_number_sign:
+        // we just parsed an exponent sign
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any2;
+            }
+
+            default:
+            {
+                error_message = "invalid number; expected digit after exponent sign";
+                return token_type::parse_error;
+            }
+        }
+
+scan_number_any2:
+        // we just parsed a number after the exponent or exponent sign
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any2;
+            }
+
+            default:
+                goto scan_number_done;
+        }
+
+scan_number_done:
+        // unget the character after the number (we only read it to know that
+        // we are done scanning a number)
+        unget();
+
+        char* endptr = nullptr; // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+        errno = 0;
+
+        // try to parse integers first and fall back to floats
+        if (number_type == token_type::value_unsigned)
+        {
+            const auto x = std::strtoull(token_buffer.data(), &endptr, 10);
+
+            // we checked the number format before
+            JSON_ASSERT(endptr == token_buffer.data() + token_buffer.size());
+
+            if (errno == 0)
+            {
+                value_unsigned = static_cast<number_unsigned_t>(x);
+                if (value_unsigned == x)
+                {
+                    return token_type::value_unsigned;
+                }
+            }
+        }
+        else if (number_type == token_type::value_integer)
+        {
+            const auto x = std::strtoll(token_buffer.data(), &endptr, 10);
+
+            // we checked the number format before
+            JSON_ASSERT(endptr == token_buffer.data() + token_buffer.size());
+
+            if (errno == 0)
+            {
+                value_integer = static_cast<number_integer_t>(x);
+                if (value_integer == x)
+                {
+                    return token_type::value_integer;
+                }
+            }
+        }
+
+        // this code is reached if we parse a floating-point number or if an
+        // integer conversion above failed
+        strtof(value_float, token_buffer.data(), &endptr);
+
+        // we checked the number format before
+        JSON_ASSERT(endptr == token_buffer.data() + token_buffer.size());
+
+        return token_type::value_float;
+    }
+
+    /*!
+    @param[in] literal_text  the literal text to expect
+    @param[in] length        the length of the passed literal text
+    @param[in] return_type   the token type to return on success
+    */
+    JSON_HEDLEY_NON_NULL(2)
+    token_type scan_literal(const char_type* literal_text, const std::size_t length,
+                            token_type return_type)
+    {
+        JSON_ASSERT(std::char_traits<char_type>::to_char_type(current) == literal_text[0]);
+        for (std::size_t i = 1; i < length; ++i)
+        {
+            if (JSON_HEDLEY_UNLIKELY(std::char_traits<char_type>::to_char_type(get()) != literal_text[i]))
+            {
+                error_message = "invalid literal";
+                return token_type::parse_error;
+            }
+        }
+        return return_type;
+    }
+
+    /////////////////////
+    // input management
+    /////////////////////
+
+    /// reset token_buffer; current character is beginning of token
+    void reset() noexcept
+    {
+        token_buffer.clear();
+        token_string.clear();
+        token_string.push_back(std::char_traits<char_type>::to_char_type(current));
+    }
+
+    /*
+    @brief get next character from the input
+
+    This function provides the interface to the used input adapter. It does
+    not throw in case the input reached EOF, but returns a
+    `std::char_traits<char>::eof()` in that case.  Stores the scanned characters
+    for use in error messages.
+
+    @return character read from the input
+    */
+    char_int_type get()
+    {
+        ++position.chars_read_total;
+        ++position.chars_read_current_line;
+
+        if (next_unget)
+        {
+            // just reset the next_unget variable and work with current
+            next_unget = false;
+        }
+        else
+        {
+            current = ia.get_character();
+        }
+
+        if (JSON_HEDLEY_LIKELY(current != std::char_traits<char_type>::eof()))
+        {
+            token_string.push_back(std::char_traits<char_type>::to_char_type(current));
+        }
+
+        if (current == '\n')
+        {
+            ++position.lines_read;
+            position.chars_read_current_line = 0;
+        }
+
+        return current;
+    }
+
+    /*!
+    @brief unget current character (read it again on next get)
+
+    We implement unget by setting variable next_unget to true. The input is not
+    changed - we just simulate ungetting by modifying chars_read_total,
+    chars_read_current_line, and token_string. The next call to get() will
+    behave as if the unget character is read again.
+    */
+    void unget()
+    {
+        next_unget = true;
+
+        --position.chars_read_total;
+
+        // in case we "unget" a newline, we have to also decrement the lines_read
+        if (position.chars_read_current_line == 0)
+        {
+            if (position.lines_read > 0)
+            {
+                --position.lines_read;
+            }
+        }
+        else
+        {
+            --position.chars_read_current_line;
+        }
+
+        if (JSON_HEDLEY_LIKELY(current != std::char_traits<char_type>::eof()))
+        {
+            JSON_ASSERT(!token_string.empty());
+            token_string.pop_back();
+        }
+    }
+
+    /// add a character to token_buffer
+    void add(char_int_type c)
+    {
+        token_buffer.push_back(static_cast<typename string_t::value_type>(c));
+    }
+
+  public:
+    /////////////////////
+    // value getters
+    /////////////////////
+
+    /// return integer value
+    constexpr number_integer_t get_number_integer() const noexcept
+    {
+        return value_integer;
+    }
+
+    /// return unsigned integer value
+    constexpr number_unsigned_t get_number_unsigned() const noexcept
+    {
+        return value_unsigned;
+    }
+
+    /// return floating-point value
+    constexpr number_float_t get_number_float() const noexcept
+    {
+        return value_float;
+    }
+
+    /// return current string value (implicitly resets the token; useful only once)
+    string_t& get_string()
+    {
+        return token_buffer;
+    }
+
+    /////////////////////
+    // diagnostics
+    /////////////////////
+
+    /// return position of last read token
+    constexpr position_t get_position() const noexcept
+    {
+        return position;
+    }
+
+    /// return the last read token (for errors only).  Will never contain EOF
+    /// (an arbitrary value that is not a valid char value, often -1), because
+    /// 255 may legitimately occur.  May contain NUL, which should be escaped.
+    std::string get_token_string() const
+    {
+        // escape control characters
+        std::string result;
+        for (const auto c : token_string)
+        {
+            if (static_cast<unsigned char>(c) <= '\x1F')
+            {
+                // escape control characters
+                std::array<char, 9> cs{{}};
+                static_cast<void>((std::snprintf)(cs.data(), cs.size(), "<U+%.4X>", static_cast<unsigned char>(c))); // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+                result += cs.data();
+            }
+            else
+            {
+                // add character as is
+                result.push_back(static_cast<std::string::value_type>(c));
+            }
+        }
+
+        return result;
+    }
+
+    /// return syntax error message
+    JSON_HEDLEY_RETURNS_NON_NULL
+    constexpr const char* get_error_message() const noexcept
+    {
+        return error_message;
+    }
+
+    /////////////////////
+    // actual scanner
+    /////////////////////
+
+    /*!
+    @brief skip the UTF-8 byte order mark
+    @return true iff there is no BOM or the correct BOM has been skipped
+    */
+    bool skip_bom()
+    {
+        if (get() == 0xEF)
+        {
+            // check if we completely parse the BOM
+            return get() == 0xBB && get() == 0xBF;
+        }
+
+        // the first character is not the beginning of the BOM; unget it to
+        // process is later
+        unget();
+        return true;
+    }
+
+    void skip_whitespace()
+    {
+        do
+        {
+            get();
+        }
+        while (current == ' ' || current == '\t' || current == '\n' || current == '\r');
+    }
+
+    token_type scan()
+    {
+        // initially, skip the BOM
+        if (position.chars_read_total == 0 && !skip_bom())
+        {
+            error_message = "invalid BOM; must be 0xEF 0xBB 0xBF if given";
+            return token_type::parse_error;
+        }
+
+        // read next character and ignore whitespace
+        skip_whitespace();
+
+        // ignore comments
+        while (ignore_comments && current == '/')
+        {
+            if (!scan_comment())
+            {
+                return token_type::parse_error;
+            }
+
+            // skip following whitespace
+            skip_whitespace();
+        }
+
+        switch (current)
+        {
+            // structural characters
+            case '[':
+                return token_type::begin_array;
+            case ']':
+                return token_type::end_array;
+            case '{':
+                return token_type::begin_object;
+            case '}':
+                return token_type::end_object;
+            case ':':
+                return token_type::name_separator;
+            case ',':
+                return token_type::value_separator;
+
+            // literals
+            case 't':
+            {
+                std::array<char_type, 4> true_literal = {{static_cast<char_type>('t'), static_cast<char_type>('r'), static_cast<char_type>('u'), static_cast<char_type>('e')}};
+                return scan_literal(true_literal.data(), true_literal.size(), token_type::literal_true);
+            }
+            case 'f':
+            {
+                std::array<char_type, 5> false_literal = {{static_cast<char_type>('f'), static_cast<char_type>('a'), static_cast<char_type>('l'), static_cast<char_type>('s'), static_cast<char_type>('e')}};
+                return scan_literal(false_literal.data(), false_literal.size(), token_type::literal_false);
+            }
+            case 'n':
+            {
+                std::array<char_type, 4> null_literal = {{static_cast<char_type>('n'), static_cast<char_type>('u'), static_cast<char_type>('l'), static_cast<char_type>('l')}};
+                return scan_literal(null_literal.data(), null_literal.size(), token_type::literal_null);
+            }
+
+            // string
+            case '\"':
+                return scan_string();
+
+            // number
+            case '-':
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+                return scan_number();
+
+            // end of input (the null byte is needed when parsing from
+            // string literals)
+            case '\0':
+            case std::char_traits<char_type>::eof():
+                return token_type::end_of_input;
+
+            // error
+            default:
+                error_message = "invalid literal";
+                return token_type::parse_error;
+        }
+    }
+
+  private:
+    /// input adapter
+    InputAdapterType ia;
+
+    /// whether comments should be ignored (true) or signaled as errors (false)
+    const bool ignore_comments = false;
+
+    /// the current character
+    char_int_type current = std::char_traits<char_type>::eof();
+
+    /// whether the next get() call should just return current
+    bool next_unget = false;
+
+    /// the start position of the current token
+    position_t position {};
+
+    /// raw input token string (for error messages)
+    std::vector<char_type> token_string {};
+
+    /// buffer for variable-length tokens (numbers, strings)
+    string_t token_buffer {};
+
+    /// a description of occurred lexer errors
+    const char* error_message = "";
+
+    // number values
+    number_integer_t value_integer = 0;
+    number_unsigned_t value_unsigned = 0;
+    number_float_t value_float = 0;
+
+    /// the decimal point
+    const char_int_type decimal_point_char = '.';
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/is_sax.hpp>
+
+
+#include <cstdint> // size_t
+#include <utility> // declval
+#include <string> // string
+
+// #include <nlohmann/detail/meta/detected.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+template<typename T>
+using null_function_t = decltype(std::declval<T&>().null());
+
+template<typename T>
+using boolean_function_t =
+    decltype(std::declval<T&>().boolean(std::declval<bool>()));
+
+template<typename T, typename Integer>
+using number_integer_function_t =
+    decltype(std::declval<T&>().number_integer(std::declval<Integer>()));
+
+template<typename T, typename Unsigned>
+using number_unsigned_function_t =
+    decltype(std::declval<T&>().number_unsigned(std::declval<Unsigned>()));
+
+template<typename T, typename Float, typename String>
+using number_float_function_t = decltype(std::declval<T&>().number_float(
+                                    std::declval<Float>(), std::declval<const String&>()));
+
+template<typename T, typename String>
+using string_function_t =
+    decltype(std::declval<T&>().string(std::declval<String&>()));
+
+template<typename T, typename Binary>
+using binary_function_t =
+    decltype(std::declval<T&>().binary(std::declval<Binary&>()));
+
+template<typename T>
+using start_object_function_t =
+    decltype(std::declval<T&>().start_object(std::declval<std::size_t>()));
+
+template<typename T, typename String>
+using key_function_t =
+    decltype(std::declval<T&>().key(std::declval<String&>()));
+
+template<typename T>
+using end_object_function_t = decltype(std::declval<T&>().end_object());
+
+template<typename T>
+using start_array_function_t =
+    decltype(std::declval<T&>().start_array(std::declval<std::size_t>()));
+
+template<typename T>
+using end_array_function_t = decltype(std::declval<T&>().end_array());
+
+template<typename T, typename Exception>
+using parse_error_function_t = decltype(std::declval<T&>().parse_error(
+        std::declval<std::size_t>(), std::declval<const std::string&>(),
+        std::declval<const Exception&>()));
+
+template<typename SAX, typename BasicJsonType>
+struct is_sax
+{
+  private:
+    static_assert(is_basic_json<BasicJsonType>::value,
+                  "BasicJsonType must be of type basic_json<...>");
+
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+    using exception_t = typename BasicJsonType::exception;
+
+  public:
+    static constexpr bool value =
+        is_detected_exact<bool, null_function_t, SAX>::value &&
+        is_detected_exact<bool, boolean_function_t, SAX>::value &&
+        is_detected_exact<bool, number_integer_function_t, SAX, number_integer_t>::value &&
+        is_detected_exact<bool, number_unsigned_function_t, SAX, number_unsigned_t>::value &&
+        is_detected_exact<bool, number_float_function_t, SAX, number_float_t, string_t>::value &&
+        is_detected_exact<bool, string_function_t, SAX, string_t>::value &&
+        is_detected_exact<bool, binary_function_t, SAX, binary_t>::value &&
+        is_detected_exact<bool, start_object_function_t, SAX>::value &&
+        is_detected_exact<bool, key_function_t, SAX, string_t>::value &&
+        is_detected_exact<bool, end_object_function_t, SAX>::value &&
+        is_detected_exact<bool, start_array_function_t, SAX>::value &&
+        is_detected_exact<bool, end_array_function_t, SAX>::value &&
+        is_detected_exact<bool, parse_error_function_t, SAX, exception_t>::value;
+};
+
+template<typename SAX, typename BasicJsonType>
+struct is_sax_static_asserts
+{
+  private:
+    static_assert(is_basic_json<BasicJsonType>::value,
+                  "BasicJsonType must be of type basic_json<...>");
+
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+    using exception_t = typename BasicJsonType::exception;
+
+  public:
+    static_assert(is_detected_exact<bool, null_function_t, SAX>::value,
+                  "Missing/invalid function: bool null()");
+    static_assert(is_detected_exact<bool, boolean_function_t, SAX>::value,
+                  "Missing/invalid function: bool boolean(bool)");
+    static_assert(is_detected_exact<bool, boolean_function_t, SAX>::value,
+                  "Missing/invalid function: bool boolean(bool)");
+    static_assert(
+        is_detected_exact<bool, number_integer_function_t, SAX,
+        number_integer_t>::value,
+        "Missing/invalid function: bool number_integer(number_integer_t)");
+    static_assert(
+        is_detected_exact<bool, number_unsigned_function_t, SAX,
+        number_unsigned_t>::value,
+        "Missing/invalid function: bool number_unsigned(number_unsigned_t)");
+    static_assert(is_detected_exact<bool, number_float_function_t, SAX,
+                  number_float_t, string_t>::value,
+                  "Missing/invalid function: bool number_float(number_float_t, const string_t&)");
+    static_assert(
+        is_detected_exact<bool, string_function_t, SAX, string_t>::value,
+        "Missing/invalid function: bool string(string_t&)");
+    static_assert(
+        is_detected_exact<bool, binary_function_t, SAX, binary_t>::value,
+        "Missing/invalid function: bool binary(binary_t&)");
+    static_assert(is_detected_exact<bool, start_object_function_t, SAX>::value,
+                  "Missing/invalid function: bool start_object(std::size_t)");
+    static_assert(is_detected_exact<bool, key_function_t, SAX, string_t>::value,
+                  "Missing/invalid function: bool key(string_t&)");
+    static_assert(is_detected_exact<bool, end_object_function_t, SAX>::value,
+                  "Missing/invalid function: bool end_object()");
+    static_assert(is_detected_exact<bool, start_array_function_t, SAX>::value,
+                  "Missing/invalid function: bool start_array(std::size_t)");
+    static_assert(is_detected_exact<bool, end_array_function_t, SAX>::value,
+                  "Missing/invalid function: bool end_array()");
+    static_assert(
+        is_detected_exact<bool, parse_error_function_t, SAX, exception_t>::value,
+        "Missing/invalid function: bool parse_error(std::size_t, const "
+        "std::string&, const exception&)");
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+
+/// how to treat CBOR tags
+enum class cbor_tag_handler_t
+{
+    error,   ///< throw a parse_error exception in case of a tag
+    ignore,  ///< ignore tags
+    store    ///< store tags as binary type
+};
+
+/*!
+@brief determine system byte order
+
+@return true if and only if system's byte order is little endian
+
+@note from https://stackoverflow.com/a/1001328/266378
+*/
+static inline bool little_endianness(int num = 1) noexcept
+{
+    return *reinterpret_cast<char*>(&num) == 1;
+}
+
+
+///////////////////
+// binary reader //
+///////////////////
+
+/*!
+@brief deserialization of CBOR, MessagePack, and UBJSON values
+*/
+template<typename BasicJsonType, typename InputAdapterType, typename SAX = json_sax_dom_parser<BasicJsonType>>
+class binary_reader
+{
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+    using json_sax_t = SAX;
+    using char_type = typename InputAdapterType::char_type;
+    using char_int_type = typename std::char_traits<char_type>::int_type;
+
+  public:
+    /*!
+    @brief create a binary reader
+
+    @param[in] adapter  input adapter to read from
+    */
+    explicit binary_reader(InputAdapterType&& adapter) noexcept : ia(std::move(adapter))
+    {
+        (void)detail::is_sax_static_asserts<SAX, BasicJsonType> {};
+    }
+
+    // make class move-only
+    binary_reader(const binary_reader&) = delete;
+    binary_reader(binary_reader&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+    binary_reader& operator=(const binary_reader&) = delete;
+    binary_reader& operator=(binary_reader&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+    ~binary_reader() = default;
+
+    /*!
+    @param[in] format  the binary format to parse
+    @param[in] sax_    a SAX event processor
+    @param[in] strict  whether to expect the input to be consumed completed
+    @param[in] tag_handler  how to treat CBOR tags
+
+    @return whether parsing was successful
+    */
+    JSON_HEDLEY_NON_NULL(3)
+    bool sax_parse(const input_format_t format,
+                   json_sax_t* sax_,
+                   const bool strict = true,
+                   const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
+    {
+        sax = sax_;
+        bool result = false;
+
+        switch (format)
+        {
+            case input_format_t::bson:
+                result = parse_bson_internal();
+                break;
+
+            case input_format_t::cbor:
+                result = parse_cbor_internal(true, tag_handler);
+                break;
+
+            case input_format_t::msgpack:
+                result = parse_msgpack_internal();
+                break;
+
+            case input_format_t::ubjson:
+                result = parse_ubjson_internal();
+                break;
+
+            case input_format_t::json: // LCOV_EXCL_LINE
+            default:            // LCOV_EXCL_LINE
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+        }
+
+        // strict mode: next byte must be EOF
+        if (result && strict)
+        {
+            if (format == input_format_t::ubjson)
+            {
+                get_ignore_noop();
+            }
+            else
+            {
+                get();
+            }
+
+            if (JSON_HEDLEY_UNLIKELY(current != std::char_traits<char_type>::eof()))
+            {
+                return sax->parse_error(chars_read, get_token_string(),
+                                        parse_error::create(110, chars_read, exception_message(format, "expected end of input; last byte: 0x" + get_token_string(), "value"), BasicJsonType()));
+            }
+        }
+
+        return result;
+    }
+
+  private:
+    //////////
+    // BSON //
+    //////////
+
+    /*!
+    @brief Reads in a BSON-object and passes it to the SAX-parser.
+    @return whether a valid BSON-value was passed to the SAX parser
+    */
+    bool parse_bson_internal()
+    {
+        std::int32_t document_size{};
+        get_number<std::int32_t, true>(input_format_t::bson, document_size);
+
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(static_cast<std::size_t>(-1))))
+        {
+            return false;
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(!parse_bson_element_list(/*is_array*/false)))
+        {
+            return false;
+        }
+
+        return sax->end_object();
+    }
+
+    /*!
+    @brief Parses a C-style string from the BSON input.
+    @param[in,out] result  A reference to the string variable where the read
+                            string is to be stored.
+    @return `true` if the \x00-byte indicating the end of the string was
+             encountered before the EOF; false` indicates an unexpected EOF.
+    */
+    bool get_bson_cstr(string_t& result)
+    {
+        auto out = std::back_inserter(result);
+        while (true)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::bson, "cstring")))
+            {
+                return false;
+            }
+            if (current == 0x00)
+            {
+                return true;
+            }
+            *out++ = static_cast<typename string_t::value_type>(current);
+        }
+    }
+
+    /*!
+    @brief Parses a zero-terminated string of length @a len from the BSON
+           input.
+    @param[in] len  The length (including the zero-byte at the end) of the
+                    string to be read.
+    @param[in,out] result  A reference to the string variable where the read
+                            string is to be stored.
+    @tparam NumberType The type of the length @a len
+    @pre len >= 1
+    @return `true` if the string was successfully parsed
+    */
+    template<typename NumberType>
+    bool get_bson_string(const NumberType len, string_t& result)
+    {
+        if (JSON_HEDLEY_UNLIKELY(len < 1))
+        {
+            auto last_token = get_token_string();
+            return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::bson, "string length must be at least 1, is " + std::to_string(len), "string"), BasicJsonType()));
+        }
+
+        return get_string(input_format_t::bson, len - static_cast<NumberType>(1), result) && get() != std::char_traits<char_type>::eof();
+    }
+
+    /*!
+    @brief Parses a byte array input of length @a len from the BSON input.
+    @param[in] len  The length of the byte array to be read.
+    @param[in,out] result  A reference to the binary variable where the read
+                            array is to be stored.
+    @tparam NumberType The type of the length @a len
+    @pre len >= 0
+    @return `true` if the byte array was successfully parsed
+    */
+    template<typename NumberType>
+    bool get_bson_binary(const NumberType len, binary_t& result)
+    {
+        if (JSON_HEDLEY_UNLIKELY(len < 0))
+        {
+            auto last_token = get_token_string();
+            return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::bson, "byte array length cannot be negative, is " + std::to_string(len), "binary"), BasicJsonType()));
+        }
+
+        // All BSON binary values have a subtype
+        std::uint8_t subtype{};
+        get_number<std::uint8_t>(input_format_t::bson, subtype);
+        result.set_subtype(subtype);
+
+        return get_binary(input_format_t::bson, len, result);
+    }
+
+    /*!
+    @brief Read a BSON document element of the given @a element_type.
+    @param[in] element_type The BSON element type, c.f. http://bsonspec.org/spec.html
+    @param[in] element_type_parse_position The position in the input stream,
+               where the `element_type` was read.
+    @warning Not all BSON element types are supported yet. An unsupported
+             @a element_type will give rise to a parse_error.114:
+             Unsupported BSON record type 0x...
+    @return whether a valid BSON-object/array was passed to the SAX parser
+    */
+    bool parse_bson_element_internal(const char_int_type element_type,
+                                     const std::size_t element_type_parse_position)
+    {
+        switch (element_type)
+        {
+            case 0x01: // double
+            {
+                double number{};
+                return get_number<double, true>(input_format_t::bson, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 0x02: // string
+            {
+                std::int32_t len{};
+                string_t value;
+                return get_number<std::int32_t, true>(input_format_t::bson, len) && get_bson_string(len, value) && sax->string(value);
+            }
+
+            case 0x03: // object
+            {
+                return parse_bson_internal();
+            }
+
+            case 0x04: // array
+            {
+                return parse_bson_array();
+            }
+
+            case 0x05: // binary
+            {
+                std::int32_t len{};
+                binary_t value;
+                return get_number<std::int32_t, true>(input_format_t::bson, len) && get_bson_binary(len, value) && sax->binary(value);
+            }
+
+            case 0x08: // boolean
+            {
+                return sax->boolean(get() != 0);
+            }
+
+            case 0x0A: // null
+            {
+                return sax->null();
+            }
+
+            case 0x10: // int32
+            {
+                std::int32_t value{};
+                return get_number<std::int32_t, true>(input_format_t::bson, value) && sax->number_integer(value);
+            }
+
+            case 0x12: // int64
+            {
+                std::int64_t value{};
+                return get_number<std::int64_t, true>(input_format_t::bson, value) && sax->number_integer(value);
+            }
+
+            default: // anything else not supported (yet)
+            {
+                std::array<char, 3> cr{{}};
+                static_cast<void>((std::snprintf)(cr.data(), cr.size(), "%.2hhX", static_cast<unsigned char>(element_type))); // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+                return sax->parse_error(element_type_parse_position, std::string(cr.data()), parse_error::create(114, element_type_parse_position, "Unsupported BSON record type 0x" + std::string(cr.data()), BasicJsonType()));
+            }
+        }
+    }
+
+    /*!
+    @brief Read a BSON element list (as specified in the BSON-spec)
+
+    The same binary layout is used for objects and arrays, hence it must be
+    indicated with the argument @a is_array which one is expected
+    (true --> array, false --> object).
+
+    @param[in] is_array Determines if the element list being read is to be
+                        treated as an object (@a is_array == false), or as an
+                        array (@a is_array == true).
+    @return whether a valid BSON-object/array was passed to the SAX parser
+    */
+    bool parse_bson_element_list(const bool is_array)
+    {
+        string_t key;
+
+        while (auto element_type = get())
+        {
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::bson, "element list")))
+            {
+                return false;
+            }
+
+            const std::size_t element_type_parse_position = chars_read;
+            if (JSON_HEDLEY_UNLIKELY(!get_bson_cstr(key)))
+            {
+                return false;
+            }
+
+            if (!is_array && !sax->key(key))
+            {
+                return false;
+            }
+
+            if (JSON_HEDLEY_UNLIKELY(!parse_bson_element_internal(element_type, element_type_parse_position)))
+            {
+                return false;
+            }
+
+            // get_bson_cstr only appends
+            key.clear();
+        }
+
+        return true;
+    }
+
+    /*!
+    @brief Reads an array from the BSON input and passes it to the SAX-parser.
+    @return whether a valid BSON-array was passed to the SAX parser
+    */
+    bool parse_bson_array()
+    {
+        std::int32_t document_size{};
+        get_number<std::int32_t, true>(input_format_t::bson, document_size);
+
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(static_cast<std::size_t>(-1))))
+        {
+            return false;
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(!parse_bson_element_list(/*is_array*/true)))
+        {
+            return false;
+        }
+
+        return sax->end_array();
+    }
+
+    //////////
+    // CBOR //
+    //////////
+
+    /*!
+    @param[in] get_char  whether a new character should be retrieved from the
+                         input (true) or whether the last read character should
+                         be considered instead (false)
+    @param[in] tag_handler how CBOR tags should be treated
+
+    @return whether a valid CBOR value was passed to the SAX parser
+    */
+    bool parse_cbor_internal(const bool get_char,
+                             const cbor_tag_handler_t tag_handler)
+    {
+        switch (get_char ? get() : current)
+        {
+            // EOF
+            case std::char_traits<char_type>::eof():
+                return unexpect_eof(input_format_t::cbor, "value");
+
+            // Integer 0x00..0x17 (0..23)
+            case 0x00:
+            case 0x01:
+            case 0x02:
+            case 0x03:
+            case 0x04:
+            case 0x05:
+            case 0x06:
+            case 0x07:
+            case 0x08:
+            case 0x09:
+            case 0x0A:
+            case 0x0B:
+            case 0x0C:
+            case 0x0D:
+            case 0x0E:
+            case 0x0F:
+            case 0x10:
+            case 0x11:
+            case 0x12:
+            case 0x13:
+            case 0x14:
+            case 0x15:
+            case 0x16:
+            case 0x17:
+                return sax->number_unsigned(static_cast<number_unsigned_t>(current));
+
+            case 0x18: // Unsigned integer (one-byte uint8_t follows)
+            {
+                std::uint8_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_unsigned(number);
+            }
+
+            case 0x19: // Unsigned integer (two-byte uint16_t follows)
+            {
+                std::uint16_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_unsigned(number);
+            }
+
+            case 0x1A: // Unsigned integer (four-byte uint32_t follows)
+            {
+                std::uint32_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_unsigned(number);
+            }
+
+            case 0x1B: // Unsigned integer (eight-byte uint64_t follows)
+            {
+                std::uint64_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_unsigned(number);
+            }
+
+            // Negative integer -1-0x00..-1-0x17 (-1..-24)
+            case 0x20:
+            case 0x21:
+            case 0x22:
+            case 0x23:
+            case 0x24:
+            case 0x25:
+            case 0x26:
+            case 0x27:
+            case 0x28:
+            case 0x29:
+            case 0x2A:
+            case 0x2B:
+            case 0x2C:
+            case 0x2D:
+            case 0x2E:
+            case 0x2F:
+            case 0x30:
+            case 0x31:
+            case 0x32:
+            case 0x33:
+            case 0x34:
+            case 0x35:
+            case 0x36:
+            case 0x37:
+                return sax->number_integer(static_cast<std::int8_t>(0x20 - 1 - current));
+
+            case 0x38: // Negative integer (one-byte uint8_t follows)
+            {
+                std::uint8_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast<number_integer_t>(-1) - number);
+            }
+
+            case 0x39: // Negative integer -1-n (two-byte uint16_t follows)
+            {
+                std::uint16_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast<number_integer_t>(-1) - number);
+            }
+
+            case 0x3A: // Negative integer -1-n (four-byte uint32_t follows)
+            {
+                std::uint32_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast<number_integer_t>(-1) - number);
+            }
+
+            case 0x3B: // Negative integer -1-n (eight-byte uint64_t follows)
+            {
+                std::uint64_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast<number_integer_t>(-1)
+                        - static_cast<number_integer_t>(number));
+            }
+
+            // Binary data (0x00..0x17 bytes follow)
+            case 0x40:
+            case 0x41:
+            case 0x42:
+            case 0x43:
+            case 0x44:
+            case 0x45:
+            case 0x46:
+            case 0x47:
+            case 0x48:
+            case 0x49:
+            case 0x4A:
+            case 0x4B:
+            case 0x4C:
+            case 0x4D:
+            case 0x4E:
+            case 0x4F:
+            case 0x50:
+            case 0x51:
+            case 0x52:
+            case 0x53:
+            case 0x54:
+            case 0x55:
+            case 0x56:
+            case 0x57:
+            case 0x58: // Binary data (one-byte uint8_t for n follows)
+            case 0x59: // Binary data (two-byte uint16_t for n follow)
+            case 0x5A: // Binary data (four-byte uint32_t for n follow)
+            case 0x5B: // Binary data (eight-byte uint64_t for n follow)
+            case 0x5F: // Binary data (indefinite length)
+            {
+                binary_t b;
+                return get_cbor_binary(b) && sax->binary(b);
+            }
+
+            // UTF-8 string (0x00..0x17 bytes follow)
+            case 0x60:
+            case 0x61:
+            case 0x62:
+            case 0x63:
+            case 0x64:
+            case 0x65:
+            case 0x66:
+            case 0x67:
+            case 0x68:
+            case 0x69:
+            case 0x6A:
+            case 0x6B:
+            case 0x6C:
+            case 0x6D:
+            case 0x6E:
+            case 0x6F:
+            case 0x70:
+            case 0x71:
+            case 0x72:
+            case 0x73:
+            case 0x74:
+            case 0x75:
+            case 0x76:
+            case 0x77:
+            case 0x78: // UTF-8 string (one-byte uint8_t for n follows)
+            case 0x79: // UTF-8 string (two-byte uint16_t for n follow)
+            case 0x7A: // UTF-8 string (four-byte uint32_t for n follow)
+            case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow)
+            case 0x7F: // UTF-8 string (indefinite length)
+            {
+                string_t s;
+                return get_cbor_string(s) && sax->string(s);
+            }
+
+            // array (0x00..0x17 data items follow)
+            case 0x80:
+            case 0x81:
+            case 0x82:
+            case 0x83:
+            case 0x84:
+            case 0x85:
+            case 0x86:
+            case 0x87:
+            case 0x88:
+            case 0x89:
+            case 0x8A:
+            case 0x8B:
+            case 0x8C:
+            case 0x8D:
+            case 0x8E:
+            case 0x8F:
+            case 0x90:
+            case 0x91:
+            case 0x92:
+            case 0x93:
+            case 0x94:
+            case 0x95:
+            case 0x96:
+            case 0x97:
+                return get_cbor_array(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x1Fu), tag_handler);
+
+            case 0x98: // array (one-byte uint8_t for n follows)
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_array(static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0x99: // array (two-byte uint16_t for n follow)
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_array(static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0x9A: // array (four-byte uint32_t for n follow)
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_array(static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0x9B: // array (eight-byte uint64_t for n follow)
+            {
+                std::uint64_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_array(detail::conditional_static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0x9F: // array (indefinite length)
+                return get_cbor_array(static_cast<std::size_t>(-1), tag_handler);
+
+            // map (0x00..0x17 pairs of data items follow)
+            case 0xA0:
+            case 0xA1:
+            case 0xA2:
+            case 0xA3:
+            case 0xA4:
+            case 0xA5:
+            case 0xA6:
+            case 0xA7:
+            case 0xA8:
+            case 0xA9:
+            case 0xAA:
+            case 0xAB:
+            case 0xAC:
+            case 0xAD:
+            case 0xAE:
+            case 0xAF:
+            case 0xB0:
+            case 0xB1:
+            case 0xB2:
+            case 0xB3:
+            case 0xB4:
+            case 0xB5:
+            case 0xB6:
+            case 0xB7:
+                return get_cbor_object(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x1Fu), tag_handler);
+
+            case 0xB8: // map (one-byte uint8_t for n follows)
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_object(static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0xB9: // map (two-byte uint16_t for n follow)
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_object(static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0xBA: // map (four-byte uint32_t for n follow)
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_object(static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0xBB: // map (eight-byte uint64_t for n follow)
+            {
+                std::uint64_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_object(detail::conditional_static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0xBF: // map (indefinite length)
+                return get_cbor_object(static_cast<std::size_t>(-1), tag_handler);
+
+            case 0xC6: // tagged item
+            case 0xC7:
+            case 0xC8:
+            case 0xC9:
+            case 0xCA:
+            case 0xCB:
+            case 0xCC:
+            case 0xCD:
+            case 0xCE:
+            case 0xCF:
+            case 0xD0:
+            case 0xD1:
+            case 0xD2:
+            case 0xD3:
+            case 0xD4:
+            case 0xD8: // tagged item (1 bytes follow)
+            case 0xD9: // tagged item (2 bytes follow)
+            case 0xDA: // tagged item (4 bytes follow)
+            case 0xDB: // tagged item (8 bytes follow)
+            {
+                switch (tag_handler)
+                {
+                    case cbor_tag_handler_t::error:
+                    {
+                        auto last_token = get_token_string();
+                        return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::cbor, "invalid byte: 0x" + last_token, "value"), BasicJsonType()));
+                    }
+
+                    case cbor_tag_handler_t::ignore:
+                    {
+                        // ignore binary subtype
+                        switch (current)
+                        {
+                            case 0xD8:
+                            {
+                                std::uint8_t subtype_to_ignore{};
+                                get_number(input_format_t::cbor, subtype_to_ignore);
+                                break;
+                            }
+                            case 0xD9:
+                            {
+                                std::uint16_t subtype_to_ignore{};
+                                get_number(input_format_t::cbor, subtype_to_ignore);
+                                break;
+                            }
+                            case 0xDA:
+                            {
+                                std::uint32_t subtype_to_ignore{};
+                                get_number(input_format_t::cbor, subtype_to_ignore);
+                                break;
+                            }
+                            case 0xDB:
+                            {
+                                std::uint64_t subtype_to_ignore{};
+                                get_number(input_format_t::cbor, subtype_to_ignore);
+                                break;
+                            }
+                            default:
+                                break;
+                        }
+                        return parse_cbor_internal(true, tag_handler);
+                    }
+
+                    case cbor_tag_handler_t::store:
+                    {
+                        binary_t b;
+                        // use binary subtype and store in binary container
+                        switch (current)
+                        {
+                            case 0xD8:
+                            {
+                                std::uint8_t subtype{};
+                                get_number(input_format_t::cbor, subtype);
+                                b.set_subtype(detail::conditional_static_cast<typename binary_t::subtype_type>(subtype));
+                                break;
+                            }
+                            case 0xD9:
+                            {
+                                std::uint16_t subtype{};
+                                get_number(input_format_t::cbor, subtype);
+                                b.set_subtype(detail::conditional_static_cast<typename binary_t::subtype_type>(subtype));
+                                break;
+                            }
+                            case 0xDA:
+                            {
+                                std::uint32_t subtype{};
+                                get_number(input_format_t::cbor, subtype);
+                                b.set_subtype(detail::conditional_static_cast<typename binary_t::subtype_type>(subtype));
+                                break;
+                            }
+                            case 0xDB:
+                            {
+                                std::uint64_t subtype{};
+                                get_number(input_format_t::cbor, subtype);
+                                b.set_subtype(detail::conditional_static_cast<typename binary_t::subtype_type>(subtype));
+                                break;
+                            }
+                            default:
+                                return parse_cbor_internal(true, tag_handler);
+                        }
+                        get();
+                        return get_cbor_binary(b) && sax->binary(b);
+                    }
+
+                    default:                 // LCOV_EXCL_LINE
+                        JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+                        return false;        // LCOV_EXCL_LINE
+                }
+            }
+
+            case 0xF4: // false
+                return sax->boolean(false);
+
+            case 0xF5: // true
+                return sax->boolean(true);
+
+            case 0xF6: // null
+                return sax->null();
+
+            case 0xF9: // Half-Precision Float (two-byte IEEE 754)
+            {
+                const auto byte1_raw = get();
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "number")))
+                {
+                    return false;
+                }
+                const auto byte2_raw = get();
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "number")))
+                {
+                    return false;
+                }
+
+                const auto byte1 = static_cast<unsigned char>(byte1_raw);
+                const auto byte2 = static_cast<unsigned char>(byte2_raw);
+
+                // code from RFC 7049, Appendix D, Figure 3:
+                // As half-precision floating-point numbers were only added
+                // to IEEE 754 in 2008, today's programming platforms often
+                // still only have limited support for them. It is very
+                // easy to include at least decoding support for them even
+                // without such support. An example of a small decoder for
+                // half-precision floating-point numbers in the C language
+                // is shown in Fig. 3.
+                const auto half = static_cast<unsigned int>((byte1 << 8u) + byte2);
+                const double val = [&half]
+                {
+                    const int exp = (half >> 10u) & 0x1Fu;
+                    const unsigned int mant = half & 0x3FFu;
+                    JSON_ASSERT(0 <= exp&& exp <= 32);
+                    JSON_ASSERT(mant <= 1024);
+                    switch (exp)
+                    {
+                        case 0:
+                            return std::ldexp(mant, -24);
+                        case 31:
+                            return (mant == 0)
+                            ? std::numeric_limits<double>::infinity()
+                            : std::numeric_limits<double>::quiet_NaN();
+                        default:
+                            return std::ldexp(mant + 1024, exp - 25);
+                    }
+                }();
+                return sax->number_float((half & 0x8000u) != 0
+                                         ? static_cast<number_float_t>(-val)
+                                         : static_cast<number_float_t>(val), "");
+            }
+
+            case 0xFA: // Single-Precision Float (four-byte IEEE 754)
+            {
+                float number{};
+                return get_number(input_format_t::cbor, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 0xFB: // Double-Precision Float (eight-byte IEEE 754)
+            {
+                double number{};
+                return get_number(input_format_t::cbor, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            default: // anything else (0xFF is handled inside the other types)
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::cbor, "invalid byte: 0x" + last_token, "value"), BasicJsonType()));
+            }
+        }
+    }
+
+    /*!
+    @brief reads a CBOR string
+
+    This function first reads starting bytes to determine the expected
+    string length and then copies this number of bytes into a string.
+    Additionally, CBOR's strings with indefinite lengths are supported.
+
+    @param[out] result  created string
+
+    @return whether string creation completed
+    */
+    bool get_cbor_string(string_t& result)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "string")))
+        {
+            return false;
+        }
+
+        switch (current)
+        {
+            // UTF-8 string (0x00..0x17 bytes follow)
+            case 0x60:
+            case 0x61:
+            case 0x62:
+            case 0x63:
+            case 0x64:
+            case 0x65:
+            case 0x66:
+            case 0x67:
+            case 0x68:
+            case 0x69:
+            case 0x6A:
+            case 0x6B:
+            case 0x6C:
+            case 0x6D:
+            case 0x6E:
+            case 0x6F:
+            case 0x70:
+            case 0x71:
+            case 0x72:
+            case 0x73:
+            case 0x74:
+            case 0x75:
+            case 0x76:
+            case 0x77:
+            {
+                return get_string(input_format_t::cbor, static_cast<unsigned int>(current) & 0x1Fu, result);
+            }
+
+            case 0x78: // UTF-8 string (one-byte uint8_t for n follows)
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result);
+            }
+
+            case 0x79: // UTF-8 string (two-byte uint16_t for n follow)
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result);
+            }
+
+            case 0x7A: // UTF-8 string (four-byte uint32_t for n follow)
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result);
+            }
+
+            case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow)
+            {
+                std::uint64_t len{};
+                return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result);
+            }
+
+            case 0x7F: // UTF-8 string (indefinite length)
+            {
+                while (get() != 0xFF)
+                {
+                    string_t chunk;
+                    if (!get_cbor_string(chunk))
+                    {
+                        return false;
+                    }
+                    result.append(chunk);
+                }
+                return true;
+            }
+
+            default:
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::cbor, "expected length specification (0x60-0x7B) or indefinite string type (0x7F); last byte: 0x" + last_token, "string"), BasicJsonType()));
+            }
+        }
+    }
+
+    /*!
+    @brief reads a CBOR byte array
+
+    This function first reads starting bytes to determine the expected
+    byte array length and then copies this number of bytes into the byte array.
+    Additionally, CBOR's byte arrays with indefinite lengths are supported.
+
+    @param[out] result  created byte array
+
+    @return whether byte array creation completed
+    */
+    bool get_cbor_binary(binary_t& result)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "binary")))
+        {
+            return false;
+        }
+
+        switch (current)
+        {
+            // Binary data (0x00..0x17 bytes follow)
+            case 0x40:
+            case 0x41:
+            case 0x42:
+            case 0x43:
+            case 0x44:
+            case 0x45:
+            case 0x46:
+            case 0x47:
+            case 0x48:
+            case 0x49:
+            case 0x4A:
+            case 0x4B:
+            case 0x4C:
+            case 0x4D:
+            case 0x4E:
+            case 0x4F:
+            case 0x50:
+            case 0x51:
+            case 0x52:
+            case 0x53:
+            case 0x54:
+            case 0x55:
+            case 0x56:
+            case 0x57:
+            {
+                return get_binary(input_format_t::cbor, static_cast<unsigned int>(current) & 0x1Fu, result);
+            }
+
+            case 0x58: // Binary data (one-byte uint8_t for n follows)
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::cbor, len) &&
+                       get_binary(input_format_t::cbor, len, result);
+            }
+
+            case 0x59: // Binary data (two-byte uint16_t for n follow)
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::cbor, len) &&
+                       get_binary(input_format_t::cbor, len, result);
+            }
+
+            case 0x5A: // Binary data (four-byte uint32_t for n follow)
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::cbor, len) &&
+                       get_binary(input_format_t::cbor, len, result);
+            }
+
+            case 0x5B: // Binary data (eight-byte uint64_t for n follow)
+            {
+                std::uint64_t len{};
+                return get_number(input_format_t::cbor, len) &&
+                       get_binary(input_format_t::cbor, len, result);
+            }
+
+            case 0x5F: // Binary data (indefinite length)
+            {
+                while (get() != 0xFF)
+                {
+                    binary_t chunk;
+                    if (!get_cbor_binary(chunk))
+                    {
+                        return false;
+                    }
+                    result.insert(result.end(), chunk.begin(), chunk.end());
+                }
+                return true;
+            }
+
+            default:
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::cbor, "expected length specification (0x40-0x5B) or indefinite binary array type (0x5F); last byte: 0x" + last_token, "binary"), BasicJsonType()));
+            }
+        }
+    }
+
+    /*!
+    @param[in] len  the length of the array or static_cast<std::size_t>(-1) for an
+                    array of indefinite size
+    @param[in] tag_handler how CBOR tags should be treated
+    @return whether array creation completed
+    */
+    bool get_cbor_array(const std::size_t len,
+                        const cbor_tag_handler_t tag_handler)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(len)))
+        {
+            return false;
+        }
+
+        if (len != static_cast<std::size_t>(-1))
+        {
+            for (std::size_t i = 0; i < len; ++i)
+            {
+                if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler)))
+                {
+                    return false;
+                }
+            }
+        }
+        else
+        {
+            while (get() != 0xFF)
+            {
+                if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(false, tag_handler)))
+                {
+                    return false;
+                }
+            }
+        }
+
+        return sax->end_array();
+    }
+
+    /*!
+    @param[in] len  the length of the object or static_cast<std::size_t>(-1) for an
+                    object of indefinite size
+    @param[in] tag_handler how CBOR tags should be treated
+    @return whether object creation completed
+    */
+    bool get_cbor_object(const std::size_t len,
+                         const cbor_tag_handler_t tag_handler)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(len)))
+        {
+            return false;
+        }
+
+        if (len != 0)
+        {
+            string_t key;
+            if (len != static_cast<std::size_t>(-1))
+            {
+                for (std::size_t i = 0; i < len; ++i)
+                {
+                    get();
+                    if (JSON_HEDLEY_UNLIKELY(!get_cbor_string(key) || !sax->key(key)))
+                    {
+                        return false;
+                    }
+
+                    if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler)))
+                    {
+                        return false;
+                    }
+                    key.clear();
+                }
+            }
+            else
+            {
+                while (get() != 0xFF)
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!get_cbor_string(key) || !sax->key(key)))
+                    {
+                        return false;
+                    }
+
+                    if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler)))
+                    {
+                        return false;
+                    }
+                    key.clear();
+                }
+            }
+        }
+
+        return sax->end_object();
+    }
+
+    /////////////
+    // MsgPack //
+    /////////////
+
+    /*!
+    @return whether a valid MessagePack value was passed to the SAX parser
+    */
+    bool parse_msgpack_internal()
+    {
+        switch (get())
+        {
+            // EOF
+            case std::char_traits<char_type>::eof():
+                return unexpect_eof(input_format_t::msgpack, "value");
+
+            // positive fixint
+            case 0x00:
+            case 0x01:
+            case 0x02:
+            case 0x03:
+            case 0x04:
+            case 0x05:
+            case 0x06:
+            case 0x07:
+            case 0x08:
+            case 0x09:
+            case 0x0A:
+            case 0x0B:
+            case 0x0C:
+            case 0x0D:
+            case 0x0E:
+            case 0x0F:
+            case 0x10:
+            case 0x11:
+            case 0x12:
+            case 0x13:
+            case 0x14:
+            case 0x15:
+            case 0x16:
+            case 0x17:
+            case 0x18:
+            case 0x19:
+            case 0x1A:
+            case 0x1B:
+            case 0x1C:
+            case 0x1D:
+            case 0x1E:
+            case 0x1F:
+            case 0x20:
+            case 0x21:
+            case 0x22:
+            case 0x23:
+            case 0x24:
+            case 0x25:
+            case 0x26:
+            case 0x27:
+            case 0x28:
+            case 0x29:
+            case 0x2A:
+            case 0x2B:
+            case 0x2C:
+            case 0x2D:
+            case 0x2E:
+            case 0x2F:
+            case 0x30:
+            case 0x31:
+            case 0x32:
+            case 0x33:
+            case 0x34:
+            case 0x35:
+            case 0x36:
+            case 0x37:
+            case 0x38:
+            case 0x39:
+            case 0x3A:
+            case 0x3B:
+            case 0x3C:
+            case 0x3D:
+            case 0x3E:
+            case 0x3F:
+            case 0x40:
+            case 0x41:
+            case 0x42:
+            case 0x43:
+            case 0x44:
+            case 0x45:
+            case 0x46:
+            case 0x47:
+            case 0x48:
+            case 0x49:
+            case 0x4A:
+            case 0x4B:
+            case 0x4C:
+            case 0x4D:
+            case 0x4E:
+            case 0x4F:
+            case 0x50:
+            case 0x51:
+            case 0x52:
+            case 0x53:
+            case 0x54:
+            case 0x55:
+            case 0x56:
+            case 0x57:
+            case 0x58:
+            case 0x59:
+            case 0x5A:
+            case 0x5B:
+            case 0x5C:
+            case 0x5D:
+            case 0x5E:
+            case 0x5F:
+            case 0x60:
+            case 0x61:
+            case 0x62:
+            case 0x63:
+            case 0x64:
+            case 0x65:
+            case 0x66:
+            case 0x67:
+            case 0x68:
+            case 0x69:
+            case 0x6A:
+            case 0x6B:
+            case 0x6C:
+            case 0x6D:
+            case 0x6E:
+            case 0x6F:
+            case 0x70:
+            case 0x71:
+            case 0x72:
+            case 0x73:
+            case 0x74:
+            case 0x75:
+            case 0x76:
+            case 0x77:
+            case 0x78:
+            case 0x79:
+            case 0x7A:
+            case 0x7B:
+            case 0x7C:
+            case 0x7D:
+            case 0x7E:
+            case 0x7F:
+                return sax->number_unsigned(static_cast<number_unsigned_t>(current));
+
+            // fixmap
+            case 0x80:
+            case 0x81:
+            case 0x82:
+            case 0x83:
+            case 0x84:
+            case 0x85:
+            case 0x86:
+            case 0x87:
+            case 0x88:
+            case 0x89:
+            case 0x8A:
+            case 0x8B:
+            case 0x8C:
+            case 0x8D:
+            case 0x8E:
+            case 0x8F:
+                return get_msgpack_object(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x0Fu));
+
+            // fixarray
+            case 0x90:
+            case 0x91:
+            case 0x92:
+            case 0x93:
+            case 0x94:
+            case 0x95:
+            case 0x96:
+            case 0x97:
+            case 0x98:
+            case 0x99:
+            case 0x9A:
+            case 0x9B:
+            case 0x9C:
+            case 0x9D:
+            case 0x9E:
+            case 0x9F:
+                return get_msgpack_array(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x0Fu));
+
+            // fixstr
+            case 0xA0:
+            case 0xA1:
+            case 0xA2:
+            case 0xA3:
+            case 0xA4:
+            case 0xA5:
+            case 0xA6:
+            case 0xA7:
+            case 0xA8:
+            case 0xA9:
+            case 0xAA:
+            case 0xAB:
+            case 0xAC:
+            case 0xAD:
+            case 0xAE:
+            case 0xAF:
+            case 0xB0:
+            case 0xB1:
+            case 0xB2:
+            case 0xB3:
+            case 0xB4:
+            case 0xB5:
+            case 0xB6:
+            case 0xB7:
+            case 0xB8:
+            case 0xB9:
+            case 0xBA:
+            case 0xBB:
+            case 0xBC:
+            case 0xBD:
+            case 0xBE:
+            case 0xBF:
+            case 0xD9: // str 8
+            case 0xDA: // str 16
+            case 0xDB: // str 32
+            {
+                string_t s;
+                return get_msgpack_string(s) && sax->string(s);
+            }
+
+            case 0xC0: // nil
+                return sax->null();
+
+            case 0xC2: // false
+                return sax->boolean(false);
+
+            case 0xC3: // true
+                return sax->boolean(true);
+
+            case 0xC4: // bin 8
+            case 0xC5: // bin 16
+            case 0xC6: // bin 32
+            case 0xC7: // ext 8
+            case 0xC8: // ext 16
+            case 0xC9: // ext 32
+            case 0xD4: // fixext 1
+            case 0xD5: // fixext 2
+            case 0xD6: // fixext 4
+            case 0xD7: // fixext 8
+            case 0xD8: // fixext 16
+            {
+                binary_t b;
+                return get_msgpack_binary(b) && sax->binary(b);
+            }
+
+            case 0xCA: // float 32
+            {
+                float number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 0xCB: // float 64
+            {
+                double number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 0xCC: // uint 8
+            {
+                std::uint8_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number);
+            }
+
+            case 0xCD: // uint 16
+            {
+                std::uint16_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number);
+            }
+
+            case 0xCE: // uint 32
+            {
+                std::uint32_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number);
+            }
+
+            case 0xCF: // uint 64
+            {
+                std::uint64_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number);
+            }
+
+            case 0xD0: // int 8
+            {
+                std::int8_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_integer(number);
+            }
+
+            case 0xD1: // int 16
+            {
+                std::int16_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_integer(number);
+            }
+
+            case 0xD2: // int 32
+            {
+                std::int32_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_integer(number);
+            }
+
+            case 0xD3: // int 64
+            {
+                std::int64_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_integer(number);
+            }
+
+            case 0xDC: // array 16
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::msgpack, len) && get_msgpack_array(static_cast<std::size_t>(len));
+            }
+
+            case 0xDD: // array 32
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::msgpack, len) && get_msgpack_array(static_cast<std::size_t>(len));
+            }
+
+            case 0xDE: // map 16
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::msgpack, len) && get_msgpack_object(static_cast<std::size_t>(len));
+            }
+
+            case 0xDF: // map 32
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::msgpack, len) && get_msgpack_object(static_cast<std::size_t>(len));
+            }
+
+            // negative fixint
+            case 0xE0:
+            case 0xE1:
+            case 0xE2:
+            case 0xE3:
+            case 0xE4:
+            case 0xE5:
+            case 0xE6:
+            case 0xE7:
+            case 0xE8:
+            case 0xE9:
+            case 0xEA:
+            case 0xEB:
+            case 0xEC:
+            case 0xED:
+            case 0xEE:
+            case 0xEF:
+            case 0xF0:
+            case 0xF1:
+            case 0xF2:
+            case 0xF3:
+            case 0xF4:
+            case 0xF5:
+            case 0xF6:
+            case 0xF7:
+            case 0xF8:
+            case 0xF9:
+            case 0xFA:
+            case 0xFB:
+            case 0xFC:
+            case 0xFD:
+            case 0xFE:
+            case 0xFF:
+                return sax->number_integer(static_cast<std::int8_t>(current));
+
+            default: // anything else
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::msgpack, "invalid byte: 0x" + last_token, "value"), BasicJsonType()));
+            }
+        }
+    }
+
+    /*!
+    @brief reads a MessagePack string
+
+    This function first reads starting bytes to determine the expected
+    string length and then copies this number of bytes into a string.
+
+    @param[out] result  created string
+
+    @return whether string creation completed
+    */
+    bool get_msgpack_string(string_t& result)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::msgpack, "string")))
+        {
+            return false;
+        }
+
+        switch (current)
+        {
+            // fixstr
+            case 0xA0:
+            case 0xA1:
+            case 0xA2:
+            case 0xA3:
+            case 0xA4:
+            case 0xA5:
+            case 0xA6:
+            case 0xA7:
+            case 0xA8:
+            case 0xA9:
+            case 0xAA:
+            case 0xAB:
+            case 0xAC:
+            case 0xAD:
+            case 0xAE:
+            case 0xAF:
+            case 0xB0:
+            case 0xB1:
+            case 0xB2:
+            case 0xB3:
+            case 0xB4:
+            case 0xB5:
+            case 0xB6:
+            case 0xB7:
+            case 0xB8:
+            case 0xB9:
+            case 0xBA:
+            case 0xBB:
+            case 0xBC:
+            case 0xBD:
+            case 0xBE:
+            case 0xBF:
+            {
+                return get_string(input_format_t::msgpack, static_cast<unsigned int>(current) & 0x1Fu, result);
+            }
+
+            case 0xD9: // str 8
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::msgpack, len) && get_string(input_format_t::msgpack, len, result);
+            }
+
+            case 0xDA: // str 16
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::msgpack, len) && get_string(input_format_t::msgpack, len, result);
+            }
+
+            case 0xDB: // str 32
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::msgpack, len) && get_string(input_format_t::msgpack, len, result);
+            }
+
+            default:
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::msgpack, "expected length specification (0xA0-0xBF, 0xD9-0xDB); last byte: 0x" + last_token, "string"), BasicJsonType()));
+            }
+        }
+    }
+
+    /*!
+    @brief reads a MessagePack byte array
+
+    This function first reads starting bytes to determine the expected
+    byte array length and then copies this number of bytes into a byte array.
+
+    @param[out] result  created byte array
+
+    @return whether byte array creation completed
+    */
+    bool get_msgpack_binary(binary_t& result)
+    {
+        // helper function to set the subtype
+        auto assign_and_return_true = [&result](std::int8_t subtype)
+        {
+            result.set_subtype(static_cast<std::uint8_t>(subtype));
+            return true;
+        };
+
+        switch (current)
+        {
+            case 0xC4: // bin 8
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::msgpack, len) &&
+                       get_binary(input_format_t::msgpack, len, result);
+            }
+
+            case 0xC5: // bin 16
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::msgpack, len) &&
+                       get_binary(input_format_t::msgpack, len, result);
+            }
+
+            case 0xC6: // bin 32
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::msgpack, len) &&
+                       get_binary(input_format_t::msgpack, len, result);
+            }
+
+            case 0xC7: // ext 8
+            {
+                std::uint8_t len{};
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, len) &&
+                       get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, len, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xC8: // ext 16
+            {
+                std::uint16_t len{};
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, len) &&
+                       get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, len, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xC9: // ext 32
+            {
+                std::uint32_t len{};
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, len) &&
+                       get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, len, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xD4: // fixext 1
+            {
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, 1, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xD5: // fixext 2
+            {
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, 2, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xD6: // fixext 4
+            {
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, 4, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xD7: // fixext 8
+            {
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, 8, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xD8: // fixext 16
+            {
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, 16, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            default:           // LCOV_EXCL_LINE
+                return false;  // LCOV_EXCL_LINE
+        }
+    }
+
+    /*!
+    @param[in] len  the length of the array
+    @return whether array creation completed
+    */
+    bool get_msgpack_array(const std::size_t len)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(len)))
+        {
+            return false;
+        }
+
+        for (std::size_t i = 0; i < len; ++i)
+        {
+            if (JSON_HEDLEY_UNLIKELY(!parse_msgpack_internal()))
+            {
+                return false;
+            }
+        }
+
+        return sax->end_array();
+    }
+
+    /*!
+    @param[in] len  the length of the object
+    @return whether object creation completed
+    */
+    bool get_msgpack_object(const std::size_t len)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(len)))
+        {
+            return false;
+        }
+
+        string_t key;
+        for (std::size_t i = 0; i < len; ++i)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(!get_msgpack_string(key) || !sax->key(key)))
+            {
+                return false;
+            }
+
+            if (JSON_HEDLEY_UNLIKELY(!parse_msgpack_internal()))
+            {
+                return false;
+            }
+            key.clear();
+        }
+
+        return sax->end_object();
+    }
+
+    ////////////
+    // UBJSON //
+    ////////////
+
+    /*!
+    @param[in] get_char  whether a new character should be retrieved from the
+                         input (true, default) or whether the last read
+                         character should be considered instead
+
+    @return whether a valid UBJSON value was passed to the SAX parser
+    */
+    bool parse_ubjson_internal(const bool get_char = true)
+    {
+        return get_ubjson_value(get_char ? get_ignore_noop() : current);
+    }
+
+    /*!
+    @brief reads a UBJSON string
+
+    This function is either called after reading the 'S' byte explicitly
+    indicating a string, or in case of an object key where the 'S' byte can be
+    left out.
+
+    @param[out] result   created string
+    @param[in] get_char  whether a new character should be retrieved from the
+                         input (true, default) or whether the last read
+                         character should be considered instead
+
+    @return whether string creation completed
+    */
+    bool get_ubjson_string(string_t& result, const bool get_char = true)
+    {
+        if (get_char)
+        {
+            get();  // TODO(niels): may we ignore N here?
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "value")))
+        {
+            return false;
+        }
+
+        switch (current)
+        {
+            case 'U':
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result);
+            }
+
+            case 'i':
+            {
+                std::int8_t len{};
+                return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result);
+            }
+
+            case 'I':
+            {
+                std::int16_t len{};
+                return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result);
+            }
+
+            case 'l':
+            {
+                std::int32_t len{};
+                return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result);
+            }
+
+            case 'L':
+            {
+                std::int64_t len{};
+                return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result);
+            }
+
+            default:
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "expected length type specification (U, i, I, l, L); last byte: 0x" + last_token, "string"), BasicJsonType()));
+        }
+    }
+
+    /*!
+    @param[out] result  determined size
+    @return whether size determination completed
+    */
+    bool get_ubjson_size_value(std::size_t& result)
+    {
+        switch (get_ignore_noop())
+        {
+            case 'U':
+            {
+                std::uint8_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number)))
+                {
+                    return false;
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'i':
+            {
+                std::int8_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number)))
+                {
+                    return false;
+                }
+                result = static_cast<std::size_t>(number); // NOLINT(bugprone-signed-char-misuse,cert-str34-c): number is not a char
+                return true;
+            }
+
+            case 'I':
+            {
+                std::int16_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number)))
+                {
+                    return false;
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'l':
+            {
+                std::int32_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number)))
+                {
+                    return false;
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'L':
+            {
+                std::int64_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number)))
+                {
+                    return false;
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            default:
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "expected length type specification (U, i, I, l, L) after '#'; last byte: 0x" + last_token, "size"), BasicJsonType()));
+            }
+        }
+    }
+
+    /*!
+    @brief determine the type and size for a container
+
+    In the optimized UBJSON format, a type and a size can be provided to allow
+    for a more compact representation.
+
+    @param[out] result  pair of the size and the type
+
+    @return whether pair creation completed
+    */
+    bool get_ubjson_size_type(std::pair<std::size_t, char_int_type>& result)
+    {
+        result.first = string_t::npos; // size
+        result.second = 0; // type
+
+        get_ignore_noop();
+
+        if (current == '$')
+        {
+            result.second = get();  // must not ignore 'N', because 'N' maybe the type
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "type")))
+            {
+                return false;
+            }
+
+            get_ignore_noop();
+            if (JSON_HEDLEY_UNLIKELY(current != '#'))
+            {
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "value")))
+                {
+                    return false;
+                }
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::ubjson, "expected '#' after type information; last byte: 0x" + last_token, "size"), BasicJsonType()));
+            }
+
+            return get_ubjson_size_value(result.first);
+        }
+
+        if (current == '#')
+        {
+            return get_ubjson_size_value(result.first);
+        }
+
+        return true;
+    }
+
+    /*!
+    @param prefix  the previously read or set type prefix
+    @return whether value creation completed
+    */
+    bool get_ubjson_value(const char_int_type prefix)
+    {
+        switch (prefix)
+        {
+            case std::char_traits<char_type>::eof():  // EOF
+                return unexpect_eof(input_format_t::ubjson, "value");
+
+            case 'T':  // true
+                return sax->boolean(true);
+            case 'F':  // false
+                return sax->boolean(false);
+
+            case 'Z':  // null
+                return sax->null();
+
+            case 'U':
+            {
+                std::uint8_t number{};
+                return get_number(input_format_t::ubjson, number) && sax->number_unsigned(number);
+            }
+
+            case 'i':
+            {
+                std::int8_t number{};
+                return get_number(input_format_t::ubjson, number) && sax->number_integer(number);
+            }
+
+            case 'I':
+            {
+                std::int16_t number{};
+                return get_number(input_format_t::ubjson, number) && sax->number_integer(number);
+            }
+
+            case 'l':
+            {
+                std::int32_t number{};
+                return get_number(input_format_t::ubjson, number) && sax->number_integer(number);
+            }
+
+            case 'L':
+            {
+                std::int64_t number{};
+                return get_number(input_format_t::ubjson, number) && sax->number_integer(number);
+            }
+
+            case 'd':
+            {
+                float number{};
+                return get_number(input_format_t::ubjson, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 'D':
+            {
+                double number{};
+                return get_number(input_format_t::ubjson, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 'H':
+            {
+                return get_ubjson_high_precision_number();
+            }
+
+            case 'C':  // char
+            {
+                get();
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "char")))
+                {
+                    return false;
+                }
+                if (JSON_HEDLEY_UNLIKELY(current > 127))
+                {
+                    auto last_token = get_token_string();
+                    return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "byte after 'C' must be in range 0x00..0x7F; last byte: 0x" + last_token, "char"), BasicJsonType()));
+                }
+                string_t s(1, static_cast<typename string_t::value_type>(current));
+                return sax->string(s);
+            }
+
+            case 'S':  // string
+            {
+                string_t s;
+                return get_ubjson_string(s) && sax->string(s);
+            }
+
+            case '[':  // array
+                return get_ubjson_array();
+
+            case '{':  // object
+                return get_ubjson_object();
+
+            default: // anything else
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::ubjson, "invalid byte: 0x" + last_token, "value"), BasicJsonType()));
+            }
+        }
+    }
+
+    /*!
+    @return whether array creation completed
+    */
+    bool get_ubjson_array()
+    {
+        std::pair<std::size_t, char_int_type> size_and_type;
+        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_type(size_and_type)))
+        {
+            return false;
+        }
+
+        if (size_and_type.first != string_t::npos)
+        {
+            if (JSON_HEDLEY_UNLIKELY(!sax->start_array(size_and_type.first)))
+            {
+                return false;
+            }
+
+            if (size_and_type.second != 0)
+            {
+                if (size_and_type.second != 'N')
+                {
+                    for (std::size_t i = 0; i < size_and_type.first; ++i)
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_value(size_and_type.second)))
+                        {
+                            return false;
+                        }
+                    }
+                }
+            }
+            else
+            {
+                for (std::size_t i = 0; i < size_and_type.first; ++i)
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal()))
+                    {
+                        return false;
+                    }
+                }
+            }
+        }
+        else
+        {
+            if (JSON_HEDLEY_UNLIKELY(!sax->start_array(static_cast<std::size_t>(-1))))
+            {
+                return false;
+            }
+
+            while (current != ']')
+            {
+                if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal(false)))
+                {
+                    return false;
+                }
+                get_ignore_noop();
+            }
+        }
+
+        return sax->end_array();
+    }
+
+    /*!
+    @return whether object creation completed
+    */
+    bool get_ubjson_object()
+    {
+        std::pair<std::size_t, char_int_type> size_and_type;
+        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_type(size_and_type)))
+        {
+            return false;
+        }
+
+        string_t key;
+        if (size_and_type.first != string_t::npos)
+        {
+            if (JSON_HEDLEY_UNLIKELY(!sax->start_object(size_and_type.first)))
+            {
+                return false;
+            }
+
+            if (size_and_type.second != 0)
+            {
+                for (std::size_t i = 0; i < size_and_type.first; ++i)
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!get_ubjson_string(key) || !sax->key(key)))
+                    {
+                        return false;
+                    }
+                    if (JSON_HEDLEY_UNLIKELY(!get_ubjson_value(size_and_type.second)))
+                    {
+                        return false;
+                    }
+                    key.clear();
+                }
+            }
+            else
+            {
+                for (std::size_t i = 0; i < size_and_type.first; ++i)
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!get_ubjson_string(key) || !sax->key(key)))
+                    {
+                        return false;
+                    }
+                    if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal()))
+                    {
+                        return false;
+                    }
+                    key.clear();
+                }
+            }
+        }
+        else
+        {
+            if (JSON_HEDLEY_UNLIKELY(!sax->start_object(static_cast<std::size_t>(-1))))
+            {
+                return false;
+            }
+
+            while (current != '}')
+            {
+                if (JSON_HEDLEY_UNLIKELY(!get_ubjson_string(key, false) || !sax->key(key)))
+                {
+                    return false;
+                }
+                if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal()))
+                {
+                    return false;
+                }
+                get_ignore_noop();
+                key.clear();
+            }
+        }
+
+        return sax->end_object();
+    }
+
+    // Note, no reader for UBJSON binary types is implemented because they do
+    // not exist
+
+    bool get_ubjson_high_precision_number()
+    {
+        // get size of following number string
+        std::size_t size{};
+        auto res = get_ubjson_size_value(size);
+        if (JSON_HEDLEY_UNLIKELY(!res))
+        {
+            return res;
+        }
+
+        // get number string
+        std::vector<char> number_vector;
+        for (std::size_t i = 0; i < size; ++i)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "number")))
+            {
+                return false;
+            }
+            number_vector.push_back(static_cast<char>(current));
+        }
+
+        // parse number string
+        using ia_type = decltype(detail::input_adapter(number_vector));
+        auto number_lexer = detail::lexer<BasicJsonType, ia_type>(detail::input_adapter(number_vector), false);
+        const auto result_number = number_lexer.scan();
+        const auto number_string = number_lexer.get_token_string();
+        const auto result_remainder = number_lexer.scan();
+
+        using token_type = typename detail::lexer_base<BasicJsonType>::token_type;
+
+        if (JSON_HEDLEY_UNLIKELY(result_remainder != token_type::end_of_input))
+        {
+            return sax->parse_error(chars_read, number_string, parse_error::create(115, chars_read, exception_message(input_format_t::ubjson, "invalid number text: " + number_lexer.get_token_string(), "high-precision number"), BasicJsonType()));
+        }
+
+        switch (result_number)
+        {
+            case token_type::value_integer:
+                return sax->number_integer(number_lexer.get_number_integer());
+            case token_type::value_unsigned:
+                return sax->number_unsigned(number_lexer.get_number_unsigned());
+            case token_type::value_float:
+                return sax->number_float(number_lexer.get_number_float(), std::move(number_string));
+            case token_type::uninitialized:
+            case token_type::literal_true:
+            case token_type::literal_false:
+            case token_type::literal_null:
+            case token_type::value_string:
+            case token_type::begin_array:
+            case token_type::begin_object:
+            case token_type::end_array:
+            case token_type::end_object:
+            case token_type::name_separator:
+            case token_type::value_separator:
+            case token_type::parse_error:
+            case token_type::end_of_input:
+            case token_type::literal_or_value:
+            default:
+                return sax->parse_error(chars_read, number_string, parse_error::create(115, chars_read, exception_message(input_format_t::ubjson, "invalid number text: " + number_lexer.get_token_string(), "high-precision number"), BasicJsonType()));
+        }
+    }
+
+    ///////////////////////
+    // Utility functions //
+    ///////////////////////
+
+    /*!
+    @brief get next character from the input
+
+    This function provides the interface to the used input adapter. It does
+    not throw in case the input reached EOF, but returns a -'ve valued
+    `std::char_traits<char_type>::eof()` in that case.
+
+    @return character read from the input
+    */
+    char_int_type get()
+    {
+        ++chars_read;
+        return current = ia.get_character();
+    }
+
+    /*!
+    @return character read from the input after ignoring all 'N' entries
+    */
+    char_int_type get_ignore_noop()
+    {
+        do
+        {
+            get();
+        }
+        while (current == 'N');
+
+        return current;
+    }
+
+    /*
+    @brief read a number from the input
+
+    @tparam NumberType the type of the number
+    @param[in] format   the current format (for diagnostics)
+    @param[out] result  number of type @a NumberType
+
+    @return whether conversion completed
+
+    @note This function needs to respect the system's endianness, because
+          bytes in CBOR, MessagePack, and UBJSON are stored in network order
+          (big endian) and therefore need reordering on little endian systems.
+    */
+    template<typename NumberType, bool InputIsLittleEndian = false>
+    bool get_number(const input_format_t format, NumberType& result)
+    {
+        // step 1: read input into array with system's byte order
+        std::array<std::uint8_t, sizeof(NumberType)> vec{};
+        for (std::size_t i = 0; i < sizeof(NumberType); ++i)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(format, "number")))
+            {
+                return false;
+            }
+
+            // reverse byte order prior to conversion if necessary
+            if (is_little_endian != InputIsLittleEndian)
+            {
+                vec[sizeof(NumberType) - i - 1] = static_cast<std::uint8_t>(current);
+            }
+            else
+            {
+                vec[i] = static_cast<std::uint8_t>(current); // LCOV_EXCL_LINE
+            }
+        }
+
+        // step 2: convert array into number of type T and return
+        std::memcpy(&result, vec.data(), sizeof(NumberType));
+        return true;
+    }
+
+    /*!
+    @brief create a string by reading characters from the input
+
+    @tparam NumberType the type of the number
+    @param[in] format the current format (for diagnostics)
+    @param[in] len number of characters to read
+    @param[out] result string created by reading @a len bytes
+
+    @return whether string creation completed
+
+    @note We can not reserve @a len bytes for the result, because @a len
+          may be too large. Usually, @ref unexpect_eof() detects the end of
+          the input before we run out of string memory.
+    */
+    template<typename NumberType>
+    bool get_string(const input_format_t format,
+                    const NumberType len,
+                    string_t& result)
+    {
+        bool success = true;
+        for (NumberType i = 0; i < len; i++)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(format, "string")))
+            {
+                success = false;
+                break;
+            }
+            result.push_back(static_cast<typename string_t::value_type>(current));
+        }
+        return success;
+    }
+
+    /*!
+    @brief create a byte array by reading bytes from the input
+
+    @tparam NumberType the type of the number
+    @param[in] format the current format (for diagnostics)
+    @param[in] len number of bytes to read
+    @param[out] result byte array created by reading @a len bytes
+
+    @return whether byte array creation completed
+
+    @note We can not reserve @a len bytes for the result, because @a len
+          may be too large. Usually, @ref unexpect_eof() detects the end of
+          the input before we run out of memory.
+    */
+    template<typename NumberType>
+    bool get_binary(const input_format_t format,
+                    const NumberType len,
+                    binary_t& result)
+    {
+        bool success = true;
+        for (NumberType i = 0; i < len; i++)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(format, "binary")))
+            {
+                success = false;
+                break;
+            }
+            result.push_back(static_cast<std::uint8_t>(current));
+        }
+        return success;
+    }
+
+    /*!
+    @param[in] format   the current format (for diagnostics)
+    @param[in] context  further context information (for diagnostics)
+    @return whether the last read character is not EOF
+    */
+    JSON_HEDLEY_NON_NULL(3)
+    bool unexpect_eof(const input_format_t format, const char* context) const
+    {
+        if (JSON_HEDLEY_UNLIKELY(current == std::char_traits<char_type>::eof()))
+        {
+            return sax->parse_error(chars_read, "<end of file>",
+                                    parse_error::create(110, chars_read, exception_message(format, "unexpected end of input", context), BasicJsonType()));
+        }
+        return true;
+    }
+
+    /*!
+    @return a string representation of the last read byte
+    */
+    std::string get_token_string() const
+    {
+        std::array<char, 3> cr{{}};
+        static_cast<void>((std::snprintf)(cr.data(), cr.size(), "%.2hhX", static_cast<unsigned char>(current))); // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+        return std::string{cr.data()};
+    }
+
+    /*!
+    @param[in] format   the current format
+    @param[in] detail   a detailed error message
+    @param[in] context  further context information
+    @return a message string to use in the parse_error exceptions
+    */
+    std::string exception_message(const input_format_t format,
+                                  const std::string& detail,
+                                  const std::string& context) const
+    {
+        std::string error_msg = "syntax error while parsing ";
+
+        switch (format)
+        {
+            case input_format_t::cbor:
+                error_msg += "CBOR";
+                break;
+
+            case input_format_t::msgpack:
+                error_msg += "MessagePack";
+                break;
+
+            case input_format_t::ubjson:
+                error_msg += "UBJSON";
+                break;
+
+            case input_format_t::bson:
+                error_msg += "BSON";
+                break;
+
+            case input_format_t::json: // LCOV_EXCL_LINE
+            default:            // LCOV_EXCL_LINE
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+        }
+
+        return error_msg + " " + context + ": " + detail;
+    }
+
+  private:
+    /// input adapter
+    InputAdapterType ia;
+
+    /// the current character
+    char_int_type current = std::char_traits<char_type>::eof();
+
+    /// the number of characters read
+    std::size_t chars_read = 0;
+
+    /// whether we can assume little endianness
+    const bool is_little_endian = little_endianness();
+
+    /// the SAX parser
+    json_sax_t* sax = nullptr;
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/input/input_adapters.hpp>
+
+// #include <nlohmann/detail/input/lexer.hpp>
+
+// #include <nlohmann/detail/input/parser.hpp>
+
+
+#include <cmath> // isfinite
+#include <cstdint> // uint8_t
+#include <functional> // function
+#include <string> // string
+#include <utility> // move
+#include <vector> // vector
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/input/input_adapters.hpp>
+
+// #include <nlohmann/detail/input/json_sax.hpp>
+
+// #include <nlohmann/detail/input/lexer.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/is_sax.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+////////////
+// parser //
+////////////
+
+enum class parse_event_t : std::uint8_t
+{
+    /// the parser read `{` and started to process a JSON object
+    object_start,
+    /// the parser read `}` and finished processing a JSON object
+    object_end,
+    /// the parser read `[` and started to process a JSON array
+    array_start,
+    /// the parser read `]` and finished processing a JSON array
+    array_end,
+    /// the parser read a key of a value in an object
+    key,
+    /// the parser finished reading a JSON value
+    value
+};
+
+template<typename BasicJsonType>
+using parser_callback_t =
+    std::function<bool(int /*depth*/, parse_event_t /*event*/, BasicJsonType& /*parsed*/)>;
+
+/*!
+@brief syntax analysis
+
+This class implements a recursive descent parser.
+*/
+template<typename BasicJsonType, typename InputAdapterType>
+class parser
+{
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using lexer_t = lexer<BasicJsonType, InputAdapterType>;
+    using token_type = typename lexer_t::token_type;
+
+  public:
+    /// a parser reading from an input adapter
+    explicit parser(InputAdapterType&& adapter,
+                    const parser_callback_t<BasicJsonType> cb = nullptr,
+                    const bool allow_exceptions_ = true,
+                    const bool skip_comments = false)
+        : callback(cb)
+        , m_lexer(std::move(adapter), skip_comments)
+        , allow_exceptions(allow_exceptions_)
+    {
+        // read first token
+        get_token();
+    }
+
+    /*!
+    @brief public parser interface
+
+    @param[in] strict      whether to expect the last token to be EOF
+    @param[in,out] result  parsed JSON value
+
+    @throw parse_error.101 in case of an unexpected token
+    @throw parse_error.102 if to_unicode fails or surrogate error
+    @throw parse_error.103 if to_unicode fails
+    */
+    void parse(const bool strict, BasicJsonType& result)
+    {
+        if (callback)
+        {
+            json_sax_dom_callback_parser<BasicJsonType> sdp(result, callback, allow_exceptions);
+            sax_parse_internal(&sdp);
+
+            // in strict mode, input must be completely read
+            if (strict && (get_token() != token_type::end_of_input))
+            {
+                sdp.parse_error(m_lexer.get_position(),
+                                m_lexer.get_token_string(),
+                                parse_error::create(101, m_lexer.get_position(),
+                                                    exception_message(token_type::end_of_input, "value"), BasicJsonType()));
+            }
+
+            // in case of an error, return discarded value
+            if (sdp.is_errored())
+            {
+                result = value_t::discarded;
+                return;
+            }
+
+            // set top-level value to null if it was discarded by the callback
+            // function
+            if (result.is_discarded())
+            {
+                result = nullptr;
+            }
+        }
+        else
+        {
+            json_sax_dom_parser<BasicJsonType> sdp(result, allow_exceptions);
+            sax_parse_internal(&sdp);
+
+            // in strict mode, input must be completely read
+            if (strict && (get_token() != token_type::end_of_input))
+            {
+                sdp.parse_error(m_lexer.get_position(),
+                                m_lexer.get_token_string(),
+                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input, "value"), BasicJsonType()));
+            }
+
+            // in case of an error, return discarded value
+            if (sdp.is_errored())
+            {
+                result = value_t::discarded;
+                return;
+            }
+        }
+
+        result.assert_invariant();
+    }
+
+    /*!
+    @brief public accept interface
+
+    @param[in] strict  whether to expect the last token to be EOF
+    @return whether the input is a proper JSON text
+    */
+    bool accept(const bool strict = true)
+    {
+        json_sax_acceptor<BasicJsonType> sax_acceptor;
+        return sax_parse(&sax_acceptor, strict);
+    }
+
+    template<typename SAX>
+    JSON_HEDLEY_NON_NULL(2)
+    bool sax_parse(SAX* sax, const bool strict = true)
+    {
+        (void)detail::is_sax_static_asserts<SAX, BasicJsonType> {};
+        const bool result = sax_parse_internal(sax);
+
+        // strict mode: next byte must be EOF
+        if (result && strict && (get_token() != token_type::end_of_input))
+        {
+            return sax->parse_error(m_lexer.get_position(),
+                                    m_lexer.get_token_string(),
+                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input, "value"), BasicJsonType()));
+        }
+
+        return result;
+    }
+
+  private:
+    template<typename SAX>
+    JSON_HEDLEY_NON_NULL(2)
+    bool sax_parse_internal(SAX* sax)
+    {
+        // stack to remember the hierarchy of structured values we are parsing
+        // true = array; false = object
+        std::vector<bool> states;
+        // value to avoid a goto (see comment where set to true)
+        bool skip_to_state_evaluation = false;
+
+        while (true)
+        {
+            if (!skip_to_state_evaluation)
+            {
+                // invariant: get_token() was called before each iteration
+                switch (last_token)
+                {
+                    case token_type::begin_object:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(static_cast<std::size_t>(-1))))
+                        {
+                            return false;
+                        }
+
+                        // closing } -> we are done
+                        if (get_token() == token_type::end_object)
+                        {
+                            if (JSON_HEDLEY_UNLIKELY(!sax->end_object()))
+                            {
+                                return false;
+                            }
+                            break;
+                        }
+
+                        // parse key
+                        if (JSON_HEDLEY_UNLIKELY(last_token != token_type::value_string))
+                        {
+                            return sax->parse_error(m_lexer.get_position(),
+                                                    m_lexer.get_token_string(),
+                                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::value_string, "object key"), BasicJsonType()));
+                        }
+                        if (JSON_HEDLEY_UNLIKELY(!sax->key(m_lexer.get_string())))
+                        {
+                            return false;
+                        }
+
+                        // parse separator (:)
+                        if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::name_separator))
+                        {
+                            return sax->parse_error(m_lexer.get_position(),
+                                                    m_lexer.get_token_string(),
+                                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::name_separator, "object separator"), BasicJsonType()));
+                        }
+
+                        // remember we are now inside an object
+                        states.push_back(false);
+
+                        // parse values
+                        get_token();
+                        continue;
+                    }
+
+                    case token_type::begin_array:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(static_cast<std::size_t>(-1))))
+                        {
+                            return false;
+                        }
+
+                        // closing ] -> we are done
+                        if (get_token() == token_type::end_array)
+                        {
+                            if (JSON_HEDLEY_UNLIKELY(!sax->end_array()))
+                            {
+                                return false;
+                            }
+                            break;
+                        }
+
+                        // remember we are now inside an array
+                        states.push_back(true);
+
+                        // parse values (no need to call get_token)
+                        continue;
+                    }
+
+                    case token_type::value_float:
+                    {
+                        const auto res = m_lexer.get_number_float();
+
+                        if (JSON_HEDLEY_UNLIKELY(!std::isfinite(res)))
+                        {
+                            return sax->parse_error(m_lexer.get_position(),
+                                                    m_lexer.get_token_string(),
+                                                    out_of_range::create(406, "number overflow parsing '" + m_lexer.get_token_string() + "'", BasicJsonType()));
+                        }
+
+                        if (JSON_HEDLEY_UNLIKELY(!sax->number_float(res, m_lexer.get_string())))
+                        {
+                            return false;
+                        }
+
+                        break;
+                    }
+
+                    case token_type::literal_false:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->boolean(false)))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::literal_null:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->null()))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::literal_true:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->boolean(true)))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::value_integer:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->number_integer(m_lexer.get_number_integer())))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::value_string:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->string(m_lexer.get_string())))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::value_unsigned:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->number_unsigned(m_lexer.get_number_unsigned())))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::parse_error:
+                    {
+                        // using "uninitialized" to avoid "expected" message
+                        return sax->parse_error(m_lexer.get_position(),
+                                                m_lexer.get_token_string(),
+                                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::uninitialized, "value"), BasicJsonType()));
+                    }
+
+                    case token_type::uninitialized:
+                    case token_type::end_array:
+                    case token_type::end_object:
+                    case token_type::name_separator:
+                    case token_type::value_separator:
+                    case token_type::end_of_input:
+                    case token_type::literal_or_value:
+                    default: // the last token was unexpected
+                    {
+                        return sax->parse_error(m_lexer.get_position(),
+                                                m_lexer.get_token_string(),
+                                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::literal_or_value, "value"), BasicJsonType()));
+                    }
+                }
+            }
+            else
+            {
+                skip_to_state_evaluation = false;
+            }
+
+            // we reached this line after we successfully parsed a value
+            if (states.empty())
+            {
+                // empty stack: we reached the end of the hierarchy: done
+                return true;
+            }
+
+            if (states.back())  // array
+            {
+                // comma -> next value
+                if (get_token() == token_type::value_separator)
+                {
+                    // parse a new value
+                    get_token();
+                    continue;
+                }
+
+                // closing ]
+                if (JSON_HEDLEY_LIKELY(last_token == token_type::end_array))
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!sax->end_array()))
+                    {
+                        return false;
+                    }
+
+                    // We are done with this array. Before we can parse a
+                    // new value, we need to evaluate the new state first.
+                    // By setting skip_to_state_evaluation to false, we
+                    // are effectively jumping to the beginning of this if.
+                    JSON_ASSERT(!states.empty());
+                    states.pop_back();
+                    skip_to_state_evaluation = true;
+                    continue;
+                }
+
+                return sax->parse_error(m_lexer.get_position(),
+                                        m_lexer.get_token_string(),
+                                        parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_array, "array"), BasicJsonType()));
+            }
+
+            // states.back() is false -> object
+
+            // comma -> next value
+            if (get_token() == token_type::value_separator)
+            {
+                // parse key
+                if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::value_string))
+                {
+                    return sax->parse_error(m_lexer.get_position(),
+                                            m_lexer.get_token_string(),
+                                            parse_error::create(101, m_lexer.get_position(), exception_message(token_type::value_string, "object key"), BasicJsonType()));
+                }
+
+                if (JSON_HEDLEY_UNLIKELY(!sax->key(m_lexer.get_string())))
+                {
+                    return false;
+                }
+
+                // parse separator (:)
+                if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::name_separator))
+                {
+                    return sax->parse_error(m_lexer.get_position(),
+                                            m_lexer.get_token_string(),
+                                            parse_error::create(101, m_lexer.get_position(), exception_message(token_type::name_separator, "object separator"), BasicJsonType()));
+                }
+
+                // parse values
+                get_token();
+                continue;
+            }
+
+            // closing }
+            if (JSON_HEDLEY_LIKELY(last_token == token_type::end_object))
+            {
+                if (JSON_HEDLEY_UNLIKELY(!sax->end_object()))
+                {
+                    return false;
+                }
+
+                // We are done with this object. Before we can parse a
+                // new value, we need to evaluate the new state first.
+                // By setting skip_to_state_evaluation to false, we
+                // are effectively jumping to the beginning of this if.
+                JSON_ASSERT(!states.empty());
+                states.pop_back();
+                skip_to_state_evaluation = true;
+                continue;
+            }
+
+            return sax->parse_error(m_lexer.get_position(),
+                                    m_lexer.get_token_string(),
+                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_object, "object"), BasicJsonType()));
+        }
+    }
+
+    /// get next token from lexer
+    token_type get_token()
+    {
+        return last_token = m_lexer.scan();
+    }
+
+    std::string exception_message(const token_type expected, const std::string& context)
+    {
+        std::string error_msg = "syntax error ";
+
+        if (!context.empty())
+        {
+            error_msg += "while parsing " + context + " ";
+        }
+
+        error_msg += "- ";
+
+        if (last_token == token_type::parse_error)
+        {
+            error_msg += std::string(m_lexer.get_error_message()) + "; last read: '" +
+                         m_lexer.get_token_string() + "'";
+        }
+        else
+        {
+            error_msg += "unexpected " + std::string(lexer_t::token_type_name(last_token));
+        }
+
+        if (expected != token_type::uninitialized)
+        {
+            error_msg += "; expected " + std::string(lexer_t::token_type_name(expected));
+        }
+
+        return error_msg;
+    }
+
+  private:
+    /// callback function
+    const parser_callback_t<BasicJsonType> callback = nullptr;
+    /// the type of the last read token
+    token_type last_token = token_type::uninitialized;
+    /// the lexer
+    lexer_t m_lexer;
+    /// whether to throw exceptions in case of errors
+    const bool allow_exceptions = true;
+};
+
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/iterators/internal_iterator.hpp>
+
+
+// #include <nlohmann/detail/iterators/primitive_iterator.hpp>
+
+
+#include <cstddef> // ptrdiff_t
+#include <limits>  // numeric_limits
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+/*
+@brief an iterator for primitive JSON types
+
+This class models an iterator for primitive JSON types (boolean, number,
+string). It's only purpose is to allow the iterator/const_iterator classes
+to "iterate" over primitive values. Internally, the iterator is modeled by
+a `difference_type` variable. Value begin_value (`0`) models the begin,
+end_value (`1`) models past the end.
+*/
+class primitive_iterator_t
+{
+  private:
+    using difference_type = std::ptrdiff_t;
+    static constexpr difference_type begin_value = 0;
+    static constexpr difference_type end_value = begin_value + 1;
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    /// iterator as signed integer type
+    difference_type m_it = (std::numeric_limits<std::ptrdiff_t>::min)();
+
+  public:
+    constexpr difference_type get_value() const noexcept
+    {
+        return m_it;
+    }
+
+    /// set iterator to a defined beginning
+    void set_begin() noexcept
+    {
+        m_it = begin_value;
+    }
+
+    /// set iterator to a defined past the end
+    void set_end() noexcept
+    {
+        m_it = end_value;
+    }
+
+    /// return whether the iterator can be dereferenced
+    constexpr bool is_begin() const noexcept
+    {
+        return m_it == begin_value;
+    }
+
+    /// return whether the iterator is at end
+    constexpr bool is_end() const noexcept
+    {
+        return m_it == end_value;
+    }
+
+    friend constexpr bool operator==(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
+    {
+        return lhs.m_it == rhs.m_it;
+    }
+
+    friend constexpr bool operator<(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
+    {
+        return lhs.m_it < rhs.m_it;
+    }
+
+    primitive_iterator_t operator+(difference_type n) noexcept
+    {
+        auto result = *this;
+        result += n;
+        return result;
+    }
+
+    friend constexpr difference_type operator-(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
+    {
+        return lhs.m_it - rhs.m_it;
+    }
+
+    primitive_iterator_t& operator++() noexcept
+    {
+        ++m_it;
+        return *this;
+    }
+
+    primitive_iterator_t const operator++(int) noexcept // NOLINT(readability-const-return-type)
+    {
+        auto result = *this;
+        ++m_it;
+        return result;
+    }
+
+    primitive_iterator_t& operator--() noexcept
+    {
+        --m_it;
+        return *this;
+    }
+
+    primitive_iterator_t const operator--(int) noexcept // NOLINT(readability-const-return-type)
+    {
+        auto result = *this;
+        --m_it;
+        return result;
+    }
+
+    primitive_iterator_t& operator+=(difference_type n) noexcept
+    {
+        m_it += n;
+        return *this;
+    }
+
+    primitive_iterator_t& operator-=(difference_type n) noexcept
+    {
+        m_it -= n;
+        return *this;
+    }
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+
+namespace nlohmann
+{
+namespace detail
+{
+/*!
+@brief an iterator value
+
+@note This structure could easily be a union, but MSVC currently does not allow
+unions members with complex constructors, see https://github.com/nlohmann/json/pull/105.
+*/
+template<typename BasicJsonType> struct internal_iterator
+{
+    /// iterator for JSON objects
+    typename BasicJsonType::object_t::iterator object_iterator {};
+    /// iterator for JSON arrays
+    typename BasicJsonType::array_t::iterator array_iterator {};
+    /// generic iterator for all other types
+    primitive_iterator_t primitive_iterator {};
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/iterators/iter_impl.hpp>
+
+
+#include <iterator> // iterator, random_access_iterator_tag, bidirectional_iterator_tag, advance, next
+#include <type_traits> // conditional, is_const, remove_const
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/iterators/internal_iterator.hpp>
+
+// #include <nlohmann/detail/iterators/primitive_iterator.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+// forward declare, to be able to friend it later on
+template<typename IteratorType> class iteration_proxy;
+template<typename IteratorType> class iteration_proxy_value;
+
+/*!
+@brief a template for a bidirectional iterator for the @ref basic_json class
+This class implements a both iterators (iterator and const_iterator) for the
+@ref basic_json class.
+@note An iterator is called *initialized* when a pointer to a JSON value has
+      been set (e.g., by a constructor or a copy assignment). If the iterator is
+      default-constructed, it is *uninitialized* and most methods are undefined.
+      **The library uses assertions to detect calls on uninitialized iterators.**
+@requirement The class satisfies the following concept requirements:
+-
+[BidirectionalIterator](https://en.cppreference.com/w/cpp/named_req/BidirectionalIterator):
+  The iterator that can be moved can be moved in both directions (i.e.
+  incremented and decremented).
+@since version 1.0.0, simplified in version 2.0.9, change to bidirectional
+       iterators in version 3.0.0 (see https://github.com/nlohmann/json/issues/593)
+*/
+template<typename BasicJsonType>
+class iter_impl // NOLINT(cppcoreguidelines-special-member-functions,hicpp-special-member-functions)
+{
+    /// the iterator with BasicJsonType of different const-ness
+    using other_iter_impl = iter_impl<typename std::conditional<std::is_const<BasicJsonType>::value, typename std::remove_const<BasicJsonType>::type, const BasicJsonType>::type>;
+    /// allow basic_json to access private members
+    friend other_iter_impl;
+    friend BasicJsonType;
+    friend iteration_proxy<iter_impl>;
+    friend iteration_proxy_value<iter_impl>;
+
+    using object_t = typename BasicJsonType::object_t;
+    using array_t = typename BasicJsonType::array_t;
+    // make sure BasicJsonType is basic_json or const basic_json
+    static_assert(is_basic_json<typename std::remove_const<BasicJsonType>::type>::value,
+                  "iter_impl only accepts (const) basic_json");
+
+  public:
+
+    /// The std::iterator class template (used as a base class to provide typedefs) is deprecated in C++17.
+    /// The C++ Standard has never required user-defined iterators to derive from std::iterator.
+    /// A user-defined iterator should provide publicly accessible typedefs named
+    /// iterator_category, value_type, difference_type, pointer, and reference.
+    /// Note that value_type is required to be non-const, even for constant iterators.
+    using iterator_category = std::bidirectional_iterator_tag;
+
+    /// the type of the values when the iterator is dereferenced
+    using value_type = typename BasicJsonType::value_type;
+    /// a type to represent differences between iterators
+    using difference_type = typename BasicJsonType::difference_type;
+    /// defines a pointer to the type iterated over (value_type)
+    using pointer = typename std::conditional<std::is_const<BasicJsonType>::value,
+          typename BasicJsonType::const_pointer,
+          typename BasicJsonType::pointer>::type;
+    /// defines a reference to the type iterated over (value_type)
+    using reference =
+        typename std::conditional<std::is_const<BasicJsonType>::value,
+        typename BasicJsonType::const_reference,
+        typename BasicJsonType::reference>::type;
+
+    iter_impl() = default;
+    ~iter_impl() = default;
+    iter_impl(iter_impl&&) noexcept = default;
+    iter_impl& operator=(iter_impl&&) noexcept = default;
+
+    /*!
+    @brief constructor for a given JSON instance
+    @param[in] object  pointer to a JSON object for this iterator
+    @pre object != nullptr
+    @post The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    explicit iter_impl(pointer object) noexcept : m_object(object)
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                m_it.object_iterator = typename object_t::iterator();
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_it.array_iterator = typename array_t::iterator();
+                break;
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                m_it.primitive_iterator = primitive_iterator_t();
+                break;
+            }
+        }
+    }
+
+    /*!
+    @note The conventional copy constructor and copy assignment are implicitly
+          defined. Combined with the following converting constructor and
+          assignment, they support: (1) copy from iterator to iterator, (2)
+          copy from const iterator to const iterator, and (3) conversion from
+          iterator to const iterator. However conversion from const iterator
+          to iterator is not defined.
+    */
+
+    /*!
+    @brief const copy constructor
+    @param[in] other const iterator to copy from
+    @note This copy constructor had to be defined explicitly to circumvent a bug
+          occurring on msvc v19.0 compiler (VS 2015) debug build. For more
+          information refer to: https://github.com/nlohmann/json/issues/1608
+    */
+    iter_impl(const iter_impl<const BasicJsonType>& other) noexcept
+        : m_object(other.m_object), m_it(other.m_it)
+    {}
+
+    /*!
+    @brief converting assignment
+    @param[in] other const iterator to copy from
+    @return const/non-const iterator
+    @note It is not checked whether @a other is initialized.
+    */
+    iter_impl& operator=(const iter_impl<const BasicJsonType>& other) noexcept
+    {
+        if (&other != this)
+        {
+            m_object = other.m_object;
+            m_it = other.m_it;
+        }
+        return *this;
+    }
+
+    /*!
+    @brief converting constructor
+    @param[in] other  non-const iterator to copy from
+    @note It is not checked whether @a other is initialized.
+    */
+    iter_impl(const iter_impl<typename std::remove_const<BasicJsonType>::type>& other) noexcept
+        : m_object(other.m_object), m_it(other.m_it)
+    {}
+
+    /*!
+    @brief converting assignment
+    @param[in] other  non-const iterator to copy from
+    @return const/non-const iterator
+    @note It is not checked whether @a other is initialized.
+    */
+    iter_impl& operator=(const iter_impl<typename std::remove_const<BasicJsonType>::type>& other) noexcept // NOLINT(cert-oop54-cpp)
+    {
+        m_object = other.m_object;
+        m_it = other.m_it;
+        return *this;
+    }
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    /*!
+    @brief set the iterator to the first value
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    void set_begin() noexcept
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                m_it.object_iterator = m_object->m_value.object->begin();
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_it.array_iterator = m_object->m_value.array->begin();
+                break;
+            }
+
+            case value_t::null:
+            {
+                // set to end so begin()==end() is true: null is empty
+                m_it.primitive_iterator.set_end();
+                break;
+            }
+
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                m_it.primitive_iterator.set_begin();
+                break;
+            }
+        }
+    }
+
+    /*!
+    @brief set the iterator past the last value
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    void set_end() noexcept
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                m_it.object_iterator = m_object->m_value.object->end();
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_it.array_iterator = m_object->m_value.array->end();
+                break;
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                m_it.primitive_iterator.set_end();
+                break;
+            }
+        }
+    }
+
+  public:
+    /*!
+    @brief return a reference to the value pointed to by the iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    reference operator*() const
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                JSON_ASSERT(m_it.object_iterator != m_object->m_value.object->end());
+                return m_it.object_iterator->second;
+            }
+
+            case value_t::array:
+            {
+                JSON_ASSERT(m_it.array_iterator != m_object->m_value.array->end());
+                return *m_it.array_iterator;
+            }
+
+            case value_t::null:
+                JSON_THROW(invalid_iterator::create(214, "cannot get value", *m_object));
+
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.is_begin()))
+                {
+                    return *m_object;
+                }
+
+                JSON_THROW(invalid_iterator::create(214, "cannot get value", *m_object));
+            }
+        }
+    }
+
+    /*!
+    @brief dereference the iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    pointer operator->() const
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                JSON_ASSERT(m_it.object_iterator != m_object->m_value.object->end());
+                return &(m_it.object_iterator->second);
+            }
+
+            case value_t::array:
+            {
+                JSON_ASSERT(m_it.array_iterator != m_object->m_value.array->end());
+                return &*m_it.array_iterator;
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.is_begin()))
+                {
+                    return m_object;
+                }
+
+                JSON_THROW(invalid_iterator::create(214, "cannot get value", *m_object));
+            }
+        }
+    }
+
+    /*!
+    @brief post-increment (it++)
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl const operator++(int) // NOLINT(readability-const-return-type)
+    {
+        auto result = *this;
+        ++(*this);
+        return result;
+    }
+
+    /*!
+    @brief pre-increment (++it)
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl& operator++()
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                std::advance(m_it.object_iterator, 1);
+                break;
+            }
+
+            case value_t::array:
+            {
+                std::advance(m_it.array_iterator, 1);
+                break;
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                ++m_it.primitive_iterator;
+                break;
+            }
+        }
+
+        return *this;
+    }
+
+    /*!
+    @brief post-decrement (it--)
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl const operator--(int) // NOLINT(readability-const-return-type)
+    {
+        auto result = *this;
+        --(*this);
+        return result;
+    }
+
+    /*!
+    @brief pre-decrement (--it)
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl& operator--()
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                std::advance(m_it.object_iterator, -1);
+                break;
+            }
+
+            case value_t::array:
+            {
+                std::advance(m_it.array_iterator, -1);
+                break;
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                --m_it.primitive_iterator;
+                break;
+            }
+        }
+
+        return *this;
+    }
+
+    /*!
+    @brief comparison: equal
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    template < typename IterImpl, detail::enable_if_t < (std::is_same<IterImpl, iter_impl>::value || std::is_same<IterImpl, other_iter_impl>::value), std::nullptr_t > = nullptr >
+    bool operator==(const IterImpl& other) const
+    {
+        // if objects are not the same, the comparison is undefined
+        if (JSON_HEDLEY_UNLIKELY(m_object != other.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers", *m_object));
+        }
+
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+                return (m_it.object_iterator == other.m_it.object_iterator);
+
+            case value_t::array:
+                return (m_it.array_iterator == other.m_it.array_iterator);
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+                return (m_it.primitive_iterator == other.m_it.primitive_iterator);
+        }
+    }
+
+    /*!
+    @brief comparison: not equal
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    template < typename IterImpl, detail::enable_if_t < (std::is_same<IterImpl, iter_impl>::value || std::is_same<IterImpl, other_iter_impl>::value), std::nullptr_t > = nullptr >
+    bool operator!=(const IterImpl& other) const
+    {
+        return !operator==(other);
+    }
+
+    /*!
+    @brief comparison: smaller
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    bool operator<(const iter_impl& other) const
+    {
+        // if objects are not the same, the comparison is undefined
+        if (JSON_HEDLEY_UNLIKELY(m_object != other.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers", *m_object));
+        }
+
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+                JSON_THROW(invalid_iterator::create(213, "cannot compare order of object iterators", *m_object));
+
+            case value_t::array:
+                return (m_it.array_iterator < other.m_it.array_iterator);
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+                return (m_it.primitive_iterator < other.m_it.primitive_iterator);
+        }
+    }
+
+    /*!
+    @brief comparison: less than or equal
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    bool operator<=(const iter_impl& other) const
+    {
+        return !other.operator < (*this);
+    }
+
+    /*!
+    @brief comparison: greater than
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    bool operator>(const iter_impl& other) const
+    {
+        return !operator<=(other);
+    }
+
+    /*!
+    @brief comparison: greater than or equal
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    bool operator>=(const iter_impl& other) const
+    {
+        return !operator<(other);
+    }
+
+    /*!
+    @brief add to iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl& operator+=(difference_type i)
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+                JSON_THROW(invalid_iterator::create(209, "cannot use offsets with object iterators", *m_object));
+
+            case value_t::array:
+            {
+                std::advance(m_it.array_iterator, i);
+                break;
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                m_it.primitive_iterator += i;
+                break;
+            }
+        }
+
+        return *this;
+    }
+
+    /*!
+    @brief subtract from iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl& operator-=(difference_type i)
+    {
+        return operator+=(-i);
+    }
+
+    /*!
+    @brief add to iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl operator+(difference_type i) const
+    {
+        auto result = *this;
+        result += i;
+        return result;
+    }
+
+    /*!
+    @brief addition of distance and iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    friend iter_impl operator+(difference_type i, const iter_impl& it)
+    {
+        auto result = it;
+        result += i;
+        return result;
+    }
+
+    /*!
+    @brief subtract from iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl operator-(difference_type i) const
+    {
+        auto result = *this;
+        result -= i;
+        return result;
+    }
+
+    /*!
+    @brief return difference
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    difference_type operator-(const iter_impl& other) const
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+                JSON_THROW(invalid_iterator::create(209, "cannot use offsets with object iterators", *m_object));
+
+            case value_t::array:
+                return m_it.array_iterator - other.m_it.array_iterator;
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+                return m_it.primitive_iterator - other.m_it.primitive_iterator;
+        }
+    }
+
+    /*!
+    @brief access to successor
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    reference operator[](difference_type n) const
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+                JSON_THROW(invalid_iterator::create(208, "cannot use operator[] for object iterators", *m_object));
+
+            case value_t::array:
+                return *std::next(m_it.array_iterator, n);
+
+            case value_t::null:
+                JSON_THROW(invalid_iterator::create(214, "cannot get value", *m_object));
+
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.get_value() == -n))
+                {
+                    return *m_object;
+                }
+
+                JSON_THROW(invalid_iterator::create(214, "cannot get value", *m_object));
+            }
+        }
+    }
+
+    /*!
+    @brief return the key of an object iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    const typename object_t::key_type& key() const
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        if (JSON_HEDLEY_LIKELY(m_object->is_object()))
+        {
+            return m_it.object_iterator->first;
+        }
+
+        JSON_THROW(invalid_iterator::create(207, "cannot use key() for non-object iterators", *m_object));
+    }
+
+    /*!
+    @brief return the value of an iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    reference value() const
+    {
+        return operator*();
+    }
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    /// associated JSON instance
+    pointer m_object = nullptr;
+    /// the actual iterator of the associated instance
+    internal_iterator<typename std::remove_const<BasicJsonType>::type> m_it {};
+};
+} // namespace detail
+} // namespace nlohmann
+
+// #include <nlohmann/detail/iterators/iteration_proxy.hpp>
+
+// #include <nlohmann/detail/iterators/json_reverse_iterator.hpp>
+
+
+#include <cstddef> // ptrdiff_t
+#include <iterator> // reverse_iterator
+#include <utility> // declval
+
+namespace nlohmann
+{
+namespace detail
+{
+//////////////////////
+// reverse_iterator //
+//////////////////////
+
+/*!
+@brief a template for a reverse iterator class
+
+@tparam Base the base iterator type to reverse. Valid types are @ref
+iterator (to create @ref reverse_iterator) and @ref const_iterator (to
+create @ref const_reverse_iterator).
+
+@requirement The class satisfies the following concept requirements:
+-
+[BidirectionalIterator](https://en.cppreference.com/w/cpp/named_req/BidirectionalIterator):
+  The iterator that can be moved can be moved in both directions (i.e.
+  incremented and decremented).
+- [OutputIterator](https://en.cppreference.com/w/cpp/named_req/OutputIterator):
+  It is possible to write to the pointed-to element (only if @a Base is
+  @ref iterator).
+
+@since version 1.0.0
+*/
+template<typename Base>
+class json_reverse_iterator : public std::reverse_iterator<Base>
+{
+  public:
+    using difference_type = std::ptrdiff_t;
+    /// shortcut to the reverse iterator adapter
+    using base_iterator = std::reverse_iterator<Base>;
+    /// the reference type for the pointed-to element
+    using reference = typename Base::reference;
+
+    /// create reverse iterator from iterator
+    explicit json_reverse_iterator(const typename base_iterator::iterator_type& it) noexcept
+        : base_iterator(it) {}
+
+    /// create reverse iterator from base class
+    explicit json_reverse_iterator(const base_iterator& it) noexcept : base_iterator(it) {}
+
+    /// post-increment (it++)
+    json_reverse_iterator const operator++(int) // NOLINT(readability-const-return-type)
+    {
+        return static_cast<json_reverse_iterator>(base_iterator::operator++(1));
+    }
+
+    /// pre-increment (++it)
+    json_reverse_iterator& operator++()
+    {
+        return static_cast<json_reverse_iterator&>(base_iterator::operator++());
+    }
+
+    /// post-decrement (it--)
+    json_reverse_iterator const operator--(int) // NOLINT(readability-const-return-type)
+    {
+        return static_cast<json_reverse_iterator>(base_iterator::operator--(1));
+    }
+
+    /// pre-decrement (--it)
+    json_reverse_iterator& operator--()
+    {
+        return static_cast<json_reverse_iterator&>(base_iterator::operator--());
+    }
+
+    /// add to iterator
+    json_reverse_iterator& operator+=(difference_type i)
+    {
+        return static_cast<json_reverse_iterator&>(base_iterator::operator+=(i));
+    }
+
+    /// add to iterator
+    json_reverse_iterator operator+(difference_type i) const
+    {
+        return static_cast<json_reverse_iterator>(base_iterator::operator+(i));
+    }
+
+    /// subtract from iterator
+    json_reverse_iterator operator-(difference_type i) const
+    {
+        return static_cast<json_reverse_iterator>(base_iterator::operator-(i));
+    }
+
+    /// return difference
+    difference_type operator-(const json_reverse_iterator& other) const
+    {
+        return base_iterator(*this) - base_iterator(other);
+    }
+
+    /// access to successor
+    reference operator[](difference_type n) const
+    {
+        return *(this->operator+(n));
+    }
+
+    /// return the key of an object iterator
+    auto key() const -> decltype(std::declval<Base>().key())
+    {
+        auto it = --this->base();
+        return it.key();
+    }
+
+    /// return the value of an iterator
+    reference value() const
+    {
+        auto it = --this->base();
+        return it.operator * ();
+    }
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/iterators/primitive_iterator.hpp>
+
+// #include <nlohmann/detail/json_pointer.hpp>
+
+
+#include <algorithm> // all_of
+#include <cctype> // isdigit
+#include <limits> // max
+#include <numeric> // accumulate
+#include <string> // string
+#include <utility> // move
+#include <vector> // vector
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/string_escape.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+
+/// @brief JSON Pointer defines a string syntax for identifying a specific value within a JSON document
+/// @sa https://json.nlohmann.me/api/json_pointer/
+template<typename BasicJsonType>
+class json_pointer
+{
+    // allow basic_json to access private members
+    NLOHMANN_BASIC_JSON_TPL_DECLARATION
+    friend class basic_json;
+
+  public:
+    /// @brief create JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/json_pointer/
+    explicit json_pointer(const std::string& s = "")
+        : reference_tokens(split(s))
+    {}
+
+    /// @brief return a string representation of the JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/to_string/
+    std::string to_string() const
+    {
+        return std::accumulate(reference_tokens.begin(), reference_tokens.end(),
+                               std::string{},
+                               [](const std::string & a, const std::string & b)
+        {
+            return a + "/" + detail::escape(b);
+        });
+    }
+
+    /// @brief return a string representation of the JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_string/
+    operator std::string() const
+    {
+        return to_string();
+    }
+
+    /// @brief append another JSON pointer at the end of this JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slasheq/
+    json_pointer& operator/=(const json_pointer& ptr)
+    {
+        reference_tokens.insert(reference_tokens.end(),
+                                ptr.reference_tokens.begin(),
+                                ptr.reference_tokens.end());
+        return *this;
+    }
+
+    /// @brief append an unescaped reference token at the end of this JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slasheq/
+    json_pointer& operator/=(std::string token)
+    {
+        push_back(std::move(token));
+        return *this;
+    }
+
+    /// @brief append an array index at the end of this JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slasheq/
+    json_pointer& operator/=(std::size_t array_idx)
+    {
+        return *this /= std::to_string(array_idx);
+    }
+
+    /// @brief create a new JSON pointer by appending the right JSON pointer at the end of the left JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slash/
+    friend json_pointer operator/(const json_pointer& lhs,
+                                  const json_pointer& rhs)
+    {
+        return json_pointer(lhs) /= rhs;
+    }
+
+    /// @brief create a new JSON pointer by appending the unescaped token at the end of the JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slash/
+    friend json_pointer operator/(const json_pointer& lhs, std::string token) // NOLINT(performance-unnecessary-value-param)
+    {
+        return json_pointer(lhs) /= std::move(token);
+    }
+
+    /// @brief create a new JSON pointer by appending the array-index-token at the end of the JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slash/
+    friend json_pointer operator/(const json_pointer& lhs, std::size_t array_idx)
+    {
+        return json_pointer(lhs) /= array_idx;
+    }
+
+    /// @brief returns the parent of this JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/parent_pointer/
+    json_pointer parent_pointer() const
+    {
+        if (empty())
+        {
+            return *this;
+        }
+
+        json_pointer res = *this;
+        res.pop_back();
+        return res;
+    }
+
+    /// @brief remove last reference token
+    /// @sa https://json.nlohmann.me/api/json_pointer/pop_back/
+    void pop_back()
+    {
+        if (JSON_HEDLEY_UNLIKELY(empty()))
+        {
+            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent", BasicJsonType()));
+        }
+
+        reference_tokens.pop_back();
+    }
+
+    /// @brief return last reference token
+    /// @sa https://json.nlohmann.me/api/json_pointer/back/
+    const std::string& back() const
+    {
+        if (JSON_HEDLEY_UNLIKELY(empty()))
+        {
+            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent", BasicJsonType()));
+        }
+
+        return reference_tokens.back();
+    }
+
+    /// @brief append an unescaped token at the end of the reference pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/push_back/
+    void push_back(const std::string& token)
+    {
+        reference_tokens.push_back(token);
+    }
+
+    /// @brief append an unescaped token at the end of the reference pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/push_back/
+    void push_back(std::string&& token)
+    {
+        reference_tokens.push_back(std::move(token));
+    }
+
+    /// @brief return whether pointer points to the root document
+    /// @sa https://json.nlohmann.me/api/json_pointer/empty/
+    bool empty() const noexcept
+    {
+        return reference_tokens.empty();
+    }
+
+  private:
+    /*!
+    @param[in] s  reference token to be converted into an array index
+
+    @return integer representation of @a s
+
+    @throw parse_error.106  if an array index begins with '0'
+    @throw parse_error.109  if an array index begins not with a digit
+    @throw out_of_range.404 if string @a s could not be converted to an integer
+    @throw out_of_range.410 if an array index exceeds size_type
+    */
+    static typename BasicJsonType::size_type array_index(const std::string& s)
+    {
+        using size_type = typename BasicJsonType::size_type;
+
+        // error condition (cf. RFC 6901, Sect. 4)
+        if (JSON_HEDLEY_UNLIKELY(s.size() > 1 && s[0] == '0'))
+        {
+            JSON_THROW(detail::parse_error::create(106, 0, "array index '" + s + "' must not begin with '0'", BasicJsonType()));
+        }
+
+        // error condition (cf. RFC 6901, Sect. 4)
+        if (JSON_HEDLEY_UNLIKELY(s.size() > 1 && !(s[0] >= '1' && s[0] <= '9')))
+        {
+            JSON_THROW(detail::parse_error::create(109, 0, "array index '" + s + "' is not a number", BasicJsonType()));
+        }
+
+        std::size_t processed_chars = 0;
+        unsigned long long res = 0;  // NOLINT(runtime/int)
+        JSON_TRY
+        {
+            res = std::stoull(s, &processed_chars);
+        }
+        JSON_CATCH(std::out_of_range&)
+        {
+            JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + s + "'", BasicJsonType()));
+        }
+
+        // check if the string was completely read
+        if (JSON_HEDLEY_UNLIKELY(processed_chars != s.size()))
+        {
+            JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + s + "'", BasicJsonType()));
+        }
+
+        // only triggered on special platforms (like 32bit), see also
+        // https://github.com/nlohmann/json/pull/2203
+        if (res >= static_cast<unsigned long long>((std::numeric_limits<size_type>::max)()))  // NOLINT(runtime/int)
+        {
+            JSON_THROW(detail::out_of_range::create(410, "array index " + s + " exceeds size_type", BasicJsonType())); // LCOV_EXCL_LINE
+        }
+
+        return static_cast<size_type>(res);
+    }
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    json_pointer top() const
+    {
+        if (JSON_HEDLEY_UNLIKELY(empty()))
+        {
+            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent", BasicJsonType()));
+        }
+
+        json_pointer result = *this;
+        result.reference_tokens = {reference_tokens[0]};
+        return result;
+    }
+
+  private:
+    /*!
+    @brief create and return a reference to the pointed to value
+
+    @complexity Linear in the number of reference tokens.
+
+    @throw parse_error.109 if array index is not a number
+    @throw type_error.313 if value cannot be unflattened
+    */
+    BasicJsonType& get_and_create(BasicJsonType& j) const
+    {
+        auto* result = &j;
+
+        // in case no reference tokens exist, return a reference to the JSON value
+        // j which will be overwritten by a primitive value
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (result->type())
+            {
+                case detail::value_t::null:
+                {
+                    if (reference_token == "0")
+                    {
+                        // start a new array if reference token is 0
+                        result = &result->operator[](0);
+                    }
+                    else
+                    {
+                        // start a new object otherwise
+                        result = &result->operator[](reference_token);
+                    }
+                    break;
+                }
+
+                case detail::value_t::object:
+                {
+                    // create an entry in the object
+                    result = &result->operator[](reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    // create an entry in the array
+                    result = &result->operator[](array_index(reference_token));
+                    break;
+                }
+
+                /*
+                The following code is only reached if there exists a reference
+                token _and_ the current value is primitive. In this case, we have
+                an error situation, because primitive values may only occur as
+                single value; that is, with an empty list of reference tokens.
+                */
+                case detail::value_t::string:
+                case detail::value_t::boolean:
+                case detail::value_t::number_integer:
+                case detail::value_t::number_unsigned:
+                case detail::value_t::number_float:
+                case detail::value_t::binary:
+                case detail::value_t::discarded:
+                default:
+                    JSON_THROW(detail::type_error::create(313, "invalid value to unflatten", j));
+            }
+        }
+
+        return *result;
+    }
+
+    /*!
+    @brief return a reference to the pointed to value
+
+    @note This version does not throw if a value is not present, but tries to
+          create nested values instead. For instance, calling this function
+          with pointer `"/this/that"` on a null value is equivalent to calling
+          `operator[]("this").operator[]("that")` on that value, effectively
+          changing the null value to an object.
+
+    @param[in] ptr  a JSON value
+
+    @return reference to the JSON value pointed to by the JSON pointer
+
+    @complexity Linear in the length of the JSON pointer.
+
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+    */
+    BasicJsonType& get_unchecked(BasicJsonType* ptr) const
+    {
+        for (const auto& reference_token : reference_tokens)
+        {
+            // convert null values to arrays or objects before continuing
+            if (ptr->is_null())
+            {
+                // check if reference token is a number
+                const bool nums =
+                    std::all_of(reference_token.begin(), reference_token.end(),
+                                [](const unsigned char x)
+                {
+                    return std::isdigit(x);
+                });
+
+                // change value to array for numbers or "-" or to object otherwise
+                *ptr = (nums || reference_token == "-")
+                       ? detail::value_t::array
+                       : detail::value_t::object;
+            }
+
+            switch (ptr->type())
+            {
+                case detail::value_t::object:
+                {
+                    // use unchecked object access
+                    ptr = &ptr->operator[](reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    if (reference_token == "-")
+                    {
+                        // explicitly treat "-" as index beyond the end
+                        ptr = &ptr->operator[](ptr->m_value.array->size());
+                    }
+                    else
+                    {
+                        // convert array index to number; unchecked access
+                        ptr = &ptr->operator[](array_index(reference_token));
+                    }
+                    break;
+                }
+
+                case detail::value_t::null:
+                case detail::value_t::string:
+                case detail::value_t::boolean:
+                case detail::value_t::number_integer:
+                case detail::value_t::number_unsigned:
+                case detail::value_t::number_float:
+                case detail::value_t::binary:
+                case detail::value_t::discarded:
+                default:
+                    JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'", *ptr));
+            }
+        }
+
+        return *ptr;
+    }
+
+    /*!
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.402  if the array index '-' is used
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+    */
+    BasicJsonType& get_checked(BasicJsonType* ptr) const
+    {
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (ptr->type())
+            {
+                case detail::value_t::object:
+                {
+                    // note: at performs range check
+                    ptr = &ptr->at(reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
+                    {
+                        // "-" always fails the range check
+                        JSON_THROW(detail::out_of_range::create(402,
+                                                                "array index '-' (" + std::to_string(ptr->m_value.array->size()) +
+                                                                ") is out of range", *ptr));
+                    }
+
+                    // note: at performs range check
+                    ptr = &ptr->at(array_index(reference_token));
+                    break;
+                }
+
+                case detail::value_t::null:
+                case detail::value_t::string:
+                case detail::value_t::boolean:
+                case detail::value_t::number_integer:
+                case detail::value_t::number_unsigned:
+                case detail::value_t::number_float:
+                case detail::value_t::binary:
+                case detail::value_t::discarded:
+                default:
+                    JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'", *ptr));
+            }
+        }
+
+        return *ptr;
+    }
+
+    /*!
+    @brief return a const reference to the pointed to value
+
+    @param[in] ptr  a JSON value
+
+    @return const reference to the JSON value pointed to by the JSON
+    pointer
+
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.402  if the array index '-' is used
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+    */
+    const BasicJsonType& get_unchecked(const BasicJsonType* ptr) const
+    {
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (ptr->type())
+            {
+                case detail::value_t::object:
+                {
+                    // use unchecked object access
+                    ptr = &ptr->operator[](reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
+                    {
+                        // "-" cannot be used for const access
+                        JSON_THROW(detail::out_of_range::create(402, "array index '-' (" + std::to_string(ptr->m_value.array->size()) + ") is out of range", *ptr));
+                    }
+
+                    // use unchecked array access
+                    ptr = &ptr->operator[](array_index(reference_token));
+                    break;
+                }
+
+                case detail::value_t::null:
+                case detail::value_t::string:
+                case detail::value_t::boolean:
+                case detail::value_t::number_integer:
+                case detail::value_t::number_unsigned:
+                case detail::value_t::number_float:
+                case detail::value_t::binary:
+                case detail::value_t::discarded:
+                default:
+                    JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'", *ptr));
+            }
+        }
+
+        return *ptr;
+    }
+
+    /*!
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.402  if the array index '-' is used
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+    */
+    const BasicJsonType& get_checked(const BasicJsonType* ptr) const
+    {
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (ptr->type())
+            {
+                case detail::value_t::object:
+                {
+                    // note: at performs range check
+                    ptr = &ptr->at(reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
+                    {
+                        // "-" always fails the range check
+                        JSON_THROW(detail::out_of_range::create(402,
+                                                                "array index '-' (" + std::to_string(ptr->m_value.array->size()) +
+                                                                ") is out of range", *ptr));
+                    }
+
+                    // note: at performs range check
+                    ptr = &ptr->at(array_index(reference_token));
+                    break;
+                }
+
+                case detail::value_t::null:
+                case detail::value_t::string:
+                case detail::value_t::boolean:
+                case detail::value_t::number_integer:
+                case detail::value_t::number_unsigned:
+                case detail::value_t::number_float:
+                case detail::value_t::binary:
+                case detail::value_t::discarded:
+                default:
+                    JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'", *ptr));
+            }
+        }
+
+        return *ptr;
+    }
+
+    /*!
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    */
+    bool contains(const BasicJsonType* ptr) const
+    {
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (ptr->type())
+            {
+                case detail::value_t::object:
+                {
+                    if (!ptr->contains(reference_token))
+                    {
+                        // we did not find the key in the object
+                        return false;
+                    }
+
+                    ptr = &ptr->operator[](reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
+                    {
+                        // "-" always fails the range check
+                        return false;
+                    }
+                    if (JSON_HEDLEY_UNLIKELY(reference_token.size() == 1 && !("0" <= reference_token && reference_token <= "9")))
+                    {
+                        // invalid char
+                        return false;
+                    }
+                    if (JSON_HEDLEY_UNLIKELY(reference_token.size() > 1))
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!('1' <= reference_token[0] && reference_token[0] <= '9')))
+                        {
+                            // first char should be between '1' and '9'
+                            return false;
+                        }
+                        for (std::size_t i = 1; i < reference_token.size(); i++)
+                        {
+                            if (JSON_HEDLEY_UNLIKELY(!('0' <= reference_token[i] && reference_token[i] <= '9')))
+                            {
+                                // other char should be between '0' and '9'
+                                return false;
+                            }
+                        }
+                    }
+
+                    const auto idx = array_index(reference_token);
+                    if (idx >= ptr->size())
+                    {
+                        // index out of range
+                        return false;
+                    }
+
+                    ptr = &ptr->operator[](idx);
+                    break;
+                }
+
+                case detail::value_t::null:
+                case detail::value_t::string:
+                case detail::value_t::boolean:
+                case detail::value_t::number_integer:
+                case detail::value_t::number_unsigned:
+                case detail::value_t::number_float:
+                case detail::value_t::binary:
+                case detail::value_t::discarded:
+                default:
+                {
+                    // we do not expect primitive values if there is still a
+                    // reference token to process
+                    return false;
+                }
+            }
+        }
+
+        // no reference token left means we found a primitive value
+        return true;
+    }
+
+    /*!
+    @brief split the string input to reference tokens
+
+    @note This function is only called by the json_pointer constructor.
+          All exceptions below are documented there.
+
+    @throw parse_error.107  if the pointer is not empty or begins with '/'
+    @throw parse_error.108  if character '~' is not followed by '0' or '1'
+    */
+    static std::vector<std::string> split(const std::string& reference_string)
+    {
+        std::vector<std::string> result;
+
+        // special case: empty reference string -> no reference tokens
+        if (reference_string.empty())
+        {
+            return result;
+        }
+
+        // check if nonempty reference string begins with slash
+        if (JSON_HEDLEY_UNLIKELY(reference_string[0] != '/'))
+        {
+            JSON_THROW(detail::parse_error::create(107, 1, "JSON pointer must be empty or begin with '/' - was: '" + reference_string + "'", BasicJsonType()));
+        }
+
+        // extract the reference tokens:
+        // - slash: position of the last read slash (or end of string)
+        // - start: position after the previous slash
+        for (
+            // search for the first slash after the first character
+            std::size_t slash = reference_string.find_first_of('/', 1),
+            // set the beginning of the first reference token
+            start = 1;
+            // we can stop if start == 0 (if slash == std::string::npos)
+            start != 0;
+            // set the beginning of the next reference token
+            // (will eventually be 0 if slash == std::string::npos)
+            start = (slash == std::string::npos) ? 0 : slash + 1,
+            // find next slash
+            slash = reference_string.find_first_of('/', start))
+        {
+            // use the text between the beginning of the reference token
+            // (start) and the last slash (slash).
+            auto reference_token = reference_string.substr(start, slash - start);
+
+            // check reference tokens are properly escaped
+            for (std::size_t pos = reference_token.find_first_of('~');
+                    pos != std::string::npos;
+                    pos = reference_token.find_first_of('~', pos + 1))
+            {
+                JSON_ASSERT(reference_token[pos] == '~');
+
+                // ~ must be followed by 0 or 1
+                if (JSON_HEDLEY_UNLIKELY(pos == reference_token.size() - 1 ||
+                                         (reference_token[pos + 1] != '0' &&
+                                          reference_token[pos + 1] != '1')))
+                {
+                    JSON_THROW(detail::parse_error::create(108, 0, "escape character '~' must be followed with '0' or '1'", BasicJsonType()));
+                }
+            }
+
+            // finally, store the reference token
+            detail::unescape(reference_token);
+            result.push_back(reference_token);
+        }
+
+        return result;
+    }
+
+  private:
+    /*!
+    @param[in] reference_string  the reference string to the current value
+    @param[in] value             the value to consider
+    @param[in,out] result        the result object to insert values to
+
+    @note Empty objects or arrays are flattened to `null`.
+    */
+    static void flatten(const std::string& reference_string,
+                        const BasicJsonType& value,
+                        BasicJsonType& result)
+    {
+        switch (value.type())
+        {
+            case detail::value_t::array:
+            {
+                if (value.m_value.array->empty())
+                {
+                    // flatten empty array as null
+                    result[reference_string] = nullptr;
+                }
+                else
+                {
+                    // iterate array and use index as reference string
+                    for (std::size_t i = 0; i < value.m_value.array->size(); ++i)
+                    {
+                        flatten(reference_string + "/" + std::to_string(i),
+                                value.m_value.array->operator[](i), result);
+                    }
+                }
+                break;
+            }
+
+            case detail::value_t::object:
+            {
+                if (value.m_value.object->empty())
+                {
+                    // flatten empty object as null
+                    result[reference_string] = nullptr;
+                }
+                else
+                {
+                    // iterate object and use keys as reference string
+                    for (const auto& element : *value.m_value.object)
+                    {
+                        flatten(reference_string + "/" + detail::escape(element.first), element.second, result);
+                    }
+                }
+                break;
+            }
+
+            case detail::value_t::null:
+            case detail::value_t::string:
+            case detail::value_t::boolean:
+            case detail::value_t::number_integer:
+            case detail::value_t::number_unsigned:
+            case detail::value_t::number_float:
+            case detail::value_t::binary:
+            case detail::value_t::discarded:
+            default:
+            {
+                // add primitive value with its reference string
+                result[reference_string] = value;
+                break;
+            }
+        }
+    }
+
+    /*!
+    @param[in] value  flattened JSON
+
+    @return unflattened JSON
+
+    @throw parse_error.109 if array index is not a number
+    @throw type_error.314  if value is not an object
+    @throw type_error.315  if object values are not primitive
+    @throw type_error.313  if value cannot be unflattened
+    */
+    static BasicJsonType
+    unflatten(const BasicJsonType& value)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!value.is_object()))
+        {
+            JSON_THROW(detail::type_error::create(314, "only objects can be unflattened", value));
+        }
+
+        BasicJsonType result;
+
+        // iterate the JSON object values
+        for (const auto& element : *value.m_value.object)
+        {
+            if (JSON_HEDLEY_UNLIKELY(!element.second.is_primitive()))
+            {
+                JSON_THROW(detail::type_error::create(315, "values in object must be primitive", element.second));
+            }
+
+            // assign value to reference pointed to by JSON pointer; Note that if
+            // the JSON pointer is "" (i.e., points to the whole value), function
+            // get_and_create returns a reference to result itself. An assignment
+            // will then create a primitive value.
+            json_pointer(element.first).get_and_create(result) = element.second;
+        }
+
+        return result;
+    }
+
+    /*!
+    @brief compares two JSON pointers for equality
+
+    @param[in] lhs  JSON pointer to compare
+    @param[in] rhs  JSON pointer to compare
+    @return whether @a lhs is equal to @a rhs
+
+    @complexity Linear in the length of the JSON pointer
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+    */
+    friend bool operator==(json_pointer const& lhs,
+                           json_pointer const& rhs) noexcept
+    {
+        return lhs.reference_tokens == rhs.reference_tokens;
+    }
+
+    /*!
+    @brief compares two JSON pointers for inequality
+
+    @param[in] lhs  JSON pointer to compare
+    @param[in] rhs  JSON pointer to compare
+    @return whether @a lhs is not equal @a rhs
+
+    @complexity Linear in the length of the JSON pointer
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+    */
+    friend bool operator!=(json_pointer const& lhs,
+                           json_pointer const& rhs) noexcept
+    {
+        return !(lhs == rhs);
+    }
+
+    /// the reference tokens
+    std::vector<std::string> reference_tokens;
+};
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/json_ref.hpp>
+
+
+#include <initializer_list>
+#include <utility>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+template<typename BasicJsonType>
+class json_ref
+{
+  public:
+    using value_type = BasicJsonType;
+
+    json_ref(value_type&& value)
+        : owned_value(std::move(value))
+    {}
+
+    json_ref(const value_type& value)
+        : value_ref(&value)
+    {}
+
+    json_ref(std::initializer_list<json_ref> init)
+        : owned_value(init)
+    {}
+
+    template <
+        class... Args,
+        enable_if_t<std::is_constructible<value_type, Args...>::value, int> = 0 >
+    json_ref(Args && ... args)
+        : owned_value(std::forward<Args>(args)...)
+    {}
+
+    // class should be movable only
+    json_ref(json_ref&&) noexcept = default;
+    json_ref(const json_ref&) = delete;
+    json_ref& operator=(const json_ref&) = delete;
+    json_ref& operator=(json_ref&&) = delete;
+    ~json_ref() = default;
+
+    value_type moved_or_copied() const
+    {
+        if (value_ref == nullptr)
+        {
+            return std::move(owned_value);
+        }
+        return *value_ref;
+    }
+
+    value_type const& operator*() const
+    {
+        return value_ref ? *value_ref : owned_value;
+    }
+
+    value_type const* operator->() const
+    {
+        return &** this;
+    }
+
+  private:
+    mutable value_type owned_value = nullptr;
+    value_type const* value_ref = nullptr;
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/string_escape.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/output/binary_writer.hpp>
+
+
+#include <algorithm> // reverse
+#include <array> // array
+#include <cmath> // isnan, isinf
+#include <cstdint> // uint8_t, uint16_t, uint32_t, uint64_t
+#include <cstring> // memcpy
+#include <limits> // numeric_limits
+#include <string> // string
+#include <utility> // move
+
+// #include <nlohmann/detail/input/binary_reader.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/output/output_adapters.hpp>
+
+
+#include <algorithm> // copy
+#include <cstddef> // size_t
+#include <iterator> // back_inserter
+#include <memory> // shared_ptr, make_shared
+#include <string> // basic_string
+#include <vector> // vector
+
+#ifndef JSON_NO_IO
+    #include <ios>      // streamsize
+    #include <ostream>  // basic_ostream
+#endif  // JSON_NO_IO
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+/// abstract output adapter interface
+template<typename CharType> struct output_adapter_protocol
+{
+    virtual void write_character(CharType c) = 0;
+    virtual void write_characters(const CharType* s, std::size_t length) = 0;
+    virtual ~output_adapter_protocol() = default;
+
+    output_adapter_protocol() = default;
+    output_adapter_protocol(const output_adapter_protocol&) = default;
+    output_adapter_protocol(output_adapter_protocol&&) noexcept = default;
+    output_adapter_protocol& operator=(const output_adapter_protocol&) = default;
+    output_adapter_protocol& operator=(output_adapter_protocol&&) noexcept = default;
+};
+
+/// a type to simplify interfaces
+template<typename CharType>
+using output_adapter_t = std::shared_ptr<output_adapter_protocol<CharType>>;
+
+/// output adapter for byte vectors
+template<typename CharType, typename AllocatorType = std::allocator<CharType>>
+class output_vector_adapter : public output_adapter_protocol<CharType>
+{
+  public:
+    explicit output_vector_adapter(std::vector<CharType, AllocatorType>& vec) noexcept
+        : v(vec)
+    {}
+
+    void write_character(CharType c) override
+    {
+        v.push_back(c);
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    void write_characters(const CharType* s, std::size_t length) override
+    {
+        std::copy(s, s + length, std::back_inserter(v));
+    }
+
+  private:
+    std::vector<CharType, AllocatorType>& v;
+};
+
+#ifndef JSON_NO_IO
+/// output adapter for output streams
+template<typename CharType>
+class output_stream_adapter : public output_adapter_protocol<CharType>
+{
+  public:
+    explicit output_stream_adapter(std::basic_ostream<CharType>& s) noexcept
+        : stream(s)
+    {}
+
+    void write_character(CharType c) override
+    {
+        stream.put(c);
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    void write_characters(const CharType* s, std::size_t length) override
+    {
+        stream.write(s, static_cast<std::streamsize>(length));
+    }
+
+  private:
+    std::basic_ostream<CharType>& stream;
+};
+#endif  // JSON_NO_IO
+
+/// output adapter for basic_string
+template<typename CharType, typename StringType = std::basic_string<CharType>>
+class output_string_adapter : public output_adapter_protocol<CharType>
+{
+  public:
+    explicit output_string_adapter(StringType& s) noexcept
+        : str(s)
+    {}
+
+    void write_character(CharType c) override
+    {
+        str.push_back(c);
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    void write_characters(const CharType* s, std::size_t length) override
+    {
+        str.append(s, length);
+    }
+
+  private:
+    StringType& str;
+};
+
+template<typename CharType, typename StringType = std::basic_string<CharType>>
+class output_adapter
+{
+  public:
+    template<typename AllocatorType = std::allocator<CharType>>
+    output_adapter(std::vector<CharType, AllocatorType>& vec)
+        : oa(std::make_shared<output_vector_adapter<CharType, AllocatorType>>(vec)) {}
+
+#ifndef JSON_NO_IO
+    output_adapter(std::basic_ostream<CharType>& s)
+        : oa(std::make_shared<output_stream_adapter<CharType>>(s)) {}
+#endif  // JSON_NO_IO
+
+    output_adapter(StringType& s)
+        : oa(std::make_shared<output_string_adapter<CharType, StringType>>(s)) {}
+
+    operator output_adapter_t<CharType>()
+    {
+        return oa;
+    }
+
+  private:
+    output_adapter_t<CharType> oa = nullptr;
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+
+namespace nlohmann
+{
+namespace detail
+{
+///////////////////
+// binary writer //
+///////////////////
+
+/*!
+@brief serialization to CBOR and MessagePack values
+*/
+template<typename BasicJsonType, typename CharType>
+class binary_writer
+{
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+
+  public:
+    /*!
+    @brief create a binary writer
+
+    @param[in] adapter  output adapter to write to
+    */
+    explicit binary_writer(output_adapter_t<CharType> adapter) : oa(std::move(adapter))
+    {
+        JSON_ASSERT(oa);
+    }
+
+    /*!
+    @param[in] j  JSON value to serialize
+    @pre       j.type() == value_t::object
+    */
+    void write_bson(const BasicJsonType& j)
+    {
+        switch (j.type())
+        {
+            case value_t::object:
+            {
+                write_bson_object(*j.m_value.object);
+                break;
+            }
+
+            case value_t::null:
+            case value_t::array:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                JSON_THROW(type_error::create(317, "to serialize to BSON, top-level type must be object, but is " + std::string(j.type_name()), j));
+            }
+        }
+    }
+
+    /*!
+    @param[in] j  JSON value to serialize
+    */
+    void write_cbor(const BasicJsonType& j)
+    {
+        switch (j.type())
+        {
+            case value_t::null:
+            {
+                oa->write_character(to_char_type(0xF6));
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                oa->write_character(j.m_value.boolean
+                                    ? to_char_type(0xF5)
+                                    : to_char_type(0xF4));
+                break;
+            }
+
+            case value_t::number_integer:
+            {
+                if (j.m_value.number_integer >= 0)
+                {
+                    // CBOR does not differentiate between positive signed
+                    // integers and unsigned integers. Therefore, we used the
+                    // code from the value_t::number_unsigned case here.
+                    if (j.m_value.number_integer <= 0x17)
+                    {
+                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer <= (std::numeric_limits<std::uint8_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x18));
+                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer <= (std::numeric_limits<std::uint16_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x19));
+                        write_number(static_cast<std::uint16_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer <= (std::numeric_limits<std::uint32_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x1A));
+                        write_number(static_cast<std::uint32_t>(j.m_value.number_integer));
+                    }
+                    else
+                    {
+                        oa->write_character(to_char_type(0x1B));
+                        write_number(static_cast<std::uint64_t>(j.m_value.number_integer));
+                    }
+                }
+                else
+                {
+                    // The conversions below encode the sign in the first
+                    // byte, and the value is converted to a positive number.
+                    const auto positive_number = -1 - j.m_value.number_integer;
+                    if (j.m_value.number_integer >= -24)
+                    {
+                        write_number(static_cast<std::uint8_t>(0x20 + positive_number));
+                    }
+                    else if (positive_number <= (std::numeric_limits<std::uint8_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x38));
+                        write_number(static_cast<std::uint8_t>(positive_number));
+                    }
+                    else if (positive_number <= (std::numeric_limits<std::uint16_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x39));
+                        write_number(static_cast<std::uint16_t>(positive_number));
+                    }
+                    else if (positive_number <= (std::numeric_limits<std::uint32_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x3A));
+                        write_number(static_cast<std::uint32_t>(positive_number));
+                    }
+                    else
+                    {
+                        oa->write_character(to_char_type(0x3B));
+                        write_number(static_cast<std::uint64_t>(positive_number));
+                    }
+                }
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                if (j.m_value.number_unsigned <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(j.m_value.number_unsigned));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x18));
+                    write_number(static_cast<std::uint8_t>(j.m_value.number_unsigned));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x19));
+                    write_number(static_cast<std::uint16_t>(j.m_value.number_unsigned));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x1A));
+                    write_number(static_cast<std::uint32_t>(j.m_value.number_unsigned));
+                }
+                else
+                {
+                    oa->write_character(to_char_type(0x1B));
+                    write_number(static_cast<std::uint64_t>(j.m_value.number_unsigned));
+                }
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                if (std::isnan(j.m_value.number_float))
+                {
+                    // NaN is 0xf97e00 in CBOR
+                    oa->write_character(to_char_type(0xF9));
+                    oa->write_character(to_char_type(0x7E));
+                    oa->write_character(to_char_type(0x00));
+                }
+                else if (std::isinf(j.m_value.number_float))
+                {
+                    // Infinity is 0xf97c00, -Infinity is 0xf9fc00
+                    oa->write_character(to_char_type(0xf9));
+                    oa->write_character(j.m_value.number_float > 0 ? to_char_type(0x7C) : to_char_type(0xFC));
+                    oa->write_character(to_char_type(0x00));
+                }
+                else
+                {
+                    write_compact_float(j.m_value.number_float, detail::input_format_t::cbor);
+                }
+                break;
+            }
+
+            case value_t::string:
+            {
+                // step 1: write control byte and the string length
+                const auto N = j.m_value.string->size();
+                if (N <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(0x60 + N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x78));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x79));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x7A));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+                // LCOV_EXCL_START
+                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x7B));
+                    write_number(static_cast<std::uint64_t>(N));
+                }
+                // LCOV_EXCL_STOP
+
+                // step 2: write the string
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_value.string->c_str()),
+                    j.m_value.string->size());
+                break;
+            }
+
+            case value_t::array:
+            {
+                // step 1: write control byte and the array size
+                const auto N = j.m_value.array->size();
+                if (N <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(0x80 + N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x98));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x99));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x9A));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+                // LCOV_EXCL_START
+                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x9B));
+                    write_number(static_cast<std::uint64_t>(N));
+                }
+                // LCOV_EXCL_STOP
+
+                // step 2: write each element
+                for (const auto& el : *j.m_value.array)
+                {
+                    write_cbor(el);
+                }
+                break;
+            }
+
+            case value_t::binary:
+            {
+                if (j.m_value.binary->has_subtype())
+                {
+                    if (j.m_value.binary->subtype() <= (std::numeric_limits<std::uint8_t>::max)())
+                    {
+                        write_number(static_cast<std::uint8_t>(0xd8));
+                        write_number(static_cast<std::uint8_t>(j.m_value.binary->subtype()));
+                    }
+                    else if (j.m_value.binary->subtype() <= (std::numeric_limits<std::uint16_t>::max)())
+                    {
+                        write_number(static_cast<std::uint8_t>(0xd9));
+                        write_number(static_cast<std::uint16_t>(j.m_value.binary->subtype()));
+                    }
+                    else if (j.m_value.binary->subtype() <= (std::numeric_limits<std::uint32_t>::max)())
+                    {
+                        write_number(static_cast<std::uint8_t>(0xda));
+                        write_number(static_cast<std::uint32_t>(j.m_value.binary->subtype()));
+                    }
+                    else if (j.m_value.binary->subtype() <= (std::numeric_limits<std::uint64_t>::max)())
+                    {
+                        write_number(static_cast<std::uint8_t>(0xdb));
+                        write_number(static_cast<std::uint64_t>(j.m_value.binary->subtype()));
+                    }
+                }
+
+                // step 1: write control byte and the binary array size
+                const auto N = j.m_value.binary->size();
+                if (N <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(0x40 + N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x58));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x59));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x5A));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+                // LCOV_EXCL_START
+                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x5B));
+                    write_number(static_cast<std::uint64_t>(N));
+                }
+                // LCOV_EXCL_STOP
+
+                // step 2: write each element
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_value.binary->data()),
+                    N);
+
+                break;
+            }
+
+            case value_t::object:
+            {
+                // step 1: write control byte and the object size
+                const auto N = j.m_value.object->size();
+                if (N <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(0xA0 + N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0xB8));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0xB9));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0xBA));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+                // LCOV_EXCL_START
+                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    oa->write_character(to_char_type(0xBB));
+                    write_number(static_cast<std::uint64_t>(N));
+                }
+                // LCOV_EXCL_STOP
+
+                // step 2: write each element
+                for (const auto& el : *j.m_value.object)
+                {
+                    write_cbor(el.first);
+                    write_cbor(el.second);
+                }
+                break;
+            }
+
+            case value_t::discarded:
+            default:
+                break;
+        }
+    }
+
+    /*!
+    @param[in] j  JSON value to serialize
+    */
+    void write_msgpack(const BasicJsonType& j)
+    {
+        switch (j.type())
+        {
+            case value_t::null: // nil
+            {
+                oa->write_character(to_char_type(0xC0));
+                break;
+            }
+
+            case value_t::boolean: // true and false
+            {
+                oa->write_character(j.m_value.boolean
+                                    ? to_char_type(0xC3)
+                                    : to_char_type(0xC2));
+                break;
+            }
+
+            case value_t::number_integer:
+            {
+                if (j.m_value.number_integer >= 0)
+                {
+                    // MessagePack does not differentiate between positive
+                    // signed integers and unsigned integers. Therefore, we used
+                    // the code from the value_t::number_unsigned case here.
+                    if (j.m_value.number_unsigned < 128)
+                    {
+                        // positive fixnum
+                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
+                    {
+                        // uint 8
+                        oa->write_character(to_char_type(0xCC));
+                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
+                    {
+                        // uint 16
+                        oa->write_character(to_char_type(0xCD));
+                        write_number(static_cast<std::uint16_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
+                    {
+                        // uint 32
+                        oa->write_character(to_char_type(0xCE));
+                        write_number(static_cast<std::uint32_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint64_t>::max)())
+                    {
+                        // uint 64
+                        oa->write_character(to_char_type(0xCF));
+                        write_number(static_cast<std::uint64_t>(j.m_value.number_integer));
+                    }
+                }
+                else
+                {
+                    if (j.m_value.number_integer >= -32)
+                    {
+                        // negative fixnum
+                        write_number(static_cast<std::int8_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int8_t>::min)() &&
+                             j.m_value.number_integer <= (std::numeric_limits<std::int8_t>::max)())
+                    {
+                        // int 8
+                        oa->write_character(to_char_type(0xD0));
+                        write_number(static_cast<std::int8_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int16_t>::min)() &&
+                             j.m_value.number_integer <= (std::numeric_limits<std::int16_t>::max)())
+                    {
+                        // int 16
+                        oa->write_character(to_char_type(0xD1));
+                        write_number(static_cast<std::int16_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int32_t>::min)() &&
+                             j.m_value.number_integer <= (std::numeric_limits<std::int32_t>::max)())
+                    {
+                        // int 32
+                        oa->write_character(to_char_type(0xD2));
+                        write_number(static_cast<std::int32_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int64_t>::min)() &&
+                             j.m_value.number_integer <= (std::numeric_limits<std::int64_t>::max)())
+                    {
+                        // int 64
+                        oa->write_character(to_char_type(0xD3));
+                        write_number(static_cast<std::int64_t>(j.m_value.number_integer));
+                    }
+                }
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                if (j.m_value.number_unsigned < 128)
+                {
+                    // positive fixnum
+                    write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    // uint 8
+                    oa->write_character(to_char_type(0xCC));
+                    write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    // uint 16
+                    oa->write_character(to_char_type(0xCD));
+                    write_number(static_cast<std::uint16_t>(j.m_value.number_integer));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    // uint 32
+                    oa->write_character(to_char_type(0xCE));
+                    write_number(static_cast<std::uint32_t>(j.m_value.number_integer));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    // uint 64
+                    oa->write_character(to_char_type(0xCF));
+                    write_number(static_cast<std::uint64_t>(j.m_value.number_integer));
+                }
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                write_compact_float(j.m_value.number_float, detail::input_format_t::msgpack);
+                break;
+            }
+
+            case value_t::string:
+            {
+                // step 1: write control byte and the string length
+                const auto N = j.m_value.string->size();
+                if (N <= 31)
+                {
+                    // fixstr
+                    write_number(static_cast<std::uint8_t>(0xA0 | N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    // str 8
+                    oa->write_character(to_char_type(0xD9));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    // str 16
+                    oa->write_character(to_char_type(0xDA));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    // str 32
+                    oa->write_character(to_char_type(0xDB));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+
+                // step 2: write the string
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_value.string->c_str()),
+                    j.m_value.string->size());
+                break;
+            }
+
+            case value_t::array:
+            {
+                // step 1: write control byte and the array size
+                const auto N = j.m_value.array->size();
+                if (N <= 15)
+                {
+                    // fixarray
+                    write_number(static_cast<std::uint8_t>(0x90 | N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    // array 16
+                    oa->write_character(to_char_type(0xDC));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    // array 32
+                    oa->write_character(to_char_type(0xDD));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+
+                // step 2: write each element
+                for (const auto& el : *j.m_value.array)
+                {
+                    write_msgpack(el);
+                }
+                break;
+            }
+
+            case value_t::binary:
+            {
+                // step 0: determine if the binary type has a set subtype to
+                // determine whether or not to use the ext or fixext types
+                const bool use_ext = j.m_value.binary->has_subtype();
+
+                // step 1: write control byte and the byte string length
+                const auto N = j.m_value.binary->size();
+                if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    std::uint8_t output_type{};
+                    bool fixed = true;
+                    if (use_ext)
+                    {
+                        switch (N)
+                        {
+                            case 1:
+                                output_type = 0xD4; // fixext 1
+                                break;
+                            case 2:
+                                output_type = 0xD5; // fixext 2
+                                break;
+                            case 4:
+                                output_type = 0xD6; // fixext 4
+                                break;
+                            case 8:
+                                output_type = 0xD7; // fixext 8
+                                break;
+                            case 16:
+                                output_type = 0xD8; // fixext 16
+                                break;
+                            default:
+                                output_type = 0xC7; // ext 8
+                                fixed = false;
+                                break;
+                        }
+
+                    }
+                    else
+                    {
+                        output_type = 0xC4; // bin 8
+                        fixed = false;
+                    }
+
+                    oa->write_character(to_char_type(output_type));
+                    if (!fixed)
+                    {
+                        write_number(static_cast<std::uint8_t>(N));
+                    }
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    std::uint8_t output_type = use_ext
+                                               ? 0xC8 // ext 16
+                                               : 0xC5; // bin 16
+
+                    oa->write_character(to_char_type(output_type));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    std::uint8_t output_type = use_ext
+                                               ? 0xC9 // ext 32
+                                               : 0xC6; // bin 32
+
+                    oa->write_character(to_char_type(output_type));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+
+                // step 1.5: if this is an ext type, write the subtype
+                if (use_ext)
+                {
+                    write_number(static_cast<std::int8_t>(j.m_value.binary->subtype()));
+                }
+
+                // step 2: write the byte string
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_value.binary->data()),
+                    N);
+
+                break;
+            }
+
+            case value_t::object:
+            {
+                // step 1: write control byte and the object size
+                const auto N = j.m_value.object->size();
+                if (N <= 15)
+                {
+                    // fixmap
+                    write_number(static_cast<std::uint8_t>(0x80 | (N & 0xF)));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    // map 16
+                    oa->write_character(to_char_type(0xDE));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    // map 32
+                    oa->write_character(to_char_type(0xDF));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+
+                // step 2: write each element
+                for (const auto& el : *j.m_value.object)
+                {
+                    write_msgpack(el.first);
+                    write_msgpack(el.second);
+                }
+                break;
+            }
+
+            case value_t::discarded:
+            default:
+                break;
+        }
+    }
+
+    /*!
+    @param[in] j  JSON value to serialize
+    @param[in] use_count   whether to use '#' prefixes (optimized format)
+    @param[in] use_type    whether to use '$' prefixes (optimized format)
+    @param[in] add_prefix  whether prefixes need to be used for this value
+    */
+    void write_ubjson(const BasicJsonType& j, const bool use_count,
+                      const bool use_type, const bool add_prefix = true)
+    {
+        switch (j.type())
+        {
+            case value_t::null:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('Z'));
+                }
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(j.m_value.boolean
+                                        ? to_char_type('T')
+                                        : to_char_type('F'));
+                }
+                break;
+            }
+
+            case value_t::number_integer:
+            {
+                write_number_with_ubjson_prefix(j.m_value.number_integer, add_prefix);
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                write_number_with_ubjson_prefix(j.m_value.number_unsigned, add_prefix);
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                write_number_with_ubjson_prefix(j.m_value.number_float, add_prefix);
+                break;
+            }
+
+            case value_t::string:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('S'));
+                }
+                write_number_with_ubjson_prefix(j.m_value.string->size(), true);
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_value.string->c_str()),
+                    j.m_value.string->size());
+                break;
+            }
+
+            case value_t::array:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('['));
+                }
+
+                bool prefix_required = true;
+                if (use_type && !j.m_value.array->empty())
+                {
+                    JSON_ASSERT(use_count);
+                    const CharType first_prefix = ubjson_prefix(j.front());
+                    const bool same_prefix = std::all_of(j.begin() + 1, j.end(),
+                                                         [this, first_prefix](const BasicJsonType & v)
+                    {
+                        return ubjson_prefix(v) == first_prefix;
+                    });
+
+                    if (same_prefix)
+                    {
+                        prefix_required = false;
+                        oa->write_character(to_char_type('$'));
+                        oa->write_character(first_prefix);
+                    }
+                }
+
+                if (use_count)
+                {
+                    oa->write_character(to_char_type('#'));
+                    write_number_with_ubjson_prefix(j.m_value.array->size(), true);
+                }
+
+                for (const auto& el : *j.m_value.array)
+                {
+                    write_ubjson(el, use_count, use_type, prefix_required);
+                }
+
+                if (!use_count)
+                {
+                    oa->write_character(to_char_type(']'));
+                }
+
+                break;
+            }
+
+            case value_t::binary:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('['));
+                }
+
+                if (use_type && !j.m_value.binary->empty())
+                {
+                    JSON_ASSERT(use_count);
+                    oa->write_character(to_char_type('$'));
+                    oa->write_character('U');
+                }
+
+                if (use_count)
+                {
+                    oa->write_character(to_char_type('#'));
+                    write_number_with_ubjson_prefix(j.m_value.binary->size(), true);
+                }
+
+                if (use_type)
+                {
+                    oa->write_characters(
+                        reinterpret_cast<const CharType*>(j.m_value.binary->data()),
+                        j.m_value.binary->size());
+                }
+                else
+                {
+                    for (size_t i = 0; i < j.m_value.binary->size(); ++i)
+                    {
+                        oa->write_character(to_char_type('U'));
+                        oa->write_character(j.m_value.binary->data()[i]);
+                    }
+                }
+
+                if (!use_count)
+                {
+                    oa->write_character(to_char_type(']'));
+                }
+
+                break;
+            }
+
+            case value_t::object:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('{'));
+                }
+
+                bool prefix_required = true;
+                if (use_type && !j.m_value.object->empty())
+                {
+                    JSON_ASSERT(use_count);
+                    const CharType first_prefix = ubjson_prefix(j.front());
+                    const bool same_prefix = std::all_of(j.begin(), j.end(),
+                                                         [this, first_prefix](const BasicJsonType & v)
+                    {
+                        return ubjson_prefix(v) == first_prefix;
+                    });
+
+                    if (same_prefix)
+                    {
+                        prefix_required = false;
+                        oa->write_character(to_char_type('$'));
+                        oa->write_character(first_prefix);
+                    }
+                }
+
+                if (use_count)
+                {
+                    oa->write_character(to_char_type('#'));
+                    write_number_with_ubjson_prefix(j.m_value.object->size(), true);
+                }
+
+                for (const auto& el : *j.m_value.object)
+                {
+                    write_number_with_ubjson_prefix(el.first.size(), true);
+                    oa->write_characters(
+                        reinterpret_cast<const CharType*>(el.first.c_str()),
+                        el.first.size());
+                    write_ubjson(el.second, use_count, use_type, prefix_required);
+                }
+
+                if (!use_count)
+                {
+                    oa->write_character(to_char_type('}'));
+                }
+
+                break;
+            }
+
+            case value_t::discarded:
+            default:
+                break;
+        }
+    }
+
+  private:
+    //////////
+    // BSON //
+    //////////
+
+    /*!
+    @return The size of a BSON document entry header, including the id marker
+            and the entry name size (and its null-terminator).
+    */
+    static std::size_t calc_bson_entry_header_size(const string_t& name, const BasicJsonType& j)
+    {
+        const auto it = name.find(static_cast<typename string_t::value_type>(0));
+        if (JSON_HEDLEY_UNLIKELY(it != BasicJsonType::string_t::npos))
+        {
+            JSON_THROW(out_of_range::create(409, "BSON key cannot contain code point U+0000 (at byte " + std::to_string(it) + ")", j));
+            static_cast<void>(j);
+        }
+
+        return /*id*/ 1ul + name.size() + /*zero-terminator*/1u;
+    }
+
+    /*!
+    @brief Writes the given @a element_type and @a name to the output adapter
+    */
+    void write_bson_entry_header(const string_t& name,
+                                 const std::uint8_t element_type)
+    {
+        oa->write_character(to_char_type(element_type)); // boolean
+        oa->write_characters(
+            reinterpret_cast<const CharType*>(name.c_str()),
+            name.size() + 1u);
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and boolean value @a value
+    */
+    void write_bson_boolean(const string_t& name,
+                            const bool value)
+    {
+        write_bson_entry_header(name, 0x08);
+        oa->write_character(value ? to_char_type(0x01) : to_char_type(0x00));
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and double value @a value
+    */
+    void write_bson_double(const string_t& name,
+                           const double value)
+    {
+        write_bson_entry_header(name, 0x01);
+        write_number<double, true>(value);
+    }
+
+    /*!
+    @return The size of the BSON-encoded string in @a value
+    */
+    static std::size_t calc_bson_string_size(const string_t& value)
+    {
+        return sizeof(std::int32_t) + value.size() + 1ul;
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and string value @a value
+    */
+    void write_bson_string(const string_t& name,
+                           const string_t& value)
+    {
+        write_bson_entry_header(name, 0x02);
+
+        write_number<std::int32_t, true>(static_cast<std::int32_t>(value.size() + 1ul));
+        oa->write_characters(
+            reinterpret_cast<const CharType*>(value.c_str()),
+            value.size() + 1);
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and null value
+    */
+    void write_bson_null(const string_t& name)
+    {
+        write_bson_entry_header(name, 0x0A);
+    }
+
+    /*!
+    @return The size of the BSON-encoded integer @a value
+    */
+    static std::size_t calc_bson_integer_size(const std::int64_t value)
+    {
+        return (std::numeric_limits<std::int32_t>::min)() <= value && value <= (std::numeric_limits<std::int32_t>::max)()
+               ? sizeof(std::int32_t)
+               : sizeof(std::int64_t);
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and integer @a value
+    */
+    void write_bson_integer(const string_t& name,
+                            const std::int64_t value)
+    {
+        if ((std::numeric_limits<std::int32_t>::min)() <= value && value <= (std::numeric_limits<std::int32_t>::max)())
+        {
+            write_bson_entry_header(name, 0x10); // int32
+            write_number<std::int32_t, true>(static_cast<std::int32_t>(value));
+        }
+        else
+        {
+            write_bson_entry_header(name, 0x12); // int64
+            write_number<std::int64_t, true>(static_cast<std::int64_t>(value));
+        }
+    }
+
+    /*!
+    @return The size of the BSON-encoded unsigned integer in @a j
+    */
+    static constexpr std::size_t calc_bson_unsigned_size(const std::uint64_t value) noexcept
+    {
+        return (value <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
+               ? sizeof(std::int32_t)
+               : sizeof(std::int64_t);
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and unsigned @a value
+    */
+    void write_bson_unsigned(const string_t& name,
+                             const BasicJsonType& j)
+    {
+        if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
+        {
+            write_bson_entry_header(name, 0x10 /* int32 */);
+            write_number<std::int32_t, true>(static_cast<std::int32_t>(j.m_value.number_unsigned));
+        }
+        else if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
+        {
+            write_bson_entry_header(name, 0x12 /* int64 */);
+            write_number<std::int64_t, true>(static_cast<std::int64_t>(j.m_value.number_unsigned));
+        }
+        else
+        {
+            JSON_THROW(out_of_range::create(407, "integer number " + std::to_string(j.m_value.number_unsigned) + " cannot be represented by BSON as it does not fit int64", j));
+        }
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and object @a value
+    */
+    void write_bson_object_entry(const string_t& name,
+                                 const typename BasicJsonType::object_t& value)
+    {
+        write_bson_entry_header(name, 0x03); // object
+        write_bson_object(value);
+    }
+
+    /*!
+    @return The size of the BSON-encoded array @a value
+    */
+    static std::size_t calc_bson_array_size(const typename BasicJsonType::array_t& value)
+    {
+        std::size_t array_index = 0ul;
+
+        const std::size_t embedded_document_size = std::accumulate(std::begin(value), std::end(value), static_cast<std::size_t>(0), [&array_index](std::size_t result, const typename BasicJsonType::array_t::value_type & el)
+        {
+            return result + calc_bson_element_size(std::to_string(array_index++), el);
+        });
+
+        return sizeof(std::int32_t) + embedded_document_size + 1ul;
+    }
+
+    /*!
+    @return The size of the BSON-encoded binary array @a value
+    */
+    static std::size_t calc_bson_binary_size(const typename BasicJsonType::binary_t& value)
+    {
+        return sizeof(std::int32_t) + value.size() + 1ul;
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and array @a value
+    */
+    void write_bson_array(const string_t& name,
+                          const typename BasicJsonType::array_t& value)
+    {
+        write_bson_entry_header(name, 0x04); // array
+        write_number<std::int32_t, true>(static_cast<std::int32_t>(calc_bson_array_size(value)));
+
+        std::size_t array_index = 0ul;
+
+        for (const auto& el : value)
+        {
+            write_bson_element(std::to_string(array_index++), el);
+        }
+
+        oa->write_character(to_char_type(0x00));
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and binary value @a value
+    */
+    void write_bson_binary(const string_t& name,
+                           const binary_t& value)
+    {
+        write_bson_entry_header(name, 0x05);
+
+        write_number<std::int32_t, true>(static_cast<std::int32_t>(value.size()));
+        write_number(value.has_subtype() ? static_cast<std::uint8_t>(value.subtype()) : static_cast<std::uint8_t>(0x00));
+
+        oa->write_characters(reinterpret_cast<const CharType*>(value.data()), value.size());
+    }
+
+    /*!
+    @brief Calculates the size necessary to serialize the JSON value @a j with its @a name
+    @return The calculated size for the BSON document entry for @a j with the given @a name.
+    */
+    static std::size_t calc_bson_element_size(const string_t& name,
+            const BasicJsonType& j)
+    {
+        const auto header_size = calc_bson_entry_header_size(name, j);
+        switch (j.type())
+        {
+            case value_t::object:
+                return header_size + calc_bson_object_size(*j.m_value.object);
+
+            case value_t::array:
+                return header_size + calc_bson_array_size(*j.m_value.array);
+
+            case value_t::binary:
+                return header_size + calc_bson_binary_size(*j.m_value.binary);
+
+            case value_t::boolean:
+                return header_size + 1ul;
+
+            case value_t::number_float:
+                return header_size + 8ul;
+
+            case value_t::number_integer:
+                return header_size + calc_bson_integer_size(j.m_value.number_integer);
+
+            case value_t::number_unsigned:
+                return header_size + calc_bson_unsigned_size(j.m_value.number_unsigned);
+
+            case value_t::string:
+                return header_size + calc_bson_string_size(*j.m_value.string);
+
+            case value_t::null:
+                return header_size + 0ul;
+
+            // LCOV_EXCL_START
+            case value_t::discarded:
+            default:
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert)
+                return 0ul;
+                // LCOV_EXCL_STOP
+        }
+    }
+
+    /*!
+    @brief Serializes the JSON value @a j to BSON and associates it with the
+           key @a name.
+    @param name The name to associate with the JSON entity @a j within the
+                current BSON document
+    */
+    void write_bson_element(const string_t& name,
+                            const BasicJsonType& j)
+    {
+        switch (j.type())
+        {
+            case value_t::object:
+                return write_bson_object_entry(name, *j.m_value.object);
+
+            case value_t::array:
+                return write_bson_array(name, *j.m_value.array);
+
+            case value_t::binary:
+                return write_bson_binary(name, *j.m_value.binary);
+
+            case value_t::boolean:
+                return write_bson_boolean(name, j.m_value.boolean);
+
+            case value_t::number_float:
+                return write_bson_double(name, j.m_value.number_float);
+
+            case value_t::number_integer:
+                return write_bson_integer(name, j.m_value.number_integer);
+
+            case value_t::number_unsigned:
+                return write_bson_unsigned(name, j);
+
+            case value_t::string:
+                return write_bson_string(name, *j.m_value.string);
+
+            case value_t::null:
+                return write_bson_null(name);
+
+            // LCOV_EXCL_START
+            case value_t::discarded:
+            default:
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert)
+                return;
+                // LCOV_EXCL_STOP
+        }
+    }
+
+    /*!
+    @brief Calculates the size of the BSON serialization of the given
+           JSON-object @a j.
+    @param[in] value  JSON value to serialize
+    @pre       value.type() == value_t::object
+    */
+    static std::size_t calc_bson_object_size(const typename BasicJsonType::object_t& value)
+    {
+        std::size_t document_size = std::accumulate(value.begin(), value.end(), static_cast<std::size_t>(0),
+                                    [](size_t result, const typename BasicJsonType::object_t::value_type & el)
+        {
+            return result += calc_bson_element_size(el.first, el.second);
+        });
+
+        return sizeof(std::int32_t) + document_size + 1ul;
+    }
+
+    /*!
+    @param[in] value  JSON value to serialize
+    @pre       value.type() == value_t::object
+    */
+    void write_bson_object(const typename BasicJsonType::object_t& value)
+    {
+        write_number<std::int32_t, true>(static_cast<std::int32_t>(calc_bson_object_size(value)));
+
+        for (const auto& el : value)
+        {
+            write_bson_element(el.first, el.second);
+        }
+
+        oa->write_character(to_char_type(0x00));
+    }
+
+    //////////
+    // CBOR //
+    //////////
+
+    static constexpr CharType get_cbor_float_prefix(float /*unused*/)
+    {
+        return to_char_type(0xFA);  // Single-Precision Float
+    }
+
+    static constexpr CharType get_cbor_float_prefix(double /*unused*/)
+    {
+        return to_char_type(0xFB);  // Double-Precision Float
+    }
+
+    /////////////
+    // MsgPack //
+    /////////////
+
+    static constexpr CharType get_msgpack_float_prefix(float /*unused*/)
+    {
+        return to_char_type(0xCA);  // float 32
+    }
+
+    static constexpr CharType get_msgpack_float_prefix(double /*unused*/)
+    {
+        return to_char_type(0xCB);  // float 64
+    }
+
+    ////////////
+    // UBJSON //
+    ////////////
+
+    // UBJSON: write number (floating point)
+    template<typename NumberType, typename std::enable_if<
+                 std::is_floating_point<NumberType>::value, int>::type = 0>
+    void write_number_with_ubjson_prefix(const NumberType n,
+                                         const bool add_prefix)
+    {
+        if (add_prefix)
+        {
+            oa->write_character(get_ubjson_float_prefix(n));
+        }
+        write_number(n);
+    }
+
+    // UBJSON: write number (unsigned integer)
+    template<typename NumberType, typename std::enable_if<
+                 std::is_unsigned<NumberType>::value, int>::type = 0>
+    void write_number_with_ubjson_prefix(const NumberType n,
+                                         const bool add_prefix)
+    {
+        if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int8_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('i'));  // int8
+            }
+            write_number(static_cast<std::uint8_t>(n));
+        }
+        else if (n <= (std::numeric_limits<std::uint8_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('U'));  // uint8
+            }
+            write_number(static_cast<std::uint8_t>(n));
+        }
+        else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int16_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('I'));  // int16
+            }
+            write_number(static_cast<std::int16_t>(n));
+        }
+        else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('l'));  // int32
+            }
+            write_number(static_cast<std::int32_t>(n));
+        }
+        else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('L'));  // int64
+            }
+            write_number(static_cast<std::int64_t>(n));
+        }
+        else
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('H'));  // high-precision number
+            }
+
+            const auto number = BasicJsonType(n).dump();
+            write_number_with_ubjson_prefix(number.size(), true);
+            for (std::size_t i = 0; i < number.size(); ++i)
+            {
+                oa->write_character(to_char_type(static_cast<std::uint8_t>(number[i])));
+            }
+        }
+    }
+
+    // UBJSON: write number (signed integer)
+    template < typename NumberType, typename std::enable_if <
+                   std::is_signed<NumberType>::value&&
+                   !std::is_floating_point<NumberType>::value, int >::type = 0 >
+    void write_number_with_ubjson_prefix(const NumberType n,
+                                         const bool add_prefix)
+    {
+        if ((std::numeric_limits<std::int8_t>::min)() <= n && n <= (std::numeric_limits<std::int8_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('i'));  // int8
+            }
+            write_number(static_cast<std::int8_t>(n));
+        }
+        else if (static_cast<std::int64_t>((std::numeric_limits<std::uint8_t>::min)()) <= n && n <= static_cast<std::int64_t>((std::numeric_limits<std::uint8_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('U'));  // uint8
+            }
+            write_number(static_cast<std::uint8_t>(n));
+        }
+        else if ((std::numeric_limits<std::int16_t>::min)() <= n && n <= (std::numeric_limits<std::int16_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('I'));  // int16
+            }
+            write_number(static_cast<std::int16_t>(n));
+        }
+        else if ((std::numeric_limits<std::int32_t>::min)() <= n && n <= (std::numeric_limits<std::int32_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('l'));  // int32
+            }
+            write_number(static_cast<std::int32_t>(n));
+        }
+        else if ((std::numeric_limits<std::int64_t>::min)() <= n && n <= (std::numeric_limits<std::int64_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('L'));  // int64
+            }
+            write_number(static_cast<std::int64_t>(n));
+        }
+        // LCOV_EXCL_START
+        else
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('H'));  // high-precision number
+            }
+
+            const auto number = BasicJsonType(n).dump();
+            write_number_with_ubjson_prefix(number.size(), true);
+            for (std::size_t i = 0; i < number.size(); ++i)
+            {
+                oa->write_character(to_char_type(static_cast<std::uint8_t>(number[i])));
+            }
+        }
+        // LCOV_EXCL_STOP
+    }
+
+    /*!
+    @brief determine the type prefix of container values
+    */
+    CharType ubjson_prefix(const BasicJsonType& j) const noexcept
+    {
+        switch (j.type())
+        {
+            case value_t::null:
+                return 'Z';
+
+            case value_t::boolean:
+                return j.m_value.boolean ? 'T' : 'F';
+
+            case value_t::number_integer:
+            {
+                if ((std::numeric_limits<std::int8_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::int8_t>::max)())
+                {
+                    return 'i';
+                }
+                if ((std::numeric_limits<std::uint8_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    return 'U';
+                }
+                if ((std::numeric_limits<std::int16_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::int16_t>::max)())
+                {
+                    return 'I';
+                }
+                if ((std::numeric_limits<std::int32_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::int32_t>::max)())
+                {
+                    return 'l';
+                }
+                if ((std::numeric_limits<std::int64_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::int64_t>::max)())
+                {
+                    return 'L';
+                }
+                // anything else is treated as high-precision number
+                return 'H'; // LCOV_EXCL_LINE
+            }
+
+            case value_t::number_unsigned:
+            {
+                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int8_t>::max)()))
+                {
+                    return 'i';
+                }
+                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::uint8_t>::max)()))
+                {
+                    return 'U';
+                }
+                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int16_t>::max)()))
+                {
+                    return 'I';
+                }
+                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
+                {
+                    return 'l';
+                }
+                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
+                {
+                    return 'L';
+                }
+                // anything else is treated as high-precision number
+                return 'H'; // LCOV_EXCL_LINE
+            }
+
+            case value_t::number_float:
+                return get_ubjson_float_prefix(j.m_value.number_float);
+
+            case value_t::string:
+                return 'S';
+
+            case value_t::array: // fallthrough
+            case value_t::binary:
+                return '[';
+
+            case value_t::object:
+                return '{';
+
+            case value_t::discarded:
+            default:  // discarded values
+                return 'N';
+        }
+    }
+
+    static constexpr CharType get_ubjson_float_prefix(float /*unused*/)
+    {
+        return 'd';  // float 32
+    }
+
+    static constexpr CharType get_ubjson_float_prefix(double /*unused*/)
+    {
+        return 'D';  // float 64
+    }
+
+    ///////////////////////
+    // Utility functions //
+    ///////////////////////
+
+    /*
+    @brief write a number to output input
+    @param[in] n number of type @a NumberType
+    @tparam NumberType the type of the number
+    @tparam OutputIsLittleEndian Set to true if output data is
+                                 required to be little endian
+
+    @note This function needs to respect the system's endianness, because bytes
+          in CBOR, MessagePack, and UBJSON are stored in network order (big
+          endian) and therefore need reordering on little endian systems.
+    */
+    template<typename NumberType, bool OutputIsLittleEndian = false>
+    void write_number(const NumberType n)
+    {
+        // step 1: write number to array of length NumberType
+        std::array<CharType, sizeof(NumberType)> vec{};
+        std::memcpy(vec.data(), &n, sizeof(NumberType));
+
+        // step 2: write array to output (with possible reordering)
+        if (is_little_endian != OutputIsLittleEndian)
+        {
+            // reverse byte order prior to conversion if necessary
+            std::reverse(vec.begin(), vec.end());
+        }
+
+        oa->write_characters(vec.data(), sizeof(NumberType));
+    }
+
+    void write_compact_float(const number_float_t n, detail::input_format_t format)
+    {
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+        if (static_cast<double>(n) >= static_cast<double>(std::numeric_limits<float>::lowest()) &&
+                static_cast<double>(n) <= static_cast<double>((std::numeric_limits<float>::max)()) &&
+                static_cast<double>(static_cast<float>(n)) == static_cast<double>(n))
+        {
+            oa->write_character(format == detail::input_format_t::cbor
+                                ? get_cbor_float_prefix(static_cast<float>(n))
+                                : get_msgpack_float_prefix(static_cast<float>(n)));
+            write_number(static_cast<float>(n));
+        }
+        else
+        {
+            oa->write_character(format == detail::input_format_t::cbor
+                                ? get_cbor_float_prefix(n)
+                                : get_msgpack_float_prefix(n));
+            write_number(n);
+        }
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+    }
+
+  public:
+    // The following to_char_type functions are implement the conversion
+    // between uint8_t and CharType. In case CharType is not unsigned,
+    // such a conversion is required to allow values greater than 128.
+    // See <https://github.com/nlohmann/json/issues/1286> for a discussion.
+    template < typename C = CharType,
+               enable_if_t < std::is_signed<C>::value && std::is_signed<char>::value > * = nullptr >
+    static constexpr CharType to_char_type(std::uint8_t x) noexcept
+    {
+        return *reinterpret_cast<char*>(&x);
+    }
+
+    template < typename C = CharType,
+               enable_if_t < std::is_signed<C>::value && std::is_unsigned<char>::value > * = nullptr >
+    static CharType to_char_type(std::uint8_t x) noexcept
+    {
+        static_assert(sizeof(std::uint8_t) == sizeof(CharType), "size of CharType must be equal to std::uint8_t");
+        static_assert(std::is_trivial<CharType>::value, "CharType must be trivial");
+        CharType result;
+        std::memcpy(&result, &x, sizeof(x));
+        return result;
+    }
+
+    template<typename C = CharType,
+             enable_if_t<std::is_unsigned<C>::value>* = nullptr>
+    static constexpr CharType to_char_type(std::uint8_t x) noexcept
+    {
+        return x;
+    }
+
+    template < typename InputCharType, typename C = CharType,
+               enable_if_t <
+                   std::is_signed<C>::value &&
+                   std::is_signed<char>::value &&
+                   std::is_same<char, typename std::remove_cv<InputCharType>::type>::value
+                   > * = nullptr >
+    static constexpr CharType to_char_type(InputCharType x) noexcept
+    {
+        return x;
+    }
+
+  private:
+    /// whether we can assume little endianness
+    const bool is_little_endian = little_endianness();
+
+    /// the output
+    output_adapter_t<CharType> oa = nullptr;
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/output/output_adapters.hpp>
+
+// #include <nlohmann/detail/output/serializer.hpp>
+
+
+#include <algorithm> // reverse, remove, fill, find, none_of
+#include <array> // array
+#include <clocale> // localeconv, lconv
+#include <cmath> // labs, isfinite, isnan, signbit
+#include <cstddef> // size_t, ptrdiff_t
+#include <cstdint> // uint8_t
+#include <cstdio> // snprintf
+#include <limits> // numeric_limits
+#include <string> // string, char_traits
+#include <iomanip> // setfill, setw
+#include <sstream> // stringstream
+#include <type_traits> // is_same
+#include <utility> // move
+
+// #include <nlohmann/detail/conversions/to_chars.hpp>
+
+
+#include <array> // array
+#include <cmath>   // signbit, isfinite
+#include <cstdint> // intN_t, uintN_t
+#include <cstring> // memcpy, memmove
+#include <limits> // numeric_limits
+#include <type_traits> // conditional
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+
+/*!
+@brief implements the Grisu2 algorithm for binary to decimal floating-point
+conversion.
+
+This implementation is a slightly modified version of the reference
+implementation which may be obtained from
+http://florian.loitsch.com/publications (bench.tar.gz).
+
+The code is distributed under the MIT license, Copyright (c) 2009 Florian Loitsch.
+
+For a detailed description of the algorithm see:
+
+[1] Loitsch, "Printing Floating-Point Numbers Quickly and Accurately with
+    Integers", Proceedings of the ACM SIGPLAN 2010 Conference on Programming
+    Language Design and Implementation, PLDI 2010
+[2] Burger, Dybvig, "Printing Floating-Point Numbers Quickly and Accurately",
+    Proceedings of the ACM SIGPLAN 1996 Conference on Programming Language
+    Design and Implementation, PLDI 1996
+*/
+namespace dtoa_impl
+{
+
+template<typename Target, typename Source>
+Target reinterpret_bits(const Source source)
+{
+    static_assert(sizeof(Target) == sizeof(Source), "size mismatch");
+
+    Target target;
+    std::memcpy(&target, &source, sizeof(Source));
+    return target;
+}
+
+struct diyfp // f * 2^e
+{
+    static constexpr int kPrecision = 64; // = q
+
+    std::uint64_t f = 0;
+    int e = 0;
+
+    constexpr diyfp(std::uint64_t f_, int e_) noexcept : f(f_), e(e_) {}
+
+    /*!
+    @brief returns x - y
+    @pre x.e == y.e and x.f >= y.f
+    */
+    static diyfp sub(const diyfp& x, const diyfp& y) noexcept
+    {
+        JSON_ASSERT(x.e == y.e);
+        JSON_ASSERT(x.f >= y.f);
+
+        return {x.f - y.f, x.e};
+    }
+
+    /*!
+    @brief returns x * y
+    @note The result is rounded. (Only the upper q bits are returned.)
+    */
+    static diyfp mul(const diyfp& x, const diyfp& y) noexcept
+    {
+        static_assert(kPrecision == 64, "internal error");
+
+        // Computes:
+        //  f = round((x.f * y.f) / 2^q)
+        //  e = x.e + y.e + q
+
+        // Emulate the 64-bit * 64-bit multiplication:
+        //
+        // p = u * v
+        //   = (u_lo + 2^32 u_hi) (v_lo + 2^32 v_hi)
+        //   = (u_lo v_lo         ) + 2^32 ((u_lo v_hi         ) + (u_hi v_lo         )) + 2^64 (u_hi v_hi         )
+        //   = (p0                ) + 2^32 ((p1                ) + (p2                )) + 2^64 (p3                )
+        //   = (p0_lo + 2^32 p0_hi) + 2^32 ((p1_lo + 2^32 p1_hi) + (p2_lo + 2^32 p2_hi)) + 2^64 (p3                )
+        //   = (p0_lo             ) + 2^32 (p0_hi + p1_lo + p2_lo                      ) + 2^64 (p1_hi + p2_hi + p3)
+        //   = (p0_lo             ) + 2^32 (Q                                          ) + 2^64 (H                 )
+        //   = (p0_lo             ) + 2^32 (Q_lo + 2^32 Q_hi                           ) + 2^64 (H                 )
+        //
+        // (Since Q might be larger than 2^32 - 1)
+        //
+        //   = (p0_lo + 2^32 Q_lo) + 2^64 (Q_hi + H)
+        //
+        // (Q_hi + H does not overflow a 64-bit int)
+        //
+        //   = p_lo + 2^64 p_hi
+
+        const std::uint64_t u_lo = x.f & 0xFFFFFFFFu;
+        const std::uint64_t u_hi = x.f >> 32u;
+        const std::uint64_t v_lo = y.f & 0xFFFFFFFFu;
+        const std::uint64_t v_hi = y.f >> 32u;
+
+        const std::uint64_t p0 = u_lo * v_lo;
+        const std::uint64_t p1 = u_lo * v_hi;
+        const std::uint64_t p2 = u_hi * v_lo;
+        const std::uint64_t p3 = u_hi * v_hi;
+
+        const std::uint64_t p0_hi = p0 >> 32u;
+        const std::uint64_t p1_lo = p1 & 0xFFFFFFFFu;
+        const std::uint64_t p1_hi = p1 >> 32u;
+        const std::uint64_t p2_lo = p2 & 0xFFFFFFFFu;
+        const std::uint64_t p2_hi = p2 >> 32u;
+
+        std::uint64_t Q = p0_hi + p1_lo + p2_lo;
+
+        // The full product might now be computed as
+        //
+        // p_hi = p3 + p2_hi + p1_hi + (Q >> 32)
+        // p_lo = p0_lo + (Q << 32)
+        //
+        // But in this particular case here, the full p_lo is not required.
+        // Effectively we only need to add the highest bit in p_lo to p_hi (and
+        // Q_hi + 1 does not overflow).
+
+        Q += std::uint64_t{1} << (64u - 32u - 1u); // round, ties up
+
+        const std::uint64_t h = p3 + p2_hi + p1_hi + (Q >> 32u);
+
+        return {h, x.e + y.e + 64};
+    }
+
+    /*!
+    @brief normalize x such that the significand is >= 2^(q-1)
+    @pre x.f != 0
+    */
+    static diyfp normalize(diyfp x) noexcept
+    {
+        JSON_ASSERT(x.f != 0);
+
+        while ((x.f >> 63u) == 0)
+        {
+            x.f <<= 1u;
+            x.e--;
+        }
+
+        return x;
+    }
+
+    /*!
+    @brief normalize x such that the result has the exponent E
+    @pre e >= x.e and the upper e - x.e bits of x.f must be zero.
+    */
+    static diyfp normalize_to(const diyfp& x, const int target_exponent) noexcept
+    {
+        const int delta = x.e - target_exponent;
+
+        JSON_ASSERT(delta >= 0);
+        JSON_ASSERT(((x.f << delta) >> delta) == x.f);
+
+        return {x.f << delta, target_exponent};
+    }
+};
+
+struct boundaries
+{
+    diyfp w;
+    diyfp minus;
+    diyfp plus;
+};
+
+/*!
+Compute the (normalized) diyfp representing the input number 'value' and its
+boundaries.
+
+@pre value must be finite and positive
+*/
+template<typename FloatType>
+boundaries compute_boundaries(FloatType value)
+{
+    JSON_ASSERT(std::isfinite(value));
+    JSON_ASSERT(value > 0);
+
+    // Convert the IEEE representation into a diyfp.
+    //
+    // If v is denormal:
+    //      value = 0.F * 2^(1 - bias) = (          F) * 2^(1 - bias - (p-1))
+    // If v is normalized:
+    //      value = 1.F * 2^(E - bias) = (2^(p-1) + F) * 2^(E - bias - (p-1))
+
+    static_assert(std::numeric_limits<FloatType>::is_iec559,
+                  "internal error: dtoa_short requires an IEEE-754 floating-point implementation");
+
+    constexpr int      kPrecision = std::numeric_limits<FloatType>::digits; // = p (includes the hidden bit)
+    constexpr int      kBias      = std::numeric_limits<FloatType>::max_exponent - 1 + (kPrecision - 1);
+    constexpr int      kMinExp    = 1 - kBias;
+    constexpr std::uint64_t kHiddenBit = std::uint64_t{1} << (kPrecision - 1); // = 2^(p-1)
+
+    using bits_type = typename std::conditional<kPrecision == 24, std::uint32_t, std::uint64_t >::type;
+
+    const auto bits = static_cast<std::uint64_t>(reinterpret_bits<bits_type>(value));
+    const std::uint64_t E = bits >> (kPrecision - 1);
+    const std::uint64_t F = bits & (kHiddenBit - 1);
+
+    const bool is_denormal = E == 0;
+    const diyfp v = is_denormal
+                    ? diyfp(F, kMinExp)
+                    : diyfp(F + kHiddenBit, static_cast<int>(E) - kBias);
+
+    // Compute the boundaries m- and m+ of the floating-point value
+    // v = f * 2^e.
+    //
+    // Determine v- and v+, the floating-point predecessor and successor if v,
+    // respectively.
+    //
+    //      v- = v - 2^e        if f != 2^(p-1) or e == e_min                (A)
+    //         = v - 2^(e-1)    if f == 2^(p-1) and e > e_min                (B)
+    //
+    //      v+ = v + 2^e
+    //
+    // Let m- = (v- + v) / 2 and m+ = (v + v+) / 2. All real numbers _strictly_
+    // between m- and m+ round to v, regardless of how the input rounding
+    // algorithm breaks ties.
+    //
+    //      ---+-------------+-------------+-------------+-------------+---  (A)
+    //         v-            m-            v             m+            v+
+    //
+    //      -----------------+------+------+-------------+-------------+---  (B)
+    //                       v-     m-     v             m+            v+
+
+    const bool lower_boundary_is_closer = F == 0 && E > 1;
+    const diyfp m_plus = diyfp(2 * v.f + 1, v.e - 1);
+    const diyfp m_minus = lower_boundary_is_closer
+                          ? diyfp(4 * v.f - 1, v.e - 2)  // (B)
+                          : diyfp(2 * v.f - 1, v.e - 1); // (A)
+
+    // Determine the normalized w+ = m+.
+    const diyfp w_plus = diyfp::normalize(m_plus);
+
+    // Determine w- = m- such that e_(w-) = e_(w+).
+    const diyfp w_minus = diyfp::normalize_to(m_minus, w_plus.e);
+
+    return {diyfp::normalize(v), w_minus, w_plus};
+}
+
+// Given normalized diyfp w, Grisu needs to find a (normalized) cached
+// power-of-ten c, such that the exponent of the product c * w = f * 2^e lies
+// within a certain range [alpha, gamma] (Definition 3.2 from [1])
+//
+//      alpha <= e = e_c + e_w + q <= gamma
+//
+// or
+//
+//      f_c * f_w * 2^alpha <= f_c 2^(e_c) * f_w 2^(e_w) * 2^q
+//                          <= f_c * f_w * 2^gamma
+//
+// Since c and w are normalized, i.e. 2^(q-1) <= f < 2^q, this implies
+//
+//      2^(q-1) * 2^(q-1) * 2^alpha <= c * w * 2^q < 2^q * 2^q * 2^gamma
+//
+// or
+//
+//      2^(q - 2 + alpha) <= c * w < 2^(q + gamma)
+//
+// The choice of (alpha,gamma) determines the size of the table and the form of
+// the digit generation procedure. Using (alpha,gamma)=(-60,-32) works out well
+// in practice:
+//
+// The idea is to cut the number c * w = f * 2^e into two parts, which can be
+// processed independently: An integral part p1, and a fractional part p2:
+//
+//      f * 2^e = ( (f div 2^-e) * 2^-e + (f mod 2^-e) ) * 2^e
+//              = (f div 2^-e) + (f mod 2^-e) * 2^e
+//              = p1 + p2 * 2^e
+//
+// The conversion of p1 into decimal form requires a series of divisions and
+// modulos by (a power of) 10. These operations are faster for 32-bit than for
+// 64-bit integers, so p1 should ideally fit into a 32-bit integer. This can be
+// achieved by choosing
+//
+//      -e >= 32   or   e <= -32 := gamma
+//
+// In order to convert the fractional part
+//
+//      p2 * 2^e = p2 / 2^-e = d[-1] / 10^1 + d[-2] / 10^2 + ...
+//
+// into decimal form, the fraction is repeatedly multiplied by 10 and the digits
+// d[-i] are extracted in order:
+//
+//      (10 * p2) div 2^-e = d[-1]
+//      (10 * p2) mod 2^-e = d[-2] / 10^1 + ...
+//
+// The multiplication by 10 must not overflow. It is sufficient to choose
+//
+//      10 * p2 < 16 * p2 = 2^4 * p2 <= 2^64.
+//
+// Since p2 = f mod 2^-e < 2^-e,
+//
+//      -e <= 60   or   e >= -60 := alpha
+
+constexpr int kAlpha = -60;
+constexpr int kGamma = -32;
+
+struct cached_power // c = f * 2^e ~= 10^k
+{
+    std::uint64_t f;
+    int e;
+    int k;
+};
+
+/*!
+For a normalized diyfp w = f * 2^e, this function returns a (normalized) cached
+power-of-ten c = f_c * 2^e_c, such that the exponent of the product w * c
+satisfies (Definition 3.2 from [1])
+
+     alpha <= e_c + e + q <= gamma.
+*/
+inline cached_power get_cached_power_for_binary_exponent(int e)
+{
+    // Now
+    //
+    //      alpha <= e_c + e + q <= gamma                                    (1)
+    //      ==> f_c * 2^alpha <= c * 2^e * 2^q
+    //
+    // and since the c's are normalized, 2^(q-1) <= f_c,
+    //
+    //      ==> 2^(q - 1 + alpha) <= c * 2^(e + q)
+    //      ==> 2^(alpha - e - 1) <= c
+    //
+    // If c were an exact power of ten, i.e. c = 10^k, one may determine k as
+    //
+    //      k = ceil( log_10( 2^(alpha - e - 1) ) )
+    //        = ceil( (alpha - e - 1) * log_10(2) )
+    //
+    // From the paper:
+    // "In theory the result of the procedure could be wrong since c is rounded,
+    //  and the computation itself is approximated [...]. In practice, however,
+    //  this simple function is sufficient."
+    //
+    // For IEEE double precision floating-point numbers converted into
+    // normalized diyfp's w = f * 2^e, with q = 64,
+    //
+    //      e >= -1022      (min IEEE exponent)
+    //           -52        (p - 1)
+    //           -52        (p - 1, possibly normalize denormal IEEE numbers)
+    //           -11        (normalize the diyfp)
+    //         = -1137
+    //
+    // and
+    //
+    //      e <= +1023      (max IEEE exponent)
+    //           -52        (p - 1)
+    //           -11        (normalize the diyfp)
+    //         = 960
+    //
+    // This binary exponent range [-1137,960] results in a decimal exponent
+    // range [-307,324]. One does not need to store a cached power for each
+    // k in this range. For each such k it suffices to find a cached power
+    // such that the exponent of the product lies in [alpha,gamma].
+    // This implies that the difference of the decimal exponents of adjacent
+    // table entries must be less than or equal to
+    //
+    //      floor( (gamma - alpha) * log_10(2) ) = 8.
+    //
+    // (A smaller distance gamma-alpha would require a larger table.)
+
+    // NB:
+    // Actually this function returns c, such that -60 <= e_c + e + 64 <= -34.
+
+    constexpr int kCachedPowersMinDecExp = -300;
+    constexpr int kCachedPowersDecStep = 8;
+
+    static constexpr std::array<cached_power, 79> kCachedPowers =
+    {
+        {
+            { 0xAB70FE17C79AC6CA, -1060, -300 },
+            { 0xFF77B1FCBEBCDC4F, -1034, -292 },
+            { 0xBE5691EF416BD60C, -1007, -284 },
+            { 0x8DD01FAD907FFC3C,  -980, -276 },
+            { 0xD3515C2831559A83,  -954, -268 },
+            { 0x9D71AC8FADA6C9B5,  -927, -260 },
+            { 0xEA9C227723EE8BCB,  -901, -252 },
+            { 0xAECC49914078536D,  -874, -244 },
+            { 0x823C12795DB6CE57,  -847, -236 },
+            { 0xC21094364DFB5637,  -821, -228 },
+            { 0x9096EA6F3848984F,  -794, -220 },
+            { 0xD77485CB25823AC7,  -768, -212 },
+            { 0xA086CFCD97BF97F4,  -741, -204 },
+            { 0xEF340A98172AACE5,  -715, -196 },
+            { 0xB23867FB2A35B28E,  -688, -188 },
+            { 0x84C8D4DFD2C63F3B,  -661, -180 },
+            { 0xC5DD44271AD3CDBA,  -635, -172 },
+            { 0x936B9FCEBB25C996,  -608, -164 },
+            { 0xDBAC6C247D62A584,  -582, -156 },
+            { 0xA3AB66580D5FDAF6,  -555, -148 },
+            { 0xF3E2F893DEC3F126,  -529, -140 },
+            { 0xB5B5ADA8AAFF80B8,  -502, -132 },
+            { 0x87625F056C7C4A8B,  -475, -124 },
+            { 0xC9BCFF6034C13053,  -449, -116 },
+            { 0x964E858C91BA2655,  -422, -108 },
+            { 0xDFF9772470297EBD,  -396, -100 },
+            { 0xA6DFBD9FB8E5B88F,  -369,  -92 },
+            { 0xF8A95FCF88747D94,  -343,  -84 },
+            { 0xB94470938FA89BCF,  -316,  -76 },
+            { 0x8A08F0F8BF0F156B,  -289,  -68 },
+            { 0xCDB02555653131B6,  -263,  -60 },
+            { 0x993FE2C6D07B7FAC,  -236,  -52 },
+            { 0xE45C10C42A2B3B06,  -210,  -44 },
+            { 0xAA242499697392D3,  -183,  -36 },
+            { 0xFD87B5F28300CA0E,  -157,  -28 },
+            { 0xBCE5086492111AEB,  -130,  -20 },
+            { 0x8CBCCC096F5088CC,  -103,  -12 },
+            { 0xD1B71758E219652C,   -77,   -4 },
+            { 0x9C40000000000000,   -50,    4 },
+            { 0xE8D4A51000000000,   -24,   12 },
+            { 0xAD78EBC5AC620000,     3,   20 },
+            { 0x813F3978F8940984,    30,   28 },
+            { 0xC097CE7BC90715B3,    56,   36 },
+            { 0x8F7E32CE7BEA5C70,    83,   44 },
+            { 0xD5D238A4ABE98068,   109,   52 },
+            { 0x9F4F2726179A2245,   136,   60 },
+            { 0xED63A231D4C4FB27,   162,   68 },
+            { 0xB0DE65388CC8ADA8,   189,   76 },
+            { 0x83C7088E1AAB65DB,   216,   84 },
+            { 0xC45D1DF942711D9A,   242,   92 },
+            { 0x924D692CA61BE758,   269,  100 },
+            { 0xDA01EE641A708DEA,   295,  108 },
+            { 0xA26DA3999AEF774A,   322,  116 },
+            { 0xF209787BB47D6B85,   348,  124 },
+            { 0xB454E4A179DD1877,   375,  132 },
+            { 0x865B86925B9BC5C2,   402,  140 },
+            { 0xC83553C5C8965D3D,   428,  148 },
+            { 0x952AB45CFA97A0B3,   455,  156 },
+            { 0xDE469FBD99A05FE3,   481,  164 },
+            { 0xA59BC234DB398C25,   508,  172 },
+            { 0xF6C69A72A3989F5C,   534,  180 },
+            { 0xB7DCBF5354E9BECE,   561,  188 },
+            { 0x88FCF317F22241E2,   588,  196 },
+            { 0xCC20CE9BD35C78A5,   614,  204 },
+            { 0x98165AF37B2153DF,   641,  212 },
+            { 0xE2A0B5DC971F303A,   667,  220 },
+            { 0xA8D9D1535CE3B396,   694,  228 },
+            { 0xFB9B7CD9A4A7443C,   720,  236 },
+            { 0xBB764C4CA7A44410,   747,  244 },
+            { 0x8BAB8EEFB6409C1A,   774,  252 },
+            { 0xD01FEF10A657842C,   800,  260 },
+            { 0x9B10A4E5E9913129,   827,  268 },
+            { 0xE7109BFBA19C0C9D,   853,  276 },
+            { 0xAC2820D9623BF429,   880,  284 },
+            { 0x80444B5E7AA7CF85,   907,  292 },
+            { 0xBF21E44003ACDD2D,   933,  300 },
+            { 0x8E679C2F5E44FF8F,   960,  308 },
+            { 0xD433179D9C8CB841,   986,  316 },
+            { 0x9E19DB92B4E31BA9,  1013,  324 },
+        }
+    };
+
+    // This computation gives exactly the same results for k as
+    //      k = ceil((kAlpha - e - 1) * 0.30102999566398114)
+    // for |e| <= 1500, but doesn't require floating-point operations.
+    // NB: log_10(2) ~= 78913 / 2^18
+    JSON_ASSERT(e >= -1500);
+    JSON_ASSERT(e <=  1500);
+    const int f = kAlpha - e - 1;
+    const int k = (f * 78913) / (1 << 18) + static_cast<int>(f > 0);
+
+    const int index = (-kCachedPowersMinDecExp + k + (kCachedPowersDecStep - 1)) / kCachedPowersDecStep;
+    JSON_ASSERT(index >= 0);
+    JSON_ASSERT(static_cast<std::size_t>(index) < kCachedPowers.size());
+
+    const cached_power cached = kCachedPowers[static_cast<std::size_t>(index)];
+    JSON_ASSERT(kAlpha <= cached.e + e + 64);
+    JSON_ASSERT(kGamma >= cached.e + e + 64);
+
+    return cached;
+}
+
+/*!
+For n != 0, returns k, such that pow10 := 10^(k-1) <= n < 10^k.
+For n == 0, returns 1 and sets pow10 := 1.
+*/
+inline int find_largest_pow10(const std::uint32_t n, std::uint32_t& pow10)
+{
+    // LCOV_EXCL_START
+    if (n >= 1000000000)
+    {
+        pow10 = 1000000000;
+        return 10;
+    }
+    // LCOV_EXCL_STOP
+    if (n >= 100000000)
+    {
+        pow10 = 100000000;
+        return  9;
+    }
+    if (n >= 10000000)
+    {
+        pow10 = 10000000;
+        return  8;
+    }
+    if (n >= 1000000)
+    {
+        pow10 = 1000000;
+        return  7;
+    }
+    if (n >= 100000)
+    {
+        pow10 = 100000;
+        return  6;
+    }
+    if (n >= 10000)
+    {
+        pow10 = 10000;
+        return  5;
+    }
+    if (n >= 1000)
+    {
+        pow10 = 1000;
+        return  4;
+    }
+    if (n >= 100)
+    {
+        pow10 = 100;
+        return  3;
+    }
+    if (n >= 10)
+    {
+        pow10 = 10;
+        return  2;
+    }
+
+    pow10 = 1;
+    return 1;
+}
+
+inline void grisu2_round(char* buf, int len, std::uint64_t dist, std::uint64_t delta,
+                         std::uint64_t rest, std::uint64_t ten_k)
+{
+    JSON_ASSERT(len >= 1);
+    JSON_ASSERT(dist <= delta);
+    JSON_ASSERT(rest <= delta);
+    JSON_ASSERT(ten_k > 0);
+
+    //               <--------------------------- delta ---->
+    //                                  <---- dist --------->
+    // --------------[------------------+-------------------]--------------
+    //               M-                 w                   M+
+    //
+    //                                  ten_k
+    //                                <------>
+    //                                       <---- rest ---->
+    // --------------[------------------+----+--------------]--------------
+    //                                  w    V
+    //                                       = buf * 10^k
+    //
+    // ten_k represents a unit-in-the-last-place in the decimal representation
+    // stored in buf.
+    // Decrement buf by ten_k while this takes buf closer to w.
+
+    // The tests are written in this order to avoid overflow in unsigned
+    // integer arithmetic.
+
+    while (rest < dist
+            && delta - rest >= ten_k
+            && (rest + ten_k < dist || dist - rest > rest + ten_k - dist))
+    {
+        JSON_ASSERT(buf[len - 1] != '0');
+        buf[len - 1]--;
+        rest += ten_k;
+    }
+}
+
+/*!
+Generates V = buffer * 10^decimal_exponent, such that M- <= V <= M+.
+M- and M+ must be normalized and share the same exponent -60 <= e <= -32.
+*/
+inline void grisu2_digit_gen(char* buffer, int& length, int& decimal_exponent,
+                             diyfp M_minus, diyfp w, diyfp M_plus)
+{
+    static_assert(kAlpha >= -60, "internal error");
+    static_assert(kGamma <= -32, "internal error");
+
+    // Generates the digits (and the exponent) of a decimal floating-point
+    // number V = buffer * 10^decimal_exponent in the range [M-, M+]. The diyfp's
+    // w, M- and M+ share the same exponent e, which satisfies alpha <= e <= gamma.
+    //
+    //               <--------------------------- delta ---->
+    //                                  <---- dist --------->
+    // --------------[------------------+-------------------]--------------
+    //               M-                 w                   M+
+    //
+    // Grisu2 generates the digits of M+ from left to right and stops as soon as
+    // V is in [M-,M+].
+
+    JSON_ASSERT(M_plus.e >= kAlpha);
+    JSON_ASSERT(M_plus.e <= kGamma);
+
+    std::uint64_t delta = diyfp::sub(M_plus, M_minus).f; // (significand of (M+ - M-), implicit exponent is e)
+    std::uint64_t dist  = diyfp::sub(M_plus, w      ).f; // (significand of (M+ - w ), implicit exponent is e)
+
+    // Split M+ = f * 2^e into two parts p1 and p2 (note: e < 0):
+    //
+    //      M+ = f * 2^e
+    //         = ((f div 2^-e) * 2^-e + (f mod 2^-e)) * 2^e
+    //         = ((p1        ) * 2^-e + (p2        )) * 2^e
+    //         = p1 + p2 * 2^e
+
+    const diyfp one(std::uint64_t{1} << -M_plus.e, M_plus.e);
+
+    auto p1 = static_cast<std::uint32_t>(M_plus.f >> -one.e); // p1 = f div 2^-e (Since -e >= 32, p1 fits into a 32-bit int.)
+    std::uint64_t p2 = M_plus.f & (one.f - 1);                    // p2 = f mod 2^-e
+
+    // 1)
+    //
+    // Generate the digits of the integral part p1 = d[n-1]...d[1]d[0]
+
+    JSON_ASSERT(p1 > 0);
+
+    std::uint32_t pow10{};
+    const int k = find_largest_pow10(p1, pow10);
+
+    //      10^(k-1) <= p1 < 10^k, pow10 = 10^(k-1)
+    //
+    //      p1 = (p1 div 10^(k-1)) * 10^(k-1) + (p1 mod 10^(k-1))
+    //         = (d[k-1]         ) * 10^(k-1) + (p1 mod 10^(k-1))
+    //
+    //      M+ = p1                                             + p2 * 2^e
+    //         = d[k-1] * 10^(k-1) + (p1 mod 10^(k-1))          + p2 * 2^e
+    //         = d[k-1] * 10^(k-1) + ((p1 mod 10^(k-1)) * 2^-e + p2) * 2^e
+    //         = d[k-1] * 10^(k-1) + (                         rest) * 2^e
+    //
+    // Now generate the digits d[n] of p1 from left to right (n = k-1,...,0)
+    //
+    //      p1 = d[k-1]...d[n] * 10^n + d[n-1]...d[0]
+    //
+    // but stop as soon as
+    //
+    //      rest * 2^e = (d[n-1]...d[0] * 2^-e + p2) * 2^e <= delta * 2^e
+
+    int n = k;
+    while (n > 0)
+    {
+        // Invariants:
+        //      M+ = buffer * 10^n + (p1 + p2 * 2^e)    (buffer = 0 for n = k)
+        //      pow10 = 10^(n-1) <= p1 < 10^n
+        //
+        const std::uint32_t d = p1 / pow10;  // d = p1 div 10^(n-1)
+        const std::uint32_t r = p1 % pow10;  // r = p1 mod 10^(n-1)
+        //
+        //      M+ = buffer * 10^n + (d * 10^(n-1) + r) + p2 * 2^e
+        //         = (buffer * 10 + d) * 10^(n-1) + (r + p2 * 2^e)
+        //
+        JSON_ASSERT(d <= 9);
+        buffer[length++] = static_cast<char>('0' + d); // buffer := buffer * 10 + d
+        //
+        //      M+ = buffer * 10^(n-1) + (r + p2 * 2^e)
+        //
+        p1 = r;
+        n--;
+        //
+        //      M+ = buffer * 10^n + (p1 + p2 * 2^e)
+        //      pow10 = 10^n
+        //
+
+        // Now check if enough digits have been generated.
+        // Compute
+        //
+        //      p1 + p2 * 2^e = (p1 * 2^-e + p2) * 2^e = rest * 2^e
+        //
+        // Note:
+        // Since rest and delta share the same exponent e, it suffices to
+        // compare the significands.
+        const std::uint64_t rest = (std::uint64_t{p1} << -one.e) + p2;
+        if (rest <= delta)
+        {
+            // V = buffer * 10^n, with M- <= V <= M+.
+
+            decimal_exponent += n;
+
+            // We may now just stop. But instead look if the buffer could be
+            // decremented to bring V closer to w.
+            //
+            // pow10 = 10^n is now 1 ulp in the decimal representation V.
+            // The rounding procedure works with diyfp's with an implicit
+            // exponent of e.
+            //
+            //      10^n = (10^n * 2^-e) * 2^e = ulp * 2^e
+            //
+            const std::uint64_t ten_n = std::uint64_t{pow10} << -one.e;
+            grisu2_round(buffer, length, dist, delta, rest, ten_n);
+
+            return;
+        }
+
+        pow10 /= 10;
+        //
+        //      pow10 = 10^(n-1) <= p1 < 10^n
+        // Invariants restored.
+    }
+
+    // 2)
+    //
+    // The digits of the integral part have been generated:
+    //
+    //      M+ = d[k-1]...d[1]d[0] + p2 * 2^e
+    //         = buffer            + p2 * 2^e
+    //
+    // Now generate the digits of the fractional part p2 * 2^e.
+    //
+    // Note:
+    // No decimal point is generated: the exponent is adjusted instead.
+    //
+    // p2 actually represents the fraction
+    //
+    //      p2 * 2^e
+    //          = p2 / 2^-e
+    //          = d[-1] / 10^1 + d[-2] / 10^2 + ...
+    //
+    // Now generate the digits d[-m] of p1 from left to right (m = 1,2,...)
+    //
+    //      p2 * 2^e = d[-1]d[-2]...d[-m] * 10^-m
+    //                      + 10^-m * (d[-m-1] / 10^1 + d[-m-2] / 10^2 + ...)
+    //
+    // using
+    //
+    //      10^m * p2 = ((10^m * p2) div 2^-e) * 2^-e + ((10^m * p2) mod 2^-e)
+    //                = (                   d) * 2^-e + (                   r)
+    //
+    // or
+    //      10^m * p2 * 2^e = d + r * 2^e
+    //
+    // i.e.
+    //
+    //      M+ = buffer + p2 * 2^e
+    //         = buffer + 10^-m * (d + r * 2^e)
+    //         = (buffer * 10^m + d) * 10^-m + 10^-m * r * 2^e
+    //
+    // and stop as soon as 10^-m * r * 2^e <= delta * 2^e
+
+    JSON_ASSERT(p2 > delta);
+
+    int m = 0;
+    for (;;)
+    {
+        // Invariant:
+        //      M+ = buffer * 10^-m + 10^-m * (d[-m-1] / 10 + d[-m-2] / 10^2 + ...) * 2^e
+        //         = buffer * 10^-m + 10^-m * (p2                                 ) * 2^e
+        //         = buffer * 10^-m + 10^-m * (1/10 * (10 * p2)                   ) * 2^e
+        //         = buffer * 10^-m + 10^-m * (1/10 * ((10*p2 div 2^-e) * 2^-e + (10*p2 mod 2^-e)) * 2^e
+        //
+        JSON_ASSERT(p2 <= (std::numeric_limits<std::uint64_t>::max)() / 10);
+        p2 *= 10;
+        const std::uint64_t d = p2 >> -one.e;     // d = (10 * p2) div 2^-e
+        const std::uint64_t r = p2 & (one.f - 1); // r = (10 * p2) mod 2^-e
+        //
+        //      M+ = buffer * 10^-m + 10^-m * (1/10 * (d * 2^-e + r) * 2^e
+        //         = buffer * 10^-m + 10^-m * (1/10 * (d + r * 2^e))
+        //         = (buffer * 10 + d) * 10^(-m-1) + 10^(-m-1) * r * 2^e
+        //
+        JSON_ASSERT(d <= 9);
+        buffer[length++] = static_cast<char>('0' + d); // buffer := buffer * 10 + d
+        //
+        //      M+ = buffer * 10^(-m-1) + 10^(-m-1) * r * 2^e
+        //
+        p2 = r;
+        m++;
+        //
+        //      M+ = buffer * 10^-m + 10^-m * p2 * 2^e
+        // Invariant restored.
+
+        // Check if enough digits have been generated.
+        //
+        //      10^-m * p2 * 2^e <= delta * 2^e
+        //              p2 * 2^e <= 10^m * delta * 2^e
+        //                    p2 <= 10^m * delta
+        delta *= 10;
+        dist  *= 10;
+        if (p2 <= delta)
+        {
+            break;
+        }
+    }
+
+    // V = buffer * 10^-m, with M- <= V <= M+.
+
+    decimal_exponent -= m;
+
+    // 1 ulp in the decimal representation is now 10^-m.
+    // Since delta and dist are now scaled by 10^m, we need to do the
+    // same with ulp in order to keep the units in sync.
+    //
+    //      10^m * 10^-m = 1 = 2^-e * 2^e = ten_m * 2^e
+    //
+    const std::uint64_t ten_m = one.f;
+    grisu2_round(buffer, length, dist, delta, p2, ten_m);
+
+    // By construction this algorithm generates the shortest possible decimal
+    // number (Loitsch, Theorem 6.2) which rounds back to w.
+    // For an input number of precision p, at least
+    //
+    //      N = 1 + ceil(p * log_10(2))
+    //
+    // decimal digits are sufficient to identify all binary floating-point
+    // numbers (Matula, "In-and-Out conversions").
+    // This implies that the algorithm does not produce more than N decimal
+    // digits.
+    //
+    //      N = 17 for p = 53 (IEEE double precision)
+    //      N = 9  for p = 24 (IEEE single precision)
+}
+
+/*!
+v = buf * 10^decimal_exponent
+len is the length of the buffer (number of decimal digits)
+The buffer must be large enough, i.e. >= max_digits10.
+*/
+JSON_HEDLEY_NON_NULL(1)
+inline void grisu2(char* buf, int& len, int& decimal_exponent,
+                   diyfp m_minus, diyfp v, diyfp m_plus)
+{
+    JSON_ASSERT(m_plus.e == m_minus.e);
+    JSON_ASSERT(m_plus.e == v.e);
+
+    //  --------(-----------------------+-----------------------)--------    (A)
+    //          m-                      v                       m+
+    //
+    //  --------------------(-----------+-----------------------)--------    (B)
+    //                      m-          v                       m+
+    //
+    // First scale v (and m- and m+) such that the exponent is in the range
+    // [alpha, gamma].
+
+    const cached_power cached = get_cached_power_for_binary_exponent(m_plus.e);
+
+    const diyfp c_minus_k(cached.f, cached.e); // = c ~= 10^-k
+
+    // The exponent of the products is = v.e + c_minus_k.e + q and is in the range [alpha,gamma]
+    const diyfp w       = diyfp::mul(v,       c_minus_k);
+    const diyfp w_minus = diyfp::mul(m_minus, c_minus_k);
+    const diyfp w_plus  = diyfp::mul(m_plus,  c_minus_k);
+
+    //  ----(---+---)---------------(---+---)---------------(---+---)----
+    //          w-                      w                       w+
+    //          = c*m-                  = c*v                   = c*m+
+    //
+    // diyfp::mul rounds its result and c_minus_k is approximated too. w, w- and
+    // w+ are now off by a small amount.
+    // In fact:
+    //
+    //      w - v * 10^k < 1 ulp
+    //
+    // To account for this inaccuracy, add resp. subtract 1 ulp.
+    //
+    //  --------+---[---------------(---+---)---------------]---+--------
+    //          w-  M-                  w                   M+  w+
+    //
+    // Now any number in [M-, M+] (bounds included) will round to w when input,
+    // regardless of how the input rounding algorithm breaks ties.
+    //
+    // And digit_gen generates the shortest possible such number in [M-, M+].
+    // Note that this does not mean that Grisu2 always generates the shortest
+    // possible number in the interval (m-, m+).
+    const diyfp M_minus(w_minus.f + 1, w_minus.e);
+    const diyfp M_plus (w_plus.f  - 1, w_plus.e );
+
+    decimal_exponent = -cached.k; // = -(-k) = k
+
+    grisu2_digit_gen(buf, len, decimal_exponent, M_minus, w, M_plus);
+}
+
+/*!
+v = buf * 10^decimal_exponent
+len is the length of the buffer (number of decimal digits)
+The buffer must be large enough, i.e. >= max_digits10.
+*/
+template<typename FloatType>
+JSON_HEDLEY_NON_NULL(1)
+void grisu2(char* buf, int& len, int& decimal_exponent, FloatType value)
+{
+    static_assert(diyfp::kPrecision >= std::numeric_limits<FloatType>::digits + 3,
+                  "internal error: not enough precision");
+
+    JSON_ASSERT(std::isfinite(value));
+    JSON_ASSERT(value > 0);
+
+    // If the neighbors (and boundaries) of 'value' are always computed for double-precision
+    // numbers, all float's can be recovered using strtod (and strtof). However, the resulting
+    // decimal representations are not exactly "short".
+    //
+    // The documentation for 'std::to_chars' (https://en.cppreference.com/w/cpp/utility/to_chars)
+    // says "value is converted to a string as if by std::sprintf in the default ("C") locale"
+    // and since sprintf promotes floats to doubles, I think this is exactly what 'std::to_chars'
+    // does.
+    // On the other hand, the documentation for 'std::to_chars' requires that "parsing the
+    // representation using the corresponding std::from_chars function recovers value exactly". That
+    // indicates that single precision floating-point numbers should be recovered using
+    // 'std::strtof'.
+    //
+    // NB: If the neighbors are computed for single-precision numbers, there is a single float
+    //     (7.0385307e-26f) which can't be recovered using strtod. The resulting double precision
+    //     value is off by 1 ulp.
+#if 0
+    const boundaries w = compute_boundaries(static_cast<double>(value));
+#else
+    const boundaries w = compute_boundaries(value);
+#endif
+
+    grisu2(buf, len, decimal_exponent, w.minus, w.w, w.plus);
+}
+
+/*!
+@brief appends a decimal representation of e to buf
+@return a pointer to the element following the exponent.
+@pre -1000 < e < 1000
+*/
+JSON_HEDLEY_NON_NULL(1)
+JSON_HEDLEY_RETURNS_NON_NULL
+inline char* append_exponent(char* buf, int e)
+{
+    JSON_ASSERT(e > -1000);
+    JSON_ASSERT(e <  1000);
+
+    if (e < 0)
+    {
+        e = -e;
+        *buf++ = '-';
+    }
+    else
+    {
+        *buf++ = '+';
+    }
+
+    auto k = static_cast<std::uint32_t>(e);
+    if (k < 10)
+    {
+        // Always print at least two digits in the exponent.
+        // This is for compatibility with printf("%g").
+        *buf++ = '0';
+        *buf++ = static_cast<char>('0' + k);
+    }
+    else if (k < 100)
+    {
+        *buf++ = static_cast<char>('0' + k / 10);
+        k %= 10;
+        *buf++ = static_cast<char>('0' + k);
+    }
+    else
+    {
+        *buf++ = static_cast<char>('0' + k / 100);
+        k %= 100;
+        *buf++ = static_cast<char>('0' + k / 10);
+        k %= 10;
+        *buf++ = static_cast<char>('0' + k);
+    }
+
+    return buf;
+}
+
+/*!
+@brief prettify v = buf * 10^decimal_exponent
+
+If v is in the range [10^min_exp, 10^max_exp) it will be printed in fixed-point
+notation. Otherwise it will be printed in exponential notation.
+
+@pre min_exp < 0
+@pre max_exp > 0
+*/
+JSON_HEDLEY_NON_NULL(1)
+JSON_HEDLEY_RETURNS_NON_NULL
+inline char* format_buffer(char* buf, int len, int decimal_exponent,
+                           int min_exp, int max_exp)
+{
+    JSON_ASSERT(min_exp < 0);
+    JSON_ASSERT(max_exp > 0);
+
+    const int k = len;
+    const int n = len + decimal_exponent;
+
+    // v = buf * 10^(n-k)
+    // k is the length of the buffer (number of decimal digits)
+    // n is the position of the decimal point relative to the start of the buffer.
+
+    if (k <= n && n <= max_exp)
+    {
+        // digits[000]
+        // len <= max_exp + 2
+
+        std::memset(buf + k, '0', static_cast<size_t>(n) - static_cast<size_t>(k));
+        // Make it look like a floating-point number (#362, #378)
+        buf[n + 0] = '.';
+        buf[n + 1] = '0';
+        return buf + (static_cast<size_t>(n) + 2);
+    }
+
+    if (0 < n && n <= max_exp)
+    {
+        // dig.its
+        // len <= max_digits10 + 1
+
+        JSON_ASSERT(k > n);
+
+        std::memmove(buf + (static_cast<size_t>(n) + 1), buf + n, static_cast<size_t>(k) - static_cast<size_t>(n));
+        buf[n] = '.';
+        return buf + (static_cast<size_t>(k) + 1U);
+    }
+
+    if (min_exp < n && n <= 0)
+    {
+        // 0.[000]digits
+        // len <= 2 + (-min_exp - 1) + max_digits10
+
+        std::memmove(buf + (2 + static_cast<size_t>(-n)), buf, static_cast<size_t>(k));
+        buf[0] = '0';
+        buf[1] = '.';
+        std::memset(buf + 2, '0', static_cast<size_t>(-n));
+        return buf + (2U + static_cast<size_t>(-n) + static_cast<size_t>(k));
+    }
+
+    if (k == 1)
+    {
+        // dE+123
+        // len <= 1 + 5
+
+        buf += 1;
+    }
+    else
+    {
+        // d.igitsE+123
+        // len <= max_digits10 + 1 + 5
+
+        std::memmove(buf + 2, buf + 1, static_cast<size_t>(k) - 1);
+        buf[1] = '.';
+        buf += 1 + static_cast<size_t>(k);
+    }
+
+    *buf++ = 'e';
+    return append_exponent(buf, n - 1);
+}
+
+} // namespace dtoa_impl
+
+/*!
+@brief generates a decimal representation of the floating-point number value in [first, last).
+
+The format of the resulting decimal representation is similar to printf's %g
+format. Returns an iterator pointing past-the-end of the decimal representation.
+
+@note The input number must be finite, i.e. NaN's and Inf's are not supported.
+@note The buffer must be large enough.
+@note The result is NOT null-terminated.
+*/
+template<typename FloatType>
+JSON_HEDLEY_NON_NULL(1, 2)
+JSON_HEDLEY_RETURNS_NON_NULL
+char* to_chars(char* first, const char* last, FloatType value)
+{
+    static_cast<void>(last); // maybe unused - fix warning
+    JSON_ASSERT(std::isfinite(value));
+
+    // Use signbit(value) instead of (value < 0) since signbit works for -0.
+    if (std::signbit(value))
+    {
+        value = -value;
+        *first++ = '-';
+    }
+
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+    if (value == 0) // +-0
+    {
+        *first++ = '0';
+        // Make it look like a floating-point number (#362, #378)
+        *first++ = '.';
+        *first++ = '0';
+        return first;
+    }
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+
+    JSON_ASSERT(last - first >= std::numeric_limits<FloatType>::max_digits10);
+
+    // Compute v = buffer * 10^decimal_exponent.
+    // The decimal digits are stored in the buffer, which needs to be interpreted
+    // as an unsigned decimal integer.
+    // len is the length of the buffer, i.e. the number of decimal digits.
+    int len = 0;
+    int decimal_exponent = 0;
+    dtoa_impl::grisu2(first, len, decimal_exponent, value);
+
+    JSON_ASSERT(len <= std::numeric_limits<FloatType>::max_digits10);
+
+    // Format the buffer like printf("%.*g", prec, value)
+    constexpr int kMinExp = -4;
+    // Use digits10 here to increase compatibility with version 2.
+    constexpr int kMaxExp = std::numeric_limits<FloatType>::digits10;
+
+    JSON_ASSERT(last - first >= kMaxExp + 2);
+    JSON_ASSERT(last - first >= 2 + (-kMinExp - 1) + std::numeric_limits<FloatType>::max_digits10);
+    JSON_ASSERT(last - first >= std::numeric_limits<FloatType>::max_digits10 + 6);
+
+    return dtoa_impl::format_buffer(first, len, decimal_exponent, kMinExp, kMaxExp);
+}
+
+} // namespace detail
+} // namespace nlohmann
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/output/binary_writer.hpp>
+
+// #include <nlohmann/detail/output/output_adapters.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+///////////////////
+// serialization //
+///////////////////
+
+/// how to treat decoding errors
+enum class error_handler_t
+{
+    strict,  ///< throw a type_error exception in case of invalid UTF-8
+    replace, ///< replace invalid UTF-8 sequences with U+FFFD
+    ignore   ///< ignore invalid UTF-8 sequences
+};
+
+template<typename BasicJsonType>
+class serializer
+{
+    using string_t = typename BasicJsonType::string_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using binary_char_t = typename BasicJsonType::binary_t::value_type;
+    static constexpr std::uint8_t UTF8_ACCEPT = 0;
+    static constexpr std::uint8_t UTF8_REJECT = 1;
+
+  public:
+    /*!
+    @param[in] s  output stream to serialize to
+    @param[in] ichar  indentation character to use
+    @param[in] error_handler_  how to react on decoding errors
+    */
+    serializer(output_adapter_t<char> s, const char ichar,
+               error_handler_t error_handler_ = error_handler_t::strict)
+        : o(std::move(s))
+        , loc(std::localeconv())
+        , thousands_sep(loc->thousands_sep == nullptr ? '\0' : std::char_traits<char>::to_char_type(* (loc->thousands_sep)))
+        , decimal_point(loc->decimal_point == nullptr ? '\0' : std::char_traits<char>::to_char_type(* (loc->decimal_point)))
+        , indent_char(ichar)
+        , indent_string(512, indent_char)
+        , error_handler(error_handler_)
+    {}
+
+    // delete because of pointer members
+    serializer(const serializer&) = delete;
+    serializer& operator=(const serializer&) = delete;
+    serializer(serializer&&) = delete;
+    serializer& operator=(serializer&&) = delete;
+    ~serializer() = default;
+
+    /*!
+    @brief internal implementation of the serialization function
+
+    This function is called by the public member function dump and organizes
+    the serialization internally. The indentation level is propagated as
+    additional parameter. In case of arrays and objects, the function is
+    called recursively.
+
+    - strings and object keys are escaped using `escape_string()`
+    - integer numbers are converted implicitly via `operator<<`
+    - floating-point numbers are converted to a string using `"%g"` format
+    - binary values are serialized as objects containing the subtype and the
+      byte array
+
+    @param[in] val               value to serialize
+    @param[in] pretty_print      whether the output shall be pretty-printed
+    @param[in] ensure_ascii If @a ensure_ascii is true, all non-ASCII characters
+    in the output are escaped with `\uXXXX` sequences, and the result consists
+    of ASCII characters only.
+    @param[in] indent_step       the indent level
+    @param[in] current_indent    the current indent level (only used internally)
+    */
+    void dump(const BasicJsonType& val,
+              const bool pretty_print,
+              const bool ensure_ascii,
+              const unsigned int indent_step,
+              const unsigned int current_indent = 0)
+    {
+        switch (val.m_type)
+        {
+            case value_t::object:
+            {
+                if (val.m_value.object->empty())
+                {
+                    o->write_characters("{}", 2);
+                    return;
+                }
+
+                if (pretty_print)
+                {
+                    o->write_characters("{\n", 2);
+
+                    // variable to hold indentation for recursive calls
+                    const auto new_indent = current_indent + indent_step;
+                    if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
+                    {
+                        indent_string.resize(indent_string.size() * 2, ' ');
+                    }
+
+                    // first n-1 elements
+                    auto i = val.m_value.object->cbegin();
+                    for (std::size_t cnt = 0; cnt < val.m_value.object->size() - 1; ++cnt, ++i)
+                    {
+                        o->write_characters(indent_string.c_str(), new_indent);
+                        o->write_character('\"');
+                        dump_escaped(i->first, ensure_ascii);
+                        o->write_characters("\": ", 3);
+                        dump(i->second, true, ensure_ascii, indent_step, new_indent);
+                        o->write_characters(",\n", 2);
+                    }
+
+                    // last element
+                    JSON_ASSERT(i != val.m_value.object->cend());
+                    JSON_ASSERT(std::next(i) == val.m_value.object->cend());
+                    o->write_characters(indent_string.c_str(), new_indent);
+                    o->write_character('\"');
+                    dump_escaped(i->first, ensure_ascii);
+                    o->write_characters("\": ", 3);
+                    dump(i->second, true, ensure_ascii, indent_step, new_indent);
+
+                    o->write_character('\n');
+                    o->write_characters(indent_string.c_str(), current_indent);
+                    o->write_character('}');
+                }
+                else
+                {
+                    o->write_character('{');
+
+                    // first n-1 elements
+                    auto i = val.m_value.object->cbegin();
+                    for (std::size_t cnt = 0; cnt < val.m_value.object->size() - 1; ++cnt, ++i)
+                    {
+                        o->write_character('\"');
+                        dump_escaped(i->first, ensure_ascii);
+                        o->write_characters("\":", 2);
+                        dump(i->second, false, ensure_ascii, indent_step, current_indent);
+                        o->write_character(',');
+                    }
+
+                    // last element
+                    JSON_ASSERT(i != val.m_value.object->cend());
+                    JSON_ASSERT(std::next(i) == val.m_value.object->cend());
+                    o->write_character('\"');
+                    dump_escaped(i->first, ensure_ascii);
+                    o->write_characters("\":", 2);
+                    dump(i->second, false, ensure_ascii, indent_step, current_indent);
+
+                    o->write_character('}');
+                }
+
+                return;
+            }
+
+            case value_t::array:
+            {
+                if (val.m_value.array->empty())
+                {
+                    o->write_characters("[]", 2);
+                    return;
+                }
+
+                if (pretty_print)
+                {
+                    o->write_characters("[\n", 2);
+
+                    // variable to hold indentation for recursive calls
+                    const auto new_indent = current_indent + indent_step;
+                    if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
+                    {
+                        indent_string.resize(indent_string.size() * 2, ' ');
+                    }
+
+                    // first n-1 elements
+                    for (auto i = val.m_value.array->cbegin();
+                            i != val.m_value.array->cend() - 1; ++i)
+                    {
+                        o->write_characters(indent_string.c_str(), new_indent);
+                        dump(*i, true, ensure_ascii, indent_step, new_indent);
+                        o->write_characters(",\n", 2);
+                    }
+
+                    // last element
+                    JSON_ASSERT(!val.m_value.array->empty());
+                    o->write_characters(indent_string.c_str(), new_indent);
+                    dump(val.m_value.array->back(), true, ensure_ascii, indent_step, new_indent);
+
+                    o->write_character('\n');
+                    o->write_characters(indent_string.c_str(), current_indent);
+                    o->write_character(']');
+                }
+                else
+                {
+                    o->write_character('[');
+
+                    // first n-1 elements
+                    for (auto i = val.m_value.array->cbegin();
+                            i != val.m_value.array->cend() - 1; ++i)
+                    {
+                        dump(*i, false, ensure_ascii, indent_step, current_indent);
+                        o->write_character(',');
+                    }
+
+                    // last element
+                    JSON_ASSERT(!val.m_value.array->empty());
+                    dump(val.m_value.array->back(), false, ensure_ascii, indent_step, current_indent);
+
+                    o->write_character(']');
+                }
+
+                return;
+            }
+
+            case value_t::string:
+            {
+                o->write_character('\"');
+                dump_escaped(*val.m_value.string, ensure_ascii);
+                o->write_character('\"');
+                return;
+            }
+
+            case value_t::binary:
+            {
+                if (pretty_print)
+                {
+                    o->write_characters("{\n", 2);
+
+                    // variable to hold indentation for recursive calls
+                    const auto new_indent = current_indent + indent_step;
+                    if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
+                    {
+                        indent_string.resize(indent_string.size() * 2, ' ');
+                    }
+
+                    o->write_characters(indent_string.c_str(), new_indent);
+
+                    o->write_characters("\"bytes\": [", 10);
+
+                    if (!val.m_value.binary->empty())
+                    {
+                        for (auto i = val.m_value.binary->cbegin();
+                                i != val.m_value.binary->cend() - 1; ++i)
+                        {
+                            dump_integer(*i);
+                            o->write_characters(", ", 2);
+                        }
+                        dump_integer(val.m_value.binary->back());
+                    }
+
+                    o->write_characters("],\n", 3);
+                    o->write_characters(indent_string.c_str(), new_indent);
+
+                    o->write_characters("\"subtype\": ", 11);
+                    if (val.m_value.binary->has_subtype())
+                    {
+                        dump_integer(val.m_value.binary->subtype());
+                    }
+                    else
+                    {
+                        o->write_characters("null", 4);
+                    }
+                    o->write_character('\n');
+                    o->write_characters(indent_string.c_str(), current_indent);
+                    o->write_character('}');
+                }
+                else
+                {
+                    o->write_characters("{\"bytes\":[", 10);
+
+                    if (!val.m_value.binary->empty())
+                    {
+                        for (auto i = val.m_value.binary->cbegin();
+                                i != val.m_value.binary->cend() - 1; ++i)
+                        {
+                            dump_integer(*i);
+                            o->write_character(',');
+                        }
+                        dump_integer(val.m_value.binary->back());
+                    }
+
+                    o->write_characters("],\"subtype\":", 12);
+                    if (val.m_value.binary->has_subtype())
+                    {
+                        dump_integer(val.m_value.binary->subtype());
+                        o->write_character('}');
+                    }
+                    else
+                    {
+                        o->write_characters("null}", 5);
+                    }
+                }
+                return;
+            }
+
+            case value_t::boolean:
+            {
+                if (val.m_value.boolean)
+                {
+                    o->write_characters("true", 4);
+                }
+                else
+                {
+                    o->write_characters("false", 5);
+                }
+                return;
+            }
+
+            case value_t::number_integer:
+            {
+                dump_integer(val.m_value.number_integer);
+                return;
+            }
+
+            case value_t::number_unsigned:
+            {
+                dump_integer(val.m_value.number_unsigned);
+                return;
+            }
+
+            case value_t::number_float:
+            {
+                dump_float(val.m_value.number_float);
+                return;
+            }
+
+            case value_t::discarded:
+            {
+                o->write_characters("<discarded>", 11);
+                return;
+            }
+
+            case value_t::null:
+            {
+                o->write_characters("null", 4);
+                return;
+            }
+
+            default:            // LCOV_EXCL_LINE
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+        }
+    }
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    /*!
+    @brief dump escaped string
+
+    Escape a string by replacing certain special characters by a sequence of an
+    escape character (backslash) and another character and other control
+    characters by a sequence of "\u" followed by a four-digit hex
+    representation. The escaped string is written to output stream @a o.
+
+    @param[in] s  the string to escape
+    @param[in] ensure_ascii  whether to escape non-ASCII characters with
+                             \uXXXX sequences
+
+    @complexity Linear in the length of string @a s.
+    */
+    void dump_escaped(const string_t& s, const bool ensure_ascii)
+    {
+        std::uint32_t codepoint{};
+        std::uint8_t state = UTF8_ACCEPT;
+        std::size_t bytes = 0;  // number of bytes written to string_buffer
+
+        // number of bytes written at the point of the last valid byte
+        std::size_t bytes_after_last_accept = 0;
+        std::size_t undumped_chars = 0;
+
+        for (std::size_t i = 0; i < s.size(); ++i)
+        {
+            const auto byte = static_cast<std::uint8_t>(s[i]);
+
+            switch (decode(state, codepoint, byte))
+            {
+                case UTF8_ACCEPT:  // decode found a new code point
+                {
+                    switch (codepoint)
+                    {
+                        case 0x08: // backspace
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 'b';
+                            break;
+                        }
+
+                        case 0x09: // horizontal tab
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 't';
+                            break;
+                        }
+
+                        case 0x0A: // newline
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 'n';
+                            break;
+                        }
+
+                        case 0x0C: // formfeed
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 'f';
+                            break;
+                        }
+
+                        case 0x0D: // carriage return
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 'r';
+                            break;
+                        }
+
+                        case 0x22: // quotation mark
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = '\"';
+                            break;
+                        }
+
+                        case 0x5C: // reverse solidus
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = '\\';
+                            break;
+                        }
+
+                        default:
+                        {
+                            // escape control characters (0x00..0x1F) or, if
+                            // ensure_ascii parameter is used, non-ASCII characters
+                            if ((codepoint <= 0x1F) || (ensure_ascii && (codepoint >= 0x7F)))
+                            {
+                                if (codepoint <= 0xFFFF)
+                                {
+                                    // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+                                    static_cast<void>((std::snprintf)(string_buffer.data() + bytes, 7, "\\u%04x",
+                                                                      static_cast<std::uint16_t>(codepoint)));
+                                    bytes += 6;
+                                }
+                                else
+                                {
+                                    // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+                                    static_cast<void>((std::snprintf)(string_buffer.data() + bytes, 13, "\\u%04x\\u%04x",
+                                                                      static_cast<std::uint16_t>(0xD7C0u + (codepoint >> 10u)),
+                                                                      static_cast<std::uint16_t>(0xDC00u + (codepoint & 0x3FFu))));
+                                    bytes += 12;
+                                }
+                            }
+                            else
+                            {
+                                // copy byte to buffer (all previous bytes
+                                // been copied have in default case above)
+                                string_buffer[bytes++] = s[i];
+                            }
+                            break;
+                        }
+                    }
+
+                    // write buffer and reset index; there must be 13 bytes
+                    // left, as this is the maximal number of bytes to be
+                    // written ("\uxxxx\uxxxx\0") for one code point
+                    if (string_buffer.size() - bytes < 13)
+                    {
+                        o->write_characters(string_buffer.data(), bytes);
+                        bytes = 0;
+                    }
+
+                    // remember the byte position of this accept
+                    bytes_after_last_accept = bytes;
+                    undumped_chars = 0;
+                    break;
+                }
+
+                case UTF8_REJECT:  // decode found invalid UTF-8 byte
+                {
+                    switch (error_handler)
+                    {
+                        case error_handler_t::strict:
+                        {
+                            std::stringstream ss;
+                            ss << std::uppercase << std::setfill('0') << std::setw(2) << std::hex << (byte | 0);
+                            JSON_THROW(type_error::create(316, "invalid UTF-8 byte at index " + std::to_string(i) + ": 0x" + ss.str(), BasicJsonType()));
+                        }
+
+                        case error_handler_t::ignore:
+                        case error_handler_t::replace:
+                        {
+                            // in case we saw this character the first time, we
+                            // would like to read it again, because the byte
+                            // may be OK for itself, but just not OK for the
+                            // previous sequence
+                            if (undumped_chars > 0)
+                            {
+                                --i;
+                            }
+
+                            // reset length buffer to the last accepted index;
+                            // thus removing/ignoring the invalid characters
+                            bytes = bytes_after_last_accept;
+
+                            if (error_handler == error_handler_t::replace)
+                            {
+                                // add a replacement character
+                                if (ensure_ascii)
+                                {
+                                    string_buffer[bytes++] = '\\';
+                                    string_buffer[bytes++] = 'u';
+                                    string_buffer[bytes++] = 'f';
+                                    string_buffer[bytes++] = 'f';
+                                    string_buffer[bytes++] = 'f';
+                                    string_buffer[bytes++] = 'd';
+                                }
+                                else
+                                {
+                                    string_buffer[bytes++] = detail::binary_writer<BasicJsonType, char>::to_char_type('\xEF');
+                                    string_buffer[bytes++] = detail::binary_writer<BasicJsonType, char>::to_char_type('\xBF');
+                                    string_buffer[bytes++] = detail::binary_writer<BasicJsonType, char>::to_char_type('\xBD');
+                                }
+
+                                // write buffer and reset index; there must be 13 bytes
+                                // left, as this is the maximal number of bytes to be
+                                // written ("\uxxxx\uxxxx\0") for one code point
+                                if (string_buffer.size() - bytes < 13)
+                                {
+                                    o->write_characters(string_buffer.data(), bytes);
+                                    bytes = 0;
+                                }
+
+                                bytes_after_last_accept = bytes;
+                            }
+
+                            undumped_chars = 0;
+
+                            // continue processing the string
+                            state = UTF8_ACCEPT;
+                            break;
+                        }
+
+                        default:            // LCOV_EXCL_LINE
+                            JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+                    }
+                    break;
+                }
+
+                default:  // decode found yet incomplete multi-byte code point
+                {
+                    if (!ensure_ascii)
+                    {
+                        // code point will not be escaped - copy byte to buffer
+                        string_buffer[bytes++] = s[i];
+                    }
+                    ++undumped_chars;
+                    break;
+                }
+            }
+        }
+
+        // we finished processing the string
+        if (JSON_HEDLEY_LIKELY(state == UTF8_ACCEPT))
+        {
+            // write buffer
+            if (bytes > 0)
+            {
+                o->write_characters(string_buffer.data(), bytes);
+            }
+        }
+        else
+        {
+            // we finish reading, but do not accept: string was incomplete
+            switch (error_handler)
+            {
+                case error_handler_t::strict:
+                {
+                    std::stringstream ss;
+                    ss << std::uppercase << std::setfill('0') << std::setw(2) << std::hex << (static_cast<std::uint8_t>(s.back()) | 0);
+                    JSON_THROW(type_error::create(316, "incomplete UTF-8 string; last byte: 0x" + ss.str(), BasicJsonType()));
+                }
+
+                case error_handler_t::ignore:
+                {
+                    // write all accepted bytes
+                    o->write_characters(string_buffer.data(), bytes_after_last_accept);
+                    break;
+                }
+
+                case error_handler_t::replace:
+                {
+                    // write all accepted bytes
+                    o->write_characters(string_buffer.data(), bytes_after_last_accept);
+                    // add a replacement character
+                    if (ensure_ascii)
+                    {
+                        o->write_characters("\\ufffd", 6);
+                    }
+                    else
+                    {
+                        o->write_characters("\xEF\xBF\xBD", 3);
+                    }
+                    break;
+                }
+
+                default:            // LCOV_EXCL_LINE
+                    JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+            }
+        }
+    }
+
+  private:
+    /*!
+    @brief count digits
+
+    Count the number of decimal (base 10) digits for an input unsigned integer.
+
+    @param[in] x  unsigned integer number to count its digits
+    @return    number of decimal digits
+    */
+    inline unsigned int count_digits(number_unsigned_t x) noexcept
+    {
+        unsigned int n_digits = 1;
+        for (;;)
+        {
+            if (x < 10)
+            {
+                return n_digits;
+            }
+            if (x < 100)
+            {
+                return n_digits + 1;
+            }
+            if (x < 1000)
+            {
+                return n_digits + 2;
+            }
+            if (x < 10000)
+            {
+                return n_digits + 3;
+            }
+            x = x / 10000u;
+            n_digits += 4;
+        }
+    }
+
+    // templates to avoid warnings about useless casts
+    template <typename NumberType, enable_if_t<std::is_signed<NumberType>::value, int> = 0>
+    bool is_negative_number(NumberType x)
+    {
+        return x < 0;
+    }
+
+    template < typename NumberType, enable_if_t <std::is_unsigned<NumberType>::value, int > = 0 >
+    bool is_negative_number(NumberType /*unused*/)
+    {
+        return false;
+    }
+
+    /*!
+    @brief dump an integer
+
+    Dump a given integer to output stream @a o. Works internally with
+    @a number_buffer.
+
+    @param[in] x  integer number (signed or unsigned) to dump
+    @tparam NumberType either @a number_integer_t or @a number_unsigned_t
+    */
+    template < typename NumberType, detail::enable_if_t <
+                   std::is_integral<NumberType>::value ||
+                   std::is_same<NumberType, number_unsigned_t>::value ||
+                   std::is_same<NumberType, number_integer_t>::value ||
+                   std::is_same<NumberType, binary_char_t>::value,
+                   int > = 0 >
+    void dump_integer(NumberType x)
+    {
+        static constexpr std::array<std::array<char, 2>, 100> digits_to_99
+        {
+            {
+                {{'0', '0'}}, {{'0', '1'}}, {{'0', '2'}}, {{'0', '3'}}, {{'0', '4'}}, {{'0', '5'}}, {{'0', '6'}}, {{'0', '7'}}, {{'0', '8'}}, {{'0', '9'}},
+                {{'1', '0'}}, {{'1', '1'}}, {{'1', '2'}}, {{'1', '3'}}, {{'1', '4'}}, {{'1', '5'}}, {{'1', '6'}}, {{'1', '7'}}, {{'1', '8'}}, {{'1', '9'}},
+                {{'2', '0'}}, {{'2', '1'}}, {{'2', '2'}}, {{'2', '3'}}, {{'2', '4'}}, {{'2', '5'}}, {{'2', '6'}}, {{'2', '7'}}, {{'2', '8'}}, {{'2', '9'}},
+                {{'3', '0'}}, {{'3', '1'}}, {{'3', '2'}}, {{'3', '3'}}, {{'3', '4'}}, {{'3', '5'}}, {{'3', '6'}}, {{'3', '7'}}, {{'3', '8'}}, {{'3', '9'}},
+                {{'4', '0'}}, {{'4', '1'}}, {{'4', '2'}}, {{'4', '3'}}, {{'4', '4'}}, {{'4', '5'}}, {{'4', '6'}}, {{'4', '7'}}, {{'4', '8'}}, {{'4', '9'}},
+                {{'5', '0'}}, {{'5', '1'}}, {{'5', '2'}}, {{'5', '3'}}, {{'5', '4'}}, {{'5', '5'}}, {{'5', '6'}}, {{'5', '7'}}, {{'5', '8'}}, {{'5', '9'}},
+                {{'6', '0'}}, {{'6', '1'}}, {{'6', '2'}}, {{'6', '3'}}, {{'6', '4'}}, {{'6', '5'}}, {{'6', '6'}}, {{'6', '7'}}, {{'6', '8'}}, {{'6', '9'}},
+                {{'7', '0'}}, {{'7', '1'}}, {{'7', '2'}}, {{'7', '3'}}, {{'7', '4'}}, {{'7', '5'}}, {{'7', '6'}}, {{'7', '7'}}, {{'7', '8'}}, {{'7', '9'}},
+                {{'8', '0'}}, {{'8', '1'}}, {{'8', '2'}}, {{'8', '3'}}, {{'8', '4'}}, {{'8', '5'}}, {{'8', '6'}}, {{'8', '7'}}, {{'8', '8'}}, {{'8', '9'}},
+                {{'9', '0'}}, {{'9', '1'}}, {{'9', '2'}}, {{'9', '3'}}, {{'9', '4'}}, {{'9', '5'}}, {{'9', '6'}}, {{'9', '7'}}, {{'9', '8'}}, {{'9', '9'}},
+            }
+        };
+
+        // special case for "0"
+        if (x == 0)
+        {
+            o->write_character('0');
+            return;
+        }
+
+        // use a pointer to fill the buffer
+        auto buffer_ptr = number_buffer.begin(); // NOLINT(llvm-qualified-auto,readability-qualified-auto,cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+
+        number_unsigned_t abs_value;
+
+        unsigned int n_chars{};
+
+        if (is_negative_number(x))
+        {
+            *buffer_ptr = '-';
+            abs_value = remove_sign(static_cast<number_integer_t>(x));
+
+            // account one more byte for the minus sign
+            n_chars = 1 + count_digits(abs_value);
+        }
+        else
+        {
+            abs_value = static_cast<number_unsigned_t>(x);
+            n_chars = count_digits(abs_value);
+        }
+
+        // spare 1 byte for '\0'
+        JSON_ASSERT(n_chars < number_buffer.size() - 1);
+
+        // jump to the end to generate the string from backward,
+        // so we later avoid reversing the result
+        buffer_ptr += n_chars;
+
+        // Fast int2ascii implementation inspired by "Fastware" talk by Andrei Alexandrescu
+        // See: https://www.youtube.com/watch?v=o4-CwDo2zpg
+        while (abs_value >= 100)
+        {
+            const auto digits_index = static_cast<unsigned>((abs_value % 100));
+            abs_value /= 100;
+            *(--buffer_ptr) = digits_to_99[digits_index][1];
+            *(--buffer_ptr) = digits_to_99[digits_index][0];
+        }
+
+        if (abs_value >= 10)
+        {
+            const auto digits_index = static_cast<unsigned>(abs_value);
+            *(--buffer_ptr) = digits_to_99[digits_index][1];
+            *(--buffer_ptr) = digits_to_99[digits_index][0];
+        }
+        else
+        {
+            *(--buffer_ptr) = static_cast<char>('0' + abs_value);
+        }
+
+        o->write_characters(number_buffer.data(), n_chars);
+    }
+
+    /*!
+    @brief dump a floating-point number
+
+    Dump a given floating-point number to output stream @a o. Works internally
+    with @a number_buffer.
+
+    @param[in] x  floating-point number to dump
+    */
+    void dump_float(number_float_t x)
+    {
+        // NaN / inf
+        if (!std::isfinite(x))
+        {
+            o->write_characters("null", 4);
+            return;
+        }
+
+        // If number_float_t is an IEEE-754 single or double precision number,
+        // use the Grisu2 algorithm to produce short numbers which are
+        // guaranteed to round-trip, using strtof and strtod, resp.
+        //
+        // NB: The test below works if <long double> == <double>.
+        static constexpr bool is_ieee_single_or_double
+            = (std::numeric_limits<number_float_t>::is_iec559 && std::numeric_limits<number_float_t>::digits == 24 && std::numeric_limits<number_float_t>::max_exponent == 128) ||
+              (std::numeric_limits<number_float_t>::is_iec559 && std::numeric_limits<number_float_t>::digits == 53 && std::numeric_limits<number_float_t>::max_exponent == 1024);
+
+        dump_float(x, std::integral_constant<bool, is_ieee_single_or_double>());
+    }
+
+    void dump_float(number_float_t x, std::true_type /*is_ieee_single_or_double*/)
+    {
+        auto* begin = number_buffer.data();
+        auto* end = ::nlohmann::detail::to_chars(begin, begin + number_buffer.size(), x);
+
+        o->write_characters(begin, static_cast<size_t>(end - begin));
+    }
+
+    void dump_float(number_float_t x, std::false_type /*is_ieee_single_or_double*/)
+    {
+        // get number of digits for a float -> text -> float round-trip
+        static constexpr auto d = std::numeric_limits<number_float_t>::max_digits10;
+
+        // the actual conversion
+        // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+        std::ptrdiff_t len = (std::snprintf)(number_buffer.data(), number_buffer.size(), "%.*g", d, x);
+
+        // negative value indicates an error
+        JSON_ASSERT(len > 0);
+        // check if buffer was large enough
+        JSON_ASSERT(static_cast<std::size_t>(len) < number_buffer.size());
+
+        // erase thousands separator
+        if (thousands_sep != '\0')
+        {
+            // NOLINTNEXTLINE(readability-qualified-auto,llvm-qualified-auto): std::remove returns an iterator, see https://github.com/nlohmann/json/issues/3081
+            const auto end = std::remove(number_buffer.begin(), number_buffer.begin() + len, thousands_sep);
+            std::fill(end, number_buffer.end(), '\0');
+            JSON_ASSERT((end - number_buffer.begin()) <= len);
+            len = (end - number_buffer.begin());
+        }
+
+        // convert decimal point to '.'
+        if (decimal_point != '\0' && decimal_point != '.')
+        {
+            // NOLINTNEXTLINE(readability-qualified-auto,llvm-qualified-auto): std::find returns an iterator, see https://github.com/nlohmann/json/issues/3081
+            const auto dec_pos = std::find(number_buffer.begin(), number_buffer.end(), decimal_point);
+            if (dec_pos != number_buffer.end())
+            {
+                *dec_pos = '.';
+            }
+        }
+
+        o->write_characters(number_buffer.data(), static_cast<std::size_t>(len));
+
+        // determine if we need to append ".0"
+        const bool value_is_int_like =
+            std::none_of(number_buffer.begin(), number_buffer.begin() + len + 1,
+                         [](char c)
+        {
+            return c == '.' || c == 'e';
+        });
+
+        if (value_is_int_like)
+        {
+            o->write_characters(".0", 2);
+        }
+    }
+
+    /*!
+    @brief check whether a string is UTF-8 encoded
+
+    The function checks each byte of a string whether it is UTF-8 encoded. The
+    result of the check is stored in the @a state parameter. The function must
+    be called initially with state 0 (accept). State 1 means the string must
+    be rejected, because the current byte is not allowed. If the string is
+    completely processed, but the state is non-zero, the string ended
+    prematurely; that is, the last byte indicated more bytes should have
+    followed.
+
+    @param[in,out] state  the state of the decoding
+    @param[in,out] codep  codepoint (valid only if resulting state is UTF8_ACCEPT)
+    @param[in] byte       next byte to decode
+    @return               new state
+
+    @note The function has been edited: a std::array is used.
+
+    @copyright Copyright (c) 2008-2009 Bjoern Hoehrmann <bjoern@hoehrmann.de>
+    @sa http://bjoern.hoehrmann.de/utf-8/decoder/dfa/
+    */
+    static std::uint8_t decode(std::uint8_t& state, std::uint32_t& codep, const std::uint8_t byte) noexcept
+    {
+        static const std::array<std::uint8_t, 400> utf8d =
+        {
+            {
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 00..1F
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 20..3F
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 40..5F
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 60..7F
+                1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, // 80..9F
+                7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // A0..BF
+                8, 8, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // C0..DF
+                0xA, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x4, 0x3, 0x3, // E0..EF
+                0xB, 0x6, 0x6, 0x6, 0x5, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, // F0..FF
+                0x0, 0x1, 0x2, 0x3, 0x5, 0x8, 0x7, 0x1, 0x1, 0x1, 0x4, 0x6, 0x1, 0x1, 0x1, 0x1, // s0..s0
+                1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, // s1..s2
+                1, 2, 1, 1, 1, 1, 1, 2, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, // s3..s4
+                1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, // s5..s6
+                1, 3, 1, 1, 1, 1, 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 // s7..s8
+            }
+        };
+
+        JSON_ASSERT(byte < utf8d.size());
+        const std::uint8_t type = utf8d[byte];
+
+        codep = (state != UTF8_ACCEPT)
+                ? (byte & 0x3fu) | (codep << 6u)
+                : (0xFFu >> type) & (byte);
+
+        std::size_t index = 256u + static_cast<size_t>(state) * 16u + static_cast<size_t>(type);
+        JSON_ASSERT(index < 400);
+        state = utf8d[index];
+        return state;
+    }
+
+    /*
+     * Overload to make the compiler happy while it is instantiating
+     * dump_integer for number_unsigned_t.
+     * Must never be called.
+     */
+    number_unsigned_t remove_sign(number_unsigned_t x)
+    {
+        JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+        return x; // LCOV_EXCL_LINE
+    }
+
+    /*
+     * Helper function for dump_integer
+     *
+     * This function takes a negative signed integer and returns its absolute
+     * value as unsigned integer. The plus/minus shuffling is necessary as we can
+     * not directly remove the sign of an arbitrary signed integer as the
+     * absolute values of INT_MIN and INT_MAX are usually not the same. See
+     * #1708 for details.
+     */
+    inline number_unsigned_t remove_sign(number_integer_t x) noexcept
+    {
+        JSON_ASSERT(x < 0 && x < (std::numeric_limits<number_integer_t>::max)()); // NOLINT(misc-redundant-expression)
+        return static_cast<number_unsigned_t>(-(x + 1)) + 1;
+    }
+
+  private:
+    /// the output of the serializer
+    output_adapter_t<char> o = nullptr;
+
+    /// a (hopefully) large enough character buffer
+    std::array<char, 64> number_buffer{{}};
+
+    /// the locale
+    const std::lconv* loc = nullptr;
+    /// the locale's thousand separator character
+    const char thousands_sep = '\0';
+    /// the locale's decimal point character
+    const char decimal_point = '\0';
+
+    /// string buffer
+    std::array<char, 512> string_buffer{{}};
+
+    /// the indentation character
+    const char indent_char;
+    /// the indentation string
+    string_t indent_string;
+
+    /// error_handler how to react on decoding errors
+    const error_handler_t error_handler;
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/value_t.hpp>
+
+// #include <nlohmann/json_fwd.hpp>
+
+// #include <nlohmann/ordered_map.hpp>
+
+
+#include <functional> // less
+#include <initializer_list> // initializer_list
+#include <iterator> // input_iterator_tag, iterator_traits
+#include <memory> // allocator
+#include <stdexcept> // for out_of_range
+#include <type_traits> // enable_if, is_convertible
+#include <utility> // pair
+#include <vector> // vector
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+namespace nlohmann
+{
+
+/// ordered_map: a minimal map-like container that preserves insertion order
+/// for use within nlohmann::basic_json<ordered_map>
+template <class Key, class T, class IgnoredLess = std::less<Key>,
+          class Allocator = std::allocator<std::pair<const Key, T>>>
+                  struct ordered_map : std::vector<std::pair<const Key, T>, Allocator>
+{
+    using key_type = Key;
+    using mapped_type = T;
+    using Container = std::vector<std::pair<const Key, T>, Allocator>;
+    using iterator = typename Container::iterator;
+    using const_iterator = typename Container::const_iterator;
+    using size_type = typename Container::size_type;
+    using value_type = typename Container::value_type;
+
+    // Explicit constructors instead of `using Container::Container`
+    // otherwise older compilers choke on it (GCC <= 5.5, xcode <= 9.4)
+    ordered_map(const Allocator& alloc = Allocator()) : Container{alloc} {}
+    template <class It>
+    ordered_map(It first, It last, const Allocator& alloc = Allocator())
+        : Container{first, last, alloc} {}
+    ordered_map(std::initializer_list<T> init, const Allocator& alloc = Allocator() )
+        : Container{init, alloc} {}
+
+    std::pair<iterator, bool> emplace(const key_type& key, T&& t)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (it->first == key)
+            {
+                return {it, false};
+            }
+        }
+        Container::emplace_back(key, t);
+        return {--this->end(), true};
+    }
+
+    T& operator[](const Key& key)
+    {
+        return emplace(key, T{}).first->second;
+    }
+
+    const T& operator[](const Key& key) const
+    {
+        return at(key);
+    }
+
+    T& at(const Key& key)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (it->first == key)
+            {
+                return it->second;
+            }
+        }
+
+        JSON_THROW(std::out_of_range("key not found"));
+    }
+
+    const T& at(const Key& key) const
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (it->first == key)
+            {
+                return it->second;
+            }
+        }
+
+        JSON_THROW(std::out_of_range("key not found"));
+    }
+
+    size_type erase(const Key& key)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (it->first == key)
+            {
+                // Since we cannot move const Keys, re-construct them in place
+                for (auto next = it; ++next != this->end(); ++it)
+                {
+                    it->~value_type(); // Destroy but keep allocation
+                    new (&*it) value_type{std::move(*next)};
+                }
+                Container::pop_back();
+                return 1;
+            }
+        }
+        return 0;
+    }
+
+    iterator erase(iterator pos)
+    {
+        return erase(pos, std::next(pos));
+    }
+
+    iterator erase(iterator first, iterator last)
+    {
+        const auto elements_affected = std::distance(first, last);
+        const auto offset = std::distance(Container::begin(), first);
+
+        // This is the start situation. We need to delete elements_affected
+        // elements (3 in this example: e, f, g), and need to return an
+        // iterator past the last deleted element (h in this example).
+        // Note that offset is the distance from the start of the vector
+        // to first. We will need this later.
+
+        // [ a, b, c, d, e, f, g, h, i, j ]
+        //               ^        ^
+        //             first    last
+
+        // Since we cannot move const Keys, we re-construct them in place.
+        // We start at first and re-construct (viz. copy) the elements from
+        // the back of the vector. Example for first iteration:
+
+        //               ,--------.
+        //               v        |   destroy e and re-construct with h
+        // [ a, b, c, d, e, f, g, h, i, j ]
+        //               ^        ^
+        //               it       it + elements_affected
+
+        for (auto it = first; std::next(it, elements_affected) != Container::end(); ++it)
+        {
+            it->~value_type(); // destroy but keep allocation
+            new (&*it) value_type{std::move(*std::next(it, elements_affected))}; // "move" next element to it
+        }
+
+        // [ a, b, c, d, h, i, j, h, i, j ]
+        //               ^        ^
+        //             first    last
+
+        // remove the unneeded elements at the end of the vector
+        Container::resize(this->size() - static_cast<size_type>(elements_affected));
+
+        // [ a, b, c, d, h, i, j ]
+        //               ^        ^
+        //             first    last
+
+        // first is now pointing past the last deleted element, but we cannot
+        // use this iterator, because it may have been invalidated by the
+        // resize call. Instead, we can return begin() + offset.
+        return Container::begin() + offset;
+    }
+
+    size_type count(const Key& key) const
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (it->first == key)
+            {
+                return 1;
+            }
+        }
+        return 0;
+    }
+
+    iterator find(const Key& key)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (it->first == key)
+            {
+                return it;
+            }
+        }
+        return Container::end();
+    }
+
+    const_iterator find(const Key& key) const
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (it->first == key)
+            {
+                return it;
+            }
+        }
+        return Container::end();
+    }
+
+    std::pair<iterator, bool> insert( value_type&& value )
+    {
+        return emplace(value.first, std::move(value.second));
+    }
+
+    std::pair<iterator, bool> insert( const value_type& value )
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (it->first == value.first)
+            {
+                return {it, false};
+            }
+        }
+        Container::push_back(value);
+        return {--this->end(), true};
+    }
+
+    template<typename InputIt>
+    using require_input_iter = typename std::enable_if<std::is_convertible<typename std::iterator_traits<InputIt>::iterator_category,
+            std::input_iterator_tag>::value>::type;
+
+    template<typename InputIt, typename = require_input_iter<InputIt>>
+    void insert(InputIt first, InputIt last)
+    {
+        for (auto it = first; it != last; ++it)
+        {
+            insert(*it);
+        }
+    }
+};
+
+}  // namespace nlohmann
+
+
+#if defined(JSON_HAS_CPP_17)
+    #include <string_view>
+#endif
+
+/*!
+@brief namespace for Niels Lohmann
+@see https://github.com/nlohmann
+@since version 1.0.0
+*/
+namespace nlohmann
+{
+
+/*!
+@brief a class to store JSON values
+
+@internal
+@invariant The member variables @a m_value and @a m_type have the following
+relationship:
+- If `m_type == value_t::object`, then `m_value.object != nullptr`.
+- If `m_type == value_t::array`, then `m_value.array != nullptr`.
+- If `m_type == value_t::string`, then `m_value.string != nullptr`.
+The invariants are checked by member function assert_invariant().
+
+@note ObjectType trick from https://stackoverflow.com/a/9860911
+@endinternal
+
+@since version 1.0.0
+
+@nosubgrouping
+*/
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-special-member-functions)
+{
+  private:
+    template<detail::value_t> friend struct detail::external_constructor;
+    friend ::nlohmann::json_pointer<basic_json>;
+
+    template<typename BasicJsonType, typename InputType>
+    friend class ::nlohmann::detail::parser;
+    friend ::nlohmann::detail::serializer<basic_json>;
+    template<typename BasicJsonType>
+    friend class ::nlohmann::detail::iter_impl;
+    template<typename BasicJsonType, typename CharType>
+    friend class ::nlohmann::detail::binary_writer;
+    template<typename BasicJsonType, typename InputType, typename SAX>
+    friend class ::nlohmann::detail::binary_reader;
+    template<typename BasicJsonType>
+    friend class ::nlohmann::detail::json_sax_dom_parser;
+    template<typename BasicJsonType>
+    friend class ::nlohmann::detail::json_sax_dom_callback_parser;
+    friend class ::nlohmann::detail::exception;
+
+    /// workaround type for MSVC
+    using basic_json_t = NLOHMANN_BASIC_JSON_TPL;
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    // convenience aliases for types residing in namespace detail;
+    using lexer = ::nlohmann::detail::lexer_base<basic_json>;
+
+    template<typename InputAdapterType>
+    static ::nlohmann::detail::parser<basic_json, InputAdapterType> parser(
+        InputAdapterType adapter,
+        detail::parser_callback_t<basic_json>cb = nullptr,
+        const bool allow_exceptions = true,
+        const bool ignore_comments = false
+                                 )
+    {
+        return ::nlohmann::detail::parser<basic_json, InputAdapterType>(std::move(adapter),
+                std::move(cb), allow_exceptions, ignore_comments);
+    }
+
+  private:
+    using primitive_iterator_t = ::nlohmann::detail::primitive_iterator_t;
+    template<typename BasicJsonType>
+    using internal_iterator = ::nlohmann::detail::internal_iterator<BasicJsonType>;
+    template<typename BasicJsonType>
+    using iter_impl = ::nlohmann::detail::iter_impl<BasicJsonType>;
+    template<typename Iterator>
+    using iteration_proxy = ::nlohmann::detail::iteration_proxy<Iterator>;
+    template<typename Base> using json_reverse_iterator = ::nlohmann::detail::json_reverse_iterator<Base>;
+
+    template<typename CharType>
+    using output_adapter_t = ::nlohmann::detail::output_adapter_t<CharType>;
+
+    template<typename InputType>
+    using binary_reader = ::nlohmann::detail::binary_reader<basic_json, InputType>;
+    template<typename CharType> using binary_writer = ::nlohmann::detail::binary_writer<basic_json, CharType>;
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    using serializer = ::nlohmann::detail::serializer<basic_json>;
+
+  public:
+    using value_t = detail::value_t;
+    /// JSON Pointer, see @ref nlohmann::json_pointer
+    using json_pointer = ::nlohmann::json_pointer<basic_json>;
+    template<typename T, typename SFINAE>
+    using json_serializer = JSONSerializer<T, SFINAE>;
+    /// how to treat decoding errors
+    using error_handler_t = detail::error_handler_t;
+    /// how to treat CBOR tags
+    using cbor_tag_handler_t = detail::cbor_tag_handler_t;
+    /// helper type for initializer lists of basic_json values
+    using initializer_list_t = std::initializer_list<detail::json_ref<basic_json>>;
+
+    using input_format_t = detail::input_format_t;
+    /// SAX interface type, see @ref nlohmann::json_sax
+    using json_sax_t = json_sax<basic_json>;
+
+    ////////////////
+    // exceptions //
+    ////////////////
+
+    /// @name exceptions
+    /// Classes to implement user-defined exceptions.
+    /// @{
+
+    using exception = detail::exception;
+    using parse_error = detail::parse_error;
+    using invalid_iterator = detail::invalid_iterator;
+    using type_error = detail::type_error;
+    using out_of_range = detail::out_of_range;
+    using other_error = detail::other_error;
+
+    /// @}
+
+
+    /////////////////////
+    // container types //
+    /////////////////////
+
+    /// @name container types
+    /// The canonic container types to use @ref basic_json like any other STL
+    /// container.
+    /// @{
+
+    /// the type of elements in a basic_json container
+    using value_type = basic_json;
+
+    /// the type of an element reference
+    using reference = value_type&;
+    /// the type of an element const reference
+    using const_reference = const value_type&;
+
+    /// a type to represent differences between iterators
+    using difference_type = std::ptrdiff_t;
+    /// a type to represent container sizes
+    using size_type = std::size_t;
+
+    /// the allocator type
+    using allocator_type = AllocatorType<basic_json>;
+
+    /// the type of an element pointer
+    using pointer = typename std::allocator_traits<allocator_type>::pointer;
+    /// the type of an element const pointer
+    using const_pointer = typename std::allocator_traits<allocator_type>::const_pointer;
+
+    /// an iterator for a basic_json container
+    using iterator = iter_impl<basic_json>;
+    /// a const iterator for a basic_json container
+    using const_iterator = iter_impl<const basic_json>;
+    /// a reverse iterator for a basic_json container
+    using reverse_iterator = json_reverse_iterator<typename basic_json::iterator>;
+    /// a const reverse iterator for a basic_json container
+    using const_reverse_iterator = json_reverse_iterator<typename basic_json::const_iterator>;
+
+    /// @}
+
+
+    /// @brief returns the allocator associated with the container
+    /// @sa https://json.nlohmann.me/api/basic_json/get_allocator/
+    static allocator_type get_allocator()
+    {
+        return allocator_type();
+    }
+
+    /// @brief returns version information on the library
+    /// @sa https://json.nlohmann.me/api/basic_json/meta/
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json meta()
+    {
+        basic_json result;
+
+        result["copyright"] = "(C) 2013-2022 Niels Lohmann";
+        result["name"] = "JSON for Modern C++";
+        result["url"] = "https://github.com/nlohmann/json";
+        result["version"]["string"] =
+            std::to_string(NLOHMANN_JSON_VERSION_MAJOR) + "." +
+            std::to_string(NLOHMANN_JSON_VERSION_MINOR) + "." +
+            std::to_string(NLOHMANN_JSON_VERSION_PATCH);
+        result["version"]["major"] = NLOHMANN_JSON_VERSION_MAJOR;
+        result["version"]["minor"] = NLOHMANN_JSON_VERSION_MINOR;
+        result["version"]["patch"] = NLOHMANN_JSON_VERSION_PATCH;
+
+#ifdef _WIN32
+        result["platform"] = "win32";
+#elif defined __linux__
+        result["platform"] = "linux";
+#elif defined __APPLE__
+        result["platform"] = "apple";
+#elif defined __unix__
+        result["platform"] = "unix";
+#else
+        result["platform"] = "unknown";
+#endif
+
+#if defined(__ICC) || defined(__INTEL_COMPILER)
+        result["compiler"] = {{"family", "icc"}, {"version", __INTEL_COMPILER}};
+#elif defined(__clang__)
+        result["compiler"] = {{"family", "clang"}, {"version", __clang_version__}};
+#elif defined(__GNUC__) || defined(__GNUG__)
+        result["compiler"] = {{"family", "gcc"}, {"version", std::to_string(__GNUC__) + "." + std::to_string(__GNUC_MINOR__) + "." + std::to_string(__GNUC_PATCHLEVEL__)}};
+#elif defined(__HP_cc) || defined(__HP_aCC)
+        result["compiler"] = "hp"
+#elif defined(__IBMCPP__)
+        result["compiler"] = {{"family", "ilecpp"}, {"version", __IBMCPP__}};
+#elif defined(_MSC_VER)
+        result["compiler"] = {{"family", "msvc"}, {"version", _MSC_VER}};
+#elif defined(__PGI)
+        result["compiler"] = {{"family", "pgcpp"}, {"version", __PGI}};
+#elif defined(__SUNPRO_CC)
+        result["compiler"] = {{"family", "sunpro"}, {"version", __SUNPRO_CC}};
+#else
+        result["compiler"] = {{"family", "unknown"}, {"version", "unknown"}};
+#endif
+
+#ifdef __cplusplus
+        result["compiler"]["c++"] = std::to_string(__cplusplus);
+#else
+        result["compiler"]["c++"] = "unknown";
+#endif
+        return result;
+    }
+
+
+    ///////////////////////////
+    // JSON value data types //
+    ///////////////////////////
+
+    /// @name JSON value data types
+    /// The data types to store a JSON value. These types are derived from
+    /// the template arguments passed to class @ref basic_json.
+    /// @{
+
+    /// @brief object key comparator type
+    /// @sa https://json.nlohmann.me/api/basic_json/object_comparator_t/
+#if defined(JSON_HAS_CPP_14)
+    // Use transparent comparator if possible, combined with perfect forwarding
+    // on find() and count() calls prevents unnecessary string construction.
+    using object_comparator_t = std::less<>;
+#else
+    using object_comparator_t = std::less<StringType>;
+#endif
+
+    /// @brief a type for an object
+    /// @sa https://json.nlohmann.me/api/basic_json/object_t/
+    using object_t = ObjectType<StringType,
+          basic_json,
+          object_comparator_t,
+          AllocatorType<std::pair<const StringType,
+          basic_json>>>;
+
+    /// @brief a type for an array
+    /// @sa https://json.nlohmann.me/api/basic_json/array_t/
+    using array_t = ArrayType<basic_json, AllocatorType<basic_json>>;
+
+    /// @brief a type for a string
+    /// @sa https://json.nlohmann.me/api/basic_json/string_t/
+    using string_t = StringType;
+
+    /// @brief a type for a boolean
+    /// @sa https://json.nlohmann.me/api/basic_json/boolean_t/
+    using boolean_t = BooleanType;
+
+    /// @brief a type for a number (integer)
+    /// @sa https://json.nlohmann.me/api/basic_json/number_integer_t/
+    using number_integer_t = NumberIntegerType;
+
+    /// @brief a type for a number (unsigned)
+    /// @sa https://json.nlohmann.me/api/basic_json/number_unsigned_t/
+    using number_unsigned_t = NumberUnsignedType;
+
+    /// @brief a type for a number (floating-point)
+    /// @sa https://json.nlohmann.me/api/basic_json/number_float_t/
+    using number_float_t = NumberFloatType;
+
+    /// @brief a type for a packed binary type
+    /// @sa https://json.nlohmann.me/api/basic_json/binary_t/
+    using binary_t = nlohmann::byte_container_with_subtype<BinaryType>;
+
+    /// @}
+
+  private:
+
+    /// helper for exception-safe object creation
+    template<typename T, typename... Args>
+    JSON_HEDLEY_RETURNS_NON_NULL
+    static T* create(Args&& ... args)
+    {
+        AllocatorType<T> alloc;
+        using AllocatorTraits = std::allocator_traits<AllocatorType<T>>;
+
+        auto deleter = [&](T * obj)
+        {
+            AllocatorTraits::deallocate(alloc, obj, 1);
+        };
+        std::unique_ptr<T, decltype(deleter)> obj(AllocatorTraits::allocate(alloc, 1), deleter);
+        AllocatorTraits::construct(alloc, obj.get(), std::forward<Args>(args)...);
+        JSON_ASSERT(obj != nullptr);
+        return obj.release();
+    }
+
+    ////////////////////////
+    // JSON value storage //
+    ////////////////////////
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    /*!
+    @brief a JSON value
+
+    The actual storage for a JSON value of the @ref basic_json class. This
+    union combines the different storage types for the JSON value types
+    defined in @ref value_t.
+
+    JSON type | value_t type    | used type
+    --------- | --------------- | ------------------------
+    object    | object          | pointer to @ref object_t
+    array     | array           | pointer to @ref array_t
+    string    | string          | pointer to @ref string_t
+    boolean   | boolean         | @ref boolean_t
+    number    | number_integer  | @ref number_integer_t
+    number    | number_unsigned | @ref number_unsigned_t
+    number    | number_float    | @ref number_float_t
+    binary    | binary          | pointer to @ref binary_t
+    null      | null            | *no value is stored*
+
+    @note Variable-length types (objects, arrays, and strings) are stored as
+    pointers. The size of the union should not exceed 64 bits if the default
+    value types are used.
+
+    @since version 1.0.0
+    */
+    union json_value
+    {
+        /// object (stored with pointer to save storage)
+        object_t* object;
+        /// array (stored with pointer to save storage)
+        array_t* array;
+        /// string (stored with pointer to save storage)
+        string_t* string;
+        /// binary (stored with pointer to save storage)
+        binary_t* binary;
+        /// boolean
+        boolean_t boolean;
+        /// number (integer)
+        number_integer_t number_integer;
+        /// number (unsigned integer)
+        number_unsigned_t number_unsigned;
+        /// number (floating-point)
+        number_float_t number_float;
+
+        /// default constructor (for null values)
+        json_value() = default;
+        /// constructor for booleans
+        json_value(boolean_t v) noexcept : boolean(v) {}
+        /// constructor for numbers (integer)
+        json_value(number_integer_t v) noexcept : number_integer(v) {}
+        /// constructor for numbers (unsigned)
+        json_value(number_unsigned_t v) noexcept : number_unsigned(v) {}
+        /// constructor for numbers (floating-point)
+        json_value(number_float_t v) noexcept : number_float(v) {}
+        /// constructor for empty values of a given type
+        json_value(value_t t)
+        {
+            switch (t)
+            {
+                case value_t::object:
+                {
+                    object = create<object_t>();
+                    break;
+                }
+
+                case value_t::array:
+                {
+                    array = create<array_t>();
+                    break;
+                }
+
+                case value_t::string:
+                {
+                    string = create<string_t>("");
+                    break;
+                }
+
+                case value_t::binary:
+                {
+                    binary = create<binary_t>();
+                    break;
+                }
+
+                case value_t::boolean:
+                {
+                    boolean = static_cast<boolean_t>(false);
+                    break;
+                }
+
+                case value_t::number_integer:
+                {
+                    number_integer = static_cast<number_integer_t>(0);
+                    break;
+                }
+
+                case value_t::number_unsigned:
+                {
+                    number_unsigned = static_cast<number_unsigned_t>(0);
+                    break;
+                }
+
+                case value_t::number_float:
+                {
+                    number_float = static_cast<number_float_t>(0.0);
+                    break;
+                }
+
+                case value_t::null:
+                {
+                    object = nullptr;  // silence warning, see #821
+                    break;
+                }
+
+                case value_t::discarded:
+                default:
+                {
+                    object = nullptr;  // silence warning, see #821
+                    if (JSON_HEDLEY_UNLIKELY(t == value_t::null))
+                    {
+                        JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.10.5", basic_json())); // LCOV_EXCL_LINE
+                    }
+                    break;
+                }
+            }
+        }
+
+        /// constructor for strings
+        json_value(const string_t& value) : string(create<string_t>(value)) {}
+
+        /// constructor for rvalue strings
+        json_value(string_t&& value) : string(create<string_t>(std::move(value))) {}
+
+        /// constructor for objects
+        json_value(const object_t& value) : object(create<object_t>(value)) {}
+
+        /// constructor for rvalue objects
+        json_value(object_t&& value) : object(create<object_t>(std::move(value))) {}
+
+        /// constructor for arrays
+        json_value(const array_t& value) : array(create<array_t>(value)) {}
+
+        /// constructor for rvalue arrays
+        json_value(array_t&& value) : array(create<array_t>(std::move(value))) {}
+
+        /// constructor for binary arrays
+        json_value(const typename binary_t::container_type& value) : binary(create<binary_t>(value)) {}
+
+        /// constructor for rvalue binary arrays
+        json_value(typename binary_t::container_type&& value) : binary(create<binary_t>(std::move(value))) {}
+
+        /// constructor for binary arrays (internal type)
+        json_value(const binary_t& value) : binary(create<binary_t>(value)) {}
+
+        /// constructor for rvalue binary arrays (internal type)
+        json_value(binary_t&& value) : binary(create<binary_t>(std::move(value))) {}
+
+        void destroy(value_t t)
+        {
+            if (t == value_t::array || t == value_t::object)
+            {
+                // flatten the current json_value to a heap-allocated stack
+                std::vector<basic_json> stack;
+
+                // move the top-level items to stack
+                if (t == value_t::array)
+                {
+                    stack.reserve(array->size());
+                    std::move(array->begin(), array->end(), std::back_inserter(stack));
+                }
+                else
+                {
+                    stack.reserve(object->size());
+                    for (auto&& it : *object)
+                    {
+                        stack.push_back(std::move(it.second));
+                    }
+                }
+
+                while (!stack.empty())
+                {
+                    // move the last item to local variable to be processed
+                    basic_json current_item(std::move(stack.back()));
+                    stack.pop_back();
+
+                    // if current_item is array/object, move
+                    // its children to the stack to be processed later
+                    if (current_item.is_array())
+                    {
+                        std::move(current_item.m_value.array->begin(), current_item.m_value.array->end(), std::back_inserter(stack));
+
+                        current_item.m_value.array->clear();
+                    }
+                    else if (current_item.is_object())
+                    {
+                        for (auto&& it : *current_item.m_value.object)
+                        {
+                            stack.push_back(std::move(it.second));
+                        }
+
+                        current_item.m_value.object->clear();
+                    }
+
+                    // it's now safe that current_item get destructed
+                    // since it doesn't have any children
+                }
+            }
+
+            switch (t)
+            {
+                case value_t::object:
+                {
+                    AllocatorType<object_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, object);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, object, 1);
+                    break;
+                }
+
+                case value_t::array:
+                {
+                    AllocatorType<array_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, array);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, array, 1);
+                    break;
+                }
+
+                case value_t::string:
+                {
+                    AllocatorType<string_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, string);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, string, 1);
+                    break;
+                }
+
+                case value_t::binary:
+                {
+                    AllocatorType<binary_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, binary);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, binary, 1);
+                    break;
+                }
+
+                case value_t::null:
+                case value_t::boolean:
+                case value_t::number_integer:
+                case value_t::number_unsigned:
+                case value_t::number_float:
+                case value_t::discarded:
+                default:
+                {
+                    break;
+                }
+            }
+        }
+    };
+
+  private:
+    /*!
+    @brief checks the class invariants
+
+    This function asserts the class invariants. It needs to be called at the
+    end of every constructor to make sure that created objects respect the
+    invariant. Furthermore, it has to be called each time the type of a JSON
+    value is changed, because the invariant expresses a relationship between
+    @a m_type and @a m_value.
+
+    Furthermore, the parent relation is checked for arrays and objects: If
+    @a check_parents true and the value is an array or object, then the
+    container's elements must have the current value as parent.
+
+    @param[in] check_parents  whether the parent relation should be checked.
+               The value is true by default and should only be set to false
+               during destruction of objects when the invariant does not
+               need to hold.
+    */
+    void assert_invariant(bool check_parents = true) const noexcept
+    {
+        JSON_ASSERT(m_type != value_t::object || m_value.object != nullptr);
+        JSON_ASSERT(m_type != value_t::array || m_value.array != nullptr);
+        JSON_ASSERT(m_type != value_t::string || m_value.string != nullptr);
+        JSON_ASSERT(m_type != value_t::binary || m_value.binary != nullptr);
+
+#if JSON_DIAGNOSTICS
+        JSON_TRY
+        {
+            // cppcheck-suppress assertWithSideEffect
+            JSON_ASSERT(!check_parents || !is_structured() || std::all_of(begin(), end(), [this](const basic_json & j)
+            {
+                return j.m_parent == this;
+            }));
+        }
+        JSON_CATCH(...) {} // LCOV_EXCL_LINE
+#endif
+        static_cast<void>(check_parents);
+    }
+
+    void set_parents()
+    {
+#if JSON_DIAGNOSTICS
+        switch (m_type)
+        {
+            case value_t::array:
+            {
+                for (auto& element : *m_value.array)
+                {
+                    element.m_parent = this;
+                }
+                break;
+            }
+
+            case value_t::object:
+            {
+                for (auto& element : *m_value.object)
+                {
+                    element.second.m_parent = this;
+                }
+                break;
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+                break;
+        }
+#endif
+    }
+
+    iterator set_parents(iterator it, typename iterator::difference_type count_set_parents)
+    {
+#if JSON_DIAGNOSTICS
+        for (typename iterator::difference_type i = 0; i < count_set_parents; ++i)
+        {
+            (it + i)->m_parent = this;
+        }
+#else
+        static_cast<void>(count_set_parents);
+#endif
+        return it;
+    }
+
+    reference set_parent(reference j, std::size_t old_capacity = static_cast<std::size_t>(-1))
+    {
+#if JSON_DIAGNOSTICS
+        if (old_capacity != static_cast<std::size_t>(-1))
+        {
+            // see https://github.com/nlohmann/json/issues/2838
+            JSON_ASSERT(type() == value_t::array);
+            if (JSON_HEDLEY_UNLIKELY(m_value.array->capacity() != old_capacity))
+            {
+                // capacity has changed: update all parents
+                set_parents();
+                return j;
+            }
+        }
+
+        // ordered_json uses a vector internally, so pointers could have
+        // been invalidated; see https://github.com/nlohmann/json/issues/2962
+#ifdef JSON_HEDLEY_MSVC_VERSION
+#pragma warning(push )
+#pragma warning(disable : 4127) // ignore warning to replace if with if constexpr
+#endif
+        if (detail::is_ordered_map<object_t>::value)
+        {
+            set_parents();
+            return j;
+        }
+#ifdef JSON_HEDLEY_MSVC_VERSION
+#pragma warning( pop )
+#endif
+
+        j.m_parent = this;
+#else
+        static_cast<void>(j);
+        static_cast<void>(old_capacity);
+#endif
+        return j;
+    }
+
+  public:
+    //////////////////////////
+    // JSON parser callback //
+    //////////////////////////
+
+    /// @brief parser event types
+    /// @sa https://json.nlohmann.me/api/basic_json/parse_event_t/
+    using parse_event_t = detail::parse_event_t;
+
+    /// @brief per-element parser callback type
+    /// @sa https://json.nlohmann.me/api/basic_json/parser_callback_t/
+    using parser_callback_t = detail::parser_callback_t<basic_json>;
+
+    //////////////////
+    // constructors //
+    //////////////////
+
+    /// @name constructors and destructors
+    /// Constructors of class @ref basic_json, copy/move constructor, copy
+    /// assignment, static functions creating objects, and the destructor.
+    /// @{
+
+    /// @brief create an empty value with a given type
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    basic_json(const value_t v)
+        : m_type(v), m_value(v)
+    {
+        assert_invariant();
+    }
+
+    /// @brief create a null object
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    basic_json(std::nullptr_t = nullptr) noexcept
+        : basic_json(value_t::null)
+    {
+        assert_invariant();
+    }
+
+    /// @brief create a JSON value from compatible types
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    template < typename CompatibleType,
+               typename U = detail::uncvref_t<CompatibleType>,
+               detail::enable_if_t <
+                   !detail::is_basic_json<U>::value && detail::is_compatible_type<basic_json_t, U>::value, int > = 0 >
+    basic_json(CompatibleType && val) noexcept(noexcept( // NOLINT(bugprone-forwarding-reference-overload,bugprone-exception-escape)
+                JSONSerializer<U>::to_json(std::declval<basic_json_t&>(),
+                                           std::forward<CompatibleType>(val))))
+    {
+        JSONSerializer<U>::to_json(*this, std::forward<CompatibleType>(val));
+        set_parents();
+        assert_invariant();
+    }
+
+    /// @brief create a JSON value from an existing one
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    template < typename BasicJsonType,
+               detail::enable_if_t <
+                   detail::is_basic_json<BasicJsonType>::value&& !std::is_same<basic_json, BasicJsonType>::value, int > = 0 >
+    basic_json(const BasicJsonType& val)
+    {
+        using other_boolean_t = typename BasicJsonType::boolean_t;
+        using other_number_float_t = typename BasicJsonType::number_float_t;
+        using other_number_integer_t = typename BasicJsonType::number_integer_t;
+        using other_number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+        using other_string_t = typename BasicJsonType::string_t;
+        using other_object_t = typename BasicJsonType::object_t;
+        using other_array_t = typename BasicJsonType::array_t;
+        using other_binary_t = typename BasicJsonType::binary_t;
+
+        switch (val.type())
+        {
+            case value_t::boolean:
+                JSONSerializer<other_boolean_t>::to_json(*this, val.template get<other_boolean_t>());
+                break;
+            case value_t::number_float:
+                JSONSerializer<other_number_float_t>::to_json(*this, val.template get<other_number_float_t>());
+                break;
+            case value_t::number_integer:
+                JSONSerializer<other_number_integer_t>::to_json(*this, val.template get<other_number_integer_t>());
+                break;
+            case value_t::number_unsigned:
+                JSONSerializer<other_number_unsigned_t>::to_json(*this, val.template get<other_number_unsigned_t>());
+                break;
+            case value_t::string:
+                JSONSerializer<other_string_t>::to_json(*this, val.template get_ref<const other_string_t&>());
+                break;
+            case value_t::object:
+                JSONSerializer<other_object_t>::to_json(*this, val.template get_ref<const other_object_t&>());
+                break;
+            case value_t::array:
+                JSONSerializer<other_array_t>::to_json(*this, val.template get_ref<const other_array_t&>());
+                break;
+            case value_t::binary:
+                JSONSerializer<other_binary_t>::to_json(*this, val.template get_ref<const other_binary_t&>());
+                break;
+            case value_t::null:
+                *this = nullptr;
+                break;
+            case value_t::discarded:
+                m_type = value_t::discarded;
+                break;
+            default:            // LCOV_EXCL_LINE
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+        }
+        set_parents();
+        assert_invariant();
+    }
+
+    /// @brief create a container (array or object) from an initializer list
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    basic_json(initializer_list_t init,
+               bool type_deduction = true,
+               value_t manual_type = value_t::array)
+    {
+        // check if each element is an array with two elements whose first
+        // element is a string
+        bool is_an_object = std::all_of(init.begin(), init.end(),
+                                        [](const detail::json_ref<basic_json>& element_ref)
+        {
+            return element_ref->is_array() && element_ref->size() == 2 && (*element_ref)[0].is_string();
+        });
+
+        // adjust type if type deduction is not wanted
+        if (!type_deduction)
+        {
+            // if array is wanted, do not create an object though possible
+            if (manual_type == value_t::array)
+            {
+                is_an_object = false;
+            }
+
+            // if object is wanted but impossible, throw an exception
+            if (JSON_HEDLEY_UNLIKELY(manual_type == value_t::object && !is_an_object))
+            {
+                JSON_THROW(type_error::create(301, "cannot create object from initializer list", basic_json()));
+            }
+        }
+
+        if (is_an_object)
+        {
+            // the initializer list is a list of pairs -> create object
+            m_type = value_t::object;
+            m_value = value_t::object;
+
+            for (auto& element_ref : init)
+            {
+                auto element = element_ref.moved_or_copied();
+                m_value.object->emplace(
+                    std::move(*((*element.m_value.array)[0].m_value.string)),
+                    std::move((*element.m_value.array)[1]));
+            }
+        }
+        else
+        {
+            // the initializer list describes an array -> create array
+            m_type = value_t::array;
+            m_value.array = create<array_t>(init.begin(), init.end());
+        }
+
+        set_parents();
+        assert_invariant();
+    }
+
+    /// @brief explicitly create a binary array (without subtype)
+    /// @sa https://json.nlohmann.me/api/basic_json/binary/
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json binary(const typename binary_t::container_type& init)
+    {
+        auto res = basic_json();
+        res.m_type = value_t::binary;
+        res.m_value = init;
+        return res;
+    }
+
+    /// @brief explicitly create a binary array (with subtype)
+    /// @sa https://json.nlohmann.me/api/basic_json/binary/
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json binary(const typename binary_t::container_type& init, typename binary_t::subtype_type subtype)
+    {
+        auto res = basic_json();
+        res.m_type = value_t::binary;
+        res.m_value = binary_t(init, subtype);
+        return res;
+    }
+
+    /// @brief explicitly create a binary array
+    /// @sa https://json.nlohmann.me/api/basic_json/binary/
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json binary(typename binary_t::container_type&& init)
+    {
+        auto res = basic_json();
+        res.m_type = value_t::binary;
+        res.m_value = std::move(init);
+        return res;
+    }
+
+    /// @brief explicitly create a binary array (with subtype)
+    /// @sa https://json.nlohmann.me/api/basic_json/binary/
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json binary(typename binary_t::container_type&& init, typename binary_t::subtype_type subtype)
+    {
+        auto res = basic_json();
+        res.m_type = value_t::binary;
+        res.m_value = binary_t(std::move(init), subtype);
+        return res;
+    }
+
+    /// @brief explicitly create an array from an initializer list
+    /// @sa https://json.nlohmann.me/api/basic_json/array/
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json array(initializer_list_t init = {})
+    {
+        return basic_json(init, false, value_t::array);
+    }
+
+    /// @brief explicitly create an object from an initializer list
+    /// @sa https://json.nlohmann.me/api/basic_json/object/
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json object(initializer_list_t init = {})
+    {
+        return basic_json(init, false, value_t::object);
+    }
+
+    /// @brief construct an array with count copies of given value
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    basic_json(size_type cnt, const basic_json& val)
+        : m_type(value_t::array)
+    {
+        m_value.array = create<array_t>(cnt, val);
+        set_parents();
+        assert_invariant();
+    }
+
+    /// @brief construct a JSON container given an iterator range
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    template < class InputIT, typename std::enable_if <
+                   std::is_same<InputIT, typename basic_json_t::iterator>::value ||
+                   std::is_same<InputIT, typename basic_json_t::const_iterator>::value, int >::type = 0 >
+    basic_json(InputIT first, InputIT last)
+    {
+        JSON_ASSERT(first.m_object != nullptr);
+        JSON_ASSERT(last.m_object != nullptr);
+
+        // make sure iterator fits the current value
+        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(201, "iterators are not compatible", basic_json()));
+        }
+
+        // copy type from first iterator
+        m_type = first.m_object->m_type;
+
+        // check if iterator range is complete for primitive values
+        switch (m_type)
+        {
+            case value_t::boolean:
+            case value_t::number_float:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::string:
+            {
+                if (JSON_HEDLEY_UNLIKELY(!first.m_it.primitive_iterator.is_begin()
+                                         || !last.m_it.primitive_iterator.is_end()))
+                {
+                    JSON_THROW(invalid_iterator::create(204, "iterators out of range", *first.m_object));
+                }
+                break;
+            }
+
+            case value_t::null:
+            case value_t::object:
+            case value_t::array:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+                break;
+        }
+
+        switch (m_type)
+        {
+            case value_t::number_integer:
+            {
+                m_value.number_integer = first.m_object->m_value.number_integer;
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                m_value.number_unsigned = first.m_object->m_value.number_unsigned;
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                m_value.number_float = first.m_object->m_value.number_float;
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                m_value.boolean = first.m_object->m_value.boolean;
+                break;
+            }
+
+            case value_t::string:
+            {
+                m_value = *first.m_object->m_value.string;
+                break;
+            }
+
+            case value_t::object:
+            {
+                m_value.object = create<object_t>(first.m_it.object_iterator,
+                                                  last.m_it.object_iterator);
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_value.array = create<array_t>(first.m_it.array_iterator,
+                                                last.m_it.array_iterator);
+                break;
+            }
+
+            case value_t::binary:
+            {
+                m_value = *first.m_object->m_value.binary;
+                break;
+            }
+
+            case value_t::null:
+            case value_t::discarded:
+            default:
+                JSON_THROW(invalid_iterator::create(206, "cannot construct with iterators from " + std::string(first.m_object->type_name()), *first.m_object));
+        }
+
+        set_parents();
+        assert_invariant();
+    }
+
+
+    ///////////////////////////////////////
+    // other constructors and destructor //
+    ///////////////////////////////////////
+
+    template<typename JsonRef,
+             detail::enable_if_t<detail::conjunction<detail::is_json_ref<JsonRef>,
+                                 std::is_same<typename JsonRef::value_type, basic_json>>::value, int> = 0 >
+    basic_json(const JsonRef& ref) : basic_json(ref.moved_or_copied()) {}
+
+    /// @brief copy constructor
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    basic_json(const basic_json& other)
+        : m_type(other.m_type)
+    {
+        // check of passed value is valid
+        other.assert_invariant();
+
+        switch (m_type)
+        {
+            case value_t::object:
+            {
+                m_value = *other.m_value.object;
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_value = *other.m_value.array;
+                break;
+            }
+
+            case value_t::string:
+            {
+                m_value = *other.m_value.string;
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                m_value = other.m_value.boolean;
+                break;
+            }
+
+            case value_t::number_integer:
+            {
+                m_value = other.m_value.number_integer;
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                m_value = other.m_value.number_unsigned;
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                m_value = other.m_value.number_float;
+                break;
+            }
+
+            case value_t::binary:
+            {
+                m_value = *other.m_value.binary;
+                break;
+            }
+
+            case value_t::null:
+            case value_t::discarded:
+            default:
+                break;
+        }
+
+        set_parents();
+        assert_invariant();
+    }
+
+    /// @brief move constructor
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    basic_json(basic_json&& other) noexcept
+        : m_type(std::move(other.m_type)),
+          m_value(std::move(other.m_value))
+    {
+        // check that passed value is valid
+        other.assert_invariant(false);
+
+        // invalidate payload
+        other.m_type = value_t::null;
+        other.m_value = {};
+
+        set_parents();
+        assert_invariant();
+    }
+
+    /// @brief copy assignment
+    /// @sa https://json.nlohmann.me/api/basic_json/operator=/
+    basic_json& operator=(basic_json other) noexcept (
+        std::is_nothrow_move_constructible<value_t>::value&&
+        std::is_nothrow_move_assignable<value_t>::value&&
+        std::is_nothrow_move_constructible<json_value>::value&&
+        std::is_nothrow_move_assignable<json_value>::value
+    )
+    {
+        // check that passed value is valid
+        other.assert_invariant();
+
+        using std::swap;
+        swap(m_type, other.m_type);
+        swap(m_value, other.m_value);
+
+        set_parents();
+        assert_invariant();
+        return *this;
+    }
+
+    /// @brief destructor
+    /// @sa https://json.nlohmann.me/api/basic_json/~basic_json/
+    ~basic_json() noexcept
+    {
+        assert_invariant(false);
+        m_value.destroy(m_type);
+    }
+
+    /// @}
+
+  public:
+    ///////////////////////
+    // object inspection //
+    ///////////////////////
+
+    /// @name object inspection
+    /// Functions to inspect the type of a JSON value.
+    /// @{
+
+    /// @brief serialization
+    /// @sa https://json.nlohmann.me/api/basic_json/dump/
+    string_t dump(const int indent = -1,
+                  const char indent_char = ' ',
+                  const bool ensure_ascii = false,
+                  const error_handler_t error_handler = error_handler_t::strict) const
+    {
+        string_t result;
+        serializer s(detail::output_adapter<char, string_t>(result), indent_char, error_handler);
+
+        if (indent >= 0)
+        {
+            s.dump(*this, true, ensure_ascii, static_cast<unsigned int>(indent));
+        }
+        else
+        {
+            s.dump(*this, false, ensure_ascii, 0);
+        }
+
+        return result;
+    }
+
+    /// @brief return the type of the JSON value (explicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/type/
+    constexpr value_t type() const noexcept
+    {
+        return m_type;
+    }
+
+    /// @brief return whether type is primitive
+    /// @sa https://json.nlohmann.me/api/basic_json/is_primitive/
+    constexpr bool is_primitive() const noexcept
+    {
+        return is_null() || is_string() || is_boolean() || is_number() || is_binary();
+    }
+
+    /// @brief return whether type is structured
+    /// @sa https://json.nlohmann.me/api/basic_json/is_structured/
+    constexpr bool is_structured() const noexcept
+    {
+        return is_array() || is_object();
+    }
+
+    /// @brief return whether value is null
+    /// @sa https://json.nlohmann.me/api/basic_json/is_null/
+    constexpr bool is_null() const noexcept
+    {
+        return m_type == value_t::null;
+    }
+
+    /// @brief return whether value is a boolean
+    /// @sa https://json.nlohmann.me/api/basic_json/is_boolean/
+    constexpr bool is_boolean() const noexcept
+    {
+        return m_type == value_t::boolean;
+    }
+
+    /// @brief return whether value is a number
+    /// @sa https://json.nlohmann.me/api/basic_json/is_number/
+    constexpr bool is_number() const noexcept
+    {
+        return is_number_integer() || is_number_float();
+    }
+
+    /// @brief return whether value is an integer number
+    /// @sa https://json.nlohmann.me/api/basic_json/is_number_integer/
+    constexpr bool is_number_integer() const noexcept
+    {
+        return m_type == value_t::number_integer || m_type == value_t::number_unsigned;
+    }
+
+    /// @brief return whether value is an unsigned integer number
+    /// @sa https://json.nlohmann.me/api/basic_json/is_number_unsigned/
+    constexpr bool is_number_unsigned() const noexcept
+    {
+        return m_type == value_t::number_unsigned;
+    }
+
+    /// @brief return whether value is a floating-point number
+    /// @sa https://json.nlohmann.me/api/basic_json/is_number_float/
+    constexpr bool is_number_float() const noexcept
+    {
+        return m_type == value_t::number_float;
+    }
+
+    /// @brief return whether value is an object
+    /// @sa https://json.nlohmann.me/api/basic_json/is_object/
+    constexpr bool is_object() const noexcept
+    {
+        return m_type == value_t::object;
+    }
+
+    /// @brief return whether value is an array
+    /// @sa https://json.nlohmann.me/api/basic_json/is_array/
+    constexpr bool is_array() const noexcept
+    {
+        return m_type == value_t::array;
+    }
+
+    /// @brief return whether value is a string
+    /// @sa https://json.nlohmann.me/api/basic_json/is_string/
+    constexpr bool is_string() const noexcept
+    {
+        return m_type == value_t::string;
+    }
+
+    /// @brief return whether value is a binary array
+    /// @sa https://json.nlohmann.me/api/basic_json/is_binary/
+    constexpr bool is_binary() const noexcept
+    {
+        return m_type == value_t::binary;
+    }
+
+    /// @brief return whether value is discarded
+    /// @sa https://json.nlohmann.me/api/basic_json/is_discarded/
+    constexpr bool is_discarded() const noexcept
+    {
+        return m_type == value_t::discarded;
+    }
+
+    /// @brief return the type of the JSON value (implicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_value_t/
+    constexpr operator value_t() const noexcept
+    {
+        return m_type;
+    }
+
+    /// @}
+
+  private:
+    //////////////////
+    // value access //
+    //////////////////
+
+    /// get a boolean (explicit)
+    boolean_t get_impl(boolean_t* /*unused*/) const
+    {
+        if (JSON_HEDLEY_LIKELY(is_boolean()))
+        {
+            return m_value.boolean;
+        }
+
+        JSON_THROW(type_error::create(302, "type must be boolean, but is " + std::string(type_name()), *this));
+    }
+
+    /// get a pointer to the value (object)
+    object_t* get_impl_ptr(object_t* /*unused*/) noexcept
+    {
+        return is_object() ? m_value.object : nullptr;
+    }
+
+    /// get a pointer to the value (object)
+    constexpr const object_t* get_impl_ptr(const object_t* /*unused*/) const noexcept
+    {
+        return is_object() ? m_value.object : nullptr;
+    }
+
+    /// get a pointer to the value (array)
+    array_t* get_impl_ptr(array_t* /*unused*/) noexcept
+    {
+        return is_array() ? m_value.array : nullptr;
+    }
+
+    /// get a pointer to the value (array)
+    constexpr const array_t* get_impl_ptr(const array_t* /*unused*/) const noexcept
+    {
+        return is_array() ? m_value.array : nullptr;
+    }
+
+    /// get a pointer to the value (string)
+    string_t* get_impl_ptr(string_t* /*unused*/) noexcept
+    {
+        return is_string() ? m_value.string : nullptr;
+    }
+
+    /// get a pointer to the value (string)
+    constexpr const string_t* get_impl_ptr(const string_t* /*unused*/) const noexcept
+    {
+        return is_string() ? m_value.string : nullptr;
+    }
+
+    /// get a pointer to the value (boolean)
+    boolean_t* get_impl_ptr(boolean_t* /*unused*/) noexcept
+    {
+        return is_boolean() ? &m_value.boolean : nullptr;
+    }
+
+    /// get a pointer to the value (boolean)
+    constexpr const boolean_t* get_impl_ptr(const boolean_t* /*unused*/) const noexcept
+    {
+        return is_boolean() ? &m_value.boolean : nullptr;
+    }
+
+    /// get a pointer to the value (integer number)
+    number_integer_t* get_impl_ptr(number_integer_t* /*unused*/) noexcept
+    {
+        return is_number_integer() ? &m_value.number_integer : nullptr;
+    }
+
+    /// get a pointer to the value (integer number)
+    constexpr const number_integer_t* get_impl_ptr(const number_integer_t* /*unused*/) const noexcept
+    {
+        return is_number_integer() ? &m_value.number_integer : nullptr;
+    }
+
+    /// get a pointer to the value (unsigned number)
+    number_unsigned_t* get_impl_ptr(number_unsigned_t* /*unused*/) noexcept
+    {
+        return is_number_unsigned() ? &m_value.number_unsigned : nullptr;
+    }
+
+    /// get a pointer to the value (unsigned number)
+    constexpr const number_unsigned_t* get_impl_ptr(const number_unsigned_t* /*unused*/) const noexcept
+    {
+        return is_number_unsigned() ? &m_value.number_unsigned : nullptr;
+    }
+
+    /// get a pointer to the value (floating-point number)
+    number_float_t* get_impl_ptr(number_float_t* /*unused*/) noexcept
+    {
+        return is_number_float() ? &m_value.number_float : nullptr;
+    }
+
+    /// get a pointer to the value (floating-point number)
+    constexpr const number_float_t* get_impl_ptr(const number_float_t* /*unused*/) const noexcept
+    {
+        return is_number_float() ? &m_value.number_float : nullptr;
+    }
+
+    /// get a pointer to the value (binary)
+    binary_t* get_impl_ptr(binary_t* /*unused*/) noexcept
+    {
+        return is_binary() ? m_value.binary : nullptr;
+    }
+
+    /// get a pointer to the value (binary)
+    constexpr const binary_t* get_impl_ptr(const binary_t* /*unused*/) const noexcept
+    {
+        return is_binary() ? m_value.binary : nullptr;
+    }
+
+    /*!
+    @brief helper function to implement get_ref()
+
+    This function helps to implement get_ref() without code duplication for
+    const and non-const overloads
+
+    @tparam ThisType will be deduced as `basic_json` or `const basic_json`
+
+    @throw type_error.303 if ReferenceType does not match underlying value
+    type of the current JSON
+    */
+    template<typename ReferenceType, typename ThisType>
+    static ReferenceType get_ref_impl(ThisType& obj)
+    {
+        // delegate the call to get_ptr<>()
+        auto* ptr = obj.template get_ptr<typename std::add_pointer<ReferenceType>::type>();
+
+        if (JSON_HEDLEY_LIKELY(ptr != nullptr))
+        {
+            return *ptr;
+        }
+
+        JSON_THROW(type_error::create(303, "incompatible ReferenceType for get_ref, actual type is " + std::string(obj.type_name()), obj));
+    }
+
+  public:
+    /// @name value access
+    /// Direct access to the stored value of a JSON value.
+    /// @{
+
+    /// @brief get a pointer value (implicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/get_ptr/
+    template<typename PointerType, typename std::enable_if<
+                 std::is_pointer<PointerType>::value, int>::type = 0>
+    auto get_ptr() noexcept -> decltype(std::declval<basic_json_t&>().get_impl_ptr(std::declval<PointerType>()))
+    {
+        // delegate the call to get_impl_ptr<>()
+        return get_impl_ptr(static_cast<PointerType>(nullptr));
+    }
+
+    /// @brief get a pointer value (implicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/get_ptr/
+    template < typename PointerType, typename std::enable_if <
+                   std::is_pointer<PointerType>::value&&
+                   std::is_const<typename std::remove_pointer<PointerType>::type>::value, int >::type = 0 >
+    constexpr auto get_ptr() const noexcept -> decltype(std::declval<const basic_json_t&>().get_impl_ptr(std::declval<PointerType>()))
+    {
+        // delegate the call to get_impl_ptr<>() const
+        return get_impl_ptr(static_cast<PointerType>(nullptr));
+    }
+
+  private:
+    /*!
+    @brief get a value (explicit)
+
+    Explicit type conversion between the JSON value and a compatible value
+    which is [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible)
+    and [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible).
+    The value is converted by calling the @ref json_serializer<ValueType>
+    `from_json()` method.
+
+    The function is equivalent to executing
+    @code {.cpp}
+    ValueType ret;
+    JSONSerializer<ValueType>::from_json(*this, ret);
+    return ret;
+    @endcode
+
+    This overloads is chosen if:
+    - @a ValueType is not @ref basic_json,
+    - @ref json_serializer<ValueType> has a `from_json()` method of the form
+      `void from_json(const basic_json&, ValueType&)`, and
+    - @ref json_serializer<ValueType> does not have a `from_json()` method of
+      the form `ValueType from_json(const basic_json&)`
+
+    @tparam ValueType the returned value type
+
+    @return copy of the JSON value, converted to @a ValueType
+
+    @throw what @ref json_serializer<ValueType> `from_json()` method throws
+
+    @liveexample{The example below shows several conversions from JSON values
+    to other types. There a few things to note: (1) Floating-point numbers can
+    be converted to integers\, (2) A JSON array can be converted to a standard
+    `std::vector<short>`\, (3) A JSON object can be converted to C++
+    associative containers such as `std::unordered_map<std::string\,
+    json>`.,get__ValueType_const}
+
+    @since version 2.1.0
+    */
+    template < typename ValueType,
+               detail::enable_if_t <
+                   detail::is_default_constructible<ValueType>::value&&
+                   detail::has_from_json<basic_json_t, ValueType>::value,
+                   int > = 0 >
+    ValueType get_impl(detail::priority_tag<0> /*unused*/) const noexcept(noexcept(
+                JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), std::declval<ValueType&>())))
+    {
+        auto ret = ValueType();
+        JSONSerializer<ValueType>::from_json(*this, ret);
+        return ret;
+    }
+
+    /*!
+    @brief get a value (explicit); special case
+
+    Explicit type conversion between the JSON value and a compatible value
+    which is **not** [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible)
+    and **not** [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible).
+    The value is converted by calling the @ref json_serializer<ValueType>
+    `from_json()` method.
+
+    The function is equivalent to executing
+    @code {.cpp}
+    return JSONSerializer<ValueType>::from_json(*this);
+    @endcode
+
+    This overloads is chosen if:
+    - @a ValueType is not @ref basic_json and
+    - @ref json_serializer<ValueType> has a `from_json()` method of the form
+      `ValueType from_json(const basic_json&)`
+
+    @note If @ref json_serializer<ValueType> has both overloads of
+    `from_json()`, this one is chosen.
+
+    @tparam ValueType the returned value type
+
+    @return copy of the JSON value, converted to @a ValueType
+
+    @throw what @ref json_serializer<ValueType> `from_json()` method throws
+
+    @since version 2.1.0
+    */
+    template < typename ValueType,
+               detail::enable_if_t <
+                   detail::has_non_default_from_json<basic_json_t, ValueType>::value,
+                   int > = 0 >
+    ValueType get_impl(detail::priority_tag<1> /*unused*/) const noexcept(noexcept(
+                JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>())))
+    {
+        return JSONSerializer<ValueType>::from_json(*this);
+    }
+
+    /*!
+    @brief get special-case overload
+
+    This overloads converts the current @ref basic_json in a different
+    @ref basic_json type
+
+    @tparam BasicJsonType == @ref basic_json
+
+    @return a copy of *this, converted into @a BasicJsonType
+
+    @complexity Depending on the implementation of the called `from_json()`
+                method.
+
+    @since version 3.2.0
+    */
+    template < typename BasicJsonType,
+               detail::enable_if_t <
+                   detail::is_basic_json<BasicJsonType>::value,
+                   int > = 0 >
+    BasicJsonType get_impl(detail::priority_tag<2> /*unused*/) const
+    {
+        return *this;
+    }
+
+    /*!
+    @brief get special-case overload
+
+    This overloads avoids a lot of template boilerplate, it can be seen as the
+    identity method
+
+    @tparam BasicJsonType == @ref basic_json
+
+    @return a copy of *this
+
+    @complexity Constant.
+
+    @since version 2.1.0
+    */
+    template<typename BasicJsonType,
+             detail::enable_if_t<
+                 std::is_same<BasicJsonType, basic_json_t>::value,
+                 int> = 0>
+    basic_json get_impl(detail::priority_tag<3> /*unused*/) const
+    {
+        return *this;
+    }
+
+    /*!
+    @brief get a pointer value (explicit)
+    @copydoc get()
+    */
+    template<typename PointerType,
+             detail::enable_if_t<
+                 std::is_pointer<PointerType>::value,
+                 int> = 0>
+    constexpr auto get_impl(detail::priority_tag<4> /*unused*/) const noexcept
+    -> decltype(std::declval<const basic_json_t&>().template get_ptr<PointerType>())
+    {
+        // delegate the call to get_ptr
+        return get_ptr<PointerType>();
+    }
+
+  public:
+    /*!
+    @brief get a (pointer) value (explicit)
+
+    Performs explicit type conversion between the JSON value and a compatible value if required.
+
+    - If the requested type is a pointer to the internally stored JSON value that pointer is returned.
+    No copies are made.
+
+    - If the requested type is the current @ref basic_json, or a different @ref basic_json convertible
+    from the current @ref basic_json.
+
+    - Otherwise the value is converted by calling the @ref json_serializer<ValueType> `from_json()`
+    method.
+
+    @tparam ValueTypeCV the provided value type
+    @tparam ValueType the returned value type
+
+    @return copy of the JSON value, converted to @tparam ValueType if necessary
+
+    @throw what @ref json_serializer<ValueType> `from_json()` method throws if conversion is required
+
+    @since version 2.1.0
+    */
+    template < typename ValueTypeCV, typename ValueType = detail::uncvref_t<ValueTypeCV>>
+#if defined(JSON_HAS_CPP_14)
+    constexpr
+#endif
+    auto get() const noexcept(
+    noexcept(std::declval<const basic_json_t&>().template get_impl<ValueType>(detail::priority_tag<4> {})))
+    -> decltype(std::declval<const basic_json_t&>().template get_impl<ValueType>(detail::priority_tag<4> {}))
+    {
+        // we cannot static_assert on ValueTypeCV being non-const, because
+        // there is support for get<const basic_json_t>(), which is why we
+        // still need the uncvref
+        static_assert(!std::is_reference<ValueTypeCV>::value,
+                      "get() cannot be used with reference types, you might want to use get_ref()");
+        return get_impl<ValueType>(detail::priority_tag<4> {});
+    }
+
+    /*!
+    @brief get a pointer value (explicit)
+
+    Explicit pointer access to the internally stored JSON value. No copies are
+    made.
+
+    @warning The pointer becomes invalid if the underlying JSON object
+    changes.
+
+    @tparam PointerType pointer type; must be a pointer to @ref array_t, @ref
+    object_t, @ref string_t, @ref boolean_t, @ref number_integer_t,
+    @ref number_unsigned_t, or @ref number_float_t.
+
+    @return pointer to the internally stored JSON value if the requested
+    pointer type @a PointerType fits to the JSON value; `nullptr` otherwise
+
+    @complexity Constant.
+
+    @liveexample{The example below shows how pointers to internal values of a
+    JSON value can be requested. Note that no type conversions are made and a
+    `nullptr` is returned if the value and the requested pointer type does not
+    match.,get__PointerType}
+
+    @sa see @ref get_ptr() for explicit pointer-member access
+
+    @since version 1.0.0
+    */
+    template<typename PointerType, typename std::enable_if<
+                 std::is_pointer<PointerType>::value, int>::type = 0>
+    auto get() noexcept -> decltype(std::declval<basic_json_t&>().template get_ptr<PointerType>())
+    {
+        // delegate the call to get_ptr
+        return get_ptr<PointerType>();
+    }
+
+    /// @brief get a value (explicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/get_to/
+    template < typename ValueType,
+               detail::enable_if_t <
+                   !detail::is_basic_json<ValueType>::value&&
+                   detail::has_from_json<basic_json_t, ValueType>::value,
+                   int > = 0 >
+    ValueType & get_to(ValueType& v) const noexcept(noexcept(
+                JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), v)))
+    {
+        JSONSerializer<ValueType>::from_json(*this, v);
+        return v;
+    }
+
+    // specialization to allow calling get_to with a basic_json value
+    // see https://github.com/nlohmann/json/issues/2175
+    template<typename ValueType,
+             detail::enable_if_t <
+                 detail::is_basic_json<ValueType>::value,
+                 int> = 0>
+    ValueType & get_to(ValueType& v) const
+    {
+        v = *this;
+        return v;
+    }
+
+    template <
+        typename T, std::size_t N,
+        typename Array = T (&)[N], // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+        detail::enable_if_t <
+            detail::has_from_json<basic_json_t, Array>::value, int > = 0 >
+    Array get_to(T (&v)[N]) const // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+    noexcept(noexcept(JSONSerializer<Array>::from_json(
+                          std::declval<const basic_json_t&>(), v)))
+    {
+        JSONSerializer<Array>::from_json(*this, v);
+        return v;
+    }
+
+    /// @brief get a reference value (implicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/get_ref/
+    template<typename ReferenceType, typename std::enable_if<
+                 std::is_reference<ReferenceType>::value, int>::type = 0>
+    ReferenceType get_ref()
+    {
+        // delegate call to get_ref_impl
+        return get_ref_impl<ReferenceType>(*this);
+    }
+
+    /// @brief get a reference value (implicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/get_ref/
+    template < typename ReferenceType, typename std::enable_if <
+                   std::is_reference<ReferenceType>::value&&
+                   std::is_const<typename std::remove_reference<ReferenceType>::type>::value, int >::type = 0 >
+    ReferenceType get_ref() const
+    {
+        // delegate call to get_ref_impl
+        return get_ref_impl<ReferenceType>(*this);
+    }
+
+    /*!
+    @brief get a value (implicit)
+
+    Implicit type conversion between the JSON value and a compatible value.
+    The call is realized by calling @ref get() const.
+
+    @tparam ValueType non-pointer type compatible to the JSON value, for
+    instance `int` for JSON integer numbers, `bool` for JSON booleans, or
+    `std::vector` types for JSON arrays. The character type of @ref string_t
+    as well as an initializer list of this type is excluded to avoid
+    ambiguities as these types implicitly convert to `std::string`.
+
+    @return copy of the JSON value, converted to type @a ValueType
+
+    @throw type_error.302 in case passed type @a ValueType is incompatible
+    to the JSON value type (e.g., the JSON value is of type boolean, but a
+    string is requested); see example below
+
+    @complexity Linear in the size of the JSON value.
+
+    @liveexample{The example below shows several conversions from JSON values
+    to other types. There a few things to note: (1) Floating-point numbers can
+    be converted to integers\, (2) A JSON array can be converted to a standard
+    `std::vector<short>`\, (3) A JSON object can be converted to C++
+    associative containers such as `std::unordered_map<std::string\,
+    json>`.,operator__ValueType}
+
+    @since version 1.0.0
+    */
+    template < typename ValueType, typename std::enable_if <
+                   detail::conjunction <
+                       detail::negation<std::is_pointer<ValueType>>,
+                       detail::negation<std::is_same<ValueType, detail::json_ref<basic_json>>>,
+                                        detail::negation<std::is_same<ValueType, typename string_t::value_type>>,
+                                        detail::negation<detail::is_basic_json<ValueType>>,
+                                        detail::negation<std::is_same<ValueType, std::initializer_list<typename string_t::value_type>>>,
+
+#if defined(JSON_HAS_CPP_17) && (defined(__GNUC__) || (defined(_MSC_VER) && _MSC_VER >= 1910 && _MSC_VER <= 1914))
+                                                detail::negation<std::is_same<ValueType, std::string_view>>,
+#endif
+                                                detail::is_detected_lazy<detail::get_template_function, const basic_json_t&, ValueType>
+                                                >::value, int >::type = 0 >
+                                        JSON_EXPLICIT operator ValueType() const
+    {
+        // delegate the call to get<>() const
+        return get<ValueType>();
+    }
+
+    /// @brief get a binary value
+    /// @sa https://json.nlohmann.me/api/basic_json/get_binary/
+    binary_t& get_binary()
+    {
+        if (!is_binary())
+        {
+            JSON_THROW(type_error::create(302, "type must be binary, but is " + std::string(type_name()), *this));
+        }
+
+        return *get_ptr<binary_t*>();
+    }
+
+    /// @brief get a binary value
+    /// @sa https://json.nlohmann.me/api/basic_json/get_binary/
+    const binary_t& get_binary() const
+    {
+        if (!is_binary())
+        {
+            JSON_THROW(type_error::create(302, "type must be binary, but is " + std::string(type_name()), *this));
+        }
+
+        return *get_ptr<const binary_t*>();
+    }
+
+    /// @}
+
+
+    ////////////////////
+    // element access //
+    ////////////////////
+
+    /// @name element access
+    /// Access to the JSON value.
+    /// @{
+
+    /// @brief access specified array element with bounds checking
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
+    reference at(size_type idx)
+    {
+        // at only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            JSON_TRY
+            {
+                return set_parent(m_value.array->at(idx));
+            }
+            JSON_CATCH (std::out_of_range&)
+            {
+                // create better exception explanation
+                JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range", *this));
+            }
+        }
+        else
+        {
+            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name()), *this));
+        }
+    }
+
+    /// @brief access specified array element with bounds checking
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
+    const_reference at(size_type idx) const
+    {
+        // at only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            JSON_TRY
+            {
+                return m_value.array->at(idx);
+            }
+            JSON_CATCH (std::out_of_range&)
+            {
+                // create better exception explanation
+                JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range", *this));
+            }
+        }
+        else
+        {
+            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name()), *this));
+        }
+    }
+
+    /// @brief access specified object element with bounds checking
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
+    reference at(const typename object_t::key_type& key)
+    {
+        // at only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            JSON_TRY
+            {
+                return set_parent(m_value.object->at(key));
+            }
+            JSON_CATCH (std::out_of_range&)
+            {
+                // create better exception explanation
+                JSON_THROW(out_of_range::create(403, "key '" + key + "' not found", *this));
+            }
+        }
+        else
+        {
+            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name()), *this));
+        }
+    }
+
+    /// @brief access specified object element with bounds checking
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
+    const_reference at(const typename object_t::key_type& key) const
+    {
+        // at only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            JSON_TRY
+            {
+                return m_value.object->at(key);
+            }
+            JSON_CATCH (std::out_of_range&)
+            {
+                // create better exception explanation
+                JSON_THROW(out_of_range::create(403, "key '" + key + "' not found", *this));
+            }
+        }
+        else
+        {
+            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name()), *this));
+        }
+    }
+
+    /// @brief access specified array element
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    reference operator[](size_type idx)
+    {
+        // implicitly convert null value to an empty array
+        if (is_null())
+        {
+            m_type = value_t::array;
+            m_value.array = create<array_t>();
+            assert_invariant();
+        }
+
+        // operator[] only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            // fill up array with null values if given idx is outside range
+            if (idx >= m_value.array->size())
+            {
+#if JSON_DIAGNOSTICS
+                // remember array size & capacity before resizing
+                const auto old_size = m_value.array->size();
+                const auto old_capacity = m_value.array->capacity();
+#endif
+                m_value.array->resize(idx + 1);
+
+#if JSON_DIAGNOSTICS
+                if (JSON_HEDLEY_UNLIKELY(m_value.array->capacity() != old_capacity))
+                {
+                    // capacity has changed: update all parents
+                    set_parents();
+                }
+                else
+                {
+                    // set parent for values added above
+                    set_parents(begin() + static_cast<typename iterator::difference_type>(old_size), static_cast<typename iterator::difference_type>(idx + 1 - old_size));
+                }
+#endif
+                assert_invariant();
+            }
+
+            return m_value.array->operator[](idx);
+        }
+
+        JSON_THROW(type_error::create(305, "cannot use operator[] with a numeric argument with " + std::string(type_name()), *this));
+    }
+
+    /// @brief access specified array element
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    const_reference operator[](size_type idx) const
+    {
+        // const operator[] only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            return m_value.array->operator[](idx);
+        }
+
+        JSON_THROW(type_error::create(305, "cannot use operator[] with a numeric argument with " + std::string(type_name()), *this));
+    }
+
+    /// @brief access specified object element
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    reference operator[](const typename object_t::key_type& key)
+    {
+        // implicitly convert null value to an empty object
+        if (is_null())
+        {
+            m_type = value_t::object;
+            m_value.object = create<object_t>();
+            assert_invariant();
+        }
+
+        // operator[] only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            return set_parent(m_value.object->operator[](key));
+        }
+
+        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name()), *this));
+    }
+
+    /// @brief access specified object element
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    const_reference operator[](const typename object_t::key_type& key) const
+    {
+        // const operator[] only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            JSON_ASSERT(m_value.object->find(key) != m_value.object->end());
+            return m_value.object->find(key)->second;
+        }
+
+        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name()), *this));
+    }
+
+    /// @brief access specified object element
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    template<typename T>
+    JSON_HEDLEY_NON_NULL(2)
+    reference operator[](T* key)
+    {
+        // implicitly convert null to object
+        if (is_null())
+        {
+            m_type = value_t::object;
+            m_value = value_t::object;
+            assert_invariant();
+        }
+
+        // at only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            return set_parent(m_value.object->operator[](key));
+        }
+
+        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name()), *this));
+    }
+
+    /// @brief access specified object element
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    template<typename T>
+    JSON_HEDLEY_NON_NULL(2)
+    const_reference operator[](T* key) const
+    {
+        // at only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            JSON_ASSERT(m_value.object->find(key) != m_value.object->end());
+            return m_value.object->find(key)->second;
+        }
+
+        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name()), *this));
+    }
+
+    /// @brief access specified object element with default value
+    /// @sa https://json.nlohmann.me/api/basic_json/value/
+    /// using std::is_convertible in a std::enable_if will fail when using explicit conversions
+    template < class ValueType, typename std::enable_if <
+                   detail::is_getable<basic_json_t, ValueType>::value
+                   && !std::is_same<value_t, ValueType>::value, int >::type = 0 >
+    ValueType value(const typename object_t::key_type& key, const ValueType& default_value) const
+    {
+        // at only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            // if key is found, return value and given default value otherwise
+            const auto it = find(key);
+            if (it != end())
+            {
+                return it->template get<ValueType>();
+            }
+
+            return default_value;
+        }
+
+        JSON_THROW(type_error::create(306, "cannot use value() with " + std::string(type_name()), *this));
+    }
+
+    /// @brief access specified object element with default value
+    /// @sa https://json.nlohmann.me/api/basic_json/value/
+    /// overload for a default value of type const char*
+    string_t value(const typename object_t::key_type& key, const char* default_value) const
+    {
+        return value(key, string_t(default_value));
+    }
+
+    /// @brief access specified object element via JSON Pointer with default value
+    /// @sa https://json.nlohmann.me/api/basic_json/value/
+    template<class ValueType, typename std::enable_if<
+                 detail::is_getable<basic_json_t, ValueType>::value, int>::type = 0>
+    ValueType value(const json_pointer& ptr, const ValueType& default_value) const
+    {
+        // at only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            // if pointer resolves a value, return it or use default value
+            JSON_TRY
+            {
+                return ptr.get_checked(this).template get<ValueType>();
+            }
+            JSON_INTERNAL_CATCH (out_of_range&)
+            {
+                return default_value;
+            }
+        }
+
+        JSON_THROW(type_error::create(306, "cannot use value() with " + std::string(type_name()), *this));
+    }
+
+    /// @brief access specified object element via JSON Pointer with default value
+    /// @sa https://json.nlohmann.me/api/basic_json/value/
+    /// overload for a default value of type const char*
+    JSON_HEDLEY_NON_NULL(3)
+    string_t value(const json_pointer& ptr, const char* default_value) const
+    {
+        return value(ptr, string_t(default_value));
+    }
+
+    /// @brief access the first element
+    /// @sa https://json.nlohmann.me/api/basic_json/front/
+    reference front()
+    {
+        return *begin();
+    }
+
+    /// @brief access the first element
+    /// @sa https://json.nlohmann.me/api/basic_json/front/
+    const_reference front() const
+    {
+        return *cbegin();
+    }
+
+    /// @brief access the last element
+    /// @sa https://json.nlohmann.me/api/basic_json/back/
+    reference back()
+    {
+        auto tmp = end();
+        --tmp;
+        return *tmp;
+    }
+
+    /// @brief access the last element
+    /// @sa https://json.nlohmann.me/api/basic_json/back/
+    const_reference back() const
+    {
+        auto tmp = cend();
+        --tmp;
+        return *tmp;
+    }
+
+    /// @brief remove element given an iterator
+    /// @sa https://json.nlohmann.me/api/basic_json/erase/
+    template < class IteratorType, typename std::enable_if <
+                   std::is_same<IteratorType, typename basic_json_t::iterator>::value ||
+                   std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int >::type
+               = 0 >
+    IteratorType erase(IteratorType pos)
+    {
+        // make sure iterator fits the current value
+        if (JSON_HEDLEY_UNLIKELY(this != pos.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", *this));
+        }
+
+        IteratorType result = end();
+
+        switch (m_type)
+        {
+            case value_t::boolean:
+            case value_t::number_float:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::string:
+            case value_t::binary:
+            {
+                if (JSON_HEDLEY_UNLIKELY(!pos.m_it.primitive_iterator.is_begin()))
+                {
+                    JSON_THROW(invalid_iterator::create(205, "iterator out of range", *this));
+                }
+
+                if (is_string())
+                {
+                    AllocatorType<string_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.string);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.string, 1);
+                    m_value.string = nullptr;
+                }
+                else if (is_binary())
+                {
+                    AllocatorType<binary_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.binary);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.binary, 1);
+                    m_value.binary = nullptr;
+                }
+
+                m_type = value_t::null;
+                assert_invariant();
+                break;
+            }
+
+            case value_t::object:
+            {
+                result.m_it.object_iterator = m_value.object->erase(pos.m_it.object_iterator);
+                break;
+            }
+
+            case value_t::array:
+            {
+                result.m_it.array_iterator = m_value.array->erase(pos.m_it.array_iterator);
+                break;
+            }
+
+            case value_t::null:
+            case value_t::discarded:
+            default:
+                JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name()), *this));
+        }
+
+        return result;
+    }
+
+    /// @brief remove elements given an iterator range
+    /// @sa https://json.nlohmann.me/api/basic_json/erase/
+    template < class IteratorType, typename std::enable_if <
+                   std::is_same<IteratorType, typename basic_json_t::iterator>::value ||
+                   std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int >::type
+               = 0 >
+    IteratorType erase(IteratorType first, IteratorType last)
+    {
+        // make sure iterator fits the current value
+        if (JSON_HEDLEY_UNLIKELY(this != first.m_object || this != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(203, "iterators do not fit current value", *this));
+        }
+
+        IteratorType result = end();
+
+        switch (m_type)
+        {
+            case value_t::boolean:
+            case value_t::number_float:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::string:
+            case value_t::binary:
+            {
+                if (JSON_HEDLEY_LIKELY(!first.m_it.primitive_iterator.is_begin()
+                                       || !last.m_it.primitive_iterator.is_end()))
+                {
+                    JSON_THROW(invalid_iterator::create(204, "iterators out of range", *this));
+                }
+
+                if (is_string())
+                {
+                    AllocatorType<string_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.string);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.string, 1);
+                    m_value.string = nullptr;
+                }
+                else if (is_binary())
+                {
+                    AllocatorType<binary_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.binary);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.binary, 1);
+                    m_value.binary = nullptr;
+                }
+
+                m_type = value_t::null;
+                assert_invariant();
+                break;
+            }
+
+            case value_t::object:
+            {
+                result.m_it.object_iterator = m_value.object->erase(first.m_it.object_iterator,
+                                              last.m_it.object_iterator);
+                break;
+            }
+
+            case value_t::array:
+            {
+                result.m_it.array_iterator = m_value.array->erase(first.m_it.array_iterator,
+                                             last.m_it.array_iterator);
+                break;
+            }
+
+            case value_t::null:
+            case value_t::discarded:
+            default:
+                JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name()), *this));
+        }
+
+        return result;
+    }
+
+    /// @brief remove element from a JSON object given a key
+    /// @sa https://json.nlohmann.me/api/basic_json/erase/
+    size_type erase(const typename object_t::key_type& key)
+    {
+        // this erase only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            return m_value.object->erase(key);
+        }
+
+        JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name()), *this));
+    }
+
+    /// @brief remove element from a JSON array given an index
+    /// @sa https://json.nlohmann.me/api/basic_json/erase/
+    void erase(const size_type idx)
+    {
+        // this erase only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            if (JSON_HEDLEY_UNLIKELY(idx >= size()))
+            {
+                JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range", *this));
+            }
+
+            m_value.array->erase(m_value.array->begin() + static_cast<difference_type>(idx));
+        }
+        else
+        {
+            JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name()), *this));
+        }
+    }
+
+    /// @}
+
+
+    ////////////
+    // lookup //
+    ////////////
+
+    /// @name lookup
+    /// @{
+
+    /// @brief find an element in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/find/
+    template<typename KeyT>
+    iterator find(KeyT&& key)
+    {
+        auto result = end();
+
+        if (is_object())
+        {
+            result.m_it.object_iterator = m_value.object->find(std::forward<KeyT>(key));
+        }
+
+        return result;
+    }
+
+    /// @brief find an element in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/find/
+    template<typename KeyT>
+    const_iterator find(KeyT&& key) const
+    {
+        auto result = cend();
+
+        if (is_object())
+        {
+            result.m_it.object_iterator = m_value.object->find(std::forward<KeyT>(key));
+        }
+
+        return result;
+    }
+
+    /// @brief returns the number of occurrences of a key in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/count/
+    template<typename KeyT>
+    size_type count(KeyT&& key) const
+    {
+        // return 0 for all nonobject types
+        return is_object() ? m_value.object->count(std::forward<KeyT>(key)) : 0;
+    }
+
+    /// @brief check the existence of an element in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/contains/
+    template < typename KeyT, typename std::enable_if <
+                   !std::is_same<typename std::decay<KeyT>::type, json_pointer>::value, int >::type = 0 >
+    bool contains(KeyT && key) const
+    {
+        return is_object() && m_value.object->find(std::forward<KeyT>(key)) != m_value.object->end();
+    }
+
+    /// @brief check the existence of an element in a JSON object given a JSON pointer
+    /// @sa https://json.nlohmann.me/api/basic_json/contains/
+    bool contains(const json_pointer& ptr) const
+    {
+        return ptr.contains(this);
+    }
+
+    /// @}
+
+
+    ///////////////
+    // iterators //
+    ///////////////
+
+    /// @name iterators
+    /// @{
+
+    /// @brief returns an iterator to the first element
+    /// @sa https://json.nlohmann.me/api/basic_json/begin/
+    iterator begin() noexcept
+    {
+        iterator result(this);
+        result.set_begin();
+        return result;
+    }
+
+    /// @brief returns an iterator to the first element
+    /// @sa https://json.nlohmann.me/api/basic_json/begin/
+    const_iterator begin() const noexcept
+    {
+        return cbegin();
+    }
+
+    /// @brief returns a const iterator to the first element
+    /// @sa https://json.nlohmann.me/api/basic_json/cbegin/
+    const_iterator cbegin() const noexcept
+    {
+        const_iterator result(this);
+        result.set_begin();
+        return result;
+    }
+
+    /// @brief returns an iterator to one past the last element
+    /// @sa https://json.nlohmann.me/api/basic_json/end/
+    iterator end() noexcept
+    {
+        iterator result(this);
+        result.set_end();
+        return result;
+    }
+
+    /// @brief returns an iterator to one past the last element
+    /// @sa https://json.nlohmann.me/api/basic_json/end/
+    const_iterator end() const noexcept
+    {
+        return cend();
+    }
+
+    /// @brief returns an iterator to one past the last element
+    /// @sa https://json.nlohmann.me/api/basic_json/cend/
+    const_iterator cend() const noexcept
+    {
+        const_iterator result(this);
+        result.set_end();
+        return result;
+    }
+
+    /// @brief returns an iterator to the reverse-beginning
+    /// @sa https://json.nlohmann.me/api/basic_json/rbegin/
+    reverse_iterator rbegin() noexcept
+    {
+        return reverse_iterator(end());
+    }
+
+    /// @brief returns an iterator to the reverse-beginning
+    /// @sa https://json.nlohmann.me/api/basic_json/rbegin/
+    const_reverse_iterator rbegin() const noexcept
+    {
+        return crbegin();
+    }
+
+    /// @brief returns an iterator to the reverse-end
+    /// @sa https://json.nlohmann.me/api/basic_json/rend/
+    reverse_iterator rend() noexcept
+    {
+        return reverse_iterator(begin());
+    }
+
+    /// @brief returns an iterator to the reverse-end
+    /// @sa https://json.nlohmann.me/api/basic_json/rend/
+    const_reverse_iterator rend() const noexcept
+    {
+        return crend();
+    }
+
+    /// @brief returns a const reverse iterator to the last element
+    /// @sa https://json.nlohmann.me/api/basic_json/crbegin/
+    const_reverse_iterator crbegin() const noexcept
+    {
+        return const_reverse_iterator(cend());
+    }
+
+    /// @brief returns a const reverse iterator to one before the first
+    /// @sa https://json.nlohmann.me/api/basic_json/crend/
+    const_reverse_iterator crend() const noexcept
+    {
+        return const_reverse_iterator(cbegin());
+    }
+
+  public:
+    /// @brief wrapper to access iterator member functions in range-based for
+    /// @sa https://json.nlohmann.me/api/basic_json/items/
+    /// @deprecated This function is deprecated since 3.1.0 and will be removed in
+    ///             version 4.0.0 of the library. Please use @ref items() instead;
+    ///             that is, replace `json::iterator_wrapper(j)` with `j.items()`.
+    JSON_HEDLEY_DEPRECATED_FOR(3.1.0, items())
+    static iteration_proxy<iterator> iterator_wrapper(reference ref) noexcept
+    {
+        return ref.items();
+    }
+
+    /// @brief wrapper to access iterator member functions in range-based for
+    /// @sa https://json.nlohmann.me/api/basic_json/items/
+    /// @deprecated This function is deprecated since 3.1.0 and will be removed in
+    ///         version 4.0.0 of the library. Please use @ref items() instead;
+    ///         that is, replace `json::iterator_wrapper(j)` with `j.items()`.
+    JSON_HEDLEY_DEPRECATED_FOR(3.1.0, items())
+    static iteration_proxy<const_iterator> iterator_wrapper(const_reference ref) noexcept
+    {
+        return ref.items();
+    }
+
+    /// @brief helper to access iterator member functions in range-based for
+    /// @sa https://json.nlohmann.me/api/basic_json/items/
+    iteration_proxy<iterator> items() noexcept
+    {
+        return iteration_proxy<iterator>(*this);
+    }
+
+    /// @brief helper to access iterator member functions in range-based for
+    /// @sa https://json.nlohmann.me/api/basic_json/items/
+    iteration_proxy<const_iterator> items() const noexcept
+    {
+        return iteration_proxy<const_iterator>(*this);
+    }
+
+    /// @}
+
+
+    //////////////
+    // capacity //
+    //////////////
+
+    /// @name capacity
+    /// @{
+
+    /// @brief checks whether the container is empty.
+    /// @sa https://json.nlohmann.me/api/basic_json/empty/
+    bool empty() const noexcept
+    {
+        switch (m_type)
+        {
+            case value_t::null:
+            {
+                // null values are empty
+                return true;
+            }
+
+            case value_t::array:
+            {
+                // delegate call to array_t::empty()
+                return m_value.array->empty();
+            }
+
+            case value_t::object:
+            {
+                // delegate call to object_t::empty()
+                return m_value.object->empty();
+            }
+
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                // all other types are nonempty
+                return false;
+            }
+        }
+    }
+
+    /// @brief returns the number of elements
+    /// @sa https://json.nlohmann.me/api/basic_json/size/
+    size_type size() const noexcept
+    {
+        switch (m_type)
+        {
+            case value_t::null:
+            {
+                // null values are empty
+                return 0;
+            }
+
+            case value_t::array:
+            {
+                // delegate call to array_t::size()
+                return m_value.array->size();
+            }
+
+            case value_t::object:
+            {
+                // delegate call to object_t::size()
+                return m_value.object->size();
+            }
+
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                // all other types have size 1
+                return 1;
+            }
+        }
+    }
+
+    /// @brief returns the maximum possible number of elements
+    /// @sa https://json.nlohmann.me/api/basic_json/max_size/
+    size_type max_size() const noexcept
+    {
+        switch (m_type)
+        {
+            case value_t::array:
+            {
+                // delegate call to array_t::max_size()
+                return m_value.array->max_size();
+            }
+
+            case value_t::object:
+            {
+                // delegate call to object_t::max_size()
+                return m_value.object->max_size();
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                // all other types have max_size() == size()
+                return size();
+            }
+        }
+    }
+
+    /// @}
+
+
+    ///////////////
+    // modifiers //
+    ///////////////
+
+    /// @name modifiers
+    /// @{
+
+    /// @brief clears the contents
+    /// @sa https://json.nlohmann.me/api/basic_json/clear/
+    void clear() noexcept
+    {
+        switch (m_type)
+        {
+            case value_t::number_integer:
+            {
+                m_value.number_integer = 0;
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                m_value.number_unsigned = 0;
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                m_value.number_float = 0.0;
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                m_value.boolean = false;
+                break;
+            }
+
+            case value_t::string:
+            {
+                m_value.string->clear();
+                break;
+            }
+
+            case value_t::binary:
+            {
+                m_value.binary->clear();
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_value.array->clear();
+                break;
+            }
+
+            case value_t::object:
+            {
+                m_value.object->clear();
+                break;
+            }
+
+            case value_t::null:
+            case value_t::discarded:
+            default:
+                break;
+        }
+    }
+
+    /// @brief add an object to an array
+    /// @sa https://json.nlohmann.me/api/basic_json/push_back/
+    void push_back(basic_json&& val)
+    {
+        // push_back only works for null objects or arrays
+        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_array())))
+        {
+            JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name()), *this));
+        }
+
+        // transform null object into an array
+        if (is_null())
+        {
+            m_type = value_t::array;
+            m_value = value_t::array;
+            assert_invariant();
+        }
+
+        // add element to array (move semantics)
+        const auto old_capacity = m_value.array->capacity();
+        m_value.array->push_back(std::move(val));
+        set_parent(m_value.array->back(), old_capacity);
+        // if val is moved from, basic_json move constructor marks it null, so we do not call the destructor
+    }
+
+    /// @brief add an object to an array
+    /// @sa https://json.nlohmann.me/api/basic_json/operator+=/
+    reference operator+=(basic_json&& val)
+    {
+        push_back(std::move(val));
+        return *this;
+    }
+
+    /// @brief add an object to an array
+    /// @sa https://json.nlohmann.me/api/basic_json/push_back/
+    void push_back(const basic_json& val)
+    {
+        // push_back only works for null objects or arrays
+        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_array())))
+        {
+            JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name()), *this));
+        }
+
+        // transform null object into an array
+        if (is_null())
+        {
+            m_type = value_t::array;
+            m_value = value_t::array;
+            assert_invariant();
+        }
+
+        // add element to array
+        const auto old_capacity = m_value.array->capacity();
+        m_value.array->push_back(val);
+        set_parent(m_value.array->back(), old_capacity);
+    }
+
+    /// @brief add an object to an array
+    /// @sa https://json.nlohmann.me/api/basic_json/operator+=/
+    reference operator+=(const basic_json& val)
+    {
+        push_back(val);
+        return *this;
+    }
+
+    /// @brief add an object to an object
+    /// @sa https://json.nlohmann.me/api/basic_json/push_back/
+    void push_back(const typename object_t::value_type& val)
+    {
+        // push_back only works for null objects or objects
+        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_object())))
+        {
+            JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name()), *this));
+        }
+
+        // transform null object into an object
+        if (is_null())
+        {
+            m_type = value_t::object;
+            m_value = value_t::object;
+            assert_invariant();
+        }
+
+        // add element to object
+        auto res = m_value.object->insert(val);
+        set_parent(res.first->second);
+    }
+
+    /// @brief add an object to an object
+    /// @sa https://json.nlohmann.me/api/basic_json/operator+=/
+    reference operator+=(const typename object_t::value_type& val)
+    {
+        push_back(val);
+        return *this;
+    }
+
+    /// @brief add an object to an object
+    /// @sa https://json.nlohmann.me/api/basic_json/push_back/
+    void push_back(initializer_list_t init)
+    {
+        if (is_object() && init.size() == 2 && (*init.begin())->is_string())
+        {
+            basic_json&& key = init.begin()->moved_or_copied();
+            push_back(typename object_t::value_type(
+                          std::move(key.get_ref<string_t&>()), (init.begin() + 1)->moved_or_copied()));
+        }
+        else
+        {
+            push_back(basic_json(init));
+        }
+    }
+
+    /// @brief add an object to an object
+    /// @sa https://json.nlohmann.me/api/basic_json/operator+=/
+    reference operator+=(initializer_list_t init)
+    {
+        push_back(init);
+        return *this;
+    }
+
+    /// @brief add an object to an array
+    /// @sa https://json.nlohmann.me/api/basic_json/emplace_back/
+    template<class... Args>
+    reference emplace_back(Args&& ... args)
+    {
+        // emplace_back only works for null objects or arrays
+        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_array())))
+        {
+            JSON_THROW(type_error::create(311, "cannot use emplace_back() with " + std::string(type_name()), *this));
+        }
+
+        // transform null object into an array
+        if (is_null())
+        {
+            m_type = value_t::array;
+            m_value = value_t::array;
+            assert_invariant();
+        }
+
+        // add element to array (perfect forwarding)
+        const auto old_capacity = m_value.array->capacity();
+        m_value.array->emplace_back(std::forward<Args>(args)...);
+        return set_parent(m_value.array->back(), old_capacity);
+    }
+
+    /// @brief add an object to an object if key does not exist
+    /// @sa https://json.nlohmann.me/api/basic_json/emplace/
+    template<class... Args>
+    std::pair<iterator, bool> emplace(Args&& ... args)
+    {
+        // emplace only works for null objects or arrays
+        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_object())))
+        {
+            JSON_THROW(type_error::create(311, "cannot use emplace() with " + std::string(type_name()), *this));
+        }
+
+        // transform null object into an object
+        if (is_null())
+        {
+            m_type = value_t::object;
+            m_value = value_t::object;
+            assert_invariant();
+        }
+
+        // add element to array (perfect forwarding)
+        auto res = m_value.object->emplace(std::forward<Args>(args)...);
+        set_parent(res.first->second);
+
+        // create result iterator and set iterator to the result of emplace
+        auto it = begin();
+        it.m_it.object_iterator = res.first;
+
+        // return pair of iterator and boolean
+        return {it, res.second};
+    }
+
+    /// Helper for insertion of an iterator
+    /// @note: This uses std::distance to support GCC 4.8,
+    ///        see https://github.com/nlohmann/json/pull/1257
+    template<typename... Args>
+    iterator insert_iterator(const_iterator pos, Args&& ... args)
+    {
+        iterator result(this);
+        JSON_ASSERT(m_value.array != nullptr);
+
+        auto insert_pos = std::distance(m_value.array->begin(), pos.m_it.array_iterator);
+        m_value.array->insert(pos.m_it.array_iterator, std::forward<Args>(args)...);
+        result.m_it.array_iterator = m_value.array->begin() + insert_pos;
+
+        // This could have been written as:
+        // result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, cnt, val);
+        // but the return value of insert is missing in GCC 4.8, so it is written this way instead.
+
+        set_parents();
+        return result;
+    }
+
+    /// @brief inserts element into array
+    /// @sa https://json.nlohmann.me/api/basic_json/insert/
+    iterator insert(const_iterator pos, const basic_json& val)
+    {
+        // insert only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            // check if iterator pos fits to this JSON value
+            if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
+            {
+                JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", *this));
+            }
+
+            // insert to array and return iterator
+            return insert_iterator(pos, val);
+        }
+
+        JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name()), *this));
+    }
+
+    /// @brief inserts element into array
+    /// @sa https://json.nlohmann.me/api/basic_json/insert/
+    iterator insert(const_iterator pos, basic_json&& val)
+    {
+        return insert(pos, val);
+    }
+
+    /// @brief inserts copies of element into array
+    /// @sa https://json.nlohmann.me/api/basic_json/insert/
+    iterator insert(const_iterator pos, size_type cnt, const basic_json& val)
+    {
+        // insert only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            // check if iterator pos fits to this JSON value
+            if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
+            {
+                JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", *this));
+            }
+
+            // insert to array and return iterator
+            return insert_iterator(pos, cnt, val);
+        }
+
+        JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name()), *this));
+    }
+
+    /// @brief inserts range of elements into array
+    /// @sa https://json.nlohmann.me/api/basic_json/insert/
+    iterator insert(const_iterator pos, const_iterator first, const_iterator last)
+    {
+        // insert only works for arrays
+        if (JSON_HEDLEY_UNLIKELY(!is_array()))
+        {
+            JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name()), *this));
+        }
+
+        // check if iterator pos fits to this JSON value
+        if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
+        {
+            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", *this));
+        }
+
+        // check if range iterators belong to the same JSON object
+        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(210, "iterators do not fit", *this));
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(first.m_object == this))
+        {
+            JSON_THROW(invalid_iterator::create(211, "passed iterators may not belong to container", *this));
+        }
+
+        // insert to array and return iterator
+        return insert_iterator(pos, first.m_it.array_iterator, last.m_it.array_iterator);
+    }
+
+    /// @brief inserts elements from initializer list into array
+    /// @sa https://json.nlohmann.me/api/basic_json/insert/
+    iterator insert(const_iterator pos, initializer_list_t ilist)
+    {
+        // insert only works for arrays
+        if (JSON_HEDLEY_UNLIKELY(!is_array()))
+        {
+            JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name()), *this));
+        }
+
+        // check if iterator pos fits to this JSON value
+        if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
+        {
+            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", *this));
+        }
+
+        // insert to array and return iterator
+        return insert_iterator(pos, ilist.begin(), ilist.end());
+    }
+
+    /// @brief inserts range of elements into object
+    /// @sa https://json.nlohmann.me/api/basic_json/insert/
+    void insert(const_iterator first, const_iterator last)
+    {
+        // insert only works for objects
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name()), *this));
+        }
+
+        // check if range iterators belong to the same JSON object
+        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(210, "iterators do not fit", *this));
+        }
+
+        // passed iterators must belong to objects
+        if (JSON_HEDLEY_UNLIKELY(!first.m_object->is_object()))
+        {
+            JSON_THROW(invalid_iterator::create(202, "iterators first and last must point to objects", *this));
+        }
+
+        m_value.object->insert(first.m_it.object_iterator, last.m_it.object_iterator);
+    }
+
+    /// @brief updates a JSON object from another object, overwriting existing keys
+    /// @sa https://json.nlohmann.me/api/basic_json/update/
+    void update(const_reference j, bool merge_objects = false)
+    {
+        update(j.begin(), j.end(), merge_objects);
+    }
+
+    /// @brief updates a JSON object from another object, overwriting existing keys
+    /// @sa https://json.nlohmann.me/api/basic_json/update/
+    void update(const_iterator first, const_iterator last, bool merge_objects = false)
+    {
+        // implicitly convert null value to an empty object
+        if (is_null())
+        {
+            m_type = value_t::object;
+            m_value.object = create<object_t>();
+            assert_invariant();
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(type_name()), *this));
+        }
+
+        // check if range iterators belong to the same JSON object
+        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(210, "iterators do not fit", *this));
+        }
+
+        // passed iterators must belong to objects
+        if (JSON_HEDLEY_UNLIKELY(!first.m_object->is_object()))
+        {
+            JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(first.m_object->type_name()), *first.m_object));
+        }
+
+        for (auto it = first; it != last; ++it)
+        {
+            if (merge_objects && it.value().is_object())
+            {
+                auto it2 = m_value.object->find(it.key());
+                if (it2 != m_value.object->end())
+                {
+                    it2->second.update(it.value(), true);
+                    continue;
+                }
+            }
+            m_value.object->operator[](it.key()) = it.value();
+#if JSON_DIAGNOSTICS
+            m_value.object->operator[](it.key()).m_parent = this;
+#endif
+        }
+    }
+
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    void swap(reference other) noexcept (
+        std::is_nothrow_move_constructible<value_t>::value&&
+        std::is_nothrow_move_assignable<value_t>::value&&
+        std::is_nothrow_move_constructible<json_value>::value&&
+        std::is_nothrow_move_assignable<json_value>::value
+    )
+    {
+        std::swap(m_type, other.m_type);
+        std::swap(m_value, other.m_value);
+
+        set_parents();
+        other.set_parents();
+        assert_invariant();
+    }
+
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    friend void swap(reference left, reference right) noexcept (
+        std::is_nothrow_move_constructible<value_t>::value&&
+        std::is_nothrow_move_assignable<value_t>::value&&
+        std::is_nothrow_move_constructible<json_value>::value&&
+        std::is_nothrow_move_assignable<json_value>::value
+    )
+    {
+        left.swap(right);
+    }
+
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    void swap(array_t& other) // NOLINT(bugprone-exception-escape)
+    {
+        // swap only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            std::swap(*(m_value.array), other);
+        }
+        else
+        {
+            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name()), *this));
+        }
+    }
+
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    void swap(object_t& other) // NOLINT(bugprone-exception-escape)
+    {
+        // swap only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            std::swap(*(m_value.object), other);
+        }
+        else
+        {
+            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name()), *this));
+        }
+    }
+
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    void swap(string_t& other) // NOLINT(bugprone-exception-escape)
+    {
+        // swap only works for strings
+        if (JSON_HEDLEY_LIKELY(is_string()))
+        {
+            std::swap(*(m_value.string), other);
+        }
+        else
+        {
+            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name()), *this));
+        }
+    }
+
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    void swap(binary_t& other) // NOLINT(bugprone-exception-escape)
+    {
+        // swap only works for strings
+        if (JSON_HEDLEY_LIKELY(is_binary()))
+        {
+            std::swap(*(m_value.binary), other);
+        }
+        else
+        {
+            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name()), *this));
+        }
+    }
+
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    void swap(typename binary_t::container_type& other) // NOLINT(bugprone-exception-escape)
+    {
+        // swap only works for strings
+        if (JSON_HEDLEY_LIKELY(is_binary()))
+        {
+            std::swap(*(m_value.binary), other);
+        }
+        else
+        {
+            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name()), *this));
+        }
+    }
+
+    /// @}
+
+  public:
+    //////////////////////////////////////////
+    // lexicographical comparison operators //
+    //////////////////////////////////////////
+
+    /// @name lexicographical comparison operators
+    /// @{
+
+    /// @brief comparison: equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
+    friend bool operator==(const_reference lhs, const_reference rhs) noexcept
+    {
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+        const auto lhs_type = lhs.type();
+        const auto rhs_type = rhs.type();
+
+        if (lhs_type == rhs_type)
+        {
+            switch (lhs_type)
+            {
+                case value_t::array:
+                    return *lhs.m_value.array == *rhs.m_value.array;
+
+                case value_t::object:
+                    return *lhs.m_value.object == *rhs.m_value.object;
+
+                case value_t::null:
+                    return true;
+
+                case value_t::string:
+                    return *lhs.m_value.string == *rhs.m_value.string;
+
+                case value_t::boolean:
+                    return lhs.m_value.boolean == rhs.m_value.boolean;
+
+                case value_t::number_integer:
+                    return lhs.m_value.number_integer == rhs.m_value.number_integer;
+
+                case value_t::number_unsigned:
+                    return lhs.m_value.number_unsigned == rhs.m_value.number_unsigned;
+
+                case value_t::number_float:
+                    return lhs.m_value.number_float == rhs.m_value.number_float;
+
+                case value_t::binary:
+                    return *lhs.m_value.binary == *rhs.m_value.binary;
+
+                case value_t::discarded:
+                default:
+                    return false;
+            }
+        }
+        else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_float)
+        {
+            return static_cast<number_float_t>(lhs.m_value.number_integer) == rhs.m_value.number_float;
+        }
+        else if (lhs_type == value_t::number_float && rhs_type == value_t::number_integer)
+        {
+            return lhs.m_value.number_float == static_cast<number_float_t>(rhs.m_value.number_integer);
+        }
+        else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_float)
+        {
+            return static_cast<number_float_t>(lhs.m_value.number_unsigned) == rhs.m_value.number_float;
+        }
+        else if (lhs_type == value_t::number_float && rhs_type == value_t::number_unsigned)
+        {
+            return lhs.m_value.number_float == static_cast<number_float_t>(rhs.m_value.number_unsigned);
+        }
+        else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_integer)
+        {
+            return static_cast<number_integer_t>(lhs.m_value.number_unsigned) == rhs.m_value.number_integer;
+        }
+        else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_unsigned)
+        {
+            return lhs.m_value.number_integer == static_cast<number_integer_t>(rhs.m_value.number_unsigned);
+        }
+
+        return false;
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+    }
+
+    /// @brief comparison: equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator==(const_reference lhs, ScalarType rhs) noexcept
+    {
+        return lhs == basic_json(rhs);
+    }
+
+    /// @brief comparison: equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator==(ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) == rhs;
+    }
+
+    /// @brief comparison: not equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ne/
+    friend bool operator!=(const_reference lhs, const_reference rhs) noexcept
+    {
+        return !(lhs == rhs);
+    }
+
+    /// @brief comparison: not equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ne/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator!=(const_reference lhs, ScalarType rhs) noexcept
+    {
+        return lhs != basic_json(rhs);
+    }
+
+    /// @brief comparison: not equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ne/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator!=(ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) != rhs;
+    }
+
+    /// @brief comparison: less than
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_lt/
+    friend bool operator<(const_reference lhs, const_reference rhs) noexcept
+    {
+        const auto lhs_type = lhs.type();
+        const auto rhs_type = rhs.type();
+
+        if (lhs_type == rhs_type)
+        {
+            switch (lhs_type)
+            {
+                case value_t::array:
+                    // note parentheses are necessary, see
+                    // https://github.com/nlohmann/json/issues/1530
+                    return (*lhs.m_value.array) < (*rhs.m_value.array);
+
+                case value_t::object:
+                    return (*lhs.m_value.object) < (*rhs.m_value.object);
+
+                case value_t::null:
+                    return false;
+
+                case value_t::string:
+                    return (*lhs.m_value.string) < (*rhs.m_value.string);
+
+                case value_t::boolean:
+                    return (lhs.m_value.boolean) < (rhs.m_value.boolean);
+
+                case value_t::number_integer:
+                    return (lhs.m_value.number_integer) < (rhs.m_value.number_integer);
+
+                case value_t::number_unsigned:
+                    return (lhs.m_value.number_unsigned) < (rhs.m_value.number_unsigned);
+
+                case value_t::number_float:
+                    return (lhs.m_value.number_float) < (rhs.m_value.number_float);
+
+                case value_t::binary:
+                    return (*lhs.m_value.binary) < (*rhs.m_value.binary);
+
+                case value_t::discarded:
+                default:
+                    return false;
+            }
+        }
+        else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_float)
+        {
+            return static_cast<number_float_t>(lhs.m_value.number_integer) < rhs.m_value.number_float;
+        }
+        else if (lhs_type == value_t::number_float && rhs_type == value_t::number_integer)
+        {
+            return lhs.m_value.number_float < static_cast<number_float_t>(rhs.m_value.number_integer);
+        }
+        else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_float)
+        {
+            return static_cast<number_float_t>(lhs.m_value.number_unsigned) < rhs.m_value.number_float;
+        }
+        else if (lhs_type == value_t::number_float && rhs_type == value_t::number_unsigned)
+        {
+            return lhs.m_value.number_float < static_cast<number_float_t>(rhs.m_value.number_unsigned);
+        }
+        else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_unsigned)
+        {
+            return lhs.m_value.number_integer < static_cast<number_integer_t>(rhs.m_value.number_unsigned);
+        }
+        else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_integer)
+        {
+            return static_cast<number_integer_t>(lhs.m_value.number_unsigned) < rhs.m_value.number_integer;
+        }
+
+        // We only reach this line if we cannot compare values. In that case,
+        // we compare types. Note we have to call the operator explicitly,
+        // because MSVC has problems otherwise.
+        return operator<(lhs_type, rhs_type);
+    }
+
+    /// @brief comparison: less than
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_lt/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator<(const_reference lhs, ScalarType rhs) noexcept
+    {
+        return lhs < basic_json(rhs);
+    }
+
+    /// @brief comparison: less than
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_lt/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator<(ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) < rhs;
+    }
+
+    /// @brief comparison: less than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
+    friend bool operator<=(const_reference lhs, const_reference rhs) noexcept
+    {
+        return !(rhs < lhs);
+    }
+
+    /// @brief comparison: less than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator<=(const_reference lhs, ScalarType rhs) noexcept
+    {
+        return lhs <= basic_json(rhs);
+    }
+
+    /// @brief comparison: less than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator<=(ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) <= rhs;
+    }
+
+    /// @brief comparison: greater than
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_gt/
+    friend bool operator>(const_reference lhs, const_reference rhs) noexcept
+    {
+        return !(lhs <= rhs);
+    }
+
+    /// @brief comparison: greater than
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_gt/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator>(const_reference lhs, ScalarType rhs) noexcept
+    {
+        return lhs > basic_json(rhs);
+    }
+
+    /// @brief comparison: greater than
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_gt/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator>(ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) > rhs;
+    }
+
+    /// @brief comparison: greater than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
+    friend bool operator>=(const_reference lhs, const_reference rhs) noexcept
+    {
+        return !(lhs < rhs);
+    }
+
+    /// @brief comparison: greater than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator>=(const_reference lhs, ScalarType rhs) noexcept
+    {
+        return lhs >= basic_json(rhs);
+    }
+
+    /// @brief comparison: greater than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator>=(ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) >= rhs;
+    }
+
+    /// @}
+
+    ///////////////////
+    // serialization //
+    ///////////////////
+
+    /// @name serialization
+    /// @{
+#ifndef JSON_NO_IO
+    /// @brief serialize to stream
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ltlt/
+    friend std::ostream& operator<<(std::ostream& o, const basic_json& j)
+    {
+        // read width member and use it as indentation parameter if nonzero
+        const bool pretty_print = o.width() > 0;
+        const auto indentation = pretty_print ? o.width() : 0;
+
+        // reset width to 0 for subsequent calls to this stream
+        o.width(0);
+
+        // do the actual serialization
+        serializer s(detail::output_adapter<char>(o), o.fill());
+        s.dump(j, pretty_print, false, static_cast<unsigned int>(indentation));
+        return o;
+    }
+
+    /// @brief serialize to stream
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ltlt/
+    /// @deprecated This function is deprecated since 3.0.0 and will be removed in
+    ///             version 4.0.0 of the library. Please use
+    ///             operator<<(std::ostream&, const basic_json&) instead; that is,
+    ///             replace calls like `j >> o;` with `o << j;`.
+    JSON_HEDLEY_DEPRECATED_FOR(3.0.0, operator<<(std::ostream&, const basic_json&))
+    friend std::ostream& operator>>(const basic_json& j, std::ostream& o)
+    {
+        return o << j;
+    }
+#endif  // JSON_NO_IO
+    /// @}
+
+
+    /////////////////////
+    // deserialization //
+    /////////////////////
+
+    /// @name deserialization
+    /// @{
+
+    /// @brief deserialize from a compatible input
+    /// @sa https://json.nlohmann.me/api/basic_json/parse/
+    template<typename InputType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json parse(InputType&& i,
+                            const parser_callback_t cb = nullptr,
+                            const bool allow_exceptions = true,
+                            const bool ignore_comments = false)
+    {
+        basic_json result;
+        parser(detail::input_adapter(std::forward<InputType>(i)), cb, allow_exceptions, ignore_comments).parse(true, result);
+        return result;
+    }
+
+    /// @brief deserialize from a pair of character iterators
+    /// @sa https://json.nlohmann.me/api/basic_json/parse/
+    template<typename IteratorType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json parse(IteratorType first,
+                            IteratorType last,
+                            const parser_callback_t cb = nullptr,
+                            const bool allow_exceptions = true,
+                            const bool ignore_comments = false)
+    {
+        basic_json result;
+        parser(detail::input_adapter(std::move(first), std::move(last)), cb, allow_exceptions, ignore_comments).parse(true, result);
+        return result;
+    }
+
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, parse(ptr, ptr + len))
+    static basic_json parse(detail::span_input_adapter&& i,
+                            const parser_callback_t cb = nullptr,
+                            const bool allow_exceptions = true,
+                            const bool ignore_comments = false)
+    {
+        basic_json result;
+        parser(i.get(), cb, allow_exceptions, ignore_comments).parse(true, result);
+        return result;
+    }
+
+    /// @brief check if the input is valid JSON
+    /// @sa https://json.nlohmann.me/api/basic_json/accept/
+    template<typename InputType>
+    static bool accept(InputType&& i,
+                       const bool ignore_comments = false)
+    {
+        return parser(detail::input_adapter(std::forward<InputType>(i)), nullptr, false, ignore_comments).accept(true);
+    }
+
+    /// @brief check if the input is valid JSON
+    /// @sa https://json.nlohmann.me/api/basic_json/accept/
+    template<typename IteratorType>
+    static bool accept(IteratorType first, IteratorType last,
+                       const bool ignore_comments = false)
+    {
+        return parser(detail::input_adapter(std::move(first), std::move(last)), nullptr, false, ignore_comments).accept(true);
+    }
+
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, accept(ptr, ptr + len))
+    static bool accept(detail::span_input_adapter&& i,
+                       const bool ignore_comments = false)
+    {
+        return parser(i.get(), nullptr, false, ignore_comments).accept(true);
+    }
+
+    /// @brief generate SAX events
+    /// @sa https://json.nlohmann.me/api/basic_json/sax_parse/
+    template <typename InputType, typename SAX>
+    JSON_HEDLEY_NON_NULL(2)
+    static bool sax_parse(InputType&& i, SAX* sax,
+                          input_format_t format = input_format_t::json,
+                          const bool strict = true,
+                          const bool ignore_comments = false)
+    {
+        auto ia = detail::input_adapter(std::forward<InputType>(i));
+        return format == input_format_t::json
+               ? parser(std::move(ia), nullptr, true, ignore_comments).sax_parse(sax, strict)
+               : detail::binary_reader<basic_json, decltype(ia), SAX>(std::move(ia)).sax_parse(format, sax, strict);
+    }
+
+    /// @brief generate SAX events
+    /// @sa https://json.nlohmann.me/api/basic_json/sax_parse/
+    template<class IteratorType, class SAX>
+    JSON_HEDLEY_NON_NULL(3)
+    static bool sax_parse(IteratorType first, IteratorType last, SAX* sax,
+                          input_format_t format = input_format_t::json,
+                          const bool strict = true,
+                          const bool ignore_comments = false)
+    {
+        auto ia = detail::input_adapter(std::move(first), std::move(last));
+        return format == input_format_t::json
+               ? parser(std::move(ia), nullptr, true, ignore_comments).sax_parse(sax, strict)
+               : detail::binary_reader<basic_json, decltype(ia), SAX>(std::move(ia)).sax_parse(format, sax, strict);
+    }
+
+    /// @brief generate SAX events
+    /// @sa https://json.nlohmann.me/api/basic_json/sax_parse/
+    /// @deprecated This function is deprecated since 3.8.0 and will be removed in
+    ///             version 4.0.0 of the library. Please use
+    ///             sax_parse(ptr, ptr + len) instead.
+    template <typename SAX>
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, sax_parse(ptr, ptr + len, ...))
+    JSON_HEDLEY_NON_NULL(2)
+    static bool sax_parse(detail::span_input_adapter&& i, SAX* sax,
+                          input_format_t format = input_format_t::json,
+                          const bool strict = true,
+                          const bool ignore_comments = false)
+    {
+        auto ia = i.get();
+        return format == input_format_t::json
+               // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
+               ? parser(std::move(ia), nullptr, true, ignore_comments).sax_parse(sax, strict)
+               // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
+               : detail::binary_reader<basic_json, decltype(ia), SAX>(std::move(ia)).sax_parse(format, sax, strict);
+    }
+#ifndef JSON_NO_IO
+    /// @brief deserialize from stream
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_gtgt/
+    /// @deprecated This stream operator is deprecated since 3.0.0 and will be removed in
+    ///             version 4.0.0 of the library. Please use
+    ///             operator>>(std::istream&, basic_json&) instead; that is,
+    ///             replace calls like `j << i;` with `i >> j;`.
+    JSON_HEDLEY_DEPRECATED_FOR(3.0.0, operator>>(std::istream&, basic_json&))
+    friend std::istream& operator<<(basic_json& j, std::istream& i)
+    {
+        return operator>>(i, j);
+    }
+
+    /// @brief deserialize from stream
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_gtgt/
+    friend std::istream& operator>>(std::istream& i, basic_json& j)
+    {
+        parser(detail::input_adapter(i)).parse(false, j);
+        return i;
+    }
+#endif  // JSON_NO_IO
+    /// @}
+
+    ///////////////////////////
+    // convenience functions //
+    ///////////////////////////
+
+    /// @brief return the type as string
+    /// @sa https://json.nlohmann.me/api/basic_json/type_name/
+    JSON_HEDLEY_RETURNS_NON_NULL
+    const char* type_name() const noexcept
+    {
+        switch (m_type)
+        {
+            case value_t::null:
+                return "null";
+            case value_t::object:
+                return "object";
+            case value_t::array:
+                return "array";
+            case value_t::string:
+                return "string";
+            case value_t::boolean:
+                return "boolean";
+            case value_t::binary:
+                return "binary";
+            case value_t::discarded:
+                return "discarded";
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            default:
+                return "number";
+        }
+    }
+
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    //////////////////////
+    // member variables //
+    //////////////////////
+
+    /// the type of the current element
+    value_t m_type = value_t::null;
+
+    /// the value of the current element
+    json_value m_value = {};
+
+#if JSON_DIAGNOSTICS
+    /// a pointer to a parent value (for debugging purposes)
+    basic_json* m_parent = nullptr;
+#endif
+
+    //////////////////////////////////////////
+    // binary serialization/deserialization //
+    //////////////////////////////////////////
+
+    /// @name binary serialization/deserialization support
+    /// @{
+
+  public:
+    /// @brief create a CBOR serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_cbor/
+    static std::vector<std::uint8_t> to_cbor(const basic_json& j)
+    {
+        std::vector<std::uint8_t> result;
+        to_cbor(j, result);
+        return result;
+    }
+
+    /// @brief create a CBOR serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_cbor/
+    static void to_cbor(const basic_json& j, detail::output_adapter<std::uint8_t> o)
+    {
+        binary_writer<std::uint8_t>(o).write_cbor(j);
+    }
+
+    /// @brief create a CBOR serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_cbor/
+    static void to_cbor(const basic_json& j, detail::output_adapter<char> o)
+    {
+        binary_writer<char>(o).write_cbor(j);
+    }
+
+    /// @brief create a MessagePack serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_msgpack/
+    static std::vector<std::uint8_t> to_msgpack(const basic_json& j)
+    {
+        std::vector<std::uint8_t> result;
+        to_msgpack(j, result);
+        return result;
+    }
+
+    /// @brief create a MessagePack serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_msgpack/
+    static void to_msgpack(const basic_json& j, detail::output_adapter<std::uint8_t> o)
+    {
+        binary_writer<std::uint8_t>(o).write_msgpack(j);
+    }
+
+    /// @brief create a MessagePack serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_msgpack/
+    static void to_msgpack(const basic_json& j, detail::output_adapter<char> o)
+    {
+        binary_writer<char>(o).write_msgpack(j);
+    }
+
+    /// @brief create a UBJSON serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_ubjson/
+    static std::vector<std::uint8_t> to_ubjson(const basic_json& j,
+            const bool use_size = false,
+            const bool use_type = false)
+    {
+        std::vector<std::uint8_t> result;
+        to_ubjson(j, result, use_size, use_type);
+        return result;
+    }
+
+    /// @brief create a UBJSON serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_ubjson/
+    static void to_ubjson(const basic_json& j, detail::output_adapter<std::uint8_t> o,
+                          const bool use_size = false, const bool use_type = false)
+    {
+        binary_writer<std::uint8_t>(o).write_ubjson(j, use_size, use_type);
+    }
+
+    /// @brief create a UBJSON serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_ubjson/
+    static void to_ubjson(const basic_json& j, detail::output_adapter<char> o,
+                          const bool use_size = false, const bool use_type = false)
+    {
+        binary_writer<char>(o).write_ubjson(j, use_size, use_type);
+    }
+
+    /// @brief create a BSON serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_bson/
+    static std::vector<std::uint8_t> to_bson(const basic_json& j)
+    {
+        std::vector<std::uint8_t> result;
+        to_bson(j, result);
+        return result;
+    }
+
+    /// @brief create a BSON serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_bson/
+    static void to_bson(const basic_json& j, detail::output_adapter<std::uint8_t> o)
+    {
+        binary_writer<std::uint8_t>(o).write_bson(j);
+    }
+
+    /// @brief create a BSON serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_bson/
+    static void to_bson(const basic_json& j, detail::output_adapter<char> o)
+    {
+        binary_writer<char>(o).write_bson(j);
+    }
+
+    /// @brief create a JSON value from an input in CBOR format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_cbor/
+    template<typename InputType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_cbor(InputType&& i,
+                                const bool strict = true,
+                                const bool allow_exceptions = true,
+                                const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = detail::input_adapter(std::forward<InputType>(i));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in CBOR format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_cbor/
+    template<typename IteratorType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_cbor(IteratorType first, IteratorType last,
+                                const bool strict = true,
+                                const bool allow_exceptions = true,
+                                const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = detail::input_adapter(std::move(first), std::move(last));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    template<typename T>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_cbor(ptr, ptr + len))
+    static basic_json from_cbor(const T* ptr, std::size_t len,
+                                const bool strict = true,
+                                const bool allow_exceptions = true,
+                                const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
+    {
+        return from_cbor(ptr, ptr + len, strict, allow_exceptions, tag_handler);
+    }
+
+
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_cbor(ptr, ptr + len))
+    static basic_json from_cbor(detail::span_input_adapter&& i,
+                                const bool strict = true,
+                                const bool allow_exceptions = true,
+                                const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = i.get();
+        // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
+        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in MessagePack format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_msgpack/
+    template<typename InputType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_msgpack(InputType&& i,
+                                   const bool strict = true,
+                                   const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = detail::input_adapter(std::forward<InputType>(i));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::msgpack, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in MessagePack format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_msgpack/
+    template<typename IteratorType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_msgpack(IteratorType first, IteratorType last,
+                                   const bool strict = true,
+                                   const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = detail::input_adapter(std::move(first), std::move(last));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::msgpack, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    template<typename T>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_msgpack(ptr, ptr + len))
+    static basic_json from_msgpack(const T* ptr, std::size_t len,
+                                   const bool strict = true,
+                                   const bool allow_exceptions = true)
+    {
+        return from_msgpack(ptr, ptr + len, strict, allow_exceptions);
+    }
+
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_msgpack(ptr, ptr + len))
+    static basic_json from_msgpack(detail::span_input_adapter&& i,
+                                   const bool strict = true,
+                                   const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = i.get();
+        // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
+        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::msgpack, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in UBJSON format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_ubjson/
+    template<typename InputType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_ubjson(InputType&& i,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = detail::input_adapter(std::forward<InputType>(i));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::ubjson, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in UBJSON format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_ubjson/
+    template<typename IteratorType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_ubjson(IteratorType first, IteratorType last,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = detail::input_adapter(std::move(first), std::move(last));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::ubjson, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    template<typename T>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_ubjson(ptr, ptr + len))
+    static basic_json from_ubjson(const T* ptr, std::size_t len,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        return from_ubjson(ptr, ptr + len, strict, allow_exceptions);
+    }
+
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_ubjson(ptr, ptr + len))
+    static basic_json from_ubjson(detail::span_input_adapter&& i,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = i.get();
+        // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
+        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::ubjson, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in BSON format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_bson/
+    template<typename InputType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_bson(InputType&& i,
+                                const bool strict = true,
+                                const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = detail::input_adapter(std::forward<InputType>(i));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::bson, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in BSON format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_bson/
+    template<typename IteratorType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_bson(IteratorType first, IteratorType last,
+                                const bool strict = true,
+                                const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = detail::input_adapter(std::move(first), std::move(last));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::bson, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    template<typename T>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_bson(ptr, ptr + len))
+    static basic_json from_bson(const T* ptr, std::size_t len,
+                                const bool strict = true,
+                                const bool allow_exceptions = true)
+    {
+        return from_bson(ptr, ptr + len, strict, allow_exceptions);
+    }
+
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_bson(ptr, ptr + len))
+    static basic_json from_bson(detail::span_input_adapter&& i,
+                                const bool strict = true,
+                                const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = i.get();
+        // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
+        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::bson, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+    /// @}
+
+    //////////////////////////
+    // JSON Pointer support //
+    //////////////////////////
+
+    /// @name JSON Pointer functions
+    /// @{
+
+    /// @brief access specified element via JSON Pointer
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    reference operator[](const json_pointer& ptr)
+    {
+        return ptr.get_unchecked(this);
+    }
+
+    /// @brief access specified element via JSON Pointer
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    const_reference operator[](const json_pointer& ptr) const
+    {
+        return ptr.get_unchecked(this);
+    }
+
+    /// @brief access specified element via JSON Pointer
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
+    reference at(const json_pointer& ptr)
+    {
+        return ptr.get_checked(this);
+    }
+
+    /// @brief access specified element via JSON Pointer
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
+    const_reference at(const json_pointer& ptr) const
+    {
+        return ptr.get_checked(this);
+    }
+
+    /// @brief return flattened JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/flatten/
+    basic_json flatten() const
+    {
+        basic_json result(value_t::object);
+        json_pointer::flatten("", *this, result);
+        return result;
+    }
+
+    /// @brief unflatten a previously flattened JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/unflatten/
+    basic_json unflatten() const
+    {
+        return json_pointer::unflatten(*this);
+    }
+
+    /// @}
+
+    //////////////////////////
+    // JSON Patch functions //
+    //////////////////////////
+
+    /// @name JSON Patch functions
+    /// @{
+
+    /// @brief applies a JSON patch
+    /// @sa https://json.nlohmann.me/api/basic_json/patch/
+    basic_json patch(const basic_json& json_patch) const
+    {
+        // make a working copy to apply the patch to
+        basic_json result = *this;
+
+        // the valid JSON Patch operations
+        enum class patch_operations {add, remove, replace, move, copy, test, invalid};
+
+        const auto get_op = [](const std::string & op)
+        {
+            if (op == "add")
+            {
+                return patch_operations::add;
+            }
+            if (op == "remove")
+            {
+                return patch_operations::remove;
+            }
+            if (op == "replace")
+            {
+                return patch_operations::replace;
+            }
+            if (op == "move")
+            {
+                return patch_operations::move;
+            }
+            if (op == "copy")
+            {
+                return patch_operations::copy;
+            }
+            if (op == "test")
+            {
+                return patch_operations::test;
+            }
+
+            return patch_operations::invalid;
+        };
+
+        // wrapper for "add" operation; add value at ptr
+        const auto operation_add = [&result](json_pointer & ptr, basic_json val)
+        {
+            // adding to the root of the target document means replacing it
+            if (ptr.empty())
+            {
+                result = val;
+                return;
+            }
+
+            // make sure the top element of the pointer exists
+            json_pointer top_pointer = ptr.top();
+            if (top_pointer != ptr)
+            {
+                result.at(top_pointer);
+            }
+
+            // get reference to parent of JSON pointer ptr
+            const auto last_path = ptr.back();
+            ptr.pop_back();
+            basic_json& parent = result[ptr];
+
+            switch (parent.m_type)
+            {
+                case value_t::null:
+                case value_t::object:
+                {
+                    // use operator[] to add value
+                    parent[last_path] = val;
+                    break;
+                }
+
+                case value_t::array:
+                {
+                    if (last_path == "-")
+                    {
+                        // special case: append to back
+                        parent.push_back(val);
+                    }
+                    else
+                    {
+                        const auto idx = json_pointer::array_index(last_path);
+                        if (JSON_HEDLEY_UNLIKELY(idx > parent.size()))
+                        {
+                            // avoid undefined behavior
+                            JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range", parent));
+                        }
+
+                        // default case: insert add offset
+                        parent.insert(parent.begin() + static_cast<difference_type>(idx), val);
+                    }
+                    break;
+                }
+
+                // if there exists a parent it cannot be primitive
+                case value_t::string: // LCOV_EXCL_LINE
+                case value_t::boolean: // LCOV_EXCL_LINE
+                case value_t::number_integer: // LCOV_EXCL_LINE
+                case value_t::number_unsigned: // LCOV_EXCL_LINE
+                case value_t::number_float: // LCOV_EXCL_LINE
+                case value_t::binary: // LCOV_EXCL_LINE
+                case value_t::discarded: // LCOV_EXCL_LINE
+                default:            // LCOV_EXCL_LINE
+                    JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+            }
+        };
+
+        // wrapper for "remove" operation; remove value at ptr
+        const auto operation_remove = [this, &result](json_pointer & ptr)
+        {
+            // get reference to parent of JSON pointer ptr
+            const auto last_path = ptr.back();
+            ptr.pop_back();
+            basic_json& parent = result.at(ptr);
+
+            // remove child
+            if (parent.is_object())
+            {
+                // perform range check
+                auto it = parent.find(last_path);
+                if (JSON_HEDLEY_LIKELY(it != parent.end()))
+                {
+                    parent.erase(it);
+                }
+                else
+                {
+                    JSON_THROW(out_of_range::create(403, "key '" + last_path + "' not found", *this));
+                }
+            }
+            else if (parent.is_array())
+            {
+                // note erase performs range check
+                parent.erase(json_pointer::array_index(last_path));
+            }
+        };
+
+        // type check: top level value must be an array
+        if (JSON_HEDLEY_UNLIKELY(!json_patch.is_array()))
+        {
+            JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects", json_patch));
+        }
+
+        // iterate and apply the operations
+        for (const auto& val : json_patch)
+        {
+            // wrapper to get a value for an operation
+            const auto get_value = [&val](const std::string & op,
+                                          const std::string & member,
+                                          bool string_type) -> basic_json &
+            {
+                // find value
+                auto it = val.m_value.object->find(member);
+
+                // context-sensitive error message
+                const auto error_msg = (op == "op") ? "operation" : "operation '" + op + "'";
+
+                // check if desired value is present
+                if (JSON_HEDLEY_UNLIKELY(it == val.m_value.object->end()))
+                {
+                    // NOLINTNEXTLINE(performance-inefficient-string-concatenation)
+                    JSON_THROW(parse_error::create(105, 0, error_msg + " must have member '" + member + "'", val));
+                }
+
+                // check if result is of type string
+                if (JSON_HEDLEY_UNLIKELY(string_type && !it->second.is_string()))
+                {
+                    // NOLINTNEXTLINE(performance-inefficient-string-concatenation)
+                    JSON_THROW(parse_error::create(105, 0, error_msg + " must have string member '" + member + "'", val));
+                }
+
+                // no error: return value
+                return it->second;
+            };
+
+            // type check: every element of the array must be an object
+            if (JSON_HEDLEY_UNLIKELY(!val.is_object()))
+            {
+                JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects", val));
+            }
+
+            // collect mandatory members
+            const auto op = get_value("op", "op", true).template get<std::string>();
+            const auto path = get_value(op, "path", true).template get<std::string>();
+            json_pointer ptr(path);
+
+            switch (get_op(op))
+            {
+                case patch_operations::add:
+                {
+                    operation_add(ptr, get_value("add", "value", false));
+                    break;
+                }
+
+                case patch_operations::remove:
+                {
+                    operation_remove(ptr);
+                    break;
+                }
+
+                case patch_operations::replace:
+                {
+                    // the "path" location must exist - use at()
+                    result.at(ptr) = get_value("replace", "value", false);
+                    break;
+                }
+
+                case patch_operations::move:
+                {
+                    const auto from_path = get_value("move", "from", true).template get<std::string>();
+                    json_pointer from_ptr(from_path);
+
+                    // the "from" location must exist - use at()
+                    basic_json v = result.at(from_ptr);
+
+                    // The move operation is functionally identical to a
+                    // "remove" operation on the "from" location, followed
+                    // immediately by an "add" operation at the target
+                    // location with the value that was just removed.
+                    operation_remove(from_ptr);
+                    operation_add(ptr, v);
+                    break;
+                }
+
+                case patch_operations::copy:
+                {
+                    const auto from_path = get_value("copy", "from", true).template get<std::string>();
+                    const json_pointer from_ptr(from_path);
+
+                    // the "from" location must exist - use at()
+                    basic_json v = result.at(from_ptr);
+
+                    // The copy is functionally identical to an "add"
+                    // operation at the target location using the value
+                    // specified in the "from" member.
+                    operation_add(ptr, v);
+                    break;
+                }
+
+                case patch_operations::test:
+                {
+                    bool success = false;
+                    JSON_TRY
+                    {
+                        // check if "value" matches the one at "path"
+                        // the "path" location must exist - use at()
+                        success = (result.at(ptr) == get_value("test", "value", false));
+                    }
+                    JSON_INTERNAL_CATCH (out_of_range&)
+                    {
+                        // ignore out of range errors: success remains false
+                    }
+
+                    // throw an exception if test fails
+                    if (JSON_HEDLEY_UNLIKELY(!success))
+                    {
+                        JSON_THROW(other_error::create(501, "unsuccessful: " + val.dump(), val));
+                    }
+
+                    break;
+                }
+
+                case patch_operations::invalid:
+                default:
+                {
+                    // op must be "add", "remove", "replace", "move", "copy", or
+                    // "test"
+                    JSON_THROW(parse_error::create(105, 0, "operation value '" + op + "' is invalid", val));
+                }
+            }
+        }
+
+        return result;
+    }
+
+    /// @brief creates a diff as a JSON patch
+    /// @sa https://json.nlohmann.me/api/basic_json/diff/
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json diff(const basic_json& source, const basic_json& target,
+                           const std::string& path = "")
+    {
+        // the patch
+        basic_json result(value_t::array);
+
+        // if the values are the same, return empty patch
+        if (source == target)
+        {
+            return result;
+        }
+
+        if (source.type() != target.type())
+        {
+            // different types: replace value
+            result.push_back(
+            {
+                {"op", "replace"}, {"path", path}, {"value", target}
+            });
+            return result;
+        }
+
+        switch (source.type())
+        {
+            case value_t::array:
+            {
+                // first pass: traverse common elements
+                std::size_t i = 0;
+                while (i < source.size() && i < target.size())
+                {
+                    // recursive call to compare array values at index i
+                    auto temp_diff = diff(source[i], target[i], path + "/" + std::to_string(i));
+                    result.insert(result.end(), temp_diff.begin(), temp_diff.end());
+                    ++i;
+                }
+
+                // We now reached the end of at least one array
+                // in a second pass, traverse the remaining elements
+
+                // remove my remaining elements
+                const auto end_index = static_cast<difference_type>(result.size());
+                while (i < source.size())
+                {
+                    // add operations in reverse order to avoid invalid
+                    // indices
+                    result.insert(result.begin() + end_index, object(
+                    {
+                        {"op", "remove"},
+                        {"path", path + "/" + std::to_string(i)}
+                    }));
+                    ++i;
+                }
+
+                // add other remaining elements
+                while (i < target.size())
+                {
+                    result.push_back(
+                    {
+                        {"op", "add"},
+                        {"path", path + "/-"},
+                        {"value", target[i]}
+                    });
+                    ++i;
+                }
+
+                break;
+            }
+
+            case value_t::object:
+            {
+                // first pass: traverse this object's elements
+                for (auto it = source.cbegin(); it != source.cend(); ++it)
+                {
+                    // escape the key name to be used in a JSON patch
+                    const auto path_key = path + "/" + detail::escape(it.key());
+
+                    if (target.find(it.key()) != target.end())
+                    {
+                        // recursive call to compare object values at key it
+                        auto temp_diff = diff(it.value(), target[it.key()], path_key);
+                        result.insert(result.end(), temp_diff.begin(), temp_diff.end());
+                    }
+                    else
+                    {
+                        // found a key that is not in o -> remove it
+                        result.push_back(object(
+                        {
+                            {"op", "remove"}, {"path", path_key}
+                        }));
+                    }
+                }
+
+                // second pass: traverse other object's elements
+                for (auto it = target.cbegin(); it != target.cend(); ++it)
+                {
+                    if (source.find(it.key()) == source.end())
+                    {
+                        // found a key that is not in this -> add it
+                        const auto path_key = path + "/" + detail::escape(it.key());
+                        result.push_back(
+                        {
+                            {"op", "add"}, {"path", path_key},
+                            {"value", it.value()}
+                        });
+                    }
+                }
+
+                break;
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                // both primitive type: replace value
+                result.push_back(
+                {
+                    {"op", "replace"}, {"path", path}, {"value", target}
+                });
+                break;
+            }
+        }
+
+        return result;
+    }
+
+    /// @}
+
+    ////////////////////////////////
+    // JSON Merge Patch functions //
+    ////////////////////////////////
+
+    /// @name JSON Merge Patch functions
+    /// @{
+
+    /// @brief applies a JSON Merge Patch
+    /// @sa https://json.nlohmann.me/api/basic_json/merge_patch/
+    void merge_patch(const basic_json& apply_patch)
+    {
+        if (apply_patch.is_object())
+        {
+            if (!is_object())
+            {
+                *this = object();
+            }
+            for (auto it = apply_patch.begin(); it != apply_patch.end(); ++it)
+            {
+                if (it.value().is_null())
+                {
+                    erase(it.key());
+                }
+                else
+                {
+                    operator[](it.key()).merge_patch(it.value());
+                }
+            }
+        }
+        else
+        {
+            *this = apply_patch;
+        }
+    }
+
+    /// @}
+};
+
+/// @brief user-defined to_string function for JSON values
+/// @sa https://json.nlohmann.me/api/basic_json/to_string/
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+std::string to_string(const NLOHMANN_BASIC_JSON_TPL& j)
+{
+    return j.dump();
+}
+
+} // namespace nlohmann
+
+///////////////////////
+// nonmember support //
+///////////////////////
+
+namespace std // NOLINT(cert-dcl58-cpp)
+{
+
+/// @brief hash value for JSON objects
+/// @sa https://json.nlohmann.me/api/basic_json/std_hash/
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+struct hash<nlohmann::NLOHMANN_BASIC_JSON_TPL>
+{
+    std::size_t operator()(const nlohmann::NLOHMANN_BASIC_JSON_TPL& j) const
+    {
+        return nlohmann::detail::hash(j);
+    }
+};
+
+// specialization for std::less<value_t>
+template<>
+struct less< ::nlohmann::detail::value_t> // do not remove the space after '<', see https://github.com/nlohmann/json/pull/679
+{
+    /*!
+    @brief compare two value_t enum values
+    @since version 3.0.0
+    */
+    bool operator()(nlohmann::detail::value_t lhs,
+                    nlohmann::detail::value_t rhs) const noexcept
+    {
+        return nlohmann::detail::operator<(lhs, rhs);
+    }
+};
+
+// C++20 prohibit function specialization in the std namespace.
+#ifndef JSON_HAS_CPP_20
+
+/// @brief exchanges the values of two JSON objects
+/// @sa https://json.nlohmann.me/api/basic_json/std_swap/
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+inline void swap(nlohmann::NLOHMANN_BASIC_JSON_TPL& j1, nlohmann::NLOHMANN_BASIC_JSON_TPL& j2) noexcept(  // NOLINT(readability-inconsistent-declaration-parameter-name)
+    is_nothrow_move_constructible<nlohmann::NLOHMANN_BASIC_JSON_TPL>::value&&                          // NOLINT(misc-redundant-expression)
+    is_nothrow_move_assignable<nlohmann::NLOHMANN_BASIC_JSON_TPL>::value)
+{
+    j1.swap(j2);
+}
+
+#endif
+
+} // namespace std
+
+/// @brief user-defined string literal for JSON values
+/// @sa https://json.nlohmann.me/api/basic_json/operator_literal_json/
+JSON_HEDLEY_NON_NULL(1)
+inline nlohmann::json operator "" _json(const char* s, std::size_t n)
+{
+    return nlohmann::json::parse(s, s + n);
+}
+
+/// @brief user-defined string literal for JSON pointer
+/// @sa https://json.nlohmann.me/api/basic_json/operator_literal_json_pointer/
+JSON_HEDLEY_NON_NULL(1)
+inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std::size_t n)
+{
+    return nlohmann::json::json_pointer(std::string(s, n));
+}
+
+// #include <nlohmann/detail/macro_unscope.hpp>
+
+
+// restore clang diagnostic settings
+#if defined(__clang__)
+    #pragma clang diagnostic pop
+#endif
+
+// clean up
+#undef JSON_ASSERT
+#undef JSON_INTERNAL_CATCH
+#undef JSON_CATCH
+#undef JSON_THROW
+#undef JSON_TRY
+#undef JSON_PRIVATE_UNLESS_TESTED
+#undef JSON_HAS_CPP_11
+#undef JSON_HAS_CPP_14
+#undef JSON_HAS_CPP_17
+#undef JSON_HAS_CPP_20
+#undef JSON_HAS_FILESYSTEM
+#undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+#undef NLOHMANN_BASIC_JSON_TPL_DECLARATION
+#undef NLOHMANN_BASIC_JSON_TPL
+#undef JSON_EXPLICIT
+#undef NLOHMANN_CAN_CALL_STD_FUNC_IMPL
+
+// #include <nlohmann/thirdparty/hedley/hedley_undef.hpp>
+
+
+#undef JSON_HEDLEY_ALWAYS_INLINE
+#undef JSON_HEDLEY_ARM_VERSION
+#undef JSON_HEDLEY_ARM_VERSION_CHECK
+#undef JSON_HEDLEY_ARRAY_PARAM
+#undef JSON_HEDLEY_ASSUME
+#undef JSON_HEDLEY_BEGIN_C_DECLS
+#undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE
+#undef JSON_HEDLEY_CLANG_HAS_BUILTIN
+#undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE
+#undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE
+#undef JSON_HEDLEY_CLANG_HAS_EXTENSION
+#undef JSON_HEDLEY_CLANG_HAS_FEATURE
+#undef JSON_HEDLEY_CLANG_HAS_WARNING
+#undef JSON_HEDLEY_COMPCERT_VERSION
+#undef JSON_HEDLEY_COMPCERT_VERSION_CHECK
+#undef JSON_HEDLEY_CONCAT
+#undef JSON_HEDLEY_CONCAT3
+#undef JSON_HEDLEY_CONCAT3_EX
+#undef JSON_HEDLEY_CONCAT_EX
+#undef JSON_HEDLEY_CONST
+#undef JSON_HEDLEY_CONSTEXPR
+#undef JSON_HEDLEY_CONST_CAST
+#undef JSON_HEDLEY_CPP_CAST
+#undef JSON_HEDLEY_CRAY_VERSION
+#undef JSON_HEDLEY_CRAY_VERSION_CHECK
+#undef JSON_HEDLEY_C_DECL
+#undef JSON_HEDLEY_DEPRECATED
+#undef JSON_HEDLEY_DEPRECATED_FOR
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION
+#undef JSON_HEDLEY_DIAGNOSTIC_POP
+#undef JSON_HEDLEY_DIAGNOSTIC_PUSH
+#undef JSON_HEDLEY_DMC_VERSION
+#undef JSON_HEDLEY_DMC_VERSION_CHECK
+#undef JSON_HEDLEY_EMPTY_BASES
+#undef JSON_HEDLEY_EMSCRIPTEN_VERSION
+#undef JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK
+#undef JSON_HEDLEY_END_C_DECLS
+#undef JSON_HEDLEY_FLAGS
+#undef JSON_HEDLEY_FLAGS_CAST
+#undef JSON_HEDLEY_GCC_HAS_ATTRIBUTE
+#undef JSON_HEDLEY_GCC_HAS_BUILTIN
+#undef JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE
+#undef JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE
+#undef JSON_HEDLEY_GCC_HAS_EXTENSION
+#undef JSON_HEDLEY_GCC_HAS_FEATURE
+#undef JSON_HEDLEY_GCC_HAS_WARNING
+#undef JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK
+#undef JSON_HEDLEY_GCC_VERSION
+#undef JSON_HEDLEY_GCC_VERSION_CHECK
+#undef JSON_HEDLEY_GNUC_HAS_ATTRIBUTE
+#undef JSON_HEDLEY_GNUC_HAS_BUILTIN
+#undef JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE
+#undef JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE
+#undef JSON_HEDLEY_GNUC_HAS_EXTENSION
+#undef JSON_HEDLEY_GNUC_HAS_FEATURE
+#undef JSON_HEDLEY_GNUC_HAS_WARNING
+#undef JSON_HEDLEY_GNUC_VERSION
+#undef JSON_HEDLEY_GNUC_VERSION_CHECK
+#undef JSON_HEDLEY_HAS_ATTRIBUTE
+#undef JSON_HEDLEY_HAS_BUILTIN
+#undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE
+#undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS
+#undef JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE
+#undef JSON_HEDLEY_HAS_EXTENSION
+#undef JSON_HEDLEY_HAS_FEATURE
+#undef JSON_HEDLEY_HAS_WARNING
+#undef JSON_HEDLEY_IAR_VERSION
+#undef JSON_HEDLEY_IAR_VERSION_CHECK
+#undef JSON_HEDLEY_IBM_VERSION
+#undef JSON_HEDLEY_IBM_VERSION_CHECK
+#undef JSON_HEDLEY_IMPORT
+#undef JSON_HEDLEY_INLINE
+#undef JSON_HEDLEY_INTEL_CL_VERSION
+#undef JSON_HEDLEY_INTEL_CL_VERSION_CHECK
+#undef JSON_HEDLEY_INTEL_VERSION
+#undef JSON_HEDLEY_INTEL_VERSION_CHECK
+#undef JSON_HEDLEY_IS_CONSTANT
+#undef JSON_HEDLEY_IS_CONSTEXPR_
+#undef JSON_HEDLEY_LIKELY
+#undef JSON_HEDLEY_MALLOC
+#undef JSON_HEDLEY_MCST_LCC_VERSION
+#undef JSON_HEDLEY_MCST_LCC_VERSION_CHECK
+#undef JSON_HEDLEY_MESSAGE
+#undef JSON_HEDLEY_MSVC_VERSION
+#undef JSON_HEDLEY_MSVC_VERSION_CHECK
+#undef JSON_HEDLEY_NEVER_INLINE
+#undef JSON_HEDLEY_NON_NULL
+#undef JSON_HEDLEY_NO_ESCAPE
+#undef JSON_HEDLEY_NO_RETURN
+#undef JSON_HEDLEY_NO_THROW
+#undef JSON_HEDLEY_NULL
+#undef JSON_HEDLEY_PELLES_VERSION
+#undef JSON_HEDLEY_PELLES_VERSION_CHECK
+#undef JSON_HEDLEY_PGI_VERSION
+#undef JSON_HEDLEY_PGI_VERSION_CHECK
+#undef JSON_HEDLEY_PREDICT
+#undef JSON_HEDLEY_PRINTF_FORMAT
+#undef JSON_HEDLEY_PRIVATE
+#undef JSON_HEDLEY_PUBLIC
+#undef JSON_HEDLEY_PURE
+#undef JSON_HEDLEY_REINTERPRET_CAST
+#undef JSON_HEDLEY_REQUIRE
+#undef JSON_HEDLEY_REQUIRE_CONSTEXPR
+#undef JSON_HEDLEY_REQUIRE_MSG
+#undef JSON_HEDLEY_RESTRICT
+#undef JSON_HEDLEY_RETURNS_NON_NULL
+#undef JSON_HEDLEY_SENTINEL
+#undef JSON_HEDLEY_STATIC_ASSERT
+#undef JSON_HEDLEY_STATIC_CAST
+#undef JSON_HEDLEY_STRINGIFY
+#undef JSON_HEDLEY_STRINGIFY_EX
+#undef JSON_HEDLEY_SUNPRO_VERSION
+#undef JSON_HEDLEY_SUNPRO_VERSION_CHECK
+#undef JSON_HEDLEY_TINYC_VERSION
+#undef JSON_HEDLEY_TINYC_VERSION_CHECK
+#undef JSON_HEDLEY_TI_ARMCL_VERSION
+#undef JSON_HEDLEY_TI_ARMCL_VERSION_CHECK
+#undef JSON_HEDLEY_TI_CL2000_VERSION
+#undef JSON_HEDLEY_TI_CL2000_VERSION_CHECK
+#undef JSON_HEDLEY_TI_CL430_VERSION
+#undef JSON_HEDLEY_TI_CL430_VERSION_CHECK
+#undef JSON_HEDLEY_TI_CL6X_VERSION
+#undef JSON_HEDLEY_TI_CL6X_VERSION_CHECK
+#undef JSON_HEDLEY_TI_CL7X_VERSION
+#undef JSON_HEDLEY_TI_CL7X_VERSION_CHECK
+#undef JSON_HEDLEY_TI_CLPRU_VERSION
+#undef JSON_HEDLEY_TI_CLPRU_VERSION_CHECK
+#undef JSON_HEDLEY_TI_VERSION
+#undef JSON_HEDLEY_TI_VERSION_CHECK
+#undef JSON_HEDLEY_UNAVAILABLE
+#undef JSON_HEDLEY_UNLIKELY
+#undef JSON_HEDLEY_UNPREDICTABLE
+#undef JSON_HEDLEY_UNREACHABLE
+#undef JSON_HEDLEY_UNREACHABLE_RETURN
+#undef JSON_HEDLEY_VERSION
+#undef JSON_HEDLEY_VERSION_DECODE_MAJOR
+#undef JSON_HEDLEY_VERSION_DECODE_MINOR
+#undef JSON_HEDLEY_VERSION_DECODE_REVISION
+#undef JSON_HEDLEY_VERSION_ENCODE
+#undef JSON_HEDLEY_WARNING
+#undef JSON_HEDLEY_WARN_UNUSED_RESULT
+#undef JSON_HEDLEY_WARN_UNUSED_RESULT_MSG
+#undef JSON_HEDLEY_FALL_THROUGH
+
+
+
+#endif  // INCLUDE_NLOHMANN_JSON_V3_10_5_HPP_
diff --git a/external_imported/json/tests/abi/inline_ns/CMakeLists.txt b/external_imported/json/tests/abi/inline_ns/CMakeLists.txt
new file mode 100644
index 000000000..c1a0817e0
--- /dev/null
+++ b/external_imported/json/tests/abi/inline_ns/CMakeLists.txt
@@ -0,0 +1,12 @@
+# test linking an old library version without an inline namespace
+# with the current library using an inline namespace into the same executable
+
+# build test executable and add test
+add_executable(abi_compat_inline_ns
+    use_v3_10_5.cpp
+    use_current.cpp)
+target_link_libraries(abi_compat_inline_ns PRIVATE abi_compat_main)
+
+add_test(
+    NAME test-abi_compat_inline_ns
+    COMMAND abi_compat_inline_ns ${DOCTEST_TEST_FILTER})
diff --git a/external_imported/json/tests/abi/inline_ns/use_current.cpp b/external_imported/json/tests/abi/inline_ns/use_current.cpp
new file mode 100644
index 000000000..cb07dd33e
--- /dev/null
+++ b/external_imported/json/tests/abi/inline_ns/use_current.cpp
@@ -0,0 +1,36 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+#include <nlohmann/json.hpp>
+
+TEST_CASE("use current library with inline namespace")
+{
+    SECTION("implicitly")
+    {
+        using nlohmann::json;
+        using nlohmann::ordered_json;
+
+        json j;
+        // In v3.10.5 mixing json_pointers of different basic_json types
+        // results in implicit string conversion
+        j[ordered_json::json_pointer("/root")] = json::object();
+        CHECK(j.dump() == "{\"root\":{}}");
+    }
+
+    SECTION("explicitly")
+    {
+        using NLOHMANN_JSON_NAMESPACE::json;
+        using NLOHMANN_JSON_NAMESPACE::ordered_json;
+
+        json j;
+        j[ordered_json::json_pointer("/root")] = json::object();
+        CHECK(j.dump() == "{\"root\":{}}");
+    }
+}
diff --git a/external_imported/json/tests/abi/inline_ns/use_v3_10_5.cpp b/external_imported/json/tests/abi/inline_ns/use_v3_10_5.cpp
new file mode 100644
index 000000000..7a4275390
--- /dev/null
+++ b/external_imported/json/tests/abi/inline_ns/use_v3_10_5.cpp
@@ -0,0 +1,22 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+#include <nlohmann/json_v3_10_5.hpp>
+using nlohmann::json;
+using nlohmann::ordered_json;
+
+TEST_CASE("use library v3.10.5 without inline namespace")
+{
+    json j;
+    j[ordered_json::json_pointer("/root")] = json::object();
+    // In v3.10.5 mixing json_pointers of different basic_json types
+    // results in implicit string conversion
+    CHECK(j.dump() == "{\"/root\":{}}");
+}
diff --git a/external_imported/json/tests/abi/main.cpp b/external_imported/json/tests/abi/main.cpp
new file mode 100644
index 000000000..0a4805e76
--- /dev/null
+++ b/external_imported/json/tests/abi/main.cpp
@@ -0,0 +1,11 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// Copyright (c) 2013-2022 Niels Lohmann <http://nlohmann.me>.
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "doctest_compatibility.h"
diff --git a/external_imported/json/tests/benchmarks/CMakeLists.txt b/external_imported/json/tests/benchmarks/CMakeLists.txt
new file mode 100644
index 000000000..4aa095e39
--- /dev/null
+++ b/external_imported/json/tests/benchmarks/CMakeLists.txt
@@ -0,0 +1,34 @@
+cmake_minimum_required(VERSION 3.11...3.14)
+project(JSON_Benchmarks LANGUAGES CXX)
+
+# set compiler flags
+if((CMAKE_CXX_COMPILER_ID MATCHES GNU) OR (CMAKE_CXX_COMPILER_ID MATCHES Clang))
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto -DNDEBUG -O3")
+endif()
+
+# configure Google Benchmarks
+include(FetchContent)
+FetchContent_Declare(
+    benchmark
+    GIT_REPOSITORY https://github.com/google/benchmark.git
+    GIT_TAG origin/main
+    GIT_SHALLOW TRUE
+)
+
+FetchContent_GetProperties(benchmark)
+if(NOT benchmark_POPULATED)
+    FetchContent_Populate(benchmark)
+    set(BENCHMARK_ENABLE_TESTING OFF CACHE INTERNAL "" FORCE)
+    add_subdirectory(${benchmark_SOURCE_DIR} ${benchmark_BINARY_DIR})
+endif()
+
+# download test data
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../cmake ${CMAKE_MODULE_PATH})
+include(download_test_data)
+
+# benchmark binary
+add_executable(json_benchmarks src/benchmarks.cpp)
+target_compile_features(json_benchmarks PRIVATE cxx_std_11)
+target_link_libraries(json_benchmarks benchmark ${CMAKE_THREAD_LIBS_INIT})
+add_dependencies(json_benchmarks download_test_data)
+target_include_directories(json_benchmarks PRIVATE ${CMAKE_SOURCE_DIR}/../../single_include ${CMAKE_BINARY_DIR}/include)
diff --git a/external_imported/json/tests/benchmarks/src/benchmarks.cpp b/external_imported/json/tests/benchmarks/src/benchmarks.cpp
new file mode 100644
index 000000000..0210b9fea
--- /dev/null
+++ b/external_imported/json/tests/benchmarks/src/benchmarks.cpp
@@ -0,0 +1,177 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include <benchmark/benchmark.h>
+#include <nlohmann/json.hpp>
+#include <fstream>
+#include <numeric>
+#include <vector>
+#include <test_data.hpp>
+
+using json = nlohmann::json;
+
+//////////////////////////////////////////////////////////////////////////////
+// parse JSON from file
+//////////////////////////////////////////////////////////////////////////////
+
+static void ParseFile(benchmark::State& state, const char* filename)
+{
+    while (state.KeepRunning())
+    {
+        state.PauseTiming();
+        auto* f = new std::ifstream(filename);
+        auto* j = new json();
+        state.ResumeTiming();
+
+        *j = json::parse(*f);
+
+        state.PauseTiming();
+        delete f;
+        delete j;
+        state.ResumeTiming();
+    }
+
+    std::ifstream file(filename, std::ios::binary | std::ios::ate);
+    state.SetBytesProcessed(state.iterations() * file.tellg());
+}
+BENCHMARK_CAPTURE(ParseFile, jeopardy,          TEST_DATA_DIRECTORY "/jeopardy/jeopardy.json");
+BENCHMARK_CAPTURE(ParseFile, canada,            TEST_DATA_DIRECTORY "/nativejson-benchmark/canada.json");
+BENCHMARK_CAPTURE(ParseFile, citm_catalog,      TEST_DATA_DIRECTORY "/nativejson-benchmark/citm_catalog.json");
+BENCHMARK_CAPTURE(ParseFile, twitter,           TEST_DATA_DIRECTORY "/nativejson-benchmark/twitter.json");
+BENCHMARK_CAPTURE(ParseFile, floats,            TEST_DATA_DIRECTORY "/regression/floats.json");
+BENCHMARK_CAPTURE(ParseFile, signed_ints,       TEST_DATA_DIRECTORY "/regression/signed_ints.json");
+BENCHMARK_CAPTURE(ParseFile, unsigned_ints,     TEST_DATA_DIRECTORY "/regression/unsigned_ints.json");
+BENCHMARK_CAPTURE(ParseFile, small_signed_ints, TEST_DATA_DIRECTORY "/regression/small_signed_ints.json");
+
+//////////////////////////////////////////////////////////////////////////////
+// parse JSON from string
+//////////////////////////////////////////////////////////////////////////////
+
+static void ParseString(benchmark::State& state, const char* filename)
+{
+    std::ifstream f(filename);
+    std::string str((std::istreambuf_iterator<char>(f)), std::istreambuf_iterator<char>());
+
+    while (state.KeepRunning())
+    {
+        state.PauseTiming();
+        auto* j = new json();
+        state.ResumeTiming();
+
+        *j = json::parse(str);
+
+        state.PauseTiming();
+        delete j;
+        state.ResumeTiming();
+    }
+
+    state.SetBytesProcessed(state.iterations() * str.size());
+}
+BENCHMARK_CAPTURE(ParseString, jeopardy,          TEST_DATA_DIRECTORY "/jeopardy/jeopardy.json");
+BENCHMARK_CAPTURE(ParseString, canada,            TEST_DATA_DIRECTORY "/nativejson-benchmark/canada.json");
+BENCHMARK_CAPTURE(ParseString, citm_catalog,      TEST_DATA_DIRECTORY "/nativejson-benchmark/citm_catalog.json");
+BENCHMARK_CAPTURE(ParseString, twitter,           TEST_DATA_DIRECTORY "/nativejson-benchmark/twitter.json");
+BENCHMARK_CAPTURE(ParseString, floats,            TEST_DATA_DIRECTORY "/regression/floats.json");
+BENCHMARK_CAPTURE(ParseString, signed_ints,       TEST_DATA_DIRECTORY "/regression/signed_ints.json");
+BENCHMARK_CAPTURE(ParseString, unsigned_ints,     TEST_DATA_DIRECTORY "/regression/unsigned_ints.json");
+BENCHMARK_CAPTURE(ParseString, small_signed_ints, TEST_DATA_DIRECTORY "/regression/small_signed_ints.json");
+
+//////////////////////////////////////////////////////////////////////////////
+// serialize JSON
+//////////////////////////////////////////////////////////////////////////////
+
+static void Dump(benchmark::State& state, const char* filename, int indent)
+{
+    std::ifstream f(filename);
+    std::string str((std::istreambuf_iterator<char>(f)), std::istreambuf_iterator<char>());
+    json j = json::parse(str);
+
+    while (state.KeepRunning())
+    {
+        j.dump(indent);
+    }
+
+    state.SetBytesProcessed(state.iterations() * j.dump(indent).size());
+}
+BENCHMARK_CAPTURE(Dump, jeopardy / -,          TEST_DATA_DIRECTORY "/jeopardy/jeopardy.json",                 -1);
+BENCHMARK_CAPTURE(Dump, jeopardy / 4,          TEST_DATA_DIRECTORY "/jeopardy/jeopardy.json",                 4);
+BENCHMARK_CAPTURE(Dump, canada / -,            TEST_DATA_DIRECTORY "/nativejson-benchmark/canada.json",       -1);
+BENCHMARK_CAPTURE(Dump, canada / 4,            TEST_DATA_DIRECTORY "/nativejson-benchmark/canada.json",       4);
+BENCHMARK_CAPTURE(Dump, citm_catalog / -,      TEST_DATA_DIRECTORY "/nativejson-benchmark/citm_catalog.json", -1);
+BENCHMARK_CAPTURE(Dump, citm_catalog / 4,      TEST_DATA_DIRECTORY "/nativejson-benchmark/citm_catalog.json", 4);
+BENCHMARK_CAPTURE(Dump, twitter / -,           TEST_DATA_DIRECTORY "/nativejson-benchmark/twitter.json",      -1);
+BENCHMARK_CAPTURE(Dump, twitter / 4,           TEST_DATA_DIRECTORY "/nativejson-benchmark/twitter.json",      4);
+BENCHMARK_CAPTURE(Dump, floats / -,            TEST_DATA_DIRECTORY "/regression/floats.json",                 -1);
+BENCHMARK_CAPTURE(Dump, floats / 4,            TEST_DATA_DIRECTORY "/regression/floats.json",                 4);
+BENCHMARK_CAPTURE(Dump, signed_ints / -,       TEST_DATA_DIRECTORY "/regression/signed_ints.json",            -1);
+BENCHMARK_CAPTURE(Dump, signed_ints / 4,       TEST_DATA_DIRECTORY "/regression/signed_ints.json",            4);
+BENCHMARK_CAPTURE(Dump, unsigned_ints / -,     TEST_DATA_DIRECTORY "/regression/unsigned_ints.json",          -1);
+BENCHMARK_CAPTURE(Dump, unsigned_ints / 4,     TEST_DATA_DIRECTORY "/regression/unsigned_ints.json",          4);
+BENCHMARK_CAPTURE(Dump, small_signed_ints / -, TEST_DATA_DIRECTORY "/regression/small_signed_ints.json",      -1);
+BENCHMARK_CAPTURE(Dump, small_signed_ints / 4, TEST_DATA_DIRECTORY "/regression/small_signed_ints.json",      4);
+
+//////////////////////////////////////////////////////////////////////////////
+// serialize CBOR
+//////////////////////////////////////////////////////////////////////////////
+static void ToCbor(benchmark::State& state, const char* filename)
+{
+    std::ifstream f(filename);
+    std::string str((std::istreambuf_iterator<char>(f)), std::istreambuf_iterator<char>());
+    json j = json::parse(str);
+
+    while (state.KeepRunning())
+    {
+        json::to_cbor(j);
+    }
+
+    state.SetBytesProcessed(state.iterations() * json::to_cbor(j).size());
+}
+BENCHMARK_CAPTURE(ToCbor, jeopardy,          TEST_DATA_DIRECTORY "/jeopardy/jeopardy.json");
+BENCHMARK_CAPTURE(ToCbor, canada,            TEST_DATA_DIRECTORY "/nativejson-benchmark/canada.json");
+BENCHMARK_CAPTURE(ToCbor, citm_catalog,      TEST_DATA_DIRECTORY "/nativejson-benchmark/citm_catalog.json");
+BENCHMARK_CAPTURE(ToCbor, twitter,           TEST_DATA_DIRECTORY "/nativejson-benchmark/twitter.json");
+BENCHMARK_CAPTURE(ToCbor, floats,            TEST_DATA_DIRECTORY "/regression/floats.json");
+BENCHMARK_CAPTURE(ToCbor, signed_ints,       TEST_DATA_DIRECTORY "/regression/signed_ints.json");
+BENCHMARK_CAPTURE(ToCbor, unsigned_ints,     TEST_DATA_DIRECTORY "/regression/unsigned_ints.json");
+BENCHMARK_CAPTURE(ToCbor, small_signed_ints, TEST_DATA_DIRECTORY "/regression/small_signed_ints.json");
+
+//////////////////////////////////////////////////////////////////////////////
+// serialize binary CBOR
+//////////////////////////////////////////////////////////////////////////////
+static void BinaryToCbor(benchmark::State& state)
+{
+    std::vector<uint8_t> data(256);
+    std::iota(data.begin(), data.end(), 0);
+
+    auto it = data.begin();
+    std::vector<uint8_t> in;
+    in.reserve(state.range(0));
+    for (int i = 0; i < state.range(0); ++i)
+    {
+        if (it == data.end())
+        {
+            it = data.begin();
+        }
+
+        in.push_back(*it);
+        ++it;
+    }
+
+    json::binary_t bin{in};
+    json j{{"type", "binary"}, {"data", bin}};
+
+    while (state.KeepRunning())
+    {
+        json::to_cbor(j);
+    }
+
+    state.SetBytesProcessed(state.iterations() * json::to_cbor(j).size());
+}
+BENCHMARK(BinaryToCbor)->RangeMultiplier(2)->Range(8, 8 << 12);
+
+BENCHMARK_MAIN();
diff --git a/external_imported/json/test/cmake_add_subdirectory/CMakeLists.txt b/external_imported/json/tests/cmake_add_subdirectory/CMakeLists.txt
similarity index 100%
rename from external_imported/json/test/cmake_add_subdirectory/CMakeLists.txt
rename to external_imported/json/tests/cmake_add_subdirectory/CMakeLists.txt
diff --git a/external_imported/json/tests/cmake_add_subdirectory/project/CMakeLists.txt b/external_imported/json/tests/cmake_add_subdirectory/project/CMakeLists.txt
new file mode 100644
index 000000000..0695305ff
--- /dev/null
+++ b/external_imported/json/tests/cmake_add_subdirectory/project/CMakeLists.txt
@@ -0,0 +1,20 @@
+cmake_minimum_required(VERSION 3.1...3.14)
+
+project(DummyImport CXX)
+
+set(JSON_BuildTests OFF CACHE INTERNAL "")
+add_subdirectory(${nlohmann_json_source}
+   ${CMAKE_CURRENT_BINARY_DIR}/nlohmann_json)
+
+add_executable(with_namespace_target main.cpp)
+target_link_libraries(with_namespace_target nlohmann_json::nlohmann_json)
+
+add_executable(without_namespace_target main.cpp)
+target_link_libraries(without_namespace_target nlohmann_json)
+
+if(NOT MSVC)
+    add_executable(without_exceptions main.cpp)
+    target_link_libraries(without_exceptions nlohmann_json::nlohmann_json)
+    target_compile_definitions(without_exceptions PRIVATE JSON_NOEXCEPTION)
+    target_compile_options(without_exceptions PRIVATE -fno-exceptions)
+endif()
diff --git a/external_imported/json/tests/cmake_add_subdirectory/project/main.cpp b/external_imported/json/tests/cmake_add_subdirectory/project/main.cpp
new file mode 100644
index 000000000..6db944861
--- /dev/null
+++ b/external_imported/json/tests/cmake_add_subdirectory/project/main.cpp
@@ -0,0 +1,16 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include <nlohmann/json.hpp>
+
+int main(int argc, char** argv)
+{
+    nlohmann::json j;
+
+    return 0;
+}
diff --git a/external_imported/json/test/cmake_fetch_content/CMakeLists.txt b/external_imported/json/tests/cmake_fetch_content/CMakeLists.txt
similarity index 100%
rename from external_imported/json/test/cmake_fetch_content/CMakeLists.txt
rename to external_imported/json/tests/cmake_fetch_content/CMakeLists.txt
diff --git a/external_imported/json/tests/cmake_fetch_content/project/CMakeLists.txt b/external_imported/json/tests/cmake_fetch_content/project/CMakeLists.txt
new file mode 100644
index 000000000..b64af9ea5
--- /dev/null
+++ b/external_imported/json/tests/cmake_fetch_content/project/CMakeLists.txt
@@ -0,0 +1,20 @@
+cmake_minimum_required(VERSION 3.11...3.14)
+
+project(DummyImport CXX)
+
+include(FetchContent)
+
+get_filename_component(GIT_REPOSITORY_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../.. ABSOLUTE)
+FetchContent_Declare(json GIT_REPOSITORY ${GIT_REPOSITORY_DIRECTORY} GIT_TAG HEAD)
+
+FetchContent_GetProperties(json)
+if(NOT json_POPULATED)
+  FetchContent_Populate(json)
+  add_subdirectory(${json_SOURCE_DIR} ${json_BINARY_DIR} EXCLUDE_FROM_ALL)
+endif()
+
+add_executable(with_namespace_target main.cpp)
+target_link_libraries(with_namespace_target nlohmann_json::nlohmann_json)
+
+add_executable(without_namespace_target main.cpp)
+target_link_libraries(without_namespace_target nlohmann_json)
diff --git a/external_imported/json/tests/cmake_fetch_content/project/main.cpp b/external_imported/json/tests/cmake_fetch_content/project/main.cpp
new file mode 100644
index 000000000..6db944861
--- /dev/null
+++ b/external_imported/json/tests/cmake_fetch_content/project/main.cpp
@@ -0,0 +1,16 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include <nlohmann/json.hpp>
+
+int main(int argc, char** argv)
+{
+    nlohmann::json j;
+
+    return 0;
+}
diff --git a/external_imported/json/tests/cmake_fetch_content2/CMakeLists.txt b/external_imported/json/tests/cmake_fetch_content2/CMakeLists.txt
new file mode 100644
index 000000000..40e75e832
--- /dev/null
+++ b/external_imported/json/tests/cmake_fetch_content2/CMakeLists.txt
@@ -0,0 +1,20 @@
+if (${CMAKE_VERSION} VERSION_GREATER "3.14.0")
+  add_test(NAME cmake_fetch_content2_configure
+    COMMAND ${CMAKE_COMMAND}
+    -G "${CMAKE_GENERATOR}"
+    -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+    -Dnlohmann_json_source=${PROJECT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/project
+  )
+  add_test(NAME cmake_fetch_content2_build
+    COMMAND ${CMAKE_COMMAND} --build .
+  )
+  set_tests_properties(cmake_fetch_content2_configure PROPERTIES
+    FIXTURES_SETUP cmake_fetch_content2
+    LABELS "git_required;not_reproducible"
+  )
+  set_tests_properties(cmake_fetch_content2_build PROPERTIES
+    FIXTURES_REQUIRED cmake_fetch_content2
+    LABELS "git_required;not_reproducible"
+  )
+endif()
diff --git a/external_imported/json/tests/cmake_fetch_content2/project/CMakeLists.txt b/external_imported/json/tests/cmake_fetch_content2/project/CMakeLists.txt
new file mode 100644
index 000000000..734b9cc0e
--- /dev/null
+++ b/external_imported/json/tests/cmake_fetch_content2/project/CMakeLists.txt
@@ -0,0 +1,15 @@
+cmake_minimum_required(VERSION 3.14)
+
+project(DummyImport CXX)
+
+include(FetchContent)
+
+get_filename_component(GIT_REPOSITORY_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../.. ABSOLUTE)
+FetchContent_Declare(json GIT_REPOSITORY ${GIT_REPOSITORY_DIRECTORY} GIT_TAG HEAD)
+FetchContent_MakeAvailable(json)
+
+add_executable(with_namespace_target main.cpp)
+target_link_libraries(with_namespace_target nlohmann_json::nlohmann_json)
+
+add_executable(without_namespace_target main.cpp)
+target_link_libraries(without_namespace_target nlohmann_json)
diff --git a/external_imported/json/tests/cmake_fetch_content2/project/main.cpp b/external_imported/json/tests/cmake_fetch_content2/project/main.cpp
new file mode 100644
index 000000000..6db944861
--- /dev/null
+++ b/external_imported/json/tests/cmake_fetch_content2/project/main.cpp
@@ -0,0 +1,16 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include <nlohmann/json.hpp>
+
+int main(int argc, char** argv)
+{
+    nlohmann::json j;
+
+    return 0;
+}
diff --git a/external_imported/json/test/cmake_import/CMakeLists.txt b/external_imported/json/tests/cmake_import/CMakeLists.txt
similarity index 100%
rename from external_imported/json/test/cmake_import/CMakeLists.txt
rename to external_imported/json/tests/cmake_import/CMakeLists.txt
diff --git a/external_imported/json/tests/cmake_import/project/CMakeLists.txt b/external_imported/json/tests/cmake_import/project/CMakeLists.txt
new file mode 100644
index 000000000..585f34cef
--- /dev/null
+++ b/external_imported/json/tests/cmake_import/project/CMakeLists.txt
@@ -0,0 +1,12 @@
+cmake_minimum_required(VERSION 3.1...3.14)
+
+project(DummyImport CXX)
+
+find_package(nlohmann_json REQUIRED)
+
+add_executable(with_namespace_target main.cpp)
+target_link_libraries(with_namespace_target nlohmann_json::nlohmann_json)
+
+add_executable(without_namespace_target main.cpp)
+target_link_libraries(without_namespace_target nlohmann_json)
+
diff --git a/external_imported/json/tests/cmake_import/project/main.cpp b/external_imported/json/tests/cmake_import/project/main.cpp
new file mode 100644
index 000000000..6db944861
--- /dev/null
+++ b/external_imported/json/tests/cmake_import/project/main.cpp
@@ -0,0 +1,16 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include <nlohmann/json.hpp>
+
+int main(int argc, char** argv)
+{
+    nlohmann::json j;
+
+    return 0;
+}
diff --git a/external_imported/json/test/cmake_import_minver/CMakeLists.txt b/external_imported/json/tests/cmake_import_minver/CMakeLists.txt
similarity index 100%
rename from external_imported/json/test/cmake_import_minver/CMakeLists.txt
rename to external_imported/json/tests/cmake_import_minver/CMakeLists.txt
diff --git a/external_imported/json/tests/cmake_import_minver/project/CMakeLists.txt b/external_imported/json/tests/cmake_import_minver/project/CMakeLists.txt
new file mode 100644
index 000000000..25e40bfac
--- /dev/null
+++ b/external_imported/json/tests/cmake_import_minver/project/CMakeLists.txt
@@ -0,0 +1,8 @@
+cmake_minimum_required(VERSION 3.1...3.14)
+
+project(DummyImportMinVer CXX)
+
+find_package(nlohmann_json 3.2.0 REQUIRED)
+
+add_executable(with_namespace_target main.cpp)
+target_link_libraries(with_namespace_target nlohmann_json::nlohmann_json)
diff --git a/external_imported/json/tests/cmake_import_minver/project/main.cpp b/external_imported/json/tests/cmake_import_minver/project/main.cpp
new file mode 100644
index 000000000..6db944861
--- /dev/null
+++ b/external_imported/json/tests/cmake_import_minver/project/main.cpp
@@ -0,0 +1,16 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include <nlohmann/json.hpp>
+
+int main(int argc, char** argv)
+{
+    nlohmann::json j;
+
+    return 0;
+}
diff --git a/external_imported/json/test/cmake_target_include_directories/CMakeLists.txt b/external_imported/json/tests/cmake_target_include_directories/CMakeLists.txt
similarity index 100%
rename from external_imported/json/test/cmake_target_include_directories/CMakeLists.txt
rename to external_imported/json/tests/cmake_target_include_directories/CMakeLists.txt
diff --git a/external_imported/json/tests/cmake_target_include_directories/project/Bar.cpp b/external_imported/json/tests/cmake_target_include_directories/project/Bar.cpp
new file mode 100644
index 000000000..83a14bc85
--- /dev/null
+++ b/external_imported/json/tests/cmake_target_include_directories/project/Bar.cpp
@@ -0,0 +1,11 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "Bar.hpp"
+
+class Bar;
diff --git a/external_imported/json/tests/cmake_target_include_directories/project/Bar.hpp b/external_imported/json/tests/cmake_target_include_directories/project/Bar.hpp
new file mode 100644
index 000000000..a56257c30
--- /dev/null
+++ b/external_imported/json/tests/cmake_target_include_directories/project/Bar.hpp
@@ -0,0 +1,12 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include <nlohmann/json.hpp>
+#include "Foo.hpp"
+
+class Bar : public Foo {};
diff --git a/external_imported/json/tests/cmake_target_include_directories/project/CMakeLists.txt b/external_imported/json/tests/cmake_target_include_directories/project/CMakeLists.txt
new file mode 100644
index 000000000..26b55cd89
--- /dev/null
+++ b/external_imported/json/tests/cmake_target_include_directories/project/CMakeLists.txt
@@ -0,0 +1,21 @@
+cmake_minimum_required(VERSION 3.1...3.14)
+
+project(DummyImport CXX)
+
+add_executable(with_private_target main.cpp)
+target_include_directories(with_private_target PRIVATE ${nlohmann_json_source}/include)
+set_target_properties(with_private_target PROPERTIES CXX_STANDARD 11)
+
+add_executable(with_private_system_target main.cpp)
+target_include_directories(with_private_system_target PRIVATE SYSTEM ${nlohmann_json_source}/include)
+set_target_properties(with_private_system_target PROPERTIES CXX_STANDARD 11)
+
+# regression from https://github.com/nlohmann/json/discussions/2281
+add_library(Foo STATIC Foo.cpp Bar.cpp)
+target_include_directories(Foo PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${nlohmann_json_source}/include)
+set_target_properties(Foo PROPERTIES CXX_STANDARD 11)
+
+add_library(Bar STATIC Bar.cpp)
+target_link_libraries(Bar PRIVATE Foo)
+target_include_directories(Bar PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${nlohmann_json_source}/include)
+set_target_properties(Bar PROPERTIES CXX_STANDARD 11)
diff --git a/external_imported/json/tests/cmake_target_include_directories/project/Foo.cpp b/external_imported/json/tests/cmake_target_include_directories/project/Foo.cpp
new file mode 100644
index 000000000..42e950e75
--- /dev/null
+++ b/external_imported/json/tests/cmake_target_include_directories/project/Foo.cpp
@@ -0,0 +1,11 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "Foo.hpp"
+
+class Foo;
diff --git a/external_imported/json/tests/cmake_target_include_directories/project/Foo.hpp b/external_imported/json/tests/cmake_target_include_directories/project/Foo.hpp
new file mode 100644
index 000000000..18fe9763e
--- /dev/null
+++ b/external_imported/json/tests/cmake_target_include_directories/project/Foo.hpp
@@ -0,0 +1,12 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#pragma once
+#include <nlohmann/json.hpp>
+
+class Foo {};
diff --git a/external_imported/json/tests/cmake_target_include_directories/project/main.cpp b/external_imported/json/tests/cmake_target_include_directories/project/main.cpp
new file mode 100644
index 000000000..6db944861
--- /dev/null
+++ b/external_imported/json/tests/cmake_target_include_directories/project/main.cpp
@@ -0,0 +1,16 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include <nlohmann/json.hpp>
+
+int main(int argc, char** argv)
+{
+    nlohmann::json j;
+
+    return 0;
+}
diff --git a/external_imported/json/tests/cuda_example/CMakeLists.txt b/external_imported/json/tests/cuda_example/CMakeLists.txt
new file mode 100644
index 000000000..26b57f227
--- /dev/null
+++ b/external_imported/json/tests/cuda_example/CMakeLists.txt
@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION 3.18)
+project(json_cuda LANGUAGES CUDA)
+
+add_executable(json_cuda json_cuda.cu)
+target_include_directories(json_cuda PRIVATE ../../include)
+target_compile_features(json_cuda PUBLIC cuda_std_11)
+set_target_properties(json_cuda PROPERTIES
+    CUDA_EXTENSIONS OFF
+    CUDA_STANDARD_REQUIRED ON
+)
diff --git a/external_imported/json/tests/cuda_example/json_cuda.cu b/external_imported/json/tests/cuda_example/json_cuda.cu
new file mode 100644
index 000000000..657596662
--- /dev/null
+++ b/external_imported/json/tests/cuda_example/json_cuda.cu
@@ -0,0 +1,19 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include <nlohmann/json.hpp>
+
+int main()
+{
+    nlohmann::ordered_json json = {"Test"};
+    json.dump();
+
+    // regression for #3013 (ordered_json::reset() compile error with nvcc)
+    nlohmann::ordered_json metadata;
+    metadata.erase("key");
+}
diff --git a/external_imported/json/tests/fuzzing.md b/external_imported/json/tests/fuzzing.md
new file mode 100644
index 000000000..cfbf4f249
--- /dev/null
+++ b/external_imported/json/tests/fuzzing.md
@@ -0,0 +1,81 @@
+# Fuzz testing
+
+Each parser of the library (JSON, BJData, BSON, CBOR, MessagePack, and UBJSON) can be fuzz tested. Currently,
+[libFuzzer](https://llvm.org/docs/LibFuzzer.html) and [afl++](https://github.com/AFLplusplus/AFLplusplus) are supported.
+
+## Corpus creation
+
+For most effective fuzzing, a [corpus](https://llvm.org/docs/LibFuzzer.html#corpus) should be provided. A corpus is a
+directory with some simple input files that cover several features of the parser and is hence a good starting point
+for mutations.
+
+```shell
+TEST_DATA_VERSION=3.1.0
+wget https://github.com/nlohmann/json_test_data/archive/refs/tags/v$TEST_DATA_VERSION.zip
+unzip v$TEST_DATA_VERSION.zip
+rm v$TEST_DATA_VERSION.zip
+for FORMAT in json bjdata bson cbor msgpack ubjson
+do
+  rm -fr corpus_$FORMAT
+  mkdir corpus_$FORMAT
+  find json_test_data-$TEST_DATA_VERSION -size -5k -name "*.$FORMAT" -exec cp "{}" "corpus_$FORMAT" \;
+done
+rm -fr json_test_data-$TEST_DATA_VERSION
+```
+
+The generated corpus can be used with both libFuzzer and afl++. The remainder of this documentation assumes the corpus
+directories have been created in the `tests` directory.
+
+## libFuzzer
+
+To use libFuzzer, you need to pass `-fsanitize=fuzzer` as `FUZZER_ENGINE`. In the `tests` directory, call
+
+```shell
+make fuzzers FUZZER_ENGINE="-fsanitize=fuzzer"
+```
+
+This creates a fuzz tester binary for each parser that supports these
+[command line options](https://llvm.org/docs/LibFuzzer.html#options).
+
+In case your default compiler is not a Clang compiler that includes libFuzzer (Clang 6.0 or later), you need to set the
+`CXX` variable accordingly. Note the compiler provided by Xcode (AppleClang) does not contain libFuzzer. Please install
+Clang via Homebrew calling `brew install llvm` and add `CXX=$(brew --prefix llvm)/bin/clang` to the `make` call:
+
+```shell
+make fuzzers FUZZER_ENGINE="-fsanitize=fuzzer" CXX=$(brew --prefix llvm)/bin/clang
+```
+
+Then pass the corpus directory as command-line argument (assuming it is located in `tests`):
+
+```shell
+./parse_cbor_fuzzer corpus_cbor
+```
+
+The fuzzer should be able to run indefinitely without crashing. In case of a crash, the tested input is dumped into
+a file starting with `crash-`.
+
+## afl++
+
+To use afl++, you need to pass `-fsanitize=fuzzer` as `FUZZER_ENGINE`. It will be replaced by a `libAFLDriver.a` to
+re-use the same code written for libFuzzer with afl++. Furthermore, set `afl-clang-fast++` as compiler.
+
+```shell
+CXX=afl-clang-fast++ make fuzzers FUZZER_ENGINE="-fsanitize=fuzzer" 
+```
+
+Then the fuzzer is called like this in the `tests` directory:
+
+```shell
+afl-fuzz -i corpus_cbor -o out  -- ./parse_cbor_fuzzer 
+```
+
+The fuzzer should be able to run indefinitely without crashing. In case of a crash, the tested input is written to the
+directory `out`.
+
+## OSS-Fuzz
+
+The library is further fuzz-tested 24/7 by Google's [OSS-Fuzz project](https://github.com/google/oss-fuzz). It uses
+the same `fuzzers` target as above and also relies on the `FUZZER_ENGINE` variable. See the used
+[build script](https://github.com/google/oss-fuzz/blob/master/projects/json/build.sh) for more information.
+
+In case the build at OSS-Fuzz fails, an issue will be created automatically.
diff --git a/external_imported/json/test/reports/2016-08-29-fuzz/exec_speed.png b/external_imported/json/tests/reports/2016-08-29-fuzz/exec_speed.png
similarity index 100%
rename from external_imported/json/test/reports/2016-08-29-fuzz/exec_speed.png
rename to external_imported/json/tests/reports/2016-08-29-fuzz/exec_speed.png
diff --git a/external_imported/json/test/reports/2016-08-29-fuzz/fuzz.tiff b/external_imported/json/tests/reports/2016-08-29-fuzz/fuzz.tiff
similarity index 100%
rename from external_imported/json/test/reports/2016-08-29-fuzz/fuzz.tiff
rename to external_imported/json/tests/reports/2016-08-29-fuzz/fuzz.tiff
diff --git a/external_imported/json/test/reports/2016-08-29-fuzz/high_freq.png b/external_imported/json/tests/reports/2016-08-29-fuzz/high_freq.png
similarity index 100%
rename from external_imported/json/test/reports/2016-08-29-fuzz/high_freq.png
rename to external_imported/json/tests/reports/2016-08-29-fuzz/high_freq.png
diff --git a/external_imported/json/test/reports/2016-08-29-fuzz/index.html b/external_imported/json/tests/reports/2016-08-29-fuzz/index.html
similarity index 100%
rename from external_imported/json/test/reports/2016-08-29-fuzz/index.html
rename to external_imported/json/tests/reports/2016-08-29-fuzz/index.html
diff --git a/external_imported/json/test/reports/2016-08-29-fuzz/low_freq.png b/external_imported/json/tests/reports/2016-08-29-fuzz/low_freq.png
similarity index 100%
rename from external_imported/json/test/reports/2016-08-29-fuzz/low_freq.png
rename to external_imported/json/tests/reports/2016-08-29-fuzz/low_freq.png
diff --git a/external_imported/json/test/reports/2016-09-09-nativejson_benchmark/README.md b/external_imported/json/tests/reports/2016-09-09-nativejson_benchmark/README.md
similarity index 100%
rename from external_imported/json/test/reports/2016-09-09-nativejson_benchmark/README.md
rename to external_imported/json/tests/reports/2016-09-09-nativejson_benchmark/README.md
diff --git a/external_imported/json/test/reports/2016-09-09-nativejson_benchmark/conformance_Nlohmann (C++11).md b/external_imported/json/tests/reports/2016-09-09-nativejson_benchmark/conformance_Nlohmann (C++11).md
similarity index 100%
rename from external_imported/json/test/reports/2016-09-09-nativejson_benchmark/conformance_Nlohmann (C++11).md
rename to external_imported/json/tests/reports/2016-09-09-nativejson_benchmark/conformance_Nlohmann (C++11).md
diff --git a/external_imported/json/test/reports/2016-09-09-nativejson_benchmark/conformance_overall_Result.png b/external_imported/json/tests/reports/2016-09-09-nativejson_benchmark/conformance_overall_Result.png
similarity index 100%
rename from external_imported/json/test/reports/2016-09-09-nativejson_benchmark/conformance_overall_Result.png
rename to external_imported/json/tests/reports/2016-09-09-nativejson_benchmark/conformance_overall_Result.png
diff --git a/external_imported/json/test/reports/2016-09-09-nativejson_benchmark/performance_Corei7-4980HQ@2.80GHz_mac64_clang7.0_1._Parse_Memory_(byte).png b/external_imported/json/tests/reports/2016-09-09-nativejson_benchmark/performance_Corei7-4980HQ@2.80GHz_mac64_clang7.0_1._Parse_Memory_(byte).png
similarity index 100%
rename from external_imported/json/test/reports/2016-09-09-nativejson_benchmark/performance_Corei7-4980HQ@2.80GHz_mac64_clang7.0_1._Parse_Memory_(byte).png
rename to external_imported/json/tests/reports/2016-09-09-nativejson_benchmark/performance_Corei7-4980HQ@2.80GHz_mac64_clang7.0_1._Parse_Memory_(byte).png
diff --git a/external_imported/json/test/reports/2016-09-09-nativejson_benchmark/performance_Corei7-4980HQ@2.80GHz_mac64_clang7.0_1._Parse_Time_(ms).png b/external_imported/json/tests/reports/2016-09-09-nativejson_benchmark/performance_Corei7-4980HQ@2.80GHz_mac64_clang7.0_1._Parse_Time_(ms).png
similarity index 100%
rename from external_imported/json/test/reports/2016-09-09-nativejson_benchmark/performance_Corei7-4980HQ@2.80GHz_mac64_clang7.0_1._Parse_Time_(ms).png
rename to external_imported/json/tests/reports/2016-09-09-nativejson_benchmark/performance_Corei7-4980HQ@2.80GHz_mac64_clang7.0_1._Parse_Time_(ms).png
diff --git a/external_imported/json/test/reports/2016-09-09-nativejson_benchmark/performance_Corei7-4980HQ@2.80GHz_mac64_clang7.0_2._Stringify_Time_(ms).png b/external_imported/json/tests/reports/2016-09-09-nativejson_benchmark/performance_Corei7-4980HQ@2.80GHz_mac64_clang7.0_2._Stringify_Time_(ms).png
similarity index 100%
rename from external_imported/json/test/reports/2016-09-09-nativejson_benchmark/performance_Corei7-4980HQ@2.80GHz_mac64_clang7.0_2._Stringify_Time_(ms).png
rename to external_imported/json/tests/reports/2016-09-09-nativejson_benchmark/performance_Corei7-4980HQ@2.80GHz_mac64_clang7.0_2._Stringify_Time_(ms).png
diff --git a/external_imported/json/test/reports/2016-09-09-nativejson_benchmark/performance_Corei7-4980HQ@2.80GHz_mac64_clang7.0_3._Prettify_Time_(ms).png b/external_imported/json/tests/reports/2016-09-09-nativejson_benchmark/performance_Corei7-4980HQ@2.80GHz_mac64_clang7.0_3._Prettify_Time_(ms).png
similarity index 100%
rename from external_imported/json/test/reports/2016-09-09-nativejson_benchmark/performance_Corei7-4980HQ@2.80GHz_mac64_clang7.0_3._Prettify_Time_(ms).png
rename to external_imported/json/tests/reports/2016-09-09-nativejson_benchmark/performance_Corei7-4980HQ@2.80GHz_mac64_clang7.0_3._Prettify_Time_(ms).png
diff --git a/external_imported/json/test/reports/2016-09-09-nativejson_benchmark/performance_Corei7-4980HQ@2.80GHz_mac64_clang7.0_7._Code_size_FileSize_(byte).png b/external_imported/json/tests/reports/2016-09-09-nativejson_benchmark/performance_Corei7-4980HQ@2.80GHz_mac64_clang7.0_7._Code_size_FileSize_(byte).png
similarity index 100%
rename from external_imported/json/test/reports/2016-09-09-nativejson_benchmark/performance_Corei7-4980HQ@2.80GHz_mac64_clang7.0_7._Code_size_FileSize_(byte).png
rename to external_imported/json/tests/reports/2016-09-09-nativejson_benchmark/performance_Corei7-4980HQ@2.80GHz_mac64_clang7.0_7._Code_size_FileSize_(byte).png
diff --git a/external_imported/json/test/reports/2016-10-02-fuzz/exec_speed.png b/external_imported/json/tests/reports/2016-10-02-fuzz/exec_speed.png
similarity index 100%
rename from external_imported/json/test/reports/2016-10-02-fuzz/exec_speed.png
rename to external_imported/json/tests/reports/2016-10-02-fuzz/exec_speed.png
diff --git a/external_imported/json/test/reports/2016-10-02-fuzz/fuzz.tiff b/external_imported/json/tests/reports/2016-10-02-fuzz/fuzz.tiff
similarity index 100%
rename from external_imported/json/test/reports/2016-10-02-fuzz/fuzz.tiff
rename to external_imported/json/tests/reports/2016-10-02-fuzz/fuzz.tiff
diff --git a/external_imported/json/test/reports/2016-10-02-fuzz/high_freq.png b/external_imported/json/tests/reports/2016-10-02-fuzz/high_freq.png
similarity index 100%
rename from external_imported/json/test/reports/2016-10-02-fuzz/high_freq.png
rename to external_imported/json/tests/reports/2016-10-02-fuzz/high_freq.png
diff --git a/external_imported/json/test/reports/2016-10-02-fuzz/index.html b/external_imported/json/tests/reports/2016-10-02-fuzz/index.html
similarity index 100%
rename from external_imported/json/test/reports/2016-10-02-fuzz/index.html
rename to external_imported/json/tests/reports/2016-10-02-fuzz/index.html
diff --git a/external_imported/json/test/reports/2016-10-02-fuzz/low_freq.png b/external_imported/json/tests/reports/2016-10-02-fuzz/low_freq.png
similarity index 100%
rename from external_imported/json/test/reports/2016-10-02-fuzz/low_freq.png
rename to external_imported/json/tests/reports/2016-10-02-fuzz/low_freq.png
diff --git a/external_imported/json/tests/src/fuzzer-driver_afl.cpp b/external_imported/json/tests/src/fuzzer-driver_afl.cpp
new file mode 100644
index 000000000..ae3aefe1e
--- /dev/null
+++ b/external_imported/json/tests/src/fuzzer-driver_afl.cpp
@@ -0,0 +1,39 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+/*
+This file implements a driver for American Fuzzy Lop (afl-fuzz). It relies on
+an implementation of the `LLVMFuzzerTestOneInput` function which processes a
+passed byte array.
+*/
+
+#include <vector>    // for vector
+#include <cstdint>   // for uint8_t
+#include <iostream>  // for cin
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size);
+
+int main()
+{
+#ifdef __AFL_HAVE_MANUAL_CONTROL
+    while (__AFL_LOOP(1000))
+    {
+#endif
+        // copy stdin to byte vector
+        std::vector<uint8_t> vec;
+        char c = 0;
+        while (std::cin.get(c))
+        {
+            vec.push_back(static_cast<uint8_t>(c));
+        }
+
+        LLVMFuzzerTestOneInput(vec.data(), vec.size());
+#ifdef __AFL_HAVE_MANUAL_CONTROL
+    }
+#endif
+}
diff --git a/external_imported/json/tests/src/fuzzer-parse_bjdata.cpp b/external_imported/json/tests/src/fuzzer-parse_bjdata.cpp
new file mode 100644
index 000000000..30f1ddd00
--- /dev/null
+++ b/external_imported/json/tests/src/fuzzer-parse_bjdata.cpp
@@ -0,0 +1,85 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+/*
+This file implements a parser test suitable for fuzz testing. Given a byte
+array data, it performs the following steps:
+
+- j1 = from_bjdata(data)
+- vec = to_bjdata(j1)
+- j2 = from_bjdata(vec)
+- assert(j1 == j2)
+- vec2 = to_bjdata(j1, use_size = true, use_type = false)
+- j3 = from_bjdata(vec2)
+- assert(j1 == j3)
+- vec3 = to_bjdata(j1, use_size = true, use_type = true)
+- j4 = from_bjdata(vec3)
+- assert(j1 == j4)
+
+The provided function `LLVMFuzzerTestOneInput` can be used in different fuzzer
+drivers.
+*/
+
+#include <iostream>
+#include <sstream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+// see http://llvm.org/docs/LibFuzzer.html
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
+{
+    try
+    {
+        // step 1: parse input
+        std::vector<uint8_t> const vec1(data, data + size);
+        json const j1 = json::from_bjdata(vec1);
+
+        try
+        {
+            // step 2.1: round trip without adding size annotations to container types
+            std::vector<uint8_t> const vec2 = json::to_bjdata(j1, false, false);
+
+            // step 2.2: round trip with adding size annotations but without adding type annotations to container types
+            std::vector<uint8_t> const vec3 = json::to_bjdata(j1, true, false);
+
+            // step 2.3: round trip with adding size as well as type annotations to container types
+            std::vector<uint8_t> const vec4 = json::to_bjdata(j1, true, true);
+
+            // parse serialization
+            json const j2 = json::from_bjdata(vec2);
+            json const j3 = json::from_bjdata(vec3);
+            json const j4 = json::from_bjdata(vec4);
+
+            // serializations must match
+            assert(json::to_bjdata(j2, false, false) == vec2);
+            assert(json::to_bjdata(j3, true, false) == vec3);
+            assert(json::to_bjdata(j4, true, true) == vec4);
+        }
+        catch (const json::parse_error&)
+        {
+            // parsing a BJData serialization must not fail
+            assert(false);
+        }
+    }
+    catch (const json::parse_error&)
+    {
+        // parse errors are ok, because input may be random bytes
+    }
+    catch (const json::type_error&)
+    {
+        // type errors can occur during parsing, too
+    }
+    catch (const json::out_of_range&)
+    {
+        // out of range errors may happen if provided sizes are excessive
+    }
+
+    // return 0 - non-zero return values are reserved for future use
+    return 0;
+}
diff --git a/external_imported/json/tests/src/fuzzer-parse_bson.cpp b/external_imported/json/tests/src/fuzzer-parse_bson.cpp
new file mode 100644
index 000000000..fa2a221db
--- /dev/null
+++ b/external_imported/json/tests/src/fuzzer-parse_bson.cpp
@@ -0,0 +1,74 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+/*
+This file implements a parser test suitable for fuzz testing. Given a byte
+array data, it performs the following steps:
+
+- j1 = from_bson(data)
+- vec = to_bson(j1)
+- j2 = from_bson(vec)
+- assert(j1 == j2)
+
+The provided function `LLVMFuzzerTestOneInput` can be used in different fuzzer
+drivers.
+*/
+
+#include <iostream>
+#include <sstream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+// see http://llvm.org/docs/LibFuzzer.html
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
+{
+    try
+    {
+        // step 1: parse input
+        std::vector<uint8_t> const vec1(data, data + size);
+        json const j1 = json::from_bson(vec1);
+
+        if (j1.is_discarded())
+        {
+            return 0;
+        }
+
+        try
+        {
+            // step 2: round trip
+            std::vector<uint8_t> const vec2 = json::to_bson(j1);
+
+            // parse serialization
+            json const j2 = json::from_bson(vec2);
+
+            // serializations must match
+            assert(json::to_bson(j2) == vec2);
+        }
+        catch (const json::parse_error&)
+        {
+            // parsing a BSON serialization must not fail
+            assert(false);
+        }
+    }
+    catch (const json::parse_error&)
+    {
+        // parse errors are ok, because input may be random bytes
+    }
+    catch (const json::type_error&)
+    {
+        // type errors can occur during parsing, too
+    }
+    catch (const json::out_of_range&)
+    {
+        // out of range errors can occur during parsing, too
+    }
+
+    // return 0 - non-zero return values are reserved for future use
+    return 0;
+}
diff --git a/external_imported/json/tests/src/fuzzer-parse_cbor.cpp b/external_imported/json/tests/src/fuzzer-parse_cbor.cpp
new file mode 100644
index 000000000..db92aca8f
--- /dev/null
+++ b/external_imported/json/tests/src/fuzzer-parse_cbor.cpp
@@ -0,0 +1,69 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+/*
+This file implements a parser test suitable for fuzz testing. Given a byte
+array data, it performs the following steps:
+
+- j1 = from_cbor(data)
+- vec = to_cbor(j1)
+- j2 = from_cbor(vec)
+- assert(j1 == j2)
+
+The provided function `LLVMFuzzerTestOneInput` can be used in different fuzzer
+drivers.
+*/
+
+#include <iostream>
+#include <sstream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+// see http://llvm.org/docs/LibFuzzer.html
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
+{
+    try
+    {
+        // step 1: parse input
+        std::vector<uint8_t> const vec1(data, data + size);
+        json const j1 = json::from_cbor(vec1);
+
+        try
+        {
+            // step 2: round trip
+            std::vector<uint8_t> const vec2 = json::to_cbor(j1);
+
+            // parse serialization
+            json const j2 = json::from_cbor(vec2);
+
+            // serializations must match
+            assert(json::to_cbor(j2) == vec2);
+        }
+        catch (const json::parse_error&)
+        {
+            // parsing a CBOR serialization must not fail
+            assert(false);
+        }
+    }
+    catch (const json::parse_error&)
+    {
+        // parse errors are ok, because input may be random bytes
+    }
+    catch (const json::type_error&)
+    {
+        // type errors can occur during parsing, too
+    }
+    catch (const json::out_of_range&)
+    {
+        // out of range errors can occur during parsing, too
+    }
+
+    // return 0 - non-zero return values are reserved for future use
+    return 0;
+}
diff --git a/external_imported/json/tests/src/fuzzer-parse_json.cpp b/external_imported/json/tests/src/fuzzer-parse_json.cpp
new file mode 100644
index 000000000..be04e8030
--- /dev/null
+++ b/external_imported/json/tests/src/fuzzer-parse_json.cpp
@@ -0,0 +1,70 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+/*
+This file implements a parser test suitable for fuzz testing. Given a byte
+array data, it performs the following steps:
+
+- j1 = parse(data)
+- s1 = serialize(j1)
+- j2 = parse(s1)
+- s2 = serialize(j2)
+- assert(s1 == s2)
+
+The provided function `LLVMFuzzerTestOneInput` can be used in different fuzzer
+drivers.
+*/
+
+#include <iostream>
+#include <sstream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+// see http://llvm.org/docs/LibFuzzer.html
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
+{
+    try
+    {
+        // step 1: parse input
+        json const j1 = json::parse(data, data + size);
+
+        try
+        {
+            // step 2: round trip
+
+            // first serialization
+            std::string const s1 = j1.dump();
+
+            // parse serialization
+            json const j2 = json::parse(s1);
+
+            // second serialization
+            std::string const s2 = j2.dump();
+
+            // serializations must match
+            assert(s1 == s2);
+        }
+        catch (const json::parse_error&)
+        {
+            // parsing a JSON serialization must not fail
+            assert(false);
+        }
+    }
+    catch (const json::parse_error&)
+    {
+        // parse errors are ok, because input may be random bytes
+    }
+    catch (const json::out_of_range&)
+    {
+        // out of range errors may happen if provided sizes are excessive
+    }
+
+    // return 0 - non-zero return values are reserved for future use
+    return 0;
+}
diff --git a/external_imported/json/tests/src/fuzzer-parse_msgpack.cpp b/external_imported/json/tests/src/fuzzer-parse_msgpack.cpp
new file mode 100644
index 000000000..0106b4053
--- /dev/null
+++ b/external_imported/json/tests/src/fuzzer-parse_msgpack.cpp
@@ -0,0 +1,69 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+/*
+This file implements a parser test suitable for fuzz testing. Given a byte
+array data, it performs the following steps:
+
+- j1 = from_msgpack(data)
+- vec = to_msgpack(j1)
+- j2 = from_msgpack(vec)
+- assert(j1 == j2)
+
+The provided function `LLVMFuzzerTestOneInput` can be used in different fuzzer
+drivers.
+*/
+
+#include <iostream>
+#include <sstream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+// see http://llvm.org/docs/LibFuzzer.html
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
+{
+    try
+    {
+        // step 1: parse input
+        std::vector<uint8_t> const vec1(data, data + size);
+        json const j1 = json::from_msgpack(vec1);
+
+        try
+        {
+            // step 2: round trip
+            std::vector<uint8_t> const vec2 = json::to_msgpack(j1);
+
+            // parse serialization
+            json const j2 = json::from_msgpack(vec2);
+
+            // serializations must match
+            assert(json::to_msgpack(j2) == vec2);
+        }
+        catch (const json::parse_error&)
+        {
+            // parsing a MessagePack serialization must not fail
+            assert(false);
+        }
+    }
+    catch (const json::parse_error&)
+    {
+        // parse errors are ok, because input may be random bytes
+    }
+    catch (const json::type_error&)
+    {
+        // type errors can occur during parsing, too
+    }
+    catch (const json::out_of_range&)
+    {
+        // out of range errors may happen if provided sizes are excessive
+    }
+
+    // return 0 - non-zero return values are reserved for future use
+    return 0;
+}
diff --git a/external_imported/json/tests/src/fuzzer-parse_ubjson.cpp b/external_imported/json/tests/src/fuzzer-parse_ubjson.cpp
new file mode 100644
index 000000000..2830bef75
--- /dev/null
+++ b/external_imported/json/tests/src/fuzzer-parse_ubjson.cpp
@@ -0,0 +1,85 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+/*
+This file implements a parser test suitable for fuzz testing. Given a byte
+array data, it performs the following steps:
+
+- j1 = from_ubjson(data)
+- vec = to_ubjson(j1)
+- j2 = from_ubjson(vec)
+- assert(j1 == j2)
+- vec2 = to_ubjson(j1, use_size = true, use_type = false)
+- j3 = from_ubjson(vec2)
+- assert(j1 == j3)
+- vec3 = to_ubjson(j1, use_size = true, use_type = true)
+- j4 = from_ubjson(vec3)
+- assert(j1 == j4)
+
+The provided function `LLVMFuzzerTestOneInput` can be used in different fuzzer
+drivers.
+*/
+
+#include <iostream>
+#include <sstream>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+// see http://llvm.org/docs/LibFuzzer.html
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
+{
+    try
+    {
+        // step 1: parse input
+        std::vector<uint8_t> const vec1(data, data + size);
+        json const j1 = json::from_ubjson(vec1);
+
+        try
+        {
+            // step 2.1: round trip without adding size annotations to container types
+            std::vector<uint8_t> const vec2 = json::to_ubjson(j1, false, false);
+
+            // step 2.2: round trip with adding size annotations but without adding type annotations to container types
+            std::vector<uint8_t> const vec3 = json::to_ubjson(j1, true, false);
+
+            // step 2.3: round trip with adding size as well as type annotations to container types
+            std::vector<uint8_t> const vec4 = json::to_ubjson(j1, true, true);
+
+            // parse serialization
+            json const j2 = json::from_ubjson(vec2);
+            json const j3 = json::from_ubjson(vec3);
+            json const j4 = json::from_ubjson(vec4);
+
+            // serializations must match
+            assert(json::to_ubjson(j2, false, false) == vec2);
+            assert(json::to_ubjson(j3, true, false) == vec3);
+            assert(json::to_ubjson(j4, true, true) == vec4);
+        }
+        catch (const json::parse_error&)
+        {
+            // parsing a UBJSON serialization must not fail
+            assert(false);
+        }
+    }
+    catch (const json::parse_error&)
+    {
+        // parse errors are ok, because input may be random bytes
+    }
+    catch (const json::type_error&)
+    {
+        // type errors can occur during parsing, too
+    }
+    catch (const json::out_of_range&)
+    {
+        // out of range errors may happen if provided sizes are excessive
+    }
+
+    // return 0 - non-zero return values are reserved for future use
+    return 0;
+}
diff --git a/external_imported/json/tests/src/make_test_data_available.hpp b/external_imported/json/tests/src/make_test_data_available.hpp
new file mode 100644
index 000000000..a2ffefa89
--- /dev/null
+++ b/external_imported/json/tests/src/make_test_data_available.hpp
@@ -0,0 +1,30 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#pragma once
+
+#include <cstdio>   // fopen, fclose, FILE
+#include <memory> // unique_ptr
+#include <test_data.hpp>
+#include <doctest.h>
+
+namespace utils
+{
+
+inline bool check_testsuite_downloaded()
+{
+    const std::unique_ptr<std::FILE, decltype(&std::fclose)> file(std::fopen(TEST_DATA_DIRECTORY "/README.md", "r"), &std::fclose);
+    return file != nullptr;
+}
+
+TEST_CASE("check test suite is downloaded")
+{
+    REQUIRE_MESSAGE(utils::check_testsuite_downloaded(), "Test data not found in '" TEST_DATA_DIRECTORY "'. Please execute target 'download_test_data' before running this test suite. See <https://github.com/nlohmann/json#execute-unit-tests> for more information.");
+}
+
+}  // namespace utils
diff --git a/external_imported/json/tests/src/test_utils.hpp b/external_imported/json/tests/src/test_utils.hpp
new file mode 100644
index 000000000..dbb0a9b14
--- /dev/null
+++ b/external_imported/json/tests/src/test_utils.hpp
@@ -0,0 +1,33 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#pragma once
+
+#include <cstdint> // uint8_t
+#include <fstream> // ifstream, istreambuf_iterator, ios
+#include <vector> // vector
+
+namespace utils
+{
+
+inline std::vector<std::uint8_t> read_binary_file(const std::string& filename)
+{
+    std::ifstream file(filename, std::ios::binary);
+    file.unsetf(std::ios::skipws);
+
+    file.seekg(0, std::ios::end);
+    const auto size = file.tellg();
+    file.seekg(0, std::ios::beg);
+
+    std::vector<std::uint8_t> byte_vector;
+    byte_vector.reserve(static_cast<std::size_t>(size));
+    byte_vector.insert(byte_vector.begin(), std::istream_iterator<std::uint8_t>(file), std::istream_iterator<std::uint8_t>());
+    return byte_vector;
+}
+
+} // namespace utils
diff --git a/external_imported/json/tests/src/unit-32bit.cpp b/external_imported/json/tests/src/unit-32bit.cpp
new file mode 100644
index 000000000..22a2ad283
--- /dev/null
+++ b/external_imported/json/tests/src/unit-32bit.cpp
@@ -0,0 +1,134 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+#include <nlohmann/json.hpp>
+using nlohmann::json;
+
+#include <climits> // SIZE_MAX
+#include <limits> // numeric_limits
+
+template <typename OfType, typename T, bool MinInRange, bool MaxInRange>
+struct trait_test_arg
+{
+    using of_type = OfType;
+    using type = T;
+    static constexpr bool min_in_range = MinInRange;
+    static constexpr bool max_in_range = MaxInRange;
+};
+
+TEST_CASE_TEMPLATE_DEFINE("value_in_range_of trait", T, value_in_range_of_test)
+{
+    using nlohmann::detail::value_in_range_of;
+
+    using of_type = typename T::of_type;
+    using type = typename T::type;
+    constexpr bool min_in_range = T::min_in_range;
+    constexpr bool max_in_range = T::max_in_range;
+
+    type const val_min = std::numeric_limits<type>::min();
+    type const val_min2 = val_min + 1;
+    type const val_max = std::numeric_limits<type>::max();
+    type const val_max2 = val_max - 1;
+
+    REQUIRE(CHAR_BIT == 8);
+
+    std::string of_type_str;
+    if (std::is_unsigned<of_type>::value)
+    {
+        of_type_str += "u";
+    }
+    of_type_str += "int";
+    of_type_str += std::to_string(sizeof(of_type) * 8);
+
+    INFO("of_type := ", of_type_str);
+
+    std::string type_str;
+    if (std::is_unsigned<type>::value)
+    {
+        type_str += "u";
+    }
+    type_str += "int";
+    type_str += std::to_string(sizeof(type) * 8);
+
+    INFO("type := ", type_str);
+
+    CAPTURE(val_min);
+    CAPTURE(min_in_range);
+    CAPTURE(val_max);
+    CAPTURE(max_in_range);
+
+    if (min_in_range)
+    {
+        CHECK(value_in_range_of<of_type>(val_min));
+        CHECK(value_in_range_of<of_type>(val_min2));
+    }
+    else
+    {
+        CHECK_FALSE(value_in_range_of<of_type>(val_min));
+        CHECK_FALSE(value_in_range_of<of_type>(val_min2));
+    }
+
+    if (max_in_range)
+    {
+        CHECK(value_in_range_of<of_type>(val_max));
+        CHECK(value_in_range_of<of_type>(val_max2));
+    }
+    else
+    {
+        CHECK_FALSE(value_in_range_of<of_type>(val_max));
+        CHECK_FALSE(value_in_range_of<of_type>(val_max2));
+    }
+}
+
+TEST_CASE("32bit")
+{
+    REQUIRE(SIZE_MAX == 0xffffffff);
+}
+
+TEST_CASE_TEMPLATE_INVOKE(value_in_range_of_test, \
+                          trait_test_arg<std::size_t, std::int32_t, false, true>, \
+                          trait_test_arg<std::size_t, std::uint32_t, true, true>, \
+                          trait_test_arg<std::size_t, std::int64_t, false, false>, \
+                          trait_test_arg<std::size_t, std::uint64_t, true, false>);
+
+TEST_CASE("BJData")
+{
+    SECTION("parse errors")
+    {
+        SECTION("array")
+        {
+            SECTION("optimized array: negative size")
+            {
+                std::vector<uint8_t> const vM = {'[', '$', 'M', '#', '[', 'I', 0x00, 0x20, 'M', 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0xFF, ']'};
+                std::vector<uint8_t> const vMX = {'[', '$', 'U', '#', '[', 'M', 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 'U', 0x01, ']'};
+
+                json _;
+                CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vM), "[json.exception.out_of_range.408] syntax error while parsing BJData size: integer value overflow", json::out_of_range&);
+                CHECK(json::from_bjdata(vM, true, false).is_discarded());
+
+                CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vMX), "[json.exception.out_of_range.408] syntax error while parsing BJData size: integer value overflow", json::out_of_range&);
+                CHECK(json::from_bjdata(vMX, true, false).is_discarded());
+            }
+
+            SECTION("optimized array: integer value overflow")
+            {
+                std::vector<uint8_t> const vL = {'[', '#', 'L', 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F};
+                std::vector<uint8_t> const vM = {'[', '$', 'M', '#', '[', 'I', 0x00, 0x20, 'M', 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0xFF, ']'};
+
+                json _;
+                CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vL), "[json.exception.out_of_range.408] syntax error while parsing BJData size: integer value overflow", json::out_of_range&);
+                CHECK(json::from_bjdata(vL, true, false).is_discarded());
+
+                CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vM), "[json.exception.out_of_range.408] syntax error while parsing BJData size: integer value overflow", json::out_of_range&);
+                CHECK(json::from_bjdata(vM, true, false).is_discarded());
+            }
+        }
+    }
+}
diff --git a/external_imported/json/test/src/unit-algorithms.cpp b/external_imported/json/tests/src/unit-algorithms.cpp
similarity index 77%
rename from external_imported/json/test/src/unit-algorithms.cpp
rename to external_imported/json/tests/src/unit-algorithms.cpp
index c08e858a6..3fb1640d4 100644
--- a/external_imported/json/test/src/unit-algorithms.cpp
+++ b/external_imported/json/tests/src/unit-algorithms.cpp
@@ -1,34 +1,14 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
 
 #include "doctest_compatibility.h"
 
+#include <algorithm>
 #include <nlohmann/json.hpp>
 using nlohmann::json;
 
@@ -43,7 +23,7 @@ TEST_CASE("algorithms")
         {
             CHECK(std::all_of(j_array.begin(), j_array.end(), [](const json & value)
             {
-                return value.size() > 0;
+                return !value.empty();
             }));
             CHECK(std::all_of(j_object.begin(), j_object.end(), [](const json & value)
             {
@@ -67,7 +47,7 @@ TEST_CASE("algorithms")
         {
             CHECK(std::none_of(j_array.begin(), j_array.end(), [](const json & value)
             {
-                return value.size() == 0;
+                return value.empty();
             }));
             CHECK(std::none_of(j_object.begin(), j_object.end(), [](const json & value)
             {
@@ -241,9 +221,7 @@ TEST_CASE("algorithms")
             SECTION("sorting an object")
             {
                 json j({{"one", 1}, {"two", 2}});
-                CHECK_THROWS_AS(std::sort(j.begin(), j.end()), json::invalid_iterator&);
-                CHECK_THROWS_WITH(std::sort(j.begin(), j.end()),
-                                  "[json.exception.invalid_iterator.209] cannot use offsets with object iterators");
+                CHECK_THROWS_WITH_AS(std::sort(j.begin(), j.end()), "[json.exception.invalid_iterator.209] cannot use offsets with object iterators", json::invalid_iterator&);
             }
         }
 
@@ -317,4 +295,71 @@ TEST_CASE("algorithms")
         std::sort_heap(j_array.begin(), j_array.end());
         CHECK(j_array == json({false, true, 3, 13, 29, {{"one", 1}, {"two", 2}}, {1, 2, 3}, "baz", "foo"}));
     }
+
+    SECTION("iota")
+    {
+        SECTION("int")
+        {
+            json json_arr = {0, 5, 2, 4, 10, 20, 30, 40, 50, 1};
+            std::iota(json_arr.begin(), json_arr.end(), 0);
+            CHECK(json_arr == json({0, 1, 2, 3, 4, 5, 6, 7, 8, 9}));
+        }
+        SECTION("double")
+        {
+            json json_arr = {0.5, 1.5, 1.3, 4.1, 10.2, 20.5, 30.6, 40.1, 50.22, 1.5};
+            std::iota(json_arr.begin(), json_arr.end(), 0.5);
+            CHECK(json_arr == json({0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5, 9.5}));
+        }
+
+        SECTION("char")
+        {
+            json json_arr = {'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', '0', '1'};
+            std::iota(json_arr.begin(), json_arr.end(), '0');
+            CHECK(json_arr == json({'0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}));
+        }
+    }
+
+    SECTION("copy")
+    {
+        SECTION("copy without if")
+        {
+            json dest_arr;
+            const json source_arr = {1, 2, 3, 4};
+
+            std::copy(source_arr.begin(), source_arr.end(), std::back_inserter(dest_arr));
+
+            CHECK(dest_arr == source_arr);
+        }
+        SECTION("copy if")
+        {
+            json dest_arr;
+            const json source_arr = {0, 3, 6, 9, 12, 15, 20};
+
+            std::copy_if(source_arr.begin(), source_arr.end(), std::back_inserter(dest_arr), [](const json & _value)
+            {
+                return _value.get<int>() % 3 == 0;
+            });
+            CHECK(dest_arr == json({0, 3, 6, 9, 12, 15}));
+        }
+        SECTION("copy n")
+        {
+            const json source_arr = {0, 1, 2, 3, 4, 5, 6, 7};
+            json dest_arr;
+            const unsigned char numToCopy = 2;
+
+            std::copy_n(source_arr.begin(), numToCopy, std::back_inserter(dest_arr));
+            CHECK(dest_arr == json{0, 1});
+
+        }
+        SECTION("copy n chars")
+        {
+            const json source_arr = {'1', '2', '3', '4', '5', '6', '7'};
+            json dest_arr;
+            const unsigned char numToCopy = 4;
+
+            std::copy_n(source_arr.begin(), numToCopy, std::back_inserter(dest_arr));
+            CHECK(dest_arr == json{'1', '2', '3', '4'});
+        }
+    }
+
 }
diff --git a/external_imported/json/test/src/unit-allocator.cpp b/external_imported/json/tests/src/unit-allocator.cpp
similarity index 75%
rename from external_imported/json/test/src/unit-allocator.cpp
rename to external_imported/json/tests/src/unit-allocator.cpp
index ad78b8f9e..399c8bfa8 100644
--- a/external_imported/json/test/src/unit-allocator.cpp
+++ b/external_imported/json/tests/src/unit-allocator.cpp
@@ -1,31 +1,10 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
 
 #include "doctest_compatibility.h"
 
@@ -39,13 +18,24 @@ namespace
 template<class T>
 struct bad_allocator : std::allocator<T>
 {
+    using std::allocator<T>::allocator;
+
+    bad_allocator() = default;
+    template<class U> bad_allocator(const bad_allocator<U>& /*unused*/) { }
+
     template<class... Args>
-    void construct(T*, Args&& ...)
+    void construct(T* /*unused*/, Args&& ... /*unused*/) // NOLINT(cppcoreguidelines-missing-std-forward)
     {
         throw std::bad_alloc();
     }
+
+    template <class U>
+    struct rebind
+    {
+        using other = bad_allocator<U>;
+    };
 };
-}
+} // namespace
 
 TEST_CASE("bad_alloc")
 {
@@ -85,10 +75,8 @@ struct my_allocator : std::allocator<T>
             next_construct_fails = false;
             throw std::bad_alloc();
         }
-        else
-        {
-            ::new (reinterpret_cast<void*>(p)) T(std::forward<Args>(args)...);
-        }
+
+        ::new (reinterpret_cast<void*>(p)) T(std::forward<Args>(args)...);
     }
 
     void deallocate(T* p, std::size_t n)
@@ -98,10 +86,8 @@ struct my_allocator : std::allocator<T>
             next_deallocate_fails = false;
             throw std::bad_alloc();
         }
-        else
-        {
-            std::allocator<T>::deallocate(p, n);
-        }
+
+        std::allocator<T>::deallocate(p, n);
     }
 
     void destroy(T* p)
@@ -111,10 +97,9 @@ struct my_allocator : std::allocator<T>
             next_destroy_fails = false;
             throw std::bad_alloc();
         }
-        else
-        {
-            p->~T();
-        }
+
+        static_cast<void>(p); // fix MSVC's C4100 warning
+        p->~T();
     }
 
     template <class U>
@@ -133,7 +118,7 @@ void my_allocator_clean_up(T* p)
     alloc.destroy(p);
     alloc.deallocate(p, 1);
 }
-}
+} // namespace
 
 TEST_CASE("controlled bad_alloc")
 {
@@ -183,7 +168,7 @@ TEST_CASE("controlled bad_alloc")
         SECTION("json_value(const string_t&)")
         {
             next_construct_fails = false;
-            my_json::string_t v("foo");
+            const my_json::string_t v("foo");
             CHECK_NOTHROW(my_allocator_clean_up(my_json::json_value(v).string));
             next_construct_fails = true;
             CHECK_THROWS_AS(my_json::json_value(v), std::bad_alloc&);
@@ -196,7 +181,7 @@ TEST_CASE("controlled bad_alloc")
         SECTION("basic_json(const CompatibleObjectType&)")
         {
             next_construct_fails = false;
-            std::map<std::string, std::string> v {{"foo", "bar"}};
+            const std::map<std::string, std::string> v {{"foo", "bar"}};
             CHECK_NOTHROW(my_json(v));
             next_construct_fails = true;
             CHECK_THROWS_AS(my_json(v), std::bad_alloc&);
@@ -206,7 +191,7 @@ TEST_CASE("controlled bad_alloc")
         SECTION("basic_json(const CompatibleArrayType&)")
         {
             next_construct_fails = false;
-            std::vector<std::string> v {"foo", "bar", "baz"};
+            const std::vector<std::string> v {"foo", "bar", "baz"};
             CHECK_NOTHROW(my_json(v));
             next_construct_fails = true;
             CHECK_THROWS_AS(my_json(v), std::bad_alloc&);
@@ -225,7 +210,7 @@ TEST_CASE("controlled bad_alloc")
         SECTION("basic_json(const typename string_t::value_type*)")
         {
             next_construct_fails = false;
-            std::string s("foo");
+            const std::string s("foo");
             CHECK_NOTHROW(my_json(s));
             next_construct_fails = true;
             CHECK_THROWS_AS(my_json(s), std::bad_alloc&);
@@ -239,9 +224,9 @@ namespace
 template<class T>
 struct allocator_no_forward : std::allocator<T>
 {
-    allocator_no_forward() {}
+    allocator_no_forward() = default;
     template <class U>
-    allocator_no_forward(allocator_no_forward<U>) {}
+    allocator_no_forward(allocator_no_forward<U> /*unused*/) {}
 
     template <class U>
     struct rebind
@@ -256,7 +241,7 @@ struct allocator_no_forward : std::allocator<T>
         ::new (static_cast<void*>(p)) T(args...);
     }
 };
-}
+} // namespace
 
 TEST_CASE("bad my_allocator::construct")
 {
diff --git a/external_imported/json/tests/src/unit-alt-string.cpp b/external_imported/json/tests/src/unit-alt-string.cpp
new file mode 100644
index 000000000..7efe2e2e9
--- /dev/null
+++ b/external_imported/json/tests/src/unit-alt-string.cpp
@@ -0,0 +1,322 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-FileCopyrightText: 2018 Vitaliy Manushkin <agri@akamo.info>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+#include <nlohmann/json.hpp>
+
+#include <string>
+#include <utility>
+
+/* forward declarations */
+class alt_string;
+bool operator<(const char* op1, const alt_string& op2) noexcept;
+void int_to_string(alt_string& target, std::size_t value);
+
+/*
+ * This is virtually a string class.
+ * It covers std::string under the hood.
+ */
+class alt_string
+{
+  public:
+    using value_type = std::string::value_type;
+
+    static constexpr auto npos = static_cast<std::size_t>(-1);
+
+    alt_string(const char* str): str_impl(str) {}
+    alt_string(const char* str, std::size_t count): str_impl(str, count) {}
+    alt_string(size_t count, char chr): str_impl(count, chr) {}
+    alt_string() = default;
+
+    template <typename...TParams>
+    alt_string& append(TParams&& ...params)
+    {
+        str_impl.append(std::forward<TParams>(params)...);
+        return *this;
+    }
+
+    void push_back(char c)
+    {
+        str_impl.push_back(c);
+    }
+
+    template <typename op_type>
+    bool operator==(const op_type& op) const
+    {
+        return str_impl == op;
+    }
+
+    bool operator==(const alt_string& op) const
+    {
+        return str_impl == op.str_impl;
+    }
+
+    template <typename op_type>
+    bool operator!=(const op_type& op) const
+    {
+        return str_impl != op;
+    }
+
+    bool operator!=(const alt_string& op) const
+    {
+        return str_impl != op.str_impl;
+    }
+
+    std::size_t size() const noexcept
+    {
+        return str_impl.size();
+    }
+
+    void resize (std::size_t n)
+    {
+        str_impl.resize(n);
+    }
+
+    void resize (std::size_t n, char c)
+    {
+        str_impl.resize(n, c);
+    }
+
+    template <typename op_type>
+    bool operator<(const op_type& op) const noexcept
+    {
+        return str_impl < op;
+    }
+
+    bool operator<(const alt_string& op) const noexcept
+    {
+        return str_impl < op.str_impl;
+    }
+
+    const char* c_str() const
+    {
+        return str_impl.c_str();
+    }
+
+    char& operator[](std::size_t index)
+    {
+        return str_impl[index];
+    }
+
+    const char& operator[](std::size_t index) const
+    {
+        return str_impl[index];
+    }
+
+    char& back()
+    {
+        return str_impl.back();
+    }
+
+    const char& back() const
+    {
+        return str_impl.back();
+    }
+
+    void clear()
+    {
+        str_impl.clear();
+    }
+
+    const value_type* data() const
+    {
+        return str_impl.data();
+    }
+
+    bool empty() const
+    {
+        return str_impl.empty();
+    }
+
+    std::size_t find(const alt_string& str, std::size_t pos = 0) const
+    {
+        return str_impl.find(str.str_impl, pos);
+    }
+
+    std::size_t find_first_of(char c, std::size_t pos = 0) const
+    {
+        return str_impl.find_first_of(c, pos);
+    }
+
+    alt_string substr(std::size_t pos = 0, std::size_t count = npos) const
+    {
+        const std::string s = str_impl.substr(pos, count);
+        return {s.data(), s.size()};
+    }
+
+    alt_string& replace(std::size_t pos, std::size_t count, const alt_string& str)
+    {
+        str_impl.replace(pos, count, str.str_impl);
+        return *this;
+    }
+
+  private:
+    std::string str_impl {};
+
+    friend bool operator<(const char* /*op1*/, const alt_string& /*op2*/) noexcept;
+};
+
+void int_to_string(alt_string& target, std::size_t value)
+{
+    target = std::to_string(value).c_str();
+}
+
+using alt_json = nlohmann::basic_json <
+                 std::map,
+                 std::vector,
+                 alt_string,
+                 bool,
+                 std::int64_t,
+                 std::uint64_t,
+                 double,
+                 std::allocator,
+                 nlohmann::adl_serializer >;
+
+bool operator<(const char* op1, const alt_string& op2) noexcept
+{
+    return op1 < op2.str_impl;
+}
+
+TEST_CASE("alternative string type")
+{
+    SECTION("dump")
+    {
+        {
+            alt_json doc;
+            doc["pi"] = 3.141;
+            alt_string dump = doc.dump();
+            CHECK(dump == R"({"pi":3.141})");
+        }
+
+        {
+            alt_json doc;
+            doc["happy"] = true;
+            alt_string dump = doc.dump();
+            CHECK(dump == R"({"happy":true})");
+        }
+
+        {
+            alt_json doc;
+            doc["name"] = "I'm Batman";
+            alt_string dump = doc.dump();
+            CHECK(dump == R"({"name":"I'm Batman"})");
+        }
+
+        {
+            alt_json doc;
+            doc["nothing"] = nullptr;
+            alt_string dump = doc.dump();
+            CHECK(dump == R"({"nothing":null})");
+        }
+
+        {
+            alt_json doc;
+            doc["answer"]["everything"] = 42;
+            alt_string dump = doc.dump();
+            CHECK(dump == R"({"answer":{"everything":42}})");
+        }
+
+        {
+            alt_json doc;
+            doc["list"] = { 1, 0, 2 };
+            alt_string dump = doc.dump();
+            CHECK(dump == R"({"list":[1,0,2]})");
+        }
+
+        {
+            alt_json doc;
+            doc["object"] = { {"currency", "USD"}, {"value", 42.99} };
+            alt_string dump = doc.dump();
+            CHECK(dump == R"({"object":{"currency":"USD","value":42.99}})");
+        }
+    }
+
+    SECTION("parse")
+    {
+        auto doc = alt_json::parse(R"({"foo": "bar"})");
+        alt_string dump = doc.dump();
+        CHECK(dump == R"({"foo":"bar"})");
+    }
+
+    SECTION("items")
+    {
+        auto doc = alt_json::parse(R"({"foo": "bar"})");
+
+        for (const auto& item : doc.items())
+        {
+            CHECK(item.key() == "foo");
+            CHECK(item.value() == "bar");
+        }
+
+        auto doc_array = alt_json::parse(R"(["foo", "bar"])");
+
+        for (const auto& item : doc_array.items())
+        {
+            if (item.key() == "0" )
+            {
+                CHECK( item.value() == "foo" );
+            }
+            else if (item.key() == "1" )
+            {
+                CHECK(item.value() == "bar");
+            }
+            else
+            {
+                CHECK(false);
+            }
+        }
+    }
+
+    SECTION("equality")
+    {
+        alt_json doc;
+        doc["Who are you?"] = "I'm Batman";
+
+        CHECK("I'm Batman" == doc["Who are you?"]);
+        CHECK(doc["Who are you?"]  == "I'm Batman");
+        CHECK_FALSE("I'm Batman" != doc["Who are you?"]);
+        CHECK_FALSE(doc["Who are you?"]  != "I'm Batman");
+
+        CHECK("I'm Bruce Wayne" != doc["Who are you?"]);
+        CHECK(doc["Who are you?"]  != "I'm Bruce Wayne");
+        CHECK_FALSE("I'm Bruce Wayne" == doc["Who are you?"]);
+        CHECK_FALSE(doc["Who are you?"]  == "I'm Bruce Wayne");
+
+        {
+            const alt_json& const_doc = doc;
+
+            CHECK("I'm Batman" == const_doc["Who are you?"]);
+            CHECK(const_doc["Who are you?"] == "I'm Batman");
+            CHECK_FALSE("I'm Batman" != const_doc["Who are you?"]);
+            CHECK_FALSE(const_doc["Who are you?"] != "I'm Batman");
+
+            CHECK("I'm Bruce Wayne" != const_doc["Who are you?"]);
+            CHECK(const_doc["Who are you?"] != "I'm Bruce Wayne");
+            CHECK_FALSE("I'm Bruce Wayne" == const_doc["Who are you?"]);
+            CHECK_FALSE(const_doc["Who are you?"] == "I'm Bruce Wayne");
+        }
+    }
+
+    SECTION("JSON pointer")
+    {
+        // conversion from json to alt_json fails to compile (see #3425);
+        // attempted fix(*) produces: [[['b','a','r'],['b','a','z']]] (with each char being an integer)
+        // (*) disable implicit conversion for json_refs of any basic_json type
+        // alt_json j = R"(
+        // {
+        //     "foo": ["bar", "baz"]
+        // }
+        // )"_json;
+        auto j = alt_json::parse(R"({"foo": ["bar", "baz"]})");
+
+        CHECK(j.at(alt_json::json_pointer("/foo/0")) == j["foo"][0]);
+        CHECK(j.at(alt_json::json_pointer("/foo/1")) == j["foo"][1]);
+    }
+}
diff --git a/external_imported/json/tests/src/unit-assert_macro.cpp b/external_imported/json/tests/src/unit-assert_macro.cpp
new file mode 100644
index 000000000..55eb3b9ec
--- /dev/null
+++ b/external_imported/json/tests/src/unit-assert_macro.cpp
@@ -0,0 +1,48 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+// avoid warning when assert does not abort
+DOCTEST_GCC_SUPPRESS_WARNING_PUSH
+DOCTEST_GCC_SUPPRESS_WARNING("-Wstrict-overflow")
+DOCTEST_CLANG_SUPPRESS_WARNING_PUSH
+DOCTEST_CLANG_SUPPRESS_WARNING("-Wstrict-overflow")
+
+/// global variable to record side effect of assert calls
+static int assert_counter;
+
+/// set failure variable to true instead of calling assert(x)
+#define JSON_ASSERT(x) {if (!(x)) ++assert_counter; }
+
+#include <nlohmann/json.hpp>
+using nlohmann::json;
+
+// the test assumes exceptions to work
+#if !defined(JSON_NOEXCEPTION)
+TEST_CASE("JSON_ASSERT(x)")
+{
+    SECTION("basic_json(first, second)")
+    {
+        assert_counter = 0;
+        CHECK(assert_counter == 0);
+
+        const json::iterator it{};
+        json j;
+
+        // in case assertions do not abort execution, an exception is thrown
+        CHECK_THROWS_WITH_AS(json(it, j.end()), "[json.exception.invalid_iterator.201] iterators are not compatible", json::invalid_iterator);
+
+        // check that assertion actually happened
+        CHECK(assert_counter == 1);
+    }
+}
+#endif
+
+DOCTEST_GCC_SUPPRESS_WARNING_POP
+DOCTEST_CLANG_SUPPRESS_WARNING_POP
diff --git a/external_imported/json/tests/src/unit-binary_formats.cpp b/external_imported/json/tests/src/unit-binary_formats.cpp
new file mode 100644
index 000000000..b41a6fec1
--- /dev/null
+++ b/external_imported/json/tests/src/unit-binary_formats.cpp
@@ -0,0 +1,211 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+#include <nlohmann/json.hpp>
+using nlohmann::json;
+
+#include <fstream>
+#include "make_test_data_available.hpp"
+
+TEST_CASE("Binary Formats" * doctest::skip())
+{
+    SECTION("canada.json")
+    {
+        const auto* filename = TEST_DATA_DIRECTORY "/nativejson-benchmark/canada.json";
+        const json j = json::parse(std::ifstream(filename));
+
+        const auto json_size = j.dump().size();
+        const auto bjdata_1_size = json::to_bjdata(j).size();
+        const auto bjdata_2_size = json::to_bjdata(j, true).size();
+        const auto bjdata_3_size = json::to_bjdata(j, true, true).size();
+        const auto bson_size = json::to_bson(j).size();
+        const auto cbor_size = json::to_cbor(j).size();
+        const auto msgpack_size = json::to_msgpack(j).size();
+        const auto ubjson_1_size = json::to_ubjson(j).size();
+        const auto ubjson_2_size = json::to_ubjson(j, true).size();
+        const auto ubjson_3_size = json::to_ubjson(j, true, true).size();
+
+        CHECK(json_size == 2090303);
+        CHECK(bjdata_1_size == 1112030);
+        CHECK(bjdata_2_size == 1224148);
+        CHECK(bjdata_3_size == 1224148);
+        CHECK(bson_size == 1794522);
+        CHECK(cbor_size == 1055552);
+        CHECK(msgpack_size == 1056145);
+        CHECK(ubjson_1_size == 1112030);
+        CHECK(ubjson_2_size == 1224148);
+        CHECK(ubjson_3_size == 1169069);
+
+        CHECK((100.0 * double(json_size) / double(json_size)) == Approx(100.0));
+        CHECK((100.0 * double(bjdata_1_size) / double(json_size)) == Approx(53.199));
+        CHECK((100.0 * double(bjdata_2_size) / double(json_size)) == Approx(58.563));
+        CHECK((100.0 * double(bjdata_3_size) / double(json_size)) == Approx(58.563));
+        CHECK((100.0 * double(bson_size) / double(json_size)) == Approx(85.849));
+        CHECK((100.0 * double(cbor_size) / double(json_size)) == Approx(50.497));
+        CHECK((100.0 * double(msgpack_size) / double(json_size)) == Approx(50.526));
+        CHECK((100.0 * double(ubjson_1_size) / double(json_size)) == Approx(53.199));
+        CHECK((100.0 * double(ubjson_2_size) / double(json_size)) == Approx(58.563));
+        CHECK((100.0 * double(ubjson_3_size) / double(json_size)) == Approx(55.928));
+    }
+
+    SECTION("twitter.json")
+    {
+        const auto* filename = TEST_DATA_DIRECTORY "/nativejson-benchmark/twitter.json";
+        const json j = json::parse(std::ifstream(filename));
+
+        const auto json_size = j.dump().size();
+        const auto bjdata_1_size = json::to_bjdata(j).size();
+        const auto bjdata_2_size = json::to_bjdata(j, true).size();
+        const auto bjdata_3_size = json::to_bjdata(j, true, true).size();
+        const auto bson_size = json::to_bson(j).size();
+        const auto cbor_size = json::to_cbor(j).size();
+        const auto msgpack_size = json::to_msgpack(j).size();
+        const auto ubjson_1_size = json::to_ubjson(j).size();
+        const auto ubjson_2_size = json::to_ubjson(j, true).size();
+        const auto ubjson_3_size = json::to_ubjson(j, true, true).size();
+
+        CHECK(json_size == 466906);
+        CHECK(bjdata_1_size == 425342);
+        CHECK(bjdata_2_size == 429970);
+        CHECK(bjdata_3_size == 429970);
+        CHECK(bson_size == 444568);
+        CHECK(cbor_size == 402814);
+        CHECK(msgpack_size == 401510);
+        CHECK(ubjson_1_size == 426160);
+        CHECK(ubjson_2_size == 430788);
+        CHECK(ubjson_3_size == 430798);
+
+        CHECK((100.0 * double(json_size) / double(json_size)) == Approx(100.0));
+        CHECK((100.0 * double(bjdata_1_size) / double(json_size)) == Approx(91.097));
+        CHECK((100.0 * double(bjdata_2_size) / double(json_size)) == Approx(92.089));
+        CHECK((100.0 * double(bjdata_3_size) / double(json_size)) == Approx(92.089));
+        CHECK((100.0 * double(bson_size) / double(json_size)) == Approx(95.215));
+        CHECK((100.0 * double(cbor_size) / double(json_size)) == Approx(86.273));
+        CHECK((100.0 * double(msgpack_size) / double(json_size)) == Approx(85.993));
+        CHECK((100.0 * double(ubjson_1_size) / double(json_size)) == Approx(91.273));
+        CHECK((100.0 * double(ubjson_2_size) / double(json_size)) == Approx(92.264));
+        CHECK((100.0 * double(ubjson_3_size) / double(json_size)) == Approx(92.266));
+    }
+
+    SECTION("citm_catalog.json")
+    {
+        const auto* filename = TEST_DATA_DIRECTORY "/nativejson-benchmark/citm_catalog.json";
+        const json j = json::parse(std::ifstream(filename));
+
+        const auto json_size = j.dump().size();
+        const auto bjdata_1_size = json::to_bjdata(j).size();
+        const auto bjdata_2_size = json::to_bjdata(j, true).size();
+        const auto bjdata_3_size = json::to_bjdata(j, true, true).size();
+        const auto bson_size = json::to_bson(j).size();
+        const auto cbor_size = json::to_cbor(j).size();
+        const auto msgpack_size = json::to_msgpack(j).size();
+        const auto ubjson_1_size = json::to_ubjson(j).size();
+        const auto ubjson_2_size = json::to_ubjson(j, true).size();
+        const auto ubjson_3_size = json::to_ubjson(j, true, true).size();
+
+        CHECK(json_size == 500299);
+        CHECK(bjdata_1_size == 390781);
+        CHECK(bjdata_2_size == 433557);
+        CHECK(bjdata_3_size == 432964);
+        CHECK(bson_size == 479430);
+        CHECK(cbor_size == 342373);
+        CHECK(msgpack_size == 342473);
+        CHECK(ubjson_1_size == 391463);
+        CHECK(ubjson_2_size == 434239);
+        CHECK(ubjson_3_size == 425073);
+
+        CHECK((100.0 * double(json_size) / double(json_size)) == Approx(100.0));
+        CHECK((100.0 * double(bjdata_1_size) / double(json_size)) == Approx(78.109));
+        CHECK((100.0 * double(bjdata_2_size) / double(json_size)) == Approx(86.659));
+        CHECK((100.0 * double(bjdata_3_size) / double(json_size)) == Approx(86.541));
+        CHECK((100.0 * double(bson_size) / double(json_size)) == Approx(95.828));
+        CHECK((100.0 * double(cbor_size) / double(json_size)) == Approx(68.433));
+        CHECK((100.0 * double(msgpack_size) / double(json_size)) == Approx(68.453));
+        CHECK((100.0 * double(ubjson_1_size) / double(json_size)) == Approx(78.245));
+        CHECK((100.0 * double(ubjson_2_size) / double(json_size)) == Approx(86.795));
+        CHECK((100.0 * double(ubjson_3_size) / double(json_size)) == Approx(84.963));
+    }
+
+    SECTION("jeopardy.json")
+    {
+        const auto* filename = TEST_DATA_DIRECTORY "/jeopardy/jeopardy.json";
+        json j = json::parse(std::ifstream(filename));
+
+        const auto json_size = j.dump().size();
+        const auto bjdata_1_size = json::to_bjdata(j).size();
+        const auto bjdata_2_size = json::to_bjdata(j, true).size();
+        const auto bjdata_3_size = json::to_bjdata(j, true, true).size();
+        const auto bson_size = json::to_bson({{"", j}}).size(); // wrap array in object for BSON
+        const auto cbor_size = json::to_cbor(j).size();
+        const auto msgpack_size = json::to_msgpack(j).size();
+        const auto ubjson_1_size = json::to_ubjson(j).size();
+        const auto ubjson_2_size = json::to_ubjson(j, true).size();
+        const auto ubjson_3_size = json::to_ubjson(j, true, true).size();
+
+        CHECK(json_size == 52508728);
+        CHECK(bjdata_1_size == 50710965);
+        CHECK(bjdata_2_size == 51144830);
+        CHECK(bjdata_3_size == 51144830);
+        CHECK(bson_size == 56008520);
+        CHECK(cbor_size == 46187320);
+        CHECK(msgpack_size == 46158575);
+        CHECK(ubjson_1_size == 50710965);
+        CHECK(ubjson_2_size == 51144830);
+        CHECK(ubjson_3_size == 49861422);
+
+        CHECK((100.0 * double(json_size) / double(json_size)) == Approx(100.0));
+        CHECK((100.0 * double(bjdata_1_size) / double(json_size)) == Approx(96.576));
+        CHECK((100.0 * double(bjdata_2_size) / double(json_size)) == Approx(97.402));
+        CHECK((100.0 * double(bjdata_3_size) / double(json_size)) == Approx(97.402));
+        CHECK((100.0 * double(bson_size) / double(json_size)) == Approx(106.665));
+        CHECK((100.0 * double(cbor_size) / double(json_size)) == Approx(87.961));
+        CHECK((100.0 * double(msgpack_size) / double(json_size)) == Approx(87.906));
+        CHECK((100.0 * double(ubjson_1_size) / double(json_size)) == Approx(96.576));
+        CHECK((100.0 * double(ubjson_2_size) / double(json_size)) == Approx(97.402));
+        CHECK((100.0 * double(ubjson_3_size) / double(json_size)) == Approx(94.958));
+    }
+
+    SECTION("sample.json")
+    {
+        const auto* filename = TEST_DATA_DIRECTORY "/json_testsuite/sample.json";
+        const json j = json::parse(std::ifstream(filename));
+
+        const auto json_size = j.dump().size();
+        const auto bjdata_1_size = json::to_bjdata(j).size();
+        const auto bjdata_2_size = json::to_bjdata(j, true).size();
+        const auto bjdata_3_size = json::to_bjdata(j, true, true).size();
+        // BSON cannot process the file as it contains code point  U+0000
+        const auto cbor_size = json::to_cbor(j).size();
+        const auto msgpack_size = json::to_msgpack(j).size();
+        const auto ubjson_1_size = json::to_ubjson(j).size();
+        const auto ubjson_2_size = json::to_ubjson(j, true).size();
+        const auto ubjson_3_size = json::to_ubjson(j, true, true).size();
+
+        CHECK(json_size == 168677);
+        CHECK(bjdata_1_size == 148695);
+        CHECK(bjdata_2_size == 150569);
+        CHECK(bjdata_3_size == 150569);
+        CHECK(cbor_size == 147095);
+        CHECK(msgpack_size == 147017);
+        CHECK(ubjson_1_size == 148695);
+        CHECK(ubjson_2_size == 150569);
+        CHECK(ubjson_3_size == 150883);
+
+        CHECK((100.0 * double(json_size) / double(json_size)) == Approx(100.0));
+        CHECK((100.0 * double(bjdata_1_size) / double(json_size)) == Approx(88.153));
+        CHECK((100.0 * double(bjdata_2_size) / double(json_size)) == Approx(89.264));
+        CHECK((100.0 * double(bjdata_3_size) / double(json_size)) == Approx(89.264));
+        CHECK((100.0 * double(cbor_size) / double(json_size)) == Approx(87.205));
+        CHECK((100.0 * double(msgpack_size) / double(json_size)) == Approx(87.158));
+        CHECK((100.0 * double(ubjson_1_size) / double(json_size)) == Approx(88.153));
+        CHECK((100.0 * double(ubjson_2_size) / double(json_size)) == Approx(89.264));
+        CHECK((100.0 * double(ubjson_3_size) / double(json_size)) == Approx(89.450));
+    }
+}
diff --git a/external_imported/json/tests/src/unit-bjdata.cpp b/external_imported/json/tests/src/unit-bjdata.cpp
new file mode 100644
index 000000000..9f247fe6f
--- /dev/null
+++ b/external_imported/json/tests/src/unit-bjdata.cpp
@@ -0,0 +1,3581 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+#define JSON_TESTS_PRIVATE
+#include <nlohmann/json.hpp>
+using nlohmann::json;
+
+#include <algorithm>
+#include <climits>
+#include <limits>
+#include <iostream>
+#include <fstream>
+#include <set>
+#include "make_test_data_available.hpp"
+#include "test_utils.hpp"
+
+namespace
+{
+class SaxCountdown
+{
+  public:
+    explicit SaxCountdown(const int count) : events_left(count)
+    {}
+
+    bool null()
+    {
+        return events_left-- > 0;
+    }
+
+    bool boolean(bool /*unused*/)
+    {
+        return events_left-- > 0;
+    }
+
+    bool number_integer(json::number_integer_t /*unused*/)
+    {
+        return events_left-- > 0;
+    }
+
+    bool number_unsigned(json::number_unsigned_t /*unused*/)
+    {
+        return events_left-- > 0;
+    }
+
+    bool number_float(json::number_float_t /*unused*/, const std::string& /*unused*/)
+    {
+        return events_left-- > 0;
+    }
+
+    bool string(std::string& /*unused*/)
+    {
+        return events_left-- > 0;
+    }
+
+    bool binary(std::vector<std::uint8_t>& /*unused*/)
+    {
+        return events_left-- > 0;
+    }
+
+    bool start_object(std::size_t /*unused*/)
+    {
+        return events_left-- > 0;
+    }
+
+    bool key(std::string& /*unused*/)
+    {
+        return events_left-- > 0;
+    }
+
+    bool end_object()
+    {
+        return events_left-- > 0;
+    }
+
+    bool start_array(std::size_t /*unused*/)
+    {
+        return events_left-- > 0;
+    }
+
+    bool end_array()
+    {
+        return events_left-- > 0;
+    }
+
+    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/, const json::exception& /*unused*/) // NOLINT(readability-convert-member-functions-to-static)
+    {
+        return false;
+    }
+
+  private:
+    int events_left = 0;
+};
+} // namespace
+
+// at some point in the future, a unit test dedicated to type traits might be a good idea
+template <typename OfType, typename T, bool MinInRange, bool MaxInRange>
+struct trait_test_arg
+{
+    using of_type = OfType;
+    using type = T;
+    static constexpr bool min_in_range = MinInRange;
+    static constexpr bool max_in_range = MaxInRange;
+};
+
+TEST_CASE_TEMPLATE_DEFINE("value_in_range_of trait", T, value_in_range_of_test)
+{
+    using nlohmann::detail::value_in_range_of;
+
+    using of_type = typename T::of_type;
+    using type = typename T::type;
+    constexpr bool min_in_range = T::min_in_range;
+    constexpr bool max_in_range = T::max_in_range;
+
+    type const val_min = std::numeric_limits<type>::min();
+    type const val_min2 = val_min + 1;
+    type const val_max = std::numeric_limits<type>::max();
+    type const val_max2 = val_max - 1;
+
+    REQUIRE(CHAR_BIT == 8);
+
+    std::string of_type_str;
+    if (std::is_unsigned<of_type>::value)
+    {
+        of_type_str += "u";
+    }
+    of_type_str += "int";
+    of_type_str += std::to_string(sizeof(of_type) * 8);
+
+    INFO("of_type := ", of_type_str);
+
+    std::string type_str;
+    if (std::is_unsigned<type>::value)
+    {
+        type_str += "u";
+    }
+    type_str += "int";
+    type_str += std::to_string(sizeof(type) * 8);
+
+    INFO("type := ", type_str);
+
+    CAPTURE(val_min);
+    CAPTURE(min_in_range);
+    CAPTURE(val_max);
+    CAPTURE(max_in_range);
+
+    if (min_in_range)
+    {
+        CHECK(value_in_range_of<of_type>(val_min));
+        CHECK(value_in_range_of<of_type>(val_min2));
+    }
+    else
+    {
+        CHECK_FALSE(value_in_range_of<of_type>(val_min));
+        CHECK_FALSE(value_in_range_of<of_type>(val_min2));
+    }
+
+    if (max_in_range)
+    {
+        CHECK(value_in_range_of<of_type>(val_max));
+        CHECK(value_in_range_of<of_type>(val_max2));
+    }
+    else
+    {
+        CHECK_FALSE(value_in_range_of<of_type>(val_max));
+        CHECK_FALSE(value_in_range_of<of_type>(val_max2));
+    }
+}
+
+TEST_CASE_TEMPLATE_INVOKE(value_in_range_of_test, \
+                          trait_test_arg<std::int32_t, std::int32_t, true, true>, \
+                          trait_test_arg<std::int32_t, std::uint32_t, true, false>, \
+                          trait_test_arg<std::uint32_t, std::int32_t, false, true>, \
+                          trait_test_arg<std::uint32_t, std::uint32_t, true, true>, \
+                          trait_test_arg<std::int32_t, std::int64_t, false, false>, \
+                          trait_test_arg<std::int32_t, std::uint64_t, true, false>, \
+                          trait_test_arg<std::uint32_t, std::int64_t, false, false>, \
+                          trait_test_arg<std::uint32_t, std::uint64_t, true, false>, \
+                          trait_test_arg<std::int64_t, std::int32_t, true, true>, \
+                          trait_test_arg<std::int64_t, std::uint32_t, true, true>, \
+                          trait_test_arg<std::uint64_t, std::int32_t, false, true>, \
+                          trait_test_arg<std::uint64_t, std::uint32_t, true, true>, \
+                          trait_test_arg<std::int64_t, std::int64_t, true, true>, \
+                          trait_test_arg<std::int64_t, std::uint64_t, true, false>, \
+                          trait_test_arg<std::uint64_t, std::int64_t, false, true>, \
+                          trait_test_arg<std::uint64_t, std::uint64_t, true, true>);
+
+#if SIZE_MAX == 0xffffffff
+TEST_CASE_TEMPLATE_INVOKE(value_in_range_of_test, \
+                          trait_test_arg<std::size_t, std::int32_t, false, true>, \
+                          trait_test_arg<std::size_t, std::uint32_t, true, true>, \
+                          trait_test_arg<std::size_t, std::int64_t, false, false>, \
+                          trait_test_arg<std::size_t, std::uint64_t, true, false>);
+#else
+TEST_CASE_TEMPLATE_INVOKE(value_in_range_of_test, \
+                          trait_test_arg<std::size_t, std::int32_t, false, true>, \
+                          trait_test_arg<std::size_t, std::uint32_t, true, true>, \
+                          trait_test_arg<std::size_t, std::int64_t, false, true>, \
+                          trait_test_arg<std::size_t, std::uint64_t, true, true>);
+#endif
+
+TEST_CASE("BJData")
+{
+    SECTION("binary_reader BJData LUT arrays are sorted")
+    {
+        std::vector<std::uint8_t> const data;
+        auto ia = nlohmann::detail::input_adapter(data);
+        // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
+        nlohmann::detail::binary_reader<json, decltype(ia)> const br{std::move(ia), json::input_format_t::bjdata};
+
+        CHECK(std::is_sorted(br.bjd_optimized_type_markers.begin(), br.bjd_optimized_type_markers.end()));
+        CHECK(std::is_sorted(br.bjd_types_map.begin(), br.bjd_types_map.end()));
+    }
+
+    SECTION("individual values")
+    {
+        SECTION("discarded")
+        {
+            // discarded values are not serialized
+            json const j = json::value_t::discarded;
+            const auto result = json::to_bjdata(j);
+            CHECK(result.empty());
+        }
+
+        SECTION("null")
+        {
+            json const j = nullptr;
+            std::vector<uint8_t> const expected = {'Z'};
+            const auto result = json::to_bjdata(j);
+            CHECK(result == expected);
+
+            // roundtrip
+            CHECK(json::from_bjdata(result) == j);
+            CHECK(json::from_bjdata(result, true, false) == j);
+        }
+
+        SECTION("boolean")
+        {
+            SECTION("true")
+            {
+                json const j = true;
+                std::vector<uint8_t> const expected = {'T'};
+                const auto result = json::to_bjdata(j);
+                CHECK(result == expected);
+
+                // roundtrip
+                CHECK(json::from_bjdata(result) == j);
+                CHECK(json::from_bjdata(result, true, false) == j);
+            }
+
+            SECTION("false")
+            {
+                json const j = false;
+                std::vector<uint8_t> const expected = {'F'};
+                const auto result = json::to_bjdata(j);
+                CHECK(result == expected);
+
+                // roundtrip
+                CHECK(json::from_bjdata(result) == j);
+                CHECK(json::from_bjdata(result, true, false) == j);
+            }
+        }
+
+        SECTION("number")
+        {
+            SECTION("signed")
+            {
+                SECTION("-9223372036854775808..-2147483649 (int64)")
+                {
+                    std::vector<int64_t> const numbers
+                    {
+                        (std::numeric_limits<int64_t>::min)(),
+                        -1000000000000000000LL,
+                        -100000000000000000LL,
+                        -10000000000000000LL,
+                        -1000000000000000LL,
+                        -100000000000000LL,
+                        -10000000000000LL,
+                        -1000000000000LL,
+                        -100000000000LL,
+                        -10000000000LL,
+                        -2147483649LL,
+                    };
+                    for (const auto i : numbers)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        json const j = i;
+
+                        // check type
+                        CHECK(j.is_number_integer());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            static_cast<uint8_t>('L'),
+                            static_cast<uint8_t>(i & 0xff),
+                            static_cast<uint8_t>((i >> 8) & 0xff),
+                            static_cast<uint8_t>((i >> 16) & 0xff),
+                            static_cast<uint8_t>((i >> 24) & 0xff),
+                            static_cast<uint8_t>((i >> 32) & 0xff),
+                            static_cast<uint8_t>((i >> 40) & 0xff),
+                            static_cast<uint8_t>((i >> 48) & 0xff),
+                            static_cast<uint8_t>((i >> 56) & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_bjdata(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 9);
+
+                        // check individual bytes
+                        CHECK(result[0] == 'L');
+                        int64_t const restored = (static_cast<int64_t>(result[8]) << 070) +
+                                                 (static_cast<int64_t>(result[7]) << 060) +
+                                                 (static_cast<int64_t>(result[6]) << 050) +
+                                                 (static_cast<int64_t>(result[5]) << 040) +
+                                                 (static_cast<int64_t>(result[4]) << 030) +
+                                                 (static_cast<int64_t>(result[3]) << 020) +
+                                                 (static_cast<int64_t>(result[2]) << 010) +
+                                                 static_cast<int64_t>(result[1]);
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_bjdata(result) == j);
+                        CHECK(json::from_bjdata(result, true, false) == j);
+                    }
+                }
+
+                SECTION("-2147483648..-32769 (int32)")
+                {
+                    std::vector<int32_t> const numbers
+                    {
+                        -32769,
+                            -100000,
+                            -1000000,
+                            -10000000,
+                            -100000000,
+                            -1000000000,
+                            -2147483647 - 1, // https://stackoverflow.com/a/29356002/266378
+                        };
+                    for (const auto i : numbers)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        json const j = i;
+
+                        // check type
+                        CHECK(j.is_number_integer());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            static_cast<uint8_t>('l'),
+                            static_cast<uint8_t>(i & 0xff),
+                            static_cast<uint8_t>((i >> 8) & 0xff),
+                            static_cast<uint8_t>((i >> 16) & 0xff),
+                            static_cast<uint8_t>((i >> 24) & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_bjdata(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 5);
+
+                        // check individual bytes
+                        CHECK(result[0] == 'l');
+                        int32_t const restored = (static_cast<int32_t>(result[4]) << 030) +
+                                                 (static_cast<int32_t>(result[3]) << 020) +
+                                                 (static_cast<int32_t>(result[2]) << 010) +
+                                                 static_cast<int32_t>(result[1]);
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_bjdata(result) == j);
+                        CHECK(json::from_bjdata(result, true, false) == j);
+                    }
+                }
+
+                SECTION("-32768..-129 (int16)")
+                {
+                    for (int32_t i = -32768; i <= -129; ++i)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        json const j = i;
+
+                        // check type
+                        CHECK(j.is_number_integer());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            static_cast<uint8_t>('I'),
+                            static_cast<uint8_t>(i & 0xff),
+                            static_cast<uint8_t>((i >> 8) & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_bjdata(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 3);
+
+                        // check individual bytes
+                        CHECK(result[0] == 'I');
+                        auto const restored = static_cast<int16_t>(((result[2] << 8) + result[1]));
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_bjdata(result) == j);
+                        CHECK(json::from_bjdata(result, true, false) == j);
+                    }
+                }
+
+                SECTION("-9263 (int16)")
+                {
+                    json const j = -9263;
+                    std::vector<uint8_t> const expected = {'I', 0xd1, 0xdb};
+
+                    // compare result + size
+                    const auto result = json::to_bjdata(j);
+                    CHECK(result == expected);
+                    CHECK(result.size() == 3);
+
+                    // check individual bytes
+                    CHECK(result[0] == 'I');
+                    auto const restored = static_cast<int16_t>(((result[2] << 8) + result[1]));
+                    CHECK(restored == -9263);
+
+                    // roundtrip
+                    CHECK(json::from_bjdata(result) == j);
+                    CHECK(json::from_bjdata(result, true, false) == j);
+                }
+
+                SECTION("-128..-1 (int8)")
+                {
+                    for (auto i = -128; i <= -1; ++i)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        json const j = i;
+
+                        // check type
+                        CHECK(j.is_number_integer());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            'i',
+                            static_cast<uint8_t>(i),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_bjdata(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 2);
+
+                        // check individual bytes
+                        CHECK(result[0] == 'i');
+                        CHECK(static_cast<int8_t>(result[1]) == i);
+
+                        // roundtrip
+                        CHECK(json::from_bjdata(result) == j);
+                        CHECK(json::from_bjdata(result, true, false) == j);
+                    }
+                }
+
+                SECTION("0..127 (int8)")
+                {
+                    for (size_t i = 0; i <= 127; ++i)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        json j = -1;
+                        j.get_ref<json::number_integer_t&>() = static_cast<json::number_integer_t>(i);
+
+                        // check type
+                        CHECK(j.is_number_integer());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            static_cast<uint8_t>('i'),
+                            static_cast<uint8_t>(i),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_bjdata(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 2);
+
+                        // check individual bytes
+                        CHECK(result[0] == 'i');
+                        CHECK(result[1] == i);
+
+                        // roundtrip
+                        CHECK(json::from_bjdata(result) == j);
+                        CHECK(json::from_bjdata(result, true, false) == j);
+                    }
+                }
+
+                SECTION("128..255 (uint8)")
+                {
+                    for (size_t i = 128; i <= 255; ++i)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        json j = -1;
+                        j.get_ref<json::number_integer_t&>() = static_cast<json::number_integer_t>(i);
+
+                        // check type
+                        CHECK(j.is_number_integer());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            static_cast<uint8_t>('U'),
+                            static_cast<uint8_t>(i),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_bjdata(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 2);
+
+                        // check individual bytes
+                        CHECK(result[0] == 'U');
+                        CHECK(result[1] == i);
+
+                        // roundtrip
+                        CHECK(json::from_bjdata(result) == j);
+                        CHECK(json::from_bjdata(result, true, false) == j);
+                    }
+                }
+
+                SECTION("256..32767 (int16)")
+                {
+                    for (size_t i = 256; i <= 32767; ++i)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        json j = -1;
+                        j.get_ref<json::number_integer_t&>() = static_cast<json::number_integer_t>(i);
+
+                        // check type
+                        CHECK(j.is_number_integer());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            static_cast<uint8_t>('I'),
+                            static_cast<uint8_t>(i & 0xff),
+                            static_cast<uint8_t>((i >> 8) & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_bjdata(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 3);
+
+                        // check individual bytes
+                        CHECK(result[0] == 'I');
+                        auto const restored = static_cast<uint16_t>(static_cast<uint8_t>(result[2]) * 256 + static_cast<uint8_t>(result[1]));
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_bjdata(result) == j);
+                        CHECK(json::from_bjdata(result, true, false) == j);
+                    }
+                }
+
+                SECTION("32768..65535 (uint16)")
+                {
+                    for (const uint32_t i :
+                            {
+                                32768u, 55555u, 65535u
+                            })
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        json j = -1;
+                        j.get_ref<json::number_integer_t&>() = static_cast<json::number_integer_t>(i);
+
+                        // check type
+                        CHECK(j.is_number_integer());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            static_cast<uint8_t>('u'),
+                            static_cast<uint8_t>(i & 0xff),
+                            static_cast<uint8_t>((i >> 8) & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_bjdata(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 3);
+
+                        // check individual bytes
+                        CHECK(result[0] == 'u');
+                        auto const restored = static_cast<uint16_t>(static_cast<uint8_t>(result[2]) * 256 + static_cast<uint8_t>(result[1]));
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_bjdata(result) == j);
+                        CHECK(json::from_bjdata(result, true, false) == j);
+                    }
+                }
+
+                SECTION("65536..2147483647 (int32)")
+                {
+                    for (const uint32_t i :
+                            {
+                                65536u, 77777u, 2147483647u
+                            })
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        json j = -1;
+                        j.get_ref<json::number_integer_t&>() = static_cast<json::number_integer_t>(i);
+
+                        // check type
+                        CHECK(j.is_number_integer());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            'l',
+                            static_cast<uint8_t>(i & 0xff),
+                            static_cast<uint8_t>((i >> 8) & 0xff),
+                            static_cast<uint8_t>((i >> 16) & 0xff),
+                            static_cast<uint8_t>((i >> 24) & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_bjdata(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 5);
+
+                        // check individual bytes
+                        CHECK(result[0] == 'l');
+                        uint32_t const restored = (static_cast<uint32_t>(result[4]) << 030) +
+                                                  (static_cast<uint32_t>(result[3]) << 020) +
+                                                  (static_cast<uint32_t>(result[2]) << 010) +
+                                                  static_cast<uint32_t>(result[1]);
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_bjdata(result) == j);
+                        CHECK(json::from_bjdata(result, true, false) == j);
+                    }
+                }
+
+                SECTION("2147483648..4294967295 (uint32)")
+                {
+                    for (const uint32_t i :
+                            {
+                                2147483648u, 3333333333u, 4294967295u
+                            })
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        json j = -1;
+                        j.get_ref<json::number_integer_t&>() = static_cast<json::number_integer_t>(i);
+
+                        // check type
+                        CHECK(j.is_number_integer());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            'm',
+                            static_cast<uint8_t>(i & 0xff),
+                            static_cast<uint8_t>((i >> 8) & 0xff),
+                            static_cast<uint8_t>((i >> 16) & 0xff),
+                            static_cast<uint8_t>((i >> 24) & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_bjdata(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 5);
+
+                        // check individual bytes
+                        CHECK(result[0] == 'm');
+                        uint32_t const restored = (static_cast<uint32_t>(result[4]) << 030) +
+                                                  (static_cast<uint32_t>(result[3]) << 020) +
+                                                  (static_cast<uint32_t>(result[2]) << 010) +
+                                                  static_cast<uint32_t>(result[1]);
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_bjdata(result) == j);
+                        CHECK(json::from_bjdata(result, true, false) == j);
+                    }
+                }
+
+                SECTION("4294967296..9223372036854775807 (int64)")
+                {
+                    std::vector<uint64_t> const v = {4294967296LU, 9223372036854775807LU};
+                    for (const uint64_t i : v)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        json j = -1;
+                        j.get_ref<json::number_integer_t&>() = static_cast<json::number_integer_t>(i);
+
+                        // check type
+                        CHECK(j.is_number_integer());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            'L',
+                            static_cast<uint8_t>(i & 0xff),
+                            static_cast<uint8_t>((i >> 010) & 0xff),
+                            static_cast<uint8_t>((i >> 020) & 0xff),
+                            static_cast<uint8_t>((i >> 030) & 0xff),
+                            static_cast<uint8_t>((i >> 040) & 0xff),
+                            static_cast<uint8_t>((i >> 050) & 0xff),
+                            static_cast<uint8_t>((i >> 060) & 0xff),
+                            static_cast<uint8_t>((i >> 070) & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_bjdata(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 9);
+
+                        // check individual bytes
+                        CHECK(result[0] == 'L');
+                        uint64_t const restored = (static_cast<uint64_t>(result[8]) << 070) +
+                                                  (static_cast<uint64_t>(result[7]) << 060) +
+                                                  (static_cast<uint64_t>(result[6]) << 050) +
+                                                  (static_cast<uint64_t>(result[5]) << 040) +
+                                                  (static_cast<uint64_t>(result[4]) << 030) +
+                                                  (static_cast<uint64_t>(result[3]) << 020) +
+                                                  (static_cast<uint64_t>(result[2]) << 010) +
+                                                  static_cast<uint64_t>(result[1]);
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_bjdata(result) == j);
+                        CHECK(json::from_bjdata(result, true, false) == j);
+                    }
+                }
+
+                SECTION("9223372036854775808..18446744073709551615 (uint64)")
+                {
+                    std::vector<uint64_t> const v = {9223372036854775808ull, 18446744073709551615ull};
+                    for (const uint64_t i : v)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        json const j = i;
+
+                        // check type
+                        CHECK(j.is_number_unsigned());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            'M',
+                            static_cast<uint8_t>(i & 0xff),
+                            static_cast<uint8_t>((i >> 010) & 0xff),
+                            static_cast<uint8_t>((i >> 020) & 0xff),
+                            static_cast<uint8_t>((i >> 030) & 0xff),
+                            static_cast<uint8_t>((i >> 040) & 0xff),
+                            static_cast<uint8_t>((i >> 050) & 0xff),
+                            static_cast<uint8_t>((i >> 060) & 0xff),
+                            static_cast<uint8_t>((i >> 070) & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_bjdata(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 9);
+
+                        // check individual bytes
+                        CHECK(result[0] == 'M');
+                        uint64_t const restored = (static_cast<uint64_t>(result[8]) << 070) +
+                                                  (static_cast<uint64_t>(result[7]) << 060) +
+                                                  (static_cast<uint64_t>(result[6]) << 050) +
+                                                  (static_cast<uint64_t>(result[5]) << 040) +
+                                                  (static_cast<uint64_t>(result[4]) << 030) +
+                                                  (static_cast<uint64_t>(result[3]) << 020) +
+                                                  (static_cast<uint64_t>(result[2]) << 010) +
+                                                  static_cast<uint64_t>(result[1]);
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_bjdata(result) == j);
+                        CHECK(json::from_bjdata(result, true, false) == j);
+                    }
+                }
+            }
+
+            SECTION("unsigned")
+            {
+                SECTION("0..127 (int8)")
+                {
+                    for (size_t i = 0; i <= 127; ++i)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with unsigned integer number
+                        json const j = i;
+
+                        // check type
+                        CHECK(j.is_number_unsigned());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected{'i', static_cast<uint8_t>(i)};
+
+                        // compare result + size
+                        const auto result = json::to_bjdata(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 2);
+
+                        // check individual bytes
+                        CHECK(result[0] == 'i');
+                        auto const restored = static_cast<uint8_t>(result[1]);
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_bjdata(result) == j);
+                        CHECK(json::from_bjdata(result, true, false) == j);
+                    }
+                }
+
+                SECTION("128..255 (uint8)")
+                {
+                    for (size_t i = 128; i <= 255; ++i)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with unsigned integer number
+                        json const j = i;
+
+                        // check type
+                        CHECK(j.is_number_unsigned());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected{'U', static_cast<uint8_t>(i)};
+
+                        // compare result + size
+                        const auto result = json::to_bjdata(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 2);
+
+                        // check individual bytes
+                        CHECK(result[0] == 'U');
+                        auto const restored = static_cast<uint8_t>(result[1]);
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_bjdata(result) == j);
+                        CHECK(json::from_bjdata(result, true, false) == j);
+                    }
+                }
+
+                SECTION("256..32767 (int16)")
+                {
+                    for (size_t i = 256; i <= 32767; ++i)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with unsigned integer number
+                        json const j = i;
+
+                        // check type
+                        CHECK(j.is_number_unsigned());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            'I',
+                            static_cast<uint8_t>(i & 0xff),
+                            static_cast<uint8_t>((i >> 8) & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_bjdata(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 3);
+
+                        // check individual bytes
+                        CHECK(result[0] == 'I');
+                        auto const restored = static_cast<uint16_t>(static_cast<uint8_t>(result[2]) * 256 + static_cast<uint8_t>(result[1]));
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_bjdata(result) == j);
+                        CHECK(json::from_bjdata(result, true, false) == j);
+                    }
+                }
+
+                SECTION("32768..65535 (uint16)")
+                {
+                    for (const uint32_t i :
+                            {
+                                32768u, 55555u, 65535u
+                            })
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with unsigned integer number
+                        json const j = i;
+
+                        // check type
+                        CHECK(j.is_number_unsigned());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            'u',
+                            static_cast<uint8_t>(i & 0xff),
+                            static_cast<uint8_t>((i >> 8) & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_bjdata(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 3);
+
+                        // check individual bytes
+                        CHECK(result[0] == 'u');
+                        auto const restored = static_cast<uint16_t>(static_cast<uint8_t>(result[2]) * 256 + static_cast<uint8_t>(result[1]));
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_bjdata(result) == j);
+                        CHECK(json::from_bjdata(result, true, false) == j);
+                    }
+                }
+                SECTION("65536..2147483647 (int32)")
+                {
+                    for (const uint32_t i :
+                            {
+                                65536u, 77777u, 2147483647u
+                            })
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with unsigned integer number
+                        json const j = i;
+
+                        // check type
+                        CHECK(j.is_number_unsigned());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            'l',
+                            static_cast<uint8_t>(i & 0xff),
+                            static_cast<uint8_t>((i >> 8) & 0xff),
+                            static_cast<uint8_t>((i >> 16) & 0xff),
+                            static_cast<uint8_t>((i >> 24) & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_bjdata(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 5);
+
+                        // check individual bytes
+                        CHECK(result[0] == 'l');
+                        uint32_t const restored = (static_cast<uint32_t>(result[4]) << 030) +
+                                                  (static_cast<uint32_t>(result[3]) << 020) +
+                                                  (static_cast<uint32_t>(result[2]) << 010) +
+                                                  static_cast<uint32_t>(result[1]);
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_bjdata(result) == j);
+                        CHECK(json::from_bjdata(result, true, false) == j);
+                    }
+                }
+
+                SECTION("2147483648..4294967295 (uint32)")
+                {
+                    for (const uint32_t i :
+                            {
+                                2147483648u, 3333333333u, 4294967295u
+                            })
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with unsigned integer number
+                        json const j = i;
+
+                        // check type
+                        CHECK(j.is_number_unsigned());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            'm',
+                            static_cast<uint8_t>(i & 0xff),
+                            static_cast<uint8_t>((i >> 8) & 0xff),
+                            static_cast<uint8_t>((i >> 16) & 0xff),
+                            static_cast<uint8_t>((i >> 24) & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_bjdata(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 5);
+
+                        // check individual bytes
+                        CHECK(result[0] == 'm');
+                        uint32_t const restored = (static_cast<uint32_t>(result[4]) << 030) +
+                                                  (static_cast<uint32_t>(result[3]) << 020) +
+                                                  (static_cast<uint32_t>(result[2]) << 010) +
+                                                  static_cast<uint32_t>(result[1]);
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_bjdata(result) == j);
+                        CHECK(json::from_bjdata(result, true, false) == j);
+                    }
+                }
+
+                SECTION("4294967296..9223372036854775807 (int64)")
+                {
+                    std::vector<uint64_t> const v = {4294967296ul, 9223372036854775807ul};
+                    for (const uint64_t i : v)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        json const j = i;
+
+                        // check type
+                        CHECK(j.is_number_unsigned());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            'L',
+                            static_cast<uint8_t>(i & 0xff),
+                            static_cast<uint8_t>((i >> 010) & 0xff),
+                            static_cast<uint8_t>((i >> 020) & 0xff),
+                            static_cast<uint8_t>((i >> 030) & 0xff),
+                            static_cast<uint8_t>((i >> 040) & 0xff),
+                            static_cast<uint8_t>((i >> 050) & 0xff),
+                            static_cast<uint8_t>((i >> 060) & 0xff),
+                            static_cast<uint8_t>((i >> 070) & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_bjdata(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 9);
+
+                        // check individual bytes
+                        CHECK(result[0] == 'L');
+                        uint64_t const restored = (static_cast<uint64_t>(result[8]) << 070) +
+                                                  (static_cast<uint64_t>(result[7]) << 060) +
+                                                  (static_cast<uint64_t>(result[6]) << 050) +
+                                                  (static_cast<uint64_t>(result[5]) << 040) +
+                                                  (static_cast<uint64_t>(result[4]) << 030) +
+                                                  (static_cast<uint64_t>(result[3]) << 020) +
+                                                  (static_cast<uint64_t>(result[2]) << 010) +
+                                                  static_cast<uint64_t>(result[1]);
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_bjdata(result) == j);
+                        CHECK(json::from_bjdata(result, true, false) == j);
+                    }
+                }
+
+                SECTION("9223372036854775808..18446744073709551615 (uint64)")
+                {
+                    std::vector<uint64_t> const v = {9223372036854775808ull, 18446744073709551615ull};
+                    for (const uint64_t i : v)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        json const j = i;
+
+                        // check type
+                        CHECK(j.is_number_unsigned());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            'M',
+                            static_cast<uint8_t>(i & 0xff),
+                            static_cast<uint8_t>((i >> 010) & 0xff),
+                            static_cast<uint8_t>((i >> 020) & 0xff),
+                            static_cast<uint8_t>((i >> 030) & 0xff),
+                            static_cast<uint8_t>((i >> 040) & 0xff),
+                            static_cast<uint8_t>((i >> 050) & 0xff),
+                            static_cast<uint8_t>((i >> 060) & 0xff),
+                            static_cast<uint8_t>((i >> 070) & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_bjdata(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 9);
+
+                        // check individual bytes
+                        CHECK(result[0] == 'M');
+                        uint64_t const restored = (static_cast<uint64_t>(result[8]) << 070) +
+                                                  (static_cast<uint64_t>(result[7]) << 060) +
+                                                  (static_cast<uint64_t>(result[6]) << 050) +
+                                                  (static_cast<uint64_t>(result[5]) << 040) +
+                                                  (static_cast<uint64_t>(result[4]) << 030) +
+                                                  (static_cast<uint64_t>(result[3]) << 020) +
+                                                  (static_cast<uint64_t>(result[2]) << 010) +
+                                                  static_cast<uint64_t>(result[1]);
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_bjdata(result) == j);
+                        CHECK(json::from_bjdata(result, true, false) == j);
+                    }
+                }
+            }
+            SECTION("float64")
+            {
+                SECTION("3.1415925")
+                {
+                    double v = 3.1415925;
+                    json const j = v;
+                    std::vector<uint8_t> const expected =
+                    {
+                        'D', 0xfc, 0xde, 0xa6, 0x3f, 0xfb, 0x21, 0x09, 0x40
+                    };
+                    const auto result = json::to_bjdata(j);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_bjdata(result) == j);
+                    CHECK(json::from_bjdata(result) == v);
+                    CHECK(json::from_bjdata(result, true, false) == j);
+                }
+            }
+
+            SECTION("half-precision float")
+            {
+                SECTION("simple half floats")
+                {
+                    CHECK(json::parse("0.0") == json::from_bjdata(std::vector<uint8_t>({'h', 0x00, 0x00})));
+                    CHECK(json::parse("-0.0") == json::from_bjdata(std::vector<uint8_t>({'h', 0x00, 0x80})));
+                    CHECK(json::parse("1.0") == json::from_bjdata(std::vector<uint8_t>({'h', 0x00, 0x3c})));
+                    CHECK(json::parse("1.5") == json::from_bjdata(std::vector<uint8_t>({'h', 0x00, 0x3e})));
+                    CHECK(json::parse("65504.0") == json::from_bjdata(std::vector<uint8_t>({'h', 0xff, 0x7b})));
+                }
+
+                SECTION("errors")
+                {
+                    SECTION("no byte follows")
+                    {
+                        json _;
+                        std::vector<uint8_t> const vec0 = {'h'};
+                        CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vec0), "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing BJData number: unexpected end of input", json::parse_error&);
+                        CHECK(json::from_bjdata(vec0, true, false).is_discarded());
+                    }
+
+                    SECTION("only one byte follows")
+                    {
+                        json _;
+                        std::vector<uint8_t> const vec1 = {'h', 0x00};
+                        CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vec1), "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing BJData number: unexpected end of input", json::parse_error&);
+                        CHECK(json::from_bjdata(vec1, true, false).is_discarded());
+                    }
+                }
+            }
+
+            SECTION("half-precision float (edge cases)")
+            {
+                SECTION("exp = 0b00000")
+                {
+                    SECTION("0 (0 00000 0000000000)")
+                    {
+                        json const j = json::from_bjdata(std::vector<uint8_t>({'h', 0x00, 0x00}));
+                        json::number_float_t d{j};
+                        CHECK(d == 0.0);
+                    }
+
+                    SECTION("-0 (1 00000 0000000000)")
+                    {
+                        json const j = json::from_bjdata(std::vector<uint8_t>({'h', 0x00, 0x80}));
+                        json::number_float_t d{j};
+                        CHECK(d == -0.0);
+                    }
+
+                    SECTION("2**-24 (0 00000 0000000001)")
+                    {
+                        json const j = json::from_bjdata(std::vector<uint8_t>({'h', 0x01, 0x00}));
+                        json::number_float_t d{j};
+                        CHECK(d == std::pow(2.0, -24.0));
+                    }
+                }
+
+                SECTION("exp = 0b11111")
+                {
+                    SECTION("infinity (0 11111 0000000000)")
+                    {
+                        json const j = json::from_bjdata(std::vector<uint8_t>({'h', 0x00, 0x7c}));
+                        json::number_float_t d{j};
+                        CHECK(d == std::numeric_limits<json::number_float_t>::infinity());
+                        CHECK(j.dump() == "null");
+                    }
+
+                    SECTION("-infinity (1 11111 0000000000)")
+                    {
+                        json const j = json::from_bjdata(std::vector<uint8_t>({'h', 0x00, 0xfc}));
+                        json::number_float_t d{j};
+                        CHECK(d == -std::numeric_limits<json::number_float_t>::infinity());
+                        CHECK(j.dump() == "null");
+                    }
+                }
+
+                SECTION("other values from https://en.wikipedia.org/wiki/Half-precision_floating-point_format")
+                {
+                    SECTION("1 (0 01111 0000000000)")
+                    {
+                        json const j = json::from_bjdata(std::vector<uint8_t>({'h', 0x00, 0x3c}));
+                        json::number_float_t d{j};
+                        CHECK(d == 1);
+                    }
+
+                    SECTION("-2 (1 10000 0000000000)")
+                    {
+                        json const j = json::from_bjdata(std::vector<uint8_t>({'h', 0x00, 0xc0}));
+                        json::number_float_t d{j};
+                        CHECK(d == -2);
+                    }
+
+                    SECTION("65504 (0 11110 1111111111)")
+                    {
+                        json const j = json::from_bjdata(std::vector<uint8_t>({'h', 0xff, 0x7b}));
+                        json::number_float_t d{j};
+                        CHECK(d == 65504);
+                    }
+                }
+
+                SECTION("infinity")
+                {
+                    json const j = json::from_bjdata(std::vector<uint8_t>({'h', 0x00, 0x7c}));
+                    json::number_float_t const d{j};
+                    CHECK_FALSE(std::isfinite(d));
+                    CHECK(j.dump() == "null");
+                }
+
+                SECTION("NaN")
+                {
+                    json const j = json::from_bjdata(std::vector<uint8_t>({'h', 0x00, 0x7e }));
+                    json::number_float_t const d{j};
+                    CHECK(std::isnan(d));
+                    CHECK(j.dump() == "null");
+                }
+            }
+
+            SECTION("high-precision number")
+            {
+                SECTION("unsigned integer number")
+                {
+                    std::vector<uint8_t> const vec = {'H', 'i', 0x14, '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0'};
+                    const auto j = json::from_bjdata(vec);
+                    CHECK(j.is_number_unsigned());
+                    CHECK(j.dump() == "12345678901234567890");
+                }
+
+                SECTION("signed integer number")
+                {
+                    std::vector<uint8_t> const vec = {'H', 'i', 0x13, '-', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '1', '2', '3', '4', '5', '6', '7', '8'};
+                    const auto j = json::from_bjdata(vec);
+                    CHECK(j.is_number_integer());
+                    CHECK(j.dump() == "-123456789012345678");
+                }
+
+                SECTION("floating-point number")
+                {
+                    std::vector<uint8_t> const vec = {'H', 'i', 0x16, '3', '.', '1', '4', '1', '5', '9',  '2', '6', '5', '3', '5', '8', '9',  '7', '9', '3', '2', '3', '8', '4',  '6'};
+                    const auto j = json::from_bjdata(vec);
+                    CHECK(j.is_number_float());
+                    CHECK(j.dump() == "3.141592653589793");
+                }
+
+                SECTION("errors")
+                {
+                    // error while parsing length
+                    std::vector<uint8_t> const vec0 = {'H', 'i'};
+                    CHECK(json::from_bjdata(vec0, true, false).is_discarded());
+                    // error while parsing string
+                    std::vector<uint8_t> const vec1 = {'H', 'i', '1'};
+                    CHECK(json::from_bjdata(vec1, true, false).is_discarded());
+
+                    json _;
+                    std::vector<uint8_t> const vec2 = {'H', 'i', 2, '1', 'A', '3'};
+                    CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vec2), "[json.exception.parse_error.115] parse error at byte 5: syntax error while parsing BJData high-precision number: invalid number text: 1A", json::parse_error);
+                    std::vector<uint8_t> const vec3 = {'H', 'i', 2, '1', '.'};
+                    CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vec3), "[json.exception.parse_error.115] parse error at byte 5: syntax error while parsing BJData high-precision number: invalid number text: 1.", json::parse_error);
+                    std::vector<uint8_t> const vec4 = {'H', 2, '1', '0'};
+                    CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vec4), "[json.exception.parse_error.113] parse error at byte 2: syntax error while parsing BJData size: expected length type specification (U, i, u, I, m, l, M, L) after '#'; last byte: 0x02", json::parse_error);
+                }
+            }
+        }
+
+        SECTION("string")
+        {
+            SECTION("N = 0..127")
+            {
+                for (size_t N = 0; N <= 127; ++N)
+                {
+                    CAPTURE(N)
+
+                    // create JSON value with string containing of N * 'x'
+                    const auto s = std::string(N, 'x');
+                    json const j = s;
+
+                    // create expected byte vector
+                    std::vector<uint8_t> expected;
+                    expected.push_back('S');
+                    expected.push_back('i');
+                    expected.push_back(static_cast<uint8_t>(N));
+                    for (size_t i = 0; i < N; ++i)
+                    {
+                        expected.push_back('x');
+                    }
+
+                    // compare result + size
+                    const auto result = json::to_bjdata(j);
+                    CHECK(result == expected);
+                    CHECK(result.size() == N + 3);
+                    // check that no null byte is appended
+                    if (N > 0)
+                    {
+                        CHECK(result.back() != '\x00');
+                    }
+
+                    // roundtrip
+                    CHECK(json::from_bjdata(result) == j);
+                    CHECK(json::from_bjdata(result, true, false) == j);
+                }
+            }
+
+            SECTION("N = 128..255")
+            {
+                for (size_t N = 128; N <= 255; ++N)
+                {
+                    CAPTURE(N)
+
+                    // create JSON value with string containing of N * 'x'
+                    const auto s = std::string(N, 'x');
+                    json const j = s;
+
+                    // create expected byte vector
+                    std::vector<uint8_t> expected;
+                    expected.push_back('S');
+                    expected.push_back('U');
+                    expected.push_back(static_cast<uint8_t>(N));
+                    for (size_t i = 0; i < N; ++i)
+                    {
+                        expected.push_back('x');
+                    }
+
+                    // compare result + size
+                    const auto result = json::to_bjdata(j);
+                    CHECK(result == expected);
+                    CHECK(result.size() == N + 3);
+                    // check that no null byte is appended
+                    CHECK(result.back() != '\x00');
+
+                    // roundtrip
+                    CHECK(json::from_bjdata(result) == j);
+                    CHECK(json::from_bjdata(result, true, false) == j);
+                }
+            }
+
+            SECTION("N = 256..32767")
+            {
+                for (const size_t N :
+                        {
+                            256u, 999u, 1025u, 3333u, 2048u, 32767u
+                        })
+                {
+                    CAPTURE(N)
+
+                    // create JSON value with string containing of N * 'x'
+                    const auto s = std::string(N, 'x');
+                    json const j = s;
+
+                    // create expected byte vector (hack: create string first)
+                    std::vector<uint8_t> expected(N, 'x');
+                    // reverse order of commands, because we insert at begin()
+                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 8) & 0xff));
+                    expected.insert(expected.begin(), static_cast<uint8_t>(N & 0xff));
+                    expected.insert(expected.begin(), 'I');
+                    expected.insert(expected.begin(), 'S');
+
+                    // compare result + size
+                    const auto result = json::to_bjdata(j);
+                    CHECK(result == expected);
+                    CHECK(result.size() == N + 4);
+                    // check that no null byte is appended
+                    CHECK(result.back() != '\x00');
+
+                    // roundtrip
+                    CHECK(json::from_bjdata(result) == j);
+                    CHECK(json::from_bjdata(result, true, false) == j);
+                }
+            }
+
+            SECTION("N = 32768..65535")
+            {
+                for (const size_t N :
+                        {
+                            32768u, 55555u, 65535u
+                        })
+                {
+                    CAPTURE(N)
+
+                    // create JSON value with string containing of N * 'x'
+                    const auto s = std::string(N, 'x');
+                    json const j = s;
+
+                    // create expected byte vector (hack: create string first)
+                    std::vector<uint8_t> expected(N, 'x');
+                    // reverse order of commands, because we insert at begin()
+                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 8) & 0xff));
+                    expected.insert(expected.begin(), static_cast<uint8_t>(N & 0xff));
+                    expected.insert(expected.begin(), 'u');
+                    expected.insert(expected.begin(), 'S');
+
+                    // compare result + size
+                    const auto result = json::to_bjdata(j);
+                    CHECK(result == expected);
+                    CHECK(result.size() == N + 4);
+                    // check that no null byte is appended
+                    CHECK(result.back() != '\x00');
+
+                    // roundtrip
+                    CHECK(json::from_bjdata(result) == j);
+                    CHECK(json::from_bjdata(result, true, false) == j);
+                }
+            }
+
+            SECTION("N = 65536..2147483647")
+            {
+                for (const size_t N :
+                        {
+                            65536u, 77777u, 1048576u
+                        })
+                {
+                    CAPTURE(N)
+
+                    // create JSON value with string containing of N * 'x'
+                    const auto s = std::string(N, 'x');
+                    json const j = s;
+
+                    // create expected byte vector (hack: create string first)
+                    std::vector<uint8_t> expected(N, 'x');
+                    // reverse order of commands, because we insert at begin()
+                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 24) & 0xff));
+                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 16) & 0xff));
+                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 8) & 0xff));
+                    expected.insert(expected.begin(), static_cast<uint8_t>(N & 0xff));
+                    expected.insert(expected.begin(), 'l');
+                    expected.insert(expected.begin(), 'S');
+
+                    // compare result + size
+                    const auto result = json::to_bjdata(j);
+                    CHECK(result == expected);
+                    CHECK(result.size() == N + 6);
+                    // check that no null byte is appended
+                    CHECK(result.back() != '\x00');
+
+                    // roundtrip
+                    CHECK(json::from_bjdata(result) == j);
+                    CHECK(json::from_bjdata(result, true, false) == j);
+                }
+            }
+        }
+
+        SECTION("binary")
+        {
+            SECTION("N = 0..127")
+            {
+                for (std::size_t N = 0; N <= 127; ++N)
+                {
+                    CAPTURE(N)
+
+                    // create JSON value with byte array containing of N * 'x'
+                    const auto s = std::vector<std::uint8_t>(N, 'x');
+                    json const j = json::binary(s);
+
+                    // create expected byte vector
+                    std::vector<std::uint8_t> expected;
+                    expected.push_back(static_cast<std::uint8_t>('['));
+                    if (N != 0)
+                    {
+                        expected.push_back(static_cast<std::uint8_t>('$'));
+                        expected.push_back(static_cast<std::uint8_t>('U'));
+                    }
+                    expected.push_back(static_cast<std::uint8_t>('#'));
+                    expected.push_back(static_cast<std::uint8_t>('i'));
+                    expected.push_back(static_cast<std::uint8_t>(N));
+                    for (size_t i = 0; i < N; ++i)
+                    {
+                        expected.push_back(0x78);
+                    }
+
+                    // compare result + size
+                    const auto result = json::to_bjdata(j, true, true);
+                    CHECK(result == expected);
+                    if (N == 0)
+                    {
+                        CHECK(result.size() == N + 4);
+                    }
+                    else
+                    {
+                        CHECK(result.size() == N + 6);
+                    }
+
+                    // check that no null byte is appended
+                    if (N > 0)
+                    {
+                        CHECK(result.back() != '\x00');
+                    }
+
+                    // roundtrip only works to an array of numbers
+                    json j_out = s;
+                    CHECK(json::from_bjdata(result) == j_out);
+                    CHECK(json::from_bjdata(result, true, false) == j_out);
+                }
+            }
+
+            SECTION("N = 128..255")
+            {
+                for (std::size_t N = 128; N <= 255; ++N)
+                {
+                    CAPTURE(N)
+
+                    // create JSON value with byte array containing of N * 'x'
+                    const auto s = std::vector<std::uint8_t>(N, 'x');
+                    json const j = json::binary(s);
+
+                    // create expected byte vector
+                    std::vector<uint8_t> expected;
+                    expected.push_back(static_cast<std::uint8_t>('['));
+                    expected.push_back(static_cast<std::uint8_t>('$'));
+                    expected.push_back(static_cast<std::uint8_t>('U'));
+                    expected.push_back(static_cast<std::uint8_t>('#'));
+                    expected.push_back(static_cast<std::uint8_t>('U'));
+                    expected.push_back(static_cast<std::uint8_t>(N));
+                    for (size_t i = 0; i < N; ++i)
+                    {
+                        expected.push_back(0x78);
+                    }
+
+                    // compare result + size
+                    const auto result = json::to_bjdata(j, true, true);
+                    CHECK(result == expected);
+                    CHECK(result.size() == N + 6);
+                    // check that no null byte is appended
+                    CHECK(result.back() != '\x00');
+
+                    // roundtrip only works to an array of numbers
+                    json j_out = s;
+                    CHECK(json::from_bjdata(result) == j_out);
+                    CHECK(json::from_bjdata(result, true, false) == j_out);
+                }
+            }
+
+            SECTION("N = 256..32767")
+            {
+                for (const std::size_t N :
+                        {
+                            256u, 999u, 1025u, 3333u, 2048u, 32767u
+                        })
+                {
+                    CAPTURE(N)
+
+                    // create JSON value with byte array containing of N * 'x'
+                    const auto s = std::vector<std::uint8_t>(N, 'x');
+                    json const j = json::binary(s);
+
+                    // create expected byte vector
+                    std::vector<std::uint8_t> expected(N + 7, 'x');
+                    expected[0] = '[';
+                    expected[1] = '$';
+                    expected[2] = 'U';
+                    expected[3] = '#';
+                    expected[4] = 'I';
+                    expected[5] = static_cast<std::uint8_t>(N & 0xFF);
+                    expected[6] = static_cast<std::uint8_t>((N >> 8) & 0xFF);
+
+                    // compare result + size
+                    const auto result = json::to_bjdata(j, true, true);
+                    CHECK(result == expected);
+                    CHECK(result.size() == N + 7);
+                    // check that no null byte is appended
+                    CHECK(result.back() != '\x00');
+
+                    // roundtrip only works to an array of numbers
+                    json j_out = s;
+                    CHECK(json::from_bjdata(result) == j_out);
+                    CHECK(json::from_bjdata(result, true, false) == j_out);
+                }
+            }
+
+            SECTION("N = 32768..65535")
+            {
+                for (const std::size_t N :
+                        {
+                            32768u, 55555u, 65535u
+                        })
+                {
+                    CAPTURE(N)
+
+                    // create JSON value with byte array containing of N * 'x'
+                    const auto s = std::vector<std::uint8_t>(N, 'x');
+                    json const j = json::binary(s);
+
+                    // create expected byte vector
+                    std::vector<std::uint8_t> expected(N + 7, 'x');
+                    expected[0] = '[';
+                    expected[1] = '$';
+                    expected[2] = 'U';
+                    expected[3] = '#';
+                    expected[4] = 'u';
+                    expected[5] = static_cast<std::uint8_t>(N & 0xFF);
+                    expected[6] = static_cast<std::uint8_t>((N >> 8) & 0xFF);
+
+                    // compare result + size
+                    const auto result = json::to_bjdata(j, true, true);
+                    CHECK(result == expected);
+                    CHECK(result.size() == N + 7);
+                    // check that no null byte is appended
+                    CHECK(result.back() != '\x00');
+
+                    // roundtrip only works to an array of numbers
+                    json j_out = s;
+                    CHECK(json::from_bjdata(result) == j_out);
+                    CHECK(json::from_bjdata(result, true, false) == j_out);
+                }
+            }
+
+            SECTION("N = 65536..2147483647")
+            {
+                for (const std::size_t N :
+                        {
+                            65536u, 77777u, 1048576u
+                        })
+                {
+                    CAPTURE(N)
+
+                    // create JSON value with byte array containing of N * 'x'
+                    const auto s = std::vector<std::uint8_t>(N, 'x');
+                    json const j = json::binary(s);
+
+                    // create expected byte vector
+                    std::vector<std::uint8_t> expected(N + 9, 'x');
+                    expected[0] = '[';
+                    expected[1] = '$';
+                    expected[2] = 'U';
+                    expected[3] = '#';
+                    expected[4] = 'l';
+                    expected[5] = static_cast<std::uint8_t>(N & 0xFF);
+                    expected[6] = static_cast<std::uint8_t>((N >> 8) & 0xFF);
+                    expected[7] = static_cast<std::uint8_t>((N >> 16) & 0xFF);
+                    expected[8] = static_cast<std::uint8_t>((N >> 24) & 0xFF);
+
+                    // compare result + size
+                    const auto result = json::to_bjdata(j, true, true);
+                    CHECK(result == expected);
+                    CHECK(result.size() == N + 9);
+                    // check that no null byte is appended
+                    CHECK(result.back() != '\x00');
+
+                    // roundtrip only works to an array of numbers
+                    json j_out = s;
+                    CHECK(json::from_bjdata(result) == j_out);
+                    CHECK(json::from_bjdata(result, true, false) == j_out);
+                }
+            }
+
+            SECTION("Other Serializations")
+            {
+                const std::size_t N = 10;
+                const auto s = std::vector<std::uint8_t>(N, 'x');
+                json const j = json::binary(s);
+
+                SECTION("No Count No Type")
+                {
+                    std::vector<uint8_t> expected;
+                    expected.push_back(static_cast<std::uint8_t>('['));
+                    for (std::size_t i = 0; i < N; ++i)
+                    {
+                        expected.push_back(static_cast<std::uint8_t>('U'));
+                        expected.push_back(static_cast<std::uint8_t>(0x78));
+                    }
+                    expected.push_back(static_cast<std::uint8_t>(']'));
+
+                    // compare result + size
+                    const auto result = json::to_bjdata(j, false, false);
+                    CHECK(result == expected);
+                    CHECK(result.size() == N + 12);
+                    // check that no null byte is appended
+                    CHECK(result.back() != '\x00');
+
+                    // roundtrip only works to an array of numbers
+                    json j_out = s;
+                    CHECK(json::from_bjdata(result) == j_out);
+                    CHECK(json::from_bjdata(result, true, false) == j_out);
+                }
+
+                SECTION("Yes Count No Type")
+                {
+                    std::vector<std::uint8_t> expected;
+                    expected.push_back(static_cast<std::uint8_t>('['));
+                    expected.push_back(static_cast<std::uint8_t>('#'));
+                    expected.push_back(static_cast<std::uint8_t>('i'));
+                    expected.push_back(static_cast<std::uint8_t>(N));
+
+                    for (size_t i = 0; i < N; ++i)
+                    {
+                        expected.push_back(static_cast<std::uint8_t>('U'));
+                        expected.push_back(static_cast<std::uint8_t>(0x78));
+                    }
+
+                    // compare result + size
+                    const auto result = json::to_bjdata(j, true, false);
+                    CHECK(result == expected);
+                    CHECK(result.size() == N + 14);
+                    // check that no null byte is appended
+                    CHECK(result.back() != '\x00');
+
+                    // roundtrip only works to an array of numbers
+                    json j_out = s;
+                    CHECK(json::from_bjdata(result) == j_out);
+                    CHECK(json::from_bjdata(result, true, false) == j_out);
+                }
+            }
+        }
+        SECTION("array")
+        {
+            SECTION("empty")
+            {
+                SECTION("size=false type=false")
+                {
+                    json const j = json::array();
+                    std::vector<uint8_t> const expected = {'[', ']'};
+                    const auto result = json::to_bjdata(j);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_bjdata(result) == j);
+                    CHECK(json::from_bjdata(result, true, false) == j);
+                }
+
+                SECTION("size=true type=false")
+                {
+                    json const j = json::array();
+                    std::vector<uint8_t> const expected = {'[', '#', 'i', 0};
+                    const auto result = json::to_bjdata(j, true);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_bjdata(result) == j);
+                    CHECK(json::from_bjdata(result, true, false) == j);
+                }
+
+                SECTION("size=true type=true")
+                {
+                    json const j = json::array();
+                    std::vector<uint8_t> const expected = {'[', '#', 'i', 0};
+                    const auto result = json::to_bjdata(j, true, true);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_bjdata(result) == j);
+                    CHECK(json::from_bjdata(result, true, false) == j);
+                }
+            }
+
+            SECTION("[null]")
+            {
+                SECTION("size=false type=false")
+                {
+                    json const j = {nullptr};
+                    std::vector<uint8_t> const expected = {'[', 'Z', ']'};
+                    const auto result = json::to_bjdata(j);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_bjdata(result) == j);
+                    CHECK(json::from_bjdata(result, true, false) == j);
+                }
+
+                SECTION("size=true type=false")
+                {
+                    json const j = {nullptr};
+                    std::vector<uint8_t> const expected = {'[', '#', 'i', 1, 'Z'};
+                    const auto result = json::to_bjdata(j, true);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_bjdata(result) == j);
+                    CHECK(json::from_bjdata(result, true, false) == j);
+                }
+
+                SECTION("size=true type=true")
+                {
+                    json const j = {nullptr};
+                    std::vector<uint8_t> const expected = {'[', '#', 'i', 1, 'Z'};
+                    const auto result = json::to_bjdata(j, true, true);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_bjdata(result) == j);
+                    CHECK(json::from_bjdata(result, true, false) == j);
+                }
+            }
+
+            SECTION("[1,2,3,4,5]")
+            {
+                SECTION("size=false type=false")
+                {
+                    json const j = json::parse("[1,2,3,4,5]");
+                    std::vector<uint8_t> const expected = {'[', 'i', 1, 'i', 2, 'i', 3, 'i', 4, 'i', 5, ']'};
+                    const auto result = json::to_bjdata(j);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_bjdata(result) == j);
+                    CHECK(json::from_bjdata(result, true, false) == j);
+                }
+
+                SECTION("size=true type=false")
+                {
+                    json const j = json::parse("[1,2,3,4,5]");
+                    std::vector<uint8_t> const expected = {'[', '#', 'i', 5, 'i', 1, 'i', 2, 'i', 3, 'i', 4, 'i', 5};
+                    const auto result = json::to_bjdata(j, true);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_bjdata(result) == j);
+                    CHECK(json::from_bjdata(result, true, false) == j);
+                }
+
+                SECTION("size=true type=true")
+                {
+                    json const j = json::parse("[1,2,3,4,5]");
+                    std::vector<uint8_t> const expected = {'[', '$', 'i', '#', 'i', 5, 1, 2, 3, 4, 5};
+                    const auto result = json::to_bjdata(j, true, true);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_bjdata(result) == j);
+                    CHECK(json::from_bjdata(result, true, false) == j);
+                }
+            }
+
+            SECTION("[[[[]]]]")
+            {
+                SECTION("size=false type=false")
+                {
+                    json const j = json::parse("[[[[]]]]");
+                    std::vector<uint8_t> const expected = {'[', '[', '[', '[', ']', ']', ']', ']'};
+                    const auto result = json::to_bjdata(j);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_bjdata(result) == j);
+                    CHECK(json::from_bjdata(result, true, false) == j);
+                }
+
+                SECTION("size=true type=false")
+                {
+                    json const j = json::parse("[[[[]]]]");
+                    std::vector<uint8_t> const expected = {'[', '#', 'i', 1, '[', '#', 'i', 1, '[', '#', 'i', 1, '[', '#', 'i', 0};
+                    const auto result = json::to_bjdata(j, true);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_bjdata(result) == j);
+                    CHECK(json::from_bjdata(result, true, false) == j);
+                }
+
+                SECTION("size=true type=true")
+                {
+                    json const j = json::parse("[[[[]]]]");
+                    std::vector<uint8_t> const expected = {'[', '#', 'i', 1, '[', '#', 'i', 1, '[', '#', 'i', 1, '[', '#', 'i', 0};
+                    const auto result = json::to_bjdata(j, true, true);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_bjdata(result) == j);
+                    CHECK(json::from_bjdata(result, true, false) == j);
+                }
+            }
+
+            SECTION("array with int16_t elements")
+            {
+                SECTION("size=false type=false")
+                {
+                    json j(257, nullptr);
+                    std::vector<uint8_t> expected(j.size() + 2, 'Z'); // all null
+                    expected[0] = '['; // opening array
+                    expected[258] = ']'; // closing array
+                    const auto result = json::to_bjdata(j);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_bjdata(result) == j);
+                    CHECK(json::from_bjdata(result, true, false) == j);
+                }
+
+                SECTION("size=true type=false")
+                {
+                    json j(257, nullptr);
+                    std::vector<uint8_t> expected(j.size() + 5, 'Z'); // all null
+                    expected[0] = '['; // opening array
+                    expected[1] = '#'; // array size
+                    expected[2] = 'I'; // int16
+                    expected[3] = 0x01; // 0x0101, first byte
+                    expected[4] = 0x01; // 0x0101, second byte
+                    const auto result = json::to_bjdata(j, true);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_bjdata(result) == j);
+                    CHECK(json::from_bjdata(result, true, false) == j);
+                }
+            }
+
+            SECTION("array with uint16_t elements")
+            {
+                SECTION("size=false type=false")
+                {
+                    json j(32768, nullptr);
+                    std::vector<uint8_t> expected(j.size() + 2, 'Z'); // all null
+                    expected[0] = '['; // opening array
+                    expected[32769] = ']'; // closing array
+                    const auto result = json::to_bjdata(j);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_bjdata(result) == j);
+                    CHECK(json::from_bjdata(result, true, false) == j);
+                }
+
+                SECTION("size=true type=false")
+                {
+                    json j(32768, nullptr);
+                    std::vector<uint8_t> expected(j.size() + 5, 'Z'); // all null
+                    expected[0] = '['; // opening array
+                    expected[1] = '#'; // array size
+                    expected[2] = 'u'; // int16
+                    expected[3] = 0x00; // 0x0101, first byte
+                    expected[4] = 0x80; // 0x0101, second byte
+                    const auto result = json::to_bjdata(j, true);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_bjdata(result) == j);
+                    CHECK(json::from_bjdata(result, true, false) == j);
+                }
+            }
+
+            SECTION("array with int32_t elements")
+            {
+                SECTION("size=false type=false")
+                {
+                    json j(65793, nullptr);
+                    std::vector<uint8_t> expected(j.size() + 2, 'Z'); // all null
+                    expected[0] = '['; // opening array
+                    expected[65794] = ']'; // closing array
+                    const auto result = json::to_bjdata(j);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_bjdata(result) == j);
+                    CHECK(json::from_bjdata(result, true, false) == j);
+                }
+
+                SECTION("size=true type=false")
+                {
+                    json j(65793, nullptr);
+                    std::vector<uint8_t> expected(j.size() + 7, 'Z'); // all null
+                    expected[0] = '['; // opening array
+                    expected[1] = '#'; // array size
+                    expected[2] = 'l'; // int32
+                    expected[3] = 0x01; // 0x00010101, fourth byte
+                    expected[4] = 0x01; // 0x00010101, third byte
+                    expected[5] = 0x01; // 0x00010101, second byte
+                    expected[6] = 0x00; // 0x00010101, first byte
+                    const auto result = json::to_bjdata(j, true);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_bjdata(result) == j);
+                    CHECK(json::from_bjdata(result, true, false) == j);
+                }
+            }
+        }
+
+        SECTION("object")
+        {
+            SECTION("empty")
+            {
+                SECTION("size=false type=false")
+                {
+                    json const j = json::object();
+                    std::vector<uint8_t> const expected = {'{', '}'};
+                    const auto result = json::to_bjdata(j);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_bjdata(result) == j);
+                    CHECK(json::from_bjdata(result, true, false) == j);
+                }
+
+                SECTION("size=true type=false")
+                {
+                    json const j = json::object();
+                    std::vector<uint8_t> const expected = {'{', '#', 'i', 0};
+                    const auto result = json::to_bjdata(j, true);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_bjdata(result) == j);
+                    CHECK(json::from_bjdata(result, true, false) == j);
+                }
+
+                SECTION("size=true type=true")
+                {
+                    json const j = json::object();
+                    std::vector<uint8_t> const expected = {'{', '#', 'i', 0};
+                    const auto result = json::to_bjdata(j, true, true);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_bjdata(result) == j);
+                    CHECK(json::from_bjdata(result, true, false) == j);
+                }
+            }
+
+            SECTION("{\"\":null}")
+            {
+                SECTION("size=false type=false")
+                {
+                    json const j = {{"", nullptr}};
+                    std::vector<uint8_t> const expected = {'{', 'i', 0, 'Z', '}'};
+                    const auto result = json::to_bjdata(j);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_bjdata(result) == j);
+                    CHECK(json::from_bjdata(result, true, false) == j);
+                }
+
+                SECTION("size=true type=false")
+                {
+                    json const j = {{"", nullptr}};
+                    std::vector<uint8_t> const expected = {'{', '#', 'i', 1, 'i', 0, 'Z'};
+                    const auto result = json::to_bjdata(j, true);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_bjdata(result) == j);
+                    CHECK(json::from_bjdata(result, true, false) == j);
+                }
+            }
+
+            SECTION("{\"a\": {\"b\": {\"c\": {}}}}")
+            {
+                SECTION("size=false type=false")
+                {
+                    json const j = json::parse(R"({"a": {"b": {"c": {}}}})");
+                    std::vector<uint8_t> const expected =
+                    {
+                        '{', 'i', 1, 'a', '{', 'i', 1, 'b', '{', 'i', 1, 'c', '{', '}', '}', '}', '}'
+                    };
+                    const auto result = json::to_bjdata(j);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_bjdata(result) == j);
+                    CHECK(json::from_bjdata(result, true, false) == j);
+                }
+
+                SECTION("size=true type=false")
+                {
+                    json const j = json::parse(R"({"a": {"b": {"c": {}}}})");
+                    std::vector<uint8_t> const expected =
+                    {
+                        '{', '#', 'i', 1, 'i', 1, 'a', '{', '#', 'i', 1, 'i', 1, 'b', '{', '#', 'i', 1, 'i', 1, 'c', '{', '#', 'i', 0
+                    };
+                    const auto result = json::to_bjdata(j, true);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_bjdata(result) == j);
+                    CHECK(json::from_bjdata(result, true, false) == j);
+                }
+
+                SECTION("size=true type=true ignore object type marker")
+                {
+                    json const j = json::parse(R"({"a": {"b": {"c": {}}}})");
+                    std::vector<uint8_t> const expected =
+                    {
+                        '{', '#', 'i', 1, 'i', 1, 'a', '{', '#', 'i', 1, 'i', 1, 'b', '{', '#', 'i', 1, 'i', 1, 'c', '{', '#', 'i', 0
+                    };
+                    const auto result = json::to_bjdata(j, true, true);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_bjdata(result) == j);
+                    CHECK(json::from_bjdata(result, true, false) == j);
+                }
+            }
+        }
+    }
+
+    SECTION("errors")
+    {
+        SECTION("strict mode")
+        {
+            std::vector<uint8_t> const vec = {'Z', 'Z'};
+            SECTION("non-strict mode")
+            {
+                const auto result = json::from_bjdata(vec, false);
+                CHECK(result == json());
+            }
+
+            SECTION("strict mode")
+            {
+                json _;
+                CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vec),
+                                     "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing BJData value: expected end of input; last byte: 0x5A", json::parse_error&);
+            }
+        }
+    }
+
+    SECTION("SAX aborts")
+    {
+        SECTION("start_array()")
+        {
+            std::vector<uint8_t> const v = {'[', 'T', 'F', ']'};
+            SaxCountdown scp(0);
+            CHECK_FALSE(json::sax_parse(v, &scp, json::input_format_t::bjdata));
+        }
+
+        SECTION("start_object()")
+        {
+            std::vector<uint8_t> const v = {'{', 'i', 3, 'f', 'o', 'o', 'F', '}'};
+            SaxCountdown scp(0);
+            CHECK_FALSE(json::sax_parse(v, &scp, json::input_format_t::bjdata));
+        }
+
+        SECTION("key() in object")
+        {
+            std::vector<uint8_t> const v = {'{', 'i', 3, 'f', 'o', 'o', 'F', '}'};
+            SaxCountdown scp(1);
+            CHECK_FALSE(json::sax_parse(v, &scp, json::input_format_t::bjdata));
+        }
+
+        SECTION("start_array(len)")
+        {
+            std::vector<uint8_t> const v = {'[', '#', 'i', '2', 'T', 'F'};
+            SaxCountdown scp(0);
+            CHECK_FALSE(json::sax_parse(v, &scp, json::input_format_t::bjdata));
+        }
+
+        SECTION("start_object(len)")
+        {
+            std::vector<uint8_t> const v = {'{', '#', 'i', '1', 3, 'f', 'o', 'o', 'F'};
+            SaxCountdown scp(0);
+            CHECK_FALSE(json::sax_parse(v, &scp, json::input_format_t::bjdata));
+        }
+
+        SECTION("key() in object with length")
+        {
+            std::vector<uint8_t> const v = {'{', 'i', 3, 'f', 'o', 'o', 'F', '}'};
+            SaxCountdown scp(1);
+            CHECK_FALSE(json::sax_parse(v, &scp, json::input_format_t::bjdata));
+        }
+
+        SECTION("start_array() in ndarray _ArraySize_")
+        {
+            std::vector<uint8_t> const v = {'[', '$', 'i', '#', '[', '$', 'i', '#', 'i', 2, 2, 1, 1, 2};
+            SaxCountdown scp(2);
+            CHECK_FALSE(json::sax_parse(v, &scp, json::input_format_t::bjdata));
+        }
+
+        SECTION("number_integer() in ndarray _ArraySize_")
+        {
+            std::vector<uint8_t> const v = {'[', '$', 'U', '#', '[', '$', 'i', '#', 'i', 2, 2, 1, 1, 2};
+            SaxCountdown scp(3);
+            CHECK_FALSE(json::sax_parse(v, &scp, json::input_format_t::bjdata));
+        }
+
+        SECTION("key() in ndarray _ArrayType_")
+        {
+            std::vector<uint8_t> const v = {'[', '$', 'U', '#', '[', '$', 'U', '#', 'i', 2, 2, 2, 1, 2, 3, 4};
+            SaxCountdown scp(6);
+            CHECK_FALSE(json::sax_parse(v, &scp, json::input_format_t::bjdata));
+        }
+
+        SECTION("string() in ndarray _ArrayType_")
+        {
+            std::vector<uint8_t> const v = {'[', '$', 'U', '#', '[', '$', 'U', '#', 'i', 2, 2, 2, 1, 2, 3, 4};
+            SaxCountdown scp(7);
+            CHECK_FALSE(json::sax_parse(v, &scp, json::input_format_t::bjdata));
+        }
+
+        SECTION("key() in ndarray _ArrayData_")
+        {
+            std::vector<uint8_t> const v = {'[', '$', 'U', '#', '[', '$', 'U', '#', 'i', 2, 2, 2, 1, 2, 3, 4};
+            SaxCountdown scp(8);
+            CHECK_FALSE(json::sax_parse(v, &scp, json::input_format_t::bjdata));
+        }
+
+        SECTION("string() in ndarray _ArrayData_")
+        {
+            std::vector<uint8_t> const v = {'[', '$', 'U', '#', '[', '$', 'U', '#', 'i', 2, 2, 2, 1, 2, 3, 4};
+            SaxCountdown scp(9);
+            CHECK_FALSE(json::sax_parse(v, &scp, json::input_format_t::bjdata));
+        }
+
+        SECTION("string() in ndarray _ArrayType_")
+        {
+            std::vector<uint8_t> const v = {'[', '$', 'U', '#', '[', '$', 'i', '#', 'i', 2, 3, 2, 6, 5, 4, 3, 2, 1};
+            SaxCountdown scp(11);
+            CHECK_FALSE(json::sax_parse(v, &scp, json::input_format_t::bjdata));
+        }
+
+        SECTION("start_array() in ndarray _ArrayData_")
+        {
+            std::vector<uint8_t> const v = {'[', '$', 'U', '#', '[', 'i', 2, 'i', 3, ']', 6, 5, 4, 3, 2, 1};
+            SaxCountdown scp(13);
+            CHECK_FALSE(json::sax_parse(v, &scp, json::input_format_t::bjdata));
+        }
+    }
+
+    SECTION("parsing values")
+    {
+        SECTION("strings")
+        {
+            // create a single-character string for all number types
+            std::vector<uint8_t> s_i = {'S', 'i', 1, 'a'};
+            std::vector<uint8_t> const s_U = {'S', 'U', 1, 'a'};
+            std::vector<uint8_t> const s_I = {'S', 'I', 1, 0, 'a'};
+            std::vector<uint8_t> const s_u = {'S', 'u', 1, 0, 'a'};
+            std::vector<uint8_t> const s_l = {'S', 'l', 1, 0, 0, 0, 'a'};
+            std::vector<uint8_t> const s_m = {'S', 'm', 1, 0, 0, 0, 'a'};
+            std::vector<uint8_t> const s_L = {'S', 'L', 1, 0, 0, 0, 0, 0, 0, 0, 'a'};
+            std::vector<uint8_t> const s_M = {'S', 'M', 1, 0, 0, 0, 0, 0, 0, 0, 'a'};
+
+            // check if string is parsed correctly to "a"
+            CHECK(json::from_bjdata(s_i) == "a");
+            CHECK(json::from_bjdata(s_U) == "a");
+            CHECK(json::from_bjdata(s_I) == "a");
+            CHECK(json::from_bjdata(s_u) == "a");
+            CHECK(json::from_bjdata(s_l) == "a");
+            CHECK(json::from_bjdata(s_m) == "a");
+            CHECK(json::from_bjdata(s_L) == "a");
+            CHECK(json::from_bjdata(s_M) == "a");
+
+            // roundtrip: output should be optimized
+            CHECK(json::to_bjdata(json::from_bjdata(s_i)) == s_i);
+            CHECK(json::to_bjdata(json::from_bjdata(s_U)) == s_i);
+            CHECK(json::to_bjdata(json::from_bjdata(s_I)) == s_i);
+            CHECK(json::to_bjdata(json::from_bjdata(s_u)) == s_i);
+            CHECK(json::to_bjdata(json::from_bjdata(s_l)) == s_i);
+            CHECK(json::to_bjdata(json::from_bjdata(s_m)) == s_i);
+            CHECK(json::to_bjdata(json::from_bjdata(s_L)) == s_i);
+            CHECK(json::to_bjdata(json::from_bjdata(s_M)) == s_i);
+        }
+
+        SECTION("number")
+        {
+            SECTION("float")
+            {
+                // float32
+                std::vector<uint8_t> const v_d = {'d', 0xd0, 0x0f, 0x49, 0x40};
+                CHECK(json::from_bjdata(v_d) == 3.14159f);
+
+                // float64
+                std::vector<uint8_t> const v_D = {'D', 0x6e, 0x86, 0x1b, 0xf0, 0xf9, 0x21, 0x09, 0x40};
+                CHECK(json::from_bjdata(v_D) == 3.14159);
+
+                // float32 is serialized as float64 as the library does not support float32
+                CHECK(json::to_bjdata(json::from_bjdata(v_d)) == json::to_bjdata(3.14159f));
+            }
+        }
+
+        SECTION("array")
+        {
+            SECTION("optimized version (length only)")
+            {
+                // create vector with two elements of the same type
+                std::vector<uint8_t> const v_TU = {'[', '#', 'U', 2, 'T', 'T'};
+                std::vector<uint8_t> const v_T = {'[', '#', 'i', 2, 'T', 'T'};
+                std::vector<uint8_t> const v_F = {'[', '#', 'i', 2, 'F', 'F'};
+                std::vector<uint8_t> const v_Z = {'[', '#', 'i', 2, 'Z', 'Z'};
+                std::vector<uint8_t> const v_i = {'[', '#', 'i', 2, 'i', 0x7F, 'i', 0x7F};
+                std::vector<uint8_t> const v_U = {'[', '#', 'i', 2, 'U', 0xFF, 'U', 0xFF};
+                std::vector<uint8_t> const v_I = {'[', '#', 'i', 2, 'I', 0xFF, 0x7F, 'I', 0xFF, 0x7F};
+                std::vector<uint8_t> const v_u = {'[', '#', 'i', 2, 'u', 0x0F, 0xA7, 'u', 0x0F, 0xA7};
+                std::vector<uint8_t> const v_l = {'[', '#', 'i', 2, 'l', 0xFF, 0xFF, 0xFF, 0x7F, 'l', 0xFF, 0xFF, 0xFF, 0x7F};
+                std::vector<uint8_t> const v_m = {'[', '#', 'i', 2, 'm', 0xFF, 0xC9, 0x9A, 0xBB, 'm', 0xFF, 0xC9, 0x9A, 0xBB};
+                std::vector<uint8_t> const v_L = {'[', '#', 'i', 2, 'L', 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 'L', 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F};
+                std::vector<uint8_t> const v_M = {'[', '#', 'i', 2, 'M', 0xFF, 0xFF, 0x63, 0xA7, 0xB3, 0xB6, 0xE0, 0x8D, 'M', 0xFF, 0xFF, 0x63, 0xA7, 0xB3, 0xB6, 0xE0, 0x8D};
+                std::vector<uint8_t> const v_D = {'[', '#', 'i', 2, 'D', 0x4a, 0xd8, 0x12, 0x4d, 0xfb, 0x21, 0x09, 0x40, 'D', 0x4a, 0xd8, 0x12, 0x4d, 0xfb, 0x21, 0x09, 0x40};
+                std::vector<uint8_t> const v_S = {'[', '#', 'i', 2, 'S', 'i', 1, 'a', 'S', 'i', 1, 'a'};
+                std::vector<uint8_t> const v_C = {'[', '#', 'i', 2, 'C', 'a', 'C', 'a'};
+
+                // check if vector is parsed correctly
+                CHECK(json::from_bjdata(v_TU) == json({true, true}));
+                CHECK(json::from_bjdata(v_T) == json({true, true}));
+                CHECK(json::from_bjdata(v_F) == json({false, false}));
+                CHECK(json::from_bjdata(v_Z) == json({nullptr, nullptr}));
+                CHECK(json::from_bjdata(v_i) == json({127, 127}));
+                CHECK(json::from_bjdata(v_U) == json({255, 255}));
+                CHECK(json::from_bjdata(v_I) == json({32767, 32767}));
+                CHECK(json::from_bjdata(v_u) == json({42767, 42767}));
+                CHECK(json::from_bjdata(v_l) == json({2147483647, 2147483647}));
+                CHECK(json::from_bjdata(v_m) == json({3147483647, 3147483647}));
+                CHECK(json::from_bjdata(v_L) == json({9223372036854775807, 9223372036854775807}));
+                CHECK(json::from_bjdata(v_M) == json({10223372036854775807ull, 10223372036854775807ull}));
+                CHECK(json::from_bjdata(v_D) == json({3.1415926, 3.1415926}));
+                CHECK(json::from_bjdata(v_S) == json({"a", "a"}));
+                CHECK(json::from_bjdata(v_C) == json({"a", "a"}));
+
+                // roundtrip: output should be optimized
+                CHECK(json::to_bjdata(json::from_bjdata(v_T), true) == v_T);
+                CHECK(json::to_bjdata(json::from_bjdata(v_F), true) == v_F);
+                CHECK(json::to_bjdata(json::from_bjdata(v_Z), true) == v_Z);
+                CHECK(json::to_bjdata(json::from_bjdata(v_i), true) == v_i);
+                CHECK(json::to_bjdata(json::from_bjdata(v_U), true) == v_U);
+                CHECK(json::to_bjdata(json::from_bjdata(v_I), true) == v_I);
+                CHECK(json::to_bjdata(json::from_bjdata(v_u), true) == v_u);
+                CHECK(json::to_bjdata(json::from_bjdata(v_l), true) == v_l);
+                CHECK(json::to_bjdata(json::from_bjdata(v_m), true) == v_m);
+                CHECK(json::to_bjdata(json::from_bjdata(v_L), true) == v_L);
+                CHECK(json::to_bjdata(json::from_bjdata(v_M), true) == v_M);
+                CHECK(json::to_bjdata(json::from_bjdata(v_D), true) == v_D);
+                CHECK(json::to_bjdata(json::from_bjdata(v_S), true) == v_S);
+                CHECK(json::to_bjdata(json::from_bjdata(v_C), true) == v_S); // char is serialized to string
+            }
+
+            SECTION("optimized version (type and length)")
+            {
+                // create vector with two elements of the same type
+                std::vector<uint8_t> const v_i = {'[', '$', 'i', '#', 'i', 2, 0x7F, 0x7F};
+                std::vector<uint8_t> const v_U = {'[', '$', 'U', '#', 'i', 2, 0xFF, 0xFF};
+                std::vector<uint8_t> const v_I = {'[', '$', 'I', '#', 'i', 2, 0xFF, 0x7F, 0xFF, 0x7F};
+                std::vector<uint8_t> const v_u = {'[', '$', 'u', '#', 'i', 2, 0x0F, 0xA7, 0x0F, 0xA7};
+                std::vector<uint8_t> const v_l = {'[', '$', 'l', '#', 'i', 2, 0xFF, 0xFF, 0xFF, 0x7F, 0xFF, 0xFF, 0xFF, 0x7F};
+                std::vector<uint8_t> const v_m = {'[', '$', 'm', '#', 'i', 2, 0xFF, 0xC9, 0x9A, 0xBB, 0xFF, 0xC9, 0x9A, 0xBB};
+                std::vector<uint8_t> const v_L = {'[', '$', 'L', '#', 'i', 2, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F};
+                std::vector<uint8_t> const v_M = {'[', '$', 'M', '#', 'i', 2, 0xFF, 0xFF, 0x63, 0xA7, 0xB3, 0xB6, 0xE0, 0x8D, 0xFF, 0xFF, 0x63, 0xA7, 0xB3, 0xB6, 0xE0, 0x8D};
+                std::vector<uint8_t> const v_D = {'[', '$', 'D', '#', 'i', 2, 0x4a, 0xd8, 0x12, 0x4d, 0xfb, 0x21, 0x09, 0x40, 0x4a, 0xd8, 0x12, 0x4d, 0xfb, 0x21, 0x09, 0x40};
+                std::vector<uint8_t> const v_S = {'[', '#', 'i', 2, 'S', 'i', 1, 'a', 'S', 'i', 1, 'a'};
+                std::vector<uint8_t> const v_C = {'[', '$', 'C', '#', 'i', 2, 'a', 'a'};
+
+                // check if vector is parsed correctly
+                CHECK(json::from_bjdata(v_i) == json({127, 127}));
+                CHECK(json::from_bjdata(v_U) == json({255, 255}));
+                CHECK(json::from_bjdata(v_I) == json({32767, 32767}));
+                CHECK(json::from_bjdata(v_u) == json({42767, 42767}));
+                CHECK(json::from_bjdata(v_l) == json({2147483647, 2147483647}));
+                CHECK(json::from_bjdata(v_m) == json({3147483647, 3147483647}));
+                CHECK(json::from_bjdata(v_L) == json({9223372036854775807, 9223372036854775807}));
+                CHECK(json::from_bjdata(v_M) == json({10223372036854775807ull, 10223372036854775807ull}));
+                CHECK(json::from_bjdata(v_D) == json({3.1415926, 3.1415926}));
+                CHECK(json::from_bjdata(v_S) == json({"a", "a"}));
+                CHECK(json::from_bjdata(v_C) == json({"a", "a"}));
+
+                // roundtrip: output should be optimized
+                std::vector<uint8_t> const v_empty = {'[', '#', 'i', 0};
+                CHECK(json::to_bjdata(json::from_bjdata(v_i), true, true) == v_i);
+                CHECK(json::to_bjdata(json::from_bjdata(v_U), true, true) == v_U);
+                CHECK(json::to_bjdata(json::from_bjdata(v_I), true, true) == v_I);
+                CHECK(json::to_bjdata(json::from_bjdata(v_u), true, true) == v_u);
+                CHECK(json::to_bjdata(json::from_bjdata(v_l), true, true) == v_l);
+                CHECK(json::to_bjdata(json::from_bjdata(v_m), true, true) == v_m);
+                CHECK(json::to_bjdata(json::from_bjdata(v_L), true, true) == v_L);
+                CHECK(json::to_bjdata(json::from_bjdata(v_M), true, true) == v_M);
+                CHECK(json::to_bjdata(json::from_bjdata(v_D), true, true) == v_D);
+                CHECK(json::to_bjdata(json::from_bjdata(v_S), true, true) == v_S);
+                CHECK(json::to_bjdata(json::from_bjdata(v_C), true, true) == v_S); // char is serialized to string
+            }
+
+            SECTION("optimized ndarray (type and vector-size as optimized 1D array)")
+            {
+                // create vector with two elements of the same type
+                std::vector<uint8_t> const v_0 = {'[', '$', 'i', '#', '[', '$', 'i', '#', 'i', 1, 0};
+                std::vector<uint8_t> const v_1 = {'[', '$', 'i', '#', '[', '$', 'i', '#', 'i', 1, 2, 0x7F, 0x7F};
+                std::vector<uint8_t> const v_i = {'[', '$', 'i', '#', '[', '$', 'i', '#', 'i', 2, 1, 2, 0x7F, 0x7F};
+                std::vector<uint8_t> const v_U = {'[', '$', 'U', '#', '[', '$', 'i', '#', 'i', 2, 1, 2, 0xFF, 0xFF};
+                std::vector<uint8_t> const v_I = {'[', '$', 'I', '#', '[', '$', 'i', '#', 'i', 2, 1, 2, 0xFF, 0x7F, 0xFF, 0x7F};
+                std::vector<uint8_t> const v_u = {'[', '$', 'u', '#', '[', '$', 'i', '#', 'i', 2, 1, 2, 0x0F, 0xA7, 0x0F, 0xA7};
+                std::vector<uint8_t> const v_l = {'[', '$', 'l', '#', '[', '$', 'i', '#', 'i', 2, 1, 2, 0xFF, 0xFF, 0xFF, 0x7F, 0xFF, 0xFF, 0xFF, 0x7F};
+                std::vector<uint8_t> const v_m = {'[', '$', 'm', '#', '[', '$', 'i', '#', 'i', 2, 1, 2, 0xFF, 0xC9, 0x9A, 0xBB, 0xFF, 0xC9, 0x9A, 0xBB};
+                std::vector<uint8_t> const v_L = {'[', '$', 'L', '#', '[', '$', 'i', '#', 'i', 2, 1, 2, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F};
+                std::vector<uint8_t> const v_M = {'[', '$', 'M', '#', '[', '$', 'i', '#', 'i', 2, 1, 2, 0xFF, 0xFF, 0x63, 0xA7, 0xB3, 0xB6, 0xE0, 0x8D, 0xFF, 0xFF, 0x63, 0xA7, 0xB3, 0xB6, 0xE0, 0x8D};
+                std::vector<uint8_t> const v_D = {'[', '$', 'D', '#', '[', '$', 'i', '#', 'i', 2, 1, 2, 0x4a, 0xd8, 0x12, 0x4d, 0xfb, 0x21, 0x09, 0x40, 0x4a, 0xd8, 0x12, 0x4d, 0xfb, 0x21, 0x09, 0x40};
+                std::vector<uint8_t> const v_S = {'[', '#', '[', '$', 'i', '#', 'i', 2, 1, 2, 'S', 'i', 1, 'a', 'S', 'i', 1, 'a'};
+                std::vector<uint8_t> const v_C = {'[', '$', 'C', '#', '[', '$', 'i', '#', 'i', 2, 1, 2, 'a', 'a'};
+
+                // check if vector is parsed correctly
+                CHECK(json::from_bjdata(v_0) == json::array());
+                CHECK(json::from_bjdata(v_1) == json({127, 127}));
+                CHECK(json::from_bjdata(v_i) == json({127, 127}));
+                CHECK(json::from_bjdata(v_U) == json({255, 255}));
+                CHECK(json::from_bjdata(v_I) == json({32767, 32767}));
+                CHECK(json::from_bjdata(v_u) == json({42767, 42767}));
+                CHECK(json::from_bjdata(v_l) == json({2147483647, 2147483647}));
+                CHECK(json::from_bjdata(v_m) == json({3147483647, 3147483647}));
+                CHECK(json::from_bjdata(v_L) == json({9223372036854775807, 9223372036854775807}));
+                CHECK(json::from_bjdata(v_M) == json({10223372036854775807ull, 10223372036854775807ull}));
+                CHECK(json::from_bjdata(v_D) == json({3.1415926, 3.1415926}));
+                CHECK(json::from_bjdata(v_S) == json({"a", "a"}));
+                CHECK(json::from_bjdata(v_C) == json({"a", "a"}));
+            }
+
+            SECTION("optimized ndarray (type and vector-size ndarray with JData annotations)")
+            {
+                // create vector with 0, 1, 2 elements of the same type
+                std::vector<uint8_t> const v_e = {'[', '$', 'U', '#', '[', '$', 'i', '#', 'i', 2, 2, 1, 0xFE, 0xFF};
+                std::vector<uint8_t> const v_U = {'[', '$', 'U', '#', '[', '$', 'i', '#', 'i', 2, 2, 3, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06};
+                std::vector<uint8_t> const v_i = {'[', '$', 'i', '#', '[', '$', 'i', '#', 'i', 2, 2, 3, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06};
+                std::vector<uint8_t> const v_u = {'[', '$', 'u', '#', '[', '$', 'i', '#', 'i', 2, 2, 3, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x04, 0x00, 0x05, 0x00, 0x06, 0x00};
+                std::vector<uint8_t> const v_I = {'[', '$', 'I', '#', '[', '$', 'i', '#', 'i', 2, 2, 3, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x04, 0x00, 0x05, 0x00, 0x06, 0x00};
+                std::vector<uint8_t> const v_m = {'[', '$', 'm', '#', '[', '$', 'i', '#', 'i', 2, 2, 3, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00};
+                std::vector<uint8_t> const v_l = {'[', '$', 'l', '#', '[', '$', 'i', '#', 'i', 2, 2, 3, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00};
+                std::vector<uint8_t> const v_M = {'[', '$', 'M', '#', '[', '$', 'i', '#', 'i', 2, 2, 3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+                std::vector<uint8_t> const v_L = {'[', '$', 'L', '#', '[', '$', 'i', '#', 'i', 2, 2, 3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+                std::vector<uint8_t> const v_d = {'[', '$', 'd', '#', '[', '$', 'i', '#', 'i', 2, 2, 3, 0x00, 0x00, 0x80, 0x3F, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x80, 0x40, 0x00, 0x00, 0xA0, 0x40, 0x00, 0x00, 0xC0, 0x40};
+                std::vector<uint8_t> const v_D = {'[', '$', 'D', '#', '[', '$', 'i', '#', 'i', 2, 2, 3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x40};
+                std::vector<uint8_t> const v_C = {'[', '$', 'C', '#', '[', '$', 'i', '#', 'i', 2, 2, 3, 'a', 'b', 'c', 'd', 'e', 'f'};
+
+                // check if vector is parsed correctly
+                CHECK(json::from_bjdata(v_e) == json({{"_ArrayData_", {254, 255}}, {"_ArraySize_", {2, 1}}, {"_ArrayType_", "uint8"}}));
+                CHECK(json::from_bjdata(v_U) == json({{"_ArrayData_", {1, 2, 3, 4, 5, 6}}, {"_ArraySize_", {2, 3}}, {"_ArrayType_", "uint8"}}));
+                CHECK(json::from_bjdata(v_i) == json({{"_ArrayData_", {1, 2, 3, 4, 5, 6}}, {"_ArraySize_", {2, 3}}, {"_ArrayType_", "int8"}}));
+                CHECK(json::from_bjdata(v_i) == json({{"_ArrayData_", {1, 2, 3, 4, 5, 6}}, {"_ArraySize_", {2, 3}}, {"_ArrayType_", "int8"}}));
+                CHECK(json::from_bjdata(v_u) == json({{"_ArrayData_", {1, 2, 3, 4, 5, 6}}, {"_ArraySize_", {2, 3}}, {"_ArrayType_", "uint16"}}));
+                CHECK(json::from_bjdata(v_I) == json({{"_ArrayData_", {1, 2, 3, 4, 5, 6}}, {"_ArraySize_", {2, 3}}, {"_ArrayType_", "int16"}}));
+                CHECK(json::from_bjdata(v_m) == json({{"_ArrayData_", {1, 2, 3, 4, 5, 6}}, {"_ArraySize_", {2, 3}}, {"_ArrayType_", "uint32"}}));
+                CHECK(json::from_bjdata(v_l) == json({{"_ArrayData_", {1, 2, 3, 4, 5, 6}}, {"_ArraySize_", {2, 3}}, {"_ArrayType_", "int32"}}));
+                CHECK(json::from_bjdata(v_M) == json({{"_ArrayData_", {1, 2, 3, 4, 5, 6}}, {"_ArraySize_", {2, 3}}, {"_ArrayType_", "uint64"}}));
+                CHECK(json::from_bjdata(v_L) == json({{"_ArrayData_", {1, 2, 3, 4, 5, 6}}, {"_ArraySize_", {2, 3}}, {"_ArrayType_", "int64"}}));
+                CHECK(json::from_bjdata(v_d) == json({{"_ArrayData_", {1.f, 2.f, 3.f, 4.f, 5.f, 6.f}}, {"_ArraySize_", {2, 3}}, {"_ArrayType_", "single"}}));
+                CHECK(json::from_bjdata(v_D) == json({{"_ArrayData_", {1., 2., 3., 4., 5., 6.}}, {"_ArraySize_", {2, 3}}, {"_ArrayType_", "double"}}));
+                CHECK(json::from_bjdata(v_C) == json({{"_ArrayData_", {'a', 'b', 'c', 'd', 'e', 'f'}}, {"_ArraySize_", {2, 3}}, {"_ArrayType_", "char"}}));
+
+                // roundtrip: output should be optimized
+                CHECK(json::to_bjdata(json::from_bjdata(v_e), true, true) == v_e);
+                CHECK(json::to_bjdata(json::from_bjdata(v_U), true, true) == v_U);
+                CHECK(json::to_bjdata(json::from_bjdata(v_i), true, true) == v_i);
+                CHECK(json::to_bjdata(json::from_bjdata(v_u), true, true) == v_u);
+                CHECK(json::to_bjdata(json::from_bjdata(v_I), true, true) == v_I);
+                CHECK(json::to_bjdata(json::from_bjdata(v_m), true, true) == v_m);
+                CHECK(json::to_bjdata(json::from_bjdata(v_l), true, true) == v_l);
+                CHECK(json::to_bjdata(json::from_bjdata(v_M), true, true) == v_M);
+                CHECK(json::to_bjdata(json::from_bjdata(v_L), true, true) == v_L);
+                CHECK(json::to_bjdata(json::from_bjdata(v_d), true, true) == v_d);
+                CHECK(json::to_bjdata(json::from_bjdata(v_D), true, true) == v_D);
+                CHECK(json::to_bjdata(json::from_bjdata(v_C), true, true) == v_C);
+            }
+
+            SECTION("optimized ndarray (type and vector-size as 1D array)")
+            {
+                // create vector with two elements of the same type
+                std::vector<uint8_t> const v_0 = {'[', '$', 'i', '#', '[', ']'};
+                std::vector<uint8_t> const v_E = {'[', '$', 'i', '#', '[', 'i', 2, 'i', 0, ']'};
+                std::vector<uint8_t> const v_i = {'[', '$', 'i', '#', '[', 'i', 1, 'i', 2, ']', 0x7F, 0x7F};
+                std::vector<uint8_t> const v_U = {'[', '$', 'U', '#', '[', 'i', 1, 'i', 2, ']', 0xFF, 0xFF};
+                std::vector<uint8_t> const v_I = {'[', '$', 'I', '#', '[', 'i', 1, 'i', 2, ']', 0xFF, 0x7F, 0xFF, 0x7F};
+                std::vector<uint8_t> const v_u = {'[', '$', 'u', '#', '[', 'i', 1, 'i', 2, ']', 0x0F, 0xA7, 0x0F, 0xA7};
+                std::vector<uint8_t> const v_l = {'[', '$', 'l', '#', '[', 'i', 1, 'i', 2, ']', 0xFF, 0xFF, 0xFF, 0x7F, 0xFF, 0xFF, 0xFF, 0x7F};
+                std::vector<uint8_t> const v_m = {'[', '$', 'm', '#', '[', 'i', 1, 'i', 2, ']', 0xFF, 0xC9, 0x9A, 0xBB, 0xFF, 0xC9, 0x9A, 0xBB};
+                std::vector<uint8_t> const v_L = {'[', '$', 'L', '#', '[', 'i', 1, 'i', 2, ']', 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F};
+                std::vector<uint8_t> const v_M = {'[', '$', 'M', '#', '[', 'i', 1, 'i', 2, ']', 0xFF, 0xFF, 0x63, 0xA7, 0xB3, 0xB6, 0xE0, 0x8D, 0xFF, 0xFF, 0x63, 0xA7, 0xB3, 0xB6, 0xE0, 0x8D};
+                std::vector<uint8_t> const v_D = {'[', '$', 'D', '#', '[', 'i', 1, 'i', 2, ']', 0x4a, 0xd8, 0x12, 0x4d, 0xfb, 0x21, 0x09, 0x40, 0x4a, 0xd8, 0x12, 0x4d, 0xfb, 0x21, 0x09, 0x40};
+                std::vector<uint8_t> const v_S = {'[', '#', '[', 'i', 1, 'i', 2, ']', 'S', 'i', 1, 'a', 'S', 'i', 1, 'a'};
+                std::vector<uint8_t> const v_C = {'[', '$', 'C', '#', '[', 'i', 1, 'i', 2, ']', 'a', 'a'};
+                std::vector<uint8_t> const v_R = {'[', '#', '[', 'i', 2, ']', 'i', 6, 'U', 7};
+
+                // check if vector is parsed correctly
+                CHECK(json::from_bjdata(v_0) == json::array());
+                CHECK(json::from_bjdata(v_E) == json::array());
+                CHECK(json::from_bjdata(v_i) == json({127, 127}));
+                CHECK(json::from_bjdata(v_U) == json({255, 255}));
+                CHECK(json::from_bjdata(v_I) == json({32767, 32767}));
+                CHECK(json::from_bjdata(v_u) == json({42767, 42767}));
+                CHECK(json::from_bjdata(v_l) == json({2147483647, 2147483647}));
+                CHECK(json::from_bjdata(v_m) == json({3147483647, 3147483647}));
+                CHECK(json::from_bjdata(v_L) == json({9223372036854775807, 9223372036854775807}));
+                CHECK(json::from_bjdata(v_M) == json({10223372036854775807ull, 10223372036854775807ull}));
+                CHECK(json::from_bjdata(v_D) == json({3.1415926, 3.1415926}));
+                CHECK(json::from_bjdata(v_S) == json({"a", "a"}));
+                CHECK(json::from_bjdata(v_C) == json({"a", "a"}));
+                CHECK(json::from_bjdata(v_R) == json({6, 7}));
+            }
+
+            SECTION("optimized ndarray (type and vector-size as size-optimized array)")
+            {
+                // create vector with two elements of the same type
+                std::vector<uint8_t> const v_i = {'[', '$', 'i', '#', '[', '#', 'i', 2, 'i', 1, 'i', 2, 0x7F, 0x7F};
+                std::vector<uint8_t> const v_U = {'[', '$', 'U', '#', '[', '#', 'i', 2, 'i', 1, 'i', 2, 0xFF, 0xFF};
+                std::vector<uint8_t> const v_I = {'[', '$', 'I', '#', '[', '#', 'i', 2, 'i', 1, 'i', 2, 0xFF, 0x7F, 0xFF, 0x7F};
+                std::vector<uint8_t> const v_u = {'[', '$', 'u', '#', '[', '#', 'i', 2, 'i', 1, 'i', 2, 0x0F, 0xA7, 0x0F, 0xA7};
+                std::vector<uint8_t> const v_l = {'[', '$', 'l', '#', '[', '#', 'i', 2, 'i', 1, 'i', 2, 0xFF, 0xFF, 0xFF, 0x7F, 0xFF, 0xFF, 0xFF, 0x7F};
+                std::vector<uint8_t> const v_m = {'[', '$', 'm', '#', '[', '#', 'i', 2, 'i', 1, 'i', 2, 0xFF, 0xC9, 0x9A, 0xBB, 0xFF, 0xC9, 0x9A, 0xBB};
+                std::vector<uint8_t> const v_L = {'[', '$', 'L', '#', '[', '#', 'i', 2, 'i', 1, 'i', 2, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F};
+                std::vector<uint8_t> const v_M = {'[', '$', 'M', '#', '[', '#', 'i', 2, 'i', 1, 'i', 2, 0xFF, 0xFF, 0x63, 0xA7, 0xB3, 0xB6, 0xE0, 0x8D, 0xFF, 0xFF, 0x63, 0xA7, 0xB3, 0xB6, 0xE0, 0x8D};
+                std::vector<uint8_t> const v_D = {'[', '$', 'D', '#', '[', '#', 'i', 2, 'i', 1, 'i', 2, 0x4a, 0xd8, 0x12, 0x4d, 0xfb, 0x21, 0x09, 0x40, 0x4a, 0xd8, 0x12, 0x4d, 0xfb, 0x21, 0x09, 0x40};
+                std::vector<uint8_t> const v_S = {'[', '#', '[', '#', 'i', 2, 'i', 1, 'i', 2, 'S', 'i', 1, 'a', 'S', 'i', 1, 'a'};
+                std::vector<uint8_t> const v_C = {'[', '$', 'C', '#', '[', '#', 'i', 2, 'i', 1, 'i', 2, 'a', 'a'};
+
+                // check if vector is parsed correctly
+                CHECK(json::from_bjdata(v_i) == json({127, 127}));
+                CHECK(json::from_bjdata(v_U) == json({255, 255}));
+                CHECK(json::from_bjdata(v_I) == json({32767, 32767}));
+                CHECK(json::from_bjdata(v_u) == json({42767, 42767}));
+                CHECK(json::from_bjdata(v_l) == json({2147483647, 2147483647}));
+                CHECK(json::from_bjdata(v_m) == json({3147483647, 3147483647}));
+                CHECK(json::from_bjdata(v_L) == json({9223372036854775807, 9223372036854775807}));
+                CHECK(json::from_bjdata(v_M) == json({10223372036854775807ull, 10223372036854775807ull}));
+                CHECK(json::from_bjdata(v_D) == json({3.1415926, 3.1415926}));
+                CHECK(json::from_bjdata(v_S) == json({"a", "a"}));
+                CHECK(json::from_bjdata(v_C) == json({"a", "a"}));
+            }
+
+            SECTION("invalid ndarray annotations remains as object")
+            {
+                // check if invalid ND array annotations stay as object
+                json j_type = json({{"_ArrayData_", {1, 2, 3, 4, 5, 6}}, {"_ArraySize_", {2, 3}}, {"_ArrayType_", "invalidtype"}});
+                json j_size = json({{"_ArrayData_", {1, 2, 3, 4, 5}}, {"_ArraySize_", {2, 3}}, {"_ArrayType_", "uint8"}});
+
+                // roundtrip: output should stay as object
+                CHECK(json::from_bjdata(json::to_bjdata(j_type), true, true) == j_type);
+                CHECK(json::from_bjdata(json::to_bjdata(j_size), true, true) == j_size);
+            }
+        }
+    }
+
+    SECTION("parse errors")
+    {
+        SECTION("empty byte vector")
+        {
+            json _;
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(std::vector<uint8_t>()),
+                                 "[json.exception.parse_error.110] parse error at byte 1: syntax error while parsing BJData value: unexpected end of input", json::parse_error&);
+        }
+
+        SECTION("char")
+        {
+            SECTION("eof after C byte")
+            {
+                std::vector<uint8_t> const v = {'C'};
+                json _;
+                CHECK_THROWS_WITH_AS(_ = json::from_bjdata(v), "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing BJData char: unexpected end of input", json::parse_error&);
+            }
+
+            SECTION("byte out of range")
+            {
+                std::vector<uint8_t> const v = {'C', 130};
+                json _;
+                CHECK_THROWS_WITH(_ = json::from_bjdata(v), "[json.exception.parse_error.113] parse error at byte 2: syntax error while parsing BJData char: byte after 'C' must be in range 0x00..0x7F; last byte: 0x82");
+            }
+        }
+
+        SECTION("strings")
+        {
+            SECTION("eof after S byte")
+            {
+                std::vector<uint8_t> const v = {'S'};
+                json _;
+                CHECK_THROWS_WITH_AS(_ = json::from_bjdata(v), "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing BJData value: unexpected end of input", json::parse_error&);
+            }
+
+            SECTION("invalid byte")
+            {
+                std::vector<uint8_t> const v = {'S', '1', 'a'};
+                json _;
+                CHECK_THROWS_WITH_AS(_ = json::from_bjdata(v), "[json.exception.parse_error.113] parse error at byte 2: syntax error while parsing BJData string: expected length type specification (U, i, u, I, m, l, M, L); last byte: 0x31", json::parse_error&);
+            }
+
+            SECTION("parse bjdata markers in ubjson")
+            {
+                // create a single-character string for all number types
+                std::vector<uint8_t> const s_u = {'S', 'u', 1, 0, 'a'};
+                std::vector<uint8_t> const s_m = {'S', 'm', 1, 0, 0, 0, 'a'};
+                std::vector<uint8_t> const s_M = {'S', 'M', 1, 0, 0, 0, 0, 0, 0, 0, 'a'};
+
+                json _;
+                // check if string is parsed correctly to "a"
+                CHECK_THROWS_WITH_AS(_ = json::from_ubjson(s_u), "[json.exception.parse_error.113] parse error at byte 2: syntax error while parsing UBJSON string: expected length type specification (U, i, I, l, L); last byte: 0x75", json::parse_error&);
+                CHECK_THROWS_WITH_AS(_ = json::from_ubjson(s_m), "[json.exception.parse_error.113] parse error at byte 2: syntax error while parsing UBJSON string: expected length type specification (U, i, I, l, L); last byte: 0x6D", json::parse_error&);
+                CHECK_THROWS_WITH_AS(_ = json::from_ubjson(s_M), "[json.exception.parse_error.113] parse error at byte 2: syntax error while parsing UBJSON string: expected length type specification (U, i, I, l, L); last byte: 0x4D", json::parse_error&);
+            }
+        }
+
+        SECTION("array")
+        {
+            SECTION("optimized array: no size following type")
+            {
+                std::vector<uint8_t> const v = {'[', '$', 'i', 2};
+                json _;
+                CHECK_THROWS_WITH_AS(_ = json::from_bjdata(v), "[json.exception.parse_error.112] parse error at byte 4: syntax error while parsing BJData size: expected '#' after type information; last byte: 0x02", json::parse_error&);
+            }
+
+            SECTION("optimized array: negative size")
+            {
+                std::vector<uint8_t> const v1 = {'[', '#', 'i', 0xF1};
+                std::vector<uint8_t> const v2 = {'[', '$', 'I', '#', 'i', 0xF2};
+                std::vector<uint8_t> const v3 = {'[', '$', 'I', '#', '[', 'i', 0xF4, 'i', 0x02, ']'};
+                std::vector<uint8_t> const v4 = {'[', '$', 0xF6, '#', 'i', 0xF7};
+                std::vector<uint8_t> const v5 = {'[', '$', 'I', '#', '[', 'i', 0xF5, 'i', 0xF1, ']'};
+                std::vector<uint8_t> const v6 = {'[', '#', '[', 'i', 0xF3, 'i', 0x02, ']'};
+
+                std::vector<uint8_t> const vI = {'[', '#', 'I', 0x00, 0xF1};
+                std::vector<uint8_t> const vl = {'[', '#', 'l', 0x00, 0x00, 0x00, 0xF2};
+                std::vector<uint8_t> const vL = {'[', '#', 'L', 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF3};
+                std::vector<uint8_t> const vM = {'[', '$', 'M', '#', '[', 'I', 0x00, 0x20, 'M', 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0xFF, ']'};
+                std::vector<uint8_t> const vMX = {'[', '$', 'U', '#', '[', 'M', 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 'U', 0x01, ']'};
+
+                json _;
+                CHECK_THROWS_WITH_AS(_ = json::from_bjdata(v1), "[json.exception.parse_error.113] parse error at byte 4: syntax error while parsing BJData size: count in an optimized container must be positive", json::parse_error&);
+                CHECK(json::from_bjdata(v1, true, false).is_discarded());
+
+                CHECK_THROWS_WITH_AS(_ = json::from_bjdata(v2), "[json.exception.parse_error.113] parse error at byte 6: syntax error while parsing BJData size: count in an optimized container must be positive", json::parse_error&);
+                CHECK(json::from_bjdata(v2, true, false).is_discarded());
+
+                CHECK_THROWS_WITH_AS(_ = json::from_bjdata(v3), "[json.exception.parse_error.113] parse error at byte 7: syntax error while parsing BJData size: count in an optimized container must be positive", json::parse_error&);
+                CHECK(json::from_bjdata(v3, true, false).is_discarded());
+
+                CHECK_THROWS_WITH_AS(_ = json::from_bjdata(v4), "[json.exception.parse_error.113] parse error at byte 6: syntax error while parsing BJData size: count in an optimized container must be positive", json::parse_error&);
+                CHECK(json::from_bjdata(v4, true, false).is_discarded());
+
+                CHECK_THROWS_WITH_AS(_ = json::from_bjdata(v5), "[json.exception.parse_error.113] parse error at byte 7: syntax error while parsing BJData size: count in an optimized container must be positive", json::parse_error&);
+                CHECK(json::from_bjdata(v5, true, false).is_discarded());
+
+                CHECK_THROWS_WITH_AS(_ = json::from_bjdata(v6), "[json.exception.parse_error.113] parse error at byte 5: syntax error while parsing BJData size: count in an optimized container must be positive", json::parse_error&);
+                CHECK(json::from_bjdata(v6, true, false).is_discarded());
+
+                CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vI), "[json.exception.parse_error.113] parse error at byte 5: syntax error while parsing BJData size: count in an optimized container must be positive", json::parse_error&);
+                CHECK(json::from_bjdata(vI, true, false).is_discarded());
+
+                CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vl), "[json.exception.parse_error.113] parse error at byte 7: syntax error while parsing BJData size: count in an optimized container must be positive", json::parse_error&);
+                CHECK(json::from_bjdata(vl, true, false).is_discarded());
+
+                CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vL), "[json.exception.parse_error.113] parse error at byte 11: syntax error while parsing BJData size: count in an optimized container must be positive", json::parse_error&);
+                CHECK(json::from_bjdata(vL, true, false).is_discarded());
+
+#if SIZE_MAX != 0xffffffff
+                CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vM), "[json.exception.out_of_range.408] syntax error while parsing BJData size: excessive ndarray size caused overflow", json::out_of_range&);
+#else
+                CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vM), "[json.exception.out_of_range.408] syntax error while parsing BJData size: integer value overflow", json::out_of_range&);
+#endif
+                CHECK(json::from_bjdata(vM, true, false).is_discarded());
+
+#if SIZE_MAX != 0xffffffff
+                CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vMX), "[json.exception.out_of_range.408] syntax error while parsing BJData size: excessive ndarray size caused overflow", json::out_of_range&);
+#else
+                CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vMX), "[json.exception.out_of_range.408] syntax error while parsing BJData size: integer value overflow", json::out_of_range&);
+#endif
+                CHECK(json::from_bjdata(vMX, true, false).is_discarded());
+            }
+
+            SECTION("optimized array: integer value overflow")
+            {
+#if SIZE_MAX == 0xffffffff
+                std::vector<uint8_t> const vL = {'[', '#', 'L', 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F};
+                std::vector<uint8_t> const vM = {'[', '$', 'M', '#', '[', 'I', 0x00, 0x20, 'M', 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0xFF, ']'};
+
+                json _;
+                CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vL), "[json.exception.out_of_range.408] syntax error while parsing BJData size: integer value overflow", json::out_of_range&);
+                CHECK(json::from_bjdata(vL, true, false).is_discarded());
+                CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vM), "[json.exception.out_of_range.408] syntax error while parsing BJData size: integer value overflow", json::out_of_range&);
+                CHECK(json::from_bjdata(vM, true, false).is_discarded());
+#endif
+            }
+
+            SECTION("do not accept NTFZ markers in ndarray optimized type (with count)")
+            {
+                json _;
+                std::vector<uint8_t> const v_N = {'[', '$', 'N', '#', '[', '#', 'i', 2, 'i', 1, 'i', 2};
+                std::vector<uint8_t> const v_T = {'[', '$', 'T', '#', '[', '#', 'i', 2, 'i', 1, 'i', 2};
+                std::vector<uint8_t> const v_F = {'[', '$', 'F', '#', '[', '#', 'i', 2, 'i', 1, 'i', 2};
+                std::vector<uint8_t> const v_Z = {'[', '$', 'Z', '#', '[', '#', 'i', 2, 'i', 1, 'i', 2};
+
+                CHECK_THROWS_WITH_AS(_ = json::from_bjdata(v_N), "[json.exception.parse_error.112] parse error at byte 3: syntax error while parsing BJData type: marker 0x4E is not a permitted optimized array type", json::parse_error&);
+                CHECK(json::from_bjdata(v_N, true, false).is_discarded());
+
+                CHECK_THROWS_WITH_AS(_ = json::from_bjdata(v_T), "[json.exception.parse_error.112] parse error at byte 3: syntax error while parsing BJData type: marker 0x54 is not a permitted optimized array type", json::parse_error&);
+                CHECK(json::from_bjdata(v_T, true, false).is_discarded());
+
+                CHECK_THROWS_WITH_AS(_ = json::from_bjdata(v_F), "[json.exception.parse_error.112] parse error at byte 3: syntax error while parsing BJData type: marker 0x46 is not a permitted optimized array type", json::parse_error&);
+                CHECK(json::from_bjdata(v_F, true, false).is_discarded());
+
+                CHECK_THROWS_WITH_AS(_ = json::from_bjdata(v_Z), "[json.exception.parse_error.112] parse error at byte 3: syntax error while parsing BJData type: marker 0x5A is not a permitted optimized array type", json::parse_error&);
+                CHECK(json::from_bjdata(v_Z, true, false).is_discarded());
+            }
+
+            SECTION("do not accept NTFZ markers in ndarray optimized type (without count)")
+            {
+                json _;
+                std::vector<uint8_t> const v_N = {'[', '$', 'N', '#', '[', 'i', 1, 'i', 2, ']'};
+                std::vector<uint8_t> const v_T = {'[', '$', 'T', '#', '[', 'i', 1, 'i', 2, ']'};
+                std::vector<uint8_t> const v_F = {'[', '$', 'F', '#', '[', 'i', 1, 'i', 2, ']'};
+                std::vector<uint8_t> const v_Z = {'[', '$', 'Z', '#', '[', 'i', 1, 'i', 2, ']'};
+
+                CHECK_THROWS_WITH_AS(_ = json::from_bjdata(v_N), "[json.exception.parse_error.112] parse error at byte 3: syntax error while parsing BJData type: marker 0x4E is not a permitted optimized array type", json::parse_error&);
+                CHECK(json::from_bjdata(v_N, true, false).is_discarded());
+
+                CHECK_THROWS_WITH_AS(_ = json::from_bjdata(v_T), "[json.exception.parse_error.112] parse error at byte 3: syntax error while parsing BJData type: marker 0x54 is not a permitted optimized array type", json::parse_error&);
+                CHECK(json::from_bjdata(v_T, true, false).is_discarded());
+
+                CHECK_THROWS_WITH_AS(_ = json::from_bjdata(v_F), "[json.exception.parse_error.112] parse error at byte 3: syntax error while parsing BJData type: marker 0x46 is not a permitted optimized array type", json::parse_error&);
+                CHECK(json::from_bjdata(v_F, true, false).is_discarded());
+
+                CHECK_THROWS_WITH_AS(_ = json::from_bjdata(v_Z), "[json.exception.parse_error.112] parse error at byte 3: syntax error while parsing BJData type: marker 0x5A is not a permitted optimized array type", json::parse_error&);
+                CHECK(json::from_bjdata(v_Z, true, false).is_discarded());
+            }
+        }
+
+        SECTION("strings")
+        {
+            std::vector<uint8_t> const vS = {'S'};
+            json _;
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vS), "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing BJData value: unexpected end of input", json::parse_error&);
+            CHECK(json::from_bjdata(vS, true, false).is_discarded());
+
+            std::vector<uint8_t> const v = {'S', 'i', '2', 'a'};
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(v), "[json.exception.parse_error.110] parse error at byte 5: syntax error while parsing BJData string: unexpected end of input", json::parse_error&);
+            CHECK(json::from_bjdata(v, true, false).is_discarded());
+
+            std::vector<uint8_t> const vC = {'C'};
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vC), "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing BJData char: unexpected end of input", json::parse_error&);
+            CHECK(json::from_bjdata(vC, true, false).is_discarded());
+        }
+
+        SECTION("sizes")
+        {
+            std::vector<uint8_t> const vU = {'[', '#', 'U'};
+            json _;
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vU), "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing BJData number: unexpected end of input", json::parse_error&);
+            CHECK(json::from_bjdata(vU, true, false).is_discarded());
+
+            std::vector<uint8_t> const vi = {'[', '#', 'i'};
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vi), "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing BJData number: unexpected end of input", json::parse_error&);
+            CHECK(json::from_bjdata(vi, true, false).is_discarded());
+
+            std::vector<uint8_t> const vI = {'[', '#', 'I'};
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vI), "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing BJData number: unexpected end of input", json::parse_error&);
+            CHECK(json::from_bjdata(vI, true, false).is_discarded());
+
+            std::vector<uint8_t> const vu = {'[', '#', 'u'};
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vu), "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing BJData number: unexpected end of input", json::parse_error&);
+            CHECK(json::from_bjdata(vu, true, false).is_discarded());
+
+            std::vector<uint8_t> const vl = {'[', '#', 'l'};
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vl), "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing BJData number: unexpected end of input", json::parse_error&);
+            CHECK(json::from_bjdata(vl, true, false).is_discarded());
+
+            std::vector<uint8_t> const vm = {'[', '#', 'm'};
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vm), "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing BJData number: unexpected end of input", json::parse_error&);
+            CHECK(json::from_bjdata(vm, true, false).is_discarded());
+
+            std::vector<uint8_t> const vL = {'[', '#', 'L'};
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vL), "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing BJData number: unexpected end of input", json::parse_error&);
+            CHECK(json::from_bjdata(vL, true, false).is_discarded());
+
+            std::vector<uint8_t> const vM = {'[', '#', 'M'};
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vM), "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing BJData number: unexpected end of input", json::parse_error&);
+            CHECK(json::from_bjdata(vM, true, false).is_discarded());
+
+            std::vector<uint8_t> const v0 = {'[', '#', 'T', ']'};
+            CHECK_THROWS_WITH(_ = json::from_bjdata(v0), "[json.exception.parse_error.113] parse error at byte 3: syntax error while parsing BJData size: expected length type specification (U, i, u, I, m, l, M, L) after '#'; last byte: 0x54");
+            CHECK(json::from_bjdata(v0, true, false).is_discarded());
+        }
+
+        SECTION("parse bjdata markers as array size in ubjson")
+        {
+            json _;
+            std::vector<uint8_t> const vu = {'[', '#', 'u'};
+            CHECK_THROWS_WITH_AS(_ = json::from_ubjson(vu), "[json.exception.parse_error.113] parse error at byte 3: syntax error while parsing UBJSON size: expected length type specification (U, i, I, l, L) after '#'; last byte: 0x75", json::parse_error&);
+            CHECK(json::from_ubjson(vu, true, false).is_discarded());
+
+            std::vector<uint8_t> const vm = {'[', '#', 'm'};
+            CHECK_THROWS_WITH_AS(_ = json::from_ubjson(vm), "[json.exception.parse_error.113] parse error at byte 3: syntax error while parsing UBJSON size: expected length type specification (U, i, I, l, L) after '#'; last byte: 0x6D", json::parse_error&);
+            CHECK(json::from_ubjson(vm, true, false).is_discarded());
+
+            std::vector<uint8_t> const vM = {'[', '#', 'M'};
+            CHECK_THROWS_WITH_AS(_ = json::from_ubjson(vM), "[json.exception.parse_error.113] parse error at byte 3: syntax error while parsing UBJSON size: expected length type specification (U, i, I, l, L) after '#'; last byte: 0x4D", json::parse_error&);
+            CHECK(json::from_ubjson(vM, true, false).is_discarded());
+
+            std::vector<uint8_t> const v0 = {'[', '#', '['};
+            CHECK_THROWS_WITH_AS(_ = json::from_ubjson(v0), "[json.exception.parse_error.113] parse error at byte 3: syntax error while parsing UBJSON size: expected length type specification (U, i, I, l, L) after '#'; last byte: 0x5B", json::parse_error&);
+            CHECK(json::from_ubjson(v0, true, false).is_discarded());
+        }
+
+        SECTION("types")
+        {
+            std::vector<uint8_t> const v0 = {'[', '$'};
+            json _;
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(v0), "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing BJData type: unexpected end of input", json::parse_error&);
+            CHECK(json::from_bjdata(v0, true, false).is_discarded());
+
+            std::vector<uint8_t> const vi = {'[', '$', '#'};
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vi), "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing BJData value: unexpected end of input", json::parse_error&);
+            CHECK(json::from_bjdata(vi, true, false).is_discarded());
+
+            std::vector<uint8_t> const vU = {'[', '$', 'U'};
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vU), "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing BJData value: unexpected end of input", json::parse_error&);
+            CHECK(json::from_bjdata(vU, true, false).is_discarded());
+
+            std::vector<uint8_t> const v1 = {'[', '$', '['};
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(v1), "[json.exception.parse_error.112] parse error at byte 3: syntax error while parsing BJData type: marker 0x5B is not a permitted optimized array type", json::parse_error&);
+            CHECK(json::from_bjdata(v1, true, false).is_discarded());
+        }
+
+        SECTION("arrays")
+        {
+            std::vector<uint8_t> const vST = {'[', '$', 'i', '#', 'i', 2, 1};
+            json _;
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vST), "[json.exception.parse_error.110] parse error at byte 8: syntax error while parsing BJData number: unexpected end of input", json::parse_error&);
+            CHECK(json::from_bjdata(vST, true, false).is_discarded());
+
+            std::vector<uint8_t> const vS = {'[', '#', 'i', 2, 'i', 1};
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vS), "[json.exception.parse_error.110] parse error at byte 7: syntax error while parsing BJData value: unexpected end of input", json::parse_error&);
+            CHECK(json::from_bjdata(vS, true, false).is_discarded());
+
+            std::vector<uint8_t> const v = {'[', 'i', 2, 'i', 1};
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(v), "[json.exception.parse_error.110] parse error at byte 6: syntax error while parsing BJData value: unexpected end of input", json::parse_error&);
+            CHECK(json::from_bjdata(v, true, false).is_discarded());
+        }
+
+        SECTION("ndarrays")
+        {
+            std::vector<uint8_t> const vST = {'[', '$', 'i', '#', '[', '$', 'i', '#'};
+            json _;
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vST), "[json.exception.parse_error.113] parse error at byte 9: syntax error while parsing BJData size: expected length type specification (U, i, u, I, m, l, M, L) after '#'; last byte: 0xFF", json::parse_error&);
+            CHECK(json::from_bjdata(vST, true, false).is_discarded());
+
+            std::vector<uint8_t> const v = {'[', '$', 'i', '#', '[', '$', 'i', '#', 'i', 2, 1, 2};
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(v), "[json.exception.parse_error.110] parse error at byte 13: syntax error while parsing BJData number: unexpected end of input", json::parse_error&);
+            CHECK(json::from_bjdata(v, true, false).is_discarded());
+
+            std::vector<uint8_t> const vS0 = {'[', '$', 'i', '#', '[', '$', 'i', '#', 'i', 2, 1};
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vS0), "[json.exception.parse_error.110] parse error at byte 12: syntax error while parsing BJData number: unexpected end of input", json::parse_error&);
+            CHECK(json::from_bjdata(vS0, true, false).is_discarded());
+
+            std::vector<uint8_t> const vS = {'[', '$', 'i', '#', '[', '#', 'i', 2, 1, 2, 1};
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vS), "[json.exception.parse_error.113] parse error at byte 9: syntax error while parsing BJData size: expected length type specification (U, i, u, I, m, l, M, L) after '#'; last byte: 0x01", json::parse_error&);
+            CHECK(json::from_bjdata(vS, true, false).is_discarded());
+
+            std::vector<uint8_t> const vT = {'[', '$', 'i', '#', '[', 'i', 2, 'i'};
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vT), "[json.exception.parse_error.110] parse error at byte 9: syntax error while parsing BJData number: unexpected end of input", json::parse_error&);
+            CHECK(json::from_bjdata(vT, true, false).is_discarded());
+
+            std::vector<uint8_t> const vT0 = {'[', '$', 'i', '#', '[', 'i'};
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vT0), "[json.exception.parse_error.110] parse error at byte 7: syntax error while parsing BJData number: unexpected end of input", json::parse_error&);
+            CHECK(json::from_bjdata(vT0, true, false).is_discarded());
+
+            std::vector<uint8_t> const vu = {'[', '$', 'i', '#', '[', '$', 'i', '#', 'u', 1, 0};
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vu), "[json.exception.parse_error.110] parse error at byte 12: syntax error while parsing BJData number: unexpected end of input", json::parse_error&);
+            CHECK(json::from_bjdata(vu, true, false).is_discarded());
+
+            std::vector<uint8_t> const vm = {'[', '$', 'i', '#', '[', '$', 'i', '#', 'm', 1, 0, 0, 0};
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vm), "[json.exception.parse_error.110] parse error at byte 14: syntax error while parsing BJData number: unexpected end of input", json::parse_error&);
+            CHECK(json::from_bjdata(vm, true, false).is_discarded());
+
+            std::vector<uint8_t> const vM = {'[', '$', 'i', '#', '[', '$', 'i', '#', 'M', 1, 0, 0, 0, 0, 0, 0, 0};
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vM), "[json.exception.parse_error.110] parse error at byte 18: syntax error while parsing BJData number: unexpected end of input", json::parse_error&);
+            CHECK(json::from_bjdata(vM, true, false).is_discarded());
+
+            std::vector<uint8_t> const vU = {'[', '$', 'U', '#', '[', '$', 'i', '#', 'i', 2, 2, 3, 1, 2, 3, 4, 5};
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vU), "[json.exception.parse_error.110] parse error at byte 18: syntax error while parsing BJData number: unexpected end of input", json::parse_error&);
+            CHECK(json::from_bjdata(vU, true, false).is_discarded());
+
+            std::vector<uint8_t> const vT1 = {'[', '$', 'T', '#', '[', '$', 'i', '#', 'i', 2, 2, 3};
+            CHECK(json::from_bjdata(vT1, true, false).is_discarded());
+
+            std::vector<uint8_t> const vh = {'[', '$', 'h', '#', '[', '$', 'i', '#', 'i', 2, 2, 3};
+            CHECK(json::from_bjdata(vh, true, false).is_discarded());
+
+            std::vector<uint8_t> const vR = {'[', '$', 'i', '#', '[', 'i', 1, '[', ']', ']', 1};
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vR), "[json.exception.parse_error.113] parse error at byte 8: syntax error while parsing BJData size: ndarray dimensional vector is not allowed", json::parse_error&);
+            CHECK(json::from_bjdata(vR, true, false).is_discarded());
+
+            std::vector<uint8_t> const vRo = {'[', '$', 'i', '#', '[', 'i', 0, '{', '}', ']', 1};
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vRo), "[json.exception.parse_error.113] parse error at byte 8: syntax error while parsing BJData size: expected length type specification (U, i, u, I, m, l, M, L) after '#'; last byte: 0x7B", json::parse_error&);
+            CHECK(json::from_bjdata(vRo, true, false).is_discarded());
+
+            std::vector<uint8_t> const vR1 = {'[', '$', 'i', '#', '[', '[', 'i', 1, ']', ']', 1};
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vR1), "[json.exception.parse_error.113] parse error at byte 6: syntax error while parsing BJData size: ndarray dimensional vector is not allowed", json::parse_error&);
+            CHECK(json::from_bjdata(vR1, true, false).is_discarded());
+
+            std::vector<uint8_t> const vR2 = {'[', '$', 'i', '#', '[', '#', '[', 'i', 1, ']', ']', 1};
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vR2), "[json.exception.parse_error.113] parse error at byte 11: syntax error while parsing BJData size: expected length type specification (U, i, u, I, m, l, M, L) after '#'; last byte: 0x5D", json::parse_error&);
+            CHECK(json::from_bjdata(vR2, true, false).is_discarded());
+
+            std::vector<uint8_t> const vR3 = {'[', '#', '[', 'i', '2', 'i', 2, ']'};
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vR3), "[json.exception.parse_error.112] parse error at byte 8: syntax error while parsing BJData size: ndarray requires both type and size", json::parse_error&);
+            CHECK(json::from_bjdata(vR3, true, false).is_discarded());
+
+            std::vector<uint8_t> const vR4 = {'[', '$', 'i', '#', '[', '$', 'i', '#', '[', 'i', 1, ']', 1};
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vR4), "[json.exception.parse_error.110] parse error at byte 14: syntax error while parsing BJData number: unexpected end of input", json::parse_error&);
+            CHECK(json::from_bjdata(vR4, true, false).is_discarded());
+
+            std::vector<uint8_t> const vR5 = {'[', '$', 'i', '#', '[', '[', '[', ']', ']', ']'};
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vR5), "[json.exception.parse_error.113] parse error at byte 6: syntax error while parsing BJData size: ndarray dimensional vector is not allowed", json::parse_error&);
+            CHECK(json::from_bjdata(vR5, true, false).is_discarded());
+
+            std::vector<uint8_t> const vR6 = {'[', '$', 'i', '#', '[', '$', 'i', '#', '[', 'i', '2', 'i', 2, ']'};
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vR6), "[json.exception.parse_error.112] parse error at byte 14: syntax error while parsing BJData size: ndarray can not be recursive", json::parse_error&);
+            CHECK(json::from_bjdata(vR6, true, false).is_discarded());
+
+            std::vector<uint8_t> const vH = {'[', 'H', '[', '#', '[', '$', 'i', '#', '[', 'i', '2', 'i', 2, ']'};
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vH), "[json.exception.parse_error.113] parse error at byte 3: syntax error while parsing BJData size: ndarray dimensional vector is not allowed", json::parse_error&);
+            CHECK(json::from_bjdata(vH, true, false).is_discarded());
+        }
+
+        SECTION("objects")
+        {
+            std::vector<uint8_t> const vST = {'{', '$', 'i', '#', 'i', 2, 'i', 1, 'a', 1};
+            json _;
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vST), "[json.exception.parse_error.110] parse error at byte 11: syntax error while parsing BJData value: unexpected end of input", json::parse_error&);
+            CHECK(json::from_bjdata(vST, true, false).is_discarded());
+
+            std::vector<uint8_t> const vT = {'{', '$', 'i', 'i', 1, 'a', 1};
+            CHECK_THROWS_WITH(_ = json::from_bjdata(vT), "[json.exception.parse_error.112] parse error at byte 4: syntax error while parsing BJData size: expected '#' after type information; last byte: 0x69");
+            CHECK(json::from_bjdata(vT, true, false).is_discarded());
+
+            std::vector<uint8_t> const vS = {'{', '#', 'i', 2, 'i', 1, 'a', 'i', 1};
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vS), "[json.exception.parse_error.110] parse error at byte 10: syntax error while parsing BJData value: unexpected end of input", json::parse_error&);
+            CHECK(json::from_bjdata(vS, true, false).is_discarded());
+
+            std::vector<uint8_t> const v = {'{', 'i', 1, 'a', 'i', 1};
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(v), "[json.exception.parse_error.110] parse error at byte 7: syntax error while parsing BJData value: unexpected end of input", json::parse_error&);
+            CHECK(json::from_bjdata(v, true, false).is_discarded());
+
+            std::vector<uint8_t> const v2 = {'{', 'i', 1, 'a', 'i', 1, 'i'};
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(v2), "[json.exception.parse_error.110] parse error at byte 8: syntax error while parsing BJData number: unexpected end of input", json::parse_error&);
+            CHECK(json::from_bjdata(v2, true, false).is_discarded());
+
+            std::vector<uint8_t> const v3 = {'{', 'i', 1, 'a'};
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(v3), "[json.exception.parse_error.110] parse error at byte 5: syntax error while parsing BJData value: unexpected end of input", json::parse_error&);
+            CHECK(json::from_bjdata(v3, true, false).is_discarded());
+
+            std::vector<uint8_t> const vST1 = {'{', '$', 'd', '#', 'i', 2, 'i', 1, 'a'};
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vST1), "[json.exception.parse_error.110] parse error at byte 10: syntax error while parsing BJData number: unexpected end of input", json::parse_error&);
+            CHECK(json::from_bjdata(vST1, true, false).is_discarded());
+
+            std::vector<uint8_t> const vST2 = {'{', '#', 'i', 2, 'i', 1, 'a'};
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vST2), "[json.exception.parse_error.110] parse error at byte 8: syntax error while parsing BJData value: unexpected end of input", json::parse_error&);
+            CHECK(json::from_bjdata(vST2, true, false).is_discarded());
+
+            std::vector<uint8_t> const vO = {'{', '#', '[', 'i', 2, 'i', 1, ']', 'i', 1, 'a', 'i', 1, 'i', 1, 'b', 'i', 2};
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vO), "[json.exception.parse_error.112] parse error at byte 8: syntax error while parsing BJData size: ndarray requires both type and size", json::parse_error&);
+            CHECK(json::from_bjdata(vO, true, false).is_discarded());
+
+            std::vector<uint8_t> const vO2 = {'{', '$', 'i', '#', '[', 'i', 2, 'i', 1, ']', 'i', 1, 'a', 1, 'i', 1, 'b', 2};
+            CHECK_THROWS_WITH_AS(_ = json::from_bjdata(vO2), "[json.exception.parse_error.112] parse error at byte 10: syntax error while parsing BJData object: BJData object does not support ND-array size in optimized format", json::parse_error&);
+            CHECK(json::from_bjdata(vO2, true, false).is_discarded());
+        }
+    }
+
+    SECTION("writing optimized values")
+    {
+        SECTION("integer")
+        {
+            SECTION("array of i")
+            {
+                json const j = {1, -1};
+                std::vector<uint8_t> const expected = {'[', '$', 'i', '#', 'i', 2, 1, 0xff};
+                CHECK(json::to_bjdata(j, true, true) == expected);
+            }
+
+            SECTION("array of U")
+            {
+                json const j = {200, 201};
+                std::vector<uint8_t> const expected = {'[', '$', 'U', '#', 'i', 2, 0xC8, 0xC9};
+                CHECK(json::to_bjdata(j, true, true) == expected);
+            }
+
+            SECTION("array of I")
+            {
+                json const j = {30000, -30000};
+                std::vector<uint8_t> const expected = {'[', '$', 'I', '#', 'i', 2, 0x30, 0x75, 0xd0, 0x8a};
+                CHECK(json::to_bjdata(j, true, true) == expected);
+            }
+
+            SECTION("array of u")
+            {
+                json const j = {50000, 50001};
+                std::vector<uint8_t> const expected = {'[', '$', 'u', '#', 'i', 2, 0x50, 0xC3, 0x51, 0xC3};
+                CHECK(json::to_bjdata(j, true, true) == expected);
+            }
+
+            SECTION("array of l")
+            {
+                json const j = {70000, -70000};
+                std::vector<uint8_t> const expected = {'[', '$', 'l', '#', 'i', 2, 0x70, 0x11, 0x01, 0x00, 0x90, 0xEE, 0xFE, 0xFF};
+                CHECK(json::to_bjdata(j, true, true) == expected);
+            }
+
+            SECTION("array of m")
+            {
+                json const j = {3147483647, 3147483648};
+                std::vector<uint8_t> const expected = {'[', '$', 'm', '#', 'i', 2, 0xFF, 0xC9, 0x9A, 0xBB, 0x00, 0xCA, 0x9A, 0xBB};
+                CHECK(json::to_bjdata(j, true, true) == expected);
+            }
+
+            SECTION("array of L")
+            {
+                json const j = {5000000000, -5000000000};
+                std::vector<uint8_t> const expected = {'[', '$', 'L', '#', 'i', 2, 0x00, 0xF2, 0x05, 0x2A, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xFA, 0xD5, 0xFE, 0xFF, 0xFF, 0xFF};
+                CHECK(json::to_bjdata(j, true, true) == expected);
+            }
+        }
+
+        SECTION("unsigned integer")
+        {
+            SECTION("array of i")
+            {
+                json const j = {1u, 2u};
+                std::vector<uint8_t> const expected = {'[', '$', 'i', '#', 'i', 2, 1, 2};
+                std::vector<uint8_t> const expected_size = {'[', '#', 'i', 2, 'i', 1, 'i', 2};
+                CHECK(json::to_bjdata(j, true, true) == expected);
+                CHECK(json::to_bjdata(j, true) == expected_size);
+            }
+
+            SECTION("array of U")
+            {
+                json const j = {200u, 201u};
+                std::vector<uint8_t> const expected = {'[', '$', 'U', '#', 'i', 2, 0xC8, 0xC9};
+                std::vector<uint8_t> const expected_size = {'[', '#', 'i', 2, 'U', 0xC8, 'U', 0xC9};
+                CHECK(json::to_bjdata(j, true, true) == expected);
+                CHECK(json::to_bjdata(j, true) == expected_size);
+            }
+
+            SECTION("array of I")
+            {
+                json const j = {30000u, 30001u};
+                std::vector<uint8_t> const expected = {'[', '$', 'I', '#', 'i', 2, 0x30, 0x75, 0x31, 0x75};
+                std::vector<uint8_t> const expected_size = {'[', '#', 'i', 2, 'I', 0x30, 0x75, 'I', 0x31, 0x75};
+                CHECK(json::to_bjdata(j, true, true) == expected);
+                CHECK(json::to_bjdata(j, true) == expected_size);
+            }
+
+            SECTION("array of u")
+            {
+                json const j = {50000u, 50001u};
+                std::vector<uint8_t> const expected = {'[', '$', 'u', '#', 'i', 2, 0x50, 0xC3, 0x51, 0xC3};
+                std::vector<uint8_t> const expected_size = {'[', '#', 'i', 2, 'u', 0x50, 0xC3, 'u', 0x51, 0xC3};
+                CHECK(json::to_bjdata(j, true, true) == expected);
+                CHECK(json::to_bjdata(j, true) == expected_size);
+            }
+
+            SECTION("array of l")
+            {
+                json const j = {70000u, 70001u};
+                std::vector<uint8_t> const expected = {'[', '$', 'l', '#', 'i', 2, 0x70, 0x11, 0x01, 0x00, 0x71, 0x11, 0x01, 0x00};
+                std::vector<uint8_t> const expected_size = {'[', '#', 'i', 2, 'l', 0x70, 0x11, 0x01, 0x00, 'l', 0x71, 0x11, 0x01, 0x00};
+                CHECK(json::to_bjdata(j, true, true) == expected);
+                CHECK(json::to_bjdata(j, true) == expected_size);
+            }
+
+            SECTION("array of m")
+            {
+                json const j = {3147483647u, 3147483648u};
+                std::vector<uint8_t> const expected = {'[', '$', 'm', '#', 'i', 2, 0xFF, 0xC9, 0x9A, 0xBB, 0x00, 0xCA, 0x9A, 0xBB};
+                std::vector<uint8_t> const expected_size = {'[', '#', 'i', 2, 'm', 0xFF, 0xC9, 0x9A, 0xBB, 'm', 0x00, 0xCA, 0x9A, 0xBB};
+                CHECK(json::to_bjdata(j, true, true) == expected);
+                CHECK(json::to_bjdata(j, true) == expected_size);
+            }
+
+            SECTION("array of L")
+            {
+                json const j = {5000000000u, 5000000001u};
+                std::vector<uint8_t> const expected = {'[', '$', 'L', '#', 'i', 2, 0x00, 0xF2, 0x05, 0x2A, 0x01, 0x00, 0x00, 0x00, 0x01, 0xF2, 0x05, 0x2A, 0x01, 0x00, 0x00, 0x00};
+                std::vector<uint8_t> const expected_size = {'[', '#', 'i', 2, 'L', 0x00, 0xF2, 0x05, 0x2A, 0x01, 0x00, 0x00, 0x00, 'L', 0x01, 0xF2, 0x05, 0x2A, 0x01, 0x00, 0x00, 0x00};
+                CHECK(json::to_bjdata(j, true, true) == expected);
+                CHECK(json::to_bjdata(j, true) == expected_size);
+            }
+
+            SECTION("array of M")
+            {
+                json const j = {10223372036854775807ull, 10223372036854775808ull};
+                std::vector<uint8_t> const expected = {'[', '$', 'M', '#', 'i', 2, 0xFF, 0xFF, 0x63, 0xA7, 0xB3, 0xB6, 0xE0, 0x8D, 0x00, 0x00, 0x64, 0xA7, 0xB3, 0xB6, 0xE0, 0x8D};
+                std::vector<uint8_t> const expected_size = {'[', '#', 'i', 2, 'M', 0xFF, 0xFF, 0x63, 0xA7, 0xB3, 0xB6, 0xE0, 0x8D, 'M', 0x00, 0x00, 0x64, 0xA7, 0xB3, 0xB6, 0xE0, 0x8D};
+                CHECK(json::to_bjdata(j, true, true) == expected);
+                CHECK(json::to_bjdata(j, true) == expected_size);
+            }
+        }
+    }
+}
+
+TEST_CASE("Universal Binary JSON Specification Examples 1")
+{
+    SECTION("Null Value")
+    {
+        json const j = {{"passcode", nullptr}};
+        std::vector<uint8_t> v = {'{', 'i', 8, 'p', 'a', 's', 's', 'c', 'o', 'd', 'e', 'Z', '}'};
+        CHECK(json::to_bjdata(j) == v);
+        CHECK(json::from_bjdata(v) == j);
+    }
+
+    SECTION("No-Op Value")
+    {
+        json const j = {"foo", "bar", "baz"};
+        std::vector<uint8_t> v = {'[', 'S', 'i', 3, 'f', 'o', 'o',
+                                  'S', 'i', 3, 'b', 'a', 'r',
+                                  'S', 'i', 3, 'b', 'a', 'z', ']'
+                                 };
+        std::vector<uint8_t> const v2 = {'[', 'S', 'i', 3, 'f', 'o', 'o', 'N',
+                                         'S', 'i', 3, 'b', 'a', 'r', 'N', 'N', 'N',
+                                         'S', 'i', 3, 'b', 'a', 'z', 'N', 'N', ']'
+                                        };
+        CHECK(json::to_bjdata(j) == v);
+        CHECK(json::from_bjdata(v) == j);
+        CHECK(json::from_bjdata(v2) == j);
+    }
+
+    SECTION("Boolean Types")
+    {
+        json const j = {{"authorized", true}, {"verified", false}};
+        std::vector<uint8_t> v = {'{', 'i', 10, 'a', 'u', 't', 'h', 'o', 'r', 'i', 'z', 'e', 'd', 'T',
+                                  'i', 8, 'v', 'e', 'r', 'i', 'f', 'i', 'e', 'd', 'F', '}'
+                                 };
+        CHECK(json::to_bjdata(j) == v);
+        CHECK(json::from_bjdata(v) == j);
+    }
+
+    SECTION("Numeric Types")
+    {
+        json j =
+        {
+            {"int8", 16},
+            {"uint8", 255},
+            {"int16", 32767},
+            {"uint16", 42767},
+            {"int32", 2147483647},
+            {"uint32", 3147483647},
+            {"int64", 9223372036854775807},
+            {"uint64", 10223372036854775807ull},
+            {"float64", 113243.7863123}
+        };
+        std::vector<uint8_t> v = {'{',
+                                  'i', 7, 'f', 'l', 'o', 'a', 't', '6', '4', 'D', 0xcf, 0x34, 0xbc, 0x94, 0xbc, 0xa5, 0xfb, 0x40,
+                                  'i', 5, 'i', 'n', 't', '1', '6', 'I', 0xff, 0x7f,
+                                  'i', 5, 'i', 'n', 't', '3', '2', 'l', 0xff, 0xff, 0xff, 0x7f,
+                                  'i', 5, 'i', 'n', 't', '6', '4', 'L', 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f,
+                                  'i', 4, 'i', 'n', 't', '8', 'i', 16,
+                                  'i', 6, 'u', 'i', 'n', 't', '1', '6', 'u', 0x0F, 0xA7,
+                                  'i', 6, 'u', 'i', 'n', 't', '3', '2', 'm', 0xFF, 0xC9, 0x9A, 0xBB,
+                                  'i', 6, 'u', 'i', 'n', 't', '6', '4', 'M', 0xFF, 0xFF, 0x63, 0xA7, 0xB3, 0xB6, 0xE0, 0x8D,
+                                  'i', 5, 'u', 'i', 'n', 't', '8', 'U', 0xff,
+                                  '}'
+                                 };
+        CHECK(json::to_bjdata(j) == v);
+        CHECK(json::from_bjdata(v) == j);
+    }
+
+    SECTION("Char Type")
+    {
+        json const j = {{"rolecode", "a"}, {"delim", ";"}};
+        std::vector<uint8_t> const v = {'{', 'i', 5, 'd', 'e', 'l', 'i', 'm', 'C', ';', 'i', 8, 'r', 'o', 'l', 'e', 'c', 'o', 'd', 'e', 'C', 'a', '}'};
+        //CHECK(json::to_bjdata(j) == v);
+        CHECK(json::from_bjdata(v) == j);
+    }
+
+    SECTION("String Type")
+    {
+        SECTION("English")
+        {
+            json const j = "hello";
+            std::vector<uint8_t> v = {'S', 'i', 5, 'h', 'e', 'l', 'l', 'o'};
+            CHECK(json::to_bjdata(j) == v);
+            CHECK(json::from_bjdata(v) == j);
+        }
+
+        SECTION("Russian")
+        {
+            json const j = "привет";
+            std::vector<uint8_t> v = {'S', 'i', 12, 0xD0, 0xBF, 0xD1, 0x80, 0xD0, 0xB8, 0xD0, 0xB2, 0xD0, 0xB5, 0xD1, 0x82};
+            CHECK(json::to_bjdata(j) == v);
+            CHECK(json::from_bjdata(v) == j);
+        }
+
+        SECTION("Russian")
+        {
+            json const j = "مرحبا";
+            std::vector<uint8_t> v = {'S', 'i', 10, 0xD9, 0x85, 0xD8, 0xB1, 0xD8, 0xAD, 0xD8, 0xA8, 0xD8, 0xA7};
+            CHECK(json::to_bjdata(j) == v);
+            CHECK(json::from_bjdata(v) == j);
+        }
+    }
+
+    SECTION("Array Type")
+    {
+        SECTION("size=false type=false")
+        {
+            // note the float has been replaced by a double
+            json const j = {nullptr, true, false, 4782345193, 153.132, "ham"};
+            std::vector<uint8_t> v = {'[', 'Z', 'T', 'F', 'L', 0xE9, 0xCB, 0x0C, 0x1D, 0x01, 0x00, 0x00, 0x00, 'D', 0x4e, 0x62, 0x10, 0x58, 0x39, 0x24, 0x63, 0x40, 'S', 'i', 3, 'h', 'a', 'm', ']'};
+            CHECK(json::to_bjdata(j) == v);
+            CHECK(json::from_bjdata(v) == j);
+        }
+
+        SECTION("size=true type=false")
+        {
+            // note the float has been replaced by a double
+            json const j = {nullptr, true, false, 4782345193, 153.132, "ham"};
+            std::vector<uint8_t> v = {'[', '#', 'i', 6, 'Z', 'T', 'F', 'L', 0xE9, 0xCB, 0x0C, 0x1D, 0x01, 0x00, 0x00, 0x00, 'D', 0x4e, 0x62, 0x10, 0x58, 0x39, 0x24, 0x63, 0x40, 'S', 'i', 3, 'h', 'a', 'm'};
+            CHECK(json::to_bjdata(j, true) == v);
+            CHECK(json::from_bjdata(v) == j);
+        }
+
+        SECTION("size=true type=true")
+        {
+            // note the float has been replaced by a double
+            json const j = {nullptr, true, false, 4782345193, 153.132, "ham"};
+            std::vector<uint8_t> v = {'[', '#', 'i', 6, 'Z', 'T', 'F', 'L', 0xE9, 0xCB, 0x0C, 0x1D, 0x01, 0x00, 0x00, 0x00, 'D', 0x4e, 0x62, 0x10, 0x58, 0x39, 0x24, 0x63, 0x40, 'S', 'i', 3, 'h', 'a', 'm'};
+            CHECK(json::to_bjdata(j, true, true) == v);
+            CHECK(json::from_bjdata(v) == j);
+        }
+    }
+
+    SECTION("Object Type")
+    {
+        SECTION("size=false type=false")
+        {
+            json j =
+            {
+                {
+                    "post", {
+                        {"id", 1137},
+                        {"author", "rkalla"},
+                        {"timestamp", 1364482090592},
+                        {"body", "I totally agree!"}
+                    }
+                }
+            };
+            std::vector<uint8_t> v = {'{', 'i', 4, 'p', 'o', 's', 't', '{',
+                                      'i', 6, 'a', 'u', 't', 'h', 'o', 'r', 'S', 'i', 6, 'r', 'k', 'a', 'l', 'l', 'a',
+                                      'i', 4, 'b', 'o', 'd', 'y', 'S', 'i', 16, 'I', ' ', 't', 'o', 't', 'a', 'l', 'l', 'y', ' ', 'a', 'g', 'r', 'e', 'e', '!',
+                                      'i', 2, 'i', 'd', 'I', 0x71, 0x04,
+                                      'i', 9, 't', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', 'L', 0x60, 0x66, 0x78, 0xB1, 0x3D, 0x01, 0x00, 0x00,
+                                      '}', '}'
+                                     };
+            CHECK(json::to_bjdata(j) == v);
+            CHECK(json::from_bjdata(v) == j);
+        }
+
+        SECTION("size=true type=false")
+        {
+            json j =
+            {
+                {
+                    "post", {
+                        {"id", 1137},
+                        {"author", "rkalla"},
+                        {"timestamp", 1364482090592},
+                        {"body", "I totally agree!"}
+                    }
+                }
+            };
+            std::vector<uint8_t> v = {'{', '#', 'i', 1, 'i', 4, 'p', 'o', 's', 't', '{', '#', 'i', 4,
+                                      'i', 6, 'a', 'u', 't', 'h', 'o', 'r', 'S', 'i', 6, 'r', 'k', 'a', 'l', 'l', 'a',
+                                      'i', 4, 'b', 'o', 'd', 'y', 'S', 'i', 16, 'I', ' ', 't', 'o', 't', 'a', 'l', 'l', 'y', ' ', 'a', 'g', 'r', 'e', 'e', '!',
+                                      'i', 2, 'i', 'd', 'I', 0x71, 0x04,
+                                      'i', 9, 't', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', 'L', 0x60, 0x66, 0x78, 0xB1, 0x3D, 0x01, 0x00, 0x00,
+                                     };
+            CHECK(json::to_bjdata(j, true) == v);
+            CHECK(json::from_bjdata(v) == j);
+        }
+
+        SECTION("size=true type=true")
+        {
+            json j =
+            {
+                {
+                    "post", {
+                        {"id", 1137},
+                        {"author", "rkalla"},
+                        {"timestamp", 1364482090592},
+                        {"body", "I totally agree!"}
+                    }
+                }
+            };
+            std::vector<uint8_t> v = {'{', '#', 'i', 1, 'i', 4, 'p', 'o', 's', 't', '{', '#', 'i', 4,
+                                      'i', 6, 'a', 'u', 't', 'h', 'o', 'r', 'S', 'i', 6, 'r', 'k', 'a', 'l', 'l', 'a',
+                                      'i', 4, 'b', 'o', 'd', 'y', 'S', 'i', 16, 'I', ' ', 't', 'o', 't', 'a', 'l', 'l', 'y', ' ', 'a', 'g', 'r', 'e', 'e', '!',
+                                      'i', 2, 'i', 'd', 'I', 0x71, 0x04,
+                                      'i', 9, 't', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', 'L', 0x60, 0x66, 0x78, 0xB1, 0x3D, 0x01, 0x00, 0x00,
+                                     };
+            CHECK(json::to_bjdata(j, true, true) == v);
+            CHECK(json::from_bjdata(v) == j);
+        }
+    }
+
+    SECTION("Optimized Format")
+    {
+        SECTION("Array Example")
+        {
+            SECTION("No Optimization")
+            {
+                // note the floats have been replaced by doubles
+                json const j = {29.97, 31.13, 67.0, 2.113, 23.888};
+                std::vector<uint8_t> v = {'[',
+                                          'D', 0xb8, 0x1e, 0x85, 0xeb, 0x51, 0xf8, 0x3d, 0x40,
+                                          'D', 0xe1, 0x7a, 0x14, 0xae, 0x47, 0x21, 0x3f, 0x40,
+                                          'D', 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x50, 0x40,
+                                          'D', 0x81, 0x95, 0x43, 0x8b, 0x6c, 0xe7, 0x00, 0x40,
+                                          'D', 0x17, 0xd9, 0xce, 0xf7, 0x53, 0xe3, 0x37, 0x40,
+                                          ']'
+                                         };
+                CHECK(json::to_bjdata(j) == v);
+                CHECK(json::from_bjdata(v) == j);
+            }
+
+            SECTION("Optimized with count")
+            {
+                // note the floats have been replaced by doubles
+                json const j = {29.97, 31.13, 67.0, 2.113, 23.888};
+                std::vector<uint8_t> v = {'[', '#', 'i', 5,
+                                          'D', 0xb8, 0x1e, 0x85, 0xeb, 0x51, 0xf8, 0x3d, 0x40,
+                                          'D', 0xe1, 0x7a, 0x14, 0xae, 0x47, 0x21, 0x3f, 0x40,
+                                          'D', 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x50, 0x40,
+                                          'D', 0x81, 0x95, 0x43, 0x8b, 0x6c, 0xe7, 0x00, 0x40,
+                                          'D', 0x17, 0xd9, 0xce, 0xf7, 0x53, 0xe3, 0x37, 0x40,
+                                         };
+                CHECK(json::to_bjdata(j, true) == v);
+                CHECK(json::from_bjdata(v) == j);
+            }
+
+            SECTION("Optimized with type & count")
+            {
+                // note the floats have been replaced by doubles
+                json const j = {29.97, 31.13, 67.0, 2.113, 23.888};
+                std::vector<uint8_t> v = {'[', '$', 'D', '#', 'i', 5,
+                                          0xb8, 0x1e, 0x85, 0xeb, 0x51, 0xf8, 0x3d, 0x40,
+                                          0xe1, 0x7a, 0x14, 0xae, 0x47, 0x21, 0x3f, 0x40,
+                                          0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x50, 0x40,
+                                          0x81, 0x95, 0x43, 0x8b, 0x6c, 0xe7, 0x00, 0x40,
+                                          0x17, 0xd9, 0xce, 0xf7, 0x53, 0xe3, 0x37, 0x40,
+                                         };
+                CHECK(json::to_bjdata(j, true, true) == v);
+                CHECK(json::from_bjdata(v) == j);
+            }
+        }
+
+        SECTION("Object Example")
+        {
+            SECTION("No Optimization")
+            {
+                // note the floats have been replaced by doubles
+                json const j = { {"lat", 29.976}, {"long", 31.131}, {"alt", 67.0} };
+                std::vector<uint8_t> v = {'{',
+                                          'i', 3, 'a', 'l', 't', 'D',      0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x50, 0x40,
+                                          'i', 3, 'l', 'a', 't', 'D',      0x60, 0xe5, 0xd0, 0x22, 0xdb, 0xf9, 0x3d, 0x40,
+                                          'i', 4, 'l', 'o', 'n', 'g', 'D', 0xa8, 0xc6, 0x4b, 0x37, 0x89, 0x21, 0x3f, 0x40,
+                                          '}'
+                                         };
+                CHECK(json::to_bjdata(j) == v);
+                CHECK(json::from_bjdata(v) == j);
+            }
+
+            SECTION("Optimized with count")
+            {
+                // note the floats have been replaced by doubles
+                json const j = { {"lat", 29.976}, {"long", 31.131}, {"alt", 67.0} };
+                std::vector<uint8_t> v = {'{', '#', 'i', 3,
+                                          'i', 3, 'a', 'l', 't', 'D',      0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x50, 0x40,
+                                          'i', 3, 'l', 'a', 't', 'D',      0x60, 0xe5, 0xd0, 0x22, 0xdb, 0xf9, 0x3d, 0x40,
+                                          'i', 4, 'l', 'o', 'n', 'g', 'D', 0xa8, 0xc6, 0x4b, 0x37, 0x89, 0x21, 0x3f, 0x40,
+                                         };
+                CHECK(json::to_bjdata(j, true) == v);
+                CHECK(json::from_bjdata(v) == j);
+            }
+
+            SECTION("Optimized with type & count")
+            {
+                // note the floats have been replaced by doubles
+                json const j = { {"lat", 29.976}, {"long", 31.131}, {"alt", 67.0} };
+                std::vector<uint8_t> v = {'{', '$', 'D', '#', 'i', 3,
+                                          'i', 3, 'a', 'l', 't',      0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x50, 0x40,
+                                          'i', 3, 'l', 'a', 't',      0x60, 0xe5, 0xd0, 0x22, 0xdb, 0xf9, 0x3d, 0x40,
+                                          'i', 4, 'l', 'o', 'n', 'g', 0xa8, 0xc6, 0x4b, 0x37, 0x89, 0x21, 0x3f, 0x40,
+                                         };
+                CHECK(json::to_bjdata(j, true, true) == v);
+                CHECK(json::from_bjdata(v) == j);
+            }
+        }
+
+        SECTION("Special Cases (Null, No-Op and Boolean)")
+        {
+            SECTION("Array")
+            {
+                json _;
+                std::vector<uint8_t> const v = {'[', '$', 'N', '#', 'I', 0x00, 0x02};
+                CHECK_THROWS_WITH_AS(_ = json::from_bjdata(v), "[json.exception.parse_error.112] parse error at byte 3: syntax error while parsing BJData type: marker 0x4E is not a permitted optimized array type", json::parse_error&);
+                CHECK(json::from_bjdata(v, true, false).is_discarded());
+            }
+
+            SECTION("Object")
+            {
+                json _;
+                std::vector<uint8_t> const v = {'{', '$', 'Z', '#', 'i', 3, 'i', 4, 'n', 'a', 'm', 'e', 'i', 8, 'p', 'a', 's', 's', 'w', 'o', 'r', 'd', 'i', 5, 'e', 'm', 'a', 'i', 'l'};
+                CHECK_THROWS_WITH_AS(_ = json::from_bjdata(v), "[json.exception.parse_error.112] parse error at byte 3: syntax error while parsing BJData type: marker 0x5A is not a permitted optimized array type", json::parse_error&);
+                CHECK(json::from_bjdata(v, true, false).is_discarded());
+            }
+        }
+    }
+}
+
+#if !defined(JSON_NOEXCEPTION)
+TEST_CASE("all BJData first bytes")
+{
+    // these bytes will fail immediately with exception parse_error.112
+    std::set<uint8_t> supported =
+    {
+        'T', 'F', 'Z', 'U', 'i', 'I', 'l', 'L', 'd', 'D', 'C', 'S', '[', '{', 'N', 'H', 'u', 'm', 'M', 'h'
+    };
+
+    for (auto i = 0; i < 256; ++i)
+    {
+        const auto byte = static_cast<uint8_t>(i);
+        CAPTURE(byte)
+
+        try
+        {
+            auto res = json::from_bjdata(std::vector<uint8_t>(1, byte));
+        }
+        catch (const json::parse_error& e)
+        {
+            // check that parse_error.112 is only thrown if the
+            // first byte is not in the supported set
+            INFO_WITH_TEMP(e.what());
+            if (supported.find(byte) == supported.end())
+            {
+                CHECK(e.id == 112);
+            }
+            else
+            {
+                CHECK(e.id != 112);
+            }
+        }
+    }
+}
+#endif
+
+TEST_CASE("BJData roundtrips" * doctest::skip())
+{
+    SECTION("input from self-generated BJData files")
+    {
+        for (const std::string filename :
+                {
+                    TEST_DATA_DIRECTORY "/json_nlohmann_tests/all_unicode.json",
+                    TEST_DATA_DIRECTORY "/json.org/1.json",
+                    TEST_DATA_DIRECTORY "/json.org/2.json",
+                    TEST_DATA_DIRECTORY "/json.org/3.json",
+                    TEST_DATA_DIRECTORY "/json.org/4.json",
+                    TEST_DATA_DIRECTORY "/json.org/5.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip01.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip02.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip03.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip04.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip05.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip06.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip07.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip08.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip09.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip10.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip11.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip12.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip13.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip14.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip15.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip16.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip17.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip18.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip19.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip20.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip21.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip22.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip23.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip24.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip25.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip26.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip27.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip28.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip29.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip30.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip31.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip32.json",
+                    TEST_DATA_DIRECTORY "/json_testsuite/sample.json",
+                    TEST_DATA_DIRECTORY "/json_tests/pass1.json",
+                    TEST_DATA_DIRECTORY "/json_tests/pass2.json",
+                    TEST_DATA_DIRECTORY "/json_tests/pass3.json"
+                })
+        {
+            CAPTURE(filename)
+
+            {
+                INFO_WITH_TEMP(filename + ": std::vector<uint8_t>");
+                // parse JSON file
+                std::ifstream f_json(filename);
+                json j1 = json::parse(f_json);
+
+                // parse BJData file
+                auto packed = utils::read_binary_file(filename + ".bjdata");
+                json j2;
+                CHECK_NOTHROW(j2 = json::from_bjdata(packed));
+
+                // compare parsed JSON values
+                CHECK(j1 == j2);
+            }
+
+            {
+                INFO_WITH_TEMP(filename + ": std::ifstream");
+                // parse JSON file
+                std::ifstream f_json(filename);
+                json j1 = json::parse(f_json);
+
+                // parse BJData file
+                std::ifstream f_bjdata(filename + ".bjdata", std::ios::binary);
+                json j2;
+                CHECK_NOTHROW(j2 = json::from_bjdata(f_bjdata));
+
+                // compare parsed JSON values
+                CHECK(j1 == j2);
+            }
+
+            {
+                INFO_WITH_TEMP(filename + ": output to output adapters");
+                // parse JSON file
+                std::ifstream f_json(filename);
+                json const j1 = json::parse(f_json);
+
+                // parse BJData file
+                auto packed = utils::read_binary_file(filename + ".bjdata");
+
+                {
+                    INFO_WITH_TEMP(filename + ": output adapters: std::vector<uint8_t>");
+                    std::vector<uint8_t> vec;
+                    json::to_bjdata(j1, vec);
+                    CHECK(vec == packed);
+                }
+            }
+        }
+    }
+}
diff --git a/external_imported/json/test/src/unit-bson.cpp b/external_imported/json/tests/src/unit-bson.cpp
similarity index 78%
rename from external_imported/json/test/src/unit-bson.cpp
rename to external_imported/json/tests/src/unit-bson.cpp
index ef3c8d408..13216f2f5 100644
--- a/external_imported/json/test/src/unit-bson.cpp
+++ b/external_imported/json/tests/src/unit-bson.cpp
@@ -1,31 +1,10 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
 
 #include "doctest_compatibility.h"
 
@@ -33,8 +12,9 @@ SOFTWARE.
 using nlohmann::json;
 
 #include <fstream>
+#include <limits>
 #include <sstream>
-#include <test_data.hpp>
+#include "make_test_data_available.hpp"
 #include "test_utils.hpp"
 
 TEST_CASE("BSON")
@@ -43,75 +23,67 @@ TEST_CASE("BSON")
     {
         SECTION("null")
         {
-            json j = nullptr;
-            CHECK_THROWS_AS(json::to_bson(j), json::type_error&);
-            CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.type_error.317] to serialize to BSON, top-level type must be object, but is null");
+            json const j = nullptr;
+            CHECK_THROWS_WITH_AS(json::to_bson(j), "[json.exception.type_error.317] to serialize to BSON, top-level type must be object, but is null", json::type_error&);
         }
 
         SECTION("boolean")
         {
             SECTION("true")
             {
-                json j = true;
-                CHECK_THROWS_AS(json::to_bson(j), json::type_error&);
-                CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.type_error.317] to serialize to BSON, top-level type must be object, but is boolean");
+                json const j = true;
+                CHECK_THROWS_WITH_AS(json::to_bson(j), "[json.exception.type_error.317] to serialize to BSON, top-level type must be object, but is boolean", json::type_error&);
             }
 
             SECTION("false")
             {
-                json j = false;
-                CHECK_THROWS_AS(json::to_bson(j), json::type_error&);
-                CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.type_error.317] to serialize to BSON, top-level type must be object, but is boolean");
+                json const j = false;
+                CHECK_THROWS_WITH_AS(json::to_bson(j), "[json.exception.type_error.317] to serialize to BSON, top-level type must be object, but is boolean", json::type_error&);
             }
         }
 
         SECTION("number")
         {
-            json j = 42;
-            CHECK_THROWS_AS(json::to_bson(j), json::type_error&);
-            CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.type_error.317] to serialize to BSON, top-level type must be object, but is number");
+            json const j = 42;
+            CHECK_THROWS_WITH_AS(json::to_bson(j), "[json.exception.type_error.317] to serialize to BSON, top-level type must be object, but is number", json::type_error&);
         }
 
         SECTION("float")
         {
-            json j = 4.2;
-            CHECK_THROWS_AS(json::to_bson(j), json::type_error&);
-            CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.type_error.317] to serialize to BSON, top-level type must be object, but is number");
+            json const j = 4.2;
+            CHECK_THROWS_WITH_AS(json::to_bson(j), "[json.exception.type_error.317] to serialize to BSON, top-level type must be object, but is number", json::type_error&);
         }
 
         SECTION("string")
         {
-            json j = "not supported";
-            CHECK_THROWS_AS(json::to_bson(j), json::type_error&);
-            CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.type_error.317] to serialize to BSON, top-level type must be object, but is string");
+            json const j = "not supported";
+            CHECK_THROWS_WITH_AS(json::to_bson(j), "[json.exception.type_error.317] to serialize to BSON, top-level type must be object, but is string", json::type_error&);
         }
 
         SECTION("array")
         {
-            json j = std::vector<int> {1, 2, 3, 4, 5, 6, 7};
-            CHECK_THROWS_AS(json::to_bson(j), json::type_error&);
-            CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.type_error.317] to serialize to BSON, top-level type must be object, but is array");
+            json const j = std::vector<int> {1, 2, 3, 4, 5, 6, 7};
+            CHECK_THROWS_WITH_AS(json::to_bson(j), "[json.exception.type_error.317] to serialize to BSON, top-level type must be object, but is array", json::type_error&);
         }
     }
 
     SECTION("keys containing code-point U+0000 cannot be serialized to BSON")
     {
-        json j =
+        json const j =
         {
             { std::string("en\0try", 6), true }
         };
-        CHECK_THROWS_AS(json::to_bson(j), json::out_of_range&);
 #if JSON_DIAGNOSTICS
-        CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.out_of_range.409] (/en) BSON key cannot contain code point U+0000 (at byte 2)");
+        CHECK_THROWS_WITH_AS(json::to_bson(j), "[json.exception.out_of_range.409] (/en) BSON key cannot contain code point U+0000 (at byte 2)", json::out_of_range&);
 #else
-        CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.out_of_range.409] BSON key cannot contain code point U+0000 (at byte 2)");
+        CHECK_THROWS_WITH_AS(json::to_bson(j), "[json.exception.out_of_range.409] BSON key cannot contain code point U+0000 (at byte 2)", json::out_of_range&);
 #endif
     }
 
     SECTION("string length must be at least 1")
     {
         // from https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11175
-        std::vector<std::uint8_t> v =
+        std::vector<std::uint8_t> const v =
         {
             0x20, 0x20, 0x20, 0x20,
             0x02,
@@ -119,16 +91,15 @@ TEST_CASE("BSON")
             0x00, 0x00, 0x00, 0x80
         };
         json _;
-        CHECK_THROWS_AS(_ = json::from_bson(v), json::parse_error&);
-        CHECK_THROWS_WITH(_ = json::from_bson(v), "[json.exception.parse_error.112] parse error at byte 10: syntax error while parsing BSON string: string length must be at least 1, is -2147483648");
+        CHECK_THROWS_WITH_AS(_ = json::from_bson(v), "[json.exception.parse_error.112] parse error at byte 10: syntax error while parsing BSON string: string length must be at least 1, is -2147483648", json::parse_error&);
     }
 
     SECTION("objects")
     {
         SECTION("empty object")
         {
-            json j = json::object();
-            std::vector<std::uint8_t> expected =
+            json const j = json::object();
+            std::vector<std::uint8_t> const expected =
             {
                 0x05, 0x00, 0x00, 0x00, // size (little endian)
                 // no entries
@@ -145,12 +116,12 @@ TEST_CASE("BSON")
 
         SECTION("non-empty object with bool")
         {
-            json j =
+            json const j =
             {
                 { "entry", true }
             };
 
-            std::vector<std::uint8_t> expected =
+            std::vector<std::uint8_t> const expected =
             {
                 0x0D, 0x00, 0x00, 0x00, // size (little endian)
                 0x08,               // entry: boolean
@@ -169,12 +140,12 @@ TEST_CASE("BSON")
 
         SECTION("non-empty object with bool")
         {
-            json j =
+            json const j =
             {
                 { "entry", false }
             };
 
-            std::vector<std::uint8_t> expected =
+            std::vector<std::uint8_t> const expected =
             {
                 0x0D, 0x00, 0x00, 0x00, // size (little endian)
                 0x08,               // entry: boolean
@@ -193,12 +164,12 @@ TEST_CASE("BSON")
 
         SECTION("non-empty object with double")
         {
-            json j =
+            json const j =
             {
                 { "entry", 4.2 }
             };
 
-            std::vector<std::uint8_t> expected =
+            std::vector<std::uint8_t> const expected =
             {
                 0x14, 0x00, 0x00, 0x00, // size (little endian)
                 0x01, /// entry: double
@@ -217,12 +188,12 @@ TEST_CASE("BSON")
 
         SECTION("non-empty object with string")
         {
-            json j =
+            json const j =
             {
                 { "entry", "bsonstr" }
             };
 
-            std::vector<std::uint8_t> expected =
+            std::vector<std::uint8_t> const expected =
             {
                 0x18, 0x00, 0x00, 0x00, // size (little endian)
                 0x02, /// entry: string (UTF-8)
@@ -241,12 +212,12 @@ TEST_CASE("BSON")
 
         SECTION("non-empty object with null member")
         {
-            json j =
+            json const j =
             {
                 { "entry", nullptr }
             };
 
-            std::vector<std::uint8_t> expected =
+            std::vector<std::uint8_t> const expected =
             {
                 0x0C, 0x00, 0x00, 0x00, // size (little endian)
                 0x0A, /// entry: null
@@ -264,12 +235,12 @@ TEST_CASE("BSON")
 
         SECTION("non-empty object with integer (32-bit) member")
         {
-            json j =
+            json const j =
             {
                 { "entry", std::int32_t{0x12345678} }
             };
 
-            std::vector<std::uint8_t> expected =
+            std::vector<std::uint8_t> const expected =
             {
                 0x10, 0x00, 0x00, 0x00, // size (little endian)
                 0x10, /// entry: int32
@@ -288,12 +259,12 @@ TEST_CASE("BSON")
 
         SECTION("non-empty object with integer (64-bit) member")
         {
-            json j =
+            json const j =
             {
                 { "entry", std::int64_t{0x1234567804030201} }
             };
 
-            std::vector<std::uint8_t> expected =
+            std::vector<std::uint8_t> const expected =
             {
                 0x14, 0x00, 0x00, 0x00, // size (little endian)
                 0x12, /// entry: int64
@@ -312,12 +283,12 @@ TEST_CASE("BSON")
 
         SECTION("non-empty object with negative integer (32-bit) member")
         {
-            json j =
+            json const j =
             {
                 { "entry", std::int32_t{-1} }
             };
 
-            std::vector<std::uint8_t> expected =
+            std::vector<std::uint8_t> const expected =
             {
                 0x10, 0x00, 0x00, 0x00, // size (little endian)
                 0x10, /// entry: int32
@@ -336,12 +307,12 @@ TEST_CASE("BSON")
 
         SECTION("non-empty object with negative integer (64-bit) member")
         {
-            json j =
+            json const j =
             {
                 { "entry", std::int64_t{-1} }
             };
 
-            std::vector<std::uint8_t> expected =
+            std::vector<std::uint8_t> const expected =
             {
                 0x10, 0x00, 0x00, 0x00, // size (little endian)
                 0x10, /// entry: int32
@@ -361,12 +332,12 @@ TEST_CASE("BSON")
         SECTION("non-empty object with unsigned integer (64-bit) member")
         {
             // directly encoding uint64 is not supported in bson (only for timestamp values)
-            json j =
+            json const j =
             {
                 { "entry", std::uint64_t{0x1234567804030201} }
             };
 
-            std::vector<std::uint8_t> expected =
+            std::vector<std::uint8_t> const expected =
             {
                 0x14, 0x00, 0x00, 0x00, // size (little endian)
                 0x12, /// entry: int64
@@ -385,12 +356,12 @@ TEST_CASE("BSON")
 
         SECTION("non-empty object with small unsigned integer member")
         {
-            json j =
+            json const j =
             {
                 { "entry", std::uint64_t{0x42} }
             };
 
-            std::vector<std::uint8_t> expected =
+            std::vector<std::uint8_t> const expected =
             {
                 0x10, 0x00, 0x00, 0x00, // size (little endian)
                 0x10, /// entry: int32
@@ -409,12 +380,12 @@ TEST_CASE("BSON")
 
         SECTION("non-empty object with object member")
         {
-            json j =
+            json const j =
             {
                 { "entry", json::object() }
             };
 
-            std::vector<std::uint8_t> expected =
+            std::vector<std::uint8_t> const expected =
             {
                 0x11, 0x00, 0x00, 0x00, // size (little endian)
                 0x03, /// entry: embedded document
@@ -437,12 +408,12 @@ TEST_CASE("BSON")
 
         SECTION("non-empty object with array member")
         {
-            json j =
+            json const j =
             {
                 { "entry", json::array() }
             };
 
-            std::vector<std::uint8_t> expected =
+            std::vector<std::uint8_t> const expected =
             {
                 0x11, 0x00, 0x00, 0x00, // size (little endian)
                 0x04, /// entry: embedded document
@@ -465,12 +436,12 @@ TEST_CASE("BSON")
 
         SECTION("non-empty object with non-empty array member")
         {
-            json j =
+            json const j =
             {
                 { "entry", json::array({1, 2, 3, 4, 5, 6, 7, 8}) }
             };
 
-            std::vector<std::uint8_t> expected =
+            std::vector<std::uint8_t> const expected =
             {
                 0x49, 0x00, 0x00, 0x00, // size (little endian)
                 0x04, /// entry: embedded document
@@ -502,12 +473,12 @@ TEST_CASE("BSON")
         {
             const size_t N = 10;
             const auto s = std::vector<std::uint8_t>(N, 'x');
-            json j =
+            json const j =
             {
                 { "entry", json::binary(s, 0) }
             };
 
-            std::vector<std::uint8_t> expected =
+            std::vector<std::uint8_t> const expected =
             {
                 0x1B, 0x00, 0x00, 0x00, // size (little endian)
                 0x05, // entry: binary
@@ -532,12 +503,12 @@ TEST_CASE("BSON")
         {
             // an MD5 hash
             const std::vector<std::uint8_t> md5hash = {0xd7, 0x7e, 0x27, 0x54, 0xbe, 0x12, 0x37, 0xfe, 0xd6, 0x0c, 0x33, 0x98, 0x30, 0x3b, 0x8d, 0xc4};
-            json j =
+            json const j =
             {
                 { "entry", json::binary(md5hash, 5) }
             };
 
-            std::vector<std::uint8_t> expected =
+            std::vector<std::uint8_t> const expected =
             {
                 0x21, 0x00, 0x00, 0x00, // size (little endian)
                 0x05, // entry: binary
@@ -561,7 +532,7 @@ TEST_CASE("BSON")
         SECTION("Some more complex document")
         {
             // directly encoding uint64 is not supported in bson (only for timestamp values)
-            json j =
+            json const j =
             {
                 {"double", 42.5},
                 {"entry", 4.2},
@@ -569,7 +540,7 @@ TEST_CASE("BSON")
                 {"object", {{ "string", "value" }}}
             };
 
-            std::vector<std::uint8_t> expected =
+            std::vector<std::uint8_t> const expected =
             {
                 /*size */ 0x4f, 0x00, 0x00, 0x00,
                 /*entry*/ 0x01, 'd',  'o',  'u',  'b',  'l',  'e',  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x45, 0x40,
@@ -591,7 +562,7 @@ TEST_CASE("BSON")
         }
     }
 
-    SECTION("Examples from http://bsonspec.org/faq.html")
+    SECTION("Examples from https://bsonspec.org/faq.html")
     {
         SECTION("Example 1")
         {
@@ -627,7 +598,7 @@ TEST_CASE("BSON input/output_adapters")
         {"object", {{ "string", "value" }}}
     };
 
-    std::vector<std::uint8_t> bson_representation =
+    std::vector<std::uint8_t> const bson_representation =
     {
         /*size */ 0x4f, 0x00, 0x00, 0x00,
         /*entry*/ 0x01, 'd',  'o',  'u',  'b',  'l',  'e',  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x45, 0x40,
@@ -687,42 +658,42 @@ class SaxCountdown
         return events_left-- > 0;
     }
 
-    bool boolean(bool)
+    bool boolean(bool /*unused*/)
     {
         return events_left-- > 0;
     }
 
-    bool number_integer(json::number_integer_t)
+    bool number_integer(json::number_integer_t /*unused*/)
     {
         return events_left-- > 0;
     }
 
-    bool number_unsigned(json::number_unsigned_t)
+    bool number_unsigned(json::number_unsigned_t /*unused*/)
     {
         return events_left-- > 0;
     }
 
-    bool number_float(json::number_float_t, const std::string&)
+    bool number_float(json::number_float_t /*unused*/, const std::string& /*unused*/)
     {
         return events_left-- > 0;
     }
 
-    bool string(std::string&)
+    bool string(std::string& /*unused*/)
     {
         return events_left-- > 0;
     }
 
-    bool binary(std::vector<std::uint8_t>&)
+    bool binary(std::vector<std::uint8_t>& /*unused*/)
     {
         return events_left-- > 0;
     }
 
-    bool start_object(std::size_t)
+    bool start_object(std::size_t /*unused*/)
     {
         return events_left-- > 0;
     }
 
-    bool key(std::string&)
+    bool key(std::string& /*unused*/)
     {
         return events_left-- > 0;
     }
@@ -732,7 +703,7 @@ class SaxCountdown
         return events_left-- > 0;
     }
 
-    bool start_array(std::size_t)
+    bool start_array(std::size_t /*unused*/)
     {
         return events_left-- > 0;
     }
@@ -742,7 +713,7 @@ class SaxCountdown
         return events_left-- > 0;
     }
 
-    bool parse_error(std::size_t, const std::string&, const json::exception&)
+    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/, const json::exception& /*unused*/) // NOLINT(readability-convert-member-functions-to-static)
     {
         return false;
     }
@@ -750,13 +721,13 @@ class SaxCountdown
   private:
     int events_left = 0;
 };
-}
+} // namespace
 
 TEST_CASE("Incomplete BSON Input")
 {
     SECTION("Incomplete BSON Input 1")
     {
-        std::vector<std::uint8_t> incomplete_bson =
+        std::vector<std::uint8_t> const incomplete_bson =
         {
             0x0D, 0x00, 0x00, 0x00, // size (little endian)
             0x08,                   // entry: boolean
@@ -764,9 +735,7 @@ TEST_CASE("Incomplete BSON Input")
         };
 
         json _;
-        CHECK_THROWS_AS(_ = json::from_bson(incomplete_bson), json::parse_error&);
-        CHECK_THROWS_WITH(_ = json::from_bson(incomplete_bson),
-                          "[json.exception.parse_error.110] parse error at byte 9: syntax error while parsing BSON cstring: unexpected end of input");
+        CHECK_THROWS_WITH_AS(_ = json::from_bson(incomplete_bson), "[json.exception.parse_error.110] parse error at byte 9: syntax error while parsing BSON cstring: unexpected end of input", json::parse_error&);
 
         CHECK(json::from_bson(incomplete_bson, true, false).is_discarded());
 
@@ -776,16 +745,14 @@ TEST_CASE("Incomplete BSON Input")
 
     SECTION("Incomplete BSON Input 2")
     {
-        std::vector<std::uint8_t> incomplete_bson =
+        std::vector<std::uint8_t> const incomplete_bson =
         {
             0x0D, 0x00, 0x00, 0x00, // size (little endian)
             0x08,                   // entry: boolean, unexpected EOF
         };
 
         json _;
-        CHECK_THROWS_AS(_ = json::from_bson(incomplete_bson), json::parse_error&);
-        CHECK_THROWS_WITH(_ = json::from_bson(incomplete_bson),
-                          "[json.exception.parse_error.110] parse error at byte 6: syntax error while parsing BSON cstring: unexpected end of input");
+        CHECK_THROWS_WITH_AS(_ = json::from_bson(incomplete_bson), "[json.exception.parse_error.110] parse error at byte 6: syntax error while parsing BSON cstring: unexpected end of input", json::parse_error&);
         CHECK(json::from_bson(incomplete_bson, true, false).is_discarded());
 
         SaxCountdown scp(0);
@@ -794,7 +761,7 @@ TEST_CASE("Incomplete BSON Input")
 
     SECTION("Incomplete BSON Input 3")
     {
-        std::vector<std::uint8_t> incomplete_bson =
+        std::vector<std::uint8_t> const incomplete_bson =
         {
             0x41, 0x00, 0x00, 0x00, // size (little endian)
             0x04, /// entry: embedded document
@@ -807,9 +774,7 @@ TEST_CASE("Incomplete BSON Input")
         };
 
         json _;
-        CHECK_THROWS_AS(_ = json::from_bson(incomplete_bson), json::parse_error&);
-        CHECK_THROWS_WITH(_ = json::from_bson(incomplete_bson),
-                          "[json.exception.parse_error.110] parse error at byte 28: syntax error while parsing BSON element list: unexpected end of input");
+        CHECK_THROWS_WITH_AS(_ = json::from_bson(incomplete_bson), "[json.exception.parse_error.110] parse error at byte 28: syntax error while parsing BSON element list: unexpected end of input", json::parse_error&);
         CHECK(json::from_bson(incomplete_bson, true, false).is_discarded());
 
         SaxCountdown scp(1);
@@ -818,15 +783,13 @@ TEST_CASE("Incomplete BSON Input")
 
     SECTION("Incomplete BSON Input 4")
     {
-        std::vector<std::uint8_t> incomplete_bson =
+        std::vector<std::uint8_t> const incomplete_bson =
         {
             0x0D, 0x00, // size (incomplete), unexpected EOF
         };
 
         json _;
-        CHECK_THROWS_AS(_ = json::from_bson(incomplete_bson), json::parse_error&);
-        CHECK_THROWS_WITH(_ = json::from_bson(incomplete_bson),
-                          "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing BSON number: unexpected end of input");
+        CHECK_THROWS_WITH_AS(_ = json::from_bson(incomplete_bson), "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing BSON number: unexpected end of input", json::parse_error&);
         CHECK(json::from_bson(incomplete_bson, true, false).is_discarded());
 
         SaxCountdown scp(0);
@@ -837,7 +800,7 @@ TEST_CASE("Incomplete BSON Input")
     {
         SECTION("key")
         {
-            json j = {{"key", "value"}};
+            json const j = {{"key", "value"}};
             auto bson_vec = json::to_bson(j);
             SaxCountdown scp(2);
             CHECK(!json::sax_parse(bson_vec, &scp, json::input_format_t::bson));
@@ -845,7 +808,7 @@ TEST_CASE("Incomplete BSON Input")
 
         SECTION("array")
         {
-            json j =
+            json const j =
             {
                 { "entry", json::array() }
             };
@@ -859,7 +822,7 @@ TEST_CASE("Incomplete BSON Input")
 TEST_CASE("Negative size of binary value")
 {
     // invalid BSON: the size of the binary value is -1
-    std::vector<std::uint8_t> input =
+    std::vector<std::uint8_t> const input =
     {
         0x21, 0x00, 0x00, 0x00, // size (little endian)
         0x05, // entry: binary
@@ -872,13 +835,12 @@ TEST_CASE("Negative size of binary value")
         0x00 // end marker
     };
     json _;
-    CHECK_THROWS_AS(_ = json::from_bson(input), json::parse_error);
-    CHECK_THROWS_WITH(_ = json::from_bson(input), "[json.exception.parse_error.112] parse error at byte 15: syntax error while parsing BSON binary: byte array length cannot be negative, is -1");
+    CHECK_THROWS_WITH_AS(_ = json::from_bson(input), "[json.exception.parse_error.112] parse error at byte 15: syntax error while parsing BSON binary: byte array length cannot be negative, is -1", json::parse_error);
 }
 
 TEST_CASE("Unsupported BSON input")
 {
-    std::vector<std::uint8_t> bson =
+    std::vector<std::uint8_t> const bson =
     {
         0x0C, 0x00, 0x00, 0x00, // size (little endian)
         0xFF,                   // entry type: Min key (not supported yet)
@@ -887,9 +849,7 @@ TEST_CASE("Unsupported BSON input")
     };
 
     json _;
-    CHECK_THROWS_AS(_ = json::from_bson(bson), json::parse_error&);
-    CHECK_THROWS_WITH(_ = json::from_bson(bson),
-                      "[json.exception.parse_error.114] parse error at byte 5: Unsupported BSON record type 0xFF");
+    CHECK_THROWS_WITH_AS(_ = json::from_bson(bson), "[json.exception.parse_error.114] parse error at byte 5: Unsupported BSON record type 0xFF", json::parse_error&);
     CHECK(json::from_bson(bson, true, false).is_discarded());
 
     SaxCountdown scp(0);
@@ -904,9 +864,9 @@ TEST_CASE("BSON numerical data")
         {
             SECTION("std::int64_t: INT64_MIN .. INT32_MIN-1")
             {
-                std::vector<int64_t> numbers
+                std::vector<int64_t> const numbers
                 {
-                    INT64_MIN,
+                    (std::numeric_limits<int64_t>::min)(),
                     -1000000000000000000LL,
                     -100000000000000000LL,
                     -10000000000000000LL,
@@ -916,22 +876,22 @@ TEST_CASE("BSON numerical data")
                     -1000000000000LL,
                     -100000000000LL,
                     -10000000000LL,
-                    static_cast<std::int64_t>(INT32_MIN) - 1,
+                    static_cast<std::int64_t>((std::numeric_limits<std::int32_t>::min)()) - 1,
                 };
 
-                for (auto i : numbers)
+                for (const auto i : numbers)
                 {
 
                     CAPTURE(i)
 
-                    json j =
+                    json const j =
                     {
                         { "entry", i }
                     };
                     CHECK(j.at("entry").is_number_integer());
 
-                    std::uint64_t iu = *reinterpret_cast<std::uint64_t*>(&i);
-                    std::vector<std::uint8_t> expected_bson =
+                    std::uint64_t const iu = *reinterpret_cast<const std::uint64_t*>(&i);
+                    std::vector<std::uint8_t> const expected_bson =
                     {
                         0x14u, 0x00u, 0x00u, 0x00u, // size (little endian)
                         0x12u, /// entry: int64
@@ -959,12 +919,11 @@ TEST_CASE("BSON numerical data")
                 }
             }
 
-
             SECTION("signed std::int32_t: INT32_MIN .. INT32_MAX")
             {
-                std::vector<int32_t> numbers
+                std::vector<int32_t> const numbers
                 {
-                    INT32_MIN,
+                    (std::numeric_limits<int32_t>::min)(),
                     -2147483647L,
                     -1000000000L,
                     -100000000L,
@@ -988,22 +947,22 @@ TEST_CASE("BSON numerical data")
                     100000000L,
                     1000000000L,
                     2147483646L,
-                    INT32_MAX
+                    (std::numeric_limits<int32_t>::max)()
                 };
 
-                for (auto i : numbers)
+                for (const auto i : numbers)
                 {
 
                     CAPTURE(i)
 
-                    json j =
+                    json const j =
                     {
                         { "entry", i }
                     };
                     CHECK(j.at("entry").is_number_integer());
 
-                    std::uint32_t iu = *reinterpret_cast<std::uint32_t*>(&i);
-                    std::vector<std::uint8_t> expected_bson =
+                    std::uint32_t const iu = *reinterpret_cast<const std::uint32_t*>(&i);
+                    std::vector<std::uint8_t> const expected_bson =
                     {
                         0x10u, 0x00u, 0x00u, 0x00u, // size (little endian)
                         0x10u, /// entry: int32
@@ -1029,9 +988,9 @@ TEST_CASE("BSON numerical data")
 
             SECTION("signed std::int64_t: INT32_MAX+1 .. INT64_MAX")
             {
-                std::vector<int64_t> numbers
+                std::vector<int64_t> const numbers
                 {
-                    INT64_MAX,
+                    (std::numeric_limits<int64_t>::max)(),
                     1000000000000000000LL,
                     100000000000000000LL,
                     10000000000000000LL,
@@ -1041,22 +1000,22 @@ TEST_CASE("BSON numerical data")
                     1000000000000LL,
                     100000000000LL,
                     10000000000LL,
-                    static_cast<std::int64_t>(INT32_MAX) + 1,
+                    static_cast<std::int64_t>((std::numeric_limits<int32_t>::max)()) + 1,
                 };
 
-                for (auto i : numbers)
+                for (const auto i : numbers)
                 {
 
                     CAPTURE(i)
 
-                    json j =
+                    json const j =
                     {
                         { "entry", i }
                     };
                     CHECK(j.at("entry").is_number_integer());
 
-                    std::uint64_t iu = *reinterpret_cast<std::uint64_t*>(&i);
-                    std::vector<std::uint8_t> expected_bson =
+                    std::uint64_t const iu = *reinterpret_cast<const std::uint64_t*>(&i);
+                    std::vector<std::uint8_t> const expected_bson =
                     {
                         0x14u, 0x00u, 0x00u, 0x00u, // size (little endian)
                         0x12u, /// entry: int64
@@ -1089,7 +1048,7 @@ TEST_CASE("BSON numerical data")
         {
             SECTION("unsigned std::uint64_t: 0 .. INT32_MAX")
             {
-                std::vector<std::uint64_t> numbers
+                std::vector<std::uint64_t> const numbers
                 {
                     0ULL,
                     1ULL,
@@ -1103,21 +1062,21 @@ TEST_CASE("BSON numerical data")
                     100000000ULL,
                     1000000000ULL,
                     2147483646ULL,
-                    static_cast<std::uint64_t>(INT32_MAX)
+                    static_cast<std::uint64_t>((std::numeric_limits<int32_t>::max)())
                 };
 
-                for (auto i : numbers)
+                for (const auto i : numbers)
                 {
 
                     CAPTURE(i)
 
-                    json j =
+                    json const j =
                     {
                         { "entry", i }
                     };
 
                     auto iu = i;
-                    std::vector<std::uint8_t> expected_bson =
+                    std::vector<std::uint8_t> const expected_bson =
                     {
                         0x10u, 0x00u, 0x00u, 0x00u, // size (little endian)
                         0x10u, /// entry: int32
@@ -1144,11 +1103,11 @@ TEST_CASE("BSON numerical data")
 
             SECTION("unsigned std::uint64_t: INT32_MAX+1 .. INT64_MAX")
             {
-                std::vector<std::uint64_t> numbers
+                std::vector<std::uint64_t> const numbers
                 {
-                    static_cast<std::uint64_t>(INT32_MAX) + 1,
+                    static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()) + 1,
                     4000000000ULL,
-                    static_cast<std::uint64_t>(UINT32_MAX),
+                    static_cast<std::uint64_t>((std::numeric_limits<std::uint32_t>::max)()),
                     10000000000ULL,
                     100000000000ULL,
                     1000000000000ULL,
@@ -1158,21 +1117,21 @@ TEST_CASE("BSON numerical data")
                     10000000000000000ULL,
                     100000000000000000ULL,
                     1000000000000000000ULL,
-                    static_cast<std::uint64_t>(INT64_MAX),
+                    static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()),
                 };
 
-                for (auto i : numbers)
+                for (const auto i : numbers)
                 {
 
                     CAPTURE(i)
 
-                    json j =
+                    json const j =
                     {
                         { "entry", i }
                     };
 
                     auto iu = i;
-                    std::vector<std::uint8_t> expected_bson =
+                    std::vector<std::uint8_t> const expected_bson =
                     {
                         0x14u, 0x00u, 0x00u, 0x00u, // size (little endian)
                         0x12u, /// entry: int64
@@ -1202,27 +1161,27 @@ TEST_CASE("BSON numerical data")
 
             SECTION("unsigned std::uint64_t: INT64_MAX+1 .. UINT64_MAX")
             {
-                std::vector<std::uint64_t> numbers
+                std::vector<std::uint64_t> const numbers
                 {
-                    static_cast<std::uint64_t>(INT64_MAX) + 1ULL,
+                    static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()) + 1ULL,
                     10000000000000000000ULL,
                     18000000000000000000ULL,
-                    UINT64_MAX - 1ULL,
-                    UINT64_MAX,
+                    (std::numeric_limits<std::uint64_t>::max)() - 1ULL,
+                    (std::numeric_limits<std::uint64_t>::max)(),
                 };
 
-                for (auto i : numbers)
+                for (const auto i : numbers)
                 {
 
                     CAPTURE(i)
 
-                    json j =
+                    json const j =
                     {
                         { "entry", i }
                     };
 
                     auto iu = i;
-                    std::vector<std::uint8_t> expected_bson =
+                    std::vector<std::uint8_t> const expected_bson =
                     {
                         0x14u, 0x00u, 0x00u, 0x00u, // size (little endian)
                         0x12u, /// entry: int64
@@ -1255,7 +1214,7 @@ TEST_CASE("BSON roundtrips" * doctest::skip())
 {
     SECTION("reference files")
     {
-        for (std::string filename :
+        for (const std::string filename :
                 {
                     TEST_DATA_DIRECTORY "/json.org/1.json",
                     TEST_DATA_DIRECTORY "/json.org/2.json",
@@ -1315,7 +1274,7 @@ TEST_CASE("BSON roundtrips" * doctest::skip())
                 INFO_WITH_TEMP(filename + ": output to output adapters");
                 // parse JSON file
                 std::ifstream f_json(filename);
-                json j1 = json::parse(f_json);
+                json const j1 = json::parse(f_json);
 
                 // parse BSON file
                 auto packed = utils::read_binary_file(filename + ".bson");
diff --git a/external_imported/json/tests/src/unit-byte_container_with_subtype.cpp b/external_imported/json/tests/src/unit-byte_container_with_subtype.cpp
new file mode 100644
index 000000000..4116076b0
--- /dev/null
+++ b/external_imported/json/tests/src/unit-byte_container_with_subtype.cpp
@@ -0,0 +1,77 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// Copyright (c) 2013-2022 Niels Lohmann <http://nlohmann.me>.
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+#include <nlohmann/json.hpp>
+using nlohmann::json;
+
+TEST_CASE("byte_container_with_subtype")
+{
+    using subtype_type = nlohmann::byte_container_with_subtype<std::vector<std::uint8_t>>::subtype_type;
+
+    SECTION("empty container")
+    {
+        nlohmann::byte_container_with_subtype<std::vector<std::uint8_t>> container;
+
+        CHECK(!container.has_subtype());
+        CHECK(container.subtype() == static_cast<subtype_type>(-1));
+
+        container.clear_subtype();
+        CHECK(!container.has_subtype());
+        CHECK(container.subtype() == static_cast<subtype_type>(-1));
+
+        container.set_subtype(42);
+        CHECK(container.has_subtype());
+        CHECK(container.subtype() == 42);
+    }
+
+    SECTION("subtyped container")
+    {
+        nlohmann::byte_container_with_subtype<std::vector<std::uint8_t>> container({}, 42);
+        CHECK(container.has_subtype());
+        CHECK(container.subtype() == 42);
+
+        container.clear_subtype();
+        CHECK(!container.has_subtype());
+        CHECK(container.subtype() == static_cast<subtype_type>(-1));
+    }
+
+    SECTION("comparisons")
+    {
+        std::vector<std::uint8_t> const bytes = {{0xCA, 0xFE, 0xBA, 0xBE}};
+        nlohmann::byte_container_with_subtype<std::vector<std::uint8_t>> container1;
+        nlohmann::byte_container_with_subtype<std::vector<std::uint8_t>> container2({}, 42);
+        nlohmann::byte_container_with_subtype<std::vector<std::uint8_t>> container3(bytes);
+        nlohmann::byte_container_with_subtype<std::vector<std::uint8_t>> container4(bytes, 42);
+
+        CHECK(container1 == container1);
+        CHECK(container1 != container2);
+        CHECK(container1 != container3);
+        CHECK(container1 != container4);
+        CHECK(container2 != container1);
+        CHECK(container2 == container2);
+        CHECK(container2 != container3);
+        CHECK(container2 != container4);
+        CHECK(container3 != container1);
+        CHECK(container3 != container2);
+        CHECK(container3 == container3);
+        CHECK(container3 != container4);
+        CHECK(container4 != container1);
+        CHECK(container4 != container2);
+        CHECK(container4 != container3);
+        CHECK(container4 == container4);
+
+        container3.clear();
+        container4.clear();
+
+        CHECK(container1 == container3);
+        CHECK(container2 == container4);
+    }
+}
diff --git a/external_imported/json/test/src/unit-capacity.cpp b/external_imported/json/tests/src/unit-capacity.cpp
similarity index 78%
rename from external_imported/json/test/src/unit-capacity.cpp
rename to external_imported/json/tests/src/unit-capacity.cpp
index 9be901bf9..61203cc23 100644
--- a/external_imported/json/test/src/unit-capacity.cpp
+++ b/external_imported/json/tests/src/unit-capacity.cpp
@@ -1,31 +1,11 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// Copyright (c) 2013-2022 Niels Lohmann <http://nlohmann.me>.
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
 
 #include "doctest_compatibility.h"
 
@@ -38,8 +18,8 @@ TEST_CASE("capacity")
     {
         SECTION("boolean")
         {
-            json j = true;
-            const json j_const(j);
+            json j = true; // NOLINT(misc-const-correctness)
+            const json j_const = true;
 
             SECTION("result of empty")
             {
@@ -56,8 +36,8 @@ TEST_CASE("capacity")
 
         SECTION("string")
         {
-            json j = "hello world";
-            const json j_const(j);
+            json j = "hello world"; // NOLINT(misc-const-correctness)
+            const json j_const = "hello world";
 
             SECTION("result of empty")
             {
@@ -76,8 +56,8 @@ TEST_CASE("capacity")
         {
             SECTION("empty array")
             {
-                json j = json::array();
-                const json j_const(j);
+                json j = json::array(); // NOLINT(misc-const-correctness)
+                const json j_const = json::array();
 
                 SECTION("result of empty")
                 {
@@ -94,8 +74,8 @@ TEST_CASE("capacity")
 
             SECTION("filled array")
             {
-                json j = {1, 2, 3};
-                const json j_const(j);
+                json j = {1, 2, 3}; // NOLINT(misc-const-correctness)
+                const json j_const = {1, 2, 3};
 
                 SECTION("result of empty")
                 {
@@ -115,8 +95,8 @@ TEST_CASE("capacity")
         {
             SECTION("empty object")
             {
-                json j = json::object();
-                const json j_const(j);
+                json j = json::object(); // NOLINT(misc-const-correctness)
+                const json j_const = json::object();
 
                 SECTION("result of empty")
                 {
@@ -133,8 +113,8 @@ TEST_CASE("capacity")
 
             SECTION("filled object")
             {
-                json j = {{"one", 1}, {"two", 2}, {"three", 3}};
-                const json j_const(j);
+                json j = {{"one", 1}, {"two", 2}, {"three", 3}}; // NOLINT(misc-const-correctness)
+                const json j_const = {{"one", 1}, {"two", 2}, {"three", 3}};
 
                 SECTION("result of empty")
                 {
@@ -152,8 +132,8 @@ TEST_CASE("capacity")
 
         SECTION("number (integer)")
         {
-            json j = -23;
-            const json j_const(j);
+            json j = -23; // NOLINT(misc-const-correctness)
+            const json j_const = -23;
 
             SECTION("result of empty")
             {
@@ -170,8 +150,8 @@ TEST_CASE("capacity")
 
         SECTION("number (unsigned)")
         {
-            json j = 23u;
-            const json j_const(j);
+            json j = 23u; // NOLINT(misc-const-correctness)
+            const json j_const = 23u;
 
             SECTION("result of empty")
             {
@@ -188,8 +168,8 @@ TEST_CASE("capacity")
 
         SECTION("number (float)")
         {
-            json j = 23.42;
-            const json j_const(j);
+            json j = 23.42; // NOLINT(misc-const-correctness)
+            const json j_const = 23.42;
 
             SECTION("result of empty")
             {
@@ -206,8 +186,8 @@ TEST_CASE("capacity")
 
         SECTION("null")
         {
-            json j = nullptr;
-            const json j_const(j);
+            json j = nullptr; // NOLINT(misc-const-correctness)
+            const json j_const = nullptr;
 
             SECTION("result of empty")
             {
@@ -227,8 +207,8 @@ TEST_CASE("capacity")
     {
         SECTION("boolean")
         {
-            json j = true;
-            const json j_const(j);
+            json j = true; // NOLINT(misc-const-correctness)
+            const json j_const = true;
 
             SECTION("result of size")
             {
@@ -247,8 +227,8 @@ TEST_CASE("capacity")
 
         SECTION("string")
         {
-            json j = "hello world";
-            const json j_const(j);
+            json j = "hello world"; // NOLINT(misc-const-correctness)
+            const json j_const = "hello world";
 
             SECTION("result of size")
             {
@@ -269,8 +249,8 @@ TEST_CASE("capacity")
         {
             SECTION("empty array")
             {
-                json j = json::array();
-                const json j_const(j);
+                json j = json::array(); // NOLINT(misc-const-correctness)
+                const json j_const = json::array();
 
                 SECTION("result of size")
                 {
@@ -289,8 +269,8 @@ TEST_CASE("capacity")
 
             SECTION("filled array")
             {
-                json j = {1, 2, 3};
-                const json j_const(j);
+                json j = {1, 2, 3}; // NOLINT(misc-const-correctness)
+                const json j_const = {1, 2, 3};
 
                 SECTION("result of size")
                 {
@@ -312,8 +292,8 @@ TEST_CASE("capacity")
         {
             SECTION("empty object")
             {
-                json j = json::object();
-                const json j_const(j);
+                json j = json::object(); // NOLINT(misc-const-correctness)
+                const json j_const = json::object();
 
                 SECTION("result of size")
                 {
@@ -332,8 +312,8 @@ TEST_CASE("capacity")
 
             SECTION("filled object")
             {
-                json j = {{"one", 1}, {"two", 2}, {"three", 3}};
-                const json j_const(j);
+                json j = {{"one", 1}, {"two", 2}, {"three", 3}}; // NOLINT(misc-const-correctness)
+                const json j_const = {{"one", 1}, {"two", 2}, {"three", 3}};
 
                 SECTION("result of size")
                 {
@@ -353,8 +333,8 @@ TEST_CASE("capacity")
 
         SECTION("number (integer)")
         {
-            json j = -23;
-            const json j_const(j);
+            json j = -23; // NOLINT(misc-const-correctness)
+            const json j_const = -23;
 
             SECTION("result of size")
             {
@@ -373,8 +353,8 @@ TEST_CASE("capacity")
 
         SECTION("number (unsigned)")
         {
-            json j = 23u;
-            const json j_const(j);
+            json j = 23u; // NOLINT(misc-const-correctness)
+            const json j_const = 23u;
 
             SECTION("result of size")
             {
@@ -393,8 +373,8 @@ TEST_CASE("capacity")
 
         SECTION("number (float)")
         {
-            json j = 23.42;
-            const json j_const(j);
+            json j = 23.42; // NOLINT(misc-const-correctness)
+            const json j_const = 23.42;
 
             SECTION("result of size")
             {
@@ -413,8 +393,8 @@ TEST_CASE("capacity")
 
         SECTION("null")
         {
-            json j = nullptr;
-            const json j_const(j);
+            json j = nullptr; // NOLINT(misc-const-correctness)
+            const json j_const = nullptr;
 
             SECTION("result of size")
             {
@@ -436,8 +416,8 @@ TEST_CASE("capacity")
     {
         SECTION("boolean")
         {
-            json j = true;
-            const json j_const(j);
+            json j = true; // NOLINT(misc-const-correctness)
+            const json j_const = true;
 
             SECTION("result of max_size")
             {
@@ -448,8 +428,8 @@ TEST_CASE("capacity")
 
         SECTION("string")
         {
-            json j = "hello world";
-            const json j_const(j);
+            json j = "hello world"; // NOLINT(misc-const-correctness)
+            const json j_const = "hello world";
 
             SECTION("result of max_size")
             {
@@ -462,8 +442,8 @@ TEST_CASE("capacity")
         {
             SECTION("empty array")
             {
-                json j = json::array();
-                const json j_const(j);
+                json j = json::array(); // NOLINT(misc-const-correctness)
+                const json j_const = json::array();
 
                 SECTION("result of max_size")
                 {
@@ -474,8 +454,8 @@ TEST_CASE("capacity")
 
             SECTION("filled array")
             {
-                json j = {1, 2, 3};
-                const json j_const(j);
+                json j = {1, 2, 3}; // NOLINT(misc-const-correctness)
+                const json j_const = {1, 2, 3};
 
                 SECTION("result of max_size")
                 {
@@ -489,8 +469,8 @@ TEST_CASE("capacity")
         {
             SECTION("empty object")
             {
-                json j = json::object();
-                const json j_const(j);
+                json j = json::object(); // NOLINT(misc-const-correctness)
+                const json j_const = json::object();
 
                 SECTION("result of max_size")
                 {
@@ -501,8 +481,8 @@ TEST_CASE("capacity")
 
             SECTION("filled object")
             {
-                json j = {{"one", 1}, {"two", 2}, {"three", 3}};
-                const json j_const(j);
+                json j = {{"one", 1}, {"two", 2}, {"three", 3}}; // NOLINT(misc-const-correctness)
+                const json j_const = {{"one", 1}, {"two", 2}, {"three", 3}};
 
                 SECTION("result of max_size")
                 {
@@ -514,8 +494,8 @@ TEST_CASE("capacity")
 
         SECTION("number (integer)")
         {
-            json j = -23;
-            const json j_const(j);
+            json j = -23; // NOLINT(misc-const-correctness)
+            const json j_const = -23;
 
             SECTION("result of max_size")
             {
@@ -526,8 +506,8 @@ TEST_CASE("capacity")
 
         SECTION("number (unsigned)")
         {
-            json j = 23u;
-            const json j_const(j);
+            json j = 23u; // NOLINT(misc-const-correctness)
+            const json j_const = 23u;
 
             SECTION("result of max_size")
             {
@@ -538,8 +518,8 @@ TEST_CASE("capacity")
 
         SECTION("number (float)")
         {
-            json j = 23.42;
-            const json j_const(j);
+            json j = 23.42; // NOLINT(misc-const-correctness)
+            const json j_const = 23.42;
 
             SECTION("result of max_size")
             {
@@ -550,8 +530,8 @@ TEST_CASE("capacity")
 
         SECTION("null")
         {
-            json j = nullptr;
-            const json j_const(j);
+            json j = nullptr; // NOLINT(misc-const-correctness)
+            const json j_const = nullptr;
 
             SECTION("result of max_size")
             {
diff --git a/external_imported/json/tests/src/unit-cbor.cpp b/external_imported/json/tests/src/unit-cbor.cpp
new file mode 100644
index 000000000..be94d2f6e
--- /dev/null
+++ b/external_imported/json/tests/src/unit-cbor.cpp
@@ -0,0 +1,2705 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+#include <nlohmann/json.hpp>
+using nlohmann::json;
+
+#include <fstream>
+#include <sstream>
+#include <iomanip>
+#include <iostream>
+#include <limits>
+#include <set>
+#include "make_test_data_available.hpp"
+#include "test_utils.hpp"
+
+namespace
+{
+class SaxCountdown
+{
+  public:
+    explicit SaxCountdown(const int count) : events_left(count)
+    {}
+
+    bool null()
+    {
+        return events_left-- > 0;
+    }
+
+    bool boolean(bool /*unused*/)
+    {
+        return events_left-- > 0;
+    }
+
+    bool number_integer(json::number_integer_t /*unused*/)
+    {
+        return events_left-- > 0;
+    }
+
+    bool number_unsigned(json::number_unsigned_t /*unused*/)
+    {
+        return events_left-- > 0;
+    }
+
+    bool number_float(json::number_float_t /*unused*/, const std::string& /*unused*/)
+    {
+        return events_left-- > 0;
+    }
+
+    bool string(std::string& /*unused*/)
+    {
+        return events_left-- > 0;
+    }
+
+    bool binary(std::vector<std::uint8_t>& /*unused*/)
+    {
+        return events_left-- > 0;
+    }
+
+    bool start_object(std::size_t /*unused*/)
+    {
+        return events_left-- > 0;
+    }
+
+    bool key(std::string& /*unused*/)
+    {
+        return events_left-- > 0;
+    }
+
+    bool end_object()
+    {
+        return events_left-- > 0;
+    }
+
+    bool start_array(std::size_t /*unused*/)
+    {
+        return events_left-- > 0;
+    }
+
+    bool end_array()
+    {
+        return events_left-- > 0;
+    }
+
+    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/, const json::exception& /*unused*/) // NOLINT(readability-convert-member-functions-to-static)
+    {
+        return false;
+    }
+
+  private:
+    int events_left = 0;
+};
+} // namespace
+
+TEST_CASE("CBOR")
+{
+    SECTION("individual values")
+    {
+        SECTION("discarded")
+        {
+            // discarded values are not serialized
+            json const j = json::value_t::discarded;
+            const auto result = json::to_cbor(j);
+            CHECK(result.empty());
+        }
+
+        SECTION("NaN")
+        {
+            // NaN value
+            json const j = std::numeric_limits<json::number_float_t>::quiet_NaN();
+            const std::vector<uint8_t> expected = {0xf9, 0x7e, 0x00};
+            const auto result = json::to_cbor(j);
+            CHECK(result == expected);
+        }
+
+        SECTION("Infinity")
+        {
+            // Infinity value
+            json const j = std::numeric_limits<json::number_float_t>::infinity();
+            const std::vector<uint8_t> expected = {0xf9, 0x7c, 0x00};
+            const auto result = json::to_cbor(j);
+            CHECK(result == expected);
+        }
+
+        SECTION("null")
+        {
+            const json j = nullptr;
+            const std::vector<uint8_t> expected = {0xf6};
+            const auto result = json::to_cbor(j);
+            CHECK(result == expected);
+
+            // roundtrip
+            CHECK(json::from_cbor(result) == j);
+            CHECK(json::from_cbor(result, true, false) == j);
+        }
+
+        SECTION("boolean")
+        {
+            SECTION("true")
+            {
+                const json j = true;
+                const std::vector<uint8_t> expected = {0xf5};
+                const auto result = json::to_cbor(j);
+                CHECK(result == expected);
+
+                // roundtrip
+                CHECK(json::from_cbor(result) == j);
+                CHECK(json::from_cbor(result, true, false) == j);
+            }
+
+            SECTION("false")
+            {
+                const json j = false;
+                const std::vector<uint8_t> expected = {0xf4};
+                const auto result = json::to_cbor(j);
+                CHECK(result == expected);
+
+                // roundtrip
+                CHECK(json::from_cbor(result) == j);
+                CHECK(json::from_cbor(result, true, false) == j);
+            }
+        }
+
+        SECTION("number")
+        {
+            SECTION("signed")
+            {
+                SECTION("-9223372036854775808..-4294967297")
+                {
+                    const std::vector<int64_t> numbers
+                    {
+                        (std::numeric_limits<int64_t>::min)(),
+                        -1000000000000000000,
+                        -100000000000000000,
+                        -10000000000000000,
+                        -1000000000000000,
+                        -100000000000000,
+                        -10000000000000,
+                        -1000000000000,
+                        -100000000000,
+                        -10000000000,
+                        -4294967297,
+                    };
+                    for (const auto i : numbers)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        const json j = i;
+
+                        // check type
+                        CHECK(j.is_number_integer());
+
+                        // create expected byte vector
+                        const auto positive = static_cast<uint64_t>(-1 - i);
+                        const std::vector<uint8_t> expected
+                        {
+                            static_cast<uint8_t>(0x3b),
+                            static_cast<uint8_t>((positive >> 56) & 0xff),
+                            static_cast<uint8_t>((positive >> 48) & 0xff),
+                            static_cast<uint8_t>((positive >> 40) & 0xff),
+                            static_cast<uint8_t>((positive >> 32) & 0xff),
+                            static_cast<uint8_t>((positive >> 24) & 0xff),
+                            static_cast<uint8_t>((positive >> 16) & 0xff),
+                            static_cast<uint8_t>((positive >> 8) & 0xff),
+                            static_cast<uint8_t>(positive & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_cbor(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 9);
+
+                        // check individual bytes
+                        CHECK(result[0] == 0x3b);
+                        const uint64_t restored = (static_cast<uint64_t>(result[1]) << 070) +
+                                                  (static_cast<uint64_t>(result[2]) << 060) +
+                                                  (static_cast<uint64_t>(result[3]) << 050) +
+                                                  (static_cast<uint64_t>(result[4]) << 040) +
+                                                  (static_cast<uint64_t>(result[5]) << 030) +
+                                                  (static_cast<uint64_t>(result[6]) << 020) +
+                                                  (static_cast<uint64_t>(result[7]) << 010) +
+                                                  static_cast<uint64_t>(result[8]);
+                        CHECK(restored == positive);
+                        CHECK(-1 - static_cast<int64_t>(restored) == i);
+
+                        // roundtrip
+                        CHECK(json::from_cbor(result) == j);
+                        CHECK(json::from_cbor(result, true, false) == j);
+                    }
+                }
+
+                SECTION("-4294967296..-65537")
+                {
+                    const std::vector<int64_t> numbers
+                    {
+                        -65537,
+                            -100000,
+                            -1000000,
+                            -10000000,
+                            -100000000,
+                            -1000000000,
+                            -4294967296,
+                        };
+                    for (const auto i : numbers)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        const json j = i;
+
+                        // check type
+                        CHECK(j.is_number_integer());
+
+                        // create expected byte vector
+                        auto positive = static_cast<uint32_t>(static_cast<uint64_t>(-1 - i) & 0x00000000ffffffff);
+                        const std::vector<uint8_t> expected
+                        {
+                            static_cast<uint8_t>(0x3a),
+                            static_cast<uint8_t>((positive >> 24) & 0xff),
+                            static_cast<uint8_t>((positive >> 16) & 0xff),
+                            static_cast<uint8_t>((positive >> 8) & 0xff),
+                            static_cast<uint8_t>(positive & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_cbor(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 5);
+
+                        // check individual bytes
+                        CHECK(result[0] == 0x3a);
+                        const uint32_t restored = (static_cast<uint32_t>(result[1]) << 030) +
+                                                  (static_cast<uint32_t>(result[2]) << 020) +
+                                                  (static_cast<uint32_t>(result[3]) << 010) +
+                                                  static_cast<uint32_t>(result[4]);
+                        CHECK(restored == positive);
+                        CHECK(-1LL - restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_cbor(result) == j);
+                        CHECK(json::from_cbor(result, true, false) == j);
+                    }
+                }
+
+                SECTION("-65536..-257")
+                {
+                    for (int32_t i = -65536; i <= -257; ++i)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        const json j = i;
+
+                        // check type
+                        CHECK(j.is_number_integer());
+
+                        // create expected byte vector
+                        const auto positive = static_cast<uint16_t>(-1 - i);
+                        const std::vector<uint8_t> expected
+                        {
+                            static_cast<uint8_t>(0x39),
+                            static_cast<uint8_t>((positive >> 8) & 0xff),
+                            static_cast<uint8_t>(positive & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_cbor(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 3);
+
+                        // check individual bytes
+                        CHECK(result[0] == 0x39);
+                        const auto restored = static_cast<uint16_t>(static_cast<uint8_t>(result[1]) * 256 + static_cast<uint8_t>(result[2]));
+                        CHECK(restored == positive);
+                        CHECK(-1 - restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_cbor(result) == j);
+                        CHECK(json::from_cbor(result, true, false) == j);
+                    }
+                }
+
+                SECTION("-9263 (int 16)")
+                {
+                    const json j = -9263;
+                    std::vector<uint8_t> expected = {0x39, 0x24, 0x2e};
+
+                    const auto result = json::to_cbor(j);
+                    CHECK(result == expected);
+
+                    const auto restored = static_cast<int16_t>(-1 - ((result[1] << 8) + result[2]));
+                    CHECK(restored == -9263);
+
+                    // roundtrip
+                    CHECK(json::from_cbor(result) == j);
+                    CHECK(json::from_cbor(result, true, false) == j);
+                }
+
+                SECTION("-256..-24")
+                {
+                    for (auto i = -256; i < -24; ++i)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        const json j = i;
+
+                        // check type
+                        CHECK(j.is_number_integer());
+
+                        // create expected byte vector
+                        const std::vector<uint8_t> expected
+                        {
+                            0x38,
+                            static_cast<uint8_t>(-1 - i),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_cbor(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 2);
+
+                        // check individual bytes
+                        CHECK(result[0] == 0x38);
+                        CHECK(static_cast<int16_t>(-1 - result[1]) == i);
+
+                        // roundtrip
+                        CHECK(json::from_cbor(result) == j);
+                        CHECK(json::from_cbor(result, true, false) == j);
+                    }
+                }
+
+                SECTION("-24..-1")
+                {
+                    for (auto i = -24; i <= -1; ++i)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        const json j = i;
+
+                        // check type
+                        CHECK(j.is_number_integer());
+
+                        // create expected byte vector
+                        const std::vector<uint8_t> expected
+                        {
+                            static_cast<uint8_t>(0x20 - 1 - static_cast<uint8_t>(i)),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_cbor(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 1);
+
+                        // check individual bytes
+                        CHECK(static_cast<int8_t>(0x20 - 1 - result[0]) == i);
+
+                        // roundtrip
+                        CHECK(json::from_cbor(result) == j);
+                        CHECK(json::from_cbor(result, true, false) == j);
+                    }
+                }
+
+                SECTION("0..23")
+                {
+                    for (size_t i = 0; i <= 23; ++i)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        json j = -1;
+                        j.get_ref<json::number_integer_t&>() = static_cast<json::number_integer_t>(i);
+
+                        // check type
+                        CHECK(j.is_number_integer());
+
+                        // create expected byte vector
+                        const std::vector<uint8_t> expected
+                        {
+                            static_cast<uint8_t>(i),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_cbor(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 1);
+
+                        // check individual bytes
+                        CHECK(result[0] == i);
+
+                        // roundtrip
+                        CHECK(json::from_cbor(result) == j);
+                        CHECK(json::from_cbor(result, true, false) == j);
+                    }
+                }
+
+                SECTION("24..255")
+                {
+                    for (size_t i = 24; i <= 255; ++i)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        json j = -1;
+                        j.get_ref<json::number_integer_t&>() = static_cast<json::number_integer_t>(i);
+
+                        // check type
+                        CHECK(j.is_number_integer());
+
+                        // create expected byte vector
+                        const std::vector<uint8_t> expected
+                        {
+                            static_cast<uint8_t>(0x18),
+                            static_cast<uint8_t>(i),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_cbor(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 2);
+
+                        // check individual bytes
+                        CHECK(result[0] == 0x18);
+                        CHECK(result[1] == i);
+
+                        // roundtrip
+                        CHECK(json::from_cbor(result) == j);
+                        CHECK(json::from_cbor(result, true, false) == j);
+                    }
+                }
+
+                SECTION("256..65535")
+                {
+                    for (size_t i = 256; i <= 65535; ++i)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        json j = -1;
+                        j.get_ref<json::number_integer_t&>() = static_cast<json::number_integer_t>(i);
+
+                        // check type
+                        CHECK(j.is_number_integer());
+
+                        // create expected byte vector
+                        const std::vector<uint8_t> expected
+                        {
+                            static_cast<uint8_t>(0x19),
+                            static_cast<uint8_t>((i >> 8) & 0xff),
+                            static_cast<uint8_t>(i & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_cbor(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 3);
+
+                        // check individual bytes
+                        CHECK(result[0] == 0x19);
+                        const auto restored = static_cast<uint16_t>(static_cast<uint8_t>(result[1]) * 256 + static_cast<uint8_t>(result[2]));
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_cbor(result) == j);
+                        CHECK(json::from_cbor(result, true, false) == j);
+                    }
+                }
+
+                SECTION("65536..4294967295")
+                {
+                    for (const uint32_t i :
+                            {
+                                65536u, 77777u, 1048576u
+                            })
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        json j = -1;
+                        j.get_ref<json::number_integer_t&>() = static_cast<json::number_integer_t>(i);
+
+                        // check type
+                        CHECK(j.is_number_integer());
+
+                        // create expected byte vector
+                        const std::vector<uint8_t> expected
+                        {
+                            0x1a,
+                            static_cast<uint8_t>((i >> 24) & 0xff),
+                            static_cast<uint8_t>((i >> 16) & 0xff),
+                            static_cast<uint8_t>((i >> 8) & 0xff),
+                            static_cast<uint8_t>(i & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_cbor(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 5);
+
+                        // check individual bytes
+                        CHECK(result[0] == 0x1a);
+                        const uint32_t restored = (static_cast<uint32_t>(result[1]) << 030) +
+                                                  (static_cast<uint32_t>(result[2]) << 020) +
+                                                  (static_cast<uint32_t>(result[3]) << 010) +
+                                                  static_cast<uint32_t>(result[4]);
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_cbor(result) == j);
+                        CHECK(json::from_cbor(result, true, false) == j);
+                    }
+                }
+
+                SECTION("4294967296..4611686018427387903")
+                {
+                    for (const uint64_t i :
+                            {
+                                4294967296ul, 4611686018427387903ul
+                            })
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        json j = -1;
+                        j.get_ref<json::number_integer_t&>() = static_cast<json::number_integer_t>(i);
+
+                        // check type
+                        CHECK(j.is_number_integer());
+
+                        // create expected byte vector
+                        const std::vector<uint8_t> expected
+                        {
+                            0x1b,
+                            static_cast<uint8_t>((i >> 070) & 0xff),
+                            static_cast<uint8_t>((i >> 060) & 0xff),
+                            static_cast<uint8_t>((i >> 050) & 0xff),
+                            static_cast<uint8_t>((i >> 040) & 0xff),
+                            static_cast<uint8_t>((i >> 030) & 0xff),
+                            static_cast<uint8_t>((i >> 020) & 0xff),
+                            static_cast<uint8_t>((i >> 010) & 0xff),
+                            static_cast<uint8_t>(i & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_cbor(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 9);
+
+                        // check individual bytes
+                        CHECK(result[0] == 0x1b);
+                        const uint64_t restored = (static_cast<uint64_t>(result[1]) << 070) +
+                                                  (static_cast<uint64_t>(result[2]) << 060) +
+                                                  (static_cast<uint64_t>(result[3]) << 050) +
+                                                  (static_cast<uint64_t>(result[4]) << 040) +
+                                                  (static_cast<uint64_t>(result[5]) << 030) +
+                                                  (static_cast<uint64_t>(result[6]) << 020) +
+                                                  (static_cast<uint64_t>(result[7]) << 010) +
+                                                  static_cast<uint64_t>(result[8]);
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_cbor(result) == j);
+                        CHECK(json::from_cbor(result, true, false) == j);
+                    }
+                }
+
+                SECTION("-32768..-129 (int 16)")
+                {
+                    for (int16_t i = -32768; i <= static_cast<std::int16_t>(-129); ++i)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        const json j = i;
+
+                        // check type
+                        CHECK(j.is_number_integer());
+
+                        // create expected byte vector
+                        const std::vector<uint8_t> expected
+                        {
+                            0xd1,
+                            static_cast<uint8_t>((i >> 8) & 0xff),
+                            static_cast<uint8_t>(i & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_msgpack(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 3);
+
+                        // check individual bytes
+                        CHECK(result[0] == 0xd1);
+                        const auto restored = static_cast<int16_t>((result[1] << 8) + result[2]);
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_msgpack(result) == j);
+                    }
+                }
+            }
+
+            SECTION("unsigned")
+            {
+                SECTION("0..23 (Integer)")
+                {
+                    for (size_t i = 0; i <= 23; ++i)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with unsigned integer number
+                        const json j = i;
+
+                        // check type
+                        CHECK(j.is_number_unsigned());
+
+                        // create expected byte vector
+                        const std::vector<uint8_t> expected
+                        {
+                            static_cast<uint8_t>(i),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_cbor(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 1);
+
+                        // check individual bytes
+                        CHECK(result[0] == i);
+
+                        // roundtrip
+                        CHECK(json::from_cbor(result) == j);
+                        CHECK(json::from_cbor(result, true, false) == j);
+                    }
+                }
+
+                SECTION("24..255 (one-byte uint8_t)")
+                {
+                    for (size_t i = 24; i <= 255; ++i)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with unsigned integer number
+                        const json j = i;
+
+                        // check type
+                        CHECK(j.is_number_unsigned());
+
+                        // create expected byte vector
+                        const std::vector<uint8_t> expected
+                        {
+                            0x18,
+                            static_cast<uint8_t>(i),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_cbor(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 2);
+
+                        // check individual bytes
+                        CHECK(result[0] == 0x18);
+                        const auto restored = static_cast<uint8_t>(result[1]);
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_cbor(result) == j);
+                        CHECK(json::from_cbor(result, true, false) == j);
+                    }
+                }
+
+                SECTION("256..65535 (two-byte uint16_t)")
+                {
+                    for (size_t i = 256; i <= 65535; ++i)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with unsigned integer number
+                        const json j = i;
+
+                        // check type
+                        CHECK(j.is_number_unsigned());
+
+                        // create expected byte vector
+                        const std::vector<uint8_t> expected
+                        {
+                            0x19,
+                            static_cast<uint8_t>((i >> 8) & 0xff),
+                            static_cast<uint8_t>(i & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_cbor(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 3);
+
+                        // check individual bytes
+                        CHECK(result[0] == 0x19);
+                        const auto restored = static_cast<uint16_t>(static_cast<uint8_t>(result[1]) * 256 + static_cast<uint8_t>(result[2]));
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_cbor(result) == j);
+                        CHECK(json::from_cbor(result, true, false) == j);
+                    }
+                }
+
+                SECTION("65536..4294967295 (four-byte uint32_t)")
+                {
+                    for (const uint32_t i :
+                            {
+                                65536u, 77777u, 1048576u
+                            })
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with unsigned integer number
+                        const json j = i;
+
+                        // check type
+                        CHECK(j.is_number_unsigned());
+
+                        // create expected byte vector
+                        const std::vector<uint8_t> expected
+                        {
+                            0x1a,
+                            static_cast<uint8_t>((i >> 24) & 0xff),
+                            static_cast<uint8_t>((i >> 16) & 0xff),
+                            static_cast<uint8_t>((i >> 8) & 0xff),
+                            static_cast<uint8_t>(i & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_cbor(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 5);
+
+                        // check individual bytes
+                        CHECK(result[0] == 0x1a);
+                        const uint32_t restored = (static_cast<uint32_t>(result[1]) << 030) +
+                                                  (static_cast<uint32_t>(result[2]) << 020) +
+                                                  (static_cast<uint32_t>(result[3]) << 010) +
+                                                  static_cast<uint32_t>(result[4]);
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_cbor(result) == j);
+                        CHECK(json::from_cbor(result, true, false) == j);
+                    }
+                }
+
+                SECTION("4294967296..4611686018427387903 (eight-byte uint64_t)")
+                {
+                    for (const uint64_t i :
+                            {
+                                4294967296ul, 4611686018427387903ul
+                            })
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        const json j = i;
+
+                        // check type
+                        CHECK(j.is_number_unsigned());
+
+                        // create expected byte vector
+                        const std::vector<uint8_t> expected
+                        {
+                            0x1b,
+                            static_cast<uint8_t>((i >> 070) & 0xff),
+                            static_cast<uint8_t>((i >> 060) & 0xff),
+                            static_cast<uint8_t>((i >> 050) & 0xff),
+                            static_cast<uint8_t>((i >> 040) & 0xff),
+                            static_cast<uint8_t>((i >> 030) & 0xff),
+                            static_cast<uint8_t>((i >> 020) & 0xff),
+                            static_cast<uint8_t>((i >> 010) & 0xff),
+                            static_cast<uint8_t>(i & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_cbor(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 9);
+
+                        // check individual bytes
+                        CHECK(result[0] == 0x1b);
+                        const uint64_t restored = (static_cast<uint64_t>(result[1]) << 070) +
+                                                  (static_cast<uint64_t>(result[2]) << 060) +
+                                                  (static_cast<uint64_t>(result[3]) << 050) +
+                                                  (static_cast<uint64_t>(result[4]) << 040) +
+                                                  (static_cast<uint64_t>(result[5]) << 030) +
+                                                  (static_cast<uint64_t>(result[6]) << 020) +
+                                                  (static_cast<uint64_t>(result[7]) << 010) +
+                                                  static_cast<uint64_t>(result[8]);
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_cbor(result) == j);
+                        CHECK(json::from_cbor(result, true, false) == j);
+                    }
+                }
+            }
+
+            SECTION("double-precision float")
+            {
+                SECTION("3.1415925")
+                {
+                    double v = 3.1415925;
+                    const json j = v;
+                    std::vector<uint8_t> expected =
+                    {
+                        0xfb, 0x40, 0x09, 0x21, 0xfb, 0x3f, 0xa6, 0xde, 0xfc
+                    };
+                    const auto result = json::to_cbor(j);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_cbor(result) == j);
+                    CHECK(json::from_cbor(result) == v);
+
+                    CHECK(json::from_cbor(result, true, false) == j);
+                }
+            }
+
+            SECTION("single-precision float")
+            {
+                SECTION("0.5")
+                {
+                    double v = 0.5;
+                    const json j = v;
+                    // its double-precision float binary value is
+                    // {0xfb, 0x3f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
+                    // but to save memory, we can store it as single-precision float.
+                    const std::vector<uint8_t> expected = {0xfa, 0x3f, 0x00, 0x00, 0x00};
+                    const auto result = json::to_cbor(j);
+                    CHECK(result == expected);
+                    // roundtrip
+                    CHECK(json::from_cbor(result) == j);
+                    CHECK(json::from_cbor(result) == v);
+                }
+                SECTION("0.0")
+                {
+                    double v = 0.0;
+                    const json j = v;
+                    // its double-precision binary value is:
+                    // {0xfb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
+                    const std::vector<uint8_t> expected = {0xfa, 0x00, 0x00, 0x00, 0x00};
+                    const auto result = json::to_cbor(j);
+                    CHECK(result == expected);
+                    // roundtrip
+                    CHECK(json::from_cbor(result) == j);
+                    CHECK(json::from_cbor(result) == v);
+                }
+                SECTION("-0.0")
+                {
+                    double v = -0.0;
+                    const json j = v;
+                    // its double-precision binary value is:
+                    // {0xfb, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
+                    const std::vector<uint8_t> expected = {0xfa, 0x80, 0x00, 0x00, 0x00};
+                    const auto result = json::to_cbor(j);
+                    CHECK(result == expected);
+                    // roundtrip
+                    CHECK(json::from_cbor(result) == j);
+                    CHECK(json::from_cbor(result) == v);
+                }
+                SECTION("100.0")
+                {
+                    double v = 100.0;
+                    const json j = v;
+                    // its double-precision binary value is:
+                    // {0xfb, 0x40, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
+                    const std::vector<uint8_t> expected = {0xfa, 0x42, 0xc8, 0x00, 0x00};
+                    const auto result = json::to_cbor(j);
+                    CHECK(result == expected);
+                    // roundtrip
+                    CHECK(json::from_cbor(result) == j);
+                    CHECK(json::from_cbor(result) == v);
+                }
+                SECTION("200.0")
+                {
+                    double v = 200.0;
+                    const json j = v;
+                    // its double-precision binary value is:
+                    // {0xfb, 0x40, 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
+                    const std::vector<uint8_t> expected = {0xfa, 0x43, 0x48, 0x00, 0x00};
+                    const auto result = json::to_cbor(j);
+                    CHECK(result == expected);
+                    // roundtrip
+                    CHECK(json::from_cbor(result) == j);
+                    CHECK(json::from_cbor(result) == v);
+                }
+                SECTION("3.40282e+38(max float)")
+                {
+                    float v = (std::numeric_limits<float>::max)();
+                    const json j = v;
+                    const std::vector<uint8_t> expected =
+                    {
+                        0xfa, 0x7f, 0x7f, 0xff, 0xff
+                    };
+                    const auto result = json::to_cbor(j);
+                    CHECK(result == expected);
+                    // roundtrip
+                    CHECK(json::from_cbor(result) == j);
+                    CHECK(json::from_cbor(result) == v);
+                }
+                SECTION("-3.40282e+38(lowest float)")
+                {
+                    auto v = static_cast<double>(std::numeric_limits<float>::lowest());
+                    const json j = v;
+                    const std::vector<uint8_t> expected =
+                    {
+                        0xfa, 0xff, 0x7f, 0xff, 0xff
+                    };
+                    const auto result = json::to_cbor(j);
+                    CHECK(result == expected);
+                    // roundtrip
+                    CHECK(json::from_cbor(result) == j);
+                    CHECK(json::from_cbor(result) == v);
+                }
+                SECTION("1 + 3.40282e+38(more than max float)")
+                {
+                    double v = static_cast<double>((std::numeric_limits<float>::max)()) + 0.1e+34;
+                    const json j = v;
+                    const std::vector<uint8_t> expected =
+                    {
+                        0xfb, 0x47, 0xf0, 0x00, 0x03, 0x04, 0xdc, 0x64, 0x49
+                    };
+                    // double
+                    const auto result = json::to_cbor(j);
+                    CHECK(result == expected);
+                    // roundtrip
+                    CHECK(json::from_cbor(result) == j);
+                    CHECK(json::from_cbor(result) == v);
+                }
+                SECTION("-1 - 3.40282e+38(less than lowest float)")
+                {
+                    double v = static_cast<double>(std::numeric_limits<float>::lowest()) - 1.0;
+                    const json j = v;
+                    const std::vector<uint8_t> expected =
+                    {
+                        0xfa, 0xff, 0x7f, 0xff, 0xff
+                    };
+                    // the same with lowest float
+                    const auto result = json::to_cbor(j);
+                    CHECK(result == expected);
+                    // roundtrip
+                    CHECK(json::from_cbor(result) == j);
+                    CHECK(json::from_cbor(result) == v);
+                }
+
+            }
+
+            SECTION("half-precision float (edge cases)")
+            {
+                SECTION("errors")
+                {
+                    SECTION("no byte follows")
+                    {
+                        json _;
+                        CHECK_THROWS_WITH_AS(_ = json::from_cbor(std::vector<uint8_t>({0xf9})), "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing CBOR number: unexpected end of input", json::parse_error&);
+                        CHECK(json::from_cbor(std::vector<uint8_t>({0xf9}), true, false).is_discarded());
+                    }
+                    SECTION("only one byte follows")
+                    {
+                        json _;
+                        CHECK_THROWS_WITH_AS(_ = json::from_cbor(std::vector<uint8_t>({0xf9, 0x7c})), "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing CBOR number: unexpected end of input", json::parse_error&);
+                        CHECK(json::from_cbor(std::vector<uint8_t>({0xf9, 0x7c}), true, false).is_discarded());
+                    }
+                }
+
+                SECTION("exp = 0b00000")
+                {
+                    SECTION("0 (0 00000 0000000000)")
+                    {
+                        json const j = json::from_cbor(std::vector<uint8_t>({0xf9, 0x00, 0x00}));
+                        json::number_float_t d{j};
+                        CHECK(d == 0.0);
+                    }
+
+                    SECTION("-0 (1 00000 0000000000)")
+                    {
+                        json const j = json::from_cbor(std::vector<uint8_t>({0xf9, 0x80, 0x00}));
+                        json::number_float_t d{j};
+                        CHECK(d == -0.0);
+                    }
+
+                    SECTION("2**-24 (0 00000 0000000001)")
+                    {
+                        json const j = json::from_cbor(std::vector<uint8_t>({0xf9, 0x00, 0x01}));
+                        json::number_float_t d{j};
+                        CHECK(d == std::pow(2.0, -24.0));
+                    }
+                }
+
+                SECTION("exp = 0b11111")
+                {
+                    SECTION("infinity (0 11111 0000000000)")
+                    {
+                        json const j = json::from_cbor(std::vector<uint8_t>({0xf9, 0x7c, 0x00}));
+                        json::number_float_t d{j};
+                        CHECK(d == std::numeric_limits<json::number_float_t>::infinity());
+                        CHECK(j.dump() == "null");
+                    }
+
+                    SECTION("-infinity (1 11111 0000000000)")
+                    {
+                        json const j = json::from_cbor(std::vector<uint8_t>({0xf9, 0xfc, 0x00}));
+                        json::number_float_t d{j};
+                        CHECK(d == -std::numeric_limits<json::number_float_t>::infinity());
+                        CHECK(j.dump() == "null");
+                    }
+                }
+
+                SECTION("other values from https://en.wikipedia.org/wiki/Half-precision_floating-point_format")
+                {
+                    SECTION("1 (0 01111 0000000000)")
+                    {
+                        json const j = json::from_cbor(std::vector<uint8_t>({0xf9, 0x3c, 0x00}));
+                        json::number_float_t d{j};
+                        CHECK(d == 1);
+                    }
+
+                    SECTION("-2 (1 10000 0000000000)")
+                    {
+                        json const j = json::from_cbor(std::vector<uint8_t>({0xf9, 0xc0, 0x00}));
+                        json::number_float_t d{j};
+                        CHECK(d == -2);
+                    }
+
+                    SECTION("65504 (0 11110 1111111111)")
+                    {
+                        json const j = json::from_cbor(std::vector<uint8_t>({0xf9, 0x7b, 0xff}));
+                        json::number_float_t d{j};
+                        CHECK(d == 65504);
+                    }
+                }
+
+                SECTION("infinity")
+                {
+                    json const j = json::from_cbor(std::vector<uint8_t>({0xf9, 0x7c, 0x00}));
+                    json::number_float_t const d{j};
+                    CHECK(!std::isfinite(d));
+                    CHECK(j.dump() == "null");
+                }
+
+                SECTION("NaN")
+                {
+                    json const j = json::from_cbor(std::vector<uint8_t>({0xf9, 0x7e, 0x00}));
+                    json::number_float_t const d{j};
+                    CHECK(std::isnan(d));
+                    CHECK(j.dump() == "null");
+                }
+            }
+        }
+
+        SECTION("string")
+        {
+            SECTION("N = 0..23")
+            {
+                for (size_t N = 0; N <= 0x17; ++N)
+                {
+                    CAPTURE(N)
+
+                    // create JSON value with string containing of N * 'x'
+                    const auto s = std::string(N, 'x');
+                    const json j = s;
+
+                    // create expected byte vector
+                    std::vector<uint8_t> expected;
+                    expected.push_back(static_cast<uint8_t>(0x60 + N));
+                    for (size_t i = 0; i < N; ++i)
+                    {
+                        expected.push_back('x');
+                    }
+
+                    // compare result + size
+                    const auto result = json::to_cbor(j);
+                    CHECK(result == expected);
+                    CHECK(result.size() == N + 1);
+                    // check that no null byte is appended
+                    if (N > 0)
+                    {
+                        CHECK(result.back() != '\x00');
+                    }
+
+                    // roundtrip
+                    CHECK(json::from_cbor(result) == j);
+                    CHECK(json::from_cbor(result, true, false) == j);
+                }
+            }
+
+            SECTION("N = 24..255")
+            {
+                for (size_t N = 24; N <= 255; ++N)
+                {
+                    CAPTURE(N)
+
+                    // create JSON value with string containing of N * 'x'
+                    const auto s = std::string(N, 'x');
+                    const json j = s;
+
+                    // create expected byte vector
+                    std::vector<uint8_t> expected;
+
+                    expected.push_back(0x78);
+                    expected.push_back(static_cast<uint8_t>(N));
+                    for (size_t i = 0; i < N; ++i)
+                    {
+                        expected.push_back('x');
+                    }
+
+                    // compare result + size
+                    const auto result = json::to_cbor(j);
+                    CHECK(result == expected);
+                    CHECK(result.size() == N + 2);
+                    // check that no null byte is appended
+                    CHECK(result.back() != '\x00');
+
+                    // roundtrip
+                    CHECK(json::from_cbor(result) == j);
+                    CHECK(json::from_cbor(result, true, false) == j);
+                }
+            }
+
+            SECTION("N = 256..65535")
+            {
+                for (const size_t N :
+                        {
+                            256u, 999u, 1025u, 3333u, 2048u, 65535u
+                        })
+                {
+                    CAPTURE(N)
+
+                    // create JSON value with string containing of N * 'x'
+                    const auto s = std::string(N, 'x');
+                    const json j = s;
+
+                    // create expected byte vector (hack: create string first)
+                    std::vector<uint8_t> expected(N, 'x');
+                    // reverse order of commands, because we insert at begin()
+                    expected.insert(expected.begin(), static_cast<uint8_t>(N & 0xff));
+                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 8) & 0xff));
+                    expected.insert(expected.begin(), 0x79);
+
+                    // compare result + size
+                    const auto result = json::to_cbor(j);
+                    CHECK(result == expected);
+                    CHECK(result.size() == N + 3);
+                    // check that no null byte is appended
+                    CHECK(result.back() != '\x00');
+
+                    // roundtrip
+                    CHECK(json::from_cbor(result) == j);
+                    CHECK(json::from_cbor(result, true, false) == j);
+                }
+            }
+
+            SECTION("N = 65536..4294967295")
+            {
+                for (const size_t N :
+                        {
+                            65536u, 77777u, 1048576u
+                        })
+                {
+                    CAPTURE(N)
+
+                    // create JSON value with string containing of N * 'x'
+                    const auto s = std::string(N, 'x');
+                    const json j = s;
+
+                    // create expected byte vector (hack: create string first)
+                    std::vector<uint8_t> expected(N, 'x');
+                    // reverse order of commands, because we insert at begin()
+                    expected.insert(expected.begin(), static_cast<uint8_t>(N & 0xff));
+                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 8) & 0xff));
+                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 16) & 0xff));
+                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 24) & 0xff));
+                    expected.insert(expected.begin(), 0x7a);
+
+                    // compare result + size
+                    const auto result = json::to_cbor(j);
+                    CHECK(result == expected);
+                    CHECK(result.size() == N + 5);
+                    // check that no null byte is appended
+                    CHECK(result.back() != '\x00');
+
+                    // roundtrip
+                    CHECK(json::from_cbor(result) == j);
+                    CHECK(json::from_cbor(result, true, false) == j);
+                }
+            }
+        }
+
+        SECTION("array")
+        {
+            SECTION("empty")
+            {
+                const json j = json::array();
+                std::vector<uint8_t> expected = {0x80};
+                const auto result = json::to_cbor(j);
+                CHECK(result == expected);
+
+                // roundtrip
+                CHECK(json::from_cbor(result) == j);
+                CHECK(json::from_cbor(result, true, false) == j);
+            }
+
+            SECTION("[null]")
+            {
+                const json j = {nullptr};
+                const std::vector<uint8_t> expected = {0x81, 0xf6};
+                const auto result = json::to_cbor(j);
+                CHECK(result == expected);
+
+                // roundtrip
+                CHECK(json::from_cbor(result) == j);
+                CHECK(json::from_cbor(result, true, false) == j);
+            }
+
+            SECTION("[1,2,3,4,5]")
+            {
+                const json j = json::parse("[1,2,3,4,5]");
+                const std::vector<uint8_t> expected = {0x85, 0x01, 0x02, 0x03, 0x04, 0x05};
+                const auto result = json::to_cbor(j);
+                CHECK(result == expected);
+
+                // roundtrip
+                CHECK(json::from_cbor(result) == j);
+                CHECK(json::from_cbor(result, true, false) == j);
+            }
+
+            SECTION("[[[[]]]]")
+            {
+                const json j = json::parse("[[[[]]]]");
+                const std::vector<uint8_t> expected = {0x81, 0x81, 0x81, 0x80};
+                const auto result = json::to_cbor(j);
+                CHECK(result == expected);
+
+                // roundtrip
+                CHECK(json::from_cbor(result) == j);
+                CHECK(json::from_cbor(result, true, false) == j);
+            }
+
+            SECTION("array with uint16_t elements")
+            {
+                const json j(257, nullptr);
+                std::vector<uint8_t> expected(j.size() + 3, 0xf6); // all null
+                expected[0] = 0x99; // array 16 bit
+                expected[1] = 0x01; // size (0x0101), byte 0
+                expected[2] = 0x01; // size (0x0101), byte 1
+                const auto result = json::to_cbor(j);
+                CHECK(result == expected);
+
+                // roundtrip
+                CHECK(json::from_cbor(result) == j);
+                CHECK(json::from_cbor(result, true, false) == j);
+            }
+
+            SECTION("array with uint32_t elements")
+            {
+                const json j(65793, nullptr);
+                std::vector<uint8_t> expected(j.size() + 5, 0xf6); // all null
+                expected[0] = 0x9a; // array 32 bit
+                expected[1] = 0x00; // size (0x00010101), byte 0
+                expected[2] = 0x01; // size (0x00010101), byte 1
+                expected[3] = 0x01; // size (0x00010101), byte 2
+                expected[4] = 0x01; // size (0x00010101), byte 3
+                const auto result = json::to_cbor(j);
+                CHECK(result == expected);
+
+                // roundtrip
+                CHECK(json::from_cbor(result) == j);
+                CHECK(json::from_cbor(result, true, false) == j);
+            }
+        }
+
+        SECTION("object")
+        {
+            SECTION("empty")
+            {
+                const json j = json::object();
+                const std::vector<uint8_t> expected = {0xa0};
+                const auto result = json::to_cbor(j);
+                CHECK(result == expected);
+
+                // roundtrip
+                CHECK(json::from_cbor(result) == j);
+                CHECK(json::from_cbor(result, true, false) == j);
+            }
+
+            SECTION("{\"\":null}")
+            {
+                const json j = {{"", nullptr}};
+                const std::vector<uint8_t> expected = {0xa1, 0x60, 0xf6};
+                const auto result = json::to_cbor(j);
+                CHECK(result == expected);
+
+                // roundtrip
+                CHECK(json::from_cbor(result) == j);
+                CHECK(json::from_cbor(result, true, false) == j);
+            }
+
+            SECTION("{\"a\": {\"b\": {\"c\": {}}}}")
+            {
+                const json j = json::parse(R"({"a": {"b": {"c": {}}}})");
+                const std::vector<uint8_t> expected =
+                {
+                    0xa1, 0x61, 0x61, 0xa1, 0x61, 0x62, 0xa1, 0x61, 0x63, 0xa0
+                };
+                const auto result = json::to_cbor(j);
+                CHECK(result == expected);
+
+                // roundtrip
+                CHECK(json::from_cbor(result) == j);
+                CHECK(json::from_cbor(result, true, false) == j);
+            }
+
+            SECTION("object with uint8_t elements")
+            {
+                json j;
+                for (auto i = 0; i < 255; ++i)
+                {
+                    // format i to a fixed width of 5
+                    // each entry will need 7 bytes: 6 for string, 1 for null
+                    std::stringstream ss;
+                    ss << std::setw(5) << std::setfill('0') << i;
+                    j.emplace(ss.str(), nullptr);
+                }
+
+                const auto result = json::to_cbor(j);
+
+                // Checking against an expected vector byte by byte is
+                // difficult, because no assumption on the order of key/value
+                // pairs are made. We therefore only check the prefix (type and
+                // size and the overall size. The rest is then handled in the
+                // roundtrip check.
+                CHECK(result.size() == 1787); // 1 type, 1 size, 255*7 content
+                CHECK(result[0] == 0xb8); // map 8 bit
+                CHECK(result[1] == 0xff); // size byte (0xff)
+                // roundtrip
+                CHECK(json::from_cbor(result) == j);
+                CHECK(json::from_cbor(result, true, false) == j);
+            }
+
+            SECTION("object with uint16_t elements")
+            {
+                json j;
+                for (auto i = 0; i < 256; ++i)
+                {
+                    // format i to a fixed width of 5
+                    // each entry will need 7 bytes: 6 for string, 1 for null
+                    std::stringstream ss;
+                    ss << std::setw(5) << std::setfill('0') << i;
+                    j.emplace(ss.str(), nullptr);
+                }
+
+                const auto result = json::to_cbor(j);
+
+                // Checking against an expected vector byte by byte is
+                // difficult, because no assumption on the order of key/value
+                // pairs are made. We therefore only check the prefix (type and
+                // size and the overall size. The rest is then handled in the
+                // roundtrip check.
+                CHECK(result.size() == 1795); // 1 type, 2 size, 256*7 content
+                CHECK(result[0] == 0xb9); // map 16 bit
+                CHECK(result[1] == 0x01); // byte 0 of size (0x0100)
+                CHECK(result[2] == 0x00); // byte 1 of size (0x0100)
+
+                // roundtrip
+                CHECK(json::from_cbor(result) == j);
+                CHECK(json::from_cbor(result, true, false) == j);
+            }
+
+            SECTION("object with uint32_t elements")
+            {
+                json j;
+                for (auto i = 0; i < 65536; ++i)
+                {
+                    // format i to a fixed width of 5
+                    // each entry will need 7 bytes: 6 for string, 1 for null
+                    std::stringstream ss;
+                    ss << std::setw(5) << std::setfill('0') << i;
+                    j.emplace(ss.str(), nullptr);
+                }
+
+                const auto result = json::to_cbor(j);
+
+                // Checking against an expected vector byte by byte is
+                // difficult, because no assumption on the order of key/value
+                // pairs are made. We therefore only check the prefix (type and
+                // size and the overall size. The rest is then handled in the
+                // roundtrip check.
+                CHECK(result.size() == 458757); // 1 type, 4 size, 65536*7 content
+                CHECK(result[0] == 0xba); // map 32 bit
+                CHECK(result[1] == 0x00); // byte 0 of size (0x00010000)
+                CHECK(result[2] == 0x01); // byte 1 of size (0x00010000)
+                CHECK(result[3] == 0x00); // byte 2 of size (0x00010000)
+                CHECK(result[4] == 0x00); // byte 3 of size (0x00010000)
+
+                // roundtrip
+                CHECK(json::from_cbor(result) == j);
+                CHECK(json::from_cbor(result, true, false) == j);
+            }
+        }
+
+        SECTION("binary")
+        {
+            SECTION("N = 0..23")
+            {
+                for (size_t N = 0; N <= 0x17; ++N)
+                {
+                    CAPTURE(N)
+
+                    // create JSON value with byte array containing of N * 'x'
+                    const auto s = std::vector<uint8_t>(N, 'x');
+                    const json j = json::binary(s);
+
+                    // create expected byte vector
+                    std::vector<uint8_t> expected;
+                    expected.push_back(static_cast<uint8_t>(0x40 + N));
+                    for (size_t i = 0; i < N; ++i)
+                    {
+                        expected.push_back(0x78);
+                    }
+
+                    // compare result + size
+                    const auto result = json::to_cbor(j);
+                    CHECK(result == expected);
+                    CHECK(result.size() == N + 1);
+                    // check that no null byte is appended
+                    if (N > 0)
+                    {
+                        CHECK(result.back() != '\x00');
+                    }
+
+                    // roundtrip
+                    CHECK(json::from_cbor(result) == j);
+                    CHECK(json::from_cbor(result, true, false) == j);
+                }
+            }
+
+            SECTION("N = 24..255")
+            {
+                for (size_t N = 24; N <= 255; ++N)
+                {
+                    CAPTURE(N)
+
+                    // create JSON value with string containing of N * 'x'
+                    const auto s = std::vector<uint8_t>(N, 'x');
+                    const json j = json::binary(s);
+
+                    // create expected byte vector
+                    std::vector<uint8_t> expected;
+                    expected.push_back(0x58);
+                    expected.push_back(static_cast<uint8_t>(N));
+                    for (size_t i = 0; i < N; ++i)
+                    {
+                        expected.push_back('x');
+                    }
+
+                    // compare result + size
+                    const auto result = json::to_cbor(j);
+                    CHECK(result == expected);
+                    CHECK(result.size() == N + 2);
+                    // check that no null byte is appended
+                    CHECK(result.back() != '\x00');
+
+                    // roundtrip
+                    CHECK(json::from_cbor(result) == j);
+                    CHECK(json::from_cbor(result, true, false) == j);
+                }
+            }
+
+            SECTION("N = 256..65535")
+            {
+                for (const size_t N :
+                        {
+                            256u, 999u, 1025u, 3333u, 2048u, 65535u
+                        })
+                {
+                    CAPTURE(N)
+
+                    // create JSON value with string containing of N * 'x'
+                    const auto s = std::vector<uint8_t>(N, 'x');
+                    const json j = json::binary(s);
+
+                    // create expected byte vector (hack: create string first)
+                    std::vector<uint8_t> expected(N, 'x');
+                    // reverse order of commands, because we insert at begin()
+                    expected.insert(expected.begin(), static_cast<uint8_t>(N & 0xff));
+                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 8) & 0xff));
+                    expected.insert(expected.begin(), 0x59);
+
+                    // compare result + size
+                    const auto result = json::to_cbor(j);
+                    CHECK(result == expected);
+                    CHECK(result.size() == N + 3);
+                    // check that no null byte is appended
+                    CHECK(result.back() != '\x00');
+
+                    // roundtrip
+                    CHECK(json::from_cbor(result) == j);
+                    CHECK(json::from_cbor(result, true, false) == j);
+                }
+            }
+
+            SECTION("N = 65536..4294967295")
+            {
+                for (const size_t N :
+                        {
+                            65536u, 77777u, 1048576u
+                        })
+                {
+                    CAPTURE(N)
+
+                    // create JSON value with string containing of N * 'x'
+                    const auto s = std::vector<uint8_t>(N, 'x');
+                    const json j = json::binary(s);
+
+                    // create expected byte vector (hack: create string first)
+                    std::vector<uint8_t> expected(N, 'x');
+                    // reverse order of commands, because we insert at begin()
+                    expected.insert(expected.begin(), static_cast<uint8_t>(N & 0xff));
+                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 8) & 0xff));
+                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 16) & 0xff));
+                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 24) & 0xff));
+                    expected.insert(expected.begin(), 0x5a);
+
+                    // compare result + size
+                    const auto result = json::to_cbor(j);
+                    CHECK(result == expected);
+                    CHECK(result.size() == N + 5);
+                    // check that no null byte is appended
+                    CHECK(result.back() != '\x00');
+
+                    // roundtrip
+                    CHECK(json::from_cbor(result) == j);
+                    CHECK(json::from_cbor(result, true, false) == j);
+                }
+            }
+
+            SECTION("indefinite size")
+            {
+                std::vector<std::uint8_t> const input = {0x5F, 0x44, 0xaa, 0xbb, 0xcc, 0xdd, 0x43, 0xee, 0xff, 0x99, 0xFF};
+                auto j = json::from_cbor(input);
+                CHECK(j.is_binary());
+                auto k = json::binary({0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff, 0x99});
+                CAPTURE(j.dump(0, ' ', false, json::error_handler_t::strict))
+                CHECK(j == k);
+            }
+
+            SECTION("binary in array")
+            {
+                // array with three empty byte strings
+                std::vector<std::uint8_t> const input = {0x83, 0x40, 0x40, 0x40};
+                json _;
+                CHECK_NOTHROW(_ = json::from_cbor(input));
+            }
+
+            SECTION("binary in object")
+            {
+                // object mapping "foo" to empty byte string
+                std::vector<std::uint8_t> const input = {0xA1, 0x63, 0x66, 0x6F, 0x6F, 0x40};
+                json _;
+                CHECK_NOTHROW(_ = json::from_cbor(input));
+            }
+
+            SECTION("SAX callback with binary")
+            {
+                // object mapping "foo" to byte string
+                std::vector<std::uint8_t> const input = {0xA1, 0x63, 0x66, 0x6F, 0x6F, 0x41, 0x00};
+
+                // callback to set binary_seen to true if a binary value was seen
+                bool binary_seen = false;
+                auto callback = [&binary_seen](int /*depth*/, json::parse_event_t /*event*/, json & parsed) noexcept
+                {
+                    if (parsed.is_binary())
+                    {
+                        binary_seen = true;
+                    }
+                    return true;
+                };
+
+                json j;
+                auto cbp = nlohmann::detail::json_sax_dom_callback_parser<json>(j, callback, true);
+                CHECK(json::sax_parse(input, &cbp, json::input_format_t::cbor));
+                CHECK(j.at("foo").is_binary());
+                CHECK(binary_seen);
+            }
+        }
+    }
+
+    SECTION("additional deserialization")
+    {
+        SECTION("0x5b (byte array)")
+        {
+            std::vector<uint8_t> const given = {0x5b, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x01, 0x61
+                                               };
+            const json j = json::from_cbor(given);
+            CHECK(j == json::binary(std::vector<uint8_t> {'a'}));
+        }
+
+        SECTION("0x7b (string)")
+        {
+            std::vector<uint8_t> const given = {0x7b, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x01, 0x61
+                                               };
+            const json j = json::from_cbor(given);
+            CHECK(j == "a");
+        }
+
+        SECTION("0x9b (array)")
+        {
+            std::vector<uint8_t> const given = {0x9b, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x01, 0xf4
+                                               };
+            const json j = json::from_cbor(given);
+            CHECK(j == json::parse("[false]"));
+        }
+
+        SECTION("0xbb (map)")
+        {
+            std::vector<uint8_t> const given = {0xbb, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x01, 0x60, 0xf4
+                                               };
+            const json j = json::from_cbor(given);
+            CHECK(j == json::parse("{\"\": false}"));
+        }
+    }
+
+    SECTION("errors")
+    {
+        SECTION("empty byte vector")
+        {
+            json _;
+            CHECK_THROWS_WITH_AS(_ = json::from_cbor(std::vector<uint8_t>()), "[json.exception.parse_error.110] parse error at byte 1: syntax error while parsing CBOR value: unexpected end of input", json::parse_error&);
+            CHECK(json::from_cbor(std::vector<uint8_t>(), true, false).is_discarded());
+        }
+
+        SECTION("too short byte vector")
+        {
+            json _;
+            CHECK_THROWS_WITH_AS(_ = json::from_cbor(std::vector<uint8_t>({0x18})), "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing CBOR number: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_cbor(std::vector<uint8_t>({0x19})), "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing CBOR number: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_cbor(std::vector<uint8_t>({0x19, 0x00})), "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing CBOR number: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_cbor(std::vector<uint8_t>({0x1a})), "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing CBOR number: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_cbor(std::vector<uint8_t>({0x1a, 0x00})), "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing CBOR number: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_cbor(std::vector<uint8_t>({0x1a, 0x00, 0x00})), "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing CBOR number: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_cbor(std::vector<uint8_t>({0x1a, 0x00, 0x00, 0x00})), "[json.exception.parse_error.110] parse error at byte 5: syntax error while parsing CBOR number: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_cbor(std::vector<uint8_t>({0x1b})), "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing CBOR number: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_cbor(std::vector<uint8_t>({0x1b, 0x00})), "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing CBOR number: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_cbor(std::vector<uint8_t>({0x1b, 0x00, 0x00})), "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing CBOR number: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_cbor(std::vector<uint8_t>({0x1b, 0x00, 0x00, 0x00})), "[json.exception.parse_error.110] parse error at byte 5: syntax error while parsing CBOR number: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_cbor(std::vector<uint8_t>({0x1b, 0x00, 0x00, 0x00, 0x00})), "[json.exception.parse_error.110] parse error at byte 6: syntax error while parsing CBOR number: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_cbor(std::vector<uint8_t>({0x1b, 0x00, 0x00, 0x00, 0x00, 0x00})), "[json.exception.parse_error.110] parse error at byte 7: syntax error while parsing CBOR number: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_cbor(std::vector<uint8_t>({0x1b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00})), "[json.exception.parse_error.110] parse error at byte 8: syntax error while parsing CBOR number: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_cbor(std::vector<uint8_t>({0x1b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00})), "[json.exception.parse_error.110] parse error at byte 9: syntax error while parsing CBOR number: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_cbor(std::vector<uint8_t>({0x62})), "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing CBOR string: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_cbor(std::vector<uint8_t>({0x62, 0x60})), "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing CBOR string: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_cbor(std::vector<uint8_t>({0x7F})), "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing CBOR string: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_cbor(std::vector<uint8_t>({0x7F, 0x60})), "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing CBOR string: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_cbor(std::vector<uint8_t>({0x82, 0x01})), "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing CBOR value: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_cbor(std::vector<uint8_t>({0x9F, 0x01})), "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing CBOR value: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_cbor(std::vector<uint8_t>({0xBF, 0x61, 0x61, 0xF5})), "[json.exception.parse_error.110] parse error at byte 5: syntax error while parsing CBOR string: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_cbor(std::vector<uint8_t>({0xA1, 0x61, 0X61})), "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing CBOR value: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_cbor(std::vector<uint8_t>({0xBF, 0x61, 0X61})), "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing CBOR value: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_cbor(std::vector<uint8_t>({0x5F})), "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing CBOR binary: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_cbor(std::vector<uint8_t>({0x5F, 0x00})), "[json.exception.parse_error.113] parse error at byte 2: syntax error while parsing CBOR binary: expected length specification (0x40-0x5B) or indefinite binary array type (0x5F); last byte: 0x00", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_cbor(std::vector<uint8_t>({0x41})), "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing CBOR binary: unexpected end of input", json::parse_error&);
+
+            CHECK(json::from_cbor(std::vector<uint8_t>({0x18}), true, false).is_discarded());
+            CHECK(json::from_cbor(std::vector<uint8_t>({0x19}), true, false).is_discarded());
+            CHECK(json::from_cbor(std::vector<uint8_t>({0x19, 0x00}), true, false).is_discarded());
+            CHECK(json::from_cbor(std::vector<uint8_t>({0x1a}), true, false).is_discarded());
+            CHECK(json::from_cbor(std::vector<uint8_t>({0x1a, 0x00}), true, false).is_discarded());
+            CHECK(json::from_cbor(std::vector<uint8_t>({0x1a, 0x00, 0x00}), true, false).is_discarded());
+            CHECK(json::from_cbor(std::vector<uint8_t>({0x1a, 0x00, 0x00, 0x00}), true, false).is_discarded());
+            CHECK(json::from_cbor(std::vector<uint8_t>({0x1b}), true, false).is_discarded());
+            CHECK(json::from_cbor(std::vector<uint8_t>({0x1b, 0x00}), true, false).is_discarded());
+            CHECK(json::from_cbor(std::vector<uint8_t>({0x1b, 0x00, 0x00}), true, false).is_discarded());
+            CHECK(json::from_cbor(std::vector<uint8_t>({0x1b, 0x00, 0x00, 0x00}), true, false).is_discarded());
+            CHECK(json::from_cbor(std::vector<uint8_t>({0x1b, 0x00, 0x00, 0x00, 0x00}), true, false).is_discarded());
+            CHECK(json::from_cbor(std::vector<uint8_t>({0x1b, 0x00, 0x00, 0x00, 0x00, 0x00}), true, false).is_discarded());
+            CHECK(json::from_cbor(std::vector<uint8_t>({0x1b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}), true, false).is_discarded());
+            CHECK(json::from_cbor(std::vector<uint8_t>({0x1b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}), true, false).is_discarded());
+            CHECK(json::from_cbor(std::vector<uint8_t>({0x62}), true, false).is_discarded());
+            CHECK(json::from_cbor(std::vector<uint8_t>({0x62, 0x60}), true, false).is_discarded());
+            CHECK(json::from_cbor(std::vector<uint8_t>({0x7F}), true, false).is_discarded());
+            CHECK(json::from_cbor(std::vector<uint8_t>({0x7F, 0x60}), true, false).is_discarded());
+            CHECK(json::from_cbor(std::vector<uint8_t>({0x82, 0x01}), true, false).is_discarded());
+            CHECK(json::from_cbor(std::vector<uint8_t>({0x9F, 0x01}), true, false).is_discarded());
+            CHECK(json::from_cbor(std::vector<uint8_t>({0xBF, 0x61, 0x61, 0xF5}), true, false).is_discarded());
+            CHECK(json::from_cbor(std::vector<uint8_t>({0xA1, 0x61, 0x61}), true, false).is_discarded());
+            CHECK(json::from_cbor(std::vector<uint8_t>({0xBF, 0x61, 0x61}), true, false).is_discarded());
+            CHECK(json::from_cbor(std::vector<uint8_t>({0x5F}), true, false).is_discarded());
+            CHECK(json::from_cbor(std::vector<uint8_t>({0x5F, 0x00}), true, false).is_discarded());
+            CHECK(json::from_cbor(std::vector<uint8_t>({0x41}), true, false).is_discarded());
+        }
+
+        SECTION("unsupported bytes")
+        {
+            SECTION("concrete examples")
+            {
+                json _;
+                CHECK_THROWS_WITH_AS(_ = json::from_cbor(std::vector<uint8_t>({0x1c})), "[json.exception.parse_error.112] parse error at byte 1: syntax error while parsing CBOR value: invalid byte: 0x1C", json::parse_error&);
+                CHECK(json::from_cbor(std::vector<uint8_t>({0x1c}), true, false).is_discarded());
+
+                CHECK_THROWS_WITH_AS(_ = json::from_cbor(std::vector<uint8_t>({0xf8})), "[json.exception.parse_error.112] parse error at byte 1: syntax error while parsing CBOR value: invalid byte: 0xF8", json::parse_error&);
+                CHECK(json::from_cbor(std::vector<uint8_t>({0xf8}), true, false).is_discarded());
+            }
+
+            SECTION("all unsupported bytes")
+            {
+                for (const auto byte :
+                        {
+                            // ?
+                            0x1c, 0x1d, 0x1e, 0x1f,
+                            // ?
+                            0x3c, 0x3d, 0x3e, 0x3f,
+                            // ?
+                            0x5c, 0x5d, 0x5e,
+                            // ?
+                            0x7c, 0x7d, 0x7e,
+                            // ?
+                            0x9c, 0x9d, 0x9e,
+                            // ?
+                            0xbc, 0xbd, 0xbe,
+                            // date/time
+                            0xc0, 0xc1,
+                            // bignum
+                            0xc2, 0xc3,
+                            // fraction
+                            0xc4,
+                            // bigfloat
+                            0xc5,
+                            // tagged item
+                            0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,
+                            // expected conversion
+                            0xd5, 0xd6, 0xd7,
+                            // more tagged items
+                            0xd8, 0xd9, 0xda, 0xdb,
+                            // ?
+                            0xdc, 0xdd, 0xde, 0xdf,
+                            // (simple value)
+                            0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xf0, 0xf1, 0xf2, 0xf3,
+                            // undefined
+                            0xf7,
+                            // simple value
+                            0xf8
+                        })
+                {
+                    json _;
+                    CHECK_THROWS_AS(_ = json::from_cbor(std::vector<uint8_t>({static_cast<uint8_t>(byte)})), json::parse_error&);
+                    CHECK(json::from_cbor(std::vector<uint8_t>({static_cast<uint8_t>(byte)}), true, false).is_discarded());
+                }
+            }
+        }
+
+        SECTION("invalid string in map")
+        {
+            json _;
+            CHECK_THROWS_WITH_AS(_ = json::from_cbor(std::vector<uint8_t>({0xa1, 0xff, 0x01})), "[json.exception.parse_error.113] parse error at byte 2: syntax error while parsing CBOR string: expected length specification (0x60-0x7B) or indefinite string type (0x7F); last byte: 0xFF", json::parse_error&);
+            CHECK(json::from_cbor(std::vector<uint8_t>({0xa1, 0xff, 0x01}), true, false).is_discarded());
+        }
+
+        SECTION("strict mode")
+        {
+            std::vector<uint8_t> const vec = {0xf6, 0xf6};
+            SECTION("non-strict mode")
+            {
+                const auto result = json::from_cbor(vec, false);
+                CHECK(result == json());
+                CHECK(!json::from_cbor(vec, false, false).is_discarded());
+            }
+
+            SECTION("strict mode")
+            {
+                json _;
+                CHECK_THROWS_WITH_AS(_ = json::from_cbor(vec), "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing CBOR value: expected end of input; last byte: 0xF6", json::parse_error&);
+                CHECK(json::from_cbor(vec, true, false).is_discarded());
+            }
+        }
+    }
+
+    SECTION("SAX aborts")
+    {
+        SECTION("start_array(len)")
+        {
+            std::vector<uint8_t> const v = {0x83, 0x01, 0x02, 0x03};
+            SaxCountdown scp(0);
+            CHECK(!json::sax_parse(v, &scp, json::input_format_t::cbor));
+        }
+
+        SECTION("start_object(len)")
+        {
+            std::vector<uint8_t> const v = {0xA1, 0x63, 0x66, 0x6F, 0x6F, 0xF4};
+            SaxCountdown scp(0);
+            CHECK(!json::sax_parse(v, &scp, json::input_format_t::cbor));
+        }
+
+        SECTION("key()")
+        {
+            std::vector<uint8_t> const v = {0xA1, 0x63, 0x66, 0x6F, 0x6F, 0xF4};
+            SaxCountdown scp(1);
+            CHECK(!json::sax_parse(v, &scp, json::input_format_t::cbor));
+        }
+    }
+}
+
+// use this testcase outside [hide] to run it with Valgrind
+TEST_CASE("single CBOR roundtrip")
+{
+    SECTION("sample.json")
+    {
+        std::string const filename = TEST_DATA_DIRECTORY "/json_testsuite/sample.json";
+
+        // parse JSON file
+        std::ifstream f_json(filename);
+        const json j1 = json::parse(f_json);
+
+        // parse CBOR file
+        auto packed = utils::read_binary_file(filename + ".cbor");
+        json j2;
+        CHECK_NOTHROW(j2 = json::from_cbor(packed));
+
+        // compare parsed JSON values
+        CHECK(j1 == j2);
+
+        SECTION("roundtrips")
+        {
+            SECTION("std::ostringstream")
+            {
+                std::basic_ostringstream<std::uint8_t> ss;
+                json::to_cbor(j1, ss);
+                json j3 = json::from_cbor(ss.str());
+                CHECK(j1 == j3);
+            }
+
+            SECTION("std::string")
+            {
+                std::string s;
+                json::to_cbor(j1, s);
+                json j3 = json::from_cbor(s);
+                CHECK(j1 == j3);
+            }
+        }
+
+        // check with different start index
+        packed.insert(packed.begin(), 5, 0xff);
+        CHECK(j1 == json::from_cbor(packed.begin() + 5, packed.end()));
+    }
+}
+
+#if !defined(JSON_NOEXCEPTION)
+TEST_CASE("CBOR regressions")
+{
+    SECTION("fuzz test results")
+    {
+        /*
+        The following test cases were found during a two-day session with
+        AFL-Fuzz. As a result, empty byte vectors and excessive lengths are
+        detected.
+        */
+        for (const std::string filename :
+                {
+                    TEST_DATA_DIRECTORY "/cbor_regression/test01",
+                    TEST_DATA_DIRECTORY "/cbor_regression/test02",
+                    TEST_DATA_DIRECTORY "/cbor_regression/test03",
+                    TEST_DATA_DIRECTORY "/cbor_regression/test04",
+                    TEST_DATA_DIRECTORY "/cbor_regression/test05",
+                    TEST_DATA_DIRECTORY "/cbor_regression/test06",
+                    TEST_DATA_DIRECTORY "/cbor_regression/test07",
+                    TEST_DATA_DIRECTORY "/cbor_regression/test08",
+                    TEST_DATA_DIRECTORY "/cbor_regression/test09",
+                    TEST_DATA_DIRECTORY "/cbor_regression/test10",
+                    TEST_DATA_DIRECTORY "/cbor_regression/test11",
+                    TEST_DATA_DIRECTORY "/cbor_regression/test12",
+                    TEST_DATA_DIRECTORY "/cbor_regression/test13",
+                    TEST_DATA_DIRECTORY "/cbor_regression/test14",
+                    TEST_DATA_DIRECTORY "/cbor_regression/test15",
+                    TEST_DATA_DIRECTORY "/cbor_regression/test16",
+                    TEST_DATA_DIRECTORY "/cbor_regression/test17",
+                    TEST_DATA_DIRECTORY "/cbor_regression/test18",
+                    TEST_DATA_DIRECTORY "/cbor_regression/test19",
+                    TEST_DATA_DIRECTORY "/cbor_regression/test20",
+                    TEST_DATA_DIRECTORY "/cbor_regression/test21"
+                })
+        {
+            CAPTURE(filename)
+
+            try
+            {
+                // parse CBOR file
+                auto vec1 = utils::read_binary_file(filename);
+                json j1 = json::from_cbor(vec1);
+
+                try
+                {
+                    // step 2: round trip
+                    std::vector<uint8_t> const vec2 = json::to_cbor(j1);
+
+                    // parse serialization
+                    json j2 = json::from_cbor(vec2);
+
+                    // deserializations must match
+                    CHECK(j1 == j2);
+                }
+                catch (const json::parse_error&)
+                {
+                    // parsing a CBOR serialization must not fail
+                    CHECK(false);
+                }
+            }
+            catch (const json::parse_error&) // NOLINT(bugprone-empty-catch)
+            {
+                // parse errors are ok, because input may be random bytes
+            }
+        }
+    }
+}
+#endif
+
+TEST_CASE("CBOR roundtrips" * doctest::skip())
+{
+    SECTION("input from flynn")
+    {
+        // most of these are excluded due to differences in key order (not a real problem)
+        std::set<std::string> exclude_packed;
+        exclude_packed.insert(TEST_DATA_DIRECTORY "/json.org/1.json");
+        exclude_packed.insert(TEST_DATA_DIRECTORY "/json.org/2.json");
+        exclude_packed.insert(TEST_DATA_DIRECTORY "/json.org/3.json");
+        exclude_packed.insert(TEST_DATA_DIRECTORY "/json.org/4.json");
+        exclude_packed.insert(TEST_DATA_DIRECTORY "/json.org/5.json");
+        exclude_packed.insert(TEST_DATA_DIRECTORY "/json_testsuite/sample.json"); // kills AppVeyor
+        exclude_packed.insert(TEST_DATA_DIRECTORY "/json_tests/pass1.json");
+        exclude_packed.insert(TEST_DATA_DIRECTORY "/regression/working_file.json");
+        exclude_packed.insert(TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object.json");
+        exclude_packed.insert(TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_duplicated_key.json");
+        exclude_packed.insert(TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_long_strings.json");
+
+        for (const std::string filename :
+                {
+                    TEST_DATA_DIRECTORY "/json_nlohmann_tests/all_unicode.json",
+                    TEST_DATA_DIRECTORY "/json.org/1.json",
+                    TEST_DATA_DIRECTORY "/json.org/2.json",
+                    TEST_DATA_DIRECTORY "/json.org/3.json",
+                    TEST_DATA_DIRECTORY "/json.org/4.json",
+                    TEST_DATA_DIRECTORY "/json.org/5.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip01.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip02.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip03.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip04.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip05.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip06.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip07.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip08.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip09.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip10.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip11.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip12.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip13.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip14.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip15.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip16.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip17.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip18.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip19.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip20.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip21.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip22.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip23.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip24.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip25.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip26.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip27.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip28.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip29.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip30.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip31.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip32.json",
+                    TEST_DATA_DIRECTORY "/json_testsuite/sample.json", // kills AppVeyor
+                    TEST_DATA_DIRECTORY "/json_tests/pass1.json",
+                    TEST_DATA_DIRECTORY "/json_tests/pass2.json",
+                    TEST_DATA_DIRECTORY "/json_tests/pass3.json",
+                    TEST_DATA_DIRECTORY "/regression/floats.json",
+                    TEST_DATA_DIRECTORY "/regression/signed_ints.json",
+                    TEST_DATA_DIRECTORY "/regression/unsigned_ints.json",
+                    TEST_DATA_DIRECTORY "/regression/working_file.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_arraysWithSpaces.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_empty-string.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_empty.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_ending_with_newline.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_false.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_heterogeneous.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_null.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_with_1_and_newline.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_with_leading_space.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_with_several_null.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_with_trailing_space.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_0e+1.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_0e1.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_after_space.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_double_close_to_zero.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_double_huge_neg_exp.json",
+                    //TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_huge_exp.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_int_with_exp.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_minus_zero.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_negative_int.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_negative_one.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_negative_zero.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_real_capital_e.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_real_capital_e_neg_exp.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_real_capital_e_pos_exp.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_real_exponent.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_real_fraction_exponent.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_real_neg_exp.json",
+                    //TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_real_neg_overflow.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_real_pos_exponent.json",
+                    //TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_real_pos_overflow.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_real_underflow.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_simple_int.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_simple_real.json",
+                    //TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_too_big_neg_int.json",
+                    //TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_too_big_pos_int.json",
+                    //TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_very_big_negative_int.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_basic.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_duplicated_key.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_duplicated_key_and_value.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_empty.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_empty_key.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_escaped_null_in_key.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_extreme_numbers.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_long_strings.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_simple.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_string_unicode.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_with_newlines.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_1_2_3_bytes_UTF-8_sequences.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_UTF-16_Surrogates_U+1D11E_MUSICAL_SYMBOL_G_CLEF.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_accepted_surrogate_pair.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_accepted_surrogate_pairs.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_allowed_escapes.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_backslash_and_u_escaped_zero.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_backslash_doublequotes.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_comments.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_double_escape_a.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_double_escape_n.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_escaped_control_character.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_escaped_noncharacter.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_in_array.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_in_array_with_leading_space.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_last_surrogates_1_and_2.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_newline_uescaped.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_nonCharacterInUTF-8_U+10FFFF.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_nonCharacterInUTF-8_U+1FFFF.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_nonCharacterInUTF-8_U+FFFF.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_null_escape.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_one-byte-utf-8.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_pi.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_simple_ascii.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_space.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_three-byte-utf-8.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_two-byte-utf-8.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_u+2028_line_sep.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_u+2029_par_sep.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_uEscape.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_unescaped_char_delete.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_unicode.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_unicodeEscapedBackslash.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_unicode_2.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_unicode_U+200B_ZERO_WIDTH_SPACE.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_unicode_U+2064_invisible_plus.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_unicode_escaped_double_quote.json",
+                    // TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_utf16.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_utf8.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_with_del_character.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_structure_lonely_false.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_structure_lonely_int.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_structure_lonely_negative_real.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_structure_lonely_null.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_structure_lonely_string.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_structure_lonely_true.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_structure_string_empty.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_structure_trailing_newline.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_structure_true_in_array.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_structure_whitespace_array.json"
+                })
+        {
+            CAPTURE(filename)
+
+            {
+                INFO_WITH_TEMP(filename + ": std::vector<uint8_t>");
+                // parse JSON file
+                std::ifstream f_json(filename);
+                json j1 = json::parse(f_json);
+
+                // parse CBOR file
+                const auto packed = utils::read_binary_file(filename + ".cbor");
+                json j2;
+                CHECK_NOTHROW(j2 = json::from_cbor(packed));
+
+                // compare parsed JSON values
+                CHECK(j1 == j2);
+            }
+
+            {
+                INFO_WITH_TEMP(filename + ": std::ifstream");
+                // parse JSON file
+                std::ifstream f_json(filename);
+                json j1 = json::parse(f_json);
+
+                // parse CBOR file
+                std::ifstream f_cbor(filename + ".cbor", std::ios::binary);
+                json j2;
+                CHECK_NOTHROW(j2 = json::from_cbor(f_cbor));
+
+                // compare parsed JSON values
+                CHECK(j1 == j2);
+            }
+
+            {
+                INFO_WITH_TEMP(filename + ": uint8_t* and size");
+                // parse JSON file
+                std::ifstream f_json(filename);
+                json j1 = json::parse(f_json);
+
+                // parse CBOR file
+                const auto packed = utils::read_binary_file(filename + ".cbor");
+                json j2;
+                CHECK_NOTHROW(j2 = json::from_cbor({packed.data(), packed.size()}));
+
+                // compare parsed JSON values
+                CHECK(j1 == j2);
+            }
+
+            {
+                INFO_WITH_TEMP(filename + ": output to output adapters");
+                // parse JSON file
+                std::ifstream f_json(filename);
+                json const j1 = json::parse(f_json);
+
+                // parse CBOR file
+                const auto packed = utils::read_binary_file(filename + ".cbor");
+
+                if (exclude_packed.count(filename) == 0u)
+                {
+                    {
+                        INFO_WITH_TEMP(filename + ": output adapters: std::vector<uint8_t>");
+                        std::vector<uint8_t> vec;
+                        json::to_cbor(j1, vec);
+                        CHECK(vec == packed);
+                    }
+                }
+            }
+        }
+    }
+}
+
+#if !defined(JSON_NOEXCEPTION)
+TEST_CASE("all CBOR first bytes")
+{
+    // these bytes will fail immediately with exception parse_error.112
+    std::set<uint8_t> unsupported =
+    {
+        //// types not supported by this library
+
+        // date/time
+        0xc0, 0xc1,
+        // bignum
+        0xc2, 0xc3,
+        // decimal fracion
+        0xc4,
+        // bigfloat
+        0xc5,
+        // tagged item
+        0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd,
+        0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd8,
+        0xd9, 0xda, 0xdb,
+        // expected conversion
+        0xd5, 0xd6, 0xd7,
+        // simple value
+        0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7,
+        0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xef, 0xf0,
+        0xf1, 0xf2, 0xf3,
+        0xf8,
+        // undefined
+        0xf7,
+
+        //// bytes not specified by CBOR
+
+        0x1c, 0x1d, 0x1e, 0x1f,
+        0x3c, 0x3d, 0x3e, 0x3f,
+        0x5c, 0x5d, 0x5e,
+        0x7c, 0x7d, 0x7e,
+        0x9c, 0x9d, 0x9e,
+        0xbc, 0xbd, 0xbe,
+        0xdc, 0xdd, 0xde, 0xdf,
+        0xee,
+        0xfc, 0xfe, 0xfd,
+
+        /// break cannot be the first byte
+
+        0xff
+    };
+
+    for (auto i = 0; i < 256; ++i)
+    {
+        const auto byte = static_cast<uint8_t>(i);
+
+        try
+        {
+            auto res = json::from_cbor(std::vector<uint8_t>(1, byte));
+        }
+        catch (const json::parse_error& e)
+        {
+            // check that parse_error.112 is only thrown if the
+            // first byte is in the unsupported set
+            INFO_WITH_TEMP(e.what());
+            if (unsupported.find(byte) != unsupported.end())
+            {
+                CHECK(e.id == 112);
+            }
+            else
+            {
+                CHECK(e.id != 112);
+            }
+        }
+    }
+}
+#endif
+
+TEST_CASE("examples from RFC 7049 Appendix A")
+{
+    SECTION("numbers")
+    {
+        CHECK(json::to_cbor(json::parse("0")) == std::vector<uint8_t>({0x00}));
+        CHECK(json::parse("0") == json::from_cbor(std::vector<uint8_t>({0x00})));
+
+        CHECK(json::to_cbor(json::parse("1")) == std::vector<uint8_t>({0x01}));
+        CHECK(json::parse("1") == json::from_cbor(std::vector<uint8_t>({0x01})));
+
+        CHECK(json::to_cbor(json::parse("10")) == std::vector<uint8_t>({0x0a}));
+        CHECK(json::parse("10") == json::from_cbor(std::vector<uint8_t>({0x0a})));
+
+        CHECK(json::to_cbor(json::parse("23")) == std::vector<uint8_t>({0x17}));
+        CHECK(json::parse("23") == json::from_cbor(std::vector<uint8_t>({0x17})));
+
+        CHECK(json::to_cbor(json::parse("24")) == std::vector<uint8_t>({0x18, 0x18}));
+        CHECK(json::parse("24") == json::from_cbor(std::vector<uint8_t>({0x18, 0x18})));
+
+        CHECK(json::to_cbor(json::parse("25")) == std::vector<uint8_t>({0x18, 0x19}));
+        CHECK(json::parse("25") == json::from_cbor(std::vector<uint8_t>({0x18, 0x19})));
+
+        CHECK(json::to_cbor(json::parse("100")) == std::vector<uint8_t>({0x18, 0x64}));
+        CHECK(json::parse("100") == json::from_cbor(std::vector<uint8_t>({0x18, 0x64})));
+
+        CHECK(json::to_cbor(json::parse("1000")) == std::vector<uint8_t>({0x19, 0x03, 0xe8}));
+        CHECK(json::parse("1000") == json::from_cbor(std::vector<uint8_t>({0x19, 0x03, 0xe8})));
+
+        CHECK(json::to_cbor(json::parse("1000000")) == std::vector<uint8_t>({0x1a, 0x00, 0x0f, 0x42, 0x40}));
+        CHECK(json::parse("1000000") == json::from_cbor(std::vector<uint8_t>({0x1a, 0x00, 0x0f, 0x42, 0x40})));
+
+        CHECK(json::to_cbor(json::parse("1000000000000")) == std::vector<uint8_t>({0x1b, 0x00, 0x00, 0x00, 0xe8, 0xd4, 0xa5, 0x10, 0x00}));
+        CHECK(json::parse("1000000000000") == json::from_cbor(std::vector<uint8_t>({0x1b, 0x00, 0x00, 0x00, 0xe8, 0xd4, 0xa5, 0x10, 0x00})));
+
+        CHECK(json::to_cbor(json::parse("18446744073709551615")) == std::vector<uint8_t>({0x1b, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}));
+        CHECK(json::parse("18446744073709551615") == json::from_cbor(std::vector<uint8_t>({0x1b, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff})));
+
+        // positive bignum is not supported
+        //CHECK(json::to_cbor(json::parse("18446744073709551616")) == std::vector<uint8_t>({0xc2, 0x49, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}));
+        //CHECK(json::parse("18446744073709551616") == json::from_cbor(std::vector<uint8_t>({0xc2, 0x49, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00})));
+
+        //CHECK(json::to_cbor(json::parse("-18446744073709551616")) == std::vector<uint8_t>({0x3b, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}));
+        //CHECK(json::parse("-18446744073709551616") == json::from_cbor(std::vector<uint8_t>({0x3b, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff})));
+
+        // negative bignum is not supported
+        //CHECK(json::to_cbor(json::parse("-18446744073709551617")) == std::vector<uint8_t>({0xc3, 0x49, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}));
+        //CHECK(json::parse("-18446744073709551617") == json::from_cbor(std::vector<uint8_t>({0xc3, 0x49, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00})));
+
+        CHECK(json::to_cbor(json::parse("-1")) == std::vector<uint8_t>({0x20}));
+        CHECK(json::parse("-1") == json::from_cbor(std::vector<uint8_t>({0x20})));
+
+        CHECK(json::to_cbor(json::parse("-10")) == std::vector<uint8_t>({0x29}));
+        CHECK(json::parse("-10") == json::from_cbor(std::vector<uint8_t>({0x29})));
+
+        CHECK(json::to_cbor(json::parse("-100")) == std::vector<uint8_t>({0x38, 0x63}));
+        CHECK(json::parse("-100") == json::from_cbor(std::vector<uint8_t>({0x38, 0x63})));
+
+        CHECK(json::to_cbor(json::parse("-1000")) == std::vector<uint8_t>({0x39, 0x03, 0xe7}));
+        CHECK(json::parse("-1000") == json::from_cbor(std::vector<uint8_t>({0x39, 0x03, 0xe7})));
+
+        // half-precision float
+        //CHECK(json::to_cbor(json::parse("0.0")) == std::vector<uint8_t>({0xf9, 0x00, 0x00}));
+        CHECK(json::parse("0.0") == json::from_cbor(std::vector<uint8_t>({0xf9, 0x00, 0x00})));
+
+        // half-precision float
+        //CHECK(json::to_cbor(json::parse("-0.0")) == std::vector<uint8_t>({0xf9, 0x80, 0x00}));
+        CHECK(json::parse("-0.0") == json::from_cbor(std::vector<uint8_t>({0xf9, 0x80, 0x00})));
+
+        // half-precision float
+        //CHECK(json::to_cbor(json::parse("1.0")) == std::vector<uint8_t>({0xf9, 0x3c, 0x00}));
+        CHECK(json::parse("1.0") == json::from_cbor(std::vector<uint8_t>({0xf9, 0x3c, 0x00})));
+
+        CHECK(json::to_cbor(json::parse("1.1")) == std::vector<uint8_t>({0xfb, 0x3f, 0xf1, 0x99, 0x99, 0x99, 0x99, 0x99, 0x9a}));
+        CHECK(json::parse("1.1") == json::from_cbor(std::vector<uint8_t>({0xfb, 0x3f, 0xf1, 0x99, 0x99, 0x99, 0x99, 0x99, 0x9a})));
+
+        // half-precision float
+        //CHECK(json::to_cbor(json::parse("1.5")) == std::vector<uint8_t>({0xf9, 0x3e, 0x00}));
+        CHECK(json::parse("1.5") == json::from_cbor(std::vector<uint8_t>({0xf9, 0x3e, 0x00})));
+
+        // half-precision float
+        //CHECK(json::to_cbor(json::parse("65504.0")) == std::vector<uint8_t>({0xf9, 0x7b, 0xff}));
+        CHECK(json::parse("65504.0") == json::from_cbor(std::vector<uint8_t>({0xf9, 0x7b, 0xff})));
+
+        //CHECK(json::to_cbor(json::parse("100000.0")) == std::vector<uint8_t>({0xfa, 0x47, 0xc3, 0x50, 0x00}));
+        CHECK(json::parse("100000.0") == json::from_cbor(std::vector<uint8_t>({0xfa, 0x47, 0xc3, 0x50, 0x00})));
+
+        //CHECK(json::to_cbor(json::parse("3.4028234663852886e+38")) == std::vector<uint8_t>({0xfa, 0x7f, 0x7f, 0xff, 0xff}));
+        CHECK(json::parse("3.4028234663852886e+38") == json::from_cbor(std::vector<uint8_t>({0xfa, 0x7f, 0x7f, 0xff, 0xff})));
+
+        CHECK(json::to_cbor(json::parse("1.0e+300")) == std::vector<uint8_t>({0xfb, 0x7e, 0x37, 0xe4, 0x3c, 0x88, 0x00, 0x75, 0x9c}));
+        CHECK(json::parse("1.0e+300") == json::from_cbor(std::vector<uint8_t>({0xfb, 0x7e, 0x37, 0xe4, 0x3c, 0x88, 0x00, 0x75, 0x9c})));
+
+        // half-precision float
+        //CHECK(json::to_cbor(json::parse("5.960464477539063e-8")) == std::vector<uint8_t>({0xf9, 0x00, 0x01}));
+        CHECK(json::parse("-4.0") == json::from_cbor(std::vector<uint8_t>({0xf9, 0xc4, 0x00})));
+
+        // half-precision float
+        //CHECK(json::to_cbor(json::parse("0.00006103515625")) == std::vector<uint8_t>({0xf9, 0x04, 0x00}));
+        CHECK(json::parse("-4.0") == json::from_cbor(std::vector<uint8_t>({0xf9, 0xc4, 0x00})));
+
+        // half-precision float
+        //CHECK(json::to_cbor(json::parse("-4.0")) == std::vector<uint8_t>({0xf9, 0xc4, 0x00}));
+        CHECK(json::parse("-4.0") == json::from_cbor(std::vector<uint8_t>({0xf9, 0xc4, 0x00})));
+
+        CHECK(json::to_cbor(json::parse("-4.1")) == std::vector<uint8_t>({0xfb, 0xc0, 0x10, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66}));
+        CHECK(json::parse("-4.1") == json::from_cbor(std::vector<uint8_t>({0xfb, 0xc0, 0x10, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66})));
+    }
+
+    SECTION("simple values")
+    {
+        CHECK(json::to_cbor(json::parse("false")) == std::vector<uint8_t>({0xf4}));
+        CHECK(json::parse("false") == json::from_cbor(std::vector<uint8_t>({0xf4})));
+
+        CHECK(json::to_cbor(json::parse("true")) == std::vector<uint8_t>({0xf5}));
+        CHECK(json::parse("true") == json::from_cbor(std::vector<uint8_t>({0xf5})));
+
+        CHECK(json::to_cbor(json::parse("true")) == std::vector<uint8_t>({0xf5}));
+        CHECK(json::parse("true") == json::from_cbor(std::vector<uint8_t>({0xf5})));
+    }
+
+    SECTION("strings")
+    {
+        CHECK(json::to_cbor(json::parse("\"\"")) == std::vector<uint8_t>({0x60}));
+        CHECK(json::parse("\"\"") == json::from_cbor(std::vector<uint8_t>({0x60})));
+
+        CHECK(json::to_cbor(json::parse("\"a\"")) == std::vector<uint8_t>({0x61, 0x61}));
+        CHECK(json::parse("\"a\"") == json::from_cbor(std::vector<uint8_t>({0x61, 0x61})));
+
+        CHECK(json::to_cbor(json::parse("\"IETF\"")) == std::vector<uint8_t>({0x64, 0x49, 0x45, 0x54, 0x46}));
+        CHECK(json::parse("\"IETF\"") == json::from_cbor(std::vector<uint8_t>({0x64, 0x49, 0x45, 0x54, 0x46})));
+
+        CHECK(json::to_cbor(json::parse("\"\\u00fc\"")) == std::vector<uint8_t>({0x62, 0xc3, 0xbc}));
+        CHECK(json::parse("\"\\u00fc\"") == json::from_cbor(std::vector<uint8_t>({0x62, 0xc3, 0xbc})));
+
+        CHECK(json::to_cbor(json::parse("\"\\u6c34\"")) == std::vector<uint8_t>({0x63, 0xe6, 0xb0, 0xb4}));
+        CHECK(json::parse("\"\\u6c34\"") == json::from_cbor(std::vector<uint8_t>({0x63, 0xe6, 0xb0, 0xb4})));
+
+        CHECK(json::to_cbor(json::parse("\"\\ud800\\udd51\"")) == std::vector<uint8_t>({0x64, 0xf0, 0x90, 0x85, 0x91}));
+        CHECK(json::parse("\"\\ud800\\udd51\"") == json::from_cbor(std::vector<uint8_t>({0x64, 0xf0, 0x90, 0x85, 0x91})));
+
+        // indefinite length strings
+        CHECK(json::parse("\"streaming\"") == json::from_cbor(std::vector<uint8_t>({0x7f, 0x65, 0x73, 0x74, 0x72, 0x65, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x67, 0xff})));
+    }
+
+    SECTION("byte arrays")
+    {
+        const auto packed = utils::read_binary_file(TEST_DATA_DIRECTORY "/binary_data/cbor_binary.cbor");
+        json j;
+        CHECK_NOTHROW(j = json::from_cbor(packed));
+
+        const auto expected = utils::read_binary_file(TEST_DATA_DIRECTORY "/binary_data/cbor_binary.out");
+        CHECK(j == json::binary(expected));
+
+        // 0xd8
+        CHECK(json::to_cbor(json::binary(std::vector<uint8_t> {}, 0x42)) == std::vector<uint8_t> {0xd8, 0x42, 0x40});
+        CHECK(!json::from_cbor(json::to_cbor(json::binary(std::vector<uint8_t> {}, 0x42)), true, true, json::cbor_tag_handler_t::ignore).get_binary().has_subtype());
+        CHECK(json::from_cbor(json::to_cbor(json::binary(std::vector<uint8_t> {}, 0x42)), true, true, json::cbor_tag_handler_t::store).get_binary().subtype() == 0x42);
+        // 0xd9
+        CHECK(json::to_cbor(json::binary(std::vector<uint8_t> {}, 1000)) == std::vector<uint8_t> {0xd9, 0x03, 0xe8, 0x40});
+        CHECK(!json::from_cbor(json::to_cbor(json::binary(std::vector<uint8_t> {}, 1000)), true, true, json::cbor_tag_handler_t::ignore).get_binary().has_subtype());
+        CHECK(json::from_cbor(json::to_cbor(json::binary(std::vector<uint8_t> {}, 1000)), true, true, json::cbor_tag_handler_t::store).get_binary().subtype() == 1000);
+        // 0xda
+        CHECK(json::to_cbor(json::binary(std::vector<uint8_t> {}, 394216)) == std::vector<uint8_t> {0xda, 0x00, 0x06, 0x03, 0xe8, 0x40});
+        CHECK(!json::from_cbor(json::to_cbor(json::binary(std::vector<uint8_t> {}, 394216)), true, true, json::cbor_tag_handler_t::ignore).get_binary().has_subtype());
+        CHECK(json::from_cbor(json::to_cbor(json::binary(std::vector<uint8_t> {}, 394216)), true, true, json::cbor_tag_handler_t::store).get_binary().subtype() == 394216);
+        // 0xdb
+        CHECK(json::to_cbor(json::binary(std::vector<uint8_t> {}, 8589934590)) == std::vector<uint8_t> {0xdb, 0x00, 0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 0xfe, 0x40});
+        CHECK(!json::from_cbor(json::to_cbor(json::binary(std::vector<uint8_t> {}, 8589934590)), true, true, json::cbor_tag_handler_t::ignore).get_binary().has_subtype());
+        CHECK(json::from_cbor(json::to_cbor(json::binary(std::vector<uint8_t> {}, 8589934590)), true, true, json::cbor_tag_handler_t::store).get_binary().subtype() == 8589934590);
+    }
+
+    SECTION("arrays")
+    {
+        CHECK(json::to_cbor(json::parse("[]")) == std::vector<uint8_t>({0x80}));
+        CHECK(json::parse("[]") == json::from_cbor(std::vector<uint8_t>({0x80})));
+
+        CHECK(json::to_cbor(json::parse("[1, 2, 3]")) == std::vector<uint8_t>({0x83, 0x01, 0x02, 0x03}));
+        CHECK(json::parse("[1, 2, 3]") == json::from_cbor(std::vector<uint8_t>({0x83, 0x01, 0x02, 0x03})));
+
+        CHECK(json::to_cbor(json::parse("[1, [2, 3], [4, 5]]")) == std::vector<uint8_t>({0x83, 0x01, 0x82, 0x02, 0x03, 0x82, 0x04, 0x05}));
+        CHECK(json::parse("[1, [2, 3], [4, 5]]") == json::from_cbor(std::vector<uint8_t>({0x83, 0x01, 0x82, 0x02, 0x03, 0x82, 0x04, 0x05})));
+
+        CHECK(json::to_cbor(json::parse("[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25]")) == std::vector<uint8_t>({0x98, 0x19, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x18, 0x18, 0x19}));
+        CHECK(json::parse("[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25]") == json::from_cbor(std::vector<uint8_t>({0x98, 0x19, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x18, 0x18, 0x19})));
+
+        // indefinite length arrays
+        CHECK(json::parse("[]") == json::from_cbor(std::vector<uint8_t>({0x9f, 0xff})));
+        CHECK(json::parse("[1, [2, 3], [4, 5]] ") == json::from_cbor(std::vector<uint8_t>({0x9f, 0x01, 0x82, 0x02, 0x03, 0x9f, 0x04, 0x05, 0xff, 0xff})));
+        CHECK(json::parse("[1, [2, 3], [4, 5]]") == json::from_cbor(std::vector<uint8_t>({0x9f, 0x01, 0x82, 0x02, 0x03, 0x82, 0x04, 0x05, 0xff})));
+        CHECK(json::parse("[1, [2, 3], [4, 5]]") == json::from_cbor(std::vector<uint8_t>({0x83, 0x01, 0x82, 0x02, 0x03, 0x9f, 0x04, 0x05, 0xff})));
+        CHECK(json::parse("[1, [2, 3], [4, 5]]") == json::from_cbor(std::vector<uint8_t>({0x83, 0x01, 0x9f, 0x02, 0x03, 0xff, 0x82, 0x04, 0x05})));
+        CHECK(json::parse("[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25]") == json::from_cbor(std::vector<uint8_t>({0x9f, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x18, 0x18, 0x19, 0xff})));
+    }
+
+    SECTION("objects")
+    {
+        CHECK(json::to_cbor(json::parse("{}")) == std::vector<uint8_t>({0xa0}));
+        CHECK(json::parse("{}") == json::from_cbor(std::vector<uint8_t>({0xa0})));
+
+        CHECK(json::to_cbor(json::parse("{\"a\": 1, \"b\": [2, 3]}")) == std::vector<uint8_t>({0xa2, 0x61, 0x61, 0x01, 0x61, 0x62, 0x82, 0x02, 0x03}));
+        CHECK(json::parse("{\"a\": 1, \"b\": [2, 3]}") == json::from_cbor(std::vector<uint8_t>({0xa2, 0x61, 0x61, 0x01, 0x61, 0x62, 0x82, 0x02, 0x03})));
+
+        CHECK(json::to_cbor(json::parse("[\"a\", {\"b\": \"c\"}]")) == std::vector<uint8_t>({0x82, 0x61, 0x61, 0xa1, 0x61, 0x62, 0x61, 0x63}));
+        CHECK(json::parse("[\"a\", {\"b\": \"c\"}]") == json::from_cbor(std::vector<uint8_t>({0x82, 0x61, 0x61, 0xa1, 0x61, 0x62, 0x61, 0x63})));
+
+        CHECK(json::to_cbor(json::parse("{\"a\": \"A\", \"b\": \"B\", \"c\": \"C\", \"d\": \"D\", \"e\": \"E\"}")) == std::vector<uint8_t>({0xa5, 0x61, 0x61, 0x61, 0x41, 0x61, 0x62, 0x61, 0x42, 0x61, 0x63, 0x61, 0x43, 0x61, 0x64, 0x61, 0x44, 0x61, 0x65, 0x61, 0x45}));
+        CHECK(json::parse("{\"a\": \"A\", \"b\": \"B\", \"c\": \"C\", \"d\": \"D\", \"e\": \"E\"}") == json::from_cbor(std::vector<uint8_t>({0xa5, 0x61, 0x61, 0x61, 0x41, 0x61, 0x62, 0x61, 0x42, 0x61, 0x63, 0x61, 0x43, 0x61, 0x64, 0x61, 0x44, 0x61, 0x65, 0x61, 0x45})));
+
+        // indefinite length objects
+        CHECK(json::parse("{\"a\": 1, \"b\": [2, 3]}") == json::from_cbor(std::vector<uint8_t>({0xbf, 0x61, 0x61, 0x01, 0x61, 0x62, 0x9f, 0x02, 0x03, 0xff, 0xff})));
+        CHECK(json::parse("[\"a\", {\"b\": \"c\"}]") == json::from_cbor(std::vector<uint8_t>({0x82, 0x61, 0x61, 0xbf, 0x61, 0x62, 0x61, 0x63, 0xff})));
+        CHECK(json::parse("{\"Fun\": true, \"Amt\": -2}") == json::from_cbor(std::vector<uint8_t>({0xbf, 0x63, 0x46, 0x75, 0x6e, 0xf5, 0x63, 0x41, 0x6d, 0x74, 0x21, 0xff})));
+    }
+}
+
+TEST_CASE("Tagged values")
+{
+    const json j = "s";
+    auto v = json::to_cbor(j);
+
+    SECTION("0xC6..0xD4")
+    {
+        for (const auto b : std::vector<std::uint8_t>
+    {
+        0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4
+    })
+        {
+            CAPTURE(b);
+
+            // add tag to value
+            auto v_tagged = v;
+            v_tagged.insert(v_tagged.begin(), b);
+
+            // check that parsing fails in error mode
+            json _;
+            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged), json::parse_error);
+            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged, true, true, json::cbor_tag_handler_t::error), json::parse_error);
+
+            // check that parsing succeeds and gets original value in ignore mode
+            auto j_tagged = json::from_cbor(v_tagged, true, true, json::cbor_tag_handler_t::ignore);
+            CHECK(j_tagged == j);
+
+            auto j_tagged_stored = json::from_cbor(v_tagged, true, true, json::cbor_tag_handler_t::store);
+            CHECK(j_tagged_stored == j);
+        }
+    }
+
+    SECTION("0xD8 - 1 byte follows")
+    {
+        SECTION("success")
+        {
+            // add tag to value
+            auto v_tagged = v;
+            v_tagged.insert(v_tagged.begin(), 0x42); // 1 byte
+            v_tagged.insert(v_tagged.begin(), 0xD8); // tag
+
+            // check that parsing fails in error mode
+            json _;
+            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged), json::parse_error);
+            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged, true, true, json::cbor_tag_handler_t::error), json::parse_error);
+
+            // check that parsing succeeds and gets original value in ignore mode
+            auto j_tagged = json::from_cbor(v_tagged, true, true, json::cbor_tag_handler_t::ignore);
+            CHECK(j_tagged == j);
+        }
+
+        SECTION("missing byte after tag")
+        {
+            // add tag to value
+            auto v_tagged = v;
+            v_tagged.insert(v_tagged.begin(), 0xD8); // tag
+
+            // check that parsing fails in all modes
+            json _;
+            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged), json::parse_error);
+            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged, true, true, json::cbor_tag_handler_t::error), json::parse_error);
+            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged, true, true, json::cbor_tag_handler_t::ignore), json::parse_error);
+        }
+    }
+
+    SECTION("0xD9 - 2 byte follow")
+    {
+        SECTION("success")
+        {
+            // add tag to value
+            auto v_tagged = v;
+            v_tagged.insert(v_tagged.begin(), 0x42); // 1 byte
+            v_tagged.insert(v_tagged.begin(), 0x23); // 1 byte
+            v_tagged.insert(v_tagged.begin(), 0xD9); // tag
+
+            // check that parsing fails in error mode
+            json _;
+            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged), json::parse_error);
+            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged, true, true, json::cbor_tag_handler_t::error), json::parse_error);
+
+            // check that parsing succeeds and gets original value in ignore mode
+            auto j_tagged = json::from_cbor(v_tagged, true, true, json::cbor_tag_handler_t::ignore);
+            CHECK(j_tagged == j);
+        }
+
+        SECTION("missing byte after tag")
+        {
+            // add tag to value
+            auto v_tagged = v;
+            v_tagged.insert(v_tagged.begin(), 0x23); // 1 byte
+            v_tagged.insert(v_tagged.begin(), 0xD9); // tag
+
+            // check that parsing fails in all modes
+            json _;
+            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged), json::parse_error);
+            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged, true, true, json::cbor_tag_handler_t::error), json::parse_error);
+            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged, true, true, json::cbor_tag_handler_t::ignore), json::parse_error);
+        }
+    }
+
+    SECTION("0xDA - 4 bytes follow")
+    {
+        SECTION("success")
+        {
+            // add tag to value
+            auto v_tagged = v;
+            v_tagged.insert(v_tagged.begin(), 0x42); // 1 byte
+            v_tagged.insert(v_tagged.begin(), 0x23); // 1 byte
+            v_tagged.insert(v_tagged.begin(), 0x22); // 1 byte
+            v_tagged.insert(v_tagged.begin(), 0x11); // 1 byte
+            v_tagged.insert(v_tagged.begin(), 0xDA); // tag
+
+            // check that parsing fails in error mode
+            json _;
+            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged), json::parse_error);
+            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged, true, true, json::cbor_tag_handler_t::error), json::parse_error);
+
+            // check that parsing succeeds and gets original value in ignore mode
+            auto j_tagged = json::from_cbor(v_tagged, true, true, json::cbor_tag_handler_t::ignore);
+            CHECK(j_tagged == j);
+        }
+
+        SECTION("missing bytes after tag")
+        {
+            // add tag to value
+            auto v_tagged = v;
+            v_tagged.insert(v_tagged.begin(), 0x23); // 1 byte
+            v_tagged.insert(v_tagged.begin(), 0x22); // 1 byte
+            v_tagged.insert(v_tagged.begin(), 0x11); // 1 byte
+            v_tagged.insert(v_tagged.begin(), 0xDA); // tag
+
+            // check that parsing fails in all modes
+            json _;
+            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged), json::parse_error);
+            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged, true, true, json::cbor_tag_handler_t::error), json::parse_error);
+            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged, true, true, json::cbor_tag_handler_t::ignore), json::parse_error);
+        }
+    }
+
+    SECTION("0xDB - 8 bytes follow")
+    {
+        SECTION("success")
+        {
+            // add tag to value
+            auto v_tagged = v;
+            v_tagged.insert(v_tagged.begin(), 0x42); // 1 byte
+            v_tagged.insert(v_tagged.begin(), 0x23); // 1 byte
+            v_tagged.insert(v_tagged.begin(), 0x22); // 1 byte
+            v_tagged.insert(v_tagged.begin(), 0x11); // 1 byte
+            v_tagged.insert(v_tagged.begin(), 0x42); // 1 byte
+            v_tagged.insert(v_tagged.begin(), 0x23); // 1 byte
+            v_tagged.insert(v_tagged.begin(), 0x22); // 1 byte
+            v_tagged.insert(v_tagged.begin(), 0x11); // 1 byte
+            v_tagged.insert(v_tagged.begin(), 0xDB); // tag
+
+            // check that parsing fails in error mode
+            json _;
+            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged), json::parse_error);
+            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged, true, true, json::cbor_tag_handler_t::error), json::parse_error);
+
+            // check that parsing succeeds and gets original value in ignore mode
+            auto j_tagged = json::from_cbor(v_tagged, true, true, json::cbor_tag_handler_t::ignore);
+            CHECK(j_tagged == j);
+        }
+
+        SECTION("missing byte after tag")
+        {
+            // add tag to value
+            auto v_tagged = v;
+            v_tagged.insert(v_tagged.begin(), 0x42); // 1 byte
+            v_tagged.insert(v_tagged.begin(), 0x23); // 1 byte
+            v_tagged.insert(v_tagged.begin(), 0x22); // 1 byte
+            v_tagged.insert(v_tagged.begin(), 0x11); // 1 byte
+            v_tagged.insert(v_tagged.begin(), 0x23); // 1 byte
+            v_tagged.insert(v_tagged.begin(), 0x22); // 1 byte
+            v_tagged.insert(v_tagged.begin(), 0x11); // 1 byte
+            v_tagged.insert(v_tagged.begin(), 0xDB); // tag
+
+            // check that parsing fails in all modes
+            json _;
+            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged), json::parse_error);
+            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged, true, true, json::cbor_tag_handler_t::error), json::parse_error);
+            CHECK_THROWS_AS(_ = json::from_cbor(v_tagged, true, true, json::cbor_tag_handler_t::ignore), json::parse_error);
+        }
+    }
+
+    SECTION("tagged binary")
+    {
+        // create a binary value of subtype 42
+        json j_binary;
+        j_binary["binary"] = json::binary({0xCA, 0xFE, 0xBA, 0xBE}, 42);
+
+        // convert to CBOR
+        const auto vec = json::to_cbor(j_binary);
+        CHECK(vec == std::vector<std::uint8_t> {0xA1, 0x66, 0x62, 0x69, 0x6E, 0x61, 0x72, 0x79, 0xD8, 0x2A, 0x44, 0xCA, 0xFE, 0xBA, 0xBE});
+
+        // parse error when parsing tagged value
+        json _;
+        CHECK_THROWS_WITH_AS(_ = json::from_cbor(vec), "[json.exception.parse_error.112] parse error at byte 9: syntax error while parsing CBOR value: invalid byte: 0xD8", json::parse_error);
+
+        // binary without subtype when tags are ignored
+        json jb = json::from_cbor(vec, true, true, json::cbor_tag_handler_t::ignore);
+        CHECK(jb.is_object());
+        CHECK(jb["binary"].is_binary());
+        CHECK(!jb["binary"].get_binary().has_subtype());
+    }
+}
diff --git a/external_imported/json/tests/src/unit-class_const_iterator.cpp b/external_imported/json/tests/src/unit-class_const_iterator.cpp
new file mode 100644
index 000000000..003ce8892
--- /dev/null
+++ b/external_imported/json/tests/src/unit-class_const_iterator.cpp
@@ -0,0 +1,393 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+#define JSON_TESTS_PRIVATE
+#include <nlohmann/json.hpp>
+using nlohmann::json;
+
+TEST_CASE("const_iterator class")
+{
+    SECTION("construction")
+    {
+        SECTION("constructor")
+        {
+            SECTION("null")
+            {
+                json const j(json::value_t::null);
+                json::const_iterator const it(&j);
+            }
+
+            SECTION("object")
+            {
+                json const j(json::value_t::object);
+                json::const_iterator const it(&j);
+            }
+
+            SECTION("array")
+            {
+                json const j(json::value_t::array);
+                json::const_iterator const it(&j);
+            }
+        }
+
+        SECTION("copy assignment")
+        {
+            json const j(json::value_t::null);
+            json::const_iterator const it(&j);
+            json::const_iterator it2(&j);
+            it2 = it;
+        }
+
+        SECTION("copy constructor from non-const iterator")
+        {
+            SECTION("create from uninitialized iterator")
+            {
+                const json::iterator it {};
+                json::const_iterator const cit(it);
+            }
+
+            SECTION("create from initialized iterator")
+            {
+                json j;
+                const json::iterator it = j.begin();
+                json::const_iterator const cit(it);
+            }
+        }
+    }
+
+    SECTION("initialization")
+    {
+        SECTION("set_begin")
+        {
+            SECTION("null")
+            {
+                json const j(json::value_t::null);
+                json::const_iterator it(&j);
+                it.set_begin();
+                CHECK((it == j.cbegin()));
+            }
+
+            SECTION("object")
+            {
+                json const j(json::value_t::object);
+                json::const_iterator it(&j);
+                it.set_begin();
+                CHECK((it == j.cbegin()));
+            }
+
+            SECTION("array")
+            {
+                json const j(json::value_t::array);
+                json::const_iterator it(&j);
+                it.set_begin();
+                CHECK((it == j.cbegin()));
+            }
+        }
+
+        SECTION("set_end")
+        {
+            SECTION("null")
+            {
+                json const j(json::value_t::null);
+                json::const_iterator it(&j);
+                it.set_end();
+                CHECK((it == j.cend()));
+            }
+
+            SECTION("object")
+            {
+                json const j(json::value_t::object);
+                json::const_iterator it(&j);
+                it.set_end();
+                CHECK((it == j.cend()));
+            }
+
+            SECTION("array")
+            {
+                json const j(json::value_t::array);
+                json::const_iterator it(&j);
+                it.set_end();
+                CHECK((it == j.cend()));
+            }
+        }
+    }
+
+    SECTION("element access")
+    {
+        SECTION("operator*")
+        {
+            SECTION("null")
+            {
+                json const j(json::value_t::null);
+                json::const_iterator const it = j.cbegin();
+                CHECK_THROWS_WITH_AS(*it, "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&);
+            }
+
+            SECTION("number")
+            {
+                json const j(17);
+                json::const_iterator it = j.cbegin();
+                CHECK(*it == json(17));
+                it = j.cend();
+                CHECK_THROWS_WITH_AS(*it, "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&);
+            }
+
+            SECTION("object")
+            {
+                json const j({{"foo", "bar"}});
+                json::const_iterator const it = j.cbegin();
+                CHECK(*it == json("bar"));
+            }
+
+            SECTION("array")
+            {
+                json const j({1, 2, 3, 4});
+                json::const_iterator const it = j.cbegin();
+                CHECK(*it == json(1));
+            }
+        }
+
+        SECTION("operator->")
+        {
+            SECTION("null")
+            {
+                json const j(json::value_t::null);
+                json::const_iterator const it = j.cbegin();
+                CHECK_THROWS_WITH_AS(std::string(it->type_name()), "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&);
+            }
+
+            SECTION("number")
+            {
+                json const j(17);
+                json::const_iterator it = j.cbegin();
+                CHECK(std::string(it->type_name()) == "number");
+                it = j.cend();
+                CHECK_THROWS_WITH_AS(std::string(it->type_name()), "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&);
+            }
+
+            SECTION("object")
+            {
+                json const j({{"foo", "bar"}});
+                json::const_iterator const it = j.cbegin();
+                CHECK(std::string(it->type_name()) == "string");
+            }
+
+            SECTION("array")
+            {
+                json const j({1, 2, 3, 4});
+                json::const_iterator const it = j.cbegin();
+                CHECK(std::string(it->type_name()) == "number");
+            }
+        }
+    }
+
+    SECTION("increment/decrement")
+    {
+        SECTION("post-increment")
+        {
+            SECTION("null")
+            {
+                json const j(json::value_t::null);
+                json::const_iterator it = j.cbegin();
+                CHECK((it.m_it.primitive_iterator.m_it == 1));
+                it++;
+                CHECK((it.m_it.primitive_iterator.m_it != 0 && it.m_it.primitive_iterator.m_it != 1));
+            }
+
+            SECTION("number")
+            {
+                json const j(17);
+                json::const_iterator it = j.cbegin();
+                CHECK((it.m_it.primitive_iterator.m_it == 0));
+                it++;
+                CHECK((it.m_it.primitive_iterator.m_it == 1));
+                it++;
+                CHECK((it.m_it.primitive_iterator.m_it != 0 && it.m_it.primitive_iterator.m_it != 1));
+            }
+
+            SECTION("object")
+            {
+                json const j({{"foo", "bar"}});
+                json::const_iterator it = j.cbegin();
+                CHECK((it.m_it.object_iterator == it.m_object->m_data.m_value.object->begin()));
+                it++;
+                CHECK((it.m_it.object_iterator == it.m_object->m_data.m_value.object->end()));
+            }
+
+            SECTION("array")
+            {
+                json const j({1, 2, 3, 4});
+                json::const_iterator it = j.cbegin();
+                CHECK((it.m_it.array_iterator == it.m_object->m_data.m_value.array->begin()));
+                it++;
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->begin()));
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->end()));
+                it++;
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->begin()));
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->end()));
+                it++;
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->begin()));
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->end()));
+                it++;
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->begin()));
+                CHECK((it.m_it.array_iterator == it.m_object->m_data.m_value.array->end()));
+            }
+        }
+
+        SECTION("pre-increment")
+        {
+            SECTION("null")
+            {
+                json const j(json::value_t::null);
+                json::const_iterator it = j.cbegin();
+                CHECK((it.m_it.primitive_iterator.m_it == 1));
+                ++it;
+                CHECK((it.m_it.primitive_iterator.m_it != 0 && it.m_it.primitive_iterator.m_it != 1));
+            }
+
+            SECTION("number")
+            {
+                json const j(17);
+                json::const_iterator it = j.cbegin();
+                CHECK((it.m_it.primitive_iterator.m_it == 0));
+                ++it;
+                CHECK((it.m_it.primitive_iterator.m_it == 1));
+                ++it;
+                CHECK((it.m_it.primitive_iterator.m_it != 0 && it.m_it.primitive_iterator.m_it != 1));
+            }
+
+            SECTION("object")
+            {
+                json const j({{"foo", "bar"}});
+                json::const_iterator it = j.cbegin();
+                CHECK((it.m_it.object_iterator == it.m_object->m_data.m_value.object->begin()));
+                ++it;
+                CHECK((it.m_it.object_iterator == it.m_object->m_data.m_value.object->end()));
+            }
+
+            SECTION("array")
+            {
+                json const j({1, 2, 3, 4});
+                json::const_iterator it = j.cbegin();
+                CHECK((it.m_it.array_iterator == it.m_object->m_data.m_value.array->begin()));
+                ++it;
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->begin()));
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->end()));
+                ++it;
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->begin()));
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->end()));
+                ++it;
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->begin()));
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->end()));
+                ++it;
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->begin()));
+                CHECK((it.m_it.array_iterator == it.m_object->m_data.m_value.array->end()));
+            }
+        }
+
+        SECTION("post-decrement")
+        {
+            SECTION("null")
+            {
+                json const j(json::value_t::null);
+                json::const_iterator const it = j.cend();
+                CHECK((it.m_it.primitive_iterator.m_it == 1));
+            }
+
+            SECTION("number")
+            {
+                json const j(17);
+                json::const_iterator it = j.cend();
+                CHECK((it.m_it.primitive_iterator.m_it == 1));
+                it--;
+                CHECK((it.m_it.primitive_iterator.m_it == 0));
+                it--;
+                CHECK((it.m_it.primitive_iterator.m_it != 0 && it.m_it.primitive_iterator.m_it != 1));
+            }
+
+            SECTION("object")
+            {
+                json const j({{"foo", "bar"}});
+                json::const_iterator it = j.cend();
+                CHECK((it.m_it.object_iterator == it.m_object->m_data.m_value.object->end()));
+                it--;
+                CHECK((it.m_it.object_iterator == it.m_object->m_data.m_value.object->begin()));
+            }
+
+            SECTION("array")
+            {
+                json const j({1, 2, 3, 4});
+                json::const_iterator it = j.cend();
+                CHECK((it.m_it.array_iterator == it.m_object->m_data.m_value.array->end()));
+                it--;
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->begin()));
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->end()));
+                it--;
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->begin()));
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->end()));
+                it--;
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->begin()));
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->end()));
+                it--;
+                CHECK((it.m_it.array_iterator == it.m_object->m_data.m_value.array->begin()));
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->end()));
+            }
+        }
+
+        SECTION("pre-decrement")
+        {
+            SECTION("null")
+            {
+                json const j(json::value_t::null);
+                json::const_iterator const it = j.cend();
+                CHECK((it.m_it.primitive_iterator.m_it == 1));
+            }
+
+            SECTION("number")
+            {
+                json const j(17);
+                json::const_iterator it = j.cend();
+                CHECK((it.m_it.primitive_iterator.m_it == 1));
+                --it;
+                CHECK((it.m_it.primitive_iterator.m_it == 0));
+                --it;
+                CHECK((it.m_it.primitive_iterator.m_it != 0 && it.m_it.primitive_iterator.m_it != 1));
+            }
+
+            SECTION("object")
+            {
+                json const j({{"foo", "bar"}});
+                json::const_iterator it = j.cend();
+                CHECK((it.m_it.object_iterator == it.m_object->m_data.m_value.object->end()));
+                --it;
+                CHECK((it.m_it.object_iterator == it.m_object->m_data.m_value.object->begin()));
+            }
+
+            SECTION("array")
+            {
+                json const j({1, 2, 3, 4});
+                json::const_iterator it = j.cend();
+                CHECK((it.m_it.array_iterator == it.m_object->m_data.m_value.array->end()));
+                --it;
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->begin()));
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->end()));
+                --it;
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->begin()));
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->end()));
+                --it;
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->begin()));
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->end()));
+                --it;
+                CHECK((it.m_it.array_iterator == it.m_object->m_data.m_value.array->begin()));
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->end()));
+            }
+        }
+    }
+}
diff --git a/external_imported/json/tests/src/unit-class_iterator.cpp b/external_imported/json/tests/src/unit-class_iterator.cpp
new file mode 100644
index 000000000..296ffa3ff
--- /dev/null
+++ b/external_imported/json/tests/src/unit-class_iterator.cpp
@@ -0,0 +1,468 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+#define JSON_TESTS_PRIVATE
+#include <nlohmann/json.hpp>
+using nlohmann::json;
+
+template<typename Iter>
+using can_post_increment_temporary = decltype((std::declval<Iter>()++)++);
+
+template<typename Iter>
+using can_post_decrement_temporary = decltype((std::declval<Iter>()--)--);
+
+TEST_CASE("iterator class")
+{
+    SECTION("construction")
+    {
+        SECTION("constructor")
+        {
+            SECTION("null")
+            {
+                json j(json::value_t::null);
+                json::iterator const it(&j);
+            }
+
+            SECTION("object")
+            {
+                json j(json::value_t::object);
+                json::iterator const it(&j);
+            }
+
+            SECTION("array")
+            {
+                json j(json::value_t::array);
+                json::iterator const it(&j);
+            }
+        }
+
+        SECTION("copy assignment")
+        {
+            json j(json::value_t::null);
+            json::iterator const it(&j);
+            json::iterator it2(&j);
+            it2 = it;
+        }
+    }
+
+    SECTION("initialization")
+    {
+        SECTION("set_begin")
+        {
+            SECTION("null")
+            {
+                json j(json::value_t::null);
+                json::iterator it(&j);
+                it.set_begin();
+                CHECK((it == j.begin()));
+            }
+
+            SECTION("object")
+            {
+                json j(json::value_t::object);
+                json::iterator it(&j);
+                it.set_begin();
+                CHECK((it == j.begin()));
+            }
+
+            SECTION("array")
+            {
+                json j(json::value_t::array);
+                json::iterator it(&j);
+                it.set_begin();
+                CHECK((it == j.begin()));
+            }
+        }
+
+        SECTION("set_end")
+        {
+            SECTION("null")
+            {
+                json j(json::value_t::null);
+                json::iterator it(&j);
+                it.set_end();
+                CHECK((it == j.end()));
+            }
+
+            SECTION("object")
+            {
+                json j(json::value_t::object);
+                json::iterator it(&j);
+                it.set_end();
+                CHECK((it == j.end()));
+            }
+
+            SECTION("array")
+            {
+                json j(json::value_t::array);
+                json::iterator it(&j);
+                it.set_end();
+                CHECK((it == j.end()));
+            }
+        }
+    }
+
+    SECTION("element access")
+    {
+        SECTION("operator*")
+        {
+            SECTION("null")
+            {
+                json j(json::value_t::null);
+                json::iterator const it = j.begin();
+                CHECK_THROWS_WITH_AS(*it, "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&);
+            }
+
+            SECTION("number")
+            {
+                json j(17);
+                json::iterator it = j.begin();
+                CHECK(*it == json(17));
+                it = j.end();
+                CHECK_THROWS_WITH_AS(*it, "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&);
+            }
+
+            SECTION("object")
+            {
+                json j({{"foo", "bar"}});
+                json::iterator const it = j.begin();
+                CHECK(*it == json("bar"));
+            }
+
+            SECTION("array")
+            {
+                json j({1, 2, 3, 4});
+                json::iterator const it = j.begin();
+                CHECK(*it == json(1));
+            }
+        }
+
+        SECTION("operator->")
+        {
+            SECTION("null")
+            {
+                json j(json::value_t::null);
+                json::iterator const it = j.begin();
+                CHECK_THROWS_WITH_AS(std::string(it->type_name()), "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&);
+            }
+
+            SECTION("number")
+            {
+                json j(17);
+                json::iterator it = j.begin();
+                CHECK(std::string(it->type_name()) == "number");
+                it = j.end();
+                CHECK_THROWS_WITH_AS(std::string(it->type_name()), "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&);
+            }
+
+            SECTION("object")
+            {
+                json j({{"foo", "bar"}});
+                json::iterator const it = j.begin();
+                CHECK(std::string(it->type_name()) == "string");
+            }
+
+            SECTION("array")
+            {
+                json j({1, 2, 3, 4});
+                json::iterator const it = j.begin();
+                CHECK(std::string(it->type_name()) == "number");
+            }
+        }
+    }
+
+    SECTION("increment/decrement")
+    {
+        SECTION("post-increment")
+        {
+            SECTION("null")
+            {
+                json j(json::value_t::null);
+                json::iterator it = j.begin();
+                CHECK((it.m_it.primitive_iterator.m_it == 1));
+                it++;
+                CHECK((it.m_it.primitive_iterator.m_it != 0 && it.m_it.primitive_iterator.m_it != 1));
+            }
+
+            SECTION("number")
+            {
+                json j(17);
+                json::iterator it = j.begin();
+                CHECK((it.m_it.primitive_iterator.m_it == 0));
+                it++;
+                CHECK((it.m_it.primitive_iterator.m_it == 1));
+                it++;
+                CHECK((it.m_it.primitive_iterator.m_it != 0 && it.m_it.primitive_iterator.m_it != 1));
+            }
+
+            SECTION("object")
+            {
+                json j({{"foo", "bar"}});
+                json::iterator it = j.begin();
+                CHECK((it.m_it.object_iterator == it.m_object->m_data.m_value.object->begin()));
+                it++;
+                CHECK((it.m_it.object_iterator == it.m_object->m_data.m_value.object->end()));
+            }
+
+            SECTION("array")
+            {
+                json j({1, 2, 3, 4});
+                json::iterator it = j.begin();
+                CHECK((it.m_it.array_iterator == it.m_object->m_data.m_value.array->begin()));
+                it++;
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->begin()));
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->end()));
+                it++;
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->begin()));
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->end()));
+                it++;
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->begin()));
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->end()));
+                it++;
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->begin()));
+                CHECK((it.m_it.array_iterator == it.m_object->m_data.m_value.array->end()));
+            }
+        }
+
+        SECTION("pre-increment")
+        {
+            SECTION("null")
+            {
+                json j(json::value_t::null);
+                json::iterator it = j.begin();
+                CHECK((it.m_it.primitive_iterator.m_it == 1));
+                ++it;
+                CHECK((it.m_it.primitive_iterator.m_it != 0 && it.m_it.primitive_iterator.m_it != 1));
+            }
+
+            SECTION("number")
+            {
+                json j(17);
+                json::iterator it = j.begin();
+                CHECK((it.m_it.primitive_iterator.m_it == 0));
+                ++it;
+                CHECK((it.m_it.primitive_iterator.m_it == 1));
+                ++it;
+                CHECK((it.m_it.primitive_iterator.m_it != 0 && it.m_it.primitive_iterator.m_it != 1));
+            }
+
+            SECTION("object")
+            {
+                json j({{"foo", "bar"}});
+                json::iterator it = j.begin();
+                CHECK((it.m_it.object_iterator == it.m_object->m_data.m_value.object->begin()));
+                ++it;
+                CHECK((it.m_it.object_iterator == it.m_object->m_data.m_value.object->end()));
+            }
+
+            SECTION("array")
+            {
+                json j({1, 2, 3, 4});
+                json::iterator it = j.begin();
+                CHECK((it.m_it.array_iterator == it.m_object->m_data.m_value.array->begin()));
+                ++it;
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->begin()));
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->end()));
+                ++it;
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->begin()));
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->end()));
+                ++it;
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->begin()));
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->end()));
+                ++it;
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->begin()));
+                CHECK((it.m_it.array_iterator == it.m_object->m_data.m_value.array->end()));
+            }
+        }
+
+        SECTION("post-decrement")
+        {
+            SECTION("null")
+            {
+                json j(json::value_t::null);
+                json::iterator const it = j.end();
+                CHECK((it.m_it.primitive_iterator.m_it == 1));
+            }
+
+            SECTION("number")
+            {
+                json j(17);
+                json::iterator it = j.end();
+                CHECK((it.m_it.primitive_iterator.m_it == 1));
+                it--;
+                CHECK((it.m_it.primitive_iterator.m_it == 0));
+                it--;
+                CHECK((it.m_it.primitive_iterator.m_it != 0 && it.m_it.primitive_iterator.m_it != 1));
+            }
+
+            SECTION("object")
+            {
+                json j({{"foo", "bar"}});
+                json::iterator it = j.end();
+                CHECK((it.m_it.object_iterator == it.m_object->m_data.m_value.object->end()));
+                it--;
+                CHECK((it.m_it.object_iterator == it.m_object->m_data.m_value.object->begin()));
+            }
+
+            SECTION("array")
+            {
+                json j({1, 2, 3, 4});
+                json::iterator it = j.end();
+                CHECK((it.m_it.array_iterator == it.m_object->m_data.m_value.array->end()));
+                it--;
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->begin()));
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->end()));
+                it--;
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->begin()));
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->end()));
+                it--;
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->begin()));
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->end()));
+                it--;
+                CHECK((it.m_it.array_iterator == it.m_object->m_data.m_value.array->begin()));
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->end()));
+            }
+        }
+
+        SECTION("pre-decrement")
+        {
+            SECTION("null")
+            {
+                json j(json::value_t::null);
+                json::iterator const it = j.end();
+                CHECK((it.m_it.primitive_iterator.m_it == 1));
+            }
+
+            SECTION("number")
+            {
+                json j(17);
+                json::iterator it = j.end();
+                CHECK((it.m_it.primitive_iterator.m_it == 1));
+                --it;
+                CHECK((it.m_it.primitive_iterator.m_it == 0));
+                --it;
+                CHECK((it.m_it.primitive_iterator.m_it != 0 && it.m_it.primitive_iterator.m_it != 1));
+            }
+
+            SECTION("object")
+            {
+                json j({{"foo", "bar"}});
+                json::iterator it = j.end();
+                CHECK((it.m_it.object_iterator == it.m_object->m_data.m_value.object->end()));
+                --it;
+                CHECK((it.m_it.object_iterator == it.m_object->m_data.m_value.object->begin()));
+            }
+
+            SECTION("array")
+            {
+                json j({1, 2, 3, 4});
+                json::iterator it = j.end();
+                CHECK((it.m_it.array_iterator == it.m_object->m_data.m_value.array->end()));
+                --it;
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->begin()));
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->end()));
+                --it;
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->begin()));
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->end()));
+                --it;
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->begin()));
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->end()));
+                --it;
+                CHECK((it.m_it.array_iterator == it.m_object->m_data.m_value.array->begin()));
+                CHECK((it.m_it.array_iterator != it.m_object->m_data.m_value.array->end()));
+            }
+        }
+    }
+    SECTION("equality-preserving")
+    {
+        SECTION("post-increment")
+        {
+            SECTION("primitive_iterator_t")
+            {
+                using Iter = nlohmann::detail::primitive_iterator_t;
+                CHECK(std::is_same < decltype(std::declval<Iter&>()++), Iter >::value);
+            }
+            SECTION("iter_impl")
+            {
+                using Iter = nlohmann::detail::iter_impl<json>;
+                CHECK(std::is_same < decltype(std::declval<Iter&>()++), Iter >::value);
+            }
+            SECTION("json_reverse_iterator")
+            {
+                using Base = nlohmann::detail::iter_impl<json>;
+                using Iter = nlohmann::detail::json_reverse_iterator<Base>;
+                CHECK(std::is_same < decltype(std::declval<Iter&>()++), Iter >::value);
+            }
+        }
+        SECTION("post-decrement")
+        {
+            SECTION("primitive_iterator_t")
+            {
+                using Iter = nlohmann::detail::primitive_iterator_t;
+                CHECK(std::is_same < decltype(std::declval<Iter&>()--), Iter >::value);
+            }
+            SECTION("iter_impl")
+            {
+                using Iter = nlohmann::detail::iter_impl<json>;
+                CHECK(std::is_same < decltype(std::declval<Iter&>()--), Iter >::value );
+            }
+            SECTION("json_reverse_iterator")
+            {
+                using Base = nlohmann::detail::iter_impl<json>;
+                using Iter = nlohmann::detail::json_reverse_iterator<Base>;
+                CHECK(std::is_same < decltype(std::declval<Iter&>()--), Iter >::value );
+            }
+        }
+    }
+    // prevent "accidental mutation of a temporary object"
+    SECTION("cert-dcl21-cpp")
+    {
+        using nlohmann::detail::is_detected;
+        SECTION("post-increment")
+        {
+            SECTION("primitive_iterator_t")
+            {
+                using Iter = nlohmann::detail::primitive_iterator_t;
+                CHECK_FALSE(is_detected<can_post_increment_temporary, Iter&>::value);
+            }
+            SECTION("iter_impl")
+            {
+                using Iter = nlohmann::detail::iter_impl<json>;
+                CHECK_FALSE(is_detected<can_post_increment_temporary, Iter&>::value);
+            }
+            SECTION("json_reverse_iterator")
+            {
+                using Base = nlohmann::detail::iter_impl<json>;
+                using Iter = nlohmann::detail::json_reverse_iterator<Base>;
+                CHECK_FALSE(is_detected<can_post_increment_temporary, Iter&>::value);
+            }
+        }
+        SECTION("post-decrement")
+        {
+            SECTION("primitive_iterator_t")
+            {
+                using Iter = nlohmann::detail::primitive_iterator_t;
+                CHECK_FALSE(is_detected<can_post_decrement_temporary, Iter&>::value);
+            }
+            SECTION("iter_impl")
+            {
+                using Iter = nlohmann::detail::iter_impl<json>;
+                CHECK_FALSE(is_detected<can_post_decrement_temporary, Iter&>::value);
+            }
+            SECTION("json_reverse_iterator")
+            {
+                using Base = nlohmann::detail::iter_impl<json>;
+                using Iter = nlohmann::detail::json_reverse_iterator<Base>;
+                CHECK_FALSE(is_detected<can_post_decrement_temporary, Iter&>::value);
+            }
+
+        }
+    }
+}
diff --git a/external_imported/json/test/src/unit-class_lexer.cpp b/external_imported/json/tests/src/unit-class_lexer.cpp
similarity index 86%
rename from external_imported/json/test/src/unit-class_lexer.cpp
rename to external_imported/json/tests/src/unit-class_lexer.cpp
index 07d243a81..ac0292531 100644
--- a/external_imported/json/test/src/unit-class_lexer.cpp
+++ b/external_imported/json/tests/src/unit-class_lexer.cpp
@@ -1,31 +1,10 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
 
 #include "doctest_compatibility.h"
 
@@ -36,19 +15,19 @@ using nlohmann::json;
 namespace
 {
 // shortcut to scan a string literal
-json::lexer::token_type scan_string(const char* s, const bool ignore_comments = false);
+json::lexer::token_type scan_string(const char* s, bool ignore_comments = false);
 json::lexer::token_type scan_string(const char* s, const bool ignore_comments)
 {
     auto ia = nlohmann::detail::input_adapter(s);
-    return nlohmann::detail::lexer<json, decltype(ia)>(std::move(ia), ignore_comments).scan();
-}
+    return nlohmann::detail::lexer<json, decltype(ia)>(std::move(ia), ignore_comments).scan(); // NOLINT(hicpp-move-const-arg,performance-move-const-arg)
 }
+} // namespace
 
-std::string get_error_message(const char* s, const bool ignore_comments = false);
+std::string get_error_message(const char* s, bool ignore_comments = false);
 std::string get_error_message(const char* s, const bool ignore_comments)
 {
     auto ia = nlohmann::detail::input_adapter(s);
-    auto lexer = nlohmann::detail::lexer<json, decltype(ia)>(std::move(ia), ignore_comments);
+    auto lexer = nlohmann::detail::lexer<json, decltype(ia)>(std::move(ia), ignore_comments); // NOLINT(hicpp-move-const-arg,performance-move-const-arg)
     lexer.scan();
     return lexer.get_error_message();
 }
diff --git a/external_imported/json/tests/src/unit-class_parser.cpp b/external_imported/json/tests/src/unit-class_parser.cpp
new file mode 100644
index 000000000..f766842aa
--- /dev/null
+++ b/external_imported/json/tests/src/unit-class_parser.cpp
@@ -0,0 +1,1691 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+#define JSON_TESTS_PRIVATE
+#include <nlohmann/json.hpp>
+using nlohmann::json;
+#ifdef JSON_TEST_NO_GLOBAL_UDLS
+    using namespace nlohmann::literals; // NOLINT(google-build-using-namespace)
+#endif
+
+#include <valarray>
+
+namespace
+{
+class SaxEventLogger
+{
+  public:
+    bool null()
+    {
+        events.emplace_back("null()");
+        return true;
+    }
+
+    bool boolean(bool val)
+    {
+        events.emplace_back(val ? "boolean(true)" : "boolean(false)");
+        return true;
+    }
+
+    bool number_integer(json::number_integer_t val)
+    {
+        events.push_back("number_integer(" + std::to_string(val) + ")");
+        return true;
+    }
+
+    bool number_unsigned(json::number_unsigned_t val)
+    {
+        events.push_back("number_unsigned(" + std::to_string(val) + ")");
+        return true;
+    }
+
+    bool number_float(json::number_float_t /*unused*/, const std::string& s)
+    {
+        events.push_back("number_float(" + s + ")");
+        return true;
+    }
+
+    bool string(std::string& val)
+    {
+        events.push_back("string(" + val + ")");
+        return true;
+    }
+
+    bool binary(json::binary_t& val)
+    {
+        std::string binary_contents = "binary(";
+        std::string comma_space;
+        for (auto b : val)
+        {
+            binary_contents.append(comma_space);
+            binary_contents.append(std::to_string(static_cast<int>(b)));
+            comma_space = ", ";
+        }
+        binary_contents.append(")");
+        events.push_back(binary_contents);
+        return true;
+    }
+
+    bool start_object(std::size_t elements)
+    {
+        if (elements == static_cast<std::size_t>(-1))
+        {
+            events.emplace_back("start_object()");
+        }
+        else
+        {
+            events.push_back("start_object(" + std::to_string(elements) + ")");
+        }
+        return true;
+    }
+
+    bool key(std::string& val)
+    {
+        events.push_back("key(" + val + ")");
+        return true;
+    }
+
+    bool end_object()
+    {
+        events.emplace_back("end_object()");
+        return true;
+    }
+
+    bool start_array(std::size_t elements)
+    {
+        if (elements == static_cast<std::size_t>(-1))
+        {
+            events.emplace_back("start_array()");
+        }
+        else
+        {
+            events.push_back("start_array(" + std::to_string(elements) + ")");
+        }
+        return true;
+    }
+
+    bool end_array()
+    {
+        events.emplace_back("end_array()");
+        return true;
+    }
+
+    bool parse_error(std::size_t position, const std::string& /*unused*/, const json::exception& /*unused*/)
+    {
+        errored = true;
+        events.push_back("parse_error(" + std::to_string(position) + ")");
+        return false;
+    }
+
+    std::vector<std::string> events {};
+    bool errored = false;
+};
+
+class SaxCountdown : public nlohmann::json::json_sax_t
+{
+  public:
+    explicit SaxCountdown(const int count) : events_left(count)
+    {}
+
+    bool null() override
+    {
+        return events_left-- > 0;
+    }
+
+    bool boolean(bool /*val*/) override
+    {
+        return events_left-- > 0;
+    }
+
+    bool number_integer(json::number_integer_t /*val*/) override
+    {
+        return events_left-- > 0;
+    }
+
+    bool number_unsigned(json::number_unsigned_t /*val*/) override
+    {
+        return events_left-- > 0;
+    }
+
+    bool number_float(json::number_float_t /*val*/, const std::string& /*s*/) override
+    {
+        return events_left-- > 0;
+    }
+
+    bool string(std::string& /*val*/) override
+    {
+        return events_left-- > 0;
+    }
+
+    bool binary(json::binary_t& /*val*/) override
+    {
+        return events_left-- > 0;
+    }
+
+    bool start_object(std::size_t /*elements*/) override
+    {
+        return events_left-- > 0;
+    }
+
+    bool key(std::string& /*val*/) override
+    {
+        return events_left-- > 0;
+    }
+
+    bool end_object() override
+    {
+        return events_left-- > 0;
+    }
+
+    bool start_array(std::size_t /*elements*/) override
+    {
+        return events_left-- > 0;
+    }
+
+    bool end_array() override
+    {
+        return events_left-- > 0;
+    }
+
+    bool parse_error(std::size_t /*position*/, const std::string& /*last_token*/, const json::exception& /*ex*/) override
+    {
+        return false;
+    }
+
+  private:
+    int events_left = 0;
+};
+
+json parser_helper(const std::string& s);
+bool accept_helper(const std::string& s);
+void comments_helper(const std::string& s);
+
+json parser_helper(const std::string& s)
+{
+    json j;
+    json::parser(nlohmann::detail::input_adapter(s)).parse(true, j);
+
+    // if this line was reached, no exception occurred
+    // -> check if result is the same without exceptions
+    json j_nothrow;
+    CHECK_NOTHROW(json::parser(nlohmann::detail::input_adapter(s), nullptr, false).parse(true, j_nothrow));
+    CHECK(j_nothrow == j);
+
+    json j_sax;
+    nlohmann::detail::json_sax_dom_parser<json> sdp(j_sax);
+    json::sax_parse(s, &sdp);
+    CHECK(j_sax == j);
+
+    comments_helper(s);
+
+    return j;
+}
+
+bool accept_helper(const std::string& s)
+{
+    CAPTURE(s)
+
+    // 1. parse s without exceptions
+    json j;
+    CHECK_NOTHROW(json::parser(nlohmann::detail::input_adapter(s), nullptr, false).parse(true, j));
+    const bool ok_noexcept = !j.is_discarded();
+
+    // 2. accept s
+    const bool ok_accept = json::parser(nlohmann::detail::input_adapter(s)).accept(true);
+
+    // 3. check if both approaches come to the same result
+    CHECK(ok_noexcept == ok_accept);
+
+    // 4. parse with SAX (compare with relaxed accept result)
+    SaxEventLogger el;
+    CHECK_NOTHROW(json::sax_parse(s, &el, json::input_format_t::json, false));
+    CHECK(json::parser(nlohmann::detail::input_adapter(s)).accept(false) == !el.errored);
+
+    // 5. parse with simple callback
+    json::parser_callback_t const cb = [](int /*unused*/, json::parse_event_t /*unused*/, json& /*unused*/) noexcept
+    {
+        return true;
+    };
+    json const j_cb = json::parse(s, cb, false);
+    const bool ok_noexcept_cb = !j_cb.is_discarded();
+
+    // 6. check if this approach came to the same result
+    CHECK(ok_noexcept == ok_noexcept_cb);
+
+    // 7. check if comments are properly ignored
+    if (ok_accept)
+    {
+        comments_helper(s);
+    }
+
+    // 8. return result
+    return ok_accept;
+}
+
+void comments_helper(const std::string& s)
+{
+    json _;
+
+    // parse/accept with default parser
+    CHECK_NOTHROW(_ = json::parse(s));
+    CHECK(json::accept(s));
+
+    // parse/accept while skipping comments
+    CHECK_NOTHROW(_ = json::parse(s, nullptr, false, true));
+    CHECK(json::accept(s, true));
+
+    std::vector<std::string> json_with_comments;
+
+    // start with a comment
+    json_with_comments.push_back(std::string("// this is a comment\n") + s);
+    json_with_comments.push_back(std::string("/* this is a comment */") + s);
+    // end with a comment
+    json_with_comments.push_back(s + "// this is a comment");
+    json_with_comments.push_back(s + "/* this is a comment */");
+
+    // check all strings
+    for (const auto& json_with_comment : json_with_comments)
+    {
+        CAPTURE(json_with_comment)
+        CHECK_THROWS_AS(_ = json::parse(json_with_comment), json::parse_error);
+        CHECK(!json::accept(json_with_comment));
+
+        CHECK_NOTHROW(_ = json::parse(json_with_comment, nullptr, true, true));
+        CHECK(json::accept(json_with_comment, true));
+    }
+}
+
+} // namespace
+
+TEST_CASE("parser class")
+{
+    SECTION("parse")
+    {
+        SECTION("null")
+        {
+            CHECK(parser_helper("null") == json(nullptr));
+        }
+
+        SECTION("true")
+        {
+            CHECK(parser_helper("true") == json(true));
+        }
+
+        SECTION("false")
+        {
+            CHECK(parser_helper("false") == json(false));
+        }
+
+        SECTION("array")
+        {
+            SECTION("empty array")
+            {
+                CHECK(parser_helper("[]") == json(json::value_t::array));
+                CHECK(parser_helper("[ ]") == json(json::value_t::array));
+            }
+
+            SECTION("nonempty array")
+            {
+                CHECK(parser_helper("[true, false, null]") == json({true, false, nullptr}));
+            }
+        }
+
+        SECTION("object")
+        {
+            SECTION("empty object")
+            {
+                CHECK(parser_helper("{}") == json(json::value_t::object));
+                CHECK(parser_helper("{ }") == json(json::value_t::object));
+            }
+
+            SECTION("nonempty object")
+            {
+                CHECK(parser_helper("{\"\": true, \"one\": 1, \"two\": null}") == json({{"", true}, {"one", 1}, {"two", nullptr}}));
+            }
+        }
+
+        SECTION("string")
+        {
+            // empty string
+            CHECK(parser_helper("\"\"") == json(json::value_t::string));
+
+            SECTION("errors")
+            {
+                // error: tab in string
+                CHECK_THROWS_WITH_AS(parser_helper("\"\t\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0009 (HT) must be escaped to \\u0009 or \\t; last read: '\"<U+0009>'", json::parse_error&);
+                // error: newline in string
+                CHECK_THROWS_WITH_AS(parser_helper("\"\n\""), "[json.exception.parse_error.101] parse error at line 2, column 0: syntax error while parsing value - invalid string: control character U+000A (LF) must be escaped to \\u000A or \\n; last read: '\"<U+000A>'", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("\"\r\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+000D (CR) must be escaped to \\u000D or \\r; last read: '\"<U+000D>'", json::parse_error&);
+                // error: backspace in string
+                CHECK_THROWS_WITH_AS(parser_helper("\"\b\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0008 (BS) must be escaped to \\u0008 or \\b; last read: '\"<U+0008>'", json::parse_error&);
+                // improve code coverage
+                CHECK_THROWS_AS(parser_helper("\uFF01"), json::parse_error&);
+                CHECK_THROWS_AS(parser_helper("[-4:1,]"), json::parse_error&);
+                // unescaped control characters
+                CHECK_THROWS_WITH_AS(parser_helper("\"\x00\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: missing closing quote; last read: '\"'", json::parse_error&); // NOLINT(bugprone-string-literal-with-embedded-nul)
+                CHECK_THROWS_WITH_AS(parser_helper("\"\x01\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0001 (SOH) must be escaped to \\u0001; last read: '\"<U+0001>'", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("\"\x02\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0002 (STX) must be escaped to \\u0002; last read: '\"<U+0002>'", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("\"\x03\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0003 (ETX) must be escaped to \\u0003; last read: '\"<U+0003>'", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("\"\x04\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0004 (EOT) must be escaped to \\u0004; last read: '\"<U+0004>'", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("\"\x05\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0005 (ENQ) must be escaped to \\u0005; last read: '\"<U+0005>'", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("\"\x06\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0006 (ACK) must be escaped to \\u0006; last read: '\"<U+0006>'", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("\"\x07\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0007 (BEL) must be escaped to \\u0007; last read: '\"<U+0007>'", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("\"\x08\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0008 (BS) must be escaped to \\u0008 or \\b; last read: '\"<U+0008>'", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("\"\x09\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0009 (HT) must be escaped to \\u0009 or \\t; last read: '\"<U+0009>'", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("\"\x0a\""), "[json.exception.parse_error.101] parse error at line 2, column 0: syntax error while parsing value - invalid string: control character U+000A (LF) must be escaped to \\u000A or \\n; last read: '\"<U+000A>'", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("\"\x0b\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+000B (VT) must be escaped to \\u000B; last read: '\"<U+000B>'", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("\"\x0c\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+000C (FF) must be escaped to \\u000C or \\f; last read: '\"<U+000C>'", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("\"\x0d\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+000D (CR) must be escaped to \\u000D or \\r; last read: '\"<U+000D>'", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("\"\x0e\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+000E (SO) must be escaped to \\u000E; last read: '\"<U+000E>'", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("\"\x0f\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+000F (SI) must be escaped to \\u000F; last read: '\"<U+000F>'", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("\"\x10\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0010 (DLE) must be escaped to \\u0010; last read: '\"<U+0010>'", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("\"\x11\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0011 (DC1) must be escaped to \\u0011; last read: '\"<U+0011>'", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("\"\x12\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0012 (DC2) must be escaped to \\u0012; last read: '\"<U+0012>'", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("\"\x13\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0013 (DC3) must be escaped to \\u0013; last read: '\"<U+0013>'", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("\"\x14\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0014 (DC4) must be escaped to \\u0014; last read: '\"<U+0014>'", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("\"\x15\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0015 (NAK) must be escaped to \\u0015; last read: '\"<U+0015>'", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("\"\x16\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0016 (SYN) must be escaped to \\u0016; last read: '\"<U+0016>'", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("\"\x17\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0017 (ETB) must be escaped to \\u0017; last read: '\"<U+0017>'", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("\"\x18\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0018 (CAN) must be escaped to \\u0018; last read: '\"<U+0018>'", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("\"\x19\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0019 (EM) must be escaped to \\u0019; last read: '\"<U+0019>'", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("\"\x1a\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+001A (SUB) must be escaped to \\u001A; last read: '\"<U+001A>'", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("\"\x1b\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+001B (ESC) must be escaped to \\u001B; last read: '\"<U+001B>'", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("\"\x1c\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+001C (FS) must be escaped to \\u001C; last read: '\"<U+001C>'", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("\"\x1d\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+001D (GS) must be escaped to \\u001D; last read: '\"<U+001D>'", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("\"\x1e\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+001E (RS) must be escaped to \\u001E; last read: '\"<U+001E>'", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("\"\x1f\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+001F (US) must be escaped to \\u001F; last read: '\"<U+001F>'", json::parse_error&);
+
+                SECTION("additional test for null byte")
+                {
+                    // The test above for the null byte is wrong, because passing
+                    // a string to the parser only reads int until it encounters
+                    // a null byte. This test inserts the null byte later on and
+                    // uses an iterator range.
+                    std::string s = "\"1\"";
+                    s[1] = '\0';
+                    json _;
+                    CHECK_THROWS_WITH_AS(_ = json::parse(s.begin(), s.end()), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0000 (NUL) must be escaped to \\u0000; last read: '\"<U+0000>'", json::parse_error&);
+                }
+            }
+
+            SECTION("escaped")
+            {
+                // quotation mark "\""
+                auto r1 = R"("\"")"_json;
+                CHECK(parser_helper("\"\\\"\"") == r1);
+                // reverse solidus "\\"
+                auto r2 = R"("\\")"_json;
+                CHECK(parser_helper("\"\\\\\"") == r2);
+                // solidus
+                CHECK(parser_helper("\"\\/\"") == R"("/")"_json);
+                // backspace
+                CHECK(parser_helper("\"\\b\"") == json("\b"));
+                // formfeed
+                CHECK(parser_helper("\"\\f\"") == json("\f"));
+                // newline
+                CHECK(parser_helper("\"\\n\"") == json("\n"));
+                // carriage return
+                CHECK(parser_helper("\"\\r\"") == json("\r"));
+                // horizontal tab
+                CHECK(parser_helper("\"\\t\"") == json("\t"));
+
+                CHECK(parser_helper("\"\\u0001\"").get<json::string_t>() == "\x01");
+                CHECK(parser_helper("\"\\u000a\"").get<json::string_t>() == "\n");
+                CHECK(parser_helper("\"\\u00b0\"").get<json::string_t>() == "°");
+                CHECK(parser_helper("\"\\u0c00\"").get<json::string_t>() == "à°€");
+                CHECK(parser_helper("\"\\ud000\"").get<json::string_t>() == "퀀");
+                CHECK(parser_helper("\"\\u000E\"").get<json::string_t>() == "\x0E");
+                CHECK(parser_helper("\"\\u00F0\"").get<json::string_t>() == "ð");
+                CHECK(parser_helper("\"\\u0100\"").get<json::string_t>() == "Ä€");
+                CHECK(parser_helper("\"\\u2000\"").get<json::string_t>() == " ");
+                CHECK(parser_helper("\"\\uFFFF\"").get<json::string_t>() == "ï¿¿");
+                CHECK(parser_helper("\"\\u20AC\"").get<json::string_t>() == "€");
+                CHECK(parser_helper("\"€\"").get<json::string_t>() == "€");
+                CHECK(parser_helper("\"🎈\"").get<json::string_t>() == "🎈");
+
+                CHECK(parser_helper("\"\\ud80c\\udc60\"").get<json::string_t>() == "\xf0\x93\x81\xa0");
+                CHECK(parser_helper("\"\\ud83c\\udf1e\"").get<json::string_t>() == "🌞");
+            }
+        }
+
+        SECTION("number")
+        {
+            SECTION("integers")
+            {
+                SECTION("without exponent")
+                {
+                    CHECK(parser_helper("-128") == json(-128));
+                    CHECK(parser_helper("-0") == json(-0));
+                    CHECK(parser_helper("0") == json(0));
+                    CHECK(parser_helper("128") == json(128));
+                }
+
+                SECTION("with exponent")
+                {
+                    CHECK(parser_helper("0e1") == json(0e1));
+                    CHECK(parser_helper("0E1") == json(0e1));
+
+                    CHECK(parser_helper("10000E-4") == json(10000e-4));
+                    CHECK(parser_helper("10000E-3") == json(10000e-3));
+                    CHECK(parser_helper("10000E-2") == json(10000e-2));
+                    CHECK(parser_helper("10000E-1") == json(10000e-1));
+                    CHECK(parser_helper("10000E0") == json(10000e0));
+                    CHECK(parser_helper("10000E1") == json(10000e1));
+                    CHECK(parser_helper("10000E2") == json(10000e2));
+                    CHECK(parser_helper("10000E3") == json(10000e3));
+                    CHECK(parser_helper("10000E4") == json(10000e4));
+
+                    CHECK(parser_helper("10000e-4") == json(10000e-4));
+                    CHECK(parser_helper("10000e-3") == json(10000e-3));
+                    CHECK(parser_helper("10000e-2") == json(10000e-2));
+                    CHECK(parser_helper("10000e-1") == json(10000e-1));
+                    CHECK(parser_helper("10000e0") == json(10000e0));
+                    CHECK(parser_helper("10000e1") == json(10000e1));
+                    CHECK(parser_helper("10000e2") == json(10000e2));
+                    CHECK(parser_helper("10000e3") == json(10000e3));
+                    CHECK(parser_helper("10000e4") == json(10000e4));
+
+                    CHECK(parser_helper("-0e1") == json(-0e1));
+                    CHECK(parser_helper("-0E1") == json(-0e1));
+                    CHECK(parser_helper("-0E123") == json(-0e123));
+
+                    // numbers after exponent
+                    CHECK(parser_helper("10E0") == json(10e0));
+                    CHECK(parser_helper("10E1") == json(10e1));
+                    CHECK(parser_helper("10E2") == json(10e2));
+                    CHECK(parser_helper("10E3") == json(10e3));
+                    CHECK(parser_helper("10E4") == json(10e4));
+                    CHECK(parser_helper("10E5") == json(10e5));
+                    CHECK(parser_helper("10E6") == json(10e6));
+                    CHECK(parser_helper("10E7") == json(10e7));
+                    CHECK(parser_helper("10E8") == json(10e8));
+                    CHECK(parser_helper("10E9") == json(10e9));
+                    CHECK(parser_helper("10E+0") == json(10e0));
+                    CHECK(parser_helper("10E+1") == json(10e1));
+                    CHECK(parser_helper("10E+2") == json(10e2));
+                    CHECK(parser_helper("10E+3") == json(10e3));
+                    CHECK(parser_helper("10E+4") == json(10e4));
+                    CHECK(parser_helper("10E+5") == json(10e5));
+                    CHECK(parser_helper("10E+6") == json(10e6));
+                    CHECK(parser_helper("10E+7") == json(10e7));
+                    CHECK(parser_helper("10E+8") == json(10e8));
+                    CHECK(parser_helper("10E+9") == json(10e9));
+                    CHECK(parser_helper("10E-1") == json(10e-1));
+                    CHECK(parser_helper("10E-2") == json(10e-2));
+                    CHECK(parser_helper("10E-3") == json(10e-3));
+                    CHECK(parser_helper("10E-4") == json(10e-4));
+                    CHECK(parser_helper("10E-5") == json(10e-5));
+                    CHECK(parser_helper("10E-6") == json(10e-6));
+                    CHECK(parser_helper("10E-7") == json(10e-7));
+                    CHECK(parser_helper("10E-8") == json(10e-8));
+                    CHECK(parser_helper("10E-9") == json(10e-9));
+                }
+
+                SECTION("edge cases")
+                {
+                    // From RFC8259, Section 6:
+                    // Note that when such software is used, numbers that are
+                    // integers and are in the range [-(2**53)+1, (2**53)-1]
+                    // are interoperable in the sense that implementations will
+                    // agree exactly on their numeric values.
+
+                    // -(2**53)+1
+                    CHECK(parser_helper("-9007199254740991").get<int64_t>() == -9007199254740991);
+                    // (2**53)-1
+                    CHECK(parser_helper("9007199254740991").get<int64_t>() == 9007199254740991);
+                }
+
+                SECTION("over the edge cases")  // issue #178 - Integer conversion to unsigned (incorrect handling of 64-bit integers)
+                {
+                    // While RFC8259, Section 6 specifies a preference for support
+                    // for ranges in range of IEEE 754-2008 binary64 (double precision)
+                    // this does not accommodate 64-bit integers without loss of accuracy.
+                    // As 64-bit integers are now widely used in software, it is desirable
+                    // to expand support to the full 64 bit (signed and unsigned) range
+                    // i.e. -(2**63) -> (2**64)-1.
+
+                    // -(2**63)    ** Note: compilers see negative literals as negated positive numbers (hence the -1))
+                    CHECK(parser_helper("-9223372036854775808").get<int64_t>() == -9223372036854775807 - 1);
+                    // (2**63)-1
+                    CHECK(parser_helper("9223372036854775807").get<int64_t>() == 9223372036854775807);
+                    // (2**64)-1
+                    CHECK(parser_helper("18446744073709551615").get<uint64_t>() == 18446744073709551615u);
+                }
+            }
+
+            SECTION("floating-point")
+            {
+                SECTION("without exponent")
+                {
+                    CHECK(parser_helper("-128.5") == json(-128.5));
+                    CHECK(parser_helper("0.999") == json(0.999));
+                    CHECK(parser_helper("128.5") == json(128.5));
+                    CHECK(parser_helper("-0.0") == json(-0.0));
+                }
+
+                SECTION("with exponent")
+                {
+                    CHECK(parser_helper("-128.5E3") == json(-128.5E3));
+                    CHECK(parser_helper("-128.5E-3") == json(-128.5E-3));
+                    CHECK(parser_helper("-0.0e1") == json(-0.0e1));
+                    CHECK(parser_helper("-0.0E1") == json(-0.0e1));
+                }
+            }
+
+            SECTION("overflow")
+            {
+                // overflows during parsing yield an exception
+                CHECK_THROWS_WITH_AS(parser_helper("1.18973e+4932").empty(), "[json.exception.out_of_range.406] number overflow parsing '1.18973e+4932'", json::out_of_range&);
+            }
+
+            SECTION("invalid numbers")
+            {
+                // numbers must not begin with "+"
+                CHECK_THROWS_AS(parser_helper("+1"), json::parse_error&);
+                CHECK_THROWS_AS(parser_helper("+0"), json::parse_error&);
+
+                CHECK_THROWS_WITH_AS(parser_helper("01"),
+                                     "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - unexpected number literal; expected end of input", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("-01"),
+                                     "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - unexpected number literal; expected end of input", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("--1"),
+                                     "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid number; expected digit after '-'; last read: '--'", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("1."),
+                                     "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid number; expected digit after '.'; last read: '1.'", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("1E"),
+                                     "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid number; expected '+', '-', or digit after exponent; last read: '1E'", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("1E-"),
+                                     "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid number; expected digit after exponent sign; last read: '1E-'", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("1.E1"),
+                                     "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid number; expected digit after '.'; last read: '1.E'", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("-1E"),
+                                     "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid number; expected '+', '-', or digit after exponent; last read: '-1E'", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("-0E#"),
+                                     "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid number; expected '+', '-', or digit after exponent; last read: '-0E#'", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("-0E-#"),
+                                     "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error while parsing value - invalid number; expected digit after exponent sign; last read: '-0E-#'", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("-0#"),
+                                     "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid literal; last read: '-0#'; expected end of input", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("-0.0:"),
+                                     "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error while parsing value - unexpected ':'; expected end of input", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("-0.0Z"),
+                                     "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error while parsing value - invalid literal; last read: '-0.0Z'; expected end of input", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("-0E123:"),
+                                     "[json.exception.parse_error.101] parse error at line 1, column 7: syntax error while parsing value - unexpected ':'; expected end of input", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("-0e0-:"),
+                                     "[json.exception.parse_error.101] parse error at line 1, column 6: syntax error while parsing value - invalid number; expected digit after '-'; last read: '-:'; expected end of input", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("-0e-:"),
+                                     "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error while parsing value - invalid number; expected digit after exponent sign; last read: '-0e-:'", json::parse_error&);
+                CHECK_THROWS_WITH_AS(parser_helper("-0f"),
+                                     "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid literal; last read: '-0f'; expected end of input", json::parse_error&);
+            }
+        }
+    }
+
+    SECTION("accept")
+    {
+        SECTION("null")
+        {
+            CHECK(accept_helper("null"));
+        }
+
+        SECTION("true")
+        {
+            CHECK(accept_helper("true"));
+        }
+
+        SECTION("false")
+        {
+            CHECK(accept_helper("false"));
+        }
+
+        SECTION("array")
+        {
+            SECTION("empty array")
+            {
+                CHECK(accept_helper("[]"));
+                CHECK(accept_helper("[ ]"));
+            }
+
+            SECTION("nonempty array")
+            {
+                CHECK(accept_helper("[true, false, null]"));
+            }
+        }
+
+        SECTION("object")
+        {
+            SECTION("empty object")
+            {
+                CHECK(accept_helper("{}"));
+                CHECK(accept_helper("{ }"));
+            }
+
+            SECTION("nonempty object")
+            {
+                CHECK(accept_helper("{\"\": true, \"one\": 1, \"two\": null}"));
+            }
+        }
+
+        SECTION("string")
+        {
+            // empty string
+            CHECK(accept_helper("\"\""));
+
+            SECTION("errors")
+            {
+                // error: tab in string
+                CHECK(accept_helper("\"\t\"") == false);
+                // error: newline in string
+                CHECK(accept_helper("\"\n\"") == false);
+                CHECK(accept_helper("\"\r\"") == false);
+                // error: backspace in string
+                CHECK(accept_helper("\"\b\"") == false);
+                // improve code coverage
+                CHECK(accept_helper("\uFF01") == false);
+                CHECK(accept_helper("[-4:1,]") == false);
+                // unescaped control characters
+                CHECK(accept_helper("\"\x00\"") == false); // NOLINT(bugprone-string-literal-with-embedded-nul)
+                CHECK(accept_helper("\"\x01\"") == false);
+                CHECK(accept_helper("\"\x02\"") == false);
+                CHECK(accept_helper("\"\x03\"") == false);
+                CHECK(accept_helper("\"\x04\"") == false);
+                CHECK(accept_helper("\"\x05\"") == false);
+                CHECK(accept_helper("\"\x06\"") == false);
+                CHECK(accept_helper("\"\x07\"") == false);
+                CHECK(accept_helper("\"\x08\"") == false);
+                CHECK(accept_helper("\"\x09\"") == false);
+                CHECK(accept_helper("\"\x0a\"") == false);
+                CHECK(accept_helper("\"\x0b\"") == false);
+                CHECK(accept_helper("\"\x0c\"") == false);
+                CHECK(accept_helper("\"\x0d\"") == false);
+                CHECK(accept_helper("\"\x0e\"") == false);
+                CHECK(accept_helper("\"\x0f\"") == false);
+                CHECK(accept_helper("\"\x10\"") == false);
+                CHECK(accept_helper("\"\x11\"") == false);
+                CHECK(accept_helper("\"\x12\"") == false);
+                CHECK(accept_helper("\"\x13\"") == false);
+                CHECK(accept_helper("\"\x14\"") == false);
+                CHECK(accept_helper("\"\x15\"") == false);
+                CHECK(accept_helper("\"\x16\"") == false);
+                CHECK(accept_helper("\"\x17\"") == false);
+                CHECK(accept_helper("\"\x18\"") == false);
+                CHECK(accept_helper("\"\x19\"") == false);
+                CHECK(accept_helper("\"\x1a\"") == false);
+                CHECK(accept_helper("\"\x1b\"") == false);
+                CHECK(accept_helper("\"\x1c\"") == false);
+                CHECK(accept_helper("\"\x1d\"") == false);
+                CHECK(accept_helper("\"\x1e\"") == false);
+                CHECK(accept_helper("\"\x1f\"") == false);
+            }
+
+            SECTION("escaped")
+            {
+                // quotation mark "\""
+                auto r1 = R"("\"")"_json;
+                CHECK(accept_helper("\"\\\"\""));
+                // reverse solidus "\\"
+                auto r2 = R"("\\")"_json;
+                CHECK(accept_helper("\"\\\\\""));
+                // solidus
+                CHECK(accept_helper("\"\\/\""));
+                // backspace
+                CHECK(accept_helper("\"\\b\""));
+                // formfeed
+                CHECK(accept_helper("\"\\f\""));
+                // newline
+                CHECK(accept_helper("\"\\n\""));
+                // carriage return
+                CHECK(accept_helper("\"\\r\""));
+                // horizontal tab
+                CHECK(accept_helper("\"\\t\""));
+
+                CHECK(accept_helper("\"\\u0001\""));
+                CHECK(accept_helper("\"\\u000a\""));
+                CHECK(accept_helper("\"\\u00b0\""));
+                CHECK(accept_helper("\"\\u0c00\""));
+                CHECK(accept_helper("\"\\ud000\""));
+                CHECK(accept_helper("\"\\u000E\""));
+                CHECK(accept_helper("\"\\u00F0\""));
+                CHECK(accept_helper("\"\\u0100\""));
+                CHECK(accept_helper("\"\\u2000\""));
+                CHECK(accept_helper("\"\\uFFFF\""));
+                CHECK(accept_helper("\"\\u20AC\""));
+                CHECK(accept_helper("\"€\""));
+                CHECK(accept_helper("\"🎈\""));
+
+                CHECK(accept_helper("\"\\ud80c\\udc60\""));
+                CHECK(accept_helper("\"\\ud83c\\udf1e\""));
+            }
+        }
+
+        SECTION("number")
+        {
+            SECTION("integers")
+            {
+                SECTION("without exponent")
+                {
+                    CHECK(accept_helper("-128"));
+                    CHECK(accept_helper("-0"));
+                    CHECK(accept_helper("0"));
+                    CHECK(accept_helper("128"));
+                }
+
+                SECTION("with exponent")
+                {
+                    CHECK(accept_helper("0e1"));
+                    CHECK(accept_helper("0E1"));
+
+                    CHECK(accept_helper("10000E-4"));
+                    CHECK(accept_helper("10000E-3"));
+                    CHECK(accept_helper("10000E-2"));
+                    CHECK(accept_helper("10000E-1"));
+                    CHECK(accept_helper("10000E0"));
+                    CHECK(accept_helper("10000E1"));
+                    CHECK(accept_helper("10000E2"));
+                    CHECK(accept_helper("10000E3"));
+                    CHECK(accept_helper("10000E4"));
+
+                    CHECK(accept_helper("10000e-4"));
+                    CHECK(accept_helper("10000e-3"));
+                    CHECK(accept_helper("10000e-2"));
+                    CHECK(accept_helper("10000e-1"));
+                    CHECK(accept_helper("10000e0"));
+                    CHECK(accept_helper("10000e1"));
+                    CHECK(accept_helper("10000e2"));
+                    CHECK(accept_helper("10000e3"));
+                    CHECK(accept_helper("10000e4"));
+
+                    CHECK(accept_helper("-0e1"));
+                    CHECK(accept_helper("-0E1"));
+                    CHECK(accept_helper("-0E123"));
+                }
+
+                SECTION("edge cases")
+                {
+                    // From RFC8259, Section 6:
+                    // Note that when such software is used, numbers that are
+                    // integers and are in the range [-(2**53)+1, (2**53)-1]
+                    // are interoperable in the sense that implementations will
+                    // agree exactly on their numeric values.
+
+                    // -(2**53)+1
+                    CHECK(accept_helper("-9007199254740991"));
+                    // (2**53)-1
+                    CHECK(accept_helper("9007199254740991"));
+                }
+
+                SECTION("over the edge cases")  // issue #178 - Integer conversion to unsigned (incorrect handling of 64-bit integers)
+                {
+                    // While RFC8259, Section 6 specifies a preference for support
+                    // for ranges in range of IEEE 754-2008 binary64 (double precision)
+                    // this does not accommodate 64 bit integers without loss of accuracy.
+                    // As 64 bit integers are now widely used in software, it is desirable
+                    // to expand support to to the full 64 bit (signed and unsigned) range
+                    // i.e. -(2**63) -> (2**64)-1.
+
+                    // -(2**63)    ** Note: compilers see negative literals as negated positive numbers (hence the -1))
+                    CHECK(accept_helper("-9223372036854775808"));
+                    // (2**63)-1
+                    CHECK(accept_helper("9223372036854775807"));
+                    // (2**64)-1
+                    CHECK(accept_helper("18446744073709551615"));
+                }
+            }
+
+            SECTION("floating-point")
+            {
+                SECTION("without exponent")
+                {
+                    CHECK(accept_helper("-128.5"));
+                    CHECK(accept_helper("0.999"));
+                    CHECK(accept_helper("128.5"));
+                    CHECK(accept_helper("-0.0"));
+                }
+
+                SECTION("with exponent")
+                {
+                    CHECK(accept_helper("-128.5E3"));
+                    CHECK(accept_helper("-128.5E-3"));
+                    CHECK(accept_helper("-0.0e1"));
+                    CHECK(accept_helper("-0.0E1"));
+                }
+            }
+
+            SECTION("overflow")
+            {
+                // overflows during parsing
+                CHECK(!accept_helper("1.18973e+4932"));
+            }
+
+            SECTION("invalid numbers")
+            {
+                CHECK(accept_helper("01") == false);
+                CHECK(accept_helper("--1") == false);
+                CHECK(accept_helper("1.") == false);
+                CHECK(accept_helper("1E") == false);
+                CHECK(accept_helper("1E-") == false);
+                CHECK(accept_helper("1.E1") == false);
+                CHECK(accept_helper("-1E") == false);
+                CHECK(accept_helper("-0E#") == false);
+                CHECK(accept_helper("-0E-#") == false);
+                CHECK(accept_helper("-0#") == false);
+                CHECK(accept_helper("-0.0:") == false);
+                CHECK(accept_helper("-0.0Z") == false);
+                CHECK(accept_helper("-0E123:") == false);
+                CHECK(accept_helper("-0e0-:") == false);
+                CHECK(accept_helper("-0e-:") == false);
+                CHECK(accept_helper("-0f") == false);
+
+                // numbers must not begin with "+"
+                CHECK(accept_helper("+1") == false);
+                CHECK(accept_helper("+0") == false);
+            }
+        }
+    }
+
+    SECTION("parse errors")
+    {
+        // unexpected end of number
+        CHECK_THROWS_WITH_AS(parser_helper("0."),
+                             "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid number; expected digit after '.'; last read: '0.'", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("-"),
+                             "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid number; expected digit after '-'; last read: '-'", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("--"),
+                             "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid number; expected digit after '-'; last read: '--'", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("-0."),
+                             "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid number; expected digit after '.'; last read: '-0.'", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("-."),
+                             "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid number; expected digit after '-'; last read: '-.'", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("-:"),
+                             "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid number; expected digit after '-'; last read: '-:'", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("0.:"),
+                             "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid number; expected digit after '.'; last read: '0.:'", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("e."),
+                             "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error while parsing value - invalid literal; last read: 'e'", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("1e."),
+                             "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid number; expected '+', '-', or digit after exponent; last read: '1e.'", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("1e/"),
+                             "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid number; expected '+', '-', or digit after exponent; last read: '1e/'", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("1e:"),
+                             "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid number; expected '+', '-', or digit after exponent; last read: '1e:'", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("1E."),
+                             "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid number; expected '+', '-', or digit after exponent; last read: '1E.'", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("1E/"),
+                             "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid number; expected '+', '-', or digit after exponent; last read: '1E/'", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("1E:"),
+                             "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid number; expected '+', '-', or digit after exponent; last read: '1E:'", json::parse_error&);
+
+        // unexpected end of null
+        CHECK_THROWS_WITH_AS(parser_helper("n"),
+                             "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid literal; last read: 'n'", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("nu"),
+                             "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid literal; last read: 'nu'", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("nul"),
+                             "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid literal; last read: 'nul'", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("nulk"),
+                             "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid literal; last read: 'nulk'", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("nulm"),
+                             "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid literal; last read: 'nulm'", json::parse_error&);
+
+        // unexpected end of true
+        CHECK_THROWS_WITH_AS(parser_helper("t"),
+                             "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid literal; last read: 't'", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("tr"),
+                             "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid literal; last read: 'tr'", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("tru"),
+                             "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid literal; last read: 'tru'", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("trud"),
+                             "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid literal; last read: 'trud'", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("truf"),
+                             "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid literal; last read: 'truf'", json::parse_error&);
+
+        // unexpected end of false
+        CHECK_THROWS_WITH_AS(parser_helper("f"),
+                             "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid literal; last read: 'f'", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("fa"),
+                             "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid literal; last read: 'fa'", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("fal"),
+                             "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid literal; last read: 'fal'", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("fals"),
+                             "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error while parsing value - invalid literal; last read: 'fals'", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("falsd"),
+                             "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error while parsing value - invalid literal; last read: 'falsd'", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("falsf"),
+                             "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error while parsing value - invalid literal; last read: 'falsf'", json::parse_error&);
+
+        // missing/unexpected end of array
+        CHECK_THROWS_WITH_AS(parser_helper("["),
+                             "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - unexpected end of input; expected '[', '{', or a literal", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("[1"),
+                             "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing array - unexpected end of input; expected ']'", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("[1,"),
+                             "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - unexpected end of input; expected '[', '{', or a literal", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("[1,]"),
+                             "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - unexpected ']'; expected '[', '{', or a literal", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("]"),
+                             "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error while parsing value - unexpected ']'; expected '[', '{', or a literal", json::parse_error&);
+
+        // missing/unexpected end of object
+        CHECK_THROWS_WITH_AS(parser_helper("{"),
+                             "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing object key - unexpected end of input; expected string literal", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("{\"foo\""),
+                             "[json.exception.parse_error.101] parse error at line 1, column 7: syntax error while parsing object separator - unexpected end of input; expected ':'", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("{\"foo\":"),
+                             "[json.exception.parse_error.101] parse error at line 1, column 8: syntax error while parsing value - unexpected end of input; expected '[', '{', or a literal", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("{\"foo\":}"),
+                             "[json.exception.parse_error.101] parse error at line 1, column 8: syntax error while parsing value - unexpected '}'; expected '[', '{', or a literal", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("{\"foo\":1,}"),
+                             "[json.exception.parse_error.101] parse error at line 1, column 10: syntax error while parsing object key - unexpected '}'; expected string literal", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("}"),
+                             "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error while parsing value - unexpected '}'; expected '[', '{', or a literal", json::parse_error&);
+
+        // missing/unexpected end of string
+        CHECK_THROWS_WITH_AS(parser_helper("\""),
+                             "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: missing closing quote; last read: '\"'", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("\"\\\""),
+                             "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid string: missing closing quote; last read: '\"\\\"'", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("\"\\u\""),
+                             "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u\"'", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("\"\\u0\""),
+                             "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error while parsing value - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u0\"'", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("\"\\u01\""),
+                             "[json.exception.parse_error.101] parse error at line 1, column 6: syntax error while parsing value - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u01\"'", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("\"\\u012\""),
+                             "[json.exception.parse_error.101] parse error at line 1, column 7: syntax error while parsing value - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u012\"'", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("\"\\u"),
+                             "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u'", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("\"\\u0"),
+                             "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error while parsing value - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u0'", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("\"\\u01"),
+                             "[json.exception.parse_error.101] parse error at line 1, column 6: syntax error while parsing value - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u01'", json::parse_error&);
+        CHECK_THROWS_WITH_AS(parser_helper("\"\\u012"),
+                             "[json.exception.parse_error.101] parse error at line 1, column 7: syntax error while parsing value - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u012'", json::parse_error&);
+
+        // invalid escapes
+        for (int c = 1; c < 128; ++c)
+        {
+            auto s = std::string("\"\\") + std::string(1, static_cast<char>(c)) + "\"";
+
+            switch (c)
+            {
+                // valid escapes
+                case ('"'):
+                case ('\\'):
+                case ('/'):
+                case ('b'):
+                case ('f'):
+                case ('n'):
+                case ('r'):
+                case ('t'):
+                {
+                    CHECK_NOTHROW(parser_helper(s));
+                    break;
+                }
+
+                // \u must be followed with four numbers, so we skip it here
+                case ('u'):
+                {
+                    break;
+                }
+
+                // any other combination of backslash and character is invalid
+                default:
+                {
+                    CHECK_THROWS_AS(parser_helper(s), json::parse_error&);
+                    // only check error message if c is not a control character
+                    if (c > 0x1f)
+                    {
+                        CHECK_THROWS_WITH_STD_STR(parser_helper(s),
+                                                  "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid string: forbidden character after backslash; last read: '\"\\" + std::string(1, static_cast<char>(c)) + "'");
+                    }
+                    break;
+                }
+            }
+        }
+
+        // invalid \uxxxx escapes
+        {
+            // check whether character is a valid hex character
+            const auto valid = [](int c)
+            {
+                switch (c)
+                {
+                    case ('0'):
+                    case ('1'):
+                    case ('2'):
+                    case ('3'):
+                    case ('4'):
+                    case ('5'):
+                    case ('6'):
+                    case ('7'):
+                    case ('8'):
+                    case ('9'):
+                    case ('a'):
+                    case ('b'):
+                    case ('c'):
+                    case ('d'):
+                    case ('e'):
+                    case ('f'):
+                    case ('A'):
+                    case ('B'):
+                    case ('C'):
+                    case ('D'):
+                    case ('E'):
+                    case ('F'):
+                    {
+                        return true;
+                    }
+
+                    default:
+                    {
+                        return false;
+                    }
+                }
+            };
+
+            for (int c = 1; c < 128; ++c)
+            {
+                std::string const s = "\"\\u";
+
+                // create a string with the iterated character at each position
+                auto s1 = s + "000" + std::string(1, static_cast<char>(c)) + "\"";
+                auto s2 = s + "00" + std::string(1, static_cast<char>(c)) + "0\"";
+                auto s3 = s + "0" + std::string(1, static_cast<char>(c)) + "00\"";
+                auto s4 = s + std::string(1, static_cast<char>(c)) + "000\"";
+
+                if (valid(c))
+                {
+                    CAPTURE(s1)
+                    CHECK_NOTHROW(parser_helper(s1));
+                    CAPTURE(s2)
+                    CHECK_NOTHROW(parser_helper(s2));
+                    CAPTURE(s3)
+                    CHECK_NOTHROW(parser_helper(s3));
+                    CAPTURE(s4)
+                    CHECK_NOTHROW(parser_helper(s4));
+                }
+                else
+                {
+                    CAPTURE(s1)
+                    CHECK_THROWS_AS(parser_helper(s1), json::parse_error&);
+                    // only check error message if c is not a control character
+                    if (c > 0x1f)
+                    {
+                        CHECK_THROWS_WITH_STD_STR(parser_helper(s1),
+                                                  "[json.exception.parse_error.101] parse error at line 1, column 7: syntax error while parsing value - invalid string: '\\u' must be followed by 4 hex digits; last read: '" + s1.substr(0, 7) + "'");
+                    }
+
+                    CAPTURE(s2)
+                    CHECK_THROWS_AS(parser_helper(s2), json::parse_error&);
+                    // only check error message if c is not a control character
+                    if (c > 0x1f)
+                    {
+                        CHECK_THROWS_WITH_STD_STR(parser_helper(s2),
+                                                  "[json.exception.parse_error.101] parse error at line 1, column 6: syntax error while parsing value - invalid string: '\\u' must be followed by 4 hex digits; last read: '" + s2.substr(0, 6) + "'");
+                    }
+
+                    CAPTURE(s3)
+                    CHECK_THROWS_AS(parser_helper(s3), json::parse_error&);
+                    // only check error message if c is not a control character
+                    if (c > 0x1f)
+                    {
+                        CHECK_THROWS_WITH_STD_STR(parser_helper(s3),
+                                                  "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error while parsing value - invalid string: '\\u' must be followed by 4 hex digits; last read: '" + s3.substr(0, 5) + "'");
+                    }
+
+                    CAPTURE(s4)
+                    CHECK_THROWS_AS(parser_helper(s4), json::parse_error&);
+                    // only check error message if c is not a control character
+                    if (c > 0x1f)
+                    {
+                        CHECK_THROWS_WITH_STD_STR(parser_helper(s4),
+                                                  "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid string: '\\u' must be followed by 4 hex digits; last read: '" + s4.substr(0, 4) + "'");
+                    }
+                }
+            }
+        }
+
+        json _;
+
+        // missing part of a surrogate pair
+        CHECK_THROWS_WITH_AS(_ = json::parse("\"\\uD80C\""), "[json.exception.parse_error.101] parse error at line 1, column 8: syntax error while parsing value - invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD80C\"'", json::parse_error&);
+        // invalid surrogate pair
+        CHECK_THROWS_WITH_AS(_ = json::parse("\"\\uD80C\\uD80C\""),
+                             "[json.exception.parse_error.101] parse error at line 1, column 13: syntax error while parsing value - invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD80C\\uD80C'", json::parse_error&);
+        CHECK_THROWS_WITH_AS(_ = json::parse("\"\\uD80C\\u0000\""),
+                             "[json.exception.parse_error.101] parse error at line 1, column 13: syntax error while parsing value - invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD80C\\u0000'", json::parse_error&);
+        CHECK_THROWS_WITH_AS(_ = json::parse("\"\\uD80C\\uFFFF\""),
+                             "[json.exception.parse_error.101] parse error at line 1, column 13: syntax error while parsing value - invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD80C\\uFFFF'", json::parse_error&);
+    }
+
+    SECTION("parse errors (accept)")
+    {
+        // unexpected end of number
+        CHECK(accept_helper("0.") == false);
+        CHECK(accept_helper("-") == false);
+        CHECK(accept_helper("--") == false);
+        CHECK(accept_helper("-0.") == false);
+        CHECK(accept_helper("-.") == false);
+        CHECK(accept_helper("-:") == false);
+        CHECK(accept_helper("0.:") == false);
+        CHECK(accept_helper("e.") == false);
+        CHECK(accept_helper("1e.") == false);
+        CHECK(accept_helper("1e/") == false);
+        CHECK(accept_helper("1e:") == false);
+        CHECK(accept_helper("1E.") == false);
+        CHECK(accept_helper("1E/") == false);
+        CHECK(accept_helper("1E:") == false);
+
+        // unexpected end of null
+        CHECK(accept_helper("n") == false);
+        CHECK(accept_helper("nu") == false);
+        CHECK(accept_helper("nul") == false);
+
+        // unexpected end of true
+        CHECK(accept_helper("t") == false);
+        CHECK(accept_helper("tr") == false);
+        CHECK(accept_helper("tru") == false);
+
+        // unexpected end of false
+        CHECK(accept_helper("f") == false);
+        CHECK(accept_helper("fa") == false);
+        CHECK(accept_helper("fal") == false);
+        CHECK(accept_helper("fals") == false);
+
+        // missing/unexpected end of array
+        CHECK(accept_helper("[") == false);
+        CHECK(accept_helper("[1") == false);
+        CHECK(accept_helper("[1,") == false);
+        CHECK(accept_helper("[1,]") == false);
+        CHECK(accept_helper("]") == false);
+
+        // missing/unexpected end of object
+        CHECK(accept_helper("{") == false);
+        CHECK(accept_helper("{\"foo\"") == false);
+        CHECK(accept_helper("{\"foo\":") == false);
+        CHECK(accept_helper("{\"foo\":}") == false);
+        CHECK(accept_helper("{\"foo\":1,}") == false);
+        CHECK(accept_helper("}") == false);
+
+        // missing/unexpected end of string
+        CHECK(accept_helper("\"") == false);
+        CHECK(accept_helper("\"\\\"") == false);
+        CHECK(accept_helper("\"\\u\"") == false);
+        CHECK(accept_helper("\"\\u0\"") == false);
+        CHECK(accept_helper("\"\\u01\"") == false);
+        CHECK(accept_helper("\"\\u012\"") == false);
+        CHECK(accept_helper("\"\\u") == false);
+        CHECK(accept_helper("\"\\u0") == false);
+        CHECK(accept_helper("\"\\u01") == false);
+        CHECK(accept_helper("\"\\u012") == false);
+
+        // unget of newline
+        CHECK(parser_helper("\n123\n") == 123);
+
+        // invalid escapes
+        for (int c = 1; c < 128; ++c)
+        {
+            auto s = std::string("\"\\") + std::string(1, static_cast<char>(c)) + "\"";
+
+            switch (c)
+            {
+                // valid escapes
+                case ('"'):
+                case ('\\'):
+                case ('/'):
+                case ('b'):
+                case ('f'):
+                case ('n'):
+                case ('r'):
+                case ('t'):
+                {
+                    CHECK(json::parser(nlohmann::detail::input_adapter(s)).accept());
+                    break;
+                }
+
+                // \u must be followed with four numbers, so we skip it here
+                case ('u'):
+                {
+                    break;
+                }
+
+                // any other combination of backslash and character is invalid
+                default:
+                {
+                    CHECK(json::parser(nlohmann::detail::input_adapter(s)).accept() == false);
+                    break;
+                }
+            }
+        }
+
+        // invalid \uxxxx escapes
+        {
+            // check whether character is a valid hex character
+            const auto valid = [](int c)
+            {
+                switch (c)
+                {
+                    case ('0'):
+                    case ('1'):
+                    case ('2'):
+                    case ('3'):
+                    case ('4'):
+                    case ('5'):
+                    case ('6'):
+                    case ('7'):
+                    case ('8'):
+                    case ('9'):
+                    case ('a'):
+                    case ('b'):
+                    case ('c'):
+                    case ('d'):
+                    case ('e'):
+                    case ('f'):
+                    case ('A'):
+                    case ('B'):
+                    case ('C'):
+                    case ('D'):
+                    case ('E'):
+                    case ('F'):
+                    {
+                        return true;
+                    }
+
+                    default:
+                    {
+                        return false;
+                    }
+                }
+            };
+
+            for (int c = 1; c < 128; ++c)
+            {
+                std::string const s = "\"\\u";
+
+                // create a string with the iterated character at each position
+                const auto s1 = s + "000" + std::string(1, static_cast<char>(c)) + "\"";
+                const auto s2 = s + "00" + std::string(1, static_cast<char>(c)) + "0\"";
+                const auto s3 = s + "0" + std::string(1, static_cast<char>(c)) + "00\"";
+                const auto s4 = s + std::string(1, static_cast<char>(c)) + "000\"";
+
+                if (valid(c))
+                {
+                    CAPTURE(s1)
+                    CHECK(json::parser(nlohmann::detail::input_adapter(s1)).accept());
+                    CAPTURE(s2)
+                    CHECK(json::parser(nlohmann::detail::input_adapter(s2)).accept());
+                    CAPTURE(s3)
+                    CHECK(json::parser(nlohmann::detail::input_adapter(s3)).accept());
+                    CAPTURE(s4)
+                    CHECK(json::parser(nlohmann::detail::input_adapter(s4)).accept());
+                }
+                else
+                {
+                    CAPTURE(s1)
+                    CHECK(json::parser(nlohmann::detail::input_adapter(s1)).accept() == false);
+
+                    CAPTURE(s2)
+                    CHECK(json::parser(nlohmann::detail::input_adapter(s2)).accept() == false);
+
+                    CAPTURE(s3)
+                    CHECK(json::parser(nlohmann::detail::input_adapter(s3)).accept() == false);
+
+                    CAPTURE(s4)
+                    CHECK(json::parser(nlohmann::detail::input_adapter(s4)).accept() == false);
+                }
+            }
+        }
+
+        // missing part of a surrogate pair
+        CHECK(accept_helper("\"\\uD80C\"") == false);
+        // invalid surrogate pair
+        CHECK(accept_helper("\"\\uD80C\\uD80C\"") == false);
+        CHECK(accept_helper("\"\\uD80C\\u0000\"") == false);
+        CHECK(accept_helper("\"\\uD80C\\uFFFF\"") == false);
+    }
+
+    SECTION("tests found by mutate++")
+    {
+        // test case to make sure no comma precedes the first key
+        CHECK_THROWS_WITH_AS(parser_helper("{,\"key\": false}"), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing object key - unexpected ','; expected string literal", json::parse_error&);
+        // test case to make sure an object is properly closed
+        CHECK_THROWS_WITH_AS(parser_helper("[{\"key\": false true]"), "[json.exception.parse_error.101] parse error at line 1, column 19: syntax error while parsing object - unexpected true literal; expected '}'", json::parse_error&);
+
+        // test case to make sure the callback is properly evaluated after reading a key
+        {
+            json::parser_callback_t const cb = [](int /*unused*/, json::parse_event_t event, json& /*unused*/) noexcept
+            {
+                return event != json::parse_event_t::key;
+            };
+
+            json x = json::parse("{\"key\": false}", cb);
+            CHECK(x == json::object());
+        }
+    }
+
+    SECTION("callback function")
+    {
+        const auto* s_object = R"(
+            {
+                "foo": 2,
+                "bar": {
+                    "baz": 1
+                }
+            }
+        )";
+
+        const auto* s_array = R"(
+            [1,2,[3,4,5],4,5]
+        )";
+
+        const auto* structured_array = R"(
+            [
+                1,
+                {
+                     "foo": "bar"
+                },
+                {
+                     "qux": "baz"
+                }
+            ]
+        )";
+
+        SECTION("filter nothing")
+        {
+            json j_object = json::parse(s_object, [](int /*unused*/, json::parse_event_t /*unused*/, const json& /*unused*/) noexcept
+            {
+                return true;
+            });
+
+            CHECK (j_object == json({{"foo", 2}, {"bar", {{"baz", 1}}}}));
+
+            json j_array = json::parse(s_array, [](int /*unused*/, json::parse_event_t /*unused*/, const json& /*unused*/) noexcept
+            {
+                return true;
+            });
+
+            CHECK (j_array == json({1, 2, {3, 4, 5}, 4, 5}));
+        }
+
+        SECTION("filter everything")
+        {
+            json const j_object = json::parse(s_object, [](int /*unused*/, json::parse_event_t /*unused*/, const json& /*unused*/) noexcept
+            {
+                return false;
+            });
+
+            // the top-level object will be discarded, leaving a null
+            CHECK (j_object.is_null());
+
+            json const j_array = json::parse(s_array, [](int /*unused*/, json::parse_event_t /*unused*/, const json& /*unused*/) noexcept
+            {
+                return false;
+            });
+
+            // the top-level array will be discarded, leaving a null
+            CHECK (j_array.is_null());
+        }
+
+        SECTION("filter specific element")
+        {
+            json j_object = json::parse(s_object, [](int /*unused*/, json::parse_event_t event, const json & j) noexcept
+            {
+                // filter all number(2) elements
+                return event != json::parse_event_t::value || j != json(2);
+            });
+
+            CHECK (j_object == json({{"bar", {{"baz", 1}}}}));
+
+            json j_array = json::parse(s_array, [](int /*unused*/, json::parse_event_t event, const json & j) noexcept
+            {
+                return event != json::parse_event_t::value || j != json(2);
+            });
+
+            CHECK (j_array == json({1, {3, 4, 5}, 4, 5}));
+        }
+
+        SECTION("filter object in array")
+        {
+            json j_filtered1 = json::parse(structured_array, [](int /*unused*/, json::parse_event_t e, const json & parsed)
+            {
+                return !(e == json::parse_event_t::object_end && parsed.contains("foo"));
+            });
+
+            // the specified object will be discarded, and removed.
+            CHECK (j_filtered1.size() == 2);
+            CHECK (j_filtered1 == json({1, {{"qux", "baz"}}}));
+
+            json j_filtered2 = json::parse(structured_array, [](int /*unused*/, json::parse_event_t e, const json& /*parsed*/) noexcept
+            {
+                return e != json::parse_event_t::object_end;
+            });
+
+            // removed all objects in array.
+            CHECK (j_filtered2.size() == 1);
+            CHECK (j_filtered2 == json({1}));
+        }
+
+        SECTION("filter specific events")
+        {
+            SECTION("first closing event")
+            {
+                {
+                    json j_object = json::parse(s_object, [](int /*unused*/, json::parse_event_t e, const json& /*unused*/) noexcept
+                    {
+                        static bool first = true;
+                        if (e == json::parse_event_t::object_end && first)
+                        {
+                            first = false;
+                            return false;
+                        }
+
+                        return true;
+                    });
+
+                    // the first completed object will be discarded
+                    CHECK (j_object == json({{"foo", 2}}));
+                }
+
+                {
+                    json j_array = json::parse(s_array, [](int /*unused*/, json::parse_event_t e, const json& /*unused*/) noexcept
+                    {
+                        static bool first = true;
+                        if (e == json::parse_event_t::array_end && first)
+                        {
+                            first = false;
+                            return false;
+                        }
+
+                        return true;
+                    });
+
+                    // the first completed array will be discarded
+                    CHECK (j_array == json({1, 2, 4, 5}));
+                }
+            }
+        }
+
+        SECTION("special cases")
+        {
+            // the following test cases cover the situation in which an empty
+            // object and array is discarded only after the closing character
+            // has been read
+
+            json j_empty_object = json::parse("{}", [](int /*unused*/, json::parse_event_t e, const json& /*unused*/) noexcept
+            {
+                return e != json::parse_event_t::object_end;
+            });
+            CHECK(j_empty_object == json());
+
+            json j_empty_array = json::parse("[]", [](int /*unused*/, json::parse_event_t e, const json& /*unused*/) noexcept
+            {
+                return e != json::parse_event_t::array_end;
+            });
+            CHECK(j_empty_array == json());
+        }
+    }
+
+    SECTION("constructing from contiguous containers")
+    {
+        SECTION("from std::vector")
+        {
+            std::vector<uint8_t> v = {'t', 'r', 'u', 'e'};
+            json j;
+            json::parser(nlohmann::detail::input_adapter(std::begin(v), std::end(v))).parse(true, j);
+            CHECK(j == json(true));
+        }
+
+        SECTION("from std::array")
+        {
+            std::array<uint8_t, 5> v { {'t', 'r', 'u', 'e'} };
+            json j;
+            json::parser(nlohmann::detail::input_adapter(std::begin(v), std::end(v))).parse(true, j);
+            CHECK(j == json(true));
+        }
+
+        SECTION("from array")
+        {
+            uint8_t v[] = {'t', 'r', 'u', 'e'}; // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+            json j;
+            json::parser(nlohmann::detail::input_adapter(std::begin(v), std::end(v))).parse(true, j);
+            CHECK(j == json(true));
+        }
+
+        SECTION("from char literal")
+        {
+            CHECK(parser_helper("true") == json(true));
+        }
+
+        SECTION("from std::string")
+        {
+            std::string v = {'t', 'r', 'u', 'e'};
+            json j;
+            json::parser(nlohmann::detail::input_adapter(std::begin(v), std::end(v))).parse(true, j);
+            CHECK(j == json(true));
+        }
+
+        SECTION("from std::initializer_list")
+        {
+            std::initializer_list<uint8_t> const v = {'t', 'r', 'u', 'e'};
+            json j;
+            json::parser(nlohmann::detail::input_adapter(std::begin(v), std::end(v))).parse(true, j);
+            CHECK(j == json(true));
+        }
+
+        SECTION("from std::valarray")
+        {
+            std::valarray<uint8_t> v = {'t', 'r', 'u', 'e'};
+            json j;
+            json::parser(nlohmann::detail::input_adapter(std::begin(v), std::end(v))).parse(true, j);
+            CHECK(j == json(true));
+        }
+    }
+
+    SECTION("improve test coverage")
+    {
+        SECTION("parser with callback")
+        {
+            json::parser_callback_t const cb = [](int /*unused*/, json::parse_event_t /*unused*/, json& /*unused*/) noexcept
+            {
+                return true;
+            };
+
+            CHECK(json::parse("{\"foo\": true:", cb, false).is_discarded());
+
+            json _;
+            CHECK_THROWS_WITH_AS(_ = json::parse("{\"foo\": true:", cb), "[json.exception.parse_error.101] parse error at line 1, column 13: syntax error while parsing object - unexpected ':'; expected '}'", json::parse_error&);
+
+            CHECK_THROWS_WITH_AS(_ = json::parse("1.18973e+4932", cb), "[json.exception.out_of_range.406] number overflow parsing '1.18973e+4932'", json::out_of_range&);
+        }
+
+        SECTION("SAX parser")
+        {
+            SECTION("} without value")
+            {
+                SaxCountdown s(1);
+                CHECK(json::sax_parse("{}", &s) == false);
+            }
+
+            SECTION("} with value")
+            {
+                SaxCountdown s(3);
+                CHECK(json::sax_parse("{\"k1\": true}", &s) == false);
+            }
+
+            SECTION("second key")
+            {
+                SaxCountdown s(3);
+                CHECK(json::sax_parse("{\"k1\": true, \"k2\": false}", &s) == false);
+            }
+
+            SECTION("] without value")
+            {
+                SaxCountdown s(1);
+                CHECK(json::sax_parse("[]", &s) == false);
+            }
+
+            SECTION("] with value")
+            {
+                SaxCountdown s(2);
+                CHECK(json::sax_parse("[1]", &s) == false);
+            }
+
+            SECTION("float")
+            {
+                SaxCountdown s(0);
+                CHECK(json::sax_parse("3.14", &s) == false);
+            }
+
+            SECTION("false")
+            {
+                SaxCountdown s(0);
+                CHECK(json::sax_parse("false", &s) == false);
+            }
+
+            SECTION("null")
+            {
+                SaxCountdown s(0);
+                CHECK(json::sax_parse("null", &s) == false);
+            }
+
+            SECTION("true")
+            {
+                SaxCountdown s(0);
+                CHECK(json::sax_parse("true", &s) == false);
+            }
+
+            SECTION("unsigned")
+            {
+                SaxCountdown s(0);
+                CHECK(json::sax_parse("12", &s) == false);
+            }
+
+            SECTION("integer")
+            {
+                SaxCountdown s(0);
+                CHECK(json::sax_parse("-12", &s) == false);
+            }
+
+            SECTION("string")
+            {
+                SaxCountdown s(0);
+                CHECK(json::sax_parse("\"foo\"", &s) == false);
+            }
+        }
+    }
+
+    SECTION("error messages for comments")
+    {
+        json _;
+        CHECK_THROWS_WITH_AS(_ = json::parse("/a", nullptr, true, true), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid comment; expecting '/' or '*' after '/'; last read: '/a'", json::parse_error);
+        CHECK_THROWS_WITH_AS(_ = json::parse("/*", nullptr, true, true), "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid comment; missing closing '*/'; last read: '/*<U+0000>'", json::parse_error);
+    }
+}
diff --git a/external_imported/json/tests/src/unit-comparison.cpp b/external_imported/json/tests/src/unit-comparison.cpp
new file mode 100644
index 000000000..7df20486d
--- /dev/null
+++ b/external_imported/json/tests/src/unit-comparison.cpp
@@ -0,0 +1,596 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+// cmake/test.cmake selects the C++ standard versions with which to build a
+// unit test based on the presence of JSON_HAS_CPP_<VERSION> macros.
+// When using macros that are only defined for particular versions of the standard
+// (e.g., JSON_HAS_FILESYSTEM for C++17 and up), please mention the corresponding
+// version macro in a comment close by, like this:
+// JSON_HAS_CPP_<VERSION> (do not remove; see note at top of file)
+
+#include "doctest_compatibility.h"
+
+#define JSON_TESTS_PRIVATE
+#include <nlohmann/json.hpp>
+using nlohmann::json;
+
+#if JSON_HAS_THREE_WAY_COMPARISON
+// this can be replaced with the doctest stl extension header in version 2.5
+namespace doctest
+{
+template<> struct StringMaker<std::partial_ordering>
+{
+    static String convert(const std::partial_ordering& order)
+    {
+        if (order == std::partial_ordering::less)
+        {
+            return "std::partial_ordering::less";
+        }
+        if (order == std::partial_ordering::equivalent)
+        {
+            return "std::partial_ordering::equivalent";
+        }
+        if (order == std::partial_ordering::greater)
+        {
+            return "std::partial_ordering::greater";
+        }
+        if (order == std::partial_ordering::unordered)
+        {
+            return "std::partial_ordering::unordered";
+        }
+        return "{?}";
+    }
+};
+} // namespace doctest
+
+#endif
+
+namespace
+{
+// helper function to check std::less<json::value_t>
+// see https://en.cppreference.com/w/cpp/utility/functional/less
+template <typename A, typename B, typename U = std::less<json::value_t>>
+bool f(A a, B b, U u = U())
+{
+    return u(a, b);
+}
+} // namespace
+
+TEST_CASE("lexicographical comparison operators")
+{
+    constexpr auto f_ = false;
+    constexpr auto _t = true;
+    constexpr auto nan = std::numeric_limits<json::number_float_t>::quiet_NaN();
+#if JSON_HAS_THREE_WAY_COMPARISON
+    constexpr auto lt = std::partial_ordering::less;
+    constexpr auto gt = std::partial_ordering::greater;
+    constexpr auto eq = std::partial_ordering::equivalent;
+    constexpr auto un = std::partial_ordering::unordered;
+#endif
+
+#if JSON_HAS_THREE_WAY_COMPARISON
+    INFO("using 3-way comparison");
+#endif
+
+#if JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+    INFO("using legacy comparison");
+#endif
+
+    //REQUIRE(std::numeric_limits<json::number_float_t>::has_quiet_NaN);
+    REQUIRE(std::isnan(nan));
+
+    SECTION("types")
+    {
+        std::vector<json::value_t> j_types =
+        {
+            json::value_t::null,
+            json::value_t::boolean,
+            json::value_t::number_integer,
+            json::value_t::number_unsigned,
+            json::value_t::number_float,
+            json::value_t::object,
+            json::value_t::array,
+            json::value_t::string,
+            json::value_t::binary,
+            json::value_t::discarded
+        };
+
+        std::vector<std::vector<bool>> expected_lt =
+        {
+            //0   1   2   3   4   5   6   7   8   9
+            {f_, _t, _t, _t, _t, _t, _t, _t, _t, f_}, //  0
+            {f_, f_, _t, _t, _t, _t, _t, _t, _t, f_}, //  1
+            {f_, f_, f_, f_, f_, _t, _t, _t, _t, f_}, //  2
+            {f_, f_, f_, f_, f_, _t, _t, _t, _t, f_}, //  3
+            {f_, f_, f_, f_, f_, _t, _t, _t, _t, f_}, //  4
+            {f_, f_, f_, f_, f_, f_, _t, _t, _t, f_}, //  5
+            {f_, f_, f_, f_, f_, f_, f_, _t, _t, f_}, //  6
+            {f_, f_, f_, f_, f_, f_, f_, f_, _t, f_}, //  7
+            {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_}, //  8
+            {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_}, //  9
+        };
+
+        SECTION("comparison: less")
+        {
+            REQUIRE(expected_lt.size() == j_types.size());
+            for (size_t i = 0; i < j_types.size(); ++i)
+            {
+                REQUIRE(expected_lt[i].size() == j_types.size());
+                for (size_t j = 0; j < j_types.size(); ++j)
+                {
+                    CAPTURE(i)
+                    CAPTURE(j)
+                    // check precomputed values
+#if JSON_HAS_THREE_WAY_COMPARISON
+                    // JSON_HAS_CPP_20 (do not remove; see note at top of file)
+                    CHECK((j_types[i] < j_types[j]) == expected_lt[i][j]);
+#else
+                    CHECK(operator<(j_types[i], j_types[j]) == expected_lt[i][j]);
+#endif
+                    CHECK(f(j_types[i], j_types[j]) == expected_lt[i][j]);
+                }
+            }
+        }
+#if JSON_HAS_THREE_WAY_COMPARISON
+        // JSON_HAS_CPP_20 (do not remove; see note at top of file)
+        SECTION("comparison: 3-way")
+        {
+            std::vector<std::vector<std::partial_ordering>> expected =
+            {
+                //0   1   2   3   4   5   6   7   8   9
+                {eq, lt, lt, lt, lt, lt, lt, lt, lt, un}, //  0
+                {gt, eq, lt, lt, lt, lt, lt, lt, lt, un}, //  1
+                {gt, gt, eq, eq, eq, lt, lt, lt, lt, un}, //  2
+                {gt, gt, eq, eq, eq, lt, lt, lt, lt, un}, //  3
+                {gt, gt, eq, eq, eq, lt, lt, lt, lt, un}, //  4
+                {gt, gt, gt, gt, gt, eq, lt, lt, lt, un}, //  5
+                {gt, gt, gt, gt, gt, gt, eq, lt, lt, un}, //  6
+                {gt, gt, gt, gt, gt, gt, gt, eq, lt, un}, //  7
+                {gt, gt, gt, gt, gt, gt, gt, gt, eq, un}, //  8
+                {un, un, un, un, un, un, un, un, un, un}, //  9
+            };
+
+            // check expected partial_ordering against expected boolean
+            REQUIRE(expected.size() == expected_lt.size());
+            for (size_t i = 0; i < expected.size(); ++i)
+            {
+                REQUIRE(expected[i].size() == expected_lt[i].size());
+                for (size_t j = 0; j < expected[i].size(); ++j)
+                {
+                    CAPTURE(i)
+                    CAPTURE(j)
+                    CHECK(std::is_lt(expected[i][j]) == expected_lt[i][j]);
+                }
+            }
+
+            // check 3-way comparison against expected partial_ordering
+            REQUIRE(expected.size() == j_types.size());
+            for (size_t i = 0; i < j_types.size(); ++i)
+            {
+                REQUIRE(expected[i].size() == j_types.size());
+                for (size_t j = 0; j < j_types.size(); ++j)
+                {
+                    CAPTURE(i)
+                    CAPTURE(j)
+                    CHECK((j_types[i] <=> j_types[j]) == expected[i][j]); // *NOPAD*
+                }
+            }
+        }
+#endif
+    }
+
+    SECTION("values")
+    {
+        json j_values =
+        {
+            nullptr, nullptr,                                              // 0 1
+            -17, 42,                                                       // 2 3
+            8u, 13u,                                                       // 4 5
+            3.14159, 23.42,                                                // 6 7
+            nan, nan,                                                      // 8 9
+            "foo", "bar",                                                  // 10 11
+            true, false,                                                   // 12 13
+            {1, 2, 3}, {"one", "two", "three"},                            // 14 15
+            {{"first", 1}, {"second", 2}}, {{"a", "A"}, {"b", {"B"}}},     // 16 17
+            json::binary({1, 2, 3}), json::binary({1, 2, 4}),              // 18 19
+            json(json::value_t::discarded), json(json::value_t::discarded) // 20 21
+        };
+
+        std::vector<std::vector<bool>> expected_eq =
+        {
+            //0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15  16  17  18  19  20  21
+            {_t, _t, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_}, //  0
+            {_t, _t, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_}, //  1
+            {f_, f_, _t, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_}, //  2
+            {f_, f_, f_, _t, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_}, //  3
+            {f_, f_, f_, f_, _t, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_}, //  4
+            {f_, f_, f_, f_, f_, _t, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_}, //  5
+            {f_, f_, f_, f_, f_, f_, _t, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_}, //  6
+            {f_, f_, f_, f_, f_, f_, f_, _t, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_}, //  7
+            {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_}, //  8
+            {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_}, //  9
+            {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, _t, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_}, // 10
+            {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, _t, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_}, // 11
+            {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, _t, f_, f_, f_, f_, f_, f_, f_, f_, f_}, // 12
+            {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, _t, f_, f_, f_, f_, f_, f_, f_, f_}, // 13
+            {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, _t, f_, f_, f_, f_, f_, f_, f_}, // 14
+            {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, _t, f_, f_, f_, f_, f_, f_}, // 15
+            {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, _t, f_, f_, f_, f_, f_}, // 16
+            {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, _t, f_, f_, f_, f_}, // 17
+            {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, _t, f_, f_, f_}, // 18
+            {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, _t, f_, f_}, // 19
+            {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_}, // 20
+            {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_}, // 21
+        };
+
+        std::vector<std::vector<bool>> expected_lt =
+        {
+            //0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15  16  17  18  19  20  21
+            {f_, f_, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, f_, f_}, //  0
+            {f_, f_, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, f_, f_}, //  1
+            {f_, f_, f_, _t, _t, _t, _t, _t, f_, f_, _t, _t, f_, f_, _t, _t, _t, _t, _t, _t, f_, f_}, //  2
+            {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, _t, _t, f_, f_, _t, _t, _t, _t, _t, _t, f_, f_}, //  3
+            {f_, f_, f_, _t, f_, _t, f_, _t, f_, f_, _t, _t, f_, f_, _t, _t, _t, _t, _t, _t, f_, f_}, //  4
+            {f_, f_, f_, _t, f_, f_, f_, _t, f_, f_, _t, _t, f_, f_, _t, _t, _t, _t, _t, _t, f_, f_}, //  5
+            {f_, f_, f_, _t, _t, _t, f_, _t, f_, f_, _t, _t, f_, f_, _t, _t, _t, _t, _t, _t, f_, f_}, //  6
+            {f_, f_, f_, _t, f_, f_, f_, f_, f_, f_, _t, _t, f_, f_, _t, _t, _t, _t, _t, _t, f_, f_}, //  7
+            {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, _t, _t, f_, f_, _t, _t, _t, _t, _t, _t, f_, f_}, //  8
+            {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, _t, _t, f_, f_, _t, _t, _t, _t, _t, _t, f_, f_}, //  9
+            {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, _t, _t, f_, f_}, // 10
+            {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, _t, f_, f_, f_, f_, f_, f_, f_, _t, _t, f_, f_}, // 11
+            {f_, f_, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, f_, f_, _t, _t, _t, _t, _t, _t, f_, f_}, // 12
+            {f_, f_, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, f_, _t, _t, _t, _t, _t, _t, f_, f_}, // 13
+            {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, _t, _t, f_, f_, f_, _t, f_, f_, _t, _t, f_, f_}, // 14
+            {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, _t, _t, f_, f_, f_, f_, f_, f_, _t, _t, f_, f_}, // 15
+            {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, _t, _t, f_, f_, _t, _t, f_, f_, _t, _t, f_, f_}, // 16
+            {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, _t, _t, f_, f_, _t, _t, _t, f_, _t, _t, f_, f_}, // 17
+            {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, _t, f_, f_}, // 18
+            {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_}, // 19
+            {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_}, // 20
+            {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_}, // 21
+        };
+
+        SECTION("compares unordered")
+        {
+            std::vector<std::vector<bool>> expected =
+            {
+                //0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15  16  17  18  19  20  21
+                {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, _t, _t}, //  0
+                {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, _t, _t}, //  1
+                {f_, f_, f_, f_, f_, f_, f_, f_, _t, _t, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, _t, _t}, //  2
+                {f_, f_, f_, f_, f_, f_, f_, f_, _t, _t, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, _t, _t}, //  3
+                {f_, f_, f_, f_, f_, f_, f_, f_, _t, _t, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, _t, _t}, //  4
+                {f_, f_, f_, f_, f_, f_, f_, f_, _t, _t, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, _t, _t}, //  5
+                {f_, f_, f_, f_, f_, f_, f_, f_, _t, _t, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, _t, _t}, //  6
+                {f_, f_, f_, f_, f_, f_, f_, f_, _t, _t, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, _t, _t}, //  7
+                {f_, f_, _t, _t, _t, _t, _t, _t, _t, _t, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, _t, _t}, //  8
+                {f_, f_, _t, _t, _t, _t, _t, _t, _t, _t, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, _t, _t}, //  9
+                {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, _t, _t}, // 10
+                {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, _t, _t}, // 11
+                {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, _t, _t}, // 12
+                {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, _t, _t}, // 13
+                {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, _t, _t}, // 14
+                {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, _t, _t}, // 15
+                {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, _t, _t}, // 16
+                {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, _t, _t}, // 17
+                {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, _t, _t}, // 18
+                {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, _t, _t}, // 19
+                {_t, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t}, // 20
+                {_t, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t, _t}, // 21
+            };
+
+            // check if two values compare unordered as expected
+            REQUIRE(expected.size() == j_values.size());
+            for (size_t i = 0; i < j_values.size(); ++i)
+            {
+                REQUIRE(expected[i].size() == j_values.size());
+                for (size_t j = 0; j < j_values.size(); ++j)
+                {
+                    CAPTURE(i)
+                    CAPTURE(j)
+                    CHECK(json::compares_unordered(j_values[i], j_values[j]) == expected[i][j]);
+                }
+            }
+        }
+
+#if JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+        SECTION("compares unordered (inverse)")
+        {
+            std::vector<std::vector<bool>> expected =
+            {
+                //0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15  16  17  18  19  20  21
+                {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_}, //  0
+                {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_}, //  1
+                {f_, f_, f_, f_, f_, f_, f_, f_, _t, _t, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_}, //  2
+                {f_, f_, f_, f_, f_, f_, f_, f_, _t, _t, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_}, //  3
+                {f_, f_, f_, f_, f_, f_, f_, f_, _t, _t, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_}, //  4
+                {f_, f_, f_, f_, f_, f_, f_, f_, _t, _t, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_}, //  5
+                {f_, f_, f_, f_, f_, f_, f_, f_, _t, _t, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_}, //  6
+                {f_, f_, f_, f_, f_, f_, f_, f_, _t, _t, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_}, //  7
+                {f_, f_, _t, _t, _t, _t, _t, _t, _t, _t, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_}, //  8
+                {f_, f_, _t, _t, _t, _t, _t, _t, _t, _t, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_}, //  9
+                {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_}, // 10
+                {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_}, // 11
+                {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_}, // 12
+                {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_}, // 13
+                {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_}, // 14
+                {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_}, // 15
+                {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_}, // 16
+                {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_}, // 17
+                {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_}, // 18
+                {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_}, // 19
+                {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_}, // 20
+                {f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_, f_}, // 21
+            };
+
+            // check that two values compare unordered as expected (with legacy-mode enabled)
+            REQUIRE(expected.size() == j_values.size());
+            for (size_t i = 0; i < j_values.size(); ++i)
+            {
+                REQUIRE(expected[i].size() == j_values.size());
+                for (size_t j = 0; j < j_values.size(); ++j)
+                {
+                    CAPTURE(i)
+                    CAPTURE(j)
+                    CAPTURE(j_values[i])
+                    CAPTURE(j_values[j])
+                    CHECK(json::compares_unordered(j_values[i], j_values[j], true) == expected[i][j]);
+                }
+            }
+        }
+#endif
+
+        SECTION("comparison: equal")
+        {
+            // check that two values compare equal
+            REQUIRE(expected_eq.size() == j_values.size());
+            for (size_t i = 0; i < j_values.size(); ++i)
+            {
+                REQUIRE(expected_eq[i].size() == j_values.size());
+                for (size_t j = 0; j < j_values.size(); ++j)
+                {
+                    CAPTURE(i)
+                    CAPTURE(j)
+                    CHECK((j_values[i] == j_values[j]) == expected_eq[i][j]);
+                }
+            }
+
+            // compare with null pointer
+            json j_null;
+            CHECK(j_null == nullptr);
+            CHECK(nullptr == j_null);
+        }
+
+        SECTION("comparison: not equal")
+        {
+            // check that two values compare unequal as expected
+            for (size_t i = 0; i < j_values.size(); ++i)
+            {
+                for (size_t j = 0; j < j_values.size(); ++j)
+                {
+                    CAPTURE(i)
+                    CAPTURE(j)
+
+                    if (json::compares_unordered(j_values[i], j_values[j], true))
+                    {
+                        // if two values compare unordered,
+                        // check that the boolean comparison result is always false
+                        CHECK_FALSE(j_values[i] != j_values[j]);
+                    }
+                    else
+                    {
+                        // otherwise, check that they compare according to their definition
+                        // as the inverse of equal
+                        CHECK((j_values[i] != j_values[j]) == !(j_values[i] == j_values[j]));
+                    }
+                }
+            }
+
+            // compare with null pointer
+            const json j_null;
+            CHECK((j_null != nullptr) == false);
+            CHECK((nullptr != j_null) == false);
+            CHECK((j_null != nullptr) == !(j_null == nullptr));
+            CHECK((nullptr != j_null) == !(nullptr == j_null));
+        }
+
+        SECTION("comparison: less")
+        {
+            // check that two values compare less than as expected
+            REQUIRE(expected_lt.size() == j_values.size());
+            for (size_t i = 0; i < j_values.size(); ++i)
+            {
+                REQUIRE(expected_lt[i].size() == j_values.size());
+                for (size_t j = 0; j < j_values.size(); ++j)
+                {
+                    CAPTURE(i)
+                    CAPTURE(j)
+                    CHECK((j_values[i] < j_values[j]) == expected_lt[i][j]);
+                }
+            }
+        }
+
+        SECTION("comparison: less than or equal equal")
+        {
+            // check that two values compare less than or equal as expected
+            for (size_t i = 0; i < j_values.size(); ++i)
+            {
+                for (size_t j = 0; j < j_values.size(); ++j)
+                {
+                    CAPTURE(i)
+                    CAPTURE(j)
+                    if (json::compares_unordered(j_values[i], j_values[j], true))
+                    {
+                        // if two values compare unordered,
+                        // check that the boolean comparison result is always false
+                        CHECK_FALSE(j_values[i] <= j_values[j]);
+                    }
+                    else
+                    {
+                        // otherwise, check that they compare according to their definition
+                        // as the inverse of less than with the operand order reversed
+                        CHECK((j_values[i] <= j_values[j]) == !(j_values[j] < j_values[i]));
+                    }
+                }
+            }
+        }
+
+        SECTION("comparison: greater than")
+        {
+            // check that two values compare greater than as expected
+            for (size_t i = 0; i < j_values.size(); ++i)
+            {
+                for (size_t j = 0; j < j_values.size(); ++j)
+                {
+                    CAPTURE(i)
+                    CAPTURE(j)
+                    if (json::compares_unordered(j_values[i], j_values[j]))
+                    {
+                        // if two values compare unordered,
+                        // check that the boolean comparison result is always false
+                        CHECK_FALSE(j_values[i] > j_values[j]);
+                    }
+                    else
+                    {
+                        // otherwise, check that they compare according to their definition
+                        // as the inverse of less than or equal which is defined as
+                        // the inverse of less than with the operand order reversed
+                        CHECK((j_values[i] > j_values[j]) == !(j_values[i] <= j_values[j]));
+                        CHECK((j_values[i] > j_values[j]) == !!(j_values[j] < j_values[i]));
+                    }
+                }
+            }
+        }
+
+        SECTION("comparison: greater than or equal")
+        {
+            // check that two values compare greater than or equal as expected
+            for (size_t i = 0; i < j_values.size(); ++i)
+            {
+                for (size_t j = 0; j < j_values.size(); ++j)
+                {
+                    CAPTURE(i)
+                    CAPTURE(j)
+                    if (json::compares_unordered(j_values[i], j_values[j], true))
+                    {
+                        // if two values compare unordered,
+                        // check that the boolean result is always false
+                        CHECK_FALSE(j_values[i] >= j_values[j]);
+                    }
+                    else
+                    {
+                        // otherwise, check that they compare according to their definition
+                        // as the inverse of less than
+                        CHECK((j_values[i] >= j_values[j]) == !(j_values[i] < j_values[j]));
+                    }
+                }
+            }
+        }
+
+#if JSON_HAS_THREE_WAY_COMPARISON
+        // JSON_HAS_CPP_20 (do not remove; see note at top of file)
+        SECTION("comparison: 3-way")
+        {
+            std::vector<std::vector<std::partial_ordering>> expected =
+            {
+                //0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15  16  17  18  19  20  21
+                {eq, eq, lt, lt, lt, lt, lt, lt, lt, lt, lt, lt, lt, lt, lt, lt, lt, lt, lt, lt, un, un}, //  0
+                {eq, eq, lt, lt, lt, lt, lt, lt, lt, lt, lt, lt, lt, lt, lt, lt, lt, lt, lt, lt, un, un}, //  1
+                {gt, gt, eq, lt, lt, lt, lt, lt, un, un, lt, lt, gt, gt, lt, lt, lt, lt, lt, lt, un, un}, //  2
+                {gt, gt, gt, eq, gt, gt, gt, gt, un, un, lt, lt, gt, gt, lt, lt, lt, lt, lt, lt, un, un}, //  3
+                {gt, gt, gt, lt, eq, lt, gt, lt, un, un, lt, lt, gt, gt, lt, lt, lt, lt, lt, lt, un, un}, //  4
+                {gt, gt, gt, lt, gt, eq, gt, lt, un, un, lt, lt, gt, gt, lt, lt, lt, lt, lt, lt, un, un}, //  5
+                {gt, gt, gt, lt, lt, lt, eq, lt, un, un, lt, lt, gt, gt, lt, lt, lt, lt, lt, lt, un, un}, //  6
+                {gt, gt, gt, lt, gt, gt, gt, eq, un, un, lt, lt, gt, gt, lt, lt, lt, lt, lt, lt, un, un}, //  7
+                {gt, gt, un, un, un, un, un, un, un, un, lt, lt, gt, gt, lt, lt, lt, lt, lt, lt, un, un}, //  8
+                {gt, gt, un, un, un, un, un, un, un, un, lt, lt, gt, gt, lt, lt, lt, lt, lt, lt, un, un}, //  9
+                {gt, gt, gt, gt, gt, gt, gt, gt, gt, gt, eq, gt, gt, gt, gt, gt, gt, gt, lt, lt, un, un}, // 10
+                {gt, gt, gt, gt, gt, gt, gt, gt, gt, gt, lt, eq, gt, gt, gt, gt, gt, gt, lt, lt, un, un}, // 11
+                {gt, gt, lt, lt, lt, lt, lt, lt, lt, lt, lt, lt, eq, gt, lt, lt, lt, lt, lt, lt, un, un}, // 12
+                {gt, gt, lt, lt, lt, lt, lt, lt, lt, lt, lt, lt, lt, eq, lt, lt, lt, lt, lt, lt, un, un}, // 13
+                {gt, gt, gt, gt, gt, gt, gt, gt, gt, gt, lt, lt, gt, gt, eq, lt, gt, gt, lt, lt, un, un}, // 14
+                {gt, gt, gt, gt, gt, gt, gt, gt, gt, gt, lt, lt, gt, gt, gt, eq, gt, gt, lt, lt, un, un}, // 15
+                {gt, gt, gt, gt, gt, gt, gt, gt, gt, gt, lt, lt, gt, gt, lt, lt, eq, gt, lt, lt, un, un}, // 16
+                {gt, gt, gt, gt, gt, gt, gt, gt, gt, gt, lt, lt, gt, gt, lt, lt, lt, eq, lt, lt, un, un}, // 17
+                {gt, gt, gt, gt, gt, gt, gt, gt, gt, gt, gt, gt, gt, gt, gt, gt, gt, gt, eq, lt, un, un}, // 18
+                {gt, gt, gt, gt, gt, gt, gt, gt, gt, gt, gt, gt, gt, gt, gt, gt, gt, gt, gt, eq, un, un}, // 19
+                {un, un, un, un, un, un, un, un, un, un, un, un, un, un, un, un, un, un, un, un, un, un}, // 20
+                {un, un, un, un, un, un, un, un, un, un, un, un, un, un, un, un, un, un, un, un, un, un}, // 21
+            };
+
+            // check expected partial_ordering against expected booleans
+            REQUIRE(expected.size() == expected_eq.size());
+            REQUIRE(expected.size() == expected_lt.size());
+            for (size_t i = 0; i < expected.size(); ++i)
+            {
+                REQUIRE(expected[i].size() == expected_eq[i].size());
+                REQUIRE(expected[i].size() == expected_lt[i].size());
+                for (size_t j = 0; j < expected[i].size(); ++j)
+                {
+                    CAPTURE(i)
+                    CAPTURE(j)
+                    CHECK(std::is_eq(expected[i][j]) == expected_eq[i][j]);
+                    CHECK(std::is_lt(expected[i][j]) == expected_lt[i][j]);
+                    if (std::is_gt(expected[i][j]))
+                    {
+                        CHECK((!expected_eq[i][j] && !expected_lt[i][j]));
+                    }
+                }
+            }
+
+            // check that two values compare according to their expected ordering
+            REQUIRE(expected.size() == j_values.size());
+            for (size_t i = 0; i < j_values.size(); ++i)
+            {
+                REQUIRE(expected[i].size() == j_values.size());
+                for (size_t j = 0; j < j_values.size(); ++j)
+                {
+                    CAPTURE(i)
+                    CAPTURE(j)
+                    CHECK((j_values[i] <=> j_values[j]) == expected[i][j]); // *NOPAD*
+                }
+            }
+        }
+#endif
+    }
+
+#if JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+    SECTION("parser callback regression")
+    {
+        SECTION("filter specific element")
+        {
+            const auto* s_object = R"(
+                {
+                    "foo": 2,
+                    "bar": {
+                        "baz": 1
+                    }
+                }
+            )";
+            const auto* s_array = R"(
+                [1,2,[3,4,5],4,5]
+            )";
+
+            json j_object = json::parse(s_object, [](int /*unused*/, json::parse_event_t /*unused*/, const json & j) noexcept
+            {
+                // filter all number(2) elements
+                return j != json(2);
+            });
+
+            CHECK (j_object == json({{"bar", {{"baz", 1}}}}));
+
+            json j_array = json::parse(s_array, [](int /*unused*/, json::parse_event_t /*unused*/, const json & j) noexcept
+            {
+                return j != json(2);
+            });
+
+            CHECK (j_array == json({1, {3, 4, 5}, 4, 5}));
+        }
+    }
+#endif
+}
diff --git a/external_imported/json/test/src/unit-concepts.cpp b/external_imported/json/tests/src/unit-concepts.cpp
similarity index 77%
rename from external_imported/json/test/src/unit-concepts.cpp
rename to external_imported/json/tests/src/unit-concepts.cpp
index deffc9a40..e04299184 100644
--- a/external_imported/json/test/src/unit-concepts.cpp
+++ b/external_imported/json/tests/src/unit-concepts.cpp
@@ -1,31 +1,10 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
 
 #include "doctest_compatibility.h"
 
@@ -78,7 +57,7 @@ TEST_CASE("concepts")
 
         // the expression "X u" has the post-condition "u.empty()"
         {
-            json u;
+            const json u;
             CHECK(u.empty());
         }
 
diff --git a/external_imported/json/tests/src/unit-constructor1.cpp b/external_imported/json/tests/src/unit-constructor1.cpp
new file mode 100644
index 000000000..bbd576057
--- /dev/null
+++ b/external_imported/json/tests/src/unit-constructor1.cpp
@@ -0,0 +1,1581 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+#define JSON_TESTS_PRIVATE
+#include <nlohmann/json.hpp>
+using nlohmann::json;
+
+#include <deque>
+#include <forward_list>
+#include <fstream>
+#include <list>
+#include <set>
+#include <unordered_map>
+#include <unordered_set>
+#include <valarray>
+
+TEST_CASE("constructors")
+{
+    SECTION("create an empty value with a given type")
+    {
+        SECTION("null")
+        {
+            auto const t = json::value_t::null;
+            json const j(t);
+            CHECK(j.type() == t);
+        }
+
+        SECTION("discarded")
+        {
+            auto const t = json::value_t::discarded;
+            json const j(t);
+            CHECK(j.type() == t);
+        }
+
+        SECTION("object")
+        {
+            auto const t = json::value_t::object;
+            json const j(t);
+            CHECK(j.type() == t);
+        }
+
+        SECTION("array")
+        {
+            auto const t = json::value_t::array;
+            json const j(t);
+            CHECK(j.type() == t);
+        }
+
+        SECTION("boolean")
+        {
+            auto const t = json::value_t::boolean;
+            json const j(t);
+            CHECK(j.type() == t);
+            CHECK(j == false);
+        }
+
+        SECTION("string")
+        {
+            auto const t = json::value_t::string;
+            json const j(t);
+            CHECK(j.type() == t);
+            CHECK(j == "");
+        }
+
+        SECTION("number_integer")
+        {
+            auto const t = json::value_t::number_integer;
+            json const j(t);
+            CHECK(j.type() == t);
+            CHECK(j == 0);
+        }
+
+        SECTION("number_unsigned")
+        {
+            auto const t = json::value_t::number_unsigned;
+            json const j(t);
+            CHECK(j.type() == t);
+            CHECK(j == 0);
+        }
+
+        SECTION("number_float")
+        {
+            auto const t = json::value_t::number_float;
+            json const j(t);
+            CHECK(j.type() == t);
+            CHECK(j == 0.0);
+        }
+
+        SECTION("binary")
+        {
+            auto const t = json::value_t::binary;
+            json const j(t);
+            CHECK(j.type() == t);
+            CHECK(j == json::binary({}));
+        }
+    }
+
+    SECTION("create a null object (implicitly)")
+    {
+        SECTION("no parameter")
+        {
+            json const j{};
+            CHECK(j.type() == json::value_t::null);
+        }
+    }
+
+    SECTION("create a null object (explicitly)")
+    {
+        SECTION("parameter")
+        {
+            json const j(nullptr);
+            CHECK(j.type() == json::value_t::null);
+        }
+    }
+
+    SECTION("create an object (explicit)")
+    {
+        SECTION("empty object")
+        {
+            json::object_t const o{};
+            json const j(o);
+            CHECK(j.type() == json::value_t::object);
+        }
+
+        SECTION("filled object")
+        {
+            json::object_t const o {{"a", json(1)}, {"b", json(1u)}, {"c", json(2.2)}, {"d", json(false)}, {"e", json("string")}, {"f", json()}};
+            json const j(o);
+            CHECK(j.type() == json::value_t::object);
+        }
+    }
+
+    SECTION("create an object (implicit)")
+    {
+        // reference object
+        json::object_t const o_reference {{"a", json(1)}, {"b", json(1u)}, {"c", json(2.2)}, {"d", json(false)}, {"e", json("string")}, {"f", json()}};
+        json const j_reference(o_reference);
+
+        SECTION("std::map<json::string_t, json>")
+        {
+            std::map<json::string_t, json> const o {{"a", json(1)}, {"b", json(1u)}, {"c", json(2.2)}, {"d", json(false)}, {"e", json("string")}, {"f", json()}};
+            json const j(o);
+            CHECK(j.type() == json::value_t::object);
+            CHECK(j == j_reference);
+        }
+
+        SECTION("std::map<std::string, std::string> #600")
+        {
+            const std::map<std::string, std::string> m
+            {
+                {"a", "b"},
+                {"c", "d"},
+                {"e", "f"},
+            };
+
+            json const j(m);
+            CHECK((j.get<decltype(m)>() == m));
+        }
+
+        SECTION("std::map<const char*, json>")
+        {
+            std::map<const char*, json> const o {{"a", json(1)}, {"b", json(1u)}, {"c", json(2.2)}, {"d", json(false)}, {"e", json("string")}, {"f", json()}};
+            json const j(o);
+            CHECK(j.type() == json::value_t::object);
+            CHECK(j == j_reference);
+        }
+
+        SECTION("std::multimap<json::string_t, json>")
+        {
+            std::multimap<json::string_t, json> const o {{"a", json(1)}, {"b", json(1u)}, {"c", json(2.2)}, {"d", json(false)}, {"e", json("string")}, {"f", json()}};
+            json const j(o);
+            CHECK(j.type() == json::value_t::object);
+            CHECK(j == j_reference);
+        }
+
+        SECTION("std::unordered_map<json::string_t, json>")
+        {
+            std::unordered_map<json::string_t, json> const o {{"a", json(1)}, {"b", json(1u)}, {"c", json(2.2)}, {"d", json(false)}, {"e", json("string")}, {"f", json()}};
+            json const j(o);
+            CHECK(j.type() == json::value_t::object);
+            CHECK(j == j_reference);
+        }
+
+        SECTION("std::unordered_multimap<json::string_t, json>")
+        {
+            std::unordered_multimap<json::string_t, json> const o {{"a", json(1)}, {"b", json(1u)}, {"c", json(2.2)}, {"d", json(false)}, {"e", json("string")}, {"f", json()}};
+            json const j(o);
+            CHECK(j.type() == json::value_t::object);
+            CHECK(j == j_reference);
+        }
+
+        SECTION("associative container literal")
+        {
+            json const j({{"a", json(1)}, {"b", json(1u)}, {"c", json(2.2)}, {"d", json(false)}, {"e", json("string")}, {"f", json()}});
+            CHECK(j.type() == json::value_t::object);
+            CHECK(j == j_reference);
+        }
+    }
+
+    SECTION("create an array (explicit)")
+    {
+        SECTION("empty array")
+        {
+            json::array_t const a{};
+            json const j(a);
+            CHECK(j.type() == json::value_t::array);
+        }
+
+        SECTION("filled array")
+        {
+            json::array_t const a {json(1), json(1u), json(2.2), json(false), json("string"), json()};
+            json const j(a);
+            CHECK(j.type() == json::value_t::array);
+        }
+    }
+
+    SECTION("create an array (implicit)")
+    {
+        // reference array
+        json::array_t const a_reference {json(1), json(1u), json(2.2), json(false), json("string"), json()};
+        json const j_reference(a_reference);
+
+        SECTION("std::list<json>")
+        {
+            std::list<json> const a {json(1), json(1u), json(2.2), json(false), json("string"), json()};
+            json const j(a);
+            CHECK(j.type() == json::value_t::array);
+            CHECK(j == j_reference);
+        }
+
+        SECTION("std::pair")
+        {
+            std::pair<float, std::string> const p{1.0f, "string"};
+            json const j(p);
+
+            CHECK(j.type() == json::value_t::array);
+            CHECK(j.get<decltype(p)>() == p);
+            REQUIRE(j.size() == 2);
+            CHECK(j[0] == std::get<0>(p));
+            CHECK(j[1] == std::get<1>(p));
+        }
+
+        SECTION("std::pair with discarded values")
+        {
+            json const j{1, 2.0, "string"};
+
+            const auto p = j.get<std::pair<int, float>>();
+            CHECK(p.first == j[0]);
+            CHECK(p.second == j[1]);
+        }
+
+        SECTION("std::tuple")
+        {
+            const auto t = std::make_tuple(1.0, std::string{"string"}, 42, std::vector<int> {0, 1});
+            json const j(t);
+
+            CHECK(j.type() == json::value_t::array);
+            REQUIRE(j.size() == 4);
+            CHECK(j.get<decltype(t)>() == t);
+            CHECK(j[0] == std::get<0>(t));
+            CHECK(j[1] == std::get<1>(t));
+            CHECK(j[2] == std::get<2>(t));
+            CHECK(j[3][0] == 0);
+            CHECK(j[3][1] == 1);
+        }
+
+        SECTION("std::tuple with discarded values")
+        {
+            json const j{1, 2.0, "string", 42};
+
+            const auto t = j.get<std::tuple<int, float, std::string>>();
+            CHECK(std::get<0>(t) == j[0]);
+            CHECK(std::get<1>(t) == j[1]);
+            // CHECK(std::get<2>(t) == j[2]); // commented out due to CI issue, see https://github.com/nlohmann/json/pull/3985 and https://github.com/nlohmann/json/issues/4025
+        }
+
+        SECTION("std::pair/tuple/array failures")
+        {
+            json const j{1};
+
+            CHECK_THROWS_WITH_AS((j.get<std::pair<int, int>>()), "[json.exception.out_of_range.401] array index 1 is out of range", json::out_of_range&);
+            CHECK_THROWS_WITH_AS((j.get<std::tuple<int, int>>()), "[json.exception.out_of_range.401] array index 1 is out of range", json::out_of_range&);
+            CHECK_THROWS_WITH_AS((j.get<std::array<int, 3>>()), "[json.exception.out_of_range.401] array index 1 is out of range", json::out_of_range&);
+        }
+
+        SECTION("std::forward_list<json>")
+        {
+            std::forward_list<json> const a {json(1), json(1u), json(2.2), json(false), json("string"), json()};
+            json const j(a);
+            CHECK(j.type() == json::value_t::array);
+            CHECK(j == j_reference);
+        }
+
+        SECTION("std::array<json, 6>")
+        {
+            std::array<json, 6> const a {{json(1), json(1u), json(2.2), json(false), json("string"), json()}};
+            json const j(a);
+            CHECK(j.type() == json::value_t::array);
+            CHECK(j == j_reference);
+
+            const auto a2 = j.get<std::array<json, 6>>();
+            CHECK(a2 == a);
+        }
+
+        SECTION("std::valarray<int>")
+        {
+            std::valarray<int> const va = {1, 2, 3, 4, 5};
+            json const j(va);
+            CHECK(j.type() == json::value_t::array);
+            CHECK(j == json({1, 2, 3, 4, 5}));
+
+            auto jva = j.get<std::valarray<int>>();
+            CHECK(jva.size() == va.size());
+            for (size_t i = 0; i < jva.size(); ++i)
+            {
+                CHECK(va[i] == jva[i]);
+            }
+        }
+
+        SECTION("std::valarray<double>")
+        {
+            std::valarray<double> const va = {1.2, 2.3, 3.4, 4.5, 5.6};
+            json const j(va);
+            CHECK(j.type() == json::value_t::array);
+            CHECK(j == json({1.2, 2.3, 3.4, 4.5, 5.6}));
+
+            auto jva = j.get<std::valarray<double>>();
+            CHECK(jva.size() == va.size());
+            for (size_t i = 0; i < jva.size(); ++i)
+            {
+                CHECK(va[i] == jva[i]);
+            }
+        }
+
+        SECTION("std::vector<json>")
+        {
+            std::vector<json> const a {json(1), json(1u), json(2.2), json(false), json("string"), json()};
+            json const j(a);
+            CHECK(j.type() == json::value_t::array);
+            CHECK(j == j_reference);
+        }
+
+        SECTION("std::deque<json>")
+        {
+            std::deque<json> const a {json(1), json(1u), json(2.2), json(false), json("string"), json()};
+            json const j(a);
+            CHECK(j.type() == json::value_t::array);
+            CHECK(j == j_reference);
+        }
+
+        SECTION("std::set<json>")
+        {
+            std::set<json> const a {json(1), json(1u), json(2.2), json(false), json("string"), json()};
+            json const j(a);
+            CHECK(j.type() == json::value_t::array);
+            // we cannot really check for equality here
+        }
+
+        SECTION("std::unordered_set<json>")
+        {
+            std::unordered_set<json> const a {json(1), json(1u), json(2.2), json(false), json("string"), json()};
+            json const j(a);
+            CHECK(j.type() == json::value_t::array);
+            // we cannot really check for equality here
+        }
+
+        SECTION("sequence container literal")
+        {
+            json const j({json(1), json(1u), json(2.2), json(false), json("string"), json()});
+            CHECK(j.type() == json::value_t::array);
+            CHECK(j == j_reference);
+        }
+    }
+
+    SECTION("create a string (explicit)")
+    {
+        SECTION("empty string")
+        {
+            json::string_t const s{};
+            json const j(s);
+            CHECK(j.type() == json::value_t::string);
+        }
+
+        SECTION("filled string")
+        {
+            json::string_t const s {"Hello world"};
+            json const j(s);
+            CHECK(j.type() == json::value_t::string);
+        }
+    }
+
+    SECTION("create a string (implicit)")
+    {
+        // reference string
+        json::string_t const s_reference {"Hello world"};
+        json const j_reference(s_reference);
+
+        SECTION("std::string")
+        {
+            std::string const s {"Hello world"};
+            json const j(s);
+            CHECK(j.type() == json::value_t::string);
+            CHECK(j == j_reference);
+        }
+
+        SECTION("char[]")
+        {
+            char const s[] {"Hello world"}; // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+            json const j(s);
+            CHECK(j.type() == json::value_t::string);
+            CHECK(j == j_reference);
+        }
+
+        SECTION("const char*")
+        {
+            const char* s {"Hello world"};
+            json const j(s);
+            CHECK(j.type() == json::value_t::string);
+            CHECK(j == j_reference);
+        }
+
+        SECTION("string literal")
+        {
+            json const j("Hello world");
+            CHECK(j.type() == json::value_t::string);
+            CHECK(j == j_reference);
+        }
+    }
+
+    SECTION("create a boolean (explicit)")
+    {
+        SECTION("empty boolean")
+        {
+            json::boolean_t const b{};
+            json const j(b);
+            CHECK(j.type() == json::value_t::boolean);
+        }
+
+        SECTION("filled boolean (true)")
+        {
+            json const j(true);
+            CHECK(j.type() == json::value_t::boolean);
+        }
+
+        SECTION("filled boolean (false)")
+        {
+            json const j(false);
+            CHECK(j.type() == json::value_t::boolean);
+        }
+
+        SECTION("from std::vector<bool>::reference")
+        {
+            std::vector<bool> v{true};
+            json const j(v[0]);
+            CHECK(std::is_same<decltype(v[0]), std::vector<bool>::reference>::value);
+            CHECK(j.type() == json::value_t::boolean);
+        }
+
+        SECTION("from std::vector<bool>::const_reference")
+        {
+            const std::vector<bool> v{true};
+            json const j(v[0]);
+            CHECK(std::is_same<decltype(v[0]), std::vector<bool>::const_reference>::value);
+            CHECK(j.type() == json::value_t::boolean);
+        }
+    }
+
+    SECTION("create a binary (explicit)")
+    {
+        SECTION("empty binary")
+        {
+            json::binary_t const b{};
+            json const j(b);
+            CHECK(j.type() == json::value_t::binary);
+        }
+
+        SECTION("filled binary")
+        {
+            json::binary_t const b({1, 2, 3});
+            json const j(b);
+            CHECK(j.type() == json::value_t::binary);
+        }
+    }
+
+    SECTION("create an integer number (explicit)")
+    {
+        SECTION("uninitialized value")
+        {
+            json::number_integer_t const n{};
+            json const j(n);
+            CHECK(j.type() == json::value_t::number_integer);
+        }
+
+        SECTION("initialized value")
+        {
+            json::number_integer_t const n(42);
+            json const j(n);
+            CHECK(j.type() == json::value_t::number_integer);
+        }
+    }
+
+    SECTION("create an integer number (implicit)")
+    {
+        // reference objects
+        json::number_integer_t const n_reference = 42;
+        json const j_reference(n_reference);
+        json::number_unsigned_t const n_unsigned_reference = 42;
+        json const j_unsigned_reference(n_unsigned_reference);
+
+        SECTION("short")
+        {
+            short const n = 42;
+            json const j(n);
+            CHECK(j.type() == json::value_t::number_integer);
+            CHECK(j == j_reference);
+        }
+
+        SECTION("unsigned short")
+        {
+            unsigned short const n = 42;
+            json const j(n);
+            CHECK(j.type() == json::value_t::number_unsigned);
+            CHECK(j == j_unsigned_reference);
+        }
+
+        SECTION("int")
+        {
+            int const n = 42;
+            json const j(n);
+            CHECK(j.type() == json::value_t::number_integer);
+            CHECK(j == j_reference);
+        }
+
+        SECTION("unsigned int")
+        {
+            unsigned int const n = 42;
+            json const j(n);
+            CHECK(j.type() == json::value_t::number_unsigned);
+            CHECK(j == j_unsigned_reference);
+        }
+
+        SECTION("long")
+        {
+            long const n = 42;
+            json const j(n);
+            CHECK(j.type() == json::value_t::number_integer);
+            CHECK(j == j_reference);
+        }
+
+        SECTION("unsigned long")
+        {
+            unsigned long const n = 42;
+            json const j(n);
+            CHECK(j.type() == json::value_t::number_unsigned);
+            CHECK(j == j_unsigned_reference);
+        }
+
+        SECTION("long long")
+        {
+            long long const n = 42;
+            json const j(n);
+            CHECK(j.type() == json::value_t::number_integer);
+            CHECK(j == j_reference);
+        }
+
+        SECTION("unsigned long long")
+        {
+            unsigned long long const n = 42;
+            json const j(n);
+            CHECK(j.type() == json::value_t::number_unsigned);
+            CHECK(j == j_unsigned_reference);
+        }
+
+        SECTION("int8_t")
+        {
+            int8_t const n = 42;
+            json const j(n);
+            CHECK(j.type() == json::value_t::number_integer);
+            CHECK(j == j_reference);
+        }
+
+        SECTION("int16_t")
+        {
+            int16_t const n = 42;
+            json const j(n);
+            CHECK(j.type() == json::value_t::number_integer);
+            CHECK(j == j_reference);
+        }
+
+        SECTION("int32_t")
+        {
+            int32_t const n = 42;
+            json const j(n);
+            CHECK(j.type() == json::value_t::number_integer);
+            CHECK(j == j_reference);
+        }
+
+        SECTION("int64_t")
+        {
+            int64_t const n = 42;
+            json const j(n);
+            CHECK(j.type() == json::value_t::number_integer);
+            CHECK(j == j_reference);
+        }
+
+        SECTION("int_fast8_t")
+        {
+            int_fast8_t const n = 42;
+            json const j(n);
+            CHECK(j.type() == json::value_t::number_integer);
+            CHECK(j == j_reference);
+        }
+
+        SECTION("int_fast16_t")
+        {
+            int_fast16_t const n = 42;
+            json const j(n);
+            CHECK(j.type() == json::value_t::number_integer);
+            CHECK(j == j_reference);
+        }
+
+        SECTION("int_fast32_t")
+        {
+            int_fast32_t const n = 42;
+            json const j(n);
+            CHECK(j.type() == json::value_t::number_integer);
+            CHECK(j == j_reference);
+        }
+
+        SECTION("int_fast64_t")
+        {
+            int_fast64_t const n = 42;
+            json const j(n);
+            CHECK(j.type() == json::value_t::number_integer);
+            CHECK(j == j_reference);
+        }
+
+        SECTION("int_least8_t")
+        {
+            int_least8_t const n = 42;
+            json const j(n);
+            CHECK(j.type() == json::value_t::number_integer);
+            CHECK(j == j_reference);
+        }
+
+        SECTION("int_least16_t")
+        {
+            int_least16_t const n = 42;
+            json const j(n);
+            CHECK(j.type() == json::value_t::number_integer);
+            CHECK(j == j_reference);
+        }
+
+        SECTION("int_least32_t")
+        {
+            int_least32_t const n = 42;
+            json const j(n);
+            CHECK(j.type() == json::value_t::number_integer);
+            CHECK(j == j_reference);
+        }
+
+        SECTION("int_least64_t")
+        {
+            int_least64_t const n = 42;
+            json const j(n);
+            CHECK(j.type() == json::value_t::number_integer);
+            CHECK(j == j_reference);
+        }
+
+        SECTION("uint8_t")
+        {
+            uint8_t const n = 42;
+            json const j(n);
+            CHECK(j.type() == json::value_t::number_unsigned);
+            CHECK(j == j_unsigned_reference);
+        }
+
+        SECTION("uint16_t")
+        {
+            uint16_t const n = 42;
+            json const j(n);
+            CHECK(j.type() == json::value_t::number_unsigned);
+            CHECK(j == j_unsigned_reference);
+        }
+
+        SECTION("uint32_t")
+        {
+            uint32_t const n = 42;
+            json const j(n);
+            CHECK(j.type() == json::value_t::number_unsigned);
+            CHECK(j == j_unsigned_reference);
+        }
+
+        SECTION("uint64_t")
+        {
+            uint64_t const n = 42;
+            json const j(n);
+            CHECK(j.type() == json::value_t::number_unsigned);
+            CHECK(j == j_unsigned_reference);
+        }
+
+        SECTION("uint_fast8_t")
+        {
+            uint_fast8_t const n = 42;
+            json const j(n);
+            CHECK(j.type() == json::value_t::number_unsigned);
+            CHECK(j == j_unsigned_reference);
+        }
+
+        SECTION("uint_fast16_t")
+        {
+            uint_fast16_t const n = 42;
+            json const j(n);
+            CHECK(j.type() == json::value_t::number_unsigned);
+            CHECK(j == j_unsigned_reference);
+        }
+
+        SECTION("uint_fast32_t")
+        {
+            uint_fast32_t const n = 42;
+            json const j(n);
+            CHECK(j.type() == json::value_t::number_unsigned);
+            CHECK(j == j_unsigned_reference);
+        }
+
+        SECTION("uint_fast64_t")
+        {
+            uint_fast64_t const n = 42;
+            json const j(n);
+            CHECK(j.type() == json::value_t::number_unsigned);
+            CHECK(j == j_unsigned_reference);
+        }
+
+        SECTION("uint_least8_t")
+        {
+            uint_least8_t const n = 42;
+            json const j(n);
+            CHECK(j.type() == json::value_t::number_unsigned);
+            CHECK(j == j_unsigned_reference);
+        }
+
+        SECTION("uint_least16_t")
+        {
+            uint_least16_t const n = 42;
+            json const j(n);
+            CHECK(j.type() == json::value_t::number_unsigned);
+            CHECK(j == j_unsigned_reference);
+        }
+
+        SECTION("uint_least32_t")
+        {
+            uint_least32_t const n = 42;
+            json const j(n);
+            CHECK(j.type() == json::value_t::number_unsigned);
+            CHECK(j == j_unsigned_reference);
+        }
+
+        SECTION("uint_least64_t")
+        {
+            uint_least64_t const n = 42;
+            json const j(n);
+            CHECK(j.type() == json::value_t::number_unsigned);
+            CHECK(j == j_unsigned_reference);
+        }
+
+        SECTION("integer literal without suffix")
+        {
+            json const j(42);
+            CHECK(j.type() == json::value_t::number_integer);
+            CHECK(j == j_reference);
+        }
+
+        SECTION("integer literal with u suffix")
+        {
+            json j(42u);
+            CHECK(j.type() == json::value_t::number_unsigned);
+            CHECK(j == j_unsigned_reference);
+        }
+
+        SECTION("integer literal with l suffix")
+        {
+            json const j(42L);
+            CHECK(j.type() == json::value_t::number_integer);
+            CHECK(j == j_reference);
+        }
+
+        SECTION("integer literal with ul suffix")
+        {
+            json j(42ul);
+            CHECK(j.type() == json::value_t::number_unsigned);
+            CHECK(j == j_unsigned_reference);
+        }
+
+        SECTION("integer literal with ll suffix")
+        {
+            json const j(42LL);
+            CHECK(j.type() == json::value_t::number_integer);
+            CHECK(j == j_reference);
+        }
+
+        SECTION("integer literal with ull suffix")
+        {
+            json j(42ull);
+            CHECK(j.type() == json::value_t::number_unsigned);
+            CHECK(j == j_unsigned_reference);
+        }
+    }
+
+    SECTION("create a floating-point number (explicit)")
+    {
+        SECTION("uninitialized value")
+        {
+            json::number_float_t const n{};
+            json const j(n);
+            CHECK(j.type() == json::value_t::number_float);
+        }
+
+        SECTION("initialized value")
+        {
+            json::number_float_t const n(42.23);
+            json const j(n);
+            CHECK(j.type() == json::value_t::number_float);
+        }
+
+        SECTION("NaN")
+        {
+            // NaN is stored properly, but serialized to null
+            json::number_float_t const n(std::numeric_limits<json::number_float_t>::quiet_NaN());
+            json const j(n);
+            CHECK(j.type() == json::value_t::number_float);
+
+            // check round trip of NaN
+            json::number_float_t const d{j};
+            CHECK((std::isnan(d) && std::isnan(n)) == true);
+
+            // check that NaN is serialized to null
+            CHECK(j.dump() == "null");
+        }
+
+        SECTION("infinity")
+        {
+            // infinity is stored properly, but serialized to null
+            json::number_float_t const n(std::numeric_limits<json::number_float_t>::infinity());
+            json const j(n);
+            CHECK(j.type() == json::value_t::number_float);
+
+            // check round trip of infinity
+            json::number_float_t const d{j};
+            CHECK(d == n);
+
+            // check that inf is serialized to null
+            CHECK(j.dump() == "null");
+        }
+    }
+
+    SECTION("create a floating-point number (implicit)")
+    {
+        // reference object
+        json::number_float_t const n_reference = 42.23;
+        json const j_reference(n_reference);
+
+        SECTION("float")
+        {
+            float const n = 42.23f;
+            json const j(n);
+            CHECK(j.type() == json::value_t::number_float);
+            CHECK(j.m_data.m_value.number_float == Approx(j_reference.m_data.m_value.number_float));
+        }
+
+        SECTION("double")
+        {
+            double const n = 42.23;
+            json const j(n);
+            CHECK(j.type() == json::value_t::number_float);
+            CHECK(j.m_data.m_value.number_float == Approx(j_reference.m_data.m_value.number_float));
+        }
+
+        SECTION("long double")
+        {
+            long double const n = 42.23L;
+            json const j(n);
+            CHECK(j.type() == json::value_t::number_float);
+            CHECK(j.m_data.m_value.number_float == Approx(j_reference.m_data.m_value.number_float));
+        }
+
+        SECTION("floating-point literal without suffix")
+        {
+            json const j(42.23);
+            CHECK(j.type() == json::value_t::number_float);
+            CHECK(j.m_data.m_value.number_float == Approx(j_reference.m_data.m_value.number_float));
+        }
+
+        SECTION("integer literal with f suffix")
+        {
+            json const j(42.23f);
+            CHECK(j.type() == json::value_t::number_float);
+            CHECK(j.m_data.m_value.number_float == Approx(j_reference.m_data.m_value.number_float));
+        }
+
+        SECTION("integer literal with l suffix")
+        {
+            json const j(42.23L);
+            CHECK(j.type() == json::value_t::number_float);
+            CHECK(j.m_data.m_value.number_float == Approx(j_reference.m_data.m_value.number_float));
+        }
+    }
+
+    SECTION("create a container (array or object) from an initializer list")
+    {
+        SECTION("empty initializer list")
+        {
+            SECTION("explicit")
+            {
+                json const j(json::initializer_list_t {});
+                CHECK(j.type() == json::value_t::object);
+            }
+
+            SECTION("implicit")
+            {
+                json const j {};
+                CHECK(j.type() == json::value_t::null);
+            }
+        }
+
+        SECTION("one element")
+        {
+            SECTION("array")
+            {
+                SECTION("explicit")
+                {
+                    json const j(json::initializer_list_t {json(json::array_t())});
+                    CHECK(j.type() == json::value_t::array);
+                }
+
+                SECTION("implicit")
+                {
+                    json const j {json::array_t()};
+                    CHECK(j.type() == json::value_t::array);
+                }
+            }
+
+            SECTION("object")
+            {
+                SECTION("explicit")
+                {
+                    json const j(json::initializer_list_t {json(json::object_t())});
+                    CHECK(j.type() == json::value_t::array);
+                }
+
+                SECTION("implicit")
+                {
+                    json const j {json::object_t()};
+                    CHECK(j.type() == json::value_t::array);
+                }
+            }
+
+            SECTION("string")
+            {
+                SECTION("explicit")
+                {
+                    json const j(json::initializer_list_t {json("Hello world")});
+                    CHECK(j.type() == json::value_t::array);
+                }
+
+                SECTION("implicit")
+                {
+                    json const j {"Hello world"};
+                    CHECK(j.type() == json::value_t::array);
+                }
+            }
+
+            SECTION("boolean")
+            {
+                SECTION("explicit")
+                {
+                    json const j(json::initializer_list_t {json(true)});
+                    CHECK(j.type() == json::value_t::array);
+                }
+
+                SECTION("implicit")
+                {
+                    json const j {true};
+                    CHECK(j.type() == json::value_t::array);
+                }
+            }
+
+            SECTION("number (integer)")
+            {
+                SECTION("explicit")
+                {
+                    json const j(json::initializer_list_t {json(1)});
+                    CHECK(j.type() == json::value_t::array);
+                }
+
+                SECTION("implicit")
+                {
+                    json const j {1};
+                    CHECK(j.type() == json::value_t::array);
+                }
+            }
+
+            SECTION("number (unsigned)")
+            {
+                SECTION("explicit")
+                {
+                    json const j(json::initializer_list_t {json(1u)});
+                    CHECK(j.type() == json::value_t::array);
+                }
+
+                SECTION("implicit")
+                {
+                    json const j {1u};
+                    CHECK(j.type() == json::value_t::array);
+                }
+            }
+
+            SECTION("number (floating-point)")
+            {
+                SECTION("explicit")
+                {
+                    json const j(json::initializer_list_t {json(42.23)});
+                    CHECK(j.type() == json::value_t::array);
+                }
+
+                SECTION("implicit")
+                {
+                    json const j {42.23};
+                    CHECK(j.type() == json::value_t::array);
+                }
+            }
+        }
+
+        SECTION("more elements")
+        {
+            SECTION("explicit")
+            {
+                json const j(json::initializer_list_t {1, 1u, 42.23, true, nullptr, json::object_t(), json::array_t()});
+                CHECK(j.type() == json::value_t::array);
+            }
+
+            SECTION("implicit")
+            {
+                json const j {1, 1u, 42.23, true, nullptr, json::object_t(), json::array_t()};
+                CHECK(j.type() == json::value_t::array);
+            }
+        }
+
+        SECTION("implicit type deduction")
+        {
+            SECTION("object")
+            {
+                json const j { {"one", 1}, {"two", 1u}, {"three", 2.2}, {"four", false} };
+                CHECK(j.type() == json::value_t::object);
+            }
+
+            SECTION("array")
+            {
+                json const j { {"one", 1}, {"two", 1u}, {"three", 2.2}, {"four", false}, 13 };
+                CHECK(j.type() == json::value_t::array);
+            }
+        }
+
+        SECTION("explicit type deduction")
+        {
+            SECTION("empty object")
+            {
+                json const j = json::object();
+                CHECK(j.type() == json::value_t::object);
+            }
+
+            SECTION("object")
+            {
+                json const j = json::object({ {"one", 1}, {"two", 1u}, {"three", 2.2}, {"four", false} });
+                CHECK(j.type() == json::value_t::object);
+            }
+
+            SECTION("object with error")
+            {
+                json _;
+                CHECK_THROWS_WITH_AS(_ = json::object({ {"one", 1}, {"two", 1u}, {"three", 2.2}, {"four", false}, 13 }), "[json.exception.type_error.301] cannot create object from initializer list", json::type_error&);
+            }
+
+            SECTION("empty array")
+            {
+                json const j = json::array();
+                CHECK(j.type() == json::value_t::array);
+            }
+
+            SECTION("array")
+            {
+                json const j = json::array({ {"one", 1}, {"two", 1u}, {"three", 2.2}, {"four", false} });
+                CHECK(j.type() == json::value_t::array);
+            }
+        }
+
+        SECTION("move from initializer_list")
+        {
+            SECTION("string")
+            {
+                SECTION("constructor with implicit types (array)")
+                {
+                    // This should break through any short string optimization in std::string
+                    std::string source(1024, '!');
+                    const auto* source_addr = source.data();
+                    json j = {std::move(source)};
+                    const auto* target_addr = j[0].get_ref<std::string const&>().data();
+                    const bool success = (target_addr == source_addr);
+                    CHECK(success);
+                }
+
+                SECTION("constructor with implicit types (object)")
+                {
+                    // This should break through any short string optimization in std::string
+                    std::string source(1024, '!');
+                    const auto* source_addr = source.data();
+                    json j = {{"key", std::move(source)}};
+                    const auto* target_addr = j["key"].get_ref<std::string const&>().data();
+                    const bool success = (target_addr == source_addr);
+                    CHECK(success);
+                }
+
+                SECTION("constructor with implicit types (object key)")
+                {
+                    // This should break through any short string optimization in std::string
+                    std::string source(1024, '!');
+                    const auto* source_addr = source.data();
+                    json j = {{std::move(source), 42}};
+                    const auto* target_addr = j.get_ref<json::object_t&>().begin()->first.data();
+                    const bool success = (target_addr == source_addr);
+                    CHECK(success);
+                }
+            }
+
+            SECTION("array")
+            {
+                SECTION("constructor with implicit types (array)")
+                {
+                    json::array_t source = {1, 2, 3};
+                    const auto* source_addr = source.data();
+                    json j {std::move(source)};
+                    const auto* target_addr = j[0].get_ref<json::array_t const&>().data();
+                    const bool success = (target_addr == source_addr);
+                    CHECK(success);
+                }
+
+                SECTION("constructor with implicit types (object)")
+                {
+                    json::array_t source = {1, 2, 3};
+                    const auto* source_addr = source.data();
+                    json const j {{"key", std::move(source)}};
+                    const auto* target_addr = j["key"].get_ref<json::array_t const&>().data();
+                    const bool success = (target_addr == source_addr);
+                    CHECK(success);
+                }
+
+                SECTION("assignment with implicit types (array)")
+                {
+                    json::array_t source = {1, 2, 3};
+                    const auto* source_addr = source.data();
+                    json j = {std::move(source)};
+                    const auto* target_addr = j[0].get_ref<json::array_t const&>().data();
+                    const bool success = (target_addr == source_addr);
+                    CHECK(success);
+                }
+
+                SECTION("assignment with implicit types (object)")
+                {
+                    json::array_t source = {1, 2, 3};
+                    const auto* source_addr = source.data();
+                    json j = {{"key", std::move(source)}};
+                    const auto* target_addr = j["key"].get_ref<json::array_t const&>().data();
+                    const bool success = (target_addr == source_addr);
+                    CHECK(success);
+                }
+            }
+
+            SECTION("object")
+            {
+                SECTION("constructor with implicit types (array)")
+                {
+                    json::object_t source = {{"hello", "world"}};
+                    const json* source_addr = &source.at("hello");
+                    json j {std::move(source)};
+                    CHECK(&(j[0].get_ref<json::object_t const&>().at("hello")) == source_addr);
+                }
+
+                SECTION("constructor with implicit types (object)")
+                {
+                    json::object_t source = {{"hello", "world"}};
+                    const json* source_addr = &source.at("hello");
+                    json j {{"key", std::move(source)}};
+                    CHECK(&(j["key"].get_ref<json::object_t const&>().at("hello")) == source_addr);
+                }
+
+                SECTION("assignment with implicit types (array)")
+                {
+                    json::object_t source = {{"hello", "world"}};
+                    const json* source_addr = &source.at("hello");
+                    json j = {std::move(source)};
+                    CHECK(&(j[0].get_ref<json::object_t const&>().at("hello")) == source_addr);
+                }
+
+                SECTION("assignment with implicit types (object)")
+                {
+                    json::object_t source = {{"hello", "world"}};
+                    const json* source_addr = &source.at("hello");
+                    json j = {{"key", std::move(source)}};
+                    CHECK(&(j["key"].get_ref<json::object_t const&>().at("hello")) == source_addr);
+                }
+            }
+
+            SECTION("json")
+            {
+                SECTION("constructor with implicit types (array)")
+                {
+                    json source {1, 2, 3};
+                    const json* source_addr = &source[0];
+                    json j {std::move(source), {}};
+                    CHECK(&j[0][0] == source_addr);
+                }
+
+                SECTION("constructor with implicit types (object)")
+                {
+                    json source {1, 2, 3};
+                    const json* source_addr = &source[0];
+                    json j {{"key", std::move(source)}};
+                    CHECK(&j["key"][0] == source_addr);
+                }
+
+                SECTION("assignment with implicit types (array)")
+                {
+                    json source {1, 2, 3};
+                    const json* source_addr = &source[0];
+                    json j = {std::move(source), {}};
+                    CHECK(&j[0][0] == source_addr);
+                }
+
+                SECTION("assignment with implicit types (object)")
+                {
+                    json source {1, 2, 3};
+                    const json* source_addr = &source[0];
+                    json j = {{"key", std::move(source)}};
+                    CHECK(&j["key"][0] == source_addr);
+                }
+            }
+
+        }
+    }
+
+    SECTION("create an array of n copies of a given value")
+    {
+        SECTION("cnt = 0")
+        {
+            json const v = {1, "foo", 34.23, {1, 2, 3}, {{"A", 1}, {"B", 2u}}};
+            json const arr(0, v);
+            CHECK(arr.size() == 0);
+        }
+
+        SECTION("cnt = 1")
+        {
+            json const v = {1, "foo", 34.23, {1, 2, 3}, {{"A", 1}, {"B", 2u}}};
+            json const arr(1, v);
+            CHECK(arr.size() == 1);
+            for (const auto& x : arr)
+            {
+                CHECK(x == v);
+            }
+        }
+
+        SECTION("cnt = 3")
+        {
+            json const v = {1, "foo", 34.23, {1, 2, 3}, {{"A", 1}, {"B", 2u}}};
+            json const arr(3, v);
+            CHECK(arr.size() == 3);
+            for (const auto& x : arr)
+            {
+                CHECK(x == v);
+            }
+        }
+    }
+
+    SECTION("create a JSON container from an iterator range")
+    {
+        SECTION("object")
+        {
+            SECTION("json(begin(), end())")
+            {
+                {
+                    json jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}};
+                    json const j_new(jobject.begin(), jobject.end());
+                    CHECK(j_new == jobject);
+                }
+                {
+                    json jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}};
+                    json const j_new(jobject.cbegin(), jobject.cend());
+                    CHECK(j_new == jobject);
+                }
+            }
+
+            SECTION("json(begin(), begin())")
+            {
+                {
+                    json jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}};
+                    json const j_new(jobject.begin(), jobject.begin());
+                    CHECK(j_new == json::object());
+                }
+                {
+                    json const jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}};
+                    json const j_new(jobject.cbegin(), jobject.cbegin());
+                    CHECK(j_new == json::object());
+                }
+            }
+
+            SECTION("construct from subrange")
+            {
+                json const jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}, {"d", false}, {"e", true}};
+                json const j_new(jobject.find("b"), jobject.find("e"));
+                CHECK(j_new == json({{"b", 1}, {"c", 17u}, {"d", false}}));
+            }
+
+            SECTION("incompatible iterators")
+            {
+                {
+                    json jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}, {"d", false}, {"e", true}};
+                    json jobject2 = {{"a", "a"}, {"b", 1}, {"c", 17u}};
+                    CHECK_THROWS_WITH_AS(json(jobject.begin(), jobject2.end()), "[json.exception.invalid_iterator.201] iterators are not compatible", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(json(jobject2.begin(), jobject.end()), "[json.exception.invalid_iterator.201] iterators are not compatible", json::invalid_iterator&);
+                }
+                {
+                    json const jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}, {"d", false}, {"e", true}};
+                    json const jobject2 = {{"a", "a"}, {"b", 1}, {"c", 17u}};
+                    CHECK_THROWS_WITH_AS(json(jobject.cbegin(), jobject2.cend()), "[json.exception.invalid_iterator.201] iterators are not compatible", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(json(jobject2.cbegin(), jobject.cend()), "[json.exception.invalid_iterator.201] iterators are not compatible", json::invalid_iterator&);
+                }
+            }
+        }
+
+        SECTION("array")
+        {
+            SECTION("json(begin(), end())")
+            {
+                {
+                    json jarray = {1, 2, 3, 4, 5};
+                    json const j_new(jarray.begin(), jarray.end());
+                    CHECK(j_new == jarray);
+                }
+                {
+                    json const jarray = {1, 2, 3, 4, 5};
+                    json const j_new(jarray.cbegin(), jarray.cend());
+                    CHECK(j_new == jarray);
+                }
+            }
+
+            SECTION("json(begin(), begin())")
+            {
+                {
+                    json jarray = {1, 2, 3, 4, 5};
+                    json j_new(jarray.begin(), jarray.begin());
+                    CHECK(j_new == json::array());
+                }
+                {
+                    json const jarray = {1, 2, 3, 4, 5};
+                    json const j_new(jarray.cbegin(), jarray.cbegin());
+                    CHECK(j_new == json::array());
+                }
+            }
+
+            SECTION("construct from subrange")
+            {
+                {
+                    json jarray = {1, 2, 3, 4, 5};
+                    json const j_new(jarray.begin() + 1, jarray.begin() + 3);
+                    CHECK(j_new == json({2, 3}));
+                }
+                {
+                    json const jarray = {1, 2, 3, 4, 5};
+                    json const j_new(jarray.cbegin() + 1, jarray.cbegin() + 3);
+                    CHECK(j_new == json({2, 3}));
+                }
+            }
+
+            SECTION("incompatible iterators")
+            {
+                {
+                    json jarray = {1, 2, 3, 4};
+                    json jarray2 = {2, 3, 4, 5};
+                    CHECK_THROWS_WITH_AS(json(jarray.begin(), jarray2.end()), "[json.exception.invalid_iterator.201] iterators are not compatible", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(json(jarray2.begin(), jarray.end()), "[json.exception.invalid_iterator.201] iterators are not compatible", json::invalid_iterator&);
+                }
+                {
+                    json const jarray = {1, 2, 3, 4};
+                    json const jarray2 = {2, 3, 4, 5};
+                    CHECK_THROWS_WITH_AS(json(jarray.cbegin(), jarray2.cend()), "[json.exception.invalid_iterator.201] iterators are not compatible", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(json(jarray2.cbegin(), jarray.cend()), "[json.exception.invalid_iterator.201] iterators are not compatible", json::invalid_iterator&);
+                }
+            }
+        }
+
+        SECTION("other values")
+        {
+            SECTION("construct with two valid iterators")
+            {
+                SECTION("null")
+                {
+                    {
+                        json j;
+                        CHECK_THROWS_WITH_AS(json(j.begin(), j.end()), "[json.exception.invalid_iterator.206] cannot construct with iterators from null", json::invalid_iterator&);
+                    }
+                    {
+                        json const j;
+                        CHECK_THROWS_WITH_AS(json(j.cbegin(), j.cend()), "[json.exception.invalid_iterator.206] cannot construct with iterators from null", json::invalid_iterator&);
+                    }
+                }
+
+                SECTION("string")
+                {
+                    {
+                        json j = "foo";
+                        json const j_new(j.begin(), j.end());
+                        CHECK(j == j_new);
+                    }
+                    {
+                        json const j = "bar";
+                        json const j_new(j.cbegin(), j.cend());
+                        CHECK(j == j_new);
+                    }
+                }
+
+                SECTION("number (boolean)")
+                {
+                    {
+                        json j = false;
+                        json const j_new(j.begin(), j.end());
+                        CHECK(j == j_new);
+                    }
+                    {
+                        json const j = true;
+                        json const j_new(j.cbegin(), j.cend());
+                        CHECK(j == j_new);
+                    }
+                }
+
+                SECTION("number (integer)")
+                {
+                    {
+                        json j = 17;
+                        json const j_new(j.begin(), j.end());
+                        CHECK(j == j_new);
+                    }
+                    {
+                        json const j = 17;
+                        json const j_new(j.cbegin(), j.cend());
+                        CHECK(j == j_new);
+                    }
+                }
+
+                SECTION("number (unsigned)")
+                {
+                    {
+                        json j = 17u;
+                        json const j_new(j.begin(), j.end());
+                        CHECK(j == j_new);
+                    }
+                    {
+                        json const j = 17u;
+                        json const j_new(j.cbegin(), j.cend());
+                        CHECK(j == j_new);
+                    }
+                }
+
+                SECTION("number (floating point)")
+                {
+                    {
+                        json j = 23.42;
+                        json const j_new(j.begin(), j.end());
+                        CHECK(j == j_new);
+                    }
+                    {
+                        json const j = 23.42;
+                        json const j_new(j.cbegin(), j.cend());
+                        CHECK(j == j_new);
+                    }
+                }
+
+                SECTION("binary")
+                {
+                    {
+                        json j = json::binary({1, 2, 3});
+                        json const j_new(j.begin(), j.end());
+                        CHECK((j == j_new));
+                    }
+                    {
+                        json const j = json::binary({1, 2, 3});
+                        json const j_new(j.cbegin(), j.cend());
+                        CHECK((j == j_new));
+                    }
+                }
+            }
+
+            SECTION("construct with two invalid iterators")
+            {
+                SECTION("string")
+                {
+                    {
+                        json j = "foo";
+                        CHECK_THROWS_WITH_AS(json(j.end(), j.end()), "[json.exception.invalid_iterator.204] iterators out of range", json::invalid_iterator&);
+                        CHECK_THROWS_WITH_AS(json(j.begin(), j.begin()), "[json.exception.invalid_iterator.204] iterators out of range", json::invalid_iterator&);
+                    }
+                    {
+                        json const j = "bar";
+                        CHECK_THROWS_WITH_AS(json(j.cend(), j.cend()), "[json.exception.invalid_iterator.204] iterators out of range", json::invalid_iterator&);
+                        CHECK_THROWS_WITH_AS(json(j.cbegin(), j.cbegin()), "[json.exception.invalid_iterator.204] iterators out of range", json::invalid_iterator&);
+                    }
+                }
+
+                SECTION("number (boolean)")
+                {
+                    {
+                        json j = false;
+                        CHECK_THROWS_WITH_AS(json(j.end(), j.end()), "[json.exception.invalid_iterator.204] iterators out of range", json::invalid_iterator&);
+                        CHECK_THROWS_WITH_AS(json(j.begin(), j.begin()), "[json.exception.invalid_iterator.204] iterators out of range", json::invalid_iterator&);
+                    }
+                    {
+                        json const j = true;
+                        CHECK_THROWS_WITH_AS(json(j.cend(), j.cend()), "[json.exception.invalid_iterator.204] iterators out of range", json::invalid_iterator&);
+                        CHECK_THROWS_WITH_AS(json(j.cbegin(), j.cbegin()), "[json.exception.invalid_iterator.204] iterators out of range", json::invalid_iterator&);
+                    }
+                }
+
+                SECTION("number (integer)")
+                {
+                    {
+                        json j = 17;
+                        CHECK_THROWS_WITH_AS(json(j.end(), j.end()), "[json.exception.invalid_iterator.204] iterators out of range", json::invalid_iterator&);
+                        CHECK_THROWS_WITH_AS(json(j.begin(), j.begin()), "[json.exception.invalid_iterator.204] iterators out of range", json::invalid_iterator&);
+                    }
+                    {
+                        json const j = 17;
+                        CHECK_THROWS_WITH_AS(json(j.cend(), j.cend()), "[json.exception.invalid_iterator.204] iterators out of range", json::invalid_iterator&);
+                        CHECK_THROWS_WITH_AS(json(j.cbegin(), j.cbegin()), "[json.exception.invalid_iterator.204] iterators out of range", json::invalid_iterator&);
+                    }
+                }
+
+                SECTION("number (integer)")
+                {
+                    {
+                        json j = 17u;
+                        CHECK_THROWS_WITH_AS(json(j.end(), j.end()), "[json.exception.invalid_iterator.204] iterators out of range", json::invalid_iterator&);
+                        CHECK_THROWS_WITH_AS(json(j.begin(), j.begin()), "[json.exception.invalid_iterator.204] iterators out of range", json::invalid_iterator&);
+                    }
+                    {
+                        json const j = 17u;
+                        CHECK_THROWS_WITH_AS(json(j.cend(), j.cend()), "[json.exception.invalid_iterator.204] iterators out of range", json::invalid_iterator&);
+                        CHECK_THROWS_WITH_AS(json(j.cbegin(), j.cbegin()), "[json.exception.invalid_iterator.204] iterators out of range", json::invalid_iterator&);
+                    }
+                }
+
+                SECTION("number (floating point)")
+                {
+                    {
+                        json j = 23.42;
+                        CHECK_THROWS_WITH_AS(json(j.end(), j.end()), "[json.exception.invalid_iterator.204] iterators out of range", json::invalid_iterator&);
+                        CHECK_THROWS_WITH_AS(json(j.begin(), j.begin()), "[json.exception.invalid_iterator.204] iterators out of range", json::invalid_iterator&);
+                    }
+                    {
+                        json const j = 23.42;
+                        CHECK_THROWS_WITH_AS(json(j.cend(), j.cend()), "[json.exception.invalid_iterator.204] iterators out of range", json::invalid_iterator&);
+                        CHECK_THROWS_WITH_AS(json(j.cbegin(), j.cbegin()), "[json.exception.invalid_iterator.204] iterators out of range", json::invalid_iterator&);
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/external_imported/json/tests/src/unit-constructor2.cpp b/external_imported/json/tests/src/unit-constructor2.cpp
new file mode 100644
index 000000000..85a91ff9b
--- /dev/null
+++ b/external_imported/json/tests/src/unit-constructor2.cpp
@@ -0,0 +1,186 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+#include <nlohmann/json.hpp>
+using nlohmann::json;
+
+TEST_CASE("other constructors and destructor")
+{
+    SECTION("copy constructor")
+    {
+        SECTION("object")
+        {
+            json j {{"foo", 1}, {"bar", false}};
+            json k(j); // NOLINT(performance-unnecessary-copy-initialization)
+            CHECK(j == k);
+        }
+
+        SECTION("array")
+        {
+            json j {"foo", 1, 42.23, false};
+            json k(j); // NOLINT(performance-unnecessary-copy-initialization)
+            CHECK(j == k);
+        }
+
+        SECTION("null")
+        {
+            json j(nullptr);
+            json k(j); // NOLINT(performance-unnecessary-copy-initialization)
+            CHECK(j == k);
+        }
+
+        SECTION("boolean")
+        {
+            json j(true);
+            json k(j); // NOLINT(performance-unnecessary-copy-initialization)
+            CHECK(j == k);
+        }
+
+        SECTION("string")
+        {
+            json j("Hello world");
+            json k(j); // NOLINT(performance-unnecessary-copy-initialization)
+            CHECK(j == k);
+        }
+
+        SECTION("number (integer)")
+        {
+            json j(42);
+            json k(j); // NOLINT(performance-unnecessary-copy-initialization)
+            CHECK(j == k);
+        }
+
+        SECTION("number (unsigned)")
+        {
+            json j(42u);
+            json k(j); // NOLINT(performance-unnecessary-copy-initialization)
+            CHECK(j == k);
+        }
+
+        SECTION("number (floating-point)")
+        {
+            json j(42.23);
+            json k(j); // NOLINT(performance-unnecessary-copy-initialization)
+            CHECK(j == k);
+        }
+
+        SECTION("binary")
+        {
+            json j = json::binary({1, 2, 3});
+            json k(j); // NOLINT(performance-unnecessary-copy-initialization)
+            CHECK(j == k);
+        }
+    }
+
+    SECTION("move constructor")
+    {
+        json j {{"foo", "bar"}, {"baz", {1, 2, 3, 4}}, {"a", 42u}, {"b", 42.23}, {"c", nullptr}};
+        CHECK(j.type() == json::value_t::object);
+        const json k(std::move(j));
+        CHECK(k.type() == json::value_t::object);
+        CHECK(j.type() == json::value_t::null); // NOLINT: access after move is OK here
+    }
+
+    SECTION("copy assignment")
+    {
+        SECTION("object")
+        {
+            json j {{"foo", 1}, {"bar", false}};
+            json k;
+            k = j;
+            CHECK(j == k);
+        }
+
+        SECTION("array")
+        {
+            json j {"foo", 1, 42.23, false};
+            json k;
+            k = j;
+            CHECK(j == k);
+        }
+
+        SECTION("null")
+        {
+            json j(nullptr);
+            json k;
+            k = j;
+            CHECK(j == k);
+        }
+
+        SECTION("boolean")
+        {
+            json j(true);
+            json k;
+            k = j;
+            CHECK(j == k);
+        }
+
+        SECTION("string")
+        {
+            json j("Hello world");
+            json k;
+            k = j;
+            CHECK(j == k);
+        }
+
+        SECTION("number (integer)")
+        {
+            json j(42);
+            json k;
+            k = j;
+            CHECK(j == k);
+        }
+
+        SECTION("number (unsigned)")
+        {
+            json j(42u);
+            json k;
+            k = j;
+            CHECK(j == k);
+        }
+
+        SECTION("number (floating-point)")
+        {
+            json j(42.23);
+            json k;
+            k = j;
+            CHECK(j == k);
+        }
+
+        SECTION("binary")
+        {
+            json j = json::binary({1, 2, 3});
+            json k;
+            k = j;
+            CHECK(j == k);
+        }
+    }
+
+    SECTION("destructor")
+    {
+        SECTION("object")
+        {
+            auto* j = new json {{"foo", 1}, {"bar", false}}; // NOLINT(cppcoreguidelines-owning-memory)
+            delete j; // NOLINT(cppcoreguidelines-owning-memory)
+        }
+
+        SECTION("array")
+        {
+            auto* j = new json {"foo", 1, 1u, false, 23.42}; // NOLINT(cppcoreguidelines-owning-memory)
+            delete j; // NOLINT(cppcoreguidelines-owning-memory)
+        }
+
+        SECTION("string")
+        {
+            auto* j = new json("Hello world"); // NOLINT(cppcoreguidelines-owning-memory)
+            delete j; // NOLINT(cppcoreguidelines-owning-memory)
+        }
+    }
+}
diff --git a/external_imported/json/tests/src/unit-convenience.cpp b/external_imported/json/tests/src/unit-convenience.cpp
new file mode 100644
index 000000000..34bbb02cf
--- /dev/null
+++ b/external_imported/json/tests/src/unit-convenience.cpp
@@ -0,0 +1,205 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+#define JSON_TESTS_PRIVATE
+#include <nlohmann/json.hpp>
+using nlohmann::json;
+
+#include <sstream>
+
+namespace
+{
+struct alt_string_iter
+{
+    alt_string_iter() = default;
+    alt_string_iter(const char* cstr)
+        : impl(cstr)
+    {}
+
+    void reserve(std::size_t s)
+    {
+        impl.reserve(s);
+    }
+
+    template<typename Iter>
+    void append(Iter first, Iter last)
+    {
+        impl.append(first, last);
+    }
+
+    std::string::const_iterator begin() const noexcept
+    {
+        return impl.begin();
+    }
+
+    std::string::const_iterator end() const noexcept
+    {
+        return impl.end();
+    }
+
+    std::size_t size() const noexcept
+    {
+        return impl.size();
+    }
+
+    alt_string_iter& operator+=(const char c)
+    {
+        impl += c;
+        return *this;
+    }
+
+    std::string impl{};
+};
+
+struct alt_string_data
+{
+    alt_string_data() = default;
+    alt_string_data(const char* cstr)
+        : impl(cstr)
+    {}
+
+    void reserve(std::size_t s)
+    {
+        impl.reserve(s);
+    }
+
+    void append(const char* p, std::size_t s)
+    {
+        impl.append(p, s);
+    }
+
+    const char* data() const
+    {
+        return impl.data();
+    }
+
+    std::size_t size() const
+    {
+        return impl.size();
+    }
+
+    alt_string_data& operator+=(const char c)
+    {
+        impl += c;
+        return *this;
+    }
+
+    std::string impl{};
+};
+
+void check_escaped(const char* original, const char* escaped = "", bool ensure_ascii = false);
+void check_escaped(const char* original, const char* escaped, const bool ensure_ascii)
+{
+    std::stringstream ss;
+    json::serializer s(nlohmann::detail::output_adapter<char>(ss), ' ');
+    s.dump_escaped(original, ensure_ascii);
+    CHECK(ss.str() == escaped);
+}
+} // namespace
+
+TEST_CASE("convenience functions")
+{
+    SECTION("type name as string")
+    {
+        CHECK(std::string(json(json::value_t::null).type_name()) == "null");
+        CHECK(std::string(json(json::value_t::object).type_name()) == "object");
+        CHECK(std::string(json(json::value_t::array).type_name()) == "array");
+        CHECK(std::string(json(json::value_t::number_integer).type_name()) == "number");
+        CHECK(std::string(json(json::value_t::number_unsigned).type_name()) == "number");
+        CHECK(std::string(json(json::value_t::number_float).type_name()) == "number");
+        CHECK(std::string(json(json::value_t::binary).type_name()) == "binary");
+        CHECK(std::string(json(json::value_t::boolean).type_name()) == "boolean");
+        CHECK(std::string(json(json::value_t::string).type_name()) == "string");
+        CHECK(std::string(json(json::value_t::discarded).type_name()) == "discarded");
+    }
+
+    SECTION("string escape")
+    {
+        check_escaped("\"", "\\\"");
+        check_escaped("\\", "\\\\");
+        check_escaped("\b", "\\b");
+        check_escaped("\f", "\\f");
+        check_escaped("\n", "\\n");
+        check_escaped("\r", "\\r");
+        check_escaped("\t", "\\t");
+
+        check_escaped("\x01", "\\u0001");
+        check_escaped("\x02", "\\u0002");
+        check_escaped("\x03", "\\u0003");
+        check_escaped("\x04", "\\u0004");
+        check_escaped("\x05", "\\u0005");
+        check_escaped("\x06", "\\u0006");
+        check_escaped("\x07", "\\u0007");
+        check_escaped("\x08", "\\b");
+        check_escaped("\x09", "\\t");
+        check_escaped("\x0a", "\\n");
+        check_escaped("\x0b", "\\u000b");
+        check_escaped("\x0c", "\\f");
+        check_escaped("\x0d", "\\r");
+        check_escaped("\x0e", "\\u000e");
+        check_escaped("\x0f", "\\u000f");
+        check_escaped("\x10", "\\u0010");
+        check_escaped("\x11", "\\u0011");
+        check_escaped("\x12", "\\u0012");
+        check_escaped("\x13", "\\u0013");
+        check_escaped("\x14", "\\u0014");
+        check_escaped("\x15", "\\u0015");
+        check_escaped("\x16", "\\u0016");
+        check_escaped("\x17", "\\u0017");
+        check_escaped("\x18", "\\u0018");
+        check_escaped("\x19", "\\u0019");
+        check_escaped("\x1a", "\\u001a");
+        check_escaped("\x1b", "\\u001b");
+        check_escaped("\x1c", "\\u001c");
+        check_escaped("\x1d", "\\u001d");
+        check_escaped("\x1e", "\\u001e");
+        check_escaped("\x1f", "\\u001f");
+
+        // invalid UTF-8 characters
+        CHECK_THROWS_WITH_AS(check_escaped("ä\xA9ü"), "[json.exception.type_error.316] invalid UTF-8 byte at index 2: 0xA9", json::type_error&);
+
+        CHECK_THROWS_WITH_AS(check_escaped("\xC2"), "[json.exception.type_error.316] incomplete UTF-8 string; last byte: 0xC2", json::type_error&);
+    }
+
+    SECTION("string concat")
+    {
+        using nlohmann::detail::concat;
+
+        const char* expected = "Hello, world!";
+        alt_string_iter const hello_iter{"Hello, "};
+        alt_string_data const hello_data{"Hello, "};
+        std::string const world = "world";
+
+        SECTION("std::string")
+        {
+            std::string str1 = concat(hello_iter, world, '!');
+            std::string str2 = concat(hello_data, world, '!');
+            std::string str3 = concat("Hello, ", world, '!');
+
+            CHECK(str1 == expected);
+            CHECK(str2 == expected);
+            CHECK(str3 == expected);
+        }
+
+        SECTION("alt_string_iter")
+        {
+            alt_string_iter str = concat<alt_string_iter>(hello_iter, world, '!');
+
+            CHECK(str.impl == expected);
+        }
+
+        SECTION("alt_string_data")
+        {
+            alt_string_data str = concat<alt_string_data>(hello_data, world, '!');
+
+            CHECK(str.impl == expected);
+        }
+    }
+}
diff --git a/external_imported/json/tests/src/unit-conversions.cpp b/external_imported/json/tests/src/unit-conversions.cpp
new file mode 100644
index 000000000..d7df0bee5
--- /dev/null
+++ b/external_imported/json/tests/src/unit-conversions.cpp
@@ -0,0 +1,1572 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// Copyright (c) 2013-2022 Niels Lohmann <http://nlohmann.me>.
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+// cmake/test.cmake selects the C++ standard versions with which to build a
+// unit test based on the presence of JSON_HAS_CPP_<VERSION> macros.
+// When using macros that are only defined for particular versions of the standard
+// (e.g., JSON_HAS_FILESYSTEM for C++17 and up), please mention the corresponding
+// version macro in a comment close by, like this:
+// JSON_HAS_CPP_<VERSION> (do not remove; see note at top of file)
+
+#include "doctest_compatibility.h"
+
+#define JSON_TESTS_PRIVATE
+#include <nlohmann/json.hpp>
+using nlohmann::json;
+
+#include <deque>
+#include <forward_list>
+#include <list>
+#include <set>
+#include <unordered_map>
+#include <unordered_set>
+#include <valarray>
+
+// NLOHMANN_JSON_SERIALIZE_ENUM uses a static std::pair
+DOCTEST_CLANG_SUPPRESS_WARNING_PUSH
+DOCTEST_CLANG_SUPPRESS_WARNING("-Wexit-time-destructors")
+
+TEST_CASE("value conversion")
+{
+    SECTION("get an object (explicit)")
+    {
+        const json::object_t o_reference = {{"object", json::object()},
+            {"array", {1, 2, 3, 4}},
+            {"number", 42},
+            {"boolean", false},
+            {"null", nullptr},
+            {"string", "Hello world"}
+        };
+        json j(o_reference);
+
+        SECTION("json::object_t")
+        {
+            json::object_t const o = j.get<json::object_t>();
+            CHECK(json(o) == j);
+        }
+
+        SECTION("std::map<json::string_t, json>")
+        {
+            const std::map<json::string_t, json> o =
+                j.get<std::map<json::string_t, json>>();
+            CHECK(json(o) == j);
+        }
+
+        SECTION("std::multimap<json::string_t, json>")
+        {
+            const std::multimap<json::string_t, json> o =
+                j.get<std::multimap<json::string_t, json>>();
+            CHECK(json(o) == j);
+        }
+
+        SECTION("std::unordered_map<json::string_t, json>")
+        {
+            const std::unordered_map<json::string_t, json> o =
+                j.get<std::unordered_map<json::string_t, json>>();
+            CHECK(json(o) == j);
+        }
+
+        SECTION("std::unordered_multimap<json::string_t, json>")
+        {
+            const std::unordered_multimap<json::string_t, json> o =
+                j.get<std::unordered_multimap<json::string_t, json>>();
+            CHECK(json(o) == j);
+        }
+
+        SECTION("exception in case of a non-object type")
+        {
+            CHECK_THROWS_WITH_AS(
+                json(json::value_t::null).get<json::object_t>(),
+                "[json.exception.type_error.302] type must be object, but is null", json::type_error&);
+            CHECK_THROWS_WITH_AS(
+                json(json::value_t::array).get<json::object_t>(),
+                "[json.exception.type_error.302] type must be object, but is array", json::type_error&);
+            CHECK_THROWS_WITH_AS(
+                json(json::value_t::string).get<json::object_t>(),
+                "[json.exception.type_error.302] type must be object, but is string", json::type_error&);
+            CHECK_THROWS_WITH_AS(json(json::value_t::boolean).get<json::object_t>(),
+                                 "[json.exception.type_error.302] type must be object, "
+                                 "but is boolean", json::type_error&);
+            CHECK_THROWS_WITH_AS(
+                json(json::value_t::number_integer).get<json::object_t>(),
+                "[json.exception.type_error.302] type must be object, but is number", json::type_error&);
+            CHECK_THROWS_WITH_AS(
+                json(json::value_t::number_unsigned).get<json::object_t>(),
+                "[json.exception.type_error.302] type must be object, but is number", json::type_error&);
+            CHECK_THROWS_WITH_AS(
+                json(json::value_t::number_float).get<json::object_t>(),
+                "[json.exception.type_error.302] type must be object, but is number", json::type_error&);
+        }
+    }
+
+    SECTION("get an object (explicit, get_to)")
+    {
+        const json::object_t o_reference = {{"object", json::object()},
+            {"array", {1, 2, 3, 4}},
+            {"number", 42},
+            {"boolean", false},
+            {"null", nullptr},
+            {"string", "Hello world"}
+        };
+        json j(o_reference);
+
+        SECTION("json::object_t")
+        {
+            json::object_t o = {{"previous", "value"}};
+            j.get_to(o);
+            CHECK(json(o) == j);
+        }
+
+        SECTION("std::map<json::string_t, json>")
+        {
+            std::map<json::string_t, json> o{{"previous", "value"}};
+            j.get_to(o);
+            CHECK(json(o) == j);
+        }
+
+        SECTION("std::multimap<json::string_t, json>")
+        {
+            std::multimap<json::string_t, json> o{{"previous", "value"}};
+            j.get_to(o);
+            CHECK(json(o) == j);
+        }
+
+        SECTION("std::unordered_map<json::string_t, json>")
+        {
+            std::unordered_map<json::string_t, json> o{{"previous", "value"}};
+            j.get_to(o);
+            CHECK(json(o) == j);
+        }
+
+        SECTION("std::unordered_multimap<json::string_t, json>")
+        {
+            std::unordered_multimap<json::string_t, json> o{{"previous", "value"}};
+            j.get_to(o);
+            CHECK(json(o) == j);
+        }
+    }
+
+#if JSON_USE_IMPLICIT_CONVERSIONS
+    SECTION("get an object (implicit)")
+    {
+        const json::object_t o_reference = {{"object", json::object()},
+            {"array", {1, 2, 3, 4}},
+            {"number", 42},
+            {"boolean", false},
+            {"null", nullptr},
+            {"string", "Hello world"}
+        };
+        json j(o_reference);
+
+        SECTION("json::object_t")
+        {
+            const json::object_t o = j;
+            CHECK(json(o) == j);
+        }
+
+        SECTION("std::map<json::string_t, json>")
+        {
+            const std::map<json::string_t, json> o = j;
+            CHECK(json(o) == j);
+        }
+
+        SECTION("std::multimap<json::string_t, json>")
+        {
+            const std::multimap<json::string_t, json> o = j;
+            CHECK(json(o) == j);
+        }
+
+        SECTION("std::unordered_map<json::string_t, json>")
+        {
+            const std::unordered_map<json::string_t, json> o = j;
+            CHECK(json(o) == j);
+        }
+
+        SECTION("std::unordered_multimap<json::string_t, json>")
+        {
+            const std::unordered_multimap<json::string_t, json> o = j;
+            CHECK(json(o) == j);
+        }
+    }
+#endif
+
+    SECTION("get an array (explicit)")
+    {
+        const json::array_t a_reference{json(1),     json(1u),       json(2.2),
+                                        json(false), json("string"), json()};
+        json j(a_reference);
+
+        SECTION("json::array_t")
+        {
+            const json::array_t a = j.get<json::array_t>();
+            CHECK(json(a) == j);
+        }
+
+        SECTION("std::list<json>")
+        {
+            const std::list<json> a = j.get<std::list<json>>();
+            CHECK(json(a) == j);
+        }
+
+        SECTION("std::forward_list<json>")
+        {
+            const std::forward_list<json> a = j.get<std::forward_list<json>>();
+            CHECK(json(a) == j);
+
+            CHECK_THROWS_WITH_AS(
+                json(json::value_t::null).get<std::forward_list<json>>(),
+                "[json.exception.type_error.302] type must be array, but is null", json::type_error&);
+        }
+
+        SECTION("std::vector<json>")
+        {
+            const std::vector<json> a = j.get<std::vector<json>>();
+            CHECK(json(a) == j);
+
+            CHECK_THROWS_WITH_AS(
+                json(json::value_t::null).get<std::vector<json>>(),
+                "[json.exception.type_error.302] type must be array, but is null", json::type_error&);
+
+#if !defined(JSON_NOEXCEPTION)
+            SECTION("reserve is called on containers that supports it")
+            {
+                // make sure all values are properly copied
+                const json j2({1, 2, 3, 4, 5, 6, 7, 8, 9, 10});
+                auto v2 = j2.get<std::vector<int>>();
+                CHECK(v2.size() == 10);
+            }
+#endif
+        }
+
+        SECTION("built-in arrays")
+        {
+            const char str[] = "a string"; // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+            const int nbs[] = {0, 1, 2}; // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+
+            const json j2 = nbs;
+            const json j3 = str;
+
+            auto v = j2.get<std::vector<int>>();
+            auto s = j3.get<std::string>();
+            CHECK(std::equal(v.begin(), v.end(), std::begin(nbs)));
+            CHECK(s == str);
+        }
+
+        SECTION("std::deque<json>")
+        {
+            const std::deque<json> a = j.get<std::deque<json>>();
+            CHECK(json(a) == j);
+        }
+
+        SECTION("exception in case of a non-array type")
+        {
+            CHECK_THROWS_WITH_AS(
+                json(json::value_t::object).get<std::vector<int>>(),
+                "[json.exception.type_error.302] type must be array, but is object", json::type_error&);
+            CHECK_THROWS_WITH_AS(
+                json(json::value_t::null).get<json::array_t>(),
+                "[json.exception.type_error.302] type must be array, but is null", json::type_error&);
+            CHECK_THROWS_WITH_AS(
+                json(json::value_t::object).get<json::array_t>(),
+                "[json.exception.type_error.302] type must be array, but is object", json::type_error&);
+            CHECK_THROWS_WITH_AS(
+                json(json::value_t::string).get<json::array_t>(),
+                "[json.exception.type_error.302] type must be array, but is string", json::type_error&);
+            CHECK_THROWS_WITH_AS(
+                json(json::value_t::boolean).get<json::array_t>(),
+                "[json.exception.type_error.302] type must be array, but is boolean", json::type_error&);
+            CHECK_THROWS_WITH_AS(
+                json(json::value_t::number_integer).get<json::array_t>(),
+                "[json.exception.type_error.302] type must be array, but is number", json::type_error&);
+            CHECK_THROWS_WITH_AS(
+                json(json::value_t::number_unsigned).get<json::array_t>(),
+                "[json.exception.type_error.302] type must be array, but is number", json::type_error&);
+            CHECK_THROWS_WITH_AS(
+                json(json::value_t::number_float).get<json::array_t>(),
+                "[json.exception.type_error.302] type must be array, but is number", json::type_error&);
+        }
+    }
+
+    SECTION("get an array (explicit, get_to)")
+    {
+        const json::array_t a_reference{json(1),     json(1u),       json(2.2),
+                                        json(false), json("string"), json()};
+        json j(a_reference);
+
+        SECTION("json::array_t")
+        {
+            json::array_t a{"previous", "value"};
+            j.get_to(a);
+            CHECK(json(a) == j);
+        }
+
+        SECTION("std::valarray<json>")
+        {
+            std::valarray<json> a{"previous", "value"};
+            j.get_to(a);
+            CHECK(json(a) == j);
+        }
+
+        SECTION("std::list<json>")
+        {
+            std::list<json> a{"previous", "value"};
+            j.get_to(a);
+            CHECK(json(a) == j);
+        }
+
+        SECTION("std::forward_list<json>")
+        {
+            std::forward_list<json> a{"previous", "value"};
+            j.get_to(a);
+            CHECK(json(a) == j);
+        }
+
+        SECTION("std::vector<json>")
+        {
+            std::vector<json> a{"previous", "value"};
+            j.get_to(a);
+            CHECK(json(a) == j);
+        }
+
+        SECTION("built-in arrays")
+        {
+            const int nbs[] = {0, 1, 2}; // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+            int nbs2[] = {0, 0, 0}; // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+
+            const json j2 = nbs;
+            j2.get_to(nbs2);
+            CHECK(std::equal(std::begin(nbs), std::end(nbs), std::begin(nbs2)));
+        }
+
+        SECTION("std::deque<json>")
+        {
+            std::deque<json> a{"previous", "value"};
+            j.get_to(a);
+            CHECK(json(a) == j);
+        }
+    }
+
+#if JSON_USE_IMPLICIT_CONVERSIONS
+    SECTION("get an array (implicit)")
+    {
+        const json::array_t a_reference{json(1),     json(1u),       json(2.2),
+                                        json(false), json("string"), json()};
+        json j(a_reference);
+
+        SECTION("json::array_t")
+        {
+            const json::array_t a = j;
+            CHECK(json(a) == j);
+        }
+
+        SECTION("std::list<json>")
+        {
+            const std::list<json> a = j;
+            CHECK(json(a) == j);
+        }
+
+        SECTION("std::forward_list<json>")
+        {
+            const std::forward_list<json> a = j;
+            CHECK(json(a) == j);
+        }
+
+        SECTION("std::vector<json>")
+        {
+            const std::vector<json> a = j;
+            CHECK(json(a) == j);
+        }
+
+        SECTION("std::deque<json>")
+        {
+            const std::deque<json> a = j;
+            CHECK(json(a) == j);
+        }
+    }
+#endif
+
+    SECTION("get a string (explicit)")
+    {
+        const json::string_t s_reference{"Hello world"};
+        json j(s_reference);
+
+        SECTION("string_t")
+        {
+            const json::string_t s = j.get<json::string_t>();
+            CHECK(json(s) == j);
+        }
+
+        SECTION("std::string")
+        {
+            const std::string s = j.get<std::string>();
+            CHECK(json(s) == j);
+        }
+#if defined(JSON_HAS_CPP_17)
+        SECTION("std::string_view")
+        {
+            std::string_view const s = j.get<std::string_view>();
+            CHECK(json(s) == j);
+        }
+#endif
+
+        SECTION("exception in case of a non-string type")
+        {
+            CHECK_THROWS_WITH_AS(
+                json(json::value_t::null).get<json::string_t>(),
+                "[json.exception.type_error.302] type must be string, but is null", json::type_error&);
+            CHECK_THROWS_WITH_AS(
+                json(json::value_t::object).get<json::string_t>(),
+                "[json.exception.type_error.302] type must be string, but is object", json::type_error&);
+            CHECK_THROWS_WITH_AS(
+                json(json::value_t::array).get<json::string_t>(),
+                "[json.exception.type_error.302] type must be string, but is array", json::type_error&);
+            CHECK_THROWS_WITH_AS(json(json::value_t::boolean).get<json::string_t>(),
+                                 "[json.exception.type_error.302] type must be string, "
+                                 "but is boolean", json::type_error&);
+            CHECK_THROWS_WITH_AS(
+                json(json::value_t::number_integer).get<json::string_t>(),
+                "[json.exception.type_error.302] type must be string, but is number", json::type_error&);
+            CHECK_THROWS_WITH_AS(
+                json(json::value_t::number_unsigned).get<json::string_t>(),
+                "[json.exception.type_error.302] type must be string, but is number", json::type_error&);
+            CHECK_THROWS_WITH_AS(
+                json(json::value_t::number_float).get<json::string_t>(),
+                "[json.exception.type_error.302] type must be string, but is number", json::type_error&);
+        }
+
+#if defined(JSON_HAS_CPP_17)
+        SECTION("exception in case of a non-string type using string_view")
+        {
+            CHECK_THROWS_WITH_AS(json(json::value_t::null).get<std::string_view>(),
+                                 "[json.exception.type_error.302] type must be string, but is null", json::type_error&);
+            CHECK_THROWS_WITH_AS(json(json::value_t::object).get<std::string_view>(),
+                                 "[json.exception.type_error.302] type must be string, but is object", json::type_error&);
+            CHECK_THROWS_WITH_AS(json(json::value_t::array).get<std::string_view>(),
+                                 "[json.exception.type_error.302] type must be string, but is array", json::type_error&);
+            CHECK_THROWS_WITH_AS(json(json::value_t::boolean).get<std::string_view>(),
+                                 "[json.exception.type_error.302] type must be string, but is boolean", json::type_error&);
+            CHECK_THROWS_WITH_AS(json(json::value_t::number_integer).get<std::string_view>(),
+                                 "[json.exception.type_error.302] type must be string, but is number", json::type_error&);
+            CHECK_THROWS_WITH_AS(json(json::value_t::number_unsigned).get<std::string_view>(),
+                                 "[json.exception.type_error.302] type must be string, but is number", json::type_error&);
+            CHECK_THROWS_WITH_AS(json(json::value_t::number_float).get<std::string_view>(),
+                                 "[json.exception.type_error.302] type must be string, but is number", json::type_error&);
+        }
+#endif
+    }
+
+    SECTION("get a string (explicit, get_to)")
+    {
+        const json::string_t s_reference{"Hello world"};
+        json j(s_reference);
+
+        SECTION("string_t")
+        {
+            json::string_t s = "previous value";
+            j.get_to(s);
+            CHECK(json(s) == j);
+        }
+
+        SECTION("std::string")
+        {
+            std::string s = "previous value";
+            j.get_to(s);
+            CHECK(json(s) == j);
+        }
+#if defined(JSON_HAS_CPP_17)
+        SECTION("std::string_view")
+        {
+            std::string const s = "previous value";
+            std::string_view sv = s;
+            j.get_to(sv);
+            CHECK(json(sv) == j);
+        }
+#endif
+    }
+
+    SECTION("get null (explicit)")
+    {
+        std::nullptr_t n = nullptr;
+        const json j(n);
+
+        auto n2 = j.get<std::nullptr_t>();
+        CHECK(n2 == n);
+
+        CHECK_THROWS_WITH_AS(json(json::value_t::string).get<std::nullptr_t>(),
+                             "[json.exception.type_error.302] type must be null, but is string", json::type_error&);
+        CHECK_THROWS_WITH_AS(json(json::value_t::object).get<std::nullptr_t>(),
+                             "[json.exception.type_error.302] type must be null, but is object", json::type_error&);
+        CHECK_THROWS_WITH_AS(json(json::value_t::array).get<std::nullptr_t>(),
+                             "[json.exception.type_error.302] type must be null, but is array", json::type_error&);
+        CHECK_THROWS_WITH_AS(json(json::value_t::boolean).get<std::nullptr_t>(),
+                             "[json.exception.type_error.302] type must be null, but is boolean", json::type_error&);
+        CHECK_THROWS_WITH_AS(json(json::value_t::number_integer).get<std::nullptr_t>(),
+                             "[json.exception.type_error.302] type must be null, but is number", json::type_error&);
+        CHECK_THROWS_WITH_AS(json(json::value_t::number_unsigned).get<std::nullptr_t>(),
+                             "[json.exception.type_error.302] type must be null, but is number", json::type_error&);
+        CHECK_THROWS_WITH_AS(json(json::value_t::number_float).get<std::nullptr_t>(),
+                             "[json.exception.type_error.302] type must be null, but is number", json::type_error&);
+    }
+
+#if JSON_USE_IMPLICIT_CONVERSIONS
+    SECTION("get a string (implicit)")
+    {
+        const json::string_t s_reference{"Hello world"};
+        json j(s_reference);
+
+        SECTION("string_t")
+        {
+            const json::string_t s = j;
+            CHECK(json(s) == j);
+        }
+
+#if defined(JSON_HAS_CPP_17)
+        SECTION("std::string_view")
+        {
+            std::string_view const s = j.get<std::string_view>();
+            CHECK(json(s) == j);
+        }
+#endif
+
+        SECTION("std::string")
+        {
+            const std::string s = j;
+            CHECK(json(s) == j);
+        }
+    }
+#endif
+
+    SECTION("get a boolean (explicit)")
+    {
+        const json::boolean_t b_reference{true};
+        json j(b_reference);
+
+        SECTION("boolean_t")
+        {
+            auto b = j.get<json::boolean_t>();
+            CHECK(json(b) == j);
+        }
+
+        SECTION("uint8_t")
+        {
+            auto n = j.get<uint8_t>();
+            CHECK(n == 1);
+        }
+
+        SECTION("bool")
+        {
+            const bool b = j.get<bool>();
+            CHECK(json(b) == j);
+        }
+
+        SECTION("exception in case of a non-number type")
+        {
+            CHECK_THROWS_AS(json(json::value_t::string).get<uint8_t>(),
+                            json::type_error&);
+
+            CHECK_THROWS_WITH_AS(
+                json(json::value_t::null).get<json::boolean_t>(),
+                "[json.exception.type_error.302] type must be boolean, but is null", json::type_error&);
+            CHECK_THROWS_WITH_AS(json(json::value_t::object).get<json::boolean_t>(),
+                                 "[json.exception.type_error.302] type must be boolean, "
+                                 "but is object", json::type_error&);
+            CHECK_THROWS_WITH_AS(
+                json(json::value_t::array).get<json::boolean_t>(),
+                "[json.exception.type_error.302] type must be boolean, but is array", json::type_error&);
+            CHECK_THROWS_WITH_AS(json(json::value_t::string).get<json::boolean_t>(),
+                                 "[json.exception.type_error.302] type must be boolean, "
+                                 "but is string", json::type_error&);
+            CHECK_THROWS_WITH_AS(
+                json(json::value_t::number_integer).get<json::boolean_t>(),
+                "[json.exception.type_error.302] type must be boolean, but is "
+                "number", json::type_error&);
+            CHECK_THROWS_WITH_AS(
+                json(json::value_t::number_unsigned).get<json::boolean_t>(),
+                "[json.exception.type_error.302] type must be boolean, but is "
+                "number", json::type_error&);
+            CHECK_THROWS_WITH_AS(
+                json(json::value_t::number_float).get<json::boolean_t>(),
+                "[json.exception.type_error.302] type must be boolean, but is "
+                "number", json::type_error&);
+        }
+    }
+
+#if JSON_USE_IMPLICIT_CONVERSIONS
+    SECTION("get a boolean (implicit)")
+    {
+        const json::boolean_t b_reference{true};
+        json j(b_reference);
+
+        SECTION("boolean_t")
+        {
+            const json::boolean_t b = j;
+            CHECK(json(b) == j);
+        }
+
+        SECTION("bool")
+        {
+            const bool b = j;
+            CHECK(json(b) == j);
+        }
+    }
+#endif
+
+    SECTION("get an integer number (explicit)")
+    {
+        const json::number_integer_t n_reference{42};
+        json j(n_reference);
+        const json::number_unsigned_t n_unsigned_reference{42u};
+        json j_unsigned(n_unsigned_reference);
+
+        SECTION("number_integer_t")
+        {
+            auto n = j.get<json::number_integer_t>();
+            CHECK(json(n) == j);
+        }
+
+        SECTION("number_unsigned_t")
+        {
+            auto n = j_unsigned.get<json::number_unsigned_t>();
+            CHECK(json(n) == j_unsigned);
+        }
+
+        SECTION("short")
+        {
+            auto n = j.get<short>();
+            CHECK(json(n) == j);
+        }
+
+        SECTION("unsigned short")
+        {
+            auto n = j.get<unsigned short>();
+            CHECK(json(n) == j);
+        }
+
+        SECTION("int")
+        {
+            const int n = j.get<int>();
+            CHECK(json(n) == j);
+        }
+
+        SECTION("unsigned int")
+        {
+            auto n = j.get<unsigned int>();
+            CHECK(json(n) == j);
+        }
+
+        SECTION("long")
+        {
+            const long n = j.get<long>();
+            CHECK(json(n) == j);
+        }
+
+        SECTION("unsigned long")
+        {
+            auto n = j.get<unsigned long>();
+            CHECK(json(n) == j);
+        }
+
+        SECTION("long long")
+        {
+            auto n = j.get<long long>();
+            CHECK(json(n) == j);
+        }
+
+        SECTION("unsigned long long")
+        {
+            auto n = j.get<unsigned long long>();
+            CHECK(json(n) == j);
+        }
+
+        SECTION("int8_t")
+        {
+            auto n = j.get<int8_t>();
+            CHECK(json(n) == j);
+        }
+
+        SECTION("int16_t")
+        {
+            auto n = j.get<int16_t>();
+            CHECK(json(n) == j);
+        }
+
+        SECTION("int32_t")
+        {
+            auto n = j.get<int32_t>();
+            CHECK(json(n) == j);
+        }
+
+        SECTION("int64_t")
+        {
+            auto n = j.get<int64_t>();
+            CHECK(json(n) == j);
+        }
+
+        SECTION("int8_fast_t")
+        {
+            auto n = j.get<int_fast8_t>();
+            CHECK(json(n) == j);
+        }
+
+        SECTION("int16_fast_t")
+        {
+            auto n = j.get<int_fast16_t>();
+            CHECK(json(n) == j);
+        }
+
+        SECTION("int32_fast_t")
+        {
+            auto n = j.get<int_fast32_t>();
+            CHECK(json(n) == j);
+        }
+
+        SECTION("int64_fast_t")
+        {
+            auto n = j.get<int_fast64_t>();
+            CHECK(json(n) == j);
+        }
+
+        SECTION("int8_least_t")
+        {
+            auto n = j.get<int_least8_t>();
+            CHECK(json(n) == j);
+        }
+
+        SECTION("int16_least_t")
+        {
+            auto n = j.get<int_least16_t>();
+            CHECK(json(n) == j);
+        }
+
+        SECTION("int32_least_t")
+        {
+            auto n = j.get<int_least32_t>();
+            CHECK(json(n) == j);
+        }
+
+        SECTION("int64_least_t")
+        {
+            auto n = j.get<int_least64_t>();
+            CHECK(json(n) == j);
+        }
+
+        SECTION("uint8_t")
+        {
+            auto n = j.get<uint8_t>();
+            CHECK(json(n) == j);
+        }
+
+        SECTION("uint16_t")
+        {
+            auto n = j.get<uint16_t>();
+            CHECK(json(n) == j);
+        }
+
+        SECTION("uint32_t")
+        {
+            auto n = j.get<uint32_t>();
+            CHECK(json(n) == j);
+        }
+
+        SECTION("uint64_t")
+        {
+            auto n = j.get<uint64_t>();
+            CHECK(json(n) == j);
+        }
+
+        SECTION("uint8_fast_t")
+        {
+            auto n = j.get<uint_fast8_t>();
+            CHECK(json(n) == j);
+        }
+
+        SECTION("uint16_fast_t")
+        {
+            auto n = j.get<uint_fast16_t>();
+            CHECK(json(n) == j);
+        }
+
+        SECTION("uint32_fast_t")
+        {
+            auto n = j.get<uint_fast32_t>();
+            CHECK(json(n) == j);
+        }
+
+        SECTION("uint64_fast_t")
+        {
+            auto n = j.get<uint_fast64_t>();
+            CHECK(json(n) == j);
+        }
+
+        SECTION("uint8_least_t")
+        {
+            auto n = j.get<uint_least8_t>();
+            CHECK(json(n) == j);
+        }
+
+        SECTION("uint16_least_t")
+        {
+            auto n = j.get<uint_least16_t>();
+            CHECK(json(n) == j);
+        }
+
+        SECTION("uint32_least_t")
+        {
+            auto n = j.get<uint_least32_t>();
+            CHECK(json(n) == j);
+        }
+
+        SECTION("uint64_least_t")
+        {
+            auto n = j.get<uint_least64_t>();
+            CHECK(json(n) == j);
+        }
+
+        SECTION("exception in case of a non-number type")
+        {
+            CHECK_THROWS_WITH_AS(
+                json(json::value_t::null).get<json::number_integer_t>(),
+                "[json.exception.type_error.302] type must be number, but is null", json::type_error&);
+            CHECK_THROWS_WITH_AS(
+                json(json::value_t::object).get<json::number_integer_t>(),
+                "[json.exception.type_error.302] type must be number, but is object", json::type_error&);
+            CHECK_THROWS_WITH_AS(
+                json(json::value_t::array).get<json::number_integer_t>(),
+                "[json.exception.type_error.302] type must be number, but is array", json::type_error&);
+            CHECK_THROWS_WITH_AS(
+                json(json::value_t::string).get<json::number_integer_t>(),
+                "[json.exception.type_error.302] type must be number, but is string", json::type_error&);
+            CHECK_THROWS_WITH_AS(
+                json(json::value_t::boolean).get<json::number_integer_t>(),
+                "[json.exception.type_error.302] type must be number, but is "
+                "boolean", json::type_error&);
+
+            CHECK_NOTHROW(
+                json(json::value_t::number_float).get<json::number_integer_t>());
+            CHECK_NOTHROW(
+                json(json::value_t::number_float).get<json::number_unsigned_t>());
+        }
+    }
+
+#if JSON_USE_IMPLICIT_CONVERSIONS
+    SECTION("get an integer number (implicit)")
+    {
+        json::number_integer_t const n_reference{42};
+        json j(n_reference);
+        json::number_unsigned_t const n_unsigned_reference{42u};
+        json j_unsigned(n_unsigned_reference);
+
+        SECTION("number_integer_t")
+        {
+            auto n = j.get<json::number_integer_t>();
+            CHECK(json(n) == j);
+        }
+
+        SECTION("number_unsigned_t")
+        {
+            auto n = j_unsigned.get<json::number_unsigned_t>();
+            CHECK(json(n) == j_unsigned);
+        }
+
+        SECTION("short")
+        {
+            short const n = j;
+            CHECK(json(n) == j);
+        }
+
+        SECTION("unsigned short")
+        {
+            unsigned short const n = j_unsigned;
+            CHECK(json(n) == j_unsigned);
+        }
+
+        SECTION("int")
+        {
+            int const n = j;
+            CHECK(json(n) == j);
+        }
+
+        SECTION("unsigned int")
+        {
+            unsigned int const n = j_unsigned;
+            CHECK(json(n) == j_unsigned);
+        }
+
+        SECTION("long")
+        {
+            long const n = j;
+            CHECK(json(n) == j);
+        }
+
+        SECTION("unsigned long")
+        {
+            unsigned long const n = j_unsigned;
+            CHECK(json(n) == j_unsigned);
+        }
+
+        SECTION("long long")
+        {
+            long long const n = j;
+            CHECK(json(n) == j);
+        }
+
+        SECTION("unsigned long long")
+        {
+            unsigned long long const n = j_unsigned;
+            CHECK(json(n) == j_unsigned);
+        }
+
+        SECTION("int8_t")
+        {
+            int8_t const n = j;
+            CHECK(json(n) == j);
+        }
+
+        SECTION("int16_t")
+        {
+            int16_t const n = j;
+            CHECK(json(n) == j);
+        }
+
+        SECTION("int32_t")
+        {
+            int32_t const n = j;
+            CHECK(json(n) == j);
+        }
+
+        SECTION("int64_t")
+        {
+            int64_t const n = j;
+            CHECK(json(n) == j);
+        }
+
+        SECTION("int8_fast_t")
+        {
+            int_fast8_t const n = j;
+            CHECK(json(n) == j);
+        }
+
+        SECTION("int16_fast_t")
+        {
+            int_fast16_t const n = j;
+            CHECK(json(n) == j);
+        }
+
+        SECTION("int32_fast_t")
+        {
+            int_fast32_t const n = j;
+            CHECK(json(n) == j);
+        }
+
+        SECTION("int64_fast_t")
+        {
+            int_fast64_t const n = j;
+            CHECK(json(n) == j);
+        }
+
+        SECTION("int8_least_t")
+        {
+            int_least8_t const n = j;
+            CHECK(json(n) == j);
+        }
+
+        SECTION("int16_least_t")
+        {
+            int_least16_t const n = j;
+            CHECK(json(n) == j);
+        }
+
+        SECTION("int32_least_t")
+        {
+            int_least32_t const n = j;
+            CHECK(json(n) == j);
+        }
+
+        SECTION("int64_least_t")
+        {
+            int_least64_t const n = j;
+            CHECK(json(n) == j);
+        }
+
+        SECTION("uint8_t")
+        {
+            uint8_t const n = j_unsigned;
+            CHECK(json(n) == j_unsigned);
+        }
+
+        SECTION("uint16_t")
+        {
+            uint16_t const n = j_unsigned;
+            CHECK(json(n) == j_unsigned);
+        }
+
+        SECTION("uint32_t")
+        {
+            uint32_t const n = j_unsigned;
+            CHECK(json(n) == j_unsigned);
+        }
+
+        SECTION("uint64_t")
+        {
+            uint64_t const n = j_unsigned;
+            CHECK(json(n) == j_unsigned);
+        }
+
+        SECTION("uint8_fast_t")
+        {
+            uint_fast8_t const n = j_unsigned;
+            CHECK(json(n) == j_unsigned);
+        }
+
+        SECTION("uint16_fast_t")
+        {
+            uint_fast16_t const n = j_unsigned;
+            CHECK(json(n) == j_unsigned);
+        }
+
+        SECTION("uint32_fast_t")
+        {
+            uint_fast32_t const n = j_unsigned;
+            CHECK(json(n) == j_unsigned);
+        }
+
+        SECTION("uint64_fast_t")
+        {
+            uint_fast64_t const n = j_unsigned;
+            CHECK(json(n) == j_unsigned);
+        }
+
+        SECTION("uint8_least_t")
+        {
+            uint_least8_t const n = j_unsigned;
+            CHECK(json(n) == j_unsigned);
+        }
+
+        SECTION("uint16_least_t")
+        {
+            uint_least16_t const n = j_unsigned;
+            CHECK(json(n) == j_unsigned);
+        }
+
+        SECTION("uint32_least_t")
+        {
+            uint_least32_t const n = j_unsigned;
+            CHECK(json(n) == j_unsigned);
+        }
+
+        SECTION("uint64_least_t")
+        {
+            uint_least64_t const n = j_unsigned;
+            CHECK(json(n) == j_unsigned);
+        }
+    }
+#endif
+
+    SECTION("get a floating-point number (explicit)")
+    {
+        json::number_float_t const n_reference{42.23};
+        json const j(n_reference);
+
+        SECTION("number_float_t")
+        {
+            auto n = j.get<json::number_float_t>();
+            CHECK(json(n).m_data.m_value.number_float == Approx(j.m_data.m_value.number_float));
+        }
+
+        SECTION("float")
+        {
+            auto n = j.get<float>();
+            CHECK(json(n).m_data.m_value.number_float == Approx(j.m_data.m_value.number_float));
+        }
+
+        SECTION("double")
+        {
+            auto n = j.get<double>();
+            CHECK(json(n).m_data.m_value.number_float == Approx(j.m_data.m_value.number_float));
+        }
+
+        SECTION("exception in case of a non-string type")
+        {
+            CHECK_THROWS_WITH_AS(
+                json(json::value_t::null).get<json::number_float_t>(),
+                "[json.exception.type_error.302] type must be number, but is null", json::type_error&);
+            CHECK_THROWS_WITH_AS(
+                json(json::value_t::object).get<json::number_float_t>(),
+                "[json.exception.type_error.302] type must be number, but is object", json::type_error&);
+            CHECK_THROWS_WITH_AS(
+                json(json::value_t::array).get<json::number_float_t>(),
+                "[json.exception.type_error.302] type must be number, but is array", json::type_error&);
+            CHECK_THROWS_WITH_AS(
+                json(json::value_t::string).get<json::number_float_t>(),
+                "[json.exception.type_error.302] type must be number, but is string", json::type_error&);
+            CHECK_THROWS_WITH_AS(
+                json(json::value_t::boolean).get<json::number_float_t>(),
+                "[json.exception.type_error.302] type must be number, but is "
+                "boolean", json::type_error&);
+
+            CHECK_NOTHROW(
+                json(json::value_t::number_integer).get<json::number_float_t>());
+            CHECK_NOTHROW(
+                json(json::value_t::number_unsigned).get<json::number_float_t>());
+        }
+    }
+
+#if JSON_USE_IMPLICIT_CONVERSIONS
+    SECTION("get a floating-point number (implicit)")
+    {
+        json::number_float_t const n_reference{42.23};
+        json const j(n_reference);
+
+        SECTION("number_float_t")
+        {
+            json::number_float_t const n = j;
+            CHECK(json(n).m_data.m_value.number_float == Approx(j.m_data.m_value.number_float));
+        }
+
+        SECTION("float")
+        {
+            float const n = j;
+            CHECK(json(n).m_data.m_value.number_float == Approx(j.m_data.m_value.number_float));
+        }
+
+        SECTION("double")
+        {
+            double const n = j;
+            CHECK(json(n).m_data.m_value.number_float == Approx(j.m_data.m_value.number_float));
+        }
+    }
+#endif
+
+    SECTION("get a binary value (explicit)")
+    {
+        json::binary_t const n_reference{{1, 2, 3}};
+        json j(n_reference);
+
+        SECTION("binary_t")
+        {
+            json::binary_t const b = j.get<json::binary_t>();
+            CHECK(*json(b).m_data.m_value.binary == *j.m_data.m_value.binary);
+        }
+
+        SECTION("get_binary()")
+        {
+            SECTION("non-const")
+            {
+                auto& b = j.get_binary();
+                CHECK(*json(b).m_data.m_value.binary == *j.m_data.m_value.binary);
+            }
+
+            SECTION("non-const")
+            {
+                const json j_const = j;
+                const auto& b = j_const.get_binary();
+                CHECK(*json(b).m_data.m_value.binary == *j.m_data.m_value.binary);
+            }
+        }
+
+        SECTION("exception in case of a non-string type")
+        {
+            json j_null(json::value_t::null);
+            json j_object(json::value_t::object);
+            json j_array(json::value_t::array);
+            json j_string(json::value_t::string);
+            json j_boolean(json::value_t::boolean);
+            const json j_null_const(json::value_t::null);
+            const json j_object_const(json::value_t::object);
+            const json j_array_const(json::value_t::array);
+            const json j_string_const(json::value_t::string);
+            const json j_boolean_const(json::value_t::boolean);
+
+            CHECK_THROWS_WITH_AS(j_null.get<json::binary_t>(),
+                                 "[json.exception.type_error.302] type must be binary, but is null",
+                                 json::type_error&);
+            CHECK_THROWS_WITH_AS(j_object.get<json::binary_t>(),
+                                 "[json.exception.type_error.302] type must be binary, but is object",
+                                 json::type_error&);
+            CHECK_THROWS_WITH_AS(j_array.get<json::binary_t>(),
+                                 "[json.exception.type_error.302] type must be binary, but is array",
+                                 json::type_error&);
+            CHECK_THROWS_WITH_AS(j_string.get<json::binary_t>(),
+                                 "[json.exception.type_error.302] type must be binary, but is string",
+                                 json::type_error&);
+            CHECK_THROWS_WITH_AS(j_boolean.get<json::binary_t>(),
+                                 "[json.exception.type_error.302] type must be binary, but is boolean",
+                                 json::type_error&);
+
+            CHECK_THROWS_WITH_AS(j_null_const.get<json::binary_t>(),
+                                 "[json.exception.type_error.302] type must be binary, but is null",
+                                 json::type_error&);
+            CHECK_THROWS_WITH_AS(j_object_const.get<json::binary_t>(),
+                                 "[json.exception.type_error.302] type must be binary, but is object",
+                                 json::type_error&);
+            CHECK_THROWS_WITH_AS(j_array_const.get<json::binary_t>(),
+                                 "[json.exception.type_error.302] type must be binary, but is array",
+                                 json::type_error&);
+            CHECK_THROWS_WITH_AS(j_string_const.get<json::binary_t>(),
+                                 "[json.exception.type_error.302] type must be binary, but is string",
+                                 json::type_error&);
+            CHECK_THROWS_WITH_AS(j_boolean_const.get<json::binary_t>(),
+                                 "[json.exception.type_error.302] type must be binary, but is boolean",
+                                 json::type_error&);
+
+            CHECK_THROWS_WITH_AS(j_null.get_binary(),
+                                 "[json.exception.type_error.302] type must be binary, but is null",
+                                 json::type_error&);
+            CHECK_THROWS_WITH_AS(j_object.get_binary(),
+                                 "[json.exception.type_error.302] type must be binary, but is object",
+                                 json::type_error&);
+            CHECK_THROWS_WITH_AS(j_array.get_binary(),
+                                 "[json.exception.type_error.302] type must be binary, but is array",
+                                 json::type_error&);
+            CHECK_THROWS_WITH_AS(j_string.get_binary(),
+                                 "[json.exception.type_error.302] type must be binary, but is string",
+                                 json::type_error&);
+            CHECK_THROWS_WITH_AS(j_boolean.get_binary(),
+                                 "[json.exception.type_error.302] type must be binary, but is boolean",
+                                 json::type_error&);
+
+            CHECK_THROWS_WITH_AS(j_null_const.get_binary(),
+                                 "[json.exception.type_error.302] type must be binary, but is null",
+                                 json::type_error&);
+            CHECK_THROWS_WITH_AS(j_object_const.get_binary(),
+                                 "[json.exception.type_error.302] type must be binary, but is object",
+                                 json::type_error&);
+            CHECK_THROWS_WITH_AS(j_array_const.get_binary(),
+                                 "[json.exception.type_error.302] type must be binary, but is array",
+                                 json::type_error&);
+            CHECK_THROWS_WITH_AS(j_string_const.get_binary(),
+                                 "[json.exception.type_error.302] type must be binary, but is string",
+                                 json::type_error&);
+            CHECK_THROWS_WITH_AS(j_boolean_const.get_binary(),
+                                 "[json.exception.type_error.302] type must be binary, but is boolean",
+                                 json::type_error&);
+        }
+    }
+
+#if JSON_USE_IMPLICIT_CONVERSIONS
+    SECTION("get a binary value (implicit)")
+    {
+        json::binary_t const n_reference{{1, 2, 3}};
+        json const j(n_reference);
+
+        SECTION("binary_t")
+        {
+            json::binary_t const b = j;
+            CHECK(*json(b).m_data.m_value.binary == *j.m_data.m_value.binary);
+        }
+    }
+#endif
+
+    SECTION("get an enum")
+    {
+        enum c_enum { value_1, value_2 };
+        enum class cpp_enum { value_1, value_2 };
+
+        CHECK(json(value_1).get<c_enum>() == value_1);
+        CHECK(json(cpp_enum::value_1).get<cpp_enum>() == cpp_enum::value_1);
+    }
+
+    SECTION("more involved conversions")
+    {
+        SECTION("object-like STL containers")
+        {
+            json const j1 = {{"one", 1}, {"two", 2}, {"three", 3}};
+            json const j2 = {{"one", 1u}, {"two", 2u}, {"three", 3u}};
+            json const j3 = {{"one", 1.1}, {"two", 2.2}, {"three", 3.3}};
+            json const j4 = {{"one", true}, {"two", false}, {"three", true}};
+            json const j5 = {{"one", "eins"}, {"two", "zwei"}, {"three", "drei"}};
+
+            SECTION("std::map")
+            {
+                j1.get<std::map<std::string, int>>();
+                j2.get<std::map<std::string, unsigned int>>();
+                j3.get<std::map<std::string, double>>();
+                j4.get<std::map<std::string, bool>>();
+                j5.get<std::map<std::string, std::string>>();
+            }
+
+            SECTION("std::unordered_map")
+            {
+                j1.get<std::unordered_map<std::string, int>>();
+                j2.get<std::unordered_map<std::string, unsigned int>>();
+                j3.get<std::unordered_map<std::string, double>>();
+                j4.get<std::unordered_map<std::string, bool>>();
+                j5.get<std::unordered_map<std::string, std::string>>();
+                // CHECK(m5["one"] == "eins");
+            }
+
+            SECTION("std::multimap")
+            {
+                j1.get<std::multimap<std::string, int>>();
+                j2.get<std::multimap<std::string, unsigned int>>();
+                j3.get<std::multimap<std::string, double>>();
+                j4.get<std::multimap<std::string, bool>>();
+                j5.get<std::multimap<std::string, std::string>>();
+                // CHECK(m5["one"] == "eins");
+            }
+
+            SECTION("std::unordered_multimap")
+            {
+                j1.get<std::unordered_multimap<std::string, int>>();
+                j2.get<std::unordered_multimap<std::string, unsigned int>>();
+                j3.get<std::unordered_multimap<std::string, double>>();
+                j4.get<std::unordered_multimap<std::string, bool>>();
+                j5.get<std::unordered_multimap<std::string, std::string>>();
+                // CHECK(m5["one"] == "eins");
+            }
+
+            SECTION("exception in case of a non-object type")
+            {
+                CHECK_THROWS_WITH_AS(
+                    (json().get<std::map<std::string, int>>()),
+                    "[json.exception.type_error.302] type must be object, but is null", json::type_error&);
+            }
+        }
+
+        SECTION("array-like STL containers")
+        {
+            json const j1 = {1, 2, 3, 4};
+            json const j2 = {1u, 2u, 3u, 4u};
+            json const j3 = {1.2, 2.3, 3.4, 4.5};
+            json const j4 = {true, false, true};
+            json const j5 = {"one", "two", "three"};
+
+            SECTION("std::list")
+            {
+                j1.get<std::list<int>>();
+                j2.get<std::list<unsigned int>>();
+                j3.get<std::list<double>>();
+                j4.get<std::list<bool>>();
+                j5.get<std::list<std::string>>();
+            }
+
+            SECTION("std::forward_list")
+            {
+                j1.get<std::forward_list<int>>();
+                j2.get<std::forward_list<unsigned int>>();
+                j3.get<std::forward_list<double>>();
+                j4.get<std::forward_list<bool>>();
+                j5.get<std::forward_list<std::string>>();
+            }
+
+            SECTION("std::array")
+            {
+                j1.get<std::array<int, 4>>();
+                j2.get<std::array<unsigned int, 3>>();
+                j3.get<std::array<double, 4>>();
+                j4.get<std::array<bool, 3>>();
+                j5.get<std::array<std::string, 3>>();
+
+                SECTION("std::array is larger than JSON")
+                {
+                    std::array<int, 6> arr6 = {{1, 2, 3, 4, 5, 6}};
+                    CHECK_THROWS_WITH_AS(j1.get_to(arr6), "[json.exception.out_of_range.401] "
+                                         "array index 4 is out of range", json::out_of_range&);
+                }
+
+                SECTION("std::array is smaller than JSON")
+                {
+                    std::array<int, 2> arr2 = {{8, 9}};
+                    j1.get_to(arr2);
+                    CHECK(arr2[0] == 1);
+                    CHECK(arr2[1] == 2);
+                }
+            }
+
+            SECTION("std::valarray")
+            {
+                j1.get<std::valarray<int>>();
+                j2.get<std::valarray<unsigned int>>();
+                j3.get<std::valarray<double>>();
+                j4.get<std::valarray<bool>>();
+                j5.get<std::valarray<std::string>>();
+            }
+
+            SECTION("std::vector")
+            {
+                j1.get<std::vector<int>>();
+                j2.get<std::vector<unsigned int>>();
+                j3.get<std::vector<double>>();
+                j4.get<std::vector<bool>>();
+                j5.get<std::vector<std::string>>();
+            }
+
+            SECTION("std::deque")
+            {
+                j1.get<std::deque<int>>();
+                j2.get<std::deque<unsigned int>>();
+                j2.get<std::deque<double>>();
+                j4.get<std::deque<bool>>();
+                j5.get<std::deque<std::string>>();
+            }
+
+            SECTION("std::set")
+            {
+                j1.get<std::set<int>>();
+                j2.get<std::set<unsigned int>>();
+                j3.get<std::set<double>>();
+                j4.get<std::set<bool>>();
+                j5.get<std::set<std::string>>();
+            }
+
+            SECTION("std::unordered_set")
+            {
+                j1.get<std::unordered_set<int>>();
+                j2.get<std::unordered_set<unsigned int>>();
+                j3.get<std::unordered_set<double>>();
+                j4.get<std::unordered_set<bool>>();
+                j5.get<std::unordered_set<std::string>>();
+            }
+
+            SECTION("std::map (array of pairs)")
+            {
+                std::map<int, int> m{{0, 1}, {1, 2}, {2, 3}};
+                json const j6 = m;
+
+                auto m2 = j6.get<std::map<int, int>>();
+                CHECK(m == m2);
+
+                json const j7 = {0, 1, 2, 3};
+                json const j8 = 2;
+                CHECK_THROWS_WITH_AS((j7.get<std::map<int, int>>()),
+                                     "[json.exception.type_error.302] type must be array, "
+                                     "but is number", json::type_error&);
+                CHECK_THROWS_WITH_AS((j8.get<std::map<int, int>>()),
+                                     "[json.exception.type_error.302] type must be array, "
+                                     "but is number", json::type_error&);
+
+                SECTION("superfluous entries")
+                {
+                    json const j9 = {{0, 1, 2}, {1, 2, 3}, {2, 3, 4}};
+                    m2 = j9.get<std::map<int, int>>();
+                    CHECK(m == m2);
+                }
+            }
+
+            SECTION("std::unordered_map (array of pairs)")
+            {
+                std::unordered_map<int, int> m{{0, 1}, {1, 2}, {2, 3}};
+                json const j6 = m;
+
+                auto m2 = j6.get<std::unordered_map<int, int>>();
+                CHECK(m == m2);
+
+                json const j7 = {0, 1, 2, 3};
+                json const j8 = 2;
+                CHECK_THROWS_WITH_AS((j7.get<std::unordered_map<int, int>>()),
+                                     "[json.exception.type_error.302] type must be array, "
+                                     "but is number", json::type_error&);
+                CHECK_THROWS_WITH_AS((j8.get<std::unordered_map<int, int>>()),
+                                     "[json.exception.type_error.302] type must be array, "
+                                     "but is number", json::type_error&);
+
+                SECTION("superfluous entries")
+                {
+                    json const j9{{0, 1, 2}, {1, 2, 3}, {2, 3, 4}};
+                    m2 = j9.get<std::unordered_map<int, int>>();
+                    CHECK(m == m2);
+                }
+            }
+
+            SECTION("exception in case of a non-object type")
+            {
+                // does type really must be an array? or it rather must not be null?
+                // that's what I thought when other test like this one broke
+                CHECK_THROWS_WITH_AS(
+                    (json().get<std::list<int>>()),
+                    "[json.exception.type_error.302] type must be array, but is null", json::type_error&);
+                CHECK_THROWS_WITH_AS(
+                    (json().get<std::vector<int>>()),
+                    "[json.exception.type_error.302] type must be array, but is null", json::type_error&);
+                CHECK_THROWS_WITH_AS(
+                    (json().get<std::vector<json>>()),
+                    "[json.exception.type_error.302] type must be array, but is null", json::type_error&);
+                CHECK_THROWS_WITH_AS(
+                    (json().get<std::list<json>>()),
+                    "[json.exception.type_error.302] type must be array, but is null", json::type_error&);
+                CHECK_THROWS_WITH_AS(
+                    (json().get<std::valarray<int>>()),
+                    "[json.exception.type_error.302] type must be array, but is null", json::type_error&);
+                CHECK_THROWS_WITH_AS(
+                    (json().get<std::map<int, int>>()),
+                    "[json.exception.type_error.302] type must be array, but is null", json::type_error&);
+            }
+        }
+    }
+}
+
+enum class cards {kreuz, pik, herz, karo};
+
+// NOLINTNEXTLINE(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays) - false positive
+NLOHMANN_JSON_SERIALIZE_ENUM(cards,
+{
+    {cards::kreuz, "kreuz"},
+    {cards::pik, "pik"},
+    {cards::pik, "puk"},  // second entry for cards::puk; will not be used
+    {cards::herz, "herz"},
+    {cards::karo, "karo"}
+})
+
+enum TaskState
+{
+    TS_STOPPED,
+    TS_RUNNING,
+    TS_COMPLETED,
+    TS_INVALID = -1,
+};
+
+// NOLINTNEXTLINE(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays) - false positive
+NLOHMANN_JSON_SERIALIZE_ENUM(TaskState,
+{
+    {TS_INVALID, nullptr},
+    {TS_STOPPED, "stopped"},
+    {TS_RUNNING, "running"},
+    {TS_COMPLETED, "completed"},
+})
+
+TEST_CASE("JSON to enum mapping")
+{
+    SECTION("enum class")
+    {
+        // enum -> json
+        CHECK(json(cards::kreuz) == "kreuz");
+        CHECK(json(cards::pik) == "pik");
+        CHECK(json(cards::herz) == "herz");
+        CHECK(json(cards::karo) == "karo");
+
+        // json -> enum
+        CHECK(cards::kreuz == json("kreuz"));
+        CHECK(cards::pik == json("pik"));
+        CHECK(cards::herz == json("herz"));
+        CHECK(cards::karo == json("karo"));
+
+        // invalid json -> first enum
+        CHECK(cards::kreuz == json("what?").get<cards>());
+    }
+
+    SECTION("traditional enum")
+    {
+        // enum -> json
+        CHECK(json(TS_STOPPED) == "stopped");
+        CHECK(json(TS_RUNNING) == "running");
+        CHECK(json(TS_COMPLETED) == "completed");
+        CHECK(json(TS_INVALID) == json());
+
+        // json -> enum
+        CHECK(TS_STOPPED == json("stopped"));
+        CHECK(TS_RUNNING == json("running"));
+        CHECK(TS_COMPLETED == json("completed"));
+        CHECK(TS_INVALID == json());
+
+        // invalid json -> first enum
+        CHECK(TS_INVALID == json("what?").get<TaskState>());
+    }
+}
+
+DOCTEST_CLANG_SUPPRESS_WARNING_POP
diff --git a/external_imported/json/tests/src/unit-custom-base-class.cpp b/external_imported/json/tests/src/unit-custom-base-class.cpp
new file mode 100644
index 000000000..7d3c2eefc
--- /dev/null
+++ b/external_imported/json/tests/src/unit-custom-base-class.cpp
@@ -0,0 +1,336 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include <set>
+#include <sstream>
+#include <string>
+
+#include "doctest_compatibility.h"
+
+#include <nlohmann/json.hpp>
+
+// Test extending nlohmann::json by using a custom base class.
+// Add some metadata to each node and test the behaviour of copy / move
+template<class MetaDataType>
+class json_metadata
+{
+  public:
+    using metadata_t = MetaDataType;
+    metadata_t& metadata()
+    {
+        return m_metadata;
+    }
+    const metadata_t& metadata() const
+    {
+        return m_metadata;
+    }
+  private:
+    metadata_t m_metadata = {};
+};
+
+template<class T>
+using json_with_metadata =
+    nlohmann::basic_json <
+    std::map,
+    std::vector,
+    std::string,
+    bool,
+    std::int64_t,
+    std::uint64_t,
+    double,
+    std::allocator,
+    nlohmann::adl_serializer,
+    std::vector<std::uint8_t>,
+    json_metadata<T>
+    >;
+
+TEST_CASE("JSON Node Metadata")
+{
+    SECTION("type int")
+    {
+        using json = json_with_metadata<int>;
+        json null;
+        auto obj   = json::object();
+        auto array = json::array();
+
+        null.metadata()  = 1;
+        obj.metadata()   = 2;
+        array.metadata() = 3;
+        auto copy = array;
+
+        CHECK(null.metadata()  == 1);
+        CHECK(obj.metadata()   == 2);
+        CHECK(array.metadata() == 3);
+        CHECK(copy.metadata()  == 3);
+    }
+    SECTION("type vector<int>")
+    {
+        using json = json_with_metadata<std::vector<int>>;
+        json value;
+        value.metadata().emplace_back(1);
+        auto copy = value;
+        value.metadata().emplace_back(2);
+
+        CHECK(copy.metadata().size()  == 1);
+        CHECK(copy.metadata().at(0)   == 1);
+        CHECK(value.metadata().size() == 2);
+        CHECK(value.metadata().at(0)  == 1);
+        CHECK(value.metadata().at(1)  == 2);
+    }
+    SECTION("copy ctor")
+    {
+        using json = json_with_metadata<std::vector<int>>;
+        json value;
+        value.metadata().emplace_back(1);
+        value.metadata().emplace_back(2);
+
+        json copy = value;
+
+        CHECK(copy.metadata().size()  == 2);
+        CHECK(copy.metadata().at(0)   == 1);
+        CHECK(copy.metadata().at(1)   == 2);
+        CHECK(value.metadata().size() == 2);
+        CHECK(value.metadata().at(0)  == 1);
+        CHECK(value.metadata().at(1)  == 2);
+
+        value.metadata().clear();
+        CHECK(copy.metadata().size()  == 2);
+        CHECK(value.metadata().size() == 0);
+    }
+    SECTION("move ctor")
+    {
+        using json = json_with_metadata<std::vector<int>>;
+        json value;
+        value.metadata().emplace_back(1);
+        value.metadata().emplace_back(2);
+
+        const json moved = std::move(value);
+
+        CHECK(moved.metadata().size()  == 2);
+        CHECK(moved.metadata().at(0)   == 1);
+        CHECK(moved.metadata().at(1)   == 2);
+    }
+    SECTION("move assign")
+    {
+        using json = json_with_metadata<std::vector<int>>;
+        json value;
+        value.metadata().emplace_back(1);
+        value.metadata().emplace_back(2);
+
+        json moved;
+        moved = std::move(value);
+
+        CHECK(moved.metadata().size()  == 2);
+        CHECK(moved.metadata().at(0)   == 1);
+        CHECK(moved.metadata().at(1)   == 2);
+    }
+    SECTION("copy assign")
+    {
+        using json = json_with_metadata<std::vector<int>>;
+        json value;
+        value.metadata().emplace_back(1);
+        value.metadata().emplace_back(2);
+
+        json copy;
+        copy = value;
+
+        CHECK(copy.metadata().size()  == 2);
+        CHECK(copy.metadata().at(0)   == 1);
+        CHECK(copy.metadata().at(1)   == 2);
+        CHECK(value.metadata().size() == 2);
+        CHECK(value.metadata().at(0)  == 1);
+        CHECK(value.metadata().at(1)  == 2);
+
+        value.metadata().clear();
+        CHECK(copy.metadata().size()  == 2);
+        CHECK(value.metadata().size() == 0);
+    }
+    SECTION("type unique_ptr<int>")
+    {
+        using json = json_with_metadata<std::unique_ptr<int>>;
+        json value;
+        value.metadata().reset(new int(42)); // NOLINT(cppcoreguidelines-owning-memory)
+        auto moved = std::move(value);
+
+        CHECK(moved.metadata() != nullptr);
+        CHECK(*moved.metadata() == 42);
+    }
+    SECTION("type vector<int> in json array")
+    {
+        using json = json_with_metadata<std::vector<int>>;
+        json value;
+        value.metadata().emplace_back(1);
+        value.metadata().emplace_back(2);
+
+        json const array(10, value);
+
+        CHECK(value.metadata().size() == 2);
+        CHECK(value.metadata().at(0)  == 1);
+        CHECK(value.metadata().at(1)  == 2);
+
+        for (const auto& val : array)
+        {
+            CHECK(val.metadata().size() == 2);
+            CHECK(val.metadata().at(0)  == 1);
+            CHECK(val.metadata().at(1)  == 2);
+        }
+    }
+}
+
+// Test extending nlohmann::json by using a custom base class.
+// Add a custom member function template iterating over the whole json tree.
+class visitor_adaptor
+{
+  public:
+    template <class Fnc>
+    void visit(const Fnc& fnc) const;
+  private:
+    template <class Ptr, class Fnc>
+    void do_visit(const Ptr& ptr, const Fnc& fnc) const;
+};
+
+using json_with_visitor_t = nlohmann::basic_json <
+                            std::map,
+                            std::vector,
+                            std::string,
+                            bool,
+                            std::int64_t,
+                            std::uint64_t,
+                            double,
+                            std::allocator,
+                            nlohmann::adl_serializer,
+                            std::vector<std::uint8_t>,
+                            visitor_adaptor
+                            >;
+
+template <class Fnc>
+void visitor_adaptor::visit(const Fnc& fnc) const
+{
+    do_visit(json_with_visitor_t::json_pointer{}, fnc);
+}
+
+template <class Ptr, class Fnc>
+void visitor_adaptor::do_visit(const Ptr& ptr, const Fnc& fnc) const
+{
+    using value_t = nlohmann::detail::value_t;
+    const json_with_visitor_t& json = *static_cast<const json_with_visitor_t*>(this); // NOLINT(cppcoreguidelines-pro-type-static-cast-downcast)
+    switch (json.type())
+    {
+        case value_t::object:
+            for (const auto& entry : json.items())
+            {
+                entry.value().do_visit(ptr / entry.key(), fnc);
+            }
+            break;
+        case value_t::array:
+            for (std::size_t i = 0; i < json.size(); ++i)
+            {
+                json.at(i).do_visit(ptr / std::to_string(i), fnc);
+            }
+            break;
+        case value_t::discarded:
+            break;
+        case value_t::null:
+        case value_t::string:
+        case value_t::boolean:
+        case value_t::number_integer:
+        case value_t::number_unsigned:
+        case value_t::number_float:
+        case value_t::binary:
+        default:
+            fnc(ptr, json);
+    }
+}
+
+TEST_CASE("JSON Visit Node")
+{
+    json_with_visitor_t json;
+    json["null"];
+    json["int"]  = -1;
+    json["uint"] = 1U;
+    json["float"] = 1.0;
+    json["boolean"] = true;
+    json["string"] = "string";
+    json["array"].push_back(0);
+    json["array"].push_back(1);
+    json["array"].push_back(json);
+
+    std::set<std::string> expected
+    {
+        "/null - null - null",
+        "/int - number_integer - -1",
+        "/uint - number_unsigned - 1",
+        "/float - number_float - 1.0",
+        "/boolean - boolean - true",
+        "/string - string - \"string\"",
+        "/array/0 - number_integer - 0",
+        "/array/1 - number_integer - 1",
+
+        "/array/2/null - null - null",
+        "/array/2/int - number_integer - -1",
+        "/array/2/uint - number_unsigned - 1",
+        "/array/2/float - number_float - 1.0",
+        "/array/2/boolean - boolean - true",
+        "/array/2/string - string - \"string\"",
+        "/array/2/array/0 - number_integer - 0",
+        "/array/2/array/1 - number_integer - 1"
+    };
+
+    json.visit(
+        [&](const json_with_visitor_t::json_pointer & p,
+            const json_with_visitor_t& j)
+    {
+        std::stringstream str;
+        str << p.to_string() << " - " ;
+        using value_t = nlohmann::detail::value_t;
+        switch (j.type())
+        {
+            case value_t::object:
+                str << "object";
+                break;
+            case value_t::array:
+                str << "array";
+                break;
+            case value_t::discarded:
+                str << "discarded";
+                break;
+            case value_t::null:
+                str << "null";
+                break;
+            case value_t::string:
+                str << "string";
+                break;
+            case value_t::boolean:
+                str << "boolean";
+                break;
+            case value_t::number_integer:
+                str << "number_integer";
+                break;
+            case value_t::number_unsigned:
+                str << "number_unsigned";
+                break;
+            case value_t::number_float:
+                str << "number_float";
+                break;
+            case value_t::binary:
+                str << "binary";
+                break;
+            default:
+                str << "error";
+                break;
+        }
+        str << " - "  << j.dump();
+        CHECK(json.at(p) == j);
+        INFO(str.str());
+        CHECK(expected.count(str.str()) == 1);
+        expected.erase(str.str());
+    }
+    );
+    CHECK(expected.empty());
+}
diff --git a/external_imported/json/tests/src/unit-deserialization.cpp b/external_imported/json/tests/src/unit-deserialization.cpp
new file mode 100644
index 000000000..3bc161f1d
--- /dev/null
+++ b/external_imported/json/tests/src/unit-deserialization.cpp
@@ -0,0 +1,1189 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// Copyright (c) 2013-2022 Niels Lohmann <http://nlohmann.me>.
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+#include <nlohmann/json.hpp>
+using nlohmann::json;
+#ifdef JSON_TEST_NO_GLOBAL_UDLS
+    using namespace nlohmann::literals; // NOLINT(google-build-using-namespace)
+#endif
+
+#include <iostream>
+#include <iterator>
+#include <sstream>
+#include <valarray>
+
+namespace
+{
+struct SaxEventLogger : public nlohmann::json_sax<json>
+{
+    bool null() override
+    {
+        events.emplace_back("null()");
+        return true;
+    }
+
+    bool boolean(bool val) override
+    {
+        events.emplace_back(val ? "boolean(true)" : "boolean(false)");
+        return true;
+    }
+
+    bool number_integer(json::number_integer_t val) override
+    {
+        events.push_back("number_integer(" + std::to_string(val) + ")");
+        return true;
+    }
+
+    bool number_unsigned(json::number_unsigned_t val) override
+    {
+        events.push_back("number_unsigned(" + std::to_string(val) + ")");
+        return true;
+    }
+
+    bool number_float(json::number_float_t /*val*/, const std::string& s) override
+    {
+        events.push_back("number_float(" + s + ")");
+        return true;
+    }
+
+    bool string(std::string& val) override
+    {
+        events.push_back("string(" + val + ")");
+        return true;
+    }
+
+    bool binary(json::binary_t& val) override
+    {
+        std::string binary_contents = "binary(";
+        std::string comma_space;
+        for (auto b : val)
+        {
+            binary_contents.append(comma_space);
+            binary_contents.append(std::to_string(static_cast<int>(b)));
+            comma_space = ", ";
+        }
+        binary_contents.append(")");
+        events.push_back(binary_contents);
+        return true;
+    }
+
+    bool start_object(std::size_t elements) override
+    {
+        if (elements == static_cast<std::size_t>(-1))
+        {
+            events.emplace_back("start_object()");
+        }
+        else
+        {
+            events.push_back("start_object(" + std::to_string(elements) + ")");
+        }
+        return true;
+    }
+
+    bool key(std::string& val) override
+    {
+        events.push_back("key(" + val + ")");
+        return true;
+    }
+
+    bool end_object() override
+    {
+        events.emplace_back("end_object()");
+        return true;
+    }
+
+    bool start_array(std::size_t elements) override
+    {
+        if (elements == static_cast<std::size_t>(-1))
+        {
+            events.emplace_back("start_array()");
+        }
+        else
+        {
+            events.push_back("start_array(" + std::to_string(elements) + ")");
+        }
+        return true;
+    }
+
+    bool end_array() override
+    {
+        events.emplace_back("end_array()");
+        return true;
+    }
+
+    bool parse_error(std::size_t position, const std::string& /*last_token*/, const json::exception& /*ex*/) override
+    {
+        events.push_back("parse_error(" + std::to_string(position) + ")");
+        return false;
+    }
+
+    std::vector<std::string> events {};
+};
+
+struct SaxEventLoggerExitAfterStartObject : public SaxEventLogger
+{
+    bool start_object(std::size_t elements) override
+    {
+        if (elements == static_cast<std::size_t>(-1))
+        {
+            events.emplace_back("start_object()");
+        }
+        else
+        {
+            events.push_back("start_object(" + std::to_string(elements) + ")");
+        }
+        return false;
+    }
+};
+
+struct SaxEventLoggerExitAfterKey : public SaxEventLogger
+{
+    bool key(std::string& val) override
+    {
+        events.push_back("key(" + val + ")");
+        return false;
+    }
+};
+
+struct SaxEventLoggerExitAfterStartArray : public SaxEventLogger
+{
+    bool start_array(std::size_t elements) override
+    {
+        if (elements == static_cast<std::size_t>(-1))
+        {
+            events.emplace_back("start_array()");
+        }
+        else
+        {
+            events.push_back("start_array(" + std::to_string(elements) + ")");
+        }
+        return false;
+    }
+};
+
+template <typename T>
+class proxy_iterator
+{
+  public:
+    using iterator = typename T::iterator;
+    using value_type = typename std::iterator_traits<iterator>::value_type;
+    using reference = typename std::iterator_traits<iterator>::reference;
+    using pointer = typename std::iterator_traits<iterator>::pointer;
+    using difference_type =
+        typename std::iterator_traits<iterator>::difference_type;
+    using iterator_category = std::input_iterator_tag;
+
+    proxy_iterator() = default;
+    explicit proxy_iterator(iterator& it) : m_it(std::addressof(it)) {}
+
+    proxy_iterator& operator++()
+    {
+        ++*m_it;
+        return *this;
+    }
+
+    proxy_iterator& operator--()
+    {
+        --*m_it;
+        return *this;
+    }
+
+    bool operator==(const proxy_iterator& rhs) const
+    {
+        return (m_it && rhs.m_it) ? (*m_it == *rhs.m_it) : (m_it == rhs.m_it);
+    }
+
+    bool operator!=(const proxy_iterator& rhs) const
+    {
+        return !(*this == rhs);
+    }
+
+    reference operator*() const
+    {
+        return **m_it;
+    }
+
+  private:
+    iterator* m_it = nullptr;
+};
+} // namespace
+
+TEST_CASE("deserialization")
+{
+    SECTION("successful deserialization")
+    {
+        SECTION("stream")
+        {
+            std::stringstream ss1;
+            std::stringstream ss2;
+            std::stringstream ss3;
+            ss1 << R"(["foo",1,2,3,false,{"one":1}])";
+            ss2 << R"(["foo",1,2,3,false,{"one":1}])";
+            ss3 << R"(["foo",1,2,3,false,{"one":1}])";
+            json j = json::parse(ss1);
+            CHECK(json::accept(ss2));
+            CHECK(j == json({"foo", 1, 2, 3, false, {{"one", 1}}}));
+
+            SaxEventLogger l;
+            CHECK(json::sax_parse(ss3, &l));
+            CHECK(l.events.size() == 11);
+            CHECK(l.events == std::vector<std::string>(
+            {
+                "start_array()", "string(foo)", "number_unsigned(1)",
+                "number_unsigned(2)", "number_unsigned(3)", "boolean(false)",
+                "start_object()", "key(one)", "number_unsigned(1)",
+                "end_object()", "end_array()"
+            }));
+        }
+
+        SECTION("string literal")
+        {
+            const auto* s = R"(["foo",1,2,3,false,{"one":1}])";
+            json j = json::parse(s);
+            CHECK(json::accept(s));
+            CHECK(j == json({"foo", 1, 2, 3, false, {{"one", 1}}}));
+
+            SaxEventLogger l;
+            CHECK(json::sax_parse(s, &l));
+            CHECK(l.events.size() == 11);
+            CHECK(l.events == std::vector<std::string>(
+            {
+                "start_array()", "string(foo)", "number_unsigned(1)",
+                "number_unsigned(2)", "number_unsigned(3)", "boolean(false)",
+                "start_object()", "key(one)", "number_unsigned(1)",
+                "end_object()", "end_array()"
+            }));
+        }
+
+        SECTION("string_t")
+        {
+            json::string_t const s = R"(["foo",1,2,3,false,{"one":1}])";
+            json j = json::parse(s);
+            CHECK(json::accept(s));
+            CHECK(j == json({"foo", 1, 2, 3, false, {{"one", 1}}}));
+
+            SaxEventLogger l;
+            CHECK(json::sax_parse(s, &l));
+            CHECK(l.events.size() == 11);
+            CHECK(l.events == std::vector<std::string>(
+            {
+                "start_array()", "string(foo)", "number_unsigned(1)",
+                "number_unsigned(2)", "number_unsigned(3)", "boolean(false)",
+                "start_object()", "key(one)", "number_unsigned(1)",
+                "end_object()", "end_array()"
+            }));
+        }
+
+        SECTION("operator<<")
+        {
+            std::stringstream ss;
+            ss << R"(["foo",1,2,3,false,{"one":1}])";
+            json j;
+            j << ss;
+            CHECK(j == json({"foo", 1, 2, 3, false, {{"one", 1}}}));
+        }
+
+        SECTION("operator>>")
+        {
+            std::stringstream ss;
+            ss << R"(["foo",1,2,3,false,{"one":1}])";
+            json j;
+            ss >> j;
+            CHECK(j == json({"foo", 1, 2, 3, false, {{"one", 1}}}));
+        }
+
+        SECTION("user-defined string literal")
+        {
+            CHECK("[\"foo\",1,2,3,false,{\"one\":1}]"_json == json({"foo", 1, 2, 3, false, {{"one", 1}}}));
+        }
+    }
+
+    SECTION("unsuccessful deserialization")
+    {
+        SECTION("stream")
+        {
+            std::stringstream ss1;
+            std::stringstream ss3;
+            std::stringstream ss4;
+            std::stringstream ss5;
+            ss1 << R"(["foo",1,2,3,false,{"one":1})";
+            ss3 << R"(["foo",1,2,3,false,{"one":1})";
+            ss4 << R"(["foo",1,2,3,false,{"one":1})";
+            ss5 << R"(["foo",1,2,3,false,{"one":1})";
+
+            json _;
+            CHECK_THROWS_WITH_AS(_ = json::parse(ss1), "[json.exception.parse_error.101] parse error at line 1, column 29: syntax error while parsing array - unexpected end of input; expected ']'", json::parse_error&);
+            CHECK(!json::accept(ss3));
+
+            json j_error;
+            CHECK_NOTHROW(j_error = json::parse(ss4, nullptr, false));
+            CHECK(j_error.is_discarded());
+
+            SaxEventLogger l;
+            CHECK(!json::sax_parse(ss5, &l));
+            CHECK(l.events.size() == 11);
+            CHECK(l.events == std::vector<std::string>(
+            {
+                "start_array()", "string(foo)", "number_unsigned(1)",
+                "number_unsigned(2)", "number_unsigned(3)", "boolean(false)",
+                "start_object()", "key(one)", "number_unsigned(1)",
+                "end_object()", "parse_error(29)"
+            }));
+        }
+
+        SECTION("string")
+        {
+            json::string_t const s = R"(["foo",1,2,3,false,{"one":1})";
+            json _;
+            CHECK_THROWS_WITH_AS(_ = json::parse(s), "[json.exception.parse_error.101] parse error at line 1, column 29: syntax error while parsing array - unexpected end of input; expected ']'", json::parse_error&);
+            CHECK(!json::accept(s));
+
+            json j_error;
+            CHECK_NOTHROW(j_error = json::parse(s, nullptr, false));
+            CHECK(j_error.is_discarded());
+
+            SaxEventLogger l;
+            CHECK(!json::sax_parse(s, &l));
+            CHECK(l.events.size() == 11);
+            CHECK(l.events == std::vector<std::string>(
+            {
+                "start_array()", "string(foo)", "number_unsigned(1)",
+                "number_unsigned(2)", "number_unsigned(3)", "boolean(false)",
+                "start_object()", "key(one)", "number_unsigned(1)",
+                "end_object()", "parse_error(29)"
+            }));
+        }
+
+        SECTION("operator<<")
+        {
+            std::stringstream ss;
+            ss << R"(["foo",1,2,3,false,{"one":1})";
+            json j;
+            CHECK_THROWS_WITH_AS(j << ss, "[json.exception.parse_error.101] parse error at line 1, column 29: syntax error while parsing array - unexpected end of input; expected ']'", json::parse_error&);
+        }
+
+        SECTION("operator>>")
+        {
+            std::stringstream ss;
+            ss << R"(["foo",1,2,3,false,{"one":1})";
+            json j;
+            CHECK_THROWS_WITH_AS(ss >> j, "[json.exception.parse_error.101] parse error at line 1, column 29: syntax error while parsing array - unexpected end of input; expected ']'", json::parse_error&);
+        }
+
+        SECTION("user-defined string literal")
+        {
+            CHECK_THROWS_WITH_AS("[\"foo\",1,2,3,false,{\"one\":1}"_json, "[json.exception.parse_error.101] parse error at line 1, column 29: syntax error while parsing array - unexpected end of input; expected ']'", json::parse_error&);
+        }
+    }
+
+    SECTION("contiguous containers")
+    {
+        SECTION("directly")
+        {
+            SECTION("from std::vector")
+            {
+                std::vector<uint8_t> const v = {'t', 'r', 'u', 'e'};
+                CHECK(json::parse(v) == json(true));
+                CHECK(json::accept(v));
+
+                SaxEventLogger l;
+                CHECK(json::sax_parse(v, &l));
+                CHECK(l.events.size() == 1);
+                CHECK(l.events == std::vector<std::string>({"boolean(true)"}));
+            }
+
+            SECTION("from std::array")
+            {
+                std::array<uint8_t, 5> const v { {'t', 'r', 'u', 'e'} };
+                CHECK(json::parse(v) == json(true));
+                CHECK(json::accept(v));
+
+                SaxEventLogger l;
+                CHECK(json::sax_parse(v, &l));
+                CHECK(l.events.size() == 1);
+                CHECK(l.events == std::vector<std::string>({"boolean(true)"}));
+            }
+
+            SECTION("from array")
+            {
+                uint8_t v[] = {'t', 'r', 'u', 'e'}; // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+                CHECK(json::parse(v) == json(true));
+                CHECK(json::accept(v));
+
+                SaxEventLogger l;
+                CHECK(json::sax_parse(v, &l));
+                CHECK(l.events.size() == 1);
+                CHECK(l.events == std::vector<std::string>({"boolean(true)"}));
+            }
+
+            SECTION("from chars")
+            {
+                auto* v = new uint8_t[5]; // NOLINT(cppcoreguidelines-owning-memory)
+                v[0] = 't';
+                v[1] = 'r';
+                v[2] = 'u';
+                v[3] = 'e';
+                v[4] = '\0';
+                CHECK(json::parse(v) == json(true));
+                CHECK(json::accept(v));
+
+                SaxEventLogger l;
+                CHECK(json::sax_parse(v, &l));
+                CHECK(l.events.size() == 1);
+                CHECK(l.events == std::vector<std::string>({"boolean(true)"}));
+
+                delete[] v; // NOLINT(cppcoreguidelines-owning-memory)
+            }
+
+            SECTION("from std::string")
+            {
+                std::string const v = {'t', 'r', 'u', 'e'};
+                CHECK(json::parse(v) == json(true));
+                CHECK(json::accept(v));
+
+                SaxEventLogger l;
+                CHECK(json::sax_parse(v, &l));
+                CHECK(l.events.size() == 1);
+                CHECK(l.events == std::vector<std::string>({"boolean(true)"}));
+            }
+
+            SECTION("from std::initializer_list")
+            {
+                std::initializer_list<uint8_t> const v = {'t', 'r', 'u', 'e'};
+                CHECK(json::parse(v) == json(true));
+                CHECK(json::accept(v));
+
+                SaxEventLogger l;
+                CHECK(json::sax_parse(v, &l));
+                CHECK(l.events.size() == 1);
+                CHECK(l.events == std::vector<std::string>({"boolean(true)"}));
+            }
+
+            SECTION("empty container")
+            {
+                std::vector<uint8_t> const v;
+                json _;
+                CHECK_THROWS_AS(_ = json::parse(v), json::parse_error&);
+                CHECK(!json::accept(v));
+
+                SaxEventLogger l;
+                CHECK(!json::sax_parse(v, &l));
+                CHECK(l.events.size() == 1);
+                CHECK(l.events == std::vector<std::string>({"parse_error(1)"}));
+            }
+        }
+
+        SECTION("via iterator range")
+        {
+            SECTION("from std::vector")
+            {
+                std::vector<uint8_t> v = {'t', 'r', 'u', 'e'};
+                CHECK(json::parse(std::begin(v), std::end(v)) == json(true));
+                CHECK(json::accept(std::begin(v), std::end(v)));
+
+                SaxEventLogger l;
+                CHECK(json::sax_parse(std::begin(v), std::end(v), &l));
+                CHECK(l.events.size() == 1);
+                CHECK(l.events == std::vector<std::string>({"boolean(true)"}));
+
+            }
+
+            SECTION("from std::array")
+            {
+                std::array<uint8_t, 5> v { {'t', 'r', 'u', 'e'} };
+                CHECK(json::parse(std::begin(v), std::end(v)) == json(true));
+                CHECK(json::accept(std::begin(v), std::end(v)));
+
+                SaxEventLogger l;
+                CHECK(json::sax_parse(std::begin(v), std::end(v), &l));
+                CHECK(l.events.size() == 1);
+                CHECK(l.events == std::vector<std::string>({"boolean(true)"}));
+            }
+
+            SECTION("from array")
+            {
+                uint8_t v[] = {'t', 'r', 'u', 'e'}; // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+                CHECK(json::parse(std::begin(v), std::end(v)) == json(true));
+                CHECK(json::accept(std::begin(v), std::end(v)));
+
+                SaxEventLogger l;
+                CHECK(json::sax_parse(std::begin(v), std::end(v), &l));
+                CHECK(l.events.size() == 1);
+                CHECK(l.events == std::vector<std::string>({"boolean(true)"}));
+            }
+
+            SECTION("from std::string")
+            {
+                std::string v = {'t', 'r', 'u', 'e'};
+                CHECK(json::parse(std::begin(v), std::end(v)) == json(true));
+                CHECK(json::accept(std::begin(v), std::end(v)));
+
+                SaxEventLogger l;
+                CHECK(json::sax_parse(std::begin(v), std::end(v), &l));
+                CHECK(l.events.size() == 1);
+                CHECK(l.events == std::vector<std::string>({"boolean(true)"}));
+            }
+
+            SECTION("from std::initializer_list")
+            {
+                std::initializer_list<uint8_t> const v = {'t', 'r', 'u', 'e'};
+                CHECK(json::parse(std::begin(v), std::end(v)) == json(true));
+                CHECK(json::accept(std::begin(v), std::end(v)));
+
+                SaxEventLogger l;
+                CHECK(json::sax_parse(std::begin(v), std::end(v), &l));
+                CHECK(l.events.size() == 1);
+                CHECK(l.events == std::vector<std::string>({"boolean(true)"}));
+            }
+
+            SECTION("from std::valarray")
+            {
+                std::valarray<uint8_t> v = {'t', 'r', 'u', 'e'};
+                CHECK(json::parse(std::begin(v), std::end(v)) == json(true));
+                CHECK(json::accept(std::begin(v), std::end(v)));
+
+                SaxEventLogger l;
+                CHECK(json::sax_parse(std::begin(v), std::end(v), &l));
+                CHECK(l.events.size() == 1);
+                CHECK(l.events == std::vector<std::string>({"boolean(true)"}));
+            }
+
+            SECTION("with empty range")
+            {
+                std::vector<uint8_t> v;
+                json _;
+                CHECK_THROWS_AS(_ = json::parse(std::begin(v), std::end(v)), json::parse_error&);
+                CHECK(!json::accept(std::begin(v), std::end(v)));
+
+                SaxEventLogger l;
+                CHECK(!json::sax_parse(std::begin(v), std::end(v), &l));
+                CHECK(l.events.size() == 1);
+                CHECK(l.events == std::vector<std::string>({"parse_error(1)"}));
+            }
+
+            SECTION("iterator_input_adapter advances iterators correctly")
+            {
+                using nlohmann::json;
+                using nlohmann::detail::input_format_t;
+                using nlohmann::detail::json_sax_dom_parser;
+                using proxy = proxy_iterator<std::string>;
+
+                std::string str1 = "[1]";
+                std::string str2 = "[2]";
+                std::string str = str1 + str2;
+
+                auto first = str.begin();
+                auto last = str.end();
+                json j;
+                json_sax_dom_parser<json> sax(j, true);
+
+                CHECK(json::sax_parse(proxy(first), proxy(last), &sax,
+                                      input_format_t::json, false));
+                CHECK(j.dump() == str1);
+                CHECK(std::string(first, last) == str2);
+            }
+        }
+
+        // these cases are required for 100% line coverage
+        SECTION("error cases")
+        {
+            SECTION("case 1")
+            {
+                std::array<std::uint8_t, 9> v = {{'\"', 'a', 'a', 'a', 'a', 'a', 'a', '\\', 'u'}};
+                json _;
+                CHECK_THROWS_AS(_ = json::parse(std::begin(v), std::end(v)), json::parse_error&);
+                CHECK(!json::accept(std::begin(v), std::end(v)));
+
+                json j_error;
+                CHECK_NOTHROW(j_error = json::parse(std::begin(v), std::end(v), nullptr, false));
+                CHECK(j_error.is_discarded());
+
+                SaxEventLogger l;
+                CHECK(!json::sax_parse(std::begin(v), std::end(v), &l));
+                CHECK(l.events.size() == 1);
+                CHECK(l.events == std::vector<std::string>({"parse_error(10)"}));
+            }
+
+            SECTION("case 2")
+            {
+                std::array<std::uint8_t, 10> v = {{'\"', 'a', 'a', 'a', 'a', 'a', 'a', '\\', 'u', '1'}};
+                json _;
+                CHECK_THROWS_AS(_ = json::parse(std::begin(v), std::end(v)), json::parse_error&);
+                CHECK(!json::accept(std::begin(v), std::end(v)));
+
+                json j_error;
+                CHECK_NOTHROW(j_error = json::parse(std::begin(v), std::end(v), nullptr, false));
+                CHECK(j_error.is_discarded());
+
+                SaxEventLogger l;
+                CHECK(!json::sax_parse(std::begin(v), std::end(v), &l));
+                CHECK(l.events.size() == 1);
+                CHECK(l.events == std::vector<std::string>({"parse_error(11)"}));
+            }
+
+            SECTION("case 3")
+            {
+                std::array<std::uint8_t, 17> v = {{'\"', 'a', 'a', 'a', 'a', 'a', 'a', '\\', 'u', '1', '1', '1', '1', '1', '1', '1', '1'}};
+                json _;
+                CHECK_THROWS_AS(_ = json::parse(std::begin(v), std::end(v)), json::parse_error&);
+                CHECK(!json::accept(std::begin(v), std::end(v)));
+
+                json j_error;
+                CHECK_NOTHROW(j_error = json::parse(std::begin(v), std::end(v), nullptr, false));
+                CHECK(j_error.is_discarded());
+
+                SaxEventLogger l;
+                CHECK(!json::sax_parse(std::begin(v), std::end(v), &l));
+                CHECK(l.events.size() == 1);
+                CHECK(l.events == std::vector<std::string>({"parse_error(18)"}));
+            }
+
+            SECTION("case 4")
+            {
+                std::array<std::uint8_t, 17> v = {{'\"', 'a', 'a', 'a', 'a', 'a', 'a', 'u', '1', '1', '1', '1', '1', '1', '1', '1', '\\'}};
+                json _;
+                CHECK_THROWS_AS(_ = json::parse(std::begin(v), std::end(v)), json::parse_error&);
+                CHECK(!json::accept(std::begin(v), std::end(v)));
+
+                json j_error;
+                CHECK_NOTHROW(j_error = json::parse(std::begin(v), std::end(v), nullptr, false));
+                CHECK(j_error.is_discarded());
+
+                SaxEventLogger l;
+                CHECK(!json::sax_parse(std::begin(v), std::end(v), &l));
+                CHECK(l.events.size() == 1);
+                CHECK(l.events == std::vector<std::string>({"parse_error(18)"}));
+            }
+
+            SECTION("case 5")
+            {
+                std::array<std::uint8_t, 3> v = {{'\"', 0x7F, 0xC1}};
+                json _;
+                CHECK_THROWS_AS(_ = json::parse(std::begin(v), std::end(v)), json::parse_error&);
+                CHECK(!json::accept(std::begin(v), std::end(v)));
+
+                json j_error;
+                CHECK_NOTHROW(j_error = json::parse(std::begin(v), std::end(v), nullptr, false));
+                CHECK(j_error.is_discarded());
+
+                SaxEventLogger l;
+                CHECK(!json::sax_parse(std::begin(v), std::end(v), &l));
+                CHECK(l.events.size() == 1);
+                CHECK(l.events == std::vector<std::string>({"parse_error(3)"}));
+            }
+
+            SECTION("case 6")
+            {
+                std::array<std::uint8_t, 4> v = {{'\"', 0x7F, 0xDF, 0x7F}};
+                json _;
+                CHECK_THROWS_WITH_AS(_ = json::parse(std::begin(v), std::end(v)), "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid string: ill-formed UTF-8 byte; last read: '\"\x7f\xdf\x7f'", json::parse_error&);
+                CHECK(!json::accept(std::begin(v), std::end(v)));
+
+                json j_error;
+                CHECK_NOTHROW(j_error = json::parse(std::begin(v), std::end(v), nullptr, false));
+                CHECK(j_error.is_discarded());
+
+                SaxEventLogger l;
+                CHECK(!json::sax_parse(std::begin(v), std::end(v), &l));
+                CHECK(l.events.size() == 1);
+                CHECK(l.events == std::vector<std::string>({"parse_error(4)"}));
+            }
+
+            SECTION("case 7")
+            {
+                std::array<std::uint8_t, 4> v = {{'\"', 0x7F, 0xDF, 0xC0}};
+                json _;
+                CHECK_THROWS_AS(_ = json::parse(std::begin(v), std::end(v)), json::parse_error&);
+                CHECK(!json::accept(std::begin(v), std::end(v)));
+
+                json j_error;
+                CHECK_NOTHROW(j_error = json::parse(std::begin(v), std::end(v), nullptr, false));
+                CHECK(j_error.is_discarded());
+
+                SaxEventLogger l;
+                CHECK(!json::sax_parse(std::begin(v), std::end(v), &l));
+                CHECK(l.events.size() == 1);
+                CHECK(l.events == std::vector<std::string>({"parse_error(4)"}));
+            }
+
+            SECTION("case 8")
+            {
+                std::array<std::uint8_t, 4> v = {{'\"', 0x7F, 0xE0, 0x9F}};
+                json _;
+                CHECK_THROWS_AS(_ = json::parse(std::begin(v), std::end(v)), json::parse_error&);
+                CHECK(!json::accept(std::begin(v), std::end(v)));
+
+                json j_error;
+                CHECK_NOTHROW(j_error = json::parse(std::begin(v), std::end(v), nullptr, false));
+                CHECK(j_error.is_discarded());
+
+                SaxEventLogger l;
+                CHECK(!json::sax_parse(std::begin(v), std::end(v), &l));
+                CHECK(l.events.size() == 1);
+                CHECK(l.events == std::vector<std::string>({"parse_error(4)"}));
+            }
+
+            SECTION("case 9")
+            {
+                std::array<std::uint8_t, 4> v = {{'\"', 0x7F, 0xEF, 0xC0}};
+                json _;
+                CHECK_THROWS_AS(_ = json::parse(std::begin(v), std::end(v)), json::parse_error&);
+                CHECK(!json::accept(std::begin(v), std::end(v)));
+
+                json j_error;
+                CHECK_NOTHROW(j_error = json::parse(std::begin(v), std::end(v), nullptr, false));
+                CHECK(j_error.is_discarded());
+
+                SaxEventLogger l;
+                CHECK(!json::sax_parse(std::begin(v), std::end(v), &l));
+                CHECK(l.events.size() == 1);
+                CHECK(l.events == std::vector<std::string>({"parse_error(4)"}));
+            }
+
+            SECTION("case 10")
+            {
+                std::array<std::uint8_t, 4> v = {{'\"', 0x7F, 0xED, 0x7F}};
+                json _;
+                CHECK_THROWS_AS(_ = json::parse(std::begin(v), std::end(v)), json::parse_error&);
+                CHECK(!json::accept(std::begin(v), std::end(v)));
+
+                json j_error;
+                CHECK_NOTHROW(j_error = json::parse(std::begin(v), std::end(v), nullptr, false));
+                CHECK(j_error.is_discarded());
+
+                SaxEventLogger l;
+                CHECK(!json::sax_parse(std::begin(v), std::end(v), &l));
+                CHECK(l.events.size() == 1);
+                CHECK(l.events == std::vector<std::string>({"parse_error(4)"}));
+            }
+
+            SECTION("case 11")
+            {
+                std::array<std::uint8_t, 4> v = {{'\"', 0x7F, 0xF0, 0x8F}};
+                json _;
+                CHECK_THROWS_AS(_ = json::parse(std::begin(v), std::end(v)), json::parse_error&);
+                CHECK(!json::accept(std::begin(v), std::end(v)));
+
+                json j_error;
+                CHECK_NOTHROW(j_error = json::parse(std::begin(v), std::end(v), nullptr, false));
+                CHECK(j_error.is_discarded());
+
+                SaxEventLogger l;
+                CHECK(!json::sax_parse(std::begin(v), std::end(v), &l));
+                CHECK(l.events.size() == 1);
+                CHECK(l.events == std::vector<std::string>({"parse_error(4)"}));
+            }
+
+            SECTION("case 12")
+            {
+                std::array<std::uint8_t, 4> v = {{'\"', 0x7F, 0xF0, 0xC0}};
+                json _;
+                CHECK_THROWS_AS(_ = json::parse(std::begin(v), std::end(v)), json::parse_error&);
+                CHECK(!json::accept(std::begin(v), std::end(v)));
+
+                json j_error;
+                CHECK_NOTHROW(j_error = json::parse(std::begin(v), std::end(v), nullptr, false));
+                CHECK(j_error.is_discarded());
+
+                SaxEventLogger l;
+                CHECK(!json::sax_parse(std::begin(v), std::end(v), &l));
+                CHECK(l.events.size() == 1);
+                CHECK(l.events == std::vector<std::string>({"parse_error(4)"}));
+            }
+
+            SECTION("case 13")
+            {
+                std::array<std::uint8_t, 4> v = {{'\"', 0x7F, 0xF3, 0x7F}};
+                json _;
+                CHECK_THROWS_AS(_ = json::parse(std::begin(v), std::end(v)), json::parse_error&);
+                CHECK(!json::accept(std::begin(v), std::end(v)));
+
+                json j_error;
+                CHECK_NOTHROW(j_error = json::parse(std::begin(v), std::end(v), nullptr, false));
+                CHECK(j_error.is_discarded());
+
+                SaxEventLogger l;
+                CHECK(!json::sax_parse(std::begin(v), std::end(v), &l));
+                CHECK(l.events.size() == 1);
+                CHECK(l.events == std::vector<std::string>({"parse_error(4)"}));
+            }
+
+            SECTION("case 14")
+            {
+                std::array<std::uint8_t, 4> v = {{'\"', 0x7F, 0xF3, 0xC0}};
+                json _;
+                CHECK_THROWS_AS(_ = json::parse(std::begin(v), std::end(v)), json::parse_error&);
+                CHECK(!json::accept(std::begin(v), std::end(v)));
+
+                json j_error;
+                CHECK_NOTHROW(j_error = json::parse(std::begin(v), std::end(v), nullptr, false));
+                CHECK(j_error.is_discarded());
+
+                SaxEventLogger l;
+                CHECK(!json::sax_parse(std::begin(v), std::end(v), &l));
+                CHECK(l.events.size() == 1);
+                CHECK(l.events == std::vector<std::string>({"parse_error(4)"}));
+            }
+
+            SECTION("case 15")
+            {
+                std::array<std::uint8_t, 4> v = {{'\"', 0x7F, 0xF4, 0x7F}};
+                json _;
+                CHECK_THROWS_AS(_ = json::parse(std::begin(v), std::end(v)), json::parse_error&);
+                CHECK(!json::accept(std::begin(v), std::end(v)));
+
+                json j_error;
+                CHECK_NOTHROW(j_error = json::parse(std::begin(v), std::end(v), nullptr, false));
+                CHECK(j_error.is_discarded());
+
+                SaxEventLogger l;
+                CHECK(!json::sax_parse(std::begin(v), std::end(v), &l));
+                CHECK(l.events.size() == 1);
+                CHECK(l.events == std::vector<std::string>({"parse_error(4)"}));
+            }
+
+            SECTION("case 16")
+            {
+                std::array<std::uint8_t, 6> v = {{'{', '\"', '\"', ':', '1', '1'}};
+                json _;
+                CHECK_THROWS_AS(_ = json::parse(std::begin(v), std::end(v)), json::parse_error&);
+                CHECK(!json::accept(std::begin(v), std::end(v)));
+
+                json j_error;
+                CHECK_NOTHROW(j_error = json::parse(std::begin(v), std::end(v), nullptr, false));
+                CHECK(j_error.is_discarded());
+
+                SaxEventLogger l;
+                CHECK(!json::sax_parse(std::begin(v), std::end(v), &l));
+                CHECK(l.events.size() == 4);
+                CHECK(l.events == std::vector<std::string>(
+                {
+                    "start_object()", "key()", "number_unsigned(11)",
+                    "parse_error(7)"
+                }));
+            }
+        }
+    }
+
+    SECTION("ignoring byte-order marks")
+    {
+        std::string bom = "\xEF\xBB\xBF";
+
+        SECTION("BOM only")
+        {
+            json _;
+            CHECK_THROWS_WITH_AS(_ = json::parse(bom), "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - unexpected end of input; expected '[', '{', or a literal", json::parse_error&);
+
+            CHECK_THROWS_WITH_AS(_ = json::parse(std::istringstream(bom)), "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - unexpected end of input; expected '[', '{', or a literal", json::parse_error&);
+
+            SaxEventLogger l;
+            CHECK(!json::sax_parse(bom, &l));
+            CHECK(l.events.size() == 1);
+            CHECK(l.events == std::vector<std::string>(
+            {
+                "parse_error(4)"
+            }));
+        }
+
+        SECTION("BOM and content")
+        {
+            CHECK(json::parse(bom + "1") == 1);
+            CHECK(json::parse(std::istringstream(bom + "1")) == 1);
+
+            SaxEventLogger l1;
+            SaxEventLogger l2;
+            CHECK(json::sax_parse(std::istringstream(bom + "1"), &l1));
+            CHECK(json::sax_parse(bom + "1", &l2));
+            CHECK(l1.events.size() == 1);
+            CHECK(l1.events == std::vector<std::string>(
+            {
+                "number_unsigned(1)"
+            }));
+            CHECK(l2.events.size() == 1);
+            CHECK(l2.events == std::vector<std::string>(
+            {
+                "number_unsigned(1)"
+            }));
+        }
+
+        SECTION("2 byte of BOM")
+        {
+            json _;
+            CHECK_THROWS_WITH_AS(_ = json::parse(bom.substr(0, 2)), "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid BOM; must be 0xEF 0xBB 0xBF if given; last read: '\xEF\xBB'", json::parse_error&);
+
+            CHECK_THROWS_WITH_AS(_ = json::parse(std::istringstream(bom.substr(0, 2))), "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid BOM; must be 0xEF 0xBB 0xBF if given; last read: '\xEF\xBB'", json::parse_error&);
+
+            SaxEventLogger l1;
+            SaxEventLogger l2;
+            CHECK(!json::sax_parse(std::istringstream(bom.substr(0, 2)), &l1));
+            CHECK(!json::sax_parse(bom.substr(0, 2), &l2));
+            CHECK(l1.events.size() == 1);
+            CHECK(l1.events == std::vector<std::string>(
+            {
+                "parse_error(3)"
+            }));
+            CHECK(l2.events.size() == 1);
+            CHECK(l2.events == std::vector<std::string>(
+            {
+                "parse_error(3)"
+            }));
+        }
+
+        SECTION("1 byte of BOM")
+        {
+            json _;
+            CHECK_THROWS_WITH_AS(_ = json::parse(bom.substr(0, 1)), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid BOM; must be 0xEF 0xBB 0xBF if given; last read: '\xEF'", json::parse_error&);
+
+            CHECK_THROWS_WITH_AS(_ = json::parse(std::istringstream(bom.substr(0, 1))), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid BOM; must be 0xEF 0xBB 0xBF if given; last read: '\xEF'", json::parse_error&);
+
+            SaxEventLogger l1;
+            SaxEventLogger l2;
+            CHECK(!json::sax_parse(std::istringstream(bom.substr(0, 1)), &l1));
+            CHECK(!json::sax_parse(bom.substr(0, 1), &l2));
+            CHECK(l1.events.size() == 1);
+            CHECK(l1.events == std::vector<std::string>(
+            {
+                "parse_error(2)"
+            }));
+            CHECK(l2.events.size() == 1);
+            CHECK(l2.events == std::vector<std::string>(
+            {
+                "parse_error(2)"
+            }));
+        }
+
+        SECTION("variations")
+        {
+            // calculate variations of each byte of the BOM to make sure
+            // that the BOM and only the BOM is skipped
+            for (int i0 = -1; i0 < 2; ++i0)
+            {
+                for (int i1 = -1; i1 < 2; ++i1)
+                {
+                    for (int i2 = -1; i2 < 2; ++i2)
+                    {
+                        // debug output for the variations
+                        CAPTURE(i0)
+                        CAPTURE(i1)
+                        CAPTURE(i2)
+
+                        std::string s;
+                        s.push_back(static_cast<char>(bom[0] + i0));
+                        s.push_back(static_cast<char>(bom[1] + i1));
+                        s.push_back(static_cast<char>(bom[2] + i2));
+
+                        if (i0 == 0 && i1 == 0 && i2 == 0)
+                        {
+                            // without any variation, we skip the BOM
+                            CHECK(json::parse(s + "null") == json());
+                            CHECK(json::parse(std::istringstream(s + "null")) == json());
+
+                            SaxEventLogger l;
+                            CHECK(json::sax_parse(s + "null", &l));
+                            CHECK(l.events.size() == 1);
+                            CHECK(l.events == std::vector<std::string>(
+                            {
+                                "null()"
+                            }));
+                        }
+                        else
+                        {
+                            // any variation is an error
+                            json _;
+                            CHECK_THROWS_AS(_ = json::parse(s + "null"), json::parse_error&);
+                            CHECK_THROWS_AS(_ = json::parse(std::istringstream(s + "null")), json::parse_error&);
+
+                            SaxEventLogger l;
+                            CHECK(!json::sax_parse(s + "null", &l));
+                            CHECK(l.events.size() == 1);
+
+                            if (i0 != 0)
+                            {
+                                CHECK(l.events == std::vector<std::string>(
+                                {
+                                    "parse_error(1)"
+                                }));
+                            }
+                            else if (i1 != 0)
+                            {
+                                CHECK(l.events == std::vector<std::string>(
+                                {
+                                    "parse_error(2)"
+                                }));
+                            }
+                            else
+                            {
+                                CHECK(l.events == std::vector<std::string>(
+                                {
+                                    "parse_error(3)"
+                                }));
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        SECTION("preserve state after parsing")
+        {
+            std::istringstream s(bom + "123 456");
+            json j;
+            j << s;
+            CHECK(j == 123);
+            j << s;
+            CHECK(j == 456);
+        }
+    }
+
+    SECTION("SAX and early abort")
+    {
+        std::string const s = R"([1, ["string", 43.12], null, {"key1": true, "key2": false}])";
+
+        SaxEventLogger default_logger;
+        SaxEventLoggerExitAfterStartObject exit_after_start_object;
+        SaxEventLoggerExitAfterKey exit_after_key;
+        SaxEventLoggerExitAfterStartArray exit_after_start_array;
+
+        json::sax_parse(s, &default_logger);
+        CHECK(default_logger.events.size() == 14);
+        CHECK(default_logger.events == std::vector<std::string>(
+        {
+            "start_array()", "number_unsigned(1)", "start_array()",
+            "string(string)", "number_float(43.12)", "end_array()", "null()",
+            "start_object()", "key(key1)", "boolean(true)", "key(key2)",
+            "boolean(false)", "end_object()", "end_array()"
+        }));
+
+        json::sax_parse(s, &exit_after_start_object);
+        CHECK(exit_after_start_object.events.size() == 8);
+        CHECK(exit_after_start_object.events == std::vector<std::string>(
+        {
+            "start_array()", "number_unsigned(1)", "start_array()",
+            "string(string)", "number_float(43.12)", "end_array()", "null()",
+            "start_object()"
+        }));
+
+        json::sax_parse(s, &exit_after_key);
+        CHECK(exit_after_key.events.size() == 9);
+        CHECK(exit_after_key.events == std::vector<std::string>(
+        {
+            "start_array()", "number_unsigned(1)", "start_array()",
+            "string(string)", "number_float(43.12)", "end_array()", "null()",
+            "start_object()", "key(key1)"
+        }));
+
+        json::sax_parse(s, &exit_after_start_array);
+        CHECK(exit_after_start_array.events.size() == 1);
+        CHECK(exit_after_start_array.events == std::vector<std::string>(
+        {
+            "start_array()"
+        }));
+    }
+
+    SECTION("JSON Lines")
+    {
+        SECTION("Example file")
+        {
+            std::stringstream ss;
+            ss << R"({"name": "Gilbert", "wins": [["straight", "7♣"], ["one pair", "10♥"]]}
+                    {"name": "Alexa", "wins": [["two pair", "4â™ "], ["two pair", "9â™ "]]}
+                    {"name": "May", "wins": []}
+                    {"name": "Deloise", "wins": [["three of a kind", "5♣"]]}
+)";
+
+            std::string line;
+            int object_count = 0;
+            while (std::getline(ss, line))
+            {
+                ++object_count;
+                CHECK(json::accept(line));
+            }
+
+            CHECK(object_count == 4);
+        }
+
+        SECTION("Example file without trailing newline")
+        {
+            std::stringstream ss;
+            ss << R"({"name": "Gilbert", "wins": [["straight", "7♣"], ["one pair", "10♥"]]}
+                    {"name": "Alexa", "wins": [["two pair", "4â™ "], ["two pair", "9â™ "]]}
+                    {"name": "May", "wins": []}
+                    {"name": "Deloise", "wins": [["three of a kind", "5♣"]]})";
+
+            std::string line;
+            int object_count = 0;
+            while (std::getline(ss, line))
+            {
+                ++object_count;
+                CHECK(json::accept(line));
+            }
+
+            CHECK(object_count == 4);
+        }
+    }
+}
+
+TEST_CASE_TEMPLATE("deserialization of different character types (ASCII)", T,
+                   char, unsigned char, signed char,
+                   wchar_t,
+                   char16_t, char32_t,
+                   std::uint8_t, std::int8_t,
+                   std::int16_t, std::uint16_t,
+                   std::int32_t, std::uint32_t)
+{
+    std::vector<T> const v = {'t', 'r', 'u', 'e'};
+    CHECK(json::parse(v) == json(true));
+    CHECK(json::accept(v));
+
+    SaxEventLogger l;
+    CHECK(json::sax_parse(v, &l));
+    CHECK(l.events.size() == 1);
+    CHECK(l.events == std::vector<std::string>({"boolean(true)"}));
+}
+
+TEST_CASE_TEMPLATE("deserialization of different character types (UTF-8)", T,
+                   char, unsigned char, std::uint8_t)
+{
+    // a star emoji
+    std::vector<T> const v = {'"', static_cast<T>(0xe2u), static_cast<T>(0xadu), static_cast<T>(0x90u), static_cast<T>(0xefu), static_cast<T>(0xb8u), static_cast<T>(0x8fu), '"'};
+    CHECK(json::parse(v).dump(-1, ' ', true) == "\"\\u2b50\\ufe0f\"");
+    CHECK(json::accept(v));
+
+    SaxEventLogger l;
+    CHECK(json::sax_parse(v, &l));
+    CHECK(l.events.size() == 1);
+}
+
+TEST_CASE_TEMPLATE("deserialization of different character types (UTF-16)", T,
+                   char16_t, std::uint16_t)
+{
+    // a star emoji
+    std::vector<T> const v = {static_cast<T>('"'), static_cast<T>(0x2b50), static_cast<T>(0xfe0f), static_cast<T>('"')};
+    CHECK(json::parse(v).dump(-1, ' ', true) == "\"\\u2b50\\ufe0f\"");
+    CHECK(json::accept(v));
+
+    SaxEventLogger l;
+    CHECK(json::sax_parse(v, &l));
+    CHECK(l.events.size() == 1);
+}
+
+TEST_CASE_TEMPLATE("deserialization of different character types (UTF-32)", T,
+                   char32_t, std::uint32_t)
+{
+    // a star emoji
+    std::vector<T> const v = {static_cast<T>('"'), static_cast<T>(0x2b50), static_cast<T>(0xfe0f), static_cast<T>('"')};
+    CHECK(json::parse(v).dump(-1, ' ', true) == "\"\\u2b50\\ufe0f\"");
+    CHECK(json::accept(v));
+
+    SaxEventLogger l;
+    CHECK(json::sax_parse(v, &l));
+    CHECK(l.events.size() == 1);
+}
diff --git a/external_imported/json/tests/src/unit-diagnostics.cpp b/external_imported/json/tests/src/unit-diagnostics.cpp
new file mode 100644
index 000000000..0e172b915
--- /dev/null
+++ b/external_imported/json/tests/src/unit-diagnostics.cpp
@@ -0,0 +1,246 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// Copyright (c) 2013-2022 Niels Lohmann <http://nlohmann.me>.
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+#ifdef JSON_DIAGNOSTICS
+    #undef JSON_DIAGNOSTICS
+#endif
+
+#define JSON_DIAGNOSTICS 1
+
+#include <nlohmann/json.hpp>
+using nlohmann::json;
+
+TEST_CASE("Better diagnostics")
+{
+    SECTION("empty JSON Pointer")
+    {
+        json const j = 1;
+        std::string s;
+        CHECK_THROWS_WITH_AS(s = j.get<std::string>(), "[json.exception.type_error.302] type must be string, but is number", json::type_error);
+    }
+
+    SECTION("invalid type")
+    {
+        json j;
+        j["a"]["b"]["c"] = 1;
+        std::string s;
+        CHECK_THROWS_WITH_AS(s = j["a"]["b"]["c"].get<std::string>(), "[json.exception.type_error.302] (/a/b/c) type must be string, but is number", json::type_error);
+    }
+
+    SECTION("missing key")
+    {
+        json j;
+        j["object"]["object"] = true;
+        CHECK_THROWS_WITH_AS(j["object"].at("not_found"), "[json.exception.out_of_range.403] (/object) key 'not_found' not found", json::out_of_range);
+    }
+
+    SECTION("array index out of range")
+    {
+        json j;
+        j["array"][4] = true;
+        CHECK_THROWS_WITH_AS(j["array"].at(5), "[json.exception.out_of_range.401] (/array) array index 5 is out of range", json::out_of_range);
+    }
+
+    SECTION("array index at wrong type")
+    {
+        json j;
+        j["array"][4] = true;
+        CHECK_THROWS_WITH_AS(j["array"][4][5], "[json.exception.type_error.305] (/array/4) cannot use operator[] with a numeric argument with boolean", json::type_error);
+    }
+
+    SECTION("wrong iterator")
+    {
+        json j;
+        j["array"] = json::array();
+        CHECK_THROWS_WITH_AS(j["array"].erase(j.begin()), "[json.exception.invalid_iterator.202] (/array) iterator does not fit current value", json::invalid_iterator);
+    }
+
+    SECTION("JSON Pointer escaping")
+    {
+        json j;
+        j["a/b"]["m~n"] = 1;
+        std::string s;
+        CHECK_THROWS_WITH_AS(s = j["a/b"]["m~n"].get<std::string>(), "[json.exception.type_error.302] (/a~1b/m~0n) type must be string, but is number", json::type_error);
+    }
+
+    SECTION("Parse error")
+    {
+        json _;
+        CHECK_THROWS_WITH_AS(_ = json::parse(""), "[json.exception.parse_error.101] parse error at line 1, column 1: attempting to parse an empty input; check that your input string or stream contains the expected JSON", json::parse_error);
+    }
+
+    SECTION("Wrong type in update()")
+    {
+        json j = {{"foo", "bar"}};
+        json k = {{"bla", 1}};
+
+        CHECK_THROWS_WITH_AS(j.update(k["bla"].begin(), k["bla"].end()), "[json.exception.type_error.312] (/bla) cannot use update() with number", json::type_error);
+        CHECK_THROWS_WITH_AS(j.update(k["bla"]), "[json.exception.type_error.312] (/bla) cannot use update() with number", json::type_error);
+    }
+}
+
+TEST_CASE("Regression tests for extended diagnostics")
+{
+    SECTION("Regression test for https://github.com/nlohmann/json/pull/2562#pullrequestreview-574858448")
+    {
+        CHECK_THROWS_WITH_AS(json({"0", "0"})[1].get<int>(), "[json.exception.type_error.302] (/1) type must be number, but is string", json::type_error);
+        CHECK_THROWS_WITH_AS(json({"0", "1"})[1].get<int>(), "[json.exception.type_error.302] (/1) type must be number, but is string", json::type_error);
+    }
+
+    SECTION("Regression test for https://github.com/nlohmann/json/pull/2562/files/380a613f2b5d32425021129cd1f371ddcfd54ddf#r563259793")
+    {
+        json j;
+        j["/foo"] = {1, 2, 3};
+        CHECK_THROWS_WITH_AS(j.unflatten(), "[json.exception.type_error.315] (/~1foo) values in object must be primitive", json::type_error);
+    }
+
+    SECTION("Regression test for issue #2838 - Assertion failure when inserting into arrays with JSON_DIAGNOSTICS set")
+    {
+        // void push_back(basic_json&& val)
+        {
+            json j_arr = json::array();
+            j_arr.push_back(json::object());
+            j_arr.push_back(json::object());
+            j_arr.push_back(json::object());
+            j_arr.push_back(json::object());
+            json j_obj = json::object();
+            j_obj["key"] = j_arr;
+        }
+
+        // void push_back(const basic_json& val)
+        {
+            json j_arr = json::array();
+            auto object = json::object();
+            j_arr.push_back(object);
+            j_arr.push_back(object);
+            j_arr.push_back(object);
+            j_arr.push_back(object);
+            json j_obj = json::object();
+            j_obj["key"] = j_arr;
+        }
+
+        // reference emplace_back(Args&& ... args)
+        {
+            json j_arr = json::array();
+            j_arr.emplace_back(json::object());
+            j_arr.emplace_back(json::object());
+            j_arr.emplace_back(json::object());
+            j_arr.emplace_back(json::object());
+            json j_obj = json::object();
+            j_obj["key"] = j_arr;
+        }
+
+        // iterator insert(const_iterator pos, const basic_json& val)
+        {
+            json j_arr = json::array();
+            j_arr.insert(j_arr.begin(), json::object());
+            j_arr.insert(j_arr.begin(), json::object());
+            j_arr.insert(j_arr.begin(), json::object());
+            j_arr.insert(j_arr.begin(), json::object());
+            json j_obj = json::object();
+            j_obj["key"] = j_arr;
+        }
+
+        // iterator insert(const_iterator pos, size_type cnt, const basic_json& val)
+        {
+            json j_arr = json::array();
+            j_arr.insert(j_arr.begin(), 2, json::object());
+            json j_obj = json::object();
+            j_obj["key"] = j_arr;
+        }
+
+        // iterator insert(const_iterator pos, const_iterator first, const_iterator last)
+        {
+            json j_arr = json::array();
+            json j_objects = {json::object(), json::object()};
+            j_arr.insert(j_arr.begin(), j_objects.begin(), j_objects.end());
+            json j_obj = json::object();
+            j_obj["key"] = j_arr;
+        }
+    }
+
+    SECTION("Regression test for issue #2962 - JSON_DIAGNOSTICS assertion for ordered_json")
+    {
+        nlohmann::ordered_json j;
+        nlohmann::ordered_json j2;
+        const std::string value;
+        j["first"] = value;
+        j["second"] = value;
+        j2["something"] = j;
+    }
+
+    SECTION("Regression test for issue #3007 - Parent pointers properly set when using update()")
+    {
+        // void update(const_reference j)
+        {
+            json j = json::object();
+
+            {
+                json j2 = json::object();
+                j2["one"] = 1;
+
+                j.update(j2);
+            }
+
+            // Must call operator[] on const element, otherwise m_parent gets updated.
+            auto const& constJ = j;
+            CHECK_THROWS_WITH_AS(constJ["one"].at(0), "[json.exception.type_error.304] (/one) cannot use at() with number", json::type_error);
+        }
+
+        // void update(const_iterator first, const_iterator last)
+        {
+            json j = json::object();
+
+            {
+                json j2 = json::object();
+                j2["one"] = 1;
+
+                j.update(j2.begin(), j2.end());
+            }
+
+            // Must call operator[] on const element, otherwise m_parent gets updated.
+            auto const& constJ = j;
+            CHECK_THROWS_WITH_AS(constJ["one"].at(0), "[json.exception.type_error.304] (/one) cannot use at() with number", json::type_error);
+        }
+
+        // Code from #3007 triggering unwanted assertion without fix to update().
+        {
+            json root = json::array();
+            json lower = json::object();
+
+            {
+                json lowest = json::object();
+                lowest["one"] = 1;
+
+                lower.update(lowest);
+            }
+
+            root.push_back(lower);
+        }
+    }
+
+    SECTION("Regression test for issue #3032 - Yet another assertion failure when inserting into arrays with JSON_DIAGNOSTICS set")
+    {
+        // reference operator[](size_type idx)
+        {
+            json j_arr = json::array();
+            j_arr[0] = 0;
+            j_arr[1] = 1;
+            j_arr[2] = 2;
+            j_arr[3] = 3;
+            j_arr[4] = 4;
+            j_arr[5] = 5;
+            j_arr[6] = 6;
+            j_arr[7] = 7;
+            json const j_arr_copy = j_arr;
+        }
+    }
+}
diff --git a/external_imported/json/tests/src/unit-disabled_exceptions.cpp b/external_imported/json/tests/src/unit-disabled_exceptions.cpp
new file mode 100644
index 000000000..4ad155140
--- /dev/null
+++ b/external_imported/json/tests/src/unit-disabled_exceptions.cpp
@@ -0,0 +1,52 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// Copyright (c) 2013-2022 Niels Lohmann <http://nlohmann.me>.
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+// disable -Wnoexcept as exceptions are switched off for this test suite
+DOCTEST_GCC_SUPPRESS_WARNING_PUSH
+DOCTEST_GCC_SUPPRESS_WARNING("-Wnoexcept")
+
+#include <nlohmann/json.hpp>
+using json = nlohmann::json;
+
+/////////////////////////////////////////////////////////////////////
+// for #2824
+/////////////////////////////////////////////////////////////////////
+
+class sax_no_exception : public nlohmann::detail::json_sax_dom_parser<json>
+{
+  public:
+    explicit sax_no_exception(json& j) : nlohmann::detail::json_sax_dom_parser<json>(j, false) {}
+
+    static bool parse_error(std::size_t /*position*/, const std::string& /*last_token*/, const json::exception& ex)
+    {
+        error_string = new std::string(ex.what()); // NOLINT(cppcoreguidelines-owning-memory)
+        return false;
+    }
+
+    static std::string* error_string;
+};
+
+std::string* sax_no_exception::error_string = nullptr;
+
+TEST_CASE("Tests with disabled exceptions")
+{
+    SECTION("issue #2824 - encoding of json::exception::what()")
+    {
+        json j;
+        sax_no_exception sax(j);
+
+        CHECK (!json::sax_parse("xyz", &sax));
+        CHECK(*sax_no_exception::error_string == "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error while parsing value - invalid literal; last read: 'x'");
+        delete sax_no_exception::error_string; // NOLINT(cppcoreguidelines-owning-memory)
+    }
+}
+
+DOCTEST_GCC_SUPPRESS_WARNING_POP
diff --git a/external_imported/json/tests/src/unit-element_access1.cpp b/external_imported/json/tests/src/unit-element_access1.cpp
new file mode 100644
index 000000000..55a07ede1
--- /dev/null
+++ b/external_imported/json/tests/src/unit-element_access1.cpp
@@ -0,0 +1,881 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// Copyright (c) 2013-2022 Niels Lohmann <http://nlohmann.me>.
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+#include <nlohmann/json.hpp>
+using nlohmann::json;
+
+TEST_CASE("element access 1")
+{
+    SECTION("array")
+    {
+        json j = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
+        const json j_const = j;
+
+        SECTION("access specified element with bounds checking")
+        {
+            SECTION("access within bounds")
+            {
+                CHECK(j.at(0) == json(1));
+                CHECK(j.at(1) == json(1u));
+                CHECK(j.at(2) == json(true));
+                CHECK(j.at(3) == json(nullptr));
+                CHECK(j.at(4) == json("string"));
+                CHECK(j.at(5) == json(42.23));
+                CHECK(j.at(6) == json::object());
+                CHECK(j.at(7) == json({1, 2, 3}));
+
+                CHECK(j_const.at(0) == json(1));
+                CHECK(j_const.at(1) == json(1u));
+                CHECK(j_const.at(2) == json(true));
+                CHECK(j_const.at(3) == json(nullptr));
+                CHECK(j_const.at(4) == json("string"));
+                CHECK(j_const.at(5) == json(42.23));
+                CHECK(j_const.at(6) == json::object());
+                CHECK(j_const.at(7) == json({1, 2, 3}));
+            }
+
+            SECTION("access outside bounds")
+            {
+                CHECK_THROWS_WITH_AS(j.at(8),
+                                     "[json.exception.out_of_range.401] array index 8 is out of range", json::out_of_range&);
+                CHECK_THROWS_WITH_AS(j_const.at(8),
+                                     "[json.exception.out_of_range.401] array index 8 is out of range", json::out_of_range&);
+            }
+
+            SECTION("access on non-array type")
+            {
+                SECTION("null")
+                {
+                    json j_nonarray(json::value_t::null);
+                    const json j_nonarray_const(j_nonarray);
+
+                    CHECK_THROWS_WITH_AS(j_nonarray.at(0), "[json.exception.type_error.304] cannot use at() with null", json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_nonarray_const.at(0), "[json.exception.type_error.304] cannot use at() with null", json::type_error&);
+                }
+
+                SECTION("boolean")
+                {
+                    json j_nonarray(json::value_t::boolean);
+                    const json j_nonarray_const(j_nonarray);
+
+                    CHECK_THROWS_WITH_AS(j_nonarray.at(0), "[json.exception.type_error.304] cannot use at() with boolean", json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_nonarray_const.at(0), "[json.exception.type_error.304] cannot use at() with boolean", json::type_error&);
+                }
+
+                SECTION("string")
+                {
+                    json j_nonarray(json::value_t::string);
+                    const json j_nonarray_const(j_nonarray);
+
+                    CHECK_THROWS_WITH_AS(j_nonarray.at(0), "[json.exception.type_error.304] cannot use at() with string", json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_nonarray_const.at(0), "[json.exception.type_error.304] cannot use at() with string", json::type_error&);
+                }
+
+                SECTION("object")
+                {
+                    json j_nonarray(json::value_t::object);
+                    const json j_nonarray_const(j_nonarray);
+
+                    CHECK_THROWS_WITH_AS(j_nonarray.at(0), "[json.exception.type_error.304] cannot use at() with object", json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_nonarray_const.at(0), "[json.exception.type_error.304] cannot use at() with object", json::type_error&);
+                }
+
+                SECTION("number (integer)")
+                {
+                    json j_nonarray(json::value_t::number_integer);
+                    const json j_nonarray_const(j_nonarray);
+
+                    CHECK_THROWS_WITH_AS(j_nonarray.at(0), "[json.exception.type_error.304] cannot use at() with number", json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_nonarray_const.at(0), "[json.exception.type_error.304] cannot use at() with number", json::type_error&);
+                }
+
+                SECTION("number (unsigned)")
+                {
+                    json j_nonarray(json::value_t::number_unsigned);
+                    const json j_nonarray_const(j_nonarray);
+
+                    CHECK_THROWS_WITH_AS(j_nonarray.at(0), "[json.exception.type_error.304] cannot use at() with number", json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_nonarray_const.at(0), "[json.exception.type_error.304] cannot use at() with number", json::type_error&);
+                }
+
+                SECTION("number (floating-point)")
+                {
+                    json j_nonarray(json::value_t::number_float);
+                    const json j_nonarray_const(j_nonarray);
+
+                    CHECK_THROWS_WITH_AS(j_nonarray.at(0), "[json.exception.type_error.304] cannot use at() with number", json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_nonarray_const.at(0), "[json.exception.type_error.304] cannot use at() with number", json::type_error&);
+                }
+            }
+        }
+
+        SECTION("front and back")
+        {
+            CHECK(j.front() == json(1));
+            CHECK(j_const.front() == json(1));
+            CHECK(j.back() == json({1, 2, 3}));
+            CHECK(j_const.back() == json({1, 2, 3}));
+        }
+
+        SECTION("access specified element")
+        {
+            SECTION("access within bounds")
+            {
+                CHECK(j[0] == json(1));
+                CHECK(j[1] == json(1u));
+                CHECK(j[2] == json(true));
+                CHECK(j[3] == json(nullptr));
+                CHECK(j[4] == json("string"));
+                CHECK(j[5] == json(42.23));
+                CHECK(j[6] == json::object());
+                CHECK(j[7] == json({1, 2, 3}));
+
+                CHECK(j_const[0] == json(1));
+                CHECK(j_const[1] == json(1u));
+                CHECK(j_const[2] == json(true));
+                CHECK(j_const[3] == json(nullptr));
+                CHECK(j_const[4] == json("string"));
+                CHECK(j_const[5] == json(42.23));
+                CHECK(j_const[6] == json::object());
+                CHECK(j_const[7] == json({1, 2, 3}));
+            }
+
+            SECTION("access on non-array type")
+            {
+                SECTION("null")
+                {
+                    SECTION("standard tests")
+                    {
+                        json j_nonarray(json::value_t::null);
+                        const json j_nonarray_const(j_nonarray);
+                        CHECK_NOTHROW(j_nonarray[0]);
+                        CHECK_THROWS_WITH_AS(j_nonarray_const[0], "[json.exception.type_error.305] cannot use operator[] with a numeric argument with null", json::type_error&);
+                    }
+
+                    SECTION("implicit transformation to properly filled array")
+                    {
+                        json j_nonarray;
+                        j_nonarray[3] = 42;
+                        CHECK(j_nonarray == json({nullptr, nullptr, nullptr, 42}));
+                    }
+                }
+
+                SECTION("boolean")
+                {
+                    json j_nonarray(json::value_t::boolean);
+                    const json j_nonarray_const(j_nonarray);
+                    CHECK_THROWS_WITH_AS(j_nonarray[0], "[json.exception.type_error.305] cannot use operator[] with a numeric argument with boolean", json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_nonarray_const[0], "[json.exception.type_error.305] cannot use operator[] with a numeric argument with boolean", json::type_error&);
+                }
+
+                SECTION("string")
+                {
+                    json j_nonarray(json::value_t::string);
+                    const json j_nonarray_const(j_nonarray);
+                    CHECK_THROWS_WITH_AS(j_nonarray[0], "[json.exception.type_error.305] cannot use operator[] with a numeric argument with string", json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_nonarray_const[0], "[json.exception.type_error.305] cannot use operator[] with a numeric argument with string", json::type_error&);
+                }
+
+                SECTION("object")
+                {
+                    json j_nonarray(json::value_t::object);
+                    const json j_nonarray_const(j_nonarray);
+                    CHECK_THROWS_WITH_AS(j_nonarray[0], "[json.exception.type_error.305] cannot use operator[] with a numeric argument with object", json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_nonarray_const[0], "[json.exception.type_error.305] cannot use operator[] with a numeric argument with object", json::type_error&);
+                }
+
+                SECTION("number (integer)")
+                {
+                    json j_nonarray(json::value_t::number_integer);
+                    const json j_nonarray_const(j_nonarray);
+                    CHECK_THROWS_WITH_AS(j_nonarray[0], "[json.exception.type_error.305] cannot use operator[] with a numeric argument with number", json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_nonarray_const[0], "[json.exception.type_error.305] cannot use operator[] with a numeric argument with number", json::type_error&);
+                }
+
+                SECTION("number (unsigned)")
+                {
+                    json j_nonarray(json::value_t::number_unsigned);
+                    const json j_nonarray_const(j_nonarray);
+                    CHECK_THROWS_WITH_AS(j_nonarray[0], "[json.exception.type_error.305] cannot use operator[] with a numeric argument with number", json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_nonarray_const[0], "[json.exception.type_error.305] cannot use operator[] with a numeric argument with number", json::type_error&);
+                }
+
+                SECTION("number (floating-point)")
+                {
+                    json j_nonarray(json::value_t::number_float);
+                    const json j_nonarray_const(j_nonarray);
+                    CHECK_THROWS_WITH_AS(j_nonarray[0], "[json.exception.type_error.305] cannot use operator[] with a numeric argument with number", json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_nonarray_const[0], "[json.exception.type_error.305] cannot use operator[] with a numeric argument with number", json::type_error&);
+                }
+            }
+        }
+
+        SECTION("remove specified element")
+        {
+            SECTION("remove element by index")
+            {
+                {
+                    json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
+                    jarray.erase(0);
+                    CHECK(jarray == json({1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}}));
+                }
+                {
+                    json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
+                    jarray.erase(1);
+                    CHECK(jarray == json({1, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}}));
+                }
+                {
+                    json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
+                    jarray.erase(2);
+                    CHECK(jarray == json({1, 1u, nullptr, "string", 42.23, json::object(), {1, 2, 3}}));
+                }
+                {
+                    json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
+                    jarray.erase(3);
+                    CHECK(jarray == json({1, 1u, true, "string", 42.23, json::object(), {1, 2, 3}}));
+                }
+                {
+                    json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
+                    jarray.erase(4);
+                    CHECK(jarray == json({1, 1u, true, nullptr, 42.23, json::object(), {1, 2, 3}}));
+                }
+                {
+                    json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
+                    jarray.erase(5);
+                    CHECK(jarray == json({1, 1u, true, nullptr, "string", json::object(), {1, 2, 3}}));
+                }
+                {
+                    json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
+                    jarray.erase(6);
+                    CHECK(jarray == json({1, 1u, true, nullptr, "string", 42.23, {1, 2, 3}}));
+                }
+                {
+                    json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
+                    jarray.erase(7);
+                    CHECK(jarray == json({1, 1u, true, nullptr, "string", 42.23, json::object()}));
+                }
+                {
+                    json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
+                    CHECK_THROWS_WITH_AS(jarray.erase(8), "[json.exception.out_of_range.401] array index 8 is out of range", json::out_of_range&);
+                }
+            }
+
+            SECTION("remove element by iterator")
+            {
+                SECTION("erase(begin())")
+                {
+                    {
+                        json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
+                        json::iterator const it2 = jarray.erase(jarray.begin());
+                        CHECK(jarray == json({1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}}));
+                        CHECK(*it2 == json(1u));
+                    }
+                    {
+                        json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
+                        json::const_iterator const it2 = jarray.erase(jarray.cbegin());
+                        CHECK(jarray == json({1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}}));
+                        CHECK(*it2 == json(1u));
+                    }
+                }
+
+                SECTION("erase(begin(), end())")
+                {
+                    {
+                        json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
+                        json::iterator it2 = jarray.erase(jarray.begin(), jarray.end());
+                        CHECK(jarray == json::array());
+                        CHECK(it2 == jarray.end());
+                    }
+                    {
+                        json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
+                        json::const_iterator it2 = jarray.erase(jarray.cbegin(), jarray.cend());
+                        CHECK(jarray == json::array());
+                        CHECK(it2 == jarray.cend());
+                    }
+                }
+
+                SECTION("erase(begin(), begin())")
+                {
+                    {
+                        json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
+                        json::iterator const it2 = jarray.erase(jarray.begin(), jarray.begin());
+                        CHECK(jarray == json({1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}}));
+                        CHECK(*it2 == json(1));
+                    }
+                    {
+                        json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
+                        json::const_iterator const it2 = jarray.erase(jarray.cbegin(), jarray.cbegin());
+                        CHECK(jarray == json({1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}}));
+                        CHECK(*it2 == json(1));
+                    }
+                }
+
+                SECTION("erase at offset")
+                {
+                    {
+                        json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
+                        json::iterator const it = jarray.begin() + 4;
+                        json::iterator const it2 = jarray.erase(it);
+                        CHECK(jarray == json({1, 1u, true, nullptr, 42.23, json::object(), {1, 2, 3}}));
+                        CHECK(*it2 == json(42.23));
+                    }
+                    {
+                        json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
+                        json::const_iterator const it = jarray.cbegin() + 4;
+                        json::const_iterator const it2 = jarray.erase(it);
+                        CHECK(jarray == json({1, 1u, true, nullptr, 42.23, json::object(), {1, 2, 3}}));
+                        CHECK(*it2 == json(42.23));
+                    }
+                }
+
+                SECTION("erase subrange")
+                {
+                    {
+                        json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
+                        json::iterator const it2 = jarray.erase(jarray.begin() + 3, jarray.begin() + 6);
+                        CHECK(jarray == json({1, 1u, true, json::object(), {1, 2, 3}}));
+                        CHECK(*it2 == json::object());
+                    }
+                    {
+                        json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
+                        json::const_iterator const it2 = jarray.erase(jarray.cbegin() + 3, jarray.cbegin() + 6);
+                        CHECK(jarray == json({1, 1u, true, json::object(), {1, 2, 3}}));
+                        CHECK(*it2 == json::object());
+                    }
+                }
+
+                SECTION("different arrays")
+                {
+                    {
+                        json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
+                        json jarray2 = {"foo", "bar"};
+
+                        CHECK_THROWS_WITH_AS(jarray.erase(jarray2.begin()),
+                                             "[json.exception.invalid_iterator.202] iterator does not fit current value", json::invalid_iterator&);
+                        CHECK_THROWS_WITH_AS(jarray.erase(jarray.begin(), jarray2.end()),
+                                             "[json.exception.invalid_iterator.203] iterators do not fit current value", json::invalid_iterator&);
+                        CHECK_THROWS_WITH_AS(jarray.erase(jarray2.begin(), jarray.end()),
+                                             "[json.exception.invalid_iterator.203] iterators do not fit current value", json::invalid_iterator&);
+                        CHECK_THROWS_WITH_AS(jarray.erase(jarray2.begin(), jarray2.end()),
+                                             "[json.exception.invalid_iterator.203] iterators do not fit current value", json::invalid_iterator&);
+                    }
+                    {
+                        json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
+                        json const jarray2 = {"foo", "bar"};
+
+                        CHECK_THROWS_WITH_AS(jarray.erase(jarray2.cbegin()),
+                                             "[json.exception.invalid_iterator.202] iterator does not fit current value", json::invalid_iterator&);
+                        CHECK_THROWS_WITH_AS(jarray.erase(jarray.cbegin(), jarray2.cend()),
+                                             "[json.exception.invalid_iterator.203] iterators do not fit current value", json::invalid_iterator&);
+                        CHECK_THROWS_WITH_AS(jarray.erase(jarray2.cbegin(), jarray.cend()),
+                                             "[json.exception.invalid_iterator.203] iterators do not fit current value", json::invalid_iterator&);
+                        CHECK_THROWS_WITH_AS(jarray.erase(jarray2.cbegin(), jarray2.cend()),
+                                             "[json.exception.invalid_iterator.203] iterators do not fit current value", json::invalid_iterator&);
+                    }
+                }
+            }
+
+            SECTION("remove element by index in non-array type")
+            {
+                SECTION("null")
+                {
+                    json j_nonobject(json::value_t::null);
+                    CHECK_THROWS_WITH_AS(j_nonobject.erase(0), "[json.exception.type_error.307] cannot use erase() with null", json::type_error&);
+                }
+
+                SECTION("boolean")
+                {
+                    json j_nonobject(json::value_t::boolean);
+                    CHECK_THROWS_WITH_AS(j_nonobject.erase(0), "[json.exception.type_error.307] cannot use erase() with boolean", json::type_error&);
+                }
+
+                SECTION("string")
+                {
+                    json j_nonobject(json::value_t::string);
+                    CHECK_THROWS_WITH_AS(j_nonobject.erase(0), "[json.exception.type_error.307] cannot use erase() with string", json::type_error&);
+                }
+
+                SECTION("object")
+                {
+                    json j_nonobject(json::value_t::object);
+                    CHECK_THROWS_WITH_AS(j_nonobject.erase(0), "[json.exception.type_error.307] cannot use erase() with object", json::type_error&);
+                }
+
+                SECTION("number (integer)")
+                {
+                    json j_nonobject(json::value_t::number_integer);
+                    CHECK_THROWS_WITH_AS(j_nonobject.erase(0), "[json.exception.type_error.307] cannot use erase() with number", json::type_error&);
+                }
+
+                SECTION("number (unsigned)")
+                {
+                    json j_nonobject(json::value_t::number_unsigned);
+                    CHECK_THROWS_WITH_AS(j_nonobject.erase(0), "[json.exception.type_error.307] cannot use erase() with number", json::type_error&);
+                }
+
+                SECTION("number (floating-point)")
+                {
+                    json j_nonobject(json::value_t::number_float);
+                    CHECK_THROWS_WITH_AS(j_nonobject.erase(0), "[json.exception.type_error.307] cannot use erase() with number", json::type_error&);
+                }
+            }
+        }
+    }
+
+    SECTION("other values")
+    {
+        SECTION("front and back")
+        {
+            SECTION("null")
+            {
+                {
+                    json j;
+                    CHECK_THROWS_WITH_AS(j.front(), "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(j.back(), "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&);
+                }
+                {
+                    const json j{};
+                    CHECK_THROWS_WITH_AS(j.front(), "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(j.back(), "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&);
+                }
+            }
+
+            SECTION("string")
+            {
+                {
+                    json j = "foo";
+                    CHECK(j.front() == j);
+                    CHECK(j.back() == j);
+                }
+                {
+                    const json j = "bar";
+                    CHECK(j.front() == j);
+                    CHECK(j.back() == j);
+                }
+            }
+
+            SECTION("number (boolean)")
+            {
+                {
+                    json j = false;
+                    CHECK(j.front() == j);
+                    CHECK(j.back() == j);
+                }
+                {
+                    const json j = true;
+                    CHECK(j.front() == j);
+                    CHECK(j.back() == j);
+                }
+            }
+
+            SECTION("number (integer)")
+            {
+                {
+                    json j = 17;
+                    CHECK(j.front() == j);
+                    CHECK(j.back() == j);
+                }
+                {
+                    const json j = 17;
+                    CHECK(j.front() == j);
+                    CHECK(j.back() == j);
+                }
+            }
+
+            SECTION("number (unsigned)")
+            {
+                {
+                    json j = 17u;
+                    CHECK(j.front() == j);
+                    CHECK(j.back() == j);
+                }
+                {
+                    const json j = 17u;
+                    CHECK(j.front() == j);
+                    CHECK(j.back() == j);
+                }
+            }
+
+            SECTION("number (floating point)")
+            {
+                {
+                    json j = 23.42;
+                    CHECK(j.front() == j);
+                    CHECK(j.back() == j);
+                }
+                {
+                    const json j = 23.42;
+                    CHECK(j.front() == j);
+                    CHECK(j.back() == j);
+                }
+            }
+        }
+
+        SECTION("erase with one valid iterator")
+        {
+            SECTION("null")
+            {
+                {
+                    json j;
+                    CHECK_THROWS_WITH_AS(j.erase(j.begin()), "[json.exception.type_error.307] cannot use erase() with null", json::type_error&);
+                }
+                {
+                    json j;
+                    CHECK_THROWS_WITH_AS(j.erase(j.begin()),
+                                         "[json.exception.type_error.307] cannot use erase() with null", json::type_error&);
+                }
+            }
+
+            SECTION("string")
+            {
+                {
+                    json j = "foo";
+                    json::iterator it = j.erase(j.begin());
+                    CHECK(j.type() == json::value_t::null);
+                    CHECK(it == j.end());
+                }
+                {
+                    json j = "bar";
+                    json::const_iterator it = j.erase(j.cbegin());
+                    CHECK(j.type() == json::value_t::null);
+                    CHECK(it == j.end());
+                }
+            }
+
+            SECTION("number (boolean)")
+            {
+                {
+                    json j = false;
+                    json::iterator it = j.erase(j.begin());
+                    CHECK(j.type() == json::value_t::null);
+                    CHECK(it == j.end());
+                }
+                {
+                    json j = true;
+                    json::const_iterator it = j.erase(j.cbegin());
+                    CHECK(j.type() == json::value_t::null);
+                    CHECK(it == j.end());
+                }
+            }
+
+            SECTION("number (integer)")
+            {
+                {
+                    json j = 17;
+                    json::iterator it = j.erase(j.begin());
+                    CHECK(j.type() == json::value_t::null);
+                    CHECK(it == j.end());
+                }
+                {
+                    json j = 17;
+                    json::const_iterator it = j.erase(j.cbegin());
+                    CHECK(j.type() == json::value_t::null);
+                    CHECK(it == j.end());
+                }
+            }
+
+            SECTION("number (unsigned)")
+            {
+                {
+                    json j = 17u;
+                    json::iterator it = j.erase(j.begin());
+                    CHECK(j.type() == json::value_t::null);
+                    CHECK(it == j.end());
+                }
+                {
+                    json j = 17u;
+                    json::const_iterator it = j.erase(j.cbegin());
+                    CHECK(j.type() == json::value_t::null);
+                    CHECK(it == j.end());
+                }
+            }
+
+            SECTION("number (floating point)")
+            {
+                {
+                    json j = 23.42;
+                    json::iterator it = j.erase(j.begin());
+                    CHECK(j.type() == json::value_t::null);
+                    CHECK(it == j.end());
+                }
+                {
+                    json j = 23.42;
+                    json::const_iterator it = j.erase(j.cbegin());
+                    CHECK(j.type() == json::value_t::null);
+                    CHECK(it == j.end());
+                }
+            }
+
+            SECTION("binary")
+            {
+                {
+                    json j = json::binary({1, 2, 3});
+                    json::iterator it = j.erase(j.begin());
+                    CHECK(j.type() == json::value_t::null);
+                    CHECK(it == j.end());
+                }
+                {
+                    json j = json::binary({1, 2, 3});
+                    json::const_iterator it = j.erase(j.cbegin());
+                    CHECK(j.type() == json::value_t::null);
+                    CHECK(it == j.end());
+                }
+            }
+        }
+
+        SECTION("erase with one invalid iterator")
+        {
+            SECTION("string")
+            {
+                {
+                    json j = "foo";
+                    CHECK_THROWS_WITH_AS(j.erase(j.end()), "[json.exception.invalid_iterator.205] iterator out of range", json::invalid_iterator&);
+                }
+                {
+                    json j = "bar";
+                    CHECK_THROWS_WITH_AS(j.erase(j.cend()), "[json.exception.invalid_iterator.205] iterator out of range", json::invalid_iterator&);
+                }
+            }
+
+            SECTION("number (boolean)")
+            {
+                {
+                    json j = false;
+                    CHECK_THROWS_WITH_AS(j.erase(j.end()), "[json.exception.invalid_iterator.205] iterator out of range", json::invalid_iterator&);
+                }
+                {
+                    json j = true;
+                    CHECK_THROWS_WITH_AS(j.erase(j.cend()), "[json.exception.invalid_iterator.205] iterator out of range", json::invalid_iterator&);
+                }
+            }
+
+            SECTION("number (integer)")
+            {
+                {
+                    json j = 17;
+                    CHECK_THROWS_WITH_AS(j.erase(j.end()), "[json.exception.invalid_iterator.205] iterator out of range", json::invalid_iterator&);
+                }
+                {
+                    json j = 17;
+                    CHECK_THROWS_WITH_AS(j.erase(j.cend()), "[json.exception.invalid_iterator.205] iterator out of range", json::invalid_iterator&);
+                }
+            }
+
+            SECTION("number (unsigned)")
+            {
+                {
+                    json j = 17u;
+                    CHECK_THROWS_WITH_AS(j.erase(j.end()), "[json.exception.invalid_iterator.205] iterator out of range", json::invalid_iterator&);
+                }
+                {
+                    json j = 17u;
+                    CHECK_THROWS_WITH_AS(j.erase(j.cend()), "[json.exception.invalid_iterator.205] iterator out of range", json::invalid_iterator&);
+                }
+            }
+
+            SECTION("number (floating point)")
+            {
+                {
+                    json j = 23.42;
+                    CHECK_THROWS_WITH_AS(j.erase(j.end()), "[json.exception.invalid_iterator.205] iterator out of range", json::invalid_iterator&);
+                }
+                {
+                    json j = 23.42;
+                    CHECK_THROWS_WITH_AS(j.erase(j.cend()), "[json.exception.invalid_iterator.205] iterator out of range", json::invalid_iterator&);
+                }
+            }
+        }
+
+        SECTION("erase with two valid iterators")
+        {
+            SECTION("null")
+            {
+                {
+                    json j;
+                    CHECK_THROWS_WITH_AS(j.erase(j.begin(), j.end()), "[json.exception.type_error.307] cannot use erase() with null", json::type_error&);
+                }
+                {
+                    json j;
+                    CHECK_THROWS_WITH_AS(j.erase(j.cbegin(), j.cend()), "[json.exception.type_error.307] cannot use erase() with null", json::type_error&);
+                }
+            }
+
+            SECTION("string")
+            {
+                {
+                    json j = "foo";
+                    json::iterator it = j.erase(j.begin(), j.end());
+                    CHECK(j.type() == json::value_t::null);
+                    CHECK(it == j.end());
+                }
+                {
+                    json j = "bar";
+                    json::const_iterator it = j.erase(j.cbegin(), j.cend());
+                    CHECK(j.type() == json::value_t::null);
+                    CHECK(it == j.end());
+                }
+            }
+
+            SECTION("number (boolean)")
+            {
+                {
+                    json j = false;
+                    json::iterator it = j.erase(j.begin(), j.end());
+                    CHECK(j.type() == json::value_t::null);
+                    CHECK(it == j.end());
+                }
+                {
+                    json j = true;
+                    json::const_iterator it = j.erase(j.cbegin(), j.cend());
+                    CHECK(j.type() == json::value_t::null);
+                    CHECK(it == j.end());
+                }
+            }
+
+            SECTION("number (integer)")
+            {
+                {
+                    json j = 17;
+                    json::iterator it = j.erase(j.begin(), j.end());
+                    CHECK(j.type() == json::value_t::null);
+                    CHECK(it == j.end());
+                }
+                {
+                    json j = 17;
+                    json::const_iterator it = j.erase(j.cbegin(), j.cend());
+                    CHECK(j.type() == json::value_t::null);
+                    CHECK(it == j.end());
+                }
+            }
+
+            SECTION("number (unsigned)")
+            {
+                {
+                    json j = 17u;
+                    json::iterator it = j.erase(j.begin(), j.end());
+                    CHECK(j.type() == json::value_t::null);
+                    CHECK(it == j.end());
+                }
+                {
+                    json j = 17u;
+                    json::const_iterator it = j.erase(j.cbegin(), j.cend());
+                    CHECK(j.type() == json::value_t::null);
+                    CHECK(it == j.end());
+                }
+            }
+
+            SECTION("number (floating point)")
+            {
+                {
+                    json j = 23.42;
+                    json::iterator it = j.erase(j.begin(), j.end());
+                    CHECK(j.type() == json::value_t::null);
+                    CHECK(it == j.end());
+                }
+                {
+                    json j = 23.42;
+                    json::const_iterator it = j.erase(j.cbegin(), j.cend());
+                    CHECK(j.type() == json::value_t::null);
+                    CHECK(it == j.end());
+                }
+            }
+
+            SECTION("binary")
+            {
+                {
+                    json j = json::binary({1, 2, 3});
+                    json::iterator it = j.erase(j.begin(), j.end());
+                    CHECK(j.type() == json::value_t::null);
+                    CHECK(it == j.end());
+                }
+                {
+                    json j = json::binary({1, 2, 3});
+                    json::const_iterator it = j.erase(j.cbegin(), j.cend());
+                    CHECK(j.type() == json::value_t::null);
+                    CHECK(it == j.end());
+                }
+            }
+        }
+
+        SECTION("erase with two invalid iterators")
+        {
+            SECTION("string")
+            {
+                {
+                    json j = "foo";
+                    CHECK_THROWS_WITH_AS(j.erase(j.end(), j.end()), "[json.exception.invalid_iterator.204] iterators out of range", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(j.erase(j.begin(), j.begin()), "[json.exception.invalid_iterator.204] iterators out of range", json::invalid_iterator&);
+                }
+                {
+                    json j = "bar";
+                    CHECK_THROWS_WITH_AS(j.erase(j.cend(), j.cend()), "[json.exception.invalid_iterator.204] iterators out of range", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(j.erase(j.cbegin(), j.cbegin()), "[json.exception.invalid_iterator.204] iterators out of range", json::invalid_iterator&);
+                }
+            }
+
+            SECTION("number (boolean)")
+            {
+                {
+                    json j = false;
+                    CHECK_THROWS_WITH_AS(j.erase(j.end(), j.end()), "[json.exception.invalid_iterator.204] iterators out of range", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(j.erase(j.begin(), j.begin()), "[json.exception.invalid_iterator.204] iterators out of range", json::invalid_iterator&);
+                }
+                {
+                    json j = true;
+                    CHECK_THROWS_WITH_AS(j.erase(j.cend(), j.cend()), "[json.exception.invalid_iterator.204] iterators out of range", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(j.erase(j.cbegin(), j.cbegin()), "[json.exception.invalid_iterator.204] iterators out of range", json::invalid_iterator&);
+                }
+            }
+
+            SECTION("number (integer)")
+            {
+                {
+                    json j = 17;
+                    CHECK_THROWS_WITH_AS(j.erase(j.end(), j.end()), "[json.exception.invalid_iterator.204] iterators out of range", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(j.erase(j.begin(), j.begin()), "[json.exception.invalid_iterator.204] iterators out of range", json::invalid_iterator&);
+                }
+                {
+                    json j = 17;
+                    CHECK_THROWS_WITH_AS(j.erase(j.cend(), j.cend()), "[json.exception.invalid_iterator.204] iterators out of range", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(j.erase(j.cbegin(), j.cbegin()), "[json.exception.invalid_iterator.204] iterators out of range", json::invalid_iterator&);
+                }
+            }
+
+            SECTION("number (unsigned)")
+            {
+                {
+                    json j = 17u;
+                    CHECK_THROWS_WITH_AS(j.erase(j.end(), j.end()), "[json.exception.invalid_iterator.204] iterators out of range", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(j.erase(j.begin(), j.begin()), "[json.exception.invalid_iterator.204] iterators out of range", json::invalid_iterator&);
+                }
+                {
+                    json j = 17u;
+                    CHECK_THROWS_WITH_AS(j.erase(j.cend(), j.cend()), "[json.exception.invalid_iterator.204] iterators out of range", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(j.erase(j.cbegin(), j.cbegin()), "[json.exception.invalid_iterator.204] iterators out of range", json::invalid_iterator&);
+                }
+            }
+
+            SECTION("number (floating point)")
+            {
+                {
+                    json j = 23.42;
+                    CHECK_THROWS_WITH_AS(j.erase(j.end(), j.end()), "[json.exception.invalid_iterator.204] iterators out of range", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(j.erase(j.begin(), j.begin()), "[json.exception.invalid_iterator.204] iterators out of range", json::invalid_iterator&);
+                }
+                {
+                    json j = 23.42;
+                    CHECK_THROWS_WITH_AS(j.erase(j.cend(), j.cend()), "[json.exception.invalid_iterator.204] iterators out of range", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(j.erase(j.cbegin(), j.cbegin()), "[json.exception.invalid_iterator.204] iterators out of range", json::invalid_iterator&);
+                }
+            }
+        }
+    }
+}
diff --git a/external_imported/json/tests/src/unit-element_access2.cpp b/external_imported/json/tests/src/unit-element_access2.cpp
new file mode 100644
index 000000000..8497fb944
--- /dev/null
+++ b/external_imported/json/tests/src/unit-element_access2.cpp
@@ -0,0 +1,1793 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// Copyright (c) 2013-2022 Niels Lohmann <http://nlohmann.me>.
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+#include <nlohmann/json.hpp>
+#ifdef JSON_TEST_NO_GLOBAL_UDLS
+    using namespace nlohmann::literals; // NOLINT(google-build-using-namespace)
+#endif
+
+// build test with C++14
+// JSON_HAS_CPP_14
+
+TEST_CASE_TEMPLATE("element access 2", Json, nlohmann::json, nlohmann::ordered_json)
+{
+    SECTION("object")
+    {
+        Json j = {{"integer", 1}, {"unsigned", 1u}, {"floating", 42.23}, {"null", nullptr}, {"string", "hello world"}, {"boolean", true}, {"object", Json::object()}, {"array", {1, 2, 3}}};
+        const Json j_const = j;
+
+        SECTION("access specified element with bounds checking")
+        {
+            SECTION("access within bounds")
+            {
+                CHECK(j.at("integer") == Json(1));
+                CHECK(j.at("unsigned") == Json(1u));
+                CHECK(j.at("boolean") == Json(true));
+                CHECK(j.at("null") == Json(nullptr));
+                CHECK(j.at("string") == Json("hello world"));
+                CHECK(j.at("floating") == Json(42.23));
+                CHECK(j.at("object") == Json::object());
+                CHECK(j.at("array") == Json({1, 2, 3}));
+
+                CHECK(j_const.at("integer") == Json(1));
+                CHECK(j_const.at("unsigned") == Json(1u));
+                CHECK(j_const.at("boolean") == Json(true));
+                CHECK(j_const.at("null") == Json(nullptr));
+                CHECK(j_const.at("string") == Json("hello world"));
+                CHECK(j_const.at("floating") == Json(42.23));
+                CHECK(j_const.at("object") == Json::object());
+                CHECK(j_const.at("array") == Json({1, 2, 3}));
+
+#ifdef JSON_HAS_CPP_17
+                CHECK(j.at(std::string_view("integer")) == Json(1));
+                CHECK(j.at(std::string_view("unsigned")) == Json(1u));
+                CHECK(j.at(std::string_view("boolean")) == Json(true));
+                CHECK(j.at(std::string_view("null")) == Json(nullptr));
+                CHECK(j.at(std::string_view("string")) == Json("hello world"));
+                CHECK(j.at(std::string_view("floating")) == Json(42.23));
+                CHECK(j.at(std::string_view("object")) == Json::object());
+                CHECK(j.at(std::string_view("array")) == Json({1, 2, 3}));
+
+                CHECK(j_const.at(std::string_view("integer")) == Json(1));
+                CHECK(j_const.at(std::string_view("unsigned")) == Json(1u));
+                CHECK(j_const.at(std::string_view("boolean")) == Json(true));
+                CHECK(j_const.at(std::string_view("null")) == Json(nullptr));
+                CHECK(j_const.at(std::string_view("string")) == Json("hello world"));
+                CHECK(j_const.at(std::string_view("floating")) == Json(42.23));
+                CHECK(j_const.at(std::string_view("object")) == Json::object());
+                CHECK(j_const.at(std::string_view("array")) == Json({1, 2, 3}));
+#endif
+            }
+
+            SECTION("access outside bounds")
+            {
+                CHECK_THROWS_WITH_AS(j.at("foo"), "[json.exception.out_of_range.403] key 'foo' not found", typename Json::out_of_range&);
+                CHECK_THROWS_WITH_AS(j_const.at("foo"), "[json.exception.out_of_range.403] key 'foo' not found", typename Json::out_of_range&);
+
+#ifdef JSON_HAS_CPP_17
+                CHECK_THROWS_WITH_AS(j.at(std::string_view("foo")), "[json.exception.out_of_range.403] key 'foo' not found", typename Json::out_of_range&);
+                CHECK_THROWS_WITH_AS(j_const.at(std::string_view("foo")), "[json.exception.out_of_range.403] key 'foo' not found", typename Json::out_of_range&);
+#endif
+            }
+
+            SECTION("access on non-object type")
+            {
+                SECTION("null")
+                {
+                    Json j_nonobject(Json::value_t::null);
+                    const Json j_nonobject_const(j_nonobject);
+                    CHECK_THROWS_WITH_AS(j_nonobject.at("foo"), "[json.exception.type_error.304] cannot use at() with null", typename Json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_nonobject_const.at("foo"), "[json.exception.type_error.304] cannot use at() with null", typename Json::type_error&);
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK_THROWS_WITH_AS(j_nonobject.at(std::string_view(std::string_view("foo"))), "[json.exception.type_error.304] cannot use at() with null", typename Json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_nonobject_const.at(std::string_view(std::string_view("foo"))), "[json.exception.type_error.304] cannot use at() with null", typename Json::type_error&);
+#endif
+                }
+
+                SECTION("boolean")
+                {
+                    Json j_nonobject(Json::value_t::boolean);
+                    const Json j_nonobject_const(j_nonobject);
+                    CHECK_THROWS_WITH_AS(j_nonobject.at("foo"), "[json.exception.type_error.304] cannot use at() with boolean", typename Json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_nonobject_const.at("foo"), "[json.exception.type_error.304] cannot use at() with boolean", typename Json::type_error&);
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK_THROWS_WITH_AS(j_nonobject.at(std::string_view("foo")), "[json.exception.type_error.304] cannot use at() with boolean", typename Json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_nonobject_const.at(std::string_view("foo")), "[json.exception.type_error.304] cannot use at() with boolean", typename Json::type_error&);
+#endif
+                }
+
+                SECTION("string")
+                {
+                    Json j_nonobject(Json::value_t::string);
+                    const Json j_nonobject_const(j_nonobject);
+                    CHECK_THROWS_WITH_AS(j_nonobject.at("foo"), "[json.exception.type_error.304] cannot use at() with string", typename Json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_nonobject_const.at("foo"), "[json.exception.type_error.304] cannot use at() with string", typename Json::type_error&);
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK_THROWS_WITH_AS(j_nonobject.at(std::string_view("foo")), "[json.exception.type_error.304] cannot use at() with string", typename Json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_nonobject_const.at(std::string_view("foo")), "[json.exception.type_error.304] cannot use at() with string", typename Json::type_error&);
+#endif
+                }
+
+                SECTION("array")
+                {
+                    Json j_nonobject(Json::value_t::array);
+                    const Json j_nonobject_const(j_nonobject);
+                    CHECK_THROWS_WITH_AS(j_nonobject.at("foo"), "[json.exception.type_error.304] cannot use at() with array", typename Json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_nonobject_const.at("foo"), "[json.exception.type_error.304] cannot use at() with array", typename Json::type_error&);
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK_THROWS_WITH_AS(j_nonobject.at(std::string_view("foo")), "[json.exception.type_error.304] cannot use at() with array", typename Json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_nonobject_const.at(std::string_view("foo")), "[json.exception.type_error.304] cannot use at() with array", typename Json::type_error&);
+#endif
+                }
+
+                SECTION("number (integer)")
+                {
+                    Json j_nonobject(Json::value_t::number_integer);
+                    const Json j_nonobject_const(j_nonobject);
+                    CHECK_THROWS_WITH_AS(j_nonobject.at("foo"), "[json.exception.type_error.304] cannot use at() with number", typename Json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_nonobject_const.at("foo"), "[json.exception.type_error.304] cannot use at() with number", typename Json::type_error&);
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK_THROWS_WITH_AS(j_nonobject.at(std::string_view("foo")), "[json.exception.type_error.304] cannot use at() with number", typename Json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_nonobject_const.at(std::string_view("foo")), "[json.exception.type_error.304] cannot use at() with number", typename Json::type_error&);
+#endif
+                }
+
+                SECTION("number (unsigned)")
+                {
+                    Json j_nonobject(Json::value_t::number_unsigned);
+                    const Json j_nonobject_const(j_nonobject);
+                    CHECK_THROWS_WITH_AS(j_nonobject.at("foo"), "[json.exception.type_error.304] cannot use at() with number", typename Json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_nonobject_const.at("foo"), "[json.exception.type_error.304] cannot use at() with number", typename Json::type_error&);
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK_THROWS_WITH_AS(j_nonobject.at(std::string_view("foo")), "[json.exception.type_error.304] cannot use at() with number", typename Json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_nonobject_const.at(std::string_view("foo")), "[json.exception.type_error.304] cannot use at() with number", typename Json::type_error&);
+#endif
+                }
+
+                SECTION("number (floating-point)")
+                {
+                    Json j_nonobject(Json::value_t::number_float);
+                    const Json j_nonobject_const(j_nonobject);
+                    CHECK_THROWS_WITH_AS(j_nonobject.at("foo"), "[json.exception.type_error.304] cannot use at() with number", typename Json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_nonobject_const.at("foo"), "[json.exception.type_error.304] cannot use at() with number", typename Json::type_error&);
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK_THROWS_WITH_AS(j_nonobject.at(std::string_view("foo")), "[json.exception.type_error.304] cannot use at() with number", typename Json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_nonobject_const.at(std::string_view("foo")), "[json.exception.type_error.304] cannot use at() with number", typename Json::type_error&);
+#endif
+                }
+            }
+        }
+
+        SECTION("access specified element with default value")
+        {
+            SECTION("given a key")
+            {
+                SECTION("access existing value")
+                {
+                    CHECK(j.value("integer", 2) == 1);
+                    CHECK(j.value("integer", 1.0) == Approx(1));
+                    CHECK(j.value("unsigned", 2) == 1u);
+                    CHECK(j.value("unsigned", 1.0) == Approx(1u));
+                    CHECK(j.value("null", Json(1)) == Json());
+                    CHECK(j.value("boolean", false) == true);
+                    CHECK(j.value("string", "bar") == "hello world");
+                    CHECK(j.value("string", std::string("bar")) == "hello world");
+                    CHECK(j.value("floating", 12.34) == Approx(42.23));
+                    CHECK(j.value("floating", 12) == 42);
+                    CHECK(j.value("object", Json({{"foo", "bar"}})) == Json::object());
+                    CHECK(j.value("array", Json({10, 100})) == Json({1, 2, 3}));
+
+                    CHECK(j_const.value("integer", 2) == 1);
+                    CHECK(j_const.value("integer", 1.0) == Approx(1));
+                    CHECK(j_const.value("unsigned", 2) == 1u);
+                    CHECK(j_const.value("unsigned", 1.0) == Approx(1u));
+                    CHECK(j_const.value("boolean", false) == true);
+                    CHECK(j_const.value("string", "bar") == "hello world");
+                    CHECK(j_const.value("string", std::string("bar")) == "hello world");
+                    CHECK(j_const.value("floating", 12.34) == Approx(42.23));
+                    CHECK(j_const.value("floating", 12) == 42);
+                    CHECK(j_const.value("object", Json({{"foo", "bar"}})) == Json::object());
+                    CHECK(j_const.value("array", Json({10, 100})) == Json({1, 2, 3}));
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK(j.value(std::string_view("integer"), 2) == 1);
+                    CHECK(j.value(std::string_view("integer"), 1.0) == Approx(1));
+                    CHECK(j.value(std::string_view("unsigned"), 2) == 1u);
+                    CHECK(j.value(std::string_view("unsigned"), 1.0) == Approx(1u));
+                    CHECK(j.value(std::string_view("null"), Json(1)) == Json());
+                    CHECK(j.value(std::string_view("boolean"), false) == true);
+                    CHECK(j.value(std::string_view("string"), "bar") == "hello world");
+                    CHECK(j.value(std::string_view("string"), std::string("bar")) == "hello world");
+                    CHECK(j.value(std::string_view("floating"), 12.34) == Approx(42.23));
+                    CHECK(j.value(std::string_view("floating"), 12) == 42);
+                    CHECK(j.value(std::string_view("object"), Json({{"foo", "bar"}})) == Json::object());
+                    CHECK(j.value(std::string_view("array"), Json({10, 100})) == Json({1, 2, 3}));
+
+                    CHECK(j_const.value(std::string_view("integer"), 2) == 1);
+                    CHECK(j_const.value(std::string_view("integer"), 1.0) == Approx(1));
+                    CHECK(j_const.value(std::string_view("unsigned"), 2) == 1u);
+                    CHECK(j_const.value(std::string_view("unsigned"), 1.0) == Approx(1u));
+                    CHECK(j_const.value(std::string_view("boolean"), false) == true);
+                    CHECK(j_const.value(std::string_view("string"), "bar") == "hello world");
+                    CHECK(j_const.value(std::string_view("string"), std::string("bar")) == "hello world");
+                    CHECK(j_const.value(std::string_view("floating"), 12.34) == Approx(42.23));
+                    CHECK(j_const.value(std::string_view("floating"), 12) == 42);
+                    CHECK(j_const.value(std::string_view("object"), Json({{"foo", "bar"}})) == Json::object());
+                    CHECK(j_const.value(std::string_view("array"), Json({10, 100})) == Json({1, 2, 3}));
+#endif
+                }
+
+                SECTION("access non-existing value")
+                {
+                    CHECK(j.value("_", 2) == 2);
+                    CHECK(j.value("_", 2u) == 2u);
+                    CHECK(j.value("_", false) == false);
+                    CHECK(j.value("_", "bar") == "bar");
+                    CHECK(j.value("_", 12.34) == Approx(12.34));
+                    CHECK(j.value("_", Json({{"foo", "bar"}})) == Json({{"foo", "bar"}}));
+                    CHECK(j.value("_", Json({10, 100})) == Json({10, 100}));
+
+                    CHECK(j_const.value("_", 2) == 2);
+                    CHECK(j_const.value("_", 2u) == 2u);
+                    CHECK(j_const.value("_", false) == false);
+                    CHECK(j_const.value("_", "bar") == "bar");
+                    CHECK(j_const.value("_", 12.34) == Approx(12.34));
+                    CHECK(j_const.value("_", Json({{"foo", "bar"}})) == Json({{"foo", "bar"}}));
+                    CHECK(j_const.value("_", Json({10, 100})) == Json({10, 100}));
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK(j.value(std::string_view("_"), 2) == 2);
+                    CHECK(j.value(std::string_view("_"), 2u) == 2u);
+                    CHECK(j.value(std::string_view("_"), false) == false);
+                    CHECK(j.value(std::string_view("_"), "bar") == "bar");
+                    CHECK(j.value(std::string_view("_"), 12.34) == Approx(12.34));
+                    CHECK(j.value(std::string_view("_"), Json({{"foo", "bar"}})) == Json({{"foo", "bar"}}));
+                    CHECK(j.value(std::string_view("_"), Json({10, 100})) == Json({10, 100}));
+
+                    CHECK(j_const.value(std::string_view("_"), 2) == 2);
+                    CHECK(j_const.value(std::string_view("_"), 2u) == 2u);
+                    CHECK(j_const.value(std::string_view("_"), false) == false);
+                    CHECK(j_const.value(std::string_view("_"), "bar") == "bar");
+                    CHECK(j_const.value(std::string_view("_"), 12.34) == Approx(12.34));
+                    CHECK(j_const.value(std::string_view("_"), Json({{"foo", "bar"}})) == Json({{"foo", "bar"}}));
+                    CHECK(j_const.value(std::string_view("_"), Json({10, 100})) == Json({10, 100}));
+#endif
+                }
+
+                SECTION("access on non-object type")
+                {
+                    SECTION("null")
+                    {
+                        Json j_nonobject(Json::value_t::null);
+                        const Json j_nonobject_const(Json::value_t::null);
+                        CHECK_THROWS_WITH_AS(j_nonobject.value("foo", 1), "[json.exception.type_error.306] cannot use value() with null", typename Json::type_error&);
+                        CHECK_THROWS_WITH_AS(j_nonobject_const.value("foo", 1), "[json.exception.type_error.306] cannot use value() with null", typename Json::type_error&);
+
+#ifdef JSON_HAS_CPP_17
+                        CHECK_THROWS_WITH_AS(j_nonobject.value(std::string_view("foo"), 1), "[json.exception.type_error.306] cannot use value() with null", typename Json::type_error&);
+                        CHECK_THROWS_WITH_AS(j_nonobject_const.value(std::string_view("foo"), 1), "[json.exception.type_error.306] cannot use value() with null", typename Json::type_error&);
+#endif
+                    }
+
+                    SECTION("boolean")
+                    {
+                        Json j_nonobject(Json::value_t::boolean);
+                        const Json j_nonobject_const(Json::value_t::boolean);
+                        CHECK_THROWS_WITH_AS(j_nonobject.value("foo", 1), "[json.exception.type_error.306] cannot use value() with boolean", typename Json::type_error&);
+                        CHECK_THROWS_WITH_AS(j_nonobject_const.value("foo", 1), "[json.exception.type_error.306] cannot use value() with boolean", typename Json::type_error&);
+
+#ifdef JSON_HAS_CPP_17
+                        CHECK_THROWS_WITH_AS(j_nonobject.value(std::string_view("foo"), 1), "[json.exception.type_error.306] cannot use value() with boolean", typename Json::type_error&);
+                        CHECK_THROWS_WITH_AS(j_nonobject_const.value(std::string_view("foo"), 1), "[json.exception.type_error.306] cannot use value() with boolean", typename Json::type_error&);
+#endif
+                    }
+
+                    SECTION("string")
+                    {
+                        Json j_nonobject(Json::value_t::string);
+                        const Json j_nonobject_const(Json::value_t::string);
+                        CHECK_THROWS_WITH_AS(j_nonobject.value("foo", 1), "[json.exception.type_error.306] cannot use value() with string", typename Json::type_error&);
+                        CHECK_THROWS_WITH_AS(j_nonobject_const.value("foo", 1), "[json.exception.type_error.306] cannot use value() with string", typename Json::type_error&);
+
+#ifdef JSON_HAS_CPP_17
+                        CHECK_THROWS_WITH_AS(j_nonobject.value(std::string_view("foo"), 1), "[json.exception.type_error.306] cannot use value() with string", typename Json::type_error&);
+                        CHECK_THROWS_WITH_AS(j_nonobject_const.value(std::string_view("foo"), 1), "[json.exception.type_error.306] cannot use value() with string", typename Json::type_error&);
+#endif
+                    }
+
+                    SECTION("array")
+                    {
+                        Json j_nonobject(Json::value_t::array);
+                        const Json j_nonobject_const(Json::value_t::array);
+                        CHECK_THROWS_WITH_AS(j_nonobject.value("foo", 1), "[json.exception.type_error.306] cannot use value() with array", typename Json::type_error&);
+                        CHECK_THROWS_WITH_AS(j_nonobject_const.value("foo", 1), "[json.exception.type_error.306] cannot use value() with array", typename Json::type_error&);
+
+#ifdef JSON_HAS_CPP_17
+                        CHECK_THROWS_WITH_AS(j_nonobject.value(std::string_view("foo"), 1), "[json.exception.type_error.306] cannot use value() with array", typename Json::type_error&);
+                        CHECK_THROWS_WITH_AS(j_nonobject_const.value(std::string_view("foo"), 1), "[json.exception.type_error.306] cannot use value() with array", typename Json::type_error&);
+#endif
+                    }
+
+                    SECTION("number (integer)")
+                    {
+                        Json j_nonobject(Json::value_t::number_integer);
+                        const Json j_nonobject_const(Json::value_t::number_integer);
+                        CHECK_THROWS_WITH_AS(j_nonobject.value("foo", 1), "[json.exception.type_error.306] cannot use value() with number", typename Json::type_error&);
+                        CHECK_THROWS_WITH_AS(j_nonobject_const.value("foo", 1), "[json.exception.type_error.306] cannot use value() with number", typename Json::type_error&);
+
+#ifdef JSON_HAS_CPP_17
+                        CHECK_THROWS_WITH_AS(j_nonobject.value(std::string_view("foo"), 1), "[json.exception.type_error.306] cannot use value() with number", typename Json::type_error&);
+                        CHECK_THROWS_WITH_AS(j_nonobject_const.value(std::string_view("foo"), 1), "[json.exception.type_error.306] cannot use value() with number", typename Json::type_error&);
+#endif
+                    }
+
+                    SECTION("number (unsigned)")
+                    {
+                        Json j_nonobject(Json::value_t::number_unsigned);
+                        const Json j_nonobject_const(Json::value_t::number_unsigned);
+                        CHECK_THROWS_WITH_AS(j_nonobject.value("foo", 1), "[json.exception.type_error.306] cannot use value() with number", typename Json::type_error&);
+                        CHECK_THROWS_WITH_AS(j_nonobject_const.value("foo", 1), "[json.exception.type_error.306] cannot use value() with number", typename Json::type_error&);
+
+#ifdef JSON_HAS_CPP_17
+                        CHECK_THROWS_WITH_AS(j_nonobject.value(std::string_view("foo"), 1), "[json.exception.type_error.306] cannot use value() with number", typename Json::type_error&);
+                        CHECK_THROWS_WITH_AS(j_nonobject_const.value(std::string_view("foo"), 1), "[json.exception.type_error.306] cannot use value() with number", typename Json::type_error&);
+#endif
+                    }
+
+                    SECTION("number (floating-point)")
+                    {
+                        Json j_nonobject(Json::value_t::number_float);
+                        const Json j_nonobject_const(Json::value_t::number_float);
+                        CHECK_THROWS_WITH_AS(j_nonobject.value("foo", 1), "[json.exception.type_error.306] cannot use value() with number", typename Json::type_error&);
+                        CHECK_THROWS_WITH_AS(j_nonobject_const.value("foo", 1), "[json.exception.type_error.306] cannot use value() with number", typename Json::type_error&);
+
+#ifdef JSON_HAS_CPP_17
+                        CHECK_THROWS_WITH_AS(j_nonobject.value(std::string_view("foo"), 1), "[json.exception.type_error.306] cannot use value() with number", typename Json::type_error&);
+                        CHECK_THROWS_WITH_AS(j_nonobject_const.value(std::string_view("foo"), 1), "[json.exception.type_error.306] cannot use value() with number", typename Json::type_error&);
+#endif
+                    }
+                }
+            }
+
+            SECTION("given a JSON pointer")
+            {
+                SECTION("access existing value")
+                {
+                    CHECK(j.value("/integer"_json_pointer, 2) == 1);
+                    CHECK(j.value("/integer"_json_pointer, 1.0) == Approx(1));
+                    CHECK(j.value("/unsigned"_json_pointer, 2) == 1u);
+                    CHECK(j.value("/unsigned"_json_pointer, 1.0) == Approx(1u));
+                    CHECK(j.value("/null"_json_pointer, Json(1)) == Json());
+                    CHECK(j.value("/boolean"_json_pointer, false) == true);
+                    CHECK(j.value("/string"_json_pointer, "bar") == "hello world");
+                    CHECK(j.value("/string"_json_pointer, std::string("bar")) == "hello world");
+                    CHECK(j.value("/floating"_json_pointer, 12.34) == Approx(42.23));
+                    CHECK(j.value("/floating"_json_pointer, 12) == 42);
+                    CHECK(j.value("/object"_json_pointer, Json({{"foo", "bar"}})) == Json::object());
+                    CHECK(j.value("/array"_json_pointer, Json({10, 100})) == Json({1, 2, 3}));
+
+                    CHECK(j_const.value("/integer"_json_pointer, 2) == 1);
+                    CHECK(j_const.value("/integer"_json_pointer, 1.0) == Approx(1));
+                    CHECK(j_const.value("/unsigned"_json_pointer, 2) == 1u);
+                    CHECK(j_const.value("/unsigned"_json_pointer, 1.0) == Approx(1u));
+                    CHECK(j_const.value("/boolean"_json_pointer, false) == true);
+                    CHECK(j_const.value("/string"_json_pointer, "bar") == "hello world");
+                    CHECK(j_const.value("/string"_json_pointer, std::string("bar")) == "hello world");
+                    CHECK(j_const.value("/floating"_json_pointer, 12.34) == Approx(42.23));
+                    CHECK(j_const.value("/floating"_json_pointer, 12) == 42);
+                    CHECK(j_const.value("/object"_json_pointer, Json({{"foo", "bar"}})) == Json::object());
+                    CHECK(j_const.value("/array"_json_pointer, Json({10, 100})) == Json({1, 2, 3}));
+                }
+
+                SECTION("access on non-object type")
+                {
+                    SECTION("null")
+                    {
+                        Json j_nonobject(Json::value_t::null);
+                        const Json j_nonobject_const(Json::value_t::null);
+                        CHECK_THROWS_WITH_AS(j_nonobject.value("/foo"_json_pointer, 1), "[json.exception.type_error.306] cannot use value() with null", typename Json::type_error&);
+                        CHECK_THROWS_WITH_AS(j_nonobject_const.value("/foo"_json_pointer, 1), "[json.exception.type_error.306] cannot use value() with null", typename Json::type_error&);
+                    }
+
+                    SECTION("boolean")
+                    {
+                        Json j_nonobject(Json::value_t::boolean);
+                        const Json j_nonobject_const(Json::value_t::boolean);
+                        CHECK_THROWS_WITH_AS(j_nonobject.value("/foo"_json_pointer, 1), "[json.exception.type_error.306] cannot use value() with boolean", typename Json::type_error&);
+                        CHECK_THROWS_WITH_AS(j_nonobject_const.value("/foo"_json_pointer, 1), "[json.exception.type_error.306] cannot use value() with boolean", typename Json::type_error&);
+                    }
+
+                    SECTION("string")
+                    {
+                        Json j_nonobject(Json::value_t::string);
+                        const Json j_nonobject_const(Json::value_t::string);
+                        CHECK_THROWS_WITH_AS(j_nonobject.value("/foo"_json_pointer, 1), "[json.exception.type_error.306] cannot use value() with string", typename Json::type_error&);
+                        CHECK_THROWS_WITH_AS(j_nonobject_const.value("/foo"_json_pointer, 1), "[json.exception.type_error.306] cannot use value() with string", typename Json::type_error&);
+                    }
+
+                    SECTION("array")
+                    {
+                        Json j_nonobject(Json::value_t::array);
+                        const Json j_nonobject_const(Json::value_t::array);
+                        CHECK_THROWS_WITH_AS(j_nonobject.value("/foo"_json_pointer, 1), "[json.exception.type_error.306] cannot use value() with array", typename Json::type_error&);
+                        CHECK_THROWS_WITH_AS(j_nonobject_const.value("/foo"_json_pointer, 1), "[json.exception.type_error.306] cannot use value() with array", typename Json::type_error&);
+                    }
+
+                    SECTION("number (integer)")
+                    {
+                        Json j_nonobject(Json::value_t::number_integer);
+                        const Json j_nonobject_const(Json::value_t::number_integer);
+                        CHECK_THROWS_WITH_AS(j_nonobject.value("/foo"_json_pointer, 1), "[json.exception.type_error.306] cannot use value() with number", typename Json::type_error&);
+                        CHECK_THROWS_WITH_AS(j_nonobject_const.value("/foo"_json_pointer, 1), "[json.exception.type_error.306] cannot use value() with number", typename Json::type_error&);
+                    }
+
+                    SECTION("number (unsigned)")
+                    {
+                        Json j_nonobject(Json::value_t::number_unsigned);
+                        const Json j_nonobject_const(Json::value_t::number_unsigned);
+                        CHECK_THROWS_WITH_AS(j_nonobject.value("/foo"_json_pointer, 1), "[json.exception.type_error.306] cannot use value() with number", typename Json::type_error&);
+                        CHECK_THROWS_WITH_AS(j_nonobject_const.value("/foo"_json_pointer, 1), "[json.exception.type_error.306] cannot use value() with number", typename Json::type_error&);
+                    }
+
+                    SECTION("number (floating-point)")
+                    {
+                        Json j_nonobject(Json::value_t::number_float);
+                        const Json j_nonobject_const(Json::value_t::number_float);
+                        CHECK_THROWS_WITH_AS(j_nonobject.value("/foo"_json_pointer, 1), "[json.exception.type_error.306] cannot use value() with number", typename Json::type_error&);
+                        CHECK_THROWS_WITH_AS(j_nonobject_const.value("/foo"_json_pointer, 1), "[json.exception.type_error.306] cannot use value() with number", typename Json::type_error&);
+                    }
+                }
+            }
+        }
+
+        SECTION("non-const operator[]")
+        {
+            {
+                Json j_null;
+                CHECK(j_null.is_null());
+                j_null["key"] = 1;
+                CHECK(j_null.is_object());
+                CHECK(j_null.size() == 1);
+                j_null["key"] = 2;
+                CHECK(j_null.size() == 1);
+            }
+#ifdef JSON_HAS_CPP_17
+            {
+                std::string_view const key = "key";
+                Json j_null;
+                CHECK(j_null.is_null());
+                j_null[key] = 1;
+                CHECK(j_null.is_object());
+                CHECK(j_null.size() == 1);
+                j_null[key] = 2;
+                CHECK(j_null.size() == 1);
+            }
+#endif
+        }
+
+        SECTION("front and back")
+        {
+            if (std::is_same<Json, nlohmann::ordered_json>::value)
+            {
+                // "integer" is the first key
+                CHECK(j.front() == Json(1));
+                CHECK(j_const.front() == Json(1));
+                // "array" is last key
+                CHECK(j.back() == Json({1, 2, 3}));
+                CHECK(j_const.back() == Json({1, 2, 3}));
+            }
+            else
+            {
+                // "array" is the smallest key
+                CHECK(j.front() == Json({1, 2, 3}));
+                CHECK(j_const.front() == Json({1, 2, 3}));
+                // "unsigned" is the largest key
+                CHECK(j.back() == Json(1u));
+                CHECK(j_const.back() == Json(1u));
+            }
+        }
+
+        SECTION("access specified element")
+        {
+            SECTION("access within bounds")
+            {
+                CHECK(j["integer"] == Json(1));
+                CHECK(j[typename Json::object_t::key_type("integer")] == j["integer"]);
+
+                CHECK(j["unsigned"] == Json(1u));
+                CHECK(j[typename Json::object_t::key_type("unsigned")] == j["unsigned"]);
+
+                CHECK(j["boolean"] == Json(true));
+                CHECK(j[typename Json::object_t::key_type("boolean")] == j["boolean"]);
+
+                CHECK(j["null"] == Json(nullptr));
+                CHECK(j[typename Json::object_t::key_type("null")] == j["null"]);
+
+                CHECK(j["string"] == Json("hello world"));
+                CHECK(j[typename Json::object_t::key_type("string")] == j["string"]);
+
+                CHECK(j["floating"] == Json(42.23));
+                CHECK(j[typename Json::object_t::key_type("floating")] == j["floating"]);
+
+                CHECK(j["object"] == Json::object());
+                CHECK(j[typename Json::object_t::key_type("object")] == j["object"]);
+
+                CHECK(j["array"] == Json({1, 2, 3}));
+                CHECK(j[typename Json::object_t::key_type("array")] == j["array"]);
+
+                CHECK(j_const["integer"] == Json(1));
+                CHECK(j_const[typename Json::object_t::key_type("integer")] == j["integer"]);
+
+                CHECK(j_const["boolean"] == Json(true));
+                CHECK(j_const[typename Json::object_t::key_type("boolean")] == j["boolean"]);
+
+                CHECK(j_const["null"] == Json(nullptr));
+                CHECK(j_const[typename Json::object_t::key_type("null")] == j["null"]);
+
+                CHECK(j_const["string"] == Json("hello world"));
+                CHECK(j_const[typename Json::object_t::key_type("string")] == j["string"]);
+
+                CHECK(j_const["floating"] == Json(42.23));
+                CHECK(j_const[typename Json::object_t::key_type("floating")] == j["floating"]);
+
+                CHECK(j_const["object"] == Json::object());
+                CHECK(j_const[typename Json::object_t::key_type("object")] == j["object"]);
+
+                CHECK(j_const["array"] == Json({1, 2, 3}));
+                CHECK(j_const[typename Json::object_t::key_type("array")] == j["array"]);
+            }
+
+#ifdef JSON_HAS_CPP_17
+            SECTION("access within bounds (string_view)")
+            {
+                CHECK(j["integer"] == Json(1));
+                CHECK(j[std::string_view("integer")] == j["integer"]);
+
+                CHECK(j["unsigned"] == Json(1u));
+                CHECK(j[std::string_view("unsigned")] == j["unsigned"]);
+
+                CHECK(j["boolean"] == Json(true));
+                CHECK(j[std::string_view("boolean")] == j["boolean"]);
+
+                CHECK(j["null"] == Json(nullptr));
+                CHECK(j[std::string_view("null")] == j["null"]);
+
+                CHECK(j["string"] == Json("hello world"));
+                CHECK(j[std::string_view("string")] == j["string"]);
+
+                CHECK(j["floating"] == Json(42.23));
+                CHECK(j[std::string_view("floating")] == j["floating"]);
+
+                CHECK(j["object"] == Json::object());
+                CHECK(j[std::string_view("object")] == j["object"]);
+
+                CHECK(j["array"] == Json({1, 2, 3}));
+                CHECK(j[std::string_view("array")] == j["array"]);
+
+                CHECK(j_const["integer"] == Json(1));
+                CHECK(j_const[std::string_view("integer")] == j["integer"]);
+
+                CHECK(j_const["boolean"] == Json(true));
+                CHECK(j_const[std::string_view("boolean")] == j["boolean"]);
+
+                CHECK(j_const["null"] == Json(nullptr));
+                CHECK(j_const[std::string_view("null")] == j["null"]);
+
+                CHECK(j_const["string"] == Json("hello world"));
+                CHECK(j_const[std::string_view("string")] == j["string"]);
+
+                CHECK(j_const["floating"] == Json(42.23));
+                CHECK(j_const[std::string_view("floating")] == j["floating"]);
+
+                CHECK(j_const["object"] == Json::object());
+                CHECK(j_const[std::string_view("object")] == j["object"]);
+
+                CHECK(j_const["array"] == Json({1, 2, 3}));
+                CHECK(j_const[std::string_view("array")] == j["array"]);
+            }
+#endif
+
+            SECTION("access on non-object type")
+            {
+                SECTION("null")
+                {
+                    Json j_nonobject(Json::value_t::null);
+                    Json j_nonobject2(Json::value_t::null);
+                    const Json j_const_nonobject(j_nonobject);
+
+                    CHECK_NOTHROW(j_nonobject["foo"]);
+                    CHECK_NOTHROW(j_nonobject2[typename Json::object_t::key_type("foo")]);
+                    CHECK_THROWS_WITH_AS(j_const_nonobject["foo"], "[json.exception.type_error.305] cannot use operator[] with a string argument with null", typename Json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_const_nonobject[typename Json::object_t::key_type("foo")], "[json.exception.type_error.305] cannot use operator[] with a string argument with null", typename Json::type_error&);
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK_NOTHROW(j_nonobject2[std::string_view("foo")]);
+                    CHECK_THROWS_WITH_AS(j_const_nonobject[std::string_view("foo")], "[json.exception.type_error.305] cannot use operator[] with a string argument with null", typename Json::type_error&);
+#endif
+                }
+
+                SECTION("boolean")
+                {
+                    Json j_nonobject(Json::value_t::boolean);
+                    const Json j_const_nonobject(j_nonobject);
+                    CHECK_THROWS_WITH_AS(j_nonobject["foo"],
+                                         "[json.exception.type_error.305] cannot use operator[] with a string argument with boolean", typename Json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_nonobject[typename Json::object_t::key_type("foo")],
+                                         "[json.exception.type_error.305] cannot use operator[] with a string argument with boolean", typename Json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_const_nonobject["foo"],
+                                         "[json.exception.type_error.305] cannot use operator[] with a string argument with boolean", typename Json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_const_nonobject[typename Json::object_t::key_type("foo")],
+                                         "[json.exception.type_error.305] cannot use operator[] with a string argument with boolean", typename Json::type_error&);
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK_THROWS_WITH_AS(j_nonobject[std::string_view("foo")], "[json.exception.type_error.305] cannot use operator[] with a string argument with boolean", typename Json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_const_nonobject[std::string_view("foo")], "[json.exception.type_error.305] cannot use operator[] with a string argument with boolean", typename Json::type_error&);
+#endif
+                }
+
+                SECTION("string")
+                {
+                    Json j_nonobject(Json::value_t::string);
+                    const Json j_const_nonobject(j_nonobject);
+                    CHECK_THROWS_WITH_AS(j_nonobject["foo"],
+                                         "[json.exception.type_error.305] cannot use operator[] with a string argument with string", typename Json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_nonobject[typename Json::object_t::key_type("foo")],
+                                         "[json.exception.type_error.305] cannot use operator[] with a string argument with string", typename Json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_const_nonobject["foo"],
+                                         "[json.exception.type_error.305] cannot use operator[] with a string argument with string", typename Json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_const_nonobject[typename Json::object_t::key_type("foo")],
+                                         "[json.exception.type_error.305] cannot use operator[] with a string argument with string", typename Json::type_error&);
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK_THROWS_WITH_AS(j_nonobject[std::string_view("foo")], "[json.exception.type_error.305] cannot use operator[] with a string argument with string", typename Json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_const_nonobject[std::string_view("foo")], "[json.exception.type_error.305] cannot use operator[] with a string argument with string", typename Json::type_error&);
+#endif
+                }
+
+                SECTION("array")
+                {
+                    Json j_nonobject(Json::value_t::array);
+                    const Json j_const_nonobject(j_nonobject);
+                    CHECK_THROWS_WITH_AS(j_nonobject["foo"],
+                                         "[json.exception.type_error.305] cannot use operator[] with a string argument with array", typename Json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_nonobject[typename Json::object_t::key_type("foo")], "[json.exception.type_error.305] cannot use operator[] with a string argument with array", typename Json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_const_nonobject["foo"],
+                                         "[json.exception.type_error.305] cannot use operator[] with a string argument with array", typename Json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_const_nonobject[typename Json::object_t::key_type("foo")],
+                                         "[json.exception.type_error.305] cannot use operator[] with a string argument with array", typename Json::type_error&);
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK_THROWS_WITH_AS(j_nonobject[std::string_view("foo")], "[json.exception.type_error.305] cannot use operator[] with a string argument with array", typename Json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_const_nonobject[std::string_view("foo")], "[json.exception.type_error.305] cannot use operator[] with a string argument with array", typename Json::type_error&);
+#endif
+                }
+
+                SECTION("number (integer)")
+                {
+                    Json j_nonobject(Json::value_t::number_integer);
+                    const Json j_const_nonobject(j_nonobject);
+                    CHECK_THROWS_WITH_AS(j_nonobject["foo"],
+                                         "[json.exception.type_error.305] cannot use operator[] with a string argument with number", typename Json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_nonobject[typename Json::object_t::key_type("foo")],
+                                         "[json.exception.type_error.305] cannot use operator[] with a string argument with number", typename Json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_const_nonobject["foo"],
+                                         "[json.exception.type_error.305] cannot use operator[] with a string argument with number", typename Json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_const_nonobject[typename Json::object_t::key_type("foo")],
+                                         "[json.exception.type_error.305] cannot use operator[] with a string argument with number", typename Json::type_error&);
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK_THROWS_WITH_AS(j_nonobject[std::string_view("foo")], "[json.exception.type_error.305] cannot use operator[] with a string argument with number", typename Json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_const_nonobject[std::string_view("foo")], "[json.exception.type_error.305] cannot use operator[] with a string argument with number", typename Json::type_error&);
+#endif
+                }
+
+                SECTION("number (unsigned)")
+                {
+                    Json j_nonobject(Json::value_t::number_unsigned);
+                    const Json j_const_nonobject(j_nonobject);
+                    CHECK_THROWS_WITH_AS(j_nonobject["foo"],
+                                         "[json.exception.type_error.305] cannot use operator[] with a string argument with number", typename Json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_nonobject[typename Json::object_t::key_type("foo")],
+                                         "[json.exception.type_error.305] cannot use operator[] with a string argument with number", typename Json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_const_nonobject["foo"],
+                                         "[json.exception.type_error.305] cannot use operator[] with a string argument with number", typename Json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_const_nonobject[typename Json::object_t::key_type("foo")],
+                                         "[json.exception.type_error.305] cannot use operator[] with a string argument with number", typename Json::type_error&);
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK_THROWS_WITH_AS(j_nonobject[std::string_view("foo")], "[json.exception.type_error.305] cannot use operator[] with a string argument with number", typename Json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_const_nonobject[std::string_view("foo")], "[json.exception.type_error.305] cannot use operator[] with a string argument with number", typename Json::type_error&);
+#endif
+                }
+
+                SECTION("number (floating-point)")
+                {
+                    Json j_nonobject(Json::value_t::number_float);
+                    const Json j_const_nonobject(j_nonobject);
+                    CHECK_THROWS_WITH_AS(j_nonobject["foo"],
+                                         "[json.exception.type_error.305] cannot use operator[] with a string argument with number", typename Json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_nonobject[typename Json::object_t::key_type("foo")],
+                                         "[json.exception.type_error.305] cannot use operator[] with a string argument with number", typename Json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_const_nonobject["foo"],
+                                         "[json.exception.type_error.305] cannot use operator[] with a string argument with number", typename Json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_const_nonobject[typename Json::object_t::key_type("foo")],
+                                         "[json.exception.type_error.305] cannot use operator[] with a string argument with number", typename Json::type_error&);
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK_THROWS_WITH_AS(j_nonobject[std::string_view("foo")], "[json.exception.type_error.305] cannot use operator[] with a string argument with number", typename Json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_const_nonobject[std::string_view("foo")], "[json.exception.type_error.305] cannot use operator[] with a string argument with number", typename Json::type_error&);
+#endif
+                }
+            }
+        }
+
+        SECTION("remove specified element")
+        {
+            SECTION("remove element by key")
+            {
+                CHECK(j.find("integer") != j.end());
+                CHECK(j.erase("integer") == 1);
+                CHECK(j.find("integer") == j.end());
+                CHECK(j.erase("integer") == 0);
+
+                CHECK(j.find("unsigned") != j.end());
+                CHECK(j.erase("unsigned") == 1);
+                CHECK(j.find("unsigned") == j.end());
+                CHECK(j.erase("unsigned") == 0);
+
+                CHECK(j.find("boolean") != j.end());
+                CHECK(j.erase("boolean") == 1);
+                CHECK(j.find("boolean") == j.end());
+                CHECK(j.erase("boolean") == 0);
+
+                CHECK(j.find("null") != j.end());
+                CHECK(j.erase("null") == 1);
+                CHECK(j.find("null") == j.end());
+                CHECK(j.erase("null") == 0);
+
+                CHECK(j.find("string") != j.end());
+                CHECK(j.erase("string") == 1);
+                CHECK(j.find("string") == j.end());
+                CHECK(j.erase("string") == 0);
+
+                CHECK(j.find("floating") != j.end());
+                CHECK(j.erase("floating") == 1);
+                CHECK(j.find("floating") == j.end());
+                CHECK(j.erase("floating") == 0);
+
+                CHECK(j.find("object") != j.end());
+                CHECK(j.erase("object") == 1);
+                CHECK(j.find("object") == j.end());
+                CHECK(j.erase("object") == 0);
+
+                CHECK(j.find("array") != j.end());
+                CHECK(j.erase("array") == 1);
+                CHECK(j.find("array") == j.end());
+                CHECK(j.erase("array") == 0);
+            }
+
+#ifdef JSON_HAS_CPP_17
+            SECTION("remove element by key (string_view)")
+            {
+                CHECK(j.find(std::string_view("integer")) != j.end());
+                CHECK(j.erase(std::string_view("integer")) == 1);
+                CHECK(j.find(std::string_view("integer")) == j.end());
+                CHECK(j.erase(std::string_view("integer")) == 0);
+
+                CHECK(j.find(std::string_view("unsigned")) != j.end());
+                CHECK(j.erase(std::string_view("unsigned")) == 1);
+                CHECK(j.find(std::string_view("unsigned")) == j.end());
+                CHECK(j.erase(std::string_view("unsigned")) == 0);
+
+                CHECK(j.find(std::string_view("boolean")) != j.end());
+                CHECK(j.erase(std::string_view("boolean")) == 1);
+                CHECK(j.find(std::string_view("boolean")) == j.end());
+                CHECK(j.erase(std::string_view("boolean")) == 0);
+
+                CHECK(j.find(std::string_view("null")) != j.end());
+                CHECK(j.erase(std::string_view("null")) == 1);
+                CHECK(j.find(std::string_view("null")) == j.end());
+                CHECK(j.erase(std::string_view("null")) == 0);
+
+                CHECK(j.find(std::string_view("string")) != j.end());
+                CHECK(j.erase(std::string_view("string")) == 1);
+                CHECK(j.find(std::string_view("string")) == j.end());
+                CHECK(j.erase(std::string_view("string")) == 0);
+
+                CHECK(j.find(std::string_view("floating")) != j.end());
+                CHECK(j.erase(std::string_view("floating")) == 1);
+                CHECK(j.find(std::string_view("floating")) == j.end());
+                CHECK(j.erase(std::string_view("floating")) == 0);
+
+                CHECK(j.find(std::string_view("object")) != j.end());
+                CHECK(j.erase(std::string_view("object")) == 1);
+                CHECK(j.find(std::string_view("object")) == j.end());
+                CHECK(j.erase(std::string_view("object")) == 0);
+
+                CHECK(j.find(std::string_view("array")) != j.end());
+                CHECK(j.erase(std::string_view("array")) == 1);
+                CHECK(j.find(std::string_view("array")) == j.end());
+                CHECK(j.erase(std::string_view("array")) == 0);
+            }
+#endif
+
+            SECTION("remove element by iterator")
+            {
+                SECTION("erase(begin())")
+                {
+                    {
+                        Json jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}};
+                        typename Json::iterator const it2 = jobject.erase(jobject.begin());
+                        CHECK(jobject == Json({{"b", 1}, {"c", 17u}}));
+                        CHECK(*it2 == Json(1));
+                    }
+                    {
+                        Json jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}};
+                        typename Json::const_iterator const it2 = jobject.erase(jobject.cbegin());
+                        CHECK(jobject == Json({{"b", 1}, {"c", 17u}}));
+                        CHECK(*it2 == Json(1));
+                    }
+                }
+
+                SECTION("erase(begin(), end())")
+                {
+                    {
+                        Json jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}};
+                        typename Json::iterator it2 = jobject.erase(jobject.begin(), jobject.end());
+                        CHECK(jobject == Json::object());
+                        CHECK(it2 == jobject.end());
+                    }
+                    {
+                        Json jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}};
+                        typename Json::const_iterator it2 = jobject.erase(jobject.cbegin(), jobject.cend());
+                        CHECK(jobject == Json::object());
+                        CHECK(it2 == jobject.cend());
+                    }
+                }
+
+                SECTION("erase(begin(), begin())")
+                {
+                    {
+                        Json jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}};
+                        typename Json::iterator const it2 = jobject.erase(jobject.begin(), jobject.begin());
+                        CHECK(jobject == Json({{"a", "a"}, {"b", 1}, {"c", 17u}}));
+                        CHECK(*it2 == Json("a"));
+                    }
+                    {
+                        Json jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}};
+                        typename Json::const_iterator const it2 = jobject.erase(jobject.cbegin(), jobject.cbegin());
+                        CHECK(jobject == Json({{"a", "a"}, {"b", 1}, {"c", 17u}}));
+                        CHECK(*it2 == Json("a"));
+                    }
+                }
+
+                SECTION("erase at offset")
+                {
+                    {
+                        Json jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}};
+                        typename Json::iterator const it = jobject.find("b");
+                        typename Json::iterator const it2 = jobject.erase(it);
+                        CHECK(jobject == Json({{"a", "a"}, {"c", 17u}}));
+                        CHECK(*it2 == Json(17));
+                    }
+                    {
+                        Json jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}};
+                        typename Json::const_iterator const it = jobject.find("b");
+                        typename Json::const_iterator const it2 = jobject.erase(it);
+                        CHECK(jobject == Json({{"a", "a"}, {"c", 17u}}));
+                        CHECK(*it2 == Json(17));
+                    }
+                }
+
+                SECTION("erase subrange")
+                {
+                    {
+                        Json jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}, {"d", false}, {"e", true}};
+                        typename Json::iterator const it2 = jobject.erase(jobject.find("b"), jobject.find("e"));
+                        CHECK(jobject == Json({{"a", "a"}, {"e", true}}));
+                        CHECK(*it2 == Json(true));
+                    }
+                    {
+                        Json jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}, {"d", false}, {"e", true}};
+                        typename Json::const_iterator const it2 = jobject.erase(jobject.find("b"), jobject.find("e"));
+                        CHECK(jobject == Json({{"a", "a"}, {"e", true}}));
+                        CHECK(*it2 == Json(true));
+                    }
+                }
+
+                SECTION("different objects")
+                {
+                    {
+                        Json jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}, {"d", false}, {"e", true}};
+                        Json jobject2 = {{"a", "a"}, {"b", 1}, {"c", 17u}};
+                        CHECK_THROWS_WITH_AS(jobject.erase(jobject2.begin()),
+                                             "[json.exception.invalid_iterator.202] iterator does not fit current value", typename Json::invalid_iterator&);
+                        CHECK_THROWS_WITH_AS(jobject.erase(jobject.begin(), jobject2.end()),
+                                             "[json.exception.invalid_iterator.203] iterators do not fit current value", typename Json::invalid_iterator&);
+                        CHECK_THROWS_WITH_AS(jobject.erase(jobject2.begin(), jobject.end()),
+                                             "[json.exception.invalid_iterator.203] iterators do not fit current value", typename Json::invalid_iterator&);
+                        CHECK_THROWS_WITH_AS(jobject.erase(jobject2.begin(), jobject2.end()),
+                                             "[json.exception.invalid_iterator.203] iterators do not fit current value", typename Json::invalid_iterator&);
+                    }
+                    {
+                        Json jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}, {"d", false}, {"e", true}};
+                        Json jobject2 = {{"a", "a"}, {"b", 1}, {"c", 17u}};
+                        CHECK_THROWS_WITH_AS(jobject.erase(jobject2.cbegin()),
+                                             "[json.exception.invalid_iterator.202] iterator does not fit current value", typename Json::invalid_iterator&);
+                        CHECK_THROWS_WITH_AS(jobject.erase(jobject.cbegin(), jobject2.cend()),
+                                             "[json.exception.invalid_iterator.203] iterators do not fit current value", typename Json::invalid_iterator&);
+                        CHECK_THROWS_WITH_AS(jobject.erase(jobject2.cbegin(), jobject.cend()),
+                                             "[json.exception.invalid_iterator.203] iterators do not fit current value", typename Json::invalid_iterator&);
+                        CHECK_THROWS_WITH_AS(jobject.erase(jobject2.cbegin(), jobject2.cend()),
+                                             "[json.exception.invalid_iterator.203] iterators do not fit current value", typename Json::invalid_iterator&);
+                    }
+                }
+            }
+
+            SECTION("remove element by key in non-object type")
+            {
+                SECTION("null")
+                {
+                    Json j_nonobject(Json::value_t::null);
+                    CHECK_THROWS_WITH_AS(j_nonobject.erase("foo"), "[json.exception.type_error.307] cannot use erase() with null", typename Json::type_error&);
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK_THROWS_WITH_AS(j_nonobject.erase(std::string_view("foo")), "[json.exception.type_error.307] cannot use erase() with null", typename Json::type_error&);
+#endif
+                }
+
+                SECTION("boolean")
+                {
+                    Json j_nonobject(Json::value_t::boolean);
+                    CHECK_THROWS_WITH_AS(j_nonobject.erase("foo"), "[json.exception.type_error.307] cannot use erase() with boolean", typename Json::type_error&);
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK_THROWS_WITH_AS(j_nonobject.erase(std::string_view("foo")), "[json.exception.type_error.307] cannot use erase() with boolean", typename Json::type_error&);
+#endif
+                }
+
+                SECTION("string")
+                {
+                    Json j_nonobject(Json::value_t::string);
+                    CHECK_THROWS_WITH_AS(j_nonobject.erase("foo"), "[json.exception.type_error.307] cannot use erase() with string", typename Json::type_error&);
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK_THROWS_WITH_AS(j_nonobject.erase(std::string_view("foo")), "[json.exception.type_error.307] cannot use erase() with string", typename Json::type_error&);
+#endif
+                }
+
+                SECTION("array")
+                {
+                    Json j_nonobject(Json::value_t::array);
+                    CHECK_THROWS_WITH_AS(j_nonobject.erase("foo"), "[json.exception.type_error.307] cannot use erase() with array", typename Json::type_error&);
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK_THROWS_WITH_AS(j_nonobject.erase(std::string_view("foo")), "[json.exception.type_error.307] cannot use erase() with array", typename Json::type_error&);
+#endif
+                }
+
+                SECTION("number (integer)")
+                {
+                    Json j_nonobject(Json::value_t::number_integer);
+                    CHECK_THROWS_WITH_AS(j_nonobject.erase("foo"), "[json.exception.type_error.307] cannot use erase() with number", typename Json::type_error&);
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK_THROWS_WITH_AS(j_nonobject.erase(std::string_view("foo")), "[json.exception.type_error.307] cannot use erase() with number", typename Json::type_error&);
+#endif
+                }
+
+                SECTION("number (floating-point)")
+                {
+                    Json j_nonobject(Json::value_t::number_float);
+                    CHECK_THROWS_WITH_AS(j_nonobject.erase("foo"), "[json.exception.type_error.307] cannot use erase() with number", typename Json::type_error&);
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK_THROWS_WITH_AS(j_nonobject.erase(std::string_view("foo")), "[json.exception.type_error.307] cannot use erase() with number", typename Json::type_error&);
+#endif
+                }
+            }
+        }
+
+        SECTION("find an element in an object")
+        {
+            SECTION("existing element")
+            {
+                for (const auto* key :
+                        {"integer", "unsigned", "floating", "null", "string", "boolean", "object", "array"
+                        })
+                {
+                    CHECK(j.find(key) != j.end());
+                    CHECK(*j.find(key) == j.at(key));
+                    CHECK(j_const.find(key) != j_const.end());
+                    CHECK(*j_const.find(key) == j_const.at(key));
+                }
+#ifdef JSON_HAS_CPP_17
+                for (const std::string_view key :
+                        {"integer", "unsigned", "floating", "null", "string", "boolean", "object", "array"
+                        })
+                {
+                    CHECK(j.find(key) != j.end());
+                    CHECK(*j.find(key) == j.at(key));
+                    CHECK(j_const.find(key) != j_const.end());
+                    CHECK(*j_const.find(key) == j_const.at(key));
+                }
+#endif
+            }
+
+            SECTION("nonexisting element")
+            {
+                CHECK(j.find("foo") == j.end());
+                CHECK(j_const.find("foo") == j_const.end());
+
+#ifdef JSON_HAS_CPP_17
+                CHECK(j.find(std::string_view("foo")) == j.end());
+                CHECK(j_const.find(std::string_view("foo")) == j_const.end());
+#endif
+            }
+
+            SECTION("all types")
+            {
+                SECTION("null")
+                {
+                    Json j_nonarray(Json::value_t::null);
+                    const Json j_nonarray_const(j_nonarray);
+
+                    CHECK(j_nonarray.find("foo") == j_nonarray.end());
+                    CHECK(j_nonarray_const.find("foo") == j_nonarray_const.end());
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK(j_nonarray.find(std::string_view("foo")) == j_nonarray.end());
+                    CHECK(j_nonarray_const.find(std::string_view("foo")) == j_nonarray_const.end());
+#endif
+                }
+
+                SECTION("string")
+                {
+                    Json j_nonarray(Json::value_t::string);
+                    const Json j_nonarray_const(j_nonarray);
+
+                    CHECK(j_nonarray.find("foo") == j_nonarray.end());
+                    CHECK(j_nonarray_const.find("foo") == j_nonarray_const.end());
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK(j_nonarray.find(std::string_view("foo")) == j_nonarray.end());
+                    CHECK(j_nonarray_const.find(std::string_view("foo")) == j_nonarray_const.end());
+#endif
+                }
+
+                SECTION("object")
+                {
+                    Json j_nonarray(Json::value_t::object);
+                    const Json j_nonarray_const(j_nonarray);
+
+                    CHECK(j_nonarray.find("foo") == j_nonarray.end());
+                    CHECK(j_nonarray_const.find("foo") == j_nonarray_const.end());
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK(j_nonarray.find(std::string_view("foo")) == j_nonarray.end());
+                    CHECK(j_nonarray_const.find(std::string_view("foo")) == j_nonarray_const.end());
+#endif
+                }
+
+                SECTION("array")
+                {
+                    Json j_nonarray(Json::value_t::array);
+                    const Json j_nonarray_const(j_nonarray);
+
+                    CHECK(j_nonarray.find("foo") == j_nonarray.end());
+                    CHECK(j_nonarray_const.find("foo") == j_nonarray_const.end());
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK(j_nonarray.find(std::string_view("foo")) == j_nonarray.end());
+                    CHECK(j_nonarray_const.find(std::string_view("foo")) == j_nonarray_const.end());
+#endif
+                }
+
+                SECTION("boolean")
+                {
+                    Json j_nonarray(Json::value_t::boolean);
+                    const Json j_nonarray_const(j_nonarray);
+
+                    CHECK(j_nonarray.find("foo") == j_nonarray.end());
+                    CHECK(j_nonarray_const.find("foo") == j_nonarray_const.end());
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK(j_nonarray.find(std::string_view("foo")) == j_nonarray.end());
+                    CHECK(j_nonarray_const.find(std::string_view("foo")) == j_nonarray_const.end());
+#endif
+                }
+
+                SECTION("number (integer)")
+                {
+                    Json j_nonarray(Json::value_t::number_integer);
+                    const Json j_nonarray_const(j_nonarray);
+
+                    CHECK(j_nonarray.find("foo") == j_nonarray.end());
+                    CHECK(j_nonarray_const.find("foo") == j_nonarray_const.end());
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK(j_nonarray.find(std::string_view("foo")) == j_nonarray.end());
+                    CHECK(j_nonarray_const.find(std::string_view("foo")) == j_nonarray_const.end());
+#endif
+                }
+
+                SECTION("number (unsigned)")
+                {
+                    Json j_nonarray(Json::value_t::number_unsigned);
+                    const Json j_nonarray_const(j_nonarray);
+
+                    CHECK(j_nonarray.find("foo") == j_nonarray.end());
+                    CHECK(j_nonarray_const.find("foo") == j_nonarray_const.end());
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK(j_nonarray.find(std::string_view("foo")) == j_nonarray.end());
+                    CHECK(j_nonarray_const.find(std::string_view("foo")) == j_nonarray_const.end());
+#endif
+                }
+
+                SECTION("number (floating-point)")
+                {
+                    Json j_nonarray(Json::value_t::number_float);
+                    const Json j_nonarray_const(j_nonarray);
+
+                    CHECK(j_nonarray.find("foo") == j_nonarray.end());
+                    CHECK(j_nonarray_const.find("foo") == j_nonarray_const.end());
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK(j_nonarray.find(std::string_view("foo")) == j_nonarray.end());
+                    CHECK(j_nonarray_const.find(std::string_view("foo")) == j_nonarray_const.end());
+#endif
+                }
+            }
+        }
+
+        SECTION("count keys in an object")
+        {
+            SECTION("existing element")
+            {
+                for (const auto* key :
+                        {"integer", "unsigned", "floating", "null", "string", "boolean", "object", "array"
+                        })
+                {
+                    CHECK(j.count(key) == 1);
+                    CHECK(j_const.count(key) == 1);
+                }
+#ifdef JSON_HAS_CPP_17
+                for (const std::string_view key :
+                        {"integer", "unsigned", "floating", "null", "string", "boolean", "object", "array"
+                        })
+                {
+                    CHECK(j.count(key) == 1);
+                    CHECK(j_const.count(key) == 1);
+                }
+#endif
+            }
+
+            SECTION("nonexisting element")
+            {
+                CHECK(j.count("foo") == 0);
+                CHECK(j_const.count("foo") == 0);
+
+#ifdef JSON_HAS_CPP_17
+                CHECK(j.count(std::string_view("foo")) == 0);
+                CHECK(j_const.count(std::string_view("foo")) == 0);
+#endif
+            }
+
+            SECTION("all types")
+            {
+                SECTION("null")
+                {
+                    Json j_nonobject(Json::value_t::null);
+                    const Json j_nonobject_const(Json::value_t::null);
+
+                    CHECK(j_nonobject.count("foo") == 0);
+                    CHECK(j_nonobject_const.count("foo") == 0);
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK(j.count(std::string_view("foo")) == 0);
+                    CHECK(j_const.count(std::string_view("foo")) == 0);
+#endif
+                }
+
+                SECTION("string")
+                {
+                    Json j_nonobject(Json::value_t::string);
+                    const Json j_nonobject_const(Json::value_t::string);
+
+                    CHECK(j_nonobject.count("foo") == 0);
+                    CHECK(j_nonobject_const.count("foo") == 0);
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK(j.count(std::string_view("foo")) == 0);
+                    CHECK(j_const.count(std::string_view("foo")) == 0);
+#endif
+                }
+
+                SECTION("object")
+                {
+                    Json j_nonobject(Json::value_t::object);
+                    const Json j_nonobject_const(Json::value_t::object);
+
+                    CHECK(j_nonobject.count("foo") == 0);
+                    CHECK(j_nonobject_const.count("foo") == 0);
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK(j.count(std::string_view("foo")) == 0);
+                    CHECK(j_const.count(std::string_view("foo")) == 0);
+#endif
+                }
+
+                SECTION("array")
+                {
+                    Json j_nonobject(Json::value_t::array);
+                    const Json j_nonobject_const(Json::value_t::array);
+
+                    CHECK(j_nonobject.count("foo") == 0);
+                    CHECK(j_nonobject_const.count("foo") == 0);
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK(j.count(std::string_view("foo")) == 0);
+                    CHECK(j_const.count(std::string_view("foo")) == 0);
+#endif
+                }
+
+                SECTION("boolean")
+                {
+                    Json j_nonobject(Json::value_t::boolean);
+                    const Json j_nonobject_const(Json::value_t::boolean);
+
+                    CHECK(j_nonobject.count("foo") == 0);
+                    CHECK(j_nonobject_const.count("foo") == 0);
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK(j.count(std::string_view("foo")) == 0);
+                    CHECK(j_const.count(std::string_view("foo")) == 0);
+#endif
+                }
+
+                SECTION("number (integer)")
+                {
+                    Json j_nonobject(Json::value_t::number_integer);
+                    const Json j_nonobject_const(Json::value_t::number_integer);
+
+                    CHECK(j_nonobject.count("foo") == 0);
+                    CHECK(j_nonobject_const.count("foo") == 0);
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK(j.count(std::string_view("foo")) == 0);
+                    CHECK(j_const.count(std::string_view("foo")) == 0);
+#endif
+                }
+
+                SECTION("number (unsigned)")
+                {
+                    Json j_nonobject(Json::value_t::number_unsigned);
+                    const Json j_nonobject_const(Json::value_t::number_unsigned);
+
+                    CHECK(j_nonobject.count("foo") == 0);
+                    CHECK(j_nonobject_const.count("foo") == 0);
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK(j.count(std::string_view("foo")) == 0);
+                    CHECK(j_const.count(std::string_view("foo")) == 0);
+#endif
+                }
+
+                SECTION("number (floating-point)")
+                {
+                    Json j_nonobject(Json::value_t::number_float);
+                    const Json j_nonobject_const(Json::value_t::number_float);
+
+                    CHECK(j_nonobject.count("foo") == 0);
+                    CHECK(j_nonobject_const.count("foo") == 0);
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK(j.count(std::string_view("foo")) == 0);
+                    CHECK(j_const.count(std::string_view("foo")) == 0);
+#endif
+                }
+            }
+        }
+
+        SECTION("check existence of key in an object")
+        {
+            SECTION("existing element")
+            {
+                for (const auto* key :
+                        {"integer", "unsigned", "floating", "null", "string", "boolean", "object", "array"
+                        })
+                {
+                    CHECK(j.contains(key) == true);
+                    CHECK(j_const.contains(key) == true);
+                }
+
+#ifdef JSON_HAS_CPP_17
+                for (const std::string_view key :
+                        {"integer", "unsigned", "floating", "null", "string", "boolean", "object", "array"
+                        })
+                {
+                    CHECK(j.contains(key) == true);
+                    CHECK(j_const.contains(key) == true);
+                }
+#endif
+            }
+
+            SECTION("nonexisting element")
+            {
+                CHECK(j.contains("foo") == false);
+                CHECK(j_const.contains("foo") == false);
+
+#ifdef JSON_HAS_CPP_17
+                CHECK(j.contains(std::string_view("foo")) == false);
+                CHECK(j_const.contains(std::string_view("foo")) == false);
+#endif
+            }
+
+            SECTION("all types")
+            {
+                SECTION("null")
+                {
+                    Json j_nonobject(Json::value_t::null);
+                    const Json j_nonobject_const(Json::value_t::null);
+
+                    CHECK(j_nonobject.contains("foo") == false);
+                    CHECK(j_nonobject_const.contains("foo") == false);
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK(j_nonobject.contains(std::string_view("foo")) == false);
+                    CHECK(j_nonobject_const.contains(std::string_view("foo")) == false);
+#endif
+                }
+
+                SECTION("string")
+                {
+                    Json j_nonobject(Json::value_t::string);
+                    const Json j_nonobject_const(Json::value_t::string);
+
+                    CHECK(j_nonobject.contains("foo") == false);
+                    CHECK(j_nonobject_const.contains("foo") == false);
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK(j_nonobject.contains(std::string_view("foo")) == false);
+                    CHECK(j_nonobject_const.contains(std::string_view("foo")) == false);
+#endif
+                }
+
+                SECTION("object")
+                {
+                    Json j_nonobject(Json::value_t::object);
+                    const Json j_nonobject_const(Json::value_t::object);
+
+                    CHECK(j_nonobject.contains("foo") == false);
+                    CHECK(j_nonobject_const.contains("foo") == false);
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK(j_nonobject.contains(std::string_view("foo")) == false);
+                    CHECK(j_nonobject_const.contains(std::string_view("foo")) == false);
+#endif
+                }
+
+                SECTION("array")
+                {
+                    Json j_nonobject(Json::value_t::array);
+                    const Json j_nonobject_const(Json::value_t::array);
+
+                    CHECK(j_nonobject.contains("foo") == false);
+                    CHECK(j_nonobject_const.contains("foo") == false);
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK(j_nonobject.contains(std::string_view("foo")) == false);
+                    CHECK(j_nonobject_const.contains(std::string_view("foo")) == false);
+#endif
+                }
+
+                SECTION("boolean")
+                {
+                    Json j_nonobject(Json::value_t::boolean);
+                    const Json j_nonobject_const(Json::value_t::boolean);
+
+                    CHECK(j_nonobject.contains("foo") == false);
+                    CHECK(j_nonobject_const.contains("foo") == false);
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK(j_nonobject.contains(std::string_view("foo")) == false);
+                    CHECK(j_nonobject_const.contains(std::string_view("foo")) == false);
+#endif
+                }
+
+                SECTION("number (integer)")
+                {
+                    Json j_nonobject(Json::value_t::number_integer);
+                    const Json j_nonobject_const(Json::value_t::number_integer);
+
+                    CHECK(j_nonobject.contains("foo") == false);
+                    CHECK(j_nonobject_const.contains("foo") == false);
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK(j_nonobject.contains(std::string_view("foo")) == false);
+                    CHECK(j_nonobject_const.contains(std::string_view("foo")) == false);
+#endif
+                }
+
+                SECTION("number (unsigned)")
+                {
+                    Json j_nonobject(Json::value_t::number_unsigned);
+                    const Json j_nonobject_const(Json::value_t::number_unsigned);
+
+                    CHECK(j_nonobject.contains("foo") == false);
+                    CHECK(j_nonobject_const.contains("foo") == false);
+
+#ifdef JSON_HAS_CPP_17
+                    CHECK(j_nonobject.contains(std::string_view("foo")) == false);
+                    CHECK(j_nonobject_const.contains(std::string_view("foo")) == false);
+#endif
+                }
+
+                SECTION("number (floating-point)")
+                {
+                    Json j_nonobject(Json::value_t::number_float);
+                    const Json j_nonobject_const(Json::value_t::number_float);
+                    CHECK(j_nonobject.contains("foo") == false);
+                    CHECK(j_nonobject_const.contains("foo") == false);
+#ifdef JSON_HAS_CPP_17
+                    CHECK(j_nonobject.contains(std::string_view("foo")) == false);
+                    CHECK(j_nonobject_const.contains(std::string_view("foo")) == false);
+#endif
+                }
+            }
+        }
+    }
+}
+
+#if !defined(JSON_NOEXCEPTION)
+TEST_CASE_TEMPLATE("element access 2 (throwing tests)", Json, nlohmann::json, nlohmann::ordered_json)
+{
+    SECTION("object")
+    {
+        Json j = {{"integer", 1}, {"unsigned", 1u}, {"floating", 42.23}, {"null", nullptr}, {"string", "hello world"}, {"boolean", true}, {"object", Json::object()}, {"array", {1, 2, 3}}};
+        const Json j_const = {{"integer", 1}, {"unsigned", 1u}, {"floating", 42.23}, {"null", nullptr}, {"string", "hello world"}, {"boolean", true}, {"object", Json::object()}, {"array", {1, 2, 3}}};
+
+        SECTION("access specified element with default value")
+        {
+            SECTION("given a JSON pointer")
+            {
+                SECTION("access non-existing value")
+                {
+                    CHECK(j.value("/not/existing"_json_pointer, 2) == 2);
+                    CHECK(j.value("/not/existing"_json_pointer, 2u) == 2u);
+                    CHECK(j.value("/not/existing"_json_pointer, false) == false);
+                    CHECK(j.value("/not/existing"_json_pointer, "bar") == "bar");
+                    CHECK(j.value("/not/existing"_json_pointer, 12.34) == Approx(12.34));
+                    CHECK(j.value("/not/existing"_json_pointer, Json({{"foo", "bar"}})) == Json({{"foo", "bar"}}));
+                    CHECK(j.value("/not/existing"_json_pointer, Json({10, 100})) == Json({10, 100}));
+
+                    CHECK(j_const.value("/not/existing"_json_pointer, 2) == 2);
+                    CHECK(j_const.value("/not/existing"_json_pointer, 2u) == 2u);
+                    CHECK(j_const.value("/not/existing"_json_pointer, false) == false);
+                    CHECK(j_const.value("/not/existing"_json_pointer, "bar") == "bar");
+                    CHECK(j_const.value("/not/existing"_json_pointer, 12.34) == Approx(12.34));
+                    CHECK(j_const.value("/not/existing"_json_pointer, Json({{"foo", "bar"}})) == Json({{"foo", "bar"}}));
+                    CHECK(j_const.value("/not/existing"_json_pointer, Json({10, 100})) == Json({10, 100}));
+                }
+            }
+        }
+    }
+}
+#endif
+
+// TODO(falbrechtskirchinger) merge with the other test case; clean up
+TEST_CASE_TEMPLATE("element access 2 (additional value() tests)", Json, nlohmann::json, nlohmann::ordered_json)
+{
+    using string_t = typename Json::string_t;
+    using number_integer_t = typename Json::number_integer_t;
+
+    // test assumes string_t and object_t::key_type are the same
+    REQUIRE(std::is_same<string_t, typename Json::object_t::key_type>::value);
+
+    Json j
+    {
+        {"foo", "bar"},
+        {"baz", 42}
+    };
+
+    const char* cpstr = "default";
+    const char castr[] = "default"; // NOLINT(hicpp-avoid-c-arrays,modernize-avoid-c-arrays,cppcoreguidelines-avoid-c-arrays)
+    string_t const str = "default";
+
+    number_integer_t integer = 69;
+    std::size_t size = 69;
+
+    SECTION("deduced ValueType")
+    {
+        SECTION("literal key")
+        {
+            CHECK(j.value("foo", "default") == "bar");
+            CHECK(j.value("foo", cpstr) == "bar");
+            CHECK(j.value("foo", castr) == "bar");
+            CHECK(j.value("foo", str) == "bar");
+            // this test is in fact different from the one below,
+            // because of 0 considering const char * overloads
+            // whereas any other number does not
+            CHECK(j.value("baz", 0) == 42);
+            CHECK(j.value("baz", 47) == 42);
+            CHECK(j.value("baz", integer) == 42);
+            CHECK(j.value("baz", size) == 42);
+
+            CHECK(j.value("bar", "default") == "default");
+            CHECK(j.value("bar", 0) == 0);
+            CHECK(j.value("bar", 47) == 47);
+            CHECK(j.value("bar", integer) == integer);
+            CHECK(j.value("bar", size) == size);
+
+            CHECK_THROWS_WITH_AS(Json().value("foo", "default"), "[json.exception.type_error.306] cannot use value() with null", typename Json::type_error&);
+            CHECK_THROWS_WITH_AS(Json().value("foo", str), "[json.exception.type_error.306] cannot use value() with null", typename Json::type_error&);
+        }
+
+        SECTION("const char * key")
+        {
+            const char* key = "foo";
+            const char* key2 = "baz";
+            const char* key_notfound = "bar";
+
+            CHECK(j.value(key, "default") == "bar");
+            CHECK(j.value(key, cpstr) == "bar");
+            CHECK(j.value(key, castr) == "bar");
+            CHECK(j.value(key, str) == "bar");
+            CHECK(j.value(key2, 0) == 42);
+            CHECK(j.value(key2, 47) == 42);
+            CHECK(j.value(key2, integer) == 42);
+            CHECK(j.value(key2, size) == 42);
+
+            CHECK(j.value(key_notfound, "default") == "default");
+            CHECK(j.value(key_notfound, 0) == 0);
+            CHECK(j.value(key_notfound, 47) == 47);
+            CHECK(j.value(key_notfound, integer) == integer);
+            CHECK(j.value(key_notfound, size) == size);
+
+            CHECK_THROWS_WITH_AS(Json().value(key, "default"), "[json.exception.type_error.306] cannot use value() with null", typename Json::type_error&);
+            CHECK_THROWS_WITH_AS(Json().value(key, str), "[json.exception.type_error.306] cannot use value() with null", typename Json::type_error&);
+        }
+
+        SECTION("const char(&)[] key")
+        {
+            const char key[] = "foo"; // NOLINT(hicpp-avoid-c-arrays,modernize-avoid-c-arrays,cppcoreguidelines-avoid-c-arrays)
+            const char key2[] = "baz"; // NOLINT(hicpp-avoid-c-arrays,modernize-avoid-c-arrays,cppcoreguidelines-avoid-c-arrays)
+            const char key_notfound[] = "bar"; // NOLINT(hicpp-avoid-c-arrays,modernize-avoid-c-arrays,cppcoreguidelines-avoid-c-arrays)
+
+            CHECK(j.value(key, "default") == "bar");
+            CHECK(j.value(key, cpstr) == "bar");
+            CHECK(j.value(key, castr) == "bar");
+            CHECK(j.value(key, str) == "bar");
+            CHECK(j.value(key2, 0) == 42);
+            CHECK(j.value(key2, 47) == 42);
+            CHECK(j.value(key2, integer) == 42);
+            CHECK(j.value(key2, size) == 42);
+
+            CHECK(j.value(key_notfound, "default") == "default");
+            CHECK(j.value(key_notfound, 0) == 0);
+            CHECK(j.value(key_notfound, 47) == 47);
+            CHECK(j.value(key_notfound, integer) == integer);
+            CHECK(j.value(key_notfound, size) == size);
+
+            CHECK_THROWS_WITH_AS(Json().value(key, "default"), "[json.exception.type_error.306] cannot use value() with null", typename Json::type_error&);
+            CHECK_THROWS_WITH_AS(Json().value(key, str), "[json.exception.type_error.306] cannot use value() with null", typename Json::type_error&);
+        }
+
+        SECTION("string_t/object_t::key_type key")
+        {
+            string_t const key = "foo";
+            string_t const key2 = "baz";
+            string_t const key_notfound = "bar";
+
+            CHECK(j.value(key, "default") == "bar");
+            CHECK(j.value(key, cpstr) == "bar");
+            CHECK(j.value(key, castr) == "bar");
+            CHECK(j.value(key, str) == "bar");
+            CHECK(j.value(key2, 0) == 42);
+            CHECK(j.value(key2, 47) == 42);
+            CHECK(j.value(key2, integer) == 42);
+            CHECK(j.value(key2, size) == 42);
+
+            CHECK(j.value(key_notfound, "default") == "default");
+            CHECK(j.value(key_notfound, 0) == 0);
+            CHECK(j.value(key_notfound, 47) == 47);
+            CHECK(j.value(key_notfound, integer) == integer);
+            CHECK(j.value(key_notfound, size) == size);
+
+            CHECK_THROWS_WITH_AS(Json().value(key, "default"), "[json.exception.type_error.306] cannot use value() with null", typename Json::type_error&);
+            CHECK_THROWS_WITH_AS(Json().value(key, str), "[json.exception.type_error.306] cannot use value() with null", typename Json::type_error&);
+        }
+
+#ifdef JSON_HAS_CPP_17
+        SECTION("std::string_view key")
+        {
+            std::string_view const key = "foo";
+            std::string_view const key2 = "baz";
+            std::string_view const key_notfound = "bar";
+
+            CHECK(j.value(key, "default") == "bar");
+            CHECK(j.value(key, cpstr) == "bar");
+            CHECK(j.value(key, castr) == "bar");
+            CHECK(j.value(key, str) == "bar");
+            CHECK(j.value(key2, 0) == 42);
+            CHECK(j.value(key2, 47) == 42);
+            CHECK(j.value(key2, integer) == 42);
+            CHECK(j.value(key2, size) == 42);
+
+            CHECK(j.value(key_notfound, "default") == "default");
+            CHECK(j.value(key_notfound, 0) == 0);
+            CHECK(j.value(key_notfound, 47) == 47);
+            CHECK(j.value(key_notfound, integer) == integer);
+            CHECK(j.value(key_notfound, size) == size);
+
+            CHECK_THROWS_WITH_AS(Json().value(key, "default"), "[json.exception.type_error.306] cannot use value() with null", typename Json::type_error&);
+            CHECK_THROWS_WITH_AS(Json().value(key, str), "[json.exception.type_error.306] cannot use value() with null", typename Json::type_error&);
+        }
+#endif
+    }
+
+    SECTION("explicit ValueType")
+    {
+        SECTION("literal key")
+        {
+            CHECK(j.template value<string_t>("foo", "default") == "bar");
+            CHECK(j.template value<string_t>("foo", cpstr) == "bar");
+            CHECK(j.template value<string_t>("foo", castr) == "bar");
+            CHECK(j.template value<string_t>("foo", str) == "bar");
+            CHECK(j.template value<number_integer_t>("baz", 0) == 42);
+            CHECK(j.template value<number_integer_t>("baz", 47) == 42);
+            CHECK(j.template value<number_integer_t>("baz", integer) == 42);
+            CHECK(j.template value<std::size_t>("baz", 0) == 42);
+            CHECK(j.template value<std::size_t>("baz", 47) == 42);
+            CHECK(j.template value<std::size_t>("baz", size) == 42);
+
+            CHECK(j.template value<string_t>("bar", "default") == "default");
+            CHECK(j.template value<number_integer_t>("bar", 0) == 0);
+            CHECK(j.template value<number_integer_t>("bar", 47) == 47);
+            CHECK(j.template value<number_integer_t>("bar", integer) == integer);
+            CHECK(j.template value<std::size_t>("bar", 0) == 0);
+            CHECK(j.template value<std::size_t>("bar", 47) == 47);
+            CHECK(j.template value<std::size_t>("bar", size) == size);
+
+            CHECK_THROWS_WITH_AS(Json().template value<string_t>("foo", "default"), "[json.exception.type_error.306] cannot use value() with null", typename Json::type_error&);
+            CHECK_THROWS_WITH_AS(Json().template value<string_t>("foo", str), "[json.exception.type_error.306] cannot use value() with null", typename Json::type_error&);
+        }
+
+        SECTION("const char * key")
+        {
+            const char* key = "foo";
+            const char* key2 = "baz";
+            const char* key_notfound = "bar";
+
+            CHECK(j.template value<string_t>(key, "default") == "bar");
+            CHECK(j.template value<string_t>(key, cpstr) == "bar");
+            CHECK(j.template value<string_t>(key, castr) == "bar");
+            CHECK(j.template value<string_t>(key, str) == "bar");
+            CHECK(j.template value<number_integer_t>(key2, 0) == 42);
+            CHECK(j.template value<number_integer_t>(key2, 47) == 42);
+            CHECK(j.template value<number_integer_t>(key2, integer) == 42);
+            CHECK(j.template value<std::size_t>(key2, 0) == 42);
+            CHECK(j.template value<std::size_t>(key2, 47) == 42);
+            CHECK(j.template value<std::size_t>(key2, size) == 42);
+
+            CHECK(j.template value<string_t>(key_notfound, "default") == "default");
+            CHECK(j.template value<number_integer_t>(key_notfound, 0) == 0);
+            CHECK(j.template value<number_integer_t>(key_notfound, 47) == 47);
+            CHECK(j.template value<number_integer_t>(key_notfound, integer) == integer);
+            CHECK(j.template value<std::size_t>(key_notfound, 0) == 0);
+            CHECK(j.template value<std::size_t>(key_notfound, 47) == 47);
+            CHECK(j.template value<std::size_t>(key_notfound, size) == size);
+
+            CHECK_THROWS_WITH_AS(Json().template value<string_t>(key, "default"), "[json.exception.type_error.306] cannot use value() with null", typename Json::type_error&);
+            CHECK_THROWS_WITH_AS(Json().template value<string_t>(key, str), "[json.exception.type_error.306] cannot use value() with null", typename Json::type_error&);
+        }
+
+        SECTION("const char(&)[] key")
+        {
+            const char key[] = "foo"; // NOLINT(hicpp-avoid-c-arrays,modernize-avoid-c-arrays,cppcoreguidelines-avoid-c-arrays)
+            const char key2[] = "baz"; // NOLINT(hicpp-avoid-c-arrays,modernize-avoid-c-arrays,cppcoreguidelines-avoid-c-arrays)
+            const char key_notfound[] = "bar"; // NOLINT(hicpp-avoid-c-arrays,modernize-avoid-c-arrays,cppcoreguidelines-avoid-c-arrays)
+
+            CHECK(j.template value<string_t>(key, "default") == "bar");
+            CHECK(j.template value<string_t>(key, cpstr) == "bar");
+            CHECK(j.template value<string_t>(key, castr) == "bar");
+            CHECK(j.template value<string_t>(key, str) == "bar");
+            CHECK(j.template value<number_integer_t>(key2, 0) == 42);
+            CHECK(j.template value<number_integer_t>(key2, 47) == 42);
+            CHECK(j.template value<number_integer_t>(key2, integer) == 42);
+            CHECK(j.template value<std::size_t>(key2, 0) == 42);
+            CHECK(j.template value<std::size_t>(key2, 47) == 42);
+            CHECK(j.template value<std::size_t>(key2, size) == 42);
+
+            CHECK(j.template value<string_t>(key_notfound, "default") == "default");
+            CHECK(j.template value<number_integer_t>(key_notfound, 0) == 0);
+            CHECK(j.template value<number_integer_t>(key_notfound, 47) == 47);
+            CHECK(j.template value<number_integer_t>(key_notfound, integer) == integer);
+            CHECK(j.template value<std::size_t>(key_notfound, 0) == 0);
+            CHECK(j.template value<std::size_t>(key_notfound, 47) == 47);
+            CHECK(j.template value<std::size_t>(key_notfound, size) == size);
+
+            CHECK_THROWS_WITH_AS(Json().template value<string_t>(key, "default"), "[json.exception.type_error.306] cannot use value() with null", typename Json::type_error&);
+            CHECK_THROWS_WITH_AS(Json().template value<string_t>(key, str), "[json.exception.type_error.306] cannot use value() with null", typename Json::type_error&);
+        }
+
+        SECTION("string_t/object_t::key_type key")
+        {
+            string_t const key = "foo";
+            string_t const key2 = "baz";
+            string_t const key_notfound = "bar";
+
+            CHECK(j.template value<string_t>(key, "default") == "bar");
+            CHECK(j.template value<string_t>(key, cpstr) == "bar");
+            CHECK(j.template value<string_t>(key, castr) == "bar");
+            CHECK(j.template value<string_t>(key, str) == "bar");
+            CHECK(j.template value<number_integer_t>(key2, 0) == 42);
+            CHECK(j.template value<number_integer_t>(key2, 47) == 42);
+            CHECK(j.template value<std::size_t>(key2, 0) == 42);
+            CHECK(j.template value<std::size_t>(key2, 47) == 42);
+
+            CHECK(j.template value<string_t>(key_notfound, "default") == "default");
+            CHECK(j.template value<number_integer_t>(key_notfound, 0) == 0);
+            CHECK(j.template value<number_integer_t>(key_notfound, 47) == 47);
+            CHECK(j.template value<std::size_t>(key_notfound, 0) == 0);
+            CHECK(j.template value<std::size_t>(key_notfound, 47) == 47);
+
+            CHECK_THROWS_WITH_AS(Json().template value<string_t>(key, "default"), "[json.exception.type_error.306] cannot use value() with null", typename Json::type_error&);
+            CHECK_THROWS_WITH_AS(Json().template value<string_t>(key, str), "[json.exception.type_error.306] cannot use value() with null", typename Json::type_error&);
+        }
+
+#ifdef JSON_HAS_CPP_17
+        SECTION("std::string_view key")
+        {
+            std::string_view const key = "foo";
+            std::string_view const key2 = "baz";
+            std::string_view const key_notfound = "bar";
+
+            CHECK(j.template value<string_t>(key, "default") == "bar");
+            CHECK(j.template value<string_t>(key, cpstr) == "bar");
+            CHECK(j.template value<string_t>(key, castr) == "bar");
+            CHECK(j.template value<string_t>(key, str) == "bar");
+            CHECK(j.template value<number_integer_t>(key2, 0) == 42);
+            CHECK(j.template value<number_integer_t>(key2, 47) == 42);
+            CHECK(j.template value<number_integer_t>(key2, integer) == 42);
+            CHECK(j.template value<std::size_t>(key2, 0) == 42);
+            CHECK(j.template value<std::size_t>(key2, 47) == 42);
+            CHECK(j.template value<std::size_t>(key2, size) == 42);
+
+            CHECK(j.template value<string_t>(key_notfound, "default") == "default");
+            CHECK(j.template value<number_integer_t>(key_notfound, 0) == 0);
+            CHECK(j.template value<number_integer_t>(key_notfound, 47) == 47);
+            CHECK(j.template value<number_integer_t>(key_notfound, integer) == integer);
+            CHECK(j.template value<std::size_t>(key_notfound, 0) == 0);
+            CHECK(j.template value<std::size_t>(key_notfound, 47) == 47);
+            CHECK(j.template value<std::size_t>(key_notfound, size) == size);
+
+            CHECK(j.template value<std::string_view>(key, "default") == "bar");
+            CHECK(j.template value<std::string_view>(key, cpstr) == "bar");
+            CHECK(j.template value<std::string_view>(key, castr) == "bar");
+            CHECK(j.template value<std::string_view>(key, str) == "bar");
+
+            CHECK(j.template value<std::string_view>(key_notfound, "default") == "default");
+
+            CHECK_THROWS_WITH_AS(Json().template value<string_t>(key, "default"), "[json.exception.type_error.306] cannot use value() with null", typename Json::type_error&);
+            CHECK_THROWS_WITH_AS(Json().template value<string_t>(key, str), "[json.exception.type_error.306] cannot use value() with null", typename Json::type_error&);
+        }
+#endif
+    }
+}
diff --git a/external_imported/json/tests/src/unit-hash.cpp b/external_imported/json/tests/src/unit-hash.cpp
new file mode 100644
index 000000000..7c98a27cb
--- /dev/null
+++ b/external_imported/json/tests/src/unit-hash.cpp
@@ -0,0 +1,113 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+#include <nlohmann/json.hpp>
+using json = nlohmann::json;
+using ordered_json = nlohmann::ordered_json;
+
+#include <set>
+
+TEST_CASE("hash<nlohmann::json>")
+{
+    // Collect hashes for different JSON values and make sure that they are distinct
+    // We cannot compare against fixed values, because the implementation of
+    // std::hash may differ between compilers.
+
+    std::set<std::size_t> hashes;
+
+    // null
+    hashes.insert(std::hash<json> {}(json(nullptr)));
+
+    // boolean
+    hashes.insert(std::hash<json> {}(json(true)));
+    hashes.insert(std::hash<json> {}(json(false)));
+
+    // string
+    hashes.insert(std::hash<json> {}(json("")));
+    hashes.insert(std::hash<json> {}(json("foo")));
+
+    // number
+    hashes.insert(std::hash<json> {}(json(0)));
+    hashes.insert(std::hash<json> {}(json(static_cast<unsigned>(0))));
+
+    hashes.insert(std::hash<json> {}(json(-1)));
+    hashes.insert(std::hash<json> {}(json(0.0)));
+    hashes.insert(std::hash<json> {}(json(42.23)));
+
+    // array
+    hashes.insert(std::hash<json> {}(json::array()));
+    hashes.insert(std::hash<json> {}(json::array({1, 2, 3})));
+
+    // object
+    hashes.insert(std::hash<json> {}(json::object()));
+    hashes.insert(std::hash<json> {}(json::object({{"foo", "bar"}})));
+
+    // binary
+    hashes.insert(std::hash<json> {}(json::binary({})));
+    hashes.insert(std::hash<json> {}(json::binary({}, 0)));
+    hashes.insert(std::hash<json> {}(json::binary({}, 42)));
+    hashes.insert(std::hash<json> {}(json::binary({1, 2, 3})));
+    hashes.insert(std::hash<json> {}(json::binary({1, 2, 3}, 0)));
+    hashes.insert(std::hash<json> {}(json::binary({1, 2, 3}, 42)));
+
+    // discarded
+    hashes.insert(std::hash<json> {}(json(json::value_t::discarded)));
+
+    CHECK(hashes.size() == 21);
+}
+
+TEST_CASE("hash<nlohmann::ordered_json>")
+{
+    // Collect hashes for different JSON values and make sure that they are distinct
+    // We cannot compare against fixed values, because the implementation of
+    // std::hash may differ between compilers.
+
+    std::set<std::size_t> hashes;
+
+    // null
+    hashes.insert(std::hash<ordered_json> {}(ordered_json(nullptr)));
+
+    // boolean
+    hashes.insert(std::hash<ordered_json> {}(ordered_json(true)));
+    hashes.insert(std::hash<ordered_json> {}(ordered_json(false)));
+
+    // string
+    hashes.insert(std::hash<ordered_json> {}(ordered_json("")));
+    hashes.insert(std::hash<ordered_json> {}(ordered_json("foo")));
+
+    // number
+    hashes.insert(std::hash<ordered_json> {}(ordered_json(0)));
+    hashes.insert(std::hash<ordered_json> {}(ordered_json(static_cast<unsigned>(0))));
+
+    hashes.insert(std::hash<ordered_json> {}(ordered_json(-1)));
+    hashes.insert(std::hash<ordered_json> {}(ordered_json(0.0)));
+    hashes.insert(std::hash<ordered_json> {}(ordered_json(42.23)));
+
+    // array
+    hashes.insert(std::hash<ordered_json> {}(ordered_json::array()));
+    hashes.insert(std::hash<ordered_json> {}(ordered_json::array({1, 2, 3})));
+
+    // object
+    hashes.insert(std::hash<ordered_json> {}(ordered_json::object()));
+    hashes.insert(std::hash<ordered_json> {}(ordered_json::object({{"foo", "bar"}})));
+
+    // binary
+    hashes.insert(std::hash<ordered_json> {}(ordered_json::binary({})));
+    hashes.insert(std::hash<ordered_json> {}(ordered_json::binary({}, 0)));
+    hashes.insert(std::hash<ordered_json> {}(ordered_json::binary({}, 42)));
+    hashes.insert(std::hash<ordered_json> {}(ordered_json::binary({1, 2, 3})));
+    hashes.insert(std::hash<ordered_json> {}(ordered_json::binary({1, 2, 3}, 0)));
+    hashes.insert(std::hash<ordered_json> {}(ordered_json::binary({1, 2, 3}, 42)));
+
+    // discarded
+    hashes.insert(std::hash<ordered_json> {}(ordered_json(ordered_json::value_t::discarded)));
+
+    CHECK(hashes.size() == 21);
+}
diff --git a/external_imported/json/test/src/unit-inspection.cpp b/external_imported/json/tests/src/unit-inspection.cpp
similarity index 81%
rename from external_imported/json/test/src/unit-inspection.cpp
rename to external_imported/json/tests/src/unit-inspection.cpp
index 004f14d19..0574094c5 100644
--- a/external_imported/json/test/src/unit-inspection.cpp
+++ b/external_imported/json/tests/src/unit-inspection.cpp
@@ -1,31 +1,10 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
 
 #include "doctest_compatibility.h"
 
@@ -34,7 +13,7 @@ using nlohmann::json;
 
 #include <fstream>
 #include <sstream>
-#include <test_data.hpp>
+#include "make_test_data_available.hpp"
 
 TEST_CASE("object inspection")
 {
@@ -42,7 +21,7 @@ TEST_CASE("object inspection")
     {
         SECTION("object")
         {
-            json j {{"foo", 1}, {"bar", false}};
+            json const j {{"foo", 1}, {"bar", false}};
             CHECK(!j.is_null());
             CHECK(!j.is_boolean());
             CHECK(!j.is_number());
@@ -60,7 +39,7 @@ TEST_CASE("object inspection")
 
         SECTION("array")
         {
-            json j {"foo", 1, 1u, 42.23, false};
+            json const j {"foo", 1, 1u, 42.23, false};
             CHECK(!j.is_null());
             CHECK(!j.is_boolean());
             CHECK(!j.is_number());
@@ -78,7 +57,7 @@ TEST_CASE("object inspection")
 
         SECTION("null")
         {
-            json j(nullptr);
+            json const j(nullptr);
             CHECK(j.is_null());
             CHECK(!j.is_boolean());
             CHECK(!j.is_number());
@@ -96,7 +75,7 @@ TEST_CASE("object inspection")
 
         SECTION("boolean")
         {
-            json j(true);
+            json const j(true);
             CHECK(!j.is_null());
             CHECK(j.is_boolean());
             CHECK(!j.is_number());
@@ -114,7 +93,7 @@ TEST_CASE("object inspection")
 
         SECTION("string")
         {
-            json j("Hello world");
+            json const j("Hello world");
             CHECK(!j.is_null());
             CHECK(!j.is_boolean());
             CHECK(!j.is_number());
@@ -132,7 +111,7 @@ TEST_CASE("object inspection")
 
         SECTION("number (integer)")
         {
-            json j(42);
+            json const j(42);
             CHECK(!j.is_null());
             CHECK(!j.is_boolean());
             CHECK(j.is_number());
@@ -150,7 +129,7 @@ TEST_CASE("object inspection")
 
         SECTION("number (unsigned)")
         {
-            json j(42u);
+            json const j(42u);
             CHECK(!j.is_null());
             CHECK(!j.is_boolean());
             CHECK(j.is_number());
@@ -168,7 +147,7 @@ TEST_CASE("object inspection")
 
         SECTION("number (floating-point)")
         {
-            json j(42.23);
+            json const j(42.23);
             CHECK(!j.is_null());
             CHECK(!j.is_boolean());
             CHECK(j.is_number());
@@ -186,7 +165,7 @@ TEST_CASE("object inspection")
 
         SECTION("binary")
         {
-            json j(json::value_t::binary);
+            json const j(json::value_t::binary);
             CHECK(!j.is_null());
             CHECK(!j.is_boolean());
             CHECK(!j.is_number());
@@ -204,7 +183,7 @@ TEST_CASE("object inspection")
 
         SECTION("discarded")
         {
-            json j(json::value_t::discarded);
+            json const j(json::value_t::discarded);
             CHECK(!j.is_null());
             CHECK(!j.is_boolean());
             CHECK(!j.is_number());
@@ -223,7 +202,7 @@ TEST_CASE("object inspection")
 
     SECTION("serialization")
     {
-        json j {{"object", json::object()}, {"array", {1, 2, 3, 4}}, {"number", 42}, {"boolean", false}, {"null", nullptr}, {"string", "Hello world"} };
+        json const j {{"object", json::object()}, {"array", {1, 2, 3, 4}}, {"number", 42}, {"boolean", false}, {"null", nullptr}, {"string", "Hello world"} };
 
         SECTION("no indent / indent=-1")
         {
@@ -309,7 +288,7 @@ TEST_CASE("object inspection")
                 std::ifstream f_escaped(TEST_DATA_DIRECTORY "/json_nlohmann_tests/all_unicode_ascii.json");
                 std::ifstream f_unescaped(TEST_DATA_DIRECTORY "/json_nlohmann_tests/all_unicode.json");
 
-                json value = json::parse(f_unescaped);
+                json const value = json::parse(f_unescaped);
                 std::string text = value.dump(4, ' ', true);
 
                 std::string expected((std::istreambuf_iterator<char>(f_escaped)),
@@ -320,7 +299,7 @@ TEST_CASE("object inspection")
 
         SECTION("serialization of discarded element")
         {
-            json j_discarded(json::value_t::discarded);
+            json const j_discarded(json::value_t::discarded);
             CHECK(j_discarded.dump() == "<discarded>");
         }
 
@@ -336,7 +315,7 @@ TEST_CASE("object inspection")
             ss.str(std::string());
 
             // use stringstream for JSON serialization
-            json j_number = 3.14159265358979;
+            json const j_number = 3.14159265358979;
             ss << j_number;
 
             // check that precision has been overridden during serialization
@@ -353,9 +332,9 @@ TEST_CASE("object inspection")
                 {"3.141592653589793", "1000000000000000010E5"
                 })
         {
-            json j1 = json::parse(s);
+            json const j1 = json::parse(s);
             std::string s1 = j1.dump();
-            json j2 = json::parse(s1);
+            json const j2 = json::parse(s1);
             std::string s2 = j2.dump();
             CHECK(s1 == s2);
         }
@@ -365,49 +344,49 @@ TEST_CASE("object inspection")
     {
         SECTION("null")
         {
-            json j = nullptr;
+            json const j = nullptr;
             CHECK(j.type() == json::value_t::null);
         }
 
         SECTION("object")
         {
-            json j = {{"foo", "bar"}};
+            json const j = {{"foo", "bar"}};
             CHECK(j.type() == json::value_t::object);
         }
 
         SECTION("array")
         {
-            json j = {1, 2, 3, 4};
+            json const j = {1, 2, 3, 4};
             CHECK(j.type() == json::value_t::array);
         }
 
         SECTION("boolean")
         {
-            json j = true;
+            json const j = true;
             CHECK(j.type() == json::value_t::boolean);
         }
 
         SECTION("string")
         {
-            json j = "Hello world";
+            json const j = "Hello world";
             CHECK(j.type() == json::value_t::string);
         }
 
         SECTION("number (integer)")
         {
-            json j = 23;
+            json const j = 23;
             CHECK(j.type() == json::value_t::number_integer);
         }
 
         SECTION("number (unsigned)")
         {
-            json j = 23u;
+            json const j = 23u;
             CHECK(j.type() == json::value_t::number_unsigned);
         }
 
         SECTION("number (floating-point)")
         {
-            json j = 42.23;
+            json const j = 42.23;
             CHECK(j.type() == json::value_t::number_float);
         }
     }
@@ -416,63 +395,63 @@ TEST_CASE("object inspection")
     {
         SECTION("null")
         {
-            json j = nullptr;
+            json const j = nullptr;
             json::value_t t = j;
             CHECK(t == j.type());
         }
 
         SECTION("object")
         {
-            json j = {{"foo", "bar"}};
+            json const j = {{"foo", "bar"}};
             json::value_t t = j;
             CHECK(t == j.type());
         }
 
         SECTION("array")
         {
-            json j = {1, 2, 3, 4};
+            json const j = {1, 2, 3, 4};
             json::value_t t = j;
             CHECK(t == j.type());
         }
 
         SECTION("boolean")
         {
-            json j = true;
+            json const j = true;
             json::value_t t = j;
             CHECK(t == j.type());
         }
 
         SECTION("string")
         {
-            json j = "Hello world";
+            json const j = "Hello world";
             json::value_t t = j;
             CHECK(t == j.type());
         }
 
         SECTION("number (integer)")
         {
-            json j = 23;
+            json const j = 23;
             json::value_t t = j;
             CHECK(t == j.type());
         }
 
         SECTION("number (unsigned)")
         {
-            json j = 23u;
+            json const j = 23u;
             json::value_t t = j;
             CHECK(t == j.type());
         }
 
         SECTION("number (floating-point)")
         {
-            json j = 42.23;
+            json const j = 42.23;
             json::value_t t = j;
             CHECK(t == j.type());
         }
 
         SECTION("binary")
         {
-            json j = json::binary({});
+            json const j = json::binary({});
             json::value_t t = j;
             CHECK(t == j.type());
         }
diff --git a/external_imported/json/test/src/unit-items.cpp b/external_imported/json/tests/src/unit-items.cpp
similarity index 89%
rename from external_imported/json/test/src/unit-items.cpp
rename to external_imported/json/tests/src/unit-items.cpp
index 4caf76f23..ef2dd74b1 100644
--- a/external_imported/json/test/src/unit-items.cpp
+++ b/external_imported/json/tests/src/unit-items.cpp
@@ -1,43 +1,23 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
 
 #include "doctest_compatibility.h"
 
 #include <nlohmann/json.hpp>
 using nlohmann::json;
 
-#if (defined(__cplusplus) && __cplusplus >= 201703L) || (defined(_HAS_CXX17) && _HAS_CXX17 == 1) // fix for issue #464
-    #define JSON_HAS_CPP_17
-    #define JSON_HAS_CPP_14
-#elif (defined(__cplusplus) && __cplusplus >= 201402L) || (defined(_HAS_CXX14) && _HAS_CXX14 == 1)
-    #define JSON_HAS_CPP_14
+// This test suite uses range for loops where values are copied. This is inefficient in usual code, but required to achieve 100% coverage.
+DOCTEST_GCC_SUPPRESS_WARNING_PUSH
+#if DOCTEST_GCC >= DOCTEST_COMPILER(11, 0, 0)
+    DOCTEST_GCC_SUPPRESS_WARNING("-Wrange-loop-construct")
 #endif
+DOCTEST_CLANG_SUPPRESS_WARNING_PUSH
+DOCTEST_CLANG_SUPPRESS_WARNING("-Wrange-loop-construct")
 
 TEST_CASE("iterator_wrapper")
 {
@@ -48,7 +28,7 @@ TEST_CASE("iterator_wrapper")
             json j = { {"A", 1}, {"B", 2} };
             int counter = 1;
 
-            for (auto i : json::iterator_wrapper(j))
+            for (auto i : json::iterator_wrapper(j)) // NOLINT(performance-for-range-copy)
             {
                 switch (counter++)
                 {
@@ -81,7 +61,7 @@ TEST_CASE("iterator_wrapper")
             json j = { {"A", 1}, {"B", 2} };
             int counter = 1;
 
-            for (auto& i : json::iterator_wrapper(j))
+            for (auto& i : json::iterator_wrapper(j)) // NOLINT(readability-qualified-auto)
             {
                 switch (counter++)
                 {
@@ -125,7 +105,7 @@ TEST_CASE("iterator_wrapper")
             json j = { {"A", 1}, {"B", 2} };
             int counter = 1;
 
-            for (const auto i : json::iterator_wrapper(j))
+            for (const auto i : json::iterator_wrapper(j)) // NOLINT(performance-for-range-copy)
             {
                 switch (counter++)
                 {
@@ -194,7 +174,7 @@ TEST_CASE("iterator_wrapper")
             const json j = { {"A", 1}, {"B", 2} };
             int counter = 1;
 
-            for (auto i : json::iterator_wrapper(j))
+            for (auto i : json::iterator_wrapper(j)) // NOLINT(performance-for-range-copy)
             {
                 switch (counter++)
                 {
@@ -227,7 +207,7 @@ TEST_CASE("iterator_wrapper")
             const json j = { {"A", 1}, {"B", 2} };
             int counter = 1;
 
-            for (auto& i : json::iterator_wrapper(j))
+            for (auto& i : json::iterator_wrapper(j)) // NOLINT(readability-qualified-auto)
             {
                 switch (counter++)
                 {
@@ -260,7 +240,7 @@ TEST_CASE("iterator_wrapper")
             const json j = { {"A", 1}, {"B", 2} };
             int counter = 1;
 
-            for (const auto i : json::iterator_wrapper(j))
+            for (const auto i : json::iterator_wrapper(j)) // NOLINT(performance-for-range-copy)
             {
                 switch (counter++)
                 {
@@ -329,7 +309,7 @@ TEST_CASE("iterator_wrapper")
             json j = { "A", "B" };
             int counter = 1;
 
-            for (auto i : json::iterator_wrapper(j))
+            for (auto i : json::iterator_wrapper(j)) // NOLINT(performance-for-range-copy)
             {
                 switch (counter++)
                 {
@@ -362,7 +342,7 @@ TEST_CASE("iterator_wrapper")
             json j = { "A", "B" };
             int counter = 1;
 
-            for (auto& i : json::iterator_wrapper(j))
+            for (auto& i : json::iterator_wrapper(j)) // NOLINT(readability-qualified-auto)
             {
                 switch (counter++)
                 {
@@ -406,7 +386,7 @@ TEST_CASE("iterator_wrapper")
             json j = { "A", "B" };
             int counter = 1;
 
-            for (const auto i : json::iterator_wrapper(j))
+            for (const auto i : json::iterator_wrapper(j)) // NOLINT(performance-for-range-copy)
             {
                 switch (counter++)
                 {
@@ -475,7 +455,7 @@ TEST_CASE("iterator_wrapper")
             const json j = { "A", "B" };
             int counter = 1;
 
-            for (auto i : json::iterator_wrapper(j))
+            for (auto i : json::iterator_wrapper(j)) // NOLINT(performance-for-range-copy)
             {
                 switch (counter++)
                 {
@@ -508,7 +488,7 @@ TEST_CASE("iterator_wrapper")
             const json j = { "A", "B" };
             int counter = 1;
 
-            for (auto& i : json::iterator_wrapper(j))
+            for (auto& i : json::iterator_wrapper(j)) // NOLINT(readability-qualified-auto)
             {
                 switch (counter++)
                 {
@@ -541,7 +521,7 @@ TEST_CASE("iterator_wrapper")
             const json j = { "A", "B" };
             int counter = 1;
 
-            for (const auto i : json::iterator_wrapper(j))
+            for (const auto i : json::iterator_wrapper(j)) // NOLINT(performance-for-range-copy)
             {
                 switch (counter++)
                 {
@@ -610,7 +590,7 @@ TEST_CASE("iterator_wrapper")
             json j = 1;
             int counter = 1;
 
-            for (auto i : json::iterator_wrapper(j))
+            for (auto i : json::iterator_wrapper(j)) // NOLINT(performance-for-range-copy)
             {
                 ++counter;
                 CHECK(i.key() == "");
@@ -625,7 +605,7 @@ TEST_CASE("iterator_wrapper")
             json j = 1;
             int counter = 1;
 
-            for (auto& i : json::iterator_wrapper(j))
+            for (auto& i : json::iterator_wrapper(j)) // NOLINT(readability-qualified-auto)
             {
                 ++counter;
                 CHECK(i.key() == "");
@@ -646,7 +626,7 @@ TEST_CASE("iterator_wrapper")
             json j = 1;
             int counter = 1;
 
-            for (const auto i : json::iterator_wrapper(j))
+            for (const auto i : json::iterator_wrapper(j)) // NOLINT(performance-for-range-copy)
             {
                 ++counter;
                 CHECK(i.key() == "");
@@ -679,7 +659,7 @@ TEST_CASE("iterator_wrapper")
             const json j = 1;
             int counter = 1;
 
-            for (auto i : json::iterator_wrapper(j))
+            for (auto i : json::iterator_wrapper(j)) // NOLINT(performance-for-range-copy)
             {
                 ++counter;
                 CHECK(i.key() == "");
@@ -694,7 +674,7 @@ TEST_CASE("iterator_wrapper")
             const json j = 1;
             int counter = 1;
 
-            for (auto& i : json::iterator_wrapper(j))
+            for (auto& i : json::iterator_wrapper(j)) // NOLINT(readability-qualified-auto)
             {
                 ++counter;
                 CHECK(i.key() == "");
@@ -709,7 +689,7 @@ TEST_CASE("iterator_wrapper")
             const json j = 1;
             int counter = 1;
 
-            for (const auto i : json::iterator_wrapper(j))
+            for (const auto i : json::iterator_wrapper(j)) // NOLINT(performance-for-range-copy)
             {
                 ++counter;
                 CHECK(i.key() == "");
@@ -745,7 +725,7 @@ TEST_CASE("items()")
             json j = { {"A", 1}, {"B", 2} };
             int counter = 1;
 
-            for (auto i : j.items())
+            for (auto i : j.items()) // NOLINT(performance-for-range-copy)
             {
                 switch (counter++)
                 {
@@ -778,7 +758,7 @@ TEST_CASE("items()")
             json j = { {"A", 1}, {"B", 2} };
             int counter = 1;
 
-            for (auto& i : j.items())
+            for (auto& i : j.items()) // NOLINT(readability-qualified-auto)
             {
                 switch (counter++)
                 {
@@ -822,7 +802,7 @@ TEST_CASE("items()")
             json j = { {"A", 1}, {"B", 2} };
             int counter = 1;
 
-            for (const auto i : j.items())
+            for (const auto i : j.items()) // NOLINT(performance-for-range-copy)
             {
                 switch (counter++)
                 {
@@ -907,7 +887,7 @@ TEST_CASE("items()")
             const json j = { {"A", 1}, {"B", 2} };
             int counter = 1;
 
-            for (auto i : j.items())
+            for (auto i : j.items()) // NOLINT(performance-for-range-copy)
             {
                 switch (counter++)
                 {
@@ -940,7 +920,7 @@ TEST_CASE("items()")
             const json j = { {"A", 1}, {"B", 2} };
             int counter = 1;
 
-            for (auto& i : j.items())
+            for (auto& i : j.items()) // NOLINT(readability-qualified-auto)
             {
                 switch (counter++)
                 {
@@ -973,7 +953,7 @@ TEST_CASE("items()")
             const json j = { {"A", 1}, {"B", 2} };
             int counter = 1;
 
-            for (const auto i : j.items())
+            for (const auto i : j.items()) // NOLINT(performance-for-range-copy)
             {
                 switch (counter++)
                 {
@@ -1042,7 +1022,7 @@ TEST_CASE("items()")
             json j = { "A", "B" };
             int counter = 1;
 
-            for (auto i : j.items())
+            for (auto i : j.items()) // NOLINT(performance-for-range-copy)
             {
                 switch (counter++)
                 {
@@ -1075,7 +1055,7 @@ TEST_CASE("items()")
             json j = { "A", "B" };
             int counter = 1;
 
-            for (auto& i : j.items())
+            for (auto& i : j.items()) // NOLINT(readability-qualified-auto)
             {
                 switch (counter++)
                 {
@@ -1119,7 +1099,7 @@ TEST_CASE("items()")
             json j = { "A", "B" };
             int counter = 1;
 
-            for (const auto i : j.items())
+            for (const auto i : j.items()) // NOLINT(performance-for-range-copy)
             {
                 switch (counter++)
                 {
@@ -1188,7 +1168,7 @@ TEST_CASE("items()")
             const json j = { "A", "B" };
             int counter = 1;
 
-            for (auto i : j.items())
+            for (auto i : j.items()) // NOLINT(performance-for-range-copy)
             {
                 switch (counter++)
                 {
@@ -1221,7 +1201,7 @@ TEST_CASE("items()")
             const json j = { "A", "B" };
             int counter = 1;
 
-            for (auto& i : j.items())
+            for (auto& i : j.items()) // NOLINT(readability-qualified-auto)
             {
                 switch (counter++)
                 {
@@ -1254,7 +1234,7 @@ TEST_CASE("items()")
             const json j = { "A", "B" };
             int counter = 1;
 
-            for (const auto i : j.items())
+            for (const auto i : j.items()) // NOLINT(performance-for-range-copy)
             {
                 switch (counter++)
                 {
@@ -1323,7 +1303,7 @@ TEST_CASE("items()")
             json j = 1;
             int counter = 1;
 
-            for (auto i : j.items())
+            for (auto i : j.items()) // NOLINT(performance-for-range-copy)
             {
                 ++counter;
                 CHECK(i.key() == "");
@@ -1338,7 +1318,7 @@ TEST_CASE("items()")
             json j = 1;
             int counter = 1;
 
-            for (auto& i : j.items())
+            for (auto& i : j.items()) // NOLINT(readability-qualified-auto)
             {
                 ++counter;
                 CHECK(i.key() == "");
@@ -1359,7 +1339,7 @@ TEST_CASE("items()")
             json j = 1;
             int counter = 1;
 
-            for (const auto i : j.items())
+            for (const auto i : j.items()) // NOLINT(performance-for-range-copy)
             {
                 ++counter;
                 CHECK(i.key() == "");
@@ -1392,7 +1372,7 @@ TEST_CASE("items()")
             const json j = 1;
             int counter = 1;
 
-            for (auto i : j.items())
+            for (auto i : j.items()) // NOLINT(performance-for-range-copy)
             {
                 ++counter;
                 CHECK(i.key() == "");
@@ -1407,7 +1387,7 @@ TEST_CASE("items()")
             const json j = 1;
             int counter = 1;
 
-            for (auto& i : j.items())
+            for (auto& i : j.items()) // NOLINT(readability-qualified-auto)
             {
                 ++counter;
                 CHECK(i.key() == "");
@@ -1422,7 +1402,7 @@ TEST_CASE("items()")
             const json j = 1;
             int counter = 1;
 
-            for (const auto i : j.items())
+            for (const auto i : j.items()) // NOLINT(performance-for-range-copy)
             {
                 ++counter;
                 CHECK(i.key() == "");
@@ -1449,10 +1429,5 @@ TEST_CASE("items()")
     }
 }
 
-#ifdef JSON_HAS_CPP_17
-    #undef JSON_HAS_CPP_17
-#endif
-
-#ifdef JSON_HAS_CPP_14
-    #undef JSON_HAS_CPP_14
-#endif
+DOCTEST_GCC_SUPPRESS_WARNING_POP
+DOCTEST_CLANG_SUPPRESS_WARNING_POP
diff --git a/external_imported/json/test/src/unit-iterators1.cpp b/external_imported/json/tests/src/unit-iterators1.cpp
similarity index 83%
rename from external_imported/json/test/src/unit-iterators1.cpp
rename to external_imported/json/tests/src/unit-iterators1.cpp
index 1ff8958fa..24669a625 100644
--- a/external_imported/json/test/src/unit-iterators1.cpp
+++ b/external_imported/json/tests/src/unit-iterators1.cpp
@@ -1,31 +1,10 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
 
 #include "doctest_compatibility.h"
 
@@ -338,23 +317,17 @@ TEST_CASE("iterators 1")
             {
                 auto it = j.begin();
                 auto cit = j_const.cbegin();
-                CHECK_THROWS_AS(it.key(), json::invalid_iterator&);
-                CHECK_THROWS_WITH(it.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators");
+                CHECK_THROWS_WITH_AS(it.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators", json::invalid_iterator&);
                 CHECK(it.value() == json(true));
-                CHECK_THROWS_AS(cit.key(), json::invalid_iterator&);
-                CHECK_THROWS_WITH(cit.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators");
+                CHECK_THROWS_WITH_AS(cit.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators", json::invalid_iterator&);
                 CHECK(cit.value() == json(true));
 
                 auto rit = j.rend();
                 auto crit = j.crend();
-                CHECK_THROWS_AS(rit.key(), json::invalid_iterator&);
-                CHECK_THROWS_AS(rit.value(), json::invalid_iterator&);
-                CHECK_THROWS_AS(crit.key(), json::invalid_iterator&);
-                CHECK_THROWS_AS(crit.value(), json::invalid_iterator&);
-                CHECK_THROWS_WITH(rit.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators");
-                CHECK_THROWS_WITH(rit.value(), "[json.exception.invalid_iterator.214] cannot get value");
-                CHECK_THROWS_WITH(crit.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators");
-                CHECK_THROWS_WITH(crit.value(), "[json.exception.invalid_iterator.214] cannot get value");
+                CHECK_THROWS_WITH_AS(rit.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators", json::invalid_iterator&);
+                CHECK_THROWS_WITH_AS(rit.value(), "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&);
+                CHECK_THROWS_WITH_AS(crit.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators", json::invalid_iterator&);
+                CHECK_THROWS_WITH_AS(crit.value(), "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&);
             }
         }
 
@@ -542,23 +515,17 @@ TEST_CASE("iterators 1")
             {
                 auto it = j.begin();
                 auto cit = j_const.cbegin();
-                CHECK_THROWS_AS(it.key(), json::invalid_iterator&);
-                CHECK_THROWS_WITH(it.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators");
+                CHECK_THROWS_WITH_AS(it.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators", json::invalid_iterator&);
                 CHECK(it.value() == json("hello world"));
-                CHECK_THROWS_AS(cit.key(), json::invalid_iterator&);
-                CHECK_THROWS_WITH(cit.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators");
+                CHECK_THROWS_WITH_AS(cit.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators", json::invalid_iterator&);
                 CHECK(cit.value() == json("hello world"));
 
                 auto rit = j.rend();
                 auto crit = j.crend();
-                CHECK_THROWS_AS(rit.key(), json::invalid_iterator&);
-                CHECK_THROWS_AS(rit.value(), json::invalid_iterator&);
-                CHECK_THROWS_AS(crit.key(), json::invalid_iterator&);
-                CHECK_THROWS_AS(crit.value(), json::invalid_iterator&);
-                CHECK_THROWS_WITH(rit.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators");
-                CHECK_THROWS_WITH(rit.value(), "[json.exception.invalid_iterator.214] cannot get value");
-                CHECK_THROWS_WITH(crit.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators");
-                CHECK_THROWS_WITH(crit.value(), "[json.exception.invalid_iterator.214] cannot get value");
+                CHECK_THROWS_WITH_AS(rit.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators", json::invalid_iterator&);
+                CHECK_THROWS_WITH_AS(rit.value(), "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&);
+                CHECK_THROWS_WITH_AS(crit.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators", json::invalid_iterator&);
+                CHECK_THROWS_WITH_AS(crit.value(), "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&);
             }
         }
 
@@ -739,11 +706,9 @@ TEST_CASE("iterators 1")
             {
                 auto it = j.begin();
                 auto cit = j_const.cbegin();
-                CHECK_THROWS_AS(it.key(), json::invalid_iterator&);
-                CHECK_THROWS_WITH(it.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators");
+                CHECK_THROWS_WITH_AS(it.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators", json::invalid_iterator&);
                 CHECK(it.value() == json(1));
-                CHECK_THROWS_AS(cit.key(), json::invalid_iterator&);
-                CHECK_THROWS_WITH(cit.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators");
+                CHECK_THROWS_WITH_AS(cit.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators", json::invalid_iterator&);
                 CHECK(cit.value() == json(1));
             }
         }
@@ -1116,23 +1081,17 @@ TEST_CASE("iterators 1")
             {
                 auto it = j.begin();
                 auto cit = j_const.cbegin();
-                CHECK_THROWS_AS(it.key(), json::invalid_iterator&);
-                CHECK_THROWS_WITH(it.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators");
+                CHECK_THROWS_WITH_AS(it.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators", json::invalid_iterator&);
                 CHECK(it.value() == json(23));
-                CHECK_THROWS_AS(cit.key(), json::invalid_iterator&);
-                CHECK_THROWS_WITH(cit.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators");
+                CHECK_THROWS_WITH_AS(cit.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators", json::invalid_iterator&);
                 CHECK(cit.value() == json(23));
 
                 auto rit = j.rend();
                 auto crit = j.crend();
-                CHECK_THROWS_AS(rit.key(), json::invalid_iterator&);
-                CHECK_THROWS_AS(rit.value(), json::invalid_iterator&);
-                CHECK_THROWS_AS(crit.key(), json::invalid_iterator&);
-                CHECK_THROWS_AS(crit.value(), json::invalid_iterator&);
-                CHECK_THROWS_WITH(rit.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators");
-                CHECK_THROWS_WITH(rit.value(), "[json.exception.invalid_iterator.214] cannot get value");
-                CHECK_THROWS_WITH(crit.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators");
-                CHECK_THROWS_WITH(crit.value(), "[json.exception.invalid_iterator.214] cannot get value");
+                CHECK_THROWS_WITH_AS(rit.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators", json::invalid_iterator&);
+                CHECK_THROWS_WITH_AS(rit.value(), "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&);
+                CHECK_THROWS_WITH_AS(crit.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators", json::invalid_iterator&);
+                CHECK_THROWS_WITH_AS(crit.value(), "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&);
             }
         }
 
@@ -1320,23 +1279,17 @@ TEST_CASE("iterators 1")
             {
                 auto it = j.begin();
                 auto cit = j_const.cbegin();
-                CHECK_THROWS_AS(it.key(), json::invalid_iterator&);
-                CHECK_THROWS_WITH(it.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators");
+                CHECK_THROWS_WITH_AS(it.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators", json::invalid_iterator&);
                 CHECK(it.value() == json(23));
-                CHECK_THROWS_AS(cit.key(), json::invalid_iterator&);
-                CHECK_THROWS_WITH(cit.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators");
+                CHECK_THROWS_WITH_AS(cit.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators", json::invalid_iterator&);
                 CHECK(cit.value() == json(23));
 
                 auto rit = j.rend();
                 auto crit = j.crend();
-                CHECK_THROWS_AS(rit.key(), json::invalid_iterator&);
-                CHECK_THROWS_AS(rit.value(), json::invalid_iterator&);
-                CHECK_THROWS_AS(crit.key(), json::invalid_iterator&);
-                CHECK_THROWS_AS(crit.value(), json::invalid_iterator&);
-                CHECK_THROWS_WITH(rit.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators");
-                CHECK_THROWS_WITH(rit.value(), "[json.exception.invalid_iterator.214] cannot get value");
-                CHECK_THROWS_WITH(crit.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators");
-                CHECK_THROWS_WITH(crit.value(), "[json.exception.invalid_iterator.214] cannot get value");
+                CHECK_THROWS_WITH_AS(rit.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators", json::invalid_iterator&);
+                CHECK_THROWS_WITH_AS(rit.value(), "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&);
+                CHECK_THROWS_WITH_AS(crit.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators", json::invalid_iterator&);
+                CHECK_THROWS_WITH_AS(crit.value(), "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&);
             }
         }
 
@@ -1524,23 +1477,17 @@ TEST_CASE("iterators 1")
             {
                 auto it = j.begin();
                 auto cit = j_const.cbegin();
-                CHECK_THROWS_AS(it.key(), json::invalid_iterator&);
-                CHECK_THROWS_WITH(it.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators");
+                CHECK_THROWS_WITH_AS(it.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators", json::invalid_iterator&);
                 CHECK(it.value() == json(23.42));
-                CHECK_THROWS_AS(cit.key(), json::invalid_iterator&);
-                CHECK_THROWS_WITH(cit.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators");
+                CHECK_THROWS_WITH_AS(cit.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators", json::invalid_iterator&);
                 CHECK(cit.value() == json(23.42));
 
                 auto rit = j.rend();
                 auto crit = j.crend();
-                CHECK_THROWS_AS(rit.key(), json::invalid_iterator&);
-                CHECK_THROWS_AS(rit.value(), json::invalid_iterator&);
-                CHECK_THROWS_AS(crit.key(), json::invalid_iterator&);
-                CHECK_THROWS_AS(crit.value(), json::invalid_iterator&);
-                CHECK_THROWS_WITH(rit.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators");
-                CHECK_THROWS_WITH(rit.value(), "[json.exception.invalid_iterator.214] cannot get value");
-                CHECK_THROWS_WITH(crit.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators");
-                CHECK_THROWS_WITH(crit.value(), "[json.exception.invalid_iterator.214] cannot get value");
+                CHECK_THROWS_WITH_AS(rit.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators", json::invalid_iterator&);
+                CHECK_THROWS_WITH_AS(rit.value(), "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&);
+                CHECK_THROWS_WITH_AS(crit.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators", json::invalid_iterator&);
+                CHECK_THROWS_WITH_AS(crit.value(), "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&);
             }
         }
 
@@ -1598,25 +1545,17 @@ TEST_CASE("iterators 1")
             {
                 auto it = j.begin();
                 auto cit = j_const.cbegin();
-                CHECK_THROWS_AS(it.key(), json::invalid_iterator&);
-                CHECK_THROWS_AS(it.value(), json::invalid_iterator&);
-                CHECK_THROWS_AS(cit.key(), json::invalid_iterator&);
-                CHECK_THROWS_AS(cit.value(), json::invalid_iterator&);
-                CHECK_THROWS_WITH(it.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators");
-                CHECK_THROWS_WITH(it.value(), "[json.exception.invalid_iterator.214] cannot get value");
-                CHECK_THROWS_WITH(cit.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators");
-                CHECK_THROWS_WITH(cit.value(), "[json.exception.invalid_iterator.214] cannot get value");
+                CHECK_THROWS_WITH_AS(it.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators", json::invalid_iterator&);
+                CHECK_THROWS_WITH_AS(it.value(), "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&);
+                CHECK_THROWS_WITH_AS(cit.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators", json::invalid_iterator&);
+                CHECK_THROWS_WITH_AS(cit.value(), "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&);
 
                 auto rit = j.rend();
                 auto crit = j.crend();
-                CHECK_THROWS_AS(rit.key(), json::invalid_iterator&);
-                CHECK_THROWS_AS(rit.value(), json::invalid_iterator&);
-                CHECK_THROWS_AS(crit.key(), json::invalid_iterator&);
-                CHECK_THROWS_AS(crit.value(), json::invalid_iterator&);
-                CHECK_THROWS_WITH(rit.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators");
-                CHECK_THROWS_WITH(rit.value(), "[json.exception.invalid_iterator.214] cannot get value");
-                CHECK_THROWS_WITH(crit.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators");
-                CHECK_THROWS_WITH(crit.value(), "[json.exception.invalid_iterator.214] cannot get value");
+                CHECK_THROWS_WITH_AS(rit.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators", json::invalid_iterator&);
+                CHECK_THROWS_WITH_AS(rit.value(), "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&);
+                CHECK_THROWS_WITH_AS(crit.key(), "[json.exception.invalid_iterator.207] cannot use key() for non-object iterators", json::invalid_iterator&);
+                CHECK_THROWS_WITH_AS(crit.value(), "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&);
             }
         }
     }
diff --git a/external_imported/json/tests/src/unit-iterators2.cpp b/external_imported/json/tests/src/unit-iterators2.cpp
new file mode 100644
index 000000000..ce8c95ba4
--- /dev/null
+++ b/external_imported/json/tests/src/unit-iterators2.cpp
@@ -0,0 +1,971 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+// cmake/test.cmake selects the C++ standard versions with which to build a
+// unit test based on the presence of JSON_HAS_CPP_<VERSION> macros.
+// When using macros that are only defined for particular versions of the standard
+// (e.g., JSON_HAS_FILESYSTEM for C++17 and up), please mention the corresponding
+// version macro in a comment close by, like this:
+// JSON_HAS_CPP_<VERSION> (do not remove; see note at top of file)
+
+#include "doctest_compatibility.h"
+
+#include <nlohmann/json.hpp>
+using nlohmann::json;
+
+#if JSON_HAS_RANGES
+    #include <algorithm>
+    #include <ranges>
+#endif
+
+TEST_CASE("iterators 2")
+{
+    SECTION("iterator comparisons")
+    {
+        json j_values = {nullptr, true, 42, 42u, 23.23, {{"one", 1}, {"two", 2}}, {1, 2, 3, 4, 5}, "Hello, world"};
+
+        for (json& j : j_values)
+        {
+            auto it1 = j.begin();
+            auto it2 = j.begin();
+            auto it3 = j.begin();
+            ++it2;
+            ++it3;
+            ++it3;
+            auto it1_c = j.cbegin();
+            auto it2_c = j.cbegin();
+            auto it3_c = j.cbegin();
+            ++it2_c;
+            ++it3_c;
+            ++it3_c;
+
+            // comparison: equal
+            {
+                CHECK(it1 == it1);
+                CHECK(!(it1 == it2));
+                CHECK(!(it1 == it3));
+                CHECK(!(it2 == it3));
+                CHECK(it1_c == it1_c);
+                CHECK(!(it1_c == it2_c));
+                CHECK(!(it1_c == it3_c));
+                CHECK(!(it2_c == it3_c));
+            }
+
+            // comparison: not equal
+            {
+                // check definition
+                CHECK( (it1 != it1) == !(it1 == it1) );
+                CHECK( (it1 != it2) == !(it1 == it2) );
+                CHECK( (it1 != it3) == !(it1 == it3) );
+                CHECK( (it2 != it3) == !(it2 == it3) );
+                CHECK( (it1_c != it1_c) == !(it1_c == it1_c) );
+                CHECK( (it1_c != it2_c) == !(it1_c == it2_c) );
+                CHECK( (it1_c != it3_c) == !(it1_c == it3_c) );
+                CHECK( (it2_c != it3_c) == !(it2_c == it3_c) );
+            }
+
+            // comparison: smaller
+            {
+                if (j.type() == json::value_t::object)
+                {
+#if JSON_DIAGNOSTICS
+                    CHECK_THROWS_WITH_AS(it1 < it1, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1 < it2, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it2 < it3, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1 < it3, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c < it1_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c < it2_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it2_c < it3_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c < it3_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+#else
+                    CHECK_THROWS_WITH_AS(it1 < it1, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1 < it2, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it2 < it3, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1 < it3, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c < it1_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c < it2_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it2_c < it3_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c < it3_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+#endif
+                }
+                else
+                {
+                    CHECK(!(it1 < it1));
+                    CHECK(it1 < it2);
+                    CHECK(it1 < it3);
+                    CHECK(it2 < it3);
+                    CHECK(!(it1_c < it1_c));
+                    CHECK(it1_c < it2_c);
+                    CHECK(it1_c < it3_c);
+                    CHECK(it2_c < it3_c);
+                }
+            }
+
+            // comparison: less than or equal
+            {
+                if (j.type() == json::value_t::object)
+                {
+#if JSON_DIAGNOSTICS
+                    CHECK_THROWS_WITH_AS(it1 <= it1, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1 <= it2, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it2 <= it3, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1 <= it3, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c <= it1_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c <= it2_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it2_c <= it3_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c <= it3_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+#else
+                    CHECK_THROWS_WITH_AS(it1 <= it1, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1 <= it2, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it2 <= it3, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1 <= it3, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c <= it1_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c <= it2_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it2_c <= it3_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c <= it3_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+#endif
+                }
+                else
+                {
+                    // check definition
+                    CHECK( (it1 <= it1) == !(it1 < it1) );
+                    CHECK( (it1 <= it2) == !(it2 < it1) );
+                    CHECK( (it1 <= it3) == !(it3 < it1) );
+                    CHECK( (it2 <= it3) == !(it3 < it2) );
+                    CHECK( (it1_c <= it1_c) == !(it1_c < it1_c) );
+                    CHECK( (it1_c <= it2_c) == !(it2_c < it1_c) );
+                    CHECK( (it1_c <= it3_c) == !(it3_c < it1_c) );
+                    CHECK( (it2_c <= it3_c) == !(it3_c < it2_c) );
+                }
+            }
+
+            // comparison: greater than
+            {
+                if (j.type() == json::value_t::object)
+                {
+#if JSON_DIAGNOSTICS
+                    CHECK_THROWS_WITH_AS(it1 > it1, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1 > it2, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it2 > it3, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1 > it3, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c > it1_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c > it2_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it2_c > it3_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c > it3_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+#else
+                    CHECK_THROWS_WITH_AS(it1 > it1, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1 > it2, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it2 > it3, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1 > it3, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c > it1_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c > it2_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it2_c > it3_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c > it3_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+#endif
+                }
+                else
+                {
+                    // check definition
+                    CHECK( (it1 > it1) == (it1 < it1) );
+                    CHECK( (it1 > it2) == (it2 < it1) );
+                    CHECK( (it1 > it3) == (it3 < it1) );
+                    CHECK( (it2 > it3) == (it3 < it2) );
+                    CHECK( (it1_c > it1_c) == (it1_c < it1_c) );
+                    CHECK( (it1_c > it2_c) == (it2_c < it1_c) );
+                    CHECK( (it1_c > it3_c) == (it3_c < it1_c) );
+                    CHECK( (it2_c > it3_c) == (it3_c < it2_c) );
+                }
+            }
+
+            // comparison: greater than or equal
+            {
+                if (j.type() == json::value_t::object)
+                {
+#if JSON_DIAGNOSTICS
+                    CHECK_THROWS_WITH_AS(it1 >= it1, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1 >= it2, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it2 >= it3, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1 >= it3, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c >= it1_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c >= it2_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it2_c >= it3_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c >= it3_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+#else
+                    CHECK_THROWS_WITH_AS(it1 >= it1, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1 >= it2, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it2 >= it3, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1 >= it3, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c >= it1_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c >= it2_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it2_c >= it3_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c >= it3_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+#endif
+                }
+                else
+                {
+                    // check definition
+                    CHECK( (it1 >= it1) == !(it1 < it1) );
+                    CHECK( (it1 >= it2) == !(it1 < it2) );
+                    CHECK( (it1 >= it3) == !(it1 < it3) );
+                    CHECK( (it2 >= it3) == !(it2 < it3) );
+                    CHECK( (it1_c >= it1_c) == !(it1_c < it1_c) );
+                    CHECK( (it1_c >= it2_c) == !(it1_c < it2_c) );
+                    CHECK( (it1_c >= it3_c) == !(it1_c < it3_c) );
+                    CHECK( (it2_c >= it3_c) == !(it2_c < it3_c) );
+                }
+            }
+        }
+
+        // check exceptions if different objects are compared
+        for (auto j : j_values)
+        {
+            for (auto k : j_values)
+            {
+                if (j != k)
+                {
+#if JSON_DIAGNOSTICS
+                    // the output differs in each loop, so we cannot fix a string for the expected exception
+#else
+                    CHECK_THROWS_WITH_AS(j.begin() == k.begin(), "[json.exception.invalid_iterator.212] cannot compare iterators of different containers", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(j.cbegin() == k.cbegin(), "[json.exception.invalid_iterator.212] cannot compare iterators of different containers", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(j.begin() < k.begin(), "[json.exception.invalid_iterator.212] cannot compare iterators of different containers", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(j.cbegin() < k.cbegin(), "[json.exception.invalid_iterator.212] cannot compare iterators of different containers", json::invalid_iterator&);
+#endif
+                }
+            }
+        }
+    }
+
+    SECTION("iterator arithmetic")
+    {
+        json j_object = {{"one", 1}, {"two", 2}, {"three", 3}};
+        json j_array = {1, 2, 3, 4, 5, 6};
+        json j_null = nullptr;
+        json j_value = 42;
+
+        SECTION("addition and subtraction")
+        {
+            SECTION("object")
+            {
+                {
+                    auto it = j_object.begin();
+                    CHECK_THROWS_WITH_AS(it += 1, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators", json::invalid_iterator&);
+                }
+                {
+                    auto it = j_object.cbegin();
+                    CHECK_THROWS_WITH_AS(it += 1, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators", json::invalid_iterator&);
+                }
+                {
+                    auto it = j_object.begin();
+                    CHECK_THROWS_WITH_AS(it + 1, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators", json::invalid_iterator&);
+                }
+                {
+                    auto it = j_object.cbegin();
+                    CHECK_THROWS_WITH_AS(it + 1, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators", json::invalid_iterator&);
+                }
+                {
+                    auto it = j_object.begin();
+                    CHECK_THROWS_WITH_AS(1 + it, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators", json::invalid_iterator&);
+                }
+                {
+                    auto it = j_object.cbegin();
+                    CHECK_THROWS_WITH_AS(1 + it, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators", json::invalid_iterator&);
+                }
+                {
+                    auto it = j_object.begin();
+                    CHECK_THROWS_WITH_AS(it -= 1, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators", json::invalid_iterator&);
+                }
+                {
+                    auto it = j_object.cbegin();
+                    CHECK_THROWS_WITH_AS(it -= 1, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators", json::invalid_iterator&);
+                }
+                {
+                    auto it = j_object.begin();
+                    CHECK_THROWS_WITH_AS(it - 1, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators", json::invalid_iterator&);
+                }
+                {
+                    auto it = j_object.cbegin();
+                    CHECK_THROWS_WITH_AS(it - 1, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators", json::invalid_iterator&);
+                }
+                {
+                    auto it = j_object.begin();
+                    CHECK_THROWS_WITH_AS(it - it, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators", json::invalid_iterator&);
+                }
+                {
+                    auto it = j_object.cbegin();
+                    CHECK_THROWS_WITH_AS(it - it, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators", json::invalid_iterator&);
+                }
+            }
+
+            SECTION("array")
+            {
+                {
+                    auto it = j_array.begin();
+                    it += 3;
+                    CHECK((j_array.begin() + 3) == it);
+                    CHECK((3 + j_array.begin()) == it);
+                    CHECK((it - 3) == j_array.begin());
+                    CHECK((it - j_array.begin()) == 3);
+                    CHECK(*it == json(4));
+                    it -= 2;
+                    CHECK(*it == json(2));
+                }
+                {
+                    auto it = j_array.cbegin();
+                    it += 3;
+                    CHECK((j_array.cbegin() + 3) == it);
+                    CHECK((3 + j_array.cbegin()) == it);
+                    CHECK((it - 3) == j_array.cbegin());
+                    CHECK((it - j_array.cbegin()) == 3);
+                    CHECK(*it == json(4));
+                    it -= 2;
+                    CHECK(*it == json(2));
+                }
+            }
+
+            SECTION("null")
+            {
+                {
+                    auto it = j_null.begin();
+                    it += 3;
+                    CHECK((j_null.begin() + 3) == it);
+                    CHECK((3 + j_null.begin()) == it);
+                    CHECK((it - 3) == j_null.begin());
+                    CHECK((it - j_null.begin()) == 3);
+                    CHECK(it != j_null.end());
+                    it -= 3;
+                    CHECK(it == j_null.end());
+                }
+                {
+                    auto it = j_null.cbegin();
+                    it += 3;
+                    CHECK((j_null.cbegin() + 3) == it);
+                    CHECK((3 + j_null.cbegin()) == it);
+                    CHECK((it - 3) == j_null.cbegin());
+                    CHECK((it - j_null.cbegin()) == 3);
+                    CHECK(it != j_null.cend());
+                    it -= 3;
+                    CHECK(it == j_null.cend());
+                }
+            }
+
+            SECTION("value")
+            {
+                {
+                    auto it = j_value.begin();
+                    it += 3;
+                    CHECK((j_value.begin() + 3) == it);
+                    CHECK((3 + j_value.begin()) == it);
+                    CHECK((it - 3) == j_value.begin());
+                    CHECK((it - j_value.begin()) == 3);
+                    CHECK(it != j_value.end());
+                    it -= 3;
+                    CHECK(*it == json(42));
+                }
+                {
+                    auto it = j_value.cbegin();
+                    it += 3;
+                    CHECK((j_value.cbegin() + 3) == it);
+                    CHECK((3 + j_value.cbegin()) == it);
+                    CHECK((it - 3) == j_value.cbegin());
+                    CHECK((it - j_value.cbegin()) == 3);
+                    CHECK(it != j_value.cend());
+                    it -= 3;
+                    CHECK(*it == json(42));
+                }
+            }
+        }
+
+        SECTION("subscript operator")
+        {
+            SECTION("object")
+            {
+                {
+                    auto it = j_object.begin();
+                    CHECK_THROWS_WITH_AS(it[0], "[json.exception.invalid_iterator.208] cannot use operator[] for object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it[1], "[json.exception.invalid_iterator.208] cannot use operator[] for object iterators", json::invalid_iterator&);
+                }
+                {
+                    auto it = j_object.cbegin();
+                    CHECK_THROWS_WITH_AS(it[0], "[json.exception.invalid_iterator.208] cannot use operator[] for object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it[1], "[json.exception.invalid_iterator.208] cannot use operator[] for object iterators", json::invalid_iterator&);
+                }
+            }
+
+            SECTION("array")
+            {
+                {
+                    auto it = j_array.begin();
+                    CHECK(it[0] == json(1));
+                    CHECK(it[1] == json(2));
+                    CHECK(it[2] == json(3));
+                    CHECK(it[3] == json(4));
+                    CHECK(it[4] == json(5));
+                    CHECK(it[5] == json(6));
+                }
+                {
+                    auto it = j_array.cbegin();
+                    CHECK(it[0] == json(1));
+                    CHECK(it[1] == json(2));
+                    CHECK(it[2] == json(3));
+                    CHECK(it[3] == json(4));
+                    CHECK(it[4] == json(5));
+                    CHECK(it[5] == json(6));
+                }
+            }
+
+            SECTION("null")
+            {
+                {
+                    auto it = j_null.begin();
+                    CHECK_THROWS_WITH_AS(it[0], "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it[1], "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&);
+                }
+                {
+                    auto it = j_null.cbegin();
+                    CHECK_THROWS_WITH_AS(it[0], "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it[1], "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&);
+                }
+            }
+
+            SECTION("value")
+            {
+                {
+                    auto it = j_value.begin();
+                    CHECK(it[0] == json(42));
+                    CHECK_THROWS_WITH_AS(it[1], "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&);
+                }
+                {
+                    auto it = j_value.cbegin();
+                    CHECK(it[0] == json(42));
+                    CHECK_THROWS_WITH_AS(it[1], "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&);
+                }
+            }
+        }
+    }
+
+    SECTION("reverse iterator comparisons")
+    {
+        json j_values = {nullptr, true, 42, 42u, 23.23, {{"one", 1}, {"two", 2}}, {1, 2, 3, 4, 5}, "Hello, world"};
+
+        for (json& j : j_values)
+        {
+            auto it1 = j.rbegin();
+            auto it2 = j.rbegin();
+            auto it3 = j.rbegin();
+            ++it2;
+            ++it3;
+            ++it3;
+            auto it1_c = j.crbegin();
+            auto it2_c = j.crbegin();
+            auto it3_c = j.crbegin();
+            ++it2_c;
+            ++it3_c;
+            ++it3_c;
+
+            // comparison: equal
+            {
+                CHECK(it1 == it1);
+                CHECK(!(it1 == it2));
+                CHECK(!(it1 == it3));
+                CHECK(!(it2 == it3));
+                CHECK(it1_c == it1_c);
+                CHECK(!(it1_c == it2_c));
+                CHECK(!(it1_c == it3_c));
+                CHECK(!(it2_c == it3_c));
+            }
+
+            // comparison: not equal
+            {
+                // check definition
+                CHECK( (it1 != it1) == !(it1 == it1) );
+                CHECK( (it1 != it2) == !(it1 == it2) );
+                CHECK( (it1 != it3) == !(it1 == it3) );
+                CHECK( (it2 != it3) == !(it2 == it3) );
+                CHECK( (it1_c != it1_c) == !(it1_c == it1_c) );
+                CHECK( (it1_c != it2_c) == !(it1_c == it2_c) );
+                CHECK( (it1_c != it3_c) == !(it1_c == it3_c) );
+                CHECK( (it2_c != it3_c) == !(it2_c == it3_c) );
+            }
+
+            // comparison: smaller
+            {
+                if (j.type() == json::value_t::object)
+                {
+#if JSON_DIAGNOSTICS
+                    CHECK_THROWS_WITH_AS(it1 < it1, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1 < it2, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it2 < it3, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1 < it3, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c < it1_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c < it2_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it2_c < it3_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c < it3_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+#else
+                    CHECK_THROWS_WITH_AS(it1 < it1, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1 < it2, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it2 < it3, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1 < it3, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c < it1_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c < it2_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it2_c < it3_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c < it3_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+#endif
+                }
+                else
+                {
+                    CHECK(!(it1 < it1));
+                    CHECK(it1 < it2);
+                    CHECK(it1 < it3);
+                    CHECK(it2 < it3);
+                    CHECK(!(it1_c < it1_c));
+                    CHECK(it1_c < it2_c);
+                    CHECK(it1_c < it3_c);
+                    CHECK(it2_c < it3_c);
+                }
+            }
+
+            // comparison: less than or equal
+            {
+                if (j.type() == json::value_t::object)
+                {
+#if JSON_DIAGNOSTICS
+                    CHECK_THROWS_WITH_AS(it1 <= it1, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1 <= it2, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it2 <= it3, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1 <= it3, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c <= it1_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c <= it2_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it2_c <= it3_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c <= it3_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+#else
+                    CHECK_THROWS_WITH_AS(it1 <= it1, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1 <= it2, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it2 <= it3, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1 <= it3, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c <= it1_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c <= it2_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it2_c <= it3_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c <= it3_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+#endif
+                }
+                else
+                {
+                    // check definition
+                    CHECK( (it1 <= it1) == !(it1 < it1) );
+                    CHECK( (it1 <= it2) == !(it2 < it1) );
+                    CHECK( (it1 <= it3) == !(it3 < it1) );
+                    CHECK( (it2 <= it3) == !(it3 < it2) );
+                    CHECK( (it1_c <= it1_c) == !(it1_c < it1_c) );
+                    CHECK( (it1_c <= it2_c) == !(it2_c < it1_c) );
+                    CHECK( (it1_c <= it3_c) == !(it3_c < it1_c) );
+                    CHECK( (it2_c <= it3_c) == !(it3_c < it2_c) );
+                }
+            }
+
+            // comparison: greater than
+            {
+                if (j.type() == json::value_t::object)
+                {
+#if JSON_DIAGNOSTICS
+                    CHECK_THROWS_WITH_AS(it1 > it1, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1 > it2, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it2 > it3, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1 > it3, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c > it1_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c > it2_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it2_c > it3_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c > it3_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+#else
+                    CHECK_THROWS_WITH_AS(it1 > it1, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1 > it2, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it2 > it3, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1 > it3, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c > it1_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c > it2_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it2_c > it3_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c > it3_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+#endif
+                }
+                else
+                {
+                    // check definition
+                    CHECK( (it1 > it1) == (it1 < it1) );
+                    CHECK( (it1 > it2) == (it2 < it1) );
+                    CHECK( (it1 > it3) == (it3 < it1) );
+                    CHECK( (it2 > it3) == (it3 < it2) );
+                    CHECK( (it1_c > it1_c) == (it1_c < it1_c) );
+                    CHECK( (it1_c > it2_c) == (it2_c < it1_c) );
+                    CHECK( (it1_c > it3_c) == (it3_c < it1_c) );
+                    CHECK( (it2_c > it3_c) == (it3_c < it2_c) );
+                }
+            }
+
+            // comparison: greater than or equal
+            {
+                if (j.type() == json::value_t::object)
+                {
+#if JSON_DIAGNOSTICS
+                    CHECK_THROWS_WITH_AS(it1 >= it1, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1 >= it2, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it2 >= it3, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1 >= it3, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c >= it1_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c >= it2_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it2_c >= it3_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c >= it3_c, "[json.exception.invalid_iterator.213] (/5) cannot compare order of object iterators", json::invalid_iterator&);
+#else
+                    CHECK_THROWS_WITH_AS(it1 >= it1, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1 >= it2, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it2 >= it3, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1 >= it3, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c >= it1_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c >= it2_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it2_c >= it3_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it1_c >= it3_c, "[json.exception.invalid_iterator.213] cannot compare order of object iterators", json::invalid_iterator&);
+#endif
+                }
+                else
+                {
+                    // check definition
+                    CHECK( (it1 >= it1) == !(it1 < it1) );
+                    CHECK( (it1 >= it2) == !(it1 < it2) );
+                    CHECK( (it1 >= it3) == !(it1 < it3) );
+                    CHECK( (it2 >= it3) == !(it2 < it3) );
+                    CHECK( (it1_c >= it1_c) == !(it1_c < it1_c) );
+                    CHECK( (it1_c >= it2_c) == !(it1_c < it2_c) );
+                    CHECK( (it1_c >= it3_c) == !(it1_c < it3_c) );
+                    CHECK( (it2_c >= it3_c) == !(it2_c < it3_c) );
+                }
+            }
+        }
+
+        // check exceptions if different objects are compared
+        for (auto j : j_values)
+        {
+            for (auto k : j_values)
+            {
+                if (j != k)
+                {
+#if JSON_DIAGNOSTICS
+                    // the output differs in each loop, so we cannot fix a string for the expected exception
+#else
+                    CHECK_THROWS_WITH_AS(j.rbegin() == k.rbegin(), "[json.exception.invalid_iterator.212] cannot compare iterators of different containers", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(j.crbegin() == k.crbegin(), "[json.exception.invalid_iterator.212] cannot compare iterators of different containers", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(j.rbegin() < k.rbegin(), "[json.exception.invalid_iterator.212] cannot compare iterators of different containers", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(j.crbegin() < k.crbegin(), "[json.exception.invalid_iterator.212] cannot compare iterators of different containers", json::invalid_iterator&);
+#endif
+                }
+            }
+        }
+    }
+
+    SECTION("reverse iterator arithmetic")
+    {
+        json j_object = {{"one", 1}, {"two", 2}, {"three", 3}};
+        json j_array = {1, 2, 3, 4, 5, 6};
+        json j_null = nullptr;
+        json j_value = 42;
+
+        SECTION("addition and subtraction")
+        {
+            SECTION("object")
+            {
+                {
+                    auto it = j_object.rbegin();
+                    CHECK_THROWS_WITH_AS(it += 1, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators", json::invalid_iterator&);
+                }
+                {
+                    auto it = j_object.crbegin();
+                    CHECK_THROWS_WITH_AS(it += 1, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators", json::invalid_iterator&);
+                }
+                {
+                    auto it = j_object.rbegin();
+                    CHECK_THROWS_WITH_AS(it + 1, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators", json::invalid_iterator&);
+                }
+                {
+                    auto it = j_object.crbegin();
+                    CHECK_THROWS_WITH_AS(it + 1, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators", json::invalid_iterator&);
+                }
+                {
+                    auto it = j_object.rbegin();
+                    CHECK_THROWS_WITH_AS(1 + it, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators", json::invalid_iterator&);
+                }
+                {
+                    auto it = j_object.crbegin();
+                    CHECK_THROWS_WITH_AS(1 + it, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators", json::invalid_iterator&);
+                }
+                {
+                    auto it = j_object.rbegin();
+                    CHECK_THROWS_WITH_AS(it -= 1, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators", json::invalid_iterator&);
+                }
+                {
+                    auto it = j_object.crbegin();
+                    CHECK_THROWS_WITH_AS(it -= 1, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators", json::invalid_iterator&);
+                }
+                {
+                    auto it = j_object.rbegin();
+                    CHECK_THROWS_WITH_AS(it - 1, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators", json::invalid_iterator&);
+                }
+                {
+                    auto it = j_object.crbegin();
+                    CHECK_THROWS_WITH_AS(it - 1, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators", json::invalid_iterator&);
+                }
+                {
+                    auto it = j_object.rbegin();
+                    CHECK_THROWS_WITH_AS(it - it, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators", json::invalid_iterator&);
+                }
+                {
+                    auto it = j_object.crbegin();
+                    CHECK_THROWS_WITH_AS(it - it, "[json.exception.invalid_iterator.209] cannot use offsets with object iterators", json::invalid_iterator&);
+                }
+            }
+
+            SECTION("array")
+            {
+                {
+                    auto it = j_array.rbegin();
+                    it += 3;
+                    CHECK((j_array.rbegin() + 3) == it);
+                    CHECK(json::reverse_iterator(3 + j_array.rbegin()) == it);
+                    CHECK((it - 3) == j_array.rbegin());
+                    CHECK((it - j_array.rbegin()) == 3);
+                    CHECK(*it == json(3));
+                    it -= 2;
+                    CHECK(*it == json(5));
+                }
+                {
+                    auto it = j_array.crbegin();
+                    it += 3;
+                    CHECK((j_array.crbegin() + 3) == it);
+                    CHECK(json::const_reverse_iterator(3 + j_array.crbegin()) == it);
+                    CHECK((it - 3) == j_array.crbegin());
+                    CHECK((it - j_array.crbegin()) == 3);
+                    CHECK(*it == json(3));
+                    it -= 2;
+                    CHECK(*it == json(5));
+                }
+            }
+
+            SECTION("null")
+            {
+                {
+                    auto it = j_null.rbegin();
+                    it += 3;
+                    CHECK((j_null.rbegin() + 3) == it);
+                    CHECK(json::reverse_iterator(3 + j_null.rbegin()) == it);
+                    CHECK((it - 3) == j_null.rbegin());
+                    CHECK((it - j_null.rbegin()) == 3);
+                    CHECK(it != j_null.rend());
+                    it -= 3;
+                    CHECK(it == j_null.rend());
+                }
+                {
+                    auto it = j_null.crbegin();
+                    it += 3;
+                    CHECK((j_null.crbegin() + 3) == it);
+                    CHECK(json::const_reverse_iterator(3 + j_null.crbegin()) == it);
+                    CHECK((it - 3) == j_null.crbegin());
+                    CHECK((it - j_null.crbegin()) == 3);
+                    CHECK(it != j_null.crend());
+                    it -= 3;
+                    CHECK(it == j_null.crend());
+                }
+            }
+
+            SECTION("value")
+            {
+                {
+                    auto it = j_value.rbegin();
+                    it += 3;
+                    CHECK((j_value.rbegin() + 3) == it);
+                    CHECK(json::reverse_iterator(3 + j_value.rbegin()) == it);
+                    CHECK((it - 3) == j_value.rbegin());
+                    CHECK((it - j_value.rbegin()) == 3);
+                    CHECK(it != j_value.rend());
+                    it -= 3;
+                    CHECK(*it == json(42));
+                }
+                {
+                    auto it = j_value.crbegin();
+                    it += 3;
+                    CHECK((j_value.crbegin() + 3) == it);
+                    CHECK(json::const_reverse_iterator(3 + j_value.crbegin()) == it);
+                    CHECK((it - 3) == j_value.crbegin());
+                    CHECK((it - j_value.crbegin()) == 3);
+                    CHECK(it != j_value.crend());
+                    it -= 3;
+                    CHECK(*it == json(42));
+                }
+            }
+        }
+
+        SECTION("subscript operator")
+        {
+            SECTION("object")
+            {
+                {
+                    auto it = j_object.rbegin();
+                    CHECK_THROWS_WITH_AS(it[0], "[json.exception.invalid_iterator.209] cannot use offsets with object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it[1], "[json.exception.invalid_iterator.209] cannot use offsets with object iterators", json::invalid_iterator&);
+                }
+                {
+                    auto it = j_object.crbegin();
+                    CHECK_THROWS_WITH_AS(it[0], "[json.exception.invalid_iterator.209] cannot use offsets with object iterators", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it[1], "[json.exception.invalid_iterator.209] cannot use offsets with object iterators", json::invalid_iterator&);
+                }
+            }
+
+            SECTION("array")
+            {
+                {
+                    auto it = j_array.rbegin();
+                    CHECK(it[0] == json(6));
+                    CHECK(it[1] == json(5));
+                    CHECK(it[2] == json(4));
+                    CHECK(it[3] == json(3));
+                    CHECK(it[4] == json(2));
+                    CHECK(it[5] == json(1));
+                }
+                {
+                    auto it = j_array.crbegin();
+                    CHECK(it[0] == json(6));
+                    CHECK(it[1] == json(5));
+                    CHECK(it[2] == json(4));
+                    CHECK(it[3] == json(3));
+                    CHECK(it[4] == json(2));
+                    CHECK(it[5] == json(1));
+                }
+            }
+
+            SECTION("null")
+            {
+                {
+                    auto it = j_null.rbegin();
+                    CHECK_THROWS_WITH_AS(it[0], "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it[1], "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&);
+                }
+                {
+                    auto it = j_null.crbegin();
+                    CHECK_THROWS_WITH_AS(it[0], "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(it[1], "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&);
+                }
+            }
+
+            SECTION("value")
+            {
+                {
+                    auto it = j_value.rbegin();
+                    CHECK(it[0] == json(42));
+                    CHECK_THROWS_WITH_AS(it[1], "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&);
+                }
+                {
+                    auto it = j_value.crbegin();
+                    CHECK(it[0] == json(42));
+                    CHECK_THROWS_WITH_AS(it[1], "[json.exception.invalid_iterator.214] cannot get value", json::invalid_iterator&);
+                }
+            }
+        }
+    }
+
+#if JSON_HAS_RANGES
+    // JSON_HAS_CPP_20 (do not remove; see note at top of file)
+    SECTION("ranges")
+    {
+        SECTION("concepts")
+        {
+            using nlohmann::detail::iteration_proxy_value;
+            CHECK(std::bidirectional_iterator<json::iterator>);
+            CHECK(std::input_iterator<iteration_proxy_value<json::iterator>>);
+
+            CHECK(std::is_same<json::iterator, std::ranges::iterator_t<json>>::value);
+            CHECK(std::ranges::bidirectional_range<json>);
+
+            using nlohmann::detail::iteration_proxy;
+            using items_type = decltype(std::declval<json&>().items());
+            CHECK(std::is_same<items_type, iteration_proxy<json::iterator>>::value);
+            CHECK(std::is_same<iteration_proxy_value<json::iterator>, std::ranges::iterator_t<items_type>>::value);
+            CHECK(std::ranges::input_range<items_type>);
+        }
+
+        // libstdc++ algorithms don't work with Clang 15 (04/2022)
+#if !DOCTEST_CLANG || (DOCTEST_CLANG && defined(__GLIBCXX__))
+        SECTION("algorithms")
+        {
+            SECTION("copy")
+            {
+                json j{"foo", "bar"};
+                auto j_copied = json::array();
+
+                std::ranges::copy(j, std::back_inserter(j_copied));
+
+                CHECK(j == j_copied);
+            }
+
+            SECTION("find_if")
+            {
+                json j{1, 3, 2, 4};
+                auto j_even = json::array();
+
+#if JSON_USE_IMPLICIT_CONVERSIONS
+                auto it = std::ranges::find_if(j, [](int v) noexcept
+                {
+                    return (v % 2) == 0;
+                });
+#else
+                auto it = std::ranges::find_if(j, [](const json & j) noexcept
+                {
+                    int v;
+                    j.get_to(v);
+                    return (v % 2) == 0;
+                });
+#endif
+
+                CHECK(*it == 2);
+            }
+        }
+#endif
+
+        // libstdc++ views don't work with Clang 15 (04/2022)
+        // libc++ hides limited ranges implementation behind guard macro
+#if !(DOCTEST_CLANG && (defined(__GLIBCXX__) || defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)))
+        SECTION("views")
+        {
+            SECTION("reverse")
+            {
+                json j{1, 2, 3, 4, 5};
+                json j_expected{5, 4, 3, 2, 1};
+
+                auto reversed = j | std::views::reverse;
+                CHECK(std::ranges::equal(reversed, j_expected));
+            }
+
+            SECTION("transform")
+            {
+                json j
+                {
+                    { "a_key", "a_value"},
+                    { "b_key", "b_value"},
+                    { "c_key", "c_value"},
+                };
+                json j_expected{"a_key", "b_key", "c_key"};
+
+                auto transformed = j.items() | std::views::transform([](const auto & item)
+                {
+                    return item.key();
+                });
+                auto j_transformed = json::array();
+                std::ranges::copy(transformed, std::back_inserter(j_transformed));
+
+                CHECK(j_transformed == j_expected);
+            }
+        }
+#endif
+    }
+#endif
+}
diff --git a/external_imported/json/tests/src/unit-json_patch.cpp b/external_imported/json/tests/src/unit-json_patch.cpp
new file mode 100644
index 000000000..0999393e6
--- /dev/null
+++ b/external_imported/json/tests/src/unit-json_patch.cpp
@@ -0,0 +1,1321 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+#include <nlohmann/json.hpp>
+using nlohmann::json;
+#ifdef JSON_TEST_NO_GLOBAL_UDLS
+    using namespace nlohmann::literals; // NOLINT(google-build-using-namespace)
+#endif
+
+#include <fstream>
+#include "make_test_data_available.hpp"
+
+TEST_CASE("JSON patch")
+{
+    SECTION("examples from RFC 6902")
+    {
+        SECTION("4. Operations")
+        {
+            // the ordering of members in JSON objects is not significant:
+            json op1 = R"({ "op": "add", "path": "/a/b/c", "value": "foo" })"_json;
+            json op2 = R"({ "path": "/a/b/c", "op": "add", "value": "foo" })"_json;
+            json op3 = R"({ "value": "foo", "path": "/a/b/c", "op": "add" })"_json;
+
+            // check if the operation objects are equivalent
+            CHECK(op1 == op2);
+            CHECK(op1 == op3);
+        }
+
+        SECTION("4.1 add")
+        {
+            json const patch1 = R"([{ "op": "add", "path": "/a/b", "value": [ "foo", "bar" ] }])"_json;
+
+            // However, the object itself or an array containing it does need
+            // to exist, and it remains an error for that not to be the case.
+            // For example, an "add" with a target location of "/a/b" starting
+            // with this document
+            json const doc1 = R"({ "a": { "foo": 1 } })"_json;
+
+            // is not an error, because "a" exists, and "b" will be added to
+            // its value.
+            CHECK_NOTHROW(doc1.patch(patch1));
+            auto doc1_ans = R"(
+                {
+                    "a": {
+                        "foo": 1,
+                        "b": [ "foo", "bar" ]
+                    }
+                }
+            )"_json;
+            CHECK(doc1.patch(patch1) == doc1_ans);
+
+            // It is an error in this document:
+            json const doc2 = R"({ "q": { "bar": 2 } })"_json;
+
+            // because "a" does not exist.
+            CHECK_THROWS_WITH_AS(doc2.patch(patch1), "[json.exception.out_of_range.403] key 'a' not found", json::out_of_range&);
+
+            json const doc3 = R"({ "a": {} })"_json;
+            json const patch2 = R"([{ "op": "add", "path": "/a/b/c", "value": 1 }])"_json;
+
+            // should cause an error because "b" does not exist in doc3
+#if JSON_DIAGNOSTICS
+            CHECK_THROWS_WITH_AS(doc3.patch(patch2), "[json.exception.out_of_range.403] (/a) key 'b' not found", json::out_of_range&);
+#else
+            CHECK_THROWS_WITH_AS(doc3.patch(patch2), "[json.exception.out_of_range.403] key 'b' not found", json::out_of_range&);
+#endif
+        }
+
+        SECTION("4.2 remove")
+        {
+            // If removing an element from an array, any elements above the
+            // specified index are shifted one position to the left.
+            json const doc = {1, 2, 3, 4};
+            json const patch = {{{"op", "remove"}, {"path", "/1"}}};
+            CHECK(doc.patch(patch) == json({1, 3, 4}));
+        }
+
+        SECTION("A.1. Adding an Object Member")
+        {
+            // An example target JSON document:
+            json const doc = R"(
+                    { "foo": "bar"}
+                )"_json;
+
+            // A JSON Patch document:
+            json const patch = R"(
+                    [
+                        { "op": "add", "path": "/baz", "value": "qux" }
+                    ]
+                )"_json;
+
+            // The resulting JSON document:
+            json expected = R"(
+                    {
+                        "baz": "qux",
+                        "foo": "bar"
+                    }
+                )"_json;
+
+            // check if patched value is as expected
+            CHECK(doc.patch(patch) == expected);
+
+            // check roundtrip
+            CHECK(doc.patch(json::diff(doc, expected)) == expected);
+        }
+
+        SECTION("A.2. Adding an Array Element")
+        {
+            // An example target JSON document:
+            json const doc = R"(
+                    { "foo": [ "bar", "baz" ] }
+                )"_json;
+
+            // A JSON Patch document:
+            json const patch = R"(
+                    [
+                        { "op": "add", "path": "/foo/1", "value": "qux" }
+                    ]
+                )"_json;
+
+            // The resulting JSON document:
+            json expected = R"(
+                    { "foo": [ "bar", "qux", "baz" ] }
+                )"_json;
+
+            // check if patched value is as expected
+            CHECK(doc.patch(patch) == expected);
+
+            // check roundtrip
+            CHECK(doc.patch(json::diff(doc, expected)) == expected);
+        }
+
+        SECTION("A.3. Removing an Object Member")
+        {
+            // An example target JSON document:
+            json const doc = R"(
+                    {
+                        "baz": "qux",
+                        "foo": "bar"
+                    }
+                )"_json;
+
+            // A JSON Patch document:
+            json const patch = R"(
+                    [
+                        { "op": "remove", "path": "/baz" }
+                    ]
+                )"_json;
+
+            // The resulting JSON document:
+            json expected = R"(
+                    { "foo": "bar" }
+                )"_json;
+
+            // check if patched value is as expected
+            CHECK(doc.patch(patch) == expected);
+
+            // check roundtrip
+            CHECK(doc.patch(json::diff(doc, expected)) == expected);
+        }
+
+        SECTION("A.4. Removing an Array Element")
+        {
+            // An example target JSON document:
+            json const doc = R"(
+                    { "foo": [ "bar", "qux", "baz" ] }
+                )"_json;
+
+            // A JSON Patch document:
+            json const patch = R"(
+                    [
+                        { "op": "remove", "path": "/foo/1" }
+                    ]
+                )"_json;
+
+            // The resulting JSON document:
+            json expected = R"(
+                    { "foo": [ "bar", "baz" ] }
+                )"_json;
+
+            // check if patched value is as expected
+            CHECK(doc.patch(patch) == expected);
+
+            // check roundtrip
+            CHECK(doc.patch(json::diff(doc, expected)) == expected);
+        }
+
+        SECTION("A.5. Replacing a Value")
+        {
+            // An example target JSON document:
+            json const doc = R"(
+                    {
+                        "baz": "qux",
+                        "foo": "bar"
+                    }
+                )"_json;
+
+            // A JSON Patch document:
+            json const patch = R"(
+                    [
+                        { "op": "replace", "path": "/baz", "value": "boo" }
+                    ]
+                )"_json;
+
+            json expected = R"(
+                    {
+                        "baz": "boo",
+                        "foo": "bar"
+                    }
+                )"_json;
+
+            // check if patched value is as expected
+            CHECK(doc.patch(patch) == expected);
+
+            // check roundtrip
+            CHECK(doc.patch(json::diff(doc, expected)) == expected);
+        }
+
+        SECTION("A.6. Moving a Value")
+        {
+            // An example target JSON document:
+            json const doc = R"(
+                    {
+                        "foo": {
+                           "bar": "baz",
+                            "waldo": "fred"
+                        },
+                        "qux": {
+                            "corge": "grault"
+                        }
+                    }
+                )"_json;
+
+            // A JSON Patch document:
+            json const patch = R"(
+                    [
+                        { "op": "move", "from": "/foo/waldo", "path": "/qux/thud" }
+                    ]
+                )"_json;
+
+            // The resulting JSON document:
+            json expected = R"(
+                    {
+                        "foo": {
+                           "bar": "baz"
+                        },
+                        "qux": {
+                            "corge": "grault",
+                            "thud": "fred"
+                        }
+                    }
+                )"_json;
+
+            // check if patched value is as expected
+            CHECK(doc.patch(patch) == expected);
+
+            // check roundtrip
+            CHECK(doc.patch(json::diff(doc, expected)) == expected);
+        }
+
+        SECTION("A.7. Moving a Value")
+        {
+            // An example target JSON document:
+            json const doc = R"(
+                    { "foo": [ "all", "grass", "cows", "eat" ] }
+                )"_json;
+
+            // A JSON Patch document:
+            json const patch = R"(
+                    [
+                        { "op": "move", "from": "/foo/1", "path": "/foo/3" }
+                    ]
+                )"_json;
+
+            // The resulting JSON document:
+            json expected = R"(
+                    { "foo": [ "all", "cows", "eat", "grass" ] }
+                )"_json;
+
+            // check if patched value is as expected
+            CHECK(doc.patch(patch) == expected);
+
+            // check roundtrip
+            CHECK(doc.patch(json::diff(doc, expected)) == expected);
+        }
+
+        SECTION("A.8. Testing a Value: Success")
+        {
+            // An example target JSON document:
+            json doc = R"(
+                    {
+                         "baz": "qux",
+                         "foo": [ "a", 2, "c" ]
+                    }
+                )"_json;
+
+            // A JSON Patch document that will result in successful evaluation:
+            json const patch = R"(
+                    [
+                        { "op": "test", "path": "/baz", "value": "qux" },
+                        { "op": "test", "path": "/foo/1", "value": 2 }
+                    ]
+                )"_json;
+
+            // check if evaluation does not throw
+            CHECK_NOTHROW(doc.patch(patch));
+            // check if patched document is unchanged
+            CHECK(doc.patch(patch) == doc);
+        }
+
+        SECTION("A.9. Testing a Value: Error")
+        {
+            // An example target JSON document:
+            json const doc = R"(
+                    { "baz": "qux" }
+                )"_json;
+
+            // A JSON Patch document that will result in an error condition:
+            json patch = R"(
+                    [
+                        { "op": "test", "path": "/baz", "value": "bar" }
+                    ]
+                )"_json;
+
+            // check that evaluation throws
+            CHECK_THROWS_AS(doc.patch(patch), json::other_error&);
+#if JSON_DIAGNOSTICS
+            CHECK_THROWS_WITH_STD_STR(doc.patch(patch), "[json.exception.other_error.501] (/0) unsuccessful: " + patch[0].dump());
+#else
+            CHECK_THROWS_WITH_STD_STR(doc.patch(patch), "[json.exception.other_error.501] unsuccessful: " + patch[0].dump());
+#endif
+        }
+
+        SECTION("A.10. Adding a Nested Member Object")
+        {
+            // An example target JSON document:
+            json const doc = R"(
+                    { "foo": "bar" }
+                )"_json;
+
+            // A JSON Patch document:
+            json const patch = R"(
+                    [
+                        { "op": "add", "path": "/child", "value": { "grandchild": { } } }
+                    ]
+                )"_json;
+
+            // The resulting JSON document:
+            json expected = R"(
+                {
+                    "foo": "bar",
+                    "child": {
+                        "grandchild": {
+                        }
+                    }
+                }
+                )"_json;
+
+            // check if patched value is as expected
+            CHECK(doc.patch(patch) == expected);
+
+            // check roundtrip
+            CHECK(doc.patch(json::diff(doc, expected)) == expected);
+        }
+
+        SECTION("A.11. Ignoring Unrecognized Elements")
+        {
+            // An example target JSON document:
+            json const doc = R"(
+                    { "foo": "bar" }
+                )"_json;
+
+            // A JSON Patch document:
+            json const patch = R"(
+                    [
+                        { "op": "add", "path": "/baz", "value": "qux", "xyz": 123 }
+                    ]
+                )"_json;
+
+            json expected = R"(
+                    {
+                        "foo": "bar",
+                        "baz": "qux"
+                    } 
+                )"_json;
+
+            // check if patched value is as expected
+            CHECK(doc.patch(patch) == expected);
+
+            // check roundtrip
+            CHECK(doc.patch(json::diff(doc, expected)) == expected);
+        }
+
+        SECTION("A.12. Adding to a Nonexistent Target")
+        {
+            // An example target JSON document:
+            json const doc = R"(
+                    { "foo": "bar" }
+                )"_json;
+
+            // A JSON Patch document:
+            json const patch = R"(
+                    [
+                        { "op": "add", "path": "/baz/bat", "value": "qux" }
+                    ]
+                )"_json;
+
+            // This JSON Patch document, applied to the target JSON document
+            // above, would result in an error (therefore, it would not be
+            // applied), because the "add" operation's target location that
+            // references neither the root of the document, nor a member of
+            // an existing object, nor a member of an existing array.
+
+            CHECK_THROWS_WITH_AS(doc.patch(patch), "[json.exception.out_of_range.403] key 'baz' not found", json::out_of_range&);
+        }
+
+        // A.13. Invalid JSON Patch Document
+        // not applicable
+
+        SECTION("A.14. Escape Ordering")
+        {
+            // An example target JSON document:
+            json const doc = R"(
+                    {
+                        "/": 9,
+                        "~1": 10
+                    }
+                )"_json;
+
+            // A JSON Patch document:
+            json const patch = R"(
+                    [
+                        {"op": "test", "path": "/~01", "value": 10}
+                    ]
+                )"_json;
+
+            json expected = R"(
+                    {
+                        "/": 9,
+                        "~1": 10
+                    } 
+                )"_json;
+
+            // check if patched value is as expected
+            CHECK(doc.patch(patch) == expected);
+
+            // check roundtrip
+            CHECK(doc.patch(json::diff(doc, expected)) == expected);
+        }
+
+        SECTION("A.15. Comparing Strings and Numbers")
+        {
+            // An example target JSON document:
+            json const doc = R"(
+                    {
+                        "/": 9,
+                        "~1": 10
+                    } 
+                )"_json;
+
+            // A JSON Patch document that will result in an error condition:
+            json patch = R"(
+                    [
+                        {"op": "test", "path": "/~01", "value": "10"}
+                    ]
+                )"_json;
+
+            // check that evaluation throws
+            CHECK_THROWS_AS(doc.patch(patch), json::other_error&);
+#if JSON_DIAGNOSTICS
+            CHECK_THROWS_WITH_STD_STR(doc.patch(patch), "[json.exception.other_error.501] (/0) unsuccessful: " + patch[0].dump());
+#else
+            CHECK_THROWS_WITH_STD_STR(doc.patch(patch), "[json.exception.other_error.501] unsuccessful: " + patch[0].dump());
+#endif
+        }
+
+        SECTION("A.16. Adding an Array Value")
+        {
+            // An example target JSON document:
+            json const doc = R"(
+                    { "foo": ["bar"] }
+                )"_json;
+
+            // A JSON Patch document:
+            json const patch = R"(
+                    [
+                        { "op": "add", "path": "/foo/-", "value": ["abc", "def"] }
+                    ]
+                )"_json;
+
+            // The resulting JSON document:
+            json expected = R"(
+                    { "foo": ["bar", ["abc", "def"]] }
+                )"_json;
+
+            // check if patched value is as expected
+            CHECK(doc.patch(patch) == expected);
+
+            // check roundtrip
+            CHECK(doc.patch(json::diff(doc, expected)) == expected);
+        }
+    }
+
+    SECTION("own examples")
+    {
+        SECTION("add")
+        {
+            SECTION("add to the root element")
+            {
+                // If the path is the root of the target document - the
+                // specified value becomes the entire content of the target
+                // document.
+
+                // An example target JSON document:
+                json const doc = 17;
+
+                // A JSON Patch document:
+                json const patch = R"(
+                        [
+                            { "op": "add", "path": "", "value": [1,2,3] }
+                        ]
+                    )"_json;
+
+                // The resulting JSON document:
+                json expected = {1, 2, 3};
+
+                // check if patched value is as expected
+                CHECK(doc.patch(patch) == expected);
+
+                // check roundtrip
+                CHECK(doc.patch(json::diff(doc, expected)) == expected);
+            }
+
+            SECTION("add to end of the array")
+            {
+                // The specified index MUST NOT be greater than the number of
+                // elements in the array. The example below uses and index of
+                // exactly the number of elements in the array which is legal.
+
+                // An example target JSON document:
+                json const doc = {0, 1, 2};
+
+                // A JSON Patch document:
+                json const patch = R"(
+                    [
+                        { "op": "add", "path": "/3", "value": 3 }
+                    ]
+                )"_json;
+
+                // The resulting JSON document:
+                json expected = {0, 1, 2, 3};
+
+                // check if patched value is as expected
+                CHECK(doc.patch(patch) == expected);
+
+                // check roundtrip
+                CHECK(doc.patch(json::diff(doc, expected)) == expected);
+            }
+        }
+
+        SECTION("copy")
+        {
+            // An example target JSON document:
+            json const doc = R"(
+                {
+                    "foo": {
+                        "bar": "baz",
+                        "waldo": "fred"
+                    },
+                    "qux": {
+                       "corge": "grault"
+                    }
+                }
+            )"_json;
+
+            // A JSON Patch document:
+            json const patch = R"(
+                [
+                    { "op": "copy", "from": "/foo/waldo", "path": "/qux/thud" }
+                ]
+            )"_json;
+
+            // The resulting JSON document:
+            json expected = R"(
+                {
+                    "foo": {
+                        "bar": "baz",
+                        "waldo": "fred"
+                    },
+                    "qux": {
+                       "corge": "grault",
+                       "thud": "fred"
+                    }
+                }
+            )"_json;
+
+            // check if patched value is as expected
+            CHECK(doc.patch(patch) == expected);
+
+            // check roundtrip
+            CHECK(doc.patch(json::diff(doc, expected)) == expected);
+        }
+
+        SECTION("replace")
+        {
+            json const j = "string";
+            json const patch = {{{"op", "replace"}, {"path", ""}, {"value", 1}}};
+            CHECK(j.patch(patch) == json(1));
+        }
+
+        SECTION("documentation GIF")
+        {
+            {
+                // a JSON patch
+                json const p1 = R"(
+                     [{"op": "add", "path": "/GB", "value": "London"}]
+                    )"_json;
+
+                // a JSON value
+                json const source = R"(
+                      {"D": "Berlin", "F": "Paris"}
+                    )"_json;
+
+                // apply the patch
+                json target = source.patch(p1);
+                // target = { "D": "Berlin", "F": "Paris", "GB": "London" }
+                CHECK(target == R"({ "D": "Berlin", "F": "Paris", "GB": "London" })"_json);
+
+                // create a diff from two JSONs
+                json p2 = json::diff(target, source); // NOLINT(readability-suspicious-call-argument)
+                // p2 = [{"op": "delete", "path": "/GB"}]
+                CHECK(p2 == R"([{"op":"remove","path":"/GB"}])"_json);
+            }
+            {
+                // a JSON value
+                json j = {"good", "bad", "ugly"};
+
+                // a JSON pointer
+                auto ptr = json::json_pointer("/2");
+
+                // use to access elements
+                j[ptr] = {{"it", "cattivo"}};
+                CHECK(j == R"(["good","bad",{"it":"cattivo"}])"_json);
+
+                // use user-defined string literal
+                j["/2/en"_json_pointer] = "ugly";
+                CHECK(j == R"(["good","bad",{"en":"ugly","it":"cattivo"}])"_json);
+
+                json flat = j.flatten();
+                CHECK(flat == R"({"/0":"good","/1":"bad","/2/en":"ugly","/2/it":"cattivo"})"_json);
+            }
+        }
+    }
+
+    SECTION("errors")
+    {
+        SECTION("unknown operation")
+        {
+            SECTION("not an array")
+            {
+                json const j;
+                json const patch = {{"op", "add"}, {"path", ""}, {"value", 1}};
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.104] parse error: JSON patch must be an array of objects", json::parse_error&);
+            }
+
+            SECTION("not an array of objects")
+            {
+                json const j;
+                json const patch = {"op", "add", "path", "", "value", 1};
+#if JSON_DIAGNOSTICS
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.104] parse error: (/0) JSON patch must be an array of objects", json::parse_error&);
+#else
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.104] parse error: JSON patch must be an array of objects", json::parse_error&);
+#endif
+            }
+
+            SECTION("missing 'op'")
+            {
+                json const j;
+                json const patch = {{{"foo", "bar"}}};
+#if JSON_DIAGNOSTICS
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation must have member 'op'", json::parse_error&);
+#else
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: operation must have member 'op'", json::parse_error&);
+#endif
+            }
+
+            SECTION("non-string 'op'")
+            {
+                json const j;
+                json const patch = {{{"op", 1}}};
+#if JSON_DIAGNOSTICS
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation must have string member 'op'", json::parse_error&);
+#else
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: operation must have string member 'op'", json::parse_error&);
+#endif
+            }
+
+            SECTION("invalid operation")
+            {
+                json const j;
+                json const patch = {{{"op", "foo"}, {"path", ""}}};
+#if JSON_DIAGNOSTICS
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation value 'foo' is invalid", json::parse_error&);
+#else
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: operation value 'foo' is invalid", json::parse_error&);
+#endif
+            }
+        }
+
+        SECTION("add")
+        {
+            SECTION("missing 'path'")
+            {
+                json const j;
+                json const patch = {{{"op", "add"}}};
+#if JSON_DIAGNOSTICS
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation 'add' must have member 'path'", json::parse_error&);
+#else
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: operation 'add' must have member 'path'", json::parse_error&);
+#endif
+            }
+
+            SECTION("non-string 'path'")
+            {
+                json const j;
+                json const patch = {{{"op", "add"}, {"path", 1}}};
+#if JSON_DIAGNOSTICS
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation 'add' must have string member 'path'", json::parse_error&);
+#else
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: operation 'add' must have string member 'path'", json::parse_error&);
+#endif
+            }
+
+            SECTION("missing 'value'")
+            {
+                json const j;
+                json const patch = {{{"op", "add"}, {"path", ""}}};
+#if JSON_DIAGNOSTICS
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation 'add' must have member 'value'", json::parse_error&);
+#else
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: operation 'add' must have member 'value'", json::parse_error&);
+#endif
+            }
+
+            SECTION("invalid array index")
+            {
+                json const j = {1, 2};
+                json const patch = {{{"op", "add"}, {"path", "/4"}, {"value", 4}}};
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.out_of_range.401] array index 4 is out of range", json::out_of_range&);
+            }
+        }
+
+        SECTION("remove")
+        {
+            SECTION("missing 'path'")
+            {
+                json const j;
+                json const patch = {{{"op", "remove"}}};
+#if JSON_DIAGNOSTICS
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation 'remove' must have member 'path'", json::parse_error&);
+#else
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: operation 'remove' must have member 'path'", json::parse_error&);
+#endif
+            }
+
+            SECTION("non-string 'path'")
+            {
+                json const j;
+                json const patch = {{{"op", "remove"}, {"path", 1}}};
+#if JSON_DIAGNOSTICS
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation 'remove' must have string member 'path'", json::parse_error&);
+#else
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: operation 'remove' must have string member 'path'", json::parse_error&);
+#endif
+            }
+
+            SECTION("nonexisting target location (array)")
+            {
+                json const j = {1, 2, 3};
+                json const patch = {{{"op", "remove"}, {"path", "/17"}}};
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.out_of_range.401] array index 17 is out of range", json::out_of_range&);
+            }
+
+            SECTION("nonexisting target location (object)")
+            {
+                json const j = {{"foo", 1}, {"bar", 2}};
+                json const patch = {{{"op", "remove"}, {"path", "/baz"}}};
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.out_of_range.403] key 'baz' not found", json::out_of_range&);
+            }
+
+            SECTION("root element as target location")
+            {
+                json const j = "string";
+                json const patch = {{{"op", "remove"}, {"path", ""}}};
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.out_of_range.405] JSON pointer has no parent", json::out_of_range&);
+            }
+        }
+
+        SECTION("replace")
+        {
+            SECTION("missing 'path'")
+            {
+                json const j;
+                json const patch = {{{"op", "replace"}}};
+#if JSON_DIAGNOSTICS
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation 'replace' must have member 'path'", json::parse_error&);
+#else
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: operation 'replace' must have member 'path'", json::parse_error&);
+#endif
+            }
+
+            SECTION("non-string 'path'")
+            {
+                json const j;
+                json const patch = {{{"op", "replace"}, {"path", 1}}};
+#if JSON_DIAGNOSTICS
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation 'replace' must have string member 'path'", json::parse_error&);
+#else
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: operation 'replace' must have string member 'path'", json::parse_error&);
+#endif
+            }
+
+            SECTION("missing 'value'")
+            {
+                json const j;
+                json const patch = {{{"op", "replace"}, {"path", ""}}};
+#if JSON_DIAGNOSTICS
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation 'replace' must have member 'value'", json::parse_error&);
+#else
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: operation 'replace' must have member 'value'", json::parse_error&);
+#endif
+            }
+
+            SECTION("nonexisting target location (array)")
+            {
+                json const j = {1, 2, 3};
+                json const patch = {{{"op", "replace"}, {"path", "/17"}, {"value", 19}}};
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.out_of_range.401] array index 17 is out of range", json::out_of_range&);
+            }
+
+            SECTION("nonexisting target location (object)")
+            {
+                json const j = {{"foo", 1}, {"bar", 2}};
+                json const patch = {{{"op", "replace"}, {"path", "/baz"}, {"value", 3}}};
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.out_of_range.403] key 'baz' not found", json::out_of_range&);
+            }
+        }
+
+        SECTION("move")
+        {
+            SECTION("missing 'path'")
+            {
+                json const j;
+                json const patch = {{{"op", "move"}}};
+#if JSON_DIAGNOSTICS
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation 'move' must have member 'path'", json::parse_error&);
+#else
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: operation 'move' must have member 'path'", json::parse_error&);
+#endif
+            }
+
+            SECTION("non-string 'path'")
+            {
+                json const j;
+                json const patch = {{{"op", "move"}, {"path", 1}}};
+#if JSON_DIAGNOSTICS
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation 'move' must have string member 'path'", json::parse_error&);
+#else
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: operation 'move' must have string member 'path'", json::parse_error&);
+#endif
+            }
+
+            SECTION("missing 'from'")
+            {
+                json const j;
+                json const patch = {{{"op", "move"}, {"path", ""}}};
+                CHECK_THROWS_AS(j.patch(patch), json::parse_error&);
+#if JSON_DIAGNOSTICS
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation 'move' must have member 'from'", json::parse_error&);
+#else
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: operation 'move' must have member 'from'", json::parse_error&);
+#endif
+            }
+
+            SECTION("non-string 'from'")
+            {
+                json const j;
+                json const patch = {{{"op", "move"}, {"path", ""}, {"from", 1}}};
+                CHECK_THROWS_AS(j.patch(patch), json::parse_error&);
+#if JSON_DIAGNOSTICS
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation 'move' must have string member 'from'", json::parse_error&);
+#else
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: operation 'move' must have string member 'from'", json::parse_error&);
+#endif
+            }
+
+            SECTION("nonexisting from location (array)")
+            {
+                json const j = {1, 2, 3};
+                json const patch = {{{"op", "move"}, {"path", "/0"}, {"from", "/5"}}};
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.out_of_range.401] array index 5 is out of range", json::out_of_range&);
+            }
+
+            SECTION("nonexisting from location (object)")
+            {
+                json const j = {{"foo", 1}, {"bar", 2}};
+                json const patch = {{{"op", "move"}, {"path", "/baz"}, {"from", "/baz"}}};
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.out_of_range.403] key 'baz' not found", json::out_of_range&);
+            }
+        }
+
+        SECTION("copy")
+        {
+            SECTION("missing 'path'")
+            {
+                json const j;
+                json const patch = {{{"op", "copy"}}};
+#if JSON_DIAGNOSTICS
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation 'copy' must have member 'path'", json::parse_error&);
+#else
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: operation 'copy' must have member 'path'", json::parse_error&);
+#endif
+            }
+
+            SECTION("non-string 'path'")
+            {
+                json const j;
+                json const patch = {{{"op", "copy"}, {"path", 1}}};
+#if JSON_DIAGNOSTICS
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation 'copy' must have string member 'path'", json::parse_error&);
+#else
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: operation 'copy' must have string member 'path'", json::parse_error&);
+#endif
+            }
+
+            SECTION("missing 'from'")
+            {
+                json const j;
+                json const patch = {{{"op", "copy"}, {"path", ""}}};
+#if JSON_DIAGNOSTICS
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation 'copy' must have member 'from'", json::parse_error&);
+#else
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: operation 'copy' must have member 'from'", json::parse_error&);
+#endif
+            }
+
+            SECTION("non-string 'from'")
+            {
+                json const j;
+                json const patch = {{{"op", "copy"}, {"path", ""}, {"from", 1}}};
+#if JSON_DIAGNOSTICS
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation 'copy' must have string member 'from'", json::parse_error&);
+#else
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: operation 'copy' must have string member 'from'", json::parse_error&);
+#endif
+            }
+
+            SECTION("nonexisting from location (array)")
+            {
+                json const j = {1, 2, 3};
+                json const patch = {{{"op", "copy"}, {"path", "/0"}, {"from", "/5"}}};
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.out_of_range.401] array index 5 is out of range", json::out_of_range&);
+            }
+
+            SECTION("nonexisting from location (object)")
+            {
+                json const j = {{"foo", 1}, {"bar", 2}};
+                json const patch = {{{"op", "copy"}, {"path", "/fob"}, {"from", "/baz"}}};
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.out_of_range.403] key 'baz' not found", json::out_of_range&);
+            }
+        }
+
+        SECTION("test")
+        {
+            SECTION("missing 'path'")
+            {
+                json const j;
+                json const patch = {{{"op", "test"}}};
+#if JSON_DIAGNOSTICS
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation 'test' must have member 'path'", json::parse_error&);
+#else
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: operation 'test' must have member 'path'", json::parse_error&);
+#endif
+            }
+
+            SECTION("non-string 'path'")
+            {
+                json const j;
+                json const patch = {{{"op", "test"}, {"path", 1}}};
+#if JSON_DIAGNOSTICS
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation 'test' must have string member 'path'", json::parse_error&);
+#else
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: operation 'test' must have string member 'path'", json::parse_error&);
+#endif
+            }
+
+            SECTION("missing 'value'")
+            {
+                json const j;
+                json const patch = {{{"op", "test"}, {"path", ""}}};
+#if JSON_DIAGNOSTICS
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: (/0) operation 'test' must have member 'value'", json::parse_error&);
+#else
+                CHECK_THROWS_WITH_AS(j.patch(patch), "[json.exception.parse_error.105] parse error: operation 'test' must have member 'value'", json::parse_error&);
+#endif
+            }
+        }
+    }
+
+    SECTION("Examples from jsonpatch.com")
+    {
+        SECTION("Simple Example")
+        {
+            // The original document
+            json const doc = R"(
+                {
+                  "baz": "qux",
+                  "foo": "bar"
+                }
+            )"_json;
+
+            // The patch
+            json const patch = R"(
+                [
+                  { "op": "replace", "path": "/baz", "value": "boo" },
+                  { "op": "add", "path": "/hello", "value": ["world"] },
+                  { "op": "remove", "path": "/foo"}
+                ]
+            )"_json;
+
+            // The result
+            json result = R"(
+                {
+                   "baz": "boo",
+                   "hello": ["world"]
+                }
+            )"_json;
+
+            // check if patched value is as expected
+            CHECK(doc.patch(patch) == result);
+
+            // check roundtrip
+            CHECK(doc.patch(json::diff(doc, result)) == result);
+        }
+
+        SECTION("Operations")
+        {
+            // The original document
+            json const doc = R"(
+                {
+                  "biscuits": [
+                    {"name":"Digestive"},
+                    {"name": "Choco Liebniz"}
+                  ]
+                }
+            )"_json;
+
+            SECTION("add")
+            {
+                // The patch
+                json const patch = R"(
+                    [
+                        {"op": "add", "path": "/biscuits/1", "value": {"name": "Ginger Nut"}}
+                    ]
+                )"_json;
+
+                // The result
+                json result = R"(
+                    {
+                      "biscuits": [
+                        {"name": "Digestive"},
+                        {"name": "Ginger Nut"},
+                        {"name": "Choco Liebniz"}
+                      ]
+                    }
+                )"_json;
+
+                // check if patched value is as expected
+                CHECK(doc.patch(patch) == result);
+
+                // check roundtrip
+                CHECK(doc.patch(json::diff(doc, result)) == result);
+            }
+
+            SECTION("remove")
+            {
+                // The patch
+                json const patch = R"(
+                    [
+                        {"op": "remove", "path": "/biscuits"}
+                    ]
+                )"_json;
+
+                // The result
+                json result = R"(
+                    {}
+                )"_json;
+
+                // check if patched value is as expected
+                CHECK(doc.patch(patch) == result);
+
+                // check roundtrip
+                CHECK(doc.patch(json::diff(doc, result)) == result);
+            }
+
+            SECTION("replace")
+            {
+                // The patch
+                json const patch = R"(
+                    [
+                        {"op": "replace", "path": "/biscuits/0/name", "value": "Chocolate Digestive"}
+                    ]
+                )"_json;
+
+                // The result
+                json result = R"(
+                    {
+                      "biscuits": [
+                        {"name": "Chocolate Digestive"},
+                        {"name": "Choco Liebniz"}
+                      ]
+                    }
+                )"_json;
+
+                // check if patched value is as expected
+                CHECK(doc.patch(patch) == result);
+
+                // check roundtrip
+                CHECK(doc.patch(json::diff(doc, result)) == result);
+            }
+
+            SECTION("copy")
+            {
+                // The patch
+                json const patch = R"(
+                    [
+                        {"op": "copy", "from": "/biscuits/0", "path": "/best_biscuit"}
+                    ]
+                )"_json;
+
+                // The result
+                json result = R"(
+                    {
+                      "biscuits": [
+                        {"name": "Digestive"},
+                        {"name": "Choco Liebniz"}
+                      ],
+                      "best_biscuit": {
+                        "name": "Digestive"
+                      }
+                    }
+                )"_json;
+
+                // check if patched value is as expected
+                CHECK(doc.patch(patch) == result);
+
+                // check roundtrip
+                CHECK(doc.patch(json::diff(doc, result)) == result);
+            }
+
+            SECTION("move")
+            {
+                // The patch
+                json const patch = R"(
+                    [
+                        {"op": "move", "from": "/biscuits", "path": "/cookies"}
+                    ]
+                )"_json;
+
+                // The result
+                json result = R"(
+                    {
+                      "cookies": [
+                        {"name": "Digestive"},
+                        {"name": "Choco Liebniz"}
+                      ]
+                    }
+                )"_json;
+
+                // check if patched value is as expected
+                CHECK(doc.patch(patch) == result);
+
+                // check roundtrip
+                CHECK(doc.patch(json::diff(doc, result)) == result);
+            }
+
+            SECTION("test")
+            {
+                // The patch
+                json patch = R"(
+                    [
+                        {"op": "test", "path": "/best_biscuit/name", "value": "Choco Liebniz"}
+                    ]
+                )"_json;
+
+                // the test will fail
+                CHECK_THROWS_AS(doc.patch(patch), json::other_error&);
+#if JSON_DIAGNOSTICS
+                CHECK_THROWS_WITH_STD_STR(doc.patch(patch), "[json.exception.other_error.501] (/0) unsuccessful: " + patch[0].dump());
+#else
+                CHECK_THROWS_WITH_STD_STR(doc.patch(patch), "[json.exception.other_error.501] unsuccessful: " + patch[0].dump());
+#endif
+            }
+        }
+    }
+
+    SECTION("Examples from bruth.github.io/jsonpatch-js")
+    {
+        SECTION("add")
+        {
+            CHECK(R"( {} )"_json.patch(
+                      R"( [{"op": "add", "path": "/foo", "value": "bar"}] )"_json
+                  ) == R"( {"foo": "bar"} )"_json);
+
+            CHECK(R"( {"foo": [1, 3]} )"_json.patch(
+                      R"( [{"op": "add", "path": "/foo", "value": "bar"}] )"_json
+                  ) == R"( {"foo": "bar"} )"_json);
+
+            CHECK(R"( {"foo": [{}]} )"_json.patch(
+                      R"( [{"op": "add", "path": "/foo/0/bar", "value": "baz"}] )"_json
+                  ) == R"( {"foo": [{"bar": "baz"}]} )"_json);
+        }
+
+        SECTION("remove")
+        {
+            CHECK(R"( {"foo": "bar"} )"_json.patch(
+                      R"( [{"op": "remove", "path": "/foo"}] )"_json
+                  ) == R"( {} )"_json);
+
+            CHECK(R"( {"foo": [1, 2, 3]} )"_json.patch(
+                      R"( [{"op": "remove", "path": "/foo/1"}] )"_json
+                  ) == R"( {"foo": [1, 3]} )"_json);
+
+            CHECK(R"( {"foo": [{"bar": "baz"}]} )"_json.patch(
+                      R"( [{"op": "remove", "path": "/foo/0/bar"}] )"_json
+                  ) == R"( {"foo": [{}]} )"_json);
+        }
+
+        SECTION("replace")
+        {
+            CHECK(R"( {"foo": "bar"} )"_json.patch(
+                      R"( [{"op": "replace", "path": "/foo", "value": 1}] )"_json
+                  ) == R"( {"foo": 1} )"_json);
+
+            CHECK(R"( {"foo": [1, 2, 3]} )"_json.patch(
+                      R"( [{"op": "replace", "path": "/foo/1", "value": 4}] )"_json
+                  ) == R"( {"foo": [1, 4, 3]} )"_json);
+
+            CHECK(R"( {"foo": [{"bar": "baz"}]} )"_json.patch(
+                      R"( [{"op": "replace", "path": "/foo/0/bar", "value": 1}] )"_json
+                  ) == R"( {"foo": [{"bar": 1}]} )"_json);
+        }
+
+        SECTION("move")
+        {
+            CHECK(R"( {"foo": [1, 2, 3]} )"_json.patch(
+                      R"( [{"op": "move", "from": "/foo", "path": "/bar"}] )"_json
+                  ) == R"( {"bar": [1, 2, 3]} )"_json);
+        }
+
+        SECTION("copy")
+        {
+            CHECK(R"( {"foo": [1, 2, 3]} )"_json.patch(
+                      R"( [{"op": "copy", "from": "/foo/1", "path": "/bar"}] )"_json
+                  ) == R"( {"foo": [1, 2, 3], "bar": 2} )"_json);
+        }
+
+        SECTION("copy")
+        {
+            CHECK_NOTHROW(R"( {"foo": "bar"} )"_json.patch(
+                              R"( [{"op": "test", "path": "/foo", "value": "bar"}] )"_json));
+        }
+    }
+
+    SECTION("Tests from github.com/json-patch/json-patch-tests")
+    {
+        for (const auto* filename :
+                {
+                    TEST_DATA_DIRECTORY "/json-patch-tests/spec_tests.json",
+                    TEST_DATA_DIRECTORY "/json-patch-tests/tests.json"
+                })
+        {
+            CAPTURE(filename)
+            std::ifstream f(filename);
+            json const suite = json::parse(f);
+
+            for (const auto& test : suite)
+            {
+                INFO_WITH_TEMP(test.value("comment", ""));
+
+                // skip tests marked as disabled
+                if (test.value("disabled", false))
+                {
+                    continue;
+                }
+
+                const auto& doc = test["doc"];
+                const auto& patch = test["patch"];
+
+                if (test.count("error") == 0)
+                {
+                    // if an expected value is given, use it; use doc otherwise
+                    const auto& expected = test.value("expected", doc);
+                    CHECK(doc.patch(patch) == expected);
+                }
+                else
+                {
+                    CHECK_THROWS(doc.patch(patch));
+                }
+            }
+        }
+    }
+}
diff --git a/external_imported/json/tests/src/unit-json_pointer.cpp b/external_imported/json/tests/src/unit-json_pointer.cpp
new file mode 100644
index 000000000..79c67f99d
--- /dev/null
+++ b/external_imported/json/tests/src/unit-json_pointer.cpp
@@ -0,0 +1,787 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+#define JSON_TESTS_PRIVATE
+#include <nlohmann/json.hpp>
+using nlohmann::json;
+#ifdef JSON_TEST_NO_GLOBAL_UDLS
+    using namespace nlohmann::literals; // NOLINT(google-build-using-namespace)
+#endif
+
+#include <map>
+#include <sstream>
+
+TEST_CASE("JSON pointers")
+{
+    SECTION("errors")
+    {
+        CHECK_THROWS_WITH_AS(json::json_pointer("foo"),
+                             "[json.exception.parse_error.107] parse error at byte 1: JSON pointer must be empty or begin with '/' - was: 'foo'", json::parse_error&);
+
+        CHECK_THROWS_WITH_AS(json::json_pointer("/~~"),
+                             "[json.exception.parse_error.108] parse error: escape character '~' must be followed with '0' or '1'", json::parse_error&);
+
+        CHECK_THROWS_WITH_AS(json::json_pointer("/~"),
+                             "[json.exception.parse_error.108] parse error: escape character '~' must be followed with '0' or '1'", json::parse_error&);
+
+        json::json_pointer p;
+        CHECK_THROWS_WITH_AS(p.top(),
+                             "[json.exception.out_of_range.405] JSON pointer has no parent", json::out_of_range&);
+        CHECK_THROWS_WITH_AS(p.pop_back(),
+                             "[json.exception.out_of_range.405] JSON pointer has no parent", json::out_of_range&);
+
+        SECTION("array index error")
+        {
+            json v = {1, 2, 3, 4};
+            json::json_pointer const ptr("/10e");
+            CHECK_THROWS_WITH_AS(v[ptr],
+                                 "[json.exception.out_of_range.404] unresolved reference token '10e'", json::out_of_range&);
+        }
+    }
+
+    SECTION("examples from RFC 6901")
+    {
+        SECTION("nonconst access")
+        {
+            json j = R"(
+            {
+                "foo": ["bar", "baz"],
+                "": 0,
+                "a/b": 1,
+                "c%d": 2,
+                "e^f": 3,
+                "g|h": 4,
+                "i\\j": 5,
+                "k\"l": 6,
+                " ": 7,
+                "m~n": 8
+            }
+            )"_json;
+
+            // the whole document
+            CHECK(j[json::json_pointer()] == j);
+            CHECK(j[json::json_pointer("")] == j);
+            CHECK(j.contains(json::json_pointer()));
+            CHECK(j.contains(json::json_pointer("")));
+
+            // array access
+            CHECK(j[json::json_pointer("/foo")] == j["foo"]);
+            CHECK(j.contains(json::json_pointer("/foo")));
+            CHECK(j[json::json_pointer("/foo/0")] == j["foo"][0]);
+            CHECK(j[json::json_pointer("/foo/1")] == j["foo"][1]);
+            CHECK(j["/foo/1"_json_pointer] == j["foo"][1]);
+            CHECK(j.contains(json::json_pointer("/foo/0")));
+            CHECK(j.contains(json::json_pointer("/foo/1")));
+            CHECK(!j.contains(json::json_pointer("/foo/3")));
+            CHECK(!j.contains(json::json_pointer("/foo/+")));
+            CHECK(!j.contains(json::json_pointer("/foo/1+2")));
+            CHECK(!j.contains(json::json_pointer("/foo/-")));
+
+            // checked array access
+            CHECK(j.at(json::json_pointer("/foo/0")) == j["foo"][0]);
+            CHECK(j.at(json::json_pointer("/foo/1")) == j["foo"][1]);
+
+            // empty string access
+            CHECK(j[json::json_pointer("/")] == j[""]);
+            CHECK(j.contains(json::json_pointer("")));
+            CHECK(j.contains(json::json_pointer("/")));
+
+            // other cases
+            CHECK(j[json::json_pointer("/ ")] == j[" "]);
+            CHECK(j[json::json_pointer("/c%d")] == j["c%d"]);
+            CHECK(j[json::json_pointer("/e^f")] == j["e^f"]);
+            CHECK(j[json::json_pointer("/g|h")] == j["g|h"]);
+            CHECK(j[json::json_pointer("/i\\j")] == j["i\\j"]);
+            CHECK(j[json::json_pointer("/k\"l")] == j["k\"l"]);
+
+            // contains
+            CHECK(j.contains(json::json_pointer("/ ")));
+            CHECK(j.contains(json::json_pointer("/c%d")));
+            CHECK(j.contains(json::json_pointer("/e^f")));
+            CHECK(j.contains(json::json_pointer("/g|h")));
+            CHECK(j.contains(json::json_pointer("/i\\j")));
+            CHECK(j.contains(json::json_pointer("/k\"l")));
+
+            // checked access
+            CHECK(j.at(json::json_pointer("/ ")) == j[" "]);
+            CHECK(j.at(json::json_pointer("/c%d")) == j["c%d"]);
+            CHECK(j.at(json::json_pointer("/e^f")) == j["e^f"]);
+            CHECK(j.at(json::json_pointer("/g|h")) == j["g|h"]);
+            CHECK(j.at(json::json_pointer("/i\\j")) == j["i\\j"]);
+            CHECK(j.at(json::json_pointer("/k\"l")) == j["k\"l"]);
+
+            // escaped access
+            CHECK(j[json::json_pointer("/a~1b")] == j["a/b"]);
+            CHECK(j[json::json_pointer("/m~0n")] == j["m~n"]);
+            CHECK(j.contains(json::json_pointer("/a~1b")));
+            CHECK(j.contains(json::json_pointer("/m~0n")));
+
+            // unescaped access to nonexisting values yield object creation
+            CHECK(!j.contains(json::json_pointer("/a/b")));
+            CHECK_NOTHROW(j[json::json_pointer("/a/b")] = 42);
+            CHECK(j.contains(json::json_pointer("/a/b")));
+            CHECK(j["a"]["b"] == json(42));
+
+            CHECK(!j.contains(json::json_pointer("/a/c/1")));
+            CHECK_NOTHROW(j[json::json_pointer("/a/c/1")] = 42);
+            CHECK(j["a"]["c"] == json({nullptr, 42}));
+            CHECK(j.contains(json::json_pointer("/a/c/1")));
+
+            CHECK(!j.contains(json::json_pointer("/a/d/-")));
+            CHECK_NOTHROW(j[json::json_pointer("/a/d/-")] = 42);
+            CHECK(!j.contains(json::json_pointer("/a/d/-")));
+            CHECK(j["a"]["d"] == json::array({42}));
+            // "/a/b" works for JSON {"a": {"b": 42}}
+            CHECK(json({{"a", {{"b", 42}}}})[json::json_pointer("/a/b")] == json(42));
+
+            // unresolved access
+            json j_primitive = 1;
+            CHECK_THROWS_WITH_AS(j_primitive["/foo"_json_pointer],
+                                 "[json.exception.out_of_range.404] unresolved reference token 'foo'", json::out_of_range&);
+            CHECK_THROWS_WITH_AS(j_primitive.at("/foo"_json_pointer),
+                                 "[json.exception.out_of_range.404] unresolved reference token 'foo'", json::out_of_range&);
+            CHECK(!j_primitive.contains(json::json_pointer("/foo")));
+        }
+
+        SECTION("const access")
+        {
+            const json j = R"(
+            {
+                "foo": ["bar", "baz"],
+                "": 0,
+                "a/b": 1,
+                "c%d": 2,
+                "e^f": 3,
+                "g|h": 4,
+                "i\\j": 5,
+                "k\"l": 6,
+                " ": 7,
+                "m~n": 8
+            }
+            )"_json;
+
+            // the whole document
+            CHECK(j[json::json_pointer()] == j);
+            CHECK(j[json::json_pointer("")] == j);
+
+            // array access
+            CHECK(j[json::json_pointer("/foo")] == j["foo"]);
+            CHECK(j[json::json_pointer("/foo/0")] == j["foo"][0]);
+            CHECK(j[json::json_pointer("/foo/1")] == j["foo"][1]);
+            CHECK(j["/foo/1"_json_pointer] == j["foo"][1]);
+
+            // checked array access
+            CHECK(j.at(json::json_pointer("/foo/0")) == j["foo"][0]);
+            CHECK(j.at(json::json_pointer("/foo/1")) == j["foo"][1]);
+
+            // empty string access
+            CHECK(j[json::json_pointer("/")] == j[""]);
+
+            // other cases
+            CHECK(j[json::json_pointer("/ ")] == j[" "]);
+            CHECK(j[json::json_pointer("/c%d")] == j["c%d"]);
+            CHECK(j[json::json_pointer("/e^f")] == j["e^f"]);
+            CHECK(j[json::json_pointer("/g|h")] == j["g|h"]);
+            CHECK(j[json::json_pointer("/i\\j")] == j["i\\j"]);
+            CHECK(j[json::json_pointer("/k\"l")] == j["k\"l"]);
+
+            // checked access
+            CHECK(j.at(json::json_pointer("/ ")) == j[" "]);
+            CHECK(j.at(json::json_pointer("/c%d")) == j["c%d"]);
+            CHECK(j.at(json::json_pointer("/e^f")) == j["e^f"]);
+            CHECK(j.at(json::json_pointer("/g|h")) == j["g|h"]);
+            CHECK(j.at(json::json_pointer("/i\\j")) == j["i\\j"]);
+            CHECK(j.at(json::json_pointer("/k\"l")) == j["k\"l"]);
+
+            // escaped access
+            CHECK(j[json::json_pointer("/a~1b")] == j["a/b"]);
+            CHECK(j[json::json_pointer("/m~0n")] == j["m~n"]);
+
+            // unescaped access
+            CHECK_THROWS_WITH_AS(j.at(json::json_pointer("/a/b")),
+                                 "[json.exception.out_of_range.403] key 'a' not found", json::out_of_range&);
+
+            // unresolved access
+            const json j_primitive = 1;
+            CHECK_THROWS_WITH_AS(j_primitive["/foo"_json_pointer],
+                                 "[json.exception.out_of_range.404] unresolved reference token 'foo'", json::out_of_range&);
+            CHECK_THROWS_WITH_AS(j_primitive.at("/foo"_json_pointer),
+                                 "[json.exception.out_of_range.404] unresolved reference token 'foo'", json::out_of_range&);
+        }
+
+        SECTION("user-defined string literal")
+        {
+            json j = R"(
+            {
+                "foo": ["bar", "baz"],
+                "": 0,
+                "a/b": 1,
+                "c%d": 2,
+                "e^f": 3,
+                "g|h": 4,
+                "i\\j": 5,
+                "k\"l": 6,
+                " ": 7,
+                "m~n": 8
+            }
+            )"_json;
+
+            // the whole document
+            CHECK(j[""_json_pointer] == j);
+            CHECK(j.contains(""_json_pointer));
+
+            // array access
+            CHECK(j["/foo"_json_pointer] == j["foo"]);
+            CHECK(j["/foo/0"_json_pointer] == j["foo"][0]);
+            CHECK(j["/foo/1"_json_pointer] == j["foo"][1]);
+            CHECK(j.contains("/foo"_json_pointer));
+            CHECK(j.contains("/foo/0"_json_pointer));
+            CHECK(j.contains("/foo/1"_json_pointer));
+            CHECK(!j.contains("/foo/-"_json_pointer));
+        }
+    }
+
+    SECTION("array access")
+    {
+        SECTION("nonconst access")
+        {
+            json j = {1, 2, 3};
+            const json j_const = j;
+
+            // check reading access
+            CHECK(j["/0"_json_pointer] == j[0]);
+            CHECK(j["/1"_json_pointer] == j[1]);
+            CHECK(j["/2"_json_pointer] == j[2]);
+
+            // assign to existing index
+            j["/1"_json_pointer] = 13;
+            CHECK(j[1] == json(13));
+
+            // assign to nonexisting index
+            j["/3"_json_pointer] = 33;
+            CHECK(j[3] == json(33));
+
+            // assign to nonexisting index (with gap)
+            j["/5"_json_pointer] = 55;
+            CHECK(j == json({1, 13, 3, 33, nullptr, 55}));
+
+            // error with leading 0
+            CHECK_THROWS_WITH_AS(j["/01"_json_pointer],
+                                 "[json.exception.parse_error.106] parse error: array index '01' must not begin with '0'", json::parse_error&);
+            CHECK_THROWS_WITH_AS(j_const["/01"_json_pointer],
+                                 "[json.exception.parse_error.106] parse error: array index '01' must not begin with '0'", json::parse_error&);
+            CHECK_THROWS_WITH_AS(j.at("/01"_json_pointer),
+                                 "[json.exception.parse_error.106] parse error: array index '01' must not begin with '0'", json::parse_error&);
+            CHECK_THROWS_WITH_AS(j_const.at("/01"_json_pointer),
+                                 "[json.exception.parse_error.106] parse error: array index '01' must not begin with '0'", json::parse_error&);
+
+            CHECK(!j.contains("/01"_json_pointer));
+            CHECK(!j.contains("/01"_json_pointer));
+            CHECK(!j_const.contains("/01"_json_pointer));
+            CHECK(!j_const.contains("/01"_json_pointer));
+
+            // error with incorrect numbers
+            CHECK_THROWS_WITH_AS(j["/one"_json_pointer] = 1,
+                                 "[json.exception.parse_error.109] parse error: array index 'one' is not a number", json::parse_error&);
+            CHECK_THROWS_WITH_AS(j_const["/one"_json_pointer] == 1,
+                                 "[json.exception.parse_error.109] parse error: array index 'one' is not a number", json::parse_error&);
+
+            CHECK_THROWS_WITH_AS(j.at("/one"_json_pointer) = 1,
+                                 "[json.exception.parse_error.109] parse error: array index 'one' is not a number", json::parse_error&);
+            CHECK_THROWS_WITH_AS(j_const.at("/one"_json_pointer) == 1,
+                                 "[json.exception.parse_error.109] parse error: array index 'one' is not a number", json::parse_error&);
+
+            CHECK_THROWS_WITH_AS(j["/+1"_json_pointer] = 1,
+                                 "[json.exception.parse_error.109] parse error: array index '+1' is not a number", json::parse_error&);
+            CHECK_THROWS_WITH_AS(j_const["/+1"_json_pointer] == 1,
+                                 "[json.exception.parse_error.109] parse error: array index '+1' is not a number", json::parse_error&);
+
+            CHECK_THROWS_WITH_AS(j["/1+1"_json_pointer] = 1,
+                                 "[json.exception.out_of_range.404] unresolved reference token '1+1'", json::out_of_range&);
+            CHECK_THROWS_WITH_AS(j_const["/1+1"_json_pointer] == 1,
+                                 "[json.exception.out_of_range.404] unresolved reference token '1+1'", json::out_of_range&);
+
+            {
+                auto too_large_index = std::to_string((std::numeric_limits<unsigned long long>::max)()) + "1";
+                json::json_pointer const jp(std::string("/") + too_large_index);
+                std::string const throw_msg = std::string("[json.exception.out_of_range.404] unresolved reference token '") + too_large_index + "'";
+
+                CHECK_THROWS_WITH_AS(j[jp] = 1, throw_msg.c_str(), json::out_of_range&);
+                CHECK_THROWS_WITH_AS(j_const[jp] == 1, throw_msg.c_str(), json::out_of_range&);
+            }
+
+            // on some machines, the check below is not constant
+            DOCTEST_MSVC_SUPPRESS_WARNING_PUSH
+            DOCTEST_MSVC_SUPPRESS_WARNING(4127)
+
+            if (sizeof(typename json::size_type) < sizeof(unsigned long long))
+            {
+                auto size_type_max_uul = static_cast<unsigned long long>((std::numeric_limits<json::size_type>::max)());
+                auto too_large_index = std::to_string(size_type_max_uul);
+                json::json_pointer const jp(std::string("/") + too_large_index);
+                std::string const throw_msg = std::string("[json.exception.out_of_range.410] array index ") + too_large_index + " exceeds size_type";
+
+                CHECK_THROWS_WITH_AS(j[jp] = 1, throw_msg.c_str(), json::out_of_range&);
+                CHECK_THROWS_WITH_AS(j_const[jp] == 1, throw_msg.c_str(), json::out_of_range&);
+            }
+
+            DOCTEST_MSVC_SUPPRESS_WARNING_POP
+
+            CHECK_THROWS_WITH_AS(j.at("/one"_json_pointer) = 1,
+                                 "[json.exception.parse_error.109] parse error: array index 'one' is not a number", json::parse_error&);
+            CHECK_THROWS_WITH_AS(j_const.at("/one"_json_pointer) == 1,
+                                 "[json.exception.parse_error.109] parse error: array index 'one' is not a number", json::parse_error&);
+
+            CHECK(!j.contains("/one"_json_pointer));
+            CHECK(!j.contains("/one"_json_pointer));
+            CHECK(!j_const.contains("/one"_json_pointer));
+            CHECK(!j_const.contains("/one"_json_pointer));
+
+            CHECK_THROWS_WITH_AS(json({{"/list/0", 1}, {"/list/1", 2}, {"/list/three", 3}}).unflatten(),
+            "[json.exception.parse_error.109] parse error: array index 'three' is not a number", json::parse_error&);
+
+            // assign to "-"
+            j["/-"_json_pointer] = 99;
+            CHECK(j == json({1, 13, 3, 33, nullptr, 55, 99}));
+
+            // error when using "-" in const object
+            CHECK_THROWS_WITH_AS(j_const["/-"_json_pointer],
+                                 "[json.exception.out_of_range.402] array index '-' (3) is out of range", json::out_of_range&);
+            CHECK(!j_const.contains("/-"_json_pointer));
+
+            // error when using "-" with at
+            CHECK_THROWS_WITH_AS(j.at("/-"_json_pointer),
+                                 "[json.exception.out_of_range.402] array index '-' (7) is out of range", json::out_of_range&);
+            CHECK_THROWS_WITH_AS(j_const.at("/-"_json_pointer),
+                                 "[json.exception.out_of_range.402] array index '-' (3) is out of range", json::out_of_range&);
+            CHECK(!j_const.contains("/-"_json_pointer));
+        }
+
+        SECTION("const access")
+        {
+            const json j = {1, 2, 3};
+
+            // check reading access
+            CHECK(j["/0"_json_pointer] == j[0]);
+            CHECK(j["/1"_json_pointer] == j[1]);
+            CHECK(j["/2"_json_pointer] == j[2]);
+
+            // assign to nonexisting index
+            CHECK_THROWS_WITH_AS(j.at("/3"_json_pointer),
+                                 "[json.exception.out_of_range.401] array index 3 is out of range", json::out_of_range&);
+            CHECK(!j.contains("/3"_json_pointer));
+
+            // assign to nonexisting index (with gap)
+            CHECK_THROWS_WITH_AS(j.at("/5"_json_pointer),
+                                 "[json.exception.out_of_range.401] array index 5 is out of range", json::out_of_range&);
+            CHECK(!j.contains("/5"_json_pointer));
+
+            // assign to "-"
+            CHECK_THROWS_WITH_AS(j["/-"_json_pointer],
+                                 "[json.exception.out_of_range.402] array index '-' (3) is out of range", json::out_of_range&);
+            CHECK_THROWS_WITH_AS(j.at("/-"_json_pointer),
+                                 "[json.exception.out_of_range.402] array index '-' (3) is out of range", json::out_of_range&);
+            CHECK(!j.contains("/-"_json_pointer));
+        }
+    }
+
+    SECTION("flatten")
+    {
+        json j =
+        {
+            {"pi", 3.141},
+            {"happy", true},
+            {"name", "Niels"},
+            {"nothing", nullptr},
+            {
+                "answer", {
+                    {"everything", 42}
+                }
+            },
+            {"list", {1, 0, 2}},
+            {
+                "object", {
+                    {"currency", "USD"},
+                    {"value", 42.99},
+                    {"", "empty string"},
+                    {"/", "slash"},
+                    {"~", "tilde"},
+                    {"~1", "tilde1"}
+                }
+            }
+        };
+
+        json j_flatten =
+        {
+            {"/pi", 3.141},
+            {"/happy", true},
+            {"/name", "Niels"},
+            {"/nothing", nullptr},
+            {"/answer/everything", 42},
+            {"/list/0", 1},
+            {"/list/1", 0},
+            {"/list/2", 2},
+            {"/object/currency", "USD"},
+            {"/object/value", 42.99},
+            {"/object/", "empty string"},
+            {"/object/~1", "slash"},
+            {"/object/~0", "tilde"},
+            {"/object/~01", "tilde1"}
+        };
+
+        // check if flattened result is as expected
+        CHECK(j.flatten() == j_flatten);
+
+        // check if unflattened result is as expected
+        CHECK(j_flatten.unflatten() == j);
+
+        // error for nonobjects
+        CHECK_THROWS_WITH_AS(json(1).unflatten(),
+                             "[json.exception.type_error.314] only objects can be unflattened", json::type_error&);
+
+        // error for nonprimitve values
+#if JSON_DIAGNOSTICS
+        CHECK_THROWS_WITH_AS(json({{"/1", {1, 2, 3}}}).unflatten(), "[json.exception.type_error.315] (/~11) values in object must be primitive", json::type_error&);
+#else
+        CHECK_THROWS_WITH_AS(json({{"/1", {1, 2, 3}}}).unflatten(), "[json.exception.type_error.315] values in object must be primitive", json::type_error&);
+#endif
+
+        // error for conflicting values
+        json const j_error = {{"", 42}, {"/foo", 17}};
+        CHECK_THROWS_WITH_AS(j_error.unflatten(),
+                             "[json.exception.type_error.313] invalid value to unflatten", json::type_error&);
+
+        // explicit roundtrip check
+        CHECK(j.flatten().unflatten() == j);
+
+        // roundtrip for primitive values
+        json j_null;
+        CHECK(j_null.flatten().unflatten() == j_null);
+        json j_number = 42;
+        CHECK(j_number.flatten().unflatten() == j_number);
+        json j_boolean = false;
+        CHECK(j_boolean.flatten().unflatten() == j_boolean);
+        json j_string = "foo";
+        CHECK(j_string.flatten().unflatten() == j_string);
+
+        // roundtrip for empty structured values (will be unflattened to null)
+        json const j_array(json::value_t::array);
+        CHECK(j_array.flatten().unflatten() == json());
+        json const j_object(json::value_t::object);
+        CHECK(j_object.flatten().unflatten() == json());
+    }
+
+    SECTION("string representation")
+    {
+        for (const auto* ptr_str :
+                {"", "/foo", "/foo/0", "/", "/a~1b", "/c%d", "/e^f", "/g|h", "/i\\j", "/k\"l", "/ ", "/m~0n"
+                })
+        {
+            json::json_pointer const ptr(ptr_str);
+            std::stringstream ss;
+            ss << ptr;
+            CHECK(ptr.to_string() == ptr_str);
+            CHECK(std::string(ptr) == ptr_str);
+            CHECK(ss.str() == ptr_str);
+        }
+    }
+
+    SECTION("conversion")
+    {
+        SECTION("array")
+        {
+            json j;
+            // all numbers -> array
+            j["/12"_json_pointer] = 0;
+            CHECK(j.is_array());
+        }
+
+        SECTION("object")
+        {
+            json j;
+            // contains a number, but is not a number -> object
+            j["/a12"_json_pointer] = 0;
+            CHECK(j.is_object());
+        }
+    }
+
+    SECTION("empty, push, pop and parent")
+    {
+        const json j =
+        {
+            {"", "Hello"},
+            {"pi", 3.141},
+            {"happy", true},
+            {"name", "Niels"},
+            {"nothing", nullptr},
+            {
+                "answer", {
+                    {"everything", 42}
+                }
+            },
+            {"list", {1, 0, 2}},
+            {
+                "object", {
+                    {"currency", "USD"},
+                    {"value", 42.99},
+                    {"", "empty string"},
+                    {"/", "slash"},
+                    {"~", "tilde"},
+                    {"~1", "tilde1"}
+                }
+            }
+        };
+
+        // empty json_pointer returns the root JSON-object
+        auto ptr = ""_json_pointer;
+        CHECK(ptr.empty());
+        CHECK(j[ptr] == j);
+
+        // simple field access
+        ptr.push_back("pi");
+        CHECK(!ptr.empty());
+        CHECK(j[ptr] == j["pi"]);
+
+        ptr.pop_back();
+        CHECK(ptr.empty());
+        CHECK(j[ptr] == j);
+
+        // object and children access
+        const std::string answer("answer");
+        ptr.push_back(answer);
+        ptr.push_back("everything");
+        CHECK(!ptr.empty());
+        CHECK(j[ptr] == j["answer"]["everything"]);
+
+        // check access via const pointer
+        const auto cptr = ptr;
+        CHECK(cptr.back() == "everything");
+
+        ptr.pop_back();
+        ptr.pop_back();
+        CHECK(ptr.empty());
+        CHECK(j[ptr] == j);
+
+        // push key which has to be encoded
+        ptr.push_back("object");
+        ptr.push_back("/");
+        CHECK(j[ptr] == j["object"]["/"]);
+        CHECK(ptr.to_string() == "/object/~1");
+
+        CHECK(j[ptr.parent_pointer()] == j["object"]);
+        ptr = ptr.parent_pointer().parent_pointer();
+        CHECK(ptr.empty());
+        CHECK(j[ptr] == j);
+        // parent-pointer of the empty json_pointer is empty
+        ptr = ptr.parent_pointer();
+        CHECK(ptr.empty());
+        CHECK(j[ptr] == j);
+
+        CHECK_THROWS_WITH(ptr.pop_back(),
+                          "[json.exception.out_of_range.405] JSON pointer has no parent");
+    }
+
+    SECTION("operators")
+    {
+        const json j =
+        {
+            {"", "Hello"},
+            {"pi", 3.141},
+            {"happy", true},
+            {"name", "Niels"},
+            {"nothing", nullptr},
+            {
+                "answer", {
+                    {"everything", 42}
+                }
+            },
+            {"list", {1, 0, 2}},
+            {
+                "object", {
+                    {"currency", "USD"},
+                    {"value", 42.99},
+                    {"", "empty string"},
+                    {"/", "slash"},
+                    {"~", "tilde"},
+                    {"~1", "tilde1"}
+                }
+            }
+        };
+
+        // empty json_pointer returns the root JSON-object
+        auto ptr = ""_json_pointer;
+        CHECK(j[ptr] == j);
+
+        // simple field access
+        ptr = ptr / "pi";
+        CHECK(j[ptr] == j["pi"]);
+
+        ptr.pop_back();
+        CHECK(j[ptr] == j);
+
+        // object and children access
+        const std::string answer("answer");
+        ptr /= answer;
+        ptr = ptr / "everything";
+        CHECK(j[ptr] == j["answer"]["everything"]);
+
+        ptr.pop_back();
+        ptr.pop_back();
+        CHECK(j[ptr] == j);
+
+        CHECK(ptr / ""_json_pointer == ptr);
+        CHECK(j["/answer"_json_pointer / "/everything"_json_pointer] == j["answer"]["everything"]);
+
+        // list children access
+        CHECK(j["/list"_json_pointer / 1] == j["list"][1]);
+
+        // push key which has to be encoded
+        ptr /= "object";
+        ptr = ptr / "/";
+        CHECK(j[ptr] == j["object"]["/"]);
+        CHECK(ptr.to_string() == "/object/~1");
+    }
+
+    SECTION("equality comparison")
+    {
+        const char* ptr_cpstring = "/foo/bar";
+        const char ptr_castring[] = "/foo/bar"; // NOLINT(hicpp-avoid-c-arrays,modernize-avoid-c-arrays,cppcoreguidelines-avoid-c-arrays)
+        std::string ptr_string{"/foo/bar"};
+        auto ptr1 = json::json_pointer(ptr_string);
+        auto ptr2 = json::json_pointer(ptr_string);
+
+        // build with C++20 to test rewritten candidates
+        // JSON_HAS_CPP_20
+
+        CHECK(ptr1 == ptr2);
+
+        CHECK(ptr1 == "/foo/bar");
+        CHECK(ptr1 == ptr_cpstring);
+        CHECK(ptr1 == ptr_castring);
+        CHECK(ptr1 == ptr_string);
+
+        CHECK("/foo/bar" == ptr1);
+        CHECK(ptr_cpstring == ptr1);
+        CHECK(ptr_castring == ptr1);
+        CHECK(ptr_string == ptr1);
+
+        CHECK_FALSE(ptr1 != ptr2);
+
+        CHECK_FALSE(ptr1 != "/foo/bar");
+        CHECK_FALSE(ptr1 != ptr_cpstring);
+        CHECK_FALSE(ptr1 != ptr_castring);
+        CHECK_FALSE(ptr1 != ptr_string);
+
+        CHECK_FALSE("/foo/bar" != ptr1);
+        CHECK_FALSE(ptr_cpstring != ptr1);
+        CHECK_FALSE(ptr_castring != ptr1);
+        CHECK_FALSE(ptr_string != ptr1);
+
+        SECTION("exceptions")
+        {
+            CHECK_THROWS_WITH_AS(ptr1 == "foo",
+                                 "[json.exception.parse_error.107] parse error at byte 1: JSON pointer must be empty or begin with '/' - was: 'foo'", json::parse_error&);
+            CHECK_THROWS_WITH_AS("foo" == ptr1,
+                                 "[json.exception.parse_error.107] parse error at byte 1: JSON pointer must be empty or begin with '/' - was: 'foo'", json::parse_error&);
+            CHECK_THROWS_WITH_AS(ptr1 == "/~~",
+                                 "[json.exception.parse_error.108] parse error: escape character '~' must be followed with '0' or '1'", json::parse_error&);
+            CHECK_THROWS_WITH_AS("/~~" == ptr1,
+                                 "[json.exception.parse_error.108] parse error: escape character '~' must be followed with '0' or '1'", json::parse_error&);
+        }
+    }
+
+    SECTION("less-than comparison")
+    {
+        auto ptr1 = json::json_pointer("/foo/a");
+        auto ptr2 = json::json_pointer("/foo/b");
+
+        CHECK(ptr1 < ptr2);
+        CHECK_FALSE(ptr2 < ptr1);
+
+        // build with C++20
+        // JSON_HAS_CPP_20
+#if JSON_HAS_THREE_WAY_COMPARISON
+        CHECK((ptr1 <=> ptr2) == std::strong_ordering::less); // *NOPAD*
+        CHECK(ptr2 > ptr1);
+#endif
+    }
+
+    SECTION("usable as map key")
+    {
+        auto ptr = json::json_pointer("/foo");
+        std::map<json::json_pointer, int> m;
+
+        m[ptr] = 42;
+
+        CHECK(m.find(ptr) != m.end());
+    }
+
+    SECTION("backwards compatibility and mixing")
+    {
+        json j = R"(
+        {
+            "foo": ["bar", "baz"]
+        }
+        )"_json;
+
+        using nlohmann::ordered_json;
+        using json_ptr_str = nlohmann::json_pointer<std::string>;
+        using json_ptr_j = nlohmann::json_pointer<json>;
+        using json_ptr_oj = nlohmann::json_pointer<ordered_json>;
+
+        CHECK(std::is_same<json_ptr_str::string_t, json::json_pointer::string_t>::value);
+        CHECK(std::is_same<json_ptr_str::string_t, ordered_json::json_pointer::string_t>::value);
+        CHECK(std::is_same<json_ptr_str::string_t, json_ptr_j::string_t>::value);
+        CHECK(std::is_same<json_ptr_str::string_t, json_ptr_oj::string_t>::value);
+
+        std::string const ptr_string{"/foo/0"};
+        json_ptr_str ptr{ptr_string};
+        json_ptr_j ptr_j{ptr_string};
+        json_ptr_oj ptr_oj{ptr_string};
+
+        CHECK(j.contains(ptr));
+        CHECK(j.contains(ptr_j));
+        CHECK(j.contains(ptr_oj));
+
+        CHECK(j.at(ptr) == j.at(ptr_j));
+        CHECK(j.at(ptr) == j.at(ptr_oj));
+
+        CHECK(j[ptr] == j[ptr_j]);
+        CHECK(j[ptr] == j[ptr_oj]);
+
+        CHECK(j.value(ptr, "x") == j.value(ptr_j, "x"));
+        CHECK(j.value(ptr, "x") == j.value(ptr_oj, "x"));
+
+        CHECK(ptr == ptr_j);
+        CHECK(ptr == ptr_oj);
+        CHECK_FALSE(ptr != ptr_j);
+        CHECK_FALSE(ptr != ptr_oj);
+
+        SECTION("equality comparison")
+        {
+            // build with C++20 to test rewritten candidates
+            // JSON_HAS_CPP_20
+
+            CHECK(ptr == ptr_j);
+            CHECK(ptr == ptr_oj);
+            CHECK(ptr_j == ptr);
+            CHECK(ptr_j == ptr_oj);
+            CHECK(ptr_oj == ptr_j);
+            CHECK(ptr_oj == ptr);
+
+            CHECK_FALSE(ptr != ptr_j);
+            CHECK_FALSE(ptr != ptr_oj);
+            CHECK_FALSE(ptr_j != ptr);
+            CHECK_FALSE(ptr_j != ptr_oj);
+            CHECK_FALSE(ptr_oj != ptr_j);
+            CHECK_FALSE(ptr_oj != ptr);
+        }
+    }
+}
diff --git a/external_imported/json/tests/src/unit-large_json.cpp b/external_imported/json/tests/src/unit-large_json.cpp
new file mode 100644
index 000000000..9703a5452
--- /dev/null
+++ b/external_imported/json/tests/src/unit-large_json.cpp
@@ -0,0 +1,29 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+#include <nlohmann/json.hpp>
+using nlohmann::json;
+
+#include <algorithm>
+
+TEST_CASE("tests on very large JSONs")
+{
+    SECTION("issue #1419 - Segmentation fault (stack overflow) due to unbounded recursion")
+    {
+        const auto depth = 5000000;
+
+        std::string s(static_cast<std::size_t>(2 * depth), '[');
+        std::fill(s.begin() + depth, s.end(), ']');
+
+        json _;
+        CHECK_NOTHROW(_ = nlohmann::json::parse(s));
+    }
+}
+
diff --git a/external_imported/json/tests/src/unit-merge_patch.cpp b/external_imported/json/tests/src/unit-merge_patch.cpp
new file mode 100644
index 000000000..6a8bcfe2a
--- /dev/null
+++ b/external_imported/json/tests/src/unit-merge_patch.cpp
@@ -0,0 +1,244 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+#include <nlohmann/json.hpp>
+using nlohmann::json;
+#ifdef JSON_TEST_NO_GLOBAL_UDLS
+    using namespace nlohmann::literals; // NOLINT(google-build-using-namespace)
+#endif
+
+TEST_CASE("JSON Merge Patch")
+{
+    SECTION("examples from RFC 7396")
+    {
+        SECTION("Section 1")
+        {
+            json document = R"({
+                "a": "b",
+                "c": {
+                    "d": "e",
+                    "f": "g"
+                }
+            })"_json;
+
+            json const patch = R"({
+                "a": "z",
+                "c": {
+                    "f": null
+                }
+            })"_json;
+
+            json expected = R"({
+                "a": "z",
+                "c": {
+                    "d": "e"
+                }
+            })"_json;
+
+            document.merge_patch(patch);
+            CHECK(document == expected);
+        }
+
+        SECTION("Section 3")
+        {
+            json document = R"({
+                "title": "Goodbye!",
+                "author": {
+                    "givenName": "John",
+                    "familyName": "Doe"
+                },
+                "tags": [
+                    "example",
+                    "sample"
+                ],
+                "content": "This will be unchanged"
+            })"_json;
+
+            json const patch = R"({
+                "title": "Hello!",
+                "phoneNumber": "+01-123-456-7890",
+                "author": {
+                    "familyName": null
+                },
+                "tags": [
+                    "example"
+                ]
+            })"_json;
+
+            json expected = R"({
+                "title": "Hello!",
+                "author": {
+                    "givenName": "John"
+                },
+                "tags": [
+                    "example"
+                ],
+                "content": "This will be unchanged",
+                "phoneNumber": "+01-123-456-7890"
+            })"_json;
+
+            document.merge_patch(patch);
+            CHECK(document == expected);
+        }
+
+        SECTION("Appendix A")
+        {
+            SECTION("Example 1")
+            {
+                json original = R"({"a":"b"})"_json;
+                json const patch = R"({"a":"c"})"_json;
+                json result = R"({"a":"c"})"_json;
+
+                original.merge_patch(patch);
+                CHECK(original == result);
+            }
+
+            SECTION("Example 2")
+            {
+                json original = R"({"a":"b"})"_json;
+                json const patch = R"({"b":"c"})"_json;
+                json result = R"({"a":"b", "b":"c"})"_json;
+
+                original.merge_patch(patch);
+                CHECK(original == result);
+            }
+
+            SECTION("Example 3")
+            {
+                json original = R"({"a":"b"})"_json;
+                json const patch = R"({"a":null})"_json;
+                json result = R"({})"_json;
+
+                original.merge_patch(patch);
+                CHECK(original == result);
+            }
+
+            SECTION("Example 4")
+            {
+                json original = R"({"a":"b","b":"c"})"_json;
+                json const patch = R"({"a":null})"_json;
+                json result = R"({"b":"c"})"_json;
+
+                original.merge_patch(patch);
+                CHECK(original == result);
+            }
+
+            SECTION("Example 5")
+            {
+                json original = R"({"a":["b"]})"_json;
+                json const patch = R"({"a":"c"})"_json;
+                json result = R"({"a":"c"})"_json;
+
+                original.merge_patch(patch);
+                CHECK(original == result);
+            }
+
+            SECTION("Example 6")
+            {
+                json original = R"({"a":"c"})"_json;
+                json const patch = R"({"a":["b"]})"_json;
+                json result = R"({"a":["b"]})"_json;
+
+                original.merge_patch(patch);
+                CHECK(original == result);
+            }
+
+            SECTION("Example 7")
+            {
+                json original = R"({"a":{"b": "c"}})"_json;
+                json const patch = R"({"a":{"b":"d","c":null}})"_json;
+                json result = R"({"a": {"b": "d"}})"_json;
+
+                original.merge_patch(patch);
+                CHECK(original == result);
+            }
+
+            SECTION("Example 8")
+            {
+                json original = R"({"a":[{"b":"c"}]})"_json;
+                json const patch = R"({"a":[1]})"_json;
+                json result = R"({"a":[1]})"_json;
+
+                original.merge_patch(patch);
+                CHECK(original == result);
+            }
+
+            SECTION("Example 9")
+            {
+                json original = R"(["a","b"])"_json;
+                json const patch = R"(["c","d"])"_json;
+                json result = R"(["c","d"])"_json;
+
+                original.merge_patch(patch);
+                CHECK(original == result);
+            }
+
+            SECTION("Example 10")
+            {
+                json original = R"({"a":"b"})"_json;
+                json const patch = R"(["c"])"_json;
+                json result = R"(["c"])"_json;
+
+                original.merge_patch(patch);
+                CHECK(original == result);
+            }
+
+            SECTION("Example 11")
+            {
+                json original = R"({"a":"foo"})"_json;
+                json const patch = R"(null)"_json;
+                json result = R"(null)"_json;
+
+                original.merge_patch(patch);
+                CHECK(original == result);
+            }
+
+            SECTION("Example 12")
+            {
+                json original = R"({"a":"foo"})"_json;
+                json const patch = R"("bar")"_json;
+                json result = R"("bar")"_json;
+
+                original.merge_patch(patch);
+                CHECK(original == result);
+            }
+
+            SECTION("Example 13")
+            {
+                json original = R"({"e":null})"_json;
+                json const patch = R"({"a":1})"_json;
+                json result = R"({"e":null,"a":1})"_json;
+
+                original.merge_patch(patch);
+                CHECK(original == result);
+            }
+
+            SECTION("Example 14")
+            {
+                json original = R"([1,2])"_json;
+                json const patch = R"({"a":"b","c":null})"_json;
+                json result = R"({"a":"b"})"_json;
+
+                original.merge_patch(patch);
+                CHECK(original == result);
+            }
+
+            SECTION("Example 15")
+            {
+                json original = R"({})"_json;
+                json const patch = R"({"a":{"bb":{"ccc":null}}})"_json;
+                json result = R"({"a":{"bb":{}}})"_json;
+
+                original.merge_patch(patch);
+                CHECK(original == result);
+            }
+        }
+    }
+}
diff --git a/external_imported/json/tests/src/unit-meta.cpp b/external_imported/json/tests/src/unit-meta.cpp
new file mode 100644
index 000000000..a522faabb
--- /dev/null
+++ b/external_imported/json/tests/src/unit-meta.cpp
@@ -0,0 +1,36 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+#include <nlohmann/json.hpp>
+using nlohmann::json;
+
+TEST_CASE("version information")
+{
+    SECTION("meta()")
+    {
+        json j = json::meta();
+
+        CHECK(j["name"] == "JSON for Modern C++");
+        CHECK(j["copyright"] == "(C) 2013-2023 Niels Lohmann");
+        CHECK(j["url"] == "https://github.com/nlohmann/json");
+        CHECK(j["version"] == json(
+        {
+            {"string", "3.11.3"},
+            {"major", 3},
+            {"minor", 11},
+            {"patch", 3}
+        }));
+
+        CHECK(j.find("platform") != j.end());
+        CHECK(j.at("compiler").find("family") != j.at("compiler").end());
+        CHECK(j.at("compiler").find("version") != j.at("compiler").end());
+        CHECK(j.at("compiler").find("c++") != j.at("compiler").end());
+    }
+}
diff --git a/external_imported/json/tests/src/unit-modifiers.cpp b/external_imported/json/tests/src/unit-modifiers.cpp
new file mode 100644
index 000000000..fb686780e
--- /dev/null
+++ b/external_imported/json/tests/src/unit-modifiers.cpp
@@ -0,0 +1,953 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// Copyright (c) 2013-2022 Niels Lohmann <http://nlohmann.me>.
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+#include <nlohmann/json.hpp>
+using nlohmann::json;
+
+TEST_CASE("modifiers")
+{
+    SECTION("clear()")
+    {
+        SECTION("boolean")
+        {
+            json j = true;
+            json const k = j;
+
+            j.clear();
+            CHECK(j == json(json::value_t::boolean));
+            CHECK(j == json(k.type()));
+        }
+
+        SECTION("string")
+        {
+            json j = "hello world";
+            json const k = j;
+
+            j.clear();
+            CHECK(j == json(json::value_t::string));
+            CHECK(j == json(k.type()));
+        }
+
+        SECTION("array")
+        {
+            SECTION("empty array")
+            {
+                json j = json::array();
+                json const k = j;
+
+                j.clear();
+                CHECK(j.empty());
+                CHECK(j == json(json::value_t::array));
+                CHECK(j == json(k.type()));
+            }
+
+            SECTION("filled array")
+            {
+                json j = {1, 2, 3};
+                json const k = j;
+
+                j.clear();
+                CHECK(j.empty());
+                CHECK(j == json(json::value_t::array));
+                CHECK(j == json(k.type()));
+            }
+        }
+
+        SECTION("object")
+        {
+            SECTION("empty object")
+            {
+                json j = json::object();
+                json const k = j;
+
+                j.clear();
+                CHECK(j.empty());
+                CHECK(j == json(json::value_t::object));
+                CHECK(j == json(k.type()));
+            }
+
+            SECTION("filled object")
+            {
+                json j = {{"one", 1}, {"two", 2}, {"three", 3}};
+                json const k = j;
+
+                j.clear();
+                CHECK(j.empty());
+                CHECK(j == json(json::value_t::object));
+                CHECK(j == json(k.type()));
+            }
+        }
+
+        SECTION("binary")
+        {
+            SECTION("empty binary")
+            {
+                json j = json::binary({});
+                json const k = j;
+
+                j.clear();
+                CHECK(!j.empty());
+                CHECK(j == json(json::value_t::binary));
+                CHECK(j == json(k.type()));
+            }
+
+            SECTION("filled binary")
+            {
+                json j = json::binary({1, 2, 3, 4, 5});
+                json const k = j;
+
+                j.clear();
+                CHECK(!j.empty());
+                CHECK(j == json(json::value_t::binary));
+                CHECK(j == json(k.type()));
+            }
+        }
+
+        SECTION("number (integer)")
+        {
+            json j = 23;
+            json const k = j;
+
+            j.clear();
+            CHECK(j == json(json::value_t::number_integer));
+            CHECK(j == json(k.type()));
+        }
+
+        SECTION("number (unsigned)")
+        {
+            json j = 23u;
+            json const k = j;
+
+            j.clear();
+            CHECK(j == json(json::value_t::number_integer));
+            CHECK(j == json(k.type()));
+        }
+
+        SECTION("number (float)")
+        {
+            json j = 23.42;
+            json const k = j;
+
+            j.clear();
+            CHECK(j == json(json::value_t::number_float));
+            CHECK(j == json(k.type()));
+        }
+
+        SECTION("null")
+        {
+            json j = nullptr;
+            json const k = j;
+
+            j.clear();
+            CHECK(j == json(json::value_t::null));
+            CHECK(j == json(k.type()));
+        }
+    }
+
+    SECTION("push_back()")
+    {
+        SECTION("to array")
+        {
+            SECTION("json&&")
+            {
+                SECTION("null")
+                {
+                    json j;
+                    j.push_back(1);
+                    j.push_back(2);
+                    CHECK(j.type() == json::value_t::array);
+                    CHECK(j == json({1, 2}));
+                }
+
+                SECTION("array")
+                {
+                    json j = {1, 2, 3};
+                    j.push_back("Hello");
+                    CHECK(j.type() == json::value_t::array);
+                    CHECK(j == json({1, 2, 3, "Hello"}));
+                }
+
+                SECTION("other type")
+                {
+                    json j = 1;
+                    CHECK_THROWS_WITH_AS(j.push_back("Hello"), "[json.exception.type_error.308] cannot use push_back() with number", json::type_error&);
+                }
+            }
+
+            SECTION("const json&")
+            {
+                SECTION("null")
+                {
+                    json j;
+                    json const k(1);
+                    j.push_back(k);
+                    j.push_back(k);
+                    CHECK(j.type() == json::value_t::array);
+                    CHECK(j == json({1, 1}));
+                }
+
+                SECTION("array")
+                {
+                    json j = {1, 2, 3};
+                    json const k("Hello");
+                    j.push_back(k);
+                    CHECK(j.type() == json::value_t::array);
+                    CHECK(j == json({1, 2, 3, "Hello"}));
+                }
+
+                SECTION("other type")
+                {
+                    json j = 1;
+                    json const k("Hello");
+                    CHECK_THROWS_WITH_AS(j.push_back(k), "[json.exception.type_error.308] cannot use push_back() with number", json::type_error&);
+                }
+            }
+        }
+
+        SECTION("to object")
+        {
+            SECTION("null")
+            {
+                json j;
+                j.push_back(json::object_t::value_type({"one", 1}));
+                j.push_back(json::object_t::value_type({"two", 2}));
+                CHECK(j.type() == json::value_t::object);
+                CHECK(j.size() == 2);
+                CHECK(j["one"] == json(1));
+                CHECK(j["two"] == json(2));
+            }
+
+            SECTION("object")
+            {
+                json j(json::value_t::object);
+                j.push_back(json::object_t::value_type({"one", 1}));
+                j.push_back(json::object_t::value_type({"two", 2}));
+                CHECK(j.size() == 2);
+                CHECK(j["one"] == json(1));
+                CHECK(j["two"] == json(2));
+            }
+
+            SECTION("other type")
+            {
+                json j = 1;
+                json const k("Hello");
+                CHECK_THROWS_WITH_AS(j.push_back(json::object_t::value_type({"one", 1})), "[json.exception.type_error.308] cannot use push_back() with number", json::type_error&);
+            }
+        }
+
+        SECTION("with initializer_list")
+        {
+            SECTION("null")
+            {
+                json j;
+                j.push_back({"foo", "bar"});
+                CHECK(j == json::array({{"foo", "bar"}}));
+
+                json k;
+                k.push_back({1, 2, 3});
+                CHECK(k == json::array({{1, 2, 3}}));
+            }
+
+            SECTION("array")
+            {
+                json j = {1, 2, 3};
+                j.push_back({"foo", "bar"});
+                CHECK(j == json({1, 2, 3, {"foo", "bar"}}));
+
+                json k = {1, 2, 3};
+                k.push_back({1, 2, 3});
+                CHECK(k == json({1, 2, 3, {1, 2, 3}}));
+            }
+
+            SECTION("object")
+            {
+                json j = {{"key1", 1}};
+                j.push_back({"key2", "bar"});
+                CHECK(j == json({{"key1", 1}, {"key2", "bar"}}));
+
+                // invalid values (no string/val pair)
+                CHECK_THROWS_WITH_AS(j.push_back({1}), "[json.exception.type_error.308] cannot use push_back() with object", json::type_error&);
+                CHECK_THROWS_WITH_AS(j.push_back({1, 2}), "[json.exception.type_error.308] cannot use push_back() with object", json::type_error&);
+                CHECK_THROWS_WITH_AS(j.push_back({1, 2, 3, 4}), "[json.exception.type_error.308] cannot use push_back() with object", json::type_error&);
+            }
+        }
+    }
+
+    SECTION("emplace_back()")
+    {
+        SECTION("to array")
+        {
+            SECTION("null")
+            {
+                json j;
+                auto& x1 = j.emplace_back(1);
+                CHECK(x1 == 1);
+                auto& x2 = j.emplace_back(2);
+                CHECK(x2 == 2);
+                CHECK(j.type() == json::value_t::array);
+                CHECK(j == json({1, 2}));
+            }
+
+            SECTION("array")
+            {
+                json j = {1, 2, 3};
+                auto& x = j.emplace_back("Hello");
+                CHECK(x == "Hello");
+                CHECK(j.type() == json::value_t::array);
+                CHECK(j == json({1, 2, 3, "Hello"}));
+            }
+
+            SECTION("multiple values")
+            {
+                json j;
+                auto& x = j.emplace_back(3, "foo");
+                CHECK(x == json({"foo", "foo", "foo"}));
+                CHECK(j.type() == json::value_t::array);
+                CHECK(j == json({{"foo", "foo", "foo"}}));
+            }
+        }
+
+        SECTION("other type")
+        {
+            json j = 1;
+            CHECK_THROWS_WITH_AS(j.emplace_back("Hello"), "[json.exception.type_error.311] cannot use emplace_back() with number", json::type_error&);
+        }
+    }
+
+    SECTION("emplace()")
+    {
+        SECTION("to object")
+        {
+            SECTION("null")
+            {
+                // start with a null value
+                json j;
+
+                // add a new key
+                auto res1 = j.emplace("foo", "bar");
+                CHECK(res1.second == true);
+                CHECK(*res1.first == "bar");
+
+                // the null value is changed to an object
+                CHECK(j.type() == json::value_t::object);
+
+                // add a new key
+                auto res2 = j.emplace("baz", "bam");
+                CHECK(res2.second == true);
+                CHECK(*res2.first == "bam");
+
+                // we try to insert at given key - no change
+                auto res3 = j.emplace("baz", "bad");
+                CHECK(res3.second == false);
+                CHECK(*res3.first == "bam");
+
+                // the final object
+                CHECK(j == json({{"baz", "bam"}, {"foo", "bar"}}));
+            }
+
+            SECTION("object")
+            {
+                // start with an object
+                json j = {{"foo", "bar"}};
+
+                // add a new key
+                auto res1 = j.emplace("baz", "bam");
+                CHECK(res1.second == true);
+                CHECK(*res1.first == "bam");
+
+                // add an existing key
+                auto res2 = j.emplace("foo", "bad");
+                CHECK(res2.second == false);
+                CHECK(*res2.first == "bar");
+
+                // check final object
+                CHECK(j == json({{"baz", "bam"}, {"foo", "bar"}}));
+            }
+        }
+
+        SECTION("other type")
+        {
+            json j = 1;
+            CHECK_THROWS_WITH_AS(j.emplace("foo", "bar"), "[json.exception.type_error.311] cannot use emplace() with number", json::type_error&);
+        }
+    }
+
+    SECTION("operator+=")
+    {
+        SECTION("to array")
+        {
+            SECTION("json&&")
+            {
+                SECTION("null")
+                {
+                    json j;
+                    j += 1;
+                    j += 2;
+                    CHECK(j.type() == json::value_t::array);
+                    CHECK(j == json({1, 2}));
+                }
+
+                SECTION("array")
+                {
+                    json j = {1, 2, 3};
+                    j += "Hello";
+                    CHECK(j.type() == json::value_t::array);
+                    CHECK(j == json({1, 2, 3, "Hello"}));
+                }
+
+                SECTION("other type")
+                {
+                    json j = 1;
+                    CHECK_THROWS_WITH_AS(j += "Hello", "[json.exception.type_error.308] cannot use push_back() with number", json::type_error&);
+                }
+            }
+
+            SECTION("const json&")
+            {
+                SECTION("null")
+                {
+                    json j;
+                    json const k(1);
+                    j += k;
+                    j += k;
+                    CHECK(j.type() == json::value_t::array);
+                    CHECK(j == json({1, 1}));
+                }
+
+                SECTION("array")
+                {
+                    json j = {1, 2, 3};
+                    json const k("Hello");
+                    j += k;
+                    CHECK(j.type() == json::value_t::array);
+                    CHECK(j == json({1, 2, 3, "Hello"}));
+                }
+
+                SECTION("other type")
+                {
+                    json j = 1;
+                    json const k("Hello");
+                    CHECK_THROWS_WITH_AS(j += k, "[json.exception.type_error.308] cannot use push_back() with number", json::type_error&);
+                }
+            }
+        }
+
+        SECTION("to object")
+        {
+            SECTION("null")
+            {
+                json j;
+                j += json::object_t::value_type({"one", 1});
+                j += json::object_t::value_type({"two", 2});
+                CHECK(j.type() == json::value_t::object);
+                CHECK(j.size() == 2);
+                CHECK(j["one"] == json(1));
+                CHECK(j["two"] == json(2));
+            }
+
+            SECTION("object")
+            {
+                json j(json::value_t::object);
+                j += json::object_t::value_type({"one", 1});
+                j += json::object_t::value_type({"two", 2});
+                CHECK(j.size() == 2);
+                CHECK(j["one"] == json(1));
+                CHECK(j["two"] == json(2));
+            }
+
+            SECTION("other type")
+            {
+                json j = 1;
+                json const k("Hello");
+                CHECK_THROWS_WITH_AS(j += json::object_t::value_type({"one", 1}), "[json.exception.type_error.308] cannot use push_back() with number", json::type_error&);
+            }
+        }
+
+        SECTION("with initializer_list")
+        {
+            SECTION("null")
+            {
+                json j;
+                j += {"foo", "bar"};
+                CHECK(j == json::array({{"foo", "bar"}}));
+
+                json k;
+                k += {1, 2, 3};
+                CHECK(k == json::array({{1, 2, 3}}));
+            }
+
+            SECTION("array")
+            {
+                json j = {1, 2, 3};
+                j += {"foo", "bar"};
+                CHECK(j == json({1, 2, 3, {"foo", "bar"}}));
+
+                json k = {1, 2, 3};
+                k += {1, 2, 3};
+                CHECK(k == json({1, 2, 3, {1, 2, 3}}));
+            }
+
+            SECTION("object")
+            {
+                json j = {{"key1", 1}};
+                j += {"key2", "bar"};
+                CHECK(j == json({{"key1", 1}, {"key2", "bar"}}));
+
+                json k = {{"key1", 1}};
+                CHECK_THROWS_WITH_AS((k += {1, 2, 3, 4}), "[json.exception.type_error.308] cannot use push_back() with object", json::type_error&);
+            }
+        }
+    }
+
+    SECTION("insert()")
+    {
+        json j_array = {1, 2, 3, 4};
+        json j_value = 5;
+
+        SECTION("value at position")
+        {
+            SECTION("insert before begin()")
+            {
+                auto it = j_array.insert(j_array.begin(), j_value);
+                CHECK(j_array.size() == 5);
+                CHECK(*it == j_value);
+                CHECK(j_array.begin() == it);
+                CHECK(j_array == json({5, 1, 2, 3, 4}));
+            }
+
+            SECTION("insert in the middle")
+            {
+                auto it = j_array.insert(j_array.begin() + 2, j_value);
+                CHECK(j_array.size() == 5);
+                CHECK(*it == j_value);
+                CHECK((it - j_array.begin()) == 2);
+                CHECK(j_array == json({1, 2, 5, 3, 4}));
+            }
+
+            SECTION("insert before end()")
+            {
+                auto it = j_array.insert(j_array.end(), j_value);
+                CHECK(j_array.size() == 5);
+                CHECK(*it == j_value);
+                CHECK((j_array.end() - it) == 1);
+                CHECK(j_array == json({1, 2, 3, 4, 5}));
+            }
+        }
+
+        SECTION("rvalue at position")
+        {
+            SECTION("insert before begin()")
+            {
+                auto it = j_array.insert(j_array.begin(), 5);
+                CHECK(j_array.size() == 5);
+                CHECK(*it == j_value);
+                CHECK(j_array.begin() == it);
+                CHECK(j_array == json({5, 1, 2, 3, 4}));
+            }
+
+            SECTION("insert in the middle")
+            {
+                auto it = j_array.insert(j_array.begin() + 2, 5);
+                CHECK(j_array.size() == 5);
+                CHECK(*it == j_value);
+                CHECK((it - j_array.begin()) == 2);
+                CHECK(j_array == json({1, 2, 5, 3, 4}));
+            }
+
+            SECTION("insert before end()")
+            {
+                auto it = j_array.insert(j_array.end(), 5);
+                CHECK(j_array.size() == 5);
+                CHECK(*it == j_value);
+                CHECK((j_array.end() - it) == 1);
+                CHECK(j_array == json({1, 2, 3, 4, 5}));
+            }
+        }
+
+        SECTION("copies at position")
+        {
+            SECTION("insert before begin()")
+            {
+                auto it = j_array.insert(j_array.begin(), 3, 5);
+                CHECK(j_array.size() == 7);
+                CHECK(*it == j_value);
+                CHECK(j_array.begin() == it);
+                CHECK(j_array == json({5, 5, 5, 1, 2, 3, 4}));
+            }
+
+            SECTION("insert in the middle")
+            {
+                auto it = j_array.insert(j_array.begin() + 2, 3, 5);
+                CHECK(j_array.size() == 7);
+                CHECK(*it == j_value);
+                CHECK((it - j_array.begin()) == 2);
+                CHECK(j_array == json({1, 2, 5, 5, 5, 3, 4}));
+            }
+
+            SECTION("insert before end()")
+            {
+                auto it = j_array.insert(j_array.end(), 3, 5);
+                CHECK(j_array.size() == 7);
+                CHECK(*it == j_value);
+                CHECK((j_array.end() - it) == 3);
+                CHECK(j_array == json({1, 2, 3, 4, 5, 5, 5}));
+            }
+
+            SECTION("insert nothing (count = 0)")
+            {
+                auto it = j_array.insert(j_array.end(), 0, 5);
+                CHECK(j_array.size() == 4);
+                // the returned iterator points to the first inserted element;
+                // there were 4 elements, so it should point to the 5th
+                CHECK(it == j_array.begin() + 4);
+                CHECK(j_array == json({1, 2, 3, 4}));
+            }
+        }
+
+        SECTION("range for array")
+        {
+            json j_other_array = {"first", "second"};
+
+            SECTION("proper usage")
+            {
+                auto it = j_array.insert(j_array.end(), j_other_array.begin(), j_other_array.end());
+                CHECK(j_array.size() == 6);
+                CHECK(*it == *j_other_array.begin());
+                CHECK((j_array.end() - it) == 2);
+                CHECK(j_array == json({1, 2, 3, 4, "first", "second"}));
+            }
+
+            SECTION("empty range")
+            {
+                auto it = j_array.insert(j_array.end(), j_other_array.begin(), j_other_array.begin());
+                CHECK(j_array.size() == 4);
+                CHECK(it == j_array.end());
+                CHECK(j_array == json({1, 2, 3, 4}));
+            }
+
+            SECTION("invalid iterators")
+            {
+                json j_other_array2 = {"first", "second"};
+
+                CHECK_THROWS_WITH_AS(j_array.insert(j_array.end(), j_array.begin(), j_array.end()), "[json.exception.invalid_iterator.211] passed iterators may not belong to container",
+                                     json::invalid_iterator&);
+                CHECK_THROWS_WITH_AS(j_array.insert(j_array.end(), j_other_array.begin(), j_other_array2.end()), "[json.exception.invalid_iterator.210] iterators do not fit",
+                                     json::invalid_iterator&);
+            }
+        }
+
+        SECTION("range for object")
+        {
+            json j_object1 = {{"one", "eins"}, {"two", "zwei"}};
+            json j_object2 = {{"eleven", "elf"}, {"seventeen", "siebzehn"}};
+
+            SECTION("proper usage")
+            {
+                j_object1.insert(j_object2.begin(), j_object2.end());
+                CHECK(j_object1.size() == 4);
+            }
+
+            SECTION("empty range")
+            {
+                j_object1.insert(j_object2.begin(), j_object2.begin());
+                CHECK(j_object1.size() == 2);
+            }
+
+            SECTION("invalid iterators")
+            {
+                json const j_other_array2 = {"first", "second"};
+
+                CHECK_THROWS_WITH_AS(j_array.insert(j_object2.begin(), j_object2.end()), "[json.exception.type_error.309] cannot use insert() with array", json::type_error&);
+                CHECK_THROWS_WITH_AS(j_object1.insert(j_object1.begin(), j_object2.end()), "[json.exception.invalid_iterator.210] iterators do not fit", json::invalid_iterator&);
+                CHECK_THROWS_WITH_AS(j_object1.insert(j_array.begin(), j_array.end()), "[json.exception.invalid_iterator.202] iterators first and last must point to objects", json::invalid_iterator&);
+            }
+        }
+
+        SECTION("initializer list at position")
+        {
+            SECTION("insert before begin()")
+            {
+                auto it = j_array.insert(j_array.begin(), {7, 8, 9});
+                CHECK(j_array.size() == 7);
+                CHECK(*it == json(7));
+                CHECK(j_array.begin() == it);
+                CHECK(j_array == json({7, 8, 9, 1, 2, 3, 4}));
+            }
+
+            SECTION("insert in the middle")
+            {
+                auto it = j_array.insert(j_array.begin() + 2, {7, 8, 9});
+                CHECK(j_array.size() == 7);
+                CHECK(*it == json(7));
+                CHECK((it - j_array.begin()) == 2);
+                CHECK(j_array == json({1, 2, 7, 8, 9, 3, 4}));
+            }
+
+            SECTION("insert before end()")
+            {
+                auto it = j_array.insert(j_array.end(), {7, 8, 9});
+                CHECK(j_array.size() == 7);
+                CHECK(*it == json(7));
+                CHECK((j_array.end() - it) == 3);
+                CHECK(j_array == json({1, 2, 3, 4, 7, 8, 9}));
+            }
+        }
+
+        SECTION("invalid iterator")
+        {
+            // pass iterator to a different array
+            json j_another_array = {1, 2};
+            json j_yet_another_array = {"first", "second"};
+            CHECK_THROWS_WITH_AS(j_array.insert(j_another_array.end(), 10), "[json.exception.invalid_iterator.202] iterator does not fit current value", json::invalid_iterator&);
+            CHECK_THROWS_WITH_AS(j_array.insert(j_another_array.end(), j_value), "[json.exception.invalid_iterator.202] iterator does not fit current value", json::invalid_iterator&);
+            CHECK_THROWS_WITH_AS(j_array.insert(j_another_array.end(), 10, 11), "[json.exception.invalid_iterator.202] iterator does not fit current value", json::invalid_iterator&);
+            CHECK_THROWS_WITH_AS(j_array.insert(j_another_array.end(), j_yet_another_array.begin(), j_yet_another_array.end()), "[json.exception.invalid_iterator.202] iterator does not fit current value", json::invalid_iterator&);
+            CHECK_THROWS_WITH_AS(j_array.insert(j_another_array.end(), {1, 2, 3, 4}), "[json.exception.invalid_iterator.202] iterator does not fit current value", json::invalid_iterator&);
+        }
+
+        SECTION("non-array type")
+        {
+            // call insert on a non-array type
+            json j_nonarray = 3;
+            json j_yet_another_array = {"first", "second"};
+            CHECK_THROWS_WITH_AS(j_nonarray.insert(j_nonarray.end(), 10), "[json.exception.type_error.309] cannot use insert() with number", json::type_error&);
+            CHECK_THROWS_WITH_AS(j_nonarray.insert(j_nonarray.end(), j_value), "[json.exception.type_error.309] cannot use insert() with number", json::type_error&);
+            CHECK_THROWS_WITH_AS(j_nonarray.insert(j_nonarray.end(), 10, 11), "[json.exception.type_error.309] cannot use insert() with number", json::type_error&);
+            CHECK_THROWS_WITH_AS(j_nonarray.insert(j_nonarray.end(), j_yet_another_array.begin(), j_yet_another_array.end()), "[json.exception.type_error.309] cannot use insert() with number", json::type_error&);
+            CHECK_THROWS_WITH_AS(j_nonarray.insert(j_nonarray.end(), {1, 2, 3, 4}), "[json.exception.type_error.309] cannot use insert() with number", json::type_error&);
+        }
+    }
+
+    SECTION("update()")
+    {
+        SECTION("non-recursive (default)")
+        {
+            json j_object1 = {{"one", "eins"}, {"two", "zwei"}};
+            json j_object2 = {{"three", "drei"}, {"two", "zwo"}};
+            json j_array = {1, 2, 3, 4};
+
+            SECTION("const reference")
+            {
+                SECTION("proper usage")
+                {
+                    j_object1.update(j_object2);
+                    CHECK(j_object1 == json({{"one", "eins"}, {"two", "zwo"}, {"three", "drei"}}));
+
+                    json j_null;
+                    j_null.update(j_object2);
+                    CHECK(j_null == j_object2);
+                }
+
+                SECTION("wrong types")
+                {
+                    CHECK_THROWS_WITH_AS(j_array.update(j_object1), "[json.exception.type_error.312] cannot use update() with array", json::type_error&);
+
+                    CHECK_THROWS_WITH_AS(j_object1.update(j_array), "[json.exception.type_error.312] cannot use update() with array", json::type_error&);
+                }
+            }
+
+            SECTION("iterator range")
+            {
+                SECTION("proper usage")
+                {
+                    j_object1.update(j_object2.begin(), j_object2.end());
+                    CHECK(j_object1 == json({{"one", "eins"}, {"two", "zwo"}, {"three", "drei"}}));
+
+                    json j_null;
+                    j_null.update(j_object2.begin(), j_object2.end());
+                    CHECK(j_null == j_object2);
+                }
+
+                SECTION("empty range")
+                {
+                    j_object1.update(j_object2.begin(), j_object2.begin());
+                    CHECK(j_object1 == json({{"one", "eins"}, {"two", "zwei"}}));
+                }
+
+                SECTION("invalid iterators")
+                {
+                    json const j_other_array2 = {"first", "second"};
+
+                    CHECK_THROWS_WITH_AS(j_array.update(j_object2.begin(), j_object2.end()), "[json.exception.type_error.312] cannot use update() with array", json::type_error&);
+                    CHECK_THROWS_WITH_AS(j_object1.update(j_object1.begin(), j_object2.end()), "[json.exception.invalid_iterator.210] iterators do not fit", json::invalid_iterator&);
+                    CHECK_THROWS_WITH_AS(j_object1.update(j_array.begin(), j_array.end()), "[json.exception.type_error.312] cannot use update() with array", json::type_error&);
+                }
+            }
+        }
+
+        SECTION("recursive")
+        {
+            SECTION("const reference")
+            {
+                SECTION("extend object")
+                {
+                    json j1 = {{"string", "s"}, {"numbers", {{"one", 1}}}};
+                    json const j2 = {{"string", "t"}, {"numbers", {{"two", 2}}}};
+                    j1.update(j2, true);
+                    CHECK(j1 == json({{"string", "t"}, {"numbers", {{"one", 1}, {"two", 2}}}}));
+                }
+
+                SECTION("replace object")
+                {
+                    json j1 = {{"string", "s"}, {"numbers", {{"one", 1}}}};
+                    json const j2 = {{"string", "t"}, {"numbers", 1}};
+                    j1.update(j2, true);
+                    CHECK(j1 == json({{"string", "t"}, {"numbers", 1}}));
+                }
+            }
+        }
+    }
+
+    SECTION("swap()")
+    {
+        SECTION("json")
+        {
+            SECTION("member swap")
+            {
+                json j("hello world");
+                json k(42.23);
+
+                j.swap(k);
+
+                CHECK(j == json(42.23));
+                CHECK(k == json("hello world"));
+            }
+
+            SECTION("nonmember swap")
+            {
+                json j("hello world");
+                json k(42.23);
+
+                using std::swap;
+                swap(j, k);
+
+                CHECK(j == json(42.23));
+                CHECK(k == json("hello world"));
+            }
+        }
+
+        SECTION("array_t")
+        {
+            SECTION("array_t type")
+            {
+                json j = {1, 2, 3, 4};
+                json::array_t a = {"foo", "bar", "baz"};
+
+                j.swap(a);
+
+                CHECK(j == json({"foo", "bar", "baz"}));
+
+                j.swap(a);
+
+                CHECK(j == json({1, 2, 3, 4}));
+            }
+
+            SECTION("non-array_t type")
+            {
+                json j = 17;
+                json::array_t a = {"foo", "bar", "baz"};
+
+                CHECK_THROWS_WITH_AS(j.swap(a), "[json.exception.type_error.310] cannot use swap(array_t&) with number", json::type_error&);
+            }
+        }
+
+        SECTION("object_t")
+        {
+            SECTION("object_t type")
+            {
+                json j = {{"one", 1}, {"two", 2}};
+                json::object_t o = {{"cow", "Kuh"}, {"chicken", "Huhn"}};
+
+                j.swap(o);
+
+                CHECK(j == json({{"cow", "Kuh"}, {"chicken", "Huhn"}}));
+
+                j.swap(o);
+
+                CHECK(j == json({{"one", 1}, {"two", 2}}));
+            }
+
+            SECTION("non-object_t type")
+            {
+                json j = 17;
+                json::object_t o = {{"cow", "Kuh"}, {"chicken", "Huhn"}};
+
+                CHECK_THROWS_WITH_AS(j.swap(o), "[json.exception.type_error.310] cannot use swap(object_t&) with number", json::type_error&);
+            }
+        }
+
+        SECTION("string_t")
+        {
+            SECTION("string_t type")
+            {
+                json j = "Hello world";
+                json::string_t s = "Hallo Welt";
+
+                j.swap(s);
+
+                CHECK(j == json("Hallo Welt"));
+
+                j.swap(s);
+
+                CHECK(j == json("Hello world"));
+            }
+
+            SECTION("non-string_t type")
+            {
+                json j = 17;
+                json::string_t s = "Hallo Welt";
+
+                CHECK_THROWS_WITH_AS(j.swap(s), "[json.exception.type_error.310] cannot use swap(string_t&) with number", json::type_error&);
+            }
+        }
+
+        SECTION("binary_t")
+        {
+            SECTION("binary_t type")
+            {
+                json j = json::binary({1, 2, 3, 4});
+                json::binary_t s = {{5, 6, 7, 8}};
+
+                j.swap(s);
+
+                CHECK(j == json::binary({5, 6, 7, 8}));
+
+                j.swap(s);
+
+                CHECK(j == json::binary({1, 2, 3, 4}));
+            }
+
+            SECTION("binary_t::container_type type")
+            {
+                json j = json::binary({1, 2, 3, 4});
+                std::vector<std::uint8_t> s = {{5, 6, 7, 8}};
+
+                j.swap(s);
+
+                CHECK(j == json::binary({5, 6, 7, 8}));
+
+                j.swap(s);
+
+                CHECK(j == json::binary({1, 2, 3, 4}));
+            }
+
+            SECTION("non-binary_t type")
+            {
+                json j = 17;
+                json::binary_t s1 = {{1, 2, 3, 4}};
+                std::vector<std::uint8_t> s2 = {{5, 6, 7, 8}};
+
+                CHECK_THROWS_WITH_AS(j.swap(s1), "[json.exception.type_error.310] cannot use swap(binary_t&) with number", json::type_error);
+                CHECK_THROWS_WITH_AS(j.swap(s2), "[json.exception.type_error.310] cannot use swap(binary_t::container_type&) with number", json::type_error);
+            }
+        }
+    }
+}
diff --git a/external_imported/json/tests/src/unit-msgpack.cpp b/external_imported/json/tests/src/unit-msgpack.cpp
new file mode 100644
index 000000000..61162afae
--- /dev/null
+++ b/external_imported/json/tests/src/unit-msgpack.cpp
@@ -0,0 +1,1866 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+#include <nlohmann/json.hpp>
+using nlohmann::json;
+#ifdef JSON_TEST_NO_GLOBAL_UDLS
+    using namespace nlohmann::literals; // NOLINT(google-build-using-namespace)
+#endif
+
+#include <fstream>
+#include <sstream>
+#include <iomanip>
+#include <limits>
+#include <set>
+#include "make_test_data_available.hpp"
+#include "test_utils.hpp"
+
+namespace
+{
+class SaxCountdown
+{
+  public:
+    explicit SaxCountdown(const int count) : events_left(count)
+    {}
+
+    bool null()
+    {
+        return events_left-- > 0;
+    }
+
+    bool boolean(bool /*unused*/)
+    {
+        return events_left-- > 0;
+    }
+
+    bool number_integer(json::number_integer_t /*unused*/)
+    {
+        return events_left-- > 0;
+    }
+
+    bool number_unsigned(json::number_unsigned_t /*unused*/)
+    {
+        return events_left-- > 0;
+    }
+
+    bool number_float(json::number_float_t /*unused*/, const std::string& /*unused*/)
+    {
+        return events_left-- > 0;
+    }
+
+    bool string(std::string& /*unused*/)
+    {
+        return events_left-- > 0;
+    }
+
+    bool binary(std::vector<std::uint8_t>& /*unused*/)
+    {
+        return events_left-- > 0;
+    }
+
+    bool start_object(std::size_t /*unused*/)
+    {
+        return events_left-- > 0;
+    }
+
+    bool key(std::string& /*unused*/)
+    {
+        return events_left-- > 0;
+    }
+
+    bool end_object()
+    {
+        return events_left-- > 0;
+    }
+
+    bool start_array(std::size_t /*unused*/)
+    {
+        return events_left-- > 0;
+    }
+
+    bool end_array()
+    {
+        return events_left-- > 0;
+    }
+
+    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/, const json::exception& /*unused*/) // NOLINT(readability-convert-member-functions-to-static)
+    {
+        return false;
+    }
+
+  private:
+    int events_left = 0;
+};
+} // namespace
+
+TEST_CASE("MessagePack")
+{
+    SECTION("individual values")
+    {
+        SECTION("discarded")
+        {
+            // discarded values are not serialized
+            json const j = json::value_t::discarded;
+            const auto result = json::to_msgpack(j);
+            CHECK(result.empty());
+        }
+
+        SECTION("null")
+        {
+            json const j = nullptr;
+            std::vector<uint8_t> const expected = {0xc0};
+            const auto result = json::to_msgpack(j);
+            CHECK(result == expected);
+
+            // roundtrip
+            CHECK(json::from_msgpack(result) == j);
+            CHECK(json::from_msgpack(result, true, false) == j);
+        }
+
+        SECTION("boolean")
+        {
+            SECTION("true")
+            {
+                json const j = true;
+                std::vector<uint8_t> const expected = {0xc3};
+                const auto result = json::to_msgpack(j);
+                CHECK(result == expected);
+
+                // roundtrip
+                CHECK(json::from_msgpack(result) == j);
+                CHECK(json::from_msgpack(result, true, false) == j);
+            }
+
+            SECTION("false")
+            {
+                json const j = false;
+                std::vector<uint8_t> const expected = {0xc2};
+                const auto result = json::to_msgpack(j);
+                CHECK(result == expected);
+
+                // roundtrip
+                CHECK(json::from_msgpack(result) == j);
+                CHECK(json::from_msgpack(result, true, false) == j);
+            }
+        }
+
+        SECTION("number")
+        {
+            SECTION("signed")
+            {
+                SECTION("-32..-1 (negative fixnum)")
+                {
+                    for (auto i = -32; i <= -1; ++i)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        json const j = i;
+
+                        // check type
+                        CHECK(j.is_number_integer());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            static_cast<uint8_t>(i)
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_msgpack(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 1);
+
+                        // check individual bytes
+                        CHECK(static_cast<int8_t>(result[0]) == i);
+
+                        // roundtrip
+                        CHECK(json::from_msgpack(result) == j);
+                        CHECK(json::from_msgpack(result, true, false) == j);
+                    }
+                }
+
+                SECTION("0..127 (positive fixnum)")
+                {
+                    for (size_t i = 0; i <= 127; ++i)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        json j = -1;
+                        j.get_ref<json::number_integer_t&>() = static_cast<json::number_integer_t>(i);
+
+                        // check type
+                        CHECK(j.is_number_integer());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected{static_cast<uint8_t>(i)};
+
+                        // compare result + size
+                        const auto result = json::to_msgpack(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 1);
+
+                        // check individual bytes
+                        CHECK(result[0] == i);
+
+                        // roundtrip
+                        CHECK(json::from_msgpack(result) == j);
+                        CHECK(json::from_msgpack(result, true, false) == j);
+                    }
+                }
+
+                SECTION("128..255 (int 8)")
+                {
+                    for (size_t i = 128; i <= 255; ++i)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        json j = -1;
+                        j.get_ref<json::number_integer_t&>() = static_cast<json::number_integer_t>(i);
+
+                        // check type
+                        CHECK(j.is_number_integer());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            0xcc,
+                            static_cast<uint8_t>(i),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_msgpack(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 2);
+
+                        // check individual bytes
+                        CHECK(result[0] == 0xcc);
+                        auto const restored = static_cast<uint8_t>(result[1]);
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_msgpack(result) == j);
+                        CHECK(json::from_msgpack(result, true, false) == j);
+                    }
+                }
+
+                SECTION("256..65535 (int 16)")
+                {
+                    for (size_t i = 256; i <= 65535; ++i)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        json j = -1;
+                        j.get_ref<json::number_integer_t&>() = static_cast<json::number_integer_t>(i);
+
+                        // check type
+                        CHECK(j.is_number_integer());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            0xcd,
+                            static_cast<uint8_t>((i >> 8) & 0xff),
+                            static_cast<uint8_t>(i & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_msgpack(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 3);
+
+                        // check individual bytes
+                        CHECK(result[0] == 0xcd);
+                        auto const restored = static_cast<uint16_t>(static_cast<uint8_t>(result[1]) * 256 + static_cast<uint8_t>(result[2]));
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_msgpack(result) == j);
+                        CHECK(json::from_msgpack(result, true, false) == j);
+                    }
+                }
+
+                SECTION("65536..4294967295 (int 32)")
+                {
+                    for (uint32_t i :
+                            {
+                                65536u, 77777u, 1048576u, 4294967295u
+                            })
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        json j = -1;
+                        j.get_ref<json::number_integer_t&>() = static_cast<json::number_integer_t>(i);
+
+                        // check type
+                        CHECK(j.is_number_integer());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            0xce,
+                            static_cast<uint8_t>((i >> 24) & 0xff),
+                            static_cast<uint8_t>((i >> 16) & 0xff),
+                            static_cast<uint8_t>((i >> 8) & 0xff),
+                            static_cast<uint8_t>(i & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_msgpack(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 5);
+
+                        // check individual bytes
+                        CHECK(result[0] == 0xce);
+                        uint32_t const restored = (static_cast<uint32_t>(result[1]) << 030) +
+                                                  (static_cast<uint32_t>(result[2]) << 020) +
+                                                  (static_cast<uint32_t>(result[3]) << 010) +
+                                                  static_cast<uint32_t>(result[4]);
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_msgpack(result) == j);
+                        CHECK(json::from_msgpack(result, true, false) == j);
+                    }
+                }
+
+                SECTION("4294967296..9223372036854775807 (int 64)")
+                {
+                    for (uint64_t i :
+                            {
+                                4294967296LU, 9223372036854775807LU
+                            })
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        json j = -1;
+                        j.get_ref<json::number_integer_t&>() = static_cast<json::number_integer_t>(i);
+
+                        // check type
+                        CHECK(j.is_number_integer());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            0xcf,
+                            static_cast<uint8_t>((i >> 070) & 0xff),
+                            static_cast<uint8_t>((i >> 060) & 0xff),
+                            static_cast<uint8_t>((i >> 050) & 0xff),
+                            static_cast<uint8_t>((i >> 040) & 0xff),
+                            static_cast<uint8_t>((i >> 030) & 0xff),
+                            static_cast<uint8_t>((i >> 020) & 0xff),
+                            static_cast<uint8_t>((i >> 010) & 0xff),
+                            static_cast<uint8_t>(i & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_msgpack(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 9);
+
+                        // check individual bytes
+                        CHECK(result[0] == 0xcf);
+                        uint64_t const restored = (static_cast<uint64_t>(result[1]) << 070) +
+                                                  (static_cast<uint64_t>(result[2]) << 060) +
+                                                  (static_cast<uint64_t>(result[3]) << 050) +
+                                                  (static_cast<uint64_t>(result[4]) << 040) +
+                                                  (static_cast<uint64_t>(result[5]) << 030) +
+                                                  (static_cast<uint64_t>(result[6]) << 020) +
+                                                  (static_cast<uint64_t>(result[7]) << 010) +
+                                                  static_cast<uint64_t>(result[8]);
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_msgpack(result) == j);
+                        CHECK(json::from_msgpack(result, true, false) == j);
+                    }
+                }
+
+                SECTION("-128..-33 (int 8)")
+                {
+                    for (auto i = -128; i <= -33; ++i)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        json const j = i;
+
+                        // check type
+                        CHECK(j.is_number_integer());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            0xd0,
+                            static_cast<uint8_t>(i),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_msgpack(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 2);
+
+                        // check individual bytes
+                        CHECK(result[0] == 0xd0);
+                        CHECK(static_cast<int8_t>(result[1]) == i);
+
+                        // roundtrip
+                        CHECK(json::from_msgpack(result) == j);
+                        CHECK(json::from_msgpack(result, true, false) == j);
+                    }
+                }
+
+                SECTION("-9263 (int 16)")
+                {
+                    json const j = -9263;
+                    std::vector<uint8_t> const expected = {0xd1, 0xdb, 0xd1};
+
+                    const auto result = json::to_msgpack(j);
+                    CHECK(result == expected);
+
+                    auto const restored = static_cast<int16_t>((result[1] << 8) + result[2]);
+                    CHECK(restored == -9263);
+
+                    // roundtrip
+                    CHECK(json::from_msgpack(result) == j);
+                    CHECK(json::from_msgpack(result, true, false) == j);
+                }
+
+                SECTION("-32768..-129 (int 16)")
+                {
+                    for (int16_t i = -32768; i <= static_cast<std::int16_t>(-129); ++i)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        json const j = i;
+
+                        // check type
+                        CHECK(j.is_number_integer());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            0xd1,
+                            static_cast<uint8_t>((i >> 8) & 0xff),
+                            static_cast<uint8_t>(i & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_msgpack(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 3);
+
+                        // check individual bytes
+                        CHECK(result[0] == 0xd1);
+                        auto const restored = static_cast<int16_t>((result[1] << 8) + result[2]);
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_msgpack(result) == j);
+                        CHECK(json::from_msgpack(result, true, false) == j);
+                    }
+                }
+
+                SECTION("-32769..-2147483648")
+                {
+                    std::vector<int32_t> const numbers
+                    {
+                        -32769,
+                            -65536,
+                            -77777,
+                            -1048576,
+                            -2147483648LL,
+                        };
+                    for (auto i : numbers)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        json const j = i;
+
+                        // check type
+                        CHECK(j.is_number_integer());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            0xd2,
+                            static_cast<uint8_t>((i >> 24) & 0xff),
+                            static_cast<uint8_t>((i >> 16) & 0xff),
+                            static_cast<uint8_t>((i >> 8) & 0xff),
+                            static_cast<uint8_t>(i & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_msgpack(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 5);
+
+                        // check individual bytes
+                        CHECK(result[0] == 0xd2);
+                        uint32_t const restored = (static_cast<uint32_t>(result[1]) << 030) +
+                                                  (static_cast<uint32_t>(result[2]) << 020) +
+                                                  (static_cast<uint32_t>(result[3]) << 010) +
+                                                  static_cast<uint32_t>(result[4]);
+                        CHECK(static_cast<std::int32_t>(restored) == i);
+
+                        // roundtrip
+                        CHECK(json::from_msgpack(result) == j);
+                        CHECK(json::from_msgpack(result, true, false) == j);
+                    }
+                }
+
+                SECTION("-9223372036854775808..-2147483649 (int 64)")
+                {
+                    std::vector<int64_t> const numbers
+                    {
+                        (std::numeric_limits<int64_t>::min)(),
+                        -2147483649LL,
+                    };
+                    for (auto i : numbers)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with unsigned integer number
+                        json const j = i;
+
+                        // check type
+                        CHECK(j.is_number_integer());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            0xd3,
+                            static_cast<uint8_t>((i >> 070) & 0xff),
+                            static_cast<uint8_t>((i >> 060) & 0xff),
+                            static_cast<uint8_t>((i >> 050) & 0xff),
+                            static_cast<uint8_t>((i >> 040) & 0xff),
+                            static_cast<uint8_t>((i >> 030) & 0xff),
+                            static_cast<uint8_t>((i >> 020) & 0xff),
+                            static_cast<uint8_t>((i >> 010) & 0xff),
+                            static_cast<uint8_t>(i & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_msgpack(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 9);
+
+                        // check individual bytes
+                        CHECK(result[0] == 0xd3);
+                        int64_t const restored = (static_cast<int64_t>(result[1]) << 070) +
+                                                 (static_cast<int64_t>(result[2]) << 060) +
+                                                 (static_cast<int64_t>(result[3]) << 050) +
+                                                 (static_cast<int64_t>(result[4]) << 040) +
+                                                 (static_cast<int64_t>(result[5]) << 030) +
+                                                 (static_cast<int64_t>(result[6]) << 020) +
+                                                 (static_cast<int64_t>(result[7]) << 010) +
+                                                 static_cast<int64_t>(result[8]);
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_msgpack(result) == j);
+                        CHECK(json::from_msgpack(result, true, false) == j);
+                    }
+                }
+            }
+
+            SECTION("unsigned")
+            {
+                SECTION("0..127 (positive fixnum)")
+                {
+                    for (size_t i = 0; i <= 127; ++i)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with unsigned integer number
+                        json const j = i;
+
+                        // check type
+                        CHECK(j.is_number_unsigned());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected{static_cast<uint8_t>(i)};
+
+                        // compare result + size
+                        const auto result = json::to_msgpack(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 1);
+
+                        // check individual bytes
+                        CHECK(result[0] == i);
+
+                        // roundtrip
+                        CHECK(json::from_msgpack(result) == j);
+                        CHECK(json::from_msgpack(result, true, false) == j);
+                    }
+                }
+
+                SECTION("128..255 (uint 8)")
+                {
+                    for (size_t i = 128; i <= 255; ++i)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with unsigned integer number
+                        json const j = i;
+
+                        // check type
+                        CHECK(j.is_number_unsigned());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            0xcc,
+                            static_cast<uint8_t>(i),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_msgpack(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 2);
+
+                        // check individual bytes
+                        CHECK(result[0] == 0xcc);
+                        auto const restored = static_cast<uint8_t>(result[1]);
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_msgpack(result) == j);
+                        CHECK(json::from_msgpack(result, true, false) == j);
+                    }
+                }
+
+                SECTION("256..65535 (uint 16)")
+                {
+                    for (size_t i = 256; i <= 65535; ++i)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with unsigned integer number
+                        json const j = i;
+
+                        // check type
+                        CHECK(j.is_number_unsigned());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            0xcd,
+                            static_cast<uint8_t>((i >> 8) & 0xff),
+                            static_cast<uint8_t>(i & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_msgpack(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 3);
+
+                        // check individual bytes
+                        CHECK(result[0] == 0xcd);
+                        auto const restored = static_cast<uint16_t>(static_cast<uint8_t>(result[1]) * 256 + static_cast<uint8_t>(result[2]));
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_msgpack(result) == j);
+                        CHECK(json::from_msgpack(result, true, false) == j);
+                    }
+                }
+
+                SECTION("65536..4294967295 (uint 32)")
+                {
+                    for (const uint32_t i :
+                            {
+                                65536u, 77777u, 1048576u, 4294967295u
+                            })
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with unsigned integer number
+                        json const j = i;
+
+                        // check type
+                        CHECK(j.is_number_unsigned());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            0xce,
+                            static_cast<uint8_t>((i >> 24) & 0xff),
+                            static_cast<uint8_t>((i >> 16) & 0xff),
+                            static_cast<uint8_t>((i >> 8) & 0xff),
+                            static_cast<uint8_t>(i & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_msgpack(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 5);
+
+                        // check individual bytes
+                        CHECK(result[0] == 0xce);
+                        uint32_t const restored = (static_cast<uint32_t>(result[1]) << 030) +
+                                                  (static_cast<uint32_t>(result[2]) << 020) +
+                                                  (static_cast<uint32_t>(result[3]) << 010) +
+                                                  static_cast<uint32_t>(result[4]);
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_msgpack(result) == j);
+                        CHECK(json::from_msgpack(result, true, false) == j);
+                    }
+                }
+
+                SECTION("4294967296..18446744073709551615 (uint 64)")
+                {
+                    for (const uint64_t i :
+                            {
+                                4294967296LU, 18446744073709551615LU
+                            })
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with unsigned integer number
+                        json const j = i;
+
+                        // check type
+                        CHECK(j.is_number_unsigned());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            0xcf,
+                            static_cast<uint8_t>((i >> 070) & 0xff),
+                            static_cast<uint8_t>((i >> 060) & 0xff),
+                            static_cast<uint8_t>((i >> 050) & 0xff),
+                            static_cast<uint8_t>((i >> 040) & 0xff),
+                            static_cast<uint8_t>((i >> 030) & 0xff),
+                            static_cast<uint8_t>((i >> 020) & 0xff),
+                            static_cast<uint8_t>((i >> 010) & 0xff),
+                            static_cast<uint8_t>(i & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_msgpack(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 9);
+
+                        // check individual bytes
+                        CHECK(result[0] == 0xcf);
+                        uint64_t const restored = (static_cast<uint64_t>(result[1]) << 070) +
+                                                  (static_cast<uint64_t>(result[2]) << 060) +
+                                                  (static_cast<uint64_t>(result[3]) << 050) +
+                                                  (static_cast<uint64_t>(result[4]) << 040) +
+                                                  (static_cast<uint64_t>(result[5]) << 030) +
+                                                  (static_cast<uint64_t>(result[6]) << 020) +
+                                                  (static_cast<uint64_t>(result[7]) << 010) +
+                                                  static_cast<uint64_t>(result[8]);
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_msgpack(result) == j);
+                        CHECK(json::from_msgpack(result, true, false) == j);
+                    }
+                }
+            }
+
+            SECTION("float")
+            {
+                SECTION("3.1415925")
+                {
+                    double const v = 3.1415925;
+                    json const j = v;
+                    std::vector<uint8_t> const expected =
+                    {
+                        0xcb, 0x40, 0x09, 0x21, 0xfb, 0x3f, 0xa6, 0xde, 0xfc
+                    };
+                    const auto result = json::to_msgpack(j);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_msgpack(result) == j);
+                    CHECK(json::from_msgpack(result) == v);
+                    CHECK(json::from_msgpack(result, true, false) == j);
+                }
+
+                SECTION("1.0")
+                {
+                    double const v = 1.0;
+                    json const j = v;
+                    std::vector<uint8_t> const expected =
+                    {
+                        0xca, 0x3f, 0x80, 0x00, 0x00
+                    };
+                    const auto result = json::to_msgpack(j);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_msgpack(result) == j);
+                    CHECK(json::from_msgpack(result) == v);
+                    CHECK(json::from_msgpack(result, true, false) == j);
+                }
+
+                SECTION("128.128")
+                {
+                    double const v = 128.1280059814453125;
+                    json const j = v;
+                    std::vector<uint8_t> const expected =
+                    {
+                        0xca, 0x43, 0x00, 0x20, 0xc5
+                    };
+                    const auto result = json::to_msgpack(j);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_msgpack(result) == j);
+                    CHECK(json::from_msgpack(result) == v);
+                    CHECK(json::from_msgpack(result, true, false) == j);
+                }
+            }
+        }
+
+        SECTION("string")
+        {
+            SECTION("N = 0..31")
+            {
+                // explicitly enumerate the first byte for all 32 strings
+                const std::vector<uint8_t> first_bytes =
+                {
+                    0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8,
+                    0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1,
+                    0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba,
+                    0xbb, 0xbc, 0xbd, 0xbe, 0xbf
+                };
+
+                for (size_t N = 0; N < first_bytes.size(); ++N)
+                {
+                    CAPTURE(N)
+
+                    // create JSON value with string containing of N * 'x'
+                    const auto s = std::string(N, 'x');
+                    json const j = s;
+
+                    // create expected byte vector
+                    std::vector<uint8_t> expected;
+                    expected.push_back(first_bytes[N]);
+                    for (size_t i = 0; i < N; ++i)
+                    {
+                        expected.push_back('x');
+                    }
+
+                    // check first byte
+                    CHECK((first_bytes[N] & 0x1f) == N);
+
+                    // compare result + size
+                    const auto result = json::to_msgpack(j);
+                    CHECK(result == expected);
+                    CHECK(result.size() == N + 1);
+                    // check that no null byte is appended
+                    if (N > 0)
+                    {
+                        CHECK(result.back() != '\x00');
+                    }
+
+                    // roundtrip
+                    CHECK(json::from_msgpack(result) == j);
+                    CHECK(json::from_msgpack(result, true, false) == j);
+                }
+            }
+
+            SECTION("N = 32..255")
+            {
+                for (size_t N = 32; N <= 255; ++N)
+                {
+                    CAPTURE(N)
+
+                    // create JSON value with string containing of N * 'x'
+                    const auto s = std::string(N, 'x');
+                    json const j = s;
+
+                    // create expected byte vector
+                    std::vector<uint8_t> expected;
+                    expected.push_back(0xd9);
+                    expected.push_back(static_cast<uint8_t>(N));
+                    for (size_t i = 0; i < N; ++i)
+                    {
+                        expected.push_back('x');
+                    }
+
+                    // compare result + size
+                    const auto result = json::to_msgpack(j);
+                    CHECK(result == expected);
+                    CHECK(result.size() == N + 2);
+                    // check that no null byte is appended
+                    CHECK(result.back() != '\x00');
+
+                    // roundtrip
+                    CHECK(json::from_msgpack(result) == j);
+                    CHECK(json::from_msgpack(result, true, false) == j);
+                }
+            }
+
+            SECTION("N = 256..65535")
+            {
+                for (size_t N :
+                        {
+                            256u, 999u, 1025u, 3333u, 2048u, 65535u
+                        })
+                {
+                    CAPTURE(N)
+
+                    // create JSON value with string containing of N * 'x'
+                    const auto s = std::string(N, 'x');
+                    json const j = s;
+
+                    // create expected byte vector (hack: create string first)
+                    std::vector<uint8_t> expected(N, 'x');
+                    // reverse order of commands, because we insert at begin()
+                    expected.insert(expected.begin(), static_cast<uint8_t>(N & 0xff));
+                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 8) & 0xff));
+                    expected.insert(expected.begin(), 0xda);
+
+                    // compare result + size
+                    const auto result = json::to_msgpack(j);
+                    CHECK(result == expected);
+                    CHECK(result.size() == N + 3);
+                    // check that no null byte is appended
+                    CHECK(result.back() != '\x00');
+
+                    // roundtrip
+                    CHECK(json::from_msgpack(result) == j);
+                    CHECK(json::from_msgpack(result, true, false) == j);
+                }
+            }
+
+            SECTION("N = 65536..4294967295")
+            {
+                for (size_t N :
+                        {
+                            65536u, 77777u, 1048576u
+                        })
+                {
+                    CAPTURE(N)
+
+                    // create JSON value with string containing of N * 'x'
+                    const auto s = std::string(N, 'x');
+                    json const j = s;
+
+                    // create expected byte vector (hack: create string first)
+                    std::vector<uint8_t> expected(N, 'x');
+                    // reverse order of commands, because we insert at begin()
+                    expected.insert(expected.begin(), static_cast<uint8_t>(N & 0xff));
+                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 8) & 0xff));
+                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 16) & 0xff));
+                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 24) & 0xff));
+                    expected.insert(expected.begin(), 0xdb);
+
+                    // compare result + size
+                    const auto result = json::to_msgpack(j);
+                    CHECK(result == expected);
+                    CHECK(result.size() == N + 5);
+                    // check that no null byte is appended
+                    CHECK(result.back() != '\x00');
+
+                    // roundtrip
+                    CHECK(json::from_msgpack(result) == j);
+                    CHECK(json::from_msgpack(result, true, false) == j);
+                }
+            }
+        }
+
+        SECTION("array")
+        {
+            SECTION("empty")
+            {
+                json const j = json::array();
+                std::vector<uint8_t> const expected = {0x90};
+                const auto result = json::to_msgpack(j);
+                CHECK(result == expected);
+
+                // roundtrip
+                CHECK(json::from_msgpack(result) == j);
+                CHECK(json::from_msgpack(result, true, false) == j);
+            }
+
+            SECTION("[null]")
+            {
+                json const j = {nullptr};
+                std::vector<uint8_t> const expected = {0x91, 0xc0};
+                const auto result = json::to_msgpack(j);
+                CHECK(result == expected);
+
+                // roundtrip
+                CHECK(json::from_msgpack(result) == j);
+                CHECK(json::from_msgpack(result, true, false) == j);
+            }
+
+            SECTION("[1,2,3,4,5]")
+            {
+                json const j = json::parse("[1,2,3,4,5]");
+                std::vector<uint8_t> const expected = {0x95, 0x01, 0x02, 0x03, 0x04, 0x05};
+                const auto result = json::to_msgpack(j);
+                CHECK(result == expected);
+
+                // roundtrip
+                CHECK(json::from_msgpack(result) == j);
+                CHECK(json::from_msgpack(result, true, false) == j);
+            }
+
+            SECTION("[[[[]]]]")
+            {
+                json const j = json::parse("[[[[]]]]");
+                std::vector<uint8_t> const expected = {0x91, 0x91, 0x91, 0x90};
+                const auto result = json::to_msgpack(j);
+                CHECK(result == expected);
+
+                // roundtrip
+                CHECK(json::from_msgpack(result) == j);
+                CHECK(json::from_msgpack(result, true, false) == j);
+            }
+
+            SECTION("array 16")
+            {
+                json j(16, nullptr);
+                std::vector<uint8_t> expected(j.size() + 3, 0xc0); // all null
+                expected[0] = 0xdc; // array 16
+                expected[1] = 0x00; // size (0x0010), byte 0
+                expected[2] = 0x10; // size (0x0010), byte 1
+                const auto result = json::to_msgpack(j);
+                CHECK(result == expected);
+
+                // roundtrip
+                CHECK(json::from_msgpack(result) == j);
+                CHECK(json::from_msgpack(result, true, false) == j);
+            }
+
+            SECTION("array 32")
+            {
+                json j(65536, nullptr);
+                std::vector<uint8_t> expected(j.size() + 5, 0xc0); // all null
+                expected[0] = 0xdd; // array 32
+                expected[1] = 0x00; // size (0x00100000), byte 0
+                expected[2] = 0x01; // size (0x00100000), byte 1
+                expected[3] = 0x00; // size (0x00100000), byte 2
+                expected[4] = 0x00; // size (0x00100000), byte 3
+                const auto result = json::to_msgpack(j);
+                //CHECK(result == expected);
+
+                CHECK(result.size() == expected.size());
+                for (size_t i = 0; i < expected.size(); ++i)
+                {
+                    CAPTURE(i)
+                    CHECK(result[i] == expected[i]);
+                }
+
+                // roundtrip
+                CHECK(json::from_msgpack(result) == j);
+                CHECK(json::from_msgpack(result, true, false) == j);
+            }
+        }
+
+        SECTION("object")
+        {
+            SECTION("empty")
+            {
+                json const j = json::object();
+                std::vector<uint8_t> const expected = {0x80};
+                const auto result = json::to_msgpack(j);
+                CHECK(result == expected);
+
+                // roundtrip
+                CHECK(json::from_msgpack(result) == j);
+                CHECK(json::from_msgpack(result, true, false) == j);
+            }
+
+            SECTION("{\"\":null}")
+            {
+                json const j = {{"", nullptr}};
+                std::vector<uint8_t> const expected = {0x81, 0xa0, 0xc0};
+                const auto result = json::to_msgpack(j);
+                CHECK(result == expected);
+
+                // roundtrip
+                CHECK(json::from_msgpack(result) == j);
+                CHECK(json::from_msgpack(result, true, false) == j);
+            }
+
+            SECTION("{\"a\": {\"b\": {\"c\": {}}}}")
+            {
+                json const j = json::parse(R"({"a": {"b": {"c": {}}}})");
+                std::vector<uint8_t> const expected =
+                {
+                    0x81, 0xa1, 0x61, 0x81, 0xa1, 0x62, 0x81, 0xa1, 0x63, 0x80
+                };
+                const auto result = json::to_msgpack(j);
+                CHECK(result == expected);
+
+                // roundtrip
+                CHECK(json::from_msgpack(result) == j);
+                CHECK(json::from_msgpack(result, true, false) == j);
+            }
+
+            SECTION("map 16")
+            {
+                json const j = R"({"00": null, "01": null, "02": null, "03": null,
+                             "04": null, "05": null, "06": null, "07": null,
+                             "08": null, "09": null, "10": null, "11": null,
+                             "12": null, "13": null, "14": null, "15": null})"_json;
+
+                const auto result = json::to_msgpack(j);
+
+                // Checking against an expected vector byte by byte is
+                // difficult, because no assumption on the order of key/value
+                // pairs are made. We therefore only check the prefix (type and
+                // size) and the overall size. The rest is then handled in the
+                // roundtrip check.
+                CHECK(result.size() == 67); // 1 type, 2 size, 16*4 content
+                CHECK(result[0] == 0xde); // map 16
+                CHECK(result[1] == 0x00); // byte 0 of size (0x0010)
+                CHECK(result[2] == 0x10); // byte 1 of size (0x0010)
+
+                // roundtrip
+                CHECK(json::from_msgpack(result) == j);
+                CHECK(json::from_msgpack(result, true, false) == j);
+            }
+
+            SECTION("map 32")
+            {
+                json j;
+                for (auto i = 0; i < 65536; ++i)
+                {
+                    // format i to a fixed width of 5
+                    // each entry will need 7 bytes: 6 for fixstr, 1 for null
+                    std::stringstream ss;
+                    ss << std::setw(5) << std::setfill('0') << i;
+                    j.emplace(ss.str(), nullptr);
+                }
+
+                const auto result = json::to_msgpack(j);
+
+                // Checking against an expected vector byte by byte is
+                // difficult, because no assumption on the order of key/value
+                // pairs are made. We therefore only check the prefix (type and
+                // size) and the overall size. The rest is then handled in the
+                // roundtrip check.
+                CHECK(result.size() == 458757); // 1 type, 4 size, 65536*7 content
+                CHECK(result[0] == 0xdf); // map 32
+                CHECK(result[1] == 0x00); // byte 0 of size (0x00010000)
+                CHECK(result[2] == 0x01); // byte 1 of size (0x00010000)
+                CHECK(result[3] == 0x00); // byte 2 of size (0x00010000)
+                CHECK(result[4] == 0x00); // byte 3 of size (0x00010000)
+
+                // roundtrip
+                CHECK(json::from_msgpack(result) == j);
+                CHECK(json::from_msgpack(result, true, false) == j);
+            }
+        }
+
+        SECTION("extension")
+        {
+            SECTION("N = 0..255")
+            {
+                for (size_t N = 0; N <= 0xFF; ++N)
+                {
+                    CAPTURE(N)
+
+                    // create JSON value with byte array containing of N * 'x'
+                    const auto s = std::vector<uint8_t>(N, 'x');
+                    json j = json::binary(s);
+                    std::uint8_t const subtype = 42;
+                    j.get_binary().set_subtype(subtype);
+
+                    // create expected byte vector
+                    std::vector<uint8_t> expected;
+                    switch (N)
+                    {
+                        case 1:
+                            expected.push_back(static_cast<std::uint8_t>(0xD4));
+                            break;
+                        case 2:
+                            expected.push_back(static_cast<std::uint8_t>(0xD5));
+                            break;
+                        case 4:
+                            expected.push_back(static_cast<std::uint8_t>(0xD6));
+                            break;
+                        case 8:
+                            expected.push_back(static_cast<std::uint8_t>(0xD7));
+                            break;
+                        case 16:
+                            expected.push_back(static_cast<std::uint8_t>(0xD8));
+                            break;
+                        default:
+                            expected.push_back(static_cast<std::uint8_t>(0xC7));
+                            expected.push_back(static_cast<std::uint8_t>(N));
+                            break;
+                    }
+                    expected.push_back(subtype);
+
+                    for (size_t i = 0; i < N; ++i)
+                    {
+                        expected.push_back(0x78);
+                    }
+
+                    // compare result + size
+                    const auto result = json::to_msgpack(j);
+                    CHECK(result == expected);
+                    switch (N)
+                    {
+                        case 1:
+                        case 2:
+                        case 4:
+                        case 8:
+                        case 16:
+                            CHECK(result.size() == N + 2);
+                            break;
+                        default:
+                            CHECK(result.size() == N + 3);
+                            break;
+                    }
+
+                    // check that no null byte is appended
+                    if (N > 0)
+                    {
+                        CHECK(result.back() != '\x00');
+                    }
+
+                    // roundtrip
+                    CHECK(json::from_msgpack(result) == j);
+                    CHECK(json::from_msgpack(result, true, false) == j);
+                }
+            }
+
+            SECTION("N = 256..65535")
+            {
+                for (std::size_t N :
+                        {
+                            256u, 999u, 1025u, 3333u, 2048u, 65535u
+                        })
+                {
+                    CAPTURE(N)
+
+                    // create JSON value with string containing of N * 'x'
+                    const auto s = std::vector<uint8_t>(N, 'x');
+                    json j = json::binary(s);
+                    std::uint8_t const subtype = 42;
+                    j.get_binary().set_subtype(subtype);
+
+                    // create expected byte vector (hack: create string first)
+                    std::vector<uint8_t> expected(N, 'x');
+                    // reverse order of commands, because we insert at begin()
+                    expected.insert(expected.begin(), subtype);
+                    expected.insert(expected.begin(), static_cast<uint8_t>(N & 0xff));
+                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 8) & 0xff));
+                    expected.insert(expected.begin(), 0xC8);
+
+                    // compare result + size
+                    const auto result = json::to_msgpack(j);
+                    CHECK(result == expected);
+                    CHECK(result.size() == N + 4);
+                    // check that no null byte is appended
+                    CHECK(result.back() != '\x00');
+
+                    // roundtrip
+                    CHECK(json::from_msgpack(result) == j);
+                    CHECK(json::from_msgpack(result, true, false) == j);
+                }
+            }
+
+            SECTION("N = 65536..4294967295")
+            {
+                for (std::size_t N :
+                        {
+                            65536u, 77777u, 1048576u
+                        })
+                {
+                    CAPTURE(N)
+
+                    // create JSON value with string containing of N * 'x'
+                    const auto s = std::vector<uint8_t>(N, 'x');
+                    json j = json::binary(s);
+                    std::uint8_t const subtype = 42;
+                    j.get_binary().set_subtype(subtype);
+
+                    // create expected byte vector (hack: create string first)
+                    std::vector<uint8_t> expected(N, 'x');
+                    // reverse order of commands, because we insert at begin()
+                    expected.insert(expected.begin(), subtype);
+                    expected.insert(expected.begin(), static_cast<uint8_t>(N & 0xff));
+                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 8) & 0xff));
+                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 16) & 0xff));
+                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 24) & 0xff));
+                    expected.insert(expected.begin(), 0xC9);
+
+                    // compare result + size
+                    const auto result = json::to_msgpack(j);
+                    CHECK(result == expected);
+                    CHECK(result.size() == N + 6);
+                    // check that no null byte is appended
+                    CHECK(result.back() != '\x00');
+
+                    // roundtrip
+                    CHECK(json::from_msgpack(result) == j);
+                    CHECK(json::from_msgpack(result, true, false) == j);
+                }
+            }
+        }
+
+        SECTION("binary")
+        {
+            SECTION("N = 0..255")
+            {
+                for (std::size_t N = 0; N <= 0xFF; ++N)
+                {
+                    CAPTURE(N)
+
+                    // create JSON value with byte array containing of N * 'x'
+                    const auto s = std::vector<uint8_t>(N, 'x');
+                    json const j = json::binary(s);
+
+                    // create expected byte vector
+                    std::vector<std::uint8_t> expected;
+                    expected.push_back(static_cast<std::uint8_t>(0xC4));
+                    expected.push_back(static_cast<std::uint8_t>(N));
+                    for (size_t i = 0; i < N; ++i)
+                    {
+                        expected.push_back(0x78);
+                    }
+
+                    // compare result + size
+                    const auto result = json::to_msgpack(j);
+                    CHECK(result == expected);
+                    CHECK(result.size() == N + 2);
+                    // check that no null byte is appended
+                    if (N > 0)
+                    {
+                        CHECK(result.back() != '\x00');
+                    }
+
+                    // roundtrip
+                    CHECK(json::from_msgpack(result) == j);
+                    CHECK(json::from_msgpack(result, true, false) == j);
+                }
+            }
+
+            SECTION("N = 256..65535")
+            {
+                for (std::size_t N :
+                        {
+                            256u, 999u, 1025u, 3333u, 2048u, 65535u
+                        })
+                {
+                    CAPTURE(N)
+
+                    // create JSON value with string containing of N * 'x'
+                    const auto s = std::vector<std::uint8_t>(N, 'x');
+                    json const j = json::binary(s);
+
+                    // create expected byte vector (hack: create string first)
+                    std::vector<std::uint8_t> expected(N, 'x');
+                    // reverse order of commands, because we insert at begin()
+                    expected.insert(expected.begin(), static_cast<std::uint8_t>(N & 0xff));
+                    expected.insert(expected.begin(), static_cast<std::uint8_t>((N >> 8) & 0xff));
+                    expected.insert(expected.begin(), 0xC5);
+
+                    // compare result + size
+                    const auto result = json::to_msgpack(j);
+                    CHECK(result == expected);
+                    CHECK(result.size() == N + 3);
+                    // check that no null byte is appended
+                    CHECK(result.back() != '\x00');
+
+                    // roundtrip
+                    CHECK(json::from_msgpack(result) == j);
+                    CHECK(json::from_msgpack(result, true, false) == j);
+                }
+            }
+
+            SECTION("N = 65536..4294967295")
+            {
+                for (std::size_t N :
+                        {
+                            65536u, 77777u, 1048576u
+                        })
+                {
+                    CAPTURE(N)
+
+                    // create JSON value with string containing of N * 'x'
+                    const auto s = std::vector<std::uint8_t>(N, 'x');
+                    json const j = json::binary(s);
+
+                    // create expected byte vector (hack: create string first)
+                    std::vector<uint8_t> expected(N, 'x');
+                    // reverse order of commands, because we insert at begin()
+                    expected.insert(expected.begin(), static_cast<std::uint8_t>(N & 0xff));
+                    expected.insert(expected.begin(), static_cast<std::uint8_t>((N >> 8) & 0xff));
+                    expected.insert(expected.begin(), static_cast<std::uint8_t>((N >> 16) & 0xff));
+                    expected.insert(expected.begin(), static_cast<std::uint8_t>((N >> 24) & 0xff));
+                    expected.insert(expected.begin(), 0xC6);
+
+                    // compare result + size
+                    const auto result = json::to_msgpack(j);
+                    CHECK(result == expected);
+                    CHECK(result.size() == N + 5);
+                    // check that no null byte is appended
+                    CHECK(result.back() != '\x00');
+
+                    // roundtrip
+                    CHECK(json::from_msgpack(result) == j);
+                    CHECK(json::from_msgpack(result, true, false) == j);
+                }
+            }
+        }
+    }
+
+    SECTION("from float32")
+    {
+        auto given = std::vector<uint8_t>({0xca, 0x41, 0xc8, 0x00, 0x01});
+        json const j = json::from_msgpack(given);
+        CHECK(j.get<double>() == Approx(25.0000019073486));
+    }
+
+    SECTION("errors")
+    {
+        SECTION("empty byte vector")
+        {
+            json _;
+            CHECK_THROWS_WITH_AS(_ = json::from_msgpack(std::vector<uint8_t>()), "[json.exception.parse_error.110] parse error at byte 1: syntax error while parsing MessagePack value: unexpected end of input", json::parse_error&);
+            CHECK(json::from_msgpack(std::vector<uint8_t>(), true, false).is_discarded());
+        }
+
+        SECTION("too short byte vector")
+        {
+            json _;
+
+            CHECK_THROWS_WITH_AS(_ = json::from_msgpack(std::vector<uint8_t>({0x87})),
+                                 "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing MessagePack string: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_msgpack(std::vector<uint8_t>({0xcc})),
+                                 "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing MessagePack number: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_msgpack(std::vector<uint8_t>({0xcd})),
+                                 "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing MessagePack number: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_msgpack(std::vector<uint8_t>({0xcd, 0x00})),
+                                 "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing MessagePack number: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_msgpack(std::vector<uint8_t>({0xce})),
+                                 "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing MessagePack number: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_msgpack(std::vector<uint8_t>({0xce, 0x00})),
+                                 "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing MessagePack number: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_msgpack(std::vector<uint8_t>({0xce, 0x00, 0x00})),
+                                 "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing MessagePack number: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_msgpack(std::vector<uint8_t>({0xce, 0x00, 0x00, 0x00})),
+                                 "[json.exception.parse_error.110] parse error at byte 5: syntax error while parsing MessagePack number: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_msgpack(std::vector<uint8_t>({0xcf})),
+                                 "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing MessagePack number: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_msgpack(std::vector<uint8_t>({0xcf, 0x00})),
+                                 "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing MessagePack number: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_msgpack(std::vector<uint8_t>({0xcf, 0x00, 0x00})),
+                                 "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing MessagePack number: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_msgpack(std::vector<uint8_t>({0xcf, 0x00, 0x00, 0x00})),
+                                 "[json.exception.parse_error.110] parse error at byte 5: syntax error while parsing MessagePack number: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_msgpack(std::vector<uint8_t>({0xcf, 0x00, 0x00, 0x00, 0x00})),
+                                 "[json.exception.parse_error.110] parse error at byte 6: syntax error while parsing MessagePack number: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_msgpack(std::vector<uint8_t>({0xcf, 0x00, 0x00, 0x00, 0x00, 0x00})),
+                                 "[json.exception.parse_error.110] parse error at byte 7: syntax error while parsing MessagePack number: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_msgpack(std::vector<uint8_t>({0xcf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00})),
+                                 "[json.exception.parse_error.110] parse error at byte 8: syntax error while parsing MessagePack number: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_msgpack(std::vector<uint8_t>({0xcf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00})),
+                                 "[json.exception.parse_error.110] parse error at byte 9: syntax error while parsing MessagePack number: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_msgpack(std::vector<uint8_t>({0xa5, 0x68, 0x65})),
+                                 "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing MessagePack string: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_msgpack(std::vector<uint8_t>({0x92, 0x01})),
+                                 "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing MessagePack value: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_msgpack(std::vector<uint8_t>({0x81, 0xa1, 0x61})),
+                                 "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing MessagePack value: unexpected end of input", json::parse_error&);
+            CHECK_THROWS_WITH_AS(_ = json::from_msgpack(std::vector<uint8_t>({0xc4, 0x02})),
+                                 "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing MessagePack binary: unexpected end of input", json::parse_error&);
+
+            CHECK(json::from_msgpack(std::vector<uint8_t>({0x87}), true, false).is_discarded());
+            CHECK(json::from_msgpack(std::vector<uint8_t>({0xcc}), true, false).is_discarded());
+            CHECK(json::from_msgpack(std::vector<uint8_t>({0xcd}), true, false).is_discarded());
+            CHECK(json::from_msgpack(std::vector<uint8_t>({0xcd, 0x00}), true, false).is_discarded());
+            CHECK(json::from_msgpack(std::vector<uint8_t>({0xce}), true, false).is_discarded());
+            CHECK(json::from_msgpack(std::vector<uint8_t>({0xce, 0x00}), true, false).is_discarded());
+            CHECK(json::from_msgpack(std::vector<uint8_t>({0xce, 0x00, 0x00}), true, false).is_discarded());
+            CHECK(json::from_msgpack(std::vector<uint8_t>({0xce, 0x00, 0x00, 0x00}), true, false).is_discarded());
+            CHECK(json::from_msgpack(std::vector<uint8_t>({0xcf}), true, false).is_discarded());
+            CHECK(json::from_msgpack(std::vector<uint8_t>({0xcf, 0x00}), true, false).is_discarded());
+            CHECK(json::from_msgpack(std::vector<uint8_t>({0xcf, 0x00, 0x00}), true, false).is_discarded());
+            CHECK(json::from_msgpack(std::vector<uint8_t>({0xcf, 0x00, 0x00, 0x00}), true, false).is_discarded());
+            CHECK(json::from_msgpack(std::vector<uint8_t>({0xcf, 0x00, 0x00, 0x00, 0x00}), true, false).is_discarded());
+            CHECK(json::from_msgpack(std::vector<uint8_t>({0xcf, 0x00, 0x00, 0x00, 0x00, 0x00}), true, false).is_discarded());
+            CHECK(json::from_msgpack(std::vector<uint8_t>({0xcf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}), true, false).is_discarded());
+            CHECK(json::from_msgpack(std::vector<uint8_t>({0xcf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}), true, false).is_discarded());
+            CHECK(json::from_msgpack(std::vector<uint8_t>({0xa5, 0x68, 0x65}), true, false).is_discarded());
+            CHECK(json::from_msgpack(std::vector<uint8_t>({0x92, 0x01}), true, false).is_discarded());
+            CHECK(json::from_msgpack(std::vector<uint8_t>({0x81, 0xA1, 0x61}), true, false).is_discarded());
+            CHECK(json::from_msgpack(std::vector<uint8_t>({0xc4, 0x02}), true, false).is_discarded());
+            CHECK(json::from_msgpack(std::vector<uint8_t>({0xc4}), true, false).is_discarded());
+        }
+
+        SECTION("unsupported bytes")
+        {
+            SECTION("concrete examples")
+            {
+                json _;
+                CHECK_THROWS_WITH_AS(_ = json::from_msgpack(std::vector<uint8_t>({0xc1})), "[json.exception.parse_error.112] parse error at byte 1: syntax error while parsing MessagePack value: invalid byte: 0xC1", json::parse_error&);
+            }
+
+            SECTION("all unsupported bytes")
+            {
+                for (auto byte :
+                        {
+                            // never used
+                            0xc1
+                        })
+                {
+                    json _;
+                    CHECK_THROWS_AS(_ = json::from_msgpack(std::vector<uint8_t>({static_cast<uint8_t>(byte)})), json::parse_error&);
+                    CHECK(json::from_msgpack(std::vector<uint8_t>({static_cast<uint8_t>(byte)}), true, false).is_discarded());
+                }
+            }
+        }
+
+        SECTION("invalid string in map")
+        {
+            json _;
+            CHECK_THROWS_WITH_AS(_ = json::from_msgpack(std::vector<uint8_t>({0x81, 0xff, 0x01})), "[json.exception.parse_error.113] parse error at byte 2: syntax error while parsing MessagePack string: expected length specification (0xA0-0xBF, 0xD9-0xDB); last byte: 0xFF", json::parse_error&);
+            CHECK(json::from_msgpack(std::vector<uint8_t>({0x81, 0xff, 0x01}), true, false).is_discarded());
+        }
+
+        SECTION("strict mode")
+        {
+            std::vector<uint8_t> const vec = {0xc0, 0xc0};
+            SECTION("non-strict mode")
+            {
+                const auto result = json::from_msgpack(vec, false);
+                CHECK(result == json());
+            }
+
+            SECTION("strict mode")
+            {
+                json _;
+                CHECK_THROWS_WITH_AS(_ = json::from_msgpack(vec), "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing MessagePack value: expected end of input; last byte: 0xC0", json::parse_error&);
+                CHECK(json::from_msgpack(vec, true, false).is_discarded());
+            }
+        }
+    }
+
+    SECTION("SAX aborts")
+    {
+        SECTION("start_array(len)")
+        {
+            std::vector<uint8_t> const v = {0x93, 0x01, 0x02, 0x03};
+            SaxCountdown scp(0);
+            CHECK(!json::sax_parse(v, &scp, json::input_format_t::msgpack));
+        }
+
+        SECTION("start_object(len)")
+        {
+            std::vector<uint8_t> const v = {0x81, 0xa3, 0x66, 0x6F, 0x6F, 0xc2};
+            SaxCountdown scp(0);
+            CHECK(!json::sax_parse(v, &scp, json::input_format_t::msgpack));
+        }
+
+        SECTION("key()")
+        {
+            std::vector<uint8_t> const v = {0x81, 0xa3, 0x66, 0x6F, 0x6F, 0xc2};
+            SaxCountdown scp(1);
+            CHECK(!json::sax_parse(v, &scp, json::input_format_t::msgpack));
+        }
+    }
+}
+
+// use this testcase outside [hide] to run it with Valgrind
+TEST_CASE("single MessagePack roundtrip")
+{
+    SECTION("sample.json")
+    {
+        std::string const filename = TEST_DATA_DIRECTORY "/json_testsuite/sample.json";
+
+        // parse JSON file
+        std::ifstream f_json(filename);
+        json j1 = json::parse(f_json);
+
+        // parse MessagePack file
+        auto packed = utils::read_binary_file(filename + ".msgpack");
+        json j2;
+        CHECK_NOTHROW(j2 = json::from_msgpack(packed));
+
+        // compare parsed JSON values
+        CHECK(j1 == j2);
+
+        SECTION("roundtrips")
+        {
+            SECTION("std::ostringstream")
+            {
+                std::basic_ostringstream<std::uint8_t> ss;
+                json::to_msgpack(j1, ss);
+                json j3 = json::from_msgpack(ss.str());
+                CHECK(j1 == j3);
+            }
+
+            SECTION("std::string")
+            {
+                std::string s;
+                json::to_msgpack(j1, s);
+                json j3 = json::from_msgpack(s);
+                CHECK(j1 == j3);
+            }
+        }
+
+        // check with different start index
+        packed.insert(packed.begin(), 5, 0xff);
+        CHECK(j1 == json::from_msgpack(packed.begin() + 5, packed.end()));
+    }
+}
+
+TEST_CASE("MessagePack roundtrips" * doctest::skip())
+{
+    SECTION("input from msgpack-python")
+    {
+        // most of these are excluded due to differences in key order (not a real problem)
+        std::set<std::string> exclude_packed;
+        exclude_packed.insert(TEST_DATA_DIRECTORY "/json.org/1.json");
+        exclude_packed.insert(TEST_DATA_DIRECTORY "/json.org/2.json");
+        exclude_packed.insert(TEST_DATA_DIRECTORY "/json.org/3.json");
+        exclude_packed.insert(TEST_DATA_DIRECTORY "/json.org/4.json");
+        exclude_packed.insert(TEST_DATA_DIRECTORY "/json.org/5.json");
+        exclude_packed.insert(TEST_DATA_DIRECTORY "/json_testsuite/sample.json"); // kills AppVeyor
+        exclude_packed.insert(TEST_DATA_DIRECTORY "/json_tests/pass1.json");
+        exclude_packed.insert(TEST_DATA_DIRECTORY "/regression/working_file.json");
+        exclude_packed.insert(TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object.json");
+        exclude_packed.insert(TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_basic.json");
+        exclude_packed.insert(TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_duplicated_key.json");
+        exclude_packed.insert(TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_long_strings.json");
+        exclude_packed.insert(TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_simple.json");
+        exclude_packed.insert(TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_string_unicode.json");
+
+        for (std::string filename :
+                {
+                    TEST_DATA_DIRECTORY "/json_nlohmann_tests/all_unicode.json",
+                    TEST_DATA_DIRECTORY "/json.org/1.json",
+                    TEST_DATA_DIRECTORY "/json.org/2.json",
+                    TEST_DATA_DIRECTORY "/json.org/3.json",
+                    TEST_DATA_DIRECTORY "/json.org/4.json",
+                    TEST_DATA_DIRECTORY "/json.org/5.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip01.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip02.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip03.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip04.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip05.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip06.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip07.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip08.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip09.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip10.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip11.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip12.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip13.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip14.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip15.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip16.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip17.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip18.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip19.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip20.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip21.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip22.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip23.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip24.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip25.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip26.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip27.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip28.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip29.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip30.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip31.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip32.json",
+                    TEST_DATA_DIRECTORY "/json_testsuite/sample.json", // kills AppVeyor
+                    TEST_DATA_DIRECTORY "/json_tests/pass1.json",
+                    TEST_DATA_DIRECTORY "/json_tests/pass2.json",
+                    TEST_DATA_DIRECTORY "/json_tests/pass3.json",
+                    TEST_DATA_DIRECTORY "/regression/floats.json",
+                    TEST_DATA_DIRECTORY "/regression/signed_ints.json",
+                    TEST_DATA_DIRECTORY "/regression/unsigned_ints.json",
+                    TEST_DATA_DIRECTORY "/regression/working_file.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_arraysWithSpaces.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_empty-string.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_empty.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_ending_with_newline.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_false.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_heterogeneous.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_null.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_with_1_and_newline.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_with_leading_space.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_with_several_null.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_with_trailing_space.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_0e+1.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_0e1.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_after_space.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_double_close_to_zero.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_double_huge_neg_exp.json",
+                    //TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_huge_exp.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_int_with_exp.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_minus_zero.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_negative_int.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_negative_one.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_negative_zero.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_real_capital_e.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_real_capital_e_neg_exp.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_real_capital_e_pos_exp.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_real_exponent.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_real_fraction_exponent.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_real_neg_exp.json",
+                    //TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_real_neg_overflow.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_real_pos_exponent.json",
+                    //TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_real_pos_overflow.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_real_underflow.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_simple_int.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_simple_real.json",
+                    //TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_too_big_neg_int.json",
+                    //TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_too_big_pos_int.json",
+                    //TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_number_very_big_negative_int.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_basic.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_duplicated_key.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_duplicated_key_and_value.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_empty.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_empty_key.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_escaped_null_in_key.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_extreme_numbers.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_long_strings.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_simple.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_string_unicode.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_object_with_newlines.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_1_2_3_bytes_UTF-8_sequences.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_UTF-16_Surrogates_U+1D11E_MUSICAL_SYMBOL_G_CLEF.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_accepted_surrogate_pair.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_accepted_surrogate_pairs.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_allowed_escapes.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_backslash_and_u_escaped_zero.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_backslash_doublequotes.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_comments.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_double_escape_a.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_double_escape_n.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_escaped_control_character.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_escaped_noncharacter.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_in_array.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_in_array_with_leading_space.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_last_surrogates_1_and_2.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_newline_uescaped.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_nonCharacterInUTF-8_U+10FFFF.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_nonCharacterInUTF-8_U+1FFFF.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_nonCharacterInUTF-8_U+FFFF.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_null_escape.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_one-byte-utf-8.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_pi.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_simple_ascii.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_space.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_three-byte-utf-8.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_two-byte-utf-8.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_u+2028_line_sep.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_u+2029_par_sep.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_uEscape.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_unescaped_char_delete.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_unicode.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_unicodeEscapedBackslash.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_unicode_2.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_unicode_U+200B_ZERO_WIDTH_SPACE.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_unicode_U+2064_invisible_plus.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_unicode_escaped_double_quote.json",
+                    // TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_utf16.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_utf8.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_string_with_del_character.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_structure_lonely_false.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_structure_lonely_int.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_structure_lonely_negative_real.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_structure_lonely_null.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_structure_lonely_string.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_structure_lonely_true.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_structure_string_empty.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_structure_trailing_newline.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_structure_true_in_array.json",
+                    TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_structure_whitespace_array.json"
+                })
+        {
+            CAPTURE(filename)
+
+            {
+                INFO_WITH_TEMP(filename + ": std::vector<uint8_t>");
+                // parse JSON file
+                std::ifstream f_json(filename);
+                json j1 = json::parse(f_json);
+
+                // parse MessagePack file
+                auto packed = utils::read_binary_file(filename + ".msgpack");
+                json j2;
+                CHECK_NOTHROW(j2 = json::from_msgpack(packed));
+
+                // compare parsed JSON values
+                CHECK(j1 == j2);
+            }
+
+            {
+                INFO_WITH_TEMP(filename + ": std::ifstream");
+                // parse JSON file
+                std::ifstream f_json(filename);
+                json j1 = json::parse(f_json);
+
+                // parse MessagePack file
+                std::ifstream f_msgpack(filename + ".msgpack", std::ios::binary);
+                json j2;
+                CHECK_NOTHROW(j2 = json::from_msgpack(f_msgpack));
+
+                // compare parsed JSON values
+                CHECK(j1 == j2);
+            }
+
+            {
+                INFO_WITH_TEMP(filename + ": uint8_t* and size");
+                // parse JSON file
+                std::ifstream f_json(filename);
+                json j1 = json::parse(f_json);
+
+                // parse MessagePack file
+                auto packed = utils::read_binary_file(filename + ".msgpack");
+                json j2;
+                CHECK_NOTHROW(j2 = json::from_msgpack({packed.data(), packed.size()}));
+
+                // compare parsed JSON values
+                CHECK(j1 == j2);
+            }
+
+            {
+                INFO_WITH_TEMP(filename + ": output to output adapters");
+                // parse JSON file
+                std::ifstream f_json(filename);
+                json const j1 = json::parse(f_json);
+
+                // parse MessagePack file
+                auto packed = utils::read_binary_file(filename + ".msgpack");
+
+                if (exclude_packed.count(filename) == 0u)
+                {
+                    {
+                        INFO_WITH_TEMP(filename + ": output adapters: std::vector<uint8_t>");
+                        std::vector<uint8_t> vec;
+                        json::to_msgpack(j1, vec);
+                        CHECK(vec == packed);
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/external_imported/json/tests/src/unit-no-mem-leak-on-adl-serialize.cpp b/external_imported/json/tests/src/unit-no-mem-leak-on-adl-serialize.cpp
new file mode 100644
index 000000000..37b10a916
--- /dev/null
+++ b/external_imported/json/tests/src/unit-no-mem-leak-on-adl-serialize.cpp
@@ -0,0 +1,86 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+#include <nlohmann/json.hpp>
+#include <exception>
+#include <iostream>
+
+struct Foo
+{
+    int a;
+    int b;
+};
+
+namespace nlohmann
+{
+template <>
+struct adl_serializer<Foo>
+{
+    static void to_json(json& j, Foo const& f)
+    {
+        switch (f.b)
+        {
+            case 0:
+                j["a"] = f.a;
+                break;
+            case 1:
+                j[0] = f.a;
+                break;
+            default:
+                j = "test";
+        }
+        if (f.a == 1)
+        {
+            throw std::runtime_error("b is invalid");
+        }
+    }
+};
+} // namespace nlohmann
+
+TEST_CASE("check_for_mem_leak_on_adl_to_json-1")
+{
+    try
+    {
+        const nlohmann::json j = Foo {1, 0};
+        std::cout << j.dump() << "\n";
+    }
+    catch (...) // NOLINT(bugprone-empty-catch)
+    {
+        // just ignore the exception in this POC
+    }
+}
+
+TEST_CASE("check_for_mem_leak_on_adl_to_json-2")
+{
+    try
+    {
+        const nlohmann::json j = Foo {1, 1};
+        std::cout << j.dump() << "\n";
+    }
+    catch (...) // NOLINT(bugprone-empty-catch)
+    {
+        // just ignore the exception in this POC
+    }
+}
+
+TEST_CASE("check_for_mem_leak_on_adl_to_json-2")
+{
+    try
+    {
+        const nlohmann::json j = Foo {1, 2};
+        std::cout << j.dump() << "\n";
+    }
+    catch (...) // NOLINT(bugprone-empty-catch)
+    {
+        // just ignore the exception in this POC
+    }
+}
+
+
diff --git a/external_imported/json/tests/src/unit-noexcept.cpp b/external_imported/json/tests/src/unit-noexcept.cpp
new file mode 100644
index 000000000..bba230d01
--- /dev/null
+++ b/external_imported/json/tests/src/unit-noexcept.cpp
@@ -0,0 +1,74 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+// disable -Wnoexcept due to struct pod_bis
+DOCTEST_GCC_SUPPRESS_WARNING_PUSH
+DOCTEST_GCC_SUPPRESS_WARNING("-Wnoexcept")
+
+#include <nlohmann/json.hpp>
+
+using nlohmann::json;
+
+namespace
+{
+enum test {};
+
+struct pod {};
+struct pod_bis {};
+
+void to_json(json& /*unused*/, pod /*unused*/) noexcept;
+void to_json(json& /*unused*/, pod_bis /*unused*/);
+void from_json(const json& /*unused*/, pod /*unused*/) noexcept;
+void from_json(const json& /*unused*/, pod_bis /*unused*/);
+void to_json(json& /*unused*/, pod /*unused*/) noexcept {}
+void to_json(json& /*unused*/, pod_bis /*unused*/) {}
+void from_json(const json& /*unused*/, pod /*unused*/) noexcept {}
+void from_json(const json& /*unused*/, pod_bis /*unused*/) {}
+
+static_assert(noexcept(json{}), "");
+static_assert(noexcept(nlohmann::to_json(std::declval<json&>(), 2)), "");
+static_assert(noexcept(nlohmann::to_json(std::declval<json&>(), 2.5)), "");
+static_assert(noexcept(nlohmann::to_json(std::declval<json&>(), true)), "");
+static_assert(noexcept(nlohmann::to_json(std::declval<json&>(), test{})), "");
+static_assert(noexcept(nlohmann::to_json(std::declval<json&>(), pod{})), "");
+static_assert(!noexcept(nlohmann::to_json(std::declval<json&>(), pod_bis{})), "");
+static_assert(noexcept(json(2)), "");
+static_assert(noexcept(json(test{})), "");
+static_assert(noexcept(json(pod{})), "");
+static_assert(noexcept(std::declval<json>().get<pod>()), "");
+static_assert(!noexcept(std::declval<json>().get<pod_bis>()), "");
+static_assert(noexcept(json(pod{})), "");
+} // namespace
+
+TEST_CASE("noexcept")
+{
+    // silence -Wunneeded-internal-declaration errors
+    static_cast<void>(static_cast<void(*)(json&, pod)>(&to_json));
+    static_cast<void>(static_cast<void(*)(json&, pod_bis)>(&to_json));
+    static_cast<void>(static_cast<void(*)(const json&, pod)>(&from_json));
+    static_cast<void>(static_cast<void(*)(const json&, pod_bis)>(&from_json));
+
+    SECTION("nothrow-copy-constructible exceptions")
+    {
+        // for ERR60-CPP (https://github.com/nlohmann/json/issues/531):
+        // Exceptions should be nothrow-copy-constructible. However, compilers
+        // treat std::runtime_exception differently in this regard. Therefore,
+        // we can only demand nothrow-copy-constructibility for our exceptions
+        // if std::runtime_exception is.
+        CHECK(std::is_nothrow_copy_constructible<json::exception>::value == std::is_nothrow_copy_constructible<std::runtime_error>::value);
+        CHECK(std::is_nothrow_copy_constructible<json::parse_error>::value == std::is_nothrow_copy_constructible<std::runtime_error>::value);
+        CHECK(std::is_nothrow_copy_constructible<json::invalid_iterator>::value == std::is_nothrow_copy_constructible<std::runtime_error>::value);
+        CHECK(std::is_nothrow_copy_constructible<json::type_error>::value == std::is_nothrow_copy_constructible<std::runtime_error>::value);
+        CHECK(std::is_nothrow_copy_constructible<json::out_of_range>::value == std::is_nothrow_copy_constructible<std::runtime_error>::value);
+        CHECK(std::is_nothrow_copy_constructible<json::other_error>::value == std::is_nothrow_copy_constructible<std::runtime_error>::value);
+    }
+}
+
+DOCTEST_GCC_SUPPRESS_WARNING_POP
diff --git a/external_imported/json/tests/src/unit-ordered_json.cpp b/external_imported/json/tests/src/unit-ordered_json.cpp
new file mode 100644
index 000000000..d77d904b0
--- /dev/null
+++ b/external_imported/json/tests/src/unit-ordered_json.cpp
@@ -0,0 +1,71 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+#include <nlohmann/json.hpp>
+using nlohmann::json;
+using nlohmann::ordered_json;
+
+TEST_CASE("ordered_json")
+{
+    json j;
+    ordered_json oj;
+
+    j["element3"] = 3;
+    j["element1"] = 1;
+    j["element2"] = 2;
+
+    oj["element3"] = 3;
+    oj["element1"] = 1;
+    oj["element2"] = 2;
+
+    CHECK(j.dump() == "{\"element1\":1,\"element2\":2,\"element3\":3}");
+    CHECK(oj.dump() == "{\"element3\":3,\"element1\":1,\"element2\":2}");
+
+    CHECK(j == json(oj));
+    CHECK(ordered_json(json(oj)) == ordered_json(j));
+
+    j.erase("element1");
+    oj.erase("element1");
+
+    CHECK(j.dump() == "{\"element2\":2,\"element3\":3}");
+    CHECK(oj.dump() == "{\"element3\":3,\"element2\":2}");
+
+    // remove again and nothing changes
+    j.erase("element1");
+    oj.erase("element1");
+
+    CHECK(j.dump() == "{\"element2\":2,\"element3\":3}");
+    CHECK(oj.dump() == "{\"element3\":3,\"element2\":2}");
+
+    // There are no dup keys cause constructor calls emplace...
+    json const multi {{"z", 1}, {"m", 2}, {"m", 3}, {"y", 4}, {"m", 5}};
+    CHECK(multi.size() == 3);
+    CHECK(multi.dump() == "{\"m\":2,\"y\":4,\"z\":1}");
+
+    ordered_json multi_ordered {{"z", 1}, {"m", 2}, {"m", 3}, {"y", 4}, {"m", 5}};
+    CHECK(multi_ordered.size() == 3);
+    CHECK(multi_ordered.dump() == "{\"z\":1,\"m\":2,\"y\":4}");
+    CHECK(multi_ordered.erase("m") == 1);
+    CHECK(multi_ordered.dump() == "{\"z\":1,\"y\":4}");
+
+    // Ranged insert test.
+    // It seems that values shouldn't be overwritten. Only new values are added
+    json j1 {{"c", 1}, {"b", 2}, {"a", 3}};
+    const json j2 {{"c", 77}, {"d", 42}, {"a", 4}};
+    j1.insert( j2.cbegin(), j2.cend() );
+    CHECK(j1.size() == 4);
+    CHECK(j1.dump() == "{\"a\":3,\"b\":2,\"c\":1,\"d\":42}");
+
+    ordered_json oj1 {{"c", 1}, {"b", 2}, {"a", 3}};
+    const ordered_json oj2 {{"c", 77}, {"d", 42}, {"a", 4}};
+    oj1.insert( oj2.cbegin(), oj2.cend() );
+    CHECK(oj1.size() == 4);
+    CHECK(oj1.dump() == "{\"c\":1,\"b\":2,\"a\":3,\"d\":42}");
+}
diff --git a/external_imported/json/test/src/unit-ordered_map.cpp b/external_imported/json/tests/src/unit-ordered_map.cpp
similarity index 80%
rename from external_imported/json/test/src/unit-ordered_map.cpp
rename to external_imported/json/tests/src/unit-ordered_map.cpp
index 645183d8c..ceafea1e9 100644
--- a/external_imported/json/test/src/unit-ordered_map.cpp
+++ b/external_imported/json/tests/src/unit-ordered_map.cpp
@@ -1,38 +1,16 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
 
 #include "doctest_compatibility.h"
 
 #include <nlohmann/json.hpp>
 using nlohmann::ordered_map;
 
-
 TEST_CASE("ordered_map")
 {
     SECTION("constructor")
@@ -40,7 +18,7 @@ TEST_CASE("ordered_map")
         SECTION("constructor from iterator range")
         {
             std::map<std::string, std::string> m {{"eins", "one"}, {"zwei", "two"}, {"drei", "three"}};
-            ordered_map<std::string, std::string> om(m.begin(), m.end());
+            ordered_map<std::string, std::string> const om(m.begin(), m.end());
             CHECK(om.size() == 3);
         }
 
@@ -49,6 +27,7 @@ TEST_CASE("ordered_map")
             std::map<std::string, std::string> m {{"eins", "one"}, {"zwei", "two"}, {"drei", "three"}};
             ordered_map<std::string, std::string> om(m.begin(), m.end());
             const auto com = om;
+            om.clear(); // silence a warning by forbidding having "const auto& com = om;"
             CHECK(com.size() == 3);
         }
     }
@@ -209,6 +188,45 @@ TEST_CASE("ordered_map")
             ++it2;
             CHECK(it2 == om.end());
         }
+
+        SECTION("with iterator pair")
+        {
+            SECTION("range in the middle")
+            {
+                // need more elements
+                om["vier"] = "four";
+                om["fünf"] = "five";
+
+                // delete "zwei" and "drei"
+                auto it = om.erase(om.begin() + 1, om.begin() + 3);
+                CHECK(it->first == "vier");
+                CHECK(om.size() == 3);
+            }
+
+            SECTION("range at the beginning")
+            {
+                // need more elements
+                om["vier"] = "four";
+                om["fünf"] = "five";
+
+                // delete "eins" and "zwei"
+                auto it = om.erase(om.begin(), om.begin() + 2);
+                CHECK(it->first == "drei");
+                CHECK(om.size() == 3);
+            }
+
+            SECTION("range at the end")
+            {
+                // need more elements
+                om["vier"] = "four";
+                om["fünf"] = "five";
+
+                // delete "vier" and "fünf"
+                auto it = om.erase(om.begin() + 3, om.end());
+                CHECK(it == om.end());
+                CHECK(om.size() == 3);
+            }
+        }
     }
 
     SECTION("count")
@@ -262,8 +280,8 @@ TEST_CASE("ordered_map")
 
         SECTION("const value_type&")
         {
-            ordered_map<std::string, std::string>::value_type vt1 {"eins", "1"};
-            ordered_map<std::string, std::string>::value_type vt4 {"vier", "four"};
+            ordered_map<std::string, std::string>::value_type const vt1 {"eins", "1"};
+            ordered_map<std::string, std::string>::value_type const vt4 {"vier", "four"};
 
             auto res1 = om.insert(vt1);
             CHECK(res1.first == om.begin());
diff --git a/external_imported/json/test/src/unit-pointer_access.cpp b/external_imported/json/tests/src/unit-pointer_access.cpp
similarity index 93%
rename from external_imported/json/test/src/unit-pointer_access.cpp
rename to external_imported/json/tests/src/unit-pointer_access.cpp
index 95478b2c7..4503a3b73 100644
--- a/external_imported/json/test/src/unit-pointer_access.cpp
+++ b/external_imported/json/tests/src/unit-pointer_access.cpp
@@ -1,31 +1,10 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
 
 #include "doctest_compatibility.h"
 
diff --git a/external_imported/json/tests/src/unit-readme.cpp b/external_imported/json/tests/src/unit-readme.cpp
new file mode 100644
index 000000000..f2a571aac
--- /dev/null
+++ b/external_imported/json/tests/src/unit-readme.cpp
@@ -0,0 +1,304 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+#include <nlohmann/json.hpp>
+using nlohmann::json;
+#ifdef JSON_TEST_NO_GLOBAL_UDLS
+    using namespace nlohmann::literals; // NOLINT(google-build-using-namespace)
+#endif
+
+#include <deque>
+#include <forward_list>
+#include <list>
+#include <set>
+#include <unordered_map>
+#include <unordered_set>
+#include <iostream>
+#include <sstream>
+#include <iomanip>
+
+// local variable is initialized but not referenced
+DOCTEST_MSVC_SUPPRESS_WARNING_PUSH
+DOCTEST_MSVC_SUPPRESS_WARNING(4189)
+
+TEST_CASE("README" * doctest::skip())
+{
+    {
+        // redirect std::cout for the README file
+        auto* old_cout_buffer = std::cout.rdbuf();
+        std::ostringstream const new_stream;
+        std::cout.rdbuf(new_stream.rdbuf());
+        {
+            // create an empty structure (null)
+            json j;
+
+            // add a number that is stored as double (note the implicit conversion of j to an object)
+            j["pi"] = 3.141;
+
+            // add a Boolean that is stored as bool
+            j["happy"] = true;
+
+            // add a string that is stored as std::string
+            j["name"] = "Niels";
+
+            // add another null object by passing nullptr
+            j["nothing"] = nullptr;
+
+            // add an object inside the object
+            j["answer"]["everything"] = 42;
+
+            // add an array that is stored as std::vector (using an initializer list)
+            j["list"] = { 1, 0, 2 };
+
+            // add another object (using an initializer list of pairs)
+            j["object"] = { {"currency", "USD"}, {"value", 42.99} };
+
+            // instead, you could also write (which looks very similar to the JSON above)
+            json const j2 =
+            {
+                {"pi", 3.141},
+                {"happy", true},
+                {"name", "Niels"},
+                {"nothing", nullptr},
+                {
+                    "answer", {
+                        {"everything", 42}
+                    }
+                },
+                {"list", {1, 0, 2}},
+                {
+                    "object", {
+                        {"currency", "USD"},
+                        {"value", 42.99}
+                    }
+                }
+            };
+        }
+
+        {
+            // ways to express the empty array []
+            json const empty_array_implicit = {{}};
+            CHECK(empty_array_implicit.is_array());
+            json const empty_array_explicit = json::array();
+            CHECK(empty_array_explicit.is_array());
+
+            // a way to express the empty object {}
+            json const empty_object_explicit = json::object();
+            CHECK(empty_object_explicit.is_object());
+
+            // a way to express an _array_ of key/value pairs [["currency", "USD"], ["value", 42.99]]
+            json array_not_object = json::array({ {"currency", "USD"}, {"value", 42.99} });
+            CHECK(array_not_object.is_array());
+            CHECK(array_not_object.size() == 2);
+            CHECK(array_not_object[0].is_array());
+            CHECK(array_not_object[1].is_array());
+        }
+
+        {
+            // create object from string literal
+            json const j = "{ \"happy\": true, \"pi\": 3.141 }"_json; // NOLINT(modernize-raw-string-literal)
+
+            // or even nicer with a raw string literal
+            auto j2 = R"({
+                "happy": true,
+                "pi": 3.141
+            })"_json;
+
+            // or explicitly
+            auto j3 = json::parse(R"({"happy": true, "pi": 3.141})");
+
+            // explicit conversion to string
+            std::string const s = j.dump();    // {\"happy\":true,\"pi\":3.141}
+
+            // serialization with pretty printing
+            // pass in the amount of spaces to indent
+            std::cout << j.dump(4) << std::endl; // NOLINT(performance-avoid-endl)
+            // {
+            //     "happy": true,
+            //     "pi": 3.141
+            // }
+
+            std::cout << std::setw(2) << j << std::endl; // NOLINT(performance-avoid-endl)
+        }
+
+        {
+            // create an array using push_back
+            json j;
+            j.push_back("foo");
+            j.push_back(1);
+            j.push_back(true);
+
+            // comparison
+            bool x = (j == R"(["foo", 1, true])"_json);  // true
+            CHECK(x == true);
+
+            // iterate the array
+            for (json::iterator it = j.begin(); it != j.end(); ++it) // NOLINT(modernize-loop-convert)
+            {
+                std::cout << *it << '\n';
+            }
+
+            // range-based for
+            for (auto& element : j)
+            {
+                std::cout << element << '\n';
+            }
+
+            // getter/setter
+            const auto tmp = j[0].get<std::string>();
+            j[1] = 42;
+            bool foo{j.at(2)};
+            CHECK(foo == true);
+
+            // other stuff
+            CHECK(j.size() == 3);                     // 3 entries
+            CHECK_FALSE(j.empty());                   // false
+            CHECK(j.type() == json::value_t::array);  // json::value_t::array
+            j.clear();                                // the array is empty again
+
+            // create an object
+            json o;
+            o["foo"] = 23;
+            o["bar"] = false;
+            o["baz"] = 3.141;
+
+            // find an entry
+            CHECK(o.find("foo") != o.end());
+            if (o.find("foo") != o.end())
+            {
+                // there is an entry with key "foo"
+            }
+        }
+
+        {
+            std::vector<int> const c_vector {1, 2, 3, 4};
+            json const j_vec(c_vector);
+            // [1, 2, 3, 4]
+
+            std::deque<float> const c_deque {1.2f, 2.3f, 3.4f, 5.6f};
+            json const j_deque(c_deque);
+            // [1.2, 2.3, 3.4, 5.6]
+
+            std::list<bool> const c_list {true, true, false, true};
+            json const j_list(c_list);
+            // [true, true, false, true]
+
+            std::forward_list<int64_t> const c_flist {12345678909876, 23456789098765, 34567890987654, 45678909876543};
+            json const j_flist(c_flist);
+            // [12345678909876, 23456789098765, 34567890987654, 45678909876543]
+
+            std::array<unsigned long, 4> const c_array {{1, 2, 3, 4}};
+            json const j_array(c_array);
+            // [1, 2, 3, 4]
+
+            std::set<std::string> const c_set {"one", "two", "three", "four", "one"};
+            json const j_set(c_set); // only one entry for "one" is used
+            // ["four", "one", "three", "two"]
+
+            std::unordered_set<std::string> const c_uset {"one", "two", "three", "four", "one"};
+            json const j_uset(c_uset); // only one entry for "one" is used
+            // maybe ["two", "three", "four", "one"]
+
+            std::multiset<std::string> const c_mset {"one", "two", "one", "four"};
+            json const j_mset(c_mset); // both entries for "one" are used
+            // maybe ["one", "two", "one", "four"]
+
+            std::unordered_multiset<std::string> const c_umset {"one", "two", "one", "four"};
+            json const j_umset(c_umset); // both entries for "one" are used
+            // maybe ["one", "two", "one", "four"]
+        }
+
+        {
+            std::map<std::string, int> const c_map { {"one", 1}, {"two", 2}, {"three", 3} };
+            json const j_map(c_map);
+            // {"one": 1, "two": 2, "three": 3}
+
+            std::unordered_map<const char*, float> const c_umap { {"one", 1.2f}, {"two", 2.3f}, {"three", 3.4f} };
+            json const j_umap(c_umap);
+            // {"one": 1.2, "two": 2.3, "three": 3.4}
+
+            std::multimap<std::string, bool> const c_mmap { {"one", true}, {"two", true}, {"three", false}, {"three", true} };
+            json const j_mmap(c_mmap); // only one entry for key "three" is used
+            // maybe {"one": true, "two": true, "three": true}
+
+            std::unordered_multimap<std::string, bool> const c_ummap { {"one", true}, {"two", true}, {"three", false}, {"three", true} };
+            json const j_ummap(c_ummap); // only one entry for key "three" is used
+            // maybe {"one": true, "two": true, "three": true}
+        }
+
+        {
+            // strings
+            std::string const s1 = "Hello, world!";
+            json const js = s1;
+            auto s2 = js.get<std::string>();
+
+            // Booleans
+            bool const b1 = true;
+            json const jb = b1;
+            bool b2{jb};
+            CHECK(b2 == true);
+
+            // numbers
+            int const i = 42;
+            json const jn = i;
+            double f{jn};
+            CHECK(f == 42);
+
+            // etc.
+
+            std::string const vs = js.get<std::string>();
+            bool vb = jb.get<bool>();
+            CHECK(vb == true);
+            int vi = jn.get<int>();
+            CHECK(vi == 42);
+
+            // etc.
+        }
+
+        {
+            // a JSON value
+            json j_original = R"({
+                "baz": ["one", "two", "three"],
+                "foo": "bar"
+            })"_json;
+
+            // access members with a JSON pointer (RFC 6901)
+            j_original["/baz/1"_json_pointer];
+            // "two"
+
+            // a JSON patch (RFC 6902)
+            json const j_patch = R"([
+                { "op": "replace", "path": "/baz", "value": "boo" },
+                { "op": "add", "path": "/hello", "value": ["world"] },
+                { "op": "remove", "path": "/foo"}
+            ])"_json;
+
+            // apply the patch
+            json const j_result = j_original.patch(j_patch);
+            // {
+            //    "baz": "boo",
+            //    "hello": ["world"]
+            // }
+
+            // calculate a JSON patch from two JSON values
+            auto res = json::diff(j_result, j_original);
+            // [
+            //   { "op":" replace", "path": "/baz", "value": ["one", "two", "three"] },
+            //   { "op":"remove","path":"/hello" },
+            //   { "op":"add","path":"/foo","value":"bar" }
+            // ]
+        }
+
+        // restore old std::cout
+        std::cout.rdbuf(old_cout_buffer);
+    }
+}
+
+DOCTEST_MSVC_SUPPRESS_WARNING_POP
diff --git a/external_imported/json/tests/src/unit-reference_access.cpp b/external_imported/json/tests/src/unit-reference_access.cpp
new file mode 100644
index 000000000..3b46fe833
--- /dev/null
+++ b/external_imported/json/tests/src/unit-reference_access.cpp
@@ -0,0 +1,247 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+#include <nlohmann/json.hpp>
+using nlohmann::json;
+
+TEST_CASE("reference access")
+{
+    // create a JSON value with different types
+    const json json_types =
+    {
+        {"boolean", true},
+        {
+            "number", {
+                {"integer", 42},
+                {"floating-point", 17.23}
+            }
+        },
+        {"string", "Hello, world!"},
+        {"array", {1, 2, 3, 4, 5}},
+        {"null", nullptr}
+    };
+
+    SECTION("reference access to object_t")
+    {
+        using test_type = json::object_t;
+        json value = {{"one", 1}, {"two", 2}};
+
+        // check if references are returned correctly
+        auto& p1 = value.get_ref<test_type&>();
+        CHECK(&p1 == value.get_ptr<test_type*>());
+        CHECK(p1 == value.get<test_type>());
+
+        const auto& p2 = value.get_ref<const test_type&>();
+        CHECK(&p2 == value.get_ptr<const test_type*>());
+        CHECK(p2 == value.get<test_type>());
+
+        // check if mismatching references throw correctly
+        CHECK_NOTHROW(value.get_ref<json::object_t&>());
+        CHECK_THROWS_WITH_AS(value.get_ref<json::array_t&>(),
+                             "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is object", json::type_error&);
+        CHECK_THROWS_WITH_AS(value.get_ref<json::string_t&>(),
+                             "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is object", json::type_error&);
+        CHECK_THROWS_WITH_AS(value.get_ref<json::boolean_t&>(),
+                             "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is object", json::type_error&);
+        CHECK_THROWS_WITH_AS(value.get_ref<json::number_integer_t&>(),
+                             "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is object", json::type_error&);
+        CHECK_THROWS_WITH_AS(value.get_ref<json::number_unsigned_t&>(),
+                             "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is object", json::type_error&);
+        CHECK_THROWS_WITH_AS(value.get_ref<json::number_float_t&>(),
+                             "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is object", json::type_error&);
+    }
+
+    SECTION("const reference access to const object_t")
+    {
+        using test_type = json::object_t;
+        const json value = {{"one", 1}, {"two", 2}};
+
+        // this should not compile
+        // test_type& p1 = value.get_ref<test_type&>();
+
+        // check if references are returned correctly
+        const auto& p2 = value.get_ref<const test_type&>();
+        CHECK(&p2 == value.get_ptr<const test_type*>());
+        CHECK(p2 == value.get<test_type>());
+    }
+
+    SECTION("reference access to array_t")
+    {
+        using test_type = json::array_t;
+        json value = {1, 2, 3, 4};
+
+        // check if references are returned correctly
+        auto& p1 = value.get_ref<test_type&>();
+        CHECK(&p1 == value.get_ptr<test_type*>());
+        CHECK(p1 == value.get<test_type>());
+
+        const auto& p2 = value.get_ref<const test_type&>();
+        CHECK(&p2 == value.get_ptr<const test_type*>());
+        CHECK(p2 == value.get<test_type>());
+
+        // check if mismatching references throw correctly
+        CHECK_THROWS_WITH_AS(value.get_ref<json::object_t&>(),
+                             "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is array", json::type_error&);
+        CHECK_NOTHROW(value.get_ref<json::array_t&>());
+        CHECK_THROWS_WITH_AS(value.get_ref<json::string_t&>(),
+                             "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is array", json::type_error&);
+        CHECK_THROWS_WITH_AS(value.get_ref<json::boolean_t&>(),
+                             "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is array", json::type_error&);
+        CHECK_THROWS_WITH_AS(value.get_ref<json::number_integer_t&>(),
+                             "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is array", json::type_error&);
+        CHECK_THROWS_WITH_AS(value.get_ref<json::number_unsigned_t&>(),
+                             "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is array", json::type_error&);
+        CHECK_THROWS_WITH_AS(value.get_ref<json::number_float_t&>(),
+                             "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is array", json::type_error&);
+    }
+
+    SECTION("reference access to string_t")
+    {
+        using test_type = json::string_t;
+        json value = "hello";
+
+        // check if references are returned correctly
+        auto& p1 = value.get_ref<test_type&>();
+        CHECK(&p1 == value.get_ptr<test_type*>());
+        CHECK(p1 == value.get<test_type>());
+
+        const auto& p2 = value.get_ref<const test_type&>();
+        CHECK(&p2 == value.get_ptr<const test_type*>());
+        CHECK(p2 == value.get<test_type>());
+
+        // check if mismatching references throw correctly
+        CHECK_THROWS_WITH_AS(value.get_ref<json::object_t&>(),
+                             "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is string", json::type_error&);
+        CHECK_THROWS_WITH_AS(value.get_ref<json::array_t&>(),
+                             "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is string", json::type_error&);
+        CHECK_NOTHROW(value.get_ref<json::string_t&>());
+        CHECK_THROWS_WITH_AS(value.get_ref<json::boolean_t&>(),
+                             "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is string", json::type_error&);
+        CHECK_THROWS_WITH_AS(value.get_ref<json::number_integer_t&>(),
+                             "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is string", json::type_error&);
+        CHECK_THROWS_WITH_AS(value.get_ref<json::number_unsigned_t&>(),
+                             "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is string", json::type_error&);
+        CHECK_THROWS_WITH_AS(value.get_ref<json::number_float_t&>(),
+                             "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is string", json::type_error&);
+    }
+
+    SECTION("reference access to boolean_t")
+    {
+        using test_type = json::boolean_t;
+        json value = false;
+
+        // check if references are returned correctly
+        auto& p1 = value.get_ref<test_type&>();
+        CHECK(&p1 == value.get_ptr<test_type*>());
+        CHECK(p1 == value.get<test_type>());
+
+        const auto& p2 = value.get_ref<const test_type&>();
+        CHECK(&p2 == value.get_ptr<const test_type*>());
+        CHECK(p2 == value.get<test_type>());
+
+        // check if mismatching references throw correctly
+        CHECK_THROWS_WITH_AS(value.get_ref<json::object_t&>(),
+                             "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is boolean", json::type_error&);
+        CHECK_THROWS_WITH_AS(value.get_ref<json::array_t&>(),
+                             "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is boolean", json::type_error&);
+        CHECK_THROWS_WITH_AS(value.get_ref<json::string_t&>(),
+                             "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is boolean", json::type_error&);
+        CHECK_NOTHROW(value.get_ref<json::boolean_t&>());
+        CHECK_THROWS_WITH_AS(value.get_ref<json::number_integer_t&>(),
+                             "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is boolean", json::type_error&);
+        CHECK_THROWS_WITH_AS(value.get_ref<json::number_unsigned_t&>(),
+                             "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is boolean", json::type_error&);
+        CHECK_THROWS_WITH_AS(value.get_ref<json::number_float_t&>(),
+                             "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is boolean", json::type_error&);
+    }
+
+    SECTION("reference access to number_integer_t")
+    {
+        using test_type = json::number_integer_t;
+        json value = -23;
+
+        // check if references are returned correctly
+        auto& p1 = value.get_ref<test_type&>();
+        CHECK(&p1 == value.get_ptr<test_type*>());
+        CHECK(p1 == value.get<test_type>());
+
+        const auto& p2 = value.get_ref<const test_type&>();
+        CHECK(&p2 == value.get_ptr<const test_type*>());
+        CHECK(p2 == value.get<test_type>());
+
+        // check if mismatching references throw correctly
+        CHECK_THROWS_WITH_AS(value.get_ref<json::object_t&>(),
+                             "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is number", json::type_error&);
+        CHECK_THROWS_WITH_AS(value.get_ref<json::array_t&>(),
+                             "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is number", json::type_error&);
+        CHECK_THROWS_WITH_AS(value.get_ref<json::string_t&>(),
+                             "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is number", json::type_error&);
+        CHECK_THROWS_WITH_AS(value.get_ref<json::boolean_t&>(),
+                             "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is number", json::type_error&);
+        CHECK_NOTHROW(value.get_ref<json::number_integer_t&>());
+        CHECK_THROWS_WITH_AS(value.get_ref<json::number_unsigned_t&>(),
+                             "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is number", json::type_error&);
+        CHECK_THROWS_WITH_AS(value.get_ref<json::number_float_t&>(),
+                             "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is number", json::type_error&);
+    }
+
+    SECTION("reference access to number_unsigned_t")
+    {
+        using test_type = json::number_unsigned_t;
+        json value = 23u;
+
+        // check if references are returned correctly
+        auto& p1 = value.get_ref<test_type&>();
+        CHECK(&p1 == value.get_ptr<test_type*>());
+        CHECK(p1 == value.get<test_type>());
+
+        const auto& p2 = value.get_ref<const test_type&>();
+        CHECK(&p2 == value.get_ptr<const test_type*>());
+        CHECK(p2 == value.get<test_type>());
+
+        // check if mismatching references throw correctly
+        CHECK_THROWS_WITH_AS(value.get_ref<json::object_t&>(),
+                             "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is number", json::type_error&);
+        CHECK_THROWS_WITH_AS(value.get_ref<json::array_t&>(),
+                             "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is number", json::type_error&);
+        CHECK_THROWS_WITH_AS(value.get_ref<json::string_t&>(),
+                             "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is number", json::type_error&);
+        CHECK_THROWS_WITH_AS(value.get_ref<json::boolean_t&>(),
+                             "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is number", json::type_error&);
+        //CHECK_THROWS_WITH_AS(value.get_ref<json::number_integer_t&>(),
+        //    "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is number", json::type_error&);
+        CHECK_NOTHROW(value.get_ref<json::number_unsigned_t&>());
+        CHECK_THROWS_WITH_AS(value.get_ref<json::number_float_t&>(), "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is number", json::type_error&);
+    }
+
+    SECTION("reference access to number_float_t")
+    {
+        using test_type = json::number_float_t;
+        json value = 42.23;
+
+        // check if references are returned correctly
+        auto& p1 = value.get_ref<test_type&>();
+        CHECK(&p1 == value.get_ptr<test_type*>());
+        CHECK(p1 == value.get<test_type>());
+
+        const auto& p2 = value.get_ref<const test_type&>();
+        CHECK(&p2 == value.get_ptr<const test_type*>());
+        CHECK(p2 == value.get<test_type>());
+
+        // check if mismatching references throw correctly
+        CHECK_THROWS_WITH_AS(value.get_ref<json::object_t&>(), "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is number", json::type_error&);
+        CHECK_THROWS_WITH_AS(value.get_ref<json::array_t&>(), "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is number", json::type_error&);
+        CHECK_THROWS_WITH_AS(value.get_ref<json::string_t&>(), "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is number", json::type_error&);
+        CHECK_THROWS_WITH_AS(value.get_ref<json::boolean_t&>(), "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is number", json::type_error&);
+        CHECK_THROWS_WITH_AS(value.get_ref<json::number_integer_t&>(), "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is number", json::type_error&);
+        CHECK_THROWS_WITH_AS(value.get_ref<json::number_unsigned_t&>(), "[json.exception.type_error.303] incompatible ReferenceType for get_ref, actual type is number", json::type_error&);
+        CHECK_NOTHROW(value.get_ref<json::number_float_t&>());
+    }
+}
diff --git a/external_imported/json/tests/src/unit-regression1.cpp b/external_imported/json/tests/src/unit-regression1.cpp
new file mode 100644
index 000000000..f5ef5d80b
--- /dev/null
+++ b/external_imported/json/tests/src/unit-regression1.cpp
@@ -0,0 +1,1513 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+// for some reason including this after the json header leads to linker errors with VS 2017...
+#include <locale>
+
+#define JSON_TESTS_PRIVATE
+#include <nlohmann/json.hpp>
+using nlohmann::json;
+#ifdef JSON_TEST_NO_GLOBAL_UDLS
+    using namespace nlohmann::literals; // NOLINT(google-build-using-namespace)
+#endif
+
+#include <fstream>
+#include <sstream>
+#include <list>
+#include <limits>
+#include <cstdio>
+#include "make_test_data_available.hpp"
+
+#ifdef JSON_HAS_CPP_17
+    #include <variant>
+#endif
+
+#include "fifo_map.hpp"
+
+/////////////////////////////////////////////////////////////////////
+// for #972
+/////////////////////////////////////////////////////////////////////
+
+template<class K, class V, class dummy_compare, class A>
+using my_workaround_fifo_map = nlohmann::fifo_map<K, V, nlohmann::fifo_map_compare<K>, A>;
+using my_json = nlohmann::basic_json<my_workaround_fifo_map>;
+
+/////////////////////////////////////////////////////////////////////
+// for #977
+/////////////////////////////////////////////////////////////////////
+
+namespace ns
+{
+struct foo
+{
+    int x;
+};
+
+template <typename, typename SFINAE = void>
+struct foo_serializer;
+
+template<typename T>
+struct foo_serializer<T, typename std::enable_if<std::is_same<foo, T>::value>::type>
+{
+    template <typename BasicJsonType>
+    static void to_json(BasicJsonType& j, const T& value)
+    {
+        j = BasicJsonType{{"x", value.x}};
+    }
+    template <typename BasicJsonType>
+    static void from_json(const BasicJsonType& j, T& value)     // !!!
+    {
+        nlohmann::from_json(j.at("x"), value.x);
+    }
+};
+
+template<typename T>
+struct foo_serializer < T, typename std::enable_if < !std::is_same<foo, T>::value >::type >
+{
+    template <typename BasicJsonType>
+    static void to_json(BasicJsonType& j, const T& value) noexcept // NOLINT(bugprone-exception-escape)
+    {
+        ::nlohmann::to_json(j, value);
+    }
+    template <typename BasicJsonType>
+    static void from_json(const BasicJsonType& j, T& value)   //!!!
+    {
+        ::nlohmann::from_json(j, value);
+    }
+};
+} // namespace ns
+
+using foo_json = nlohmann::basic_json<std::map, std::vector, std::string, bool, std::int64_t,
+      std::uint64_t, double, std::allocator, ns::foo_serializer, std::vector<std::uint8_t>>;
+
+/////////////////////////////////////////////////////////////////////
+// for #805
+/////////////////////////////////////////////////////////////////////
+
+namespace
+{
+struct nocopy // NOLINT(cppcoreguidelines-special-member-functions,hicpp-special-member-functions)
+{
+    nocopy() = default;
+    nocopy(const nocopy&) = delete;
+    nocopy(nocopy&&) = delete;
+    nocopy& operator=(const nocopy&) = delete;
+    nocopy& operator=(nocopy&&) = delete;
+
+    int val = 0;
+
+    friend void to_json(json& j, const nocopy& n)
+    {
+        j = {{"val", n.val}};
+    }
+};
+} // namespace
+
+TEST_CASE("regression tests 1")
+{
+    SECTION("issue #60 - Double quotation mark is not parsed correctly")
+    {
+        SECTION("escape_doublequote")
+        {
+            const auto* s = R"(["\"foo\""])";
+            json j = json::parse(s);
+            auto expected = R"(["\"foo\""])"_json;
+            CHECK(j == expected);
+        }
+    }
+
+    SECTION("issue #70 - Handle infinity and NaN cases")
+    {
+        // previously, NAN/INFINITY created a null value; now, the values are
+        // properly stored, but are dumped as "null"
+        SECTION("NAN value")
+        {
+            CHECK(json(NAN).dump() == "null");
+            CHECK(json(json::number_float_t(NAN)).dump() == "null");
+        }
+
+        SECTION("infinity")
+        {
+            CHECK(json(INFINITY).dump() == "null");
+            CHECK(json(json::number_float_t(INFINITY)).dump() == "null");
+        }
+
+        // With 3.0.0, the semantics of this changed: NAN and infinity are
+        // stored properly inside the JSON value (no exception or conversion
+        // to null), but are serialized as null.
+        SECTION("NAN value")
+        {
+            json const j1 = NAN;
+            CHECK(j1.is_number_float());
+            json::number_float_t const f1{j1};
+            CHECK(std::isnan(f1));
+
+            json const j2 = static_cast<json::number_float_t>(NAN);
+            CHECK(j2.is_number_float());
+            json::number_float_t const f2{j2};
+            CHECK(std::isnan(f2));
+        }
+
+        SECTION("infinity")
+        {
+            json const j1 = INFINITY;
+            CHECK(j1.is_number_float());
+            json::number_float_t const f1{j1};
+            CHECK(!std::isfinite(f1));
+
+            json const j2 = static_cast<json::number_float_t>(INFINITY);
+            CHECK(j2.is_number_float());
+            json::number_float_t const f2{j2};
+            CHECK(!std::isfinite(f2));
+        }
+    }
+
+    SECTION("pull request #71 - handle enum type")
+    {
+        enum { t = 0, u = 102};
+        json j = json::array();
+        j.push_back(t);
+
+        // maybe this is not the place to test this?
+        json j2 = u;
+
+        auto anon_enum_value = j2.get<decltype(u)>();
+        CHECK(u == anon_enum_value);
+
+        // check if the actual value was stored
+        CHECK(j2 == 102);
+
+        static_assert(std::is_same<decltype(anon_enum_value), decltype(u)>::value, "types must be the same");
+
+        j.push_back(json::object(
+        {
+            {"game_type", t}
+        }));
+    }
+
+    SECTION("issue #76 - dump() / parse() not idempotent")
+    {
+        // create JSON object
+        json fields;
+        fields["one"] = std::string("one");
+        fields["two"] = std::string("two three");
+        fields["three"] = std::string("three \"four\"");
+
+        // create another JSON object by deserializing the serialization
+        std::string const payload = fields.dump();
+        json parsed_fields = json::parse(payload);
+
+        // check individual fields to match both objects
+        CHECK(parsed_fields["one"] == fields["one"]);
+        CHECK(parsed_fields["two"] == fields["two"]);
+        CHECK(parsed_fields["three"] == fields["three"]);
+
+        // check individual fields to match original input
+        CHECK(parsed_fields["one"] == std::string("one"));
+        CHECK(parsed_fields["two"] == std::string("two three"));
+        CHECK(parsed_fields["three"] == std::string("three \"four\""));
+
+        // check equality of the objects
+        CHECK(parsed_fields == fields);
+
+        // check equality of the serialized objects
+        CHECK(fields.dump() == parsed_fields.dump());
+
+        // check everything in one line
+        CHECK(fields == json::parse(fields.dump()));
+    }
+
+    SECTION("issue #82 - lexer::get_number return NAN")
+    {
+        const auto* const content = R"(
+        {
+            "Test":"Test1",
+            "Number":100,
+            "Foo":42.42
+        })";
+
+        std::stringstream ss;
+        ss << content;
+        json j;
+        ss >> j;
+
+        auto test = j["Test"].get<std::string>();
+        CHECK(test == "Test1");
+        int number{j["Number"]};
+        CHECK(number == 100);
+        float foo{j["Foo"]};
+        CHECK(static_cast<double>(foo) == Approx(42.42));
+    }
+
+    SECTION("issue #89 - nonstandard integer type")
+    {
+        // create JSON class with nonstandard integer number type
+        using custom_json =
+            nlohmann::basic_json<std::map, std::vector, std::string, bool, int32_t, uint32_t, float>;
+        custom_json j;
+        j["int_1"] = 1;
+        CHECK(j["int_1"] == 1);
+
+        // tests for correct handling of non-standard integers that overflow the type selected by the user
+
+        // unsigned integer object creation - expected to wrap and still be stored as an integer
+        j = 4294967296U; // 2^32
+        CHECK(static_cast<int>(j.type()) == static_cast<int>(custom_json::value_t::number_unsigned));
+        CHECK(j.get<uint32_t>() == 0);  // Wrap
+
+        // unsigned integer parsing - expected to overflow and be stored as a float
+        j = custom_json::parse("4294967296"); // 2^32
+        CHECK(static_cast<int>(j.type()) == static_cast<int>(custom_json::value_t::number_float));
+        CHECK(j.get<float>() == 4294967296.0f);
+
+        // integer object creation - expected to wrap and still be stored as an integer
+        j = -2147483649LL; // -2^31-1
+        CHECK(static_cast<int>(j.type()) == static_cast<int>(custom_json::value_t::number_integer));
+        CHECK(j.get<int32_t>() == 2147483647);  // Wrap
+
+        // integer parsing - expected to overflow and be stored as a float with rounding
+        j = custom_json::parse("-2147483649"); // -2^31
+        CHECK(static_cast<int>(j.type()) == static_cast<int>(custom_json::value_t::number_float));
+        CHECK(j.get<float>() == -2147483650.0f);
+    }
+
+    SECTION("issue #93 reverse_iterator operator inheritance problem")
+    {
+        {
+            json a = {1, 2, 3};
+            json::reverse_iterator rit = a.rbegin();
+            ++rit;
+            CHECK(*rit == json(2));
+            CHECK(rit.value() == json(2));
+        }
+        {
+            json a = {1, 2, 3};
+            json::reverse_iterator const rit = ++a.rbegin();
+            CHECK(*rit == json(2));
+            CHECK(rit.value() == json(2));
+        }
+        {
+            json a = {1, 2, 3};
+            json::reverse_iterator rit = a.rbegin();
+            ++rit;
+            json b = {0, 0, 0};
+            std::transform(rit, a.rend(), b.rbegin(), [](json el)
+            {
+                return el;
+            });
+            CHECK(b == json({0, 1, 2}));
+        }
+        {
+            json a = {1, 2, 3};
+            json b = {0, 0, 0};
+            std::transform(++a.rbegin(), a.rend(), b.rbegin(), [](json el)
+            {
+                return el;
+            });
+            CHECK(b == json({0, 1, 2}));
+        }
+    }
+
+    SECTION("issue #100 - failed to iterator json object with reverse_iterator")
+    {
+        json config =
+        {
+            { "111", 111 },
+            { "112", 112 },
+            { "113", 113 }
+        };
+
+        std::stringstream ss;
+
+        for (auto it = config.begin(); it != config.end(); ++it)
+        {
+            ss << it.key() << ": " << it.value() << '\n';
+        }
+
+        for (auto it = config.rbegin(); it != config.rend(); ++it)
+        {
+            ss << it.key() << ": " << it.value() << '\n';
+        }
+
+        CHECK(ss.str() == "111: 111\n112: 112\n113: 113\n113: 113\n112: 112\n111: 111\n");
+    }
+
+    SECTION("issue #101 - binary string causes numbers to be dumped as hex")
+    {
+        int64_t const number = 10;
+        std::string const bytes{"\x00" "asdf\n", 6};
+        json j;
+        j["int64"] = number;
+        j["binary string"] = bytes;
+        // make sure the number is really printed as decimal "10" and not as
+        // hexadecimal "a"
+        CHECK(j.dump() == "{\"binary string\":\"\\u0000asdf\\n\",\"int64\":10}");
+    }
+
+    SECTION("issue #111 - subsequent unicode chars")
+    {
+        std::string const bytes{0x7, 0x7};
+        json j;
+        j["string"] = bytes;
+        CHECK(j["string"] == "\u0007\u0007");
+    }
+
+#if JSON_USE_IMPLICIT_CONVERSIONS
+    SECTION("issue #144 - implicit assignment to std::string fails")
+    {
+        json o = {{"name", "value"}};
+
+        std::string s1 = o["name"];
+        CHECK(s1 == "value");
+
+        std::string s2;
+        s2 = o["name"];
+
+        CHECK(s2 == "value");
+
+        // improve coverage
+        o["int"] = 1;
+#if JSON_DIAGNOSTICS
+        CHECK_THROWS_WITH_AS(s2 = o["int"], "[json.exception.type_error.302] (/int) type must be string, but is number", json::type_error);
+#else
+        CHECK_THROWS_WITH_AS(s2 = o["int"], "[json.exception.type_error.302] type must be string, but is number", json::type_error);
+#endif
+    }
+#endif
+
+    SECTION("issue #146 - character following a surrogate pair is skipped")
+    {
+        CHECK(json::parse("\"\\ud80c\\udc60abc\"").get<json::string_t>() == "\xf0\x93\x81\xa0\x61\x62\x63");
+    }
+
+    SECTION("issue #171 - Cannot index by key of type static constexpr const char*")
+    {
+        json j;
+
+        // Non-const access with key as "char []"
+        char array_key[] = "Key1"; // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+        CHECK_NOTHROW(j[array_key] = 1);
+        CHECK(j[array_key] == json(1));
+
+        // Non-const access with key as "const char[]"
+        const char const_array_key[] = "Key2"; // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+        CHECK_NOTHROW(j[const_array_key] = 2);
+        CHECK(j[const_array_key] == json(2));
+
+        // Non-const access with key as "char *"
+        char _ptr_key[] = "Key3"; // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+        char* ptr_key = &_ptr_key[0]; // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+        CHECK_NOTHROW(j[ptr_key] = 3);
+        CHECK(j[ptr_key] == json(3));
+
+        // Non-const access with key as "const char *"
+        const char* const_ptr_key = "Key4";
+        CHECK_NOTHROW(j[const_ptr_key] = 4);
+        CHECK(j[const_ptr_key] == json(4));
+
+        // Non-const access with key as "static constexpr const char *"
+        static constexpr const char* constexpr_ptr_key = "Key5";
+        CHECK_NOTHROW(j[constexpr_ptr_key] = 5);
+        CHECK(j[constexpr_ptr_key] == json(5));
+
+        const json j_const = j;
+
+        // Const access with key as "char []"
+        CHECK(j_const[array_key] == json(1));
+
+        // Const access with key as "const char[]"
+        CHECK(j_const[const_array_key] == json(2));
+
+        // Const access with key as "char *"
+        CHECK(j_const[ptr_key] == json(3));
+
+        // Const access with key as "const char *"
+        CHECK(j_const[const_ptr_key] == json(4));
+
+        // Const access with key as "static constexpr const char *"
+        CHECK(j_const[constexpr_ptr_key] == json(5));
+    }
+
+    SECTION("issue #186 miloyip/nativejson-benchmark: floating-point parsing")
+    {
+        json j;
+
+        j = json::parse("-0.0");
+        CHECK(j.get<double>() == -0.0);
+
+        j = json::parse("2.22507385850720113605740979670913197593481954635164564e-308");
+        CHECK(j.get<double>() == 2.2250738585072009e-308);
+
+        j = json::parse("0.999999999999999944488848768742172978818416595458984374");
+        CHECK(j.get<double>() == 0.99999999999999989);
+
+        j = json::parse("1.00000000000000011102230246251565404236316680908203126");
+        CHECK(j.get<double>() == 1.00000000000000022);
+
+        j = json::parse("7205759403792793199999e-5");
+        CHECK(j.get<double>() == 72057594037927928.0);
+
+        j = json::parse("922337203685477529599999e-5");
+        CHECK(j.get<double>() == 9223372036854774784.0);
+
+        j = json::parse("1014120480182583464902367222169599999e-5");
+        CHECK(j.get<double>() == 10141204801825834086073718800384.0);
+
+        j = json::parse("5708990770823839207320493820740630171355185151999e-3");
+        CHECK(j.get<double>() == 5708990770823838890407843763683279797179383808.0);
+
+        // create JSON class with nonstandard float number type
+
+        // float
+        nlohmann::basic_json<std::map, std::vector, std::string, bool, int32_t, uint32_t, float> const j_float =
+            1.23e25f;
+        CHECK(j_float.get<float>() == 1.23e25f);
+
+        // double
+        nlohmann::basic_json<std::map, std::vector, std::string, bool, int64_t, uint64_t, double> const j_double =
+            1.23e35;
+        CHECK(j_double.get<double>() == 1.23e35);
+
+        // long double
+        nlohmann::basic_json<std::map, std::vector, std::string, bool, int64_t, uint64_t, long double>
+        const j_long_double = 1.23e45L;
+        CHECK(j_long_double.get<long double>() == 1.23e45L);
+    }
+
+    SECTION("issue #228 - double values are serialized with commas as decimal points")
+    {
+        json const j1a = 2312.42;
+        json const j1b = json::parse("2312.42");
+
+        json const j2a = 2342e-2;
+        //issue #230
+        //json j2b = json::parse("2342e-2");
+
+        json const j3a = 10E3;
+        json const j3b = json::parse("10E3");
+        json const j3c = json::parse("10e3");
+
+        // class to create a locale that would use a comma for decimals
+        class CommaDecimalSeparator : public std::numpunct<char>
+        {
+          protected:
+            char do_decimal_point() const override
+            {
+                return ',';
+            }
+
+            char do_thousands_sep() const override
+            {
+                return '.';
+            }
+
+            std::string do_grouping() const override
+            {
+                return "\03";
+            }
+        };
+
+        // change locale to mess with decimal points
+        auto orig_locale = std::locale::global(std::locale(std::locale(), new CommaDecimalSeparator));
+
+        CHECK(j1a.dump() == "2312.42");
+        CHECK(j1b.dump() == "2312.42");
+
+        // check if locale is properly reset
+        std::stringstream ss;
+        ss.imbue(std::locale(std::locale(), new CommaDecimalSeparator));
+        ss << 4712.11;
+        CHECK(ss.str() == "4.712,11");
+        ss << j1a;
+        CHECK(ss.str() == "4.712,112312.42");
+        ss << 47.11;
+        CHECK(ss.str() == "4.712,112312.4247,11");
+
+        CHECK(j2a.dump() == "23.42");
+        //issue #230
+        //CHECK(j2b.dump() == "23.42");
+
+        CHECK(j3a.dump() == "10000.0");
+        CHECK(j3b.dump() == "10000.0");
+        CHECK(j3c.dump() == "10000.0");
+        //CHECK(j3b.dump() == "1E04"); // roundtrip error
+        //CHECK(j3c.dump() == "1e04"); // roundtrip error
+
+        std::locale::global(orig_locale);
+    }
+
+    SECTION("issue #378 - locale-independent num-to-str")
+    {
+        static_cast<void>(setlocale(LC_NUMERIC, "de_DE.UTF-8"));
+
+        // verify that dumped correctly with '.' and no grouping
+        const json j1 = 12345.67;
+        CHECK(json(12345.67).dump() == "12345.67");
+        static_cast<void>(setlocale(LC_NUMERIC, "C"));
+    }
+
+    SECTION("issue #379 - locale-independent str-to-num")
+    {
+        static_cast<void>(setlocale(LC_NUMERIC, "de_DE.UTF-8"));
+
+        // verify that parsed correctly despite using strtod internally
+        CHECK(json::parse("3.14").get<double>() == 3.14);
+
+        // check a different code path
+        CHECK(json::parse("1.000000000000000000000000000000000000000000000000000000000000000000000000").get<double>() == 1.0);
+    }
+
+    SECTION("issue #233 - Can't use basic_json::iterator as a base iterator for std::move_iterator")
+    {
+        json source = {"a", "b", "c"};
+        json expected = {"a", "b"};
+        json dest;
+
+        std::copy_n(std::make_move_iterator(source.begin()), 2, std::back_inserter(dest));
+
+        CHECK(dest == expected);
+    }
+
+    SECTION("issue #235 - ambiguous overload for 'push_back' and 'operator+='")
+    {
+        json data = {{"key", "value"}};
+        data.push_back({"key2", "value2"});
+        data += {"key3", "value3"};
+
+        CHECK(data == json({{"key", "value"}, {"key2", "value2"}, {"key3", "value3"}}));
+    }
+
+    SECTION("issue #269 - diff generates incorrect patch when removing multiple array elements")
+    {
+        json const doc = R"( { "arr1": [1, 2, 3, 4] } )"_json;
+        json expected = R"( { "arr1": [1, 2] } )"_json;
+
+        // check roundtrip
+        CHECK(doc.patch(json::diff(doc, expected)) == expected);
+    }
+
+    SECTION("issue #283 - value() does not work with _json_pointer types")
+    {
+        json j =
+        {
+            {"object", {{"key1", 1}, {"key2", 2}}},
+        };
+
+        int at_integer{j.at("/object/key2"_json_pointer)};
+        int val_integer = j.value("/object/key2"_json_pointer, 0);
+
+        CHECK(at_integer == val_integer);
+    }
+
+    SECTION("issue #304 - Unused variable warning")
+    {
+        // code triggered a "warning: unused variable" warning and is left
+        // here to avoid the warning in the future
+        json object;
+        json const patch = json::array();
+        object = object.patch(patch);
+    }
+
+    SECTION("issue #306 - Parsing fails without space at end of file")
+    {
+        for (const auto* filename :
+                {
+                    TEST_DATA_DIRECTORY "/regression/broken_file.json",
+                    TEST_DATA_DIRECTORY "/regression/working_file.json"
+                })
+        {
+            CAPTURE(filename)
+            json j;
+            std::ifstream f(filename);
+            CHECK_NOTHROW(f >> j);
+        }
+    }
+
+    SECTION("issue #310 - make json_benchmarks no longer working in 2.0.4")
+    {
+        for (const auto* filename :
+                {
+                    TEST_DATA_DIRECTORY "/regression/floats.json",
+                    TEST_DATA_DIRECTORY "/regression/signed_ints.json",
+                    TEST_DATA_DIRECTORY "/regression/unsigned_ints.json",
+                    TEST_DATA_DIRECTORY "/regression/small_signed_ints.json"
+                })
+        {
+            CAPTURE(filename)
+            json j;
+            std::ifstream f(filename);
+            CHECK_NOTHROW(f >> j);
+        }
+    }
+
+    SECTION("issue #323 - add nested object capabilities to pointers")
+    {
+        json j;
+        j["/this/that/2"_json_pointer] = 27;
+        CHECK(j == json({{"this", {{"that", {nullptr, nullptr, 27}}}}}));
+    }
+
+    SECTION("issue #329 - serialized value not always can be parsed")
+    {
+        json _;
+        CHECK_THROWS_WITH_AS(_ = json::parse("22e2222"), "[json.exception.out_of_range.406] number overflow parsing '22e2222'", json::out_of_range&);
+    }
+
+    SECTION("issue #360 - Loss of precision when serializing <double>")
+    {
+        auto check_roundtrip = [](double number)
+        {
+            CAPTURE(number)
+
+            json j = number;
+            CHECK(j.is_number_float());
+
+            std::stringstream ss;
+            ss << j;
+
+            CHECK_NOTHROW(ss >> j);
+            CHECK(j.is_number_float());
+            CHECK(j.get<json::number_float_t>() == number);
+        };
+
+        check_roundtrip(100000000000.1236);
+        check_roundtrip((std::numeric_limits<json::number_float_t>::max)());
+
+        // Some more numbers which fail to roundtrip when serialized with digits10 significand digits (instead of max_digits10)
+        check_roundtrip(1.541888611948064e-17);
+        check_roundtrip(5.418771028591015e-16);
+        check_roundtrip(9.398685592608595e-15);
+        check_roundtrip(8.826843952762347e-14);
+        check_roundtrip(8.143291313475335e-13);
+        check_roundtrip(4.851328172762508e-12);
+        check_roundtrip(6.677850998084358e-11);
+        check_roundtrip(3.995398518174525e-10);
+        check_roundtrip(1.960452605645124e-9);
+        check_roundtrip(3.551812586302883e-8);
+        check_roundtrip(2.947988411689261e-7);
+        check_roundtrip(8.210166748056192e-6);
+        check_roundtrip(6.104889704266753e-5);
+        check_roundtrip(0.0008629954631330876);
+        check_roundtrip(0.004936993881051611);
+        check_roundtrip(0.08309725102608073);
+        check_roundtrip(0.5210494268499783);
+        check_roundtrip(6.382927930939767);
+        check_roundtrip(59.94947245358671);
+        check_roundtrip(361.0838651266122);
+        check_roundtrip(4678.354596181877);
+        check_roundtrip(61412.17658956043);
+        check_roundtrip(725696.0799057782);
+        check_roundtrip(2811732.583399828);
+        check_roundtrip(30178351.07533605);
+        check_roundtrip(689684880.3235844);
+        check_roundtrip(5714887673.555147);
+        check_roundtrip(84652038821.18808);
+        check_roundtrip(156510583431.7721);
+        check_roundtrip(5938450569021.732);
+        check_roundtrip(83623297654460.33);
+        check_roundtrip(701466573254773.6);
+        check_roundtrip(1369013370304513);
+        check_roundtrip(96963648023094720); // NOLINT(bugprone-narrowing-conversions,cppcoreguidelines-narrowing-conversions)
+        check_roundtrip(3.478237409280108e+17);
+    }
+
+    SECTION("issue #366 - json::parse on failed stream gets stuck")
+    {
+        std::ifstream f("file_not_found.json");
+        json _;
+        CHECK_THROWS_WITH_AS(_ = json::parse(f), "[json.exception.parse_error.101] parse error at line 1, column 1: attempting to parse an empty input; check that your input string or stream contains the expected JSON", json::parse_error&);
+    }
+
+    SECTION("issue #367 - calling stream at EOF")
+    {
+        std::stringstream ss;
+        json j;
+        ss << "123";
+        CHECK_NOTHROW(ss >> j);
+
+        // see https://github.com/nlohmann/json/issues/367#issuecomment-262841893:
+        // ss is not at EOF; this yielded an error before the fix
+        // (threw basic_string::append). No, it should just throw
+        // a parse error because of the EOF.
+        CHECK_THROWS_WITH_AS(ss >> j, "[json.exception.parse_error.101] parse error at line 1, column 1: attempting to parse an empty input; check that your input string or stream contains the expected JSON", json::parse_error&);
+    }
+
+    SECTION("issue #367 - behavior of operator>> should more closely resemble that of built-in overloads")
+    {
+        SECTION("(empty)")
+        {
+            std::stringstream ss;
+            json j;
+            CHECK_THROWS_WITH_AS(ss >> j, "[json.exception.parse_error.101] parse error at line 1, column 1: attempting to parse an empty input; check that your input string or stream contains the expected JSON", json::parse_error&);
+        }
+
+        SECTION("(whitespace)")
+        {
+            std::stringstream ss;
+            ss << "   ";
+            json j;
+            CHECK_THROWS_WITH_AS(ss >> j,
+                                 "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - unexpected end of input; expected '[', '{', or a literal", json::parse_error&);
+        }
+
+        SECTION("one value")
+        {
+            std::stringstream ss;
+            ss << "111";
+            json j;
+            CHECK_NOTHROW(ss >> j);
+            CHECK(j == 111);
+
+            CHECK_THROWS_WITH_AS(ss >> j, "[json.exception.parse_error.101] parse error at line 1, column 1: attempting to parse an empty input; check that your input string or stream contains the expected JSON", json::parse_error&);
+        }
+
+        SECTION("one value + whitespace")
+        {
+            std::stringstream ss;
+            ss << "222 \t\n";
+            json j;
+            CHECK_NOTHROW(ss >> j);
+            CHECK(j == 222);
+
+            CHECK_THROWS_WITH_AS(ss >> j,
+                                 "[json.exception.parse_error.101] parse error at line 2, column 1: syntax error while parsing value - unexpected end of input; expected '[', '{', or a literal", json::parse_error&);
+        }
+
+        SECTION("whitespace + one value")
+        {
+            std::stringstream ss;
+            ss << "\n\t 333";
+            json j;
+            CHECK_NOTHROW(ss >> j);
+            CHECK(j == 333);
+
+            CHECK_THROWS_WITH_AS(ss >> j, "[json.exception.parse_error.101] parse error at line 1, column 1: attempting to parse an empty input; check that your input string or stream contains the expected JSON", json::parse_error&);
+        }
+
+        SECTION("three values")
+        {
+            std::stringstream ss;
+            ss << " 111 \n222\n \n  333";
+            json j;
+            CHECK_NOTHROW(ss >> j);
+            CHECK(j == 111);
+            CHECK_NOTHROW(ss >> j);
+            CHECK(j == 222);
+            CHECK_NOTHROW(ss >> j);
+            CHECK(j == 333);
+
+            CHECK_THROWS_WITH_AS(ss >> j, "[json.exception.parse_error.101] parse error at line 1, column 1: attempting to parse an empty input; check that your input string or stream contains the expected JSON", json::parse_error&);
+        }
+
+        SECTION("literals without whitespace")
+        {
+            std::stringstream ss;
+            ss << "truefalsenull\"\"";
+            json j;
+            CHECK_NOTHROW(ss >> j);
+            CHECK(j == true);
+            CHECK_NOTHROW(ss >> j);
+            CHECK(j == false);
+            CHECK_NOTHROW(ss >> j);
+            CHECK(j == nullptr);
+            CHECK_NOTHROW(ss >> j);
+            CHECK(j == "");
+
+            CHECK_THROWS_WITH_AS(ss >> j, "[json.exception.parse_error.101] parse error at line 1, column 1: attempting to parse an empty input; check that your input string or stream contains the expected JSON", json::parse_error&);
+        }
+
+        SECTION("example from #529")
+        {
+            std::stringstream ss;
+            ss << "{\n    \"one\"   : 1,\n    \"two\"   : 2\n}\n{\n    \"three\" : 3\n}";
+            json j;
+            CHECK_NOTHROW(ss >> j);
+            CHECK(j == json({{"one", 1}, {"two", 2}}));
+            CHECK_NOTHROW(ss >> j);
+            CHECK(j == json({{"three", 3}}));
+
+            CHECK_THROWS_WITH_AS(ss >> j, "[json.exception.parse_error.101] parse error at line 1, column 1: attempting to parse an empty input; check that your input string or stream contains the expected JSON", json::parse_error&);
+        }
+
+        SECTION("second example from #529")
+        {
+            std::string const str = "{\n\"one\"   : 1,\n\"two\"   : 2\n}\n{\n\"three\" : 3\n}";
+
+            {
+                std::ofstream file("test.json");
+                file << str;
+            }
+
+            std::ifstream stream("test.json", std::ifstream::in);
+            json val;
+
+            size_t i = 0;
+            while (stream.peek() != EOF)
+            {
+                CAPTURE(i)
+                CHECK_NOTHROW(stream >> val);
+
+                CHECK(i < 2);
+
+                if (i == 0)
+                {
+                    CHECK(val == json({{"one", 1}, {"two", 2}}));
+                }
+
+                if (i == 1)
+                {
+                    CHECK(val == json({{"three", 3}}));
+                }
+
+                ++i;
+            }
+
+            static_cast<void>(std::remove("test.json"));
+        }
+    }
+
+    SECTION("issue #389 - Integer-overflow (OSS-Fuzz issue 267)")
+    {
+        // original test case
+        json const j1 = json::parse("-9223372036854775808");
+        CHECK(j1.is_number_integer());
+        CHECK(j1.get<json::number_integer_t>() == (std::numeric_limits<std::int64_t>::min)());
+
+        // edge case (+1; still an integer)
+        json const j2 = json::parse("-9223372036854775807");
+        CHECK(j2.is_number_integer());
+        CHECK(j2.get<json::number_integer_t>() == (std::numeric_limits<std::int64_t>::min)() + 1);
+
+        // edge case (-1; overflow -> floats)
+        json const j3 = json::parse("-9223372036854775809");
+        CHECK(j3.is_number_float());
+    }
+
+    SECTION("issue #380 - bug in overflow detection when parsing integers")
+    {
+        json const j = json::parse("166020696663385964490");
+        CHECK(j.is_number_float());
+        CHECK(j.get<json::number_float_t>() == 166020696663385964490.0);
+    }
+
+    SECTION("issue #405 - Heap-buffer-overflow (OSS-Fuzz issue 342)")
+    {
+        // original test case
+        std::vector<uint8_t> const vec {0x65, 0xf5, 0x0a, 0x48, 0x21};
+        json _;
+        CHECK_THROWS_WITH_AS(_ = json::from_cbor(vec), "[json.exception.parse_error.110] parse error at byte 6: syntax error while parsing CBOR string: unexpected end of input", json::parse_error&);
+    }
+
+    SECTION("issue #407 - Heap-buffer-overflow (OSS-Fuzz issue 343)")
+    {
+        json _;
+
+        // original test case: incomplete float64
+        std::vector<uint8_t> const vec1 {0xcb, 0x8f, 0x0a};
+        CHECK_THROWS_WITH_AS(_ = json::from_msgpack(vec1), "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing MessagePack number: unexpected end of input", json::parse_error&);
+
+        // related test case: incomplete float32
+        std::vector<uint8_t> const vec2 {0xca, 0x8f, 0x0a};
+        CHECK_THROWS_WITH_AS(_ = json::from_msgpack(vec2), "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing MessagePack number: unexpected end of input", json::parse_error&);
+
+        // related test case: incomplete Half-Precision Float (CBOR)
+        std::vector<uint8_t> const vec3 {0xf9, 0x8f};
+        CHECK_THROWS_WITH_AS(_ = json::from_cbor(vec3), "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing CBOR number: unexpected end of input", json::parse_error&);
+
+        // related test case: incomplete Single-Precision Float (CBOR)
+        std::vector<uint8_t> const vec4 {0xfa, 0x8f, 0x0a};
+        CHECK_THROWS_WITH_AS(_ = json::from_cbor(vec4), "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing CBOR number: unexpected end of input", json::parse_error&);
+
+        // related test case: incomplete Double-Precision Float (CBOR)
+        std::vector<uint8_t> const vec5 {0xfb, 0x8f, 0x0a};
+        CHECK_THROWS_WITH_AS(_ = json::from_cbor(vec5), "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing CBOR number: unexpected end of input", json::parse_error&);
+    }
+
+    SECTION("issue #408 - Heap-buffer-overflow (OSS-Fuzz issue 344)")
+    {
+        json _;
+
+        // original test case
+        std::vector<uint8_t> const vec1 {0x87};
+        CHECK_THROWS_WITH_AS(_ = json::from_msgpack(vec1), "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing MessagePack string: unexpected end of input", json::parse_error&);
+
+        // more test cases for MessagePack
+        for (auto b :
+                {
+                    0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, // fixmap
+                    0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, // fixarray
+                    0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, // fixstr
+                    0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf
+                })
+        {
+            std::vector<uint8_t> const vec(1, static_cast<uint8_t>(b));
+            CHECK_THROWS_AS(_ = json::from_msgpack(vec), json::parse_error&);
+        }
+
+        // more test cases for CBOR
+        for (auto b :
+                {
+                    0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
+                    0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, // UTF-8 string
+                    0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
+                    0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, // array
+                    0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
+                    0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7 // map
+                })
+        {
+            std::vector<uint8_t> const vec(1, static_cast<uint8_t>(b));
+            CHECK_THROWS_AS(_ = json::from_cbor(vec), json::parse_error&);
+        }
+
+        // special case: empty input
+        std::vector<uint8_t> const vec2;
+        CHECK_THROWS_WITH_AS(_ = json::from_cbor(vec2), "[json.exception.parse_error.110] parse error at byte 1: syntax error while parsing CBOR value: unexpected end of input", json::parse_error&);
+        CHECK_THROWS_WITH_AS(_ = json::from_msgpack(vec2), "[json.exception.parse_error.110] parse error at byte 1: syntax error while parsing MessagePack value: unexpected end of input", json::parse_error&);
+    }
+
+    SECTION("issue #411 - Heap-buffer-overflow (OSS-Fuzz issue 366)")
+    {
+        json _;
+
+        // original test case: empty UTF-8 string (indefinite length)
+        std::vector<uint8_t> const vec1 {0x7f};
+        CHECK_THROWS_WITH_AS(_ = json::from_cbor(vec1), "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing CBOR string: unexpected end of input", json::parse_error&);
+
+        // related test case: empty array (indefinite length)
+        std::vector<uint8_t> const vec2 {0x9f};
+        CHECK_THROWS_WITH_AS(_ = json::from_cbor(vec2), "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing CBOR value: unexpected end of input", json::parse_error&);
+
+        // related test case: empty map (indefinite length)
+        std::vector<uint8_t> const vec3 {0xbf};
+        CHECK_THROWS_WITH_AS(_ = json::from_cbor(vec3), "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing CBOR string: unexpected end of input", json::parse_error&);
+    }
+
+    SECTION("issue #412 - Heap-buffer-overflow (OSS-Fuzz issue 367)")
+    {
+        // original test case
+        std::vector<uint8_t> const vec
+        {
+            0xab, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98,
+            0x98, 0x98, 0x98, 0x98, 0x98, 0x00, 0x00, 0x00,
+            0x60, 0xab, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98,
+            0x98, 0x98, 0x98, 0x98, 0x98, 0x00, 0x00, 0x00,
+            0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60,
+            0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60,
+            0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60,
+            0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60,
+            0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60,
+            0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60,
+            0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0xa0, 0x9f,
+            0x9f, 0x97, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60,
+            0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60,
+            0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60,
+            0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60,
+            0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60,
+            0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60
+        };
+
+        json _;
+        CHECK_THROWS_WITH_AS(_ = json::from_cbor(vec), "[json.exception.parse_error.113] parse error at byte 2: syntax error while parsing CBOR string: expected length specification (0x60-0x7B) or indefinite string type (0x7F); last byte: 0x98", json::parse_error&);
+
+        // related test case: nonempty UTF-8 string (indefinite length)
+        std::vector<uint8_t> const vec1 {0x7f, 0x61, 0x61};
+        CHECK_THROWS_WITH_AS(_ = json::from_cbor(vec1), "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing CBOR string: unexpected end of input", json::parse_error&);
+
+        // related test case: nonempty array (indefinite length)
+        std::vector<uint8_t> const vec2 {0x9f, 0x01};
+        CHECK_THROWS_WITH_AS(_ = json::from_cbor(vec2), "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing CBOR value: unexpected end of input", json::parse_error&);
+
+        // related test case: nonempty map (indefinite length)
+        std::vector<uint8_t> const vec3 {0xbf, 0x61, 0x61, 0x01};
+        CHECK_THROWS_WITH_AS(_ = json::from_cbor(vec3), "[json.exception.parse_error.110] parse error at byte 5: syntax error while parsing CBOR string: unexpected end of input", json::parse_error&);
+    }
+
+    SECTION("issue #414 - compare with literal 0)")
+    {
+#define CHECK_TYPE(v) \
+    CHECK((json(v) == (v)));\
+    CHECK(((v) == json(v)));\
+    CHECK_FALSE((json(v) != (v)));\
+    CHECK_FALSE(((v) != json(v)));
+
+        CHECK_TYPE(nullptr)
+        CHECK_TYPE(0)
+        CHECK_TYPE(0u)
+        CHECK_TYPE(0L)
+        CHECK_TYPE(0.0)
+        CHECK_TYPE("") // NOLINT(readability-container-size-empty)
+
+#undef CHECK_TYPE
+    }
+
+    SECTION("issue #416 - Use-of-uninitialized-value (OSS-Fuzz issue 377)")
+    {
+        // original test case
+        std::vector<uint8_t> const vec1
+        {
+            0x94, 0xfa, 0xfa, 0xfa, 0xfa, 0xfa, 0xfa, 0xfa,
+            0x3a, 0x96, 0x96, 0xb4, 0xb4, 0xb4, 0xb4, 0xb4,
+            0xb4, 0xb4, 0xb4, 0xb4, 0xb4, 0xb4, 0xb4, 0x71,
+            0xb4, 0xb4, 0xfa, 0xfa, 0xfa, 0xfa, 0xfa, 0x3a,
+            0x96, 0x96, 0xb4, 0xb4, 0xfa, 0x94, 0x94, 0x61,
+            0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0xfa
+        };
+
+        json _;
+        CHECK_THROWS_WITH_AS(_ = json::from_cbor(vec1), "[json.exception.parse_error.113] parse error at byte 13: syntax error while parsing CBOR string: expected length specification (0x60-0x7B) or indefinite string type (0x7F); last byte: 0xB4", json::parse_error&);
+
+        // related test case: double-precision
+        std::vector<uint8_t> const vec2
+        {
+            0x94, 0xfa, 0xfa, 0xfa, 0xfa, 0xfa, 0xfa, 0xfa,
+            0x3a, 0x96, 0x96, 0xb4, 0xb4, 0xb4, 0xb4, 0xb4,
+            0xb4, 0xb4, 0xb4, 0xb4, 0xb4, 0xb4, 0xb4, 0x71,
+            0xb4, 0xb4, 0xfa, 0xfa, 0xfa, 0xfa, 0xfa, 0x3a,
+            0x96, 0x96, 0xb4, 0xb4, 0xfa, 0x94, 0x94, 0x61,
+            0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0xfb
+        };
+        CHECK_THROWS_WITH_AS(_ = json::from_cbor(vec2), "[json.exception.parse_error.113] parse error at byte 13: syntax error while parsing CBOR string: expected length specification (0x60-0x7B) or indefinite string type (0x7F); last byte: 0xB4", json::parse_error&);
+    }
+
+    SECTION("issue #452 - Heap-buffer-overflow (OSS-Fuzz issue 585)")
+    {
+        std::vector<uint8_t> const vec = {'-', '0', '1', '2', '2', '7', '4'};
+        json _;
+        CHECK_THROWS_AS(_ = json::parse(vec), json::parse_error&);
+    }
+
+    SECTION("issue #454 - doubles are printed as integers")
+    {
+        json j = R"({"bool_value":true,"double_value":2.0,"int_value":10,"level1":{"list_value":[3,"hi",false],"tmp":5.0},"string_value":"hello"})"_json;
+        CHECK(j["double_value"].is_number_float());
+    }
+
+#if JSON_USE_IMPLICIT_CONVERSIONS
+    SECTION("issue #464 - VS2017 implicit to std::string conversion fix")
+    {
+        json v = "test";
+        std::string test;
+        test = v;
+        CHECK(v == "test");
+    }
+#endif
+
+    SECTION("issue #465 - roundtrip error while parsing 1000000000000000010E5")
+    {
+        json const j1 = json::parse("1000000000000000010E5");
+        std::string s1 = j1.dump();
+        json const j2 = json::parse(s1);
+        std::string s2 = j2.dump();
+        CHECK(s1 == s2);
+    }
+
+#if JSON_USE_IMPLICIT_CONVERSIONS
+    SECTION("issue #473 - inconsistent behavior in conversion to array type")
+    {
+        json const j_array = {1, 2, 3, 4};
+        json const j_number = 42;
+        json const j_null = nullptr;
+
+        SECTION("std::vector")
+        {
+            auto create = [](const json & j)
+            {
+                std::vector<int> const v = j;
+            };
+
+            CHECK_NOTHROW(create(j_array));
+            CHECK_THROWS_WITH_AS(create(j_number), "[json.exception.type_error.302] type must be array, but is number", json::type_error&);
+            CHECK_THROWS_WITH_AS(create(j_null), "[json.exception.type_error.302] type must be array, but is null", json::type_error&);
+        }
+
+        SECTION("std::list")
+        {
+            auto create = [](const json & j)
+            {
+                std::list<int> const v = j;
+            };
+
+            CHECK_NOTHROW(create(j_array));
+            CHECK_THROWS_WITH_AS(create(j_number), "[json.exception.type_error.302] type must be array, but is number", json::type_error&);
+            CHECK_THROWS_WITH_AS(create(j_null), "[json.exception.type_error.302] type must be array, but is null", json::type_error&);
+        }
+
+        SECTION("std::forward_list")
+        {
+            auto create = [](const json & j)
+            {
+                std::forward_list<int> const v = j;
+            };
+
+            CHECK_NOTHROW(create(j_array));
+            CHECK_THROWS_WITH_AS(create(j_number), "[json.exception.type_error.302] type must be array, but is number", json::type_error&);
+            CHECK_THROWS_WITH_AS(create(j_null), "[json.exception.type_error.302] type must be array, but is null", json::type_error&);
+        }
+    }
+#endif
+
+    SECTION("issue #486 - json::value_t can't be a map's key type in VC++ 2015")
+    {
+        // the code below must compile with MSVC
+        std::map<json::value_t, std::string> jsonTypes ;
+        jsonTypes[json::value_t::array] = "array";
+    }
+
+    SECTION("issue #494 - conversion from vector<bool> to json fails to build")
+    {
+        std::vector<bool> const boolVector = {false, true, false, false};
+        json j;
+        j["bool_vector"] = boolVector;
+
+        CHECK(j["bool_vector"].dump() == "[false,true,false,false]");
+    }
+
+    SECTION("issue #504 - assertion error (OSS-Fuzz 856)")
+    {
+        std::vector<uint8_t> const vec1 = {0xf9, 0xff, 0xff, 0x4a, 0x3a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x37, 0x02, 0x38};
+        json const j1 = json::from_cbor(vec1, false);
+
+        // step 2: round trip
+        std::vector<uint8_t> vec2 = json::to_cbor(j1);
+
+        // parse serialization
+        json const j2 = json::from_cbor(vec2);
+
+        // NaN is dumped to "null"
+        CHECK(j2.is_number_float());
+        CHECK(std::isnan(j2.get<json::number_float_t>()));
+        CHECK(j2.dump() == "null");
+
+        // check if serializations match
+        CHECK(json::to_cbor(j2) == vec2);
+    }
+
+    SECTION("issue #512 - use of overloaded operator '<=' is ambiguous")
+    {
+        json j;
+        j["a"] = 5;
+
+        // json op scalar
+        CHECK(j["a"] == 5);
+        CHECK(j["a"] != 4);
+
+        CHECK(j["a"] <= 7);
+        CHECK(j["a"] <  7);
+        CHECK(j["a"] >= 3);
+        CHECK(j["a"] >  3);
+
+        CHECK(!(j["a"] <= 4));
+        CHECK(!(j["a"] <  4));
+        CHECK(!(j["a"] >= 6));
+        CHECK(!(j["a"] >  6));
+
+        // scalar op json
+        CHECK(5 == j["a"]);
+        CHECK(4 != j["a"]);
+
+        CHECK(7 >= j["a"]);
+        CHECK(7 >  j["a"]);
+        CHECK(3 <= j["a"]);
+        CHECK(3 <  j["a"]);
+
+        CHECK(!(4 >= j["a"]));
+        CHECK(!(4 >  j["a"]));
+        CHECK(!(6 <= j["a"]));
+        CHECK(!(6 <  j["a"]));
+    }
+
+    SECTION("issue #575 - heap-buffer-overflow (OSS-Fuzz 1400)")
+    {
+        json _;
+        std::vector<uint8_t> const vec = {'"', '\\', '"', 'X', '"', '"'};
+        CHECK_THROWS_AS(_ = json::parse(vec), json::parse_error&);
+    }
+
+#if JSON_USE_IMPLICIT_CONVERSIONS
+    SECTION("issue #600 - how does one convert a map in Json back to std::map?")
+    {
+        SECTION("example 1")
+        {
+            // create a map
+            std::map<std::string, int> m1 {{"key", 1}};
+
+            // create and print a JSON from the map
+            json const j = m1;
+
+            // get the map out of JSON
+            std::map<std::string, int> m2 = j;
+
+            // make sure the roundtrip succeeds
+            CHECK(m1 == m2);
+        }
+
+        SECTION("example 2")
+        {
+            // create a map
+            std::map<std::string, std::string> m1 {{"key", "val"}};
+
+            // create and print a JSON from the map
+            json const j = m1;
+
+            // get the map out of JSON
+            std::map<std::string, std::string> m2 = j;
+
+            // make sure the roundtrip succeeds
+            CHECK(m1 == m2);
+        }
+    }
+#endif
+
+    SECTION("issue #602 - BOM not skipped when using json:parse(iterator)")
+    {
+        std::string i = "\xef\xbb\xbf{\n   \"foo\": true\n}";
+        json _;
+        CHECK_NOTHROW(_ = json::parse(i.begin(), i.end()));
+    }
+
+#if JSON_USE_IMPLICIT_CONVERSIONS
+    SECTION("issue #702 - conversion from valarray<double> to json fails to build")
+    {
+        SECTION("original example")
+        {
+            std::valarray<double> const v;
+            nlohmann::json j;
+            j["test"] = v;
+        }
+
+        SECTION("full example")
+        {
+            std::valarray<double> v = {1.2, 2.3, 3.4, 4.5};
+            json j = v;
+            std::valarray<double> vj = j;
+
+            CHECK(j == json(vj));
+            CHECK(v.size() == vj.size());
+            for (size_t i = 0; i < v.size(); ++i)
+            {
+                CHECK(v[i] == vj[i]);
+                CHECK(v[i] == j[i]);
+            }
+
+            CHECK_THROWS_WITH_AS(json().get<std::valarray<double>>(), "[json.exception.type_error.302] type must be array, but is null", json::type_error&);
+        }
+    }
+#endif
+
+    SECTION("issue #367 - Behavior of operator>> should more closely resemble that of built-in overloads.")
+    {
+        SECTION("example 1")
+        {
+            std::istringstream i1_2_3( R"({"first": "one" }{"second": "two"}3)" );
+            json j1;
+            json j2;
+            json j3;
+            i1_2_3 >> j1;
+            i1_2_3 >> j2;
+            i1_2_3 >> j3;
+
+            auto m1 = j1.get<std::map<std::string, std::string>>();
+            auto m2 = j2.get<std::map<std::string, std::string>>();
+            int i3{j3};
+
+            CHECK( m1 == ( std::map<std::string, std::string> {{ "first",  "one" }} ));
+            CHECK( m2 == ( std::map<std::string, std::string> {{ "second", "two" }} ));
+            CHECK( i3 == 3 );
+        }
+    }
+
+    SECTION("issue #714 - throw std::ios_base::failure exception when failbit set to true")
+    {
+        {
+            std::ifstream is;
+            is.exceptions(
+                is.exceptions()
+                | std::ios_base::failbit
+                | std::ios_base::badbit
+            ); // handle different exceptions as 'file not found', 'permission denied'
+
+            is.open(TEST_DATA_DIRECTORY "/regression/working_file.json");
+            json _;
+            CHECK_NOTHROW(_ = nlohmann::json::parse(is));
+        }
+
+        {
+            std::ifstream is;
+            is.exceptions(
+                is.exceptions()
+                | std::ios_base::failbit
+                | std::ios_base::badbit
+            ); // handle different exceptions as 'file not found', 'permission denied'
+
+            is.open(TEST_DATA_DIRECTORY "/json_nlohmann_tests/all_unicode.json.cbor",
+                    std::ios_base::in | std::ios_base::binary);
+            json _;
+            CHECK_NOTHROW(_ = nlohmann::json::from_cbor(is));
+        }
+    }
+
+    SECTION("issue #805 - copy constructor is used with std::initializer_list constructor.")
+    {
+        nocopy n;
+        json j;
+        j = {{"nocopy", n}};
+        CHECK(j["nocopy"]["val"] == 0);
+    }
+
+    SECTION("issue #838 - incorrect parse error with binary data in keys")
+    {
+        std::array<uint8_t, 28> key1 = {{ 103, 92, 117, 48, 48, 48, 55, 92, 114, 215, 126, 214, 95, 92, 34, 174, 40, 71, 38, 174, 40, 71, 38, 223, 134, 247, 127, 0 }};
+        std::string const key1_str(reinterpret_cast<char*>(key1.data()));
+        json const j = key1_str;
+        CHECK_THROWS_WITH_AS(j.dump(), "[json.exception.type_error.316] invalid UTF-8 byte at index 10: 0x7E", json::type_error&);
+    }
+
+#if JSON_USE_IMPLICIT_CONVERSIONS
+    SECTION("issue #843 - converting to array not working")
+    {
+        json j;
+        std::array<int, 4> ar = {{1, 1, 1, 1}};
+        j = ar;
+        ar = j;
+    }
+#endif
+
+    SECTION("issue #894 - invalid RFC6902 copy operation succeeds")
+    {
+        auto model = R"({
+            "one": {
+                "two": {
+                    "three": "hello",
+                    "four": 42
+                }
+            }
+        })"_json;
+
+        auto p1 = R"([{"op": "move",
+                       "from": "/one/two/three",
+                       "path": "/a/b/c"}])"_json;
+        CHECK_THROWS_WITH_AS(model.patch(p1),
+                             "[json.exception.out_of_range.403] key 'a' not found", json::out_of_range&);
+
+        auto p2 = R"([{"op": "copy",
+                       "from": "/one/two/three",
+                       "path": "/a/b/c"}])"_json;
+        CHECK_THROWS_WITH_AS(model.patch(p2),
+                             "[json.exception.out_of_range.403] key 'a' not found", json::out_of_range&);
+    }
+
+    SECTION("issue #961 - incorrect parsing of indefinite length CBOR strings")
+    {
+        std::vector<uint8_t> const v_cbor =
+        {
+            0x7F,
+            0x64,
+            'a', 'b', 'c', 'd',
+            0x63,
+            '1', '2', '3',
+            0xFF
+        };
+        json j = json::from_cbor(v_cbor);
+        CHECK(j == "abcd123");
+    }
+
+    SECTION("issue #962 - Timeout (OSS-Fuzz 6034)")
+    {
+        json _;
+        std::vector<uint8_t> v_ubjson = {'[', '$', 'Z', '#', 'L', 0x78, 0x28, 0x00, 0x68, 0x28, 0x69, 0x69, 0x17};
+        CHECK_THROWS_AS(_ = json::from_ubjson(v_ubjson), json::out_of_range&);
+        //CHECK_THROWS_WITH(json::from_ubjson(v_ubjson),
+        //                  "[json.exception.out_of_range.408] excessive array size: 8658170730974374167");
+
+        v_ubjson[0] = '{';
+        CHECK_THROWS_AS(_ = json::from_ubjson(v_ubjson), json::out_of_range&);
+        //CHECK_THROWS_WITH(json::from_ubjson(v_ubjson),
+        //                  "[json.exception.out_of_range.408] excessive object size: 8658170730974374167");
+    }
+
+    SECTION("issue #971 - Add a SAX parser - late bug")
+    {
+        // a JSON text
+        const auto* text = R"(
+    {
+        "Image": {
+            "Width":  800,
+            "Height": 600,
+            "Title":  "View from 15th Floor",
+            "Thumbnail": {
+                "Url":    "http://www.example.com/image/481989943",
+                "Height": 125,
+                "Width":  100
+            },
+            "Animated" : false,
+            "IDs": [116, 943, 234, 38793]
+        }
+    }
+    )";
+
+        // define parser callback
+        json::parser_callback_t const cb = [](int /*depth*/, json::parse_event_t event, json & parsed)
+        {
+            // skip object elements with key "Thumbnail"
+            return !(event == json::parse_event_t::key && parsed == json("Thumbnail"));
+        };
+
+        // parse (with callback) and serialize JSON
+        json j_filtered = json::parse(text, cb);
+
+        CHECK(j_filtered == R"({"Image":{"Animated":false,"Height":600,"IDs":[116,943,234,38793], "Title":"View from 15th Floor","Width":800}})"_json);
+    }
+
+    SECTION("issue #972 - Segmentation fault on G++ when trying to assign json string literal to custom json type")
+    {
+        my_json const foo = R"([1, 2, 3])"_json;
+    }
+
+    SECTION("issue #977 - Assigning between different json types")
+    {
+        foo_json lj = ns::foo{3};
+        ns::foo ff(lj);
+        CHECK(lj.is_object());
+        CHECK(lj.size() == 1);
+        CHECK(lj["x"] == 3);
+        CHECK(ff.x == 3);
+        nlohmann::json const nj = lj;                // This line works as expected
+    }
+}
+
+#if !defined(JSON_NOEXCEPTION)
+TEST_CASE("regression tests, exceptions dependent")
+{
+    SECTION("issue #1340 - eof not set on exhausted input stream")
+    {
+        std::stringstream s("{}{}");
+        json j;
+        s >> j;
+        s >> j;
+        CHECK_THROWS_AS(s >> j, json::parse_error const&);
+        CHECK(s.eof());
+    }
+}
+#endif
+
+/////////////////////////////////////////////////////////////////////
+// for #1642
+/////////////////////////////////////////////////////////////////////
+
+// the code below fails with Clang on Windows, so we need to exclude it there
+#if DOCTEST_CLANG && (defined(WIN32) || defined(_WIN32) || defined(__WIN32) && !defined(__CYGWIN__))
+#else
+template <typename T> class array {};
+template <typename T> class object {};
+template <typename T> class string {};
+template <typename T> class number_integer {};
+template <typename T> class number_unsigned {};
+template <typename T> class number_float {};
+#endif
diff --git a/external_imported/json/tests/src/unit-regression2.cpp b/external_imported/json/tests/src/unit-regression2.cpp
new file mode 100644
index 000000000..fab9aae3b
--- /dev/null
+++ b/external_imported/json/tests/src/unit-regression2.cpp
@@ -0,0 +1,941 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+// cmake/test.cmake selects the C++ standard versions with which to build a
+// unit test based on the presence of JSON_HAS_CPP_<VERSION> macros.
+// When using macros that are only defined for particular versions of the standard
+// (e.g., JSON_HAS_FILESYSTEM for C++17 and up), please mention the corresponding
+// version macro in a comment close by, like this:
+// JSON_HAS_CPP_<VERSION> (do not remove; see note at top of file)
+
+#include "doctest_compatibility.h"
+
+// for some reason including this after the json header leads to linker errors with VS 2017...
+#include <locale>
+
+#define JSON_TESTS_PRIVATE
+#include <nlohmann/json.hpp>
+using json = nlohmann::json;
+using ordered_json = nlohmann::ordered_json;
+#ifdef JSON_TEST_NO_GLOBAL_UDLS
+    using namespace nlohmann::literals; // NOLINT(google-build-using-namespace)
+#endif
+
+#include <cstdio>
+#include <list>
+#include <type_traits>
+#include <utility>
+
+#ifdef JSON_HAS_CPP_17
+    #include <any>
+    #include <variant>
+#endif
+
+#ifdef JSON_HAS_CPP_20
+    #if __has_include(<span>)
+        #include <span>
+    #endif
+#endif
+
+// NLOHMANN_JSON_SERIALIZE_ENUM uses a static std::pair
+DOCTEST_CLANG_SUPPRESS_WARNING_PUSH
+DOCTEST_CLANG_SUPPRESS_WARNING("-Wexit-time-destructors")
+
+/////////////////////////////////////////////////////////////////////
+// for #1021
+/////////////////////////////////////////////////////////////////////
+
+using float_json = nlohmann::basic_json<std::map, std::vector, std::string, bool, std::int64_t, std::uint64_t, float>;
+
+/////////////////////////////////////////////////////////////////////
+// for #1647
+/////////////////////////////////////////////////////////////////////
+namespace
+{
+struct NonDefaultFromJsonStruct
+{};
+
+inline bool operator==(NonDefaultFromJsonStruct const& /*unused*/, NonDefaultFromJsonStruct const& /*unused*/)
+{
+    return true;
+}
+
+enum class for_1647
+{
+    one,
+    two
+};
+
+// NOLINTNEXTLINE(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays): this is a false positive
+NLOHMANN_JSON_SERIALIZE_ENUM(for_1647,
+{
+    {for_1647::one, "one"},
+    {for_1647::two, "two"},
+})
+}  // namespace
+
+/////////////////////////////////////////////////////////////////////
+// for #1299
+/////////////////////////////////////////////////////////////////////
+
+struct Data
+{
+    Data() = default;
+    Data(std::string a_, std::string b_)
+        : a(std::move(a_))
+        , b(std::move(b_))
+    {}
+    std::string a{};
+    std::string b{};
+};
+
+void from_json(const json& j, Data& data);
+void from_json(const json& j, Data& data)
+{
+    j["a"].get_to(data.a);
+    j["b"].get_to(data.b);
+}
+
+bool operator==(Data const& lhs, Data const& rhs);
+bool operator==(Data const& lhs, Data const& rhs)
+{
+    return lhs.a == rhs.a && lhs.b == rhs.b;
+}
+
+//bool operator!=(Data const& lhs, Data const& rhs)
+//{
+//    return !(lhs == rhs);
+//}
+
+namespace nlohmann
+{
+template<>
+struct adl_serializer<NonDefaultFromJsonStruct>
+{
+    static NonDefaultFromJsonStruct from_json(json const& /*unused*/) noexcept
+    {
+        return {};
+    }
+};
+}  // namespace nlohmann
+
+/////////////////////////////////////////////////////////////////////
+// for #1805
+/////////////////////////////////////////////////////////////////////
+
+struct NotSerializableData
+{
+    int mydata;
+    float myfloat;
+};
+
+/////////////////////////////////////////////////////////////////////
+// for #2574
+/////////////////////////////////////////////////////////////////////
+
+struct NonDefaultConstructible
+{
+    explicit NonDefaultConstructible(int a)
+        : x(a)
+    {}
+    int x;
+};
+
+namespace nlohmann
+{
+template<>
+struct adl_serializer<NonDefaultConstructible>
+{
+    static NonDefaultConstructible from_json(json const& j)
+    {
+        return NonDefaultConstructible(j.get<int>());
+    }
+};
+}  // namespace nlohmann
+
+/////////////////////////////////////////////////////////////////////
+// for #2824
+/////////////////////////////////////////////////////////////////////
+
+class sax_no_exception : public nlohmann::detail::json_sax_dom_parser<json>
+{
+  public:
+    explicit sax_no_exception(json& j)
+        : nlohmann::detail::json_sax_dom_parser<json>(j, false)
+    {}
+
+    static bool parse_error(std::size_t /*position*/, const std::string& /*last_token*/, const json::exception& ex)
+    {
+        error_string = new std::string(ex.what());  // NOLINT(cppcoreguidelines-owning-memory)
+        return false;
+    }
+
+    static std::string* error_string;
+};
+
+std::string* sax_no_exception::error_string = nullptr;
+
+/////////////////////////////////////////////////////////////////////
+// for #2982
+/////////////////////////////////////////////////////////////////////
+
+template<class T>
+class my_allocator : public std::allocator<T>
+{
+  public:
+    using std::allocator<T>::allocator;
+
+    my_allocator() = default;
+    template<class U> my_allocator(const my_allocator<U>& /*unused*/) { }
+
+    template <class U>
+    struct rebind
+    {
+        using other = my_allocator<U>;
+    };
+};
+
+/////////////////////////////////////////////////////////////////////
+// for #3077
+/////////////////////////////////////////////////////////////////////
+
+class FooAlloc
+{};
+
+class Foo
+{
+  public:
+    explicit Foo(const FooAlloc& /* unused */ = FooAlloc()) {}
+
+    bool value = false;
+};
+
+class FooBar
+{
+  public:
+    Foo foo{};
+};
+
+inline void from_json(const nlohmann::json& j, FooBar& fb)
+{
+    j.at("value").get_to(fb.foo.value);
+}
+
+/////////////////////////////////////////////////////////////////////
+// for #3171
+/////////////////////////////////////////////////////////////////////
+
+struct for_3171_base // NOLINT(cppcoreguidelines-special-member-functions)
+{
+    for_3171_base(const std::string& /*unused*/ = {}) {}
+    virtual ~for_3171_base() = default;
+
+    virtual void _from_json(const json& j)
+    {
+        j.at("str").get_to(str);
+    }
+
+    std::string str{};
+};
+
+struct for_3171_derived : public for_3171_base
+{
+    for_3171_derived() = default;
+    explicit for_3171_derived(const std::string& /*unused*/) { }
+};
+
+inline void from_json(const json& j, for_3171_base& tb)
+{
+    tb._from_json(j);
+}
+
+/////////////////////////////////////////////////////////////////////
+// for #3312
+/////////////////////////////////////////////////////////////////////
+
+#ifdef JSON_HAS_CPP_20
+struct for_3312
+{
+    std::string name;
+};
+
+inline void from_json(const json& j, for_3312& obj)
+{
+    j.at("name").get_to(obj.name);
+}
+#endif
+
+/////////////////////////////////////////////////////////////////////
+// for #3204
+/////////////////////////////////////////////////////////////////////
+
+struct for_3204_foo
+{
+    for_3204_foo() = default;
+    explicit for_3204_foo(std::string /*unused*/) {} // NOLINT(performance-unnecessary-value-param)
+};
+
+struct for_3204_bar
+{
+    enum constructed_from_t
+    {
+        constructed_from_none = 0,
+        constructed_from_foo = 1,
+        constructed_from_json = 2
+    };
+
+    explicit for_3204_bar(std::function<void(for_3204_foo)> /*unused*/) noexcept // NOLINT(performance-unnecessary-value-param)
+        : constructed_from(constructed_from_foo) {}
+    explicit for_3204_bar(std::function<void(json)> /*unused*/) noexcept // NOLINT(performance-unnecessary-value-param)
+        : constructed_from(constructed_from_json) {}
+
+    constructed_from_t constructed_from = constructed_from_none;
+};
+
+/////////////////////////////////////////////////////////////////////
+// for #3333
+/////////////////////////////////////////////////////////////////////
+
+struct for_3333 final
+{
+    for_3333(int x_ = 0, int y_ = 0) : x(x_), y(y_) {}
+
+    template <class T>
+    for_3333(const T& /*unused*/)
+    {
+        CHECK(false);
+    }
+
+    int x = 0;
+    int y = 0;
+};
+
+template <>
+inline for_3333::for_3333(const json& j)
+    : for_3333(j.value("x", 0), j.value("y", 0))
+{}
+
+TEST_CASE("regression tests 2")
+{
+    SECTION("issue #1001 - Fix memory leak during parser callback")
+    {
+        const auto* geojsonExample = R"(
+          { "type": "FeatureCollection",
+            "features": [
+              { "type": "Feature",
+                "geometry": {"type": "Point", "coordinates": [102.0, 0.5]},
+                "properties": {"prop0": "value0"}
+                },
+              { "type": "Feature",
+                "geometry": {
+                  "type": "LineString",
+                  "coordinates": [
+                    [102.0, 0.0], [103.0, 1.0], [104.0, 0.0], [105.0, 1.0]
+                    ]
+                  },
+                "properties": {
+                  "prop0": "value0",
+                  "prop1": 0.0
+                  }
+                },
+              { "type": "Feature",
+                 "geometry": {
+                   "type": "Polygon",
+                   "coordinates": [
+                     [ [100.0, 0.0], [101.0, 0.0], [101.0, 1.0],
+                       [100.0, 1.0], [100.0, 0.0] ]
+                     ]
+                 },
+                 "properties": {
+                   "prop0": "value0",
+                   "prop1": {"this": "that"}
+                   }
+                 }
+               ]
+             })";
+
+        const json::parser_callback_t cb = [&](int /*level*/, json::parse_event_t event, json & parsed) noexcept
+        {
+            // skip uninteresting events
+            if (event == json::parse_event_t::value && !parsed.is_primitive())
+            {
+                return false;
+            }
+
+            switch (event)
+            {
+                case json::parse_event_t::key:
+                {
+                    return true;
+                }
+                case json::parse_event_t::value:
+                {
+                    return false;
+                }
+                case json::parse_event_t::object_start:
+                {
+                    return true;
+                }
+                case json::parse_event_t::object_end:
+                {
+                    return false;
+                }
+                case json::parse_event_t::array_start:
+                {
+                    return true;
+                }
+                case json::parse_event_t::array_end:
+                {
+                    return false;
+                }
+
+                default:
+                {
+                    return true;
+                }
+            }
+        };
+
+        auto j = json::parse(geojsonExample, cb, true);
+        CHECK(j == json());
+    }
+
+    SECTION("issue #1021 - to/from_msgpack only works with standard typization")
+    {
+        float_json j = 1000.0;
+        CHECK(float_json::from_cbor(float_json::to_cbor(j)) == j);
+        CHECK(float_json::from_msgpack(float_json::to_msgpack(j)) == j);
+        CHECK(float_json::from_ubjson(float_json::to_ubjson(j)) == j);
+
+        float_json j2 = {1000.0, 2000.0, 3000.0};
+        CHECK(float_json::from_ubjson(float_json::to_ubjson(j2, true, true)) == j2);
+    }
+
+    SECTION("issue #1045 - Using STL algorithms with JSON containers with expected results?")
+    {
+        json diffs = nlohmann::json::array();
+        json m1{{"key1", 42}};
+        json m2{{"key2", 42}};
+        auto p1 = m1.items();
+        auto p2 = m2.items();
+
+        using it_type = decltype(p1.begin());
+
+        std::set_difference(
+            p1.begin(),
+            p1.end(),
+            p2.begin(),
+            p2.end(),
+            std::inserter(diffs, diffs.end()),
+            [&](const it_type & e1, const it_type & e2) -> bool
+        {
+            using comper_pair = std::pair<std::string, decltype(e1.value())>;              // Trying to avoid unneeded copy
+            return comper_pair(e1.key(), e1.value()) < comper_pair(e2.key(), e2.value());  // Using pair comper
+        });
+
+        CHECK(diffs.size() == 1);  // Note the change here, was 2
+    }
+
+#ifdef JSON_HAS_CPP_17
+    SECTION("issue #1292 - Serializing std::variant causes stack overflow")
+    {
+        static_assert(!std::is_constructible<json, std::variant<int, float>>::value, "unexpected value");
+    }
+#endif
+
+    SECTION("issue #1299 - compile error in from_json converting to container "
+            "with std::pair")
+    {
+        const json j =
+        {
+            {"1", {{"a", "testa_1"}, {"b", "testb_1"}}},
+            {"2", {{"a", "testa_2"}, {"b", "testb_2"}}},
+            {"3", {{"a", "testa_3"}, {"b", "testb_3"}}},
+        };
+
+        std::map<std::string, Data> expected
+        {
+            {"1", {"testa_1", "testb_1"}},
+            {"2", {"testa_2", "testb_2"}},
+            {"3", {"testa_3", "testb_3"}},
+        };
+        const auto data = j.get<decltype(expected)>();
+        CHECK(expected == data);
+    }
+
+    SECTION("issue #1445 - buffer overflow in dumping invalid utf-8 strings")
+    {
+        SECTION("a bunch of -1, ensure_ascii=true")
+        {
+            const auto length = 300;
+
+            json dump_test;
+            dump_test["1"] = std::string(length, -1);
+
+            std::string expected = R"({"1":")";
+            for (int i = 0; i < length; ++i)
+            {
+                expected += "\\ufffd";
+            }
+            expected += "\"}";
+
+            auto s = dump_test.dump(-1, ' ', true, nlohmann::json::error_handler_t::replace);
+            CHECK(s == expected);
+        }
+        SECTION("a bunch of -2, ensure_ascii=false")
+        {
+            const auto length = 500;
+
+            json dump_test;
+            dump_test["1"] = std::string(length, -2);
+
+            std::string expected = R"({"1":")";
+            for (int i = 0; i < length; ++i)
+            {
+                expected += "\xEF\xBF\xBD";
+            }
+            expected += "\"}";
+
+            auto s = dump_test.dump(-1, ' ', false, nlohmann::json::error_handler_t::replace);
+            CHECK(s == expected);
+        }
+        SECTION("test case in issue #1445")
+        {
+            nlohmann::json dump_test;
+            const std::array<int, 108> data =
+            {
+                {109, 108, 103, 125, -122, -53, 115, 18, 3, 0, 102, 19, 1, 15, -110, 13, -3, -1, -81, 32, 2, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -80, 2, 0, 0, 96, -118, 46, -116, 46, 109, -84, -87, 108, 14, 109, -24, -83, 13, -18, -51, -83, -52, -115, 14, 6, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 3, 0, 0, 0, 35, -74, -73, 55, 57, -128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 33, 0, 0, 0, -96, -54, -28, -26}
+            };
+            std::string s;
+            for (const int i : data)
+            {
+                s += static_cast<char>(i);
+            }
+            dump_test["1"] = s;
+            dump_test.dump(-1, ' ', true, nlohmann::json::error_handler_t::replace);
+        }
+    }
+
+    SECTION("issue #1447 - Integer Overflow (OSS-Fuzz 12506)")
+    {
+        const json j = json::parse("[-9223372036854775808]");
+        CHECK(j.dump() == "[-9223372036854775808]");
+    }
+
+    SECTION("issue #1708 - minimum value of int64_t can be outputted")
+    {
+        constexpr auto smallest = (std::numeric_limits<int64_t>::min)();
+        const json j = smallest;
+        CHECK(j.dump() == std::to_string(smallest));
+    }
+
+    SECTION("issue #1727 - Contains with non-const lvalue json_pointer picks the wrong overload")
+    {
+        const json j = {{"root", {{"settings", {{"logging", true}}}}}};
+
+        auto jptr1 = "/root/settings/logging"_json_pointer;
+        auto jptr2 = json::json_pointer{"/root/settings/logging"};
+
+        CHECK(j.contains(jptr1));
+        CHECK(j.contains(jptr2));
+    }
+
+    SECTION("issue #1647 - compile error when deserializing enum if both non-default from_json and non-member operator== exists for other type")
+    {
+        // does not compile on ICPC when targeting C++20
+#if !(defined(__INTEL_COMPILER) && __cplusplus >= 202000)
+        {
+            const json j;
+            NonDefaultFromJsonStruct x(j);
+            NonDefaultFromJsonStruct y;
+            CHECK(x == y);
+        }
+#endif
+
+        auto val = nlohmann::json("one").get<for_1647>();
+        CHECK(val == for_1647::one);
+        const json j = val;
+    }
+
+    SECTION("issue #1715 - json::from_cbor does not respect allow_exceptions = false when input is string literal")
+    {
+        SECTION("string literal")
+        {
+            const json cbor = json::from_cbor("B", true, false);
+            CHECK(cbor.is_discarded());
+        }
+
+        SECTION("string array")
+        {
+            const std::array<char, 2> input = {{'B', 0x00}};
+            const json cbor = json::from_cbor(input, true, false);
+            CHECK(cbor.is_discarded());
+        }
+
+        SECTION("std::string")
+        {
+            const json cbor = json::from_cbor(std::string("B"), true, false);
+            CHECK(cbor.is_discarded());
+        }
+    }
+
+    SECTION("issue #1805 - A pair<T1, T2> is json constructible only if T1 and T2 are json constructible")
+    {
+        static_assert(!std::is_constructible<json, std::pair<std::string, NotSerializableData>>::value, "unexpected result");
+        static_assert(!std::is_constructible<json, std::pair<NotSerializableData, std::string>>::value, "unexpected result");
+        static_assert(std::is_constructible<json, std::pair<int, std::string>>::value, "unexpected result");
+    }
+    SECTION("issue #1825 - A tuple<Args..> is json constructible only if all T in Args are json constructible")
+    {
+        static_assert(!std::is_constructible<json, std::tuple<std::string, NotSerializableData>>::value, "unexpected result");
+        static_assert(!std::is_constructible<json, std::tuple<NotSerializableData, std::string>>::value, "unexpected result");
+        static_assert(std::is_constructible<json, std::tuple<int, std::string>>::value, "unexpected result");
+    }
+
+    SECTION("issue #1983 - JSON patch diff for op=add formation is not as per standard (RFC 6902)")
+    {
+        const auto source = R"({ "foo": [ "1", "2" ] })"_json;
+        const auto target = R"({"foo": [ "1", "2", "3" ]})"_json;
+        const auto result = json::diff(source, target);
+        CHECK(result.dump() == R"([{"op":"add","path":"/foo/-","value":"3"}])");
+    }
+
+    SECTION("issue #2067 - cannot serialize binary data to text JSON")
+    {
+        const std::array<unsigned char, 23> data = {{0x81, 0xA4, 0x64, 0x61, 0x74, 0x61, 0xC4, 0x0F, 0x33, 0x30, 0x30, 0x32, 0x33, 0x34, 0x30, 0x31, 0x30, 0x37, 0x30, 0x35, 0x30, 0x31, 0x30}};
+        const json j = json::from_msgpack(data.data(), data.size());
+        CHECK_NOTHROW(
+            j.dump(4,                             // Indent
+                   ' ',                           // Indent char
+                   false,                         // Ensure ascii
+                   json::error_handler_t::strict  // Error
+                  ));
+    }
+
+    SECTION("PR #2181 - regression bug with lvalue")
+    {
+        // see https://github.com/nlohmann/json/pull/2181#issuecomment-653326060
+        const json j{{"x", "test"}};
+        const std::string defval = "default value";
+        auto val = j.value("x", defval);
+        auto val2 = j.value("y", defval);
+    }
+
+    SECTION("issue #2293 - eof doesn't cause parsing to stop")
+    {
+        const std::vector<uint8_t> data =
+        {
+            0x7B,
+            0x6F,
+            0x62,
+            0x6A,
+            0x65,
+            0x63,
+            0x74,
+            0x20,
+            0x4F,
+            0x42
+        };
+        const json result = json::from_cbor(data, true, false);
+        CHECK(result.is_discarded());
+    }
+
+    SECTION("issue #2315 - json.update and vector<pair>does not work with ordered_json")
+    {
+        nlohmann::ordered_json jsonAnimals = {{"animal", "dog"}};
+        const nlohmann::ordered_json jsonCat = {{"animal", "cat"}};
+        jsonAnimals.update(jsonCat);
+        CHECK(jsonAnimals["animal"] == "cat");
+
+        auto jsonAnimals_parsed = nlohmann::ordered_json::parse(jsonAnimals.dump());
+        CHECK(jsonAnimals == jsonAnimals_parsed);
+
+        const std::vector<std::pair<std::string, int64_t>> intData = {std::make_pair("aaaa", 11),
+                                                                      std::make_pair("bbb", 222)
+                                                                     };
+        nlohmann::ordered_json jsonObj;
+        for (const auto& data : intData)
+        {
+            jsonObj[data.first] = data.second;
+        }
+        CHECK(jsonObj["aaaa"] == 11);
+        CHECK(jsonObj["bbb"] == 222);
+    }
+
+    SECTION("issue #2330 - ignore_comment=true fails on multiple consecutive lines starting with comments")
+    {
+        const std::string ss = "//\n//\n{\n}\n";
+        const json j = json::parse(ss, nullptr, true, true);
+        CHECK(j.dump() == "{}");
+    }
+
+#ifdef JSON_HAS_CPP_20
+#if __has_include(<span>)
+    SECTION("issue #2546 - parsing containers of std::byte")
+    {
+        const char DATA[] = R"("Hello, world!")"; // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+        const auto s = std::as_bytes(std::span(DATA));
+        const json j = json::parse(s);
+        CHECK(j.dump() == "\"Hello, world!\"");
+    }
+#endif
+#endif
+
+    SECTION("issue #2574 - Deserialization to std::array, std::pair, and std::tuple with non-default constructable types fails")
+    {
+        SECTION("std::array")
+        {
+            {
+                const json j = {7, 4};
+                auto arr = j.get<std::array<NonDefaultConstructible, 2>>();
+                CHECK(arr[0].x == 7);
+                CHECK(arr[1].x == 4);
+            }
+
+            {
+                const json j = 7;
+                CHECK_THROWS_AS((j.get<std::array<NonDefaultConstructible, 1>>()), json::type_error);
+            }
+        }
+
+        SECTION("std::pair")
+        {
+            {
+                const json j = {3, 8};
+                auto p = j.get<std::pair<NonDefaultConstructible, NonDefaultConstructible>>();
+                CHECK(p.first.x == 3);
+                CHECK(p.second.x == 8);
+            }
+
+            {
+                const json j = {4, 1};
+                auto p = j.get<std::pair<int, NonDefaultConstructible>>();
+                CHECK(p.first == 4);
+                CHECK(p.second.x == 1);
+            }
+
+            {
+                const json j = {6, 7};
+                auto p = j.get<std::pair<NonDefaultConstructible, int>>();
+                CHECK(p.first.x == 6);
+                CHECK(p.second == 7);
+            }
+
+            {
+                const json j = 7;
+                CHECK_THROWS_AS((j.get<std::pair<NonDefaultConstructible, int>>()), json::type_error);
+            }
+        }
+
+        SECTION("std::tuple")
+        {
+            {
+                const json j = {9};
+                auto t = j.get<std::tuple<NonDefaultConstructible>>();
+                CHECK(std::get<0>(t).x == 9);
+            }
+
+            {
+                const json j = {9, 8, 7};
+                auto t = j.get<std::tuple<NonDefaultConstructible, int, NonDefaultConstructible>>();
+                CHECK(std::get<0>(t).x == 9);
+                CHECK(std::get<1>(t) == 8);
+                CHECK(std::get<2>(t).x == 7);
+            }
+
+            {
+                const json j = 7;
+                CHECK_THROWS_AS((j.get<std::tuple<NonDefaultConstructible>>()), json::type_error);
+            }
+        }
+    }
+
+    SECTION("issue #2865 - ASAN detects memory leaks")
+    {
+        // the code below is expected to not leak memory
+        {
+            nlohmann::json o;
+            const std::string s = "bar";
+
+            nlohmann::to_json(o["foo"], s);
+
+            nlohmann::json p = o;
+
+            // call to_json with a non-null JSON value
+            nlohmann::to_json(p["foo"], s);
+        }
+
+        {
+            nlohmann::json o;
+            const std::string s = "bar";
+
+            nlohmann::to_json(o["foo"], s);
+
+            // call to_json with a non-null JSON value
+            nlohmann::to_json(o["foo"], s);
+        }
+    }
+
+    SECTION("issue #2824 - encoding of json::exception::what()")
+    {
+        json j;
+        sax_no_exception sax(j);
+
+        CHECK(!json::sax_parse("xyz", &sax));
+        CHECK(*sax_no_exception::error_string == "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error while parsing value - invalid literal; last read: 'x'");
+        delete sax_no_exception::error_string;  // NOLINT(cppcoreguidelines-owning-memory)
+    }
+
+    SECTION("issue #2825 - Properly constrain the basic_json conversion operator")
+    {
+        static_assert(std::is_copy_assignable<nlohmann::ordered_json>::value, "ordered_json must be copy assignable");
+    }
+
+    SECTION("issue #2958 - Inserting in unordered json using a pointer retains the leading slash")
+    {
+        const std::string p = "/root";
+
+        json test1;
+        test1[json::json_pointer(p)] = json::object();
+        CHECK(test1.dump() == "{\"root\":{}}");
+
+        ordered_json test2;
+        test2[ordered_json::json_pointer(p)] = json::object();
+        CHECK(test2.dump() == "{\"root\":{}}");
+
+        // json::json_pointer and ordered_json::json_pointer are the same type; behave as above
+        ordered_json test3;
+        test3[json::json_pointer(p)] = json::object();
+        CHECK(std::is_same<json::json_pointer::string_t, ordered_json::json_pointer::string_t>::value);
+        CHECK(test3.dump() == "{\"root\":{}}");
+    }
+
+    SECTION("issue #2982 - to_{binary format} does not provide a mechanism for specifying a custom allocator for the returned type")
+    {
+        std::vector<std::uint8_t, my_allocator<std::uint8_t>> my_vector;
+        json j = {1, 2, 3, 4};
+        json::to_cbor(j, my_vector);
+        json k = json::from_cbor(my_vector);
+        CHECK(j == k);
+    }
+
+#if JSON_HAS_FILESYSTEM || JSON_HAS_EXPERIMENTAL_FILESYSTEM
+    // JSON_HAS_CPP_17 (do not remove; see note at top of file)
+    SECTION("issue #3070 - Version 3.10.3 breaks backward-compatibility with 3.10.2 ")
+    {
+        nlohmann::detail::std_fs::path text_path("/tmp/text.txt");
+        const json j(text_path);
+
+        const auto j_path = j.get<nlohmann::detail::std_fs::path>();
+        CHECK(j_path == text_path);
+
+#if DOCTEST_CLANG || DOCTEST_GCC >= DOCTEST_COMPILER(8, 4, 0)
+        // only known to work on Clang and GCC >=8.4
+        CHECK_THROWS_WITH_AS(nlohmann::detail::std_fs::path(json(1)), "[json.exception.type_error.302] type must be string, but is number", json::type_error);
+#endif
+    }
+#endif
+
+    SECTION("issue #3077 - explicit constructor with default does not compile")
+    {
+        json j;
+        j[0]["value"] = true;
+        std::vector<FooBar> foo;
+        j.get_to(foo);
+    }
+
+    SECTION("issue #3108 - ordered_json doesn't support range based erase")
+    {
+        ordered_json j = {1, 2, 2, 4};
+
+        auto last = std::unique(j.begin(), j.end());
+        j.erase(last, j.end());
+
+        CHECK(j.dump() == "[1,2,4]");
+
+        j.erase(std::remove_if(j.begin(), j.end(), [](const ordered_json & val)
+        {
+            return val == 2;
+        }), j.end());
+
+        CHECK(j.dump() == "[1,4]");
+    }
+
+    SECTION("issue #3343 - json and ordered_json are not interchangable")
+    {
+        json::object_t jobj({ { "product", "one" } });
+        ordered_json::object_t ojobj({{"product", "one"}});
+
+        auto jit = jobj.begin();
+        auto ojit = ojobj.begin();
+
+        CHECK(jit->first == ojit->first);
+        CHECK(jit->second.get<std::string>() == ojit->second.get<std::string>());
+    }
+
+    SECTION("issue #3171 - if class is_constructible from std::string wrong from_json overload is being selected, compilation failed")
+    {
+        const json j{{ "str", "value"}};
+
+        // failed with: error: no match for ‘operator=’ (operand types are ‘for_3171_derived’ and ‘const nlohmann::basic_json<>::string_t’
+        //                                               {aka ‘const std::__cxx11::basic_string<char>’})
+        //                  s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
+        auto td = j.get<for_3171_derived>();
+
+        CHECK(td.str == "value");
+    }
+
+#ifdef JSON_HAS_CPP_20
+    SECTION("issue #3312 - Parse to custom class from unordered_json breaks on G++11.2.0 with C++20")
+    {
+        // see test for #3171
+        const ordered_json j = {{"name", "class"}};
+        for_3312 obj{};
+
+        j.get_to(obj);
+
+        CHECK(obj.name == "class");
+    }
+#endif
+
+#if defined(JSON_HAS_CPP_17) && JSON_USE_IMPLICIT_CONVERSIONS
+    SECTION("issue #3428 - Error occurred when converting nlohmann::json to std::any")
+    {
+        const json j;
+        const std::any a1 = j;
+        std::any&& a2 = j;
+
+        CHECK(a1.type() == typeid(j));
+        CHECK(a2.type() == typeid(j));
+    }
+#endif
+
+    SECTION("issue #3204 - ambiguous regression")
+    {
+        for_3204_bar bar_from_foo([](for_3204_foo) noexcept {}); // NOLINT(performance-unnecessary-value-param)
+        for_3204_bar bar_from_json([](json) noexcept {}); // NOLINT(performance-unnecessary-value-param)
+
+        CHECK(bar_from_foo.constructed_from == for_3204_bar::constructed_from_foo);
+        CHECK(bar_from_json.constructed_from == for_3204_bar::constructed_from_json);
+    }
+
+    SECTION("issue #3333 - Ambiguous conversion from nlohmann::basic_json<> to custom class")
+    {
+        const json j
+        {
+            {"x", 1},
+            {"y", 2}
+        };
+        for_3333 p = j;
+
+        CHECK(p.x == 1);
+        CHECK(p.y == 2);
+    }
+}
+
+DOCTEST_CLANG_SUPPRESS_WARNING_POP
diff --git a/external_imported/json/tests/src/unit-serialization.cpp b/external_imported/json/tests/src/unit-serialization.cpp
new file mode 100644
index 000000000..e8f0e7e5b
--- /dev/null
+++ b/external_imported/json/tests/src/unit-serialization.cpp
@@ -0,0 +1,297 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+#include <nlohmann/json.hpp>
+using nlohmann::json;
+
+#include <sstream>
+#include <iomanip>
+
+TEST_CASE("serialization")
+{
+    SECTION("operator<<")
+    {
+        SECTION("no given width")
+        {
+            std::stringstream ss;
+            const json j = {"foo", 1, 2, 3, false, {{"one", 1}}};
+            ss << j;
+            CHECK(ss.str() == "[\"foo\",1,2,3,false,{\"one\":1}]");
+        }
+
+        SECTION("given width")
+        {
+            std::stringstream ss;
+            const json j = {"foo", 1, 2, 3, false, {{"one", 1}}};
+            ss << std::setw(4) << j;
+            CHECK(ss.str() ==
+                  "[\n    \"foo\",\n    1,\n    2,\n    3,\n    false,\n    {\n        \"one\": 1\n    }\n]");
+        }
+
+        SECTION("given fill")
+        {
+            std::stringstream ss;
+            const json j = {"foo", 1, 2, 3, false, {{"one", 1}}};
+            ss << std::setw(1) << std::setfill('\t') << j;
+            CHECK(ss.str() ==
+                  "[\n\t\"foo\",\n\t1,\n\t2,\n\t3,\n\tfalse,\n\t{\n\t\t\"one\": 1\n\t}\n]");
+        }
+    }
+
+    SECTION("operator>>")
+    {
+        SECTION("no given width")
+        {
+            std::stringstream ss;
+            const json j = {"foo", 1, 2, 3, false, {{"one", 1}}};
+            j >> ss;
+            CHECK(ss.str() == "[\"foo\",1,2,3,false,{\"one\":1}]");
+        }
+
+        SECTION("given width")
+        {
+            std::stringstream ss;
+            const json j = {"foo", 1, 2, 3, false, {{"one", 1}}};
+            ss.width(4);
+            j >> ss;
+            CHECK(ss.str() ==
+                  "[\n    \"foo\",\n    1,\n    2,\n    3,\n    false,\n    {\n        \"one\": 1\n    }\n]");
+        }
+
+        SECTION("given fill")
+        {
+            std::stringstream ss;
+            const json j = {"foo", 1, 2, 3, false, {{"one", 1}}};
+            ss.width(1);
+            ss.fill('\t');
+            j >> ss;
+            CHECK(ss.str() ==
+                  "[\n\t\"foo\",\n\t1,\n\t2,\n\t3,\n\tfalse,\n\t{\n\t\t\"one\": 1\n\t}\n]");
+        }
+    }
+
+    SECTION("dump")
+    {
+        SECTION("invalid character")
+        {
+            const json j = "ä\xA9ü";
+
+            CHECK_THROWS_WITH_AS(j.dump(), "[json.exception.type_error.316] invalid UTF-8 byte at index 2: 0xA9", json::type_error&);
+            CHECK_THROWS_WITH_AS(j.dump(1, ' ', false, json::error_handler_t::strict), "[json.exception.type_error.316] invalid UTF-8 byte at index 2: 0xA9", json::type_error&);
+            CHECK(j.dump(-1, ' ', false, json::error_handler_t::ignore) == "\"äü\"");
+            CHECK(j.dump(-1, ' ', false, json::error_handler_t::replace) == "\"ä\xEF\xBF\xBDü\"");
+            CHECK(j.dump(-1, ' ', true, json::error_handler_t::replace) == "\"\\u00e4\\ufffd\\u00fc\"");
+        }
+
+        SECTION("ending with incomplete character")
+        {
+            const json j = "123\xC2";
+
+            CHECK_THROWS_WITH_AS(j.dump(), "[json.exception.type_error.316] incomplete UTF-8 string; last byte: 0xC2", json::type_error&);
+            CHECK_THROWS_AS(j.dump(1, ' ', false, json::error_handler_t::strict), json::type_error&);
+            CHECK(j.dump(-1, ' ', false, json::error_handler_t::ignore) == "\"123\"");
+            CHECK(j.dump(-1, ' ', false, json::error_handler_t::replace) == "\"123\xEF\xBF\xBD\"");
+            CHECK(j.dump(-1, ' ', true, json::error_handler_t::replace) == "\"123\\ufffd\"");
+        }
+
+        SECTION("unexpected character")
+        {
+            const json j = "123\xF1\xB0\x34\x35\x36";
+
+            CHECK_THROWS_WITH_AS(j.dump(), "[json.exception.type_error.316] invalid UTF-8 byte at index 5: 0x34", json::type_error&);
+            CHECK_THROWS_AS(j.dump(1, ' ', false, json::error_handler_t::strict), json::type_error&);
+            CHECK(j.dump(-1, ' ', false, json::error_handler_t::ignore) == "\"123456\"");
+            CHECK(j.dump(-1, ' ', false, json::error_handler_t::replace) == "\"123\xEF\xBF\xBD\x34\x35\x36\"");
+            CHECK(j.dump(-1, ' ', true, json::error_handler_t::replace) == "\"123\\ufffd456\"");
+        }
+
+        SECTION("U+FFFD Substitution of Maximal Subparts")
+        {
+            // Some tests (mostly) from
+            // https://www.unicode.org/versions/Unicode11.0.0/ch03.pdf
+            // Section 3.9 -- U+FFFD Substitution of Maximal Subparts
+
+            auto test = [&](std::string const & input, std::string const & expected)
+            {
+                const json j = input;
+                CHECK(j.dump(-1, ' ', true, json::error_handler_t::replace) == "\"" + expected + "\"");
+            };
+
+            test("\xC2", "\\ufffd");
+            test("\xC2\x41\x42", "\\ufffd" "\x41" "\x42");
+            test("\xC2\xF4", "\\ufffd" "\\ufffd");
+
+            test("\xF0\x80\x80\x41", "\\ufffd" "\\ufffd" "\\ufffd" "\x41");
+            test("\xF1\x80\x80\x41", "\\ufffd" "\x41");
+            test("\xF2\x80\x80\x41", "\\ufffd" "\x41");
+            test("\xF3\x80\x80\x41", "\\ufffd" "\x41");
+            test("\xF4\x80\x80\x41", "\\ufffd" "\x41");
+            test("\xF5\x80\x80\x41", "\\ufffd" "\\ufffd" "\\ufffd" "\x41");
+
+            test("\xF0\x90\x80\x41", "\\ufffd" "\x41");
+            test("\xF1\x90\x80\x41", "\\ufffd" "\x41");
+            test("\xF2\x90\x80\x41", "\\ufffd" "\x41");
+            test("\xF3\x90\x80\x41", "\\ufffd" "\x41");
+            test("\xF4\x90\x80\x41", "\\ufffd" "\\ufffd" "\\ufffd" "\x41");
+            test("\xF5\x90\x80\x41", "\\ufffd" "\\ufffd" "\\ufffd" "\x41");
+
+            test("\xC0\xAF\xE0\x80\xBF\xF0\x81\x82\x41", "\\ufffd" "\\ufffd" "\\ufffd" "\\ufffd" "\\ufffd" "\\ufffd" "\\ufffd" "\\ufffd" "\x41");
+            test("\xED\xA0\x80\xED\xBF\xBF\xED\xAF\x41", "\\ufffd" "\\ufffd" "\\ufffd" "\\ufffd" "\\ufffd" "\\ufffd" "\\ufffd" "\\ufffd" "\x41");
+            test("\xF4\x91\x92\x93\xFF\x41\x80\xBF\x42", "\\ufffd" "\\ufffd" "\\ufffd" "\\ufffd" "\\ufffd" "\x41" "\\ufffd""\\ufffd" "\x42");
+            test("\xE1\x80\xE2\xF0\x91\x92\xF1\xBF\x41", "\\ufffd" "\\ufffd" "\\ufffd" "\\ufffd" "\x41");
+        }
+    }
+
+    SECTION("to_string")
+    {
+        auto test = [&](std::string const & input, std::string const & expected)
+        {
+            using std::to_string;
+            const json j = input;
+            CHECK(to_string(j) == "\"" + expected + "\"");
+        };
+
+        test(R"({"x":5,"y":6})", R"({\"x\":5,\"y\":6})");
+        test("{\"x\":[10,null,null,null]}", R"({\"x\":[10,null,null,null]})");
+        test("test", "test");
+        test("[3,\"false\",false]", R"([3,\"false\",false])");
+    }
+}
+
+TEST_CASE_TEMPLATE("serialization for extreme integer values", T, int32_t, uint32_t, int64_t, uint64_t)
+{
+    SECTION("minimum")
+    {
+        constexpr auto minimum = (std::numeric_limits<T>::min)();
+        const json j = minimum;
+        CHECK(j.dump() == std::to_string(minimum));
+    }
+
+    SECTION("maximum")
+    {
+        constexpr auto maximum = (std::numeric_limits<T>::max)();
+        const json j = maximum;
+        CHECK(j.dump() == std::to_string(maximum));
+    }
+}
+
+TEST_CASE("dump with binary values")
+{
+    auto binary = json::binary({1, 2, 3, 4});
+    auto binary_empty = json::binary({});
+    auto binary_with_subtype = json::binary({1, 2, 3, 4}, 128);
+    auto binary_empty_with_subtype = json::binary({}, 128);
+
+    const json object = {{"key", binary}};
+    const json object_empty = {{"key", binary_empty}};
+    const json object_with_subtype = {{"key", binary_with_subtype}};
+    const json object_empty_with_subtype = {{"key", binary_empty_with_subtype}};
+
+    const json array = {"value", 1, binary};
+    const json array_empty = {"value", 1, binary_empty};
+    const json array_with_subtype = {"value", 1, binary_with_subtype};
+    const json array_empty_with_subtype = {"value", 1, binary_empty_with_subtype};
+
+    SECTION("normal")
+    {
+        CHECK(binary.dump() == "{\"bytes\":[1,2,3,4],\"subtype\":null}");
+        CHECK(binary_empty.dump() == "{\"bytes\":[],\"subtype\":null}");
+        CHECK(binary_with_subtype.dump() == "{\"bytes\":[1,2,3,4],\"subtype\":128}");
+        CHECK(binary_empty_with_subtype.dump() == "{\"bytes\":[],\"subtype\":128}");
+
+        CHECK(object.dump() == "{\"key\":{\"bytes\":[1,2,3,4],\"subtype\":null}}");
+        CHECK(object_empty.dump() == "{\"key\":{\"bytes\":[],\"subtype\":null}}");
+        CHECK(object_with_subtype.dump() == "{\"key\":{\"bytes\":[1,2,3,4],\"subtype\":128}}");
+        CHECK(object_empty_with_subtype.dump() == "{\"key\":{\"bytes\":[],\"subtype\":128}}");
+
+        CHECK(array.dump() == "[\"value\",1,{\"bytes\":[1,2,3,4],\"subtype\":null}]");
+        CHECK(array_empty.dump() == "[\"value\",1,{\"bytes\":[],\"subtype\":null}]");
+        CHECK(array_with_subtype.dump() == "[\"value\",1,{\"bytes\":[1,2,3,4],\"subtype\":128}]");
+        CHECK(array_empty_with_subtype.dump() == "[\"value\",1,{\"bytes\":[],\"subtype\":128}]");
+    }
+
+    SECTION("pretty-printed")
+    {
+        CHECK(binary.dump(4) == "{\n"
+              "    \"bytes\": [1, 2, 3, 4],\n"
+              "    \"subtype\": null\n"
+              "}");
+        CHECK(binary_empty.dump(4) == "{\n"
+              "    \"bytes\": [],\n"
+              "    \"subtype\": null\n"
+              "}");
+        CHECK(binary_with_subtype.dump(4) == "{\n"
+              "    \"bytes\": [1, 2, 3, 4],\n"
+              "    \"subtype\": 128\n"
+              "}");
+        CHECK(binary_empty_with_subtype.dump(4) == "{\n"
+              "    \"bytes\": [],\n"
+              "    \"subtype\": 128\n"
+              "}");
+
+        CHECK(object.dump(4) == "{\n"
+              "    \"key\": {\n"
+              "        \"bytes\": [1, 2, 3, 4],\n"
+              "        \"subtype\": null\n"
+              "    }\n"
+              "}");
+        CHECK(object_empty.dump(4) == "{\n"
+              "    \"key\": {\n"
+              "        \"bytes\": [],\n"
+              "        \"subtype\": null\n"
+              "    }\n"
+              "}");
+        CHECK(object_with_subtype.dump(4) == "{\n"
+              "    \"key\": {\n"
+              "        \"bytes\": [1, 2, 3, 4],\n"
+              "        \"subtype\": 128\n"
+              "    }\n"
+              "}");
+        CHECK(object_empty_with_subtype.dump(4) == "{\n"
+              "    \"key\": {\n"
+              "        \"bytes\": [],\n"
+              "        \"subtype\": 128\n"
+              "    }\n"
+              "}");
+
+        CHECK(array.dump(4) == "[\n"
+              "    \"value\",\n"
+              "    1,\n"
+              "    {\n"
+              "        \"bytes\": [1, 2, 3, 4],\n"
+              "        \"subtype\": null\n"
+              "    }\n"
+              "]");
+        CHECK(array_empty.dump(4) == "[\n"
+              "    \"value\",\n"
+              "    1,\n"
+              "    {\n"
+              "        \"bytes\": [],\n"
+              "        \"subtype\": null\n"
+              "    }\n"
+              "]");
+        CHECK(array_with_subtype.dump(4) == "[\n"
+              "    \"value\",\n"
+              "    1,\n"
+              "    {\n"
+              "        \"bytes\": [1, 2, 3, 4],\n"
+              "        \"subtype\": 128\n"
+              "    }\n"
+              "]");
+        CHECK(array_empty_with_subtype.dump(4) == "[\n"
+              "    \"value\",\n"
+              "    1,\n"
+              "    {\n"
+              "        \"bytes\": [],\n"
+              "        \"subtype\": 128\n"
+              "    }\n"
+              "]");
+    }
+}
diff --git a/external_imported/json/test/src/unit-testsuites.cpp b/external_imported/json/tests/src/unit-testsuites.cpp
similarity index 96%
rename from external_imported/json/test/src/unit-testsuites.cpp
rename to external_imported/json/tests/src/unit-testsuites.cpp
index da8b27d78..5807934ba 100644
--- a/external_imported/json/test/src/unit-testsuites.cpp
+++ b/external_imported/json/tests/src/unit-testsuites.cpp
@@ -1,31 +1,10 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
 
 #include "doctest_compatibility.h"
 
@@ -33,7 +12,7 @@ SOFTWARE.
 using nlohmann::json;
 
 #include <fstream>
-#include <test_data.hpp>
+#include "make_test_data_available.hpp"
 
 TEST_CASE("compliance tests from json.org")
 {
@@ -41,7 +20,7 @@ TEST_CASE("compliance tests from json.org")
 
     SECTION("expected failures")
     {
-        for (auto filename :
+        for (const auto* filename :
                 {
                     //TEST_DATA_DIRECTORY "/json_tests/fail1.json",
                     TEST_DATA_DIRECTORY "/json_tests/fail2.json",
@@ -90,7 +69,7 @@ TEST_CASE("compliance tests from json.org")
         // these tests fail above, because the parser does not end on EOF;
         // they succeed when the operator>> is used, because it does not
         // have this constraint
-        for (auto filename :
+        for (const auto* filename :
                 {
                     TEST_DATA_DIRECTORY "/json_tests/fail7.json",
                     TEST_DATA_DIRECTORY "/json_tests/fail8.json",
@@ -106,7 +85,7 @@ TEST_CASE("compliance tests from json.org")
 
     SECTION("expected passes")
     {
-        for (auto filename :
+        for (const auto* filename :
                 {
                     TEST_DATA_DIRECTORY "/json_tests/pass1.json",
                     TEST_DATA_DIRECTORY "/json_tests/pass2.json",
@@ -235,13 +214,9 @@ TEST_CASE("compliance tests from nativejson-benchmark")
                     5708990770823839524233143877797980545530986496.0);
 
         {
-            char n1e308[312];   // '1' followed by 308 '0'
+            std::string n1e308(312, '0');   // '1' followed by 308 '0'
             n1e308[0] = '[';
             n1e308[1] = '1';
-            for (int j = 2; j < 310; j++)
-            {
-                n1e308[j] = '0';
-            }
             n1e308[310] = ']';
             n1e308[311] = '\0';
             TEST_DOUBLE(n1e308, 1E308);
@@ -272,20 +247,20 @@ TEST_CASE("compliance tests from nativejson-benchmark")
 
         TEST_STRING("[\"\"]", "");
         TEST_STRING("[\"Hello\"]", "Hello");
-        TEST_STRING("[\"Hello\\nWorld\"]", "Hello\nWorld");
+        TEST_STRING(R"(["Hello\nWorld"])", "Hello\nWorld");
         //TEST_STRING("[\"Hello\\u0000World\"]", "Hello\0World");
-        TEST_STRING("[\"\\\"\\\\/\\b\\f\\n\\r\\t\"]", "\"\\/\b\f\n\r\t");
-        TEST_STRING("[\"\\u0024\"]", "\x24");         // Dollar sign U+0024
-        TEST_STRING("[\"\\u00A2\"]", "\xC2\xA2");     // Cents sign U+00A2
-        TEST_STRING("[\"\\u20AC\"]", "\xE2\x82\xAC"); // Euro sign U+20AC
-        TEST_STRING("[\"\\uD834\\uDD1E\"]", "\xF0\x9D\x84\x9E");  // G clef sign U+1D11E
+        TEST_STRING(R"(["\"\\/\b\f\n\r\t"])", "\"\\/\b\f\n\r\t");
+        TEST_STRING(R"(["\u0024"])", "$");         // Dollar sign U+0024
+        TEST_STRING(R"(["\u00A2"])", "\xC2\xA2");     // Cents sign U+00A2
+        TEST_STRING(R"(["\u20AC"])", "\xE2\x82\xAC"); // Euro sign U+20AC
+        TEST_STRING(R"(["\uD834\uDD1E"])", "\xF0\x9D\x84\x9E");  // G clef sign U+1D11E
     }
 
     SECTION("roundtrip")
     {
         // test cases are from https://github.com/miloyip/nativejson-benchmark/tree/master/test/data/roundtrip
 
-        for (auto filename :
+        for (const auto* filename :
                 {
                     TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip01.json",
                     TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip02.json",
@@ -327,7 +302,7 @@ TEST_CASE("compliance tests from nativejson-benchmark")
                                      (std::istreambuf_iterator<char>()) );
 
             CAPTURE(json_string)
-            json j = json::parse(json_string);
+            const json j = json::parse(json_string);
             CHECK(j.dump() == json_string);
         }
     }
@@ -388,43 +363,43 @@ TEST_CASE("json.org examples")
     }
     SECTION("FILE 1.json")
     {
-        std::unique_ptr<std::FILE, decltype(&std::fclose)> f(std::fopen(TEST_DATA_DIRECTORY "/json.org/1.json", "r"), &std::fclose);
+        const std::unique_ptr<std::FILE, decltype(&std::fclose)> f(std::fopen(TEST_DATA_DIRECTORY "/json.org/1.json", "r"), &std::fclose);
         json _;
         CHECK_NOTHROW(_ = json::parse(f.get()));
     }
 
     SECTION("FILE 2.json")
     {
-        std::unique_ptr<std::FILE, decltype(&std::fclose)> f(std::fopen(TEST_DATA_DIRECTORY "/json.org/2.json", "r"), &std::fclose);
+        const std::unique_ptr<std::FILE, decltype(&std::fclose)> f(std::fopen(TEST_DATA_DIRECTORY "/json.org/2.json", "r"), &std::fclose);
         json _;
         CHECK_NOTHROW(_ = json::parse(f.get()));
     }
 
     SECTION("FILE 3.json")
     {
-        std::unique_ptr<std::FILE, decltype(&std::fclose)> f(std::fopen(TEST_DATA_DIRECTORY "/json.org/3.json", "r"), &std::fclose);
+        const std::unique_ptr<std::FILE, decltype(&std::fclose)> f(std::fopen(TEST_DATA_DIRECTORY "/json.org/3.json", "r"), &std::fclose);
         json _;
         CHECK_NOTHROW(_ = json::parse(f.get()));
     }
 
     SECTION("FILE 4.json")
     {
-        std::unique_ptr<std::FILE, decltype(&std::fclose)> f(std::fopen(TEST_DATA_DIRECTORY "/json.org/4.json", "r"), &std::fclose);
+        const std::unique_ptr<std::FILE, decltype(&std::fclose)> f(std::fopen(TEST_DATA_DIRECTORY "/json.org/4.json", "r"), &std::fclose);
         json _;
         CHECK_NOTHROW(_ = json::parse(f.get()));
     }
 
     SECTION("FILE 5.json")
     {
-        std::unique_ptr<std::FILE, decltype(&std::fclose)> f(std::fopen(TEST_DATA_DIRECTORY "/json.org/5.json", "r"), &std::fclose);
+        const std::unique_ptr<std::FILE, decltype(&std::fclose)> f(std::fopen(TEST_DATA_DIRECTORY "/json.org/5.json", "r"), &std::fclose);
         json _;
         CHECK_NOTHROW(_ = json::parse(f.get()));
     }
 }
 
-TEST_CASE("RFC 7159 examples")
+TEST_CASE("RFC 8259 examples")
 {
-    // here, we list all JSON values from the RFC 7159 document
+    // here, we list all JSON values from the RFC 8259 document
 
     SECTION("7. Strings")
     {
@@ -441,7 +416,7 @@ TEST_CASE("RFC 7159 examples")
     SECTION("13 Examples")
     {
         {
-            auto json_contents = R"(
+            const auto* json_contents = R"(
             {
                  "Image": {
                      "Width":  800,
@@ -462,7 +437,7 @@ TEST_CASE("RFC 7159 examples")
         }
 
         {
-            auto json_contents = R"(
+            const auto* json_contents = R"(
                 [
                     {
                        "precision": "zip",
@@ -500,7 +475,7 @@ TEST_CASE("nst's JSONTestSuite")
     {
         SECTION("y")
         {
-            for (auto filename :
+            for (const auto* filename :
                     {
                         TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_arraysWithSpaces.json",
                         TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/y_array_empty-string.json",
@@ -610,7 +585,7 @@ TEST_CASE("nst's JSONTestSuite")
 
         SECTION("n")
         {
-            for (auto filename :
+            for (const auto* filename :
                     {
                         TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/n_array_1_true_without_comma.json",
                         TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/n_array_a_invalid_utf8.json",
@@ -822,7 +797,7 @@ TEST_CASE("nst's JSONTestSuite")
             // these tests fail above, because the parser does not end on EOF;
             // they succeed when the operator>> is used, because it does not
             // have this constraint
-            for (auto filename :
+            for (const auto* filename :
                     {
                         TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/n_array_comma_after_close.json",
                         TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/n_array_extra_close.json",
@@ -852,7 +827,7 @@ TEST_CASE("nst's JSONTestSuite")
 
         SECTION("i -> y")
         {
-            for (auto filename :
+            for (const auto* filename :
                     {
                         // we do not pose a limit on nesting
                         TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/i_structure_500_nested_arrays.json",
@@ -876,7 +851,7 @@ TEST_CASE("nst's JSONTestSuite")
         // numbers that overflow during parsing
         SECTION("i/y -> n (out of range)")
         {
-            for (auto filename :
+            for (const auto* filename :
                     {
                         TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/i_number_neg_int_huge_exp.json",
                         TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/i_number_pos_double_huge_exp.json",
@@ -895,7 +870,7 @@ TEST_CASE("nst's JSONTestSuite")
 
         SECTION("i -> n")
         {
-            for (auto filename :
+            for (const auto* filename :
                     {
                         TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/i_object_key_lone_2nd_surrogate.json",
                         TEST_DATA_DIRECTORY "/nst_json_testsuite/test_parsing/i_string_1st_surrogate_but_2nd_missing.json",
@@ -928,7 +903,7 @@ TEST_CASE("nst's JSONTestSuite (2)")
     {
         SECTION("y")
         {
-            for (auto filename :
+            for (const auto* filename :
                     {
                         TEST_DATA_DIRECTORY "/nst_json_testsuite2/test_parsing/y_array_arraysWithSpaces.json",
                         TEST_DATA_DIRECTORY "/nst_json_testsuite2/test_parsing/y_array_empty-string.json",
@@ -1039,7 +1014,7 @@ TEST_CASE("nst's JSONTestSuite (2)")
 
         SECTION("n")
         {
-            for (auto filename :
+            for (const auto* filename :
                     {
                         TEST_DATA_DIRECTORY "/nst_json_testsuite2/test_parsing/n_array_1_true_without_comma.json",
                         TEST_DATA_DIRECTORY "/nst_json_testsuite2/test_parsing/n_array_a_invalid_utf8.json",
@@ -1241,7 +1216,7 @@ TEST_CASE("nst's JSONTestSuite (2)")
 
         SECTION("n (previously overflowed)")
         {
-            for (auto filename :
+            for (const auto* filename :
                     {
                         TEST_DATA_DIRECTORY "/nst_json_testsuite2/test_parsing/n_structure_100000_opening_arrays.json",
                         TEST_DATA_DIRECTORY "/nst_json_testsuite2/test_parsing/n_structure_open_array_object.json"
@@ -1256,7 +1231,7 @@ TEST_CASE("nst's JSONTestSuite (2)")
 
         SECTION("i -> y")
         {
-            for (auto filename :
+            for (const auto* filename :
                     {
                         TEST_DATA_DIRECTORY "/nst_json_testsuite2/test_parsing/i_number_double_huge_neg_exp.json",
                         //TEST_DATA_DIRECTORY "/nst_json_testsuite2/test_parsing/i_number_huge_exp.json",
@@ -1307,7 +1282,7 @@ TEST_CASE("nst's JSONTestSuite (2)")
 
         SECTION("i -> n")
         {
-            for (auto filename :
+            for (const auto* filename :
                     {
                         //TEST_DATA_DIRECTORY "/nst_json_testsuite2/test_parsing/i_number_double_huge_neg_exp.json",
                         TEST_DATA_DIRECTORY "/nst_json_testsuite2/test_parsing/i_number_huge_exp.json",
@@ -1365,15 +1340,15 @@ std::string trim(const std::string& str);
 // from https://stackoverflow.com/a/25829178/266378
 std::string trim(const std::string& str)
 {
-    size_t first = str.find_first_not_of(' ');
+    const size_t first = str.find_first_not_of(' ');
     if (std::string::npos == first)
     {
         return str;
     }
-    size_t last = str.find_last_not_of(' ');
+    const size_t last = str.find_last_not_of(' ');
     return str.substr(first, (last - first + 1));
 }
-}
+} // namespace
 
 TEST_CASE("Big List of Naughty Strings")
 {
@@ -1399,7 +1374,7 @@ TEST_CASE("Big List of Naughty Strings")
             line = trim(line);
 
             // remove trailing comma
-            line = line.substr(0, line.find_last_of(","));
+            line = line.substr(0, line.find_last_of(','));
 
             // discard lines without at least two characters (quotes)
             if (line.size() < 2)
@@ -1409,7 +1384,7 @@ TEST_CASE("Big List of Naughty Strings")
 
             // check roundtrip
             CAPTURE(line)
-            json j = json::parse(line);
+            const json j = json::parse(line);
             CHECK(j.dump() == line);
         }
     }
diff --git a/external_imported/json/test/src/unit-to_chars.cpp b/external_imported/json/tests/src/unit-to_chars.cpp
similarity index 92%
rename from external_imported/json/test/src/unit-to_chars.cpp
rename to external_imported/json/tests/src/unit-to_chars.cpp
index 2861928f8..6d32e0656 100644
--- a/external_imported/json/test/src/unit-to_chars.cpp
+++ b/external_imported/json/tests/src/unit-to_chars.cpp
@@ -1,31 +1,10 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
 
 // XXX:
 // Only compile these tests if 'float' and 'double' are IEEE-754 single- and
@@ -38,7 +17,7 @@ using nlohmann::detail::dtoa_impl::reinterpret_bits;
 
 namespace
 {
-static float make_float(uint32_t sign_bit, uint32_t biased_exponent, uint32_t significand)
+float make_float(uint32_t sign_bit, uint32_t biased_exponent, uint32_t significand)
 {
     assert(sign_bit == 0 || sign_bit == 1);
     assert(biased_exponent <= 0xFF);
@@ -54,7 +33,7 @@ static float make_float(uint32_t sign_bit, uint32_t biased_exponent, uint32_t si
 }
 
 // ldexp -- convert f * 2^e to IEEE single precision
-static float make_float(uint64_t f, int e)
+float make_float(uint64_t f, int e)
 {
     constexpr uint64_t kHiddenBit               = 0x00800000;
     constexpr uint64_t kSignificandMask         = 0x007FFFFF;
@@ -82,15 +61,15 @@ static float make_float(uint64_t f, int e)
         e--;
     }
 
-    uint64_t biased_exponent = (e == kDenormalExponent && (f & kHiddenBit) == 0)
-                               ? 0
-                               : static_cast<uint64_t>(e + kExponentBias);
+    const uint64_t biased_exponent = (e == kDenormalExponent && (f & kHiddenBit) == 0)
+                                     ? 0
+                                     : static_cast<uint64_t>(e + kExponentBias);
 
-    uint64_t bits = (f & kSignificandMask) | (biased_exponent << kPhysicalSignificandSize);
+    const uint64_t bits = (f & kSignificandMask) | (biased_exponent << kPhysicalSignificandSize);
     return reinterpret_bits<float>(static_cast<uint32_t>(bits));
 }
 
-static double make_double(uint64_t sign_bit, uint64_t biased_exponent, uint64_t significand)
+double make_double(uint64_t sign_bit, uint64_t biased_exponent, uint64_t significand)
 {
     assert(sign_bit == 0 || sign_bit == 1);
     assert(biased_exponent <= 0x7FF);
@@ -106,7 +85,7 @@ static double make_double(uint64_t sign_bit, uint64_t biased_exponent, uint64_t
 }
 
 // ldexp -- convert f * 2^e to IEEE double precision
-static double make_double(uint64_t f, int e)
+double make_double(uint64_t f, int e)
 {
     constexpr uint64_t kHiddenBit               = 0x0010000000000000;
     constexpr uint64_t kSignificandMask         = 0x000FFFFFFFFFFFFF;
@@ -134,14 +113,14 @@ static double make_double(uint64_t f, int e)
         e--;
     }
 
-    uint64_t biased_exponent = (e == kDenormalExponent && (f & kHiddenBit) == 0)
-                               ? 0
-                               : static_cast<uint64_t>(e + kExponentBias);
+    const uint64_t biased_exponent = (e == kDenormalExponent && (f & kHiddenBit) == 0)
+                                     ? 0
+                                     : static_cast<uint64_t>(e + kExponentBias);
 
-    uint64_t bits = (f & kSignificandMask) | (biased_exponent << kPhysicalSignificandSize);
+    const uint64_t bits = (f & kSignificandMask) | (biased_exponent << kPhysicalSignificandSize);
     return reinterpret_bits<double>(bits);
 }
-}
+} // namespace
 
 TEST_CASE("digit gen")
 {
@@ -153,12 +132,12 @@ TEST_CASE("digit gen")
             CAPTURE(digits)
             CAPTURE(expected_exponent)
 
-            char buf[32];
+            std::array<char, 32> buf{};
             int len = 0;
             int exponent = 0;
-            nlohmann::detail::dtoa_impl::grisu2(buf, len, exponent, number);
+            nlohmann::detail::dtoa_impl::grisu2(buf.data(), len, exponent, number);
 
-            CHECK(digits == std::string(buf, buf + len));
+            CHECK(digits == std::string(buf.data(), buf.data() + len));
             CHECK(expected_exponent == exponent);
         };
 
@@ -217,12 +196,12 @@ TEST_CASE("digit gen")
             CAPTURE(digits)
             CAPTURE(expected_exponent)
 
-            char buf[32];
+            std::array<char, 32> buf{};
             int len = 0;
             int exponent = 0;
-            nlohmann::detail::dtoa_impl::grisu2(buf, len, exponent, number);
+            nlohmann::detail::dtoa_impl::grisu2(buf.data(), len, exponent, number);
 
-            CHECK(digits == std::string(buf, buf + len));
+            CHECK(digits == std::string(buf.data(), buf.data() + len));
             CHECK(expected_exponent == exponent);
         };
 
@@ -360,7 +339,7 @@ TEST_CASE("formatting")
         auto check_float = [](float number, const std::string & expected)
         {
             std::array<char, 33> buf{};
-            char* end = nlohmann::detail::to_chars(buf.data(), buf.data() + 32, number);
+            char* end = nlohmann::detail::to_chars(buf.data(), buf.data() + 32, number); // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
             std::string actual(buf.data(), end);
 
             CHECK(actual == expected);
@@ -420,7 +399,7 @@ TEST_CASE("formatting")
         auto check_double = [](double number, const std::string & expected)
         {
             std::array<char, 33> buf{};
-            char* end = nlohmann::detail::to_chars(buf.data(), buf.data() + 32, number);
+            char* end = nlohmann::detail::to_chars(buf.data(), buf.data() + 32, number); // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
             std::string actual(buf.data(), end);
 
             CHECK(actual == expected);
@@ -479,7 +458,7 @@ TEST_CASE("formatting")
     {
         auto check_integer = [](std::int64_t number, const std::string & expected)
         {
-            nlohmann::json j = number;
+            const nlohmann::json j = number;
             CHECK(j.dump() == expected);
         };
 
diff --git a/external_imported/json/tests/src/unit-type_traits.cpp b/external_imported/json/tests/src/unit-type_traits.cpp
new file mode 100644
index 000000000..4c78aa990
--- /dev/null
+++ b/external_imported/json/tests/src/unit-type_traits.cpp
@@ -0,0 +1,56 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+#if JSON_TEST_USING_MULTIPLE_HEADERS
+    #include <nlohmann/detail/meta/type_traits.hpp>
+#else
+    #include <nlohmann/json.hpp>
+#endif
+
+TEST_CASE("type traits")
+{
+    SECTION("is_c_string")
+    {
+        using nlohmann::detail::is_c_string;
+        using nlohmann::detail::is_c_string_uncvref;
+
+        SECTION("char *")
+        {
+            CHECK(is_c_string<char*>::value);
+            CHECK(is_c_string<const char*>::value);
+            CHECK(is_c_string<char* const>::value);
+            CHECK(is_c_string<const char* const>::value);
+
+            CHECK_FALSE(is_c_string<char*&>::value);
+            CHECK_FALSE(is_c_string<const char*&>::value);
+            CHECK_FALSE(is_c_string<char* const&>::value);
+            CHECK_FALSE(is_c_string<const char* const&>::value);
+
+            CHECK(is_c_string_uncvref<char*&>::value);
+            CHECK(is_c_string_uncvref<const char*&>::value);
+            CHECK(is_c_string_uncvref<char* const&>::value);
+            CHECK(is_c_string_uncvref<const char* const&>::value);
+        }
+
+        SECTION("char[]")
+        {
+            // NOLINTBEGIN(hicpp-avoid-c-arrays,modernize-avoid-c-arrays,cppcoreguidelines-avoid-c-arrays)
+            CHECK(is_c_string<char[]>::value);
+            CHECK(is_c_string<const char[]>::value);
+
+            CHECK_FALSE(is_c_string<char(&)[]>::value);
+            CHECK_FALSE(is_c_string<const char(&)[]>::value);
+
+            CHECK(is_c_string_uncvref<char(&)[]>::value);
+            CHECK(is_c_string_uncvref<const char(&)[]>::value);
+            // NOLINTEND(hicpp-avoid-c-arrays,modernize-avoid-c-arrays,cppcoreguidelines-avoid-c-arrays)
+        }
+    }
+}
diff --git a/external_imported/json/tests/src/unit-ubjson.cpp b/external_imported/json/tests/src/unit-ubjson.cpp
new file mode 100644
index 000000000..06611c5fe
--- /dev/null
+++ b/external_imported/json/tests/src/unit-ubjson.cpp
@@ -0,0 +1,2547 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+#include <nlohmann/json.hpp>
+using nlohmann::json;
+
+#include <iostream>
+#include <fstream>
+#include <set>
+#include "make_test_data_available.hpp"
+#include "test_utils.hpp"
+
+namespace
+{
+class SaxCountdown
+{
+  public:
+    explicit SaxCountdown(const int count) : events_left(count)
+    {}
+
+    bool null()
+    {
+        return events_left-- > 0;
+    }
+
+    bool boolean(bool /*unused*/)
+    {
+        return events_left-- > 0;
+    }
+
+    bool number_integer(json::number_integer_t /*unused*/)
+    {
+        return events_left-- > 0;
+    }
+
+    bool number_unsigned(json::number_unsigned_t /*unused*/)
+    {
+        return events_left-- > 0;
+    }
+
+    bool number_float(json::number_float_t /*unused*/, const std::string& /*unused*/)
+    {
+        return events_left-- > 0;
+    }
+
+    bool string(std::string& /*unused*/)
+    {
+        return events_left-- > 0;
+    }
+
+    bool binary(std::vector<std::uint8_t>& /*unused*/)
+    {
+        return events_left-- > 0;
+    }
+
+    bool start_object(std::size_t /*unused*/)
+    {
+        return events_left-- > 0;
+    }
+
+    bool key(std::string& /*unused*/)
+    {
+        return events_left-- > 0;
+    }
+
+    bool end_object()
+    {
+        return events_left-- > 0;
+    }
+
+    bool start_array(std::size_t /*unused*/)
+    {
+        return events_left-- > 0;
+    }
+
+    bool end_array()
+    {
+        return events_left-- > 0;
+    }
+
+    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/, const json::exception& /*unused*/) // NOLINT(readability-convert-member-functions-to-static)
+    {
+        return false;
+    }
+
+  private:
+    int events_left = 0;
+};
+} // namespace
+
+TEST_CASE("UBJSON")
+{
+    SECTION("individual values")
+    {
+        SECTION("discarded")
+        {
+            // discarded values are not serialized
+            json const j = json::value_t::discarded;
+            const auto result = json::to_ubjson(j);
+            CHECK(result.empty());
+        }
+
+        SECTION("null")
+        {
+            json const j = nullptr;
+            std::vector<uint8_t> expected = {'Z'};
+            const auto result = json::to_ubjson(j);
+            CHECK(result == expected);
+
+            // roundtrip
+            CHECK(json::from_ubjson(result) == j);
+            CHECK(json::from_ubjson(result, true, false) == j);
+        }
+
+        SECTION("boolean")
+        {
+            SECTION("true")
+            {
+                json const j = true;
+                std::vector<uint8_t> const expected = {'T'};
+                const auto result = json::to_ubjson(j);
+                CHECK(result == expected);
+
+                // roundtrip
+                CHECK(json::from_ubjson(result) == j);
+                CHECK(json::from_ubjson(result, true, false) == j);
+            }
+
+            SECTION("false")
+            {
+                json const j = false;
+                std::vector<uint8_t> const expected = {'F'};
+                const auto result = json::to_ubjson(j);
+                CHECK(result == expected);
+
+                // roundtrip
+                CHECK(json::from_ubjson(result) == j);
+                CHECK(json::from_ubjson(result, true, false) == j);
+            }
+        }
+
+        SECTION("number")
+        {
+            SECTION("signed")
+            {
+                SECTION("-9223372036854775808..-2147483649 (int64)")
+                {
+                    std::vector<int64_t> const numbers
+                    {
+                        (std::numeric_limits<int64_t>::min)(),
+                        -1000000000000000000LL,
+                        -100000000000000000LL,
+                        -10000000000000000LL,
+                        -1000000000000000LL,
+                        -100000000000000LL,
+                        -10000000000000LL,
+                        -1000000000000LL,
+                        -100000000000LL,
+                        -10000000000LL,
+                        -2147483649LL,
+                    };
+                    for (auto i : numbers)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        json const j = i;
+
+                        // check type
+                        CHECK(j.is_number_integer());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            static_cast<uint8_t>('L'),
+                            static_cast<uint8_t>((i >> 56) & 0xff),
+                            static_cast<uint8_t>((i >> 48) & 0xff),
+                            static_cast<uint8_t>((i >> 40) & 0xff),
+                            static_cast<uint8_t>((i >> 32) & 0xff),
+                            static_cast<uint8_t>((i >> 24) & 0xff),
+                            static_cast<uint8_t>((i >> 16) & 0xff),
+                            static_cast<uint8_t>((i >> 8) & 0xff),
+                            static_cast<uint8_t>(i & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_ubjson(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 9);
+
+                        // check individual bytes
+                        CHECK(result[0] == 'L');
+                        int64_t const restored = (static_cast<int64_t>(result[1]) << 070) +
+                                                 (static_cast<int64_t>(result[2]) << 060) +
+                                                 (static_cast<int64_t>(result[3]) << 050) +
+                                                 (static_cast<int64_t>(result[4]) << 040) +
+                                                 (static_cast<int64_t>(result[5]) << 030) +
+                                                 (static_cast<int64_t>(result[6]) << 020) +
+                                                 (static_cast<int64_t>(result[7]) << 010) +
+                                                 static_cast<int64_t>(result[8]);
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_ubjson(result) == j);
+                        CHECK(json::from_ubjson(result, true, false) == j);
+                    }
+                }
+
+                SECTION("-2147483648..-32769 (int32)")
+                {
+                    std::vector<int32_t> numbers;
+                    numbers.push_back(-32769);
+                    numbers.push_back(-100000);
+                    numbers.push_back(-1000000);
+                    numbers.push_back(-10000000);
+                    numbers.push_back(-100000000);
+                    numbers.push_back(-1000000000);
+                    numbers.push_back(-2147483647 - 1); // https://stackoverflow.com/a/29356002/266378
+                    for (auto i : numbers)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        json const j = i;
+
+                        // check type
+                        CHECK(j.is_number_integer());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            static_cast<uint8_t>('l'),
+                            static_cast<uint8_t>((i >> 24) & 0xff),
+                            static_cast<uint8_t>((i >> 16) & 0xff),
+                            static_cast<uint8_t>((i >> 8) & 0xff),
+                            static_cast<uint8_t>(i & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_ubjson(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 5);
+
+                        // check individual bytes
+                        CHECK(result[0] == 'l');
+                        int32_t const restored = (static_cast<int32_t>(result[1]) << 030) +
+                                                 (static_cast<int32_t>(result[2]) << 020) +
+                                                 (static_cast<int32_t>(result[3]) << 010) +
+                                                 static_cast<int32_t>(result[4]);
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_ubjson(result) == j);
+                        CHECK(json::from_ubjson(result, true, false) == j);
+                    }
+                }
+
+                SECTION("-32768..-129 (int16)")
+                {
+                    for (int32_t i = -32768; i <= -129; ++i)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        json const j = i;
+
+                        // check type
+                        CHECK(j.is_number_integer());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            static_cast<uint8_t>('I'),
+                            static_cast<uint8_t>((i >> 8) & 0xff),
+                            static_cast<uint8_t>(i & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_ubjson(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 3);
+
+                        // check individual bytes
+                        CHECK(result[0] == 'I');
+                        auto const restored = static_cast<int16_t>(((result[1] << 8) + result[2]));
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_ubjson(result) == j);
+                        CHECK(json::from_ubjson(result, true, false) == j);
+                    }
+                }
+
+                SECTION("-9263 (int16)")
+                {
+                    json const j = -9263;
+                    std::vector<uint8_t> expected = {'I', 0xdb, 0xd1};
+
+                    // compare result + size
+                    const auto result = json::to_ubjson(j);
+                    CHECK(result == expected);
+                    CHECK(result.size() == 3);
+
+                    // check individual bytes
+                    CHECK(result[0] == 'I');
+                    auto const restored = static_cast<int16_t>(((result[1] << 8) + result[2]));
+                    CHECK(restored == -9263);
+
+                    // roundtrip
+                    CHECK(json::from_ubjson(result) == j);
+                    CHECK(json::from_ubjson(result, true, false) == j);
+                }
+
+                SECTION("-128..-1 (int8)")
+                {
+                    for (auto i = -128; i <= -1; ++i)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        json const j = i;
+
+                        // check type
+                        CHECK(j.is_number_integer());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            'i',
+                            static_cast<uint8_t>(i),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_ubjson(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 2);
+
+                        // check individual bytes
+                        CHECK(result[0] == 'i');
+                        CHECK(static_cast<int8_t>(result[1]) == i);
+
+                        // roundtrip
+                        CHECK(json::from_ubjson(result) == j);
+                        CHECK(json::from_ubjson(result, true, false) == j);
+                    }
+                }
+
+                SECTION("0..127 (int8)")
+                {
+                    for (size_t i = 0; i <= 127; ++i)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        json j = -1;
+                        j.get_ref<json::number_integer_t&>() = static_cast<json::number_integer_t>(i);
+
+                        // check type
+                        CHECK(j.is_number_integer());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            static_cast<uint8_t>('i'),
+                            static_cast<uint8_t>(i),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_ubjson(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 2);
+
+                        // check individual bytes
+                        CHECK(result[0] == 'i');
+                        CHECK(result[1] == i);
+
+                        // roundtrip
+                        CHECK(json::from_ubjson(result) == j);
+                        CHECK(json::from_ubjson(result, true, false) == j);
+                    }
+                }
+
+                SECTION("128..255 (uint8)")
+                {
+                    for (size_t i = 128; i <= 255; ++i)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        json j = -1;
+                        j.get_ref<json::number_integer_t&>() = static_cast<json::number_integer_t>(i);
+
+                        // check type
+                        CHECK(j.is_number_integer());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            static_cast<uint8_t>('U'),
+                            static_cast<uint8_t>(i),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_ubjson(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 2);
+
+                        // check individual bytes
+                        CHECK(result[0] == 'U');
+                        CHECK(result[1] == i);
+
+                        // roundtrip
+                        CHECK(json::from_ubjson(result) == j);
+                        CHECK(json::from_ubjson(result, true, false) == j);
+                    }
+                }
+
+                SECTION("256..32767 (int16)")
+                {
+                    for (size_t i = 256; i <= 32767; ++i)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        json j = -1;
+                        j.get_ref<json::number_integer_t&>() = static_cast<json::number_integer_t>(i);
+
+                        // check type
+                        CHECK(j.is_number_integer());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            static_cast<uint8_t>('I'),
+                            static_cast<uint8_t>((i >> 8) & 0xff),
+                            static_cast<uint8_t>(i & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_ubjson(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 3);
+
+                        // check individual bytes
+                        CHECK(result[0] == 'I');
+                        auto const restored = static_cast<uint16_t>(static_cast<uint8_t>(result[1]) * 256 + static_cast<uint8_t>(result[2]));
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_ubjson(result) == j);
+                        CHECK(json::from_ubjson(result, true, false) == j);
+                    }
+                }
+
+                SECTION("65536..2147483647 (int32)")
+                {
+                    for (uint32_t i :
+                            {
+                                65536u, 77777u, 1048576u
+                            })
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        json j = -1;
+                        j.get_ref<json::number_integer_t&>() = static_cast<json::number_integer_t>(i);
+
+                        // check type
+                        CHECK(j.is_number_integer());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            'l',
+                            static_cast<uint8_t>((i >> 24) & 0xff),
+                            static_cast<uint8_t>((i >> 16) & 0xff),
+                            static_cast<uint8_t>((i >> 8) & 0xff),
+                            static_cast<uint8_t>(i & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_ubjson(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 5);
+
+                        // check individual bytes
+                        CHECK(result[0] == 'l');
+                        uint32_t const restored = (static_cast<uint32_t>(result[1]) << 030) +
+                                                  (static_cast<uint32_t>(result[2]) << 020) +
+                                                  (static_cast<uint32_t>(result[3]) << 010) +
+                                                  static_cast<uint32_t>(result[4]);
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_ubjson(result) == j);
+                        CHECK(json::from_ubjson(result, true, false) == j);
+                    }
+                }
+
+                SECTION("2147483648..9223372036854775807 (int64)")
+                {
+                    std::vector<uint64_t> const v = {2147483648ul, 9223372036854775807ul};
+                    for (uint64_t i : v)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        json j = -1;
+                        j.get_ref<json::number_integer_t&>() = static_cast<json::number_integer_t>(i);
+
+                        // check type
+                        CHECK(j.is_number_integer());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            'L',
+                            static_cast<uint8_t>((i >> 070) & 0xff),
+                            static_cast<uint8_t>((i >> 060) & 0xff),
+                            static_cast<uint8_t>((i >> 050) & 0xff),
+                            static_cast<uint8_t>((i >> 040) & 0xff),
+                            static_cast<uint8_t>((i >> 030) & 0xff),
+                            static_cast<uint8_t>((i >> 020) & 0xff),
+                            static_cast<uint8_t>((i >> 010) & 0xff),
+                            static_cast<uint8_t>(i & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_ubjson(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 9);
+
+                        // check individual bytes
+                        CHECK(result[0] == 'L');
+                        uint64_t const restored = (static_cast<uint64_t>(result[1]) << 070) +
+                                                  (static_cast<uint64_t>(result[2]) << 060) +
+                                                  (static_cast<uint64_t>(result[3]) << 050) +
+                                                  (static_cast<uint64_t>(result[4]) << 040) +
+                                                  (static_cast<uint64_t>(result[5]) << 030) +
+                                                  (static_cast<uint64_t>(result[6]) << 020) +
+                                                  (static_cast<uint64_t>(result[7]) << 010) +
+                                                  static_cast<uint64_t>(result[8]);
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_ubjson(result) == j);
+                        CHECK(json::from_ubjson(result, true, false) == j);
+                    }
+                }
+            }
+
+            SECTION("unsigned")
+            {
+                SECTION("0..127 (int8)")
+                {
+                    for (size_t i = 0; i <= 127; ++i)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with unsigned integer number
+                        json const j = i;
+
+                        // check type
+                        CHECK(j.is_number_unsigned());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            'i',
+                            static_cast<uint8_t>(i),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_ubjson(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 2);
+
+                        // check individual bytes
+                        CHECK(result[0] == 'i');
+                        auto const restored = static_cast<uint8_t>(result[1]);
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_ubjson(result) == j);
+                        CHECK(json::from_ubjson(result, true, false) == j);
+                    }
+                }
+
+                SECTION("128..255 (uint8)")
+                {
+                    for (size_t i = 128; i <= 255; ++i)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with unsigned integer number
+                        json const j = i;
+
+                        // check type
+                        CHECK(j.is_number_unsigned());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            'U',
+                            static_cast<uint8_t>(i),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_ubjson(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 2);
+
+                        // check individual bytes
+                        CHECK(result[0] == 'U');
+                        auto const restored = static_cast<uint8_t>(result[1]);
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_ubjson(result) == j);
+                        CHECK(json::from_ubjson(result, true, false) == j);
+                    }
+                }
+
+                SECTION("256..32767 (int16)")
+                {
+                    for (size_t i = 256; i <= 32767; ++i)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with unsigned integer number
+                        json const j = i;
+
+                        // check type
+                        CHECK(j.is_number_unsigned());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            'I',
+                            static_cast<uint8_t>((i >> 8) & 0xff),
+                            static_cast<uint8_t>(i & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_ubjson(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 3);
+
+                        // check individual bytes
+                        CHECK(result[0] == 'I');
+                        auto const restored = static_cast<uint16_t>(static_cast<uint8_t>(result[1]) * 256 + static_cast<uint8_t>(result[2]));
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_ubjson(result) == j);
+                        CHECK(json::from_ubjson(result, true, false) == j);
+                    }
+                }
+
+                SECTION("65536..2147483647 (int32)")
+                {
+                    for (uint32_t i :
+                            {
+                                65536u, 77777u, 1048576u
+                            })
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with unsigned integer number
+                        json const j = i;
+
+                        // check type
+                        CHECK(j.is_number_unsigned());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            'l',
+                            static_cast<uint8_t>((i >> 24) & 0xff),
+                            static_cast<uint8_t>((i >> 16) & 0xff),
+                            static_cast<uint8_t>((i >> 8) & 0xff),
+                            static_cast<uint8_t>(i & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_ubjson(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 5);
+
+                        // check individual bytes
+                        CHECK(result[0] == 'l');
+                        uint32_t const restored = (static_cast<uint32_t>(result[1]) << 030) +
+                                                  (static_cast<uint32_t>(result[2]) << 020) +
+                                                  (static_cast<uint32_t>(result[3]) << 010) +
+                                                  static_cast<uint32_t>(result[4]);
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_ubjson(result) == j);
+                        CHECK(json::from_ubjson(result, true, false) == j);
+                    }
+                }
+
+                SECTION("2147483648..9223372036854775807 (int64)")
+                {
+                    std::vector<uint64_t> const v = {2147483648ul, 9223372036854775807ul};
+                    for (uint64_t i : v)
+                    {
+                        CAPTURE(i)
+
+                        // create JSON value with integer number
+                        json const j = i;
+
+                        // check type
+                        CHECK(j.is_number_unsigned());
+
+                        // create expected byte vector
+                        std::vector<uint8_t> const expected
+                        {
+                            'L',
+                            static_cast<uint8_t>((i >> 070) & 0xff),
+                            static_cast<uint8_t>((i >> 060) & 0xff),
+                            static_cast<uint8_t>((i >> 050) & 0xff),
+                            static_cast<uint8_t>((i >> 040) & 0xff),
+                            static_cast<uint8_t>((i >> 030) & 0xff),
+                            static_cast<uint8_t>((i >> 020) & 0xff),
+                            static_cast<uint8_t>((i >> 010) & 0xff),
+                            static_cast<uint8_t>(i & 0xff),
+                        };
+
+                        // compare result + size
+                        const auto result = json::to_ubjson(j);
+                        CHECK(result == expected);
+                        CHECK(result.size() == 9);
+
+                        // check individual bytes
+                        CHECK(result[0] == 'L');
+                        uint64_t const restored = (static_cast<uint64_t>(result[1]) << 070) +
+                                                  (static_cast<uint64_t>(result[2]) << 060) +
+                                                  (static_cast<uint64_t>(result[3]) << 050) +
+                                                  (static_cast<uint64_t>(result[4]) << 040) +
+                                                  (static_cast<uint64_t>(result[5]) << 030) +
+                                                  (static_cast<uint64_t>(result[6]) << 020) +
+                                                  (static_cast<uint64_t>(result[7]) << 010) +
+                                                  static_cast<uint64_t>(result[8]);
+                        CHECK(restored == i);
+
+                        // roundtrip
+                        CHECK(json::from_ubjson(result) == j);
+                        CHECK(json::from_ubjson(result, true, false) == j);
+                    }
+                }
+            }
+
+            SECTION("float64")
+            {
+                SECTION("3.1415925")
+                {
+                    double v = 3.1415925;
+                    json const j = v;
+                    std::vector<uint8_t> expected =
+                    {
+                        'D', 0x40, 0x09, 0x21, 0xfb, 0x3f, 0xa6, 0xde, 0xfc
+                    };
+                    const auto result = json::to_ubjson(j);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_ubjson(result) == j);
+                    CHECK(json::from_ubjson(result) == v);
+                    CHECK(json::from_ubjson(result, true, false) == j);
+                }
+            }
+
+            SECTION("high-precision number")
+            {
+                SECTION("unsigned integer number")
+                {
+                    std::vector<uint8_t> const vec = {'H', 'i', 0x14, '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0'};
+                    const auto j = json::from_ubjson(vec);
+                    CHECK(j.is_number_unsigned());
+                    CHECK(j.dump() == "12345678901234567890");
+                }
+
+                SECTION("signed integer number")
+                {
+                    std::vector<uint8_t> const vec = {'H', 'i', 0x13, '-', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '1', '2', '3', '4', '5', '6', '7', '8'};
+                    const auto j = json::from_ubjson(vec);
+                    CHECK(j.is_number_integer());
+                    CHECK(j.dump() == "-123456789012345678");
+                }
+
+                SECTION("floating-point number")
+                {
+                    std::vector<uint8_t> const vec = {'H', 'i', 0x16, '3', '.', '1', '4', '1', '5', '9',  '2', '6', '5', '3', '5', '8', '9',  '7', '9', '3', '2', '3', '8', '4',  '6'};
+                    const auto j = json::from_ubjson(vec);
+                    CHECK(j.is_number_float());
+                    CHECK(j.dump() == "3.141592653589793");
+                }
+
+                SECTION("errors")
+                {
+                    // error while parsing length
+                    std::vector<uint8_t> const vec0 = {'H', 'i'};
+                    CHECK(json::from_ubjson(vec0, true, false).is_discarded());
+                    // error while parsing string
+                    std::vector<uint8_t> const vec1 = {'H', 'i', '1'};
+                    CHECK(json::from_ubjson(vec1, true, false).is_discarded());
+
+                    json _;
+                    std::vector<uint8_t> const vec2 = {'H', 'i', 2, '1', 'A', '3'};
+                    CHECK_THROWS_WITH_AS(_ = json::from_ubjson(vec2), "[json.exception.parse_error.115] parse error at byte 5: syntax error while parsing UBJSON high-precision number: invalid number text: 1A", json::parse_error);
+                    std::vector<uint8_t> const vec3 = {'H', 'i', 2, '1', '.'};
+                    CHECK_THROWS_WITH_AS(_ = json::from_ubjson(vec3), "[json.exception.parse_error.115] parse error at byte 5: syntax error while parsing UBJSON high-precision number: invalid number text: 1.", json::parse_error);
+                    std::vector<uint8_t> const vec4 = {'H', 2, '1', '0'};
+                    CHECK_THROWS_WITH_AS(_ = json::from_ubjson(vec4), "[json.exception.parse_error.113] parse error at byte 2: syntax error while parsing UBJSON size: expected length type specification (U, i, I, l, L) after '#'; last byte: 0x02", json::parse_error);
+                }
+
+                SECTION("serialization")
+                {
+                    // number that does not fit int64
+                    json const j = 11111111111111111111ULL;
+                    CHECK(j.is_number_unsigned());
+
+                    // number will be serialized to high-precision number
+                    const auto vec = json::to_ubjson(j);
+                    std::vector<uint8_t> expected = {'H', 'i', 0x14, '1',  '1',  '1',  '1',  '1', '1',  '1',  '1',  '1',  '1', '1',  '1',  '1',  '1',  '1', '1',  '1',  '1',  '1',  '1'};
+                    CHECK(vec == expected);
+
+                    // roundtrip
+                    CHECK(json::from_ubjson(vec) == j);
+                }
+            }
+        }
+
+        SECTION("string")
+        {
+            SECTION("N = 0..127")
+            {
+                for (size_t N = 0; N <= 127; ++N)
+                {
+                    CAPTURE(N)
+
+                    // create JSON value with string containing of N * 'x'
+                    const auto s = std::string(N, 'x');
+                    json const j = s;
+
+                    // create expected byte vector
+                    std::vector<uint8_t> expected;
+                    expected.push_back('S');
+                    expected.push_back('i');
+                    expected.push_back(static_cast<uint8_t>(N));
+                    for (size_t i = 0; i < N; ++i)
+                    {
+                        expected.push_back('x');
+                    }
+
+                    // compare result + size
+                    const auto result = json::to_ubjson(j);
+                    CHECK(result == expected);
+                    CHECK(result.size() == N + 3);
+                    // check that no null byte is appended
+                    if (N > 0)
+                    {
+                        CHECK(result.back() != '\x00');
+                    }
+
+                    // roundtrip
+                    CHECK(json::from_ubjson(result) == j);
+                    CHECK(json::from_ubjson(result, true, false) == j);
+                }
+            }
+
+            SECTION("N = 128..255")
+            {
+                for (size_t N = 128; N <= 255; ++N)
+                {
+                    CAPTURE(N)
+
+                    // create JSON value with string containing of N * 'x'
+                    const auto s = std::string(N, 'x');
+                    json const j = s;
+
+                    // create expected byte vector
+                    std::vector<uint8_t> expected;
+                    expected.push_back('S');
+                    expected.push_back('U');
+                    expected.push_back(static_cast<uint8_t>(N));
+                    for (size_t i = 0; i < N; ++i)
+                    {
+                        expected.push_back('x');
+                    }
+
+                    // compare result + size
+                    const auto result = json::to_ubjson(j);
+                    CHECK(result == expected);
+                    CHECK(result.size() == N + 3);
+                    // check that no null byte is appended
+                    CHECK(result.back() != '\x00');
+
+                    // roundtrip
+                    CHECK(json::from_ubjson(result) == j);
+                    CHECK(json::from_ubjson(result, true, false) == j);
+                }
+            }
+
+            SECTION("N = 256..32767")
+            {
+                for (size_t N :
+                        {
+                            256u, 999u, 1025u, 3333u, 2048u, 32767u
+                        })
+                {
+                    CAPTURE(N)
+
+                    // create JSON value with string containing of N * 'x'
+                    const auto s = std::string(N, 'x');
+                    json const j = s;
+
+                    // create expected byte vector (hack: create string first)
+                    std::vector<uint8_t> expected(N, 'x');
+                    // reverse order of commands, because we insert at begin()
+                    expected.insert(expected.begin(), static_cast<uint8_t>(N & 0xff));
+                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 8) & 0xff));
+                    expected.insert(expected.begin(), 'I');
+                    expected.insert(expected.begin(), 'S');
+
+                    // compare result + size
+                    const auto result = json::to_ubjson(j);
+                    CHECK(result == expected);
+                    CHECK(result.size() == N + 4);
+                    // check that no null byte is appended
+                    CHECK(result.back() != '\x00');
+
+                    // roundtrip
+                    CHECK(json::from_ubjson(result) == j);
+                    CHECK(json::from_ubjson(result, true, false) == j);
+                }
+            }
+
+            SECTION("N = 65536..2147483647")
+            {
+                for (size_t N :
+                        {
+                            65536u, 77777u, 1048576u
+                        })
+                {
+                    CAPTURE(N)
+
+                    // create JSON value with string containing of N * 'x'
+                    const auto s = std::string(N, 'x');
+                    json const j = s;
+
+                    // create expected byte vector (hack: create string first)
+                    std::vector<uint8_t> expected(N, 'x');
+                    // reverse order of commands, because we insert at begin()
+                    expected.insert(expected.begin(), static_cast<uint8_t>(N & 0xff));
+                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 8) & 0xff));
+                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 16) & 0xff));
+                    expected.insert(expected.begin(), static_cast<uint8_t>((N >> 24) & 0xff));
+                    expected.insert(expected.begin(), 'l');
+                    expected.insert(expected.begin(), 'S');
+
+                    // compare result + size
+                    const auto result = json::to_ubjson(j);
+                    CHECK(result == expected);
+                    CHECK(result.size() == N + 6);
+                    // check that no null byte is appended
+                    CHECK(result.back() != '\x00');
+
+                    // roundtrip
+                    CHECK(json::from_ubjson(result) == j);
+                    CHECK(json::from_ubjson(result, true, false) == j);
+                }
+            }
+        }
+
+        SECTION("binary")
+        {
+            SECTION("N = 0..127")
+            {
+                for (std::size_t N = 0; N <= 127; ++N)
+                {
+                    CAPTURE(N)
+
+                    // create JSON value with byte array containing of N * 'x'
+                    const auto s = std::vector<std::uint8_t>(N, 'x');
+                    json const j = json::binary(s);
+
+                    // create expected byte vector
+                    std::vector<std::uint8_t> expected;
+                    expected.push_back(static_cast<std::uint8_t>('['));
+                    if (N != 0)
+                    {
+                        expected.push_back(static_cast<std::uint8_t>('$'));
+                        expected.push_back(static_cast<std::uint8_t>('U'));
+                    }
+                    expected.push_back(static_cast<std::uint8_t>('#'));
+                    expected.push_back(static_cast<std::uint8_t>('i'));
+                    expected.push_back(static_cast<std::uint8_t>(N));
+                    for (size_t i = 0; i < N; ++i)
+                    {
+                        expected.push_back(0x78);
+                    }
+
+                    // compare result + size
+                    const auto result = json::to_ubjson(j, true, true);
+                    CHECK(result == expected);
+                    if (N == 0)
+                    {
+                        CHECK(result.size() == N + 4);
+                    }
+                    else
+                    {
+                        CHECK(result.size() == N + 6);
+                    }
+
+                    // check that no null byte is appended
+                    if (N > 0)
+                    {
+                        CHECK(result.back() != '\x00');
+                    }
+
+                    // roundtrip only works to an array of numbers
+                    json j_out = s;
+                    CHECK(json::from_ubjson(result) == j_out);
+                    CHECK(json::from_ubjson(result, true, false) == j_out);
+                }
+            }
+
+            SECTION("N = 128..255")
+            {
+                for (std::size_t N = 128; N <= 255; ++N)
+                {
+                    CAPTURE(N)
+
+                    // create JSON value with byte array containing of N * 'x'
+                    const auto s = std::vector<std::uint8_t>(N, 'x');
+                    json const j = json::binary(s);
+
+                    // create expected byte vector
+                    std::vector<uint8_t> expected;
+                    expected.push_back(static_cast<std::uint8_t>('['));
+                    expected.push_back(static_cast<std::uint8_t>('$'));
+                    expected.push_back(static_cast<std::uint8_t>('U'));
+                    expected.push_back(static_cast<std::uint8_t>('#'));
+                    expected.push_back(static_cast<std::uint8_t>('U'));
+                    expected.push_back(static_cast<std::uint8_t>(N));
+                    for (size_t i = 0; i < N; ++i)
+                    {
+                        expected.push_back(0x78);
+                    }
+
+                    // compare result + size
+                    const auto result = json::to_ubjson(j, true, true);
+                    CHECK(result == expected);
+                    CHECK(result.size() == N + 6);
+                    // check that no null byte is appended
+                    CHECK(result.back() != '\x00');
+
+                    // roundtrip only works to an array of numbers
+                    json j_out = s;
+                    CHECK(json::from_ubjson(result) == j_out);
+                    CHECK(json::from_ubjson(result, true, false) == j_out);
+                }
+            }
+
+            SECTION("N = 256..32767")
+            {
+                for (std::size_t N :
+                        {
+                            256u, 999u, 1025u, 3333u, 2048u, 32767u
+                        })
+                {
+                    CAPTURE(N)
+
+                    // create JSON value with byte array containing of N * 'x'
+                    const auto s = std::vector<std::uint8_t>(N, 'x');
+                    json const j = json::binary(s);
+
+                    // create expected byte vector
+                    std::vector<std::uint8_t> expected(N + 7, 'x');
+                    expected[0] = '[';
+                    expected[1] = '$';
+                    expected[2] = 'U';
+                    expected[3] = '#';
+                    expected[4] = 'I';
+                    expected[5] = static_cast<std::uint8_t>((N >> 8) & 0xFF);
+                    expected[6] = static_cast<std::uint8_t>(N & 0xFF);
+
+                    // compare result + size
+                    const auto result = json::to_ubjson(j, true, true);
+                    CHECK(result == expected);
+                    CHECK(result.size() == N + 7);
+                    // check that no null byte is appended
+                    CHECK(result.back() != '\x00');
+
+                    // roundtrip only works to an array of numbers
+                    json j_out = s;
+                    CHECK(json::from_ubjson(result) == j_out);
+                    CHECK(json::from_ubjson(result, true, false) == j_out);
+                }
+            }
+
+            SECTION("N = 32768..2147483647")
+            {
+                for (std::size_t N :
+                        {
+                            32768u, 77777u, 1048576u
+                        })
+                {
+                    CAPTURE(N)
+
+                    // create JSON value with byte array containing of N * 'x'
+                    const auto s = std::vector<std::uint8_t>(N, 'x');
+                    json const j = json::binary(s);
+
+                    // create expected byte vector
+                    std::vector<std::uint8_t> expected(N + 9, 'x');
+                    expected[0] = '[';
+                    expected[1] = '$';
+                    expected[2] = 'U';
+                    expected[3] = '#';
+                    expected[4] = 'l';
+                    expected[5] = static_cast<std::uint8_t>((N >> 24) & 0xFF);
+                    expected[6] = static_cast<std::uint8_t>((N >> 16) & 0xFF);
+                    expected[7] = static_cast<std::uint8_t>((N >> 8) & 0xFF);
+                    expected[8] = static_cast<std::uint8_t>(N & 0xFF);
+
+                    // compare result + size
+                    const auto result = json::to_ubjson(j, true, true);
+                    CHECK(result == expected);
+                    CHECK(result.size() == N + 9);
+                    // check that no null byte is appended
+                    CHECK(result.back() != '\x00');
+
+                    // roundtrip only works to an array of numbers
+                    json j_out = s;
+                    CHECK(json::from_ubjson(result) == j_out);
+                    CHECK(json::from_ubjson(result, true, false) == j_out);
+                }
+            }
+
+            SECTION("Other Serializations")
+            {
+                const std::size_t N = 10;
+                const auto s = std::vector<std::uint8_t>(N, 'x');
+                json const j = json::binary(s);
+
+                SECTION("No Count No Type")
+                {
+                    std::vector<uint8_t> expected;
+                    expected.push_back(static_cast<std::uint8_t>('['));
+                    for (std::size_t i = 0; i < N; ++i)
+                    {
+                        expected.push_back(static_cast<std::uint8_t>('U'));
+                        expected.push_back(static_cast<std::uint8_t>(0x78));
+                    }
+                    expected.push_back(static_cast<std::uint8_t>(']'));
+
+                    // compare result + size
+                    const auto result = json::to_ubjson(j, false, false);
+                    CHECK(result == expected);
+                    CHECK(result.size() == N + 12);
+                    // check that no null byte is appended
+                    CHECK(result.back() != '\x00');
+
+                    // roundtrip only works to an array of numbers
+                    json j_out = s;
+                    CHECK(json::from_ubjson(result) == j_out);
+                    CHECK(json::from_ubjson(result, true, false) == j_out);
+                }
+
+                SECTION("Yes Count No Type")
+                {
+                    std::vector<std::uint8_t> expected;
+                    expected.push_back(static_cast<std::uint8_t>('['));
+                    expected.push_back(static_cast<std::uint8_t>('#'));
+                    expected.push_back(static_cast<std::uint8_t>('i'));
+                    expected.push_back(static_cast<std::uint8_t>(N));
+
+                    for (size_t i = 0; i < N; ++i)
+                    {
+                        expected.push_back(static_cast<std::uint8_t>('U'));
+                        expected.push_back(static_cast<std::uint8_t>(0x78));
+                    }
+
+                    // compare result + size
+                    const auto result = json::to_ubjson(j, true, false);
+                    CHECK(result == expected);
+                    CHECK(result.size() == N + 14);
+                    // check that no null byte is appended
+                    CHECK(result.back() != '\x00');
+
+                    // roundtrip only works to an array of numbers
+                    json j_out = s;
+                    CHECK(json::from_ubjson(result) == j_out);
+                    CHECK(json::from_ubjson(result, true, false) == j_out);
+                }
+            }
+        }
+
+        SECTION("array")
+        {
+            SECTION("empty")
+            {
+                SECTION("size=false type=false")
+                {
+                    json const j = json::array();
+                    std::vector<uint8_t> expected = {'[', ']'};
+                    const auto result = json::to_ubjson(j);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_ubjson(result) == j);
+                    CHECK(json::from_ubjson(result, true, false) == j);
+                }
+
+                SECTION("size=true type=false")
+                {
+                    json const j = json::array();
+                    std::vector<uint8_t> expected = {'[', '#', 'i', 0};
+                    const auto result = json::to_ubjson(j, true);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_ubjson(result) == j);
+                    CHECK(json::from_ubjson(result, true, false) == j);
+                }
+
+                SECTION("size=true type=true")
+                {
+                    json const j = json::array();
+                    std::vector<uint8_t> expected = {'[', '#', 'i', 0};
+                    const auto result = json::to_ubjson(j, true, true);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_ubjson(result) == j);
+                    CHECK(json::from_ubjson(result, true, false) == j);
+                }
+            }
+
+            SECTION("[null]")
+            {
+                SECTION("size=false type=false")
+                {
+                    json const j = {nullptr};
+                    std::vector<uint8_t> expected = {'[', 'Z', ']'};
+                    const auto result = json::to_ubjson(j);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_ubjson(result) == j);
+                    CHECK(json::from_ubjson(result, true, false) == j);
+                }
+
+                SECTION("size=true type=false")
+                {
+                    json const j = {nullptr};
+                    std::vector<uint8_t> expected = {'[', '#', 'i', 1, 'Z'};
+                    const auto result = json::to_ubjson(j, true);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_ubjson(result) == j);
+                    CHECK(json::from_ubjson(result, true, false) == j);
+                }
+
+                SECTION("size=true type=true")
+                {
+                    json const j = {nullptr};
+                    std::vector<uint8_t> expected = {'[', '$', 'Z', '#', 'i', 1};
+                    const auto result = json::to_ubjson(j, true, true);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_ubjson(result) == j);
+                    CHECK(json::from_ubjson(result, true, false) == j);
+                }
+            }
+
+            SECTION("[1,2,3,4,5]")
+            {
+                SECTION("size=false type=false")
+                {
+                    json const j = json::parse("[1,2,3,4,5]");
+                    std::vector<uint8_t> expected = {'[', 'i', 1, 'i', 2, 'i', 3, 'i', 4, 'i', 5, ']'};
+                    const auto result = json::to_ubjson(j);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_ubjson(result) == j);
+                    CHECK(json::from_ubjson(result, true, false) == j);
+                }
+
+                SECTION("size=true type=false")
+                {
+                    json const j = json::parse("[1,2,3,4,5]");
+                    std::vector<uint8_t> expected = {'[', '#', 'i', 5, 'i', 1, 'i', 2, 'i', 3, 'i', 4, 'i', 5};
+                    const auto result = json::to_ubjson(j, true);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_ubjson(result) == j);
+                    CHECK(json::from_ubjson(result, true, false) == j);
+                }
+
+                SECTION("size=true type=true")
+                {
+                    json const j = json::parse("[1,2,3,4,5]");
+                    std::vector<uint8_t> expected = {'[', '$', 'i', '#', 'i', 5, 1, 2, 3, 4, 5};
+                    const auto result = json::to_ubjson(j, true, true);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_ubjson(result) == j);
+                    CHECK(json::from_ubjson(result, true, false) == j);
+                }
+            }
+
+            SECTION("[[[[]]]]")
+            {
+                SECTION("size=false type=false")
+                {
+                    json const j = json::parse("[[[[]]]]");
+                    std::vector<uint8_t> expected = {'[', '[', '[', '[', ']', ']', ']', ']'};
+                    const auto result = json::to_ubjson(j);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_ubjson(result) == j);
+                    CHECK(json::from_ubjson(result, true, false) == j);
+                }
+
+                SECTION("size=true type=false")
+                {
+                    json const j = json::parse("[[[[]]]]");
+                    std::vector<uint8_t> expected = {'[', '#', 'i', 1, '[', '#', 'i', 1, '[', '#', 'i', 1, '[', '#', 'i', 0};
+                    const auto result = json::to_ubjson(j, true);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_ubjson(result) == j);
+                    CHECK(json::from_ubjson(result, true, false) == j);
+                }
+
+                SECTION("size=true type=true")
+                {
+                    json const j = json::parse("[[[[]]]]");
+                    std::vector<uint8_t> expected = {'[', '$', '[', '#', 'i', 1, '$', '[', '#', 'i', 1, '$', '[', '#', 'i', 1, '#', 'i', 0};
+                    const auto result = json::to_ubjson(j, true, true);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_ubjson(result) == j);
+                    CHECK(json::from_ubjson(result, true, false) == j);
+                }
+            }
+
+            SECTION("array with uint16_t elements")
+            {
+                SECTION("size=false type=false")
+                {
+                    json j(257, nullptr);
+                    std::vector<uint8_t> expected(j.size() + 2, 'Z'); // all null
+                    expected[0] = '['; // opening array
+                    expected[258] = ']'; // closing array
+                    const auto result = json::to_ubjson(j);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_ubjson(result) == j);
+                    CHECK(json::from_ubjson(result, true, false) == j);
+                }
+
+                SECTION("size=true type=false")
+                {
+                    json j(257, nullptr);
+                    std::vector<uint8_t> expected(j.size() + 5, 'Z'); // all null
+                    expected[0] = '['; // opening array
+                    expected[1] = '#'; // array size
+                    expected[2] = 'I'; // int16
+                    expected[3] = 0x01; // 0x0101, first byte
+                    expected[4] = 0x01; // 0x0101, second byte
+                    const auto result = json::to_ubjson(j, true);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_ubjson(result) == j);
+                    CHECK(json::from_ubjson(result, true, false) == j);
+                }
+
+                SECTION("size=true type=true")
+                {
+                    json j(257, nullptr);
+                    std::vector<uint8_t> expected = {'[', '$', 'Z', '#', 'I', 0x01, 0x01};
+                    const auto result = json::to_ubjson(j, true, true);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_ubjson(result) == j);
+                    CHECK(json::from_ubjson(result, true, false) == j);
+                }
+            }
+
+            SECTION("array with uint32_t elements")
+            {
+                SECTION("size=false type=false")
+                {
+                    json j(65793, nullptr);
+                    std::vector<uint8_t> expected(j.size() + 2, 'Z'); // all null
+                    expected[0] = '['; // opening array
+                    expected[65794] = ']'; // closing array
+                    const auto result = json::to_ubjson(j);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_ubjson(result) == j);
+                    CHECK(json::from_ubjson(result, true, false) == j);
+                }
+
+                SECTION("size=true type=false")
+                {
+                    json j(65793, nullptr);
+                    std::vector<uint8_t> expected(j.size() + 7, 'Z'); // all null
+                    expected[0] = '['; // opening array
+                    expected[1] = '#'; // array size
+                    expected[2] = 'l'; // int32
+                    expected[3] = 0x00; // 0x00010101, first byte
+                    expected[4] = 0x01; // 0x00010101, second byte
+                    expected[5] = 0x01; // 0x00010101, third byte
+                    expected[6] = 0x01; // 0x00010101, fourth byte
+                    const auto result = json::to_ubjson(j, true);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_ubjson(result) == j);
+                    CHECK(json::from_ubjson(result, true, false) == j);
+                }
+
+                SECTION("size=true type=true")
+                {
+                    json j(65793, nullptr);
+                    std::vector<uint8_t> expected = {'[', '$', 'Z', '#', 'l', 0x00, 0x01, 0x01, 0x01};
+                    const auto result = json::to_ubjson(j, true, true);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_ubjson(result) == j);
+                    CHECK(json::from_ubjson(result, true, false) == j);
+                }
+            }
+        }
+
+        SECTION("object")
+        {
+            SECTION("empty")
+            {
+                SECTION("size=false type=false")
+                {
+                    json const j = json::object();
+                    std::vector<uint8_t> expected = {'{', '}'};
+                    const auto result = json::to_ubjson(j);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_ubjson(result) == j);
+                    CHECK(json::from_ubjson(result, true, false) == j);
+                }
+
+                SECTION("size=true type=false")
+                {
+                    json const j = json::object();
+                    std::vector<uint8_t> expected = {'{', '#', 'i', 0};
+                    const auto result = json::to_ubjson(j, true);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_ubjson(result) == j);
+                    CHECK(json::from_ubjson(result, true, false) == j);
+                }
+
+                SECTION("size=true type=true")
+                {
+                    json const j = json::object();
+                    std::vector<uint8_t> expected = {'{', '#', 'i', 0};
+                    const auto result = json::to_ubjson(j, true, true);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_ubjson(result) == j);
+                    CHECK(json::from_ubjson(result, true, false) == j);
+                }
+            }
+
+            SECTION("{\"\":null}")
+            {
+                SECTION("size=false type=false")
+                {
+                    json const j = {{"", nullptr}};
+                    std::vector<uint8_t> expected = {'{', 'i', 0, 'Z', '}'};
+                    const auto result = json::to_ubjson(j);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_ubjson(result) == j);
+                    CHECK(json::from_ubjson(result, true, false) == j);
+                }
+
+                SECTION("size=true type=false")
+                {
+                    json const j = {{"", nullptr}};
+                    std::vector<uint8_t> expected = {'{', '#', 'i', 1, 'i', 0, 'Z'};
+                    const auto result = json::to_ubjson(j, true);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_ubjson(result) == j);
+                    CHECK(json::from_ubjson(result, true, false) == j);
+                }
+
+                SECTION("size=true type=true")
+                {
+                    json const j = {{"", nullptr}};
+                    std::vector<uint8_t> expected = {'{', '$', 'Z', '#', 'i', 1, 'i', 0};
+                    const auto result = json::to_ubjson(j, true, true);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_ubjson(result) == j);
+                    CHECK(json::from_ubjson(result, true, false) == j);
+                }
+            }
+
+            SECTION("{\"a\": {\"b\": {\"c\": {}}}}")
+            {
+                SECTION("size=false type=false")
+                {
+                    json const j = json::parse(R"({"a": {"b": {"c": {}}}})");
+                    std::vector<uint8_t> expected =
+                    {
+                        '{', 'i', 1, 'a', '{', 'i', 1, 'b', '{', 'i', 1, 'c', '{', '}', '}', '}', '}'
+                    };
+                    const auto result = json::to_ubjson(j);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_ubjson(result) == j);
+                    CHECK(json::from_ubjson(result, true, false) == j);
+                }
+
+                SECTION("size=true type=false")
+                {
+                    json const j = json::parse(R"({"a": {"b": {"c": {}}}})");
+                    std::vector<uint8_t> expected =
+                    {
+                        '{', '#', 'i', 1, 'i', 1, 'a', '{', '#', 'i', 1, 'i', 1, 'b', '{', '#', 'i', 1, 'i', 1, 'c', '{', '#', 'i', 0
+                    };
+                    const auto result = json::to_ubjson(j, true);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_ubjson(result) == j);
+                    CHECK(json::from_ubjson(result, true, false) == j);
+                }
+
+                SECTION("size=true type=true")
+                {
+                    json const j = json::parse(R"({"a": {"b": {"c": {}}}})");
+                    std::vector<uint8_t> expected =
+                    {
+                        '{', '$', '{', '#', 'i', 1, 'i', 1, 'a', '$', '{', '#', 'i', 1, 'i', 1, 'b', '$', '{', '#', 'i', 1, 'i', 1, 'c', '#', 'i', 0
+                    };
+                    const auto result = json::to_ubjson(j, true, true);
+                    CHECK(result == expected);
+
+                    // roundtrip
+                    CHECK(json::from_ubjson(result) == j);
+                    CHECK(json::from_ubjson(result, true, false) == j);
+                }
+            }
+        }
+    }
+
+    SECTION("errors")
+    {
+        SECTION("strict mode")
+        {
+            std::vector<uint8_t> const vec = {'Z', 'Z'};
+            SECTION("non-strict mode")
+            {
+                const auto result = json::from_ubjson(vec, false);
+                CHECK(result == json());
+            }
+
+            SECTION("strict mode")
+            {
+                json _;
+                CHECK_THROWS_WITH_AS(_ = json::from_ubjson(vec), "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing UBJSON value: expected end of input; last byte: 0x5A", json::parse_error&);
+            }
+        }
+
+        SECTION("excessive size")
+        {
+            SECTION("array")
+            {
+                std::vector<uint8_t> const v_ubjson = {'[', '$', 'Z', '#', 'L', 0x78, 0x28, 0x00, 0x68, 0x28, 0x69, 0x69, 0x17};
+                json _;
+                CHECK_THROWS_AS(_ = json::from_ubjson(v_ubjson), json::out_of_range&);
+
+                json j;
+                nlohmann::detail::json_sax_dom_callback_parser<json> scp(j, [](int /*unused*/, json::parse_event_t /*unused*/, const json& /*unused*/) noexcept
+                {
+                    return true;
+                });
+                CHECK_THROWS_AS(_ = json::sax_parse(v_ubjson, &scp, json::input_format_t::ubjson), json::out_of_range&);
+            }
+
+            SECTION("object")
+            {
+                std::vector<uint8_t> const v_ubjson = {'{', '$', 'Z', '#', 'L', 0x78, 0x28, 0x00, 0x68, 0x28, 0x69, 0x69, 0x17};
+                json _;
+                CHECK_THROWS_AS(_ = json::from_ubjson(v_ubjson), json::out_of_range&);
+
+                json j;
+                nlohmann::detail::json_sax_dom_callback_parser<json> scp(j, [](int /*unused*/, json::parse_event_t /*unused*/, const json& /*unused*/) noexcept
+                {
+                    return true;
+                });
+                CHECK_THROWS_AS(_ = json::sax_parse(v_ubjson, &scp, json::input_format_t::ubjson), json::out_of_range&);
+            }
+        }
+    }
+
+    SECTION("SAX aborts")
+    {
+        SECTION("start_array()")
+        {
+            std::vector<uint8_t> const v = {'[', 'T', 'F', ']'};
+            SaxCountdown scp(0);
+            CHECK(!json::sax_parse(v, &scp, json::input_format_t::ubjson));
+        }
+
+        SECTION("start_object()")
+        {
+            std::vector<uint8_t> const v = {'{', 'i', 3, 'f', 'o', 'o', 'F', '}'};
+            SaxCountdown scp(0);
+            CHECK(!json::sax_parse(v, &scp, json::input_format_t::ubjson));
+        }
+
+        SECTION("key() in object")
+        {
+            std::vector<uint8_t> const v = {'{', 'i', 3, 'f', 'o', 'o', 'F', '}'};
+            SaxCountdown scp(1);
+            CHECK(!json::sax_parse(v, &scp, json::input_format_t::ubjson));
+        }
+
+        SECTION("start_array(len)")
+        {
+            std::vector<uint8_t> const v = {'[', '#', 'i', '2', 'T', 'F'};
+            SaxCountdown scp(0);
+            CHECK(!json::sax_parse(v, &scp, json::input_format_t::ubjson));
+        }
+
+        SECTION("start_object(len)")
+        {
+            std::vector<uint8_t> const v = {'{', '#', 'i', '1', 3, 'f', 'o', 'o', 'F'};
+            SaxCountdown scp(0);
+            CHECK(!json::sax_parse(v, &scp, json::input_format_t::ubjson));
+        }
+
+        SECTION("key() in object with length")
+        {
+            std::vector<uint8_t> const v = {'{', 'i', 3, 'f', 'o', 'o', 'F', '}'};
+            SaxCountdown scp(1);
+            CHECK(!json::sax_parse(v, &scp, json::input_format_t::ubjson));
+        }
+    }
+
+    SECTION("parsing values")
+    {
+        SECTION("strings")
+        {
+            // create a single-character string for all number types
+            std::vector<uint8_t> s_i = {'S', 'i', 1, 'a'};
+            std::vector<uint8_t> const s_U = {'S', 'U', 1, 'a'};
+            std::vector<uint8_t> const s_I = {'S', 'I', 0, 1, 'a'};
+            std::vector<uint8_t> const s_l = {'S', 'l', 0, 0, 0, 1, 'a'};
+            std::vector<uint8_t> const s_L = {'S', 'L', 0, 0, 0, 0, 0, 0, 0, 1, 'a'};
+
+            // check if string is parsed correctly to "a"
+            CHECK(json::from_ubjson(s_i) == "a");
+            CHECK(json::from_ubjson(s_U) == "a");
+            CHECK(json::from_ubjson(s_I) == "a");
+            CHECK(json::from_ubjson(s_l) == "a");
+            CHECK(json::from_ubjson(s_L) == "a");
+
+            // roundtrip: output should be optimized
+            CHECK(json::to_ubjson(json::from_ubjson(s_i)) == s_i);
+            CHECK(json::to_ubjson(json::from_ubjson(s_U)) == s_i);
+            CHECK(json::to_ubjson(json::from_ubjson(s_I)) == s_i);
+            CHECK(json::to_ubjson(json::from_ubjson(s_l)) == s_i);
+            CHECK(json::to_ubjson(json::from_ubjson(s_L)) == s_i);
+        }
+
+        SECTION("number")
+        {
+            SECTION("float")
+            {
+                // float32
+                std::vector<uint8_t> const v_d = {'d', 0x40, 0x49, 0x0f, 0xd0};
+                CHECK(json::from_ubjson(v_d) == 3.14159f);
+
+                // float64
+                std::vector<uint8_t> const v_D = {'D', 0x40, 0x09, 0x21, 0xf9, 0xf0, 0x1b, 0x86, 0x6e};
+                CHECK(json::from_ubjson(v_D) == 3.14159);
+
+                // float32 is serialized as float64 as the library does not support float32
+                CHECK(json::to_ubjson(json::from_ubjson(v_d)) == json::to_ubjson(3.14159f));
+            }
+        }
+
+        SECTION("array")
+        {
+            SECTION("optimized version (length only)")
+            {
+                // create vector with two elements of the same type
+                std::vector<uint8_t> const v_TU = {'[', '#', 'U', 2, 'T', 'T'};
+                std::vector<uint8_t> const v_T = {'[', '#', 'i', 2, 'T', 'T'};
+                std::vector<uint8_t> const v_F = {'[', '#', 'i', 2, 'F', 'F'};
+                std::vector<uint8_t> const v_Z = {'[', '#', 'i', 2, 'Z', 'Z'};
+                std::vector<uint8_t> const v_i = {'[', '#', 'i', 2, 'i', 0x7F, 'i', 0x7F};
+                std::vector<uint8_t> const v_U = {'[', '#', 'i', 2, 'U', 0xFF, 'U', 0xFF};
+                std::vector<uint8_t> const v_I = {'[', '#', 'i', 2, 'I', 0x7F, 0xFF, 'I', 0x7F, 0xFF};
+                std::vector<uint8_t> const v_l = {'[', '#', 'i', 2, 'l', 0x7F, 0xFF, 0xFF, 0xFF, 'l', 0x7F, 0xFF, 0xFF, 0xFF};
+                std::vector<uint8_t> const v_L = {'[', '#', 'i', 2, 'L', 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 'L', 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
+                std::vector<uint8_t> const v_D = {'[', '#', 'i', 2, 'D', 0x40, 0x09, 0x21, 0xfb, 0x4d, 0x12, 0xd8, 0x4a, 'D', 0x40, 0x09, 0x21, 0xfb, 0x4d, 0x12, 0xd8, 0x4a};
+                std::vector<uint8_t> const v_S = {'[', '#', 'i', 2, 'S', 'i', 1, 'a', 'S', 'i', 1, 'a'};
+                std::vector<uint8_t> const v_C = {'[', '#', 'i', 2, 'C', 'a', 'C', 'a'};
+
+                // check if vector is parsed correctly
+                CHECK(json::from_ubjson(v_TU) == json({true, true}));
+                CHECK(json::from_ubjson(v_T) == json({true, true}));
+                CHECK(json::from_ubjson(v_F) == json({false, false}));
+                CHECK(json::from_ubjson(v_Z) == json({nullptr, nullptr}));
+                CHECK(json::from_ubjson(v_i) == json({127, 127}));
+                CHECK(json::from_ubjson(v_U) == json({255, 255}));
+                CHECK(json::from_ubjson(v_I) == json({32767, 32767}));
+                CHECK(json::from_ubjson(v_l) == json({2147483647, 2147483647}));
+                CHECK(json::from_ubjson(v_L) == json({9223372036854775807, 9223372036854775807}));
+                CHECK(json::from_ubjson(v_D) == json({3.1415926, 3.1415926}));
+                CHECK(json::from_ubjson(v_S) == json({"a", "a"}));
+                CHECK(json::from_ubjson(v_C) == json({"a", "a"}));
+
+                // roundtrip: output should be optimized
+                CHECK(json::to_ubjson(json::from_ubjson(v_T), true) == v_T);
+                CHECK(json::to_ubjson(json::from_ubjson(v_F), true) == v_F);
+                CHECK(json::to_ubjson(json::from_ubjson(v_Z), true) == v_Z);
+                CHECK(json::to_ubjson(json::from_ubjson(v_i), true) == v_i);
+                CHECK(json::to_ubjson(json::from_ubjson(v_U), true) == v_U);
+                CHECK(json::to_ubjson(json::from_ubjson(v_I), true) == v_I);
+                CHECK(json::to_ubjson(json::from_ubjson(v_l), true) == v_l);
+                CHECK(json::to_ubjson(json::from_ubjson(v_L), true) == v_L);
+                CHECK(json::to_ubjson(json::from_ubjson(v_D), true) == v_D);
+                CHECK(json::to_ubjson(json::from_ubjson(v_S), true) == v_S);
+                CHECK(json::to_ubjson(json::from_ubjson(v_C), true) == v_S); // char is serialized to string
+            }
+
+            SECTION("optimized version (type and length)")
+            {
+                // create vector with two elements of the same type
+                std::vector<uint8_t> const v_N = {'[', '$', 'N', '#', 'i', 2};
+                std::vector<uint8_t> const v_T = {'[', '$', 'T', '#', 'i', 2};
+                std::vector<uint8_t> const v_F = {'[', '$', 'F', '#', 'i', 2};
+                std::vector<uint8_t> const v_Z = {'[', '$', 'Z', '#', 'i', 2};
+                std::vector<uint8_t> const v_i = {'[', '$', 'i', '#', 'i', 2, 0x7F, 0x7F};
+                std::vector<uint8_t> const v_U = {'[', '$', 'U', '#', 'i', 2, 0xFF, 0xFF};
+                std::vector<uint8_t> const v_I = {'[', '$', 'I', '#', 'i', 2, 0x7F, 0xFF, 0x7F, 0xFF};
+                std::vector<uint8_t> const v_l = {'[', '$', 'l', '#', 'i', 2, 0x7F, 0xFF, 0xFF, 0xFF, 0x7F, 0xFF, 0xFF, 0xFF};
+                std::vector<uint8_t> const v_L = {'[', '$', 'L', '#', 'i', 2, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
+                std::vector<uint8_t> const v_D = {'[', '$', 'D', '#', 'i', 2, 0x40, 0x09, 0x21, 0xfb, 0x4d, 0x12, 0xd8, 0x4a, 0x40, 0x09, 0x21, 0xfb, 0x4d, 0x12, 0xd8, 0x4a};
+                std::vector<uint8_t> const v_S = {'[', '$', 'S', '#', 'i', 2, 'i', 1, 'a', 'i', 1, 'a'};
+                std::vector<uint8_t> const v_C = {'[', '$', 'C', '#', 'i', 2, 'a', 'a'};
+
+                // check if vector is parsed correctly
+                CHECK(json::from_ubjson(v_N) == json::array());
+                CHECK(json::from_ubjson(v_T) == json({true, true}));
+                CHECK(json::from_ubjson(v_F) == json({false, false}));
+                CHECK(json::from_ubjson(v_Z) == json({nullptr, nullptr}));
+                CHECK(json::from_ubjson(v_i) == json({127, 127}));
+                CHECK(json::from_ubjson(v_U) == json({255, 255}));
+                CHECK(json::from_ubjson(v_I) == json({32767, 32767}));
+                CHECK(json::from_ubjson(v_l) == json({2147483647, 2147483647}));
+                CHECK(json::from_ubjson(v_L) == json({9223372036854775807, 9223372036854775807}));
+                CHECK(json::from_ubjson(v_D) == json({3.1415926, 3.1415926}));
+                CHECK(json::from_ubjson(v_S) == json({"a", "a"}));
+                CHECK(json::from_ubjson(v_C) == json({"a", "a"}));
+
+                // roundtrip: output should be optimized
+                std::vector<uint8_t> const v_empty = {'[', '#', 'i', 0};
+                CHECK(json::to_ubjson(json::from_ubjson(v_N), true, true) == v_empty);
+                CHECK(json::to_ubjson(json::from_ubjson(v_T), true, true) == v_T);
+                CHECK(json::to_ubjson(json::from_ubjson(v_F), true, true) == v_F);
+                CHECK(json::to_ubjson(json::from_ubjson(v_Z), true, true) == v_Z);
+                CHECK(json::to_ubjson(json::from_ubjson(v_i), true, true) == v_i);
+                CHECK(json::to_ubjson(json::from_ubjson(v_U), true, true) == v_U);
+                CHECK(json::to_ubjson(json::from_ubjson(v_I), true, true) == v_I);
+                CHECK(json::to_ubjson(json::from_ubjson(v_l), true, true) == v_l);
+                CHECK(json::to_ubjson(json::from_ubjson(v_L), true, true) == v_L);
+                CHECK(json::to_ubjson(json::from_ubjson(v_D), true, true) == v_D);
+                CHECK(json::to_ubjson(json::from_ubjson(v_S), true, true) == v_S);
+                CHECK(json::to_ubjson(json::from_ubjson(v_C), true, true) == v_S); // char is serialized to string
+            }
+        }
+    }
+
+    SECTION("parse errors")
+    {
+        SECTION("empty byte vector")
+        {
+            json _;
+            CHECK_THROWS_WITH_AS(_ = json::from_ubjson(std::vector<uint8_t>()), "[json.exception.parse_error.110] parse error at byte 1: syntax error while parsing UBJSON value: unexpected end of input", json::parse_error&);
+        }
+
+        SECTION("char")
+        {
+            SECTION("eof after C byte")
+            {
+                std::vector<uint8_t> const v = {'C'};
+                json _;
+                CHECK_THROWS_WITH_AS(_ = json::from_ubjson(v), "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing UBJSON char: unexpected end of input", json::parse_error&);
+            }
+
+            SECTION("byte out of range")
+            {
+                std::vector<uint8_t> const v = {'C', 130};
+                json _;
+                CHECK_THROWS_WITH_AS(_ = json::from_ubjson(v), "[json.exception.parse_error.113] parse error at byte 2: syntax error while parsing UBJSON char: byte after 'C' must be in range 0x00..0x7F; last byte: 0x82", json::parse_error&);
+            }
+        }
+
+        SECTION("strings")
+        {
+            SECTION("eof after S byte")
+            {
+                std::vector<uint8_t> const v = {'S'};
+                json _;
+                CHECK_THROWS_WITH_AS(_ = json::from_ubjson(v), "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing UBJSON value: unexpected end of input", json::parse_error&);
+            }
+
+            SECTION("invalid byte")
+            {
+                std::vector<uint8_t> const v = {'S', '1', 'a'};
+                json _;
+                CHECK_THROWS_WITH_AS(_ = json::from_ubjson(v), "[json.exception.parse_error.113] parse error at byte 2: syntax error while parsing UBJSON string: expected length type specification (U, i, I, l, L); last byte: 0x31", json::parse_error&);
+            }
+        }
+
+        SECTION("array")
+        {
+            SECTION("optimized array: no size following type")
+            {
+                std::vector<uint8_t> const v = {'[', '$', 'i', 2};
+                json _;
+                CHECK_THROWS_WITH_AS(_ = json::from_ubjson(v), "[json.exception.parse_error.112] parse error at byte 4: syntax error while parsing UBJSON size: expected '#' after type information; last byte: 0x02", json::parse_error&);
+            }
+        }
+
+        SECTION("strings")
+        {
+            std::vector<uint8_t> const vS = {'S'};
+            json _;
+            CHECK_THROWS_WITH_AS(_ = json::from_ubjson(vS), "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing UBJSON value: unexpected end of input", json::parse_error&);
+            CHECK(json::from_ubjson(vS, true, false).is_discarded());
+
+            std::vector<uint8_t> const v = {'S', 'i', '2', 'a'};
+            CHECK_THROWS_WITH_AS(_ = json::from_ubjson(v), "[json.exception.parse_error.110] parse error at byte 5: syntax error while parsing UBJSON string: unexpected end of input", json::parse_error&);
+            CHECK(json::from_ubjson(v, true, false).is_discarded());
+
+            std::vector<uint8_t> const vC = {'C'};
+            CHECK_THROWS_WITH_AS(_ = json::from_ubjson(vC), "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing UBJSON char: unexpected end of input", json::parse_error&);
+            CHECK(json::from_ubjson(vC, true, false).is_discarded());
+        }
+
+        SECTION("sizes")
+        {
+            std::vector<uint8_t> const vU = {'[', '#', 'U'};
+            json _;
+            CHECK_THROWS_WITH_AS(_ = json::from_ubjson(vU), "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing UBJSON number: unexpected end of input", json::parse_error&);
+            CHECK(json::from_ubjson(vU, true, false).is_discarded());
+
+            std::vector<uint8_t> const vi = {'[', '#', 'i'};
+            CHECK_THROWS_WITH_AS(_ = json::from_ubjson(vi), "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing UBJSON number: unexpected end of input", json::parse_error&);
+            CHECK(json::from_ubjson(vi, true, false).is_discarded());
+
+            std::vector<uint8_t> const vI = {'[', '#', 'I'};
+            CHECK_THROWS_WITH_AS(_ = json::from_ubjson(vI), "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing UBJSON number: unexpected end of input", json::parse_error&);
+            CHECK(json::from_ubjson(vI, true, false).is_discarded());
+
+            std::vector<uint8_t> const vl = {'[', '#', 'l'};
+            CHECK_THROWS_WITH_AS(_ = json::from_ubjson(vl), "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing UBJSON number: unexpected end of input", json::parse_error&);
+            CHECK(json::from_ubjson(vl, true, false).is_discarded());
+
+            std::vector<uint8_t> const vL = {'[', '#', 'L'};
+            CHECK_THROWS_WITH_AS(_ = json::from_ubjson(vL), "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing UBJSON number: unexpected end of input", json::parse_error&);
+            CHECK(json::from_ubjson(vL, true, false).is_discarded());
+
+            std::vector<uint8_t> const v0 = {'[', '#', 'T', ']'};
+            CHECK_THROWS_WITH_AS(_ = json::from_ubjson(v0), "[json.exception.parse_error.113] parse error at byte 3: syntax error while parsing UBJSON size: expected length type specification (U, i, I, l, L) after '#'; last byte: 0x54", json::parse_error&);
+            CHECK(json::from_ubjson(v0, true, false).is_discarded());
+        }
+
+        SECTION("types")
+        {
+            std::vector<uint8_t> const v0 = {'[', '$'};
+            json _;
+            CHECK_THROWS_WITH_AS(_ = json::from_ubjson(v0), "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing UBJSON type: unexpected end of input", json::parse_error&);
+            CHECK(json::from_ubjson(v0, true, false).is_discarded());
+
+            std::vector<uint8_t> const vi = {'[', '$', '#'};
+            CHECK_THROWS_WITH_AS(_ = json::from_ubjson(vi), "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing UBJSON value: unexpected end of input", json::parse_error&);
+            CHECK(json::from_ubjson(vi, true, false).is_discarded());
+
+            std::vector<uint8_t> const vT = {'[', '$', 'T'};
+            CHECK_THROWS_WITH_AS(_ = json::from_ubjson(vT), "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing UBJSON value: unexpected end of input", json::parse_error&);
+            CHECK(json::from_ubjson(vT, true, false).is_discarded());
+        }
+
+        SECTION("arrays")
+        {
+            std::vector<uint8_t> const vST = {'[', '$', 'i', '#', 'i', 2, 1};
+            json _;
+            CHECK_THROWS_WITH_AS(_ = json::from_ubjson(vST), "[json.exception.parse_error.110] parse error at byte 8: syntax error while parsing UBJSON number: unexpected end of input", json::parse_error&);
+            CHECK(json::from_ubjson(vST, true, false).is_discarded());
+
+            std::vector<uint8_t> const vS = {'[', '#', 'i', 2, 'i', 1};
+            CHECK_THROWS_WITH_AS(_ = json::from_ubjson(vS), "[json.exception.parse_error.110] parse error at byte 7: syntax error while parsing UBJSON value: unexpected end of input", json::parse_error&);
+            CHECK(json::from_ubjson(vS, true, false).is_discarded());
+
+            std::vector<uint8_t> const v = {'[', 'i', 2, 'i', 1};
+            CHECK_THROWS_WITH_AS(_ = json::from_ubjson(v), "[json.exception.parse_error.110] parse error at byte 6: syntax error while parsing UBJSON value: unexpected end of input", json::parse_error&);
+            CHECK(json::from_ubjson(v, true, false).is_discarded());
+        }
+
+        SECTION("objects")
+        {
+            std::vector<uint8_t> const vST = {'{', '$', 'i', '#', 'i', 2, 'i', 1, 'a', 1};
+            json _;
+            CHECK_THROWS_WITH_AS(_ = json::from_ubjson(vST), "[json.exception.parse_error.110] parse error at byte 11: syntax error while parsing UBJSON value: unexpected end of input", json::parse_error&);
+            CHECK(json::from_ubjson(vST, true, false).is_discarded());
+
+            std::vector<uint8_t> const vT = {'{', '$', 'i', 'i', 1, 'a', 1};
+            CHECK_THROWS_WITH_AS(_ = json::from_ubjson(vT), "[json.exception.parse_error.112] parse error at byte 4: syntax error while parsing UBJSON size: expected '#' after type information; last byte: 0x69", json::parse_error&);
+            CHECK(json::from_ubjson(vT, true, false).is_discarded());
+
+            std::vector<uint8_t> const vS = {'{', '#', 'i', 2, 'i', 1, 'a', 'i', 1};
+            CHECK_THROWS_WITH_AS(_ = json::from_ubjson(vS), "[json.exception.parse_error.110] parse error at byte 10: syntax error while parsing UBJSON value: unexpected end of input", json::parse_error&);
+            CHECK(json::from_ubjson(vS, true, false).is_discarded());
+
+            std::vector<uint8_t> const v = {'{', 'i', 1, 'a', 'i', 1};
+            CHECK_THROWS_WITH_AS(_ = json::from_ubjson(v), "[json.exception.parse_error.110] parse error at byte 7: syntax error while parsing UBJSON value: unexpected end of input", json::parse_error&);
+            CHECK(json::from_ubjson(v, true, false).is_discarded());
+
+            std::vector<uint8_t> const v2 = {'{', 'i', 1, 'a', 'i', 1, 'i'};
+            CHECK_THROWS_WITH_AS(_ = json::from_ubjson(v2), "[json.exception.parse_error.110] parse error at byte 8: syntax error while parsing UBJSON number: unexpected end of input", json::parse_error&);
+            CHECK(json::from_ubjson(v2, true, false).is_discarded());
+
+            std::vector<uint8_t> const v3 = {'{', 'i', 1, 'a'};
+            CHECK_THROWS_WITH_AS(_ = json::from_ubjson(v3), "[json.exception.parse_error.110] parse error at byte 5: syntax error while parsing UBJSON value: unexpected end of input", json::parse_error&);
+            CHECK(json::from_ubjson(v3, true, false).is_discarded());
+
+            std::vector<uint8_t> const vST1 = {'{', '$', 'd', '#', 'i', 2, 'i', 1, 'a'};
+            CHECK_THROWS_WITH_AS(_ = json::from_ubjson(vST1), "[json.exception.parse_error.110] parse error at byte 10: syntax error while parsing UBJSON number: unexpected end of input", json::parse_error&);
+            CHECK(json::from_ubjson(vST1, true, false).is_discarded());
+
+            std::vector<uint8_t> const vST2 = {'{', '#', 'i', 2, 'i', 1, 'a'};
+            CHECK_THROWS_WITH_AS(_ = json::from_ubjson(vST2), "[json.exception.parse_error.110] parse error at byte 8: syntax error while parsing UBJSON value: unexpected end of input", json::parse_error&);
+            CHECK(json::from_ubjson(vST2, true, false).is_discarded());
+        }
+    }
+
+    SECTION("writing optimized values")
+    {
+        SECTION("integer")
+        {
+            SECTION("array of i")
+            {
+                json const j = {1, -1};
+                std::vector<uint8_t> expected = {'[', '$', 'i', '#', 'i', 2, 1, 0xff};
+                CHECK(json::to_ubjson(j, true, true) == expected);
+            }
+
+            SECTION("array of U")
+            {
+                json const j = {200, 201};
+                std::vector<uint8_t> expected = {'[', '$', 'U', '#', 'i', 2, 0xC8, 0xC9};
+                CHECK(json::to_ubjson(j, true, true) == expected);
+            }
+
+            SECTION("array of I")
+            {
+                json const j = {30000, -30000};
+                std::vector<uint8_t> expected = {'[', '$', 'I', '#', 'i', 2, 0x75, 0x30, 0x8a, 0xd0};
+                CHECK(json::to_ubjson(j, true, true) == expected);
+            }
+
+            SECTION("array of l")
+            {
+                json const j = {70000, -70000};
+                std::vector<uint8_t> expected = {'[', '$', 'l', '#', 'i', 2, 0x00, 0x01, 0x11, 0x70, 0xFF, 0xFE, 0xEE, 0x90};
+                CHECK(json::to_ubjson(j, true, true) == expected);
+            }
+
+            SECTION("array of L")
+            {
+                json const j = {5000000000, -5000000000};
+                std::vector<uint8_t> expected = {'[', '$', 'L', '#', 'i', 2, 0x00, 0x00, 0x00, 0x01, 0x2A, 0x05, 0xF2, 0x00, 0xFF, 0xFF, 0xFF, 0xFE, 0xD5, 0xFA, 0x0E, 0x00};
+                CHECK(json::to_ubjson(j, true, true) == expected);
+            }
+        }
+
+        SECTION("unsigned integer")
+        {
+            SECTION("array of i")
+            {
+                json const j = {1u, 2u};
+                std::vector<uint8_t> expected = {'[', '$', 'i', '#', 'i', 2, 1, 2};
+                std::vector<uint8_t> expected_size = {'[', '#', 'i', 2, 'i', 1, 'i', 2};
+                CHECK(json::to_ubjson(j, true, true) == expected);
+                CHECK(json::to_ubjson(j, true) == expected_size);
+            }
+
+            SECTION("array of U")
+            {
+                json const j = {200u, 201u};
+                std::vector<uint8_t> expected = {'[', '$', 'U', '#', 'i', 2, 0xC8, 0xC9};
+                std::vector<uint8_t> expected_size = {'[', '#', 'i', 2, 'U', 0xC8, 'U', 0xC9};
+                CHECK(json::to_ubjson(j, true, true) == expected);
+                CHECK(json::to_ubjson(j, true) == expected_size);
+            }
+
+            SECTION("array of I")
+            {
+                json const j = {30000u, 30001u};
+                std::vector<uint8_t> expected = {'[', '$', 'I', '#', 'i', 2, 0x75, 0x30, 0x75, 0x31};
+                std::vector<uint8_t> expected_size = {'[', '#', 'i', 2, 'I', 0x75, 0x30, 'I', 0x75, 0x31};
+                CHECK(json::to_ubjson(j, true, true) == expected);
+                CHECK(json::to_ubjson(j, true) == expected_size);
+            }
+
+            SECTION("array of l")
+            {
+                json const j = {70000u, 70001u};
+                std::vector<uint8_t> expected = {'[', '$', 'l', '#', 'i', 2, 0x00, 0x01, 0x11, 0x70, 0x00, 0x01, 0x11, 0x71};
+                std::vector<uint8_t> expected_size = {'[', '#', 'i', 2, 'l', 0x00, 0x01, 0x11, 0x70, 'l', 0x00, 0x01, 0x11, 0x71};
+                CHECK(json::to_ubjson(j, true, true) == expected);
+                CHECK(json::to_ubjson(j, true) == expected_size);
+            }
+
+            SECTION("array of L")
+            {
+                json const j = {5000000000u, 5000000001u};
+                std::vector<uint8_t> expected = {'[', '$', 'L', '#', 'i', 2, 0x00, 0x00, 0x00, 0x01, 0x2A, 0x05, 0xF2, 0x00, 0x00, 0x00, 0x00, 0x01, 0x2A, 0x05, 0xF2, 0x01};
+                std::vector<uint8_t> expected_size = {'[', '#', 'i', 2, 'L', 0x00, 0x00, 0x00, 0x01, 0x2A, 0x05, 0xF2, 0x00, 'L', 0x00, 0x00, 0x00, 0x01, 0x2A, 0x05, 0xF2, 0x01};
+                CHECK(json::to_ubjson(j, true, true) == expected);
+                CHECK(json::to_ubjson(j, true) == expected_size);
+            }
+        }
+
+        SECTION("discarded")
+        {
+            json const j = {json::value_t::discarded, json::value_t::discarded};
+            std::vector<uint8_t> expected = {'[', '$', 'N', '#', 'i', 2};
+            CHECK(json::to_ubjson(j, true, true) == expected);
+        }
+    }
+}
+
+TEST_CASE("Universal Binary JSON Specification Examples 1")
+{
+    SECTION("Null Value")
+    {
+        json const j = {{"passcode", nullptr}};
+        std::vector<uint8_t> const v = {'{', 'i', 8, 'p', 'a', 's', 's', 'c', 'o', 'd', 'e', 'Z', '}'};
+        CHECK(json::to_ubjson(j) == v);
+        CHECK(json::from_ubjson(v) == j);
+    }
+
+    SECTION("No-Op Value")
+    {
+        json const j = {"foo", "bar", "baz"};
+        std::vector<uint8_t> const v = {'[', 'S', 'i', 3, 'f', 'o', 'o',
+                                        'S', 'i', 3, 'b', 'a', 'r',
+                                        'S', 'i', 3, 'b', 'a', 'z', ']'
+                                       };
+        std::vector<uint8_t> const v2 = {'[', 'S', 'i', 3, 'f', 'o', 'o', 'N',
+                                         'S', 'i', 3, 'b', 'a', 'r', 'N', 'N', 'N',
+                                         'S', 'i', 3, 'b', 'a', 'z', 'N', 'N', ']'
+                                        };
+        CHECK(json::to_ubjson(j) == v);
+        CHECK(json::from_ubjson(v) == j);
+        CHECK(json::from_ubjson(v2) == j);
+    }
+
+    SECTION("Boolean Types")
+    {
+        json const j = {{"authorized", true}, {"verified", false}};
+        std::vector<uint8_t> const v = {'{', 'i', 10, 'a', 'u', 't', 'h', 'o', 'r', 'i', 'z', 'e', 'd', 'T',
+                                        'i', 8, 'v', 'e', 'r', 'i', 'f', 'i', 'e', 'd', 'F', '}'
+                                       };
+        CHECK(json::to_ubjson(j) == v);
+        CHECK(json::from_ubjson(v) == j);
+    }
+
+    SECTION("Numeric Types")
+    {
+        json const j =
+        {
+            {"int8", 16},
+            {"uint8", 255},
+            {"int16", 32767},
+            {"int32", 2147483647},
+            {"int64", 9223372036854775807},
+            {"float64", 113243.7863123}
+        };
+        std::vector<uint8_t> const v = {'{',
+                                        'i', 7, 'f', 'l', 'o', 'a', 't', '6', '4', 'D', 0x40, 0xfb, 0xa5, 0xbc, 0x94, 0xbc, 0x34, 0xcf,
+                                        'i', 5, 'i', 'n', 't', '1', '6', 'I', 0x7f, 0xff,
+                                        'i', 5, 'i', 'n', 't', '3', '2', 'l', 0x7f, 0xff, 0xff, 0xff,
+                                        'i', 5, 'i', 'n', 't', '6', '4', 'L', 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                        'i', 4, 'i', 'n', 't', '8', 'i', 16,
+                                        'i', 5, 'u', 'i', 'n', 't', '8', 'U', 0xff,
+                                        '}'
+                                       };
+        CHECK(json::to_ubjson(j) == v);
+        CHECK(json::from_ubjson(v) == j);
+    }
+
+    SECTION("Char Type")
+    {
+        json const j = {{"rolecode", "a"}, {"delim", ";"}};
+        std::vector<uint8_t> const v = {'{', 'i', 5, 'd', 'e', 'l', 'i', 'm', 'C', ';', 'i', 8, 'r', 'o', 'l', 'e', 'c', 'o', 'd', 'e', 'C', 'a', '}'};
+        //CHECK(json::to_ubjson(j) == v);
+        CHECK(json::from_ubjson(v) == j);
+    }
+
+    SECTION("String Type")
+    {
+        SECTION("English")
+        {
+            json const j = "hello";
+            std::vector<uint8_t> const v = {'S', 'i', 5, 'h', 'e', 'l', 'l', 'o'};
+            CHECK(json::to_ubjson(j) == v);
+            CHECK(json::from_ubjson(v) == j);
+        }
+
+        SECTION("Russian")
+        {
+            json const j = "привет";
+            std::vector<uint8_t> const v = {'S', 'i', 12, 0xD0, 0xBF, 0xD1, 0x80, 0xD0, 0xB8, 0xD0, 0xB2, 0xD0, 0xB5, 0xD1, 0x82};
+            CHECK(json::to_ubjson(j) == v);
+            CHECK(json::from_ubjson(v) == j);
+        }
+
+        SECTION("Russian")
+        {
+            json const j = "مرحبا";
+            std::vector<uint8_t> const v = {'S', 'i', 10, 0xD9, 0x85, 0xD8, 0xB1, 0xD8, 0xAD, 0xD8, 0xA8, 0xD8, 0xA7};
+            CHECK(json::to_ubjson(j) == v);
+            CHECK(json::from_ubjson(v) == j);
+        }
+    }
+
+    SECTION("Array Type")
+    {
+        SECTION("size=false type=false")
+        {
+            // note the float has been replaced by a double
+            json const j = {nullptr, true, false, 4782345193, 153.132, "ham"};
+            std::vector<uint8_t> const v = {'[', 'Z', 'T', 'F', 'L', 0x00, 0x00, 0x00, 0x01, 0x1D, 0x0C, 0xCB, 0xE9, 'D', 0x40, 0x63, 0x24, 0x39, 0x58, 0x10, 0x62, 0x4e, 'S', 'i', 3, 'h', 'a', 'm', ']'};
+            CHECK(json::to_ubjson(j) == v);
+            CHECK(json::from_ubjson(v) == j);
+        }
+
+        SECTION("size=true type=false")
+        {
+            // note the float has been replaced by a double
+            json const j = {nullptr, true, false, 4782345193, 153.132, "ham"};
+            std::vector<uint8_t> const v = {'[', '#', 'i', 6, 'Z', 'T', 'F', 'L', 0x00, 0x00, 0x00, 0x01, 0x1D, 0x0C, 0xCB, 0xE9, 'D', 0x40, 0x63, 0x24, 0x39, 0x58, 0x10, 0x62, 0x4e, 'S', 'i', 3, 'h', 'a', 'm'};
+            CHECK(json::to_ubjson(j, true) == v);
+            CHECK(json::from_ubjson(v) == j);
+        }
+
+        SECTION("size=true type=true")
+        {
+            // note the float has been replaced by a double
+            json const j = {nullptr, true, false, 4782345193, 153.132, "ham"};
+            std::vector<uint8_t> const v = {'[', '#', 'i', 6, 'Z', 'T', 'F', 'L', 0x00, 0x00, 0x00, 0x01, 0x1D, 0x0C, 0xCB, 0xE9, 'D', 0x40, 0x63, 0x24, 0x39, 0x58, 0x10, 0x62, 0x4e, 'S', 'i', 3, 'h', 'a', 'm'};
+            CHECK(json::to_ubjson(j, true, true) == v);
+            CHECK(json::from_ubjson(v) == j);
+        }
+    }
+
+    SECTION("Object Type")
+    {
+        SECTION("size=false type=false")
+        {
+            json const j =
+            {
+                {
+                    "post", {
+                        {"id", 1137},
+                        {"author", "rkalla"},
+                        {"timestamp", 1364482090592},
+                        {"body", "I totally agree!"}
+                    }
+                }
+            };
+            std::vector<uint8_t> const v = {'{', 'i', 4, 'p', 'o', 's', 't', '{',
+                                            'i', 6, 'a', 'u', 't', 'h', 'o', 'r', 'S', 'i', 6, 'r', 'k', 'a', 'l', 'l', 'a',
+                                            'i', 4, 'b', 'o', 'd', 'y', 'S', 'i', 16, 'I', ' ', 't', 'o', 't', 'a', 'l', 'l', 'y', ' ', 'a', 'g', 'r', 'e', 'e', '!',
+                                            'i', 2, 'i', 'd', 'I', 0x04, 0x71,
+                                            'i', 9, 't', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', 'L', 0x00, 0x00, 0x01, 0x3D, 0xB1, 0x78, 0x66, 0x60,
+                                            '}', '}'
+                                           };
+            CHECK(json::to_ubjson(j) == v);
+            CHECK(json::from_ubjson(v) == j);
+        }
+
+        SECTION("size=true type=false")
+        {
+            json const j =
+            {
+                {
+                    "post", {
+                        {"id", 1137},
+                        {"author", "rkalla"},
+                        {"timestamp", 1364482090592},
+                        {"body", "I totally agree!"}
+                    }
+                }
+            };
+            std::vector<uint8_t> const v = {'{', '#', 'i', 1, 'i', 4, 'p', 'o', 's', 't', '{', '#', 'i', 4,
+                                            'i', 6, 'a', 'u', 't', 'h', 'o', 'r', 'S', 'i', 6, 'r', 'k', 'a', 'l', 'l', 'a',
+                                            'i', 4, 'b', 'o', 'd', 'y', 'S', 'i', 16, 'I', ' ', 't', 'o', 't', 'a', 'l', 'l', 'y', ' ', 'a', 'g', 'r', 'e', 'e', '!',
+                                            'i', 2, 'i', 'd', 'I', 0x04, 0x71,
+                                            'i', 9, 't', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', 'L', 0x00, 0x00, 0x01, 0x3D, 0xB1, 0x78, 0x66, 0x60
+                                           };
+            CHECK(json::to_ubjson(j, true) == v);
+            CHECK(json::from_ubjson(v) == j);
+        }
+
+        SECTION("size=true type=true")
+        {
+            json const j =
+            {
+                {
+                    "post", {
+                        {"id", 1137},
+                        {"author", "rkalla"},
+                        {"timestamp", 1364482090592},
+                        {"body", "I totally agree!"}
+                    }
+                }
+            };
+            std::vector<uint8_t> const v = {'{', '$', '{', '#', 'i', 1, 'i', 4, 'p', 'o', 's', 't', '#', 'i', 4,
+                                            'i', 6, 'a', 'u', 't', 'h', 'o', 'r', 'S', 'i', 6, 'r', 'k', 'a', 'l', 'l', 'a',
+                                            'i', 4, 'b', 'o', 'd', 'y', 'S', 'i', 16, 'I', ' ', 't', 'o', 't', 'a', 'l', 'l', 'y', ' ', 'a', 'g', 'r', 'e', 'e', '!',
+                                            'i', 2, 'i', 'd', 'I', 0x04, 0x71,
+                                            'i', 9, 't', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', 'L', 0x00, 0x00, 0x01, 0x3D, 0xB1, 0x78, 0x66, 0x60
+                                           };
+            CHECK(json::to_ubjson(j, true, true) == v);
+            CHECK(json::from_ubjson(v) == j);
+        }
+    }
+
+    SECTION("Optimized Format")
+    {
+        SECTION("Array Example")
+        {
+            SECTION("No Optimization")
+            {
+                // note the floats have been replaced by doubles
+                json const j = {29.97, 31.13, 67.0, 2.113, 23.888};
+                std::vector<uint8_t> const v = {'[',
+                                                'D', 0x40, 0x3d, 0xf8, 0x51, 0xeb, 0x85, 0x1e, 0xb8,
+                                                'D', 0x40, 0x3f, 0x21, 0x47, 0xae, 0x14, 0x7a, 0xe1,
+                                                'D', 0x40, 0x50, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                'D', 0x40, 0x00, 0xe7, 0x6c, 0x8b, 0x43, 0x95, 0x81,
+                                                'D', 0x40, 0x37, 0xe3, 0x53, 0xf7, 0xce, 0xd9, 0x17,
+                                                ']'
+                                               };
+                CHECK(json::to_ubjson(j) == v);
+                CHECK(json::from_ubjson(v) == j);
+            }
+
+            SECTION("Optimized with count")
+            {
+                // note the floats have been replaced by doubles
+                json const j = {29.97, 31.13, 67.0, 2.113, 23.888};
+                std::vector<uint8_t> const v = {'[', '#', 'i', 5,
+                                                'D', 0x40, 0x3d, 0xf8, 0x51, 0xeb, 0x85, 0x1e, 0xb8,
+                                                'D', 0x40, 0x3f, 0x21, 0x47, 0xae, 0x14, 0x7a, 0xe1,
+                                                'D', 0x40, 0x50, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                'D', 0x40, 0x00, 0xe7, 0x6c, 0x8b, 0x43, 0x95, 0x81,
+                                                'D', 0x40, 0x37, 0xe3, 0x53, 0xf7, 0xce, 0xd9, 0x17
+                                               };
+                CHECK(json::to_ubjson(j, true) == v);
+                CHECK(json::from_ubjson(v) == j);
+            }
+
+            SECTION("Optimized with type & count")
+            {
+                // note the floats have been replaced by doubles
+                json const j = {29.97, 31.13, 67.0, 2.113, 23.888};
+                std::vector<uint8_t> const v = {'[', '$', 'D', '#', 'i', 5,
+                                                0x40, 0x3d, 0xf8, 0x51, 0xeb, 0x85, 0x1e, 0xb8,
+                                                0x40, 0x3f, 0x21, 0x47, 0xae, 0x14, 0x7a, 0xe1,
+                                                0x40, 0x50, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x40, 0x00, 0xe7, 0x6c, 0x8b, 0x43, 0x95, 0x81,
+                                                0x40, 0x37, 0xe3, 0x53, 0xf7, 0xce, 0xd9, 0x17
+                                               };
+                CHECK(json::to_ubjson(j, true, true) == v);
+                CHECK(json::from_ubjson(v) == j);
+            }
+        }
+
+        SECTION("Object Example")
+        {
+            SECTION("No Optimization")
+            {
+                // note the floats have been replaced by doubles
+                json const j = { {"lat", 29.976}, {"long", 31.131}, {"alt", 67.0} };
+                std::vector<uint8_t> const v = {'{',
+                                                'i', 3, 'a', 'l', 't', 'D', 0x40, 0x50, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                'i', 3, 'l', 'a', 't', 'D', 0x40, 0x3d, 0xf9, 0xdb, 0x22, 0xd0, 0xe5, 0x60,
+                                                'i', 4, 'l', 'o', 'n', 'g', 'D', 0x40, 0x3f, 0x21, 0x89, 0x37, 0x4b, 0xc6, 0xa8,
+                                                '}'
+                                               };
+                CHECK(json::to_ubjson(j) == v);
+                CHECK(json::from_ubjson(v) == j);
+            }
+
+            SECTION("Optimized with count")
+            {
+                // note the floats have been replaced by doubles
+                json const j = { {"lat", 29.976}, {"long", 31.131}, {"alt", 67.0} };
+                std::vector<uint8_t> const v = {'{', '#', 'i', 3,
+                                                'i', 3, 'a', 'l', 't', 'D', 0x40, 0x50, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                'i', 3, 'l', 'a', 't', 'D', 0x40, 0x3d, 0xf9, 0xdb, 0x22, 0xd0, 0xe5, 0x60,
+                                                'i', 4, 'l', 'o', 'n', 'g', 'D', 0x40, 0x3f, 0x21, 0x89, 0x37, 0x4b, 0xc6, 0xa8
+                                               };
+                CHECK(json::to_ubjson(j, true) == v);
+                CHECK(json::from_ubjson(v) == j);
+            }
+
+            SECTION("Optimized with type & count")
+            {
+                // note the floats have been replaced by doubles
+                json const j = { {"lat", 29.976}, {"long", 31.131}, {"alt", 67.0} };
+                std::vector<uint8_t> const v = {'{', '$', 'D', '#', 'i', 3,
+                                                'i', 3, 'a', 'l', 't', 0x40, 0x50, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                'i', 3, 'l', 'a', 't', 0x40, 0x3d, 0xf9, 0xdb, 0x22, 0xd0, 0xe5, 0x60,
+                                                'i', 4, 'l', 'o', 'n', 'g', 0x40, 0x3f, 0x21, 0x89, 0x37, 0x4b, 0xc6, 0xa8
+                                               };
+                CHECK(json::to_ubjson(j, true, true) == v);
+                CHECK(json::from_ubjson(v) == j);
+            }
+        }
+
+        SECTION("Special Cases (Null, No-Op and Boolean)")
+        {
+            SECTION("Array")
+            {
+                std::vector<uint8_t> const v = {'[', '$', 'N', '#', 'I', 0x02, 0x00};
+                CHECK(json::from_ubjson(v) == json::array());
+            }
+
+            SECTION("Object")
+            {
+                std::vector<uint8_t> const v = {'{', '$', 'Z', '#', 'i', 3, 'i', 4, 'n', 'a', 'm', 'e', 'i', 8, 'p', 'a', 's', 's', 'w', 'o', 'r', 'd', 'i', 5, 'e', 'm', 'a', 'i', 'l'};
+                CHECK(json::from_ubjson(v) == json({ {"name", nullptr}, {"password", nullptr}, {"email", nullptr} }));
+            }
+        }
+    }
+}
+
+#if !defined(JSON_NOEXCEPTION)
+TEST_CASE("all UBJSON first bytes")
+{
+    // these bytes will fail immediately with exception parse_error.112
+    std::set<uint8_t> supported =
+    {
+        'T', 'F', 'Z', 'U', 'i', 'I', 'l', 'L', 'd', 'D', 'C', 'S', '[', '{', 'N', 'H'
+    };
+
+    for (auto i = 0; i < 256; ++i)
+    {
+        const auto byte = static_cast<uint8_t>(i);
+        CAPTURE(byte)
+
+        try
+        {
+            auto res = json::from_ubjson(std::vector<uint8_t>(1, byte));
+        }
+        catch (const json::parse_error& e)
+        {
+            // check that parse_error.112 is only thrown if the
+            // first byte is not in the supported set
+            INFO_WITH_TEMP(e.what());
+            if (supported.find(byte) == supported.end())
+            {
+                CHECK(e.id == 112);
+            }
+            else
+            {
+                CHECK(e.id != 112);
+            }
+        }
+    }
+}
+#endif
+
+TEST_CASE("UBJSON roundtrips" * doctest::skip())
+{
+    SECTION("input from self-generated UBJSON files")
+    {
+        for (std::string filename :
+                {
+                    TEST_DATA_DIRECTORY "/json_nlohmann_tests/all_unicode.json",
+                    TEST_DATA_DIRECTORY "/json.org/1.json",
+                    TEST_DATA_DIRECTORY "/json.org/2.json",
+                    TEST_DATA_DIRECTORY "/json.org/3.json",
+                    TEST_DATA_DIRECTORY "/json.org/4.json",
+                    TEST_DATA_DIRECTORY "/json.org/5.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip01.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip02.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip03.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip04.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip05.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip06.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip07.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip08.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip09.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip10.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip11.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip12.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip13.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip14.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip15.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip16.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip17.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip18.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip19.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip20.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip21.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip22.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip23.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip24.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip25.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip26.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip27.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip28.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip29.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip30.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip31.json",
+                    TEST_DATA_DIRECTORY "/json_roundtrip/roundtrip32.json",
+                    TEST_DATA_DIRECTORY "/json_testsuite/sample.json",
+                    TEST_DATA_DIRECTORY "/json_tests/pass1.json",
+                    TEST_DATA_DIRECTORY "/json_tests/pass2.json",
+                    TEST_DATA_DIRECTORY "/json_tests/pass3.json"
+                })
+        {
+            CAPTURE(filename)
+
+            {
+                INFO_WITH_TEMP(filename + ": std::vector<uint8_t>");
+                // parse JSON file
+                std::ifstream f_json(filename);
+                json const j1 = json::parse(f_json);
+
+                // parse UBJSON file
+                auto const packed = utils::read_binary_file(filename + ".ubjson");
+                json j2;
+                CHECK_NOTHROW(j2 = json::from_ubjson(packed));
+
+                // compare parsed JSON values
+                CHECK(j1 == j2);
+            }
+
+            {
+                INFO_WITH_TEMP(filename + ": std::ifstream");
+                // parse JSON file
+                std::ifstream f_json(filename);
+                json const j1 = json::parse(f_json);
+
+                // parse UBJSON file
+                std::ifstream f_ubjson(filename + ".ubjson", std::ios::binary);
+                json j2;
+                CHECK_NOTHROW(j2 = json::from_ubjson(f_ubjson));
+
+                // compare parsed JSON values
+                CHECK(j1 == j2);
+            }
+
+            {
+                INFO_WITH_TEMP(filename + ": uint8_t* and size");
+                // parse JSON file
+                std::ifstream f_json(filename);
+                json j1 = json::parse(f_json);
+
+                // parse UBJSON file
+                auto const packed = utils::read_binary_file(filename + ".ubjson");
+                json j2;
+                CHECK_NOTHROW(j2 = json::from_ubjson({packed.data(), packed.size()}));
+
+                // compare parsed JSON values
+                CHECK(j1 == j2);
+            }
+
+            {
+                INFO_WITH_TEMP(filename + ": output to output adapters");
+                // parse JSON file
+                std::ifstream f_json(filename);
+                json const j1 = json::parse(f_json);
+
+                // parse UBJSON file
+                auto const packed = utils::read_binary_file(filename + ".ubjson");
+
+                {
+                    INFO_WITH_TEMP(filename + ": output adapters: std::vector<uint8_t>");
+                    std::vector<uint8_t> vec;
+                    json::to_ubjson(j1, vec);
+                    CHECK(vec == packed);
+                }
+            }
+        }
+    }
+}
diff --git a/external_imported/json/tests/src/unit-udl.cpp b/external_imported/json/tests/src/unit-udl.cpp
new file mode 100644
index 000000000..bb72ccbce
--- /dev/null
+++ b/external_imported/json/tests/src/unit-udl.cpp
@@ -0,0 +1,57 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+#include <nlohmann/json.hpp>
+
+TEST_CASE("user-defined string literals")
+{
+    auto j_expected = nlohmann::json::parse(R"({"foo": "bar", "baz": 42})");
+    auto ptr_expected = nlohmann::json::json_pointer("/foo/bar");
+
+    SECTION("using namespace nlohmann::literals::json_literals")
+    {
+        using namespace nlohmann::literals::json_literals; // NOLINT(google-build-using-namespace)
+
+        CHECK(R"({"foo": "bar", "baz": 42})"_json == j_expected);
+        CHECK("/foo/bar"_json_pointer == ptr_expected);
+    }
+
+    SECTION("using namespace nlohmann::json_literals")
+    {
+        using namespace nlohmann::json_literals; // NOLINT(google-build-using-namespace)
+
+        CHECK(R"({"foo": "bar", "baz": 42})"_json == j_expected);
+        CHECK("/foo/bar"_json_pointer == ptr_expected);
+    }
+
+    SECTION("using namespace nlohmann::literals")
+    {
+        using namespace nlohmann::literals; // NOLINT(google-build-using-namespace)
+
+        CHECK(R"({"foo": "bar", "baz": 42})"_json == j_expected);
+        CHECK("/foo/bar"_json_pointer == ptr_expected);
+    }
+
+    SECTION("using namespace nlohmann")
+    {
+        using namespace nlohmann; // NOLINT(google-build-using-namespace)
+
+        CHECK(R"({"foo": "bar", "baz": 42})"_json == j_expected);
+        CHECK("/foo/bar"_json_pointer == ptr_expected);
+    }
+
+#ifndef JSON_TEST_NO_GLOBAL_UDLS
+    SECTION("global namespace")
+    {
+        CHECK(R"({"foo": "bar", "baz": 42})"_json == j_expected);
+        CHECK("/foo/bar"_json_pointer == ptr_expected);
+    }
+#endif
+}
diff --git a/external_imported/json/test/src/unit-udt.cpp b/external_imported/json/tests/src/unit-udt.cpp
similarity index 82%
rename from external_imported/json/test/src/unit-udt.cpp
rename to external_imported/json/tests/src/unit-udt.cpp
index b23765505..b138aa46d 100644
--- a/external_imported/json/test/src/unit-udt.cpp
+++ b/external_imported/json/tests/src/unit-udt.cpp
@@ -1,41 +1,27 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.9.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
 
 #include "doctest_compatibility.h"
 
+// disable -Wnoexcept due to class Evil
+DOCTEST_GCC_SUPPRESS_WARNING_PUSH
+DOCTEST_GCC_SUPPRESS_WARNING("-Wnoexcept")
+
 #include <nlohmann/json.hpp>
 using nlohmann::json;
+#ifdef JSON_TEST_NO_GLOBAL_UDLS
+    using namespace nlohmann::literals; // NOLINT(google-build-using-namespace)
+#endif
 
-#include <array>
 #include <map>
-#include <string>
 #include <memory>
+#include <string>
+#include <utility>
 
 namespace udt
 {
@@ -55,40 +41,40 @@ struct age
 struct name
 {
     std::string m_val;
-    name(const std::string rhs = "") : m_val(rhs) {}
+    name(std::string rhs = "") : m_val(std::move(rhs)) {}
 };
 
 struct address
 {
     std::string m_val;
-    address(const std::string rhs = "") : m_val(rhs) {}
+    address(std::string rhs = "") : m_val(std::move(rhs)) {}
 };
 
 struct person
 {
-    age m_age;
-    name m_name;
-    country m_country;
-    person() : m_age(), m_name(), m_country() {}
-    person(const age& a, const name& n, const country& c) : m_age(a), m_name(n), m_country(c) {}
+    age m_age{};
+    name m_name{};
+    country m_country{};
+    person() = default;
+    person(const age& a, name  n, const country& c) : m_age(a), m_name(std::move(n)), m_country(c) {}
 };
 
 struct contact
 {
-    person m_person;
-    address m_address;
-    contact() : m_person(), m_address() {}
-    contact(const person& p, const address& a) : m_person(p), m_address(a) {}
+    person m_person{};
+    address m_address{};
+    contact() = default;
+    contact(person p, address a) : m_person(std::move(p)), m_address(std::move(a)) {}
 };
 
 struct contact_book
 {
-    name m_book_name;
-    std::vector<contact> m_contacts;
-    contact_book() : m_book_name(), m_contacts() {}
-    contact_book(const name& n, const std::vector<contact>& c) : m_book_name(n), m_contacts(c) {}
+    name m_book_name{};
+    std::vector<contact> m_contacts{};
+    contact_book() = default;
+    contact_book(name n, std::vector<contact> c) : m_book_name(std::move(n)), m_contacts(std::move(c)) {}
 };
-}
+} // namespace udt
 
 // to_json methods
 namespace udt
@@ -178,7 +164,7 @@ static bool operator==(const contact_book& lhs, const contact_book& rhs)
     return std::tie(lhs.m_book_name, lhs.m_contacts) ==
            std::tie(rhs.m_book_name, rhs.m_contacts);
 }
-}
+} // namespace udt
 
 // from_json methods
 namespace udt
@@ -199,7 +185,7 @@ template <typename BasicJsonType>
 static void from_json(const BasicJsonType& j, country& c)
 {
     const auto str = j.template get<std::string>();
-    static const std::map<std::string, country> m =
+    const std::map<std::string, country> m =
     {
         {"中�人民共和国", country::china},
         {"France", country::france},
@@ -207,7 +193,7 @@ static void from_json(const BasicJsonType& j, country& c)
     };
 
     const auto it = m.find(str);
-    // TODO test exceptions
+    // TODO(nlohmann) test exceptions
     c = it->second;
 }
 
@@ -235,7 +221,7 @@ static void from_json(const nlohmann::json& j, contact_book& cb)
     cb.m_book_name = j["name"].get<name>();
     cb.m_contacts = j["contacts"].get<std::vector<contact>>();
 }
-}
+} // namespace udt
 
 TEST_CASE("basic usage" * doctest::test_suite("udt"))
 {
@@ -344,11 +330,11 @@ namespace udt
 {
 struct legacy_type
 {
-    std::string number;
-    legacy_type() : number() {}
-    legacy_type(const std::string& n) : number(n) {}
+    std::string number{};
+    legacy_type() = default;
+    legacy_type(std::string n) : number(std::move(n)) {}
 };
-}
+} // namespace udt
 
 namespace nlohmann
 {
@@ -375,7 +361,7 @@ struct adl_serializer<std::shared_ptr<T>>
         }
         else
         {
-            opt.reset(new T(j.get<T>()));
+            opt.reset(new T(j.get<T>())); // NOLINT(cppcoreguidelines-owning-memory)
         }
     }
 };
@@ -393,7 +379,7 @@ struct adl_serializer<udt::legacy_type>
         l.number = std::to_string(j.get<int>());
     }
 };
-}
+} // namespace nlohmann
 
 TEST_CASE("adl_serializer specialization" * doctest::test_suite("udt"))
 {
@@ -406,7 +392,7 @@ TEST_CASE("adl_serializer specialization" * doctest::test_suite("udt"))
             json j = optPerson;
             CHECK(j.is_null());
 
-            optPerson.reset(new udt::person{{42}, {"John Doe"}, udt::country::russia});
+            optPerson.reset(new udt::person{{42}, {"John Doe"}, udt::country::russia}); // NOLINT(cppcoreguidelines-owning-memory,modernize-make-shared)
             j = optPerson;
             CHECK_FALSE(j.is_null());
 
@@ -432,15 +418,15 @@ TEST_CASE("adl_serializer specialization" * doctest::test_suite("udt"))
     {
         SECTION("to_json")
         {
-            udt::legacy_type lt{"4242"};
+            udt::legacy_type const lt{"4242"};
 
-            json j = lt;
+            json const j = lt;
             CHECK(j.get<int>() == 4242);
         }
 
         SECTION("from_json")
         {
-            json j = 4242;
+            json const j = 4242;
             auto lt = j.get<udt::legacy_type>();
             CHECK(lt.number == "4242");
         }
@@ -453,27 +439,27 @@ template <>
 struct adl_serializer<std::vector<float>>
 {
     using type = std::vector<float>;
-    static void to_json(json& j, const type&)
+    static void to_json(json& j, const type& /*type*/)
     {
         j = "hijacked!";
     }
 
-    static void from_json(const json&, type& opt)
+    static void from_json(const json& /*unnamed*/, type& opt)
     {
         opt = {42.0, 42.0, 42.0};
     }
 
     // preferred version
-    static type from_json(const json&)
+    static type from_json(const json& /*unnamed*/)
     {
         return {4.0, 5.0, 6.0};
     }
 };
-}
+} // namespace nlohmann
 
 TEST_CASE("even supported types can be specialized" * doctest::test_suite("udt"))
 {
-    json j = std::vector<float> {1.0, 2.0, 3.0};
+    json const j = std::vector<float> {1.0, 2.0, 3.0};
     CHECK(j.dump() == R"("hijacked!")");
     auto f = j.get<std::vector<float>>();
     // the single argument from_json method is preferred
@@ -504,13 +490,11 @@ struct adl_serializer<std::unique_ptr<T>>
         {
             return nullptr;
         }
-        else
-        {
-            return std::unique_ptr<T>(new T(j.get<T>()));
-        }
+
+        return std::unique_ptr<T>(new T(j.get<T>()));
     }
 };
-}
+} // namespace nlohmann
 
 TEST_CASE("Non-copyable types" * doctest::test_suite("udt"))
 {
@@ -521,7 +505,7 @@ TEST_CASE("Non-copyable types" * doctest::test_suite("udt"))
         json j = optPerson;
         CHECK(j.is_null());
 
-        optPerson.reset(new udt::person{{42}, {"John Doe"}, udt::country::russia});
+        optPerson.reset(new udt::person{{42}, {"John Doe"}, udt::country::russia}); // NOLINT(cppcoreguidelines-owning-memory,modernize-make-unique)
         j = optPerson;
         CHECK_FALSE(j.is_null());
 
@@ -566,8 +550,8 @@ struct pod_serializer
                    std::is_pod<U>::value && std::is_class<U>::value, int >::type = 0 >
     static void from_json(const  BasicJsonType& j, U& t)
     {
-        std::uint64_t value;
-        // TODO The following block is no longer relevant in this serializer, make another one that shows the issue
+        std::uint64_t value = 0;
+        // The following block is no longer relevant in this serializer, make another one that shows the issue
         // the problem arises only when one from_json method is defined without any constraint
         //
         // Why cannot we simply use: j.get<std::uint64_t>() ?
@@ -582,7 +566,7 @@ struct pod_serializer
         // calling get calls from_json, for now, we cannot do this in custom
         // serializers
         nlohmann::from_json(j, value);
-        auto bytes = static_cast<char*>(static_cast<void*>(&value));
+        auto* bytes = static_cast<char*>(static_cast<void*>(&value)); // NOLINT(bugprone-casting-through-void)
         std::memcpy(&t, bytes, sizeof(value));
     }
 
@@ -601,8 +585,8 @@ struct pod_serializer
                    std::is_pod<U>::value && std::is_class<U>::value, int >::type = 0 >
     static void to_json(BasicJsonType& j, const  T& t) noexcept
     {
-        auto bytes = static_cast< const unsigned char*>(static_cast<const void*>(&t));
-        std::uint64_t value;
+        const auto* bytes = static_cast< const unsigned char*>(static_cast<const void*>(&t));  // NOLINT(bugprone-casting-through-void)
+        std::uint64_t value = 0;
         std::memcpy(&value, bytes, sizeof(value));
         nlohmann::to_json(j, value);
     }
@@ -619,9 +603,9 @@ struct small_pod
 
 struct non_pod
 {
-    std::string s;
-    non_pod() : s() {}
-    non_pod(const std::string& S) : s(S) {}
+    std::string s{};
+    non_pod() = default;
+    non_pod(std::string S) : s(std::move(S)) {}
 };
 
 template <typename BasicJsonType>
@@ -651,7 +635,7 @@ static std::ostream& operator<<(std::ostream& os, small_pod l)
 {
     return os << "begin: " << l.begin << ", middle: " << l.middle << ", end: " << l.end;
 }
-}
+} // namespace udt
 
 TEST_CASE("custom serializer for pods" * doctest::test_suite("udt"))
 {
@@ -660,14 +644,14 @@ TEST_CASE("custom serializer for pods" * doctest::test_suite("udt"))
         std::int64_t, std::uint64_t, double, std::allocator, pod_serializer>;
 
     auto p = udt::small_pod{42, '/', 42};
-    custom_json j = p;
+    custom_json const j = p;
 
     auto p2 = j.get<udt::small_pod>();
 
     CHECK(p == p2);
 
     auto np = udt::non_pod{{"non-pod"}};
-    custom_json j2 = np;
+    custom_json const j2 = np;
     auto np2 = j2.get<udt::non_pod>();
     CHECK(np == np2);
 }
@@ -697,8 +681,8 @@ TEST_CASE("custom serializer that does adl by default" * doctest::test_suite("ud
 {
     auto me = udt::person{{23}, {"theo"}, udt::country::france};
 
-    json j = me;
-    custom_json cj = me;
+    json const j = me;
+    custom_json const cj = me;
 
     CHECK(j.dump() == cj.dump());
 
@@ -710,21 +694,21 @@ TEST_CASE("different basic_json types conversions")
 {
     SECTION("null")
     {
-        json j;
+        json const j;
         custom_json cj = j;
         CHECK(cj == nullptr);
     }
 
     SECTION("boolean")
     {
-        json j = true;
+        json const j = true;
         custom_json cj = j;
         CHECK(cj == true);
     }
 
     SECTION("discarded")
     {
-        json j(json::value_t::discarded);
+        json const j(json::value_t::discarded);
         custom_json cj;
         CHECK_NOTHROW(cj = j);
         CHECK(cj.type() == custom_json::value_t::discarded);
@@ -732,35 +716,35 @@ TEST_CASE("different basic_json types conversions")
 
     SECTION("array")
     {
-        json j = {1, 2, 3};
-        custom_json cj = j;
+        json const j = {1, 2, 3};
+        custom_json const cj = j;
         CHECK((cj == std::vector<int> {1, 2, 3}));
     }
 
     SECTION("integer")
     {
-        json j = 42;
+        json const j = 42;
         custom_json cj = j;
         CHECK(cj == 42);
     }
 
     SECTION("float")
     {
-        json j = 42.0;
+        json const j = 42.0;
         custom_json cj = j;
         CHECK(cj == 42.0);
     }
 
     SECTION("unsigned")
     {
-        json j = 42u;
+        json const j = 42u;
         custom_json cj = j;
         CHECK(cj == 42u);
     }
 
     SECTION("string")
     {
-        json j = "forty-two";
+        json const j = "forty-two";
         custom_json cj = j;
         CHECK(cj == "forty-two");
     }
@@ -777,7 +761,7 @@ TEST_CASE("different basic_json types conversions")
 
     SECTION("object")
     {
-        json j = {{"forty", "two"}};
+        json const j = {{"forty", "two"}};
         custom_json cj = j;
         auto m = j.get<std::map<std::string, std::string>>();
         CHECK(cj == m);
@@ -785,7 +769,7 @@ TEST_CASE("different basic_json types conversions")
 
     SECTION("get<custom_json>")
     {
-        json j = 42;
+        json const j = 42;
         custom_json cj = j.get<custom_json>();
         CHECK(cj == 42);
     }
@@ -803,7 +787,7 @@ struct is_constructible_patched : std::false_type {};
 
 template <typename T>
 struct is_constructible_patched<T, decltype(void(json(std::declval<T>())))> : std::true_type {};
-}
+} // namespace
 
 TEST_CASE("an incomplete type does not trigger a compiler error in non-evaluated context" * doctest::test_suite("udt"))
 {
@@ -817,13 +801,16 @@ class Evil
   public:
     Evil() = default;
     template <typename T>
-    Evil(T t) : m_i(sizeof(t)) {}
+    Evil(T t) : m_i(sizeof(t))
+    {
+        static_cast<void>(t); // fix MSVC's C4100 warning
+    }
 
     int m_i = 0;
 };
 
-void from_json(const json&, Evil&) {}
-}
+void from_json(const json& /*unused*/, Evil& /*unused*/) {}
+} // namespace
 
 TEST_CASE("Issue #924")
 {
@@ -843,3 +830,35 @@ TEST_CASE("Issue #1237")
     struct non_convertible_type {};
     static_assert(!std::is_convertible<json, non_convertible_type>::value, "");
 }
+
+namespace
+{
+class no_iterator_type
+{
+  public:
+    no_iterator_type(std::initializer_list<int> l)
+        : _v(l)
+    {}
+
+    std::vector<int>::const_iterator begin() const
+    {
+        return _v.begin();
+    }
+
+    std::vector<int>::const_iterator end() const
+    {
+        return _v.end();
+    }
+
+  private:
+    std::vector<int> _v;
+};
+}  // namespace
+
+TEST_CASE("compatible array type, without iterator type alias")
+{
+    no_iterator_type const vec{1, 2, 3};
+    json const j = vec;
+}
+
+DOCTEST_GCC_SUPPRESS_WARNING_POP
diff --git a/external_imported/json/tests/src/unit-udt_macro.cpp b/external_imported/json/tests/src/unit-udt_macro.cpp
new file mode 100644
index 000000000..e2383f40d
--- /dev/null
+++ b/external_imported/json/tests/src/unit-udt_macro.cpp
@@ -0,0 +1,474 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include <string>
+#include <vector>
+#include "doctest_compatibility.h"
+
+#include <nlohmann/json.hpp>
+using nlohmann::json;
+
+namespace persons
+{
+class person_with_private_data
+{
+  private:
+    std::string name{};
+    int age = 0;
+    json metadata = nullptr;
+
+  public:
+    bool operator==(const person_with_private_data& rhs) const
+    {
+        return name == rhs.name && age == rhs.age && metadata == rhs.metadata;
+    }
+
+    person_with_private_data() = default;
+    person_with_private_data(std::string name_, int age_, json metadata_)
+        : name(std::move(name_))
+        , age(age_)
+        , metadata(std::move(metadata_))
+    {}
+
+    NLOHMANN_DEFINE_TYPE_INTRUSIVE(person_with_private_data, age, name, metadata)
+};
+
+class person_with_private_data_2
+{
+  private:
+    std::string name{};
+    int age = 0;
+    json metadata = nullptr;
+
+  public:
+    bool operator==(const person_with_private_data_2& rhs) const
+    {
+        return name == rhs.name && age == rhs.age && metadata == rhs.metadata;
+    }
+
+    person_with_private_data_2() = default;
+    person_with_private_data_2(std::string name_, int age_, json metadata_)
+        : name(std::move(name_))
+        , age(age_)
+        , metadata(std::move(metadata_))
+    {}
+
+    std::string getName() const
+    {
+        return name;
+    }
+    int getAge() const
+    {
+        return age;
+    }
+    json getMetadata() const
+    {
+        return metadata;
+    }
+
+    NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(person_with_private_data_2, age, name, metadata)
+};
+
+class person_without_private_data_1
+{
+  public:
+    std::string name{};
+    int age = 0;
+    json metadata = nullptr;
+
+    bool operator==(const person_without_private_data_1& rhs) const
+    {
+        return name == rhs.name && age == rhs.age && metadata == rhs.metadata;
+    }
+
+    person_without_private_data_1() = default;
+    person_without_private_data_1(std::string name_, int age_, json metadata_)
+        : name(std::move(name_))
+        , age(age_)
+        , metadata(std::move(metadata_))
+    {}
+
+    NLOHMANN_DEFINE_TYPE_INTRUSIVE(person_without_private_data_1, age, name, metadata)
+};
+
+class person_without_private_data_2
+{
+  public:
+    std::string name{};
+    int age = 0;
+    json metadata = nullptr;
+
+    bool operator==(const person_without_private_data_2& rhs) const
+    {
+        return name == rhs.name && age == rhs.age && metadata == rhs.metadata;
+    }
+
+    person_without_private_data_2() = default;
+    person_without_private_data_2(std::string name_, int age_, json metadata_)
+        : name(std::move(name_))
+        , age(age_)
+        , metadata(std::move(metadata_))
+    {}
+};
+
+NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(person_without_private_data_2, age, name, metadata)
+
+class person_without_private_data_3
+{
+  public:
+    std::string name{};
+    int age = 0;
+    json metadata = nullptr;
+
+    bool operator==(const person_without_private_data_3& rhs) const
+    {
+        return name == rhs.name && age == rhs.age && metadata == rhs.metadata;
+    }
+
+    person_without_private_data_3() = default;
+    person_without_private_data_3(std::string name_, int age_, json metadata_)
+        : name(std::move(name_))
+        , age(age_)
+        , metadata(std::move(metadata_))
+    {}
+
+    std::string getName() const
+    {
+        return name;
+    }
+    int getAge() const
+    {
+        return age;
+    }
+    json getMetadata() const
+    {
+        return metadata;
+    }
+};
+
+NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(person_without_private_data_3, age, name, metadata)
+
+class person_with_private_alphabet
+{
+  public:
+    bool operator==(const person_with_private_alphabet& other) const
+    {
+        return  a == other.a &&
+                b == other.b &&
+                c == other.c &&
+                d == other.d &&
+                e == other.e &&
+                f == other.f &&
+                g == other.g &&
+                h == other.h &&
+                i == other.i &&
+                j == other.j &&
+                k == other.k &&
+                l == other.l &&
+                m == other.m &&
+                n == other.n &&
+                o == other.o &&
+                p == other.p &&
+                q == other.q &&
+                r == other.r &&
+                s == other.s &&
+                t == other.t &&
+                u == other.u &&
+                v == other.v &&
+                w == other.w &&
+                x == other.x &&
+                y == other.y &&
+                z == other.z;
+    }
+
+  private:
+    int a = 0;
+    int b = 0;
+    int c = 0;
+    int d = 0;
+    int e = 0;
+    int f = 0;
+    int g = 0;
+    int h = 0;
+    int i = 0;
+    int j = 0;
+    int k = 0;
+    int l = 0;
+    int m = 0;
+    int n = 0;
+    int o = 0;
+    int p = 0;
+    int q = 0;
+    int r = 0;
+    int s = 0;
+    int t = 0;
+    int u = 0;
+    int v = 0;
+    int w = 0;
+    int x = 0;
+    int y = 0;
+    int z = 0;
+    NLOHMANN_DEFINE_TYPE_INTRUSIVE(person_with_private_alphabet, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z)
+};
+
+class person_with_public_alphabet
+{
+  public:
+    bool operator==(const person_with_public_alphabet& other) const
+    {
+        return  a == other.a &&
+                b == other.b &&
+                c == other.c &&
+                d == other.d &&
+                e == other.e &&
+                f == other.f &&
+                g == other.g &&
+                h == other.h &&
+                i == other.i &&
+                j == other.j &&
+                k == other.k &&
+                l == other.l &&
+                m == other.m &&
+                n == other.n &&
+                o == other.o &&
+                p == other.p &&
+                q == other.q &&
+                r == other.r &&
+                s == other.s &&
+                t == other.t &&
+                u == other.u &&
+                v == other.v &&
+                w == other.w &&
+                x == other.x &&
+                y == other.y &&
+                z == other.z;
+    }
+
+    int a = 0;
+    int b = 0;
+    int c = 0;
+    int d = 0;
+    int e = 0;
+    int f = 0;
+    int g = 0;
+    int h = 0;
+    int i = 0;
+    int j = 0;
+    int k = 0;
+    int l = 0;
+    int m = 0;
+    int n = 0;
+    int o = 0;
+    int p = 0;
+    int q = 0;
+    int r = 0;
+    int s = 0;
+    int t = 0;
+    int u = 0;
+    int v = 0;
+    int w = 0;
+    int x = 0;
+    int y = 0;
+    int z = 0;
+};
+
+NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(person_with_public_alphabet, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z)
+
+class person_without_default_constructor_1
+{
+  public:
+    std::string name;
+    int age;
+
+    bool operator==(const person_without_default_constructor_1& other) const
+    {
+        return name == other.name && age == other.age;
+    }
+
+    person_without_default_constructor_1(std::string name_, int age_)
+        : name{std::move(name_)}
+        , age{age_}
+    {}
+
+    NLOHMANN_DEFINE_TYPE_INTRUSIVE_ONLY_SERIALIZE(person_without_default_constructor_1, name, age)
+};
+
+class person_without_default_constructor_2
+{
+  public:
+    std::string name;
+    int age;
+
+    bool operator==(const person_without_default_constructor_2& other) const
+    {
+        return name == other.name && age == other.age;
+    }
+
+    person_without_default_constructor_2(std::string name_, int age_)
+        : name{std::move(name_)}
+        , age{age_}
+    {}
+};
+
+NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_ONLY_SERIALIZE(person_without_default_constructor_2, name, age)
+
+} // namespace persons
+
+TEST_CASE_TEMPLATE("Serialization/deserialization via NLOHMANN_DEFINE_TYPE_INTRUSIVE and NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE", T,
+                   persons::person_with_private_data,
+                   persons::person_without_private_data_1,
+                   persons::person_without_private_data_2)
+{
+    SECTION("person")
+    {
+        // serialization
+        T p1("Erik", 1, {{"haircuts", 2}});
+        CHECK(json(p1).dump() == "{\"age\":1,\"metadata\":{\"haircuts\":2},\"name\":\"Erik\"}");
+
+        // deserialization
+        auto p2 = json(p1).get<T>();
+        CHECK(p2 == p1);
+
+        // roundtrip
+        CHECK(T(json(p1)) == p1);
+        CHECK(json(T(json(p1))) == json(p1));
+
+        // check exception in case of missing field
+        json j = json(p1);
+        j.erase("age");
+        CHECK_THROWS_WITH_AS(j.get<T>(), "[json.exception.out_of_range.403] key 'age' not found", json::out_of_range);
+    }
+}
+
+TEST_CASE_TEMPLATE("Serialization/deserialization via NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT and NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT", T,
+                   persons::person_with_private_data_2,
+                   persons::person_without_private_data_3)
+{
+    SECTION("person with default values")
+    {
+        // serialization of default constructed object
+        T p0;
+        CHECK(json(p0).dump() == "{\"age\":0,\"metadata\":null,\"name\":\"\"}");
+
+        // serialization
+        T p1("Erik", 1, {{"haircuts", 2}});
+        CHECK(json(p1).dump() == "{\"age\":1,\"metadata\":{\"haircuts\":2},\"name\":\"Erik\"}");
+
+        // deserialization
+        auto p2 = json(p1).get<T>();
+        CHECK(p2 == p1);
+
+        // roundtrip
+        CHECK(T(json(p1)) == p1);
+        CHECK(json(T(json(p1))) == json(p1));
+
+        // check default value in case of missing field
+        json j = json(p1);
+        j.erase("name");
+        j.erase("age");
+        j.erase("metadata");
+        T p3 = j.get<T>();
+        CHECK(p3.getName() == "");
+        CHECK(p3.getAge() == 0);
+        CHECK(p3.getMetadata() == nullptr);
+    }
+}
+
+TEST_CASE_TEMPLATE("Serialization/deserialization of classes with 26 public/private member variables via NLOHMANN_DEFINE_TYPE_INTRUSIVE and NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE", T,
+                   persons::person_with_private_alphabet,
+                   persons::person_with_public_alphabet)
+{
+    SECTION("alphabet")
+    {
+        {
+            T obj1;
+            nlohmann::json const j = obj1; //via json object
+            T obj2;
+            j.get_to(obj2);
+            bool ok = (obj1 == obj2);
+            CHECK(ok);
+        }
+
+        {
+            T obj1;
+            nlohmann::json const j1 = obj1; //via json string
+            std::string const s = j1.dump();
+            nlohmann::json const j2 = nlohmann::json::parse(s);
+            T obj2;
+            j2.get_to(obj2);
+            bool ok = (obj1 == obj2);
+            CHECK(ok);
+        }
+
+        {
+            T obj1;
+            nlohmann::json const j1 = obj1; //via msgpack
+            std::vector<uint8_t> const buf = nlohmann::json::to_msgpack(j1);
+            nlohmann::json const j2 = nlohmann::json::from_msgpack(buf);
+            T obj2;
+            j2.get_to(obj2);
+            bool ok = (obj1 == obj2);
+            CHECK(ok);
+        }
+
+        {
+            T obj1;
+            nlohmann::json const j1 = obj1; //via bson
+            std::vector<uint8_t> const buf = nlohmann::json::to_bson(j1);
+            nlohmann::json const j2 = nlohmann::json::from_bson(buf);
+            T obj2;
+            j2.get_to(obj2);
+            bool ok = (obj1 == obj2);
+            CHECK(ok);
+        }
+
+        {
+            T obj1;
+            nlohmann::json const j1 = obj1; //via cbor
+            std::vector<uint8_t> const buf = nlohmann::json::to_cbor(j1);
+            nlohmann::json const j2 = nlohmann::json::from_cbor(buf);
+            T obj2;
+            j2.get_to(obj2);
+            bool ok = (obj1 == obj2);
+            CHECK(ok);
+        }
+
+        {
+            T obj1;
+            nlohmann::json const j1 = obj1; //via ubjson
+            std::vector<uint8_t> const buf = nlohmann::json::to_ubjson(j1);
+            nlohmann::json const j2 = nlohmann::json::from_ubjson(buf);
+            T obj2;
+            j2.get_to(obj2);
+            bool ok = (obj1 == obj2);
+            CHECK(ok);
+        }
+    }
+}
+
+TEST_CASE_TEMPLATE("Serialization of non-default-constructible classes via NLOHMANN_DEFINE_TYPE_INTRUSIVE_ONLY_SERIALIZE and NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_ONLY_SERIALIZE", T,
+                   persons::person_without_default_constructor_1,
+                   persons::person_without_default_constructor_2)
+{
+    SECTION("person")
+    {
+        {
+            // serialization of a single object
+            T person{"Erik", 1};
+            CHECK(json(person).dump() == "{\"age\":1,\"name\":\"Erik\"}");
+
+            // serialization of a container with objects
+            std::vector<T> const two_persons
+            {
+                {"Erik", 1},
+                {"Kyle", 2}
+            };
+            CHECK(json(two_persons).dump() == "[{\"age\":1,\"name\":\"Erik\"},{\"age\":2,\"name\":\"Kyle\"}]");
+        }
+    }
+}
diff --git a/external_imported/json/tests/src/unit-unicode1.cpp b/external_imported/json/tests/src/unit-unicode1.cpp
new file mode 100644
index 000000000..e4405c474
--- /dev/null
+++ b/external_imported/json/tests/src/unit-unicode1.cpp
@@ -0,0 +1,620 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+// for some reason including this after the json header leads to linker errors with VS 2017...
+#include <locale>
+#include <nlohmann/json.hpp>
+using nlohmann::json;
+
+#include <fstream>
+#include <sstream>
+#include <iomanip>
+#include "make_test_data_available.hpp"
+
+TEST_CASE("Unicode (1/5)" * doctest::skip())
+{
+    SECTION("\\uxxxx sequences")
+    {
+        // create an escaped string from a code point
+        const auto codepoint_to_unicode = [](std::size_t cp)
+        {
+            // code points are represented as a six-character sequence: a
+            // reverse solidus, followed by the lowercase letter u, followed
+            // by four hexadecimal digits that encode the character's code
+            // point
+            std::stringstream ss;
+            ss << "\\u" << std::setw(4) << std::setfill('0') << std::hex << cp;
+            return ss.str();
+        };
+
+        SECTION("correct sequences")
+        {
+            // generate all UTF-8 code points; in total, 1112064 code points are
+            // generated: 0x1FFFFF code points - 2048 invalid values between
+            // 0xD800 and 0xDFFF.
+            for (std::size_t cp = 0; cp <= 0x10FFFFu; ++cp)
+            {
+                // string to store the code point as in \uxxxx format
+                std::string json_text = "\"";
+
+                // decide whether to use one or two \uxxxx sequences
+                if (cp < 0x10000u)
+                {
+                    // The Unicode standard permanently reserves these code point
+                    // values for UTF-16 encoding of the high and low surrogates, and
+                    // they will never be assigned a character, so there should be no
+                    // reason to encode them. The official Unicode standard says that
+                    // no UTF forms, including UTF-16, can encode these code points.
+                    if (cp >= 0xD800u && cp <= 0xDFFFu)
+                    {
+                        // if we would not skip these code points, we would get a
+                        // "missing low surrogate" exception
+                        continue;
+                    }
+
+                    // code points in the Basic Multilingual Plane can be
+                    // represented with one \uxxxx sequence
+                    json_text += codepoint_to_unicode(cp);
+                }
+                else
+                {
+                    // To escape an extended character that is not in the Basic
+                    // Multilingual Plane, the character is represented as a
+                    // 12-character sequence, encoding the UTF-16 surrogate pair
+                    const auto codepoint1 = 0xd800u + (((cp - 0x10000u) >> 10) & 0x3ffu);
+                    const auto codepoint2 = 0xdc00u + ((cp - 0x10000u) & 0x3ffu);
+                    json_text += codepoint_to_unicode(codepoint1) + codepoint_to_unicode(codepoint2);
+                }
+
+                json_text += "\"";
+                CAPTURE(json_text)
+                json _;
+                CHECK_NOTHROW(_ = json::parse(json_text));
+            }
+        }
+
+        SECTION("incorrect sequences")
+        {
+            SECTION("incorrect surrogate values")
+            {
+                json _;
+
+                CHECK_THROWS_WITH_AS(_ = json::parse("\"\\uDC00\\uDC00\""), "[json.exception.parse_error.101] parse error at line 1, column 7: syntax error while parsing value - invalid string: surrogate U+DC00..U+DFFF must follow U+D800..U+DBFF; last read: '\"\\uDC00'", json::parse_error&);
+
+                CHECK_THROWS_WITH_AS(_ = json::parse("\"\\uD7FF\\uDC00\""), "[json.exception.parse_error.101] parse error at line 1, column 13: syntax error while parsing value - invalid string: surrogate U+DC00..U+DFFF must follow U+D800..U+DBFF; last read: '\"\\uD7FF\\uDC00'", json::parse_error&);
+
+                CHECK_THROWS_WITH_AS(_ = json::parse("\"\\uD800]\""), "[json.exception.parse_error.101] parse error at line 1, column 8: syntax error while parsing value - invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD800]'", json::parse_error&);
+
+                CHECK_THROWS_WITH_AS(_ = json::parse("\"\\uD800\\v\""), "[json.exception.parse_error.101] parse error at line 1, column 9: syntax error while parsing value - invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD800\\v'", json::parse_error&);
+
+                CHECK_THROWS_WITH_AS(_ = json::parse("\"\\uD800\\u123\""), "[json.exception.parse_error.101] parse error at line 1, column 13: syntax error while parsing value - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\uD800\\u123\"'", json::parse_error&);
+
+                CHECK_THROWS_WITH_AS(_ = json::parse("\"\\uD800\\uDBFF\""), "[json.exception.parse_error.101] parse error at line 1, column 13: syntax error while parsing value - invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD800\\uDBFF'", json::parse_error&);
+
+                CHECK_THROWS_WITH_AS(_ = json::parse("\"\\uD800\\uE000\""), "[json.exception.parse_error.101] parse error at line 1, column 13: syntax error while parsing value - invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD800\\uE000'", json::parse_error&);
+            }
+        }
+
+#if 0 // NOLINT(readability-avoid-unconditional-preprocessor-if)
+        SECTION("incorrect sequences")
+        {
+            SECTION("high surrogate without low surrogate")
+            {
+                // D800..DBFF are high surrogates and must be followed by low
+                // surrogates DC00..DFFF; here, nothing follows
+                for (std::size_t cp = 0xD800u; cp <= 0xDBFFu; ++cp)
+                {
+                    std::string json_text = "\"" + codepoint_to_unicode(cp) + "\"";
+                    CAPTURE(json_text)
+                    CHECK_THROWS_AS(json::parse(json_text), json::parse_error&);
+                }
+            }
+
+            SECTION("high surrogate with wrong low surrogate")
+            {
+                // D800..DBFF are high surrogates and must be followed by low
+                // surrogates DC00..DFFF; here a different sequence follows
+                for (std::size_t cp1 = 0xD800u; cp1 <= 0xDBFFu; ++cp1)
+                {
+                    for (std::size_t cp2 = 0x0000u; cp2 <= 0xFFFFu; ++cp2)
+                    {
+                        if (0xDC00u <= cp2 && cp2 <= 0xDFFFu)
+                        {
+                            continue;
+                        }
+
+                        std::string json_text = "\"" + codepoint_to_unicode(cp1) + codepoint_to_unicode(cp2) + "\"";
+                        CAPTURE(json_text)
+                        CHECK_THROWS_AS(json::parse(json_text), json::parse_error&);
+                    }
+                }
+            }
+
+            SECTION("low surrogate without high surrogate")
+            {
+                // low surrogates DC00..DFFF must follow high surrogates; here,
+                // they occur alone
+                for (std::size_t cp = 0xDC00u; cp <= 0xDFFFu; ++cp)
+                {
+                    std::string json_text = "\"" + codepoint_to_unicode(cp) + "\"";
+                    CAPTURE(json_text)
+                    CHECK_THROWS_AS(json::parse(json_text), json::parse_error&);
+                }
+            }
+
+        }
+#endif
+    }
+
+    SECTION("read all unicode characters")
+    {
+        // read a file with all unicode characters stored as single-character
+        // strings in a JSON array
+        std::ifstream f(TEST_DATA_DIRECTORY "/json_nlohmann_tests/all_unicode.json");
+        json j;
+        CHECK_NOTHROW(f >> j);
+
+        // the array has 1112064 + 1 elements (a terminating "null" value)
+        // Note: 1112064 = 0x1FFFFF code points - 2048 invalid values between
+        // 0xD800 and 0xDFFF.
+        CHECK(j.size() == 1112065);
+
+        SECTION("check JSON Pointers")
+        {
+            for (const auto& s : j)
+            {
+                // skip non-string JSON values
+                if (!s.is_string())
+                {
+                    continue;
+                }
+
+                auto ptr = s.get<std::string>();
+
+                // tilde must be followed by 0 or 1
+                if (ptr == "~")
+                {
+                    ptr += "0";
+                }
+
+                // JSON Pointers must begin with "/"
+                ptr.insert(0, "/");
+
+                CHECK_NOTHROW(json::json_pointer("/" + ptr));
+
+                // check escape/unescape roundtrip
+                auto escaped = nlohmann::detail::escape(ptr);
+                nlohmann::detail::unescape(escaped);
+                CHECK(escaped == ptr);
+            }
+        }
+    }
+
+    SECTION("ignore byte-order-mark")
+    {
+        SECTION("in a stream")
+        {
+            // read a file with a UTF-8 BOM
+            std::ifstream f(TEST_DATA_DIRECTORY "/json_nlohmann_tests/bom.json");
+            json j;
+            CHECK_NOTHROW(f >> j);
+        }
+
+        SECTION("with an iterator")
+        {
+            std::string i = "\xef\xbb\xbf{\n   \"foo\": true\n}";
+            json _;
+            CHECK_NOTHROW(_ = json::parse(i.begin(), i.end()));
+        }
+    }
+
+    SECTION("error for incomplete/wrong BOM")
+    {
+        json _;
+        CHECK_THROWS_AS(_ = json::parse("\xef\xbb"), json::parse_error&);
+        CHECK_THROWS_AS(_ = json::parse("\xef\xbb\xbb"), json::parse_error&);
+    }
+}
+
+namespace
+{
+void roundtrip(bool success_expected, const std::string& s);
+
+void roundtrip(bool success_expected, const std::string& s)
+{
+    CAPTURE(s)
+    json _;
+
+    // create JSON string value
+    const json j = s;
+    // create JSON text
+    const std::string ps = std::string("\"") + s + "\"";
+
+    if (success_expected)
+    {
+        // serialization succeeds
+        CHECK_NOTHROW(j.dump());
+
+        // exclude parse test for U+0000
+        if (s[0] != '\0')
+        {
+            // parsing JSON text succeeds
+            CHECK_NOTHROW(_ = json::parse(ps));
+        }
+
+        // roundtrip succeeds
+        CHECK_NOTHROW(_ = json::parse(j.dump()));
+
+        // after roundtrip, the same string is stored
+        const json jr = json::parse(j.dump());
+        CHECK(jr.get<std::string>() == s);
+    }
+    else
+    {
+        // serialization fails
+        CHECK_THROWS_AS(j.dump(), json::type_error&);
+
+        // parsing JSON text fails
+        CHECK_THROWS_AS(_ = json::parse(ps), json::parse_error&);
+    }
+}
+} // namespace
+
+TEST_CASE("Markus Kuhn's UTF-8 decoder capability and stress test")
+{
+    // Markus Kuhn <http://www.cl.cam.ac.uk/~mgk25/> - 2015-08-28 - CC BY 4.0
+    // http://www.cl.cam.ac.uk/~mgk25/ucs/examples/UTF-8-test.txt
+
+    SECTION("1  Some correct UTF-8 text")
+    {
+        roundtrip(true, "κόσμε");
+    }
+
+    SECTION("2  Boundary condition test cases")
+    {
+        SECTION("2.1  First possible sequence of a certain length")
+        {
+            // 2.1.1  1 byte  (U-00000000)
+            roundtrip(true, std::string("\0", 1));
+            // 2.1.2  2 bytes (U-00000080)
+            roundtrip(true, "\xc2\x80");
+            // 2.1.3  3 bytes (U-00000800)
+            roundtrip(true, "\xe0\xa0\x80");
+            // 2.1.4  4 bytes (U-00010000)
+            roundtrip(true, "\xf0\x90\x80\x80");
+
+            // 2.1.5  5 bytes (U-00200000)
+            roundtrip(false, "\xF8\x88\x80\x80\x80");
+            // 2.1.6  6 bytes (U-04000000)
+            roundtrip(false, "\xFC\x84\x80\x80\x80\x80");
+        }
+
+        SECTION("2.2  Last possible sequence of a certain length")
+        {
+            // 2.2.1  1 byte  (U-0000007F)
+            roundtrip(true, "\x7f");
+            // 2.2.2  2 bytes (U-000007FF)
+            roundtrip(true, "\xdf\xbf");
+            // 2.2.3  3 bytes (U-0000FFFF)
+            roundtrip(true, "\xef\xbf\xbf");
+
+            // 2.2.4  4 bytes (U-001FFFFF)
+            roundtrip(false, "\xF7\xBF\xBF\xBF");
+            // 2.2.5  5 bytes (U-03FFFFFF)
+            roundtrip(false, "\xFB\xBF\xBF\xBF\xBF");
+            // 2.2.6  6 bytes (U-7FFFFFFF)
+            roundtrip(false, "\xFD\xBF\xBF\xBF\xBF\xBF");
+        }
+
+        SECTION("2.3  Other boundary conditions")
+        {
+            // 2.3.1  U-0000D7FF = ed 9f bf
+            roundtrip(true, "\xed\x9f\xbf");
+            // 2.3.2  U-0000E000 = ee 80 80
+            roundtrip(true, "\xee\x80\x80");
+            // 2.3.3  U-0000FFFD = ef bf bd
+            roundtrip(true, "\xef\xbf\xbd");
+            // 2.3.4  U-0010FFFF = f4 8f bf bf
+            roundtrip(true, "\xf4\x8f\xbf\xbf");
+
+            // 2.3.5  U-00110000 = f4 90 80 80
+            roundtrip(false, "\xf4\x90\x80\x80");
+        }
+    }
+
+    SECTION("3  Malformed sequences")
+    {
+        SECTION("3.1  Unexpected continuation bytes")
+        {
+            // Each unexpected continuation byte should be separately signalled as a
+            // malformed sequence of its own.
+
+            // 3.1.1  First continuation byte 0x80
+            roundtrip(false, "\x80");
+            // 3.1.2  Last  continuation byte 0xbf
+            roundtrip(false, "\xbf");
+
+            // 3.1.3  2 continuation bytes
+            roundtrip(false, "\x80\xbf");
+            // 3.1.4  3 continuation bytes
+            roundtrip(false, "\x80\xbf\x80");
+            // 3.1.5  4 continuation bytes
+            roundtrip(false, "\x80\xbf\x80\xbf");
+            // 3.1.6  5 continuation bytes
+            roundtrip(false, "\x80\xbf\x80\xbf\x80");
+            // 3.1.7  6 continuation bytes
+            roundtrip(false, "\x80\xbf\x80\xbf\x80\xbf");
+            // 3.1.8  7 continuation bytes
+            roundtrip(false, "\x80\xbf\x80\xbf\x80\xbf\x80");
+
+            // 3.1.9  Sequence of all 64 possible continuation bytes (0x80-0xbf)
+            roundtrip(false, "\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf");
+        }
+
+        SECTION("3.2  Lonely start characters")
+        {
+            // 3.2.1  All 32 first bytes of 2-byte sequences (0xc0-0xdf)
+            roundtrip(false, "\xc0 \xc1 \xc2 \xc3 \xc4 \xc5 \xc6 \xc7 \xc8 \xc9 \xca \xcb \xcc \xcd \xce \xcf \xd0 \xd1 \xd2 \xd3 \xd4 \xd5 \xd6 \xd7 \xd8 \xd9 \xda \xdb \xdc \xdd \xde \xdf");
+            // 3.2.2  All 16 first bytes of 3-byte sequences (0xe0-0xef)
+            roundtrip(false, "\xe0 \xe1 \xe2 \xe3 \xe4 \xe5 \xe6 \xe7 \xe8 \xe9 \xea \xeb \xec \xed \xee \xef");
+            // 3.2.3  All 8 first bytes of 4-byte sequences (0xf0-0xf7)
+            roundtrip(false, "\xf0 \xf1 \xf2 \xf3 \xf4 \xf5 \xf6 \xf7");
+            // 3.2.4  All 4 first bytes of 5-byte sequences (0xf8-0xfb)
+            roundtrip(false, "\xf8 \xf9 \xfa \xfb");
+            // 3.2.5  All 2 first bytes of 6-byte sequences (0xfc-0xfd)
+            roundtrip(false, "\xfc \xfd");
+        }
+
+        SECTION("3.3  Sequences with last continuation byte missing")
+        {
+            // All bytes of an incomplete sequence should be signalled as a single
+            // malformed sequence, i.e., you should see only a single replacement
+            // character in each of the next 10 tests. (Characters as in section 2)
+
+            // 3.3.1  2-byte sequence with last byte missing (U+0000)
+            roundtrip(false, "\xc0");
+            // 3.3.2  3-byte sequence with last byte missing (U+0000)
+            roundtrip(false, "\xe0\x80");
+            // 3.3.3  4-byte sequence with last byte missing (U+0000)
+            roundtrip(false, "\xf0\x80\x80");
+            // 3.3.4  5-byte sequence with last byte missing (U+0000)
+            roundtrip(false, "\xf8\x80\x80\x80");
+            // 3.3.5  6-byte sequence with last byte missing (U+0000)
+            roundtrip(false, "\xfc\x80\x80\x80\x80");
+            // 3.3.6  2-byte sequence with last byte missing (U-000007FF)
+            roundtrip(false, "\xdf");
+            // 3.3.7  3-byte sequence with last byte missing (U-0000FFFF)
+            roundtrip(false, "\xef\xbf");
+            // 3.3.8  4-byte sequence with last byte missing (U-001FFFFF)
+            roundtrip(false, "\xf7\xbf\xbf");
+            // 3.3.9  5-byte sequence with last byte missing (U-03FFFFFF)
+            roundtrip(false, "\xfb\xbf\xbf\xbf");
+            // 3.3.10 6-byte sequence with last byte missing (U-7FFFFFFF)
+            roundtrip(false, "\xfd\xbf\xbf\xbf\xbf");
+        }
+
+        SECTION("3.4  Concatenation of incomplete sequences")
+        {
+            // All the 10 sequences of 3.3 concatenated, you should see 10 malformed
+            // sequences being signalled:
+            roundtrip(false, "\xc0\xe0\x80\xf0\x80\x80\xf8\x80\x80\x80\xfc\x80\x80\x80\x80\xdf\xef\xbf\xf7\xbf\xbf\xfb\xbf\xbf\xbf\xfd\xbf\xbf\xbf\xbf");
+        }
+
+        SECTION("3.5  Impossible bytes")
+        {
+            // The following two bytes cannot appear in a correct UTF-8 string
+
+            // 3.5.1  fe
+            roundtrip(false, "\xfe");
+            // 3.5.2  ff
+            roundtrip(false, "\xff");
+            // 3.5.3  fe fe ff ff
+            roundtrip(false, "\xfe\xfe\xff\xff");
+        }
+    }
+
+    SECTION("4  Overlong sequences")
+    {
+        // The following sequences are not malformed according to the letter of
+        // the Unicode 2.0 standard. However, they are longer then necessary and
+        // a correct UTF-8 encoder is not allowed to produce them. A "safe UTF-8
+        // decoder" should reject them just like malformed sequences for two
+        // reasons: (1) It helps to debug applications if overlong sequences are
+        // not treated as valid representations of characters, because this helps
+        // to spot problems more quickly. (2) Overlong sequences provide
+        // alternative representations of characters, that could maliciously be
+        // used to bypass filters that check only for ASCII characters. For
+        // instance, a 2-byte encoded line feed (LF) would not be caught by a
+        // line counter that counts only 0x0a bytes, but it would still be
+        // processed as a line feed by an unsafe UTF-8 decoder later in the
+        // pipeline. From a security point of view, ASCII compatibility of UTF-8
+        // sequences means also, that ASCII characters are *only* allowed to be
+        // represented by ASCII bytes in the range 0x00-0x7f. To ensure this
+        // aspect of ASCII compatibility, use only "safe UTF-8 decoders" that
+        // reject overlong UTF-8 sequences for which a shorter encoding exists.
+
+        SECTION("4.1  Examples of an overlong ASCII character")
+        {
+            // With a safe UTF-8 decoder, all the following five overlong
+            // representations of the ASCII character slash ("/") should be rejected
+            // like a malformed UTF-8 sequence, for instance by substituting it with
+            // a replacement character. If you see a slash below, you do not have a
+            // safe UTF-8 decoder!
+
+            // 4.1.1 U+002F = c0 af
+            roundtrip(false, "\xc0\xaf");
+            // 4.1.2 U+002F = e0 80 af
+            roundtrip(false, "\xe0\x80\xaf");
+            // 4.1.3 U+002F = f0 80 80 af
+            roundtrip(false, "\xf0\x80\x80\xaf");
+            // 4.1.4 U+002F = f8 80 80 80 af
+            roundtrip(false, "\xf8\x80\x80\x80\xaf");
+            // 4.1.5 U+002F = fc 80 80 80 80 af
+            roundtrip(false, "\xfc\x80\x80\x80\x80\xaf");
+        }
+
+        SECTION("4.2  Maximum overlong sequences")
+        {
+            // Below you see the highest Unicode value that is still resulting in an
+            // overlong sequence if represented with the given number of bytes. This
+            // is a boundary test for safe UTF-8 decoders. All five characters should
+            // be rejected like malformed UTF-8 sequences.
+
+            // 4.2.1  U-0000007F = c1 bf
+            roundtrip(false, "\xc1\xbf");
+            // 4.2.2  U-000007FF = e0 9f bf
+            roundtrip(false, "\xe0\x9f\xbf");
+            // 4.2.3  U-0000FFFF = f0 8f bf bf
+            roundtrip(false, "\xf0\x8f\xbf\xbf");
+            // 4.2.4  U-001FFFFF = f8 87 bf bf bf
+            roundtrip(false, "\xf8\x87\xbf\xbf\xbf");
+            // 4.2.5  U-03FFFFFF = fc 83 bf bf bf bf
+            roundtrip(false, "\xfc\x83\xbf\xbf\xbf\xbf");
+        }
+
+        SECTION("4.3  Overlong representation of the NUL character")
+        {
+            // The following five sequences should also be rejected like malformed
+            // UTF-8 sequences and should not be treated like the ASCII NUL
+            // character.
+
+            // 4.3.1  U+0000 = c0 80
+            roundtrip(false, "\xc0\x80");
+            // 4.3.2  U+0000 = e0 80 80
+            roundtrip(false, "\xe0\x80\x80");
+            // 4.3.3  U+0000 = f0 80 80 80
+            roundtrip(false, "\xf0\x80\x80\x80");
+            // 4.3.4  U+0000 = f8 80 80 80 80
+            roundtrip(false, "\xf8\x80\x80\x80\x80");
+            // 4.3.5  U+0000 = fc 80 80 80 80 80
+            roundtrip(false, "\xfc\x80\x80\x80\x80\x80");
+        }
+    }
+
+    SECTION("5  Illegal code positions")
+    {
+        // The following UTF-8 sequences should be rejected like malformed
+        // sequences, because they never represent valid ISO 10646 characters and
+        // a UTF-8 decoder that accepts them might introduce security problems
+        // comparable to overlong UTF-8 sequences.
+
+        SECTION("5.1 Single UTF-16 surrogates")
+        {
+            // 5.1.1  U+D800 = ed a0 80
+            roundtrip(false, "\xed\xa0\x80");
+            // 5.1.2  U+DB7F = ed ad bf
+            roundtrip(false, "\xed\xad\xbf");
+            // 5.1.3  U+DB80 = ed ae 80
+            roundtrip(false, "\xed\xae\x80");
+            // 5.1.4  U+DBFF = ed af bf
+            roundtrip(false, "\xed\xaf\xbf");
+            // 5.1.5  U+DC00 = ed b0 80
+            roundtrip(false, "\xed\xb0\x80");
+            // 5.1.6  U+DF80 = ed be 80
+            roundtrip(false, "\xed\xbe\x80");
+            // 5.1.7  U+DFFF = ed bf bf
+            roundtrip(false, "\xed\xbf\xbf");
+        }
+
+        SECTION("5.2 Paired UTF-16 surrogates")
+        {
+            // 5.2.1  U+D800 U+DC00 = ed a0 80 ed b0 80
+            roundtrip(false, "\xed\xa0\x80\xed\xb0\x80");
+            // 5.2.2  U+D800 U+DFFF = ed a0 80 ed bf bf
+            roundtrip(false, "\xed\xa0\x80\xed\xbf\xbf");
+            // 5.2.3  U+DB7F U+DC00 = ed ad bf ed b0 80
+            roundtrip(false, "\xed\xad\xbf\xed\xb0\x80");
+            // 5.2.4  U+DB7F U+DFFF = ed ad bf ed bf bf
+            roundtrip(false, "\xed\xad\xbf\xed\xbf\xbf");
+            // 5.2.5  U+DB80 U+DC00 = ed ae 80 ed b0 80
+            roundtrip(false, "\xed\xae\x80\xed\xb0\x80");
+            // 5.2.6  U+DB80 U+DFFF = ed ae 80 ed bf bf
+            roundtrip(false, "\xed\xae\x80\xed\xbf\xbf");
+            // 5.2.7  U+DBFF U+DC00 = ed af bf ed b0 80
+            roundtrip(false, "\xed\xaf\xbf\xed\xb0\x80");
+            // 5.2.8  U+DBFF U+DFFF = ed af bf ed bf bf
+            roundtrip(false, "\xed\xaf\xbf\xed\xbf\xbf");
+        }
+
+        SECTION("5.3 Noncharacter code positions")
+        {
+            // The following "noncharacters" are "reserved for internal use" by
+            // applications, and according to older versions of the Unicode Standard
+            // "should never be interchanged". Unicode Corrigendum #9 dropped the
+            // latter restriction. Nevertheless, their presence in incoming UTF-8 data
+            // can remain a potential security risk, depending on what use is made of
+            // these codes subsequently. Examples of such internal use:
+            //
+            //  - Some file APIs with 16-bit characters may use the integer value -1
+            //    = U+FFFF to signal an end-of-file (EOF) or error condition.
+            //
+            //  - In some UTF-16 receivers, code point U+FFFE might trigger a
+            //    byte-swap operation (to convert between UTF-16LE and UTF-16BE).
+            //
+            // With such internal use of noncharacters, it may be desirable and safer
+            // to block those code points in UTF-8 decoders, as they should never
+            // occur legitimately in incoming UTF-8 data, and could trigger unsafe
+            // behaviour in subsequent processing.
+
+            // Particularly problematic noncharacters in 16-bit applications:
+
+            // 5.3.1  U+FFFE = ef bf be
+            roundtrip(true, "\xef\xbf\xbe");
+            // 5.3.2  U+FFFF = ef bf bf
+            roundtrip(true, "\xef\xbf\xbf");
+
+            // 5.3.3  U+FDD0 .. U+FDEF
+            roundtrip(true, "\xEF\xB7\x90");
+            roundtrip(true, "\xEF\xB7\x91");
+            roundtrip(true, "\xEF\xB7\x92");
+            roundtrip(true, "\xEF\xB7\x93");
+            roundtrip(true, "\xEF\xB7\x94");
+            roundtrip(true, "\xEF\xB7\x95");
+            roundtrip(true, "\xEF\xB7\x96");
+            roundtrip(true, "\xEF\xB7\x97");
+            roundtrip(true, "\xEF\xB7\x98");
+            roundtrip(true, "\xEF\xB7\x99");
+            roundtrip(true, "\xEF\xB7\x9A");
+            roundtrip(true, "\xEF\xB7\x9B");
+            roundtrip(true, "\xEF\xB7\x9C");
+            roundtrip(true, "\xEF\xB7\x9D");
+            roundtrip(true, "\xEF\xB7\x9E");
+            roundtrip(true, "\xEF\xB7\x9F");
+            roundtrip(true, "\xEF\xB7\xA0");
+            roundtrip(true, "\xEF\xB7\xA1");
+            roundtrip(true, "\xEF\xB7\xA2");
+            roundtrip(true, "\xEF\xB7\xA3");
+            roundtrip(true, "\xEF\xB7\xA4");
+            roundtrip(true, "\xEF\xB7\xA5");
+            roundtrip(true, "\xEF\xB7\xA6");
+            roundtrip(true, "\xEF\xB7\xA7");
+            roundtrip(true, "\xEF\xB7\xA8");
+            roundtrip(true, "\xEF\xB7\xA9");
+            roundtrip(true, "\xEF\xB7\xAA");
+            roundtrip(true, "\xEF\xB7\xAB");
+            roundtrip(true, "\xEF\xB7\xAC");
+            roundtrip(true, "\xEF\xB7\xAD");
+            roundtrip(true, "\xEF\xB7\xAE");
+            roundtrip(true, "\xEF\xB7\xAF");
+
+            // 5.3.4  U+nFFFE U+nFFFF (for n = 1..10)
+            roundtrip(true, "\xF0\x9F\xBF\xBF");
+            roundtrip(true, "\xF0\xAF\xBF\xBF");
+            roundtrip(true, "\xF0\xBF\xBF\xBF");
+            roundtrip(true, "\xF1\x8F\xBF\xBF");
+            roundtrip(true, "\xF1\x9F\xBF\xBF");
+            roundtrip(true, "\xF1\xAF\xBF\xBF");
+            roundtrip(true, "\xF1\xBF\xBF\xBF");
+            roundtrip(true, "\xF2\x8F\xBF\xBF");
+            roundtrip(true, "\xF2\x9F\xBF\xBF");
+            roundtrip(true, "\xF2\xAF\xBF\xBF");
+        }
+    }
+}
diff --git a/external_imported/json/tests/src/unit-unicode2.cpp b/external_imported/json/tests/src/unit-unicode2.cpp
new file mode 100644
index 000000000..ebc29db52
--- /dev/null
+++ b/external_imported/json/tests/src/unit-unicode2.cpp
@@ -0,0 +1,610 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+// for some reason including this after the json header leads to linker errors with VS 2017...
+#include <locale>
+
+#include <nlohmann/json.hpp>
+using nlohmann::json;
+
+#include <fstream>
+#include <sstream>
+#include <iostream>
+#include <iomanip>
+#include "make_test_data_available.hpp"
+
+// this test suite uses static variables with non-trivial destructors
+DOCTEST_CLANG_SUPPRESS_WARNING_PUSH
+DOCTEST_CLANG_SUPPRESS_WARNING("-Wexit-time-destructors")
+
+namespace
+{
+extern size_t calls;
+size_t calls = 0;
+
+void check_utf8dump(bool success_expected, int byte1, int byte2, int byte3, int byte4);
+
+void check_utf8dump(bool success_expected, int byte1, int byte2 = -1, int byte3 = -1, int byte4 = -1)
+{
+    static std::string json_string;
+    json_string.clear();
+
+    CAPTURE(byte1)
+    CAPTURE(byte2)
+    CAPTURE(byte3)
+    CAPTURE(byte4)
+
+    json_string += std::string(1, static_cast<char>(byte1));
+
+    if (byte2 != -1)
+    {
+        json_string += std::string(1, static_cast<char>(byte2));
+    }
+
+    if (byte3 != -1)
+    {
+        json_string += std::string(1, static_cast<char>(byte3));
+    }
+
+    if (byte4 != -1)
+    {
+        json_string += std::string(1, static_cast<char>(byte4));
+    }
+
+    CAPTURE(json_string)
+
+    // store the string in a JSON value
+    static json j;
+    static json j2;
+    j = json_string;
+    j2 = "abc" + json_string + "xyz";
+
+    static std::string s_ignored;
+    static std::string s_ignored2;
+    static std::string s_ignored_ascii;
+    static std::string s_ignored2_ascii;
+    static std::string s_replaced;
+    static std::string s_replaced2;
+    static std::string s_replaced_ascii;
+    static std::string s_replaced2_ascii;
+
+    // dumping with ignore/replace must not throw in any case
+    s_ignored = j.dump(-1, ' ', false, json::error_handler_t::ignore);
+    s_ignored2 = j2.dump(-1, ' ', false, json::error_handler_t::ignore);
+    s_ignored_ascii = j.dump(-1, ' ', true, json::error_handler_t::ignore);
+    s_ignored2_ascii = j2.dump(-1, ' ', true, json::error_handler_t::ignore);
+    s_replaced = j.dump(-1, ' ', false, json::error_handler_t::replace);
+    s_replaced2 = j2.dump(-1, ' ', false, json::error_handler_t::replace);
+    s_replaced_ascii = j.dump(-1, ' ', true, json::error_handler_t::replace);
+    s_replaced2_ascii = j2.dump(-1, ' ', true, json::error_handler_t::replace);
+
+    if (success_expected)
+    {
+        static std::string s_strict;
+        // strict mode must not throw if success is expected
+        s_strict = j.dump();
+        // all dumps should agree on the string
+        CHECK(s_strict == s_ignored);
+        CHECK(s_strict == s_replaced);
+    }
+    else
+    {
+        // strict mode must throw if success is not expected
+        CHECK_THROWS_AS(j.dump(), json::type_error&);
+        // ignore and replace must create different dumps
+        CHECK(s_ignored != s_replaced);
+
+        // check that replace string contains a replacement character
+        CHECK(s_replaced.find("\xEF\xBF\xBD") != std::string::npos);
+    }
+
+    // check that prefix and suffix are preserved
+    CHECK(s_ignored2.substr(1, 3) == "abc");
+    CHECK(s_ignored2.substr(s_ignored2.size() - 4, 3) == "xyz");
+    CHECK(s_ignored2_ascii.substr(1, 3) == "abc");
+    CHECK(s_ignored2_ascii.substr(s_ignored2_ascii.size() - 4, 3) == "xyz");
+    CHECK(s_replaced2.substr(1, 3) == "abc");
+    CHECK(s_replaced2.substr(s_replaced2.size() - 4, 3) == "xyz");
+    CHECK(s_replaced2_ascii.substr(1, 3) == "abc");
+    CHECK(s_replaced2_ascii.substr(s_replaced2_ascii.size() - 4, 3) == "xyz");
+}
+
+void check_utf8string(bool success_expected, int byte1, int byte2, int byte3, int byte4);
+
+// create and check a JSON string with up to four UTF-8 bytes
+void check_utf8string(bool success_expected, int byte1, int byte2 = -1, int byte3 = -1, int byte4 = -1)
+{
+    if (++calls % 100000 == 0)
+    {
+        std::cout << calls << " of 455355 UTF-8 strings checked" << std::endl; // NOLINT(performance-avoid-endl)
+    }
+
+    static std::string json_string;
+    json_string = "\"";
+
+    CAPTURE(byte1)
+    json_string += std::string(1, static_cast<char>(byte1));
+
+    if (byte2 != -1)
+    {
+        CAPTURE(byte2)
+        json_string += std::string(1, static_cast<char>(byte2));
+    }
+
+    if (byte3 != -1)
+    {
+        CAPTURE(byte3)
+        json_string += std::string(1, static_cast<char>(byte3));
+    }
+
+    if (byte4 != -1)
+    {
+        CAPTURE(byte4)
+        json_string += std::string(1, static_cast<char>(byte4));
+    }
+
+    json_string += "\"";
+
+    CAPTURE(json_string)
+
+    json _;
+    if (success_expected)
+    {
+        CHECK_NOTHROW(_ = json::parse(json_string));
+    }
+    else
+    {
+        CHECK_THROWS_AS(_ = json::parse(json_string), json::parse_error&);
+    }
+}
+} // namespace
+
+TEST_CASE("Unicode (2/5)" * doctest::skip())
+{
+    SECTION("RFC 3629")
+    {
+        /*
+        RFC 3629 describes in Sect. 4 the syntax of UTF-8 byte sequences as
+        follows:
+
+            A UTF-8 string is a sequence of octets representing a sequence of UCS
+            characters.  An octet sequence is valid UTF-8 only if it matches the
+            following syntax, which is derived from the rules for encoding UTF-8
+            and is expressed in the ABNF of [RFC2234].
+
+            UTF8-octets = *( UTF8-char )
+            UTF8-char   = UTF8-1 / UTF8-2 / UTF8-3 / UTF8-4
+            UTF8-1      = %x00-7F
+            UTF8-2      = %xC2-DF UTF8-tail
+            UTF8-3      = %xE0 %xA0-BF UTF8-tail / %xE1-EC 2( UTF8-tail ) /
+                          %xED %x80-9F UTF8-tail / %xEE-EF 2( UTF8-tail )
+            UTF8-4      = %xF0 %x90-BF 2( UTF8-tail ) / %xF1-F3 3( UTF8-tail ) /
+                          %xF4 %x80-8F 2( UTF8-tail )
+            UTF8-tail   = %x80-BF
+        */
+
+        SECTION("ill-formed first byte")
+        {
+            for (int byte1 = 0x80; byte1 <= 0xC1; ++byte1)
+            {
+                check_utf8string(false, byte1);
+                check_utf8dump(false, byte1);
+            }
+
+            for (int byte1 = 0xF5; byte1 <= 0xFF; ++byte1)
+            {
+                check_utf8string(false, byte1);
+                check_utf8dump(false, byte1);
+            }
+        }
+
+        SECTION("UTF8-1 (x00-x7F)")
+        {
+            SECTION("well-formed")
+            {
+                for (int byte1 = 0x00; byte1 <= 0x7F; ++byte1)
+                {
+                    // unescaped control characters are parse errors in JSON
+                    if (0x00 <= byte1 && byte1 <= 0x1F)
+                    {
+                        check_utf8string(false, byte1);
+                        continue;
+                    }
+
+                    // a single quote is a parse error in JSON
+                    if (byte1 == 0x22)
+                    {
+                        check_utf8string(false, byte1);
+                        continue;
+                    }
+
+                    // a single backslash is a parse error in JSON
+                    if (byte1 == 0x5C)
+                    {
+                        check_utf8string(false, byte1);
+                        continue;
+                    }
+
+                    // all other characters are OK
+                    check_utf8string(true, byte1);
+                    check_utf8dump(true, byte1);
+                }
+            }
+        }
+
+        SECTION("UTF8-2 (xC2-xDF UTF8-tail)")
+        {
+            SECTION("well-formed")
+            {
+                for (int byte1 = 0xC2; byte1 <= 0xDF; ++byte1)
+                {
+                    for (int byte2 = 0x80; byte2 <= 0xBF; ++byte2)
+                    {
+                        check_utf8string(true, byte1, byte2);
+                        check_utf8dump(true, byte1, byte2);
+                    }
+                }
+            }
+
+            SECTION("ill-formed: missing second byte")
+            {
+                for (int byte1 = 0xC2; byte1 <= 0xDF; ++byte1)
+                {
+                    check_utf8string(false, byte1);
+                    check_utf8dump(false, byte1);
+                }
+            }
+
+            SECTION("ill-formed: wrong second byte")
+            {
+                for (int byte1 = 0xC2; byte1 <= 0xDF; ++byte1)
+                {
+                    for (int byte2 = 0x00; byte2 <= 0xFF; ++byte2)
+                    {
+                        // skip correct second byte
+                        if (0x80 <= byte2 && byte2 <= 0xBF)
+                        {
+                            continue;
+                        }
+
+                        check_utf8string(false, byte1, byte2);
+                        check_utf8dump(false, byte1, byte2);
+                    }
+                }
+            }
+        }
+
+        SECTION("UTF8-3 (xE0 xA0-BF UTF8-tail)")
+        {
+            SECTION("well-formed")
+            {
+                for (int byte1 = 0xE0; byte1 <= 0xE0; ++byte1)
+                {
+                    for (int byte2 = 0xA0; byte2 <= 0xBF; ++byte2)
+                    {
+                        for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3)
+                        {
+                            check_utf8string(true, byte1, byte2, byte3);
+                            check_utf8dump(true, byte1, byte2, byte3);
+                        }
+                    }
+                }
+            }
+
+            SECTION("ill-formed: missing second byte")
+            {
+                for (int byte1 = 0xE0; byte1 <= 0xE0; ++byte1)
+                {
+                    check_utf8string(false, byte1);
+                    check_utf8dump(false, byte1);
+                }
+            }
+
+            SECTION("ill-formed: missing third byte")
+            {
+                for (int byte1 = 0xE0; byte1 <= 0xE0; ++byte1)
+                {
+                    for (int byte2 = 0xA0; byte2 <= 0xBF; ++byte2)
+                    {
+                        check_utf8string(false, byte1, byte2);
+                        check_utf8dump(false, byte1, byte2);
+                    }
+                }
+            }
+
+            SECTION("ill-formed: wrong second byte")
+            {
+                for (int byte1 = 0xE0; byte1 <= 0xE0; ++byte1)
+                {
+                    for (int byte2 = 0x00; byte2 <= 0xFF; ++byte2)
+                    {
+                        // skip correct second byte
+                        if (0xA0 <= byte2 && byte2 <= 0xBF)
+                        {
+                            continue;
+                        }
+
+                        for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3)
+                        {
+                            check_utf8string(false, byte1, byte2, byte3);
+                            check_utf8dump(false, byte1, byte2, byte3);
+                        }
+                    }
+                }
+            }
+
+            SECTION("ill-formed: wrong third byte")
+            {
+                for (int byte1 = 0xE0; byte1 <= 0xE0; ++byte1)
+                {
+                    for (int byte2 = 0xA0; byte2 <= 0xBF; ++byte2)
+                    {
+                        for (int byte3 = 0x00; byte3 <= 0xFF; ++byte3)
+                        {
+                            // skip correct third byte
+                            if (0x80 <= byte3 && byte3 <= 0xBF)
+                            {
+                                continue;
+                            }
+
+                            check_utf8string(false, byte1, byte2, byte3);
+                            check_utf8dump(false, byte1, byte2, byte3);
+                        }
+                    }
+                }
+            }
+        }
+
+        SECTION("UTF8-3 (xE1-xEC UTF8-tail UTF8-tail)")
+        {
+            SECTION("well-formed")
+            {
+                for (int byte1 = 0xE1; byte1 <= 0xEC; ++byte1)
+                {
+                    for (int byte2 = 0x80; byte2 <= 0xBF; ++byte2)
+                    {
+                        for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3)
+                        {
+                            check_utf8string(true, byte1, byte2, byte3);
+                            check_utf8dump(true, byte1, byte2, byte3);
+                        }
+                    }
+                }
+            }
+
+            SECTION("ill-formed: missing second byte")
+            {
+                for (int byte1 = 0xE1; byte1 <= 0xEC; ++byte1)
+                {
+                    check_utf8string(false, byte1);
+                    check_utf8dump(false, byte1);
+                }
+            }
+
+            SECTION("ill-formed: missing third byte")
+            {
+                for (int byte1 = 0xE1; byte1 <= 0xEC; ++byte1)
+                {
+                    for (int byte2 = 0x80; byte2 <= 0xBF; ++byte2)
+                    {
+                        check_utf8string(false, byte1, byte2);
+                        check_utf8dump(false, byte1, byte2);
+                    }
+                }
+            }
+
+            SECTION("ill-formed: wrong second byte")
+            {
+                for (int byte1 = 0xE1; byte1 <= 0xEC; ++byte1)
+                {
+                    for (int byte2 = 0x00; byte2 <= 0xFF; ++byte2)
+                    {
+                        // skip correct second byte
+                        if (0x80 <= byte2 && byte2 <= 0xBF)
+                        {
+                            continue;
+                        }
+
+                        for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3)
+                        {
+                            check_utf8string(false, byte1, byte2, byte3);
+                            check_utf8dump(false, byte1, byte2, byte3);
+                        }
+                    }
+                }
+            }
+
+            SECTION("ill-formed: wrong third byte")
+            {
+                for (int byte1 = 0xE1; byte1 <= 0xEC; ++byte1)
+                {
+                    for (int byte2 = 0x80; byte2 <= 0xBF; ++byte2)
+                    {
+                        for (int byte3 = 0x00; byte3 <= 0xFF; ++byte3)
+                        {
+                            // skip correct third byte
+                            if (0x80 <= byte3 && byte3 <= 0xBF)
+                            {
+                                continue;
+                            }
+
+                            check_utf8string(false, byte1, byte2, byte3);
+                            check_utf8dump(false, byte1, byte2, byte3);
+                        }
+                    }
+                }
+            }
+        }
+
+        SECTION("UTF8-3 (xED x80-9F UTF8-tail)")
+        {
+            SECTION("well-formed")
+            {
+                for (int byte1 = 0xED; byte1 <= 0xED; ++byte1)
+                {
+                    for (int byte2 = 0x80; byte2 <= 0x9F; ++byte2)
+                    {
+                        for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3)
+                        {
+                            check_utf8string(true, byte1, byte2, byte3);
+                            check_utf8dump(true, byte1, byte2, byte3);
+                        }
+                    }
+                }
+            }
+
+            SECTION("ill-formed: missing second byte")
+            {
+                for (int byte1 = 0xED; byte1 <= 0xED; ++byte1)
+                {
+                    check_utf8string(false, byte1);
+                    check_utf8dump(false, byte1);
+                }
+            }
+
+            SECTION("ill-formed: missing third byte")
+            {
+                for (int byte1 = 0xED; byte1 <= 0xED; ++byte1)
+                {
+                    for (int byte2 = 0x80; byte2 <= 0x9F; ++byte2)
+                    {
+                        check_utf8string(false, byte1, byte2);
+                        check_utf8dump(false, byte1, byte2);
+                    }
+                }
+            }
+
+            SECTION("ill-formed: wrong second byte")
+            {
+                for (int byte1 = 0xED; byte1 <= 0xED; ++byte1)
+                {
+                    for (int byte2 = 0x00; byte2 <= 0xFF; ++byte2)
+                    {
+                        // skip correct second byte
+                        if (0x80 <= byte2 && byte2 <= 0x9F)
+                        {
+                            continue;
+                        }
+
+                        for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3)
+                        {
+                            check_utf8string(false, byte1, byte2, byte3);
+                            check_utf8dump(false, byte1, byte2, byte3);
+                        }
+                    }
+                }
+            }
+
+            SECTION("ill-formed: wrong third byte")
+            {
+                for (int byte1 = 0xED; byte1 <= 0xED; ++byte1)
+                {
+                    for (int byte2 = 0x80; byte2 <= 0x9F; ++byte2)
+                    {
+                        for (int byte3 = 0x00; byte3 <= 0xFF; ++byte3)
+                        {
+                            // skip correct third byte
+                            if (0x80 <= byte3 && byte3 <= 0xBF)
+                            {
+                                continue;
+                            }
+
+                            check_utf8string(false, byte1, byte2, byte3);
+                            check_utf8dump(false, byte1, byte2, byte3);
+                        }
+                    }
+                }
+            }
+        }
+
+        SECTION("UTF8-3 (xEE-xEF UTF8-tail UTF8-tail)")
+        {
+            SECTION("well-formed")
+            {
+                for (int byte1 = 0xEE; byte1 <= 0xEF; ++byte1)
+                {
+                    for (int byte2 = 0x80; byte2 <= 0xBF; ++byte2)
+                    {
+                        for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3)
+                        {
+                            check_utf8string(true, byte1, byte2, byte3);
+                            check_utf8dump(true, byte1, byte2, byte3);
+                        }
+                    }
+                }
+            }
+
+            SECTION("ill-formed: missing second byte")
+            {
+                for (int byte1 = 0xEE; byte1 <= 0xEF; ++byte1)
+                {
+                    check_utf8string(false, byte1);
+                    check_utf8dump(false, byte1);
+                }
+            }
+
+            SECTION("ill-formed: missing third byte")
+            {
+                for (int byte1 = 0xEE; byte1 <= 0xEF; ++byte1)
+                {
+                    for (int byte2 = 0x80; byte2 <= 0xBF; ++byte2)
+                    {
+                        check_utf8string(false, byte1, byte2);
+                        check_utf8dump(false, byte1, byte2);
+                    }
+                }
+            }
+
+            SECTION("ill-formed: wrong second byte")
+            {
+                for (int byte1 = 0xEE; byte1 <= 0xEF; ++byte1)
+                {
+                    for (int byte2 = 0x00; byte2 <= 0xFF; ++byte2)
+                    {
+                        // skip correct second byte
+                        if (0x80 <= byte2 && byte2 <= 0xBF)
+                        {
+                            continue;
+                        }
+
+                        for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3)
+                        {
+                            check_utf8string(false, byte1, byte2, byte3);
+                            check_utf8dump(false, byte1, byte2, byte3);
+                        }
+                    }
+                }
+            }
+
+            SECTION("ill-formed: wrong third byte")
+            {
+                for (int byte1 = 0xEE; byte1 <= 0xEF; ++byte1)
+                {
+                    for (int byte2 = 0x80; byte2 <= 0xBF; ++byte2)
+                    {
+                        for (int byte3 = 0x00; byte3 <= 0xFF; ++byte3)
+                        {
+                            // skip correct third byte
+                            if (0x80 <= byte3 && byte3 <= 0xBF)
+                            {
+                                continue;
+                            }
+
+                            check_utf8string(false, byte1, byte2, byte3);
+                            check_utf8dump(false, byte1, byte2, byte3);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+DOCTEST_CLANG_SUPPRESS_WARNING_POP
diff --git a/external_imported/json/tests/src/unit-unicode3.cpp b/external_imported/json/tests/src/unit-unicode3.cpp
new file mode 100644
index 000000000..dffb1cfa6
--- /dev/null
+++ b/external_imported/json/tests/src/unit-unicode3.cpp
@@ -0,0 +1,324 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+// for some reason including this after the json header leads to linker errors with VS 2017...
+#include <locale>
+
+#include <nlohmann/json.hpp>
+using nlohmann::json;
+
+#include <fstream>
+#include <sstream>
+#include <iostream>
+#include <iomanip>
+#include "make_test_data_available.hpp"
+
+// this test suite uses static variables with non-trivial destructors
+DOCTEST_CLANG_SUPPRESS_WARNING_PUSH
+DOCTEST_CLANG_SUPPRESS_WARNING("-Wexit-time-destructors")
+
+namespace
+{
+extern size_t calls;
+size_t calls = 0;
+
+void check_utf8dump(bool success_expected, int byte1, int byte2, int byte3, int byte4);
+
+void check_utf8dump(bool success_expected, int byte1, int byte2 = -1, int byte3 = -1, int byte4 = -1)
+{
+    static std::string json_string;
+    json_string.clear();
+
+    CAPTURE(byte1)
+    CAPTURE(byte2)
+    CAPTURE(byte3)
+    CAPTURE(byte4)
+
+    json_string += std::string(1, static_cast<char>(byte1));
+
+    if (byte2 != -1)
+    {
+        json_string += std::string(1, static_cast<char>(byte2));
+    }
+
+    if (byte3 != -1)
+    {
+        json_string += std::string(1, static_cast<char>(byte3));
+    }
+
+    if (byte4 != -1)
+    {
+        json_string += std::string(1, static_cast<char>(byte4));
+    }
+
+    CAPTURE(json_string)
+
+    // store the string in a JSON value
+    static json j;
+    static json j2;
+    j = json_string;
+    j2 = "abc" + json_string + "xyz";
+
+    static std::string s_ignored;
+    static std::string s_ignored2;
+    static std::string s_ignored_ascii;
+    static std::string s_ignored2_ascii;
+    static std::string s_replaced;
+    static std::string s_replaced2;
+    static std::string s_replaced_ascii;
+    static std::string s_replaced2_ascii;
+
+    // dumping with ignore/replace must not throw in any case
+    s_ignored = j.dump(-1, ' ', false, json::error_handler_t::ignore);
+    s_ignored2 = j2.dump(-1, ' ', false, json::error_handler_t::ignore);
+    s_ignored_ascii = j.dump(-1, ' ', true, json::error_handler_t::ignore);
+    s_ignored2_ascii = j2.dump(-1, ' ', true, json::error_handler_t::ignore);
+    s_replaced = j.dump(-1, ' ', false, json::error_handler_t::replace);
+    s_replaced2 = j2.dump(-1, ' ', false, json::error_handler_t::replace);
+    s_replaced_ascii = j.dump(-1, ' ', true, json::error_handler_t::replace);
+    s_replaced2_ascii = j2.dump(-1, ' ', true, json::error_handler_t::replace);
+
+    if (success_expected)
+    {
+        static std::string s_strict;
+        // strict mode must not throw if success is expected
+        s_strict = j.dump();
+        // all dumps should agree on the string
+        CHECK(s_strict == s_ignored);
+        CHECK(s_strict == s_replaced);
+    }
+    else
+    {
+        // strict mode must throw if success is not expected
+        CHECK_THROWS_AS(j.dump(), json::type_error&);
+        // ignore and replace must create different dumps
+        CHECK(s_ignored != s_replaced);
+
+        // check that replace string contains a replacement character
+        CHECK(s_replaced.find("\xEF\xBF\xBD") != std::string::npos);
+    }
+
+    // check that prefix and suffix are preserved
+    CHECK(s_ignored2.substr(1, 3) == "abc");
+    CHECK(s_ignored2.substr(s_ignored2.size() - 4, 3) == "xyz");
+    CHECK(s_ignored2_ascii.substr(1, 3) == "abc");
+    CHECK(s_ignored2_ascii.substr(s_ignored2_ascii.size() - 4, 3) == "xyz");
+    CHECK(s_replaced2.substr(1, 3) == "abc");
+    CHECK(s_replaced2.substr(s_replaced2.size() - 4, 3) == "xyz");
+    CHECK(s_replaced2_ascii.substr(1, 3) == "abc");
+    CHECK(s_replaced2_ascii.substr(s_replaced2_ascii.size() - 4, 3) == "xyz");
+}
+
+void check_utf8string(bool success_expected, int byte1, int byte2, int byte3, int byte4);
+
+// create and check a JSON string with up to four UTF-8 bytes
+void check_utf8string(bool success_expected, int byte1, int byte2 = -1, int byte3 = -1, int byte4 = -1)
+{
+    if (++calls % 100000 == 0)
+    {
+        std::cout << calls << " of 1641521 UTF-8 strings checked" << std::endl; // NOLINT(performance-avoid-endl)
+    }
+
+    static std::string json_string;
+    json_string = "\"";
+
+    CAPTURE(byte1)
+    json_string += std::string(1, static_cast<char>(byte1));
+
+    if (byte2 != -1)
+    {
+        CAPTURE(byte2)
+        json_string += std::string(1, static_cast<char>(byte2));
+    }
+
+    if (byte3 != -1)
+    {
+        CAPTURE(byte3)
+        json_string += std::string(1, static_cast<char>(byte3));
+    }
+
+    if (byte4 != -1)
+    {
+        CAPTURE(byte4)
+        json_string += std::string(1, static_cast<char>(byte4));
+    }
+
+    json_string += "\"";
+
+    CAPTURE(json_string)
+
+    json _;
+    if (success_expected)
+    {
+        CHECK_NOTHROW(_ = json::parse(json_string));
+    }
+    else
+    {
+        CHECK_THROWS_AS(_ = json::parse(json_string), json::parse_error&);
+    }
+}
+} // namespace
+
+TEST_CASE("Unicode (3/5)" * doctest::skip())
+{
+    SECTION("RFC 3629")
+    {
+        /*
+        RFC 3629 describes in Sect. 4 the syntax of UTF-8 byte sequences as
+        follows:
+
+            A UTF-8 string is a sequence of octets representing a sequence of UCS
+            characters.  An octet sequence is valid UTF-8 only if it matches the
+            following syntax, which is derived from the rules for encoding UTF-8
+            and is expressed in the ABNF of [RFC2234].
+
+            UTF8-octets = *( UTF8-char )
+            UTF8-char   = UTF8-1 / UTF8-2 / UTF8-3 / UTF8-4
+            UTF8-1      = %x00-7F
+            UTF8-2      = %xC2-DF UTF8-tail
+            UTF8-3      = %xE0 %xA0-BF UTF8-tail / %xE1-EC 2( UTF8-tail ) /
+                          %xED %x80-9F UTF8-tail / %xEE-EF 2( UTF8-tail )
+            UTF8-4      = %xF0 %x90-BF 2( UTF8-tail ) / %xF1-F3 3( UTF8-tail ) /
+                          %xF4 %x80-8F 2( UTF8-tail )
+            UTF8-tail   = %x80-BF
+        */
+
+        SECTION("UTF8-4 (xF0 x90-BF UTF8-tail UTF8-tail)")
+        {
+            SECTION("well-formed")
+            {
+                for (int byte1 = 0xF0; byte1 <= 0xF0; ++byte1)
+                {
+                    for (int byte2 = 0x90; byte2 <= 0xBF; ++byte2)
+                    {
+                        for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3)
+                        {
+                            for (int byte4 = 0x80; byte4 <= 0xBF; ++byte4)
+                            {
+                                check_utf8string(true, byte1, byte2, byte3, byte4);
+                                check_utf8dump(true, byte1, byte2, byte3, byte4);
+                            }
+                        }
+                    }
+                }
+            }
+
+            SECTION("ill-formed: missing second byte")
+            {
+                for (int byte1 = 0xF0; byte1 <= 0xF0; ++byte1)
+                {
+                    check_utf8string(false, byte1);
+                    check_utf8dump(false, byte1);
+                }
+            }
+
+            SECTION("ill-formed: missing third byte")
+            {
+                for (int byte1 = 0xF0; byte1 <= 0xF0; ++byte1)
+                {
+                    for (int byte2 = 0x90; byte2 <= 0xBF; ++byte2)
+                    {
+                        check_utf8string(false, byte1, byte2);
+                        check_utf8dump(false, byte1, byte2);
+                    }
+                }
+            }
+
+            SECTION("ill-formed: missing fourth byte")
+            {
+                for (int byte1 = 0xF0; byte1 <= 0xF0; ++byte1)
+                {
+                    for (int byte2 = 0x90; byte2 <= 0xBF; ++byte2)
+                    {
+                        for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3)
+                        {
+                            check_utf8string(false, byte1, byte2, byte3);
+                            check_utf8dump(false, byte1, byte2, byte3);
+                        }
+                    }
+                }
+            }
+
+            SECTION("ill-formed: wrong second byte")
+            {
+                for (int byte1 = 0xF0; byte1 <= 0xF0; ++byte1)
+                {
+                    for (int byte2 = 0x00; byte2 <= 0xFF; ++byte2)
+                    {
+                        // skip correct second byte
+                        if (0x90 <= byte2 && byte2 <= 0xBF)
+                        {
+                            continue;
+                        }
+
+                        for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3)
+                        {
+                            for (int byte4 = 0x80; byte4 <= 0xBF; ++byte4)
+                            {
+                                check_utf8string(false, byte1, byte2, byte3, byte4);
+                                check_utf8dump(false, byte1, byte2, byte3, byte4);
+                            }
+                        }
+                    }
+                }
+            }
+
+            SECTION("ill-formed: wrong third byte")
+            {
+                for (int byte1 = 0xF0; byte1 <= 0xF0; ++byte1)
+                {
+                    for (int byte2 = 0x90; byte2 <= 0xBF; ++byte2)
+                    {
+                        for (int byte3 = 0x00; byte3 <= 0xFF; ++byte3)
+                        {
+                            // skip correct third byte
+                            if (0x80 <= byte3 && byte3 <= 0xBF)
+                            {
+                                continue;
+                            }
+
+                            for (int byte4 = 0x80; byte4 <= 0xBF; ++byte4)
+                            {
+                                check_utf8string(false, byte1, byte2, byte3, byte4);
+                                check_utf8dump(false, byte1, byte2, byte3, byte4);
+                            }
+                        }
+                    }
+                }
+            }
+
+            SECTION("ill-formed: wrong fourth byte")
+            {
+                for (int byte1 = 0xF0; byte1 <= 0xF0; ++byte1)
+                {
+                    for (int byte2 = 0x90; byte2 <= 0xBF; ++byte2)
+                    {
+                        for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3)
+                        {
+                            for (int byte4 = 0x00; byte4 <= 0xFF; ++byte4)
+                            {
+                                // skip fourth second byte
+                                if (0x80 <= byte3 && byte3 <= 0xBF)
+                                {
+                                    continue;
+                                }
+
+                                check_utf8string(false, byte1, byte2, byte3, byte4);
+                                check_utf8dump(false, byte1, byte2, byte3, byte4);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+DOCTEST_CLANG_SUPPRESS_WARNING_POP
diff --git a/external_imported/json/tests/src/unit-unicode4.cpp b/external_imported/json/tests/src/unit-unicode4.cpp
new file mode 100644
index 000000000..6a0e08989
--- /dev/null
+++ b/external_imported/json/tests/src/unit-unicode4.cpp
@@ -0,0 +1,324 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+// for some reason including this after the json header leads to linker errors with VS 2017...
+#include <locale>
+
+#include <nlohmann/json.hpp>
+using nlohmann::json;
+
+#include <fstream>
+#include <sstream>
+#include <iostream>
+#include <iomanip>
+#include "make_test_data_available.hpp"
+
+// this test suite uses static variables with non-trivial destructors
+DOCTEST_CLANG_SUPPRESS_WARNING_PUSH
+DOCTEST_CLANG_SUPPRESS_WARNING("-Wexit-time-destructors")
+
+namespace
+{
+extern size_t calls;
+size_t calls = 0;
+
+void check_utf8dump(bool success_expected, int byte1, int byte2, int byte3, int byte4);
+
+void check_utf8dump(bool success_expected, int byte1, int byte2 = -1, int byte3 = -1, int byte4 = -1)
+{
+    static std::string json_string;
+    json_string.clear();
+
+    CAPTURE(byte1)
+    CAPTURE(byte2)
+    CAPTURE(byte3)
+    CAPTURE(byte4)
+
+    json_string += std::string(1, static_cast<char>(byte1));
+
+    if (byte2 != -1)
+    {
+        json_string += std::string(1, static_cast<char>(byte2));
+    }
+
+    if (byte3 != -1)
+    {
+        json_string += std::string(1, static_cast<char>(byte3));
+    }
+
+    if (byte4 != -1)
+    {
+        json_string += std::string(1, static_cast<char>(byte4));
+    }
+
+    CAPTURE(json_string)
+
+    // store the string in a JSON value
+    static json j;
+    static json j2;
+    j = json_string;
+    j2 = "abc" + json_string + "xyz";
+
+    static std::string s_ignored;
+    static std::string s_ignored2;
+    static std::string s_ignored_ascii;
+    static std::string s_ignored2_ascii;
+    static std::string s_replaced;
+    static std::string s_replaced2;
+    static std::string s_replaced_ascii;
+    static std::string s_replaced2_ascii;
+
+    // dumping with ignore/replace must not throw in any case
+    s_ignored = j.dump(-1, ' ', false, json::error_handler_t::ignore);
+    s_ignored2 = j2.dump(-1, ' ', false, json::error_handler_t::ignore);
+    s_ignored_ascii = j.dump(-1, ' ', true, json::error_handler_t::ignore);
+    s_ignored2_ascii = j2.dump(-1, ' ', true, json::error_handler_t::ignore);
+    s_replaced = j.dump(-1, ' ', false, json::error_handler_t::replace);
+    s_replaced2 = j2.dump(-1, ' ', false, json::error_handler_t::replace);
+    s_replaced_ascii = j.dump(-1, ' ', true, json::error_handler_t::replace);
+    s_replaced2_ascii = j2.dump(-1, ' ', true, json::error_handler_t::replace);
+
+    if (success_expected)
+    {
+        static std::string s_strict;
+        // strict mode must not throw if success is expected
+        s_strict = j.dump();
+        // all dumps should agree on the string
+        CHECK(s_strict == s_ignored);
+        CHECK(s_strict == s_replaced);
+    }
+    else
+    {
+        // strict mode must throw if success is not expected
+        CHECK_THROWS_AS(j.dump(), json::type_error&);
+        // ignore and replace must create different dumps
+        CHECK(s_ignored != s_replaced);
+
+        // check that replace string contains a replacement character
+        CHECK(s_replaced.find("\xEF\xBF\xBD") != std::string::npos);
+    }
+
+    // check that prefix and suffix are preserved
+    CHECK(s_ignored2.substr(1, 3) == "abc");
+    CHECK(s_ignored2.substr(s_ignored2.size() - 4, 3) == "xyz");
+    CHECK(s_ignored2_ascii.substr(1, 3) == "abc");
+    CHECK(s_ignored2_ascii.substr(s_ignored2_ascii.size() - 4, 3) == "xyz");
+    CHECK(s_replaced2.substr(1, 3) == "abc");
+    CHECK(s_replaced2.substr(s_replaced2.size() - 4, 3) == "xyz");
+    CHECK(s_replaced2_ascii.substr(1, 3) == "abc");
+    CHECK(s_replaced2_ascii.substr(s_replaced2_ascii.size() - 4, 3) == "xyz");
+}
+
+void check_utf8string(bool success_expected, int byte1, int byte2, int byte3, int byte4);
+
+// create and check a JSON string with up to four UTF-8 bytes
+void check_utf8string(bool success_expected, int byte1, int byte2 = -1, int byte3 = -1, int byte4 = -1)
+{
+    if (++calls % 100000 == 0)
+    {
+        std::cout << calls << " of 5517507 UTF-8 strings checked" << std::endl; // NOLINT(performance-avoid-endl)
+    }
+
+    static std::string json_string;
+    json_string = "\"";
+
+    CAPTURE(byte1)
+    json_string += std::string(1, static_cast<char>(byte1));
+
+    if (byte2 != -1)
+    {
+        CAPTURE(byte2)
+        json_string += std::string(1, static_cast<char>(byte2));
+    }
+
+    if (byte3 != -1)
+    {
+        CAPTURE(byte3)
+        json_string += std::string(1, static_cast<char>(byte3));
+    }
+
+    if (byte4 != -1)
+    {
+        CAPTURE(byte4)
+        json_string += std::string(1, static_cast<char>(byte4));
+    }
+
+    json_string += "\"";
+
+    CAPTURE(json_string)
+
+    json _;
+    if (success_expected)
+    {
+        CHECK_NOTHROW(_ = json::parse(json_string));
+    }
+    else
+    {
+        CHECK_THROWS_AS(_ = json::parse(json_string), json::parse_error&);
+    }
+}
+} // namespace
+
+TEST_CASE("Unicode (4/5)" * doctest::skip())
+{
+    SECTION("RFC 3629")
+    {
+        /*
+        RFC 3629 describes in Sect. 4 the syntax of UTF-8 byte sequences as
+        follows:
+
+            A UTF-8 string is a sequence of octets representing a sequence of UCS
+            characters.  An octet sequence is valid UTF-8 only if it matches the
+            following syntax, which is derived from the rules for encoding UTF-8
+            and is expressed in the ABNF of [RFC2234].
+
+            UTF8-octets = *( UTF8-char )
+            UTF8-char   = UTF8-1 / UTF8-2 / UTF8-3 / UTF8-4
+            UTF8-1      = %x00-7F
+            UTF8-2      = %xC2-DF UTF8-tail
+            UTF8-3      = %xE0 %xA0-BF UTF8-tail / %xE1-EC 2( UTF8-tail ) /
+                          %xED %x80-9F UTF8-tail / %xEE-EF 2( UTF8-tail )
+            UTF8-4      = %xF0 %x90-BF 2( UTF8-tail ) / %xF1-F3 3( UTF8-tail ) /
+                          %xF4 %x80-8F 2( UTF8-tail )
+            UTF8-tail   = %x80-BF
+        */
+
+        SECTION("UTF8-4 (xF1-F3 UTF8-tail UTF8-tail UTF8-tail)")
+        {
+            SECTION("well-formed")
+            {
+                for (int byte1 = 0xF1; byte1 <= 0xF3; ++byte1)
+                {
+                    for (int byte2 = 0x80; byte2 <= 0xBF; ++byte2)
+                    {
+                        for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3)
+                        {
+                            for (int byte4 = 0x80; byte4 <= 0xBF; ++byte4)
+                            {
+                                check_utf8string(true, byte1, byte2, byte3, byte4);
+                                check_utf8dump(true, byte1, byte2, byte3, byte4);
+                            }
+                        }
+                    }
+                }
+            }
+
+            SECTION("ill-formed: missing second byte")
+            {
+                for (int byte1 = 0xF1; byte1 <= 0xF3; ++byte1)
+                {
+                    check_utf8string(false, byte1);
+                    check_utf8dump(false, byte1);
+                }
+            }
+
+            SECTION("ill-formed: missing third byte")
+            {
+                for (int byte1 = 0xF1; byte1 <= 0xF3; ++byte1)
+                {
+                    for (int byte2 = 0x80; byte2 <= 0xBF; ++byte2)
+                    {
+                        check_utf8string(false, byte1, byte2);
+                        check_utf8dump(false, byte1, byte2);
+                    }
+                }
+            }
+
+            SECTION("ill-formed: missing fourth byte")
+            {
+                for (int byte1 = 0xF1; byte1 <= 0xF3; ++byte1)
+                {
+                    for (int byte2 = 0x80; byte2 <= 0xBF; ++byte2)
+                    {
+                        for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3)
+                        {
+                            check_utf8string(false, byte1, byte2, byte3);
+                            check_utf8dump(false, byte1, byte2, byte3);
+                        }
+                    }
+                }
+            }
+
+            SECTION("ill-formed: wrong second byte")
+            {
+                for (int byte1 = 0xF1; byte1 <= 0xF3; ++byte1)
+                {
+                    for (int byte2 = 0x00; byte2 <= 0xFF; ++byte2)
+                    {
+                        // skip correct second byte
+                        if (0x80 <= byte2 && byte2 <= 0xBF)
+                        {
+                            continue;
+                        }
+
+                        for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3)
+                        {
+                            for (int byte4 = 0x80; byte4 <= 0xBF; ++byte4)
+                            {
+                                check_utf8string(false, byte1, byte2, byte3, byte4);
+                                check_utf8dump(false, byte1, byte2, byte3, byte4);
+                            }
+                        }
+                    }
+                }
+            }
+
+            SECTION("ill-formed: wrong third byte")
+            {
+                for (int byte1 = 0xF1; byte1 <= 0xF3; ++byte1)
+                {
+                    for (int byte2 = 0x80; byte2 <= 0xBF; ++byte2)
+                    {
+                        for (int byte3 = 0x00; byte3 <= 0xFF; ++byte3)
+                        {
+                            // skip correct third byte
+                            if (0x80 <= byte3 && byte3 <= 0xBF)
+                            {
+                                continue;
+                            }
+
+                            for (int byte4 = 0x80; byte4 <= 0xBF; ++byte4)
+                            {
+                                check_utf8string(false, byte1, byte2, byte3, byte4);
+                                check_utf8dump(false, byte1, byte2, byte3, byte4);
+                            }
+                        }
+                    }
+                }
+            }
+
+            SECTION("ill-formed: wrong fourth byte")
+            {
+                for (int byte1 = 0xF1; byte1 <= 0xF3; ++byte1)
+                {
+                    for (int byte2 = 0x80; byte2 <= 0xBF; ++byte2)
+                    {
+                        for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3)
+                        {
+                            for (int byte4 = 0x00; byte4 <= 0xFF; ++byte4)
+                            {
+                                // skip correct fourth byte
+                                if (0x80 <= byte3 && byte3 <= 0xBF)
+                                {
+                                    continue;
+                                }
+
+                                check_utf8string(false, byte1, byte2, byte3, byte4);
+                                check_utf8dump(false, byte1, byte2, byte3, byte4);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+DOCTEST_CLANG_SUPPRESS_WARNING_POP
diff --git a/external_imported/json/tests/src/unit-unicode5.cpp b/external_imported/json/tests/src/unit-unicode5.cpp
new file mode 100644
index 000000000..217d3b38d
--- /dev/null
+++ b/external_imported/json/tests/src/unit-unicode5.cpp
@@ -0,0 +1,324 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+// for some reason including this after the json header leads to linker errors with VS 2017...
+#include <locale>
+
+#include <nlohmann/json.hpp>
+using nlohmann::json;
+
+#include <fstream>
+#include <sstream>
+#include <iostream>
+#include <iomanip>
+#include "make_test_data_available.hpp"
+
+// this test suite uses static variables with non-trivial destructors
+DOCTEST_CLANG_SUPPRESS_WARNING_PUSH
+DOCTEST_CLANG_SUPPRESS_WARNING("-Wexit-time-destructors")
+
+namespace
+{
+extern size_t calls;
+size_t calls = 0;
+
+void check_utf8dump(bool success_expected, int byte1, int byte2, int byte3, int byte4);
+
+void check_utf8dump(bool success_expected, int byte1, int byte2 = -1, int byte3 = -1, int byte4 = -1)
+{
+    static std::string json_string;
+    json_string.clear();
+
+    CAPTURE(byte1)
+    CAPTURE(byte2)
+    CAPTURE(byte3)
+    CAPTURE(byte4)
+
+    json_string += std::string(1, static_cast<char>(byte1));
+
+    if (byte2 != -1)
+    {
+        json_string += std::string(1, static_cast<char>(byte2));
+    }
+
+    if (byte3 != -1)
+    {
+        json_string += std::string(1, static_cast<char>(byte3));
+    }
+
+    if (byte4 != -1)
+    {
+        json_string += std::string(1, static_cast<char>(byte4));
+    }
+
+    CAPTURE(json_string)
+
+    // store the string in a JSON value
+    static json j;
+    static json j2;
+    j = json_string;
+    j2 = "abc" + json_string + "xyz";
+
+    static std::string s_ignored;
+    static std::string s_ignored2;
+    static std::string s_ignored_ascii;
+    static std::string s_ignored2_ascii;
+    static std::string s_replaced;
+    static std::string s_replaced2;
+    static std::string s_replaced_ascii;
+    static std::string s_replaced2_ascii;
+
+    // dumping with ignore/replace must not throw in any case
+    s_ignored = j.dump(-1, ' ', false, json::error_handler_t::ignore);
+    s_ignored2 = j2.dump(-1, ' ', false, json::error_handler_t::ignore);
+    s_ignored_ascii = j.dump(-1, ' ', true, json::error_handler_t::ignore);
+    s_ignored2_ascii = j2.dump(-1, ' ', true, json::error_handler_t::ignore);
+    s_replaced = j.dump(-1, ' ', false, json::error_handler_t::replace);
+    s_replaced2 = j2.dump(-1, ' ', false, json::error_handler_t::replace);
+    s_replaced_ascii = j.dump(-1, ' ', true, json::error_handler_t::replace);
+    s_replaced2_ascii = j2.dump(-1, ' ', true, json::error_handler_t::replace);
+
+    if (success_expected)
+    {
+        static std::string s_strict;
+        // strict mode must not throw if success is expected
+        s_strict = j.dump();
+        // all dumps should agree on the string
+        CHECK(s_strict == s_ignored);
+        CHECK(s_strict == s_replaced);
+    }
+    else
+    {
+        // strict mode must throw if success is not expected
+        CHECK_THROWS_AS(j.dump(), json::type_error&);
+        // ignore and replace must create different dumps
+        CHECK(s_ignored != s_replaced);
+
+        // check that replace string contains a replacement character
+        CHECK(s_replaced.find("\xEF\xBF\xBD") != std::string::npos);
+    }
+
+    // check that prefix and suffix are preserved
+    CHECK(s_ignored2.substr(1, 3) == "abc");
+    CHECK(s_ignored2.substr(s_ignored2.size() - 4, 3) == "xyz");
+    CHECK(s_ignored2_ascii.substr(1, 3) == "abc");
+    CHECK(s_ignored2_ascii.substr(s_ignored2_ascii.size() - 4, 3) == "xyz");
+    CHECK(s_replaced2.substr(1, 3) == "abc");
+    CHECK(s_replaced2.substr(s_replaced2.size() - 4, 3) == "xyz");
+    CHECK(s_replaced2_ascii.substr(1, 3) == "abc");
+    CHECK(s_replaced2_ascii.substr(s_replaced2_ascii.size() - 4, 3) == "xyz");
+}
+
+void check_utf8string(bool success_expected, int byte1, int byte2, int byte3, int byte4);
+
+// create and check a JSON string with up to four UTF-8 bytes
+void check_utf8string(bool success_expected, int byte1, int byte2 = -1, int byte3 = -1, int byte4 = -1)
+{
+    if (++calls % 100000 == 0)
+    {
+        std::cout << calls << " of 1246225 UTF-8 strings checked" << std::endl; // NOLINT(performance-avoid-endl)
+    }
+
+    static std::string json_string;
+    json_string = "\"";
+
+    CAPTURE(byte1)
+    json_string += std::string(1, static_cast<char>(byte1));
+
+    if (byte2 != -1)
+    {
+        CAPTURE(byte2)
+        json_string += std::string(1, static_cast<char>(byte2));
+    }
+
+    if (byte3 != -1)
+    {
+        CAPTURE(byte3)
+        json_string += std::string(1, static_cast<char>(byte3));
+    }
+
+    if (byte4 != -1)
+    {
+        CAPTURE(byte4)
+        json_string += std::string(1, static_cast<char>(byte4));
+    }
+
+    json_string += "\"";
+
+    CAPTURE(json_string)
+
+    json _;
+    if (success_expected)
+    {
+        CHECK_NOTHROW(_ = json::parse(json_string));
+    }
+    else
+    {
+        CHECK_THROWS_AS(_ = json::parse(json_string), json::parse_error&);
+    }
+}
+} // namespace
+
+TEST_CASE("Unicode (5/5)" * doctest::skip())
+{
+    SECTION("RFC 3629")
+    {
+        /*
+        RFC 3629 describes in Sect. 4 the syntax of UTF-8 byte sequences as
+        follows:
+
+            A UTF-8 string is a sequence of octets representing a sequence of UCS
+            characters.  An octet sequence is valid UTF-8 only if it matches the
+            following syntax, which is derived from the rules for encoding UTF-8
+            and is expressed in the ABNF of [RFC2234].
+
+            UTF8-octets = *( UTF8-char )
+            UTF8-char   = UTF8-1 / UTF8-2 / UTF8-3 / UTF8-4
+            UTF8-1      = %x00-7F
+            UTF8-2      = %xC2-DF UTF8-tail
+            UTF8-3      = %xE0 %xA0-BF UTF8-tail / %xE1-EC 2( UTF8-tail ) /
+                          %xED %x80-9F UTF8-tail / %xEE-EF 2( UTF8-tail )
+            UTF8-4      = %xF0 %x90-BF 2( UTF8-tail ) / %xF1-F3 3( UTF8-tail ) /
+                          %xF4 %x80-8F 2( UTF8-tail )
+            UTF8-tail   = %x80-BF
+        */
+
+        SECTION("UTF8-4 (xF4 x80-8F UTF8-tail UTF8-tail)")
+        {
+            SECTION("well-formed")
+            {
+                for (int byte1 = 0xF4; byte1 <= 0xF4; ++byte1)
+                {
+                    for (int byte2 = 0x80; byte2 <= 0x8F; ++byte2)
+                    {
+                        for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3)
+                        {
+                            for (int byte4 = 0x80; byte4 <= 0xBF; ++byte4)
+                            {
+                                check_utf8string(true, byte1, byte2, byte3, byte4);
+                                check_utf8dump(true, byte1, byte2, byte3, byte4);
+                            }
+                        }
+                    }
+                }
+            }
+
+            SECTION("ill-formed: missing second byte")
+            {
+                for (int byte1 = 0xF4; byte1 <= 0xF4; ++byte1)
+                {
+                    check_utf8string(false, byte1);
+                    check_utf8dump(false, byte1);
+                }
+            }
+
+            SECTION("ill-formed: missing third byte")
+            {
+                for (int byte1 = 0xF4; byte1 <= 0xF4; ++byte1)
+                {
+                    for (int byte2 = 0x80; byte2 <= 0x8F; ++byte2)
+                    {
+                        check_utf8string(false, byte1, byte2);
+                        check_utf8dump(false, byte1, byte2);
+                    }
+                }
+            }
+
+            SECTION("ill-formed: missing fourth byte")
+            {
+                for (int byte1 = 0xF4; byte1 <= 0xF4; ++byte1)
+                {
+                    for (int byte2 = 0x80; byte2 <= 0x8F; ++byte2)
+                    {
+                        for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3)
+                        {
+                            check_utf8string(false, byte1, byte2, byte3);
+                            check_utf8dump(false, byte1, byte2, byte3);
+                        }
+                    }
+                }
+            }
+
+            SECTION("ill-formed: wrong second byte")
+            {
+                for (int byte1 = 0xF4; byte1 <= 0xF4; ++byte1)
+                {
+                    for (int byte2 = 0x00; byte2 <= 0xFF; ++byte2)
+                    {
+                        // skip correct second byte
+                        if (0x80 <= byte2 && byte2 <= 0x8F)
+                        {
+                            continue;
+                        }
+
+                        for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3)
+                        {
+                            for (int byte4 = 0x80; byte4 <= 0xBF; ++byte4)
+                            {
+                                check_utf8string(false, byte1, byte2, byte3, byte4);
+                                check_utf8dump(false, byte1, byte2, byte3, byte4);
+                            }
+                        }
+                    }
+                }
+            }
+
+            SECTION("ill-formed: wrong third byte")
+            {
+                for (int byte1 = 0xF4; byte1 <= 0xF4; ++byte1)
+                {
+                    for (int byte2 = 0x80; byte2 <= 0x8F; ++byte2)
+                    {
+                        for (int byte3 = 0x00; byte3 <= 0xFF; ++byte3)
+                        {
+                            // skip correct third byte
+                            if (0x80 <= byte3 && byte3 <= 0xBF)
+                            {
+                                continue;
+                            }
+
+                            for (int byte4 = 0x80; byte4 <= 0xBF; ++byte4)
+                            {
+                                check_utf8string(false, byte1, byte2, byte3, byte4);
+                                check_utf8dump(false, byte1, byte2, byte3, byte4);
+                            }
+                        }
+                    }
+                }
+            }
+
+            SECTION("ill-formed: wrong fourth byte")
+            {
+                for (int byte1 = 0xF4; byte1 <= 0xF4; ++byte1)
+                {
+                    for (int byte2 = 0x80; byte2 <= 0x8F; ++byte2)
+                    {
+                        for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3)
+                        {
+                            for (int byte4 = 0x00; byte4 <= 0xFF; ++byte4)
+                            {
+                                // skip correct fourth byte
+                                if (0x80 <= byte3 && byte3 <= 0xBF)
+                                {
+                                    continue;
+                                }
+
+                                check_utf8string(false, byte1, byte2, byte3, byte4);
+                                check_utf8dump(false, byte1, byte2, byte3, byte4);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+DOCTEST_CLANG_SUPPRESS_WARNING_POP
diff --git a/external_imported/json/tests/src/unit-user_defined_input.cpp b/external_imported/json/tests/src/unit-user_defined_input.cpp
new file mode 100644
index 000000000..5483f6a0c
--- /dev/null
+++ b/external_imported/json/tests/src/unit-user_defined_input.cpp
@@ -0,0 +1,130 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+#include <nlohmann/json.hpp>
+using nlohmann::json;
+
+#include <list>
+
+namespace
+{
+TEST_CASE("Use arbitrary stdlib container")
+{
+    std::string raw_data = "[1,2,3,4]";
+    std::list<char> data(raw_data.begin(), raw_data.end());
+
+    json as_json = json::parse(data.begin(), data.end());
+    CHECK(as_json.at(0) == 1);
+    CHECK(as_json.at(1) == 2);
+    CHECK(as_json.at(2) == 3);
+    CHECK(as_json.at(3) == 4);
+}
+
+struct MyContainer
+{
+    const char* data;
+};
+
+const char* begin(const MyContainer& c)
+{
+    return c.data;
+}
+
+const char* end(const MyContainer& c)
+{
+    return c.data + strlen(c.data); // NOLINT(cppcoreguidelines-pro-bounds-pointer-arithmetic)
+}
+
+TEST_CASE("Custom container non-member begin/end")
+{
+
+    const MyContainer data{"[1,2,3,4]"};
+    json as_json = json::parse(data);
+    CHECK(as_json.at(0) == 1);
+    CHECK(as_json.at(1) == 2);
+    CHECK(as_json.at(2) == 3);
+    CHECK(as_json.at(3) == 4);
+
+}
+
+TEST_CASE("Custom container member begin/end")
+{
+    struct MyContainer2
+    {
+        const char* data;
+
+        const char* begin() const
+        {
+            return data;
+        }
+
+        const char* end() const
+        {
+            return data + strlen(data); // NOLINT(cppcoreguidelines-pro-bounds-pointer-arithmetic)
+        }
+    };
+
+    const MyContainer2 data{"[1,2,3,4]"};
+    json as_json = json::parse(data);
+    CHECK(as_json.at(0) == 1);
+    CHECK(as_json.at(1) == 2);
+    CHECK(as_json.at(2) == 3);
+    CHECK(as_json.at(3) == 4);
+}
+
+TEST_CASE("Custom iterator")
+{
+    const char* raw_data = "[1,2,3,4]";
+
+    struct MyIterator
+    {
+        using difference_type = std::size_t;
+        using value_type = char;
+        using pointer = const char*;
+        using reference = const char&;
+        using iterator_category = std::input_iterator_tag;
+
+        MyIterator& operator++()
+        {
+            ++ptr; // NOLINT(cppcoreguidelines-pro-bounds-pointer-arithmetic)
+            return *this;
+        }
+
+        reference operator*() const
+        {
+            return *ptr;
+        }
+
+        bool operator!=(const MyIterator& rhs) const
+        {
+            return ptr != rhs.ptr;
+        }
+
+        const char* ptr;
+    };
+
+    // avoid -Wunused-local-typedefs
+    CHECK(std::is_same<MyIterator::difference_type, std::size_t>::value);
+    CHECK(std::is_same<MyIterator::value_type, char>::value);
+    CHECK(std::is_same<MyIterator::pointer, const char*>::value);
+    CHECK(std::is_same<MyIterator::reference, const char&>::value);
+    CHECK(std::is_same<MyIterator::iterator_category, std::input_iterator_tag>::value);
+
+    const MyIterator begin{raw_data};
+    const MyIterator end{raw_data + strlen(raw_data)}; // NOLINT(cppcoreguidelines-pro-bounds-pointer-arithmetic)
+
+    json as_json = json::parse(begin, end);
+    CHECK(as_json.at(0) == 1);
+    CHECK(as_json.at(1) == 2);
+    CHECK(as_json.at(2) == 3);
+    CHECK(as_json.at(3) == 4);
+}
+
+} // namespace
diff --git a/external_imported/json/tests/src/unit-windows_h.cpp b/external_imported/json/tests/src/unit-windows_h.cpp
new file mode 100644
index 000000000..9c1535854
--- /dev/null
+++ b/external_imported/json/tests/src/unit-windows_h.cpp
@@ -0,0 +1,23 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+#undef WIN32_LEAN_AND_MEAN
+#undef NOMINMAX
+
+#ifdef _WIN32
+    #include <windows.h>
+#endif
+
+#include <nlohmann/json.hpp>
+using nlohmann::json;
+
+TEST_CASE("include windows.h")
+{
+    CHECK(true);
+}
diff --git a/external_imported/json/tests/src/unit-wstring.cpp b/external_imported/json/tests/src/unit-wstring.cpp
new file mode 100644
index 000000000..1aaa13ba8
--- /dev/null
+++ b/external_imported/json/tests/src/unit-wstring.cpp
@@ -0,0 +1,99 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#include "doctest_compatibility.h"
+
+#include <nlohmann/json.hpp>
+using nlohmann::json;
+
+// ICPC errors out on multibyte character sequences in source files
+#ifndef __INTEL_COMPILER
+namespace
+{
+bool wstring_is_utf16();
+bool wstring_is_utf16()
+{
+    return (std::wstring(L"💩") == std::wstring(L"\U0001F4A9"));
+}
+
+bool u16string_is_utf16();
+bool u16string_is_utf16()
+{
+    return (std::u16string(u"💩") == std::u16string(u"\U0001F4A9"));
+}
+
+bool u32string_is_utf32();
+bool u32string_is_utf32()
+{
+    return (std::u32string(U"💩") == std::u32string(U"\U0001F4A9"));
+}
+} // namespace
+
+TEST_CASE("wide strings")
+{
+    SECTION("std::wstring")
+    {
+        if (wstring_is_utf16())
+        {
+            std::wstring const w = L"[12.2,\"Ⴥaäö💤🧢\"]";
+            json const j = json::parse(w);
+            CHECK(j.dump() == "[12.2,\"Ⴥaäö💤🧢\"]");
+        }
+    }
+
+    SECTION("invalid std::wstring")
+    {
+        if (wstring_is_utf16())
+        {
+            std::wstring const w = L"\"\xDBFF";
+            json _;
+            CHECK_THROWS_AS(_ = json::parse(w), json::parse_error&);
+        }
+    }
+
+    SECTION("std::u16string")
+    {
+        if (u16string_is_utf16())
+        {
+            std::u16string const w = u"[12.2,\"Ⴥaäö💤🧢\"]";
+            json const j = json::parse(w);
+            CHECK(j.dump() == "[12.2,\"Ⴥaäö💤🧢\"]");
+        }
+    }
+
+    SECTION("invalid std::u16string")
+    {
+        if (wstring_is_utf16())
+        {
+            std::u16string const w = u"\"\xDBFF";
+            json _;
+            CHECK_THROWS_AS(_ = json::parse(w), json::parse_error&);
+        }
+    }
+
+    SECTION("std::u32string")
+    {
+        if (u32string_is_utf32())
+        {
+            std::u32string const w = U"[12.2,\"Ⴥaäö💤🧢\"]";
+            json const j = json::parse(w);
+            CHECK(j.dump() == "[12.2,\"Ⴥaäö💤🧢\"]");
+        }
+    }
+
+    SECTION("invalid std::u32string")
+    {
+        if (u32string_is_utf32())
+        {
+            std::u32string const w = U"\"\x110000";
+            json _;
+            CHECK_THROWS_AS(_ = json::parse(w), json::parse_error&);
+        }
+    }
+}
+#endif
diff --git a/external_imported/json/tests/src/unit.cpp b/external_imported/json/tests/src/unit.cpp
new file mode 100644
index 000000000..adb39dba1
--- /dev/null
+++ b/external_imported/json/tests/src/unit.cpp
@@ -0,0 +1,10 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++ (supporting code)
+// |  |  |__   |  |  | | | |  version 3.11.3
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "doctest_compatibility.h"
diff --git a/external_imported/json/test/thirdparty/Fuzzer/CMakeLists.txt b/external_imported/json/tests/thirdparty/Fuzzer/CMakeLists.txt
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/CMakeLists.txt
rename to external_imported/json/tests/thirdparty/Fuzzer/CMakeLists.txt
diff --git a/external_imported/json/test/thirdparty/Fuzzer/FuzzerCorpus.h b/external_imported/json/tests/thirdparty/Fuzzer/FuzzerCorpus.h
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/FuzzerCorpus.h
rename to external_imported/json/tests/thirdparty/Fuzzer/FuzzerCorpus.h
diff --git a/external_imported/json/test/thirdparty/Fuzzer/FuzzerCrossOver.cpp b/external_imported/json/tests/thirdparty/Fuzzer/FuzzerCrossOver.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/FuzzerCrossOver.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/FuzzerCrossOver.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/FuzzerDefs.h b/external_imported/json/tests/thirdparty/Fuzzer/FuzzerDefs.h
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/FuzzerDefs.h
rename to external_imported/json/tests/thirdparty/Fuzzer/FuzzerDefs.h
diff --git a/external_imported/json/test/thirdparty/Fuzzer/FuzzerDictionary.h b/external_imported/json/tests/thirdparty/Fuzzer/FuzzerDictionary.h
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/FuzzerDictionary.h
rename to external_imported/json/tests/thirdparty/Fuzzer/FuzzerDictionary.h
diff --git a/external_imported/json/test/thirdparty/Fuzzer/FuzzerDriver.cpp b/external_imported/json/tests/thirdparty/Fuzzer/FuzzerDriver.cpp
similarity index 99%
rename from external_imported/json/test/thirdparty/Fuzzer/FuzzerDriver.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/FuzzerDriver.cpp
index 95b0721c8..5ab6df2d5 100644
--- a/external_imported/json/test/thirdparty/Fuzzer/FuzzerDriver.cpp
+++ b/external_imported/json/tests/thirdparty/Fuzzer/FuzzerDriver.cpp
@@ -148,7 +148,7 @@ static bool ParseOneFlag(const char *Param) {
         int Val = MyStol(Str);
         *FlagDescriptions[F].IntFlag = Val;
         if (Flags.verbosity >= 2)
-          Printf("Flag: %s %d\n", Name, Val);;
+          Printf("Flag: %s %d\n", Name, Val);
         return true;
       } else if (FlagDescriptions[F].UIntFlag) {
         unsigned int Val = std::stoul(Str);
diff --git a/external_imported/json/test/thirdparty/Fuzzer/FuzzerExtFunctions.def b/external_imported/json/tests/thirdparty/Fuzzer/FuzzerExtFunctions.def
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/FuzzerExtFunctions.def
rename to external_imported/json/tests/thirdparty/Fuzzer/FuzzerExtFunctions.def
diff --git a/external_imported/json/test/thirdparty/Fuzzer/FuzzerExtFunctions.h b/external_imported/json/tests/thirdparty/Fuzzer/FuzzerExtFunctions.h
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/FuzzerExtFunctions.h
rename to external_imported/json/tests/thirdparty/Fuzzer/FuzzerExtFunctions.h
diff --git a/external_imported/json/test/thirdparty/Fuzzer/FuzzerExtFunctionsDlsym.cpp b/external_imported/json/tests/thirdparty/Fuzzer/FuzzerExtFunctionsDlsym.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/FuzzerExtFunctionsDlsym.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/FuzzerExtFunctionsDlsym.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/FuzzerExtFunctionsWeak.cpp b/external_imported/json/tests/thirdparty/Fuzzer/FuzzerExtFunctionsWeak.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/FuzzerExtFunctionsWeak.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/FuzzerExtFunctionsWeak.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/FuzzerExtFunctionsWeakAlias.cpp b/external_imported/json/tests/thirdparty/Fuzzer/FuzzerExtFunctionsWeakAlias.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/FuzzerExtFunctionsWeakAlias.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/FuzzerExtFunctionsWeakAlias.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/FuzzerFlags.def b/external_imported/json/tests/thirdparty/Fuzzer/FuzzerFlags.def
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/FuzzerFlags.def
rename to external_imported/json/tests/thirdparty/Fuzzer/FuzzerFlags.def
diff --git a/external_imported/json/test/thirdparty/Fuzzer/FuzzerIO.cpp b/external_imported/json/tests/thirdparty/Fuzzer/FuzzerIO.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/FuzzerIO.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/FuzzerIO.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/FuzzerIO.h b/external_imported/json/tests/thirdparty/Fuzzer/FuzzerIO.h
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/FuzzerIO.h
rename to external_imported/json/tests/thirdparty/Fuzzer/FuzzerIO.h
diff --git a/external_imported/json/test/thirdparty/Fuzzer/FuzzerIOPosix.cpp b/external_imported/json/tests/thirdparty/Fuzzer/FuzzerIOPosix.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/FuzzerIOPosix.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/FuzzerIOPosix.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/FuzzerIOWindows.cpp b/external_imported/json/tests/thirdparty/Fuzzer/FuzzerIOWindows.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/FuzzerIOWindows.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/FuzzerIOWindows.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/FuzzerInterface.h b/external_imported/json/tests/thirdparty/Fuzzer/FuzzerInterface.h
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/FuzzerInterface.h
rename to external_imported/json/tests/thirdparty/Fuzzer/FuzzerInterface.h
diff --git a/external_imported/json/test/thirdparty/Fuzzer/FuzzerInternal.h b/external_imported/json/tests/thirdparty/Fuzzer/FuzzerInternal.h
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/FuzzerInternal.h
rename to external_imported/json/tests/thirdparty/Fuzzer/FuzzerInternal.h
diff --git a/external_imported/json/test/thirdparty/Fuzzer/FuzzerLoop.cpp b/external_imported/json/tests/thirdparty/Fuzzer/FuzzerLoop.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/FuzzerLoop.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/FuzzerLoop.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/FuzzerMain.cpp b/external_imported/json/tests/thirdparty/Fuzzer/FuzzerMain.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/FuzzerMain.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/FuzzerMain.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/FuzzerMerge.cpp b/external_imported/json/tests/thirdparty/Fuzzer/FuzzerMerge.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/FuzzerMerge.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/FuzzerMerge.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/FuzzerMerge.h b/external_imported/json/tests/thirdparty/Fuzzer/FuzzerMerge.h
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/FuzzerMerge.h
rename to external_imported/json/tests/thirdparty/Fuzzer/FuzzerMerge.h
diff --git a/external_imported/json/test/thirdparty/Fuzzer/FuzzerMutate.cpp b/external_imported/json/tests/thirdparty/Fuzzer/FuzzerMutate.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/FuzzerMutate.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/FuzzerMutate.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/FuzzerMutate.h b/external_imported/json/tests/thirdparty/Fuzzer/FuzzerMutate.h
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/FuzzerMutate.h
rename to external_imported/json/tests/thirdparty/Fuzzer/FuzzerMutate.h
diff --git a/external_imported/json/test/thirdparty/Fuzzer/FuzzerOptions.h b/external_imported/json/tests/thirdparty/Fuzzer/FuzzerOptions.h
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/FuzzerOptions.h
rename to external_imported/json/tests/thirdparty/Fuzzer/FuzzerOptions.h
diff --git a/external_imported/json/test/thirdparty/Fuzzer/FuzzerRandom.h b/external_imported/json/tests/thirdparty/Fuzzer/FuzzerRandom.h
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/FuzzerRandom.h
rename to external_imported/json/tests/thirdparty/Fuzzer/FuzzerRandom.h
diff --git a/external_imported/json/test/thirdparty/Fuzzer/FuzzerSHA1.cpp b/external_imported/json/tests/thirdparty/Fuzzer/FuzzerSHA1.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/FuzzerSHA1.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/FuzzerSHA1.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/FuzzerSHA1.h b/external_imported/json/tests/thirdparty/Fuzzer/FuzzerSHA1.h
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/FuzzerSHA1.h
rename to external_imported/json/tests/thirdparty/Fuzzer/FuzzerSHA1.h
diff --git a/external_imported/json/test/thirdparty/Fuzzer/FuzzerTracePC.cpp b/external_imported/json/tests/thirdparty/Fuzzer/FuzzerTracePC.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/FuzzerTracePC.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/FuzzerTracePC.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/FuzzerTracePC.h b/external_imported/json/tests/thirdparty/Fuzzer/FuzzerTracePC.h
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/FuzzerTracePC.h
rename to external_imported/json/tests/thirdparty/Fuzzer/FuzzerTracePC.h
diff --git a/external_imported/json/test/thirdparty/Fuzzer/FuzzerTraceState.cpp b/external_imported/json/tests/thirdparty/Fuzzer/FuzzerTraceState.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/FuzzerTraceState.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/FuzzerTraceState.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/FuzzerUtil.cpp b/external_imported/json/tests/thirdparty/Fuzzer/FuzzerUtil.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/FuzzerUtil.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/FuzzerUtil.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/FuzzerUtil.h b/external_imported/json/tests/thirdparty/Fuzzer/FuzzerUtil.h
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/FuzzerUtil.h
rename to external_imported/json/tests/thirdparty/Fuzzer/FuzzerUtil.h
diff --git a/external_imported/json/test/thirdparty/Fuzzer/FuzzerUtilDarwin.cpp b/external_imported/json/tests/thirdparty/Fuzzer/FuzzerUtilDarwin.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/FuzzerUtilDarwin.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/FuzzerUtilDarwin.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/FuzzerUtilLinux.cpp b/external_imported/json/tests/thirdparty/Fuzzer/FuzzerUtilLinux.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/FuzzerUtilLinux.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/FuzzerUtilLinux.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/FuzzerUtilPosix.cpp b/external_imported/json/tests/thirdparty/Fuzzer/FuzzerUtilPosix.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/FuzzerUtilPosix.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/FuzzerUtilPosix.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/FuzzerUtilWindows.cpp b/external_imported/json/tests/thirdparty/Fuzzer/FuzzerUtilWindows.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/FuzzerUtilWindows.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/FuzzerUtilWindows.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/FuzzerValueBitMap.h b/external_imported/json/tests/thirdparty/Fuzzer/FuzzerValueBitMap.h
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/FuzzerValueBitMap.h
rename to external_imported/json/tests/thirdparty/Fuzzer/FuzzerValueBitMap.h
diff --git a/external_imported/json/test/thirdparty/Fuzzer/README.txt b/external_imported/json/tests/thirdparty/Fuzzer/README.txt
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/README.txt
rename to external_imported/json/tests/thirdparty/Fuzzer/README.txt
diff --git a/external_imported/json/test/thirdparty/Fuzzer/afl/afl_driver.cpp b/external_imported/json/tests/thirdparty/Fuzzer/afl/afl_driver.cpp
similarity index 99%
rename from external_imported/json/test/thirdparty/Fuzzer/afl/afl_driver.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/afl/afl_driver.cpp
index fc9589552..57ee56109 100644
--- a/external_imported/json/test/thirdparty/Fuzzer/afl/afl_driver.cpp
+++ b/external_imported/json/tests/thirdparty/Fuzzer/afl/afl_driver.cpp
@@ -71,7 +71,7 @@ statistics from the file. If that fails then the process will quit.
 #endif
 
 // Used to avoid repeating error checking boilerplate. If cond is false, a
-// fatal error has occured in the program. In this event print error_message
+// fatal error has occurred in the program. In this event print error_message
 // to stderr and abort(). Otherwise do nothing. Note that setting
 // AFL_DRIVER_STDERR_DUPLICATE_FILENAME may cause error_message to be appended
 // to the file as well, if the error occurs after the duplication is performed.
diff --git a/external_imported/json/test/thirdparty/Fuzzer/build.sh b/external_imported/json/tests/thirdparty/Fuzzer/build.sh
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/build.sh
rename to external_imported/json/tests/thirdparty/Fuzzer/build.sh
diff --git a/external_imported/json/test/thirdparty/Fuzzer/cxx.dict b/external_imported/json/tests/thirdparty/Fuzzer/cxx.dict
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/cxx.dict
rename to external_imported/json/tests/thirdparty/Fuzzer/cxx.dict
diff --git a/external_imported/json/test/thirdparty/Fuzzer/standalone/StandaloneFuzzTargetMain.c b/external_imported/json/tests/thirdparty/Fuzzer/standalone/StandaloneFuzzTargetMain.c
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/standalone/StandaloneFuzzTargetMain.c
rename to external_imported/json/tests/thirdparty/Fuzzer/standalone/StandaloneFuzzTargetMain.c
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/AFLDriverTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/AFLDriverTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/AFLDriverTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/AFLDriverTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/AbsNegAndConstant64Test.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/AbsNegAndConstant64Test.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/AbsNegAndConstant64Test.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/AbsNegAndConstant64Test.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/AbsNegAndConstantTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/AbsNegAndConstantTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/AbsNegAndConstantTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/AbsNegAndConstantTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/AccumulateAllocationsTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/AccumulateAllocationsTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/AccumulateAllocationsTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/AccumulateAllocationsTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/BufferOverflowOnInput.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/BufferOverflowOnInput.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/BufferOverflowOnInput.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/BufferOverflowOnInput.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/CMakeLists.txt b/external_imported/json/tests/thirdparty/Fuzzer/test/CMakeLists.txt
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/CMakeLists.txt
rename to external_imported/json/tests/thirdparty/Fuzzer/test/CMakeLists.txt
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/CallerCalleeTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/CallerCalleeTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/CallerCalleeTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/CallerCalleeTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/CounterTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/CounterTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/CounterTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/CounterTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/CustomCrossOverTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/CustomCrossOverTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/CustomCrossOverTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/CustomCrossOverTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/CustomMutatorTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/CustomMutatorTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/CustomMutatorTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/CustomMutatorTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/DSO1.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/DSO1.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/DSO1.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/DSO1.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/DSO2.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/DSO2.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/DSO2.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/DSO2.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/DSOTestExtra.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/DSOTestExtra.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/DSOTestExtra.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/DSOTestExtra.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/DSOTestMain.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/DSOTestMain.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/DSOTestMain.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/DSOTestMain.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/DivTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/DivTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/DivTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/DivTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/EmptyTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/EmptyTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/EmptyTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/EmptyTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/FourIndependentBranchesTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/FourIndependentBranchesTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/FourIndependentBranchesTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/FourIndependentBranchesTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/FullCoverageSetTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/FullCoverageSetTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/FullCoverageSetTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/FullCoverageSetTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/FuzzerUnittest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/FuzzerUnittest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/FuzzerUnittest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/FuzzerUnittest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/InitializeTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/InitializeTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/InitializeTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/InitializeTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/LeakTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/LeakTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/LeakTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/LeakTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/LeakTimeoutTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/LeakTimeoutTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/LeakTimeoutTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/LeakTimeoutTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/LoadTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/LoadTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/LoadTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/LoadTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/MemcmpTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/MemcmpTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/MemcmpTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/MemcmpTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/NthRunCrashTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/NthRunCrashTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/NthRunCrashTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/NthRunCrashTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/NullDerefOnEmptyTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/NullDerefOnEmptyTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/NullDerefOnEmptyTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/NullDerefOnEmptyTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/NullDerefTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/NullDerefTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/NullDerefTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/NullDerefTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/OneHugeAllocTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/OneHugeAllocTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/OneHugeAllocTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/OneHugeAllocTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/OutOfMemorySingleLargeMallocTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/OutOfMemorySingleLargeMallocTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/OutOfMemorySingleLargeMallocTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/OutOfMemorySingleLargeMallocTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/OutOfMemoryTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/OutOfMemoryTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/OutOfMemoryTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/OutOfMemoryTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/RepeatedBytesTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/RepeatedBytesTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/RepeatedBytesTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/RepeatedBytesTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/RepeatedMemcmp.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/RepeatedMemcmp.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/RepeatedMemcmp.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/RepeatedMemcmp.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/ShrinkControlFlowTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/ShrinkControlFlowTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/ShrinkControlFlowTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/ShrinkControlFlowTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/ShrinkValueProfileTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/ShrinkValueProfileTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/ShrinkValueProfileTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/ShrinkValueProfileTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/SignedIntOverflowTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/SignedIntOverflowTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/SignedIntOverflowTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/SignedIntOverflowTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/SimpleCmpTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/SimpleCmpTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/SimpleCmpTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/SimpleCmpTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/SimpleDictionaryTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/SimpleDictionaryTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/SimpleDictionaryTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/SimpleDictionaryTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/SimpleHashTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/SimpleHashTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/SimpleHashTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/SimpleHashTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/SimpleTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/SimpleTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/SimpleTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/SimpleTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/SimpleThreadedTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/SimpleThreadedTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/SimpleThreadedTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/SimpleThreadedTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/SingleMemcmpTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/SingleMemcmpTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/SingleMemcmpTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/SingleMemcmpTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/SingleStrcmpTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/SingleStrcmpTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/SingleStrcmpTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/SingleStrcmpTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/SingleStrncmpTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/SingleStrncmpTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/SingleStrncmpTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/SingleStrncmpTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/SpamyTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/SpamyTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/SpamyTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/SpamyTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/StrcmpTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/StrcmpTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/StrcmpTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/StrcmpTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/StrncmpOOBTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/StrncmpOOBTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/StrncmpOOBTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/StrncmpOOBTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/StrncmpTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/StrncmpTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/StrncmpTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/StrncmpTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/StrstrTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/StrstrTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/StrstrTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/StrstrTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/SwapCmpTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/SwapCmpTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/SwapCmpTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/SwapCmpTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/Switch2Test.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/Switch2Test.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/Switch2Test.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/Switch2Test.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/SwitchTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/SwitchTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/SwitchTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/SwitchTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/ThreadedLeakTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/ThreadedLeakTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/ThreadedLeakTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/ThreadedLeakTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/ThreadedTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/ThreadedTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/ThreadedTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/ThreadedTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/TimeoutEmptyTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/TimeoutEmptyTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/TimeoutEmptyTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/TimeoutEmptyTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/TimeoutTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/TimeoutTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/TimeoutTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/TimeoutTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/TraceMallocTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/TraceMallocTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/TraceMallocTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/TraceMallocTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/UninstrumentedTest.cpp b/external_imported/json/tests/thirdparty/Fuzzer/test/UninstrumentedTest.cpp
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/UninstrumentedTest.cpp
rename to external_imported/json/tests/thirdparty/Fuzzer/test/UninstrumentedTest.cpp
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/afl-driver-extra-stats.test b/external_imported/json/tests/thirdparty/Fuzzer/test/afl-driver-extra-stats.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/afl-driver-extra-stats.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/afl-driver-extra-stats.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/afl-driver-stderr.test b/external_imported/json/tests/thirdparty/Fuzzer/test/afl-driver-stderr.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/afl-driver-stderr.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/afl-driver-stderr.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/caller-callee.test b/external_imported/json/tests/thirdparty/Fuzzer/test/caller-callee.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/caller-callee.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/caller-callee.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/coverage.test b/external_imported/json/tests/thirdparty/Fuzzer/test/coverage.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/coverage.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/coverage.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/dict1.txt b/external_imported/json/tests/thirdparty/Fuzzer/test/dict1.txt
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/dict1.txt
rename to external_imported/json/tests/thirdparty/Fuzzer/test/dict1.txt
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/dump_coverage.test b/external_imported/json/tests/thirdparty/Fuzzer/test/dump_coverage.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/dump_coverage.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/dump_coverage.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/fuzzer-customcrossover.test b/external_imported/json/tests/thirdparty/Fuzzer/test/fuzzer-customcrossover.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/fuzzer-customcrossover.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/fuzzer-customcrossover.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/fuzzer-custommutator.test b/external_imported/json/tests/thirdparty/Fuzzer/test/fuzzer-custommutator.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/fuzzer-custommutator.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/fuzzer-custommutator.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/fuzzer-dict.test b/external_imported/json/tests/thirdparty/Fuzzer/test/fuzzer-dict.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/fuzzer-dict.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/fuzzer-dict.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/fuzzer-dirs.test b/external_imported/json/tests/thirdparty/Fuzzer/test/fuzzer-dirs.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/fuzzer-dirs.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/fuzzer-dirs.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/fuzzer-fdmask.test b/external_imported/json/tests/thirdparty/Fuzzer/test/fuzzer-fdmask.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/fuzzer-fdmask.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/fuzzer-fdmask.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/fuzzer-finalstats.test b/external_imported/json/tests/thirdparty/Fuzzer/test/fuzzer-finalstats.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/fuzzer-finalstats.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/fuzzer-finalstats.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/fuzzer-flags.test b/external_imported/json/tests/thirdparty/Fuzzer/test/fuzzer-flags.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/fuzzer-flags.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/fuzzer-flags.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/fuzzer-jobs.test b/external_imported/json/tests/thirdparty/Fuzzer/test/fuzzer-jobs.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/fuzzer-jobs.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/fuzzer-jobs.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/fuzzer-leak.test b/external_imported/json/tests/thirdparty/Fuzzer/test/fuzzer-leak.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/fuzzer-leak.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/fuzzer-leak.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/fuzzer-oom-with-profile.test b/external_imported/json/tests/thirdparty/Fuzzer/test/fuzzer-oom-with-profile.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/fuzzer-oom-with-profile.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/fuzzer-oom-with-profile.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/fuzzer-oom.test b/external_imported/json/tests/thirdparty/Fuzzer/test/fuzzer-oom.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/fuzzer-oom.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/fuzzer-oom.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/fuzzer-printcovpcs.test b/external_imported/json/tests/thirdparty/Fuzzer/test/fuzzer-printcovpcs.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/fuzzer-printcovpcs.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/fuzzer-printcovpcs.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/fuzzer-runs.test b/external_imported/json/tests/thirdparty/Fuzzer/test/fuzzer-runs.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/fuzzer-runs.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/fuzzer-runs.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/fuzzer-seed.test b/external_imported/json/tests/thirdparty/Fuzzer/test/fuzzer-seed.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/fuzzer-seed.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/fuzzer-seed.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/fuzzer-segv.test b/external_imported/json/tests/thirdparty/Fuzzer/test/fuzzer-segv.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/fuzzer-segv.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/fuzzer-segv.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/fuzzer-singleinputs.test b/external_imported/json/tests/thirdparty/Fuzzer/test/fuzzer-singleinputs.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/fuzzer-singleinputs.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/fuzzer-singleinputs.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/fuzzer-threaded.test b/external_imported/json/tests/thirdparty/Fuzzer/test/fuzzer-threaded.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/fuzzer-threaded.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/fuzzer-threaded.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/fuzzer-timeout.test b/external_imported/json/tests/thirdparty/Fuzzer/test/fuzzer-timeout.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/fuzzer-timeout.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/fuzzer-timeout.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/fuzzer-traces-hooks.test b/external_imported/json/tests/thirdparty/Fuzzer/test/fuzzer-traces-hooks.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/fuzzer-traces-hooks.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/fuzzer-traces-hooks.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/fuzzer-ubsan.test b/external_imported/json/tests/thirdparty/Fuzzer/test/fuzzer-ubsan.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/fuzzer-ubsan.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/fuzzer-ubsan.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/fuzzer.test b/external_imported/json/tests/thirdparty/Fuzzer/test/fuzzer.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/fuzzer.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/fuzzer.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/hi.txt b/external_imported/json/tests/thirdparty/Fuzzer/test/hi.txt
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/hi.txt
rename to external_imported/json/tests/thirdparty/Fuzzer/test/hi.txt
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/lit.cfg b/external_imported/json/tests/thirdparty/Fuzzer/test/lit.cfg
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/lit.cfg
rename to external_imported/json/tests/thirdparty/Fuzzer/test/lit.cfg
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/lit.site.cfg.in b/external_imported/json/tests/thirdparty/Fuzzer/test/lit.site.cfg.in
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/lit.site.cfg.in
rename to external_imported/json/tests/thirdparty/Fuzzer/test/lit.site.cfg.in
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/merge.test b/external_imported/json/tests/thirdparty/Fuzzer/test/merge.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/merge.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/merge.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/minimize_crash.test b/external_imported/json/tests/thirdparty/Fuzzer/test/minimize_crash.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/minimize_crash.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/minimize_crash.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/no-coverage/CMakeLists.txt b/external_imported/json/tests/thirdparty/Fuzzer/test/no-coverage/CMakeLists.txt
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/no-coverage/CMakeLists.txt
rename to external_imported/json/tests/thirdparty/Fuzzer/test/no-coverage/CMakeLists.txt
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/repeated-bytes.test b/external_imported/json/tests/thirdparty/Fuzzer/test/repeated-bytes.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/repeated-bytes.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/repeated-bytes.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/shrink.test b/external_imported/json/tests/thirdparty/Fuzzer/test/shrink.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/shrink.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/shrink.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/simple-cmp.test b/external_imported/json/tests/thirdparty/Fuzzer/test/simple-cmp.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/simple-cmp.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/simple-cmp.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/standalone.test b/external_imported/json/tests/thirdparty/Fuzzer/test/standalone.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/standalone.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/standalone.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/swap-cmp.test b/external_imported/json/tests/thirdparty/Fuzzer/test/swap-cmp.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/swap-cmp.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/swap-cmp.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/trace-malloc.test b/external_imported/json/tests/thirdparty/Fuzzer/test/trace-malloc.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/trace-malloc.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/trace-malloc.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/ubsan/CMakeLists.txt b/external_imported/json/tests/thirdparty/Fuzzer/test/ubsan/CMakeLists.txt
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/ubsan/CMakeLists.txt
rename to external_imported/json/tests/thirdparty/Fuzzer/test/ubsan/CMakeLists.txt
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/ulimit.test b/external_imported/json/tests/thirdparty/Fuzzer/test/ulimit.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/ulimit.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/ulimit.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/uninstrumented/CMakeLists.txt b/external_imported/json/tests/thirdparty/Fuzzer/test/uninstrumented/CMakeLists.txt
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/uninstrumented/CMakeLists.txt
rename to external_imported/json/tests/thirdparty/Fuzzer/test/uninstrumented/CMakeLists.txt
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/unit/lit.cfg b/external_imported/json/tests/thirdparty/Fuzzer/test/unit/lit.cfg
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/unit/lit.cfg
rename to external_imported/json/tests/thirdparty/Fuzzer/test/unit/lit.cfg
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/unit/lit.site.cfg.in b/external_imported/json/tests/thirdparty/Fuzzer/test/unit/lit.site.cfg.in
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/unit/lit.site.cfg.in
rename to external_imported/json/tests/thirdparty/Fuzzer/test/unit/lit.site.cfg.in
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/value-profile-cmp.test b/external_imported/json/tests/thirdparty/Fuzzer/test/value-profile-cmp.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/value-profile-cmp.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/value-profile-cmp.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/value-profile-cmp2.test b/external_imported/json/tests/thirdparty/Fuzzer/test/value-profile-cmp2.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/value-profile-cmp2.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/value-profile-cmp2.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/value-profile-cmp3.test b/external_imported/json/tests/thirdparty/Fuzzer/test/value-profile-cmp3.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/value-profile-cmp3.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/value-profile-cmp3.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/value-profile-cmp4.test b/external_imported/json/tests/thirdparty/Fuzzer/test/value-profile-cmp4.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/value-profile-cmp4.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/value-profile-cmp4.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/value-profile-div.test b/external_imported/json/tests/thirdparty/Fuzzer/test/value-profile-div.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/value-profile-div.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/value-profile-div.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/value-profile-load.test b/external_imported/json/tests/thirdparty/Fuzzer/test/value-profile-load.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/value-profile-load.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/value-profile-load.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/value-profile-mem.test b/external_imported/json/tests/thirdparty/Fuzzer/test/value-profile-mem.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/value-profile-mem.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/value-profile-mem.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/value-profile-set.test b/external_imported/json/tests/thirdparty/Fuzzer/test/value-profile-set.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/value-profile-set.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/value-profile-set.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/value-profile-strcmp.test b/external_imported/json/tests/thirdparty/Fuzzer/test/value-profile-strcmp.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/value-profile-strcmp.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/value-profile-strcmp.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/value-profile-strncmp.test b/external_imported/json/tests/thirdparty/Fuzzer/test/value-profile-strncmp.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/value-profile-strncmp.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/value-profile-strncmp.test
diff --git a/external_imported/json/test/thirdparty/Fuzzer/test/value-profile-switch.test b/external_imported/json/tests/thirdparty/Fuzzer/test/value-profile-switch.test
similarity index 100%
rename from external_imported/json/test/thirdparty/Fuzzer/test/value-profile-switch.test
rename to external_imported/json/tests/thirdparty/Fuzzer/test/value-profile-switch.test
diff --git a/external_imported/json/tests/thirdparty/doctest/doctest.h b/external_imported/json/tests/thirdparty/doctest/doctest.h
new file mode 100644
index 000000000..5c754cde0
--- /dev/null
+++ b/external_imported/json/tests/thirdparty/doctest/doctest.h
@@ -0,0 +1,7106 @@
+// ====================================================================== lgtm [cpp/missing-header-guard]
+// == DO NOT MODIFY THIS FILE BY HAND - IT IS AUTO GENERATED BY CMAKE! ==
+// ======================================================================
+//
+// doctest.h - the lightest feature-rich C++ single-header testing framework for unit tests and TDD
+//
+// Copyright (c) 2016-2023 Viktor Kirilov
+//
+// Distributed under the MIT Software License
+// See accompanying file LICENSE.txt or copy at
+// https://opensource.org/licenses/MIT
+//
+// The documentation can be found at the library's page:
+// https://github.com/doctest/doctest/blob/master/doc/markdown/readme.md
+//
+// =================================================================================================
+// =================================================================================================
+// =================================================================================================
+//
+// The library is heavily influenced by Catch - https://github.com/catchorg/Catch2
+// which uses the Boost Software License - Version 1.0
+// see here - https://github.com/catchorg/Catch2/blob/master/LICENSE.txt
+//
+// The concept of subcases (sections in Catch) and expression decomposition are from there.
+// Some parts of the code are taken directly:
+// - stringification - the detection of "ostream& operator<<(ostream&, const T&)" and StringMaker<>
+// - the Approx() helper class for floating point comparison
+// - colors in the console
+// - breaking into a debugger
+// - signal / SEH handling
+// - timer
+// - XmlWriter class - thanks to Phil Nash for allowing the direct reuse (AKA copy/paste)
+//
+// The expression decomposing templates are taken from lest - https://github.com/martinmoene/lest
+// which uses the Boost Software License - Version 1.0
+// see here - https://github.com/martinmoene/lest/blob/master/LICENSE.txt
+//
+// =================================================================================================
+// =================================================================================================
+// =================================================================================================
+
+#ifndef DOCTEST_LIBRARY_INCLUDED
+#define DOCTEST_LIBRARY_INCLUDED
+
+// =================================================================================================
+// == VERSION ======================================================================================
+// =================================================================================================
+
+#define DOCTEST_VERSION_MAJOR 2
+#define DOCTEST_VERSION_MINOR 4
+#define DOCTEST_VERSION_PATCH 11
+
+// util we need here
+#define DOCTEST_TOSTR_IMPL(x) #x
+#define DOCTEST_TOSTR(x) DOCTEST_TOSTR_IMPL(x)
+
+#define DOCTEST_VERSION_STR                                                                        \
+    DOCTEST_TOSTR(DOCTEST_VERSION_MAJOR) "."                                                       \
+    DOCTEST_TOSTR(DOCTEST_VERSION_MINOR) "."                                                       \
+    DOCTEST_TOSTR(DOCTEST_VERSION_PATCH)
+
+#define DOCTEST_VERSION                                                                            \
+    (DOCTEST_VERSION_MAJOR * 10000 + DOCTEST_VERSION_MINOR * 100 + DOCTEST_VERSION_PATCH)
+
+// =================================================================================================
+// == COMPILER VERSION =============================================================================
+// =================================================================================================
+
+// ideas for the version stuff are taken from here: https://github.com/cxxstuff/cxx_detect
+
+#ifdef _MSC_VER
+#define DOCTEST_CPLUSPLUS _MSVC_LANG
+#else
+#define DOCTEST_CPLUSPLUS __cplusplus
+#endif
+
+#define DOCTEST_COMPILER(MAJOR, MINOR, PATCH) ((MAJOR)*10000000 + (MINOR)*100000 + (PATCH))
+
+// GCC/Clang and GCC/MSVC are mutually exclusive, but Clang/MSVC are not because of clang-cl...
+#if defined(_MSC_VER) && defined(_MSC_FULL_VER)
+#if _MSC_VER == _MSC_FULL_VER / 10000
+#define DOCTEST_MSVC DOCTEST_COMPILER(_MSC_VER / 100, _MSC_VER % 100, _MSC_FULL_VER % 10000)
+#else // MSVC
+#define DOCTEST_MSVC                                                                               \
+    DOCTEST_COMPILER(_MSC_VER / 100, (_MSC_FULL_VER / 100000) % 100, _MSC_FULL_VER % 100000)
+#endif // MSVC
+#endif // MSVC
+#if defined(__clang__) && defined(__clang_minor__) && defined(__clang_patchlevel__)
+#define DOCTEST_CLANG DOCTEST_COMPILER(__clang_major__, __clang_minor__, __clang_patchlevel__)
+#elif defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__GNUC_PATCHLEVEL__) &&              \
+        !defined(__INTEL_COMPILER)
+#define DOCTEST_GCC DOCTEST_COMPILER(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
+#endif // GCC
+#if defined(__INTEL_COMPILER)
+#define DOCTEST_ICC DOCTEST_COMPILER(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, 0)
+#endif // ICC
+
+#ifndef DOCTEST_MSVC
+#define DOCTEST_MSVC 0
+#endif // DOCTEST_MSVC
+#ifndef DOCTEST_CLANG
+#define DOCTEST_CLANG 0
+#endif // DOCTEST_CLANG
+#ifndef DOCTEST_GCC
+#define DOCTEST_GCC 0
+#endif // DOCTEST_GCC
+#ifndef DOCTEST_ICC
+#define DOCTEST_ICC 0
+#endif // DOCTEST_ICC
+
+// =================================================================================================
+// == COMPILER WARNINGS HELPERS ====================================================================
+// =================================================================================================
+
+#if DOCTEST_CLANG && !DOCTEST_ICC
+#define DOCTEST_PRAGMA_TO_STR(x) _Pragma(#x)
+#define DOCTEST_CLANG_SUPPRESS_WARNING_PUSH _Pragma("clang diagnostic push")
+#define DOCTEST_CLANG_SUPPRESS_WARNING(w) DOCTEST_PRAGMA_TO_STR(clang diagnostic ignored w)
+#define DOCTEST_CLANG_SUPPRESS_WARNING_POP _Pragma("clang diagnostic pop")
+#define DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH(w)                                                \
+    DOCTEST_CLANG_SUPPRESS_WARNING_PUSH DOCTEST_CLANG_SUPPRESS_WARNING(w)
+#else // DOCTEST_CLANG
+#define DOCTEST_CLANG_SUPPRESS_WARNING_PUSH
+#define DOCTEST_CLANG_SUPPRESS_WARNING(w)
+#define DOCTEST_CLANG_SUPPRESS_WARNING_POP
+#define DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH(w)
+#endif // DOCTEST_CLANG
+
+#if DOCTEST_GCC
+#define DOCTEST_PRAGMA_TO_STR(x) _Pragma(#x)
+#define DOCTEST_GCC_SUPPRESS_WARNING_PUSH _Pragma("GCC diagnostic push")
+#define DOCTEST_GCC_SUPPRESS_WARNING(w) DOCTEST_PRAGMA_TO_STR(GCC diagnostic ignored w)
+#define DOCTEST_GCC_SUPPRESS_WARNING_POP _Pragma("GCC diagnostic pop")
+#define DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH(w)                                                  \
+    DOCTEST_GCC_SUPPRESS_WARNING_PUSH DOCTEST_GCC_SUPPRESS_WARNING(w)
+#else // DOCTEST_GCC
+#define DOCTEST_GCC_SUPPRESS_WARNING_PUSH
+#define DOCTEST_GCC_SUPPRESS_WARNING(w)
+#define DOCTEST_GCC_SUPPRESS_WARNING_POP
+#define DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH(w)
+#endif // DOCTEST_GCC
+
+#if DOCTEST_MSVC
+#define DOCTEST_MSVC_SUPPRESS_WARNING_PUSH __pragma(warning(push))
+#define DOCTEST_MSVC_SUPPRESS_WARNING(w) __pragma(warning(disable : w))
+#define DOCTEST_MSVC_SUPPRESS_WARNING_POP __pragma(warning(pop))
+#define DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(w)                                                 \
+    DOCTEST_MSVC_SUPPRESS_WARNING_PUSH DOCTEST_MSVC_SUPPRESS_WARNING(w)
+#else // DOCTEST_MSVC
+#define DOCTEST_MSVC_SUPPRESS_WARNING_PUSH
+#define DOCTEST_MSVC_SUPPRESS_WARNING(w)
+#define DOCTEST_MSVC_SUPPRESS_WARNING_POP
+#define DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(w)
+#endif // DOCTEST_MSVC
+
+// =================================================================================================
+// == COMPILER WARNINGS ============================================================================
+// =================================================================================================
+
+// both the header and the implementation suppress all of these,
+// so it only makes sense to aggregate them like so
+#define DOCTEST_SUPPRESS_COMMON_WARNINGS_PUSH                                                      \
+    DOCTEST_CLANG_SUPPRESS_WARNING_PUSH                                                            \
+    DOCTEST_CLANG_SUPPRESS_WARNING("-Wunknown-pragmas")                                            \
+    DOCTEST_CLANG_SUPPRESS_WARNING("-Wweak-vtables")                                               \
+    DOCTEST_CLANG_SUPPRESS_WARNING("-Wpadded")                                                     \
+    DOCTEST_CLANG_SUPPRESS_WARNING("-Wmissing-prototypes")                                         \
+    DOCTEST_CLANG_SUPPRESS_WARNING("-Wc++98-compat")                                               \
+    DOCTEST_CLANG_SUPPRESS_WARNING("-Wc++98-compat-pedantic")                                      \
+                                                                                                   \
+    DOCTEST_GCC_SUPPRESS_WARNING_PUSH                                                              \
+    DOCTEST_GCC_SUPPRESS_WARNING("-Wunknown-pragmas")                                              \
+    DOCTEST_GCC_SUPPRESS_WARNING("-Wpragmas")                                                      \
+    DOCTEST_GCC_SUPPRESS_WARNING("-Weffc++")                                                       \
+    DOCTEST_GCC_SUPPRESS_WARNING("-Wstrict-overflow")                                              \
+    DOCTEST_GCC_SUPPRESS_WARNING("-Wstrict-aliasing")                                              \
+    DOCTEST_GCC_SUPPRESS_WARNING("-Wmissing-declarations")                                         \
+    DOCTEST_GCC_SUPPRESS_WARNING("-Wuseless-cast")                                                 \
+    DOCTEST_GCC_SUPPRESS_WARNING("-Wnoexcept")                                                     \
+                                                                                                   \
+    DOCTEST_MSVC_SUPPRESS_WARNING_PUSH                                                             \
+    /* these 4 also disabled globally via cmake: */                                                \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4514) /* unreferenced inline function has been removed */        \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4571) /* SEH related */                                          \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4710) /* function not inlined */                                 \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4711) /* function selected for inline expansion*/                \
+    /* common ones */                                                                              \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4616) /* invalid compiler warning */                             \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4619) /* invalid compiler warning */                             \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4996) /* The compiler encountered a deprecated declaration */    \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4706) /* assignment within conditional expression */             \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4512) /* 'class' : assignment operator could not be generated */ \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4127) /* conditional expression is constant */                   \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4820) /* padding */                                              \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4625) /* copy constructor was implicitly deleted */              \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4626) /* assignment operator was implicitly deleted */           \
+    DOCTEST_MSVC_SUPPRESS_WARNING(5027) /* move assignment operator implicitly deleted */          \
+    DOCTEST_MSVC_SUPPRESS_WARNING(5026) /* move constructor was implicitly deleted */              \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4640) /* construction of local static object not thread-safe */  \
+    DOCTEST_MSVC_SUPPRESS_WARNING(5045) /* Spectre mitigation for memory load */                   \
+    DOCTEST_MSVC_SUPPRESS_WARNING(5264) /* 'variable-name': 'const' variable is not used */        \
+    /* static analysis */                                                                          \
+    DOCTEST_MSVC_SUPPRESS_WARNING(26439) /* Function may not throw. Declare it 'noexcept' */       \
+    DOCTEST_MSVC_SUPPRESS_WARNING(26495) /* Always initialize a member variable */                 \
+    DOCTEST_MSVC_SUPPRESS_WARNING(26451) /* Arithmetic overflow ... */                             \
+    DOCTEST_MSVC_SUPPRESS_WARNING(26444) /* Avoid unnamed objects with custom ctor and dtor... */  \
+    DOCTEST_MSVC_SUPPRESS_WARNING(26812) /* Prefer 'enum class' over 'enum' */
+
+#define DOCTEST_SUPPRESS_COMMON_WARNINGS_POP                                                       \
+    DOCTEST_CLANG_SUPPRESS_WARNING_POP                                                             \
+    DOCTEST_GCC_SUPPRESS_WARNING_POP                                                               \
+    DOCTEST_MSVC_SUPPRESS_WARNING_POP
+
+DOCTEST_SUPPRESS_COMMON_WARNINGS_PUSH
+
+DOCTEST_CLANG_SUPPRESS_WARNING_PUSH
+DOCTEST_CLANG_SUPPRESS_WARNING("-Wnon-virtual-dtor")
+DOCTEST_CLANG_SUPPRESS_WARNING("-Wdeprecated")
+
+DOCTEST_GCC_SUPPRESS_WARNING_PUSH
+DOCTEST_GCC_SUPPRESS_WARNING("-Wctor-dtor-privacy")
+DOCTEST_GCC_SUPPRESS_WARNING("-Wnon-virtual-dtor")
+DOCTEST_GCC_SUPPRESS_WARNING("-Wsign-promo")
+
+DOCTEST_MSVC_SUPPRESS_WARNING_PUSH
+DOCTEST_MSVC_SUPPRESS_WARNING(4623) // default constructor was implicitly defined as deleted
+
+#define DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_BEGIN                                 \
+    DOCTEST_MSVC_SUPPRESS_WARNING_PUSH                                                             \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4548) /* before comma no effect; expected side - effect */       \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4265) /* virtual functions, but destructor is not virtual */     \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4986) /* exception specification does not match previous */      \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4350) /* 'member1' called instead of 'member2' */                \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4668) /* not defined as a preprocessor macro */                  \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4365) /* signed/unsigned mismatch */                             \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4774) /* format string not a string literal */                   \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4820) /* padding */                                              \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4625) /* copy constructor was implicitly deleted */              \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4626) /* assignment operator was implicitly deleted */           \
+    DOCTEST_MSVC_SUPPRESS_WARNING(5027) /* move assignment operator implicitly deleted */          \
+    DOCTEST_MSVC_SUPPRESS_WARNING(5026) /* move constructor was implicitly deleted */              \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4623) /* default constructor was implicitly deleted */           \
+    DOCTEST_MSVC_SUPPRESS_WARNING(5039) /* pointer to pot. throwing function passed to extern C */ \
+    DOCTEST_MSVC_SUPPRESS_WARNING(5045) /* Spectre mitigation for memory load */                   \
+    DOCTEST_MSVC_SUPPRESS_WARNING(5105) /* macro producing 'defined' has undefined behavior */     \
+    DOCTEST_MSVC_SUPPRESS_WARNING(4738) /* storing float result in memory, loss of performance */  \
+    DOCTEST_MSVC_SUPPRESS_WARNING(5262) /* implicit fall-through */
+
+#define DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_END DOCTEST_MSVC_SUPPRESS_WARNING_POP
+
+// =================================================================================================
+// == FEATURE DETECTION ============================================================================
+// =================================================================================================
+
+// general compiler feature support table: https://en.cppreference.com/w/cpp/compiler_support
+// MSVC C++11 feature support table: https://msdn.microsoft.com/en-us/library/hh567368.aspx
+// GCC C++11 feature support table: https://gcc.gnu.org/projects/cxx-status.html
+// MSVC version table:
+// https://en.wikipedia.org/wiki/Microsoft_Visual_C%2B%2B#Internal_version_numbering
+// MSVC++ 14.3 (17) _MSC_VER == 1930 (Visual Studio 2022)
+// MSVC++ 14.2 (16) _MSC_VER == 1920 (Visual Studio 2019)
+// MSVC++ 14.1 (15) _MSC_VER == 1910 (Visual Studio 2017)
+// MSVC++ 14.0      _MSC_VER == 1900 (Visual Studio 2015)
+// MSVC++ 12.0      _MSC_VER == 1800 (Visual Studio 2013)
+// MSVC++ 11.0      _MSC_VER == 1700 (Visual Studio 2012)
+// MSVC++ 10.0      _MSC_VER == 1600 (Visual Studio 2010)
+// MSVC++ 9.0       _MSC_VER == 1500 (Visual Studio 2008)
+// MSVC++ 8.0       _MSC_VER == 1400 (Visual Studio 2005)
+
+// Universal Windows Platform support
+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)
+#define DOCTEST_CONFIG_NO_WINDOWS_SEH
+#endif // WINAPI_FAMILY
+#if DOCTEST_MSVC && !defined(DOCTEST_CONFIG_WINDOWS_SEH)
+#define DOCTEST_CONFIG_WINDOWS_SEH
+#endif // MSVC
+#if defined(DOCTEST_CONFIG_NO_WINDOWS_SEH) && defined(DOCTEST_CONFIG_WINDOWS_SEH)
+#undef DOCTEST_CONFIG_WINDOWS_SEH
+#endif // DOCTEST_CONFIG_NO_WINDOWS_SEH
+
+#if !defined(_WIN32) && !defined(__QNX__) && !defined(DOCTEST_CONFIG_POSIX_SIGNALS) &&             \
+        !defined(__EMSCRIPTEN__) && !defined(__wasi__)
+#define DOCTEST_CONFIG_POSIX_SIGNALS
+#endif // _WIN32
+#if defined(DOCTEST_CONFIG_NO_POSIX_SIGNALS) && defined(DOCTEST_CONFIG_POSIX_SIGNALS)
+#undef DOCTEST_CONFIG_POSIX_SIGNALS
+#endif // DOCTEST_CONFIG_NO_POSIX_SIGNALS
+
+#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS
+#if !defined(__cpp_exceptions) && !defined(__EXCEPTIONS) && !defined(_CPPUNWIND)                   \
+        || defined(__wasi__)
+#define DOCTEST_CONFIG_NO_EXCEPTIONS
+#endif // no exceptions
+#endif // DOCTEST_CONFIG_NO_EXCEPTIONS
+
+#ifdef DOCTEST_CONFIG_NO_EXCEPTIONS_BUT_WITH_ALL_ASSERTS
+#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS
+#define DOCTEST_CONFIG_NO_EXCEPTIONS
+#endif // DOCTEST_CONFIG_NO_EXCEPTIONS
+#endif // DOCTEST_CONFIG_NO_EXCEPTIONS_BUT_WITH_ALL_ASSERTS
+
+#if defined(DOCTEST_CONFIG_NO_EXCEPTIONS) && !defined(DOCTEST_CONFIG_NO_TRY_CATCH_IN_ASSERTS)
+#define DOCTEST_CONFIG_NO_TRY_CATCH_IN_ASSERTS
+#endif // DOCTEST_CONFIG_NO_EXCEPTIONS && !DOCTEST_CONFIG_NO_TRY_CATCH_IN_ASSERTS
+
+#ifdef __wasi__
+#define DOCTEST_CONFIG_NO_MULTITHREADING
+#endif
+
+#if defined(DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN) && !defined(DOCTEST_CONFIG_IMPLEMENT)
+#define DOCTEST_CONFIG_IMPLEMENT
+#endif // DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+#if defined(_WIN32) || defined(__CYGWIN__)
+#if DOCTEST_MSVC
+#define DOCTEST_SYMBOL_EXPORT __declspec(dllexport)
+#define DOCTEST_SYMBOL_IMPORT __declspec(dllimport)
+#else // MSVC
+#define DOCTEST_SYMBOL_EXPORT __attribute__((dllexport))
+#define DOCTEST_SYMBOL_IMPORT __attribute__((dllimport))
+#endif // MSVC
+#else  // _WIN32
+#define DOCTEST_SYMBOL_EXPORT __attribute__((visibility("default")))
+#define DOCTEST_SYMBOL_IMPORT
+#endif // _WIN32
+
+#ifdef DOCTEST_CONFIG_IMPLEMENTATION_IN_DLL
+#ifdef DOCTEST_CONFIG_IMPLEMENT
+#define DOCTEST_INTERFACE DOCTEST_SYMBOL_EXPORT
+#else // DOCTEST_CONFIG_IMPLEMENT
+#define DOCTEST_INTERFACE DOCTEST_SYMBOL_IMPORT
+#endif // DOCTEST_CONFIG_IMPLEMENT
+#else  // DOCTEST_CONFIG_IMPLEMENTATION_IN_DLL
+#define DOCTEST_INTERFACE
+#endif // DOCTEST_CONFIG_IMPLEMENTATION_IN_DLL
+
+// needed for extern template instantiations
+// see https://github.com/fmtlib/fmt/issues/2228
+#if DOCTEST_MSVC
+#define DOCTEST_INTERFACE_DECL
+#define DOCTEST_INTERFACE_DEF DOCTEST_INTERFACE
+#else // DOCTEST_MSVC
+#define DOCTEST_INTERFACE_DECL DOCTEST_INTERFACE
+#define DOCTEST_INTERFACE_DEF
+#endif // DOCTEST_MSVC
+
+#define DOCTEST_EMPTY
+
+#if DOCTEST_MSVC
+#define DOCTEST_NOINLINE __declspec(noinline)
+#define DOCTEST_UNUSED
+#define DOCTEST_ALIGNMENT(x)
+#elif DOCTEST_CLANG && DOCTEST_CLANG < DOCTEST_COMPILER(3, 5, 0)
+#define DOCTEST_NOINLINE
+#define DOCTEST_UNUSED
+#define DOCTEST_ALIGNMENT(x)
+#else
+#define DOCTEST_NOINLINE __attribute__((noinline))
+#define DOCTEST_UNUSED __attribute__((unused))
+#define DOCTEST_ALIGNMENT(x) __attribute__((aligned(x)))
+#endif
+
+#ifdef DOCTEST_CONFIG_NO_CONTRADICTING_INLINE
+#define DOCTEST_INLINE_NOINLINE inline
+#else
+#define DOCTEST_INLINE_NOINLINE inline DOCTEST_NOINLINE
+#endif
+
+#ifndef DOCTEST_NORETURN
+#if DOCTEST_MSVC && (DOCTEST_MSVC < DOCTEST_COMPILER(19, 0, 0))
+#define DOCTEST_NORETURN
+#else // DOCTEST_MSVC
+#define DOCTEST_NORETURN [[noreturn]]
+#endif // DOCTEST_MSVC
+#endif // DOCTEST_NORETURN
+
+#ifndef DOCTEST_NOEXCEPT
+#if DOCTEST_MSVC && (DOCTEST_MSVC < DOCTEST_COMPILER(19, 0, 0))
+#define DOCTEST_NOEXCEPT
+#else // DOCTEST_MSVC
+#define DOCTEST_NOEXCEPT noexcept
+#endif // DOCTEST_MSVC
+#endif // DOCTEST_NOEXCEPT
+
+#ifndef DOCTEST_CONSTEXPR
+#if DOCTEST_MSVC && (DOCTEST_MSVC < DOCTEST_COMPILER(19, 0, 0))
+#define DOCTEST_CONSTEXPR const
+#define DOCTEST_CONSTEXPR_FUNC inline
+#else // DOCTEST_MSVC
+#define DOCTEST_CONSTEXPR constexpr
+#define DOCTEST_CONSTEXPR_FUNC constexpr
+#endif // DOCTEST_MSVC
+#endif // DOCTEST_CONSTEXPR
+
+#ifndef DOCTEST_NO_SANITIZE_INTEGER
+#if DOCTEST_CLANG >= DOCTEST_COMPILER(3, 7, 0)
+#define DOCTEST_NO_SANITIZE_INTEGER __attribute__((no_sanitize("integer")))
+#else
+#define DOCTEST_NO_SANITIZE_INTEGER
+#endif
+#endif // DOCTEST_NO_SANITIZE_INTEGER
+
+// =================================================================================================
+// == FEATURE DETECTION END ========================================================================
+// =================================================================================================
+
+#define DOCTEST_DECLARE_INTERFACE(name)                                                            \
+    virtual ~name();                                                                               \
+    name() = default;                                                                              \
+    name(const name&) = delete;                                                                    \
+    name(name&&) = delete;                                                                         \
+    name& operator=(const name&) = delete;                                                         \
+    name& operator=(name&&) = delete;
+
+#define DOCTEST_DEFINE_INTERFACE(name)                                                             \
+    name::~name() = default;
+
+// internal macros for string concatenation and anonymous variable name generation
+#define DOCTEST_CAT_IMPL(s1, s2) s1##s2
+#define DOCTEST_CAT(s1, s2) DOCTEST_CAT_IMPL(s1, s2)
+#ifdef __COUNTER__ // not standard and may be missing for some compilers
+#define DOCTEST_ANONYMOUS(x) DOCTEST_CAT(x, __COUNTER__)
+#else // __COUNTER__
+#define DOCTEST_ANONYMOUS(x) DOCTEST_CAT(x, __LINE__)
+#endif // __COUNTER__
+
+#ifndef DOCTEST_CONFIG_ASSERTION_PARAMETERS_BY_VALUE
+#define DOCTEST_REF_WRAP(x) x&
+#else // DOCTEST_CONFIG_ASSERTION_PARAMETERS_BY_VALUE
+#define DOCTEST_REF_WRAP(x) x
+#endif // DOCTEST_CONFIG_ASSERTION_PARAMETERS_BY_VALUE
+
+// not using __APPLE__ because... this is how Catch does it
+#ifdef __MAC_OS_X_VERSION_MIN_REQUIRED
+#define DOCTEST_PLATFORM_MAC
+#elif defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
+#define DOCTEST_PLATFORM_IPHONE
+#elif defined(_WIN32)
+#define DOCTEST_PLATFORM_WINDOWS
+#elif defined(__wasi__)
+#define DOCTEST_PLATFORM_WASI
+#else // DOCTEST_PLATFORM
+#define DOCTEST_PLATFORM_LINUX
+#endif // DOCTEST_PLATFORM
+
+namespace doctest { namespace detail {
+    static DOCTEST_CONSTEXPR int consume(const int*, int) noexcept { return 0; }
+}}
+
+#define DOCTEST_GLOBAL_NO_WARNINGS(var, ...)                                                         \
+    DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wglobal-constructors")                                \
+    static const int var = doctest::detail::consume(&var, __VA_ARGS__);                              \
+    DOCTEST_CLANG_SUPPRESS_WARNING_POP
+
+#ifndef DOCTEST_BREAK_INTO_DEBUGGER
+// should probably take a look at https://github.com/scottt/debugbreak
+#ifdef DOCTEST_PLATFORM_LINUX
+#if defined(__GNUC__) && (defined(__i386) || defined(__x86_64))
+// Break at the location of the failing check if possible
+#define DOCTEST_BREAK_INTO_DEBUGGER() __asm__("int $3\n" : :) // NOLINT(hicpp-no-assembler)
+#else
+#include <signal.h>
+#define DOCTEST_BREAK_INTO_DEBUGGER() raise(SIGTRAP)
+#endif
+#elif defined(DOCTEST_PLATFORM_MAC)
+#if defined(__x86_64) || defined(__x86_64__) || defined(__amd64__) || defined(__i386)
+#define DOCTEST_BREAK_INTO_DEBUGGER() __asm__("int $3\n" : :) // NOLINT(hicpp-no-assembler)
+#elif defined(__ppc__) || defined(__ppc64__)
+// https://www.cocoawithlove.com/2008/03/break-into-debugger.html
+#define DOCTEST_BREAK_INTO_DEBUGGER() __asm__("li r0, 20\nsc\nnop\nli r0, 37\nli r4, 2\nsc\nnop\n": : : "memory","r0","r3","r4") // NOLINT(hicpp-no-assembler)
+#else
+#define DOCTEST_BREAK_INTO_DEBUGGER() __asm__("brk #0"); // NOLINT(hicpp-no-assembler)
+#endif
+#elif DOCTEST_MSVC
+#define DOCTEST_BREAK_INTO_DEBUGGER() __debugbreak()
+#elif defined(__MINGW32__)
+DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH("-Wredundant-decls")
+extern "C" __declspec(dllimport) void __stdcall DebugBreak();
+DOCTEST_GCC_SUPPRESS_WARNING_POP
+#define DOCTEST_BREAK_INTO_DEBUGGER() ::DebugBreak()
+#else // linux
+#define DOCTEST_BREAK_INTO_DEBUGGER() (static_cast<void>(0))
+#endif // linux
+#endif // DOCTEST_BREAK_INTO_DEBUGGER
+
+// this is kept here for backwards compatibility since the config option was changed
+#ifdef DOCTEST_CONFIG_USE_IOSFWD
+#ifndef DOCTEST_CONFIG_USE_STD_HEADERS
+#define DOCTEST_CONFIG_USE_STD_HEADERS
+#endif
+#endif // DOCTEST_CONFIG_USE_IOSFWD
+
+// for clang - always include ciso646 (which drags some std stuff) because
+// we want to check if we are using libc++ with the _LIBCPP_VERSION macro in
+// which case we don't want to forward declare stuff from std - for reference:
+// https://github.com/doctest/doctest/issues/126
+// https://github.com/doctest/doctest/issues/356
+#if DOCTEST_CLANG
+#include <ciso646>
+#endif // clang
+
+#ifdef _LIBCPP_VERSION
+#ifndef DOCTEST_CONFIG_USE_STD_HEADERS
+#define DOCTEST_CONFIG_USE_STD_HEADERS
+#endif
+#endif // _LIBCPP_VERSION
+
+#ifdef DOCTEST_CONFIG_USE_STD_HEADERS
+#ifndef DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
+#define DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
+#endif // DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
+DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_BEGIN
+#include <cstddef>
+#include <ostream>
+#include <istream>
+DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_END
+#else // DOCTEST_CONFIG_USE_STD_HEADERS
+
+// Forward declaring 'X' in namespace std is not permitted by the C++ Standard.
+DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4643)
+
+namespace std { // NOLINT(cert-dcl58-cpp)
+typedef decltype(nullptr) nullptr_t; // NOLINT(modernize-use-using)
+typedef decltype(sizeof(void*)) size_t; // NOLINT(modernize-use-using)
+template <class charT>
+struct char_traits;
+template <>
+struct char_traits<char>;
+template <class charT, class traits>
+class basic_ostream; // NOLINT(fuchsia-virtual-inheritance)
+typedef basic_ostream<char, char_traits<char>> ostream; // NOLINT(modernize-use-using)
+template<class traits>
+// NOLINTNEXTLINE
+basic_ostream<char, traits>& operator<<(basic_ostream<char, traits>&, const char*);
+template <class charT, class traits>
+class basic_istream;
+typedef basic_istream<char, char_traits<char>> istream; // NOLINT(modernize-use-using)
+template <class... Types>
+class tuple;
+#if DOCTEST_MSVC >= DOCTEST_COMPILER(19, 20, 0)
+// see this issue on why this is needed: https://github.com/doctest/doctest/issues/183
+template <class Ty>
+class allocator;
+template <class Elem, class Traits, class Alloc>
+class basic_string;
+using string = basic_string<char, char_traits<char>, allocator<char>>;
+#endif // VS 2019
+} // namespace std
+
+DOCTEST_MSVC_SUPPRESS_WARNING_POP
+
+#endif // DOCTEST_CONFIG_USE_STD_HEADERS
+
+#ifdef DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
+#include <type_traits>
+#endif // DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
+
+namespace doctest {
+
+using std::size_t;
+
+DOCTEST_INTERFACE extern bool is_running_in_test;
+
+#ifndef DOCTEST_CONFIG_STRING_SIZE_TYPE
+#define DOCTEST_CONFIG_STRING_SIZE_TYPE unsigned
+#endif
+
+// A 24 byte string class (can be as small as 17 for x64 and 13 for x86) that can hold strings with length
+// of up to 23 chars on the stack before going on the heap - the last byte of the buffer is used for:
+// - "is small" bit - the highest bit - if "0" then it is small - otherwise its "1" (128)
+// - if small - capacity left before going on the heap - using the lowest 5 bits
+// - if small - 2 bits are left unused - the second and third highest ones
+// - if small - acts as a null terminator if strlen() is 23 (24 including the null terminator)
+//              and the "is small" bit remains "0" ("as well as the capacity left") so its OK
+// Idea taken from this lecture about the string implementation of facebook/folly - fbstring
+// https://www.youtube.com/watch?v=kPR8h4-qZdk
+// TODO:
+// - optimizations - like not deleting memory unnecessarily in operator= and etc.
+// - resize/reserve/clear
+// - replace
+// - back/front
+// - iterator stuff
+// - find & friends
+// - push_back/pop_back
+// - assign/insert/erase
+// - relational operators as free functions - taking const char* as one of the params
+class DOCTEST_INTERFACE String
+{
+public:
+    using size_type = DOCTEST_CONFIG_STRING_SIZE_TYPE;
+
+private:
+    static DOCTEST_CONSTEXPR size_type len  = 24;      //!OCLINT avoid private static members
+    static DOCTEST_CONSTEXPR size_type last = len - 1; //!OCLINT avoid private static members
+
+    struct view // len should be more than sizeof(view) - because of the final byte for flags
+    {
+        char*    ptr;
+        size_type size;
+        size_type capacity;
+    };
+
+    union
+    {
+        char buf[len]; // NOLINT(*-avoid-c-arrays)
+        view data;
+    };
+
+    char* allocate(size_type sz);
+
+    bool isOnStack() const noexcept { return (buf[last] & 128) == 0; }
+    void setOnHeap() noexcept;
+    void setLast(size_type in = last) noexcept;
+    void setSize(size_type sz) noexcept;
+
+    void copy(const String& other);
+
+public:
+    static DOCTEST_CONSTEXPR size_type npos = static_cast<size_type>(-1);
+
+    String() noexcept;
+    ~String();
+
+    // cppcheck-suppress noExplicitConstructor
+    String(const char* in);
+    String(const char* in, size_type in_size);
+
+    String(std::istream& in, size_type in_size);
+
+    String(const String& other);
+    String& operator=(const String& other);
+
+    String& operator+=(const String& other);
+
+    String(String&& other) noexcept;
+    String& operator=(String&& other) noexcept;
+
+    char  operator[](size_type i) const;
+    char& operator[](size_type i);
+
+    // the only functions I'm willing to leave in the interface - available for inlining
+    const char* c_str() const { return const_cast<String*>(this)->c_str(); } // NOLINT
+    char*       c_str() {
+        if (isOnStack()) {
+            return reinterpret_cast<char*>(buf);
+        }
+        return data.ptr;
+    }
+
+    size_type size() const;
+    size_type capacity() const;
+
+    String substr(size_type pos, size_type cnt = npos) &&;
+    String substr(size_type pos, size_type cnt = npos) const &;
+
+    size_type find(char ch, size_type pos = 0) const;
+    size_type rfind(char ch, size_type pos = npos) const;
+
+    int compare(const char* other, bool no_case = false) const;
+    int compare(const String& other, bool no_case = false) const;
+
+friend DOCTEST_INTERFACE std::ostream& operator<<(std::ostream& s, const String& in);
+};
+
+DOCTEST_INTERFACE String operator+(const String& lhs, const String& rhs);
+
+DOCTEST_INTERFACE bool operator==(const String& lhs, const String& rhs);
+DOCTEST_INTERFACE bool operator!=(const String& lhs, const String& rhs);
+DOCTEST_INTERFACE bool operator<(const String& lhs, const String& rhs);
+DOCTEST_INTERFACE bool operator>(const String& lhs, const String& rhs);
+DOCTEST_INTERFACE bool operator<=(const String& lhs, const String& rhs);
+DOCTEST_INTERFACE bool operator>=(const String& lhs, const String& rhs);
+
+class DOCTEST_INTERFACE Contains {
+public:
+    explicit Contains(const String& string);
+
+    bool checkWith(const String& other) const;
+
+    String string;
+};
+
+DOCTEST_INTERFACE String toString(const Contains& in);
+
+DOCTEST_INTERFACE bool operator==(const String& lhs, const Contains& rhs);
+DOCTEST_INTERFACE bool operator==(const Contains& lhs, const String& rhs);
+DOCTEST_INTERFACE bool operator!=(const String& lhs, const Contains& rhs);
+DOCTEST_INTERFACE bool operator!=(const Contains& lhs, const String& rhs);
+
+namespace Color {
+    enum Enum
+    {
+        None = 0,
+        White,
+        Red,
+        Green,
+        Blue,
+        Cyan,
+        Yellow,
+        Grey,
+
+        Bright = 0x10,
+
+        BrightRed   = Bright | Red,
+        BrightGreen = Bright | Green,
+        LightGrey   = Bright | Grey,
+        BrightWhite = Bright | White
+    };
+
+    DOCTEST_INTERFACE std::ostream& operator<<(std::ostream& s, Color::Enum code);
+} // namespace Color
+
+namespace assertType {
+    enum Enum
+    {
+        // macro traits
+
+        is_warn    = 1,
+        is_check   = 2 * is_warn,
+        is_require = 2 * is_check,
+
+        is_normal      = 2 * is_require,
+        is_throws      = 2 * is_normal,
+        is_throws_as   = 2 * is_throws,
+        is_throws_with = 2 * is_throws_as,
+        is_nothrow     = 2 * is_throws_with,
+
+        is_false = 2 * is_nothrow,
+        is_unary = 2 * is_false, // not checked anywhere - used just to distinguish the types
+
+        is_eq = 2 * is_unary,
+        is_ne = 2 * is_eq,
+
+        is_lt = 2 * is_ne,
+        is_gt = 2 * is_lt,
+
+        is_ge = 2 * is_gt,
+        is_le = 2 * is_ge,
+
+        // macro types
+
+        DT_WARN    = is_normal | is_warn,
+        DT_CHECK   = is_normal | is_check,
+        DT_REQUIRE = is_normal | is_require,
+
+        DT_WARN_FALSE    = is_normal | is_false | is_warn,
+        DT_CHECK_FALSE   = is_normal | is_false | is_check,
+        DT_REQUIRE_FALSE = is_normal | is_false | is_require,
+
+        DT_WARN_THROWS    = is_throws | is_warn,
+        DT_CHECK_THROWS   = is_throws | is_check,
+        DT_REQUIRE_THROWS = is_throws | is_require,
+
+        DT_WARN_THROWS_AS    = is_throws_as | is_warn,
+        DT_CHECK_THROWS_AS   = is_throws_as | is_check,
+        DT_REQUIRE_THROWS_AS = is_throws_as | is_require,
+
+        DT_WARN_THROWS_WITH    = is_throws_with | is_warn,
+        DT_CHECK_THROWS_WITH   = is_throws_with | is_check,
+        DT_REQUIRE_THROWS_WITH = is_throws_with | is_require,
+
+        DT_WARN_THROWS_WITH_AS    = is_throws_with | is_throws_as | is_warn,
+        DT_CHECK_THROWS_WITH_AS   = is_throws_with | is_throws_as | is_check,
+        DT_REQUIRE_THROWS_WITH_AS = is_throws_with | is_throws_as | is_require,
+
+        DT_WARN_NOTHROW    = is_nothrow | is_warn,
+        DT_CHECK_NOTHROW   = is_nothrow | is_check,
+        DT_REQUIRE_NOTHROW = is_nothrow | is_require,
+
+        DT_WARN_EQ    = is_normal | is_eq | is_warn,
+        DT_CHECK_EQ   = is_normal | is_eq | is_check,
+        DT_REQUIRE_EQ = is_normal | is_eq | is_require,
+
+        DT_WARN_NE    = is_normal | is_ne | is_warn,
+        DT_CHECK_NE   = is_normal | is_ne | is_check,
+        DT_REQUIRE_NE = is_normal | is_ne | is_require,
+
+        DT_WARN_GT    = is_normal | is_gt | is_warn,
+        DT_CHECK_GT   = is_normal | is_gt | is_check,
+        DT_REQUIRE_GT = is_normal | is_gt | is_require,
+
+        DT_WARN_LT    = is_normal | is_lt | is_warn,
+        DT_CHECK_LT   = is_normal | is_lt | is_check,
+        DT_REQUIRE_LT = is_normal | is_lt | is_require,
+
+        DT_WARN_GE    = is_normal | is_ge | is_warn,
+        DT_CHECK_GE   = is_normal | is_ge | is_check,
+        DT_REQUIRE_GE = is_normal | is_ge | is_require,
+
+        DT_WARN_LE    = is_normal | is_le | is_warn,
+        DT_CHECK_LE   = is_normal | is_le | is_check,
+        DT_REQUIRE_LE = is_normal | is_le | is_require,
+
+        DT_WARN_UNARY    = is_normal | is_unary | is_warn,
+        DT_CHECK_UNARY   = is_normal | is_unary | is_check,
+        DT_REQUIRE_UNARY = is_normal | is_unary | is_require,
+
+        DT_WARN_UNARY_FALSE    = is_normal | is_false | is_unary | is_warn,
+        DT_CHECK_UNARY_FALSE   = is_normal | is_false | is_unary | is_check,
+        DT_REQUIRE_UNARY_FALSE = is_normal | is_false | is_unary | is_require,
+    };
+} // namespace assertType
+
+DOCTEST_INTERFACE const char* assertString(assertType::Enum at);
+DOCTEST_INTERFACE const char* failureString(assertType::Enum at);
+DOCTEST_INTERFACE const char* skipPathFromFilename(const char* file);
+
+struct DOCTEST_INTERFACE TestCaseData
+{
+    String      m_file;       // the file in which the test was registered (using String - see #350)
+    unsigned    m_line;       // the line where the test was registered
+    const char* m_name;       // name of the test case
+    const char* m_test_suite; // the test suite in which the test was added
+    const char* m_description;
+    bool        m_skip;
+    bool        m_no_breaks;
+    bool        m_no_output;
+    bool        m_may_fail;
+    bool        m_should_fail;
+    int         m_expected_failures;
+    double      m_timeout;
+};
+
+struct DOCTEST_INTERFACE AssertData
+{
+    // common - for all asserts
+    const TestCaseData* m_test_case;
+    assertType::Enum    m_at;
+    const char*         m_file;
+    int                 m_line;
+    const char*         m_expr;
+    bool                m_failed;
+
+    // exception-related - for all asserts
+    bool   m_threw;
+    String m_exception;
+
+    // for normal asserts
+    String m_decomp;
+
+    // for specific exception-related asserts
+    bool           m_threw_as;
+    const char*    m_exception_type;
+
+    class DOCTEST_INTERFACE StringContains {
+        private:
+            Contains content;
+            bool isContains;
+
+        public:
+            StringContains(const String& str) : content(str), isContains(false) { }
+            StringContains(Contains cntn) : content(static_cast<Contains&&>(cntn)), isContains(true) { }
+
+            bool check(const String& str) { return isContains ? (content == str) : (content.string == str); }
+
+            operator const String&() const { return content.string; }
+
+            const char* c_str() const { return content.string.c_str(); }
+    } m_exception_string;
+
+    AssertData(assertType::Enum at, const char* file, int line, const char* expr,
+        const char* exception_type, const StringContains& exception_string);
+};
+
+struct DOCTEST_INTERFACE MessageData
+{
+    String           m_string;
+    const char*      m_file;
+    int              m_line;
+    assertType::Enum m_severity;
+};
+
+struct DOCTEST_INTERFACE SubcaseSignature
+{
+    String      m_name;
+    const char* m_file;
+    int         m_line;
+
+    bool operator==(const SubcaseSignature& other) const;
+    bool operator<(const SubcaseSignature& other) const;
+};
+
+struct DOCTEST_INTERFACE IContextScope
+{
+    DOCTEST_DECLARE_INTERFACE(IContextScope)
+    virtual void stringify(std::ostream*) const = 0;
+};
+
+namespace detail {
+    struct DOCTEST_INTERFACE TestCase;
+} // namespace detail
+
+struct ContextOptions //!OCLINT too many fields
+{
+    std::ostream* cout = nullptr; // stdout stream
+    String        binary_name;    // the test binary name
+
+    const detail::TestCase* currentTest = nullptr;
+
+    // == parameters from the command line
+    String   out;       // output filename
+    String   order_by;  // how tests should be ordered
+    unsigned rand_seed; // the seed for rand ordering
+
+    unsigned first; // the first (matching) test to be executed
+    unsigned last;  // the last (matching) test to be executed
+
+    int abort_after;           // stop tests after this many failed assertions
+    int subcase_filter_levels; // apply the subcase filters for the first N levels
+
+    bool success;              // include successful assertions in output
+    bool case_sensitive;       // if filtering should be case sensitive
+    bool exit;                 // if the program should be exited after the tests are ran/whatever
+    bool duration;             // print the time duration of each test case
+    bool minimal;              // minimal console output (only test failures)
+    bool quiet;                // no console output
+    bool no_throw;             // to skip exceptions-related assertion macros
+    bool no_exitcode;          // if the framework should return 0 as the exitcode
+    bool no_run;               // to not run the tests at all (can be done with an "*" exclude)
+    bool no_intro;             // to not print the intro of the framework
+    bool no_version;           // to not print the version of the framework
+    bool no_colors;            // if output to the console should be colorized
+    bool force_colors;         // forces the use of colors even when a tty cannot be detected
+    bool no_breaks;            // to not break into the debugger
+    bool no_skip;              // don't skip test cases which are marked to be skipped
+    bool gnu_file_line;        // if line numbers should be surrounded with :x: and not (x):
+    bool no_path_in_filenames; // if the path to files should be removed from the output
+    bool no_line_numbers;      // if source code line numbers should be omitted from the output
+    bool no_debug_output;      // no output in the debug console when a debugger is attached
+    bool no_skipped_summary;   // don't print "skipped" in the summary !!! UNDOCUMENTED !!!
+    bool no_time_in_output;    // omit any time/timestamps from output !!! UNDOCUMENTED !!!
+
+    bool help;             // to print the help
+    bool version;          // to print the version
+    bool count;            // if only the count of matching tests is to be retrieved
+    bool list_test_cases;  // to list all tests matching the filters
+    bool list_test_suites; // to list all suites matching the filters
+    bool list_reporters;   // lists all registered reporters
+};
+
+namespace detail {
+    namespace types {
+#ifdef DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
+        using namespace std;
+#else
+        template <bool COND, typename T = void>
+        struct enable_if { };
+
+        template <typename T>
+        struct enable_if<true, T> { using type = T; };
+
+        struct true_type { static DOCTEST_CONSTEXPR bool value = true; };
+        struct false_type { static DOCTEST_CONSTEXPR bool value = false; };
+
+        template <typename T> struct remove_reference { using type = T; };
+        template <typename T> struct remove_reference<T&> { using type = T; };
+        template <typename T> struct remove_reference<T&&> { using type = T; };
+
+        template <typename T> struct is_rvalue_reference : false_type { };
+        template <typename T> struct is_rvalue_reference<T&&> : true_type { };
+
+        template<typename T> struct remove_const { using type = T; };
+        template <typename T> struct remove_const<const T> { using type = T; };
+
+        // Compiler intrinsics
+        template <typename T> struct is_enum { static DOCTEST_CONSTEXPR bool value = __is_enum(T); };
+        template <typename T> struct underlying_type { using type = __underlying_type(T); };
+
+        template <typename T> struct is_pointer : false_type { };
+        template <typename T> struct is_pointer<T*> : true_type { };
+
+        template <typename T> struct is_array : false_type { };
+        // NOLINTNEXTLINE(*-avoid-c-arrays)
+        template <typename T, size_t SIZE> struct is_array<T[SIZE]> : true_type { };
+#endif
+    }
+
+    // <utility>
+    template <typename T>
+    T&& declval();
+
+    template <class T>
+    DOCTEST_CONSTEXPR_FUNC T&& forward(typename types::remove_reference<T>::type& t) DOCTEST_NOEXCEPT {
+        return static_cast<T&&>(t);
+    }
+
+    template <class T>
+    DOCTEST_CONSTEXPR_FUNC T&& forward(typename types::remove_reference<T>::type&& t) DOCTEST_NOEXCEPT {
+        return static_cast<T&&>(t);
+    }
+
+    template <typename T>
+    struct deferred_false : types::false_type { };
+
+// MSVS 2015 :(
+#if !DOCTEST_CLANG && defined(_MSC_VER) && _MSC_VER <= 1900
+    template <typename T, typename = void>
+    struct has_global_insertion_operator : types::false_type { };
+
+    template <typename T>
+    struct has_global_insertion_operator<T, decltype(::operator<<(declval<std::ostream&>(), declval<const T&>()), void())> : types::true_type { };
+
+    template <typename T, typename = void>
+    struct has_insertion_operator { static DOCTEST_CONSTEXPR bool value = has_global_insertion_operator<T>::value; };
+
+    template <typename T, bool global>
+    struct insert_hack;
+
+    template <typename T>
+    struct insert_hack<T, true> {
+        static void insert(std::ostream& os, const T& t) { ::operator<<(os, t); }
+    };
+
+    template <typename T>
+    struct insert_hack<T, false> {
+        static void insert(std::ostream& os, const T& t) { operator<<(os, t); }
+    };
+
+    template <typename T>
+    using insert_hack_t = insert_hack<T, has_global_insertion_operator<T>::value>;
+#else
+    template <typename T, typename = void>
+    struct has_insertion_operator : types::false_type { };
+#endif
+
+    template <typename T>
+    struct has_insertion_operator<T, decltype(operator<<(declval<std::ostream&>(), declval<const T&>()), void())> : types::true_type { };
+
+    template <typename T>
+    struct should_stringify_as_underlying_type {
+        static DOCTEST_CONSTEXPR bool value = detail::types::is_enum<T>::value && !doctest::detail::has_insertion_operator<T>::value;
+    };
+
+    DOCTEST_INTERFACE std::ostream* tlssPush();
+    DOCTEST_INTERFACE String tlssPop();
+
+    template <bool C>
+    struct StringMakerBase {
+        template <typename T>
+        static String convert(const DOCTEST_REF_WRAP(T)) {
+#ifdef DOCTEST_CONFIG_REQUIRE_STRINGIFICATION_FOR_ALL_USED_TYPES
+            static_assert(deferred_false<T>::value, "No stringification detected for type T. See string conversion manual");
+#endif
+            return "{?}";
+        }
+    };
+
+    template <typename T>
+    struct filldata;
+
+    template <typename T>
+    void filloss(std::ostream* stream, const T& in) {
+        filldata<T>::fill(stream, in);
+    }
+
+    template <typename T, size_t N>
+    void filloss(std::ostream* stream, const T (&in)[N]) { // NOLINT(*-avoid-c-arrays)
+        // T[N], T(&)[N], T(&&)[N] have same behaviour.
+        // Hence remove reference.
+        filloss<typename types::remove_reference<decltype(in)>::type>(stream, in);
+    }
+
+    template <typename T>
+    String toStream(const T& in) {
+        std::ostream* stream = tlssPush();
+        filloss(stream, in);
+        return tlssPop();
+    }
+
+    template <>
+    struct StringMakerBase<true> {
+        template <typename T>
+        static String convert(const DOCTEST_REF_WRAP(T) in) {
+            return toStream(in);
+        }
+    };
+} // namespace detail
+
+template <typename T>
+struct StringMaker : public detail::StringMakerBase<
+    detail::has_insertion_operator<T>::value || detail::types::is_pointer<T>::value || detail::types::is_array<T>::value>
+{};
+
+#ifndef DOCTEST_STRINGIFY
+#ifdef DOCTEST_CONFIG_DOUBLE_STRINGIFY
+#define DOCTEST_STRINGIFY(...) toString(toString(__VA_ARGS__))
+#else
+#define DOCTEST_STRINGIFY(...) toString(__VA_ARGS__)
+#endif
+#endif
+
+template <typename T>
+String toString() {
+#if DOCTEST_CLANG == 0 && DOCTEST_GCC == 0 && DOCTEST_ICC == 0
+    String ret = __FUNCSIG__; // class doctest::String __cdecl doctest::toString<TYPE>(void)
+    String::size_type beginPos = ret.find('<');
+    return ret.substr(beginPos + 1, ret.size() - beginPos - static_cast<String::size_type>(sizeof(">(void)")));
+#else
+    String ret = __PRETTY_FUNCTION__; // doctest::String toString() [with T = TYPE]
+    String::size_type begin = ret.find('=') + 2;
+    return ret.substr(begin, ret.size() - begin - 1);
+#endif
+}
+
+template <typename T, typename detail::types::enable_if<!detail::should_stringify_as_underlying_type<T>::value, bool>::type = true>
+String toString(const DOCTEST_REF_WRAP(T) value) {
+    return StringMaker<T>::convert(value);
+}
+
+#ifdef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
+DOCTEST_INTERFACE String toString(const char* in);
+#endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
+
+#if DOCTEST_MSVC >= DOCTEST_COMPILER(19, 20, 0)
+// see this issue on why this is needed: https://github.com/doctest/doctest/issues/183
+DOCTEST_INTERFACE String toString(const std::string& in);
+#endif // VS 2019
+
+DOCTEST_INTERFACE String toString(String in);
+
+DOCTEST_INTERFACE String toString(std::nullptr_t);
+
+DOCTEST_INTERFACE String toString(bool in);
+
+DOCTEST_INTERFACE String toString(float in);
+DOCTEST_INTERFACE String toString(double in);
+DOCTEST_INTERFACE String toString(double long in);
+
+DOCTEST_INTERFACE String toString(char in);
+DOCTEST_INTERFACE String toString(char signed in);
+DOCTEST_INTERFACE String toString(char unsigned in);
+DOCTEST_INTERFACE String toString(short in);
+DOCTEST_INTERFACE String toString(short unsigned in);
+DOCTEST_INTERFACE String toString(signed in);
+DOCTEST_INTERFACE String toString(unsigned in);
+DOCTEST_INTERFACE String toString(long in);
+DOCTEST_INTERFACE String toString(long unsigned in);
+DOCTEST_INTERFACE String toString(long long in);
+DOCTEST_INTERFACE String toString(long long unsigned in);
+
+template <typename T, typename detail::types::enable_if<detail::should_stringify_as_underlying_type<T>::value, bool>::type = true>
+String toString(const DOCTEST_REF_WRAP(T) value) {
+    using UT = typename detail::types::underlying_type<T>::type;
+    return (DOCTEST_STRINGIFY(static_cast<UT>(value)));
+}
+
+namespace detail {
+    template <typename T>
+    struct filldata
+    {
+        static void fill(std::ostream* stream, const T& in) {
+#if defined(_MSC_VER) && _MSC_VER <= 1900
+        insert_hack_t<T>::insert(*stream, in);
+#else
+        operator<<(*stream, in);
+#endif
+        }
+    };
+
+DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4866)
+// NOLINTBEGIN(*-avoid-c-arrays)
+    template <typename T, size_t N>
+    struct filldata<T[N]> {
+        static void fill(std::ostream* stream, const T(&in)[N]) {
+            *stream << "[";
+            for (size_t i = 0; i < N; i++) {
+                if (i != 0) { *stream << ", "; }
+                *stream << (DOCTEST_STRINGIFY(in[i]));
+            }
+            *stream << "]";
+        }
+    };
+// NOLINTEND(*-avoid-c-arrays)
+DOCTEST_MSVC_SUPPRESS_WARNING_POP
+
+    // Specialized since we don't want the terminating null byte!
+// NOLINTBEGIN(*-avoid-c-arrays)
+    template <size_t N>
+    struct filldata<const char[N]> {
+        static void fill(std::ostream* stream, const char (&in)[N]) {
+            *stream << String(in, in[N - 1] ? N : N - 1);
+        } // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks)
+    };
+// NOLINTEND(*-avoid-c-arrays)
+
+    template <>
+    struct filldata<const void*> {
+        static void fill(std::ostream* stream, const void* in);
+    };
+
+    template <typename T>
+    struct filldata<T*> {
+DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4180)
+        static void fill(std::ostream* stream, const T* in) {
+DOCTEST_MSVC_SUPPRESS_WARNING_POP
+DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wmicrosoft-cast")
+            filldata<const void*>::fill(stream,
+#if DOCTEST_GCC == 0 || DOCTEST_GCC >= DOCTEST_COMPILER(4, 9, 0)
+                reinterpret_cast<const void*>(in)
+#else
+                *reinterpret_cast<const void* const*>(&in)
+#endif
+            );
+DOCTEST_CLANG_SUPPRESS_WARNING_POP
+        }
+    };
+}
+
+struct DOCTEST_INTERFACE Approx
+{
+    Approx(double value);
+
+    Approx operator()(double value) const;
+
+#ifdef DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
+    template <typename T>
+    explicit Approx(const T& value,
+                    typename detail::types::enable_if<std::is_constructible<double, T>::value>::type* =
+                            static_cast<T*>(nullptr)) {
+        *this = static_cast<double>(value);
+    }
+#endif // DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
+
+    Approx& epsilon(double newEpsilon);
+
+#ifdef DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
+    template <typename T>
+    typename std::enable_if<std::is_constructible<double, T>::value, Approx&>::type epsilon(
+            const T& newEpsilon) {
+        m_epsilon = static_cast<double>(newEpsilon);
+        return *this;
+    }
+#endif //  DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
+
+    Approx& scale(double newScale);
+
+#ifdef DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
+    template <typename T>
+    typename std::enable_if<std::is_constructible<double, T>::value, Approx&>::type scale(
+            const T& newScale) {
+        m_scale = static_cast<double>(newScale);
+        return *this;
+    }
+#endif // DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
+
+    // clang-format off
+    DOCTEST_INTERFACE friend bool operator==(double lhs, const Approx & rhs);
+    DOCTEST_INTERFACE friend bool operator==(const Approx & lhs, double rhs);
+    DOCTEST_INTERFACE friend bool operator!=(double lhs, const Approx & rhs);
+    DOCTEST_INTERFACE friend bool operator!=(const Approx & lhs, double rhs);
+    DOCTEST_INTERFACE friend bool operator<=(double lhs, const Approx & rhs);
+    DOCTEST_INTERFACE friend bool operator<=(const Approx & lhs, double rhs);
+    DOCTEST_INTERFACE friend bool operator>=(double lhs, const Approx & rhs);
+    DOCTEST_INTERFACE friend bool operator>=(const Approx & lhs, double rhs);
+    DOCTEST_INTERFACE friend bool operator< (double lhs, const Approx & rhs);
+    DOCTEST_INTERFACE friend bool operator< (const Approx & lhs, double rhs);
+    DOCTEST_INTERFACE friend bool operator> (double lhs, const Approx & rhs);
+    DOCTEST_INTERFACE friend bool operator> (const Approx & lhs, double rhs);
+
+#ifdef DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
+#define DOCTEST_APPROX_PREFIX \
+    template <typename T> friend typename std::enable_if<std::is_constructible<double, T>::value, bool>::type
+
+    DOCTEST_APPROX_PREFIX operator==(const T& lhs, const Approx& rhs) { return operator==(static_cast<double>(lhs), rhs); }
+    DOCTEST_APPROX_PREFIX operator==(const Approx& lhs, const T& rhs) { return operator==(rhs, lhs); }
+    DOCTEST_APPROX_PREFIX operator!=(const T& lhs, const Approx& rhs) { return !operator==(lhs, rhs); }
+    DOCTEST_APPROX_PREFIX operator!=(const Approx& lhs, const T& rhs) { return !operator==(rhs, lhs); }
+    DOCTEST_APPROX_PREFIX operator<=(const T& lhs, const Approx& rhs) { return static_cast<double>(lhs) < rhs.m_value || lhs == rhs; }
+    DOCTEST_APPROX_PREFIX operator<=(const Approx& lhs, const T& rhs) { return lhs.m_value < static_cast<double>(rhs) || lhs == rhs; }
+    DOCTEST_APPROX_PREFIX operator>=(const T& lhs, const Approx& rhs) { return static_cast<double>(lhs) > rhs.m_value || lhs == rhs; }
+    DOCTEST_APPROX_PREFIX operator>=(const Approx& lhs, const T& rhs) { return lhs.m_value > static_cast<double>(rhs) || lhs == rhs; }
+    DOCTEST_APPROX_PREFIX operator< (const T& lhs, const Approx& rhs) { return static_cast<double>(lhs) < rhs.m_value && lhs != rhs; }
+    DOCTEST_APPROX_PREFIX operator< (const Approx& lhs, const T& rhs) { return lhs.m_value < static_cast<double>(rhs) && lhs != rhs; }
+    DOCTEST_APPROX_PREFIX operator> (const T& lhs, const Approx& rhs) { return static_cast<double>(lhs) > rhs.m_value && lhs != rhs; }
+    DOCTEST_APPROX_PREFIX operator> (const Approx& lhs, const T& rhs) { return lhs.m_value > static_cast<double>(rhs) && lhs != rhs; }
+#undef DOCTEST_APPROX_PREFIX
+#endif // DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS
+
+    // clang-format on
+
+    double m_epsilon;
+    double m_scale;
+    double m_value;
+};
+
+DOCTEST_INTERFACE String toString(const Approx& in);
+
+DOCTEST_INTERFACE const ContextOptions* getContextOptions();
+
+template <typename F>
+struct DOCTEST_INTERFACE_DECL IsNaN
+{
+    F value; bool flipped;
+    IsNaN(F f, bool flip = false) : value(f), flipped(flip) { }
+    IsNaN<F> operator!() const { return { value, !flipped }; }
+    operator bool() const;
+};
+#ifndef __MINGW32__
+extern template struct DOCTEST_INTERFACE_DECL IsNaN<float>;
+extern template struct DOCTEST_INTERFACE_DECL IsNaN<double>;
+extern template struct DOCTEST_INTERFACE_DECL IsNaN<long double>;
+#endif
+DOCTEST_INTERFACE String toString(IsNaN<float> in);
+DOCTEST_INTERFACE String toString(IsNaN<double> in);
+DOCTEST_INTERFACE String toString(IsNaN<double long> in);
+
+#ifndef DOCTEST_CONFIG_DISABLE
+
+namespace detail {
+    // clang-format off
+#ifdef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
+    template<class T>               struct decay_array       { using type = T; };
+    template<class T, unsigned N>   struct decay_array<T[N]> { using type = T*; };
+    template<class T>               struct decay_array<T[]>  { using type = T*; };
+
+    template<class T>   struct not_char_pointer              { static DOCTEST_CONSTEXPR int value = 1; };
+    template<>          struct not_char_pointer<char*>       { static DOCTEST_CONSTEXPR int value = 0; };
+    template<>          struct not_char_pointer<const char*> { static DOCTEST_CONSTEXPR int value = 0; };
+
+    template<class T> struct can_use_op : public not_char_pointer<typename decay_array<T>::type> {};
+#endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
+    // clang-format on
+
+    struct DOCTEST_INTERFACE TestFailureException
+    {
+    };
+
+    DOCTEST_INTERFACE bool checkIfShouldThrow(assertType::Enum at);
+
+#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS
+    DOCTEST_NORETURN
+#endif // DOCTEST_CONFIG_NO_EXCEPTIONS
+    DOCTEST_INTERFACE void throwException();
+
+    struct DOCTEST_INTERFACE Subcase
+    {
+        SubcaseSignature m_signature;
+        bool             m_entered = false;
+
+        Subcase(const String& name, const char* file, int line);
+        Subcase(const Subcase&) = delete;
+        Subcase(Subcase&&) = delete;
+        Subcase& operator=(const Subcase&) = delete;
+        Subcase& operator=(Subcase&&) = delete;
+        ~Subcase();
+
+        operator bool() const;
+
+        private:
+            bool checkFilters();
+    };
+
+    template <typename L, typename R>
+    String stringifyBinaryExpr(const DOCTEST_REF_WRAP(L) lhs, const char* op,
+                               const DOCTEST_REF_WRAP(R) rhs) {
+        return (DOCTEST_STRINGIFY(lhs)) + op + (DOCTEST_STRINGIFY(rhs));
+    }
+
+#if DOCTEST_CLANG && DOCTEST_CLANG < DOCTEST_COMPILER(3, 6, 0)
+DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wunused-comparison")
+#endif
+
+// This will check if there is any way it could find a operator like member or friend and uses it.
+// If not it doesn't find the operator or if the operator at global scope is defined after
+// this template, the template won't be instantiated due to SFINAE. Once the template is not
+// instantiated it can look for global operator using normal conversions.
+#ifdef __NVCC__
+#define SFINAE_OP(ret,op) ret
+#else
+#define SFINAE_OP(ret,op) decltype((void)(doctest::detail::declval<L>() op doctest::detail::declval<R>()),ret{})
+#endif
+
+#define DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(op, op_str, op_macro)                              \
+    template <typename R>                                                                          \
+    DOCTEST_NOINLINE SFINAE_OP(Result,op) operator op(R&& rhs) {                                   \
+    bool res = op_macro(doctest::detail::forward<const L>(lhs), doctest::detail::forward<R>(rhs)); \
+        if(m_at & assertType::is_false)                                                            \
+            res = !res;                                                                            \
+        if(!res || doctest::getContextOptions()->success)                                          \
+            return Result(res, stringifyBinaryExpr(lhs, op_str, rhs));                             \
+        return Result(res);                                                                        \
+    }
+
+    // more checks could be added - like in Catch:
+    // https://github.com/catchorg/Catch2/pull/1480/files
+    // https://github.com/catchorg/Catch2/pull/1481/files
+#define DOCTEST_FORBIT_EXPRESSION(rt, op)                                                          \
+    template <typename R>                                                                          \
+    rt& operator op(const R&) {                                                                    \
+        static_assert(deferred_false<R>::value,                                                    \
+                      "Expression Too Complex Please Rewrite As Binary Comparison!");              \
+        return *this;                                                                              \
+    }
+
+    struct DOCTEST_INTERFACE Result // NOLINT(*-member-init)
+    {
+        bool   m_passed;
+        String m_decomp;
+
+        Result() = default; // TODO: Why do we need this? (To remove NOLINT)
+        Result(bool passed, const String& decomposition = String());
+
+        // forbidding some expressions based on this table: https://en.cppreference.com/w/cpp/language/operator_precedence
+        DOCTEST_FORBIT_EXPRESSION(Result, &)
+        DOCTEST_FORBIT_EXPRESSION(Result, ^)
+        DOCTEST_FORBIT_EXPRESSION(Result, |)
+        DOCTEST_FORBIT_EXPRESSION(Result, &&)
+        DOCTEST_FORBIT_EXPRESSION(Result, ||)
+        DOCTEST_FORBIT_EXPRESSION(Result, ==)
+        DOCTEST_FORBIT_EXPRESSION(Result, !=)
+        DOCTEST_FORBIT_EXPRESSION(Result, <)
+        DOCTEST_FORBIT_EXPRESSION(Result, >)
+        DOCTEST_FORBIT_EXPRESSION(Result, <=)
+        DOCTEST_FORBIT_EXPRESSION(Result, >=)
+        DOCTEST_FORBIT_EXPRESSION(Result, =)
+        DOCTEST_FORBIT_EXPRESSION(Result, +=)
+        DOCTEST_FORBIT_EXPRESSION(Result, -=)
+        DOCTEST_FORBIT_EXPRESSION(Result, *=)
+        DOCTEST_FORBIT_EXPRESSION(Result, /=)
+        DOCTEST_FORBIT_EXPRESSION(Result, %=)
+        DOCTEST_FORBIT_EXPRESSION(Result, <<=)
+        DOCTEST_FORBIT_EXPRESSION(Result, >>=)
+        DOCTEST_FORBIT_EXPRESSION(Result, &=)
+        DOCTEST_FORBIT_EXPRESSION(Result, ^=)
+        DOCTEST_FORBIT_EXPRESSION(Result, |=)
+    };
+
+#ifndef DOCTEST_CONFIG_NO_COMPARISON_WARNING_SUPPRESSION
+
+    DOCTEST_CLANG_SUPPRESS_WARNING_PUSH
+    DOCTEST_CLANG_SUPPRESS_WARNING("-Wsign-conversion")
+    DOCTEST_CLANG_SUPPRESS_WARNING("-Wsign-compare")
+    //DOCTEST_CLANG_SUPPRESS_WARNING("-Wdouble-promotion")
+    //DOCTEST_CLANG_SUPPRESS_WARNING("-Wconversion")
+    //DOCTEST_CLANG_SUPPRESS_WARNING("-Wfloat-equal")
+
+    DOCTEST_GCC_SUPPRESS_WARNING_PUSH
+    DOCTEST_GCC_SUPPRESS_WARNING("-Wsign-conversion")
+    DOCTEST_GCC_SUPPRESS_WARNING("-Wsign-compare")
+    //DOCTEST_GCC_SUPPRESS_WARNING("-Wdouble-promotion")
+    //DOCTEST_GCC_SUPPRESS_WARNING("-Wconversion")
+    //DOCTEST_GCC_SUPPRESS_WARNING("-Wfloat-equal")
+
+    DOCTEST_MSVC_SUPPRESS_WARNING_PUSH
+    // https://stackoverflow.com/questions/39479163 what's the difference between 4018 and 4389
+    DOCTEST_MSVC_SUPPRESS_WARNING(4388) // signed/unsigned mismatch
+    DOCTEST_MSVC_SUPPRESS_WARNING(4389) // 'operator' : signed/unsigned mismatch
+    DOCTEST_MSVC_SUPPRESS_WARNING(4018) // 'expression' : signed/unsigned mismatch
+    //DOCTEST_MSVC_SUPPRESS_WARNING(4805) // 'operation' : unsafe mix of type 'type' and type 'type' in operation
+
+#endif // DOCTEST_CONFIG_NO_COMPARISON_WARNING_SUPPRESSION
+
+    // clang-format off
+#ifndef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
+#define DOCTEST_COMPARISON_RETURN_TYPE bool
+#else // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
+#define DOCTEST_COMPARISON_RETURN_TYPE typename types::enable_if<can_use_op<L>::value || can_use_op<R>::value, bool>::type
+    inline bool eq(const char* lhs, const char* rhs) { return String(lhs) == String(rhs); }
+    inline bool ne(const char* lhs, const char* rhs) { return String(lhs) != String(rhs); }
+    inline bool lt(const char* lhs, const char* rhs) { return String(lhs) <  String(rhs); }
+    inline bool gt(const char* lhs, const char* rhs) { return String(lhs) >  String(rhs); }
+    inline bool le(const char* lhs, const char* rhs) { return String(lhs) <= String(rhs); }
+    inline bool ge(const char* lhs, const char* rhs) { return String(lhs) >= String(rhs); }
+#endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
+    // clang-format on
+
+#define DOCTEST_RELATIONAL_OP(name, op)                                                            \
+    template <typename L, typename R>                                                              \
+    DOCTEST_COMPARISON_RETURN_TYPE name(const DOCTEST_REF_WRAP(L) lhs,                             \
+                                        const DOCTEST_REF_WRAP(R) rhs) {                           \
+        return lhs op rhs;                                                                         \
+    }
+
+    DOCTEST_RELATIONAL_OP(eq, ==)
+    DOCTEST_RELATIONAL_OP(ne, !=)
+    DOCTEST_RELATIONAL_OP(lt, <)
+    DOCTEST_RELATIONAL_OP(gt, >)
+    DOCTEST_RELATIONAL_OP(le, <=)
+    DOCTEST_RELATIONAL_OP(ge, >=)
+
+#ifndef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
+#define DOCTEST_CMP_EQ(l, r) l == r
+#define DOCTEST_CMP_NE(l, r) l != r
+#define DOCTEST_CMP_GT(l, r) l > r
+#define DOCTEST_CMP_LT(l, r) l < r
+#define DOCTEST_CMP_GE(l, r) l >= r
+#define DOCTEST_CMP_LE(l, r) l <= r
+#else // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
+#define DOCTEST_CMP_EQ(l, r) eq(l, r)
+#define DOCTEST_CMP_NE(l, r) ne(l, r)
+#define DOCTEST_CMP_GT(l, r) gt(l, r)
+#define DOCTEST_CMP_LT(l, r) lt(l, r)
+#define DOCTEST_CMP_GE(l, r) ge(l, r)
+#define DOCTEST_CMP_LE(l, r) le(l, r)
+#endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
+
+    template <typename L>
+    // cppcheck-suppress copyCtorAndEqOperator
+    struct Expression_lhs
+    {
+        L                lhs;
+        assertType::Enum m_at;
+
+        explicit Expression_lhs(L&& in, assertType::Enum at)
+                : lhs(static_cast<L&&>(in))
+                , m_at(at) {}
+
+        DOCTEST_NOINLINE operator Result() {
+// this is needed only for MSVC 2015
+DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4800) // 'int': forcing value to bool
+            bool res = static_cast<bool>(lhs);
+DOCTEST_MSVC_SUPPRESS_WARNING_POP
+            if(m_at & assertType::is_false) { //!OCLINT bitwise operator in conditional
+                res = !res;
+            }
+
+            if(!res || getContextOptions()->success) {
+                return { res, (DOCTEST_STRINGIFY(lhs)) };
+            }
+            return { res };
+        }
+
+        /* This is required for user-defined conversions from Expression_lhs to L */
+        operator L() const { return lhs; }
+
+        // clang-format off
+        DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(==, " == ", DOCTEST_CMP_EQ) //!OCLINT bitwise operator in conditional
+        DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(!=, " != ", DOCTEST_CMP_NE) //!OCLINT bitwise operator in conditional
+        DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(>,  " >  ", DOCTEST_CMP_GT) //!OCLINT bitwise operator in conditional
+        DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(<,  " <  ", DOCTEST_CMP_LT) //!OCLINT bitwise operator in conditional
+        DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(>=, " >= ", DOCTEST_CMP_GE) //!OCLINT bitwise operator in conditional
+        DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(<=, " <= ", DOCTEST_CMP_LE) //!OCLINT bitwise operator in conditional
+        // clang-format on
+
+        // forbidding some expressions based on this table: https://en.cppreference.com/w/cpp/language/operator_precedence
+        DOCTEST_FORBIT_EXPRESSION(Expression_lhs, &)
+        DOCTEST_FORBIT_EXPRESSION(Expression_lhs, ^)
+        DOCTEST_FORBIT_EXPRESSION(Expression_lhs, |)
+        DOCTEST_FORBIT_EXPRESSION(Expression_lhs, &&)
+        DOCTEST_FORBIT_EXPRESSION(Expression_lhs, ||)
+        DOCTEST_FORBIT_EXPRESSION(Expression_lhs, =)
+        DOCTEST_FORBIT_EXPRESSION(Expression_lhs, +=)
+        DOCTEST_FORBIT_EXPRESSION(Expression_lhs, -=)
+        DOCTEST_FORBIT_EXPRESSION(Expression_lhs, *=)
+        DOCTEST_FORBIT_EXPRESSION(Expression_lhs, /=)
+        DOCTEST_FORBIT_EXPRESSION(Expression_lhs, %=)
+        DOCTEST_FORBIT_EXPRESSION(Expression_lhs, <<=)
+        DOCTEST_FORBIT_EXPRESSION(Expression_lhs, >>=)
+        DOCTEST_FORBIT_EXPRESSION(Expression_lhs, &=)
+        DOCTEST_FORBIT_EXPRESSION(Expression_lhs, ^=)
+        DOCTEST_FORBIT_EXPRESSION(Expression_lhs, |=)
+        // these 2 are unfortunate because they should be allowed - they have higher precedence over the comparisons, but the
+        // ExpressionDecomposer class uses the left shift operator to capture the left operand of the binary expression...
+        DOCTEST_FORBIT_EXPRESSION(Expression_lhs, <<)
+        DOCTEST_FORBIT_EXPRESSION(Expression_lhs, >>)
+    };
+
+#ifndef DOCTEST_CONFIG_NO_COMPARISON_WARNING_SUPPRESSION
+
+    DOCTEST_CLANG_SUPPRESS_WARNING_POP
+    DOCTEST_MSVC_SUPPRESS_WARNING_POP
+    DOCTEST_GCC_SUPPRESS_WARNING_POP
+
+#endif // DOCTEST_CONFIG_NO_COMPARISON_WARNING_SUPPRESSION
+
+#if DOCTEST_CLANG && DOCTEST_CLANG < DOCTEST_COMPILER(3, 6, 0)
+DOCTEST_CLANG_SUPPRESS_WARNING_POP
+#endif
+
+    struct DOCTEST_INTERFACE ExpressionDecomposer
+    {
+        assertType::Enum m_at;
+
+        ExpressionDecomposer(assertType::Enum at);
+
+        // The right operator for capturing expressions is "<=" instead of "<<" (based on the operator precedence table)
+        // but then there will be warnings from GCC about "-Wparentheses" and since "_Pragma()" is problematic this will stay for now...
+        // https://github.com/catchorg/Catch2/issues/870
+        // https://github.com/catchorg/Catch2/issues/565
+        template <typename L>
+        Expression_lhs<L> operator<<(L&& operand) {
+            return Expression_lhs<L>(static_cast<L&&>(operand), m_at);
+        }
+
+        template <typename L,typename types::enable_if<!doctest::detail::types::is_rvalue_reference<L>::value,void >::type* = nullptr>
+        Expression_lhs<const L&> operator<<(const L &operand) {
+            return Expression_lhs<const L&>(operand, m_at);
+        }
+    };
+
+    struct DOCTEST_INTERFACE TestSuite
+    {
+        const char* m_test_suite = nullptr;
+        const char* m_description = nullptr;
+        bool        m_skip = false;
+        bool        m_no_breaks = false;
+        bool        m_no_output = false;
+        bool        m_may_fail = false;
+        bool        m_should_fail = false;
+        int         m_expected_failures = 0;
+        double      m_timeout = 0;
+
+        TestSuite& operator*(const char* in);
+
+        template <typename T>
+        TestSuite& operator*(const T& in) {
+            in.fill(*this);
+            return *this;
+        }
+    };
+
+    using funcType = void (*)();
+
+    struct DOCTEST_INTERFACE TestCase : public TestCaseData
+    {
+        funcType m_test; // a function pointer to the test case
+
+        String m_type; // for templated test cases - gets appended to the real name
+        int m_template_id; // an ID used to distinguish between the different versions of a templated test case
+        String m_full_name; // contains the name (only for templated test cases!) + the template type
+
+        TestCase(funcType test, const char* file, unsigned line, const TestSuite& test_suite,
+                 const String& type = String(), int template_id = -1);
+
+        TestCase(const TestCase& other);
+        TestCase(TestCase&&) = delete;
+
+        DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(26434) // hides a non-virtual function
+        TestCase& operator=(const TestCase& other);
+        DOCTEST_MSVC_SUPPRESS_WARNING_POP
+
+        TestCase& operator=(TestCase&&) = delete;
+
+        TestCase& operator*(const char* in);
+
+        template <typename T>
+        TestCase& operator*(const T& in) {
+            in.fill(*this);
+            return *this;
+        }
+
+        bool operator<(const TestCase& other) const;
+
+        ~TestCase() = default;
+    };
+
+    // forward declarations of functions used by the macros
+    DOCTEST_INTERFACE int  regTest(const TestCase& tc);
+    DOCTEST_INTERFACE int  setTestSuite(const TestSuite& ts);
+    DOCTEST_INTERFACE bool isDebuggerActive();
+
+    template<typename T>
+    int instantiationHelper(const T&) { return 0; }
+
+    namespace binaryAssertComparison {
+        enum Enum
+        {
+            eq = 0,
+            ne,
+            gt,
+            lt,
+            ge,
+            le
+        };
+    } // namespace binaryAssertComparison
+
+    // clang-format off
+    template <int, class L, class R> struct RelationalComparator     { bool operator()(const DOCTEST_REF_WRAP(L),     const DOCTEST_REF_WRAP(R)    ) const { return false;        } };
+
+#define DOCTEST_BINARY_RELATIONAL_OP(n, op) \
+    template <class L, class R> struct RelationalComparator<n, L, R> { bool operator()(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) const { return op(lhs, rhs); } };
+    // clang-format on
+
+    DOCTEST_BINARY_RELATIONAL_OP(0, doctest::detail::eq)
+    DOCTEST_BINARY_RELATIONAL_OP(1, doctest::detail::ne)
+    DOCTEST_BINARY_RELATIONAL_OP(2, doctest::detail::gt)
+    DOCTEST_BINARY_RELATIONAL_OP(3, doctest::detail::lt)
+    DOCTEST_BINARY_RELATIONAL_OP(4, doctest::detail::ge)
+    DOCTEST_BINARY_RELATIONAL_OP(5, doctest::detail::le)
+
+    struct DOCTEST_INTERFACE ResultBuilder : public AssertData
+    {
+        ResultBuilder(assertType::Enum at, const char* file, int line, const char* expr,
+                      const char* exception_type = "", const String& exception_string = "");
+
+        ResultBuilder(assertType::Enum at, const char* file, int line, const char* expr,
+                      const char* exception_type, const Contains& exception_string);
+
+        void setResult(const Result& res);
+
+        template <int comparison, typename L, typename R>
+        DOCTEST_NOINLINE bool binary_assert(const DOCTEST_REF_WRAP(L) lhs,
+                                            const DOCTEST_REF_WRAP(R) rhs) {
+            m_failed = !RelationalComparator<comparison, L, R>()(lhs, rhs);
+            if (m_failed || getContextOptions()->success) {
+                m_decomp = stringifyBinaryExpr(lhs, ", ", rhs);
+            }
+            return !m_failed;
+        }
+
+        template <typename L>
+        DOCTEST_NOINLINE bool unary_assert(const DOCTEST_REF_WRAP(L) val) {
+            m_failed = !val;
+
+            if (m_at & assertType::is_false) { //!OCLINT bitwise operator in conditional
+                m_failed = !m_failed;
+            }
+
+            if (m_failed || getContextOptions()->success) {
+                m_decomp = (DOCTEST_STRINGIFY(val));
+            }
+
+            return !m_failed;
+        }
+
+        void translateException();
+
+        bool log();
+        void react() const;
+    };
+
+    namespace assertAction {
+        enum Enum
+        {
+            nothing     = 0,
+            dbgbreak    = 1,
+            shouldthrow = 2
+        };
+    } // namespace assertAction
+
+    DOCTEST_INTERFACE void failed_out_of_a_testing_context(const AssertData& ad);
+
+    DOCTEST_INTERFACE bool decomp_assert(assertType::Enum at, const char* file, int line,
+                                         const char* expr, const Result& result);
+
+#define DOCTEST_ASSERT_OUT_OF_TESTS(decomp)                                                        \
+    do {                                                                                           \
+        if(!is_running_in_test) {                                                                  \
+            if(failed) {                                                                           \
+                ResultBuilder rb(at, file, line, expr);                                            \
+                rb.m_failed = failed;                                                              \
+                rb.m_decomp = decomp;                                                              \
+                failed_out_of_a_testing_context(rb);                                               \
+                if(isDebuggerActive() && !getContextOptions()->no_breaks)                          \
+                    DOCTEST_BREAK_INTO_DEBUGGER();                                                 \
+                if(checkIfShouldThrow(at))                                                         \
+                    throwException();                                                              \
+            }                                                                                      \
+            return !failed;                                                                        \
+        }                                                                                          \
+    } while(false)
+
+#define DOCTEST_ASSERT_IN_TESTS(decomp)                                                            \
+    ResultBuilder rb(at, file, line, expr);                                                        \
+    rb.m_failed = failed;                                                                          \
+    if(rb.m_failed || getContextOptions()->success)                                                \
+        rb.m_decomp = decomp;                                                                      \
+    if(rb.log())                                                                                   \
+        DOCTEST_BREAK_INTO_DEBUGGER();                                                             \
+    if(rb.m_failed && checkIfShouldThrow(at))                                                      \
+    throwException()
+
+    template <int comparison, typename L, typename R>
+    DOCTEST_NOINLINE bool binary_assert(assertType::Enum at, const char* file, int line,
+                                        const char* expr, const DOCTEST_REF_WRAP(L) lhs,
+                                        const DOCTEST_REF_WRAP(R) rhs) {
+        bool failed = !RelationalComparator<comparison, L, R>()(lhs, rhs);
+
+        // ###################################################################################
+        // IF THE DEBUGGER BREAKS HERE - GO 1 LEVEL UP IN THE CALLSTACK FOR THE FAILING ASSERT
+        // THIS IS THE EFFECT OF HAVING 'DOCTEST_CONFIG_SUPER_FAST_ASSERTS' DEFINED
+        // ###################################################################################
+        DOCTEST_ASSERT_OUT_OF_TESTS(stringifyBinaryExpr(lhs, ", ", rhs));
+        DOCTEST_ASSERT_IN_TESTS(stringifyBinaryExpr(lhs, ", ", rhs));
+        return !failed;
+    }
+
+    template <typename L>
+    DOCTEST_NOINLINE bool unary_assert(assertType::Enum at, const char* file, int line,
+                                       const char* expr, const DOCTEST_REF_WRAP(L) val) {
+        bool failed = !val;
+
+        if(at & assertType::is_false) //!OCLINT bitwise operator in conditional
+            failed = !failed;
+
+        // ###################################################################################
+        // IF THE DEBUGGER BREAKS HERE - GO 1 LEVEL UP IN THE CALLSTACK FOR THE FAILING ASSERT
+        // THIS IS THE EFFECT OF HAVING 'DOCTEST_CONFIG_SUPER_FAST_ASSERTS' DEFINED
+        // ###################################################################################
+        DOCTEST_ASSERT_OUT_OF_TESTS((DOCTEST_STRINGIFY(val)));
+        DOCTEST_ASSERT_IN_TESTS((DOCTEST_STRINGIFY(val)));
+        return !failed;
+    }
+
+    struct DOCTEST_INTERFACE IExceptionTranslator
+    {
+        DOCTEST_DECLARE_INTERFACE(IExceptionTranslator)
+        virtual bool translate(String&) const = 0;
+    };
+
+    template <typename T>
+    class ExceptionTranslator : public IExceptionTranslator //!OCLINT destructor of virtual class
+    {
+    public:
+        explicit ExceptionTranslator(String (*translateFunction)(T))
+                : m_translateFunction(translateFunction) {}
+
+        bool translate(String& res) const override {
+#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS
+            try {
+                throw; // lgtm [cpp/rethrow-no-exception]
+                // cppcheck-suppress catchExceptionByValue
+            } catch(const T& ex) {
+                res = m_translateFunction(ex); //!OCLINT parameter reassignment
+                return true;
+            } catch(...) {}         //!OCLINT -  empty catch statement
+#endif                              // DOCTEST_CONFIG_NO_EXCEPTIONS
+            static_cast<void>(res); // to silence -Wunused-parameter
+            return false;
+        }
+
+    private:
+        String (*m_translateFunction)(T);
+    };
+
+    DOCTEST_INTERFACE void registerExceptionTranslatorImpl(const IExceptionTranslator* et);
+
+    // ContextScope base class used to allow implementing methods of ContextScope
+    // that don't depend on the template parameter in doctest.cpp.
+    struct DOCTEST_INTERFACE ContextScopeBase : public IContextScope {
+        ContextScopeBase(const ContextScopeBase&) = delete;
+
+        ContextScopeBase& operator=(const ContextScopeBase&) = delete;
+        ContextScopeBase& operator=(ContextScopeBase&&) = delete;
+
+        ~ContextScopeBase() override = default;
+
+    protected:
+        ContextScopeBase();
+        ContextScopeBase(ContextScopeBase&& other) noexcept;
+
+        void destroy();
+        bool need_to_destroy{true};
+    };
+
+    template <typename L> class ContextScope : public ContextScopeBase
+    {
+        L lambda_;
+
+    public:
+        explicit ContextScope(const L &lambda) : lambda_(lambda) {}
+        explicit ContextScope(L&& lambda) : lambda_(static_cast<L&&>(lambda)) { }
+
+        ContextScope(const ContextScope&) = delete;
+        ContextScope(ContextScope&&) noexcept = default;
+
+        ContextScope& operator=(const ContextScope&) = delete;
+        ContextScope& operator=(ContextScope&&) = delete;
+
+        void stringify(std::ostream* s) const override { lambda_(s); }
+
+        ~ContextScope() override {
+            if (need_to_destroy) {
+                destroy();
+            }
+        }
+    };
+
+    struct DOCTEST_INTERFACE MessageBuilder : public MessageData
+    {
+        std::ostream* m_stream;
+        bool          logged = false;
+
+        MessageBuilder(const char* file, int line, assertType::Enum severity);
+
+        MessageBuilder(const MessageBuilder&) = delete;
+        MessageBuilder(MessageBuilder&&) = delete;
+
+        MessageBuilder& operator=(const MessageBuilder&) = delete;
+        MessageBuilder& operator=(MessageBuilder&&) = delete;
+
+        ~MessageBuilder();
+
+        // the preferred way of chaining parameters for stringification
+DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4866)
+        template <typename T>
+        MessageBuilder& operator,(const T& in) {
+            *m_stream << (DOCTEST_STRINGIFY(in));
+            return *this;
+        }
+DOCTEST_MSVC_SUPPRESS_WARNING_POP
+
+        // kept here just for backwards-compatibility - the comma operator should be preferred now
+        template <typename T>
+        MessageBuilder& operator<<(const T& in) { return this->operator,(in); }
+
+        // the `,` operator has the lowest operator precedence - if `<<` is used by the user then
+        // the `,` operator will be called last which is not what we want and thus the `*` operator
+        // is used first (has higher operator precedence compared to `<<`) so that we guarantee that
+        // an operator of the MessageBuilder class is called first before the rest of the parameters
+        template <typename T>
+        MessageBuilder& operator*(const T& in) { return this->operator,(in); }
+
+        bool log();
+        void react();
+    };
+
+    template <typename L>
+    ContextScope<L> MakeContextScope(const L &lambda) {
+        return ContextScope<L>(lambda);
+    }
+} // namespace detail
+
+#define DOCTEST_DEFINE_DECORATOR(name, type, def)                                                  \
+    struct name                                                                                    \
+    {                                                                                              \
+        type data;                                                                                 \
+        name(type in = def)                                                                        \
+                : data(in) {}                                                                      \
+        void fill(detail::TestCase& state) const { state.DOCTEST_CAT(m_, name) = data; }           \
+        void fill(detail::TestSuite& state) const { state.DOCTEST_CAT(m_, name) = data; }          \
+    }
+
+DOCTEST_DEFINE_DECORATOR(test_suite, const char*, "");
+DOCTEST_DEFINE_DECORATOR(description, const char*, "");
+DOCTEST_DEFINE_DECORATOR(skip, bool, true);
+DOCTEST_DEFINE_DECORATOR(no_breaks, bool, true);
+DOCTEST_DEFINE_DECORATOR(no_output, bool, true);
+DOCTEST_DEFINE_DECORATOR(timeout, double, 0);
+DOCTEST_DEFINE_DECORATOR(may_fail, bool, true);
+DOCTEST_DEFINE_DECORATOR(should_fail, bool, true);
+DOCTEST_DEFINE_DECORATOR(expected_failures, int, 0);
+
+template <typename T>
+int registerExceptionTranslator(String (*translateFunction)(T)) {
+    DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wexit-time-destructors")
+    static detail::ExceptionTranslator<T> exceptionTranslator(translateFunction);
+    DOCTEST_CLANG_SUPPRESS_WARNING_POP
+    detail::registerExceptionTranslatorImpl(&exceptionTranslator);
+    return 0;
+}
+
+} // namespace doctest
+
+// in a separate namespace outside of doctest because the DOCTEST_TEST_SUITE macro
+// introduces an anonymous namespace in which getCurrentTestSuite gets overridden
+namespace doctest_detail_test_suite_ns {
+DOCTEST_INTERFACE doctest::detail::TestSuite& getCurrentTestSuite();
+} // namespace doctest_detail_test_suite_ns
+
+namespace doctest {
+#else  // DOCTEST_CONFIG_DISABLE
+template <typename T>
+int registerExceptionTranslator(String (*)(T)) {
+    return 0;
+}
+#endif // DOCTEST_CONFIG_DISABLE
+
+namespace detail {
+    using assert_handler = void (*)(const AssertData&);
+    struct ContextState;
+} // namespace detail
+
+class DOCTEST_INTERFACE Context
+{
+    detail::ContextState* p;
+
+    void parseArgs(int argc, const char* const* argv, bool withDefaults = false);
+
+public:
+    explicit Context(int argc = 0, const char* const* argv = nullptr);
+
+    Context(const Context&) = delete;
+    Context(Context&&) = delete;
+
+    Context& operator=(const Context&) = delete;
+    Context& operator=(Context&&) = delete;
+
+    ~Context(); // NOLINT(performance-trivially-destructible)
+
+    void applyCommandLine(int argc, const char* const* argv);
+
+    void addFilter(const char* filter, const char* value);
+    void clearFilters();
+    void setOption(const char* option, bool value);
+    void setOption(const char* option, int value);
+    void setOption(const char* option, const char* value);
+
+    bool shouldExit();
+
+    void setAsDefaultForAssertsOutOfTestCases();
+
+    void setAssertHandler(detail::assert_handler ah);
+
+    void setCout(std::ostream* out);
+
+    int run();
+};
+
+namespace TestCaseFailureReason {
+    enum Enum
+    {
+        None                     = 0,
+        AssertFailure            = 1,   // an assertion has failed in the test case
+        Exception                = 2,   // test case threw an exception
+        Crash                    = 4,   // a crash...
+        TooManyFailedAsserts     = 8,   // the abort-after option
+        Timeout                  = 16,  // see the timeout decorator
+        ShouldHaveFailedButDidnt = 32,  // see the should_fail decorator
+        ShouldHaveFailedAndDid   = 64,  // see the should_fail decorator
+        DidntFailExactlyNumTimes = 128, // see the expected_failures decorator
+        FailedExactlyNumTimes    = 256, // see the expected_failures decorator
+        CouldHaveFailedAndDid    = 512  // see the may_fail decorator
+    };
+} // namespace TestCaseFailureReason
+
+struct DOCTEST_INTERFACE CurrentTestCaseStats
+{
+    int    numAssertsCurrentTest;
+    int    numAssertsFailedCurrentTest;
+    double seconds;
+    int    failure_flags; // use TestCaseFailureReason::Enum
+    bool   testCaseSuccess;
+};
+
+struct DOCTEST_INTERFACE TestCaseException
+{
+    String error_string;
+    bool   is_crash;
+};
+
+struct DOCTEST_INTERFACE TestRunStats
+{
+    unsigned numTestCases;
+    unsigned numTestCasesPassingFilters;
+    unsigned numTestSuitesPassingFilters;
+    unsigned numTestCasesFailed;
+    int      numAsserts;
+    int      numAssertsFailed;
+};
+
+struct QueryData
+{
+    const TestRunStats*  run_stats = nullptr;
+    const TestCaseData** data      = nullptr;
+    unsigned             num_data  = 0;
+};
+
+struct DOCTEST_INTERFACE IReporter
+{
+    // The constructor has to accept "const ContextOptions&" as a single argument
+    // which has most of the options for the run + a pointer to the stdout stream
+    // Reporter(const ContextOptions& in)
+
+    // called when a query should be reported (listing test cases, printing the version, etc.)
+    virtual void report_query(const QueryData&) = 0;
+
+    // called when the whole test run starts
+    virtual void test_run_start() = 0;
+    // called when the whole test run ends (caching a pointer to the input doesn't make sense here)
+    virtual void test_run_end(const TestRunStats&) = 0;
+
+    // called when a test case is started (safe to cache a pointer to the input)
+    virtual void test_case_start(const TestCaseData&) = 0;
+    // called when a test case is reentered because of unfinished subcases (safe to cache a pointer to the input)
+    virtual void test_case_reenter(const TestCaseData&) = 0;
+    // called when a test case has ended
+    virtual void test_case_end(const CurrentTestCaseStats&) = 0;
+
+    // called when an exception is thrown from the test case (or it crashes)
+    virtual void test_case_exception(const TestCaseException&) = 0;
+
+    // called whenever a subcase is entered (don't cache pointers to the input)
+    virtual void subcase_start(const SubcaseSignature&) = 0;
+    // called whenever a subcase is exited (don't cache pointers to the input)
+    virtual void subcase_end() = 0;
+
+    // called for each assert (don't cache pointers to the input)
+    virtual void log_assert(const AssertData&) = 0;
+    // called for each message (don't cache pointers to the input)
+    virtual void log_message(const MessageData&) = 0;
+
+    // called when a test case is skipped either because it doesn't pass the filters, has a skip decorator
+    // or isn't in the execution range (between first and last) (safe to cache a pointer to the input)
+    virtual void test_case_skipped(const TestCaseData&) = 0;
+
+    DOCTEST_DECLARE_INTERFACE(IReporter)
+
+    // can obtain all currently active contexts and stringify them if one wishes to do so
+    static int                         get_num_active_contexts();
+    static const IContextScope* const* get_active_contexts();
+
+    // can iterate through contexts which have been stringified automatically in their destructors when an exception has been thrown
+    static int           get_num_stringified_contexts();
+    static const String* get_stringified_contexts();
+};
+
+namespace detail {
+    using reporterCreatorFunc =  IReporter* (*)(const ContextOptions&);
+
+    DOCTEST_INTERFACE void registerReporterImpl(const char* name, int prio, reporterCreatorFunc c, bool isReporter);
+
+    template <typename Reporter>
+    IReporter* reporterCreator(const ContextOptions& o) {
+        return new Reporter(o);
+    }
+} // namespace detail
+
+template <typename Reporter>
+int registerReporter(const char* name, int priority, bool isReporter) {
+    detail::registerReporterImpl(name, priority, detail::reporterCreator<Reporter>, isReporter);
+    return 0;
+}
+} // namespace doctest
+
+#ifdef DOCTEST_CONFIG_ASSERTS_RETURN_VALUES
+#define DOCTEST_FUNC_EMPTY [] { return false; }()
+#else
+#define DOCTEST_FUNC_EMPTY (void)0
+#endif
+
+// if registering is not disabled
+#ifndef DOCTEST_CONFIG_DISABLE
+
+#ifdef DOCTEST_CONFIG_ASSERTS_RETURN_VALUES
+#define DOCTEST_FUNC_SCOPE_BEGIN [&]
+#define DOCTEST_FUNC_SCOPE_END ()
+#define DOCTEST_FUNC_SCOPE_RET(v) return v
+#else
+#define DOCTEST_FUNC_SCOPE_BEGIN do
+#define DOCTEST_FUNC_SCOPE_END while(false)
+#define DOCTEST_FUNC_SCOPE_RET(v) (void)0
+#endif
+
+// common code in asserts - for convenience
+#define DOCTEST_ASSERT_LOG_REACT_RETURN(b)                                                         \
+    if(b.log()) DOCTEST_BREAK_INTO_DEBUGGER();                                                     \
+    b.react();                                                                                     \
+    DOCTEST_FUNC_SCOPE_RET(!b.m_failed)
+
+#ifdef DOCTEST_CONFIG_NO_TRY_CATCH_IN_ASSERTS
+#define DOCTEST_WRAP_IN_TRY(x) x;
+#else // DOCTEST_CONFIG_NO_TRY_CATCH_IN_ASSERTS
+#define DOCTEST_WRAP_IN_TRY(x)                                                                     \
+    try {                                                                                          \
+        x;                                                                                         \
+    } catch(...) { DOCTEST_RB.translateException(); }
+#endif // DOCTEST_CONFIG_NO_TRY_CATCH_IN_ASSERTS
+
+#ifdef DOCTEST_CONFIG_VOID_CAST_EXPRESSIONS
+#define DOCTEST_CAST_TO_VOID(...)                                                                  \
+    DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH("-Wuseless-cast")                                       \
+    static_cast<void>(__VA_ARGS__);                                                                \
+    DOCTEST_GCC_SUPPRESS_WARNING_POP
+#else // DOCTEST_CONFIG_VOID_CAST_EXPRESSIONS
+#define DOCTEST_CAST_TO_VOID(...) __VA_ARGS__;
+#endif // DOCTEST_CONFIG_VOID_CAST_EXPRESSIONS
+
+// registers the test by initializing a dummy var with a function
+#define DOCTEST_REGISTER_FUNCTION(global_prefix, f, decorators)                                    \
+    global_prefix DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_ANONYMOUS(DOCTEST_ANON_VAR_), /* NOLINT */    \
+            doctest::detail::regTest(                                                              \
+                    doctest::detail::TestCase(                                                     \
+                            f, __FILE__, __LINE__,                                                 \
+                            doctest_detail_test_suite_ns::getCurrentTestSuite()) *                 \
+                    decorators))
+
+#define DOCTEST_IMPLEMENT_FIXTURE(der, base, func, decorators)                                     \
+    namespace { /* NOLINT */                                                                       \
+        struct der : public base                                                                   \
+        {                                                                                          \
+            void f();                                                                              \
+        };                                                                                         \
+        static DOCTEST_INLINE_NOINLINE void func() {                                               \
+            der v;                                                                                 \
+            v.f();                                                                                 \
+        }                                                                                          \
+        DOCTEST_REGISTER_FUNCTION(DOCTEST_EMPTY, func, decorators)                                 \
+    }                                                                                              \
+    DOCTEST_INLINE_NOINLINE void der::f() // NOLINT(misc-definitions-in-headers)
+
+#define DOCTEST_CREATE_AND_REGISTER_FUNCTION(f, decorators)                                        \
+    static void f();                                                                               \
+    DOCTEST_REGISTER_FUNCTION(DOCTEST_EMPTY, f, decorators)                                        \
+    static void f()
+
+#define DOCTEST_CREATE_AND_REGISTER_FUNCTION_IN_CLASS(f, proxy, decorators)                        \
+    static doctest::detail::funcType proxy() { return f; }                                         \
+    DOCTEST_REGISTER_FUNCTION(inline, proxy(), decorators)                                         \
+    static void f()
+
+// for registering tests
+#define DOCTEST_TEST_CASE(decorators)                                                              \
+    DOCTEST_CREATE_AND_REGISTER_FUNCTION(DOCTEST_ANONYMOUS(DOCTEST_ANON_FUNC_), decorators)
+
+// for registering tests in classes - requires C++17 for inline variables!
+#if DOCTEST_CPLUSPLUS >= 201703L
+#define DOCTEST_TEST_CASE_CLASS(decorators)                                                        \
+    DOCTEST_CREATE_AND_REGISTER_FUNCTION_IN_CLASS(DOCTEST_ANONYMOUS(DOCTEST_ANON_FUNC_),           \
+                                                  DOCTEST_ANONYMOUS(DOCTEST_ANON_PROXY_),          \
+                                                  decorators)
+#else // DOCTEST_TEST_CASE_CLASS
+#define DOCTEST_TEST_CASE_CLASS(...)                                                               \
+    TEST_CASES_CAN_BE_REGISTERED_IN_CLASSES_ONLY_IN_CPP17_MODE_OR_WITH_VS_2017_OR_NEWER
+#endif // DOCTEST_TEST_CASE_CLASS
+
+// for registering tests with a fixture
+#define DOCTEST_TEST_CASE_FIXTURE(c, decorators)                                                   \
+    DOCTEST_IMPLEMENT_FIXTURE(DOCTEST_ANONYMOUS(DOCTEST_ANON_CLASS_), c,                           \
+                              DOCTEST_ANONYMOUS(DOCTEST_ANON_FUNC_), decorators)
+
+// for converting types to strings without the <typeinfo> header and demangling
+#define DOCTEST_TYPE_TO_STRING_AS(str, ...)                                                        \
+    namespace doctest {                                                                            \
+        template <>                                                                                \
+        inline String toString<__VA_ARGS__>() {                                                    \
+            return str;                                                                            \
+        }                                                                                          \
+    }                                                                                              \
+    static_assert(true, "")
+
+#define DOCTEST_TYPE_TO_STRING(...) DOCTEST_TYPE_TO_STRING_AS(#__VA_ARGS__, __VA_ARGS__)
+
+#define DOCTEST_TEST_CASE_TEMPLATE_DEFINE_IMPL(dec, T, iter, func)                                 \
+    template <typename T>                                                                          \
+    static void func();                                                                            \
+    namespace { /* NOLINT */                                                                       \
+        template <typename Tuple>                                                                  \
+        struct iter;                                                                               \
+        template <typename Type, typename... Rest>                                                 \
+        struct iter<std::tuple<Type, Rest...>>                                                     \
+        {                                                                                          \
+            iter(const char* file, unsigned line, int index) {                                     \
+                doctest::detail::regTest(doctest::detail::TestCase(func<Type>, file, line,         \
+                                            doctest_detail_test_suite_ns::getCurrentTestSuite(),   \
+                                            doctest::toString<Type>(),                             \
+                                            int(line) * 1000 + index)                              \
+                                         * dec);                                                   \
+                iter<std::tuple<Rest...>>(file, line, index + 1);                                  \
+            }                                                                                      \
+        };                                                                                         \
+        template <>                                                                                \
+        struct iter<std::tuple<>>                                                                  \
+        {                                                                                          \
+            iter(const char*, unsigned, int) {}                                                    \
+        };                                                                                         \
+    }                                                                                              \
+    template <typename T>                                                                          \
+    static void func()
+
+#define DOCTEST_TEST_CASE_TEMPLATE_DEFINE(dec, T, id)                                              \
+    DOCTEST_TEST_CASE_TEMPLATE_DEFINE_IMPL(dec, T, DOCTEST_CAT(id, ITERATOR),                      \
+                                           DOCTEST_ANONYMOUS(DOCTEST_ANON_TMP_))
+
+#define DOCTEST_TEST_CASE_TEMPLATE_INSTANTIATE_IMPL(id, anon, ...)                                 \
+    DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_CAT(anon, DUMMY), /* NOLINT(cert-err58-cpp, fuchsia-statically-constructed-objects) */ \
+        doctest::detail::instantiationHelper(                                                      \
+            DOCTEST_CAT(id, ITERATOR)<__VA_ARGS__>(__FILE__, __LINE__, 0)))
+
+#define DOCTEST_TEST_CASE_TEMPLATE_INVOKE(id, ...)                                                 \
+    DOCTEST_TEST_CASE_TEMPLATE_INSTANTIATE_IMPL(id, DOCTEST_ANONYMOUS(DOCTEST_ANON_TMP_), std::tuple<__VA_ARGS__>) \
+    static_assert(true, "")
+
+#define DOCTEST_TEST_CASE_TEMPLATE_APPLY(id, ...)                                                  \
+    DOCTEST_TEST_CASE_TEMPLATE_INSTANTIATE_IMPL(id, DOCTEST_ANONYMOUS(DOCTEST_ANON_TMP_), __VA_ARGS__) \
+    static_assert(true, "")
+
+#define DOCTEST_TEST_CASE_TEMPLATE_IMPL(dec, T, anon, ...)                                         \
+    DOCTEST_TEST_CASE_TEMPLATE_DEFINE_IMPL(dec, T, DOCTEST_CAT(anon, ITERATOR), anon);             \
+    DOCTEST_TEST_CASE_TEMPLATE_INSTANTIATE_IMPL(anon, anon, std::tuple<__VA_ARGS__>)               \
+    template <typename T>                                                                          \
+    static void anon()
+
+#define DOCTEST_TEST_CASE_TEMPLATE(dec, T, ...)                                                    \
+    DOCTEST_TEST_CASE_TEMPLATE_IMPL(dec, T, DOCTEST_ANONYMOUS(DOCTEST_ANON_TMP_), __VA_ARGS__)
+
+// for subcases
+#define DOCTEST_SUBCASE(name)                                                                      \
+    if(const doctest::detail::Subcase & DOCTEST_ANONYMOUS(DOCTEST_ANON_SUBCASE_) DOCTEST_UNUSED =  \
+               doctest::detail::Subcase(name, __FILE__, __LINE__))
+
+// for grouping tests in test suites by using code blocks
+#define DOCTEST_TEST_SUITE_IMPL(decorators, ns_name)                                               \
+    namespace ns_name { namespace doctest_detail_test_suite_ns {                                   \
+            static DOCTEST_NOINLINE doctest::detail::TestSuite& getCurrentTestSuite() noexcept {   \
+                DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4640)                                      \
+                DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wexit-time-destructors")                \
+                DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH("-Wmissing-field-initializers")             \
+                static doctest::detail::TestSuite data{};                                          \
+                static bool                       inited = false;                                  \
+                DOCTEST_MSVC_SUPPRESS_WARNING_POP                                                  \
+                DOCTEST_CLANG_SUPPRESS_WARNING_POP                                                 \
+                DOCTEST_GCC_SUPPRESS_WARNING_POP                                                   \
+                if(!inited) {                                                                      \
+                    data* decorators;                                                              \
+                    inited = true;                                                                 \
+                }                                                                                  \
+                return data;                                                                       \
+            }                                                                                      \
+        }                                                                                          \
+    }                                                                                              \
+    namespace ns_name
+
+#define DOCTEST_TEST_SUITE(decorators)                                                             \
+    DOCTEST_TEST_SUITE_IMPL(decorators, DOCTEST_ANONYMOUS(DOCTEST_ANON_SUITE_))
+
+// for starting a testsuite block
+#define DOCTEST_TEST_SUITE_BEGIN(decorators)                                                       \
+    DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_ANONYMOUS(DOCTEST_ANON_VAR_), /* NOLINT(cert-err58-cpp) */  \
+            doctest::detail::setTestSuite(doctest::detail::TestSuite() * decorators))              \
+    static_assert(true, "")
+
+// for ending a testsuite block
+#define DOCTEST_TEST_SUITE_END                                                                     \
+    DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_ANONYMOUS(DOCTEST_ANON_VAR_), /* NOLINT(cert-err58-cpp) */  \
+            doctest::detail::setTestSuite(doctest::detail::TestSuite() * ""))                      \
+    using DOCTEST_ANONYMOUS(DOCTEST_ANON_FOR_SEMICOLON_) = int
+
+// for registering exception translators
+#define DOCTEST_REGISTER_EXCEPTION_TRANSLATOR_IMPL(translatorName, signature)                      \
+    inline doctest::String translatorName(signature);                                              \
+    DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_ANONYMOUS(DOCTEST_ANON_TRANSLATOR_), /* NOLINT(cert-err58-cpp) */ \
+            doctest::registerExceptionTranslator(translatorName))                                  \
+    doctest::String translatorName(signature)
+
+#define DOCTEST_REGISTER_EXCEPTION_TRANSLATOR(signature)                                           \
+    DOCTEST_REGISTER_EXCEPTION_TRANSLATOR_IMPL(DOCTEST_ANONYMOUS(DOCTEST_ANON_TRANSLATOR_),        \
+                                               signature)
+
+// for registering reporters
+#define DOCTEST_REGISTER_REPORTER(name, priority, reporter)                                        \
+    DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_ANONYMOUS(DOCTEST_ANON_REPORTER_), /* NOLINT(cert-err58-cpp) */ \
+            doctest::registerReporter<reporter>(name, priority, true))                             \
+    static_assert(true, "")
+
+// for registering listeners
+#define DOCTEST_REGISTER_LISTENER(name, priority, reporter)                                        \
+    DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_ANONYMOUS(DOCTEST_ANON_REPORTER_), /* NOLINT(cert-err58-cpp) */ \
+            doctest::registerReporter<reporter>(name, priority, false))                            \
+    static_assert(true, "")
+
+// clang-format off
+// for logging - disabling formatting because it's important to have these on 2 separate lines - see PR #557
+#define DOCTEST_INFO(...)                                                                          \
+    DOCTEST_INFO_IMPL(DOCTEST_ANONYMOUS(DOCTEST_CAPTURE_),                                         \
+                      DOCTEST_ANONYMOUS(DOCTEST_CAPTURE_OTHER_),                                   \
+                      __VA_ARGS__)
+// clang-format on
+
+#define DOCTEST_INFO_IMPL(mb_name, s_name, ...)                                       \
+    auto DOCTEST_ANONYMOUS(DOCTEST_CAPTURE_) = doctest::detail::MakeContextScope(                  \
+        [&](std::ostream* s_name) {                                                                \
+        doctest::detail::MessageBuilder mb_name(__FILE__, __LINE__, doctest::assertType::is_warn); \
+        mb_name.m_stream = s_name;                                                                 \
+        mb_name * __VA_ARGS__;                                                                     \
+    })
+
+#define DOCTEST_CAPTURE(x) DOCTEST_INFO(#x " := ", x)
+
+#define DOCTEST_ADD_AT_IMPL(type, file, line, mb, ...)                                             \
+    DOCTEST_FUNC_SCOPE_BEGIN {                                                                     \
+        doctest::detail::MessageBuilder mb(file, line, doctest::assertType::type);                 \
+        mb * __VA_ARGS__;                                                                          \
+        if(mb.log())                                                                               \
+            DOCTEST_BREAK_INTO_DEBUGGER();                                                         \
+        mb.react();                                                                                \
+    } DOCTEST_FUNC_SCOPE_END
+
+// clang-format off
+#define DOCTEST_ADD_MESSAGE_AT(file, line, ...) DOCTEST_ADD_AT_IMPL(is_warn, file, line, DOCTEST_ANONYMOUS(DOCTEST_MESSAGE_), __VA_ARGS__)
+#define DOCTEST_ADD_FAIL_CHECK_AT(file, line, ...) DOCTEST_ADD_AT_IMPL(is_check, file, line, DOCTEST_ANONYMOUS(DOCTEST_MESSAGE_), __VA_ARGS__)
+#define DOCTEST_ADD_FAIL_AT(file, line, ...) DOCTEST_ADD_AT_IMPL(is_require, file, line, DOCTEST_ANONYMOUS(DOCTEST_MESSAGE_), __VA_ARGS__)
+// clang-format on
+
+#define DOCTEST_MESSAGE(...) DOCTEST_ADD_MESSAGE_AT(__FILE__, __LINE__, __VA_ARGS__)
+#define DOCTEST_FAIL_CHECK(...) DOCTEST_ADD_FAIL_CHECK_AT(__FILE__, __LINE__, __VA_ARGS__)
+#define DOCTEST_FAIL(...) DOCTEST_ADD_FAIL_AT(__FILE__, __LINE__, __VA_ARGS__)
+
+#define DOCTEST_TO_LVALUE(...) __VA_ARGS__ // Not removed to keep backwards compatibility.
+
+#ifndef DOCTEST_CONFIG_SUPER_FAST_ASSERTS
+
+#define DOCTEST_ASSERT_IMPLEMENT_2(assert_type, ...)                                               \
+    DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Woverloaded-shift-op-parentheses")                  \
+    /* NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks) */                                  \
+    doctest::detail::ResultBuilder DOCTEST_RB(doctest::assertType::assert_type, __FILE__,          \
+                                               __LINE__, #__VA_ARGS__);                            \
+    DOCTEST_WRAP_IN_TRY(DOCTEST_RB.setResult(                                                      \
+            doctest::detail::ExpressionDecomposer(doctest::assertType::assert_type)                \
+            << __VA_ARGS__)) /* NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks) */         \
+    DOCTEST_ASSERT_LOG_REACT_RETURN(DOCTEST_RB)                                                    \
+    DOCTEST_CLANG_SUPPRESS_WARNING_POP
+
+#define DOCTEST_ASSERT_IMPLEMENT_1(assert_type, ...)                                               \
+    DOCTEST_FUNC_SCOPE_BEGIN {                                                                     \
+        DOCTEST_ASSERT_IMPLEMENT_2(assert_type, __VA_ARGS__);                                      \
+    } DOCTEST_FUNC_SCOPE_END // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks)
+
+#define DOCTEST_BINARY_ASSERT(assert_type, comp, ...)                                              \
+    DOCTEST_FUNC_SCOPE_BEGIN {                                                                     \
+        doctest::detail::ResultBuilder DOCTEST_RB(doctest::assertType::assert_type, __FILE__,      \
+                                                   __LINE__, #__VA_ARGS__);                        \
+        DOCTEST_WRAP_IN_TRY(                                                                       \
+                DOCTEST_RB.binary_assert<doctest::detail::binaryAssertComparison::comp>(           \
+                        __VA_ARGS__))                                                              \
+        DOCTEST_ASSERT_LOG_REACT_RETURN(DOCTEST_RB);                                               \
+    } DOCTEST_FUNC_SCOPE_END
+
+#define DOCTEST_UNARY_ASSERT(assert_type, ...)                                                     \
+    DOCTEST_FUNC_SCOPE_BEGIN {                                                                     \
+        doctest::detail::ResultBuilder DOCTEST_RB(doctest::assertType::assert_type, __FILE__,      \
+                                                   __LINE__, #__VA_ARGS__);                        \
+        DOCTEST_WRAP_IN_TRY(DOCTEST_RB.unary_assert(__VA_ARGS__))                                  \
+        DOCTEST_ASSERT_LOG_REACT_RETURN(DOCTEST_RB);                                               \
+    } DOCTEST_FUNC_SCOPE_END
+
+#else // DOCTEST_CONFIG_SUPER_FAST_ASSERTS
+
+// necessary for <ASSERT>_MESSAGE
+#define DOCTEST_ASSERT_IMPLEMENT_2 DOCTEST_ASSERT_IMPLEMENT_1
+
+#define DOCTEST_ASSERT_IMPLEMENT_1(assert_type, ...)                                               \
+    DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Woverloaded-shift-op-parentheses")                  \
+    doctest::detail::decomp_assert(                                                                \
+            doctest::assertType::assert_type, __FILE__, __LINE__, #__VA_ARGS__,                    \
+            doctest::detail::ExpressionDecomposer(doctest::assertType::assert_type)                \
+                    << __VA_ARGS__) DOCTEST_CLANG_SUPPRESS_WARNING_POP
+
+#define DOCTEST_BINARY_ASSERT(assert_type, comparison, ...)                                        \
+    doctest::detail::binary_assert<doctest::detail::binaryAssertComparison::comparison>(           \
+            doctest::assertType::assert_type, __FILE__, __LINE__, #__VA_ARGS__, __VA_ARGS__)
+
+#define DOCTEST_UNARY_ASSERT(assert_type, ...)                                                     \
+    doctest::detail::unary_assert(doctest::assertType::assert_type, __FILE__, __LINE__,            \
+                                  #__VA_ARGS__, __VA_ARGS__)
+
+#endif // DOCTEST_CONFIG_SUPER_FAST_ASSERTS
+
+#define DOCTEST_WARN(...) DOCTEST_ASSERT_IMPLEMENT_1(DT_WARN, __VA_ARGS__)
+#define DOCTEST_CHECK(...) DOCTEST_ASSERT_IMPLEMENT_1(DT_CHECK, __VA_ARGS__)
+#define DOCTEST_REQUIRE(...) DOCTEST_ASSERT_IMPLEMENT_1(DT_REQUIRE, __VA_ARGS__)
+#define DOCTEST_WARN_FALSE(...) DOCTEST_ASSERT_IMPLEMENT_1(DT_WARN_FALSE, __VA_ARGS__)
+#define DOCTEST_CHECK_FALSE(...) DOCTEST_ASSERT_IMPLEMENT_1(DT_CHECK_FALSE, __VA_ARGS__)
+#define DOCTEST_REQUIRE_FALSE(...) DOCTEST_ASSERT_IMPLEMENT_1(DT_REQUIRE_FALSE, __VA_ARGS__)
+
+// clang-format off
+#define DOCTEST_WARN_MESSAGE(cond, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_ASSERT_IMPLEMENT_2(DT_WARN, cond); } DOCTEST_FUNC_SCOPE_END
+#define DOCTEST_CHECK_MESSAGE(cond, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_ASSERT_IMPLEMENT_2(DT_CHECK, cond); } DOCTEST_FUNC_SCOPE_END
+#define DOCTEST_REQUIRE_MESSAGE(cond, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_ASSERT_IMPLEMENT_2(DT_REQUIRE, cond); } DOCTEST_FUNC_SCOPE_END
+#define DOCTEST_WARN_FALSE_MESSAGE(cond, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_ASSERT_IMPLEMENT_2(DT_WARN_FALSE, cond); } DOCTEST_FUNC_SCOPE_END
+#define DOCTEST_CHECK_FALSE_MESSAGE(cond, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_ASSERT_IMPLEMENT_2(DT_CHECK_FALSE, cond); } DOCTEST_FUNC_SCOPE_END
+#define DOCTEST_REQUIRE_FALSE_MESSAGE(cond, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_ASSERT_IMPLEMENT_2(DT_REQUIRE_FALSE, cond); } DOCTEST_FUNC_SCOPE_END
+// clang-format on
+
+#define DOCTEST_WARN_EQ(...) DOCTEST_BINARY_ASSERT(DT_WARN_EQ, eq, __VA_ARGS__)
+#define DOCTEST_CHECK_EQ(...) DOCTEST_BINARY_ASSERT(DT_CHECK_EQ, eq, __VA_ARGS__)
+#define DOCTEST_REQUIRE_EQ(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_EQ, eq, __VA_ARGS__)
+#define DOCTEST_WARN_NE(...) DOCTEST_BINARY_ASSERT(DT_WARN_NE, ne, __VA_ARGS__)
+#define DOCTEST_CHECK_NE(...) DOCTEST_BINARY_ASSERT(DT_CHECK_NE, ne, __VA_ARGS__)
+#define DOCTEST_REQUIRE_NE(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_NE, ne, __VA_ARGS__)
+#define DOCTEST_WARN_GT(...) DOCTEST_BINARY_ASSERT(DT_WARN_GT, gt, __VA_ARGS__)
+#define DOCTEST_CHECK_GT(...) DOCTEST_BINARY_ASSERT(DT_CHECK_GT, gt, __VA_ARGS__)
+#define DOCTEST_REQUIRE_GT(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_GT, gt, __VA_ARGS__)
+#define DOCTEST_WARN_LT(...) DOCTEST_BINARY_ASSERT(DT_WARN_LT, lt, __VA_ARGS__)
+#define DOCTEST_CHECK_LT(...) DOCTEST_BINARY_ASSERT(DT_CHECK_LT, lt, __VA_ARGS__)
+#define DOCTEST_REQUIRE_LT(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_LT, lt, __VA_ARGS__)
+#define DOCTEST_WARN_GE(...) DOCTEST_BINARY_ASSERT(DT_WARN_GE, ge, __VA_ARGS__)
+#define DOCTEST_CHECK_GE(...) DOCTEST_BINARY_ASSERT(DT_CHECK_GE, ge, __VA_ARGS__)
+#define DOCTEST_REQUIRE_GE(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_GE, ge, __VA_ARGS__)
+#define DOCTEST_WARN_LE(...) DOCTEST_BINARY_ASSERT(DT_WARN_LE, le, __VA_ARGS__)
+#define DOCTEST_CHECK_LE(...) DOCTEST_BINARY_ASSERT(DT_CHECK_LE, le, __VA_ARGS__)
+#define DOCTEST_REQUIRE_LE(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_LE, le, __VA_ARGS__)
+
+#define DOCTEST_WARN_UNARY(...) DOCTEST_UNARY_ASSERT(DT_WARN_UNARY, __VA_ARGS__)
+#define DOCTEST_CHECK_UNARY(...) DOCTEST_UNARY_ASSERT(DT_CHECK_UNARY, __VA_ARGS__)
+#define DOCTEST_REQUIRE_UNARY(...) DOCTEST_UNARY_ASSERT(DT_REQUIRE_UNARY, __VA_ARGS__)
+#define DOCTEST_WARN_UNARY_FALSE(...) DOCTEST_UNARY_ASSERT(DT_WARN_UNARY_FALSE, __VA_ARGS__)
+#define DOCTEST_CHECK_UNARY_FALSE(...) DOCTEST_UNARY_ASSERT(DT_CHECK_UNARY_FALSE, __VA_ARGS__)
+#define DOCTEST_REQUIRE_UNARY_FALSE(...) DOCTEST_UNARY_ASSERT(DT_REQUIRE_UNARY_FALSE, __VA_ARGS__)
+
+#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS
+
+#define DOCTEST_ASSERT_THROWS_AS(expr, assert_type, message, ...)                                  \
+    DOCTEST_FUNC_SCOPE_BEGIN {                                                                     \
+        if(!doctest::getContextOptions()->no_throw) {                                              \
+            doctest::detail::ResultBuilder DOCTEST_RB(doctest::assertType::assert_type, __FILE__,  \
+                                                       __LINE__, #expr, #__VA_ARGS__, message);    \
+            try {                                                                                  \
+                DOCTEST_CAST_TO_VOID(expr)                                                         \
+            } catch(const typename doctest::detail::types::remove_const<                           \
+                    typename doctest::detail::types::remove_reference<__VA_ARGS__>::type>::type&) {\
+                DOCTEST_RB.translateException();                                                   \
+                DOCTEST_RB.m_threw_as = true;                                                      \
+            } catch(...) { DOCTEST_RB.translateException(); }                                      \
+            DOCTEST_ASSERT_LOG_REACT_RETURN(DOCTEST_RB);                                           \
+        } else { /* NOLINT(*-else-after-return) */                                                 \
+            DOCTEST_FUNC_SCOPE_RET(false);                                                         \
+        }                                                                                          \
+    } DOCTEST_FUNC_SCOPE_END
+
+#define DOCTEST_ASSERT_THROWS_WITH(expr, expr_str, assert_type, ...)                               \
+    DOCTEST_FUNC_SCOPE_BEGIN {                                                                     \
+        if(!doctest::getContextOptions()->no_throw) {                                              \
+            doctest::detail::ResultBuilder DOCTEST_RB(doctest::assertType::assert_type, __FILE__,  \
+                                                       __LINE__, expr_str, "", __VA_ARGS__);       \
+            try {                                                                                  \
+                DOCTEST_CAST_TO_VOID(expr)                                                         \
+            } catch(...) { DOCTEST_RB.translateException(); }                                      \
+            DOCTEST_ASSERT_LOG_REACT_RETURN(DOCTEST_RB);                                           \
+        } else { /* NOLINT(*-else-after-return) */                                                 \
+           DOCTEST_FUNC_SCOPE_RET(false);                                                          \
+        }                                                                                          \
+    } DOCTEST_FUNC_SCOPE_END
+
+#define DOCTEST_ASSERT_NOTHROW(assert_type, ...)                                                   \
+    DOCTEST_FUNC_SCOPE_BEGIN {                                                                     \
+        doctest::detail::ResultBuilder DOCTEST_RB(doctest::assertType::assert_type, __FILE__,      \
+                                                   __LINE__, #__VA_ARGS__);                        \
+        try {                                                                                      \
+            DOCTEST_CAST_TO_VOID(__VA_ARGS__)                                                      \
+        } catch(...) { DOCTEST_RB.translateException(); }                                          \
+        DOCTEST_ASSERT_LOG_REACT_RETURN(DOCTEST_RB);                                               \
+    } DOCTEST_FUNC_SCOPE_END
+
+// clang-format off
+#define DOCTEST_WARN_THROWS(...) DOCTEST_ASSERT_THROWS_WITH((__VA_ARGS__), #__VA_ARGS__, DT_WARN_THROWS, "")
+#define DOCTEST_CHECK_THROWS(...) DOCTEST_ASSERT_THROWS_WITH((__VA_ARGS__), #__VA_ARGS__, DT_CHECK_THROWS, "")
+#define DOCTEST_REQUIRE_THROWS(...) DOCTEST_ASSERT_THROWS_WITH((__VA_ARGS__), #__VA_ARGS__, DT_REQUIRE_THROWS, "")
+
+#define DOCTEST_WARN_THROWS_AS(expr, ...) DOCTEST_ASSERT_THROWS_AS(expr, DT_WARN_THROWS_AS, "", __VA_ARGS__)
+#define DOCTEST_CHECK_THROWS_AS(expr, ...) DOCTEST_ASSERT_THROWS_AS(expr, DT_CHECK_THROWS_AS, "", __VA_ARGS__)
+#define DOCTEST_REQUIRE_THROWS_AS(expr, ...) DOCTEST_ASSERT_THROWS_AS(expr, DT_REQUIRE_THROWS_AS, "", __VA_ARGS__)
+
+#define DOCTEST_WARN_THROWS_WITH(expr, ...) DOCTEST_ASSERT_THROWS_WITH(expr, #expr, DT_WARN_THROWS_WITH, __VA_ARGS__)
+#define DOCTEST_CHECK_THROWS_WITH(expr, ...) DOCTEST_ASSERT_THROWS_WITH(expr, #expr, DT_CHECK_THROWS_WITH, __VA_ARGS__)
+#define DOCTEST_REQUIRE_THROWS_WITH(expr, ...) DOCTEST_ASSERT_THROWS_WITH(expr, #expr, DT_REQUIRE_THROWS_WITH, __VA_ARGS__)
+
+#define DOCTEST_WARN_THROWS_WITH_AS(expr, message, ...) DOCTEST_ASSERT_THROWS_AS(expr, DT_WARN_THROWS_WITH_AS, message, __VA_ARGS__)
+#define DOCTEST_CHECK_THROWS_WITH_AS(expr, message, ...) DOCTEST_ASSERT_THROWS_AS(expr, DT_CHECK_THROWS_WITH_AS, message, __VA_ARGS__)
+#define DOCTEST_REQUIRE_THROWS_WITH_AS(expr, message, ...) DOCTEST_ASSERT_THROWS_AS(expr, DT_REQUIRE_THROWS_WITH_AS, message, __VA_ARGS__)
+
+#define DOCTEST_WARN_NOTHROW(...) DOCTEST_ASSERT_NOTHROW(DT_WARN_NOTHROW, __VA_ARGS__)
+#define DOCTEST_CHECK_NOTHROW(...) DOCTEST_ASSERT_NOTHROW(DT_CHECK_NOTHROW, __VA_ARGS__)
+#define DOCTEST_REQUIRE_NOTHROW(...) DOCTEST_ASSERT_NOTHROW(DT_REQUIRE_NOTHROW, __VA_ARGS__)
+
+#define DOCTEST_WARN_THROWS_MESSAGE(expr, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_WARN_THROWS(expr); } DOCTEST_FUNC_SCOPE_END
+#define DOCTEST_CHECK_THROWS_MESSAGE(expr, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_CHECK_THROWS(expr); } DOCTEST_FUNC_SCOPE_END
+#define DOCTEST_REQUIRE_THROWS_MESSAGE(expr, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_REQUIRE_THROWS(expr); } DOCTEST_FUNC_SCOPE_END
+#define DOCTEST_WARN_THROWS_AS_MESSAGE(expr, ex, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_WARN_THROWS_AS(expr, ex); } DOCTEST_FUNC_SCOPE_END
+#define DOCTEST_CHECK_THROWS_AS_MESSAGE(expr, ex, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_CHECK_THROWS_AS(expr, ex); } DOCTEST_FUNC_SCOPE_END
+#define DOCTEST_REQUIRE_THROWS_AS_MESSAGE(expr, ex, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_REQUIRE_THROWS_AS(expr, ex); } DOCTEST_FUNC_SCOPE_END
+#define DOCTEST_WARN_THROWS_WITH_MESSAGE(expr, with, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_WARN_THROWS_WITH(expr, with); } DOCTEST_FUNC_SCOPE_END
+#define DOCTEST_CHECK_THROWS_WITH_MESSAGE(expr, with, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_CHECK_THROWS_WITH(expr, with); } DOCTEST_FUNC_SCOPE_END
+#define DOCTEST_REQUIRE_THROWS_WITH_MESSAGE(expr, with, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_REQUIRE_THROWS_WITH(expr, with); } DOCTEST_FUNC_SCOPE_END
+#define DOCTEST_WARN_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_WARN_THROWS_WITH_AS(expr, with, ex); } DOCTEST_FUNC_SCOPE_END
+#define DOCTEST_CHECK_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_CHECK_THROWS_WITH_AS(expr, with, ex); } DOCTEST_FUNC_SCOPE_END
+#define DOCTEST_REQUIRE_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_REQUIRE_THROWS_WITH_AS(expr, with, ex); } DOCTEST_FUNC_SCOPE_END
+#define DOCTEST_WARN_NOTHROW_MESSAGE(expr, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_WARN_NOTHROW(expr); } DOCTEST_FUNC_SCOPE_END
+#define DOCTEST_CHECK_NOTHROW_MESSAGE(expr, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_CHECK_NOTHROW(expr); } DOCTEST_FUNC_SCOPE_END
+#define DOCTEST_REQUIRE_NOTHROW_MESSAGE(expr, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_REQUIRE_NOTHROW(expr); } DOCTEST_FUNC_SCOPE_END
+// clang-format on
+
+#endif // DOCTEST_CONFIG_NO_EXCEPTIONS
+
+// =================================================================================================
+// == WHAT FOLLOWS IS VERSIONS OF THE MACROS THAT DO NOT DO ANY REGISTERING!                      ==
+// == THIS CAN BE ENABLED BY DEFINING DOCTEST_CONFIG_DISABLE GLOBALLY!                            ==
+// =================================================================================================
+#else // DOCTEST_CONFIG_DISABLE
+
+#define DOCTEST_IMPLEMENT_FIXTURE(der, base, func, name)                                           \
+    namespace /* NOLINT */ {                                                                       \
+        template <typename DOCTEST_UNUSED_TEMPLATE_TYPE>                                           \
+        struct der : public base                                                                   \
+        { void f(); };                                                                             \
+    }                                                                                              \
+    template <typename DOCTEST_UNUSED_TEMPLATE_TYPE>                                               \
+    inline void der<DOCTEST_UNUSED_TEMPLATE_TYPE>::f()
+
+#define DOCTEST_CREATE_AND_REGISTER_FUNCTION(f, name)                                              \
+    template <typename DOCTEST_UNUSED_TEMPLATE_TYPE>                                               \
+    static inline void f()
+
+// for registering tests
+#define DOCTEST_TEST_CASE(name)                                                                    \
+    DOCTEST_CREATE_AND_REGISTER_FUNCTION(DOCTEST_ANONYMOUS(DOCTEST_ANON_FUNC_), name)
+
+// for registering tests in classes
+#define DOCTEST_TEST_CASE_CLASS(name)                                                              \
+    DOCTEST_CREATE_AND_REGISTER_FUNCTION(DOCTEST_ANONYMOUS(DOCTEST_ANON_FUNC_), name)
+
+// for registering tests with a fixture
+#define DOCTEST_TEST_CASE_FIXTURE(x, name)                                                         \
+    DOCTEST_IMPLEMENT_FIXTURE(DOCTEST_ANONYMOUS(DOCTEST_ANON_CLASS_), x,                           \
+                              DOCTEST_ANONYMOUS(DOCTEST_ANON_FUNC_), name)
+
+// for converting types to strings without the <typeinfo> header and demangling
+#define DOCTEST_TYPE_TO_STRING_AS(str, ...) static_assert(true, "")
+#define DOCTEST_TYPE_TO_STRING(...) static_assert(true, "")
+
+// for typed tests
+#define DOCTEST_TEST_CASE_TEMPLATE(name, type, ...)                                                \
+    template <typename type>                                                                       \
+    inline void DOCTEST_ANONYMOUS(DOCTEST_ANON_TMP_)()
+
+#define DOCTEST_TEST_CASE_TEMPLATE_DEFINE(name, type, id)                                          \
+    template <typename type>                                                                       \
+    inline void DOCTEST_ANONYMOUS(DOCTEST_ANON_TMP_)()
+
+#define DOCTEST_TEST_CASE_TEMPLATE_INVOKE(id, ...) static_assert(true, "")
+#define DOCTEST_TEST_CASE_TEMPLATE_APPLY(id, ...) static_assert(true, "")
+
+// for subcases
+#define DOCTEST_SUBCASE(name)
+
+// for a testsuite block
+#define DOCTEST_TEST_SUITE(name) namespace // NOLINT
+
+// for starting a testsuite block
+#define DOCTEST_TEST_SUITE_BEGIN(name) static_assert(true, "")
+
+// for ending a testsuite block
+#define DOCTEST_TEST_SUITE_END using DOCTEST_ANONYMOUS(DOCTEST_ANON_FOR_SEMICOLON_) = int
+
+#define DOCTEST_REGISTER_EXCEPTION_TRANSLATOR(signature)                                           \
+    template <typename DOCTEST_UNUSED_TEMPLATE_TYPE>                                               \
+    static inline doctest::String DOCTEST_ANONYMOUS(DOCTEST_ANON_TRANSLATOR_)(signature)
+
+#define DOCTEST_REGISTER_REPORTER(name, priority, reporter)
+#define DOCTEST_REGISTER_LISTENER(name, priority, reporter)
+
+#define DOCTEST_INFO(...) (static_cast<void>(0))
+#define DOCTEST_CAPTURE(x) (static_cast<void>(0))
+#define DOCTEST_ADD_MESSAGE_AT(file, line, ...) (static_cast<void>(0))
+#define DOCTEST_ADD_FAIL_CHECK_AT(file, line, ...) (static_cast<void>(0))
+#define DOCTEST_ADD_FAIL_AT(file, line, ...) (static_cast<void>(0))
+#define DOCTEST_MESSAGE(...) (static_cast<void>(0))
+#define DOCTEST_FAIL_CHECK(...) (static_cast<void>(0))
+#define DOCTEST_FAIL(...) (static_cast<void>(0))
+
+#if defined(DOCTEST_CONFIG_EVALUATE_ASSERTS_EVEN_WHEN_DISABLED)                                    \
+ && defined(DOCTEST_CONFIG_ASSERTS_RETURN_VALUES)
+
+#define DOCTEST_WARN(...) [&] { return __VA_ARGS__; }()
+#define DOCTEST_CHECK(...) [&] { return __VA_ARGS__; }()
+#define DOCTEST_REQUIRE(...) [&] { return __VA_ARGS__; }()
+#define DOCTEST_WARN_FALSE(...) [&] { return !(__VA_ARGS__); }()
+#define DOCTEST_CHECK_FALSE(...) [&] { return !(__VA_ARGS__); }()
+#define DOCTEST_REQUIRE_FALSE(...) [&] { return !(__VA_ARGS__); }()
+
+#define DOCTEST_WARN_MESSAGE(cond, ...) [&] { return cond; }()
+#define DOCTEST_CHECK_MESSAGE(cond, ...) [&] { return cond; }()
+#define DOCTEST_REQUIRE_MESSAGE(cond, ...) [&] { return cond; }()
+#define DOCTEST_WARN_FALSE_MESSAGE(cond, ...) [&] { return !(cond); }()
+#define DOCTEST_CHECK_FALSE_MESSAGE(cond, ...) [&] { return !(cond); }()
+#define DOCTEST_REQUIRE_FALSE_MESSAGE(cond, ...) [&] { return !(cond); }()
+
+namespace doctest {
+namespace detail {
+#define DOCTEST_RELATIONAL_OP(name, op)                                                            \
+    template <typename L, typename R>                                                              \
+    bool name(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) { return lhs op rhs; }
+
+    DOCTEST_RELATIONAL_OP(eq, ==)
+    DOCTEST_RELATIONAL_OP(ne, !=)
+    DOCTEST_RELATIONAL_OP(lt, <)
+    DOCTEST_RELATIONAL_OP(gt, >)
+    DOCTEST_RELATIONAL_OP(le, <=)
+    DOCTEST_RELATIONAL_OP(ge, >=)
+} // namespace detail
+} // namespace doctest
+
+#define DOCTEST_WARN_EQ(...) [&] { return doctest::detail::eq(__VA_ARGS__); }()
+#define DOCTEST_CHECK_EQ(...) [&] { return doctest::detail::eq(__VA_ARGS__); }()
+#define DOCTEST_REQUIRE_EQ(...) [&] { return doctest::detail::eq(__VA_ARGS__); }()
+#define DOCTEST_WARN_NE(...) [&] { return doctest::detail::ne(__VA_ARGS__); }()
+#define DOCTEST_CHECK_NE(...) [&] { return doctest::detail::ne(__VA_ARGS__); }()
+#define DOCTEST_REQUIRE_NE(...) [&] { return doctest::detail::ne(__VA_ARGS__); }()
+#define DOCTEST_WARN_LT(...) [&] { return doctest::detail::lt(__VA_ARGS__); }()
+#define DOCTEST_CHECK_LT(...) [&] { return doctest::detail::lt(__VA_ARGS__); }()
+#define DOCTEST_REQUIRE_LT(...) [&] { return doctest::detail::lt(__VA_ARGS__); }()
+#define DOCTEST_WARN_GT(...) [&] { return doctest::detail::gt(__VA_ARGS__); }()
+#define DOCTEST_CHECK_GT(...) [&] { return doctest::detail::gt(__VA_ARGS__); }()
+#define DOCTEST_REQUIRE_GT(...) [&] { return doctest::detail::gt(__VA_ARGS__); }()
+#define DOCTEST_WARN_LE(...) [&] { return doctest::detail::le(__VA_ARGS__); }()
+#define DOCTEST_CHECK_LE(...) [&] { return doctest::detail::le(__VA_ARGS__); }()
+#define DOCTEST_REQUIRE_LE(...) [&] { return doctest::detail::le(__VA_ARGS__); }()
+#define DOCTEST_WARN_GE(...) [&] { return doctest::detail::ge(__VA_ARGS__); }()
+#define DOCTEST_CHECK_GE(...) [&] { return doctest::detail::ge(__VA_ARGS__); }()
+#define DOCTEST_REQUIRE_GE(...) [&] { return doctest::detail::ge(__VA_ARGS__); }()
+#define DOCTEST_WARN_UNARY(...) [&] { return __VA_ARGS__; }()
+#define DOCTEST_CHECK_UNARY(...) [&] { return __VA_ARGS__; }()
+#define DOCTEST_REQUIRE_UNARY(...) [&] { return __VA_ARGS__; }()
+#define DOCTEST_WARN_UNARY_FALSE(...) [&] { return !(__VA_ARGS__); }()
+#define DOCTEST_CHECK_UNARY_FALSE(...) [&] { return !(__VA_ARGS__); }()
+#define DOCTEST_REQUIRE_UNARY_FALSE(...) [&] { return !(__VA_ARGS__); }()
+
+#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS
+
+#define DOCTEST_WARN_THROWS_WITH(expr, with, ...) [] { static_assert(false, "Exception translation is not available when doctest is disabled."); return false; }()
+#define DOCTEST_CHECK_THROWS_WITH(expr, with, ...) DOCTEST_WARN_THROWS_WITH(,,)
+#define DOCTEST_REQUIRE_THROWS_WITH(expr, with, ...) DOCTEST_WARN_THROWS_WITH(,,)
+#define DOCTEST_WARN_THROWS_WITH_AS(expr, with, ex, ...) DOCTEST_WARN_THROWS_WITH(,,)
+#define DOCTEST_CHECK_THROWS_WITH_AS(expr, with, ex, ...) DOCTEST_WARN_THROWS_WITH(,,)
+#define DOCTEST_REQUIRE_THROWS_WITH_AS(expr, with, ex, ...) DOCTEST_WARN_THROWS_WITH(,,)
+
+#define DOCTEST_WARN_THROWS_WITH_MESSAGE(expr, with, ...) DOCTEST_WARN_THROWS_WITH(,,)
+#define DOCTEST_CHECK_THROWS_WITH_MESSAGE(expr, with, ...) DOCTEST_WARN_THROWS_WITH(,,)
+#define DOCTEST_REQUIRE_THROWS_WITH_MESSAGE(expr, with, ...) DOCTEST_WARN_THROWS_WITH(,,)
+#define DOCTEST_WARN_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) DOCTEST_WARN_THROWS_WITH(,,)
+#define DOCTEST_CHECK_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) DOCTEST_WARN_THROWS_WITH(,,)
+#define DOCTEST_REQUIRE_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) DOCTEST_WARN_THROWS_WITH(,,)
+
+#define DOCTEST_WARN_THROWS(...) [&] { try { __VA_ARGS__; return false; } catch (...) { return true; } }()
+#define DOCTEST_CHECK_THROWS(...) [&] { try { __VA_ARGS__; return false; } catch (...) { return true; } }()
+#define DOCTEST_REQUIRE_THROWS(...) [&] { try { __VA_ARGS__; return false; } catch (...) { return true; } }()
+#define DOCTEST_WARN_THROWS_AS(expr, ...) [&] { try { expr; } catch (__VA_ARGS__) { return true; } catch (...) { } return false; }()
+#define DOCTEST_CHECK_THROWS_AS(expr, ...) [&] { try { expr; } catch (__VA_ARGS__) { return true; } catch (...) { } return false; }()
+#define DOCTEST_REQUIRE_THROWS_AS(expr, ...) [&] { try { expr; } catch (__VA_ARGS__) { return true; } catch (...) { } return false; }()
+#define DOCTEST_WARN_NOTHROW(...) [&] { try { __VA_ARGS__; return true; } catch (...) { return false; } }()
+#define DOCTEST_CHECK_NOTHROW(...) [&] { try { __VA_ARGS__; return true; } catch (...) { return false; } }()
+#define DOCTEST_REQUIRE_NOTHROW(...) [&] { try { __VA_ARGS__; return true; } catch (...) { return false; } }()
+
+#define DOCTEST_WARN_THROWS_MESSAGE(expr, ...) [&] { try { __VA_ARGS__; return false; } catch (...) { return true; } }()
+#define DOCTEST_CHECK_THROWS_MESSAGE(expr, ...) [&] { try { __VA_ARGS__; return false; } catch (...) { return true; } }()
+#define DOCTEST_REQUIRE_THROWS_MESSAGE(expr, ...) [&] { try { __VA_ARGS__; return false; } catch (...) { return true; } }()
+#define DOCTEST_WARN_THROWS_AS_MESSAGE(expr, ex, ...) [&] { try { expr; } catch (__VA_ARGS__) { return true; } catch (...) { } return false; }()
+#define DOCTEST_CHECK_THROWS_AS_MESSAGE(expr, ex, ...) [&] { try { expr; } catch (__VA_ARGS__) { return true; } catch (...) { } return false; }()
+#define DOCTEST_REQUIRE_THROWS_AS_MESSAGE(expr, ex, ...) [&] { try { expr; } catch (__VA_ARGS__) { return true; } catch (...) { } return false; }()
+#define DOCTEST_WARN_NOTHROW_MESSAGE(expr, ...) [&] { try { __VA_ARGS__; return true; } catch (...) { return false; } }()
+#define DOCTEST_CHECK_NOTHROW_MESSAGE(expr, ...) [&] { try { __VA_ARGS__; return true; } catch (...) { return false; } }()
+#define DOCTEST_REQUIRE_NOTHROW_MESSAGE(expr, ...) [&] { try { __VA_ARGS__; return true; } catch (...) { return false; } }()
+
+#endif // DOCTEST_CONFIG_NO_EXCEPTIONS
+
+#else // DOCTEST_CONFIG_EVALUATE_ASSERTS_EVEN_WHEN_DISABLED
+
+#define DOCTEST_WARN(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_WARN_FALSE(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK_FALSE(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE_FALSE(...) DOCTEST_FUNC_EMPTY
+
+#define DOCTEST_WARN_MESSAGE(cond, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK_MESSAGE(cond, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE_MESSAGE(cond, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_WARN_FALSE_MESSAGE(cond, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK_FALSE_MESSAGE(cond, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE_FALSE_MESSAGE(cond, ...) DOCTEST_FUNC_EMPTY
+
+#define DOCTEST_WARN_EQ(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK_EQ(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE_EQ(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_WARN_NE(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK_NE(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE_NE(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_WARN_GT(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK_GT(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE_GT(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_WARN_LT(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK_LT(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE_LT(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_WARN_GE(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK_GE(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE_GE(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_WARN_LE(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK_LE(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE_LE(...) DOCTEST_FUNC_EMPTY
+
+#define DOCTEST_WARN_UNARY(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK_UNARY(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE_UNARY(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_WARN_UNARY_FALSE(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK_UNARY_FALSE(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE_UNARY_FALSE(...) DOCTEST_FUNC_EMPTY
+
+#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS
+
+#define DOCTEST_WARN_THROWS(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK_THROWS(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE_THROWS(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_WARN_THROWS_AS(expr, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK_THROWS_AS(expr, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE_THROWS_AS(expr, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_WARN_THROWS_WITH(expr, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK_THROWS_WITH(expr, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE_THROWS_WITH(expr, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_WARN_THROWS_WITH_AS(expr, with, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK_THROWS_WITH_AS(expr, with, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE_THROWS_WITH_AS(expr, with, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_WARN_NOTHROW(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK_NOTHROW(...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE_NOTHROW(...) DOCTEST_FUNC_EMPTY
+
+#define DOCTEST_WARN_THROWS_MESSAGE(expr, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK_THROWS_MESSAGE(expr, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE_THROWS_MESSAGE(expr, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_WARN_THROWS_AS_MESSAGE(expr, ex, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK_THROWS_AS_MESSAGE(expr, ex, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE_THROWS_AS_MESSAGE(expr, ex, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_WARN_THROWS_WITH_MESSAGE(expr, with, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK_THROWS_WITH_MESSAGE(expr, with, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE_THROWS_WITH_MESSAGE(expr, with, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_WARN_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_WARN_NOTHROW_MESSAGE(expr, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_CHECK_NOTHROW_MESSAGE(expr, ...) DOCTEST_FUNC_EMPTY
+#define DOCTEST_REQUIRE_NOTHROW_MESSAGE(expr, ...) DOCTEST_FUNC_EMPTY
+
+#endif // DOCTEST_CONFIG_NO_EXCEPTIONS
+
+#endif // DOCTEST_CONFIG_EVALUATE_ASSERTS_EVEN_WHEN_DISABLED
+
+#endif // DOCTEST_CONFIG_DISABLE
+
+#ifdef DOCTEST_CONFIG_NO_EXCEPTIONS
+
+#ifdef DOCTEST_CONFIG_NO_EXCEPTIONS_BUT_WITH_ALL_ASSERTS
+#define DOCTEST_EXCEPTION_EMPTY_FUNC DOCTEST_FUNC_EMPTY
+#else // DOCTEST_CONFIG_NO_EXCEPTIONS_BUT_WITH_ALL_ASSERTS
+#define DOCTEST_EXCEPTION_EMPTY_FUNC [] { static_assert(false, "Exceptions are disabled! " \
+    "Use DOCTEST_CONFIG_NO_EXCEPTIONS_BUT_WITH_ALL_ASSERTS if you want to compile with exceptions disabled."); return false; }()
+
+#undef DOCTEST_REQUIRE
+#undef DOCTEST_REQUIRE_FALSE
+#undef DOCTEST_REQUIRE_MESSAGE
+#undef DOCTEST_REQUIRE_FALSE_MESSAGE
+#undef DOCTEST_REQUIRE_EQ
+#undef DOCTEST_REQUIRE_NE
+#undef DOCTEST_REQUIRE_GT
+#undef DOCTEST_REQUIRE_LT
+#undef DOCTEST_REQUIRE_GE
+#undef DOCTEST_REQUIRE_LE
+#undef DOCTEST_REQUIRE_UNARY
+#undef DOCTEST_REQUIRE_UNARY_FALSE
+
+#define DOCTEST_REQUIRE DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_REQUIRE_FALSE DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_REQUIRE_MESSAGE DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_REQUIRE_FALSE_MESSAGE DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_REQUIRE_EQ DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_REQUIRE_NE DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_REQUIRE_GT DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_REQUIRE_LT DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_REQUIRE_GE DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_REQUIRE_LE DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_REQUIRE_UNARY DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_REQUIRE_UNARY_FALSE DOCTEST_EXCEPTION_EMPTY_FUNC
+
+#endif // DOCTEST_CONFIG_NO_EXCEPTIONS_BUT_WITH_ALL_ASSERTS
+
+#define DOCTEST_WARN_THROWS(...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_CHECK_THROWS(...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_REQUIRE_THROWS(...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_WARN_THROWS_AS(expr, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_CHECK_THROWS_AS(expr, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_REQUIRE_THROWS_AS(expr, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_WARN_THROWS_WITH(expr, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_CHECK_THROWS_WITH(expr, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_REQUIRE_THROWS_WITH(expr, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_WARN_THROWS_WITH_AS(expr, with, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_CHECK_THROWS_WITH_AS(expr, with, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_REQUIRE_THROWS_WITH_AS(expr, with, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_WARN_NOTHROW(...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_CHECK_NOTHROW(...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_REQUIRE_NOTHROW(...) DOCTEST_EXCEPTION_EMPTY_FUNC
+
+#define DOCTEST_WARN_THROWS_MESSAGE(expr, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_CHECK_THROWS_MESSAGE(expr, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_REQUIRE_THROWS_MESSAGE(expr, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_WARN_THROWS_AS_MESSAGE(expr, ex, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_CHECK_THROWS_AS_MESSAGE(expr, ex, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_REQUIRE_THROWS_AS_MESSAGE(expr, ex, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_WARN_THROWS_WITH_MESSAGE(expr, with, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_CHECK_THROWS_WITH_MESSAGE(expr, with, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_REQUIRE_THROWS_WITH_MESSAGE(expr, with, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_WARN_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_CHECK_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_REQUIRE_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_WARN_NOTHROW_MESSAGE(expr, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_CHECK_NOTHROW_MESSAGE(expr, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+#define DOCTEST_REQUIRE_NOTHROW_MESSAGE(expr, ...) DOCTEST_EXCEPTION_EMPTY_FUNC
+
+#endif // DOCTEST_CONFIG_NO_EXCEPTIONS
+
+// clang-format off
+// KEPT FOR BACKWARDS COMPATIBILITY - FORWARDING TO THE RIGHT MACROS
+#define DOCTEST_FAST_WARN_EQ             DOCTEST_WARN_EQ
+#define DOCTEST_FAST_CHECK_EQ            DOCTEST_CHECK_EQ
+#define DOCTEST_FAST_REQUIRE_EQ          DOCTEST_REQUIRE_EQ
+#define DOCTEST_FAST_WARN_NE             DOCTEST_WARN_NE
+#define DOCTEST_FAST_CHECK_NE            DOCTEST_CHECK_NE
+#define DOCTEST_FAST_REQUIRE_NE          DOCTEST_REQUIRE_NE
+#define DOCTEST_FAST_WARN_GT             DOCTEST_WARN_GT
+#define DOCTEST_FAST_CHECK_GT            DOCTEST_CHECK_GT
+#define DOCTEST_FAST_REQUIRE_GT          DOCTEST_REQUIRE_GT
+#define DOCTEST_FAST_WARN_LT             DOCTEST_WARN_LT
+#define DOCTEST_FAST_CHECK_LT            DOCTEST_CHECK_LT
+#define DOCTEST_FAST_REQUIRE_LT          DOCTEST_REQUIRE_LT
+#define DOCTEST_FAST_WARN_GE             DOCTEST_WARN_GE
+#define DOCTEST_FAST_CHECK_GE            DOCTEST_CHECK_GE
+#define DOCTEST_FAST_REQUIRE_GE          DOCTEST_REQUIRE_GE
+#define DOCTEST_FAST_WARN_LE             DOCTEST_WARN_LE
+#define DOCTEST_FAST_CHECK_LE            DOCTEST_CHECK_LE
+#define DOCTEST_FAST_REQUIRE_LE          DOCTEST_REQUIRE_LE
+
+#define DOCTEST_FAST_WARN_UNARY          DOCTEST_WARN_UNARY
+#define DOCTEST_FAST_CHECK_UNARY         DOCTEST_CHECK_UNARY
+#define DOCTEST_FAST_REQUIRE_UNARY       DOCTEST_REQUIRE_UNARY
+#define DOCTEST_FAST_WARN_UNARY_FALSE    DOCTEST_WARN_UNARY_FALSE
+#define DOCTEST_FAST_CHECK_UNARY_FALSE   DOCTEST_CHECK_UNARY_FALSE
+#define DOCTEST_FAST_REQUIRE_UNARY_FALSE DOCTEST_REQUIRE_UNARY_FALSE
+
+#define DOCTEST_TEST_CASE_TEMPLATE_INSTANTIATE(id, ...) DOCTEST_TEST_CASE_TEMPLATE_INVOKE(id,__VA_ARGS__)
+// clang-format on
+
+// BDD style macros
+// clang-format off
+#define DOCTEST_SCENARIO(name) DOCTEST_TEST_CASE("  Scenario: " name)
+#define DOCTEST_SCENARIO_CLASS(name) DOCTEST_TEST_CASE_CLASS("  Scenario: " name)
+#define DOCTEST_SCENARIO_TEMPLATE(name, T, ...)  DOCTEST_TEST_CASE_TEMPLATE("  Scenario: " name, T, __VA_ARGS__)
+#define DOCTEST_SCENARIO_TEMPLATE_DEFINE(name, T, id) DOCTEST_TEST_CASE_TEMPLATE_DEFINE("  Scenario: " name, T, id)
+
+#define DOCTEST_GIVEN(name)     DOCTEST_SUBCASE("   Given: " name)
+#define DOCTEST_WHEN(name)      DOCTEST_SUBCASE("    When: " name)
+#define DOCTEST_AND_WHEN(name)  DOCTEST_SUBCASE("And when: " name)
+#define DOCTEST_THEN(name)      DOCTEST_SUBCASE("    Then: " name)
+#define DOCTEST_AND_THEN(name)  DOCTEST_SUBCASE("     And: " name)
+// clang-format on
+
+// == SHORT VERSIONS OF THE MACROS
+#ifndef DOCTEST_CONFIG_NO_SHORT_MACRO_NAMES
+
+#define TEST_CASE(name) DOCTEST_TEST_CASE(name)
+#define TEST_CASE_CLASS(name) DOCTEST_TEST_CASE_CLASS(name)
+#define TEST_CASE_FIXTURE(x, name) DOCTEST_TEST_CASE_FIXTURE(x, name)
+#define TYPE_TO_STRING_AS(str, ...) DOCTEST_TYPE_TO_STRING_AS(str, __VA_ARGS__)
+#define TYPE_TO_STRING(...) DOCTEST_TYPE_TO_STRING(__VA_ARGS__)
+#define TEST_CASE_TEMPLATE(name, T, ...) DOCTEST_TEST_CASE_TEMPLATE(name, T, __VA_ARGS__)
+#define TEST_CASE_TEMPLATE_DEFINE(name, T, id) DOCTEST_TEST_CASE_TEMPLATE_DEFINE(name, T, id)
+#define TEST_CASE_TEMPLATE_INVOKE(id, ...) DOCTEST_TEST_CASE_TEMPLATE_INVOKE(id, __VA_ARGS__)
+#define TEST_CASE_TEMPLATE_APPLY(id, ...) DOCTEST_TEST_CASE_TEMPLATE_APPLY(id, __VA_ARGS__)
+#define SUBCASE(name) DOCTEST_SUBCASE(name)
+#define TEST_SUITE(decorators) DOCTEST_TEST_SUITE(decorators)
+#define TEST_SUITE_BEGIN(name) DOCTEST_TEST_SUITE_BEGIN(name)
+#define TEST_SUITE_END DOCTEST_TEST_SUITE_END
+#define REGISTER_EXCEPTION_TRANSLATOR(signature) DOCTEST_REGISTER_EXCEPTION_TRANSLATOR(signature)
+#define REGISTER_REPORTER(name, priority, reporter) DOCTEST_REGISTER_REPORTER(name, priority, reporter)
+#define REGISTER_LISTENER(name, priority, reporter) DOCTEST_REGISTER_LISTENER(name, priority, reporter)
+#define INFO(...) DOCTEST_INFO(__VA_ARGS__)
+#define CAPTURE(x) DOCTEST_CAPTURE(x)
+#define ADD_MESSAGE_AT(file, line, ...) DOCTEST_ADD_MESSAGE_AT(file, line, __VA_ARGS__)
+#define ADD_FAIL_CHECK_AT(file, line, ...) DOCTEST_ADD_FAIL_CHECK_AT(file, line, __VA_ARGS__)
+#define ADD_FAIL_AT(file, line, ...) DOCTEST_ADD_FAIL_AT(file, line, __VA_ARGS__)
+#define MESSAGE(...) DOCTEST_MESSAGE(__VA_ARGS__)
+#define FAIL_CHECK(...) DOCTEST_FAIL_CHECK(__VA_ARGS__)
+#define FAIL(...) DOCTEST_FAIL(__VA_ARGS__)
+#define TO_LVALUE(...) DOCTEST_TO_LVALUE(__VA_ARGS__)
+
+#define WARN(...) DOCTEST_WARN(__VA_ARGS__)
+#define WARN_FALSE(...) DOCTEST_WARN_FALSE(__VA_ARGS__)
+#define WARN_THROWS(...) DOCTEST_WARN_THROWS(__VA_ARGS__)
+#define WARN_THROWS_AS(expr, ...) DOCTEST_WARN_THROWS_AS(expr, __VA_ARGS__)
+#define WARN_THROWS_WITH(expr, ...) DOCTEST_WARN_THROWS_WITH(expr, __VA_ARGS__)
+#define WARN_THROWS_WITH_AS(expr, with, ...) DOCTEST_WARN_THROWS_WITH_AS(expr, with, __VA_ARGS__)
+#define WARN_NOTHROW(...) DOCTEST_WARN_NOTHROW(__VA_ARGS__)
+#define CHECK(...) DOCTEST_CHECK(__VA_ARGS__)
+#define CHECK_FALSE(...) DOCTEST_CHECK_FALSE(__VA_ARGS__)
+#define CHECK_THROWS(...) DOCTEST_CHECK_THROWS(__VA_ARGS__)
+#define CHECK_THROWS_AS(expr, ...) DOCTEST_CHECK_THROWS_AS(expr, __VA_ARGS__)
+#define CHECK_THROWS_WITH(expr, ...) DOCTEST_CHECK_THROWS_WITH(expr, __VA_ARGS__)
+#define CHECK_THROWS_WITH_AS(expr, with, ...) DOCTEST_CHECK_THROWS_WITH_AS(expr, with, __VA_ARGS__)
+#define CHECK_NOTHROW(...) DOCTEST_CHECK_NOTHROW(__VA_ARGS__)
+#define REQUIRE(...) DOCTEST_REQUIRE(__VA_ARGS__)
+#define REQUIRE_FALSE(...) DOCTEST_REQUIRE_FALSE(__VA_ARGS__)
+#define REQUIRE_THROWS(...) DOCTEST_REQUIRE_THROWS(__VA_ARGS__)
+#define REQUIRE_THROWS_AS(expr, ...) DOCTEST_REQUIRE_THROWS_AS(expr, __VA_ARGS__)
+#define REQUIRE_THROWS_WITH(expr, ...) DOCTEST_REQUIRE_THROWS_WITH(expr, __VA_ARGS__)
+#define REQUIRE_THROWS_WITH_AS(expr, with, ...) DOCTEST_REQUIRE_THROWS_WITH_AS(expr, with, __VA_ARGS__)
+#define REQUIRE_NOTHROW(...) DOCTEST_REQUIRE_NOTHROW(__VA_ARGS__)
+
+#define WARN_MESSAGE(cond, ...) DOCTEST_WARN_MESSAGE(cond, __VA_ARGS__)
+#define WARN_FALSE_MESSAGE(cond, ...) DOCTEST_WARN_FALSE_MESSAGE(cond, __VA_ARGS__)
+#define WARN_THROWS_MESSAGE(expr, ...) DOCTEST_WARN_THROWS_MESSAGE(expr, __VA_ARGS__)
+#define WARN_THROWS_AS_MESSAGE(expr, ex, ...) DOCTEST_WARN_THROWS_AS_MESSAGE(expr, ex, __VA_ARGS__)
+#define WARN_THROWS_WITH_MESSAGE(expr, with, ...) DOCTEST_WARN_THROWS_WITH_MESSAGE(expr, with, __VA_ARGS__)
+#define WARN_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) DOCTEST_WARN_THROWS_WITH_AS_MESSAGE(expr, with, ex, __VA_ARGS__)
+#define WARN_NOTHROW_MESSAGE(expr, ...) DOCTEST_WARN_NOTHROW_MESSAGE(expr, __VA_ARGS__)
+#define CHECK_MESSAGE(cond, ...) DOCTEST_CHECK_MESSAGE(cond, __VA_ARGS__)
+#define CHECK_FALSE_MESSAGE(cond, ...) DOCTEST_CHECK_FALSE_MESSAGE(cond, __VA_ARGS__)
+#define CHECK_THROWS_MESSAGE(expr, ...) DOCTEST_CHECK_THROWS_MESSAGE(expr, __VA_ARGS__)
+#define CHECK_THROWS_AS_MESSAGE(expr, ex, ...) DOCTEST_CHECK_THROWS_AS_MESSAGE(expr, ex, __VA_ARGS__)
+#define CHECK_THROWS_WITH_MESSAGE(expr, with, ...) DOCTEST_CHECK_THROWS_WITH_MESSAGE(expr, with, __VA_ARGS__)
+#define CHECK_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) DOCTEST_CHECK_THROWS_WITH_AS_MESSAGE(expr, with, ex, __VA_ARGS__)
+#define CHECK_NOTHROW_MESSAGE(expr, ...) DOCTEST_CHECK_NOTHROW_MESSAGE(expr, __VA_ARGS__)
+#define REQUIRE_MESSAGE(cond, ...) DOCTEST_REQUIRE_MESSAGE(cond, __VA_ARGS__)
+#define REQUIRE_FALSE_MESSAGE(cond, ...) DOCTEST_REQUIRE_FALSE_MESSAGE(cond, __VA_ARGS__)
+#define REQUIRE_THROWS_MESSAGE(expr, ...) DOCTEST_REQUIRE_THROWS_MESSAGE(expr, __VA_ARGS__)
+#define REQUIRE_THROWS_AS_MESSAGE(expr, ex, ...) DOCTEST_REQUIRE_THROWS_AS_MESSAGE(expr, ex, __VA_ARGS__)
+#define REQUIRE_THROWS_WITH_MESSAGE(expr, with, ...) DOCTEST_REQUIRE_THROWS_WITH_MESSAGE(expr, with, __VA_ARGS__)
+#define REQUIRE_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) DOCTEST_REQUIRE_THROWS_WITH_AS_MESSAGE(expr, with, ex, __VA_ARGS__)
+#define REQUIRE_NOTHROW_MESSAGE(expr, ...) DOCTEST_REQUIRE_NOTHROW_MESSAGE(expr, __VA_ARGS__)
+
+#define SCENARIO(name) DOCTEST_SCENARIO(name)
+#define SCENARIO_CLASS(name) DOCTEST_SCENARIO_CLASS(name)
+#define SCENARIO_TEMPLATE(name, T, ...) DOCTEST_SCENARIO_TEMPLATE(name, T, __VA_ARGS__)
+#define SCENARIO_TEMPLATE_DEFINE(name, T, id) DOCTEST_SCENARIO_TEMPLATE_DEFINE(name, T, id)
+#define GIVEN(name) DOCTEST_GIVEN(name)
+#define WHEN(name) DOCTEST_WHEN(name)
+#define AND_WHEN(name) DOCTEST_AND_WHEN(name)
+#define THEN(name) DOCTEST_THEN(name)
+#define AND_THEN(name) DOCTEST_AND_THEN(name)
+
+#define WARN_EQ(...) DOCTEST_WARN_EQ(__VA_ARGS__)
+#define CHECK_EQ(...) DOCTEST_CHECK_EQ(__VA_ARGS__)
+#define REQUIRE_EQ(...) DOCTEST_REQUIRE_EQ(__VA_ARGS__)
+#define WARN_NE(...) DOCTEST_WARN_NE(__VA_ARGS__)
+#define CHECK_NE(...) DOCTEST_CHECK_NE(__VA_ARGS__)
+#define REQUIRE_NE(...) DOCTEST_REQUIRE_NE(__VA_ARGS__)
+#define WARN_GT(...) DOCTEST_WARN_GT(__VA_ARGS__)
+#define CHECK_GT(...) DOCTEST_CHECK_GT(__VA_ARGS__)
+#define REQUIRE_GT(...) DOCTEST_REQUIRE_GT(__VA_ARGS__)
+#define WARN_LT(...) DOCTEST_WARN_LT(__VA_ARGS__)
+#define CHECK_LT(...) DOCTEST_CHECK_LT(__VA_ARGS__)
+#define REQUIRE_LT(...) DOCTEST_REQUIRE_LT(__VA_ARGS__)
+#define WARN_GE(...) DOCTEST_WARN_GE(__VA_ARGS__)
+#define CHECK_GE(...) DOCTEST_CHECK_GE(__VA_ARGS__)
+#define REQUIRE_GE(...) DOCTEST_REQUIRE_GE(__VA_ARGS__)
+#define WARN_LE(...) DOCTEST_WARN_LE(__VA_ARGS__)
+#define CHECK_LE(...) DOCTEST_CHECK_LE(__VA_ARGS__)
+#define REQUIRE_LE(...) DOCTEST_REQUIRE_LE(__VA_ARGS__)
+#define WARN_UNARY(...) DOCTEST_WARN_UNARY(__VA_ARGS__)
+#define CHECK_UNARY(...) DOCTEST_CHECK_UNARY(__VA_ARGS__)
+#define REQUIRE_UNARY(...) DOCTEST_REQUIRE_UNARY(__VA_ARGS__)
+#define WARN_UNARY_FALSE(...) DOCTEST_WARN_UNARY_FALSE(__VA_ARGS__)
+#define CHECK_UNARY_FALSE(...) DOCTEST_CHECK_UNARY_FALSE(__VA_ARGS__)
+#define REQUIRE_UNARY_FALSE(...) DOCTEST_REQUIRE_UNARY_FALSE(__VA_ARGS__)
+
+// KEPT FOR BACKWARDS COMPATIBILITY
+#define FAST_WARN_EQ(...) DOCTEST_FAST_WARN_EQ(__VA_ARGS__)
+#define FAST_CHECK_EQ(...) DOCTEST_FAST_CHECK_EQ(__VA_ARGS__)
+#define FAST_REQUIRE_EQ(...) DOCTEST_FAST_REQUIRE_EQ(__VA_ARGS__)
+#define FAST_WARN_NE(...) DOCTEST_FAST_WARN_NE(__VA_ARGS__)
+#define FAST_CHECK_NE(...) DOCTEST_FAST_CHECK_NE(__VA_ARGS__)
+#define FAST_REQUIRE_NE(...) DOCTEST_FAST_REQUIRE_NE(__VA_ARGS__)
+#define FAST_WARN_GT(...) DOCTEST_FAST_WARN_GT(__VA_ARGS__)
+#define FAST_CHECK_GT(...) DOCTEST_FAST_CHECK_GT(__VA_ARGS__)
+#define FAST_REQUIRE_GT(...) DOCTEST_FAST_REQUIRE_GT(__VA_ARGS__)
+#define FAST_WARN_LT(...) DOCTEST_FAST_WARN_LT(__VA_ARGS__)
+#define FAST_CHECK_LT(...) DOCTEST_FAST_CHECK_LT(__VA_ARGS__)
+#define FAST_REQUIRE_LT(...) DOCTEST_FAST_REQUIRE_LT(__VA_ARGS__)
+#define FAST_WARN_GE(...) DOCTEST_FAST_WARN_GE(__VA_ARGS__)
+#define FAST_CHECK_GE(...) DOCTEST_FAST_CHECK_GE(__VA_ARGS__)
+#define FAST_REQUIRE_GE(...) DOCTEST_FAST_REQUIRE_GE(__VA_ARGS__)
+#define FAST_WARN_LE(...) DOCTEST_FAST_WARN_LE(__VA_ARGS__)
+#define FAST_CHECK_LE(...) DOCTEST_FAST_CHECK_LE(__VA_ARGS__)
+#define FAST_REQUIRE_LE(...) DOCTEST_FAST_REQUIRE_LE(__VA_ARGS__)
+
+#define FAST_WARN_UNARY(...) DOCTEST_FAST_WARN_UNARY(__VA_ARGS__)
+#define FAST_CHECK_UNARY(...) DOCTEST_FAST_CHECK_UNARY(__VA_ARGS__)
+#define FAST_REQUIRE_UNARY(...) DOCTEST_FAST_REQUIRE_UNARY(__VA_ARGS__)
+#define FAST_WARN_UNARY_FALSE(...) DOCTEST_FAST_WARN_UNARY_FALSE(__VA_ARGS__)
+#define FAST_CHECK_UNARY_FALSE(...) DOCTEST_FAST_CHECK_UNARY_FALSE(__VA_ARGS__)
+#define FAST_REQUIRE_UNARY_FALSE(...) DOCTEST_FAST_REQUIRE_UNARY_FALSE(__VA_ARGS__)
+
+#define TEST_CASE_TEMPLATE_INSTANTIATE(id, ...) DOCTEST_TEST_CASE_TEMPLATE_INSTANTIATE(id, __VA_ARGS__)
+
+#endif // DOCTEST_CONFIG_NO_SHORT_MACRO_NAMES
+
+#ifndef DOCTEST_CONFIG_DISABLE
+
+// this is here to clear the 'current test suite' for the current translation unit - at the top
+DOCTEST_TEST_SUITE_END();
+
+#endif // DOCTEST_CONFIG_DISABLE
+
+DOCTEST_CLANG_SUPPRESS_WARNING_POP
+DOCTEST_MSVC_SUPPRESS_WARNING_POP
+DOCTEST_GCC_SUPPRESS_WARNING_POP
+
+DOCTEST_SUPPRESS_COMMON_WARNINGS_POP
+
+#endif // DOCTEST_LIBRARY_INCLUDED
+
+#ifndef DOCTEST_SINGLE_HEADER
+#define DOCTEST_SINGLE_HEADER
+#endif // DOCTEST_SINGLE_HEADER
+
+#if defined(DOCTEST_CONFIG_IMPLEMENT) || !defined(DOCTEST_SINGLE_HEADER)
+
+#ifndef DOCTEST_SINGLE_HEADER
+#include "doctest_fwd.h"
+#endif // DOCTEST_SINGLE_HEADER
+
+DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wunused-macros")
+
+#ifndef DOCTEST_LIBRARY_IMPLEMENTATION
+#define DOCTEST_LIBRARY_IMPLEMENTATION
+
+DOCTEST_CLANG_SUPPRESS_WARNING_POP
+
+DOCTEST_SUPPRESS_COMMON_WARNINGS_PUSH
+
+DOCTEST_CLANG_SUPPRESS_WARNING_PUSH
+DOCTEST_CLANG_SUPPRESS_WARNING("-Wglobal-constructors")
+DOCTEST_CLANG_SUPPRESS_WARNING("-Wexit-time-destructors")
+DOCTEST_CLANG_SUPPRESS_WARNING("-Wsign-conversion")
+DOCTEST_CLANG_SUPPRESS_WARNING("-Wshorten-64-to-32")
+DOCTEST_CLANG_SUPPRESS_WARNING("-Wmissing-variable-declarations")
+DOCTEST_CLANG_SUPPRESS_WARNING("-Wswitch")
+DOCTEST_CLANG_SUPPRESS_WARNING("-Wswitch-enum")
+DOCTEST_CLANG_SUPPRESS_WARNING("-Wcovered-switch-default")
+DOCTEST_CLANG_SUPPRESS_WARNING("-Wmissing-noreturn")
+DOCTEST_CLANG_SUPPRESS_WARNING("-Wdisabled-macro-expansion")
+DOCTEST_CLANG_SUPPRESS_WARNING("-Wmissing-braces")
+DOCTEST_CLANG_SUPPRESS_WARNING("-Wmissing-field-initializers")
+DOCTEST_CLANG_SUPPRESS_WARNING("-Wunused-member-function")
+DOCTEST_CLANG_SUPPRESS_WARNING("-Wnonportable-system-include-path")
+
+DOCTEST_GCC_SUPPRESS_WARNING_PUSH
+DOCTEST_GCC_SUPPRESS_WARNING("-Wconversion")
+DOCTEST_GCC_SUPPRESS_WARNING("-Wsign-conversion")
+DOCTEST_GCC_SUPPRESS_WARNING("-Wmissing-field-initializers")
+DOCTEST_GCC_SUPPRESS_WARNING("-Wmissing-braces")
+DOCTEST_GCC_SUPPRESS_WARNING("-Wswitch")
+DOCTEST_GCC_SUPPRESS_WARNING("-Wswitch-enum")
+DOCTEST_GCC_SUPPRESS_WARNING("-Wswitch-default")
+DOCTEST_GCC_SUPPRESS_WARNING("-Wunsafe-loop-optimizations")
+DOCTEST_GCC_SUPPRESS_WARNING("-Wold-style-cast")
+DOCTEST_GCC_SUPPRESS_WARNING("-Wunused-function")
+DOCTEST_GCC_SUPPRESS_WARNING("-Wmultiple-inheritance")
+DOCTEST_GCC_SUPPRESS_WARNING("-Wsuggest-attribute")
+
+DOCTEST_MSVC_SUPPRESS_WARNING_PUSH
+DOCTEST_MSVC_SUPPRESS_WARNING(4267) // 'var' : conversion from 'x' to 'y', possible loss of data
+DOCTEST_MSVC_SUPPRESS_WARNING(4530) // C++ exception handler used, but unwind semantics not enabled
+DOCTEST_MSVC_SUPPRESS_WARNING(4577) // 'noexcept' used with no exception handling mode specified
+DOCTEST_MSVC_SUPPRESS_WARNING(4774) // format string expected in argument is not a string literal
+DOCTEST_MSVC_SUPPRESS_WARNING(4365) // conversion from 'int' to 'unsigned', signed/unsigned mismatch
+DOCTEST_MSVC_SUPPRESS_WARNING(5039) // pointer to potentially throwing function passed to extern C
+DOCTEST_MSVC_SUPPRESS_WARNING(4800) // forcing value to bool 'true' or 'false' (performance warning)
+DOCTEST_MSVC_SUPPRESS_WARNING(5245) // unreferenced function with internal linkage has been removed
+
+DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_BEGIN
+
+// required includes - will go only in one translation unit!
+#include <ctime>
+#include <cmath>
+#include <climits>
+// borland (Embarcadero) compiler requires math.h and not cmath - https://github.com/doctest/doctest/pull/37
+#ifdef __BORLANDC__
+#include <math.h>
+#endif // __BORLANDC__
+#include <new>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <limits>
+#include <utility>
+#include <fstream>
+#include <sstream>
+#ifndef DOCTEST_CONFIG_NO_INCLUDE_IOSTREAM
+#include <iostream>
+#endif // DOCTEST_CONFIG_NO_INCLUDE_IOSTREAM
+#include <algorithm>
+#include <iomanip>
+#include <vector>
+#ifndef DOCTEST_CONFIG_NO_MULTITHREADING
+#include <atomic>
+#include <mutex>
+#define DOCTEST_DECLARE_MUTEX(name) std::mutex name;
+#define DOCTEST_DECLARE_STATIC_MUTEX(name) static DOCTEST_DECLARE_MUTEX(name)
+#define DOCTEST_LOCK_MUTEX(name) std::lock_guard<std::mutex> DOCTEST_ANONYMOUS(DOCTEST_ANON_LOCK_)(name);
+#else // DOCTEST_CONFIG_NO_MULTITHREADING
+#define DOCTEST_DECLARE_MUTEX(name)
+#define DOCTEST_DECLARE_STATIC_MUTEX(name)
+#define DOCTEST_LOCK_MUTEX(name)
+#endif // DOCTEST_CONFIG_NO_MULTITHREADING
+#include <set>
+#include <map>
+#include <unordered_set>
+#include <exception>
+#include <stdexcept>
+#include <csignal>
+#include <cfloat>
+#include <cctype>
+#include <cstdint>
+#include <string>
+
+#ifdef DOCTEST_PLATFORM_MAC
+#include <sys/types.h>
+#include <unistd.h>
+#include <sys/sysctl.h>
+#endif // DOCTEST_PLATFORM_MAC
+
+#ifdef DOCTEST_PLATFORM_WINDOWS
+
+// defines for a leaner windows.h
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#define DOCTEST_UNDEF_WIN32_LEAN_AND_MEAN
+#endif // WIN32_LEAN_AND_MEAN
+#ifndef NOMINMAX
+#define NOMINMAX
+#define DOCTEST_UNDEF_NOMINMAX
+#endif // NOMINMAX
+
+// not sure what AfxWin.h is for - here I do what Catch does
+#ifdef __AFXDLL
+#include <AfxWin.h>
+#else
+#include <windows.h>
+#endif
+#include <io.h>
+
+#else // DOCTEST_PLATFORM_WINDOWS
+
+#include <sys/time.h>
+#include <unistd.h>
+
+#endif // DOCTEST_PLATFORM_WINDOWS
+
+// this is a fix for https://github.com/doctest/doctest/issues/348
+// https://mail.gnome.org/archives/xml/2012-January/msg00000.html
+#if !defined(HAVE_UNISTD_H) && !defined(STDOUT_FILENO)
+#define STDOUT_FILENO fileno(stdout)
+#endif // HAVE_UNISTD_H
+
+DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_END
+
+// counts the number of elements in a C array
+#define DOCTEST_COUNTOF(x) (sizeof(x) / sizeof(x[0]))
+
+#ifdef DOCTEST_CONFIG_DISABLE
+#define DOCTEST_BRANCH_ON_DISABLED(if_disabled, if_not_disabled) if_disabled
+#else // DOCTEST_CONFIG_DISABLE
+#define DOCTEST_BRANCH_ON_DISABLED(if_disabled, if_not_disabled) if_not_disabled
+#endif // DOCTEST_CONFIG_DISABLE
+
+#ifndef DOCTEST_CONFIG_OPTIONS_PREFIX
+#define DOCTEST_CONFIG_OPTIONS_PREFIX "dt-"
+#endif
+
+#ifndef DOCTEST_THREAD_LOCAL
+#if defined(DOCTEST_CONFIG_NO_MULTITHREADING) || DOCTEST_MSVC && (DOCTEST_MSVC < DOCTEST_COMPILER(19, 0, 0))
+#define DOCTEST_THREAD_LOCAL
+#else // DOCTEST_MSVC
+#define DOCTEST_THREAD_LOCAL thread_local
+#endif // DOCTEST_MSVC
+#endif // DOCTEST_THREAD_LOCAL
+
+#ifndef DOCTEST_MULTI_LANE_ATOMICS_THREAD_LANES
+#define DOCTEST_MULTI_LANE_ATOMICS_THREAD_LANES 32
+#endif
+
+#ifndef DOCTEST_MULTI_LANE_ATOMICS_CACHE_LINE_SIZE
+#define DOCTEST_MULTI_LANE_ATOMICS_CACHE_LINE_SIZE 64
+#endif
+
+#ifdef DOCTEST_CONFIG_NO_UNPREFIXED_OPTIONS
+#define DOCTEST_OPTIONS_PREFIX_DISPLAY DOCTEST_CONFIG_OPTIONS_PREFIX
+#else
+#define DOCTEST_OPTIONS_PREFIX_DISPLAY ""
+#endif
+
+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)
+#define DOCTEST_CONFIG_NO_MULTI_LANE_ATOMICS
+#endif
+
+#ifndef DOCTEST_CDECL
+#define DOCTEST_CDECL __cdecl
+#endif
+
+namespace doctest {
+
+bool is_running_in_test = false;
+
+namespace {
+    using namespace detail;
+
+    template <typename Ex>
+    DOCTEST_NORETURN void throw_exception(Ex const& e) {
+#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS
+        throw e;
+#else  // DOCTEST_CONFIG_NO_EXCEPTIONS
+#ifdef DOCTEST_CONFIG_HANDLE_EXCEPTION
+        DOCTEST_CONFIG_HANDLE_EXCEPTION(e);
+#else // DOCTEST_CONFIG_HANDLE_EXCEPTION
+#ifndef DOCTEST_CONFIG_NO_INCLUDE_IOSTREAM
+        std::cerr << "doctest will terminate because it needed to throw an exception.\n"
+                  << "The message was: " << e.what() << '\n';
+#endif // DOCTEST_CONFIG_NO_INCLUDE_IOSTREAM
+#endif // DOCTEST_CONFIG_HANDLE_EXCEPTION
+        std::terminate();
+#endif // DOCTEST_CONFIG_NO_EXCEPTIONS
+    }
+
+#ifndef DOCTEST_INTERNAL_ERROR
+#define DOCTEST_INTERNAL_ERROR(msg)                                                                \
+    throw_exception(std::logic_error(                                                              \
+            __FILE__ ":" DOCTEST_TOSTR(__LINE__) ": Internal doctest error: " msg))
+#endif // DOCTEST_INTERNAL_ERROR
+
+    // case insensitive strcmp
+    int stricmp(const char* a, const char* b) {
+        for(;; a++, b++) {
+            const int d = tolower(*a) - tolower(*b);
+            if(d != 0 || !*a)
+                return d;
+        }
+    }
+
+    struct Endianness
+    {
+        enum Arch
+        {
+            Big,
+            Little
+        };
+
+        static Arch which() {
+            int x = 1;
+            // casting any data pointer to char* is allowed
+            auto ptr = reinterpret_cast<char*>(&x);
+            if(*ptr)
+                return Little;
+            return Big;
+        }
+    };
+} // namespace
+
+namespace detail {
+    DOCTEST_THREAD_LOCAL class
+    {
+        std::vector<std::streampos> stack;
+        std::stringstream           ss;
+
+    public:
+        std::ostream* push() {
+            stack.push_back(ss.tellp());
+            return &ss;
+        }
+
+        String pop() {
+            if (stack.empty())
+                DOCTEST_INTERNAL_ERROR("TLSS was empty when trying to pop!");
+
+            std::streampos pos = stack.back();
+            stack.pop_back();
+            unsigned sz = static_cast<unsigned>(ss.tellp() - pos);
+            ss.rdbuf()->pubseekpos(pos, std::ios::in | std::ios::out);
+            return String(ss, sz);
+        }
+    } g_oss;
+
+    std::ostream* tlssPush() {
+        return g_oss.push();
+    }
+
+    String tlssPop() {
+        return g_oss.pop();
+    }
+
+#ifndef DOCTEST_CONFIG_DISABLE
+
+namespace timer_large_integer
+{
+
+#if defined(DOCTEST_PLATFORM_WINDOWS)
+    using type = ULONGLONG;
+#else // DOCTEST_PLATFORM_WINDOWS
+    using type = std::uint64_t;
+#endif // DOCTEST_PLATFORM_WINDOWS
+}
+
+using ticks_t = timer_large_integer::type;
+
+#ifdef DOCTEST_CONFIG_GETCURRENTTICKS
+    ticks_t getCurrentTicks() { return DOCTEST_CONFIG_GETCURRENTTICKS(); }
+#elif defined(DOCTEST_PLATFORM_WINDOWS)
+    ticks_t getCurrentTicks() {
+        static LARGE_INTEGER hz = { {0} }, hzo = { {0} };
+        if(!hz.QuadPart) {
+            QueryPerformanceFrequency(&hz);
+            QueryPerformanceCounter(&hzo);
+        }
+        LARGE_INTEGER t;
+        QueryPerformanceCounter(&t);
+        return ((t.QuadPart - hzo.QuadPart) * LONGLONG(1000000)) / hz.QuadPart;
+    }
+#else  // DOCTEST_PLATFORM_WINDOWS
+    ticks_t getCurrentTicks() {
+        timeval t;
+        gettimeofday(&t, nullptr);
+        return static_cast<ticks_t>(t.tv_sec) * 1000000 + static_cast<ticks_t>(t.tv_usec);
+    }
+#endif // DOCTEST_PLATFORM_WINDOWS
+
+    struct Timer
+    {
+        void         start() { m_ticks = getCurrentTicks(); }
+        unsigned int getElapsedMicroseconds() const {
+            return static_cast<unsigned int>(getCurrentTicks() - m_ticks);
+        }
+        //unsigned int getElapsedMilliseconds() const {
+        //    return static_cast<unsigned int>(getElapsedMicroseconds() / 1000);
+        //}
+        double getElapsedSeconds() const { return static_cast<double>(getCurrentTicks() - m_ticks) / 1000000.0; }
+
+    private:
+        ticks_t m_ticks = 0;
+    };
+
+#ifdef DOCTEST_CONFIG_NO_MULTITHREADING
+    template <typename T>
+    using Atomic = T;
+#else // DOCTEST_CONFIG_NO_MULTITHREADING
+    template <typename T>
+    using Atomic = std::atomic<T>;
+#endif // DOCTEST_CONFIG_NO_MULTITHREADING
+
+#if defined(DOCTEST_CONFIG_NO_MULTI_LANE_ATOMICS) || defined(DOCTEST_CONFIG_NO_MULTITHREADING)
+    template <typename T>
+    using MultiLaneAtomic = Atomic<T>;
+#else // DOCTEST_CONFIG_NO_MULTI_LANE_ATOMICS
+    // Provides a multilane implementation of an atomic variable that supports add, sub, load,
+    // store. Instead of using a single atomic variable, this splits up into multiple ones,
+    // each sitting on a separate cache line. The goal is to provide a speedup when most
+    // operations are modifying. It achieves this with two properties:
+    //
+    // * Multiple atomics are used, so chance of congestion from the same atomic is reduced.
+    // * Each atomic sits on a separate cache line, so false sharing is reduced.
+    //
+    // The disadvantage is that there is a small overhead due to the use of TLS, and load/store
+    // is slower because all atomics have to be accessed.
+    template <typename T>
+    class MultiLaneAtomic
+    {
+        struct CacheLineAlignedAtomic
+        {
+            Atomic<T> atomic{};
+            char padding[DOCTEST_MULTI_LANE_ATOMICS_CACHE_LINE_SIZE - sizeof(Atomic<T>)];
+        };
+        CacheLineAlignedAtomic m_atomics[DOCTEST_MULTI_LANE_ATOMICS_THREAD_LANES];
+
+        static_assert(sizeof(CacheLineAlignedAtomic) == DOCTEST_MULTI_LANE_ATOMICS_CACHE_LINE_SIZE,
+                      "guarantee one atomic takes exactly one cache line");
+
+    public:
+        T operator++() DOCTEST_NOEXCEPT { return fetch_add(1) + 1; }
+
+        T operator++(int) DOCTEST_NOEXCEPT { return fetch_add(1); }
+
+        T fetch_add(T arg, std::memory_order order = std::memory_order_seq_cst) DOCTEST_NOEXCEPT {
+            return myAtomic().fetch_add(arg, order);
+        }
+
+        T fetch_sub(T arg, std::memory_order order = std::memory_order_seq_cst) DOCTEST_NOEXCEPT {
+            return myAtomic().fetch_sub(arg, order);
+        }
+
+        operator T() const DOCTEST_NOEXCEPT { return load(); }
+
+        T load(std::memory_order order = std::memory_order_seq_cst) const DOCTEST_NOEXCEPT {
+            auto result = T();
+            for(auto const& c : m_atomics) {
+                result += c.atomic.load(order);
+            }
+            return result;
+        }
+
+        T operator=(T desired) DOCTEST_NOEXCEPT { // lgtm [cpp/assignment-does-not-return-this]
+            store(desired);
+            return desired;
+        }
+
+        void store(T desired, std::memory_order order = std::memory_order_seq_cst) DOCTEST_NOEXCEPT {
+            // first value becomes desired", all others become 0.
+            for(auto& c : m_atomics) {
+                c.atomic.store(desired, order);
+                desired = {};
+            }
+        }
+
+    private:
+        // Each thread has a different atomic that it operates on. If more than NumLanes threads
+        // use this, some will use the same atomic. So performance will degrade a bit, but still
+        // everything will work.
+        //
+        // The logic here is a bit tricky. The call should be as fast as possible, so that there
+        // is minimal to no overhead in determining the correct atomic for the current thread.
+        //
+        // 1. A global static counter laneCounter counts continuously up.
+        // 2. Each successive thread will use modulo operation of that counter so it gets an atomic
+        //    assigned in a round-robin fashion.
+        // 3. This tlsLaneIdx is stored in the thread local data, so it is directly available with
+        //    little overhead.
+        Atomic<T>& myAtomic() DOCTEST_NOEXCEPT {
+            static Atomic<size_t> laneCounter;
+            DOCTEST_THREAD_LOCAL size_t tlsLaneIdx =
+                    laneCounter++ % DOCTEST_MULTI_LANE_ATOMICS_THREAD_LANES;
+
+            return m_atomics[tlsLaneIdx].atomic;
+        }
+    };
+#endif // DOCTEST_CONFIG_NO_MULTI_LANE_ATOMICS
+
+    // this holds both parameters from the command line and runtime data for tests
+    struct ContextState : ContextOptions, TestRunStats, CurrentTestCaseStats
+    {
+        MultiLaneAtomic<int> numAssertsCurrentTest_atomic;
+        MultiLaneAtomic<int> numAssertsFailedCurrentTest_atomic;
+
+        std::vector<std::vector<String>> filters = decltype(filters)(9); // 9 different filters
+
+        std::vector<IReporter*> reporters_currently_used;
+
+        assert_handler ah = nullptr;
+
+        Timer timer;
+
+        std::vector<String> stringifiedContexts; // logging from INFO() due to an exception
+
+        // stuff for subcases
+        bool reachedLeaf;
+        std::vector<SubcaseSignature> subcaseStack;
+        std::vector<SubcaseSignature> nextSubcaseStack;
+        std::unordered_set<unsigned long long> fullyTraversedSubcases;
+        size_t currentSubcaseDepth;
+        Atomic<bool> shouldLogCurrentException;
+
+        void resetRunData() {
+            numTestCases                = 0;
+            numTestCasesPassingFilters  = 0;
+            numTestSuitesPassingFilters = 0;
+            numTestCasesFailed          = 0;
+            numAsserts                  = 0;
+            numAssertsFailed            = 0;
+            numAssertsCurrentTest       = 0;
+            numAssertsFailedCurrentTest = 0;
+        }
+
+        void finalizeTestCaseData() {
+            seconds = timer.getElapsedSeconds();
+
+            // update the non-atomic counters
+            numAsserts += numAssertsCurrentTest_atomic;
+            numAssertsFailed += numAssertsFailedCurrentTest_atomic;
+            numAssertsCurrentTest       = numAssertsCurrentTest_atomic;
+            numAssertsFailedCurrentTest = numAssertsFailedCurrentTest_atomic;
+
+            if(numAssertsFailedCurrentTest)
+                failure_flags |= TestCaseFailureReason::AssertFailure;
+
+            if(Approx(currentTest->m_timeout).epsilon(DBL_EPSILON) != 0 &&
+               Approx(seconds).epsilon(DBL_EPSILON) > currentTest->m_timeout)
+                failure_flags |= TestCaseFailureReason::Timeout;
+
+            if(currentTest->m_should_fail) {
+                if(failure_flags) {
+                    failure_flags |= TestCaseFailureReason::ShouldHaveFailedAndDid;
+                } else {
+                    failure_flags |= TestCaseFailureReason::ShouldHaveFailedButDidnt;
+                }
+            } else if(failure_flags && currentTest->m_may_fail) {
+                failure_flags |= TestCaseFailureReason::CouldHaveFailedAndDid;
+            } else if(currentTest->m_expected_failures > 0) {
+                if(numAssertsFailedCurrentTest == currentTest->m_expected_failures) {
+                    failure_flags |= TestCaseFailureReason::FailedExactlyNumTimes;
+                } else {
+                    failure_flags |= TestCaseFailureReason::DidntFailExactlyNumTimes;
+                }
+            }
+
+            bool ok_to_fail = (TestCaseFailureReason::ShouldHaveFailedAndDid & failure_flags) ||
+                              (TestCaseFailureReason::CouldHaveFailedAndDid & failure_flags) ||
+                              (TestCaseFailureReason::FailedExactlyNumTimes & failure_flags);
+
+            // if any subcase has failed - the whole test case has failed
+            testCaseSuccess = !(failure_flags && !ok_to_fail);
+            if(!testCaseSuccess)
+                numTestCasesFailed++;
+        }
+    };
+
+    ContextState* g_cs = nullptr;
+
+    // used to avoid locks for the debug output
+    // TODO: figure out if this is indeed necessary/correct - seems like either there still
+    // could be a race or that there wouldn't be a race even if using the context directly
+    DOCTEST_THREAD_LOCAL bool g_no_colors;
+
+#endif // DOCTEST_CONFIG_DISABLE
+} // namespace detail
+
+char* String::allocate(size_type sz) {
+    if (sz <= last) {
+        buf[sz] = '\0';
+        setLast(last - sz);
+        return buf;
+    } else {
+        setOnHeap();
+        data.size = sz;
+        data.capacity = data.size + 1;
+        data.ptr = new char[data.capacity];
+        data.ptr[sz] = '\0';
+        return data.ptr;
+    }
+}
+
+void String::setOnHeap() noexcept { *reinterpret_cast<unsigned char*>(&buf[last]) = 128; }
+void String::setLast(size_type in) noexcept { buf[last] = char(in); }
+void String::setSize(size_type sz) noexcept {
+    if (isOnStack()) { buf[sz] = '\0'; setLast(last - sz); }
+    else { data.ptr[sz] = '\0'; data.size = sz; }
+}
+
+void String::copy(const String& other) {
+    if(other.isOnStack()) {
+        memcpy(buf, other.buf, len);
+    } else {
+        memcpy(allocate(other.data.size), other.data.ptr, other.data.size);
+    }
+}
+
+String::String() noexcept {
+    buf[0] = '\0';
+    setLast();
+}
+
+String::~String() {
+    if(!isOnStack())
+        delete[] data.ptr;
+} // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks)
+
+String::String(const char* in)
+        : String(in, strlen(in)) {}
+
+String::String(const char* in, size_type in_size) {
+    memcpy(allocate(in_size), in, in_size);
+}
+
+String::String(std::istream& in, size_type in_size) {
+    in.read(allocate(in_size), in_size);
+}
+
+String::String(const String& other) { copy(other); }
+
+String& String::operator=(const String& other) {
+    if(this != &other) {
+        if(!isOnStack())
+            delete[] data.ptr;
+
+        copy(other);
+    }
+
+    return *this;
+}
+
+String& String::operator+=(const String& other) {
+    const size_type my_old_size = size();
+    const size_type other_size  = other.size();
+    const size_type total_size  = my_old_size + other_size;
+    if(isOnStack()) {
+        if(total_size < len) {
+            // append to the current stack space
+            memcpy(buf + my_old_size, other.c_str(), other_size + 1);
+            // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks)
+            setLast(last - total_size);
+        } else {
+            // alloc new chunk
+            char* temp = new char[total_size + 1];
+            // copy current data to new location before writing in the union
+            memcpy(temp, buf, my_old_size); // skip the +1 ('\0') for speed
+            // update data in union
+            setOnHeap();
+            data.size     = total_size;
+            data.capacity = data.size + 1;
+            data.ptr      = temp;
+            // transfer the rest of the data
+            memcpy(data.ptr + my_old_size, other.c_str(), other_size + 1);
+        }
+    } else {
+        if(data.capacity > total_size) {
+            // append to the current heap block
+            data.size = total_size;
+            memcpy(data.ptr + my_old_size, other.c_str(), other_size + 1);
+        } else {
+            // resize
+            data.capacity *= 2;
+            if(data.capacity <= total_size)
+                data.capacity = total_size + 1;
+            // alloc new chunk
+            char* temp = new char[data.capacity];
+            // copy current data to new location before releasing it
+            memcpy(temp, data.ptr, my_old_size); // skip the +1 ('\0') for speed
+            // release old chunk
+            delete[] data.ptr;
+            // update the rest of the union members
+            data.size = total_size;
+            data.ptr  = temp;
+            // transfer the rest of the data
+            memcpy(data.ptr + my_old_size, other.c_str(), other_size + 1);
+        }
+    }
+
+    return *this;
+}
+
+String::String(String&& other) noexcept {
+    memcpy(buf, other.buf, len);
+    other.buf[0] = '\0';
+    other.setLast();
+}
+
+String& String::operator=(String&& other) noexcept {
+    if(this != &other) {
+        if(!isOnStack())
+            delete[] data.ptr;
+        memcpy(buf, other.buf, len);
+        other.buf[0] = '\0';
+        other.setLast();
+    }
+    return *this;
+}
+
+char String::operator[](size_type i) const {
+    return const_cast<String*>(this)->operator[](i);
+}
+
+char& String::operator[](size_type i) {
+    if(isOnStack())
+        return reinterpret_cast<char*>(buf)[i];
+    return data.ptr[i];
+}
+
+DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH("-Wmaybe-uninitialized")
+String::size_type String::size() const {
+    if(isOnStack())
+        return last - (size_type(buf[last]) & 31); // using "last" would work only if "len" is 32
+    return data.size;
+}
+DOCTEST_GCC_SUPPRESS_WARNING_POP
+
+String::size_type String::capacity() const {
+    if(isOnStack())
+        return len;
+    return data.capacity;
+}
+
+String String::substr(size_type pos, size_type cnt) && {
+    cnt = std::min(cnt, size() - 1 - pos);
+    char* cptr = c_str();
+    memmove(cptr, cptr + pos, cnt);
+    setSize(cnt);
+    return std::move(*this);
+}
+
+String String::substr(size_type pos, size_type cnt) const & {
+    cnt = std::min(cnt, size() - 1 - pos);
+    return String{ c_str() + pos, cnt };
+}
+
+String::size_type String::find(char ch, size_type pos) const {
+    const char* begin = c_str();
+    const char* end = begin + size();
+    const char* it = begin + pos;
+    for (; it < end && *it != ch; it++);
+    if (it < end) { return static_cast<size_type>(it - begin); }
+    else { return npos; }
+}
+
+String::size_type String::rfind(char ch, size_type pos) const {
+    const char* begin = c_str();
+    const char* it = begin + std::min(pos, size() - 1);
+    for (; it >= begin && *it != ch; it--);
+    if (it >= begin) { return static_cast<size_type>(it - begin); }
+    else { return npos; }
+}
+
+int String::compare(const char* other, bool no_case) const {
+    if(no_case)
+        return doctest::stricmp(c_str(), other);
+    return std::strcmp(c_str(), other);
+}
+
+int String::compare(const String& other, bool no_case) const {
+    return compare(other.c_str(), no_case);
+}
+
+String operator+(const String& lhs, const String& rhs) { return  String(lhs) += rhs; }
+
+bool operator==(const String& lhs, const String& rhs) { return lhs.compare(rhs) == 0; }
+bool operator!=(const String& lhs, const String& rhs) { return lhs.compare(rhs) != 0; }
+bool operator< (const String& lhs, const String& rhs) { return lhs.compare(rhs) < 0; }
+bool operator> (const String& lhs, const String& rhs) { return lhs.compare(rhs) > 0; }
+bool operator<=(const String& lhs, const String& rhs) { return (lhs != rhs) ? lhs.compare(rhs) < 0 : true; }
+bool operator>=(const String& lhs, const String& rhs) { return (lhs != rhs) ? lhs.compare(rhs) > 0 : true; }
+
+std::ostream& operator<<(std::ostream& s, const String& in) { return s << in.c_str(); }
+
+Contains::Contains(const String& str) : string(str) { }
+
+bool Contains::checkWith(const String& other) const {
+    return strstr(other.c_str(), string.c_str()) != nullptr;
+}
+
+String toString(const Contains& in) {
+    return "Contains( " + in.string + " )";
+}
+
+bool operator==(const String& lhs, const Contains& rhs) { return rhs.checkWith(lhs); }
+bool operator==(const Contains& lhs, const String& rhs) { return lhs.checkWith(rhs); }
+bool operator!=(const String& lhs, const Contains& rhs) { return !rhs.checkWith(lhs); }
+bool operator!=(const Contains& lhs, const String& rhs) { return !lhs.checkWith(rhs); }
+
+namespace {
+    void color_to_stream(std::ostream&, Color::Enum) DOCTEST_BRANCH_ON_DISABLED({}, ;)
+} // namespace
+
+namespace Color {
+    std::ostream& operator<<(std::ostream& s, Color::Enum code) {
+        color_to_stream(s, code);
+        return s;
+    }
+} // namespace Color
+
+// clang-format off
+const char* assertString(assertType::Enum at) {
+    DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4061) // enum 'x' in switch of enum 'y' is not explicitly handled
+    #define DOCTEST_GENERATE_ASSERT_TYPE_CASE(assert_type) case assertType::DT_ ## assert_type: return #assert_type
+    #define DOCTEST_GENERATE_ASSERT_TYPE_CASES(assert_type) \
+        DOCTEST_GENERATE_ASSERT_TYPE_CASE(WARN_ ## assert_type); \
+        DOCTEST_GENERATE_ASSERT_TYPE_CASE(CHECK_ ## assert_type); \
+        DOCTEST_GENERATE_ASSERT_TYPE_CASE(REQUIRE_ ## assert_type)
+    switch(at) {
+        DOCTEST_GENERATE_ASSERT_TYPE_CASE(WARN);
+        DOCTEST_GENERATE_ASSERT_TYPE_CASE(CHECK);
+        DOCTEST_GENERATE_ASSERT_TYPE_CASE(REQUIRE);
+
+        DOCTEST_GENERATE_ASSERT_TYPE_CASES(FALSE);
+
+        DOCTEST_GENERATE_ASSERT_TYPE_CASES(THROWS);
+
+        DOCTEST_GENERATE_ASSERT_TYPE_CASES(THROWS_AS);
+
+        DOCTEST_GENERATE_ASSERT_TYPE_CASES(THROWS_WITH);
+
+        DOCTEST_GENERATE_ASSERT_TYPE_CASES(THROWS_WITH_AS);
+
+        DOCTEST_GENERATE_ASSERT_TYPE_CASES(NOTHROW);
+
+        DOCTEST_GENERATE_ASSERT_TYPE_CASES(EQ);
+        DOCTEST_GENERATE_ASSERT_TYPE_CASES(NE);
+        DOCTEST_GENERATE_ASSERT_TYPE_CASES(GT);
+        DOCTEST_GENERATE_ASSERT_TYPE_CASES(LT);
+        DOCTEST_GENERATE_ASSERT_TYPE_CASES(GE);
+        DOCTEST_GENERATE_ASSERT_TYPE_CASES(LE);
+
+        DOCTEST_GENERATE_ASSERT_TYPE_CASES(UNARY);
+        DOCTEST_GENERATE_ASSERT_TYPE_CASES(UNARY_FALSE);
+
+        default: DOCTEST_INTERNAL_ERROR("Tried stringifying invalid assert type!");
+    }
+    DOCTEST_MSVC_SUPPRESS_WARNING_POP
+}
+// clang-format on
+
+const char* failureString(assertType::Enum at) {
+    if(at & assertType::is_warn) //!OCLINT bitwise operator in conditional
+        return "WARNING";
+    if(at & assertType::is_check) //!OCLINT bitwise operator in conditional
+        return "ERROR";
+    if(at & assertType::is_require) //!OCLINT bitwise operator in conditional
+        return "FATAL ERROR";
+    return "";
+}
+
+DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wnull-dereference")
+DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH("-Wnull-dereference")
+// depending on the current options this will remove the path of filenames
+const char* skipPathFromFilename(const char* file) {
+#ifndef DOCTEST_CONFIG_DISABLE
+    if(getContextOptions()->no_path_in_filenames) {
+        auto back    = std::strrchr(file, '\\');
+        auto forward = std::strrchr(file, '/');
+        if(back || forward) {
+            if(back > forward)
+                forward = back;
+            return forward + 1;
+        }
+    }
+#endif // DOCTEST_CONFIG_DISABLE
+    return file;
+}
+DOCTEST_CLANG_SUPPRESS_WARNING_POP
+DOCTEST_GCC_SUPPRESS_WARNING_POP
+
+bool SubcaseSignature::operator==(const SubcaseSignature& other) const {
+    return m_line == other.m_line
+        && std::strcmp(m_file, other.m_file) == 0
+        && m_name == other.m_name;
+}
+
+bool SubcaseSignature::operator<(const SubcaseSignature& other) const {
+    if(m_line != other.m_line)
+        return m_line < other.m_line;
+    if(std::strcmp(m_file, other.m_file) != 0)
+        return std::strcmp(m_file, other.m_file) < 0;
+    return m_name.compare(other.m_name) < 0;
+}
+
+DOCTEST_DEFINE_INTERFACE(IContextScope)
+
+namespace detail {
+    void filldata<const void*>::fill(std::ostream* stream, const void* in) {
+        if (in) { *stream << in; }
+        else { *stream << "nullptr"; }
+    }
+
+    template <typename T>
+    String toStreamLit(T t) {
+        std::ostream* os = tlssPush();
+        os->operator<<(t);
+        return tlssPop();
+    }
+}
+
+#ifdef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
+String toString(const char* in) { return String("\"") + (in ? in : "{null string}") + "\""; }
+#endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
+
+#if DOCTEST_MSVC >= DOCTEST_COMPILER(19, 20, 0)
+// see this issue on why this is needed: https://github.com/doctest/doctest/issues/183
+String toString(const std::string& in) { return in.c_str(); }
+#endif // VS 2019
+
+String toString(String in) { return in; }
+
+String toString(std::nullptr_t) { return "nullptr"; }
+
+String toString(bool in) { return in ? "true" : "false"; }
+
+String toString(float in) { return toStreamLit(in); }
+String toString(double in) { return toStreamLit(in); }
+String toString(double long in) { return toStreamLit(in); }
+
+String toString(char in) { return toStreamLit(static_cast<signed>(in)); }
+String toString(char signed in) { return toStreamLit(static_cast<signed>(in)); }
+String toString(char unsigned in) { return toStreamLit(static_cast<unsigned>(in)); }
+String toString(short in) { return toStreamLit(in); }
+String toString(short unsigned in) { return toStreamLit(in); }
+String toString(signed in) { return toStreamLit(in); }
+String toString(unsigned in) { return toStreamLit(in); }
+String toString(long in) { return toStreamLit(in); }
+String toString(long unsigned in) { return toStreamLit(in); }
+String toString(long long in) { return toStreamLit(in); }
+String toString(long long unsigned in) { return toStreamLit(in); }
+
+Approx::Approx(double value)
+        : m_epsilon(static_cast<double>(std::numeric_limits<float>::epsilon()) * 100)
+        , m_scale(1.0)
+        , m_value(value) {}
+
+Approx Approx::operator()(double value) const {
+    Approx approx(value);
+    approx.epsilon(m_epsilon);
+    approx.scale(m_scale);
+    return approx;
+}
+
+Approx& Approx::epsilon(double newEpsilon) {
+    m_epsilon = newEpsilon;
+    return *this;
+}
+Approx& Approx::scale(double newScale) {
+    m_scale = newScale;
+    return *this;
+}
+
+bool operator==(double lhs, const Approx& rhs) {
+    // Thanks to Richard Harris for his help refining this formula
+    return std::fabs(lhs - rhs.m_value) <
+           rhs.m_epsilon * (rhs.m_scale + std::max<double>(std::fabs(lhs), std::fabs(rhs.m_value)));
+}
+bool operator==(const Approx& lhs, double rhs) { return operator==(rhs, lhs); }
+bool operator!=(double lhs, const Approx& rhs) { return !operator==(lhs, rhs); }
+bool operator!=(const Approx& lhs, double rhs) { return !operator==(rhs, lhs); }
+bool operator<=(double lhs, const Approx& rhs) { return lhs < rhs.m_value || lhs == rhs; }
+bool operator<=(const Approx& lhs, double rhs) { return lhs.m_value < rhs || lhs == rhs; }
+bool operator>=(double lhs, const Approx& rhs) { return lhs > rhs.m_value || lhs == rhs; }
+bool operator>=(const Approx& lhs, double rhs) { return lhs.m_value > rhs || lhs == rhs; }
+bool operator<(double lhs, const Approx& rhs) { return lhs < rhs.m_value && lhs != rhs; }
+bool operator<(const Approx& lhs, double rhs) { return lhs.m_value < rhs && lhs != rhs; }
+bool operator>(double lhs, const Approx& rhs) { return lhs > rhs.m_value && lhs != rhs; }
+bool operator>(const Approx& lhs, double rhs) { return lhs.m_value > rhs && lhs != rhs; }
+
+String toString(const Approx& in) {
+    return "Approx( " + doctest::toString(in.m_value) + " )";
+}
+const ContextOptions* getContextOptions() { return DOCTEST_BRANCH_ON_DISABLED(nullptr, g_cs); }
+
+DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4738)
+template <typename F>
+IsNaN<F>::operator bool() const {
+    return std::isnan(value) ^ flipped;
+}
+DOCTEST_MSVC_SUPPRESS_WARNING_POP
+template struct DOCTEST_INTERFACE_DEF IsNaN<float>;
+template struct DOCTEST_INTERFACE_DEF IsNaN<double>;
+template struct DOCTEST_INTERFACE_DEF IsNaN<long double>;
+template <typename F>
+String toString(IsNaN<F> in) { return String(in.flipped ? "! " : "") + "IsNaN( " + doctest::toString(in.value) + " )"; }
+String toString(IsNaN<float> in) { return toString<float>(in); }
+String toString(IsNaN<double> in) { return toString<double>(in); }
+String toString(IsNaN<double long> in) { return toString<double long>(in); }
+
+} // namespace doctest
+
+#ifdef DOCTEST_CONFIG_DISABLE
+namespace doctest {
+Context::Context(int, const char* const*) {}
+Context::~Context() = default;
+void Context::applyCommandLine(int, const char* const*) {}
+void Context::addFilter(const char*, const char*) {}
+void Context::clearFilters() {}
+void Context::setOption(const char*, bool) {}
+void Context::setOption(const char*, int) {}
+void Context::setOption(const char*, const char*) {}
+bool Context::shouldExit() { return false; }
+void Context::setAsDefaultForAssertsOutOfTestCases() {}
+void Context::setAssertHandler(detail::assert_handler) {}
+void Context::setCout(std::ostream*) {}
+int  Context::run() { return 0; }
+
+int                         IReporter::get_num_active_contexts() { return 0; }
+const IContextScope* const* IReporter::get_active_contexts() { return nullptr; }
+int                         IReporter::get_num_stringified_contexts() { return 0; }
+const String*               IReporter::get_stringified_contexts() { return nullptr; }
+
+int registerReporter(const char*, int, IReporter*) { return 0; }
+
+} // namespace doctest
+#else // DOCTEST_CONFIG_DISABLE
+
+#if !defined(DOCTEST_CONFIG_COLORS_NONE)
+#if !defined(DOCTEST_CONFIG_COLORS_WINDOWS) && !defined(DOCTEST_CONFIG_COLORS_ANSI)
+#ifdef DOCTEST_PLATFORM_WINDOWS
+#define DOCTEST_CONFIG_COLORS_WINDOWS
+#else // linux
+#define DOCTEST_CONFIG_COLORS_ANSI
+#endif // platform
+#endif // DOCTEST_CONFIG_COLORS_WINDOWS && DOCTEST_CONFIG_COLORS_ANSI
+#endif // DOCTEST_CONFIG_COLORS_NONE
+
+namespace doctest_detail_test_suite_ns {
+// holds the current test suite
+doctest::detail::TestSuite& getCurrentTestSuite() {
+    static doctest::detail::TestSuite data{};
+    return data;
+}
+} // namespace doctest_detail_test_suite_ns
+
+namespace doctest {
+namespace {
+    // the int (priority) is part of the key for automatic sorting - sadly one can register a
+    // reporter with a duplicate name and a different priority but hopefully that won't happen often :|
+    using reporterMap = std::map<std::pair<int, String>, reporterCreatorFunc>;
+
+    reporterMap& getReporters() {
+        static reporterMap data;
+        return data;
+    }
+    reporterMap& getListeners() {
+        static reporterMap data;
+        return data;
+    }
+} // namespace
+namespace detail {
+#define DOCTEST_ITERATE_THROUGH_REPORTERS(function, ...)                                           \
+    for(auto& curr_rep : g_cs->reporters_currently_used)                                           \
+    curr_rep->function(__VA_ARGS__)
+
+    bool checkIfShouldThrow(assertType::Enum at) {
+        if(at & assertType::is_require) //!OCLINT bitwise operator in conditional
+            return true;
+
+        if((at & assertType::is_check) //!OCLINT bitwise operator in conditional
+           && getContextOptions()->abort_after > 0 &&
+           (g_cs->numAssertsFailed + g_cs->numAssertsFailedCurrentTest_atomic) >=
+                   getContextOptions()->abort_after)
+            return true;
+
+        return false;
+    }
+
+#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS
+    DOCTEST_NORETURN void throwException() {
+        g_cs->shouldLogCurrentException = false;
+        throw TestFailureException(); // NOLINT(hicpp-exception-baseclass)
+    }
+#else // DOCTEST_CONFIG_NO_EXCEPTIONS
+    void throwException() {}
+#endif // DOCTEST_CONFIG_NO_EXCEPTIONS
+} // namespace detail
+
+namespace {
+    using namespace detail;
+    // matching of a string against a wildcard mask (case sensitivity configurable) taken from
+    // https://www.codeproject.com/Articles/1088/Wildcard-string-compare-globbing
+    int wildcmp(const char* str, const char* wild, bool caseSensitive) {
+        const char* cp = str;
+        const char* mp = wild;
+
+        while((*str) && (*wild != '*')) {
+            if((caseSensitive ? (*wild != *str) : (tolower(*wild) != tolower(*str))) &&
+               (*wild != '?')) {
+                return 0;
+            }
+            wild++;
+            str++;
+        }
+
+        while(*str) {
+            if(*wild == '*') {
+                if(!*++wild) {
+                    return 1;
+                }
+                mp = wild;
+                cp = str + 1;
+            } else if((caseSensitive ? (*wild == *str) : (tolower(*wild) == tolower(*str))) ||
+                      (*wild == '?')) {
+                wild++;
+                str++;
+            } else {
+                wild = mp;   //!OCLINT parameter reassignment
+                str  = cp++; //!OCLINT parameter reassignment
+            }
+        }
+
+        while(*wild == '*') {
+            wild++;
+        }
+        return !*wild;
+    }
+
+    // checks if the name matches any of the filters (and can be configured what to do when empty)
+    bool matchesAny(const char* name, const std::vector<String>& filters, bool matchEmpty,
+        bool caseSensitive) {
+        if (filters.empty() && matchEmpty)
+            return true;
+        for (auto& curr : filters)
+            if (wildcmp(name, curr.c_str(), caseSensitive))
+                return true;
+        return false;
+    }
+
+    DOCTEST_NO_SANITIZE_INTEGER
+    unsigned long long hash(unsigned long long a, unsigned long long b) {
+        return (a << 5) + b;
+    }
+
+    // C string hash function (djb2) - taken from http://www.cse.yorku.ca/~oz/hash.html
+    DOCTEST_NO_SANITIZE_INTEGER
+    unsigned long long hash(const char* str) {
+        unsigned long long hash = 5381;
+        char c;
+        while ((c = *str++))
+            hash = ((hash << 5) + hash) + c; // hash * 33 + c
+        return hash;
+    }
+
+    unsigned long long hash(const SubcaseSignature& sig) {
+        return hash(hash(hash(sig.m_file), hash(sig.m_name.c_str())), sig.m_line);
+    }
+
+    unsigned long long hash(const std::vector<SubcaseSignature>& sigs, size_t count) {
+        unsigned long long running = 0;
+        auto end = sigs.begin() + count;
+        for (auto it = sigs.begin(); it != end; it++) {
+            running = hash(running, hash(*it));
+        }
+        return running;
+    }
+
+    unsigned long long hash(const std::vector<SubcaseSignature>& sigs) {
+        unsigned long long running = 0;
+        for (const SubcaseSignature& sig : sigs) {
+            running = hash(running, hash(sig));
+        }
+        return running;
+    }
+} // namespace
+namespace detail {
+    bool Subcase::checkFilters() {
+        if (g_cs->subcaseStack.size() < size_t(g_cs->subcase_filter_levels)) {
+            if (!matchesAny(m_signature.m_name.c_str(), g_cs->filters[6], true, g_cs->case_sensitive))
+                return true;
+            if (matchesAny(m_signature.m_name.c_str(), g_cs->filters[7], false, g_cs->case_sensitive))
+                return true;
+        }
+        return false;
+    }
+
+    Subcase::Subcase(const String& name, const char* file, int line)
+            : m_signature({name, file, line}) {
+        if (!g_cs->reachedLeaf) {
+            if (g_cs->nextSubcaseStack.size() <= g_cs->subcaseStack.size()
+                || g_cs->nextSubcaseStack[g_cs->subcaseStack.size()] == m_signature) {
+                // Going down.
+                if (checkFilters()) { return; }
+
+                g_cs->subcaseStack.push_back(m_signature);
+                g_cs->currentSubcaseDepth++;
+                m_entered = true;
+                DOCTEST_ITERATE_THROUGH_REPORTERS(subcase_start, m_signature);
+            }
+        } else {
+            if (g_cs->subcaseStack[g_cs->currentSubcaseDepth] == m_signature) {
+                // This subcase is reentered via control flow.
+                g_cs->currentSubcaseDepth++;
+                m_entered = true;
+                DOCTEST_ITERATE_THROUGH_REPORTERS(subcase_start, m_signature);
+            } else if (g_cs->nextSubcaseStack.size() <= g_cs->currentSubcaseDepth
+                    && g_cs->fullyTraversedSubcases.find(hash(hash(g_cs->subcaseStack, g_cs->currentSubcaseDepth), hash(m_signature)))
+                    == g_cs->fullyTraversedSubcases.end()) {
+                if (checkFilters()) { return; }
+                // This subcase is part of the one to be executed next.
+                g_cs->nextSubcaseStack.clear();
+                g_cs->nextSubcaseStack.insert(g_cs->nextSubcaseStack.end(),
+                    g_cs->subcaseStack.begin(), g_cs->subcaseStack.begin() + g_cs->currentSubcaseDepth);
+                g_cs->nextSubcaseStack.push_back(m_signature);
+            }
+        }
+    }
+
+    DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4996) // std::uncaught_exception is deprecated in C++17
+    DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH("-Wdeprecated-declarations")
+    DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wdeprecated-declarations")
+
+    Subcase::~Subcase() {
+        if (m_entered) {
+            g_cs->currentSubcaseDepth--;
+
+            if (!g_cs->reachedLeaf) {
+                // Leaf.
+                g_cs->fullyTraversedSubcases.insert(hash(g_cs->subcaseStack));
+                g_cs->nextSubcaseStack.clear();
+                g_cs->reachedLeaf = true;
+            } else if (g_cs->nextSubcaseStack.empty()) {
+                // All children are finished.
+                g_cs->fullyTraversedSubcases.insert(hash(g_cs->subcaseStack));
+            }
+
+#if defined(__cpp_lib_uncaught_exceptions) && __cpp_lib_uncaught_exceptions >= 201411L && (!defined(__MAC_OS_X_VERSION_MIN_REQUIRED) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
+            if(std::uncaught_exceptions() > 0
+#else
+            if(std::uncaught_exception()
+#endif
+                && g_cs->shouldLogCurrentException) {
+                DOCTEST_ITERATE_THROUGH_REPORTERS(
+                        test_case_exception, {"exception thrown in subcase - will translate later "
+                                                "when the whole test case has been exited (cannot "
+                                                "translate while there is an active exception)",
+                                                false});
+                g_cs->shouldLogCurrentException = false;
+            }
+
+            DOCTEST_ITERATE_THROUGH_REPORTERS(subcase_end, DOCTEST_EMPTY);
+        }
+    }
+
+    DOCTEST_CLANG_SUPPRESS_WARNING_POP
+    DOCTEST_GCC_SUPPRESS_WARNING_POP
+    DOCTEST_MSVC_SUPPRESS_WARNING_POP
+
+    Subcase::operator bool() const { return m_entered; }
+
+    Result::Result(bool passed, const String& decomposition)
+            : m_passed(passed)
+            , m_decomp(decomposition) {}
+
+    ExpressionDecomposer::ExpressionDecomposer(assertType::Enum at)
+            : m_at(at) {}
+
+    TestSuite& TestSuite::operator*(const char* in) {
+        m_test_suite = in;
+        return *this;
+    }
+
+    TestCase::TestCase(funcType test, const char* file, unsigned line, const TestSuite& test_suite,
+                       const String& type, int template_id) {
+        m_file              = file;
+        m_line              = line;
+        m_name              = nullptr; // will be later overridden in operator*
+        m_test_suite        = test_suite.m_test_suite;
+        m_description       = test_suite.m_description;
+        m_skip              = test_suite.m_skip;
+        m_no_breaks         = test_suite.m_no_breaks;
+        m_no_output         = test_suite.m_no_output;
+        m_may_fail          = test_suite.m_may_fail;
+        m_should_fail       = test_suite.m_should_fail;
+        m_expected_failures = test_suite.m_expected_failures;
+        m_timeout           = test_suite.m_timeout;
+
+        m_test        = test;
+        m_type        = type;
+        m_template_id = template_id;
+    }
+
+    TestCase::TestCase(const TestCase& other)
+            : TestCaseData() {
+        *this = other;
+    }
+
+    DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(26434) // hides a non-virtual function
+    TestCase& TestCase::operator=(const TestCase& other) {
+        TestCaseData::operator=(other);
+        m_test        = other.m_test;
+        m_type        = other.m_type;
+        m_template_id = other.m_template_id;
+        m_full_name   = other.m_full_name;
+
+        if(m_template_id != -1)
+            m_name = m_full_name.c_str();
+        return *this;
+    }
+    DOCTEST_MSVC_SUPPRESS_WARNING_POP
+
+    TestCase& TestCase::operator*(const char* in) {
+        m_name = in;
+        // make a new name with an appended type for templated test case
+        if(m_template_id != -1) {
+            m_full_name = String(m_name) + "<" + m_type + ">";
+            // redirect the name to point to the newly constructed full name
+            m_name = m_full_name.c_str();
+        }
+        return *this;
+    }
+
+    bool TestCase::operator<(const TestCase& other) const {
+        // this will be used only to differentiate between test cases - not relevant for sorting
+        if(m_line != other.m_line)
+            return m_line < other.m_line;
+        const int name_cmp = strcmp(m_name, other.m_name);
+        if(name_cmp != 0)
+            return name_cmp < 0;
+        const int file_cmp = m_file.compare(other.m_file);
+        if(file_cmp != 0)
+            return file_cmp < 0;
+        return m_template_id < other.m_template_id;
+    }
+
+    // all the registered tests
+    std::set<TestCase>& getRegisteredTests() {
+        static std::set<TestCase> data;
+        return data;
+    }
+} // namespace detail
+namespace {
+    using namespace detail;
+    // for sorting tests by file/line
+    bool fileOrderComparator(const TestCase* lhs, const TestCase* rhs) {
+        // this is needed because MSVC gives different case for drive letters
+        // for __FILE__ when evaluated in a header and a source file
+        const int res = lhs->m_file.compare(rhs->m_file, bool(DOCTEST_MSVC));
+        if(res != 0)
+            return res < 0;
+        if(lhs->m_line != rhs->m_line)
+            return lhs->m_line < rhs->m_line;
+        return lhs->m_template_id < rhs->m_template_id;
+    }
+
+    // for sorting tests by suite/file/line
+    bool suiteOrderComparator(const TestCase* lhs, const TestCase* rhs) {
+        const int res = std::strcmp(lhs->m_test_suite, rhs->m_test_suite);
+        if(res != 0)
+            return res < 0;
+        return fileOrderComparator(lhs, rhs);
+    }
+
+    // for sorting tests by name/suite/file/line
+    bool nameOrderComparator(const TestCase* lhs, const TestCase* rhs) {
+        const int res = std::strcmp(lhs->m_name, rhs->m_name);
+        if(res != 0)
+            return res < 0;
+        return suiteOrderComparator(lhs, rhs);
+    }
+
+    DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wdeprecated-declarations")
+    void color_to_stream(std::ostream& s, Color::Enum code) {
+        static_cast<void>(s);    // for DOCTEST_CONFIG_COLORS_NONE or DOCTEST_CONFIG_COLORS_WINDOWS
+        static_cast<void>(code); // for DOCTEST_CONFIG_COLORS_NONE
+#ifdef DOCTEST_CONFIG_COLORS_ANSI
+        if(g_no_colors ||
+           (isatty(STDOUT_FILENO) == false && getContextOptions()->force_colors == false))
+            return;
+
+        auto col = "";
+        // clang-format off
+            switch(code) { //!OCLINT missing break in switch statement / unnecessary default statement in covered switch statement
+                case Color::Red:         col = "[0;31m"; break;
+                case Color::Green:       col = "[0;32m"; break;
+                case Color::Blue:        col = "[0;34m"; break;
+                case Color::Cyan:        col = "[0;36m"; break;
+                case Color::Yellow:      col = "[0;33m"; break;
+                case Color::Grey:        col = "[1;30m"; break;
+                case Color::LightGrey:   col = "[0;37m"; break;
+                case Color::BrightRed:   col = "[1;31m"; break;
+                case Color::BrightGreen: col = "[1;32m"; break;
+                case Color::BrightWhite: col = "[1;37m"; break;
+                case Color::Bright: // invalid
+                case Color::None:
+                case Color::White:
+                default:                 col = "[0m";
+            }
+        // clang-format on
+        s << "\033" << col;
+#endif // DOCTEST_CONFIG_COLORS_ANSI
+
+#ifdef DOCTEST_CONFIG_COLORS_WINDOWS
+        if(g_no_colors ||
+           (_isatty(_fileno(stdout)) == false && getContextOptions()->force_colors == false))
+            return;
+
+        static struct ConsoleHelper {
+            HANDLE stdoutHandle;
+            WORD   origFgAttrs;
+            WORD   origBgAttrs;
+
+            ConsoleHelper() {
+                stdoutHandle = GetStdHandle(STD_OUTPUT_HANDLE);
+                CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
+                GetConsoleScreenBufferInfo(stdoutHandle, &csbiInfo);
+                origFgAttrs = csbiInfo.wAttributes & ~(BACKGROUND_GREEN | BACKGROUND_RED |
+                    BACKGROUND_BLUE | BACKGROUND_INTENSITY);
+                origBgAttrs = csbiInfo.wAttributes & ~(FOREGROUND_GREEN | FOREGROUND_RED |
+                    FOREGROUND_BLUE | FOREGROUND_INTENSITY);
+            }
+        } ch;
+
+#define DOCTEST_SET_ATTR(x) SetConsoleTextAttribute(ch.stdoutHandle, x | ch.origBgAttrs)
+
+        // clang-format off
+        switch (code) {
+            case Color::White:       DOCTEST_SET_ATTR(FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE); break;
+            case Color::Red:         DOCTEST_SET_ATTR(FOREGROUND_RED);                                      break;
+            case Color::Green:       DOCTEST_SET_ATTR(FOREGROUND_GREEN);                                    break;
+            case Color::Blue:        DOCTEST_SET_ATTR(FOREGROUND_BLUE);                                     break;
+            case Color::Cyan:        DOCTEST_SET_ATTR(FOREGROUND_BLUE | FOREGROUND_GREEN);                  break;
+            case Color::Yellow:      DOCTEST_SET_ATTR(FOREGROUND_RED | FOREGROUND_GREEN);                   break;
+            case Color::Grey:        DOCTEST_SET_ATTR(0);                                                   break;
+            case Color::LightGrey:   DOCTEST_SET_ATTR(FOREGROUND_INTENSITY);                                break;
+            case Color::BrightRed:   DOCTEST_SET_ATTR(FOREGROUND_INTENSITY | FOREGROUND_RED);               break;
+            case Color::BrightGreen: DOCTEST_SET_ATTR(FOREGROUND_INTENSITY | FOREGROUND_GREEN);             break;
+            case Color::BrightWhite: DOCTEST_SET_ATTR(FOREGROUND_INTENSITY | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE); break;
+            case Color::None:
+            case Color::Bright: // invalid
+            default:                 DOCTEST_SET_ATTR(ch.origFgAttrs);
+        }
+            // clang-format on
+#endif // DOCTEST_CONFIG_COLORS_WINDOWS
+    }
+    DOCTEST_CLANG_SUPPRESS_WARNING_POP
+
+    std::vector<const IExceptionTranslator*>& getExceptionTranslators() {
+        static std::vector<const IExceptionTranslator*> data;
+        return data;
+    }
+
+    String translateActiveException() {
+#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS
+        String res;
+        auto&  translators = getExceptionTranslators();
+        for(auto& curr : translators)
+            if(curr->translate(res))
+                return res;
+        // clang-format off
+        DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH("-Wcatch-value")
+        try {
+            throw;
+        } catch(std::exception& ex) {
+            return ex.what();
+        } catch(std::string& msg) {
+            return msg.c_str();
+        } catch(const char* msg) {
+            return msg;
+        } catch(...) {
+            return "unknown exception";
+        }
+        DOCTEST_GCC_SUPPRESS_WARNING_POP
+// clang-format on
+#else  // DOCTEST_CONFIG_NO_EXCEPTIONS
+        return "";
+#endif // DOCTEST_CONFIG_NO_EXCEPTIONS
+    }
+} // namespace
+
+namespace detail {
+    // used by the macros for registering tests
+    int regTest(const TestCase& tc) {
+        getRegisteredTests().insert(tc);
+        return 0;
+    }
+
+    // sets the current test suite
+    int setTestSuite(const TestSuite& ts) {
+        doctest_detail_test_suite_ns::getCurrentTestSuite() = ts;
+        return 0;
+    }
+
+#ifdef DOCTEST_IS_DEBUGGER_ACTIVE
+    bool isDebuggerActive() { return DOCTEST_IS_DEBUGGER_ACTIVE(); }
+#else // DOCTEST_IS_DEBUGGER_ACTIVE
+#ifdef DOCTEST_PLATFORM_LINUX
+    class ErrnoGuard {
+    public:
+        ErrnoGuard() : m_oldErrno(errno) {}
+        ~ErrnoGuard() { errno = m_oldErrno; }
+    private:
+        int m_oldErrno;
+    };
+    // See the comments in Catch2 for the reasoning behind this implementation:
+    // https://github.com/catchorg/Catch2/blob/v2.13.1/include/internal/catch_debugger.cpp#L79-L102
+    bool isDebuggerActive() {
+        ErrnoGuard guard;
+        std::ifstream in("/proc/self/status");
+        for(std::string line; std::getline(in, line);) {
+            static const int PREFIX_LEN = 11;
+            if(line.compare(0, PREFIX_LEN, "TracerPid:\t") == 0) {
+                return line.length() > PREFIX_LEN && line[PREFIX_LEN] != '0';
+            }
+        }
+        return false;
+    }
+#elif defined(DOCTEST_PLATFORM_MAC)
+    // The following function is taken directly from the following technical note:
+    // https://developer.apple.com/library/archive/qa/qa1361/_index.html
+    // Returns true if the current process is being debugged (either
+    // running under the debugger or has a debugger attached post facto).
+    bool isDebuggerActive() {
+        int        mib[4];
+        kinfo_proc info;
+        size_t     size;
+        // Initialize the flags so that, if sysctl fails for some bizarre
+        // reason, we get a predictable result.
+        info.kp_proc.p_flag = 0;
+        // Initialize mib, which tells sysctl the info we want, in this case
+        // we're looking for information about a specific process ID.
+        mib[0] = CTL_KERN;
+        mib[1] = KERN_PROC;
+        mib[2] = KERN_PROC_PID;
+        mib[3] = getpid();
+        // Call sysctl.
+        size = sizeof(info);
+        if(sysctl(mib, DOCTEST_COUNTOF(mib), &info, &size, 0, 0) != 0) {
+            std::cerr << "\nCall to sysctl failed - unable to determine if debugger is active **\n";
+            return false;
+        }
+        // We're being debugged if the P_TRACED flag is set.
+        return ((info.kp_proc.p_flag & P_TRACED) != 0);
+    }
+#elif DOCTEST_MSVC || defined(__MINGW32__) || defined(__MINGW64__)
+    bool isDebuggerActive() { return ::IsDebuggerPresent() != 0; }
+#else
+    bool isDebuggerActive() { return false; }
+#endif // Platform
+#endif // DOCTEST_IS_DEBUGGER_ACTIVE
+
+    void registerExceptionTranslatorImpl(const IExceptionTranslator* et) {
+        if(std::find(getExceptionTranslators().begin(), getExceptionTranslators().end(), et) ==
+           getExceptionTranslators().end())
+            getExceptionTranslators().push_back(et);
+    }
+
+    DOCTEST_THREAD_LOCAL std::vector<IContextScope*> g_infoContexts; // for logging with INFO()
+
+    ContextScopeBase::ContextScopeBase() {
+        g_infoContexts.push_back(this);
+    }
+
+    ContextScopeBase::ContextScopeBase(ContextScopeBase&& other) noexcept {
+        if (other.need_to_destroy) {
+            other.destroy();
+        }
+        other.need_to_destroy = false;
+        g_infoContexts.push_back(this);
+    }
+
+    DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4996) // std::uncaught_exception is deprecated in C++17
+    DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH("-Wdeprecated-declarations")
+    DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wdeprecated-declarations")
+
+    // destroy cannot be inlined into the destructor because that would mean calling stringify after
+    // ContextScope has been destroyed (base class destructors run after derived class destructors).
+    // Instead, ContextScope calls this method directly from its destructor.
+    void ContextScopeBase::destroy() {
+#if defined(__cpp_lib_uncaught_exceptions) && __cpp_lib_uncaught_exceptions >= 201411L && (!defined(__MAC_OS_X_VERSION_MIN_REQUIRED) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
+        if(std::uncaught_exceptions() > 0) {
+#else
+        if(std::uncaught_exception()) {
+#endif
+            std::ostringstream s;
+            this->stringify(&s);
+            g_cs->stringifiedContexts.push_back(s.str().c_str());
+        }
+        g_infoContexts.pop_back();
+    }
+
+    DOCTEST_CLANG_SUPPRESS_WARNING_POP
+    DOCTEST_GCC_SUPPRESS_WARNING_POP
+    DOCTEST_MSVC_SUPPRESS_WARNING_POP
+} // namespace detail
+namespace {
+    using namespace detail;
+
+#if !defined(DOCTEST_CONFIG_POSIX_SIGNALS) && !defined(DOCTEST_CONFIG_WINDOWS_SEH)
+    struct FatalConditionHandler
+    {
+        static void reset() {}
+        static void allocateAltStackMem() {}
+        static void freeAltStackMem() {}
+    };
+#else // DOCTEST_CONFIG_POSIX_SIGNALS || DOCTEST_CONFIG_WINDOWS_SEH
+
+    void reportFatal(const std::string&);
+
+#ifdef DOCTEST_PLATFORM_WINDOWS
+
+    struct SignalDefs
+    {
+        DWORD id;
+        const char* name;
+    };
+    // There is no 1-1 mapping between signals and windows exceptions.
+    // Windows can easily distinguish between SO and SigSegV,
+    // but SigInt, SigTerm, etc are handled differently.
+    SignalDefs signalDefs[] = {
+            {static_cast<DWORD>(EXCEPTION_ILLEGAL_INSTRUCTION),
+             "SIGILL - Illegal instruction signal"},
+            {static_cast<DWORD>(EXCEPTION_STACK_OVERFLOW), "SIGSEGV - Stack overflow"},
+            {static_cast<DWORD>(EXCEPTION_ACCESS_VIOLATION),
+             "SIGSEGV - Segmentation violation signal"},
+            {static_cast<DWORD>(EXCEPTION_INT_DIVIDE_BY_ZERO), "Divide by zero error"},
+    };
+
+    struct FatalConditionHandler
+    {
+        static LONG CALLBACK handleException(PEXCEPTION_POINTERS ExceptionInfo) {
+            // Multiple threads may enter this filter/handler at once. We want the error message to be printed on the
+            // console just once no matter how many threads have crashed.
+            DOCTEST_DECLARE_STATIC_MUTEX(mutex)
+            static bool execute = true;
+            {
+                DOCTEST_LOCK_MUTEX(mutex)
+                if(execute) {
+                    bool reported = false;
+                    for(size_t i = 0; i < DOCTEST_COUNTOF(signalDefs); ++i) {
+                        if(ExceptionInfo->ExceptionRecord->ExceptionCode == signalDefs[i].id) {
+                            reportFatal(signalDefs[i].name);
+                            reported = true;
+                            break;
+                        }
+                    }
+                    if(reported == false)
+                        reportFatal("Unhandled SEH exception caught");
+                    if(isDebuggerActive() && !g_cs->no_breaks)
+                        DOCTEST_BREAK_INTO_DEBUGGER();
+                }
+                execute = false;
+            }
+            std::exit(EXIT_FAILURE);
+        }
+
+        static void allocateAltStackMem() {}
+        static void freeAltStackMem() {}
+
+        FatalConditionHandler() {
+            isSet = true;
+            // 32k seems enough for doctest to handle stack overflow,
+            // but the value was found experimentally, so there is no strong guarantee
+            guaranteeSize = 32 * 1024;
+            // Register an unhandled exception filter
+            previousTop = SetUnhandledExceptionFilter(handleException);
+            // Pass in guarantee size to be filled
+            SetThreadStackGuarantee(&guaranteeSize);
+
+            // On Windows uncaught exceptions from another thread, exceptions from
+            // destructors, or calls to std::terminate are not a SEH exception
+
+            // The terminal handler gets called when:
+            // - std::terminate is called FROM THE TEST RUNNER THREAD
+            // - an exception is thrown from a destructor FROM THE TEST RUNNER THREAD
+            original_terminate_handler = std::get_terminate();
+            std::set_terminate([]() DOCTEST_NOEXCEPT {
+                reportFatal("Terminate handler called");
+                if(isDebuggerActive() && !g_cs->no_breaks)
+                    DOCTEST_BREAK_INTO_DEBUGGER();
+                std::exit(EXIT_FAILURE); // explicitly exit - otherwise the SIGABRT handler may be called as well
+            });
+
+            // SIGABRT is raised when:
+            // - std::terminate is called FROM A DIFFERENT THREAD
+            // - an exception is thrown from a destructor FROM A DIFFERENT THREAD
+            // - an uncaught exception is thrown FROM A DIFFERENT THREAD
+            prev_sigabrt_handler = std::signal(SIGABRT, [](int signal) DOCTEST_NOEXCEPT {
+                if(signal == SIGABRT) {
+                    reportFatal("SIGABRT - Abort (abnormal termination) signal");
+                    if(isDebuggerActive() && !g_cs->no_breaks)
+                        DOCTEST_BREAK_INTO_DEBUGGER();
+                    std::exit(EXIT_FAILURE);
+                }
+            });
+
+            // The following settings are taken from google test, and more
+            // specifically from UnitTest::Run() inside of gtest.cc
+
+            // the user does not want to see pop-up dialogs about crashes
+            prev_error_mode_1 = SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOALIGNMENTFAULTEXCEPT |
+                                             SEM_NOGPFAULTERRORBOX | SEM_NOOPENFILEERRORBOX);
+            // This forces the abort message to go to stderr in all circumstances.
+            prev_error_mode_2 = _set_error_mode(_OUT_TO_STDERR);
+            // In the debug version, Visual Studio pops up a separate dialog
+            // offering a choice to debug the aborted program - we want to disable that.
+            prev_abort_behavior = _set_abort_behavior(0x0, _WRITE_ABORT_MSG | _CALL_REPORTFAULT);
+            // In debug mode, the Windows CRT can crash with an assertion over invalid
+            // input (e.g. passing an invalid file descriptor). The default handling
+            // for these assertions is to pop up a dialog and wait for user input.
+            // Instead ask the CRT to dump such assertions to stderr non-interactively.
+            prev_report_mode = _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
+            prev_report_file = _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);
+        }
+
+        static void reset() {
+            if(isSet) {
+                // Unregister handler and restore the old guarantee
+                SetUnhandledExceptionFilter(previousTop);
+                SetThreadStackGuarantee(&guaranteeSize);
+                std::set_terminate(original_terminate_handler);
+                std::signal(SIGABRT, prev_sigabrt_handler);
+                SetErrorMode(prev_error_mode_1);
+                _set_error_mode(prev_error_mode_2);
+                _set_abort_behavior(prev_abort_behavior, _WRITE_ABORT_MSG | _CALL_REPORTFAULT);
+                static_cast<void>(_CrtSetReportMode(_CRT_ASSERT, prev_report_mode));
+                static_cast<void>(_CrtSetReportFile(_CRT_ASSERT, prev_report_file));
+                isSet = false;
+            }
+        }
+
+        ~FatalConditionHandler() { reset(); }
+
+    private:
+        static UINT         prev_error_mode_1;
+        static int          prev_error_mode_2;
+        static unsigned int prev_abort_behavior;
+        static int          prev_report_mode;
+        static _HFILE       prev_report_file;
+        static void (DOCTEST_CDECL *prev_sigabrt_handler)(int);
+        static std::terminate_handler original_terminate_handler;
+        static bool isSet;
+        static ULONG guaranteeSize;
+        static LPTOP_LEVEL_EXCEPTION_FILTER previousTop;
+    };
+
+    UINT         FatalConditionHandler::prev_error_mode_1;
+    int          FatalConditionHandler::prev_error_mode_2;
+    unsigned int FatalConditionHandler::prev_abort_behavior;
+    int          FatalConditionHandler::prev_report_mode;
+    _HFILE       FatalConditionHandler::prev_report_file;
+    void (DOCTEST_CDECL *FatalConditionHandler::prev_sigabrt_handler)(int);
+    std::terminate_handler FatalConditionHandler::original_terminate_handler;
+    bool FatalConditionHandler::isSet = false;
+    ULONG FatalConditionHandler::guaranteeSize = 0;
+    LPTOP_LEVEL_EXCEPTION_FILTER FatalConditionHandler::previousTop = nullptr;
+
+#else // DOCTEST_PLATFORM_WINDOWS
+
+    struct SignalDefs
+    {
+        int         id;
+        const char* name;
+    };
+    SignalDefs signalDefs[] = {{SIGINT, "SIGINT - Terminal interrupt signal"},
+                               {SIGILL, "SIGILL - Illegal instruction signal"},
+                               {SIGFPE, "SIGFPE - Floating point error signal"},
+                               {SIGSEGV, "SIGSEGV - Segmentation violation signal"},
+                               {SIGTERM, "SIGTERM - Termination request signal"},
+                               {SIGABRT, "SIGABRT - Abort (abnormal termination) signal"}};
+
+    struct FatalConditionHandler
+    {
+        static bool             isSet;
+        static struct sigaction oldSigActions[DOCTEST_COUNTOF(signalDefs)];
+        static stack_t          oldSigStack;
+        static size_t           altStackSize;
+        static char*            altStackMem;
+
+        static void handleSignal(int sig) {
+            const char* name = "<unknown signal>";
+            for(std::size_t i = 0; i < DOCTEST_COUNTOF(signalDefs); ++i) {
+                SignalDefs& def = signalDefs[i];
+                if(sig == def.id) {
+                    name = def.name;
+                    break;
+                }
+            }
+            reset();
+            reportFatal(name);
+            raise(sig);
+        }
+
+        static void allocateAltStackMem() {
+            altStackMem = new char[altStackSize];
+        }
+
+        static void freeAltStackMem() {
+            delete[] altStackMem;
+        }
+
+        FatalConditionHandler() {
+            isSet = true;
+            stack_t sigStack;
+            sigStack.ss_sp    = altStackMem;
+            sigStack.ss_size  = altStackSize;
+            sigStack.ss_flags = 0;
+            sigaltstack(&sigStack, &oldSigStack);
+            struct sigaction sa = {};
+            sa.sa_handler       = handleSignal;
+            sa.sa_flags         = SA_ONSTACK;
+            for(std::size_t i = 0; i < DOCTEST_COUNTOF(signalDefs); ++i) {
+                sigaction(signalDefs[i].id, &sa, &oldSigActions[i]);
+            }
+        }
+
+        ~FatalConditionHandler() { reset(); }
+        static void reset() {
+            if(isSet) {
+                // Set signals back to previous values -- hopefully nobody overwrote them in the meantime
+                for(std::size_t i = 0; i < DOCTEST_COUNTOF(signalDefs); ++i) {
+                    sigaction(signalDefs[i].id, &oldSigActions[i], nullptr);
+                }
+                // Return the old stack
+                sigaltstack(&oldSigStack, nullptr);
+                isSet = false;
+            }
+        }
+    };
+
+    bool             FatalConditionHandler::isSet = false;
+    struct sigaction FatalConditionHandler::oldSigActions[DOCTEST_COUNTOF(signalDefs)] = {};
+    stack_t          FatalConditionHandler::oldSigStack = {};
+    size_t           FatalConditionHandler::altStackSize = 4 * SIGSTKSZ;
+    char*            FatalConditionHandler::altStackMem = nullptr;
+
+#endif // DOCTEST_PLATFORM_WINDOWS
+#endif // DOCTEST_CONFIG_POSIX_SIGNALS || DOCTEST_CONFIG_WINDOWS_SEH
+
+} // namespace
+
+namespace {
+    using namespace detail;
+
+#ifdef DOCTEST_PLATFORM_WINDOWS
+#define DOCTEST_OUTPUT_DEBUG_STRING(text) ::OutputDebugStringA(text)
+#else
+    // TODO: integration with XCode and other IDEs
+#define DOCTEST_OUTPUT_DEBUG_STRING(text)
+#endif // Platform
+
+    void addAssert(assertType::Enum at) {
+        if((at & assertType::is_warn) == 0) //!OCLINT bitwise operator in conditional
+            g_cs->numAssertsCurrentTest_atomic++;
+    }
+
+    void addFailedAssert(assertType::Enum at) {
+        if((at & assertType::is_warn) == 0) //!OCLINT bitwise operator in conditional
+            g_cs->numAssertsFailedCurrentTest_atomic++;
+    }
+
+#if defined(DOCTEST_CONFIG_POSIX_SIGNALS) || defined(DOCTEST_CONFIG_WINDOWS_SEH)
+    void reportFatal(const std::string& message) {
+        g_cs->failure_flags |= TestCaseFailureReason::Crash;
+
+        DOCTEST_ITERATE_THROUGH_REPORTERS(test_case_exception, {message.c_str(), true});
+
+        while (g_cs->subcaseStack.size()) {
+            g_cs->subcaseStack.pop_back();
+            DOCTEST_ITERATE_THROUGH_REPORTERS(subcase_end, DOCTEST_EMPTY);
+        }
+
+        g_cs->finalizeTestCaseData();
+
+        DOCTEST_ITERATE_THROUGH_REPORTERS(test_case_end, *g_cs);
+
+        DOCTEST_ITERATE_THROUGH_REPORTERS(test_run_end, *g_cs);
+    }
+#endif // DOCTEST_CONFIG_POSIX_SIGNALS || DOCTEST_CONFIG_WINDOWS_SEH
+} // namespace
+
+AssertData::AssertData(assertType::Enum at, const char* file, int line, const char* expr,
+    const char* exception_type, const StringContains& exception_string)
+    : m_test_case(g_cs->currentTest), m_at(at), m_file(file), m_line(line), m_expr(expr),
+    m_failed(true), m_threw(false), m_threw_as(false), m_exception_type(exception_type),
+    m_exception_string(exception_string) {
+#if DOCTEST_MSVC
+    if (m_expr[0] == ' ') // this happens when variadic macros are disabled under MSVC
+        ++m_expr;
+#endif // MSVC
+}
+
+namespace detail {
+    ResultBuilder::ResultBuilder(assertType::Enum at, const char* file, int line, const char* expr,
+                                 const char* exception_type, const String& exception_string)
+        : AssertData(at, file, line, expr, exception_type, exception_string) { }
+
+    ResultBuilder::ResultBuilder(assertType::Enum at, const char* file, int line, const char* expr,
+        const char* exception_type, const Contains& exception_string)
+        : AssertData(at, file, line, expr, exception_type, exception_string) { }
+
+    void ResultBuilder::setResult(const Result& res) {
+        m_decomp = res.m_decomp;
+        m_failed = !res.m_passed;
+    }
+
+    void ResultBuilder::translateException() {
+        m_threw     = true;
+        m_exception = translateActiveException();
+    }
+
+    bool ResultBuilder::log() {
+        if(m_at & assertType::is_throws) { //!OCLINT bitwise operator in conditional
+            m_failed = !m_threw;
+        } else if((m_at & assertType::is_throws_as) && (m_at & assertType::is_throws_with)) { //!OCLINT
+            m_failed = !m_threw_as || !m_exception_string.check(m_exception);
+        } else if(m_at & assertType::is_throws_as) { //!OCLINT bitwise operator in conditional
+            m_failed = !m_threw_as;
+        } else if(m_at & assertType::is_throws_with) { //!OCLINT bitwise operator in conditional
+            m_failed = !m_exception_string.check(m_exception);
+        } else if(m_at & assertType::is_nothrow) { //!OCLINT bitwise operator in conditional
+            m_failed = m_threw;
+        }
+
+        if(m_exception.size())
+            m_exception = "\"" + m_exception + "\"";
+
+        if(is_running_in_test) {
+            addAssert(m_at);
+            DOCTEST_ITERATE_THROUGH_REPORTERS(log_assert, *this);
+
+            if(m_failed)
+                addFailedAssert(m_at);
+        } else if(m_failed) {
+            failed_out_of_a_testing_context(*this);
+        }
+
+        return m_failed && isDebuggerActive() && !getContextOptions()->no_breaks &&
+            (g_cs->currentTest == nullptr || !g_cs->currentTest->m_no_breaks); // break into debugger
+    }
+
+    void ResultBuilder::react() const {
+        if(m_failed && checkIfShouldThrow(m_at))
+            throwException();
+    }
+
+    void failed_out_of_a_testing_context(const AssertData& ad) {
+        if(g_cs->ah)
+            g_cs->ah(ad);
+        else
+            std::abort();
+    }
+
+    bool decomp_assert(assertType::Enum at, const char* file, int line, const char* expr,
+                       const Result& result) {
+        bool failed = !result.m_passed;
+
+        // ###################################################################################
+        // IF THE DEBUGGER BREAKS HERE - GO 1 LEVEL UP IN THE CALLSTACK FOR THE FAILING ASSERT
+        // THIS IS THE EFFECT OF HAVING 'DOCTEST_CONFIG_SUPER_FAST_ASSERTS' DEFINED
+        // ###################################################################################
+        DOCTEST_ASSERT_OUT_OF_TESTS(result.m_decomp);
+        DOCTEST_ASSERT_IN_TESTS(result.m_decomp);
+        return !failed;
+    }
+
+    MessageBuilder::MessageBuilder(const char* file, int line, assertType::Enum severity) {
+        m_stream   = tlssPush();
+        m_file     = file;
+        m_line     = line;
+        m_severity = severity;
+    }
+
+    MessageBuilder::~MessageBuilder() {
+        if (!logged)
+            tlssPop();
+    }
+
+    DOCTEST_DEFINE_INTERFACE(IExceptionTranslator)
+
+    bool MessageBuilder::log() {
+        if (!logged) {
+            m_string = tlssPop();
+            logged = true;
+        }
+
+        DOCTEST_ITERATE_THROUGH_REPORTERS(log_message, *this);
+
+        const bool isWarn = m_severity & assertType::is_warn;
+
+        // warn is just a message in this context so we don't treat it as an assert
+        if(!isWarn) {
+            addAssert(m_severity);
+            addFailedAssert(m_severity);
+        }
+
+        return isDebuggerActive() && !getContextOptions()->no_breaks && !isWarn &&
+            (g_cs->currentTest == nullptr || !g_cs->currentTest->m_no_breaks); // break into debugger
+    }
+
+    void MessageBuilder::react() {
+        if(m_severity & assertType::is_require) //!OCLINT bitwise operator in conditional
+            throwException();
+    }
+} // namespace detail
+namespace {
+    using namespace detail;
+
+    // clang-format off
+
+// =================================================================================================
+// The following code has been taken verbatim from Catch2/include/internal/catch_xmlwriter.h/cpp
+// This is done so cherry-picking bug fixes is trivial - even the style/formatting is untouched.
+// =================================================================================================
+
+    class XmlEncode {
+    public:
+        enum ForWhat { ForTextNodes, ForAttributes };
+
+        XmlEncode( std::string const& str, ForWhat forWhat = ForTextNodes );
+
+        void encodeTo( std::ostream& os ) const;
+
+        friend std::ostream& operator << ( std::ostream& os, XmlEncode const& xmlEncode );
+
+    private:
+        std::string m_str;
+        ForWhat m_forWhat;
+    };
+
+    class XmlWriter {
+    public:
+
+        class ScopedElement {
+        public:
+            ScopedElement( XmlWriter* writer );
+
+            ScopedElement( ScopedElement&& other ) DOCTEST_NOEXCEPT;
+            ScopedElement& operator=( ScopedElement&& other ) DOCTEST_NOEXCEPT;
+
+            ~ScopedElement();
+
+            ScopedElement& writeText( std::string const& text, bool indent = true );
+
+            template<typename T>
+            ScopedElement& writeAttribute( std::string const& name, T const& attribute ) {
+                m_writer->writeAttribute( name, attribute );
+                return *this;
+            }
+
+        private:
+            mutable XmlWriter* m_writer = nullptr;
+        };
+
+#ifndef DOCTEST_CONFIG_NO_INCLUDE_IOSTREAM
+        XmlWriter( std::ostream& os = std::cout );
+#else // DOCTEST_CONFIG_NO_INCLUDE_IOSTREAM
+        XmlWriter( std::ostream& os );
+#endif // DOCTEST_CONFIG_NO_INCLUDE_IOSTREAM
+        ~XmlWriter();
+
+        XmlWriter( XmlWriter const& ) = delete;
+        XmlWriter& operator=( XmlWriter const& ) = delete;
+
+        XmlWriter& startElement( std::string const& name );
+
+        ScopedElement scopedElement( std::string const& name );
+
+        XmlWriter& endElement();
+
+        XmlWriter& writeAttribute( std::string const& name, std::string const& attribute );
+
+        XmlWriter& writeAttribute( std::string const& name, const char* attribute );
+
+        XmlWriter& writeAttribute( std::string const& name, bool attribute );
+
+        template<typename T>
+        XmlWriter& writeAttribute( std::string const& name, T const& attribute ) {
+        std::stringstream rss;
+            rss << attribute;
+            return writeAttribute( name, rss.str() );
+        }
+
+        XmlWriter& writeText( std::string const& text, bool indent = true );
+
+        //XmlWriter& writeComment( std::string const& text );
+
+        //void writeStylesheetRef( std::string const& url );
+
+        //XmlWriter& writeBlankLine();
+
+        void ensureTagClosed();
+
+        void writeDeclaration();
+
+    private:
+
+        void newlineIfNecessary();
+
+        bool m_tagIsOpen = false;
+        bool m_needsNewline = false;
+        std::vector<std::string> m_tags;
+        std::string m_indent;
+        std::ostream& m_os;
+    };
+
+// =================================================================================================
+// The following code has been taken verbatim from Catch2/include/internal/catch_xmlwriter.h/cpp
+// This is done so cherry-picking bug fixes is trivial - even the style/formatting is untouched.
+// =================================================================================================
+
+using uchar = unsigned char;
+
+namespace {
+
+    size_t trailingBytes(unsigned char c) {
+        if ((c & 0xE0) == 0xC0) {
+            return 2;
+        }
+        if ((c & 0xF0) == 0xE0) {
+            return 3;
+        }
+        if ((c & 0xF8) == 0xF0) {
+            return 4;
+        }
+        DOCTEST_INTERNAL_ERROR("Invalid multibyte utf-8 start byte encountered");
+    }
+
+    uint32_t headerValue(unsigned char c) {
+        if ((c & 0xE0) == 0xC0) {
+            return c & 0x1F;
+        }
+        if ((c & 0xF0) == 0xE0) {
+            return c & 0x0F;
+        }
+        if ((c & 0xF8) == 0xF0) {
+            return c & 0x07;
+        }
+        DOCTEST_INTERNAL_ERROR("Invalid multibyte utf-8 start byte encountered");
+    }
+
+    void hexEscapeChar(std::ostream& os, unsigned char c) {
+        std::ios_base::fmtflags f(os.flags());
+        os << "\\x"
+            << std::uppercase << std::hex << std::setfill('0') << std::setw(2)
+            << static_cast<int>(c);
+        os.flags(f);
+    }
+
+} // anonymous namespace
+
+    XmlEncode::XmlEncode( std::string const& str, ForWhat forWhat )
+    :   m_str( str ),
+        m_forWhat( forWhat )
+    {}
+
+    void XmlEncode::encodeTo( std::ostream& os ) const {
+        // Apostrophe escaping not necessary if we always use " to write attributes
+        // (see: https://www.w3.org/TR/xml/#syntax)
+
+        for( std::size_t idx = 0; idx < m_str.size(); ++ idx ) {
+            uchar c = m_str[idx];
+            switch (c) {
+            case '<':   os << "&lt;"; break;
+            case '&':   os << "&amp;"; break;
+
+            case '>':
+                // See: https://www.w3.org/TR/xml/#syntax
+                if (idx > 2 && m_str[idx - 1] == ']' && m_str[idx - 2] == ']')
+                    os << "&gt;";
+                else
+                    os << c;
+                break;
+
+            case '\"':
+                if (m_forWhat == ForAttributes)
+                    os << "&quot;";
+                else
+                    os << c;
+                break;
+
+            default:
+                // Check for control characters and invalid utf-8
+
+                // Escape control characters in standard ascii
+                // see https://stackoverflow.com/questions/404107/why-are-control-characters-illegal-in-xml-1-0
+                if (c < 0x09 || (c > 0x0D && c < 0x20) || c == 0x7F) {
+                    hexEscapeChar(os, c);
+                    break;
+                }
+
+                // Plain ASCII: Write it to stream
+                if (c < 0x7F) {
+                    os << c;
+                    break;
+                }
+
+                // UTF-8 territory
+                // Check if the encoding is valid and if it is not, hex escape bytes.
+                // Important: We do not check the exact decoded values for validity, only the encoding format
+                // First check that this bytes is a valid lead byte:
+                // This means that it is not encoded as 1111 1XXX
+                // Or as 10XX XXXX
+                if (c <  0xC0 ||
+                    c >= 0xF8) {
+                    hexEscapeChar(os, c);
+                    break;
+                }
+
+                auto encBytes = trailingBytes(c);
+                // Are there enough bytes left to avoid accessing out-of-bounds memory?
+                if (idx + encBytes - 1 >= m_str.size()) {
+                    hexEscapeChar(os, c);
+                    break;
+                }
+                // The header is valid, check data
+                // The next encBytes bytes must together be a valid utf-8
+                // This means: bitpattern 10XX XXXX and the extracted value is sane (ish)
+                bool valid = true;
+                uint32_t value = headerValue(c);
+                for (std::size_t n = 1; n < encBytes; ++n) {
+                    uchar nc = m_str[idx + n];
+                    valid &= ((nc & 0xC0) == 0x80);
+                    value = (value << 6) | (nc & 0x3F);
+                }
+
+                if (
+                    // Wrong bit pattern of following bytes
+                    (!valid) ||
+                    // Overlong encodings
+                    (value < 0x80) ||
+                    (                 value < 0x800   && encBytes > 2) || // removed "0x80 <= value &&" because redundant
+                    (0x800 < value && value < 0x10000 && encBytes > 3) ||
+                    // Encoded value out of range
+                    (value >= 0x110000)
+                    ) {
+                    hexEscapeChar(os, c);
+                    break;
+                }
+
+                // If we got here, this is in fact a valid(ish) utf-8 sequence
+                for (std::size_t n = 0; n < encBytes; ++n) {
+                    os << m_str[idx + n];
+                }
+                idx += encBytes - 1;
+                break;
+            }
+        }
+    }
+
+    std::ostream& operator << ( std::ostream& os, XmlEncode const& xmlEncode ) {
+        xmlEncode.encodeTo( os );
+        return os;
+    }
+
+    XmlWriter::ScopedElement::ScopedElement( XmlWriter* writer )
+    :   m_writer( writer )
+    {}
+
+    XmlWriter::ScopedElement::ScopedElement( ScopedElement&& other ) DOCTEST_NOEXCEPT
+    :   m_writer( other.m_writer ){
+        other.m_writer = nullptr;
+    }
+    XmlWriter::ScopedElement& XmlWriter::ScopedElement::operator=( ScopedElement&& other ) DOCTEST_NOEXCEPT {
+        if ( m_writer ) {
+            m_writer->endElement();
+        }
+        m_writer = other.m_writer;
+        other.m_writer = nullptr;
+        return *this;
+    }
+
+
+    XmlWriter::ScopedElement::~ScopedElement() {
+        if( m_writer )
+            m_writer->endElement();
+    }
+
+    XmlWriter::ScopedElement& XmlWriter::ScopedElement::writeText( std::string const& text, bool indent ) {
+        m_writer->writeText( text, indent );
+        return *this;
+    }
+
+    XmlWriter::XmlWriter( std::ostream& os ) : m_os( os )
+    {
+        // writeDeclaration(); // called explicitly by the reporters that use the writer class - see issue #627
+    }
+
+    XmlWriter::~XmlWriter() {
+        while( !m_tags.empty() )
+            endElement();
+    }
+
+    XmlWriter& XmlWriter::startElement( std::string const& name ) {
+        ensureTagClosed();
+        newlineIfNecessary();
+        m_os << m_indent << '<' << name;
+        m_tags.push_back( name );
+        m_indent += "  ";
+        m_tagIsOpen = true;
+        return *this;
+    }
+
+    XmlWriter::ScopedElement XmlWriter::scopedElement( std::string const& name ) {
+        ScopedElement scoped( this );
+        startElement( name );
+        return scoped;
+    }
+
+    XmlWriter& XmlWriter::endElement() {
+        newlineIfNecessary();
+        m_indent = m_indent.substr( 0, m_indent.size()-2 );
+        if( m_tagIsOpen ) {
+            m_os << "/>";
+            m_tagIsOpen = false;
+        }
+        else {
+            m_os << m_indent << "</" << m_tags.back() << ">";
+        }
+        m_os << std::endl;
+        m_tags.pop_back();
+        return *this;
+    }
+
+    XmlWriter& XmlWriter::writeAttribute( std::string const& name, std::string const& attribute ) {
+        if( !name.empty() && !attribute.empty() )
+            m_os << ' ' << name << "=\"" << XmlEncode( attribute, XmlEncode::ForAttributes ) << '"';
+        return *this;
+    }
+
+    XmlWriter& XmlWriter::writeAttribute( std::string const& name, const char* attribute ) {
+        if( !name.empty() && attribute && attribute[0] != '\0' )
+            m_os << ' ' << name << "=\"" << XmlEncode( attribute, XmlEncode::ForAttributes ) << '"';
+        return *this;
+    }
+
+    XmlWriter& XmlWriter::writeAttribute( std::string const& name, bool attribute ) {
+        m_os << ' ' << name << "=\"" << ( attribute ? "true" : "false" ) << '"';
+        return *this;
+    }
+
+    XmlWriter& XmlWriter::writeText( std::string const& text, bool indent ) {
+        if( !text.empty() ){
+            bool tagWasOpen = m_tagIsOpen;
+            ensureTagClosed();
+            if( tagWasOpen && indent )
+                m_os << m_indent;
+            m_os << XmlEncode( text );
+            m_needsNewline = true;
+        }
+        return *this;
+    }
+
+    //XmlWriter& XmlWriter::writeComment( std::string const& text ) {
+    //    ensureTagClosed();
+    //    m_os << m_indent << "<!--" << text << "-->";
+    //    m_needsNewline = true;
+    //    return *this;
+    //}
+
+    //void XmlWriter::writeStylesheetRef( std::string const& url ) {
+    //    m_os << "<?xml-stylesheet type=\"text/xsl\" href=\"" << url << "\"?>\n";
+    //}
+
+    //XmlWriter& XmlWriter::writeBlankLine() {
+    //    ensureTagClosed();
+    //    m_os << '\n';
+    //    return *this;
+    //}
+
+    void XmlWriter::ensureTagClosed() {
+        if( m_tagIsOpen ) {
+            m_os << ">" << std::endl;
+            m_tagIsOpen = false;
+        }
+    }
+
+    void XmlWriter::writeDeclaration() {
+        m_os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+    }
+
+    void XmlWriter::newlineIfNecessary() {
+        if( m_needsNewline ) {
+            m_os << std::endl;
+            m_needsNewline = false;
+        }
+    }
+
+// =================================================================================================
+// End of copy-pasted code from Catch
+// =================================================================================================
+
+    // clang-format on
+
+    struct XmlReporter : public IReporter
+    {
+        XmlWriter xml;
+        DOCTEST_DECLARE_MUTEX(mutex)
+
+        // caching pointers/references to objects of these types - safe to do
+        const ContextOptions& opt;
+        const TestCaseData*   tc = nullptr;
+
+        XmlReporter(const ContextOptions& co)
+                : xml(*co.cout)
+                , opt(co) {}
+
+        void log_contexts() {
+            int num_contexts = get_num_active_contexts();
+            if(num_contexts) {
+                auto              contexts = get_active_contexts();
+                std::stringstream ss;
+                for(int i = 0; i < num_contexts; ++i) {
+                    contexts[i]->stringify(&ss);
+                    xml.scopedElement("Info").writeText(ss.str());
+                    ss.str("");
+                }
+            }
+        }
+
+        unsigned line(unsigned l) const { return opt.no_line_numbers ? 0 : l; }
+
+        void test_case_start_impl(const TestCaseData& in) {
+            bool open_ts_tag = false;
+            if(tc != nullptr) { // we have already opened a test suite
+                if(std::strcmp(tc->m_test_suite, in.m_test_suite) != 0) {
+                    xml.endElement();
+                    open_ts_tag = true;
+                }
+            }
+            else {
+                open_ts_tag = true; // first test case ==> first test suite
+            }
+
+            if(open_ts_tag) {
+                xml.startElement("TestSuite");
+                xml.writeAttribute("name", in.m_test_suite);
+            }
+
+            tc = &in;
+            xml.startElement("TestCase")
+                    .writeAttribute("name", in.m_name)
+                    .writeAttribute("filename", skipPathFromFilename(in.m_file.c_str()))
+                    .writeAttribute("line", line(in.m_line))
+                    .writeAttribute("description", in.m_description);
+
+            if(Approx(in.m_timeout) != 0)
+                xml.writeAttribute("timeout", in.m_timeout);
+            if(in.m_may_fail)
+                xml.writeAttribute("may_fail", true);
+            if(in.m_should_fail)
+                xml.writeAttribute("should_fail", true);
+        }
+
+        // =========================================================================================
+        // WHAT FOLLOWS ARE OVERRIDES OF THE VIRTUAL METHODS OF THE REPORTER INTERFACE
+        // =========================================================================================
+
+        void report_query(const QueryData& in) override {
+            test_run_start();
+            if(opt.list_reporters) {
+                for(auto& curr : getListeners())
+                    xml.scopedElement("Listener")
+                            .writeAttribute("priority", curr.first.first)
+                            .writeAttribute("name", curr.first.second);
+                for(auto& curr : getReporters())
+                    xml.scopedElement("Reporter")
+                            .writeAttribute("priority", curr.first.first)
+                            .writeAttribute("name", curr.first.second);
+            } else if(opt.count || opt.list_test_cases) {
+                for(unsigned i = 0; i < in.num_data; ++i) {
+                    xml.scopedElement("TestCase").writeAttribute("name", in.data[i]->m_name)
+                        .writeAttribute("testsuite", in.data[i]->m_test_suite)
+                        .writeAttribute("filename", skipPathFromFilename(in.data[i]->m_file.c_str()))
+                        .writeAttribute("line", line(in.data[i]->m_line))
+                        .writeAttribute("skipped", in.data[i]->m_skip);
+                }
+                xml.scopedElement("OverallResultsTestCases")
+                        .writeAttribute("unskipped", in.run_stats->numTestCasesPassingFilters);
+            } else if(opt.list_test_suites) {
+                for(unsigned i = 0; i < in.num_data; ++i)
+                    xml.scopedElement("TestSuite").writeAttribute("name", in.data[i]->m_test_suite);
+                xml.scopedElement("OverallResultsTestCases")
+                        .writeAttribute("unskipped", in.run_stats->numTestCasesPassingFilters);
+                xml.scopedElement("OverallResultsTestSuites")
+                        .writeAttribute("unskipped", in.run_stats->numTestSuitesPassingFilters);
+            }
+            xml.endElement();
+        }
+
+        void test_run_start() override {
+            xml.writeDeclaration();
+
+            // remove .exe extension - mainly to have the same output on UNIX and Windows
+            std::string binary_name = skipPathFromFilename(opt.binary_name.c_str());
+#ifdef DOCTEST_PLATFORM_WINDOWS
+            if(binary_name.rfind(".exe") != std::string::npos)
+                binary_name = binary_name.substr(0, binary_name.length() - 4);
+#endif // DOCTEST_PLATFORM_WINDOWS
+
+            xml.startElement("doctest").writeAttribute("binary", binary_name);
+            if(opt.no_version == false)
+                xml.writeAttribute("version", DOCTEST_VERSION_STR);
+
+            // only the consequential ones (TODO: filters)
+            xml.scopedElement("Options")
+                    .writeAttribute("order_by", opt.order_by.c_str())
+                    .writeAttribute("rand_seed", opt.rand_seed)
+                    .writeAttribute("first", opt.first)
+                    .writeAttribute("last", opt.last)
+                    .writeAttribute("abort_after", opt.abort_after)
+                    .writeAttribute("subcase_filter_levels", opt.subcase_filter_levels)
+                    .writeAttribute("case_sensitive", opt.case_sensitive)
+                    .writeAttribute("no_throw", opt.no_throw)
+                    .writeAttribute("no_skip", opt.no_skip);
+        }
+
+        void test_run_end(const TestRunStats& p) override {
+            if(tc) // the TestSuite tag - only if there has been at least 1 test case
+                xml.endElement();
+
+            xml.scopedElement("OverallResultsAsserts")
+                    .writeAttribute("successes", p.numAsserts - p.numAssertsFailed)
+                    .writeAttribute("failures", p.numAssertsFailed);
+
+            xml.startElement("OverallResultsTestCases")
+                    .writeAttribute("successes",
+                                    p.numTestCasesPassingFilters - p.numTestCasesFailed)
+                    .writeAttribute("failures", p.numTestCasesFailed);
+            if(opt.no_skipped_summary == false)
+                xml.writeAttribute("skipped", p.numTestCases - p.numTestCasesPassingFilters);
+            xml.endElement();
+
+            xml.endElement();
+        }
+
+        void test_case_start(const TestCaseData& in) override {
+            test_case_start_impl(in);
+            xml.ensureTagClosed();
+        }
+
+        void test_case_reenter(const TestCaseData&) override {}
+
+        void test_case_end(const CurrentTestCaseStats& st) override {
+            xml.startElement("OverallResultsAsserts")
+                    .writeAttribute("successes",
+                                    st.numAssertsCurrentTest - st.numAssertsFailedCurrentTest)
+                    .writeAttribute("failures", st.numAssertsFailedCurrentTest)
+                    .writeAttribute("test_case_success", st.testCaseSuccess);
+            if(opt.duration)
+                xml.writeAttribute("duration", st.seconds);
+            if(tc->m_expected_failures)
+                xml.writeAttribute("expected_failures", tc->m_expected_failures);
+            xml.endElement();
+
+            xml.endElement();
+        }
+
+        void test_case_exception(const TestCaseException& e) override {
+            DOCTEST_LOCK_MUTEX(mutex)
+
+            xml.scopedElement("Exception")
+                    .writeAttribute("crash", e.is_crash)
+                    .writeText(e.error_string.c_str());
+        }
+
+        void subcase_start(const SubcaseSignature& in) override {
+            xml.startElement("SubCase")
+                    .writeAttribute("name", in.m_name)
+                    .writeAttribute("filename", skipPathFromFilename(in.m_file))
+                    .writeAttribute("line", line(in.m_line));
+            xml.ensureTagClosed();
+        }
+
+        void subcase_end() override { xml.endElement(); }
+
+        void log_assert(const AssertData& rb) override {
+            if(!rb.m_failed && !opt.success)
+                return;
+
+            DOCTEST_LOCK_MUTEX(mutex)
+
+            xml.startElement("Expression")
+                    .writeAttribute("success", !rb.m_failed)
+                    .writeAttribute("type", assertString(rb.m_at))
+                    .writeAttribute("filename", skipPathFromFilename(rb.m_file))
+                    .writeAttribute("line", line(rb.m_line));
+
+            xml.scopedElement("Original").writeText(rb.m_expr);
+
+            if(rb.m_threw)
+                xml.scopedElement("Exception").writeText(rb.m_exception.c_str());
+
+            if(rb.m_at & assertType::is_throws_as)
+                xml.scopedElement("ExpectedException").writeText(rb.m_exception_type);
+            if(rb.m_at & assertType::is_throws_with)
+                xml.scopedElement("ExpectedExceptionString").writeText(rb.m_exception_string.c_str());
+            if((rb.m_at & assertType::is_normal) && !rb.m_threw)
+                xml.scopedElement("Expanded").writeText(rb.m_decomp.c_str());
+
+            log_contexts();
+
+            xml.endElement();
+        }
+
+        void log_message(const MessageData& mb) override {
+            DOCTEST_LOCK_MUTEX(mutex)
+
+            xml.startElement("Message")
+                    .writeAttribute("type", failureString(mb.m_severity))
+                    .writeAttribute("filename", skipPathFromFilename(mb.m_file))
+                    .writeAttribute("line", line(mb.m_line));
+
+            xml.scopedElement("Text").writeText(mb.m_string.c_str());
+
+            log_contexts();
+
+            xml.endElement();
+        }
+
+        void test_case_skipped(const TestCaseData& in) override {
+            if(opt.no_skipped_summary == false) {
+                test_case_start_impl(in);
+                xml.writeAttribute("skipped", "true");
+                xml.endElement();
+            }
+        }
+    };
+
+    DOCTEST_REGISTER_REPORTER("xml", 0, XmlReporter);
+
+    void fulltext_log_assert_to_stream(std::ostream& s, const AssertData& rb) {
+        if((rb.m_at & (assertType::is_throws_as | assertType::is_throws_with)) ==
+            0) //!OCLINT bitwise operator in conditional
+            s << Color::Cyan << assertString(rb.m_at) << "( " << rb.m_expr << " ) "
+                << Color::None;
+
+        if(rb.m_at & assertType::is_throws) { //!OCLINT bitwise operator in conditional
+            s << (rb.m_threw ? "threw as expected!" : "did NOT throw at all!") << "\n";
+        } else if((rb.m_at & assertType::is_throws_as) &&
+                    (rb.m_at & assertType::is_throws_with)) { //!OCLINT
+            s << Color::Cyan << assertString(rb.m_at) << "( " << rb.m_expr << ", \""
+                << rb.m_exception_string.c_str()
+                << "\", " << rb.m_exception_type << " ) " << Color::None;
+            if(rb.m_threw) {
+                if(!rb.m_failed) {
+                    s << "threw as expected!\n";
+                } else {
+                    s << "threw a DIFFERENT exception! (contents: " << rb.m_exception << ")\n";
+                }
+            } else {
+                s << "did NOT throw at all!\n";
+            }
+        } else if(rb.m_at &
+                    assertType::is_throws_as) { //!OCLINT bitwise operator in conditional
+            s << Color::Cyan << assertString(rb.m_at) << "( " << rb.m_expr << ", "
+                << rb.m_exception_type << " ) " << Color::None
+                << (rb.m_threw ? (rb.m_threw_as ? "threw as expected!" :
+                                                "threw a DIFFERENT exception: ") :
+                                "did NOT throw at all!")
+                << Color::Cyan << rb.m_exception << "\n";
+        } else if(rb.m_at &
+                    assertType::is_throws_with) { //!OCLINT bitwise operator in conditional
+            s << Color::Cyan << assertString(rb.m_at) << "( " << rb.m_expr << ", \""
+                << rb.m_exception_string.c_str()
+                << "\" ) " << Color::None
+                << (rb.m_threw ? (!rb.m_failed ? "threw as expected!" :
+                                                "threw a DIFFERENT exception: ") :
+                                "did NOT throw at all!")
+                << Color::Cyan << rb.m_exception << "\n";
+        } else if(rb.m_at & assertType::is_nothrow) { //!OCLINT bitwise operator in conditional
+            s << (rb.m_threw ? "THREW exception: " : "didn't throw!") << Color::Cyan
+                << rb.m_exception << "\n";
+        } else {
+            s << (rb.m_threw ? "THREW exception: " :
+                                (!rb.m_failed ? "is correct!\n" : "is NOT correct!\n"));
+            if(rb.m_threw)
+                s << rb.m_exception << "\n";
+            else
+                s << "  values: " << assertString(rb.m_at) << "( " << rb.m_decomp << " )\n";
+        }
+    }
+
+    // TODO:
+    // - log_message()
+    // - respond to queries
+    // - honor remaining options
+    // - more attributes in tags
+    struct JUnitReporter : public IReporter
+    {
+        XmlWriter xml;
+        DOCTEST_DECLARE_MUTEX(mutex)
+        Timer timer;
+        std::vector<String> deepestSubcaseStackNames;
+
+        struct JUnitTestCaseData
+        {
+            static std::string getCurrentTimestamp() {
+                // Beware, this is not reentrant because of backward compatibility issues
+                // Also, UTC only, again because of backward compatibility (%z is C++11)
+                time_t rawtime;
+                std::time(&rawtime);
+                auto const timeStampSize = sizeof("2017-01-16T17:06:45Z");
+
+                std::tm timeInfo;
+#ifdef DOCTEST_PLATFORM_WINDOWS
+                gmtime_s(&timeInfo, &rawtime);
+#else // DOCTEST_PLATFORM_WINDOWS
+                gmtime_r(&rawtime, &timeInfo);
+#endif // DOCTEST_PLATFORM_WINDOWS
+
+                char timeStamp[timeStampSize];
+                const char* const fmt = "%Y-%m-%dT%H:%M:%SZ";
+
+                std::strftime(timeStamp, timeStampSize, fmt, &timeInfo);
+                return std::string(timeStamp);
+            }
+
+            struct JUnitTestMessage
+            {
+                JUnitTestMessage(const std::string& _message, const std::string& _type, const std::string& _details)
+                    : message(_message), type(_type), details(_details) {}
+
+                JUnitTestMessage(const std::string& _message, const std::string& _details)
+                    : message(_message), type(), details(_details) {}
+
+                std::string message, type, details;
+            };
+
+            struct JUnitTestCase
+            {
+                JUnitTestCase(const std::string& _classname, const std::string& _name)
+                    : classname(_classname), name(_name), time(0), failures() {}
+
+                std::string classname, name;
+                double time;
+                std::vector<JUnitTestMessage> failures, errors;
+            };
+
+            void add(const std::string& classname, const std::string& name) {
+                testcases.emplace_back(classname, name);
+            }
+
+            void appendSubcaseNamesToLastTestcase(std::vector<String> nameStack) {
+                for(auto& curr: nameStack)
+                    if(curr.size())
+                        testcases.back().name += std::string("/") + curr.c_str();
+            }
+
+            void addTime(double time) {
+                if(time < 1e-4)
+                    time = 0;
+                testcases.back().time = time;
+                totalSeconds += time;
+            }
+
+            void addFailure(const std::string& message, const std::string& type, const std::string& details) {
+                testcases.back().failures.emplace_back(message, type, details);
+                ++totalFailures;
+            }
+
+            void addError(const std::string& message, const std::string& details) {
+                testcases.back().errors.emplace_back(message, details);
+                ++totalErrors;
+            }
+
+            std::vector<JUnitTestCase> testcases;
+            double totalSeconds = 0;
+            int totalErrors = 0, totalFailures = 0;
+        };
+
+        JUnitTestCaseData testCaseData;
+
+        // caching pointers/references to objects of these types - safe to do
+        const ContextOptions& opt;
+        const TestCaseData*   tc = nullptr;
+
+        JUnitReporter(const ContextOptions& co)
+                : xml(*co.cout)
+                , opt(co) {}
+
+        unsigned line(unsigned l) const { return opt.no_line_numbers ? 0 : l; }
+
+        // =========================================================================================
+        // WHAT FOLLOWS ARE OVERRIDES OF THE VIRTUAL METHODS OF THE REPORTER INTERFACE
+        // =========================================================================================
+
+        void report_query(const QueryData&) override {
+            xml.writeDeclaration();
+        }
+
+        void test_run_start() override {
+            xml.writeDeclaration();
+        }
+
+        void test_run_end(const TestRunStats& p) override {
+            // remove .exe extension - mainly to have the same output on UNIX and Windows
+            std::string binary_name = skipPathFromFilename(opt.binary_name.c_str());
+#ifdef DOCTEST_PLATFORM_WINDOWS
+            if(binary_name.rfind(".exe") != std::string::npos)
+                binary_name = binary_name.substr(0, binary_name.length() - 4);
+#endif // DOCTEST_PLATFORM_WINDOWS
+            xml.startElement("testsuites");
+            xml.startElement("testsuite").writeAttribute("name", binary_name)
+                    .writeAttribute("errors", testCaseData.totalErrors)
+                    .writeAttribute("failures", testCaseData.totalFailures)
+                    .writeAttribute("tests", p.numAsserts);
+            if(opt.no_time_in_output == false) {
+                xml.writeAttribute("time", testCaseData.totalSeconds);
+                xml.writeAttribute("timestamp", JUnitTestCaseData::getCurrentTimestamp());
+            }
+            if(opt.no_version == false)
+                xml.writeAttribute("doctest_version", DOCTEST_VERSION_STR);
+
+            for(const auto& testCase : testCaseData.testcases) {
+                xml.startElement("testcase")
+                    .writeAttribute("classname", testCase.classname)
+                    .writeAttribute("name", testCase.name);
+                if(opt.no_time_in_output == false)
+                    xml.writeAttribute("time", testCase.time);
+                // This is not ideal, but it should be enough to mimic gtest's junit output.
+                xml.writeAttribute("status", "run");
+
+                for(const auto& failure : testCase.failures) {
+                    xml.scopedElement("failure")
+                        .writeAttribute("message", failure.message)
+                        .writeAttribute("type", failure.type)
+                        .writeText(failure.details, false);
+                }
+
+                for(const auto& error : testCase.errors) {
+                    xml.scopedElement("error")
+                        .writeAttribute("message", error.message)
+                        .writeText(error.details);
+                }
+
+                xml.endElement();
+            }
+            xml.endElement();
+            xml.endElement();
+        }
+
+        void test_case_start(const TestCaseData& in) override {
+            testCaseData.add(skipPathFromFilename(in.m_file.c_str()), in.m_name);
+            timer.start();
+        }
+
+        void test_case_reenter(const TestCaseData& in) override {
+            testCaseData.addTime(timer.getElapsedSeconds());
+            testCaseData.appendSubcaseNamesToLastTestcase(deepestSubcaseStackNames);
+            deepestSubcaseStackNames.clear();
+
+            timer.start();
+            testCaseData.add(skipPathFromFilename(in.m_file.c_str()), in.m_name);
+        }
+
+        void test_case_end(const CurrentTestCaseStats&) override {
+            testCaseData.addTime(timer.getElapsedSeconds());
+            testCaseData.appendSubcaseNamesToLastTestcase(deepestSubcaseStackNames);
+            deepestSubcaseStackNames.clear();
+        }
+
+        void test_case_exception(const TestCaseException& e) override {
+            DOCTEST_LOCK_MUTEX(mutex)
+            testCaseData.addError("exception", e.error_string.c_str());
+        }
+
+        void subcase_start(const SubcaseSignature& in) override {
+            deepestSubcaseStackNames.push_back(in.m_name);
+        }
+
+        void subcase_end() override {}
+
+        void log_assert(const AssertData& rb) override {
+            if(!rb.m_failed) // report only failures & ignore the `success` option
+                return;
+
+            DOCTEST_LOCK_MUTEX(mutex)
+
+            std::ostringstream os;
+            os << skipPathFromFilename(rb.m_file) << (opt.gnu_file_line ? ":" : "(")
+              << line(rb.m_line) << (opt.gnu_file_line ? ":" : "):") << std::endl;
+
+            fulltext_log_assert_to_stream(os, rb);
+            log_contexts(os);
+            testCaseData.addFailure(rb.m_decomp.c_str(), assertString(rb.m_at), os.str());
+        }
+
+        void log_message(const MessageData& mb) override {
+            if(mb.m_severity & assertType::is_warn) // report only failures
+                return;
+
+            DOCTEST_LOCK_MUTEX(mutex)
+
+            std::ostringstream os;
+            os << skipPathFromFilename(mb.m_file) << (opt.gnu_file_line ? ":" : "(")
+              << line(mb.m_line) << (opt.gnu_file_line ? ":" : "):") << std::endl;
+
+            os << mb.m_string.c_str() << "\n";
+            log_contexts(os);
+
+            testCaseData.addFailure(mb.m_string.c_str(),
+                mb.m_severity & assertType::is_check ? "FAIL_CHECK" : "FAIL", os.str());
+        }
+
+        void test_case_skipped(const TestCaseData&) override {}
+
+        void log_contexts(std::ostringstream& s) {
+            int num_contexts = get_num_active_contexts();
+            if(num_contexts) {
+                auto contexts = get_active_contexts();
+
+                s << "  logged: ";
+                for(int i = 0; i < num_contexts; ++i) {
+                    s << (i == 0 ? "" : "          ");
+                    contexts[i]->stringify(&s);
+                    s << std::endl;
+                }
+            }
+        }
+    };
+
+    DOCTEST_REGISTER_REPORTER("junit", 0, JUnitReporter);
+
+    struct Whitespace
+    {
+        int nrSpaces;
+        explicit Whitespace(int nr)
+                : nrSpaces(nr) {}
+    };
+
+    std::ostream& operator<<(std::ostream& out, const Whitespace& ws) {
+        if(ws.nrSpaces != 0)
+            out << std::setw(ws.nrSpaces) << ' ';
+        return out;
+    }
+
+    struct ConsoleReporter : public IReporter
+    {
+        std::ostream&                 s;
+        bool                          hasLoggedCurrentTestStart;
+        std::vector<SubcaseSignature> subcasesStack;
+        size_t                        currentSubcaseLevel;
+        DOCTEST_DECLARE_MUTEX(mutex)
+
+        // caching pointers/references to objects of these types - safe to do
+        const ContextOptions& opt;
+        const TestCaseData*   tc;
+
+        ConsoleReporter(const ContextOptions& co)
+                : s(*co.cout)
+                , opt(co) {}
+
+        ConsoleReporter(const ContextOptions& co, std::ostream& ostr)
+                : s(ostr)
+                , opt(co) {}
+
+        // =========================================================================================
+        // WHAT FOLLOWS ARE HELPERS USED BY THE OVERRIDES OF THE VIRTUAL METHODS OF THE INTERFACE
+        // =========================================================================================
+
+        void separator_to_stream() {
+            s << Color::Yellow
+              << "==============================================================================="
+                 "\n";
+        }
+
+        const char* getSuccessOrFailString(bool success, assertType::Enum at,
+                                           const char* success_str) {
+            if(success)
+                return success_str;
+            return failureString(at);
+        }
+
+        Color::Enum getSuccessOrFailColor(bool success, assertType::Enum at) {
+            return success ? Color::BrightGreen :
+                             (at & assertType::is_warn) ? Color::Yellow : Color::Red;
+        }
+
+        void successOrFailColoredStringToStream(bool success, assertType::Enum at,
+                                                const char* success_str = "SUCCESS") {
+            s << getSuccessOrFailColor(success, at)
+              << getSuccessOrFailString(success, at, success_str) << ": ";
+        }
+
+        void log_contexts() {
+            int num_contexts = get_num_active_contexts();
+            if(num_contexts) {
+                auto contexts = get_active_contexts();
+
+                s << Color::None << "  logged: ";
+                for(int i = 0; i < num_contexts; ++i) {
+                    s << (i == 0 ? "" : "          ");
+                    contexts[i]->stringify(&s);
+                    s << "\n";
+                }
+            }
+
+            s << "\n";
+        }
+
+        // this was requested to be made virtual so users could override it
+        virtual void file_line_to_stream(const char* file, int line,
+                                        const char* tail = "") {
+            s << Color::LightGrey << skipPathFromFilename(file) << (opt.gnu_file_line ? ":" : "(")
+            << (opt.no_line_numbers ? 0 : line) // 0 or the real num depending on the option
+            << (opt.gnu_file_line ? ":" : "):") << tail;
+        }
+
+        void logTestStart() {
+            if(hasLoggedCurrentTestStart)
+                return;
+
+            separator_to_stream();
+            file_line_to_stream(tc->m_file.c_str(), tc->m_line, "\n");
+            if(tc->m_description)
+                s << Color::Yellow << "DESCRIPTION: " << Color::None << tc->m_description << "\n";
+            if(tc->m_test_suite && tc->m_test_suite[0] != '\0')
+                s << Color::Yellow << "TEST SUITE: " << Color::None << tc->m_test_suite << "\n";
+            if(strncmp(tc->m_name, "  Scenario:", 11) != 0)
+                s << Color::Yellow << "TEST CASE:  ";
+            s << Color::None << tc->m_name << "\n";
+
+            for(size_t i = 0; i < currentSubcaseLevel; ++i) {
+                if(subcasesStack[i].m_name[0] != '\0')
+                    s << "  " << subcasesStack[i].m_name << "\n";
+            }
+
+            if(currentSubcaseLevel != subcasesStack.size()) {
+                s << Color::Yellow << "\nDEEPEST SUBCASE STACK REACHED (DIFFERENT FROM THE CURRENT ONE):\n" << Color::None;
+                for(size_t i = 0; i < subcasesStack.size(); ++i) {
+                    if(subcasesStack[i].m_name[0] != '\0')
+                        s << "  " << subcasesStack[i].m_name << "\n";
+                }
+            }
+
+            s << "\n";
+
+            hasLoggedCurrentTestStart = true;
+        }
+
+        void printVersion() {
+            if(opt.no_version == false)
+                s << Color::Cyan << "[doctest] " << Color::None << "doctest version is \""
+                  << DOCTEST_VERSION_STR << "\"\n";
+        }
+
+        void printIntro() {
+            if(opt.no_intro == false) {
+                printVersion();
+                s << Color::Cyan << "[doctest] " << Color::None
+                  << "run with \"--" DOCTEST_OPTIONS_PREFIX_DISPLAY "help\" for options\n";
+            }
+        }
+
+        void printHelp() {
+            int sizePrefixDisplay = static_cast<int>(strlen(DOCTEST_OPTIONS_PREFIX_DISPLAY));
+            printVersion();
+            // clang-format off
+            s << Color::Cyan << "[doctest]\n" << Color::None;
+            s << Color::Cyan << "[doctest] " << Color::None;
+            s << "boolean values: \"1/on/yes/true\" or \"0/off/no/false\"\n";
+            s << Color::Cyan << "[doctest] " << Color::None;
+            s << "filter  values: \"str1,str2,str3\" (comma separated strings)\n";
+            s << Color::Cyan << "[doctest]\n" << Color::None;
+            s << Color::Cyan << "[doctest] " << Color::None;
+            s << "filters use wildcards for matching strings\n";
+            s << Color::Cyan << "[doctest] " << Color::None;
+            s << "something passes a filter if any of the strings in a filter matches\n";
+#ifndef DOCTEST_CONFIG_NO_UNPREFIXED_OPTIONS
+            s << Color::Cyan << "[doctest]\n" << Color::None;
+            s << Color::Cyan << "[doctest] " << Color::None;
+            s << "ALL FLAGS, OPTIONS AND FILTERS ALSO AVAILABLE WITH A \"" DOCTEST_CONFIG_OPTIONS_PREFIX "\" PREFIX!!!\n";
+#endif
+            s << Color::Cyan << "[doctest]\n" << Color::None;
+            s << Color::Cyan << "[doctest] " << Color::None;
+            s << "Query flags - the program quits after them. Available:\n\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "?,   --" DOCTEST_OPTIONS_PREFIX_DISPLAY "help, -" DOCTEST_OPTIONS_PREFIX_DISPLAY "h                      "
+              << Whitespace(sizePrefixDisplay*0) <<  "prints this message\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "v,   --" DOCTEST_OPTIONS_PREFIX_DISPLAY "version                       "
+              << Whitespace(sizePrefixDisplay*1) << "prints the version\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "c,   --" DOCTEST_OPTIONS_PREFIX_DISPLAY "count                         "
+              << Whitespace(sizePrefixDisplay*1) << "prints the number of matching tests\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "ltc, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "list-test-cases               "
+              << Whitespace(sizePrefixDisplay*1) << "lists all matching tests by name\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "lts, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "list-test-suites              "
+              << Whitespace(sizePrefixDisplay*1) << "lists all matching test suites\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "lr,  --" DOCTEST_OPTIONS_PREFIX_DISPLAY "list-reporters                "
+              << Whitespace(sizePrefixDisplay*1) << "lists all registered reporters\n\n";
+            // ================================================================================== << 79
+            s << Color::Cyan << "[doctest] " << Color::None;
+            s << "The available <int>/<string> options/filters are:\n\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "tc,  --" DOCTEST_OPTIONS_PREFIX_DISPLAY "test-case=<filters>           "
+              << Whitespace(sizePrefixDisplay*1) << "filters     tests by their name\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "tce, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "test-case-exclude=<filters>   "
+              << Whitespace(sizePrefixDisplay*1) << "filters OUT tests by their name\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "sf,  --" DOCTEST_OPTIONS_PREFIX_DISPLAY "source-file=<filters>         "
+              << Whitespace(sizePrefixDisplay*1) << "filters     tests by their file\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "sfe, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "source-file-exclude=<filters> "
+              << Whitespace(sizePrefixDisplay*1) << "filters OUT tests by their file\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "ts,  --" DOCTEST_OPTIONS_PREFIX_DISPLAY "test-suite=<filters>          "
+              << Whitespace(sizePrefixDisplay*1) << "filters     tests by their test suite\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "tse, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "test-suite-exclude=<filters>  "
+              << Whitespace(sizePrefixDisplay*1) << "filters OUT tests by their test suite\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "sc,  --" DOCTEST_OPTIONS_PREFIX_DISPLAY "subcase=<filters>             "
+              << Whitespace(sizePrefixDisplay*1) << "filters     subcases by their name\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "sce, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "subcase-exclude=<filters>     "
+              << Whitespace(sizePrefixDisplay*1) << "filters OUT subcases by their name\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "r,   --" DOCTEST_OPTIONS_PREFIX_DISPLAY "reporters=<filters>           "
+              << Whitespace(sizePrefixDisplay*1) << "reporters to use (console is default)\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "o,   --" DOCTEST_OPTIONS_PREFIX_DISPLAY "out=<string>                  "
+              << Whitespace(sizePrefixDisplay*1) << "output filename\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "ob,  --" DOCTEST_OPTIONS_PREFIX_DISPLAY "order-by=<string>             "
+              << Whitespace(sizePrefixDisplay*1) << "how the tests should be ordered\n";
+            s << Whitespace(sizePrefixDisplay*3) << "                                       <string> - [file/suite/name/rand/none]\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "rs,  --" DOCTEST_OPTIONS_PREFIX_DISPLAY "rand-seed=<int>               "
+              << Whitespace(sizePrefixDisplay*1) << "seed for random ordering\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "f,   --" DOCTEST_OPTIONS_PREFIX_DISPLAY "first=<int>                   "
+              << Whitespace(sizePrefixDisplay*1) << "the first test passing the filters to\n";
+            s << Whitespace(sizePrefixDisplay*3) << "                                       execute - for range-based execution\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "l,   --" DOCTEST_OPTIONS_PREFIX_DISPLAY "last=<int>                    "
+              << Whitespace(sizePrefixDisplay*1) << "the last test passing the filters to\n";
+            s << Whitespace(sizePrefixDisplay*3) << "                                       execute - for range-based execution\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "aa,  --" DOCTEST_OPTIONS_PREFIX_DISPLAY "abort-after=<int>             "
+              << Whitespace(sizePrefixDisplay*1) << "stop after <int> failed assertions\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "scfl,--" DOCTEST_OPTIONS_PREFIX_DISPLAY "subcase-filter-levels=<int>   "
+              << Whitespace(sizePrefixDisplay*1) << "apply filters for the first <int> levels\n";
+            s << Color::Cyan << "\n[doctest] " << Color::None;
+            s << "Bool options - can be used like flags and true is assumed. Available:\n\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "s,   --" DOCTEST_OPTIONS_PREFIX_DISPLAY "success=<bool>                "
+              << Whitespace(sizePrefixDisplay*1) << "include successful assertions in output\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "cs,  --" DOCTEST_OPTIONS_PREFIX_DISPLAY "case-sensitive=<bool>         "
+              << Whitespace(sizePrefixDisplay*1) << "filters being treated as case sensitive\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "e,   --" DOCTEST_OPTIONS_PREFIX_DISPLAY "exit=<bool>                   "
+              << Whitespace(sizePrefixDisplay*1) << "exits after the tests finish\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "d,   --" DOCTEST_OPTIONS_PREFIX_DISPLAY "duration=<bool>               "
+              << Whitespace(sizePrefixDisplay*1) << "prints the time duration of each test\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "m,   --" DOCTEST_OPTIONS_PREFIX_DISPLAY "minimal=<bool>                "
+              << Whitespace(sizePrefixDisplay*1) << "minimal console output (only failures)\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "q,   --" DOCTEST_OPTIONS_PREFIX_DISPLAY "quiet=<bool>                  "
+              << Whitespace(sizePrefixDisplay*1) << "no console output\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "nt,  --" DOCTEST_OPTIONS_PREFIX_DISPLAY "no-throw=<bool>               "
+              << Whitespace(sizePrefixDisplay*1) << "skips exceptions-related assert checks\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "ne,  --" DOCTEST_OPTIONS_PREFIX_DISPLAY "no-exitcode=<bool>            "
+              << Whitespace(sizePrefixDisplay*1) << "returns (or exits) always with success\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "nr,  --" DOCTEST_OPTIONS_PREFIX_DISPLAY "no-run=<bool>                 "
+              << Whitespace(sizePrefixDisplay*1) << "skips all runtime doctest operations\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "ni,  --" DOCTEST_OPTIONS_PREFIX_DISPLAY "no-intro=<bool>               "
+              << Whitespace(sizePrefixDisplay*1) << "omit the framework intro in the output\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "nv,  --" DOCTEST_OPTIONS_PREFIX_DISPLAY "no-version=<bool>             "
+              << Whitespace(sizePrefixDisplay*1) << "omit the framework version in the output\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "nc,  --" DOCTEST_OPTIONS_PREFIX_DISPLAY "no-colors=<bool>              "
+              << Whitespace(sizePrefixDisplay*1) << "disables colors in output\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "fc,  --" DOCTEST_OPTIONS_PREFIX_DISPLAY "force-colors=<bool>           "
+              << Whitespace(sizePrefixDisplay*1) << "use colors even when not in a tty\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "nb,  --" DOCTEST_OPTIONS_PREFIX_DISPLAY "no-breaks=<bool>              "
+              << Whitespace(sizePrefixDisplay*1) << "disables breakpoints in debuggers\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "ns,  --" DOCTEST_OPTIONS_PREFIX_DISPLAY "no-skip=<bool>                "
+              << Whitespace(sizePrefixDisplay*1) << "don't skip test cases marked as skip\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "gfl, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "gnu-file-line=<bool>          "
+              << Whitespace(sizePrefixDisplay*1) << ":n: vs (n): for line numbers in output\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "npf, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "no-path-filenames=<bool>      "
+              << Whitespace(sizePrefixDisplay*1) << "only filenames and no paths in output\n";
+            s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "nln, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "no-line-numbers=<bool>        "
+              << Whitespace(sizePrefixDisplay*1) << "0 instead of real line numbers in output\n";
+            // ================================================================================== << 79
+            // clang-format on
+
+            s << Color::Cyan << "\n[doctest] " << Color::None;
+            s << "for more information visit the project documentation\n\n";
+        }
+
+        void printRegisteredReporters() {
+            printVersion();
+            auto printReporters = [this] (const reporterMap& reporters, const char* type) {
+                if(reporters.size()) {
+                    s << Color::Cyan << "[doctest] " << Color::None << "listing all registered " << type << "\n";
+                    for(auto& curr : reporters)
+                        s << "priority: " << std::setw(5) << curr.first.first
+                          << " name: " << curr.first.second << "\n";
+                }
+            };
+            printReporters(getListeners(), "listeners");
+            printReporters(getReporters(), "reporters");
+        }
+
+        // =========================================================================================
+        // WHAT FOLLOWS ARE OVERRIDES OF THE VIRTUAL METHODS OF THE REPORTER INTERFACE
+        // =========================================================================================
+
+        void report_query(const QueryData& in) override {
+            if(opt.version) {
+                printVersion();
+            } else if(opt.help) {
+                printHelp();
+            } else if(opt.list_reporters) {
+                printRegisteredReporters();
+            } else if(opt.count || opt.list_test_cases) {
+                if(opt.list_test_cases) {
+                    s << Color::Cyan << "[doctest] " << Color::None
+                      << "listing all test case names\n";
+                    separator_to_stream();
+                }
+
+                for(unsigned i = 0; i < in.num_data; ++i)
+                    s << Color::None << in.data[i]->m_name << "\n";
+
+                separator_to_stream();
+
+                s << Color::Cyan << "[doctest] " << Color::None
+                  << "unskipped test cases passing the current filters: "
+                  << g_cs->numTestCasesPassingFilters << "\n";
+
+            } else if(opt.list_test_suites) {
+                s << Color::Cyan << "[doctest] " << Color::None << "listing all test suites\n";
+                separator_to_stream();
+
+                for(unsigned i = 0; i < in.num_data; ++i)
+                    s << Color::None << in.data[i]->m_test_suite << "\n";
+
+                separator_to_stream();
+
+                s << Color::Cyan << "[doctest] " << Color::None
+                  << "unskipped test cases passing the current filters: "
+                  << g_cs->numTestCasesPassingFilters << "\n";
+                s << Color::Cyan << "[doctest] " << Color::None
+                  << "test suites with unskipped test cases passing the current filters: "
+                  << g_cs->numTestSuitesPassingFilters << "\n";
+            }
+        }
+
+        void test_run_start() override {
+            if(!opt.minimal)
+                printIntro();
+        }
+
+        void test_run_end(const TestRunStats& p) override {
+            if(opt.minimal && p.numTestCasesFailed == 0)
+                return;
+
+            separator_to_stream();
+            s << std::dec;
+
+            auto totwidth = int(std::ceil(log10(static_cast<double>(std::max(p.numTestCasesPassingFilters, static_cast<unsigned>(p.numAsserts))) + 1)));
+            auto passwidth = int(std::ceil(log10(static_cast<double>(std::max(p.numTestCasesPassingFilters - p.numTestCasesFailed, static_cast<unsigned>(p.numAsserts - p.numAssertsFailed))) + 1)));
+            auto failwidth = int(std::ceil(log10(static_cast<double>(std::max(p.numTestCasesFailed, static_cast<unsigned>(p.numAssertsFailed))) + 1)));
+            const bool anythingFailed = p.numTestCasesFailed > 0 || p.numAssertsFailed > 0;
+            s << Color::Cyan << "[doctest] " << Color::None << "test cases: " << std::setw(totwidth)
+              << p.numTestCasesPassingFilters << " | "
+              << ((p.numTestCasesPassingFilters == 0 || anythingFailed) ? Color::None :
+                                                                          Color::Green)
+              << std::setw(passwidth) << p.numTestCasesPassingFilters - p.numTestCasesFailed << " passed"
+              << Color::None << " | " << (p.numTestCasesFailed > 0 ? Color::Red : Color::None)
+              << std::setw(failwidth) << p.numTestCasesFailed << " failed" << Color::None << " |";
+            if(opt.no_skipped_summary == false) {
+                const int numSkipped = p.numTestCases - p.numTestCasesPassingFilters;
+                s << " " << (numSkipped == 0 ? Color::None : Color::Yellow) << numSkipped
+                  << " skipped" << Color::None;
+            }
+            s << "\n";
+            s << Color::Cyan << "[doctest] " << Color::None << "assertions: " << std::setw(totwidth)
+              << p.numAsserts << " | "
+              << ((p.numAsserts == 0 || anythingFailed) ? Color::None : Color::Green)
+              << std::setw(passwidth) << (p.numAsserts - p.numAssertsFailed) << " passed" << Color::None
+              << " | " << (p.numAssertsFailed > 0 ? Color::Red : Color::None) << std::setw(failwidth)
+              << p.numAssertsFailed << " failed" << Color::None << " |\n";
+            s << Color::Cyan << "[doctest] " << Color::None
+              << "Status: " << (p.numTestCasesFailed > 0 ? Color::Red : Color::Green)
+              << ((p.numTestCasesFailed > 0) ? "FAILURE!" : "SUCCESS!") << Color::None << std::endl;
+        }
+
+        void test_case_start(const TestCaseData& in) override {
+            hasLoggedCurrentTestStart = false;
+            tc                        = &in;
+            subcasesStack.clear();
+            currentSubcaseLevel = 0;
+        }
+
+        void test_case_reenter(const TestCaseData&) override {
+            subcasesStack.clear();
+        }
+
+        void test_case_end(const CurrentTestCaseStats& st) override {
+            if(tc->m_no_output)
+                return;
+
+            // log the preamble of the test case only if there is something
+            // else to print - something other than that an assert has failed
+            if(opt.duration ||
+               (st.failure_flags && st.failure_flags != static_cast<int>(TestCaseFailureReason::AssertFailure)))
+                logTestStart();
+
+            if(opt.duration)
+                s << Color::None << std::setprecision(6) << std::fixed << st.seconds
+                  << " s: " << tc->m_name << "\n";
+
+            if(st.failure_flags & TestCaseFailureReason::Timeout)
+                s << Color::Red << "Test case exceeded time limit of " << std::setprecision(6)
+                  << std::fixed << tc->m_timeout << "!\n";
+
+            if(st.failure_flags & TestCaseFailureReason::ShouldHaveFailedButDidnt) {
+                s << Color::Red << "Should have failed but didn't! Marking it as failed!\n";
+            } else if(st.failure_flags & TestCaseFailureReason::ShouldHaveFailedAndDid) {
+                s << Color::Yellow << "Failed as expected so marking it as not failed\n";
+            } else if(st.failure_flags & TestCaseFailureReason::CouldHaveFailedAndDid) {
+                s << Color::Yellow << "Allowed to fail so marking it as not failed\n";
+            } else if(st.failure_flags & TestCaseFailureReason::DidntFailExactlyNumTimes) {
+                s << Color::Red << "Didn't fail exactly " << tc->m_expected_failures
+                  << " times so marking it as failed!\n";
+            } else if(st.failure_flags & TestCaseFailureReason::FailedExactlyNumTimes) {
+                s << Color::Yellow << "Failed exactly " << tc->m_expected_failures
+                  << " times as expected so marking it as not failed!\n";
+            }
+            if(st.failure_flags & TestCaseFailureReason::TooManyFailedAsserts) {
+                s << Color::Red << "Aborting - too many failed asserts!\n";
+            }
+            s << Color::None; // lgtm [cpp/useless-expression]
+        }
+
+        void test_case_exception(const TestCaseException& e) override {
+            DOCTEST_LOCK_MUTEX(mutex)
+            if(tc->m_no_output)
+                return;
+
+            logTestStart();
+
+            file_line_to_stream(tc->m_file.c_str(), tc->m_line, " ");
+            successOrFailColoredStringToStream(false, e.is_crash ? assertType::is_require :
+                                                                   assertType::is_check);
+            s << Color::Red << (e.is_crash ? "test case CRASHED: " : "test case THREW exception: ")
+              << Color::Cyan << e.error_string << "\n";
+
+            int num_stringified_contexts = get_num_stringified_contexts();
+            if(num_stringified_contexts) {
+                auto stringified_contexts = get_stringified_contexts();
+                s << Color::None << "  logged: ";
+                for(int i = num_stringified_contexts; i > 0; --i) {
+                    s << (i == num_stringified_contexts ? "" : "          ")
+                      << stringified_contexts[i - 1] << "\n";
+                }
+            }
+            s << "\n" << Color::None;
+        }
+
+        void subcase_start(const SubcaseSignature& subc) override {
+            subcasesStack.push_back(subc);
+            ++currentSubcaseLevel;
+            hasLoggedCurrentTestStart = false;
+        }
+
+        void subcase_end() override {
+            --currentSubcaseLevel;
+            hasLoggedCurrentTestStart = false;
+        }
+
+        void log_assert(const AssertData& rb) override {
+            if((!rb.m_failed && !opt.success) || tc->m_no_output)
+                return;
+
+            DOCTEST_LOCK_MUTEX(mutex)
+
+            logTestStart();
+
+            file_line_to_stream(rb.m_file, rb.m_line, " ");
+            successOrFailColoredStringToStream(!rb.m_failed, rb.m_at);
+
+            fulltext_log_assert_to_stream(s, rb);
+
+            log_contexts();
+        }
+
+        void log_message(const MessageData& mb) override {
+            if(tc->m_no_output)
+                return;
+
+            DOCTEST_LOCK_MUTEX(mutex)
+
+            logTestStart();
+
+            file_line_to_stream(mb.m_file, mb.m_line, " ");
+            s << getSuccessOrFailColor(false, mb.m_severity)
+              << getSuccessOrFailString(mb.m_severity & assertType::is_warn, mb.m_severity,
+                                        "MESSAGE") << ": ";
+            s << Color::None << mb.m_string << "\n";
+            log_contexts();
+        }
+
+        void test_case_skipped(const TestCaseData&) override {}
+    };
+
+    DOCTEST_REGISTER_REPORTER("console", 0, ConsoleReporter);
+
+#ifdef DOCTEST_PLATFORM_WINDOWS
+    struct DebugOutputWindowReporter : public ConsoleReporter
+    {
+        DOCTEST_THREAD_LOCAL static std::ostringstream oss;
+
+        DebugOutputWindowReporter(const ContextOptions& co)
+                : ConsoleReporter(co, oss) {}
+
+#define DOCTEST_DEBUG_OUTPUT_REPORTER_OVERRIDE(func, type, arg)                                    \
+    void func(type arg) override {                                                                 \
+        bool with_col = g_no_colors;                                                               \
+        g_no_colors   = false;                                                                     \
+        ConsoleReporter::func(arg);                                                                \
+        if(oss.tellp() != std::streampos{}) {                                                      \
+            DOCTEST_OUTPUT_DEBUG_STRING(oss.str().c_str());                                        \
+            oss.str("");                                                                           \
+        }                                                                                          \
+        g_no_colors = with_col;                                                                    \
+    }
+
+        DOCTEST_DEBUG_OUTPUT_REPORTER_OVERRIDE(test_run_start, DOCTEST_EMPTY, DOCTEST_EMPTY)
+        DOCTEST_DEBUG_OUTPUT_REPORTER_OVERRIDE(test_run_end, const TestRunStats&, in)
+        DOCTEST_DEBUG_OUTPUT_REPORTER_OVERRIDE(test_case_start, const TestCaseData&, in)
+        DOCTEST_DEBUG_OUTPUT_REPORTER_OVERRIDE(test_case_reenter, const TestCaseData&, in)
+        DOCTEST_DEBUG_OUTPUT_REPORTER_OVERRIDE(test_case_end, const CurrentTestCaseStats&, in)
+        DOCTEST_DEBUG_OUTPUT_REPORTER_OVERRIDE(test_case_exception, const TestCaseException&, in)
+        DOCTEST_DEBUG_OUTPUT_REPORTER_OVERRIDE(subcase_start, const SubcaseSignature&, in)
+        DOCTEST_DEBUG_OUTPUT_REPORTER_OVERRIDE(subcase_end, DOCTEST_EMPTY, DOCTEST_EMPTY)
+        DOCTEST_DEBUG_OUTPUT_REPORTER_OVERRIDE(log_assert, const AssertData&, in)
+        DOCTEST_DEBUG_OUTPUT_REPORTER_OVERRIDE(log_message, const MessageData&, in)
+        DOCTEST_DEBUG_OUTPUT_REPORTER_OVERRIDE(test_case_skipped, const TestCaseData&, in)
+    };
+
+    DOCTEST_THREAD_LOCAL std::ostringstream DebugOutputWindowReporter::oss;
+#endif // DOCTEST_PLATFORM_WINDOWS
+
+    // the implementation of parseOption()
+    bool parseOptionImpl(int argc, const char* const* argv, const char* pattern, String* value) {
+        // going from the end to the beginning and stopping on the first occurrence from the end
+        for(int i = argc; i > 0; --i) {
+            auto index = i - 1;
+            auto temp = std::strstr(argv[index], pattern);
+            if(temp && (value || strlen(temp) == strlen(pattern))) { //!OCLINT prefer early exits and continue
+                // eliminate matches in which the chars before the option are not '-'
+                bool noBadCharsFound = true;
+                auto curr            = argv[index];
+                while(curr != temp) {
+                    if(*curr++ != '-') {
+                        noBadCharsFound = false;
+                        break;
+                    }
+                }
+                if(noBadCharsFound && argv[index][0] == '-') {
+                    if(value) {
+                        // parsing the value of an option
+                        temp += strlen(pattern);
+                        const unsigned len = strlen(temp);
+                        if(len) {
+                            *value = temp;
+                            return true;
+                        }
+                    } else {
+                        // just a flag - no value
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    // parses an option and returns the string after the '=' character
+    bool parseOption(int argc, const char* const* argv, const char* pattern, String* value = nullptr,
+                     const String& defaultVal = String()) {
+        if(value)
+            *value = defaultVal;
+#ifndef DOCTEST_CONFIG_NO_UNPREFIXED_OPTIONS
+        // offset (normally 3 for "dt-") to skip prefix
+        if(parseOptionImpl(argc, argv, pattern + strlen(DOCTEST_CONFIG_OPTIONS_PREFIX), value))
+            return true;
+#endif // DOCTEST_CONFIG_NO_UNPREFIXED_OPTIONS
+        return parseOptionImpl(argc, argv, pattern, value);
+    }
+
+    // locates a flag on the command line
+    bool parseFlag(int argc, const char* const* argv, const char* pattern) {
+        return parseOption(argc, argv, pattern);
+    }
+
+    // parses a comma separated list of words after a pattern in one of the arguments in argv
+    bool parseCommaSepArgs(int argc, const char* const* argv, const char* pattern,
+                           std::vector<String>& res) {
+        String filtersString;
+        if(parseOption(argc, argv, pattern, &filtersString)) {
+            // tokenize with "," as a separator, unless escaped with backslash
+            std::ostringstream s;
+            auto flush = [&s, &res]() {
+                auto string = s.str();
+                if(string.size() > 0) {
+                    res.push_back(string.c_str());
+                }
+                s.str("");
+            };
+
+            bool seenBackslash = false;
+            const char* current = filtersString.c_str();
+            const char* end = current + strlen(current);
+            while(current != end) {
+                char character = *current++;
+                if(seenBackslash) {
+                    seenBackslash = false;
+                    if(character == ',' || character == '\\') {
+                        s.put(character);
+                        continue;
+                    }
+                    s.put('\\');
+                }
+                if(character == '\\') {
+                    seenBackslash = true;
+                } else if(character == ',') {
+                    flush();
+                } else {
+                    s.put(character);
+                }
+            }
+
+            if(seenBackslash) {
+                s.put('\\');
+            }
+            flush();
+            return true;
+        }
+        return false;
+    }
+
+    enum optionType
+    {
+        option_bool,
+        option_int
+    };
+
+    // parses an int/bool option from the command line
+    bool parseIntOption(int argc, const char* const* argv, const char* pattern, optionType type,
+                        int& res) {
+        String parsedValue;
+        if(!parseOption(argc, argv, pattern, &parsedValue))
+            return false;
+
+        if(type) {
+            // integer
+            // TODO: change this to use std::stoi or something else! currently it uses undefined behavior - assumes '0' on failed parse...
+            int theInt = std::atoi(parsedValue.c_str());
+            if (theInt != 0) {
+                res = theInt; //!OCLINT parameter reassignment
+                return true;
+            }
+        } else {
+            // boolean
+            const char positive[][5] = { "1", "true", "on", "yes" };  // 5 - strlen("true") + 1
+            const char negative[][6] = { "0", "false", "off", "no" }; // 6 - strlen("false") + 1
+
+            // if the value matches any of the positive/negative possibilities
+            for (unsigned i = 0; i < 4; i++) {
+                if (parsedValue.compare(positive[i], true) == 0) {
+                    res = 1; //!OCLINT parameter reassignment
+                    return true;
+                }
+                if (parsedValue.compare(negative[i], true) == 0) {
+                    res = 0; //!OCLINT parameter reassignment
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+} // namespace
+
+Context::Context(int argc, const char* const* argv)
+        : p(new detail::ContextState) {
+    parseArgs(argc, argv, true);
+    if(argc)
+        p->binary_name = argv[0];
+}
+
+Context::~Context() {
+    if(g_cs == p)
+        g_cs = nullptr;
+    delete p;
+}
+
+void Context::applyCommandLine(int argc, const char* const* argv) {
+    parseArgs(argc, argv);
+    if(argc)
+        p->binary_name = argv[0];
+}
+
+// parses args
+void Context::parseArgs(int argc, const char* const* argv, bool withDefaults) {
+    using namespace detail;
+
+    // clang-format off
+    parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "source-file=",        p->filters[0]);
+    parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "sf=",                 p->filters[0]);
+    parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "source-file-exclude=",p->filters[1]);
+    parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "sfe=",                p->filters[1]);
+    parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "test-suite=",         p->filters[2]);
+    parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "ts=",                 p->filters[2]);
+    parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "test-suite-exclude=", p->filters[3]);
+    parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "tse=",                p->filters[3]);
+    parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "test-case=",          p->filters[4]);
+    parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "tc=",                 p->filters[4]);
+    parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "test-case-exclude=",  p->filters[5]);
+    parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "tce=",                p->filters[5]);
+    parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "subcase=",            p->filters[6]);
+    parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "sc=",                 p->filters[6]);
+    parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "subcase-exclude=",    p->filters[7]);
+    parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "sce=",                p->filters[7]);
+    parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "reporters=",          p->filters[8]);
+    parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "r=",                  p->filters[8]);
+    // clang-format on
+
+    int    intRes = 0;
+    String strRes;
+
+#define DOCTEST_PARSE_AS_BOOL_OR_FLAG(name, sname, var, default)                                   \
+    if(parseIntOption(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX name "=", option_bool, intRes) ||  \
+       parseIntOption(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX sname "=", option_bool, intRes))   \
+        p->var = static_cast<bool>(intRes);                                                        \
+    else if(parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX name) ||                           \
+            parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX sname))                            \
+        p->var = true;                                                                             \
+    else if(withDefaults)                                                                          \
+    p->var = default
+
+#define DOCTEST_PARSE_INT_OPTION(name, sname, var, default)                                        \
+    if(parseIntOption(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX name "=", option_int, intRes) ||   \
+       parseIntOption(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX sname "=", option_int, intRes))    \
+        p->var = intRes;                                                                           \
+    else if(withDefaults)                                                                          \
+    p->var = default
+
+#define DOCTEST_PARSE_STR_OPTION(name, sname, var, default)                                        \
+    if(parseOption(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX name "=", &strRes, default) ||        \
+       parseOption(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX sname "=", &strRes, default) ||       \
+       withDefaults)                                                                               \
+    p->var = strRes
+
+    // clang-format off
+    DOCTEST_PARSE_STR_OPTION("out", "o", out, "");
+    DOCTEST_PARSE_STR_OPTION("order-by", "ob", order_by, "file");
+    DOCTEST_PARSE_INT_OPTION("rand-seed", "rs", rand_seed, 0);
+
+    DOCTEST_PARSE_INT_OPTION("first", "f", first, 0);
+    DOCTEST_PARSE_INT_OPTION("last", "l", last, UINT_MAX);
+
+    DOCTEST_PARSE_INT_OPTION("abort-after", "aa", abort_after, 0);
+    DOCTEST_PARSE_INT_OPTION("subcase-filter-levels", "scfl", subcase_filter_levels, INT_MAX);
+
+    DOCTEST_PARSE_AS_BOOL_OR_FLAG("success", "s", success, false);
+    DOCTEST_PARSE_AS_BOOL_OR_FLAG("case-sensitive", "cs", case_sensitive, false);
+    DOCTEST_PARSE_AS_BOOL_OR_FLAG("exit", "e", exit, false);
+    DOCTEST_PARSE_AS_BOOL_OR_FLAG("duration", "d", duration, false);
+    DOCTEST_PARSE_AS_BOOL_OR_FLAG("minimal", "m", minimal, false);
+    DOCTEST_PARSE_AS_BOOL_OR_FLAG("quiet", "q", quiet, false);
+    DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-throw", "nt", no_throw, false);
+    DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-exitcode", "ne", no_exitcode, false);
+    DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-run", "nr", no_run, false);
+    DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-intro", "ni", no_intro, false);
+    DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-version", "nv", no_version, false);
+    DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-colors", "nc", no_colors, false);
+    DOCTEST_PARSE_AS_BOOL_OR_FLAG("force-colors", "fc", force_colors, false);
+    DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-breaks", "nb", no_breaks, false);
+    DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-skip", "ns", no_skip, false);
+    DOCTEST_PARSE_AS_BOOL_OR_FLAG("gnu-file-line", "gfl", gnu_file_line, !bool(DOCTEST_MSVC));
+    DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-path-filenames", "npf", no_path_in_filenames, false);
+    DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-line-numbers", "nln", no_line_numbers, false);
+    DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-debug-output", "ndo", no_debug_output, false);
+    DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-skipped-summary", "nss", no_skipped_summary, false);
+    DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-time-in-output", "ntio", no_time_in_output, false);
+    // clang-format on
+
+    if(withDefaults) {
+        p->help             = false;
+        p->version          = false;
+        p->count            = false;
+        p->list_test_cases  = false;
+        p->list_test_suites = false;
+        p->list_reporters   = false;
+    }
+    if(parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "help") ||
+       parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "h") ||
+       parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "?")) {
+        p->help = true;
+        p->exit = true;
+    }
+    if(parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "version") ||
+       parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "v")) {
+        p->version = true;
+        p->exit    = true;
+    }
+    if(parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "count") ||
+       parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "c")) {
+        p->count = true;
+        p->exit  = true;
+    }
+    if(parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "list-test-cases") ||
+       parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "ltc")) {
+        p->list_test_cases = true;
+        p->exit            = true;
+    }
+    if(parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "list-test-suites") ||
+       parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "lts")) {
+        p->list_test_suites = true;
+        p->exit             = true;
+    }
+    if(parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "list-reporters") ||
+       parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "lr")) {
+        p->list_reporters = true;
+        p->exit           = true;
+    }
+}
+
+// allows the user to add procedurally to the filters from the command line
+void Context::addFilter(const char* filter, const char* value) { setOption(filter, value); }
+
+// allows the user to clear all filters from the command line
+void Context::clearFilters() {
+    for(auto& curr : p->filters)
+        curr.clear();
+}
+
+// allows the user to override procedurally the bool options from the command line
+void Context::setOption(const char* option, bool value) {
+    setOption(option, value ? "true" : "false");
+}
+
+// allows the user to override procedurally the int options from the command line
+void Context::setOption(const char* option, int value) {
+    setOption(option, toString(value).c_str());
+}
+
+// allows the user to override procedurally the string options from the command line
+void Context::setOption(const char* option, const char* value) {
+    auto argv   = String("-") + option + "=" + value;
+    auto lvalue = argv.c_str();
+    parseArgs(1, &lvalue);
+}
+
+// users should query this in their main() and exit the program if true
+bool Context::shouldExit() { return p->exit; }
+
+void Context::setAsDefaultForAssertsOutOfTestCases() { g_cs = p; }
+
+void Context::setAssertHandler(detail::assert_handler ah) { p->ah = ah; }
+
+void Context::setCout(std::ostream* out) { p->cout = out; }
+
+static class DiscardOStream : public std::ostream
+{
+private:
+    class : public std::streambuf
+    {
+    private:
+        // allowing some buffering decreases the amount of calls to overflow
+        char buf[1024];
+
+    protected:
+        std::streamsize xsputn(const char_type*, std::streamsize count) override { return count; }
+
+        int_type overflow(int_type ch) override {
+            setp(std::begin(buf), std::end(buf));
+            return traits_type::not_eof(ch);
+        }
+    } discardBuf;
+
+public:
+    DiscardOStream()
+            : std::ostream(&discardBuf) {}
+} discardOut;
+
+// the main function that does all the filtering and test running
+int Context::run() {
+    using namespace detail;
+
+    // save the old context state in case such was setup - for using asserts out of a testing context
+    auto old_cs = g_cs;
+    // this is the current contest
+    g_cs               = p;
+    is_running_in_test = true;
+
+    g_no_colors = p->no_colors;
+    p->resetRunData();
+
+    std::fstream fstr;
+    if(p->cout == nullptr) {
+        if(p->quiet) {
+            p->cout = &discardOut;
+        } else if(p->out.size()) {
+            // to a file if specified
+            fstr.open(p->out.c_str(), std::fstream::out);
+            p->cout = &fstr;
+        } else {
+#ifndef DOCTEST_CONFIG_NO_INCLUDE_IOSTREAM
+            // stdout by default
+            p->cout = &std::cout;
+#else // DOCTEST_CONFIG_NO_INCLUDE_IOSTREAM
+            return EXIT_FAILURE;
+#endif // DOCTEST_CONFIG_NO_INCLUDE_IOSTREAM
+        }
+    }
+
+    FatalConditionHandler::allocateAltStackMem();
+
+    auto cleanup_and_return = [&]() {
+        FatalConditionHandler::freeAltStackMem();
+
+        if(fstr.is_open())
+            fstr.close();
+
+        // restore context
+        g_cs               = old_cs;
+        is_running_in_test = false;
+
+        // we have to free the reporters which were allocated when the run started
+        for(auto& curr : p->reporters_currently_used)
+            delete curr;
+        p->reporters_currently_used.clear();
+
+        if(p->numTestCasesFailed && !p->no_exitcode)
+            return EXIT_FAILURE;
+        return EXIT_SUCCESS;
+    };
+
+    // setup default reporter if none is given through the command line
+    if(p->filters[8].empty())
+        p->filters[8].push_back("console");
+
+    // check to see if any of the registered reporters has been selected
+    for(auto& curr : getReporters()) {
+        if(matchesAny(curr.first.second.c_str(), p->filters[8], false, p->case_sensitive))
+            p->reporters_currently_used.push_back(curr.second(*g_cs));
+    }
+
+    // TODO: check if there is nothing in reporters_currently_used
+
+    // prepend all listeners
+    for(auto& curr : getListeners())
+        p->reporters_currently_used.insert(p->reporters_currently_used.begin(), curr.second(*g_cs));
+
+#ifdef DOCTEST_PLATFORM_WINDOWS
+    if(isDebuggerActive() && p->no_debug_output == false)
+        p->reporters_currently_used.push_back(new DebugOutputWindowReporter(*g_cs));
+#endif // DOCTEST_PLATFORM_WINDOWS
+
+    // handle version, help and no_run
+    if(p->no_run || p->version || p->help || p->list_reporters) {
+        DOCTEST_ITERATE_THROUGH_REPORTERS(report_query, QueryData());
+
+        return cleanup_and_return();
+    }
+
+    std::vector<const TestCase*> testArray;
+    for(auto& curr : getRegisteredTests())
+        testArray.push_back(&curr);
+    p->numTestCases = testArray.size();
+
+    // sort the collected records
+    if(!testArray.empty()) {
+        if(p->order_by.compare("file", true) == 0) {
+            std::sort(testArray.begin(), testArray.end(), fileOrderComparator);
+        } else if(p->order_by.compare("suite", true) == 0) {
+            std::sort(testArray.begin(), testArray.end(), suiteOrderComparator);
+        } else if(p->order_by.compare("name", true) == 0) {
+            std::sort(testArray.begin(), testArray.end(), nameOrderComparator);
+        } else if(p->order_by.compare("rand", true) == 0) {
+            std::srand(p->rand_seed);
+
+            // random_shuffle implementation
+            const auto first = &testArray[0];
+            for(size_t i = testArray.size() - 1; i > 0; --i) {
+                int idxToSwap = std::rand() % (i + 1);
+
+                const auto temp = first[i];
+
+                first[i]         = first[idxToSwap];
+                first[idxToSwap] = temp;
+            }
+        } else if(p->order_by.compare("none", true) == 0) {
+            // means no sorting - beneficial for death tests which call into the executable
+            // with a specific test case in mind - we don't want to slow down the startup times
+        }
+    }
+
+    std::set<String> testSuitesPassingFilt;
+
+    bool                             query_mode = p->count || p->list_test_cases || p->list_test_suites;
+    std::vector<const TestCaseData*> queryResults;
+
+    if(!query_mode)
+        DOCTEST_ITERATE_THROUGH_REPORTERS(test_run_start, DOCTEST_EMPTY);
+
+    // invoke the registered functions if they match the filter criteria (or just count them)
+    for(auto& curr : testArray) {
+        const auto& tc = *curr;
+
+        bool skip_me = false;
+        if(tc.m_skip && !p->no_skip)
+            skip_me = true;
+
+        if(!matchesAny(tc.m_file.c_str(), p->filters[0], true, p->case_sensitive))
+            skip_me = true;
+        if(matchesAny(tc.m_file.c_str(), p->filters[1], false, p->case_sensitive))
+            skip_me = true;
+        if(!matchesAny(tc.m_test_suite, p->filters[2], true, p->case_sensitive))
+            skip_me = true;
+        if(matchesAny(tc.m_test_suite, p->filters[3], false, p->case_sensitive))
+            skip_me = true;
+        if(!matchesAny(tc.m_name, p->filters[4], true, p->case_sensitive))
+            skip_me = true;
+        if(matchesAny(tc.m_name, p->filters[5], false, p->case_sensitive))
+            skip_me = true;
+
+        if(!skip_me)
+            p->numTestCasesPassingFilters++;
+
+        // skip the test if it is not in the execution range
+        if((p->last < p->numTestCasesPassingFilters && p->first <= p->last) ||
+           (p->first > p->numTestCasesPassingFilters))
+            skip_me = true;
+
+        if(skip_me) {
+            if(!query_mode)
+                DOCTEST_ITERATE_THROUGH_REPORTERS(test_case_skipped, tc);
+            continue;
+        }
+
+        // do not execute the test if we are to only count the number of filter passing tests
+        if(p->count)
+            continue;
+
+        // print the name of the test and don't execute it
+        if(p->list_test_cases) {
+            queryResults.push_back(&tc);
+            continue;
+        }
+
+        // print the name of the test suite if not done already and don't execute it
+        if(p->list_test_suites) {
+            if((testSuitesPassingFilt.count(tc.m_test_suite) == 0) && tc.m_test_suite[0] != '\0') {
+                queryResults.push_back(&tc);
+                testSuitesPassingFilt.insert(tc.m_test_suite);
+                p->numTestSuitesPassingFilters++;
+            }
+            continue;
+        }
+
+        // execute the test if it passes all the filtering
+        {
+            p->currentTest = &tc;
+
+            p->failure_flags = TestCaseFailureReason::None;
+            p->seconds       = 0;
+
+            // reset atomic counters
+            p->numAssertsFailedCurrentTest_atomic = 0;
+            p->numAssertsCurrentTest_atomic       = 0;
+
+            p->fullyTraversedSubcases.clear();
+
+            DOCTEST_ITERATE_THROUGH_REPORTERS(test_case_start, tc);
+
+            p->timer.start();
+
+            bool run_test = true;
+
+            do {
+                // reset some of the fields for subcases (except for the set of fully passed ones)
+                p->reachedLeaf = false;
+                // May not be empty if previous subcase exited via exception.
+                p->subcaseStack.clear();
+                p->currentSubcaseDepth = 0;
+
+                p->shouldLogCurrentException = true;
+
+                // reset stuff for logging with INFO()
+                p->stringifiedContexts.clear();
+
+#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS
+                try {
+#endif // DOCTEST_CONFIG_NO_EXCEPTIONS
+// MSVC 2015 diagnoses fatalConditionHandler as unused (because reset() is a static method)
+DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4101) // unreferenced local variable
+                    FatalConditionHandler fatalConditionHandler; // Handle signals
+                    // execute the test
+                    tc.m_test();
+                    fatalConditionHandler.reset();
+DOCTEST_MSVC_SUPPRESS_WARNING_POP
+#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS
+                } catch(const TestFailureException&) {
+                    p->failure_flags |= TestCaseFailureReason::AssertFailure;
+                } catch(...) {
+                    DOCTEST_ITERATE_THROUGH_REPORTERS(test_case_exception,
+                                                      {translateActiveException(), false});
+                    p->failure_flags |= TestCaseFailureReason::Exception;
+                }
+#endif // DOCTEST_CONFIG_NO_EXCEPTIONS
+
+                // exit this loop if enough assertions have failed - even if there are more subcases
+                if(p->abort_after > 0 &&
+                   p->numAssertsFailed + p->numAssertsFailedCurrentTest_atomic >= p->abort_after) {
+                    run_test = false;
+                    p->failure_flags |= TestCaseFailureReason::TooManyFailedAsserts;
+                }
+
+                if(!p->nextSubcaseStack.empty() && run_test)
+                    DOCTEST_ITERATE_THROUGH_REPORTERS(test_case_reenter, tc);
+                if(p->nextSubcaseStack.empty())
+                    run_test = false;
+            } while(run_test);
+
+            p->finalizeTestCaseData();
+
+            DOCTEST_ITERATE_THROUGH_REPORTERS(test_case_end, *g_cs);
+
+            p->currentTest = nullptr;
+
+            // stop executing tests if enough assertions have failed
+            if(p->abort_after > 0 && p->numAssertsFailed >= p->abort_after)
+                break;
+        }
+    }
+
+    if(!query_mode) {
+        DOCTEST_ITERATE_THROUGH_REPORTERS(test_run_end, *g_cs);
+    } else {
+        QueryData qdata;
+        qdata.run_stats = g_cs;
+        qdata.data      = queryResults.data();
+        qdata.num_data  = unsigned(queryResults.size());
+        DOCTEST_ITERATE_THROUGH_REPORTERS(report_query, qdata);
+    }
+
+    return cleanup_and_return();
+}
+
+DOCTEST_DEFINE_INTERFACE(IReporter)
+
+int IReporter::get_num_active_contexts() { return detail::g_infoContexts.size(); }
+const IContextScope* const* IReporter::get_active_contexts() {
+    return get_num_active_contexts() ? &detail::g_infoContexts[0] : nullptr;
+}
+
+int IReporter::get_num_stringified_contexts() { return detail::g_cs->stringifiedContexts.size(); }
+const String* IReporter::get_stringified_contexts() {
+    return get_num_stringified_contexts() ? &detail::g_cs->stringifiedContexts[0] : nullptr;
+}
+
+namespace detail {
+    void registerReporterImpl(const char* name, int priority, reporterCreatorFunc c, bool isReporter) {
+        if(isReporter)
+            getReporters().insert(reporterMap::value_type(reporterMap::key_type(priority, name), c));
+        else
+            getListeners().insert(reporterMap::value_type(reporterMap::key_type(priority, name), c));
+    }
+} // namespace detail
+
+} // namespace doctest
+
+#endif // DOCTEST_CONFIG_DISABLE
+
+#ifdef DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4007) // 'function' : must be 'attribute' - see issue #182
+int main(int argc, char** argv) { return doctest::Context(argc, argv).run(); }
+DOCTEST_MSVC_SUPPRESS_WARNING_POP
+#endif // DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+DOCTEST_CLANG_SUPPRESS_WARNING_POP
+DOCTEST_MSVC_SUPPRESS_WARNING_POP
+DOCTEST_GCC_SUPPRESS_WARNING_POP
+
+DOCTEST_SUPPRESS_COMMON_WARNINGS_POP
+
+#endif // DOCTEST_LIBRARY_IMPLEMENTATION
+#endif // DOCTEST_CONFIG_IMPLEMENT
+
+#ifdef DOCTEST_UNDEF_WIN32_LEAN_AND_MEAN
+#undef WIN32_LEAN_AND_MEAN
+#undef DOCTEST_UNDEF_WIN32_LEAN_AND_MEAN
+#endif // DOCTEST_UNDEF_WIN32_LEAN_AND_MEAN
+
+#ifdef DOCTEST_UNDEF_NOMINMAX
+#undef NOMINMAX
+#undef DOCTEST_UNDEF_NOMINMAX
+#endif // DOCTEST_UNDEF_NOMINMAX
diff --git a/external_imported/json/test/thirdparty/doctest/doctest_compatibility.h b/external_imported/json/tests/thirdparty/doctest/doctest_compatibility.h
similarity index 96%
rename from external_imported/json/test/thirdparty/doctest/doctest_compatibility.h
rename to external_imported/json/tests/thirdparty/doctest/doctest_compatibility.h
index 6194e26b0..e056a824d 100644
--- a/external_imported/json/test/thirdparty/doctest/doctest_compatibility.h
+++ b/external_imported/json/tests/thirdparty/doctest/doctest_compatibility.h
@@ -20,7 +20,7 @@
 // doctest doesn't support THROWS_WITH for std::string out of the box (has to include <string>...)
 #define CHECK_THROWS_WITH_STD_STR_IMPL(expr, str, var_name)                    \
     do {                                                                       \
-        std::string var_name = str;                                            \
+        const std::string var_name = str;                                      \
         CHECK_THROWS_WITH(expr, var_name.c_str());                             \
     } while (false)
 #define CHECK_THROWS_WITH_STD_STR(expr, str)                                   \
diff --git a/external_imported/json/test/thirdparty/fifo_map/fifo_map.hpp b/external_imported/json/tests/thirdparty/fifo_map/fifo_map.hpp
similarity index 96%
rename from external_imported/json/test/thirdparty/fifo_map/fifo_map.hpp
rename to external_imported/json/tests/thirdparty/fifo_map/fifo_map.hpp
index c281e3be3..549b71bf9 100644
--- a/external_imported/json/test/thirdparty/fifo_map/fifo_map.hpp
+++ b/external_imported/json/tests/thirdparty/fifo_map/fifo_map.hpp
@@ -99,7 +99,7 @@ template <
     class T,
     class Compare = fifo_map_compare<Key>,
     class Allocator = std::allocator<std::pair<const Key, T>>
-    > class fifo_map
+    > class fifo_map // NOLINT(cppcoreguidelines-special-member-functions,hicpp-special-member-functions,-warnings-as-errors)
 {
   public:
     using key_type = Key;
@@ -300,7 +300,7 @@ template <
 
     /// insert value
     template<class P>
-    std::pair<iterator, bool> insert( P&& value )
+    std::pair<iterator, bool> insert( P&& value ) // NOLINT(cppcoreguidelines-missing-std-forward)
     {
         m_compare.add_key(value.first);
         return m_map.insert(value);
@@ -393,7 +393,7 @@ template <
     }
 
     /// swaps the contents
-    void swap(fifo_map& other)
+    void swap(fifo_map& other) // NOLINT(cppcoreguidelines-noexcept-swap,performance-noexcept-swap)
     {
         std::swap(m_map, other.m_map);
         std::swap(m_compare, other.m_compare);
@@ -514,17 +514,17 @@ template <
     internal_map_type m_map;
 };
 
-}
+} // namespace nlohmann
 
 // specialization of std::swap
-namespace std
+namespace std // NOLINT(cert-dcl58-cpp,-warnings-as-errors)
 {
 template <class Key, class T, class Compare, class Allocator>
-inline void swap(nlohmann::fifo_map<Key, T, Compare, Allocator>& m1,
+inline void swap(nlohmann::fifo_map<Key, T, Compare, Allocator>& m1, // NOLINT(cert-dcl58-cpp,cppcoreguidelines-noexcept-swap,performance-noexcept-swap)
                  nlohmann::fifo_map<Key, T, Compare, Allocator>& m2)
 {
     m1.swap(m2);
 }
-}
+} // namespace std
 
 #endif
diff --git a/external_imported/json/test/thirdparty/imapdl/filterbr.py b/external_imported/json/tests/thirdparty/imapdl/filterbr.py
similarity index 100%
rename from external_imported/json/test/thirdparty/imapdl/filterbr.py
rename to external_imported/json/tests/thirdparty/imapdl/filterbr.py
diff --git a/external_imported/json/third_party/amalgamate/LICENSE.md b/external_imported/json/third_party/amalgamate/LICENSE.md
deleted file mode 100644
index 7fe9cf08a..000000000
--- a/external_imported/json/third_party/amalgamate/LICENSE.md
+++ /dev/null
@@ -1,27 +0,0 @@
-amalgamate.py - Amalgamate C source and header files
-Copyright (c) 2012, Erik Edlund <erik.edlund@32767.se>
-
-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 Erik Edlund, 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.
diff --git a/external_imported/json/third_party/cpplint/LICENSE b/external_imported/json/third_party/cpplint/LICENSE
deleted file mode 100644
index 1756a599c..000000000
--- a/external_imported/json/third_party/cpplint/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-cpplint.py and its corresponding unit tests are Copyright (C) 2009 Google Inc.
-
-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.
diff --git a/external_imported/json/third_party/cpplint/README.rst b/external_imported/json/third_party/cpplint/README.rst
deleted file mode 100644
index 4208f35ec..000000000
--- a/external_imported/json/third_party/cpplint/README.rst
+++ /dev/null
@@ -1,80 +0,0 @@
-cpplint - static code checker for C++
-=====================================
-
-.. image:: https://travis-ci.org/cpplint/cpplint.svg?branch=master
-    :target: https://travis-ci.org/cpplint/cpplint
-
-.. image:: https://img.shields.io/pypi/v/cpplint.svg
-    :target: https://pypi.python.org/pypi/cpplint
-
-.. image:: https://img.shields.io/pypi/pyversions/cpplint.svg
-    :target: https://pypi.python.org/pypi/cpplint
-
-.. image:: https://img.shields.io/pypi/status/cpplint.svg
-    :target: https://pypi.python.org/pypi/cpplint
-
-.. image:: https://img.shields.io/pypi/l/cpplint.svg
-    :target: https://pypi.python.org/pypi/cpplint
-
-.. image:: https://img.shields.io/pypi/dd/cpplint.svg
-    :target: https://pypi.python.org/pypi/cpplint
-
-.. image:: https://img.shields.io/pypi/dw/cpplint.svg
-    :target: https://pypi.python.org/pypi/cpplint
-
-.. image:: https://img.shields.io/pypi/dm/cpplint.svg
-    :target: https://pypi.python.org/pypi/cpplint
-
-Cpplint is a command-line tool to check C/C++ files for style issues following `Google's C++ style guide <http://google.github.io/styleguide/cppguide.html>`_.
-Cpplint is developed and maintained by Google Inc. at `google/styleguide <https://github.com/google/styleguide>`_, also see see the `wikipedia entry <http://en.wikipedia.org/wiki/Cpplint>`_
-
-While Google maintains cpplint, Google is not (very) responsive to issues and pull requests, this fork aims to be (somewhat) more open to add fixes to cpplint to enable fixes, when those fixes make cpplint usable in wider contexts.
-
-
-Installation
-============
-
-
-To install cpplint from PyPI, run:
-
-.. code-block:: bash
-
-    $ pip install cpplint
-
-Then run it with:
-
-.. code-block:: bash
-
-    $ cpplint [OPTIONS] files
-
-For full usage instructions, run:
-
-.. code-block:: bash
-
-    $ cpplint --help
-
-Changes
--------
-
-The modifications in this fork are minor fixes and cosmetic changes:
-
-* more default extensions
-* python 3 compatibility
-* customizable file extensions with the --extensions argument
-* continuous integration on travis
-* support for recursive file discovery via the --recursive argument
-* support for excluding files via --exclude
-* JUnit XML output format
-* Overriding repository root auto-detection via --repository
-* Support ``#pragma once`` as an alternative to header include guards
-
-
-Acknowledgements
-----------------
-
-Thanks to Google Inc. for open-sourcing their in-house tool.
-Thanks to maintainers of the fork
-
-* `tkruse <https://github.com/tkruse>`_  
-* `mattyclarkson <https://github.com/mattyclarkson>`_
-* `theandrewdavis <https://github.com/theandrewdavis>`_
diff --git a/external_imported/json/third_party/cpplint/cpplint.py b/external_imported/json/third_party/cpplint/cpplint.py
deleted file mode 100755
index 81bc98b7a..000000000
--- a/external_imported/json/third_party/cpplint/cpplint.py
+++ /dev/null
@@ -1,6583 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright (c) 2009 Google Inc. All rights reserved.
-#
-# 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.
-
-"""Does google-lint on c++ files.
-
-The goal of this script is to identify places in the code that *may*
-be in non-compliance with google style.  It does not attempt to fix
-up these problems -- the point is to educate.  It does also not
-attempt to find all problems, or to ensure that everything it does
-find is legitimately a problem.
-
-In particular, we can get very confused by /* and // inside strings!
-We do a small hack, which is to ignore //'s with "'s after them on the
-same line, but it is far from perfect (in either direction).
-"""
-
-import codecs
-import copy
-import getopt
-import glob
-import itertools
-import math  # for log
-import os
-import re
-import sre_compile
-import string
-import sys
-import sysconfig
-import unicodedata
-import xml.etree.ElementTree
-
-# if empty, use defaults
-_valid_extensions = set([])
-
-__VERSION__ = '1.4.4'
-
-try:
-  xrange          # Python 2
-except NameError:
-  #  -- pylint: disable=redefined-builtin
-  xrange = range  # Python 3
-
-
-_USAGE = """
-Syntax: cpplint.py [--verbose=#] [--output=emacs|eclipse|vs7|junit]
-                   [--filter=-x,+y,...]
-                   [--counting=total|toplevel|detailed] [--root=subdir]
-                   [--repository=path]
-                   [--linelength=digits] [--headers=x,y,...]
-                   [--recursive]
-                   [--exclude=path]
-                   [--extensions=hpp,cpp,...]
-                   [--quiet]
-                   [--version]
-        <file> [file] ...
-
-  Style checker for C/C++ source files.
-  This is a fork of the Google style checker with minor extensions.
-
-  The style guidelines this tries to follow are those in
-    https://google.github.io/styleguide/cppguide.html
-
-  Every problem is given a confidence score from 1-5, with 5 meaning we are
-  certain of the problem, and 1 meaning it could be a legitimate construct.
-  This will miss some errors, and is not a substitute for a code review.
-
-  To suppress false-positive errors of a certain category, add a
-  'NOLINT(category)' comment to the line.  NOLINT or NOLINT(*)
-  suppresses errors of all categories on that line.
-
-  The files passed in will be linted; at least one file must be provided.
-  Default linted extensions are %s.
-  Other file types will be ignored.
-  Change the extensions with the --extensions flag.
-
-  Flags:
-
-    output=emacs|eclipse|vs7|junit
-      By default, the output is formatted to ease emacs parsing.  Visual Studio
-      compatible output (vs7) may also be used.  Further support exists for
-      eclipse (eclipse), and JUnit (junit). XML parsers such as those used
-      in Jenkins and Bamboo may also be used.  Other formats are unsupported.
-
-    verbose=#
-      Specify a number 0-5 to restrict errors to certain verbosity levels.
-      Errors with lower verbosity levels have lower confidence and are more
-      likely to be false positives.
-
-    quiet
-      Don't print anything if no errors are found.
-
-    filter=-x,+y,...
-      Specify a comma-separated list of category-filters to apply: only
-      error messages whose category names pass the filters will be printed.
-      (Category names are printed with the message and look like
-      "[whitespace/indent]".)  Filters are evaluated left to right.
-      "-FOO" and "FOO" means "do not print categories that start with FOO".
-      "+FOO" means "do print categories that start with FOO".
-
-      Examples: --filter=-whitespace,+whitespace/braces
-                --filter=whitespace,runtime/printf,+runtime/printf_format
-                --filter=-,+build/include_what_you_use
-
-      To see a list of all the categories used in cpplint, pass no arg:
-         --filter=
-
-    counting=total|toplevel|detailed
-      The total number of errors found is always printed. If
-      'toplevel' is provided, then the count of errors in each of
-      the top-level categories like 'build' and 'whitespace' will
-      also be printed. If 'detailed' is provided, then a count
-      is provided for each category like 'build/class'.
-
-    repository=path
-      The top level directory of the repository, used to derive the header
-      guard CPP variable. By default, this is determined by searching for a
-      path that contains .git, .hg, or .svn. When this flag is specified, the
-      given path is used instead. This option allows the header guard CPP
-      variable to remain consistent even if members of a team have different
-      repository root directories (such as when checking out a subdirectory
-      with SVN). In addition, users of non-mainstream version control systems
-      can use this flag to ensure readable header guard CPP variables.
-
-      Examples:
-        Assuming that Alice checks out ProjectName and Bob checks out
-        ProjectName/trunk and trunk contains src/chrome/ui/browser.h, then
-        with no --repository flag, the header guard CPP variable will be:
-
-        Alice => TRUNK_SRC_CHROME_BROWSER_UI_BROWSER_H_
-        Bob   => SRC_CHROME_BROWSER_UI_BROWSER_H_
-
-        If Alice uses the --repository=trunk flag and Bob omits the flag or
-        uses --repository=. then the header guard CPP variable will be:
-
-        Alice => SRC_CHROME_BROWSER_UI_BROWSER_H_
-        Bob   => SRC_CHROME_BROWSER_UI_BROWSER_H_
-
-    root=subdir
-      The root directory used for deriving header guard CPP variable.
-      This directory is relative to the top level directory of the repository
-      which by default is determined by searching for a directory that contains
-      .git, .hg, or .svn but can also be controlled with the --repository flag.
-      If the specified directory does not exist, this flag is ignored.
-
-      Examples:
-        Assuming that src is the top level directory of the repository (and
-        cwd=top/src), the header guard CPP variables for
-        src/chrome/browser/ui/browser.h are:
-
-        No flag => CHROME_BROWSER_UI_BROWSER_H_
-        --root=chrome => BROWSER_UI_BROWSER_H_
-        --root=chrome/browser => UI_BROWSER_H_
-        --root=.. => SRC_CHROME_BROWSER_UI_BROWSER_H_
-
-    linelength=digits
-      This is the allowed line length for the project. The default value is
-      80 characters.
-
-      Examples:
-        --linelength=120
-
-    recursive
-      Search for files to lint recursively. Each directory given in the list
-      of files to be linted is replaced by all files that descend from that
-      directory. Files with extensions not in the valid extensions list are
-      excluded.
-
-    exclude=path
-      Exclude the given path from the list of files to be linted. Relative
-      paths are evaluated relative to the current directory and shell globbing
-      is performed. This flag can be provided multiple times to exclude
-      multiple files.
-
-      Examples:
-        --exclude=one.cc
-        --exclude=src/*.cc
-        --exclude=src/*.cc --exclude=test/*.cc
-
-    extensions=extension,extension,...
-      The allowed file extensions that cpplint will check
-
-      Examples:
-        --extensions=%s
-
-    headers=x,y,...
-      The header extensions that cpplint will treat as .h in checks. Values are
-      automatically added to --extensions list.
-     (by default, only files with extensions %s will be assumed to be headers)
-
-      Examples:
-        --headers=%s
-        --headers=hpp,hxx
-        --headers=hpp
-
-    cpplint.py supports per-directory configurations specified in CPPLINT.cfg
-    files. CPPLINT.cfg file can contain a number of key=value pairs.
-    Currently the following options are supported:
-
-      set noparent
-      filter=+filter1,-filter2,...
-      exclude_files=regex
-      linelength=80
-      root=subdir
-      headers=x,y,...
-
-    "set noparent" option prevents cpplint from traversing directory tree
-    upwards looking for more .cfg files in parent directories. This option
-    is usually placed in the top-level project directory.
-
-    The "filter" option is similar in function to --filter flag. It specifies
-    message filters in addition to the |_DEFAULT_FILTERS| and those specified
-    through --filter command-line flag.
-
-    "exclude_files" allows to specify a regular expression to be matched against
-    a file name. If the expression matches, the file is skipped and not run
-    through the linter.
-
-    "linelength" allows to specify the allowed line length for the project.
-
-    The "root" option is similar in function to the --root flag (see example
-    above). Paths are relative to the directory of the CPPLINT.cfg.
-
-    The "headers" option is similar in function to the --headers flag
-    (see example above).
-
-    CPPLINT.cfg has an effect on files in the same directory and all
-    sub-directories, unless overridden by a nested configuration file.
-
-      Example file:
-        filter=-build/include_order,+build/include_alpha
-        exclude_files=.*\\.cc
-
-    The above example disables build/include_order warning and enables
-    build/include_alpha as well as excludes all .cc from being
-    processed by linter, in the current directory (where the .cfg
-    file is located) and all sub-directories.
-"""
-
-# We categorize each error message we print.  Here are the categories.
-# We want an explicit list so we can list them all in cpplint --filter=.
-# If you add a new error message with a new category, add it to the list
-# here!  cpplint_unittest.py should tell you if you forget to do this.
-_ERROR_CATEGORIES = [
-    'build/class',
-    'build/c++11',
-    'build/c++14',
-    'build/c++tr1',
-    'build/deprecated',
-    'build/endif_comment',
-    'build/explicit_make_pair',
-    'build/forward_decl',
-    'build/header_guard',
-    'build/include',
-    'build/include_subdir',
-    'build/include_alpha',
-    'build/include_order',
-    'build/include_what_you_use',
-    'build/namespaces_literals',
-    'build/namespaces',
-    'build/printf_format',
-    'build/storage_class',
-    'legal/copyright',
-    'readability/alt_tokens',
-    'readability/braces',
-    'readability/casting',
-    'readability/check',
-    'readability/constructors',
-    'readability/fn_size',
-    'readability/inheritance',
-    'readability/multiline_comment',
-    'readability/multiline_string',
-    'readability/namespace',
-    'readability/nolint',
-    'readability/nul',
-    'readability/strings',
-    'readability/todo',
-    'readability/utf8',
-    'runtime/arrays',
-    'runtime/casting',
-    'runtime/explicit',
-    'runtime/int',
-    'runtime/init',
-    'runtime/invalid_increment',
-    'runtime/member_string_references',
-    'runtime/memset',
-    'runtime/indentation_namespace',
-    'runtime/operator',
-    'runtime/printf',
-    'runtime/printf_format',
-    'runtime/references',
-    'runtime/string',
-    'runtime/threadsafe_fn',
-    'runtime/vlog',
-    'whitespace/blank_line',
-    'whitespace/braces',
-    'whitespace/comma',
-    'whitespace/comments',
-    'whitespace/empty_conditional_body',
-    'whitespace/empty_if_body',
-    'whitespace/empty_loop_body',
-    'whitespace/end_of_line',
-    'whitespace/ending_newline',
-    'whitespace/forcolon',
-    'whitespace/indent',
-    'whitespace/line_length',
-    'whitespace/newline',
-    'whitespace/operators',
-    'whitespace/parens',
-    'whitespace/semicolon',
-    'whitespace/tab',
-    'whitespace/todo',
-    ]
-
-# These error categories are no longer enforced by cpplint, but for backwards-
-# compatibility they may still appear in NOLINT comments.
-_LEGACY_ERROR_CATEGORIES = [
-    'readability/streams',
-    'readability/function',
-    ]
-
-# The default state of the category filter. This is overridden by the --filter=
-# flag. By default all errors are on, so only add here categories that should be
-# off by default (i.e., categories that must be enabled by the --filter= flags).
-# All entries here should start with a '-' or '+', as in the --filter= flag.
-_DEFAULT_FILTERS = ['-build/include_alpha']
-
-# The default list of categories suppressed for C (not C++) files.
-_DEFAULT_C_SUPPRESSED_CATEGORIES = [
-    'readability/casting',
-    ]
-
-# The default list of categories suppressed for Linux Kernel files.
-_DEFAULT_KERNEL_SUPPRESSED_CATEGORIES = [
-    'whitespace/tab',
-    ]
-
-# We used to check for high-bit characters, but after much discussion we
-# decided those were OK, as long as they were in UTF-8 and didn't represent
-# hard-coded international strings, which belong in a separate i18n file.
-
-# C++ headers
-_CPP_HEADERS = frozenset([
-    # Legacy
-    'algobase.h',
-    'algo.h',
-    'alloc.h',
-    'builtinbuf.h',
-    'bvector.h',
-    'complex.h',
-    'defalloc.h',
-    'deque.h',
-    'editbuf.h',
-    'fstream.h',
-    'function.h',
-    'hash_map',
-    'hash_map.h',
-    'hash_set',
-    'hash_set.h',
-    'hashtable.h',
-    'heap.h',
-    'indstream.h',
-    'iomanip.h',
-    'iostream.h',
-    'istream.h',
-    'iterator.h',
-    'list.h',
-    'map.h',
-    'multimap.h',
-    'multiset.h',
-    'ostream.h',
-    'pair.h',
-    'parsestream.h',
-    'pfstream.h',
-    'procbuf.h',
-    'pthread_alloc',
-    'pthread_alloc.h',
-    'rope',
-    'rope.h',
-    'ropeimpl.h',
-    'set.h',
-    'slist',
-    'slist.h',
-    'stack.h',
-    'stdiostream.h',
-    'stl_alloc.h',
-    'stl_relops.h',
-    'streambuf.h',
-    'stream.h',
-    'strfile.h',
-    'strstream.h',
-    'tempbuf.h',
-    'tree.h',
-    'type_traits.h',
-    'vector.h',
-    # 17.6.1.2 C++ library headers
-    'algorithm',
-    'array',
-    'atomic',
-    'bitset',
-    'chrono',
-    'codecvt',
-    'complex',
-    'condition_variable',
-    'deque',
-    'exception',
-    'forward_list',
-    'fstream',
-    'functional',
-    'future',
-    'initializer_list',
-    'iomanip',
-    'ios',
-    'iosfwd',
-    'iostream',
-    'istream',
-    'iterator',
-    'limits',
-    'list',
-    'locale',
-    'map',
-    'memory',
-    'mutex',
-    'new',
-    'numeric',
-    'ostream',
-    'queue',
-    'random',
-    'ratio',
-    'regex',
-    'scoped_allocator',
-    'set',
-    'sstream',
-    'stack',
-    'stdexcept',
-    'streambuf',
-    'string',
-    'strstream',
-    'system_error',
-    'thread',
-    'tuple',
-    'typeindex',
-    'typeinfo',
-    'type_traits',
-    'unordered_map',
-    'unordered_set',
-    'utility',
-    'valarray',
-    'vector',
-    # 17.6.1.2 C++14 headers
-    'shared_mutex',
-    # 17.6.1.2 C++17 headers
-    'any',
-    'charconv',
-    'codecvt',
-    'execution',
-    'filesystem',
-    'memory_resource',
-    'optional',
-    'string_view',
-    'variant',
-    # 17.6.1.2 C++ headers for C library facilities
-    'cassert',
-    'ccomplex',
-    'cctype',
-    'cerrno',
-    'cfenv',
-    'cfloat',
-    'cinttypes',
-    'ciso646',
-    'climits',
-    'clocale',
-    'cmath',
-    'csetjmp',
-    'csignal',
-    'cstdalign',
-    'cstdarg',
-    'cstdbool',
-    'cstddef',
-    'cstdint',
-    'cstdio',
-    'cstdlib',
-    'cstring',
-    'ctgmath',
-    'ctime',
-    'cuchar',
-    'cwchar',
-    'cwctype',
-    ])
-
-# Type names
-_TYPES = re.compile(
-    r'^(?:'
-    # [dcl.type.simple]
-    r'(char(16_t|32_t)?)|wchar_t|'
-    r'bool|short|int|long|signed|unsigned|float|double|'
-    # [support.types]
-    r'(ptrdiff_t|size_t|max_align_t|nullptr_t)|'
-    # [cstdint.syn]
-    r'(u?int(_fast|_least)?(8|16|32|64)_t)|'
-    r'(u?int(max|ptr)_t)|'
-    r')$')
-
-
-# These headers are excluded from [build/include] and [build/include_order]
-# checks:
-# - Anything not following google file name conventions (containing an
-#   uppercase character, such as Python.h or nsStringAPI.h, for example).
-# - Lua headers.
-_THIRD_PARTY_HEADERS_PATTERN = re.compile(
-    r'^(?:[^/]*[A-Z][^/]*\.h|lua\.h|lauxlib\.h|lualib\.h)$')
-
-# Pattern for matching FileInfo.BaseName() against test file name
-_test_suffixes = ['_test', '_regtest', '_unittest']
-_TEST_FILE_SUFFIX = '(' + '|'.join(_test_suffixes) + r')$'
-
-# Pattern that matches only complete whitespace, possibly across multiple lines.
-_EMPTY_CONDITIONAL_BODY_PATTERN = re.compile(r'^\s*$', re.DOTALL)
-
-# Assertion macros.  These are defined in base/logging.h and
-# testing/base/public/gunit.h.
-_CHECK_MACROS = [
-    'DCHECK', 'CHECK',
-    'EXPECT_TRUE', 'ASSERT_TRUE',
-    'EXPECT_FALSE', 'ASSERT_FALSE',
-    ]
-
-# Replacement macros for CHECK/DCHECK/EXPECT_TRUE/EXPECT_FALSE
-_CHECK_REPLACEMENT = dict([(macro_var, {}) for macro_var in _CHECK_MACROS])
-
-for op, replacement in [('==', 'EQ'), ('!=', 'NE'),
-                        ('>=', 'GE'), ('>', 'GT'),
-                        ('<=', 'LE'), ('<', 'LT')]:
-  _CHECK_REPLACEMENT['DCHECK'][op] = 'DCHECK_%s' % replacement
-  _CHECK_REPLACEMENT['CHECK'][op] = 'CHECK_%s' % replacement
-  _CHECK_REPLACEMENT['EXPECT_TRUE'][op] = 'EXPECT_%s' % replacement
-  _CHECK_REPLACEMENT['ASSERT_TRUE'][op] = 'ASSERT_%s' % replacement
-
-for op, inv_replacement in [('==', 'NE'), ('!=', 'EQ'),
-                            ('>=', 'LT'), ('>', 'LE'),
-                            ('<=', 'GT'), ('<', 'GE')]:
-  _CHECK_REPLACEMENT['EXPECT_FALSE'][op] = 'EXPECT_%s' % inv_replacement
-  _CHECK_REPLACEMENT['ASSERT_FALSE'][op] = 'ASSERT_%s' % inv_replacement
-
-# Alternative tokens and their replacements.  For full list, see section 2.5
-# Alternative tokens [lex.digraph] in the C++ standard.
-#
-# Digraphs (such as '%:') are not included here since it's a mess to
-# match those on a word boundary.
-_ALT_TOKEN_REPLACEMENT = {
-    'and': '&&',
-    'bitor': '|',
-    'or': '||',
-    'xor': '^',
-    'compl': '~',
-    'bitand': '&',
-    'and_eq': '&=',
-    'or_eq': '|=',
-    'xor_eq': '^=',
-    'not': '!',
-    'not_eq': '!='
-    }
-
-# Compile regular expression that matches all the above keywords.  The "[ =()]"
-# bit is meant to avoid matching these keywords outside of boolean expressions.
-#
-# False positives include C-style multi-line comments and multi-line strings
-# but those have always been troublesome for cpplint.
-_ALT_TOKEN_REPLACEMENT_PATTERN = re.compile(
-    r'[ =()](' + ('|'.join(_ALT_TOKEN_REPLACEMENT.keys())) + r')(?=[ (]|$)')
-
-
-# These constants define types of headers for use with
-# _IncludeState.CheckNextIncludeOrder().
-_C_SYS_HEADER = 1
-_CPP_SYS_HEADER = 2
-_LIKELY_MY_HEADER = 3
-_POSSIBLE_MY_HEADER = 4
-_OTHER_HEADER = 5
-
-# These constants define the current inline assembly state
-_NO_ASM = 0       # Outside of inline assembly block
-_INSIDE_ASM = 1   # Inside inline assembly block
-_END_ASM = 2      # Last line of inline assembly block
-_BLOCK_ASM = 3    # The whole block is an inline assembly block
-
-# Match start of assembly blocks
-_MATCH_ASM = re.compile(r'^\s*(?:asm|_asm|__asm|__asm__)'
-                        r'(?:\s+(volatile|__volatile__))?'
-                        r'\s*[{(]')
-
-# Match strings that indicate we're working on a C (not C++) file.
-_SEARCH_C_FILE = re.compile(r'\b(?:LINT_C_FILE|'
-                            r'vim?:\s*.*(\s*|:)filetype=c(\s*|:|$))')
-
-# Match string that indicates we're working on a Linux Kernel file.
-_SEARCH_KERNEL_FILE = re.compile(r'\b(?:LINT_KERNEL_FILE)')
-
-_regexp_compile_cache = {}
-
-# {str, set(int)}: a map from error categories to sets of linenumbers
-# on which those errors are expected and should be suppressed.
-_error_suppressions = {}
-
-# The root directory used for deriving header guard CPP variable.
-# This is set by --root flag.
-_root = None
-_root_debug = False
-
-# The top level repository directory. If set, _root is calculated relative to
-# this directory instead of the directory containing version control artifacts.
-# This is set by the --repository flag.
-_repository = None
-
-# Files to exclude from linting. This is set by the --exclude flag.
-_excludes = None
-
-# Whether to supress PrintInfo messages
-_quiet = False
-
-# The allowed line length of files.
-# This is set by --linelength flag.
-_line_length = 80
-
-try:
-  unicode
-except NameError:
-  #  -- pylint: disable=redefined-builtin
-  basestring = unicode = str
-
-try:
-  long
-except NameError:
-  #  -- pylint: disable=redefined-builtin
-  long = int
-
-if sys.version_info < (3,):
-  #  -- pylint: disable=no-member
-  # BINARY_TYPE = str
-  itervalues = dict.itervalues
-  iteritems = dict.iteritems
-else:
-  # BINARY_TYPE = bytes
-  itervalues = dict.values
-  iteritems = dict.items
-
-def unicode_escape_decode(x):
-  if sys.version_info < (3,):
-    return codecs.unicode_escape_decode(x)[0]
-  else:
-    return x
-
-# Treat all headers starting with 'h' equally: .h, .hpp, .hxx etc.
-# This is set by --headers flag.
-_hpp_headers = set(['h', 'hh', 'hpp', 'hxx', 'h++', 'cuh'])
-
-# {str, bool}: a map from error categories to booleans which indicate if the
-# category should be suppressed for every line.
-_global_error_suppressions = {}
-
-def ProcessHppHeadersOption(val):
-  global _hpp_headers
-  try:
-    _hpp_headers = set(val.split(','))
-    # Automatically append to extensions list so it does not have to be set 2 times
-    _valid_extensions.update(_hpp_headers)
-  except ValueError:
-    PrintUsage('Header extensions must be comma separated list.')
-
-def IsHeaderExtension(file_extension):
-  return file_extension in _hpp_headers
-
-def GetHeaderExtensions():
-  return _hpp_headers or ['h']
-
-# The allowed extensions for file names
-# This is set by --extensions flag
-def GetAllExtensions():
-  if not _valid_extensions:
-    return GetHeaderExtensions().union(set(['c', 'cc', 'cpp', 'cxx', 'c++', 'cu']))
-  return _valid_extensions
-
-def GetNonHeaderExtensions():
-  return GetAllExtensions().difference(GetHeaderExtensions())
-
-
-
-def ParseNolintSuppressions(filename, raw_line, linenum, error):
-  """Updates the global list of line error-suppressions.
-
-  Parses any NOLINT comments on the current line, updating the global
-  error_suppressions store.  Reports an error if the NOLINT comment
-  was malformed.
-
-  Args:
-    filename: str, the name of the input file.
-    raw_line: str, the line of input text, with comments.
-    linenum: int, the number of the current line.
-    error: function, an error handler.
-  """
-  matched = Search(r'\bNOLINT(NEXTLINE)?\b(\([^)]+\))?', raw_line)
-  if matched:
-    if matched.group(1):
-      suppressed_line = linenum + 1
-    else:
-      suppressed_line = linenum
-    category = matched.group(2)
-    if category in (None, '(*)'):  # => "suppress all"
-      _error_suppressions.setdefault(None, set()).add(suppressed_line)
-    else:
-      if category.startswith('(') and category.endswith(')'):
-        category = category[1:-1]
-        if category in _ERROR_CATEGORIES:
-          _error_suppressions.setdefault(category, set()).add(suppressed_line)
-        elif category not in _LEGACY_ERROR_CATEGORIES:
-          error(filename, linenum, 'readability/nolint', 5,
-                'Unknown NOLINT error category: %s' % category)
-
-
-def ProcessGlobalSuppresions(lines):
-  """Updates the list of global error suppressions.
-
-  Parses any lint directives in the file that have global effect.
-
-  Args:
-    lines: An array of strings, each representing a line of the file, with the
-           last element being empty if the file is terminated with a newline.
-  """
-  for line in lines:
-    if _SEARCH_C_FILE.search(line):
-      for category in _DEFAULT_C_SUPPRESSED_CATEGORIES:
-        _global_error_suppressions[category] = True
-    if _SEARCH_KERNEL_FILE.search(line):
-      for category in _DEFAULT_KERNEL_SUPPRESSED_CATEGORIES:
-        _global_error_suppressions[category] = True
-
-
-def ResetNolintSuppressions():
-  """Resets the set of NOLINT suppressions to empty."""
-  _error_suppressions.clear()
-  _global_error_suppressions.clear()
-
-
-def IsErrorSuppressedByNolint(category, linenum):
-  """Returns true if the specified error category is suppressed on this line.
-
-  Consults the global error_suppressions map populated by
-  ParseNolintSuppressions/ProcessGlobalSuppresions/ResetNolintSuppressions.
-
-  Args:
-    category: str, the category of the error.
-    linenum: int, the current line number.
-  Returns:
-    bool, True iff the error should be suppressed due to a NOLINT comment or
-    global suppression.
-  """
-  return (_global_error_suppressions.get(category, False) or
-          linenum in _error_suppressions.get(category, set()) or
-          linenum in _error_suppressions.get(None, set()))
-
-
-def Match(pattern, s):
-  """Matches the string with the pattern, caching the compiled regexp."""
-  # The regexp compilation caching is inlined in both Match and Search for
-  # performance reasons; factoring it out into a separate function turns out
-  # to be noticeably expensive.
-  if pattern not in _regexp_compile_cache:
-    _regexp_compile_cache[pattern] = sre_compile.compile(pattern)
-  return _regexp_compile_cache[pattern].match(s)
-
-
-def ReplaceAll(pattern, rep, s):
-  """Replaces instances of pattern in a string with a replacement.
-
-  The compiled regex is kept in a cache shared by Match and Search.
-
-  Args:
-    pattern: regex pattern
-    rep: replacement text
-    s: search string
-
-  Returns:
-    string with replacements made (or original string if no replacements)
-  """
-  if pattern not in _regexp_compile_cache:
-    _regexp_compile_cache[pattern] = sre_compile.compile(pattern)
-  return _regexp_compile_cache[pattern].sub(rep, s)
-
-
-def Search(pattern, s):
-  """Searches the string for the pattern, caching the compiled regexp."""
-  if pattern not in _regexp_compile_cache:
-    _regexp_compile_cache[pattern] = sre_compile.compile(pattern)
-  return _regexp_compile_cache[pattern].search(s)
-
-
-def _IsSourceExtension(s):
-  """File extension (excluding dot) matches a source file extension."""
-  return s in GetNonHeaderExtensions()
-
-
-class _IncludeState(object):
-  """Tracks line numbers for includes, and the order in which includes appear.
-
-  include_list contains list of lists of (header, line number) pairs.
-  It's a lists of lists rather than just one flat list to make it
-  easier to update across preprocessor boundaries.
-
-  Call CheckNextIncludeOrder() once for each header in the file, passing
-  in the type constants defined above. Calls in an illegal order will
-  raise an _IncludeError with an appropriate error message.
-
-  """
-  # self._section will move monotonically through this set. If it ever
-  # needs to move backwards, CheckNextIncludeOrder will raise an error.
-  _INITIAL_SECTION = 0
-  _MY_H_SECTION = 1
-  _C_SECTION = 2
-  _CPP_SECTION = 3
-  _OTHER_H_SECTION = 4
-
-  _TYPE_NAMES = {
-      _C_SYS_HEADER: 'C system header',
-      _CPP_SYS_HEADER: 'C++ system header',
-      _LIKELY_MY_HEADER: 'header this file implements',
-      _POSSIBLE_MY_HEADER: 'header this file may implement',
-      _OTHER_HEADER: 'other header',
-      }
-  _SECTION_NAMES = {
-      _INITIAL_SECTION: "... nothing. (This can't be an error.)",
-      _MY_H_SECTION: 'a header this file implements',
-      _C_SECTION: 'C system header',
-      _CPP_SECTION: 'C++ system header',
-      _OTHER_H_SECTION: 'other header',
-      }
-
-  def __init__(self):
-    self.include_list = [[]]
-    self._section = None
-    self._last_header = None
-    self.ResetSection('')
-
-  def FindHeader(self, header):
-    """Check if a header has already been included.
-
-    Args:
-      header: header to check.
-    Returns:
-      Line number of previous occurrence, or -1 if the header has not
-      been seen before.
-    """
-    for section_list in self.include_list:
-      for f in section_list:
-        if f[0] == header:
-          return f[1]
-    return -1
-
-  def ResetSection(self, directive):
-    """Reset section checking for preprocessor directive.
-
-    Args:
-      directive: preprocessor directive (e.g. "if", "else").
-    """
-    # The name of the current section.
-    self._section = self._INITIAL_SECTION
-    # The path of last found header.
-    self._last_header = ''
-
-    # Update list of includes.  Note that we never pop from the
-    # include list.
-    if directive in ('if', 'ifdef', 'ifndef'):
-      self.include_list.append([])
-    elif directive in ('else', 'elif'):
-      self.include_list[-1] = []
-
-  def SetLastHeader(self, header_path):
-    self._last_header = header_path
-
-  def CanonicalizeAlphabeticalOrder(self, header_path):
-    """Returns a path canonicalized for alphabetical comparison.
-
-    - replaces "-" with "_" so they both cmp the same.
-    - removes '-inl' since we don't require them to be after the main header.
-    - lowercase everything, just in case.
-
-    Args:
-      header_path: Path to be canonicalized.
-
-    Returns:
-      Canonicalized path.
-    """
-    return header_path.replace('-inl.h', '.h').replace('-', '_').lower()
-
-  def IsInAlphabeticalOrder(self, clean_lines, linenum, header_path):
-    """Check if a header is in alphabetical order with the previous header.
-
-    Args:
-      clean_lines: A CleansedLines instance containing the file.
-      linenum: The number of the line to check.
-      header_path: Canonicalized header to be checked.
-
-    Returns:
-      Returns true if the header is in alphabetical order.
-    """
-    # If previous section is different from current section, _last_header will
-    # be reset to empty string, so it's always less than current header.
-    #
-    # If previous line was a blank line, assume that the headers are
-    # intentionally sorted the way they are.
-    if (self._last_header > header_path and
-        Match(r'^\s*#\s*include\b', clean_lines.elided[linenum - 1])):
-      return False
-    return True
-
-  def CheckNextIncludeOrder(self, header_type):
-    """Returns a non-empty error message if the next header is out of order.
-
-    This function also updates the internal state to be ready to check
-    the next include.
-
-    Args:
-      header_type: One of the _XXX_HEADER constants defined above.
-
-    Returns:
-      The empty string if the header is in the right order, or an
-      error message describing what's wrong.
-
-    """
-    error_message = ('Found %s after %s' %
-                     (self._TYPE_NAMES[header_type],
-                      self._SECTION_NAMES[self._section]))
-
-    last_section = self._section
-
-    if header_type == _C_SYS_HEADER:
-      if self._section <= self._C_SECTION:
-        self._section = self._C_SECTION
-      else:
-        self._last_header = ''
-        return error_message
-    elif header_type == _CPP_SYS_HEADER:
-      if self._section <= self._CPP_SECTION:
-        self._section = self._CPP_SECTION
-      else:
-        self._last_header = ''
-        return error_message
-    elif header_type == _LIKELY_MY_HEADER:
-      if self._section <= self._MY_H_SECTION:
-        self._section = self._MY_H_SECTION
-      else:
-        self._section = self._OTHER_H_SECTION
-    elif header_type == _POSSIBLE_MY_HEADER:
-      if self._section <= self._MY_H_SECTION:
-        self._section = self._MY_H_SECTION
-      else:
-        # This will always be the fallback because we're not sure
-        # enough that the header is associated with this file.
-        self._section = self._OTHER_H_SECTION
-    else:
-      assert header_type == _OTHER_HEADER
-      self._section = self._OTHER_H_SECTION
-
-    if last_section != self._section:
-      self._last_header = ''
-
-    return ''
-
-
-class _CppLintState(object):
-  """Maintains module-wide state.."""
-
-  def __init__(self):
-    self.verbose_level = 1  # global setting.
-    self.error_count = 0    # global count of reported errors
-    # filters to apply when emitting error messages
-    self.filters = _DEFAULT_FILTERS[:]
-    # backup of filter list. Used to restore the state after each file.
-    self._filters_backup = self.filters[:]
-    self.counting = 'total'  # In what way are we counting errors?
-    self.errors_by_category = {}  # string to int dict storing error counts
-    self.quiet = False  # Suppress non-error messagess?
-
-    # output format:
-    # "emacs" - format that emacs can parse (default)
-    # "eclipse" - format that eclipse can parse
-    # "vs7" - format that Microsoft Visual Studio 7 can parse
-    # "junit" - format that Jenkins, Bamboo, etc can parse
-    self.output_format = 'emacs'
-
-    # For JUnit output, save errors and failures until the end so that they
-    # can be written into the XML
-    self._junit_errors = []
-    self._junit_failures = []
-
-  def SetOutputFormat(self, output_format):
-    """Sets the output format for errors."""
-    self.output_format = output_format
-
-  def SetQuiet(self, quiet):
-    """Sets the module's quiet settings, and returns the previous setting."""
-    last_quiet = self.quiet
-    self.quiet = quiet
-    return last_quiet
-
-  def SetVerboseLevel(self, level):
-    """Sets the module's verbosity, and returns the previous setting."""
-    last_verbose_level = self.verbose_level
-    self.verbose_level = level
-    return last_verbose_level
-
-  def SetCountingStyle(self, counting_style):
-    """Sets the module's counting options."""
-    self.counting = counting_style
-
-  def SetFilters(self, filters):
-    """Sets the error-message filters.
-
-    These filters are applied when deciding whether to emit a given
-    error message.
-
-    Args:
-      filters: A string of comma-separated filters (eg "+whitespace/indent").
-               Each filter should start with + or -; else we die.
-
-    Raises:
-      ValueError: The comma-separated filters did not all start with '+' or '-'.
-                  E.g. "-,+whitespace,-whitespace/indent,whitespace/badfilter"
-    """
-    # Default filters always have less priority than the flag ones.
-    self.filters = _DEFAULT_FILTERS[:]
-    self.AddFilters(filters)
-
-  def AddFilters(self, filters):
-    """ Adds more filters to the existing list of error-message filters. """
-    for filt in filters.split(','):
-      clean_filt = filt.strip()
-      if clean_filt:
-        self.filters.append(clean_filt)
-    for filt in self.filters:
-      if not (filt.startswith('+') or filt.startswith('-')):
-        raise ValueError('Every filter in --filters must start with + or -'
-                         ' (%s does not)' % filt)
-
-  def BackupFilters(self):
-    """ Saves the current filter list to backup storage."""
-    self._filters_backup = self.filters[:]
-
-  def RestoreFilters(self):
-    """ Restores filters previously backed up."""
-    self.filters = self._filters_backup[:]
-
-  def ResetErrorCounts(self):
-    """Sets the module's error statistic back to zero."""
-    self.error_count = 0
-    self.errors_by_category = {}
-
-  def IncrementErrorCount(self, category):
-    """Bumps the module's error statistic."""
-    self.error_count += 1
-    if self.counting in ('toplevel', 'detailed'):
-      if self.counting != 'detailed':
-        category = category.split('/')[0]
-      if category not in self.errors_by_category:
-        self.errors_by_category[category] = 0
-      self.errors_by_category[category] += 1
-
-  def PrintErrorCounts(self):
-    """Print a summary of errors by category, and the total."""
-    for category, count in sorted(iteritems(self.errors_by_category)):
-      self.PrintInfo('Category \'%s\' errors found: %d\n' %
-                       (category, count))
-    if self.error_count > 0:
-      self.PrintInfo('Total errors found: %d\n' % self.error_count)
-
-  def PrintInfo(self, message):
-    if not _quiet and self.output_format != 'junit':
-      sys.stdout.write(message)
-
-  def PrintError(self, message):
-    if self.output_format == 'junit':
-      self._junit_errors.append(message)
-    else:
-      sys.stderr.write(message)
-
-  def AddJUnitFailure(self, filename, linenum, message, category, confidence):
-    self._junit_failures.append((filename, linenum, message, category,
-        confidence))
-
-  def FormatJUnitXML(self):
-    num_errors = len(self._junit_errors)
-    num_failures = len(self._junit_failures)
-
-    testsuite = xml.etree.ElementTree.Element('testsuite')
-    testsuite.attrib['name'] = 'cpplint'
-    testsuite.attrib['errors'] = str(num_errors)
-    testsuite.attrib['failures'] = str(num_failures)
-
-    if num_errors == 0 and num_failures == 0:
-      testsuite.attrib['tests'] = str(1)
-      xml.etree.ElementTree.SubElement(testsuite, 'testcase', name='passed')
-
-    else:
-      testsuite.attrib['tests'] = str(num_errors + num_failures)
-      if num_errors > 0:
-        testcase = xml.etree.ElementTree.SubElement(testsuite, 'testcase')
-        testcase.attrib['name'] = 'errors'
-        error = xml.etree.ElementTree.SubElement(testcase, 'error')
-        error.text = '\n'.join(self._junit_errors)
-      if num_failures > 0:
-        # Group failures by file
-        failed_file_order = []
-        failures_by_file = {}
-        for failure in self._junit_failures:
-          failed_file = failure[0]
-          if failed_file not in failed_file_order:
-            failed_file_order.append(failed_file)
-            failures_by_file[failed_file] = []
-          failures_by_file[failed_file].append(failure)
-        # Create a testcase for each file
-        for failed_file in failed_file_order:
-          failures = failures_by_file[failed_file]
-          testcase = xml.etree.ElementTree.SubElement(testsuite, 'testcase')
-          testcase.attrib['name'] = failed_file
-          failure = xml.etree.ElementTree.SubElement(testcase, 'failure')
-          template = '{0}: {1} [{2}] [{3}]'
-          texts = [template.format(f[1], f[2], f[3], f[4]) for f in failures]
-          failure.text = '\n'.join(texts)
-
-    xml_decl = '<?xml version="1.0" encoding="UTF-8" ?>\n'
-    return xml_decl + xml.etree.ElementTree.tostring(testsuite, 'utf-8').decode('utf-8')
-
-
-_cpplint_state = _CppLintState()
-
-
-def _OutputFormat():
-  """Gets the module's output format."""
-  return _cpplint_state.output_format
-
-
-def _SetOutputFormat(output_format):
-  """Sets the module's output format."""
-  _cpplint_state.SetOutputFormat(output_format)
-
-def _Quiet():
-  """Return's the module's quiet setting."""
-  return _cpplint_state.quiet
-
-def _SetQuiet(quiet):
-  """Set the module's quiet status, and return previous setting."""
-  return _cpplint_state.SetQuiet(quiet)
-
-
-def _VerboseLevel():
-  """Returns the module's verbosity setting."""
-  return _cpplint_state.verbose_level
-
-
-def _SetVerboseLevel(level):
-  """Sets the module's verbosity, and returns the previous setting."""
-  return _cpplint_state.SetVerboseLevel(level)
-
-
-def _SetCountingStyle(level):
-  """Sets the module's counting options."""
-  _cpplint_state.SetCountingStyle(level)
-
-
-def _Filters():
-  """Returns the module's list of output filters, as a list."""
-  return _cpplint_state.filters
-
-
-def _SetFilters(filters):
-  """Sets the module's error-message filters.
-
-  These filters are applied when deciding whether to emit a given
-  error message.
-
-  Args:
-    filters: A string of comma-separated filters (eg "whitespace/indent").
-             Each filter should start with + or -; else we die.
-  """
-  _cpplint_state.SetFilters(filters)
-
-def _AddFilters(filters):
-  """Adds more filter overrides.
-
-  Unlike _SetFilters, this function does not reset the current list of filters
-  available.
-
-  Args:
-    filters: A string of comma-separated filters (eg "whitespace/indent").
-             Each filter should start with + or -; else we die.
-  """
-  _cpplint_state.AddFilters(filters)
-
-def _BackupFilters():
-  """ Saves the current filter list to backup storage."""
-  _cpplint_state.BackupFilters()
-
-def _RestoreFilters():
-  """ Restores filters previously backed up."""
-  _cpplint_state.RestoreFilters()
-
-class _FunctionState(object):
-  """Tracks current function name and the number of lines in its body."""
-
-  _NORMAL_TRIGGER = 250  # for --v=0, 500 for --v=1, etc.
-  _TEST_TRIGGER = 400    # about 50% more than _NORMAL_TRIGGER.
-
-  def __init__(self):
-    self.in_a_function = False
-    self.lines_in_function = 0
-    self.current_function = ''
-
-  def Begin(self, function_name):
-    """Start analyzing function body.
-
-    Args:
-      function_name: The name of the function being tracked.
-    """
-    self.in_a_function = True
-    self.lines_in_function = 0
-    self.current_function = function_name
-
-  def Count(self):
-    """Count line in current function body."""
-    if self.in_a_function:
-      self.lines_in_function += 1
-
-  def Check(self, error, filename, linenum):
-    """Report if too many lines in function body.
-
-    Args:
-      error: The function to call with any errors found.
-      filename: The name of the current file.
-      linenum: The number of the line to check.
-    """
-    if not self.in_a_function:
-      return
-
-    if Match(r'T(EST|est)', self.current_function):
-      base_trigger = self._TEST_TRIGGER
-    else:
-      base_trigger = self._NORMAL_TRIGGER
-    trigger = base_trigger * 2**_VerboseLevel()
-
-    if self.lines_in_function > trigger:
-      error_level = int(math.log(self.lines_in_function / base_trigger, 2))
-      # 50 => 0, 100 => 1, 200 => 2, 400 => 3, 800 => 4, 1600 => 5, ...
-      if error_level > 5:
-        error_level = 5
-      error(filename, linenum, 'readability/fn_size', error_level,
-            'Small and focused functions are preferred:'
-            ' %s has %d non-comment lines'
-            ' (error triggered by exceeding %d lines).'  % (
-                self.current_function, self.lines_in_function, trigger))
-
-  def End(self):
-    """Stop analyzing function body."""
-    self.in_a_function = False
-
-
-class _IncludeError(Exception):
-  """Indicates a problem with the include order in a file."""
-  pass
-
-
-class FileInfo(object):
-  """Provides utility functions for filenames.
-
-  FileInfo provides easy access to the components of a file's path
-  relative to the project root.
-  """
-
-  def __init__(self, filename):
-    self._filename = filename
-
-  def FullName(self):
-    """Make Windows paths like Unix."""
-    return os.path.abspath(self._filename).replace('\\', '/')
-
-  def RepositoryName(self):
-    r"""FullName after removing the local path to the repository.
-
-    If we have a real absolute path name here we can try to do something smart:
-    detecting the root of the checkout and truncating /path/to/checkout from
-    the name so that we get header guards that don't include things like
-    "C:\Documents and Settings\..." or "/home/username/..." in them and thus
-    people on different computers who have checked the source out to different
-    locations won't see bogus errors.
-    """
-    fullname = self.FullName()
-
-    if os.path.exists(fullname):
-      project_dir = os.path.dirname(fullname)
-
-      # If the user specified a repository path, it exists, and the file is
-      # contained in it, use the specified repository path
-      if _repository:
-        repo = FileInfo(_repository).FullName()
-        root_dir = project_dir
-        while os.path.exists(root_dir):
-          # allow case insensitive compare on Windows
-          if os.path.normcase(root_dir) == os.path.normcase(repo):
-            return os.path.relpath(fullname, root_dir).replace('\\', '/')
-          one_up_dir = os.path.dirname(root_dir)
-          if one_up_dir == root_dir:
-            break
-          root_dir = one_up_dir
-
-      if os.path.exists(os.path.join(project_dir, ".svn")):
-        # If there's a .svn file in the current directory, we recursively look
-        # up the directory tree for the top of the SVN checkout
-        root_dir = project_dir
-        one_up_dir = os.path.dirname(root_dir)
-        while os.path.exists(os.path.join(one_up_dir, ".svn")):
-          root_dir = os.path.dirname(root_dir)
-          one_up_dir = os.path.dirname(one_up_dir)
-
-        prefix = os.path.commonprefix([root_dir, project_dir])
-        return fullname[len(prefix) + 1:]
-
-      # Not SVN <= 1.6? Try to find a git, hg, or svn top level directory by
-      # searching up from the current path.
-      root_dir = current_dir = os.path.dirname(fullname)
-      while current_dir != os.path.dirname(current_dir):
-        if (os.path.exists(os.path.join(current_dir, ".git")) or
-            os.path.exists(os.path.join(current_dir, ".hg")) or
-            os.path.exists(os.path.join(current_dir, ".svn"))):
-          root_dir = current_dir
-        current_dir = os.path.dirname(current_dir)
-
-      if (os.path.exists(os.path.join(root_dir, ".git")) or
-          os.path.exists(os.path.join(root_dir, ".hg")) or
-          os.path.exists(os.path.join(root_dir, ".svn"))):
-        prefix = os.path.commonprefix([root_dir, project_dir])
-        return fullname[len(prefix) + 1:]
-
-    # Don't know what to do; header guard warnings may be wrong...
-    return fullname
-
-  def Split(self):
-    """Splits the file into the directory, basename, and extension.
-
-    For 'chrome/browser/browser.cc', Split() would
-    return ('chrome/browser', 'browser', '.cc')
-
-    Returns:
-      A tuple of (directory, basename, extension).
-    """
-
-    googlename = self.RepositoryName()
-    project, rest = os.path.split(googlename)
-    return (project,) + os.path.splitext(rest)
-
-  def BaseName(self):
-    """File base name - text after the final slash, before the final period."""
-    return self.Split()[1]
-
-  def Extension(self):
-    """File extension - text following the final period, includes that period."""
-    return self.Split()[2]
-
-  def NoExtension(self):
-    """File has no source file extension."""
-    return '/'.join(self.Split()[0:2])
-
-  def IsSource(self):
-    """File has a source file extension."""
-    return _IsSourceExtension(self.Extension()[1:])
-
-
-def _ShouldPrintError(category, confidence, linenum):
-  """If confidence >= verbose, category passes filter and is not suppressed."""
-
-  # There are three ways we might decide not to print an error message:
-  # a "NOLINT(category)" comment appears in the source,
-  # the verbosity level isn't high enough, or the filters filter it out.
-  if IsErrorSuppressedByNolint(category, linenum):
-    return False
-
-  if confidence < _cpplint_state.verbose_level:
-    return False
-
-  is_filtered = False
-  for one_filter in _Filters():
-    if one_filter.startswith('-'):
-      if category.startswith(one_filter[1:]):
-        is_filtered = True
-    elif one_filter.startswith('+'):
-      if category.startswith(one_filter[1:]):
-        is_filtered = False
-    else:
-      assert False  # should have been checked for in SetFilter.
-  if is_filtered:
-    return False
-
-  return True
-
-
-def Error(filename, linenum, category, confidence, message):
-  """Logs the fact we've found a lint error.
-
-  We log where the error was found, and also our confidence in the error,
-  that is, how certain we are this is a legitimate style regression, and
-  not a misidentification or a use that's sometimes justified.
-
-  False positives can be suppressed by the use of
-  "cpplint(category)"  comments on the offending line.  These are
-  parsed into _error_suppressions.
-
-  Args:
-    filename: The name of the file containing the error.
-    linenum: The number of the line containing the error.
-    category: A string used to describe the "category" this bug
-      falls under: "whitespace", say, or "runtime".  Categories
-      may have a hierarchy separated by slashes: "whitespace/indent".
-    confidence: A number from 1-5 representing a confidence score for
-      the error, with 5 meaning that we are certain of the problem,
-      and 1 meaning that it could be a legitimate construct.
-    message: The error message.
-  """
-  if _ShouldPrintError(category, confidence, linenum):
-    _cpplint_state.IncrementErrorCount(category)
-    if _cpplint_state.output_format == 'vs7':
-      _cpplint_state.PrintError('%s(%s): error cpplint: [%s] %s [%d]\n' % (
-          filename, linenum, category, message, confidence))
-    elif _cpplint_state.output_format == 'eclipse':
-      sys.stderr.write('%s:%s: warning: %s  [%s] [%d]\n' % (
-          filename, linenum, message, category, confidence))
-    elif _cpplint_state.output_format == 'junit':
-      _cpplint_state.AddJUnitFailure(filename, linenum, message, category,
-          confidence)
-    else:
-      final_message = '%s:%s:  %s  [%s] [%d]\n' % (
-          filename, linenum, message, category, confidence)
-      sys.stderr.write(final_message)
-
-# Matches standard C++ escape sequences per 2.13.2.3 of the C++ standard.
-_RE_PATTERN_CLEANSE_LINE_ESCAPES = re.compile(
-    r'\\([abfnrtv?"\\\']|\d+|x[0-9a-fA-F]+)')
-# Match a single C style comment on the same line.
-_RE_PATTERN_C_COMMENTS = r'/\*(?:[^*]|\*(?!/))*\*/'
-# Matches multi-line C style comments.
-# This RE is a little bit more complicated than one might expect, because we
-# have to take care of space removals tools so we can handle comments inside
-# statements better.
-# The current rule is: We only clear spaces from both sides when we're at the
-# end of the line. Otherwise, we try to remove spaces from the right side,
-# if this doesn't work we try on left side but only if there's a non-character
-# on the right.
-_RE_PATTERN_CLEANSE_LINE_C_COMMENTS = re.compile(
-    r'(\s*' + _RE_PATTERN_C_COMMENTS + r'\s*$|' +
-    _RE_PATTERN_C_COMMENTS + r'\s+|' +
-    r'\s+' + _RE_PATTERN_C_COMMENTS + r'(?=\W)|' +
-    _RE_PATTERN_C_COMMENTS + r')')
-
-
-def IsCppString(line):
-  """Does line terminate so, that the next symbol is in string constant.
-
-  This function does not consider single-line nor multi-line comments.
-
-  Args:
-    line: is a partial line of code starting from the 0..n.
-
-  Returns:
-    True, if next character appended to 'line' is inside a
-    string constant.
-  """
-
-  line = line.replace(r'\\', 'XX')  # after this, \\" does not match to \"
-  return ((line.count('"') - line.count(r'\"') - line.count("'\"'")) & 1) == 1
-
-
-def CleanseRawStrings(raw_lines):
-  """Removes C++11 raw strings from lines.
-
-    Before:
-      static const char kData[] = R"(
-          multi-line string
-          )";
-
-    After:
-      static const char kData[] = ""
-          (replaced by blank line)
-          "";
-
-  Args:
-    raw_lines: list of raw lines.
-
-  Returns:
-    list of lines with C++11 raw strings replaced by empty strings.
-  """
-
-  delimiter = None
-  lines_without_raw_strings = []
-  for line in raw_lines:
-    if delimiter:
-      # Inside a raw string, look for the end
-      end = line.find(delimiter)
-      if end >= 0:
-        # Found the end of the string, match leading space for this
-        # line and resume copying the original lines, and also insert
-        # a "" on the last line.
-        leading_space = Match(r'^(\s*)\S', line)
-        line = leading_space.group(1) + '""' + line[end + len(delimiter):]
-        delimiter = None
-      else:
-        # Haven't found the end yet, append a blank line.
-        line = '""'
-
-    # Look for beginning of a raw string, and replace them with
-    # empty strings.  This is done in a loop to handle multiple raw
-    # strings on the same line.
-    while delimiter is None:
-      # Look for beginning of a raw string.
-      # See 2.14.15 [lex.string] for syntax.
-      #
-      # Once we have matched a raw string, we check the prefix of the
-      # line to make sure that the line is not part of a single line
-      # comment.  It's done this way because we remove raw strings
-      # before removing comments as opposed to removing comments
-      # before removing raw strings.  This is because there are some
-      # cpplint checks that requires the comments to be preserved, but
-      # we don't want to check comments that are inside raw strings.
-      matched = Match(r'^(.*?)\b(?:R|u8R|uR|UR|LR)"([^\s\\()]*)\((.*)$', line)
-      if (matched and
-          not Match(r'^([^\'"]|\'(\\.|[^\'])*\'|"(\\.|[^"])*")*//',
-                    matched.group(1))):
-        delimiter = ')' + matched.group(2) + '"'
-
-        end = matched.group(3).find(delimiter)
-        if end >= 0:
-          # Raw string ended on same line
-          line = (matched.group(1) + '""' +
-                  matched.group(3)[end + len(delimiter):])
-          delimiter = None
-        else:
-          # Start of a multi-line raw string
-          line = matched.group(1) + '""'
-      else:
-        break
-
-    lines_without_raw_strings.append(line)
-
-  # TODO(unknown): if delimiter is not None here, we might want to
-  # emit a warning for unterminated string.
-  return lines_without_raw_strings
-
-
-def FindNextMultiLineCommentStart(lines, lineix):
-  """Find the beginning marker for a multiline comment."""
-  while lineix < len(lines):
-    if lines[lineix].strip().startswith('/*'):
-      # Only return this marker if the comment goes beyond this line
-      if lines[lineix].strip().find('*/', 2) < 0:
-        return lineix
-    lineix += 1
-  return len(lines)
-
-
-def FindNextMultiLineCommentEnd(lines, lineix):
-  """We are inside a comment, find the end marker."""
-  while lineix < len(lines):
-    if lines[lineix].strip().endswith('*/'):
-      return lineix
-    lineix += 1
-  return len(lines)
-
-
-def RemoveMultiLineCommentsFromRange(lines, begin, end):
-  """Clears a range of lines for multi-line comments."""
-  # Having // dummy comments makes the lines non-empty, so we will not get
-  # unnecessary blank line warnings later in the code.
-  for i in range(begin, end):
-    lines[i] = '/**/'
-
-
-def RemoveMultiLineComments(filename, lines, error):
-  """Removes multiline (c-style) comments from lines."""
-  lineix = 0
-  while lineix < len(lines):
-    lineix_begin = FindNextMultiLineCommentStart(lines, lineix)
-    if lineix_begin >= len(lines):
-      return
-    lineix_end = FindNextMultiLineCommentEnd(lines, lineix_begin)
-    if lineix_end >= len(lines):
-      error(filename, lineix_begin + 1, 'readability/multiline_comment', 5,
-            'Could not find end of multi-line comment')
-      return
-    RemoveMultiLineCommentsFromRange(lines, lineix_begin, lineix_end + 1)
-    lineix = lineix_end + 1
-
-
-def CleanseComments(line):
-  """Removes //-comments and single-line C-style /* */ comments.
-
-  Args:
-    line: A line of C++ source.
-
-  Returns:
-    The line with single-line comments removed.
-  """
-  commentpos = line.find('//')
-  if commentpos != -1 and not IsCppString(line[:commentpos]):
-    line = line[:commentpos].rstrip()
-  # get rid of /* ... */
-  return _RE_PATTERN_CLEANSE_LINE_C_COMMENTS.sub('', line)
-
-
-class CleansedLines(object):
-  """Holds 4 copies of all lines with different preprocessing applied to them.
-
-  1) elided member contains lines without strings and comments.
-  2) lines member contains lines without comments.
-  3) raw_lines member contains all the lines without processing.
-  4) lines_without_raw_strings member is same as raw_lines, but with C++11 raw
-     strings removed.
-  All these members are of <type 'list'>, and of the same length.
-  """
-
-  def __init__(self, lines):
-    self.elided = []
-    self.lines = []
-    self.raw_lines = lines
-    self.num_lines = len(lines)
-    self.lines_without_raw_strings = CleanseRawStrings(lines)
-    for linenum in range(len(self.lines_without_raw_strings)):
-      self.lines.append(CleanseComments(
-          self.lines_without_raw_strings[linenum]))
-      elided = self._CollapseStrings(self.lines_without_raw_strings[linenum])
-      self.elided.append(CleanseComments(elided))
-
-  def NumLines(self):
-    """Returns the number of lines represented."""
-    return self.num_lines
-
-  @staticmethod
-  def _CollapseStrings(elided):
-    """Collapses strings and chars on a line to simple "" or '' blocks.
-
-    We nix strings first so we're not fooled by text like '"http://"'
-
-    Args:
-      elided: The line being processed.
-
-    Returns:
-      The line with collapsed strings.
-    """
-    if _RE_PATTERN_INCLUDE.match(elided):
-      return elided
-
-    # Remove escaped characters first to make quote/single quote collapsing
-    # basic.  Things that look like escaped characters shouldn't occur
-    # outside of strings and chars.
-    elided = _RE_PATTERN_CLEANSE_LINE_ESCAPES.sub('', elided)
-
-    # Replace quoted strings and digit separators.  Both single quotes
-    # and double quotes are processed in the same loop, otherwise
-    # nested quotes wouldn't work.
-    collapsed = ''
-    while True:
-      # Find the first quote character
-      match = Match(r'^([^\'"]*)([\'"])(.*)$', elided)
-      if not match:
-        collapsed += elided
-        break
-      head, quote, tail = match.groups()
-
-      if quote == '"':
-        # Collapse double quoted strings
-        second_quote = tail.find('"')
-        if second_quote >= 0:
-          collapsed += head + '""'
-          elided = tail[second_quote + 1:]
-        else:
-          # Unmatched double quote, don't bother processing the rest
-          # of the line since this is probably a multiline string.
-          collapsed += elided
-          break
-      else:
-        # Found single quote, check nearby text to eliminate digit separators.
-        #
-        # There is no special handling for floating point here, because
-        # the integer/fractional/exponent parts would all be parsed
-        # correctly as long as there are digits on both sides of the
-        # separator.  So we are fine as long as we don't see something
-        # like "0.'3" (gcc 4.9.0 will not allow this literal).
-        if Search(r'\b(?:0[bBxX]?|[1-9])[0-9a-fA-F]*$', head):
-          match_literal = Match(r'^((?:\'?[0-9a-zA-Z_])*)(.*)$', "'" + tail)
-          collapsed += head + match_literal.group(1).replace("'", '')
-          elided = match_literal.group(2)
-        else:
-          second_quote = tail.find('\'')
-          if second_quote >= 0:
-            collapsed += head + "''"
-            elided = tail[second_quote + 1:]
-          else:
-            # Unmatched single quote
-            collapsed += elided
-            break
-
-    return collapsed
-
-
-def FindEndOfExpressionInLine(line, startpos, stack):
-  """Find the position just after the end of current parenthesized expression.
-
-  Args:
-    line: a CleansedLines line.
-    startpos: start searching at this position.
-    stack: nesting stack at startpos.
-
-  Returns:
-    On finding matching end: (index just after matching end, None)
-    On finding an unclosed expression: (-1, None)
-    Otherwise: (-1, new stack at end of this line)
-  """
-  for i in xrange(startpos, len(line)):
-    char = line[i]
-    if char in '([{':
-      # Found start of parenthesized expression, push to expression stack
-      stack.append(char)
-    elif char == '<':
-      # Found potential start of template argument list
-      if i > 0 and line[i - 1] == '<':
-        # Left shift operator
-        if stack and stack[-1] == '<':
-          stack.pop()
-          if not stack:
-            return (-1, None)
-      elif i > 0 and Search(r'\boperator\s*$', line[0:i]):
-        # operator<, don't add to stack
-        continue
-      else:
-        # Tentative start of template argument list
-        stack.append('<')
-    elif char in ')]}':
-      # Found end of parenthesized expression.
-      #
-      # If we are currently expecting a matching '>', the pending '<'
-      # must have been an operator.  Remove them from expression stack.
-      while stack and stack[-1] == '<':
-        stack.pop()
-      if not stack:
-        return (-1, None)
-      if ((stack[-1] == '(' and char == ')') or
-          (stack[-1] == '[' and char == ']') or
-          (stack[-1] == '{' and char == '}')):
-        stack.pop()
-        if not stack:
-          return (i + 1, None)
-      else:
-        # Mismatched parentheses
-        return (-1, None)
-    elif char == '>':
-      # Found potential end of template argument list.
-
-      # Ignore "->" and operator functions
-      if (i > 0 and
-          (line[i - 1] == '-' or Search(r'\boperator\s*$', line[0:i - 1]))):
-        continue
-
-      # Pop the stack if there is a matching '<'.  Otherwise, ignore
-      # this '>' since it must be an operator.
-      if stack:
-        if stack[-1] == '<':
-          stack.pop()
-          if not stack:
-            return (i + 1, None)
-    elif char == ';':
-      # Found something that look like end of statements.  If we are currently
-      # expecting a '>', the matching '<' must have been an operator, since
-      # template argument list should not contain statements.
-      while stack and stack[-1] == '<':
-        stack.pop()
-      if not stack:
-        return (-1, None)
-
-  # Did not find end of expression or unbalanced parentheses on this line
-  return (-1, stack)
-
-
-def CloseExpression(clean_lines, linenum, pos):
-  """If input points to ( or { or [ or <, finds the position that closes it.
-
-  If lines[linenum][pos] points to a '(' or '{' or '[' or '<', finds the
-  linenum/pos that correspond to the closing of the expression.
-
-  TODO(unknown): cpplint spends a fair bit of time matching parentheses.
-  Ideally we would want to index all opening and closing parentheses once
-  and have CloseExpression be just a simple lookup, but due to preprocessor
-  tricks, this is not so easy.
-
-  Args:
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    pos: A position on the line.
-
-  Returns:
-    A tuple (line, linenum, pos) pointer *past* the closing brace, or
-    (line, len(lines), -1) if we never find a close.  Note we ignore
-    strings and comments when matching; and the line we return is the
-    'cleansed' line at linenum.
-  """
-
-  line = clean_lines.elided[linenum]
-  if (line[pos] not in '({[<') or Match(r'<[<=]', line[pos:]):
-    return (line, clean_lines.NumLines(), -1)
-
-  # Check first line
-  (end_pos, stack) = FindEndOfExpressionInLine(line, pos, [])
-  if end_pos > -1:
-    return (line, linenum, end_pos)
-
-  # Continue scanning forward
-  while stack and linenum < clean_lines.NumLines() - 1:
-    linenum += 1
-    line = clean_lines.elided[linenum]
-    (end_pos, stack) = FindEndOfExpressionInLine(line, 0, stack)
-    if end_pos > -1:
-      return (line, linenum, end_pos)
-
-  # Did not find end of expression before end of file, give up
-  return (line, clean_lines.NumLines(), -1)
-
-
-def FindStartOfExpressionInLine(line, endpos, stack):
-  """Find position at the matching start of current expression.
-
-  This is almost the reverse of FindEndOfExpressionInLine, but note
-  that the input position and returned position differs by 1.
-
-  Args:
-    line: a CleansedLines line.
-    endpos: start searching at this position.
-    stack: nesting stack at endpos.
-
-  Returns:
-    On finding matching start: (index at matching start, None)
-    On finding an unclosed expression: (-1, None)
-    Otherwise: (-1, new stack at beginning of this line)
-  """
-  i = endpos
-  while i >= 0:
-    char = line[i]
-    if char in ')]}':
-      # Found end of expression, push to expression stack
-      stack.append(char)
-    elif char == '>':
-      # Found potential end of template argument list.
-      #
-      # Ignore it if it's a "->" or ">=" or "operator>"
-      if (i > 0 and
-          (line[i - 1] == '-' or
-           Match(r'\s>=\s', line[i - 1:]) or
-           Search(r'\boperator\s*$', line[0:i]))):
-        i -= 1
-      else:
-        stack.append('>')
-    elif char == '<':
-      # Found potential start of template argument list
-      if i > 0 and line[i - 1] == '<':
-        # Left shift operator
-        i -= 1
-      else:
-        # If there is a matching '>', we can pop the expression stack.
-        # Otherwise, ignore this '<' since it must be an operator.
-        if stack and stack[-1] == '>':
-          stack.pop()
-          if not stack:
-            return (i, None)
-    elif char in '([{':
-      # Found start of expression.
-      #
-      # If there are any unmatched '>' on the stack, they must be
-      # operators.  Remove those.
-      while stack and stack[-1] == '>':
-        stack.pop()
-      if not stack:
-        return (-1, None)
-      if ((char == '(' and stack[-1] == ')') or
-          (char == '[' and stack[-1] == ']') or
-          (char == '{' and stack[-1] == '}')):
-        stack.pop()
-        if not stack:
-          return (i, None)
-      else:
-        # Mismatched parentheses
-        return (-1, None)
-    elif char == ';':
-      # Found something that look like end of statements.  If we are currently
-      # expecting a '<', the matching '>' must have been an operator, since
-      # template argument list should not contain statements.
-      while stack and stack[-1] == '>':
-        stack.pop()
-      if not stack:
-        return (-1, None)
-
-    i -= 1
-
-  return (-1, stack)
-
-
-def ReverseCloseExpression(clean_lines, linenum, pos):
-  """If input points to ) or } or ] or >, finds the position that opens it.
-
-  If lines[linenum][pos] points to a ')' or '}' or ']' or '>', finds the
-  linenum/pos that correspond to the opening of the expression.
-
-  Args:
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    pos: A position on the line.
-
-  Returns:
-    A tuple (line, linenum, pos) pointer *at* the opening brace, or
-    (line, 0, -1) if we never find the matching opening brace.  Note
-    we ignore strings and comments when matching; and the line we
-    return is the 'cleansed' line at linenum.
-  """
-  line = clean_lines.elided[linenum]
-  if line[pos] not in ')}]>':
-    return (line, 0, -1)
-
-  # Check last line
-  (start_pos, stack) = FindStartOfExpressionInLine(line, pos, [])
-  if start_pos > -1:
-    return (line, linenum, start_pos)
-
-  # Continue scanning backward
-  while stack and linenum > 0:
-    linenum -= 1
-    line = clean_lines.elided[linenum]
-    (start_pos, stack) = FindStartOfExpressionInLine(line, len(line) - 1, stack)
-    if start_pos > -1:
-      return (line, linenum, start_pos)
-
-  # Did not find start of expression before beginning of file, give up
-  return (line, 0, -1)
-
-
-def CheckForCopyright(filename, lines, error):
-  """Logs an error if no Copyright message appears at the top of the file."""
-
-  # We'll say it should occur by line 10. Don't forget there's a
-  # dummy line at the front.
-  for line in xrange(1, min(len(lines), 11)):
-    if re.search(r'Copyright', lines[line], re.I): break
-  else:                       # means no copyright line was found
-    error(filename, 0, 'legal/copyright', 5,
-          'No copyright message found.  '
-          'You should have a line: "Copyright [year] <Copyright Owner>"')
-
-
-def GetIndentLevel(line):
-  """Return the number of leading spaces in line.
-
-  Args:
-    line: A string to check.
-
-  Returns:
-    An integer count of leading spaces, possibly zero.
-  """
-  indent = Match(r'^( *)\S', line)
-  if indent:
-    return len(indent.group(1))
-  else:
-    return 0
-
-def PathSplitToList(path):
-  """Returns the path split into a list by the separator.
-
-  Args:
-    path: An absolute or relative path (e.g. '/a/b/c/' or '../a')
-
-  Returns:
-    A list of path components (e.g. ['a', 'b', 'c]).
-  """
-  lst = []
-  while True:
-    (head, tail) = os.path.split(path)
-    if head == path:  # absolute paths end
-      lst.append(head)
-      break
-    if tail == path:  # relative paths end
-      lst.append(tail)
-      break
-
-    path = head
-    lst.append(tail)
-
-  lst.reverse()
-  return lst
-
-def GetHeaderGuardCPPVariable(filename):
-  """Returns the CPP variable that should be used as a header guard.
-
-  Args:
-    filename: The name of a C++ header file.
-
-  Returns:
-    The CPP variable that should be used as a header guard in the
-    named file.
-
-  """
-
-  # Restores original filename in case that cpplint is invoked from Emacs's
-  # flymake.
-  filename = re.sub(r'_flymake\.h$', '.h', filename)
-  filename = re.sub(r'/\.flymake/([^/]*)$', r'/\1', filename)
-  # Replace 'c++' with 'cpp'.
-  filename = filename.replace('C++', 'cpp').replace('c++', 'cpp')
-
-  fileinfo = FileInfo(filename)
-  file_path_from_root = fileinfo.RepositoryName()
-
-  def FixupPathFromRoot():
-    if _root_debug:
-      sys.stderr.write("\n_root fixup, _root = '%s', repository name = '%s'\n"
-          % (_root, fileinfo.RepositoryName()))
-
-    # Process the file path with the --root flag if it was set.
-    if not _root:
-      if _root_debug:
-        sys.stderr.write("_root unspecified\n")
-      return file_path_from_root
-
-    def StripListPrefix(lst, prefix):
-      # f(['x', 'y'], ['w, z']) -> None  (not a valid prefix)
-      if lst[:len(prefix)] != prefix:
-        return None
-      # f(['a, 'b', 'c', 'd'], ['a', 'b']) -> ['c', 'd']
-      return lst[(len(prefix)):]
-
-    # root behavior:
-    #   --root=subdir , lstrips subdir from the header guard
-    maybe_path = StripListPrefix(PathSplitToList(file_path_from_root),
-                                 PathSplitToList(_root))
-
-    if _root_debug:
-      sys.stderr.write(("_root lstrip (maybe_path=%s, file_path_from_root=%s," +
-          " _root=%s)\n") % (maybe_path, file_path_from_root, _root))
-
-    if maybe_path:
-      return os.path.join(*maybe_path)
-
-    #   --root=.. , will prepend the outer directory to the header guard
-    full_path = fileinfo.FullName()
-    root_abspath = os.path.abspath(_root)
-
-    maybe_path = StripListPrefix(PathSplitToList(full_path),
-                                 PathSplitToList(root_abspath))
-
-    if _root_debug:
-      sys.stderr.write(("_root prepend (maybe_path=%s, full_path=%s, " +
-          "root_abspath=%s)\n") % (maybe_path, full_path, root_abspath))
-
-    if maybe_path:
-      return os.path.join(*maybe_path)
-
-    if _root_debug:
-      sys.stderr.write("_root ignore, returning %s\n" % (file_path_from_root))
-
-    #   --root=FAKE_DIR is ignored
-    return file_path_from_root
-
-  file_path_from_root = FixupPathFromRoot()
-  return re.sub(r'[^a-zA-Z0-9]', '_', file_path_from_root).upper() + '_'
-
-
-def CheckForHeaderGuard(filename, clean_lines, error):
-  """Checks that the file contains a header guard.
-
-  Logs an error if no #ifndef header guard is present.  For other
-  headers, checks that the full pathname is used.
-
-  Args:
-    filename: The name of the C++ header file.
-    clean_lines: A CleansedLines instance containing the file.
-    error: The function to call with any errors found.
-  """
-
-  # Don't check for header guards if there are error suppression
-  # comments somewhere in this file.
-  #
-  # Because this is silencing a warning for a nonexistent line, we
-  # only support the very specific NOLINT(build/header_guard) syntax,
-  # and not the general NOLINT or NOLINT(*) syntax.
-  raw_lines = clean_lines.lines_without_raw_strings
-  for i in raw_lines:
-    if Search(r'//\s*NOLINT\(build/header_guard\)', i):
-      return
-
-  # Allow pragma once instead of header guards
-  for i in raw_lines:
-    if Search(r'^\s*#pragma\s+once', i):
-      return
-
-  cppvar = GetHeaderGuardCPPVariable(filename)
-
-  ifndef = ''
-  ifndef_linenum = 0
-  define = ''
-  endif = ''
-  endif_linenum = 0
-  for linenum, line in enumerate(raw_lines):
-    linesplit = line.split()
-    if len(linesplit) >= 2:
-      # find the first occurrence of #ifndef and #define, save arg
-      if not ifndef and linesplit[0] == '#ifndef':
-        # set ifndef to the header guard presented on the #ifndef line.
-        ifndef = linesplit[1]
-        ifndef_linenum = linenum
-      if not define and linesplit[0] == '#define':
-        define = linesplit[1]
-    # find the last occurrence of #endif, save entire line
-    if line.startswith('#endif'):
-      endif = line
-      endif_linenum = linenum
-
-  if not ifndef or not define or ifndef != define:
-    error(filename, 0, 'build/header_guard', 5,
-          'No #ifndef header guard found, suggested CPP variable is: %s' %
-          cppvar)
-    return
-
-  # The guard should be PATH_FILE_H_, but we also allow PATH_FILE_H__
-  # for backward compatibility.
-  if ifndef != cppvar:
-    error_level = 0
-    if ifndef != cppvar + '_':
-      error_level = 5
-
-    ParseNolintSuppressions(filename, raw_lines[ifndef_linenum], ifndef_linenum,
-                            error)
-    error(filename, ifndef_linenum, 'build/header_guard', error_level,
-          '#ifndef header guard has wrong style, please use: %s' % cppvar)
-
-  # Check for "//" comments on endif line.
-  ParseNolintSuppressions(filename, raw_lines[endif_linenum], endif_linenum,
-                          error)
-  match = Match(r'#endif\s*//\s*' + cppvar + r'(_)?\b', endif)
-  if match:
-    if match.group(1) == '_':
-      # Issue low severity warning for deprecated double trailing underscore
-      error(filename, endif_linenum, 'build/header_guard', 0,
-            '#endif line should be "#endif  // %s"' % cppvar)
-    return
-
-  # Didn't find the corresponding "//" comment.  If this file does not
-  # contain any "//" comments at all, it could be that the compiler
-  # only wants "/**/" comments, look for those instead.
-  no_single_line_comments = True
-  for i in xrange(1, len(raw_lines) - 1):
-    line = raw_lines[i]
-    if Match(r'^(?:(?:\'(?:\.|[^\'])*\')|(?:"(?:\.|[^"])*")|[^\'"])*//', line):
-      no_single_line_comments = False
-      break
-
-  if no_single_line_comments:
-    match = Match(r'#endif\s*/\*\s*' + cppvar + r'(_)?\s*\*/', endif)
-    if match:
-      if match.group(1) == '_':
-        # Low severity warning for double trailing underscore
-        error(filename, endif_linenum, 'build/header_guard', 0,
-              '#endif line should be "#endif  /* %s */"' % cppvar)
-      return
-
-  # Didn't find anything
-  error(filename, endif_linenum, 'build/header_guard', 5,
-        '#endif line should be "#endif  // %s"' % cppvar)
-
-
-def CheckHeaderFileIncluded(filename, include_state, error):
-  """Logs an error if a source file does not include its header."""
-
-  # Do not check test files
-  fileinfo = FileInfo(filename)
-  if Search(_TEST_FILE_SUFFIX, fileinfo.BaseName()):
-    return
-
-  for ext in GetHeaderExtensions():
-    basefilename = filename[0:len(filename) - len(fileinfo.Extension())]
-    headerfile = basefilename + '.' + ext
-    if not os.path.exists(headerfile):
-      continue
-    headername = FileInfo(headerfile).RepositoryName()
-    first_include = None
-    for section_list in include_state.include_list:
-      for f in section_list:
-        if headername in f[0] or f[0] in headername:
-          return
-        if not first_include:
-          first_include = f[1]
-
-    error(filename, first_include, 'build/include', 5,
-          '%s should include its header file %s' % (fileinfo.RepositoryName(),
-                                                    headername))
-
-
-def CheckForBadCharacters(filename, lines, error):
-  """Logs an error for each line containing bad characters.
-
-  Two kinds of bad characters:
-
-  1. Unicode replacement characters: These indicate that either the file
-  contained invalid UTF-8 (likely) or Unicode replacement characters (which
-  it shouldn't).  Note that it's possible for this to throw off line
-  numbering if the invalid UTF-8 occurred adjacent to a newline.
-
-  2. NUL bytes.  These are problematic for some tools.
-
-  Args:
-    filename: The name of the current file.
-    lines: An array of strings, each representing a line of the file.
-    error: The function to call with any errors found.
-  """
-  for linenum, line in enumerate(lines):
-    if unicode_escape_decode('\ufffd') in line:
-      error(filename, linenum, 'readability/utf8', 5,
-            'Line contains invalid UTF-8 (or Unicode replacement character).')
-    if '\0' in line:
-      error(filename, linenum, 'readability/nul', 5, 'Line contains NUL byte.')
-
-
-def CheckForNewlineAtEOF(filename, lines, error):
-  """Logs an error if there is no newline char at the end of the file.
-
-  Args:
-    filename: The name of the current file.
-    lines: An array of strings, each representing a line of the file.
-    error: The function to call with any errors found.
-  """
-
-  # The array lines() was created by adding two newlines to the
-  # original file (go figure), then splitting on \n.
-  # To verify that the file ends in \n, we just have to make sure the
-  # last-but-two element of lines() exists and is empty.
-  if len(lines) < 3 or lines[-2]:
-    error(filename, len(lines) - 2, 'whitespace/ending_newline', 5,
-          'Could not find a newline character at the end of the file.')
-
-
-def CheckForMultilineCommentsAndStrings(filename, clean_lines, linenum, error):
-  """Logs an error if we see /* ... */ or "..." that extend past one line.
-
-  /* ... */ comments are legit inside macros, for one line.
-  Otherwise, we prefer // comments, so it's ok to warn about the
-  other.  Likewise, it's ok for strings to extend across multiple
-  lines, as long as a line continuation character (backslash)
-  terminates each line. Although not currently prohibited by the C++
-  style guide, it's ugly and unnecessary. We don't do well with either
-  in this lint program, so we warn about both.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-  line = clean_lines.elided[linenum]
-
-  # Remove all \\ (escaped backslashes) from the line. They are OK, and the
-  # second (escaped) slash may trigger later \" detection erroneously.
-  line = line.replace('\\\\', '')
-
-  if line.count('/*') > line.count('*/'):
-    error(filename, linenum, 'readability/multiline_comment', 5,
-          'Complex multi-line /*...*/-style comment found. '
-          'Lint may give bogus warnings.  '
-          'Consider replacing these with //-style comments, '
-          'with #if 0...#endif, '
-          'or with more clearly structured multi-line comments.')
-
-  if (line.count('"') - line.count('\\"')) % 2:
-    error(filename, linenum, 'readability/multiline_string', 5,
-          'Multi-line string ("...") found.  This lint script doesn\'t '
-          'do well with such strings, and may give bogus warnings.  '
-          'Use C++11 raw strings or concatenation instead.')
-
-
-# (non-threadsafe name, thread-safe alternative, validation pattern)
-#
-# The validation pattern is used to eliminate false positives such as:
-#  _rand();               // false positive due to substring match.
-#  ->rand();              // some member function rand().
-#  ACMRandom rand(seed);  // some variable named rand.
-#  ISAACRandom rand();    // another variable named rand.
-#
-# Basically we require the return value of these functions to be used
-# in some expression context on the same line by matching on some
-# operator before the function name.  This eliminates constructors and
-# member function calls.
-_UNSAFE_FUNC_PREFIX = r'(?:[-+*/=%^&|(<]\s*|>\s+)'
-_THREADING_LIST = (
-    ('asctime(', 'asctime_r(', _UNSAFE_FUNC_PREFIX + r'asctime\([^)]+\)'),
-    ('ctime(', 'ctime_r(', _UNSAFE_FUNC_PREFIX + r'ctime\([^)]+\)'),
-    ('getgrgid(', 'getgrgid_r(', _UNSAFE_FUNC_PREFIX + r'getgrgid\([^)]+\)'),
-    ('getgrnam(', 'getgrnam_r(', _UNSAFE_FUNC_PREFIX + r'getgrnam\([^)]+\)'),
-    ('getlogin(', 'getlogin_r(', _UNSAFE_FUNC_PREFIX + r'getlogin\(\)'),
-    ('getpwnam(', 'getpwnam_r(', _UNSAFE_FUNC_PREFIX + r'getpwnam\([^)]+\)'),
-    ('getpwuid(', 'getpwuid_r(', _UNSAFE_FUNC_PREFIX + r'getpwuid\([^)]+\)'),
-    ('gmtime(', 'gmtime_r(', _UNSAFE_FUNC_PREFIX + r'gmtime\([^)]+\)'),
-    ('localtime(', 'localtime_r(', _UNSAFE_FUNC_PREFIX + r'localtime\([^)]+\)'),
-    ('rand(', 'rand_r(', _UNSAFE_FUNC_PREFIX + r'rand\(\)'),
-    ('strtok(', 'strtok_r(',
-     _UNSAFE_FUNC_PREFIX + r'strtok\([^)]+\)'),
-    ('ttyname(', 'ttyname_r(', _UNSAFE_FUNC_PREFIX + r'ttyname\([^)]+\)'),
-    )
-
-
-def CheckPosixThreading(filename, clean_lines, linenum, error):
-  """Checks for calls to thread-unsafe functions.
-
-  Much code has been originally written without consideration of
-  multi-threading. Also, engineers are relying on their old experience;
-  they have learned posix before threading extensions were added. These
-  tests guide the engineers to use thread-safe functions (when using
-  posix directly).
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-  line = clean_lines.elided[linenum]
-  for single_thread_func, multithread_safe_func, pattern in _THREADING_LIST:
-    # Additional pattern matching check to confirm that this is the
-    # function we are looking for
-    if Search(pattern, line):
-      error(filename, linenum, 'runtime/threadsafe_fn', 2,
-            'Consider using ' + multithread_safe_func +
-            '...) instead of ' + single_thread_func +
-            '...) for improved thread safety.')
-
-
-def CheckVlogArguments(filename, clean_lines, linenum, error):
-  """Checks that VLOG() is only used for defining a logging level.
-
-  For example, VLOG(2) is correct. VLOG(INFO), VLOG(WARNING), VLOG(ERROR), and
-  VLOG(FATAL) are not.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-  line = clean_lines.elided[linenum]
-  if Search(r'\bVLOG\((INFO|ERROR|WARNING|DFATAL|FATAL)\)', line):
-    error(filename, linenum, 'runtime/vlog', 5,
-          'VLOG() should be used with numeric verbosity level.  '
-          'Use LOG() if you want symbolic severity levels.')
-
-# Matches invalid increment: *count++, which moves pointer instead of
-# incrementing a value.
-_RE_PATTERN_INVALID_INCREMENT = re.compile(
-    r'^\s*\*\w+(\+\+|--);')
-
-
-def CheckInvalidIncrement(filename, clean_lines, linenum, error):
-  """Checks for invalid increment *count++.
-
-  For example following function:
-  void increment_counter(int* count) {
-    *count++;
-  }
-  is invalid, because it effectively does count++, moving pointer, and should
-  be replaced with ++*count, (*count)++ or *count += 1.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-  line = clean_lines.elided[linenum]
-  if _RE_PATTERN_INVALID_INCREMENT.match(line):
-    error(filename, linenum, 'runtime/invalid_increment', 5,
-          'Changing pointer instead of value (or unused value of operator*).')
-
-
-def IsMacroDefinition(clean_lines, linenum):
-  if Search(r'^#define', clean_lines[linenum]):
-    return True
-
-  if linenum > 0 and Search(r'\\$', clean_lines[linenum - 1]):
-    return True
-
-  return False
-
-
-def IsForwardClassDeclaration(clean_lines, linenum):
-  return Match(r'^\s*(\btemplate\b)*.*class\s+\w+;\s*$', clean_lines[linenum])
-
-
-class _BlockInfo(object):
-  """Stores information about a generic block of code."""
-
-  def __init__(self, linenum, seen_open_brace):
-    self.starting_linenum = linenum
-    self.seen_open_brace = seen_open_brace
-    self.open_parentheses = 0
-    self.inline_asm = _NO_ASM
-    self.check_namespace_indentation = False
-
-  def CheckBegin(self, filename, clean_lines, linenum, error):
-    """Run checks that applies to text up to the opening brace.
-
-    This is mostly for checking the text after the class identifier
-    and the "{", usually where the base class is specified.  For other
-    blocks, there isn't much to check, so we always pass.
-
-    Args:
-      filename: The name of the current file.
-      clean_lines: A CleansedLines instance containing the file.
-      linenum: The number of the line to check.
-      error: The function to call with any errors found.
-    """
-    pass
-
-  def CheckEnd(self, filename, clean_lines, linenum, error):
-    """Run checks that applies to text after the closing brace.
-
-    This is mostly used for checking end of namespace comments.
-
-    Args:
-      filename: The name of the current file.
-      clean_lines: A CleansedLines instance containing the file.
-      linenum: The number of the line to check.
-      error: The function to call with any errors found.
-    """
-    pass
-
-  def IsBlockInfo(self):
-    """Returns true if this block is a _BlockInfo.
-
-    This is convenient for verifying that an object is an instance of
-    a _BlockInfo, but not an instance of any of the derived classes.
-
-    Returns:
-      True for this class, False for derived classes.
-    """
-    return self.__class__ == _BlockInfo
-
-
-class _ExternCInfo(_BlockInfo):
-  """Stores information about an 'extern "C"' block."""
-
-  def __init__(self, linenum):
-    _BlockInfo.__init__(self, linenum, True)
-
-
-class _ClassInfo(_BlockInfo):
-  """Stores information about a class."""
-
-  def __init__(self, name, class_or_struct, clean_lines, linenum):
-    _BlockInfo.__init__(self, linenum, False)
-    self.name = name
-    self.is_derived = False
-    self.check_namespace_indentation = True
-    if class_or_struct == 'struct':
-      self.access = 'public'
-      self.is_struct = True
-    else:
-      self.access = 'private'
-      self.is_struct = False
-
-    # Remember initial indentation level for this class.  Using raw_lines here
-    # instead of elided to account for leading comments.
-    self.class_indent = GetIndentLevel(clean_lines.raw_lines[linenum])
-
-    # Try to find the end of the class.  This will be confused by things like:
-    #   class A {
-    #   } *x = { ...
-    #
-    # But it's still good enough for CheckSectionSpacing.
-    self.last_line = 0
-    depth = 0
-    for i in range(linenum, clean_lines.NumLines()):
-      line = clean_lines.elided[i]
-      depth += line.count('{') - line.count('}')
-      if not depth:
-        self.last_line = i
-        break
-
-  def CheckBegin(self, filename, clean_lines, linenum, error):
-    # Look for a bare ':'
-    if Search('(^|[^:]):($|[^:])', clean_lines.elided[linenum]):
-      self.is_derived = True
-
-  def CheckEnd(self, filename, clean_lines, linenum, error):
-    # If there is a DISALLOW macro, it should appear near the end of
-    # the class.
-    seen_last_thing_in_class = False
-    for i in xrange(linenum - 1, self.starting_linenum, -1):
-      match = Search(
-          r'\b(DISALLOW_COPY_AND_ASSIGN|DISALLOW_IMPLICIT_CONSTRUCTORS)\(' +
-          self.name + r'\)',
-          clean_lines.elided[i])
-      if match:
-        if seen_last_thing_in_class:
-          error(filename, i, 'readability/constructors', 3,
-                match.group(1) + ' should be the last thing in the class')
-        break
-
-      if not Match(r'^\s*$', clean_lines.elided[i]):
-        seen_last_thing_in_class = True
-
-    # Check that closing brace is aligned with beginning of the class.
-    # Only do this if the closing brace is indented by only whitespaces.
-    # This means we will not check single-line class definitions.
-    indent = Match(r'^( *)\}', clean_lines.elided[linenum])
-    if indent and len(indent.group(1)) != self.class_indent:
-      if self.is_struct:
-        parent = 'struct ' + self.name
-      else:
-        parent = 'class ' + self.name
-      error(filename, linenum, 'whitespace/indent', 3,
-            'Closing brace should be aligned with beginning of %s' % parent)
-
-
-class _NamespaceInfo(_BlockInfo):
-  """Stores information about a namespace."""
-
-  def __init__(self, name, linenum):
-    _BlockInfo.__init__(self, linenum, False)
-    self.name = name or ''
-    self.check_namespace_indentation = True
-
-  def CheckEnd(self, filename, clean_lines, linenum, error):
-    """Check end of namespace comments."""
-    line = clean_lines.raw_lines[linenum]
-
-    # Check how many lines is enclosed in this namespace.  Don't issue
-    # warning for missing namespace comments if there aren't enough
-    # lines.  However, do apply checks if there is already an end of
-    # namespace comment and it's incorrect.
-    #
-    # TODO(unknown): We always want to check end of namespace comments
-    # if a namespace is large, but sometimes we also want to apply the
-    # check if a short namespace contained nontrivial things (something
-    # other than forward declarations).  There is currently no logic on
-    # deciding what these nontrivial things are, so this check is
-    # triggered by namespace size only, which works most of the time.
-    if (linenum - self.starting_linenum < 10
-        and not Match(r'^\s*};*\s*(//|/\*).*\bnamespace\b', line)):
-      return
-
-    # Look for matching comment at end of namespace.
-    #
-    # Note that we accept C style "/* */" comments for terminating
-    # namespaces, so that code that terminate namespaces inside
-    # preprocessor macros can be cpplint clean.
-    #
-    # We also accept stuff like "// end of namespace <name>." with the
-    # period at the end.
-    #
-    # Besides these, we don't accept anything else, otherwise we might
-    # get false negatives when existing comment is a substring of the
-    # expected namespace.
-    if self.name:
-      # Named namespace
-      if not Match((r'^\s*};*\s*(//|/\*).*\bnamespace\s+' +
-                    re.escape(self.name) + r'[\*/\.\\\s]*$'),
-                   line):
-        error(filename, linenum, 'readability/namespace', 5,
-              'Namespace should be terminated with "// namespace %s"' %
-              self.name)
-    else:
-      # Anonymous namespace
-      if not Match(r'^\s*};*\s*(//|/\*).*\bnamespace[\*/\.\\\s]*$', line):
-        # If "// namespace anonymous" or "// anonymous namespace (more text)",
-        # mention "// anonymous namespace" as an acceptable form
-        if Match(r'^\s*}.*\b(namespace anonymous|anonymous namespace)\b', line):
-          error(filename, linenum, 'readability/namespace', 5,
-                'Anonymous namespace should be terminated with "// namespace"'
-                ' or "// anonymous namespace"')
-        else:
-          error(filename, linenum, 'readability/namespace', 5,
-                'Anonymous namespace should be terminated with "// namespace"')
-
-
-class _PreprocessorInfo(object):
-  """Stores checkpoints of nesting stacks when #if/#else is seen."""
-
-  def __init__(self, stack_before_if):
-    # The entire nesting stack before #if
-    self.stack_before_if = stack_before_if
-
-    # The entire nesting stack up to #else
-    self.stack_before_else = []
-
-    # Whether we have already seen #else or #elif
-    self.seen_else = False
-
-
-class NestingState(object):
-  """Holds states related to parsing braces."""
-
-  def __init__(self):
-    # Stack for tracking all braces.  An object is pushed whenever we
-    # see a "{", and popped when we see a "}".  Only 3 types of
-    # objects are possible:
-    # - _ClassInfo: a class or struct.
-    # - _NamespaceInfo: a namespace.
-    # - _BlockInfo: some other type of block.
-    self.stack = []
-
-    # Top of the previous stack before each Update().
-    #
-    # Because the nesting_stack is updated at the end of each line, we
-    # had to do some convoluted checks to find out what is the current
-    # scope at the beginning of the line.  This check is simplified by
-    # saving the previous top of nesting stack.
-    #
-    # We could save the full stack, but we only need the top.  Copying
-    # the full nesting stack would slow down cpplint by ~10%.
-    self.previous_stack_top = []
-
-    # Stack of _PreprocessorInfo objects.
-    self.pp_stack = []
-
-  def SeenOpenBrace(self):
-    """Check if we have seen the opening brace for the innermost block.
-
-    Returns:
-      True if we have seen the opening brace, False if the innermost
-      block is still expecting an opening brace.
-    """
-    return (not self.stack) or self.stack[-1].seen_open_brace
-
-  def InNamespaceBody(self):
-    """Check if we are currently one level inside a namespace body.
-
-    Returns:
-      True if top of the stack is a namespace block, False otherwise.
-    """
-    return self.stack and isinstance(self.stack[-1], _NamespaceInfo)
-
-  def InExternC(self):
-    """Check if we are currently one level inside an 'extern "C"' block.
-
-    Returns:
-      True if top of the stack is an extern block, False otherwise.
-    """
-    return self.stack and isinstance(self.stack[-1], _ExternCInfo)
-
-  def InClassDeclaration(self):
-    """Check if we are currently one level inside a class or struct declaration.
-
-    Returns:
-      True if top of the stack is a class/struct, False otherwise.
-    """
-    return self.stack and isinstance(self.stack[-1], _ClassInfo)
-
-  def InAsmBlock(self):
-    """Check if we are currently one level inside an inline ASM block.
-
-    Returns:
-      True if the top of the stack is a block containing inline ASM.
-    """
-    return self.stack and self.stack[-1].inline_asm != _NO_ASM
-
-  def InTemplateArgumentList(self, clean_lines, linenum, pos):
-    """Check if current position is inside template argument list.
-
-    Args:
-      clean_lines: A CleansedLines instance containing the file.
-      linenum: The number of the line to check.
-      pos: position just after the suspected template argument.
-    Returns:
-      True if (linenum, pos) is inside template arguments.
-    """
-    while linenum < clean_lines.NumLines():
-      # Find the earliest character that might indicate a template argument
-      line = clean_lines.elided[linenum]
-      match = Match(r'^[^{};=\[\]\.<>]*(.)', line[pos:])
-      if not match:
-        linenum += 1
-        pos = 0
-        continue
-      token = match.group(1)
-      pos += len(match.group(0))
-
-      # These things do not look like template argument list:
-      #   class Suspect {
-      #   class Suspect x; }
-      if token in ('{', '}', ';'): return False
-
-      # These things look like template argument list:
-      #   template <class Suspect>
-      #   template <class Suspect = default_value>
-      #   template <class Suspect[]>
-      #   template <class Suspect...>
-      if token in ('>', '=', '[', ']', '.'): return True
-
-      # Check if token is an unmatched '<'.
-      # If not, move on to the next character.
-      if token != '<':
-        pos += 1
-        if pos >= len(line):
-          linenum += 1
-          pos = 0
-        continue
-
-      # We can't be sure if we just find a single '<', and need to
-      # find the matching '>'.
-      (_, end_line, end_pos) = CloseExpression(clean_lines, linenum, pos - 1)
-      if end_pos < 0:
-        # Not sure if template argument list or syntax error in file
-        return False
-      linenum = end_line
-      pos = end_pos
-    return False
-
-  def UpdatePreprocessor(self, line):
-    """Update preprocessor stack.
-
-    We need to handle preprocessors due to classes like this:
-      #ifdef SWIG
-      struct ResultDetailsPageElementExtensionPoint {
-      #else
-      struct ResultDetailsPageElementExtensionPoint : public Extension {
-      #endif
-
-    We make the following assumptions (good enough for most files):
-    - Preprocessor condition evaluates to true from #if up to first
-      #else/#elif/#endif.
-
-    - Preprocessor condition evaluates to false from #else/#elif up
-      to #endif.  We still perform lint checks on these lines, but
-      these do not affect nesting stack.
-
-    Args:
-      line: current line to check.
-    """
-    if Match(r'^\s*#\s*(if|ifdef|ifndef)\b', line):
-      # Beginning of #if block, save the nesting stack here.  The saved
-      # stack will allow us to restore the parsing state in the #else case.
-      self.pp_stack.append(_PreprocessorInfo(copy.deepcopy(self.stack)))
-    elif Match(r'^\s*#\s*(else|elif)\b', line):
-      # Beginning of #else block
-      if self.pp_stack:
-        if not self.pp_stack[-1].seen_else:
-          # This is the first #else or #elif block.  Remember the
-          # whole nesting stack up to this point.  This is what we
-          # keep after the #endif.
-          self.pp_stack[-1].seen_else = True
-          self.pp_stack[-1].stack_before_else = copy.deepcopy(self.stack)
-
-        # Restore the stack to how it was before the #if
-        self.stack = copy.deepcopy(self.pp_stack[-1].stack_before_if)
-      else:
-        # TODO(unknown): unexpected #else, issue warning?
-        pass
-    elif Match(r'^\s*#\s*endif\b', line):
-      # End of #if or #else blocks.
-      if self.pp_stack:
-        # If we saw an #else, we will need to restore the nesting
-        # stack to its former state before the #else, otherwise we
-        # will just continue from where we left off.
-        if self.pp_stack[-1].seen_else:
-          # Here we can just use a shallow copy since we are the last
-          # reference to it.
-          self.stack = self.pp_stack[-1].stack_before_else
-        # Drop the corresponding #if
-        self.pp_stack.pop()
-      else:
-        # TODO(unknown): unexpected #endif, issue warning?
-        pass
-
-  # TODO(unknown): Update() is too long, but we will refactor later.
-  def Update(self, filename, clean_lines, linenum, error):
-    """Update nesting state with current line.
-
-    Args:
-      filename: The name of the current file.
-      clean_lines: A CleansedLines instance containing the file.
-      linenum: The number of the line to check.
-      error: The function to call with any errors found.
-    """
-    line = clean_lines.elided[linenum]
-
-    # Remember top of the previous nesting stack.
-    #
-    # The stack is always pushed/popped and not modified in place, so
-    # we can just do a shallow copy instead of copy.deepcopy.  Using
-    # deepcopy would slow down cpplint by ~28%.
-    if self.stack:
-      self.previous_stack_top = self.stack[-1]
-    else:
-      self.previous_stack_top = None
-
-    # Update pp_stack
-    self.UpdatePreprocessor(line)
-
-    # Count parentheses.  This is to avoid adding struct arguments to
-    # the nesting stack.
-    if self.stack:
-      inner_block = self.stack[-1]
-      depth_change = line.count('(') - line.count(')')
-      inner_block.open_parentheses += depth_change
-
-      # Also check if we are starting or ending an inline assembly block.
-      if inner_block.inline_asm in (_NO_ASM, _END_ASM):
-        if (depth_change != 0 and
-            inner_block.open_parentheses == 1 and
-            _MATCH_ASM.match(line)):
-          # Enter assembly block
-          inner_block.inline_asm = _INSIDE_ASM
-        else:
-          # Not entering assembly block.  If previous line was _END_ASM,
-          # we will now shift to _NO_ASM state.
-          inner_block.inline_asm = _NO_ASM
-      elif (inner_block.inline_asm == _INSIDE_ASM and
-            inner_block.open_parentheses == 0):
-        # Exit assembly block
-        inner_block.inline_asm = _END_ASM
-
-    # Consume namespace declaration at the beginning of the line.  Do
-    # this in a loop so that we catch same line declarations like this:
-    #   namespace proto2 { namespace bridge { class MessageSet; } }
-    while True:
-      # Match start of namespace.  The "\b\s*" below catches namespace
-      # declarations even if it weren't followed by a whitespace, this
-      # is so that we don't confuse our namespace checker.  The
-      # missing spaces will be flagged by CheckSpacing.
-      namespace_decl_match = Match(r'^\s*namespace\b\s*([:\w]+)?(.*)$', line)
-      if not namespace_decl_match:
-        break
-
-      new_namespace = _NamespaceInfo(namespace_decl_match.group(1), linenum)
-      self.stack.append(new_namespace)
-
-      line = namespace_decl_match.group(2)
-      if line.find('{') != -1:
-        new_namespace.seen_open_brace = True
-        line = line[line.find('{') + 1:]
-
-    # Look for a class declaration in whatever is left of the line
-    # after parsing namespaces.  The regexp accounts for decorated classes
-    # such as in:
-    #   class LOCKABLE API Object {
-    #   };
-    class_decl_match = Match(
-        r'^(\s*(?:template\s*<[\w\s<>,:=]*>\s*)?'
-        r'(class|struct)\s+(?:[A-Z_]+\s+)*(\w+(?:::\w+)*))'
-        r'(.*)$', line)
-    if (class_decl_match and
-        (not self.stack or self.stack[-1].open_parentheses == 0)):
-      # We do not want to accept classes that are actually template arguments:
-      #   template <class Ignore1,
-      #             class Ignore2 = Default<Args>,
-      #             template <Args> class Ignore3>
-      #   void Function() {};
-      #
-      # To avoid template argument cases, we scan forward and look for
-      # an unmatched '>'.  If we see one, assume we are inside a
-      # template argument list.
-      end_declaration = len(class_decl_match.group(1))
-      if not self.InTemplateArgumentList(clean_lines, linenum, end_declaration):
-        self.stack.append(_ClassInfo(
-            class_decl_match.group(3), class_decl_match.group(2),
-            clean_lines, linenum))
-        line = class_decl_match.group(4)
-
-    # If we have not yet seen the opening brace for the innermost block,
-    # run checks here.
-    if not self.SeenOpenBrace():
-      self.stack[-1].CheckBegin(filename, clean_lines, linenum, error)
-
-    # Update access control if we are inside a class/struct
-    if self.stack and isinstance(self.stack[-1], _ClassInfo):
-      classinfo = self.stack[-1]
-      access_match = Match(
-          r'^(.*)\b(public|private|protected|signals)(\s+(?:slots\s*)?)?'
-          r':(?:[^:]|$)',
-          line)
-      if access_match:
-        classinfo.access = access_match.group(2)
-
-        # Check that access keywords are indented +1 space.  Skip this
-        # check if the keywords are not preceded by whitespaces.
-        indent = access_match.group(1)
-        if (len(indent) != classinfo.class_indent + 1 and
-            Match(r'^\s*$', indent)):
-          if classinfo.is_struct:
-            parent = 'struct ' + classinfo.name
-          else:
-            parent = 'class ' + classinfo.name
-          slots = ''
-          if access_match.group(3):
-            slots = access_match.group(3)
-          error(filename, linenum, 'whitespace/indent', 3,
-                '%s%s: should be indented +1 space inside %s' % (
-                    access_match.group(2), slots, parent))
-
-    # Consume braces or semicolons from what's left of the line
-    while True:
-      # Match first brace, semicolon, or closed parenthesis.
-      matched = Match(r'^[^{;)}]*([{;)}])(.*)$', line)
-      if not matched:
-        break
-
-      token = matched.group(1)
-      if token == '{':
-        # If namespace or class hasn't seen a opening brace yet, mark
-        # namespace/class head as complete.  Push a new block onto the
-        # stack otherwise.
-        if not self.SeenOpenBrace():
-          self.stack[-1].seen_open_brace = True
-        elif Match(r'^extern\s*"[^"]*"\s*\{', line):
-          self.stack.append(_ExternCInfo(linenum))
-        else:
-          self.stack.append(_BlockInfo(linenum, True))
-          if _MATCH_ASM.match(line):
-            self.stack[-1].inline_asm = _BLOCK_ASM
-
-      elif token == ';' or token == ')':
-        # If we haven't seen an opening brace yet, but we already saw
-        # a semicolon, this is probably a forward declaration.  Pop
-        # the stack for these.
-        #
-        # Similarly, if we haven't seen an opening brace yet, but we
-        # already saw a closing parenthesis, then these are probably
-        # function arguments with extra "class" or "struct" keywords.
-        # Also pop these stack for these.
-        if not self.SeenOpenBrace():
-          self.stack.pop()
-      else:  # token == '}'
-        # Perform end of block checks and pop the stack.
-        if self.stack:
-          self.stack[-1].CheckEnd(filename, clean_lines, linenum, error)
-          self.stack.pop()
-      line = matched.group(2)
-
-  def InnermostClass(self):
-    """Get class info on the top of the stack.
-
-    Returns:
-      A _ClassInfo object if we are inside a class, or None otherwise.
-    """
-    for i in range(len(self.stack), 0, -1):
-      classinfo = self.stack[i - 1]
-      if isinstance(classinfo, _ClassInfo):
-        return classinfo
-    return None
-
-  def CheckCompletedBlocks(self, filename, error):
-    """Checks that all classes and namespaces have been completely parsed.
-
-    Call this when all lines in a file have been processed.
-    Args:
-      filename: The name of the current file.
-      error: The function to call with any errors found.
-    """
-    # Note: This test can result in false positives if #ifdef constructs
-    # get in the way of brace matching. See the testBuildClass test in
-    # cpplint_unittest.py for an example of this.
-    for obj in self.stack:
-      if isinstance(obj, _ClassInfo):
-        error(filename, obj.starting_linenum, 'build/class', 5,
-              'Failed to find complete declaration of class %s' %
-              obj.name)
-      elif isinstance(obj, _NamespaceInfo):
-        error(filename, obj.starting_linenum, 'build/namespaces', 5,
-              'Failed to find complete declaration of namespace %s' %
-              obj.name)
-
-
-def CheckForNonStandardConstructs(filename, clean_lines, linenum,
-                                  nesting_state, error):
-  r"""Logs an error if we see certain non-ANSI constructs ignored by gcc-2.
-
-  Complain about several constructs which gcc-2 accepts, but which are
-  not standard C++.  Warning about these in lint is one way to ease the
-  transition to new compilers.
-  - put storage class first (e.g. "static const" instead of "const static").
-  - "%lld" instead of %qd" in printf-type functions.
-  - "%1$d" is non-standard in printf-type functions.
-  - "\%" is an undefined character escape sequence.
-  - text after #endif is not allowed.
-  - invalid inner-style forward declaration.
-  - >? and <? operators, and their >?= and <?= cousins.
-
-  Additionally, check for constructor/destructor style violations and reference
-  members, as it is very convenient to do so while checking for
-  gcc-2 compliance.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    nesting_state: A NestingState instance which maintains information about
-                   the current stack of nested blocks being parsed.
-    error: A callable to which errors are reported, which takes 4 arguments:
-           filename, line number, error level, and message
-  """
-
-  # Remove comments from the line, but leave in strings for now.
-  line = clean_lines.lines[linenum]
-
-  if Search(r'printf\s*\(.*".*%[-+ ]?\d*q', line):
-    error(filename, linenum, 'runtime/printf_format', 3,
-          '%q in format strings is deprecated.  Use %ll instead.')
-
-  if Search(r'printf\s*\(.*".*%\d+\$', line):
-    error(filename, linenum, 'runtime/printf_format', 2,
-          '%N$ formats are unconventional.  Try rewriting to avoid them.')
-
-  # Remove escaped backslashes before looking for undefined escapes.
-  line = line.replace('\\\\', '')
-
-  if Search(r'("|\').*\\(%|\[|\(|{)', line):
-    error(filename, linenum, 'build/printf_format', 3,
-          '%, [, (, and { are undefined character escapes.  Unescape them.')
-
-  # For the rest, work with both comments and strings removed.
-  line = clean_lines.elided[linenum]
-
-  if Search(r'\b(const|volatile|void|char|short|int|long'
-            r'|float|double|signed|unsigned'
-            r'|schar|u?int8|u?int16|u?int32|u?int64)'
-            r'\s+(register|static|extern|typedef)\b',
-            line):
-    error(filename, linenum, 'build/storage_class', 5,
-          'Storage-class specifier (static, extern, typedef, etc) should be '
-          'at the beginning of the declaration.')
-
-  if Match(r'\s*#\s*endif\s*[^/\s]+', line):
-    error(filename, linenum, 'build/endif_comment', 5,
-          'Uncommented text after #endif is non-standard.  Use a comment.')
-
-  if Match(r'\s*class\s+(\w+\s*::\s*)+\w+\s*;', line):
-    error(filename, linenum, 'build/forward_decl', 5,
-          'Inner-style forward declarations are invalid.  Remove this line.')
-
-  if Search(r'(\w+|[+-]?\d+(\.\d*)?)\s*(<|>)\?=?\s*(\w+|[+-]?\d+)(\.\d*)?',
-            line):
-    error(filename, linenum, 'build/deprecated', 3,
-          '>? and <? (max and min) operators are non-standard and deprecated.')
-
-  if Search(r'^\s*const\s*string\s*&\s*\w+\s*;', line):
-    # TODO(unknown): Could it be expanded safely to arbitrary references,
-    # without triggering too many false positives? The first
-    # attempt triggered 5 warnings for mostly benign code in the regtest, hence
-    # the restriction.
-    # Here's the original regexp, for the reference:
-    # type_name = r'\w+((\s*::\s*\w+)|(\s*<\s*\w+?\s*>))?'
-    # r'\s*const\s*' + type_name + '\s*&\s*\w+\s*;'
-    error(filename, linenum, 'runtime/member_string_references', 2,
-          'const string& members are dangerous. It is much better to use '
-          'alternatives, such as pointers or simple constants.')
-
-  # Everything else in this function operates on class declarations.
-  # Return early if the top of the nesting stack is not a class, or if
-  # the class head is not completed yet.
-  classinfo = nesting_state.InnermostClass()
-  if not classinfo or not classinfo.seen_open_brace:
-    return
-
-  # The class may have been declared with namespace or classname qualifiers.
-  # The constructor and destructor will not have those qualifiers.
-  base_classname = classinfo.name.split('::')[-1]
-
-  # Look for single-argument constructors that aren't marked explicit.
-  # Technically a valid construct, but against style.
-  explicit_constructor_match = Match(
-      r'\s+(?:(?:inline|constexpr)\s+)*(explicit\s+)?'
-      r'(?:(?:inline|constexpr)\s+)*%s\s*'
-      r'\(((?:[^()]|\([^()]*\))*)\)'
-      % re.escape(base_classname),
-      line)
-
-  if explicit_constructor_match:
-    is_marked_explicit = explicit_constructor_match.group(1)
-
-    if not explicit_constructor_match.group(2):
-      constructor_args = []
-    else:
-      constructor_args = explicit_constructor_match.group(2).split(',')
-
-    # collapse arguments so that commas in template parameter lists and function
-    # argument parameter lists don't split arguments in two
-    i = 0
-    while i < len(constructor_args):
-      constructor_arg = constructor_args[i]
-      while (constructor_arg.count('<') > constructor_arg.count('>') or
-             constructor_arg.count('(') > constructor_arg.count(')')):
-        constructor_arg += ',' + constructor_args[i + 1]
-        del constructor_args[i + 1]
-      constructor_args[i] = constructor_arg
-      i += 1
-
-    variadic_args = [arg for arg in constructor_args if '&&...' in arg]
-    defaulted_args = [arg for arg in constructor_args if '=' in arg]
-    noarg_constructor = (not constructor_args or  # empty arg list
-                         # 'void' arg specifier
-                         (len(constructor_args) == 1 and
-                          constructor_args[0].strip() == 'void'))
-    onearg_constructor = ((len(constructor_args) == 1 and  # exactly one arg
-                           not noarg_constructor) or
-                          # all but at most one arg defaulted
-                          (len(constructor_args) >= 1 and
-                           not noarg_constructor and
-                           len(defaulted_args) >= len(constructor_args) - 1) or
-                          # variadic arguments with zero or one argument
-                          (len(constructor_args) <= 2 and
-                           len(variadic_args) >= 1))
-    initializer_list_constructor = bool(
-        onearg_constructor and
-        Search(r'\bstd\s*::\s*initializer_list\b', constructor_args[0]))
-    copy_constructor = bool(
-        onearg_constructor and
-        Match(r'(const\s+)?%s(\s*<[^>]*>)?(\s+const)?\s*(?:<\w+>\s*)?&'
-              % re.escape(base_classname), constructor_args[0].strip()))
-
-    if (not is_marked_explicit and
-        onearg_constructor and
-        not initializer_list_constructor and
-        not copy_constructor):
-      if defaulted_args or variadic_args:
-        error(filename, linenum, 'runtime/explicit', 5,
-              'Constructors callable with one argument '
-              'should be marked explicit.')
-      else:
-        error(filename, linenum, 'runtime/explicit', 5,
-              'Single-parameter constructors should be marked explicit.')
-    elif is_marked_explicit and not onearg_constructor:
-      if noarg_constructor:
-        error(filename, linenum, 'runtime/explicit', 5,
-              'Zero-parameter constructors should not be marked explicit.')
-
-
-def CheckSpacingForFunctionCall(filename, clean_lines, linenum, error):
-  """Checks for the correctness of various spacing around function calls.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-  line = clean_lines.elided[linenum]
-
-  # Since function calls often occur inside if/for/while/switch
-  # expressions - which have their own, more liberal conventions - we
-  # first see if we should be looking inside such an expression for a
-  # function call, to which we can apply more strict standards.
-  fncall = line    # if there's no control flow construct, look at whole line
-  for pattern in (r'\bif\s*\((.*)\)\s*{',
-                  r'\bfor\s*\((.*)\)\s*{',
-                  r'\bwhile\s*\((.*)\)\s*[{;]',
-                  r'\bswitch\s*\((.*)\)\s*{'):
-    match = Search(pattern, line)
-    if match:
-      fncall = match.group(1)    # look inside the parens for function calls
-      break
-
-  # Except in if/for/while/switch, there should never be space
-  # immediately inside parens (eg "f( 3, 4 )").  We make an exception
-  # for nested parens ( (a+b) + c ).  Likewise, there should never be
-  # a space before a ( when it's a function argument.  I assume it's a
-  # function argument when the char before the whitespace is legal in
-  # a function name (alnum + _) and we're not starting a macro. Also ignore
-  # pointers and references to arrays and functions coz they're too tricky:
-  # we use a very simple way to recognize these:
-  # " (something)(maybe-something)" or
-  # " (something)(maybe-something," or
-  # " (something)[something]"
-  # Note that we assume the contents of [] to be short enough that
-  # they'll never need to wrap.
-  if (  # Ignore control structures.
-      not Search(r'\b(if|for|while|switch|return|new|delete|catch|sizeof)\b',
-                 fncall) and
-      # Ignore pointers/references to functions.
-      not Search(r' \([^)]+\)\([^)]*(\)|,$)', fncall) and
-      # Ignore pointers/references to arrays.
-      not Search(r' \([^)]+\)\[[^\]]+\]', fncall)):
-    if Search(r'\w\s*\(\s(?!\s*\\$)', fncall):      # a ( used for a fn call
-      error(filename, linenum, 'whitespace/parens', 4,
-            'Extra space after ( in function call')
-    elif Search(r'\(\s+(?!(\s*\\)|\()', fncall):
-      error(filename, linenum, 'whitespace/parens', 2,
-            'Extra space after (')
-    if (Search(r'\w\s+\(', fncall) and
-        not Search(r'_{0,2}asm_{0,2}\s+_{0,2}volatile_{0,2}\s+\(', fncall) and
-        not Search(r'#\s*define|typedef|using\s+\w+\s*=', fncall) and
-        not Search(r'\w\s+\((\w+::)*\*\w+\)\(', fncall) and
-        not Search(r'\bcase\s+\(', fncall)):
-      # TODO(unknown): Space after an operator function seem to be a common
-      # error, silence those for now by restricting them to highest verbosity.
-      if Search(r'\boperator_*\b', line):
-        error(filename, linenum, 'whitespace/parens', 0,
-              'Extra space before ( in function call')
-      else:
-        error(filename, linenum, 'whitespace/parens', 4,
-              'Extra space before ( in function call')
-    # If the ) is followed only by a newline or a { + newline, assume it's
-    # part of a control statement (if/while/etc), and don't complain
-    if Search(r'[^)]\s+\)\s*[^{\s]', fncall):
-      # If the closing parenthesis is preceded by only whitespaces,
-      # try to give a more descriptive error message.
-      if Search(r'^\s+\)', fncall):
-        error(filename, linenum, 'whitespace/parens', 2,
-              'Closing ) should be moved to the previous line')
-      else:
-        error(filename, linenum, 'whitespace/parens', 2,
-              'Extra space before )')
-
-
-def IsBlankLine(line):
-  """Returns true if the given line is blank.
-
-  We consider a line to be blank if the line is empty or consists of
-  only white spaces.
-
-  Args:
-    line: A line of a string.
-
-  Returns:
-    True, if the given line is blank.
-  """
-  return not line or line.isspace()
-
-
-def CheckForNamespaceIndentation(filename, nesting_state, clean_lines, line,
-                                 error):
-  is_namespace_indent_item = (
-      len(nesting_state.stack) > 1 and
-      nesting_state.stack[-1].check_namespace_indentation and
-      isinstance(nesting_state.previous_stack_top, _NamespaceInfo) and
-      nesting_state.previous_stack_top == nesting_state.stack[-2])
-
-  if ShouldCheckNamespaceIndentation(nesting_state, is_namespace_indent_item,
-                                     clean_lines.elided, line):
-    CheckItemIndentationInNamespace(filename, clean_lines.elided,
-                                    line, error)
-
-
-def CheckForFunctionLengths(filename, clean_lines, linenum,
-                            function_state, error):
-  """Reports for long function bodies.
-
-  For an overview why this is done, see:
-  https://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Write_Short_Functions
-
-  Uses a simplistic algorithm assuming other style guidelines
-  (especially spacing) are followed.
-  Only checks unindented functions, so class members are unchecked.
-  Trivial bodies are unchecked, so constructors with huge initializer lists
-  may be missed.
-  Blank/comment lines are not counted so as to avoid encouraging the removal
-  of vertical space and comments just to get through a lint check.
-  NOLINT *on the last line of a function* disables this check.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    function_state: Current function name and lines in body so far.
-    error: The function to call with any errors found.
-  """
-  lines = clean_lines.lines
-  line = lines[linenum]
-  joined_line = ''
-
-  starting_func = False
-  regexp = r'(\w(\w|::|\*|\&|\s)*)\('  # decls * & space::name( ...
-  match_result = Match(regexp, line)
-  if match_result:
-    # If the name is all caps and underscores, figure it's a macro and
-    # ignore it, unless it's TEST or TEST_F.
-    function_name = match_result.group(1).split()[-1]
-    if function_name == 'TEST' or function_name == 'TEST_F' or (
-        not Match(r'[A-Z_]+$', function_name)):
-      starting_func = True
-
-  if starting_func:
-    body_found = False
-    for start_linenum in xrange(linenum, clean_lines.NumLines()):
-      start_line = lines[start_linenum]
-      joined_line += ' ' + start_line.lstrip()
-      if Search(r'(;|})', start_line):  # Declarations and trivial functions
-        body_found = True
-        break                              # ... ignore
-      elif Search(r'{', start_line):
-        body_found = True
-        function = Search(r'((\w|:)*)\(', line).group(1)
-        if Match(r'TEST', function):    # Handle TEST... macros
-          parameter_regexp = Search(r'(\(.*\))', joined_line)
-          if parameter_regexp:             # Ignore bad syntax
-            function += parameter_regexp.group(1)
-        else:
-          function += '()'
-        function_state.Begin(function)
-        break
-    if not body_found:
-      # No body for the function (or evidence of a non-function) was found.
-      error(filename, linenum, 'readability/fn_size', 5,
-            'Lint failed to find start of function body.')
-  elif Match(r'^\}\s*$', line):  # function end
-    function_state.Check(error, filename, linenum)
-    function_state.End()
-  elif not Match(r'^\s*$', line):
-    function_state.Count()  # Count non-blank/non-comment lines.
-
-
-_RE_PATTERN_TODO = re.compile(r'^//(\s*)TODO(\(.+?\))?:?(\s|$)?')
-
-
-def CheckComment(line, filename, linenum, next_line_start, error):
-  """Checks for common mistakes in comments.
-
-  Args:
-    line: The line in question.
-    filename: The name of the current file.
-    linenum: The number of the line to check.
-    next_line_start: The first non-whitespace column of the next line.
-    error: The function to call with any errors found.
-  """
-  commentpos = line.find('//')
-  if commentpos != -1:
-    # Check if the // may be in quotes.  If so, ignore it
-    if re.sub(r'\\.', '', line[0:commentpos]).count('"') % 2 == 0:
-      # Allow one space for new scopes, two spaces otherwise:
-      if (not (Match(r'^.*{ *//', line) and next_line_start == commentpos) and
-          ((commentpos >= 1 and
-            line[commentpos-1] not in string.whitespace) or
-           (commentpos >= 2 and
-            line[commentpos-2] not in string.whitespace))):
-        error(filename, linenum, 'whitespace/comments', 2,
-              'At least two spaces is best between code and comments')
-
-      # Checks for common mistakes in TODO comments.
-      comment = line[commentpos:]
-      match = _RE_PATTERN_TODO.match(comment)
-      if match:
-        # One whitespace is correct; zero whitespace is handled elsewhere.
-        leading_whitespace = match.group(1)
-        if len(leading_whitespace) > 1:
-          error(filename, linenum, 'whitespace/todo', 2,
-                'Too many spaces before TODO')
-
-        username = match.group(2)
-        if not username:
-          error(filename, linenum, 'readability/todo', 2,
-                'Missing username in TODO; it should look like '
-                '"// TODO(my_username): Stuff."')
-
-        middle_whitespace = match.group(3)
-        # Comparisons made explicit for correctness -- pylint: disable=g-explicit-bool-comparison
-        if middle_whitespace != ' ' and middle_whitespace != '':
-          error(filename, linenum, 'whitespace/todo', 2,
-                'TODO(my_username) should be followed by a space')
-
-      # If the comment contains an alphanumeric character, there
-      # should be a space somewhere between it and the // unless
-      # it's a /// or //! Doxygen comment.
-      if (Match(r'//[^ ]*\w', comment) and
-          not Match(r'(///|//\!)(\s+|$)', comment)):
-        error(filename, linenum, 'whitespace/comments', 4,
-              'Should have a space between // and comment')
-
-
-def CheckSpacing(filename, clean_lines, linenum, nesting_state, error):
-  """Checks for the correctness of various spacing issues in the code.
-
-  Things we check for: spaces around operators, spaces after
-  if/for/while/switch, no spaces around parens in function calls, two
-  spaces between code and comment, don't start a block with a blank
-  line, don't end a function with a blank line, don't add a blank line
-  after public/protected/private, don't have too many blank lines in a row.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    nesting_state: A NestingState instance which maintains information about
-                   the current stack of nested blocks being parsed.
-    error: The function to call with any errors found.
-  """
-
-  # Don't use "elided" lines here, otherwise we can't check commented lines.
-  # Don't want to use "raw" either, because we don't want to check inside C++11
-  # raw strings,
-  raw = clean_lines.lines_without_raw_strings
-  line = raw[linenum]
-
-  # Before nixing comments, check if the line is blank for no good
-  # reason.  This includes the first line after a block is opened, and
-  # blank lines at the end of a function (ie, right before a line like '}'
-  #
-  # Skip all the blank line checks if we are immediately inside a
-  # namespace body.  In other words, don't issue blank line warnings
-  # for this block:
-  #   namespace {
-  #
-  #   }
-  #
-  # A warning about missing end of namespace comments will be issued instead.
-  #
-  # Also skip blank line checks for 'extern "C"' blocks, which are formatted
-  # like namespaces.
-  if (IsBlankLine(line) and
-      not nesting_state.InNamespaceBody() and
-      not nesting_state.InExternC()):
-    elided = clean_lines.elided
-    prev_line = elided[linenum - 1]
-    prevbrace = prev_line.rfind('{')
-    # TODO(unknown): Don't complain if line before blank line, and line after,
-    #                both start with alnums and are indented the same amount.
-    #                This ignores whitespace at the start of a namespace block
-    #                because those are not usually indented.
-    if prevbrace != -1 and prev_line[prevbrace:].find('}') == -1:
-      # OK, we have a blank line at the start of a code block.  Before we
-      # complain, we check if it is an exception to the rule: The previous
-      # non-empty line has the parameters of a function header that are indented
-      # 4 spaces (because they did not fit in a 80 column line when placed on
-      # the same line as the function name).  We also check for the case where
-      # the previous line is indented 6 spaces, which may happen when the
-      # initializers of a constructor do not fit into a 80 column line.
-      exception = False
-      if Match(r' {6}\w', prev_line):  # Initializer list?
-        # We are looking for the opening column of initializer list, which
-        # should be indented 4 spaces to cause 6 space indentation afterwards.
-        search_position = linenum-2
-        while (search_position >= 0
-               and Match(r' {6}\w', elided[search_position])):
-          search_position -= 1
-        exception = (search_position >= 0
-                     and elided[search_position][:5] == '    :')
-      else:
-        # Search for the function arguments or an initializer list.  We use a
-        # simple heuristic here: If the line is indented 4 spaces; and we have a
-        # closing paren, without the opening paren, followed by an opening brace
-        # or colon (for initializer lists) we assume that it is the last line of
-        # a function header.  If we have a colon indented 4 spaces, it is an
-        # initializer list.
-        exception = (Match(r' {4}\w[^\(]*\)\s*(const\s*)?(\{\s*$|:)',
-                           prev_line)
-                     or Match(r' {4}:', prev_line))
-
-      if not exception:
-        error(filename, linenum, 'whitespace/blank_line', 2,
-              'Redundant blank line at the start of a code block '
-              'should be deleted.')
-    # Ignore blank lines at the end of a block in a long if-else
-    # chain, like this:
-    #   if (condition1) {
-    #     // Something followed by a blank line
-    #
-    #   } else if (condition2) {
-    #     // Something else
-    #   }
-    if linenum + 1 < clean_lines.NumLines():
-      next_line = raw[linenum + 1]
-      if (next_line
-          and Match(r'\s*}', next_line)
-          and next_line.find('} else ') == -1):
-        error(filename, linenum, 'whitespace/blank_line', 3,
-              'Redundant blank line at the end of a code block '
-              'should be deleted.')
-
-    matched = Match(r'\s*(public|protected|private):', prev_line)
-    if matched:
-      error(filename, linenum, 'whitespace/blank_line', 3,
-            'Do not leave a blank line after "%s:"' % matched.group(1))
-
-  # Next, check comments
-  next_line_start = 0
-  if linenum + 1 < clean_lines.NumLines():
-    next_line = raw[linenum + 1]
-    next_line_start = len(next_line) - len(next_line.lstrip())
-  CheckComment(line, filename, linenum, next_line_start, error)
-
-  # get rid of comments and strings
-  line = clean_lines.elided[linenum]
-
-  # You shouldn't have spaces before your brackets, except maybe after
-  # 'delete []' or 'return []() {};'
-  if Search(r'\w\s+\[', line) and not Search(r'(?:delete|return)\s+\[', line):
-    error(filename, linenum, 'whitespace/braces', 5,
-          'Extra space before [')
-
-  # In range-based for, we wanted spaces before and after the colon, but
-  # not around "::" tokens that might appear.
-  if (Search(r'for *\(.*[^:]:[^: ]', line) or
-      Search(r'for *\(.*[^: ]:[^:]', line)):
-    error(filename, linenum, 'whitespace/forcolon', 2,
-          'Missing space around colon in range-based for loop')
-
-
-def CheckOperatorSpacing(filename, clean_lines, linenum, error):
-  """Checks for horizontal spacing around operators.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-  line = clean_lines.elided[linenum]
-
-  # Don't try to do spacing checks for operator methods.  Do this by
-  # replacing the troublesome characters with something else,
-  # preserving column position for all other characters.
-  #
-  # The replacement is done repeatedly to avoid false positives from
-  # operators that call operators.
-  while True:
-    match = Match(r'^(.*\boperator\b)(\S+)(\s*\(.*)$', line)
-    if match:
-      line = match.group(1) + ('_' * len(match.group(2))) + match.group(3)
-    else:
-      break
-
-  # We allow no-spaces around = within an if: "if ( (a=Foo()) == 0 )".
-  # Otherwise not.  Note we only check for non-spaces on *both* sides;
-  # sometimes people put non-spaces on one side when aligning ='s among
-  # many lines (not that this is behavior that I approve of...)
-  if ((Search(r'[\w.]=', line) or
-       Search(r'=[\w.]', line))
-      and not Search(r'\b(if|while|for) ', line)
-      # Operators taken from [lex.operators] in C++11 standard.
-      and not Search(r'(>=|<=|==|!=|&=|\^=|\|=|\+=|\*=|\/=|\%=)', line)
-      and not Search(r'operator=', line)):
-    error(filename, linenum, 'whitespace/operators', 4,
-          'Missing spaces around =')
-
-  # It's ok not to have spaces around binary operators like + - * /, but if
-  # there's too little whitespace, we get concerned.  It's hard to tell,
-  # though, so we punt on this one for now.  TODO.
-
-  # You should always have whitespace around binary operators.
-  #
-  # Check <= and >= first to avoid false positives with < and >, then
-  # check non-include lines for spacing around < and >.
-  #
-  # If the operator is followed by a comma, assume it's be used in a
-  # macro context and don't do any checks.  This avoids false
-  # positives.
-  #
-  # Note that && is not included here.  This is because there are too
-  # many false positives due to RValue references.
-  match = Search(r'[^<>=!\s](==|!=|<=|>=|\|\|)[^<>=!\s,;\)]', line)
-  if match:
-    error(filename, linenum, 'whitespace/operators', 3,
-          'Missing spaces around %s' % match.group(1))
-  elif not Match(r'#.*include', line):
-    # Look for < that is not surrounded by spaces.  This is only
-    # triggered if both sides are missing spaces, even though
-    # technically should should flag if at least one side is missing a
-    # space.  This is done to avoid some false positives with shifts.
-    match = Match(r'^(.*[^\s<])<[^\s=<,]', line)
-    if match:
-      (_, _, end_pos) = CloseExpression(
-          clean_lines, linenum, len(match.group(1)))
-      if end_pos <= -1:
-        error(filename, linenum, 'whitespace/operators', 3,
-              'Missing spaces around <')
-
-    # Look for > that is not surrounded by spaces.  Similar to the
-    # above, we only trigger if both sides are missing spaces to avoid
-    # false positives with shifts.
-    match = Match(r'^(.*[^-\s>])>[^\s=>,]', line)
-    if match:
-      (_, _, start_pos) = ReverseCloseExpression(
-          clean_lines, linenum, len(match.group(1)))
-      if start_pos <= -1:
-        error(filename, linenum, 'whitespace/operators', 3,
-              'Missing spaces around >')
-
-  # We allow no-spaces around << when used like this: 10<<20, but
-  # not otherwise (particularly, not when used as streams)
-  #
-  # We also allow operators following an opening parenthesis, since
-  # those tend to be macros that deal with operators.
-  match = Search(r'(operator|[^\s(<])(?:L|UL|LL|ULL|l|ul|ll|ull)?<<([^\s,=<])', line)
-  if (match and not (match.group(1).isdigit() and match.group(2).isdigit()) and
-      not (match.group(1) == 'operator' and match.group(2) == ';')):
-    error(filename, linenum, 'whitespace/operators', 3,
-          'Missing spaces around <<')
-
-  # We allow no-spaces around >> for almost anything.  This is because
-  # C++11 allows ">>" to close nested templates, which accounts for
-  # most cases when ">>" is not followed by a space.
-  #
-  # We still warn on ">>" followed by alpha character, because that is
-  # likely due to ">>" being used for right shifts, e.g.:
-  #   value >> alpha
-  #
-  # When ">>" is used to close templates, the alphanumeric letter that
-  # follows would be part of an identifier, and there should still be
-  # a space separating the template type and the identifier.
-  #   type<type<type>> alpha
-  match = Search(r'>>[a-zA-Z_]', line)
-  if match:
-    error(filename, linenum, 'whitespace/operators', 3,
-          'Missing spaces around >>')
-
-  # There shouldn't be space around unary operators
-  match = Search(r'(!\s|~\s|[\s]--[\s;]|[\s]\+\+[\s;])', line)
-  if match:
-    error(filename, linenum, 'whitespace/operators', 4,
-          'Extra space for operator %s' % match.group(1))
-
-
-def CheckParenthesisSpacing(filename, clean_lines, linenum, error):
-  """Checks for horizontal spacing around parentheses.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-  line = clean_lines.elided[linenum]
-
-  # No spaces after an if, while, switch, or for
-  match = Search(r' (if\(|for\(|while\(|switch\()', line)
-  if match:
-    error(filename, linenum, 'whitespace/parens', 5,
-          'Missing space before ( in %s' % match.group(1))
-
-  # For if/for/while/switch, the left and right parens should be
-  # consistent about how many spaces are inside the parens, and
-  # there should either be zero or one spaces inside the parens.
-  # We don't want: "if ( foo)" or "if ( foo   )".
-  # Exception: "for ( ; foo; bar)" and "for (foo; bar; )" are allowed.
-  match = Search(r'\b(if|for|while|switch)\s*'
-                 r'\(([ ]*)(.).*[^ ]+([ ]*)\)\s*{\s*$',
-                 line)
-  if match:
-    if len(match.group(2)) != len(match.group(4)):
-      if not (match.group(3) == ';' and
-              len(match.group(2)) == 1 + len(match.group(4)) or
-              not match.group(2) and Search(r'\bfor\s*\(.*; \)', line)):
-        error(filename, linenum, 'whitespace/parens', 5,
-              'Mismatching spaces inside () in %s' % match.group(1))
-    if len(match.group(2)) not in [0, 1]:
-      error(filename, linenum, 'whitespace/parens', 5,
-            'Should have zero or one spaces inside ( and ) in %s' %
-            match.group(1))
-
-
-def CheckCommaSpacing(filename, clean_lines, linenum, error):
-  """Checks for horizontal spacing near commas and semicolons.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-  raw = clean_lines.lines_without_raw_strings
-  line = clean_lines.elided[linenum]
-
-  # You should always have a space after a comma (either as fn arg or operator)
-  #
-  # This does not apply when the non-space character following the
-  # comma is another comma, since the only time when that happens is
-  # for empty macro arguments.
-  #
-  # We run this check in two passes: first pass on elided lines to
-  # verify that lines contain missing whitespaces, second pass on raw
-  # lines to confirm that those missing whitespaces are not due to
-  # elided comments.
-  if (Search(r',[^,\s]', ReplaceAll(r'\boperator\s*,\s*\(', 'F(', line)) and
-      Search(r',[^,\s]', raw[linenum])):
-    error(filename, linenum, 'whitespace/comma', 3,
-          'Missing space after ,')
-
-  # You should always have a space after a semicolon
-  # except for few corner cases
-  # TODO(unknown): clarify if 'if (1) { return 1;}' is requires one more
-  # space after ;
-  if Search(r';[^\s};\\)/]', line):
-    error(filename, linenum, 'whitespace/semicolon', 3,
-          'Missing space after ;')
-
-
-def _IsType(clean_lines, nesting_state, expr):
-  """Check if expression looks like a type name, returns true if so.
-
-  Args:
-    clean_lines: A CleansedLines instance containing the file.
-    nesting_state: A NestingState instance which maintains information about
-                   the current stack of nested blocks being parsed.
-    expr: The expression to check.
-  Returns:
-    True, if token looks like a type.
-  """
-  # Keep only the last token in the expression
-  last_word = Match(r'^.*(\b\S+)$', expr)
-  if last_word:
-    token = last_word.group(1)
-  else:
-    token = expr
-
-  # Match native types and stdint types
-  if _TYPES.match(token):
-    return True
-
-  # Try a bit harder to match templated types.  Walk up the nesting
-  # stack until we find something that resembles a typename
-  # declaration for what we are looking for.
-  typename_pattern = (r'\b(?:typename|class|struct)\s+' + re.escape(token) +
-                      r'\b')
-  block_index = len(nesting_state.stack) - 1
-  while block_index >= 0:
-    if isinstance(nesting_state.stack[block_index], _NamespaceInfo):
-      return False
-
-    # Found where the opening brace is.  We want to scan from this
-    # line up to the beginning of the function, minus a few lines.
-    #   template <typename Type1,  // stop scanning here
-    #             ...>
-    #   class C
-    #     : public ... {  // start scanning here
-    last_line = nesting_state.stack[block_index].starting_linenum
-
-    next_block_start = 0
-    if block_index > 0:
-      next_block_start = nesting_state.stack[block_index - 1].starting_linenum
-    first_line = last_line
-    while first_line >= next_block_start:
-      if clean_lines.elided[first_line].find('template') >= 0:
-        break
-      first_line -= 1
-    if first_line < next_block_start:
-      # Didn't find any "template" keyword before reaching the next block,
-      # there are probably no template things to check for this block
-      block_index -= 1
-      continue
-
-    # Look for typename in the specified range
-    for i in xrange(first_line, last_line + 1, 1):
-      if Search(typename_pattern, clean_lines.elided[i]):
-        return True
-    block_index -= 1
-
-  return False
-
-
-def CheckBracesSpacing(filename, clean_lines, linenum, nesting_state, error):
-  """Checks for horizontal spacing near commas.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    nesting_state: A NestingState instance which maintains information about
-                   the current stack of nested blocks being parsed.
-    error: The function to call with any errors found.
-  """
-  line = clean_lines.elided[linenum]
-
-  # Except after an opening paren, or after another opening brace (in case of
-  # an initializer list, for instance), you should have spaces before your
-  # braces when they are delimiting blocks, classes, namespaces etc.
-  # And since you should never have braces at the beginning of a line,
-  # this is an easy test.  Except that braces used for initialization don't
-  # follow the same rule; we often don't want spaces before those.
-  match = Match(r'^(.*[^ ({>]){', line)
-
-  if match:
-    # Try a bit harder to check for brace initialization.  This
-    # happens in one of the following forms:
-    #   Constructor() : initializer_list_{} { ... }
-    #   Constructor{}.MemberFunction()
-    #   Type variable{};
-    #   FunctionCall(type{}, ...);
-    #   LastArgument(..., type{});
-    #   LOG(INFO) << type{} << " ...";
-    #   map_of_type[{...}] = ...;
-    #   ternary = expr ? new type{} : nullptr;
-    #   OuterTemplate<InnerTemplateConstructor<Type>{}>
-    #
-    # We check for the character following the closing brace, and
-    # silence the warning if it's one of those listed above, i.e.
-    # "{.;,)<>]:".
-    #
-    # To account for nested initializer list, we allow any number of
-    # closing braces up to "{;,)<".  We can't simply silence the
-    # warning on first sight of closing brace, because that would
-    # cause false negatives for things that are not initializer lists.
-    #   Silence this:         But not this:
-    #     Outer{                if (...) {
-    #       Inner{...}            if (...){  // Missing space before {
-    #     };                    }
-    #
-    # There is a false negative with this approach if people inserted
-    # spurious semicolons, e.g. "if (cond){};", but we will catch the
-    # spurious semicolon with a separate check.
-    leading_text = match.group(1)
-    (endline, endlinenum, endpos) = CloseExpression(
-        clean_lines, linenum, len(match.group(1)))
-    trailing_text = ''
-    if endpos > -1:
-      trailing_text = endline[endpos:]
-    for offset in xrange(endlinenum + 1,
-                         min(endlinenum + 3, clean_lines.NumLines() - 1)):
-      trailing_text += clean_lines.elided[offset]
-    # We also suppress warnings for `uint64_t{expression}` etc., as the style
-    # guide recommends brace initialization for integral types to avoid
-    # overflow/truncation.
-    if (not Match(r'^[\s}]*[{.;,)<>\]:]', trailing_text)
-        and not _IsType(clean_lines, nesting_state, leading_text)):
-      error(filename, linenum, 'whitespace/braces', 5,
-            'Missing space before {')
-
-  # Make sure '} else {' has spaces.
-  if Search(r'}else', line):
-    error(filename, linenum, 'whitespace/braces', 5,
-          'Missing space before else')
-
-  # You shouldn't have a space before a semicolon at the end of the line.
-  # There's a special case for "for" since the style guide allows space before
-  # the semicolon there.
-  if Search(r':\s*;\s*$', line):
-    error(filename, linenum, 'whitespace/semicolon', 5,
-          'Semicolon defining empty statement. Use {} instead.')
-  elif Search(r'^\s*;\s*$', line):
-    error(filename, linenum, 'whitespace/semicolon', 5,
-          'Line contains only semicolon. If this should be an empty statement, '
-          'use {} instead.')
-  elif (Search(r'\s+;\s*$', line) and
-        not Search(r'\bfor\b', line)):
-    error(filename, linenum, 'whitespace/semicolon', 5,
-          'Extra space before last semicolon. If this should be an empty '
-          'statement, use {} instead.')
-
-
-def IsDecltype(clean_lines, linenum, column):
-  """Check if the token ending on (linenum, column) is decltype().
-
-  Args:
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: the number of the line to check.
-    column: end column of the token to check.
-  Returns:
-    True if this token is decltype() expression, False otherwise.
-  """
-  (text, _, start_col) = ReverseCloseExpression(clean_lines, linenum, column)
-  if start_col < 0:
-    return False
-  if Search(r'\bdecltype\s*$', text[0:start_col]):
-    return True
-  return False
-
-def CheckSectionSpacing(filename, clean_lines, class_info, linenum, error):
-  """Checks for additional blank line issues related to sections.
-
-  Currently the only thing checked here is blank line before protected/private.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    class_info: A _ClassInfo objects.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-  # Skip checks if the class is small, where small means 25 lines or less.
-  # 25 lines seems like a good cutoff since that's the usual height of
-  # terminals, and any class that can't fit in one screen can't really
-  # be considered "small".
-  #
-  # Also skip checks if we are on the first line.  This accounts for
-  # classes that look like
-  #   class Foo { public: ... };
-  #
-  # If we didn't find the end of the class, last_line would be zero,
-  # and the check will be skipped by the first condition.
-  if (class_info.last_line - class_info.starting_linenum <= 24 or
-      linenum <= class_info.starting_linenum):
-    return
-
-  matched = Match(r'\s*(public|protected|private):', clean_lines.lines[linenum])
-  if matched:
-    # Issue warning if the line before public/protected/private was
-    # not a blank line, but don't do this if the previous line contains
-    # "class" or "struct".  This can happen two ways:
-    #  - We are at the beginning of the class.
-    #  - We are forward-declaring an inner class that is semantically
-    #    private, but needed to be public for implementation reasons.
-    # Also ignores cases where the previous line ends with a backslash as can be
-    # common when defining classes in C macros.
-    prev_line = clean_lines.lines[linenum - 1]
-    if (not IsBlankLine(prev_line) and
-        not Search(r'\b(class|struct)\b', prev_line) and
-        not Search(r'\\$', prev_line)):
-      # Try a bit harder to find the beginning of the class.  This is to
-      # account for multi-line base-specifier lists, e.g.:
-      #   class Derived
-      #       : public Base {
-      end_class_head = class_info.starting_linenum
-      for i in range(class_info.starting_linenum, linenum):
-        if Search(r'\{\s*$', clean_lines.lines[i]):
-          end_class_head = i
-          break
-      if end_class_head < linenum - 1:
-        error(filename, linenum, 'whitespace/blank_line', 3,
-              '"%s:" should be preceded by a blank line' % matched.group(1))
-
-
-def GetPreviousNonBlankLine(clean_lines, linenum):
-  """Return the most recent non-blank line and its line number.
-
-  Args:
-    clean_lines: A CleansedLines instance containing the file contents.
-    linenum: The number of the line to check.
-
-  Returns:
-    A tuple with two elements.  The first element is the contents of the last
-    non-blank line before the current line, or the empty string if this is the
-    first non-blank line.  The second is the line number of that line, or -1
-    if this is the first non-blank line.
-  """
-
-  prevlinenum = linenum - 1
-  while prevlinenum >= 0:
-    prevline = clean_lines.elided[prevlinenum]
-    if not IsBlankLine(prevline):     # if not a blank line...
-      return (prevline, prevlinenum)
-    prevlinenum -= 1
-  return ('', -1)
-
-
-def CheckBraces(filename, clean_lines, linenum, error):
-  """Looks for misplaced braces (e.g. at the end of line).
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-
-  line = clean_lines.elided[linenum]        # get rid of comments and strings
-
-  if Match(r'\s*{\s*$', line):
-    # We allow an open brace to start a line in the case where someone is using
-    # braces in a block to explicitly create a new scope, which is commonly used
-    # to control the lifetime of stack-allocated variables.  Braces are also
-    # used for brace initializers inside function calls.  We don't detect this
-    # perfectly: we just don't complain if the last non-whitespace character on
-    # the previous non-blank line is ',', ';', ':', '(', '{', or '}', or if the
-    # previous line starts a preprocessor block. We also allow a brace on the
-    # following line if it is part of an array initialization and would not fit
-    # within the 80 character limit of the preceding line.
-    prevline = GetPreviousNonBlankLine(clean_lines, linenum)[0]
-    if (not Search(r'[,;:}{(]\s*$', prevline) and
-        not Match(r'\s*#', prevline) and
-        not (GetLineWidth(prevline) > _line_length - 2 and '[]' in prevline)):
-      error(filename, linenum, 'whitespace/braces', 4,
-            '{ should almost always be at the end of the previous line')
-
-  # An else clause should be on the same line as the preceding closing brace.
-  if Match(r'\s*else\b\s*(?:if\b|\{|$)', line):
-    prevline = GetPreviousNonBlankLine(clean_lines, linenum)[0]
-    if Match(r'\s*}\s*$', prevline):
-      error(filename, linenum, 'whitespace/newline', 4,
-            'An else should appear on the same line as the preceding }')
-
-  # If braces come on one side of an else, they should be on both.
-  # However, we have to worry about "else if" that spans multiple lines!
-  if Search(r'else if\s*\(', line):       # could be multi-line if
-    brace_on_left = bool(Search(r'}\s*else if\s*\(', line))
-    # find the ( after the if
-    pos = line.find('else if')
-    pos = line.find('(', pos)
-    if pos > 0:
-      (endline, _, endpos) = CloseExpression(clean_lines, linenum, pos)
-      brace_on_right = endline[endpos:].find('{') != -1
-      if brace_on_left != brace_on_right:    # must be brace after if
-        error(filename, linenum, 'readability/braces', 5,
-              'If an else has a brace on one side, it should have it on both')
-  elif Search(r'}\s*else[^{]*$', line) or Match(r'[^}]*else\s*{', line):
-    error(filename, linenum, 'readability/braces', 5,
-          'If an else has a brace on one side, it should have it on both')
-
-  # Likewise, an else should never have the else clause on the same line
-  if Search(r'\belse [^\s{]', line) and not Search(r'\belse if\b', line):
-    error(filename, linenum, 'whitespace/newline', 4,
-          'Else clause should never be on same line as else (use 2 lines)')
-
-  # In the same way, a do/while should never be on one line
-  if Match(r'\s*do [^\s{]', line):
-    error(filename, linenum, 'whitespace/newline', 4,
-          'do/while clauses should not be on a single line')
-
-  # Check single-line if/else bodies. The style guide says 'curly braces are not
-  # required for single-line statements'. We additionally allow multi-line,
-  # single statements, but we reject anything with more than one semicolon in
-  # it. This means that the first semicolon after the if should be at the end of
-  # its line, and the line after that should have an indent level equal to or
-  # lower than the if. We also check for ambiguous if/else nesting without
-  # braces.
-  if_else_match = Search(r'\b(if\s*\(|else\b)', line)
-  if if_else_match and not Match(r'\s*#', line):
-    if_indent = GetIndentLevel(line)
-    endline, endlinenum, endpos = line, linenum, if_else_match.end()
-    if_match = Search(r'\bif\s*\(', line)
-    if if_match:
-      # This could be a multiline if condition, so find the end first.
-      pos = if_match.end() - 1
-      (endline, endlinenum, endpos) = CloseExpression(clean_lines, linenum, pos)
-    # Check for an opening brace, either directly after the if or on the next
-    # line. If found, this isn't a single-statement conditional.
-    if (not Match(r'\s*{', endline[endpos:])
-        and not (Match(r'\s*$', endline[endpos:])
-                 and endlinenum < (len(clean_lines.elided) - 1)
-                 and Match(r'\s*{', clean_lines.elided[endlinenum + 1]))):
-      while (endlinenum < len(clean_lines.elided)
-             and ';' not in clean_lines.elided[endlinenum][endpos:]):
-        endlinenum += 1
-        endpos = 0
-      if endlinenum < len(clean_lines.elided):
-        endline = clean_lines.elided[endlinenum]
-        # We allow a mix of whitespace and closing braces (e.g. for one-liner
-        # methods) and a single \ after the semicolon (for macros)
-        endpos = endline.find(';')
-        if not Match(r';[\s}]*(\\?)$', endline[endpos:]):
-          # Semicolon isn't the last character, there's something trailing.
-          # Output a warning if the semicolon is not contained inside
-          # a lambda expression.
-          if not Match(r'^[^{};]*\[[^\[\]]*\][^{}]*\{[^{}]*\}\s*\)*[;,]\s*$',
-                       endline):
-            error(filename, linenum, 'readability/braces', 4,
-                  'If/else bodies with multiple statements require braces')
-        elif endlinenum < len(clean_lines.elided) - 1:
-          # Make sure the next line is dedented
-          next_line = clean_lines.elided[endlinenum + 1]
-          next_indent = GetIndentLevel(next_line)
-          # With ambiguous nested if statements, this will error out on the
-          # if that *doesn't* match the else, regardless of whether it's the
-          # inner one or outer one.
-          if (if_match and Match(r'\s*else\b', next_line)
-              and next_indent != if_indent):
-            error(filename, linenum, 'readability/braces', 4,
-                  'Else clause should be indented at the same level as if. '
-                  'Ambiguous nested if/else chains require braces.')
-          elif next_indent > if_indent:
-            error(filename, linenum, 'readability/braces', 4,
-                  'If/else bodies with multiple statements require braces')
-
-
-def CheckTrailingSemicolon(filename, clean_lines, linenum, error):
-  """Looks for redundant trailing semicolon.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-
-  line = clean_lines.elided[linenum]
-
-  # Block bodies should not be followed by a semicolon.  Due to C++11
-  # brace initialization, there are more places where semicolons are
-  # required than not, so we use a whitelist approach to check these
-  # rather than a blacklist.  These are the places where "};" should
-  # be replaced by just "}":
-  # 1. Some flavor of block following closing parenthesis:
-  #    for (;;) {};
-  #    while (...) {};
-  #    switch (...) {};
-  #    Function(...) {};
-  #    if (...) {};
-  #    if (...) else if (...) {};
-  #
-  # 2. else block:
-  #    if (...) else {};
-  #
-  # 3. const member function:
-  #    Function(...) const {};
-  #
-  # 4. Block following some statement:
-  #    x = 42;
-  #    {};
-  #
-  # 5. Block at the beginning of a function:
-  #    Function(...) {
-  #      {};
-  #    }
-  #
-  #    Note that naively checking for the preceding "{" will also match
-  #    braces inside multi-dimensional arrays, but this is fine since
-  #    that expression will not contain semicolons.
-  #
-  # 6. Block following another block:
-  #    while (true) {}
-  #    {};
-  #
-  # 7. End of namespaces:
-  #    namespace {};
-  #
-  #    These semicolons seems far more common than other kinds of
-  #    redundant semicolons, possibly due to people converting classes
-  #    to namespaces.  For now we do not warn for this case.
-  #
-  # Try matching case 1 first.
-  match = Match(r'^(.*\)\s*)\{', line)
-  if match:
-    # Matched closing parenthesis (case 1).  Check the token before the
-    # matching opening parenthesis, and don't warn if it looks like a
-    # macro.  This avoids these false positives:
-    #  - macro that defines a base class
-    #  - multi-line macro that defines a base class
-    #  - macro that defines the whole class-head
-    #
-    # But we still issue warnings for macros that we know are safe to
-    # warn, specifically:
-    #  - TEST, TEST_F, TEST_P, MATCHER, MATCHER_P
-    #  - TYPED_TEST
-    #  - INTERFACE_DEF
-    #  - EXCLUSIVE_LOCKS_REQUIRED, SHARED_LOCKS_REQUIRED, LOCKS_EXCLUDED:
-    #
-    # We implement a whitelist of safe macros instead of a blacklist of
-    # unsafe macros, even though the latter appears less frequently in
-    # google code and would have been easier to implement.  This is because
-    # the downside for getting the whitelist wrong means some extra
-    # semicolons, while the downside for getting the blacklist wrong
-    # would result in compile errors.
-    #
-    # In addition to macros, we also don't want to warn on
-    #  - Compound literals
-    #  - Lambdas
-    #  - alignas specifier with anonymous structs
-    #  - decltype
-    closing_brace_pos = match.group(1).rfind(')')
-    opening_parenthesis = ReverseCloseExpression(
-        clean_lines, linenum, closing_brace_pos)
-    if opening_parenthesis[2] > -1:
-      line_prefix = opening_parenthesis[0][0:opening_parenthesis[2]]
-      macro = Search(r'\b([A-Z_][A-Z0-9_]*)\s*$', line_prefix)
-      func = Match(r'^(.*\])\s*$', line_prefix)
-      if ((macro and
-           macro.group(1) not in (
-               'TEST', 'TEST_F', 'MATCHER', 'MATCHER_P', 'TYPED_TEST',
-               'EXCLUSIVE_LOCKS_REQUIRED', 'SHARED_LOCKS_REQUIRED',
-               'LOCKS_EXCLUDED', 'INTERFACE_DEF')) or
-          (func and not Search(r'\boperator\s*\[\s*\]', func.group(1))) or
-          Search(r'\b(?:struct|union)\s+alignas\s*$', line_prefix) or
-          Search(r'\bdecltype$', line_prefix) or
-          Search(r'\s+=\s*$', line_prefix)):
-        match = None
-    if (match and
-        opening_parenthesis[1] > 1 and
-        Search(r'\]\s*$', clean_lines.elided[opening_parenthesis[1] - 1])):
-      # Multi-line lambda-expression
-      match = None
-
-  else:
-    # Try matching cases 2-3.
-    match = Match(r'^(.*(?:else|\)\s*const)\s*)\{', line)
-    if not match:
-      # Try matching cases 4-6.  These are always matched on separate lines.
-      #
-      # Note that we can't simply concatenate the previous line to the
-      # current line and do a single match, otherwise we may output
-      # duplicate warnings for the blank line case:
-      #   if (cond) {
-      #     // blank line
-      #   }
-      prevline = GetPreviousNonBlankLine(clean_lines, linenum)[0]
-      if prevline and Search(r'[;{}]\s*$', prevline):
-        match = Match(r'^(\s*)\{', line)
-
-  # Check matching closing brace
-  if match:
-    (endline, endlinenum, endpos) = CloseExpression(
-        clean_lines, linenum, len(match.group(1)))
-    if endpos > -1 and Match(r'^\s*;', endline[endpos:]):
-      # Current {} pair is eligible for semicolon check, and we have found
-      # the redundant semicolon, output warning here.
-      #
-      # Note: because we are scanning forward for opening braces, and
-      # outputting warnings for the matching closing brace, if there are
-      # nested blocks with trailing semicolons, we will get the error
-      # messages in reversed order.
-
-      # We need to check the line forward for NOLINT
-      raw_lines = clean_lines.raw_lines
-      ParseNolintSuppressions(filename, raw_lines[endlinenum-1], endlinenum-1,
-                              error)
-      ParseNolintSuppressions(filename, raw_lines[endlinenum], endlinenum,
-                              error)
-
-      error(filename, endlinenum, 'readability/braces', 4,
-            "You don't need a ; after a }")
-
-
-def CheckEmptyBlockBody(filename, clean_lines, linenum, error):
-  """Look for empty loop/conditional body with only a single semicolon.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-
-  # Search for loop keywords at the beginning of the line.  Because only
-  # whitespaces are allowed before the keywords, this will also ignore most
-  # do-while-loops, since those lines should start with closing brace.
-  #
-  # We also check "if" blocks here, since an empty conditional block
-  # is likely an error.
-  line = clean_lines.elided[linenum]
-  matched = Match(r'\s*(for|while|if)\s*\(', line)
-  if matched:
-    # Find the end of the conditional expression.
-    (end_line, end_linenum, end_pos) = CloseExpression(
-        clean_lines, linenum, line.find('('))
-
-    # Output warning if what follows the condition expression is a semicolon.
-    # No warning for all other cases, including whitespace or newline, since we
-    # have a separate check for semicolons preceded by whitespace.
-    if end_pos >= 0 and Match(r';', end_line[end_pos:]):
-      if matched.group(1) == 'if':
-        error(filename, end_linenum, 'whitespace/empty_conditional_body', 5,
-              'Empty conditional bodies should use {}')
-      else:
-        error(filename, end_linenum, 'whitespace/empty_loop_body', 5,
-              'Empty loop bodies should use {} or continue')
-
-    # Check for if statements that have completely empty bodies (no comments)
-    # and no else clauses.
-    if end_pos >= 0 and matched.group(1) == 'if':
-      # Find the position of the opening { for the if statement.
-      # Return without logging an error if it has no brackets.
-      opening_linenum = end_linenum
-      opening_line_fragment = end_line[end_pos:]
-      # Loop until EOF or find anything that's not whitespace or opening {.
-      while not Search(r'^\s*\{', opening_line_fragment):
-        if Search(r'^(?!\s*$)', opening_line_fragment):
-          # Conditional has no brackets.
-          return
-        opening_linenum += 1
-        if opening_linenum == len(clean_lines.elided):
-          # Couldn't find conditional's opening { or any code before EOF.
-          return
-        opening_line_fragment = clean_lines.elided[opening_linenum]
-      # Set opening_line (opening_line_fragment may not be entire opening line).
-      opening_line = clean_lines.elided[opening_linenum]
-
-      # Find the position of the closing }.
-      opening_pos = opening_line_fragment.find('{')
-      if opening_linenum == end_linenum:
-        # We need to make opening_pos relative to the start of the entire line.
-        opening_pos += end_pos
-      (closing_line, closing_linenum, closing_pos) = CloseExpression(
-          clean_lines, opening_linenum, opening_pos)
-      if closing_pos < 0:
-        return
-
-      # Now construct the body of the conditional. This consists of the portion
-      # of the opening line after the {, all lines until the closing line,
-      # and the portion of the closing line before the }.
-      if (clean_lines.raw_lines[opening_linenum] !=
-          CleanseComments(clean_lines.raw_lines[opening_linenum])):
-        # Opening line ends with a comment, so conditional isn't empty.
-        return
-      if closing_linenum > opening_linenum:
-        # Opening line after the {. Ignore comments here since we checked above.
-        bodylist = list(opening_line[opening_pos+1:])
-        # All lines until closing line, excluding closing line, with comments.
-        bodylist.extend(clean_lines.raw_lines[opening_linenum+1:closing_linenum])
-        # Closing line before the }. Won't (and can't) have comments.
-        bodylist.append(clean_lines.elided[closing_linenum][:closing_pos-1])
-        body = '\n'.join(bodylist)
-      else:
-        # If statement has brackets and fits on a single line.
-        body = opening_line[opening_pos+1:closing_pos-1]
-
-      # Check if the body is empty
-      if not _EMPTY_CONDITIONAL_BODY_PATTERN.search(body):
-        return
-      # The body is empty. Now make sure there's not an else clause.
-      current_linenum = closing_linenum
-      current_line_fragment = closing_line[closing_pos:]
-      # Loop until EOF or find anything that's not whitespace or else clause.
-      while Search(r'^\s*$|^(?=\s*else)', current_line_fragment):
-        if Search(r'^(?=\s*else)', current_line_fragment):
-          # Found an else clause, so don't log an error.
-          return
-        current_linenum += 1
-        if current_linenum == len(clean_lines.elided):
-          break
-        current_line_fragment = clean_lines.elided[current_linenum]
-
-      # The body is empty and there's no else clause until EOF or other code.
-      error(filename, end_linenum, 'whitespace/empty_if_body', 4,
-            ('If statement had no body and no else clause'))
-
-
-def FindCheckMacro(line):
-  """Find a replaceable CHECK-like macro.
-
-  Args:
-    line: line to search on.
-  Returns:
-    (macro name, start position), or (None, -1) if no replaceable
-    macro is found.
-  """
-  for macro in _CHECK_MACROS:
-    i = line.find(macro)
-    if i >= 0:
-      # Find opening parenthesis.  Do a regular expression match here
-      # to make sure that we are matching the expected CHECK macro, as
-      # opposed to some other macro that happens to contain the CHECK
-      # substring.
-      matched = Match(r'^(.*\b' + macro + r'\s*)\(', line)
-      if not matched:
-        continue
-      return (macro, len(matched.group(1)))
-  return (None, -1)
-
-
-def CheckCheck(filename, clean_lines, linenum, error):
-  """Checks the use of CHECK and EXPECT macros.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-
-  # Decide the set of replacement macros that should be suggested
-  lines = clean_lines.elided
-  (check_macro, start_pos) = FindCheckMacro(lines[linenum])
-  if not check_macro:
-    return
-
-  # Find end of the boolean expression by matching parentheses
-  (last_line, end_line, end_pos) = CloseExpression(
-      clean_lines, linenum, start_pos)
-  if end_pos < 0:
-    return
-
-  # If the check macro is followed by something other than a
-  # semicolon, assume users will log their own custom error messages
-  # and don't suggest any replacements.
-  if not Match(r'\s*;', last_line[end_pos:]):
-    return
-
-  if linenum == end_line:
-    expression = lines[linenum][start_pos + 1:end_pos - 1]
-  else:
-    expression = lines[linenum][start_pos + 1:]
-    for i in xrange(linenum + 1, end_line):
-      expression += lines[i]
-    expression += last_line[0:end_pos - 1]
-
-  # Parse expression so that we can take parentheses into account.
-  # This avoids false positives for inputs like "CHECK((a < 4) == b)",
-  # which is not replaceable by CHECK_LE.
-  lhs = ''
-  rhs = ''
-  operator = None
-  while expression:
-    matched = Match(r'^\s*(<<|<<=|>>|>>=|->\*|->|&&|\|\||'
-                    r'==|!=|>=|>|<=|<|\()(.*)$', expression)
-    if matched:
-      token = matched.group(1)
-      if token == '(':
-        # Parenthesized operand
-        expression = matched.group(2)
-        (end, _) = FindEndOfExpressionInLine(expression, 0, ['('])
-        if end < 0:
-          return  # Unmatched parenthesis
-        lhs += '(' + expression[0:end]
-        expression = expression[end:]
-      elif token in ('&&', '||'):
-        # Logical and/or operators.  This means the expression
-        # contains more than one term, for example:
-        #   CHECK(42 < a && a < b);
-        #
-        # These are not replaceable with CHECK_LE, so bail out early.
-        return
-      elif token in ('<<', '<<=', '>>', '>>=', '->*', '->'):
-        # Non-relational operator
-        lhs += token
-        expression = matched.group(2)
-      else:
-        # Relational operator
-        operator = token
-        rhs = matched.group(2)
-        break
-    else:
-      # Unparenthesized operand.  Instead of appending to lhs one character
-      # at a time, we do another regular expression match to consume several
-      # characters at once if possible.  Trivial benchmark shows that this
-      # is more efficient when the operands are longer than a single
-      # character, which is generally the case.
-      matched = Match(r'^([^-=!<>()&|]+)(.*)$', expression)
-      if not matched:
-        matched = Match(r'^(\s*\S)(.*)$', expression)
-        if not matched:
-          break
-      lhs += matched.group(1)
-      expression = matched.group(2)
-
-  # Only apply checks if we got all parts of the boolean expression
-  if not (lhs and operator and rhs):
-    return
-
-  # Check that rhs do not contain logical operators.  We already know
-  # that lhs is fine since the loop above parses out && and ||.
-  if rhs.find('&&') > -1 or rhs.find('||') > -1:
-    return
-
-  # At least one of the operands must be a constant literal.  This is
-  # to avoid suggesting replacements for unprintable things like
-  # CHECK(variable != iterator)
-  #
-  # The following pattern matches decimal, hex integers, strings, and
-  # characters (in that order).
-  lhs = lhs.strip()
-  rhs = rhs.strip()
-  match_constant = r'^([-+]?(\d+|0[xX][0-9a-fA-F]+)[lLuU]{0,3}|".*"|\'.*\')$'
-  if Match(match_constant, lhs) or Match(match_constant, rhs):
-    # Note: since we know both lhs and rhs, we can provide a more
-    # descriptive error message like:
-    #   Consider using CHECK_EQ(x, 42) instead of CHECK(x == 42)
-    # Instead of:
-    #   Consider using CHECK_EQ instead of CHECK(a == b)
-    #
-    # We are still keeping the less descriptive message because if lhs
-    # or rhs gets long, the error message might become unreadable.
-    error(filename, linenum, 'readability/check', 2,
-          'Consider using %s instead of %s(a %s b)' % (
-              _CHECK_REPLACEMENT[check_macro][operator],
-              check_macro, operator))
-
-
-def CheckAltTokens(filename, clean_lines, linenum, error):
-  """Check alternative keywords being used in boolean expressions.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-  line = clean_lines.elided[linenum]
-
-  # Avoid preprocessor lines
-  if Match(r'^\s*#', line):
-    return
-
-  # Last ditch effort to avoid multi-line comments.  This will not help
-  # if the comment started before the current line or ended after the
-  # current line, but it catches most of the false positives.  At least,
-  # it provides a way to workaround this warning for people who use
-  # multi-line comments in preprocessor macros.
-  #
-  # TODO(unknown): remove this once cpplint has better support for
-  # multi-line comments.
-  if line.find('/*') >= 0 or line.find('*/') >= 0:
-    return
-
-  for match in _ALT_TOKEN_REPLACEMENT_PATTERN.finditer(line):
-    error(filename, linenum, 'readability/alt_tokens', 2,
-          'Use operator %s instead of %s' % (
-              _ALT_TOKEN_REPLACEMENT[match.group(1)], match.group(1)))
-
-
-def GetLineWidth(line):
-  """Determines the width of the line in column positions.
-
-  Args:
-    line: A string, which may be a Unicode string.
-
-  Returns:
-    The width of the line in column positions, accounting for Unicode
-    combining characters and wide characters.
-  """
-  if isinstance(line, unicode):
-    width = 0
-    for uc in unicodedata.normalize('NFC', line):
-      if unicodedata.east_asian_width(uc) in ('W', 'F'):
-        width += 2
-      elif not unicodedata.combining(uc):
-        # Issue 337
-        # https://mail.python.org/pipermail/python-list/2012-August/628809.html
-        if (sys.version_info.major, sys.version_info.minor) <= (3, 2):
-          # https://github.com/python/cpython/blob/2.7/Include/unicodeobject.h#L81
-          is_wide_build = sysconfig.get_config_var("Py_UNICODE_SIZE") >= 4
-          # https://github.com/python/cpython/blob/2.7/Objects/unicodeobject.c#L564
-          is_low_surrogate = 0xDC00 <= ord(uc) <= 0xDFFF
-          if not is_wide_build and is_low_surrogate:
-            width -= 1
-
-        width += 1
-    return width
-  else:
-    return len(line)
-
-
-def CheckStyle(filename, clean_lines, linenum, file_extension, nesting_state,
-               error):
-  """Checks rules from the 'C++ style rules' section of cppguide.html.
-
-  Most of these rules are hard to test (naming, comment style), but we
-  do what we can.  In particular we check for 2-space indents, line lengths,
-  tab usage, spaces inside code, etc.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    file_extension: The extension (without the dot) of the filename.
-    nesting_state: A NestingState instance which maintains information about
-                   the current stack of nested blocks being parsed.
-    error: The function to call with any errors found.
-  """
-
-  # Don't use "elided" lines here, otherwise we can't check commented lines.
-  # Don't want to use "raw" either, because we don't want to check inside C++11
-  # raw strings,
-  raw_lines = clean_lines.lines_without_raw_strings
-  line = raw_lines[linenum]
-  prev = raw_lines[linenum - 1] if linenum > 0 else ''
-
-  if line.find('\t') != -1:
-    error(filename, linenum, 'whitespace/tab', 1,
-          'Tab found; better to use spaces')
-
-  # One or three blank spaces at the beginning of the line is weird; it's
-  # hard to reconcile that with 2-space indents.
-  # NOTE: here are the conditions rob pike used for his tests.  Mine aren't
-  # as sophisticated, but it may be worth becoming so:  RLENGTH==initial_spaces
-  # if(RLENGTH > 20) complain = 0;
-  # if(match($0, " +(error|private|public|protected):")) complain = 0;
-  # if(match(prev, "&& *$")) complain = 0;
-  # if(match(prev, "\\|\\| *$")) complain = 0;
-  # if(match(prev, "[\",=><] *$")) complain = 0;
-  # if(match($0, " <<")) complain = 0;
-  # if(match(prev, " +for \\(")) complain = 0;
-  # if(prevodd && match(prevprev, " +for \\(")) complain = 0;
-  scope_or_label_pattern = r'\s*\w+\s*:\s*\\?$'
-  classinfo = nesting_state.InnermostClass()
-  initial_spaces = 0
-  cleansed_line = clean_lines.elided[linenum]
-  while initial_spaces < len(line) and line[initial_spaces] == ' ':
-    initial_spaces += 1
-  # There are certain situations we allow one space, notably for
-  # section labels, and also lines containing multi-line raw strings.
-  # We also don't check for lines that look like continuation lines
-  # (of lines ending in double quotes, commas, equals, or angle brackets)
-  # because the rules for how to indent those are non-trivial.
-  if (not Search(r'[",=><] *$', prev) and
-      (initial_spaces == 1 or initial_spaces == 3) and
-      not Match(scope_or_label_pattern, cleansed_line) and
-      not (clean_lines.raw_lines[linenum] != line and
-           Match(r'^\s*""', line))):
-    error(filename, linenum, 'whitespace/indent', 3,
-          'Weird number of spaces at line-start.  '
-          'Are you using a 2-space indent?')
-
-  if line and line[-1].isspace():
-    error(filename, linenum, 'whitespace/end_of_line', 4,
-          'Line ends in whitespace.  Consider deleting these extra spaces.')
-
-  # Check if the line is a header guard.
-  is_header_guard = False
-  if IsHeaderExtension(file_extension):
-    cppvar = GetHeaderGuardCPPVariable(filename)
-    if (line.startswith('#ifndef %s' % cppvar) or
-        line.startswith('#define %s' % cppvar) or
-        line.startswith('#endif  // %s' % cppvar)):
-      is_header_guard = True
-  # #include lines and header guards can be long, since there's no clean way to
-  # split them.
-  #
-  # URLs can be long too.  It's possible to split these, but it makes them
-  # harder to cut&paste.
-  #
-  # The "$Id:...$" comment may also get very long without it being the
-  # developers fault.
-  #
-  # Doxygen documentation copying can get pretty long when using an overloaded
-  # function declaration
-  if (not line.startswith('#include') and not is_header_guard and
-      not Match(r'^\s*//.*http(s?)://\S*$', line) and
-      not Match(r'^\s*//\s*[^\s]*$', line) and
-      not Match(r'^// \$Id:.*#[0-9]+ \$$', line) and
-      not Match(r'^\s*/// [@\\](copydoc|copydetails|copybrief) .*$', line)):
-    line_width = GetLineWidth(line)
-    if line_width > _line_length:
-      error(filename, linenum, 'whitespace/line_length', 2,
-            'Lines should be <= %i characters long' % _line_length)
-
-  if (cleansed_line.count(';') > 1 and
-      # allow simple single line lambdas
-      not Match(r'^[^{};]*\[[^\[\]]*\][^{}]*\{[^{}\n\r]*\}',
-                line) and
-      # for loops are allowed two ;'s (and may run over two lines).
-      cleansed_line.find('for') == -1 and
-      (GetPreviousNonBlankLine(clean_lines, linenum)[0].find('for') == -1 or
-       GetPreviousNonBlankLine(clean_lines, linenum)[0].find(';') != -1) and
-      # It's ok to have many commands in a switch case that fits in 1 line
-      not ((cleansed_line.find('case ') != -1 or
-            cleansed_line.find('default:') != -1) and
-           cleansed_line.find('break;') != -1)):
-    error(filename, linenum, 'whitespace/newline', 0,
-          'More than one command on the same line')
-
-  # Some more style checks
-  CheckBraces(filename, clean_lines, linenum, error)
-  CheckTrailingSemicolon(filename, clean_lines, linenum, error)
-  CheckEmptyBlockBody(filename, clean_lines, linenum, error)
-  CheckSpacing(filename, clean_lines, linenum, nesting_state, error)
-  CheckOperatorSpacing(filename, clean_lines, linenum, error)
-  CheckParenthesisSpacing(filename, clean_lines, linenum, error)
-  CheckCommaSpacing(filename, clean_lines, linenum, error)
-  CheckBracesSpacing(filename, clean_lines, linenum, nesting_state, error)
-  CheckSpacingForFunctionCall(filename, clean_lines, linenum, error)
-  CheckCheck(filename, clean_lines, linenum, error)
-  CheckAltTokens(filename, clean_lines, linenum, error)
-  classinfo = nesting_state.InnermostClass()
-  if classinfo:
-    CheckSectionSpacing(filename, clean_lines, classinfo, linenum, error)
-
-
-_RE_PATTERN_INCLUDE = re.compile(r'^\s*#\s*include\s*([<"])([^>"]*)[>"].*$')
-# Matches the first component of a filename delimited by -s and _s. That is:
-#  _RE_FIRST_COMPONENT.match('foo').group(0) == 'foo'
-#  _RE_FIRST_COMPONENT.match('foo.cc').group(0) == 'foo'
-#  _RE_FIRST_COMPONENT.match('foo-bar_baz.cc').group(0) == 'foo'
-#  _RE_FIRST_COMPONENT.match('foo_bar-baz.cc').group(0) == 'foo'
-_RE_FIRST_COMPONENT = re.compile(r'^[^-_.]+')
-
-
-def _DropCommonSuffixes(filename):
-  """Drops common suffixes like _test.cc or -inl.h from filename.
-
-  For example:
-    >>> _DropCommonSuffixes('foo/foo-inl.h')
-    'foo/foo'
-    >>> _DropCommonSuffixes('foo/bar/foo.cc')
-    'foo/bar/foo'
-    >>> _DropCommonSuffixes('foo/foo_internal.h')
-    'foo/foo'
-    >>> _DropCommonSuffixes('foo/foo_unusualinternal.h')
-    'foo/foo_unusualinternal'
-
-  Args:
-    filename: The input filename.
-
-  Returns:
-    The filename with the common suffix removed.
-  """
-  for suffix in itertools.chain(
-      ('%s.%s' % (test_suffix.lstrip('_'), ext)
-       for test_suffix, ext in itertools.product(_test_suffixes, GetNonHeaderExtensions())),
-      ('%s.%s' % (suffix, ext)
-       for suffix, ext in itertools.product(['inl', 'imp', 'internal'], GetHeaderExtensions()))):
-    if (filename.endswith(suffix) and len(filename) > len(suffix) and
-        filename[-len(suffix) - 1] in ('-', '_')):
-      return filename[:-len(suffix) - 1]
-  return os.path.splitext(filename)[0]
-
-
-def _ClassifyInclude(fileinfo, include, is_system):
-  """Figures out what kind of header 'include' is.
-
-  Args:
-    fileinfo: The current file cpplint is running over. A FileInfo instance.
-    include: The path to a #included file.
-    is_system: True if the #include used <> rather than "".
-
-  Returns:
-    One of the _XXX_HEADER constants.
-
-  For example:
-    >>> _ClassifyInclude(FileInfo('foo/foo.cc'), 'stdio.h', True)
-    _C_SYS_HEADER
-    >>> _ClassifyInclude(FileInfo('foo/foo.cc'), 'string', True)
-    _CPP_SYS_HEADER
-    >>> _ClassifyInclude(FileInfo('foo/foo.cc'), 'foo/foo.h', False)
-    _LIKELY_MY_HEADER
-    >>> _ClassifyInclude(FileInfo('foo/foo_unknown_extension.cc'),
-    ...                  'bar/foo_other_ext.h', False)
-    _POSSIBLE_MY_HEADER
-    >>> _ClassifyInclude(FileInfo('foo/foo.cc'), 'foo/bar.h', False)
-    _OTHER_HEADER
-  """
-  # This is a list of all standard c++ header files, except
-  # those already checked for above.
-  is_cpp_h = include in _CPP_HEADERS
-
-  # Headers with C++ extensions shouldn't be considered C system headers
-  if is_system and os.path.splitext(include)[1] in ['.hpp', '.hxx', '.h++']:
-    is_system = False
-
-  if is_system:
-    if is_cpp_h:
-      return _CPP_SYS_HEADER
-    else:
-      return _C_SYS_HEADER
-
-  # If the target file and the include we're checking share a
-  # basename when we drop common extensions, and the include
-  # lives in . , then it's likely to be owned by the target file.
-  target_dir, target_base = (
-      os.path.split(_DropCommonSuffixes(fileinfo.RepositoryName())))
-  include_dir, include_base = os.path.split(_DropCommonSuffixes(include))
-  target_dir_pub = os.path.normpath(target_dir + '/../public')
-  target_dir_pub = target_dir_pub.replace('\\', '/')
-  if target_base == include_base and (
-      include_dir == target_dir or
-      include_dir == target_dir_pub):
-    return _LIKELY_MY_HEADER
-
-  # If the target and include share some initial basename
-  # component, it's possible the target is implementing the
-  # include, so it's allowed to be first, but we'll never
-  # complain if it's not there.
-  target_first_component = _RE_FIRST_COMPONENT.match(target_base)
-  include_first_component = _RE_FIRST_COMPONENT.match(include_base)
-  if (target_first_component and include_first_component and
-      target_first_component.group(0) ==
-      include_first_component.group(0)):
-    return _POSSIBLE_MY_HEADER
-
-  return _OTHER_HEADER
-
-
-
-def CheckIncludeLine(filename, clean_lines, linenum, include_state, error):
-  """Check rules that are applicable to #include lines.
-
-  Strings on #include lines are NOT removed from elided line, to make
-  certain tasks easier. However, to prevent false positives, checks
-  applicable to #include lines in CheckLanguage must be put here.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    include_state: An _IncludeState instance in which the headers are inserted.
-    error: The function to call with any errors found.
-  """
-  fileinfo = FileInfo(filename)
-  line = clean_lines.lines[linenum]
-
-  # "include" should use the new style "foo/bar.h" instead of just "bar.h"
-  # Only do this check if the included header follows google naming
-  # conventions.  If not, assume that it's a 3rd party API that
-  # requires special include conventions.
-  #
-  # We also make an exception for Lua headers, which follow google
-  # naming convention but not the include convention.
-  match = Match(r'#include\s*"([^/]+\.h)"', line)
-  if match and not _THIRD_PARTY_HEADERS_PATTERN.match(match.group(1)):
-    error(filename, linenum, 'build/include_subdir', 4,
-          'Include the directory when naming .h files')
-
-  # we shouldn't include a file more than once. actually, there are a
-  # handful of instances where doing so is okay, but in general it's
-  # not.
-  match = _RE_PATTERN_INCLUDE.search(line)
-  if match:
-    include = match.group(2)
-    is_system = (match.group(1) == '<')
-    duplicate_line = include_state.FindHeader(include)
-    if duplicate_line >= 0:
-      error(filename, linenum, 'build/include', 4,
-            '"%s" already included at %s:%s' %
-            (include, filename, duplicate_line))
-      return
-
-    for extension in GetNonHeaderExtensions():
-      if (include.endswith('.' + extension) and
-          os.path.dirname(fileinfo.RepositoryName()) != os.path.dirname(include)):
-        error(filename, linenum, 'build/include', 4,
-              'Do not include .' + extension + ' files from other packages')
-        return
-
-    if not _THIRD_PARTY_HEADERS_PATTERN.match(include):
-      include_state.include_list[-1].append((include, linenum))
-
-      # We want to ensure that headers appear in the right order:
-      # 1) for foo.cc, foo.h  (preferred location)
-      # 2) c system files
-      # 3) cpp system files
-      # 4) for foo.cc, foo.h  (deprecated location)
-      # 5) other google headers
-      #
-      # We classify each include statement as one of those 5 types
-      # using a number of techniques. The include_state object keeps
-      # track of the highest type seen, and complains if we see a
-      # lower type after that.
-      error_message = include_state.CheckNextIncludeOrder(
-          _ClassifyInclude(fileinfo, include, is_system))
-      if error_message:
-        error(filename, linenum, 'build/include_order', 4,
-              '%s. Should be: %s.h, c system, c++ system, other.' %
-              (error_message, fileinfo.BaseName()))
-      canonical_include = include_state.CanonicalizeAlphabeticalOrder(include)
-      if not include_state.IsInAlphabeticalOrder(
-          clean_lines, linenum, canonical_include):
-        error(filename, linenum, 'build/include_alpha', 4,
-              'Include "%s" not in alphabetical order' % include)
-      include_state.SetLastHeader(canonical_include)
-
-
-
-def _GetTextInside(text, start_pattern):
-  r"""Retrieves all the text between matching open and close parentheses.
-
-  Given a string of lines and a regular expression string, retrieve all the text
-  following the expression and between opening punctuation symbols like
-  (, [, or {, and the matching close-punctuation symbol. This properly nested
-  occurrences of the punctuations, so for the text like
-    printf(a(), b(c()));
-  a call to _GetTextInside(text, r'printf\(') will return 'a(), b(c())'.
-  start_pattern must match string having an open punctuation symbol at the end.
-
-  Args:
-    text: The lines to extract text. Its comments and strings must be elided.
-           It can be single line and can span multiple lines.
-    start_pattern: The regexp string indicating where to start extracting
-                   the text.
-  Returns:
-    The extracted text.
-    None if either the opening string or ending punctuation could not be found.
-  """
-  # TODO(unknown): Audit cpplint.py to see what places could be profitably
-  # rewritten to use _GetTextInside (and use inferior regexp matching today).
-
-  # Give opening punctuations to get the matching close-punctuations.
-  matching_punctuation = {'(': ')', '{': '}', '[': ']'}
-  closing_punctuation = set(itervalues(matching_punctuation))
-
-  # Find the position to start extracting text.
-  match = re.search(start_pattern, text, re.M)
-  if not match:  # start_pattern not found in text.
-    return None
-  start_position = match.end(0)
-
-  assert start_position > 0, (
-      'start_pattern must ends with an opening punctuation.')
-  assert text[start_position - 1] in matching_punctuation, (
-      'start_pattern must ends with an opening punctuation.')
-  # Stack of closing punctuations we expect to have in text after position.
-  punctuation_stack = [matching_punctuation[text[start_position - 1]]]
-  position = start_position
-  while punctuation_stack and position < len(text):
-    if text[position] == punctuation_stack[-1]:
-      punctuation_stack.pop()
-    elif text[position] in closing_punctuation:
-      # A closing punctuation without matching opening punctuations.
-      return None
-    elif text[position] in matching_punctuation:
-      punctuation_stack.append(matching_punctuation[text[position]])
-    position += 1
-  if punctuation_stack:
-    # Opening punctuations left without matching close-punctuations.
-    return None
-  # punctuations match.
-  return text[start_position:position - 1]
-
-
-# Patterns for matching call-by-reference parameters.
-#
-# Supports nested templates up to 2 levels deep using this messy pattern:
-#   < (?: < (?: < [^<>]*
-#               >
-#           |   [^<>] )*
-#         >
-#     |   [^<>] )*
-#   >
-_RE_PATTERN_IDENT = r'[_a-zA-Z]\w*'  # =~ [[:alpha:]][[:alnum:]]*
-_RE_PATTERN_TYPE = (
-    r'(?:const\s+)?(?:typename\s+|class\s+|struct\s+|union\s+|enum\s+)?'
-    r'(?:\w|'
-    r'\s*<(?:<(?:<[^<>]*>|[^<>])*>|[^<>])*>|'
-    r'::)+')
-# A call-by-reference parameter ends with '& identifier'.
-_RE_PATTERN_REF_PARAM = re.compile(
-    r'(' + _RE_PATTERN_TYPE + r'(?:\s*(?:\bconst\b|[*]))*\s*'
-    r'&\s*' + _RE_PATTERN_IDENT + r')\s*(?:=[^,()]+)?[,)]')
-# A call-by-const-reference parameter either ends with 'const& identifier'
-# or looks like 'const type& identifier' when 'type' is atomic.
-_RE_PATTERN_CONST_REF_PARAM = (
-    r'(?:.*\s*\bconst\s*&\s*' + _RE_PATTERN_IDENT +
-    r'|const\s+' + _RE_PATTERN_TYPE + r'\s*&\s*' + _RE_PATTERN_IDENT + r')')
-# Stream types.
-_RE_PATTERN_REF_STREAM_PARAM = (
-    r'(?:.*stream\s*&\s*' + _RE_PATTERN_IDENT + r')')
-
-
-def CheckLanguage(filename, clean_lines, linenum, file_extension,
-                  include_state, nesting_state, error):
-  """Checks rules from the 'C++ language rules' section of cppguide.html.
-
-  Some of these rules are hard to test (function overloading, using
-  uint32 inappropriately), but we do the best we can.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    file_extension: The extension (without the dot) of the filename.
-    include_state: An _IncludeState instance in which the headers are inserted.
-    nesting_state: A NestingState instance which maintains information about
-                   the current stack of nested blocks being parsed.
-    error: The function to call with any errors found.
-  """
-  # If the line is empty or consists of entirely a comment, no need to
-  # check it.
-  line = clean_lines.elided[linenum]
-  if not line:
-    return
-
-  match = _RE_PATTERN_INCLUDE.search(line)
-  if match:
-    CheckIncludeLine(filename, clean_lines, linenum, include_state, error)
-    return
-
-  # Reset include state across preprocessor directives.  This is meant
-  # to silence warnings for conditional includes.
-  match = Match(r'^\s*#\s*(if|ifdef|ifndef|elif|else|endif)\b', line)
-  if match:
-    include_state.ResetSection(match.group(1))
-
-
-  # Perform other checks now that we are sure that this is not an include line
-  CheckCasts(filename, clean_lines, linenum, error)
-  CheckGlobalStatic(filename, clean_lines, linenum, error)
-  CheckPrintf(filename, clean_lines, linenum, error)
-
-  if IsHeaderExtension(file_extension):
-    # TODO(unknown): check that 1-arg constructors are explicit.
-    #                How to tell it's a constructor?
-    #                (handled in CheckForNonStandardConstructs for now)
-    # TODO(unknown): check that classes declare or disable copy/assign
-    #                (level 1 error)
-    pass
-
-  # Check if people are using the verboten C basic types.  The only exception
-  # we regularly allow is "unsigned short port" for port.
-  if Search(r'\bshort port\b', line):
-    if not Search(r'\bunsigned short port\b', line):
-      error(filename, linenum, 'runtime/int', 4,
-            'Use "unsigned short" for ports, not "short"')
-  else:
-    match = Search(r'\b(short|long(?! +double)|long long)\b', line)
-    if match:
-      error(filename, linenum, 'runtime/int', 4,
-            'Use int16/int64/etc, rather than the C type %s' % match.group(1))
-
-  # Check if some verboten operator overloading is going on
-  # TODO(unknown): catch out-of-line unary operator&:
-  #   class X {};
-  #   int operator&(const X& x) { return 42; }  // unary operator&
-  # The trick is it's hard to tell apart from binary operator&:
-  #   class Y { int operator&(const Y& x) { return 23; } }; // binary operator&
-  if Search(r'\boperator\s*&\s*\(\s*\)', line):
-    error(filename, linenum, 'runtime/operator', 4,
-          'Unary operator& is dangerous.  Do not use it.')
-
-  # Check for suspicious usage of "if" like
-  # } if (a == b) {
-  if Search(r'\}\s*if\s*\(', line):
-    error(filename, linenum, 'readability/braces', 4,
-          'Did you mean "else if"? If not, start a new line for "if".')
-
-  # Check for potential format string bugs like printf(foo).
-  # We constrain the pattern not to pick things like DocidForPrintf(foo).
-  # Not perfect but it can catch printf(foo.c_str()) and printf(foo->c_str())
-  # TODO(unknown): Catch the following case. Need to change the calling
-  # convention of the whole function to process multiple line to handle it.
-  #   printf(
-  #       boy_this_is_a_really_long_variable_that_cannot_fit_on_the_prev_line);
-  printf_args = _GetTextInside(line, r'(?i)\b(string)?printf\s*\(')
-  if printf_args:
-    match = Match(r'([\w.\->()]+)$', printf_args)
-    if match and match.group(1) != '__VA_ARGS__':
-      function_name = re.search(r'\b((?:string)?printf)\s*\(',
-                                line, re.I).group(1)
-      error(filename, linenum, 'runtime/printf', 4,
-            'Potential format string bug. Do %s("%%s", %s) instead.'
-            % (function_name, match.group(1)))
-
-  # Check for potential memset bugs like memset(buf, sizeof(buf), 0).
-  match = Search(r'memset\s*\(([^,]*),\s*([^,]*),\s*0\s*\)', line)
-  if match and not Match(r"^''|-?[0-9]+|0x[0-9A-Fa-f]$", match.group(2)):
-    error(filename, linenum, 'runtime/memset', 4,
-          'Did you mean "memset(%s, 0, %s)"?'
-          % (match.group(1), match.group(2)))
-
-  if Search(r'\busing namespace\b', line):
-    if Search(r'\bliterals\b', line):
-      error(filename, linenum, 'build/namespaces_literals', 5,
-            'Do not use namespace using-directives.  '
-            'Use using-declarations instead.')
-    else:
-      error(filename, linenum, 'build/namespaces', 5,
-            'Do not use namespace using-directives.  '
-            'Use using-declarations instead.')
-
-  # Detect variable-length arrays.
-  match = Match(r'\s*(.+::)?(\w+) [a-z]\w*\[(.+)];', line)
-  if (match and match.group(2) != 'return' and match.group(2) != 'delete' and
-      match.group(3).find(']') == -1):
-    # Split the size using space and arithmetic operators as delimiters.
-    # If any of the resulting tokens are not compile time constants then
-    # report the error.
-    tokens = re.split(r'\s|\+|\-|\*|\/|<<|>>]', match.group(3))
-    is_const = True
-    skip_next = False
-    for tok in tokens:
-      if skip_next:
-        skip_next = False
-        continue
-
-      if Search(r'sizeof\(.+\)', tok): continue
-      if Search(r'arraysize\(\w+\)', tok): continue
-
-      tok = tok.lstrip('(')
-      tok = tok.rstrip(')')
-      if not tok: continue
-      if Match(r'\d+', tok): continue
-      if Match(r'0[xX][0-9a-fA-F]+', tok): continue
-      if Match(r'k[A-Z0-9]\w*', tok): continue
-      if Match(r'(.+::)?k[A-Z0-9]\w*', tok): continue
-      if Match(r'(.+::)?[A-Z][A-Z0-9_]*', tok): continue
-      # A catch all for tricky sizeof cases, including 'sizeof expression',
-      # 'sizeof(*type)', 'sizeof(const type)', 'sizeof(struct StructName)'
-      # requires skipping the next token because we split on ' ' and '*'.
-      if tok.startswith('sizeof'):
-        skip_next = True
-        continue
-      is_const = False
-      break
-    if not is_const:
-      error(filename, linenum, 'runtime/arrays', 1,
-            'Do not use variable-length arrays.  Use an appropriately named '
-            "('k' followed by CamelCase) compile-time constant for the size.")
-
-  # Check for use of unnamed namespaces in header files.  Registration
-  # macros are typically OK, so we allow use of "namespace {" on lines
-  # that end with backslashes.
-  if (IsHeaderExtension(file_extension)
-      and Search(r'\bnamespace\s*{', line)
-      and line[-1] != '\\'):
-    error(filename, linenum, 'build/namespaces', 4,
-          'Do not use unnamed namespaces in header files.  See '
-          'https://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Namespaces'
-          ' for more information.')
-
-
-def CheckGlobalStatic(filename, clean_lines, linenum, error):
-  """Check for unsafe global or static objects.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-  line = clean_lines.elided[linenum]
-
-  # Match two lines at a time to support multiline declarations
-  if linenum + 1 < clean_lines.NumLines() and not Search(r'[;({]', line):
-    line += clean_lines.elided[linenum + 1].strip()
-
-  # Check for people declaring static/global STL strings at the top level.
-  # This is dangerous because the C++ language does not guarantee that
-  # globals with constructors are initialized before the first access, and
-  # also because globals can be destroyed when some threads are still running.
-  # TODO(unknown): Generalize this to also find static unique_ptr instances.
-  # TODO(unknown): File bugs for clang-tidy to find these.
-  match = Match(
-      r'((?:|static +)(?:|const +))(?::*std::)?string( +const)? +'
-      r'([a-zA-Z0-9_:]+)\b(.*)',
-      line)
-
-  # Remove false positives:
-  # - String pointers (as opposed to values).
-  #    string *pointer
-  #    const string *pointer
-  #    string const *pointer
-  #    string *const pointer
-  #
-  # - Functions and template specializations.
-  #    string Function<Type>(...
-  #    string Class<Type>::Method(...
-  #
-  # - Operators.  These are matched separately because operator names
-  #   cross non-word boundaries, and trying to match both operators
-  #   and functions at the same time would decrease accuracy of
-  #   matching identifiers.
-  #    string Class::operator*()
-  if (match and
-      not Search(r'\bstring\b(\s+const)?\s*[\*\&]\s*(const\s+)?\w', line) and
-      not Search(r'\boperator\W', line) and
-      not Match(r'\s*(<.*>)?(::[a-zA-Z0-9_]+)*\s*\(([^"]|$)', match.group(4))):
-    if Search(r'\bconst\b', line):
-      error(filename, linenum, 'runtime/string', 4,
-            'For a static/global string constant, use a C style string '
-            'instead: "%schar%s %s[]".' %
-            (match.group(1), match.group(2) or '', match.group(3)))
-    else:
-      error(filename, linenum, 'runtime/string', 4,
-            'Static/global string variables are not permitted.')
-
-  if (Search(r'\b([A-Za-z0-9_]*_)\(\1\)', line) or
-      Search(r'\b([A-Za-z0-9_]*_)\(CHECK_NOTNULL\(\1\)\)', line)):
-    error(filename, linenum, 'runtime/init', 4,
-          'You seem to be initializing a member variable with itself.')
-
-
-def CheckPrintf(filename, clean_lines, linenum, error):
-  """Check for printf related issues.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-  line = clean_lines.elided[linenum]
-
-  # When snprintf is used, the second argument shouldn't be a literal.
-  match = Search(r'snprintf\s*\(([^,]*),\s*([0-9]*)\s*,', line)
-  if match and match.group(2) != '0':
-    # If 2nd arg is zero, snprintf is used to calculate size.
-    error(filename, linenum, 'runtime/printf', 3,
-          'If you can, use sizeof(%s) instead of %s as the 2nd arg '
-          'to snprintf.' % (match.group(1), match.group(2)))
-
-  # Check if some verboten C functions are being used.
-  if Search(r'\bsprintf\s*\(', line):
-    error(filename, linenum, 'runtime/printf', 5,
-          'Never use sprintf. Use snprintf instead.')
-  match = Search(r'\b(strcpy|strcat)\s*\(', line)
-  if match:
-    error(filename, linenum, 'runtime/printf', 4,
-          'Almost always, snprintf is better than %s' % match.group(1))
-
-
-def IsDerivedFunction(clean_lines, linenum):
-  """Check if current line contains an inherited function.
-
-  Args:
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-  Returns:
-    True if current line contains a function with "override"
-    virt-specifier.
-  """
-  # Scan back a few lines for start of current function
-  for i in xrange(linenum, max(-1, linenum - 10), -1):
-    match = Match(r'^([^()]*\w+)\(', clean_lines.elided[i])
-    if match:
-      # Look for "override" after the matching closing parenthesis
-      line, _, closing_paren = CloseExpression(
-          clean_lines, i, len(match.group(1)))
-      return (closing_paren >= 0 and
-              Search(r'\boverride\b', line[closing_paren:]))
-  return False
-
-
-def IsOutOfLineMethodDefinition(clean_lines, linenum):
-  """Check if current line contains an out-of-line method definition.
-
-  Args:
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-  Returns:
-    True if current line contains an out-of-line method definition.
-  """
-  # Scan back a few lines for start of current function
-  for i in xrange(linenum, max(-1, linenum - 10), -1):
-    if Match(r'^([^()]*\w+)\(', clean_lines.elided[i]):
-      return Match(r'^[^()]*\w+::\w+\(', clean_lines.elided[i]) is not None
-  return False
-
-
-def IsInitializerList(clean_lines, linenum):
-  """Check if current line is inside constructor initializer list.
-
-  Args:
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-  Returns:
-    True if current line appears to be inside constructor initializer
-    list, False otherwise.
-  """
-  for i in xrange(linenum, 1, -1):
-    line = clean_lines.elided[i]
-    if i == linenum:
-      remove_function_body = Match(r'^(.*)\{\s*$', line)
-      if remove_function_body:
-        line = remove_function_body.group(1)
-
-    if Search(r'\s:\s*\w+[({]', line):
-      # A lone colon tend to indicate the start of a constructor
-      # initializer list.  It could also be a ternary operator, which
-      # also tend to appear in constructor initializer lists as
-      # opposed to parameter lists.
-      return True
-    if Search(r'\}\s*,\s*$', line):
-      # A closing brace followed by a comma is probably the end of a
-      # brace-initialized member in constructor initializer list.
-      return True
-    if Search(r'[{};]\s*$', line):
-      # Found one of the following:
-      # - A closing brace or semicolon, probably the end of the previous
-      #   function.
-      # - An opening brace, probably the start of current class or namespace.
-      #
-      # Current line is probably not inside an initializer list since
-      # we saw one of those things without seeing the starting colon.
-      return False
-
-  # Got to the beginning of the file without seeing the start of
-  # constructor initializer list.
-  return False
-
-
-def CheckForNonConstReference(filename, clean_lines, linenum,
-                              nesting_state, error):
-  """Check for non-const references.
-
-  Separate from CheckLanguage since it scans backwards from current
-  line, instead of scanning forward.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    nesting_state: A NestingState instance which maintains information about
-                   the current stack of nested blocks being parsed.
-    error: The function to call with any errors found.
-  """
-  # Do nothing if there is no '&' on current line.
-  line = clean_lines.elided[linenum]
-  if '&' not in line:
-    return
-
-  # If a function is inherited, current function doesn't have much of
-  # a choice, so any non-const references should not be blamed on
-  # derived function.
-  if IsDerivedFunction(clean_lines, linenum):
-    return
-
-  # Don't warn on out-of-line method definitions, as we would warn on the
-  # in-line declaration, if it isn't marked with 'override'.
-  if IsOutOfLineMethodDefinition(clean_lines, linenum):
-    return
-
-  # Long type names may be broken across multiple lines, usually in one
-  # of these forms:
-  #   LongType
-  #       ::LongTypeContinued &identifier
-  #   LongType::
-  #       LongTypeContinued &identifier
-  #   LongType<
-  #       ...>::LongTypeContinued &identifier
-  #
-  # If we detected a type split across two lines, join the previous
-  # line to current line so that we can match const references
-  # accordingly.
-  #
-  # Note that this only scans back one line, since scanning back
-  # arbitrary number of lines would be expensive.  If you have a type
-  # that spans more than 2 lines, please use a typedef.
-  if linenum > 1:
-    previous = None
-    if Match(r'\s*::(?:[\w<>]|::)+\s*&\s*\S', line):
-      # previous_line\n + ::current_line
-      previous = Search(r'\b((?:const\s*)?(?:[\w<>]|::)+[\w<>])\s*$',
-                        clean_lines.elided[linenum - 1])
-    elif Match(r'\s*[a-zA-Z_]([\w<>]|::)+\s*&\s*\S', line):
-      # previous_line::\n + current_line
-      previous = Search(r'\b((?:const\s*)?(?:[\w<>]|::)+::)\s*$',
-                        clean_lines.elided[linenum - 1])
-    if previous:
-      line = previous.group(1) + line.lstrip()
-    else:
-      # Check for templated parameter that is split across multiple lines
-      endpos = line.rfind('>')
-      if endpos > -1:
-        (_, startline, startpos) = ReverseCloseExpression(
-            clean_lines, linenum, endpos)
-        if startpos > -1 and startline < linenum:
-          # Found the matching < on an earlier line, collect all
-          # pieces up to current line.
-          line = ''
-          for i in xrange(startline, linenum + 1):
-            line += clean_lines.elided[i].strip()
-
-  # Check for non-const references in function parameters.  A single '&' may
-  # found in the following places:
-  #   inside expression: binary & for bitwise AND
-  #   inside expression: unary & for taking the address of something
-  #   inside declarators: reference parameter
-  # We will exclude the first two cases by checking that we are not inside a
-  # function body, including one that was just introduced by a trailing '{'.
-  # TODO(unknown): Doesn't account for 'catch(Exception& e)' [rare].
-  if (nesting_state.previous_stack_top and
-      not (isinstance(nesting_state.previous_stack_top, _ClassInfo) or
-           isinstance(nesting_state.previous_stack_top, _NamespaceInfo))):
-    # Not at toplevel, not within a class, and not within a namespace
-    return
-
-  # Avoid initializer lists.  We only need to scan back from the
-  # current line for something that starts with ':'.
-  #
-  # We don't need to check the current line, since the '&' would
-  # appear inside the second set of parentheses on the current line as
-  # opposed to the first set.
-  if linenum > 0:
-    for i in xrange(linenum - 1, max(0, linenum - 10), -1):
-      previous_line = clean_lines.elided[i]
-      if not Search(r'[),]\s*$', previous_line):
-        break
-      if Match(r'^\s*:\s+\S', previous_line):
-        return
-
-  # Avoid preprocessors
-  if Search(r'\\\s*$', line):
-    return
-
-  # Avoid constructor initializer lists
-  if IsInitializerList(clean_lines, linenum):
-    return
-
-  # We allow non-const references in a few standard places, like functions
-  # called "swap()" or iostream operators like "<<" or ">>".  Do not check
-  # those function parameters.
-  #
-  # We also accept & in static_assert, which looks like a function but
-  # it's actually a declaration expression.
-  whitelisted_functions = (r'(?:[sS]wap(?:<\w:+>)?|'
-                           r'operator\s*[<>][<>]|'
-                           r'static_assert|COMPILE_ASSERT'
-                           r')\s*\(')
-  if Search(whitelisted_functions, line):
-    return
-  elif not Search(r'\S+\([^)]*$', line):
-    # Don't see a whitelisted function on this line.  Actually we
-    # didn't see any function name on this line, so this is likely a
-    # multi-line parameter list.  Try a bit harder to catch this case.
-    for i in xrange(2):
-      if (linenum > i and
-          Search(whitelisted_functions, clean_lines.elided[linenum - i - 1])):
-        return
-
-  decls = ReplaceAll(r'{[^}]*}', ' ', line)  # exclude function body
-  for parameter in re.findall(_RE_PATTERN_REF_PARAM, decls):
-    if (not Match(_RE_PATTERN_CONST_REF_PARAM, parameter) and
-        not Match(_RE_PATTERN_REF_STREAM_PARAM, parameter)):
-      error(filename, linenum, 'runtime/references', 2,
-            'Is this a non-const reference? '
-            'If so, make const or use a pointer: ' +
-            ReplaceAll(' *<', '<', parameter))
-
-
-def CheckCasts(filename, clean_lines, linenum, error):
-  """Various cast related checks.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-  line = clean_lines.elided[linenum]
-
-  # Check to see if they're using an conversion function cast.
-  # I just try to capture the most common basic types, though there are more.
-  # Parameterless conversion functions, such as bool(), are allowed as they are
-  # probably a member operator declaration or default constructor.
-  match = Search(
-      r'(\bnew\s+(?:const\s+)?|\S<\s*(?:const\s+)?)?\b'
-      r'(int|float|double|bool|char|int32|uint32|int64|uint64)'
-      r'(\([^)].*)', line)
-  expecting_function = ExpectingFunctionArgs(clean_lines, linenum)
-  if match and not expecting_function:
-    matched_type = match.group(2)
-
-    # matched_new_or_template is used to silence two false positives:
-    # - New operators
-    # - Template arguments with function types
-    #
-    # For template arguments, we match on types immediately following
-    # an opening bracket without any spaces.  This is a fast way to
-    # silence the common case where the function type is the first
-    # template argument.  False negative with less-than comparison is
-    # avoided because those operators are usually followed by a space.
-    #
-    #   function<double(double)>   // bracket + no space = false positive
-    #   value < double(42)         // bracket + space = true positive
-    matched_new_or_template = match.group(1)
-
-    # Avoid arrays by looking for brackets that come after the closing
-    # parenthesis.
-    if Match(r'\([^()]+\)\s*\[', match.group(3)):
-      return
-
-    # Other things to ignore:
-    # - Function pointers
-    # - Casts to pointer types
-    # - Placement new
-    # - Alias declarations
-    matched_funcptr = match.group(3)
-    if (matched_new_or_template is None and
-        not (matched_funcptr and
-             (Match(r'\((?:[^() ]+::\s*\*\s*)?[^() ]+\)\s*\(',
-                    matched_funcptr) or
-              matched_funcptr.startswith('(*)'))) and
-        not Match(r'\s*using\s+\S+\s*=\s*' + matched_type, line) and
-        not Search(r'new\(\S+\)\s*' + matched_type, line)):
-      error(filename, linenum, 'readability/casting', 4,
-            'Using deprecated casting style.  '
-            'Use static_cast<%s>(...) instead' %
-            matched_type)
-
-  if not expecting_function:
-    CheckCStyleCast(filename, clean_lines, linenum, 'static_cast',
-                    r'\((int|float|double|bool|char|u?int(16|32|64))\)', error)
-
-  # This doesn't catch all cases. Consider (const char * const)"hello".
-  #
-  # (char *) "foo" should always be a const_cast (reinterpret_cast won't
-  # compile).
-  if CheckCStyleCast(filename, clean_lines, linenum, 'const_cast',
-                     r'\((char\s?\*+\s?)\)\s*"', error):
-    pass
-  else:
-    # Check pointer casts for other than string constants
-    CheckCStyleCast(filename, clean_lines, linenum, 'reinterpret_cast',
-                    r'\((\w+\s?\*+\s?)\)', error)
-
-  # In addition, we look for people taking the address of a cast.  This
-  # is dangerous -- casts can assign to temporaries, so the pointer doesn't
-  # point where you think.
-  #
-  # Some non-identifier character is required before the '&' for the
-  # expression to be recognized as a cast.  These are casts:
-  #   expression = &static_cast<int*>(temporary());
-  #   function(&(int*)(temporary()));
-  #
-  # This is not a cast:
-  #   reference_type&(int* function_param);
-  match = Search(
-      r'(?:[^\w]&\(([^)*][^)]*)\)[\w(])|'
-      r'(?:[^\w]&(static|dynamic|down|reinterpret)_cast\b)', line)
-  if match:
-    # Try a better error message when the & is bound to something
-    # dereferenced by the casted pointer, as opposed to the casted
-    # pointer itself.
-    parenthesis_error = False
-    match = Match(r'^(.*&(?:static|dynamic|down|reinterpret)_cast\b)<', line)
-    if match:
-      _, y1, x1 = CloseExpression(clean_lines, linenum, len(match.group(1)))
-      if x1 >= 0 and clean_lines.elided[y1][x1] == '(':
-        _, y2, x2 = CloseExpression(clean_lines, y1, x1)
-        if x2 >= 0:
-          extended_line = clean_lines.elided[y2][x2:]
-          if y2 < clean_lines.NumLines() - 1:
-            extended_line += clean_lines.elided[y2 + 1]
-          if Match(r'\s*(?:->|\[)', extended_line):
-            parenthesis_error = True
-
-    if parenthesis_error:
-      error(filename, linenum, 'readability/casting', 4,
-            ('Are you taking an address of something dereferenced '
-             'from a cast?  Wrapping the dereferenced expression in '
-             'parentheses will make the binding more obvious'))
-    else:
-      error(filename, linenum, 'runtime/casting', 4,
-            ('Are you taking an address of a cast?  '
-             'This is dangerous: could be a temp var.  '
-             'Take the address before doing the cast, rather than after'))
-
-
-def CheckCStyleCast(filename, clean_lines, linenum, cast_type, pattern, error):
-  """Checks for a C-style cast by looking for the pattern.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    cast_type: The string for the C++ cast to recommend.  This is either
-      reinterpret_cast, static_cast, or const_cast, depending.
-    pattern: The regular expression used to find C-style casts.
-    error: The function to call with any errors found.
-
-  Returns:
-    True if an error was emitted.
-    False otherwise.
-  """
-  line = clean_lines.elided[linenum]
-  match = Search(pattern, line)
-  if not match:
-    return False
-
-  # Exclude lines with keywords that tend to look like casts
-  context = line[0:match.start(1) - 1]
-  if Match(r'.*\b(?:sizeof|alignof|alignas|[_A-Z][_A-Z0-9]*)\s*$', context):
-    return False
-
-  # Try expanding current context to see if we one level of
-  # parentheses inside a macro.
-  if linenum > 0:
-    for i in xrange(linenum - 1, max(0, linenum - 5), -1):
-      context = clean_lines.elided[i] + context
-  if Match(r'.*\b[_A-Z][_A-Z0-9]*\s*\((?:\([^()]*\)|[^()])*$', context):
-    return False
-
-  # operator++(int) and operator--(int)
-  if context.endswith(' operator++') or context.endswith(' operator--'):
-    return False
-
-  # A single unnamed argument for a function tends to look like old style cast.
-  # If we see those, don't issue warnings for deprecated casts.
-  remainder = line[match.end(0):]
-  if Match(r'^\s*(?:;|const\b|throw\b|final\b|override\b|[=>{),]|->)',
-           remainder):
-    return False
-
-  # At this point, all that should be left is actual casts.
-  error(filename, linenum, 'readability/casting', 4,
-        'Using C-style cast.  Use %s<%s>(...) instead' %
-        (cast_type, match.group(1)))
-
-  return True
-
-
-def ExpectingFunctionArgs(clean_lines, linenum):
-  """Checks whether where function type arguments are expected.
-
-  Args:
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-
-  Returns:
-    True if the line at 'linenum' is inside something that expects arguments
-    of function types.
-  """
-  line = clean_lines.elided[linenum]
-  return (Match(r'^\s*MOCK_(CONST_)?METHOD\d+(_T)?\(', line) or
-          (linenum >= 2 and
-           (Match(r'^\s*MOCK_(?:CONST_)?METHOD\d+(?:_T)?\((?:\S+,)?\s*$',
-                  clean_lines.elided[linenum - 1]) or
-            Match(r'^\s*MOCK_(?:CONST_)?METHOD\d+(?:_T)?\(\s*$',
-                  clean_lines.elided[linenum - 2]) or
-            Search(r'\bstd::m?function\s*\<\s*$',
-                   clean_lines.elided[linenum - 1]))))
-
-
-_HEADERS_CONTAINING_TEMPLATES = (
-    ('<deque>', ('deque',)),
-    ('<functional>', ('unary_function', 'binary_function',
-                      'plus', 'minus', 'multiplies', 'divides', 'modulus',
-                      'negate',
-                      'equal_to', 'not_equal_to', 'greater', 'less',
-                      'greater_equal', 'less_equal',
-                      'logical_and', 'logical_or', 'logical_not',
-                      'unary_negate', 'not1', 'binary_negate', 'not2',
-                      'bind1st', 'bind2nd',
-                      'pointer_to_unary_function',
-                      'pointer_to_binary_function',
-                      'ptr_fun',
-                      'mem_fun_t', 'mem_fun', 'mem_fun1_t', 'mem_fun1_ref_t',
-                      'mem_fun_ref_t',
-                      'const_mem_fun_t', 'const_mem_fun1_t',
-                      'const_mem_fun_ref_t', 'const_mem_fun1_ref_t',
-                      'mem_fun_ref',
-                     )),
-    ('<limits>', ('numeric_limits',)),
-    ('<list>', ('list',)),
-    ('<map>', ('map', 'multimap',)),
-    ('<memory>', ('allocator', 'make_shared', 'make_unique', 'shared_ptr',
-                  'unique_ptr', 'weak_ptr')),
-    ('<queue>', ('queue', 'priority_queue',)),
-    ('<set>', ('set', 'multiset',)),
-    ('<stack>', ('stack',)),
-    ('<string>', ('char_traits', 'basic_string',)),
-    ('<tuple>', ('tuple',)),
-    ('<unordered_map>', ('unordered_map', 'unordered_multimap')),
-    ('<unordered_set>', ('unordered_set', 'unordered_multiset')),
-    ('<utility>', ('pair',)),
-    ('<vector>', ('vector',)),
-
-    # gcc extensions.
-    # Note: std::hash is their hash, ::hash is our hash
-    ('<hash_map>', ('hash_map', 'hash_multimap',)),
-    ('<hash_set>', ('hash_set', 'hash_multiset',)),
-    ('<slist>', ('slist',)),
-    )
-
-_HEADERS_MAYBE_TEMPLATES = (
-    ('<algorithm>', ('copy', 'max', 'min', 'min_element', 'sort',
-                     'transform',
-                    )),
-    ('<utility>', ('forward', 'make_pair', 'move', 'swap')),
-    )
-
-_RE_PATTERN_STRING = re.compile(r'\bstring\b')
-
-_re_pattern_headers_maybe_templates = []
-for _header, _templates in _HEADERS_MAYBE_TEMPLATES:
-  for _template in _templates:
-    # Match max<type>(..., ...), max(..., ...), but not foo->max, foo.max or
-    # 'type::max()'.
-    _re_pattern_headers_maybe_templates.append(
-        (re.compile(r'[^>.]\b' + _template + r'(<.*?>)?\([^\)]'),
-            _template,
-            _header))
-
-# Other scripts may reach in and modify this pattern.
-_re_pattern_templates = []
-for _header, _templates in _HEADERS_CONTAINING_TEMPLATES:
-  for _template in _templates:
-    _re_pattern_templates.append(
-        (re.compile(r'(\<|\b)' + _template + r'\s*\<'),
-         _template + '<>',
-         _header))
-
-
-def FilesBelongToSameModule(filename_cc, filename_h):
-  """Check if these two filenames belong to the same module.
-
-  The concept of a 'module' here is a as follows:
-  foo.h, foo-inl.h, foo.cc, foo_test.cc and foo_unittest.cc belong to the
-  same 'module' if they are in the same directory.
-  some/path/public/xyzzy and some/path/internal/xyzzy are also considered
-  to belong to the same module here.
-
-  If the filename_cc contains a longer path than the filename_h, for example,
-  '/absolute/path/to/base/sysinfo.cc', and this file would include
-  'base/sysinfo.h', this function also produces the prefix needed to open the
-  header. This is used by the caller of this function to more robustly open the
-  header file. We don't have access to the real include paths in this context,
-  so we need this guesswork here.
-
-  Known bugs: tools/base/bar.cc and base/bar.h belong to the same module
-  according to this implementation. Because of this, this function gives
-  some false positives. This should be sufficiently rare in practice.
-
-  Args:
-    filename_cc: is the path for the source (e.g. .cc) file
-    filename_h: is the path for the header path
-
-  Returns:
-    Tuple with a bool and a string:
-    bool: True if filename_cc and filename_h belong to the same module.
-    string: the additional prefix needed to open the header file.
-  """
-  fileinfo_cc = FileInfo(filename_cc)
-  if not fileinfo_cc.Extension().lstrip('.') in GetNonHeaderExtensions():
-    return (False, '')
-
-  fileinfo_h = FileInfo(filename_h)
-  if not IsHeaderExtension(fileinfo_h.Extension().lstrip('.')):
-    return (False, '')
-
-  filename_cc = filename_cc[:-(len(fileinfo_cc.Extension()))]
-  matched_test_suffix = Search(_TEST_FILE_SUFFIX, fileinfo_cc.BaseName())
-  if matched_test_suffix:
-    filename_cc = filename_cc[:-len(matched_test_suffix.group(1))]
-
-  filename_cc = filename_cc.replace('/public/', '/')
-  filename_cc = filename_cc.replace('/internal/', '/')
-
-  filename_h = filename_h[:-(len(fileinfo_h.Extension()))]
-  if filename_h.endswith('-inl'):
-    filename_h = filename_h[:-len('-inl')]
-  filename_h = filename_h.replace('/public/', '/')
-  filename_h = filename_h.replace('/internal/', '/')
-
-  files_belong_to_same_module = filename_cc.endswith(filename_h)
-  common_path = ''
-  if files_belong_to_same_module:
-    common_path = filename_cc[:-len(filename_h)]
-  return files_belong_to_same_module, common_path
-
-
-def UpdateIncludeState(filename, include_dict, io=codecs):
-  """Fill up the include_dict with new includes found from the file.
-
-  Args:
-    filename: the name of the header to read.
-    include_dict: a dictionary in which the headers are inserted.
-    io: The io factory to use to read the file. Provided for testability.
-
-  Returns:
-    True if a header was successfully added. False otherwise.
-  """
-  headerfile = None
-  try:
-    headerfile = io.open(filename, 'r', 'utf8', 'replace')
-  except IOError:
-    return False
-  linenum = 0
-  for line in headerfile:
-    linenum += 1
-    clean_line = CleanseComments(line)
-    match = _RE_PATTERN_INCLUDE.search(clean_line)
-    if match:
-      include = match.group(2)
-      include_dict.setdefault(include, linenum)
-  return True
-
-
-def CheckForIncludeWhatYouUse(filename, clean_lines, include_state, error,
-                              io=codecs):
-  """Reports for missing stl includes.
-
-  This function will output warnings to make sure you are including the headers
-  necessary for the stl containers and functions that you use. We only give one
-  reason to include a header. For example, if you use both equal_to<> and
-  less<> in a .h file, only one (the latter in the file) of these will be
-  reported as a reason to include the <functional>.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    include_state: An _IncludeState instance.
-    error: The function to call with any errors found.
-    io: The IO factory to use to read the header file. Provided for unittest
-        injection.
-  """
-  required = {}  # A map of header name to linenumber and the template entity.
-                 # Example of required: { '<functional>': (1219, 'less<>') }
-
-  for linenum in xrange(clean_lines.NumLines()):
-    line = clean_lines.elided[linenum]
-    if not line or line[0] == '#':
-      continue
-
-    # String is special -- it is a non-templatized type in STL.
-    matched = _RE_PATTERN_STRING.search(line)
-    if matched:
-      # Don't warn about strings in non-STL namespaces:
-      # (We check only the first match per line; good enough.)
-      prefix = line[:matched.start()]
-      if prefix.endswith('std::') or not prefix.endswith('::'):
-        required['<string>'] = (linenum, 'string')
-
-    for pattern, template, header in _re_pattern_headers_maybe_templates:
-      if pattern.search(line):
-        required[header] = (linenum, template)
-
-    # The following function is just a speed up, no semantics are changed.
-    if not '<' in line:  # Reduces the cpu time usage by skipping lines.
-      continue
-
-    for pattern, template, header in _re_pattern_templates:
-      matched = pattern.search(line)
-      if matched:
-        # Don't warn about IWYU in non-STL namespaces:
-        # (We check only the first match per line; good enough.)
-        prefix = line[:matched.start()]
-        if prefix.endswith('std::') or not prefix.endswith('::'):
-          required[header] = (linenum, template)
-
-  # The policy is that if you #include something in foo.h you don't need to
-  # include it again in foo.cc. Here, we will look at possible includes.
-  # Let's flatten the include_state include_list and copy it into a dictionary.
-  include_dict = dict([item for sublist in include_state.include_list
-                       for item in sublist])
-
-  # Did we find the header for this file (if any) and successfully load it?
-  header_found = False
-
-  # Use the absolute path so that matching works properly.
-  abs_filename = FileInfo(filename).FullName()
-
-  # For Emacs's flymake.
-  # If cpplint is invoked from Emacs's flymake, a temporary file is generated
-  # by flymake and that file name might end with '_flymake.cc'. In that case,
-  # restore original file name here so that the corresponding header file can be
-  # found.
-  # e.g. If the file name is 'foo_flymake.cc', we should search for 'foo.h'
-  # instead of 'foo_flymake.h'
-  abs_filename = re.sub(r'_flymake\.cc$', '.cc', abs_filename)
-
-  # include_dict is modified during iteration, so we iterate over a copy of
-  # the keys.
-  header_keys = list(include_dict.keys())
-  for header in header_keys:
-    (same_module, common_path) = FilesBelongToSameModule(abs_filename, header)
-    fullpath = common_path + header
-    if same_module and UpdateIncludeState(fullpath, include_dict, io):
-      header_found = True
-
-  # If we can't find the header file for a .cc, assume it's because we don't
-  # know where to look. In that case we'll give up as we're not sure they
-  # didn't include it in the .h file.
-  # TODO(unknown): Do a better job of finding .h files so we are confident that
-  # not having the .h file means there isn't one.
-  if not header_found:
-    for extension in GetNonHeaderExtensions():
-      if filename.endswith('.' + extension):
-        return
-
-  # All the lines have been processed, report the errors found.
-  for required_header_unstripped in sorted(required, key=required.__getitem__):
-    template = required[required_header_unstripped][1]
-    if required_header_unstripped.strip('<>"') not in include_dict:
-      error(filename, required[required_header_unstripped][0],
-            'build/include_what_you_use', 4,
-            'Add #include ' + required_header_unstripped + ' for ' + template)
-
-
-_RE_PATTERN_EXPLICIT_MAKEPAIR = re.compile(r'\bmake_pair\s*<')
-
-
-def CheckMakePairUsesDeduction(filename, clean_lines, linenum, error):
-  """Check that make_pair's template arguments are deduced.
-
-  G++ 4.6 in C++11 mode fails badly if make_pair's template arguments are
-  specified explicitly, and such use isn't intended in any case.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-  line = clean_lines.elided[linenum]
-  match = _RE_PATTERN_EXPLICIT_MAKEPAIR.search(line)
-  if match:
-    error(filename, linenum, 'build/explicit_make_pair',
-          4,  # 4 = high confidence
-          'For C++11-compatibility, omit template arguments from make_pair'
-          ' OR use pair directly OR if appropriate, construct a pair directly')
-
-
-def CheckRedundantVirtual(filename, clean_lines, linenum, error):
-  """Check if line contains a redundant "virtual" function-specifier.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-  # Look for "virtual" on current line.
-  line = clean_lines.elided[linenum]
-  virtual = Match(r'^(.*)(\bvirtual\b)(.*)$', line)
-  if not virtual: return
-
-  # Ignore "virtual" keywords that are near access-specifiers.  These
-  # are only used in class base-specifier and do not apply to member
-  # functions.
-  if (Search(r'\b(public|protected|private)\s+$', virtual.group(1)) or
-      Match(r'^\s+(public|protected|private)\b', virtual.group(3))):
-    return
-
-  # Ignore the "virtual" keyword from virtual base classes.  Usually
-  # there is a column on the same line in these cases (virtual base
-  # classes are rare in google3 because multiple inheritance is rare).
-  if Match(r'^.*[^:]:[^:].*$', line): return
-
-  # Look for the next opening parenthesis.  This is the start of the
-  # parameter list (possibly on the next line shortly after virtual).
-  # TODO(unknown): doesn't work if there are virtual functions with
-  # decltype() or other things that use parentheses, but csearch suggests
-  # that this is rare.
-  end_col = -1
-  end_line = -1
-  start_col = len(virtual.group(2))
-  for start_line in xrange(linenum, min(linenum + 3, clean_lines.NumLines())):
-    line = clean_lines.elided[start_line][start_col:]
-    parameter_list = Match(r'^([^(]*)\(', line)
-    if parameter_list:
-      # Match parentheses to find the end of the parameter list
-      (_, end_line, end_col) = CloseExpression(
-          clean_lines, start_line, start_col + len(parameter_list.group(1)))
-      break
-    start_col = 0
-
-  if end_col < 0:
-    return  # Couldn't find end of parameter list, give up
-
-  # Look for "override" or "final" after the parameter list
-  # (possibly on the next few lines).
-  for i in xrange(end_line, min(end_line + 3, clean_lines.NumLines())):
-    line = clean_lines.elided[i][end_col:]
-    match = Search(r'\b(override|final)\b', line)
-    if match:
-      error(filename, linenum, 'readability/inheritance', 4,
-            ('"virtual" is redundant since function is '
-             'already declared as "%s"' % match.group(1)))
-
-    # Set end_col to check whole lines after we are done with the
-    # first line.
-    end_col = 0
-    if Search(r'[^\w]\s*$', line):
-      break
-
-
-def CheckRedundantOverrideOrFinal(filename, clean_lines, linenum, error):
-  """Check if line contains a redundant "override" or "final" virt-specifier.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-  # Look for closing parenthesis nearby.  We need one to confirm where
-  # the declarator ends and where the virt-specifier starts to avoid
-  # false positives.
-  line = clean_lines.elided[linenum]
-  declarator_end = line.rfind(')')
-  if declarator_end >= 0:
-    fragment = line[declarator_end:]
-  else:
-    if linenum > 1 and clean_lines.elided[linenum - 1].rfind(')') >= 0:
-      fragment = line
-    else:
-      return
-
-  # Check that at most one of "override" or "final" is present, not both
-  if Search(r'\boverride\b', fragment) and Search(r'\bfinal\b', fragment):
-    error(filename, linenum, 'readability/inheritance', 4,
-          ('"override" is redundant since function is '
-           'already declared as "final"'))
-
-
-
-
-# Returns true if we are at a new block, and it is directly
-# inside of a namespace.
-def IsBlockInNameSpace(nesting_state, is_forward_declaration):
-  """Checks that the new block is directly in a namespace.
-
-  Args:
-    nesting_state: The _NestingState object that contains info about our state.
-    is_forward_declaration: If the class is a forward declared class.
-  Returns:
-    Whether or not the new block is directly in a namespace.
-  """
-  if is_forward_declaration:
-    return len(nesting_state.stack) >= 1 and (
-      isinstance(nesting_state.stack[-1], _NamespaceInfo))
-
-
-  return (len(nesting_state.stack) > 1 and
-          nesting_state.stack[-1].check_namespace_indentation and
-          isinstance(nesting_state.stack[-2], _NamespaceInfo))
-
-
-def ShouldCheckNamespaceIndentation(nesting_state, is_namespace_indent_item,
-                                    raw_lines_no_comments, linenum):
-  """This method determines if we should apply our namespace indentation check.
-
-  Args:
-    nesting_state: The current nesting state.
-    is_namespace_indent_item: If we just put a new class on the stack, True.
-      If the top of the stack is not a class, or we did not recently
-      add the class, False.
-    raw_lines_no_comments: The lines without the comments.
-    linenum: The current line number we are processing.
-
-  Returns:
-    True if we should apply our namespace indentation check. Currently, it
-    only works for classes and namespaces inside of a namespace.
-  """
-
-  is_forward_declaration = IsForwardClassDeclaration(raw_lines_no_comments,
-                                                     linenum)
-
-  if not (is_namespace_indent_item or is_forward_declaration):
-    return False
-
-  # If we are in a macro, we do not want to check the namespace indentation.
-  if IsMacroDefinition(raw_lines_no_comments, linenum):
-    return False
-
-  return IsBlockInNameSpace(nesting_state, is_forward_declaration)
-
-
-# Call this method if the line is directly inside of a namespace.
-# If the line above is blank (excluding comments) or the start of
-# an inner namespace, it cannot be indented.
-def CheckItemIndentationInNamespace(filename, raw_lines_no_comments, linenum,
-                                    error):
-  line = raw_lines_no_comments[linenum]
-  if Match(r'^\s+', line):
-    error(filename, linenum, 'runtime/indentation_namespace', 4,
-          'Do not indent within a namespace')
-
-
-def ProcessLine(filename, file_extension, clean_lines, line,
-                include_state, function_state, nesting_state, error,
-                extra_check_functions=None):
-  """Processes a single line in the file.
-
-  Args:
-    filename: Filename of the file that is being processed.
-    file_extension: The extension (dot not included) of the file.
-    clean_lines: An array of strings, each representing a line of the file,
-                 with comments stripped.
-    line: Number of line being processed.
-    include_state: An _IncludeState instance in which the headers are inserted.
-    function_state: A _FunctionState instance which counts function lines, etc.
-    nesting_state: A NestingState instance which maintains information about
-                   the current stack of nested blocks being parsed.
-    error: A callable to which errors are reported, which takes 4 arguments:
-           filename, line number, error level, and message
-    extra_check_functions: An array of additional check functions that will be
-                           run on each source line. Each function takes 4
-                           arguments: filename, clean_lines, line, error
-  """
-  raw_lines = clean_lines.raw_lines
-  ParseNolintSuppressions(filename, raw_lines[line], line, error)
-  nesting_state.Update(filename, clean_lines, line, error)
-  CheckForNamespaceIndentation(filename, nesting_state, clean_lines, line,
-                               error)
-  if nesting_state.InAsmBlock(): return
-  CheckForFunctionLengths(filename, clean_lines, line, function_state, error)
-  CheckForMultilineCommentsAndStrings(filename, clean_lines, line, error)
-  CheckStyle(filename, clean_lines, line, file_extension, nesting_state, error)
-  CheckLanguage(filename, clean_lines, line, file_extension, include_state,
-                nesting_state, error)
-  CheckForNonConstReference(filename, clean_lines, line, nesting_state, error)
-  CheckForNonStandardConstructs(filename, clean_lines, line,
-                                nesting_state, error)
-  CheckVlogArguments(filename, clean_lines, line, error)
-  CheckPosixThreading(filename, clean_lines, line, error)
-  CheckInvalidIncrement(filename, clean_lines, line, error)
-  CheckMakePairUsesDeduction(filename, clean_lines, line, error)
-  CheckRedundantVirtual(filename, clean_lines, line, error)
-  CheckRedundantOverrideOrFinal(filename, clean_lines, line, error)
-  if extra_check_functions:
-    for check_fn in extra_check_functions:
-      check_fn(filename, clean_lines, line, error)
-
-def FlagCxx11Features(filename, clean_lines, linenum, error):
-  """Flag those c++11 features that we only allow in certain places.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-  line = clean_lines.elided[linenum]
-
-  include = Match(r'\s*#\s*include\s+[<"]([^<"]+)[">]', line)
-
-  # Flag unapproved C++ TR1 headers.
-  if include and include.group(1).startswith('tr1/'):
-    error(filename, linenum, 'build/c++tr1', 5,
-          ('C++ TR1 headers such as <%s> are unapproved.') % include.group(1))
-
-  # Flag unapproved C++11 headers.
-  if include and include.group(1) in ('cfenv',
-                                      'condition_variable',
-                                      'fenv.h',
-                                      'future',
-                                      'mutex',
-                                      'thread',
-                                      'chrono',
-                                      'ratio',
-                                      'regex',
-                                      'system_error',
-                                     ):
-    error(filename, linenum, 'build/c++11', 5,
-          ('<%s> is an unapproved C++11 header.') % include.group(1))
-
-  # The only place where we need to worry about C++11 keywords and library
-  # features in preprocessor directives is in macro definitions.
-  if Match(r'\s*#', line) and not Match(r'\s*#\s*define\b', line): return
-
-  # These are classes and free functions.  The classes are always
-  # mentioned as std::*, but we only catch the free functions if
-  # they're not found by ADL.  They're alphabetical by header.
-  for top_name in (
-      # type_traits
-      'alignment_of',
-      'aligned_union',
-      ):
-    if Search(r'\bstd::%s\b' % top_name, line):
-      error(filename, linenum, 'build/c++11', 5,
-            ('std::%s is an unapproved C++11 class or function.  Send c-style '
-             'an example of where it would make your code more readable, and '
-             'they may let you use it.') % top_name)
-
-
-def FlagCxx14Features(filename, clean_lines, linenum, error):
-  """Flag those C++14 features that we restrict.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    error: The function to call with any errors found.
-  """
-  line = clean_lines.elided[linenum]
-
-  include = Match(r'\s*#\s*include\s+[<"]([^<"]+)[">]', line)
-
-  # Flag unapproved C++14 headers.
-  if include and include.group(1) in ('scoped_allocator', 'shared_mutex'):
-    error(filename, linenum, 'build/c++14', 5,
-          ('<%s> is an unapproved C++14 header.') % include.group(1))
-
-
-def ProcessFileData(filename, file_extension, lines, error,
-                    extra_check_functions=None):
-  """Performs lint checks and reports any errors to the given error function.
-
-  Args:
-    filename: Filename of the file that is being processed.
-    file_extension: The extension (dot not included) of the file.
-    lines: An array of strings, each representing a line of the file, with the
-           last element being empty if the file is terminated with a newline.
-    error: A callable to which errors are reported, which takes 4 arguments:
-           filename, line number, error level, and message
-    extra_check_functions: An array of additional check functions that will be
-                           run on each source line. Each function takes 4
-                           arguments: filename, clean_lines, line, error
-  """
-  lines = (['// marker so line numbers and indices both start at 1'] + lines +
-           ['// marker so line numbers end in a known way'])
-
-  include_state = _IncludeState()
-  function_state = _FunctionState()
-  nesting_state = NestingState()
-
-  ResetNolintSuppressions()
-
-  CheckForCopyright(filename, lines, error)
-  ProcessGlobalSuppresions(lines)
-  RemoveMultiLineComments(filename, lines, error)
-  clean_lines = CleansedLines(lines)
-
-  if IsHeaderExtension(file_extension):
-    CheckForHeaderGuard(filename, clean_lines, error)
-
-  for line in xrange(clean_lines.NumLines()):
-    ProcessLine(filename, file_extension, clean_lines, line,
-                include_state, function_state, nesting_state, error,
-                extra_check_functions)
-    FlagCxx11Features(filename, clean_lines, line, error)
-  nesting_state.CheckCompletedBlocks(filename, error)
-
-  CheckForIncludeWhatYouUse(filename, clean_lines, include_state, error)
-
-  # Check that the .cc file has included its header if it exists.
-  if _IsSourceExtension(file_extension):
-    CheckHeaderFileIncluded(filename, include_state, error)
-
-  # We check here rather than inside ProcessLine so that we see raw
-  # lines rather than "cleaned" lines.
-  CheckForBadCharacters(filename, lines, error)
-
-  CheckForNewlineAtEOF(filename, lines, error)
-
-def ProcessConfigOverrides(filename):
-  """ Loads the configuration files and processes the config overrides.
-
-  Args:
-    filename: The name of the file being processed by the linter.
-
-  Returns:
-    False if the current |filename| should not be processed further.
-  """
-
-  abs_filename = os.path.abspath(filename)
-  cfg_filters = []
-  keep_looking = True
-  while keep_looking:
-    abs_path, base_name = os.path.split(abs_filename)
-    if not base_name:
-      break  # Reached the root directory.
-
-    cfg_file = os.path.join(abs_path, "CPPLINT.cfg")
-    abs_filename = abs_path
-    if not os.path.isfile(cfg_file):
-      continue
-
-    try:
-      with open(cfg_file) as file_handle:
-        for line in file_handle:
-          line, _, _ = line.partition('#')  # Remove comments.
-          if not line.strip():
-            continue
-
-          name, _, val = line.partition('=')
-          name = name.strip()
-          val = val.strip()
-          if name == 'set noparent':
-            keep_looking = False
-          elif name == 'filter':
-            cfg_filters.append(val)
-          elif name == 'exclude_files':
-            # When matching exclude_files pattern, use the base_name of
-            # the current file name or the directory name we are processing.
-            # For example, if we are checking for lint errors in /foo/bar/baz.cc
-            # and we found the .cfg file at /foo/CPPLINT.cfg, then the config
-            # file's "exclude_files" filter is meant to be checked against "bar"
-            # and not "baz" nor "bar/baz.cc".
-            if base_name:
-              pattern = re.compile(val)
-              if pattern.match(base_name):
-                if _cpplint_state.quiet:
-                  # Suppress "Ignoring file" warning when using --quiet.
-                  return False
-                _cpplint_state.PrintInfo('Ignoring "%s": file excluded by "%s". '
-                                 'File path component "%s" matches '
-                                 'pattern "%s"\n' %
-                                 (filename, cfg_file, base_name, val))
-                return False
-          elif name == 'linelength':
-            global _line_length
-            try:
-              _line_length = int(val)
-            except ValueError:
-              _cpplint_state.PrintError('Line length must be numeric.')
-          elif name == 'extensions':
-            global _valid_extensions
-            try:
-              extensions = [ext.strip() for ext in val.split(',')]
-              _valid_extensions = set(extensions)
-            except ValueError:
-              sys.stderr.write('Extensions should be a comma-separated list of values;'
-                               'for example: extensions=hpp,cpp\n'
-                               'This could not be parsed: "%s"' % (val,))
-          elif name == 'root':
-            global _root
-            # root directories are specified relative to CPPLINT.cfg dir.
-            _root = os.path.join(os.path.dirname(cfg_file), val)
-          elif name == 'headers':
-            ProcessHppHeadersOption(val)
-          else:
-            _cpplint_state.PrintError(
-                'Invalid configuration option (%s) in file %s\n' %
-                (name, cfg_file))
-
-    except IOError:
-      _cpplint_state.PrintError(
-          "Skipping config file '%s': Can't open for reading\n" % cfg_file)
-      keep_looking = False
-
-  # Apply all the accumulated filters in reverse order (top-level directory
-  # config options having the least priority).
-  for cfg_filter in reversed(cfg_filters):
-    _AddFilters(cfg_filter)
-
-  return True
-
-
-def ProcessFile(filename, vlevel, extra_check_functions=None):
-  """Does google-lint on a single file.
-
-  Args:
-    filename: The name of the file to parse.
-
-    vlevel: The level of errors to report.  Every error of confidence
-    >= verbose_level will be reported.  0 is a good default.
-
-    extra_check_functions: An array of additional check functions that will be
-                           run on each source line. Each function takes 4
-                           arguments: filename, clean_lines, line, error
-  """
-
-  _SetVerboseLevel(vlevel)
-  _BackupFilters()
-  old_errors = _cpplint_state.error_count
-
-  if not ProcessConfigOverrides(filename):
-    _RestoreFilters()
-    return
-
-  lf_lines = []
-  crlf_lines = []
-  try:
-    # Support the UNIX convention of using "-" for stdin.  Note that
-    # we are not opening the file with universal newline support
-    # (which codecs doesn't support anyway), so the resulting lines do
-    # contain trailing '\r' characters if we are reading a file that
-    # has CRLF endings.
-    # If after the split a trailing '\r' is present, it is removed
-    # below.
-    if filename == '-':
-      lines = codecs.StreamReaderWriter(sys.stdin,
-                                        codecs.getreader('utf8'),
-                                        codecs.getwriter('utf8'),
-                                        'replace').read().split('\n')
-    else:
-      lines = codecs.open(filename, 'r', 'utf8', 'replace').read().split('\n')
-
-    # Remove trailing '\r'.
-    # The -1 accounts for the extra trailing blank line we get from split()
-    for linenum in range(len(lines) - 1):
-      if lines[linenum].endswith('\r'):
-        lines[linenum] = lines[linenum].rstrip('\r')
-        crlf_lines.append(linenum + 1)
-      else:
-        lf_lines.append(linenum + 1)
-
-  except IOError:
-    _cpplint_state.PrintError(
-        "Skipping input '%s': Can't open for reading\n" % filename)
-    _RestoreFilters()
-    return
-
-  # Note, if no dot is found, this will give the entire filename as the ext.
-  file_extension = filename[filename.rfind('.') + 1:]
-
-  # When reading from stdin, the extension is unknown, so no cpplint tests
-  # should rely on the extension.
-  if filename != '-' and file_extension not in GetAllExtensions():
-    _cpplint_state.PrintError('Ignoring %s; not a valid file name '
-                     '(%s)\n' % (filename, ', '.join(GetAllExtensions())))
-  else:
-    ProcessFileData(filename, file_extension, lines, Error,
-                    extra_check_functions)
-
-    # If end-of-line sequences are a mix of LF and CR-LF, issue
-    # warnings on the lines with CR.
-    #
-    # Don't issue any warnings if all lines are uniformly LF or CR-LF,
-    # since critique can handle these just fine, and the style guide
-    # doesn't dictate a particular end of line sequence.
-    #
-    # We can't depend on os.linesep to determine what the desired
-    # end-of-line sequence should be, since that will return the
-    # server-side end-of-line sequence.
-    if lf_lines and crlf_lines:
-      # Warn on every line with CR.  An alternative approach might be to
-      # check whether the file is mostly CRLF or just LF, and warn on the
-      # minority, we bias toward LF here since most tools prefer LF.
-      for linenum in crlf_lines:
-        Error(filename, linenum, 'whitespace/newline', 1,
-              'Unexpected \\r (^M) found; better to use only \\n')
-
-  # Suppress printing anything if --quiet was passed unless the error
-  # count has increased after processing this file.
-  if not _cpplint_state.quiet or old_errors != _cpplint_state.error_count:
-    _cpplint_state.PrintInfo('Done processing %s\n' % filename)
-  _RestoreFilters()
-
-
-def PrintUsage(message):
-  """Prints a brief usage string and exits, optionally with an error message.
-
-  Args:
-    message: The optional error message.
-  """
-  sys.stderr.write(_USAGE  % (list(GetAllExtensions()),
-       ','.join(list(GetAllExtensions())),
-       GetHeaderExtensions(),
-       ','.join(GetHeaderExtensions())))
-
-  if message:
-    sys.exit('\nFATAL ERROR: ' + message)
-  else:
-    sys.exit(0)
-
-def PrintVersion():
-  sys.stdout.write('Cpplint fork (https://github.com/cpplint/cpplint)\n')
-  sys.stdout.write('cpplint ' + __VERSION__ + '\n')
-  sys.stdout.write('Python ' + sys.version + '\n')
-  sys.exit(0)
-
-def PrintCategories():
-  """Prints a list of all the error-categories used by error messages.
-
-  These are the categories used to filter messages via --filter.
-  """
-  sys.stderr.write(''.join('  %s\n' % cat for cat in _ERROR_CATEGORIES))
-  sys.exit(0)
-
-
-def ParseArguments(args):
-  """Parses the command line arguments.
-
-  This may set the output format and verbosity level as side-effects.
-
-  Args:
-    args: The command line arguments:
-
-  Returns:
-    The list of filenames to lint.
-  """
-  try:
-    (opts, filenames) = getopt.getopt(args, '', ['help', 'output=', 'verbose=',
-                                                 'v=',
-                                                 'version',
-                                                 'counting=',
-                                                 'filter=',
-                                                 'root=',
-                                                 'repository=',
-                                                 'linelength=',
-                                                 'extensions=',
-                                                 'exclude=',
-                                                 'recursive',
-                                                 'headers=',
-                                                 'quiet'])
-  except getopt.GetoptError:
-    PrintUsage('Invalid arguments.')
-
-  verbosity = _VerboseLevel()
-  output_format = _OutputFormat()
-  filters = ''
-  quiet = _Quiet()
-  counting_style = ''
-  recursive = False
-
-  for (opt, val) in opts:
-    if opt == '--help':
-      PrintUsage(None)
-    if opt == '--version':
-      PrintVersion()
-    elif opt == '--output':
-      if val not in ('emacs', 'vs7', 'eclipse', 'junit'):
-        PrintUsage('The only allowed output formats are emacs, vs7, eclipse '
-                   'and junit.')
-      output_format = val
-    elif opt == '--quiet':
-      quiet = True
-    elif opt == '--verbose' or opt == '--v':
-      verbosity = int(val)
-    elif opt == '--filter':
-      filters = val
-      if not filters:
-        PrintCategories()
-    elif opt == '--counting':
-      if val not in ('total', 'toplevel', 'detailed'):
-        PrintUsage('Valid counting options are total, toplevel, and detailed')
-      counting_style = val
-    elif opt == '--root':
-      global _root
-      _root = val
-    elif opt == '--repository':
-      global _repository
-      _repository = val
-    elif opt == '--linelength':
-      global _line_length
-      try:
-        _line_length = int(val)
-      except ValueError:
-        PrintUsage('Line length must be digits.')
-    elif opt == '--exclude':
-      global _excludes
-      if not _excludes:
-        _excludes = set()
-      _excludes.update(glob.glob(val))
-    elif opt == '--extensions':
-      global _valid_extensions
-      try:
-        _valid_extensions = set(val.split(','))
-      except ValueError:
-        PrintUsage('Extensions must be comma seperated list.')
-    elif opt == '--headers':
-      ProcessHppHeadersOption(val)
-    elif opt == '--recursive':
-      recursive = True
-
-  if not filenames:
-    PrintUsage('No files were specified.')
-
-  if recursive:
-    filenames = _ExpandDirectories(filenames)
-
-  if _excludes:
-    filenames = _FilterExcludedFiles(filenames)
-
-  _SetOutputFormat(output_format)
-  _SetQuiet(quiet)
-  _SetVerboseLevel(verbosity)
-  _SetFilters(filters)
-  _SetCountingStyle(counting_style)
-
-  return filenames
-
-def _ExpandDirectories(filenames):
-  """Searches a list of filenames and replaces directories in the list with
-  all files descending from those directories. Files with extensions not in
-  the valid extensions list are excluded.
-
-  Args:
-    filenames: A list of files or directories
-
-  Returns:
-    A list of all files that are members of filenames or descended from a
-    directory in filenames
-  """
-  expanded = set()
-  for filename in filenames:
-    if not os.path.isdir(filename):
-      expanded.add(filename)
-      continue
-
-    for root, _, files in os.walk(filename):
-      for loopfile in files:
-        fullname = os.path.join(root, loopfile)
-        if fullname.startswith('.' + os.path.sep):
-          fullname = fullname[len('.' + os.path.sep):]
-        expanded.add(fullname)
-
-  filtered = []
-  for filename in expanded:
-    if os.path.splitext(filename)[1][1:] in GetAllExtensions():
-      filtered.append(filename)
-
-  return filtered
-
-def _FilterExcludedFiles(filenames):
-  """Filters out files listed in the --exclude command line switch. File paths
-  in the switch are evaluated relative to the current working directory
-  """
-  exclude_paths = [os.path.abspath(f) for f in _excludes]
-  return [f for f in filenames if os.path.abspath(f) not in exclude_paths]
-
-def main():
-  filenames = ParseArguments(sys.argv[1:])
-  backup_err = sys.stderr
-  try:
-    # Change stderr to write with replacement characters so we don't die
-    # if we try to print something containing non-ASCII characters.
-    sys.stderr = codecs.StreamReader(sys.stderr, 'replace')
-
-    _cpplint_state.ResetErrorCounts()
-    for filename in filenames:
-      ProcessFile(filename, _cpplint_state.verbose_level)
-    # If --quiet is passed, suppress printing error count unless there are errors.
-    if not _cpplint_state.quiet or _cpplint_state.error_count > 0:
-      _cpplint_state.PrintErrorCounts()
-
-    if _cpplint_state.output_format == 'junit':
-      sys.stderr.write(_cpplint_state.FormatJUnitXML())
-
-  finally:
-    sys.stderr = backup_err
-
-  sys.exit(_cpplint_state.error_count > 0)
-
-
-if __name__ == '__main__':
-  main()
diff --git a/external_imported/json/third_party/cpplint/update.sh b/external_imported/json/third_party/cpplint/update.sh
deleted file mode 100755
index 03b6785b7..000000000
--- a/external_imported/json/third_party/cpplint/update.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-wget -N https://raw.githubusercontent.com/cpplint/cpplint/master/cpplint.py
-wget -N https://raw.githubusercontent.com/cpplint/cpplint/master/LICENSE
-wget -N https://raw.githubusercontent.com/cpplint/cpplint/master/README.rst
diff --git a/external_imported/json/third_party/gdb_pretty_printer/README.md b/external_imported/json/third_party/gdb_pretty_printer/README.md
deleted file mode 100644
index f5f61927b..000000000
--- a/external_imported/json/third_party/gdb_pretty_printer/README.md
+++ /dev/null
@@ -1,77 +0,0 @@
-# GDB Pretty Printer
-
-File [nlohmann-json.py](nlohmann-json.py) contains a pretty printer for GDB for JSON values of this library. It was originally published as [Gist](https://gist.github.com/ssbssa/60da5339c6e6036b2afce17de06050ea#file-nlohmann-json-py) by [Hannes Domani](https://github.com/ssbssa).
-
-## How to use
-
-- Add line
-  
-  ```
-  source /path/to/nlohmann-json.py
-  ```
-  
-  to `~/.gdbinit`. Note you must replace `/path/to` with whatever path you stored file `nlohmann-json.py`.
-- In GDB, debug as usual. When you want to pretty-print a JSON value `var`, type
-  
-  ```
-  p -pretty on -array on -- var
-  ```
-  
-  The result should look like
-  
-  ```
-    $1 = std::map with 5 elements = {
-        ["Baptiste"] = std::map with 1 element = {
-            ["first"] = "second"
-        },
-        ["Emmanuel"] = std::vector of length 3, capacity 3 = {
-            3,
-            "25",
-            0.5
-        },
-        ["Jean"] = 0.7,
-        ["Zorg"] = std::map with 8 elements = {
-            ["array"] = std::vector of length 3, capacity 3 = {
-                1,
-                0,
-                2
-            },
-            ["awesome_str"] = "bleh",
-            ["bool"] = true,
-            ["flex"] = 0.2,
-            ["float"] = 5.22,
-            ["int"] = 5,
-            ["nested"] = std::map with 1 element = {
-                ["bar"] = "barz"
-            },
-            ["trap "] = "you fell"
-        },
-        ["empty"] = nlohmann::detail::value_t::null
-    }
-    ```
-
-Tested with GDB 9.2. See [#1952](https://github.com/nlohmann/json/issues/1952) for more information. Please post questions there.
-
-## Copyright
-
-MIT License
-
-Copyright (C) 2020 [Hannes Domani](https://github.com/ssbssa)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/external_imported/json/third_party/gdb_pretty_printer/nlohmann-json.py b/external_imported/json/third_party/gdb_pretty_printer/nlohmann-json.py
deleted file mode 100644
index 5bac45f61..000000000
--- a/external_imported/json/third_party/gdb_pretty_printer/nlohmann-json.py
+++ /dev/null
@@ -1,28 +0,0 @@
-import gdb
-import re
-
-class JsonValuePrinter:
-    "Print a json-value"
-
-    def __init__(self, val):
-        self.val = val
-
-    def to_string(self):
-        if self.val.type.strip_typedefs().code == gdb.TYPE_CODE_FLT:
-            return ("%.6f" % float(self.val)).rstrip("0")
-        return self.val
-
-def json_lookup_function(val):
-    if re.search("^nlohmann::basic_json<.*>$", val.type.strip_typedefs().name):
-        t = str(val['m_type'])
-        if t.startswith("nlohmann::detail::value_t::"):
-            try:
-                union_val = val['m_value'][t[27:]]
-                if union_val.type.code == gdb.TYPE_CODE_PTR:
-                    return gdb.default_visualizer(union_val.dereference())
-                else:
-                    return JsonValuePrinter(union_val)
-            except:
-                return JsonValuePrinter(val['m_type'])
-
-gdb.pretty_printers.append(json_lookup_function)
diff --git a/external_imported/json/third_party/amalgamate/CHANGES.md b/external_imported/json/tools/amalgamate/CHANGES.md
similarity index 100%
rename from external_imported/json/third_party/amalgamate/CHANGES.md
rename to external_imported/json/tools/amalgamate/CHANGES.md
diff --git a/external_imported/json/third_party/amalgamate/README.md b/external_imported/json/tools/amalgamate/README.md
similarity index 100%
rename from external_imported/json/third_party/amalgamate/README.md
rename to external_imported/json/tools/amalgamate/README.md
diff --git a/external_imported/json/third_party/amalgamate/amalgamate.py b/external_imported/json/tools/amalgamate/amalgamate.py
similarity index 99%
rename from external_imported/json/third_party/amalgamate/amalgamate.py
rename to external_imported/json/tools/amalgamate/amalgamate.py
index f01b43b76..0aed7c901 100755
--- a/external_imported/json/third_party/amalgamate/amalgamate.py
+++ b/external_imported/json/tools/amalgamate/amalgamate.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # coding=utf-8
 
 # amalgamate.py - Amalgamate C source and header files.
diff --git a/external_imported/json/third_party/amalgamate/config.json b/external_imported/json/tools/amalgamate/config_json.json
similarity index 100%
rename from external_imported/json/third_party/amalgamate/config.json
rename to external_imported/json/tools/amalgamate/config_json.json
diff --git a/external_imported/json/tools/amalgamate/config_json_fwd.json b/external_imported/json/tools/amalgamate/config_json_fwd.json
new file mode 100644
index 000000000..695929c15
--- /dev/null
+++ b/external_imported/json/tools/amalgamate/config_json_fwd.json
@@ -0,0 +1,8 @@
+{
+	"project": "JSON for Modern C++",
+	"target": "single_include/nlohmann/json_fwd.hpp",
+	"sources": [
+		"include/nlohmann/json_fwd.hpp"
+	],
+	"include_paths": ["include"]
+}
diff --git a/external_imported/json/tools/gdb_pretty_printer/README.md b/external_imported/json/tools/gdb_pretty_printer/README.md
new file mode 100644
index 000000000..c1a3651d4
--- /dev/null
+++ b/external_imported/json/tools/gdb_pretty_printer/README.md
@@ -0,0 +1,78 @@
+# GDB Pretty Printer
+
+File [nlohmann-json.py](nlohmann-json.py) contains a pretty printer for GDB for JSON values of this library. It was originally published as [Gist](https://gist.github.com/ssbssa/60da5339c6e6036b2afce17de06050ea#file-nlohmann-json-py) by [Hannes Domani](https://github.com/ssbssa).
+
+## How to use
+
+- Add line
+  
+  ```
+  source /path/to/nlohmann-json.py
+  ```
+  
+  to `~/.gdbinit`. Note you must replace `/path/to` with whatever path you stored file `nlohmann-json.py`.
+- In GDB, debug as usual. When you want to pretty-print a JSON value `var`, type
+  
+  ```
+  p -pretty on -array on -- var
+  ```
+  
+  The result should look like
+  
+  ```
+    $1 = std::map with 5 elements = {
+        ["Baptiste"] = std::map with 1 element = {
+            ["first"] = "second"
+        },
+        ["Emmanuel"] = std::vector of length 3, capacity 3 = {
+            3,
+            "25",
+            0.5
+        },
+        ["Jean"] = 0.7,
+        ["Zorg"] = std::map with 8 elements = {
+            ["array"] = std::vector of length 3, capacity 3 = {
+                1,
+                0,
+                2
+            },
+            ["awesome_str"] = "bleh",
+            ["bool"] = true,
+            ["flex"] = 0.2,
+            ["float"] = 5.22,
+            ["int"] = 5,
+            ["nested"] = std::map with 1 element = {
+                ["bar"] = "barz"
+            },
+            ["trap "] = "you fell"
+        },
+        ["empty"] = nlohmann::detail::value_t::null
+    }
+    ```
+
+Requires Python 3.9+. Last tested with GDB 12.1.
+See [#1952](https://github.com/nlohmann/json/issues/1952) for more information. Please post questions there.
+
+## Copyright
+
+MIT License
+
+Copyright (C) 2020 [Hannes Domani](https://github.com/ssbssa)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/external_imported/json/tools/gdb_pretty_printer/nlohmann-json.py b/external_imported/json/tools/gdb_pretty_printer/nlohmann-json.py
new file mode 100644
index 000000000..299152aed
--- /dev/null
+++ b/external_imported/json/tools/gdb_pretty_printer/nlohmann-json.py
@@ -0,0 +1,32 @@
+import gdb
+import re
+
+ns_pattern = re.compile(r'nlohmann(::json_abi(?P<tags>\w*)(_v(?P<v_major>\d+)_(?P<v_minor>\d+)_(?P<v_patch>\d+))?)?::(?P<name>.+)')
+class JsonValuePrinter:
+    "Print a json-value"
+
+    def __init__(self, val):
+        self.val = val
+
+    def to_string(self):
+        if self.val.type.strip_typedefs().code == gdb.TYPE_CODE_FLT:
+            return ("%.6f" % float(self.val)).rstrip("0")
+        return self.val
+
+def json_lookup_function(val):
+    if m := ns_pattern.fullmatch(str(val.type.strip_typedefs().name)):
+      name = m.group('name')
+      if name and name.startswith('basic_json<') and name.endswith('>'):
+          m = ns_pattern.fullmatch(str(val['m_type']))
+          t = m.group('name')
+          if t and t.startswith('detail::value_t::'):
+              try:
+                  union_val = val['m_value'][t.removeprefix('detail::value_t::')]
+                  if union_val.type.code == gdb.TYPE_CODE_PTR:
+                      return gdb.default_visualizer(union_val.dereference())
+                  else:
+                      return JsonValuePrinter(union_val)
+              except Exception:
+                  return JsonValuePrinter(val['m_type'])
+
+gdb.pretty_printers.append(json_lookup_function)
diff --git a/external_imported/json/tools/generate_natvis/README.md b/external_imported/json/tools/generate_natvis/README.md
new file mode 100644
index 000000000..b4d3a7d7f
--- /dev/null
+++ b/external_imported/json/tools/generate_natvis/README.md
@@ -0,0 +1,10 @@
+generate_natvis.py
+==================
+
+Generate the Natvis debugger visualization file for all supported namespace combinations.
+
+## Usage
+
+```
+./generate_natvis.py --version X.Y.Z output_directory/
+```
diff --git a/external_imported/json/tools/generate_natvis/generate_natvis.py b/external_imported/json/tools/generate_natvis/generate_natvis.py
new file mode 100755
index 000000000..9266050c5
--- /dev/null
+++ b/external_imported/json/tools/generate_natvis/generate_natvis.py
@@ -0,0 +1,41 @@
+#!/usr/bin/env python3
+
+import argparse
+import itertools
+import jinja2
+import os
+import re
+import sys
+
+def semver(v):
+    if not re.fullmatch(r'\d+\.\d+\.\d+', v):
+        raise ValueError
+    return v
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--version', required=True, type=semver, help='Library version number')
+    parser.add_argument('output', help='Output directory for nlohmann_json.natvis')
+    args = parser.parse_args()
+
+    namespaces = ['nlohmann']
+    abi_prefix = 'json_abi'
+    abi_tags = ['_diag', '_ldvcmp']
+    version = '_v' + args.version.replace('.', '_')
+    inline_namespaces = []
+
+    # generate all combinations of inline namespace names
+    for n in range(0, len(abi_tags) + 1):
+        for tags in itertools.combinations(abi_tags, n):
+            ns = abi_prefix + ''.join(tags)
+            inline_namespaces += [ns, ns + version]
+
+    namespaces += [f'{namespaces[0]}::{ns}' for ns in inline_namespaces]
+
+    env = jinja2.Environment(loader=jinja2.FileSystemLoader(searchpath=sys.path[0]), autoescape=True, trim_blocks=True,
+                                                            lstrip_blocks=True, keep_trailing_newline=True)
+    template = env.get_template('nlohmann_json.natvis.j2')
+    natvis = template.render(namespaces=namespaces)
+
+    with open(os.path.join(args.output, 'nlohmann_json.natvis'), 'w') as f:
+        f.write(natvis)
diff --git a/external_imported/json/tools/generate_natvis/nlohmann_json.natvis.j2 b/external_imported/json/tools/generate_natvis/nlohmann_json.natvis.j2
new file mode 100644
index 000000000..d6b728935
--- /dev/null
+++ b/external_imported/json/tools/generate_natvis/nlohmann_json.natvis.j2
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- * * * * * * * * AUTO-GENERATED FILE  * * * * * * * * -->
+<!-- Edit ./tools/generate_natvis/nlohmann_json.natvis.j2 -->
+<!-- * * * * * * * * AUTO-GENERATED FILE  * * * * * * * * -->
+
+<AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
+{% for ns in namespaces %}
+    <!-- Namespace {{ ns }} -->
+    <Type Name="{{ ns }}::basic_json&lt;*&gt;">
+        <DisplayString Condition="m_type == {{ ns }}::detail::value_t::null">null</DisplayString>
+        <DisplayString Condition="m_type == {{ ns }}::detail::value_t::object">{*(m_value.object)}</DisplayString>
+        <DisplayString Condition="m_type == {{ ns }}::detail::value_t::array">{*(m_value.array)}</DisplayString>
+        <DisplayString Condition="m_type == {{ ns }}::detail::value_t::string">{*(m_value.string)}</DisplayString>
+        <DisplayString Condition="m_type == {{ ns }}::detail::value_t::boolean">{m_value.boolean}</DisplayString>
+        <DisplayString Condition="m_type == {{ ns }}::detail::value_t::number_integer">{m_value.number_integer}</DisplayString>
+        <DisplayString Condition="m_type == {{ ns }}::detail::value_t::number_unsigned">{m_value.number_unsigned}</DisplayString>
+        <DisplayString Condition="m_type == {{ ns }}::detail::value_t::number_float">{m_value.number_float}</DisplayString>
+        <DisplayString Condition="m_type == {{ ns }}::detail::value_t::discarded">discarded</DisplayString>
+        <Expand>
+            <ExpandedItem Condition="m_type == {{ ns }}::detail::value_t::object">
+                *(m_value.object),view(simple)
+            </ExpandedItem>
+            <ExpandedItem Condition="m_type == {{ ns }}::detail::value_t::array">
+                *(m_value.array),view(simple)
+            </ExpandedItem>
+        </Expand>
+    </Type>
+
+    <!-- Skip the pair first/second members in the treeview while traversing a map.
+         Only works in VS 2015 Update 2 and beyond using the new visualization -->
+    <Type Name="std::pair&lt;*, {{ ns }}::basic_json&lt;*&gt;&gt;" IncludeView="MapHelper">
+        <DisplayString>{second}</DisplayString>
+        <Expand>
+            <ExpandedItem>second</ExpandedItem>
+        </Expand>
+    </Type>
+
+{% endfor %}
+</AutoVisualizer>
diff --git a/external_imported/json/third_party/macro_builder/main.cpp b/external_imported/json/tools/macro_builder/main.cpp
similarity index 100%
rename from external_imported/json/third_party/macro_builder/main.cpp
rename to external_imported/json/tools/macro_builder/main.cpp
diff --git a/external_imported/json/tools/serve_header/README.md b/external_imported/json/tools/serve_header/README.md
new file mode 100644
index 000000000..123fd4479
--- /dev/null
+++ b/external_imported/json/tools/serve_header/README.md
@@ -0,0 +1,91 @@
+serve_header.py
+===============
+
+Serves the `single_include/nlohmann/json.hpp` header file over HTTP(S).
+
+The header file is automatically amalgamated on demand.
+
+![serve_header.py demo](demo.png)
+
+## Prerequisites
+
+1. Make sure these Python packages are installed.
+    ```
+    PyYAML
+    watchdog
+    ```
+    (see `tools/serve_header/requirements.txt`)
+
+2. To serve the header over HTTPS (which is required by Compiler Explorer at this time), a certificate is needed.
+   The recommended method for creating a locally-trusted certificate is to use [`mkcert`](https://github.com/FiloSottile/mkcert).
+   - Install the `mkcert` certificate authority into your trust store(s):
+     ```
+     $ mkcert -install
+     ```
+   - Create a certificate for `localhost`:
+     ```
+     $ mkcert localhost
+     ```
+     The command will create two files, `localhost.pem` and `localhost-key.pem`, in the current working directory. It is recommended to create them in the top level or project root directory.
+
+## Usage
+
+`serve_header.py` has a built-in default configuration that will serve the `single_include/nlohmann/json.hpp` header file relative to the top level or project root directory it is homed in.
+The built-in configuration expects the certificate `localhost.pem` and the private key `localhost-key.pem`to be located in the top level or project root directory.
+
+To start serving the `json.hpp` header file at `https://localhost:8443/json.hpp`, run this command from the top level or project root directory:
+```
+$ make serve_header
+```
+
+Open [Compiler Explorer](https://godbolt.org/) and try it out:
+```cpp
+#include <https://localhost:8443/json.hpp>
+using namespace nlohmann;
+
+#include <iostream>
+
+int main() {
+    // these macros are dynamically injected into the header file
+    std::cout << JSON_BUILD_TIME << " (" << JSON_BUILD_COUNT << ")\n";
+
+    return 0;
+}
+```
+
+> `serve_header.py` dynamically injects the macros `JSON_BUILD_COUNT` and `JSON_BUILD_TIME` into the served header file. By comparing build count or time output from the compiled program with the output from `serve_header.py`, one can be reasonably sure the compiled code uses the expected revision of the header file.
+
+## Configuration
+
+`serve_header.py` will try to read a configuration file `serve_header.yml` in the top level or project root directory, and will fall back on built-in defaults if the file cannot be read.
+An annotated example configuration can be found in `tools/serve_header/serve_header.yml.example`.
+
+## Serving `json.hpp` from multiple project directory instances or working trees
+
+`serve_header.py` was designed with the goal of supporting multiple project roots or working trees at the same time.
+The recommended directory structure is shown below but `serve_header.py` can work with other structures as well, including a nested hierarchy.
+```
+json/          ⮜ the parent or web server root directory
+├── develop/   ⮜ the main git checkout
+│   └── ...
+├── feature1/
+│   └── ...      any number of additional
+├── feature2/  ⮜ working trees (e.g., created
+│   └── ...      with git worktree)
+└── feature3/
+    └── ...
+```
+
+To serve the header of each working tree at `https://localhost:8443/<worktree>/json.hpp`, a configuration file is needed.
+1. Create the file `serve_header.yml` in the top level or project root directory of any working tree:
+    ```yaml
+    root: ..
+    ```
+   By shifting the web server root directory up one level, the `single_include/nlohmann/json.hpp` header files relative to each sibling directory or working tree will be served.
+
+2. Start `serve_header.py` by running this command from the same top level or project root directory the configuration file is located in:
+    ```
+    $ make serve_header
+    ```
+
+`serve_header.py` will automatically detect the addition or removal of working trees anywhere within the configured web server root directory.
diff --git a/external_imported/json/tools/serve_header/demo.png b/external_imported/json/tools/serve_header/demo.png
new file mode 100644
index 000000000..b77751608
Binary files /dev/null and b/external_imported/json/tools/serve_header/demo.png differ
diff --git a/external_imported/json/tools/serve_header/requirements.txt b/external_imported/json/tools/serve_header/requirements.txt
new file mode 100644
index 000000000..d32eed3bd
--- /dev/null
+++ b/external_imported/json/tools/serve_header/requirements.txt
@@ -0,0 +1,2 @@
+PyYAML==6.0
+watchdog==2.1.7
diff --git a/external_imported/json/tools/serve_header/serve_header.py b/external_imported/json/tools/serve_header/serve_header.py
new file mode 100755
index 000000000..9844e6800
--- /dev/null
+++ b/external_imported/json/tools/serve_header/serve_header.py
@@ -0,0 +1,410 @@
+#!/usr/bin/env python3
+
+import contextlib
+import logging
+import os
+import re
+import shutil
+import sys
+import subprocess
+
+from datetime import datetime, timedelta
+from io import BytesIO
+from threading import Lock, Timer
+
+from watchdog.events import FileSystemEventHandler
+from watchdog.observers import Observer
+
+from http import HTTPStatus
+from http.server import ThreadingHTTPServer, SimpleHTTPRequestHandler
+
+CONFIG_FILE = 'serve_header.yml'
+MAKEFILE = 'Makefile'
+INCLUDE = 'include/nlohmann/'
+SINGLE_INCLUDE = 'single_include/nlohmann/'
+HEADER = 'json.hpp'
+
+DATETIME_FORMAT = '%Y-%m-%d %H:%M:%S'
+
+JSON_VERSION_RE = re.compile(r'\s*#\s*define\s+NLOHMANN_JSON_VERSION_MAJOR\s+')
+
+class ExitHandler(logging.StreamHandler):
+    def __init__(self, level):
+        """."""
+        super().__init__()
+        self.level = level
+
+    def emit(self, record):
+        if record.levelno >= self.level:
+            sys.exit(1)
+
+def is_project_root(test_dir='.'):
+    makefile = os.path.join(test_dir, MAKEFILE)
+    include = os.path.join(test_dir, INCLUDE)
+    single_include = os.path.join(test_dir, SINGLE_INCLUDE)
+
+    return (os.path.exists(makefile)
+            and os.path.isfile(makefile)
+            and os.path.exists(include)
+            and os.path.exists(single_include))
+
+class DirectoryEventBucket:
+    def __init__(self, callback, delay=1.2, threshold=0.8):
+        """."""
+        self.delay = delay
+        self.threshold = timedelta(seconds=threshold)
+        self.callback = callback
+        self.event_dirs = set([])
+        self.timer = None
+        self.lock = Lock()
+
+    def start_timer(self):
+        if self.timer is None:
+            self.timer = Timer(self.delay, self.process_dirs)
+            self.timer.start()
+
+    def process_dirs(self):
+        result_dirs = []
+        event_dirs = set([])
+        with self.lock:
+            self.timer = None
+            while self.event_dirs:
+                time, event_dir = self.event_dirs.pop()
+                delta = datetime.now() - time
+                if delta < self.threshold:
+                    event_dirs.add((time, event_dir))
+                else:
+                    result_dirs.append(event_dir)
+            self.event_dirs = event_dirs
+            if result_dirs:
+                self.callback(os.path.commonpath(result_dirs))
+            if self.event_dirs:
+                self.start_timer()
+
+    def add_dir(self, path):
+        with self.lock:
+            # add path to the set of event_dirs if it is not a sibling of
+            # a directory already in the set
+            if not any(os.path.commonpath([path, event_dir]) == event_dir
+               for (_, event_dir) in self.event_dirs):
+                self.event_dirs.add((datetime.now(), path))
+                if self.timer is None:
+                    self.start_timer()
+
+class WorkTree:
+    make_command = 'make'
+
+    def __init__(self, root_dir, tree_dir):
+        """."""
+        self.root_dir = root_dir
+        self.tree_dir = tree_dir
+        self.rel_dir = os.path.relpath(tree_dir, root_dir)
+        self.name = os.path.basename(tree_dir)
+        self.include_dir = os.path.abspath(os.path.join(tree_dir, INCLUDE))
+        self.header = os.path.abspath(os.path.join(tree_dir, SINGLE_INCLUDE, HEADER))
+        self.rel_header = os.path.relpath(self.header, root_dir)
+        self.dirty = True
+        self.build_count = 0
+        t = os.path.getmtime(self.header)
+        t = datetime.fromtimestamp(t)
+        self.build_time = t.strftime(DATETIME_FORMAT)
+
+    def __hash__(self):
+        """."""
+        return hash((self.tree_dir))
+
+    def __eq__(self, other):
+        """."""
+        if not isinstance(other, type(self)):
+            return NotImplemented
+        return self.tree_dir == other.tree_dir
+
+    def update_dirty(self, path):
+        if self.dirty:
+            return
+
+        path = os.path.abspath(path)
+        if os.path.commonpath([path, self.include_dir]) == self.include_dir:
+            logging.info(f'{self.name}: working tree marked dirty')
+            self.dirty = True
+
+    def amalgamate_header(self):
+        if not self.dirty:
+            return
+
+        mtime = os.path.getmtime(self.header)
+        subprocess.run([WorkTree.make_command, 'amalgamate'], cwd=self.tree_dir,
+                       stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+        if mtime == os.path.getmtime(self.header):
+            logging.info(f'{self.name}: no changes')
+        else:
+            self.build_count += 1
+            self.build_time = datetime.now().strftime(DATETIME_FORMAT)
+            logging.info(f'{self.name}: header amalgamated (build count {self.build_count})')
+
+        self.dirty = False
+
+class WorkTrees(FileSystemEventHandler):
+    def __init__(self, root_dir):
+        """."""
+        super().__init__()
+        self.root_dir = root_dir
+        self.trees = set([])
+        self.tree_lock = Lock()
+        self.scan(root_dir)
+        self.created_bucket = DirectoryEventBucket(self.scan)
+        self.observer = Observer()
+        self.observer.schedule(self, root_dir, recursive=True)
+        self.observer.start()
+
+    def scan(self, base_dir):
+        scan_dirs = set([base_dir])
+        # recursively scan base_dir for working trees
+
+        while scan_dirs:
+            scan_dir = os.path.abspath(scan_dirs.pop())
+            self.scan_tree(scan_dir)
+            try:
+                with os.scandir(scan_dir) as dir_it:
+                    for entry in dir_it:
+                        if entry.is_dir():
+                            scan_dirs.add(entry.path)
+            except FileNotFoundError as e:
+                logging.debug('path disappeared: %s', e)
+
+    def scan_tree(self, scan_dir):
+        if not is_project_root(scan_dir):
+            return
+
+        # skip source trees in build directories
+        # this check could be enhanced
+        if scan_dir.endswith('/_deps/json-src'):
+            return
+
+        tree = WorkTree(self.root_dir, scan_dir)
+        with self.tree_lock:
+            if not tree in self.trees:
+                if tree.name == tree.rel_dir:
+                    logging.info(f'adding working tree {tree.name}')
+                else:
+                    logging.info(f'adding working tree {tree.name} at {tree.rel_dir}')
+                url = os.path.join('/', tree.rel_dir, HEADER)
+                logging.info(f'{tree.name}: serving header at {url}')
+                self.trees.add(tree)
+
+    def rescan(self, path=None):
+        if path is not None:
+            path = os.path.abspath(path)
+        trees = set([])
+        # check if any working trees have been removed
+        with self.tree_lock:
+            while self.trees:
+                tree = self.trees.pop()
+                if ((path is None
+                    or os.path.commonpath([path, tree.tree_dir]) == tree.tree_dir)
+                    and not is_project_root(tree.tree_dir)):
+                    if tree.name == tree.rel_dir:
+                        logging.info(f'removing working tree {tree.name}')
+                    else:
+                        logging.info(f'removing working tree {tree.name} at {tree.rel_dir}')
+                else:
+                    trees.add(tree)
+            self.trees = trees
+
+    def find(self, path):
+        # find working tree for a given header file path
+        path = os.path.abspath(path)
+        with self.tree_lock:
+            for tree in self.trees:
+                if path == tree.header:
+                    return tree
+        return None
+
+    def on_any_event(self, event):
+        logging.debug('%s (is_dir=%s): %s', event.event_type,
+                      event.is_directory, event.src_path)
+        path = os.path.abspath(event.src_path)
+        if event.is_directory:
+            if event.event_type == 'created':
+                # check for new working trees
+                self.created_bucket.add_dir(path)
+            elif event.event_type == 'deleted':
+                # check for deleted working trees
+                self.rescan(path)
+        elif event.event_type == 'closed':
+            with self.tree_lock:
+                for tree in self.trees:
+                    tree.update_dirty(path)
+
+    def stop(self):
+        self.observer.stop()
+        self.observer.join()
+
+class HeaderRequestHandler(SimpleHTTPRequestHandler): # lgtm[py/missing-call-to-init]
+    def __init__(self, request, client_address, server):
+        """."""
+        self.worktrees = server.worktrees
+        self.worktree = None
+        try:
+            super().__init__(request, client_address, server,
+                             directory=server.worktrees.root_dir)
+        except ConnectionResetError:
+            logging.debug('connection reset by peer')
+
+    def translate_path(self, path):
+        path = os.path.abspath(super().translate_path(path))
+
+        # add single_include/nlohmann into path, if needed
+        header = os.path.join('/', HEADER)
+        header_path = os.path.join('/', SINGLE_INCLUDE, HEADER)
+        if (path.endswith(header)
+            and not path.endswith(header_path)):
+            path = os.path.join(os.path.dirname(path), SINGLE_INCLUDE, HEADER)
+
+        return path
+
+    def send_head(self):
+        # check if the translated path matches a working tree
+        # and fullfill the request; otherwise, send 404
+        path = self.translate_path(self.path)
+        self.worktree = self.worktrees.find(path)
+        if self.worktree is not None:
+            self.worktree.amalgamate_header()
+            logging.info(f'{self.worktree.name}; serving header (build count {self.worktree.build_count})')
+            return super().send_head()
+        logging.info(f'invalid request path: {self.path}')
+        super().send_error(HTTPStatus.NOT_FOUND, 'Not Found')
+        return None
+
+    def send_header(self, keyword, value):
+        # intercept Content-Length header; sent in copyfile later
+        if keyword == 'Content-Length':
+            return
+        super().send_header(keyword, value)
+
+    def end_headers (self):
+        # intercept; called in copyfile() or indirectly
+        # by send_head via super().send_error()
+        pass
+
+    def copyfile(self, source, outputfile):
+        injected = False
+        content = BytesIO()
+        length = 0
+        # inject build count and time into served header
+        for line in source:
+            line = line.decode('utf-8')
+            if not injected and JSON_VERSION_RE.match(line):
+                length += content.write(bytes('#define JSON_BUILD_COUNT '\
+                                              f'{self.worktree.build_count}\n', 'utf-8'))
+                length += content.write(bytes('#define JSON_BUILD_TIME '\
+                                              f'"{self.worktree.build_time}"\n\n', 'utf-8'))
+                injected = True
+            length += content.write(bytes(line, 'utf-8'))
+
+        # set content length
+        super().send_header('Content-Length', length)
+        # CORS header
+        self.send_header('Access-Control-Allow-Origin', '*')
+        # prevent caching
+        self.send_header('Cache-Control', 'no-cache, no-store, must-revalidate')
+        self.send_header('Pragma', 'no-cache')
+        self.send_header('Expires', '0')
+        super().end_headers()
+
+        # send the header
+        content.seek(0)
+        shutil.copyfileobj(content, outputfile)
+
+    def log_message(self, format, *args):
+        pass
+
+class DualStackServer(ThreadingHTTPServer):
+    def __init__(self, addr, worktrees):
+        """."""
+        self.worktrees = worktrees
+        super().__init__(addr, HeaderRequestHandler)
+
+    def server_bind(self):
+        # suppress exception when protocol is IPv4
+        with contextlib.suppress(Exception):
+            self.socket.setsockopt(
+                socket.IPPROTO_IPV6, socket.IPV6_V6ONLY, 0)
+        return super().server_bind()
+
+if __name__ == '__main__':
+    import argparse
+    import ssl
+    import socket
+    import yaml
+
+    # exit code
+    ec = 0
+
+    # setup logging
+    logging.basicConfig(format='[%(asctime)s] %(levelname)s: %(message)s',
+                        datefmt=DATETIME_FORMAT, level=logging.INFO)
+    log = logging.getLogger()
+    log.addHandler(ExitHandler(logging.ERROR))
+
+    # parse command line arguments
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--make', default='make',
+                        help='the make command (default: make)')
+    args = parser.parse_args()
+
+    # propagate the make command to use for amalgamating headers
+    WorkTree.make_command = args.make
+
+    worktrees = None
+    try:
+        # change working directory to project root
+        os.chdir(os.path.realpath(os.path.join(sys.path[0], '../../')))
+
+        if not is_project_root():
+            log.error('working directory does not look like project root')
+
+        # load config
+        config = {}
+        config_file = os.path.abspath(CONFIG_FILE)
+        try:
+            with open(config_file, 'r') as f:
+                config = yaml.safe_load(f)
+        except FileNotFoundError:
+            log.info(f'cannot find configuration file: {config_file}')
+            log.info('using default configuration')
+
+        # find and monitor working trees
+        worktrees = WorkTrees(config.get('root', '.'))
+
+        # start web server
+        infos = socket.getaddrinfo(config.get('bind', None), config.get('port', 8443),
+                                   type=socket.SOCK_STREAM, flags=socket.AI_PASSIVE)
+        DualStackServer.address_family = infos[0][0]
+        HeaderRequestHandler.protocol_version = 'HTTP/1.0'
+        with DualStackServer(infos[0][4], worktrees) as httpd:
+            scheme = 'HTTP'
+            https = config.get('https', {})
+            if https.get('enabled', True):
+                cert_file = https.get('cert_file', 'localhost.pem')
+                key_file = https.get('key_file', 'localhost-key.pem')
+                ssl_ctx = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH)
+                ssl_ctx.minimum_version = ssl.TLSVersion.TLSv1_2
+                ssl_ctx.maximum_version = ssl.TLSVersion.MAXIMUM_SUPPORTED
+                ssl_ctx.load_cert_chain(cert_file, key_file)
+                httpd.socket = ssl_ctx.wrap_socket(httpd.socket, server_side=True)
+                scheme = 'HTTPS'
+            host, port = httpd.socket.getsockname()[:2]
+            log.info(f'serving {scheme} on {host} port {port}')
+            log.info('press Ctrl+C to exit')
+            httpd.serve_forever()
+
+    except KeyboardInterrupt:
+        log.info('exiting')
+    except Exception:
+        ec = 1
+        log.exception('an error occurred:')
+    finally:
+        if worktrees is not None:
+            worktrees.stop()
+            sys.exit(ec)
diff --git a/external_imported/json/tools/serve_header/serve_header.yml.example b/external_imported/json/tools/serve_header/serve_header.yml.example
new file mode 100644
index 000000000..42310910e
--- /dev/null
+++ b/external_imported/json/tools/serve_header/serve_header.yml.example
@@ -0,0 +1,15 @@
+# all paths are relative to the project root
+
+# the root directory for the web server
+# root: .
+
+# configure SSL
+# https:
+#   enabled: true
+# these filenames are listed in .gitignore
+#  cert_file: localhost.pem
+#  key_file: localhost-key.pem
+
+# address and port for the server to listen on
+# bind: null
+# port: 8443
diff --git a/external_imported/json/wsjcpp.yml b/external_imported/json/wsjcpp.yml
index d8184952f..e6443cf82 100644
--- a/external_imported/json/wsjcpp.yml
+++ b/external_imported/json/wsjcpp.yml
@@ -2,7 +2,7 @@ wsjcpp_version: "v0.1.1"
 cmake_minimum_required: "3.0"
 cmake_cxx_standard: "11"
 name: "nlohmann/json"
-version: "v3.9.1"
+version: "v3.11.3"
 description: "JSON for Modern C++"
 issues: "https://github.com/nlohmann/json/issues"
 keywords:
@@ -21,3 +21,6 @@ distribution:
   - source-file: "single_include/nlohmann/json.hpp"
     target-file: "json.hpp"
     type: "source-code"
+  - source-file: "single_include/nlohmann/json_fwd.hpp"
+    target-file: "json_fwd.hpp"
+    type: "source-code"
diff --git a/external_imported/sentry-native/.github/workflows/ci.yml b/external_imported/sentry-native/.github/workflows/ci.yml
index fa8c1bb9a..13c748df8 100644
--- a/external_imported/sentry-native/.github/workflows/ci.yml
+++ b/external_imported/sentry-native/.github/workflows/ci.yml
@@ -13,7 +13,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - run: make style
+      - run: |
+          sudo apt update
+          sudo apt install clang-format-15
+          make style-15
 
   build-ios:
     name: Xcode Build for iOS
@@ -118,7 +121,7 @@ jobs:
           submodules: recursive
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: '3.11'
           cache: 'pip'
 
       - name: Installing Linux Dependencies
diff --git a/external_imported/sentry-native/.gitignore b/external_imported/sentry-native/.gitignore
index f3c4c8a7c..8b197770e 100644
--- a/external_imported/sentry-native/.gitignore
+++ b/external_imported/sentry-native/.gitignore
@@ -4,8 +4,9 @@
 CMakeSettings.json
 .idea
 
-# CMake builds
+# CMake builds & install
 /*build*
+/*install*
 
 # Run files
 .sentry-native
diff --git a/external_imported/sentry-native/CHANGELOG.md b/external_imported/sentry-native/CHANGELOG.md
index a1cde9759..dcaaf1ebf 100644
--- a/external_imported/sentry-native/CHANGELOG.md
+++ b/external_imported/sentry-native/CHANGELOG.md
@@ -1,5 +1,118 @@
 # Changelog
 
+## 0.7.0
+
+**Breaking changes**:
+
+- Make `crashpad` the default backend for Linux. ([#927](https://github.com/getsentry/sentry-native/pull/927))
+- Remove build option `SENTRY_CRASHPAD_SYSTEM`. ([#928](https://github.com/getsentry/sentry-native/pull/928))
+
+**Fixes**:
+
+- Maintain `crashpad` client instance during Native SDK lifecycle. ([#910](https://github.com/getsentry/sentry-native/pull/910))
+- Specify correct dependencies for CMake client projects using a system-provided breakpad. ([#926](https://github.com/getsentry/sentry-native/pull/926))
+- Correct the Windows header include used by `sentry.h`, which fixes the build of [Swift bindings](https://github.com/thebrowsercompany/swift-sentry). ([#935](https://github.com/getsentry/sentry-native/pull/935))
+
+**Internal**:
+
+- Updated `crashpad` to 2023-11-24. ([#912](https://github.com/getsentry/sentry-native/pull/912), [crashpad#91](https://github.com/getsentry/crashpad/pull/91))
+- Fixing `crashpad` build for Windows on ARM64. ([#919](https://github.com/getsentry/sentry-native/pull/919), [crashpad#90](https://github.com/getsentry/crashpad/pull/90), [crashpad#92](https://github.com/getsentry/crashpad/pull/92), [crashpad#93](https://github.com/getsentry/crashpad/pull/93), [crashpad#94](https://github.com/getsentry/crashpad/pull/94))
+- Remove options memory leak during consent setting. ([#922](https://github.com/getsentry/sentry-native/pull/922))
+
+**Thank you**:
+
+Features, fixes and improvements in this release have been contributed by:
+
+- [@compnerd](https://github.com/compnerd)
+- [@stima](https://github.com/stima)
+
+## 0.6.7
+
+**Fixes**:
+
+- Disable sigaltstack on Android. ([#901](https://github.com/getsentry/sentry-native/pull/901))
+- Prevent stuck crashpad-client on Windows. ([#902](https://github.com/getsentry/sentry-native/pull/902), [crashpad#89](https://github.com/getsentry/crashpad/pull/89))
+
+## 0.6.6
+
+**Fixes**:
+
+- Use a more up-to-date version of `mini_chromium` as a `crashpad` dependency, which fixes a build error on some systems. ([#891](https://github.com/getsentry/sentry-native/pull/891), [crashpad#88](https://github.com/getsentry/crashpad/pull/88))
+
+**Internal**:
+
+- Updated `libunwindstack` to 2023-09-13. ([#884](https://github.com/getsentry/sentry-native/pull/884), [libunwindstack-ndk#8](https://github.com/getsentry/libunwindstack-ndk/pull/8))
+- Updated `crashpad` to 2023-09-28. ([#891](https://github.com/getsentry/sentry-native/pull/891), [crashpad#88](https://github.com/getsentry/crashpad/pull/88))
+- Updated `breakpad` to 2023-10-02. ([#892](https://github.com/getsentry/sentry-native/pull/892), [breakpad#38](https://github.com/getsentry/breakpad/pull/38))
+
+**Thank you**:
+
+Features, fixes and improvements in this release have been contributed by:
+
+- [@sapphonie](https://github.com/sapphonie)
+
+## 0.6.5
+
+**Fixes**:
+
+- Remove deadlock pattern in dynamic sdk-name assignment ([#858](https://github.com/getsentry/sentry-native/pull/858))
+
+## 0.6.4
+
+**Fixes**:
+
+- Crash events are initialized with level `FATAL` ([#852](https://github.com/getsentry/sentry-native/pull/852))
+- Fix MSVC compiler error with on non-Unicode systems ([#846](https://github.com/getsentry/sentry-native/pull/846), [crashpad#85](https://github.com/getsentry/crashpad/pull/85))
+
+**Features**:
+
+- crashpad_handler: log `body` if minidump endpoint response is not `OK` ([#851](https://github.com/getsentry/sentry-native/pull/851), [crashpad#87](https://github.com/getsentry/crashpad/pull/87))
+
+**Thank you**:
+
+Features, fixes and improvements in this release have been contributed by:
+
+- [@xyz1001](https://github.com/xyz1001)
+
+## 0.6.3
+
+**Features**:
+
+- Disable PC adjustment in the backend for libunwindstack ([#839](https://github.com/getsentry/sentry-native/pull/839))
+- Crashpad backend allows inspection and enrichment of the crash event in the on_crash/before_send hooks ([#843](https://github.com/getsentry/sentry-native/pull/843))
+- Add http-proxy support to the `crashpad_handler` ([#847](https://github.com/getsentry/sentry-native/pull/847), [crashpad#86](https://github.com/getsentry/crashpad/pull/86))
+
+**Internal**:
+
+- Updated Breakpad backend to 2023-05-03. ([#836](https://github.com/getsentry/sentry-native/pull/836), [breakpad#35](https://github.com/getsentry/breakpad/pull/35))
+- Updated Crashpad backend to 2023-05-03. ([#837](https://github.com/getsentry/sentry-native/pull/837), [crashpad#82](https://github.com/getsentry/crashpad/pull/82))
+
+## 0.6.2
+
+**Features**:
+
+- Extend API with ptr/len-string interfaces. ([#827](https://github.com/getsentry/sentry-native/pull/827))
+- Allow setting sdk_name at runtime ([#834](https://github.com/getsentry/sentry-native/pull/834))
+
+## 0.6.1
+
+**Fixes**:
+
+- Remove OpenSSL as direct dependency for the crashpad backend on Linux. ([#812](https://github.com/getsentry/sentry-native/pull/812), [crashpad#81](https://github.com/getsentry/crashpad/pull/81))
+- Check `libcurl` for feature `AsynchDNS` at compile- and runtime. ([#813](https://github.com/getsentry/sentry-native/pull/813))
+- Allow setting `CRASHPAD_WER_ENABLED` when using system crashpad. ([#816](https://github.com/getsentry/sentry-native/pull/816))
+
+**Docs**:
+
+- Add badges for conan, nix and vcpkg package-repos to README. ([#795](https://github.com/getsentry/sentry-native/pull/795))
+
+**Thank you**:
+
+Features, fixes and improvements in this release have been contributed by:
+
+- [@Cyriuz](https://github.com/Cyriuz)
+- [@MartinDelille](https://github.com/MartinDelille)
+
 ## 0.6.0
 
 **Breaking changes**:
diff --git a/external_imported/sentry-native/CMakeLists.txt b/external_imported/sentry-native/CMakeLists.txt
index 67331dd4c..8e460cded 100644
--- a/external_imported/sentry-native/CMakeLists.txt
+++ b/external_imported/sentry-native/CMakeLists.txt
@@ -26,11 +26,11 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
 endif()
 
 if(NOT CMAKE_C_STANDARD)
-  set(CMAKE_C_STANDARD 11)
+	set(CMAKE_C_STANDARD 11)
 endif()
 
 if(NOT CMAKE_CXX_STANDARD)
-  set(CMAKE_CXX_STANDARD 17)
+	set(CMAKE_CXX_STANDARD 17)
 endif()
 
 include(GNUInstallDirs)
@@ -65,6 +65,9 @@ endif()
 
 if(MSVC)
 	option(SENTRY_BUILD_RUNTIMESTATIC "Build sentry-native with static runtime" OFF)
+
+	set(CMAKE_C_FLAGS    "${CMAKE_C_FLAGS} /utf-8")
+	set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} /utf-8")
 endif()
 
 if(LINUX)
@@ -93,7 +96,7 @@ else()
 endif()
 
 set(SENTRY_TRANSPORT ${SENTRY_DEFAULT_TRANSPORT} CACHE STRING
-  "The HTTP transport that sentry uses to submit events to the sentry server, can be either 'none', 'curl' or 'winhttp' on windows.")
+	"The HTTP transport that sentry uses to submit events to the sentry server, can be either 'none', 'curl' or 'winhttp' on windows.")
 
 if(SENTRY_TRANSPORT STREQUAL "winhttp")
 	set(SENTRY_TRANSPORT_WINHTTP TRUE)
@@ -122,10 +125,8 @@ option(SENTRY_ENABLE_INSTALL "Enable sentry installation" "${SENTRY_MAIN_PROJECT
 if(MSVC AND CMAKE_GENERATOR_TOOLSET MATCHES "_xp$")
 	message(WARNING "Crashpad is not supported for MSVC with XP toolset. Default backend was switched to 'breakpad'")
 	set(SENTRY_DEFAULT_BACKEND "breakpad")
-elseif((APPLE AND NOT IOS) OR WIN32)
+elseif((APPLE AND NOT IOS) OR WIN32 OR LINUX)
 	set(SENTRY_DEFAULT_BACKEND "crashpad")
-elseif(LINUX)
-	set(SENTRY_DEFAULT_BACKEND "breakpad")
 else()
 	set(SENTRY_DEFAULT_BACKEND "inproc")
 endif()
@@ -274,7 +275,7 @@ endif()
 
 if(SENTRY_TRANSPORT_CURL)
 	if(NOT CURL_FOUND) # Some other lib might bring libcurl already
-		find_package(CURL REQUIRED)
+		find_package(CURL REQUIRED COMPONENTS AsynchDNS)
 	endif()
 
 	if(TARGET CURL::libcurl) # Only available in cmake 3.12+
@@ -364,11 +365,11 @@ endif()
 
 # handle platform libraries
 if(ANDROID)
-    set(_SENTRY_PLATFORM_LIBS "dl" "log")
+	set(_SENTRY_PLATFORM_LIBS "dl" "log")
 elseif(LINUX)
-    set(_SENTRY_PLATFORM_LIBS "dl" "rt")
+	set(_SENTRY_PLATFORM_LIBS "dl" "rt")
 elseif(WIN32)
-    set(_SENTRY_PLATFORM_LIBS "dbghelp" "shlwapi" "version")
+	set(_SENTRY_PLATFORM_LIBS "dbghelp" "shlwapi" "version")
 endif()
 
 if(SENTRY_TRANSPORT_WINHTTP)
@@ -382,9 +383,9 @@ endif()
 
 # apply platform libraries to sentry library
 if(SENTRY_LIBRARY_TYPE STREQUAL "STATIC")
-    target_link_libraries(sentry PUBLIC ${_SENTRY_PLATFORM_LIBS})
+	target_link_libraries(sentry PUBLIC ${_SENTRY_PLATFORM_LIBS})
 else()
-    target_link_libraries(sentry PRIVATE ${_SENTRY_PLATFORM_LIBS})
+	target_link_libraries(sentry PRIVATE ${_SENTRY_PLATFORM_LIBS})
 endif()
 
 # suppress some errors and warnings for MinGW target
@@ -412,78 +413,74 @@ if(SENTRY_WITH_LIBUNWINDSTACK)
 endif()
 
 if(SENTRY_BACKEND_CRASHPAD)
-	option(SENTRY_CRASHPAD_SYSTEM "Use system crashpad" OFF)
-	if(SENTRY_CRASHPAD_SYSTEM)
-		find_package(crashpad REQUIRED)
-		target_link_libraries(sentry PUBLIC crashpad::client)
+	# FIXME: required for cmake 3.12 and lower:
+	# - NEW behavior lets normal variable override option
+	cmake_policy(SET CMP0077 NEW)
+	if(SENTRY_BUILD_SHARED_LIBS)
+		set(CRASHPAD_ENABLE_INSTALL OFF CACHE BOOL "Enable crashpad installation" FORCE)
 	else()
-		# FIXME: required for cmake 3.12 and lower:
-		# - NEW behavior lets normal variable override option
-		cmake_policy(SET CMP0077 NEW)
-		if(SENTRY_BUILD_SHARED_LIBS)
-			set(CRASHPAD_ENABLE_INSTALL OFF CACHE BOOL "Enable crashpad installation" FORCE)
-		else()
-			set(CRASHPAD_ENABLE_INSTALL ON CACHE BOOL "Enable crashpad installation" FORCE)
-		endif()
-		add_subdirectory(external/crashpad crashpad_build)
-		if(CRASHPAD_WER_ENABLED)
-			add_compile_definitions(CRASHPAD_WER_ENABLED)
-		endif()
+		set(CRASHPAD_ENABLE_INSTALL ON CACHE BOOL "Enable crashpad installation" FORCE)
+	endif()
+	add_subdirectory(external/crashpad crashpad_build)
+
+	if(CRASHPAD_WER_ENABLED)
+		add_dependencies(sentry crashpad::wer)
+	endif()
 
-		# set static runtime if enabled
-		if(SENTRY_BUILD_RUNTIMESTATIC AND MSVC)
-			set_property(TARGET crashpad_client PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-			set_property(TARGET crashpad_compat PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-			set_property(TARGET crashpad_getopt PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-			set_property(TARGET crashpad_handler PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-			set_property(TARGET crashpad_handler_lib PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-			set_property(TARGET crashpad_minidump PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-			set_property(TARGET crashpad_snapshot PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-			set_property(TARGET crashpad_tools PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-			set_property(TARGET crashpad_util PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-			if(CRASHPAD_WER_ENABLED)
-				set_property(TARGET crashpad_wer PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-			endif()
-			set_property(TARGET crashpad_zlib PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-			set_property(TARGET mini_chromium PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+	# set static runtime if enabled
+	if(SENTRY_BUILD_RUNTIMESTATIC AND MSVC)
+		set_property(TARGET crashpad_client PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+		set_property(TARGET crashpad_compat PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+		set_property(TARGET crashpad_getopt PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+		set_property(TARGET crashpad_handler PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+		set_property(TARGET crashpad_handler_lib PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+		set_property(TARGET crashpad_minidump PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+		set_property(TARGET crashpad_snapshot PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+		set_property(TARGET crashpad_tools PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+		set_property(TARGET crashpad_util PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+		if(CRASHPAD_WER_ENABLED)
+			set_property(TARGET crashpad_wer PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 		endif()
+		set_property(TARGET crashpad_zlib PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+		set_property(TARGET mini_chromium PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+	endif()
 
-		if(DEFINED SENTRY_FOLDER)
-			set_target_properties(crashpad_client PROPERTIES FOLDER ${SENTRY_FOLDER})
-			set_target_properties(crashpad_compat PROPERTIES FOLDER ${SENTRY_FOLDER})
-			set_target_properties(crashpad_getopt PROPERTIES FOLDER ${SENTRY_FOLDER})
-			set_target_properties(crashpad_handler PROPERTIES FOLDER ${SENTRY_FOLDER})
-			set_target_properties(crashpad_handler_lib PROPERTIES FOLDER ${SENTRY_FOLDER})
-			set_target_properties(crashpad_minidump PROPERTIES FOLDER ${SENTRY_FOLDER})
-			set_target_properties(crashpad_snapshot PROPERTIES FOLDER ${SENTRY_FOLDER})
-			set_target_properties(crashpad_tools PROPERTIES FOLDER ${SENTRY_FOLDER})
-			set_target_properties(crashpad_util PROPERTIES FOLDER ${SENTRY_FOLDER})
-			set_target_properties(crashpad_zlib PROPERTIES FOLDER ${SENTRY_FOLDER})
-			set_target_properties(mini_chromium PROPERTIES FOLDER ${SENTRY_FOLDER})
-			if(CRASHPAD_WER_ENABLED)
-				set_target_properties(crashpad_wer PROPERTIES FOLDER ${SENTRY_FOLDER})
-			endif()
+	if(DEFINED SENTRY_FOLDER)
+		set_target_properties(crashpad_client PROPERTIES FOLDER ${SENTRY_FOLDER})
+		set_target_properties(crashpad_compat PROPERTIES FOLDER ${SENTRY_FOLDER})
+		set_target_properties(crashpad_getopt PROPERTIES FOLDER ${SENTRY_FOLDER})
+		set_target_properties(crashpad_handler PROPERTIES FOLDER ${SENTRY_FOLDER})
+		set_target_properties(crashpad_handler_lib PROPERTIES FOLDER ${SENTRY_FOLDER})
+		set_target_properties(crashpad_minidump PROPERTIES FOLDER ${SENTRY_FOLDER})
+		set_target_properties(crashpad_snapshot PROPERTIES FOLDER ${SENTRY_FOLDER})
+		set_target_properties(crashpad_tools PROPERTIES FOLDER ${SENTRY_FOLDER})
+		set_target_properties(crashpad_util PROPERTIES FOLDER ${SENTRY_FOLDER})
+		set_target_properties(crashpad_zlib PROPERTIES FOLDER ${SENTRY_FOLDER})
+		set_target_properties(mini_chromium PROPERTIES FOLDER ${SENTRY_FOLDER})
+		if(CRASHPAD_WER_ENABLED)
+			set_target_properties(crashpad_wer PROPERTIES FOLDER ${SENTRY_FOLDER})
 		endif()
+	endif()
 
-		target_link_libraries(sentry PRIVATE
-			$<BUILD_INTERFACE:crashpad::client>
-			$<INSTALL_INTERFACE:sentry_crashpad::client>
-		)
-		install(EXPORT crashpad_export NAMESPACE sentry_crashpad:: FILE sentry_crashpad-targets.cmake
-			DESTINATION "${CMAKE_INSTALL_CMAKEDIR}"
-		)
-		if(WIN32 AND MSVC)
-			sentry_install(FILES $<TARGET_PDB_FILE:crashpad_handler>
+	target_link_libraries(sentry PRIVATE
+		$<BUILD_INTERFACE:crashpad::client>
+		$<INSTALL_INTERFACE:sentry_crashpad::client>
+	)
+	install(EXPORT crashpad_export NAMESPACE sentry_crashpad:: FILE sentry_crashpad-targets.cmake
+		DESTINATION "${CMAKE_INSTALL_CMAKEDIR}"
+	)
+	if(WIN32 AND MSVC)
+		sentry_install(FILES $<TARGET_PDB_FILE:crashpad_handler>
+			DESTINATION "${CMAKE_INSTALL_BINDIR}" OPTIONAL)
+		if (CRASHPAD_WER_ENABLED)
+			sentry_install(FILES $<TARGET_PDB_FILE:crashpad_wer>
 				DESTINATION "${CMAKE_INSTALL_BINDIR}" OPTIONAL)
-			if (CRASHPAD_WER_ENABLED)
-				sentry_install(FILES $<TARGET_PDB_FILE:crashpad_wer>
-					DESTINATION "${CMAKE_INSTALL_BINDIR}" OPTIONAL)
-			endif()
 		endif()
 	endif()
 	add_dependencies(sentry crashpad::handler)
+
 	if(CRASHPAD_WER_ENABLED)
-		add_dependencies(sentry crashpad::wer)
+		add_compile_definitions(CRASHPAD_WER_ENABLED)
 	endif()
 elseif(SENTRY_BACKEND_BREAKPAD)
 	option(SENTRY_BREAKPAD_SYSTEM "Use system breakpad" OFF)
@@ -491,7 +488,11 @@ elseif(SENTRY_BACKEND_BREAKPAD)
 		# system breakpad is using pkg-config, see `external/breakpad/breakpad-client.pc.in`
 		find_package(PkgConfig REQUIRED)
 		pkg_check_modules(BREAKPAD REQUIRED IMPORTED_TARGET breakpad-client)
-		target_link_libraries(sentry PUBLIC PkgConfig::BREAKPAD)
+		if(SENTRY_BUILD_SHARED_LIBS)
+			target_link_libraries(sentry PRIVATE PkgConfig::BREAKPAD)
+		else()
+			target_link_libraries(sentry PUBLIC PkgConfig::BREAKPAD)
+		endif()
 	else()
 		add_subdirectory(external)
 		target_include_directories(sentry PRIVATE
diff --git a/external_imported/sentry-native/CONTRIBUTING.md b/external_imported/sentry-native/CONTRIBUTING.md
index 61bc6f297..2af86e966 100644
--- a/external_imported/sentry-native/CONTRIBUTING.md
+++ b/external_imported/sentry-native/CONTRIBUTING.md
@@ -144,6 +144,7 @@ The example currently supports the following commands:
 - `discarding-before-send`: Installs a `before_send()` callback that discards the event.
 - `on-crash`: Installs an `on_crash()` callback that retains the crash event. 
 - `discarding-on-crash`: Installs an `on_crash()` callback that discards the crash event.
+- `override-sdk-name`: Changes the SDK name via the options at runtime.
 
 Only on Windows using crashpad with its WER handler module: 
 
diff --git a/external_imported/sentry-native/Makefile b/external_imported/sentry-native/Makefile
index 6925df596..a936b143f 100644
--- a/external_imported/sentry-native/Makefile
+++ b/external_imported/sentry-native/Makefile
@@ -83,3 +83,9 @@ style: setup-venv
 	@.venv/bin/python ./scripts/check-clang-format.py -r examples include src tests/unit
 	@.venv/bin/black --diff --check tests
 .PHONY: style
+
+# TODO: workaround for clang-format 15+ where local formatting breaks with clang-format-14 based style checks on CI
+style-15: setup-venv
+	@.venv/bin/python ./scripts/check-clang-format.py --clang-format-executable /usr/bin/clang-format-15 -r examples include src tests/unit
+	@.venv/bin/black --diff --check tests
+.PHONY: style-15
diff --git a/external_imported/sentry-native/README.md b/external_imported/sentry-native/README.md
index 77d5da1d2..3c809b50c 100644
--- a/external_imported/sentry-native/README.md
+++ b/external_imported/sentry-native/README.md
@@ -1,3 +1,5 @@
+[![Conan Center](https://shields.io/conan/v/sentry-native)](https://conan.io/center/recipes/sentry-native) [![nixpkgs unstable](https://repology.org/badge/version-for-repo/nix_unstable/sentry-native.svg)](https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/development/libraries/sentry-native/default.nix) [![vcpkg](https://shields.io/vcpkg/v/sentry-native)](https://vcpkg.link/ports/sentry-native)
+
 <p align="center">
   <a href="https://sentry.io/?utm_source=github&utm_medium=logo" target="_blank">
     <picture>
@@ -15,13 +17,10 @@ applications, optimized for C and C++. Sentry allows to add tags, breadcrumbs
 and arbitrary custom context to enrich error reports. Supports Sentry _20.6.0_
 and later.
 
-**Note**: This SDK is being actively developed and still in Beta. We recommend
-to check for updates regularly to benefit from latest features and bug fixes.
-Please see [Known Limitations](#known-limitations).
-
 ## Resources <!-- omit in toc -->
 
-- [Discord](https://discord.gg/ez5KZN7) server for project discussions.
+- [SDK Documentation](https://docs.sentry.io/platforms/native/)
+- [Discord](https://discord.gg/ez5KZN7) server for project discussions
 - Follow [@getsentry](https://twitter.com/getsentry) on Twitter for updates
 
 ## Table of Contents <!-- omit in toc -->
@@ -228,9 +227,9 @@ using `cmake -D BUILD_SHARED_LIBS=OFF ..`.
   Sentry can use different backends depending on platform.
 
   - **crashpad**: This uses the out-of-process crashpad handler. It is currently
-    only supported on Desktop OSs, and used as the default on Windows and macOS.
+    only supported on Desktop OSs, and used as the default on Windows, Linux and macOS.
   - **breakpad**: This uses the in-process breakpad handler. It is currently
-    only supported on Desktop OSs, and used as the default on Linux.
+    only supported on Desktop OSs.
   - **inproc**: A small in-process handler which is supported on all platforms,
     and is used as default on Android.
   - **none**: This builds `sentry-native` without a backend, so it does not handle
@@ -239,12 +238,8 @@ using `cmake -D BUILD_SHARED_LIBS=OFF ..`.
 - `SENTRY_INTEGRATION_QT` (Default: OFF):
   Builds the Qt integration, which turns Qt log messages into breadcrumbs.
 
-- `SENTRY_BREAKPAD_SYSTEM` / `SENTRY_CRASHPAD_SYSTEM` (Default: OFF):
-  This instructs the build system to use system-installed breakpad or crashpad
-  libraries instead of using the in-tree version. This is generally not recommended
-  for crashpad, as sentry uses a patched version that has attachment support.
-  This is being worked on upstream as well, and a future version might work with
-  an unmodified crashpad version as well.
+- `SENTRY_BREAKPAD_SYSTEM` (Default: OFF):
+  This instructs the build system to use system-installed breakpad libraries instead of using the in-tree version. 
 
 | Feature    | Windows | macOS | Linux | Android | iOS |
 | ---------- | ------- | ----- | ----- | ------- | --- |
diff --git a/external_imported/sentry-native/examples/example.c b/external_imported/sentry-native/examples/example.c
index ad9e594f9..7e1b71b0c 100644
--- a/external_imported/sentry-native/examples/example.c
+++ b/external_imported/sentry-native/examples/example.c
@@ -218,6 +218,10 @@ main(int argc, char **argv)
             options, discarding_on_crash_callback, NULL);
     }
 
+    if (has_arg(argc, argv, "override-sdk-name")) {
+        sentry_options_set_sdk_name(options, "sentry.native.android.flutter");
+    }
+
     sentry_init(options);
 
     if (!has_arg(argc, argv, "no-setup")) {
diff --git a/external_imported/sentry-native/external/CMakeLists.txt b/external_imported/sentry-native/external/CMakeLists.txt
index fb2917f4e..9f3a29869 100644
--- a/external_imported/sentry-native/external/CMakeLists.txt
+++ b/external_imported/sentry-native/external/CMakeLists.txt
@@ -40,6 +40,8 @@ set(BREAKPAD_SOURCES_COMMON_WINDOWS
 )
 
 set(BREAKPAD_SOURCES_COMMON_APPLE
+    breakpad/src/common/mac/arch_utilities.cc
+    breakpad/src/common/mac/arch_utilities.h
     breakpad/src/common/mac/file_id.cc
     breakpad/src/common/mac/file_id.h
     breakpad/src/common/mac/macho_id.cc
diff --git a/external_imported/sentry-native/external/breakpad/DEPS b/external_imported/sentry-native/external/breakpad/DEPS
index e08dbd4ca..3fcd524dc 100644
--- a/external_imported/sentry-native/external/breakpad/DEPS
+++ b/external_imported/sentry-native/external/breakpad/DEPS
@@ -52,7 +52,7 @@ deps = {
 hooks = [
   {
     # Keep the manifest up to date.
-    "action": ["python", "src/src/tools/python/deps-to-manifest.py",
+    "action": ["src/src/tools/python/deps-to-manifest.py",
                "src/DEPS", "src/default.xml"],
   },
 ]
diff --git a/external_imported/sentry-native/external/breakpad/Makefile.am b/external_imported/sentry-native/external/breakpad/Makefile.am
index 1d45f8e56..06f34ce84 100644
--- a/external_imported/sentry-native/external/breakpad/Makefile.am
+++ b/external_imported/sentry-native/external/breakpad/Makefile.am
@@ -694,9 +694,11 @@ src_tools_linux_dump_syms_dump_syms_SOURCES = \
 	src/common/linux/safe_readlink.cc \
 	src/tools/linux/dump_syms/dump_syms.cc
 src_tools_linux_dump_syms_dump_syms_CXXFLAGS = \
-	$(RUSTC_DEMANGLE_CFLAGS)
+	$(RUSTC_DEMANGLE_CFLAGS) \
+	$(ZSTD_CFLAGS)
 src_tools_linux_dump_syms_dump_syms_LDADD = \
 	$(RUSTC_DEMANGLE_LIBS) \
+	$(ZSTD_CFLAGS) \
 	-lz
 
 src_tools_linux_md2core_minidump_2_core_SOURCES = \
@@ -821,11 +823,13 @@ src_common_dumper_unittest_SOURCES = \
 src_common_dumper_unittest_CPPFLAGS = \
 	$(AM_CPPFLAGS) $(TEST_CFLAGS) \
 	$(RUSTC_DEMANGLE_CFLAGS) \
-	$(PTHREAD_CFLAGS)
+	$(PTHREAD_CFLAGS) \
+	$(ZSTD_CFLAGS)
 src_common_dumper_unittest_LDADD = \
 	$(TEST_LIBS) \
 	$(RUSTC_DEMANGLE_LIBS) \
 	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS) \
+	$(ZSTD_LIBS) \
 	-lz
 
 src_common_mac_macho_reader_unittest_SOURCES = \
@@ -1732,10 +1736,12 @@ EXTRA_DIST = \
 	src/third_party/curl/typecheck-gcc.h \
 	src/third_party/curl/types.h \
 	src/third_party/mac_headers/architecture/byte_order.h \
+	src/third_party/mac_headers/arm/_types.h \
 	src/third_party/mac_headers/i386/_types.h \
 	src/third_party/mac_headers/mach/boolean.h \
+	src/third_party/mac_headers/mach/arm/boolean.h \
+	src/third_party/mac_headers/mach/arm/vm_types.h \
 	src/third_party/mac_headers/mach/i386/boolean.h \
-	src/third_party/mac_headers/mach/i386/vm_param.h \
 	src/third_party/mac_headers/mach/i386/vm_types.h \
 	src/third_party/mac_headers/mach/machine/boolean.h \
 	src/third_party/mac_headers/mach/machine.h \
diff --git a/external_imported/sentry-native/external/breakpad/Makefile.in b/external_imported/sentry-native/external/breakpad/Makefile.in
index d790cac43..0c47bf87d 100644
--- a/external_imported/sentry-native/external/breakpad/Makefile.in
+++ b/external_imported/sentry-native/external/breakpad/Makefile.in
@@ -2185,12 +2185,10 @@ DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EGREP = @EGREP@
 ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 GMOCK_CFLAGS = @GMOCK_CFLAGS@
 GMOCK_LIBS = @GMOCK_LIBS@
-GREP = @GREP@
 GTEST_CFLAGS = @GTEST_CFLAGS@
 GTEST_LIBS = @GTEST_LIBS@
 HAVE_CXX17 = @HAVE_CXX17@
@@ -2697,7 +2695,7 @@ src_tools_linux_dump_syms_dump_syms_CXXFLAGS = \
 
 src_tools_linux_dump_syms_dump_syms_LDADD = \
 	$(RUSTC_DEMANGLE_LIBS) \
-	-lz
+	-lz -lzstd
 
 src_tools_linux_md2core_minidump_2_core_SOURCES = \
 	src/common/linux/memory_mapped_file.cc \
@@ -2830,7 +2828,7 @@ src_common_dumper_unittest_LDADD = \
 	$(TEST_LIBS) \
 	$(RUSTC_DEMANGLE_LIBS) \
 	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS) \
-	-lz
+	-lz -lzstd
 
 src_common_mac_macho_reader_unittest_SOURCES = \
 	src/common/dwarf_cfi_to_module.cc \
@@ -3734,10 +3732,12 @@ EXTRA_DIST = \
 	src/third_party/curl/typecheck-gcc.h \
 	src/third_party/curl/types.h \
 	src/third_party/mac_headers/architecture/byte_order.h \
+	src/third_party/mac_headers/arm/_types.h \
 	src/third_party/mac_headers/i386/_types.h \
 	src/third_party/mac_headers/mach/boolean.h \
+	src/third_party/mac_headers/mach/arm/boolean.h \
+	src/third_party/mac_headers/mach/arm/vm_types.h \
 	src/third_party/mac_headers/mach/i386/boolean.h \
-	src/third_party/mac_headers/mach/i386/vm_param.h \
 	src/third_party/mac_headers/mach/i386/vm_types.h \
 	src/third_party/mac_headers/mach/machine/boolean.h \
 	src/third_party/mac_headers/mach/machine.h \
diff --git a/external_imported/sentry-native/external/breakpad/aclocal.m4 b/external_imported/sentry-native/external/breakpad/aclocal.m4
index 009cc48ed..31be0bad8 100644
--- a/external_imported/sentry-native/external/breakpad/aclocal.m4
+++ b/external_imported/sentry-native/external/breakpad/aclocal.m4
@@ -848,35 +848,6 @@ else
 fi
 ])
 
-#  -*- Autoconf -*-
-# Obsolete and "removed" macros, that must however still report explicit
-# error messages when used, to smooth transition.
-#
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([AM_CONFIG_HEADER],
-[AC_DIAGNOSE([obsolete],
-['$0': this macro is obsolete.
-You should use the 'AC][_CONFIG_HEADERS' macro instead.])dnl
-AC_CONFIG_HEADERS($@)])
-
-AC_DEFUN([AM_PROG_CC_STDC],
-[AC_PROG_CC
-am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
-AC_DIAGNOSE([obsolete],
-['$0': this macro is obsolete.
-You should simply use the 'AC][_PROG_CC' macro instead.
-Also, your code should no longer depend upon 'am_cv_prog_cc_stdc',
-but upon 'ac_cv_prog_cc_stdc'.])])
-
-AC_DEFUN([AM_C_PROTOTYPES],
-         [AC_FATAL([automatic de-ANSI-fication support has been removed])])
-AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])
-
 # Helper functions for option handling.                     -*- Autoconf -*-
 
 # Copyright (C) 2001-2021 Free Software Foundation, Inc.
diff --git a/external_imported/sentry-native/external/breakpad/configure b/external_imported/sentry-native/external/breakpad/configure
index 76d4a9f61..3442e7969 100755
--- a/external_imported/sentry-native/external/breakpad/configure
+++ b/external_imported/sentry-native/external/breakpad/configure
@@ -182,8 +182,7 @@ test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1"
   if (eval "$as_required") 2>/dev/null
 then :
   as_have_required=yes
@@ -685,8 +684,6 @@ PTHREAD_CFLAGS
 PTHREAD_LIBS
 PTHREAD_CC
 ax_pthread_config
-EGREP
-GREP
 RANLIB
 am__fastdepCXX_FALSE
 am__fastdepCXX_TRUE
@@ -813,6 +810,7 @@ enable_system_test_libs
 enable_selftest
 with_rustc_demangle
 enable_system_rustc_demangle
+enable_zstd
 with_tests_as_root
 '
       ac_precious_vars='build_alias
@@ -1486,6 +1484,7 @@ Optional Features:
                           is no). This assumes that rustc-demangle is
                           installed in your sysroot, and all headers from it
                           are available in your standard include path
+  --enable-zstd           Enable decompression of ELF sections with zstd
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1719,39 +1718,6 @@ fi
 
 } # ac_fn_cxx_try_compile
 
-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-printf %s "checking for $2... " >&6; }
-if eval test \${$3+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  eval "$3=yes"
-else $as_nop
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_compile
-
 # ac_fn_c_try_link LINENO
 # -----------------------
 # Try to link conftest.$ac_ext, and return whether this succeeded.
@@ -1799,6 +1765,39 @@ fi
 
 } # ac_fn_c_try_link
 
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  eval "$3=yes"
+else $as_nop
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_compile
+
 # ac_fn_c_check_func LINENO FUNC VAR
 # ----------------------------------
 # Tests whether FUNC exists, setting the cache variable VAR accordingly
@@ -6597,11 +6596,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
 printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_11+y}
+if test ${ac_cv_prog_cxx_cxx11+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_11=no
+  ac_cv_prog_cxx_cxx11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -6643,11 +6642,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
 printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_98+y}
+if test ${ac_cv_prog_cxx_cxx98+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_98=no
+  ac_cv_prog_cxx_cxx98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -6937,180 +6936,6 @@ if test "x$enable_m32" = xyes; then
   CXXFLAGS="${CXXFLAGS} -m32"
 fi
 
-# Autoupdate added the next two lines to ensure that your configure
-# script's behavior did not change.  They are probably safe to remove.
-ac_header= ac_cache=
-for ac_item in $ac_header_c_list
-do
-  if test $ac_cache; then
-    ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
-    if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
-      printf "%s\n" "#define $ac_item 1" >> confdefs.h
-    fi
-    ac_header= ac_cache=
-  elif test $ac_header; then
-    ac_cache=$ac_item
-  else
-    ac_header=$ac_item
-  fi
-done
-
-
-
-
-
-
-
-
-if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
-then :
-
-printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-printf %s "checking for grep that handles long lines and -e... " >&6; }
-if test ${ac_cv_path_GREP+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -z "$GREP"; then
-  ac_path_GREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_prog in grep ggrep
-   do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_GREP" || continue
-# Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  printf %s 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_GREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-printf "%s\n" "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-printf %s "checking for egrep... " >&6; }
-if test ${ac_cv_path_EGREP+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     if test -z "$EGREP"; then
-  ac_path_EGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_prog in egrep
-   do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_EGREP" || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  printf %s 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_EGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_EGREP=$EGREP
-fi
-
-   fi
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-printf "%s\n" "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-
 # Check whether --enable-largefile was given.
 if test ${enable_largefile+y}
 then :
@@ -7678,6 +7503,35 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
+ac_header= ac_cache=
+for ac_item in $ac_header_c_list
+do
+  if test $ac_cache; then
+    ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
+    if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
+      printf "%s\n" "#define $ac_item 1" >> confdefs.h
+    fi
+    ac_header= ac_cache=
+  elif test $ac_header; then
+    ac_cache=$ac_item
+  else
+    ac_header=$ac_item
+  fi
+done
+
+
+
+
+
+
+
+
+if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
+then :
+
+printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
 ac_fn_c_check_header_compile "$LINENO" "a.out.h" "ac_cv_header_a_out_h" "$ac_includes_default"
 if test "x$ac_cv_header_a_out_h" = xyes
 then :
@@ -10652,6 +10506,70 @@ fi
 
 
 
+# Check whether --enable-zstd was given.
+if test ${enable_zstd+y}
+then :
+  enableval=$enable_zstd;
+else $as_nop
+  enable_zstd=no
+fi
+
+if test "x${enable_zstd}" != xno; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ZSTD_decompress in -lzstd" >&5
+printf %s "checking for ZSTD_decompress in -lzstd... " >&6; }
+if test ${ac_cv_lib_zstd_ZSTD_decompress+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lzstd  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+char ZSTD_decompress ();
+int
+main (void)
+{
+return ZSTD_decompress ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  ac_cv_lib_zstd_ZSTD_decompress=yes
+else $as_nop
+  ac_cv_lib_zstd_ZSTD_decompress=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zstd_ZSTD_decompress" >&5
+printf "%s\n" "$ac_cv_lib_zstd_ZSTD_decompress" >&6; }
+if test "x$ac_cv_lib_zstd_ZSTD_decompress" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBZSTD 1" >>confdefs.h
+
+  LIBS="-lzstd $LIBS"
+
+else $as_nop
+  as_fn_error $? "zstd library not found." "$LINENO" 5
+fi
+
+  ac_fn_c_check_header_compile "$LINENO" "zstd.h" "ac_cv_header_zstd_h" "$ac_includes_default"
+if test "x$ac_cv_header_zstd_h" = xyes
+then :
+
+else $as_nop
+  as_fn_error $? "zstd header not found." "$LINENO" 5
+fi
+
+fi
+
 
 # Check whether --with-tests-as-root was given.
 if test ${with_tests_as_root+y}
@@ -10767,6 +10685,7 @@ DEFS=-DHAVE_CONFIG_H
 
 ac_libobjs=
 ac_ltlibobjs=
+U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
diff --git a/external_imported/sentry-native/external/breakpad/configure.ac b/external_imported/sentry-native/external/breakpad/configure.ac
index ca2936695..bfee372a3 100644
--- a/external_imported/sentry-native/external/breakpad/configure.ac
+++ b/external_imported/sentry-native/external/breakpad/configure.ac
@@ -37,7 +37,7 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_CANONICAL_HOST
 
 AM_INIT_AUTOMAKE(subdir-objects tar-ustar 1.13)
-AM_CONFIG_HEADER(src/config.h)
+AC_CONFIG_HEADERS(src/config.h)
 AM_MAINTAINER_MODE
 
 AM_PROG_AR
@@ -59,15 +59,6 @@ if test "x$enable_m32" = xyes; then
   CXXFLAGS="${CXXFLAGS} -m32"
 fi
 
-m4_warn([obsolete],
-[The preprocessor macro `STDC_HEADERS' is obsolete.
-  Except in unusual embedded environments, you can safely include all
-  ISO C90 headers unconditionally.])dnl
-# Autoupdate added the next two lines to ensure that your configure
-# script's behavior did not change.  They are probably safe to remove.
-AC_CHECK_INCLUDES_DEFAULT
-AC_PROG_EGREP
-
 AC_SYS_LARGEFILE
 AX_PTHREAD
 AC_CHECK_HEADERS([a.out.h sys/mman.h sys/random.h])
@@ -221,6 +212,17 @@ fi
 AC_ARG_VAR([RUSTC_DEMANGLE_CFLAGS], [Compiler flags for rustc-demangle])
 AC_ARG_VAR([RUSTC_DEMANGLE_LIBS], [Linker flags for rustc-demangle])
 
+AC_ARG_ENABLE(zstd,
+              AS_HELP_STRING([--enable-zstd],
+                             [Enable decompression of ELF sections with zstd]),,
+              [enable_zstd=no])
+if test "x${enable_zstd}" != xno; then
+  AC_CHECK_LIB(zstd, ZSTD_decompress, [],
+               [AC_MSG_ERROR([zstd library not found.])])
+  AC_CHECK_HEADER(zstd.h, [],
+                  [AC_MSG_ERROR([zstd header not found.])])
+fi
+
 AC_ARG_WITH(tests-as-root,
             AS_HELP_STRING([--with-tests-as-root],
                            [Run the tests as root. Use this on platforms]
diff --git a/external_imported/sentry-native/external/breakpad/src/client/ios/exception_handler_no_mach.cc b/external_imported/sentry-native/external/breakpad/src/client/ios/exception_handler_no_mach.cc
index ff6d47e06..675e3424d 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/ios/exception_handler_no_mach.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/ios/exception_handler_no_mach.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <signal.h>
 #include <TargetConditionals.h>
 
diff --git a/external_imported/sentry-native/external/breakpad/src/client/linux/crash_generation/crash_generation_client.cc b/external_imported/sentry-native/external/breakpad/src/client/linux/crash_generation/crash_generation_client.cc
index 5a8c6b4c9..020c61466 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/linux/crash_generation/crash_generation_client.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/linux/crash_generation/crash_generation_client.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "client/linux/crash_generation/crash_generation_client.h"
 
 #include <stdio.h>
@@ -45,9 +49,11 @@ namespace {
 class CrashGenerationClientImpl : public CrashGenerationClient {
  public:
   explicit CrashGenerationClientImpl(int server_fd) : server_fd_(server_fd) {}
-  virtual ~CrashGenerationClientImpl() {}
+  CrashGenerationClientImpl(const CrashGenerationClientImpl&) = delete;
+  void operator=(const CrashGenerationClientImpl&) = delete;
+  ~CrashGenerationClientImpl() override = default;
 
-  virtual bool RequestDump(const void* blob, size_t blob_size) {
+  bool RequestDump(const void* blob, size_t blob_size) override {
     int fds[2];
     if (sys_pipe(fds) < 0)
       return false;
@@ -88,8 +94,6 @@ class CrashGenerationClientImpl : public CrashGenerationClient {
 
  private:
   int server_fd_;
-
-  DISALLOW_COPY_AND_ASSIGN(CrashGenerationClientImpl);
 };
 
 }  // namespace
diff --git a/external_imported/sentry-native/external/breakpad/src/client/linux/crash_generation/crash_generation_client.h b/external_imported/sentry-native/external/breakpad/src/client/linux/crash_generation/crash_generation_client.h
index 915b5700f..1e4a7a5e5 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/linux/crash_generation/crash_generation_client.h
+++ b/external_imported/sentry-native/external/breakpad/src/client/linux/crash_generation/crash_generation_client.h
@@ -29,8 +29,6 @@
 #ifndef CLIENT_LINUX_CRASH_GENERATION_CRASH_GENERATION_CLIENT_H_
 #define CLIENT_LINUX_CRASH_GENERATION_CRASH_GENERATION_CLIENT_H_
 
-#include "common/basictypes.h"
-
 #include <stddef.h>
 
 namespace google_breakpad {
@@ -41,8 +39,10 @@ namespace google_breakpad {
 // via a remote process.
 class CrashGenerationClient {
  public:
-  CrashGenerationClient() {}
-  virtual ~CrashGenerationClient() {}
+  CrashGenerationClient() = default;
+  CrashGenerationClient(const CrashGenerationClient&) = delete;
+  void operator=(const CrashGenerationClient&) = delete;
+  virtual ~CrashGenerationClient() = default;
 
   // Request the crash server to generate a dump.  |blob| is an opaque
   // CrashContext pointer from exception_handler.h.
@@ -54,9 +54,6 @@ class CrashGenerationClient {
   // The returned CrashGenerationClient* is owned by the caller of
   // this function.
   static CrashGenerationClient* TryCreate(int server_fd);
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(CrashGenerationClient);
 };
 
 }  // namespace google_breakpad
diff --git a/external_imported/sentry-native/external/breakpad/src/client/linux/crash_generation/crash_generation_server.cc b/external_imported/sentry-native/external/breakpad/src/client/linux/crash_generation/crash_generation_server.cc
index 56cc0cd7b..e3270c9d4 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/linux/crash_generation/crash_generation_server.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/linux/crash_generation/crash_generation_server.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <assert.h>
 #include <dirent.h>
 #include <fcntl.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/client/linux/dump_writer_common/thread_info.cc b/external_imported/sentry-native/external/breakpad/src/client/linux/dump_writer_common/thread_info.cc
index d8bf80b0c..6288a056e 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/linux/dump_writer_common/thread_info.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/linux/dump_writer_common/thread_info.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "client/linux/dump_writer_common/thread_info.h"
 
 #include <string.h>
@@ -318,23 +322,19 @@ void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
   out->t5  = mcontext.__gregs[30];
   out->t6  = mcontext.__gregs[31];
 
-# if __riscv_flen == 32
-  for(int i = 0; i < MD_FLOATINGSAVEAREA_RISCV_FPR_COUNT; i++)
-    out->float_save.regs[i] = mcontext.__fpregs.__f.__f[i];
-  out->float_save.fpcsr = mcontext.__fpregs.__f.__fcsr;
-# elif __riscv_flen == 64
-  for(int i = 0; i < MD_FLOATINGSAVEAREA_RISCV_FPR_COUNT; i++)
-    out->float_save.regs[i] = mcontext.__fpregs.__d.__f[i];
-  out->float_save.fpcsr = mcontext.__fpregs.__d.__fcsr;
-# elif __riscv_flen == 128
-  for(int i = 0; i < MD_FLOATINGSAVEAREA_RISCV_FPR_COUNT; i++) {
-    out->float_save.regs[i].high = mcontext.__fpregs.__q.__f[2*i];
-    out->float_save.regs[i].low  = mcontext.__fpregs.__q.__f[2*i+1];
-  }
-  out->float_save.fpcsr = mcontext.__fpregs.__q.__fcsr;
-# else
-#  error "Unexpected __riscv_flen"
-# endif
+  // Breakpad only supports RISCV32 with 32 bit floating point.
+  // Breakpad only supports RISCV64 with 64 bit floating point.
+#if __riscv_xlen == 32
+  for (int i = 0; i < MD_CONTEXT_RISCV_FPR_COUNT; i++)
+    out->fpregs[i] = mcontext.__fpregs.__f.__f[i];
+  out->fcsr = mcontext.__fpregs.__f.__fcsr;
+#elif __riscv_xlen == 64
+  for (int i = 0; i < MD_CONTEXT_RISCV_FPR_COUNT; i++)
+    out->fpregs[i] = mcontext.__fpregs.__d.__f[i];
+  out->fcsr = mcontext.__fpregs.__d.__fcsr;
+#else
+#error "Unexpected __riscv_xlen"
+#endif
 }
 #endif  // __riscv
 
diff --git a/external_imported/sentry-native/external/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc b/external_imported/sentry-native/external/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
index 97ed2a9f4..764976835 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "client/linux/dump_writer_common/ucontext_reader.h"
 
 #include "common/linux/linux_libc_support.h"
@@ -306,21 +310,19 @@ void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc) {
   out->t5  = uc->uc_mcontext.__gregs[30];
   out->t6  = uc->uc_mcontext.__gregs[31];
 
-# if __riscv_flen == 32
-  for(int i = 0; i < MD_FLOATINGSAVEAREA_RISCV_FPR_COUNT; i++)
-    out->float_save.regs[i] = uc->uc_mcontext.__fpregs.__f.__f[i];
-  out->float_save.fpcsr = uc->uc_mcontext.__fpregs.__f.__fcsr;
-# elif __riscv_flen == 64
-  for(int i = 0; i < MD_FLOATINGSAVEAREA_RISCV_FPR_COUNT; i++)
-    out->float_save.regs[i] = uc->uc_mcontext.__fpregs.__d.__f[i];
-  out->float_save.fpcsr = uc->uc_mcontext.__fpregs.__d.__fcsr;
-# elif __riscv_flen == 128
-  for(int i = 0; i < MD_FLOATINGSAVEAREA_RISCV_FPR_COUNT; i++) {
-    out->float_save.regs[i].high = uc->uc_mcontext.__fpregs.__q.__f[2*i];
-    out->float_save.regs[i].low  = uc->uc_mcontext.__fpregs.__q.__f[2*i+1];
-  }
-  out->float_save.fpcsr = uc->uc_mcontext.__fpregs.__q.__fcsr;
-# endif
+  // Breakpad only supports RISCV32 with 32 bit floating point.
+  // Breakpad only supports RISCV64 with 64 bit floating point.
+#if __riscv_xlen == 32
+  for (int i = 0; i < MD_CONTEXT_RISCV_FPR_COUNT; i++)
+    out->fpregs[i] = uc->uc_mcontext.__fpregs.__f.__f[i];
+  out->fcsr = uc->uc_mcontext.__fpregs.__f.__fcsr;
+#elif __riscv_xlen == 64
+  for (int i = 0; i < MD_CONTEXT_RISCV_FPR_COUNT; i++)
+    out->fpregs[i] = uc->uc_mcontext.__fpregs.__d.__f[i];
+  out->fcsr = uc->uc_mcontext.__fpregs.__d.__fcsr;
+#else
+#error "Unexpected __riscv_xlen"
+#endif
 }
 #endif
 
diff --git a/external_imported/sentry-native/external/breakpad/src/client/linux/handler/exception_handler.cc b/external_imported/sentry-native/external/breakpad/src/client/linux/handler/exception_handler.cc
index bbdb798b5..9e23c1194 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/linux/handler/exception_handler.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/linux/handler/exception_handler.cc
@@ -62,6 +62,10 @@
 // alternative malloc. Each function should have comment above it detailing the
 // context which it runs in.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "client/linux/handler/exception_handler.h"
 
 #include <errno.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/client/linux/handler/exception_handler_unittest.cc b/external_imported/sentry-native/external/breakpad/src/client/linux/handler/exception_handler_unittest.cc
index 691ea1335..b2d8d4681 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/linux/handler/exception_handler_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/linux/handler/exception_handler_unittest.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <poll.h>
 #include <pthread.h>
 #include <stdint.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/client/linux/handler/minidump_descriptor.cc b/external_imported/sentry-native/external/breakpad/src/client/linux/handler/minidump_descriptor.cc
index 517fce975..db2f9b180 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/linux/handler/minidump_descriptor.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/linux/handler/minidump_descriptor.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <stdio.h>
 
 #include "client/linux/handler/minidump_descriptor.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/client/linux/log/log.cc b/external_imported/sentry-native/external/breakpad/src/client/linux/log/log.cc
index c45de64b7..2a48d7fea 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/linux/log/log.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/linux/log/log.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "client/linux/log/log.h"
 
 #if defined(__ANDROID__)
diff --git a/external_imported/sentry-native/external/breakpad/src/client/linux/microdump_writer/microdump_writer.cc b/external_imported/sentry-native/external/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
index 1f19d3bb6..93dae35e5 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
@@ -29,6 +29,10 @@
 // This translation unit generates microdumps into the console (logcat on
 // Android). See crbug.com/410294 for more info and design docs.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "client/linux/microdump_writer/microdump_writer.h"
 
 #include <limits>
diff --git a/external_imported/sentry-native/external/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc b/external_imported/sentry-native/external/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
index 848656643..b1d570eb4 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <ctype.h>
 #include <sys/syscall.h>
 #include <sys/types.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/cpu_set_unittest.cc b/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/cpu_set_unittest.cc
index e9d4e87ac..b99e98de3 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/cpu_set_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/cpu_set_unittest.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/directory_reader_unittest.cc b/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/directory_reader_unittest.cc
index ffc5fbfd9..708d586ed 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/directory_reader_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/directory_reader_unittest.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <set>
 #include <string>
 
diff --git a/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/line_reader_unittest.cc b/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/line_reader_unittest.cc
index b96ebf9d0..bc1f9d399 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/line_reader_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/line_reader_unittest.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc b/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
index 2c507c1bf..4bf9094e9 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
@@ -29,6 +29,10 @@
 // linux_core_dumper.cc: Implement google_breakpad::LinuxCoreDumper.
 // See linux_core_dumper.h for details.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "client/linux/minidump_writer/linux_core_dumper.h"
 
 #include <asm/ptrace.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/linux_core_dumper_unittest.cc b/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/linux_core_dumper_unittest.cc
index 157e4f897..72790422e 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/linux_core_dumper_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/linux_core_dumper_unittest.cc
@@ -29,6 +29,10 @@
 // linux_core_dumper_unittest.cc:
 // Unit tests for google_breakpad::LinuxCoreDumoer.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <string>
 
 #include "breakpad_googletest_includes.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/linux_dumper.cc b/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
index 01b06facf..5c4c389c3 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
@@ -34,6 +34,10 @@
 // rules apply as detailed at the top of minidump_writer.h: no libc calls and
 // use the alternative allocator.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "client/linux/minidump_writer/linux_dumper.h"
 
 #include <assert.h>
@@ -342,7 +346,7 @@ LinuxDumper::ElfFileIdentifierForMapping(const MappingInfo& mapping,
     return false;
   bool filename_modified = HandleDeletedFileInMapping(filename);
 
-  MemoryMappedFile mapped_file(filename, mapping.offset);
+  MemoryMappedFile mapped_file(filename, 0);
   if (!mapped_file.data() || mapped_file.size() < SELFMAG)
     return false;
 
@@ -455,7 +459,7 @@ bool ElfFileSoName(const LinuxDumper& dumper,
   if (!dumper.GetMappingAbsolutePath(mapping, filename))
     return false;
 
-  MemoryMappedFile mapped_file(filename, mapping.offset);
+  MemoryMappedFile mapped_file(filename, 0);
   if (!mapped_file.data() || mapped_file.size() < SELFMAG) {
     // mmap failed
     return false;
diff --git a/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc b/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
index bc1e4fbef..5a135fda0 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
@@ -30,6 +30,10 @@
 // threads. The first word of each thread's stack is set to the thread
 // id.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <pthread.h>
 #include <stdint.h>
 #include <stdio.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc b/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
index 718fab7c5..2adc39e12 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
@@ -35,6 +35,10 @@
 // rules apply as detailed at the top of minidump_writer.h: no libc calls and
 // use the alternative allocator.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "client/linux/minidump_writer/linux_ptrace_dumper.h"
 
 #include <asm/ptrace.h>
@@ -175,6 +179,13 @@ bool LinuxPtraceDumper::ReadRegisters(ThreadInfo* info, pid_t tid) {
     return false;
   }
 
+  // When running on arm processors the binary may be built with softfp or
+  // hardfp. If built with softfp we have no hardware registers to read from,
+  // so the following read will always fail. gcc defines __SOFTFP__ macro,
+  // clang13 does not do so. see: https://reviews.llvm.org/D135680.
+  // If you are using clang and the macro is NOT defined, please include the
+  // macro define for applicable targets.
+#if !defined(__SOFTFP__)
 #if !(defined(__ANDROID__) && defined(__ARM_EABI__))
   // When running an arm build on an arm64 device, attempting to get the
   // floating point registers fails. On Android, the floating point registers
@@ -186,6 +197,7 @@ bool LinuxPtraceDumper::ReadRegisters(ThreadInfo* info, pid_t tid) {
     return false;
   }
 #endif  // !(defined(__ANDROID__) && defined(__ARM_EABI__))
+#endif  // !defined(__SOFTFP__)
   return true;
 #else  // PTRACE_GETREGS
   return false;
diff --git a/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc b/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
index a8455165d..16a9daf1d 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
@@ -32,6 +32,10 @@
 // This file was renamed from linux_dumper_unittest.cc and modified due
 // to LinuxDumper being splitted into two classes.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/minidump_writer.cc b/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
index a5f9b8416..a95dd2548 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
@@ -42,6 +42,10 @@
 //     a canonical instance in the LinuxDumper object. We use the placement
 //     new form to allocate objects and we don't delete them.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "client/linux/handler/minidump_descriptor.h"
 #include "client/linux/minidump_writer/minidump_writer.h"
 #include "client/minidump_file_writer-inl.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc b/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
index 2601d29b6..effedc5e1 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <fcntl.h>
 #include <poll.h>
 #include <sys/stat.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc b/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc
index 92cae92e2..399f1a123 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc
@@ -29,6 +29,10 @@
 // minidump_writer_unittest_utils.cc:
 // Shared routines used by unittests under client/linux/minidump_writer.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <limits.h>
 #include <stdlib.h>
 
diff --git a/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/pe_file.cc b/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/pe_file.cc
index 960b978b6..7b3fe6c08 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/pe_file.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/pe_file.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <string.h>
 
 #include "client/linux/minidump_writer/pe_file.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc b/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc
index cbdc5fbce..4ac525695 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/client/linux/sender/google_crash_report_sender.cc b/external_imported/sentry-native/external/breakpad/src/client/linux/sender/google_crash_report_sender.cc
index 6f45d831a..f6e481939 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/linux/sender/google_crash_report_sender.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/linux/sender/google_crash_report_sender.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/linux/google_crashdump_uploader.h"
 #include <string>
 #include <iostream>
diff --git a/external_imported/sentry-native/external/breakpad/src/client/mac/crash_generation/crash_generation_client.cc b/external_imported/sentry-native/external/breakpad/src/client/mac/crash_generation/crash_generation_client.cc
index 32f1c827d..7622dddd2 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/mac/crash_generation/crash_generation_client.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/mac/crash_generation/crash_generation_client.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "client/mac/crash_generation/crash_generation_client.h"
 
 #include "client/mac/crash_generation/crash_generation_server.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/client/mac/crash_generation/crash_generation_server.cc b/external_imported/sentry-native/external/breakpad/src/client/mac/crash_generation/crash_generation_server.cc
index 6bbd4bb50..8d742f361 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/mac/crash_generation/crash_generation_server.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/mac/crash_generation/crash_generation_server.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "client/mac/crash_generation/crash_generation_server.h"
 
 #include <pthread.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/client/mac/handler/breakpad_nlist_64.cc b/external_imported/sentry-native/external/breakpad/src/client/mac/handler/breakpad_nlist_64.cc
index b4f04c917..d59c7b080 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/mac/handler/breakpad_nlist_64.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/mac/handler/breakpad_nlist_64.cc
@@ -65,6 +65,10 @@
  * I've modified it to be compatible with 64-bit images.
 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "breakpad_nlist_64.h"
 
 #include <CoreFoundation/CoreFoundation.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/client/mac/handler/dynamic_images.cc b/external_imported/sentry-native/external/breakpad/src/client/mac/handler/dynamic_images.cc
index b1d2c464e..3db7467bf 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/mac/handler/dynamic_images.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/mac/handler/dynamic_images.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "client/mac/handler/dynamic_images.h"
 
 extern "C" { // needed to compile on Leopard
diff --git a/external_imported/sentry-native/external/breakpad/src/client/mac/handler/exception_handler.cc b/external_imported/sentry-native/external/breakpad/src/client/mac/handler/exception_handler.cc
index c091209fb..968e551c1 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/mac/handler/exception_handler.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/mac/handler/exception_handler.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <mach/exc.h>
 #include <mach/mig.h>
 #include <pthread.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/client/mac/handler/minidump_generator.cc b/external_imported/sentry-native/external/breakpad/src/client/mac/handler/minidump_generator.cc
index 3738416e5..fd863aea9 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/mac/handler/minidump_generator.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/mac/handler/minidump_generator.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <algorithm>
 #include <cstdio>
 
diff --git a/external_imported/sentry-native/external/breakpad/src/client/mac/handler/protected_memory_allocator.cc b/external_imported/sentry-native/external/breakpad/src/client/mac/handler/protected_memory_allocator.cc
index 833832636..8205a214d 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/mac/handler/protected_memory_allocator.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/mac/handler/protected_memory_allocator.cc
@@ -30,6 +30,10 @@
 //
 // See the header file for documentation
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "protected_memory_allocator.h"
 #include <assert.h>
 
diff --git a/external_imported/sentry-native/external/breakpad/src/client/mac/handler/testcases/DynamicImagesTests.cc b/external_imported/sentry-native/external/breakpad/src/client/mac/handler/testcases/DynamicImagesTests.cc
index 14ea88d23..d7564fc9c 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/mac/handler/testcases/DynamicImagesTests.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/mac/handler/testcases/DynamicImagesTests.cc
@@ -33,6 +33,10 @@
 //  Copyright 2008 Google LLC
 //
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "client/mac/handler/testcases/DynamicImagesTests.h"
 #include "client/mac/handler/dynamic_images.h"
 
diff --git a/external_imported/sentry-native/external/breakpad/src/client/mac/handler/testcases/breakpad_nlist_test.cc b/external_imported/sentry-native/external/breakpad/src/client/mac/handler/testcases/breakpad_nlist_test.cc
index a89d8c440..3779e357a 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/mac/handler/testcases/breakpad_nlist_test.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/mac/handler/testcases/breakpad_nlist_test.cc
@@ -33,6 +33,10 @@
 //  Copyright 2008 Google LLC
 //
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "client/mac/handler/testcases/breakpad_nlist_test.h"
 #include <mach-o/nlist.h>
 #include "client/mac/handler/breakpad_nlist_64.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/client/mac/tests/crash_generation_server_test.cc b/external_imported/sentry-native/external/breakpad/src/client/mac/tests/crash_generation_server_test.cc
index 50825a938..743b268e0 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/mac/tests/crash_generation_server_test.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/mac/tests/crash_generation_server_test.cc
@@ -29,6 +29,10 @@
 // crash_generation_server_test.cc
 // Unit tests for CrashGenerationServer
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <dirent.h>
 #include <glob.h>
 #include <stdint.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/client/mac/tests/exception_handler_test.cc b/external_imported/sentry-native/external/breakpad/src/client/mac/tests/exception_handler_test.cc
index eb9aa1bcd..91b931b94 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/mac/tests/exception_handler_test.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/mac/tests/exception_handler_test.cc
@@ -28,6 +28,10 @@
 
 // exception_handler_test.cc: Unit tests for google_breakpad::ExceptionHandler
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <pthread.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/client/mac/tests/minidump_generator_test.cc b/external_imported/sentry-native/external/breakpad/src/client/mac/tests/minidump_generator_test.cc
index 1a889dfec..2606e14f5 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/mac/tests/minidump_generator_test.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/mac/tests/minidump_generator_test.cc
@@ -28,6 +28,10 @@
 
 // minidump_generator_test.cc: Unit tests for google_breakpad::MinidumpGenerator
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <AvailabilityMacros.h>
 #ifndef MAC_OS_X_VERSION_10_6
 #define MAC_OS_X_VERSION_10_6 1060
diff --git a/external_imported/sentry-native/external/breakpad/src/client/mac/tests/minidump_generator_test_helper.cc b/external_imported/sentry-native/external/breakpad/src/client/mac/tests/minidump_generator_test_helper.cc
index 93cbe1bba..8177eeab7 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/mac/tests/minidump_generator_test_helper.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/mac/tests/minidump_generator_test_helper.cc
@@ -30,6 +30,10 @@
 //   minidump_generator_test.cc can launch to test certain things
 //   that require a separate executable.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <unistd.h>
 
 #include "client/mac/handler/exception_handler.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/client/minidump_file_writer.cc b/external_imported/sentry-native/external/breakpad/src/client/minidump_file_writer.cc
index d5193e2c0..c00af36c8 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/minidump_file_writer.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/minidump_file_writer.cc
@@ -30,6 +30,10 @@
 //
 // See minidump_file_writer.h for documentation.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <fcntl.h>
 #include <limits.h>
 #include <stdio.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/client/minidump_file_writer_unittest.cc b/external_imported/sentry-native/external/breakpad/src/client/minidump_file_writer_unittest.cc
index bb3a02693..21e0b8a1a 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/minidump_file_writer_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/minidump_file_writer_unittest.cc
@@ -36,6 +36,10 @@
  -o minidump_file_writer_unittest
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <fcntl.h>
 #include <unistd.h>
 
diff --git a/external_imported/sentry-native/external/breakpad/src/client/solaris/handler/exception_handler.cc b/external_imported/sentry-native/external/breakpad/src/client/solaris/handler/exception_handler.cc
index b7b702acf..0e5f44976 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/solaris/handler/exception_handler.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/solaris/handler/exception_handler.cc
@@ -28,6 +28,10 @@
 
 // Author: Alfred Peng
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <signal.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/client/solaris/handler/exception_handler_test.cc b/external_imported/sentry-native/external/breakpad/src/client/solaris/handler/exception_handler_test.cc
index a84f2df13..3d656820d 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/solaris/handler/exception_handler_test.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/solaris/handler/exception_handler_test.cc
@@ -28,6 +28,10 @@
 
 // Author: Alfred Peng
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <pthread.h>
 #include <unistd.h>
 
diff --git a/external_imported/sentry-native/external/breakpad/src/client/solaris/handler/minidump_generator.cc b/external_imported/sentry-native/external/breakpad/src/client/solaris/handler/minidump_generator.cc
index 8f2f6ee25..5d24d0ae8 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/solaris/handler/minidump_generator.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/solaris/handler/minidump_generator.cc
@@ -28,6 +28,10 @@
 
 // Author: Alfred Peng
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <fcntl.h>
 #include <sys/frame.h>
 #include <sys/stat.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/client/solaris/handler/minidump_test.cc b/external_imported/sentry-native/external/breakpad/src/client/solaris/handler/minidump_test.cc
index 00f8d9a5b..a8f690632 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/solaris/handler/minidump_test.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/solaris/handler/minidump_test.cc
@@ -28,6 +28,10 @@
 
 // Author: Alfred Peng
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <pthread.h>
 #include <unistd.h>
 
diff --git a/external_imported/sentry-native/external/breakpad/src/client/solaris/handler/solaris_lwp.cc b/external_imported/sentry-native/external/breakpad/src/client/solaris/handler/solaris_lwp.cc
index d707a5b31..02f1c37e8 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/solaris/handler/solaris_lwp.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/solaris/handler/solaris_lwp.cc
@@ -28,6 +28,10 @@
 
 // Author: Alfred Peng
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <dirent.h>
 #include <elf.h>
 #include <errno.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/client/windows/crash_generation/client_info.cc b/external_imported/sentry-native/external/breakpad/src/client/windows/crash_generation/client_info.cc
index f0a4b9119..61ee21262 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/windows/crash_generation/client_info.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/windows/crash_generation/client_info.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "client/windows/crash_generation/client_info.h"
 #include "client/windows/common/ipc_protocol.h"
 
diff --git a/external_imported/sentry-native/external/breakpad/src/client/windows/crash_generation/crash_generation_client.cc b/external_imported/sentry-native/external/breakpad/src/client/windows/crash_generation/crash_generation_client.cc
index d6da09eb9..c3d6a2bc8 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/windows/crash_generation/crash_generation_client.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/windows/crash_generation/crash_generation_client.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "client/windows/crash_generation/crash_generation_client.h"
 #include <cassert>
 #include <utility>
diff --git a/external_imported/sentry-native/external/breakpad/src/client/windows/crash_generation/crash_generation_server.cc b/external_imported/sentry-native/external/breakpad/src/client/windows/crash_generation/crash_generation_server.cc
index bf80ee9cf..61b0cbc0b 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/windows/crash_generation/crash_generation_server.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/windows/crash_generation/crash_generation_server.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "client/windows/crash_generation/crash_generation_server.h"
 #include <windows.h>
 #include <cassert>
diff --git a/external_imported/sentry-native/external/breakpad/src/client/windows/crash_generation/minidump_generator.cc b/external_imported/sentry-native/external/breakpad/src/client/windows/crash_generation/minidump_generator.cc
index 523db27ae..a0454cf94 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/windows/crash_generation/minidump_generator.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/windows/crash_generation/minidump_generator.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "client/windows/crash_generation/minidump_generator.h"
 
 #include <assert.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/client/windows/handler/exception_handler.cc b/external_imported/sentry-native/external/breakpad/src/client/windows/handler/exception_handler.cc
index 3b3938aa5..64b297999 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/windows/handler/exception_handler.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/windows/handler/exception_handler.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <objbase.h>
 
 #include <algorithm>
diff --git a/external_imported/sentry-native/external/breakpad/src/client/windows/sender/crash_report_sender.cc b/external_imported/sentry-native/external/breakpad/src/client/windows/sender/crash_report_sender.cc
index 27a7ec393..6ce0026ce 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/windows/sender/crash_report_sender.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/windows/sender/crash_report_sender.cc
@@ -29,6 +29,10 @@
 // Disable exception handler warnings.
 #pragma warning( disable : 4530 )
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <errno.h>
 
 #include "client/windows/sender/crash_report_sender.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/client/windows/tests/crash_generation_app/abstract_class.cc b/external_imported/sentry-native/external/breakpad/src/client/windows/tests/crash_generation_app/abstract_class.cc
index 28b8ee14d..737c817c9 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/windows/tests/crash_generation_app/abstract_class.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/windows/tests/crash_generation_app/abstract_class.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "client/windows/tests/crash_generation_app/abstract_class.h"
 
 namespace google_breakpad {
diff --git a/external_imported/sentry-native/external/breakpad/src/client/windows/tests/crash_generation_app/crash_generation_app.cc b/external_imported/sentry-native/external/breakpad/src/client/windows/tests/crash_generation_app/crash_generation_app.cc
index 883afcc69..9ae4679e3 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/windows/tests/crash_generation_app/crash_generation_app.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/windows/tests/crash_generation_app/crash_generation_app.cc
@@ -29,6 +29,10 @@
 // crash_generation_app.cpp : Defines the entry point for the application.
 //
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "client/windows/tests/crash_generation_app/crash_generation_app.h"
 
 #include <windows.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/client/windows/unittests/crash_generation_server_test.cc b/external_imported/sentry-native/external/breakpad/src/client/windows/unittests/crash_generation_server_test.cc
index cd624f072..adb03f400 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/windows/unittests/crash_generation_server_test.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/windows/unittests/crash_generation_server_test.cc
@@ -27,6 +27,10 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "breakpad_googletest_includes.h"
 #include "client/windows/crash_generation/crash_generation_server.h"
 #include "client/windows/common/ipc_protocol.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/client/windows/unittests/dump_analysis.cc b/external_imported/sentry-native/external/breakpad/src/client/windows/unittests/dump_analysis.cc
index 24a33769c..c403d8556 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/windows/unittests/dump_analysis.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/windows/unittests/dump_analysis.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <windows.h>
 #include <objbase.h>
 #include <dbghelp.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/client/windows/unittests/exception_handler_death_test.cc b/external_imported/sentry-native/external/breakpad/src/client/windows/unittests/exception_handler_death_test.cc
index a7679dd66..50d3fda9d 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/windows/unittests/exception_handler_death_test.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/windows/unittests/exception_handler_death_test.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <windows.h>
 #include <dbghelp.h>
 #include <strsafe.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/client/windows/unittests/exception_handler_nesting_test.cc b/external_imported/sentry-native/external/breakpad/src/client/windows/unittests/exception_handler_nesting_test.cc
index 81ae7dc7d..7fa6ac226 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/windows/unittests/exception_handler_nesting_test.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/windows/unittests/exception_handler_nesting_test.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <windows.h>
 
 #include <string>
diff --git a/external_imported/sentry-native/external/breakpad/src/client/windows/unittests/exception_handler_test.cc b/external_imported/sentry-native/external/breakpad/src/client/windows/unittests/exception_handler_test.cc
index 237af29dd..f658726ba 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/windows/unittests/exception_handler_test.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/windows/unittests/exception_handler_test.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "client/windows/unittests/exception_handler_test.h"
 
 #include <windows.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/client/windows/unittests/minidump_test.cc b/external_imported/sentry-native/external/breakpad/src/client/windows/unittests/minidump_test.cc
index 7bfc8d772..741447df4 100644
--- a/external_imported/sentry-native/external/breakpad/src/client/windows/unittests/minidump_test.cc
+++ b/external_imported/sentry-native/external/breakpad/src/client/windows/unittests/minidump_test.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <windows.h>
 #include <objbase.h>
 #include <dbghelp.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/basictypes.h b/external_imported/sentry-native/external/breakpad/src/common/basictypes.h
index 6458a8932..79c9b7756 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/basictypes.h
+++ b/external_imported/sentry-native/external/breakpad/src/common/basictypes.h
@@ -29,14 +29,6 @@
 #ifndef COMMON_BASICTYPES_H_
 #define COMMON_BASICTYPES_H_
 
-// A macro to disallow the copy constructor and operator= functions
-// This should be used in the private: declarations for a class
-#ifndef DISALLOW_COPY_AND_ASSIGN
-#define DISALLOW_COPY_AND_ASSIGN(TypeName) \
-  TypeName(const TypeName&);               \
-  void operator=(const TypeName&)
-#endif  // DISALLOW_COPY_AND_ASSIGN
-
 namespace google_breakpad {
 
 // Used to explicitly mark the return value of a function as unused. If you are
diff --git a/external_imported/sentry-native/external/breakpad/src/common/byte_cursor_unittest.cc b/external_imported/sentry-native/external/breakpad/src/common/byte_cursor_unittest.cc
index 00648f764..41180ca2e 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/byte_cursor_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/byte_cursor_unittest.cc
@@ -31,6 +31,10 @@
 // byte_cursor_unittest.cc: Unit tests for google_breakpad::ByteBuffer
 // and google_breakpad::ByteCursor.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <string>
 
 #include <string.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/convert_UTF.cc b/external_imported/sentry-native/external/breakpad/src/common/convert_UTF.cc
index 4a5df1eb2..6e95b2f9b 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/convert_UTF.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/convert_UTF.cc
@@ -55,6 +55,10 @@ See the header file "ConvertUTF.h" for complete documentation.
 ------------------------------------------------------------------------ */
 
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "convert_UTF.h"
 #ifdef CVTUTF_DEBUG
 #include <stdio.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/dwarf/bytereader.cc b/external_imported/sentry-native/external/breakpad/src/common/dwarf/bytereader.cc
index 46bed6d03..faa7d680a 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/dwarf/bytereader.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/dwarf/bytereader.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <assert.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/dwarf/bytereader_unittest.cc b/external_imported/sentry-native/external/breakpad/src/common/dwarf/bytereader_unittest.cc
index c23c737be..a5eb0da53 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/dwarf/bytereader_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/dwarf/bytereader_unittest.cc
@@ -30,6 +30,10 @@
 
 // bytereader_unittest.cc: Unit tests for google_breakpad::ByteReader
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <stdint.h>
 
 #include <string>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/dwarf/cfi_assembler.cc b/external_imported/sentry-native/external/breakpad/src/common/dwarf/cfi_assembler.cc
index 9ed979b41..b3e064f06 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/dwarf/cfi_assembler.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/dwarf/cfi_assembler.cc
@@ -31,6 +31,10 @@
 // cfi_assembler.cc: Implementation of google_breakpad::CFISection class.
 // See cfi_assembler.h for details.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/dwarf/cfi_assembler.h"
 
 #include <assert.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/dwarf/dwarf2diehandler.cc b/external_imported/sentry-native/external/breakpad/src/common/dwarf/dwarf2diehandler.cc
index ea3ac71c8..8aea0f2ff 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/dwarf/dwarf2diehandler.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/dwarf/dwarf2diehandler.cc
@@ -31,6 +31,10 @@
 // dwarf2diehandler.cc: Implement the dwarf2reader::DieDispatcher class.
 // See dwarf2diehandler.h for details.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <assert.h>
 #include <stdint.h>
 
diff --git a/external_imported/sentry-native/external/breakpad/src/common/dwarf/dwarf2diehandler_unittest.cc b/external_imported/sentry-native/external/breakpad/src/common/dwarf/dwarf2diehandler_unittest.cc
index 67c9489dc..afcbf6254 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/dwarf/dwarf2diehandler_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/dwarf/dwarf2diehandler_unittest.cc
@@ -32,6 +32,10 @@
 
 // dwarf2diehander_unittest.cc: Unit tests for google_breakpad::DIEDispatcher.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <stdint.h>
 
 #include <string>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/dwarf/dwarf2enums.h b/external_imported/sentry-native/external/breakpad/src/common/dwarf/dwarf2enums.h
index 777d9bfca..f1c995f92 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/dwarf/dwarf2enums.h
+++ b/external_imported/sentry-native/external/breakpad/src/common/dwarf/dwarf2enums.h
@@ -580,10 +580,10 @@ enum DwarfSectionId {
   DW_SECT_TYPES = 2,
   DW_SECT_ABBREV = 3,
   DW_SECT_LINE = 4,
-  DW_SECT_LOC = 5,
+  DW_SECT_LOCLISTS = 5,
   DW_SECT_STR_OFFSETS = 6,
-  DW_SECT_MACINFO = 7,
-  DW_SECT_MACRO = 8
+  DW_SECT_MACRO = 7,
+  DW_SECT_RNGLISTS = 8
 };
 
 // Source languages.  These are values for DW_AT_language.
diff --git a/external_imported/sentry-native/external/breakpad/src/common/dwarf/dwarf2reader.cc b/external_imported/sentry-native/external/breakpad/src/common/dwarf/dwarf2reader.cc
index b191d78c5..8a8bf6f86 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/dwarf/dwarf2reader.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/dwarf/dwarf2reader.cc
@@ -31,6 +31,10 @@
 // Implementation of LineInfo, CompilationUnit,
 // and CallFrameInfo. See dwarf2reader.h for details.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/dwarf/dwarf2reader.h"
 
 #include <stdint.h>
@@ -76,9 +80,10 @@ CompilationUnit::CompilationUnit(const string& path,
       str_offsets_buffer_(NULL), str_offsets_buffer_length_(0),
       addr_buffer_(NULL), addr_buffer_length_(0),
       is_split_dwarf_(false), is_type_unit_(false), dwo_id_(0), dwo_name_(),
-      skeleton_dwo_id_(0), ranges_base_(0), addr_base_(0),
-      str_offsets_base_(0), have_checked_for_dwp_(false), dwp_path_(),
-      dwp_byte_reader_(), dwp_reader_() {}
+      skeleton_dwo_id_(0), addr_base_(0),
+      str_offsets_base_(0), have_checked_for_dwp_(false),
+      should_process_split_dwarf_(false), low_pc_(0),
+      has_source_line_info_(false), source_line_offset_(0) {}
 
 // Initialize a compilation unit from a .dwo or .dwp file.
 // In this case, we need the .debug_addr section from the
@@ -87,16 +92,10 @@ CompilationUnit::CompilationUnit(const string& path,
 // the executable file, and call it as if we were still
 // processing the original compilation unit.
 
-void CompilationUnit::SetSplitDwarf(const uint8_t* addr_buffer,
-                                    uint64_t addr_buffer_length,
-                                    uint64_t addr_base,
-                                    uint64_t ranges_base,
+void CompilationUnit::SetSplitDwarf(uint64_t addr_base,
                                     uint64_t dwo_id) {
   is_split_dwarf_ = true;
-  addr_buffer_ = addr_buffer;
-  addr_buffer_length_ = addr_buffer_length;
   addr_base_ = addr_base;
-  ranges_base_ = ranges_base;
   skeleton_dwo_id_ = dwo_id;
 }
 
@@ -396,7 +395,13 @@ uint64_t CompilationUnit::Start() {
 
   // Set up our buffer
   buffer_ = iter->second.first + offset_from_section_start_;
-  buffer_length_ = iter->second.second - offset_from_section_start_;
+  if (is_split_dwarf_) {
+    iter = GetSectionByName(sections_, ".debug_info_offset");
+    assert(iter != sections_.end());
+    buffer_length_ = iter->second.second;
+  } else {
+    buffer_length_ = iter->second.second - offset_from_section_start_;
+  }
 
   // Read the header
   ReadHeader();
@@ -430,6 +435,12 @@ uint64_t CompilationUnit::Start() {
     string_buffer_length_ = iter->second.second;
   }
 
+  iter = GetSectionByName(sections_, ".debug_line");
+  if (iter != sections_.end()) {
+    line_buffer_ = iter->second.first;
+    line_buffer_length_ = iter->second.second;
+  }
+
   // Set the line string section if we have one.
   iter = GetSectionByName(sections_, ".debug_line_str");
   if (iter != sections_.end()) {
@@ -457,10 +468,8 @@ uint64_t CompilationUnit::Start() {
   // If this is a skeleton compilation unit generated with split DWARF,
   // and the client needs the full debug info, we need to find the full
   // compilation unit in a .dwo or .dwp file.
-  if (!is_split_dwarf_
-      && dwo_name_ != NULL
-      && handler_->NeedSplitDebugInfo())
-    ProcessSplitDwarf();
+  should_process_split_dwarf_ =
+      !is_split_dwarf_ && dwo_name_ != NULL && handler_->NeedSplitDebugInfo();
 
   return ourlength;
 }
@@ -881,7 +890,9 @@ const uint8_t* CompilationUnit::ProcessDIE(uint64_t dieoffset,
   // DW_AT_str_offsets_base or DW_AT_addr_base.  If it does, that attribute must
   // be found and processed before trying to process the other attributes;
   // otherwise the string or address values will all come out incorrect.
-  if (abbrev.tag == DW_TAG_compile_unit && header_.version == 5) {
+  if ((abbrev.tag == DW_TAG_compile_unit ||
+       abbrev.tag == DW_TAG_skeleton_unit) &&
+      header_.version == 5) {
     uint64_t dieoffset_copy = dieoffset;
     const uint8_t* start_copy = start;
     for (AttributeList::const_iterator i = abbrev.attributes.begin();
@@ -990,66 +1001,69 @@ inline int GetElfWidth(const ElfReader& elf) {
   return 0;
 }
 
-void CompilationUnit::ProcessSplitDwarf() {
+bool CompilationUnit::ProcessSplitDwarf(std::string& split_file,
+                                        SectionMap& sections,
+                                        ByteReader& split_byte_reader,
+                                        uint64_t& cu_offset) {
+  if (!should_process_split_dwarf_)
+    return false;
   struct stat statbuf;
+  bool found_in_dwp = false;
   if (!have_checked_for_dwp_) {
     // Look for a .dwp file in the same directory as the executable.
     have_checked_for_dwp_ = true;
     string dwp_suffix(".dwp");
-    dwp_path_ = path_ + dwp_suffix;
-    if (stat(dwp_path_.c_str(), &statbuf) != 0) {
+    std::string dwp_path = path_ + dwp_suffix;
+    if (stat(dwp_path.c_str(), &statbuf) != 0) {
       // Fall back to a split .debug file in the same directory.
       string debug_suffix(".debug");
-      dwp_path_ = path_;
+      dwp_path = path_;
       size_t found = path_.rfind(debug_suffix);
-      if (found + debug_suffix.length() == path_.length())
-        dwp_path_ = dwp_path_.replace(found, debug_suffix.length(), dwp_suffix);
+      if (found != string::npos &&
+          found + debug_suffix.length() == path_.length())
+        dwp_path = dwp_path.replace(found, debug_suffix.length(), dwp_suffix);
     }
-    if (stat(dwp_path_.c_str(), &statbuf) == 0) {
-      ElfReader* elf = new ElfReader(dwp_path_);
-      int width = GetElfWidth(*elf);
+    if (stat(dwp_path.c_str(), &statbuf) == 0) {
+      split_elf_reader_ = std::make_unique<ElfReader>(dwp_path);
+      int width = GetElfWidth(*split_elf_reader_.get());
       if (width != 0) {
-        dwp_byte_reader_.reset(new ByteReader(reader_->GetEndianness()));
-        dwp_byte_reader_->SetAddressSize(width);
-        dwp_reader_.reset(new DwpReader(*dwp_byte_reader_, elf));
+        split_byte_reader = ByteReader(reader_->GetEndianness());
+        split_byte_reader.SetAddressSize(width);
+        dwp_reader_ = std::make_unique<DwpReader>(split_byte_reader,
+                                                  split_elf_reader_.get());
         dwp_reader_->Initialize();
-      } else {
-        delete elf;
+        // If we have a .dwp file, read the debug sections for the requested CU.
+        dwp_reader_->ReadDebugSectionsForCU(dwo_id_, &sections);
+        if (!sections.empty()) {
+          SectionMap::const_iterator cu_iter =
+              GetSectionByName(sections, ".debug_info_offset");
+          SectionMap::const_iterator debug_info_iter =
+              GetSectionByName(sections, ".debug_info");
+          assert(cu_iter != sections.end());
+          assert(debug_info_iter != sections.end());
+          cu_offset = cu_iter->second.first - debug_info_iter->second.first;
+          found_in_dwp = true;
+          split_file = dwp_path;
+        }
       }
     }
   }
-  bool found_in_dwp = false;
-  if (dwp_reader_) {
-    // If we have a .dwp file, read the debug sections for the requested CU.
-    SectionMap sections;
-    dwp_reader_->ReadDebugSectionsForCU(dwo_id_, &sections);
-    if (!sections.empty()) {
-      found_in_dwp = true;
-      CompilationUnit dwp_comp_unit(dwp_path_, sections, 0,
-                                    dwp_byte_reader_.get(), handler_);
-      dwp_comp_unit.SetSplitDwarf(addr_buffer_, addr_buffer_length_, addr_base_,
-                                  ranges_base_, dwo_id_);
-      dwp_comp_unit.Start();
-    }
-  }
   if (!found_in_dwp) {
     // If no .dwp file, try to open the .dwo file.
     if (stat(dwo_name_, &statbuf) == 0) {
-      ElfReader elf(dwo_name_);
-      int width = GetElfWidth(elf);
+      split_elf_reader_ = std::make_unique<ElfReader>(dwo_name_);
+      int width = GetElfWidth(*split_elf_reader_.get());
       if (width != 0) {
-        ByteReader reader(ENDIANNESS_LITTLE);
-        reader.SetAddressSize(width);
-        SectionMap sections;
-        ReadDebugSectionsFromDwo(&elf, &sections);
-        CompilationUnit dwo_comp_unit(dwo_name_, sections, 0, &reader,
-                                      handler_);
-        dwo_comp_unit.SetSplitDwarf(addr_buffer_, addr_buffer_length_,
-                                    addr_base_, ranges_base_, dwo_id_);
-        dwo_comp_unit.Start();
+        split_byte_reader = ByteReader(ENDIANNESS_LITTLE);
+        split_byte_reader.SetAddressSize(width);
+        ReadDebugSectionsFromDwo(split_elf_reader_.get(), &sections);
+        if (!sections.empty()) {
+          split_file = dwo_name_;
+        }
       }
     }
   }
+  return !split_file.empty();
 }
 
 void CompilationUnit::ReadDebugSectionsFromDwo(ElfReader* elf_reader,
@@ -1084,10 +1098,6 @@ DwpReader::DwpReader(const ByteReader& byte_reader, ElfReader* elf_reader)
       abbrev_size_(0), info_data_(NULL), info_size_(0),
       str_offsets_data_(NULL), str_offsets_size_(0) {}
 
-DwpReader::~DwpReader() {
-  if (elf_reader_) delete elf_reader_;
-}
-
 void DwpReader::Initialize() {
   cu_index_ = elf_reader_->GetSectionByName(".debug_cu_index",
                                             &cu_index_size_);
@@ -1127,6 +1137,8 @@ void DwpReader::Initialize() {
     info_data_ = elf_reader_->GetSectionByName(".debug_info.dwo", &info_size_);
     str_offsets_data_ = elf_reader_->GetSectionByName(".debug_str_offsets.dwo",
                                                       &str_offsets_size_);
+    rnglist_data_ =
+        elf_reader_->GetSectionByName(".debug_rnglists.dwo", &rnglist_size_);
     if (size_table_ >= cu_index_ + cu_index_size_) {
       version_ = 0;
     }
@@ -1227,13 +1239,24 @@ void DwpReader::ReadDebugSectionsForCU(uint64_t dwo_id,
       } else if (section_id == DW_SECT_INFO) {
         sections->insert(std::make_pair(
             ".debug_info",
-            std::make_pair(reinterpret_cast<const uint8_t*> (info_data_)
-                           + offset, size)));
+            std::make_pair(reinterpret_cast<const uint8_t*>(info_data_), 0)));
+        // .debug_info_offset will points the buffer for the CU with given
+        // dwo_id.
+        sections->insert(std::make_pair(
+            ".debug_info_offset",
+            std::make_pair(
+                reinterpret_cast<const uint8_t*>(info_data_) + offset, size)));
       } else if (section_id == DW_SECT_STR_OFFSETS) {
         sections->insert(std::make_pair(
             ".debug_str_offsets",
             std::make_pair(reinterpret_cast<const uint8_t*> (str_offsets_data_)
                            + offset, size)));
+      } else if (section_id == DW_SECT_RNGLISTS) {
+        sections->insert(std::make_pair(
+            ".debug_rnglists",
+            std::make_pair(
+                reinterpret_cast<const uint8_t*>(rnglist_data_) + offset,
+                size)));
       }
     }
     sections->insert(std::make_pair(
@@ -1819,6 +1842,11 @@ bool RangeListReader::ReadRanges(enum DwarfForm form, uint64_t data) {
       return ReadDebugRngList(data);
     }
   } else if (form == DW_FORM_rnglistx) {
+    if (cu_info_->ranges_base_ == 0) {
+      // In split dwarf, there's no DW_AT_rnglists_base attribute, range_base
+      // will just be the first byte after the header.
+      cu_info_->ranges_base_ = reader_->OffsetSize() == 4? 12: 20;
+    }
     offset_array_ = cu_info_->ranges_base_;
     uint64_t index_offset = reader_->OffsetSize() * data;
     uint64_t range_list_offset =
diff --git a/external_imported/sentry-native/external/breakpad/src/common/dwarf/dwarf2reader.h b/external_imported/sentry-native/external/breakpad/src/common/dwarf/dwarf2reader.h
index ddcdd8011..b6bd2f31a 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/dwarf/dwarf2reader.h
+++ b/external_imported/sentry-native/external/breakpad/src/common/dwarf/dwarf2reader.h
@@ -469,8 +469,7 @@ class CompilationUnit {
   // compilation unit.  We also inherit the Dwarf2Handler from
   // the executable file, and call it as if we were still
   // processing the original compilation unit.
-  void SetSplitDwarf(const uint8_t* addr_buffer, uint64_t addr_buffer_length,
-                     uint64_t addr_base, uint64_t ranges_base, uint64_t dwo_id);
+  void SetSplitDwarf(uint64_t addr_base, uint64_t dwo_id);
 
   // Begin reading a Dwarf2 compilation unit, and calling the
   // callbacks in the Dwarf2Handler
@@ -481,6 +480,36 @@ class CompilationUnit {
   // start of the next compilation unit, if there is one.
   uint64_t Start();
 
+  // Process the actual debug information in a split DWARF file.
+  bool ProcessSplitDwarf(std::string& split_file,
+                         SectionMap& sections,
+                         ByteReader& split_byte_reader,
+                         uint64_t& cu_offset);
+
+  const uint8_t* GetAddrBuffer() { return addr_buffer_; }
+
+  uint64_t GetAddrBufferLen() { return addr_buffer_length_; }
+
+  uint64_t GetAddrBase() { return addr_base_; }
+
+  uint64_t GetLowPC() { return low_pc_; }
+
+  uint64_t GetDWOID() { return dwo_id_; }
+
+  const uint8_t* GetLineBuffer() { return line_buffer_; }
+
+  uint64_t GetLineBufferLen() { return line_buffer_length_; }
+
+  const uint8_t* GetLineStrBuffer() { return line_string_buffer_; }
+
+  uint64_t GetLineStrBufferLen() { return line_string_buffer_length_; }
+
+  bool HasSourceLineInfo() { return has_source_line_info_; }
+
+  uint64_t GetSourceLineOffset() { return source_line_offset_; }
+
+  bool ShouldProcessSplitDwarf() { return should_process_split_dwarf_; }
+
  private:
 
   // This struct represents a single DWARF2/3 abbreviation
@@ -565,14 +594,12 @@ class CompilationUnit {
     else if (attr == DW_AT_str_offsets_base) {
       str_offsets_base_ = data;
     }
-    else if (attr == DW_AT_GNU_ranges_base || attr == DW_AT_rnglists_base) {
-      ranges_base_ = data;
+    else if (attr == DW_AT_low_pc) {
+      low_pc_ = data;
     }
-    // TODO(yunlian): When we add DW_AT_ranges_base from DWARF-5,
-    // that base will apply to DW_AT_ranges attributes in the
-    // skeleton CU as well as in the .dwo/.dwp files.
-    else if (attr == DW_AT_ranges && is_split_dwarf_) {
-      data += ranges_base_;
+    else if (attr == DW_AT_stmt_list) {
+      has_source_line_info_ = true;
+      source_line_offset_ = data;
     }
     handler_->ProcessAttributeUnsigned(offset, attr, form, data);
   }
@@ -647,9 +674,6 @@ class CompilationUnit {
   // new place to position the stream to.
   const uint8_t* SkipAttribute(const uint8_t* start, enum DwarfForm form);
 
-  // Process the actual debug information in a split DWARF file.
-  void ProcessSplitDwarf();
-
   // Read the debug sections from a .dwo file.
   void ReadDebugSectionsFromDwo(ElfReader* elf_reader,
                                 SectionMap* sections);
@@ -658,7 +682,7 @@ class CompilationUnit {
   const string path_;
 
   // Offset from section start is the offset of this compilation unit
-  // from the beginning of the .debug_info section.
+  // from the beginning of the .debug_info/.debug_info.dwo section.
   uint64_t offset_from_section_start_;
 
   // buffer is the buffer for our CU, starting at .debug_info + offset
@@ -688,7 +712,7 @@ class CompilationUnit {
   const uint8_t* string_buffer_;
   uint64_t string_buffer_length_;
 
-  // Similarly for .debug_line_string.
+  // Similarly for .debug_line_str.
   const uint8_t* line_string_buffer_;
   uint64_t line_string_buffer_length_;
 
@@ -702,6 +726,10 @@ class CompilationUnit {
   const uint8_t* addr_buffer_;
   uint64_t addr_buffer_length_;
 
+  // .debug_line section buffer and length.
+  const uint8_t* line_buffer_;
+  uint64_t line_buffer_length_;
+
   // Flag indicating whether this compilation unit is part of a .dwo
   // or .dwp file.  If true, we are reading this unit because a
   // skeleton compilation unit in an executable file had a
@@ -730,10 +758,6 @@ class CompilationUnit {
   // from the skeleton CU.
   uint64_t skeleton_dwo_id_;
 
-  // The value of the DW_AT_GNU_ranges_base or DW_AT_rnglists_base attribute,
-  // if any.
-  uint64_t ranges_base_;
-
   // The value of the DW_AT_GNU_addr_base attribute, if any.
   uint64_t addr_base_;
 
@@ -743,14 +767,20 @@ class CompilationUnit {
   // True if we have already looked for a .dwp file.
   bool have_checked_for_dwp_;
 
-  // Path to the .dwp file.
-  string dwp_path_;
-
-  // ByteReader for the DWP file.
-  std::unique_ptr<ByteReader> dwp_byte_reader_;
+  // ElfReader for the dwo/dwo file.
+  std::unique_ptr<ElfReader> split_elf_reader_;
 
   // DWP reader.
-   std::unique_ptr<DwpReader> dwp_reader_;
+  std::unique_ptr<DwpReader> dwp_reader_;
+
+  bool should_process_split_dwarf_;
+
+  // The value of the DW_AT_low_pc attribute, if any.
+  uint64_t low_pc_;
+
+  // The value of DW_AT_stmt_list attribute if any.
+  bool has_source_line_info_;
+  uint64_t source_line_offset_;
 };
 
 // A Reader for a .dwp file.  Supports the fetching of DWARF debug
@@ -770,8 +800,6 @@ class DwpReader {
  public:
   DwpReader(const ByteReader& byte_reader, ElfReader* elf_reader);
 
-  ~DwpReader();
-
   // Read the CU index and initialize data members.
   void Initialize();
 
@@ -839,6 +867,8 @@ class DwpReader {
   size_t info_size_;
   const char* str_offsets_data_;
   size_t str_offsets_size_;
+  const char* rnglist_data_;
+  size_t rnglist_size_;
 };
 
 // This class is a reader for DWARF's Call Frame Information.  CFI
diff --git a/external_imported/sentry-native/external/breakpad/src/common/dwarf/dwarf2reader_cfi_unittest.cc b/external_imported/sentry-native/external/breakpad/src/common/dwarf/dwarf2reader_cfi_unittest.cc
index dc4418c72..67b662a35 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/dwarf/dwarf2reader_cfi_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/dwarf/dwarf2reader_cfi_unittest.cc
@@ -30,6 +30,10 @@
 
 // dwarf2reader_cfi_unittest.cc: Unit tests for google_breakpad::CallFrameInfo
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <stdint.h>
 #include <stdlib.h>
 
diff --git a/external_imported/sentry-native/external/breakpad/src/common/dwarf/dwarf2reader_die_unittest.cc b/external_imported/sentry-native/external/breakpad/src/common/dwarf/dwarf2reader_die_unittest.cc
index fc639a64b..2b365396d 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/dwarf/dwarf2reader_die_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/dwarf/dwarf2reader_die_unittest.cc
@@ -30,6 +30,10 @@
 
 // dwarf2reader_die_unittest.cc: Unit tests for google_breakpad::CompilationUnit
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <stdint.h>
 #include <stdlib.h>
 
@@ -329,7 +333,8 @@ struct DwarfFormsFixture: public DIEFixture {
                             uint64_t offset=0) {
     ByteReader byte_reader(params.endianness == kLittleEndian ?
                            ENDIANNESS_LITTLE : ENDIANNESS_BIG);
-    CompilationUnit parser("", MakeSectionMap(), offset, &byte_reader, &handler);
+    CompilationUnit parser("", MakeSectionMap(), offset, &byte_reader,
+                           &handler);
     EXPECT_EQ(offset + parser.Start(), info_contents.size());
   }
 
diff --git a/external_imported/sentry-native/external/breakpad/src/common/dwarf/dwarf2reader_lineinfo_unittest.cc b/external_imported/sentry-native/external/breakpad/src/common/dwarf/dwarf2reader_lineinfo_unittest.cc
index 033c63336..7de627d3c 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/dwarf/dwarf2reader_lineinfo_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/dwarf/dwarf2reader_lineinfo_unittest.cc
@@ -30,6 +30,10 @@
 
 // dwarf2reader_lineinfo_unittest.cc: Unit tests for google_breakpad::LineInfo
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <stdint.h>
 #include <stdlib.h>
 
diff --git a/external_imported/sentry-native/external/breakpad/src/common/dwarf/dwarf2reader_splitfunctions_unittest.cc b/external_imported/sentry-native/external/breakpad/src/common/dwarf/dwarf2reader_splitfunctions_unittest.cc
index 9ceea1097..12b27e686 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/dwarf/dwarf2reader_splitfunctions_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/dwarf/dwarf2reader_splitfunctions_unittest.cc
@@ -32,6 +32,10 @@
 // information generated when with splitting optimizations such as
 // -fsplit-machine-functions (clang) -freorder-blocks-and-partition (gcc).
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <stdint.h>
 #include <stdlib.h>
 
diff --git a/external_imported/sentry-native/external/breakpad/src/common/dwarf/elf_reader.cc b/external_imported/sentry-native/external/breakpad/src/common/dwarf/elf_reader.cc
index 7664377cb..31deb9db4 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/dwarf/elf_reader.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/dwarf/elf_reader.cc
@@ -30,6 +30,10 @@
 #define _GNU_SOURCE  // needed for pread()
 #endif
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <fcntl.h>
 #include <limits.h>
 #include <string.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/dwarf/functioninfo.cc b/external_imported/sentry-native/external/breakpad/src/common/dwarf/functioninfo.cc
index d8fdb842d..5b0ce81a4 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/dwarf/functioninfo.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/dwarf/functioninfo.cc
@@ -29,6 +29,10 @@
 // This is a client for the dwarf2reader to extract function and line
 // information from the debug info.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <assert.h>
 #include <limits.h>
 #include <stdio.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/dwarf_cfi_to_module.cc b/external_imported/sentry-native/external/breakpad/src/common/dwarf_cfi_to_module.cc
index 7da8507d7..4c594175e 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/dwarf_cfi_to_module.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/dwarf_cfi_to_module.cc
@@ -33,6 +33,10 @@
 // Implementation of google_breakpad::DwarfCFIToModule.
 // See dwarf_cfi_to_module.h for details.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <memory>
 #include <sstream>
 #include <utility>
@@ -143,6 +147,29 @@ vector<string> DwarfCFIToModule::RegisterNames::MIPS() {
                     sizeof(kRegisterNames) / sizeof(kRegisterNames[0]));
 }
 
+vector<string> DwarfCFIToModule::RegisterNames::RISCV() {
+  static const char *const names[] = {
+    "pc",  "ra",  "sp",  "gp",  "tp",  "t0",  "t1",  "t2",
+    "s0",  "s1",  "a0",  "a1",  "a2",  "a3",  "a4",  "a5",
+    "a6",  "a7",  "s2",  "s3",  "s4",  "s5",  "s6",  "s7",
+    "s8",  "s9",  "s10", "s11", "t3",  "t4",  "t5",  "t6",
+    "f0",  "f1",  "f2",  "f3",  "f4",  "f5",  "f6",  "f7",
+    "f8",  "f9",  "f10", "f11", "f12", "f13", "f14", "f15",
+    "f16", "f17", "f18", "f19", "f20", "f21", "f22", "f23",
+    "f24", "f25", "f26", "f27", "f28", "f29", "f30", "f31",
+    "",    "",    "",    "",    "",    "",    "",    "",
+    "",    "",    "",    "",    "",    "",    "",    "",
+    "",    "",    "",    "",    "",    "",    "",    "",
+    "",    "",    "",    "",    "",    "",    "",    "",
+    "v0",  "v1",  "v2",  "v3",  "v4",  "v5",  "v6",  "v7",
+    "v8",  "v9",  "v10", "v11", "v12", "v13", "v14", "v15",
+    "v16", "v17", "v18", "v19", "v20", "v21", "v22", "v23",
+    "v24", "v25", "v26", "v27", "v28", "v29", "v30", "v31"
+  };
+
+  return MakeVector(names, sizeof(names) / sizeof(names[0]));
+}
+
 bool DwarfCFIToModule::Entry(size_t offset, uint64_t address, uint64_t length,
                              uint8_t version, const string& augmentation,
                              unsigned return_address) {
diff --git a/external_imported/sentry-native/external/breakpad/src/common/dwarf_cfi_to_module.h b/external_imported/sentry-native/external/breakpad/src/common/dwarf_cfi_to_module.h
index 42b618d5b..19297db93 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/dwarf_cfi_to_module.h
+++ b/external_imported/sentry-native/external/breakpad/src/common/dwarf_cfi_to_module.h
@@ -114,6 +114,9 @@ class DwarfCFIToModule: public CallFrameInfo::Handler {
     // MIPS.
     static vector<string> MIPS();
 
+    // RISC-V.
+    static vector<string> RISCV();
+
    private:
     // Given STRINGS, an array of C strings with SIZE elements, return an
     // equivalent vector<string>.
diff --git a/external_imported/sentry-native/external/breakpad/src/common/dwarf_cfi_to_module_unittest.cc b/external_imported/sentry-native/external/breakpad/src/common/dwarf_cfi_to_module_unittest.cc
index 0b677b211..52653ec6e 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/dwarf_cfi_to_module_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/dwarf_cfi_to_module_unittest.cc
@@ -30,6 +30,10 @@
 
 // dwarf_cfi_to_module_unittest.cc: Tests for google_breakpad::DwarfCFIToModule.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <string>
 #include <vector>
 
@@ -303,3 +307,15 @@ TEST(RegisterNames, X86_64) {
   EXPECT_EQ("$rsp", names[7]);
   EXPECT_EQ("$rip", names[16]);
 }
+
+TEST(RegisterNames, RISCV) {
+  vector<string> names = DwarfCFIToModule::RegisterNames::RISCV();
+
+  EXPECT_EQ("pc", names[0]);
+  EXPECT_EQ("t6", names[31]);
+  EXPECT_EQ("f0", names[32]);
+  EXPECT_EQ("f31", names[63]);
+  EXPECT_EQ("v0", names[96]);
+  EXPECT_EQ("v31", names[127]);
+}
+
diff --git a/external_imported/sentry-native/external/breakpad/src/common/dwarf_cu_to_module.cc b/external_imported/sentry-native/external/breakpad/src/common/dwarf_cu_to_module.cc
index a5a1fd069..94a0d428e 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/dwarf_cu_to_module.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/dwarf_cu_to_module.cc
@@ -35,6 +35,10 @@
 #define __STDC_FORMAT_MACROS
 #endif  /* __STDC_FORMAT_MACROS */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/dwarf_cu_to_module.h"
 
 #include <assert.h>
@@ -165,19 +169,23 @@ bool DwarfCUToModule::FileContext::IsUnhandledInterCUReference(
 // parsing. This is for data shared across the CU's entire DIE tree,
 // and parameters from the code invoking the CU parser.
 struct DwarfCUToModule::CUContext {
-  CUContext(FileContext* file_context_arg, WarningReporter* reporter_arg,
-            RangesHandler* ranges_handler_arg)
+  CUContext(FileContext* file_context_arg,
+            WarningReporter* reporter_arg,
+            RangesHandler* ranges_handler_arg,
+            uint64_t low_pc,
+            uint64_t addr_base)
       : version(0),
         file_context(file_context_arg),
         reporter(reporter_arg),
         ranges_handler(ranges_handler_arg),
         language(Language::CPlusPlus),
-        low_pc(0),
+        low_pc(low_pc),
         high_pc(0),
         ranges_form(DW_FORM_sec_offset),
         ranges_data(0),
         ranges_base(0),
-        str_offsets_base(0) { }
+        addr_base(addr_base),
+        str_offsets_base(0) {}
 
   ~CUContext() {
     for (vector<Module::Function*>::iterator it = functions.begin();
@@ -326,7 +334,10 @@ class DwarfCUToModule::GenericDIEHandler: public DIEHandler {
   // Use this from EndAttributes member functions, not ProcessAttribute*
   // functions; only the former can be sure that all the DIE's attributes
   // have been seen.
-  StringView ComputeQualifiedName();
+  //
+  // On return, if has_qualified_name is non-NULL, *has_qualified_name is set to
+  // true if the DIE includes a fully-qualified name, false otherwise.
+  StringView ComputeQualifiedName(bool* has_qualified_name);
 
   CUContext* cu_context_;
   DIEContext* parent_context_;
@@ -462,7 +473,8 @@ void DwarfCUToModule::GenericDIEHandler::ProcessAttributeString(
   }
 }
 
-StringView DwarfCUToModule::GenericDIEHandler::ComputeQualifiedName() {
+StringView DwarfCUToModule::GenericDIEHandler::ComputeQualifiedName(
+    bool* has_qualified_name) {
   // Use the demangled name, if one is available. Demangled names are
   // preferable to those inferred from the DWARF structure because they
   // include argument types.
@@ -478,6 +490,15 @@ StringView DwarfCUToModule::GenericDIEHandler::ComputeQualifiedName() {
   StringView* unqualified_name = nullptr;
   StringView* enclosing_name = nullptr;
   if (!qualified_name) {
+    if (has_qualified_name) {
+      // dSYMs built with -gmlt do not include the DW_AT_linkage_name
+      // with the unmangled symbol, but rather include it in the
+      // LC_SYMTAB STABS, which end up in the externs of the module.
+      //
+      // Remember this so the Module can copy over the extern name later.
+      *has_qualified_name = false;
+    }
+
     // Find the unqualified name. If the DIE has its own DW_AT_name
     // attribute, then use that; otherwise, check the specification.
     if (!name_attribute_.empty()) {
@@ -496,6 +517,10 @@ StringView DwarfCUToModule::GenericDIEHandler::ComputeQualifiedName() {
     } else if (parent_context_) {
       enclosing_name = &parent_context_->name;
     }
+  } else {
+    if (has_qualified_name) {
+      *has_qualified_name = true;
+    }
   }
 
   // Prepare the return value before upcoming mutations possibly invalidate the
@@ -554,6 +579,7 @@ class DwarfCUToModule::InlineHandler : public GenericDIEHandler {
         ranges_data_(0),
         call_site_line_(0),
         inline_nest_level_(inline_nest_level),
+        has_range_data_(false),
         inlines_(inlines) {}
 
   void ProcessAttributeUnsigned(enum DwarfAttribute attr,
@@ -575,6 +601,7 @@ class DwarfCUToModule::InlineHandler : public GenericDIEHandler {
   int call_site_line_;         // DW_AT_call_line
   int call_site_file_id_;      // DW_AT_call_file
   int inline_nest_level_;
+  bool has_range_data_;
   // A vector of inlines in the same nest level. It's owned by its parent
   // function/inline. At Finish(), add this inline into the vector.
   vector<unique_ptr<Module::Inline>>& inlines_;
@@ -595,6 +622,7 @@ void DwarfCUToModule::InlineHandler::ProcessAttributeUnsigned(
       high_pc_ = data;
       break;
     case DW_AT_ranges:
+      has_range_data_ = true;
       ranges_data_ = data;
       ranges_form_ = form;
       break;
@@ -638,7 +666,7 @@ bool DwarfCUToModule::InlineHandler::EndAttributes() {
 void DwarfCUToModule::InlineHandler::Finish() {
   vector<Module::Range> ranges;
 
-  if (low_pc_ && high_pc_) {
+  if (!has_range_data_) {
     if (high_pc_form_ != DW_FORM_addr &&
         high_pc_form_ != DW_FORM_GNU_addr_index &&
         high_pc_form_ != DW_FORM_addrx &&
@@ -675,11 +703,12 @@ void DwarfCUToModule::InlineHandler::Finish() {
   // Every DW_TAG_inlined_subroutine should have a DW_AT_abstract_origin.
   assert(specification_offset_ != 0);
 
-  cu_context_->file_context->module_->inline_origin_map.SetReference(
-      specification_offset_, specification_offset_);
+  Module::InlineOriginMap& inline_origin_map =
+      cu_context_->file_context->module_
+          ->inline_origin_maps[cu_context_->file_context->filename_];
+  inline_origin_map.SetReference(specification_offset_, specification_offset_);
   Module::InlineOrigin* origin =
-      cu_context_->file_context->module_->inline_origin_map
-          .GetOrCreateInlineOrigin(specification_offset_, name_);
+      inline_origin_map.GetOrCreateInlineOrigin(specification_offset_, name_);
   unique_ptr<Module::Inline> in(
       new Module::Inline(origin, ranges, call_site_line_, call_site_file_id_,
                          inline_nest_level_, std::move(child_inlines_)));
@@ -718,7 +747,9 @@ class DwarfCUToModule::FuncHandler: public GenericDIEHandler {
         ranges_form_(DW_FORM_sec_offset),
         ranges_data_(0),
         inline_(false),
-        handle_inline_(handle_inline) {}
+        handle_inline_(handle_inline),
+        has_qualified_name_(false),
+        has_range_data_(false) {}
 
   void ProcessAttributeUnsigned(enum DwarfAttribute attr,
                                 enum DwarfForm form,
@@ -741,6 +772,8 @@ class DwarfCUToModule::FuncHandler: public GenericDIEHandler {
   bool inline_;
   vector<unique_ptr<Module::Inline>> child_inlines_;
   bool handle_inline_;
+  bool has_qualified_name_;
+  bool has_range_data_;
   DIEContext child_context_; // A context for our children.
 };
 
@@ -760,6 +793,7 @@ void DwarfCUToModule::FuncHandler::ProcessAttributeUnsigned(
       high_pc_ = data;
       break;
     case DW_AT_ranges:
+      has_range_data_ = true;
       ranges_data_ = data;
       ranges_form_ = form;
       break;
@@ -804,7 +838,7 @@ DIEHandler* DwarfCUToModule::FuncHandler::FindChildHandler(
 
 bool DwarfCUToModule::FuncHandler::EndAttributes() {
   // Compute our name, and record a specification, if appropriate.
-  name_ = ComputeQualifiedName();
+  name_ = ComputeQualifiedName(&has_qualified_name_);
   if (name_.empty() && abstract_origin_) {
     name_ = abstract_origin_->name;
   }
@@ -830,7 +864,7 @@ void DwarfCUToModule::FuncHandler::Finish() {
       iter->second->name = name_;
   }
 
-  if (!ranges_data_) {
+  if (!has_range_data_) {
     // Make high_pc_ an address, if it isn't already.
     if (high_pc_form_ != DW_FORM_addr &&
         high_pc_form_ != DW_FORM_GNU_addr_index &&
@@ -877,6 +911,9 @@ void DwarfCUToModule::FuncHandler::Finish() {
     scoped_ptr<Module::Function> func(new Module::Function(name, low_pc_));
     func->ranges = ranges;
     func->parameter_size = 0;
+    // If the name was unqualified, prefer the Extern name if there's a mismatch
+    // (the Extern name will be fully-qualified in that case).
+    func->prefer_extern_name = !has_qualified_name_;
     if (func->address) {
       // If the function address is zero this is a sign that this function
       // description is just empty debug data and should just be discarded.
@@ -903,15 +940,16 @@ void DwarfCUToModule::FuncHandler::Finish() {
     StringView name = name_.empty() ? name_omitted : name_;
     uint64_t offset =
         specification_offset_ != 0 ? specification_offset_ : offset_;
-    cu_context_->file_context->module_->inline_origin_map.SetReference(offset_,
-                                                                       offset);
-    cu_context_->file_context->module_->inline_origin_map
-        .GetOrCreateInlineOrigin(offset_, name);
+    Module::InlineOriginMap& inline_origin_map =
+        cu_context_->file_context->module_
+            ->inline_origin_maps[cu_context_->file_context->filename_];
+    inline_origin_map.SetReference(offset_, offset);
+    inline_origin_map.GetOrCreateInlineOrigin(offset_, name);
   }
 }
 
 bool DwarfCUToModule::NamedScopeHandler::EndAttributes() {
-  child_context_.name = ComputeQualifiedName();
+  child_context_.name = ComputeQualifiedName(NULL);
   if (child_context_.name.empty() && no_specification) {
     cu_context_->reporter->UnknownSpecification(offset_, specification_offset_);
   }
@@ -1041,12 +1079,21 @@ DwarfCUToModule::DwarfCUToModule(FileContext* file_context,
                                  LineToModuleHandler* line_reader,
                                  RangesHandler* ranges_handler,
                                  WarningReporter* reporter,
-                                 bool handle_inline)
+                                 bool handle_inline,
+                                 uint64_t low_pc,
+                                 uint64_t addr_base,
+                                 bool has_source_line_info,
+                                 uint64_t source_line_offset)
     : RootDIEHandler(handle_inline),
       line_reader_(line_reader),
-      cu_context_(new CUContext(file_context, reporter, ranges_handler)),
+      cu_context_(new CUContext(file_context,
+                                reporter,
+                                ranges_handler,
+                                low_pc,
+                                addr_base)),
       child_context_(new DIEContext()),
-      has_source_line_info_(false) {}
+      has_source_line_info_(has_source_line_info),
+      source_line_offset_(source_line_offset) {}
 
 DwarfCUToModule::~DwarfCUToModule() {
 }
diff --git a/external_imported/sentry-native/external/breakpad/src/common/dwarf_cu_to_module.h b/external_imported/sentry-native/external/breakpad/src/common/dwarf_cu_to_module.h
index 5a8001042..1ff0ebc7f 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/dwarf_cu_to_module.h
+++ b/external_imported/sentry-native/external/breakpad/src/common/dwarf_cu_to_module.h
@@ -264,7 +264,11 @@ class DwarfCUToModule: public RootDIEHandler {
                   LineToModuleHandler* line_reader,
                   RangesHandler* ranges_handler,
                   WarningReporter* reporter,
-                  bool handle_inline = false);
+                  bool handle_inline = false,
+                  uint64_t low_pc = 0,
+                  uint64_t addr_base = 0,
+                  bool has_source_line_info = false,
+                  uint64_t source_line_offset = 0);
   ~DwarfCUToModule();
 
   void ProcessAttributeSigned(enum DwarfAttribute attr,
diff --git a/external_imported/sentry-native/external/breakpad/src/common/dwarf_cu_to_module_unittest.cc b/external_imported/sentry-native/external/breakpad/src/common/dwarf_cu_to_module_unittest.cc
index f3fa49032..134b2c243 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/dwarf_cu_to_module_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/dwarf_cu_to_module_unittest.cc
@@ -30,6 +30,10 @@
 
 // dwarf_cu_to_module.cc: Unit tests for google_breakpad::DwarfCUToModule.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <stdint.h>
 
 #include <string>
@@ -263,6 +267,10 @@ class CUFixtureBase {
   void TestFunction(int i, const string& name,
                     Module::Address address, Module::Address size);
 
+  // Test that the I'th function (ordered by address) in the module
+  // this.module_ has the given prefer_extern_name.
+  void TestFunctionPreferExternName(int i, bool prefer_extern_name);
+
   // Test that the number of source lines owned by the I'th function
   // in the module this.module_ is equal to EXPECTED.
   void TestLineCount(int i, size_t expected);
@@ -611,6 +619,15 @@ void CUFixtureBase::TestFunction(int i, const string& name,
   EXPECT_EQ(0U,      function->parameter_size);
 }
 
+void CUFixtureBase::TestFunctionPreferExternName(int i,
+                                                 bool prefer_extern_name) {
+  FillFunctions();
+  ASSERT_LT((size_t)i, functions_.size());
+
+  Module::Function* function = functions_[i];
+  EXPECT_EQ(prefer_extern_name, function->prefer_extern_name);
+}
+
 void CUFixtureBase::TestLineCount(int i, size_t expected) {
   FillFunctions();
   ASSERT_LT((size_t) i, functions_.size());
diff --git a/external_imported/sentry-native/external/breakpad/src/common/dwarf_line_to_module.cc b/external_imported/sentry-native/external/breakpad/src/common/dwarf_line_to_module.cc
index e716d483c..940ab2d69 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/dwarf_line_to_module.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/dwarf_line_to_module.cc
@@ -31,6 +31,10 @@
 // dwarf_line_to_module.cc: Implementation of DwarfLineToModule class.
 // See dwarf_line_to_module.h for details. 
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <stdio.h>
 
 #include <string>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/dwarf_line_to_module_unittest.cc b/external_imported/sentry-native/external/breakpad/src/common/dwarf_line_to_module_unittest.cc
index c4a02dfa2..9eb1469fa 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/dwarf_line_to_module_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/dwarf_line_to_module_unittest.cc
@@ -30,6 +30,10 @@
 
 // dwarf_line_to_module.cc: Unit tests for google_breakpad::DwarfLineToModule.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <vector>
 
 #include "breakpad_googletest_includes.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/common/dwarf_range_list_handler.cc b/external_imported/sentry-native/external/breakpad/src/common/dwarf_range_list_handler.cc
index 4d3dbd2eb..c40a5c3bc 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/dwarf_range_list_handler.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/dwarf_range_list_handler.cc
@@ -32,6 +32,10 @@
 // dwarf_range_list_handler.cc: Implementation of DwarfRangeListHandler class.
 // See dwarf_range_list_handler.h for details.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <algorithm>
 
 #include "common/dwarf_range_list_handler.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/common/language.cc b/external_imported/sentry-native/external/breakpad/src/common/language.cc
index 0096a8d1e..61693a8cd 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/language.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/language.cc
@@ -31,6 +31,10 @@
 // language.cc: Subclasses and singletons for google_breakpad::Language.
 // See language.h for details.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/language.h"
 
 #include <stdlib.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/linux/breakpad_getcontext.h b/external_imported/sentry-native/external/breakpad/src/common/linux/breakpad_getcontext.h
index c553219f8..d64784d46 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/linux/breakpad_getcontext.h
+++ b/external_imported/sentry-native/external/breakpad/src/common/linux/breakpad_getcontext.h
@@ -29,10 +29,6 @@
 #ifndef GOOGLE_BREAKPAD_COMMON_LINUX_INCLUDE_UCONTEXT_H
 #define GOOGLE_BREAKPAD_COMMON_LINUX_INCLUDE_UCONTEXT_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifndef HAVE_GETCONTEXT
 
 #include <signal.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/linux/breakpad_getcontext_unittest.cc b/external_imported/sentry-native/external/breakpad/src/common/linux/breakpad_getcontext_unittest.cc
index 573ddd88c..5b340eb74 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/linux/breakpad_getcontext_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/linux/breakpad_getcontext_unittest.cc
@@ -29,6 +29,10 @@
 // asm/sigcontext.h can't be included with signal.h on glibc or
 // musl, so only compare _libc_fpstate and _fpstate on Android.
 #if defined(__ANDROID__) && defined(__x86_64__)
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <asm/sigcontext.h>
 #endif
 
diff --git a/external_imported/sentry-native/external/breakpad/src/common/linux/crc32.cc b/external_imported/sentry-native/external/breakpad/src/common/linux/crc32.cc
index c02f06c4f..cf386a24c 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/linux/crc32.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/linux/crc32.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/linux/crc32.h"
 
 namespace google_breakpad {
diff --git a/external_imported/sentry-native/external/breakpad/src/common/linux/dump_symbols.cc b/external_imported/sentry-native/external/breakpad/src/common/linux/dump_symbols.cc
index b436f7653..b693fc9e1 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/linux/dump_symbols.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/linux/dump_symbols.cc
@@ -31,6 +31,10 @@
 // dump_symbols.cc: implement google_breakpad::WriteSymbolFile:
 // Find all the debugging info in a file and dump it as a Breakpad symbol file.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/linux/dump_symbols.h"
 
 #include <assert.h>
@@ -47,6 +51,9 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <zlib.h>
+#ifdef HAVE_LIBZSTD
+#include <zstd.h>
+#endif
 
 #include <set>
 #include <string>
@@ -104,6 +111,11 @@ using google_breakpad::wasteful_vector;
 #define EM_AARCH64      183
 #endif
 
+// Define ZStd compression if host machine does not include this define.
+#ifndef ELFCOMPRESS_ZSTD
+#define ELFCOMPRESS_ZSTD 2
+#endif
+
 //
 // FDWrapper
 //
@@ -301,7 +313,7 @@ uint32_t GetCompressionHeader(
   return sizeof (*header);
 }
 
-std::pair<uint8_t *, uint64_t> UncompressSectionContents(
+std::pair<uint8_t *, uint64_t> UncompressZlibSectionContents(
     const uint8_t* compressed_buffer, uint64_t compressed_size, uint64_t uncompressed_size) {
   z_stream stream;
   memset(&stream, 0, sizeof stream);
@@ -330,6 +342,90 @@ std::pair<uint8_t *, uint64_t> UncompressSectionContents(
     : std::make_pair(uncompressed_buffer.release(), uncompressed_size);
 }
 
+#ifdef HAVE_LIBZSTD
+std::pair<uint8_t *, uint64_t> UncompressZstdSectionContents(
+    const uint8_t* compressed_buffer, uint64_t compressed_size,uint64_t uncompressed_size) {
+
+  google_breakpad::scoped_array<uint8_t> uncompressed_buffer(new uint8_t[uncompressed_size]);
+  size_t out_size = ZSTD_decompress(uncompressed_buffer.get(), uncompressed_size,
+    compressed_buffer, compressed_size);
+  if (ZSTD_isError(out_size)) {
+    return std::make_pair(nullptr, 0);
+  }
+  assert(out_size == uncompressed_size);
+  return std::make_pair(uncompressed_buffer.release(), uncompressed_size);
+}
+#endif
+
+std::pair<uint8_t *, uint64_t> UncompressSectionContents(
+    uint64_t compression_type, const uint8_t* compressed_buffer,
+    uint64_t compressed_size, uint64_t uncompressed_size) {
+  if (compression_type == ELFCOMPRESS_ZLIB) {
+    return UncompressZlibSectionContents(compressed_buffer, compressed_size, uncompressed_size);
+  }
+
+#ifdef HAVE_LIBZSTD
+  if (compression_type == ELFCOMPRESS_ZSTD) {
+    return UncompressZstdSectionContents(compressed_buffer, compressed_size, uncompressed_size);
+  }
+#endif
+
+  return std::make_pair(nullptr, 0);
+}
+
+void StartProcessSplitDwarf(google_breakpad::CompilationUnit* reader,
+                            Module* module,
+                            google_breakpad::Endianness endianness,
+                            bool handle_inter_cu_refs,
+                            bool handle_inline) {
+  std::string split_file;
+  google_breakpad::SectionMap split_sections;
+  google_breakpad::ByteReader split_byte_reader(endianness);
+  uint64_t cu_offset = 0;
+  if (!reader->ProcessSplitDwarf(split_file, split_sections, split_byte_reader,
+                                 cu_offset))
+    return;
+  DwarfCUToModule::FileContext file_context(split_file, module,
+                                            handle_inter_cu_refs);
+  for (auto section : split_sections)
+    file_context.AddSectionToSectionMap(section.first, section.second.first,
+                                        section.second.second);
+  // Because DWP/DWO file doesn't have .debug_addr/.debug_line/.debug_line_str,
+  // its debug info will refer to .debug_addr/.debug_line in the main binary.
+  if (file_context.section_map().find(".debug_addr") ==
+      file_context.section_map().end())
+    file_context.AddSectionToSectionMap(".debug_addr", reader->GetAddrBuffer(),
+                                        reader->GetAddrBufferLen());
+  if (file_context.section_map().find(".debug_line") ==
+      file_context.section_map().end())
+    file_context.AddSectionToSectionMap(".debug_line", reader->GetLineBuffer(),
+                                        reader->GetLineBufferLen());
+  if (file_context.section_map().find(".debug_line_str") ==
+      file_context.section_map().end())
+    file_context.AddSectionToSectionMap(".debug_line_str",
+                                        reader->GetLineStrBuffer(),
+                                        reader->GetLineStrBufferLen());
+
+  DumperRangesHandler ranges_handler(&split_byte_reader);
+  DumperLineToModule line_to_module(&split_byte_reader);
+  DwarfCUToModule::WarningReporter reporter(split_file, cu_offset);
+  DwarfCUToModule root_handler(
+      &file_context, &line_to_module, &ranges_handler, &reporter, handle_inline,
+      reader->GetLowPC(), reader->GetAddrBase(), reader->HasSourceLineInfo(),
+      reader->GetSourceLineOffset());
+  google_breakpad::DIEDispatcher die_dispatcher(&root_handler);
+  google_breakpad::CompilationUnit split_reader(
+      split_file, file_context.section_map(), cu_offset, &split_byte_reader,
+      &die_dispatcher);
+  split_reader.SetSplitDwarf(reader->GetAddrBase(), reader->GetDWOID());
+  split_reader.Start();
+  // Normally, it won't happen unless we have transitive reference.
+  if (split_reader.ShouldProcessSplitDwarf()) {
+    StartProcessSplitDwarf(&split_reader, module, endianness,
+                           handle_inter_cu_refs, handle_inline);
+  }
+}
+
 template<typename ElfClass>
 bool LoadDwarf(const string& dwarf_filename,
                const typename ElfClass::Ehdr* elf_header,
@@ -380,7 +476,7 @@ bool LoadDwarf(const string& dwarf_filename,
     size -= compression_header_size;
 
     std::pair<uint8_t *, uint64_t> uncompressed =
-      UncompressSectionContents(contents, size, chdr.ch_size);
+      UncompressSectionContents(chdr.ch_type, contents, size, chdr.ch_size);
 
     if (uncompressed.first != nullptr && uncompressed.second != 0) {
       file_context.AddManagedSectionToSectionMap(name, uncompressed.first, uncompressed.second);
@@ -417,6 +513,11 @@ bool LoadDwarf(const string& dwarf_filename,
                                          &die_dispatcher);
     // Process the entire compilation unit; get the offset of the next.
     offset += reader.Start();
+    // Start to process split dwarf file.
+    if (reader.ShouldProcessSplitDwarf()) {
+      StartProcessSplitDwarf(&reader, module, endianness, handle_inter_cu_refs,
+                             handle_inline);
+    }
   }
   return true;
 }
@@ -445,6 +546,9 @@ bool DwarfCFIRegisterNames(const typename ElfClass::Ehdr* elf_header,
     case EM_X86_64:
       *register_names = DwarfCFIToModule::RegisterNames::X86_64();
       return true;
+    case EM_RISCV:
+      *register_names = DwarfCFIToModule::RegisterNames::RISCV();
+      return true;
     default:
       return false;
   }
@@ -522,7 +626,7 @@ bool LoadDwarfCFI(const string& dwarf_filename,
   cfi_size -= compression_header_size;
 
   std::pair<uint8_t *, uint64_t> uncompressed =
-    UncompressSectionContents(cfi, cfi_size, chdr.ch_size);
+    UncompressSectionContents(chdr.ch_type, cfi, cfi_size, chdr.ch_size);
 
   if (uncompressed.first == nullptr || uncompressed.second == 0) {
     fprintf(stderr, "%s: decompression failed\n", dwarf_filename.c_str());
@@ -1018,6 +1122,7 @@ const char* ElfArchitecture(const typename ElfClass::Ehdr* elf_header) {
     case EM_SPARC:      return "sparc";
     case EM_SPARCV9:    return "sparcv9";
     case EM_X86_64:     return "x86_64";
+    case EM_RISCV:      return "riscv";
     default: return NULL;
   }
 }
diff --git a/external_imported/sentry-native/external/breakpad/src/common/linux/dump_symbols_unittest.cc b/external_imported/sentry-native/external/breakpad/src/common/linux/dump_symbols_unittest.cc
index 97d5827e2..55dcdeed8 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/linux/dump_symbols_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/linux/dump_symbols_unittest.cc
@@ -31,6 +31,10 @@
 // dump_symbols_unittest.cc:
 // Unittests for google_breakpad::DumpSymbols
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <elf.h>
 #include <link.h>
 #include <stdio.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/linux/elf_core_dump.cc b/external_imported/sentry-native/external/breakpad/src/common/linux/elf_core_dump.cc
index f5ee30337..67257fd27 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/linux/elf_core_dump.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/linux/elf_core_dump.cc
@@ -29,6 +29,10 @@
 // elf_core_dump.cc: Implement google_breakpad::ElfCoreDump.
 // See elf_core_dump.h for details.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/linux/elf_core_dump.h"
 
 #include <stddef.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/linux/elf_core_dump_unittest.cc b/external_imported/sentry-native/external/breakpad/src/common/linux/elf_core_dump_unittest.cc
index 6789dd84c..25cab99f8 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/linux/elf_core_dump_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/linux/elf_core_dump_unittest.cc
@@ -28,6 +28,10 @@
 
 // elf_core_dump_unittest.cc: Unit tests for google_breakpad::ElfCoreDump.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <sys/procfs.h>
 
 #include <set>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/linux/elf_symbols_to_module.cc b/external_imported/sentry-native/external/breakpad/src/common/linux/elf_symbols_to_module.cc
index 3c33be99a..70d50f891 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/linux/elf_symbols_to_module.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/linux/elf_symbols_to_module.cc
@@ -30,6 +30,10 @@
 
 // Original author: Ted Mielczarek <ted.mielczarek@gmail.com>
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/linux/elf_symbols_to_module.h"
 
 #include <cxxabi.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/linux/elf_symbols_to_module_unittest.cc b/external_imported/sentry-native/external/breakpad/src/common/linux/elf_symbols_to_module_unittest.cc
index 17eb670ff..a74b29f0f 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/linux/elf_symbols_to_module_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/linux/elf_symbols_to_module_unittest.cc
@@ -31,6 +31,10 @@
 // elf_symbols_to_module_unittest.cc:
 // Unittests for google_breakpad::ELFSymbolsToModule
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <elf.h>
 
 #include <string>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/linux/elfutils.cc b/external_imported/sentry-native/external/breakpad/src/common/linux/elfutils.cc
index a68cc0af3..95b5db829 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/linux/elfutils.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/linux/elfutils.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/linux/elfutils.h"
 
 #include <assert.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/linux/file_id.cc b/external_imported/sentry-native/external/breakpad/src/common/linux/file_id.cc
index 0bd2a759e..d8fcbd8d6 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/linux/file_id.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/linux/file_id.cc
@@ -31,6 +31,10 @@
 // See file_id.h for documentation
 //
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/linux/file_id.h"
 
 #include <arpa/inet.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/linux/file_id_unittest.cc b/external_imported/sentry-native/external/breakpad/src/common/linux/file_id_unittest.cc
index 74bf9e1b5..0ef453532 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/linux/file_id_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/linux/file_id_unittest.cc
@@ -28,6 +28,10 @@
 
 // Unit tests for FileID
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <elf.h>
 #include <spawn.h>
 #include <stdlib.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/linux/google_crashdump_uploader.cc b/external_imported/sentry-native/external/breakpad/src/common/linux/google_crashdump_uploader.cc
index 6242e6d23..8c5e04925 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/linux/google_crashdump_uploader.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/linux/google_crashdump_uploader.cc
@@ -27,6 +27,10 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/linux/google_crashdump_uploader.h"
 
 #include <sys/types.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/linux/google_crashdump_uploader_test.cc b/external_imported/sentry-native/external/breakpad/src/common/linux/google_crashdump_uploader_test.cc
index 39aab65d0..e81f21d64 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/linux/google_crashdump_uploader_test.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/linux/google_crashdump_uploader_test.cc
@@ -28,6 +28,10 @@
 
 // Unit test for crash dump uploader.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <string>
 
 #include "common/linux/google_crashdump_uploader.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/common/linux/guid_creator.cc b/external_imported/sentry-native/external/breakpad/src/common/linux/guid_creator.cc
index 31a326c71..8635f9dc0 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/linux/guid_creator.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/linux/guid_creator.cc
@@ -27,7 +27,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <config.h>  // Must come first
 #endif
 
 #include "common/linux/eintr_wrapper.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/common/linux/http_upload.cc b/external_imported/sentry-native/external/breakpad/src/common/linux/http_upload.cc
index 1b576ea60..0a5bdb502 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/linux/http_upload.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/linux/http_upload.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/linux/http_upload.h"
 
 #include <assert.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/linux/libcurl_wrapper.cc b/external_imported/sentry-native/external/breakpad/src/common/linux/libcurl_wrapper.cc
index a53087d9c..2b6390981 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/linux/libcurl_wrapper.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/linux/libcurl_wrapper.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <dlfcn.h>
 
 #include <iostream>
@@ -303,12 +307,10 @@ bool LibcurlWrapper::SendRequestInner(const string& url,
     (*easy_getinfo_)(curl_, CURLINFO_RESPONSE_CODE, http_status_code);
   }
 
-#ifndef NDEBUG
   if (err_code != CURLE_OK)
     fprintf(stderr, "Failed to send http request to %s, error: %s\n",
             url.c_str(),
             (*easy_strerror_)(err_code));
-#endif
 
   Reset();
 
diff --git a/external_imported/sentry-native/external/breakpad/src/common/linux/linux_libc_support.cc b/external_imported/sentry-native/external/breakpad/src/common/linux/linux_libc_support.cc
index 10cbeaef1..abcbfde8a 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/linux/linux_libc_support.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/linux/linux_libc_support.cc
@@ -30,6 +30,10 @@
 // we call the libc functions directly we risk crashing in the dynamic linker
 // as it tries to resolve uncached PLT entries.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/linux/linux_libc_support.h"
 
 #include <stddef.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/linux/linux_libc_support_unittest.cc b/external_imported/sentry-native/external/breakpad/src/common/linux/linux_libc_support_unittest.cc
index 449f995fc..30dd1430c 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/linux/linux_libc_support_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/linux/linux_libc_support_unittest.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "breakpad_googletest_includes.h"
 #include "common/linux/linux_libc_support.h"
 
diff --git a/external_imported/sentry-native/external/breakpad/src/common/linux/memory_mapped_file.cc b/external_imported/sentry-native/external/breakpad/src/common/linux/memory_mapped_file.cc
index 7e4446070..a7b96eb59 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/linux/memory_mapped_file.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/linux/memory_mapped_file.cc
@@ -29,6 +29,10 @@
 // memory_mapped_file.cc: Implement google_breakpad::MemoryMappedFile.
 // See memory_mapped_file.h for details.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/linux/memory_mapped_file.h"
 
 #include <fcntl.h>
@@ -57,8 +61,11 @@ MemoryMappedFile::~MemoryMappedFile() {
 
 bool MemoryMappedFile::Map(const char* path, size_t offset) {
   Unmap();
-
-  int fd = sys_open(path, O_RDONLY, 0);
+  // Based on https://pubs.opengroup.org/onlinepubs/7908799/xsh/open.html
+  // If O_NONBLOCK is set: The open() function will return without blocking
+  // for the device to be ready or available. Setting this value will provent
+  // hanging if file is not avilable.
+  int fd = sys_open(path, O_RDONLY | O_NONBLOCK, 0);
   if (fd == -1) {
     return false;
   }
diff --git a/external_imported/sentry-native/external/breakpad/src/common/linux/memory_mapped_file.h b/external_imported/sentry-native/external/breakpad/src/common/linux/memory_mapped_file.h
index d4a85051e..462e116eb 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/linux/memory_mapped_file.h
+++ b/external_imported/sentry-native/external/breakpad/src/common/linux/memory_mapped_file.h
@@ -33,7 +33,7 @@
 #define COMMON_LINUX_MEMORY_MAPPED_FILE_H_
 
 #include <stddef.h>
-#include "common/basictypes.h"
+
 #include "common/memory_range.h"
 
 namespace google_breakpad {
@@ -49,6 +49,9 @@ class MemoryMappedFile {
   // If Map() fails, the object behaves as if it is default constructed.
   MemoryMappedFile(const char* path, size_t offset);
 
+  MemoryMappedFile(const MemoryMappedFile&) = delete;
+  void operator=(const MemoryMappedFile&) = delete;
+
   ~MemoryMappedFile();
 
   // Maps a file at |path| into memory, which can then be accessed via
@@ -77,8 +80,6 @@ class MemoryMappedFile {
  private:
   // Mapped file content as a MemoryRange object.
   MemoryRange content_;
-
-  DISALLOW_COPY_AND_ASSIGN(MemoryMappedFile);
 };
 
 }  // namespace google_breakpad
diff --git a/external_imported/sentry-native/external/breakpad/src/common/linux/memory_mapped_file_unittest.cc b/external_imported/sentry-native/external/breakpad/src/common/linux/memory_mapped_file_unittest.cc
index 5ed677df8..b7a61a70e 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/linux/memory_mapped_file_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/linux/memory_mapped_file_unittest.cc
@@ -29,6 +29,10 @@
 // memory_mapped_file_unittest.cc:
 // Unit tests for google_breakpad::MemoryMappedFile.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <fcntl.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/linux/safe_readlink.cc b/external_imported/sentry-native/external/breakpad/src/common/linux/safe_readlink.cc
index 97ea62c03..a42b01a5f 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/linux/safe_readlink.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/linux/safe_readlink.cc
@@ -29,6 +29,10 @@
 // safe_readlink.cc: Implement google_breakpad::SafeReadLink.
 // See safe_readlink.h for details.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <stddef.h>
 
 #include "third_party/lss/linux_syscall_support.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/common/linux/safe_readlink_unittest.cc b/external_imported/sentry-native/external/breakpad/src/common/linux/safe_readlink_unittest.cc
index 6f5f9d753..8fa6d0656 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/linux/safe_readlink_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/linux/safe_readlink_unittest.cc
@@ -28,6 +28,10 @@
 
 // safe_readlink_unittest.cc: Unit tests for google_breakpad::SafeReadLink.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "breakpad_googletest_includes.h"
 #include "common/linux/safe_readlink.h"
 
diff --git a/external_imported/sentry-native/external/breakpad/src/common/linux/scoped_pipe.cc b/external_imported/sentry-native/external/breakpad/src/common/linux/scoped_pipe.cc
index b13f8d459..8de04ce95 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/linux/scoped_pipe.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/linux/scoped_pipe.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/linux/scoped_pipe.h"
 
 #include <unistd.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/linux/scoped_pipe_unittest.cc b/external_imported/sentry-native/external/breakpad/src/common/linux/scoped_pipe_unittest.cc
index a7d6272cf..4daa5c255 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/linux/scoped_pipe_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/linux/scoped_pipe_unittest.cc
@@ -28,6 +28,10 @@
 
 // scoped_pipe_unittest.cc: Unit tests for google_breakpad::ScopedPipe.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/linux/scoped_pipe.h"
 
 #include "breakpad_googletest_includes.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/common/linux/scoped_tmpfile.cc b/external_imported/sentry-native/external/breakpad/src/common/linux/scoped_tmpfile.cc
index 229e8d42c..2395a64e8 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/linux/scoped_tmpfile.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/linux/scoped_tmpfile.cc
@@ -29,6 +29,10 @@
 // Utility class for creating a temporary file that is deleted in the
 // destructor.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/linux/scoped_tmpfile.h"
 
 #include <fcntl.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/linux/scoped_tmpfile_unittest.cc b/external_imported/sentry-native/external/breakpad/src/common/linux/scoped_tmpfile_unittest.cc
index f82c5998b..f0bb2bbb4 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/linux/scoped_tmpfile_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/linux/scoped_tmpfile_unittest.cc
@@ -28,6 +28,10 @@
 
 // scoped_tmpfile_unittest.cc: Unit tests for google_breakpad::ScopedTmpfile.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/linux/scoped_tmpfile.h"
 
 #include <unistd.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/linux/symbol_collector_client.cc b/external_imported/sentry-native/external/breakpad/src/common/linux/symbol_collector_client.cc
index 1c1dc97a5..e9a1893c2 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/linux/symbol_collector_client.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/linux/symbol_collector_client.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/linux/symbol_collector_client.h"
 
 #include <stdio.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/linux/symbol_upload.cc b/external_imported/sentry-native/external/breakpad/src/common/linux/symbol_upload.cc
index c080533af..8ab143c6f 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/linux/symbol_upload.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/linux/symbol_upload.cc
@@ -29,6 +29,10 @@
 // symbol_upload.cc: implemented google_breakpad::sym_upload::Start, a helper
 // function for linux symbol upload tool.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/linux/symbol_upload.h"
 
 #include <assert.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/linux/synth_elf.cc b/external_imported/sentry-native/external/breakpad/src/common/linux/synth_elf.cc
index 2ba25e611..8e9170e7f 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/linux/synth_elf.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/linux/synth_elf.cc
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/linux/synth_elf.h"
 
 #include <assert.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/linux/synth_elf_unittest.cc b/external_imported/sentry-native/external/breakpad/src/common/linux/synth_elf_unittest.cc
index 44ef6ef3b..578f6a261 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/linux/synth_elf_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/linux/synth_elf_unittest.cc
@@ -31,6 +31,10 @@
 // synth_elf_unittest.cc:
 // Unittests for google_breakpad::synth_elf::ELF
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <elf.h>
 
 #include "breakpad_googletest_includes.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/common/linux/tests/crash_generator.cc b/external_imported/sentry-native/external/breakpad/src/common/linux/tests/crash_generator.cc
index 0db0c4a24..1cad9ae26 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/linux/tests/crash_generator.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/linux/tests/crash_generator.cc
@@ -29,6 +29,10 @@
 // crash_generator.cc: Implement google_breakpad::CrashGenerator.
 // See crash_generator.h for details.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/linux/tests/crash_generator.h"
 
 #include <pthread.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/long_string_dictionary.cc b/external_imported/sentry-native/external/breakpad/src/common/long_string_dictionary.cc
index f504aa429..19a649e7b 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/long_string_dictionary.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/long_string_dictionary.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/long_string_dictionary.h"
 
 #include <assert.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/long_string_dictionary_unittest.cc b/external_imported/sentry-native/external/breakpad/src/common/long_string_dictionary_unittest.cc
index be34efdfc..f10dc0d97 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/long_string_dictionary_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/long_string_dictionary_unittest.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <algorithm>
 #include <string>
 
diff --git a/external_imported/sentry-native/external/breakpad/src/common/mac/arch_utilities.cc b/external_imported/sentry-native/external/breakpad/src/common/mac/arch_utilities.cc
index 392efe786..742108205 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/mac/arch_utilities.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/mac/arch_utilities.cc
@@ -26,113 +26,24 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/mac/arch_utilities.h"
 
+#include <mach/machine.h>
 #include <mach-o/arch.h>
 #include <mach-o/fat.h>
 #include <stdio.h>
 #include <string.h>
 
-#ifndef CPU_SUBTYPE_ARM_V7S
-#define CPU_SUBTYPE_ARM_V7S (static_cast<cpu_subtype_t>(11))
-#endif  // CPU_SUBTYPE_ARM_V7S
-
-#ifndef CPU_TYPE_ARM64
-#define CPU_TYPE_ARM64 (CPU_TYPE_ARM | CPU_ARCH_ABI64)
-#endif  // CPU_TYPE_ARM64
-
-#ifndef CPU_SUBTYPE_ARM64_ALL
-#define CPU_SUBTYPE_ARM64_ALL (static_cast<cpu_subtype_t>(0))
-#endif  // CPU_SUBTYPE_ARM64_ALL
-
-#ifndef CPU_SUBTYPE_ARM64_E
-#define CPU_SUBTYPE_ARM64_E (static_cast<cpu_subtype_t>(2))
-#endif  // CPU_SUBTYPE_ARM64_E
-
-namespace {
-
-const NXArchInfo* ArchInfo_arm64(cpu_subtype_t cpu_subtype) {
-  const char* name = NULL;
-  switch (cpu_subtype) {
-    case CPU_SUBTYPE_ARM64_ALL:
-      name = "arm64";
-      break;
-    case CPU_SUBTYPE_ARM64_E:
-      name = "arm64e";
-      break;
-    default:
-      return NULL;
-  }
-
-  NXArchInfo* arm64 = new NXArchInfo;
-  *arm64 = *NXGetArchInfoFromCpuType(CPU_TYPE_ARM,
-                                     CPU_SUBTYPE_ARM_V7);
-  arm64->name = name;
-  arm64->cputype = CPU_TYPE_ARM64;
-  arm64->cpusubtype = cpu_subtype;
-  arm64->description = "arm 64";
-  return arm64;
-}
-
-const NXArchInfo* ArchInfo_armv7s() {
-  NXArchInfo* armv7s = new NXArchInfo;
-  *armv7s = *NXGetArchInfoFromCpuType(CPU_TYPE_ARM,
-                                      CPU_SUBTYPE_ARM_V7);
-  armv7s->name = "armv7s";
-  armv7s->cpusubtype = CPU_SUBTYPE_ARM_V7S;
-  armv7s->description = "arm v7s";
-  return armv7s;
-}
-
-}  // namespace
-
-namespace google_breakpad {
-
-const NXArchInfo* BreakpadGetArchInfoFromName(const char* arch_name) {
-  // TODO: Remove this when the OS knows about arm64.
-  if (!strcmp("arm64", arch_name))
-    return BreakpadGetArchInfoFromCpuType(CPU_TYPE_ARM64,
-                                          CPU_SUBTYPE_ARM64_ALL);
-
-  if (!strcmp("arm64e", arch_name))
-    return BreakpadGetArchInfoFromCpuType(CPU_TYPE_ARM64,
-                                          CPU_SUBTYPE_ARM64_E);
-
-  // TODO: Remove this when the OS knows about armv7s.
-  if (!strcmp("armv7s", arch_name))
-    return BreakpadGetArchInfoFromCpuType(CPU_TYPE_ARM, CPU_SUBTYPE_ARM_V7S);
-
-  return NXGetArchInfoFromName(arch_name);
-}
-
-const NXArchInfo* BreakpadGetArchInfoFromCpuType(cpu_type_t cpu_type,
-                                                 cpu_subtype_t cpu_subtype) {
-  // TODO: Remove this when the OS knows about arm64.
-  if (cpu_type == CPU_TYPE_ARM64 && cpu_subtype == CPU_SUBTYPE_ARM64_ALL) {
-    static const NXArchInfo* arm64 = ArchInfo_arm64(cpu_subtype);
-    return arm64;
-  }
-
-  if (cpu_type == CPU_TYPE_ARM64 && cpu_subtype == CPU_SUBTYPE_ARM64_E) {
-    static const NXArchInfo* arm64e = ArchInfo_arm64(cpu_subtype);
-    return arm64e;
-  }
-
-  // TODO: Remove this when the OS knows about armv7s.
-  if (cpu_type == CPU_TYPE_ARM && cpu_subtype == CPU_SUBTYPE_ARM_V7S) {
-    static const NXArchInfo* armv7s = ArchInfo_armv7s();
-    return armv7s;
-  }
-
-  return NXGetArchInfoFromCpuType(cpu_type, cpu_subtype);
-}
-
-}  // namespace google_breakpad
+#if defined(__APPLE__) && (__MAC_OS_X_VERSION_MAX_ALLOWED >= 130000 || \
+                           __IPHONE_OS_VERSION_MAX_ALLOWED >= 160000 || \
+                           __TVOS_OS_VERSION_MAX_ALLOWED >= 160000)
+#include <mach-o/utils.h>
+#endif
 
-// TODO(crbug.com/1242776): The "#ifndef __APPLE__" should be here, but the
-// system version of NXGetLocalArchInfo returns incorrect information on
-// x86_64 machines (treating them as just x86), so use the Breakpad version
-// all the time for now.
 namespace {
 
 enum Architecture {
@@ -147,122 +58,122 @@ enum Architecture {
   kNumArchitectures
 };
 
+struct NamedArchInfo {
+  const char* name;
+  ArchInfo info;
+};
+
 // enum Architecture above and kKnownArchitectures below
 // must be kept in sync.
-const NXArchInfo kKnownArchitectures[] = {
-  {
-    "i386",
-    CPU_TYPE_I386,
-    CPU_SUBTYPE_I386_ALL,
-    NX_LittleEndian,
-    "Intel 80x86"
-  },
-  {
-    "x86_64",
-    CPU_TYPE_X86_64,
-    CPU_SUBTYPE_X86_64_ALL,
-    NX_LittleEndian,
-    "Intel x86-64"
-  },
-  {
-    "x86_64h",
-    CPU_TYPE_X86_64,
-    CPU_SUBTYPE_X86_64_H,
-    NX_LittleEndian,
-    "Intel x86-64h Haswell"
-  },
-  {
-    "arm",
-    CPU_TYPE_ARM,
-    CPU_SUBTYPE_ARM_ALL,
-    NX_LittleEndian,
-    "ARM"
-  },
-  {
-    "arm64",
-    CPU_TYPE_ARM64,
-    CPU_SUBTYPE_ARM64_ALL,
-    NX_LittleEndian,
-    "ARM64"
-  },
-  {
-    "arm64e",
-    CPU_TYPE_ARM64,
-    CPU_SUBTYPE_ARM64_E,
-    NX_LittleEndian,
-    "ARM64e"
-  },
-  {
-    "ppc",
-    CPU_TYPE_POWERPC,
-    CPU_SUBTYPE_POWERPC_ALL,
-    NX_BigEndian,
-    "PowerPC"
-  }
-};
+constexpr NamedArchInfo kKnownArchitectures[] = {
+    {"i386", {CPU_TYPE_I386, CPU_SUBTYPE_I386_ALL}},
+    {"x86_64", {CPU_TYPE_X86_64, CPU_SUBTYPE_X86_64_ALL}},
+    {"x86_64h", {CPU_TYPE_X86_64, CPU_SUBTYPE_X86_64_H}},
+    {"arm", {CPU_TYPE_ARM, CPU_SUBTYPE_ARM_ALL}},
+    {"arm64", {CPU_TYPE_ARM64, CPU_SUBTYPE_ARM64_ALL}},
+    {"arm64e", {CPU_TYPE_ARM64, CPU_SUBTYPE_ARM64E}},
+    {"ppc", {CPU_TYPE_POWERPC, CPU_SUBTYPE_POWERPC_ALL}}};
 
 }  // namespace
 
-const NXArchInfo *NXGetLocalArchInfo(void) {
+ArchInfo GetLocalArchInfo(void) {
   Architecture arch;
 #if defined(__i386__)
   arch = kArch_i386;
 #elif defined(__x86_64__)
   arch = kArch_x86_64;
-#elif defined(__arm64)
+#elif defined(__arm64__) || defined(__aarch64__)
   arch = kArch_arm64;
 #elif defined(__arm__)
   arch = kArch_arm;
 #elif defined(__powerpc__)
   arch = kArch_ppc;
 #else
-  #error "Unsupported CPU architecture"
+#error "Unsupported CPU architecture"
 #endif
-  return &kKnownArchitectures[arch];
+  return kKnownArchitectures[arch].info;
 }
 
-#ifndef __APPLE__
+#ifdef __APPLE__
+
+std::optional<ArchInfo> GetArchInfoFromName(const char* arch_name) {
+#if (__MAC_OS_X_VERSION_MAX_ALLOWED >= 130000 || \
+     __IPHONE_OS_VERSION_MAX_ALLOWED >= 160000 || \
+     __TVOS_OS_VERSION_MAX_ALLOWED >= 160000)
+  if (__builtin_available(macOS 13.0, iOS 16.0, tvOS 16.0, *)) {
+    cpu_type_t type;
+    cpu_subtype_t subtype;
+    if (macho_cpu_type_for_arch_name(arch_name, &type, &subtype)) {
+      return ArchInfo{type, subtype};
+    }
+  } else {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+    const NXArchInfo* info = NXGetArchInfoFromName(arch_name);
+#pragma clang diagnostic pop
+    if (info) {
+      return ArchInfo{info->cputype, info->cpusubtype};
+    }
+  }
+#else
+  const NXArchInfo* info = NXGetArchInfoFromName(arch_name);
+  if (info) {
+    return ArchInfo{info->cputype, info->cpusubtype};
+  }
+#endif
+  return std::nullopt;
+}
 
-const NXArchInfo *NXGetArchInfoFromName(const char *name) {
-  for (int arch = 0; arch < kNumArchitectures; ++arch) {
-    if (!strcmp(name, kKnownArchitectures[arch].name)) {
-      return &kKnownArchitectures[arch];
+const char* GetNameFromCPUType(cpu_type_t cpu_type, cpu_subtype_t cpu_subtype) {
+#if (__MAC_OS_X_VERSION_MAX_ALLOWED >= 130000 || \
+     __IPHONE_OS_VERSION_MAX_ALLOWED >= 160000 || \
+     __TVOS_OS_VERSION_MAX_ALLOWED >= 160000)
+  if (__builtin_available(macOS 13.0, iOS 16.0, tvOS 16.0, *)) {
+    const char* name = macho_arch_name_for_cpu_type(cpu_type, cpu_subtype);
+    if (name) {
+      return name;
+    }
+  } else {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+    const NXArchInfo* info = NXGetArchInfoFromCpuType(cpu_type, cpu_subtype);
+#pragma clang diagnostic pop
+    if (info) {
+      return info->name;
     }
   }
-  return NULL;
+#else
+  const NXArchInfo* info = NXGetArchInfoFromCpuType(cpu_type, cpu_subtype);
+  if (info) {
+    return info->name;
+  }
+#endif
+  return kUnknownArchName;
 }
 
-const NXArchInfo *NXGetArchInfoFromCpuType(cpu_type_t cputype,
-                                           cpu_subtype_t cpusubtype) {
-  const NXArchInfo *candidate = NULL;
+#else
+
+std::optional<ArchInfo> GetArchInfoFromName(const char* arch_name) {
   for (int arch = 0; arch < kNumArchitectures; ++arch) {
-    if (kKnownArchitectures[arch].cputype == cputype) {
-      if (kKnownArchitectures[arch].cpusubtype == cpusubtype) {
-        return &kKnownArchitectures[arch];
-      }
-      if (!candidate) {
-        candidate = &kKnownArchitectures[arch];
-      }
+    if (!strcmp(arch_name, kKnownArchitectures[arch].name)) {
+      return kKnownArchitectures[arch].info;
     }
   }
-  return candidate;
+  return std::nullopt;
 }
 
-struct fat_arch *NXFindBestFatArch(cpu_type_t cputype,
-                                   cpu_subtype_t cpusubtype,
-                                   struct fat_arch *fat_archs,
-                                   uint32_t nfat_archs) {
-  struct fat_arch *candidate = NULL;
-  for (uint32_t f = 0; f < nfat_archs; ++f) {
-    if (fat_archs[f].cputype == cputype) {
-      if (fat_archs[f].cpusubtype == cpusubtype) {
-        return &fat_archs[f];
+const char* GetNameFromCPUType(cpu_type_t cpu_type, cpu_subtype_t cpu_subtype) {
+  const char* candidate = kUnknownArchName;
+  for (int arch = 0; arch < kNumArchitectures; ++arch) {
+    if (kKnownArchitectures[arch].info.cputype == cpu_type) {
+      if (kKnownArchitectures[arch].info.cpusubtype == cpu_subtype) {
+        return kKnownArchitectures[arch].name;
       }
-      if (!candidate) {
-        candidate = &fat_archs[f];
+      if (!strcmp(candidate, kUnknownArchName)) {
+        candidate = kKnownArchitectures[arch].name;
       }
     }
   }
   return candidate;
 }
-#endif  // !__APPLE__
+#endif  // __APPLE__
diff --git a/external_imported/sentry-native/external/breakpad/src/common/mac/arch_utilities.h b/external_imported/sentry-native/external/breakpad/src/common/mac/arch_utilities.h
index d267c43b8..3b036738a 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/mac/arch_utilities.h
+++ b/external_imported/sentry-native/external/breakpad/src/common/mac/arch_utilities.h
@@ -31,16 +31,26 @@
 #ifndef COMMON_MAC_ARCH_UTILITIES_H__
 #define COMMON_MAC_ARCH_UTILITIES_H__
 
-#include <mach-o/arch.h>
+#include <mach/machine.h>
 
-namespace google_breakpad {
+#include <optional>
 
-// Custom implementation of |NXGetArchInfoFromName| and
-// |NXGetArchInfoFromCpuType| that handle newer CPU on older OSes.
-const NXArchInfo* BreakpadGetArchInfoFromName(const char* arch_name);
-const NXArchInfo* BreakpadGetArchInfoFromCpuType(cpu_type_t cpu_type,
-                                                 cpu_subtype_t cpu_subtype);
+static constexpr const char* kUnknownArchName = "<Unknown architecture>";
 
-}  // namespace google_breakpad
+struct ArchInfo {
+  cpu_type_t cputype;
+  cpu_subtype_t cpusubtype;
+};
+
+// Returns architecture info if `arch_name` corresponds to a valid, known
+// architecture, and std::nullopt otherwise.
+std::optional<ArchInfo> GetArchInfoFromName(const char* arch_name);
+
+// Returns the name of the architecture specified by `cpu_type` and
+// `cpu_subtype`, or `kUnknownArchName` if it's unknown or invalid.
+const char* GetNameFromCPUType(cpu_type_t cpu_type, cpu_subtype_t cpu_subtype);
+
+// Returns the architecture of the machine this code is running on.
+ArchInfo GetLocalArchInfo();
 
 #endif  // COMMON_MAC_ARCH_UTILITIES_H__
diff --git a/external_imported/sentry-native/external/breakpad/src/common/mac/bootstrap_compat.cc b/external_imported/sentry-native/external/breakpad/src/common/mac/bootstrap_compat.cc
index 6647bae36..408589ba9 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/mac/bootstrap_compat.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/mac/bootstrap_compat.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/mac/bootstrap_compat.h"
 
 namespace breakpad {
diff --git a/external_imported/sentry-native/external/breakpad/src/common/mac/dump_syms.cc b/external_imported/sentry-native/external/breakpad/src/common/mac/dump_syms.cc
index 9658b2c6d..c06945e48 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/mac/dump_syms.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/mac/dump_syms.cc
@@ -32,6 +32,10 @@
 
 // dump_syms.cc: Create a symbol file for use with minidumps
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/mac/dump_syms.h"
 
 #include <assert.h>
@@ -217,11 +221,10 @@ bool DumpSymbols::ReadData(uint8_t* contents, size_t size,
   return true;
 }
 
-bool DumpSymbols::SetArchitecture(cpu_type_t cpu_type,
-                                  cpu_subtype_t cpu_subtype) {
+bool DumpSymbols::SetArchitecture(const ArchInfo& info) {
   // Find the best match for the architecture the user requested.
-  const SuperFatArch* best_match = FindBestMatchForArchitecture(
-      cpu_type, cpu_subtype);
+  const SuperFatArch* best_match =
+      FindBestMatchForArchitecture(info.cputype, info.cpusubtype);
   if (!best_match) return false;
 
   // Record the selected object file.
@@ -229,70 +232,37 @@ bool DumpSymbols::SetArchitecture(cpu_type_t cpu_type,
   return true;
 }
 
-bool DumpSymbols::SetArchitecture(const std::string& arch_name) {
-  bool arch_set = false;
-  const NXArchInfo* arch_info =
-      google_breakpad::BreakpadGetArchInfoFromName(arch_name.c_str());
-  if (arch_info) {
-    arch_set = SetArchitecture(arch_info->cputype, arch_info->cpusubtype);
-  }
-  return arch_set;
-}
 
 SuperFatArch* DumpSymbols::FindBestMatchForArchitecture(
-    cpu_type_t cpu_type, cpu_subtype_t cpu_subtype) {
-  // Check if all the object files can be converted to struct fat_arch.
-  bool can_convert_to_fat_arch = true;
-  vector<struct fat_arch> fat_arch_vector;
-  for (vector<SuperFatArch>::const_iterator it = object_files_.begin();
-       it != object_files_.end();
-       ++it) {
-    struct fat_arch arch;
-    bool success = it->ConvertToFatArch(&arch);
-    if (!success) {
-      can_convert_to_fat_arch = false;
-      break;
-    }
-    fat_arch_vector.push_back(arch);
-  }
-
-  // If all the object files can be converted to struct fat_arch, use
-  // NXFindBestFatArch.
-  if (can_convert_to_fat_arch) {
-    const struct fat_arch* best_match
-      = NXFindBestFatArch(cpu_type, cpu_subtype, &fat_arch_vector[0],
-                          static_cast<uint32_t>(fat_arch_vector.size()));
-
-    for (size_t i = 0; i < fat_arch_vector.size(); ++i) {
-      if (best_match == &fat_arch_vector[i])
-        return &object_files_[i];
+    cpu_type_t cpu_type,
+    cpu_subtype_t cpu_subtype) {
+  SuperFatArch* closest_match = nullptr;
+  for (auto& object_file : object_files_) {
+    if (static_cast<cpu_type_t>(object_file.cputype) == cpu_type) {
+      // If there's an exact match, return it directly.
+      if ((static_cast<cpu_subtype_t>(object_file.cpusubtype) &
+           ~CPU_SUBTYPE_MASK) == (cpu_subtype & ~CPU_SUBTYPE_MASK)) {
+        return &object_file;
+      }
+      // Otherwise, hold on to this as the closest match since at least the CPU
+      // type matches.
+      if (!closest_match) {
+        closest_match = &object_file;
+      }
     }
-    assert(best_match == NULL);
-    // Fall through since NXFindBestFatArch can't find arm slices on x86_64
-    // macOS 13. See FB11955188.
   }
-
-  // Check for an exact match with cpu_type and cpu_subtype.
-  for (vector<SuperFatArch>::iterator it = object_files_.begin();
-       it != object_files_.end();
-       ++it) {
-    if (static_cast<cpu_type_t>(it->cputype) == cpu_type &&
-        (static_cast<cpu_subtype_t>(it->cpusubtype) & ~CPU_SUBTYPE_MASK) ==
-            (cpu_subtype & ~CPU_SUBTYPE_MASK))
-      return &*it;
-  }
-
   // No exact match found.
-  // TODO(erikchen): If it becomes necessary, we can copy the implementation of
-  // NXFindBestFatArch, located at
-  // http://web.mit.edu/darwin/src/modules/cctools/libmacho/arch.c.
-  fprintf(stderr, "Failed to find an exact match for an object file with cpu "
-      "type: %d and cpu subtype: %d.\n", cpu_type, cpu_subtype);
-  if (!can_convert_to_fat_arch) {
-    fprintf(stderr, "Furthermore, at least one object file is larger "
-        "than 2**32.\n");
+  fprintf(stderr,
+          "Failed to find an exact match for an object file with cpu "
+          "type: %d and cpu subtype: %d.\n",
+          cpu_type, cpu_subtype);
+  if (closest_match) {
+    fprintf(stderr, "Using %s as the closest match.\n",
+            GetNameFromCPUType(closest_match->cputype,
+                               closest_match->cpusubtype));
+    return closest_match;
   }
-  return NULL;
+  return nullptr;
 }
 
 string DumpSymbols::Identifier() {
@@ -398,8 +368,8 @@ bool DumpSymbols::CreateEmptyModule(scoped_ptr<Module>& module) {
       selected_object_file_ = &object_files_[0];
     else {
       // Look for an object file whose architecture matches our own.
-      const NXArchInfo* local_arch = NXGetLocalArchInfo();
-      if (!SetArchitecture(local_arch->cputype, local_arch->cpusubtype)) {
+      ArchInfo local_arch = GetLocalArchInfo();
+      if (!SetArchitecture(local_arch)) {
         fprintf(stderr, "%s: object file contains more than one"
                 " architecture, none of which match the current"
                 " architecture; specify an architecture explicitly"
@@ -414,18 +384,16 @@ bool DumpSymbols::CreateEmptyModule(scoped_ptr<Module>& module) {
 
   // Find the name of the selected file's architecture, to appear in
   // the MODULE record and in error messages.
-  const NXArchInfo* selected_arch_info =
-      google_breakpad::BreakpadGetArchInfoFromCpuType(
-          selected_object_file_->cputype, selected_object_file_->cpusubtype);
+  const char* selected_arch_name = GetNameFromCPUType(
+      selected_object_file_->cputype, selected_object_file_->cpusubtype);
 
   // In certain cases, it is possible that architecture info can't be reliably
   // determined, e.g. new architectures that breakpad is unware of. In that
   // case, avoid crashing and return false instead.
-  if (selected_arch_info == NULL) {
+  if (selected_arch_name == kUnknownArchName) {
     return false;
   }
 
-  const char* selected_arch_name = selected_arch_info->name;
   if (strcmp(selected_arch_name, "i386") == 0)
     selected_arch_name = "x86";
 
@@ -438,7 +406,12 @@ bool DumpSymbols::CreateEmptyModule(scoped_ptr<Module>& module) {
   }
 
   // Compute a module name, to appear in the MODULE record.
-  string module_name = google_breakpad::BaseName(object_filename_);
+  string module_name;
+  if (!module_name_.empty()) {
+    module_name = module_name_;
+  } else {
+    module_name = google_breakpad::BaseName(object_filename_);
+  }
 
   // Choose an identifier string, to appear in the MODULE record.
   string identifier = Identifier();
@@ -447,18 +420,71 @@ bool DumpSymbols::CreateEmptyModule(scoped_ptr<Module>& module) {
 
   // Create a module to hold the debugging information.
   module.reset(new Module(module_name, "mac", selected_arch_name, identifier,
-                          "", enable_multiple_));
+                          "", enable_multiple_, prefer_extern_name_));
   return true;
 }
 
+void DumpSymbols::StartProcessSplitDwarf(
+    google_breakpad::CompilationUnit* reader,
+    Module* module,
+    google_breakpad::Endianness endianness,
+    bool handle_inter_cu_refs,
+    bool handle_inline) const {
+  std::string split_file;
+  google_breakpad::SectionMap split_sections;
+  google_breakpad::ByteReader split_byte_reader(endianness);
+  uint64_t cu_offset = 0;
+  if (reader->ProcessSplitDwarf(split_file, split_sections, split_byte_reader,
+                                cu_offset))
+    return;
+  DwarfCUToModule::FileContext file_context(split_file, module,
+                                            handle_inter_cu_refs);
+  for (auto section : split_sections)
+    file_context.AddSectionToSectionMap(section.first, section.second.first,
+                                        section.second.second);
+  // Because DWP/DWO file doesn't have .debug_addr/.debug_line/.debug_line_str,
+  // its debug info will refer to .debug_addr/.debug_line in the main binary.
+  if (file_context.section_map().find(".debug_addr") ==
+      file_context.section_map().end())
+    file_context.AddSectionToSectionMap(".debug_addr", reader->GetAddrBuffer(),
+                                        reader->GetAddrBufferLen());
+  if (file_context.section_map().find(".debug_line") ==
+      file_context.section_map().end())
+    file_context.AddSectionToSectionMap(".debug_line", reader->GetLineBuffer(),
+                                        reader->GetLineBufferLen());
+  if (file_context.section_map().find(".debug_line_str") ==
+      file_context.section_map().end())
+    file_context.AddSectionToSectionMap(".debug_line_str",
+                                        reader->GetLineStrBuffer(),
+                                        reader->GetLineStrBufferLen());
+  DumperRangesHandler ranges_handler(&split_byte_reader);
+  DumperLineToModule line_to_module(&split_byte_reader);
+  DwarfCUToModule::WarningReporter reporter(split_file, cu_offset);
+  DwarfCUToModule root_handler(
+      &file_context, &line_to_module, &ranges_handler, &reporter, handle_inline,
+      reader->GetLowPC(), reader->GetAddrBase(), reader->HasSourceLineInfo(),
+      reader->GetSourceLineOffset());
+  google_breakpad::DIEDispatcher die_dispatcher(&root_handler);
+  google_breakpad::CompilationUnit split_reader(
+      split_file, file_context.section_map(), cu_offset, &split_byte_reader,
+      &die_dispatcher);
+  split_reader.SetSplitDwarf(reader->GetAddrBase(), reader->GetDWOID());
+  split_reader.Start();
+  // Normally, it won't happen unless we have transitive reference.
+  if (split_reader.ShouldProcessSplitDwarf()) {
+    StartProcessSplitDwarf(&split_reader, module, endianness,
+                           handle_inter_cu_refs, handle_inline);
+  }
+}
+
 void DumpSymbols::ReadDwarf(google_breakpad::Module* module,
                             const mach_o::Reader& macho_reader,
                             const mach_o::SectionMap& dwarf_sections,
                             bool handle_inter_cu_refs) const {
   // Build a byte reader of the appropriate endianness.
-  ByteReader byte_reader(macho_reader.big_endian()
-                         ? ENDIANNESS_BIG
-                         : ENDIANNESS_LITTLE);
+  google_breakpad::Endianness endianness =
+      macho_reader.big_endian() ? ENDIANNESS_BIG : ENDIANNESS_LITTLE;
+  ByteReader byte_reader(endianness);
 
   // Construct a context for this file.
   DwarfCUToModule::FileContext file_context(selected_object_name_,
@@ -494,14 +520,14 @@ void DumpSymbols::ReadDwarf(google_breakpad::Module* module,
 
   // Walk the __debug_info section, one compilation unit at a time.
   uint64_t debug_info_length = debug_info_section.second;
+  bool handle_inline = symbol_data_ & INLINES;
   for (uint64_t offset = 0; offset < debug_info_length;) {
     // Make a handler for the root DIE that populates MODULE with the
     // debug info.
     DwarfCUToModule::WarningReporter reporter(selected_object_name_,
                                               offset);
     DwarfCUToModule root_handler(&file_context, &line_to_module,
-                                 &ranges_handler, &reporter,
-                                 symbol_data_ & INLINES);
+                                 &ranges_handler, &reporter, handle_inline);
     // Make a Dwarf2Handler that drives our DIEHandler.
     DIEDispatcher die_dispatcher(&root_handler);
     // Make a DWARF parser for the compilation unit at OFFSET.
@@ -512,6 +538,11 @@ void DumpSymbols::ReadDwarf(google_breakpad::Module* module,
                                                &die_dispatcher);
     // Process the entire compilation unit; get the offset of the next.
     offset += dwarf_reader.Start();
+    // Start to process split dwarf file.
+    if (dwarf_reader.ShouldProcessSplitDwarf()) {
+      StartProcessSplitDwarf(&dwarf_reader, module, endianness,
+                             handle_inter_cu_refs, handle_inline);
+    }
   }
 }
 
@@ -536,16 +567,14 @@ bool DumpSymbols::ReadCFI(google_breakpad::Module* module,
       register_names = DwarfCFIToModule::RegisterNames::ARM64();
       break;
     default: {
-      const NXArchInfo* arch = google_breakpad::BreakpadGetArchInfoFromCpuType(
-          macho_reader.cpu_type(), macho_reader.cpu_subtype());
-      fprintf(stderr, "%s: cannot convert DWARF call frame information for ",
-              selected_object_name_.c_str());
-      if (arch)
-        fprintf(stderr, "architecture '%s'", arch->name);
-      else
-        fprintf(stderr, "architecture %d,%d",
-                macho_reader.cpu_type(), macho_reader.cpu_subtype());
-      fprintf(stderr, " to Breakpad symbol file: no register name table\n");
+      const char* arch_name = GetNameFromCPUType(macho_reader.cpu_type(),
+                                                 macho_reader.cpu_subtype());
+      fprintf(
+          stderr,
+          "%s: cannot convert DWARF call frame information for architecture "
+          "'%s' (%d, %d) to Breakpad symbol file: no register name table\n",
+          selected_object_name_.c_str(), arch_name, macho_reader.cpu_type(),
+          macho_reader.cpu_subtype());
       return false;
     }
   }
diff --git a/external_imported/sentry-native/external/breakpad/src/common/mac/dump_syms.h b/external_imported/sentry-native/external/breakpad/src/common/mac/dump_syms.h
index c2e1b40b9..5ccf49e3e 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/mac/dump_syms.h
+++ b/external_imported/sentry-native/external/breakpad/src/common/mac/dump_syms.h
@@ -43,6 +43,8 @@
 #include <vector>
 
 #include "common/byte_cursor.h"
+#include "common/dwarf/dwarf2reader.h"
+#include "common/mac/arch_utilities.h"
 #include "common/mac/macho_reader.h"
 #include "common/mac/super_fat_arch.h"
 #include "common/module.h"
@@ -55,7 +57,9 @@ class DumpSymbols {
  public:
   DumpSymbols(SymbolData symbol_data,
               bool handle_inter_cu_refs,
-              bool enable_multiple = false)
+              bool enable_multiple = false,
+              const std::string& module_name = "",
+              bool prefer_extern_name = false)
       : symbol_data_(symbol_data),
         handle_inter_cu_refs_(handle_inter_cu_refs),
         object_filename_(),
@@ -65,12 +69,19 @@ class DumpSymbols {
         object_files_(),
         selected_object_file_(),
         selected_object_name_(),
-        enable_multiple_(enable_multiple) {}
+        enable_multiple_(enable_multiple),
+        module_name_(module_name),
+        prefer_extern_name_(prefer_extern_name) {}
   ~DumpSymbols() = default;
 
   // Prepare to read debugging information from |filename|. |filename| may be
   // the name of a fat file, a Mach-O file, or a dSYM bundle containing either
-  // of the above. On success, return true; if there is a problem reading
+  // of the above.
+  //
+  // If |module_name_| is empty, uses the basename of |filename| as the module
+  // name. Otherwise, uses |module_name_| as the module name.
+  //
+  // On success, return true; if there is a problem reading
   // |filename|, report it and return false.
   bool Read(const std::string& filename);
 
@@ -82,26 +93,15 @@ class DumpSymbols {
   // problem reading |contents|, report it and return false.
   bool ReadData(uint8_t* contents, size_t size, const std::string& filename);
 
-  // If this dumper's file includes an object file for |cpu_type| and
-  // |cpu_subtype|, then select that object file for dumping, and return
-  // true. Otherwise, return false, and leave this dumper's selected
-  // architecture unchanged.
-  //
-  // By default, if this dumper's file contains only one object file, then
-  // the dumper will dump those symbols; and if it contains more than one
-  // object file, then the dumper will dump the object file whose
-  // architecture matches that of this dumper program.
-  bool SetArchitecture(cpu_type_t cpu_type, cpu_subtype_t cpu_subtype);
-
-  // If this dumper's file includes an object file for |arch_name|, then select
-  // that object file for dumping, and return true. Otherwise, return false,
-  // and leave this dumper's selected architecture unchanged.
+  // If this dumper's file includes an object file for `info`, then select that
+  // object file for dumping, and return true. Otherwise, return false, and
+  // leave this dumper's selected architecture unchanged.
   //
   // By default, if this dumper's file contains only one object file, then
   // the dumper will dump those symbols; and if it contains more than one
   // object file, then the dumper will dump the object file whose
   // architecture matches that of this dumper program.
-  bool SetArchitecture(const std::string& arch_name);
+  bool SetArchitecture(const ArchInfo& info);
 
   // Return a pointer to an array of SuperFatArch structures describing the
   // object files contained in this dumper's file. Set *|count| to the number
@@ -144,6 +144,13 @@ class DumpSymbols {
   // Creates an empty module object.
   bool CreateEmptyModule(scoped_ptr<Module>& module);
 
+  // Process the split dwarf file referenced by reader.
+  void StartProcessSplitDwarf(google_breakpad::CompilationUnit* reader,
+                              Module* module,
+                              google_breakpad::Endianness endianness,
+                              bool handle_inter_cu_refs,
+                              bool handle_inline) const;
+
   // Read debugging information from |dwarf_sections|, which was taken from
   // |macho_reader|, and add it to |module|.
   void ReadDwarf(google_breakpad::Module* module,
@@ -204,6 +211,19 @@ class DumpSymbols {
   // See: https://crbug.com/google-breakpad/751 and docs at 
   // docs/symbol_files.md#records-3
   bool enable_multiple_;
+
+  // If non-empty, used as the module name. Otherwise, the basename of
+  // |object_filename_| is used as the module name.
+  const std::string module_name_;
+
+  // If a Function and an Extern share the same address but have a different
+  // name, prefer the name of the Extern.
+  //
+  // Use this when dumping Mach-O .dSYMs built with -gmlt (Minimum Line Tables),
+  // as the Function's fully-qualified name will only be present in the STABS
+  // (which are placed in the Extern), not in the DWARF symbols (which are
+  // placed in the Function).
+  bool prefer_extern_name_;
 };
 
 }  // namespace google_breakpad
diff --git a/external_imported/sentry-native/external/breakpad/src/common/mac/file_id.cc b/external_imported/sentry-native/external/breakpad/src/common/mac/file_id.cc
index a6c1d26f6..ee4a66bbe 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/mac/file_id.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/mac/file_id.cc
@@ -32,6 +32,10 @@
 //
 // Author: Dan Waylonis
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/mac/file_id.h"
 
 #include <fcntl.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/mac/launch_reporter.cc b/external_imported/sentry-native/external/breakpad/src/common/mac/launch_reporter.cc
index de554ee3a..f6b8aed1c 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/mac/launch_reporter.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/mac/launch_reporter.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <stdio.h>
 #include <sys/wait.h>
 #include <unistd.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/mac/macho_id.cc b/external_imported/sentry-native/external/breakpad/src/common/mac/macho_id.cc
index e67ccddb7..bb0058ced 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/mac/macho_id.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/mac/macho_id.cc
@@ -33,6 +33,10 @@
 // Author: Dan Waylonis
 
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <fcntl.h>
 #include <mach-o/loader.h>
 #include <stdio.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/mac/macho_reader.cc b/external_imported/sentry-native/external/breakpad/src/common/mac/macho_reader.cc
index 23c809c48..0324be143 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/mac/macho_reader.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/mac/macho_reader.cc
@@ -31,6 +31,10 @@
 // macho_reader.cc: Implementation of google_breakpad::Mach_O::FatReader and
 // google_breakpad::Mach_O::Reader. See macho_reader.h for details.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/mac/macho_reader.h"
 
 #include <assert.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/mac/macho_reader_unittest.cc b/external_imported/sentry-native/external/breakpad/src/common/mac/macho_reader_unittest.cc
index 3beec341f..4b5ac6ca0 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/mac/macho_reader_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/mac/macho_reader_unittest.cc
@@ -31,6 +31,10 @@
 // macho_reader_unittest.cc: Unit tests for google_breakpad::Mach_O::FatReader
 // and google_breakpad::Mach_O::Reader.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <map>
 #include <string>
 #include <vector>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/mac/macho_utilities.cc b/external_imported/sentry-native/external/breakpad/src/common/mac/macho_utilities.cc
index 16e430df9..113e8d3fa 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/mac/macho_utilities.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/mac/macho_utilities.cc
@@ -30,6 +30,10 @@
 //
 // Author: Dave Camp
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/mac/byteswap.h"
 #include "common/mac/macho_utilities.h"
 
diff --git a/external_imported/sentry-native/external/breakpad/src/common/mac/macho_walker.cc b/external_imported/sentry-native/external/breakpad/src/common/mac/macho_walker.cc
index 505a4df1d..4b9f56c2a 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/mac/macho_walker.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/mac/macho_walker.cc
@@ -32,17 +32,21 @@
 //
 // Author: Dan Waylonis
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <assert.h>
 #include <fcntl.h>
-#include <mach-o/arch.h>
 #include <mach-o/fat.h>
 #include <mach-o/loader.h>
 #include <string.h>
 #include <unistd.h>
 
+#include "common/mac/arch_utilities.h"
 #include "common/mac/byteswap.h"
-#include "common/mac/macho_walker.h"
 #include "common/mac/macho_utilities.h"
+#include "common/mac/macho_walker.h"
 
 namespace MacFileUtilities {
 
@@ -81,9 +85,8 @@ bool MachoWalker::WalkHeader(cpu_type_t cpu_type, cpu_subtype_t cpu_subtype) {
   cpu_subtype_t valid_cpu_subtype = cpu_subtype;
   // if |cpu_type| is 0, use the native cpu type.
   if (cpu_type == 0) {
-    const NXArchInfo* arch = NXGetLocalArchInfo();
-    assert(arch);
-    valid_cpu_type = arch->cputype;
+    ArchInfo arch = GetLocalArchInfo();
+    valid_cpu_type = arch.cputype;
     valid_cpu_subtype = CPU_SUBTYPE_MULTIPLE;
   }
   off_t offset;
diff --git a/external_imported/sentry-native/external/breakpad/src/common/mac/string_utilities.cc b/external_imported/sentry-native/external/breakpad/src/common/mac/string_utilities.cc
index 861029d4e..3b83351f4 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/mac/string_utilities.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/mac/string_utilities.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/scoped_ptr.h"
 #include "common/mac/string_utilities.h"
 
diff --git a/external_imported/sentry-native/external/breakpad/src/common/md5.cc b/external_imported/sentry-native/external/breakpad/src/common/md5.cc
index b6e710da9..86298f4de 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/md5.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/md5.cc
@@ -13,6 +13,10 @@
  * will fill a supplied 16-byte array with the digest.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <string.h>
 
 #include "common/md5.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/common/memory_allocator_unittest.cc b/external_imported/sentry-native/external/breakpad/src/common/memory_allocator_unittest.cc
index 6ca625bb5..8ef68913b 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/memory_allocator_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/memory_allocator_unittest.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "breakpad_googletest_includes.h"
 #include "common/memory_allocator.h"
 
diff --git a/external_imported/sentry-native/external/breakpad/src/common/memory_range_unittest.cc b/external_imported/sentry-native/external/breakpad/src/common/memory_range_unittest.cc
index f112e7616..f081d6798 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/memory_range_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/memory_range_unittest.cc
@@ -28,6 +28,10 @@
 
 // memory_range_unittest.cc: Unit tests for google_breakpad::MemoryRange.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "breakpad_googletest_includes.h"
 #include "common/memory_range.h"
 
diff --git a/external_imported/sentry-native/external/breakpad/src/common/module.cc b/external_imported/sentry-native/external/breakpad/src/common/module.cc
index 75782ab16..0eb5aad82 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/module.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/module.cc
@@ -30,6 +30,10 @@
 
 // module.cc: Implement google_breakpad::Module.  See module.h.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/module.h"
 #include "common/string_view.h"
 
@@ -101,14 +105,16 @@ Module::Module(const string& name,
                const string& architecture,
                const string& id,
                const string& code_id /* = "" */,
-               bool enable_multiple_field /* = false*/)
+               bool enable_multiple_field /* = false*/,
+               bool prefer_extern_name /* = false*/)
     : name_(name),
       os_(os),
       architecture_(architecture),
       id_(id),
       code_id_(code_id),
       load_address_(0),
-      enable_multiple_field_(enable_multiple_field) {}
+      enable_multiple_field_(enable_multiple_field),
+      prefer_extern_name_(prefer_extern_name) {}
 
 Module::~Module() {
   for (FileByNameMap::iterator it = files_.begin(); it != files_.end(); ++it)
@@ -148,11 +154,28 @@ bool Module::AddFunction(Function* function) {
     it_ext = externs_.find(&arm_thumb_ext);
   }
   if (it_ext != externs_.end()) {
+    Extern* found_ext = it_ext->get();
+    bool name_mismatch = found_ext->name != function->name;
     if (enable_multiple_field_) {
-      Extern* found_ext = it_ext->get();
+      bool is_multiple_based_on_name;
+      // In the case of a .dSYM built with -gmlt, the external name will be the
+      // fully-qualified symbol name, but the function name will be the partial
+      // name (or omitted).
+      //
+      // Don't mark multiple in this case.
+      if (name_mismatch &&
+          (function->name == "<name omitted>" ||
+           found_ext->name.find(function->name.str()) != string::npos)) {
+        is_multiple_based_on_name = false;
+      } else {
+        is_multiple_based_on_name = name_mismatch;
+      }
       // If the PUBLIC is for the same symbol as the FUNC, don't mark multiple.
       function->is_multiple |=
-          found_ext->name != function->name || found_ext->is_multiple;
+          is_multiple_based_on_name || found_ext->is_multiple;
+    }
+    if (name_mismatch && prefer_extern_name_) {
+      function->name = AddStringToPool(it_ext->get()->name);
     }
     externs_.erase(it_ext);
   }
@@ -266,8 +289,7 @@ void Module::GetStackFrameEntries(vector<StackFrameEntry*>* vec) const {
   }
 }
 
-void Module::AssignSourceIds(
-    set<InlineOrigin*, InlineOriginCompare>& inline_origins) {
+void Module::AssignSourceIds() {
   // First, give every source file an id of -1.
   for (FileByNameMap::iterator file_it = files_.begin();
        file_it != files_.end(); ++file_it) {
@@ -371,7 +393,7 @@ bool Module::Write(std::ostream& stream, SymbolData symbol_data) {
     // Get all referenced inline origins.
     set<InlineOrigin*, InlineOriginCompare> inline_origins;
     CreateInlineOrigins(inline_origins);
-    AssignSourceIds(inline_origins);
+    AssignSourceIds();
 
     // Write out files.
     for (FileByNameMap::iterator file_it = files_.begin();
diff --git a/external_imported/sentry-native/external/breakpad/src/common/module.h b/external_imported/sentry-native/external/breakpad/src/common/module.h
index c1fd9f59c..28e8e9c50 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/module.h
+++ b/external_imported/sentry-native/external/breakpad/src/common/module.h
@@ -131,6 +131,10 @@ class Module {
 
     // If this symbol has been folded with other symbols in the linked binary.
     bool is_multiple = false;
+
+    // If the function's name should be filled out from a matching Extern,
+    // should they not match.
+    bool prefer_extern_name = false;
   };
 
   struct InlineOrigin {
@@ -142,10 +146,6 @@ class Module {
 
     // The inlined function's name.
     StringView name;
-
-    File* file;
-
-    int getFileID() const { return file ? file->source_id : -1; }
   };
 
   // A inlined call site.
@@ -224,7 +224,7 @@ class Module {
     map<uint64_t, uint64_t> references_;
   };
 
-  InlineOriginMap inline_origin_map;
+  map<std::string, InlineOriginMap> inline_origin_maps;
 
   // A source line.
   struct Line {
@@ -317,7 +317,8 @@ class Module {
          const string& architecture,
          const string& id,
          const string& code_id = "",
-         bool enable_multiple_field = false);
+         bool enable_multiple_field = false,
+         bool prefer_extern_name = false);
   ~Module();
 
   // Set the module's load address to LOAD_ADDRESS; addresses given
@@ -402,7 +403,7 @@ class Module {
   // Set the source id numbers for all other files --- unused by the
   // source line data --- to -1.  We do this before writing out the
   // symbol file, at which point we omit any unused files.
-  void AssignSourceIds(set<InlineOrigin*, InlineOriginCompare>& inline_origins);
+  void AssignSourceIds();
 
   // This function should be called before AssignSourceIds() to get the set of
   // valid InlineOrigins*.
@@ -502,6 +503,15 @@ class Module {
   // at
   // https://chromium.googlesource.com/breakpad/breakpad/+/master/docs/symbol_files.md#records-3
   bool enable_multiple_field_;
+
+  // If a Function and an Extern share the same address but have a different
+  // name, prefer the name of the Extern.
+  //
+  // Use this when dumping Mach-O .dSYMs built with -gmlt (Minimum Line Tables),
+  // as the Function's fully-qualified name will only be present in the STABS
+  // (which are placed in the Extern), not in the DWARF symbols (which are
+  // placed in the Function).
+  bool prefer_extern_name_;
 };
 
 }  // namespace google_breakpad
diff --git a/external_imported/sentry-native/external/breakpad/src/common/module_unittest.cc b/external_imported/sentry-native/external/breakpad/src/common/module_unittest.cc
index 39727554f..c51162e52 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/module_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/module_unittest.cc
@@ -30,6 +30,10 @@
 
 // module_unittest.cc: Unit tests for google_breakpad::Module.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -194,9 +198,7 @@ TEST(Module, WriteOmitUnusedFiles) {
   function->lines.push_back(line1);
   function->lines.push_back(line2);
   m.AddFunction(function);
-
-  std::set<Module::InlineOrigin*, Module::InlineOriginCompare> inline_origins;
-  m.AssignSourceIds(inline_origins);
+  m.AssignSourceIds();
 
   vector<Module::File*> vec;
   m.GetFiles(&vec);
@@ -636,6 +638,37 @@ TEST(Module, ConstructFunctionsAndExternsWithSameAddress) {
                contents.c_str());
 }
 
+// If there exists an extern and a function at the same address, only write
+// out the FUNC entry.
+TEST(Module, ConstructFunctionsAndExternsWithSameAddressPreferExternName) {
+  stringstream s;
+  Module m(MODULE_NAME, MODULE_OS, MODULE_ARCH, MODULE_ID, "", false, true);
+
+  // Two externs.
+  auto extern1 = std::make_unique<Module::Extern>(0xabc0);
+  extern1->name = "extern1";
+  auto extern2 = std::make_unique<Module::Extern>(0xfff0);
+  extern2->name = "extern2";
+
+  m.AddExtern(std::move(extern1));
+  m.AddExtern(std::move(extern2));
+
+  Module::Function* function = new Module::Function("function2", 0xfff0);
+  Module::Range range(0xfff0, 0x10);
+  function->ranges.push_back(range);
+  function->parameter_size = 0;
+  m.AddFunction(function);
+
+  m.Write(s, ALL_SYMBOL_DATA);
+  string contents = s.str();
+
+  EXPECT_STREQ("MODULE " MODULE_OS " " MODULE_ARCH " " MODULE_ID " " MODULE_NAME
+               "\n"
+               "FUNC fff0 10 0 extern2\n"
+               "PUBLIC abc0 0 extern1\n",
+               contents.c_str());
+}
+
 // If there exists an extern and a function at the same address, only write
 // out the FUNC entry, and mark it with `m` if the multiple field is enabled.
 TEST(Module, ConstructFunctionsAndExternsWithSameAddressMultiple) {
diff --git a/external_imported/sentry-native/external/breakpad/src/common/path_helper.cc b/external_imported/sentry-native/external/breakpad/src/common/path_helper.cc
index e51a1b681..fbbcfca31 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/path_helper.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/path_helper.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/path_helper.h"
 
 #include <assert.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/safe_math_unittest.cc b/external_imported/sentry-native/external/breakpad/src/common/safe_math_unittest.cc
index 1908155d4..453afbe03 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/safe_math_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/safe_math_unittest.cc
@@ -28,6 +28,10 @@
 
 // safe_math_unittest.cc: Unit tests for SafeMath
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "safe_math.h"
 #include "breakpad_googletest_includes.h"
 
diff --git a/external_imported/sentry-native/external/breakpad/src/common/simple_string_dictionary.cc b/external_imported/sentry-native/external/breakpad/src/common/simple_string_dictionary.cc
index 682888978..d3e09b8fc 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/simple_string_dictionary.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/simple_string_dictionary.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/simple_string_dictionary.h"
 
 namespace google_breakpad {
diff --git a/external_imported/sentry-native/external/breakpad/src/common/simple_string_dictionary.h b/external_imported/sentry-native/external/breakpad/src/common/simple_string_dictionary.h
index f7253a34e..166d56c8d 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/simple_string_dictionary.h
+++ b/external_imported/sentry-native/external/breakpad/src/common/simple_string_dictionary.h
@@ -32,8 +32,6 @@
 #include <assert.h>
 #include <string.h>
 
-#include "common/basictypes.h"
-
 namespace google_breakpad {
 
 // Opaque type for the serialized representation of a NonAllocatingMap. One is
@@ -80,6 +78,8 @@ class NonAllocatingMap {
         : map_(map),
           current_(0) {
     }
+    Iterator(const Iterator&) = delete;
+    void operator=(const Iterator&) = delete;
 
     // Returns the next entry in the map, or NULL if at the end of the
     // collection.
@@ -90,14 +90,12 @@ class NonAllocatingMap {
           return entry;
         }
       }
-      return NULL;
+      return nullptr;
     }
 
    private:
     const NonAllocatingMap& map_;
     size_t current_;
-
-    DISALLOW_COPY_AND_ASSIGN(Iterator);
   };
 
   NonAllocatingMap() : entries_() {
diff --git a/external_imported/sentry-native/external/breakpad/src/common/simple_string_dictionary_unittest.cc b/external_imported/sentry-native/external/breakpad/src/common/simple_string_dictionary_unittest.cc
index 4f3f1f5c3..b4dd7fe90 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/simple_string_dictionary_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/simple_string_dictionary_unittest.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "breakpad_googletest_includes.h"
 #include "common/simple_string_dictionary.h"
 
diff --git a/external_imported/sentry-native/external/breakpad/src/common/solaris/dump_symbols.cc b/external_imported/sentry-native/external/breakpad/src/common/solaris/dump_symbols.cc
index 8277fd661..09e5b376b 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/solaris/dump_symbols.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/solaris/dump_symbols.cc
@@ -28,6 +28,10 @@
 
 // Author: Alfred Peng
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <demangle.h>
 #include <fcntl.h>
 #include <gelf.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/solaris/file_id.cc b/external_imported/sentry-native/external/breakpad/src/common/solaris/file_id.cc
index 53d205b67..5a9982bb4 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/solaris/file_id.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/solaris/file_id.cc
@@ -32,6 +32,10 @@
 //
 // Author: Alfred Peng
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <elf.h>
 #include <fcntl.h>
 #include <gelf.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/solaris/guid_creator.cc b/external_imported/sentry-native/external/breakpad/src/common/solaris/guid_creator.cc
index 4802f5a74..998d24991 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/solaris/guid_creator.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/solaris/guid_creator.cc
@@ -28,6 +28,10 @@
 
 // Author: Alfred Peng
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <cassert>
 #include <ctime>
 
diff --git a/external_imported/sentry-native/external/breakpad/src/common/stabs_reader.cc b/external_imported/sentry-native/external/breakpad/src/common/stabs_reader.cc
index 30118830a..e18780c9d 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/stabs_reader.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/stabs_reader.cc
@@ -31,6 +31,10 @@
 // This file implements the google_breakpad::StabsReader class.
 // See stabs_reader.h.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/stabs_reader.h"
 
 #include <assert.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/stabs_reader.h b/external_imported/sentry-native/external/breakpad/src/common/stabs_reader.h
index 3f5f0a8f2..655683f12 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/stabs_reader.h
+++ b/external_imported/sentry-native/external/breakpad/src/common/stabs_reader.h
@@ -49,10 +49,6 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifdef HAVE_MACH_O_NLIST_H
 #include <mach-o/nlist.h>
 #elif defined(HAVE_A_OUT_H)
diff --git a/external_imported/sentry-native/external/breakpad/src/common/stabs_reader_unittest.cc b/external_imported/sentry-native/external/breakpad/src/common/stabs_reader_unittest.cc
index 79888815e..294e8836a 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/stabs_reader_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/stabs_reader_unittest.cc
@@ -30,6 +30,10 @@
 
 // stabs_reader_unittest.cc: Unit tests for google_breakpad::StabsReader.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <assert.h>
 #include <errno.h>
 #include <stab.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/stabs_to_module.cc b/external_imported/sentry-native/external/breakpad/src/common/stabs_to_module.cc
index 3d026c22c..f04c987ad 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/stabs_to_module.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/stabs_to_module.cc
@@ -30,6 +30,10 @@
 
 // dump_stabs.cc --- implement the StabsToModule class.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <assert.h>
 #include <cxxabi.h>
 #include <stdarg.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/stabs_to_module_unittest.cc b/external_imported/sentry-native/external/breakpad/src/common/stabs_to_module_unittest.cc
index 95bdb261f..c6d40281b 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/stabs_to_module_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/stabs_to_module_unittest.cc
@@ -30,6 +30,10 @@
 
 // dump_stabs_unittest.cc: Unit tests for StabsToModule.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <vector>
 
 #include "breakpad_googletest_includes.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/common/string_conversion.cc b/external_imported/sentry-native/external/breakpad/src/common/string_conversion.cc
index 213d6ed7c..a4e64ff06 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/string_conversion.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/string_conversion.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <string.h>
 
 #include "common/convert_UTF.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/common/string_conversion_unittest.cc b/external_imported/sentry-native/external/breakpad/src/common/string_conversion_unittest.cc
index 2e64a9576..0f372c800 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/string_conversion_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/string_conversion_unittest.cc
@@ -28,6 +28,10 @@
 
 // string_conversion_unittest.cc: Unit tests for google_breakpad::UTF* helpers.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <string>
 #include <vector>
 
diff --git a/external_imported/sentry-native/external/breakpad/src/common/test_assembler.cc b/external_imported/sentry-native/external/breakpad/src/common/test_assembler.cc
index 918996638..6b1c1fd35 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/test_assembler.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/test_assembler.cc
@@ -31,6 +31,10 @@
 // test_assembler.cc: Implementation of google_breakpad::TestAssembler.
 // See test_assembler.h for details.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/test_assembler.h"
 
 #include <assert.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/test_assembler_unittest.cc b/external_imported/sentry-native/external/breakpad/src/common/test_assembler_unittest.cc
index f16594f1d..0307fdbf4 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/test_assembler_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/test_assembler_unittest.cc
@@ -30,6 +30,10 @@
 
 // test_assembler_unittest.cc: Unit tests for google_breakpad::TestAssembler.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <string>
 #include <string.h>
 
diff --git a/external_imported/sentry-native/external/breakpad/src/common/tests/file_utils.cc b/external_imported/sentry-native/external/breakpad/src/common/tests/file_utils.cc
index 814b2094f..84a228095 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/tests/file_utils.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/tests/file_utils.cc
@@ -29,6 +29,10 @@
 // file_utils.cc: Implement utility functions for file manipulation.
 // See file_utils.h for details.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <fcntl.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/windows/dia_util.cc b/external_imported/sentry-native/external/breakpad/src/common/windows/dia_util.cc
index dcfe0ef97..a5d984d1a 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/windows/dia_util.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/windows/dia_util.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/windows/dia_util.h"
 
 #include <atlbase.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/windows/guid_string.cc b/external_imported/sentry-native/external/breakpad/src/common/windows/guid_string.cc
index be9eb8a39..2c298c33a 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/windows/guid_string.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/windows/guid_string.cc
@@ -30,6 +30,10 @@
 //
 // See guid_string.h for documentation.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <wchar.h>
 
 #include "common/windows/string_utils-inl.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/common/windows/http_upload.cc b/external_imported/sentry-native/external/breakpad/src/common/windows/http_upload.cc
index 088a5e54d..bd48a2339 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/windows/http_upload.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/windows/http_upload.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <assert.h>
 
 // Disable exception handler warnings.
diff --git a/external_imported/sentry-native/external/breakpad/src/common/windows/omap.cc b/external_imported/sentry-native/external/breakpad/src/common/windows/omap.cc
index ad9169974..1ffcec765 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/windows/omap.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/windows/omap.cc
@@ -100,6 +100,10 @@
 // position) so that resolution will work as expected for translated addresses.
 // This is transparent to the rest of the toolchain.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/windows/omap.h"
 
 #include <atlbase.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/windows/omap_unittest.cc b/external_imported/sentry-native/external/breakpad/src/common/windows/omap_unittest.cc
index 841e53910..ebe0d47e3 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/windows/omap_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/windows/omap_unittest.cc
@@ -28,6 +28,10 @@
 
 // Unittests for OMAP related functions.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/windows/omap.h"
 
 #include "breakpad_googletest_includes.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/common/windows/pdb_source_line_writer.cc b/external_imported/sentry-native/external/breakpad/src/common/windows/pdb_source_line_writer.cc
index 800c316fb..dd80a6d25 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/windows/pdb_source_line_writer.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/windows/pdb_source_line_writer.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/windows/pdb_source_line_writer.h"
 
 #include <windows.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/windows/pe_source_line_writer.cc b/external_imported/sentry-native/external/breakpad/src/common/windows/pe_source_line_writer.cc
index a568e0c75..d1d25cf43 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/windows/pe_source_line_writer.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/windows/pe_source_line_writer.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/windows/pe_source_line_writer.h"
 
 #include "common/windows/pe_util.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/common/windows/pe_source_line_writer.h b/external_imported/sentry-native/external/breakpad/src/common/windows/pe_source_line_writer.h
index a37481459..324663bac 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/windows/pe_source_line_writer.h
+++ b/external_imported/sentry-native/external/breakpad/src/common/windows/pe_source_line_writer.h
@@ -31,7 +31,6 @@
 
 #include <string>
 
-#include "common/basictypes.h"
 #include "common/windows/module_info.h"
 
 namespace google_breakpad {
@@ -44,6 +43,8 @@ using std::wstring;
 class PESourceLineWriter {
 public:
   explicit PESourceLineWriter(const wstring& pe_file);
+  PESourceLineWriter(const PESourceLineWriter&) = delete;
+  void operator=(const PESourceLineWriter&) = delete;
   ~PESourceLineWriter();
 
   // Writes Breakpad symbols from the pe file to |symbol_file|.
@@ -58,9 +59,7 @@ class PESourceLineWriter {
   bool GetPEInfo(PEModuleInfo* info);
 
 private:
-  const wstring pe_file_;
-
-  DISALLOW_COPY_AND_ASSIGN(PESourceLineWriter);
+ const wstring pe_file_;
 };
 
 }  // namespace google_breakpad
diff --git a/external_imported/sentry-native/external/breakpad/src/common/windows/pe_util.cc b/external_imported/sentry-native/external/breakpad/src/common/windows/pe_util.cc
index 1df931051..2d4aebe79 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/windows/pe_util.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/windows/pe_util.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "pe_util.h"
 
 #include <windows.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/windows/string_utils.cc b/external_imported/sentry-native/external/breakpad/src/common/windows/string_utils.cc
index 01dca1937..1e570b525 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/windows/string_utils.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/windows/string_utils.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <cassert>
 #include <vector>
 
diff --git a/external_imported/sentry-native/external/breakpad/src/common/windows/sym_upload_v2_protocol.cc b/external_imported/sentry-native/external/breakpad/src/common/windows/sym_upload_v2_protocol.cc
index f2dc660cf..450f3626b 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/windows/sym_upload_v2_protocol.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/windows/sym_upload_v2_protocol.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/windows/sym_upload_v2_protocol.h"
 
 #include <cstdio>
diff --git a/external_imported/sentry-native/external/breakpad/src/common/windows/symbol_collector_client.cc b/external_imported/sentry-native/external/breakpad/src/common/windows/symbol_collector_client.cc
index 187b100ec..d91b702b0 100644
--- a/external_imported/sentry-native/external/breakpad/src/common/windows/symbol_collector_client.cc
+++ b/external_imported/sentry-native/external/breakpad/src/common/windows/symbol_collector_client.cc
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/windows/symbol_collector_client.h"
 
 #include <stdio.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/config.h.in b/external_imported/sentry-native/external/breakpad/src/config.h.in
index 8fd7b0aa3..9a4eb0de9 100644
--- a/external_imported/sentry-native/external/breakpad/src/config.h.in
+++ b/external_imported/sentry-native/external/breakpad/src/config.h.in
@@ -21,6 +21,9 @@
 /* Define to 1 if you have the `rustc_demangle' library (-lrustc_demangle). */
 #undef HAVE_LIBRUSTC_DEMANGLE
 
+/* Define to 1 if you have the `zstd' library (-lzstd). */
+#undef HAVE_LIBZSTD
+
 /* Define to 1 if you have the `memfd_create' function. */
 #undef HAVE_MEMFD_CREATE
 
diff --git a/external_imported/sentry-native/external/breakpad/src/google_breakpad/common/minidump_cpu_amd64.h b/external_imported/sentry-native/external/breakpad/src/google_breakpad/common/minidump_cpu_amd64.h
index 308f21ecb..be209801a 100644
--- a/external_imported/sentry-native/external/breakpad/src/google_breakpad/common/minidump_cpu_amd64.h
+++ b/external_imported/sentry-native/external/breakpad/src/google_breakpad/common/minidump_cpu_amd64.h
@@ -227,7 +227,7 @@ typedef struct {
 
 #define MD_CONTEXT_AMD64_ALL             (MD_CONTEXT_AMD64_FULL | \
                                           MD_CONTEXT_AMD64_SEGMENTS | \
-                                          MD_CONTEXT_X86_DEBUG_REGISTERS)
+                                          MD_CONTEXT_AMD64_DEBUG_REGISTERS)
      /* CONTEXT_ALL */
 
 
diff --git a/external_imported/sentry-native/external/breakpad/src/google_breakpad/common/minidump_cpu_riscv.h b/external_imported/sentry-native/external/breakpad/src/google_breakpad/common/minidump_cpu_riscv.h
index 94d061175..812cf5fda 100644
--- a/external_imported/sentry-native/external/breakpad/src/google_breakpad/common/minidump_cpu_riscv.h
+++ b/external_imported/sentry-native/external/breakpad/src/google_breakpad/common/minidump_cpu_riscv.h
@@ -39,28 +39,8 @@
 
 #include "google_breakpad/common/breakpad_types.h"
 
-#define MD_FLOATINGSAVEAREA_RISCV_FPR_COUNT 32
-#if defined(__riscv)
-# if __riscv_flen == 32
-typedef uint32_t riscv_fpr_size;
-# elif __riscv_flen == 64
-typedef uint64_t riscv_fpr_size;
-# elif __riscv_flen == 128
-typedef uint128_struct riscv_fpr_size;
-# else
-#  error "Unexpected __riscv_flen"
-# endif
-#else
-typedef uint32_t riscv_fpr_size;
-#endif
-
 #define MD_CONTEXT_RISCV_GPR_COUNT 32
-
-typedef struct {
-    /* 32 floating point registers, f0 .. f31. */
-    riscv_fpr_size regs[MD_FLOATINGSAVEAREA_RISCV_FPR_COUNT];
-    uint32_t fpcsr;
-} MDFloatingSaveAreaRISCV;
+#define MD_CONTEXT_RISCV_FPR_COUNT 32
 
 enum MDRISCVRegisterNumbers {
   MD_CONTEXT_RISCV_REG_PC     = 0,
@@ -72,13 +52,14 @@ enum MDRISCVRegisterNumbers {
  * context stored in the structure. */
 #define MD_CONTEXT_RISCV 0x00800000
 #define MD_CONTEXT_RISCV_INTEGER (MD_CONTEXT_RISCV | 0x00000001)
-#define MD_CONTEXT_RISCV_FLOATING_POINT (MD_CONTEXT_RISCV | 0x00000004)
+#define MD_CONTEXT_RISCV_FLOATING_POINT (MD_CONTEXT_RISCV | 0x00000002)
 #define MD_CONTEXT_RISCV_FULL (MD_CONTEXT_RISCV_INTEGER | \
                                MD_CONTEXT_RISCV_FLOATING_POINT)
 
 typedef struct {
   /* Determines which fields of this struct are populated */
   uint32_t context_flags;
+  uint32_t version;
 
   uint32_t pc;
   uint32_t ra;
@@ -113,20 +94,24 @@ typedef struct {
   uint32_t t5;
   uint32_t t6;
 
-  MDFloatingSaveAreaRISCV float_save;
+  /* 32 floating point registers, f0 .. f31. Breakpad only supports RISCV32
+   * with 32 bit floating point. */
+  uint32_t fpregs[MD_CONTEXT_RISCV_FPR_COUNT];
+  uint32_t fcsr;
 } MDRawContextRISCV;
 
 /* For (MDRawContextRISCV64).context_flags.  These values indicate the type of
  * context stored in the structure. */
 #define MD_CONTEXT_RISCV64 0x08000000
 #define MD_CONTEXT_RISCV64_INTEGER (MD_CONTEXT_RISCV64 | 0x00000001)
-#define MD_CONTEXT_RISCV64_FLOATING_POINT (MD_CONTEXT_RISCV64 | 0x00000004)
+#define MD_CONTEXT_RISCV64_FLOATING_POINT (MD_CONTEXT_RISCV64 | 0x00000002)
 #define MD_CONTEXT_RISCV64_FULL (MD_CONTEXT_RISCV64_INTEGER | \
                                  MD_CONTEXT_RISCV64_FLOATING_POINT)
 
 typedef struct {
   /* Determines which fields of this struct are populated */
   uint32_t context_flags;
+  uint32_t version;
 
   uint64_t pc;
   uint64_t ra;
@@ -161,7 +146,10 @@ typedef struct {
   uint64_t t5;
   uint64_t t6;
 
-  MDFloatingSaveAreaRISCV float_save;
+  /* 32 floating point registers, f0 .. f31. Breakpad only supports RISCV64 with
+   * 64 bit floating point. */
+  uint64_t fpregs[MD_CONTEXT_RISCV_FPR_COUNT];
+  uint32_t fcsr;
 } MDRawContextRISCV64;
 
 
diff --git a/external_imported/sentry-native/external/breakpad/src/google_breakpad/common/minidump_exception_linux.h b/external_imported/sentry-native/external/breakpad/src/google_breakpad/common/minidump_exception_linux.h
index 06d36fd15..a3bc000ee 100644
--- a/external_imported/sentry-native/external/breakpad/src/google_breakpad/common/minidump_exception_linux.h
+++ b/external_imported/sentry-native/external/breakpad/src/google_breakpad/common/minidump_exception_linux.h
@@ -157,6 +157,11 @@ typedef enum {
   MD_EXCEPTION_FLAG_LIN_SEGV_ACCERR = 2,
   MD_EXCEPTION_FLAG_LIN_SEGV_BNDERR = 3,
   MD_EXCEPTION_FLAG_LIN_SEGV_PKUERR = 4,
+  MD_EXCEPTION_FLAG_LIN_SEGV_ACCADI = 5,
+  MD_EXCEPTION_FLAG_LIN_SEGV_ADIDERR = 6,
+  MD_EXCEPTION_FLAG_LIN_SEGV_ADIPERR = 7,
+  MD_EXCEPTION_FLAG_LIN_SEGV_MTEAERR = 8,
+  MD_EXCEPTION_FLAG_LIN_SEGV_MTESERR = 9,
 
   /* SIGBUS */
   MD_EXCEPTION_FLAG_LIN_BUS_ADRALN = 1,
diff --git a/external_imported/sentry-native/external/breakpad/src/google_breakpad/common/minidump_format.h b/external_imported/sentry-native/external/breakpad/src/google_breakpad/common/minidump_format.h
index 1526afcea..959d15ba2 100644
--- a/external_imported/sentry-native/external/breakpad/src/google_breakpad/common/minidump_format.h
+++ b/external_imported/sentry-native/external/breakpad/src/google_breakpad/common/minidump_format.h
@@ -1105,7 +1105,7 @@ typedef struct {
 
 typedef struct {
   uint32_t count;
-  MDLocationDescriptor objects[0]; /* MDRawCrashpadAnnotation */
+  MDRawCrashpadAnnotation objects[0];
 } MDRawCrashpadAnnotationList;
 
 typedef struct {
@@ -1122,7 +1122,7 @@ typedef struct {
 
 typedef struct {
   uint32_t count;
-  MDLocationDescriptor modules[0];  /* MDRawModuleCrashpadInfoLink */
+  MDRawModuleCrashpadInfoLink modules[0];
 } MDRawModuleCrashpadInfoList;
 
 typedef struct {
diff --git a/external_imported/sentry-native/external/breakpad/src/google_breakpad/processor/minidump.h b/external_imported/sentry-native/external/breakpad/src/google_breakpad/processor/minidump.h
index 934a0e3ef..e523ab367 100644
--- a/external_imported/sentry-native/external/breakpad/src/google_breakpad/processor/minidump.h
+++ b/external_imported/sentry-native/external/breakpad/src/google_breakpad/processor/minidump.h
@@ -89,7 +89,6 @@
 #include <string>
 #include <vector>
 
-#include "common/basictypes.h"
 #include "common/using_std_string.h"
 #include "google_breakpad/processor/code_module.h"
 #include "google_breakpad/processor/code_modules.h"
@@ -114,7 +113,7 @@ template<typename AddressType, typename EntryType> class RangeMap;
 // itself.
 class MinidumpObject : public DumpObject {
  public:
-  virtual ~MinidumpObject() {}
+  virtual ~MinidumpObject() = default;
 
  protected:
   explicit MinidumpObject(Minidump* minidump);
@@ -136,7 +135,9 @@ class MinidumpObject : public DumpObject {
 // same interface, and may be derived from this class.
 class MinidumpStream : public MinidumpObject {
  public:
-  virtual ~MinidumpStream() {}
+  MinidumpStream(const MinidumpStream&) = delete;
+  void operator=(const MinidumpStream&) = delete;
+  ~MinidumpStream() override = default;
 
  protected:
   explicit MinidumpStream(Minidump* minidump);
@@ -150,8 +151,6 @@ class MinidumpStream : public MinidumpObject {
   // that implements MinidumpStream can compare expected_size to a
   // known size as an integrity check.
   virtual bool Read(uint32_t expected_size) = 0;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpStream);
 };
 
 
@@ -167,7 +166,9 @@ class MinidumpStream : public MinidumpObject {
 // user wants).
 class MinidumpContext : public DumpContext {
  public:
-  virtual ~MinidumpContext();
+  MinidumpContext(const MinidumpContext&) = delete;
+  void operator=(const MinidumpContext&) = delete;
+  ~MinidumpContext() override;
 
  protected:
   explicit MinidumpContext(Minidump* minidump);
@@ -192,8 +193,6 @@ class MinidumpContext : public DumpContext {
   // for access to data about the minidump file itself, such as whether
   // it should be byte-swapped.
   Minidump* minidump_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpContext);
 };
 
 
@@ -208,7 +207,7 @@ class MinidumpContext : public DumpContext {
 class MinidumpMemoryRegion : public MinidumpObject,
                              public MemoryRegion {
  public:
-  virtual ~MinidumpMemoryRegion();
+  ~MinidumpMemoryRegion() override;
 
   static void set_max_bytes(uint32_t max_bytes) { max_bytes_ = max_bytes; }
   static uint32_t max_bytes() { return max_bytes_; }
@@ -219,22 +218,22 @@ class MinidumpMemoryRegion : public MinidumpObject,
   const uint8_t* GetMemory() const;
 
   // The address of the base of the memory region.
-  uint64_t GetBase() const;
+  uint64_t GetBase() const override;
 
   // The size, in bytes, of the memory region.
-  uint32_t GetSize() const;
+  uint32_t GetSize() const override;
 
   // Frees the cached memory region, if cached.
   void FreeMemory();
 
   // Obtains the value of memory at the pointer specified by address.
-  bool GetMemoryAtAddress(uint64_t address, uint8_t*  value) const;
-  bool GetMemoryAtAddress(uint64_t address, uint16_t* value) const;
-  bool GetMemoryAtAddress(uint64_t address, uint32_t* value) const;
-  bool GetMemoryAtAddress(uint64_t address, uint64_t* value) const;
+  bool GetMemoryAtAddress(uint64_t address, uint8_t* value) const override;
+  bool GetMemoryAtAddress(uint64_t address, uint16_t* value) const override;
+  bool GetMemoryAtAddress(uint64_t address, uint32_t* value) const override;
+  bool GetMemoryAtAddress(uint64_t address, uint64_t* value) const override;
 
   // Print a human-readable representation of the object to stdout.
-  void Print() const;
+  void Print() const override;
   void SetPrintMode(bool hexdump, unsigned int width);
 
  protected:
@@ -277,9 +276,9 @@ class MinidumpMemoryRegion : public MinidumpObject,
 // contain a memory region or context.
 class MinidumpThread : public MinidumpObject {
  public:
-  virtual ~MinidumpThread();
+  ~MinidumpThread() override;
 
-  const MDRawThread* thread() const { return valid_ ? &thread_ : NULL; }
+  const MDRawThread* thread() const { return valid_ ? &thread_ : nullptr; }
   // GetMemory may return NULL even if the MinidumpThread is valid,
   // if the thread memory cannot be read.
   virtual MinidumpMemoryRegion* GetMemory();
@@ -322,7 +321,9 @@ class MinidumpThread : public MinidumpObject {
 // a process.
 class MinidumpThreadList : public MinidumpStream {
  public:
-  virtual ~MinidumpThreadList();
+  MinidumpThreadList(const MinidumpThreadList&) = delete;
+  void operator=(const MinidumpThreadList&) = delete;
+  ~MinidumpThreadList() override;
 
   static void set_max_threads(uint32_t max_threads) {
     max_threads_ = max_threads;
@@ -364,18 +365,16 @@ class MinidumpThreadList : public MinidumpStream {
 
   // The list of threads.
   MinidumpThreads* threads_;
-  uint32_t        thread_count_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpThreadList);
+  uint32_t thread_count_;
 };
 
 // MinidumpThreadName contains the name of a thread.
 class MinidumpThreadName : public MinidumpObject {
  public:
-  virtual ~MinidumpThreadName();
+  ~MinidumpThreadName() override;
 
   const MDRawThreadName* thread_name() const {
-    return valid_ ? &thread_name_ : NULL;
+    return valid_ ? &thread_name_ : nullptr;
   }
 
   // Gets the thread ID.
@@ -419,7 +418,9 @@ class MinidumpThreadName : public MinidumpObject {
 // MinidumpThreadNames) in a process.
 class MinidumpThreadNameList : public MinidumpStream {
  public:
-  virtual ~MinidumpThreadNameList();
+  MinidumpThreadNameList(const MinidumpThreadNameList&) = delete;
+  void operator=(const MinidumpThreadNameList&) = delete;
+  ~MinidumpThreadNameList() override;
 
   virtual unsigned int thread_name_count() const {
     return valid_ ? thread_name_count_ : 0;
@@ -446,8 +447,6 @@ class MinidumpThreadNameList : public MinidumpStream {
   // The list of thread names.
   MinidumpThreadNames* thread_names_;
   uint32_t thread_name_count_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpThreadNameList);
 };
 
 // MinidumpModule wraps MDRawModule, which contains information about loaded
@@ -457,7 +456,7 @@ class MinidumpThreadNameList : public MinidumpStream {
 class MinidumpModule : public MinidumpObject,
                        public CodeModule {
  public:
-  virtual ~MinidumpModule();
+  ~MinidumpModule() override;
 
   static void set_max_cv_bytes(uint32_t max_cv_bytes) {
     max_cv_bytes_ = max_cv_bytes;
@@ -469,27 +468,27 @@ class MinidumpModule : public MinidumpObject,
   }
   static uint32_t max_misc_bytes() { return max_misc_bytes_; }
 
-  const MDRawModule* module() const { return valid_ ? &module_ : NULL; }
+  const MDRawModule* module() const { return valid_ ? &module_ : nullptr; }
 
   // CodeModule implementation
-  virtual uint64_t base_address() const {
+  uint64_t base_address() const override {
     return valid_ ? module_.base_of_image : static_cast<uint64_t>(-1);
   }
-  virtual uint64_t size() const { return valid_ ? module_.size_of_image : 0; }
-  virtual string code_file() const;
-  virtual string code_identifier() const;
-  virtual string debug_file() const;
-  virtual string debug_identifier() const;
-  virtual string version() const;
-  virtual CodeModule* Copy() const;
-  virtual bool is_unloaded() const { return false; }
+  uint64_t size() const override { return valid_ ? module_.size_of_image : 0; }
+  string code_file() const override;
+  string code_identifier() const override;
+  string debug_file() const override;
+  string debug_identifier() const override;
+  string version() const override;
+  CodeModule* Copy() const override;
+  bool is_unloaded() const override { return false; }
 
   // Getter and setter for shrink_down_delta.  This is used when the address
   // range for a module is shrunk down due to address range conflicts with
   // other modules.  The base_address and size fields are not updated and they
   // should always reflect the original values (reported in the minidump).
-  virtual uint64_t shrink_down_delta() const;
-  virtual void SetShrinkDownDelta(uint64_t shrink_down_delta);
+  uint64_t shrink_down_delta() const override;
+  void SetShrinkDownDelta(uint64_t shrink_down_delta) override;
 
   // The CodeView record, which contains information to locate the module's
   // debugging information (pdb).  This is returned as uint8_t* because
@@ -580,7 +579,9 @@ class MinidumpModule : public MinidumpObject,
 class MinidumpModuleList : public MinidumpStream,
                            public CodeModules {
  public:
-  virtual ~MinidumpModuleList();
+  MinidumpModuleList(const MinidumpModuleList&) = delete;
+  void operator=(const MinidumpModuleList&) = delete;
+  ~MinidumpModuleList() override;
 
   static void set_max_modules(uint32_t max_modules) {
     max_modules_ = max_modules;
@@ -588,19 +589,19 @@ class MinidumpModuleList : public MinidumpStream,
   static uint32_t max_modules() { return max_modules_; }
 
   // CodeModules implementation.
-  virtual unsigned int module_count() const {
+  unsigned int module_count() const override {
     return valid_ ? module_count_ : 0;
   }
-  virtual const MinidumpModule* GetModuleForAddress(uint64_t address) const;
-  virtual const MinidumpModule* GetMainModule() const;
-  virtual const MinidumpModule* GetModuleAtSequence(
-      unsigned int sequence) const;
-  virtual const MinidumpModule* GetModuleAtIndex(unsigned int index) const;
-  virtual const CodeModules* Copy() const;
+  const MinidumpModule* GetModuleForAddress(uint64_t address) const override;
+  const MinidumpModule* GetMainModule() const override;
+  const MinidumpModule* GetModuleAtSequence(
+      unsigned int sequence) const override;
+  const MinidumpModule* GetModuleAtIndex(unsigned int index) const override;
+  const CodeModules* Copy() const override;
 
   // Returns a vector of all modules which address ranges needed to be shrunk
   // down due to address range conflicts with other modules.
-  virtual vector<linked_ptr<const CodeModule> > GetShrunkRangeModules() const;
+  vector<linked_ptr<const CodeModule>> GetShrunkRangeModules() const override;
 
   // Print a human-readable representation of the object to stdout.
   void Print();
@@ -615,7 +616,7 @@ class MinidumpModuleList : public MinidumpStream,
 
   static const uint32_t kStreamType = MD_MODULE_LIST_STREAM;
 
-  bool Read(uint32_t expected_size);
+  bool Read(uint32_t expected_size) override;
 
   bool StoreRange(const MinidumpModule& module,
                   uint64_t base_address,
@@ -632,8 +633,6 @@ class MinidumpModuleList : public MinidumpStream,
 
   MinidumpModules* modules_;
   uint32_t module_count_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpModuleList);
 };
 
 
@@ -648,7 +647,9 @@ class MinidumpModuleList : public MinidumpStream,
 // memory minidumps contain all of a process' mapped memory.
 class MinidumpMemoryList : public MinidumpStream {
  public:
-  virtual ~MinidumpMemoryList();
+  MinidumpMemoryList(const MinidumpMemoryList&) = delete;
+  void operator=(const MinidumpMemoryList&) = delete;
+  ~MinidumpMemoryList() override;
 
   static void set_max_regions(uint32_t max_regions) {
     max_regions_ = max_regions;
@@ -696,8 +697,6 @@ class MinidumpMemoryList : public MinidumpStream {
   // The list of regions.
   MemoryRegions* regions_;
   uint32_t region_count_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpMemoryList);
 };
 
 
@@ -709,10 +708,12 @@ class MinidumpMemoryList : public MinidumpStream {
 // occurred.
 class MinidumpException : public MinidumpStream {
  public:
-  virtual ~MinidumpException();
+  MinidumpException(const MinidumpException&) = delete;
+  void operator=(const MinidumpException&) = delete;
+  ~MinidumpException() override;
 
   const MDRawExceptionStream* exception() const {
-    return valid_ ? &exception_ : NULL;
+    return valid_ ? &exception_ : nullptr;
   }
 
   // The thread ID is used to determine if a thread is the exception thread,
@@ -736,19 +737,19 @@ class MinidumpException : public MinidumpStream {
   bool Read(uint32_t expected_size) override;
 
   MDRawExceptionStream exception_;
-  MinidumpContext*     context_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpException);
+  MinidumpContext* context_;
 };
 
 // MinidumpAssertion wraps MDRawAssertionInfo, which contains information
 // about an assertion that caused the minidump to be generated.
 class MinidumpAssertion : public MinidumpStream {
  public:
-  virtual ~MinidumpAssertion();
+  MinidumpAssertion(const MinidumpAssertion&) = delete;
+  void operator=(const MinidumpAssertion&) = delete;
+  ~MinidumpAssertion() override;
 
   const MDRawAssertionInfo* assertion() const {
-    return valid_ ? &assertion_ : NULL;
+    return valid_ ? &assertion_ : nullptr;
   }
 
   string expression() const {
@@ -779,8 +780,6 @@ class MinidumpAssertion : public MinidumpStream {
   string expression_;
   string function_;
   string file_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpAssertion);
 };
 
 
@@ -788,10 +787,12 @@ class MinidumpAssertion : public MinidumpStream {
 // the system on which the minidump was generated.  See also MinidumpMiscInfo.
 class MinidumpSystemInfo : public MinidumpStream {
  public:
-  virtual ~MinidumpSystemInfo();
+  MinidumpSystemInfo(const MinidumpSystemInfo&) = delete;
+  void operator=(const MinidumpSystemInfo&) = delete;
+  ~MinidumpSystemInfo() override;
 
   const MDRawSystemInfo* system_info() const {
-    return valid_ ? &system_info_ : NULL;
+    return valid_ ? &system_info_ : nullptr;
   }
 
   // GetOS and GetCPU return textual representations of the operating system
@@ -834,8 +835,6 @@ class MinidumpSystemInfo : public MinidumpStream {
 
   // A string identifying the CPU vendor, if known.
   const string* cpu_vendor_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpSystemInfo);
 };
 
 
@@ -846,7 +845,7 @@ class MinidumpUnloadedModule : public MinidumpObject,
   ~MinidumpUnloadedModule() override;
 
   const MDRawUnloadedModule* module() const {
-    return valid_ ? &unloaded_module_ : NULL;
+    return valid_ ? &unloaded_module_ : nullptr;
   }
 
   // CodeModule implementation
@@ -903,6 +902,8 @@ class MinidumpUnloadedModule : public MinidumpObject,
 class MinidumpUnloadedModuleList : public MinidumpStream,
                                    public CodeModules {
  public:
+  MinidumpUnloadedModuleList(const MinidumpUnloadedModuleList&) = delete;
+  void operator=(const MinidumpUnloadedModuleList&) = delete;
   ~MinidumpUnloadedModuleList() override;
 
   static void set_max_modules(uint32_t max_modules) {
@@ -945,8 +946,6 @@ class MinidumpUnloadedModuleList : public MinidumpStream,
 
   MinidumpUnloadedModules* unloaded_modules_;
   uint32_t module_count_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpUnloadedModuleList);
 };
 
 
@@ -955,8 +954,11 @@ class MinidumpUnloadedModuleList : public MinidumpStream,
 // information.  See also MinidumpSystemInfo.
 class MinidumpMiscInfo : public MinidumpStream {
  public:
+  MinidumpMiscInfo(const MinidumpMiscInfo&) = delete;
+  void operator=(const MinidumpMiscInfo&) = delete;
+
   const MDRawMiscInfo* misc_info() const {
-    return valid_ ? &misc_info_ : NULL;
+    return valid_ ? &misc_info_ : nullptr;
   }
 
   // Print a human-readable representation of the object to stdout.
@@ -980,8 +982,6 @@ class MinidumpMiscInfo : public MinidumpStream {
   string daylight_name_;
   string build_string_;
   string dbg_bld_str_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpMiscInfo);
 };
 
 
@@ -990,8 +990,11 @@ class MinidumpMiscInfo : public MinidumpStream {
 // at the time the minidump was generated.
 class MinidumpBreakpadInfo : public MinidumpStream {
  public:
+  MinidumpBreakpadInfo(const MinidumpBreakpadInfo&) = delete;
+  void operator=(const MinidumpBreakpadInfo&) = delete;
+
   const MDRawBreakpadInfo* breakpad_info() const {
-    return valid_ ? &breakpad_info_ : NULL;
+    return valid_ ? &breakpad_info_ : nullptr;
   }
 
   // These thread IDs are used to determine if threads deserve special
@@ -1014,8 +1017,6 @@ class MinidumpBreakpadInfo : public MinidumpStream {
   bool Read(uint32_t expected_size_) override;
 
   MDRawBreakpadInfo breakpad_info_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpBreakpadInfo);
 };
 
 // MinidumpMemoryInfo wraps MDRawMemoryInfo, which provides information
@@ -1023,7 +1024,9 @@ class MinidumpBreakpadInfo : public MinidumpStream {
 // and protection.
 class MinidumpMemoryInfo : public MinidumpObject {
  public:
-  const MDRawMemoryInfo* info() const { return valid_ ? &memory_info_ : NULL; }
+  const MDRawMemoryInfo* info() const {
+    return valid_ ? &memory_info_ : nullptr;
+  }
 
   // The address of the base of the memory region.
   uint64_t GetBase() const { return valid_ ? memory_info_.base_address : 0; }
@@ -1060,7 +1063,9 @@ class MinidumpMemoryInfo : public MinidumpObject {
 // info corresponding to a specific address.
 class MinidumpMemoryInfoList : public MinidumpStream {
  public:
-  virtual ~MinidumpMemoryInfoList();
+  MinidumpMemoryInfoList(const MinidumpMemoryInfoList&) = delete;
+  void operator=(const MinidumpMemoryInfoList&) = delete;
+  ~MinidumpMemoryInfoList() override;
 
   unsigned int info_count() const { return valid_ ? info_count_ : 0; }
 
@@ -1086,14 +1091,15 @@ class MinidumpMemoryInfoList : public MinidumpStream {
 
   MinidumpMemoryInfos* infos_;
   uint32_t info_count_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpMemoryInfoList);
 };
 
 // MinidumpLinuxMaps wraps information about a single mapped memory region
 // from /proc/self/maps.
 class MinidumpLinuxMaps : public MinidumpObject {
  public:
+  MinidumpLinuxMaps(const MinidumpLinuxMaps&) = delete;
+  void operator=(const MinidumpLinuxMaps&) = delete;
+
   // The memory address of the base of the mapped region.
   uint64_t GetBase() const { return valid_ ? region_.start : 0; }
   // The size of the mapped region.
@@ -1139,8 +1145,6 @@ class MinidumpLinuxMaps : public MinidumpObject {
 
   // The memory region struct that this class wraps.
   MappedMemoryRegion region_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpLinuxMaps);
 };
 
 // MinidumpLinuxMapsList corresponds to the Linux-exclusive MD_LINUX_MAPS
@@ -1148,7 +1152,9 @@ class MinidumpLinuxMaps : public MinidumpObject {
 // the mapped memory regions and their access permissions.
 class MinidumpLinuxMapsList : public MinidumpStream {
  public:
-  virtual ~MinidumpLinuxMapsList();
+  MinidumpLinuxMapsList(const MinidumpLinuxMapsList&) = delete;
+  void operator=(const MinidumpLinuxMapsList&) = delete;
+  ~MinidumpLinuxMapsList() override;
 
   // Get number of mappings.
   unsigned int get_maps_count() const { return valid_ ? maps_count_ : 0; }
@@ -1180,8 +1186,6 @@ class MinidumpLinuxMapsList : public MinidumpStream {
   MinidumpLinuxMappings* maps_;
   // The number of mappings.
   uint32_t maps_count_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinidumpLinuxMapsList);
 };
 
 // MinidumpCrashpadInfo wraps MDRawCrashpadInfo, which is an optional stream in
@@ -1196,12 +1200,12 @@ class MinidumpCrashpadInfo : public MinidumpStream {
   };
 
   const MDRawCrashpadInfo* crashpad_info() const {
-    return valid_ ? &crashpad_info_ : NULL;
+    return valid_ ? &crashpad_info_ : nullptr;
   }
 
   const std::vector<std::vector<AnnotationObject>>*
   GetModuleCrashpadInfoAnnotationObjects() const {
-    return valid_ ? &module_crashpad_info_annotation_objects_ : NULL;
+    return valid_ ? &module_crashpad_info_annotation_objects_ : nullptr;
   }
 
   // Print a human-readable representation of the object to stdout.
@@ -1242,6 +1246,9 @@ class Minidump {
   // is valid as long as the Minidump object is.
   explicit Minidump(std::istream& input);
 
+  Minidump(const Minidump&) = delete;
+  void operator=(const Minidump&) = delete;
+
   virtual ~Minidump();
 
   // path may be empty if the minidump was not opened from a file
@@ -1258,7 +1265,9 @@ class Minidump {
   }
   static uint32_t max_string_length() { return max_string_length_; }
 
-  virtual const MDRawHeader* header() const { return valid_ ? &header_ : NULL; }
+  virtual const MDRawHeader* header() const {
+    return valid_ ? &header_ : nullptr;
+  }
 
   // Reads the CPU information from the system info stream and generates the
   // appropriate CPU flags.  The returned context_cpu_flags are the same as
@@ -1374,7 +1383,7 @@ class Minidump {
   // the Minidump object locate interesting streams quickly, and
   // provides a convenient place to stash MinidumpStream objects.
   struct MinidumpStreamInfo {
-    MinidumpStreamInfo() : stream_index(0), stream(NULL) {}
+    MinidumpStreamInfo() : stream_index(0), stream(nullptr) {}
     ~MinidumpStreamInfo() { delete stream; }
 
     // Index into the MinidumpDirectoryEntries vector
@@ -1436,8 +1445,6 @@ class Minidump {
   // Knobs for controlling display of memory printing.
   bool                      hexdump_;
   unsigned int              hexdump_width_;
-
-  DISALLOW_COPY_AND_ASSIGN(Minidump);
 };
 
 
diff --git a/external_imported/sentry-native/external/breakpad/src/google_breakpad/processor/minidump_processor.h b/external_imported/sentry-native/external/breakpad/src/google_breakpad/processor/minidump_processor.h
index 137ef4444..8475407e7 100644
--- a/external_imported/sentry-native/external/breakpad/src/google_breakpad/processor/minidump_processor.h
+++ b/external_imported/sentry-native/external/breakpad/src/google_breakpad/processor/minidump_processor.h
@@ -126,8 +126,18 @@ class MinidumpProcessor {
   // does not exist or cannot be determined.
   static string GetAssertion(Minidump* dump);
 
+  // Sets the flag to enable/disable use of objdump during normal crash
+  // processing. This is independent from the flag for use of objdump during
+  // exploitability analysis.
   void set_enable_objdump(bool enabled) { enable_objdump_ = enabled; }
 
+  // Sets the flag to enable/disable use of objdump during exploitability
+  // analysis. This is independent from the flag for use of objdump during
+  // normal crash processing.
+  void set_enable_objdump_for_exploitability(bool enabled) {
+    enable_objdump_for_exploitability_ = enabled;
+  }
+
  private:
   StackFrameSymbolizer* frame_symbolizer_;
   // Indicate whether resolver_helper_ is owned by this instance.
@@ -138,9 +148,15 @@ class MinidumpProcessor {
   // memory corruption issue.
   bool enable_exploitability_;
 
-  // This flag permits the exploitability scanner to shell out to objdump
-  // for purposes of disassembly.
+  // This flag permits the processor to shell out to objdump for purposes of
+  // disassembly during normal crash processing, but not during exploitability
+  // analysis.
   bool enable_objdump_;
+
+  // This flag permits the exploitability scanner to shell out to objdump for
+  // purposes of disassembly. This results in significantly more overhead than
+  // the enable_objdump_ flag.
+  bool enable_objdump_for_exploitability_;
 };
 
 }  // namespace google_breakpad
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/address_map_unittest.cc b/external_imported/sentry-native/external/breakpad/src/processor/address_map_unittest.cc
index 1bf0d7180..2d754b602 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/address_map_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/address_map_unittest.cc
@@ -30,6 +30,10 @@
 //
 // Author: Mark Mentovai
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <limits.h>
 #include <stdio.h>
 
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/basic_code_modules.cc b/external_imported/sentry-native/external/breakpad/src/processor/basic_code_modules.cc
index 57021d479..bdfc8f3de 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/basic_code_modules.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/basic_code_modules.cc
@@ -33,6 +33,10 @@
 //
 // Author: Mark Mentovai
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "processor/basic_code_modules.h"
 
 #include <assert.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/basic_source_line_resolver.cc b/external_imported/sentry-native/external/breakpad/src/processor/basic_source_line_resolver.cc
index 07aba6bc2..220bd746c 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/basic_source_line_resolver.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/basic_source_line_resolver.cc
@@ -31,6 +31,10 @@
 // See basic_source_line_resolver.h and basic_source_line_resolver_types.h
 // for documentation.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/basic_source_line_resolver_unittest.cc b/external_imported/sentry-native/external/breakpad/src/processor/basic_source_line_resolver_unittest.cc
index fba4e9a6b..a73ded8b7 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/basic_source_line_resolver_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/basic_source_line_resolver_unittest.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <assert.h>
 #include <stdio.h>
 
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/call_stack.cc b/external_imported/sentry-native/external/breakpad/src/processor/call_stack.cc
index 87ffd1ae3..6ecae6dcb 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/call_stack.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/call_stack.cc
@@ -32,6 +32,10 @@
 //
 // Author: Mark Mentovai
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "google_breakpad/processor/call_stack.h"
 #include "google_breakpad/processor/stack_frame.h"
 
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/cfi_frame_info.cc b/external_imported/sentry-native/external/breakpad/src/processor/cfi_frame_info.cc
index 5216a44ea..2094e0941 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/cfi_frame_info.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/cfi_frame_info.cc
@@ -31,6 +31,10 @@
 // cfi_frame_info.cc: Implementation of CFIFrameInfo class.
 // See cfi_frame_info.h for details.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "processor/cfi_frame_info.h"
 
 #include <string.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/cfi_frame_info_unittest.cc b/external_imported/sentry-native/external/breakpad/src/processor/cfi_frame_info_unittest.cc
index 85f970a5e..0cf4562d3 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/cfi_frame_info_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/cfi_frame_info_unittest.cc
@@ -31,6 +31,10 @@
 // cfi_frame_info_unittest.cc: Unit tests for CFIFrameInfo,
 // CFIRuleParser, CFIFrameInfoParseHandler, and SimpleCFIWalker.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <string.h>
 
 #include "breakpad_googletest_includes.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/contained_range_map_unittest.cc b/external_imported/sentry-native/external/breakpad/src/processor/contained_range_map_unittest.cc
index 670bb1898..1d681fdfd 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/contained_range_map_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/contained_range_map_unittest.cc
@@ -30,6 +30,10 @@
 //
 // Author: Mark Mentovai
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <stdio.h>
 
 #include "processor/contained_range_map-inl.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/convert_old_arm64_context.cc b/external_imported/sentry-native/external/breakpad/src/processor/convert_old_arm64_context.cc
index 8347064a2..768475b2f 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/convert_old_arm64_context.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/convert_old_arm64_context.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "processor/convert_old_arm64_context.h"
 
 #include <string.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/disassembler_objdump.cc b/external_imported/sentry-native/external/breakpad/src/processor/disassembler_objdump.cc
index f000b4b41..9f9569a5e 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/disassembler_objdump.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/disassembler_objdump.cc
@@ -30,6 +30,10 @@
 //
 // Author: Mark Brand
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "processor/disassembler_objdump.h"
 
 #include <unistd.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/disassembler_objdump_unittest.cc b/external_imported/sentry-native/external/breakpad/src/processor/disassembler_objdump_unittest.cc
index 4b4ce6c30..30a60da5a 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/disassembler_objdump_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/disassembler_objdump_unittest.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <unistd.h>
 #include <vector>
 
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/disassembler_x86.cc b/external_imported/sentry-native/external/breakpad/src/processor/disassembler_x86.cc
index dffb996de..741cec7fd 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/disassembler_x86.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/disassembler_x86.cc
@@ -33,6 +33,10 @@
 //
 // Author: Cris Neckar
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "processor/disassembler_x86.h"
 
 #include <string.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/disassembler_x86_unittest.cc b/external_imported/sentry-native/external/breakpad/src/processor/disassembler_x86_unittest.cc
index 117b3bf8e..18525b825 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/disassembler_x86_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/disassembler_x86_unittest.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <unistd.h>
 
 #include "breakpad_googletest_includes.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/dump_context.cc b/external_imported/sentry-native/external/breakpad/src/processor/dump_context.cc
index a8ab00840..ab97930f9 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/dump_context.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/dump_context.cc
@@ -30,6 +30,10 @@
 //
 // See dump_context.h for documentation.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "google_breakpad/processor/dump_context.h"
 
 #include <assert.h>
@@ -772,24 +776,14 @@ void DumpContext::Print() {
              context_riscv->t6);
 
 #if defined(__riscv)
-      for (unsigned int freg_index = 0;
-           freg_index < MD_FLOATINGSAVEAREA_RISCV_FPR_COUNT; ++freg_index) {
-        riscv_fpr_size fp_value = context_riscv->float_save.regs[freg_index];
-# if __riscv_flen == 32
-        printf("  float_save.regs[%2d]            = 0x%" PRIx32 "\n",
-               freg_index, fp_value);
-# elif __riscv_flen == 64
-        printf("  float_save.regs[%2d]            = 0x%" PRIx64 "\n",
-               freg_index, fp_value);
-# elif __riscv_flen == 128
-        printf("  float_save.regs[%2d]            = 0x%" PRIx64 "%" PRIx64 "\n",
-               freg_index, fp_value.high, fp_value.low);
-# else
-#  error "Unexpected __riscv_flen"
-# endif
+      for (unsigned int freg_index = 0; freg_index < MD_CONTEXT_RISCV_FPR_COUNT;
+           ++freg_index) {
+        // Breakpad only supports RISCV32 with 32 bit floating point.
+        uint32_t fp_value = context_riscv->fpregs[freg_index];
+        printf("  fpregs[%2d]            = 0x%" PRIx32 "\n", freg_index,
+               fp_value);
       }
-      printf("  float_save.fpcsr     = 0x%" PRIx32 "\n",
-             context_riscv->float_save.fpcsr);
+      printf("  fcsr     = 0x%" PRIx32 "\n", context_riscv->fcsr);
 #endif
       break;
     }
@@ -866,25 +860,14 @@ void DumpContext::Print() {
              context_riscv64->t6);
 
 #if defined(__riscv)
-      for (unsigned int freg_index = 0;
-           freg_index < MD_FLOATINGSAVEAREA_RISCV_FPR_COUNT; ++freg_index) {
-        riscv_fpr_size fp_value = context_riscv64->float_save.regs[freg_index];
-# if __riscv_flen == 32
-        printf("  float_save.regs[%2d]            = 0x%" PRIx32 "\n",
-               freg_index, fp_value);
-# elif __riscv_flen == 64
-        printf("  float_save.regs[%2d]            = 0x%" PRIx64 "\n",
-               freg_index, fp_value);
-# elif __riscv_flen == 128
-        printf("  float_save.regs[%2d]            = 0x%"
-               PRIx64 "%" PRIx64 "\n",
-               freg_index, fp_value.high, fp_value.low);
-# else
-#  error "Unexpected __riscv_flen"
-# endif
+      for (unsigned int freg_index = 0; freg_index < MD_CONTEXT_RISCV_FPR_COUNT;
+           ++freg_index) {
+        // Breakpad only supports RISCV64 with 64 bit floating point.
+        uint64_t fp_value = context_riscv64->fpregs[freg_index];
+        printf("  fpregs[%2d]            = 0x%" PRIx64 "\n", freg_index,
+               fp_value);
       }
-      printf("  float_save.fpcsr     = 0x%" PRIx32 "\n",
-             context_riscv64->float_save.fpcsr);
+      printf("  fcsr     = 0x%" PRIx32 "\n", context_riscv64->fcsr);
 #endif
       break;
     }
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/dump_object.cc b/external_imported/sentry-native/external/breakpad/src/processor/dump_object.cc
index 6186c8faf..4050b11e2 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/dump_object.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/dump_object.cc
@@ -28,6 +28,10 @@
 
 // dump_object.cc: A base class for all mini/micro dump object.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "google_breakpad/processor/dump_object.h"
 
 namespace google_breakpad {
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/exploitability.cc b/external_imported/sentry-native/external/breakpad/src/processor/exploitability.cc
index 7a4107bf9..89064c9b1 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/exploitability.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/exploitability.cc
@@ -33,6 +33,10 @@
 // Author: Cris Neckar
 
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <cassert>
 
 #include "common/scoped_ptr.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/exploitability_linux.cc b/external_imported/sentry-native/external/breakpad/src/processor/exploitability_linux.cc
index c48bbdf5c..76e78f45b 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/exploitability_linux.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/exploitability_linux.cc
@@ -33,6 +33,10 @@
 //
 // Author: Matthew Riley
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "processor/exploitability_linux.h"
 
 #include <string.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/exploitability_unittest.cc b/external_imported/sentry-native/external/breakpad/src/processor/exploitability_unittest.cc
index bc1823c67..09e4690d5 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/exploitability_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/exploitability_unittest.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <stdlib.h>
 #include <unistd.h>
 
@@ -80,7 +84,7 @@ ExploitabilityFor(const string& filename) {
   SimpleSymbolSupplier supplier(TestDataDir() + "/symbols");
   BasicSourceLineResolver resolver;
   MinidumpProcessor processor(&supplier, &resolver, true);
-  processor.set_enable_objdump(true);
+  processor.set_enable_objdump_for_exploitability(true);
   ProcessState state;
 
   string minidump_file = TestDataDir() + "/" + filename;
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/exploitability_win.cc b/external_imported/sentry-native/external/breakpad/src/processor/exploitability_win.cc
index accaadd3e..b94e87255 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/exploitability_win.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/exploitability_win.cc
@@ -33,6 +33,10 @@
 //
 // Author: Cris Neckar
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <vector>
 
 #include "processor/exploitability_win.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/fast_source_line_resolver.cc b/external_imported/sentry-native/external/breakpad/src/processor/fast_source_line_resolver.cc
index 0d1ebc6b4..79803f2ca 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/fast_source_line_resolver.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/fast_source_line_resolver.cc
@@ -36,6 +36,10 @@
 //
 // Author: Siyang Xie (lambxsy@google.com)
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "google_breakpad/processor/fast_source_line_resolver.h"
 #include "processor/fast_source_line_resolver_types.h"
 
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/fast_source_line_resolver_unittest.cc b/external_imported/sentry-native/external/breakpad/src/processor/fast_source_line_resolver_unittest.cc
index 1bb350193..08340c15a 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/fast_source_line_resolver_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/fast_source_line_resolver_unittest.cc
@@ -36,6 +36,10 @@
 //
 // Author: Siyang Xie (lambxsy@google.com)
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <assert.h>
 #include <stdio.h>
 
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/logging.cc b/external_imported/sentry-native/external/breakpad/src/processor/logging.cc
index 136f4f8f4..46386eb5f 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/logging.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/logging.cc
@@ -32,6 +32,10 @@
 //
 // Author: Mark Mentovai
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <assert.h>
 #include <errno.h>
 #include <string.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/map_serializers_unittest.cc b/external_imported/sentry-native/external/breakpad/src/processor/map_serializers_unittest.cc
index 74ebd5e5a..cd31ddc83 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/map_serializers_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/map_serializers_unittest.cc
@@ -31,6 +31,10 @@
 //
 // Author: Siyang Xie (lambxsy@google.com)
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <climits>
 #include <map>
 #include <string>
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/microdump.cc b/external_imported/sentry-native/external/breakpad/src/processor/microdump.cc
index 83fb098cc..94d2c200a 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/microdump.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/microdump.cc
@@ -30,6 +30,10 @@
 //
 // See microdump.h for documentation.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "google_breakpad/processor/microdump.h"
 
 #include <stdio.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/microdump_processor.cc b/external_imported/sentry-native/external/breakpad/src/processor/microdump_processor.cc
index be6150cdd..3c25d5cf0 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/microdump_processor.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/microdump_processor.cc
@@ -30,6 +30,10 @@
 //
 // See microdump_processor.h for documentation.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "google_breakpad/processor/microdump_processor.h"
 
 #include <assert.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/microdump_processor_unittest.cc b/external_imported/sentry-native/external/breakpad/src/processor/microdump_processor_unittest.cc
index 3362431b0..47f5e35ec 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/microdump_processor_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/microdump_processor_unittest.cc
@@ -28,6 +28,10 @@
 
 // Unit test for MicrodumpProcessor.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <fstream>
 #include <iostream>
 #include <string>
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/microdump_stackwalk.cc b/external_imported/sentry-native/external/breakpad/src/processor/microdump_stackwalk.cc
index 593b07d68..222310f76 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/microdump_stackwalk.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/microdump_stackwalk.cc
@@ -29,6 +29,10 @@
 // microdump_stackwalk.cc: Process a microdump with MicrodumpProcessor, printing
 // the results, including stack traces.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/minidump.cc b/external_imported/sentry-native/external/breakpad/src/processor/minidump.cc
index 135770d50..83f72b97b 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/minidump.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/minidump.cc
@@ -32,6 +32,10 @@
 //
 // Author: Mark Mentovai
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "google_breakpad/processor/minidump.h"
 
 #include <assert.h>
@@ -72,6 +76,11 @@ using std::vector;
 
 namespace {
 
+// Limit arrived at by adding up possible states in Intel Ch. 13.5 X-SAVE
+// MANAGED STATE
+// (~ 3680 bytes) plus some extra for the future.
+const uint32_t kMaxXSaveAreaSize = 16384;
+
 // Returns true iff |context_size| matches exactly one of the sizes of the
 // various MDRawContext* types.
 // TODO(blundell): This function can be removed once
@@ -503,6 +512,10 @@ bool MinidumpContext::Read(uint32_t expected_size) {
     // sizeof(MDRawContextAMD64). For now we skip this extended data.
     if (expected_size > sizeof(MDRawContextAMD64)) {
       size_t bytes_left = expected_size - sizeof(MDRawContextAMD64);
+      if (bytes_left > kMaxXSaveAreaSize) {
+        BPLOG(ERROR) << "MinidumpContext oversized xstate area";
+        return false;
+      }
       std::vector<uint8_t> xstate(bytes_left);
       if (!minidump_->ReadBytes(xstate.data(),
                                 bytes_left)) {
@@ -1246,12 +1259,11 @@ bool MinidumpContext::Read(uint32_t expected_size) {
           Swap(&context_riscv->t5);
           Swap(&context_riscv->t6);
 
-          for (int fpr_index = 0;
-               fpr_index < MD_FLOATINGSAVEAREA_RISCV_FPR_COUNT;
+          for (int fpr_index = 0; fpr_index < MD_CONTEXT_RISCV_FPR_COUNT;
                ++fpr_index) {
-            Swap(&context_riscv->float_save.regs[fpr_index]);
+            Swap(&context_riscv->fpregs[fpr_index]);
           }
-          Swap(&context_riscv->float_save.fpcsr);
+          Swap(&context_riscv->fcsr);
         }
         SetContextRISCV(context_riscv.release());
 
@@ -1325,12 +1337,11 @@ bool MinidumpContext::Read(uint32_t expected_size) {
           Swap(&context_riscv64->t5);
           Swap(&context_riscv64->t6);
 
-          for (int fpr_index = 0;
-               fpr_index < MD_FLOATINGSAVEAREA_RISCV_FPR_COUNT;
+          for (int fpr_index = 0; fpr_index < MD_CONTEXT_RISCV_FPR_COUNT;
                ++fpr_index) {
-            Swap(&context_riscv64->float_save.regs[fpr_index]);
+            Swap(&context_riscv64->fpregs[fpr_index]);
           }
-          Swap(&context_riscv64->float_save.fpcsr);
+          Swap(&context_riscv64->fcsr);
         }
         SetContextRISCV64(context_riscv64.release());
 
@@ -5479,6 +5490,27 @@ void MinidumpCrashpadInfo::Print() {
       printf("  module_list[%d].simple_annotations[\"%s\"] = %s\n",
              module_index, annot.first.c_str(), annot.second.c_str());
     }
+    const auto& crashpad_annots =
+        module_crashpad_info_annotation_objects_[module_index];
+    for (const AnnotationObject& annot : crashpad_annots) {
+      std::string str_value;
+      if (annot.type == 1) {
+        // Value represents a C-style string.
+        for (const uint8_t& v : annot.value) {
+          str_value.append(1, static_cast<char>(v));
+        }
+      } else {
+        // Value represents something else.
+        char buffer[3];
+        for (const uint8_t& v : annot.value) {
+          snprintf(buffer, sizeof(buffer), "%02X", v);
+          str_value.append(buffer);
+        }
+      }
+      printf(
+          "  module_list[%d].crashpad_annotations[\"%s\"] (type = %u) = %s\n",
+          module_index, annot.name.c_str(), annot.type, str_value.c_str());
+    }
     printf("  address_mask = %" PRIu64 "\n", crashpad_info_.address_mask);
   }
 
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/minidump_dump.cc b/external_imported/sentry-native/external/breakpad/src/processor/minidump_dump.cc
index 83afd1da5..d3c33ad4f 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/minidump_dump.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/minidump_dump.cc
@@ -31,6 +31,10 @@
 //
 // Author: Mark Mentovai
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/minidump_processor.cc b/external_imported/sentry-native/external/breakpad/src/processor/minidump_processor.cc
index 0073ae4e5..5d2dea6d8 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/minidump_processor.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/minidump_processor.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "google_breakpad/processor/minidump_processor.h"
 
 #include <assert.h>
@@ -59,7 +63,8 @@ MinidumpProcessor::MinidumpProcessor(SymbolSupplier* supplier,
     : frame_symbolizer_(new StackFrameSymbolizer(supplier, resolver)),
       own_frame_symbolizer_(true),
       enable_exploitability_(false),
-      enable_objdump_(false) {
+      enable_objdump_(false),
+      enable_objdump_for_exploitability_(false) {
 }
 
 MinidumpProcessor::MinidumpProcessor(SymbolSupplier* supplier,
@@ -68,7 +73,8 @@ MinidumpProcessor::MinidumpProcessor(SymbolSupplier* supplier,
     : frame_symbolizer_(new StackFrameSymbolizer(supplier, resolver)),
       own_frame_symbolizer_(true),
       enable_exploitability_(enable_exploitability),
-      enable_objdump_(false) {
+      enable_objdump_(false),
+      enable_objdump_for_exploitability_(false) {
 }
 
 MinidumpProcessor::MinidumpProcessor(StackFrameSymbolizer* frame_symbolizer,
@@ -76,7 +82,8 @@ MinidumpProcessor::MinidumpProcessor(StackFrameSymbolizer* frame_symbolizer,
     : frame_symbolizer_(frame_symbolizer),
       own_frame_symbolizer_(false),
       enable_exploitability_(enable_exploitability),
-      enable_objdump_(false) {
+      enable_objdump_(false),
+      enable_objdump_for_exploitability_(false) {
   assert(frame_symbolizer_);
 }
 
@@ -371,9 +378,8 @@ ProcessResult MinidumpProcessor::Process(
   // rating.
   if (enable_exploitability_) {
     scoped_ptr<Exploitability> exploitability(
-        Exploitability::ExploitabilityForPlatform(dump,
-                                                  process_state,
-                                                  enable_objdump_));
+        Exploitability::ExploitabilityForPlatform(
+          dump, process_state, enable_objdump_for_exploitability_));
     // The engine will be null if the platform is not supported
     if (exploitability != NULL) {
       process_state->exploitability_ = exploitability->CheckExploitability();
@@ -629,6 +635,16 @@ bool MinidumpProcessor::GetCPUInfo(Minidump* dump, SystemInfo* info) {
       break;
     }
 
+    case MD_CPU_ARCHITECTURE_RISCV: {
+      info->cpu = "riscv";
+      break;
+    }
+
+    case MD_CPU_ARCHITECTURE_RISCV64: {
+      info->cpu = "riscv64";
+      break;
+    }
+
     default: {
       // Assign the numeric architecture ID into the CPU string.
       char cpu_string[7];
@@ -1782,6 +1798,21 @@ string MinidumpProcessor::GetCrashReason(Minidump* dump, uint64_t* address,
             case MD_EXCEPTION_FLAG_LIN_SEGV_PKUERR:
               reason.append("SEGV_PKUERR");
               break;
+            case MD_EXCEPTION_FLAG_LIN_SEGV_ACCADI:
+              reason.append("SEGV_ACCADI");
+              break;
+            case MD_EXCEPTION_FLAG_LIN_SEGV_ADIDERR:
+              reason.append("SEGV_ADIDERR");
+              break;
+            case MD_EXCEPTION_FLAG_LIN_SEGV_ADIPERR:
+              reason.append("SEGV_ADIPERR");
+              break;
+            case MD_EXCEPTION_FLAG_LIN_SEGV_MTEAERR:
+              reason.append("SEGV_MTEAERR");
+              break;
+            case MD_EXCEPTION_FLAG_LIN_SEGV_MTESERR:
+              reason.append("SEGV_MTESERR");
+              break;
             default:
               reason.append(flags_string);
               BPLOG(INFO) << "Unknown exception reason " << reason;
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/minidump_processor_unittest.cc b/external_imported/sentry-native/external/breakpad/src/processor/minidump_processor_unittest.cc
index 1ca8c9fbd..de3cfdd59 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/minidump_processor_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/minidump_processor_unittest.cc
@@ -29,6 +29,10 @@
 // Unit test for MinidumpProcessor.  Uses a pre-generated minidump and
 // corresponding symbol file, and checks the stack frames for correctness.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <stdlib.h>
 
 #include <string>
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/minidump_stackwalk.cc b/external_imported/sentry-native/external/breakpad/src/processor/minidump_stackwalk.cc
index cee9a734d..74b41acf7 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/minidump_stackwalk.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/minidump_stackwalk.cc
@@ -31,6 +31,10 @@
 //
 // Author: Mark Mentovai
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
@@ -57,6 +61,7 @@ struct Options {
   bool machine_readable;
   bool output_stack_contents;
   bool output_requesting_thread_only;
+  bool brief;
 
   string minidump_file;
   std::vector<string> symbol_paths;
@@ -110,6 +115,8 @@ bool PrintMinidumpProcess(const Options& options) {
 
   if (options.machine_readable) {
     PrintProcessStateMachineReadable(process_state);
+  } else if (options.brief) {
+    PrintRequestingThreadBrief(process_state);
   } else {
     PrintProcessState(process_state, options.output_stack_contents,
                       options.output_requesting_thread_only, &resolver);
@@ -130,7 +137,8 @@ static void Usage(int argc, const char *argv[], bool error) {
           "\n"
           "  -m         Output in machine-readable format\n"
           "  -s         Output stack contents\n"
-          "  -c         Output thread that causes crash or dump only\n",
+          "  -c         Output thread that causes crash or dump only\n"
+          "  -b         Brief of the thread that causes crash or dump\n",
           google_breakpad::BaseName(argv[0]).c_str());
 }
 
@@ -140,14 +148,18 @@ static void SetupOptions(int argc, const char *argv[], Options* options) {
   options->machine_readable = false;
   options->output_stack_contents = false;
   options->output_requesting_thread_only = false;
+  options->brief = false;
 
-  while ((ch = getopt(argc, (char * const*)argv, "chms")) != -1) {
+  while ((ch = getopt(argc, (char* const*)argv, "bchms")) != -1) {
     switch (ch) {
       case 'h':
         Usage(argc, argv, false);
         exit(0);
         break;
 
+      case 'b':
+        options->brief = true;
+        break;
       case 'c':
         options->output_requesting_thread_only = true;
         break;
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/minidump_unittest.cc b/external_imported/sentry-native/external/breakpad/src/processor/minidump_unittest.cc
index 53d44ae1e..719adf78a 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/minidump_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/minidump_unittest.cc
@@ -29,6 +29,10 @@
 // Unit test for Minidump.  Uses a pre-generated minidump and
 // verifies that certain streams are correct.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <iostream>
 #include <fstream>
 #include <sstream>
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/module_comparer.cc b/external_imported/sentry-native/external/breakpad/src/processor/module_comparer.cc
index 389712c50..a6413038a 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/module_comparer.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/module_comparer.cc
@@ -31,6 +31,10 @@
 //
 // Author: lambxsy@google.com (Siyang Xie)
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "processor/module_comparer.h"
 
 #include <map>
@@ -64,7 +68,7 @@ bool ModuleComparer::Compare(const string& symbol_data) {
   buffer.reset();
 
   // Serialize BasicSourceLineResolver::Module.
-  unsigned int serialized_size = 0;
+  size_t serialized_size = 0;
   scoped_array<char> serialized_data(
       serializer_.Serialize(*(basic_module.get()), &serialized_size));
   ASSERT_TRUE(serialized_data.get());
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/module_serializer.cc b/external_imported/sentry-native/external/breakpad/src/processor/module_serializer.cc
index d04450946..05519958f 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/module_serializer.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/module_serializer.cc
@@ -32,6 +32,10 @@
 //
 // Author: Siyang Xie (lambxsy@google.com)
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "processor/module_serializer.h"
 
 #include <map>
@@ -107,10 +111,10 @@ char* ModuleSerializer::Write(const BasicSourceLineResolver::Module& module,
   return dest;
 }
 
-char* ModuleSerializer::Serialize(
-    const BasicSourceLineResolver::Module& module, unsigned int* size) {
+char* ModuleSerializer::Serialize(const BasicSourceLineResolver::Module& module,
+                                  size_t* size) {
   // Compute size of memory to allocate.
-  unsigned int size_to_alloc = SizeOf(module);
+  const size_t size_to_alloc = SizeOf(module);
 
   // Allocate memory for serialized data.
   char* serialized_data = new char[size_to_alloc];
@@ -124,8 +128,8 @@ char* ModuleSerializer::Serialize(
   // Write serialized data to allocated memory chunk.
   char* end_address = Write(module, serialized_data);
   // Verify the allocated memory size is equal to the size of data been written.
-  unsigned int size_written =
-      static_cast<unsigned int>(end_address - serialized_data);
+  const size_t size_written =
+      static_cast<size_t>(end_address - serialized_data);
   if (size_to_alloc != size_written) {
     BPLOG(ERROR) << "size_to_alloc differs from size_written: "
                    << size_to_alloc << " vs " << size_written;
@@ -134,6 +138,7 @@ char* ModuleSerializer::Serialize(
   // Set size and return the start address of memory chunk.
   if (size)
     *size = size_to_alloc;
+
   return serialized_data;
 }
 
@@ -146,7 +151,7 @@ bool ModuleSerializer::SerializeModuleAndLoadIntoFastResolver(
   BasicSourceLineResolver::Module* basic_module =
       dynamic_cast<BasicSourceLineResolver::Module*>(iter->second);
 
-  unsigned int size = 0;
+  size_t size = 0;
   scoped_array<char> symbol_data(Serialize(*basic_module, &size));
   if (!symbol_data.get()) {
     BPLOG(ERROR) << "Serialization failed for module: " << basic_module->name_;
@@ -197,8 +202,8 @@ bool ModuleSerializer::ConvertOneModule(
   return SerializeModuleAndLoadIntoFastResolver(iter, fast_resolver);
 }
 
-char* ModuleSerializer::SerializeSymbolFileData(
-    const string& symbol_data, unsigned int* size) {
+char* ModuleSerializer::SerializeSymbolFileData(const string& symbol_data,
+                                                size_t* size) {
   scoped_ptr<BasicSourceLineResolver::Module> module(
       new BasicSourceLineResolver::Module("no name"));
   scoped_array<char> buffer(new char[symbol_data.size() + 1]);
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/module_serializer.h b/external_imported/sentry-native/external/breakpad/src/processor/module_serializer.h
index 4e365a417..fd387cbbc 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/module_serializer.h
+++ b/external_imported/sentry-native/external/breakpad/src/processor/module_serializer.h
@@ -72,13 +72,13 @@ class ModuleSerializer {
   // Caller takes the ownership of the memory chunk (allocated on heap), and
   // owner should call delete [] to free the memory after use.
   char* Serialize(const BasicSourceLineResolver::Module& module,
-                  unsigned int* size = NULL);
+                  size_t* size = nullptr);
 
   // Given the string format symbol_data, produces a chunk of serialized data.
   // Caller takes ownership of the serialized data (on heap), and owner should
   // call delete [] to free the memory after use.
   char* SerializeSymbolFileData(const string& symbol_data,
-                                unsigned int* size = NULL);
+                                size_t* size = nullptr);
 
   // Serializes one loaded module with given moduleid in the basic source line
   // resolver, and loads the serialized data into the fast source line resolver.
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/pathname_stripper.cc b/external_imported/sentry-native/external/breakpad/src/processor/pathname_stripper.cc
index f34b53f7f..11dc6974e 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/pathname_stripper.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/pathname_stripper.cc
@@ -32,6 +32,10 @@
 //
 // Author: Mark Mentovai
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "processor/pathname_stripper.h"
 
 namespace google_breakpad {
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/pathname_stripper_unittest.cc b/external_imported/sentry-native/external/breakpad/src/processor/pathname_stripper_unittest.cc
index ff474a7b7..c5c39cc80 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/pathname_stripper_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/pathname_stripper_unittest.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <stdio.h>
 
 #include "processor/pathname_stripper.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/postfix_evaluator_unittest.cc b/external_imported/sentry-native/external/breakpad/src/processor/postfix_evaluator_unittest.cc
index 76d857511..d3c524092 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/postfix_evaluator_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/postfix_evaluator_unittest.cc
@@ -30,6 +30,10 @@
 //
 // Author: Mark Mentovai
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <assert.h>
 #include <stdio.h>
 
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/proc_maps_linux.cc b/external_imported/sentry-native/external/breakpad/src/processor/proc_maps_linux.cc
index 05c1145a9..6fcb909a1 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/proc_maps_linux.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/proc_maps_linux.cc
@@ -6,6 +6,10 @@
 #define __STDC_FORMAT_MACROS
 #endif
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "google_breakpad/processor/proc_maps_linux.h"
 
 #include <fcntl.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/proc_maps_linux_unittest.cc b/external_imported/sentry-native/external/breakpad/src/processor/proc_maps_linux_unittest.cc
index dc51babb9..3d683cad7 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/proc_maps_linux_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/proc_maps_linux_unittest.cc
@@ -2,6 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "breakpad_googletest_includes.h"
 #include "common/using_std_string.h"
 #include "google_breakpad/processor/proc_maps_linux.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/process_state.cc b/external_imported/sentry-native/external/breakpad/src/processor/process_state.cc
index 95bbd48dc..c5c38b6cc 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/process_state.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/process_state.cc
@@ -32,6 +32,10 @@
 //
 // Author: Mark Mentovai
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "google_breakpad/processor/process_state.h"
 #include "google_breakpad/processor/call_stack.h"
 #include "google_breakpad/processor/code_modules.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/range_map_truncate_lower_unittest.cc b/external_imported/sentry-native/external/breakpad/src/processor/range_map_truncate_lower_unittest.cc
index 12dad8733..b3599fc50 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/range_map_truncate_lower_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/range_map_truncate_lower_unittest.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <limits.h>
 #include <stdio.h>
 
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/range_map_truncate_upper_unittest.cc b/external_imported/sentry-native/external/breakpad/src/processor/range_map_truncate_upper_unittest.cc
index 57046e196..aa058ad46 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/range_map_truncate_upper_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/range_map_truncate_upper_unittest.cc
@@ -31,6 +31,10 @@
 //
 // Author: Ivan Penkov
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <limits.h>
 #include <stdio.h>
 
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/range_map_unittest.cc b/external_imported/sentry-native/external/breakpad/src/processor/range_map_unittest.cc
index 2745e8097..8735bb095 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/range_map_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/range_map_unittest.cc
@@ -31,6 +31,10 @@
 // Author: Mark Mentovai
 
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <limits.h>
 #include <stdio.h>
 
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/simple_symbol_supplier.cc b/external_imported/sentry-native/external/breakpad/src/processor/simple_symbol_supplier.cc
index 5b3f6819e..0de34c949 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/simple_symbol_supplier.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/simple_symbol_supplier.cc
@@ -32,6 +32,10 @@
 //
 // Author: Mark Mentovai
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "processor/simple_symbol_supplier.h"
 
 #include <assert.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/source_line_resolver_base.cc b/external_imported/sentry-native/external/breakpad/src/processor/source_line_resolver_base.cc
index 5c0b6cd7a..da9ff7624 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/source_line_resolver_base.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/source_line_resolver_base.cc
@@ -33,6 +33,10 @@
 //
 // Author: Siyang Xie (lambxsy@google.com)
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/stack_frame_cpu.cc b/external_imported/sentry-native/external/breakpad/src/processor/stack_frame_cpu.cc
index e31a31988..4a4a052cc 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/stack_frame_cpu.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/stack_frame_cpu.cc
@@ -32,6 +32,10 @@
 //
 // Author: Colin Blundell
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "google_breakpad/processor/stack_frame_cpu.h"
 
 namespace google_breakpad {
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/stack_frame_symbolizer.cc b/external_imported/sentry-native/external/breakpad/src/processor/stack_frame_symbolizer.cc
index 0d124a021..3afd471b8 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/stack_frame_symbolizer.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/stack_frame_symbolizer.cc
@@ -31,6 +31,10 @@
 // line information in a stack frame, and also looks up WindowsFrameInfo or
 // CFIFrameInfo for a stack frame.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "google_breakpad/processor/stack_frame_symbolizer.h"
 
 #include <assert.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/stackwalk_common.cc b/external_imported/sentry-native/external/breakpad/src/processor/stackwalk_common.cc
index a1b6364d1..688b27823 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/stackwalk_common.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/stackwalk_common.cc
@@ -31,6 +31,10 @@
 //
 // Author: Mark Mentovai
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "processor/stackwalk_common.h"
 
 #include <assert.h>
@@ -273,6 +277,32 @@ static void PrintStackContents(const string& indent,
   printf("\n");
 }
 
+static void PrintFrameHeader(const StackFrame* frame, int frame_index) {
+  printf("%2d  ", frame_index);
+
+  uint64_t instruction_address = frame->ReturnAddress();
+
+  if (frame->module) {
+    printf("%s", PathnameStripper::File(frame->module->code_file()).c_str());
+    if (!frame->function_name.empty()) {
+      printf("!%s", frame->function_name.c_str());
+      if (!frame->source_file_name.empty()) {
+        string source_file = PathnameStripper::File(frame->source_file_name);
+        printf(" [%s : %d + 0x%" PRIx64 "]", source_file.c_str(),
+               frame->source_line,
+               instruction_address - frame->source_line_base);
+      } else {
+        printf(" + 0x%" PRIx64, instruction_address - frame->function_base);
+      }
+    } else {
+      printf(" + 0x%" PRIx64,
+             instruction_address - frame->module->base_address());
+    }
+  } else {
+    printf("0x%" PRIx64, instruction_address);
+  }
+}
+
 // PrintStack prints the call stack in |stack| to stdout, in a reasonably
 // useful form.  Module, function, and source file names are displayed if
 // they are available.  The code offset to the base code address of the
@@ -294,30 +324,7 @@ static void PrintStack(const CallStack* stack,
   }
   for (int frame_index = 0; frame_index < frame_count; ++frame_index) {
     const StackFrame* frame = stack->frames()->at(frame_index);
-    printf("%2d  ", frame_index);
-
-    uint64_t instruction_address = frame->ReturnAddress();
-
-    if (frame->module) {
-      printf("%s", PathnameStripper::File(frame->module->code_file()).c_str());
-      if (!frame->function_name.empty()) {
-        printf("!%s", frame->function_name.c_str());
-        if (!frame->source_file_name.empty()) {
-          string source_file = PathnameStripper::File(frame->source_file_name);
-          printf(" [%s : %d + 0x%" PRIx64 "]",
-                 source_file.c_str(),
-                 frame->source_line,
-                 instruction_address - frame->source_line_base);
-        } else {
-          printf(" + 0x%" PRIx64, instruction_address - frame->function_base);
-        }
-      } else {
-        printf(" + 0x%" PRIx64,
-               instruction_address - frame->module->base_address());
-      }
-    } else {
-      printf("0x%" PRIx64, instruction_address);
-    }
+    PrintFrameHeader(frame, frame_index);
     printf("\n ");
 
     // Inlined frames don't have registers info.
@@ -1277,4 +1284,21 @@ void PrintProcessStateMachineReadable(const ProcessState& process_state) {
   }
 }
 
+void PrintRequestingThreadBrief(const ProcessState& process_state) {
+  int requesting_thread = process_state.requesting_thread();
+  if (requesting_thread == -1) {
+    printf(" <no crashing or requesting dump thread identified>\n");
+    return;
+  }
+
+  printf("Thread %d (%s)\n", requesting_thread,
+         process_state.crashed() ? "crashed" : "requested dump, did not crash");
+  const CallStack* stack = process_state.threads()->at(requesting_thread);
+  int frame_count = stack->frames()->size();
+  for (int frame_index = 0; frame_index < frame_count; ++frame_index) {
+    PrintFrameHeader(stack->frames()->at(frame_index), frame_index);
+    printf("\n");
+  }
+}
+
 }  // namespace google_breakpad
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/stackwalk_common.h b/external_imported/sentry-native/external/breakpad/src/processor/stackwalk_common.h
index bb12b98f4..3782f987b 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/stackwalk_common.h
+++ b/external_imported/sentry-native/external/breakpad/src/processor/stackwalk_common.h
@@ -43,6 +43,7 @@ void PrintProcessState(const ProcessState& process_state,
                        bool output_stack_contents,
                        bool output_requesting_thread_only,
                        SourceLineResolverInterface* resolver);
+void PrintRequestingThreadBrief(const ProcessState& process_state);
 
 }  // namespace google_breakpad
 
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker.cc b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker.cc
index e607b7212..1ff6cf7cb 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker.cc
@@ -32,6 +32,10 @@
 //
 // Author: Mark Mentovai
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "google_breakpad/processor/stackwalker.h"
 
 #include <assert.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_address_list.cc b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_address_list.cc
index b393d4757..7c346c665 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_address_list.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_address_list.cc
@@ -32,6 +32,10 @@
 //
 // Author: Chris Hamilton <chrisha@chromium.org>
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <assert.h>
 
 #include <vector>
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_address_list.h b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_address_list.h
index 28d377c3e..d27f3fb2d 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_address_list.h
+++ b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_address_list.h
@@ -36,7 +36,6 @@
 #ifndef PROCESSOR_STACKWALKER_ADDRESS_LIST_H_
 #define PROCESSOR_STACKWALKER_ADDRESS_LIST_H_
 
-#include "common/basictypes.h"
 #include "google_breakpad/common/breakpad_types.h"
 #include "google_breakpad/processor/stackwalker.h"
 
@@ -53,6 +52,8 @@ class StackwalkerAddressList : public Stackwalker {
                          size_t frame_count,
                          const CodeModules* modules,
                          StackFrameSymbolizer* frame_symbolizer);
+  StackwalkerAddressList(const StackwalkerAddressList&) = delete;
+  void operator=(const StackwalkerAddressList&) = delete;
 
  private:
   // Implementation of Stackwalker.
@@ -62,8 +63,6 @@ class StackwalkerAddressList : public Stackwalker {
 
   const uint64_t* frames_;
   size_t frame_count_;
-
-  DISALLOW_COPY_AND_ASSIGN(StackwalkerAddressList);
 };
 
 }  // namespace google_breakpad
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_address_list_unittest.cc b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_address_list_unittest.cc
index feda62681..1b5a4fc79 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_address_list_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_address_list_unittest.cc
@@ -31,6 +31,10 @@
 //
 // Author: Chris Hamilton <chrisha@chromium.org>
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <string>
 #include <vector>
 
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_amd64.cc b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_amd64.cc
index 6a539709f..b934e73b4 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_amd64.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_amd64.cc
@@ -32,6 +32,10 @@
 //
 // Author: Mark Mentovai, Ted Mielczarek
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <assert.h>
 
 #include "common/scoped_ptr.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_amd64_unittest.cc b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_amd64_unittest.cc
index a7e513e93..88f6ef7f0 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_amd64_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_amd64_unittest.cc
@@ -30,6 +30,10 @@
 
 // stackwalker_amd64_unittest.cc: Unit tests for StackwalkerAMD64 class.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <string.h>
 #include <string>
 #include <vector>
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_arm.cc b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_arm.cc
index 7df2eb6d3..5f6f3e8da 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_arm.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_arm.cc
@@ -32,6 +32,10 @@
 //
 // Author: Mark Mentovai, Ted Mielczarek, Jim Blandy
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <vector>
 
 #include "common/scoped_ptr.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_arm64.cc b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_arm64.cc
index ae3a05958..0fa02e04f 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_arm64.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_arm64.cc
@@ -32,6 +32,10 @@
 //
 // Author: Mark Mentovai, Ted Mielczarek, Jim Blandy, Colin Blundell
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <vector>
 
 #include "common/scoped_ptr.h"
@@ -263,15 +267,25 @@ void StackwalkerARM64::CorrectRegLRByFramePointer(
           last_frame->context.iregs[MD_CONTEXT_ARM64_REG_SP])
     return;
 
-  StackFrameARM64* last_last_frame =
-      static_cast<StackFrameARM64*>(*(frames.end() - 2));
-  uint64_t last_last_fp =
-      last_last_frame->context.iregs[MD_CONTEXT_ARM64_REG_FP];
+  // Searching for a real callee frame. Skipping inline frames since they
+  // don't contain context (and cannot be downcasted to StackFrameARM64).
+  size_t last_frame_callee_id = frames.size() - 2;
+  while (last_frame_callee_id >= 0 && frames[last_frame_callee_id]->trust ==
+                                          StackFrame::FRAME_TRUST_INLINE) {
+    last_frame_callee_id--;
+  }
+  if (last_frame_callee_id < 0) return;
+  StackFrameARM64* last_frame_callee =
+      static_cast<StackFrameARM64*>(frames[last_frame_callee_id]);
+
+  uint64_t last_frame_callee_fp =
+      last_frame_callee->context.iregs[MD_CONTEXT_ARM64_REG_FP];
 
   uint64_t last_fp = 0;
-  if (last_last_fp && !memory_->GetMemoryAtAddress(last_last_fp, &last_fp)) {
-    BPLOG(ERROR) << "Unable to read last_fp from last_last_fp: 0x"
-                 << std::hex << last_last_fp;
+  if (last_frame_callee_fp &&
+      !memory_->GetMemoryAtAddress(last_frame_callee_fp, &last_fp)) {
+    BPLOG(ERROR) << "Unable to read last_fp from last_last_fp: 0x" << std::hex
+                 << last_frame_callee_fp;
     return;
   }
   // Give up if STACK CFI doesn't agree with frame pointer.
@@ -279,9 +293,10 @@ void StackwalkerARM64::CorrectRegLRByFramePointer(
     return;
 
   uint64_t last_lr = 0;
-  if (last_last_fp && !memory_->GetMemoryAtAddress(last_last_fp + 8, &last_lr)) {
+  if (last_frame_callee_fp &&
+      !memory_->GetMemoryAtAddress(last_frame_callee_fp + 8, &last_lr)) {
     BPLOG(ERROR) << "Unable to read last_lr from (last_last_fp + 8): 0x"
-                 << std::hex << (last_last_fp + 8);
+                 << std::hex << (last_frame_callee_fp + 8);
     return;
   }
   last_lr = PtrauthStrip(last_lr);
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_arm64_unittest.cc b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_arm64_unittest.cc
index 37475058f..f302d7d56 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_arm64_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_arm64_unittest.cc
@@ -30,6 +30,10 @@
 
 // stackwalker_arm64_unittest.cc: Unit tests for StackwalkerARM64 class.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <string.h>
 #include <string>
 #include <vector>
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_arm_unittest.cc b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_arm_unittest.cc
index 20c810a71..6103e2029 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_arm_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_arm_unittest.cc
@@ -30,6 +30,10 @@
 
 // stackwalker_arm_unittest.cc: Unit tests for StackwalkerARM class.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <string.h>
 #include <string>
 #include <vector>
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_mips.cc b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_mips.cc
index 11b08fae7..7195c1627 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_mips.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_mips.cc
@@ -32,6 +32,10 @@
 //
 // Author: Tata Elxsi
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/scoped_ptr.h"
 #include "google_breakpad/processor/call_stack.h"
 #include "google_breakpad/processor/code_modules.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_mips64_unittest.cc b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_mips64_unittest.cc
index aefcf8eec..55b7503fa 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_mips64_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_mips64_unittest.cc
@@ -31,6 +31,10 @@
 // stackwalker_mips64_unittest.cc: Unit tests for StackwalkerMIPS class for
 // mips64 platforms.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <string.h>
 #include <string>
 #include <vector>
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_mips_unittest.cc b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_mips_unittest.cc
index ac7324c46..305f4db8d 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_mips_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_mips_unittest.cc
@@ -30,6 +30,10 @@
 
 // stackwalker_mips_unittest.cc: Unit tests for StackwalkerMIPS class.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <string.h>
 #include <string>
 #include <vector>
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_ppc.cc b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_ppc.cc
index e71d91380..0083392b5 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_ppc.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_ppc.cc
@@ -33,6 +33,10 @@
 // Author: Mark Mentovai
 
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/scoped_ptr.h"
 #include "processor/stackwalker_ppc.h"
 #include "google_breakpad/processor/call_stack.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_ppc64.cc b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_ppc64.cc
index 9ac8e45bd..c36d16be3 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_ppc64.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_ppc64.cc
@@ -31,6 +31,10 @@
 // See stackwalker_ppc64.h for documentation.
 
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/scoped_ptr.h"
 #include "processor/stackwalker_ppc64.h"
 #include "google_breakpad/processor/call_stack.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_riscv.cc b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_riscv.cc
index 3d8a64f4f..c3681a617 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_riscv.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_riscv.cc
@@ -33,6 +33,10 @@
  * Author: Iacopo Colonnelli
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/scoped_ptr.h"
 #include "google_breakpad/processor/call_stack.h"
 #include "google_breakpad/processor/code_modules.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_riscv64.cc b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_riscv64.cc
index d97bad631..0ed7b5e65 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_riscv64.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_riscv64.cc
@@ -33,6 +33,10 @@
  * Author: Iacopo Colonnelli
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "common/scoped_ptr.h"
 #include "google_breakpad/processor/call_stack.h"
 #include "google_breakpad/processor/code_modules.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_riscv64_unittest.cc b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_riscv64_unittest.cc
index 73c062642..c8579b9b9 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_riscv64_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_riscv64_unittest.cc
@@ -31,6 +31,10 @@
  * Author: Iacopo Colonnelli
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <string.h>
 #include <string>
 #include <vector>
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_riscv_unittest.cc b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_riscv_unittest.cc
index f4a6b79cc..37f0e233a 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_riscv_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_riscv_unittest.cc
@@ -31,6 +31,10 @@
  * Author: Iacopo Colonnelli
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <string.h>
 #include <string>
 #include <vector>
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_selftest.cc b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_selftest.cc
index 2737f64dc..4f3483b41 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_selftest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_selftest.cc
@@ -48,6 +48,10 @@
 //
 // Author: Mark Mentovai
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <assert.h>
 
 #include "processor/logging.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_sparc.cc b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_sparc.cc
index fb76744cb..ed7f7dc3d 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_sparc.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_sparc.cc
@@ -33,6 +33,10 @@
 // Author: Michael Shang
 
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "google_breakpad/processor/call_stack.h"
 #include "google_breakpad/processor/memory_region.h"
 #include "google_breakpad/processor/stack_frame_cpu.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_x86.cc b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_x86.cc
index b598c5bd6..9bda5f8c4 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_x86.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_x86.cc
@@ -32,6 +32,10 @@
 //
 // Author: Mark Mentovai
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <assert.h>
 #include <string>
 
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_x86_unittest.cc b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_x86_unittest.cc
index 3d786b8e3..b614b0e44 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_x86_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_x86_unittest.cc
@@ -30,6 +30,10 @@
 
 // stackwalker_x86_unittest.cc: Unit tests for StackwalkerX86 class.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <string>
 #include <vector>
 
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/static_address_map_unittest.cc b/external_imported/sentry-native/external/breakpad/src/processor/static_address_map_unittest.cc
index 2e206a099..aebab976c 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/static_address_map_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/static_address_map_unittest.cc
@@ -30,6 +30,10 @@
 //
 // Author: Siyang Xie (lambxsy@google.com)
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <climits>
 #include <cstdlib>
 #include <ctime>
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/static_contained_range_map_unittest.cc b/external_imported/sentry-native/external/breakpad/src/processor/static_contained_range_map_unittest.cc
index cdc11c1db..d0507a4b1 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/static_contained_range_map_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/static_contained_range_map_unittest.cc
@@ -31,6 +31,10 @@
 //
 // Author: Siyang Xie (lambxsy@google.com)
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "breakpad_googletest_includes.h"
 #include "common/scoped_ptr.h"
 #include "processor/contained_range_map-inl.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/static_map_unittest.cc b/external_imported/sentry-native/external/breakpad/src/processor/static_map_unittest.cc
index 4360e8c61..67b201b63 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/static_map_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/static_map_unittest.cc
@@ -30,6 +30,10 @@
 //
 // Author: Siyang Xie (lambxsy@google.com)
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <climits>
 #include <map>
 
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/static_range_map_unittest.cc b/external_imported/sentry-native/external/breakpad/src/processor/static_range_map_unittest.cc
index 3903e9486..d4ddec0c5 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/static_range_map_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/static_range_map_unittest.cc
@@ -30,6 +30,10 @@
 //
 // Author: Siyang Xie (lambxsy@google.com)
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "breakpad_googletest_includes.h"
 #include "common/scoped_ptr.h"
 #include "processor/range_map-inl.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/symbolic_constants_win.cc b/external_imported/sentry-native/external/breakpad/src/processor/symbolic_constants_win.cc
index 0c57b6868..98c2b4dde 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/symbolic_constants_win.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/symbolic_constants_win.cc
@@ -32,6 +32,10 @@
 //
 // Author: Ben Wagner
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <string>
 
 #include "common/stdio_wrapper.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/synth_minidump.cc b/external_imported/sentry-native/external/breakpad/src/processor/synth_minidump.cc
index 9dacb395a..e51d1060a 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/synth_minidump.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/synth_minidump.cc
@@ -30,6 +30,10 @@
 
 // synth_minidump.cc: Implementation of SynthMinidump.  See synth_minidump.h
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "processor/synth_minidump.h"
 
 namespace google_breakpad {
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/synth_minidump_unittest.cc b/external_imported/sentry-native/external/breakpad/src/processor/synth_minidump_unittest.cc
index 4bc46747b..3b803afe3 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/synth_minidump_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/synth_minidump_unittest.cc
@@ -31,6 +31,10 @@
 // synth_minidump_unittest.cc: Unit tests for google_breakpad::SynthMinidump
 // classes.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <sstream>
 #include <string>
 
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/testdata/linux_test_app.cc b/external_imported/sentry-native/external/breakpad/src/processor/testdata/linux_test_app.cc
index 4ff4f7076..b0bbb6698 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/testdata/linux_test_app.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/testdata/linux_test_app.cc
@@ -38,6 +38,10 @@
 // generate an executable with STABS symbols (needs -m32), or -gdwarf-2 for one
 // with DWARF symbols (32- or 64-bit)
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <stdio.h>
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/testdata/test_app.cc b/external_imported/sentry-native/external/breakpad/src/processor/testdata/test_app.cc
index 79cabef09..83468fbbf 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/testdata/test_app.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/testdata/test_app.cc
@@ -31,6 +31,10 @@
 //   google_breakpad/src/client/windows/releasestaticcrt/exception_handler.lib
 // Then run test_app to generate a dump, and dump_syms to create the .sym file.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <stdio.h>
 
 #include "client/windows/handler/exception_handler.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/processor/tokenize.cc b/external_imported/sentry-native/external/breakpad/src/processor/tokenize.cc
index 4e62f2ea8..a46c9644c 100644
--- a/external_imported/sentry-native/external/breakpad/src/processor/tokenize.cc
+++ b/external_imported/sentry-native/external/breakpad/src/processor/tokenize.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <string.h>
 
 #include <string>
diff --git a/external_imported/sentry-native/external/breakpad/src/third_party/libdisasm/x86_format.c b/external_imported/sentry-native/external/breakpad/src/third_party/libdisasm/x86_format.c
index 0ec960dc8..bb547ad4c 100644
--- a/external_imported/sentry-native/external/breakpad/src/third_party/libdisasm/x86_format.c
+++ b/external_imported/sentry-native/external/breakpad/src/third_party/libdisasm/x86_format.c
@@ -29,7 +29,7 @@
 } while( 0 )
 
 #define STRNCATF( buf, fmt, data, len ) do {        \
-        char _tmp[MAX_OP_STRING];                   \
+        char _tmp[MAX_OP_XML_STRING];               \
                                                     \
         snprintf( _tmp, sizeof _tmp, fmt, data );   \
         STRNCAT( buf, _tmp, len );                  \
diff --git a/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/README b/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/README
index c681bb3d6..2b855b60c 100644
--- a/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/README
+++ b/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/README
@@ -1,2 +1,25 @@
-These headers were copied from the Mac OS X 10.7 SDK to enable building
-the Mac dump_syms code that processes Mach-O files on Linux.
+These headers were copied to enable building the Mac dump_syms code that
+processes Mach-O files on Linux.
+
+From xnu-8792.41.9 (https://github.com/apple-oss-distributions/xnu at 5c2921b)
+i386/_types.h
+arm/_types.h
+mach/boolean.h
+mach/machine.h
+mach/thread_status.h
+mach/vm_prot.h
+mach/i386/boolean.h
+mach/i386/vm_types.h
+mach/arm/boolean.h
+mach/arm/vm_types.h
+mach/machine/boolean.h
+mach/machine/vm_types.h
+
+From cctools-986 (https://github.com/apple-oss-distributions/cctools at cbe977a)
+mach-o/arch.h
+mach-o/fat.h
+mach-o/loader.h
+mach-o/nlist.h
+
+From architecture-282 (https://github.com/apple-oss-distributions/architecture at fe86900)
+architecture/byte_order.h
diff --git a/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/architecture/byte_order.h b/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/architecture/byte_order.h
index b772d9f38..1f723ae14 100644
--- a/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/architecture/byte_order.h
+++ b/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/architecture/byte_order.h
@@ -2,14 +2,14 @@
  * Copyright (c) 1999-2008 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
- * 
+ *
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
  * compliance with the License. Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this
  * file.
- * 
+ *
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
@@ -17,7 +17,7 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
- * 
+ *
  * @APPLE_LICENSE_HEADER_END@
  */
 /*
@@ -26,20 +26,14 @@
  * Byte ordering conversion.
  *
  */
-/* This file mostly left blank */
 
-#ifndef _ARCHITECTURE_BYTE_ORDER_H_
+#ifndef	_ARCHITECTURE_BYTE_ORDER_H_
 #define _ARCHITECTURE_BYTE_ORDER_H_
 
-/*
- * Identify the byte order
- * of the current host.
- */
-
 enum NXByteOrder {
     NX_UnknownByteOrder,
     NX_LittleEndian,
     NX_BigEndian
 };
 
-#endif  /* _ARCHITECTURE_BYTE_ORDER_H_ */
+#endif	/* _ARCHITECTURE_BYTE_ORDER_H_ */
\ No newline at end of file
diff --git a/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/arm/_types.h b/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/arm/_types.h
new file mode 100644
index 000000000..f464d6bd6
--- /dev/null
+++ b/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/arm/_types.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ */
+#ifndef _BSD_ARM__TYPES_H_
+#define _BSD_ARM__TYPES_H_
+
+#if defined (__arm__) || defined (__arm64__) || defined (__aarch64__)
+
+
+typedef long                    __darwin_intptr_t;
+typedef unsigned int            __darwin_natural_t;
+
+
+#endif /* defined (__arm__) || defined (__arm64__) || defined (__aarch64__) */
+
+#endif  /* _BSD_ARM__TYPES_H_ */
\ No newline at end of file
diff --git a/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/i386/_types.h b/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/i386/_types.h
index 2ed7fd675..c0478d3ff 100644
--- a/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/i386/_types.h
+++ b/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/i386/_types.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2000-2003 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
+ *
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
@@ -11,10 +11,10 @@
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.
- * 
+ *
  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
+ *
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
@@ -22,13 +22,17 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
- * 
+ *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
-#ifndef	_BSD_I386__TYPES_H_
-#define	_BSD_I386__TYPES_H_
+#ifndef _BSD_I386__TYPES_H_
+#define _BSD_I386__TYPES_H_
+
+#if defined (__i386__) || defined (__x86_64__)
+
+typedef long                    __darwin_intptr_t;
+typedef unsigned int            __darwin_natural_t;
 
-typedef long			__darwin_intptr_t;
-typedef unsigned int		__darwin_natural_t;
+#endif /* defined (__i386__) || defined (__x86_64__) */
 
-#endif	/* _BSD_I386__TYPES_H_ */
+#endif  /* _BSD_I386__TYPES_H_ */
\ No newline at end of file
diff --git a/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach-o/arch.h b/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach-o/arch.h
index 526c10fc8..29b81c5ba 100644
--- a/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach-o/arch.h
+++ b/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach-o/arch.h
@@ -48,7 +48,7 @@ typedef struct {
     const char *description;
 } NXArchInfo;
 
-#if __cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
@@ -72,6 +72,36 @@ extern const NXArchInfo *NXGetArchInfoFromName(const char *name);
 extern const NXArchInfo *NXGetArchInfoFromCpuType(cpu_type_t cputype,
 						  cpu_subtype_t cpusubtype);
 
+/* The above interfaces that return pointers to NXArchInfo structs in normal
+ * cases returns a pointer from the array returned in NXGetAllArchInfos().
+ * In some cases when the cputype is CPU_TYPE_I386 or CPU_TYPE_POWERPC it will
+ * retun malloc(3)'ed NXArchInfo struct which contains a string in the
+ * description field also a malloc(3)'ed pointer.  To allow programs not to
+ * leak memory they can call NXFreeArchInfo() on pointers returned from the
+ * above interfaces.  Since this is a new API on older systems can use the
+ * code below.  Going forward the above interfaces will only return pointers
+ * from the array returned in NXGetAllArchInfos().
+ */
+extern void NXFreeArchInfo(const NXArchInfo *x);
+
+/* The code that can be used for NXFreeArchInfo() when it is not available is:
+ *
+ *	static void NXFreeArchInfo(
+ *	const NXArchInfo *x)
+ *	{
+ *	    const NXArchInfo *p;
+ *	
+ *	        p = NXGetAllArchInfos();
+ *	        while(p->name != NULL){
+ *	            if(x == p)
+ *	                return;
+ *	            p++;
+ *	        }
+ *	        free((char *)x->description);
+ *	        free((NXArchInfo *)x);
+ *	}
+ */
+
 /* NXFindBestFatArch() is passed a cputype and cpusubtype and a set of
  * fat_arch structs and selects the best one that matches (if any) and returns
  * a pointer to that fat_arch struct (or NULL).  The fat_arch structs must be
@@ -86,6 +116,21 @@ extern struct fat_arch *NXFindBestFatArch(cpu_type_t cputype,
 					  struct fat_arch *fat_archs,
 					  uint32_t nfat_archs);
 
+/* NXFindBestFatArch_64() is passed a cputype and cpusubtype and a set of
+ * fat_arch_64 structs and selects the best one that matches (if any) and
+ * returns a pointer to that fat_arch_64 struct (or NULL).  The fat_arch_64
+ * structs must be in the host byte order and correct such that the fat_archs64
+ * really points to enough memory for nfat_arch structs.  It is possible that
+ * this routine could fail if new cputypes or cpusubtypes are added and an old
+ * version of this routine is used.  But if there is an exact match between the
+ * cputype and cpusubtype and one of the fat_arch_64 structs this routine will
+ * always succeed.
+ */
+extern struct fat_arch_64 *NXFindBestFatArch_64(cpu_type_t cputype,
+					        cpu_subtype_t cpusubtype,
+					        struct fat_arch_64 *fat_archs64,
+					        uint32_t nfat_archs);
+
 /* NXCombineCpuSubtypes() returns the resulting cpusubtype when combining two
  * different cpusubtypes for the specified cputype.  If the two cpusubtypes
  * can't be combined (the specific subtypes are mutually exclusive) -1 is
@@ -98,8 +143,8 @@ extern cpu_subtype_t NXCombineCpuSubtypes(cpu_type_t cputype,
 					  cpu_subtype_t cpusubtype1,
 					  cpu_subtype_t cpusubtype2);
 
-#if __cplusplus
+#ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
-#endif /* _MACH_O_ARCH_H_ */
+#endif /* _MACH_O_ARCH_H_ */
\ No newline at end of file
diff --git a/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach-o/fat.h b/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach-o/fat.h
index e2bcf433d..0e5927dc2 100644
--- a/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach-o/fat.h
+++ b/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach-o/fat.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2016 Apple, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
@@ -49,7 +49,7 @@
 #define FAT_CIGAM	0xbebafeca	/* NXSwapLong(FAT_MAGIC) */
 
 struct fat_header {
-	uint32_t	magic;		/* FAT_MAGIC */
+	uint32_t	magic;		/* FAT_MAGIC or FAT_MAGIC_64 */
 	uint32_t	nfat_arch;	/* number of structs that follow */
 };
 
@@ -61,4 +61,23 @@ struct fat_arch {
 	uint32_t	align;		/* alignment as a power of 2 */
 };
 
-#endif /* _MACH_O_FAT_H_ */
+/*
+ * The support for the 64-bit fat file format described here is a work in
+ * progress and not yet fully supported in all the Apple Developer Tools.
+ *
+ * When a slice is greater than 4mb or an offset to a slice is greater than 4mb
+ * then the 64-bit fat file format is used.
+ */
+#define FAT_MAGIC_64	0xcafebabf
+#define FAT_CIGAM_64	0xbfbafeca	/* NXSwapLong(FAT_MAGIC_64) */
+
+struct fat_arch_64 {
+	cpu_type_t	cputype;	/* cpu specifier (int) */
+	cpu_subtype_t	cpusubtype;	/* machine specifier (int) */
+	uint64_t	offset;		/* file offset to this object file */
+	uint64_t	size;		/* size of this object file */
+	uint32_t	align;		/* alignment as a power of 2 */
+	uint32_t	reserved;	/* reserved */
+};
+
+#endif /* _MACH_O_FAT_H_ */
\ No newline at end of file
diff --git a/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach-o/loader.h b/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach-o/loader.h
index ff18e29c7..2b03dfdc4 100644
--- a/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach-o/loader.h
+++ b/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach-o/loader.h
@@ -115,11 +115,14 @@ struct mach_header_64 {
 #define	MH_DYLIB	0x6		/* dynamically bound shared library */
 #define	MH_DYLINKER	0x7		/* dynamic link editor */
 #define	MH_BUNDLE	0x8		/* dynamically bound bundle file */
-#define	MH_DYLIB_STUB	0x9		/* shared library stub for static */
-					/*  linking only, no section contents */
-#define	MH_DSYM		0xa		/* companion file with only debug */
-					/*  sections */
+#define	MH_DYLIB_STUB	0x9		/* shared library stub for static
+					   linking only, no section contents */
+#define	MH_DSYM		0xa		/* companion file with only debug
+					   sections */
 #define	MH_KEXT_BUNDLE	0xb		/* x86_64 kexts */
+#define MH_FILESET	0xc		/* a file composed of other Mach-Os to
+					   be run in the same userspace sharing
+					   a single linkedit. */
 
 /* Constants for the flags field of the mach_header */
 #define	MH_NOUNDEFS	0x1		/* the object file has no undefined
@@ -207,6 +210,25 @@ struct mach_header_64 {
 					   require it. Only used in MH_EXECUTE
 					   filetypes. */
 
+#define MH_APP_EXTENSION_SAFE 0x02000000 /* The code was linked for use in an
+					    application extension. */
+
+#define	MH_NLIST_OUTOFSYNC_WITH_DYLDINFO 0x04000000 /* The external symbols
+					   listed in the nlist symbol table do
+					   not include all the symbols listed in
+					   the dyld info. */
+
+#define	MH_SIM_SUPPORT 0x08000000	/* Allow LC_MIN_VERSION_MACOS and
+					   LC_BUILD_VERSION load commands with
+					   the platforms macOS, macCatalyst,
+					   iOSSimulator, tvOSSimulator and
+					   watchOSSimulator. */
+					   
+#define MH_DYLIB_IN_CACHE 0x80000000	/* Only for use on dylibs. When this bit
+					   is set, the dylib is part of the dyld
+					   shared cache, rather than loose in
+					   the filesystem. */
+
 /*
  * The load commands directly follow the mach_header.  The total size of all
  * of the commands is given by the sizeofcmds field in the mach_header.  All
@@ -290,6 +312,20 @@ struct load_command {
 #define LC_FUNCTION_STARTS 0x26 /* compressed table of function start addresses */
 #define LC_DYLD_ENVIRONMENT 0x27 /* string for dyld to treat
 				    like environment variable */
+#define LC_MAIN (0x28|LC_REQ_DYLD) /* replacement for LC_UNIXTHREAD */
+#define LC_DATA_IN_CODE 0x29 /* table of non-instructions in __text */
+#define LC_SOURCE_VERSION 0x2A /* source version used to build binary */
+#define LC_DYLIB_CODE_SIGN_DRS 0x2B /* Code signing DRs copied from linked dylibs */
+#define	LC_ENCRYPTION_INFO_64 0x2C /* 64-bit encrypted segment information */
+#define LC_LINKER_OPTION 0x2D /* linker options in MH_OBJECT files */
+#define LC_LINKER_OPTIMIZATION_HINT 0x2E /* optimization hints in MH_OBJECT files */
+#define LC_VERSION_MIN_TVOS 0x2F /* build for AppleTV min OS version */
+#define LC_VERSION_MIN_WATCHOS 0x30 /* build for Watch min OS version */
+#define LC_NOTE 0x31 /* arbitrary data included within a Mach-O file */
+#define LC_BUILD_VERSION 0x32 /* build for platform min OS version */
+#define LC_DYLD_EXPORTS_TRIE (0x33 | LC_REQ_DYLD) /* used with linkedit_data_command, payload is trie */
+#define LC_DYLD_CHAINED_FIXUPS (0x34 | LC_REQ_DYLD) /* used with linkedit_data_command */
+#define LC_FILESET_ENTRY (0x35 | LC_REQ_DYLD) /* used with fileset_entry_command */
 
 /*
  * A variable length string in a load command is represented by an lc_str
@@ -367,6 +403,9 @@ struct segment_command_64 { /* for 64-bit architectures */
 				       first page of the segment is not
 				       protected.  All other pages of the
 				       segment are protected. */
+#define SG_READ_ONLY    0x10 /* This segment is made read-only after fixups */
+
+
 
 /*
  * A segment is made up of zero or more sections.  Non-MH_OBJECT files have
@@ -492,6 +531,8 @@ struct section_64 { /* for 64-bit architectures */
 #define S_THREAD_LOCAL_INIT_FUNCTION_POINTERS    0x15  /* functions to call
 							  to initialize TLV
 							  values */
+#define S_INIT_FUNC_OFFSETS                      0x16  /* 32-bit offsets to
+							  initializers */
 
 /*
  * Constants for the section attributes part of the flags field of a section
@@ -753,14 +794,14 @@ struct dylinker_command {
  * Thread commands contain machine-specific data structures suitable for
  * use in the thread state primitives.  The machine specific data structures
  * follow the struct thread_command as follows.
- * Each flavor of machine specific data structure is preceded by an unsigned
- * long constant for the flavor of that data structure, an uint32_t
- * that is the count of longs of the size of the state data structure and then
+ * Each flavor of machine specific data structure is preceded by an uint32_t
+ * constant for the flavor of that data structure, an uint32_t that is the
+ * count of uint32_t's of the size of the state data structure and then
  * the state data structure follows.  This triple may be repeated for many
  * flavors.  The constants for the flavors, counts and state data structure
  * definitions are expected to be in the header file <machine/thread_status.h>.
  * These machine specific data structures sizes must be multiples of
- * 4 bytes  The cmdsize reflects the total size of the thread_command
+ * 4 bytes.  The cmdsize reflects the total size of the thread_command
  * and all of the sizes of the constants for the flavors, counts and state
  * data structures.
  *
@@ -774,7 +815,7 @@ struct thread_command {
 	uint32_t	cmd;		/* LC_THREAD or  LC_UNIXTHREAD */
 	uint32_t	cmdsize;	/* total size of this command */
 	/* uint32_t flavor		   flavor of thread state */
-	/* uint32_t count		   count of longs in thread state */
+	/* uint32_t count		   count of uint32_t's in thread state */
 	/* struct XXX_thread_state state   thread state for this flavor */
 	/* ... */
 };
@@ -1149,7 +1190,11 @@ struct rpath_command {
  */
 struct linkedit_data_command {
     uint32_t	cmd;		/* LC_CODE_SIGNATURE, LC_SEGMENT_SPLIT_INFO,
-                                   or LC_FUNCTION_STARTS */
+				   LC_FUNCTION_STARTS, LC_DATA_IN_CODE,
+				   LC_DYLIB_CODE_SIGN_DRS,
+				   LC_LINKER_OPTIMIZATION_HINT,
+				   LC_DYLD_EXPORTS_TRIE, or
+				   LC_DYLD_CHAINED_FIXUPS. */
     uint32_t	cmdsize;	/* sizeof(struct linkedit_data_command) */
     uint32_t	dataoff;	/* file offset of data in __LINKEDIT segment */
     uint32_t	datasize;	/* file size of data in __LINKEDIT segment  */
@@ -1168,18 +1213,75 @@ struct encryption_info_command {
 				   0 means not-encrypted yet */
 };
 
+/*
+ * The encryption_info_command_64 contains the file offset and size of an
+ * of an encrypted segment (for use in x86_64 targets).
+ */
+struct encryption_info_command_64 {
+   uint32_t	cmd;		/* LC_ENCRYPTION_INFO_64 */
+   uint32_t	cmdsize;	/* sizeof(struct encryption_info_command_64) */
+   uint32_t	cryptoff;	/* file offset of encrypted range */
+   uint32_t	cryptsize;	/* file size of encrypted range */
+   uint32_t	cryptid;	/* which enryption system,
+				   0 means not-encrypted yet */
+   uint32_t	pad;		/* padding to make this struct's size a multiple
+				   of 8 bytes */
+};
+
 /*
  * The version_min_command contains the min OS version on which this 
  * binary was built to run.
  */
 struct version_min_command {
     uint32_t	cmd;		/* LC_VERSION_MIN_MACOSX or
-				   LC_VERSION_MIN_IPHONEOS  */
+				   LC_VERSION_MIN_IPHONEOS or
+				   LC_VERSION_MIN_WATCHOS or
+				   LC_VERSION_MIN_TVOS */
     uint32_t	cmdsize;	/* sizeof(struct min_version_command) */
     uint32_t	version;	/* X.Y.Z is encoded in nibbles xxxx.yy.zz */
-    uint32_t	reserved;	/* zero */
+    uint32_t	sdk;		/* X.Y.Z is encoded in nibbles xxxx.yy.zz */
+};
+
+/*
+ * The build_version_command contains the min OS version on which this 
+ * binary was built to run for its platform.  The list of known platforms and
+ * tool values following it.
+ */
+struct build_version_command {
+    uint32_t	cmd;		/* LC_BUILD_VERSION */
+    uint32_t	cmdsize;	/* sizeof(struct build_version_command) plus */
+				/* ntools * sizeof(struct build_tool_version) */
+    uint32_t	platform;	/* platform */
+    uint32_t	minos;		/* X.Y.Z is encoded in nibbles xxxx.yy.zz */
+    uint32_t	sdk;		/* X.Y.Z is encoded in nibbles xxxx.yy.zz */
+    uint32_t	ntools;		/* number of tool entries following this */
+};
+
+struct build_tool_version {
+    uint32_t	tool;		/* enum for the tool */
+    uint32_t	version;	/* version number of the tool */
 };
 
+/* Known values for the platform field above. */
+#define PLATFORM_MACOS 1
+#define PLATFORM_IOS 2
+#define PLATFORM_TVOS 3
+#define PLATFORM_WATCHOS 4
+#define PLATFORM_BRIDGEOS 5
+#define PLATFORM_MACCATALYST 6
+#define PLATFORM_IOSSIMULATOR 7
+#define PLATFORM_TVOSSIMULATOR 8
+#define PLATFORM_WATCHOSSIMULATOR 9
+#define PLATFORM_DRIVERKIT 10
+
+#ifndef __APPLE_BLEACH_SDK__
+#endif /* __APPLE_BLEACH_SDK__ */
+
+/* Known values for the tool field above. */
+#define TOOL_CLANG 1
+#define TOOL_SWIFT 2
+#define TOOL_LD	3
+
 /*
  * The dyld_info_command contains the file offsets and sizes of 
  * the new compressed form of the information dyld needs to 
@@ -1265,14 +1367,19 @@ struct dyld_info_command {
      * Nodes for a symbol start with a uleb128 that is the length of
      * the exported symbol information for the string so far.
      * If there is no exported symbol, the node starts with a zero byte. 
-     * If there is exported info, it follows the length.  First is
-     * a uleb128 containing flags.  Normally, it is followed by a
-     * uleb128 encoded offset which is location of the content named
+     * If there is exported info, it follows the length.  
+     *
+     * First is a uleb128 containing flags. Normally, it is followed by
+     * a uleb128 encoded offset which is location of the content named
      * by the symbol from the mach_header for the image.  If the flags
      * is EXPORT_SYMBOL_FLAGS_REEXPORT, then following the flags is
      * a uleb128 encoded library ordinal, then a zero terminated
      * UTF8 string.  If the string is zero length, then the symbol
      * is re-export from the specified dylib with the same name.
+     * If the flags is EXPORT_SYMBOL_FLAGS_STUB_AND_RESOLVER, then following
+     * the flags is two uleb128s: the stub offset and the resolver offset.
+     * The stub is used by non-lazy pointers.  The resolver is used
+     * by lazy pointers and must be called to get the actual address to use.
      *
      * After the optional exported symbol information is a byte of
      * how many edges (0-255) that this node has leaving it, 
@@ -1316,6 +1423,7 @@ struct dyld_info_command {
 #define BIND_SPECIAL_DYLIB_SELF					 0
 #define BIND_SPECIAL_DYLIB_MAIN_EXECUTABLE			-1
 #define BIND_SPECIAL_DYLIB_FLAT_LOOKUP				-2
+#define BIND_SPECIAL_DYLIB_WEAK_LOOKUP				-3
 
 #define BIND_SYMBOL_FLAGS_WEAK_IMPORT				0x1
 #define BIND_SYMBOL_FLAGS_NON_WEAK_DEFINITION			0x8
@@ -1335,6 +1443,9 @@ struct dyld_info_command {
 #define BIND_OPCODE_DO_BIND_ADD_ADDR_ULEB			0xA0
 #define BIND_OPCODE_DO_BIND_ADD_ADDR_IMM_SCALED			0xB0
 #define BIND_OPCODE_DO_BIND_ULEB_TIMES_SKIPPING_ULEB		0xC0
+#define	BIND_OPCODE_THREADED					0xD0
+#define	BIND_SUBOPCODE_THREADED_SET_BIND_ORDINAL_TABLE_SIZE_ULEB 0x00
+#define	BIND_SUBOPCODE_THREADED_APPLY				 0x01
 
 
 /*
@@ -1344,9 +1455,23 @@ struct dyld_info_command {
 #define EXPORT_SYMBOL_FLAGS_KIND_MASK				0x03
 #define EXPORT_SYMBOL_FLAGS_KIND_REGULAR			0x00
 #define EXPORT_SYMBOL_FLAGS_KIND_THREAD_LOCAL			0x01
+#define EXPORT_SYMBOL_FLAGS_KIND_ABSOLUTE			0x02
 #define EXPORT_SYMBOL_FLAGS_WEAK_DEFINITION			0x04
 #define EXPORT_SYMBOL_FLAGS_REEXPORT				0x08
 #define EXPORT_SYMBOL_FLAGS_STUB_AND_RESOLVER			0x10
+#define EXPORT_SYMBOL_FLAGS_STATIC_RESOLVER			0x20
+
+
+/*
+ * The linker_option_command contains linker options embedded in object files.
+ */
+struct linker_option_command {
+    uint32_t  cmd;	/* LC_LINKER_OPTION only used in MH_OBJECT filetypes */
+    uint32_t  cmdsize;
+    uint32_t  count;	/* number of strings */
+    /* concatenation of zero terminated UTF8 strings.
+       Zero filled at end to align */
+};
 
 /*
  * The symseg_command contains the offset and size of the GNU style
@@ -1388,6 +1513,50 @@ struct fvmfile_command {
 	uint32_t	header_addr;	/* files virtual address */
 };
 
+
+/*
+ * The entry_point_command is a replacement for thread_command.
+ * It is used for main executables to specify the location (file offset)
+ * of main().  If -stack_size was used at link time, the stacksize
+ * field will contain the stack size need for the main thread.
+ */
+struct entry_point_command {
+    uint32_t  cmd;	/* LC_MAIN only used in MH_EXECUTE filetypes */
+    uint32_t  cmdsize;	/* 24 */
+    uint64_t  entryoff;	/* file (__TEXT) offset of main() */
+    uint64_t  stacksize;/* if not zero, initial stack size */
+};
+
+
+/*
+ * The source_version_command is an optional load command containing
+ * the version of the sources used to build the binary.
+ */
+struct source_version_command {
+    uint32_t  cmd;	/* LC_SOURCE_VERSION */
+    uint32_t  cmdsize;	/* 16 */
+    uint64_t  version;	/* A.B.C.D.E packed as a24.b10.c10.d10.e10 */
+};
+
+
+/*
+ * The LC_DATA_IN_CODE load commands uses a linkedit_data_command 
+ * to point to an array of data_in_code_entry entries. Each entry
+ * describes a range of data in a code section.
+ */
+struct data_in_code_entry {
+    uint32_t	offset;  /* from mach_header to start of data range*/
+    uint16_t	length;  /* number of bytes in data range */
+    uint16_t	kind;    /* a DICE_KIND_* value  */
+};
+#define DICE_KIND_DATA              0x0001
+#define DICE_KIND_JUMP_TABLE8       0x0002
+#define DICE_KIND_JUMP_TABLE16      0x0003
+#define DICE_KIND_JUMP_TABLE32      0x0004
+#define DICE_KIND_ABS_JUMP_TABLE32  0x0005
+
+
+
 /*
  * Sections of type S_THREAD_LOCAL_VARIABLES contain an array 
  * of tlv_descriptor structures.
@@ -1399,4 +1568,39 @@ struct tlv_descriptor
 	unsigned long	offset;
 };
 
-#endif /* _MACHO_LOADER_H_ */
+/*
+ * LC_NOTE commands describe a region of arbitrary data included in a Mach-O
+ * file.  Its initial use is to record extra data in MH_CORE files.
+ */
+struct note_command {
+    uint32_t	cmd;		/* LC_NOTE */
+    uint32_t	cmdsize;	/* sizeof(struct note_command) */
+    char	data_owner[16];	/* owner name for this LC_NOTE */
+    uint64_t	offset;		/* file offset of this data */
+    uint64_t	size;		/* length of data region */
+};
+
+/*
+ * LC_FILESET_ENTRY commands describe constituent Mach-O files that are part
+ * of a fileset. In one implementation, entries are dylibs with individual
+ * mach headers and repositionable text and data segments. Each entry is
+ * further described by its own mach header.
+ */
+struct fileset_entry_command {
+    uint32_t     cmd;        /* LC_FILESET_ENTRY */
+    uint32_t     cmdsize;    /* includes entry_id string */
+    uint64_t     vmaddr;     /* memory address of the entry */
+    uint64_t     fileoff;    /* file offset of the entry */
+    union lc_str entry_id;   /* contained entry id */
+    uint32_t     reserved;   /* reserved */
+};
+
+/*
+ * These deprecated values may still be used within Apple but are mechanically
+ * removed from public API. The mechanical process may produce unusual results.
+ */
+#if (!defined(PLATFORM_IOSMAC))
+#define PLATFORM_IOSMAC PLATFORM_MACCATALYST
+#endif
+
+#endif /* _MACHO_LOADER_H_ */
\ No newline at end of file
diff --git a/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach-o/nlist.h b/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach-o/nlist.h
index 1c1941012..7b979a52a 100644
--- a/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach-o/nlist.h
+++ b/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach-o/nlist.h
@@ -78,7 +78,7 @@ struct nlist {
 #ifndef __LP64__
 		char *n_name;	/* for use when in-core */
 #endif
-		int32_t n_strx;	/* index into the string table */
+		uint32_t n_strx;	/* index into the string table */
 	} n_un;
 	uint8_t n_type;		/* type flag, see below */
 	uint8_t n_sect;		/* section number or NO_SECT */
@@ -296,17 +296,29 @@ struct nlist_64 {
  */
 #define N_SYMBOL_RESOLVER  0x0100 
 
+/*
+ * The N_ALT_ENTRY bit of the n_desc field indicates that the
+ * symbol is pinned to the previous content.
+ */
+#define N_ALT_ENTRY 0x0200
+
+/*
+ * The N_COLD_FUNC bit of the n_desc field indicates that the symbol is used
+ * infrequently and the linker should order it towards the end of the section.
+ */
+#define N_COLD_FUNC 0x0400
+
 #ifndef __STRICT_BSD__
-#if __cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 /*
  * The function nlist(3) from the C library.
  */
 extern int nlist (const char *filename, struct nlist *list);
-#if __cplusplus
+#ifdef __cplusplus
 }
 #endif /* __cplusplus */
 #endif /* __STRICT_BSD__ */
 
-#endif /* _MACHO_LIST_H_ */
+#endif /* _MACHO_LIST_H_ */
\ No newline at end of file
diff --git a/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/arm/boolean.h b/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/arm/boolean.h
new file mode 100644
index 000000000..d653a394c
--- /dev/null
+++ b/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/arm/boolean.h
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ *
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ *
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ *
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/*
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989 Carnegie Mellon University
+ * All Rights Reserved.
+ *
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ *
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * Carnegie Mellon requests users of this software to return to
+ *
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ *
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+
+/*
+ *	File:	boolean.h
+ *
+ *	Boolean type, for ARM.
+ */
+
+#ifndef _MACH_ARM_BOOLEAN_H_
+#define _MACH_ARM_BOOLEAN_H_
+
+#if defined (__arm__) || defined (__arm64__) || defined (__aarch64__)
+
+typedef int             boolean_t;
+
+#endif /* defined (__arm__) || defined (__arm64__) */
+
+#endif  /* _MACH_ARM_BOOLEAN_H_ */
\ No newline at end of file
diff --git a/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/arm/vm_types.h b/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/arm/vm_types.h
new file mode 100644
index 000000000..3650a8690
--- /dev/null
+++ b/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/arm/vm_types.h
@@ -0,0 +1,159 @@
+/*
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ *
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ *
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ *
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/*
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989,1988 Carnegie Mellon University
+ * All Rights Reserved.
+ *
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ *
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * Carnegie Mellon requests users of this software to return to
+ *
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ *
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+
+/*
+ *	File:	vm_types.h
+ *	Author:	Avadis Tevanian, Jr.
+ *	Date: 1985
+ *
+ *	Header file for VM data types.  ARM version.
+ */
+
+#ifndef _MACH_ARM_VM_TYPES_H_
+#define _MACH_ARM_VM_TYPES_H_
+
+#if defined (__arm__) || defined (__arm64__) || defined (__aarch64__)
+
+#ifndef ASSEMBLER
+
+#include <arm/_types.h>
+#include <stdint.h>
+#include <sys/cdefs.h>
+
+/*
+ * natural_t and integer_t are Mach's legacy types for machine-
+ * independent integer types (unsigned, and signed, respectively).
+ * Their original purpose was to define other types in a machine/
+ * compiler independent way.
+ *
+ * They also had an implicit "same size as pointer" characteristic
+ * to them (i.e. Mach's traditional types are very ILP32 or ILP64
+ * centric).  We will likely support x86 ABIs that do not follow
+ * either ofthese models (specifically LP64).  Therefore, we had to
+ * make a choice between making these types scale with pointers or stay
+ * tied to integers.  Because their use is predominantly tied to
+ * to the size of an integer, we are keeping that association and
+ * breaking free from pointer size guarantees.
+ *
+ * New use of these types is discouraged.
+ */
+typedef __darwin_natural_t      natural_t;
+typedef int                     integer_t;
+
+/*
+ * A vm_offset_t is a type-neutral pointer,
+ * e.g. an offset into a virtual memory space.
+ */
+#ifdef __LP64__
+typedef uintptr_t               vm_offset_t ;
+typedef uintptr_t               vm_size_t;
+
+typedef uint64_t                mach_vm_address_t ;
+typedef uint64_t                mach_vm_offset_t ;
+typedef uint64_t                mach_vm_size_t;
+
+typedef uint64_t                vm_map_offset_t ;
+typedef uint64_t                vm_map_address_t ;
+typedef uint64_t                vm_map_size_t;
+#else
+typedef natural_t               vm_offset_t ;
+/*
+ * A vm_size_t is the proper type for e.g.
+ * expressing the difference between two
+ * vm_offset_t entities.
+ */
+typedef natural_t               vm_size_t;
+
+/*
+ * This new type is independent of a particular vm map's
+ * implementation size - and represents appropriate types
+ * for all possible maps.  This is used for interfaces
+ * where the size of the map is not known - or we don't
+ * want to have to distinguish.
+ */
+typedef uint64_t                mach_vm_address_t ;
+typedef uint64_t                mach_vm_offset_t ;
+typedef uint64_t                mach_vm_size_t;
+
+typedef uint32_t                vm_map_offset_t ;
+typedef uint32_t                vm_map_address_t ;
+typedef uint32_t                vm_map_size_t;
+#endif /* __LP64__ */
+
+
+typedef uint32_t                vm32_offset_t;
+typedef uint32_t                vm32_address_t;
+typedef uint32_t                vm32_size_t;
+
+typedef vm_offset_t             mach_port_context_t;
+
+#ifdef MACH_KERNEL_PRIVATE
+typedef vm32_offset_t           mach_port_context32_t;
+typedef mach_vm_offset_t        mach_port_context64_t;
+#endif
+
+#endif  /* ASSEMBLER */
+
+/*
+ * If composing messages by hand (please do not)
+ */
+#define MACH_MSG_TYPE_INTEGER_T MACH_MSG_TYPE_INTEGER_32
+
+#endif /* defined (__arm__) || defined (__arm64__) || defined (__aarch64__) */
+
+#endif  /* _MACH_ARM_VM_TYPES_H_ */
\ No newline at end of file
diff --git a/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/boolean.h b/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/boolean.h
index 641c3962d..ba8842934 100644
--- a/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/boolean.h
+++ b/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/boolean.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
+ *
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
@@ -11,10 +11,10 @@
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.
- * 
+ *
  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
+ *
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
@@ -22,34 +22,34 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
- * 
+ *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
  */
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
@@ -62,27 +62,27 @@
  *
  */
 
-#ifndef	_MACH_BOOLEAN_H_
-#define	_MACH_BOOLEAN_H_
+#ifndef _MACH_BOOLEAN_H_
+#define _MACH_BOOLEAN_H_
 
 /*
  *	Pick up "boolean_t" type definition
  */
 
-#ifndef	ASSEMBLER
+#ifndef ASSEMBLER
 #include <mach/machine/boolean.h>
-#endif	/* ASSEMBLER */
+#endif  /* ASSEMBLER */
 
 /*
  *	Define TRUE and FALSE if not defined.
  */
 
-#ifndef	TRUE
-#define TRUE	1
-#endif	/* TRUE */
+#ifndef TRUE
+#define TRUE    1
+#endif  /* TRUE */
 
-#ifndef	FALSE
-#define FALSE	0
-#endif	/* FALSE */
+#ifndef FALSE
+#define FALSE   0
+#endif  /* FALSE */
 
-#endif	/* _MACH_BOOLEAN_H_ */
+#endif  /* _MACH_BOOLEAN_H_ */
\ No newline at end of file
diff --git a/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/i386/boolean.h b/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/i386/boolean.h
index 100f7e7b5..b1d69a193 100644
--- a/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/i386/boolean.h
+++ b/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/i386/boolean.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
+ *
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
@@ -11,10 +11,10 @@
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.
- * 
+ *
  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
+ *
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
@@ -22,34 +22,34 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
- * 
+ *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
  */
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1991,1990,1989 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
@@ -62,13 +62,17 @@
  *	Boolean type, for I386.
  */
 
-#ifndef	_MACH_I386_BOOLEAN_H_
+#ifndef _MACH_I386_BOOLEAN_H_
 #define _MACH_I386_BOOLEAN_H_
 
+#if defined (__i386__) || defined (__x86_64__)
+
 #if defined(__x86_64__) && !defined(KERNEL)
-typedef unsigned int	boolean_t;
+typedef unsigned int    boolean_t;
 #else
-typedef int		boolean_t;
+typedef int             boolean_t;
 #endif
 
-#endif	/* _MACH_I386_BOOLEAN_H_ */
+#endif /* defined (__i386__) || defined (__x86_64__) */
+
+#endif  /* _MACH_I386_BOOLEAN_H_ */
\ No newline at end of file
diff --git a/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/i386/vm_param.h b/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/i386/vm_param.h
deleted file mode 100644
index edcb83496..000000000
--- a/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/i386/vm_param.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989,1988 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-
-/* 
- * Copyright (c) 1994 The University of Utah and
- * the Computer Systems Laboratory at the University of Utah (CSL).
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation, and (3) all advertising
- * materials mentioning features or use of this software display the following
- * acknowledgement: ``This product includes software developed by the
- * Computer Systems Laboratory at the University of Utah.''
- *
- * THE UNIVERSITY OF UTAH AND CSL ALLOW FREE USE OF THIS SOFTWARE IN ITS "AS
- * IS" CONDITION.  THE UNIVERSITY OF UTAH AND CSL DISCLAIM ANY LIABILITY OF
- * ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
- * CSL requests users of this software to return to csl-dist@cs.utah.edu any
- * improvements that they make and grant CSL redistribution rights.
- *
- */
-
-/*
- *	File:	vm_param.h
- *	Author:	Avadis Tevanian, Jr.
- *	Date:	1985
- *
- *	I386 machine dependent virtual memory parameters.
- *	Most of the declarations are preceeded by I386_ (or i386_)
- *	which is OK because only I386 specific code will be using
- *	them.
- */
-
-#ifndef	_MACH_I386_VM_PARAM_H_
-#define _MACH_I386_VM_PARAM_H_
-
-#define BYTE_SIZE		8		/* byte size in bits */
-
-#define I386_PGBYTES		4096		/* bytes per 80386 page */
-#define I386_PGSHIFT		12		/* bitshift for pages */
-
-#define	PAGE_SIZE		I386_PGBYTES
-#define	PAGE_SHIFT		I386_PGSHIFT
-#define	PAGE_MASK		(PAGE_SIZE - 1)
-
-#define I386_LPGBYTES		2*1024*1024	/* bytes per large page */
-#define I386_LPGSHIFT		21		/* bitshift for large pages */
-#define I386_LPGMASK		(I386_LPGBYTES-1)
-
-/*
- *	Convert bytes to pages and convert pages to bytes.
- *	No rounding is used.
- */
-
-#define i386_btop(x)		((ppnum_t)((x) >> I386_PGSHIFT))
-#define machine_btop(x)		i386_btop(x)
-#define i386_ptob(x)		(((pmap_paddr_t)(x)) << I386_PGSHIFT)
-
-/*
- *	Round off or truncate to the nearest page.  These will work
- *	for either addresses or counts.  (i.e. 1 byte rounds to 1 page
- *	bytes.
- */
-
-#define i386_round_page(x)	((((pmap_paddr_t)(x)) + I386_PGBYTES - 1) & \
-					~(I386_PGBYTES-1))
-#define i386_trunc_page(x)	(((pmap_paddr_t)(x)) & ~(I386_PGBYTES-1))
-
-
-
-#define VM_MIN_ADDRESS64	((user_addr_t) 0x0000000000000000ULL)
-/*
- * default top of user stack... it grows down from here
- */
-#define VM_USRSTACK64		((user_addr_t) 0x00007FFF5FC00000ULL)
-#define VM_DYLD64		((user_addr_t) 0x00007FFF5FC00000ULL)
-#define VM_LIB64_SHR_DATA	((user_addr_t) 0x00007FFF60000000ULL)
-#define VM_LIB64_SHR_TEXT	((user_addr_t) 0x00007FFF80000000ULL)
-/*
- * the end of the usable user address space , for now about 47 bits.
- * the 64 bit commpage is past the end of this
- */
-#define VM_MAX_PAGE_ADDRESS	((user_addr_t) 0x00007FFFFFE00000ULL)
-/*
- * canonical end of user address space for limits checking
- */
-#define VM_MAX_USER_PAGE_ADDRESS ((user_addr_t)0x00007FFFFFFFF000ULL)
-
-
-/* system-wide values */
-#define MACH_VM_MIN_ADDRESS		((mach_vm_offset_t) 0)
-#define MACH_VM_MAX_ADDRESS		((mach_vm_offset_t) VM_MAX_PAGE_ADDRESS)
-
-/* process-relative values (all 32-bit legacy only for now) */
-#define VM_MIN_ADDRESS		((vm_offset_t) 0)
-#define VM_USRSTACK32		((vm_offset_t) 0xC0000000)
-#define VM_MAX_ADDRESS		((vm_offset_t) 0xFFE00000)
-
-
-
-#endif	/* _MACH_I386_VM_PARAM_H_ */
diff --git a/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/i386/vm_types.h b/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/i386/vm_types.h
index 2c38fa2d7..0c3bb6ba4 100644
--- a/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/i386/vm_types.h
+++ b/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/i386/vm_types.h
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2016 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
+ *
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
@@ -11,10 +11,10 @@
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.
- * 
+ *
  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
+ *
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
@@ -22,34 +22,34 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
- * 
+ *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
  */
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1991,1990,1989,1988 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
@@ -64,14 +64,16 @@
  *	Header file for VM data types.  I386 version.
  */
 
-#ifndef	_MACH_I386_VM_TYPES_H_
+#ifndef _MACH_I386_VM_TYPES_H_
 #define _MACH_I386_VM_TYPES_H_
 
-#ifndef	ASSEMBLER
+#if defined (__i386__) || defined (__x86_64__)
+
+#ifndef ASSEMBLER
 
 #include <i386/_types.h>
-#include <mach/i386/vm_param.h>
 #include <stdint.h>
+#include <sys/cdefs.h>
 
 /*
  * natural_t and integer_t are Mach's legacy types for machine-
@@ -90,18 +92,18 @@
  *
  * New use of these types is discouraged.
  */
-typedef __darwin_natural_t	natural_t;
-typedef int			integer_t;
+typedef __darwin_natural_t      natural_t;
+typedef int                     integer_t;
 
 /*
  * A vm_offset_t is a type-neutral pointer,
  * e.g. an offset into a virtual memory space.
  */
 #ifdef __LP64__
-typedef uintptr_t		vm_offset_t;
-#else	/* __LP64__ */
-typedef	natural_t		vm_offset_t;
-#endif	/* __LP64__ */
+typedef uintptr_t               vm_offset_t ;
+#else   /* __LP64__ */
+typedef natural_t               vm_offset_t ;
+#endif  /* __LP64__ */
 
 /*
  * A vm_size_t is the proper type for e.g.
@@ -109,10 +111,10 @@ typedef	natural_t		vm_offset_t;
  * vm_offset_t entities.
  */
 #ifdef __LP64__
-typedef uintptr_t		vm_size_t;
-#else	/* __LP64__ */
-typedef	natural_t		vm_size_t;
-#endif	/* __LP64__ */
+typedef uintptr_t               vm_size_t;
+#else   /* __LP64__ */
+typedef natural_t               vm_size_t;
+#endif  /* __LP64__ */
 
 /*
  * This new type is independent of a particular vm map's
@@ -121,20 +123,35 @@ typedef	natural_t		vm_size_t;
  * where the size of the map is not known - or we don't
  * want to have to distinguish.
  */
-typedef uint64_t		mach_vm_address_t;
-typedef uint64_t		mach_vm_offset_t;
-typedef uint64_t		mach_vm_size_t;
+typedef uint64_t                mach_vm_address_t ;
+typedef uint64_t                mach_vm_offset_t ;
+typedef uint64_t                mach_vm_size_t;
+
+typedef uint64_t                vm_map_offset_t ;
+typedef uint64_t                vm_map_address_t ;
+typedef uint64_t                vm_map_size_t;
+
+typedef mach_vm_address_t       mach_port_context_t;
 
-typedef uint64_t		vm_map_offset_t;
-typedef uint64_t		vm_map_address_t;
-typedef uint64_t		vm_map_size_t;
+#ifdef  MACH_KERNEL_PRIVATE
 
+/*
+ * These are types used internal to Mach to implement the
+ * legacy 32-bit VM APIs published by the kernel.
+ */
+typedef uint32_t                vm32_address_t;
+typedef uint32_t                vm32_offset_t;
+typedef uint32_t                vm32_size_t;
 
-#endif	/* ASSEMBLER */
+#endif  /* MACH_KERNEL_PRIVATE */
+
+#endif  /* ASSEMBLER */
 
 /*
  * If composing messages by hand (please do not)
  */
-#define	MACH_MSG_TYPE_INTEGER_T	MACH_MSG_TYPE_INTEGER_32
+#define MACH_MSG_TYPE_INTEGER_T MACH_MSG_TYPE_INTEGER_32
+
+#endif /* defined (__i386__) || defined (__x86_64__) */
 
-#endif	/* _MACH_I386_VM_TYPES_H_ */
+#endif  /* _MACH_I386_VM_TYPES_H_ */
\ No newline at end of file
diff --git a/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/machine.h b/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/machine.h
index 5bb21e48b..53457cca7 100644
--- a/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/machine.h
+++ b/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/machine.h
@@ -1,8 +1,9 @@
 /*
- * Copyright (c) 2000-2007 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2007-2016 Apple, Inc. All rights reserved.
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
+ *
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
@@ -11,10 +12,10 @@
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.
- * 
+ *
  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
+ *
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
@@ -22,31 +23,31 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
- * 
+ *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
@@ -57,60 +58,114 @@
  *	Machine independent machine abstraction.
  */
 
-#ifndef	_MACH_MACHINE_H_
+#ifndef _MACH_MACHINE_H_
 #define _MACH_MACHINE_H_
 
+#ifndef __ASSEMBLER__
+
 #include <stdint.h>
 #include <mach/machine/vm_types.h>
 #include <mach/boolean.h>
 
-typedef integer_t	cpu_type_t;
-typedef integer_t	cpu_subtype_t;
-typedef integer_t	cpu_threadtype_t;
+typedef integer_t       cpu_type_t;
+typedef integer_t       cpu_subtype_t;
+typedef integer_t       cpu_threadtype_t;
+
+#define CPU_STATE_MAX           4
+
+#define CPU_STATE_USER          0
+#define CPU_STATE_SYSTEM        1
+#define CPU_STATE_IDLE          2
+#define CPU_STATE_NICE          3
+
+#ifdef  KERNEL_PRIVATE
+
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+cpu_type_t                      cpu_type(void);
+
+cpu_subtype_t           cpu_subtype(void);
+
+cpu_threadtype_t        cpu_threadtype(void);
+__END_DECLS
 
-#define CPU_STATE_MAX		4
+#ifdef  MACH_KERNEL_PRIVATE
 
-#define CPU_STATE_USER		0
-#define CPU_STATE_SYSTEM	1
-#define CPU_STATE_IDLE		2
-#define CPU_STATE_NICE		3
+struct machine_info {
+	integer_t       major_version;          /* kernel major version id */
+	integer_t       minor_version;          /* kernel minor version id */
+	integer_t       max_cpus;                       /* max number of CPUs possible */
+	uint32_t        memory_size;            /* size of memory in bytes, capped at 2 GB */
+	uint64_t        max_mem;                        /* actual size of physical memory */
+	uint32_t        physical_cpu;           /* number of physical CPUs now available */
+	integer_t       physical_cpu_max;       /* max number of physical CPUs possible */
+	uint32_t        logical_cpu;            /* number of logical cpu now available */
+	integer_t       logical_cpu_max;        /* max number of physical CPUs possible */
+};
 
+typedef struct machine_info     *machine_info_t;
+typedef struct machine_info     machine_info_data_t;
+
+extern struct machine_info      machine_info;
+
+__BEGIN_DECLS
+cpu_type_t                      slot_type(
+	int             slot_num);
+
+cpu_subtype_t           slot_subtype(
+	int             slot_num);
+
+cpu_threadtype_t        slot_threadtype(
+	int             slot_num);
+__END_DECLS
+
+#endif  /* MACH_KERNEL_PRIVATE */
+#endif  /* KERNEL_PRIVATE */
 
 
 /*
  * Capability bits used in the definition of cpu_type.
  */
-#define	CPU_ARCH_MASK	0xff000000		/* mask for architecture bits */
-#define CPU_ARCH_ABI64	0x01000000		/* 64 bit ABI */
+#define CPU_ARCH_MASK           0xff000000      /* mask for architecture bits */
+#define CPU_ARCH_ABI64          0x01000000      /* 64 bit ABI */
+#define CPU_ARCH_ABI64_32       0x02000000      /* ABI for 64-bit hardware with 32-bit types; LP32 */
 
 /*
  *	Machine types known by all.
  */
- 
-#define CPU_TYPE_ANY		((cpu_type_t) -1)
 
-#define CPU_TYPE_VAX		((cpu_type_t) 1)
+#define CPU_TYPE_ANY            ((cpu_type_t) -1)
+
+#define CPU_TYPE_VAX            ((cpu_type_t) 1)
 /* skip				((cpu_type_t) 2)	*/
 /* skip				((cpu_type_t) 3)	*/
 /* skip				((cpu_type_t) 4)	*/
 /* skip				((cpu_type_t) 5)	*/
-#define	CPU_TYPE_MC680x0	((cpu_type_t) 6)
-#define CPU_TYPE_X86		((cpu_type_t) 7)
-#define CPU_TYPE_I386		CPU_TYPE_X86		/* compatibility */
-#define	CPU_TYPE_X86_64		(CPU_TYPE_X86 | CPU_ARCH_ABI64)
+#define CPU_TYPE_MC680x0        ((cpu_type_t) 6)
+#define CPU_TYPE_X86            ((cpu_type_t) 7)
+#define CPU_TYPE_I386           CPU_TYPE_X86            /* compatibility */
+#define CPU_TYPE_X86_64         (CPU_TYPE_X86 | CPU_ARCH_ABI64)
 
 /* skip CPU_TYPE_MIPS		((cpu_type_t) 8)	*/
-/* skip 			((cpu_type_t) 9)	*/
-#define CPU_TYPE_MC98000	((cpu_type_t) 10)
+/* skip                         ((cpu_type_t) 9)	*/
+#define CPU_TYPE_MC98000        ((cpu_type_t) 10)
 #define CPU_TYPE_HPPA           ((cpu_type_t) 11)
-#define CPU_TYPE_ARM		((cpu_type_t) 12)
-#define CPU_TYPE_MC88000	((cpu_type_t) 13)
-#define CPU_TYPE_SPARC		((cpu_type_t) 14)
-#define CPU_TYPE_I860		((cpu_type_t) 15)
+#define CPU_TYPE_ARM            ((cpu_type_t) 12)
+#define CPU_TYPE_ARM64          (CPU_TYPE_ARM | CPU_ARCH_ABI64)
+#define CPU_TYPE_ARM64_32       (CPU_TYPE_ARM | CPU_ARCH_ABI64_32)
+#define CPU_TYPE_MC88000        ((cpu_type_t) 13)
+#define CPU_TYPE_SPARC          ((cpu_type_t) 14)
+#define CPU_TYPE_I860           ((cpu_type_t) 15)
 /* skip	CPU_TYPE_ALPHA		((cpu_type_t) 16)	*/
 /* skip				((cpu_type_t) 17)	*/
-#define CPU_TYPE_POWERPC		((cpu_type_t) 18)
-#define CPU_TYPE_POWERPC64		(CPU_TYPE_POWERPC | CPU_ARCH_ABI64)
+#define CPU_TYPE_POWERPC                ((cpu_type_t) 18)
+#define CPU_TYPE_POWERPC64              (CPU_TYPE_POWERPC | CPU_ARCH_ABI64)
+/* skip				((cpu_type_t) 19)	*/
+/* skip				((cpu_type_t) 20 */
+/* skip				((cpu_type_t) 21 */
+/* skip				((cpu_type_t) 22 */
+/* skip				((cpu_type_t) 23 */
 
 /*
  *	Machine subtypes (these are defined here, instead of in a machine
@@ -121,9 +176,16 @@ typedef integer_t	cpu_threadtype_t;
 /*
  * Capability bits used in the definition of cpu_subtype.
  */
-#define CPU_SUBTYPE_MASK	0xff000000	/* mask for feature flags */
-#define CPU_SUBTYPE_LIB64	0x80000000	/* 64 bit libraries */
+#define CPU_SUBTYPE_MASK        0xff000000      /* mask for feature flags */
+#define CPU_SUBTYPE_LIB64       0x80000000      /* 64 bit libraries */
+#define CPU_SUBTYPE_PTRAUTH_ABI 0x80000000      /* pointer authentication with versioned ABI */
 
+/*
+ *      When selecting a slice, ANY will pick the slice with the best
+ *      grading for the selected cpu_type_t, unlike the "ALL" subtypes,
+ *      which are the slices that can run on any hardware for that cpu type.
+ */
+#define CPU_SUBTYPE_ANY         ((cpu_subtype_t) -1)
 
 /*
  *	Object files that are hand-crafted to run on any
@@ -136,42 +198,42 @@ typedef integer_t	cpu_threadtype_t;
  *	It is the responsibility of the implementor to make sure the
  *	software handles unsupported implementations elegantly.
  */
-#define	CPU_SUBTYPE_MULTIPLE		((cpu_subtype_t) -1)
-#define CPU_SUBTYPE_LITTLE_ENDIAN	((cpu_subtype_t) 0)
-#define CPU_SUBTYPE_BIG_ENDIAN		((cpu_subtype_t) 1)
+#define CPU_SUBTYPE_MULTIPLE            ((cpu_subtype_t) -1)
+#define CPU_SUBTYPE_LITTLE_ENDIAN       ((cpu_subtype_t) 0)
+#define CPU_SUBTYPE_BIG_ENDIAN          ((cpu_subtype_t) 1)
 
 /*
  *     Machine threadtypes.
  *     This is none - not defined - for most machine types/subtypes.
  */
-#define CPU_THREADTYPE_NONE		((cpu_threadtype_t) 0)
+#define CPU_THREADTYPE_NONE             ((cpu_threadtype_t) 0)
 
 /*
  *	VAX subtypes (these do *not* necessary conform to the actual cpu
  *	ID assigned by DEC available via the SID register).
  */
 
-#define	CPU_SUBTYPE_VAX_ALL	((cpu_subtype_t) 0) 
-#define CPU_SUBTYPE_VAX780	((cpu_subtype_t) 1)
-#define CPU_SUBTYPE_VAX785	((cpu_subtype_t) 2)
-#define CPU_SUBTYPE_VAX750	((cpu_subtype_t) 3)
-#define CPU_SUBTYPE_VAX730	((cpu_subtype_t) 4)
-#define CPU_SUBTYPE_UVAXI	((cpu_subtype_t) 5)
-#define CPU_SUBTYPE_UVAXII	((cpu_subtype_t) 6)
-#define CPU_SUBTYPE_VAX8200	((cpu_subtype_t) 7)
-#define CPU_SUBTYPE_VAX8500	((cpu_subtype_t) 8)
-#define CPU_SUBTYPE_VAX8600	((cpu_subtype_t) 9)
-#define CPU_SUBTYPE_VAX8650	((cpu_subtype_t) 10)
-#define CPU_SUBTYPE_VAX8800	((cpu_subtype_t) 11)
-#define CPU_SUBTYPE_UVAXIII	((cpu_subtype_t) 12)
+#define CPU_SUBTYPE_VAX_ALL     ((cpu_subtype_t) 0)
+#define CPU_SUBTYPE_VAX780      ((cpu_subtype_t) 1)
+#define CPU_SUBTYPE_VAX785      ((cpu_subtype_t) 2)
+#define CPU_SUBTYPE_VAX750      ((cpu_subtype_t) 3)
+#define CPU_SUBTYPE_VAX730      ((cpu_subtype_t) 4)
+#define CPU_SUBTYPE_UVAXI       ((cpu_subtype_t) 5)
+#define CPU_SUBTYPE_UVAXII      ((cpu_subtype_t) 6)
+#define CPU_SUBTYPE_VAX8200     ((cpu_subtype_t) 7)
+#define CPU_SUBTYPE_VAX8500     ((cpu_subtype_t) 8)
+#define CPU_SUBTYPE_VAX8600     ((cpu_subtype_t) 9)
+#define CPU_SUBTYPE_VAX8650     ((cpu_subtype_t) 10)
+#define CPU_SUBTYPE_VAX8800     ((cpu_subtype_t) 11)
+#define CPU_SUBTYPE_UVAXIII     ((cpu_subtype_t) 12)
 
 /*
- * 	680x0 subtypes
+ *      680x0 subtypes
  *
  * The subtype definitions here are unusual for historical reasons.
  * NeXT used to consider 68030 code as generic 68000 code.  For
  * backwards compatability:
- * 
+ *
  *	CPU_SUBTYPE_MC68030 symbol has been preserved for source code
  *	compatability.
  *
@@ -182,119 +244,119 @@ typedef integer_t	cpu_threadtype_t;
  *	files to be tagged as containing 68030-specific instructions.
  */
 
-#define	CPU_SUBTYPE_MC680x0_ALL		((cpu_subtype_t) 1)
-#define CPU_SUBTYPE_MC68030		((cpu_subtype_t) 1) /* compat */
-#define CPU_SUBTYPE_MC68040		((cpu_subtype_t) 2) 
-#define	CPU_SUBTYPE_MC68030_ONLY	((cpu_subtype_t) 3)
+#define CPU_SUBTYPE_MC680x0_ALL         ((cpu_subtype_t) 1)
+#define CPU_SUBTYPE_MC68030             ((cpu_subtype_t) 1) /* compat */
+#define CPU_SUBTYPE_MC68040             ((cpu_subtype_t) 2)
+#define CPU_SUBTYPE_MC68030_ONLY        ((cpu_subtype_t) 3)
 
 /*
  *	I386 subtypes
  */
 
-#define CPU_SUBTYPE_INTEL(f, m)	((cpu_subtype_t) (f) + ((m) << 4))
-
-#define	CPU_SUBTYPE_I386_ALL			CPU_SUBTYPE_INTEL(3, 0)
-#define CPU_SUBTYPE_386					CPU_SUBTYPE_INTEL(3, 0)
-#define CPU_SUBTYPE_486					CPU_SUBTYPE_INTEL(4, 0)
-#define CPU_SUBTYPE_486SX				CPU_SUBTYPE_INTEL(4, 8)	// 8 << 4 = 128
-#define CPU_SUBTYPE_586					CPU_SUBTYPE_INTEL(5, 0)
-#define CPU_SUBTYPE_PENT	CPU_SUBTYPE_INTEL(5, 0)
-#define CPU_SUBTYPE_PENTPRO	CPU_SUBTYPE_INTEL(6, 1)
-#define CPU_SUBTYPE_PENTII_M3	CPU_SUBTYPE_INTEL(6, 3)
-#define CPU_SUBTYPE_PENTII_M5	CPU_SUBTYPE_INTEL(6, 5)
-#define CPU_SUBTYPE_CELERON				CPU_SUBTYPE_INTEL(7, 6)
-#define CPU_SUBTYPE_CELERON_MOBILE		CPU_SUBTYPE_INTEL(7, 7)
-#define CPU_SUBTYPE_PENTIUM_3			CPU_SUBTYPE_INTEL(8, 0)
-#define CPU_SUBTYPE_PENTIUM_3_M			CPU_SUBTYPE_INTEL(8, 1)
-#define CPU_SUBTYPE_PENTIUM_3_XEON		CPU_SUBTYPE_INTEL(8, 2)
-#define CPU_SUBTYPE_PENTIUM_M			CPU_SUBTYPE_INTEL(9, 0)
-#define CPU_SUBTYPE_PENTIUM_4			CPU_SUBTYPE_INTEL(10, 0)
-#define CPU_SUBTYPE_PENTIUM_4_M			CPU_SUBTYPE_INTEL(10, 1)
-#define CPU_SUBTYPE_ITANIUM				CPU_SUBTYPE_INTEL(11, 0)
-#define CPU_SUBTYPE_ITANIUM_2			CPU_SUBTYPE_INTEL(11, 1)
-#define CPU_SUBTYPE_XEON				CPU_SUBTYPE_INTEL(12, 0)
-#define CPU_SUBTYPE_XEON_MP				CPU_SUBTYPE_INTEL(12, 1)
-
-#define CPU_SUBTYPE_INTEL_FAMILY(x)	((x) & 15)
-#define CPU_SUBTYPE_INTEL_FAMILY_MAX	15
-
-#define CPU_SUBTYPE_INTEL_MODEL(x)	((x) >> 4)
-#define CPU_SUBTYPE_INTEL_MODEL_ALL	0
+#define CPU_SUBTYPE_INTEL(f, m) ((cpu_subtype_t) (f) + ((m) << 4))
+
+#define CPU_SUBTYPE_I386_ALL                    CPU_SUBTYPE_INTEL(3, 0)
+#define CPU_SUBTYPE_386                                 CPU_SUBTYPE_INTEL(3, 0)
+#define CPU_SUBTYPE_486                                 CPU_SUBTYPE_INTEL(4, 0)
+#define CPU_SUBTYPE_486SX                               CPU_SUBTYPE_INTEL(4, 8) // 8 << 4 = 128
+#define CPU_SUBTYPE_586                                 CPU_SUBTYPE_INTEL(5, 0)
+#define CPU_SUBTYPE_PENT        CPU_SUBTYPE_INTEL(5, 0)
+#define CPU_SUBTYPE_PENTPRO     CPU_SUBTYPE_INTEL(6, 1)
+#define CPU_SUBTYPE_PENTII_M3   CPU_SUBTYPE_INTEL(6, 3)
+#define CPU_SUBTYPE_PENTII_M5   CPU_SUBTYPE_INTEL(6, 5)
+#define CPU_SUBTYPE_CELERON                             CPU_SUBTYPE_INTEL(7, 6)
+#define CPU_SUBTYPE_CELERON_MOBILE              CPU_SUBTYPE_INTEL(7, 7)
+#define CPU_SUBTYPE_PENTIUM_3                   CPU_SUBTYPE_INTEL(8, 0)
+#define CPU_SUBTYPE_PENTIUM_3_M                 CPU_SUBTYPE_INTEL(8, 1)
+#define CPU_SUBTYPE_PENTIUM_3_XEON              CPU_SUBTYPE_INTEL(8, 2)
+#define CPU_SUBTYPE_PENTIUM_M                   CPU_SUBTYPE_INTEL(9, 0)
+#define CPU_SUBTYPE_PENTIUM_4                   CPU_SUBTYPE_INTEL(10, 0)
+#define CPU_SUBTYPE_PENTIUM_4_M                 CPU_SUBTYPE_INTEL(10, 1)
+#define CPU_SUBTYPE_ITANIUM                             CPU_SUBTYPE_INTEL(11, 0)
+#define CPU_SUBTYPE_ITANIUM_2                   CPU_SUBTYPE_INTEL(11, 1)
+#define CPU_SUBTYPE_XEON                                CPU_SUBTYPE_INTEL(12, 0)
+#define CPU_SUBTYPE_XEON_MP                             CPU_SUBTYPE_INTEL(12, 1)
+
+#define CPU_SUBTYPE_INTEL_FAMILY(x)     ((x) & 15)
+#define CPU_SUBTYPE_INTEL_FAMILY_MAX    15
+
+#define CPU_SUBTYPE_INTEL_MODEL(x)      ((x) >> 4)
+#define CPU_SUBTYPE_INTEL_MODEL_ALL     0
 
 /*
  *	X86 subtypes.
  */
 
-#define CPU_SUBTYPE_X86_ALL		((cpu_subtype_t)3)
-#define CPU_SUBTYPE_X86_64_ALL		((cpu_subtype_t)3)
-#define CPU_SUBTYPE_X86_ARCH1		((cpu_subtype_t)4)
-#define CPU_SUBTYPE_X86_64_H		((cpu_subtype_t)8)	/* Haswell feature subset */
+#define CPU_SUBTYPE_X86_ALL             ((cpu_subtype_t)3)
+#define CPU_SUBTYPE_X86_64_ALL          ((cpu_subtype_t)3)
+#define CPU_SUBTYPE_X86_ARCH1           ((cpu_subtype_t)4)
+#define CPU_SUBTYPE_X86_64_H            ((cpu_subtype_t)8)      /* Haswell feature subset */
 
 
-#define CPU_THREADTYPE_INTEL_HTT	((cpu_threadtype_t) 1)
+#define CPU_THREADTYPE_INTEL_HTT        ((cpu_threadtype_t) 1)
 
 /*
  *	Mips subtypes.
  */
 
-#define	CPU_SUBTYPE_MIPS_ALL	((cpu_subtype_t) 0)
-#define CPU_SUBTYPE_MIPS_R2300	((cpu_subtype_t) 1)
-#define CPU_SUBTYPE_MIPS_R2600	((cpu_subtype_t) 2)
-#define CPU_SUBTYPE_MIPS_R2800	((cpu_subtype_t) 3)
-#define CPU_SUBTYPE_MIPS_R2000a	((cpu_subtype_t) 4)	/* pmax */
-#define CPU_SUBTYPE_MIPS_R2000	((cpu_subtype_t) 5)
-#define CPU_SUBTYPE_MIPS_R3000a	((cpu_subtype_t) 6)	/* 3max */
-#define CPU_SUBTYPE_MIPS_R3000	((cpu_subtype_t) 7)
+#define CPU_SUBTYPE_MIPS_ALL    ((cpu_subtype_t) 0)
+#define CPU_SUBTYPE_MIPS_R2300  ((cpu_subtype_t) 1)
+#define CPU_SUBTYPE_MIPS_R2600  ((cpu_subtype_t) 2)
+#define CPU_SUBTYPE_MIPS_R2800  ((cpu_subtype_t) 3)
+#define CPU_SUBTYPE_MIPS_R2000a ((cpu_subtype_t) 4)     /* pmax */
+#define CPU_SUBTYPE_MIPS_R2000  ((cpu_subtype_t) 5)
+#define CPU_SUBTYPE_MIPS_R3000a ((cpu_subtype_t) 6)     /* 3max */
+#define CPU_SUBTYPE_MIPS_R3000  ((cpu_subtype_t) 7)
 
 /*
  *	MC98000 (PowerPC) subtypes
  */
-#define	CPU_SUBTYPE_MC98000_ALL	((cpu_subtype_t) 0)
-#define CPU_SUBTYPE_MC98601	((cpu_subtype_t) 1)
+#define CPU_SUBTYPE_MC98000_ALL ((cpu_subtype_t) 0)
+#define CPU_SUBTYPE_MC98601     ((cpu_subtype_t) 1)
 
 /*
  *	HPPA subtypes for Hewlett-Packard HP-PA family of
- *	risc processors. Port by NeXT to 700 series. 
+ *	risc processors. Port by NeXT to 700 series.
  */
 
-#define	CPU_SUBTYPE_HPPA_ALL		((cpu_subtype_t) 0)
-#define CPU_SUBTYPE_HPPA_7100		((cpu_subtype_t) 0) /* compat */
-#define CPU_SUBTYPE_HPPA_7100LC		((cpu_subtype_t) 1)
+#define CPU_SUBTYPE_HPPA_ALL            ((cpu_subtype_t) 0)
+#define CPU_SUBTYPE_HPPA_7100           ((cpu_subtype_t) 0) /* compat */
+#define CPU_SUBTYPE_HPPA_7100LC         ((cpu_subtype_t) 1)
 
 /*
  *	MC88000 subtypes.
  */
-#define	CPU_SUBTYPE_MC88000_ALL	((cpu_subtype_t) 0)
-#define CPU_SUBTYPE_MC88100	((cpu_subtype_t) 1)
-#define CPU_SUBTYPE_MC88110	((cpu_subtype_t) 2)
+#define CPU_SUBTYPE_MC88000_ALL ((cpu_subtype_t) 0)
+#define CPU_SUBTYPE_MC88100     ((cpu_subtype_t) 1)
+#define CPU_SUBTYPE_MC88110     ((cpu_subtype_t) 2)
 
 /*
  *	SPARC subtypes
  */
-#define	CPU_SUBTYPE_SPARC_ALL		((cpu_subtype_t) 0)
+#define CPU_SUBTYPE_SPARC_ALL           ((cpu_subtype_t) 0)
 
 /*
  *	I860 subtypes
  */
-#define CPU_SUBTYPE_I860_ALL	((cpu_subtype_t) 0)
-#define CPU_SUBTYPE_I860_860	((cpu_subtype_t) 1)
+#define CPU_SUBTYPE_I860_ALL    ((cpu_subtype_t) 0)
+#define CPU_SUBTYPE_I860_860    ((cpu_subtype_t) 1)
 
 /*
  *	PowerPC subtypes
  */
-#define CPU_SUBTYPE_POWERPC_ALL		((cpu_subtype_t) 0)
-#define CPU_SUBTYPE_POWERPC_601		((cpu_subtype_t) 1)
-#define CPU_SUBTYPE_POWERPC_602		((cpu_subtype_t) 2)
-#define CPU_SUBTYPE_POWERPC_603		((cpu_subtype_t) 3)
-#define CPU_SUBTYPE_POWERPC_603e	((cpu_subtype_t) 4)
-#define CPU_SUBTYPE_POWERPC_603ev	((cpu_subtype_t) 5)
-#define CPU_SUBTYPE_POWERPC_604		((cpu_subtype_t) 6)
-#define CPU_SUBTYPE_POWERPC_604e	((cpu_subtype_t) 7)
-#define CPU_SUBTYPE_POWERPC_620		((cpu_subtype_t) 8)
-#define CPU_SUBTYPE_POWERPC_750		((cpu_subtype_t) 9)
-#define CPU_SUBTYPE_POWERPC_7400	((cpu_subtype_t) 10)
-#define CPU_SUBTYPE_POWERPC_7450	((cpu_subtype_t) 11)
-#define CPU_SUBTYPE_POWERPC_970		((cpu_subtype_t) 100)
+#define CPU_SUBTYPE_POWERPC_ALL         ((cpu_subtype_t) 0)
+#define CPU_SUBTYPE_POWERPC_601         ((cpu_subtype_t) 1)
+#define CPU_SUBTYPE_POWERPC_602         ((cpu_subtype_t) 2)
+#define CPU_SUBTYPE_POWERPC_603         ((cpu_subtype_t) 3)
+#define CPU_SUBTYPE_POWERPC_603e        ((cpu_subtype_t) 4)
+#define CPU_SUBTYPE_POWERPC_603ev       ((cpu_subtype_t) 5)
+#define CPU_SUBTYPE_POWERPC_604         ((cpu_subtype_t) 6)
+#define CPU_SUBTYPE_POWERPC_604e        ((cpu_subtype_t) 7)
+#define CPU_SUBTYPE_POWERPC_620         ((cpu_subtype_t) 8)
+#define CPU_SUBTYPE_POWERPC_750         ((cpu_subtype_t) 9)
+#define CPU_SUBTYPE_POWERPC_7400        ((cpu_subtype_t) 10)
+#define CPU_SUBTYPE_POWERPC_7450        ((cpu_subtype_t) 11)
+#define CPU_SUBTYPE_POWERPC_970         ((cpu_subtype_t) 100)
 
 /*
  *	ARM subtypes
@@ -303,8 +365,38 @@ typedef integer_t	cpu_threadtype_t;
 #define CPU_SUBTYPE_ARM_V4T             ((cpu_subtype_t) 5)
 #define CPU_SUBTYPE_ARM_V6              ((cpu_subtype_t) 6)
 #define CPU_SUBTYPE_ARM_V5TEJ           ((cpu_subtype_t) 7)
-#define CPU_SUBTYPE_ARM_XSCALE		((cpu_subtype_t) 8)
-#define CPU_SUBTYPE_ARM_V7		((cpu_subtype_t) 9)
+#define CPU_SUBTYPE_ARM_XSCALE          ((cpu_subtype_t) 8)
+#define CPU_SUBTYPE_ARM_V7              ((cpu_subtype_t) 9)  /* ARMv7-A and ARMv7-R */
+#define CPU_SUBTYPE_ARM_V7F             ((cpu_subtype_t) 10) /* Cortex A9 */
+#define CPU_SUBTYPE_ARM_V7S             ((cpu_subtype_t) 11) /* Swift */
+#define CPU_SUBTYPE_ARM_V7K             ((cpu_subtype_t) 12)
+#define CPU_SUBTYPE_ARM_V8              ((cpu_subtype_t) 13)
+#define CPU_SUBTYPE_ARM_V6M             ((cpu_subtype_t) 14) /* Not meant to be run under xnu */
+#define CPU_SUBTYPE_ARM_V7M             ((cpu_subtype_t) 15) /* Not meant to be run under xnu */
+#define CPU_SUBTYPE_ARM_V7EM            ((cpu_subtype_t) 16) /* Not meant to be run under xnu */
+#define CPU_SUBTYPE_ARM_V8M             ((cpu_subtype_t) 17) /* Not meant to be run under xnu */
+
+/*
+ *  ARM64 subtypes
+ */
+#define CPU_SUBTYPE_ARM64_ALL           ((cpu_subtype_t) 0)
+#define CPU_SUBTYPE_ARM64_V8            ((cpu_subtype_t) 1)
+#define CPU_SUBTYPE_ARM64E              ((cpu_subtype_t) 2)
+
+/* CPU subtype feature flags for ptrauth on arm64e platforms */
+#define CPU_SUBTYPE_ARM64_PTR_AUTH_MASK 0x0f000000
+#define CPU_SUBTYPE_ARM64_PTR_AUTH_VERSION(x) (((x) & CPU_SUBTYPE_ARM64_PTR_AUTH_MASK) >> 24)
+#ifdef PRIVATE
+#define CPU_SUBTYPE_ARM64_PTR_AUTH_CURRENT_VERSION 0
+#endif /* PRIVATE */
+
+/*
+ *  ARM64_32 subtypes
+ */
+#define CPU_SUBTYPE_ARM64_32_ALL        ((cpu_subtype_t) 0)
+#define CPU_SUBTYPE_ARM64_32_V8 ((cpu_subtype_t) 1)
+
+#endif /* !__ASSEMBLER__ */
 
 /*
  *	CPU families (sysctl hw.cpufamily)
@@ -317,31 +409,53 @@ typedef integer_t	cpu_threadtype_t;
  * Use feature flags (eg, hw.optional.altivec) to test for optional
  * functionality.
  */
-#define CPUFAMILY_UNKNOWN   		0
-#define CPUFAMILY_POWERPC_G3		0xcee41549
-#define CPUFAMILY_POWERPC_G4		0x77c184ae
-#define CPUFAMILY_POWERPC_G5		0xed76d8aa
-#define CPUFAMILY_INTEL_6_13		0xaa33392b
-#define CPUFAMILY_INTEL_YONAH		0x73d67300
-#define CPUFAMILY_INTEL_MEROM		0x426f69ef
-#define CPUFAMILY_INTEL_PENRYN		0x78ea4fbc
-#define CPUFAMILY_INTEL_NEHALEM		0x6b5a4cd2
-#define CPUFAMILY_INTEL_WESTMERE	0x573b5eec
-#define CPUFAMILY_INTEL_SANDYBRIDGE	0x5490b78c
-#define CPUFAMILY_ARM_9			0xe73283ae
-#define CPUFAMILY_ARM_11		0x8ff620d8
-#define CPUFAMILY_ARM_XSCALE		0x53b005f5
-#define CPUFAMILY_ARM_13		0x0cc90e64
-#define CPUFAMILY_ARM_14		0x96077ef1
+#define CPUFAMILY_UNKNOWN               0
+#define CPUFAMILY_POWERPC_G3            0xcee41549
+#define CPUFAMILY_POWERPC_G4            0x77c184ae
+#define CPUFAMILY_POWERPC_G5            0xed76d8aa
+#define CPUFAMILY_INTEL_6_13            0xaa33392b
+#define CPUFAMILY_INTEL_PENRYN          0x78ea4fbc
+#define CPUFAMILY_INTEL_NEHALEM         0x6b5a4cd2
+#define CPUFAMILY_INTEL_WESTMERE        0x573b5eec
+#define CPUFAMILY_INTEL_SANDYBRIDGE     0x5490b78c
+#define CPUFAMILY_INTEL_IVYBRIDGE       0x1f65e835
+#define CPUFAMILY_INTEL_HASWELL         0x10b282dc
+#define CPUFAMILY_INTEL_BROADWELL       0x582ed09c
+#define CPUFAMILY_INTEL_SKYLAKE         0x37fc219f
+#define CPUFAMILY_INTEL_KABYLAKE        0x0f817246
+#define CPUFAMILY_INTEL_ICELAKE         0x38435547
+#define CPUFAMILY_ARM_9                 0xe73283ae
+#define CPUFAMILY_ARM_11                0x8ff620d8
+#define CPUFAMILY_ARM_XSCALE            0x53b005f5
+#define CPUFAMILY_ARM_12                0xbd1b0ae9
+#define CPUFAMILY_ARM_13                0x0cc90e64
+#define CPUFAMILY_ARM_14                0x96077ef1
+#define CPUFAMILY_ARM_15                0xa8511bca
+#define CPUFAMILY_ARM_SWIFT             0x1e2d6381
+#define CPUFAMILY_ARM_CYCLONE           0x37a09642
+#define CPUFAMILY_ARM_TYPHOON           0x2c91a47e
+#define CPUFAMILY_ARM_TWISTER           0x92fb37c8
+#define CPUFAMILY_ARM_HURRICANE         0x67ceee93
+#define CPUFAMILY_ARM_MONSOON_MISTRAL   0xe81e7ef6
+#define CPUFAMILY_ARM_VORTEX_TEMPEST    0x07d34b9f
+#define CPUFAMILY_ARM_LIGHTNING_THUNDER 0x462504d2
+#ifndef RC_HIDE_XNU_FIRESTORM
+#define CPUFAMILY_ARM_FIRESTORM_ICESTORM 0x1b588bb3
+#endif /* !RC_HIDE_XNU_FIRESTORM */
+
+/* Described in rdar://64125549 */
+#define CPUSUBFAMILY_UNKNOWN            0
+#define CPUSUBFAMILY_ARM_HP             1
+#define CPUSUBFAMILY_ARM_HG             2
+#define CPUSUBFAMILY_ARM_M              3
+#ifndef RC_HIDE_XNU_FIRESTORM
+#define CPUSUBFAMILY_ARM_HS             4
+#define CPUSUBFAMILY_ARM_HC_HD          5
+#endif /* !RC_HIDE_XNU_FIRESTORM */
 
 /* The following synonyms are deprecated: */
-#define CPUFAMILY_INTEL_6_14	CPUFAMILY_INTEL_YONAH
-#define CPUFAMILY_INTEL_6_15	CPUFAMILY_INTEL_MEROM
-#define CPUFAMILY_INTEL_6_23	CPUFAMILY_INTEL_PENRYN
-#define CPUFAMILY_INTEL_6_26	CPUFAMILY_INTEL_NEHALEM
-
-#define CPUFAMILY_INTEL_CORE	CPUFAMILY_INTEL_YONAH
-#define CPUFAMILY_INTEL_CORE2	CPUFAMILY_INTEL_MEROM
+#define CPUFAMILY_INTEL_6_23    CPUFAMILY_INTEL_PENRYN
+#define CPUFAMILY_INTEL_6_26    CPUFAMILY_INTEL_NEHALEM
 
 
-#endif	/* _MACH_MACHINE_H_ */
+#endif  /* _MACH_MACHINE_H_ */
\ No newline at end of file
diff --git a/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/machine/boolean.h b/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/machine/boolean.h
index ffdc2390a..adca083dc 100644
--- a/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/machine/boolean.h
+++ b/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/machine/boolean.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
+ *
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
@@ -11,10 +11,10 @@
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.
- * 
+ *
  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
+ *
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
@@ -22,7 +22,7 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
- * 
+ *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 
@@ -31,10 +31,10 @@
 
 #if defined (__i386__) || defined(__x86_64__)
 #include "mach/i386/boolean.h"
-#elif defined (__arm__)
+#elif defined (__arm__) || defined (__arm64__) || defined(__aarch64__)
 #include "mach/arm/boolean.h"
 #else
 #error architecture not supported
 #endif
 
-#endif /* _MACH_MACHINE_BOOLEAN_H_ */
+#endif /* _MACH_MACHINE_BOOLEAN_H_ */
\ No newline at end of file
diff --git a/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/machine/thread_state.h b/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/machine/thread_state.h
index 1547acac7..fceb4279e 100644
--- a/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/machine/thread_state.h
+++ b/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/machine/thread_state.h
@@ -6,4 +6,4 @@
 
 #define THREAD_STATE_MAX 1
 
-#endif /* _MACH_MACHINE_THREAD_STATE_H_ */
+#endif /* _MACH_MACHINE_THREAD_STATE_H_ */
\ No newline at end of file
diff --git a/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/machine/thread_status.h b/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/machine/thread_status.h
index d1ab56ad5..4309afdc3 100644
--- a/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/machine/thread_status.h
+++ b/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/machine/thread_status.h
@@ -1 +1 @@
-/* This file intentionally left blank */
+/* This file intentionally left blank */
\ No newline at end of file
diff --git a/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/machine/vm_types.h b/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/machine/vm_types.h
index 8ccd24be5..7ee7ac8e8 100644
--- a/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/machine/vm_types.h
+++ b/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/machine/vm_types.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
+ *
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
@@ -11,10 +11,10 @@
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.
- * 
+ *
  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
+ *
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
@@ -22,7 +22,7 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
- * 
+ *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 
@@ -31,10 +31,10 @@
 
 #if defined (__i386__) || defined(__x86_64__)
 #include "mach/i386/vm_types.h"
-#elif defined (__arm__)
+#elif defined (__arm__) || defined (__arm64__) || defined(__aarch64__)
 #include "mach/arm/vm_types.h"
 #else
 #error architecture not supported
 #endif
 
-#endif /* _MACH_MACHINE_VM_TYPES_H_ */
+#endif /* _MACH_MACHINE_VM_TYPES_H_ */
\ No newline at end of file
diff --git a/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/thread_status.h b/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/thread_status.h
index aead09bf9..f742500ca 100644
--- a/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/thread_status.h
+++ b/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/thread_status.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
+ *
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
@@ -11,10 +11,10 @@
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.
- * 
+ *
  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
+ *
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
@@ -22,7 +22,7 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
- * 
+ *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
@@ -32,24 +32,24 @@
  * Mach Operating System
  * Copyright (c) 1991,1990,1989,1988 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
@@ -65,8 +65,8 @@
  *
  */
 
-#ifndef	_MACH_THREAD_STATUS_H_
-#define	_MACH_THREAD_STATUS_H_
+#ifndef _MACH_THREAD_STATUS_H_
+#define _MACH_THREAD_STATUS_H_
 
 /*
  *	The actual structure that comprises the thread state is defined
@@ -80,15 +80,21 @@
  *	Generic definition for machine-dependent thread status.
  */
 
-typedef	natural_t	*thread_state_t;	/* Variable-length array */
+typedef natural_t       *thread_state_t;        /* Variable-length array */
 
 /* THREAD_STATE_MAX is now defined in <mach/machine/thread_state.h> */
-typedef	natural_t	thread_state_data_t[THREAD_STATE_MAX];
+typedef natural_t       thread_state_data_t[THREAD_STATE_MAX];
+
+#define THREAD_STATE_FLAVOR_LIST        0       /* List of valid flavors */
+#define THREAD_STATE_FLAVOR_LIST_NEW    128
+#define THREAD_STATE_FLAVOR_LIST_10_9   129
+#define THREAD_STATE_FLAVOR_LIST_10_13  130
+#define THREAD_STATE_FLAVOR_LIST_10_15  131
 
-#define	THREAD_STATE_FLAVOR_LIST	0	/* List of valid flavors */
-#define THREAD_STATE_FLAVOR_LIST_NEW	128
+typedef int                     thread_state_flavor_t;
+typedef thread_state_flavor_t   *thread_state_flavor_array_t;
 
-typedef	int			thread_state_flavor_t;
-typedef thread_state_flavor_t	*thread_state_flavor_array_t;
+#define THREAD_CONVERT_THREAD_STATE_TO_SELF   1
+#define THREAD_CONVERT_THREAD_STATE_FROM_SELF 2
 
-#endif	/* _MACH_THREAD_STATUS_H_ */
+#endif  /* _MACH_THREAD_STATUS_H_ */
\ No newline at end of file
diff --git a/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/vm_prot.h b/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/vm_prot.h
index 07c2114e5..b19c8e247 100644
--- a/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/vm_prot.h
+++ b/external_imported/sentry-native/external/breakpad/src/third_party/mac_headers/mach/vm_prot.h
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2021 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
+ *
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
@@ -11,10 +11,10 @@
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.
- * 
+ *
  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
+ *
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
@@ -22,34 +22,34 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
- * 
+ *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
  */
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
@@ -63,8 +63,8 @@
  *
  */
 
-#ifndef	_MACH_VM_PROT_H_
-#define	_MACH_VM_PROT_H_
+#ifndef _MACH_VM_PROT_H_
+#define _MACH_VM_PROT_H_
 
 /*
  *	Types defined:
@@ -72,29 +72,36 @@
  *	vm_prot_t		VM protection values.
  */
 
-typedef int		vm_prot_t;
+typedef int             vm_prot_t;
 
 /*
  *	Protection values, defined as bits within the vm_prot_t type
  */
 
-#define	VM_PROT_NONE	((vm_prot_t) 0x00)
+#define VM_PROT_NONE    ((vm_prot_t) 0x00)
 
-#define VM_PROT_READ	((vm_prot_t) 0x01)	/* read permission */
-#define VM_PROT_WRITE	((vm_prot_t) 0x02)	/* write permission */
-#define VM_PROT_EXECUTE	((vm_prot_t) 0x04)	/* execute permission */
+#define VM_PROT_READ    ((vm_prot_t) 0x01)      /* read permission */
+#define VM_PROT_WRITE   ((vm_prot_t) 0x02)      /* write permission */
+#define VM_PROT_EXECUTE ((vm_prot_t) 0x04)      /* execute permission */
 
 /*
  *	The default protection for newly-created virtual memory
  */
 
-#define VM_PROT_DEFAULT	(VM_PROT_READ|VM_PROT_WRITE)
+#define VM_PROT_DEFAULT (VM_PROT_READ|VM_PROT_WRITE)
 
 /*
  *	The maximum privileges possible, for parameter checking.
  */
 
-#define VM_PROT_ALL	(VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE)
+#define VM_PROT_ALL     (VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE)
+
+/*
+ *	This is an alias to VM_PROT_EXECUTE to identify callers that
+ *	want to allocate an hardware assisted Read-only/read-write
+ *	trusted path in userland.
+ */
+#define        VM_PROT_RORW_TP                 (VM_PROT_EXECUTE)
 
 /*
  *	An invalid protection value.
@@ -103,15 +110,16 @@ typedef int		vm_prot_t;
  *	looks like VM_PROT_ALL and then some.
  */
 
-#define VM_PROT_NO_CHANGE	((vm_prot_t) 0x08)
+#define VM_PROT_NO_CHANGE_LEGACY       ((vm_prot_t) 0x08)
+#define VM_PROT_NO_CHANGE              ((vm_prot_t) 0x01000000)
 
-/* 
+/*
  *      When a caller finds that he cannot obtain write permission on a
  *      mapped entry, the following flag can be used.  The entry will
  *      be made "needs copy" effectively copying the object (using COW),
  *      and write permission will be added to the maximum protections
- *      for the associated entry. 
- */        
+ *      for the associated entry.
+ */
 
 #define VM_PROT_COPY            ((vm_prot_t) 0x10)
 
@@ -127,14 +135,59 @@ typedef int		vm_prot_t;
  *	walking down the shadow chain.
  */
 
-#define VM_PROT_WANTS_COPY	((vm_prot_t) 0x10)
+#define VM_PROT_WANTS_COPY      ((vm_prot_t) 0x10)
 
+#ifdef PRIVATE
+/*
+ *	The caller wants this memory region treated as if it had a valid
+ *	code signature.
+ */
+
+#define VM_PROT_TRUSTED         ((vm_prot_t) 0x20)
+#endif /* PRIVATE */
 
 /*
- * 	Another invalid protection value.
+ *      Another invalid protection value.
  *	Indicates that the other protection bits are to be applied as a mask
  *	against the actual protection bits of the map entry.
  */
-#define VM_PROT_IS_MASK		((vm_prot_t) 0x40)
+#define VM_PROT_IS_MASK         ((vm_prot_t) 0x40)
+
+/*
+ * Another invalid protection value to support execute-only protection.
+ * VM_PROT_STRIP_READ is a special marker that tells mprotect to not
+ * set VM_PROT_READ. We have to do it this way because existing code
+ * expects the system to set VM_PROT_READ if VM_PROT_EXECUTE is set.
+ * VM_PROT_EXECUTE_ONLY is just a convenience value to indicate that
+ * the memory should be executable and explicitly not readable. It will
+ * be ignored on platforms that do not support this type of protection.
+ */
+#define VM_PROT_STRIP_READ              ((vm_prot_t) 0x80)
+#define VM_PROT_EXECUTE_ONLY    (VM_PROT_EXECUTE|VM_PROT_STRIP_READ)
+
+#ifdef PRIVATE
+/*
+ * When using VM_PROT_COPY, fail instead of copying an executable mapping,
+ * since that could cause code-signing violations.
+ */
+#define VM_PROT_COPY_FAIL_IF_EXECUTABLE ((vm_prot_t)0x100)
+#endif /* PRIVATE */
+
+#if defined(__x86_64__)
+/*
+ * Another invalid protection value to support specifying different
+ * execute permissions for user- and supervisor- modes.  When
+ * MBE is enabled in a VM, VM_PROT_EXECUTE is used to indicate
+ * supervisor-mode execute permission, and VM_PROT_UEXEC specifies
+ * user-mode execute permission.  Currently only used by the
+ * x86 Hypervisor kext.
+ */
+#define VM_PROT_UEXEC                   ((vm_prot_t) 0x8)     /* User-mode Execute Permission */
+
+#define VM_PROT_ALLEXEC                 (VM_PROT_EXECUTE | VM_PROT_UEXEC)
+#else
+#define VM_PROT_ALLEXEC                 (VM_PROT_EXECUTE)
+#endif /* defined(__x86_64__) */
+
 
-#endif	/* _MACH_VM_PROT_H_ */
+#endif  /* _MACH_VM_PROT_H_ */
\ No newline at end of file
diff --git a/external_imported/sentry-native/external/breakpad/src/tools/linux/core2md/core2md.cc b/external_imported/sentry-native/external/breakpad/src/tools/linux/core2md/core2md.cc
index 3f34294f5..ec4a012a9 100644
--- a/external_imported/sentry-native/external/breakpad/src/tools/linux/core2md/core2md.cc
+++ b/external_imported/sentry-native/external/breakpad/src/tools/linux/core2md/core2md.cc
@@ -28,6 +28,10 @@
 
 // core2md.cc: A utility to convert an ELF core file to a minidump file.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <stdio.h>
 
 #include "client/linux/minidump_writer/minidump_writer.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/tools/linux/core_handler/core_handler.cc b/external_imported/sentry-native/external/breakpad/src/tools/linux/core_handler/core_handler.cc
index 224073d34..8a1d97662 100644
--- a/external_imported/sentry-native/external/breakpad/src/tools/linux/core_handler/core_handler.cc
+++ b/external_imported/sentry-native/external/breakpad/src/tools/linux/core_handler/core_handler.cc
@@ -28,6 +28,10 @@
 
 // core_handler.cc: A tool to handle coredumps on Linux
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/tools/linux/dump_syms/dump_syms.cc b/external_imported/sentry-native/external/breakpad/src/tools/linux/dump_syms/dump_syms.cc
index 8998b3b35..2fce23c2a 100644
--- a/external_imported/sentry-native/external/breakpad/src/tools/linux/dump_syms/dump_syms.cc
+++ b/external_imported/sentry-native/external/breakpad/src/tools/linux/dump_syms/dump_syms.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <paths.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -56,7 +60,7 @@ int usage(const char* self) {
   fprintf(stderr, "  -n <name>   Use specified name for name of the object\n");
   fprintf(stderr, "  -o <os>     Use specified name for the "
                                  "operating system\n");
-  fprintf(stderr, "  -m          Enable writing the optional 'm' field on FUNC"
+  fprintf(stderr, "  -m          Enable writing the optional 'm' field on FUNC "
                                  "and PUBLIC, denoting multiple symbols for "
                                  "the address.\n");
   return 1;
diff --git a/external_imported/sentry-native/external/breakpad/src/tools/linux/md2core/minidump-2-core.cc b/external_imported/sentry-native/external/breakpad/src/tools/linux/md2core/minidump-2-core.cc
index a4ddbe8e9..3e310bc7d 100644
--- a/external_imported/sentry-native/external/breakpad/src/tools/linux/md2core/minidump-2-core.cc
+++ b/external_imported/sentry-native/external/breakpad/src/tools/linux/md2core/minidump-2-core.cc
@@ -30,6 +30,10 @@
 // Large parts lifted from the userspace core dumper:
 //   http://code.google.com/p/google-coredumper/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <elf.h>
 #include <errno.h>
 #include <limits.h>
@@ -278,7 +282,7 @@ typedef struct prpsinfo {       /* Information about process                 */
 // We parse the minidump file and keep the parsed information in this structure
 struct CrashedProcess {
   CrashedProcess()
-      : crashing_tid(-1),
+      : exception{-1},
         auxv(NULL),
         auxv_length(0) {
     memset(&prps, 0, sizeof(prps));
@@ -302,7 +306,6 @@ struct CrashedProcess {
   };
   std::map<uint64_t, Mapping> mappings;
 
-  pid_t crashing_tid;
   int fatal_signal;
 
   struct Thread {
@@ -326,6 +329,7 @@ struct CrashedProcess {
     size_t stack_length;
   };
   std::vector<Thread> threads;
+  Thread exception;
 
   const uint8_t* auxv;
   size_t auxv_length;
@@ -579,25 +583,21 @@ ParseThreadRegisters(CrashedProcess::Thread* thread,
   thread->mcontext.__gregs[30] = rawregs->t5;
   thread->mcontext.__gregs[31] = rawregs->t6;
 
-# if __riscv_flen == 32
-  for (int i = 0; i < MD_FLOATINGSAVEAREA_RISCV_FPR_COUNT; ++i) {
-    thread->mcontext.__fpregs.__f.__f[i] = rawregs->float_save.regs[i];
+  // Breakpad only supports RISCV32 with 32 bit floating point.
+  // Breakpad only supports RISCV64 with 64 bit floating point.
+#if __riscv_xlen == 32
+  for (int i = 0; i < MD_CONTEXT_RISCV_FPR_COUNT; ++i) {
+    thread->mcontext.__fpregs.__f.__f[i] = rawregs->fpregs[i];
   }
-  thread->mcontext.__fpregs.__f.__fcsr = rawregs->float_save.fpcsr;
-# elif __riscv_flen == 64
-  for (int i = 0; i < MD_FLOATINGSAVEAREA_RISCV_FPR_COUNT; ++i) {
-    thread->mcontext.__fpregs.__d.__f[i] = rawregs->float_save.regs[i];
+  thread->mcontext.__fpregs.__f.__fcsr = rawregs->fcsr;
+#elif __riscv_xlen == 64
+  for (int i = 0; i < MD_CONTEXT_RISCV_FPR_COUNT; ++i) {
+    thread->mcontext.__fpregs.__d.__f[i] = rawregs->fpregs[i];
   }
-  thread->mcontext.__fpregs.__d.__fcsr = rawregs->float_save.fpcsr;
-# elif __riscv_flen == 128
-  for (int i = 0; i < MD_FLOATINGSAVEAREA_RISCV_FPR_COUNT; ++i) {
-    thread->mcontext.__fpregs.__q.__f[2*i] = rawregs->float_save.regs[i].high;
-    thread->mcontext.__fpregs.__q.__f[2*i+1] = rawregs->float_save.regs[i].low;
-  }
-  thread->mcontext.__fpregs.__q.__fcsr = rawregs->float_save.fpcsr;
-# else
-#  error "Unexpected __riscv_flen"
-# endif
+  thread->mcontext.__fpregs.__d.__fcsr = rawregs->fcsr;
+#else
+#error "Unexpected __riscv_xlen"
+#endif
 }
 #else
 #error "This code has not been ported to your platform yet"
@@ -995,10 +995,25 @@ ParseDSODebugInfo(const Options& options, CrashedProcess* crashinfo,
 
 static void
 ParseExceptionStream(const Options& options, CrashedProcess* crashinfo,
-                     const MinidumpMemoryRange& range) {
+                     const MinidumpMemoryRange& range,
+                     const MinidumpMemoryRange& full_file) {
   const MDRawExceptionStream* exp = range.GetData<MDRawExceptionStream>(0);
-  crashinfo->crashing_tid = exp->thread_id;
+  if (!exp) {
+    return;
+  }
+  if (options.verbose) {
+    fprintf(stderr,
+            "MD_EXCEPTION_STREAM:\n"
+            "Found exception thread %" PRIu32 " \n"
+            "\n\n",
+            exp->thread_id);
+  }
   crashinfo->fatal_signal = (int) exp->exception_record.exception_code;
+  crashinfo->exception = {};
+  crashinfo->exception.tid = exp->thread_id;
+  // crashinfo->threads[].tid == crashinfo->exception.tid provides the stack.
+  ParseThreadRegisters(&crashinfo->exception,
+                       full_file.Subrange(exp->thread_context));
 }
 
 static bool
@@ -1361,7 +1376,7 @@ main(int argc, const char* argv[]) {
         break;
       case MD_EXCEPTION_STREAM:
         ParseExceptionStream(options, &crashinfo,
-                             dump.Subrange(dirent->location));
+                             dump.Subrange(dirent->location), dump);
         break;
       case MD_MODULE_LIST_STREAM:
         ParseModuleStream(options, &crashinfo, dump.Subrange(dirent->location),
@@ -1477,16 +1492,21 @@ main(int argc, const char* argv[]) {
     return 1;
   }
 
-  for (unsigned i = 0; i < crashinfo.threads.size(); ++i) {
-    if (crashinfo.threads[i].tid == crashinfo.crashing_tid) {
-      WriteThread(options, crashinfo.threads[i], crashinfo.fatal_signal);
+  for (const auto& current_thread : crashinfo.threads) {
+    if (current_thread.tid == crashinfo.exception.tid) {
+      // Use the exception record's context for the crashed thread instead of
+      // the thread's own context. For the crashed thread the thread's own
+      // context is the state inside the exception handler. Using it would not
+      // result in the expected stack trace from the time of the crash.
+      // The stack memory has already been provided by current_thread.
+      WriteThread(options, crashinfo.exception, crashinfo.fatal_signal);
       break;
     }
   }
 
-  for (unsigned i = 0; i < crashinfo.threads.size(); ++i) {
-    if (crashinfo.threads[i].tid != crashinfo.crashing_tid)
-      WriteThread(options, crashinfo.threads[i], 0);
+  for (const auto& current_thread : crashinfo.threads) {
+    if (current_thread.tid != crashinfo.exception.tid)
+      WriteThread(options, current_thread, 0);
   }
 
   if (note_align) {
diff --git a/external_imported/sentry-native/external/breakpad/src/tools/linux/md2core/minidump_memory_range_unittest.cc b/external_imported/sentry-native/external/breakpad/src/tools/linux/md2core/minidump_memory_range_unittest.cc
index 9012101d6..c939dd647 100644
--- a/external_imported/sentry-native/external/breakpad/src/tools/linux/md2core/minidump_memory_range_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/tools/linux/md2core/minidump_memory_range_unittest.cc
@@ -29,6 +29,10 @@
 // minidump_memory_range_unittest.cc:
 // Unit tests for google_breakpad::MinidumpMemoryRange.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "breakpad_googletest_includes.h"
 #include "tools/linux/md2core/minidump_memory_range.h"
 
diff --git a/external_imported/sentry-native/external/breakpad/src/tools/linux/pid2md/pid2md.cc b/external_imported/sentry-native/external/breakpad/src/tools/linux/pid2md/pid2md.cc
index ca1cb6377..add12a738 100644
--- a/external_imported/sentry-native/external/breakpad/src/tools/linux/pid2md/pid2md.cc
+++ b/external_imported/sentry-native/external/breakpad/src/tools/linux/pid2md/pid2md.cc
@@ -28,6 +28,10 @@
 
 // pid2md.cc: An utility to generate a minidump from a running process
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/tools/linux/symupload/minidump_upload.cc b/external_imported/sentry-native/external/breakpad/src/tools/linux/symupload/minidump_upload.cc
index 6adead034..9f2c96744 100644
--- a/external_imported/sentry-native/external/breakpad/src/tools/linux/symupload/minidump_upload.cc
+++ b/external_imported/sentry-native/external/breakpad/src/tools/linux/symupload/minidump_upload.cc
@@ -33,6 +33,10 @@
 //  ver: the product version
 //  symbol_file: the breakpad format symbol file
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/tools/linux/symupload/sym_upload.cc b/external_imported/sentry-native/external/breakpad/src/tools/linux/symupload/sym_upload.cc
index 8f5e8a507..a76c55f7d 100644
--- a/external_imported/sentry-native/external/breakpad/src/tools/linux/symupload/sym_upload.cc
+++ b/external_imported/sentry-native/external/breakpad/src/tools/linux/symupload/sym_upload.cc
@@ -38,6 +38,10 @@
 //  cpu: the CPU that the module was built for
 //  symbol_file: the contents of the breakpad-format symbol file
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/tools/mac/dump_syms/dump_syms_tool.cc b/external_imported/sentry-native/external/breakpad/src/tools/mac/dump_syms/dump_syms_tool.cc
index 2e05cbf3b..9fb8d13f2 100644
--- a/external_imported/sentry-native/external/breakpad/src/tools/mac/dump_syms/dump_syms_tool.cc
+++ b/external_imported/sentry-native/external/breakpad/src/tools/mac/dump_syms/dump_syms_tool.cc
@@ -31,6 +31,10 @@
 // dump_syms_tool.cc: Command line tool that uses the DumpSymbols class.
 // TODO(waylonis): accept stdin
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <mach-o/arch.h>
 #include <unistd.h>
 
@@ -59,16 +63,20 @@ struct Options {
         cfi(true),
         handle_inter_cu_refs(true),
         handle_inlines(false),
-        enable_multiple(false) {}
+        enable_multiple(false),
+        module_name(),
+        prefer_extern_name(false) {}
 
   string srcPath;
   string dsymPath;
-  const NXArchInfo *arch;
+  std::optional<ArchInfo> arch;
   bool header_only;
   bool cfi;
   bool handle_inter_cu_refs;
   bool handle_inlines;
   bool enable_multiple;
+  string module_name;
+  bool prefer_extern_name;
 };
 
 static bool StackFrameEntryComparator(const Module::StackFrameEntry* a,
@@ -117,11 +125,12 @@ static void CopyCFIDataBetweenModules(Module* to_module,
 }
 
 static bool SetArchitecture(DumpSymbols& dump_symbols,
-                            const NXArchInfo* arch,
+                            const ArchInfo& arch,
                             const std::string& filename) {
-  if (!dump_symbols.SetArchitecture(arch->cputype, arch->cpusubtype)) {
+  if (!dump_symbols.SetArchitecture(arch)) {
     fprintf(stderr, "%s: no architecture '%s' is present in file.\n",
-            filename.c_str(), arch->name);
+            filename.c_str(),
+            GetNameFromCPUType(arch.cputype, arch.cpusubtype));
     size_t available_size;
     const SuperFatArch* available =
         dump_symbols.AvailableArchitectures(&available_size);
@@ -131,14 +140,8 @@ static bool SetArchitecture(DumpSymbols& dump_symbols,
       fprintf(stderr, "architectures present in the file are:\n");
     for (size_t i = 0; i < available_size; i++) {
       const SuperFatArch* arch = &available[i];
-      const NXArchInfo* arch_info =
-          google_breakpad::BreakpadGetArchInfoFromCpuType(arch->cputype,
-                                                          arch->cpusubtype);
-      if (arch_info)
-        fprintf(stderr, "%s (%s)\n", arch_info->name, arch_info->description);
-      else
-        fprintf(stderr, "unrecognized cpu type 0x%x, subtype 0x%x\n",
-                arch->cputype, arch->cpusubtype);
+      fprintf(stderr, "%s\n",
+              GetNameFromCPUType(arch->cputype, arch->cpusubtype));
     }
     return false;
   }
@@ -150,7 +153,8 @@ static bool Start(const Options& options) {
       (options.handle_inlines ? INLINES : NO_DATA) |
       (options.cfi ? CFI : NO_DATA) | SYMBOLS_AND_FILES;
   DumpSymbols dump_symbols(symbol_data, options.handle_inter_cu_refs,
-                           options.enable_multiple);
+                           options.enable_multiple, options.module_name,
+                           options.prefer_extern_name);
 
   // For x86_64 binaries, the CFI data is in the __TEXT,__eh_frame of the
   // Mach-O file, which is not copied into the dSYM. Whereas in i386, the CFI
@@ -169,7 +173,7 @@ static bool Start(const Options& options) {
     return false;
 
   if (options.arch &&
-      !SetArchitecture(dump_symbols, options.arch, primary_file)) {
+      !SetArchitecture(dump_symbols, *options.arch, primary_file)) {
     return false;
   }
 
@@ -189,7 +193,7 @@ static bool Start(const Options& options) {
       return false;
 
     if (options.arch &&
-        !SetArchitecture(dump_symbols, options.arch, options.srcPath)) {
+        !SetArchitecture(dump_symbols, *options.arch, options.srcPath)) {
       return false;
     }
     Module* cfi_module = NULL;
@@ -197,13 +201,38 @@ static bool Start(const Options& options) {
       return false;
     scoped_ptr<Module> scoped_cfi_module(cfi_module);
 
+    bool name_matches;
+    if (!options.module_name.empty()) {
+      // Ignore the basename of the dSYM and binary and use the passed-in module
+      // name.
+      name_matches = true;
+    } else {
+      name_matches = cfi_module->name() == module->name();
+    }
+
     // Ensure that the modules are for the same debug code file.
-    if (cfi_module->name() != module->name() ||
-        cfi_module->os() != module->os() ||
+    if (!name_matches || cfi_module->os() != module->os() ||
         cfi_module->architecture() != module->architecture() ||
         cfi_module->identifier() != module->identifier()) {
       fprintf(stderr, "Cannot generate a symbol file from split sources that do"
                       " not match.\n");
+      if (!name_matches) {
+        fprintf(stderr, "Name mismatch: binary=[%s], dSYM=[%s]\n",
+                cfi_module->name().c_str(), module->name().c_str());
+      }
+      if (cfi_module->os() != module->os()) {
+        fprintf(stderr, "OS mismatch: binary=[%s], dSYM=[%s]\n",
+                cfi_module->os().c_str(), module->os().c_str());
+      }
+      if (cfi_module->architecture() != module->architecture()) {
+        fprintf(stderr, "Architecture mismatch: binary=[%s], dSYM=[%s]\n",
+                cfi_module->architecture().c_str(),
+                module->architecture().c_str());
+      }
+      if (cfi_module->identifier() != module->identifier()) {
+        fprintf(stderr, "Identifier mismatch: binary=[%s], dSYM=[%s]\n",
+                cfi_module->identifier().c_str(), module->identifier().c_str());
+      }
       return false;
     }
 
@@ -216,8 +245,10 @@ static bool Start(const Options& options) {
 //=============================================================================
 static void Usage(int argc, const char *argv[]) {
   fprintf(stderr, "Output a Breakpad symbol file from a Mach-o file.\n");
-  fprintf(stderr, "Usage: %s [-a ARCHITECTURE] [-c] [-g dSYM path] "
-                  "<Mach-o file>\n", argv[0]);
+  fprintf(stderr,
+          "Usage: %s [-a ARCHITECTURE] [-c] [-g dSYM path] "
+          "[-n MODULE] [-x] <Mach-o file>\n",
+          argv[0]);
   fprintf(stderr, "\t-i: Output module header information only.\n");
   fprintf(stderr, "\t-a: Architecture type [default: native, or whatever is\n");
   fprintf(stderr, "\t    in the file, if it contains only one architecture]\n");
@@ -229,6 +260,12 @@ static void Usage(int argc, const char *argv[]) {
   fprintf(stderr,
           "\t-m: Enable writing the optional 'm' field on FUNC "
           "and PUBLIC, denoting multiple symbols for the address.\n");
+  fprintf(stderr,
+          "\t-n: Use MODULE as the name of the module rather than \n"
+          "the basename of the Mach-O file/dSYM.\n");
+  fprintf(stderr,
+          "\t-x: Prefer the PUBLIC (extern) name over the FUNC if\n"
+          "they do not match.\n");
   fprintf(stderr, "\t-h: Usage\n");
   fprintf(stderr, "\t-?: Usage\n");
 }
@@ -238,14 +275,13 @@ static void SetupOptions(int argc, const char *argv[], Options *options) {
   extern int optind;
   signed char ch;
 
-  while ((ch = getopt(argc, (char* const*)argv, "ia:g:crdm?h")) != -1) {
+  while ((ch = getopt(argc, (char* const*)argv, "ia:g:crdm?hn:x")) != -1) {
     switch (ch) {
       case 'i':
         options->header_only = true;
         break;
       case 'a': {
-        const NXArchInfo *arch_info =
-            google_breakpad::BreakpadGetArchInfoFromName(optarg);
+        std::optional<ArchInfo> arch_info = GetArchInfoFromName(optarg);
         if (!arch_info) {
           fprintf(stderr, "%s: Invalid architecture: %s\n", argv[0], optarg);
           Usage(argc, argv);
@@ -269,6 +305,12 @@ static void SetupOptions(int argc, const char *argv[], Options *options) {
       case 'm':
         options->enable_multiple = true;
         break;
+      case 'n':
+        options->module_name = optarg;
+        break;
+      case 'x':
+        options->prefer_extern_name = true;
+        break;
       case '?':
       case 'h':
         Usage(argc, argv);
diff --git a/external_imported/sentry-native/external/breakpad/src/tools/mac/dump_syms/macho_dump.cc b/external_imported/sentry-native/external/breakpad/src/tools/mac/dump_syms/macho_dump.cc
deleted file mode 100644
index b724cc740..000000000
--- a/external_imported/sentry-native/external/breakpad/src/tools/mac/dump_syms/macho_dump.cc
+++ /dev/null
@@ -1,202 +0,0 @@
-// Copyright 2010 Google LLC
-//
-// 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 LLC 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.
-
-// Original author: Jim Blandy <jimb@mozilla.com> <jimb@red-bean.com>
-
-// macho_dump.cc: Dump the contents of a Mach-O file. This is mostly
-// a test program for the Mach_O::FatReader and Mach_O::Reader classes.
-
-#include <errno.h>
-#include <fcntl.h>
-#include <mach-o/arch.h>
-#include <sys/mman.h>
-#include <stdint.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-#include <sstream>
-#include <string>
-#include <vector>
-
-#include "common/byte_cursor.h"
-#include "common/mac/arch_utilities.h"
-#include "common/mac/macho_reader.h"
-#include "common/path_helper.h"
-
-using google_breakpad::ByteBuffer;
-using std::ostringstream;
-using std::string;
-using std::vector;
-
-namespace {
-namespace mach_o = google_breakpad::mach_o;
-
-string program_name;
-
-int check_syscall(int result, const char* operation, const char* filename) {
-  if (result < 0) {
-    fprintf(stderr, "%s: %s '%s': %s\n",
-            program_name.c_str(), operation,
-            filename, strerror(errno));
-    exit(1);
-  }
-  return result;
-}
-
-class DumpSection: public mach_o::Reader::SectionHandler {
- public:
-  DumpSection() : index_(0) { }
-  bool HandleSection(const mach_o::Section& section) {
-    printf("        section %d '%s' in segment '%s'\n"
-           "          address: 0x%llx\n"
-           "          alignment: 1 << %d B\n"
-           "          flags: %d\n"
-           "          size: %ld\n",
-           index_++, section.section_name.c_str(), section.segment_name.c_str(),
-           section.address, section.align,
-           mach_o::SectionFlags(section.flags),
-           section.contents.Size());
-    return true;
-  }
-
- private:
-  int index_;
-};
-
-class DumpCommand: public mach_o::Reader::LoadCommandHandler {
- public:
-  DumpCommand(mach_o::Reader* reader) : reader_(reader), index_(0) { }
-  bool UnknownCommand(mach_o::LoadCommandType type,
-                      const ByteBuffer& contents) {
-    printf("      load command %d: %d", index_++, type);
-    return true;
-  }
-  bool SegmentCommand(const mach_o::Segment& segment) {
-    printf("      load command %d: %s-bit segment '%s'\n"
-           "        address: 0x%llx\n"
-           "        memory size: 0x%llx\n"
-           "        maximum protection: 0x%x\n"
-           "        initial protection: 0x%x\n"
-           "        flags: %d\n"
-           "        section_list size: %ld B\n",
-           index_++, (segment.bits_64 ? "64" : "32"), segment.name.c_str(),
-           segment.vmaddr, segment.vmsize, segment.maxprot,
-           segment.initprot, mach_o::SegmentFlags(segment.flags),
-           segment.section_list.Size());
-           
-    DumpSection dump_section;
-    return reader_->WalkSegmentSections(segment, &dump_section);
-  }
- private:
-  mach_o::Reader* reader_;
-  int index_;
-};
-
-void DumpFile(const char* filename) {
-  int fd = check_syscall(open(filename, O_RDONLY), "opening", filename);
-  struct stat attributes;
-  check_syscall(fstat(fd, &attributes),
-                "getting file attributes for", filename);
-  void* mapping = mmap(NULL, attributes.st_size, PROT_READ,
-                       MAP_PRIVATE, fd, 0);
-  close(fd);
-  check_syscall(mapping == (void*)-1 ? -1 : 0,
-                "mapping contents of", filename);
-
-  mach_o::FatReader::Reporter fat_reporter(filename);
-  mach_o::FatReader fat_reader(&fat_reporter);
-  if (!fat_reader.Read(reinterpret_cast<uint8_t*>(mapping),
-                       attributes.st_size)) {
-    exit(1);
-  }
-  printf("filename: %s\n", filename);
-  size_t object_files_size;
-  const SuperFatArch* super_fat_object_files =
-      fat_reader.object_files(&object_files_size);
-  struct fat_arch* object_files;
-  if (!super_fat_object_files->ConvertToFatArch(object_files)) {
-    exit(1);
-  }
-  printf("  object file count: %ld\n", object_files_size);
-  for (size_t i = 0; i < object_files_size; i++) {
-    const struct fat_arch& file = object_files[i];
-    const NXArchInfo* fat_arch_info =
-        google_breakpad::BreakpadGetArchInfoFromCpuType(
-            file.cputype, file.cpusubtype);
-    printf("\n  object file %ld:\n"
-           "    fat header:\n:"
-           "      CPU type: %s (%s)\n"
-           "      size: %d B\n"
-           "      alignment: 1<<%d B\n",
-           i, fat_arch_info->name, fat_arch_info->description,
-           file.size, file.align);
-
-    ostringstream name;
-    name << filename;
-    if (object_files_size > 1)
-      name << ", object file #" << i;
-    ByteBuffer file_contents(reinterpret_cast<uint8_t*>(mapping)
-                             + file.offset, file.size);
-    mach_o::Reader::Reporter reporter(name.str());
-    mach_o::Reader reader(&reporter);
-    if (!reader.Read(file_contents, file.cputype, file.cpusubtype)) {
-      exit(1);
-    }
-
-    const NXArchInfo* macho_arch_info =
-      NXGetArchInfoFromCpuType(reader.cpu_type(),
-                               reader.cpu_subtype());
-    printf("    Mach-O header:\n"
-           "      word size: %s\n" 
-           "      CPU type: %s (%s)\n"
-           "      File type: %d\n"
-           "      flags: %x\n",
-           (reader.bits_64() ? "64 bits" : "32 bits"),
-           macho_arch_info->name, macho_arch_info->description,
-           reader.file_type(), reader.flags());
-
-    DumpCommand dump_command(&reader);
-    reader.WalkLoadCommands(&dump_command);
-  }
-  munmap(mapping, attributes.st_size);
-}
-
-}  // namespace
-
-int main(int argc, char** argv) {
-  program_name = google_breakpad::BaseName(argv[0]);
-  if (argc == 1) {
-    fprintf(stderr, "Usage: %s FILE ...\n"
-            "Dump the contents of the Mach-O or fat binary files "
-            "'FILE ...'.\n", program_name.c_str());
-  }
-  for (int i = 1; i < argc; i++) {
-    DumpFile(argv[i]);
-  }
-}
diff --git a/external_imported/sentry-native/external/breakpad/src/tools/mac/upload_system_symbols/upload_system_symbols.go b/external_imported/sentry-native/external/breakpad/src/tools/mac/upload_system_symbols/upload_system_symbols.go
index ba0672763..f34c288ae 100644
--- a/external_imported/sentry-native/external/breakpad/src/tools/mac/upload_system_symbols/upload_system_symbols.go
+++ b/external_imported/sentry-native/external/breakpad/src/tools/mac/upload_system_symbols/upload_system_symbols.go
@@ -163,6 +163,29 @@ func main() {
 	}
 }
 
+// manglePath reduces an absolute filesystem path to a string suitable as the
+// base for a file name which encodes some of the original path. The result
+// concatenates the leading initial from each path component except the last to
+// the last path component; for example /System/Library/Frameworks/AppKit
+// becomes SLFAppKit.
+// Assumes ASCII.
+func manglePath(path string) string {
+	components := strings.Split(path, "/")
+	n := len(components)
+	builder := strings.Builder{}
+	for i, component := range components {
+		if len(component) == 0 {
+			continue
+		}
+		if i < n-1 {
+			builder.WriteString(component[:1])
+		} else {
+			builder.WriteString(component)
+		}
+	}
+	return builder.String()
+}
+
 type WorkerPool struct {
 	wg sync.WaitGroup
 }
@@ -296,7 +319,7 @@ func (dq *DumpQueue) worker() {
 	dumpSyms := path.Join(*breakpadTools, "dump_syms")
 
 	for req := range dq.queue {
-		filebase := path.Join(dq.dumpPath, strings.Replace(req.path, "/", "_", -1))
+		filebase := path.Join(dq.dumpPath, manglePath(req.path))
 		symfile := fmt.Sprintf("%s_%s.sym", filebase, req.arch)
 		f, err := os.Create(symfile)
 		if err != nil {
diff --git a/external_imported/sentry-native/external/breakpad/src/tools/python/deps-to-manifest.py b/external_imported/sentry-native/external/breakpad/src/tools/python/deps-to-manifest.py
index 2fcaf7717..b614f94fd 100755
--- a/external_imported/sentry-native/external/breakpad/src/tools/python/deps-to-manifest.py
+++ b/external_imported/sentry-native/external/breakpad/src/tools/python/deps-to-manifest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 # Copyright 2016 Google LLC
 #
 # Redistribution and use in source and binary forms, with or without
@@ -29,8 +29,6 @@
 
 """Convert gclient's DEPS file to repo's manifest xml file."""
 
-from __future__ import print_function
-
 import argparse
 import os
 import sys
@@ -76,7 +74,8 @@ def ConvertDepsToManifest(deps, manifest):
   """Convert the |deps| file to the |manifest|."""
   # Load the DEPS file data.
   ctx = {}
-  execfile(deps, ctx)
+  with open(deps, 'rb') as file:
+    exec(compile(file.read(), deps, 'exec'), ctx)
 
   new_contents = ''
 
diff --git a/external_imported/sentry-native/external/breakpad/src/tools/python/filter_syms.py b/external_imported/sentry-native/external/breakpad/src/tools/python/filter_syms.py
index caf3693a5..8537769e9 100644
--- a/external_imported/sentry-native/external/breakpad/src/tools/python/filter_syms.py
+++ b/external_imported/sentry-native/external/breakpad/src/tools/python/filter_syms.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright 2012 Google LLC
 #
 # Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,6 @@
 updating any references to the FILE records in the other record types.
 """
 
-import macpath
 import ntpath
 import optparse
 import os
@@ -132,8 +131,8 @@ def _AdjustPath(self, path):
     Returns:
         The actual path to use when writing the FILE record.
     """
-    return path[len(filter(path.startswith,
-                           self.ignored_prefixes + [''])[0]):]
+    return path[len(next(filter(path.startswith,
+                                self.ignored_prefixes + ['']))):]
 
   def _ParseFileRecord(self, file_record):
     """Parses and corrects a FILE record."""
@@ -193,7 +192,7 @@ def main():
     symbol_parser = SymbolFileParser(sys.stdin, sys.stdout, options.prefixes,
                                      path_handler)
     symbol_parser.Process()
-  except BreakpadParseError, e:
+  except BreakpadParseError as e:
     print >> sys.stderr, 'Got an error while processing symbol file'
     print >> sys.stderr, str(e)
     return 1
diff --git a/external_imported/sentry-native/external/breakpad/src/tools/python/tests/filter_syms_unittest.py b/external_imported/sentry-native/external/breakpad/src/tools/python/tests/filter_syms_unittest.py
index 1081fc731..f6364b8b3 100644
--- a/external_imported/sentry-native/external/breakpad/src/tools/python/tests/filter_syms_unittest.py
+++ b/external_imported/sentry-native/external/breakpad/src/tools/python/tests/filter_syms_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright 2012 Google LLC
 #
 # Redistribution and use in source and binary forms, with or without
@@ -29,10 +29,9 @@
 
 """Unit tests for filter_syms.py"""
 
-import cStringIO
+import io
 import ntpath
 import os
-import StringIO
 import sys
 import unittest
 
@@ -44,8 +43,8 @@
 
 class FilterSysmsTest(unittest.TestCase):
   def assertParsed(self, input_data, ignored_prefixes, expected):
-    input_io = cStringIO.StringIO(input_data)
-    output_io = cStringIO.StringIO()
+    input_io = io.StringIO(input_data)
+    output_io = io.StringIO()
     parser = filter_syms.SymbolFileParser(input_io, output_io,
                                           ignored_prefixes, ntpath)
     parser.Process()
@@ -134,4 +133,4 @@ def testIgnoredPrefixesDuplicateFiles(self):
     self.assertParsed(INPUT, IGNORED_PREFIXES, EXPECTED_OUTPUT)
 
 if __name__ == '__main__':
-  unittest.main()
\ No newline at end of file
+  unittest.main()
diff --git a/external_imported/sentry-native/external/breakpad/src/tools/solaris/dump_syms/dump_syms.cc b/external_imported/sentry-native/external/breakpad/src/tools/solaris/dump_syms/dump_syms.cc
index fc331c21b..ead160011 100644
--- a/external_imported/sentry-native/external/breakpad/src/tools/solaris/dump_syms/dump_syms.cc
+++ b/external_imported/sentry-native/external/breakpad/src/tools/solaris/dump_syms/dump_syms.cc
@@ -28,6 +28,10 @@
 
 // Author: Alfred Peng
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <string>
 #include <cstdio>
 
diff --git a/external_imported/sentry-native/external/breakpad/src/tools/solaris/dump_syms/testdata/dump_syms_regtest.cc b/external_imported/sentry-native/external/breakpad/src/tools/solaris/dump_syms/testdata/dump_syms_regtest.cc
index b4d191bde..fb6c883b5 100644
--- a/external_imported/sentry-native/external/breakpad/src/tools/solaris/dump_syms/testdata/dump_syms_regtest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/tools/solaris/dump_syms/testdata/dump_syms_regtest.cc
@@ -28,6 +28,10 @@
 
 // ./dump_syms dump_syms_regtest.pdb > dump_syms_regtest.sym
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 namespace google_breakpad {
 
 class C {
diff --git a/external_imported/sentry-native/external/breakpad/src/tools/windows/converter/ms_symbol_server_converter.cc b/external_imported/sentry-native/external/breakpad/src/tools/windows/converter/ms_symbol_server_converter.cc
index bfe46925c..f7d9d9431 100644
--- a/external_imported/sentry-native/external/breakpad/src/tools/windows/converter/ms_symbol_server_converter.cc
+++ b/external_imported/sentry-native/external/breakpad/src/tools/windows/converter/ms_symbol_server_converter.cc
@@ -33,6 +33,10 @@
 //
 // Author: Mark Mentovai
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <windows.h>
 #include <dbghelp.h>
 #include <pathcch.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/tools/windows/converter_exe/converter.cc b/external_imported/sentry-native/external/breakpad/src/tools/windows/converter_exe/converter.cc
index 75ec55b0f..92c41774a 100644
--- a/external_imported/sentry-native/external/breakpad/src/tools/windows/converter_exe/converter.cc
+++ b/external_imported/sentry-native/external/breakpad/src/tools/windows/converter_exe/converter.cc
@@ -31,6 +31,10 @@
 #pragma comment(lib, "diaguids.lib")
 #pragma comment(lib, "imagehlp.lib")
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <cassert>
 #include <cstdio>
 #include <ctime>
diff --git a/external_imported/sentry-native/external/breakpad/src/tools/windows/converter_exe/escaping.cc b/external_imported/sentry-native/external/breakpad/src/tools/windows/converter_exe/escaping.cc
index de0742984..e399c0f48 100644
--- a/external_imported/sentry-native/external/breakpad/src/tools/windows/converter_exe/escaping.cc
+++ b/external_imported/sentry-native/external/breakpad/src/tools/windows/converter_exe/escaping.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "tools/windows/converter_exe/escaping.h"
 
 #include <assert.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/tools/windows/converter_exe/http_download.cc b/external_imported/sentry-native/external/breakpad/src/tools/windows/converter_exe/http_download.cc
index 75f674e08..de8241980 100644
--- a/external_imported/sentry-native/external/breakpad/src/tools/windows/converter_exe/http_download.cc
+++ b/external_imported/sentry-native/external/breakpad/src/tools/windows/converter_exe/http_download.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <assert.h>
 #include <stdio.h>
 #include <Windows.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/tools/windows/converter_exe/tokenizer.cc b/external_imported/sentry-native/external/breakpad/src/tools/windows/converter_exe/tokenizer.cc
index 6d627536d..08480d7be 100644
--- a/external_imported/sentry-native/external/breakpad/src/tools/windows/converter_exe/tokenizer.cc
+++ b/external_imported/sentry-native/external/breakpad/src/tools/windows/converter_exe/tokenizer.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <assert.h>
 
 #include "tools/windows/converter_exe/tokenizer.h"
diff --git a/external_imported/sentry-native/external/breakpad/src/tools/windows/converter_exe/winhttp_client.cc b/external_imported/sentry-native/external/breakpad/src/tools/windows/converter_exe/winhttp_client.cc
index f8c1492d5..425a9daad 100644
--- a/external_imported/sentry-native/external/breakpad/src/tools/windows/converter_exe/winhttp_client.cc
+++ b/external_imported/sentry-native/external/breakpad/src/tools/windows/converter_exe/winhttp_client.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "tools/windows/converter_exe/winhttp_client.h"
 
 #include <assert.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/tools/windows/converter_exe/wininet_client.cc b/external_imported/sentry-native/external/breakpad/src/tools/windows/converter_exe/wininet_client.cc
index 90cf114ca..571ab86c6 100644
--- a/external_imported/sentry-native/external/breakpad/src/tools/windows/converter_exe/wininet_client.cc
+++ b/external_imported/sentry-native/external/breakpad/src/tools/windows/converter_exe/wininet_client.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include "tools/windows/converter_exe/wininet_client.h"
 
 #include <assert.h>
diff --git a/external_imported/sentry-native/external/breakpad/src/tools/windows/dump_syms/dump_syms.cc b/external_imported/sentry-native/external/breakpad/src/tools/windows/dump_syms/dump_syms.cc
index 26c226a25..1979d4306 100644
--- a/external_imported/sentry-native/external/breakpad/src/tools/windows/dump_syms/dump_syms.cc
+++ b/external_imported/sentry-native/external/breakpad/src/tools/windows/dump_syms/dump_syms.cc
@@ -29,6 +29,10 @@
 // Windows utility to dump the line number data from a pdb file to
 // a text-based format that we can use from the minidump processor.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <stdio.h>
 #include <wchar.h>
 
diff --git a/external_imported/sentry-native/external/breakpad/src/tools/windows/dump_syms/dump_syms_unittest.cc b/external_imported/sentry-native/external/breakpad/src/tools/windows/dump_syms/dump_syms_unittest.cc
index 97dc5c9b9..73c48a2f4 100644
--- a/external_imported/sentry-native/external/breakpad/src/tools/windows/dump_syms/dump_syms_unittest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/tools/windows/dump_syms/dump_syms_unittest.cc
@@ -26,6 +26,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <Windows.h>
 #include <shellapi.h>
 
diff --git a/external_imported/sentry-native/external/breakpad/src/tools/windows/dump_syms/testdata/dump_syms_regtest.cc b/external_imported/sentry-native/external/breakpad/src/tools/windows/dump_syms/testdata/dump_syms_regtest.cc
index 442676bae..90d00af2e 100644
--- a/external_imported/sentry-native/external/breakpad/src/tools/windows/dump_syms/testdata/dump_syms_regtest.cc
+++ b/external_imported/sentry-native/external/breakpad/src/tools/windows/dump_syms/testdata/dump_syms_regtest.cc
@@ -35,6 +35,11 @@
 // cl /Zi dump_syms_regtest64.cc /link /PROFILE
 // dump_syms dump_syms_regtest64.pdb > dump_syms_regtest64.sym
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+
 namespace google_breakpad {
 
 class C {
diff --git a/external_imported/sentry-native/external/breakpad/src/tools/windows/symupload/symupload.cc b/external_imported/sentry-native/external/breakpad/src/tools/windows/symupload/symupload.cc
index 65123a280..46ace95ad 100644
--- a/external_imported/sentry-native/external/breakpad/src/tools/windows/symupload/symupload.cc
+++ b/external_imported/sentry-native/external/breakpad/src/tools/windows/symupload/symupload.cc
@@ -42,6 +42,10 @@
 //  cpu: the CPU that the module was built for, typically "x86".
 //  symbol_file: the contents of the breakpad-format symbol file
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>  // Must come first
+#endif
+
 #include <windows.h>
 #include <dbghelp.h>
 #include <wininet.h>
diff --git a/external_imported/sentry-native/external/crashpad/.github/CODEOWNERS b/external_imported/sentry-native/external/crashpad/.github/CODEOWNERS
new file mode 100644
index 000000000..7afbb99cb
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/.github/CODEOWNERS
@@ -0,0 +1 @@
+*   @getsentry/owners-native
diff --git a/external_imported/sentry-native/external/crashpad/.github/workflows/build.yml b/external_imported/sentry-native/external/crashpad/.github/workflows/build.yml
index cbefe8fea..5161a689e 100644
--- a/external_imported/sentry-native/external/crashpad/.github/workflows/build.yml
+++ b/external_imported/sentry-native/external/crashpad/.github/workflows/build.yml
@@ -26,7 +26,7 @@ jobs:
 
       - name: Build crashpad
         run: |
-          cmake -B cmake-build
+          cmake -B cmake-build -D CRASHPAD_BUILD_TOOLS=On
           cmake --build cmake-build --parallel
 
       - name: Build crashpad with client-side stack traces
@@ -34,6 +34,18 @@ jobs:
           cmake -B cmake-build-stacks -D CRASHPAD_ENABLE_STACKTRACE=ON
           cmake --build cmake-build-stacks --parallel
 
+      - name: Build crashpad Windows ARM64
+        if: ${{ runner.os == 'Windows' }}
+        run: |
+          cmake -B cmake-build-arm64 -DCMAKE_TOOLCHAIN_FILE="cmake/toolchains/win_arm64.cmake" -DCRASHPAD_BUILD_TOOLS=On
+          cmake --build cmake-build-arm64 --config RelWithDebInfo -- /p:Platform=ARM64
+
+      - name: Build crashpad with client-side stack traces Windows ARM64
+        if: ${{ runner.os == 'Windows' }}
+        run: |
+          cmake -B cmake-build-stacks-arm64 -DCMAKE_TOOLCHAIN_FILE="cmake/toolchains/win_arm64.cmake" -DCRASHPAD_ENABLE_STACKTRACE=ON
+          cmake --build cmake-build-stacks-arm64 --config RelWithDebInfo -- /p:Platform=ARM64
+
   build-ios:
     runs-on: macos-latest
     steps:
diff --git a/external_imported/sentry-native/external/crashpad/AUTHORS b/external_imported/sentry-native/external/crashpad/AUTHORS
index 021039243..e797d3db7 100644
--- a/external_imported/sentry-native/external/crashpad/AUTHORS
+++ b/external_imported/sentry-native/external/crashpad/AUTHORS
@@ -13,3 +13,4 @@ Vewd Software AS
 LG Electronics, Inc.
 MIPS Technologies, Inc.
 Darshan Sen <raisinten@gmail.com>
+Ho Cheung <uioptt24@gmail.com>
diff --git a/external_imported/sentry-native/external/crashpad/BUILD.gn b/external_imported/sentry-native/external/crashpad/BUILD.gn
index db65cffc4..83c4a32c0 100644
--- a/external_imported/sentry-native/external/crashpad/BUILD.gn
+++ b/external_imported/sentry-native/external/crashpad/BUILD.gn
@@ -123,11 +123,6 @@ if (crashpad_is_in_chromium || crashpad_is_in_fuchsia) {
       deps = _resources
     }
 
-    fuchsia_shell_package("crashpad-database-util") {
-      package_name = "crashpad_database_util"
-      deps = [ "tools:crashpad_database_util" ]
-    }
-
     group("tests") {
       testonly = true
 
diff --git a/external_imported/sentry-native/external/crashpad/CMakeLists.txt b/external_imported/sentry-native/external/crashpad/CMakeLists.txt
index cbb998436..79edcfafc 100644
--- a/external_imported/sentry-native/external/crashpad/CMakeLists.txt
+++ b/external_imported/sentry-native/external/crashpad/CMakeLists.txt
@@ -25,14 +25,6 @@ if(CRASHPAD_ZLIB_SYSTEM)
     find_package(ZLIB REQUIRED)
 endif()
 
-
-if(LINUX OR ANDROID)
-    find_package(OpenSSL)
-    if(OPENSSL_FOUND)
-        set(CRASHPAD_USE_BORINGSSL ON)
-    endif()
-endif()
-
 if (NOT (ANDROID OR FUCHSIA))
     add_compile_definitions(CRASHPAD_FLOCK_ALWAYS_SUPPORTED=1)
 else()
@@ -58,7 +50,11 @@ function(crashpad_install_dev)
 endfunction()
 
 if(WIN32)
-    enable_language(ASM_MASM)
+    if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES ARM64)
+        enable_language(ASM_MARMASM)
+    else()
+        enable_language(ASM_MASM)
+    endif()
 
     if(MINGW)
         find_program(JWASM_FOUND jwasm)
@@ -110,6 +106,9 @@ if(WIN32)
     )
 endif()
 if(MSVC)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /utf-8")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /utf-8")
+
     string(REGEX REPLACE "/[Ww][0123]" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
     string(REGEX REPLACE "/[Ww][0123]" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
     target_compile_options(crashpad_interface INTERFACE
diff --git a/external_imported/sentry-native/external/crashpad/DEPS b/external_imported/sentry-native/external/crashpad/DEPS
index 0ef3c1f4b..80c1aabf3 100644
--- a/external_imported/sentry-native/external/crashpad/DEPS
+++ b/external_imported/sentry-native/external/crashpad/DEPS
@@ -44,22 +44,22 @@ deps = {
       'af29db7ec28d6df1c7f0f745186884091e602e07',
   'crashpad/third_party/lss/lss':
       Var('chromium_git') + '/linux-syscall-support.git@' +
-      'e1e7b0ad8ee99a875b272c8e33e308472e897660',
+      '9719c1e1e676814c456b55f5f070eabad6709d31',
   'crashpad/third_party/mini_chromium/mini_chromium':
       Var('chromium_git') + '/chromium/mini_chromium@' +
-      '4332ddb6963750e1106efdcece6d6e2de6dc6430',
+      '9e21183c1ea369398d6f6ddd302c8db580bd19c4',
   'crashpad/third_party/libfuzzer/src':
       Var('chromium_git') + '/chromium/llvm-project/compiler-rt/lib/fuzzer.git@' +
       'fda403cf93ecb8792cb1d061564d89a6553ca020',
   'crashpad/third_party/zlib/zlib':
       Var('chromium_git') + '/chromium/src/third_party/zlib@' +
-      '13dc246a58e4b72104d35f9b1809af95221ebda7',
+      'fef58692c1d7bec94c4ed3d030a45a1832a9615d',
 
   # CIPD packages.
   'buildtools/linux64': {
     'packages': [
       {
-        'package': 'gn/gn/linux-amd64',
+        'package': 'gn/gn/linux-${{arch}}',
         'version': Var('gn_version'),
       }
     ],
@@ -89,8 +89,8 @@ deps = {
   'crashpad/third_party/linux/clang/linux-amd64': {
     'packages': [
       {
-        'package': 'fuchsia/clang/linux-amd64',
-        'version': 'goma',
+        'package': 'fuchsia/third_party/clang/linux-amd64',
+        'version': 'Tpc85d1ZwSlZ6UKl2d96GRUBGNA5JKholOKe24sRDr0C',
       },
     ],
     'condition': 'checkout_linux and pull_linux_clang',
@@ -99,8 +99,8 @@ deps = {
   'crashpad/third_party/fuchsia/clang/mac-amd64': {
     'packages': [
       {
-        'package': 'fuchsia/clang/mac-amd64',
-        'version': 'goma',
+        'package': 'fuchsia/third_party/clang/mac-amd64',
+        'version': 'MAOjNhwTu5JU3P_0C9dITiyCTtQ1n7lRJnMfB9hhvOkC',
       },
     ],
     'condition': 'checkout_fuchsia and host_os == "mac"',
@@ -109,17 +109,22 @@ deps = {
   'crashpad/third_party/fuchsia/clang/linux-amd64': {
     'packages': [
       {
-        'package': 'fuchsia/clang/linux-amd64',
-        'version': 'goma',
+        'package': 'fuchsia/third_party/clang/linux-amd64',
+        'version': 'Tpc85d1ZwSlZ6UKl2d96GRUBGNA5JKholOKe24sRDr0C',
       },
     ],
     'condition': 'checkout_fuchsia and host_os == "linux"',
     'dep_type': 'cipd'
   },
+  'crashpad/third_party/fuchsia-gn-sdk': {
+    'url': Var('chromium_git') + '/chromium/src/third_party/fuchsia-gn-sdk.git@' +
+           '0d6902558d92fe3d49ba9a8f638ddea829be595b',
+    'condition': 'checkout_fuchsia',
+  },
   'crashpad/third_party/fuchsia/sdk/mac-amd64': {
     'packages': [
       {
-        'package': 'fuchsia/sdk/gn/mac-amd64',
+        'package': 'fuchsia/sdk/core/mac-amd64',
         'version': 'latest'
       },
     ],
@@ -129,7 +134,7 @@ deps = {
   'crashpad/third_party/fuchsia/sdk/linux-amd64': {
     'packages': [
       {
-        'package': 'fuchsia/sdk/gn/linux-amd64',
+        'package': 'fuchsia/sdk/core/linux-amd64',
         'version': 'latest'
       },
     ],
@@ -249,6 +254,15 @@ hooks = [
       'crashpad/build/install_linux_sysroot.py',
     ],
   },
+  {
+    'name': 'Generate Fuchsia Build Definitions',
+    'pattern': '.',
+    'condition': 'checkout_fuchsia',
+    'action': [
+      'python3',
+      'crashpad/build/fuchsia/gen_build_defs.py'
+    ],
+  },
   {
     'name': 'setup_gn_ios',
     'pattern': '.',
diff --git a/external_imported/sentry-native/external/crashpad/build/BUILD.gn b/external_imported/sentry-native/external/crashpad/build/BUILD.gn
index 49a2afa31..7d7e08bbd 100644
--- a/external_imported/sentry-native/external/crashpad/build/BUILD.gn
+++ b/external_imported/sentry-native/external/crashpad/build/BUILD.gn
@@ -31,9 +31,8 @@ config("crashpad_is_in_fuchsia") {
 }
 
 config("flock_always_supported_defines") {
-  defines = [
-    "CRASHPAD_FLOCK_ALWAYS_SUPPORTED=$crashpad_flock_always_supported",
-  ]
+  defines =
+      [ "CRASHPAD_FLOCK_ALWAYS_SUPPORTED=$crashpad_flock_always_supported" ]
 }
 
 group("default_exe_manifest_win") {
@@ -52,16 +51,18 @@ config("crashpad_fuzzer_flags") {
   ldflags = [ "-fsanitize=address" ]
 }
 
-if (crashpad_is_ios) {
-  group("ios_enable_arc") {
-    if (crashpad_is_in_chromium) {
-      public_configs = [ "//build/config/compiler:enable_arc" ]
-    } else if (crashpad_is_standalone) {
-      public_configs =
-          [ "//third_party/mini_chromium/mini_chromium/build/config:ios_enable_arc" ]
+if (crashpad_is_apple) {
+  group("apple_enable_arc") {
+    # If `crashpad_is_in_chromium`, then because Chromium enables ARC
+    # compilation by default, no special configuration is needed.
+
+    if (crashpad_is_standalone) {
+      public_configs = [ "//third_party/mini_chromium/mini_chromium/build/config:apple_enable_arc" ]
     }
   }
+}
 
+if (crashpad_is_ios) {
   group("ios_xctest") {
     if (crashpad_is_in_chromium) {
       public_configs = [ "//build/config/ios:xctest_config" ]
diff --git a/external_imported/sentry-native/external/crashpad/build/crashpad_buildconfig.gni b/external_imported/sentry-native/external/crashpad/build/crashpad_buildconfig.gni
index 3de3f8db4..4e9091a2c 100644
--- a/external_imported/sentry-native/external/crashpad/build/crashpad_buildconfig.gni
+++ b/external_imported/sentry-native/external/crashpad/build/crashpad_buildconfig.gni
@@ -59,6 +59,7 @@ if (crashpad_is_external || crashpad_is_in_dart) {
 if (crashpad_is_in_chromium) {
   crashpad_is_mac = is_mac
   crashpad_is_ios = is_ios
+  crashpad_is_apple = is_apple
   crashpad_is_win = is_win
   crashpad_is_linux = is_linux || is_chromeos
   crashpad_is_android = is_android
@@ -73,6 +74,7 @@ if (crashpad_is_in_chromium) {
 
   crashpad_is_mac = mini_chromium_is_mac
   crashpad_is_ios = mini_chromium_is_ios
+  crashpad_is_apple = mini_chromium_is_apple
   crashpad_is_win = mini_chromium_is_win
   crashpad_is_linux = mini_chromium_is_linux
   crashpad_is_android = mini_chromium_is_android
diff --git a/external_imported/sentry-native/external/crashpad/build/fuchsia/gen_build_defs.py b/external_imported/sentry-native/external/crashpad/build/fuchsia/gen_build_defs.py
new file mode 100755
index 000000000..22414d1c1
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/build/fuchsia/gen_build_defs.py
@@ -0,0 +1,350 @@
+#!/usr/bin/env vpython3
+# Copyright 2023 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+#
+# Generates a single BUILD.gn file with build targets generated using the
+# manifest files in the SDK.
+
+import json
+import logging
+import os
+import shutil
+import sys
+
+
+DIR_SRC_ROOT = os.path.abspath(
+    os.path.join(os.path.dirname(__file__), os.pardir, os.pardir))
+
+def GetHostOS():
+    """Get host operating system."""
+
+    host_platform = sys.platform
+    if host_platform.startswith('linux'):
+        return 'linux'
+    if host_platform.startswith('darwin'):
+        return 'mac'
+    raise Exception('Unsupported host platform: %s' % host_platform)
+
+
+# Inserted at the top of the generated BUILD.gn file.
+_GENERATED_PREAMBLE = """# DO NOT EDIT! This file was generated by
+# //build/fuchsia/gen_build_def.py.
+# Any changes made to this file will be discarded.
+
+import("//third_party/fuchsia/sdk/{host_os}-amd64/build/fidl_library.gni")
+import("//third_party/fuchsia/sdk/{host_os}-amd64/build/fuchsia_sdk_pkg.gni")
+
+""".format(host_os=GetHostOS())
+
+SDK_ROOT = os.path.join(DIR_SRC_ROOT, 'third_party', 'fuchsia', 'sdk',
+                        f'{GetHostOS()}-amd64')
+
+
+def ReformatTargetName(dep_name):
+  """"Substitutes characters in |dep_name| which are not valid in GN target
+  names (e.g. dots become hyphens)."""
+  return dep_name
+
+
+def FormatGNTarget(fields):
+  """Returns a GN target definition as a string.
+
+  |fields|: The GN fields to include in the target body.
+            'target_name' and 'type' are mandatory."""
+
+  output = '%s("%s") {\n' % (fields['type'], fields['target_name'])
+  del fields['target_name']
+  del fields['type']
+
+  # Ensure that fields with no ordering requirement are sorted.
+  for field in ['sources', 'public_deps']:
+    if field in fields:
+      fields[field].sort()
+
+  for key, val in fields.items():
+    if isinstance(val, str):
+      val_serialized = '\"%s\"' % val
+    elif isinstance(val, list):
+      # Serialize a list of strings in the prettiest possible manner.
+      if len(val) == 0:
+        val_serialized = '[]'
+      elif len(val) == 1:
+        val_serialized = '[ \"%s\" ]' % val[0]
+      else:
+        val_serialized = '[\n    ' + ',\n    '.join(['\"%s\"' % x
+                                                     for x in val]) + '\n  ]'
+    else:
+      raise Exception('Could not serialize %r' % val)
+
+    output += '  %s = %s\n' % (key, val_serialized)
+  output += '}'
+
+  return output
+
+
+def MetaRootRelativePaths(sdk_relative_paths, meta_root):
+  return [os.path.relpath(path, meta_root) for path in sdk_relative_paths]
+
+
+def ConvertCommonFields(json):
+  """Extracts fields from JSON manifest data which are used across all
+  target types. Note that FIDL packages do their own processing."""
+
+  meta_root = json['root']
+
+  converted = {'target_name': ReformatTargetName(json['name'])}
+
+  if 'deps' in json:
+    converted['public_deps'] = MetaRootRelativePaths(json['deps'],
+                                                     os.path.dirname(meta_root))
+
+  # FIDL bindings dependencies are relative to the "fidl" sub-directory.
+  if 'fidl_binding_deps' in json:
+    for entry in json['fidl_binding_deps']:
+      converted['public_deps'] += MetaRootRelativePaths([
+          'fidl/' + dep + ':' + os.path.basename(dep) + '_' +
+          entry['binding_type'] for dep in entry['deps']
+      ], meta_root)
+
+  return converted
+
+
+def ConvertFidlLibrary(json):
+  """Converts a fidl_library manifest entry to a GN target.
+
+  Arguments:
+    json: The parsed manifest JSON.
+  Returns:
+    The GN target definition, represented as a string."""
+
+  meta_root = json['root']
+
+  converted = ConvertCommonFields(json)
+  converted['type'] = 'fidl_library'
+  converted['sources'] = MetaRootRelativePaths(json['sources'], meta_root)
+  converted['library_name'] = json['name']
+
+  return converted
+
+
+def ConvertCcPrebuiltLibrary(json):
+  """Converts a cc_prebuilt_library manifest entry to a GN target.
+
+  Arguments:
+    json: The parsed manifest JSON.
+  Returns:
+    The GN target definition, represented as a string."""
+
+  meta_root = json['root']
+
+  converted = ConvertCommonFields(json)
+  converted['type'] = 'fuchsia_sdk_pkg'
+
+  converted['sources'] = MetaRootRelativePaths(json['headers'], meta_root)
+
+  converted['include_dirs'] = MetaRootRelativePaths([json['include_dir']],
+                                                    meta_root)
+
+  if json['format'] == 'shared':
+    converted['shared_libs'] = [json['name']]
+  else:
+    converted['static_libs'] = [json['name']]
+
+  return converted
+
+
+def ConvertCcSourceLibrary(json):
+  """Converts a cc_source_library manifest entry to a GN target.
+
+  Arguments:
+    json: The parsed manifest JSON.
+  Returns:
+    The GN target definition, represented as a string."""
+
+  meta_root = json['root']
+
+  converted = ConvertCommonFields(json)
+  converted['type'] = 'fuchsia_sdk_pkg'
+
+  # Headers and source file paths can be scattered across "sources", "headers",
+  # and "files". Merge them together into one source list.
+  converted['sources'] = MetaRootRelativePaths(json['sources'], meta_root)
+  if 'headers' in json:
+    converted['sources'] += MetaRootRelativePaths(json['headers'], meta_root)
+  if 'files' in json:
+    converted['sources'] += MetaRootRelativePaths(json['files'], meta_root)
+  converted['sources'] = list(set(converted['sources']))
+
+  converted['include_dirs'] = MetaRootRelativePaths([json['include_dir']],
+                                                    meta_root)
+
+  return converted
+
+
+def ConvertLoadableModule(json):
+  """Converts a loadable module manifest entry to GN targets.
+
+  Arguments:
+    json: The parsed manifest JSON.
+  Returns:
+    A list of GN target definitions."""
+
+  name = json['name']
+  if name != 'vulkan_layers':
+    raise RuntimeError('Unsupported loadable_module: %s' % name)
+
+  # Copy resources and binaries
+  resources = json['resources']
+
+  binaries = json['binaries']
+
+  def _filename_no_ext(name):
+    return os.path.splitext(os.path.basename(name))[0]
+
+  # Pair each json resource with its corresponding binary. Each such pair
+  # is a "layer". We only need to check one arch because each arch has the
+  # same list of binaries.
+  arch = next(iter(binaries))
+  binary_names = binaries[arch]
+  local_pkg = json['root']
+  vulkan_targets = []
+
+  for res in resources:
+    layer_name = _filename_no_ext(res)
+
+    # Filter binaries for a matching name.
+    filtered = [n for n in binary_names if _filename_no_ext(n) == layer_name]
+
+    if not filtered:
+      # If the binary could not be found then do not generate a
+      # target for this layer. The missing targets will cause a
+      # mismatch with the "golden" outputs.
+      continue
+
+    # Replace hardcoded arch in the found binary filename.
+    binary = filtered[0].replace('/' + arch + '/', "/${target_cpu}/")
+
+    target = {}
+    target['name'] = layer_name
+    target['config'] = os.path.relpath(res, start=local_pkg)
+    target['binary'] = os.path.relpath(binary, start=local_pkg)
+
+    vulkan_targets.append(target)
+
+  converted = []
+  all_target = {}
+  all_target['target_name'] = 'all'
+  all_target['type'] = 'group'
+  all_target['data_deps'] = []
+  for target in vulkan_targets:
+    config_target = {}
+    config_target['target_name'] = target['name'] + '_config'
+    config_target['type'] = 'copy'
+    config_target['sources'] = [target['config']]
+    config_target['outputs'] = ['${root_gen_dir}/' + target['config']]
+    converted.append(config_target)
+    lib_target = {}
+    lib_target['target_name'] = target['name'] + '_lib'
+    lib_target['type'] = 'copy'
+    lib_target['sources'] = [target['binary']]
+    lib_target['outputs'] = ['${root_out_dir}/lib/{{source_file_part}}']
+    converted.append(lib_target)
+    group_target = {}
+    group_target['target_name'] = target['name']
+    group_target['type'] = 'group'
+    group_target['data_deps'] = [
+        ':' + target['name'] + '_config', ':' + target['name'] + '_lib'
+    ]
+    converted.append(group_target)
+    all_target['data_deps'].append(':' + target['name'])
+  converted.append(all_target)
+  return converted
+
+
+def ConvertNoOp(json):
+  """Null implementation of a conversion function. No output is generated."""
+
+  return None
+
+
+"""Maps manifest types to conversion functions."""
+_CONVERSION_FUNCTION_MAP = {
+    'fidl_library': ConvertFidlLibrary,
+    'cc_source_library': ConvertCcSourceLibrary,
+    'cc_prebuilt_library': ConvertCcPrebuiltLibrary,
+    'loadable_module': ConvertLoadableModule,
+
+    # No need to build targets for these types yet.
+    'companion_host_tool': ConvertNoOp,
+    'component_manifest': ConvertNoOp,
+    'config': ConvertNoOp,
+    'dart_library': ConvertNoOp,
+    'data': ConvertNoOp,
+    'device_profile': ConvertNoOp,
+    'documentation': ConvertNoOp,
+    'ffx_tool': ConvertNoOp,
+    'host_tool': ConvertNoOp,
+    'image': ConvertNoOp,
+    'sysroot': ConvertNoOp,
+}
+
+
+def ConvertMeta(meta_path):
+  parsed = json.load(open(meta_path))
+  if 'type' not in parsed:
+    return
+
+  convert_function = _CONVERSION_FUNCTION_MAP.get(parsed['type'])
+  if convert_function is None:
+    logging.warning('Unexpected SDK artifact type %s in %s.' %
+                    (parsed['type'], meta_path))
+    return
+
+  converted = convert_function(parsed)
+  if not converted:
+    return
+  output_path = os.path.join(os.path.dirname(meta_path), 'BUILD.gn')
+  if os.path.exists(output_path):
+    os.unlink(output_path)
+  with open(output_path, 'w') as buildfile:
+    buildfile.write(_GENERATED_PREAMBLE)
+
+    # Loadable modules have multiple targets
+    if convert_function != ConvertLoadableModule:
+      buildfile.write(FormatGNTarget(converted) + '\n\n')
+    else:
+      for target in converted:
+        buildfile.write(FormatGNTarget(target) + '\n\n')
+
+
+def ProcessSdkManifest():
+  toplevel_meta = json.load(
+      open(os.path.join(SDK_ROOT, 'meta', 'manifest.json')))
+
+  for part in toplevel_meta['parts']:
+    meta_path = os.path.join(SDK_ROOT, part['meta'])
+    ConvertMeta(meta_path)
+
+
+def main():
+
+  # Exit if there's no Fuchsia support for this platform.
+  try:
+    GetHostOS()
+  except:
+    logging.warning('Fuchsia SDK is not supported on this platform.')
+    return 0
+
+  # TODO(crbug/1432399): Remove this when links to these files inside the sdk
+  # directory have been redirected.
+  shutil.copytree(os.path.join(DIR_SRC_ROOT, 'third_party', 'fuchsia-gn-sdk',
+                               'src'),
+                  os.path.join(SDK_ROOT, 'build'),
+                  dirs_exist_ok=True)
+
+  ProcessSdkManifest()
+
+
+if __name__ == '__main__':
+  sys.exit(main())
diff --git a/external_imported/sentry-native/external/crashpad/build/ios/Unittest-Info.plist b/external_imported/sentry-native/external/crashpad/build/ios/Unittest-Info.plist
index fdca91fb1..0af7bbc41 100644
--- a/external_imported/sentry-native/external/crashpad/build/ios/Unittest-Info.plist
+++ b/external_imported/sentry-native/external/crashpad/build/ios/Unittest-Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleIdentifier</key>
-	<string>${IOS_BUNDLE_ID_PREFIX}.googletest.${GTEST_BUNDLE_ID_SUFFIX:rfc1034identifier}</string>
+	<string>${IOS_BUNDLE_ID_PREFIX}.${GTEST_BUNDLE_ID_SUFFIX:rfc1034identifier}</string>
 	<key>UIApplicationDelegate</key>
 	<string>CrashpadUnitTestDelegate</string>
 </dict>
diff --git a/external_imported/sentry-native/external/crashpad/client/BUILD.gn b/external_imported/sentry-native/external/crashpad/client/BUILD.gn
index 5c71dcc91..bc67b32f1 100644
--- a/external_imported/sentry-native/external/crashpad/client/BUILD.gn
+++ b/external_imported/sentry-native/external/crashpad/client/BUILD.gn
@@ -89,6 +89,10 @@ crashpad_static_library("client") {
     cflags = [ "/wd4201" ]  # nonstandard extension used : nameless struct/union
   }
 
+  if (crashpad_is_apple) {
+    deps += [ "../build:apple_enable_arc" ]
+  }
+
   if (crashpad_is_ios) {
     deps += [
       "../handler:common",
@@ -127,7 +131,7 @@ static_library("common") {
     "simple_string_dictionary.h",
   ]
 
-  if (crashpad_is_mac || crashpad_is_ios) {
+  if (crashpad_is_apple) {
     sources += [ "crash_report_database_mac.mm" ]
   }
   if (crashpad_is_win) {
@@ -147,17 +151,19 @@ static_library("common") {
   ]
   deps = [ "../util" ]
   configs += [ "../build:flock_always_supported_defines" ]
+
+  if (crashpad_is_apple) {
+    deps += [ "../build:apple_enable_arc" ]
+  }
 }
 
 crashpad_executable("ring_buffer_annotation_load_test") {
   testonly = true
-  sources = [
-    "ring_buffer_annotation_load_test_main.cc",
-  ]
+  sources = [ "ring_buffer_annotation_load_test_main.cc" ]
   deps = [
     ":client",
-    "../tools:tool_support",
     "$mini_chromium_source_parent:base",
+    "../tools:tool_support",
   ]
 }
 
@@ -212,6 +218,10 @@ source_set("client_test") {
     data_deps = [ "../handler:crashpad_handler" ]
   }
 
+  if (crashpad_is_apple) {
+    deps += [ "../build:apple_enable_arc" ]
+  }
+
   if (crashpad_is_win) {
     data_deps += [
       "../handler:crashpad_handler_console",
diff --git a/external_imported/sentry-native/external/crashpad/client/annotation.h b/external_imported/sentry-native/external/crashpad/client/annotation.h
index e80e76647..a5d14f0d9 100644
--- a/external_imported/sentry-native/external/crashpad/client/annotation.h
+++ b/external_imported/sentry-native/external/crashpad/client/annotation.h
@@ -246,6 +246,14 @@ class Annotation {
 
   std::atomic<Annotation*>& link_node() { return link_node_; }
 
+  Annotation* GetLinkNode(std::memory_order order = std::memory_order_seq_cst) {
+    return link_node_.load(order);
+  }
+  const Annotation* GetLinkNode(
+      std::memory_order order = std::memory_order_seq_cst) const {
+    return link_node_.load(order);
+  }
+
  private:
   //! \brief Linked list next-node pointer. Accessed only by \sa AnnotationList.
   //!
@@ -323,9 +331,11 @@ class StringAnnotation : public Annotation {
   void Set(base::StringPiece string) {
     Annotation::ValueSizeType size =
         std::min(MaxSize, base::saturated_cast<ValueSizeType>(string.size()));
-    memcpy(value_, string.data(), size);
+    string = string.substr(0, size);
+    std::copy(string.begin(), string.end(), value_);
     // Check for no embedded `NUL` characters.
-    DCHECK(!memchr(value_, '\0', size)) << "embedded NUL";
+    DCHECK(string.find('\0', /*pos=*/0) == base::StringPiece::npos)
+        << "embedded NUL";
     SetSize(size);
   }
 
diff --git a/external_imported/sentry-native/external/crashpad/client/annotation_list.cc b/external_imported/sentry-native/external/crashpad/client/annotation_list.cc
index 188cadbd7..bcf7ca76a 100644
--- a/external_imported/sentry-native/external/crashpad/client/annotation_list.cc
+++ b/external_imported/sentry-native/external/crashpad/client/annotation_list.cc
@@ -77,7 +77,7 @@ Annotation* AnnotationList::Iterator::operator*() const {
 
 AnnotationList::Iterator& AnnotationList::Iterator::operator++() {
   CHECK_NE(curr_, tail_);
-  curr_ = curr_->link_node();
+  curr_ = curr_->GetLinkNode();
   return *this;
 }
 
@@ -86,12 +86,42 @@ bool AnnotationList::Iterator::operator==(
   return curr_ == other.curr_;
 }
 
+AnnotationList::ConstIterator::ConstIterator(const Annotation* head,
+                                             const Annotation* tail)
+    : curr_(head), tail_(tail) {}
+
+AnnotationList::ConstIterator::~ConstIterator() = default;
+
+const Annotation* AnnotationList::ConstIterator::operator*() const {
+  CHECK_NE(curr_, tail_);
+  return curr_;
+}
+
+AnnotationList::ConstIterator& AnnotationList::ConstIterator::operator++() {
+  CHECK_NE(curr_, tail_);
+  curr_ = curr_->GetLinkNode();
+  return *this;
+}
+
+bool AnnotationList::ConstIterator::operator==(
+    const AnnotationList::ConstIterator& other) const {
+  return curr_ == other.curr_;
+}
+
 AnnotationList::Iterator AnnotationList::begin() {
-  return Iterator(head_.link_node(), tail_pointer_);
+  return Iterator(head_.GetLinkNode(), tail_pointer_);
+}
+
+AnnotationList::ConstIterator AnnotationList::cbegin() const {
+  return ConstIterator(head_.GetLinkNode(), tail_pointer_);
 }
 
 AnnotationList::Iterator AnnotationList::end() {
   return Iterator(&tail_, tail_pointer_);
 }
 
+AnnotationList::ConstIterator AnnotationList::cend() const {
+  return ConstIterator(&tail_, tail_pointer_);
+}
+
 }  // namespace crashpad
diff --git a/external_imported/sentry-native/external/crashpad/client/annotation_list.h b/external_imported/sentry-native/external/crashpad/client/annotation_list.h
index 10e6e37aa..eec7fb4c1 100644
--- a/external_imported/sentry-native/external/crashpad/client/annotation_list.h
+++ b/external_imported/sentry-native/external/crashpad/client/annotation_list.h
@@ -80,11 +80,37 @@ class AnnotationList {
     // Copy and assign are required.
   };
 
+  //! \brief An InputIterator for iterating a const AnnotationList.
+  class ConstIterator {
+   public:
+    ~ConstIterator();
+
+    const Annotation* operator*() const;
+    ConstIterator& operator++();
+    bool operator==(const ConstIterator& other) const;
+    bool operator!=(const ConstIterator& other) const {
+      return !(*this == other);
+    }
+
+   private:
+    friend class AnnotationList;
+    ConstIterator(const Annotation* head, const Annotation* tail);
+
+    const Annotation* curr_;
+    const Annotation* const tail_;
+
+    // Copy and assign are required.
+  };
+
   //! \brief Returns an iterator to the first element of the annotation list.
   Iterator begin();
+  ConstIterator begin() const { return cbegin(); }
+  ConstIterator cbegin() const;
 
   //! \brief Returns an iterator past the last element of the annotation list.
   Iterator end();
+  ConstIterator end() const { return cend(); }
+  ConstIterator cend() const;
 
  protected:
 #if BUILDFLAG(IS_IOS)
diff --git a/external_imported/sentry-native/external/crashpad/client/annotation_list_test.cc b/external_imported/sentry-native/external/crashpad/client/annotation_list_test.cc
index d9473c544..0ac87ffae 100644
--- a/external_imported/sentry-native/external/crashpad/client/annotation_list_test.cc
+++ b/external_imported/sentry-native/external/crashpad/client/annotation_list_test.cc
@@ -128,6 +128,100 @@ TEST_F(AnnotationList, DuplicateKeys) {
   EXPECT_EQ(1u, annotations.size());
 }
 
+TEST_F(AnnotationList, IteratorSingleAnnotation) {
+  ASSERT_EQ(annotations_.begin(), annotations_.end());
+  ASSERT_EQ(annotations_.cbegin(), annotations_.cend());
+
+  one_.Set("1");
+
+  auto iterator = annotations_.begin();
+  auto const_iterator = annotations_.cbegin();
+
+  ASSERT_NE(iterator, annotations_.end());
+  ASSERT_NE(const_iterator, annotations_.cend());
+
+  EXPECT_EQ(*iterator, &one_);
+  EXPECT_EQ(*const_iterator, &one_);
+
+  ++iterator;
+  ++const_iterator;
+
+  EXPECT_EQ(iterator, annotations_.end());
+  EXPECT_EQ(const_iterator, annotations_.cend());
+}
+
+TEST_F(AnnotationList, IteratorMultipleAnnotationsInserted) {
+  ASSERT_EQ(annotations_.begin(), annotations_.end());
+  ASSERT_EQ(annotations_.cbegin(), annotations_.cend());
+
+  one_.Set("1");
+  two_.Set("2");
+
+  // New annotations are inserted to the beginning of the list. Hence, |two_|
+  // must be the first annotation, followed by |one_|.
+  {
+    auto iterator = annotations_.begin();
+    auto const_iterator = annotations_.cbegin();
+
+    ASSERT_NE(iterator, annotations_.end());
+    ASSERT_NE(const_iterator, annotations_.cend());
+
+    EXPECT_EQ(*iterator, &two_);
+    EXPECT_EQ(*const_iterator, &two_);
+
+    ++iterator;
+    ++const_iterator;
+
+    ASSERT_NE(iterator, annotations_.end());
+    ASSERT_NE(const_iterator, annotations_.cend());
+
+    EXPECT_EQ(*iterator, &one_);
+    EXPECT_EQ(*const_iterator, &one_);
+
+    ++iterator;
+    ++const_iterator;
+
+    EXPECT_EQ(iterator, annotations_.end());
+    EXPECT_EQ(const_iterator, annotations_.cend());
+  }
+}
+
+TEST_F(AnnotationList, IteratorMultipleAnnotationsInsertedAndRemoved) {
+  ASSERT_EQ(annotations_.begin(), annotations_.end());
+  ASSERT_EQ(annotations_.cbegin(), annotations_.cend());
+
+  one_.Set("1");
+  two_.Set("2");
+  one_.Clear();
+  two_.Clear();
+
+  // Even after clearing, Annotations are still inserted in the list and
+  // reachable via the iterators.
+  auto iterator = annotations_.begin();
+  auto const_iterator = annotations_.cbegin();
+
+  ASSERT_NE(iterator, annotations_.end());
+  ASSERT_NE(const_iterator, annotations_.cend());
+
+  EXPECT_EQ(*iterator, &two_);
+  EXPECT_EQ(*const_iterator, &two_);
+
+  ++iterator;
+  ++const_iterator;
+
+  ASSERT_NE(iterator, annotations_.end());
+  ASSERT_NE(const_iterator, annotations_.cend());
+
+  EXPECT_EQ(*iterator, &one_);
+  EXPECT_EQ(*const_iterator, &one_);
+
+  ++iterator;
+  ++const_iterator;
+
+  EXPECT_EQ(iterator, annotations_.end());
+  EXPECT_EQ(const_iterator, annotations_.cend());
+}
+
 class RaceThread : public Thread {
  public:
   explicit RaceThread(test::AnnotationList* test) : Thread(), test_(test) {}
diff --git a/external_imported/sentry-native/external/crashpad/client/annotation_test.cc b/external_imported/sentry-native/external/crashpad/client/annotation_test.cc
index f1a4aa7d1..fd22c2a0b 100644
--- a/external_imported/sentry-native/external/crashpad/client/annotation_test.cc
+++ b/external_imported/sentry-native/external/crashpad/client/annotation_test.cc
@@ -161,8 +161,9 @@ TEST_F(Annotation, BaseAnnotationShouldNotSupportSpinGuard) {
       crashpad::Annotation::Type::kString, "no-spin-guard", buffer);
   EXPECT_EQ(annotation.concurrent_access_guard_mode(),
             crashpad::Annotation::ConcurrentAccessGuardMode::kUnguarded);
-#ifdef NDEBUG
-  // This fails a DCHECK() in debug builds, so only test it for NDEBUG builds.
+#if !DCHECK_IS_ON()
+  // This fails a DCHECK() in debug builds, so only test it when DCHECK()
+  // is not on.
   EXPECT_EQ(std::nullopt, annotation.TryCreateScopedSpinGuard(0));
 #endif
 }
diff --git a/external_imported/sentry-native/external/crashpad/client/client_argv_handling.cc b/external_imported/sentry-native/external/crashpad/client/client_argv_handling.cc
index 766812cdf..af7270b38 100644
--- a/external_imported/sentry-native/external/crashpad/client/client_argv_handling.cc
+++ b/external_imported/sentry-native/external/crashpad/client/client_argv_handling.cc
@@ -32,6 +32,7 @@ std::vector<std::string> BuildHandlerArgvStrings(
     const base::FilePath& database,
     const base::FilePath& metrics_dir,
     const std::string& url,
+    const std::string& http_proxy,
     const std::map<std::string, std::string>& annotations,
     const std::vector<std::string>& arguments,
     const std::vector<base::FilePath>& attachments) {
@@ -54,6 +55,10 @@ std::vector<std::string> BuildHandlerArgvStrings(
     argv_strings.push_back(FormatArgumentString("url", url));
   }
 
+  if (!http_proxy.empty()) {
+    argv_strings.push_back(FormatArgumentString("http-proxy", http_proxy));
+  }
+
   for (const auto& kv : annotations) {
     argv_strings.push_back(
         FormatArgumentString("annotation", kv.first + '=' + kv.second));
diff --git a/external_imported/sentry-native/external/crashpad/client/client_argv_handling.h b/external_imported/sentry-native/external/crashpad/client/client_argv_handling.h
index ba05bd352..d3c083f7a 100644
--- a/external_imported/sentry-native/external/crashpad/client/client_argv_handling.h
+++ b/external_imported/sentry-native/external/crashpad/client/client_argv_handling.h
@@ -34,6 +34,7 @@ std::vector<std::string> BuildHandlerArgvStrings(
     const base::FilePath& database,
     const base::FilePath& metrics_dir,
     const std::string& url,
+    const std::string& http_proxy,
     const std::map<std::string, std::string>& annotations,
     const std::vector<std::string>& arguments,
     const std::vector<base::FilePath>& attachments = {});
diff --git a/external_imported/sentry-native/external/crashpad/client/crash_report_database_generic.cc b/external_imported/sentry-native/external/crashpad/client/crash_report_database_generic.cc
index 28a393d03..617a07451 100644
--- a/external_imported/sentry-native/external/crashpad/client/crash_report_database_generic.cc
+++ b/external_imported/sentry-native/external/crashpad/client/crash_report_database_generic.cc
@@ -22,6 +22,7 @@
 #include <tuple>
 #include <utility>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "client/settings.h"
diff --git a/external_imported/sentry-native/external/crashpad/client/crash_report_database_mac.mm b/external_imported/sentry-native/external/crashpad/client/crash_report_database_mac.mm
index 7221b5955..5d72b17e5 100644
--- a/external_imported/sentry-native/external/crashpad/client/crash_report_database_mac.mm
+++ b/external_imported/sentry-native/external/crashpad/client/crash_report_database_mac.mm
@@ -30,12 +30,12 @@
 #include <mutex>
 #include <tuple>
 
+#include "base/apple/scoped_nsautorelease_pool.h"
 #include "base/logging.h"
-#include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/scoped_generic.h"
+#include "base/strings/strcat.h"
 #include "base/strings/string_piece.h"
-#include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
 #include "client/settings.h"
 #include "util/file/directory_reader.h"
@@ -116,9 +116,9 @@ bool CreateOrEnsureDirectoryExists(const base::FilePath& path) {
 // have changed, and new_name determines whether the returned xattr name will be
 // the old name or its new equivalent.
 std::string XattrNameInternal(const base::StringPiece& name, bool new_name) {
-  return base::StringPrintf(new_name ? "org.chromium.crashpad.database.%s"
-                                     : "com.googlecode.crashpad.%s",
-                            name.data());
+  return base::StrCat({new_name ? "org.chromium.crashpad.database."
+                                : "com.googlecode.crashpad.",
+                       name});
 }
 
 }  // namespace
@@ -813,7 +813,7 @@ OperationStatus ReportsInDirectory(const base::FilePath& path,
 CrashReportDatabase::OperationStatus CrashReportDatabaseMac::ReportsInDirectory(
     const base::FilePath& path,
     std::vector<CrashReportDatabase::Report>* reports) {
-  base::mac::ScopedNSAutoreleasePool pool;
+  base::apple::ScopedNSAutoreleasePool pool;
 
   DCHECK(reports->empty());
 
diff --git a/external_imported/sentry-native/external/crashpad/client/crash_report_database_win.cc b/external_imported/sentry-native/external/crashpad/client/crash_report_database_win.cc
index b0c5229ec..d0a630458 100644
--- a/external_imported/sentry-native/external/crashpad/client/crash_report_database_win.cc
+++ b/external_imported/sentry-native/external/crashpad/client/crash_report_database_win.cc
@@ -25,6 +25,7 @@
 #include <tuple>
 #include <utility>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "base/numerics/safe_math.h"
 #include "base/strings/utf_string_conversions.h"
@@ -545,8 +546,7 @@ void Metadata::Write() {
   for (const auto& report : reports_) {
     const base::FilePath& path = report.file_path;
     if (path.DirName() != report_dir_) {
-      LOG(ERROR) << path.value().c_str() << " expected to start with "
-                 << base::WideToUTF8(report_dir_.value());
+      LOG(ERROR) << path << " expected to start with " << report_dir_;
       return;
     }
     records.push_back(MetadataFileReportRecord(report, &string_table));
@@ -590,12 +590,11 @@ OperationStatus Metadata::VerifyReport(const ReportDisk& report_disk,
 bool EnsureDirectory(const base::FilePath& path) {
   DWORD fileattr = GetFileAttributes(path.value().c_str());
   if (fileattr == INVALID_FILE_ATTRIBUTES) {
-    PLOG(ERROR) << "GetFileAttributes " << base::WideToUTF8(path.value());
+    PLOG(ERROR) << "GetFileAttributes " << path;
     return false;
   }
   if ((fileattr & FILE_ATTRIBUTE_DIRECTORY) == 0) {
-    LOG(ERROR) << "GetFileAttributes " << base::WideToUTF8(path.value())
-               << ": not a directory";
+    LOG(ERROR) << "GetFileAttributes " << path << ": not a directory";
     return false;
   }
   return true;
@@ -877,7 +876,7 @@ OperationStatus CrashReportDatabaseWin::DeleteReport(const UUID& uuid) {
     return os;
 
   if (!DeleteFile(report_path.value().c_str())) {
-    PLOG(ERROR) << "DeleteFile " << base::WideToUTF8(report_path.value());
+    PLOG(ERROR) << "DeleteFile " << report_path;
     return kFileSystemError;
   }
 
@@ -1021,8 +1020,7 @@ void CrashReportDatabaseWin::CleanOrphanedAttachments() {
     if (IsDirectory(path, false)) {
       UUID uuid;
       if (!uuid.InitializeFromString(filename.value())) {
-        LOG(ERROR) << "unexpected attachment dir name "
-                   << filename.value().c_str();
+        LOG(ERROR) << "unexpected attachment dir name " << filename;
         continue;
       }
 
diff --git a/external_imported/sentry-native/external/crashpad/client/crashpad_client.h b/external_imported/sentry-native/external/crashpad/client/crashpad_client.h
index 2cb8eb99c..06528e309 100644
--- a/external_imported/sentry-native/external/crashpad/client/crashpad_client.h
+++ b/external_imported/sentry-native/external/crashpad/client/crashpad_client.h
@@ -27,10 +27,13 @@
 #include "build/build_config.h"
 #include "build/chromeos_buildflags.h"
 #include "util/file/file_io.h"
+
+#if !BUILDFLAG(IS_FUCHSIA)
 #include "util/misc/capture_context.h"
+#endif  // !BUILDFLAG(IS_FUCHSIA)
 
 #if BUILDFLAG(IS_APPLE)
-#include "base/mac/scoped_mach_port.h"
+#include "base/apple/scoped_mach_port.h"
 #elif BUILDFLAG(IS_WIN)
 #include <windows.h>
 #include "util/win/scoped_handle.h"
@@ -124,6 +127,7 @@ class CrashpadClient {
                     const base::FilePath& database,
                     const base::FilePath& metrics_dir,
                     const std::string& url,
+                    const std::string& http_proxy,
                     const std::map<std::string, std::string>& annotations,
                     const std::vector<std::string>& arguments,
                     bool restartable,
@@ -363,6 +367,8 @@ class CrashpadClient {
   //!     path as its `--metrics-dir` argument.
   //! \param[in] url The URL of an upload server. The handler will be started
   //!     with this URL as its `--url` argument.
+  //! \param[in] http_proxy The URL of an HTTP proxy. The handler will be started
+  //!     with this URL as its `--http-proxy` argument.
   //! \param[in] annotations Process annotations to set in each crash report.
   //!     The handler will be started with an `--annotation` argument for each
   //!     element in this map.
@@ -377,6 +383,7 @@ class CrashpadClient {
       const base::FilePath& database,
       const base::FilePath& metrics_dir,
       const std::string& url,
+      const std::string& http_proxy,
       const std::map<std::string, std::string>& annotations,
       const std::vector<std::string>& arguments,
       const std::vector<base::FilePath>& attachments = {});
@@ -394,6 +401,8 @@ class CrashpadClient {
   //!     path as its `--metrics-dir` argument.
   //! \param[in] url The URL of an upload server. The handler will be started
   //!     with this URL as its `--url` argument.
+  //! \param[in] http_proxy The URL of an HTTP proxy. The handler will be started
+  //!     with this URL as its `--http-proxy` argument.
   //! \param[in] annotations Process annotations to set in each crash report.
   //!     The handler will be started with an `--annotation` argument for each
   //!     element in this map.
@@ -410,6 +419,7 @@ class CrashpadClient {
       const base::FilePath& database,
       const base::FilePath& metrics_dir,
       const std::string& url,
+      const std::string& http_proxy,
       const std::map<std::string, std::string>& annotations,
       const std::vector<std::string>& arguments,
       int socket);
@@ -433,7 +443,7 @@ class CrashpadClient {
   static void CrashWithoutDump(const std::string& message);
 
   //! \brief The type for custom handlers installed by clients.
-  using FirstChanceHandlerLinux = bool (*)(int, siginfo_t*, ucontext_t*);
+  using FirstChanceHandler = bool (*)(int, siginfo_t*, ucontext_t*);
 
   //! \brief Installs a custom crash signal handler which runs before the
   //!     currently installed Crashpad handler.
@@ -451,7 +461,25 @@ class CrashpadClient {
   //! signal handler is run.
   //!
   //! \param[in] handler The custom crash signal handler to install.
-  static void SetFirstChanceExceptionHandler(FirstChanceHandlerLinux handler);
+  static void SetFirstChanceExceptionHandler(FirstChanceHandler handler);
+
+  //! \brief Installs a custom crash signal handler which runs after the
+  //!     currently installed Crashpad handler.
+  //!
+  //! Handling signals appropriately can be tricky and use of this method
+  //! should be avoided, if possible.
+  //!
+  //! A handler must have already been installed before calling this method.
+  //!
+  //! The custom handler runs in a signal handler context and must be safe for
+  //! that purpose.
+  //!
+  //! If the custom handler returns `true`, the signal is not reraised.
+  //!
+  //! \param[in] handler The custom crash signal handler to install.
+  static void SetLastChanceExceptionHandler(bool (*handler)(int,
+                                                            siginfo_t*,
+                                                            ucontext_t*));
 
   //! \brief Configures a set of signals that shouldn't have Crashpad signal
   //!     handlers installed.
@@ -624,7 +652,7 @@ class CrashpadClient {
   //!     Crashpad exception handler service.
   //!
   //! \return `true` on success, `false` on failure with a message logged.
-  bool SetHandlerMachPort(base::mac::ScopedMachSendRight exception_port);
+  bool SetHandlerMachPort(base::apple::ScopedMachSendRight exception_port);
 
   //! \brief Retrieves a send right to the process’ crash handler Mach port.
   //!
@@ -645,12 +673,12 @@ class CrashpadClient {
   //!     SetHandlerMachService(). This method must only be called after a
   //!     successful call to one of those methods. `MACH_PORT_NULL` on failure
   //!     with a message logged.
-  base::mac::ScopedMachSendRight GetHandlerMachPort() const;
+  base::apple::ScopedMachSendRight GetHandlerMachPort() const;
 #endif
 
 #if BUILDFLAG(IS_WIN) || DOXYGEN
   //! \brief The type for custom handlers installed by clients.
-  using FirstChanceHandlerWin = bool (*)(EXCEPTION_POINTERS*);
+  using FirstChanceHandler = bool (*)(EXCEPTION_POINTERS*);
 
   //! \brief Installs a custom unhandled exception filter which runs before the
   //!     currently installed Crashpad handler.
@@ -668,7 +696,7 @@ class CrashpadClient {
   //! unhandled exception handler is run.
   //!
   //! \param[in] handler The custom unhandled exception handler to install.
-  static void SetFirstChanceExceptionHandler(FirstChanceHandlerWin handler);
+  static void SetFirstChanceExceptionHandler(FirstChanceHandler handler);
 
   //! \brief Sets the IPC pipe of a presumably-running Crashpad handler process
   //!     which was started with StartHandler() or by other compatible means
@@ -807,11 +835,17 @@ class CrashpadClient {
 #endif
 
  private:
+#if BUILDFLAG(IS_WIN)
+  //!  \brief Registers process handlers for the client.
+  void RegisterHandlers();
+#endif
+
 #if BUILDFLAG(IS_APPLE)
-  base::mac::ScopedMachSendRight exception_port_;
+  base::apple::ScopedMachSendRight exception_port_;
 #elif BUILDFLAG(IS_WIN)
   std::wstring ipc_pipe_;
   ScopedKernelHANDLE handler_start_thread_;
+  ScopedVectoredExceptionRegistration vectored_handler_;
 #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
   std::set<int> unhandled_signals_;
 #endif  // BUILDFLAG(IS_APPLE)
diff --git a/external_imported/sentry-native/external/crashpad/client/crashpad_client_fuchsia.cc b/external_imported/sentry-native/external/crashpad/client/crashpad_client_fuchsia.cc
index e6addb1ce..9b09ad1bb 100644
--- a/external_imported/sentry-native/external/crashpad/client/crashpad_client_fuchsia.cc
+++ b/external_imported/sentry-native/external/crashpad/client/crashpad_client_fuchsia.cc
@@ -20,6 +20,7 @@
 #include <lib/zx/process.h>
 #include <zircon/processargs.h>
 
+#include "base/check_op.h"
 #include "base/fuchsia/fuchsia_logging.h"
 #include "base/logging.h"
 #include "client/client_argv_handling.h"
diff --git a/external_imported/sentry-native/external/crashpad/client/crashpad_client_ios.cc b/external_imported/sentry-native/external/crashpad/client/crashpad_client_ios.cc
index 53adf8d4a..a34cc15e3 100644
--- a/external_imported/sentry-native/external/crashpad/client/crashpad_client_ios.cc
+++ b/external_imported/sentry-native/external/crashpad/client/crashpad_client_ios.cc
@@ -21,9 +21,9 @@
 #include <ios>
 #include <iterator>
 
+#include "base/apple/mach_logging.h"
+#include "base/apple/scoped_mach_port.h"
 #include "base/logging.h"
-#include "base/mac/mach_logging.h"
-#include "base/mac/scoped_mach_port.h"
 #include "client/ios_handler/exception_processor.h"
 #include "client/ios_handler/in_process_handler.h"
 #include "util/ios/raw_logging.h"
@@ -393,7 +393,7 @@ class CrashHandler : public Thread,
     Signals::RestoreHandlerAndReraiseSignalOnReturn(siginfo, old_action);
   }
 
-  base::mac::ScopedMachReceiveRight exception_port_;
+  base::apple::ScopedMachReceiveRight exception_port_;
   ExceptionPorts::ExceptionHandlerVector original_handlers_;
   struct sigaction old_action_ = {};
   internal::InProcessHandler in_process_handler_;
diff --git a/external_imported/sentry-native/external/crashpad/client/crashpad_client_linux.cc b/external_imported/sentry-native/external/crashpad/client/crashpad_client_linux.cc
index 01a10008e..238413709 100644
--- a/external_imported/sentry-native/external/crashpad/client/crashpad_client_linux.cc
+++ b/external_imported/sentry-native/external/crashpad/client/crashpad_client_linux.cc
@@ -30,6 +30,7 @@
 
 #include <atomic>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
@@ -131,6 +132,8 @@ std::vector<std::string> BuildArgsToLaunchWithLinker(
 
 #endif  // BUILDFLAG(IS_ANDROID)
 
+using LastChanceHandler = bool (*)(int, siginfo_t*, ucontext_t*);
+
 // A base class for Crashpad signal handler implementations.
 class SignalHandler {
  public:
@@ -150,10 +153,14 @@ class SignalHandler {
     }
   }
 
-  void SetFirstChanceHandler(CrashpadClient::FirstChanceHandlerLinux handler) {
+  void SetFirstChanceHandler(CrashpadClient::FirstChanceHandler handler) {
     first_chance_handler_ = handler;
   }
 
+  void SetLastChanceExceptionHandler(LastChanceHandler handler) {
+    last_chance_handler_ = handler;
+  }
+
   // The base implementation for all signal handlers, suitable for calling
   // directly to simulate signal delivery.
   void HandleCrash(int signo, siginfo_t* siginfo, void* context) {
@@ -212,6 +219,11 @@ class SignalHandler {
     if (!handler_->disabled_.test_and_set()) {
       handler_->HandleCrash(signo, siginfo, context);
       handler_->WakeThreads();
+      if (handler_->last_chance_handler_ &&
+          handler_->last_chance_handler_(
+              signo, siginfo, static_cast<ucontext_t*>(context))) {
+        return;
+      }
     } else {
       // Processes on Android normally have several chained signal handlers that
       // co-operate to report crashes. e.g. WebView will have this signal
@@ -253,7 +265,8 @@ class SignalHandler {
 
   Signals::OldActions old_actions_ = {};
   ExceptionInformation exception_information_ = {};
-  CrashpadClient::FirstChanceHandlerLinux first_chance_handler_ = nullptr;
+  CrashpadClient::FirstChanceHandler first_chance_handler_ = nullptr;
+  LastChanceHandler last_chance_handler_ = nullptr;
   int32_t dump_done_futex_ = kDumpNotDone;
 #if !defined(__cpp_lib_atomic_value_initialization) || \
     __cpp_lib_atomic_value_initialization < 201911L
@@ -443,6 +456,7 @@ bool CrashpadClient::StartHandler(
     const base::FilePath& database,
     const base::FilePath& metrics_dir,
     const std::string& url,
+    const std::string& http_proxy,
     const std::map<std::string, std::string>& annotations,
     const std::vector<std::string>& arguments,
     bool restartable,
@@ -457,7 +471,7 @@ bool CrashpadClient::StartHandler(
   }
 
   std::vector<std::string> argv = BuildHandlerArgvStrings(
-      handler, database, metrics_dir, url, annotations, arguments, attachments);
+      handler, database, metrics_dir, url, http_proxy, annotations, arguments, attachments);
 
   argv.push_back(FormatArgumentInt("initial-client-fd", handler_sock.get()));
   argv.push_back("--shared-client-connection");
@@ -676,11 +690,12 @@ bool CrashpadClient::StartHandlerAtCrash(
     const base::FilePath& database,
     const base::FilePath& metrics_dir,
     const std::string& url,
+    const std::string& http_proxy,
     const std::map<std::string, std::string>& annotations,
     const std::vector<std::string>& arguments,
     const std::vector<base::FilePath>& attachments) {
   std::vector<std::string> argv = BuildHandlerArgvStrings(
-      handler, database, metrics_dir, url, annotations, arguments, attachments);
+      handler, database, metrics_dir, url, http_proxy, annotations, arguments, attachments);
 
   auto signal_handler = LaunchAtCrashHandler::Get();
   return signal_handler->Initialize(&argv, nullptr, &unhandled_signals_);
@@ -692,11 +707,12 @@ bool CrashpadClient::StartHandlerForClient(
     const base::FilePath& database,
     const base::FilePath& metrics_dir,
     const std::string& url,
+    const std::string& http_proxy,
     const std::map<std::string, std::string>& annotations,
     const std::vector<std::string>& arguments,
     int socket) {
   std::vector<std::string> argv = BuildHandlerArgvStrings(
-      handler, database, metrics_dir, url, annotations, arguments);
+      handler, database, metrics_dir, url, http_proxy, annotations, arguments);
 
   argv.push_back(FormatArgumentInt("initial-client-fd", socket));
 
@@ -734,11 +750,17 @@ void CrashpadClient::CrashWithoutDump(const std::string& message) {
 
 // static
 void CrashpadClient::SetFirstChanceExceptionHandler(
-    FirstChanceHandlerLinux handler) {
+    FirstChanceHandler handler) {
   DCHECK(SignalHandler::Get());
   SignalHandler::Get()->SetFirstChanceHandler(handler);
 }
 
+// static
+void CrashpadClient::SetLastChanceExceptionHandler(LastChanceHandler handler) {
+  DCHECK(SignalHandler::Get());
+  SignalHandler::Get()->SetLastChanceExceptionHandler(handler);
+}
+
 void CrashpadClient::SetUnhandledSignals(const std::set<int>& signals) {
   DCHECK(!SignalHandler::Get());
   unhandled_signals_ = signals;
diff --git a/external_imported/sentry-native/external/crashpad/client/crashpad_client_linux_test.cc b/external_imported/sentry-native/external/crashpad/client/crashpad_client_linux_test.cc
index 08418487e..5d492009c 100644
--- a/external_imported/sentry-native/external/crashpad/client/crashpad_client_linux_test.cc
+++ b/external_imported/sentry-native/external/crashpad/client/crashpad_client_linux_test.cc
@@ -71,11 +71,14 @@ enum class CrashType : uint32_t {
   kBuiltinTrap,
   kInfiniteRecursion,
   kSegvWithTagBits,
+  // kFakeSegv is meant to simulate a MTE segv error.
+  kFakeSegv,
 };
 
 struct StartHandlerForSelfTestOptions {
   bool start_handler_at_crash;
   bool set_first_chance_handler;
+  bool set_last_chance_handler;
   bool crash_non_main_thread;
   bool client_uses_signals;
   bool gather_indirectly_referenced_memory;
@@ -84,7 +87,7 @@ struct StartHandlerForSelfTestOptions {
 
 class StartHandlerForSelfTest
     : public testing::TestWithParam<
-          std::tuple<bool, bool, bool, bool, bool, CrashType>> {
+          std::tuple<bool, bool, bool, bool, bool, bool, CrashType>> {
  public:
   StartHandlerForSelfTest() = default;
 
@@ -99,6 +102,7 @@ class StartHandlerForSelfTest
     memset(&options_, 0, sizeof(options_));
     std::tie(options_.start_handler_at_crash,
              options_.set_first_chance_handler,
+             options_.set_last_chance_handler,
              options_.crash_non_main_thread,
              options_.client_uses_signals,
              options_.gather_indirectly_referenced_memory,
@@ -225,6 +229,9 @@ void ValidateDump(const StartHandlerForSelfTestOptions& options,
 #if defined(COMPILER_GCC)
 __attribute__((noinline))
 #endif
+#if defined(__clang__)
+__attribute__((optnone))
+#endif
 int RecurseInfinitely(int* ptr) {
   int buf[1 << 20];
   return *ptr + RecurseInfinitely(buf);
@@ -241,6 +248,10 @@ bool HandleCrashSuccessfully(int, siginfo_t*, ucontext_t*) {
 #pragma clang diagnostic pop
 }
 
+bool HandleCrashSuccessfullyAfterReporting(int, siginfo_t*, ucontext_t*) {
+  return true;
+}
+
 void DoCrash(const StartHandlerForSelfTestOptions& options,
              CrashpadClient* client) {
   if (sigsetjmp(do_crash_sigjmp_env, 1) != 0) {
@@ -270,6 +281,15 @@ void DoCrash(const StartHandlerForSelfTestOptions& options,
       *x;
       break;
     }
+
+    case CrashType::kFakeSegv: {
+      // With a regular SIGSEGV like null dereference, the signal gets reraised
+      // automatically, causing HandleOrReraiseSignal() to be called a second
+      // time, terminating the process with the signal regardless of the last
+      // chance handler.
+      raise(SIGSEGV);
+      break;
+    }
   }
 }
 
@@ -400,6 +420,10 @@ CRASHPAD_CHILD_TEST_MAIN(StartHandlerForSelfTestChild) {
     client.SetFirstChanceExceptionHandler(HandleCrashSuccessfully);
   }
 
+  if (options.set_last_chance_handler) {
+    client.SetLastChanceExceptionHandler(HandleCrashSuccessfullyAfterReporting);
+  }
+
 #if BUILDFLAG(IS_ANDROID)
   if (android_set_abort_message) {
     android_set_abort_message(kTestAbortMessage);
@@ -437,6 +461,16 @@ class StartHandlerForSelfInChildTest : public MultiprocessExec {
         case CrashType::kSegvWithTagBits:
           SetExpectedChildTermination(TerminationReason::kTerminationSignal,
                                       SIGSEGV);
+          break;
+        case CrashType::kFakeSegv:
+          if (!options.set_last_chance_handler) {
+            SetExpectedChildTermination(TerminationReason::kTerminationSignal,
+                                        SIGSEGV);
+          } else {
+            SetExpectedChildTermination(TerminationReason::kTerminationNormal,
+                                        EXIT_SUCCESS);
+          }
+          break;
       }
     }
   }
@@ -468,7 +502,11 @@ class StartHandlerForSelfInChildTest : public MultiprocessExec {
     writer.Close();
 
     if (options_.client_uses_signals && !options_.set_first_chance_handler &&
-        options_.crash_type != CrashType::kSimulated) {
+        options_.crash_type != CrashType::kSimulated &&
+        // The last chance handler will prevent the client handler from being
+        // called if crash type is kFakeSegv.
+        (!options_.set_last_chance_handler ||
+         options_.crash_type != CrashType::kFakeSegv)) {
       // Wait for child's client signal handler.
       char c;
       EXPECT_TRUE(LoggingReadFileExactly(ReadPipeHandle(), &c, sizeof(c)));
@@ -514,6 +552,15 @@ TEST_P(StartHandlerForSelfTest, StartHandlerInChild) {
   }
 #endif  // defined(ADDRESS_SANITIZER)
 
+  // kFakeSegv does raise(SIGSEGV) to simulate a MTE error which is a SEGSEGV
+  // that doesn't get reraised automatically, but this causes the child process
+  // to flakily terminate normally on some bots (e.g. android-nougat-x86-rel)
+  // for some reason so this is skipped.
+  if (!Options().set_last_chance_handler &&
+      Options().crash_type == CrashType::kFakeSegv) {
+    GTEST_SKIP();
+  }
+
   if (Options().crash_type == CrashType::kSegvWithTagBits) {
 #if !defined(ARCH_CPU_ARM64)
     GTEST_SKIP() << "Testing for tag bits only exists on aarch64.";
@@ -546,10 +593,12 @@ INSTANTIATE_TEST_SUITE_P(
                      testing::Bool(),
                      testing::Bool(),
                      testing::Bool(),
+                     testing::Bool(),
                      testing::Values(CrashType::kSimulated,
                                      CrashType::kBuiltinTrap,
                                      CrashType::kInfiniteRecursion,
-                                     CrashType::kSegvWithTagBits)));
+                                     CrashType::kSegvWithTagBits,
+                                     CrashType::kFakeSegv)));
 
 // Test state for starting the handler for another process.
 class StartHandlerForClientTest {
diff --git a/external_imported/sentry-native/external/crashpad/client/crashpad_client_mac.cc b/external_imported/sentry-native/external/crashpad/client/crashpad_client_mac.cc
index 17cee8ecc..5dc512e2a 100644
--- a/external_imported/sentry-native/external/crashpad/client/crashpad_client_mac.cc
+++ b/external_imported/sentry-native/external/crashpad/client/crashpad_client_mac.cc
@@ -24,8 +24,9 @@
 #include <tuple>
 #include <utility>
 
+#include "base/apple/mach_logging.h"
+#include "base/check_op.h"
 #include "base/logging.h"
-#include "base/mac/mach_logging.h"
 #include "base/strings/stringprintf.h"
 #include "util/mac/mac_util.h"
 #include "util/mach/bootstrap.h"
@@ -122,19 +123,20 @@ class HandlerStarter final : public NotifyServer::DefaultInterface {
   //!
   //! \return On success, a send right to the Crashpad handler that has been
   //!     started. On failure, `MACH_PORT_NULL` with a message logged.
-  static base::mac::ScopedMachSendRight InitialStart(
+  static base::apple::ScopedMachSendRight InitialStart(
       const base::FilePath& handler,
       const base::FilePath& database,
       const base::FilePath& metrics_dir,
       const std::string& url,
+      const std::string& http_proxy,
       const std::map<std::string, std::string>& annotations,
       const std::vector<std::string>& arguments,
       const std::vector<base::FilePath>& attachments,
       bool restartable) {
-    base::mac::ScopedMachReceiveRight receive_right(
+    base::apple::ScopedMachReceiveRight receive_right(
         NewMachPort(MACH_PORT_RIGHT_RECEIVE));
     if (!receive_right.is_valid()) {
-      return base::mac::ScopedMachSendRight();
+      return base::apple::ScopedMachSendRight();
     }
 
     mach_port_t port;
@@ -146,9 +148,9 @@ class HandlerStarter final : public NotifyServer::DefaultInterface {
                                                &right_type);
     if (kr != KERN_SUCCESS) {
       MACH_LOG(ERROR, kr) << "mach_port_extract_right";
-      return base::mac::ScopedMachSendRight();
+      return base::apple::ScopedMachSendRight();
     }
-    base::mac::ScopedMachSendRight send_right(port);
+    base::apple::ScopedMachSendRight send_right(port);
     DCHECK_EQ(port, receive_right.get());
     DCHECK_EQ(right_type,
               implicit_cast<mach_msg_type_name_t>(MACH_MSG_TYPE_PORT_SEND));
@@ -167,18 +169,25 @@ class HandlerStarter final : public NotifyServer::DefaultInterface {
                      database,
                      metrics_dir,
                      url,
+                     http_proxy,
                      annotations,
                      arguments,
                      attachments,
                      std::move(receive_right),
                      handler_restarter.get(),
                      false)) {
-      return base::mac::ScopedMachSendRight();
+      return base::apple::ScopedMachSendRight();
     }
 
     if (handler_restarter &&
-        handler_restarter->StartRestartThread(
-            handler, database, metrics_dir, url, annotations, arguments, attachments)) {
+        handler_restarter->StartRestartThread(handler,
+                                              database,
+                                              metrics_dir,
+                                              url,
+                                              http_proxy,
+                                              annotations,
+                                              arguments,
+                                              attachments)) {
       // The thread owns the object now.
       std::ignore = handler_restarter.release();
     }
@@ -211,10 +220,11 @@ class HandlerStarter final : public NotifyServer::DefaultInterface {
                 database_,
                 metrics_dir_,
                 url_,
+                http_proxy_,
                 annotations_,
                 arguments_,
                 attachments_,
-                base::mac::ScopedMachReceiveRight(rights),
+                base::apple::ScopedMachReceiveRight(rights),
                 this,
                 true);
 
@@ -258,10 +268,11 @@ class HandlerStarter final : public NotifyServer::DefaultInterface {
                           const base::FilePath& database,
                           const base::FilePath& metrics_dir,
                           const std::string& url,
+                          const std::string& http_proxy,
                           const std::map<std::string, std::string>& annotations,
                           const std::vector<std::string>& arguments,
                           const std::vector<base::FilePath>& attachments,
-                          base::mac::ScopedMachReceiveRight receive_right,
+                          base::apple::ScopedMachReceiveRight receive_right,
                           HandlerStarter* handler_restarter,
                           bool restart) {
     DCHECK(!restart || handler_restarter);
@@ -287,7 +298,7 @@ class HandlerStarter final : public NotifyServer::DefaultInterface {
         // port-destroyed notifications can be delivered.
         handler_restarter->notify_port_.reset();
       } else {
-        base::mac::ScopedMachSendRight previous_owner(previous);
+        base::apple::ScopedMachSendRight previous_owner(previous);
         DCHECK(restart || !previous_owner.is_valid());
       }
 
@@ -337,6 +348,9 @@ class HandlerStarter final : public NotifyServer::DefaultInterface {
     if (!url.empty()) {
       argv.push_back(FormatArgumentString("url", url));
     }
+    if (!http_proxy.empty()) {
+      argv.push_back(FormatArgumentString("http-proxy", http_proxy));
+    }
     for (const auto& kv : annotations) {
       argv.push_back(
           FormatArgumentString("annotation", kv.first + '=' + kv.second));
@@ -380,6 +394,7 @@ class HandlerStarter final : public NotifyServer::DefaultInterface {
                           const base::FilePath& database,
                           const base::FilePath& metrics_dir,
                           const std::string& url,
+                          const std::string& http_proxy,
                           const std::map<std::string, std::string>& annotations,
                           const std::vector<std::string>& arguments,
                           const std::vector<base::FilePath>& attachments) {
@@ -387,6 +402,7 @@ class HandlerStarter final : public NotifyServer::DefaultInterface {
     database_ = database;
     metrics_dir_ = metrics_dir;
     url_ = url;
+    http_proxy_ = http_proxy;
     annotations_ = annotations;
     arguments_ = arguments;
     attachments_ = attachments;
@@ -440,10 +456,11 @@ class HandlerStarter final : public NotifyServer::DefaultInterface {
   base::FilePath database_;
   base::FilePath metrics_dir_;
   std::string url_;
+  std::string http_proxy_;
   std::map<std::string, std::string> annotations_;
   std::vector<std::string> arguments_;
   std::vector<base::FilePath> attachments_;
-  base::mac::ScopedMachReceiveRight notify_port_;
+  base::apple::ScopedMachReceiveRight notify_port_;
   uint64_t last_start_time_;
 };
 
@@ -460,6 +477,7 @@ bool CrashpadClient::StartHandler(
     const base::FilePath& database,
     const base::FilePath& metrics_dir,
     const std::string& url,
+    const std::string& http_proxy,
     const std::map<std::string, std::string>& annotations,
     const std::vector<std::string>& arguments,
     bool restartable,
@@ -468,11 +486,12 @@ bool CrashpadClient::StartHandler(
   // The “restartable� behavior can only be selected on OS X 10.10 and later. In
   // previous OS versions, if the initial client were to crash while attempting
   // to restart the handler, it would become an unkillable process.
-  base::mac::ScopedMachSendRight exception_port(HandlerStarter::InitialStart(
+  base::apple::ScopedMachSendRight exception_port(HandlerStarter::InitialStart(
       handler,
       database,
       metrics_dir,
       url,
+      http_proxy,
       annotations,
       arguments,
       attachments,
@@ -487,7 +506,8 @@ bool CrashpadClient::StartHandler(
 }
 
 bool CrashpadClient::SetHandlerMachService(const std::string& service_name) {
-  base::mac::ScopedMachSendRight exception_port(BootstrapLookUp(service_name));
+  base::apple::ScopedMachSendRight exception_port(
+      BootstrapLookUp(service_name));
   if (!exception_port.is_valid()) {
     return false;
   }
@@ -497,7 +517,7 @@ bool CrashpadClient::SetHandlerMachService(const std::string& service_name) {
 }
 
 bool CrashpadClient::SetHandlerMachPort(
-    base::mac::ScopedMachSendRight exception_port) {
+    base::apple::ScopedMachSendRight exception_port) {
   DCHECK(!exception_port_.is_valid());
   DCHECK(exception_port.is_valid());
 
@@ -509,7 +529,7 @@ bool CrashpadClient::SetHandlerMachPort(
   return true;
 }
 
-base::mac::ScopedMachSendRight CrashpadClient::GetHandlerMachPort() const {
+base::apple::ScopedMachSendRight CrashpadClient::GetHandlerMachPort() const {
   DCHECK(exception_port_.is_valid());
 
   // For the purposes of this method, only return a port set by
@@ -530,16 +550,16 @@ base::mac::ScopedMachSendRight CrashpadClient::GetHandlerMachPort() const {
       mach_task_self(), exception_port_.get(), MACH_PORT_RIGHT_SEND, 1);
   if (kr != KERN_SUCCESS) {
     MACH_LOG(ERROR, kr) << "mach_port_mod_refs";
-    return base::mac::ScopedMachSendRight(MACH_PORT_NULL);
+    return base::apple::ScopedMachSendRight(MACH_PORT_NULL);
   }
 
-  return base::mac::ScopedMachSendRight(exception_port_.get());
+  return base::apple::ScopedMachSendRight(exception_port_.get());
 }
 
 // static
 void CrashpadClient::UseSystemDefaultHandler() {
-  base::mac::ScopedMachSendRight
-      system_crash_reporter_handler(SystemCrashReporterHandler());
+  base::apple::ScopedMachSendRight system_crash_reporter_handler(
+      SystemCrashReporterHandler());
 
   // Proceed even if SystemCrashReporterHandler() failed, setting MACH_PORT_NULL
   // to clear the current exception ports.
diff --git a/external_imported/sentry-native/external/crashpad/client/crashpad_client_win.cc b/external_imported/sentry-native/external/crashpad/client/crashpad_client_win.cc
index 0bb7aa89c..fa87ef996 100644
--- a/external_imported/sentry-native/external/crashpad/client/crashpad_client_win.cc
+++ b/external_imported/sentry-native/external/crashpad/client/crashpad_client_win.cc
@@ -23,8 +23,10 @@
 #include <string.h>
 
 #include <memory>
+#include <string_view>
 
 #include "base/atomicops.h"
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "base/scoped_generic.h"
 #include "base/strings/stringprintf.h"
@@ -63,7 +65,7 @@ HANDLE g_signal_exception = INVALID_HANDLE_VALUE;
 // Where we store the exception information that the crash handler reads.
 ExceptionInformation g_crash_exception_information;
 
-CrashpadClient::FirstChanceHandlerWin first_chance_handler_ = nullptr;
+CrashpadClient::FirstChanceHandler first_chance_handler_ = nullptr;
 
 // Guards multiple simultaneous calls to DumpWithoutCrash() in the client.
 base::Lock* g_non_crash_dump_lock = nullptr;
@@ -203,6 +205,17 @@ LONG WINAPI UnhandledExceptionHandler(EXCEPTION_POINTERS* exception_pointers) {
   return EXCEPTION_CONTINUE_SEARCH;
 }
 
+#if !defined(ADDRESS_SANITIZER)
+LONG WINAPI HandleHeapCorruption(EXCEPTION_POINTERS* exception_pointers) {
+  if (exception_pointers->ExceptionRecord->ExceptionCode ==
+      STATUS_HEAP_CORRUPTION) {
+    return UnhandledExceptionHandler(exception_pointers);
+  }
+
+  return EXCEPTION_CONTINUE_SEARCH;
+}
+#endif
+
 void HandleAbortSignal(int signum) {
   DCHECK_EQ(signum, SIGABRT);
 
@@ -331,6 +344,7 @@ struct BackgroundHandlerStartThreadData {
       const base::FilePath& database,
       const base::FilePath& metrics_dir,
       const std::string& url,
+      const std::string& http_proxy,
       const std::map<std::string, std::string>& annotations,
       const std::vector<std::string>& arguments,
       const std::vector<base::FilePath>& attachments,
@@ -340,6 +354,7 @@ struct BackgroundHandlerStartThreadData {
         database(database),
         metrics_dir(metrics_dir),
         url(url),
+        http_proxy(http_proxy),
         annotations(annotations),
         arguments(arguments),
         attachments(attachments),
@@ -350,6 +365,7 @@ struct BackgroundHandlerStartThreadData {
   base::FilePath database;
   base::FilePath metrics_dir;
   std::string url;
+  std::string http_proxy;
   std::map<std::string, std::string> annotations;
   std::vector<std::string> arguments;
   std::vector<base::FilePath> attachments;
@@ -405,6 +421,11 @@ bool StartHandlerProcess(
         FormatArgumentString("url", base::UTF8ToWide(data->url)),
         &command_line);
   }
+  if (!data->http_proxy.empty()) {
+    AppendCommandLineArgument(
+        FormatArgumentString("http-proxy", base::UTF8ToWide(data->http_proxy)),
+        &command_line);
+  }
   for (const auto& kv : data->annotations) {
     AppendCommandLineArgument(
         FormatArgumentString("annotation",
@@ -520,7 +541,7 @@ bool StartHandlerProcess(
   // invalid command line where the first argument needed by rundll32 is not in
   // the correct format as required in:
   // https://support.microsoft.com/en-ca/help/164787/info-windows-rundll-and-rundll32-interface
-  const base::WStringPiece kRunDll32Exe(L"rundll32.exe");
+  const std::wstring_view kRunDll32Exe(L"rundll32.exe");
   bool is_embedded_in_dll = false;
   if (data->handler.value().size() >= kRunDll32Exe.size() &&
       _wcsicmp(data->handler.value()
@@ -592,35 +613,10 @@ void CommonInProcessInitialization() {
   g_non_crash_dump_lock = new base::Lock();
 }
 
-void RegisterHandlers() {
-  SetUnhandledExceptionFilter(&UnhandledExceptionHandler);
-
-  // The Windows CRT's signal.h lists:
-  // - SIGINT
-  // - SIGILL
-  // - SIGFPE
-  // - SIGSEGV
-  // - SIGTERM
-  // - SIGBREAK
-  // - SIGABRT
-  // SIGILL and SIGTERM are documented as not being generated. SIGBREAK and
-  // SIGINT are for Ctrl-Break and Ctrl-C, and aren't something for which
-  // capturing a dump is warranted. SIGFPE and SIGSEGV are captured as regular
-  // exceptions through the unhandled exception filter. This leaves SIGABRT. In
-  // the standard CRT, abort() is implemented as a synchronous call to the
-  // SIGABRT signal handler if installed, but after doing so, the unhandled
-  // exception filter is not triggered (it instead __fastfail()s). So, register
-  // to handle SIGABRT to catch abort() calls, as client code might use this and
-  // expect it to cause a crash dump. This will only work when the abort()
-  // that's called in client code is the same (or has the same behavior) as the
-  // one in use here.
-  void (*rv)(int) = signal(SIGABRT, HandleAbortSignal);
-  DCHECK_NE(rv, SIG_ERR);
-}
-
 }  // namespace
 
-CrashpadClient::CrashpadClient() : ipc_pipe_(), handler_start_thread_() {}
+CrashpadClient::CrashpadClient()
+    : ipc_pipe_(), handler_start_thread_(), vectored_handler_() {}
 
 CrashpadClient::~CrashpadClient() {}
 
@@ -629,6 +625,7 @@ bool CrashpadClient::StartHandler(
     const base::FilePath& database,
     const base::FilePath& metrics_dir,
     const std::string& url,
+    const std::string& http_proxy,
     const std::map<std::string, std::string>& annotations,
     const std::vector<std::string>& arguments,
     bool restartable,
@@ -661,6 +658,7 @@ bool CrashpadClient::StartHandler(
                                                    database,
                                                    metrics_dir,
                                                    url,
+                                                   http_proxy,
                                                    annotations,
                                                    arguments,
                                                    attachments,
@@ -694,6 +692,42 @@ bool CrashpadClient::StartHandler(
   }
 }
 
+void CrashpadClient::RegisterHandlers() {
+  SetUnhandledExceptionFilter(&UnhandledExceptionHandler);
+
+  // Windows swallows heap corruption failures but we can intercept them with
+  // a vectored exception handler. Note that a vectored exception handler is
+  // not compatible with or generally helpful in ASAN builds (ASAN inserts a
+  // bad dereference at the beginning of the handler, leading to recursive
+  // invocation of the handler).
+#if !defined(ADDRESS_SANITIZER)
+  PVOID handler = AddVectoredExceptionHandler(true, HandleHeapCorruption);
+  vectored_handler_.reset(handler);
+#endif
+
+  // The Windows CRT's signal.h lists:
+  // - SIGINT
+  // - SIGILL
+  // - SIGFPE
+  // - SIGSEGV
+  // - SIGTERM
+  // - SIGBREAK
+  // - SIGABRT
+  // SIGILL and SIGTERM are documented as not being generated. SIGBREAK and
+  // SIGINT are for Ctrl-Break and Ctrl-C, and aren't something for which
+  // capturing a dump is warranted. SIGFPE and SIGSEGV are captured as regular
+  // exceptions through the unhandled exception filter. This leaves SIGABRT. In
+  // the standard CRT, abort() is implemented as a synchronous call to the
+  // SIGABRT signal handler if installed, but after doing so, the unhandled
+  // exception filter is not triggered (it instead __fastfail()s). So, register
+  // to handle SIGABRT to catch abort() calls, as client code might use this and
+  // expect it to cause a crash dump. This will only work when the abort()
+  // that's called in client code is the same (or has the same behavior) as the
+  // one in use here.
+  void (*rv)(int) = signal(SIGABRT, HandleAbortSignal);
+  DCHECK_NE(rv, SIG_ERR);
+}
+
 bool CrashpadClient::SetHandlerIPCPipe(const std::wstring& ipc_pipe) {
   DCHECK(ipc_pipe_.empty());
   DCHECK(!ipc_pipe.empty());
@@ -1119,7 +1153,7 @@ bool CrashpadClient::DumpAndCrashTargetProcess(HANDLE process,
 
 // static
 void CrashpadClient::SetFirstChanceExceptionHandler(
-    FirstChanceHandlerWin handler) {
+    FirstChanceHandler handler) {
   first_chance_handler_ = handler;
 }
 
diff --git a/external_imported/sentry-native/external/crashpad/client/ios_handler/exception_processor.mm b/external_imported/sentry-native/external/crashpad/client/ios_handler/exception_processor.mm
index 3deaa0f5c..470b0e76f 100644
--- a/external_imported/sentry-native/external/crashpad/client/ios_handler/exception_processor.mm
+++ b/external_imported/sentry-native/external/crashpad/client/ios_handler/exception_processor.mm
@@ -38,6 +38,7 @@
 #include <sys/types.h>
 #include <unwind.h>
 
+#include <atomic>
 #include <exception>
 #include <type_traits>
 #include <typeinfo>
@@ -64,7 +65,7 @@
   Class cls_unremapped;
 };
 struct objc_exception {
-  id obj;
+  id __unsafe_unretained obj;
   objc_typeinfo tinfo;
 };
 
@@ -218,7 +219,7 @@ id HandleUncaughtException(NativeCPUContext* cpu_context, id exception) {
   // preprocessor didn't catch anything, so pass the frames or just the context
   // to the exception_delegate.
   void FinalizeUncaughtNSException(id exception) {
-    if ([last_exception_ isEqual:exception] &&
+    if (last_exception() == (__bridge void*)exception &&
         !last_handled_intermediate_dump_.empty() &&
         exception_delegate_->MoveIntermediateDumpAtPathToPending(
             last_handled_intermediate_dump_)) {
@@ -227,8 +228,11 @@ void FinalizeUncaughtNSException(id exception) {
     }
 
     std::string name, reason;
-    SetNSExceptionAnnotations(exception, name, reason);
-    NSArray<NSNumber*>* address_array = [exception callStackReturnAddresses];
+    NSArray<NSNumber*>* address_array = nil;
+    if ([exception isKindOfClass:[NSException class]]) {
+      SetNSExceptionAnnotations(exception, name, reason);
+      address_array = [exception callStackReturnAddresses];
+    }
 
     if ([address_array count] > 0) {
       static StringAnnotation<256> name_key("UncaughtNSException");
@@ -258,11 +262,8 @@ id MaybeCallNextPreprocessor(id exception) {
   // Restore the objc_setExceptionPreprocessor and NSUncaughtExceptionHandler.
   void Uninstall();
 
-  NSException* last_exception() { return last_exception_; }
-  void set_last_exception(NSException* exception) {
-    [last_exception_ release];
-    last_exception_ = [exception retain];
-  }
+  void* last_exception() { return last_exception_; }
+  void set_last_exception(void* exception) { last_exception_ = exception; }
 
  private:
   ExceptionPreprocessorState() = default;
@@ -272,9 +273,11 @@ void set_last_exception(NSException* exception) {
   // HANDLE_UNCAUGHT_NSEXCEPTION.
   base::FilePath last_handled_intermediate_dump_;
 
-  // Recorded last NSException in case the exception is caught and thrown again
-  // (without using objc_exception_rethrow.)
-  NSException* last_exception_ = nil;
+  // Recorded last NSException pointer in case the exception is caught and
+  // thrown again (without using objc_exception_rethrow) as an
+  // unsafe_unretained reference. Stored as a void* as the only safe
+  // operation is pointer comparison.
+  std::atomic<void*> last_exception_ = nil;
 
   ObjcExceptionDelegate* exception_delegate_ = nullptr;
   objc_exception_preprocessor next_preprocessor_ = nullptr;
@@ -291,7 +294,9 @@ static __attribute__((noinline)) id HANDLE_UNCAUGHT_NSEXCEPTION(
     id exception,
     const char* sinkhole) {
   std::string name, reason;
-  SetNSExceptionAnnotations(exception, name, reason);
+  if ([exception isKindOfClass:[NSException class]]) {
+    SetNSExceptionAnnotations(exception, name, reason);
+  }
   LOG(WARNING) << "Handling Objective-C exception name: " << name
                << " reason: " << reason << " with sinkhole: " << sinkhole;
   NativeCPUContext cpu_context{};
@@ -319,6 +324,20 @@ bool ModulePathMatchesSinkhole(const char* path, const char* sinkhole) {
 #endif
 }
 
+//! \brief Helper to release memory from calls to __cxa_allocate_exception.
+class ScopedException {
+ public:
+  explicit ScopedException(objc_exception* exception) : exception_(exception) {}
+
+  ScopedException(const ScopedException&) = delete;
+  ScopedException& operator=(const ScopedException&) = delete;
+
+  ~ScopedException() { __cxxabiv1::__cxa_free_exception(exception_); }
+
+ private:
+  objc_exception* exception_;  // weak
+};
+
 id ObjcExceptionPreprocessor(id exception) {
   // Some sinkholes don't use objc_exception_rethrow when they should, which
   // would otherwise prevent the exception_preprocessor from getting called
@@ -326,10 +345,10 @@ id ObjcExceptionPreprocessor(id exception) {
   // ignore it.
   ExceptionPreprocessorState* preprocessor_state =
       ExceptionPreprocessorState::Get();
-  if ([preprocessor_state->last_exception() isEqual:exception]) {
+  if (preprocessor_state->last_exception() == (__bridge void*)exception) {
     return preprocessor_state->MaybeCallNextPreprocessor(exception);
   }
-  preprocessor_state->set_last_exception(exception);
+  preprocessor_state->set_last_exception((__bridge void*)exception);
 
   static bool seen_first_exception;
 
@@ -339,9 +358,14 @@ id ObjcExceptionPreprocessor(id exception) {
   static StringAnnotation<1024> lastexception_bt("lastexception_bt");
   auto* key = seen_first_exception ? &lastexception : &firstexception;
   auto* bt_key = seen_first_exception ? &lastexception_bt : &firstexception_bt;
-  NSString* value = [NSString
-      stringWithFormat:@"%@ reason %@", [exception name], [exception reason]];
-  key->Set(base::SysNSStringToUTF8(value));
+
+  if ([exception isKindOfClass:[NSException class]]) {
+    NSString* value = [NSString
+        stringWithFormat:@"%@ reason %@", [exception name], [exception reason]];
+    key->Set(base::SysNSStringToUTF8(value));
+  } else {
+    key->Set(base::SysNSStringToUTF8([exception description]));
+  }
 
   // This exception preprocessor runs prior to the one in libobjc, which sets
   // the -[NSException callStackReturnAddresses].
@@ -374,6 +398,7 @@ id ObjcExceptionPreprocessor(id exception) {
   // From 10.15.0 objc4-779.1/runtime/objc-exception.mm objc_exception_throw.
   objc_exception* exception_objc = reinterpret_cast<objc_exception*>(
       __cxxabiv1::__cxa_allocate_exception(sizeof(objc_exception)));
+  ScopedException exception_objc_owner(exception_objc);
   exception_objc->obj = exception;
   exception_objc->tinfo.vtable = objc_ehtype_vtable + 2;
   exception_objc->tinfo.name = object_getClassName(exception);
diff --git a/external_imported/sentry-native/external/crashpad/client/ios_handler/in_process_handler.cc b/external_imported/sentry-native/external/crashpad/client/ios_handler/in_process_handler.cc
index 4dd032f05..dfdc03c9b 100644
--- a/external_imported/sentry-native/external/crashpad/client/ios_handler/in_process_handler.cc
+++ b/external_imported/sentry-native/external/crashpad/client/ios_handler/in_process_handler.cc
@@ -19,7 +19,6 @@
 
 #include <algorithm>
 
-#include "base/cxx17_backports.h"
 #include "base/logging.h"
 #include "client/ios_handler/in_process_intermediate_dump_handler.h"
 #include "client/prune_crash_reports.h"
@@ -93,7 +92,7 @@ bool InProcessHandler::Initialize(
     upload_thread_options.identify_client_via_url = true;
 
     upload_thread_.reset(new CrashReportUploadThread(
-        database_.get(), url, upload_thread_options, callback));
+        database_.get(), url, "", upload_thread_options, callback));
   }
 
   if (!CreateDirectory(database))
diff --git a/external_imported/sentry-native/external/crashpad/client/ios_handler/in_process_intermediate_dump_handler.cc b/external_imported/sentry-native/external/crashpad/client/ios_handler/in_process_intermediate_dump_handler.cc
index 06eacceed..a7ac5dae1 100644
--- a/external_imported/sentry-native/external/crashpad/client/ios_handler/in_process_intermediate_dump_handler.cc
+++ b/external_imported/sentry-native/external/crashpad/client/ios_handler/in_process_intermediate_dump_handler.cc
@@ -24,6 +24,7 @@
 #include <iterator>
 #include <optional>
 
+#include "base/check_op.h"
 #include "build/build_config.h"
 #include "snapshot/snapshot_constants.h"
 #include "util/ios/ios_intermediate_dump_writer.h"
diff --git a/external_imported/sentry-native/external/crashpad/client/pthread_create_linux.cc b/external_imported/sentry-native/external/crashpad/client/pthread_create_linux.cc
index acbf57d57..86ff8dba6 100644
--- a/external_imported/sentry-native/external/crashpad/client/pthread_create_linux.cc
+++ b/external_imported/sentry-native/external/crashpad/client/pthread_create_linux.cc
@@ -15,6 +15,7 @@
 #include <dlfcn.h>
 #include <pthread.h>
 
+#include "base/check.h"
 #include "base/logging.h"
 #include "client/crashpad_client.h"
 #include "util/misc/no_cfi_icall.h"
diff --git a/external_imported/sentry-native/external/crashpad/client/ring_buffer_annotation_load_test_main.cc b/external_imported/sentry-native/external/crashpad/client/ring_buffer_annotation_load_test_main.cc
index 12355f4b1..2a767be58 100644
--- a/external_imported/sentry-native/external/crashpad/client/ring_buffer_annotation_load_test_main.cc
+++ b/external_imported/sentry-native/external/crashpad/client/ring_buffer_annotation_load_test_main.cc
@@ -315,9 +315,11 @@ class RingBufferAnnotationSnapshot final {
       int next_value;
       base::StringPiece str(reinterpret_cast<const char*>(&bytes[0]),
                             bytes.size());
-      if (!HexStringToInt(str, &next_value)) {
-        fprintf(
-            stderr, "Couldn't parse value: [%s]\n", str.as_string().c_str());
+      if (!base::HexStringToInt(str, &next_value)) {
+        fprintf(stderr,
+                "Couldn't parse value: [%.*s]\n",
+                base::checked_cast<int>(bytes.size()),
+                bytes.data());
         abort();
       }
       if (value == std::numeric_limits<int>::max()) {
diff --git a/external_imported/sentry-native/external/crashpad/client/simulate_crash_mac.cc b/external_imported/sentry-native/external/crashpad/client/simulate_crash_mac.cc
index d801a4317..427d9d542 100644
--- a/external_imported/sentry-native/external/crashpad/client/simulate_crash_mac.cc
+++ b/external_imported/sentry-native/external/crashpad/client/simulate_crash_mac.cc
@@ -19,10 +19,10 @@
 
 #include <iterator>
 
+#include "base/apple/mach_logging.h"
+#include "base/apple/scoped_mach_port.h"
 #include "base/check_op.h"
 #include "base/logging.h"
-#include "base/mac/mach_logging.h"
-#include "base/mac/scoped_mach_port.h"
 #include "build/build_config.h"
 #include "util/mach/exc_client_variants.h"
 #include "util/mach/exception_behaviors.h"
@@ -205,7 +205,7 @@ void SimulateCrash(const NativeCPUContext& cpu_context) {
 #error Port to your CPU architecture
 #endif
 
-  base::mac::ScopedMachSendRight thread(mach_thread_self());
+  base::apple::ScopedMachSendRight thread(mach_thread_self());
   exception_type_t exception = kMachExceptionSimulated;
   mach_exception_data_type_t codes[] = {0, 0};
   mach_msg_type_number_t code_count = std::size(codes);
diff --git a/external_imported/sentry-native/external/crashpad/cmake/toolchains/win_arm64.cmake b/external_imported/sentry-native/external/crashpad/cmake/toolchains/win_arm64.cmake
new file mode 100644
index 000000000..26ae4f386
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/cmake/toolchains/win_arm64.cmake
@@ -0,0 +1,6 @@
+# Toolchain file that should provide required and non-conflicting build-
+# parameters to allow normal and cross-compilation to ARM64 targets on 
+# Windows using any generator.
+SET(CMAKE_GENERATOR_PLATFORM "ARM64")
+SET(CMAKE_SYSTEM_PROCESSOR "ARM64")
+SET(CMAKE_SYSTEM_NAME "Windows")
\ No newline at end of file
diff --git a/external_imported/sentry-native/external/crashpad/compat/BUILD.gn b/external_imported/sentry-native/external/crashpad/compat/BUILD.gn
index 63cfa6eb0..d75c26e1d 100644
--- a/external_imported/sentry-native/external/crashpad/compat/BUILD.gn
+++ b/external_imported/sentry-native/external/crashpad/compat/BUILD.gn
@@ -17,7 +17,7 @@ import("../build/crashpad_buildconfig.gni")
 config("compat_config") {
   include_dirs = []
 
-  if (crashpad_is_mac || crashpad_is_ios) {
+  if (crashpad_is_apple) {
     include_dirs += [ "mac" ]
   }
 
@@ -41,7 +41,7 @@ config("compat_config") {
 }
 
 template("compat_target") {
-  if (crashpad_is_mac || crashpad_is_ios) {
+  if (crashpad_is_apple) {
     # There are no sources to compile, which doesn’t mix will with a
     # static_library.
     group(target_name) {
@@ -64,7 +64,7 @@ template("compat_target") {
 compat_target("compat") {
   sources = []
 
-  if (crashpad_is_mac || crashpad_is_ios) {
+  if (crashpad_is_apple) {
     sources += [
       "mac/Availability.h",
       "mac/AvailabilityVersions.h",
diff --git a/external_imported/sentry-native/external/crashpad/doc/appengine/src/crashpad-home/main.go b/external_imported/sentry-native/external/crashpad/doc/appengine/src/crashpad-home/main.go
index 1af2125e8..d988af3ce 100644
--- a/external_imported/sentry-native/external/crashpad/doc/appengine/src/crashpad-home/main.go
+++ b/external_imported/sentry-native/external/crashpad/doc/appengine/src/crashpad-home/main.go
@@ -63,7 +63,7 @@ func handler(w http.ResponseWriter, r *http.Request) {
 		"/man/generate_dump.html":          mainBaseURL + "tools/generate_dump.md",
 		"/man/index.html":                  mainBaseURL + "doc/man.md",
 		"/man/on_demand_service_tool.html": mainBaseURL + "tools/mac/on_demand_service_tool.md",
-		"/man/run_with_crashpad.html":      mainBaseURL + "tools/mac/run_with_crashpad.md",
+		"/man/run_with_crashpad.html":      mainBaseURL + "tools/run_with_crashpad.md",
 	}
 
 	ctx := appengine.NewContext(r)
diff --git a/external_imported/sentry-native/external/crashpad/doc/man.md b/external_imported/sentry-native/external/crashpad/doc/man.md
index 7789a014d..098c8483f 100644
--- a/external_imported/sentry-native/external/crashpad/doc/man.md
+++ b/external_imported/sentry-native/external/crashpad/doc/man.md
@@ -27,7 +27,7 @@ limitations under the License.
  * [catch_exception_tool](../tools/mac/catch_exception_tool.md)
  * [exception_port_tool](../tools/mac/exception_port_tool.md)
  * [on_demand_service_tool](../tools/mac/on_demand_service_tool.md)
- * [run_with_crashpad](../tools/mac/run_with_crashpad.md)
+ * [run_with_crashpad](../tools/run_with_crashpad.md)
 
 ## Section 8: DÓ•mons
 
diff --git a/external_imported/sentry-native/external/crashpad/handler/BUILD.gn b/external_imported/sentry-native/external/crashpad/handler/BUILD.gn
index e5d488e26..a2d6f7fb4 100644
--- a/external_imported/sentry-native/external/crashpad/handler/BUILD.gn
+++ b/external_imported/sentry-native/external/crashpad/handler/BUILD.gn
@@ -49,6 +49,9 @@ static_library("handler") {
       "linux/cros_crash_report_exception_handler.cc",
       "linux/cros_crash_report_exception_handler.h",
     ]
+
+    # TODO(https://crbug.com/1420445): Remove this config when M115 branches.
+    configs += [ "../build:crashpad_is_in_chromium" ]
   }
 
   if (crashpad_is_win) {
@@ -97,7 +100,7 @@ static_library("common") {
     "minidump_to_upload_parameters.cc",
     "minidump_to_upload_parameters.h",
   ]
-  if (crashpad_is_mac || crashpad_is_ios) {
+  if (crashpad_is_apple) {
     sources += [
       "mac/file_limit_annotation.cc",
       "mac/file_limit_annotation.h",
@@ -342,6 +345,19 @@ if (crashpad_is_win) {
     ]
   }
 
+  crashpad_executable("heap_corrupting_program") {
+    testonly = true
+
+    sources = [ "win/heap_corrupting_program.cc" ]
+
+    deps = [
+      "../client",
+      "../compat",
+      "../snapshot",
+      "../third_party/mini_chromium:base",
+    ]
+  }
+
   if (current_cpu == "x86") {
     # Cannot create an x64 DLL with embedded debug info.
     crashpad_executable("crashy_z7_loader") {
diff --git a/external_imported/sentry-native/external/crashpad/handler/crash_report_upload_thread.cc b/external_imported/sentry-native/external/crashpad/handler/crash_report_upload_thread.cc
index 5bd2889ed..7cea398e1 100644
--- a/external_imported/sentry-native/external/crashpad/handler/crash_report_upload_thread.cc
+++ b/external_imported/sentry-native/external/crashpad/handler/crash_report_upload_thread.cc
@@ -20,6 +20,7 @@
 #include <algorithm>
 #include <map>
 #include <memory>
+#include <utility>
 #include <vector>
 
 #include "base/logging.h"
@@ -88,12 +89,14 @@ class ScopedFunctionInvoker final {
 
 CrashReportUploadThread::CrashReportUploadThread(
     CrashReportDatabase* database,
-    const std::string& url,
+    std::string url,
+    std::string http_proxy,
     const Options& options,
     ProcessPendingReportsObservationCallback callback)
     : options_(options),
-      callback_(callback),
-      url_(url),
+      callback_(std::move(callback)),
+      url_(std::move(url)),
+      http_proxy_(std::move(http_proxy)),
       // When watching for pending reports, check every 15 minutes, even in the
       // absence of a signal from the handler thread. This allows for failed
       // uploads to be retried periodically, and for pending reports written by
@@ -365,6 +368,7 @@ CrashReportUploadThread::UploadResult CrashReportUploadThread::UploadReport(
     }
   }
   http_transport->SetURL(url);
+  http_transport->SetHTTPProxy(http_proxy_);
 
   if (!http_transport->ExecuteSynchronously(response_body)) {
     return UploadResult::kRetry;
diff --git a/external_imported/sentry-native/external/crashpad/handler/crash_report_upload_thread.h b/external_imported/sentry-native/external/crashpad/handler/crash_report_upload_thread.h
index 22bb26e31..6bde3835b 100644
--- a/external_imported/sentry-native/external/crashpad/handler/crash_report_upload_thread.h
+++ b/external_imported/sentry-native/external/crashpad/handler/crash_report_upload_thread.h
@@ -85,7 +85,8 @@ class CrashReportUploadThread : public WorkerThread::Delegate,
   //!     processing and attempting to upload on-disk crash reports.
   //!     If this callback is empty, it is not invoked.
   CrashReportUploadThread(CrashReportDatabase* database,
-                          const std::string& url,
+                          std::string url,
+                          std::string http_proxy,
                           const Options& options,
                           ProcessPendingReportsObservationCallback callback);
 
@@ -226,6 +227,7 @@ class CrashReportUploadThread : public WorkerThread::Delegate,
   const Options options_;
   const ProcessPendingReportsObservationCallback callback_;
   const std::string url_;
+  const std::string http_proxy_;
   WorkerThread thread_;
   ThreadSafeVector<UUID> known_pending_report_uuids_;
 #if BUILDFLAG(IS_IOS)
diff --git a/external_imported/sentry-native/external/crashpad/handler/crashpad_handler.md b/external_imported/sentry-native/external/crashpad/handler/crashpad_handler.md
index 324957de5..3e722bad5 100644
--- a/external_imported/sentry-native/external/crashpad/handler/crashpad_handler.md
+++ b/external_imported/sentry-native/external/crashpad/handler/crashpad_handler.md
@@ -83,7 +83,7 @@ closed.
 It is not normally appropriate to invoke this program directly. Usually, it will
 be invoked by a Crashpad client using the Crashpad client library, or started by
 another system service. On macOS, arbitrary programs may be run with a Crashpad
-handler by using [run_with_crashpad(1)](../tools/mac/run_with_crashpad.md) to
+handler by using [run_with_crashpad(1)](../tools/run_with_crashpad.md) to
 establish the Crashpad client environment before running a program.
 
 ## Options
@@ -321,7 +321,7 @@ establish the Crashpad client environment before running a program.
 [catch_exception_tool(1)](../tools/mac/catch_exception_tool.md),
 [crashpad_database_util(1)](../tools/crashpad_database_util.md),
 [generate_dump(1)](../tools/generate_dump.md),
-[run_with_crashpad(1)](../tools/mac/run_with_crashpad.md)
+[run_with_crashpad(1)](../tools/run_with_crashpad.md)
 
 ## Resources
 
diff --git a/external_imported/sentry-native/external/crashpad/handler/handler_main.cc b/external_imported/sentry-native/external/crashpad/handler/handler_main.cc
index 7f875b9e9..0ba16ae31 100644
--- a/external_imported/sentry-native/external/crashpad/handler/handler_main.cc
+++ b/external_imported/sentry-native/external/crashpad/handler/handler_main.cc
@@ -71,7 +71,7 @@
 #include <libgen.h>
 #include <signal.h>
 
-#include "base/mac/scoped_mach_port.h"
+#include "base/apple/scoped_mach_port.h"
 #include "handler/mac/crash_report_exception_handler.h"
 #include "handler/mac/exception_handler_server.h"
 #include "handler/mac/file_limit_annotation.h"
@@ -223,6 +223,7 @@ struct Options {
   std::map<std::string, std::string> annotations;
   std::map<std::string, std::string> monitor_self_annotations;
   std::string url;
+  std::string http_proxy;
   base::FilePath database;
   base::FilePath metrics_dir;
   std::vector<std::string> monitor_self_arguments;
@@ -515,6 +516,7 @@ void MonitorSelf(const Options& options) {
                                     options.database,
                                     base::FilePath(),
                                     options.url,
+                                    options.http_proxy,
                                     options.annotations,
                                     extra_arguments,
                                     true,
@@ -621,6 +623,7 @@ int HandlerMain(int argc,
     kOptionTraceParentWithException,
 #endif
     kOptionURL,
+    kOptionHttpProxy,
 #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
     kOptionUseCrosCrashReporter,
     kOptionMinidumpDirForTests,
@@ -705,6 +708,7 @@ int HandlerMain(int argc,
 #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
         // BUILDFLAG(IS_ANDROID)
     {"url", required_argument, nullptr, kOptionURL},
+    {"http-proxy", optional_argument, nullptr, kOptionHttpProxy},
 #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
     {"use-cros-crash-reporter",
      no_argument,
@@ -878,6 +882,10 @@ int HandlerMain(int argc,
         options.url = optarg;
         break;
       }
+      case kOptionHttpProxy: {
+        options.http_proxy = optarg;
+        break;
+      }
 #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
       case kOptionUseCrosCrashReporter: {
         options.use_cros_crash_reporter = true;
@@ -1030,6 +1038,7 @@ int HandlerMain(int argc,
     upload_thread.Reset(new CrashReportUploadThread(
         database.get(),
         options.url,
+        options.http_proxy,
         upload_thread_options,
         CrashReportUploadThread::ProcessPendingReportsObservationCallback()));
     upload_thread.Get()->Start();
@@ -1112,7 +1121,7 @@ int HandlerMain(int argc,
     CloseStdinAndStdout();
   }
 
-  base::mac::ScopedMachReceiveRight receive_right;
+  base::apple::ScopedMachReceiveRight receive_right;
 
   if (options.handshake_fd >= 0) {
     receive_right.reset(
diff --git a/external_imported/sentry-native/external/crashpad/handler/linux/cros_crash_report_exception_handler.cc b/external_imported/sentry-native/external/crashpad/handler/linux/cros_crash_report_exception_handler.cc
index a3a685524..bfccd1f2e 100644
--- a/external_imported/sentry-native/external/crashpad/handler/linux/cros_crash_report_exception_handler.cc
+++ b/external_imported/sentry-native/external/crashpad/handler/linux/cros_crash_report_exception_handler.cc
@@ -17,6 +17,10 @@
 #include <vector>
 
 #include "base/logging.h"
+#include "base/strings/stringprintf.h"
+#if defined(CRASHPAD_IS_IN_CHROMIUM)
+#include "base/system/sys_info.h"
+#endif // CRASHPAD_IS_IN_CHROMIUM
 #include "client/settings.h"
 #include "handler/linux/capture_snapshot.h"
 #include "handler/minidump_to_upload_parameters.h"
@@ -246,6 +250,29 @@ bool CrosCrashReportExceptionHandler::HandleExceptionWithConnection(
   // crash_reporter needs to know the pid and uid of the crashing process.
   std::vector<std::string> argv({"/sbin/crash_reporter"});
 
+#if defined(CRASHPAD_IS_IN_CHROMIUM)
+  int32_t major_version = 0, minor_version = 0, bugfix_version = 0;
+  base::SysInfo::OperatingSystemVersionNumbers(
+      &major_version, &minor_version, &bugfix_version);
+  // The version on which https://crrev.com/c/4265753 landed.
+  constexpr int32_t kFixedVersion = 15363;
+  // TODO(https://crbug.com/1420445): Remove this check (and the
+  // CRASHPAD_IS_IN_CHROMIUM defines) when M115 branches.
+  // (Lacros is guaranteed not to be more than 2 milestones ahead of ash, and
+  // M113 on ash has the relevant crash_reporter change.)
+  if (major_version >= kFixedVersion) {
+    // Used to distinguish between non-fatal and fatal crashes.
+    const ExceptionSnapshot* const exception_snapshot = snapshot->Exception();
+    if (exception_snapshot) {
+      // convert to int32, since crashpad uses -1 as a signal for non-fatal
+      // crashes.
+      argv.push_back(base::StringPrintf(
+          "--chrome_signal=%d",
+          static_cast<int32_t>(exception_snapshot->Exception())));
+    }
+  }
+#endif // CRASHPAD_IS_IN_CHROMIUM
+
   argv.push_back("--chrome_memfd=" + std::to_string(file_writer.fd()));
 
   const pid_t pid = process_snapshot->ProcessID();
diff --git a/external_imported/sentry-native/external/crashpad/handler/linux/exception_handler_server.cc b/external_imported/sentry-native/external/crashpad/handler/linux/exception_handler_server.cc
index a267e2f12..00b076469 100644
--- a/external_imported/sentry-native/external/crashpad/handler/linux/exception_handler_server.cc
+++ b/external_imported/sentry-native/external/crashpad/handler/linux/exception_handler_server.cc
@@ -25,6 +25,7 @@
 
 #include <utility>
 
+#include "base/check_op.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/posix/eintr_wrapper.h"
diff --git a/external_imported/sentry-native/external/crashpad/handler/linux/exception_handler_server_test.cc b/external_imported/sentry-native/external/crashpad/handler/linux/exception_handler_server_test.cc
index 40f06e645..e16d93b75 100644
--- a/external_imported/sentry-native/external/crashpad/handler/linux/exception_handler_server_test.cc
+++ b/external_imported/sentry-native/external/crashpad/handler/linux/exception_handler_server_test.cc
@@ -253,7 +253,10 @@ class ExceptionHandlerServerTest : public testing::TestWithParam<bool> {
         pid_t last_client;
         ASSERT_TRUE(server_test_->Delegate()->WaitForException(
             5.0, &last_client, &last_address));
-        EXPECT_EQ(last_address, info.exception_information_address);
+        // `exception_information_address` is underaligned and `EXPECT_EQ`
+        // internally takes arguments by reference. Copy it into a temporary
+        // before comparing to avoid undefined behavior.
+        EXPECT_EQ(last_address, VMAddress{info.exception_information_address});
         EXPECT_EQ(last_client, ChildPID());
       } else {
         CheckedReadFileAtEOF(ReadPipeHandle());
diff --git a/external_imported/sentry-native/external/crashpad/handler/mac/crash_report_exception_handler.cc b/external_imported/sentry-native/external/crashpad/handler/mac/crash_report_exception_handler.cc
index 445046804..906dbad91 100644
--- a/external_imported/sentry-native/external/crashpad/handler/mac/crash_report_exception_handler.cc
+++ b/external_imported/sentry-native/external/crashpad/handler/mac/crash_report_exception_handler.cc
@@ -17,9 +17,9 @@
 #include <utility>
 #include <vector>
 
+#include "base/apple/mach_logging.h"
+#include "base/apple/scoped_mach_port.h"
 #include "base/logging.h"
-#include "base/mac/mach_logging.h"
-#include "base/mac/scoped_mach_port.h"
 #include "base/strings/stringprintf.h"
 #include "client/settings.h"
 #include "handler/mac/file_limit_annotation.h"
@@ -222,8 +222,8 @@ kern_return_t CrashReportExceptionHandler::CatchMachException(
     // processes that haven’t actually crashed, and could result in reports not
     // actually associated with crashes being sent to the operating system
     // vendor.
-    base::mac::ScopedMachSendRight
-        system_crash_reporter_handler(SystemCrashReporterHandler());
+    base::apple::ScopedMachSendRight system_crash_reporter_handler(
+        SystemCrashReporterHandler());
     if (system_crash_reporter_handler.get()) {
       // Make copies of mutable out parameters so that the system crash reporter
       // can’t influence the state returned by this method.
diff --git a/external_imported/sentry-native/external/crashpad/handler/mac/exception_handler_server.cc b/external_imported/sentry-native/external/crashpad/handler/mac/exception_handler_server.cc
index 0e7f505c0..5c1814c8c 100644
--- a/external_imported/sentry-native/external/crashpad/handler/mac/exception_handler_server.cc
+++ b/external_imported/sentry-native/external/crashpad/handler/mac/exception_handler_server.cc
@@ -16,8 +16,9 @@
 
 #include <utility>
 
+#include "base/apple/mach_logging.h"
+#include "base/check.h"
 #include "base/logging.h"
-#include "base/mac/mach_logging.h"
 #include "util/mach/composite_mach_message_server.h"
 #include "util/mach/mach_extensions.h"
 #include "util/mach/mach_message.h"
@@ -73,7 +74,7 @@ class ExceptionHandlerServerRun : public UniversalMachExcServer::Interface,
                                           MACH_MSG_TYPE_MAKE_SEND_ONCE,
                                           &previous);
       MACH_CHECK(kr == KERN_SUCCESS, kr) << "mach_port_request_notification";
-      base::mac::ScopedMachSendRight previous_owner(previous);
+      base::apple::ScopedMachSendRight previous_owner(previous);
     }
 
     // A single CompositeMachMessageServer will dispatch both exception messages
@@ -84,7 +85,7 @@ class ExceptionHandlerServerRun : public UniversalMachExcServer::Interface,
     // from ever existing. Using distinct receive rights also allows the handler
     // methods to ensure that the messages they process were sent by a holder of
     // the proper send right.
-    base::mac::ScopedMachPortSet server_port_set(
+    base::apple::ScopedMachPortSet server_port_set(
         NewMachPort(MACH_PORT_RIGHT_PORT_SET));
     CHECK(server_port_set.is_valid());
 
@@ -192,7 +193,7 @@ class ExceptionHandlerServerRun : public UniversalMachExcServer::Interface,
 }  // namespace
 
 ExceptionHandlerServer::ExceptionHandlerServer(
-    base::mac::ScopedMachReceiveRight receive_port,
+    base::apple::ScopedMachReceiveRight receive_port,
     bool launchd)
     : receive_port_(std::move(receive_port)),
       notify_port_(NewMachPort(MACH_PORT_RIGHT_RECEIVE)),
diff --git a/external_imported/sentry-native/external/crashpad/handler/mac/exception_handler_server.h b/external_imported/sentry-native/external/crashpad/handler/mac/exception_handler_server.h
index 085ebd8a5..6d63a290d 100644
--- a/external_imported/sentry-native/external/crashpad/handler/mac/exception_handler_server.h
+++ b/external_imported/sentry-native/external/crashpad/handler/mac/exception_handler_server.h
@@ -17,7 +17,7 @@
 
 #include <mach/mach.h>
 
-#include "base/mac/scoped_mach_port.h"
+#include "base/apple/scoped_mach_port.h"
 #include "util/mach/exc_server_variants.h"
 
 namespace crashpad {
@@ -34,7 +34,7 @@ class ExceptionHandlerServer {
   //!     launchd. \a receive_port is not monitored for no-senders
   //!     notifications, and instead, Stop() must be called to provide a “quit�
   //!     signal.
-  ExceptionHandlerServer(base::mac::ScopedMachReceiveRight receive_port,
+  ExceptionHandlerServer(base::apple::ScopedMachReceiveRight receive_port,
                          bool launchd);
 
   ExceptionHandlerServer(const ExceptionHandlerServer&) = delete;
@@ -73,8 +73,8 @@ class ExceptionHandlerServer {
   void Stop();
 
  private:
-  base::mac::ScopedMachReceiveRight receive_port_;
-  base::mac::ScopedMachReceiveRight notify_port_;
+  base::apple::ScopedMachReceiveRight receive_port_;
+  base::apple::ScopedMachReceiveRight notify_port_;
   bool launchd_;
 };
 
diff --git a/external_imported/sentry-native/external/crashpad/handler/win/crash_report_exception_handler.cc b/external_imported/sentry-native/external/crashpad/handler/win/crash_report_exception_handler.cc
index eab593cd3..84979f100 100644
--- a/external_imported/sentry-native/external/crashpad/handler/win/crash_report_exception_handler.cc
+++ b/external_imported/sentry-native/external/crashpad/handler/win/crash_report_exception_handler.cc
@@ -115,7 +115,7 @@ unsigned int CrashReportExceptionHandler::ExceptionHandlerServerException(
     for (const auto& attachment : (*attachments_)) {
       FileReader file_reader;
       if (!file_reader.Open(attachment)) {
-        LOG(ERROR) << "attachment " << attachment.value().c_str()
+        LOG(ERROR) << "attachment " << attachment
                    << " couldn't be opened, skipping";
         continue;
       }
@@ -124,7 +124,7 @@ unsigned int CrashReportExceptionHandler::ExceptionHandlerServerException(
       FileWriter* file_writer =
           new_report->AddAttachment(base::WideToUTF8(filename.value()));
       if (file_writer == nullptr) {
-        LOG(ERROR) << "attachment " << filename.value().c_str()
+        LOG(ERROR) << "attachment " << filename
                    << " couldn't be created, skipping";
         continue;
       }
diff --git a/external_imported/sentry-native/external/crashpad/handler/win/crashy_test_program.cc b/external_imported/sentry-native/external/crashpad/handler/win/crashy_test_program.cc
index 658a22535..0929f3375 100644
--- a/external_imported/sentry-native/external/crashpad/handler/win/crashy_test_program.cc
+++ b/external_imported/sentry-native/external/crashpad/handler/win/crashy_test_program.cc
@@ -25,6 +25,7 @@
 #include <type_traits>
 #include <vector>
 
+#include "base/check.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "build/build_config.h"
diff --git a/external_imported/sentry-native/external/crashpad/handler/win/fastfail_test_program.cc b/external_imported/sentry-native/external/crashpad/handler/win/fastfail_test_program.cc
index 510ee56e7..f654119f8 100644
--- a/external_imported/sentry-native/external/crashpad/handler/win/fastfail_test_program.cc
+++ b/external_imported/sentry-native/external/crashpad/handler/win/fastfail_test_program.cc
@@ -14,6 +14,7 @@
 
 #include <string.h>
 
+#include "base/check.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "client/crashpad_client.h"
@@ -129,6 +130,10 @@ int CrashyMain(int argc, wchar_t* argv[]) {
     return EXIT_FAILURE;
   }
 
+  // Some versions of python call SetErrorMode() which extends to children, and
+  // prevents the WerFault infrastructure from running.
+  SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX);
+
   if (type == L"cf")
     CfgCrash();
   if (type == L"ff")
diff --git a/external_imported/sentry-native/external/crashpad/handler/win/hanging_program.cc b/external_imported/sentry-native/external/crashpad/handler/win/hanging_program.cc
index 2404bf30e..72f903f21 100644
--- a/external_imported/sentry-native/external/crashpad/handler/win/hanging_program.cc
+++ b/external_imported/sentry-native/external/crashpad/handler/win/hanging_program.cc
@@ -17,6 +17,7 @@
 
 #include <iterator>
 
+#include "base/check.h"
 #include "base/debug/alias.h"
 #include "base/logging.h"
 #include "base/notreached.h"
diff --git a/external_imported/sentry-native/external/crashpad/handler/win/heap_corrupting_program.cc b/external_imported/sentry-native/external/crashpad/handler/win/heap_corrupting_program.cc
new file mode 100644
index 000000000..8fe62f6ef
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/handler/win/heap_corrupting_program.cc
@@ -0,0 +1,96 @@
+// Copyright 2023 The Crashpad Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include <string.h>
+
+#include "base/check.h"
+#include "base/files/file_path.h"
+#include "base/logging.h"
+#include "client/crashpad_client.h"
+#include "util/misc/paths.h"
+
+#include <Windows.h>
+
+// We set up a program that crashes with a heap corruption exception.
+// STATUS_HEAP_CORRUPTION (0xC0000374 3221226356).
+namespace crashpad {
+namespace {
+
+void HeapCorruptionCrash() {
+  __try {
+    HANDLE heap = ::HeapCreate(0, 0, 0);
+    CHECK(heap);
+    CHECK(HeapSetInformation(
+        heap, HeapEnableTerminationOnCorruption, nullptr, 0));
+    void* addr = ::HeapAlloc(heap, 0, 0x1000);
+    CHECK(addr);
+    // Corrupt heap header.
+    char* addr_mutable = reinterpret_cast<char*>(addr);
+    memset(addr_mutable - sizeof(addr), 0xCC, sizeof(addr));
+
+    HeapFree(heap, 0, addr);
+    HeapDestroy(heap);
+  } __except (EXCEPTION_EXECUTE_HANDLER) {
+    // Heap corruption exception should never be caught.
+    CHECK(false);
+  }
+  // Should never reach here.
+  abort();
+}
+
+int CrashyMain(int argc, wchar_t* argv[]) {
+  static CrashpadClient* client = new crashpad::CrashpadClient();
+
+  if (argc == 2) {
+    // We call this from end_to_end_test.py.
+    if (!client->SetHandlerIPCPipe(argv[1])) {
+      LOG(ERROR) << "SetHandler";
+      return EXIT_FAILURE;
+    }
+  } else if (argc == 3) {
+    // This is helpful for debugging.
+    if (!client->StartHandler(base::FilePath(argv[1]),
+                              base::FilePath(argv[2]),
+                              base::FilePath(),
+                              std::string(),
+                              std::map<std::string, std::string>(),
+                              std::vector<std::string>(),
+                              false,
+                              true)) {
+      LOG(ERROR) << "StartHandler";
+      return EXIT_FAILURE;
+    }
+    // Got to have a handler & registration.
+    if (!client->WaitForHandlerStart(10000)) {
+      LOG(ERROR) << "Handler failed to start";
+      return EXIT_FAILURE;
+    }
+  } else {
+    fprintf(stderr, "Usage: %ls <server_pipe_name>\n", argv[0]);
+    fprintf(stderr, "       %ls <handler_path> <database_path>\n", argv[0]);
+    return EXIT_FAILURE;
+  }
+
+  HeapCorruptionCrash();
+
+  LOG(ERROR) << "Invalid type or exception failed.";
+  return EXIT_FAILURE;
+}
+
+}  // namespace
+}  // namespace crashpad
+
+int wmain(int argc, wchar_t* argv[]) {
+  return crashpad::CrashyMain(argc, argv);
+}
diff --git a/external_imported/sentry-native/external/crashpad/minidump/minidump_annotation_writer.cc b/external_imported/sentry-native/external/crashpad/minidump/minidump_annotation_writer.cc
index 1d6a49288..751dd013b 100644
--- a/external_imported/sentry-native/external/crashpad/minidump/minidump_annotation_writer.cc
+++ b/external_imported/sentry-native/external/crashpad/minidump/minidump_annotation_writer.cc
@@ -16,6 +16,7 @@
 
 #include <memory>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "util/file/file_writer.h"
 #include "util/numeric/safe_assignment.h"
diff --git a/external_imported/sentry-native/external/crashpad/minidump/minidump_byte_array_writer.cc b/external_imported/sentry-native/external/crashpad/minidump/minidump_byte_array_writer.cc
index 38ce1c7ef..b3c8aa9d1 100644
--- a/external_imported/sentry-native/external/crashpad/minidump/minidump_byte_array_writer.cc
+++ b/external_imported/sentry-native/external/crashpad/minidump/minidump_byte_array_writer.cc
@@ -14,6 +14,7 @@
 
 #include "minidump/minidump_byte_array_writer.h"
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "util/file/file_writer.h"
 #include "util/numeric/safe_assignment.h"
diff --git a/external_imported/sentry-native/external/crashpad/minidump/minidump_context.h b/external_imported/sentry-native/external/crashpad/minidump/minidump_context.h
index 30988d8cb..12413de02 100644
--- a/external_imported/sentry-native/external/crashpad/minidump/minidump_context.h
+++ b/external_imported/sentry-native/external/crashpad/minidump/minidump_context.h
@@ -637,6 +637,56 @@ struct MinidumpContextMIPS64 {
   uint64_t fir;
 };
 
+//! \brief 64-bit RISCV-specific flags for
+//! MinidumpContextRISCV64::context_flags.
+enum MinidumpContextRISCV64Flags : uint32_t {
+  //! \brief Identifies the context structure as RISCV64.
+  kMinidumpContextRISCV64 = 0x08000000,
+
+  //! \brief Indicates the validity of integer registers.
+  //!
+  //! Registers 'pc' and `x1`-`x31` are valid.
+  kMinidumpContextRISCV64Integer = kMinidumpContextRISCV64 | 0x00000001,
+
+  //! \brief Indicates the validity of floating point registers.
+  //!
+  //! Floating point registers `f0`-`f31` are valid.
+  kMinidumpContextRISCV64FloatingPoint = kMinidumpContextRISCV64 | 0x00000002,
+
+  //! \brief Indicates the validity of all registers.
+  kMinidumpContextRISCV64All = kMinidumpContextRISCV64Integer |
+                               kMinidumpContextRISCV64FloatingPoint,
+};
+
+//! \brief A 64-bit RISC-V CPU context (register state) carried in a minidump
+//! file.
+//!
+//! This structure is versioned. Increment |kVersion| when changing this
+//! structure.
+struct MinidumpContextRISCV64 {
+
+  //! \brief The structure’s currently-defined version number.
+  static constexpr uint32_t kVersion = 1;
+
+  //! \brief Indicates the validity of fields in this structure.
+  uint32_t context_flags;
+
+  //! \brief The structure’s version number.
+  uint32_t version;
+
+  //! \brief The program counter register.
+  uint64_t pc;
+
+  //! \brief The integer registers, x1 through x31.
+  uint64_t regs[31];
+
+  //! \brief The floating point registers.
+  uint64_t fpregs[32];
+
+  //! \brief The floating point control and status register.
+  uint32_t fcsr;
+};
+
 }  // namespace crashpad
 
 #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_
diff --git a/external_imported/sentry-native/external/crashpad/minidump/minidump_context_writer.cc b/external_imported/sentry-native/external/crashpad/minidump/minidump_context_writer.cc
index 5f741ed74..12942c184 100644
--- a/external_imported/sentry-native/external/crashpad/minidump/minidump_context_writer.cc
+++ b/external_imported/sentry-native/external/crashpad/minidump/minidump_context_writer.cc
@@ -19,6 +19,7 @@
 #include <stdint.h>
 #include <string.h>
 
+#include "base/check_op.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "build/build_config.h"
@@ -102,6 +103,13 @@ MinidumpContextWriter::CreateFromSnapshot(const CPUContext* context_snapshot) {
       break;
     }
 
+    case kCPUArchitectureRISCV64: {
+      context = std::make_unique<MinidumpContextRISCV64Writer>();
+      reinterpret_cast<MinidumpContextRISCV64Writer*>(context.get())
+          ->InitializeFromSnapshot(context_snapshot->riscv64);
+      break;
+    }
+
     default: {
       LOG(ERROR) << "unknown context architecture "
                  << context_snapshot->architecture;
@@ -359,7 +367,36 @@ size_t MinidumpContextAMD64Writer::ContextSize() const {
 
 bool MinidumpXSaveAMD64CetU::InitializeFromSnapshot(
     const CPUContextX86_64* context_snapshot) {
+#ifdef SENTRY_DISABLED
   DCHECK_EQ(context_snapshot->xstate.cet_u.cetmsr, 1ull);
+#else
+  // TODO(supervacuus): this DCHECK led to multiple user inquiries because it
+  //  ends up killing the crashpad_handler (when using a DEBUG build) which in
+  //  turn keeps the crashpad client waiting indefinitely.
+  //
+  //  It seems that crashpad devs put a DCHECK here because they already check
+  //  at the call-site that the CET_U flag is enabled in the XSAVE feature set.
+  //  However, that this flag is set, only means that the CET_U registers in
+  //  XSAVE are valid, not necessarily that the SH_STK_EN bit is set.
+  //
+  //  I couldn't find anything in the Intel (SDM 13.1) or AMD (PR 11.5.2,
+  //  18.11/12/13) CET/SS spec that would signal that SH_STK_EN(=cetmsr[0])
+  //  cannot be 0 at this point. Ideally, if SH_STK_EN is not set, then SSP
+  //  should be set to 0 too (which means both are in their initial state). But
+  //  even that should not lead to fatally exit the crashpad_handler (even in
+  //  DEBUG), but rather produce a log and result in something that can be
+  //  analysed in the backend.
+  //
+  //  Any validation based on these register contents must check SH_STK_EN
+  //  anyway or check SSP for !NULL and as a valid base like it is done here:
+  //  https://chromium.googlesource.com/crashpad/crashpad/+/6278690abe6ef0dda047e67dc1d0c49ce7af3811/snapshot/win/thread_snapshot_win.cc#130
+  if (!(context_snapshot->xstate.cet_u.cetmsr & 1ull)) {
+    LOG(WARNING) << "CET MSR enabled flag is not set ("
+                 << context_snapshot->xstate.cet_u.cetmsr
+                 << "); SSP = "
+                 << context_snapshot->xstate.cet_u.ssp;
+  }
+#endif
   cet_u_.cetmsr = context_snapshot->xstate.cet_u.cetmsr;
   cet_u_.ssp = context_snapshot->xstate.cet_u.ssp;
   return true;
@@ -556,4 +593,42 @@ size_t MinidumpContextMIPS64Writer::ContextSize() const {
   return sizeof(context_);
 }
 
+MinidumpContextRISCV64Writer::MinidumpContextRISCV64Writer()
+    : MinidumpContextWriter(), context_() {
+  context_.context_flags = kMinidumpContextRISCV64;
+  context_.version = MinidumpContextRISCV64::kVersion;
+}
+
+MinidumpContextRISCV64Writer::~MinidumpContextRISCV64Writer() = default;
+
+void MinidumpContextRISCV64Writer::InitializeFromSnapshot(
+    const CPUContextRISCV64* context_snapshot) {
+  DCHECK_EQ(state(), kStateMutable);
+  DCHECK_EQ(context_.context_flags, kMinidumpContextRISCV64);
+
+  context_.context_flags = kMinidumpContextRISCV64All;
+  context_.version = MinidumpContextRISCV64::kVersion;
+  context_.pc = context_snapshot->pc;
+
+  static_assert(sizeof(context_.regs) == sizeof(context_snapshot->regs),
+                "GPRs size mismatch");
+  memcpy(context_.regs, context_snapshot->regs, sizeof(context_.regs));
+
+  static_assert(sizeof(context_.fpregs) == sizeof(context_snapshot->fpregs),
+                "FPRs size mismatch");
+  memcpy(context_.fpregs, context_snapshot->fpregs, sizeof(context_.fpregs));
+  context_.fcsr = context_snapshot->fcsr;
+}
+
+bool MinidumpContextRISCV64Writer::WriteObject(
+    FileWriterInterface* file_writer) {
+  DCHECK_EQ(state(), kStateWritable);
+  return file_writer->Write(&context_, sizeof(context_));
+}
+
+size_t MinidumpContextRISCV64Writer::ContextSize() const {
+  DCHECK_GE(state(), kStateFrozen);
+  return sizeof(context_);
+}
+
 }  // namespace crashpad
diff --git a/external_imported/sentry-native/external/crashpad/minidump/minidump_context_writer.h b/external_imported/sentry-native/external/crashpad/minidump/minidump_context_writer.h
index 6660be437..8e39c6692 100644
--- a/external_imported/sentry-native/external/crashpad/minidump/minidump_context_writer.h
+++ b/external_imported/sentry-native/external/crashpad/minidump/minidump_context_writer.h
@@ -369,6 +369,50 @@ class MinidumpContextMIPS64Writer final : public MinidumpContextWriter {
   MinidumpContextMIPS64 context_;
 };
 
+//! \brief The writer for a MinidumpContextRISCV64 structure in a minidump file.
+class MinidumpContextRISCV64Writer final : public MinidumpContextWriter {
+ public:
+  MinidumpContextRISCV64Writer();
+
+  MinidumpContextRISCV64Writer(const MinidumpContextRISCV64Writer&) = delete;
+  MinidumpContextRISCV64Writer& operator=(const MinidumpContextRISCV64Writer&) =
+      delete;
+
+  ~MinidumpContextRISCV64Writer() override;
+
+  //! \brief Initializes the MinidumpContextRISCV64 based on \a
+  //! context_snapshot.
+  //!
+  //! \param[in] context_snapshot The context snapshot to use as source data.
+  //!
+  //! \note Valid in #kStateMutable. No mutation of context() may be done before
+  //!     calling this method, and it is not normally necessary to alter
+  //!     context() after calling this method.
+  void InitializeFromSnapshot(const CPUContextRISCV64* context_snapshot);
+
+  //! \brief Returns a pointer to the context structure that this object will
+  //!     write.
+  //!
+  //! \attention This returns a non-`const` pointer to this object’s private
+  //!     data so that a caller can populate the context structure directly.
+  //!     This is done because providing setter interfaces to each field in the
+  //!     context structure would be unwieldy and cumbersome. Care must be taken
+  //!     to populate the context structure correctly. The context structure
+  //!     must only be modified while this object is in the #kStateMutable
+  //!     state.
+  MinidumpContextRISCV64* context() { return &context_; }
+
+ protected:
+  // MinidumpWritable:
+  bool WriteObject(FileWriterInterface* file_writer) override;
+
+  // MinidumpContextWriter:
+  size_t ContextSize() const override;
+
+ private:
+  MinidumpContextRISCV64 context_;
+};
+
 }  // namespace crashpad
 
 #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_
diff --git a/external_imported/sentry-native/external/crashpad/minidump/minidump_context_writer_test.cc b/external_imported/sentry-native/external/crashpad/minidump/minidump_context_writer_test.cc
index e2a04d1dc..9eebe81b2 100644
--- a/external_imported/sentry-native/external/crashpad/minidump/minidump_context_writer_test.cc
+++ b/external_imported/sentry-native/external/crashpad/minidump/minidump_context_writer_test.cc
@@ -143,6 +143,49 @@ TYPED_TEST(MinidumpContextWriter, MinidumpContextAMD64Writer) {
   }
 }
 
+TYPED_TEST(MinidumpContextWriter, MinidumpContextRISCV64Writer) {
+  {
+    // Make sure that a heap-allocated context writer has the proper alignment,
+    // because it may be nonstandard.
+    auto context_writer = std::make_unique<MinidumpContextRISCV64Writer>();
+    EXPECT_EQ(reinterpret_cast<uintptr_t>(context_writer.get()) &
+                  (alignof(MinidumpContextRISCV64Writer) - 1),
+              0u);
+  }
+
+  StringFile string_file;
+
+  {
+    // Make sure that a context writer that’s untouched writes a zeroed-out
+    // context.
+    SCOPED_TRACE("zero");
+
+    EmptyContextTest<MinidumpContextRISCV64Writer,
+                     MinidumpContextRISCV64,
+                     TypeParam>(ExpectMinidumpContextRISCV64);
+  }
+
+  {
+    SCOPED_TRACE("nonzero");
+
+    string_file.Reset();
+    constexpr uint32_t kSeed = 0x808664;
+
+    MinidumpContextRISCV64Writer context_writer;
+    InitializeMinidumpContextRISCV64(context_writer.context(), kSeed);
+
+    EXPECT_TRUE(context_writer.WriteEverything(&string_file));
+    ASSERT_EQ(string_file.string().size(), sizeof(MinidumpContextRISCV64));
+
+    const MinidumpContextRISCV64* observed =
+        MinidumpWritableAtRVA<MinidumpContextRISCV64>(string_file.string(),
+                                                      TypeParam(0));
+    ASSERT_TRUE(observed);
+
+    ExpectMinidumpContextRISCV64(kSeed, observed, false);
+  }
+}
+
 template <typename Writer, typename Context, typename RVAType>
 void FromSnapshotTest(const CPUContext& snapshot_context,
                       void (*expect_context)(uint32_t, const Context*, bool),
@@ -268,6 +311,23 @@ TYPED_TEST(MinidumpContextWriter, MIPS64_FromSnapshot) {
                    TypeParam>(context, ExpectMinidumpContextMIPS64, kSeed);
 }
 
+TYPED_TEST(MinidumpContextWriter, RISCV64_Zeros) {
+  EmptyContextTest<MinidumpContextRISCV64Writer,
+                   MinidumpContextRISCV64,
+                   TypeParam>(ExpectMinidumpContextRISCV64);
+}
+
+TYPED_TEST(MinidumpContextWriter, RISCV64_FromSnapshot) {
+  constexpr uint32_t kSeed = 64;
+  CPUContextRISCV64 context_riscv64;
+  CPUContext context;
+  context.riscv64 = &context_riscv64;
+  InitializeCPUContextRISCV64(&context, kSeed);
+  FromSnapshotTest<MinidumpContextRISCV64Writer,
+                   MinidumpContextRISCV64,
+                   TypeParam>(context, ExpectMinidumpContextRISCV64, kSeed);
+}
+
 }  // namespace
 }  // namespace test
 }  // namespace crashpad
diff --git a/external_imported/sentry-native/external/crashpad/minidump/minidump_crashpad_info_writer_test.cc b/external_imported/sentry-native/external/crashpad/minidump/minidump_crashpad_info_writer_test.cc
index 39c791c2e..d01655d84 100644
--- a/external_imported/sentry-native/external/crashpad/minidump/minidump_crashpad_info_writer_test.cc
+++ b/external_imported/sentry-native/external/crashpad/minidump/minidump_crashpad_info_writer_test.cc
@@ -148,8 +148,17 @@ TEST(MinidumpCrashpadInfoWriter, AddressMask) {
   ASSERT_TRUE(empty_client_id.InitializeFromString(
       "00000000-0000-0000-0000-000000000000"));
 
+  // Copy address_mask into a local variable because
+  // |MinidumpCrashpadInfo::address_mask| requires 8-byte alignment but the
+  // struct itself is 4-byte aligned.
+  const auto address_mask = [&crashpad_info] {
+    uint64_t data = 0;
+    memcpy(&data, &crashpad_info->address_mask, sizeof(data));
+    return data;
+  }();
+
   EXPECT_EQ(crashpad_info->version, MinidumpCrashpadInfo::kVersion);
-  EXPECT_EQ(crashpad_info->address_mask, mask);
+  EXPECT_EQ(address_mask, mask);
   EXPECT_EQ(crashpad_info->report_id, empty_report_id);
   EXPECT_EQ(crashpad_info->client_id, empty_client_id);
   EXPECT_FALSE(simple_annotations);
@@ -172,7 +181,16 @@ TEST(MinidumpCrashpadInfoWriter, EmptyAddressMask) {
   ASSERT_NO_FATAL_FAILURE(GetCrashpadInfoStream(
       string_file.string(), &crashpad_info, &simple_annotations, &module_list));
 
-  EXPECT_EQ(crashpad_info->address_mask, 0UL);
+  // Copy address_mask into a local variable because
+  // |MinidumpCrashpadInfo::address_mask| requires 8-byte alignment but the
+  // struct itself is 4-byte aligned.
+  const auto address_mask = [&crashpad_info] {
+    uint64_t data = 0;
+    memcpy(&data, &crashpad_info->address_mask, sizeof(data));
+    return data;
+  }();
+
+  EXPECT_EQ(address_mask, 0UL);
 }
 
 TEST(MinidumpCrashpadInfoWriter, SimpleAnnotations) {
diff --git a/external_imported/sentry-native/external/crashpad/minidump/minidump_extensions.h b/external_imported/sentry-native/external/crashpad/minidump/minidump_extensions.h
index 951ada395..2ca262f32 100644
--- a/external_imported/sentry-native/external/crashpad/minidump/minidump_extensions.h
+++ b/external_imported/sentry-native/external/crashpad/minidump/minidump_extensions.h
@@ -218,6 +218,9 @@ enum MinidumpCPUArchitecture : uint16_t {
   //! \deprecated Use #kMinidumpCPUArchitectureARM64 instead.
   kMinidumpCPUArchitectureARM64Breakpad = 0x8003,
 
+  //! \brief Used by Breakpad for 64-bit RISC-V.
+  kMinidumpCPUArchitectureRISCV64Breakpad = 0x8006,
+
   //! \brief Unknown CPU architecture.
   kMinidumpCPUArchitectureUnknown = PROCESSOR_ARCHITECTURE_UNKNOWN,
 };
diff --git a/external_imported/sentry-native/external/crashpad/minidump/minidump_file_writer.cc b/external_imported/sentry-native/external/crashpad/minidump/minidump_file_writer.cc
index a9f360a18..29a9e5f0e 100644
--- a/external_imported/sentry-native/external/crashpad/minidump/minidump_file_writer.cc
+++ b/external_imported/sentry-native/external/crashpad/minidump/minidump_file_writer.cc
@@ -16,6 +16,7 @@
 
 #include <utility>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "minidump/minidump_crashpad_info_writer.h"
 #include "minidump/minidump_exception_writer.h"
diff --git a/external_imported/sentry-native/external/crashpad/minidump/minidump_handle_writer.cc b/external_imported/sentry-native/external/crashpad/minidump/minidump_handle_writer.cc
index bed4f1008..72f1b1965 100644
--- a/external_imported/sentry-native/external/crashpad/minidump/minidump_handle_writer.cc
+++ b/external_imported/sentry-native/external/crashpad/minidump/minidump_handle_writer.cc
@@ -16,6 +16,7 @@
 
 #include <string>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "minidump/minidump_extensions.h"
 #include "util/file/file_writer.h"
diff --git a/external_imported/sentry-native/external/crashpad/minidump/minidump_memory_writer.cc b/external_imported/sentry-native/external/crashpad/minidump/minidump_memory_writer.cc
index f52e6a4cb..dd6c91aef 100644
--- a/external_imported/sentry-native/external/crashpad/minidump/minidump_memory_writer.cc
+++ b/external_imported/sentry-native/external/crashpad/minidump/minidump_memory_writer.cc
@@ -19,6 +19,7 @@
 #include <utility>
 
 #include "base/auto_reset.h"
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "util/file/file_writer.h"
 #include "util/numeric/safe_assignment.h"
diff --git a/external_imported/sentry-native/external/crashpad/minidump/minidump_misc_info_writer.cc b/external_imported/sentry-native/external/crashpad/minidump/minidump_misc_info_writer.cc
index 133ae3086..1abb46c31 100644
--- a/external_imported/sentry-native/external/crashpad/minidump/minidump_misc_info_writer.cc
+++ b/external_imported/sentry-native/external/crashpad/minidump/minidump_misc_info_writer.cc
@@ -175,6 +175,8 @@ std::string MinidumpMiscInfoDebugBuildString() {
   static constexpr char kCPU[] = "mips";
 #elif defined(ARCH_CPU_MIPS64EL)
   static constexpr char kCPU[] = "mips64";
+#elif defined(ARCH_CPU_RISCV64)
+  static constexpr char kCPU[] = "riscv64";
 #else
 #error define kCPU for this CPU
 #endif
diff --git a/external_imported/sentry-native/external/crashpad/minidump/minidump_misc_info_writer.h b/external_imported/sentry-native/external/crashpad/minidump/minidump_misc_info_writer.h
index d355433d3..6e3bb45a1 100644
--- a/external_imported/sentry-native/external/crashpad/minidump/minidump_misc_info_writer.h
+++ b/external_imported/sentry-native/external/crashpad/minidump/minidump_misc_info_writer.h
@@ -145,7 +145,7 @@ class MinidumpMiscInfoWriter final : public internal::MinidumpStreamWriter {
 
 //! \brief Conversion functions from a native UTF16 C-string to a char16_t
 //!     C-string. No-op where the native UTF16 string is std::u16string.
-#if defined(WCHAR_T_IS_UTF16) || DOXYGEN
+#if defined(WCHAR_T_IS_16_BIT) || DOXYGEN
 inline const char16_t* AsU16CStr(const wchar_t* str) {
   return reinterpret_cast<const char16_t*>(str);
 }
diff --git a/external_imported/sentry-native/external/crashpad/minidump/minidump_misc_info_writer_test.cc b/external_imported/sentry-native/external/crashpad/minidump/minidump_misc_info_writer_test.cc
index 970c33382..ff132b901 100644
--- a/external_imported/sentry-native/external/crashpad/minidump/minidump_misc_info_writer_test.cc
+++ b/external_imported/sentry-native/external/crashpad/minidump/minidump_misc_info_writer_test.cc
@@ -178,8 +178,11 @@ void ExpectMiscInfoEqual<MINIDUMP_MISC_INFO_5>(
             expected_misc_info.XStateData.SizeOfInfo);
   EXPECT_EQ(observed_misc_info.XStateData.ContextSize,
             expected_misc_info.XStateData.ContextSize);
-  EXPECT_EQ(observed_misc_info.XStateData.EnabledFeatures,
-            expected_misc_info.XStateData.EnabledFeatures);
+  // `EnabledFeatures` is underaligned and `EXPECT_EQ` internally takes
+  // arguments by reference. Copy it into a temporary before comparing to avoid
+  // undefined behavior.
+  EXPECT_EQ(uint64_t{observed_misc_info.XStateData.EnabledFeatures},
+            uint64_t{expected_misc_info.XStateData.EnabledFeatures});
   for (size_t feature_index = 0;
        feature_index < std::size(observed_misc_info.XStateData.Features);
        ++feature_index) {
diff --git a/external_imported/sentry-native/external/crashpad/minidump/minidump_module_crashpad_info_writer.cc b/external_imported/sentry-native/external/crashpad/minidump/minidump_module_crashpad_info_writer.cc
index 456f4bd4a..7f3dcda90 100644
--- a/external_imported/sentry-native/external/crashpad/minidump/minidump_module_crashpad_info_writer.cc
+++ b/external_imported/sentry-native/external/crashpad/minidump/minidump_module_crashpad_info_writer.cc
@@ -16,6 +16,7 @@
 
 #include <utility>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "minidump/minidump_annotation_writer.h"
 #include "minidump/minidump_simple_string_dictionary_writer.h"
diff --git a/external_imported/sentry-native/external/crashpad/minidump/minidump_module_writer.cc b/external_imported/sentry-native/external/crashpad/minidump/minidump_module_writer.cc
index 237fee0db..1287a6de6 100644
--- a/external_imported/sentry-native/external/crashpad/minidump/minidump_module_writer.cc
+++ b/external_imported/sentry-native/external/crashpad/minidump/minidump_module_writer.cc
@@ -19,6 +19,7 @@
 #include <limits>
 #include <utility>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "minidump/minidump_string_writer.h"
diff --git a/external_imported/sentry-native/external/crashpad/minidump/minidump_rva_list_writer.cc b/external_imported/sentry-native/external/crashpad/minidump/minidump_rva_list_writer.cc
index 77e10d47b..3a1ee8e8d 100644
--- a/external_imported/sentry-native/external/crashpad/minidump/minidump_rva_list_writer.cc
+++ b/external_imported/sentry-native/external/crashpad/minidump/minidump_rva_list_writer.cc
@@ -16,6 +16,7 @@
 
 #include <utility>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "util/file/file_writer.h"
 #include "util/numeric/safe_assignment.h"
diff --git a/external_imported/sentry-native/external/crashpad/minidump/minidump_simple_string_dictionary_writer.cc b/external_imported/sentry-native/external/crashpad/minidump/minidump_simple_string_dictionary_writer.cc
index f4c9011c0..cb25098b8 100644
--- a/external_imported/sentry-native/external/crashpad/minidump/minidump_simple_string_dictionary_writer.cc
+++ b/external_imported/sentry-native/external/crashpad/minidump/minidump_simple_string_dictionary_writer.cc
@@ -16,6 +16,7 @@
 
 #include <utility>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "util/file/file_writer.h"
 #include "util/numeric/safe_assignment.h"
diff --git a/external_imported/sentry-native/external/crashpad/minidump/minidump_stacktrace_writer.cc b/external_imported/sentry-native/external/crashpad/minidump/minidump_stacktrace_writer.cc
index 74724ca77..10388c320 100644
--- a/external_imported/sentry-native/external/crashpad/minidump/minidump_stacktrace_writer.cc
+++ b/external_imported/sentry-native/external/crashpad/minidump/minidump_stacktrace_writer.cc
@@ -6,6 +6,7 @@
 #include <limits>
 #include <utility>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "snapshot/exception_snapshot.h"
 #include "snapshot/thread_snapshot.h"
diff --git a/external_imported/sentry-native/external/crashpad/minidump/minidump_string_writer.cc b/external_imported/sentry-native/external/crashpad/minidump/minidump_string_writer.cc
index ea7856abd..0b0a3e86e 100644
--- a/external_imported/sentry-native/external/crashpad/minidump/minidump_string_writer.cc
+++ b/external_imported/sentry-native/external/crashpad/minidump/minidump_string_writer.cc
@@ -16,6 +16,7 @@
 
 #include <utility>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "minidump/minidump_writer_util.h"
 #include "util/file/file_writer.h"
diff --git a/external_imported/sentry-native/external/crashpad/minidump/minidump_system_info_writer.cc b/external_imported/sentry-native/external/crashpad/minidump/minidump_system_info_writer.cc
index 4468c41af..e2ab775ae 100644
--- a/external_imported/sentry-native/external/crashpad/minidump/minidump_system_info_writer.cc
+++ b/external_imported/sentry-native/external/crashpad/minidump/minidump_system_info_writer.cc
@@ -132,6 +132,9 @@ void MinidumpSystemInfoWriter::InitializeFromSnapshot(
     case kCPUArchitectureARM64:
       cpu_architecture = kMinidumpCPUArchitectureARM64;
       break;
+    case kCPUArchitectureRISCV64:
+      cpu_architecture = kMinidumpCPUArchitectureRISCV64Breakpad;
+      break;
     default:
       NOTREACHED();
       cpu_architecture = kMinidumpCPUArchitectureUnknown;
diff --git a/external_imported/sentry-native/external/crashpad/minidump/minidump_thread_name_list_writer.cc b/external_imported/sentry-native/external/crashpad/minidump/minidump_thread_name_list_writer.cc
index 5679b8112..aba496a5b 100644
--- a/external_imported/sentry-native/external/crashpad/minidump/minidump_thread_name_list_writer.cc
+++ b/external_imported/sentry-native/external/crashpad/minidump/minidump_thread_name_list_writer.cc
@@ -16,6 +16,7 @@
 
 #include <utility>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "minidump/minidump_thread_id_map.h"
 #include "snapshot/thread_snapshot.h"
diff --git a/external_imported/sentry-native/external/crashpad/minidump/minidump_thread_writer.cc b/external_imported/sentry-native/external/crashpad/minidump/minidump_thread_writer.cc
index 02870f6e1..b7aa889a6 100644
--- a/external_imported/sentry-native/external/crashpad/minidump/minidump_thread_writer.cc
+++ b/external_imported/sentry-native/external/crashpad/minidump/minidump_thread_writer.cc
@@ -16,6 +16,7 @@
 
 #include <utility>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "minidump/minidump_context_writer.h"
 #include "minidump/minidump_memory_writer.h"
diff --git a/external_imported/sentry-native/external/crashpad/minidump/minidump_unloaded_module_writer.cc b/external_imported/sentry-native/external/crashpad/minidump/minidump_unloaded_module_writer.cc
index 3f1c8e5db..c7bf3452b 100644
--- a/external_imported/sentry-native/external/crashpad/minidump/minidump_unloaded_module_writer.cc
+++ b/external_imported/sentry-native/external/crashpad/minidump/minidump_unloaded_module_writer.cc
@@ -17,6 +17,7 @@
 #include <limits>
 #include <utility>
 
+#include "base/check_op.h"
 #include "minidump/minidump_writer_util.h"
 #include "util/file/file_writer.h"
 #include "util/numeric/in_range_cast.h"
diff --git a/external_imported/sentry-native/external/crashpad/minidump/minidump_writable.cc b/external_imported/sentry-native/external/crashpad/minidump/minidump_writable.cc
index cb23b3ff1..c0badd72e 100644
--- a/external_imported/sentry-native/external/crashpad/minidump/minidump_writable.cc
+++ b/external_imported/sentry-native/external/crashpad/minidump/minidump_writable.cc
@@ -18,6 +18,7 @@
 
 #include <iterator>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "util/file/file_writer.h"
 #include "util/numeric/safe_assignment.h"
diff --git a/external_imported/sentry-native/external/crashpad/minidump/test/minidump_context_test_util.cc b/external_imported/sentry-native/external/crashpad/minidump/test/minidump_context_test_util.cc
index 5746e4c30..b40558cf2 100644
--- a/external_imported/sentry-native/external/crashpad/minidump/test/minidump_context_test_util.cc
+++ b/external_imported/sentry-native/external/crashpad/minidump/test/minidump_context_test_util.cc
@@ -272,6 +272,31 @@ void InitializeMinidumpContextMIPS64(MinidumpContextMIPS64* context,
   context->dsp_control = value++;
 }
 
+void InitializeMinidumpContextRISCV64(MinidumpContextRISCV64* context,
+                                      uint32_t seed) {
+  if (seed == 0) {
+    memset(context, 0, sizeof(*context));
+    context->context_flags = kMinidumpContextRISCV64;
+    context->version = MinidumpContextRISCV64::kVersion;
+    return;
+  }
+
+  context->context_flags = kMinidumpContextRISCV64All;
+  context->version = MinidumpContextRISCV64::kVersion;
+
+  uint32_t value = seed;
+
+  context->pc = value++;
+  for (size_t index = 0; index < std::size(context->regs); ++index) {
+    context->regs[index] = value++;
+  }
+
+  for (size_t index = 0; index < std::size(context->fpregs); ++index) {
+    context->fpregs[index] = value++;
+  }
+  context->fcsr = value++;
+}
+
 namespace {
 
 // Using Google Test assertions, compares |expected| to |observed|. This is
@@ -601,5 +626,24 @@ void ExpectMinidumpContextMIPS64(uint32_t expect_seed,
   EXPECT_EQ(observed->dsp_control, expected.dsp_control);
 }
 
+void ExpectMinidumpContextRISCV64(uint32_t expect_seed,
+                                  const MinidumpContextRISCV64* observed,
+                                  bool snapshot) {
+  MinidumpContextRISCV64 expected;
+  InitializeMinidumpContextRISCV64(&expected, expect_seed);
+
+  EXPECT_EQ(observed->context_flags, expected.context_flags);
+  EXPECT_EQ(observed->version, expected.version);
+
+  for (size_t index = 0; index < std::size(expected.regs); ++index) {
+    EXPECT_EQ(observed->regs[index], expected.regs[index]);
+  }
+
+  for (size_t index = 0; index < std::size(expected.fpregs); ++index) {
+    EXPECT_EQ(observed->fpregs[index], expected.fpregs[index]);
+  }
+  EXPECT_EQ(observed->fcsr, expected.fcsr);
+}
+
 }  // namespace test
 }  // namespace crashpad
diff --git a/external_imported/sentry-native/external/crashpad/minidump/test/minidump_context_test_util.h b/external_imported/sentry-native/external/crashpad/minidump/test/minidump_context_test_util.h
index 793e2c39c..4ce5c1e1c 100644
--- a/external_imported/sentry-native/external/crashpad/minidump/test/minidump_context_test_util.h
+++ b/external_imported/sentry-native/external/crashpad/minidump/test/minidump_context_test_util.h
@@ -47,6 +47,8 @@ void InitializeMinidumpContextARM64(MinidumpContextARM64* context,
 void InitializeMinidumpContextMIPS(MinidumpContextMIPS* context, uint32_t seed);
 void InitializeMinidumpContextMIPS64(MinidumpContextMIPS* context,
                                      uint32_t seed);
+void InitializeMinidumpContextRISCV64(MinidumpContextRISCV64* context,
+                                      uint32_t seed);
 //! \}
 
 //! \brief Verifies, via Google Test assertions, that a context structure
@@ -85,6 +87,9 @@ void ExpectMinidumpContextMIPS(uint32_t expect_seed,
 void ExpectMinidumpContextMIPS64(uint32_t expect_seed,
                                  const MinidumpContextMIPS64* observed,
                                  bool snapshot);
+void ExpectMinidumpContextRISCV64(uint32_t expect_seed,
+                                  const MinidumpContextRISCV64* observed,
+                                  bool snapshot);
 //! \}
 
 }  // namespace test
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/BUILD.gn b/external_imported/sentry-native/external/crashpad/snapshot/BUILD.gn
index 9ffdb47bc..a364f9561 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/BUILD.gn
+++ b/external_imported/sentry-native/external/crashpad/snapshot/BUILD.gn
@@ -493,6 +493,7 @@ bundle_data("snapshot_test_ios_data") {
     "ios/testdata/crash-1fa088dda0adb41459d063078a0f384a0bb8eefa",
     "ios/testdata/crash-5726011582644224",
     "ios/testdata/crash-6605504629637120",
+    "ios/testdata/crash-c44acfcbccd8c7a8",
   ]
 
   outputs = [ "{{bundle_resources_dir}}/crashpad_test_data/" +
@@ -565,7 +566,7 @@ if ((crashpad_is_linux || crashpad_is_android || crashpad_is_fuchsia) &&
   }
 }
 
-if (crashpad_is_mac || crashpad_is_ios) {
+if (crashpad_is_apple) {
   crashpad_loadable_module("crashpad_snapshot_test_module_crashy_initializer") {
     testonly = true
     sources = [
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/capture_memory.cc b/external_imported/sentry-native/external/crashpad/snapshot/capture_memory.cc
index 0a465d22f..c1c6fba58 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/capture_memory.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/capture_memory.cc
@@ -117,6 +117,11 @@ void CaptureMemory::PointedToByContext(const CPUContext& context,
   for (size_t i = 0; i < std::size(context.mipsel->regs); ++i) {
     MaybeCaptureMemoryAround(delegate, context.mipsel->regs[i]);
   }
+#elif defined(ARCH_CPU_RISCV64)
+  MaybeCaptureMemoryAround(delegate, context.riscv64->pc);
+  for (size_t i = 0; i < std::size(context.riscv64->regs); ++i) {
+    MaybeCaptureMemoryAround(delegate, context.riscv64->regs[i]);
+  }
 #else
 #error Port.
 #endif
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/cpu_architecture.h b/external_imported/sentry-native/external/crashpad/snapshot/cpu_architecture.h
index 4003a9290..26d45f841 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/cpu_architecture.h
+++ b/external_imported/sentry-native/external/crashpad/snapshot/cpu_architecture.h
@@ -43,7 +43,10 @@ enum CPUArchitecture {
   kCPUArchitectureMIPSEL,
 
   //! \brief 64-bit MIPSEL.
-  kCPUArchitectureMIPS64EL
+  kCPUArchitectureMIPS64EL,
+
+  //! \brief 64-bit RISC-V.
+  kCPUArchitectureRISCV64,
 };
 
 }  // namespace crashpad
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/cpu_context.cc b/external_imported/sentry-native/external/crashpad/snapshot/cpu_context.cc
index 6eaa853fd..492a0f7f9 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/cpu_context.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/cpu_context.cc
@@ -20,6 +20,7 @@
 #include <iterator>
 
 #include "base/notreached.h"
+#include "cpu_architecture.h"
 #include "util/misc/arraysize.h"
 #include "util/misc/implicit_cast.h"
 
@@ -170,6 +171,8 @@ uint64_t CPUContext::InstructionPointer() const {
       return arm->pc;
     case kCPUArchitectureARM64:
       return arm64->pc;
+    case kCPUArchitectureRISCV64:
+      return riscv64->pc;
     default:
       NOTREACHED();
       return ~0ull;
@@ -186,6 +189,8 @@ uint64_t CPUContext::StackPointer() const {
       return arm->sp;
     case kCPUArchitectureARM64:
       return arm64->sp;
+    case kCPUArchitectureRISCV64:
+      return riscv64->regs[1];
     default:
       NOTREACHED();
       return ~0ull;
@@ -226,6 +231,7 @@ bool CPUContext::Is64Bit() const {
     case kCPUArchitectureX86_64:
     case kCPUArchitectureARM64:
     case kCPUArchitectureMIPS64EL:
+    case kCPUArchitectureRISCV64:
       return true;
     case kCPUArchitectureX86:
     case kCPUArchitectureARM:
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/cpu_context.h b/external_imported/sentry-native/external/crashpad/snapshot/cpu_context.h
index 7bc252be1..c3640c328 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/cpu_context.h
+++ b/external_imported/sentry-native/external/crashpad/snapshot/cpu_context.h
@@ -362,6 +362,15 @@ struct CPUContextMIPS64 {
   uint64_t fir;
 };
 
+//! \brief A context structure carrying RISCV64 CPU state.
+struct CPUContextRISCV64 {
+  uint64_t pc;
+  uint64_t regs[31];
+
+  uint64_t fpregs[32];
+  uint32_t fcsr;
+};
+
 //! \brief A context structure capable of carrying the context of any supported
 //!     CPU architecture.
 struct CPUContext {
@@ -402,6 +411,7 @@ struct CPUContext {
     CPUContextARM64* arm64;
     CPUContextMIPS* mipsel;
     CPUContextMIPS64* mips64;
+    CPUContextRISCV64* riscv64;
   };
 };
 
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/crashpad_info_client_options_test.cc b/external_imported/sentry-native/external/crashpad/snapshot/crashpad_info_client_options_test.cc
index bc0979028..005dfd590 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/crashpad_info_client_options_test.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/crashpad_info_client_options_test.cc
@@ -241,6 +241,22 @@ TEST(CrashpadInfoClientOptions, TwoModules) {
 class CrashpadInfoSizes_ClientOptions
     : public testing::TestWithParam<base::FilePath::StringType> {};
 
+// UBSan detects a function type mismatch when calling
+// TestModule_GetCrashpadInfo since the expected function signature should
+// return a CrashpadInfo* but the actual TestModule_GetCrashpadInfo defined for
+// the test returns a TestCrashpadInfo*. CrashpadInfo is a struct with its
+// members set as private and TestCrashpadInfo is a POD meant to replicate the
+// layout of CrashpadInfo byte-for-byte. Note this is intentional since the
+// whole point of the test is to exercise the snapshot reader’s ability to
+// handle CrashpadInfo.
+#if defined(__clang__)
+[[clang::no_sanitize("function")]]
+#endif
+inline CrashpadInfo*
+CallGetCrashpadInfo(CrashpadInfo* (*func)()) {
+  return func();
+}
+
 TEST_P(CrashpadInfoSizes_ClientOptions, DifferentlySizedStruct) {
   base::FilePath::StringType artifact(FILE_PATH_LITERAL("module_"));
   artifact += GetParam();
@@ -279,7 +295,8 @@ TEST_P(CrashpadInfoSizes_ClientOptions, DifferentlySizedStruct) {
   EXPECT_EQ(options.gather_indirectly_referenced_memory, TriState::kUnset);
 
   // Get the remote CrashpadInfo structure.
-  CrashpadInfo* remote_crashpad_info = TestModule_GetCrashpadInfo();
+  CrashpadInfo* remote_crashpad_info =
+      CallGetCrashpadInfo(TestModule_GetCrashpadInfo);
   ASSERT_TRUE(remote_crashpad_info);
 
   {
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/elf/elf_image_reader.cc b/external_imported/sentry-native/external/crashpad/snapshot/elf/elf_image_reader.cc
index 30e8b987c..b0340e5fb 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/elf/elf_image_reader.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/elf/elf_image_reader.cc
@@ -21,6 +21,7 @@
 #include <utility>
 #include <vector>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "base/numerics/safe_math.h"
 #include "build/build_config.h"
@@ -733,8 +734,11 @@ bool ElfImageReader::GetAddressFromDynamicArray(uint64_t tag,
   if (!dynamic_array_->GetValue(tag, log, address)) {
     return false;
   }
-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
-  // The GNU loader updates the dynamic array according to the load bias.
+
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
+    (defined(__GLIBC__) && defined(ARCH_CPU_RISCV64))
+  // The GNU loader updates the dynamic array according to the load bias (except
+  // for RISC-V: https://sourceware.org/bugzilla/show_bug.cgi?id=24484).
   // The Android and Fuchsia loaders only update the debug address.
   if (tag != DT_DEBUG) {
     *address += GetLoadBias();
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/cpu_context_fuchsia.cc b/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/cpu_context_fuchsia.cc
index 8c907cb9e..989bc463b 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/cpu_context_fuchsia.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/cpu_context_fuchsia.cc
@@ -21,8 +21,9 @@ namespace internal {
 
 #if defined(ARCH_CPU_X86_64)
 
-void InitializeCPUContextX86_64_NoFloatingPoint(
+void InitializeCPUContextX86_64(
     const zx_thread_state_general_regs_t& thread_context,
+    const zx_thread_state_fp_regs_t& float_context,
     CPUContextX86_64* context) {
   memset(context, 0, sizeof(*context));
   context->rax = thread_context.rax;
@@ -43,6 +44,19 @@ void InitializeCPUContextX86_64_NoFloatingPoint(
   context->r15 = thread_context.r15;
   context->rip = thread_context.rip;
   context->rflags = thread_context.rflags;
+
+  context->fxsave.fcw = float_context.fcw;
+  context->fxsave.fsw = float_context.fsw;
+  context->fxsave.ftw = float_context.ftw;
+  context->fxsave.fop = float_context.fop;
+  context->fxsave.fpu_ip_64 = float_context.fip;
+  context->fxsave.fpu_dp_64 = float_context.fdp;
+
+  for (size_t i = 0; i < std::size(float_context.st); ++i) {
+    memcpy(&context->fxsave.st_mm[i],
+           &float_context.st[i],
+           sizeof(float_context.st[i]));
+  }
 }
 
 #elif defined(ARCH_CPU_ARM64)
@@ -89,6 +103,52 @@ void InitializeCPUContextARM64(
   memcpy(&context->fpsimd, &vector_context.v, sizeof(vector_context.v));
 }
 
+#elif defined(ARCH_CPU_RISCV64)
+
+void InitializeCPUContextRISCV64(
+    const zx_thread_state_general_regs_t& thread_context,
+    const zx_thread_state_fp_regs_t& float_context,
+    CPUContextRISCV64* context) {
+  context->pc = thread_context.pc;
+  context->regs[0] = thread_context.ra;
+  context->regs[1] = thread_context.sp;
+  context->regs[2] = thread_context.gp;
+  context->regs[3] = thread_context.tp;
+  context->regs[4] = thread_context.t0;
+  context->regs[5] = thread_context.t1;
+  context->regs[6] = thread_context.t2;
+  context->regs[7] = thread_context.s0;
+  context->regs[8] = thread_context.s1;
+  context->regs[9] = thread_context.a0;
+  context->regs[10] = thread_context.a1;
+  context->regs[11] = thread_context.a2;
+  context->regs[12] = thread_context.a3;
+  context->regs[13] = thread_context.a4;
+  context->regs[14] = thread_context.a5;
+  context->regs[15] = thread_context.a6;
+  context->regs[16] = thread_context.a7;
+  context->regs[17] = thread_context.s2;
+  context->regs[18] = thread_context.s3;
+  context->regs[19] = thread_context.s4;
+  context->regs[20] = thread_context.s5;
+  context->regs[21] = thread_context.s6;
+  context->regs[22] = thread_context.s7;
+  context->regs[23] = thread_context.s8;
+  context->regs[24] = thread_context.s9;
+  context->regs[25] = thread_context.s10;
+  context->regs[26] = thread_context.s11;
+  context->regs[27] = thread_context.t3;
+  context->regs[28] = thread_context.t4;
+  context->regs[29] = thread_context.t5;
+  context->regs[30] = thread_context.t6;
+
+  for (size_t i = 0; i < std::size(context->fpregs); ++i) {
+    context->fpregs[i] = float_context.q[i].low;
+  }
+
+  context->fcsr = float_context.fcsr;
+}
+
 #endif  // ARCH_CPU_X86_64
 
 }  // namespace internal
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/cpu_context_fuchsia.h b/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/cpu_context_fuchsia.h
index 3cce60ed2..5d4cd8e84 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/cpu_context_fuchsia.h
+++ b/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/cpu_context_fuchsia.h
@@ -29,13 +29,14 @@ namespace internal {
 //! \brief Initializes a CPUContextX86_64 structure from native context
 //!     structures on Fuchsia.
 //!
-//! Floating point registers are currently initialized to zero.
 //! Segment registers are currently initialized to zero.
 //!
 //! \param[in] thread_context The native thread context.
+//! \param[in] float_context The native floating point context.
 //! \param[out] context The CPUContextX86_64 structure to initialize.
-void InitializeCPUContextX86_64_NoFloatingPoint(
+void InitializeCPUContextX86_64(
     const zx_thread_state_general_regs_t& thread_context,
+    const zx_thread_state_fp_regs_t& float_context,
     CPUContextX86_64* context);
 
 #endif  // ARCH_CPU_X86_64 || DOXYGEN
@@ -56,6 +57,21 @@ void InitializeCPUContextARM64(
 
 #endif  // ARCH_CPU_ARM64 || DOXYGEN
 
+#if defined(ARCH_CPU_RISCV64) || DOXYGEN
+
+//! \brief Initializes a CPUContextRISCV64 structure from native context
+//!     structures on Fuchsia.
+//!
+//! \param[in] thread_context The native thread context.
+//! \param[in] float_context The native floating point context.
+//! \param[out] context The CPUContextRISCV64 structure to initialize.
+void InitializeCPUContextRISCV64(
+    const zx_thread_state_general_regs_t& thread_context,
+    const zx_thread_state_fp_regs_t& float_context,
+    CPUContextRISCV64* context);
+
+#endif  // ARCH_CPU_RISCV64 || DOXYGEN
+
 }  // namespace internal
 }  // namespace crashpad
 
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/exception_snapshot_fuchsia.cc b/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/exception_snapshot_fuchsia.cc
index 50ea6fff9..be71ca22a 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/exception_snapshot_fuchsia.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/exception_snapshot_fuchsia.cc
@@ -42,6 +42,8 @@ bool ExceptionSnapshotFuchsia::Initialize(
   exception_info_ = exception_report.context.arch.u.x86_64.err_code;
 #elif defined(ARCH_CPU_ARM64)
   exception_info_ = exception_report.context.arch.u.arm_64.esr;
+#elif defined(ARCH_CPU_RISCV64)
+  exception_info_ = exception_report.context.arch.u.riscv_64.cause;
 #endif
 
   codes_.push_back(exception_);
@@ -52,6 +54,8 @@ bool ExceptionSnapshotFuchsia::Initialize(
   codes_.push_back(exception_report.context.arch.u.x86_64.cr2);
 #elif defined(ARCH_CPU_ARM64)
   codes_.push_back(exception_report.context.arch.u.arm_64.far);
+#elif defined(ARCH_CPU_RISCV64)
+  codes_.push_back(exception_report.context.arch.u.riscv_64.tval);
 #endif
 
   const auto threads = process_reader->Threads();
@@ -70,14 +74,19 @@ bool ExceptionSnapshotFuchsia::Initialize(
 #if defined(ARCH_CPU_X86_64)
   context_.architecture = kCPUArchitectureX86_64;
   context_.x86_64 = &context_arch_;
-  // TODO(fxbug.dev/5496): Add float context once saved in |t|.
-  InitializeCPUContextX86_64_NoFloatingPoint(t->general_registers,
-                                             context_.x86_64);
+  // TODO(fxbug.dev/5496): Add vector context.
+  InitializeCPUContextX86_64(
+      t->general_registers, t->fp_registers, context_.x86_64);
 #elif defined(ARCH_CPU_ARM64)
   context_.architecture = kCPUArchitectureARM64;
   context_.arm64 = &context_arch_;
   InitializeCPUContextARM64(
       t->general_registers, t->vector_registers, context_.arm64);
+#elif defined(ARCH_CPU_RISCV64)
+  context_.architecture = kCPUArchitectureRISCV64;
+  context_.riscv64 = &context_arch_;
+  InitializeCPUContextRISCV64(
+      t->general_registers, t->fp_registers, context_.riscv64);
 #else
 #error Port.
 #endif
@@ -92,6 +101,8 @@ bool ExceptionSnapshotFuchsia::Initialize(
     exception_address_ = exception_report.context.arch.u.x86_64.cr2;
 #elif defined(ARCH_CPU_ARM64)
     exception_address_ = exception_report.context.arch.u.arm_64.far;
+#elif defined(ARCH_CPU_RISCV64)
+    exception_address_ = exception_report.context.arch.u.riscv_64.tval;
 #else
 #error Port.
 #endif
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/exception_snapshot_fuchsia.h b/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/exception_snapshot_fuchsia.h
index 59f4d42bc..2d9701f98 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/exception_snapshot_fuchsia.h
+++ b/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/exception_snapshot_fuchsia.h
@@ -69,6 +69,8 @@ class ExceptionSnapshotFuchsia final : public ExceptionSnapshot {
   CPUContextX86_64 context_arch_;
 #elif defined(ARCH_CPU_ARM64)
   CPUContextARM64 context_arch_;
+#elif defined(ARCH_CPU_RISCV64)
+  CPUContextRISCV64 context_arch_;
 #endif
   CPUContext context_;
   std::vector<uint64_t> codes_;
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/process_reader_fuchsia.cc b/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/process_reader_fuchsia.cc
index 02be7c296..5bf2acf7d 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/process_reader_fuchsia.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/process_reader_fuchsia.cc
@@ -18,6 +18,7 @@
 #include <link.h>
 #include <zircon/syscalls.h>
 
+#include "base/check_op.h"
 #include "base/fuchsia/fuchsia_logging.h"
 #include "base/logging.h"
 #include "util/fuchsia/koid_utilities.h"
@@ -40,7 +41,7 @@ void GetStackRegions(
   uint64_t sp;
 #if defined(ARCH_CPU_X86_64)
   sp = regs.rsp;
-#elif defined(ARCH_CPU_ARM64)
+#elif defined(ARCH_CPU_ARM64) || defined(ARCH_CPU_RISCV64)
   sp = regs.sp;
 #else
 #error Port
@@ -234,7 +235,7 @@ void ProcessReaderFuchsia::InitializeModules() {
     // Crashpad needs to use the same module name at run time for symbol
     // resolution to work properly.
     //
-    // TODO(fuchsia/DX-1234): once Crashpad switches to elf-search, the
+    // TODO: https://fxbug.dev/6057 - once Crashpad switches to elf-search, the
     // following overwrites won't be necessary as only shared libraries will
     // have a soname at runtime, just like at build time.
     //
@@ -265,7 +266,6 @@ void ProcessReaderFuchsia::InitializeModules() {
     if (dsoname.empty()) {
       // This value must be kept in sync with what is used at build time to
       // index symbols for executables and loadable modules.
-      // See fuchsia/DX-1193 for more details.
       module.name = "<_>";
       module.type = ModuleSnapshot::kModuleTypeExecutable;
     } else {
@@ -346,6 +346,19 @@ void ProcessReaderFuchsia::InitializeThreads() {
         }
       }
 
+// Floating point registers are in the vector context for ARM.
+#if !defined(ARCH_CPU_ARM64)
+      zx_thread_state_fp_regs_t fp_regs;
+      status = thread_handles[i].read_state(
+          ZX_THREAD_STATE_FP_REGS, &fp_regs, sizeof(fp_regs));
+      if (status != ZX_OK) {
+        ZX_LOG(WARNING, status)
+            << "zx_thread_read_state(ZX_THREAD_STATE_FP_REGS)";
+      } else {
+        thread.fp_registers = fp_regs;
+      }
+#endif
+
       zx_thread_state_vector_regs_t vector_regs;
       status = thread_handles[i].read_state(
           ZX_THREAD_STATE_VECTOR_REGS, &vector_regs, sizeof(vector_regs));
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/process_reader_fuchsia.h b/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/process_reader_fuchsia.h
index cfeb67814..31e788698 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/process_reader_fuchsia.h
+++ b/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/process_reader_fuchsia.h
@@ -76,6 +76,10 @@ class ProcessReaderFuchsia {
     //!     returned by `zx_thread_read_state()`.
     zx_thread_state_general_regs_t general_registers = {};
 
+    //! \brief The raw architecture-specific `zx_thread_state_fp_regs_t` as
+    //!     returned by `zx_thread_read_state()`.
+    zx_thread_state_fp_regs_t fp_registers = {};
+
     //! \brief The raw architecture-specific `zx_thread_state_vector_regs_t` as
     //!     returned by `zx_thread_read_state()`.
     zx_thread_state_vector_regs_t vector_registers = {};
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/process_snapshot_fuchsia_test.cc b/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/process_snapshot_fuchsia_test.cc
index 7fcbb53ca..af245d3ed 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/process_snapshot_fuchsia_test.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/process_snapshot_fuchsia_test.cc
@@ -200,7 +200,7 @@ class InvalidStackPointerTest : public MultiprocessExec {
     constexpr uint64_t kOffsetIntoMapping = 1024;
 #if defined(ARCH_CPU_X86_64)
     regs.rsp = address_of_large_mapping + kOffsetIntoMapping;
-#elif defined(ARCH_CPU_ARM64)
+#elif defined(ARCH_CPU_ARM64) || defined(ARCH_CPU_RISCV64)
     regs.sp = address_of_large_mapping + kOffsetIntoMapping;
 #else
 #error
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/system_snapshot_fuchsia.cc b/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/system_snapshot_fuchsia.cc
index b820ed96b..81a9d3018 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/system_snapshot_fuchsia.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/system_snapshot_fuchsia.cc
@@ -45,6 +45,8 @@ void SystemSnapshotFuchsia::Initialize(const timeval* snapshot_time) {
   static constexpr const char kArch[] = "x86_64";
 #elif defined(ARCH_CPU_ARM64)
   static constexpr const char kArch[] = "aarch64";
+#elif defined(ARCH_CPU_RISCV64)
+  static constexpr const char kArch[] = "riscv64";
 #else
   static constexpr const char kArch[] = "unknown";
 #endif
@@ -61,6 +63,8 @@ CPUArchitecture SystemSnapshotFuchsia::GetCPUArchitecture() const {
   return kCPUArchitectureX86_64;
 #elif defined(ARCH_CPU_ARM64)
   return kCPUArchitectureARM64;
+#elif defined(ARCH_CPU_RISCV64)
+  return kCPUArchitectureRISCV64;
 #else
 #error Port
 #endif
@@ -71,7 +75,7 @@ uint32_t SystemSnapshotFuchsia::CPURevision() const {
 #if defined(ARCH_CPU_X86_64)
   return cpuid_.Revision();
 #else
-  // TODO(fuchsia/DX-712): Read actual revision.
+  // TODO: https://fxbug.dev/5561 - Read actual revision.
   return 0;
 #endif
 }
@@ -86,7 +90,7 @@ std::string SystemSnapshotFuchsia::CPUVendor() const {
 #if defined(ARCH_CPU_X86_64)
   return cpuid_.Vendor();
 #else
-  // TODO(fuchsia/DX-712): Read actual vendor.
+  // TODO: https://fxbug.dev/5561 - Read actual vendor.
   return std::string();
 #endif
 }
@@ -189,7 +193,7 @@ bool SystemSnapshotFuchsia::NXEnabled() const {
 #if defined(ARCH_CPU_X86_64)
   return cpuid_.NXEnabled();
 #else
-  // TODO(fuchsia/DX-712): Read actual NX bit value.
+  // TODO: https://fxbug.dev/5561 - Read actual NX bit value.
   return false;
 #endif
 }
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/thread_snapshot_fuchsia.cc b/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/thread_snapshot_fuchsia.cc
index 20b85dde8..759895254 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/thread_snapshot_fuchsia.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/thread_snapshot_fuchsia.cc
@@ -40,14 +40,19 @@ bool ThreadSnapshotFuchsia::Initialize(
 #if defined(ARCH_CPU_X86_64)
   context_.architecture = kCPUArchitectureX86_64;
   context_.x86_64 = &context_arch_;
-  // TODO(fuchsia/DX-642): Add float context once saved in |thread|.
-  InitializeCPUContextX86_64_NoFloatingPoint(thread.general_registers,
-                                             context_.x86_64);
+  // TODO(fxbug.dev/5496): Add vector context.
+  InitializeCPUContextX86_64(
+      thread.general_registers, thread.fp_registers, context_.x86_64);
 #elif defined(ARCH_CPU_ARM64)
   context_.architecture = kCPUArchitectureARM64;
   context_.arm64 = &context_arch_;
   InitializeCPUContextARM64(
       thread.general_registers, thread.vector_registers, context_.arm64);
+#elif defined(ARCH_CPU_RISCV64)
+  context_.architecture = kCPUArchitectureRISCV64;
+  context_.riscv64 = &context_arch_;
+  InitializeCPUContextRISCV64(
+      thread.general_registers, thread.fp_registers, context_.riscv64);
 #else
 #error Port.
 #endif
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/thread_snapshot_fuchsia.h b/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/thread_snapshot_fuchsia.h
index 8f5ebc72a..84cac3df6 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/thread_snapshot_fuchsia.h
+++ b/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/thread_snapshot_fuchsia.h
@@ -69,6 +69,8 @@ class ThreadSnapshotFuchsia final : public ThreadSnapshot {
   CPUContextX86_64 context_arch_;
 #elif defined(ARCH_CPU_ARM64)
   CPUContextARM64 context_arch_;
+#elif defined(ARCH_CPU_RISCV64)
+  CPUContextRISCV64 context_arch_;
 #else
 #error Port.
 #endif
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/ios/exception_snapshot_ios_intermediate_dump.cc b/external_imported/sentry-native/external/crashpad/snapshot/ios/exception_snapshot_ios_intermediate_dump.cc
index dd41687d9..e34784540 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/ios/exception_snapshot_ios_intermediate_dump.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/ios/exception_snapshot_ios_intermediate_dump.cc
@@ -14,8 +14,9 @@
 
 #include "snapshot/ios/exception_snapshot_ios_intermediate_dump.h"
 
+#include "base/apple/mach_logging.h"
+#include "base/check_op.h"
 #include "base/logging.h"
-#include "base/mac/mach_logging.h"
 #include "snapshot/cpu_context.h"
 #include "snapshot/ios/intermediate_dump_reader_util.h"
 #include "snapshot/mac/cpu_context_mac.h"
@@ -175,18 +176,21 @@ bool ExceptionSnapshotIOSIntermediateDump::InitializeFromMachException(
     const std::vector<uint8_t>& bytes = code_dump->bytes();
     const mach_exception_data_type_t* code =
         reinterpret_cast<const mach_exception_data_type_t*>(bytes.data());
-    if (bytes.size() == 0 || !code) {
+    if (bytes.size() == 0 ||
+        bytes.size() % sizeof(mach_exception_data_type_t) != 0 || !code) {
       LOG(ERROR) << "Invalid mach exception code.";
     } else {
-      // TODO: rationalize with the macOS implementation.
       mach_msg_type_number_t code_count =
           bytes.size() / sizeof(mach_exception_data_type_t);
       for (mach_msg_type_number_t code_index = 0; code_index < code_count;
            ++code_index) {
         codes_.push_back(code[code_index]);
       }
+      DCHECK_GE(code_count, 1u);
       exception_info_ = code[0];
-      exception_address_ = code[1];
+      if (code_count >= 2) {
+        exception_address_ = code[1];
+      }
     }
   }
 
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/ios/memory_snapshot_ios_intermediate_dump.cc b/external_imported/sentry-native/external/crashpad/snapshot/ios/memory_snapshot_ios_intermediate_dump.cc
index a3c7a1377..b272eb65f 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/ios/memory_snapshot_ios_intermediate_dump.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/ios/memory_snapshot_ios_intermediate_dump.cc
@@ -14,6 +14,8 @@
 
 #include "snapshot/ios/memory_snapshot_ios_intermediate_dump.h"
 
+#include "base/check_op.h"
+
 namespace crashpad {
 namespace internal {
 
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/ios/module_snapshot_ios_intermediate_dump.cc b/external_imported/sentry-native/external/crashpad/snapshot/ios/module_snapshot_ios_intermediate_dump.cc
index 39d3bab7e..09498f148 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/ios/module_snapshot_ios_intermediate_dump.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/ios/module_snapshot_ios_intermediate_dump.cc
@@ -17,8 +17,8 @@
 #include <mach-o/loader.h>
 #include <mach/mach.h>
 
+#include "base/apple/mach_logging.h"
 #include "base/files/file_path.h"
-#include "base/mac/mach_logging.h"
 #include "client/annotation.h"
 #include "snapshot/ios/intermediate_dump_reader_util.h"
 #include "util/ios/ios_intermediate_dump_data.h"
@@ -51,10 +51,13 @@ bool ModuleSnapshotIOSIntermediateDump::Initialize(
   GetDataStringFromMap(image_data, Key::kName, &name_);
   GetDataValueFromMap(image_data, Key::kAddress, &address_);
   GetDataValueFromMap(image_data, Key::kSize, &size_);
-  GetDataValueFromMap(image_data, Key::kSourceVersion, &source_version_);
   GetDataValueFromMap(image_data, Key::kFileType, &filetype_);
 
   // These keys are often missing.
+  GetDataValueFromMap(image_data,
+                      Key::kSourceVersion,
+                      &source_version_,
+                      LogMissingDataValueFromMap::kDontLogIfMissing);
   GetDataValueFromMap(image_data,
                       Key::kTimestamp,
                       &timestamp_,
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/ios/process_snapshot_ios_intermediate_dump_test.cc b/external_imported/sentry-native/external/crashpad/snapshot/ios/process_snapshot_ios_intermediate_dump_test.cc
index 58f10bf39..6d64b1d07 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/ios/process_snapshot_ios_intermediate_dump_test.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/ios/process_snapshot_ios_intermediate_dump_test.cc
@@ -16,7 +16,8 @@
 
 #include <mach-o/loader.h>
 
-#include "base/cxx17_backports.h"
+#include <algorithm>
+
 #include "base/files/scoped_file.h"
 #include "base/posix/eintr_wrapper.h"
 #include "build/build_config.h"
@@ -760,6 +761,11 @@ TEST_F(ProcessSnapshotIOSIntermediateDumpTest, FuzzTestCases) {
       FILE_PATH_LITERAL("snapshot/ios/testdata/crash-6605504629637120"));
   crashpad::internal::ProcessSnapshotIOSIntermediateDump process_snapshot3;
   EXPECT_FALSE(process_snapshot3.InitializeWithFilePath(fuzz_path, {}));
+
+  fuzz_path = TestPaths::TestDataRoot().Append(
+      FILE_PATH_LITERAL("snapshot/ios/testdata/crash-c44acfcbccd8c7a8"));
+  crashpad::internal::ProcessSnapshotIOSIntermediateDump process_snapshot4;
+  EXPECT_TRUE(process_snapshot4.InitializeWithFilePath(fuzz_path, {}));
 }
 
 }  // namespace
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/ios/system_snapshot_ios_intermediate_dump.cc b/external_imported/sentry-native/external/crashpad/snapshot/ios/system_snapshot_ios_intermediate_dump.cc
index be676857c..15f66992b 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/ios/system_snapshot_ios_intermediate_dump.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/ios/system_snapshot_ios_intermediate_dump.cc
@@ -22,8 +22,8 @@
 
 #include <algorithm>
 
+#include "base/apple/mach_logging.h"
 #include "base/logging.h"
-#include "base/mac/mach_logging.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "snapshot/cpu_context.h"
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/ios/testdata/crash-c44acfcbccd8c7a8 b/external_imported/sentry-native/external/crashpad/snapshot/ios/testdata/crash-c44acfcbccd8c7a8
new file mode 100644
index 000000000..5e7eb83f3
Binary files /dev/null and b/external_imported/sentry-native/external/crashpad/snapshot/ios/testdata/crash-c44acfcbccd8c7a8 differ
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/ios/thread_snapshot_ios_intermediate_dump.cc b/external_imported/sentry-native/external/crashpad/snapshot/ios/thread_snapshot_ios_intermediate_dump.cc
index 901e1f119..d37ccef3b 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/ios/thread_snapshot_ios_intermediate_dump.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/ios/thread_snapshot_ios_intermediate_dump.cc
@@ -14,7 +14,7 @@
 
 #include "snapshot/ios/thread_snapshot_ios_intermediate_dump.h"
 
-#include "base/mac/mach_logging.h"
+#include "base/apple/mach_logging.h"
 #include "snapshot/ios/intermediate_dump_reader_util.h"
 #include "snapshot/mac/cpu_context_mac.h"
 #include "util/ios/ios_intermediate_dump_data.h"
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/linux/cpu_context_linux.cc b/external_imported/sentry-native/external/crashpad/snapshot/linux/cpu_context_linux.cc
index 21db23432..6c4cb3ebc 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/linux/cpu_context_linux.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/linux/cpu_context_linux.cc
@@ -266,6 +266,21 @@ void InitializeCPUContextARM64_OnlyFPSIMD(
   context->fpcr = float_context.fpcr;
 }
 
+#elif defined(ARCH_CPU_RISCV64)
+
+void InitializeCPUContextRISCV64(const ThreadContext::t64_t& thread_context,
+                                 const FloatContext::f64_t& float_context,
+                                 CPUContextRISCV64* context) {
+  context->pc = thread_context.pc;
+
+  static_assert(sizeof(context->regs) == sizeof(thread_context.regs));
+  memcpy(context->regs, thread_context.regs, sizeof(context->regs));
+
+  static_assert(sizeof(context->fpregs) == sizeof(float_context.fpregs));
+  memcpy(context->fpregs, float_context.fpregs, sizeof(context->fpregs));
+  context->fcsr = float_context.fcsr;
+}
+
 #endif  // ARCH_CPU_X86_FAMILY
 
 }  // namespace internal
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/linux/cpu_context_linux.h b/external_imported/sentry-native/external/crashpad/snapshot/linux/cpu_context_linux.h
index 1ea5eecda..507d1b44d 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/linux/cpu_context_linux.h
+++ b/external_imported/sentry-native/external/crashpad/snapshot/linux/cpu_context_linux.h
@@ -174,6 +174,20 @@ void InitializeCPUContextMIPS(
 
 #endif  // ARCH_CPU_MIPS_FAMILY || DOXYGEN
 
+#if defined(ARCH_CPU_RISCV64) || DOXYGEN
+
+//! \brief Initializes a CPUContextRISCV64 structure from native context
+//!     structures on Linux.
+//!
+//! \param[in] thread_context The native thread context.
+//! \param[in] float_context The native float context.
+//! \param[out] context The CPUContextRISCV64 structure to initialize.
+void InitializeCPUContextRISCV64(const ThreadContext::t64_t& thread_context,
+                                 const FloatContext::f64_t& float_context,
+                                 CPUContextRISCV64* context);
+
+#endif  // ARCH_CPU_RISCV64 || DOXYGEN
+
 }  // namespace internal
 }  // namespace crashpad
 
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/linux/exception_snapshot_linux.cc b/external_imported/sentry-native/external/crashpad/snapshot/linux/exception_snapshot_linux.cc
index 4e6ec11f8..677afdaa7 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/linux/exception_snapshot_linux.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/linux/exception_snapshot_linux.cc
@@ -325,6 +325,48 @@ bool ExceptionSnapshotLinux::ReadContext<ContextTraits64>(
       reader, context_address, context_.mips64);
 }
 
+#elif defined(ARCH_CPU_RISCV64)
+
+static bool ReadContext(ProcessReaderLinux* reader,
+                        LinuxVMAddress context_address,
+                        typename ContextTraits64::CPUContext* dest_context) {
+  const ProcessMemory* memory = reader->Memory();
+
+  LinuxVMAddress gregs_address = context_address +
+                                 offsetof(UContext<ContextTraits64>, mcontext) +
+                                 offsetof(MContext64, regs);
+
+  typename ContextTraits64::SignalThreadContext thread_context;
+  if (!memory->Read(gregs_address, sizeof(thread_context), &thread_context)) {
+    LOG(ERROR) << "Couldn't read gregs";
+    return false;
+  }
+
+  LinuxVMAddress fpregs_address =
+      context_address + offsetof(UContext<ContextTraits64>, mcontext) +
+      offsetof(MContext64, fpregs);
+
+  typename ContextTraits64::SignalFloatContext fp_context;
+  if (!memory->Read(fpregs_address, sizeof(fp_context), &fp_context)) {
+    LOG(ERROR) << "Couldn't read fpregs";
+    return false;
+  }
+
+  InitializeCPUContextRISCV64(thread_context, fp_context, dest_context);
+
+  return true;
+}
+
+template <>
+bool ExceptionSnapshotLinux::ReadContext<ContextTraits64>(
+    ProcessReaderLinux* reader,
+    LinuxVMAddress context_address) {
+  context_.architecture = kCPUArchitectureRISCV64;
+  context_.riscv64 = &context_union_.riscv64;
+
+  return internal::ReadContext(reader, context_address, context_.riscv64);
+}
+
 #endif  // ARCH_CPU_X86_FAMILY
 
 bool ExceptionSnapshotLinux::Initialize(
@@ -355,10 +397,12 @@ bool ExceptionSnapshotLinux::Initialize(
       return false;
     }
   } else {
+#if !defined(ARCH_CPU_RISCV64)
     if (!ReadContext<ContextTraits32>(process_reader, context_address) ||
         !ReadSiginfo<Traits32>(process_reader, siginfo_address)) {
       return false;
     }
+#endif
   }
 
   CaptureMemoryDelegateLinux capture_memory_delegate(
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/linux/exception_snapshot_linux.h b/external_imported/sentry-native/external/crashpad/snapshot/linux/exception_snapshot_linux.h
index 3ea3d931f..f931d3300 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/linux/exception_snapshot_linux.h
+++ b/external_imported/sentry-native/external/crashpad/snapshot/linux/exception_snapshot_linux.h
@@ -89,6 +89,8 @@ class ExceptionSnapshotLinux final : public ExceptionSnapshot {
 #elif defined(ARCH_CPU_MIPS_FAMILY)
     CPUContextMIPS mipsel;
     CPUContextMIPS64 mips64;
+#elif defined(ARCH_CPU_RISCV64)
+    CPUContextRISCV64 riscv64;
 #endif
   } context_union_;
   CPUContext context_;
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/linux/exception_snapshot_linux_test.cc b/external_imported/sentry-native/external/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
index 0f5e21af6..94f45f1eb 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
@@ -297,6 +297,34 @@ void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) {
 #undef CPU_ARCH_NAME
 }
 
+#elif defined(ARCH_CPU_RISCV64)
+using NativeCPUContext = ucontext_t;
+
+void InitializeContext(NativeCPUContext* context) {
+  for (size_t reg = 0; reg < std::size(context->uc_mcontext.__gregs); ++reg) {
+    context->uc_mcontext.__gregs[reg] = reg;
+  }
+
+  memset(&context->uc_mcontext.__fpregs,
+         44,
+         sizeof(context->uc_mcontext.__fpregs));
+}
+
+void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) {
+  EXPECT_EQ(actual.architecture, kCPUArchitectureRISCV64);
+
+  EXPECT_EQ(actual.riscv64->pc, expected.uc_mcontext.__gregs[0]);
+
+  for (size_t reg = 0; reg < std::size(actual.riscv64->regs); ++reg) {
+    EXPECT_EQ(actual.riscv64->regs[reg], expected.uc_mcontext.__gregs[reg + 1]);
+  }
+
+  EXPECT_EQ(memcmp(&actual.riscv64->fpregs,
+                   &expected.uc_mcontext.__fpregs,
+                   sizeof(actual.riscv64->fpregs)),
+            0);
+}
+
 #else
 #error Port.
 #endif
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/linux/process_reader_linux.cc b/external_imported/sentry-native/external/crashpad/snapshot/linux/process_reader_linux.cc
index 8ec0edc6d..45713386d 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/linux/process_reader_linux.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/linux/process_reader_linux.cc
@@ -127,6 +127,8 @@ void ProcessReaderLinux::Thread::InitializeStack(ProcessReaderLinux* reader) {
 #elif defined(ARCH_CPU_MIPS_FAMILY)
   stack_pointer = reader->Is64Bit() ? thread_info.thread_context.t64.regs[29]
                                     : thread_info.thread_context.t32.regs[29];
+#elif defined(ARCH_CPU_RISCV64)
+  stack_pointer = thread_info.thread_context.t64.regs[1];
 #else
 #error Port.
 #endif
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/linux/signal_context.h b/external_imported/sentry-native/external/crashpad/snapshot/linux/signal_context.h
index 6ac7adea4..89e697a08 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/linux/signal_context.h
+++ b/external_imported/sentry-native/external/crashpad/snapshot/linux/signal_context.h
@@ -422,6 +422,40 @@ static_assert(offsetof(UContext<ContextTraits64>, mcontext.fpregs) ==
               "context offset mismatch");
 #endif
 
+#elif defined(ARCH_CPU_RISCV64)
+
+struct ContextTraits64 : public Traits64 {
+  using SignalThreadContext = ThreadContext::t64_t;
+  using SignalFloatContext = FloatContext::f64_t;
+  using CPUContext = CPUContextRISCV64;
+};
+
+struct MContext64 {
+  ThreadContext::t64_t regs;
+  FloatContext::f64_t fpregs;
+};
+
+template <typename Traits>
+struct UContext {
+  typename Traits::ULong flags;
+  typename Traits::Address link;
+  SignalStack<Traits> stack;
+  Sigset<Traits> sigmask;
+  char alignment_padding_[8];
+  char padding[128 - sizeof(Sigset<Traits>)];
+  MContext64 mcontext;
+};
+
+static_assert(offsetof(UContext<ContextTraits64>, mcontext) ==
+                  offsetof(ucontext_t, uc_mcontext),
+              "context offset mismatch");
+static_assert(offsetof(UContext<ContextTraits64>, mcontext.regs) ==
+                  offsetof(ucontext_t, uc_mcontext.__gregs),
+              "context offset mismatch");
+static_assert(offsetof(UContext<ContextTraits64>, mcontext.fpregs) ==
+                  offsetof(ucontext_t, uc_mcontext.__fpregs),
+              "context offset mismatch");
+
 #else
 #error Port.
 #endif  // ARCH_CPU_X86_FAMILY
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/linux/system_snapshot_linux.cc b/external_imported/sentry-native/external/crashpad/snapshot/linux/system_snapshot_linux.cc
index 9d199ff56..b32f22d78 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/linux/system_snapshot_linux.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/linux/system_snapshot_linux.cc
@@ -20,6 +20,7 @@
 
 #include <algorithm>
 
+#include "base/check_op.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/notreached.h"
@@ -62,8 +63,8 @@ bool ReadCPUsOnline(uint32_t* first_cpu, uint8_t* cpu_count) {
     std::string left, right;
     if (SplitStringFirst(range, '-', &left, &right)) {
       unsigned int start, end;
-      if (!StringToUint(base::StringPiece(left), &start) ||
-          !StringToUint(base::StringPiece(right), &end) || end <= start) {
+      if (!base::StringToUint(base::StringPiece(left), &start) ||
+          !base::StringToUint(base::StringPiece(right), &end) || end <= start) {
         LOG(ERROR) << "format error: " << range;
         return false;
       }
@@ -78,7 +79,7 @@ bool ReadCPUsOnline(uint32_t* first_cpu, uint8_t* cpu_count) {
       }
     } else {
       unsigned int cpuno;
-      if (!StringToUint(base::StringPiece(range), &cpuno)) {
+      if (!base::StringToUint(base::StringPiece(range), &cpuno)) {
         LOG(ERROR) << "format error";
         return false;
       }
@@ -205,6 +206,8 @@ CPUArchitecture SystemSnapshotLinux::GetCPUArchitecture() const {
 #elif defined(ARCH_CPU_MIPS_FAMILY)
   return process_reader_->Is64Bit() ? kCPUArchitectureMIPS64EL
                                     : kCPUArchitectureMIPSEL;
+#elif defined(ARCH_CPU_RISCV64)
+  return kCPUArchitectureRISCV64;
 #else
 #error port to your architecture
 #endif
@@ -220,6 +223,9 @@ uint32_t SystemSnapshotLinux::CPURevision() const {
 #elif defined(ARCH_CPU_MIPS_FAMILY)
   // Not implementable on MIPS
   return 0;
+#elif defined(ARCH_CPU_RISCV64)
+  // Not implemented
+  return 0;
 #else
 #error port to your architecture
 #endif
@@ -240,6 +246,9 @@ std::string SystemSnapshotLinux::CPUVendor() const {
 #elif defined(ARCH_CPU_MIPS_FAMILY)
   // Not implementable on MIPS
   return std::string();
+#elif defined(ARCH_CPU_RISCV64)
+  // Not implemented
+  return std::string();
 #else
 #error port to your architecture
 #endif
@@ -373,6 +382,9 @@ bool SystemSnapshotLinux::NXEnabled() const {
 #elif defined(ARCH_CPU_MIPS_FAMILY)
   // Not implementable on MIPS
   return false;
+#elif defined(ARCH_CPU_RISCV64)
+  // Not implemented
+  return false;
 #else
 #error Port.
 #endif  // ARCH_CPU_X86_FAMILY
@@ -399,13 +411,13 @@ void SystemSnapshotLinux::ReadKernelVersion(const std::string& version_string) {
     return;
   }
 
-  if (!StringToInt(base::StringPiece(versions[0]), &os_version_major_)) {
+  if (!base::StringToInt(base::StringPiece(versions[0]), &os_version_major_)) {
     LOG(WARNING) << "no kernel version";
     return;
   }
   DCHECK_GE(os_version_major_, 3);
 
-  if (!StringToInt(base::StringPiece(versions[1]), &os_version_minor_)) {
+  if (!base::StringToInt(base::StringPiece(versions[1]), &os_version_minor_)) {
     LOG(WARNING) << "no major revision";
     return;
   }
@@ -415,8 +427,8 @@ void SystemSnapshotLinux::ReadKernelVersion(const std::string& version_string) {
   if (minor_rev_end == std::string::npos) {
     minor_rev_end = versions[2].size();
   }
-  if (!StringToInt(base::StringPiece(versions[2].c_str(), minor_rev_end),
-                   &os_version_bugfix_)) {
+  if (!base::StringToInt(base::StringPiece(versions[2].c_str(), minor_rev_end),
+                         &os_version_bugfix_)) {
     LOG(WARNING) << "no minor revision";
     return;
   }
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/linux/test_modules.cc b/external_imported/sentry-native/external/crashpad/snapshot/linux/test_modules.cc
index 7d9d08d2e..c03cbaae5 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/linux/test_modules.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/linux/test_modules.cc
@@ -110,6 +110,13 @@ bool WriteTestModule(const base::FilePath& module_path,
   module.ehdr.e_machine = EM_AARCH64;
 #elif defined(ARCH_CPU_MIPSEL) || defined(ARCH_CPU_MIPS64EL)
   module.ehdr.e_machine = EM_MIPS;
+#elif defined(ARCH_CPU_RISCV64)
+  module.ehdr.e_machine = EM_RISCV;
+#endif
+
+#if defined(ARCH_CPU_RISCV64)
+  // Crashpad supports RV64GC
+  module.ehdr.e_flags = EF_RISCV_RVC | EF_RISCV_FLOAT_ABI_DOUBLE;
 #endif
 
   module.ehdr.e_version = EV_CURRENT;
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/linux/thread_snapshot_linux.cc b/external_imported/sentry-native/external/crashpad/snapshot/linux/thread_snapshot_linux.cc
index 94945e926..6489387f2 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/linux/thread_snapshot_linux.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/linux/thread_snapshot_linux.cc
@@ -196,6 +196,12 @@ bool ThreadSnapshotLinux::Initialize(
         thread.thread_info.float_context.f32,
         context_.mipsel);
   }
+#elif defined(ARCH_CPU_RISCV64)
+  context_.architecture = kCPUArchitectureRISCV64;
+  context_.riscv64 = &context_union_.riscv64;
+  InitializeCPUContextRISCV64(thread.thread_info.thread_context.t64,
+                              thread.thread_info.float_context.f64,
+                              context_.riscv64);
 #else
 #error Port.
 #endif
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/linux/thread_snapshot_linux.h b/external_imported/sentry-native/external/crashpad/snapshot/linux/thread_snapshot_linux.h
index 643ea5843..2229f7a9a 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/linux/thread_snapshot_linux.h
+++ b/external_imported/sentry-native/external/crashpad/snapshot/linux/thread_snapshot_linux.h
@@ -78,6 +78,8 @@ class ThreadSnapshotLinux final : public ThreadSnapshot {
 #elif defined(ARCH_CPU_MIPS_FAMILY)
     CPUContextMIPS mipsel;
     CPUContextMIPS64 mips64;
+#elif defined(ARCH_CPU_RISCV64)
+    CPUContextRISCV64 riscv64;
 #else
 #error Port.
 #endif  // ARCH_CPU_X86_FAMILY
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/mac/mach_o_image_reader.cc b/external_imported/sentry-native/external/crashpad/snapshot/mac/mach_o_image_reader.cc
index 728255216..b648f7f25 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/mac/mach_o_image_reader.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/mac/mach_o_image_reader.cc
@@ -22,6 +22,7 @@
 #include <limits>
 #include <utility>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "client/crashpad_info.h"
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/mac/mach_o_image_segment_reader.cc b/external_imported/sentry-native/external/crashpad/snapshot/mac/mach_o_image_segment_reader.cc
index 6e328f9aa..17b7bd331 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/mac/mach_o_image_segment_reader.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/mac/mach_o_image_segment_reader.cc
@@ -20,6 +20,7 @@
 
 #include <utility>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
@@ -39,38 +40,26 @@ std::string SizeLimitedCString(const char* c_string, size_t max_length) {
 }  // namespace
 
 bool IsMalformedCLKernelsModule(uint32_t mach_o_file_type,
-                                const std::string& module_name,
-                                bool* has_timestamp) {
+                                const std::string& module_name) {
 #if defined(ARCH_CPU_X86_FAMILY)
   if (mach_o_file_type != MH_BUNDLE) {
     return false;
   }
 
   if (module_name == "cl_kernels") {
-    if (__MAC_OS_X_VERSION_MIN_REQUIRED >= __MAC_10_10 ||
-        MacOSVersionNumber() >= 10'10'00) {
-      if (has_timestamp) {
-        *has_timestamp = false;
-      }
-      return true;
-    }
-    return false;
+    return __MAC_OS_X_VERSION_MIN_REQUIRED >= __MAC_10_10 ||
+        MacOSVersionNumber() >= 10'10'00;
   }
 
   static const char kCvmsObjectPathPrefix[] =
       "/private/var/db/CVMS/cvmsCodeSignObj";
-  if (module_name.compare(
-          0, strlen(kCvmsObjectPathPrefix), kCvmsObjectPathPrefix) == 0 &&
-      (__MAC_OS_X_VERSION_MIN_REQUIRED >= __MAC_10_14 ||
-       MacOSVersionNumber() >= 10'14'00)) {
-    if (has_timestamp) {
-      *has_timestamp = true;
-    }
-    return true;
-  }
-#endif  // ARCH_CPU_X86_FAMILY
-
+  return module_name.compare(
+             0, strlen(kCvmsObjectPathPrefix), kCvmsObjectPathPrefix) == 0 &&
+         (__MAC_OS_X_VERSION_MIN_REQUIRED >= __MAC_10_14 ||
+          MacOSVersionNumber() >= 10'14'00);
+#else
   return false;
+#endif  // ARCH_CPU_X86_FAMILY
 }
 
 MachOImageSegmentReader::MachOImageSegmentReader()
@@ -165,9 +154,8 @@ bool MachOImageSegmentReader::Initialize(ProcessReaderMac* process_reader,
     //
     // https://openradar.appspot.com/20239912
     if (section_segment_name != segment_name &&
-        !(IsMalformedCLKernelsModule(file_type, module_name, nullptr) &&
-          segment_name == SEG_TEXT &&
-          section_segment_name == "__LD" &&
+        !(IsMalformedCLKernelsModule(file_type, module_name) &&
+          segment_name == SEG_TEXT && section_segment_name == "__LD" &&
           section_name == "__compact_unwind" &&
           (section.flags & S_ATTR_DEBUG))) {
       LOG(WARNING) << "section.segname incorrect in segment " << segment_name
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/mac/mach_o_image_segment_reader.h b/external_imported/sentry-native/external/crashpad/snapshot/mac/mach_o_image_segment_reader.h
index a56652922..a4f17274f 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/mac/mach_o_image_segment_reader.h
+++ b/external_imported/sentry-native/external/crashpad/snapshot/mac/mach_o_image_segment_reader.h
@@ -53,18 +53,11 @@ namespace crashpad {
 //! \param[in] mach_o_file_type The Mach-O type of the module being examined.
 //! \param[in] module_name The pathname that `dyld` reported having loaded the
 //!     module from.
-//! \param[out] has_timestamp Optional, may be `nullptr`. If provided, and the
-//!     module is a maformed `cl_kernels` module, this will be set to `true` if
-//!     the module was loaded from the filesystem (as is the case when loaded
-//!     from the CVMS directory) and is expected to have a timestamp, and
-//!     `false` otherwise. Note that even when loaded from the filesystem, these
-//!     modules are unlinked from the filesystem after loading.
 //!
 //! \return `true` if the module appears to be a malformed `cl_kernels` module
 //!     based on the provided information, `false` otherwise.
 bool IsMalformedCLKernelsModule(uint32_t mach_o_file_type,
-                                const std::string& module_name,
-                                bool* has_timestamp);
+                                const std::string& module_name);
 
 //! \brief A reader for `LC_SEGMENT` or `LC_SEGMENT_64` load commands in Mach-O
 //!     images mapped into another process.
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/mac/process_reader_mac.cc b/external_imported/sentry-native/external/crashpad/snapshot/mac/process_reader_mac.cc
index c694eb0e7..c77c0d39e 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/mac/process_reader_mac.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/mac/process_reader_mac.cc
@@ -21,10 +21,11 @@
 #include <algorithm>
 #include <utility>
 
+#include "base/apple/mach_logging.h"
+#include "base/apple/scoped_mach_port.h"
+#include "base/apple/scoped_mach_vm.h"
+#include "base/check_op.h"
 #include "base/logging.h"
-#include "base/mac/mach_logging.h"
-#include "base/mac/scoped_mach_port.h"
-#include "base/mac/scoped_mach_vm.h"
 #include "base/strings/stringprintf.h"
 #include "snapshot/mac/mach_o_image_reader.h"
 #include "snapshot/mac/process_types.h"
@@ -265,7 +266,7 @@ void ProcessReaderMac::InitializeThreads() {
   // loop below will leak thread port send rights.
   ScopedForbidReturn threads_need_owners;
 
-  base::mac::ScopedMachVM threads_vm(
+  base::apple::ScopedMachVM threads_vm(
       reinterpret_cast<vm_address_t>(threads),
       mach_vm_round_page(thread_count * sizeof(*threads)));
 
@@ -509,26 +510,27 @@ void ProcessReaderMac::InitializeModules() {
     }
 
     if (file_type == MH_EXECUTE) {
-      // On Mac OS X 10.6, the main executable does not normally show up at
-      // index 0. This is because of how 10.6.8 dyld-132.13/src/dyld.cpp
-      // notifyGDB(), the function resposible for causing
-      // dyld_all_image_infos::infoArray to be updated, is called. It is
-      // registered to be called when all dependents of an image have been
-      // mapped (dyld_image_state_dependents_mapped), meaning that the main
-      // executable won’t be added to the list until all of the libraries it
-      // depends on are, even though dyld begins looking at the main executable
-      // first. This changed in later versions of dyld, including those present
-      // in 10.7. 10.9.4 dyld-239.4/src/dyld.cpp updateAllImages() (renamed from
-      // notifyGDB()) is registered to be called when an image itself has been
-      // mapped (dyld_image_state_mapped), regardless of the libraries that it
-      // depends on.
+      // On macOS 14, the main executable does not normally show up at
+      // index 0. In previous versions of dyld, each loaded image was
+      // appended to the all image info vector as it was loaded.
+      // (For example, see RuntimeState::notifyDebuggerLoad in dyld-1066.8).
+      // Starting from dyld-1122.1, notifyDebuggerLoad calls
+      // ExternallyViewableState::addImages for all but the main executable
+      // (which has already been added). ExternallyViewableState::addImages
+      // inserts all new image infos at the front of the vector, leaving the
+      // main executable as the last item.
       //
       // The interface requires that the main executable be first in the list,
       // so swap it into the right position.
       size_t index = modules_.size() - 1;
-      if (main_executable_count == 0) {
-        std::swap(modules_[0], modules_[index]);
-      } else {
+      if (index > 0) {
+        CHECK_EQ(index, image_info_vector.size() - 1);
+        if (main_executable_count == 0) {
+          std::rotate(
+              modules_.rbegin(), modules_.rbegin() + 1, modules_.rend());
+        }
+      }
+      if (main_executable_count > 0) {
         LOG(WARNING) << base::StringPrintf(
             "multiple MH_EXECUTE modules (%s, %s)",
             modules_[0].name.c_str(),
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/mac/process_reader_mac_test.cc b/external_imported/sentry-native/external/crashpad/snapshot/mac/process_reader_mac_test.cc
index 14cf33d37..ed6992376 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/mac/process_reader_mac_test.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/mac/process_reader_mac_test.cc
@@ -28,11 +28,12 @@
 
 #include <iterator>
 #include <map>
+#include <unordered_set>
 #include <utility>
 
+#include "base/apple/mach_logging.h"
 #include "base/check_op.h"
 #include "base/logging.h"
-#include "base/mac/mach_logging.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
@@ -54,6 +55,15 @@ namespace crashpad {
 namespace test {
 namespace {
 
+using ModulePathAndAddress = std::pair<std::string, mach_vm_address_t>;
+struct PathAndAddressHash {
+  std::size_t operator()(const ModulePathAndAddress& pair) const {
+    return std::hash<std::string>()(pair.first) ^
+           std::hash<mach_vm_address_t>()(pair.second);
+  }
+};
+using ModuleSet = std::unordered_set<ModulePathAndAddress, PathAndAddressHash>;
+
 constexpr char kDyldPath[] = "/usr/lib/dyld";
 
 TEST(ProcessReaderMac, SelfBasic) {
@@ -361,7 +371,7 @@ void ExpectSeveralThreads(ThreadMap* thread_map,
         // Non-main threads use the stack region to store thread data. See
         // macOS 12 libpthread-486.100.11 src/pthread.c _pthread_allocate().
 #if defined(ARCH_CPU_ARM64)
-        // arm64 has an additional offset for alignment. See macOS 12 
+        // arm64 has an additional offset for alignment. See macOS 12
         // libpthread-486.100.11 src/pthread.c _pthread_allocate() and
         // PTHREAD_T_OFFSET (defined in src/types_internal.h).
         expected_stack_region_end += sizeof(_opaque_pthread_t) + 0x3000;
@@ -654,9 +664,8 @@ T GetDyldFunction(const char* symbol) {
   return reinterpret_cast<T>(dlsym(dl_handle, symbol));
 }
 
-void VerifyImageExistenceAndTimestamp(const char* path, time_t timestamp) {
+void VerifyImageExistence(const char* path) {
   const char* stat_path;
-  bool timestamp_may_be_0;
 
 #if __MAC_OS_X_VERSION_MAX_ALLOWED < __MAC_10_16
   static auto _dyld_shared_cache_contains_path =
@@ -666,7 +675,7 @@ void VerifyImageExistenceAndTimestamp(const char* path, time_t timestamp) {
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunguarded-availability"
-  if (_dyld_shared_cache_contains_path &&
+  if (&_dyld_shared_cache_contains_path &&
       _dyld_shared_cache_contains_path(path)) {
 #pragma clang diagnostic pop
     // The timestamp will either match the timestamp of the dyld_shared_cache
@@ -686,18 +695,13 @@ void VerifyImageExistenceAndTimestamp(const char* path, time_t timestamp) {
     }();
 
     stat_path = dyld_shared_cache_file_path;
-    timestamp_may_be_0 = true;
   } else {
     stat_path = path;
-    timestamp_may_be_0 = false;
   }
 
   struct stat stat_buf;
   int rv = stat(stat_path, &stat_buf);
   EXPECT_EQ(rv, 0) << ErrnoMessage("stat");
-  if (rv == 0 && (!timestamp_may_be_0 || timestamp != 0)) {
-    EXPECT_EQ(timestamp, stat_buf.st_mtime);
-  }
 }
 
 // cl_kernels images (OpenCL kernels) are weird. They’re not ld output and don’t
@@ -839,67 +843,57 @@ TEST(ProcessReaderMac, SelfModules) {
   ASSERT_TRUE(process_reader.Initialize(mach_task_self()));
 
   uint32_t dyld_image_count = _dyld_image_count();
-  const std::vector<ProcessReaderMac::Module>& modules =
-      process_reader.Modules();
-
-  // There needs to be at least an entry for the main executable, for a dylib,
-  // and for dyld.
-  ASSERT_GE(modules.size(), 3u);
-
-  // dyld_image_count doesn’t include an entry for dyld itself, but |modules|
-  // does.
-  ASSERT_EQ(modules.size(), dyld_image_count + 1);
-
-  bool found_cl_kernels = false;
-  for (uint32_t index = 0; index < dyld_image_count; ++index) {
-    SCOPED_TRACE(base::StringPrintf(
-        "index %u, name %s", index, modules[index].name.c_str()));
 
-    const char* dyld_image_name = _dyld_get_image_name(index);
-    EXPECT_EQ(modules[index].name, dyld_image_name);
-    ASSERT_TRUE(modules[index].reader);
-    EXPECT_EQ(
-        modules[index].reader->Address(),
-        FromPointerCast<mach_vm_address_t>(_dyld_get_image_header(index)));
-
-    bool expect_timestamp;
-    if (index == 0 && MacOSVersionNumber() < 12'00'00) {
-      // Pre-dyld4, dyld didn’t set the main executable's timestamp, and it was 
-      // reported as 0.
-      EXPECT_EQ(modules[index].timestamp, 0);
-    } else if (IsMalformedCLKernelsModule(modules[index].reader->FileType(),
-                                          modules[index].name,
-                                          &expect_timestamp)) {
-      // cl_kernels doesn’t exist as a file, but may still have a timestamp.
-      if (!expect_timestamp) {
-        EXPECT_EQ(modules[index].timestamp, 0);
-      } else {
-        EXPECT_NE(modules[index].timestamp, 0);
+  std::set<std::string> cl_kernel_names;
+  auto modules = process_reader.Modules();
+  ModuleSet actual_modules;
+  for (size_t i = 0; i < modules.size(); ++i) {
+    auto& module = modules[i];
+    ASSERT_TRUE(module.reader);
+    if (i == modules.size() - 1) {
+      EXPECT_EQ(module.name, kDyldPath);
+      const dyld_all_image_infos* dyld_image_infos = DyldGetAllImageInfos();
+      if (dyld_image_infos->version >= 2) {
+        EXPECT_EQ(module.reader->Address(),
+                  FromPointerCast<mach_vm_address_t>(
+                      dyld_image_infos->dyldImageLoadAddress));
       }
-      found_cl_kernels = true;
+      // Don't include dyld, since dyld image APIs will not have an entry for
+      // dyld itself.
+      continue;
+    }
+    // Ensure executable is first, and that there's only one.
+    uint32_t file_type = module.reader->FileType();
+    if (i == 0) {
+      EXPECT_EQ(file_type, static_cast<uint32_t>(MH_EXECUTE));
     } else {
-      // Hope that the module didn’t change on disk.
-      VerifyImageExistenceAndTimestamp(dyld_image_name,
-                                       modules[index].timestamp);
+      EXPECT_NE(file_type, static_cast<uint32_t>(MH_EXECUTE));
     }
+    if (IsMalformedCLKernelsModule(module.reader->FileType(), module.name)) {
+      cl_kernel_names.insert(module.name);
+    }
+    actual_modules.insert(
+        std::make_pair(module.name, module.reader->Address()));
   }
+  EXPECT_EQ(cl_kernel_names.size() > 0,
+            ExpectCLKernels() && ensure_cl_kernels.success());
 
-  EXPECT_EQ(found_cl_kernels, ExpectCLKernels() && ensure_cl_kernels.success());
-
-  size_t index = modules.size() - 1;
-  EXPECT_EQ(modules[index].name, kDyldPath);
-
-  // dyld didn’t load itself either, so it couldn’t record its timestamp, and it
-  // is also reported as 0.
-  EXPECT_EQ(modules[index].timestamp, 0);
+  // There needs to be at least an entry for the main executable and a dylib.
+  ASSERT_GE(actual_modules.size(), 2u);
+  ASSERT_EQ(actual_modules.size(), dyld_image_count);
 
-  const dyld_all_image_infos* dyld_image_infos = DyldGetAllImageInfos();
-  if (dyld_image_infos->version >= 2) {
-    ASSERT_TRUE(modules[index].reader);
-    EXPECT_EQ(modules[index].reader->Address(),
-              FromPointerCast<mach_vm_address_t>(
-                  dyld_image_infos->dyldImageLoadAddress));
+  ModuleSet expect_modules;
+  for (uint32_t index = 0; index < dyld_image_count; ++index) {
+    const char* dyld_image_name = _dyld_get_image_name(index);
+    mach_vm_address_t dyld_image_address =
+        FromPointerCast<mach_vm_address_t>(_dyld_get_image_header(index));
+    expect_modules.insert(
+        std::make_pair(std::string(dyld_image_name), dyld_image_address));
+    if (cl_kernel_names.find(dyld_image_name) == cl_kernel_names.end()) {
+      VerifyImageExistence(dyld_image_name);
+    }
   }
+  EXPECT_EQ(actual_modules, expect_modules);
 }
 
 class ProcessReaderModulesChild final : public MachMultiprocess {
@@ -918,27 +912,45 @@ class ProcessReaderModulesChild final : public MachMultiprocess {
   void MachMultiprocessParent() override {
     ProcessReaderMac process_reader;
     ASSERT_TRUE(process_reader.Initialize(ChildTask()));
-
     const std::vector<ProcessReaderMac::Module>& modules =
         process_reader.Modules();
 
+    ModuleSet actual_modules;
+    std::set<std::string> cl_kernel_names;
+    for (size_t i = 0; i < modules.size(); ++i) {
+      auto& module = modules[i];
+      ASSERT_TRUE(module.reader);
+      uint32_t file_type = module.reader->FileType();
+      if (i == 0) {
+        EXPECT_EQ(file_type, static_cast<uint32_t>(MH_EXECUTE));
+      } else if (i == modules.size() - 1) {
+        EXPECT_EQ(file_type, static_cast<uint32_t>(MH_DYLINKER));
+
+      } else {
+        EXPECT_NE(file_type, static_cast<uint32_t>(MH_EXECUTE));
+        EXPECT_NE(file_type, static_cast<uint32_t>(MH_DYLINKER));
+      }
+      if (IsMalformedCLKernelsModule(module.reader->FileType(), module.name)) {
+        cl_kernel_names.insert(module.name);
+      }
+      actual_modules.insert(
+          std::make_pair(module.name, module.reader->Address()));
+    }
+
     // There needs to be at least an entry for the main executable, for a dylib,
     // and for dyld.
-    ASSERT_GE(modules.size(), 3u);
+    ASSERT_GE(actual_modules.size(), 3u);
 
     FileHandle read_handle = ReadPipeHandle();
 
-    uint32_t expect_modules;
+    uint32_t expect_modules_size;
     CheckedReadFileExactly(
-        read_handle, &expect_modules, sizeof(expect_modules));
-
-    ASSERT_EQ(modules.size(), expect_modules);
+        read_handle, &expect_modules_size, sizeof(expect_modules_size));
 
-    bool found_cl_kernels = false;
-    for (size_t index = 0; index < modules.size(); ++index) {
-      SCOPED_TRACE(base::StringPrintf(
-          "index %zu, name %s", index, modules[index].name.c_str()));
+    ASSERT_EQ(actual_modules.size(), expect_modules_size);
+    ModuleSet expect_modules;
 
+    for (size_t index = 0; index < expect_modules_size; ++index) {
       uint32_t expect_name_length;
       CheckedReadFileExactly(
           read_handle, &expect_name_length, sizeof(expect_name_length));
@@ -946,40 +958,18 @@ class ProcessReaderModulesChild final : public MachMultiprocess {
       // The NUL terminator is not read.
       std::string expect_name(expect_name_length, '\0');
       CheckedReadFileExactly(read_handle, &expect_name[0], expect_name_length);
-      EXPECT_EQ(modules[index].name, expect_name);
 
       mach_vm_address_t expect_address;
       CheckedReadFileExactly(
           read_handle, &expect_address, sizeof(expect_address));
-      ASSERT_TRUE(modules[index].reader);
-      EXPECT_EQ(modules[index].reader->Address(), expect_address);
-
-      bool expect_timestamp;
-      if ((index == 0 && MacOSVersionNumber() < 12'00'00) ||
-          index == modules.size() - 1) {
-        // Pre-dyld4, dyld didn’t set the main executable's timestamp, and it
-        // was reported as 0.
-        // The last module is dyld.
-        EXPECT_EQ(modules[index].timestamp, 0);
-      } else if (IsMalformedCLKernelsModule(modules[index].reader->FileType(),
-                                            modules[index].name,
-                                            &expect_timestamp)) {
-        // cl_kernels doesn’t exist as a file, but may still have a timestamp.
-        if (!expect_timestamp) {
-          EXPECT_EQ(modules[index].timestamp, 0);
-        } else {
-          EXPECT_NE(modules[index].timestamp, 0);
-        }
-        found_cl_kernels = true;
-      } else {
-        // Hope that the module didn’t change on disk.
-        VerifyImageExistenceAndTimestamp(expect_name.c_str(),
-                                         modules[index].timestamp);
+      expect_modules.insert(std::make_pair(expect_name, expect_address));
+      if (cl_kernel_names.find(expect_name) == cl_kernel_names.end()) {
+        VerifyImageExistence(expect_name.c_str());
       }
     }
-
-    EXPECT_EQ(found_cl_kernels,
+    EXPECT_EQ(cl_kernel_names.size() > 0,
               ExpectCLKernels() && ensure_cl_kernels_success_);
+    EXPECT_EQ(expect_modules, actual_modules);
   }
 
   void MachMultiprocessChild() override {
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/mac/system_snapshot_mac.cc b/external_imported/sentry-native/external/crashpad/snapshot/mac/system_snapshot_mac.cc
index 3b17252d9..334627ffe 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/mac/system_snapshot_mac.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/mac/system_snapshot_mac.cc
@@ -86,7 +86,6 @@ SystemSnapshotMac::SystemSnapshotMac()
       os_version_major_(0),
       os_version_minor_(0),
       os_version_bugfix_(0),
-      os_server_(false),
       initialized_() {
 }
 
@@ -107,7 +106,6 @@ void SystemSnapshotMac::Initialize(ProcessReaderMac* process_reader,
                          &os_version_minor_,
                          &os_version_bugfix_,
                          &os_version_build_,
-                         &os_server_,
                          &os_version_string);
 
   std::string uname_string;
@@ -304,7 +302,7 @@ SystemSnapshot::OperatingSystem SystemSnapshotMac::GetOperatingSystem() const {
 
 bool SystemSnapshotMac::OSServer() const {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
-  return os_server_;
+  return false;
 }
 
 void SystemSnapshotMac::OSVersion(int* major,
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/mac/system_snapshot_mac.h b/external_imported/sentry-native/external/crashpad/snapshot/mac/system_snapshot_mac.h
index cf8fbbe92..275ae5fec 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/mac/system_snapshot_mac.h
+++ b/external_imported/sentry-native/external/crashpad/snapshot/mac/system_snapshot_mac.h
@@ -93,7 +93,6 @@ class SystemSnapshotMac final : public SystemSnapshot {
   int os_version_major_;
   int os_version_minor_;
   int os_version_bugfix_;
-  bool os_server_;
   InitializationStateDcheck initialized_;
 };
 
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/minidump/minidump_context_converter.cc b/external_imported/sentry-native/external/crashpad/snapshot/minidump/minidump_context_converter.cc
index f2fa2ab37..ec02dff12 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/minidump/minidump_context_converter.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/minidump/minidump_context_converter.cc
@@ -266,6 +266,33 @@ bool MinidumpContextConverter::Initialize(
     context_.mips64->fir = src->fir;
 
     memcpy(&context_.mips64->fpregs, &src->fpregs, sizeof(src->fpregs));
+  } else if (context_.architecture ==
+             CPUArchitecture::kCPUArchitectureRISCV64) {
+    context_memory_.resize(sizeof(CPUContextRISCV64));
+    context_.riscv64 =
+        reinterpret_cast<CPUContextRISCV64*>(context_memory_.data());
+    const MinidumpContextRISCV64* src =
+        reinterpret_cast<const MinidumpContextRISCV64*>(
+            minidump_context.data());
+    if (minidump_context.size() < sizeof(MinidumpContextRISCV64)) {
+      return false;
+    }
+
+    if (!(src->context_flags & kMinidumpContextRISCV64)) {
+      return false;
+    }
+
+    context_.riscv64->pc = src->pc;
+
+    static_assert(sizeof(context_.riscv64->regs) == sizeof(src->regs),
+                  "GPR size mismatch");
+    memcpy(&context_.riscv64->regs, &src->regs, sizeof(src->regs));
+
+    static_assert(sizeof(context_.riscv64->fpregs) == sizeof(src->fpregs),
+                  "FPR size mismatch");
+    memcpy(&context_.riscv64->fpregs, &src->fpregs, sizeof(src->fpregs));
+
+    context_.riscv64->fcsr = src->fcsr;
   } else {
     // Architecture is listed as "unknown".
     DLOG(ERROR) << "Unknown architecture";
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/minidump/module_snapshot_minidump.cc b/external_imported/sentry-native/external/crashpad/snapshot/minidump/module_snapshot_minidump.cc
index 43229e7aa..50e5ea859 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/minidump/module_snapshot_minidump.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/minidump/module_snapshot_minidump.cc
@@ -17,6 +17,7 @@
 #include <stddef.h>
 #include <string.h>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "base/notreached.h"
 #include "minidump/minidump_extensions.h"
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/minidump/process_snapshot_minidump.cc b/external_imported/sentry-native/external/crashpad/snapshot/minidump/process_snapshot_minidump.cc
index e88a2646c..03f321719 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/minidump/process_snapshot_minidump.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/minidump/process_snapshot_minidump.cc
@@ -346,7 +346,7 @@ bool ProcessSnapshotMinidump::InitializeMiscInfo() {
   switch (stream_it->second->DataSize) {
     case sizeof(MINIDUMP_MISC_INFO_5):
     case sizeof(MINIDUMP_MISC_INFO_4):
-#if defined(WCHAR_T_IS_UTF16)
+#if defined(WCHAR_T_IS_16_BIT)
       full_version_ = base::WideToUTF8(info.BuildString);
 #else
       full_version_ = base::UTF16ToUTF8(info.BuildString);
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/minidump/process_snapshot_minidump_test.cc b/external_imported/sentry-native/external/crashpad/snapshot/minidump/process_snapshot_minidump_test.cc
index 00fc3f84d..31e304c2b 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/minidump/process_snapshot_minidump_test.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/minidump/process_snapshot_minidump_test.cc
@@ -868,8 +868,9 @@ TEST(ProcessSnapshotMinidump, ThreadsWithNames) {
 }
 
 TEST(ProcessSnapshotMinidump, System) {
-  const char* cpu_info = "GenuineIntel";
-  const uint32_t* cpu_info_bytes = reinterpret_cast<const uint32_t*>(cpu_info);
+  const char cpu_info[] = "GenuineIntel";
+  uint32_t cpu_info_bytes[3];
+  memcpy(cpu_info_bytes, cpu_info, sizeof(cpu_info_bytes));
   StringFile string_file;
 
   MINIDUMP_HEADER header = {};
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/minidump/system_snapshot_minidump.cc b/external_imported/sentry-native/external/crashpad/snapshot/minidump/system_snapshot_minidump.cc
index abccda318..58bd7b364 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/minidump/system_snapshot_minidump.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/minidump/system_snapshot_minidump.cc
@@ -68,6 +68,8 @@ CPUArchitecture SystemSnapshotMinidump::GetCPUArchitecture() const {
     case kMinidumpCPUArchitectureMIPS:
       return kCPUArchitectureMIPSEL;
     // No word on how MIPS64 is signalled
+    case kMinidumpCPUArchitectureRISCV64Breakpad:
+      return kCPUArchitectureRISCV64;
 
     default:
       return CPUArchitecture::kCPUArchitectureUnknown;
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/minidump/thread_snapshot_minidump.cc b/external_imported/sentry-native/external/crashpad/snapshot/minidump/thread_snapshot_minidump.cc
index babf4c631..10e8f485a 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/minidump/thread_snapshot_minidump.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/minidump/thread_snapshot_minidump.cc
@@ -17,7 +17,8 @@
 #include <stddef.h>
 #include <string.h>
 
-#include "base/cxx17_backports.h"
+#include <algorithm>
+
 #include "minidump/minidump_context.h"
 
 namespace crashpad {
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/sanitized/memory_snapshot_sanitized.cc b/external_imported/sentry-native/external/crashpad/snapshot/sanitized/memory_snapshot_sanitized.cc
index b4f9ba42b..58bcdde42 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/sanitized/memory_snapshot_sanitized.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/sanitized/memory_snapshot_sanitized.cc
@@ -16,6 +16,8 @@
 
 #include <string.h>
 
+#include "util/linux/pac_helper.h"
+
 namespace crashpad {
 namespace internal {
 
@@ -62,8 +64,9 @@ class MemorySanitizer : public MemorySnapshot::Delegate {
     auto words =
         reinterpret_cast<Pointer*>(static_cast<char*>(data) + aligned_offset);
     for (size_t index = 0; index < word_count; ++index) {
-      if (words[index] > MemorySnapshotSanitized::kSmallWordMax &&
-          !ranges_->Contains(words[index])) {
+      auto word = StripPACBits(words[index]);
+      if (word > MemorySnapshotSanitized::kSmallWordMax &&
+          !ranges_->Contains(word)) {
         words[index] = defaced;
       }
     }
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/sanitized/module_snapshot_sanitized.cc b/external_imported/sentry-native/external/crashpad/snapshot/sanitized/module_snapshot_sanitized.cc
index 192b4cb10..0ad2ee975 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/sanitized/module_snapshot_sanitized.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/sanitized/module_snapshot_sanitized.cc
@@ -14,6 +14,8 @@
 
 #include "snapshot/sanitized/module_snapshot_sanitized.h"
 
+#include "base/strings/pattern.h"
+
 namespace crashpad {
 namespace internal {
 
@@ -22,7 +24,7 @@ namespace {
 bool KeyIsAllowed(const std::string& name,
                   const std::vector<std::string>& allowed_keys) {
   for (const auto& key : allowed_keys) {
-    if (name == key) {
+    if (base::MatchPattern(name, key)) {
       return true;
     }
   }
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/sanitized/process_snapshot_sanitized.cc b/external_imported/sentry-native/external/crashpad/snapshot/sanitized/process_snapshot_sanitized.cc
index 1e0037064..afa1c9f84 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/sanitized/process_snapshot_sanitized.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/sanitized/process_snapshot_sanitized.cc
@@ -17,6 +17,7 @@
 #include <stdint.h>
 
 #include "snapshot/cpu_context.h"
+#include "util/linux/pac_helper.h"
 #include "util/numeric/safe_assignment.h"
 
 namespace crashpad {
@@ -61,7 +62,8 @@ class StackReferencesAddressRange : public MemorySnapshot::Delegate {
                                             aligned_sp_offset);
     size_t word_count = (size - aligned_sp_offset) / sizeof(Pointer);
     for (size_t index = 0; index < word_count; ++index) {
-      if (words[index] >= low_ && words[index] < high_) {
+      auto word = StripPACBits(words[index]);
+      if (word >= low_ && word < high_) {
         return true;
       }
     }
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/sanitized/process_snapshot_sanitized.h b/external_imported/sentry-native/external/crashpad/snapshot/sanitized/process_snapshot_sanitized.h
index c5dfa4a0a..af65fb680 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/sanitized/process_snapshot_sanitized.h
+++ b/external_imported/sentry-native/external/crashpad/snapshot/sanitized/process_snapshot_sanitized.h
@@ -53,6 +53,7 @@ class ProcessSnapshotSanitized final : public ProcessSnapshot {
   //! \param[in] allowed_annotations A list of annotations names to allow to
   //!     be returned by AnnotationsSimpleMap() or from this object's module
   //!     snapshots. If `nullptr`, all annotations will be returned.
+  //      These annotation names support pattern matching, eg: "switch-*"
   //! \param[in] allowed_memory_ranges A list of memory ranges to allow to be
   //!     accessible via Memory(), or `nullptr` to allow all ranges.
   //! \param[in] target_module_address An address in the target process'
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/sanitized/process_snapshot_sanitized_test.cc b/external_imported/sentry-native/external/crashpad/snapshot/sanitized/process_snapshot_sanitized_test.cc
index ba1272b5c..329c3c760 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/sanitized/process_snapshot_sanitized_test.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/sanitized/process_snapshot_sanitized_test.cc
@@ -79,6 +79,8 @@ class ExceptionGenerator {
 };
 
 constexpr char kAllowedAnnotationName[] = "name_of_allowed_anno";
+constexpr char kAllowedAnnotationNamePattern[] = "name_of_another_*";
+constexpr char kAllowedAnnotationNamePatternActual[] = "name_of_another_anno";
 constexpr char kAllowedAnnotationValue[] = "some_value";
 constexpr char kNonAllowedAnnotationName[] = "non_allowed_anno";
 constexpr char kNonAllowedAnnotationValue[] = "private_annotation";
@@ -99,6 +101,10 @@ void ChildTestFunction() {
   static StringAnnotation<32> allowed_annotation(kAllowedAnnotationName);
   allowed_annotation.Set(kAllowedAnnotationValue);
 
+  static StringAnnotation<32> allowed_matched_annotation(
+      kAllowedAnnotationNamePatternActual);
+  allowed_matched_annotation.Set(kAllowedAnnotationValue);
+
   static StringAnnotation<32> non_allowed_annotation(kNonAllowedAnnotationName);
   non_allowed_annotation.Set(kNonAllowedAnnotationValue);
 
@@ -129,11 +135,15 @@ CRASHPAD_CHILD_TEST_MAIN(ChildToBeSanitized) {
 
 void ExpectAnnotations(ProcessSnapshot* snapshot, bool sanitized) {
   bool found_allowed = false;
+  bool found_matched_allowed = false;
   bool found_non_allowed = false;
   for (auto module : snapshot->Modules()) {
     for (const auto& anno : module->AnnotationObjects()) {
       if (anno.name == kAllowedAnnotationName) {
         found_allowed = true;
+      }
+      if (anno.name == kAllowedAnnotationNamePatternActual) {
+        found_matched_allowed = true;
       } else if (anno.name == kNonAllowedAnnotationName) {
         found_non_allowed = true;
       }
@@ -141,6 +151,7 @@ void ExpectAnnotations(ProcessSnapshot* snapshot, bool sanitized) {
   }
 
   EXPECT_TRUE(found_allowed);
+  EXPECT_TRUE(found_matched_allowed);
   if (sanitized) {
     EXPECT_FALSE(found_non_allowed);
   } else {
@@ -279,6 +290,7 @@ class SanitizeTest : public MultiprocessExec {
 
     auto allowed_annotations = std::make_unique<std::vector<std::string>>();
     allowed_annotations->push_back(kAllowedAnnotationName);
+    allowed_annotations->push_back(kAllowedAnnotationNamePattern);
 
     auto allowed_memory_ranges =
         std::make_unique<std::vector<std::pair<VMAddress, VMAddress>>>();
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/test/test_cpu_context.cc b/external_imported/sentry-native/external/crashpad/snapshot/test/test_cpu_context.cc
index 7efbf5af8..998229466 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/test/test_cpu_context.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/test/test_cpu_context.cc
@@ -295,5 +295,27 @@ void InitializeCPUContextMIPS64(CPUContext* context, uint32_t seed) {
   mips64->dsp_control = value++;
 }
 
+void InitializeCPUContextRISCV64(CPUContext* context, uint32_t seed) {
+  context->architecture = kCPUArchitectureRISCV64;
+  CPUContextRISCV64* riscv64 = context->riscv64;
+
+  if (seed == 0) {
+    memset(riscv64, 0, sizeof(*riscv64));
+    return;
+  }
+
+  uint32_t value = seed;
+
+  riscv64->pc = value++;
+  for (size_t index = 0; index < std::size(riscv64->regs); ++index) {
+    riscv64->regs[index] = value++;
+  }
+
+  for (size_t index = 0; index < std::size(riscv64->fpregs); ++index) {
+    riscv64->fpregs[index] = value++;
+  }
+  riscv64->fcsr = value++;
+}
+
 }  // namespace test
 }  // namespace crashpad
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/test/test_cpu_context.h b/external_imported/sentry-native/external/crashpad/snapshot/test/test_cpu_context.h
index e4372ceed..053dec28b 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/test/test_cpu_context.h
+++ b/external_imported/sentry-native/external/crashpad/snapshot/test/test_cpu_context.h
@@ -63,6 +63,7 @@ void InitializeCPUContextARM(CPUContext* context, uint32_t seed);
 void InitializeCPUContextARM64(CPUContext* context, uint32_t seed);
 void InitializeCPUContextMIPS(CPUContext* context, uint32_t seed);
 void InitializeCPUContextMIPS64(CPUContext* context, uint32_t seed);
+void InitializeCPUContextRISCV64(CPUContext* context, uint32_t seed);
 //! \}
 
 }  // namespace test
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/win/end_to_end_test.py b/external_imported/sentry-native/external/crashpad/snapshot/win/end_to_end_test.py
index 136d5b9ab..25f661c1a 100755
--- a/external_imported/sentry-native/external/crashpad/snapshot/win/end_to_end_test.py
+++ b/external_imported/sentry-native/external/crashpad/snapshot/win/end_to_end_test.py
@@ -212,6 +212,12 @@ def GetDumpFromZ7Program(out_dir, pipe_name):
                               win32con.EXCEPTION_ACCESS_VIOLATION)
 
 
+def GetDumpFromHeapCorruptingProgram(out_dir, pipe_name):
+    STATUS_HEAP_CORRUPTION = 0xC0000374
+    return GetDumpFromProgram(out_dir, pipe_name, 'heap_corrupting_program.exe',
+                              STATUS_HEAP_CORRUPTION)
+
+
 def GetDumpFromFastFailProgram(out_dir, pipe_name, *args):
     STATUS_STACK_BUFFER_OVERRUN = 0xc0000409
     return GetDumpFromProgram(out_dir, pipe_name, 'fastfail_program.exe',
@@ -444,6 +450,14 @@ def RunSigAbrtTest(cdb_path, sigabrt_main_path, sigabrt_background_path):
     out.Check('code 40000015', 'got sigabrt signal from background thread')
 
 
+def RunHeapCorruptionTest(cdb_path, heap_path):
+    """Runs tests on heap corruption caught using the vectored handler."""
+    out = CdbRun(cdb_path, heap_path, '.ecxr;k')
+    out.Check('code c0000374', 'captured exception from heap corruption crash')
+    out.Check('::HeapCorruptionCrash', 'See expected throwing function')
+    out = CdbRun(cdb_path, heap_path, '.ecxr;k')
+
+
 def RunFastFailDumpTest(cdb_path, fastfail_path):
     """Runs tests on __fastfail() caught using the runtime exception helper."""
     out = CdbRun(cdb_path, fastfail_path, '.ecxr;k')
@@ -541,8 +555,14 @@ def main(args):
                 return 1
             Run7zDumpTest(cdb_path, z7_dump_path)
 
+        heap_path = GetDumpFromHeapCorruptingProgram(args[0], pipe_name)
+        if not heap_path:
+            return 1
+        RunHeapCorruptionTest(cdb_path, heap_path)
+
         # __fastfail() & CFG crash caught by WerRuntimeExceptionHelperModule.
-        if (Win32_20H1()):
+        # TODO(crashpad:458) These are not working when launched from python.
+        if (False and Win32_20H1()):
             cfg_path = GetDumpFromFastFailProgram(args[0], pipe_name, "cf")
             if not cfg_path:
                 return 1
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/win/exception_snapshot_win.cc b/external_imported/sentry-native/external/crashpad/snapshot/win/exception_snapshot_win.cc
index 2a70c5c0c..b8931444a 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/win/exception_snapshot_win.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/win/exception_snapshot_win.cc
@@ -14,6 +14,8 @@
 
 #include "snapshot/win/exception_snapshot_win.h"
 
+#include <algorithm>
+
 #include "base/logging.h"
 #include "snapshot/capture_memory.h"
 #include "snapshot/memory_snapshot.h"
@@ -261,8 +263,12 @@ bool ExceptionSnapshotWin::InitializeFromExceptionPointers(
     exception_code_ = first_record.ExceptionCode;
     exception_flags_ = first_record.ExceptionFlags;
     exception_address_ = first_record.ExceptionAddress;
-    for (DWORD i = 0; i < first_record.NumberParameters; ++i)
+
+    const DWORD number_parameters = std::min<DWORD>(
+        first_record.NumberParameters, EXCEPTION_MAXIMUM_PARAMETERS);
+    for (DWORD i = 0; i < number_parameters; ++i) {
       codes_.push_back(first_record.ExceptionInformation[i]);
+    }
     if (first_record.ExceptionRecord) {
       // https://crashpad.chromium.org/bug/43
       LOG(WARNING) << "dropping chained ExceptionRecord";
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/win/exception_snapshot_win_test.cc b/external_imported/sentry-native/external/crashpad/snapshot/win/exception_snapshot_win_test.cc
index dcdc3cf4d..aa78e5579 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/win/exception_snapshot_win_test.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/win/exception_snapshot_win_test.cc
@@ -14,11 +14,14 @@
 
 #include "snapshot/win/exception_snapshot_win.h"
 
+#include <windows.h>
+
 #include <string>
 
 #include "base/files/file_path.h"
 #include "base/strings/utf_string_conversions.h"
 #include "gtest/gtest.h"
+#include "snapshot/win/exception_snapshot_win.h"
 #include "snapshot/win/process_snapshot_win.h"
 #include "test/errors.h"
 #include "test/test_paths.h"
@@ -315,6 +318,48 @@ TEST(SimulateCrash, ChildDumpWithoutCrashingWOW64) {
 }
 #endif  // ARCH_CPU_64_BITS
 
+TEST(ExceptionSnapshot, TooManyExceptionParameters) {
+  ProcessReaderWin process_reader;
+  ASSERT_TRUE(process_reader.Initialize(GetCurrentProcess(),
+                                        ProcessSuspensionState::kRunning));
+
+  // Construct a fake exception record and CPU context.
+  auto exception_record = std::make_unique<EXCEPTION_RECORD>();
+  exception_record->ExceptionCode = STATUS_FATAL_APP_EXIT;
+  exception_record->ExceptionFlags = EXCEPTION_NONCONTINUABLE;
+  exception_record->ExceptionAddress = reinterpret_cast<PVOID>(0xFA15E);
+  // One more than is permitted in the struct.
+  exception_record->NumberParameters = EXCEPTION_MAXIMUM_PARAMETERS + 1;
+  for (int i = 0; i < EXCEPTION_MAXIMUM_PARAMETERS; ++i) {
+    exception_record->ExceptionInformation[i] = 1000 + i;
+  }
+
+  auto cpu_context = std::make_unique<internal::CPUContextUnion>();
+
+  auto exception_pointers = std::make_unique<EXCEPTION_POINTERS>();
+  exception_pointers->ExceptionRecord =
+      reinterpret_cast<PEXCEPTION_RECORD>(exception_record.get());
+  exception_pointers->ContextRecord =
+      reinterpret_cast<PCONTEXT>(cpu_context.get());
+
+  internal::ExceptionSnapshotWin snapshot;
+  ASSERT_TRUE(snapshot.Initialize(
+      &process_reader,
+      GetCurrentThreadId(),
+      reinterpret_cast<WinVMAddress>(exception_pointers.get()),
+      nullptr));
+
+  EXPECT_EQ(STATUS_FATAL_APP_EXIT, snapshot.Exception());
+  EXPECT_EQ(static_cast<uint32_t>(EXCEPTION_NONCONTINUABLE),
+            snapshot.ExceptionInfo());
+  EXPECT_EQ(0xFA15Eu, snapshot.ExceptionAddress());
+  EXPECT_EQ(static_cast<size_t>(EXCEPTION_MAXIMUM_PARAMETERS),
+            snapshot.Codes().size());
+  for (size_t i = 0; i < EXCEPTION_MAXIMUM_PARAMETERS; ++i) {
+    EXPECT_EQ(1000 + i, snapshot.Codes()[i]);
+  }
+}
+
 }  // namespace
 }  // namespace test
 }  // namespace crashpad
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/win/process_reader_win.cc b/external_imported/sentry-native/external/crashpad/snapshot/win/process_reader_win.cc
index 7573a7350..8c3bb160d 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/win/process_reader_win.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/win/process_reader_win.cc
@@ -22,6 +22,7 @@
 
 #include <memory>
 
+#include "base/check_op.h"
 #include "base/notreached.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ -173,9 +174,12 @@ void DoStackWalk(ProcessReaderWin::Thread* thread,
   //   ctx = (LPVOID)ctx_;
   // }
 
-// TODO: we dont support this right away, maybe in the future
-// #elif defined(ARCH_CPU_ARM64)
-//  machine_type = IMAGE_FILE_MACHINE_ARM64;
+#elif defined(ARCH_CPU_ARM64)
+  machine_type = IMAGE_FILE_MACHINE_ARM64;
+  ctx = *thread->context.context<CONTEXT>();
+  stack_frame.AddrPC.Offset = ctx.Pc;
+  stack_frame.AddrFrame.Offset = ctx.Fp;
+  stack_frame.AddrStack.Offset = ctx.Sp;
 #else
 #error Unsupported Windows Arch
 #endif  // ARCH_CPU_X86
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/win/process_snapshot_win.cc b/external_imported/sentry-native/external/crashpad/snapshot/win/process_snapshot_win.cc
index 9d5990148..6c06165f6 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/win/process_snapshot_win.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/win/process_snapshot_win.cc
@@ -19,6 +19,7 @@
 
 #include <algorithm>
 #include <iterator>
+#include <string_view>
 #include <utility>
 
 #include "base/logging.h"
@@ -329,7 +330,7 @@ void ProcessSnapshotWin::InitializeUnloadedModules() {
           uet.SizeOfImage,
           uet.CheckSum,
           uet.TimeDateStamp,
-          base::WideToUTF8(base::WStringPiece(
+          base::WideToUTF8(std::wstring_view(
               uet.ImageName,
               wcsnlen(uet.ImageName, std::size(uet.ImageName))))));
     }
diff --git a/external_imported/sentry-native/external/crashpad/snapshot/win/process_snapshot_win_test.cc b/external_imported/sentry-native/external/crashpad/snapshot/win/process_snapshot_win_test.cc
index 5e2249856..1bc56ed37 100644
--- a/external_imported/sentry-native/external/crashpad/snapshot/win/process_snapshot_win_test.cc
+++ b/external_imported/sentry-native/external/crashpad/snapshot/win/process_snapshot_win_test.cc
@@ -100,10 +100,10 @@ void TestImageReaderChild(const TestPaths::Architecture architecture) {
       }
     }
 
-    // Confirm that less than 1M of extra data was gathered. The cap is set to
+    // Confirm that less than 1.2M of extra data was gathered. The cap is set to
     // only 100K, but there are other "extra memory" regions that aren't
     // included in the cap. (Completely uncapped it would be > 10M.)
-    EXPECT_LT(extra_memory_total, 1000000u);
+    EXPECT_LT(extra_memory_total, 1200000u);
   }
 
   // Tell the child it can terminate.
diff --git a/external_imported/sentry-native/external/crashpad/test/BUILD.gn b/external_imported/sentry-native/external/crashpad/test/BUILD.gn
index bf21bfeeb..f20c66f29 100644
--- a/external_imported/sentry-native/external/crashpad/test/BUILD.gn
+++ b/external_imported/sentry-native/external/crashpad/test/BUILD.gn
@@ -61,12 +61,10 @@ static_library("test") {
   # TODO(crbug.com/812974): Remove !crashpad_is_fuchsia when Fuchsia is no
   # longer treated as a posix platform.
   if (crashpad_is_posix && !crashpad_is_fuchsia) {
-    sources += [
-      "scoped_set_thread_name_posix.cc",
-    ]
+    sources += [ "scoped_set_thread_name_posix.cc" ]
   }
 
-  if (crashpad_is_mac || crashpad_is_ios) {
+  if (crashpad_is_apple) {
     sources += [
       "mac/mach_errors.cc",
       "mac/mach_errors.h",
@@ -135,9 +133,9 @@ static_library("test") {
   data = [ "test_paths_test_data_root.txt" ]
 
   deps = [
+    "$mini_chromium_source_parent:base",
     "../compat",
     "../third_party/googletest:googletest",
-    "$mini_chromium_source_parent:base",
     "../util",
   ]
 
@@ -214,10 +212,10 @@ source_set("test_test") {
 
   deps = [
     ":test",
+    "$mini_chromium_source_parent:base",
     "../compat",
     "../third_party/googletest:googlemock",
     "../third_party/googletest:googletest",
-    "$mini_chromium_source_parent:base",
     "../util",
   ]
 
@@ -243,10 +241,10 @@ static_library("googlemock_main") {
   defines = [ "CRASHPAD_TEST_LAUNCHER_GOOGLEMOCK" ]
   deps = [
     ":test",
-    "../third_party/googletest:googlemock",
-    "../third_party/googletest:googletest",
     "$mini_chromium_source_parent:base",
     "$mini_chromium_source_parent:base_test_support",
+    "../third_party/googletest:googlemock",
+    "../third_party/googletest:googletest",
   ]
   if (crashpad_is_android) {
     deps += [ "../util" ]
@@ -263,9 +261,9 @@ static_library("googletest_main") {
   defines = [ "CRASHPAD_TEST_LAUNCHER_GOOGLETEST" ]
   deps = [
     ":test",
-    "../third_party/googletest:googletest",
     "$mini_chromium_source_parent:base",
     "$mini_chromium_source_parent:base_test_support",
+    "../third_party/googletest:googletest",
   ]
   if (crashpad_is_android) {
     deps += [ "../util" ]
diff --git a/external_imported/sentry-native/external/crashpad/test/fuchsia_crashpad_tests.cml b/external_imported/sentry-native/external/crashpad/test/fuchsia_crashpad_tests.cml
index b5c0c8a00..63ec2e20d 100644
--- a/external_imported/sentry-native/external/crashpad/test/fuchsia_crashpad_tests.cml
+++ b/external_imported/sentry-native/external/crashpad/test/fuchsia_crashpad_tests.cml
@@ -4,6 +4,7 @@
 {
     include: [
         "//src/sys/test_runners/elf/ambient_exec.shard.cml",
+        "inspect/offer.shard.cml",
         "syslog/client.shard.cml",
     ],
     program: {
diff --git a/external_imported/sentry-native/external/crashpad/test/ios/BUILD.gn b/external_imported/sentry-native/external/crashpad/test/ios/BUILD.gn
index c17f461c1..6b1deca85 100644
--- a/external_imported/sentry-native/external/crashpad/test/ios/BUILD.gn
+++ b/external_imported/sentry-native/external/crashpad/test/ios/BUILD.gn
@@ -40,7 +40,7 @@ source_set("google_test_runner") {
   configs += [ "../..:crashpad_config" ]
   deps = [
     "../$mini_chromium_source_parent:base",
-    "../../build:ios_enable_arc",
+    "../../build:apple_enable_arc",
     "../../build:ios_xctest",
     "../../test/ios:google_test_runner_shared_headers",
   ]
@@ -57,7 +57,7 @@ source_set("google_test_setup") {
   deps = [
     ":google_test_runner_shared_headers",
     "../$mini_chromium_source_parent:base",
-    "../../build:ios_enable_arc",
+    "../../build:apple_enable_arc",
     "../../third_party/googletest:googletest",
   ]
   frameworks = [ "UIKit.framework" ]
@@ -66,9 +66,13 @@ source_set("google_test_setup") {
 source_set("xcuitests") {
   testonly = true
   sources = [ "crash_type_xctest.mm" ]
-  configs += [ "../..:crashpad_config" ]
+  configs += [
+    "../..:crashpad_config",
+    "../../build:crashpad_is_in_chromium",
+  ]
+
   deps = [
-    "../../build:ios_enable_arc",
+    "../../build:apple_enable_arc",
     "../../build:ios_xctest",
     "../../client:common",
     "../../test/ios/host:app_shared_sources",
diff --git a/external_imported/sentry-native/external/crashpad/test/ios/cptest_google_test_runner.mm b/external_imported/sentry-native/external/crashpad/test/ios/cptest_google_test_runner.mm
index 9e950393e..3958f8c1a 100644
--- a/external_imported/sentry-native/external/crashpad/test/ios/cptest_google_test_runner.mm
+++ b/external_imported/sentry-native/external/crashpad/test/ios/cptest_google_test_runner.mm
@@ -18,10 +18,6 @@
 #include "base/check.h"
 #import "test/ios/cptest_google_test_runner_delegate.h"
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 @interface CPTestGoogleTestRunner : XCTestCase
 @end
 
diff --git a/external_imported/sentry-native/external/crashpad/test/ios/crash_type_xctest.mm b/external_imported/sentry-native/external/crashpad/test/ios/crash_type_xctest.mm
index 8e32f11f7..8d4038db0 100644
--- a/external_imported/sentry-native/external/crashpad/test/ios/crash_type_xctest.mm
+++ b/external_imported/sentry-native/external/crashpad/test/ios/crash_type_xctest.mm
@@ -24,10 +24,6 @@
 #include "util/mach/exception_types.h"
 #include "util/mach/mach_extensions.h"
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 @interface CPTestTestCase : XCTestCase {
   XCUIApplication* app_;
   CPTestSharedObject* rootObject_;
@@ -150,10 +146,16 @@ - (void)testBadAccess {
 
 - (void)testException {
   [rootObject_ crashException];
+  // After https://reviews.llvm.org/D141222 exceptions call
+  // __libcpp_verbose_abort, which Chromium sets to `brk 0` in release.
+#if defined(CRASHPAD_IS_IN_CHROMIUM) && defined(NDEBUG)
+  [self verifyCrashReportException:SIGABRT];
+#else
   [self verifyCrashReportException:EXC_SOFT_SIGNAL];
   NSNumber* report_exception;
   XCTAssertTrue([rootObject_ pendingReportExceptionInfo:&report_exception]);
   XCTAssertEqual(report_exception.intValue, SIGABRT);
+#endif
 }
 
 - (void)testNSException {
@@ -169,6 +171,16 @@ - (void)testNSException {
       isEqualToString:@"NSInternalInconsistencyException"]);
 }
 
+- (void)testNotAnNSException {
+  [rootObject_ crashNotAnNSException];
+  // When @throwing something other than an NSException the
+  // UncaughtExceptionHandler is not called, so the application SIGABRTs.
+  [self verifyCrashReportException:EXC_SOFT_SIGNAL];
+  NSNumber* report_exception;
+  XCTAssertTrue([rootObject_ pendingReportExceptionInfo:&report_exception]);
+  XCTAssertEqual(report_exception.intValue, SIGABRT);
+}
+
 - (void)testUnhandledNSException {
   [rootObject_ crashUnhandledNSException];
   [self verifyCrashReportException:crashpad::kMachExceptionFromNSException];
@@ -374,6 +386,17 @@ - (void)testSimultaneousCrash {
   XCTAssertEqual([rootObject_ pendingReportCount], 1);
 }
 
+- (void)testSimultaneousNSException {
+  [rootObject_ catchConcurrentNSException];
+
+  // The app should not crash
+  XCTAssertTrue(app_.state == XCUIApplicationStateRunningForeground);
+
+  // No report should be generated.
+  [rootObject_ processIntermediateDumps];
+  XCTAssertEqual([rootObject_ pendingReportCount], 0);
+}
+
 - (void)testCrashInHandlerReentrant {
   XCTAssertTrue(app_.state == XCUIApplicationStateRunningForeground);
   rootObject_ = [EDOClientService rootObjectWithPort:12345];
diff --git a/external_imported/sentry-native/external/crashpad/test/ios/google_test_setup.mm b/external_imported/sentry-native/external/crashpad/test/ios/google_test_setup.mm
index dc71c672c..e68f4d011 100644
--- a/external_imported/sentry-native/external/crashpad/test/ios/google_test_setup.mm
+++ b/external_imported/sentry-native/external/crashpad/test/ios/google_test_setup.mm
@@ -20,10 +20,6 @@
 #include "gtest/gtest.h"
 #include "test/ios/cptest_google_test_runner_delegate.h"
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 @interface UIApplication (Testing)
 - (void)_terminateWithStatus:(int)status;
 @end
diff --git a/external_imported/sentry-native/external/crashpad/test/ios/host/BUILD.gn b/external_imported/sentry-native/external/crashpad/test/ios/host/BUILD.gn
index 77f145d0e..7a735f34d 100644
--- a/external_imported/sentry-native/external/crashpad/test/ios/host/BUILD.gn
+++ b/external_imported/sentry-native/external/crashpad/test/ios/host/BUILD.gn
@@ -24,7 +24,7 @@ source_set("app_shared_sources") {
   testonly = true
   sources = [ "cptest_shared_object.h" ]
   configs += [ "../../..:crashpad_config" ]
-  deps = [ "../../../build:ios_enable_arc" ]
+  deps = [ "../../../build:apple_enable_arc" ]
   frameworks = [ "UIKit.framework" ]
 }
 
@@ -42,7 +42,7 @@ static_library("app_host_sources") {
   configs += [ "../../..:crashpad_config" ]
   deps = [
     ":app_shared_sources",
-    "../../../build:ios_enable_arc",
+    "../../../build:apple_enable_arc",
     "../../../client",
     "../../../snapshot",
     "../../../test",
@@ -65,8 +65,11 @@ bundle_data("crashy_module_bundle") {
 }
 
 ios_app_bundle("ios_crash_xcuitests") {
-  info_plist = "Info.plist"
   testonly = true
+  info_plist = "Info.plist"
+  if (crashpad_is_in_chromium) {
+    bundle_identifier = shared_bundle_id_for_test_apps
+  }
   deps = [
     ":app_host_sources",
     ":crashy_module_bundle",
diff --git a/external_imported/sentry-native/external/crashpad/test/ios/host/Info.plist b/external_imported/sentry-native/external/crashpad/test/ios/host/Info.plist
index 4c62e9695..16716116f 100644
--- a/external_imported/sentry-native/external/crashpad/test/ios/host/Info.plist
+++ b/external_imported/sentry-native/external/crashpad/test/ios/host/Info.plist
@@ -9,7 +9,7 @@
   <key>CFBundleExecutable</key>
   <string>${EXECUTABLE_NAME}</string>
   <key>CFBundleIdentifier</key>
-  <string>${IOS_BUNDLE_ID_PREFIX}.googletest.${EXECUTABLE_NAME:rfc1034identifier}</string>
+  <string>${BUNDLE_IDENTIFIER}</string>
   <key>CFBundleInfoDictionaryVersion</key>
   <string>6.0</string>
   <key>CFBundleName</key>
diff --git a/external_imported/sentry-native/external/crashpad/test/ios/host/cptest_application_delegate.mm b/external_imported/sentry-native/external/crashpad/test/ios/host/cptest_application_delegate.mm
index c2ee1949e..531a4cde1 100644
--- a/external_imported/sentry-native/external/crashpad/test/ios/host/cptest_application_delegate.mm
+++ b/external_imported/sentry-native/external/crashpad/test/ios/host/cptest_application_delegate.mm
@@ -50,10 +50,6 @@
 #include "util/ios/raw_logging.h"
 #include "util/thread/thread.h"
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 using OperationStatus = crashpad::CrashReportDatabase::OperationStatus;
 using Report = crashpad::CrashReportDatabase::Report;
 
@@ -110,13 +106,17 @@ OperationStatus GetPendingReports(std::vector<Report>* pending_reports) {
 
 UIWindow* GetAnyWindow() {
 #if defined(__IPHONE_15_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_15_0
+  UIWindowScene* scene = reinterpret_cast<UIWindowScene*>(
+      [UIApplication sharedApplication].connectedScenes.anyObject);
   if (@available(iOS 15.0, *)) {
-    UIWindowScene* scene = reinterpret_cast<UIWindowScene*>(
-        [UIApplication sharedApplication].connectedScenes.anyObject);
     return scene.keyWindow;
+  } else {
+    return [scene.windows firstObject];
   }
-#endif
+
+#else
   return [UIApplication sharedApplication].windows[0];
+#endif
 }
 
 [[clang::optnone]] void recurse(int counter) {
@@ -337,6 +337,10 @@ - (void)crashNSException {
   });
 }
 
+- (void)crashNotAnNSException {
+  @throw @"Boom";
+}
+
 - (void)crashUnhandledNSException {
   std::thread t([self]() {
     @autoreleasepool {
@@ -500,6 +504,34 @@ - (void)crashConcurrentSignalAndMach {
   mach_thread.Join();
 }
 
+class ThrowNSExceptionThread : public crashpad::Thread {
+ public:
+  explicit ThrowNSExceptionThread() : Thread() {}
+
+ private:
+  void ThreadMain() override {
+    for (int i = 0; i < 300; ++i) {
+      @try {
+        NSArray* empty_array = @[];
+        [empty_array objectAtIndex:42];
+      } @catch (NSException* exception) {
+      } @finally {
+      }
+    }
+  }
+};
+
+- (void)catchConcurrentNSException {
+  std::vector<ThrowNSExceptionThread> race_threads(30);
+  for (ThrowNSExceptionThread& race_thread : race_threads) {
+    race_thread.Start();
+  }
+
+  for (ThrowNSExceptionThread& race_thread : race_threads) {
+    race_thread.Join();
+  }
+}
+
 - (void)crashInHandlerReentrant {
   crashpad::CrashpadClient client_;
   client_.SetMachExceptionCallbackForTesting(abort);
diff --git a/external_imported/sentry-native/external/crashpad/test/ios/host/cptest_crash_view_controller.mm b/external_imported/sentry-native/external/crashpad/test/ios/host/cptest_crash_view_controller.mm
index 8e4076e3b..c866388c1 100644
--- a/external_imported/sentry-native/external/crashpad/test/ios/host/cptest_crash_view_controller.mm
+++ b/external_imported/sentry-native/external/crashpad/test/ios/host/cptest_crash_view_controller.mm
@@ -14,10 +14,6 @@
 
 #import "test/ios/host/cptest_crash_view_controller.h"
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 @implementation CPTestCrashViewController
 
 - (void)loadView {
diff --git a/external_imported/sentry-native/external/crashpad/test/ios/host/cptest_shared_object.h b/external_imported/sentry-native/external/crashpad/test/ios/host/cptest_shared_object.h
index d992458b2..21011ce42 100644
--- a/external_imported/sentry-native/external/crashpad/test/ios/host/cptest_shared_object.h
+++ b/external_imported/sentry-native/external/crashpad/test/ios/host/cptest_shared_object.h
@@ -73,6 +73,9 @@
 // Trigger a crash with an uncaught NSException.
 - (void)crashNSException;
 
+// Trigger a crash throwing something that isn't an NSException (an NSString).
+- (void)crashNotAnNSException;
+
 // Trigger a crash with an uncaught and unhandled NSException.
 - (void)crashUnhandledNSException;
 
@@ -103,6 +106,9 @@
 // Triggers a simulataneous Mach exception and signal in different threads.
 - (void)crashConcurrentSignalAndMach;
 
+// Triggers simultaneous caught NSExceptions
+- (void)catchConcurrentNSException;
+
 // Triggers a SIGABRT signal while handling an NSException to test reentrant
 // exceptions.
 - (void)crashInHandlerReentrant;
diff --git a/external_imported/sentry-native/external/crashpad/test/ios/host/handler_forbidden_allocators.cc b/external_imported/sentry-native/external/crashpad/test/ios/host/handler_forbidden_allocators.cc
index 34e93e3a6..65e0a136b 100644
--- a/external_imported/sentry-native/external/crashpad/test/ios/host/handler_forbidden_allocators.cc
+++ b/external_imported/sentry-native/external/crashpad/test/ios/host/handler_forbidden_allocators.cc
@@ -17,9 +17,11 @@
 #include <CoreFoundation/CoreFoundation.h>
 #include <malloc/malloc.h>
 #include <pthread.h>
+
 #include <limits>
 
-#include "base/mac/mach_logging.h"
+#include "base/apple/mach_logging.h"
+#include "base/check_op.h"
 #include "client/crashpad_client.h"
 #include "util/ios/raw_logging.h"
 
@@ -30,7 +32,25 @@ namespace {
 
 uint64_t g_main_thread = 0;
 uint64_t g_mach_exception_thread = 0;
-malloc_zone_t g_old_zone;
+
+// Somewhat simplified logic copied from Chromium's
+// base/allocator/partition_allocator/shim/malloc_zone_functions_apple.h. The
+// arrays g_original_zones and g_original_zones_ptr stores all information about
+// malloc zones before they are shimmed. This information needs to be accessed
+// during dispatch back into the zone.
+constexpr int kMaxZoneCount = 30;
+malloc_zone_t g_original_zones[kMaxZoneCount];
+malloc_zone_t* g_original_zones_ptr[kMaxZoneCount];
+unsigned int g_zone_count = 0;
+
+struct _malloc_zone_t original_zone_for_zone(struct _malloc_zone_t* zone) {
+  for (unsigned int i = 0; i < g_zone_count; ++i) {
+    if (g_original_zones_ptr[i] == zone) {
+      return g_original_zones[i];
+    }
+  }
+  return g_original_zones[0];
+}
 
 bool is_handler_thread() {
   uint64_t thread_self;
@@ -44,7 +64,7 @@ void* handler_forbidden_malloc(struct _malloc_zone_t* zone, size_t size) {
     CRASHPAD_RAW_LOG("handler_forbidden_malloc allocator used in handler.");
     exit(EXIT_FAILURE);
   }
-  return g_old_zone.malloc(zone, size);
+  return original_zone_for_zone(zone).malloc(zone, size);
 }
 
 void* handler_forbidden_calloc(struct _malloc_zone_t* zone,
@@ -54,7 +74,7 @@ void* handler_forbidden_calloc(struct _malloc_zone_t* zone,
     CRASHPAD_RAW_LOG("handler_forbidden_calloc allocator used in handler.");
     exit(EXIT_FAILURE);
   }
-  return g_old_zone.calloc(zone, num_items, size);
+  return original_zone_for_zone(zone).calloc(zone, num_items, size);
 }
 
 void* handler_forbidden_valloc(struct _malloc_zone_t* zone, size_t size) {
@@ -62,7 +82,7 @@ void* handler_forbidden_valloc(struct _malloc_zone_t* zone, size_t size) {
     CRASHPAD_RAW_LOG("handler_forbidden_valloc allocator used in handler.");
     exit(EXIT_FAILURE);
   }
-  return g_old_zone.valloc(zone, size);
+  return original_zone_for_zone(zone).valloc(zone, size);
 }
 
 void handler_forbidden_free(struct _malloc_zone_t* zone, void* ptr) {
@@ -70,7 +90,7 @@ void handler_forbidden_free(struct _malloc_zone_t* zone, void* ptr) {
     CRASHPAD_RAW_LOG("handler_forbidden_free allocator used in handler.");
     exit(EXIT_FAILURE);
   }
-  g_old_zone.free(zone, ptr);
+  original_zone_for_zone(zone).free(zone, ptr);
 }
 
 void* handler_forbidden_realloc(struct _malloc_zone_t* zone,
@@ -80,7 +100,7 @@ void* handler_forbidden_realloc(struct _malloc_zone_t* zone,
     CRASHPAD_RAW_LOG("handler_forbidden_realloc allocator used in handler.");
     exit(EXIT_FAILURE);
   }
-  return g_old_zone.realloc(zone, ptr, size);
+  return original_zone_for_zone(zone).realloc(zone, ptr, size);
 }
 
 void handler_forbidden_destroy(struct _malloc_zone_t* zone) {
@@ -88,7 +108,7 @@ void handler_forbidden_destroy(struct _malloc_zone_t* zone) {
     CRASHPAD_RAW_LOG("handler_forbidden_destroy allocator used in handler.");
     exit(EXIT_FAILURE);
   }
-  g_old_zone.destroy(zone);
+  original_zone_for_zone(zone).destroy(zone);
 }
 
 void* handler_forbidden_memalign(struct _malloc_zone_t* zone,
@@ -98,7 +118,7 @@ void* handler_forbidden_memalign(struct _malloc_zone_t* zone,
     CRASHPAD_RAW_LOG("handler_forbidden_memalign allocator used in handler.");
     exit(EXIT_FAILURE);
   }
-  return g_old_zone.memalign(zone, alignment, size);
+  return original_zone_for_zone(zone).memalign(zone, alignment, size);
 }
 
 unsigned handler_forbidden_batch_malloc(struct _malloc_zone_t* zone,
@@ -110,7 +130,8 @@ unsigned handler_forbidden_batch_malloc(struct _malloc_zone_t* zone,
         "handler_forbidden_batch_malloc allocator used in handler.");
     exit(EXIT_FAILURE);
   }
-  return g_old_zone.batch_malloc(zone, size, results, num_requested);
+  return original_zone_for_zone(zone).batch_malloc(
+      zone, size, results, num_requested);
 }
 
 void handler_forbidden_batch_free(struct _malloc_zone_t* zone,
@@ -120,7 +141,7 @@ void handler_forbidden_batch_free(struct _malloc_zone_t* zone,
     CRASHPAD_RAW_LOG("handler_forbidden_batch_free allocator used in handler.");
     exit(EXIT_FAILURE);
   }
-  g_old_zone.batch_free(zone, to_be_freed, num_to_be_freed);
+  original_zone_for_zone(zone).batch_free(zone, to_be_freed, num_to_be_freed);
 }
 
 void handler_forbidden_free_definite_size(struct _malloc_zone_t* zone,
@@ -131,7 +152,7 @@ void handler_forbidden_free_definite_size(struct _malloc_zone_t* zone,
         "handler_forbidden_free_definite_size allocator used in handler.");
     exit(EXIT_FAILURE);
   }
-  g_old_zone.free_definite_size(zone, ptr, size);
+  original_zone_for_zone(zone).free_definite_size(zone, ptr, size);
 }
 
 size_t handler_forbidden_pressure_relief(struct _malloc_zone_t* zone,
@@ -141,7 +162,7 @@ size_t handler_forbidden_pressure_relief(struct _malloc_zone_t* zone,
         "handler_forbidden_pressure_relief allocator used in handler.");
     exit(EXIT_FAILURE);
   }
-  return g_old_zone.pressure_relief(zone, goal);
+  return original_zone_for_zone(zone).pressure_relief(zone, goal);
 }
 
 boolean_t handler_forbidden_claimed_address(struct _malloc_zone_t* zone,
@@ -151,10 +172,46 @@ boolean_t handler_forbidden_claimed_address(struct _malloc_zone_t* zone,
         "handler_forbidden_claimed_address allocator used in handler.");
     exit(EXIT_FAILURE);
   }
-  return g_old_zone.claimed_address(zone, ptr);
+
+  if (original_zone_for_zone(zone).claimed_address) {
+    return original_zone_for_zone(zone).claimed_address(zone, ptr);
+  }
+
+  // If the fast API 'claimed_address' is not implemented in the specified zone,
+  // fall back to 'size' function, which also tells whether the given address
+  // belongs to the zone or not although it'd be slow.
+  return original_zone_for_zone(zone).size(zone, ptr);
 }
 
 #if defined(__IPHONE_16_1) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_16_1
+// The fallback function to be called when try_free_default_function receives a
+// pointer which doesn't belong to the allocator.
+void TryFreeDefaultFallbackToFindZoneAndFree(void* ptr) {
+  unsigned int zone_count = 0;
+  vm_address_t* zones = nullptr;
+  kern_return_t result =
+      malloc_get_all_zones(mach_task_self(), nullptr, &zones, &zone_count);
+  MACH_CHECK(result == KERN_SUCCESS, result) << "malloc_get_all_zones";
+
+  // "find_zone_and_free" expected by try_free_default.
+  //
+  // libmalloc's zones call find_registered_zone() in case the default one
+  // doesn't handle the allocation. We can't, so we try to emulate it. See the
+  // implementation in libmalloc/src/malloc.c for details.
+  // https://github.com/apple-oss-distributions/libmalloc/blob/main/src/malloc.c
+  for (unsigned int i = 0; i < zone_count; ++i) {
+    malloc_zone_t* zone = reinterpret_cast<malloc_zone_t*>(zones[i]);
+    if (size_t size = zone->size(zone, ptr)) {
+      if (zone->version >= 6 && zone->free_definite_size) {
+        zone->free_definite_size(zone, ptr, size);
+      } else {
+        zone->free(zone, ptr);
+      }
+      return;
+    }
+  }
+}
+
 void handler_forbidden_try_free_default(struct _malloc_zone_t* zone,
                                         void* ptr) {
   if (is_handler_thread()) {
@@ -162,7 +219,11 @@ void handler_forbidden_try_free_default(struct _malloc_zone_t* zone,
         "handler_forbidden_try_free_default allocator used in handler.");
     exit(EXIT_FAILURE);
   }
-  g_old_zone.try_free_default(zone, ptr);
+
+  if (original_zone_for_zone(zone).try_free_default) {
+    return original_zone_for_zone(zone).try_free_default(zone, ptr);
+  }
+  TryFreeDefaultFallbackToFindZoneAndFree(ptr);
 }
 #endif
 
@@ -171,7 +232,7 @@ size_t handler_forbidden_size(struct _malloc_zone_t* zone, const void* ptr) {
     CRASHPAD_RAW_LOG("handler_forbidden_size allocator used in handler.");
     exit(EXIT_FAILURE);
   }
-  return g_old_zone.size(zone, ptr);
+  return original_zone_for_zone(zone).size(zone, ptr);
 }
 
 bool DeprotectMallocZone(malloc_zone_t* default_zone,
@@ -253,7 +314,6 @@ void ReplaceZoneFunctions(malloc_zone_t* zone, const malloc_zone_t* functions) {
   zone->destroy = functions->destroy;
   zone->batch_malloc = functions->batch_malloc;
   zone->batch_free = functions->batch_free;
-  zone->introspect = functions->introspect;
   zone->memalign = functions->memalign;
   zone->free_definite_size = functions->free_definite_size;
   zone->pressure_relief = functions->pressure_relief;
@@ -286,8 +346,6 @@ void ReplaceAllocatorsWithHandlerForbidden() {
   CrashpadClient crashpad_client;
   g_mach_exception_thread = crashpad_client.GetThreadIdForTesting();
 
-  malloc_zone_t* default_zone = malloc_default_zone();
-  memcpy(&g_old_zone, default_zone, sizeof(g_old_zone));
   malloc_zone_t new_functions = {};
   new_functions.size = handler_forbidden_size;
   new_functions.malloc = handler_forbidden_malloc;
@@ -305,8 +363,16 @@ void ReplaceAllocatorsWithHandlerForbidden() {
 #if defined(__IPHONE_16_1) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_16_1
   new_functions.try_free_default = handler_forbidden_try_free_default;
 #endif
+  malloc_zone_t* default_zone = malloc_default_zone();
+  g_original_zones_ptr[g_zone_count] = default_zone;
+  ReplaceZoneFunctions(&g_original_zones[g_zone_count++], default_zone);
   ReplaceZoneFunctions(default_zone, &new_functions);
 
+  malloc_zone_t* purgeable_zone = malloc_default_purgeable_zone();
+  g_original_zones_ptr[g_zone_count] = purgeable_zone;
+  ReplaceZoneFunctions(&g_original_zones[g_zone_count++], purgeable_zone);
+  ReplaceZoneFunctions(purgeable_zone, &new_functions);
+
   vm_address_t* zones;
   unsigned int count;
   kern_return_t kr =
@@ -315,11 +381,13 @@ void ReplaceAllocatorsWithHandlerForbidden() {
     return;
   for (unsigned int i = 0; i < count; ++i) {
     malloc_zone_t* zone = reinterpret_cast<malloc_zone_t*>(zones[i]);
+    g_original_zones_ptr[g_zone_count] = zone;
+    ReplaceZoneFunctions(&g_original_zones[g_zone_count++], zone);
     ReplaceZoneFunctions(zone, &new_functions);
-  }
 
-  malloc_zone_t* purgeable_zone = malloc_default_purgeable_zone();
-  ReplaceZoneFunctions(purgeable_zone, &new_functions);
+    if (g_zone_count >= kMaxZoneCount)
+      break;
+  }
 }
 
 }  // namespace test
diff --git a/external_imported/sentry-native/external/crashpad/test/ios/host/main.mm b/external_imported/sentry-native/external/crashpad/test/ios/host/main.mm
index d1d6b00f5..cf06f30db 100644
--- a/external_imported/sentry-native/external/crashpad/test/ios/host/main.mm
+++ b/external_imported/sentry-native/external/crashpad/test/ios/host/main.mm
@@ -16,10 +16,6 @@
 
 #import "test/ios/host/cptest_application_delegate.h"
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 int main(int argc, char* argv[]) {
   NSString* appDelegateClassName;
   @autoreleasepool {
diff --git a/external_imported/sentry-native/external/crashpad/test/linux/get_tls.cc b/external_imported/sentry-native/external/crashpad/test/linux/get_tls.cc
index c8147f0df..405976eaa 100644
--- a/external_imported/sentry-native/external/crashpad/test/linux/get_tls.cc
+++ b/external_imported/sentry-native/external/crashpad/test/linux/get_tls.cc
@@ -49,6 +49,8 @@ LinuxVMAddress GetTLS() {
       : "=r"(tls)
       :
       : "$3");
+#elif defined(ARCH_CPU_RISCV64)
+  asm("mv %0, tp" : "=r"(tls));
 #else
 #error Port.
 #endif  // ARCH_CPU_ARMEL
diff --git a/external_imported/sentry-native/external/crashpad/test/mac/exception_swallower.cc b/external_imported/sentry-native/external/crashpad/test/mac/exception_swallower.cc
index 52c2a2d63..132fb428a 100644
--- a/external_imported/sentry-native/external/crashpad/test/mac/exception_swallower.cc
+++ b/external_imported/sentry-native/external/crashpad/test/mac/exception_swallower.cc
@@ -20,8 +20,8 @@
 
 #include <string>
 
+#include "base/apple/scoped_mach_port.h"
 #include "base/check_op.h"
-#include "base/mac/scoped_mach_port.h"
 #include "base/strings/stringprintf.h"
 #include "handler/mac/exception_handler_server.h"
 #include "util/mach/bootstrap.h"
@@ -58,7 +58,7 @@ class ExceptionSwallower::ExceptionSwallowerThread
       public UniversalMachExcServer::Interface {
  public:
   explicit ExceptionSwallowerThread(
-      base::mac::ScopedMachReceiveRight receive_right)
+      base::apple::ScopedMachReceiveRight receive_right)
       : Thread(),
         UniversalMachExcServer::Interface(),
         exception_handler_server_(std::move(receive_right), true),
@@ -129,7 +129,7 @@ ExceptionSwallower::ExceptionSwallower() : exception_swallower_thread_() {
       base::StringPrintf("org.chromium.crashpad.test.exception_swallower.%d.%s",
                          getpid(),
                          RandomString().c_str());
-  base::mac::ScopedMachReceiveRight receive_right(
+  base::apple::ScopedMachReceiveRight receive_right(
       BootstrapCheckIn(service_name));
   CHECK(receive_right.is_valid());
 
@@ -164,7 +164,7 @@ void ExceptionSwallower::SwallowExceptions() {
   const char* service_name = CheckedGetenv(kServiceEnvironmentVariable);
   CHECK(service_name);
 
-  base::mac::ScopedMachSendRight exception_swallower_port(
+  base::apple::ScopedMachSendRight exception_swallower_port(
       BootstrapLookUp(service_name));
   CHECK(exception_swallower_port.is_valid());
 
diff --git a/external_imported/sentry-native/external/crashpad/test/mac/mach_errors.h b/external_imported/sentry-native/external/crashpad/test/mac/mach_errors.h
index ba3191b07..862d717cb 100644
--- a/external_imported/sentry-native/external/crashpad/test/mac/mach_errors.h
+++ b/external_imported/sentry-native/external/crashpad/test/mac/mach_errors.h
@@ -23,8 +23,9 @@ namespace crashpad {
 namespace test {
 
 // This function formats messages in a similar way to the Mach error logging
-// macros in base/mac/mach_logging.h. It exists to interoperate with Google Test
-// assertions, which don’t interoperate with logging but can be streamed to.
+// macros in base/apple/mach_logging.h. It exists to interoperate with Google
+// Test assertions, which don’t interoperate with logging but can be streamed
+// to.
 //
 // Where non-test code could do:
 //   MACH_CHECK(kr == KERN_SUCCESS, kr) << "vm_deallocate";
diff --git a/external_imported/sentry-native/external/crashpad/test/mac/mach_multiprocess.cc b/external_imported/sentry-native/external/crashpad/test/mac/mach_multiprocess.cc
index 6af870e81..d317055f0 100644
--- a/external_imported/sentry-native/external/crashpad/test/mac/mach_multiprocess.cc
+++ b/external_imported/sentry-native/external/crashpad/test/mac/mach_multiprocess.cc
@@ -21,8 +21,8 @@
 #include <string>
 #include <tuple>
 
+#include "base/apple/scoped_mach_port.h"
 #include "base/auto_reset.h"
-#include "base/mac/scoped_mach_port.h"
 #include "gtest/gtest.h"
 #include "test/errors.h"
 #include "test/mac/mach_errors.h"
@@ -64,9 +64,9 @@ struct MachMultiprocessInfo {
   }
 
   std::string service_name;
-  base::mac::ScopedMachReceiveRight local_port;
-  base::mac::ScopedMachSendRight remote_port;
-  base::mac::ScopedMachSendRight child_task;  // valid only in parent
+  base::apple::ScopedMachReceiveRight local_port;
+  base::apple::ScopedMachSendRight remote_port;
+  base::apple::ScopedMachSendRight child_task;  // valid only in parent
 };
 
 }  // namespace internal
diff --git a/external_imported/sentry-native/external/crashpad/test/test_paths.cc b/external_imported/sentry-native/external/crashpad/test/test_paths.cc
index 1e1c250a3..75399ac82 100644
--- a/external_imported/sentry-native/external/crashpad/test/test_paths.cc
+++ b/external_imported/sentry-native/external/crashpad/test/test_paths.cc
@@ -17,6 +17,7 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 
+#include "base/check.h"
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "util/misc/paths.h"
diff --git a/external_imported/sentry-native/external/crashpad/test/win/win_child_process.cc b/external_imported/sentry-native/external/crashpad/test/win/win_child_process.cc
index 72b55087a..d4d9a462a 100644
--- a/external_imported/sentry-native/external/crashpad/test/win/win_child_process.cc
+++ b/external_imported/sentry-native/external/crashpad/test/win/win_child_process.cc
@@ -20,6 +20,7 @@
 #include <string>
 #include <utility>
 
+#include "base/check.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ -191,7 +192,7 @@ std::unique_ptr<WinChildProcess::Handles> WinChildProcess::Launch() {
       TestPaths::Executable().value() +
       base::UTF8ToWide(base::StringPrintf(
           " --gtest_filter=%s.%s %s=0x%x|0x%x --gtest_also_run_disabled_tests",
-          test_info->test_case_name(),
+          test_info->test_suite_name(),
           test_info->name(),
           kIsMultiprocessChild,
           HandleToInt(write_for_child.get()),
diff --git a/external_imported/sentry-native/external/crashpad/third_party/cpp-httplib/README.crashpad b/external_imported/sentry-native/external/crashpad/third_party/cpp-httplib/README.crashpad
index cfb476e0a..a1ba93aaa 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/cpp-httplib/README.crashpad
+++ b/external_imported/sentry-native/external/crashpad/third_party/cpp-httplib/README.crashpad
@@ -5,6 +5,7 @@ Revision: 5b3187e2f9e77c672063d49a1167bbb563da023e
 License: MIT
 License File: cpp-httplib/LICENSE
 Security Critical: no (test only)
+Shipped: no
 
 Description:
 A C++11 header-only HTTP library.
diff --git a/external_imported/sentry-native/external/crashpad/third_party/edo/BUILD.gn b/external_imported/sentry-native/external/crashpad/third_party/edo/BUILD.gn
index f026f61dc..1bd98e17a 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/edo/BUILD.gn
+++ b/external_imported/sentry-native/external/crashpad/third_party/edo/BUILD.gn
@@ -139,6 +139,6 @@ if (crashpad_is_in_chromium) {
     ]
 
     public_configs = [ ":config" ]
-    deps = [ "../../build:ios_enable_arc" ]
+    deps = [ "../../build:apple_enable_arc" ]
   }
 }
diff --git a/external_imported/sentry-native/external/crashpad/third_party/edo/README.crashpad b/external_imported/sentry-native/external/crashpad/third_party/edo/README.crashpad
index fb8315825..770026aae 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/edo/README.crashpad
+++ b/external_imported/sentry-native/external/crashpad/third_party/edo/README.crashpad
@@ -5,6 +5,7 @@ Revision: See DEPS
 License: Apache 2.0
 License File: edo/LICENSE
 Security Critical: no
+Shipped: no
 
 Description:
 iOS remote method invocations (distant object) over Inter-process communication layer.
diff --git a/external_imported/sentry-native/external/crashpad/third_party/fuchsia/BUILD.gn b/external_imported/sentry-native/external/crashpad/third_party/fuchsia/BUILD.gn
index 7594c1c9f..51aa43ba6 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/fuchsia/BUILD.gn
+++ b/external_imported/sentry-native/external/crashpad/third_party/fuchsia/BUILD.gn
@@ -18,7 +18,7 @@ if (crashpad_is_in_fuchsia) {
   group("fuchsia") {
     public_deps = [
       "//sdk/lib/fdio",
-      "//zircon/public/lib/zx",
+      "//zircon/system/ulib/zx",
     ]
   }
 } else if (crashpad_is_in_chromium) {
diff --git a/external_imported/sentry-native/external/crashpad/third_party/getopt/README.crashpad b/external_imported/sentry-native/external/crashpad/third_party/getopt/README.crashpad
index b7ff95436..ac3201a61 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/getopt/README.crashpad
+++ b/external_imported/sentry-native/external/crashpad/third_party/getopt/README.crashpad
@@ -4,6 +4,7 @@ URL: https://sourceware.org/ml/newlib/2005/msg00758.html
 License: Public domain
 License File: LICENSE
 Security Critical: no
+Shipped: yes
 
 Description:
 A public domain implementation of getopt.
diff --git a/external_imported/sentry-native/external/crashpad/third_party/googletest/README.crashpad b/external_imported/sentry-native/external/crashpad/third_party/googletest/README.crashpad
index 9a6ca6c6b..ecdce8871 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/googletest/README.crashpad
+++ b/external_imported/sentry-native/external/crashpad/third_party/googletest/README.crashpad
@@ -5,6 +5,7 @@ Revision: See DEPS
 License: BSD 3-clause
 License File: googletest/googletest/LICENSE
 Security Critical: no
+Shipped: no
 
 Description:
 Google Test (Google C++ Testing Framework) is Google’s framework for writing C++
diff --git a/external_imported/sentry-native/external/crashpad/third_party/gyp/README.crashpad b/external_imported/sentry-native/external/crashpad/third_party/gyp/README.crashpad
index 18eb16491..ea5a342bf 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/gyp/README.crashpad
+++ b/external_imported/sentry-native/external/crashpad/third_party/gyp/README.crashpad
@@ -5,6 +5,7 @@ Revision: See DEPS
 License: BSD 3-clause
 License File: gyp/LICENSE
 Security Critical: no
+Shipped: no
 
 Description:
 GYP is used to generate build files.
diff --git a/external_imported/sentry-native/external/crashpad/third_party/lss/README.crashpad b/external_imported/sentry-native/external/crashpad/third_party/lss/README.crashpad
index d1ac9913e..9a12c1c82 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/lss/README.crashpad
+++ b/external_imported/sentry-native/external/crashpad/third_party/lss/README.crashpad
@@ -5,6 +5,7 @@ Revision: See DEPS
 License: BSD 3-clause
 License File: lss/linux_syscall_support.h
 Security Critical: yes
+Shipped: yes
 
 Description:
 Every so often, projects need to directly embed Linux system calls instead of
diff --git a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/LICENSE b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/LICENSE
index 58ab3fba9..b66a6b273 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/LICENSE
+++ b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/LICENSE
@@ -1,5 +1,4 @@
-Copyright (c) 2005-2011, Google Inc.
-All rights reserved.
+Copyright 2005-2011 Google LLC
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -11,7 +10,7 @@ notice, this list of conditions and the following disclaimer.
 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
+   Neither the name of Google LLC nor the names of its
 contributors may be used to endorse or promote products derived from
 this software without specific prior written permission.
 
diff --git a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/README.md b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/README.md
index b0cd12977..e25abdd21 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/README.md
+++ b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/README.md
@@ -39,6 +39,7 @@ the header itself as this list might be out of date.
 * MIPS 32-bit o32 ABI
 * MIPS 32-bit n32 ABI
 * MIPS 64-bit n64 ABI
+* LOONGARCH 64-bit ABI
 
 ## API
 
diff --git a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/linux_syscall_support.h b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/linux_syscall_support.h
index d3791cd4e..aab95e698 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/linux_syscall_support.h
+++ b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/linux_syscall_support.h
@@ -1,5 +1,4 @@
-/* Copyright (c) 2005-2011, Google Inc.
- * All rights reserved.
+/* Copyright 2005-2011 Google LLC
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -11,7 +10,7 @@
  * 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
+ *     * Neither the name of Google LLC nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
  *
@@ -47,7 +46,7 @@
  *   the necessary definitions.
  *
  * SYS_ERRNO:
- *   All system calls will update "errno" unless overriden by setting the
+ *   All system calls will update "errno" unless overridden by setting the
  *   SYS_ERRNO macro prior to including this file. SYS_ERRNO should be
  *   an l-value.
  *
@@ -88,7 +87,8 @@
  */
 #if (defined(__i386__) || defined(__x86_64__) || defined(__ARM_ARCH_3__) ||   \
      defined(__mips__) || defined(__PPC__) || defined(__ARM_EABI__) || \
-     defined(__aarch64__) || defined(__s390__) || defined(__e2k__))  \
+     defined(__aarch64__) || defined(__s390__) || defined(__e2k__) ||  \
+     (defined(__riscv) && __riscv_xlen == 64) || defined(__loongarch_lp64))  \
   && (defined(__linux) || defined(__ANDROID__))
 
 #ifndef SYS_CPLUSPLUS
@@ -266,6 +266,12 @@ struct kernel_timeval {
   long               tv_usec;
 };
 
+/* include/linux/time.h                                                      */
+struct kernel_itimerval {
+  struct kernel_timeval it_interval;
+  struct kernel_timeval it_value;
+};
+
 /* include/linux/resource.h                                                  */
 struct kernel_rusage {
   struct kernel_timeval ru_utime;
@@ -302,8 +308,8 @@ struct kernel_old_sigaction {
 } __attribute__((packed,aligned(4)));
 #elif (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32)
   #define kernel_old_sigaction kernel_sigaction
-#elif defined(__aarch64__)
-  // No kernel_old_sigaction defined for arm64.
+#elif defined(__aarch64__) || defined(__riscv) || defined(__loongarch_lp64)
+  // No kernel_old_sigaction defined for arm64 riscv and loongarch64.
 #endif
 
 /* Some kernel functions (e.g. sigaction() in 2.6.23) require that the
@@ -342,7 +348,9 @@ struct kernel_sigaction {
     void             (*sa_sigaction_)(int, siginfo_t *, void *);
   };
   unsigned long      sa_flags;
+#if !defined(__riscv) && !defined(__loongarch_lp64)
   void               (*sa_restorer)(void);
+#endif
   struct kernel_sigset_t sa_mask;
 #endif
 };
@@ -356,6 +364,16 @@ struct kernel_sockaddr {
 /* include/asm-{arm,aarch64,i386,mips,ppc,s390}/stat.h                       */
 #ifdef __mips__
 #if _MIPS_SIM == _MIPS_SIM_ABI64
+typedef unsigned long long kernel_blkcnt_t;
+typedef unsigned kernel_blksize_t;
+typedef unsigned kernel_dev_t;
+typedef unsigned kernel_gid_t;
+typedef unsigned long long kernel_ino_t;
+typedef unsigned kernel_mode_t;
+typedef unsigned kernel_nlink_t;
+typedef long long kernel_off_t;
+typedef unsigned kernel_time_t;
+typedef unsigned kernel_uid_t;
 struct kernel_stat {
 #else
 struct kernel_stat64 {
@@ -450,182 +468,262 @@ struct kernel_stat64 {
 
 /* include/asm-{arm,aarch64,i386,mips,x86_64,ppc,s390}/stat.h                */
 #if defined(__i386__) || defined(__ARM_ARCH_3__) || defined(__ARM_EABI__)
+typedef unsigned kernel_blkcnt_t;
+typedef unsigned kernel_blksize_t;
+typedef unsigned short kernel_dev_t;
+typedef unsigned short kernel_gid_t;
+typedef unsigned kernel_ino_t;
+typedef unsigned short kernel_mode_t;
+typedef unsigned short kernel_nlink_t;
+typedef unsigned kernel_off_t;
+typedef unsigned kernel_time_t;
+typedef unsigned short kernel_uid_t;
 struct kernel_stat {
   /* The kernel headers suggest that st_dev and st_rdev should be 32bit
    * quantities encoding 12bit major and 20bit minor numbers in an interleaved
    * format. In reality, we do not see useful data in the top bits. So,
    * we'll leave the padding in here, until we find a better solution.
    */
-  unsigned short     st_dev;
+  kernel_dev_t       st_dev;
   short              pad1;
-  unsigned           st_ino;
-  unsigned short     st_mode;
-  unsigned short     st_nlink;
-  unsigned short     st_uid;
-  unsigned short     st_gid;
-  unsigned short     st_rdev;
+  kernel_ino_t       st_ino;
+  kernel_mode_t      st_mode;
+  kernel_nlink_t     st_nlink;
+  kernel_uid_t       st_uid;
+  kernel_gid_t       st_gid;
+  kernel_dev_t       st_rdev;
   short              pad2;
-  unsigned           st_size;
-  unsigned           st_blksize;
-  unsigned           st_blocks;
-  unsigned           st_atime_;
+  kernel_off_t       st_size;
+  kernel_blksize_t   st_blksize;
+  kernel_blkcnt_t    st_blocks;
+  kernel_time_t      st_atime_;
   unsigned           st_atime_nsec_;
-  unsigned           st_mtime_;
+  kernel_time_t      st_mtime_;
   unsigned           st_mtime_nsec_;
-  unsigned           st_ctime_;
+  kernel_time_t      st_ctime_;
   unsigned           st_ctime_nsec_;
   unsigned           __unused4;
   unsigned           __unused5;
 };
 #elif defined(__x86_64__)
+typedef int64_t kernel_blkcnt_t;
+typedef int64_t kernel_blksize_t;
+typedef uint64_t kernel_dev_t;
+typedef unsigned kernel_gid_t;
+typedef uint64_t kernel_ino_t;
+typedef unsigned kernel_mode_t;
+typedef uint64_t kernel_nlink_t;
+typedef int64_t kernel_off_t;
+typedef uint64_t kernel_time_t;
+typedef unsigned kernel_uid_t;
 struct kernel_stat {
-  uint64_t           st_dev;
-  uint64_t           st_ino;
-  uint64_t           st_nlink;
-  unsigned           st_mode;
-  unsigned           st_uid;
-  unsigned           st_gid;
+  kernel_dev_t       st_dev;
+  kernel_ino_t       st_ino;
+  kernel_nlink_t     st_nlink;
+  kernel_mode_t      st_mode;
+  kernel_uid_t       st_uid;
+  kernel_gid_t       st_gid;
   unsigned           __pad0;
-  uint64_t           st_rdev;
-  int64_t            st_size;
-  int64_t            st_blksize;
-  int64_t            st_blocks;
-  uint64_t           st_atime_;
+  kernel_dev_t       st_rdev;
+  kernel_off_t       st_size;
+  kernel_blksize_t   st_blksize;
+  kernel_blkcnt_t    st_blocks;
+  kernel_time_t      st_atime_;
   uint64_t           st_atime_nsec_;
-  uint64_t           st_mtime_;
+  kernel_time_t      st_mtime_;
   uint64_t           st_mtime_nsec_;
-  uint64_t           st_ctime_;
+  kernel_time_t      st_ctime_;
   uint64_t           st_ctime_nsec_;
   int64_t            __unused4[3];
 };
 #elif defined(__PPC__)
+typedef unsigned long kernel_blkcnt_t;
+typedef unsigned long kernel_blksize_t;
+typedef unsigned kernel_dev_t;
+typedef unsigned kernel_gid_t;
+typedef unsigned long kernel_ino_t;
+typedef unsigned long kernel_mode_t;
+typedef unsigned short kernel_nlink_t;
+typedef long kernel_off_t;
+typedef unsigned long kernel_time_t;
+typedef unsigned kernel_uid_t;
 struct kernel_stat {
-  unsigned           st_dev;
-  unsigned long      st_ino;      // ino_t
-  unsigned long      st_mode;     // mode_t
-  unsigned short     st_nlink;    // nlink_t
-  unsigned           st_uid;      // uid_t
-  unsigned           st_gid;      // gid_t
-  unsigned           st_rdev;
-  long               st_size;     // off_t
-  unsigned long      st_blksize;
-  unsigned long      st_blocks;
-  unsigned long      st_atime_;
+  kernel_dev_t       st_dev;
+  kernel_ino_t       st_ino;
+  kernel_mode_t      st_mode;
+  kernel_nlink_t     st_nlink;
+  kernel_gid_t       st_uid;
+  kernel_uid_t       st_gid;
+  kernel_dev_t       st_rdev;
+  kernel_off_t       st_size;
+  kernel_blksize_t   st_blksize;
+  kernel_blkcnt_t    st_blocks;
+  kernel_time_t      st_atime_;
   unsigned long      st_atime_nsec_;
-  unsigned long      st_mtime_;
+  kernel_time_t      st_mtime_;
   unsigned long      st_mtime_nsec_;
-  unsigned long      st_ctime_;
+  kernel_time_t      st_ctime_;
   unsigned long      st_ctime_nsec_;
   unsigned long      __unused4;
   unsigned long      __unused5;
 };
 #elif (defined(__mips__) && _MIPS_SIM != _MIPS_SIM_ABI64)
+typedef int kernel_blkcnt_t;
+typedef int kernel_blksize_t;
+typedef unsigned kernel_dev_t;
+typedef unsigned kernel_gid_t;
+typedef unsigned kernel_ino_t;
+typedef unsigned kernel_mode_t;
+typedef unsigned kernel_nlink_t;
+typedef long kernel_off_t;
+typedef long kernel_time_t;
+typedef unsigned kernel_uid_t;
 struct kernel_stat {
-  unsigned           st_dev;
+  kernel_dev_t       st_dev;
   int                st_pad1[3];
-  unsigned           st_ino;
-  unsigned           st_mode;
-  unsigned           st_nlink;
-  unsigned           st_uid;
-  unsigned           st_gid;
-  unsigned           st_rdev;
+  kernel_ino_t       st_ino;
+  kernel_mode_t      st_mode;
+  kernel_nlink_t     st_nlink;
+  kernel_uid_t       st_uid;
+  kernel_gid_t       st_gid;
+  kernel_dev_t       st_rdev;
   int                st_pad2[2];
-  long               st_size;
+  kernel_off_t       st_size;
   int                st_pad3;
-  long               st_atime_;
+  kernel_time_t      st_atime_;
   long               st_atime_nsec_;
-  long               st_mtime_;
+  kernel_time_t      st_mtime_;
   long               st_mtime_nsec_;
-  long               st_ctime_;
+  kernel_time_t      st_ctime_;
   long               st_ctime_nsec_;
-  int                st_blksize;
-  int                st_blocks;
+  kernel_blksize_t   st_blksize;
+  kernel_blkcnt_t    st_blocks;
   int                st_pad4[14];
 };
-#elif defined(__aarch64__)
+#elif defined(__aarch64__) || defined(__riscv) || defined(__loongarch_lp64)
+typedef long kernel_blkcnt_t;
+typedef int kernel_blksize_t;
+typedef unsigned long kernel_dev_t;
+typedef unsigned int kernel_gid_t;
+typedef unsigned long kernel_ino_t;
+typedef unsigned int kernel_mode_t;
+typedef unsigned int kernel_nlink_t;
+typedef long kernel_off_t;
+typedef long kernel_time_t;
+typedef unsigned int kernel_uid_t;
 struct kernel_stat {
-  unsigned long      st_dev;
-  unsigned long      st_ino;
-  unsigned int       st_mode;
-  unsigned int       st_nlink;
-  unsigned int       st_uid;
-  unsigned int       st_gid;
-  unsigned long      st_rdev;
+  kernel_dev_t       st_dev;
+  kernel_ino_t       st_ino;
+  kernel_mode_t      st_mode;
+  kernel_nlink_t     st_nlink;
+  kernel_uid_t       st_uid;
+  kernel_gid_t       st_gid;
+  kernel_dev_t       st_rdev;
   unsigned long      __pad1;
-  long               st_size;
-  int                st_blksize;
+  kernel_off_t       st_size;
+  kernel_blksize_t   st_blksize;
   int                __pad2;
-  long               st_blocks;
-  long               st_atime_;
+  kernel_blkcnt_t    st_blocks;
+  kernel_time_t      st_atime_;
   unsigned long      st_atime_nsec_;
-  long               st_mtime_;
+  kernel_time_t      st_mtime_;
   unsigned long      st_mtime_nsec_;
-  long               st_ctime_;
+  kernel_time_t      st_ctime_;
   unsigned long      st_ctime_nsec_;
   unsigned int       __unused4;
   unsigned int       __unused5;
 };
 #elif defined(__s390x__)
+typedef long kernel_blkcnt_t;
+typedef unsigned long kernel_blksize_t;
+typedef unsigned long kernel_dev_t;
+typedef unsigned int kernel_gid_t;
+typedef unsigned long kernel_ino_t;
+typedef unsigned int kernel_mode_t;
+typedef unsigned long kernel_nlink_t;
+typedef unsigned long kernel_off_t;
+typedef unsigned long kernel_time_t;
+typedef unsigned int kernel_uid_t;
 struct kernel_stat {
-  unsigned long      st_dev;
-  unsigned long      st_ino;
-  unsigned long      st_nlink;
-  unsigned int       st_mode;
-  unsigned int       st_uid;
-  unsigned int       st_gid;
+  kernel_dev_t       st_dev;
+  kernel_ino_t       st_ino;
+  kernel_nlink_t     st_nlink;
+  kernel_mode_t      st_mode;
+  kernel_uid_t       st_uid;
+  kernel_gid_t       st_gid;
   unsigned int       __pad1;
-  unsigned long      st_rdev;
-  unsigned long      st_size;
-  unsigned long      st_atime_;
+  kernel_dev_t       st_rdev;
+  kernel_off_t       st_size;
+  kernel_time_t      st_atime_;
   unsigned long      st_atime_nsec_;
-  unsigned long      st_mtime_;
+  kernel_time_t      st_mtime_;
   unsigned long      st_mtime_nsec_;
-  unsigned long      st_ctime_;
+  kernel_time_t      st_ctime_;
   unsigned long      st_ctime_nsec_;
-  unsigned long      st_blksize;
-  long               st_blocks;
+  kernel_blksize_t   st_blksize;
+  kernel_blkcnt_t    st_blocks;
   unsigned long      __unused[3];
 };
 #elif defined(__s390__)
+typedef unsigned long kernel_blkcnt_t;
+typedef unsigned long kernel_blksize_t;
+typedef unsigned short kernel_dev_t;
+typedef unsigned short kernel_gid_t;
+typedef unsigned long kernel_ino_t;
+typedef unsigned short kernel_mode_t;
+typedef unsigned short kernel_nlink_t;
+typedef unsigned long kernel_off_t;
+typedef unsigned long kernel_time_t;
+typedef unsigned short kernel_uid_t;
 struct kernel_stat {
-  unsigned short     st_dev;
+  kernel_dev_t       st_dev;
   unsigned short     __pad1;
-  unsigned long      st_ino;
-  unsigned short     st_mode;
-  unsigned short     st_nlink;
-  unsigned short     st_uid;
-  unsigned short     st_gid;
-  unsigned short     st_rdev;
+  kernel_ino_t       st_ino;
+  kernel_mode_t      st_mode;
+  kernel_nlink_t     st_nlink;
+  kernel_uid_t       st_uid;
+  kernel_gid_t       st_gid;
+  kernel_dev_t       st_rdev;
   unsigned short     __pad2;
-  unsigned long      st_size;
-  unsigned long      st_blksize;
-  unsigned long      st_blocks;
-  unsigned long      st_atime_;
+  kernel_off_t       st_size;
+  kernel_blksize_t   st_blksize;
+  kernel_blkcnt_t    st_blocks;
+  kernel_time_t      st_atime_;
   unsigned long      st_atime_nsec_;
-  unsigned long      st_mtime_;
+  kernel_time_t      st_mtime_;
   unsigned long      st_mtime_nsec_;
-  unsigned long      st_ctime_;
+  kernel_time_t      st_ctime_;
   unsigned long      st_ctime_nsec_;
   unsigned long      __unused4;
   unsigned long      __unused5;
 };
 #elif defined(__e2k__)
+typedef unsigned long kernel_blkcnt_t;
+typedef unsigned long kernel_blksize_t;
+typedef unsigned long kernel_dev_t;
+typedef unsigned int kernel_gid_t;
+typedef unsigned long kernel_ino_t;
+typedef unsigned int kernel_mode_t;
+typedef unsigned long kernel_nlink_t;
+typedef unsigned long kernel_off_t;
+typedef unsigned long kernel_time_t;
+typedef unsigned int kernel_uid_t;
 struct kernel_stat {
-  unsigned long      st_dev;
-  unsigned long      st_ino;
-  unsigned int       st_mode;
-  unsigned long      st_nlink;
-  unsigned int       st_uid;
-  unsigned int       st_gid;
-  unsigned long      st_rdev;
-  unsigned long      st_size;
-  unsigned long      st_blksize;
-  unsigned long      st_blocks;
-  unsigned long      st_atime_;
+  kernel_dev_t       st_dev;
+  kernel_ino_t       st_ino;
+  kernel_mode_t      st_mode;
+  kernel_nlink_t     st_nlink;
+  kernel_uid_t       st_uid;
+  kernel_gid_t       st_gid;
+  kernel_dev_t       st_rdev;
+  kernel_off_t       st_size;
+  kernel_blksize_t   st_blksize;
+  kernel_blkcnt_t    st_blocks;
+  kernel_time_t      st_atime_;
   unsigned long      st_atime_nsec_;
-  unsigned long      st_mtime_;
+  kernel_time_t      st_mtime_;
   unsigned long      st_mtime_nsec_;
-  unsigned long      st_ctime_;
+  kernel_time_t      st_ctime_;
   unsigned long      st_ctime_nsec_;
 };
 #endif
@@ -743,6 +841,37 @@ struct kernel_statfs {
 };
 #endif
 
+struct kernel_statx_timestamp {
+  int64_t   tv_sec;
+  uint32_t  tv_nsec;
+  int32_t   __reserved;
+};
+
+struct kernel_statx {
+  uint32_t  stx_mask;
+  uint32_t  stx_blksize;
+  uint64_t  stx_attributes;
+  uint32_t  stx_nlink;
+  uint32_t  stx_uid;
+  uint32_t  stx_gid;
+  uint16_t  stx_mode;
+  uint16_t  __spare0[1];
+  uint64_t  stx_ino;
+  uint64_t  stx_size;
+  uint64_t  stx_blocks;
+  uint64_t  stx_attributes_mask;
+  struct kernel_statx_timestamp  stx_atime;
+  struct kernel_statx_timestamp  stx_btime;
+  struct kernel_statx_timestamp  stx_ctime;
+  struct kernel_statx_timestamp  stx_mtime;
+  uint32_t  stx_rdev_major;
+  uint32_t  stx_rdev_minor;
+  uint32_t  stx_dev_major;
+  uint32_t  stx_dev_minor;
+  uint64_t  stx_mnt_id;
+  uint64_t  __spare2;
+  uint64_t  __spare3[12];
+};
 
 /* Definitions missing from the standard header files                        */
 #ifndef O_DIRECTORY
@@ -779,6 +908,18 @@ struct kernel_statfs {
 #ifndef AT_REMOVEDIR
 #define AT_REMOVEDIR            0x200
 #endif
+#ifndef AT_NO_AUTOMOUNT
+#define AT_NO_AUTOMOUNT         0x800
+#endif
+#ifndef AT_EMPTY_PATH
+#define AT_EMPTY_PATH           0x1000
+#endif
+#ifndef STATX_BASIC_STATS
+#define STATX_BASIC_STATS       0x000007ffU
+#endif
+#ifndef AT_STATX_SYNC_AS_STAT
+#define AT_STATX_SYNC_AS_STAT   0x0000
+#endif
 #ifndef MREMAP_FIXED
 #define MREMAP_FIXED            2
 #endif
@@ -1110,7 +1251,7 @@ struct kernel_statfs {
 #define __NR_getrandom          (__NR_SYSCALL_BASE + 384)
 #endif
 /* End of ARM 3/EABI definitions                                             */
-#elif defined(__aarch64__)
+#elif defined(__aarch64__) || defined(__riscv) || defined(__loongarch_lp64)
 #ifndef __NR_setxattr
 #define __NR_setxattr             5
 #endif
@@ -1166,9 +1307,11 @@ struct kernel_statfs {
 #ifndef __NR_readlinkat
 #define __NR_readlinkat          78
 #endif
+#if !defined(__loongarch_lp64)
 #ifndef __NR_newfstatat
 #define __NR_newfstatat          79
 #endif
+#endif
 #ifndef __NR_set_tid_address
 #define __NR_set_tid_address     96
 #endif
@@ -1209,7 +1352,9 @@ struct kernel_statfs {
 #ifndef __NR_getrandom
 #define __NR_getrandom          278
 #endif
-/* End of aarch64 definitions                                                */
+#ifndef __NR_statx
+#define __NR_statx              291
+#endif
 #elif defined(__x86_64__)
 #ifndef __NR_pread64
 #define __NR_pread64             17
@@ -1678,7 +1823,7 @@ struct kernel_statfs {
 #ifndef __NR_getcpu
 #define __NR_getcpu             302
 #endif
-/* End of powerpc defininitions                                              */
+/* End of powerpc definitions                                              */
 #elif defined(__s390__)
 #ifndef __NR_quotactl
 #define __NR_quotactl           131
@@ -1926,14 +2071,14 @@ struct kernel_statfs {
   #undef  LSS_RETURN
   #if defined(__i386__) || defined(__x86_64__) || defined(__ARM_ARCH_3__) \
        || defined(__ARM_EABI__) || defined(__aarch64__) || defined(__s390__) \
-       || defined(__e2k__)
+       || defined(__e2k__) || defined(__riscv) || defined(__loongarch_lp64)
   /* Failing system calls return a negative result in the range of
    * -1..-4095. These are "errno" values with the sign inverted.
    */
   #define LSS_RETURN(type, res)                                               \
     do {                                                                      \
       if ((unsigned long)(res) >= (unsigned long)(-4095)) {                   \
-        LSS_ERRNO = -(res);                                                   \
+        LSS_ERRNO = (int)(-(res));                                            \
         res = -1;                                                             \
       }                                                                       \
       return (type) (res);                                                    \
@@ -2287,7 +2432,7 @@ struct kernel_statfs {
     #define _LSS_RETURN(type, res, cast)                                      \
       do {                                                                    \
         if ((uint64_t)(res) >= (uint64_t)(-4095)) {                           \
-          LSS_ERRNO = -(res);                                                 \
+          LSS_ERRNO = (int)(-(res));                                          \
           res = -1;                                                           \
         }                                                                     \
         return (type)(cast)(res);                                             \
@@ -2836,7 +2981,7 @@ struct kernel_statfs {
                                    void *newtls, int *child_tidptr) {
       int64_t __res;
       {
-        register uint64_t __flags __asm__("x0") = flags;
+        register uint64_t __flags __asm__("x0") = (uint64_t)flags;
         register void *__stack __asm__("x1") = child_stack;
         register void *__ptid  __asm__("x2") = parent_tidptr;
         register void *__tls   __asm__("x3") = newtls;
@@ -3419,6 +3564,122 @@ struct kernel_statfs {
       }
       LSS_RETURN(int, __ret);
     }
+  #elif defined(__riscv) && __riscv_xlen == 64
+    #undef LSS_REG
+    #define LSS_REG(r,a) register int64_t __r##r __asm__("a"#r) = (int64_t)a
+    #undef  LSS_BODY
+    #define LSS_BODY(type,name,args...)                                       \
+          register int64_t __res_a0 __asm__("a0");                            \
+          register int64_t __a7 __asm__("a7") = __NR_##name;                  \
+          int64_t __res;                                                      \
+          __asm__ __volatile__ ("scall\n"                                     \
+                                : "=r"(__res_a0)                              \
+                                : "r"(__a7) , ## args                         \
+                                : "memory");                                  \
+          __res = __res_a0;                                                   \
+          LSS_RETURN(type, __res)
+    #undef _syscall0
+    #define _syscall0(type, name)                                             \
+      type LSS_NAME(name)(void) {                                             \
+        LSS_BODY(type, name);                                                 \
+      }
+    #undef _syscall1
+    #define _syscall1(type, name, type1, arg1)                                \
+      type LSS_NAME(name)(type1 arg1) {                                       \
+        LSS_REG(0, arg1); LSS_BODY(type, name, "r"(__r0));                    \
+      }
+    #undef _syscall2
+    #define _syscall2(type, name, type1, arg1, type2, arg2)                   \
+      type LSS_NAME(name)(type1 arg1, type2 arg2) {                           \
+        LSS_REG(0, arg1); LSS_REG(1, arg2);                                   \
+        LSS_BODY(type, name, "r"(__r0), "r"(__r1));                           \
+      }
+    #undef _syscall3
+    #define _syscall3(type, name, type1, arg1, type2, arg2, type3, arg3)      \
+      type LSS_NAME(name)(type1 arg1, type2 arg2, type3 arg3) {               \
+        LSS_REG(0, arg1); LSS_REG(1, arg2); LSS_REG(2, arg3);                 \
+        LSS_BODY(type, name, "r"(__r0), "r"(__r1), "r"(__r2));                \
+      }
+    #undef _syscall4
+    #define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4)  \
+      type LSS_NAME(name)(type1 arg1, type2 arg2, type3 arg3, type4 arg4) {   \
+        LSS_REG(0, arg1); LSS_REG(1, arg2); LSS_REG(2, arg3);                 \
+        LSS_REG(3, arg4);                                                     \
+        LSS_BODY(type, name, "r"(__r0), "r"(__r1), "r"(__r2), "r"(__r3));     \
+      }
+    #undef _syscall5
+    #define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,  \
+                      type5,arg5)                                             \
+      type LSS_NAME(name)(type1 arg1, type2 arg2, type3 arg3, type4 arg4,     \
+                          type5 arg5) {                                       \
+        LSS_REG(0, arg1); LSS_REG(1, arg2); LSS_REG(2, arg3);                 \
+        LSS_REG(3, arg4); LSS_REG(4, arg5);                                   \
+        LSS_BODY(type, name, "r"(__r0), "r"(__r1), "r"(__r2), "r"(__r3),      \
+                             "r"(__r4));                                      \
+      }
+    #undef _syscall6
+    #define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,  \
+                      type5,arg5,type6,arg6)                                  \
+      type LSS_NAME(name)(type1 arg1, type2 arg2, type3 arg3, type4 arg4,     \
+                          type5 arg5, type6 arg6) {                           \
+        LSS_REG(0, arg1); LSS_REG(1, arg2); LSS_REG(2, arg3);                 \
+        LSS_REG(3, arg4); LSS_REG(4, arg5); LSS_REG(5, arg6);                 \
+        LSS_BODY(type, name, "r"(__r0), "r"(__r1), "r"(__r2), "r"(__r3),      \
+                             "r"(__r4), "r"(__r5));                           \
+      }
+
+    LSS_INLINE int LSS_NAME(clone)(int (*fn)(void *), void *child_stack,
+                                   int flags, void *arg, int *parent_tidptr,
+                                   void *newtls, int *child_tidptr) {
+      int64_t __res;
+      {
+        register int64_t __res_a0 __asm__("a0");
+        register uint64_t __flags __asm__("a0") = flags;
+        register void *__stack __asm__("a1") = child_stack;
+        register void *__ptid  __asm__("a2") = parent_tidptr;
+        register void *__tls   __asm__("a3") = newtls;
+        register int  *__ctid  __asm__("a4") = child_tidptr;
+        __asm__ __volatile__(/* Push "arg" and "fn" onto the stack that will be
+                              * used by the child.
+                              */
+                             "addi    %2,%2,-16\n"
+                             "sd      %1, 0(%2)\n"
+                             "sd      %4, 8(%2)\n"
+
+                             /* %a0 = syscall(%a0 = flags,
+                              *               %a1 = child_stack,
+                              *               %a2 = parent_tidptr,
+                              *               %a3 = newtls,
+                              *               %a4 = child_tidptr)
+                              */
+                             "li      a7, %8\n"
+                             "scall\n"
+
+                             /* if (%a0 != 0)
+                              *   return %a0;
+                              */
+                             "bnez    %0, 1f\n"
+
+                             /* In the child, now. Call "fn(arg)".
+                              */
+                             "ld      a1, 0(sp)\n"
+                             "ld      a0, 8(sp)\n"
+                             "jalr    a1\n"
+
+                             /* Call _exit(%a0).
+                              */
+                             "li      a7, %9\n"
+                             "scall\n"
+                           "1:\n"
+                             : "=r" (__res_a0)
+                             : "r"(fn), "r"(__stack), "r"(__flags), "r"(arg),
+                               "r"(__ptid), "r"(__tls), "r"(__ctid),
+                               "i"(__NR_clone), "i"(__NR_exit)
+                             : "cc", "memory");
+        __res = __res_a0;
+      }
+      LSS_RETURN(int, __res);
+    }
   #elif defined(__e2k__)
 
     #undef _LSS_BODY
@@ -3671,6 +3932,134 @@ struct kernel_statfs {
                               "b[4]", "b[5]", "pred0");
       LSS_RETURN(int, __res);
     }
+  #elif defined(__loongarch_lp64)
+    /* Most definitions of _syscallX() neglect to mark "memory" as being
+     * clobbered. This causes problems with compilers, that do a better job
+     * at optimizing across __asm__ calls.
+     * So, we just have to redefine all of the _syscallX() macros.
+     */
+    #undef LSS_REG
+    #define LSS_REG(ar,a) register int64_t __r##ar __asm__("a"#ar) = (int64_t)a
+    /* syscall is like subroutine calls, all caller-saved registers may be
+     * clobbered, we should add them to the |Clobbers| list.
+     * a0 is not included because it's in the output list.
+     */
+    #define LSS_SYSCALL_CLOBBERS "t0", "t1", "t2", "t3", "t4", "t5", "t6",    \
+                                 "t7", "t8", "memory"
+    #undef  LSS_BODY
+    #define LSS_BODY(type,name,args...)                                       \
+          register int64_t __res_a0 __asm__("a0");                            \
+          register int64_t __a7 __asm__("a7") = __NR_##name;                  \
+          int64_t __res;                                                      \
+          __asm__ __volatile__ ("syscall 0x0\n"                               \
+                                : "=r"(__res_a0)                              \
+                                : "r"(__a7), ## args                          \
+                                : LSS_SYSCALL_CLOBBERS);                      \
+          __res = __res_a0;                                                   \
+          LSS_RETURN(type, __res)
+    #undef _syscall0
+    #define _syscall0(type, name)                                             \
+      type LSS_NAME(name)(void) {                                             \
+        LSS_BODY(type, name);                                                 \
+      }
+    #undef _syscall1
+    #define _syscall1(type, name, type1, arg1)                                \
+      type LSS_NAME(name)(type1 arg1) {                                       \
+        LSS_REG(0, arg1); LSS_BODY(type, name, "r"(__r0));                    \
+      }
+    #undef _syscall2
+    #define _syscall2(type, name, type1, arg1, type2, arg2)                   \
+      type LSS_NAME(name)(type1 arg1, type2 arg2) {                           \
+        LSS_REG(0, arg1); LSS_REG(1, arg2);                                   \
+        LSS_BODY(type, name, "r"(__r0), "r"(__r1));                           \
+      }
+    #undef _syscall3
+    #define _syscall3(type, name, type1, arg1, type2, arg2, type3, arg3)      \
+      type LSS_NAME(name)(type1 arg1, type2 arg2, type3 arg3) {               \
+        LSS_REG(0, arg1); LSS_REG(1, arg2); LSS_REG(2, arg3);                 \
+        LSS_BODY(type, name, "r"(__r0), "r"(__r1), "r"(__r2));                \
+      }
+    #undef _syscall4
+    #define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4)  \
+      type LSS_NAME(name)(type1 arg1, type2 arg2, type3 arg3, type4 arg4) {   \
+        LSS_REG(0, arg1); LSS_REG(1, arg2); LSS_REG(2, arg3);                 \
+        LSS_REG(3, arg4);                                                     \
+        LSS_BODY(type, name, "r"(__r0), "r"(__r1), "r"(__r2), "r"(__r3));     \
+      }
+    #undef _syscall5
+    #define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,  \
+                      type5,arg5)                                             \
+      type LSS_NAME(name)(type1 arg1, type2 arg2, type3 arg3, type4 arg4,     \
+                          type5 arg5) {                                       \
+        LSS_REG(0, arg1); LSS_REG(1, arg2); LSS_REG(2, arg3);                 \
+        LSS_REG(3, arg4); LSS_REG(4, arg5);                                   \
+        LSS_BODY(type, name, "r"(__r0), "r"(__r1), "r"(__r2), "r"(__r3),      \
+                             "r"(__r4));                                      \
+      }
+    #undef _syscall6
+    #define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,  \
+                      type5,arg5,type6,arg6)                                  \
+      type LSS_NAME(name)(type1 arg1, type2 arg2, type3 arg3, type4 arg4,     \
+                          type5 arg5, type6 arg6) {                           \
+        LSS_REG(0, arg1); LSS_REG(1, arg2); LSS_REG(2, arg3);                 \
+        LSS_REG(3, arg4); LSS_REG(4, arg5); LSS_REG(5, arg6);                 \
+        LSS_BODY(type, name, "r"(__r0), "r"(__r1), "r"(__r2), "r"(__r3),      \
+                             "r"(__r4), "r"(__r5));                           \
+      }
+
+    LSS_INLINE int LSS_NAME(clone)(int (*fn)(void *), void *child_stack,
+                                   int flags, void *arg, int *parent_tidptr,
+                                   void *newtls, int *child_tidptr) {
+      int64_t __res;
+      {
+        register int64_t __res_a0 __asm__("a0");
+        register uint64_t __flags __asm__("a0") = flags;
+        register void *__stack __asm__("a1") = child_stack;
+        register void *__ptid  __asm__("a2") = parent_tidptr;
+        register void *__tls   __asm__("a3") = newtls;
+        register int  *__ctid  __asm__("a4") = child_tidptr;
+        __asm__ __volatile__(/* Push "arg" and "fn" onto the stack that will be
+                              * used by the child.
+                              */
+                             "addi.d  %2, %2, -16\n"
+                             "st.d    %1, %2, 8\n"
+                             "st.d    %4, %2, 0\n"
+
+                             /* %a0 = syscall(%a0 = flags,
+                              *               %a1 = child_stack,
+                              *               %a2 = parent_tidptr,
+                              *               %a3 = newtls,
+                              *               %a4 = child_tidptr)
+                              */
+                             "li.d      $a7, %8\n"
+                             "syscall   0x0\n"
+
+                             /* if (%a0 != 0)
+                              *   return %a0;
+                              */
+                             "bnez    $a0, 1f\n"
+
+                             /* In the child, now. Call "fn(arg)".
+                              */
+                             "ld.d    $a0, $sp, 0\n"
+                             "ld.d    $a1, $sp, 8\n"
+                             "addi.d  $sp, $sp, 16\n"
+                             "jirl    $ra, $a1, 0\n"
+
+                             /* Call _exit(%a0).
+                              */
+                             "li.d     $a7, %9\n"
+                             "syscall  0x0\n"
+                           "1:\n"
+                             : "=r" (__res_a0)
+                             : "r"(fn), "r"(__stack), "r"(__flags), "r"(arg),
+                               "r"(__ptid), "r"(__tls), "r"(__ctid),
+                               "i"(__NR_clone), "i"(__NR_exit)
+                             : "a7", LSS_SYSCALL_CLOBBERS);
+      __res = __res_a0;
+      }
+      LSS_RETURN(int, __res);
+    }
 
   #endif
   #define __NR__exit   __NR_exit
@@ -3702,8 +4091,10 @@ struct kernel_statfs {
     // fork is polyfilled below when not available.
     LSS_INLINE _syscall0(pid_t,   fork)
   #endif
+  #if defined(__NR_fstat)
   LSS_INLINE _syscall2(int,     fstat,           int,         f,
                       struct kernel_stat*,   b)
+  #endif
   LSS_INLINE _syscall2(int,     fstatfs,         int,         f,
                       struct kernel_statfs*, b)
   #if defined(__x86_64__)
@@ -3725,6 +4116,8 @@ struct kernel_statfs {
                       struct kernel_dirent64*, d, int,    c)
   LSS_INLINE _syscall0(gid_t,   getegid)
   LSS_INLINE _syscall0(uid_t,   geteuid)
+  LSS_INLINE _syscall2(int,     getitimer,       int,        w,
+                       struct kernel_itimerval*, c)
   #if defined(__NR_getpgrp)
     LSS_INLINE _syscall0(pid_t,   getpgrp)
   #endif
@@ -3736,10 +4129,10 @@ struct kernel_statfs {
                        gid_t *,         e,       gid_t *,     s)
   LSS_INLINE _syscall3(int,     getresuid,       uid_t *,     r,
                        uid_t *,         e,       uid_t *,     s)
-#if !defined(__ARM_EABI__)
+  #if defined(__NR_getrlimit)
   LSS_INLINE _syscall2(int,     getrlimit,       int,         r,
                       struct kernel_rlimit*, l)
-#endif
+  #endif
   LSS_INLINE _syscall1(pid_t,   getsid,          pid_t,       p)
   LSS_INLINE _syscall0(pid_t,   _gettid)
   LSS_INLINE _syscall2(pid_t,   gettimeofday,    struct kernel_timeval*, t,
@@ -3846,6 +4239,9 @@ struct kernel_statfs {
   LSS_INLINE _syscall1(int,     setfsuid,        uid_t,       u)
   LSS_INLINE _syscall1(int,     setuid,          uid_t,       u)
   LSS_INLINE _syscall1(int,     setgid,          gid_t,       g)
+  LSS_INLINE _syscall3(int,     setitimer,       int,         w,
+                       const struct kernel_itimerval*,        n,
+                       struct kernel_itimerval*, o)
   LSS_INLINE _syscall2(int,     setpgid,         pid_t,       p,
                        pid_t,          g)
   LSS_INLINE _syscall3(int,     setpriority,     int,         a,
@@ -3854,8 +4250,10 @@ struct kernel_statfs {
                        gid_t,          e, gid_t,  s)
   LSS_INLINE _syscall3(int,     setresuid,       uid_t,       r,
                        uid_t,          e, uid_t,  s)
+  #if defined(__NR_setrlimit)
   LSS_INLINE _syscall2(int,     setrlimit,       int,         r,
                        const struct kernel_rlimit*, l)
+  #endif
   LSS_INLINE _syscall0(pid_t,    setsid)
   LSS_INLINE _syscall2(int,     sigaltstack,     const stack_t*, s,
                        const stack_t*, o)
@@ -3889,23 +4287,6 @@ struct kernel_statfs {
     LSS_INLINE _syscall3(long, getcpu, unsigned *, cpu,
                          unsigned *, node, void *, unused)
   #endif
-  #if defined(__x86_64__) || defined(__e2k__) ||                              \
-     (defined(__mips__) && _MIPS_SIM != _MIPS_SIM_ABI32)
-    LSS_INLINE _syscall3(int, recvmsg,            int,   s,
-                        struct kernel_msghdr*,     m, int, f)
-    LSS_INLINE _syscall3(int, sendmsg,            int,   s,
-                         const struct kernel_msghdr*, m, int, f)
-    LSS_INLINE _syscall6(int, sendto,             int,   s,
-                         const void*,             m, size_t, l,
-                         int,                     f,
-                         const struct kernel_sockaddr*, a, int, t)
-    LSS_INLINE _syscall2(int, shutdown,           int,   s,
-                         int,                     h)
-    LSS_INLINE _syscall3(int, socket,             int,   d,
-                         int,                     t, int,       p)
-    LSS_INLINE _syscall4(int, socketpair,         int,   d,
-                         int,                     t, int,       p, int*, s)
-  #endif
   #if defined(__NR_fadvise64)
     #if defined(__x86_64__)
     /* Need to make sure loff_t isn't truncated to 32-bits under x32.  */
@@ -3988,6 +4369,12 @@ struct kernel_statfs {
                          const char *,            p,
                          struct kernel_stat*,     b, int, f)
   #endif
+  #if defined(__NR_statx)
+    LSS_INLINE _syscall5(int, statx,              int,   d,
+                         const char *,            p,
+                         int, f,                  int,   m,
+                         struct kernel_statx*,    b)
+  #endif
   #if defined(__x86_64__) || defined(__s390x__)
     LSS_INLINE int LSS_NAME(getresgid32)(gid_t *rgid,
                                          gid_t *egid,
@@ -4194,36 +4581,36 @@ struct kernel_statfs {
 
   LSS_INLINE int LSS_NAME(sigaddset)(struct kernel_sigset_t *set,
                                      int signum) {
-    if (signum < 1 || signum > (int)(8*sizeof(set->sig))) {
+    if (signum < 1 || (size_t)signum > (8*sizeof(set->sig))) {
       LSS_ERRNO = EINVAL;
       return -1;
     } else {
-      set->sig[(signum - 1)/(8*sizeof(set->sig[0]))]
-          |= 1UL << ((signum - 1) % (8*sizeof(set->sig[0])));
+      set->sig[(size_t)(signum - 1)/(8*sizeof(set->sig[0]))]
+          |= 1UL << ((size_t)(signum - 1) % (8*sizeof(set->sig[0])));
       return 0;
     }
   }
 
   LSS_INLINE int LSS_NAME(sigdelset)(struct kernel_sigset_t *set,
                                         int signum) {
-    if (signum < 1 || signum > (int)(8*sizeof(set->sig))) {
+    if (signum < 1 || (size_t)signum > (8*sizeof(set->sig))) {
       LSS_ERRNO = EINVAL;
       return -1;
     } else {
-      set->sig[(signum - 1)/(8*sizeof(set->sig[0]))]
-          &= ~(1UL << ((signum - 1) % (8*sizeof(set->sig[0]))));
+      set->sig[(size_t)(signum - 1)/(8*sizeof(set->sig[0]))]
+          &= ~(1UL << ((size_t)(signum - 1) % (8*sizeof(set->sig[0]))));
       return 0;
     }
   }
 
   LSS_INLINE int LSS_NAME(sigismember)(struct kernel_sigset_t *set,
                                           int signum) {
-    if (signum < 1 || signum > (int)(8*sizeof(set->sig))) {
+    if (signum < 1 || (size_t)signum > (8*sizeof(set->sig))) {
       LSS_ERRNO = EINVAL;
       return -1;
     } else {
-      return !!(set->sig[(signum - 1)/(8*sizeof(set->sig[0]))] &
-                (1UL << ((signum - 1) % (8*sizeof(set->sig[0])))));
+      return !!(set->sig[(size_t)(signum - 1)/(8*sizeof(set->sig[0]))] &
+                (1UL << ((size_t)(signum - 1) % (8*sizeof(set->sig[0])))));
     }
   }
   #if defined(__i386__) ||                                                    \
@@ -4484,23 +4871,31 @@ struct kernel_statfs {
       LSS_SC_BODY(4, int, 8, d, type, protocol, sv);
     }
   #endif
-  #if defined(__ARM_EABI__) || defined (__aarch64__)
+  #if defined(__NR_recvmsg)
     LSS_INLINE _syscall3(ssize_t, recvmsg, int, s, struct kernel_msghdr*, msg,
                          int, flags)
+  #endif
+  #if defined(__NR_sendmsg)
     LSS_INLINE _syscall3(ssize_t, sendmsg, int, s, const struct kernel_msghdr*,
                          msg, int, flags)
+  #endif
+  #if defined(__NR_sendto)
     LSS_INLINE _syscall6(ssize_t, sendto, int, s, const void*, buf, size_t,len,
                          int, flags, const struct kernel_sockaddr*, to,
                          unsigned int, tolen)
+  #endif
+  #if defined(__NR_shutdown)
     LSS_INLINE _syscall2(int, shutdown, int, s, int, how)
+  #endif
+  #if defined(__NR_socket)
     LSS_INLINE _syscall3(int, socket, int, domain, int, type, int, protocol)
+  #endif
+  #if defined(__NR_socketpair)
     LSS_INLINE _syscall4(int, socketpair, int, d, int, type, int, protocol,
                          int*, sv)
   #endif
-  #if defined(__i386__) || defined(__ARM_ARCH_3__) ||                         \
-      (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32) ||                  \
-      defined(__s390__)
-    #define __NR__socketcall  __NR_socketcall
+
+  #if defined(__NR_socketcall)
     LSS_INLINE _syscall2(int,      _socketcall,    int,   c,
                          va_list,                  a)
     LSS_INLINE int LSS_NAME(socketcall)(int op, ...) {
@@ -4512,36 +4907,43 @@ struct kernel_statfs {
       return rc;
     }
 
+  # if !defined(__NR_recvmsg)
     LSS_INLINE ssize_t LSS_NAME(recvmsg)(int s,struct kernel_msghdr *msg,
                                          int flags){
       return (ssize_t)LSS_NAME(socketcall)(17, s, msg, flags);
     }
-
+  # endif
+  # if !defined(__NR_sendmsg)
     LSS_INLINE ssize_t LSS_NAME(sendmsg)(int s,
                                          const struct kernel_msghdr *msg,
                                          int flags) {
       return (ssize_t)LSS_NAME(socketcall)(16, s, msg, flags);
     }
-
+  # endif
+  # if !defined(__NR_sendto)
     LSS_INLINE ssize_t LSS_NAME(sendto)(int s, const void *buf, size_t len,
                                         int flags,
                                         const struct kernel_sockaddr *to,
                                         unsigned int tolen) {
       return (ssize_t)LSS_NAME(socketcall)(11, s, buf, len, flags, to, tolen);
     }
-
+  # endif
+  # if !defined(__NR_shutdown)
     LSS_INLINE int LSS_NAME(shutdown)(int s, int how) {
       return LSS_NAME(socketcall)(13, s, how);
     }
-
+  # endif
+  # if !defined(__NR_socket)
     LSS_INLINE int LSS_NAME(socket)(int domain, int type, int protocol) {
       return LSS_NAME(socketcall)(1, domain, type, protocol);
     }
-
+  # endif
+  # if !defined(__NR_socketpair)
     LSS_INLINE int LSS_NAME(socketpair)(int d, int type, int protocol,
                                         int sv[2]) {
       return LSS_NAME(socketcall)(8, d, type, protocol, sv);
     }
+  # endif
   #endif
   #if defined(__NR_fstatat64)
     LSS_INLINE _syscall4(int,   fstatat64,        int,   d,
@@ -4623,12 +5025,12 @@ struct kernel_statfs {
     va_start(ap, flags);
     new_address = va_arg(ap, void *);
     rc = LSS_NAME(_mremap)(old_address, old_size, new_size,
-                           flags, new_address);
+                           (unsigned long)flags, new_address);
     va_end(ap);
     return rc;
   }
 
-  LSS_INLINE int LSS_NAME(ptrace_detach)(pid_t pid) {
+  LSS_INLINE long LSS_NAME(ptrace_detach)(pid_t pid) {
     /* PTRACE_DETACH can sometimes forget to wake up the tracee and it
      * then sends job control signals to the real parent, rather than to
      * the tracer. We reduce the risk of this happening by starting a
@@ -4639,7 +5041,8 @@ struct kernel_statfs {
      * detached.  Large multi threaded apps can take a long time in the kernel
      * processing SIGCONT.
      */
-    int rc, err;
+    long rc;
+    int err;
     LSS_NAME(sched_yield)();
     rc = LSS_NAME(ptrace)(PTRACE_DETACH, pid, (void *)0, (void *)0);
     err = LSS_ERRNO;
@@ -4672,7 +5075,7 @@ struct kernel_statfs {
                                      LSS_SYSCALL_ARG(c), (uint64_t)(o));
     }
 
-    LSS_INLINE int LSS_NAME(readahead)(int f, loff_t o, unsigned c) {
+    LSS_INLINE int LSS_NAME(readahead)(int f, loff_t o, size_t c) {
       LSS_BODY(3, int, readahead, LSS_SYSCALL_ARG(f), (uint64_t)(o),
                                   LSS_SYSCALL_ARG(c));
     }
@@ -4711,7 +5114,7 @@ struct kernel_statfs {
                            unsigned, o2)
       LSS_INLINE _syscall5(ssize_t, _pwrite64,       int,         f,
                            const void *,   b, size_t, c, unsigned, o1,
-                           long, o2)
+                           unsigned, o2)
       LSS_INLINE _syscall4(int, _readahead,          int,         f,
                            unsigned,       o1, unsigned, o2, size_t, c)
     #endif
@@ -4732,9 +5135,9 @@ struct kernel_statfs {
       return LSS_NAME(_pwrite64)(fd, buf, count,
                                  LSS_LLARG_PAD o.arg[0], o.arg[1]);
     }
-    LSS_INLINE int LSS_NAME(readahead)(int fd, loff_t off, int len) {
+    LSS_INLINE int LSS_NAME(readahead)(int fd, loff_t off, size_t count) {
       union { loff_t off; unsigned arg[2]; } o = { off };
-      return LSS_NAME(_readahead)(fd, LSS_LLARG_PAD o.arg[0], o.arg[1], len);
+      return LSS_NAME(_readahead)(fd, LSS_LLARG_PAD o.arg[0], o.arg[1], count);
     }
   #endif
 #endif
@@ -4789,16 +5192,79 @@ struct kernel_statfs {
   }
 #endif
 
+#if defined(__NR_statx)
+  /* copy the contents of kernel_statx to the kernel_stat structure.  */
+  LSS_INLINE void LSS_NAME(cp_stat_statx)(struct kernel_stat  *to,
+                                          struct kernel_statx *from) {
+    memset(to, 0, sizeof(struct kernel_stat));
+    to->st_dev = (kernel_dev_t)((from->stx_dev_minor & 0xff) |
+                                ((from->stx_dev_major & 0xfff) << 8) |
+                                ((from->stx_dev_minor & ~0xffu) << 12));
+    to->st_rdev = (kernel_dev_t)((from->stx_rdev_minor & 0xff) |
+                                 ((from->stx_rdev_major & 0xfff) << 8) |
+                                 ((from->stx_rdev_minor & ~0xffu) << 12));
+    to->st_ino = (kernel_ino_t)from->stx_ino;
+    to->st_mode = (kernel_mode_t)from->stx_mode;
+    to->st_nlink = (kernel_nlink_t)from->stx_nlink;
+    to->st_uid = (kernel_uid_t)from->stx_uid;
+    to->st_gid = (kernel_gid_t)from->stx_gid;
+    to->st_atime_ = (kernel_time_t)(from->stx_atime.tv_sec);
+    to->st_atime_nsec_ = from->stx_atime.tv_nsec;
+    to->st_mtime_ = (kernel_time_t)(from->stx_mtime.tv_sec);
+    to->st_mtime_nsec_ = from->stx_mtime.tv_nsec;
+    to->st_ctime_ = (kernel_time_t)(from->stx_ctime.tv_sec);
+    to->st_ctime_nsec_ = from->stx_ctime.tv_nsec;
+    to->st_size = (kernel_off_t)(from->stx_size);
+    to->st_blocks = (kernel_blkcnt_t)(from->stx_blocks);
+    to->st_blksize = (kernel_blksize_t)from->stx_blksize;
+  }
+#endif
+
+#if !defined(__NR_fstat)
+  LSS_INLINE int LSS_NAME(fstat)(int fd,
+                                 struct kernel_stat *buf) {
+    #if defined(__NR_newfstatat)
+      return LSS_NAME(newfstatat)(fd, "", buf, AT_EMPTY_PATH);
+    #elif defined(__NR_statx)
+      struct kernel_statx stx;
+      int flags = AT_NO_AUTOMOUNT | AT_EMPTY_PATH;
+      int mask = STATX_BASIC_STATS;
+      int res = LSS_NAME(statx)(fd, "", flags, mask, &stx);
+      LSS_NAME(cp_stat_statx)(buf, &stx);
+      return res;
+    #endif
+  }
+#endif
+
 #if !defined(__NR_stat)
   LSS_INLINE int LSS_NAME(stat)(const char *pathname,
                                 struct kernel_stat *buf) {
-    return LSS_NAME(newfstatat)(AT_FDCWD, pathname, buf, 0);
+    #if defined(__NR_newfstatat)
+      return LSS_NAME(newfstatat)(AT_FDCWD, pathname, buf, 0);
+    #elif defined(__NR_statx)
+      struct kernel_statx stx;
+      int flags = AT_NO_AUTOMOUNT | AT_STATX_SYNC_AS_STAT;
+      int mask = STATX_BASIC_STATS;
+      int res = LSS_NAME(statx)(AT_FDCWD, pathname, flags, mask, &stx);
+      LSS_NAME(cp_stat_statx)(buf, &stx);
+      return res;
+    #endif
   }
 #endif
+
 #if !defined(__NR_lstat)
   LSS_INLINE int LSS_NAME(lstat)(const char *pathname,
                                  struct kernel_stat *buf) {
-    return LSS_NAME(newfstatat)(AT_FDCWD, pathname, buf, AT_SYMLINK_NOFOLLOW);
+    #if defined(__NR_newfstatat)
+      return LSS_NAME(newfstatat)(AT_FDCWD, pathname, buf, AT_SYMLINK_NOFOLLOW);
+    #elif defined(__NR_statx)
+      struct kernel_statx stx;
+      int flags = AT_NO_AUTOMOUNT | AT_SYMLINK_NOFOLLOW;
+      int mask = STATX_BASIC_STATS;
+      int res = LSS_NAME(statx)(AT_FDCWD, pathname, flags, mask, &stx);
+      LSS_NAME(cp_stat_statx)(buf, &stx);
+      return res;
+    #endif
   }
 #endif
 
@@ -4812,7 +5278,7 @@ struct kernel_statfs {
 // TODO: define this in an arch-independant way instead of inlining the clone
 //       syscall body.
 
-# if defined(__aarch64__)
+# if defined(__aarch64__) || defined(__riscv) || defined(__loongarch_lp64)
   LSS_INLINE pid_t LSS_NAME(fork)(void) {
     // No fork syscall on aarch64 - implement by means of the clone syscall.
     // Note that this does not reset glibc's cached view of the PID/TID, so
diff --git a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/Makefile b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/Makefile
index a6f1ec6a5..a4e2f3873 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/Makefile
+++ b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/Makefile
@@ -1,4 +1,4 @@
-# Copyright 2018, Google Inc.  All rights reserved.
+# Copyright 2018 Google LLC
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
@@ -10,7 +10,7 @@
 # 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
+#     * Neither the name of Google LLC nor the names of its
 # contributors may be used to endorse or promote products derived from
 # this software without specific prior written permission.
 #
@@ -41,8 +41,10 @@ LDFLAGS += -static
 
 TESTS = \
 	fallocate \
+	getitimer \
 	getrandom \
 	lstat \
+	setitimer \
 	sigaction \
 	sigtimedwait \
 	stat \
@@ -53,6 +55,10 @@ all: check
 %_test: %.c test_skel.h $(top_srcdir)/linux_syscall_support.h
 	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $<
 
+# Force building C as C++ code to improve compile-time coverage.
+%_cc_test: %.c test_skel.h $(top_srcdir)/linux_syscall_support.h
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $<
+
 %_test: %.cc test_skel.h $(top_srcdir)/linux_syscall_support.h
 	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $<
 
@@ -70,10 +76,10 @@ all: check
 		exit 1; \
 	fi
 
-ALL_TEST_TARGETS = $(TESTS:=_test)
+ALL_TEST_TARGETS = $(TESTS:=_test) $(TESTS:=_cc_test)
 compile_tests: $(ALL_TEST_TARGETS)
 
-ALL_RUN_TARGETS = $(TESTS:=_run)
+ALL_RUN_TARGETS = $(TESTS:=_run) $(TESTS:=_cc_run)
 check: $(ALL_RUN_TARGETS)
 
 # The "tempfile" targets are the names we use with temp files.
@@ -114,6 +120,7 @@ cross:
 		"mips64-unknown-linux-gnu-gcc -mabi=n32" \
 		"s390-ibm-linux-gnu-gcc" \
 		"s390x-ibm-linux-gnu-gcc" \
+		"loongarch64-unknown-linux-gnu-gcc" \
 	; do \
 		cxx=`echo "$$cc" | sed 's:-gcc:-g++:'`; \
 		$(MAKE) --no-print-directory CC="$$cc" CXX="$$cxx" cross_compile; \
diff --git a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/fallocate.c b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/fallocate.c
index f6589070f..1a26fed55 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/fallocate.c
+++ b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/fallocate.c
@@ -1,4 +1,4 @@
-/* Copyright 2019, Google Inc.  All rights reserved.
+/* Copyright 2019 Google LLC
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -10,7 +10,7 @@
  * 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
+ *     * Neither the name of Google LLC nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
  *
diff --git a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/getitimer.c b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/getitimer.c
new file mode 100644
index 000000000..860538a0f
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/getitimer.c
@@ -0,0 +1,84 @@
+/* Copyright 2022 Google LLC
+ *
+ * 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 LLC 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.
+ */
+
+#include "test_skel.h"
+
+int main(int argc, char *argv[]) {
+  // We need an invalid timer value. The assert()'s below should
+  // be static asserts but it is not available in older C versions.
+#define kInvalidTimer 9999
+  assert(kInvalidTimer != ITIMER_REAL);
+  assert(kInvalidTimer != ITIMER_VIRTUAL);
+  assert(kInvalidTimer != ITIMER_PROF);
+
+  // This should fail with EINVAL.
+  struct kernel_itimerval curr_itimer;
+  assert(sys_getitimer(kInvalidTimer, &curr_itimer) == -1);
+  assert(errno == EINVAL);
+
+  // Create a read-only page.
+  size_t page_size = getpagesize();
+  void* read_only_page = sys_mmap(NULL, page_size, PROT_READ,
+                                  MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+  assert(read_only_page != MAP_FAILED);
+
+  // This should fail with EFAULT.
+  assert(sys_getitimer(ITIMER_REAL,
+                       (struct kernel_itimerval*) read_only_page) == -1);
+  assert(errno == EFAULT);
+
+  // This should complete without an error.
+  assert(sys_getitimer(ITIMER_REAL, &curr_itimer) == 0);
+
+  // Set up a real time timer with very long interval and value so that
+  // we do not need to handle SIGALARM in test.
+  struct kernel_itimerval new_itimer;
+  const time_t kIntervalSec = 60 * 60 * 24 * 365;  // One year.
+  const long kIntervalUSec = 123;
+  new_itimer.it_interval.tv_sec = kIntervalSec;
+  new_itimer.it_interval.tv_usec = kIntervalUSec;
+  new_itimer.it_value = new_itimer.it_interval;
+  assert(sys_setitimer(ITIMER_REAL, &new_itimer, NULL) == 0);
+
+  assert(sys_getitimer(ITIMER_REAL, &curr_itimer) == 0);
+  assert(kernel_timeval_eq(&curr_itimer.it_interval, &new_itimer.it_interval));
+
+  // Disable timer.
+  struct kernel_itimerval empty_itimer;
+  empty_itimer.it_interval.tv_sec = 0;
+  empty_itimer.it_interval.tv_usec = 0;
+  empty_itimer.it_value = empty_itimer.it_interval;
+  assert(sys_setitimer(ITIMER_REAL, &empty_itimer, NULL) == 0);
+
+  // We should read back an empty itimer.
+  assert(sys_getitimer(ITIMER_REAL, &curr_itimer) == 0);
+  assert(kernel_itimerval_eq(&curr_itimer, &empty_itimer));
+
+  return 0;
+}
diff --git a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/getrandom.c b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/getrandom.c
index eb1f16228..0ec38b3c9 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/getrandom.c
+++ b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/getrandom.c
@@ -1,4 +1,4 @@
-/* Copyright 2020, Google Inc.  All rights reserved.
+/* Copyright 2020 Google LLC
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -10,7 +10,7 @@
  * 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
+ *     * Neither the name of Google LLC nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
  *
diff --git a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/lstat.c b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/lstat.c
index 33848a981..816ba9faa 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/lstat.c
+++ b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/lstat.c
@@ -1,4 +1,4 @@
-/* Copyright 2021, Google Inc.  All rights reserved.
+/* Copyright 2021 Google LLC
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -10,7 +10,7 @@
  * 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
+ *     * Neither the name of Google LLC nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
  *
diff --git a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/setitimer.c b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/setitimer.c
new file mode 100644
index 000000000..dd2ccfe5c
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/setitimer.c
@@ -0,0 +1,90 @@
+/* Copyright 2022 Google LLC
+ *
+ * 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 LLC 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.
+ */
+
+#include "test_skel.h"
+
+int main(int argc, char *argv[]) {
+  // We need an invalid timer value. The assert()'s below should
+  // be static asserts but it is not avalible in older C versions.
+#define kInvalidTimer 9999
+  assert(kInvalidTimer != ITIMER_REAL);
+  assert(kInvalidTimer != ITIMER_VIRTUAL);
+  assert(kInvalidTimer != ITIMER_PROF);
+
+  // Invalid timer returns EINVAL.
+  assert(sys_setitimer(kInvalidTimer, NULL, NULL) == -1);
+  assert(errno == EINVAL);
+
+  const int kSignal = SIGALRM;
+  const size_t kSigsetSize = sizeof(struct kernel_sigset_t);
+
+  // Block SIGALRM.
+  struct kernel_sigset_t sigalarm_only;
+  struct kernel_sigset_t old_sigset;
+  assert(sys_sigemptyset(&sigalarm_only) == 0);
+  assert(sys_sigaddset(&sigalarm_only, kSignal) == 0);
+  assert(sys_rt_sigprocmask(SIG_BLOCK, &sigalarm_only, &old_sigset,
+                            kSigsetSize) == 0);
+
+  // Set up a real time timer.
+  struct kernel_itimerval new_itimer = {};
+  const long kIntervalUSec = 123;
+  new_itimer.it_interval.tv_sec = 0;
+  new_itimer.it_interval.tv_usec = kIntervalUSec;
+  new_itimer.it_value = new_itimer.it_interval;
+  assert(sys_setitimer(ITIMER_REAL, &new_itimer, NULL) == 0);
+
+  // Wait for alarm.
+  struct timespec timeout;
+  const unsigned long kNanoSecsPerSec = 1000000000;
+  const unsigned long kNanoSecsPerMicroSec = 1000;
+
+  // Use a timeout 3 times of the timer interval.
+  unsigned long duration_ns = kIntervalUSec * kNanoSecsPerMicroSec * 3;
+  timeout.tv_sec = duration_ns / kNanoSecsPerSec ;
+  timeout.tv_nsec = duration_ns % kNanoSecsPerSec;
+
+  int sig;
+  do {
+    sig = sys_sigtimedwait(&sigalarm_only, NULL, &timeout);
+  } while (sig == -1 && errno == EINTR);
+  assert(sig == kSignal);
+
+  // Disable timer, check saving of old timer value.
+  struct kernel_itimerval empty_itimer = {};
+  struct kernel_itimerval old_itimer;
+  empty_itimer.it_interval.tv_sec = 0;
+  empty_itimer.it_interval.tv_usec = 0;
+  empty_itimer.it_value = empty_itimer.it_interval;
+
+  assert(sys_setitimer(ITIMER_REAL, &empty_itimer, &old_itimer) == 0);
+  assert(kernel_timeval_eq(&old_itimer.it_interval, &new_itimer.it_interval));
+
+  return 0;
+}
diff --git a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/sigaction.c b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/sigaction.c
index f247aca7c..db3658f40 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/sigaction.c
+++ b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/sigaction.c
@@ -1,4 +1,4 @@
-/* Copyright 2020, Google Inc.  All rights reserved.
+/* Copyright 2020 Google LLC
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -10,7 +10,7 @@
  * 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
+ *     * Neither the name of Google LLC nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
  *
diff --git a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/sigtimedwait.c b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/sigtimedwait.c
index ee2f740fe..d56d30460 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/sigtimedwait.c
+++ b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/sigtimedwait.c
@@ -1,4 +1,4 @@
-/* Copyright 2019, Google Inc.  All rights reserved.
+/* Copyright 2019 Google LLC
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -10,7 +10,7 @@
  * 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
+ *     * Neither the name of Google LLC nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
  *
diff --git a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/stat.c b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/stat.c
index 48cac620c..5ae66852d 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/stat.c
+++ b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/stat.c
@@ -1,4 +1,4 @@
-/* Copyright 2021, Google Inc.  All rights reserved.
+/* Copyright 2021 Google LLC
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -10,7 +10,7 @@
  * 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
+ *     * Neither the name of Google LLC nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
  *
diff --git a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/test_skel.h b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/test_skel.h
index 238c48d1d..89077c95d 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/test_skel.h
+++ b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/test_skel.h
@@ -1,4 +1,4 @@
-/* Copyright 2018, Google Inc.  All rights reserved.
+/* Copyright 2018 Google LLC
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -10,7 +10,7 @@
  * 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
+ *     * Neither the name of Google LLC nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
  *
@@ -54,6 +54,7 @@
 #include <sys/stat.h>
 #include <sys/vfs.h>
 #include <sys/wait.h>
+#include <unistd.h>
 
 #include <linux/capability.h>
 
@@ -72,3 +73,17 @@ void assert_buffers_eq_len(const void *buf1, const void *buf2, size_t len) {
   }
 }
 #define assert_buffers_eq(obj1, obj2) assert_buffers_eq_len(obj1, obj2, sizeof(*obj1))
+
+// Returns true iff pointed timevals are equal.
+static inline bool kernel_timeval_eq(const struct kernel_timeval* lhs,
+                                     const struct kernel_timeval* rhs) {
+  return (lhs->tv_sec == rhs->tv_sec) && (lhs->tv_usec == rhs->tv_usec);
+}
+
+// Returns true iff pointed itimervals are equal.
+static inline bool kernel_itimerval_eq(const struct kernel_itimerval* lhs,
+                                       const struct kernel_itimerval* rhs) {
+  return kernel_timeval_eq(&lhs->it_interval, &rhs->it_interval) &&
+         kernel_timeval_eq(&lhs->it_value, &rhs->it_value);
+}
+
diff --git a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/unlink.c b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/unlink.c
index 70c8bc9a5..191e36792 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/unlink.c
+++ b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/unlink.c
@@ -1,4 +1,4 @@
-/* Copyright 2018, Google Inc.  All rights reserved.
+/* Copyright 2018 Google LLC
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -10,7 +10,7 @@
  * 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
+ *     * Neither the name of Google LLC nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
  *
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/CMakeLists.txt b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/CMakeLists.txt
index 4577c1d12..48bfbe8df 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/CMakeLists.txt
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/CMakeLists.txt
@@ -15,7 +15,7 @@ mc_append_sources(
     check.h
     check_op.h
     compiler_specific.h
-    cxx17_backports.h
+    containers/span.h
     debug/alias.cc
     debug/alias.h
     files/file_path.cc
@@ -50,6 +50,11 @@ mc_append_sources(
     rand_util.h
     scoped_clear_last_error.h
     scoped_generic.h
+    strings/pattern.cc
+    strings/pattern.h
+    strings/strcat.cc
+    strings/strcat.h
+    strings/strcat_internal.h
     strings/string_number_conversions.cc
     strings/string_number_conversions.h
     strings/string_piece.h
@@ -70,6 +75,7 @@ mc_append_sources(
     third_party/icu/icu_utf.h
     threading/thread_local_storage.cc
     threading/thread_local_storage.h
+    types/cxx23_to_underlying.h
 )
 
 if(NOT MINGW)
@@ -82,43 +88,30 @@ else()
     )
 endif()
 
-if(APPLE AND NOT IOS)
-    mc_append_sources(
-        mac/close_nocancel.cc
-        mac/foundation_util.h
-        mac/foundation_util.mm
-        mac/mach_logging.cc
-        mac/mach_logging.h
-        mac/scoped_cftyperef.h
-        mac/scoped_ioobject.h
-        mac/scoped_launch_data.h
-        mac/scoped_mach_port.cc
-        mac/scoped_mach_port.h
-        mac/scoped_mach_vm.cc
-        mac/scoped_mach_vm.h
-        mac/scoped_nsautorelease_pool.h
-        mac/scoped_nsautorelease_pool.mm
-        mac/scoped_nsobject.h
-        mac/scoped_typeref.h
-        strings/sys_string_conversions_mac.mm
-    )
-elseif(IOS)
+if(APPLE)
     mc_append_sources(
-        mac/foundation_util.h
-        mac/foundation_util.mm
-        mac/mach_logging.cc
-        mac/mach_logging.h
-        mac/scoped_cftyperef.h
-        mac/scoped_mach_port.cc
-        mac/scoped_mach_port.h
-        mac/scoped_mach_vm.cc
-        mac/scoped_mach_vm.h
-        mac/scoped_nsautorelease_pool.h
-        mac/scoped_nsautorelease_pool.mm
-        mac/scoped_nsobject.h
-        mac/scoped_typeref.h
+        apple/bridging.h
+        apple/foundation_util.h
+        apple/foundation_util.mm
+        apple/mach_logging.cc
+        apple/mach_logging.h
+        apple/scoped_cftyperef.h
+        apple/scoped_mach_port.cc
+        apple/scoped_mach_port.h
+        apple/scoped_mach_vm.cc
+        apple/scoped_mach_vm.h
+        apple/scoped_nsautorelease_pool.h
+        apple/scoped_nsautorelease_pool.mm
+        apple/scoped_typeref.h
         strings/sys_string_conversions_mac.mm
     )
+    if (NOT IOS)
+        mc_append_sources(
+            mac/close_nocancel.cc
+            mac/scoped_ioobject.h
+            mac/scoped_launch_data.h
+        )
+    endif()
 endif()
 
 if(WIN32)
@@ -144,6 +137,9 @@ else()
     )
 endif()
 
+if(APPLE)
+    target_compile_options(mini_chromium PUBLIC -fobjc-arc -fno-objc-arc-exceptions)
+endif()
 if(APPLE AND NOT IOS)
     target_link_libraries(mini_chromium PUBLIC
         "-framework ApplicationServices"
@@ -181,7 +177,11 @@ target_link_libraries(mini_chromium
 if(WIN32)
     target_link_libraries(mini_chromium PRIVATE advapi32 kernel32)
     if(MSVC)
-        target_compile_options(mini_chromium PRIVATE "/wd4201" "/wd4996")
+        target_compile_options(mini_chromium PRIVATE
+            $<$<COMPILE_LANGUAGE:C,CXX>:/wd4201> # nonstandard extension used : nameless struct/union.
+            $<$<COMPILE_LANGUAGE:C,CXX>:/wd4244> # conversion from '__int64' to 'int32_t', possible loss of data.
+            $<$<COMPILE_LANGUAGE:C,CXX>:/wd4996> # 'X' was declared deprecated.
+        )
         target_compile_definitions(mini_chromium PRIVATE
             NOMINMAX
             UNICODE
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/README.crashpad b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/README.crashpad
index 37d507bf2..2ebdfffea 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/README.crashpad
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/README.crashpad
@@ -5,6 +5,7 @@ Revision: See DEPS
 License: BSD 3-clause
 License File: mini_chromium/LICENSE
 Security Critical: yes
+Shipped in Chromium: no
 
 Description:
 mini_chromium is a small collection of useful low-level (“base�) routines from
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/AUTHORS b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/AUTHORS
index 3c022c096..8bd1039f9 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/AUTHORS
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/AUTHORS
@@ -2,4 +2,4 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-# See https://chromium.googlesource.com/chromium/chromium/+/trunk/AUTHORS
+# See https://chromium.googlesource.com/chromium/src/+/main/AUTHORS
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/BUILD.gn b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/BUILD.gn
index 2a22b0c14..690d70b08 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/BUILD.gn
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/BUILD.gn
@@ -14,7 +14,7 @@ static_library("base") {
     "check.h",
     "check_op.h",
     "compiler_specific.h",
-    "cxx17_backports.h",
+    "containers/span.h",
     "debug/alias.cc",
     "debug/alias.h",
     "files/file_path.cc",
@@ -49,6 +49,11 @@ static_library("base") {
     "rand_util.h",
     "scoped_clear_last_error.h",
     "scoped_generic.h",
+    "strings/pattern.cc",
+    "strings/pattern.h",
+    "strings/strcat.cc",
+    "strings/strcat.h",
+    "strings/strcat_internal.h",
     "strings/string_number_conversions.cc",
     "strings/string_number_conversions.h",
     "strings/string_piece.h",
@@ -70,6 +75,7 @@ static_library("base") {
     "third_party/icu/icu_utf.h",
     "threading/thread_local_storage.cc",
     "threading/thread_local_storage.h",
+    "types/cxx23_to_underlying.h",
   ]
 
   if (mini_chromium_is_posix || mini_chromium_is_fuchsia) {
@@ -86,56 +92,43 @@ static_library("base") {
     ]
   }
 
-  if (mini_chromium_is_mac) {
+  if (mini_chromium_is_apple) {
     sources += [
-      "mac/close_nocancel.cc",
-      "mac/foundation_util.h",
-      "mac/foundation_util.mm",
-      "mac/mach_logging.cc",
-      "mac/mach_logging.h",
-      "mac/scoped_cftyperef.h",
-      "mac/scoped_ioobject.h",
-      "mac/scoped_launch_data.h",
-      "mac/scoped_mach_port.cc",
-      "mac/scoped_mach_port.h",
-      "mac/scoped_mach_vm.cc",
-      "mac/scoped_mach_vm.h",
-      "mac/scoped_nsautorelease_pool.h",
-      "mac/scoped_nsautorelease_pool.mm",
-      "mac/scoped_nsobject.h",
-      "mac/scoped_typeref.h",
+      "apple/bridging.h",
+      "apple/foundation_util.h",
+      "apple/foundation_util.mm",
+      "apple/mach_logging.cc",
+      "apple/mach_logging.h",
+      "apple/scoped_cftyperef.h",
+      "apple/scoped_mach_port.cc",
+      "apple/scoped_mach_port.h",
+      "apple/scoped_mach_vm.cc",
+      "apple/scoped_mach_vm.h",
+      "apple/scoped_nsautorelease_pool.h",
+      "apple/scoped_nsautorelease_pool.mm",
+      "apple/scoped_typeref.h",
       "strings/sys_string_conversions_mac.mm",
     ]
     frameworks = [
-      "ApplicationServices.framework",
       "CoreFoundation.framework",
       "Foundation.framework",
-      "IOKit.framework",
       "Security.framework",
     ]
-  } else if (mini_chromium_is_ios) {
+  }
+  if (mini_chromium_is_mac) {
     sources += [
-      "mac/foundation_util.h",
-      "mac/foundation_util.mm",
-      "mac/mach_logging.cc",
-      "mac/mach_logging.h",
-      "mac/scoped_cftyperef.h",
-      "mac/scoped_mach_port.cc",
-      "mac/scoped_mach_port.h",
-      "mac/scoped_mach_vm.cc",
-      "mac/scoped_mach_vm.h",
-      "mac/scoped_nsautorelease_pool.h",
-      "mac/scoped_nsautorelease_pool.mm",
-      "mac/scoped_nsobject.h",
-      "mac/scoped_typeref.h",
-      "strings/sys_string_conversions_mac.mm",
+      "mac/close_nocancel.cc",
+      "mac/scoped_ioobject.h",
+      "mac/scoped_launch_data.h",
     ]
-    frameworks = [
-      "CoreFoundation.framework",
+    frameworks += [
+      "ApplicationServices.framework",
+      "IOKit.framework",
+    ]
+  } else if (mini_chromium_is_ios) {
+    frameworks += [
       "CoreGraphics.framework",
       "CoreText.framework",
-      "Foundation.framework",
-      "Security.framework",
     ]
   } else if (mini_chromium_is_win) {
     sources += [
@@ -164,6 +157,10 @@ static_library("base") {
 
   public_deps = [ "../build" ]
 
+  if (mini_chromium_is_apple) {
+    public_configs += [ "../build/config:apple_enable_arc" ]
+  }
+
   if (mini_chromium_is_android) {
     libs = [ "log" ]
   }
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/apple/bridging.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/apple/bridging.h
new file mode 100644
index 000000000..d5dde2d99
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/apple/bridging.h
@@ -0,0 +1,140 @@
+// Copyright 2021 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef BASE_APPLE_BRIDGING_H_
+#define BASE_APPLE_BRIDGING_H_
+
+#include <CoreText/CoreText.h>
+#import <Foundation/Foundation.h>
+
+#include "base/apple/scoped_cftyperef.h"
+#include "base/check.h"
+#include "build/build_config.h"
+
+#if BUILDFLAG(IS_IOS)
+#import <UIKit/UIKit.h>
+#endif
+
+#if BUILDFLAG(IS_MAC)
+#import <AppKit/AppKit.h>
+#endif
+
+// These functions convert pointers of bridged CFTypes to NSTypes and
+// vice-versa. They come in two flavors: those that transfer ownership
+// (`OwnershipCast`) and those that just convert the pointer (`PtrCast`).
+//
+// Examples:
+//
+// Ownership transference (as in `CFBridgingRetain`/`Release`):
+//   CFStringRef cf_string = CFStringCreateWithCString(...);
+//   NSString* ns_string = CFToNSOwnershipCast(cf_string);
+//   // At this point, `cf_string` does not need releasing.
+//
+//   NSString* ns_string = [[NSString alloc] initWithString:...];
+//   CFStringRef cf_string = NSToCFOwnershipCast(ns_string);
+//   // At this point, `cf_string` must be released.
+//
+// Pointer conversion (as in `__bridge`):
+//   // `cf_data` is some `CFDataRef` from somewhere.
+//   NSImage* ns_image = [[NSImage alloc] initWithData:CFToNSPtrCast(cf_data)];
+//
+//   // `ns_data` is some `NSData *` from somewhere.
+//   SecKeyRef sec_key = SecKeyCreateFromData(..., NSToCFPtrCast(ns_data), ...);
+//
+// The reason to use these functions (rather than using `__bridge` and
+// `CFBridgingRetain`/`Release`) is because they are type-safe. The OS-provided
+// bridging calls do not type check, while these calls do the appropriate type
+// checking via the magic of macros.
+//
+// Implementation note: Why not templates? Type checking in Core Foundation
+// involves functions named in a specific pattern, and only macro token pasting
+// works for this purpose.
+
+#define CF_TO_NS_CAST_IMPL(TypeCF, TypeNS)                               \
+  namespace base::apple {                                                \
+  inline TypeNS* _Nullable CFToNSOwnershipCast(                          \
+      TypeCF##Ref CF_CONSUMED _Nullable cf_val) {                        \
+    DCHECK(!cf_val || TypeCF##GetTypeID() == CFGetTypeID(cf_val));       \
+    return (__bridge_transfer TypeNS*)cf_val;                            \
+  }                                                                      \
+  inline CF_RETURNS_RETAINED TypeCF##Ref _Nullable NSToCFOwnershipCast(  \
+      TypeNS* _Nullable ns_val) {                                        \
+    TypeCF##Ref cf_val = (__bridge_retained TypeCF##Ref)ns_val;          \
+    DCHECK(!cf_val || TypeCF##GetTypeID() == CFGetTypeID(cf_val));       \
+    return cf_val;                                                       \
+  }                                                                      \
+  inline TypeNS* _Nullable CFToNSPtrCast(TypeCF##Ref _Nullable cf_val) { \
+    DCHECK(!cf_val || TypeCF##GetTypeID() == CFGetTypeID(cf_val));       \
+    return (__bridge TypeNS*)cf_val;                                     \
+  }                                                                      \
+  inline TypeCF##Ref _Nullable NSToCFPtrCast(TypeNS* _Nullable ns_val) { \
+    TypeCF##Ref cf_val = (__bridge TypeCF##Ref)ns_val;                   \
+    DCHECK(!cf_val || TypeCF##GetTypeID() == CFGetTypeID(cf_val));       \
+    return cf_val;                                                       \
+  }                                                                      \
+  }
+
+#define CF_TO_NS_MUTABLE_CAST_IMPL(name)                                 \
+  CF_TO_NS_CAST_IMPL(CF##name, NS##name)                                 \
+  namespace base::apple {                                                \
+  inline NSMutable##name* _Nullable CFToNSOwnershipCast(                 \
+      CFMutable##name##Ref CF_CONSUMED _Nullable cf_val) {               \
+    DCHECK(!cf_val || CF##name##GetTypeID() == CFGetTypeID(cf_val));     \
+    return (__bridge_transfer NSMutable##name*)cf_val;                   \
+  }                                                                      \
+  inline CF_RETURNS_RETAINED                                             \
+      CFMutable##name##Ref _Nullable NSToCFOwnershipCast(                \
+          NSMutable##name* _Nullable ns_val) {                           \
+    CFMutable##name##Ref cf_val =                                        \
+        (__bridge_retained CFMutable##name##Ref)ns_val;                  \
+    DCHECK(!cf_val || CF##name##GetTypeID() == CFGetTypeID(cf_val));     \
+    return cf_val;                                                       \
+  }                                                                      \
+  inline NSMutable##name* _Nullable CFToNSPtrCast(                       \
+      CFMutable##name##Ref _Nullable cf_val) {                           \
+    DCHECK(!cf_val || CF##name##GetTypeID() == CFGetTypeID(cf_val));     \
+    return (__bridge NSMutable##name*)cf_val;                            \
+  }                                                                      \
+  inline CFMutable##name##Ref _Nullable NSToCFPtrCast(                   \
+      NSMutable##name* _Nullable ns_val) {                               \
+    CFMutable##name##Ref cf_val = (__bridge CFMutable##name##Ref)ns_val; \
+    DCHECK(!cf_val || CF##name##GetTypeID() == CFGetTypeID(cf_val));     \
+    return cf_val;                                                       \
+  }                                                                      \
+  }
+
+// List of toll-free bridged types taken from:
+// https://web.archive.org/web/20111124025525/http://www.cocoadev.com/index.pl?TollFreeBridged
+// https://developer.apple.com/library/archive/documentation/CoreFoundation/Conceptual/CFDesignConcepts/Articles/tollFreeBridgedTypes.html#//apple_ref/doc/uid/TP40010677-SW4
+
+// Foundation
+CF_TO_NS_MUTABLE_CAST_IMPL(Array)
+CF_TO_NS_MUTABLE_CAST_IMPL(AttributedString)
+CF_TO_NS_CAST_IMPL(CFCalendar, NSCalendar)
+CF_TO_NS_MUTABLE_CAST_IMPL(CharacterSet)
+CF_TO_NS_MUTABLE_CAST_IMPL(Data)
+CF_TO_NS_CAST_IMPL(CFDate, NSDate)
+CF_TO_NS_MUTABLE_CAST_IMPL(Dictionary)
+CF_TO_NS_CAST_IMPL(CFError, NSError)
+CF_TO_NS_CAST_IMPL(CFLocale, NSLocale)
+CF_TO_NS_CAST_IMPL(CFNumber, NSNumber)
+CF_TO_NS_CAST_IMPL(CFRunLoopTimer, NSTimer)
+CF_TO_NS_CAST_IMPL(CFTimeZone, NSTimeZone)
+CF_TO_NS_MUTABLE_CAST_IMPL(Set)
+CF_TO_NS_CAST_IMPL(CFReadStream, NSInputStream)
+CF_TO_NS_CAST_IMPL(CFWriteStream, NSOutputStream)
+CF_TO_NS_MUTABLE_CAST_IMPL(String)
+CF_TO_NS_CAST_IMPL(CFURL, NSURL)
+
+// AppKit / UIKit
+#if BUILDFLAG(IS_IOS)
+CF_TO_NS_CAST_IMPL(CTFont, UIFont)
+#else
+CF_TO_NS_CAST_IMPL(CTFont, NSFont)
+#endif  // BUILDFLAG(IS_IOS)
+
+#undef CF_TO_NS_CAST_IMPL
+#undef CF_TO_NS_MUTABLE_CAST_IMPL
+
+#endif  // BASE_APPLE_BRIDGING_H_
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/apple/foundation_util.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/apple/foundation_util.h
new file mode 100644
index 000000000..1654c8a1e
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/apple/foundation_util.h
@@ -0,0 +1,124 @@
+// Copyright 2008 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef MINI_CHROMIUM_BASE_APPLE_FOUNDATION_UTIL_H_
+#define MINI_CHROMIUM_BASE_APPLE_FOUNDATION_UTIL_H_
+
+#include "base/logging.h"
+#include "build/build_config.h"
+
+#if BUILDFLAG(IS_IOS)
+#include <CoreText/CoreText.h>
+#else
+#include <ApplicationServices/ApplicationServices.h>
+#endif
+
+#if defined(__OBJC__)
+#import <Foundation/Foundation.h>
+#else  // defined(__OBJC__)
+#include <CoreFoundation/CoreFoundation.h>
+#endif  // defined(__OBJC__)
+
+namespace base {
+namespace apple {
+
+// CFCast<>() and CFCastStrict<>() cast a basic CFTypeRef to a more
+// specific CoreFoundation type. The compatibility of the passed
+// object is found by comparing its opaque type against the
+// requested type identifier. If the supplied object is not
+// compatible with the requested return type, CFCast<>() returns
+// NULL and CFCastStrict<>() will DCHECK. Providing a NULL pointer
+// to either variant results in NULL being returned without
+// triggering any DCHECK.
+//
+// Example usage:
+// CFNumberRef some_number = base::apple::CFCast<CFNumberRef>(
+//     CFArrayGetValueAtIndex(array, index));
+//
+// CFTypeRef hello = CFSTR("hello world");
+// CFStringRef some_string = base::apple::CFCastStrict<CFStringRef>(hello);
+
+template <typename T>
+T CFCast(const CFTypeRef& cf_val);
+
+template <typename T>
+T CFCastStrict(const CFTypeRef& cf_val);
+
+#define CF_CAST_DECL(TypeCF)                                \
+  template <>                                               \
+  TypeCF##Ref CFCast<TypeCF##Ref>(const CFTypeRef& cf_val); \
+                                                            \
+  template <>                                               \
+  TypeCF##Ref CFCastStrict<TypeCF##Ref>(const CFTypeRef& cf_val)
+
+CF_CAST_DECL(CFArray);
+CF_CAST_DECL(CFBag);
+CF_CAST_DECL(CFBoolean);
+CF_CAST_DECL(CFData);
+CF_CAST_DECL(CFDate);
+CF_CAST_DECL(CFDictionary);
+CF_CAST_DECL(CFNull);
+CF_CAST_DECL(CFNumber);
+CF_CAST_DECL(CFSet);
+CF_CAST_DECL(CFString);
+CF_CAST_DECL(CFURL);
+CF_CAST_DECL(CFUUID);
+
+CF_CAST_DECL(CGColor);
+
+CF_CAST_DECL(CTFont);
+CF_CAST_DECL(CTRun);
+
+#if !BUILDFLAG(IS_IOS)
+CF_CAST_DECL(SecACL);
+CF_CAST_DECL(SecTrustedApplication);
+#endif
+
+#undef CF_CAST_DECL
+
+#if defined(__OBJC__)
+
+// ObjCCast<>() and ObjCCastStrict<>() cast a basic id to a more
+// specific (NSObject-derived) type. The compatibility of the passed
+// object is found by checking if it's a kind of the requested type
+// identifier. If the supplied object is not compatible with the
+// requested return type, ObjCCast<>() returns nil and
+// ObjCCastStrict<>() will DCHECK. Providing a nil pointer to either
+// variant results in nil being returned without triggering any DCHECK.
+//
+// The strict variant is useful when retrieving a value from a
+// collection which only has values of a specific type, e.g. an
+// NSArray of NSStrings. The non-strict variant is useful when
+// retrieving values from data that you can't fully control. For
+// example, a plist read from disk may be beyond your exclusive
+// control, so you'd only want to check that the values you retrieve
+// from it are of the expected types, but not crash if they're not.
+//
+// Example usage:
+// NSString* version = base::apple::ObjCCast<NSString>(
+//     [bundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"]);
+//
+// NSString* str = base::apple::ObjCCastStrict<NSString>(
+//     [ns_arr_of_ns_strs objectAtIndex:0]);
+template <typename T>
+T* ObjCCast(id objc_val) {
+  if ([objc_val isKindOfClass:[T class]]) {
+    return reinterpret_cast<T*>(objc_val);
+  }
+  return nil;
+}
+
+template <typename T>
+T* ObjCCastStrict(id objc_val) {
+  T* rv = ObjCCast<T>(objc_val);
+  DCHECK(objc_val == nil || rv);
+  return rv;
+}
+
+#endif  // defined(__OBJC__)
+
+}  // namespace apple
+}  // namespace base
+
+#endif  // MINI_CHROMIUM_BASE_APPLE_FOUNDATION_UTIL_H_
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/apple/foundation_util.mm b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/apple/foundation_util.mm
new file mode 100644
index 000000000..2c63ac991
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/apple/foundation_util.mm
@@ -0,0 +1,64 @@
+// Copyright 2008 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "base/apple/foundation_util.h"
+
+#include "base/check.h"
+
+#if !BUILDFLAG(IS_IOS)
+extern "C" {
+CFTypeID SecACLGetTypeID();
+CFTypeID SecTrustedApplicationGetTypeID();
+}  // extern "C"
+#endif
+
+namespace base {
+namespace apple {
+
+#define CF_CAST_DEFN(TypeCF)                                       \
+  template <>                                                      \
+  TypeCF##Ref CFCast<TypeCF##Ref>(const CFTypeRef& cf_val) {       \
+    if (cf_val == NULL) {                                          \
+      return NULL;                                                 \
+    }                                                              \
+    if (CFGetTypeID(cf_val) == TypeCF##GetTypeID()) {              \
+      return (TypeCF##Ref)(cf_val);                                \
+    }                                                              \
+    return NULL;                                                   \
+  }                                                                \
+                                                                   \
+  template <>                                                      \
+  TypeCF##Ref CFCastStrict<TypeCF##Ref>(const CFTypeRef& cf_val) { \
+    TypeCF##Ref rv = CFCast<TypeCF##Ref>(cf_val);                  \
+    DCHECK(cf_val == NULL || rv);                                  \
+    return rv;                                                     \
+  }
+
+CF_CAST_DEFN(CFArray)
+CF_CAST_DEFN(CFBag)
+CF_CAST_DEFN(CFBoolean)
+CF_CAST_DEFN(CFData)
+CF_CAST_DEFN(CFDate)
+CF_CAST_DEFN(CFDictionary)
+CF_CAST_DEFN(CFNull)
+CF_CAST_DEFN(CFNumber)
+CF_CAST_DEFN(CFSet)
+CF_CAST_DEFN(CFString)
+CF_CAST_DEFN(CFURL)
+CF_CAST_DEFN(CFUUID)
+
+CF_CAST_DEFN(CGColor)
+
+CF_CAST_DEFN(CTFont)
+CF_CAST_DEFN(CTRun)
+
+#if !BUILDFLAG(IS_IOS)
+CF_CAST_DEFN(SecACL)
+CF_CAST_DEFN(SecTrustedApplication)
+#endif
+
+#undef CF_CAST_DEFN
+
+}  // namespace apple
+}  // namespace base
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/mach_logging.cc b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/apple/mach_logging.cc
similarity index 89%
rename from external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/mach_logging.cc
rename to external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/apple/mach_logging.cc
index a0041cc50..d5d519802 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/mach_logging.cc
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/apple/mach_logging.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/mac/mach_logging.h"
+#include "base/apple/mach_logging.h"
 
 #include <iomanip>
 #include <string>
@@ -34,13 +34,10 @@ MachLogMessage::MachLogMessage(const char* function,
                                int line,
                                LogSeverity severity,
                                mach_error_t mach_err)
-    : LogMessage(function, file_path, line, severity),
-      mach_err_(mach_err) {
-}
+    : LogMessage(function, file_path, line, severity), mach_err_(mach_err) {}
 
 MachLogMessage::~MachLogMessage() {
-  stream() << ": "
-           << mach_error_string(mach_err_)
+  stream() << ": " << mach_error_string(mach_err_)
            << FormatMachErrorNumber(mach_err_);
 }
 
@@ -52,12 +49,10 @@ BootstrapLogMessage::BootstrapLogMessage(const char* function,
                                          LogSeverity severity,
                                          kern_return_t bootstrap_err)
     : LogMessage(function, file_path, line, severity),
-      bootstrap_err_(bootstrap_err) {
-}
+      bootstrap_err_(bootstrap_err) {}
 
 BootstrapLogMessage::~BootstrapLogMessage() {
-  stream() << ": "
-           << bootstrap_strerror(bootstrap_err_);
+  stream() << ": " << bootstrap_strerror(bootstrap_err_);
 
   switch (bootstrap_err_) {
     case BOOTSTRAP_SUCCESS:
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/apple/mach_logging.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/apple/mach_logging.h
new file mode 100644
index 000000000..9ba89b490
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/apple/mach_logging.h
@@ -0,0 +1,163 @@
+// Copyright 2014 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef MINI_CHROMIUM_BASE_APPLE_MACH_LOGGING_H_
+#define MINI_CHROMIUM_BASE_APPLE_MACH_LOGGING_H_
+
+#include <mach/mach.h>
+
+#include "base/logging.h"
+#include "build/build_config.h"
+
+// Use the MACH_LOG family of macros along with a mach_error_t (kern_return_t)
+// containing a Mach error. The error value will be decoded so that logged
+// messages explain the error.
+//
+// Use the BOOTSTRAP_LOG family of macros specifically for errors that occur
+// while interoperating with the bootstrap subsystem. These errors will first
+// be looked up as bootstrap error messages. If no match is found, they will
+// be treated as generic Mach errors, as in MACH_LOG.
+//
+// Examples:
+//
+//   kern_return_t kr = mach_timebase_info(&info);
+//   if (kr != KERN_SUCCESS) {
+//     MACH_LOG(ERROR, kr) << "mach_timebase_info";
+//   }
+//
+//   kr = vm_deallocate(task, address, size);
+//   MACH_DCHECK(kr == KERN_SUCCESS, kr) << "vm_deallocate";
+
+namespace logging {
+
+class MachLogMessage : public logging::LogMessage {
+ public:
+  MachLogMessage(const char* function,
+                 const char* file_path,
+                 int line,
+                 LogSeverity severity,
+                 mach_error_t mach_err);
+
+  MachLogMessage(const MachLogMessage&) = delete;
+  MachLogMessage& operator=(const MachLogMessage&) = delete;
+
+  ~MachLogMessage();
+
+ private:
+  mach_error_t mach_err_;
+};
+
+}  // namespace logging
+
+#define MACH_LOG_STREAM(severity, mach_err) \
+  COMPACT_GOOGLE_LOG_EX_##severity(MachLogMessage, mach_err).stream()
+#define MACH_VLOG_STREAM(verbose_level, mach_err)                        \
+  logging::MachLogMessage(                                               \
+      __PRETTY_FUNCTION__, __FILE__, __LINE__, -verbose_level, mach_err) \
+      .stream()
+
+#define MACH_LOG(severity, mach_err) \
+  LAZY_STREAM(MACH_LOG_STREAM(severity, mach_err), LOG_IS_ON(severity))
+#define MACH_LOG_IF(severity, condition, mach_err) \
+  LAZY_STREAM(MACH_LOG_STREAM(severity, mach_err), \
+              LOG_IS_ON(severity) && (condition))
+
+#define MACH_VLOG(verbose_level, mach_err)               \
+  LAZY_STREAM(MACH_VLOG_STREAM(verbose_level, mach_err), \
+              VLOG_IS_ON(verbose_level))
+#define MACH_VLOG_IF(verbose_level, condition, mach_err) \
+  LAZY_STREAM(MACH_VLOG_STREAM(verbose_level, mach_err), \
+              VLOG_IS_ON(verbose_level) && (condition))
+
+#define MACH_CHECK(condition, mach_err)                       \
+  LAZY_STREAM(MACH_LOG_STREAM(FATAL, mach_err), !(condition)) \
+      << "Check failed: " #condition << ". "
+
+#define MACH_DLOG(severity, mach_err) \
+  LAZY_STREAM(MACH_LOG_STREAM(severity, mach_err), DLOG_IS_ON(severity))
+#define MACH_DLOG_IF(severity, condition, mach_err) \
+  LAZY_STREAM(MACH_LOG_STREAM(severity, mach_err),  \
+              DLOG_IS_ON(severity) && (condition))
+
+#define MACH_DVLOG(verbose_level, mach_err)              \
+  LAZY_STREAM(MACH_VLOG_STREAM(verbose_level, mach_err), \
+              DVLOG_IS_ON(verbose_level))
+#define MACH_DVLOG_IF(verbose_level, condition, mach_err) \
+  LAZY_STREAM(MACH_VLOG_STREAM(verbose_level, mach_err),  \
+              DVLOG_IS_ON(verbose_level) && (condition))
+
+#define MACH_DCHECK(condition, mach_err)                                      \
+  LAZY_STREAM(MACH_LOG_STREAM(FATAL, mach_err), DCHECK_IS_ON && !(condition)) \
+      << "Check failed: " #condition << ". "
+
+#if !BUILDFLAG(IS_IOS)
+
+namespace logging {
+
+class BootstrapLogMessage : public logging::LogMessage {
+ public:
+  BootstrapLogMessage(const char* function,
+                      const char* file_path,
+                      int line,
+                      LogSeverity severity,
+                      kern_return_t bootstrap_err);
+
+  BootstrapLogMessage(const BootstrapLogMessage&) = delete;
+  BootstrapLogMessage& operator=(const BootstrapLogMessage&) = delete;
+
+  ~BootstrapLogMessage();
+
+ private:
+  kern_return_t bootstrap_err_;
+};
+
+}  // namespace logging
+
+#define BOOTSTRAP_LOG_STREAM(severity, bootstrap_err) \
+  COMPACT_GOOGLE_LOG_EX_##severity(BootstrapLogMessage, bootstrap_err).stream()
+#define BOOTSTRAP_VLOG_STREAM(verbose_level, bootstrap_err)                   \
+  logging::BootstrapLogMessage(                                               \
+      __PRETTY_FUNCTION__, __FILE__, __LINE__, -verbose_level, bootstrap_err) \
+      .stream()
+
+#define BOOTSTRAP_LOG(severity, bootstrap_err)               \
+  LAZY_STREAM(BOOTSTRAP_LOG_STREAM(severity, bootstrap_err), \
+              LOG_IS_ON(severity))
+#define BOOTSTRAP_LOG_IF(severity, condition, bootstrap_err) \
+  LAZY_STREAM(BOOTSTRAP_LOG_STREAM(severity, bootstrap_err), \
+              LOG_IS_ON(severity) && (condition))
+
+#define BOOTSTRAP_VLOG(verbose_level, bootstrap_err)               \
+  LAZY_STREAM(BOOTSTRAP_VLOG_STREAM(verbose_level, bootstrap_err), \
+              VLOG_IS_ON(verbose_level))
+#define BOOTSTRAP_VLOG_IF(verbose_level, condition, bootstrap_err) \
+  LAZY_STREAM(BOOTSTRAP_VLOG_STREAM(verbose_level, bootstrap_err), \
+              VLOG_IS_ON(verbose_level) && (condition))
+
+#define BOOTSTRAP_CHECK(condition, bootstrap_err)                       \
+  LAZY_STREAM(BOOTSTRAP_LOG_STREAM(FATAL, bootstrap_err), !(condition)) \
+      << "Check failed: " #condition << ". "
+
+#define BOOTSTRAP_DLOG(severity, bootstrap_err)              \
+  LAZY_STREAM(BOOTSTRAP_LOG_STREAM(severity, bootstrap_err), \
+              DLOG_IS_ON(severity))
+#define BOOTSTRAP_DLOG_IF(severity, condition, bootstrap_err) \
+  LAZY_STREAM(BOOTSTRAP_LOG_STREAM(severity, bootstrap_err),  \
+              DLOG_IS_ON(severity) && (condition))
+
+#define BOOTSTRAP_DVLOG(verbose_level, bootstrap_err)              \
+  LAZY_STREAM(BOOTSTRAP_VLOG_STREAM(verbose_level, bootstrap_err), \
+              DVLOG_IS_ON(verbose_level))
+#define BOOTSTRAP_DVLOG_IF(verbose_level, condition, bootstrap_err) \
+  LAZY_STREAM(BOOTSTRAP_VLOG_STREAM(verbose_level, bootstrap_err),  \
+              DVLOG_IS_ON(verbose_level) && (condition))
+
+#define BOOTSTRAP_DCHECK(condition, bootstrap_err)        \
+  LAZY_STREAM(BOOTSTRAP_LOG_STREAM(FATAL, bootstrap_err), \
+              DCHECK_IS_ON && !(condition))               \
+      << "Check failed: " #condition << ". "
+
+#endif  // !BUILDFLAG(IS_IOS)
+
+#endif  // MINI_CHROMIUM_BASE_APPLE_MACH_LOGGING_H_
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/apple/scoped_cftyperef.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/apple/scoped_cftyperef.h
new file mode 100644
index 000000000..856f40950
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/apple/scoped_cftyperef.h
@@ -0,0 +1,36 @@
+// Copyright 2006-2008 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef MINI_CHROMIUM_BASE_APPLE_SCOPED_CFTYPEREF_H_
+#define MINI_CHROMIUM_BASE_APPLE_SCOPED_CFTYPEREF_H_
+
+#include <CoreFoundation/CoreFoundation.h>
+
+#include "base/apple/scoped_typeref.h"
+
+namespace base {
+namespace apple {
+
+namespace internal {
+
+template <typename CFT>
+struct ScopedCFTypeRefTraits {
+  static CFT InvalidValue() { return nullptr; }
+  static CFT Retain(CFT object) {
+    CFRetain(object);
+    return object;
+  }
+  static void Release(CFT object) { CFRelease(object); }
+};
+
+}  // namespace internal
+
+template <typename CFT>
+using ScopedCFTypeRef =
+    ScopedTypeRef<CFT, internal::ScopedCFTypeRefTraits<CFT>>;
+
+}  // namespace apple
+}  // namespace base
+
+#endif  // MINI_CHROMIUM_BASE_APPLE_SCOPED_CFTYPEREF_H_
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_mach_port.cc b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/apple/scoped_mach_port.cc
similarity index 87%
rename from external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_mach_port.cc
rename to external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/apple/scoped_mach_port.cc
index d89ae61a8..6f657f834 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_mach_port.cc
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/apple/scoped_mach_port.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/mac/scoped_mach_port.h"
+#include "base/apple/scoped_mach_port.h"
 
-#include "base/mac/mach_logging.h"
+#include "base/apple/mach_logging.h"
 
 namespace base {
-namespace mac {
+namespace apple {
 namespace internal {
 
 void SendRightTraits::Free(mach_port_t port) {
@@ -28,5 +28,5 @@ void PortSetTraits::Free(mach_port_t port) {
 }
 
 }  // namespace internal
-}  // namespace mac
+}  // namespace apple
 }  // namespace base
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/apple/scoped_mach_port.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/apple/scoped_mach_port.h
new file mode 100644
index 000000000..dd574a44a
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/apple/scoped_mach_port.h
@@ -0,0 +1,43 @@
+// Copyright 2012 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef MINI_CHROMIUM_BASE_APPLE_SCOPED_MACH_PORT_H_
+#define MINI_CHROMIUM_BASE_APPLE_SCOPED_MACH_PORT_H_
+
+#include <mach/mach.h>
+
+#include "base/scoped_generic.h"
+
+namespace base {
+namespace apple {
+
+namespace internal {
+
+struct SendRightTraits {
+  static mach_port_t InvalidValue() { return MACH_PORT_NULL; }
+  static void Free(mach_port_t port);
+};
+
+struct ReceiveRightTraits {
+  static mach_port_t InvalidValue() { return MACH_PORT_NULL; }
+  static void Free(mach_port_t port);
+};
+
+struct PortSetTraits {
+  static mach_port_t InvalidValue() { return MACH_PORT_NULL; }
+  static void Free(mach_port_t port);
+};
+
+}  // namespace internal
+
+using ScopedMachSendRight =
+    ScopedGeneric<mach_port_t, internal::SendRightTraits>;
+using ScopedMachReceiveRight =
+    ScopedGeneric<mach_port_t, internal::ReceiveRightTraits>;
+using ScopedMachPortSet = ScopedGeneric<mach_port_t, internal::PortSetTraits>;
+
+}  // namespace apple
+}  // namespace base
+
+#endif  // MINI_CHROMIUM_BASE_APPLE_SCOPED_MACH_PORT_H_
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_mach_vm.cc b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/apple/scoped_mach_vm.cc
similarity index 77%
rename from external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_mach_vm.cc
rename to external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/apple/scoped_mach_vm.cc
index e7d718ea1..f13057441 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_mach_vm.cc
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/apple/scoped_mach_vm.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/mac/scoped_mach_vm.h"
+#include "base/apple/scoped_mach_vm.h"
 
 namespace base {
-namespace mac {
+namespace apple {
 
 void ScopedMachVM::reset(vm_address_t address, vm_size_t size) {
   DCHECK(address % PAGE_SIZE == 0);
@@ -13,9 +13,8 @@ void ScopedMachVM::reset(vm_address_t address, vm_size_t size) {
 
   if (size_) {
     if (address_ < address) {
-      vm_deallocate(mach_task_self(),
-                    address_,
-                    std::min(size_, address - address_));
+      vm_deallocate(
+          mach_task_self(), address_, std::min(size_, address - address_));
     }
     if (address_ + size_ > address + size) {
       vm_address_t deallocate_start = std::max(address_, address + size);
@@ -29,5 +28,5 @@ void ScopedMachVM::reset(vm_address_t address, vm_size_t size) {
   size_ = size;
 }
 
-}  // namespace mac
+}  // namespace apple
 }  // namespace base
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_mach_vm.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/apple/scoped_mach_vm.h
similarity index 86%
rename from external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_mach_vm.h
rename to external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/apple/scoped_mach_vm.h
index ecc18aaed..2f9994c4c 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_mach_vm.h
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/apple/scoped_mach_vm.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MINI_CHROMIUM_BASE_MAC_SCOPED_MACH_VM_H_
-#define MINI_CHROMIUM_BASE_MAC_SCOPED_MACH_VM_H_
+#ifndef MINI_CHROMIUM_BASE_APPLE_SCOPED_MACH_VM_H_
+#define MINI_CHROMIUM_BASE_APPLE_SCOPED_MACH_VM_H_
 
 #include <mach/mach.h>
 
 #include <algorithm>
 
-#include "base/logging.h"
+#include "base/check.h"
 
 // Use ScopedMachVM to supervise ownership of pages in the current process
 // through the Mach VM subsystem. Pages allocated with vm_allocate can be
@@ -41,13 +41,12 @@
 //   ScopedMachVM vm_owner(address, mach_vm_round_page(size));
 
 namespace base {
-namespace mac {
+namespace apple {
 
 class ScopedMachVM {
  public:
   explicit ScopedMachVM(vm_address_t address = 0, vm_size_t size = 0)
-      : address_(address),
-        size_(size) {
+      : address_(address), size_(size) {
     DCHECK(address % PAGE_SIZE == 0);
     DCHECK(size % PAGE_SIZE == 0);
   }
@@ -63,13 +62,9 @@ class ScopedMachVM {
 
   void reset(vm_address_t address = 0, vm_size_t size = 0);
 
-  vm_address_t address() const {
-    return address_;
-  }
+  vm_address_t address() const { return address_; }
 
-  vm_size_t size() const {
-    return size_;
-  }
+  vm_size_t size() const { return size_; }
 
   void swap(ScopedMachVM& that) {
     std::swap(address_, that.address_);
@@ -86,7 +81,7 @@ class ScopedMachVM {
   vm_size_t size_;
 };
 
-}  // namespace mac
+}  // namespace apple
 }  // namespace base
 
-#endif  // MINI_CHROMIUM_BASE_MAC_SCOPED_MACH_VM_H_
+#endif  // MINI_CHROMIUM_BASE_APPLE_SCOPED_MACH_VM_H_
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/apple/scoped_nsautorelease_pool.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/apple/scoped_nsautorelease_pool.h
new file mode 100644
index 000000000..58fdcbc88
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/apple/scoped_nsautorelease_pool.h
@@ -0,0 +1,48 @@
+// Copyright 2008 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef MINI_CHROMIUM_BASE_APPLE_SCOPED_NSAUTORELEASE_POOL_H_
+#define MINI_CHROMIUM_BASE_APPLE_SCOPED_NSAUTORELEASE_POOL_H_
+
+#include "build/build_config.h"
+
+namespace base {
+namespace apple {
+
+// On the Mac, ScopedNSAutoreleasePool creates an autorelease pool when
+// instantiated and pops it when destroyed.  This allows an autorelease pool to
+// be maintained in ordinary C++ code without bringing in any direct Objective-C
+// dependency.
+//
+// On other platforms, ScopedNSAutoreleasePool is an empty object with no
+// effects.  This allows it to be used directly in cross-platform code without
+// ugly #ifdefs.
+class ScopedNSAutoreleasePool {
+ public:
+#if !BUILDFLAG(IS_APPLE)
+  ScopedNSAutoreleasePool() {}
+  void Recycle() {}
+#else  // BUILDFLAG(IS_APPLE)
+  ScopedNSAutoreleasePool();
+
+  ScopedNSAutoreleasePool(const ScopedNSAutoreleasePool&) = delete;
+  ScopedNSAutoreleasePool& operator=(const ScopedNSAutoreleasePool&) = delete;
+
+  ~ScopedNSAutoreleasePool();
+
+  // Clear out the pool in case its position on the stack causes it to be
+  // alive for long periods of time (such as the entire length of the app).
+  // Only use then when you're certain the items currently in the pool are
+  // no longer needed.
+  void Recycle();
+
+ private:
+  void* autorelease_pool_;
+#endif  // BUILDFLAG(IS_APPLE)
+};
+
+}  // namespace apple
+}  // namespace base
+
+#endif  // MINI_CHROMIUM_BASE_APPLE_SCOPED_NSAUTORELEASE_POOL_H_
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/apple/scoped_nsautorelease_pool.mm b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/apple/scoped_nsautorelease_pool.mm
new file mode 100644
index 000000000..4251484b2
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/apple/scoped_nsautorelease_pool.mm
@@ -0,0 +1,36 @@
+// Copyright 2008 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "base/apple/scoped_nsautorelease_pool.h"
+
+#include "base/logging.h"
+
+// Note that this uses the direct runtime interface to the autorelease pool.
+// https://clang.llvm.org/docs/AutomaticReferenceCounting.html#runtime-support
+// This is so this can work when compiled for ARC.
+
+extern "C" {
+void* objc_autoreleasePoolPush(void);
+void objc_autoreleasePoolPop(void* pool);
+}
+
+namespace base {
+namespace apple {
+
+ScopedNSAutoreleasePool::ScopedNSAutoreleasePool()
+    : autorelease_pool_(objc_autoreleasePoolPush()) {}
+
+ScopedNSAutoreleasePool::~ScopedNSAutoreleasePool() {
+  objc_autoreleasePoolPop(autorelease_pool_);
+}
+
+// Cycle the internal pool, allowing everything there to get cleaned up and
+// start anew.
+void ScopedNSAutoreleasePool::Recycle() {
+  objc_autoreleasePoolPop(autorelease_pool_);
+  autorelease_pool_ = objc_autoreleasePoolPush();
+}
+
+}  // namespace apple
+}  // namespace base
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/apple/scoped_typeref.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/apple/scoped_typeref.h
new file mode 100644
index 000000000..5d195aa57
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/apple/scoped_typeref.h
@@ -0,0 +1,144 @@
+// Copyright 2014 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef MINI_CHROMIUM_BASE_APPLE_SCOPED_TYPEREF_H_
+#define MINI_CHROMIUM_BASE_APPLE_SCOPED_TYPEREF_H_
+
+#include "base/check.h"
+#include "base/memory/scoped_policy.h"
+
+namespace base {
+namespace apple {
+
+template <typename T>
+struct ScopedTypeRefTraits;
+
+template <typename T, typename Traits = ScopedTypeRefTraits<T>>
+class ScopedTypeRef {
+ public:
+  using element_type = T;
+
+  // Construction from underlying type
+
+  explicit constexpr ScopedTypeRef(
+      element_type object = Traits::InvalidValue(),
+      base::scoped_policy::OwnershipPolicy policy = base::scoped_policy::ASSUME)
+      : object_(object) {
+    if (object_ != Traits::InvalidValue() &&
+        policy == base::scoped_policy::RETAIN) {
+      object_ = Traits::Retain(object_);
+    }
+  }
+
+  // Copy construction
+
+  ScopedTypeRef(const ScopedTypeRef<T, Traits>& that) : object_(that.get()) {
+    if (object_ != Traits::InvalidValue()) {
+      object_ = Traits::Retain(object_);
+    }
+  }
+
+  template <typename R, typename RTraits>
+  ScopedTypeRef(const ScopedTypeRef<R, RTraits>& that) : object_(that.get()) {
+    if (object_ != Traits::InvalidValue()) {
+      object_ = Traits::Retain(object_);
+    }
+  }
+
+  // Copy assignment
+
+  ScopedTypeRef& operator=(const ScopedTypeRef<T, Traits>& that) {
+    reset(that.get(), base::scoped_policy::RETAIN);
+    return *this;
+  }
+
+  template <typename R, typename RTraits>
+  ScopedTypeRef& operator=(const ScopedTypeRef<R, RTraits>& that) {
+    reset(that.get(), base::scoped_policy::RETAIN);
+    return *this;
+  }
+
+  // Move construction
+
+  ScopedTypeRef(ScopedTypeRef<T, Traits>&& that) : object_(that.release()) {}
+
+  template <typename R, typename RTraits>
+  ScopedTypeRef(ScopedTypeRef<R, RTraits>&& that) : object_(that.release()) {}
+
+  // Move assignment
+
+  ScopedTypeRef& operator=(ScopedTypeRef<T, Traits>&& that) {
+    reset(that.release(), base::scoped_policy::ASSUME);
+    return *this;
+  }
+
+  template <typename R, typename RTraits>
+  ScopedTypeRef& operator=(ScopedTypeRef<R, RTraits>&& that) {
+    reset(that.release(), base::scoped_policy::ASSUME);
+    return *this;
+  }
+
+  // Resetting
+
+  template <typename R, typename RTraits>
+  void reset(const ScopedTypeRef<R, RTraits>& that) {
+    reset(that.get(), base::scoped_policy::RETAIN);
+  }
+
+  void reset(element_type object = Traits::InvalidValue(),
+             base::scoped_policy::OwnershipPolicy policy =
+                 base::scoped_policy::ASSUME) {
+    if (object != Traits::InvalidValue() &&
+        policy == base::scoped_policy::RETAIN) {
+      object = Traits::Retain(object);
+    }
+    if (object_ != Traits::InvalidValue()) {
+      Traits::Release(object_);
+    }
+    object_ = object;
+  }
+
+  // Destruction
+
+  ~ScopedTypeRef() {
+    if (object_ != Traits::InvalidValue()) {
+      Traits::Release(object_);
+    }
+  }
+
+  [[nodiscard]] element_type* InitializeInto() {
+    CHECK_EQ(object_, Traits::InvalidValue());
+    return &object_;
+  }
+
+  bool operator==(const ScopedTypeRef& that) const {
+    return object_ == that.object_;
+  }
+  bool operator!=(const ScopedTypeRef& that) const {
+    return object_ != that.object_;
+  }
+  explicit operator bool() const { return object_ != Traits::InvalidValue(); }
+
+  element_type get() const { return object_; }
+
+  void swap(ScopedTypeRef& that) {
+    element_type temp = that.object_;
+    that.object_ = object_;
+    object_ = temp;
+  }
+
+  [[nodiscard]] element_type release() {
+    element_type temp = object_;
+    object_ = Traits::InvalidValue();
+    return temp;
+  }
+
+ private:
+  element_type object_;
+};
+
+}  // namespace apple
+}  // namespace base
+
+#endif  // MINI_CHROMIUM_BASE_APPLE_SCOPED_TYPEREF_H_
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/check_op.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/check_op.h
index b38ee90f4..29757e893 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/check_op.h
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/check_op.h
@@ -5,6 +5,7 @@
 #ifndef MINI_CHROMIUM_BASE_CHECK_OP_H_
 #define MINI_CHROMIUM_BASE_CHECK_OP_H_
 
+#include "base/check.h"
 #include "base/logging.h"
 
 namespace logging {
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/containers/span.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/containers/span.h
new file mode 100644
index 000000000..7b6074c2a
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/containers/span.h
@@ -0,0 +1,516 @@
+// Copyright 2017 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef BASE_CONTAINERS_SPAN_H_
+#define BASE_CONTAINERS_SPAN_H_
+
+#include <stddef.h>
+#include <stdint.h>
+
+#include <array>
+#include <iterator>
+#include <limits>
+#include <type_traits>
+#include <utility>
+
+#include "base/check.h"
+#include "base/compiler_specific.h"
+#include "base/numerics/safe_conversions.h"
+#include "base/template_util.h"
+
+namespace base {
+
+// [views.constants]
+constexpr size_t dynamic_extent = std::numeric_limits<size_t>::max();
+
+template <typename T,
+          size_t Extent = dynamic_extent,
+          typename InternalPtrType = T*>
+class span;
+
+namespace internal {
+
+template <size_t I>
+using size_constant = std::integral_constant<size_t, I>;
+
+template <typename T>
+struct ExtentImpl : size_constant<dynamic_extent> {};
+
+template <typename T, size_t N>
+struct ExtentImpl<T[N]> : size_constant<N> {};
+
+template <typename T, size_t N>
+struct ExtentImpl<std::array<T, N>> : size_constant<N> {};
+
+template <typename T, size_t N>
+struct ExtentImpl<base::span<T, N>> : size_constant<N> {};
+
+template <typename T>
+using Extent = ExtentImpl<remove_cvref_t<T>>;
+
+template <typename T>
+struct IsSpanImpl : std::false_type {};
+
+template <typename T, size_t Extent>
+struct IsSpanImpl<span<T, Extent>> : std::true_type {};
+
+template <typename T>
+using IsNotSpan = std::negation<IsSpanImpl<std::decay_t<T>>>;
+
+template <typename T>
+struct IsStdArrayImpl : std::false_type {};
+
+template <typename T, size_t N>
+struct IsStdArrayImpl<std::array<T, N>> : std::true_type {};
+
+template <typename T>
+using IsNotStdArray = std::negation<IsStdArrayImpl<std::decay_t<T>>>;
+
+template <typename T>
+using IsNotCArray = std::negation<std::is_array<std::remove_reference_t<T>>>;
+
+template <typename From, typename To>
+using IsLegalDataConversion = std::is_convertible<From (*)[], To (*)[]>;
+
+template <typename Container, typename T>
+using ContainerHasConvertibleData = IsLegalDataConversion<
+    std::remove_pointer_t<decltype(std::data(std::declval<Container>()))>,
+    T>;
+
+template <typename Container>
+using ContainerHasIntegralSize =
+    std::is_integral<decltype(std::size(std::declval<Container>()))>;
+
+template <typename From, size_t FromExtent, typename To, size_t ToExtent>
+using EnableIfLegalSpanConversion =
+    std::enable_if_t<(ToExtent == dynamic_extent || ToExtent == FromExtent) &&
+                     IsLegalDataConversion<From, To>::value>;
+
+// SFINAE check if Array can be converted to a span<T>.
+template <typename Array, typename T, size_t Extent>
+using EnableIfSpanCompatibleArray =
+    std::enable_if_t<(Extent == dynamic_extent ||
+                      Extent == internal::Extent<Array>::value) &&
+                     ContainerHasConvertibleData<Array, T>::value>;
+
+// SFINAE check if Container can be converted to a span<T>.
+template <typename Container, typename T>
+using IsSpanCompatibleContainer =
+    std::conjunction<IsNotSpan<Container>,
+                     IsNotStdArray<Container>,
+                     IsNotCArray<Container>,
+                     ContainerHasConvertibleData<Container, T>,
+                     ContainerHasIntegralSize<Container>>;
+
+template <typename Container, typename T>
+using EnableIfSpanCompatibleContainer =
+    std::enable_if_t<IsSpanCompatibleContainer<Container, T>::value>;
+
+template <typename Container, typename T, size_t Extent>
+using EnableIfSpanCompatibleContainerAndSpanIsDynamic =
+    std::enable_if_t<IsSpanCompatibleContainer<Container, T>::value &&
+                     Extent == dynamic_extent>;
+
+// A helper template for storing the size of a span. Spans with static extents
+// don't require additional storage, since the extent itself is specified in the
+// template parameter.
+template <size_t Extent>
+class ExtentStorage {
+ public:
+  constexpr explicit ExtentStorage(size_t size) noexcept {}
+  constexpr size_t size() const noexcept { return Extent; }
+};
+
+// Specialization of ExtentStorage for dynamic extents, which do require
+// explicit storage for the size.
+template <>
+struct ExtentStorage<dynamic_extent> {
+  constexpr explicit ExtentStorage(size_t size) noexcept : size_(size) {}
+  constexpr size_t size() const noexcept { return size_; }
+
+ private:
+  size_t size_;
+};
+
+// must_not_be_dynamic_extent prevents |dynamic_extent| from being returned in a
+// constexpr context.
+template <size_t kExtent>
+constexpr size_t must_not_be_dynamic_extent() {
+  static_assert(
+      kExtent != dynamic_extent,
+      "EXTENT should only be used for containers with a static extent.");
+  return kExtent;
+}
+
+}  // namespace internal
+
+// A span is a value type that represents an array of elements of type T. Since
+// it only consists of a pointer to memory with an associated size, it is very
+// light-weight. It is cheap to construct, copy, move and use spans, so that
+// users are encouraged to use it as a pass-by-value parameter. A span does not
+// own the underlying memory, so care must be taken to ensure that a span does
+// not outlive the backing store.
+//
+// span is somewhat analogous to StringPiece, but with arbitrary element types,
+// allowing mutation if T is non-const.
+//
+// span is implicitly convertible from C++ arrays, as well as most [1]
+// container-like types that provide a data() and size() method (such as
+// std::vector<T>). A mutable span<T> can also be implicitly converted to an
+// immutable span<const T>.
+//
+// Consider using a span for functions that take a data pointer and size
+// parameter: it allows the function to still act on an array-like type, while
+// allowing the caller code to be a bit more concise.
+//
+// For read-only data access pass a span<const T>: the caller can supply either
+// a span<const T> or a span<T>, while the callee will have a read-only view.
+// For read-write access a mutable span<T> is required.
+//
+// Without span:
+//   Read-Only:
+//     // std::string HexEncode(const uint8_t* data, size_t size);
+//     std::vector<uint8_t> data_buffer = GenerateData();
+//     std::string r = HexEncode(data_buffer.data(), data_buffer.size());
+//
+//  Mutable:
+//     // ssize_t SafeSNPrintf(char* buf, size_t N, const char* fmt, Args...);
+//     char str_buffer[100];
+//     SafeSNPrintf(str_buffer, sizeof(str_buffer), "Pi ~= %lf", 3.14);
+//
+// With span:
+//   Read-Only:
+//     // std::string HexEncode(base::span<const uint8_t> data);
+//     std::vector<uint8_t> data_buffer = GenerateData();
+//     std::string r = HexEncode(data_buffer);
+//
+//  Mutable:
+//     // ssize_t SafeSNPrintf(base::span<char>, const char* fmt, Args...);
+//     char str_buffer[100];
+//     SafeSNPrintf(str_buffer, "Pi ~= %lf", 3.14);
+//
+// Spans with "const" and pointers
+// -------------------------------
+//
+// Const and pointers can get confusing. Here are vectors of pointers and their
+// corresponding spans:
+//
+//   const std::vector<int*>        =>  base::span<int* const>
+//   std::vector<const int*>        =>  base::span<const int*>
+//   const std::vector<const int*>  =>  base::span<const int* const>
+//
+// Differences from the C++20 draft
+// --------------------------------
+//
+// http://eel.is/c++draft/views contains the latest C++20 draft of std::span.
+// Chromium tries to follow the draft as close as possible. Differences between
+// the draft and the implementation are documented in subsections below.
+//
+// Differences from [span.objectrep]:
+// - as_bytes() and as_writable_bytes() return spans of uint8_t instead of
+//   std::byte (std::byte is a C++17 feature)
+//
+// Differences from [span.cons]:
+// - Constructing a static span (i.e. Extent != dynamic_extent) from a dynamic
+//   sized container (e.g. std::vector) requires an explicit conversion (in the
+//   C++20 draft this is simply UB)
+//
+// Furthermore, all constructors and methods are marked noexcept due to the lack
+// of exceptions in Chromium.
+//
+// Due to the lack of class template argument deduction guides in C++14
+// appropriate make_span() utility functions are provided.
+
+// [span], class template span
+template <typename T, size_t Extent, typename InternalPtrType>
+class span : public internal::ExtentStorage<Extent> {
+ private:
+  using ExtentStorage = internal::ExtentStorage<Extent>;
+
+ public:
+  using element_type = T;
+  using value_type = std::remove_cv_t<T>;
+  using size_type = size_t;
+  using difference_type = ptrdiff_t;
+  using pointer = T*;
+  using const_pointer = const T*;
+  using reference = T&;
+  using const_reference = const T&;
+  using iterator = T*;
+  using reverse_iterator = std::reverse_iterator<iterator>;
+  static constexpr size_t extent = Extent;
+
+  // [span.cons], span constructors, copy, assignment, and destructor
+  constexpr span() noexcept : ExtentStorage(0), data_(nullptr) {
+    static_assert(Extent == dynamic_extent || Extent == 0, "Invalid Extent");
+  }
+
+  constexpr span(T* data, size_t size) noexcept
+      : ExtentStorage(size), data_(data) {
+    CHECK(Extent == dynamic_extent || Extent == size);
+  }
+
+  // Artificially templatized to break ambiguity for span(ptr, 0).
+  template <typename = void>
+  constexpr span(T* begin, T* end) noexcept : span(begin, end - begin) {
+    // Note: CHECK_LE is not constexpr, hence regular CHECK must be used.
+    CHECK(begin <= end);
+  }
+
+  template <
+      size_t N,
+      typename = internal::EnableIfSpanCompatibleArray<T (&)[N], T, Extent>>
+  constexpr span(T (&array)[N]) noexcept : span(std::data(array), N) {}
+
+  template <
+      typename U,
+      size_t N,
+      typename =
+          internal::EnableIfSpanCompatibleArray<std::array<U, N>&, T, Extent>>
+  constexpr span(std::array<U, N>& array) noexcept
+      : span(std::data(array), N) {}
+
+  template <typename U,
+            size_t N,
+            typename = internal::
+                EnableIfSpanCompatibleArray<const std::array<U, N>&, T, Extent>>
+  constexpr span(const std::array<U, N>& array) noexcept
+      : span(std::data(array), N) {}
+
+  // Conversion from a container that has compatible std::data() and integral
+  // std::size().
+  template <
+      typename Container,
+      typename =
+          internal::EnableIfSpanCompatibleContainerAndSpanIsDynamic<Container&,
+                                                                    T,
+                                                                    Extent>>
+  constexpr span(Container& container) noexcept
+      : span(std::data(container), std::size(container)) {}
+
+  template <
+      typename Container,
+      typename = internal::EnableIfSpanCompatibleContainerAndSpanIsDynamic<
+          const Container&,
+          T,
+          Extent>>
+  constexpr span(const Container& container) noexcept
+      : span(std::data(container), std::size(container)) {}
+
+  constexpr span(const span& other) noexcept = default;
+
+  // Conversions from spans of compatible types and extents: this allows a
+  // span<T> to be seamlessly used as a span<const T>, but not the other way
+  // around. If extent is not dynamic, OtherExtent has to be equal to Extent.
+  template <
+      typename U,
+      size_t OtherExtent,
+      typename =
+          internal::EnableIfLegalSpanConversion<U, OtherExtent, T, Extent>>
+  constexpr span(const span<U, OtherExtent>& other)
+      : span(other.data(), other.size()) {}
+
+  constexpr span& operator=(const span& other) noexcept = default;
+  ~span() noexcept = default;
+
+  // [span.sub], span subviews
+  template <size_t Count>
+  constexpr span<T, Count> first() const noexcept {
+    static_assert(Count <= Extent, "Count must not exceed Extent");
+    CHECK(Extent != dynamic_extent || Count <= size());
+    return {data(), Count};
+  }
+
+  template <size_t Count>
+  constexpr span<T, Count> last() const noexcept {
+    static_assert(Count <= Extent, "Count must not exceed Extent");
+    CHECK(Extent != dynamic_extent || Count <= size());
+    return {data() + (size() - Count), Count};
+  }
+
+  template <size_t Offset, size_t Count = dynamic_extent>
+  constexpr span<T,
+                 (Count != dynamic_extent
+                      ? Count
+                      : (Extent != dynamic_extent ? Extent - Offset
+                                                  : dynamic_extent))>
+  subspan() const noexcept {
+    static_assert(Offset <= Extent, "Offset must not exceed Extent");
+    static_assert(Count == dynamic_extent || Count <= Extent - Offset,
+                  "Count must not exceed Extent - Offset");
+    CHECK(Extent != dynamic_extent || Offset <= size());
+    CHECK(Extent != dynamic_extent || Count == dynamic_extent ||
+          Count <= size() - Offset);
+    return {data() + Offset, Count != dynamic_extent ? Count : size() - Offset};
+  }
+
+  constexpr span<T, dynamic_extent> first(size_t count) const noexcept {
+    // Note: CHECK_LE is not constexpr, hence regular CHECK must be used.
+    CHECK(count <= size());
+    return {data(), count};
+  }
+
+  constexpr span<T, dynamic_extent> last(size_t count) const noexcept {
+    // Note: CHECK_LE is not constexpr, hence regular CHECK must be used.
+    CHECK(count <= size());
+    return {data() + (size() - count), count};
+  }
+
+  constexpr span<T, dynamic_extent> subspan(size_t offset,
+                                            size_t count = dynamic_extent) const
+      noexcept {
+    // Note: CHECK_LE is not constexpr, hence regular CHECK must be used.
+    CHECK(offset <= size());
+    CHECK(count == dynamic_extent || count <= size() - offset);
+    return {data() + offset, count != dynamic_extent ? count : size() - offset};
+  }
+
+  // [span.obs], span observers
+  constexpr size_t size() const noexcept { return ExtentStorage::size(); }
+  constexpr size_t size_bytes() const noexcept { return size() * sizeof(T); }
+  [[nodiscard]] constexpr bool empty() const noexcept { return size() == 0; }
+
+  // [span.elem], span element access
+  constexpr T& operator[](size_t idx) const noexcept {
+    // Note: CHECK_LT is not constexpr, hence regular CHECK must be used.
+    CHECK(idx < size());
+    return *(data() + idx);
+  }
+
+  constexpr T& front() const noexcept {
+    static_assert(Extent == dynamic_extent || Extent > 0,
+                  "Extent must not be 0");
+    CHECK(Extent != dynamic_extent || !empty());
+    return *data();
+  }
+
+  constexpr T& back() const noexcept {
+    static_assert(Extent == dynamic_extent || Extent > 0,
+                  "Extent must not be 0");
+    CHECK(Extent != dynamic_extent || !empty());
+    return *(data() + size() - 1);
+  }
+
+  constexpr T* data() const noexcept { return data_; }
+
+  // [span.iter], span iterator support
+  constexpr iterator begin() const noexcept {
+    return data();
+  }
+
+  constexpr iterator end() const noexcept {
+    return data() + size();
+  }
+
+  constexpr reverse_iterator rbegin() const noexcept {
+    return reverse_iterator(end());
+  }
+
+  constexpr reverse_iterator rend() const noexcept {
+    return reverse_iterator(begin());
+  }
+
+ private:
+  // This field is not a raw_ptr<> because it was filtered by the rewriter
+  // for: #constexpr-ctor-field-initializer, #global-scope, #union
+  InternalPtrType data_;
+};
+
+// span<T, Extent>::extent can not be declared inline prior to C++17, hence this
+// definition is required.
+template <class T, size_t Extent, typename InternalPtrType>
+constexpr size_t span<T, Extent, InternalPtrType>::extent;
+
+template <typename It,
+          typename T = std::remove_reference_t<iter_reference_t<It>>>
+span(It, StrictNumeric<size_t>) -> span<T>;
+
+template <typename It,
+          typename End,
+          typename = std::enable_if_t<!std::is_convertible_v<End, size_t>>,
+          typename T = std::remove_reference_t<iter_reference_t<It>>>
+span(It, End) -> span<T>;
+
+template <typename T, size_t N>
+span(T (&)[N]) -> span<T, N>;
+
+template <typename T, size_t N>
+span(std::array<T, N>&) -> span<T, N>;
+
+template <typename T, size_t N>
+span(const std::array<T, N>&) -> span<const T, N>;
+
+template <typename Container,
+          typename T = std::remove_pointer_t<
+              decltype(std::data(std::declval<Container>()))>,
+          size_t X = internal::Extent<Container>::value>
+span(Container&&) -> span<T, X>;
+
+// [span.objectrep], views of object representation
+template <typename T, size_t X>
+span<const uint8_t, (X == dynamic_extent ? dynamic_extent : sizeof(T) * X)>
+as_bytes(span<T, X> s) noexcept {
+  return {reinterpret_cast<const uint8_t*>(s.data()), s.size_bytes()};
+}
+
+template <typename T,
+          size_t X,
+          typename = std::enable_if_t<!std::is_const_v<T>>>
+span<uint8_t, (X == dynamic_extent ? dynamic_extent : sizeof(T) * X)>
+as_writable_bytes(span<T, X> s) noexcept {
+  return {reinterpret_cast<uint8_t*>(s.data()), s.size_bytes()};
+}
+
+// Type-deducing helpers for constructing a span.
+template <int&... ExplicitArgumentBarrier, typename T>
+constexpr span<T> make_span(T* data, size_t size) noexcept {
+  return {data, size};
+}
+
+template <int&... ExplicitArgumentBarrier, typename T>
+constexpr span<T> make_span(T* begin, T* end) noexcept {
+  return {begin, end};
+}
+
+// make_span utility function that deduces both the span's value_type and extent
+// from the passed in argument.
+//
+// Usage: auto span = base::make_span(...);
+template <int&... ExplicitArgumentBarrier, typename Container>
+constexpr auto make_span(Container&& container) noexcept {
+  using T =
+      std::remove_pointer_t<decltype(std::data(std::declval<Container>()))>;
+  using Extent = internal::Extent<Container>;
+  return span<T, Extent::value>(std::forward<Container>(container));
+}
+
+// make_span utility functions that allow callers to explicit specify the span's
+// extent, the value_type is deduced automatically. This is useful when passing
+// a dynamically sized container to a method expecting static spans, when the
+// container is known to have the correct size.
+//
+// Note: This will CHECK that N indeed matches size(container).
+//
+// Usage: auto static_span = base::make_span<N>(...);
+template <size_t N, int&... ExplicitArgumentBarrier, typename Container>
+constexpr auto make_span(Container&& container) noexcept {
+  using T =
+      std::remove_pointer_t<decltype(std::data(std::declval<Container>()))>;
+  return span<T, N>(std::data(container), std::size(container));
+}
+
+}  // namespace base
+
+// EXTENT returns the size of any type that can be converted to a |base::span|
+// with definite extent, i.e. everything that is a contiguous storage of some
+// sort with static size. Specifically, this works for std::array in a constexpr
+// context. Note:
+//   * |std::size| should be preferred for plain arrays.
+//   * In run-time contexts, functions such as |std::array::size| should be
+//     preferred.
+#define EXTENT(x)                                        \
+  ::base::internal::must_not_be_dynamic_extent<decltype( \
+      ::base::make_span(x))::extent>()
+
+#endif  // BASE_CONTAINERS_SPAN_H_
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/files/file_path.cc b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/files/file_path.cc
index 37c4b208a..0b1efff79 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/files/file_path.cc
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/files/file_path.cc
@@ -6,9 +6,15 @@
 
 #include <ctype.h>
 
-#include "base/cxx17_backports.h"
+#include <ostream>
+
+#include "base/check.h"
 #include "base/logging.h"
 
+#if defined(FILE_PATH_USES_WIDE_CHARACTERS)
+#include "base/strings/utf_string_conversions.h"
+#endif  // FILE_PATH_USES_WIDE_CHARACTERS
+
 namespace base {
 
 #if defined(FILE_PATH_USES_WIN_SEPARATORS)
@@ -120,7 +126,7 @@ bool FilePath::operator!=(const FilePath& that) const {
 
 // static
 bool FilePath::IsSeparator(CharType character) {
-  for (size_t i = 0; i < size(FilePath::kSeparators) - 1; ++i) {
+  for (size_t i = 0; i < std::size(FilePath::kSeparators) - 1; ++i) {
     if (character == kSeparators[i]) {
       return true;
     }
@@ -143,9 +149,8 @@ FilePath FilePath::DirName() const {
   // resizes below using letter will still be valid.
   StringType::size_type letter = FindDriveLetter(new_path.path_);
 
-  StringType::size_type last_separator =
-      new_path.path_.find_last_of(kSeparators, StringType::npos,
-                                  size(kSeparators) - 1);
+  StringType::size_type last_separator = new_path.path_.find_last_of(
+      kSeparators, StringType::npos, std::size(kSeparators) - 1);
   if (last_separator == StringType::npos) {
     // path_ is in the current directory.
     new_path.path_.resize(letter + 1);
@@ -181,9 +186,8 @@ FilePath FilePath::BaseName() const {
 
   // Keep everything after the final separator, but if the pathname is only
   // one character and it's a separator, leave it alone.
-  StringType::size_type last_separator =
-      new_path.path_.find_last_of(kSeparators, StringType::npos,
-                                  size(kSeparators) - 1);
+  StringType::size_type last_separator = new_path.path_.find_last_of(
+      kSeparators, StringType::npos, std::size(kSeparators) - 1);
   if (last_separator != StringType::npos &&
       last_separator < new_path.path_.length() - 1) {
     new_path.path_.erase(0, last_separator + 1);
@@ -287,6 +291,10 @@ void FilePath::StripTrailingSeparatorsInternal() {
 
 }  // namespace base
 
-void PrintTo(const base::FilePath& path, std::ostream* out) {
-  *out << path.value().c_str();
+std::ostream& operator<<(std::ostream& os, const base::FilePath& file_path) {
+#ifdef FILE_PATH_USES_WIDE_CHARACTERS
+  return os << base::WideToUTF8(file_path.value());
+#else
+  return os << file_path.value();
+#endif
 }
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/files/file_path.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/files/file_path.h
index 186a1be85..795558374 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/files/file_path.h
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/files/file_path.h
@@ -116,6 +116,7 @@
 #if BUILDFLAG(IS_WIN)
 #define FILE_PATH_USES_DRIVE_LETTERS
 #define FILE_PATH_USES_WIN_SEPARATORS
+#define FILE_PATH_USES_WIDE_CHARACTERS
 #endif  // BUILDFLAG(IS_WIN)
 
 namespace base {
@@ -225,8 +226,11 @@ class FilePath {
 
 }  // namespace base
 
-// This is required by googletest to print a readable output on test failures.
-extern void PrintTo(const base::FilePath& path, std::ostream* out);
+// Streams `file_path`'s value to a byte stream, converting from wide
+// characters if called for. (also lets googletest print a readable output on
+// test failures)
+extern std::ostream& operator<<(std::ostream& os,
+                                const base::FilePath& file_path);
 
 // Macros for string literal initialization of FilePath::CharType[], and for
 // using a FilePath::CharType[] in a printf-style format string.
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/files/scoped_file.cc b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/files/scoped_file.cc
index cdf66fc3c..f106e5985 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/files/scoped_file.cc
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/files/scoped_file.cc
@@ -10,6 +10,8 @@
 
 #if BUILDFLAG(IS_POSIX)
 #include <unistd.h>
+
+#include "base/check.h"
 #include "base/posix/eintr_wrapper.h"
 #endif
 
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/format_macros.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/format_macros.h
index 0cf2f00d1..b273a2eca 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/format_macros.h
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/format_macros.h
@@ -23,25 +23,18 @@
 
 #include "build/build_config.h"
 
-#if BUILDFLAG(IS_POSIX)
-
-#if (defined(_INTTYPES_H) || defined(_INTTYPES_H_)) && !defined(PRId64)
+#if BUILDFLAG(IS_POSIX) && \
+    (defined(_INTTYPES_H) || defined(_INTTYPES_H_)) && !defined(PRId64)
 #error "inttypes.h has already been included before this header file, but "
 #error "without __STDC_FORMAT_MACROS defined."
 #endif
 
-#if !defined(__STDC_FORMAT_MACROS)
+#if BUILDFLAG(IS_POSIX) && !defined(__STDC_FORMAT_MACROS)
 #define __STDC_FORMAT_MACROS
 #endif
 
 #include <inttypes.h>
 
-// GCC will concatenate wide and narrow strings correctly, so nothing needs to
-// be done here.
-#define WidePRId64 PRId64
-#define WidePRIu64 PRIu64
-#define WidePRIx64 PRIx64
-
 #if !defined(PRIuS)
 #define PRIuS "zu"
 #endif
@@ -74,28 +67,4 @@
 #endif
 #endif  // BUILDFLAG(IS_APPLE)
 
-#else  // BUILDFLAG(IS_WIN)
-
-#if !defined(PRId64)
-#define PRId64 "I64d"
-#endif
-
-#if !defined(PRIu64)
-#define PRIu64 "I64u"
-#endif
-
-#if !defined(PRIx64)
-#define PRIx64 "I64x"
-#endif
-
-#define WidePRId64 L"I64d"
-#define WidePRIu64 L"I64u"
-#define WidePRIx64 L"I64x"
-
-#if !defined(PRIuS)
-#define PRIuS "Iu"
-#endif
-
-#endif
-
 #endif  // BASE_FORMAT_MACROS_H_
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/logging.cc b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/logging.cc
index 4abec6699..f9eaa8bd7 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/logging.cc
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/logging.cc
@@ -54,7 +54,7 @@
 #include <lib/syslog/global.h>
 #endif
 
-#include "base/cxx17_backports.h"
+#include "base/check_op.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ -102,7 +102,7 @@ std::string SystemErrorCodeToString(unsigned long error_code) {
                             error_code,
                             0,
                             msgbuf,
-                            static_cast<DWORD>(base::size(msgbuf)),
+                            static_cast<DWORD>(std::size(msgbuf)),
                             nullptr);
   if (len) {
     // Most system messages end in a period and a space. Remove the space if
@@ -244,7 +244,7 @@ LogMessage::~LogMessage() {
       // By default, messages are only readable by the admin group. Explicitly
       // make them readable by the user generating the messages.
       char euid_string[12];
-      snprintf(euid_string, base::size(euid_string), "%d", geteuid());
+      snprintf(euid_string, std::size(euid_string), "%d", geteuid());
       asl_set(asl_message.get(), ASL_KEY_READ_UID, euid_string);
 
       // Map Chrome log severities to ASL log levels.
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/logging.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/logging.h
index 712a59805..fedb1dbdf 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/logging.h
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/logging.h
@@ -5,16 +5,13 @@
 #ifndef MINI_CHROMIUM_BASE_LOGGING_H_
 #define MINI_CHROMIUM_BASE_LOGGING_H_
 
-#include <assert.h>
 #include <errno.h>
+#include <stdint.h>
 
 #include <limits>
 #include <sstream>
 #include <string>
 
-#include "base/check.h"
-#include "base/check_op.h"
-#include "base/notreached.h"
 #include "build/build_config.h"
 
 namespace logging {
@@ -307,9 +304,6 @@ const LogSeverity LOG_0 = LOG_ERROR;
     LAZY_STREAM(VPLOG_STREAM(verbose_level), \
                 DVLOG_IS_ON(verbose_level) && (condition))
 
-#undef assert
-#define assert(condition) DLOG_ASSERT(condition)
-
 namespace std {
 ostream& operator<<(ostream& out, const u16string& str);
 }  // namespace std
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/foundation_util.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/foundation_util.h
deleted file mode 100644
index 09a37f4be..000000000
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/foundation_util.h
+++ /dev/null
@@ -1,188 +0,0 @@
-// Copyright 2008 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_MAC_FOUNDATION_UTIL_H_
-#define MINI_CHROMIUM_BASE_MAC_FOUNDATION_UTIL_H_
-
-#include "base/logging.h"
-#include "build/build_config.h"
-
-#if BUILDFLAG(IS_IOS)
-#include <CoreText/CoreText.h>
-#else
-#include <ApplicationServices/ApplicationServices.h>
-#endif
-
-#if defined(__OBJC__)
-#import <Foundation/Foundation.h>
-#else  // defined(__OBJC__)
-#include <CoreFoundation/CoreFoundation.h>
-#endif  // defined(__OBJC__)
-
-#if !defined(__OBJC__)
-#define OBJC_CPP_CLASS_DECL(x) class x;
-#else  // defined(__OBJC__)
-#define OBJC_CPP_CLASS_DECL(x)
-#endif  // defined(__OBJC__)
-
-// Convert toll-free bridged CFTypes to NSTypes and vice-versa. This does not
-// autorelease |cf_val|. This is useful for the case where there is a CFType in
-// a call that expects an NSType and the compiler is complaining about const
-// casting problems.
-// The calls are used like this:
-// NSString *foo = CFToNSCast(CFSTR("Hello"));
-// CFStringRef foo2 = NSToCFCast(@"Hello");
-// The macro magic below is to enforce safe casting. It could possibly have
-// been done using template function specialization, but template function
-// specialization doesn't always work intuitively,
-// (http://www.gotw.ca/publications/mill17.htm) so the trusty combination
-// of macros and function overloading is used instead.
-
-#define CF_TO_NS_CAST_DECL(TypeCF, TypeNS) \
-OBJC_CPP_CLASS_DECL(TypeNS) \
-\
-namespace base { \
-namespace mac { \
-TypeNS* CFToNSCast(TypeCF##Ref cf_val); \
-TypeCF##Ref NSToCFCast(TypeNS* ns_val); \
-} \
-}
-#define CF_TO_NS_MUTABLE_CAST_DECL(name) \
-CF_TO_NS_CAST_DECL(CF##name, NS##name) \
-OBJC_CPP_CLASS_DECL(NSMutable##name) \
-\
-namespace base { \
-namespace mac { \
-NSMutable##name* CFToNSCast(CFMutable##name##Ref cf_val); \
-CFMutable##name##Ref NSToCFCast(NSMutable##name* ns_val); \
-} \
-}
-
-// List of toll-free bridged types taken from:
-// http://www.cocoadev.com/index.pl?TollFreeBridged
-
-CF_TO_NS_MUTABLE_CAST_DECL(Array)
-CF_TO_NS_MUTABLE_CAST_DECL(AttributedString)
-CF_TO_NS_CAST_DECL(CFCalendar, NSCalendar)
-CF_TO_NS_MUTABLE_CAST_DECL(CharacterSet)
-CF_TO_NS_MUTABLE_CAST_DECL(Data)
-CF_TO_NS_CAST_DECL(CFDate, NSDate)
-CF_TO_NS_MUTABLE_CAST_DECL(Dictionary)
-CF_TO_NS_CAST_DECL(CFError, NSError)
-CF_TO_NS_CAST_DECL(CFLocale, NSLocale)
-CF_TO_NS_CAST_DECL(CFNumber, NSNumber)
-CF_TO_NS_CAST_DECL(CFRunLoopTimer, NSTimer)
-CF_TO_NS_CAST_DECL(CFTimeZone, NSTimeZone)
-CF_TO_NS_MUTABLE_CAST_DECL(Set)
-CF_TO_NS_CAST_DECL(CFReadStream, NSInputStream)
-CF_TO_NS_CAST_DECL(CFWriteStream, NSOutputStream)
-CF_TO_NS_MUTABLE_CAST_DECL(String)
-CF_TO_NS_CAST_DECL(CFURL, NSURL)
-
-#undef CF_TO_NS_CAST_DECL
-#undef CF_TO_NS_MUTABLE_CAST_DECL
-#undef OBJC_CPP_CLASS_DECL
-
-namespace base {
-namespace mac {
-
-// CFCast<>() and CFCastStrict<>() cast a basic CFTypeRef to a more
-// specific CoreFoundation type. The compatibility of the passed
-// object is found by comparing its opaque type against the
-// requested type identifier. If the supplied object is not
-// compatible with the requested return type, CFCast<>() returns
-// NULL and CFCastStrict<>() will DCHECK. Providing a NULL pointer
-// to either variant results in NULL being returned without
-// triggering any DCHECK.
-//
-// Example usage:
-// CFNumberRef some_number = base::mac::CFCast<CFNumberRef>(
-//     CFArrayGetValueAtIndex(array, index));
-//
-// CFTypeRef hello = CFSTR("hello world");
-// CFStringRef some_string = base::mac::CFCastStrict<CFStringRef>(hello);
-
-template<typename T>
-T CFCast(const CFTypeRef& cf_val);
-
-template<typename T>
-T CFCastStrict(const CFTypeRef& cf_val);
-
-#define CF_CAST_DECL(TypeCF)                  \
-template<> TypeCF##Ref                        \
-CFCast<TypeCF##Ref>(const CFTypeRef& cf_val); \
-                                              \
-template<> TypeCF##Ref                        \
-CFCastStrict<TypeCF##Ref>(const CFTypeRef& cf_val)
-
-CF_CAST_DECL(CFArray);
-CF_CAST_DECL(CFBag);
-CF_CAST_DECL(CFBoolean);
-CF_CAST_DECL(CFData);
-CF_CAST_DECL(CFDate);
-CF_CAST_DECL(CFDictionary);
-CF_CAST_DECL(CFNull);
-CF_CAST_DECL(CFNumber);
-CF_CAST_DECL(CFSet);
-CF_CAST_DECL(CFString);
-CF_CAST_DECL(CFURL);
-CF_CAST_DECL(CFUUID);
-
-CF_CAST_DECL(CGColor);
-
-CF_CAST_DECL(CTFont);
-CF_CAST_DECL(CTRun);
-
-#if !BUILDFLAG(IS_IOS)
-CF_CAST_DECL(SecACL);
-CF_CAST_DECL(SecTrustedApplication);
-#endif
-
-#undef CF_CAST_DECL
-
-#if defined(__OBJC__)
-
-// ObjCCast<>() and ObjCCastStrict<>() cast a basic id to a more
-// specific (NSObject-derived) type. The compatibility of the passed
-// object is found by checking if it's a kind of the requested type
-// identifier. If the supplied object is not compatible with the
-// requested return type, ObjCCast<>() returns nil and
-// ObjCCastStrict<>() will DCHECK. Providing a nil pointer to either
-// variant results in nil being returned without triggering any DCHECK.
-//
-// The strict variant is useful when retrieving a value from a
-// collection which only has values of a specific type, e.g. an
-// NSArray of NSStrings. The non-strict variant is useful when
-// retrieving values from data that you can't fully control. For
-// example, a plist read from disk may be beyond your exclusive
-// control, so you'd only want to check that the values you retrieve
-// from it are of the expected types, but not crash if they're not.
-//
-// Example usage:
-// NSString* version = base::mac::ObjCCast<NSString>(
-//     [bundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"]);
-//
-// NSString* str = base::mac::ObjCCastStrict<NSString>(
-//     [ns_arr_of_ns_strs objectAtIndex:0]);
-template<typename T>
-T* ObjCCast(id objc_val) {
-  if ([objc_val isKindOfClass:[T class]]) {
-    return reinterpret_cast<T*>(objc_val);
-  }
-  return nil;
-}
-
-template<typename T>
-T* ObjCCastStrict(id objc_val) {
-  T* rv = ObjCCast<T>(objc_val);
-  DCHECK(objc_val == nil || rv);
-  return rv;
-}
-
-#endif  // defined(__OBJC__)
-
-}  // namespace mac
-}  // namespace base
-
-#endif  // MINI_CHROMIUM_BASE_MAC_FOUNDATION_UTIL_H_
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/foundation_util.mm b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/foundation_util.mm
deleted file mode 100644
index 18e435ecc..000000000
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/foundation_util.mm
+++ /dev/null
@@ -1,116 +0,0 @@
-// Copyright 2008 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "base/mac/foundation_util.h"
-
-#if !BUILDFLAG(IS_IOS)
-extern "C" {
-CFTypeID SecACLGetTypeID();
-CFTypeID SecTrustedApplicationGetTypeID();
-}  // extern "C"
-#endif
-
-namespace base {
-namespace mac {
-
-// Definitions for the corresponding CF_TO_NS_CAST_DECL macros in
-// foundation_util.h.
-#define CF_TO_NS_CAST_DEFN(TypeCF, TypeNS) \
-\
-TypeNS* CFToNSCast(TypeCF##Ref cf_val) { \
-  DCHECK(!cf_val || TypeCF##GetTypeID() == CFGetTypeID(cf_val)); \
-  TypeNS* ns_val = \
-      const_cast<TypeNS*>(reinterpret_cast<const TypeNS*>(cf_val)); \
-  return ns_val; \
-} \
-\
-TypeCF##Ref NSToCFCast(TypeNS* ns_val) { \
-  TypeCF##Ref cf_val = reinterpret_cast<TypeCF##Ref>(ns_val); \
-  DCHECK(!cf_val || TypeCF##GetTypeID() == CFGetTypeID(cf_val)); \
-  return cf_val; \
-}
-
-#define CF_TO_NS_MUTABLE_CAST_DEFN(name) \
-CF_TO_NS_CAST_DEFN(CF##name, NS##name) \
-\
-NSMutable##name* CFToNSCast(CFMutable##name##Ref cf_val) { \
-  DCHECK(!cf_val || CF##name##GetTypeID() == CFGetTypeID(cf_val)); \
-  NSMutable##name* ns_val = reinterpret_cast<NSMutable##name*>(cf_val); \
-  return ns_val; \
-} \
-\
-CFMutable##name##Ref NSToCFCast(NSMutable##name* ns_val) { \
-  CFMutable##name##Ref cf_val = \
-      reinterpret_cast<CFMutable##name##Ref>(ns_val); \
-  DCHECK(!cf_val || CF##name##GetTypeID() == CFGetTypeID(cf_val)); \
-  return cf_val; \
-}
-
-CF_TO_NS_MUTABLE_CAST_DEFN(Array)
-CF_TO_NS_MUTABLE_CAST_DEFN(AttributedString)
-CF_TO_NS_CAST_DEFN(CFCalendar, NSCalendar)
-CF_TO_NS_MUTABLE_CAST_DEFN(CharacterSet)
-CF_TO_NS_MUTABLE_CAST_DEFN(Data)
-CF_TO_NS_CAST_DEFN(CFDate, NSDate)
-CF_TO_NS_MUTABLE_CAST_DEFN(Dictionary)
-CF_TO_NS_CAST_DEFN(CFError, NSError)
-CF_TO_NS_CAST_DEFN(CFLocale, NSLocale)
-CF_TO_NS_CAST_DEFN(CFNumber, NSNumber)
-CF_TO_NS_CAST_DEFN(CFRunLoopTimer, NSTimer)
-CF_TO_NS_CAST_DEFN(CFTimeZone, NSTimeZone)
-CF_TO_NS_MUTABLE_CAST_DEFN(Set)
-CF_TO_NS_CAST_DEFN(CFReadStream, NSInputStream)
-CF_TO_NS_CAST_DEFN(CFWriteStream, NSOutputStream)
-CF_TO_NS_MUTABLE_CAST_DEFN(String)
-CF_TO_NS_CAST_DEFN(CFURL, NSURL)
-
-#undef CF_TO_NS_CAST_DEFN
-#undef CF_TO_NS_MUTABLE_CAST_DEFN
-
-#define CF_CAST_DEFN(TypeCF) \
-template<> TypeCF##Ref \
-CFCast<TypeCF##Ref>(const CFTypeRef& cf_val) { \
-  if (cf_val == NULL) { \
-    return NULL; \
-  } \
-  if (CFGetTypeID(cf_val) == TypeCF##GetTypeID()) { \
-    return (TypeCF##Ref)(cf_val); \
-  } \
-  return NULL; \
-} \
-\
-template<> TypeCF##Ref \
-CFCastStrict<TypeCF##Ref>(const CFTypeRef& cf_val) { \
-  TypeCF##Ref rv = CFCast<TypeCF##Ref>(cf_val); \
-  DCHECK(cf_val == NULL || rv); \
-  return rv; \
-}
-
-CF_CAST_DEFN(CFArray)
-CF_CAST_DEFN(CFBag)
-CF_CAST_DEFN(CFBoolean)
-CF_CAST_DEFN(CFData)
-CF_CAST_DEFN(CFDate)
-CF_CAST_DEFN(CFDictionary)
-CF_CAST_DEFN(CFNull)
-CF_CAST_DEFN(CFNumber)
-CF_CAST_DEFN(CFSet)
-CF_CAST_DEFN(CFString)
-CF_CAST_DEFN(CFURL)
-CF_CAST_DEFN(CFUUID)
-
-CF_CAST_DEFN(CGColor)
-
-CF_CAST_DEFN(CTFont)
-CF_CAST_DEFN(CTRun)
-
-#if !BUILDFLAG(IS_IOS)
-CF_CAST_DEFN(SecACL)
-CF_CAST_DEFN(SecTrustedApplication)
-#endif
-
-#undef CF_CAST_DEFN
-
-}  // namespace mac
-}  // namespace base
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/mach_logging.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/mach_logging.h
deleted file mode 100644
index c39b23087..000000000
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/mach_logging.h
+++ /dev/null
@@ -1,163 +0,0 @@
-// Copyright 2014 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_MAC_MACH_LOGGING_H_
-#define MINI_CHROMIUM_BASE_MAC_MACH_LOGGING_H_
-
-#include <mach/mach.h>
-
-#include "base/logging.h"
-#include "build/build_config.h"
-
-// Use the MACH_LOG family of macros along with a mach_error_t (kern_return_t)
-// containing a Mach error. The error value will be decoded so that logged
-// messages explain the error.
-//
-// Use the BOOTSTRAP_LOG family of macros specifically for errors that occur
-// while interoperating with the bootstrap subsystem. These errors will first
-// be looked up as bootstrap error messages. If no match is found, they will
-// be treated as generic Mach errors, as in MACH_LOG.
-//
-// Examples:
-//
-//   kern_return_t kr = mach_timebase_info(&info);
-//   if (kr != KERN_SUCCESS) {
-//     MACH_LOG(ERROR, kr) << "mach_timebase_info";
-//   }
-//
-//   kr = vm_deallocate(task, address, size);
-//   MACH_DCHECK(kr == KERN_SUCCESS, kr) << "vm_deallocate";
-
-namespace logging {
-
-class MachLogMessage : public logging::LogMessage {
- public:
-  MachLogMessage(const char* function,
-                 const char* file_path,
-                 int line,
-                 LogSeverity severity,
-                 mach_error_t mach_err);
-
-  MachLogMessage(const MachLogMessage&) = delete;
-  MachLogMessage& operator=(const MachLogMessage&) = delete;
-
-  ~MachLogMessage();
-
- private:
-  mach_error_t mach_err_;
-};
-
-}  // namespace logging
-
-#define MACH_LOG_STREAM(severity, mach_err) \
-    COMPACT_GOOGLE_LOG_EX_ ## severity(MachLogMessage, mach_err).stream()
-#define MACH_VLOG_STREAM(verbose_level, mach_err) \
-    logging::MachLogMessage(__PRETTY_FUNCTION__, __FILE__, __LINE__, \
-                            -verbose_level, mach_err).stream()
-
-#define MACH_LOG(severity, mach_err) \
-    LAZY_STREAM(MACH_LOG_STREAM(severity, mach_err), LOG_IS_ON(severity))
-#define MACH_LOG_IF(severity, condition, mach_err) \
-    LAZY_STREAM(MACH_LOG_STREAM(severity, mach_err), \
-                LOG_IS_ON(severity) && (condition))
-
-#define MACH_VLOG(verbose_level, mach_err) \
-    LAZY_STREAM(MACH_VLOG_STREAM(verbose_level, mach_err), \
-                VLOG_IS_ON(verbose_level))
-#define MACH_VLOG_IF(verbose_level, condition, mach_err) \
-    LAZY_STREAM(MACH_VLOG_STREAM(verbose_level, mach_err), \
-                VLOG_IS_ON(verbose_level) && (condition))
-
-#define MACH_CHECK(condition, mach_err) \
-    LAZY_STREAM(MACH_LOG_STREAM(FATAL, mach_err), !(condition)) \
-    << "Check failed: " # condition << ". "
-
-#define MACH_DLOG(severity, mach_err) \
-    LAZY_STREAM(MACH_LOG_STREAM(severity, mach_err), DLOG_IS_ON(severity))
-#define MACH_DLOG_IF(severity, condition, mach_err) \
-    LAZY_STREAM(MACH_LOG_STREAM(severity, mach_err), \
-                DLOG_IS_ON(severity) && (condition))
-
-#define MACH_DVLOG(verbose_level, mach_err) \
-    LAZY_STREAM(MACH_VLOG_STREAM(verbose_level, mach_err), \
-                DVLOG_IS_ON(verbose_level))
-#define MACH_DVLOG_IF(verbose_level, condition, mach_err) \
-    LAZY_STREAM(MACH_VLOG_STREAM(verbose_level, mach_err), \
-                DVLOG_IS_ON(verbose_level) && (condition))
-
-#define MACH_DCHECK(condition, mach_err) \
-    LAZY_STREAM(MACH_LOG_STREAM(FATAL, mach_err), \
-                DCHECK_IS_ON && !(condition)) \
-    << "Check failed: " # condition << ". "
-
-#if !BUILDFLAG(IS_IOS)
-
-namespace logging {
-
-class BootstrapLogMessage : public logging::LogMessage {
- public:
-  BootstrapLogMessage(const char* function,
-                      const char* file_path,
-                      int line,
-                      LogSeverity severity,
-                      kern_return_t bootstrap_err);
-
-  BootstrapLogMessage(const BootstrapLogMessage&) = delete;
-  BootstrapLogMessage& operator=(const BootstrapLogMessage&) = delete;
-
-  ~BootstrapLogMessage();
-
- private:
-  kern_return_t bootstrap_err_;
-};
-
-}  // namespace logging
-
-#define BOOTSTRAP_LOG_STREAM(severity, bootstrap_err) \
-    COMPACT_GOOGLE_LOG_EX_ ## severity(BootstrapLogMessage, \
-                                       bootstrap_err).stream()
-#define BOOTSTRAP_VLOG_STREAM(verbose_level, bootstrap_err) \
-    logging::BootstrapLogMessage(__PRETTY_FUNCTION__, __FILE__, __LINE__, \
-                            -verbose_level, bootstrap_err).stream()
-
-#define BOOTSTRAP_LOG(severity, bootstrap_err) \
-    LAZY_STREAM(BOOTSTRAP_LOG_STREAM(severity, \
-                                     bootstrap_err), LOG_IS_ON(severity))
-#define BOOTSTRAP_LOG_IF(severity, condition, bootstrap_err) \
-    LAZY_STREAM(BOOTSTRAP_LOG_STREAM(severity, bootstrap_err), \
-                LOG_IS_ON(severity) && (condition))
-
-#define BOOTSTRAP_VLOG(verbose_level, bootstrap_err) \
-    LAZY_STREAM(BOOTSTRAP_VLOG_STREAM(verbose_level, bootstrap_err), \
-                VLOG_IS_ON(verbose_level))
-#define BOOTSTRAP_VLOG_IF(verbose_level, condition, bootstrap_err) \
-    LAZY_STREAM(BOOTSTRAP_VLOG_STREAM(verbose_level, bootstrap_err), \
-                VLOG_IS_ON(verbose_level) && (condition))
-
-#define BOOTSTRAP_CHECK(condition, bootstrap_err) \
-    LAZY_STREAM(BOOTSTRAP_LOG_STREAM(FATAL, bootstrap_err), !(condition)) \
-    << "Check failed: " # condition << ". "
-
-#define BOOTSTRAP_DLOG(severity, bootstrap_err) \
-    LAZY_STREAM(BOOTSTRAP_LOG_STREAM(severity, bootstrap_err), \
-                DLOG_IS_ON(severity))
-#define BOOTSTRAP_DLOG_IF(severity, condition, bootstrap_err) \
-    LAZY_STREAM(BOOTSTRAP_LOG_STREAM(severity, bootstrap_err), \
-                DLOG_IS_ON(severity) && (condition))
-
-#define BOOTSTRAP_DVLOG(verbose_level, bootstrap_err) \
-    LAZY_STREAM(BOOTSTRAP_VLOG_STREAM(verbose_level, bootstrap_err), \
-                DVLOG_IS_ON(verbose_level))
-#define BOOTSTRAP_DVLOG_IF(verbose_level, condition, bootstrap_err) \
-    LAZY_STREAM(BOOTSTRAP_VLOG_STREAM(verbose_level, bootstrap_err), \
-                DVLOG_IS_ON(verbose_level) && (condition))
-
-#define BOOTSTRAP_DCHECK(condition, bootstrap_err) \
-    LAZY_STREAM(BOOTSTRAP_LOG_STREAM(FATAL, bootstrap_err), \
-                DCHECK_IS_ON && !(condition)) \
-    << "Check failed: " # condition << ". "
-
-#endif  // !BUILDFLAG(IS_IOS)
-
-#endif  // MINI_CHROMIUM_BASE_MAC_MACH_LOGGING_H_
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_cftyperef.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_cftyperef.h
deleted file mode 100644
index ad7b06895..000000000
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_cftyperef.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2006-2008 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_MAC_SCOPED_CFTYPEREF_H_
-#define MINI_CHROMIUM_BASE_MAC_SCOPED_CFTYPEREF_H_
-
-#include <CoreFoundation/CoreFoundation.h>
-
-#include "base/mac/scoped_typeref.h"
-
-namespace base {
-
-namespace internal {
-
-template <typename CFT>
-struct ScopedCFTypeRefTraits {
-  static CFT InvalidValue() { return nullptr; }
-  static CFT Retain(CFT object) {
-    CFRetain(object);
-    return object;
-  }
-  static void Release(CFT object) { CFRelease(object); }
-};
-
-}  // namespace internal
-
-template <typename CFT>
-using ScopedCFTypeRef =
-    ScopedTypeRef<CFT, internal::ScopedCFTypeRefTraits<CFT>>;
-
-}  // namespace base
-
-#endif  // MINI_CHROMIUM_BASE_MAC_SCOPED_CFTYPEREF_H_
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_ioobject.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_ioobject.h
index 4a790ca6a..71f4b354a 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_ioobject.h
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_ioobject.h
@@ -7,7 +7,7 @@
 
 #include <IOKit/IOKitLib.h>
 
-#include "base/mac/scoped_typeref.h"
+#include "base/apple/scoped_typeref.h"
 
 namespace base {
 namespace mac {
@@ -27,7 +27,8 @@ struct ScopedIOObjectTraits {
 }  // namespce internal
 
 template <typename IOT>
-using ScopedIOObject = ScopedTypeRef<IOT, internal::ScopedIOObjectTraits<IOT>>;
+using ScopedIOObject =
+    apple::ScopedTypeRef<IOT, internal::ScopedIOObjectTraits<IOT>>;
 
 }  // namespace mac
 }  // namespace base
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_mach_port.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_mach_port.h
deleted file mode 100644
index 741c0a8b5..000000000
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_mach_port.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2012 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_MAC_SCOPED_MACH_PORT_H_
-#define MINI_CHROMIUM_BASE_MAC_SCOPED_MACH_PORT_H_
-
-#include <mach/mach.h>
-
-#include "base/scoped_generic.h"
-
-namespace base {
-namespace mac {
-
-namespace internal {
-
-struct SendRightTraits {
-  static mach_port_t InvalidValue() {
-    return MACH_PORT_NULL;
-  }
-  static void Free(mach_port_t port);
-};
-
-struct ReceiveRightTraits {
-  static mach_port_t InvalidValue() {
-    return MACH_PORT_NULL;
-  }
-  static void Free(mach_port_t port);
-};
-
-struct PortSetTraits {
-  static mach_port_t InvalidValue() {
-    return MACH_PORT_NULL;
-  }
-  static void Free(mach_port_t port);
-};
-
-}  // namespace internal
-
-using ScopedMachSendRight =
-    ScopedGeneric<mach_port_t, internal::SendRightTraits>;
-using ScopedMachReceiveRight =
-    ScopedGeneric<mach_port_t, internal::ReceiveRightTraits>;
-using ScopedMachPortSet = ScopedGeneric<mach_port_t, internal::PortSetTraits>;
-
-}  // namespace mac
-}  // namespace base
-
-#endif  // MINI_CHROMIUM_BASE_MAC_SCOPED_MACH_PORT_H_
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_nsautorelease_pool.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_nsautorelease_pool.h
deleted file mode 100644
index ad471ff18..000000000
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_nsautorelease_pool.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2008 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_MAC_SCOPED_NSAUTORELEASE_POOL_H_
-#define MINI_CHROMIUM_BASE_MAC_SCOPED_NSAUTORELEASE_POOL_H_
-
-#include "build/build_config.h"
-
-#if BUILDFLAG(IS_APPLE)
-#if defined(__OBJC__)
-@class NSAutoreleasePool;
-#else  // __OBJC__
-class NSAutoreleasePool;
-#endif  // __OBJC__
-#endif  // BUILDFLAG(IS_APPLE)
-
-namespace base {
-namespace mac {
-
-// On the Mac, ScopedNSAutoreleasePool allocates an NSAutoreleasePool when
-// instantiated and sends it a -drain message when destroyed.  This allows an
-// autorelease pool to be maintained in ordinary C++ code without bringing in
-// any direct Objective-C dependency.
-//
-// On other platforms, ScopedNSAutoreleasePool is an empty object with no
-// effects.  This allows it to be used directly in cross-platform code without
-// ugly #ifdefs.
-class ScopedNSAutoreleasePool {
- public:
-#if !BUILDFLAG(IS_APPLE)
-  ScopedNSAutoreleasePool() {}
-  void Recycle() { }
-#else  // BUILDFLAG(IS_APPLE)
-  ScopedNSAutoreleasePool();
-
-  ScopedNSAutoreleasePool(const ScopedNSAutoreleasePool&) = delete;
-  ScopedNSAutoreleasePool& operator=(const ScopedNSAutoreleasePool&) = delete;
-
-  ~ScopedNSAutoreleasePool();
-
-  // Clear out the pool in case its position on the stack causes it to be
-  // alive for long periods of time (such as the entire length of the app).
-  // Only use then when you're certain the items currently in the pool are
-  // no longer needed.
-  void Recycle();
- private:
-  NSAutoreleasePool* autorelease_pool_;
-#endif  // BUILDFLAG(IS_APPLE)
-};
-
-}  // namespace mac
-}  // namespace base
-
-#endif  // MINI_CHROMIUM_BASE_MAC_SCOPED_NSAUTORELEASE_POOL_H_
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_nsautorelease_pool.mm b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_nsautorelease_pool.mm
deleted file mode 100644
index 443906569..000000000
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_nsautorelease_pool.mm
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2008 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "base/mac/scoped_nsautorelease_pool.h"
-
-#import <Foundation/Foundation.h>
-
-#include "base/logging.h"
-
-namespace base {
-namespace mac {
-
-ScopedNSAutoreleasePool::ScopedNSAutoreleasePool()
-    : autorelease_pool_([[NSAutoreleasePool alloc] init]) {
-  DCHECK(autorelease_pool_);
-}
-
-ScopedNSAutoreleasePool::~ScopedNSAutoreleasePool() {
-  [autorelease_pool_ drain];
-}
-
-// Cycle the internal pool, allowing everything there to get cleaned up and
-// start anew.
-void ScopedNSAutoreleasePool::Recycle() {
-  [autorelease_pool_ drain];
-  autorelease_pool_ = [[NSAutoreleasePool alloc] init];
-  DCHECK(autorelease_pool_);
-}
-
-}  // namespace mac
-}  // namespace base
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_nsobject.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_nsobject.h
deleted file mode 100644
index 6c2f27386..000000000
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_nsobject.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2006-2008 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_MAC_SCOPED_NSOBJECT_H_
-#define MINI_CHROMIUM_BASE_MAC_SCOPED_NSOBJECT_H_
-
-#import <Foundation/Foundation.h>
-
-#include <type_traits>
-
-#include "base/compiler_specific.h"
-#include "base/mac/scoped_typeref.h"
-
-namespace base {
-
-namespace internal {
-
-template <typename NST>
-struct ScopedNSProtocolTraits {
-  static NST InvalidValue() { return nil; }
-  static NST Retain(NST nst) { return [nst retain]; }
-  static void Release(NST nst) { [nst release]; }
-};
-
-}  // namespace internal
-
-template <typename NST>
-class scoped_nsprotocol
-    : public ScopedTypeRef<NST, internal::ScopedNSProtocolTraits<NST>> {
- public:
-  using ScopedTypeRef<NST,
-                      internal::ScopedNSProtocolTraits<NST>>::ScopedTypeRef;
-
-  NST autorelease() { return [this->release() autorelease]; }
-};
-
-template <class C>
-void swap(scoped_nsprotocol<C>& p1, scoped_nsprotocol<C>& p2) {
-  p1.swap(p2);
-}
-
-template <class C>
-bool operator==(C p1, const scoped_nsprotocol<C>& p2) {
-  return p1 == p2.get();
-}
-
-template <class C>
-bool operator!=(C p1, const scoped_nsprotocol<C>& p2) {
-  return p1 != p2.get();
-}
-
-template <typename NST>
-class scoped_nsobject : public scoped_nsprotocol<NST*> {
- public:
-  using scoped_nsprotocol<NST*>::scoped_nsprotocol;
-
-  static_assert(std::is_same<NST, NSAutoreleasePool>::value == false,
-                "Use ScopedNSAutoreleasePool instead");
-};
-
-template<>
-class scoped_nsobject<id> : public scoped_nsprotocol<id> {
- public:
-  using scoped_nsprotocol<id>::scoped_nsprotocol;
-};
-
-}  // namespace base
-
-#endif  // MINI_CHROMIUM_BASE_MAC_SCOPED_NSOBJECT_H_
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_typeref.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_typeref.h
deleted file mode 100644
index 7b3313351..000000000
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_typeref.h
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright 2014 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MINI_CHROMIUM_BASE_MAC_SCOPED_TYPEREF_H_
-#define MINI_CHROMIUM_BASE_MAC_SCOPED_TYPEREF_H_
-
-#include "base/logging.h"
-#include "base/memory/scoped_policy.h"
-
-namespace base {
-
-template <typename T>
-struct ScopedTypeRefTraits;
-
-template <typename T, typename Traits = ScopedTypeRefTraits<T>>
-class ScopedTypeRef {
- public:
-  typedef T element_type;
-
-  ScopedTypeRef(
-      T object = Traits::InvalidValue(),
-      base::scoped_policy::OwnershipPolicy policy = base::scoped_policy::ASSUME)
-      : object_(object) {
-    if (object_ && policy == base::scoped_policy::RETAIN)
-      object_ = Traits::Retain(object_);
-  }
-
-  ScopedTypeRef(const ScopedTypeRef<T, Traits>& that) : object_(that.object_) {
-    if (object_)
-      object_ = Traits::Retain(object_);
-  }
-
-  ~ScopedTypeRef() {
-    if (object_)
-      Traits::Release(object_);
-  }
-
-  ScopedTypeRef& operator=(const ScopedTypeRef<T, Traits>& that) {
-    reset(that.get(), base::scoped_policy::RETAIN);
-    return *this;
-  }
-
-  [[nodiscard]] T* InitializeInto() {
-    DCHECK(!object_);
-    return &object_;
-  }
-
-  void reset(T object = Traits::InvalidValue(),
-             base::scoped_policy::OwnershipPolicy policy =
-                 base::scoped_policy::ASSUME) {
-    if (object && policy == base::scoped_policy::RETAIN)
-      object = Traits::Retain(object);
-    if (object_)
-      Traits::Release(object_);
-    object_ = object;
-  }
-
-  bool operator==(T that) const { return object_ == that; }
-
-  bool operator!=(T that) const { return object_ != that; }
-
-  operator T() const { return object_; }
-
-  T get() const { return object_; }
-
-  void swap(ScopedTypeRef& that) {
-    T temp = that.object_;
-    that.object_ = object_;
-    object_ = temp;
-  }
-
-  [[nodiscard]] T release() {
-    T temp = object_;
-    object_ = Traits::InvalidValue();
-    return temp;
-  }
-
- private:
-  T object_;
-};
-
-}  // namespace base
-
-#endif  // MINI_CHROMIUM_BASE_MAC_SCOPED_TYPEREF_H_
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/posix/safe_strerror.cc b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/posix/safe_strerror.cc
index a67fa2855..fe4eca69e 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/posix/safe_strerror.cc
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/posix/safe_strerror.cc
@@ -8,7 +8,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "base/cxx17_backports.h"
 #include "build/build_config.h"
 
 #if BUILDFLAG(IS_ANDROID)
@@ -38,7 +37,7 @@ void safe_strerror_r(int err, char* buf, size_t len) {
 
 std::string safe_strerror(int err) {
   char buf[256];
-  safe_strerror_r(err, buf, size(buf));
+  safe_strerror_r(err, buf, std::size(buf));
   return std::string(buf);
 }
 
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/rand_util.cc b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/rand_util.cc
index 93ed79803..f5e0d31a5 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/rand_util.cc
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/rand_util.cc
@@ -11,8 +11,8 @@
 #include <cmath>
 #include <limits>
 
+#include "base/check_op.h"
 #include "base/files/file_util.h"
-#include "base/logging.h"
 #include "build/build_config.h"
 
 #if BUILDFLAG(IS_FUCHSIA)
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/pattern.cc b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/pattern.cc
new file mode 100644
index 000000000..cc747aab6
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/pattern.cc
@@ -0,0 +1,155 @@
+// Copyright 2015 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "base/strings/pattern.h"
+
+#include "base/third_party/icu/icu_utf.h"
+
+namespace base {
+
+namespace {
+
+constexpr bool IsWildcard(base_icu::UChar32 character) {
+  return character == '*' || character == '?';
+}
+
+// Searches for the next subpattern of |pattern| in |string|, up to the given
+// |maximum_distance|. The subpattern extends from the start of |pattern| up to
+// the first wildcard character (or the end of the string). If the value of
+// |maximum_distance| is negative, the maximum distance is considered infinite.
+template <typename CHAR, typename NEXT>
+constexpr bool SearchForChars(const CHAR** pattern,
+                              const CHAR* pattern_end,
+                              const CHAR** string,
+                              const CHAR* string_end,
+                              int maximum_distance,
+                              NEXT next) {
+  const CHAR* pattern_start = *pattern;
+  const CHAR* string_start = *string;
+  bool escape = false;
+  while (true) {
+    if (*pattern == pattern_end) {
+      // If this is the end of the pattern, only accept the end of the string;
+      // anything else falls through to the mismatch case.
+      if (*string == string_end)
+        return true;
+    } else {
+      // If we have found a wildcard, we're done.
+      if (!escape && IsWildcard(**pattern))
+        return true;
+
+      // Check if the escape character is found. If so, skip it and move to the
+      // next character.
+      if (!escape && **pattern == '\\') {
+        escape = true;
+        next(pattern, pattern_end);
+        continue;
+      }
+
+      escape = false;
+
+      if (*string == string_end)
+        return false;
+
+      // Check if the chars match, if so, increment the ptrs.
+      const CHAR* pattern_next = *pattern;
+      const CHAR* string_next = *string;
+      base_icu::UChar32 pattern_char = next(&pattern_next, pattern_end);
+      if (pattern_char == next(&string_next, string_end) &&
+          pattern_char != CBU_SENTINEL) {
+        *pattern = pattern_next;
+        *string = string_next;
+        continue;
+      }
+    }
+
+    // Mismatch. If we have reached the maximum distance, return false,
+    // otherwise restart at the beginning of the pattern with the next character
+    // in the string.
+    // TODO(bauerb): This is a naive implementation of substring search, which
+    // could be implemented with a more efficient algorithm, e.g.
+    // Knuth-Morris-Pratt (at the expense of requiring preprocessing).
+    if (maximum_distance == 0)
+      return false;
+
+    // Because unlimited distance is represented as -1, this will never reach 0
+    // and therefore fail the match above.
+    maximum_distance--;
+    *pattern = pattern_start;
+    next(&string_start, string_end);
+    *string = string_start;
+  }
+}
+
+// Consumes consecutive wildcard characters (? or *). Returns the maximum number
+// of characters matched by the sequence of wildcards, or -1 if the wildcards
+// match an arbitrary number of characters (which is the case if it contains at
+// least one *).
+template <typename CHAR, typename NEXT>
+constexpr int EatWildcards(const CHAR** pattern, const CHAR* end, NEXT next) {
+  int num_question_marks = 0;
+  bool has_asterisk = false;
+  while (*pattern != end) {
+    if (**pattern == '?') {
+      num_question_marks++;
+    } else if (**pattern == '*') {
+      has_asterisk = true;
+    } else {
+      break;
+    }
+
+    next(pattern, end);
+  }
+  return has_asterisk ? -1 : num_question_marks;
+}
+
+template <typename CHAR, typename NEXT>
+constexpr bool MatchPatternT(const CHAR* eval,
+                             const CHAR* eval_end,
+                             const CHAR* pattern,
+                             const CHAR* pattern_end,
+                             NEXT next) {
+  do {
+    int maximum_wildcard_length = EatWildcards(&pattern, pattern_end, next);
+    if (!SearchForChars(&pattern, pattern_end, &eval, eval_end,
+                        maximum_wildcard_length, next)) {
+      return false;
+    }
+  } while (pattern != pattern_end);
+  return true;
+}
+
+struct NextCharUTF8 {
+  base_icu::UChar32 operator()(const char** p, const char* end) {
+    base_icu::UChar32 c;
+    int offset = 0;
+    CBU8_NEXT(reinterpret_cast<const uint8_t*>(*p), offset, end - *p, c);
+    *p += offset;
+    return c;
+  }
+};
+
+struct NextCharUTF16 {
+  base_icu::UChar32 operator()(const char16_t** p, const char16_t* end) {
+    base_icu::UChar32 c;
+    int offset = 0;
+    CBU16_NEXT(*p, offset, end - *p, c);
+    *p += offset;
+    return c;
+  }
+};
+
+}  // namespace
+
+bool MatchPattern(StringPiece eval, StringPiece pattern) {
+  return MatchPatternT(eval.data(), eval.data() + eval.size(), pattern.data(),
+                       pattern.data() + pattern.size(), NextCharUTF8());
+}
+
+bool MatchPattern(StringPiece16 eval, StringPiece16 pattern) {
+  return MatchPatternT(eval.data(), eval.data() + eval.size(), pattern.data(),
+                       pattern.data() + pattern.size(), NextCharUTF16());
+}
+
+}  // namespace base
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/pattern.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/pattern.h
new file mode 100644
index 000000000..20c13c76d
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/pattern.h
@@ -0,0 +1,22 @@
+// Copyright 2015 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef BASE_STRINGS_PATTERN_H_
+#define BASE_STRINGS_PATTERN_H_
+
+#include "base/strings/string_piece.h"
+
+namespace base {
+
+// Returns true if the |string| passed in matches the |pattern|. The pattern
+// string can contain wildcards like * and ?.
+//
+// The backslash character (\) is an escape character for * and ?.
+// ? matches 0 or 1 character, while * matches 0 or more characters.
+bool MatchPattern(StringPiece string, StringPiece pattern);
+bool MatchPattern(StringPiece16 string, StringPiece16 pattern);
+
+}  // namespace base
+
+#endif  // BASE_STRINGS_PATTERN_H_
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/strcat.cc b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/strcat.cc
new file mode 100644
index 000000000..f322fc332
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/strcat.cc
@@ -0,0 +1,17 @@
+// Copyright 2017 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "base/strings/strcat.h"
+
+#include <string>
+
+#include "base/strings/strcat_internal.h"
+
+namespace base {
+
+std::string StrCat(span<const StringPiece> pieces) {
+  return internal::StrCatT(pieces);
+}
+
+}  // namespace base
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/strcat.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/strcat.h
new file mode 100644
index 000000000..d26c2fc0c
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/strcat.h
@@ -0,0 +1,66 @@
+// Copyright 2017 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef BASE_STRINGS_STRCAT_H_
+#define BASE_STRINGS_STRCAT_H_
+
+#include <initializer_list>
+
+#include "base/containers/span.h"
+#include "base/strings/string_piece.h"
+#include "build/build_config.h"
+
+#if BUILDFLAG(IS_WIN)
+// Guard against conflict with Win32 API StrCat macro:
+// check StrCat wasn't and will not be redefined.
+#define StrCat StrCat
+#endif
+
+namespace base {
+
+// StrCat ----------------------------------------------------------------------
+//
+// StrCat is a function to perform concatenation on a sequence of strings.
+// It is preferrable to a sequence of "a + b + c" because it is both faster and
+// generates less code.
+//
+//   std::string result = base::StrCat({"foo ", result, "\nfoo ", bar});
+//
+// MORE INFO
+//
+// StrCat can see all arguments at once, so it can allocate one return buffer
+// of exactly the right size and copy once, as opposed to a sequence of
+// operator+ which generates a series of temporary strings, copying as it goes.
+// And by using StringPiece arguments, StrCat can avoid creating temporary
+// string objects for char* constants.
+//
+// ALTERNATIVES
+//
+// Internal Google / Abseil has a similar StrCat function. That version takes
+// an overloaded number of arguments instead of initializer list (overflowing
+// to initializer list for many arguments). We don't have any legacy
+// requirements and using only initializer_list is simpler and generates
+// roughly the same amount of code at the call sites.
+//
+// Abseil's StrCat also allows numbers by using an intermediate class that can
+// be implicitly constructed from either a string or various number types. This
+// class formats the numbers into a static buffer for increased performance,
+// and the call sites look nice.
+//
+// As-written Abseil's helper class for numbers generates slightly more code
+// than the raw StringPiece version. We can de-inline the helper class'
+// constructors which will cause the StringPiece constructors to be de-inlined
+// for this call and generate slightly less code. This is something we can
+// explore more in the future.
+
+[[nodiscard]] std::string StrCat(span<const StringPiece> pieces);
+
+// Initializer list forwards to the array version.
+inline std::string StrCat(std::initializer_list<StringPiece> pieces) {
+  return StrCat(make_span(pieces));
+}
+
+}  // namespace base
+
+#endif  // BASE_STRINGS_STRCAT_H_
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/strcat_internal.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/strcat_internal.h
new file mode 100644
index 000000000..f54b06956
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/strcat_internal.h
@@ -0,0 +1,76 @@
+// Copyright 2020 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef BASE_STRINGS_STRCAT_INTERNAL_H_
+#define BASE_STRINGS_STRCAT_INTERNAL_H_
+
+#include <string>
+
+#include "base/containers/span.h"
+#include "base/template_util.h"
+
+namespace base {
+
+namespace internal {
+
+// Optimized version of `std::basic_string::resize()` that skips zero
+// initialization of appended characters. Reading from the newly allocated
+// characters results in undefined behavior if they are not explicitly
+// initialized afterwards. Currently proposed for standardization as
+// std::basic_string::resize_and_overwrite: https://wg21.link/P1072R6
+template <typename CharT>
+auto Resize(std::basic_string<CharT>& str, size_t total_size, priority_tag<1>)
+    -> decltype(str.__resize_default_init(total_size)) {
+  str.__resize_default_init(total_size);
+}
+
+// Fallback to regular std::basic_string::resize() if invoking
+// __resize_default_init is ill-formed.
+template <typename CharT>
+void Resize(std::basic_string<CharT>& str, size_t total_size, priority_tag<0>) {
+  str.resize(total_size);
+}
+
+// Appends `pieces` to `dest`. Instead of simply calling `dest.append()`
+// `pieces.size()` times, this method first resizes `dest` to be of the desired
+// size, and then appends each piece via `std::char_traits::copy`. This achieves
+// two goals:
+// 1) Allocating the desired size all at once avoids other allocations that
+//    could happen if intermediate allocations did not reserve enough capacity.
+// 2) Invoking std::char_traits::copy instead of std::basic_string::append
+//    avoids having to write the terminating '\0' character n times.
+template <typename CharT, typename StringT>
+void StrAppendT(std::basic_string<CharT>& dest, span<const StringT> pieces) {
+  const size_t initial_size = dest.size();
+  size_t total_size = initial_size;
+  for (const auto& cur : pieces)
+    total_size += cur.size();
+
+  // Note: As opposed to `reserve()` calling `resize()` with an argument smaller
+  // than the current `capacity()` does not result in the string releasing spare
+  // capacity. Furthermore, common std::string implementations apply a geometric
+  // growth strategy if the current capacity is not sufficient for the newly
+  // added characters. Since this codepath is also triggered by `resize()`, we
+  // don't have to manage the std::string's capacity ourselves here to avoid
+  // performance hits in case `StrAppend()` gets called in a loop.
+  Resize(dest, total_size, priority_tag<1>());
+  CharT* dest_char = &dest[initial_size];
+  for (const auto& cur : pieces) {
+    std::char_traits<CharT>::copy(dest_char, cur.data(), cur.size());
+    dest_char += cur.size();
+  }
+}
+
+template <typename StringT>
+auto StrCatT(span<const StringT> pieces) {
+  std::basic_string<typename StringT::value_type> result;
+  StrAppendT(result, pieces);
+  return result;
+}
+
+}  // namespace internal
+
+}  // namespace base
+
+#endif  // BASE_STRINGS_STRCAT_INTERNAL_H_
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_piece.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_piece.h
index d2fe0dc48..a6a448bc7 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_piece.h
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_piece.h
@@ -160,7 +160,6 @@ std::ostream& operator<<(std::ostream& ostream,
 
 typedef BasicStringPiece<std::string> StringPiece;
 typedef BasicStringPiece<std::u16string> StringPiece16;
-typedef BasicStringPiece<std::wstring> WStringPiece;
 
 inline bool operator==(const StringPiece& x, const StringPiece& y) {
   if (x.size() != y.size())
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_util.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_util.h
index 2d8b13dfc..55cc8e466 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_util.h
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_util.h
@@ -5,8 +5,8 @@
 #ifndef MINI_CHROMIUM_BASE_STRINGS_STRING_UTIL_H_
 #define MINI_CHROMIUM_BASE_STRINGS_STRING_UTIL_H_
 
+#include "base/check_op.h"
 #include "base/compiler_specific.h"
-#include "base/logging.h"
 #include "build/build_config.h"
 
 namespace base {
@@ -17,13 +17,16 @@ int vsnprintf(char* buffer, size_t size, const char* format, va_list arguments)
 size_t strlcpy(char* dst, const char* src, size_t dst_size);
 size_t wcslcpy(wchar_t* dst, const wchar_t* src, size_t dst_size);
 
-}  // namespace base
-
-#if BUILDFLAG(IS_WIN)
-#include "base/strings/string_util_win.h"
-#elif BUILDFLAG(IS_POSIX)
-#include "base/strings/string_util_posix.h"
-#endif
+// Determines the type of ASCII character, independent of locale (the C
+// library versions will change based on locale).
+template <typename Char>
+inline bool IsAsciiWhitespace(Char c) {
+  return c == ' ' || (c >= 0x09 && c <= 0x0d);
+}
+template <typename Char>
+inline bool IsAsciiDigit(Char c) {
+  return c >= '0' && c <= '9';
+}
 
 template <class string_type>
 inline typename string_type::value_type* WriteInto(string_type* str,
@@ -38,4 +41,12 @@ inline typename string_type::value_type* WriteInto(string_type* str,
   return &((*str)[0]);
 }
 
+}  // namespace base
+
+#if BUILDFLAG(IS_WIN)
+#include "base/strings/string_util_win.h"
+#elif BUILDFLAG(IS_POSIX)
+#include "base/strings/string_util_posix.h"
+#endif
+
 #endif  // MINI_CHROMIUM_BASE_STRINGS_STRING_UTIL_H_
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_util_posix.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_util_posix.h
index fc7d2141a..5daba8a52 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_util_posix.h
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_util_posix.h
@@ -5,8 +5,6 @@
 #ifndef MINI_CHROMIUM_BASE_STRINGS_STRING_UTIL_POSIX_H_
 #define MINI_CHROMIUM_BASE_STRINGS_STRING_UTIL_POSIX_H_
 
-#include "base/strings/string_util.h"
-
 #include <stdio.h>
 #include <string.h>
 
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/stringprintf.cc b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/stringprintf.cc
index 905c019b2..fa3c5c5ae 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/stringprintf.cc
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/stringprintf.cc
@@ -8,7 +8,6 @@
 
 #include <vector>
 
-#include "base/cxx17_backports.h"
 #include "base/logging.h"
 #include "base/scoped_clear_last_error.h"
 #include "base/strings/string_util.h"
@@ -35,16 +34,16 @@ static void StringAppendVT(StringType* dst,
   va_copy(ap_copy, ap);
 
   ScopedClearLastError clear_errno;
-  int result = vsnprintfT(stack_buf, size(stack_buf), format, ap_copy);
+  int result = vsnprintfT(stack_buf, std::size(stack_buf), format, ap_copy);
   va_end(ap_copy);
 
-  if (result >= 0 && result < static_cast<int>(size(stack_buf))) {
+  if (result >= 0 && result < static_cast<int>(std::size(stack_buf))) {
     dst->append(stack_buf, result);
     return;
   }
 
   // Repeatedly increase buffer size until it fits.
-  size_t mem_length = size(stack_buf);
+  size_t mem_length = std::size(stack_buf);
   while (true) {
     if (result < 0) {
 #if !BUILDFLAG(IS_WIN)
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/sys_string_conversions_mac.mm b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/sys_string_conversions_mac.mm
index 9b9befdfb..87f872593 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/sys_string_conversions_mac.mm
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/sys_string_conversions_mac.mm
@@ -4,8 +4,8 @@
 
 #include "base/strings/sys_string_conversions.h"
 
-#include "base/logging.h"
-#include "base/mac/foundation_util.h"
+#include "base/apple/bridging.h"
+#include "base/check_op.h"
 
 namespace base {
 
@@ -83,7 +83,7 @@ static CFStringRef STLStringToCFStringWithEncodingsT(
   if (!nsstring) {
     return std::string();
   }
-  return SysCFStringRefToUTF8(base::mac::NSToCFCast(nsstring));
+  return SysCFStringRefToUTF8(apple::NSToCFPtrCast(nsstring));
 }
 
 CFStringRef SysUTF8ToCFStringRef(const std::string& utf8) {
@@ -91,7 +91,7 @@ CFStringRef SysUTF8ToCFStringRef(const std::string& utf8) {
 }
 
 NSString* SysUTF8ToNSString(const std::string& utf8) {
-  return [base::mac::CFToNSCast(SysUTF8ToCFStringRef(utf8)) autorelease];
+  return base::apple::CFToNSOwnershipCast(SysUTF8ToCFStringRef(utf8));
 }
 
 }  // namespace base
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/utf_string_conversion_utils.cc b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/utf_string_conversion_utils.cc
index 0f9f3d2cb..ba51598b4 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/utf_string_conversion_utils.cc
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/utf_string_conversion_utils.cc
@@ -32,10 +32,13 @@ bool ReadUnicodeCharacter(const char* src,
                           int32_t src_len,
                           int32_t* char_index,
                           uint32_t* code_point_out) {
-  int32_t code_point;
-  CBU8_NEXT(src, *char_index, src_len, code_point);
-  *code_point_out = static_cast<uint32_t>(code_point);
+  base_icu::UChar32 code_point;
+  CBU8_NEXT(reinterpret_cast<const uint8_t*>(src), *char_index, src_len,
+            code_point);
+  *code_point_out = code_point;
 
+  // The ICU macro above moves to the next char, we want to point to the last
+  // char consumed.
   (*char_index)--;
 
   return IsValidCodepoint(code_point);
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/utf_string_conversion_utils.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/utf_string_conversion_utils.h
index 15fe3008e..99873ee7b 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/utf_string_conversion_utils.h
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/utf_string_conversion_utils.h
@@ -5,6 +5,8 @@
 #ifndef MINI_CHROMIUM_BASE_STRINGS_UTF_STRING_CONVERSION_UTILS_H_
 #define MINI_CHROMIUM_BASE_STRINGS_UTF_STRING_CONVERSION_UTILS_H_
 
+#include <stdint.h>
+
 #include <string>
 
 namespace base {
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/utf_string_conversions.cc b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/utf_string_conversions.cc
index 0d752602d..a1c243c7f 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/utf_string_conversions.cc
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/utf_string_conversions.cc
@@ -7,6 +7,7 @@
 #include <stdint.h>
 
 #include <string>
+#include <string_view>
 
 #include "base/strings/utf_string_conversion_utils.h"
 #include "build/build_config.h"
@@ -58,8 +59,8 @@ std::string UTF16ToUTF8(const StringPiece16& utf16) {
   return ret;
 }
 
-#if defined(WCHAR_T_IS_UTF16)
-std::string WideToUTF8(WStringPiece wide) {
+#if defined(WCHAR_T_IS_16_BIT)
+std::string WideToUTF8(std::wstring_view wide) {
   std::string ret;
   UTF16ToUTF8(
       reinterpret_cast<const char16_t*>(wide.data()), wide.size(), &ret);
@@ -71,6 +72,6 @@ std::wstring UTF8ToWide(StringPiece utf8) {
   return std::wstring(reinterpret_cast<const wchar_t*>(utf16.data()),
                       utf16.size());
 }
-#endif  // defined(WCHAR_T_IS_UTF16)
+#endif  // defined(WCHAR_T_IS_16_BIT)
 
 }  // namespace
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/utf_string_conversions.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/utf_string_conversions.h
index 1b404aff4..64c79c2bc 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/utf_string_conversions.h
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/utf_string_conversions.h
@@ -6,6 +6,7 @@
 #define MINI_CHROMIUM_BASE_STRINGS_UTF_STRING_CONVERSIONS_H_
 
 #include <string>
+#include <string_view>
 
 #include "base/strings/string_piece.h"
 #include "build/build_config.h"
@@ -17,10 +18,10 @@ std::u16string UTF8ToUTF16(const StringPiece& utf8);
 bool UTF16ToUTF8(const char16_t* src, size_t src_len, std::string* output);
 std::string UTF16ToUTF8(const StringPiece16& utf16);
 
-#if defined(WCHAR_T_IS_UTF16)
-std::string WideToUTF8(WStringPiece wide);
+#if defined(WCHAR_T_IS_16_BIT)
+std::string WideToUTF8(std::wstring_view wide);
 std::wstring UTF8ToWide(StringPiece utf8);
-#endif  // defined(WCHAR_T_IS_UTF16)
+#endif  // defined(WCHAR_T_IS_16_BIT)
 
 }  // namespace
 
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/condition_variable_posix.cc b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/condition_variable_posix.cc
index 51b659bed..755e8b629 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/condition_variable_posix.cc
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/condition_variable_posix.cc
@@ -4,7 +4,7 @@
 
 #include "base/synchronization/condition_variable.h"
 
-#include "base/logging.h"
+#include "base/check_op.h"
 
 namespace base {
 
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/lock.cc b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/lock.cc
index 9e8e00bc9..24830328b 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/lock.cc
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/lock.cc
@@ -8,7 +8,7 @@
 
 #include "base/synchronization/lock.h"
 
-#include "base/logging.h"
+#include "base/check_op.h"
 
 #ifndef NDEBUG
 
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/lock_impl_posix.cc b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/lock_impl_posix.cc
index 073dde1be..a8486f2c9 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/lock_impl_posix.cc
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/lock_impl_posix.cc
@@ -6,7 +6,7 @@
 
 #include <errno.h>
 
-#include "base/logging.h"
+#include "base/check_op.h"
 
 namespace base {
 namespace internal {
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/template_util.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/template_util.h
index aad2aa949..7fce811e4 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/template_util.h
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/template_util.h
@@ -5,123 +5,48 @@
 #ifndef MINI_CHROMIUM_BASE_TEMPLATE_UTIL_H_
 #define MINI_CHROMIUM_BASE_TEMPLATE_UTIL_H_
 
-#include <stddef.h>
-
-#include "build/build_config.h"
+#include <type_traits>
 
 namespace base {
 
-// template definitions from tr1
-
-template<class T, T v>
-struct integral_constant {
-  static const T value = v;
-  typedef T value_type;
-  typedef integral_constant<T, v> type;
-};
-
-template <class T, T v> const T integral_constant<T, v>::value;
-
-typedef integral_constant<bool, true> true_type;
-typedef integral_constant<bool, false> false_type;
-
-template <class T> struct is_pointer : false_type {};
-template <class T> struct is_pointer<T*> : true_type {};
-
-// Member function pointer detection. This is built-in to C++ 11's stdlib, and
-// we can remove this when we switch to it.
-template<typename T>
-struct is_member_function_pointer : false_type {};
-
-template <typename R, typename Z, typename... A>
-struct is_member_function_pointer<R(Z::*)(A...)> : true_type {};
-template <typename R, typename Z, typename... A>
-struct is_member_function_pointer<R(Z::*)(A...) const> : true_type {};
-
-
-template <class T, class U> struct is_same : public false_type {};
-template <class T> struct is_same<T,T> : true_type {};
-
-template<class> struct is_array : public false_type {};
-template<class T, size_t n> struct is_array<T[n]> : public true_type {};
-template<class T> struct is_array<T[]> : public true_type {};
-
-template <class T> struct is_non_const_reference : false_type {};
-template <class T> struct is_non_const_reference<T&> : true_type {};
-template <class T> struct is_non_const_reference<const T&> : false_type {};
-
-template <class T> struct is_const : false_type {};
-template <class T> struct is_const<const T> : true_type {};
-
-template <class T> struct is_void : false_type {};
-template <> struct is_void<void> : true_type {};
-
 namespace internal {
 
-// Types YesType and NoType are guaranteed such that sizeof(YesType) <
-// sizeof(NoType).
-typedef char YesType;
+// Helper to express preferences in an overload set. If more than one overload
+// are available for a given set of parameters the overload with the higher
+// priority will be chosen.
+template <size_t I>
+struct priority_tag : priority_tag<I - 1> {};
 
-struct NoType {
-  YesType dummy[2];
-};
-
-// This class is an implementation detail for is_convertible, and you
-// don't need to know how it works to use is_convertible. For those
-// who care: we declare two different functions, one whose argument is
-// of type To and one with a variadic argument list. We give them
-// return types of different size, so we can use sizeof to trick the
-// compiler into telling us which function it would have chosen if we
-// had called it with an argument of type From.  See Alexandrescu's
-// _Modern C++ Design_ for more details on this sort of trick.
-
-struct ConvertHelper {
-  template <typename To>
-  static YesType Test(To);
-
-  template <typename To>
-  static NoType Test(...);
-
-  template <typename From>
-  static From& Create();
-};
-
-// Used to determine if a type is a struct/union/class. Inspired by Boost's
-// is_class type_trait implementation.
-struct IsClassHelper {
-  template <typename C>
-  static YesType Test(void(C::*)(void));
-
-  template <typename C>
-  static NoType Test(...);
-};
+template <>
+struct priority_tag<0> {};
 
 }  // namespace internal
 
-// Inherits from true_type if From is convertible to To, false_type otherwise.
+// Implementation of C++20's std::remove_cvref.
 //
-// Note that if the type is convertible, this will be a true_type REGARDLESS
-// of whether or not the conversion would emit a warning.
-template <typename From, typename To>
-struct is_convertible
-    : integral_constant<bool,
-                        sizeof(internal::ConvertHelper::Test<To>(
-                                   internal::ConvertHelper::Create<From>())) ==
-                        sizeof(internal::YesType)> {
-};
-
+// References:
+// - https://en.cppreference.com/w/cpp/types/remove_cvref
+// - https://wg21.link/meta.trans.other#lib:remove_cvref
 template <typename T>
-struct is_class
-    : integral_constant<bool,
-                        sizeof(internal::IsClassHelper::Test<T>(0)) ==
-                            sizeof(internal::YesType)> {
+struct remove_cvref {
+  using type = std::remove_cv_t<std::remove_reference_t<T>>;
 };
 
-template<bool B, class T = void>
-struct enable_if {};
+// Implementation of C++20's std::remove_cvref_t.
+//
+// References:
+// - https://en.cppreference.com/w/cpp/types/remove_cvref
+// - https://wg21.link/meta.type.synop#lib:remove_cvref_t
+template <typename T>
+using remove_cvref_t = typename remove_cvref<T>::type;
 
-template<class T>
-struct enable_if<true, T> { typedef T type; };
+// Simplified implementation of C++20's std::iter_reference_t.
+// As opposed to std::iter_reference_t, this implementation does not restrict
+// the type of `Iter`.
+//
+// Reference: https://wg21.link/iterator.synopsis#:~:text=iter_reference_t
+template <typename Iter>
+using iter_reference_t = decltype(*std::declval<Iter&>());
 
 }  // namespace base
 
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/third_party/icu/icu_utf.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/third_party/icu/icu_utf.h
index 79242c6f9..45ce85d12 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/third_party/icu/icu_utf.h
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/third_party/icu/icu_utf.h
@@ -72,6 +72,25 @@ typedef int32_t UChar32;
     ((c)>=0xfdd0 && \
      ((c)<=0xfdef || ((c)&0xfffe)==0xfffe) && (c)<=0x10ffff)
 
+/**
+ * \def UPRV_BLOCK_MACRO_BEGIN
+ * Defined as the "do" keyword by default.
+ * @internal
+ */
+#ifndef CBUPRV_BLOCK_MACRO_BEGIN
+#define CBUPRV_BLOCK_MACRO_BEGIN do
+#endif
+
+/**
+ * \def UPRV_BLOCK_MACRO_END
+ * Defined as "while (FALSE)" by default.
+ * @internal
+ */
+#ifndef CBUPRV_BLOCK_MACRO_END
+#define CBUPRV_BLOCK_MACRO_END while (0)
+#endif
+
+
 /**
  * Is c a Unicode code point value (0..U+10ffff)
  * that can be assigned a character?
@@ -230,29 +249,36 @@ utf8_nextCharSafeBody(const uint8_t *s, int32_t *pi, int32_t length, ::base_icu:
  * @see U8_NEXT_UNSAFE
  * @stable ICU 2.4
  */
-#define CBU8_NEXT(s, i, length, c) { \
+#define CBU8_NEXT(s, i, length, c) CBU8_INTERNAL_NEXT_OR_SUB(s, i, length, c, CBU_SENTINEL)
+
+/** @internal */
+#define CBU8_INTERNAL_NEXT_OR_SUB(s, i, length, c, sub) CBUPRV_BLOCK_MACRO_BEGIN { \
     (c)=(uint8_t)(s)[(i)++]; \
     if(!CBU8_IS_SINGLE(c)) { \
-        uint8_t __t1, __t2; \
-        if( /* handle U+0800..U+FFFF inline */ \
-                (0xe0<=(c) && (c)<0xf0) && \
-                (((i)+1)<(length) || (length)<0) && \
-                CBU8_IS_VALID_LEAD3_AND_T1((c), __t1=(s)[i]) && \
-                (__t2=(uint8_t)((s)[(i)+1]-0x80))<=0x3f) { \
-            (c)=(((c)&0xf)<<12)|((__t1&0x3f)<<6)|__t2; \
-            (i)+=2; \
-        } else if( /* handle U+0080..U+07FF inline */ \
-                ((c)<0xe0 && (c)>=0xc2) && \
-                ((i)!=(length)) && \
-                (__t1=(uint8_t)((s)[i]-0x80))<=0x3f) { \
-            (c)=(((c)&0x1f)<<6)|__t1; \
-            ++(i); \
+        uint8_t __t = 0; \
+        if((i)!=(length) && \
+            /* fetch/validate/assemble all but last trail byte */ \
+            ((c)>=0xe0 ? \
+                ((c)<0xf0 ?  /* U+0800..U+FFFF except surrogates */ \
+                    CBU8_LEAD3_T1_BITS[(c)&=0xf]&(1<<((__t=(s)[i])>>5)) && \
+                    (__t&=0x3f, 1) \
+                :  /* U+10000..U+10FFFF */ \
+                    ((c)-=0xf0)<=4 && \
+                    CBU8_LEAD4_T1_BITS[(__t=(s)[i])>>4]&(1<<(c)) && \
+                    ((c)=((c)<<6)|(__t&0x3f), ++(i)!=(length)) && \
+                    (__t=(s)[i]-0x80)<=0x3f) && \
+                /* valid second-to-last trail byte */ \
+                ((c)=((c)<<6)|__t, ++(i)!=(length)) \
+            :  /* U+0080..U+07FF */ \
+                (c)>=0xc2 && ((c)&=0x1f, 1)) && \
+            /* last trail byte */ \
+            (__t=(s)[i]-0x80)<=0x3f && \
+            ((c)=((c)<<6)|__t, ++(i), 1)) { \
         } else { \
-            /* function call for "complicated" and error cases */ \
-            (c)=::base_icu::utf8_nextCharSafeBody((const uint8_t *)s, &(i), (length), c, -1); \
+            (c)=(sub);  /* ill-formed*/ \
         } \
     } \
-}
+} CBUPRV_BLOCK_MACRO_END
 
 /**
  * Append a code point to a string, overwriting 1 to 4 bytes.
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/threading/thread_local_storage.cc b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/threading/thread_local_storage.cc
index e52787b76..047f2fc88 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/threading/thread_local_storage.cc
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/threading/thread_local_storage.cc
@@ -6,8 +6,9 @@
 
 #include <string.h>
 
+#include "base/check_op.h"
+#include "base/notreached.h"
 #include "base/atomicops.h"
-#include "base/logging.h"
 
 using base::internal::PlatformThreadLocalStorage;
 
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/threading/thread_local_storage_posix.cc b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/threading/thread_local_storage_posix.cc
index 6e1e44365..caf1531d4 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/threading/thread_local_storage_posix.cc
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/threading/thread_local_storage_posix.cc
@@ -4,7 +4,7 @@
 
 #include "base/threading/thread_local_storage.h"
 
-#include "base/logging.h"
+#include "base/check_op.h"
 
 namespace base {
 namespace internal {
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/threading/thread_local_storage_win.cc b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/threading/thread_local_storage_win.cc
index a7ef3e704..f1d16eb02 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/threading/thread_local_storage_win.cc
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/threading/thread_local_storage_win.cc
@@ -4,7 +4,7 @@
 
 #include "base/threading/thread_local_storage.h"
 
-#include "base/logging.h"
+#include "base/check.h"
 
 namespace base {
 namespace internal {
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/types/cxx23_to_underlying.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/types/cxx23_to_underlying.h
new file mode 100644
index 000000000..12f106366
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/types/cxx23_to_underlying.h
@@ -0,0 +1,25 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef MINI_CHROMIUM_BASE_TYPES_CXX23_TO_UNDERLYING_H_
+#define MINI_CHROMIUM_BASE_TYPES_CXX23_TO_UNDERLYING_H_
+
+#include <type_traits>
+
+namespace base {
+
+// Implementation of C++23's std::to_underlying.
+//
+// Note: This has an additional `std::is_enum<EnumT>` requirement to be SFINAE
+// friendly prior to C++20.
+//
+// Reference: https://en.cppreference.com/w/cpp/utility/to_underlying
+template <typename EnumT, typename = std::enable_if_t<std::is_enum<EnumT>{}>>
+constexpr std::underlying_type_t<EnumT> to_underlying(EnumT e) noexcept {
+  return static_cast<std::underlying_type_t<EnumT>>(e);
+}
+
+}  // namespace base
+
+#endif  // MINI_CHROMIUM_BASE_TYPES_CXX23_TO_UNDERLYING_H_
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/build_config.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/build_config.h
index d3db6bd30..62527454a 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/build_config.h
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/build_config.h
@@ -111,6 +111,11 @@
 #define ARCH_CPU_MIPS64EL 1
 #define ARCH_CPU_64_BITS 1
 #endif
+#elif defined(__riscv) && (__riscv_xlen == 64)
+#define ARCH_CPU_RISCV_FAMILY 1
+#define ARCH_CPU_RISCV64 1
+#define ARCH_CPU_64_BITS 1
+#define ARCH_CPU_LITTLE_ENDIAN 1
 #else
 #error Please add support for your architecture in build/build_config.h
 #endif
@@ -129,9 +134,9 @@
 
 #if BUILDFLAG(IS_POSIX) && defined(COMPILER_GCC) && defined(__WCHAR_MAX__) && \
     (__WCHAR_MAX__ == 0x7fffffff || __WCHAR_MAX__ == 0xffffffff)
-#define WCHAR_T_IS_UTF32
+#define WCHAR_T_IS_32_BIT
 #elif BUILDFLAG(IS_WIN)
-#define WCHAR_T_IS_UTF16
+#define WCHAR_T_IS_16_BIT
 #else
 #error Please add support for your compiler in build/build_config.h
 #endif
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/config/BUILD.gn b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/config/BUILD.gn
index 3937a63b2..c9d8c946e 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/config/BUILD.gn
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/config/BUILD.gn
@@ -270,13 +270,13 @@ config("default") {
     common_flags += [ "-pthread" ]
 
     if (current_cpu == "x86") {
-      common_flags += [
-        "-m32",
-      ]
+      common_flags += [ "-m32" ]
     } else if (current_cpu == "x64") {
-      common_flags += [
-        "-m64",
-      ]
+      common_flags += [ "-m64" ]
+    } else if (current_cpu == "arm64") {
+      common_flags += [ "--target=aarch64-linux-gnu" ]
+    } else if (current_cpu == "riscv64") {
+      common_flags += [ "--target=riscv64-linux-gnu" ]
     } else {
       assert(false, "Unsupported architecture")
     }
@@ -355,12 +355,13 @@ config("executable") {
   }
 }
 
-config("ios_enable_arc") {
-  if (mini_chromium_is_ios) {
-    common_flags = [ "-fobjc-arc" ]
-    cflags_objc = common_flags
-    cflags_objcc = common_flags
-  }
+config("apple_enable_arc") {
+  common_flags = [
+    "-fobjc-arc",
+    "-fno-objc-arc-exceptions",
+  ]
+  cflags_objc = common_flags
+  cflags_objcc = common_flags
 }
 
 config("Wexit_time_destructors") {
@@ -403,39 +404,49 @@ toolchain("gcc_like_toolchain") {
     ar = rebase_path(clang_path, root_build_dir) + "/bin/llvm-ar"
     ld = cxx
   } else if (mini_chromium_is_android) {
-     assert(android_ndk_root != "", "Android builds must set android_ndk_root")
-
-     if (host_os == "linux") {
-       ndk_host_arch = "linux-x86_64"
-     } else if (host_os == "mac") {
-       ndk_host_arch = "darwin-x86_64"
-     } else if (host_os == "win") {
-       ndk_host_arch = "windows-x86_64"
-     }
-     ndk_bin_dir = string_join("/", [android_ndk_root, "toolchains", "llvm",
-                               "prebuilt", ndk_host_arch, "bin", ""])
-
-     if (target_cpu == "arm") {
-       tool_prefix = "arm-linux-androideabi"
-     } else if (target_cpu == "arm64") {
-       tool_prefix = "aarch64-linux-android"
-     } else if (target_cpu == "x86") {
-       tool_prefix = "i686-linux-android"
-     } else if (target_cpu == "x64") {
-       tool_prefix = "x86_64-linux-android"
-     }
-
-     if (target_cpu == "arm") {
-       clang_prefix = "armv7a-linux-androideabi" + android_api_level
-     } else {
-       clang_prefix = tool_prefix + android_api_level
-     }
-
-     cc = ndk_bin_dir + clang_prefix + "-clang"
-     cxx = ndk_bin_dir + clang_prefix + "-clang++"
-     asm = cxx
-     ld = cxx
-     ar = ndk_bin_dir + tool_prefix + "-ar"
+    assert(android_ndk_root != "", "Android builds must set android_ndk_root")
+
+    if (host_os == "linux") {
+      ndk_host_arch = "linux-x86_64"
+    } else if (host_os == "mac") {
+      ndk_host_arch = "darwin-x86_64"
+    } else if (host_os == "win") {
+      ndk_host_arch = "windows-x86_64"
+    }
+    ndk_bin_dir = string_join("/",
+                              [
+                                android_ndk_root,
+                                "toolchains",
+                                "llvm",
+                                "prebuilt",
+                                ndk_host_arch,
+                                "bin",
+                                "",
+                              ])
+
+    if (target_cpu == "arm") {
+      tool_prefix = "arm-linux-androideabi"
+    } else if (target_cpu == "arm64") {
+      tool_prefix = "aarch64-linux-android"
+    } else if (target_cpu == "x86") {
+      tool_prefix = "i686-linux-android"
+    } else if (target_cpu == "x64") {
+      tool_prefix = "x86_64-linux-android"
+    } else if (target_cpu == "riscv64") {
+      tool_prefix = "riscv64-linux-android"
+    }
+
+    if (target_cpu == "arm") {
+      clang_prefix = "armv7a-linux-androideabi" + android_api_level
+    } else {
+      clang_prefix = tool_prefix + android_api_level
+    }
+
+    cc = ndk_bin_dir + clang_prefix + "-clang"
+    cxx = ndk_bin_dir + clang_prefix + "-clang++"
+    asm = cxx
+    ld = cxx
+    ar = ndk_bin_dir + tool_prefix + "-ar"
   } else {
     cc = "clang"
     cxx = "clang++"
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/ios/rules.gni b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/ios/rules.gni
index c170a6652..4d20a634b 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/ios/rules.gni
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/ios/rules.gni
@@ -105,7 +105,7 @@ template("create_signed_bundle") {
 
     # Bundle ID should respect rfc1034 and replace _ with -.
     _xcode_product_bundle_id =
-        string_replace("$ios_app_bundle_id_prefix.googletest.$_output_name",
+        string_replace("$ios_app_bundle_id_prefix.$_output_name",
                        "_",
                        "-")
 
@@ -222,7 +222,20 @@ template("ios_app_bundle") {
   if (defined(invoker.info_plist)) {
     _plist_templates += [ invoker.info_plist ]
   }
-  _plist_extra_substitutions = []
+
+  if (defined(invoker.bundle_identifier)) {
+    _bundle_identifier = invoker.bundle_identifier
+    assert(_bundle_identifier == string_replace(_bundle_identifier, "_", "-"),
+           "$target_name: bundle_identifier does not respect rfc1034: " +
+               _bundle_identifier)
+  } else {
+    # Bundle identifier should respect rfc1034, so replace "_" with "-".
+    _bundle_identifier = "$ios_app_bundle_id_prefix.googletest." +
+                         string_replace(_output_name, "_", "-")
+  }
+
+  _plist_extra_substitutions = [ "BUNDLE_IDENTIFIER=$_bundle_identifier" ]
+
   if (defined(invoker.extra_substitutions)) {
     _plist_extra_substitutions += invoker.extra_substitutions
   }
@@ -675,4 +688,3 @@ template("ios_test_runner_xcuitest") {
     forward_variables_from(invoker, "*", ["data_deps"])
   }
 }
-
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/platform.gni b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/platform.gni
index f38c1a91c..06d29093d 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/platform.gni
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/platform.gni
@@ -23,6 +23,7 @@ if (current_os == "mac") {
   mini_chromium_is_fuchsia = true
 }
 
+mini_chromium_is_apple = mini_chromium_is_mac || mini_chromium_is_ios
 mini_chromium_is_posix = mini_chromium_is_mac || mini_chromium_is_ios ||
                          mini_chromium_is_linux || mini_chromium_is_android
 
@@ -34,5 +35,3 @@ declare_args() {
 assert(!mini_chromium_is_chromeos_lacros || !mini_chromium_is_chromeos_ash)
 assert(!(mini_chromium_is_chromeos_lacros || mini_chromium_is_chromeos_ash) ||
        mini_chromium_is_linux)
-
-
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/sysroot.gni b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/sysroot.gni
index 55741d143..3624c3d9b 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/sysroot.gni
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/sysroot.gni
@@ -6,13 +6,17 @@ import("platform.gni")
 
 if (mini_chromium_is_posix || mini_chromium_is_fuchsia) {
   declare_args() {
-    # A directory containing the system’s header files and libraries. If empty,
-    # a suitable default will be chosen.
-    target_sysroot = ""
+    # Don't execute if building inside the Fuchsia tree.
+    if (!(defined(is_fuchsia_tree) && is_fuchsia_tree)) {
+      # A directory containing the system’s header files and libraries. If empty,
+      # a suitable default will be chosen.
+      target_sysroot = ""
+    }
   }
 }
 
-if (mini_chromium_is_mac) {
+# Don't execute if building inside the Fuchsia tree.
+if (mini_chromium_is_mac && !(defined(is_fuchsia_tree) && is_fuchsia_tree)) {
   declare_args() {
     # The version of the macOS SDK to use. If |target_sysroot| is empty, this
     # will inform which SDK version will be chosen. If |mac_sdk| is also empty,
diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/testing/platform_test.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/testing/platform_test.h
index c7c9c14ae..213fdeff1 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/testing/platform_test.h
+++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/testing/platform_test.h
@@ -9,7 +9,15 @@
 #include "gtest/gtest.h"
 
 #if BUILDFLAG(IS_APPLE)
-#import <Foundation/Foundation.h>
+
+// Note that this uses the direct runtime interface to the autorelease pool.
+// https://clang.llvm.org/docs/AutomaticReferenceCounting.html#runtime-support
+// This is so this can work when compiled for ARC.
+
+extern "C" {
+void* objc_autoreleasePoolPush(void);
+void objc_autoreleasePoolPop(void* pool);
+}
 
 // The implementation is in this header because mini_chromium does not directly
 // depend on googletest. Consumers are free to use this interface if they do
@@ -19,18 +27,13 @@ class PlatformTest : public testing::Test {
   PlatformTest(const PlatformTest&) = delete;
   PlatformTest& operator=(const PlatformTest&) = delete;
 
-  ~PlatformTest() override { [pool_ release]; }
+  ~PlatformTest() override { objc_autoreleasePoolPop(autorelease_pool_); }
 
  protected:
-  PlatformTest() : pool_([[NSAutoreleasePool alloc] init]) {}
+  PlatformTest() : autorelease_pool_(objc_autoreleasePoolPush()) {}
 
  private:
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-  using PoolType = NSAutoreleasePool*;
-#else
-  using PoolType = id;
-#endif
-  PoolType pool_;
+  void* autorelease_pool_;
 };
 #else
 using PlatformTest = testing::Test;
diff --git a/external_imported/sentry-native/external/crashpad/third_party/ninja/README.crashpad b/external_imported/sentry-native/external/crashpad/third_party/ninja/README.crashpad
index e79bd45f2..8a5f1eeba 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/ninja/README.crashpad
+++ b/external_imported/sentry-native/external/crashpad/third_party/ninja/README.crashpad
@@ -5,6 +5,7 @@ Revision: See the CIPD version in DEPS
 License: Apache License 2.0
 License File: https://github.com/ninja-build/ninja/blob/master/COPYING
 Security Critical: no
+Shipped: no
 
 Description:
 Ninja is a small build system with a focus on speed, and is used to build
diff --git a/external_imported/sentry-native/external/crashpad/third_party/xnu/README.crashpad b/external_imported/sentry-native/external/crashpad/third_party/xnu/README.crashpad
index f8471d384..dbcf74087 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/xnu/README.crashpad
+++ b/external_imported/sentry-native/external/crashpad/third_party/xnu/README.crashpad
@@ -6,6 +6,7 @@ Version: 6153.11.26 (from macOS 10.15.0)
 License: APSL 2.0
 License File: APPLE_LICENSE
 Security Critical: no
+Shipped: yes
 
 Description:
 XNU is the operating system kernel used on macOS and other Apple systems.
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/BUILD.gn b/external_imported/sentry-native/external/crashpad/third_party/zlib/BUILD.gn
index 986a057b9..92069a575 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/BUILD.gn
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/BUILD.gn
@@ -38,6 +38,10 @@ config("zlib_config") {
   }
 }
 
+config("Wno-sign-compare") {
+  cflags = [ "-Wno-sign-compare" ]
+}
+
 if (zlib_source == "external") {
   group("zlib") {
     public_configs = [ ":zlib_config" ]
@@ -112,6 +116,11 @@ if (zlib_source == "external") {
       ]
     }
 
+    if (crashpad_is_fuchsia) {
+      # Fuchsia build's default warnings include -Wsign-compare (indirectly)
+      configs += [ ":Wno-sign-compare" ]
+    }
+
     if (crashpad_is_standalone) {
       configs -= [ "//third_party/mini_chromium/mini_chromium/build/config:Wimplicit_fallthrough" ]
     } else if (crashpad_is_external) {
@@ -119,14 +128,11 @@ if (zlib_source == "external") {
     }
 
     if (zlib_source == "embedded") {
-      sources += [ "$zlib_dir/names.h" ]
+      sources += [ "$zlib_dir/chromeconf.h" ]
 
       if (current_cpu == "x86" || current_cpu == "x64") {
         sources += [
           "$zlib_dir/crc_folding.c",
-          "$zlib_dir/fill_window_sse.c",
-          "$zlib_dir/x86.c",
-          "$zlib_dir/x86.h",
         ]
         if (!crashpad_is_win || crashpad_is_clang) {
           cflags += [
@@ -137,8 +143,6 @@ if (zlib_source == "external") {
         if (crashpad_is_clang) {
           cflags += [ "-Wno-incompatible-pointer-types" ]
         }
-      } else {
-        sources += [ "$zlib_dir/simd_stub.c" ]
       }
     }
   }
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/CMakeLists.txt b/external_imported/sentry-native/external/crashpad/third_party/zlib/CMakeLists.txt
index 627b8352c..6d8a6eda1 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/CMakeLists.txt
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/CMakeLists.txt
@@ -27,11 +27,9 @@ else()
         zlib/inflate.h
         zlib/inftrees.c
         zlib/inftrees.h
-        zlib/names.h
         zlib/trees.c
         zlib/trees.h
         zlib/uncompr.c
-        zlib/x86.h
         zlib/zconf.h
         zlib/zlib.h
         zlib/zutil.c
@@ -47,15 +45,11 @@ else()
     if(archs MATCHES "(x86_64)|(x86)|(i[3-7]86)|(AMD64)")
         target_sources(crashpad_zlib PRIVATE
             zlib/crc_folding.c
-            zlib/fill_window_sse.c
-            zlib/x86.c
         )
 
         if(NOT MSVC)
             target_compile_options(crashpad_zlib PRIVATE -msse4.2 -mpclmul)
         endif()
-    else()
-        target_sources(crashpad_zlib PRIVATE zlib/simd_stub.c)
     endif()
     target_compile_definitions(crashpad_zlib PUBLIC
         CRASHPAD_ZLIB_SOURCE_EMBEDDED
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/README.crashpad b/external_imported/sentry-native/external/crashpad/third_party/zlib/README.crashpad
index 8a9533d35..bf3af780a 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/README.crashpad
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/README.crashpad
@@ -5,6 +5,7 @@ Revision: See zlib/README.chromium
 License: zlib
 License File: zlib/LICENSE
 Security Critical: yes
+Shipped: yes
 
 Description:
 “A massively spiffy yet delicately unobtrusive compression library.�
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/BUILD.gn b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/BUILD.gn
index 5086563cf..8ed0807a9 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/BUILD.gn
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/BUILD.gn
@@ -1,40 +1,286 @@
-# Copyright (c) 2013 The Chromium Authors. All rights reserved.
+# Copyright 2013 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/compiler/compiler.gni")
+
+declare_args() {
+  # Expose zlib's symbols, used by Node.js to provide zlib APIs for its native
+  # modules.
+  zlib_symbols_visible = false
+}
+
+if (build_with_chromium) {
+  import("//testing/test.gni")
+}
+
+if (current_cpu == "arm" || current_cpu == "arm64") {
+  import("//build/config/arm.gni")
+}
+
 config("zlib_config") {
   include_dirs = [ "." ]
+
+  if (zlib_symbols_visible) {
+    defines = [ "ZLIB_DLL" ]
+  }
+}
+
+config("zlib_internal_config") {
+  defines = [ "ZLIB_IMPLEMENTATION" ]
+
+  if (!is_debug) {
+    # Build code using -O3, see: crbug.com/1084371.
+    configs = [ "//build/config/compiler:optimize_speed" ]
+  }
+  if (is_debug || use_fuzzing_engine) {
+    # Enable zlib's asserts in debug and fuzzer builds.
+    defines += [ "ZLIB_DEBUG" ]
+  }
+
+  if (is_win && !is_clang) {
+    # V8 supports building with msvc, these silence some warnings that
+    # causes compilation to fail (https://crbug.com/1255096).
+    cflags = [
+      "/wd4244",
+      "/wd4100",
+      "/wd4702",
+      "/wd4127",
+    ]
+  }
+}
+
+source_set("zlib_common_headers") {
+  visibility = [ ":*" ]
+
+  sources = [
+    "chromeconf.h",
+    "deflate.h",
+    "inffast.h",
+    "inffixed.h",
+    "inflate.h",
+    "inftrees.h",
+    "zconf.h",
+    "zlib.h",
+    "zutil.h",
+  ]
+}
+
+use_arm_neon_optimizations = false
+if ((current_cpu == "arm" || current_cpu == "arm64") &&
+    !(is_win && !is_clang)) {
+  # TODO(richard.townsend@arm.com): Optimizations temporarily disabled for
+  # Windows on Arm MSVC builds, see http://crbug.com/v8/10012.
+  if (arm_use_neon) {
+    use_arm_neon_optimizations = true
+  }
+}
+
+use_x86_x64_optimizations =
+    (current_cpu == "x86" || current_cpu == "x64") && !is_ios
+
+config("zlib_adler32_simd_config") {
+  if (use_x86_x64_optimizations) {
+    defines = [ "ADLER32_SIMD_SSSE3" ]
+    if (is_win) {
+      defines += [ "X86_WINDOWS" ]
+    } else {
+      defines += [ "X86_NOT_WINDOWS" ]
+    }
+  }
+
+  if (use_arm_neon_optimizations) {
+    defines = [ "ADLER32_SIMD_NEON" ]
+  }
 }
 
-static_library("zlib_x86_simd") {
-  if (!is_ios && (current_cpu == "x86" || current_cpu == "x64")) {
+source_set("zlib_adler32_simd") {
+  visibility = [ ":*" ]
+
+  if (use_x86_x64_optimizations) {
     sources = [
+      "adler32_simd.c",
+      "adler32_simd.h",
+    ]
+
+    if (!is_win || is_clang) {
+      cflags = [ "-mssse3" ]
+    }
+  }
+
+  if (use_arm_neon_optimizations) {
+    sources = [
+      "adler32_simd.c",
+      "adler32_simd.h",
+    ]
+  }
+
+  configs += [ ":zlib_internal_config" ]
+
+  public_configs = [ ":zlib_adler32_simd_config" ]
+
+  public_deps = [ ":zlib_common_headers" ]
+}
+
+if (use_arm_neon_optimizations) {
+  config("zlib_arm_crc32_config") {
+    defines = [ "CRC32_ARMV8_CRC32" ]
+    if (is_android) {
+      defines += [ "ARMV8_OS_ANDROID" ]
+    } else if (is_linux || is_chromeos) {
+      defines += [ "ARMV8_OS_LINUX" ]
+    } else if (is_mac) {
+      defines += [ "ARMV8_OS_MACOS" ]
+    } else if (is_ios) {
+      defines += [ "ARMV8_OS_IOS" ]
+    } else if (is_fuchsia) {
+      defines += [ "ARMV8_OS_FUCHSIA" ]
+    } else if (is_win) {
+      defines += [ "ARMV8_OS_WINDOWS" ]
+    } else {
+      assert(false, "Unsupported ARM OS")
+    }
+  }
+
+  source_set("zlib_arm_crc32") {
+    visibility = [ ":*" ]
+
+    include_dirs = [ "." ]
+
+    if (!is_win && !is_clang) {
+      assert(!use_thin_lto,
+             "ThinLTO fails mixing different module-level targets")
+      cflags_c = [ "-march=armv8-a+aes+crc" ]
+    }
+
+    sources = [
+      "crc32_simd.c",
+      "crc32_simd.h",
+    ]
+
+    configs += [ ":zlib_internal_config" ]
+
+    public_configs = [ ":zlib_arm_crc32_config" ]
+
+    public_deps = [ ":zlib_common_headers" ]
+  }
+}
+
+config("zlib_inflate_chunk_simd_config") {
+  if (use_x86_x64_optimizations) {
+    defines = [ "INFLATE_CHUNK_SIMD_SSE2" ]
+
+    if (current_cpu == "x64") {
+      defines += [ "INFLATE_CHUNK_READ_64LE" ]
+    }
+  }
+
+  if (use_arm_neon_optimizations) {
+    defines = [ "INFLATE_CHUNK_SIMD_NEON" ]
+
+    if (current_cpu == "arm64") {
+      defines += [ "INFLATE_CHUNK_READ_64LE" ]
+    }
+  }
+}
+
+source_set("zlib_inflate_chunk_simd") {
+  visibility = [ ":*" ]
+
+  if (use_x86_x64_optimizations || use_arm_neon_optimizations) {
+    include_dirs = [ "." ]
+
+    sources = [
+      "contrib/optimizations/chunkcopy.h",
+      "contrib/optimizations/inffast_chunk.c",
+      "contrib/optimizations/inffast_chunk.h",
+      "contrib/optimizations/inflate.c",
+    ]
+  }
+
+  configs += [ ":zlib_internal_config" ]
+
+  # Needed for MSVC, which is still supported by V8 and PDFium. zlib uses K&R C
+  # style function declarations, which triggers warning C4131.
+  configs -= [ "//build/config/compiler:chromium_code" ]
+  configs += [ "//build/config/compiler:no_chromium_code" ]
+  configs += [ ":zlib_warnings" ]
+
+  public_configs = [ ":zlib_inflate_chunk_simd_config" ]
+
+  public_deps = [ ":zlib_common_headers" ]
+}
+
+config("zlib_crc32_simd_config") {
+  if (use_x86_x64_optimizations) {
+    defines = [ "CRC32_SIMD_SSE42_PCLMUL" ]
+  }
+}
+
+source_set("zlib_crc32_simd") {
+  visibility = [ ":*" ]
+
+  if (use_x86_x64_optimizations) {
+    sources = [
+      "crc32_simd.c",
+      "crc32_simd.h",
       "crc_folding.c",
-      "fill_window_sse.c",
     ]
+
     if (!is_win || is_clang) {
       cflags = [
         "-msse4.2",
         "-mpclmul",
       ]
     }
-  } else {
-    sources = [
-      "simd_stub.c",
-    ]
   }
 
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [ "//build/config/compiler:no_chromium_code" ]
+  configs += [ ":zlib_internal_config" ]
+
+  public_configs = [ ":zlib_crc32_simd_config" ]
+
+  public_deps = [ ":zlib_common_headers" ]
+}
+
+config("zlib_slide_hash_simd_config") {
+  if (use_x86_x64_optimizations) {
+    defines = [ "DEFLATE_SLIDE_HASH_SSE2" ]
+  }
+
+  if (use_arm_neon_optimizations) {
+    defines = [ "DEFLATE_SLIDE_HASH_NEON" ]
+  }
+}
+
+source_set("zlib_slide_hash_simd") {
+  visibility = [ ":*" ]
+
+  if (use_x86_x64_optimizations) {
+    sources = [ "slide_hash_simd.h" ]
+  }
+
+  if (use_arm_neon_optimizations) {
+    sources = [ "slide_hash_simd.h" ]
+  }
+
+  configs += [ ":zlib_internal_config" ]
+
+  public_configs = [ ":zlib_slide_hash_simd_config" ]
+
+  public_deps = [ ":zlib_common_headers" ]
 }
 
 config("zlib_warnings") {
-  if (is_clang && !is_ios && (current_cpu == "x86" || current_cpu == "x64")) {
-    cflags = [ "-Wno-incompatible-pointer-types" ]
+  if (is_clang) {
+    cflags = [
+      "-Wno-deprecated-non-prototype",
+      "-Wno-incompatible-pointer-types",
+      "-Wunused-variable",
+    ]
   }
 }
 
-static_library("zlib") {
+component("zlib") {
   if (!is_win) {
     # Don't stomp on "libzlib" on other platforms.
     output_name = "chrome_zlib"
@@ -42,7 +288,11 @@ static_library("zlib") {
 
   sources = [
     "adler32.c",
+    "chromeconf.h",
     "compress.c",
+    "contrib/optimizations/insert_string.h",
+    "cpu_features.c",
+    "cpu_features.h",
     "crc32.c",
     "crc32.h",
     "deflate.c",
@@ -56,48 +306,90 @@ static_library("zlib") {
     "inffast.c",
     "inffast.h",
     "inffixed.h",
-    "inflate.c",
     "inflate.h",
     "inftrees.c",
     "inftrees.h",
-    "names.h",
     "trees.c",
     "trees.h",
     "uncompr.c",
-    "x86.h",
     "zconf.h",
     "zlib.h",
     "zutil.c",
     "zutil.h",
   ]
 
-  if (!is_ios && (current_cpu == "x86" || current_cpu == "x64")) {
-    sources += [ "x86.c" ]
+  defines = []
+  deps = []
+
+  if (!use_x86_x64_optimizations && !use_arm_neon_optimizations) {
+    # Apparently android_cronet bot builds with NEON disabled and
+    # we also should disable optimizations for iOS@x86 (a.k.a. simulator).
+    defines += [ "CPU_NO_SIMD" ]
+  }
+
+  if (use_x86_x64_optimizations || use_arm_neon_optimizations) {
+    deps += [
+      ":zlib_adler32_simd",
+      ":zlib_inflate_chunk_simd",
+      ":zlib_slide_hash_simd",
+    ]
+
+    if (use_x86_x64_optimizations) {
+      deps += [ ":zlib_crc32_simd" ]
+    } else if (use_arm_neon_optimizations) {
+      deps += [ ":zlib_arm_crc32" ]
+    }
+  } else {
+    sources += [ "inflate.c" ]
+  }
+
+  if (is_android) {
+    import("//build/config/android/config.gni")
+    if (defined(android_ndk_root) && android_ndk_root != "") {
+      deps += [ "//third_party/cpu_features:ndk_compat" ]
+    } else {
+      assert(false, "CPU detection requires the Android NDK")
+    }
   }
 
   configs -= [ "//build/config/compiler:chromium_code" ]
+  configs += [ "//build/config/compiler:no_chromium_code" ]
+
+  if (zlib_symbols_visible) {
+    configs -= [ "//build/config/gcc:symbol_visibility_hidden" ]
+    configs += [ "//build/config/gcc:symbol_visibility_default" ]
+  }
+
+  public_configs = [ ":zlib_config" ]
+
   configs += [
-    "//build/config/compiler:no_chromium_code",
+    ":zlib_internal_config",
 
     # Must be after no_chromium_code for warning flags to be ordered correctly.
     ":zlib_warnings",
   ]
 
-  public_configs = [ ":zlib_config" ]
-  deps = [
-    ":zlib_x86_simd",
-  ]
+  allow_circular_includes_from = deps
 }
 
 config("minizip_warnings") {
   visibility = [ ":*" ]
+
   if (is_clang) {
-    # zlib uses `if ((a == b))` for some reason.
-    cflags = [ "-Wno-parentheses-equality" ]
+    cflags = [
+      # zlib uses `if ((a == b))` for some reason.
+      "-Wno-parentheses-equality",
+      "-Wno-deprecated-non-prototype",
+    ]
   }
 }
 
 static_library("minizip") {
+  include_dirs = [
+    ".",
+    "//third_party/zlib",
+  ]
+
   sources = [
     "contrib/minizip/ioapi.c",
     "contrib/minizip/ioapi.h",
@@ -115,47 +407,126 @@ static_library("minizip") {
       "contrib/minizip/iowin32.h",
     ]
   }
-  if (is_mac || is_ios || is_android) {
+
+  if (is_apple || is_android || is_nacl) {
     # Mac, Android and the BSDs don't have fopen64, ftello64, or fseeko64. We
     # use fopen, ftell, and fseek instead on these systems.
     defines = [ "USE_FILE32API" ]
   }
 
-  deps = [
-    ":zlib",
-  ]
+  deps = [ ":zlib" ]
 
   configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [
-    "//build/config/compiler:no_chromium_code",
+  configs += [ "//build/config/compiler:no_chromium_code" ]
+
+  public_configs = [ ":zlib_config" ]
 
+  configs += [
     # Must be after no_chromium_code for warning flags to be ordered correctly.
     ":minizip_warnings",
   ]
-  public_configs = [ ":zlib_config" ]
 }
 
-static_library("zip") {
-  sources = [
-    "google/zip.cc",
-    "google/zip.h",
-    "google/zip_internal.cc",
-    "google/zip_internal.h",
-    "google/zip_reader.cc",
-    "google/zip_reader.h",
-  ]
-  deps = [
-    ":minizip",
-    "//base",
-  ]
+executable("zlib_bench") {
+  include_dirs = [ "." ]
+
+  sources = [ "contrib/bench/zlib_bench.cc" ]
+  if (!is_debug) {
+    configs -= [ "//build/config/compiler:default_optimization" ]
+    configs += [ "//build/config/compiler:optimize_speed" ]
+  }
+
+  deps = [ ":zlib" ]
+
+  configs -= [ "//build/config/compiler:chromium_code" ]
+  configs += [ "//build/config/compiler:no_chromium_code" ]
 }
 
-static_library("compression_utils") {
-  sources = [
-    "google/compression_utils.cc",
-    "google/compression_utils.h",
-  ]
-  deps = [
-    ":zlib",
-  ]
+if (!is_win || target_os != "winuwp") {
+  executable("minizip_bin") {
+    include_dirs = [ "." ]
+
+    sources = [ "contrib/minizip/minizip.c" ]
+
+    if (is_clang) {
+      cflags = [
+        "-Wno-incompatible-pointer-types-discards-qualifiers",
+
+        "-Wno-deprecated-non-prototype",
+      ]
+    }
+
+    if (!is_debug) {
+      configs -= [ "//build/config/compiler:default_optimization" ]
+      configs += [ "//build/config/compiler:optimize_speed" ]
+    }
+
+    deps = [ ":minizip" ]
+
+    configs -= [ "//build/config/compiler:chromium_code" ]
+    configs += [ "//build/config/compiler:no_chromium_code" ]
+  }
+
+  executable("miniunz_bin") {
+    include_dirs = [ "." ]
+
+    sources = [ "contrib/minizip/miniunz.c" ]
+
+    if (is_clang) {
+      cflags = [
+        "-Wno-incompatible-pointer-types-discards-qualifiers",
+        "-Wno-deprecated-non-prototype",
+      ]
+    }
+
+    if (!is_debug) {
+      configs -= [ "//build/config/compiler:default_optimization" ]
+      configs += [ "//build/config/compiler:optimize_speed" ]
+    }
+
+    deps = [ ":minizip" ]
+
+    configs -= [ "//build/config/compiler:chromium_code" ]
+    configs += [ "//build/config/compiler:no_chromium_code" ]
+  }
+}
+
+if (build_with_chromium) {
+  test("zlib_unittests") {
+    testonly = true
+
+    sources = [
+      "contrib/tests/infcover.cc",
+      "contrib/tests/infcover.h",
+      "contrib/tests/run_all_unittests.cc",
+      "contrib/tests/utils_unittest.cc",
+      "google/compression_utils_unittest.cc",
+      "google/zip_reader_unittest.cc",
+      "google/zip_unittest.cc",
+    ]
+
+    data = [ "google/test/data/" ]
+
+    if (is_ios) {
+      bundle_deps = [ "google:zlib_pak_bundle_data" ]
+    }
+
+    deps = [
+      ":minizip",
+      ":zlib",
+      "google:compression_utils",
+      "google:zip",
+      "//base/test:test_support",
+      "//testing/gtest",
+    ]
+
+    configs -= [ "//build/config/compiler:chromium_code" ]
+    configs += [ "//build/config/compiler:no_chromium_code" ]
+
+    include_dirs = [
+      "//third_party/googletest/src/googletest/include/gtest",
+      ".",
+      "google",
+    ]
+  }
 }
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/CMakeLists.txt b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/CMakeLists.txt
new file mode 100644
index 000000000..234eab8db
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/CMakeLists.txt
@@ -0,0 +1,307 @@
+cmake_minimum_required(VERSION 3.0)
+set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
+
+project(zlib C)
+
+set(VERSION "1.2.13.1")
+
+set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
+set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
+set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers")
+set(INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Installation directory for manual pages")
+set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/share/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files")
+
+include(CheckTypeSize)
+include(CheckFunctionExists)
+include(CheckIncludeFile)
+include(CheckCSourceCompiles)
+enable_testing()
+
+check_include_file(sys/types.h HAVE_SYS_TYPES_H)
+check_include_file(stdint.h    HAVE_STDINT_H)
+check_include_file(stddef.h    HAVE_STDDEF_H)
+
+option(ENABLE_SIMD_OPTIMIZATIONS "Enable all SIMD optimizations" OFF)
+option(ENABLE_SIMD_AVX512 "Enable SIMD AXV512 optimizations" OFF)
+option(USE_ZLIB_RABIN_KARP_HASH "Enable bitstream compatibility with canonical zlib" OFF)
+option(BUILD_UNITTESTS "Enable standalone unit tests build" OFF)
+
+if (USE_ZLIB_RABIN_KARP_HASH)
+   add_definitions(-DUSE_ZLIB_RABIN_KARP_ROLLING_HASH)
+endif()
+
+# TODO(cavalcantii): add support for other OSes (e.g. Android, fuchsia, osx)
+# and architectures (e.g. Arm).
+if (ENABLE_SIMD_OPTIMIZATIONS)
+   add_definitions(-DINFLATE_CHUNK_SIMD_SSE2)
+   add_definitions(-DADLER32_SIMD_SSSE3)
+   add_definitions(-DINFLATE_CHUNK_READ_64LE)
+   add_definitions(-DCRC32_SIMD_SSE42_PCLMUL)
+   if (ENABLE_SIMD_AVX512)
+    add_definitions(-DCRC32_SIMD_AVX512_PCLMUL)
+    add_compile_options(-mvpclmulqdq -msse2 -mavx512f -mpclmul)
+   else()
+    add_compile_options(-msse4.2 -mpclmul)
+   endif()
+   add_definitions(-DDEFLATE_SLIDE_HASH_SSE2)
+   # Required by CPU features detection code.
+   add_definitions(-DX86_NOT_WINDOWS)
+   # Apparently some environments (e.g. CentOS) require to explicitly link
+   # with pthread and that is required by the CPU features detection code.
+   find_package (Threads REQUIRED)
+   SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread")
+   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
+endif()
+
+#
+# Check to see if we have large file support
+#
+set(CMAKE_REQUIRED_DEFINITIONS -D_LARGEFILE64_SOURCE=1)
+# We add these other definitions here because CheckTypeSize.cmake
+# in CMake 2.4.x does not automatically do so and we want
+# compatibility with CMake 2.4.x.
+if(HAVE_SYS_TYPES_H)
+    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_SYS_TYPES_H)
+endif()
+if(HAVE_STDINT_H)
+    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDINT_H)
+endif()
+if(HAVE_STDDEF_H)
+    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDDEF_H)
+endif()
+check_type_size(off64_t OFF64_T)
+if(HAVE_OFF64_T)
+   add_definitions(-D_LARGEFILE64_SOURCE=1)
+endif()
+set(CMAKE_REQUIRED_DEFINITIONS) # clear variable
+
+#
+# Check for fseeko
+#
+check_function_exists(fseeko HAVE_FSEEKO)
+if(NOT HAVE_FSEEKO)
+    add_definitions(-DNO_FSEEKO)
+endif()
+
+#
+# Check for unistd.h
+#
+check_include_file(unistd.h Z_HAVE_UNISTD_H)
+
+if(MSVC)
+    set(CMAKE_DEBUG_POSTFIX "d")
+    add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
+    add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
+    include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+endif()
+
+if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
+    # If we're doing an out of source build and the user has a zconf.h
+    # in their source tree...
+    if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h)
+        message(STATUS "Renaming")
+        message(STATUS "    ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h")
+        message(STATUS "to 'zconf.h.included' because this file is included with zlib")
+        message(STATUS "but CMake generates it automatically in the build directory.")
+        file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.included)
+  endif()
+endif()
+
+set(ZLIB_PC ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc)
+configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmakein
+		${ZLIB_PC} @ONLY)
+configure_file(	${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.cmakein
+		${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY)
+include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR})
+
+
+#============================================================================
+# zlib
+#============================================================================
+
+set(ZLIB_PUBLIC_HDRS
+    ${CMAKE_CURRENT_BINARY_DIR}/zconf.h
+    zlib.h
+)
+set(ZLIB_PRIVATE_HDRS
+    crc32.h
+    deflate.h
+    gzguts.h
+    inffast.h
+    inffixed.h
+    inflate.h
+    inftrees.h
+    trees.h
+    zutil.h
+)
+set(ZLIB_SRCS
+    adler32.c
+    compress.c
+    crc32.c
+    deflate.c
+    gzclose.c
+    gzlib.c
+    gzread.c
+    gzwrite.c
+    inflate.c
+    infback.c
+    inftrees.c
+    inffast.c
+    trees.c
+    uncompr.c
+    zutil.c
+)
+
+
+#============================================================================
+# Update list of source files if optimizations were enabled
+#============================================================================
+if (ENABLE_SIMD_OPTIMIZATIONS)
+  list(REMOVE_ITEM ZLIB_SRCS inflate.c)
+
+  list(APPEND ZLIB_PRIVATE_HDRS ${CMAKE_CURRENT_SOURCE_DIR}/adler32_simd.h)
+  list(APPEND ZLIB_PRIVATE_HDRS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/optimizations/chunkcopy.h)
+  list(APPEND ZLIB_PRIVATE_HDRS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/optimizations/inffast_chunk.h)
+  list(APPEND ZLIB_PRIVATE_HDRS ${CMAKE_CURRENT_SOURCE_DIR}/cpu_features.h)
+  list(APPEND ZLIB_PRIVATE_HDRS ${CMAKE_CURRENT_SOURCE_DIR}/crc32_simd.h)
+
+  list(APPEND ZLIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/adler32_simd.c)
+  list(APPEND ZLIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/optimizations/inffast_chunk.c)
+  list(APPEND ZLIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/optimizations/inflate.c)
+  list(APPEND ZLIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/cpu_features.c)
+  list(APPEND ZLIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/crc32_simd.c)
+  list(APPEND ZLIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/crc_folding.c)
+endif()
+
+# parse the full version number from zlib.h and include in ZLIB_FULL_VERSION
+file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents)
+string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*"
+    "\\1" ZLIB_FULL_VERSION ${_zlib_h_contents})
+
+if(MINGW)
+    # This gets us DLL resource information when compiling on MinGW.
+    if(NOT CMAKE_RC_COMPILER)
+        set(CMAKE_RC_COMPILER windres.exe)
+    endif()
+
+    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
+                       COMMAND ${CMAKE_RC_COMPILER}
+                            -D GCC_WINDRES
+                            -I ${CMAKE_CURRENT_SOURCE_DIR}
+                            -I ${CMAKE_CURRENT_BINARY_DIR}
+                            -o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
+                            -i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc)
+    set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
+endif(MINGW)
+
+add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
+set_target_properties(zlib PROPERTIES SOVERSION 1)
+
+if(NOT CYGWIN)
+    # This property causes shared libraries on Linux to have the full version
+    # encoded into their final filename.  We disable this on Cygwin because
+    # it causes cygz-${ZLIB_FULL_VERSION}.dll to be created when cygz.dll
+    # seems to be the default.
+    #
+    # This has no effect with MSVC, on that platform the version info for
+    # the DLL comes from the resource file win32/zlib1.rc
+    set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION})
+endif()
+
+if(UNIX)
+    # On unix-like platforms the library is almost always called libz
+   set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
+   if(NOT APPLE)
+     set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")
+   endif()
+elseif(BUILD_SHARED_LIBS AND WIN32)
+    # Creates zlib1.dll when building shared library version
+    set_target_properties(zlib PROPERTIES SUFFIX "1.dll")
+endif()
+
+if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
+    install(TARGETS zlib zlibstatic
+        RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
+        ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
+        LIBRARY DESTINATION "${INSTALL_LIB_DIR}" )
+endif()
+if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL )
+    install(FILES ${ZLIB_PUBLIC_HDRS} DESTINATION "${INSTALL_INC_DIR}")
+endif()
+if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
+    install(FILES zlib.3 DESTINATION "${INSTALL_MAN_DIR}/man3")
+endif()
+if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
+    install(FILES ${ZLIB_PC} DESTINATION "${INSTALL_PKGCONFIG_DIR}")
+endif()
+
+#============================================================================
+# Benchmarker
+#============================================================================
+enable_language(CXX)
+set(CMAKE_CXX_STANDARD 14) # workaround for older compilers (e.g. g++ 5.4).
+add_executable(zlib_bench contrib/bench/zlib_bench.cc)
+target_link_libraries(zlib_bench zlib)
+
+#============================================================================
+# Unit Tests
+#============================================================================
+if (BUILD_UNITTESTS)
+    include (ExternalProject)
+    set_directory_properties(PROPERTIES EP_PREFIX ${CMAKE_BINARY_DIR}/third_party)
+    ExternalProject_add(
+        googletest
+        GIT_REPOSITORY https://github.com/google/googletest.git
+        GIT_TAG d1467f5813f4d363cfd11aba99c4e9fe47a85e99
+        UPDATE_COMMAND ""
+        INSTALL_COMMAND ""
+        LOG_DOWNLOAD ON
+        LOG_CONFIGURE ON
+        LOG_BUILD ON
+    )
+
+    # gtest includedir
+    ExternalProject_Get_Property(googletest source_dir)
+    set(GTEST_INCLUDE_DIRS
+        ${source_dir}/googletest/include
+        ${source_dir}/googletest/include/gtest
+    )
+
+    # gtest library
+    ExternalProject_Get_Property(googletest binary_dir)
+    set(GTEST_LIBRARY_PATH ${binary_dir}/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gtest.a)
+    set(GTEST_LIBRARY gtest)
+    add_library(${GTEST_LIBRARY} UNKNOWN IMPORTED)
+    set_property(TARGET ${GTEST_LIBRARY} PROPERTY IMPORTED_LOCATION ${GTEST_LIBRARY_PATH})
+    add_dependencies(${GTEST_LIBRARY} googletest)
+
+    set(UTEST_SRC
+        ${CMAKE_CURRENT_SOURCE_DIR}/contrib/tests/infcover.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/contrib/tests/infcover.h
+        ${CMAKE_CURRENT_SOURCE_DIR}/contrib/tests/utils_unittest.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/contrib/tests/standalone_test_runner.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/google/compression_utils_portable.cc
+    )
+
+    add_compile_definitions(CMAKE_STANDALONE_UNITTESTS)
+
+    add_executable(zlib_unittests ${UTEST_SRC})
+    target_include_directories(zlib_unittests PUBLIC ${GTEST_INCLUDE_DIRS})
+    target_include_directories(zlib_unittests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/google)
+
+    target_link_libraries(zlib_unittests ${GTEST_LIBRARY})
+    target_link_libraries(zlib_unittests zlib)
+    # Needed by gtest
+    target_link_libraries(zlib_unittests pthread)
+endif()
+
+#============================================================================
+# Minigzip tool
+#============================================================================
+add_executable(minizip_bin contrib/minizip/minizip.c contrib/minizip/ioapi.c
+contrib/minizip/ioapi.h contrib/minizip/unzip.c
+contrib/minizip/unzip.h contrib/minizip/zip.c contrib/minizip/zip.h
+)
+target_link_libraries(minizip_bin zlib)
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/DIR_METADATA b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/DIR_METADATA
new file mode 100644
index 000000000..d366dc732
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail: {
+  component: "Internals"
+}
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/LICENSE b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/LICENSE
index 9f056865b..8aca25d8c 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/LICENSE
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/LICENSE
@@ -1,6 +1,6 @@
-version 1.2.11, January 15th, 2017
+version 1.2.12, March 27th, 2022
 
-Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
 
 This software is provided 'as-is', without any express or implied
 warranty.  In no event will the authors be held liable for any damages
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/OWNERS b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/OWNERS
index 6adf9fc8d..3a821578a 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/OWNERS
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/OWNERS
@@ -1,3 +1,4 @@
 agl@chromium.org
-gavinp@chromium.org
-msarett@chromium.org
+cavalcantii@chromium.org
+cblume@chromium.org
+scroggo@google.com
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/README.chromium b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/README.chromium
index fe6bc105d..1dfb99666 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/README.chromium
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/README.chromium
@@ -1,9 +1,11 @@
 Name: zlib
 Short Name: zlib
 URL: http://zlib.net/
-Version: 1.2.11
+Version: 1.2.13
+CPEPrefix: cpe:/a:zlib:zlib:1.2.13
 Security Critical: yes
-License: Custom license
+Shipped: yes
+License: Zlib
 License File: LICENSE
 License Android Compatible: yes
 
@@ -22,7 +24,10 @@ Local Modifications:
    imported.
  - The contents of the google directory are original Chromium-specific
    additions.
- - google.patch contains changes from the upstream version, mostly related to
-   the build.
- - Intel SIMD optimisations from https://github.com/jtkukunas/zlib/ have been
-   integrated. These changes are reflected in simd.patch.
+ - Added chromeconf.h
+ - Plus the changes in 'patches' folder.
+ - Code in contrib/ other than contrib/minizip was added to match zlib's
+   contributor layout.
+ - In sync with 1.2.13 official release
+ - ZIP reader modified to allow for progress callbacks during extraction.
+ - ZIP reader modified to add detection of AES encrypted content.
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/adler32.c b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/adler32.c
index d0be4380a..99a294496 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/adler32.c
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/adler32.c
@@ -7,8 +7,6 @@
 
 #include "zutil.h"
 
-local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
-
 #define BASE 65521U     /* largest prime smaller than 65536 */
 #define NMAX 5552
 /* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
@@ -59,15 +57,24 @@ local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
 #  define MOD63(a) a %= BASE
 #endif
 
+#include "cpu_features.h"
+#if defined(ADLER32_SIMD_SSSE3) || defined(ADLER32_SIMD_NEON)
+#include "adler32_simd.h"
+#endif
+
 /* ========================================================================= */
-uLong ZEXPORT adler32_z(adler, buf, len)
-    uLong adler;
-    const Bytef *buf;
-    z_size_t len;
-{
+uLong ZEXPORT adler32_z(uLong adler, const Bytef *buf, z_size_t len) {
     unsigned long sum2;
     unsigned n;
 
+#if defined(ADLER32_SIMD_SSSE3)
+    if (buf != Z_NULL && len >= 64 && x86_cpu_enable_ssse3)
+        return adler32_simd_(adler, buf, len);
+#elif defined(ADLER32_SIMD_NEON)
+    if (buf != Z_NULL && len >= 64)
+        return adler32_simd_(adler, buf, len);
+#endif
+
     /* split Adler-32 into component sums */
     sum2 = (adler >> 16) & 0xffff;
     adler &= 0xffff;
@@ -83,9 +90,24 @@ uLong ZEXPORT adler32_z(adler, buf, len)
         return adler | (sum2 << 16);
     }
 
+#if defined(ADLER32_SIMD_SSSE3) || defined(ADLER32_SIMD_NEON)
+    /*
+     * Use SIMD to compute the adler32. Since this function can be
+     * freely used, check CPU features here. zlib convention is to
+     * call adler32(0, NULL, 0), before making calls to adler32().
+     * So this is a good early (and infrequent) place to cache CPU
+     * features for those later, more interesting adler32() calls.
+     */
+    if (buf == Z_NULL) {
+        if (!len) /* Assume user is calling adler32(0, NULL, 0); */
+            cpu_check_features();
+        return 1L;
+    }
+#else
     /* initial Adler-32 value (deferred check for len == 1 speed) */
     if (buf == Z_NULL)
         return 1L;
+#endif
 
     /* in case short lengths are provided, keep it somewhat fast */
     if (len < 16) {
@@ -131,20 +153,12 @@ uLong ZEXPORT adler32_z(adler, buf, len)
 }
 
 /* ========================================================================= */
-uLong ZEXPORT adler32(adler, buf, len)
-    uLong adler;
-    const Bytef *buf;
-    uInt len;
-{
+uLong ZEXPORT adler32(uLong adler, const Bytef *buf, uInt len) {
     return adler32_z(adler, buf, len);
 }
 
 /* ========================================================================= */
-local uLong adler32_combine_(adler1, adler2, len2)
-    uLong adler1;
-    uLong adler2;
-    z_off64_t len2;
-{
+local uLong adler32_combine_(uLong adler1, uLong adler2, z_off64_t len2) {
     unsigned long sum1;
     unsigned long sum2;
     unsigned rem;
@@ -169,18 +183,10 @@ local uLong adler32_combine_(adler1, adler2, len2)
 }
 
 /* ========================================================================= */
-uLong ZEXPORT adler32_combine(adler1, adler2, len2)
-    uLong adler1;
-    uLong adler2;
-    z_off_t len2;
-{
+uLong ZEXPORT adler32_combine(uLong adler1, uLong adler2, z_off_t len2) {
     return adler32_combine_(adler1, adler2, len2);
 }
 
-uLong ZEXPORT adler32_combine64(adler1, adler2, len2)
-    uLong adler1;
-    uLong adler2;
-    z_off64_t len2;
-{
+uLong ZEXPORT adler32_combine64(uLong adler1, uLong adler2, z_off64_t len2) {
     return adler32_combine_(adler1, adler2, len2);
 }
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/adler32_simd.c b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/adler32_simd.c
new file mode 100644
index 000000000..58966eecf
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/adler32_simd.c
@@ -0,0 +1,366 @@
+/* adler32_simd.c
+ *
+ * Copyright 2017 The Chromium Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the Chromium source repository LICENSE file.
+ *
+ * Per http://en.wikipedia.org/wiki/Adler-32 the adler32 A value (aka s1) is
+ * the sum of N input data bytes D1 ... DN,
+ *
+ *   A = A0 + D1 + D2 + ... + DN
+ *
+ * where A0 is the initial value.
+ *
+ * SSE2 _mm_sad_epu8() can be used for byte sums (see http://bit.ly/2wpUOeD,
+ * for example) and accumulating the byte sums can use SSE shuffle-adds (see
+ * the "Integer" section of http://bit.ly/2erPT8t for details). Arm NEON has
+ * similar instructions.
+ *
+ * The adler32 B value (aka s2) sums the A values from each step:
+ *
+ *   B0 + (A0 + D1) + (A0 + D1 + D2) + ... + (A0 + D1 + D2 + ... + DN) or
+ *
+ *       B0 + N.A0 + N.D1 + (N-1).D2 + (N-2).D3 + ... + (N-(N-1)).DN
+ *
+ * B0 being the initial value. For 32 bytes (ideal for garden-variety SIMD):
+ *
+ *   B = B0 + 32.A0 + [D1 D2 D3 ... D32] x [32 31 30 ... 1].
+ *
+ * Adjacent blocks of 32 input bytes can be iterated with the expressions to
+ * compute the adler32 s1 s2 of M >> 32 input bytes [1].
+ *
+ * As M grows, the s1 s2 sums grow. If left unchecked, they would eventually
+ * overflow the precision of their integer representation (bad). However, s1
+ * and s2 also need to be computed modulo the adler BASE value (reduced). If
+ * at most NMAX bytes are processed before a reduce, s1 s2 _cannot_ overflow
+ * a uint32_t type (the NMAX constraint) [2].
+ *
+ * [1] the iterative equations for s2 contain constant factors; these can be
+ * hoisted from the n-blocks do loop of the SIMD code.
+ *
+ * [2] zlib adler32_z() uses this fact to implement NMAX-block-based updates
+ * of the adler s1 s2 of uint32_t type (see adler32.c).
+ */
+
+#include "adler32_simd.h"
+
+/* Definitions from adler32.c: largest prime smaller than 65536 */
+#define BASE 65521U
+/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
+#define NMAX 5552
+
+#if defined(ADLER32_SIMD_SSSE3)
+
+#include <tmmintrin.h>
+
+uint32_t ZLIB_INTERNAL adler32_simd_(  /* SSSE3 */
+    uint32_t adler,
+    const unsigned char *buf,
+    z_size_t len)
+{
+    /*
+     * Split Adler-32 into component sums.
+     */
+    uint32_t s1 = adler & 0xffff;
+    uint32_t s2 = adler >> 16;
+
+    /*
+     * Process the data in blocks.
+     */
+    const unsigned BLOCK_SIZE = 1 << 5;
+
+    z_size_t blocks = len / BLOCK_SIZE;
+    len -= blocks * BLOCK_SIZE;
+
+    while (blocks)
+    {
+        unsigned n = NMAX / BLOCK_SIZE;  /* The NMAX constraint. */
+        if (n > blocks)
+            n = (unsigned) blocks;
+        blocks -= n;
+
+        const __m128i tap1 =
+            _mm_setr_epi8(32,31,30,29,28,27,26,25,24,23,22,21,20,19,18,17);
+        const __m128i tap2 =
+            _mm_setr_epi8(16,15,14,13,12,11,10, 9, 8, 7, 6, 5, 4, 3, 2, 1);
+        const __m128i zero =
+            _mm_setr_epi8( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+        const __m128i ones =
+            _mm_set_epi16( 1, 1, 1, 1, 1, 1, 1, 1);
+
+        /*
+         * Process n blocks of data. At most NMAX data bytes can be
+         * processed before s2 must be reduced modulo BASE.
+         */
+        __m128i v_ps = _mm_set_epi32(0, 0, 0, s1 * n);
+        __m128i v_s2 = _mm_set_epi32(0, 0, 0, s2);
+        __m128i v_s1 = _mm_set_epi32(0, 0, 0, 0);
+
+        do {
+            /*
+             * Load 32 input bytes.
+             */
+            const __m128i bytes1 = _mm_loadu_si128((__m128i*)(buf));
+            const __m128i bytes2 = _mm_loadu_si128((__m128i*)(buf + 16));
+
+            /*
+             * Add previous block byte sum to v_ps.
+             */
+            v_ps = _mm_add_epi32(v_ps, v_s1);
+
+            /*
+             * Horizontally add the bytes for s1, multiply-adds the
+             * bytes by [ 32, 31, 30, ... ] for s2.
+             */
+            v_s1 = _mm_add_epi32(v_s1, _mm_sad_epu8(bytes1, zero));
+            const __m128i mad1 = _mm_maddubs_epi16(bytes1, tap1);
+            v_s2 = _mm_add_epi32(v_s2, _mm_madd_epi16(mad1, ones));
+
+            v_s1 = _mm_add_epi32(v_s1, _mm_sad_epu8(bytes2, zero));
+            const __m128i mad2 = _mm_maddubs_epi16(bytes2, tap2);
+            v_s2 = _mm_add_epi32(v_s2, _mm_madd_epi16(mad2, ones));
+
+            buf += BLOCK_SIZE;
+
+        } while (--n);
+
+        v_s2 = _mm_add_epi32(v_s2, _mm_slli_epi32(v_ps, 5));
+
+        /*
+         * Sum epi32 ints v_s1(s2) and accumulate in s1(s2).
+         */
+
+#define S23O1 _MM_SHUFFLE(2,3,0,1)  /* A B C D -> B A D C */
+#define S1O32 _MM_SHUFFLE(1,0,3,2)  /* A B C D -> C D A B */
+
+        v_s1 = _mm_add_epi32(v_s1, _mm_shuffle_epi32(v_s1, S23O1));
+        v_s1 = _mm_add_epi32(v_s1, _mm_shuffle_epi32(v_s1, S1O32));
+
+        s1 += _mm_cvtsi128_si32(v_s1);
+
+        v_s2 = _mm_add_epi32(v_s2, _mm_shuffle_epi32(v_s2, S23O1));
+        v_s2 = _mm_add_epi32(v_s2, _mm_shuffle_epi32(v_s2, S1O32));
+
+        s2 = _mm_cvtsi128_si32(v_s2);
+
+#undef S23O1
+#undef S1O32
+
+        /*
+         * Reduce.
+         */
+        s1 %= BASE;
+        s2 %= BASE;
+    }
+
+    /*
+     * Handle leftover data.
+     */
+    if (len) {
+        if (len >= 16) {
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+
+            len -= 16;
+        }
+
+        while (len--) {
+            s2 += (s1 += *buf++);
+        }
+
+        if (s1 >= BASE)
+            s1 -= BASE;
+        s2 %= BASE;
+    }
+
+    /*
+     * Return the recombined sums.
+     */
+    return s1 | (s2 << 16);
+}
+
+#elif defined(ADLER32_SIMD_NEON)
+
+#include <arm_neon.h>
+
+uint32_t ZLIB_INTERNAL adler32_simd_(  /* NEON */
+    uint32_t adler,
+    const unsigned char *buf,
+    z_size_t len)
+{
+    /*
+     * Split Adler-32 into component sums.
+     */
+    uint32_t s1 = adler & 0xffff;
+    uint32_t s2 = adler >> 16;
+
+    /*
+     * Serially compute s1 & s2, until the data is 16-byte aligned.
+     */
+    if ((uintptr_t)buf & 15) {
+        while ((uintptr_t)buf & 15) {
+            s2 += (s1 += *buf++);
+            --len;
+        }
+
+        if (s1 >= BASE)
+            s1 -= BASE;
+        s2 %= BASE;
+    }
+
+    /*
+     * Process the data in blocks.
+     */
+    const unsigned BLOCK_SIZE = 1 << 5;
+
+    z_size_t blocks = len / BLOCK_SIZE;
+    len -= blocks * BLOCK_SIZE;
+
+    while (blocks)
+    {
+        unsigned n = NMAX / BLOCK_SIZE;  /* The NMAX constraint. */
+        if (n > blocks)
+            n = (unsigned) blocks;
+        blocks -= n;
+
+        /*
+         * Process n blocks of data. At most NMAX data bytes can be
+         * processed before s2 must be reduced modulo BASE.
+         */
+        uint32x4_t v_s2 = (uint32x4_t) { 0, 0, 0, s1 * n };
+        uint32x4_t v_s1 = (uint32x4_t) { 0, 0, 0, 0 };
+
+        uint16x8_t v_column_sum_1 = vdupq_n_u16(0);
+        uint16x8_t v_column_sum_2 = vdupq_n_u16(0);
+        uint16x8_t v_column_sum_3 = vdupq_n_u16(0);
+        uint16x8_t v_column_sum_4 = vdupq_n_u16(0);
+
+        do {
+            /*
+             * Load 32 input bytes.
+             */
+            const uint8x16_t bytes1 = vld1q_u8((uint8_t*)(buf));
+            const uint8x16_t bytes2 = vld1q_u8((uint8_t*)(buf + 16));
+
+            /*
+             * Add previous block byte sum to v_s2.
+             */
+            v_s2 = vaddq_u32(v_s2, v_s1);
+
+            /*
+             * Horizontally add the bytes for s1.
+             */
+            v_s1 = vpadalq_u16(v_s1, vpadalq_u8(vpaddlq_u8(bytes1), bytes2));
+
+            /*
+             * Vertically add the bytes for s2.
+             */
+            v_column_sum_1 = vaddw_u8(v_column_sum_1, vget_low_u8 (bytes1));
+            v_column_sum_2 = vaddw_u8(v_column_sum_2, vget_high_u8(bytes1));
+            v_column_sum_3 = vaddw_u8(v_column_sum_3, vget_low_u8 (bytes2));
+            v_column_sum_4 = vaddw_u8(v_column_sum_4, vget_high_u8(bytes2));
+
+            buf += BLOCK_SIZE;
+
+        } while (--n);
+
+        v_s2 = vshlq_n_u32(v_s2, 5);
+
+        /*
+         * Multiply-add bytes by [ 32, 31, 30, ... ] for s2.
+         */
+        v_s2 = vmlal_u16(v_s2, vget_low_u16 (v_column_sum_1),
+            (uint16x4_t) { 32, 31, 30, 29 });
+        v_s2 = vmlal_u16(v_s2, vget_high_u16(v_column_sum_1),
+            (uint16x4_t) { 28, 27, 26, 25 });
+        v_s2 = vmlal_u16(v_s2, vget_low_u16 (v_column_sum_2),
+            (uint16x4_t) { 24, 23, 22, 21 });
+        v_s2 = vmlal_u16(v_s2, vget_high_u16(v_column_sum_2),
+            (uint16x4_t) { 20, 19, 18, 17 });
+        v_s2 = vmlal_u16(v_s2, vget_low_u16 (v_column_sum_3),
+            (uint16x4_t) { 16, 15, 14, 13 });
+        v_s2 = vmlal_u16(v_s2, vget_high_u16(v_column_sum_3),
+            (uint16x4_t) { 12, 11, 10,  9 });
+        v_s2 = vmlal_u16(v_s2, vget_low_u16 (v_column_sum_4),
+            (uint16x4_t) {  8,  7,  6,  5 });
+        v_s2 = vmlal_u16(v_s2, vget_high_u16(v_column_sum_4),
+            (uint16x4_t) {  4,  3,  2,  1 });
+
+        /*
+         * Sum epi32 ints v_s1(s2) and accumulate in s1(s2).
+         */
+        uint32x2_t sum1 = vpadd_u32(vget_low_u32(v_s1), vget_high_u32(v_s1));
+        uint32x2_t sum2 = vpadd_u32(vget_low_u32(v_s2), vget_high_u32(v_s2));
+        uint32x2_t s1s2 = vpadd_u32(sum1, sum2);
+
+        s1 += vget_lane_u32(s1s2, 0);
+        s2 += vget_lane_u32(s1s2, 1);
+
+        /*
+         * Reduce.
+         */
+        s1 %= BASE;
+        s2 %= BASE;
+    }
+
+    /*
+     * Handle leftover data.
+     */
+    if (len) {
+        if (len >= 16) {
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+            s2 += (s1 += *buf++);
+
+            len -= 16;
+        }
+
+        while (len--) {
+            s2 += (s1 += *buf++);
+        }
+
+        if (s1 >= BASE)
+            s1 -= BASE;
+        s2 %= BASE;
+    }
+
+    /*
+     * Return the recombined sums.
+     */
+    return s1 | (s2 << 16);
+}
+
+#endif  /* ADLER32_SIMD_SSSE3 */
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/adler32_simd.h b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/adler32_simd.h
new file mode 100644
index 000000000..0b2361a51
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/adler32_simd.h
@@ -0,0 +1,16 @@
+/* adler32_simd.h
+ *
+ * Copyright 2017 The Chromium Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the Chromium source repository LICENSE file.
+ */
+
+#include <stdint.h>
+
+#include "zconf.h"
+#include "zutil.h"
+
+uint32_t ZLIB_INTERNAL adler32_simd_(
+    uint32_t adler,
+    const unsigned char *buf,
+    z_size_t len);
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/chromeconf.h b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/chromeconf.h
new file mode 100644
index 000000000..5b91c8644
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/chromeconf.h
@@ -0,0 +1,203 @@
+/* Copyright 2017 The Chromium Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file. */
+
+#ifndef THIRD_PARTY_ZLIB_CHROMECONF_H_
+#define THIRD_PARTY_ZLIB_CHROMECONF_H_
+
+#if defined(COMPONENT_BUILD)
+#if defined(WIN32)
+#if defined(ZLIB_IMPLEMENTATION)
+#define ZEXTERN __declspec(dllexport)
+#else
+#define ZEXTERN __declspec(dllimport)
+#endif
+#elif defined(ZLIB_IMPLEMENTATION)
+#define ZEXTERN __attribute__((visibility("default")))
+#endif
+#endif
+
+/* Rename all zlib names with a Cr_z_ prefix. This is based on the Z_PREFIX
+ * option from zconf.h, but with a custom prefix. Where zconf.h would rename
+ * both a macro and its underscore-suffixed internal implementation (such as
+ * deflateInit2 and deflateInit2_), only the implementation is renamed here.
+ * The Byte type is also omitted.
+ *
+ * To generate this list, run
+ * sed -rn -e 's/^# *define +([^ ]+) +(z_[^ ]+)$/#define \1 Cr_\2/p' zconf.h
+ * (use -E instead of -r on macOS).
+ *
+ * gzread is also addressed by modifications in gzread.c and zlib.h. */
+
+#define Z_CR_PREFIX_SET
+
+#define _dist_code Cr_z__dist_code
+#define _length_code Cr_z__length_code
+#define _tr_align Cr_z__tr_align
+#define _tr_flush_bits Cr_z__tr_flush_bits
+#define _tr_flush_block Cr_z__tr_flush_block
+#define _tr_init Cr_z__tr_init
+#define _tr_stored_block Cr_z__tr_stored_block
+#define _tr_tally Cr_z__tr_tally
+#define adler32 Cr_z_adler32
+#define adler32_combine Cr_z_adler32_combine
+#define adler32_combine64 Cr_z_adler32_combine64
+#define adler32_z Cr_z_adler32_z
+#define compress Cr_z_compress
+#define compress2 Cr_z_compress2
+#define compressBound Cr_z_compressBound
+#define crc32 Cr_z_crc32
+#define crc32_combine Cr_z_crc32_combine
+#define crc32_combine64 Cr_z_crc32_combine64
+#define crc32_combine_gen64 Cr_z_crc32_combine_gen64
+#define crc32_combine_gen Cr_z_crc32_combine_gen
+#define crc32_combine_op Cr_z_crc32_combine_op
+#define crc32_z Cr_z_crc32_z
+#define deflate Cr_z_deflate
+#define deflateBound Cr_z_deflateBound
+#define deflateCopy Cr_z_deflateCopy
+#define deflateEnd Cr_z_deflateEnd
+#define deflateGetDictionary Cr_z_deflateGetDictionary
+/* #undef deflateInit */
+/* #undef deflateInit2 */
+#define deflateInit2_ Cr_z_deflateInit2_
+#define deflateInit_ Cr_z_deflateInit_
+#define deflateParams Cr_z_deflateParams
+#define deflatePending Cr_z_deflatePending
+#define deflatePrime Cr_z_deflatePrime
+#define deflateReset Cr_z_deflateReset
+#define deflateResetKeep Cr_z_deflateResetKeep
+#define deflateSetDictionary Cr_z_deflateSetDictionary
+#define deflateSetHeader Cr_z_deflateSetHeader
+#define deflateTune Cr_z_deflateTune
+#define deflate_copyright Cr_z_deflate_copyright
+#define get_crc_table Cr_z_get_crc_table
+#define gz_error Cr_z_gz_error
+#define gz_intmax Cr_z_gz_intmax
+#define gz_strwinerror Cr_z_gz_strwinerror
+#define gzbuffer Cr_z_gzbuffer
+#define gzclearerr Cr_z_gzclearerr
+#define gzclose Cr_z_gzclose
+#define gzclose_r Cr_z_gzclose_r
+#define gzclose_w Cr_z_gzclose_w
+#define gzdirect Cr_z_gzdirect
+#define gzdopen Cr_z_gzdopen
+#define gzeof Cr_z_gzeof
+#define gzerror Cr_z_gzerror
+#define gzflush Cr_z_gzflush
+#define gzfread Cr_z_gzfread
+#define gzfwrite Cr_z_gzfwrite
+#define gzgetc Cr_z_gzgetc
+#define gzgetc_ Cr_z_gzgetc_
+#define gzgets Cr_z_gzgets
+#define gzoffset Cr_z_gzoffset
+#define gzoffset64 Cr_z_gzoffset64
+#define gzopen Cr_z_gzopen
+#define gzopen64 Cr_z_gzopen64
+#define gzopen_w Cr_z_gzopen_w
+#define gzprintf Cr_z_gzprintf
+#define gzputc Cr_z_gzputc
+#define gzputs Cr_z_gzputs
+#define gzread Cr_z_gzread
+#define gzrewind Cr_z_gzrewind
+#define gzseek Cr_z_gzseek
+#define gzseek64 Cr_z_gzseek64
+#define gzsetparams Cr_z_gzsetparams
+#define gztell Cr_z_gztell
+#define gztell64 Cr_z_gztell64
+#define gzungetc Cr_z_gzungetc
+#define gzvprintf Cr_z_gzvprintf
+#define gzwrite Cr_z_gzwrite
+#define inflate Cr_z_inflate
+#define inflateBack Cr_z_inflateBack
+#define inflateBackEnd Cr_z_inflateBackEnd
+/* #undef inflateBackInit */
+#define inflateBackInit_ Cr_z_inflateBackInit_
+#define inflateCodesUsed Cr_z_inflateCodesUsed
+#define inflateCopy Cr_z_inflateCopy
+#define inflateEnd Cr_z_inflateEnd
+#define inflateGetDictionary Cr_z_inflateGetDictionary
+#define inflateGetHeader Cr_z_inflateGetHeader
+/* #undef inflateInit */
+/* #undef inflateInit2 */
+#define inflateInit2_ Cr_z_inflateInit2_
+#define inflateInit_ Cr_z_inflateInit_
+#define inflateMark Cr_z_inflateMark
+#define inflatePrime Cr_z_inflatePrime
+#define inflateReset Cr_z_inflateReset
+#define inflateReset2 Cr_z_inflateReset2
+#define inflateResetKeep Cr_z_inflateResetKeep
+#define inflateSetDictionary Cr_z_inflateSetDictionary
+#define inflateSync Cr_z_inflateSync
+#define inflateSyncPoint Cr_z_inflateSyncPoint
+#define inflateUndermine Cr_z_inflateUndermine
+#define inflateValidate Cr_z_inflateValidate
+#define inflate_copyright Cr_z_inflate_copyright
+#define inflate_fast Cr_z_inflate_fast
+#define inflate_table Cr_z_inflate_table
+#define uncompress Cr_z_uncompress
+#define uncompress2 Cr_z_uncompress2
+#define zError Cr_z_zError
+#define zcalloc Cr_z_zcalloc
+#define zcfree Cr_z_zcfree
+#define zlibCompileFlags Cr_z_zlibCompileFlags
+#define zlibVersion Cr_z_zlibVersion
+/* #undef Byte */
+#define Bytef Cr_z_Bytef
+#define alloc_func Cr_z_alloc_func
+#define charf Cr_z_charf
+#define free_func Cr_z_free_func
+#define gzFile Cr_z_gzFile
+#define gz_header Cr_z_gz_header
+#define gz_headerp Cr_z_gz_headerp
+#define in_func Cr_z_in_func
+#define intf Cr_z_intf
+#define out_func Cr_z_out_func
+#define uInt Cr_z_uInt
+#define uIntf Cr_z_uIntf
+#define uLong Cr_z_uLong
+#define uLongf Cr_z_uLongf
+#define voidp Cr_z_voidp
+#define voidpc Cr_z_voidpc
+#define voidpf Cr_z_voidpf
+#define gz_header_s Cr_z_gz_header_s
+/* #undef internal_state */
+/* #undef z_off64_t */
+
+/* An exported symbol that isn't handled by Z_PREFIX in zconf.h */
+#define z_errmsg Cr_z_z_errmsg
+
+/* Symbols added in simd.patch */
+#define copy_with_crc Cr_z_copy_with_crc
+#define crc_finalize Cr_z_crc_finalize
+#define crc_fold_512to32 Cr_z_crc_fold_512to32
+#define crc_fold_copy Cr_z_crc_fold_copy
+#define crc_fold_init Cr_z_crc_fold_init
+#define crc_reset Cr_z_crc_reset
+#define fill_window_sse Cr_z_fill_window_sse
+#define deflate_read_buf Cr_z_deflate_read_buf
+#define x86_check_features Cr_z_x86_check_features
+#define x86_cpu_enable_simd Cr_z_x86_cpu_enable_simd
+
+/* Symbols added by adler_simd.c */
+#define adler32_simd_ Cr_z_adler32_simd_
+#define x86_cpu_enable_ssse3 Cr_z_x86_cpu_enable_ssse3
+
+/* Symbols added by contrib/optimizations/inffast_chunk */
+#define inflate_fast_chunk_ Cr_z_inflate_fast_chunk_
+
+/* Symbols added by crc32_simd.c */
+#define crc32_sse42_simd_ Cr_z_crc32_sse42_simd_
+
+/* Symbols added by armv8_crc32 */
+#define arm_cpu_enable_crc32 Cr_z_arm_cpu_enable_crc32
+#define arm_cpu_enable_pmull Cr_z_arm_cpu_enable_pmull
+#define arm_check_features Cr_z_arm_check_features
+#define armv8_crc32_little Cr_z_armv8_crc32_little
+#define armv8_crc32_pmull_little Cr_z_armv8_crc32_pmull_little
+
+/* Symbols added by cpu_features.c */
+#define cpu_check_features Cr_z_cpu_check_features
+#define x86_cpu_enable_sse2 Cr_z_x86_cpu_enable_sse2
+
+#endif /* THIRD_PARTY_ZLIB_CHROMECONF_H_ */
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/compress.c b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/compress.c
index e2db404ab..0f11a27c2 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/compress.c
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/compress.c
@@ -19,13 +19,8 @@
    memory, Z_BUF_ERROR if there was not enough room in the output buffer,
    Z_STREAM_ERROR if the level parameter is invalid.
 */
-int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
-    Bytef *dest;
-    uLongf *destLen;
-    const Bytef *source;
-    uLong sourceLen;
-    int level;
-{
+int ZEXPORT compress2(Bytef *dest, uLongf *destLen, const Bytef *source,
+                      uLong sourceLen, int level) {
     z_stream stream;
     int err;
     const uInt max = (uInt)-1;
@@ -65,12 +60,8 @@ int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
 
 /* ===========================================================================
  */
-int ZEXPORT compress (dest, destLen, source, sourceLen)
-    Bytef *dest;
-    uLongf *destLen;
-    const Bytef *source;
-    uLong sourceLen;
-{
+int ZEXPORT compress(Bytef *dest, uLongf *destLen, const Bytef *source,
+                     uLong sourceLen) {
     return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION);
 }
 
@@ -78,9 +69,17 @@ int ZEXPORT compress (dest, destLen, source, sourceLen)
      If the default memLevel or windowBits for deflateInit() is changed, then
    this function needs to be updated.
  */
-uLong ZEXPORT compressBound (sourceLen)
-    uLong sourceLen;
-{
-    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
-           (sourceLen >> 25) + 13;
+uLong ZEXPORT compressBound(uLong sourceLen) {
+    sourceLen = sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
+                (sourceLen >> 25) + 13;
+    /* FIXME(cavalcantii): usage of CRC32 Castagnoli as a hash function
+     * for the hash table of symbols used for compression has a side effect
+     * where for compression level [4, 5] it will increase the output buffer size
+     * by 0.1% (i.e. less than 1%) for a high entropy input (i.e. random data).
+     * To avoid a scenario where client code would fail, for safety we increase
+     * the expected output size by 0.8% (i.e. 8x more than the worst scenario).
+     * See: http://crbug.com/990489
+     */
+    sourceLen += sourceLen >> 7; // Equivalent to 1.0078125
+    return sourceLen;
 }
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/bench/check.sh b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/bench/check.sh
new file mode 100755
index 000000000..e6934605a
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/bench/check.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+#
+# Copyright 2022 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the chromium source repository LICENSE file.
+#
+# Given a zlib_bench executable and some data files, run zlib_bench --check
+# over those data files, for all zlib types (gzip|zlib|raw) and compression
+# levels 1..9 for each type. Example:
+#
+#  check.sh ./out/Release/zlib_bench [--check-binary] ~/snappy/testdata/*
+#
+# The --check-binary option modifies --check output: the compressed data is
+# also written to the program output.
+
+ZLIB_BENCH="$1" && shift
+
+CHECK_TYPE="--check"
+if [[ "${1}" == "--check-binary" ]]; then
+  CHECK_TYPE="$1" && shift  # output compressed data too
+fi
+
+DATA_FILES="$*"
+
+echo ${ZLIB_BENCH} | grep -E "/(zlib_bench|a.out)$" > /dev/null
+if [[ $? != 0 ]] || [[ -z "${DATA_FILES}" ]]; then
+  echo "usage: check.sh zlib_bench [--check-binary] files ..." >&2
+  exit 1;
+fi
+
+for type in gzip zlib raw; do
+  for level in $(seq 1 9); do
+    ${ZLIB_BENCH} $type --compression $level ${CHECK_TYPE} ${DATA_FILES}
+  done
+done
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/bench/zlib_bench.cc b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/bench/zlib_bench.cc
new file mode 100644
index 000000000..b65f9291b
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/bench/zlib_bench.cc
@@ -0,0 +1,438 @@
+/*
+ * Copyright 2018 The Chromium Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the Chromium source repository LICENSE file.
+ *
+ * A benchmark test harness for measuring decoding performance of gzip or zlib
+ * (deflate) encoded compressed data. Given a file containing any data, encode
+ * (compress) it into gzip or zlib format and then decode (uncompress). Output
+ * the median and maximum encoding and decoding rates in MB/s.
+ *
+ * Raw deflate (no gzip or zlib stream wrapper) mode is also supported. Select
+ * it with the [raw] argument. Use the [gzip] [zlib] arguments to select those
+ * stream wrappers.
+ *
+ * Note this code can be compiled outside of the Chromium build system against
+ * the system zlib (-lz) with g++ or clang++ as follows:
+ *
+ *   g++|clang++ -O3 -Wall -std=c++11 zlib_bench.cc -lstdc++ -lz
+ */
+
+#include <algorithm>
+#include <chrono>
+#include <fstream>
+#include <memory>
+#include <string>
+#include <vector>
+
+#include <memory.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "zlib.h"
+
+void error_exit(const char* error, int code) {
+  fprintf(stderr, "%s (%d)\n", error, code);
+  exit(code);
+}
+
+inline char* string_data(std::string* s) {
+  return s->empty() ? nullptr : &*s->begin();
+}
+
+struct Data {
+  Data(size_t s) { data.reset(new (std::nothrow) char[size = s]); }
+  std::unique_ptr<char[]> data;
+  size_t size;
+  std::string name;
+};
+
+Data read_file_data_or_exit(const char* name) {
+  std::ifstream file(name, std::ios::in | std::ios::binary);
+  if (!file) {
+    perror(name);
+    exit(1);
+  }
+
+  file.seekg(0, std::ios::end);
+  Data data(file.tellg());
+  file.seekg(0, std::ios::beg);
+
+  if (file && data.data)
+    file.read(data.data.get(), data.size);
+
+  if (!file || !data.data || !data.size) {
+    perror((std::string("failed: reading ") + name).c_str());
+    exit(1);
+  }
+
+  data.name = std::string(name);
+  return data;
+}
+
+size_t zlib_estimate_compressed_size(size_t input_size) {
+  return compressBound(input_size);
+}
+
+enum zlib_wrapper {
+  kWrapperNONE,
+  kWrapperZLIB,
+  kWrapperGZIP,
+  kWrapperZRAW,
+};
+
+inline int zlib_stream_wrapper_type(zlib_wrapper type) {
+  if (type == kWrapperZLIB) // zlib DEFLATE stream wrapper
+    return MAX_WBITS;
+  if (type == kWrapperGZIP) // gzip DEFLATE stream wrapper
+    return MAX_WBITS + 16;
+  if (type == kWrapperZRAW) // no wrapper, use raw DEFLATE
+    return -MAX_WBITS;
+  error_exit("bad wrapper type", int(type));
+  return 0;
+}
+
+const char* zlib_wrapper_name(zlib_wrapper type) {
+  if (type == kWrapperZLIB)
+    return "ZLIB";
+  if (type == kWrapperGZIP)
+    return "GZIP";
+  if (type == kWrapperZRAW)
+    return "RAW";
+  error_exit("bad wrapper type", int(type));
+  return nullptr;
+}
+
+static int zlib_strategy = Z_DEFAULT_STRATEGY;
+
+const char* zlib_level_strategy_name(int compression_level) {
+  if (compression_level == 0)
+    return "";  // strategy is meaningless at level 0
+  if (zlib_strategy == Z_HUFFMAN_ONLY)
+    return "huffman ";
+  if (zlib_strategy == Z_RLE)
+    return "rle ";
+  if (zlib_strategy == Z_DEFAULT_STRATEGY)
+    return "";
+  error_exit("bad strategy", zlib_strategy);
+  return nullptr;
+}
+
+static int zlib_compression_level = Z_DEFAULT_COMPRESSION;
+
+void zlib_compress(
+    const zlib_wrapper type,
+    const char* input,
+    const size_t input_size,
+    std::string* output,
+    bool resize_output = false)
+{
+  if (resize_output)
+    output->resize(zlib_estimate_compressed_size(input_size));
+  size_t output_size = output->size();
+
+  z_stream stream;
+  memset(&stream, 0, sizeof(stream));
+
+  int result = deflateInit2(&stream, zlib_compression_level, Z_DEFLATED,
+      zlib_stream_wrapper_type(type), MAX_MEM_LEVEL, zlib_strategy);
+  if (result != Z_OK)
+    error_exit("deflateInit2 failed", result);
+
+  stream.next_out = (Bytef*)string_data(output);
+  stream.avail_out = (uInt)output_size;
+  stream.next_in = (z_const Bytef*)input;
+  stream.avail_in = (uInt)input_size;
+
+  result = deflate(&stream, Z_FINISH);
+  if (stream.avail_in > 0)
+    error_exit("compress: input was not consumed", Z_DATA_ERROR);
+  if (result == Z_STREAM_END)
+    output_size = stream.total_out;
+  result |= deflateEnd(&stream);
+  if (result != Z_STREAM_END)
+    error_exit("compress failed", result);
+
+  if (resize_output)
+    output->resize(output_size);
+}
+
+void zlib_uncompress(
+    const zlib_wrapper type,
+    const std::string& input,
+    const size_t output_size,
+    std::string* output)
+{
+  z_stream stream;
+  memset(&stream, 0, sizeof(stream));
+
+  int result = inflateInit2(&stream, zlib_stream_wrapper_type(type));
+  if (result != Z_OK)
+    error_exit("inflateInit2 failed", result);
+
+  stream.next_out = (Bytef*)string_data(output);
+  stream.avail_out = (uInt)output->size();
+  stream.next_in = (z_const Bytef*)input.data();
+  stream.avail_in = (uInt)input.size();
+
+  result = inflate(&stream, Z_FINISH);
+  if (stream.total_out != output_size)
+    result = Z_DATA_ERROR;
+  result |= inflateEnd(&stream);
+  if (result == Z_STREAM_END)
+    return;
+
+  std::string error("uncompress failed: ");
+  if (stream.msg)
+    error.append(stream.msg);
+  error_exit(error.c_str(), result);
+}
+
+void verify_equal(const char* input, size_t size, std::string* output) {
+  const char* data = string_data(output);
+  if (output->size() == size && !memcmp(data, input, size))
+    return;
+  fprintf(stderr, "uncompressed data does not match the input data\n");
+  exit(3);
+}
+
+void check_file(const Data& file, zlib_wrapper type, int mode) {
+  printf("%s %d %s%s\n", zlib_wrapper_name(type), zlib_compression_level,
+    zlib_level_strategy_name(zlib_compression_level), file.name.c_str());
+
+  // Compress the file data.
+  std::string compressed;
+  zlib_compress(type, file.data.get(), file.size, &compressed, true);
+
+  // Output compressed data integrity check: the data crc32.
+  unsigned long check = crc32_z(0, Z_NULL, 0);
+  const Bytef* data = (const Bytef*)compressed.data();
+  static_assert(sizeof(z_size_t) == sizeof(size_t), "z_size_t size");
+  check = crc32_z(check, data, (z_size_t)compressed.size());
+
+  const size_t compressed_length = compressed.size();
+  printf("data crc32 %.8lx length %zu\n", check, compressed_length);
+
+  // Output gzip or zlib DEFLATE stream internal check data.
+  if (type == kWrapperGZIP) {
+    uint32_t prev_word, last_word;
+    data += compressed_length - 8;
+    prev_word = data[3] << 24 | data[2] << 16 | data[1] << 8 | data[0];
+    data += 4;  // last compressed data word
+    last_word = data[3] << 24 | data[2] << 16 | data[1] << 8 | data[0];
+    printf("gzip crc32 %.8x length %u\n", prev_word, last_word);
+  } else if (type == kWrapperZLIB) {
+    uint32_t last_word;
+    data += compressed_length - 4;
+    last_word = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3];
+    printf("zlib adler %.8x\n", last_word);
+  }
+
+  if (mode == 2)  // --check-binary: output compressed data.
+    fwrite(compressed.data(), compressed_length, 1, stdout);
+
+  if (fflush(stdout), ferror(stdout))
+    error_exit("check file: error writing output", 3);
+}
+
+void zlib_file(const char* name,
+               zlib_wrapper type,
+               int width,
+               int check,
+               bool output_csv_format) {
+  /*
+   * Read the file data.
+   */
+  struct Data file = read_file_data_or_exit(name);
+  const int length = static_cast<int>(file.size);
+  const char* data = file.data.get();
+
+  /*
+   * Compress file: report output data checks and return.
+   */
+  if (check) {
+    file.name = file.name.substr(file.name.find_last_of("/\\") + 1);
+    check_file(file, type, check);
+    return;
+  }
+
+  /*
+   * Report compression strategy and file name.
+   */
+  const char* strategy = zlib_level_strategy_name(zlib_compression_level);
+  if (!output_csv_format) {
+    printf("%s%-40s :\n", strategy, name);
+  }
+
+  /*
+   * Chop the data into blocks.
+   */
+  const int block_size = 1 << 20;
+  const int blocks = (length + block_size - 1) / block_size;
+
+  std::vector<const char*> input(blocks);
+  std::vector<size_t> input_length(blocks);
+  std::vector<std::string> compressed(blocks);
+  std::vector<std::string> output(blocks);
+
+  for (int b = 0; b < blocks; ++b) {
+    int input_start = b * block_size;
+    int input_limit = std::min<int>((b + 1) * block_size, length);
+    input[b] = data + input_start;
+    input_length[b] = input_limit - input_start;
+  }
+
+  /*
+   * Run the zlib compress/uncompress loop a few times with |repeats| to
+   * process about 10MB of data if the length is small relative to 10MB.
+   * If length is large relative to 10MB, process the data once.
+   */
+  const int mega_byte = 1024 * 1024;
+  const int repeats = (10 * mega_byte + length) / (length + 1);
+  const int runs = 5;
+  double ctime[runs];
+  double utime[runs];
+
+  for (int run = 0; run < runs; ++run) {
+    const auto now = [] { return std::chrono::steady_clock::now(); };
+
+    // Pre-grow the output buffer so we don't measure string resize time.
+    for (int b = 0; b < blocks; ++b)
+      compressed[b].resize(zlib_estimate_compressed_size(block_size));
+
+    auto start = now();
+    for (int b = 0; b < blocks; ++b)
+      for (int r = 0; r < repeats; ++r)
+        zlib_compress(type, input[b], input_length[b], &compressed[b]);
+    ctime[run] = std::chrono::duration<double>(now() - start).count();
+
+    // Compress again, resizing compressed, so we don't leave junk at the
+    // end of the compressed string that could confuse zlib_uncompress().
+    for (int b = 0; b < blocks; ++b)
+      zlib_compress(type, input[b], input_length[b], &compressed[b], true);
+
+    for (int b = 0; b < blocks; ++b)
+      output[b].resize(input_length[b]);
+
+    start = now();
+    for (int r = 0; r < repeats; ++r)
+      for (int b = 0; b < blocks; ++b)
+        zlib_uncompress(type, compressed[b], input_length[b], &output[b]);
+    utime[run] = std::chrono::duration<double>(now() - start).count();
+
+    for (int b = 0; b < blocks; ++b)
+      verify_equal(input[b], input_length[b], &output[b]);
+  }
+
+  /*
+   * Output the median/maximum compress/uncompress rates in MB/s.
+   */
+  size_t output_length = 0;
+  for (size_t i = 0; i < compressed.size(); ++i)
+    output_length += compressed[i].size();
+
+  std::sort(ctime, ctime + runs);
+  std::sort(utime, utime + runs);
+
+  double deflate_rate_med, inflate_rate_med, deflate_rate_max, inflate_rate_max;
+  deflate_rate_med = length * repeats / mega_byte / ctime[runs / 2];
+  inflate_rate_med = length * repeats / mega_byte / utime[runs / 2];
+  deflate_rate_max = length * repeats / mega_byte / ctime[0];
+  inflate_rate_max = length * repeats / mega_byte / utime[0];
+  double compress_ratio = output_length * 100.0 / length;
+
+  if (!output_csv_format) {
+    // type, block size, compression ratio, etc
+    printf("%s: [b %dM] bytes %*d -> %*u %4.2f%%", zlib_wrapper_name(type),
+           block_size / (1 << 20), width, length, width,
+           unsigned(output_length), compress_ratio);
+
+    // compress / uncompress median (max) rates
+    printf(" comp %5.1f (%5.1f) MB/s uncomp %5.1f (%5.1f) MB/s\n",
+           deflate_rate_med, deflate_rate_max, inflate_rate_med,
+           inflate_rate_max);
+  } else {
+    printf("%s\t%.5lf\t%.5lf\t%.5lf\t%.5lf\t%.5lf\n", name, deflate_rate_med,
+           inflate_rate_med, deflate_rate_max, inflate_rate_max,
+           compress_ratio);
+  }
+}
+
+static int argn = 1;
+
+char* get_option(int argc, char* argv[], const char* option) {
+  if (argn < argc)
+    return !strcmp(argv[argn], option) ? argv[argn++] : nullptr;
+  return nullptr;
+}
+
+bool get_compression(int argc, char* argv[], int& value) {
+  if (argn < argc)
+    value = isdigit(argv[argn][0]) ? atoi(argv[argn++]) : -1;
+  return value >= 0 && value <= 9;
+}
+
+void get_field_width(int argc, char* argv[], int& value) {
+  value = atoi(argv[argn++]);
+}
+
+void usage_exit(const char* program) {
+  static auto* options =
+      "gzip|zlib|raw"
+      " [--compression 0:9] [--huffman|--rle] [--field width] [--check]"
+      " [--csv]";
+  printf("usage: %s %s files ...\n", program, options);
+  printf("zlib version: %s\n", ZLIB_VERSION);
+  exit(1);
+}
+
+int main(int argc, char* argv[]) {
+  zlib_wrapper type;
+  if (get_option(argc, argv, "zlib"))
+    type = kWrapperZLIB;
+  else if (get_option(argc, argv, "gzip"))
+    type = kWrapperGZIP;
+  else if (get_option(argc, argv, "raw"))
+    type = kWrapperZRAW;
+  else
+    usage_exit(argv[0]);
+
+  int size_field_width = 0;
+  int file_check = 0;
+  bool output_csv = false;
+  while (argn < argc && argv[argn][0] == '-') {
+    if (get_option(argc, argv, "--compression")) {
+      if (!get_compression(argc, argv, zlib_compression_level))
+        usage_exit(argv[0]);
+    } else if (get_option(argc, argv, "--huffman")) {
+      zlib_strategy = Z_HUFFMAN_ONLY;
+    } else if (get_option(argc, argv, "--rle")) {
+      zlib_strategy = Z_RLE;
+    } else if (get_option(argc, argv, "--check")) {
+      file_check = 1;
+    } else if (get_option(argc, argv, "--check-binary")) {
+      file_check = 2;
+    } else if (get_option(argc, argv, "--field")) {
+      get_field_width(argc, argv, size_field_width);
+    } else if (get_option(argc, argv, "--csv")) {
+      output_csv = true;
+      printf(
+          "filename\tcompression\tdecompression\tcomp_max\t"
+          "decomp_max\tcompress_ratio\n");
+    } else {
+      usage_exit(argv[0]);
+    }
+  }
+
+  if (argn >= argc)
+    usage_exit(argv[0]);
+
+  if (size_field_width < 6)
+    size_field_width = 6;
+  while (argn < argc) {
+    zlib_file(argv[argn++], type, size_field_width, file_check, output_csv);
+  }
+
+  return 0;
+}
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/README.chromium b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/README.chromium
new file mode 100644
index 000000000..9c780f946
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/README.chromium
@@ -0,0 +1,20 @@
+Name: ZIP file API for reading file entries in a ZIP archive
+Short Name: minizip
+URL: https://github.com/madler/zlib/tree/master/contrib/minizip
+Version: 1.2.12
+License: Zlib
+License File: //third_party/zlib/LICENSE
+Security Critical: yes
+Shipped: yes
+
+Description:
+Minizip provides API on top of zlib that can enumerate and extract ZIP archive
+files. See minizip.md for chromium build instructions.
+
+Local Modifications:
+- Add parsing of the 'Info-ZIP Unicode Path Extra Field' as described in
+  https://pkware.cachefly.net/webdocs/casestudies/APPNOTE.TXT section 4.6.9.
+  (see crrev.com/1002476)
+
+- Check for overly long filename, comment, or extra field in
+  zipOpenNewFileInZip4_64 (crbug.com/1470539).
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/ioapi.c b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/ioapi.c
index 7f5c191b2..543910b5e 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/ioapi.c
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/ioapi.c
@@ -14,7 +14,7 @@
         #define _CRT_SECURE_NO_WARNINGS
 #endif
 
-#if defined(__APPLE__) || defined(IOAPI_NO_64)
+#if defined(__APPLE__) || defined(__Fuchsia__) || defined(IOAPI_NO_64)
 // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
 #define FOPEN_FUNC(filename, mode) fopen(filename, mode)
 #define FTELLO_FUNC(stream) ftello(stream)
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/ioapi.h b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/ioapi.h
index c1b7a5484..8dcbdb06e 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/ioapi.h
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/ioapi.h
@@ -43,7 +43,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "third_party/zlib/zlib.h"
+#include "zlib.h"
 
 #if defined(USE_FILE32API)
 #define fopen64 fopen
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/iowin32.c b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/iowin32.c
index 246ceb91a..c6bc314b3 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/iowin32.c
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/iowin32.c
@@ -31,14 +31,12 @@
 #define _WIN32_WINNT 0x601
 #endif
 
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN8
-// see Include/shared/winapifamily.h in the Windows Kit
-#if defined(WINAPI_FAMILY_PARTITION) && (!(defined(IOWIN32_USING_WINRT_API)))
-#if WINAPI_FAMILY_ONE_PARTITION(WINAPI_FAMILY, WINAPI_PARTITION_APP)
+#if !defined(IOWIN32_USING_WINRT_API)
+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)
+// Windows Store or Universal Windows Platform
 #define IOWIN32_USING_WINRT_API 1
 #endif
 #endif
-#endif
 
 voidpf  ZCALLBACK win32_open_file_func  OF((voidpf opaque, const char* filename, int mode));
 uLong   ZCALLBACK win32_read_file_func  OF((voidpf opaque, voidpf stream, void* buf, uLong size));
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/miniunz.c b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/miniunz.c
index 3d65401be..08737f689 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/miniunz.c
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/miniunz.c
@@ -12,7 +12,7 @@
          Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
 */
 
-#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
+#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__)) && (!defined(__ANDROID_API__))
         #ifndef __USE_FILE_OFFSET64
                 #define __USE_FILE_OFFSET64
         #endif
@@ -27,7 +27,7 @@
         #endif
 #endif
 
-#ifdef __APPLE__
+#if defined(__APPLE__) || defined(__Fuchsia__) || defined(__ANDROID_API__)
 // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
 #define FOPEN_FUNC(filename, mode) fopen(filename, mode)
 #define FTELLO_FUNC(stream) ftello(stream)
@@ -45,6 +45,7 @@
 #include <time.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <sys/stat.h>
 
 #ifdef _WIN32
 # include <direct.h>
@@ -97,7 +98,7 @@ void change_file_date(filename,dosdate,tmu_date)
   SetFileTime(hFile,&ftm,&ftLastAcc,&ftm);
   CloseHandle(hFile);
 #else
-#ifdef unix || __APPLE__
+#if defined(unix) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__ANDROID_API__)
   struct utimbuf ut;
   struct tm newdate;
   newdate.tm_sec = tmu_date.tm_sec;
@@ -125,11 +126,9 @@ int mymkdir(dirname)
     const char* dirname;
 {
     int ret=0;
-#ifdef _WIN32
+#if defined(_WIN32)
     ret = _mkdir(dirname);
-#elif unix
-    ret = mkdir (dirname,0775);
-#elif __APPLE__
+#elif defined(unix) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__ANDROID_API__)
     ret = mkdir (dirname,0775);
 #endif
     return ret;
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/minizip.c b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/minizip.c
index 4288962ec..b794953c5 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/minizip.c
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/minizip.c
@@ -12,8 +12,7 @@
          Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
 */
 
-
-#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
+#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__)) && (!defined(__ANDROID_API__))
         #ifndef __USE_FILE_OFFSET64
                 #define __USE_FILE_OFFSET64
         #endif
@@ -28,7 +27,7 @@
         #endif
 #endif
 
-#ifdef __APPLE__
+#if defined(__APPLE__) || defined(__Fuchsia__) || defined(__ANDROID_API__)
 // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
 #define FOPEN_FUNC(filename, mode) fopen(filename, mode)
 #define FTELLO_FUNC(stream) ftello(stream)
@@ -94,7 +93,7 @@ uLong filetime(f, tmzip, dt)
   return ret;
 }
 #else
-#ifdef unix || __APPLE__
+#if defined(unix) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__ANDROID_API__)
 uLong filetime(f, tmzip, dt)
     char *f;               /* name of file to get info on */
     tm_zip *tmzip;         /* return value: access, modific. and creation times */
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/minizip.md b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/minizip.md
new file mode 100644
index 000000000..9f15dd23d
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/minizip.md
@@ -0,0 +1,9 @@
+Minizip is a library provided by //third_party/zlib [1]. Its zip and unzip
+tools can be built in a developer checkout for testing purposes with:
+
+```shell
+  autoninja -C out/Release minizip_bin
+  autoninja -C out/Release miniunz_bin
+```
+
+[1] Upstream is https://github.com/madler/zlib/tree/master/contrib/minizip
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/mztools.c b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/mztools.c
index 8bf9cca32..96891c2e0 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/mztools.c
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/mztools.c
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "third_party/zlib/zlib.h"
+#include "zlib.h"
 #include "unzip.h"
 
 #define READ_8(adr)  ((unsigned char)*(adr))
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/mztools.h b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/mztools.h
index f295ffeda..a49a426ec 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/mztools.h
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/mztools.h
@@ -12,7 +12,7 @@ extern "C" {
 #endif
 
 #ifndef _ZLIB_H
-#include "third_party/zlib/zlib.h"
+#include "zlib.h"
 #endif
 
 #include "unzip.h"
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/unzip.c b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/unzip.c
index 199b4723f..4973a4eea 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/unzip.c
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/unzip.c
@@ -68,11 +68,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifndef NOUNCRYPT
-        #define NOUNCRYPT
-#endif
-
-#include "third_party/zlib/zlib.h"
+#include "zlib.h"
 #include "unzip.h"
 
 #ifdef STDC
@@ -1027,46 +1023,102 @@ local int unz64local_GetCurrentFileInfoInternal (unzFile file,
         while(acc < file_info.size_file_extra)
         {
             uLong headerId;
-                                                uLong dataSize;
+            uLong dataSize;
 
             if (unz64local_getShort(&s->z_filefunc, s->filestream,&headerId) != UNZ_OK)
                 err=UNZ_ERRNO;
 
             if (unz64local_getShort(&s->z_filefunc, s->filestream,&dataSize) != UNZ_OK)
                 err=UNZ_ERRNO;
-
+            
             /* ZIP64 extra fields */
             if (headerId == 0x0001)
             {
-                                                        uLong uL;
-
-                                                                if(file_info.uncompressed_size == MAXU32)
-                                                                {
-                                                                        if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK)
-                                                                                        err=UNZ_ERRNO;
-                                                                }
-
-                                                                if(file_info.compressed_size == MAXU32)
-                                                                {
-                                                                        if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info.compressed_size) != UNZ_OK)
-                                                                                  err=UNZ_ERRNO;
-                                                                }
-
-                                                                if(file_info_internal.offset_curfile == MAXU32)
-                                                                {
-                                                                        /* Relative Header offset */
-                                                                        if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info_internal.offset_curfile) != UNZ_OK)
-                                                                                err=UNZ_ERRNO;
-                                                                }
-
-                                                                if(file_info.disk_num_start == MAXU32)
-                                                                {
-                                                                        /* Disk Start Number */
-                                                                        if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
-                                                                                err=UNZ_ERRNO;
-                                                                }
+                uLong uL;
+
+                if(file_info.uncompressed_size == MAXU32)
+                {
+                    if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK)
+                        err=UNZ_ERRNO;
+                }
+
+                if(file_info.compressed_size == MAXU32)
+                {
+                    if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info.compressed_size) != UNZ_OK)
+                        err=UNZ_ERRNO;
+                }
+
+                if(file_info_internal.offset_curfile == MAXU32)
+                {
+                    /* Relative Header offset */
+                    if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info_internal.offset_curfile) != UNZ_OK)
+                        err=UNZ_ERRNO;
+                }
+
+                if(file_info.disk_num_start == MAXU32)
+                {
+                    /* Disk Start Number */
+                    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
+                        err=UNZ_ERRNO;
+                }
 
             }
+            else if (headerId == 0x7075) /* Info-ZIP Unicode Path Extra Field */
+            {
+                int version = 0;
+
+                if (unz64local_getByte(&s->z_filefunc, s->filestream, &version) != UNZ_OK)
+                {
+                    err = UNZ_ERRNO;
+                }
+                if (version != 1)
+                {
+                    if (ZSEEK64(s->z_filefunc, s->filestream,dataSize - 1, ZLIB_FILEFUNC_SEEK_CUR) != 0)
+                    {
+                        err = UNZ_ERRNO;
+                    }
+                }
+                else
+                {
+                    uLong uCrc, uHeaderCrc, fileNameSize;
+
+                    if (unz64local_getLong(&s->z_filefunc, s->filestream, &uCrc) != UNZ_OK)
+                    {
+                        err = UNZ_ERRNO;
+                    }
+                    uHeaderCrc = crc32(0, (const unsigned char *)szFileName, file_info.size_filename);
+                    fileNameSize = dataSize - (2 * sizeof (short) + 1);
+                    /* Check CRC against file name in the header. */
+                    if (uHeaderCrc != uCrc)
+                    {
+                        if (ZSEEK64(s->z_filefunc, s->filestream, fileNameSize, ZLIB_FILEFUNC_SEEK_CUR) != 0)
+                        {
+                            err = UNZ_ERRNO;
+                        }
+                    }
+                    else
+                    {
+                        uLong uSizeRead;
+
+                        if (fileNameSize < fileNameBufferSize)
+                        {
+                             *(szFileName + fileNameSize) = '\0';
+                            uSizeRead = fileNameSize;
+                        }
+                        else
+                        {
+                            uSizeRead = fileNameBufferSize;
+                        }
+                        if ((fileNameSize > 0) && (fileNameBufferSize > 0))
+                        {
+                            if (ZREAD64(s->z_filefunc, s->filestream, szFileName, uSizeRead) != uSizeRead)
+                            {
+                                err = UNZ_ERRNO;
+                            }
+                        }
+                    }
+                }
+            }
             else
             {
                 if (ZSEEK64(s->z_filefunc, s->filestream,dataSize,ZLIB_FILEFUNC_SEEK_CUR)!=0)
@@ -1630,6 +1682,7 @@ extern int ZEXPORT unzOpenCurrentFile3 (unzFile file, int* method,
             zdecode(s->keys,s->pcrc_32_tab,source[i]);
 
         s->pfile_in_zip_read->pos_in_zipfile+=12;
+        s->pfile_in_zip_read->rest_read_compressed-=12;
         s->encrypted=1;
     }
 #    endif
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/unzip.h b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/unzip.h
index 3c0143529..2104e3915 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/unzip.h
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/unzip.h
@@ -48,7 +48,7 @@ extern "C" {
 #endif
 
 #ifndef _ZLIB_H
-#include "third_party/zlib/zlib.h"
+#include "zlib.h"
 #endif
 
 #ifndef  _ZLIBIOAPI_H
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/zip.c b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/zip.c
index 65c0c7251..f21d49542 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/zip.c
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/zip.c
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include "third_party/zlib/zlib.h"
+#include "zlib.h"
 #include "zip.h"
 
 #ifdef STDC
@@ -1083,6 +1083,17 @@ extern int ZEXPORT zipOpenNewFileInZip4_64 (zipFile file, const char* filename,
       return ZIP_PARAMERROR;
 #endif
 
+    // The filename and comment length must fit in 16 bits.
+    if ((filename!=NULL) && (strlen(filename)>0xffff))
+        return ZIP_PARAMERROR;
+    if ((comment!=NULL) && (strlen(comment)>0xffff))
+        return ZIP_PARAMERROR;
+    // The extra field length must fit in 16 bits. If the member also requires
+    // a Zip64 extra block, that will also need to fit within that 16-bit
+    // length, but that will be checked for later.
+    if ((size_extrafield_local>0xffff) || (size_extrafield_global>0xffff))
+        return ZIP_PARAMERROR;
+
     zi = (zip64_internal*)file;
 
     if (zi->in_opened_file_inzip == 1)
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/zip.h b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/zip.h
index 8c06c0aa7..8aaebb623 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/zip.h
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/minizip/zip.h
@@ -47,7 +47,7 @@ extern "C" {
 //#define HAVE_BZIP2
 
 #ifndef _ZLIB_H
-#include "third_party/zlib/zlib.h"
+#include "zlib.h"
 #endif
 
 #ifndef _ZLIBIOAPI_H
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/optimizations/chunkcopy.h b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/optimizations/chunkcopy.h
new file mode 100644
index 000000000..f40546d54
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/optimizations/chunkcopy.h
@@ -0,0 +1,489 @@
+/* chunkcopy.h -- fast chunk copy and set operations
+ * Copyright (C) 2017 ARM, Inc.
+ * Copyright 2017 The Chromium Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the Chromium source repository LICENSE file.
+ */
+
+#ifndef CHUNKCOPY_H
+#define CHUNKCOPY_H
+
+#include <stdint.h>
+#include "zutil.h"
+
+#define Z_STATIC_ASSERT(name, assert) typedef char name[(assert) ? 1 : -1]
+
+#if __STDC_VERSION__ >= 199901L
+#define Z_RESTRICT restrict
+#else
+#define Z_RESTRICT
+#endif
+
+#if defined(__clang__) || defined(__GNUC__) || defined(__llvm__)
+#define Z_BUILTIN_MEMCPY __builtin_memcpy
+#else
+#define Z_BUILTIN_MEMCPY zmemcpy
+#endif
+
+#if defined(INFLATE_CHUNK_SIMD_NEON)
+#include <arm_neon.h>
+typedef uint8x16_t z_vec128i_t;
+#elif defined(INFLATE_CHUNK_SIMD_SSE2)
+#include <emmintrin.h>
+typedef __m128i z_vec128i_t;
+#else
+#error chunkcopy.h inflate chunk SIMD is not defined for your build target
+#endif
+
+/*
+ * Suppress MSan errors about copying uninitialized bytes (crbug.com/1376033).
+ */
+#define Z_DISABLE_MSAN
+#if defined(__has_feature)
+  #if __has_feature(memory_sanitizer)
+    #undef Z_DISABLE_MSAN
+    #define Z_DISABLE_MSAN __attribute__((no_sanitize("memory")))
+  #endif
+#endif
+
+/*
+ * chunk copy type: the z_vec128i_t type size should be exactly 128-bits
+ * and equal to CHUNKCOPY_CHUNK_SIZE.
+ */
+#define CHUNKCOPY_CHUNK_SIZE sizeof(z_vec128i_t)
+
+Z_STATIC_ASSERT(vector_128_bits_wide,
+                CHUNKCOPY_CHUNK_SIZE == sizeof(int8_t) * 16);
+
+/*
+ * Ask the compiler to perform a wide, unaligned load with a machine
+ * instruction appropriate for the z_vec128i_t type.
+ */
+static inline z_vec128i_t loadchunk(
+    const unsigned char FAR* s) Z_DISABLE_MSAN {
+  z_vec128i_t v;
+  Z_BUILTIN_MEMCPY(&v, s, sizeof(v));
+  return v;
+}
+
+/*
+ * Ask the compiler to perform a wide, unaligned store with a machine
+ * instruction appropriate for the z_vec128i_t type.
+ */
+static inline void storechunk(
+    unsigned char FAR* d,
+    const z_vec128i_t v) {
+  Z_BUILTIN_MEMCPY(d, &v, sizeof(v));
+}
+
+/*
+ * Perform a memcpy-like operation, assuming that length is non-zero and that
+ * it's OK to overwrite at least CHUNKCOPY_CHUNK_SIZE bytes of output even if
+ * the length is shorter than this.
+ *
+ * It also guarantees that it will properly unroll the data if the distance
+ * between `out` and `from` is at least CHUNKCOPY_CHUNK_SIZE, which we rely on
+ * in chunkcopy_relaxed().
+ *
+ * Aside from better memory bus utilisation, this means that short copies
+ * (CHUNKCOPY_CHUNK_SIZE bytes or fewer) will fall straight through the loop
+ * without iteration, which will hopefully make the branch prediction more
+ * reliable.
+ */
+static inline unsigned char FAR* chunkcopy_core(
+    unsigned char FAR* out,
+    const unsigned char FAR* from,
+    unsigned len) Z_DISABLE_MSAN {
+  const int bump = (--len % CHUNKCOPY_CHUNK_SIZE) + 1;
+  storechunk(out, loadchunk(from));
+  out += bump;
+  from += bump;
+  len /= CHUNKCOPY_CHUNK_SIZE;
+  while (len-- > 0) {
+    storechunk(out, loadchunk(from));
+    out += CHUNKCOPY_CHUNK_SIZE;
+    from += CHUNKCOPY_CHUNK_SIZE;
+  }
+  return out;
+}
+
+/*
+ * Like chunkcopy_core(), but avoid writing beyond of legal output.
+ *
+ * Accepts an additional pointer to the end of safe output.  A generic safe
+ * copy would use (out + len), but it's normally the case that the end of the
+ * output buffer is beyond the end of the current copy, and this can still be
+ * exploited.
+ */
+static inline unsigned char FAR* chunkcopy_core_safe(
+    unsigned char FAR* out,
+    const unsigned char FAR* from,
+    unsigned len,
+    unsigned char FAR* limit) {
+  Assert(out + len <= limit, "chunk copy exceeds safety limit");
+  if ((limit - out) < (ptrdiff_t)CHUNKCOPY_CHUNK_SIZE) {
+    const unsigned char FAR* Z_RESTRICT rfrom = from;
+    Assert((uintptr_t)out - (uintptr_t)from >= len,
+           "invalid restrict in chunkcopy_core_safe");
+    Assert((uintptr_t)from - (uintptr_t)out >= len,
+           "invalid restrict in chunkcopy_core_safe");
+    if (len & 8) {
+      Z_BUILTIN_MEMCPY(out, rfrom, 8);
+      out += 8;
+      rfrom += 8;
+    }
+    if (len & 4) {
+      Z_BUILTIN_MEMCPY(out, rfrom, 4);
+      out += 4;
+      rfrom += 4;
+    }
+    if (len & 2) {
+      Z_BUILTIN_MEMCPY(out, rfrom, 2);
+      out += 2;
+      rfrom += 2;
+    }
+    if (len & 1) {
+      *out++ = *rfrom++;
+    }
+    return out;
+  }
+  return chunkcopy_core(out, from, len);
+}
+
+/*
+ * Perform short copies until distance can be rewritten as being at least
+ * CHUNKCOPY_CHUNK_SIZE.
+ *
+ * Assumes it's OK to overwrite at least the first 2*CHUNKCOPY_CHUNK_SIZE
+ * bytes of output even if the copy is shorter than this.  This assumption
+ * holds within zlib inflate_fast(), which starts every iteration with at
+ * least 258 bytes of output space available (258 being the maximum length
+ * output from a single token; see inffast.c).
+ */
+static inline unsigned char FAR* chunkunroll_relaxed(
+    unsigned char FAR* out,
+    unsigned FAR* dist,
+    unsigned FAR* len) Z_DISABLE_MSAN {
+  const unsigned char FAR* from = out - *dist;
+  while (*dist < *len && *dist < CHUNKCOPY_CHUNK_SIZE) {
+    storechunk(out, loadchunk(from));
+    out += *dist;
+    *len -= *dist;
+    *dist += *dist;
+  }
+  return out;
+}
+
+#if defined(INFLATE_CHUNK_SIMD_NEON)
+/*
+ * v_load64_dup(): load *src as an unaligned 64-bit int and duplicate it in
+ * every 64-bit component of the 128-bit result (64-bit int splat).
+ */
+static inline z_vec128i_t v_load64_dup(const void* src) {
+  return vcombine_u8(vld1_u8(src), vld1_u8(src));
+}
+
+/*
+ * v_load32_dup(): load *src as an unaligned 32-bit int and duplicate it in
+ * every 32-bit component of the 128-bit result (32-bit int splat).
+ */
+static inline z_vec128i_t v_load32_dup(const void* src) {
+  int32_t i32;
+  Z_BUILTIN_MEMCPY(&i32, src, sizeof(i32));
+  return vreinterpretq_u8_s32(vdupq_n_s32(i32));
+}
+
+/*
+ * v_load16_dup(): load *src as an unaligned 16-bit int and duplicate it in
+ * every 16-bit component of the 128-bit result (16-bit int splat).
+ */
+static inline z_vec128i_t v_load16_dup(const void* src) {
+  int16_t i16;
+  Z_BUILTIN_MEMCPY(&i16, src, sizeof(i16));
+  return vreinterpretq_u8_s16(vdupq_n_s16(i16));
+}
+
+/*
+ * v_load8_dup(): load the 8-bit int *src and duplicate it in every 8-bit
+ * component of the 128-bit result (8-bit int splat).
+ */
+static inline z_vec128i_t v_load8_dup(const void* src) {
+  return vld1q_dup_u8((const uint8_t*)src);
+}
+
+/*
+ * v_store_128(): store the 128-bit vec in a memory destination (that might
+ * not be 16-byte aligned) void* out.
+ */
+static inline void v_store_128(void* out, const z_vec128i_t vec) {
+  vst1q_u8(out, vec);
+}
+
+#elif defined(INFLATE_CHUNK_SIMD_SSE2)
+/*
+ * v_load64_dup(): load *src as an unaligned 64-bit int and duplicate it in
+ * every 64-bit component of the 128-bit result (64-bit int splat).
+ */
+static inline z_vec128i_t v_load64_dup(const void* src) {
+  int64_t i64;
+  Z_BUILTIN_MEMCPY(&i64, src, sizeof(i64));
+  return _mm_set1_epi64x(i64);
+}
+
+/*
+ * v_load32_dup(): load *src as an unaligned 32-bit int and duplicate it in
+ * every 32-bit component of the 128-bit result (32-bit int splat).
+ */
+static inline z_vec128i_t v_load32_dup(const void* src) {
+  int32_t i32;
+  Z_BUILTIN_MEMCPY(&i32, src, sizeof(i32));
+  return _mm_set1_epi32(i32);
+}
+
+/*
+ * v_load16_dup(): load *src as an unaligned 16-bit int and duplicate it in
+ * every 16-bit component of the 128-bit result (16-bit int splat).
+ */
+static inline z_vec128i_t v_load16_dup(const void* src) {
+  int16_t i16;
+  Z_BUILTIN_MEMCPY(&i16, src, sizeof(i16));
+  return _mm_set1_epi16(i16);
+}
+
+/*
+ * v_load8_dup(): load the 8-bit int *src and duplicate it in every 8-bit
+ * component of the 128-bit result (8-bit int splat).
+ */
+static inline z_vec128i_t v_load8_dup(const void* src) {
+  return _mm_set1_epi8(*(const char*)src);
+}
+
+/*
+ * v_store_128(): store the 128-bit vec in a memory destination (that might
+ * not be 16-byte aligned) void* out.
+ */
+static inline void v_store_128(void* out, const z_vec128i_t vec) {
+  _mm_storeu_si128((__m128i*)out, vec);
+}
+#endif
+
+/*
+ * Perform an overlapping copy which behaves as a memset() operation, but
+ * supporting periods other than one, and assume that length is non-zero and
+ * that it's OK to overwrite at least CHUNKCOPY_CHUNK_SIZE*3 bytes of output
+ * even if the length is shorter than this.
+ */
+static inline unsigned char FAR* chunkset_core(
+    unsigned char FAR* out,
+    unsigned period,
+    unsigned len) {
+  z_vec128i_t v;
+  const int bump = ((len - 1) % sizeof(v)) + 1;
+
+  switch (period) {
+    case 1:
+      v = v_load8_dup(out - 1);
+      v_store_128(out, v);
+      out += bump;
+      len -= bump;
+      while (len > 0) {
+        v_store_128(out, v);
+        out += sizeof(v);
+        len -= sizeof(v);
+      }
+      return out;
+    case 2:
+      v = v_load16_dup(out - 2);
+      v_store_128(out, v);
+      out += bump;
+      len -= bump;
+      if (len > 0) {
+        v = v_load16_dup(out - 2);
+        do {
+          v_store_128(out, v);
+          out += sizeof(v);
+          len -= sizeof(v);
+        } while (len > 0);
+      }
+      return out;
+    case 4:
+      v = v_load32_dup(out - 4);
+      v_store_128(out, v);
+      out += bump;
+      len -= bump;
+      if (len > 0) {
+        v = v_load32_dup(out - 4);
+        do {
+          v_store_128(out, v);
+          out += sizeof(v);
+          len -= sizeof(v);
+        } while (len > 0);
+      }
+      return out;
+    case 8:
+      v = v_load64_dup(out - 8);
+      v_store_128(out, v);
+      out += bump;
+      len -= bump;
+      if (len > 0) {
+        v = v_load64_dup(out - 8);
+        do {
+          v_store_128(out, v);
+          out += sizeof(v);
+          len -= sizeof(v);
+        } while (len > 0);
+      }
+      return out;
+  }
+  out = chunkunroll_relaxed(out, &period, &len);
+  return chunkcopy_core(out, out - period, len);
+}
+
+/*
+ * Perform a memcpy-like operation, but assume that length is non-zero and that
+ * it's OK to overwrite at least CHUNKCOPY_CHUNK_SIZE bytes of output even if
+ * the length is shorter than this.
+ *
+ * Unlike chunkcopy_core() above, no guarantee is made regarding the behaviour
+ * of overlapping buffers, regardless of the distance between the pointers.
+ * This is reflected in the `restrict`-qualified pointers, allowing the
+ * compiler to re-order loads and stores.
+ */
+static inline unsigned char FAR* chunkcopy_relaxed(
+    unsigned char FAR* Z_RESTRICT out,
+    const unsigned char FAR* Z_RESTRICT from,
+    unsigned len) {
+  Assert((uintptr_t)out - (uintptr_t)from >= len,
+         "invalid restrict in chunkcopy_relaxed");
+  Assert((uintptr_t)from - (uintptr_t)out >= len,
+         "invalid restrict in chunkcopy_relaxed");
+  return chunkcopy_core(out, from, len);
+}
+
+/*
+ * Like chunkcopy_relaxed(), but avoid writing beyond of legal output.
+ *
+ * Unlike chunkcopy_core_safe() above, no guarantee is made regarding the
+ * behaviour of overlapping buffers, regardless of the distance between the
+ * pointers.  This is reflected in the `restrict`-qualified pointers, allowing
+ * the compiler to re-order loads and stores.
+ *
+ * Accepts an additional pointer to the end of safe output.  A generic safe
+ * copy would use (out + len), but it's normally the case that the end of the
+ * output buffer is beyond the end of the current copy, and this can still be
+ * exploited.
+ */
+static inline unsigned char FAR* chunkcopy_safe(
+    unsigned char FAR* out,
+    const unsigned char FAR* Z_RESTRICT from,
+    unsigned len,
+    unsigned char FAR* limit) {
+  Assert(out + len <= limit, "chunk copy exceeds safety limit");
+  Assert((uintptr_t)out - (uintptr_t)from >= len,
+         "invalid restrict in chunkcopy_safe");
+  Assert((uintptr_t)from - (uintptr_t)out >= len,
+         "invalid restrict in chunkcopy_safe");
+
+  return chunkcopy_core_safe(out, from, len, limit);
+}
+
+/*
+ * Perform chunky copy within the same buffer, where the source and destination
+ * may potentially overlap.
+ *
+ * Assumes that len > 0 on entry, and that it's safe to write at least
+ * CHUNKCOPY_CHUNK_SIZE*3 bytes to the output.
+ */
+static inline unsigned char FAR* chunkcopy_lapped_relaxed(
+    unsigned char FAR* out,
+    unsigned dist,
+    unsigned len) {
+  if (dist < len && dist < CHUNKCOPY_CHUNK_SIZE) {
+    return chunkset_core(out, dist, len);
+  }
+  return chunkcopy_core(out, out - dist, len);
+}
+
+/*
+ * Behave like chunkcopy_lapped_relaxed(), but avoid writing beyond of legal
+ * output.
+ *
+ * Accepts an additional pointer to the end of safe output.  A generic safe
+ * copy would use (out + len), but it's normally the case that the end of the
+ * output buffer is beyond the end of the current copy, and this can still be
+ * exploited.
+ */
+static inline unsigned char FAR* chunkcopy_lapped_safe(
+    unsigned char FAR* out,
+    unsigned dist,
+    unsigned len,
+    unsigned char FAR* limit) {
+  Assert(out + len <= limit, "chunk copy exceeds safety limit");
+  if ((limit - out) < (ptrdiff_t)(3 * CHUNKCOPY_CHUNK_SIZE)) {
+    /* TODO(cavalcantii): try harder to optimise this */
+    while (len-- > 0) {
+      *out = *(out - dist);
+      out++;
+    }
+    return out;
+  }
+  return chunkcopy_lapped_relaxed(out, dist, len);
+}
+
+/* TODO(cavalcanti): see crbug.com/1110083. */
+static inline unsigned char FAR* chunkcopy_safe_ugly(unsigned char FAR* out,
+                                                     unsigned dist,
+                                                     unsigned len,
+                                                     unsigned char FAR* limit) {
+#if defined(__GNUC__) && !defined(__clang__)
+  /* Speed is the same as using chunkcopy_safe
+     w/ GCC on ARM (tested gcc 6.3 and 7.5) and avoids
+     undefined behavior.
+  */
+  return chunkcopy_core_safe(out, out - dist, len, limit);
+#elif defined(__clang__) && defined(ARMV8_OS_ANDROID) && !defined(__aarch64__)
+  /* Seems to perform better on 32bit (i.e. Android). */
+  return chunkcopy_core_safe(out, out - dist, len, limit);
+#else
+  /* Seems to perform better on 64bit. */
+  return chunkcopy_lapped_safe(out, dist, len, limit);
+#endif
+}
+
+/*
+ * The chunk-copy code above deals with writing the decoded DEFLATE data to
+ * the output with SIMD methods to increase decode speed. Reading the input
+ * to the DEFLATE decoder with a wide, SIMD method can also increase decode
+ * speed. This option is supported on little endian machines, and reads the
+ * input data in 64-bit (8 byte) chunks.
+ */
+
+#ifdef INFLATE_CHUNK_READ_64LE
+/*
+ * Buffer the input in a uint64_t (8 bytes) in the wide input reading case.
+ */
+typedef uint64_t inflate_holder_t;
+
+/*
+ * Ask the compiler to perform a wide, unaligned load of a uint64_t using a
+ * machine instruction appropriate for the uint64_t type.
+ */
+static inline inflate_holder_t read64le(const unsigned char FAR *in) {
+    inflate_holder_t input;
+    Z_BUILTIN_MEMCPY(&input, in, sizeof(input));
+    return input;
+}
+#else
+/*
+ * Otherwise, buffer the input bits using zlib's default input buffer type.
+ */
+typedef unsigned long inflate_holder_t;
+
+#endif /* INFLATE_CHUNK_READ_64LE */
+
+#undef Z_STATIC_ASSERT
+#undef Z_RESTRICT
+#undef Z_BUILTIN_MEMCPY
+#undef Z_DISABLE_MSAN
+
+#endif /* CHUNKCOPY_H */
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/optimizations/inffast_chunk.c b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/optimizations/inffast_chunk.c
new file mode 100644
index 000000000..b1db452c2
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/optimizations/inffast_chunk.c
@@ -0,0 +1,376 @@
+/* inffast_chunk.c -- fast decoding
+ * Copyright (C) 1995-2017 Mark Adler
+ * Copyright 2023 The Chromium Authors
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+#include "inflate.h"
+#include "contrib/optimizations/inffast_chunk.h"
+#include "contrib/optimizations/chunkcopy.h"
+
+#ifdef ASMINF
+#  pragma message("Assembler code may have bugs -- use at your own risk")
+#else
+
+/*
+   Decode literal, length, and distance codes and write out the resulting
+   literal and match bytes until either not enough input or output is
+   available, an end-of-block is encountered, or a data error is encountered.
+   When large enough input and output buffers are supplied to inflate(), for
+   example, a 16K input buffer and a 64K output buffer, more than 95% of the
+   inflate() execution time is spent in this routine.
+
+   Entry assumptions:
+
+        state->mode == LEN
+        strm->avail_in >= INFLATE_FAST_MIN_INPUT (6 or 8 bytes + 7 bytes)
+        strm->avail_out >= INFLATE_FAST_MIN_OUTPUT (258 bytes + 2 bytes)
+        start >= strm->avail_out
+        state->bits < 8
+        (state->hold >> state->bits) == 0
+        strm->next_out[0..strm->avail_out] does not overlap with
+              strm->next_in[0..strm->avail_in]
+        strm->state->window is allocated with an additional
+              CHUNKCOPY_CHUNK_SIZE-1 bytes of padding beyond strm->state->wsize
+
+   On return, state->mode is one of:
+
+        LEN -- ran out of enough output space or enough available input
+        TYPE -- reached end of block code, inflate() to interpret next block
+        BAD -- error in block data
+
+   Notes:
+
+    INFLATE_FAST_MIN_INPUT: 6 or 8 bytes + 7 bytes
+
+    - The maximum input bits used by a length/distance pair is 15 bits for the
+      length code, 5 bits for the length extra, 15 bits for the distance code,
+      and 13 bits for the distance extra.  This totals 48 bits, or six bytes.
+      Therefore if strm->avail_in >= 6, then there is enough input to avoid
+      checking for available input while decoding.
+
+    - The wide input data reading option reads 64 input bits at a time. Thus,
+      if strm->avail_in >= 8, then there is enough input to avoid checking for
+      available input while decoding. Reading consumes the input with:
+
+          hold |= read64le(in) << bits;
+          in += 6;
+          bits += 48;
+
+      reporting 6 bytes of new input because |bits| is 0..15 (2 bytes rounded
+      up, worst case) and 6 bytes is enough to decode as noted above. At exit,
+      hold &= (1U << bits) - 1 drops excess input to keep the invariant:
+
+          (state->hold >> state->bits) == 0
+
+    INFLATE_FAST_MIN_OUTPUT: 258 bytes + 2 bytes for literals = 260 bytes
+
+    - The maximum bytes that a single length/distance pair can output is 258
+      bytes, which is the maximum length that can be coded.  inflate_fast()
+      requires strm->avail_out >= 260 for each loop to avoid checking for
+      available output space while decoding.
+ */
+void ZLIB_INTERNAL inflate_fast_chunk_(z_streamp strm, unsigned start) {
+    struct inflate_state FAR *state;
+    z_const unsigned char FAR *in;      /* local strm->next_in */
+    z_const unsigned char FAR *last;    /* have enough input while in < last */
+    unsigned char FAR *out;     /* local strm->next_out */
+    unsigned char FAR *beg;     /* inflate()'s initial strm->next_out */
+    unsigned char FAR *end;     /* while out < end, enough space available */
+    unsigned char FAR *limit;   /* safety limit for chunky copies */
+#ifdef INFLATE_STRICT
+    unsigned dmax;              /* maximum distance from zlib header */
+#endif
+    unsigned wsize;             /* window size or zero if not using window */
+    unsigned whave;             /* valid bytes in the window */
+    unsigned wnext;             /* window write index */
+    unsigned char FAR *window;  /* allocated sliding window, if wsize != 0 */
+    inflate_holder_t hold;      /* local strm->hold */
+    unsigned bits;              /* local strm->bits */
+    code const FAR *lcode;      /* local strm->lencode */
+    code const FAR *dcode;      /* local strm->distcode */
+    unsigned lmask;             /* mask for first level of length codes */
+    unsigned dmask;             /* mask for first level of distance codes */
+    code const *here;           /* retrieved table entry */
+    unsigned op;                /* code bits, operation, extra bits, or */
+                                /*  window position, window bytes to copy */
+    unsigned len;               /* match length, unused bytes */
+    unsigned dist;              /* match distance */
+    unsigned char FAR *from;    /* where to copy match from */
+
+    /* copy state to local variables */
+    state = (struct inflate_state FAR *)strm->state;
+    in = strm->next_in;
+    last = in + (strm->avail_in - (INFLATE_FAST_MIN_INPUT - 1));
+    out = strm->next_out;
+    beg = out - (start - strm->avail_out);
+    end = out + (strm->avail_out - (INFLATE_FAST_MIN_OUTPUT - 1));
+    limit = out + strm->avail_out;
+#ifdef INFLATE_STRICT
+    dmax = state->dmax;
+#endif
+    wsize = state->wsize;
+    whave = state->whave;
+    wnext = (state->wnext == 0 && whave >= wsize) ? wsize : state->wnext;
+    window = state->window;
+    hold = state->hold;
+    bits = state->bits;
+    lcode = state->lencode;
+    dcode = state->distcode;
+    lmask = (1U << state->lenbits) - 1;
+    dmask = (1U << state->distbits) - 1;
+
+#ifdef INFLATE_CHUNK_READ_64LE
+#define REFILL() do { \
+        Assert(bits < 64, "### Too many bits in inflate_fast."); \
+        hold |= read64le(in) << bits; \
+        in += 7; \
+        in -= bits >> 3; \
+        bits |= 56; \
+    } while (0)
+#endif
+
+    /* decode literals and length/distances until end-of-block or not enough
+       input data or output space */
+    do {
+#ifdef INFLATE_CHUNK_READ_64LE
+        REFILL();
+#else
+        if (bits < 15) {
+            hold += (unsigned long)(*in++) << bits;
+            bits += 8;
+            hold += (unsigned long)(*in++) << bits;
+            bits += 8;
+        }
+#endif
+        here = lcode + (hold & lmask);
+#ifdef INFLATE_CHUNK_READ_64LE
+        if (here->op == 0) {                    /* literal */
+            Tracevv((stderr, here->val >= 0x20 && here->val < 0x7f ?
+                    "inflate:         literal '%c'\n" :
+                    "inflate:         literal 0x%02x\n", here->val));
+            *out++ = (unsigned char)(here->val);
+            hold >>= here->bits;
+            bits -= here->bits;
+            here = lcode + (hold & lmask);
+            if (here->op == 0) {                /* literal */
+                Tracevv((stderr, here->val >= 0x20 && here->val < 0x7f ?
+                        "inflate:    2nd  literal '%c'\n" :
+                        "inflate:    2nd  literal 0x%02x\n", here->val));
+                *out++ = (unsigned char)(here->val);
+                hold >>= here->bits;
+                bits -= here->bits;
+                here = lcode + (hold & lmask);
+            }
+        }
+#endif
+      dolen:
+        op = (unsigned)(here->bits);
+        hold >>= op;
+        bits -= op;
+        op = (unsigned)(here->op);
+        if (op == 0) {                          /* literal */
+            Tracevv((stderr, here->val >= 0x20 && here->val < 0x7f ?
+                    "inflate:         literal '%c'\n" :
+                    "inflate:         literal 0x%02x\n", here->val));
+            *out++ = (unsigned char)(here->val);
+        }
+        else if (op & 16) {                     /* length base */
+            len = (unsigned)(here->val);
+            op &= 15;                           /* number of extra bits */
+            if (op) {
+#ifndef INFLATE_CHUNK_READ_64LE
+                if (bits < op) {
+                    hold += (unsigned long)(*in++) << bits;
+                    bits += 8;
+                }
+#endif
+                len += (unsigned)hold & ((1U << op) - 1);
+                hold >>= op;
+                bits -= op;
+            }
+            Tracevv((stderr, "inflate:         length %u\n", len));
+#ifndef INFLATE_CHUNK_READ_64LE
+            if (bits < 15) {
+                hold += (unsigned long)(*in++) << bits;
+                bits += 8;
+                hold += (unsigned long)(*in++) << bits;
+                bits += 8;
+            }
+#endif
+            here = dcode + (hold & dmask);
+          dodist:
+            op = (unsigned)(here->bits);
+            hold >>= op;
+            bits -= op;
+            op = (unsigned)(here->op);
+            if (op & 16) {                      /* distance base */
+                dist = (unsigned)(here->val);
+                op &= 15;                       /* number of extra bits */
+                /* we have two fast-path loads: 10+10 + 15+5 + 15 = 55,
+                   but we may need to refill here in the worst case */
+                if (bits < op) {
+#ifdef INFLATE_CHUNK_READ_64LE
+                    REFILL();
+#else
+                    hold += (unsigned long)(*in++) << bits;
+                    bits += 8;
+                    if (bits < op) {
+                        hold += (unsigned long)(*in++) << bits;
+                        bits += 8;
+                    }
+#endif
+                }
+                dist += (unsigned)hold & ((1U << op) - 1);
+#ifdef INFLATE_STRICT
+                if (dist > dmax) {
+                    strm->msg = (char *)"invalid distance too far back";
+                    state->mode = BAD;
+                    break;
+                }
+#endif
+                hold >>= op;
+                bits -= op;
+                Tracevv((stderr, "inflate:         distance %u\n", dist));
+                op = (unsigned)(out - beg);     /* max distance in output */
+                if (dist > op) {                /* see if copy from window */
+                    op = dist - op;             /* distance back in window */
+                    if (op > whave) {
+                        if (state->sane) {
+                            strm->msg =
+                                (char *)"invalid distance too far back";
+                            state->mode = BAD;
+                            break;
+                        }
+#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
+                        if (len <= op - whave) {
+                            do {
+                                *out++ = 0;
+                            } while (--len);
+                            continue;
+                        }
+                        len -= op - whave;
+                        do {
+                            *out++ = 0;
+                        } while (--op > whave);
+                        if (op == 0) {
+                            from = out - dist;
+                            do {
+                                *out++ = *from++;
+                            } while (--len);
+                            continue;
+                        }
+#endif
+                    }
+                    from = window;
+                    if (wnext >= op) {          /* contiguous in window */
+                        from += wnext - op;
+                    }
+                    else {                      /* wrap around window */
+                        op -= wnext;
+                        from += wsize - op;
+                        if (op < len) {         /* some from end of window */
+                            len -= op;
+                            out = chunkcopy_safe(out, from, op, limit);
+                            from = window;      /* more from start of window */
+                            op = wnext;
+                            /* This (rare) case can create a situation where
+                               the first chunkcopy below must be checked.
+                             */
+                        }
+                    }
+                    if (op < len) {             /* still need some from output */
+                        out = chunkcopy_safe(out, from, op, limit);
+                        len -= op;
+                        /* When dist is small the amount of data that can be
+                           copied from the window is also small, and progress
+                           towards the dangerous end of the output buffer is
+                           also small.  This means that for trivial memsets and
+                           for chunkunroll_relaxed() a safety check is
+                           unnecessary.  However, these conditions may not be
+                           entered at all, and in that case it's possible that
+                           the main copy is near the end.
+                          */
+                        out = chunkunroll_relaxed(out, &dist, &len);
+                        out = chunkcopy_safe_ugly(out, dist, len, limit);
+                    } else {
+                        /* from points to window, so there is no risk of
+                           overlapping pointers requiring memset-like behaviour
+                         */
+                        out = chunkcopy_safe(out, from, len, limit);
+                    }
+                }
+                else {
+                    /* Whole reference is in range of current output.  No
+                       range checks are necessary because we start with room
+                       for at least 258 bytes of output, so unroll and roundoff
+                       operations can write beyond `out+len` so long as they
+                       stay within 258 bytes of `out`.
+                     */
+                    out = chunkcopy_lapped_relaxed(out, dist, len);
+                }
+            }
+            else if ((op & 64) == 0) {          /* 2nd level distance code */
+                here = dcode + here->val + (hold & ((1U << op) - 1));
+                goto dodist;
+            }
+            else {
+                strm->msg = (char *)"invalid distance code";
+                state->mode = BAD;
+                break;
+            }
+        }
+        else if ((op & 64) == 0) {              /* 2nd level length code */
+            here = lcode + here->val + (hold & ((1U << op) - 1));
+            goto dolen;
+        }
+        else if (op & 32) {                     /* end-of-block */
+            Tracevv((stderr, "inflate:         end of block\n"));
+            state->mode = TYPE;
+            break;
+        }
+        else {
+            strm->msg = (char *)"invalid literal/length code";
+            state->mode = BAD;
+            break;
+        }
+    } while (in < last && out < end);
+
+    /* return unused bytes (on entry, bits < 8, so in won't go too far back) */
+    len = bits >> 3;
+    in -= len;
+    bits -= len << 3;
+    hold &= (1U << bits) - 1;
+
+    /* update state and return */
+    strm->next_in = in;
+    strm->next_out = out;
+    strm->avail_in = (unsigned)(in < last ?
+        (INFLATE_FAST_MIN_INPUT - 1) + (last - in) :
+        (INFLATE_FAST_MIN_INPUT - 1) - (in - last));
+    strm->avail_out = (unsigned)(out < end ?
+        (INFLATE_FAST_MIN_OUTPUT - 1) + (end - out) :
+        (INFLATE_FAST_MIN_OUTPUT - 1) - (out - end));
+    state->hold = hold;
+    state->bits = bits;
+
+    Assert((state->hold >> state->bits) == 0, "invalid input data state");
+}
+
+/*
+   inflate_fast() speedups that turned out slower (on a PowerPC G3 750CXe):
+   - Using bit fields for code structure
+   - Different op definition to avoid & for extra bits (do & for table bits)
+   - Three separate decoding do-loops for direct, window, and wnext == 0
+   - Special case for distance > 1 copies to do overlapped load and store copy
+   - Explicit branch predictions (based on measured branch probabilities)
+   - Deferring match copy and interspersed it with decoding subsequent codes
+   - Swapping literal/length else
+   - Swapping window/direct else
+   - Larger unrolled copy loops (three is about right)
+   - Moving len -= 3 statement into middle of loop
+ */
+
+#endif /* !ASMINF */
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/optimizations/inffast_chunk.h b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/optimizations/inffast_chunk.h
new file mode 100644
index 000000000..e75ee5e91
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/optimizations/inffast_chunk.h
@@ -0,0 +1,42 @@
+/* inffast_chunk.h -- header to use inffast_chunk.c
+ * Copyright (C) 1995-2003, 2010 Mark Adler
+ * Copyright (C) 2017 ARM, Inc.
+ * Copyright 2023 The Chromium Authors
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+#include "inffast.h"
+
+/* INFLATE_FAST_MIN_INPUT:
+   The minimum number of input bytes needed so that we can safely call
+   inflate_fast() with only one up-front bounds check. One
+   length/distance code pair (15 bits for the length code, 5 bits for length
+   extra, 15 bits for the distance code, 13 bits for distance extra) requires
+   reading up to 48 input bits. Additionally, in the same iteraction, we may
+   decode two literals from the root-table (requiring MIN_OUTPUT = 258 + 2).
+
+   Each root-table entry is up to 10 bits, for a total of 68 input bits each
+   iteraction.
+
+   The refill variant reads 8 bytes from the buffer at a time, and advances
+   the input pointer by up to 7 bytes, ensuring there are at least 56-bits
+   available in the bit-buffer. The technique was documented by Fabian Giesen
+   on his blog as variant 4 in the article 'Reading bits in far too many ways':
+   https://fgiesen.wordpress.com/2018/02/20/
+
+   In the worst case, we may refill twice in the same iteraction, requiring
+   MIN_INPUT = 8 + 7.
+*/
+#ifdef INFLATE_CHUNK_READ_64LE
+#undef INFLATE_FAST_MIN_INPUT
+#define INFLATE_FAST_MIN_INPUT 15
+#undef INFLATE_FAST_MIN_OUTPUT
+#define INFLATE_FAST_MIN_OUTPUT 260
+#endif
+
+void ZLIB_INTERNAL inflate_fast_chunk_(z_streamp strm, unsigned start);
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/optimizations/inflate.c b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/optimizations/inflate.c
new file mode 100644
index 000000000..2a8e0ef76
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/optimizations/inflate.c
@@ -0,0 +1,1562 @@
+/* inflate.c -- zlib decompression
+ * Copyright (C) 1995-2022 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+ * Change history:
+ *
+ * 1.2.beta0    24 Nov 2002
+ * - First version -- complete rewrite of inflate to simplify code, avoid
+ *   creation of window when not needed, minimize use of window when it is
+ *   needed, make inffast.c even faster, implement gzip decoding, and to
+ *   improve code readability and style over the previous zlib inflate code
+ *
+ * 1.2.beta1    25 Nov 2002
+ * - Use pointers for available input and output checking in inffast.c
+ * - Remove input and output counters in inffast.c
+ * - Change inffast.c entry and loop from avail_in >= 7 to >= 6
+ * - Remove unnecessary second byte pull from length extra in inffast.c
+ * - Unroll direct copy to three copies per loop in inffast.c
+ *
+ * 1.2.beta2    4 Dec 2002
+ * - Change external routine names to reduce potential conflicts
+ * - Correct filename to inffixed.h for fixed tables in inflate.c
+ * - Make hbuf[] unsigned char to match parameter type in inflate.c
+ * - Change strm->next_out[-state->offset] to *(strm->next_out - state->offset)
+ *   to avoid negation problem on Alphas (64 bit) in inflate.c
+ *
+ * 1.2.beta3    22 Dec 2002
+ * - Add comments on state->bits assertion in inffast.c
+ * - Add comments on op field in inftrees.h
+ * - Fix bug in reuse of allocated window after inflateReset()
+ * - Remove bit fields--back to byte structure for speed
+ * - Remove distance extra == 0 check in inflate_fast()--only helps for lengths
+ * - Change post-increments to pre-increments in inflate_fast(), PPC biased?
+ * - Add compile time option, POSTINC, to use post-increments instead (Intel?)
+ * - Make MATCH copy in inflate() much faster for when inflate_fast() not used
+ * - Use local copies of stream next and avail values, as well as local bit
+ *   buffer and bit count in inflate()--for speed when inflate_fast() not used
+ *
+ * 1.2.beta4    1 Jan 2003
+ * - Split ptr - 257 statements in inflate_table() to avoid compiler warnings
+ * - Move a comment on output buffer sizes from inffast.c to inflate.c
+ * - Add comments in inffast.c to introduce the inflate_fast() routine
+ * - Rearrange window copies in inflate_fast() for speed and simplification
+ * - Unroll last copy for window match in inflate_fast()
+ * - Use local copies of window variables in inflate_fast() for speed
+ * - Pull out common wnext == 0 case for speed in inflate_fast()
+ * - Make op and len in inflate_fast() unsigned for consistency
+ * - Add FAR to lcode and dcode declarations in inflate_fast()
+ * - Simplified bad distance check in inflate_fast()
+ * - Added inflateBackInit(), inflateBack(), and inflateBackEnd() in new
+ *   source file infback.c to provide a call-back interface to inflate for
+ *   programs like gzip and unzip -- uses window as output buffer to avoid
+ *   window copying
+ *
+ * 1.2.beta5    1 Jan 2003
+ * - Improved inflateBack() interface to allow the caller to provide initial
+ *   input in strm.
+ * - Fixed stored blocks bug in inflateBack()
+ *
+ * 1.2.beta6    4 Jan 2003
+ * - Added comments in inffast.c on effectiveness of POSTINC
+ * - Typecasting all around to reduce compiler warnings
+ * - Changed loops from while (1) or do {} while (1) to for (;;), again to
+ *   make compilers happy
+ * - Changed type of window in inflateBackInit() to unsigned char *
+ *
+ * 1.2.beta7    27 Jan 2003
+ * - Changed many types to unsigned or unsigned short to avoid warnings
+ * - Added inflateCopy() function
+ *
+ * 1.2.0        9 Mar 2003
+ * - Changed inflateBack() interface to provide separate opaque descriptors
+ *   for the in() and out() functions
+ * - Changed inflateBack() argument and in_func typedef to swap the length
+ *   and buffer address return values for the input function
+ * - Check next_in and next_out for Z_NULL on entry to inflate()
+ *
+ * The history for versions after 1.2.0 are in ChangeLog in zlib distribution.
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+#include "inflate.h"
+#include "contrib/optimizations/inffast_chunk.h"
+#include "contrib/optimizations/chunkcopy.h"
+
+#ifdef MAKEFIXED
+#  ifndef BUILDFIXED
+#    define BUILDFIXED
+#  endif
+#endif
+
+local int inflateStateCheck(z_streamp strm) {
+    struct inflate_state FAR *state;
+    if (strm == Z_NULL ||
+        strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0)
+        return 1;
+    state = (struct inflate_state FAR *)strm->state;
+    if (state == Z_NULL || state->strm != strm ||
+        state->mode < HEAD || state->mode > SYNC)
+        return 1;
+    return 0;
+}
+
+int ZEXPORT inflateResetKeep(z_streamp strm) {
+    struct inflate_state FAR *state;
+
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    strm->total_in = strm->total_out = state->total = 0;
+    strm->msg = Z_NULL;
+    if (state->wrap)        /* to support ill-conceived Java test suite */
+        strm->adler = state->wrap & 1;
+    state->mode = HEAD;
+    state->last = 0;
+    state->havedict = 0;
+    state->flags = -1;
+    state->dmax = 32768U;
+    state->head = Z_NULL;
+    state->hold = 0;
+    state->bits = 0;
+    state->lencode = state->distcode = state->next = state->codes;
+    state->sane = 1;
+    state->back = -1;
+    Tracev((stderr, "inflate: reset\n"));
+    return Z_OK;
+}
+
+int ZEXPORT inflateReset(z_streamp strm) {
+    struct inflate_state FAR *state;
+
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    state->wsize = 0;
+    state->whave = 0;
+    state->wnext = 0;
+    return inflateResetKeep(strm);
+}
+
+int ZEXPORT inflateReset2(z_streamp strm, int windowBits) {
+    int wrap;
+    struct inflate_state FAR *state;
+
+    /* get the state */
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+
+    /* extract wrap request from windowBits parameter */
+    if (windowBits < 0) {
+        if (windowBits < -15)
+            return Z_STREAM_ERROR;
+        wrap = 0;
+        windowBits = -windowBits;
+    }
+    else {
+        wrap = (windowBits >> 4) + 5;
+#ifdef GUNZIP
+        if (windowBits < 48)
+            windowBits &= 15;
+#endif
+    }
+
+    /* set number of window bits, free window if different */
+    if (windowBits && (windowBits < 8 || windowBits > 15))
+        return Z_STREAM_ERROR;
+    if (state->window != Z_NULL && state->wbits != (unsigned)windowBits) {
+        ZFREE(strm, state->window);
+        state->window = Z_NULL;
+    }
+
+    /* update state and reset the rest of it */
+    state->wrap = wrap;
+    state->wbits = (unsigned)windowBits;
+    return inflateReset(strm);
+}
+
+int ZEXPORT inflateInit2_(z_streamp strm, int windowBits,
+                          const char *version, int stream_size) {
+    int ret;
+    struct inflate_state FAR *state;
+
+    if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
+        stream_size != (int)(sizeof(z_stream)))
+        return Z_VERSION_ERROR;
+    if (strm == Z_NULL) return Z_STREAM_ERROR;
+    strm->msg = Z_NULL;                 /* in case we return an error */
+    if (strm->zalloc == (alloc_func)0) {
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+        strm->zalloc = zcalloc;
+        strm->opaque = (voidpf)0;
+#endif
+    }
+    if (strm->zfree == (free_func)0)
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+        strm->zfree = zcfree;
+#endif
+    state = (struct inflate_state FAR *)
+            ZALLOC(strm, 1, sizeof(struct inflate_state));
+    if (state == Z_NULL) return Z_MEM_ERROR;
+    Tracev((stderr, "inflate: allocated\n"));
+    strm->state = (struct internal_state FAR *)state;
+    state->strm = strm;
+    state->window = Z_NULL;
+    state->mode = HEAD;     /* to pass state test in inflateReset2() */
+    state->check = 1L;      /* 1L is the result of adler32() zero length data */
+    ret = inflateReset2(strm, windowBits);
+    if (ret != Z_OK) {
+        ZFREE(strm, state);
+        strm->state = Z_NULL;
+    }
+    return ret;
+}
+
+int ZEXPORT inflateInit_(z_streamp strm, const char *version,
+                         int stream_size) {
+    return inflateInit2_(strm, DEF_WBITS, version, stream_size);
+}
+
+int ZEXPORT inflatePrime(z_streamp strm, int bits, int value) {
+    struct inflate_state FAR *state;
+
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    if (bits == 0)
+        return Z_OK;
+    state = (struct inflate_state FAR *)strm->state;
+    if (bits < 0) {
+        state->hold = 0;
+        state->bits = 0;
+        return Z_OK;
+    }
+    if (bits > 16 || state->bits + (uInt)bits > 32) return Z_STREAM_ERROR;
+    value &= (1L << bits) - 1;
+    state->hold += (unsigned)value << state->bits;
+    state->bits += (uInt)bits;
+    return Z_OK;
+}
+
+/*
+   Return state with length and distance decoding tables and index sizes set to
+   fixed code decoding.  Normally this returns fixed tables from inffixed.h.
+   If BUILDFIXED is defined, then instead this routine builds the tables the
+   first time it's called, and returns those tables the first time and
+   thereafter.  This reduces the size of the code by about 2K bytes, in
+   exchange for a little execution time.  However, BUILDFIXED should not be
+   used for threaded applications, since the rewriting of the tables and virgin
+   may not be thread-safe.
+ */
+local void fixedtables(struct inflate_state FAR *state) {
+#ifdef BUILDFIXED
+    static int virgin = 1;
+    static code *lenfix, *distfix;
+    static code fixed[544];
+
+    /* build fixed huffman tables if first call (may not be thread safe) */
+    if (virgin) {
+        unsigned sym, bits;
+        static code *next;
+
+        /* literal/length table */
+        sym = 0;
+        while (sym < 144) state->lens[sym++] = 8;
+        while (sym < 256) state->lens[sym++] = 9;
+        while (sym < 280) state->lens[sym++] = 7;
+        while (sym < 288) state->lens[sym++] = 8;
+        next = fixed;
+        lenfix = next;
+        bits = 9;
+        inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);
+
+        /* distance table */
+        sym = 0;
+        while (sym < 32) state->lens[sym++] = 5;
+        distfix = next;
+        bits = 5;
+        inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);
+
+        /* do this just once */
+        virgin = 0;
+    }
+#else /* !BUILDFIXED */
+#   include "inffixed.h"
+#endif /* BUILDFIXED */
+    state->lencode = lenfix;
+    state->lenbits = 9;
+    state->distcode = distfix;
+    state->distbits = 5;
+}
+
+#ifdef MAKEFIXED
+#include <stdio.h>
+
+/*
+   Write out the inffixed.h that is #include'd above.  Defining MAKEFIXED also
+   defines BUILDFIXED, so the tables are built on the fly.  makefixed() writes
+   those tables to stdout, which would be piped to inffixed.h.  A small program
+   can simply call makefixed to do this:
+
+    void makefixed(void);
+
+    int main(void)
+    {
+        makefixed();
+        return 0;
+    }
+
+   Then that can be linked with zlib built with MAKEFIXED defined and run:
+
+    a.out > inffixed.h
+ */
+void makefixed(void)
+{
+    unsigned low, size;
+    struct inflate_state state;
+
+    fixedtables(&state);
+    puts("    /* inffixed.h -- table for decoding fixed codes");
+    puts("     * Generated automatically by makefixed().");
+    puts("     */");
+    puts("");
+    puts("    /* WARNING: this file should *not* be used by applications.");
+    puts("       It is part of the implementation of this library and is");
+    puts("       subject to change. Applications should only use zlib.h.");
+    puts("     */");
+    puts("");
+    size = 1U << 9;
+    printf("    static const code lenfix[%u] = {", size);
+    low = 0;
+    for (;;) {
+        if ((low % 7) == 0) printf("\n        ");
+        printf("{%u,%u,%d}", (low & 127) == 99 ? 64 : state.lencode[low].op,
+               state.lencode[low].bits, state.lencode[low].val);
+        if (++low == size) break;
+        putchar(',');
+    }
+    puts("\n    };");
+    size = 1U << 5;
+    printf("\n    static const code distfix[%u] = {", size);
+    low = 0;
+    for (;;) {
+        if ((low % 6) == 0) printf("\n        ");
+        printf("{%u,%u,%d}", state.distcode[low].op, state.distcode[low].bits,
+               state.distcode[low].val);
+        if (++low == size) break;
+        putchar(',');
+    }
+    puts("\n    };");
+}
+#endif /* MAKEFIXED */
+
+/*
+   Update the window with the last wsize (normally 32K) bytes written before
+   returning.  If window does not exist yet, create it.  This is only called
+   when a window is already in use, or when output has been written during this
+   inflate call, but the end of the deflate stream has not been reached yet.
+   It is also called to create a window for dictionary data when a dictionary
+   is loaded.
+
+   Providing output buffers larger than 32K to inflate() should provide a speed
+   advantage, since only the last 32K of output is copied to the sliding window
+   upon return from inflate(), and since all distances after the first 32K of
+   output will fall in the output data, making match copies simpler and faster.
+   The advantage may be dependent on the size of the processor's data caches.
+ */
+local int updatewindow(z_streamp strm, const Bytef *end, unsigned copy) {
+    struct inflate_state FAR *state;
+    unsigned dist;
+
+    state = (struct inflate_state FAR *)strm->state;
+
+    /* if it hasn't been done already, allocate space for the window */
+    if (state->window == Z_NULL) {
+        unsigned wsize = 1U << state->wbits;
+        state->window = (unsigned char FAR *)
+                        ZALLOC(strm, wsize + CHUNKCOPY_CHUNK_SIZE,
+                               sizeof(unsigned char));
+        if (state->window == Z_NULL) return 1;
+#ifdef INFLATE_CLEAR_UNUSED_UNDEFINED
+        /* Copies from the overflow portion of this buffer are undefined and
+           may cause analysis tools to raise a warning if we don't initialize
+           it.  However, this undefined data overwrites other undefined data
+           and is subsequently either overwritten or left deliberately
+           undefined at the end of decode; so there's really no point.
+         */
+        zmemzero(state->window + wsize, CHUNKCOPY_CHUNK_SIZE);
+#endif
+    }
+
+    /* if window not in use yet, initialize */
+    if (state->wsize == 0) {
+        state->wsize = 1U << state->wbits;
+        state->wnext = 0;
+        state->whave = 0;
+    }
+
+    /* copy state->wsize or less output bytes into the circular window */
+    if (copy >= state->wsize) {
+        zmemcpy(state->window, end - state->wsize, state->wsize);
+        state->wnext = 0;
+        state->whave = state->wsize;
+    }
+    else {
+        dist = state->wsize - state->wnext;
+        if (dist > copy) dist = copy;
+        zmemcpy(state->window + state->wnext, end - copy, dist);
+        copy -= dist;
+        if (copy) {
+            zmemcpy(state->window, end - copy, copy);
+            state->wnext = copy;
+            state->whave = state->wsize;
+        }
+        else {
+            state->wnext += dist;
+            if (state->wnext == state->wsize) state->wnext = 0;
+            if (state->whave < state->wsize) state->whave += dist;
+        }
+    }
+    return 0;
+}
+
+/* Macros for inflate(): */
+
+/* check function to use adler32() for zlib or crc32() for gzip */
+#ifdef GUNZIP
+#  define UPDATE_CHECK(check, buf, len) \
+    (state->flags ? crc32(check, buf, len) : adler32(check, buf, len))
+#else
+#  define UPDATE_CHECK(check, buf, len) adler32(check, buf, len)
+#endif
+
+/* check macros for header crc */
+#ifdef GUNZIP
+#  define CRC2(check, word) \
+    do { \
+        hbuf[0] = (unsigned char)(word); \
+        hbuf[1] = (unsigned char)((word) >> 8); \
+        check = crc32(check, hbuf, 2); \
+    } while (0)
+
+#  define CRC4(check, word) \
+    do { \
+        hbuf[0] = (unsigned char)(word); \
+        hbuf[1] = (unsigned char)((word) >> 8); \
+        hbuf[2] = (unsigned char)((word) >> 16); \
+        hbuf[3] = (unsigned char)((word) >> 24); \
+        check = crc32(check, hbuf, 4); \
+    } while (0)
+#endif
+
+/* Load registers with state in inflate() for speed */
+#define LOAD() \
+    do { \
+        put = strm->next_out; \
+        left = strm->avail_out; \
+        next = strm->next_in; \
+        have = strm->avail_in; \
+        hold = state->hold; \
+        bits = state->bits; \
+    } while (0)
+
+/* Restore state from registers in inflate() */
+#define RESTORE() \
+    do { \
+        strm->next_out = put; \
+        strm->avail_out = left; \
+        strm->next_in = next; \
+        strm->avail_in = have; \
+        state->hold = hold; \
+        state->bits = bits; \
+    } while (0)
+
+/* Clear the input bit accumulator */
+#define INITBITS() \
+    do { \
+        hold = 0; \
+        bits = 0; \
+    } while (0)
+
+/* Get a byte of input into the bit accumulator, or return from inflate()
+   if there is no input available. */
+#define PULLBYTE() \
+    do { \
+        if (have == 0) goto inf_leave; \
+        have--; \
+        hold += (unsigned long)(*next++) << bits; \
+        bits += 8; \
+    } while (0)
+
+/* Assure that there are at least n bits in the bit accumulator.  If there is
+   not enough available input to do that, then return from inflate(). */
+#define NEEDBITS(n) \
+    do { \
+        while (bits < (unsigned)(n)) \
+            PULLBYTE(); \
+    } while (0)
+
+/* Return the low n bits of the bit accumulator (n < 16) */
+#define BITS(n) \
+    ((unsigned)hold & ((1U << (n)) - 1))
+
+/* Remove n bits from the bit accumulator */
+#define DROPBITS(n) \
+    do { \
+        hold >>= (n); \
+        bits -= (unsigned)(n); \
+    } while (0)
+
+/* Remove zero to seven bits as needed to go to a byte boundary */
+#define BYTEBITS() \
+    do { \
+        hold >>= bits & 7; \
+        bits -= bits & 7; \
+    } while (0)
+
+/*
+   inflate() uses a state machine to process as much input data and generate as
+   much output data as possible before returning.  The state machine is
+   structured roughly as follows:
+
+    for (;;) switch (state) {
+    ...
+    case STATEn:
+        if (not enough input data or output space to make progress)
+            return;
+        ... make progress ...
+        state = STATEm;
+        break;
+    ...
+    }
+
+   so when inflate() is called again, the same case is attempted again, and
+   if the appropriate resources are provided, the machine proceeds to the
+   next state.  The NEEDBITS() macro is usually the way the state evaluates
+   whether it can proceed or should return.  NEEDBITS() does the return if
+   the requested bits are not available.  The typical use of the BITS macros
+   is:
+
+        NEEDBITS(n);
+        ... do something with BITS(n) ...
+        DROPBITS(n);
+
+   where NEEDBITS(n) either returns from inflate() if there isn't enough
+   input left to load n bits into the accumulator, or it continues.  BITS(n)
+   gives the low n bits in the accumulator.  When done, DROPBITS(n) drops
+   the low n bits off the accumulator.  INITBITS() clears the accumulator
+   and sets the number of available bits to zero.  BYTEBITS() discards just
+   enough bits to put the accumulator on a byte boundary.  After BYTEBITS()
+   and a NEEDBITS(8), then BITS(8) would return the next byte in the stream.
+
+   NEEDBITS(n) uses PULLBYTE() to get an available byte of input, or to return
+   if there is no input available.  The decoding of variable length codes uses
+   PULLBYTE() directly in order to pull just enough bytes to decode the next
+   code, and no more.
+
+   Some states loop until they get enough input, making sure that enough
+   state information is maintained to continue the loop where it left off
+   if NEEDBITS() returns in the loop.  For example, want, need, and keep
+   would all have to actually be part of the saved state in case NEEDBITS()
+   returns:
+
+    case STATEw:
+        while (want < need) {
+            NEEDBITS(n);
+            keep[want++] = BITS(n);
+            DROPBITS(n);
+        }
+        state = STATEx;
+    case STATEx:
+
+   As shown above, if the next state is also the next case, then the break
+   is omitted.
+
+   A state may also return if there is not enough output space available to
+   complete that state.  Those states are copying stored data, writing a
+   literal byte, and copying a matching string.
+
+   When returning, a "goto inf_leave" is used to update the total counters,
+   update the check value, and determine whether any progress has been made
+   during that inflate() call in order to return the proper return code.
+   Progress is defined as a change in either strm->avail_in or strm->avail_out.
+   When there is a window, goto inf_leave will update the window with the last
+   output written.  If a goto inf_leave occurs in the middle of decompression
+   and there is no window currently, goto inf_leave will create one and copy
+   output to the window for the next call of inflate().
+
+   In this implementation, the flush parameter of inflate() only affects the
+   return code (per zlib.h).  inflate() always writes as much as possible to
+   strm->next_out, given the space available and the provided input--the effect
+   documented in zlib.h of Z_SYNC_FLUSH.  Furthermore, inflate() always defers
+   the allocation of and copying into a sliding window until necessary, which
+   provides the effect documented in zlib.h for Z_FINISH when the entire input
+   stream available.  So the only thing the flush parameter actually does is:
+   when flush is set to Z_FINISH, inflate() cannot return Z_OK.  Instead it
+   will return Z_BUF_ERROR if it has not reached the end of the stream.
+ */
+
+int ZEXPORT inflate(z_streamp strm, int flush) {
+    struct inflate_state FAR *state;
+    z_const unsigned char FAR *next;    /* next input */
+    unsigned char FAR *put;     /* next output */
+    unsigned have, left;        /* available input and output */
+    unsigned long hold;         /* bit buffer */
+    unsigned bits;              /* bits in bit buffer */
+    unsigned in, out;           /* save starting available input and output */
+    unsigned copy;              /* number of stored or match bytes to copy */
+    unsigned char FAR *from;    /* where to copy match bytes from */
+    code here;                  /* current decoding table entry */
+    code last;                  /* parent table entry */
+    unsigned len;               /* length to copy for repeats, bits to drop */
+    int ret;                    /* return code */
+#ifdef GUNZIP
+    unsigned char hbuf[4];      /* buffer for gzip header crc calculation */
+#endif
+    static const unsigned short order[19] = /* permutation of code lengths */
+        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
+
+    if (inflateStateCheck(strm) || strm->next_out == Z_NULL ||
+        (strm->next_in == Z_NULL && strm->avail_in != 0))
+        return Z_STREAM_ERROR;
+
+    state = (struct inflate_state FAR *)strm->state;
+    if (state->mode == TYPE) state->mode = TYPEDO;      /* skip check */
+    LOAD();
+    in = have;
+    out = left;
+    ret = Z_OK;
+    for (;;)
+        switch (state->mode) {
+        case HEAD:
+            if (state->wrap == 0) {
+                state->mode = TYPEDO;
+                break;
+            }
+            NEEDBITS(16);
+#ifdef GUNZIP
+            if ((state->wrap & 2) && hold == 0x8b1f) {  /* gzip header */
+                if (state->wbits == 0)
+                    state->wbits = 15;
+                state->check = crc32(0L, Z_NULL, 0);
+                CRC2(state->check, hold);
+                INITBITS();
+                state->mode = FLAGS;
+                break;
+            }
+            if (state->head != Z_NULL)
+                state->head->done = -1;
+            if (!(state->wrap & 1) ||   /* check if zlib header allowed */
+#else
+            if (
+#endif
+                ((BITS(8) << 8) + (hold >> 8)) % 31) {
+                strm->msg = (char *)"incorrect header check";
+                state->mode = BAD;
+                break;
+            }
+            if (BITS(4) != Z_DEFLATED) {
+                strm->msg = (char *)"unknown compression method";
+                state->mode = BAD;
+                break;
+            }
+            DROPBITS(4);
+            len = BITS(4) + 8;
+            if (state->wbits == 0)
+                state->wbits = len;
+            if (len > 15 || len > state->wbits) {
+                strm->msg = (char *)"invalid window size";
+                state->mode = BAD;
+                break;
+            }
+            state->dmax = 1U << len;
+            state->flags = 0;               /* indicate zlib header */
+            Tracev((stderr, "inflate:   zlib header ok\n"));
+            strm->adler = state->check = adler32(0L, Z_NULL, 0);
+            state->mode = hold & 0x200 ? DICTID : TYPE;
+            INITBITS();
+            break;
+#ifdef GUNZIP
+        case FLAGS:
+            NEEDBITS(16);
+            state->flags = (int)(hold);
+            if ((state->flags & 0xff) != Z_DEFLATED) {
+                strm->msg = (char *)"unknown compression method";
+                state->mode = BAD;
+                break;
+            }
+            if (state->flags & 0xe000) {
+                strm->msg = (char *)"unknown header flags set";
+                state->mode = BAD;
+                break;
+            }
+            if (state->head != Z_NULL)
+                state->head->text = (int)((hold >> 8) & 1);
+            if ((state->flags & 0x0200) && (state->wrap & 4))
+                CRC2(state->check, hold);
+            INITBITS();
+            state->mode = TIME;
+                /* fallthrough */
+        case TIME:
+            NEEDBITS(32);
+            if (state->head != Z_NULL)
+                state->head->time = hold;
+            if ((state->flags & 0x0200) && (state->wrap & 4))
+                CRC4(state->check, hold);
+            INITBITS();
+            state->mode = OS;
+                /* fallthrough */
+        case OS:
+            NEEDBITS(16);
+            if (state->head != Z_NULL) {
+                state->head->xflags = (int)(hold & 0xff);
+                state->head->os = (int)(hold >> 8);
+            }
+            if ((state->flags & 0x0200) && (state->wrap & 4))
+                CRC2(state->check, hold);
+            INITBITS();
+            state->mode = EXLEN;
+                /* fallthrough */
+        case EXLEN:
+            if (state->flags & 0x0400) {
+                NEEDBITS(16);
+                state->length = (unsigned)(hold);
+                if (state->head != Z_NULL)
+                    state->head->extra_len = (unsigned)hold;
+                if ((state->flags & 0x0200) && (state->wrap & 4))
+                    CRC2(state->check, hold);
+                INITBITS();
+            }
+            else if (state->head != Z_NULL)
+                state->head->extra = Z_NULL;
+            state->mode = EXTRA;
+                /* fallthrough */
+        case EXTRA:
+            if (state->flags & 0x0400) {
+                copy = state->length;
+                if (copy > have) copy = have;
+                if (copy) {
+                    if (state->head != Z_NULL &&
+                        state->head->extra != Z_NULL &&
+                        (len = state->head->extra_len - state->length) <
+                            state->head->extra_max) {
+                        zmemcpy(state->head->extra + len, next,
+                                len + copy > state->head->extra_max ?
+                                state->head->extra_max - len : copy);
+                    }
+                    if ((state->flags & 0x0200) && (state->wrap & 4))
+                        state->check = crc32(state->check, next, copy);
+                    have -= copy;
+                    next += copy;
+                    state->length -= copy;
+                }
+                if (state->length) goto inf_leave;
+            }
+            state->length = 0;
+            state->mode = NAME;
+                /* fallthrough */
+        case NAME:
+            if (state->flags & 0x0800) {
+                if (have == 0) goto inf_leave;
+                copy = 0;
+                do {
+                    len = (unsigned)(next[copy++]);
+                    if (state->head != Z_NULL &&
+                            state->head->name != Z_NULL &&
+                            state->length < state->head->name_max)
+                        state->head->name[state->length++] = (Bytef)len;
+                } while (len && copy < have);
+                if ((state->flags & 0x0200) && (state->wrap & 4))
+                    state->check = crc32(state->check, next, copy);
+                have -= copy;
+                next += copy;
+                if (len) goto inf_leave;
+            }
+            else if (state->head != Z_NULL)
+                state->head->name = Z_NULL;
+            state->length = 0;
+            state->mode = COMMENT;
+                /* fallthrough */
+        case COMMENT:
+            if (state->flags & 0x1000) {
+                if (have == 0) goto inf_leave;
+                copy = 0;
+                do {
+                    len = (unsigned)(next[copy++]);
+                    if (state->head != Z_NULL &&
+                            state->head->comment != Z_NULL &&
+                            state->length < state->head->comm_max)
+                        state->head->comment[state->length++] = (Bytef)len;
+                } while (len && copy < have);
+                if ((state->flags & 0x0200) && (state->wrap & 4))
+                    state->check = crc32(state->check, next, copy);
+                have -= copy;
+                next += copy;
+                if (len) goto inf_leave;
+            }
+            else if (state->head != Z_NULL)
+                state->head->comment = Z_NULL;
+            state->mode = HCRC;
+                /* fallthrough */
+        case HCRC:
+            if (state->flags & 0x0200) {
+                NEEDBITS(16);
+                if ((state->wrap & 4) && hold != (state->check & 0xffff)) {
+                    strm->msg = (char *)"header crc mismatch";
+                    state->mode = BAD;
+                    break;
+                }
+                INITBITS();
+            }
+            if (state->head != Z_NULL) {
+                state->head->hcrc = (int)((state->flags >> 9) & 1);
+                state->head->done = 1;
+            }
+            strm->adler = state->check = crc32(0L, Z_NULL, 0);
+            state->mode = TYPE;
+            break;
+#endif
+        case DICTID:
+            NEEDBITS(32);
+            strm->adler = state->check = ZSWAP32(hold);
+            INITBITS();
+            state->mode = DICT;
+                /* fallthrough */
+        case DICT:
+            if (state->havedict == 0) {
+                RESTORE();
+                return Z_NEED_DICT;
+            }
+            strm->adler = state->check = adler32(0L, Z_NULL, 0);
+            state->mode = TYPE;
+                /* fallthrough */
+        case TYPE:
+            if (flush == Z_BLOCK || flush == Z_TREES) goto inf_leave;
+                /* fallthrough */
+        case TYPEDO:
+            if (state->last) {
+                BYTEBITS();
+                state->mode = CHECK;
+                break;
+            }
+            NEEDBITS(3);
+            state->last = BITS(1);
+            DROPBITS(1);
+            switch (BITS(2)) {
+            case 0:                             /* stored block */
+                Tracev((stderr, "inflate:     stored block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = STORED;
+                break;
+            case 1:                             /* fixed block */
+                fixedtables(state);
+                Tracev((stderr, "inflate:     fixed codes block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = LEN_;             /* decode codes */
+                if (flush == Z_TREES) {
+                    DROPBITS(2);
+                    goto inf_leave;
+                }
+                break;
+            case 2:                             /* dynamic block */
+                Tracev((stderr, "inflate:     dynamic codes block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = TABLE;
+                break;
+            case 3:
+                strm->msg = (char *)"invalid block type";
+                state->mode = BAD;
+            }
+            DROPBITS(2);
+            break;
+        case STORED:
+            BYTEBITS();                         /* go to byte boundary */
+            NEEDBITS(32);
+            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
+                strm->msg = (char *)"invalid stored block lengths";
+                state->mode = BAD;
+                break;
+            }
+            state->length = (unsigned)hold & 0xffff;
+            Tracev((stderr, "inflate:       stored length %u\n",
+                    state->length));
+            INITBITS();
+            state->mode = COPY_;
+            if (flush == Z_TREES) goto inf_leave;
+                /* fallthrough */
+        case COPY_:
+            state->mode = COPY;
+                /* fallthrough */
+        case COPY:
+            copy = state->length;
+            if (copy) {
+                if (copy > have) copy = have;
+                if (copy > left) copy = left;
+                if (copy == 0) goto inf_leave;
+                zmemcpy(put, next, copy);
+                have -= copy;
+                next += copy;
+                left -= copy;
+                put += copy;
+                state->length -= copy;
+                break;
+            }
+            Tracev((stderr, "inflate:       stored end\n"));
+            state->mode = TYPE;
+            break;
+        case TABLE:
+            NEEDBITS(14);
+            state->nlen = BITS(5) + 257;
+            DROPBITS(5);
+            state->ndist = BITS(5) + 1;
+            DROPBITS(5);
+            state->ncode = BITS(4) + 4;
+            DROPBITS(4);
+#ifndef PKZIP_BUG_WORKAROUND
+            if (state->nlen > 286 || state->ndist > 30) {
+                strm->msg = (char *)"too many length or distance symbols";
+                state->mode = BAD;
+                break;
+            }
+#endif
+            Tracev((stderr, "inflate:       table sizes ok\n"));
+            state->have = 0;
+            state->mode = LENLENS;
+                /* fallthrough */
+        case LENLENS:
+            while (state->have < state->ncode) {
+                NEEDBITS(3);
+                state->lens[order[state->have++]] = (unsigned short)BITS(3);
+                DROPBITS(3);
+            }
+            while (state->have < 19)
+                state->lens[order[state->have++]] = 0;
+            state->next = state->codes;
+            state->lencode = (const code FAR *)(state->next);
+            state->lenbits = 7;
+            ret = inflate_table(CODES, state->lens, 19, &(state->next),
+                                &(state->lenbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid code lengths set";
+                state->mode = BAD;
+                break;
+            }
+            Tracev((stderr, "inflate:       code lengths ok\n"));
+            state->have = 0;
+            state->mode = CODELENS;
+                /* fallthrough */
+        case CODELENS:
+            while (state->have < state->nlen + state->ndist) {
+                for (;;) {
+                    here = state->lencode[BITS(state->lenbits)];
+                    if ((unsigned)(here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                if (here.val < 16) {
+                    DROPBITS(here.bits);
+                    state->lens[state->have++] = here.val;
+                }
+                else {
+                    if (here.val == 16) {
+                        NEEDBITS(here.bits + 2);
+                        DROPBITS(here.bits);
+                        if (state->have == 0) {
+                            strm->msg = (char *)"invalid bit length repeat";
+                            state->mode = BAD;
+                            break;
+                        }
+                        len = state->lens[state->have - 1];
+                        copy = 3 + BITS(2);
+                        DROPBITS(2);
+                    }
+                    else if (here.val == 17) {
+                        NEEDBITS(here.bits + 3);
+                        DROPBITS(here.bits);
+                        len = 0;
+                        copy = 3 + BITS(3);
+                        DROPBITS(3);
+                    }
+                    else {
+                        NEEDBITS(here.bits + 7);
+                        DROPBITS(here.bits);
+                        len = 0;
+                        copy = 11 + BITS(7);
+                        DROPBITS(7);
+                    }
+                    if (state->have + copy > state->nlen + state->ndist) {
+                        strm->msg = (char *)"invalid bit length repeat";
+                        state->mode = BAD;
+                        break;
+                    }
+                    while (copy--)
+                        state->lens[state->have++] = (unsigned short)len;
+                }
+            }
+
+            /* handle error breaks in while */
+            if (state->mode == BAD) break;
+
+            /* check for end-of-block code (better have one) */
+            if (state->lens[256] == 0) {
+                strm->msg = (char *)"invalid code -- missing end-of-block";
+                state->mode = BAD;
+                break;
+            }
+
+            /* build code tables -- note: do not change the lenbits or distbits
+               values here (10 and 9) without reading the comments in inftrees.h
+               concerning the ENOUGH constants, which depend on those values */
+            state->next = state->codes;
+            state->lencode = (const code FAR *)(state->next);
+            state->lenbits = 10;
+            ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
+                                &(state->lenbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid literal/lengths set";
+                state->mode = BAD;
+                break;
+            }
+            state->distcode = (const code FAR *)(state->next);
+            state->distbits = 9;
+            ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
+                            &(state->next), &(state->distbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid distances set";
+                state->mode = BAD;
+                break;
+            }
+            Tracev((stderr, "inflate:       codes ok\n"));
+            state->mode = LEN_;
+            if (flush == Z_TREES) goto inf_leave;
+                /* fallthrough */
+        case LEN_:
+            state->mode = LEN;
+                /* fallthrough */
+        case LEN:
+            if (have >= INFLATE_FAST_MIN_INPUT &&
+                left >= INFLATE_FAST_MIN_OUTPUT) {
+                RESTORE();
+                inflate_fast_chunk_(strm, out);
+                LOAD();
+                if (state->mode == TYPE)
+                    state->back = -1;
+                break;
+            }
+            state->back = 0;
+            for (;;) {
+                here = state->lencode[BITS(state->lenbits)];
+                if ((unsigned)(here.bits) <= bits) break;
+                PULLBYTE();
+            }
+            if (here.op && (here.op & 0xf0) == 0) {
+                last = here;
+                for (;;) {
+                    here = state->lencode[last.val +
+                            (BITS(last.bits + last.op) >> last.bits)];
+                    if ((unsigned)(last.bits + here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                DROPBITS(last.bits);
+                state->back += last.bits;
+            }
+            DROPBITS(here.bits);
+            state->back += here.bits;
+            state->length = (unsigned)here.val;
+            if ((int)(here.op) == 0) {
+                Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
+                        "inflate:         literal '%c'\n" :
+                        "inflate:         literal 0x%02x\n", here.val));
+                state->mode = LIT;
+                break;
+            }
+            if (here.op & 32) {
+                Tracevv((stderr, "inflate:         end of block\n"));
+                state->back = -1;
+                state->mode = TYPE;
+                break;
+            }
+            if (here.op & 64) {
+                strm->msg = (char *)"invalid literal/length code";
+                state->mode = BAD;
+                break;
+            }
+            state->extra = (unsigned)(here.op) & 15;
+            state->mode = LENEXT;
+                /* fallthrough */
+        case LENEXT:
+            if (state->extra) {
+                NEEDBITS(state->extra);
+                state->length += BITS(state->extra);
+                DROPBITS(state->extra);
+                state->back += state->extra;
+            }
+            Tracevv((stderr, "inflate:         length %u\n", state->length));
+            state->was = state->length;
+            state->mode = DIST;
+                /* fallthrough */
+        case DIST:
+            for (;;) {
+                here = state->distcode[BITS(state->distbits)];
+                if ((unsigned)(here.bits) <= bits) break;
+                PULLBYTE();
+            }
+            if ((here.op & 0xf0) == 0) {
+                last = here;
+                for (;;) {
+                    here = state->distcode[last.val +
+                            (BITS(last.bits + last.op) >> last.bits)];
+                    if ((unsigned)(last.bits + here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                DROPBITS(last.bits);
+                state->back += last.bits;
+            }
+            DROPBITS(here.bits);
+            state->back += here.bits;
+            if (here.op & 64) {
+                strm->msg = (char *)"invalid distance code";
+                state->mode = BAD;
+                break;
+            }
+            state->offset = (unsigned)here.val;
+            state->extra = (unsigned)(here.op) & 15;
+            state->mode = DISTEXT;
+                /* fallthrough */
+        case DISTEXT:
+            if (state->extra) {
+                NEEDBITS(state->extra);
+                state->offset += BITS(state->extra);
+                DROPBITS(state->extra);
+                state->back += state->extra;
+            }
+#ifdef INFLATE_STRICT
+            if (state->offset > state->dmax) {
+                strm->msg = (char *)"invalid distance too far back";
+                state->mode = BAD;
+                break;
+            }
+#endif
+            Tracevv((stderr, "inflate:         distance %u\n", state->offset));
+            state->mode = MATCH;
+                /* fallthrough */
+        case MATCH:
+            if (left == 0) goto inf_leave;
+            copy = out - left;
+            if (state->offset > copy) {         /* copy from window */
+                copy = state->offset - copy;
+                if (copy > state->whave) {
+                    if (state->sane) {
+                        strm->msg = (char *)"invalid distance too far back";
+                        state->mode = BAD;
+                        break;
+                    }
+#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
+                    Trace((stderr, "inflate.c too far\n"));
+                    copy -= state->whave;
+                    if (copy > state->length) copy = state->length;
+                    if (copy > left) copy = left;
+                    left -= copy;
+                    state->length -= copy;
+                    do {
+                        *put++ = 0;
+                    } while (--copy);
+                    if (state->length == 0) state->mode = LEN;
+                    break;
+#endif
+                }
+                if (copy > state->wnext) {
+                    copy -= state->wnext;
+                    from = state->window + (state->wsize - copy);
+                }
+                else
+                    from = state->window + (state->wnext - copy);
+                if (copy > state->length) copy = state->length;
+                if (copy > left) copy = left;
+                put = chunkcopy_safe(put, from, copy, put + left);
+            }
+            else {                              /* copy from output */
+                copy = state->length;
+                if (copy > left) copy = left;
+                put = chunkcopy_lapped_safe(put, state->offset, copy, put + left);
+            }
+            left -= copy;
+            state->length -= copy;
+            if (state->length == 0) state->mode = LEN;
+            break;
+        case LIT:
+            if (left == 0) goto inf_leave;
+            *put++ = (unsigned char)(state->length);
+            left--;
+            state->mode = LEN;
+            break;
+        case CHECK:
+            if (state->wrap) {
+                NEEDBITS(32);
+                out -= left;
+                strm->total_out += out;
+                state->total += out;
+                if ((state->wrap & 4) && out)
+                    strm->adler = state->check =
+                        UPDATE_CHECK(state->check, put - out, out);
+                out = left;
+                if ((state->wrap & 4) && (
+#ifdef GUNZIP
+                     state->flags ? hold :
+#endif
+                     ZSWAP32(hold)) != state->check) {
+                    strm->msg = (char *)"incorrect data check";
+                    state->mode = BAD;
+                    break;
+                }
+                INITBITS();
+                Tracev((stderr, "inflate:   check matches trailer\n"));
+            }
+#ifdef GUNZIP
+            state->mode = LENGTH;
+                /* fallthrough */
+        case LENGTH:
+            if (state->wrap && state->flags) {
+                NEEDBITS(32);
+                if ((state->wrap & 4) && hold != (state->total & 0xffffffff)) {
+                    strm->msg = (char *)"incorrect length check";
+                    state->mode = BAD;
+                    break;
+                }
+                INITBITS();
+                Tracev((stderr, "inflate:   length matches trailer\n"));
+            }
+#endif
+            state->mode = DONE;
+                /* fallthrough */
+        case DONE:
+            ret = Z_STREAM_END;
+            goto inf_leave;
+        case BAD:
+            ret = Z_DATA_ERROR;
+            goto inf_leave;
+        case MEM:
+            return Z_MEM_ERROR;
+        case SYNC:
+                /* fallthrough */
+        default:
+            return Z_STREAM_ERROR;
+        }
+
+    /*
+       Return from inflate(), updating the total counts and the check value.
+       If there was no progress during the inflate() call, return a buffer
+       error.  Call updatewindow() to create and/or update the window state.
+       Note: a memory error from inflate() is non-recoverable.
+     */
+  inf_leave:
+#if defined(ZLIB_DEBUG)
+   /* XXX(cavalcantii): I put this in place back in 2017 to help debug faulty
+    * client code relying on undefined behavior when chunk_copy first landed.
+    *
+    * It is save to say after all these years that Chromium code is well
+    * behaved and works fine with the optimization, therefore we can enable
+    * this only for DEBUG builds.
+    *
+    * We write a defined value in the unused space to help mark
+    * where the stream has ended. We don't use zeros as that can
+    * mislead clients relying on undefined behavior (i.e. assuming
+    * that the data is over when the buffer has a zero/null value).
+    *
+    * The basic idea is that if client code is not relying on the zlib context
+    * to inform the amount of decompressed data, but instead reads the output
+    * buffer until a zero/null is found, it will fail faster and harder
+    * when the remaining of the buffer is marked with a symbol (e.g. 0x55).
+    */
+   if (left >= CHUNKCOPY_CHUNK_SIZE)
+      memset(put, 0x55, CHUNKCOPY_CHUNK_SIZE);
+   else
+      memset(put, 0x55, left);
+#endif
+    RESTORE();
+    if (state->wsize || (out != strm->avail_out && state->mode < BAD &&
+            (state->mode < CHECK || flush != Z_FINISH)))
+        if (updatewindow(strm, strm->next_out, out - strm->avail_out)) {
+            state->mode = MEM;
+            return Z_MEM_ERROR;
+        }
+    in -= strm->avail_in;
+    out -= strm->avail_out;
+    strm->total_in += in;
+    strm->total_out += out;
+    state->total += out;
+    if ((state->wrap & 4) && out)
+        strm->adler = state->check =
+            UPDATE_CHECK(state->check, strm->next_out - out, out);
+    strm->data_type = (int)state->bits + (state->last ? 64 : 0) +
+                      (state->mode == TYPE ? 128 : 0) +
+                      (state->mode == LEN_ || state->mode == COPY_ ? 256 : 0);
+    if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK)
+        ret = Z_BUF_ERROR;
+    return ret;
+}
+
+int ZEXPORT inflateEnd(z_streamp strm) {
+    struct inflate_state FAR *state;
+    if (inflateStateCheck(strm))
+        return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if (state->window != Z_NULL) ZFREE(strm, state->window);
+    ZFREE(strm, strm->state);
+    strm->state = Z_NULL;
+    Tracev((stderr, "inflate: end\n"));
+    return Z_OK;
+}
+
+int ZEXPORT inflateGetDictionary(z_streamp strm, Bytef *dictionary,
+                                 uInt *dictLength) {
+    struct inflate_state FAR *state;
+
+    /* check state */
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+
+    /* copy dictionary */
+    if (state->whave && dictionary != Z_NULL) {
+        zmemcpy(dictionary, state->window + state->wnext,
+                state->whave - state->wnext);
+        zmemcpy(dictionary + state->whave - state->wnext,
+                state->window, state->wnext);
+    }
+    if (dictLength != Z_NULL)
+        *dictLength = state->whave;
+    return Z_OK;
+}
+
+int ZEXPORT inflateSetDictionary(z_streamp strm, const Bytef *dictionary,
+                                 uInt dictLength) {
+    struct inflate_state FAR *state;
+    unsigned long dictid;
+    int ret;
+
+    /* check state */
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if (state->wrap != 0 && state->mode != DICT)
+        return Z_STREAM_ERROR;
+
+    /* check for correct dictionary identifier */
+    if (state->mode == DICT) {
+        dictid = adler32(0L, Z_NULL, 0);
+        dictid = adler32(dictid, dictionary, dictLength);
+        if (dictid != state->check)
+            return Z_DATA_ERROR;
+    }
+
+    /* copy dictionary to window using updatewindow(), which will amend the
+       existing dictionary if appropriate */
+    ret = updatewindow(strm, dictionary + dictLength, dictLength);
+    if (ret) {
+        state->mode = MEM;
+        return Z_MEM_ERROR;
+    }
+    state->havedict = 1;
+    Tracev((stderr, "inflate:   dictionary set\n"));
+    return Z_OK;
+}
+
+int ZEXPORT inflateGetHeader(z_streamp strm, gz_headerp head) {
+    struct inflate_state FAR *state;
+
+    /* check state */
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if ((state->wrap & 2) == 0) return Z_STREAM_ERROR;
+
+    /* save header structure */
+    state->head = head;
+    head->done = 0;
+    return Z_OK;
+}
+
+/*
+   Search buf[0..len-1] for the pattern: 0, 0, 0xff, 0xff.  Return when found
+   or when out of input.  When called, *have is the number of pattern bytes
+   found in order so far, in 0..3.  On return *have is updated to the new
+   state.  If on return *have equals four, then the pattern was found and the
+   return value is how many bytes were read including the last byte of the
+   pattern.  If *have is less than four, then the pattern has not been found
+   yet and the return value is len.  In the latter case, syncsearch() can be
+   called again with more data and the *have state.  *have is initialized to
+   zero for the first call.
+ */
+local unsigned syncsearch(unsigned FAR *have, const unsigned char FAR *buf,
+                          unsigned len) {
+    unsigned got;
+    unsigned next;
+
+    got = *have;
+    next = 0;
+    while (next < len && got < 4) {
+        if ((int)(buf[next]) == (got < 2 ? 0 : 0xff))
+            got++;
+        else if (buf[next])
+            got = 0;
+        else
+            got = 4 - got;
+        next++;
+    }
+    *have = got;
+    return next;
+}
+
+int ZEXPORT inflateSync(z_streamp strm) {
+    unsigned len;               /* number of bytes to look at or looked at */
+    int flags;                  /* temporary to save header status */
+    unsigned long in, out;      /* temporary to save total_in and total_out */
+    unsigned char buf[4];       /* to restore bit buffer to byte string */
+    struct inflate_state FAR *state;
+
+    /* check parameters */
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR;
+
+    /* if first time, start search in bit buffer */
+    if (state->mode != SYNC) {
+        state->mode = SYNC;
+        state->hold <<= state->bits & 7;
+        state->bits -= state->bits & 7;
+        len = 0;
+        while (state->bits >= 8) {
+            buf[len++] = (unsigned char)(state->hold);
+            state->hold >>= 8;
+            state->bits -= 8;
+        }
+        state->have = 0;
+        syncsearch(&(state->have), buf, len);
+    }
+
+    /* search available input */
+    len = syncsearch(&(state->have), strm->next_in, strm->avail_in);
+    strm->avail_in -= len;
+    strm->next_in += len;
+    strm->total_in += len;
+
+    /* return no joy or set up to restart inflate() on a new block */
+    if (state->have != 4) return Z_DATA_ERROR;
+    if (state->flags == -1)
+        state->wrap = 0;    /* if no header yet, treat as raw */
+    else
+        state->wrap &= ~4;  /* no point in computing a check value now */
+    flags = state->flags;
+    in = strm->total_in;  out = strm->total_out;
+    inflateReset(strm);
+    strm->total_in = in;  strm->total_out = out;
+    state->flags = flags;
+    state->mode = TYPE;
+    return Z_OK;
+}
+
+/*
+   Returns true if inflate is currently at the end of a block generated by
+   Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP
+   implementation to provide an additional safety check. PPP uses
+   Z_SYNC_FLUSH but removes the length bytes of the resulting empty stored
+   block. When decompressing, PPP checks that at the end of input packet,
+   inflate is waiting for these length bytes.
+ */
+int ZEXPORT inflateSyncPoint(z_streamp strm) {
+    struct inflate_state FAR *state;
+
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    return state->mode == STORED && state->bits == 0;
+}
+
+int ZEXPORT inflateCopy(z_streamp dest, z_streamp source) {
+    struct inflate_state FAR *state;
+    struct inflate_state FAR *copy;
+    unsigned char FAR *window;
+    unsigned wsize;
+
+    /* check input */
+    if (inflateStateCheck(source) || dest == Z_NULL)
+        return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)source->state;
+
+    /* allocate space */
+    copy = (struct inflate_state FAR *)
+           ZALLOC(source, 1, sizeof(struct inflate_state));
+    if (copy == Z_NULL) return Z_MEM_ERROR;
+    window = Z_NULL;
+    if (state->window != Z_NULL) {
+        window = (unsigned char FAR *)ZALLOC(
+            source, (1U << state->wbits) + CHUNKCOPY_CHUNK_SIZE,
+            sizeof(unsigned char));
+        if (window == Z_NULL) {
+            ZFREE(source, copy);
+            return Z_MEM_ERROR;
+        }
+    }
+
+    /* copy state */
+    zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
+    zmemcpy((voidpf)copy, (voidpf)state, sizeof(struct inflate_state));
+    copy->strm = dest;
+    if (state->lencode >= state->codes &&
+        state->lencode <= state->codes + ENOUGH - 1) {
+        copy->lencode = copy->codes + (state->lencode - state->codes);
+        copy->distcode = copy->codes + (state->distcode - state->codes);
+    }
+    copy->next = copy->codes + (state->next - state->codes);
+    if (window != Z_NULL) {
+        wsize = 1U << state->wbits;
+        zmemcpy(window, state->window, wsize);
+    }
+    copy->window = window;
+    dest->state = (struct internal_state FAR *)copy;
+    return Z_OK;
+}
+
+int ZEXPORT inflateUndermine(z_streamp strm, int subvert) {
+    struct inflate_state FAR *state;
+
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
+    state->sane = !subvert;
+    return Z_OK;
+#else
+    (void)subvert;
+    state->sane = 1;
+    return Z_DATA_ERROR;
+#endif
+}
+
+int ZEXPORT inflateValidate(z_streamp strm, int check) {
+    struct inflate_state FAR *state;
+
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if (check && state->wrap)
+        state->wrap |= 4;
+    else
+        state->wrap &= ~4;
+    return Z_OK;
+}
+
+long ZEXPORT inflateMark(z_streamp strm) {
+    struct inflate_state FAR *state;
+
+    if (inflateStateCheck(strm))
+        return -(1L << 16);
+    state = (struct inflate_state FAR *)strm->state;
+    return (long)(((unsigned long)((long)state->back)) << 16) +
+        (state->mode == COPY ? state->length :
+            (state->mode == MATCH ? state->was - state->length : 0));
+}
+
+unsigned long ZEXPORT inflateCodesUsed(z_streamp strm) {
+    struct inflate_state FAR *state;
+    if (inflateStateCheck(strm)) return (unsigned long)-1;
+    state = (struct inflate_state FAR *)strm->state;
+    return (unsigned long)(state->next - state->codes);
+}
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/optimizations/insert_string.h b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/optimizations/insert_string.h
new file mode 100644
index 000000000..260b82680
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/optimizations/insert_string.h
@@ -0,0 +1,80 @@
+/* insert_string.h
+ *
+ * Copyright 2019 The Chromium Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the Chromium source repository LICENSE file.
+ */
+
+#ifndef INSERT_STRING_H
+#define INSERT_STRING_H
+
+#ifndef INLINE
+#if defined(_MSC_VER) && !defined(__clang__)
+#define INLINE __inline
+#else
+#define INLINE inline
+#endif
+#endif
+
+#include <stdint.h>
+
+/**
+ * Some applications need to match zlib DEFLATE output exactly [3]. Use the
+ * canonical zlib Rabin-Karp rolling hash [1,2] in that case.
+ *
+ *  [1] For a description of the Rabin and Karp algorithm, see "Algorithms"
+ *      book by R. Sedgewick, Addison-Wesley, p252.
+ *  [2] https://www.euccas.me/zlib/#zlib_rabin_karp and also "rolling hash"
+ *      https://en.wikipedia.org/wiki/Rolling_hash
+ *  [3] crbug.com/1316541 AOSP incremental client APK package OTA upgrades.
+ */
+#ifdef CHROMIUM_ZLIB_NO_CASTAGNOLI
+#define USE_ZLIB_RABIN_KARP_ROLLING_HASH
+#endif
+
+/* ===========================================================================
+ * Update a hash value with the given input byte (Rabin-Karp rolling hash).
+ * IN  assertion: all calls to UPDATE_HASH are made with consecutive input
+ *    characters, so that a running hash key can be computed from the previous
+ *    key instead of complete recalculation each time.
+ */
+#define UPDATE_HASH(s, h, c) (h = (((h) << s->hash_shift) ^ (c)) & s->hash_mask)
+
+/* ===========================================================================
+ * Insert string str in the dictionary and set match_head to the previous head
+ * of the hash chain (the most recent string with same hash key). Return
+ * the previous length of the hash chain.
+ * If this file is compiled with -DFASTEST, the compression level is forced
+ * to 1, and no hash chains are maintained.
+ * IN  assertion: all calls to INSERT_STRING are made with consecutive input
+ *    characters and the first MIN_MATCH bytes of str are valid (except for
+ *    the last MIN_MATCH-1 bytes of the input file).
+ */
+local INLINE Pos insert_string(deflate_state* const s, const Pos str) {
+  Pos ret;
+/* insert_string dictionary insertion: ANZAC++ hasher
+ * significantly improves data compression speed.
+ *
+ * Note: the generated compressed output is a valid DEFLATE stream, but will
+ * differ from canonical zlib output.
+ */
+#if defined(USE_ZLIB_RABIN_KARP_ROLLING_HASH)
+  UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH - 1)]);
+#else
+  uint32_t value;
+  // Validated for little endian archs (i.e. x86, Arm). YMMV for big endian.
+  zmemcpy(&value, &s->window[str], sizeof(value));
+  s->ins_h = ((value * 66521 + 66521) >> 16) & s->hash_mask;
+#endif
+
+#ifdef FASTEST
+  ret = s->head[s->ins_h];
+#else
+  ret = s->prev[str & s->w_mask] = s->head[s->ins_h];
+#endif
+  s->head[s->ins_h] = str;
+
+  return ret;
+}
+
+#endif /* INSERT_STRING_H */
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/DEPS b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/DEPS
new file mode 100644
index 000000000..67973613c
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/DEPS
@@ -0,0 +1,5 @@
+include_rules = [
+    "+testing/gtest",
+    "+third_party/zlib/contrib/minizip",
+    "+base",
+]
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/OWNERS b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/OWNERS
new file mode 100644
index 000000000..aa6a2d1bb
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/OWNERS
@@ -0,0 +1,2 @@
+cblume@chromium.org
+cavalcantii@chromium.org
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/BUILD.gn b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/BUILD.gn
new file mode 100644
index 000000000..16e918a72
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/BUILD.gn
@@ -0,0 +1,40 @@
+# Copyright 2017 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//testing/libfuzzer/fuzzer_test.gni")
+
+# root BUILD depends on this target. Needed for package discovery
+group("fuzzers") {
+}
+
+fuzzer_test("zlib_uncompress_fuzzer") {
+  sources = [ "uncompress_fuzzer.cc" ]
+  deps = [ "../../../:zlib" ]
+}
+
+fuzzer_test("zlib_inflate_fuzzer") {
+  sources = [ "inflate_fuzzer.cc" ]
+  deps = [ "../../../:zlib" ]
+}
+
+fuzzer_test("zlib_inflate_with_header_fuzzer") {
+  sources = [ "inflate_with_header_fuzzer.cc" ]
+  deps = [ "../../../:zlib" ]
+}
+
+fuzzer_test("zlib_streaming_inflate_fuzzer") {
+  sources = [ "streaming_inflate_fuzzer.cc" ]
+  deps = [ "../../../:zlib" ]
+  libfuzzer_options = [ "max_len=256000" ]
+}
+
+fuzzer_test("zlib_deflate_set_dictionary_fuzzer") {
+  sources = [ "deflate_set_dictionary_fuzzer.cc" ]
+  deps = [ "../../../:zlib" ]
+}
+
+fuzzer_test("zlib_deflate_fuzzer") {
+  sources = [ "deflate_fuzzer.cc" ]
+  deps = [ "../../../:zlib" ]
+}
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/OWNERS b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/OWNERS
new file mode 100644
index 000000000..ff3256199
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/OWNERS
@@ -0,0 +1,2 @@
+cblume@chromium.org
+hans@chromium.org
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/deflate_fuzzer.cc b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/deflate_fuzzer.cc
new file mode 100644
index 000000000..64892bc55
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/deflate_fuzzer.cc
@@ -0,0 +1,80 @@
+// Copyright 2017 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <fuzzer/FuzzedDataProvider.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <vector>
+
+#include "zlib.h"
+
+// Fuzzer builds often have NDEBUG set, so roll our own assert macro.
+#define ASSERT(cond)                                                           \
+  do {                                                                         \
+    if (!(cond)) {                                                             \
+      fprintf(stderr, "%s:%d Assert failed: %s\n", __FILE__, __LINE__, #cond); \
+      exit(1);                                                                 \
+    }                                                                          \
+  } while (0)
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
+  FuzzedDataProvider fdp(data, size);
+  int level = fdp.PickValueInArray({0, 1, 2, 3, 4, 5, 6, 7, 8, 9});
+  int windowBits = fdp.PickValueInArray({9, 10, 11, 12, 13, 14, 15});
+  int memLevel = fdp.PickValueInArray({1, 2, 3, 4, 5, 6, 7, 8, 9});
+  int strategy = fdp.PickValueInArray(
+      {Z_DEFAULT_STRATEGY, Z_FILTERED, Z_HUFFMAN_ONLY, Z_RLE, Z_FIXED});
+  std::vector<uint8_t> src = fdp.ConsumeRemainingBytes<uint8_t>();
+
+  z_stream stream;
+  stream.zalloc = Z_NULL;
+  stream.zfree = Z_NULL;
+
+  // Compress the data one byte at a time to exercise the streaming code.
+  int ret =
+      deflateInit2(&stream, level, Z_DEFLATED, windowBits, memLevel, strategy);
+  ASSERT(ret == Z_OK);
+
+  size_t deflate_bound = deflateBound(&stream, src.size());
+
+  std::vector<uint8_t> compressed(src.size() * 2 + 1000);
+  stream.next_out = compressed.data();
+  stream.avail_out = compressed.size();
+  for (uint8_t b : src) {
+    stream.next_in = &b;
+    stream.avail_in = 1;
+    ret = deflate(&stream, Z_NO_FLUSH);
+    ASSERT(ret == Z_OK);
+  }
+  stream.next_in = Z_NULL;
+  stream.avail_in = 0;
+  ret = deflate(&stream, Z_FINISH);
+  ASSERT(ret == Z_STREAM_END);
+  compressed.resize(compressed.size() - stream.avail_out);
+  deflateEnd(&stream);
+
+  // Check that the bound was correct.
+  ASSERT(compressed.size() <= deflate_bound);
+
+  // Verify that the data decompresses correctly.
+  ret = inflateInit2(&stream, windowBits);
+  ASSERT(ret == Z_OK);
+  // Make room for at least one byte so it's never empty.
+  std::vector<uint8_t> decompressed(src.size() + 1);
+  stream.next_in = compressed.data();
+  stream.avail_in = compressed.size();
+  stream.next_out = decompressed.data();
+  stream.avail_out = decompressed.size();
+  ret = inflate(&stream, Z_FINISH);
+  ASSERT(ret == Z_STREAM_END);
+  decompressed.resize(decompressed.size() - stream.avail_out);
+  inflateEnd(&stream);
+
+  ASSERT(decompressed == src);
+
+  return 0;
+}
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/deflate_set_dictionary_fuzzer.cc b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/deflate_set_dictionary_fuzzer.cc
new file mode 100644
index 000000000..96778209f
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/deflate_set_dictionary_fuzzer.cc
@@ -0,0 +1,43 @@
+// Copyright 2017 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <stddef.h>
+#include <stdint.h>
+#include <cassert>
+#include <vector>
+
+#include "zlib.h"
+
+static Bytef buffer[256 * 1024] = {0};
+
+// Entry point for LibFuzzer.
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
+  // We need to strip the 'const' for zlib.
+  std::vector<unsigned char> input_buffer{data, data + size};
+
+  uLongf buffer_length = static_cast<uLongf>(sizeof(buffer));
+
+  z_stream stream;
+  stream.next_in = input_buffer.data();
+  stream.avail_in = size;
+  stream.total_in = size;
+  stream.next_out = buffer;
+  stream.avail_out = buffer_length;
+  stream.total_out = buffer_length;
+  stream.zalloc = Z_NULL;
+  stream.zfree = Z_NULL;
+
+  if (Z_OK != deflateInit(&stream, Z_DEFAULT_COMPRESSION)) {
+    deflateEnd(&stream);
+    assert(false);
+  }
+
+  auto deflate_set_dictionary_result =
+      deflateSetDictionary(&stream, data, size);
+  deflateEnd(&stream);
+  if (Z_OK != deflate_set_dictionary_result)
+    assert(false);
+
+  return 0;
+}
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/inflate_fuzzer.cc b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/inflate_fuzzer.cc
new file mode 100644
index 000000000..d9d62026e
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/inflate_fuzzer.cc
@@ -0,0 +1,41 @@
+// Copyright 2017 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
+#include <cassert>
+#include <vector>
+
+#include "zlib.h"
+
+static Bytef buffer[256 * 1024] = {0};
+
+// Entry point for LibFuzzer.
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
+  // We need to strip the 'const' for zlib
+  std::vector<unsigned char> input_buffer{data, data+size};
+
+  uLongf buffer_length = static_cast<uLongf>(sizeof(buffer));
+
+  z_stream stream;
+  stream.next_in = input_buffer.data();
+  stream.avail_in = size;
+  stream.total_in = size;
+  stream.next_out = buffer;
+  stream.avail_out = buffer_length;
+  stream.total_out = buffer_length;
+  stream.zalloc = Z_NULL;
+  stream.zfree = Z_NULL;
+
+  if (Z_OK != inflateInit(&stream)) {
+    inflateEnd(&stream);
+    assert(false);
+  }
+
+  inflate(&stream, Z_NO_FLUSH);
+  inflateEnd(&stream);
+
+  return 0;
+}
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/inflate_with_header_fuzzer.cc b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/inflate_with_header_fuzzer.cc
new file mode 100644
index 000000000..dfb5b39a7
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/inflate_with_header_fuzzer.cc
@@ -0,0 +1,95 @@
+// Copyright 2022 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <algorithm>
+#include <memory>
+
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <fuzzer/FuzzedDataProvider.h>
+
+#include "zlib.h"
+
+// Fuzzer builds often have NDEBUG set, so roll our own assert macro.
+#define ASSERT(cond)                                                           \
+  do {                                                                         \
+    if (!(cond)) {                                                             \
+      fprintf(stderr, "%s:%d Assert failed: %s\n", __FILE__, __LINE__, #cond); \
+      exit(1);                                                                 \
+    }                                                                          \
+  } while (0)
+
+static void chunked_inflate(gz_header* header,
+                            uint8_t* data,
+                            size_t size,
+                            size_t in_chunk_size,
+                            size_t out_chunk_size) {
+  z_stream stream;
+  stream.next_in = data;
+  stream.avail_in = 0;
+  stream.zalloc = Z_NULL;
+  stream.zfree = Z_NULL;
+
+  static const int kDefaultWindowBits = MAX_WBITS;
+  static const int kGzipOrZlibHeader = 32;
+  ASSERT(inflateInit2(&stream, kDefaultWindowBits + kGzipOrZlibHeader) == Z_OK);
+  ASSERT(inflateGetHeader(&stream, header) == Z_OK);
+
+  auto out_buffer = std::make_unique<uint8_t[]>(out_chunk_size);
+  while (true) {
+    stream.next_in = &data[stream.total_in];
+    stream.avail_in =
+        std::min(in_chunk_size, size - static_cast<size_t>(stream.total_in));
+    stream.next_out = out_buffer.get();
+    stream.avail_out = out_chunk_size;
+
+    if (inflate(&stream, stream.avail_in == 0 ? Z_SYNC_FLUSH : Z_NO_FLUSH) !=
+        Z_OK) {
+      break;
+    }
+  }
+
+  inflateEnd(&stream);
+}
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
+  if (size > 250 * 1024) {
+    // Cap the input size so the fuzzer doesn't time out. For example,
+    // crbug.com/1362206 saw timeouts with 450 KB input, so use a limit that's
+    // well below that but still large enough to hit most code.
+    return 0;
+  }
+
+  FuzzedDataProvider fdp(data, size);
+
+  // Fuzz zlib's inflate() with inflateGetHeader() enabled, various sizes for
+  // the gz_header field sizes, and various-sized chunks for input/output. This
+  // would have found CVE-2022-37434 which was a heap buffer read overflow when
+  // filling in gz_header's extra field.
+
+  gz_header header;
+  header.extra_max = fdp.ConsumeIntegralInRange(0, 100000);
+  header.name_max = fdp.ConsumeIntegralInRange(0, 100000);
+  header.comm_max = fdp.ConsumeIntegralInRange(0, 100000);
+
+  auto extra_buf = std::make_unique<uint8_t[]>(header.extra_max);
+  auto name_buf = std::make_unique<uint8_t[]>(header.name_max);
+  auto comment_buf = std::make_unique<uint8_t[]>(header.comm_max);
+
+  header.extra = extra_buf.get();
+  header.name = name_buf.get();
+  header.comment = comment_buf.get();
+
+  size_t in_chunk_size = fdp.ConsumeIntegralInRange(1, 4097);
+  size_t out_chunk_size = fdp.ConsumeIntegralInRange(1, 4097);
+  std::vector<uint8_t> remaining_data = fdp.ConsumeRemainingBytes<uint8_t>();
+
+  chunked_inflate(&header, remaining_data.data(), remaining_data.size(),
+                  in_chunk_size, out_chunk_size);
+
+  return 0;
+}
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/streaming_inflate_fuzzer.cc b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/streaming_inflate_fuzzer.cc
new file mode 100644
index 000000000..dac170a0f
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/streaming_inflate_fuzzer.cc
@@ -0,0 +1,74 @@
+// Copyright 2020 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "zlib.h"
+
+// Fuzzer builds often have NDEBUG set, so roll our own assert macro.
+#define ASSERT(cond)                                                           \
+  do {                                                                         \
+    if (!(cond)) {                                                             \
+      fprintf(stderr, "%s:%d Assert failed: %s\n", __FILE__, __LINE__, #cond); \
+      exit(1);                                                                 \
+    }                                                                          \
+  } while (0)
+
+// Entry point for LibFuzzer.
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
+  // Deflate data.
+  z_stream comp_strm;
+  comp_strm.zalloc = Z_NULL;
+  comp_strm.zfree = Z_NULL;
+  comp_strm.opaque = Z_NULL;
+  int ret = deflateInit(&comp_strm, Z_DEFAULT_COMPRESSION);
+  ASSERT(ret == Z_OK);
+
+  size_t comp_buf_cap = deflateBound(&comp_strm, size);
+  uint8_t* comp_buf = (uint8_t*)malloc(comp_buf_cap);
+  ASSERT(comp_buf != nullptr);
+  comp_strm.next_out = comp_buf;
+  comp_strm.avail_out = comp_buf_cap;
+  comp_strm.next_in = (unsigned char*)data;
+  comp_strm.avail_in = size;
+  ret = deflate(&comp_strm, Z_FINISH);
+  ASSERT(ret == Z_STREAM_END);
+  size_t comp_sz = comp_buf_cap - comp_strm.avail_out;
+
+  // Inflate comp_buf one chunk at a time.
+  z_stream decomp_strm;
+  decomp_strm.zalloc = Z_NULL;
+  decomp_strm.zfree = Z_NULL;
+  decomp_strm.opaque = Z_NULL;
+  ret = inflateInit(&decomp_strm);
+  ASSERT(ret == Z_OK);
+  decomp_strm.next_in = comp_buf;
+  decomp_strm.avail_in = comp_sz;
+
+  while (decomp_strm.avail_in > 0) {
+    uint8_t decomp_buf[1024];
+    decomp_strm.next_out = decomp_buf;
+    decomp_strm.avail_out = sizeof(decomp_buf);
+    ret = inflate(&decomp_strm, Z_FINISH);
+    ASSERT(ret == Z_OK || ret == Z_STREAM_END || ret == Z_BUF_ERROR);
+
+    // Verify the output bytes.
+    size_t num_out = sizeof(decomp_buf) - decomp_strm.avail_out;
+    for (size_t i = 0; i < num_out; i++) {
+      ASSERT(decomp_buf[i] == data[decomp_strm.total_out - num_out + i]);
+    }
+  }
+
+  ret = deflateEnd(&comp_strm);
+  ASSERT(ret == Z_OK);
+  free(comp_buf);
+
+  inflateEnd(&decomp_strm);
+  ASSERT(ret == Z_OK);
+
+  return 0;
+}
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/uncompress_fuzzer.cc b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/uncompress_fuzzer.cc
new file mode 100644
index 000000000..e63a8c058
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/fuzzers/uncompress_fuzzer.cc
@@ -0,0 +1,21 @@
+// Copyright 2015 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
+
+#include "zlib.h"
+
+static Bytef buffer[256 * 1024] = {0};
+
+// Entry point for LibFuzzer.
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
+  uLongf buffer_length = static_cast<uLongf>(sizeof(buffer));
+  if (Z_OK !=
+      uncompress(buffer, &buffer_length, data, static_cast<uLong>(size))) {
+    return 0;
+  }
+  return 0;
+}
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/infcover.cc b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/infcover.cc
new file mode 100644
index 000000000..4c55d5d7d
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/infcover.cc
@@ -0,0 +1,745 @@
+/* infcover.c -- test zlib's inflate routines with full code coverage
+ * Copyright (C) 2011, 2016 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* to use, do: ./configure --cover && make cover */
+// clang-format off
+#include "infcover.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "zlib.h"
+
+/* get definition of internal structure so we can mess with it (see pull()),
+   and so we can call inflate_trees() (see cover5()) */
+#define ZLIB_INTERNAL
+#include "inftrees.h"
+#include "inflate.h"
+
+/* XXX: use C++ streams instead of printf/fputs/etc due to portability
+ * as type sizes can vary between platforms.
+ */
+#include <iostream>
+#define local static
+
+/* XXX: hacking C assert and plugging into GTest. */
+#include "gtest.h"
+#if defined(assert)
+#undef assert
+#define assert EXPECT_TRUE
+#endif
+
+/* XXX: handle what is a reserved word in C++. */
+#define try try_f
+
+/* -- memory tracking routines -- */
+
+/*
+   These memory tracking routines are provided to zlib and track all of zlib's
+   allocations and deallocations, check for LIFO operations, keep a current
+   and high water mark of total bytes requested, optionally set a limit on the
+   total memory that can be allocated, and when done check for memory leaks.
+
+   They are used as follows:
+
+   z_stream strm;
+   mem_setup(&strm)         initializes the memory tracking and sets the
+                            zalloc, zfree, and opaque members of strm to use
+                            memory tracking for all zlib operations on strm
+   mem_limit(&strm, limit)  sets a limit on the total bytes requested -- a
+                            request that exceeds this limit will result in an
+                            allocation failure (returns NULL) -- setting the
+                            limit to zero means no limit, which is the default
+                            after mem_setup()
+   mem_used(&strm, "msg")   prints to stderr "msg" and the total bytes used
+   mem_high(&strm, "msg")   prints to stderr "msg" and the high water mark
+   mem_done(&strm, "msg")   ends memory tracking, releases all allocations
+                            for the tracking as well as leaked zlib blocks, if
+                            any.  If there was anything unusual, such as leaked
+                            blocks, non-FIFO frees, or frees of addresses not
+                            allocated, then "msg" and information about the
+                            problem is printed to stderr.  If everything is
+                            normal, nothing is printed. mem_done resets the
+                            strm members to Z_NULL to use the default memory
+                            allocation routines on the next zlib initialization
+                            using strm.
+ */
+
+/* these items are strung together in a linked list, one for each allocation */
+struct mem_item {
+    void *ptr;                  /* pointer to allocated memory */
+    size_t size;                /* requested size of allocation */
+    struct mem_item *next;      /* pointer to next item in list, or NULL */
+};
+
+/* this structure is at the root of the linked list, and tracks statistics */
+struct mem_zone {
+    struct mem_item *first;     /* pointer to first item in list, or NULL */
+    size_t total, highwater;    /* total allocations, and largest total */
+    size_t limit;               /* memory allocation limit, or 0 if no limit */
+    int notlifo, rogue;         /* counts of non-LIFO frees and rogue frees */
+};
+
+/* memory allocation routine to pass to zlib */
+local void *mem_alloc(void *mem, unsigned count, unsigned size)
+{
+    void *ptr;
+    struct mem_item *item;
+    struct mem_zone *zone = static_cast<struct mem_zone *>(mem);
+    size_t len = count * (size_t)size;
+
+    /* induced allocation failure */
+    if (zone == NULL || (zone->limit && zone->total + len > zone->limit))
+        return NULL;
+
+    /* perform allocation using the standard library, fill memory with a
+       non-zero value to make sure that the code isn't depending on zeros */
+    ptr = malloc(len);
+    if (ptr == NULL)
+        return NULL;
+    memset(ptr, 0xa5, len);
+
+    /* create a new item for the list */
+    item = static_cast<struct mem_item *>(malloc(sizeof(struct mem_item)));
+    if (item == NULL) {
+        free(ptr);
+        return NULL;
+    }
+    item->ptr = ptr;
+    item->size = len;
+
+    /* insert item at the beginning of the list */
+    item->next = zone->first;
+    zone->first = item;
+
+    /* update the statistics */
+    zone->total += item->size;
+    if (zone->total > zone->highwater)
+        zone->highwater = zone->total;
+
+    /* return the allocated memory */
+    return ptr;
+}
+
+/* memory free routine to pass to zlib */
+local void mem_free(void *mem, void *ptr)
+{
+    struct mem_item *item, *next;
+    struct mem_zone *zone = static_cast<struct mem_zone *>(mem);
+
+    /* if no zone, just do a free */
+    if (zone == NULL) {
+        free(ptr);
+        return;
+    }
+
+    /* point next to the item that matches ptr, or NULL if not found -- remove
+       the item from the linked list if found */
+    next = zone->first;
+    if (next) {
+        if (next->ptr == ptr)
+            zone->first = next->next;   /* first one is it, remove from list */
+        else {
+            do {                        /* search the linked list */
+                item = next;
+                next = item->next;
+            } while (next != NULL && next->ptr != ptr);
+            if (next) {                 /* if found, remove from linked list */
+                item->next = next->next;
+                zone->notlifo++;        /* not a LIFO free */
+            }
+
+        }
+    }
+
+    /* if found, update the statistics and free the item */
+    if (next) {
+        zone->total -= next->size;
+        free(next);
+    }
+
+    /* if not found, update the rogue count */
+    else
+        zone->rogue++;
+
+    /* in any case, do the requested free with the standard library function */
+    free(ptr);
+}
+
+/* set up a controlled memory allocation space for monitoring, set the stream
+   parameters to the controlled routines, with opaque pointing to the space */
+local void mem_setup(z_stream *strm)
+{
+    struct mem_zone *zone;
+
+    zone = static_cast<struct mem_zone *>(malloc(sizeof(struct mem_zone)));
+    assert(zone != NULL);
+    zone->first = NULL;
+    zone->total = 0;
+    zone->highwater = 0;
+    zone->limit = 0;
+    zone->notlifo = 0;
+    zone->rogue = 0;
+    strm->opaque = zone;
+    strm->zalloc = mem_alloc;
+    strm->zfree = mem_free;
+}
+
+/* set a limit on the total memory allocation, or 0 to remove the limit */
+local void mem_limit(z_stream *strm, size_t limit)
+{
+    struct mem_zone *zone = static_cast<struct mem_zone *>(strm->opaque);
+
+    zone->limit = limit;
+}
+
+/* show the current total requested allocations in bytes */
+local void mem_used(z_stream *strm, const char *prefix)
+{
+    struct mem_zone *zone = static_cast<struct mem_zone *>(strm->opaque);
+
+    std::cout << prefix << ": " << zone->total << " allocated" << std::endl;
+}
+
+/* show the high water allocation in bytes */
+local void mem_high(z_stream *strm, const char *prefix)
+{
+    struct mem_zone *zone = static_cast<struct mem_zone *>(strm->opaque);
+
+    std::cout << prefix << ": " << zone->highwater << " high water mark" << std::endl;
+}
+
+/* release the memory allocation zone -- if there are any surprises, notify */
+local void mem_done(z_stream *strm, const char *prefix)
+{
+    int count = 0;
+    struct mem_item *item, *next;
+    struct mem_zone *zone = static_cast<struct mem_zone *>(strm->opaque);
+
+    /* show high water mark */
+    mem_high(strm, prefix);
+
+    /* free leftover allocations and item structures, if any */
+    item = zone->first;
+    while (item != NULL) {
+        free(item->ptr);
+        next = item->next;
+        free(item);
+        item = next;
+        count++;
+    }
+
+    /* issue alerts about anything unexpected */
+    if (count || zone->total)
+        std::cout << "** " << prefix << ": "
+                  << zone->total << " bytes in "
+                  << count << " blocks not freed"
+                  << std::endl;
+
+    if (zone->notlifo)
+        std::cout << "** " << prefix << ": "
+                  << zone->notlifo << " frees not LIFO"
+                  << std::endl;
+
+    if (zone->rogue)
+        std::cout << "** " << prefix << ": "
+                  << zone->rogue << " frees not recognized"
+                  << std::endl;
+
+    /* free the zone and delete from the stream */
+    free(zone);
+    strm->opaque = Z_NULL;
+    strm->zalloc = Z_NULL;
+    strm->zfree = Z_NULL;
+}
+
+/* -- inflate test routines -- */
+
+/* Decode a hexadecimal string, set *len to length, in[] to the bytes.  This
+   decodes liberally, in that hex digits can be adjacent, in which case two in
+   a row writes a byte.  Or they can be delimited by any non-hex character,
+   where the delimiters are ignored except when a single hex digit is followed
+   by a delimiter, where that single digit writes a byte.  The returned data is
+   allocated and must eventually be freed.  NULL is returned if out of memory.
+   If the length is not needed, then len can be NULL. */
+local unsigned char *h2b(const char *hex, unsigned *len)
+{
+    unsigned char *in, *re;
+    unsigned next, val;
+
+    in = static_cast<unsigned char *>(malloc((strlen(hex) + 1) >> 1));
+    if (in == NULL)
+        return NULL;
+    next = 0;
+    val = 1;
+    do {
+        if (*hex >= '0' && *hex <= '9')
+            val = (val << 4) + *hex - '0';
+        else if (*hex >= 'A' && *hex <= 'F')
+            val = (val << 4) + *hex - 'A' + 10;
+        else if (*hex >= 'a' && *hex <= 'f')
+            val = (val << 4) + *hex - 'a' + 10;
+        else if (val != 1 && val < 32)  /* one digit followed by delimiter */
+            val += 240;                 /* make it look like two digits */
+        if (val > 255) {                /* have two digits */
+            in[next++] = val & 0xff;    /* save the decoded byte */
+            val = 1;                    /* start over */
+        }
+    } while (*hex++);       /* go through the loop with the terminating null */
+    if (len != NULL)
+        *len = next;
+    re = static_cast<unsigned char *>(realloc(in, next));
+    return re == NULL ? in : re;
+}
+
+/* generic inflate() run, where hex is the hexadecimal input data, what is the
+   text to include in an error message, step is how much input data to feed
+   inflate() on each call, or zero to feed it all, win is the window bits
+   parameter to inflateInit2(), len is the size of the output buffer, and err
+   is the error code expected from the first inflate() call (the second
+   inflate() call is expected to return Z_STREAM_END).  If win is 47, then
+   header information is collected with inflateGetHeader().  If a zlib stream
+   is looking for a dictionary, then an empty dictionary is provided.
+   inflate() is run until all of the input data is consumed. */
+local void inf(const char *hex, const char *what, unsigned step, int win, unsigned len,
+               int err)
+{
+    int ret;
+    unsigned have;
+    unsigned char *in, *out;
+    z_stream strm, copy;
+    gz_header head;
+
+    mem_setup(&strm);
+    strm.avail_in = 0;
+    strm.next_in = Z_NULL;
+    ret = inflateInit2(&strm, win);
+    if (ret != Z_OK) {
+        mem_done(&strm, what);
+        return;
+    }
+    out = static_cast<unsigned char *>(malloc(len));                          assert(out != NULL);
+    if (win == 47) {
+        head.extra = out;
+        head.extra_max = len;
+        head.name = out;
+        head.name_max = len;
+        head.comment = out;
+        head.comm_max = len;
+        ret = inflateGetHeader(&strm, &head);   assert(ret == Z_OK);
+    }
+    in = h2b(hex, &have);                       assert(in != NULL);
+    if (step == 0 || step > have)
+        step = have;
+    strm.avail_in = step;
+    have -= step;
+    strm.next_in = in;
+    do {
+        strm.avail_out = len;
+        strm.next_out = out;
+        ret = inflate(&strm, Z_NO_FLUSH);       assert(err == 9 || ret == err);
+        if (ret != Z_OK && ret != Z_BUF_ERROR && ret != Z_NEED_DICT)
+            break;
+        if (ret == Z_NEED_DICT) {
+            ret = inflateSetDictionary(&strm, in, 1);
+                                                assert(ret == Z_DATA_ERROR);
+            mem_limit(&strm, 1);
+            ret = inflateSetDictionary(&strm, out, 0);
+                                                assert(ret == Z_MEM_ERROR);
+            mem_limit(&strm, 0);
+            ((struct inflate_state *)strm.state)->mode = DICT;
+            ret = inflateSetDictionary(&strm, out, 0);
+                                                assert(ret == Z_OK);
+            ret = inflate(&strm, Z_NO_FLUSH);   assert(ret == Z_BUF_ERROR);
+        }
+        ret = inflateCopy(&copy, &strm);        assert(ret == Z_OK);
+        ret = inflateEnd(&copy);                assert(ret == Z_OK);
+        err = 9;                        /* don't care next time around */
+        have += strm.avail_in;
+        strm.avail_in = step > have ? have : step;
+        have -= strm.avail_in;
+    } while (strm.avail_in);
+    free(in);
+    free(out);
+    ret = inflateReset2(&strm, -8);             assert(ret == Z_OK);
+    ret = inflateEnd(&strm);                    assert(ret == Z_OK);
+    mem_done(&strm, what);
+}
+
+/* cover all of the lines in inflate.c up to inflate() */
+void cover_support(void)
+{
+    int ret;
+    z_stream strm;
+
+    mem_setup(&strm);
+    strm.avail_in = 0;
+    strm.next_in = Z_NULL;
+    ret = inflateInit(&strm);                   assert(ret == Z_OK);
+    mem_used(&strm, "inflate init");
+    ret = inflatePrime(&strm, 5, 31);           assert(ret == Z_OK);
+    ret = inflatePrime(&strm, -1, 0);           assert(ret == Z_OK);
+    ret = inflateSetDictionary(&strm, Z_NULL, 0);
+                                                assert(ret == Z_STREAM_ERROR);
+    ret = inflateEnd(&strm);                    assert(ret == Z_OK);
+    mem_done(&strm, "prime");
+
+    inf("63 0", "force window allocation", 0, -15, 1, Z_OK);
+    inf("63 18 5", "force window replacement", 0, -8, 259, Z_OK);
+    inf("63 18 68 30 d0 0 0", "force split window update", 4, -8, 259, Z_OK);
+    inf("3 0", "use fixed blocks", 0, -15, 1, Z_STREAM_END);
+    inf("", "bad window size", 0, 1, 0, Z_STREAM_ERROR);
+
+    mem_setup(&strm);
+    strm.avail_in = 0;
+    strm.next_in = Z_NULL;
+    ret = inflateInit_(&strm, "!", (int)sizeof(z_stream));
+                                                assert(ret == Z_VERSION_ERROR);
+    mem_done(&strm, "wrong version");
+
+    strm.avail_in = 0;
+    strm.next_in = Z_NULL;
+    ret = inflateInit(&strm);                   assert(ret == Z_OK);
+    ret = inflateEnd(&strm);                    assert(ret == Z_OK);
+    std::cout << "inflate built-in memory routines" << std::endl;;
+}
+
+/* cover all inflate() header and trailer cases and code after inflate() */
+void cover_wrap(void)
+{
+    int ret;
+    z_stream strm, copy;
+    unsigned char dict[257];
+
+    ret = inflate(Z_NULL, 0);                   assert(ret == Z_STREAM_ERROR);
+    ret = inflateEnd(Z_NULL);                   assert(ret == Z_STREAM_ERROR);
+    ret = inflateCopy(Z_NULL, Z_NULL);          assert(ret == Z_STREAM_ERROR);
+    std::cout << "inflate bad parameters" << std::endl;
+
+    inf("1f 8b 0 0", "bad gzip method", 0, 31, 0, Z_DATA_ERROR);
+    inf("1f 8b 8 80", "bad gzip flags", 0, 31, 0, Z_DATA_ERROR);
+    inf("77 85", "bad zlib method", 0, 15, 0, Z_DATA_ERROR);
+    inf("8 99", "set window size from header", 0, 0, 0, Z_OK);
+    inf("78 9c", "bad zlib window size", 0, 8, 0, Z_DATA_ERROR);
+    inf("78 9c 63 0 0 0 1 0 1", "check adler32", 0, 15, 1, Z_STREAM_END);
+    inf("1f 8b 8 1e 0 0 0 0 0 0 1 0 0 0 0 0 0", "bad header crc", 0, 47, 1,
+        Z_DATA_ERROR);
+    inf("1f 8b 8 2 0 0 0 0 0 0 1d 26 3 0 0 0 0 0 0 0 0 0", "check gzip length",
+        0, 47, 0, Z_STREAM_END);
+    inf("78 90", "bad zlib header check", 0, 47, 0, Z_DATA_ERROR);
+    inf("8 b8 0 0 0 1", "need dictionary", 0, 8, 0, Z_NEED_DICT);
+    inf("78 9c 63 0", "compute adler32", 0, 15, 1, Z_OK);
+
+    mem_setup(&strm);
+    strm.avail_in = 0;
+    strm.next_in = Z_NULL;
+    ret = inflateInit2(&strm, -8);
+    strm.avail_in = 2;
+    strm.next_in = (Bytef *)"\x63";
+    strm.avail_out = 1;
+    strm.next_out = (Bytef *)&ret;
+    mem_limit(&strm, 1);
+    ret = inflate(&strm, Z_NO_FLUSH);           assert(ret == Z_MEM_ERROR);
+    ret = inflate(&strm, Z_NO_FLUSH);           assert(ret == Z_MEM_ERROR);
+    mem_limit(&strm, 0);
+    memset(dict, 0, 257);
+    ret = inflateSetDictionary(&strm, dict, 257);
+                                                assert(ret == Z_OK);
+    mem_limit(&strm, (sizeof(struct inflate_state) << 1) + 256);
+    ret = inflatePrime(&strm, 16, 0);           assert(ret == Z_OK);
+    strm.avail_in = 2;
+    strm.next_in = (Bytef *)"\x80";
+    ret = inflateSync(&strm);                   assert(ret == Z_DATA_ERROR);
+    ret = inflate(&strm, Z_NO_FLUSH);           assert(ret == Z_STREAM_ERROR);
+    strm.avail_in = 4;
+    strm.next_in = (Bytef *)"\0\0\xff\xff";
+    ret = inflateSync(&strm);                   assert(ret == Z_OK);
+    (void)inflateSyncPoint(&strm);
+    ret = inflateCopy(&copy, &strm);            assert(ret == Z_MEM_ERROR);
+    mem_limit(&strm, 0);
+    ret = inflateUndermine(&strm, 1);           assert(ret == Z_DATA_ERROR);
+    (void)inflateMark(&strm);
+    ret = inflateEnd(&strm);                    assert(ret == Z_OK);
+    mem_done(&strm, "miscellaneous, force memory errors");
+}
+
+/* input and output functions for inflateBack() */
+local unsigned pull(void *desc, unsigned char **buf)
+{
+    static unsigned int next = 0;
+    static unsigned char dat[] = {0x63, 0, 2, 0};
+    struct inflate_state *state;
+
+    if (desc == Z_NULL) {
+        next = 0;
+        return 0;   /* no input (already provided at next_in) */
+    }
+    state = reinterpret_cast<struct inflate_state *>(((z_stream *)desc)->state);
+    if (state != Z_NULL)
+        state->mode = SYNC;     /* force an otherwise impossible situation */
+    return next < sizeof(dat) ? (*buf = dat + next++, 1) : 0;
+}
+
+local int push(void *desc, unsigned char *buf, unsigned len)
+{
+    (void)buf;
+    (void)len;
+    return desc != Z_NULL;      /* force error if desc not null */
+}
+
+/* cover inflateBack() up to common deflate data cases and after those */
+void cover_back(void)
+{
+    int ret;
+    z_stream strm;
+    unsigned char win[32768];
+
+    ret = inflateBackInit_(Z_NULL, 0, win, 0, 0);
+                                                assert(ret == Z_VERSION_ERROR);
+    ret = inflateBackInit(Z_NULL, 0, win);      assert(ret == Z_STREAM_ERROR);
+    ret = inflateBack(Z_NULL, Z_NULL, Z_NULL, Z_NULL, Z_NULL);
+                                                assert(ret == Z_STREAM_ERROR);
+    ret = inflateBackEnd(Z_NULL);               assert(ret == Z_STREAM_ERROR);
+    std::cout << "inflateBack bad parameters" << std::endl;;
+
+    mem_setup(&strm);
+    ret = inflateBackInit(&strm, 15, win);      assert(ret == Z_OK);
+    strm.avail_in = 2;
+    strm.next_in = (Bytef *)"\x03";
+    ret = inflateBack(&strm, pull, Z_NULL, push, Z_NULL);
+                                                assert(ret == Z_STREAM_END);
+        /* force output error */
+    strm.avail_in = 3;
+    strm.next_in = (Bytef *)"\x63\x00";
+    ret = inflateBack(&strm, pull, Z_NULL, push, &strm);
+                                                assert(ret == Z_BUF_ERROR);
+        /* force mode error by mucking with state */
+    ret = inflateBack(&strm, pull, &strm, push, Z_NULL);
+                                                assert(ret == Z_STREAM_ERROR);
+    ret = inflateBackEnd(&strm);                assert(ret == Z_OK);
+    mem_done(&strm, "inflateBack bad state");
+
+    ret = inflateBackInit(&strm, 15, win);      assert(ret == Z_OK);
+    ret = inflateBackEnd(&strm);                assert(ret == Z_OK);
+    std::cout << "inflateBack built-in memory routines" << std::endl;;
+}
+
+/* do a raw inflate of data in hexadecimal with both inflate and inflateBack */
+local int try(const char *hex, const char *id, int err)
+{
+    int ret;
+    unsigned len, size;
+    unsigned char *in, *out, *win;
+    char *prefix;
+    z_stream strm;
+
+    /* convert to hex */
+    in = h2b(hex, &len);
+    assert(in != NULL);
+
+    /* allocate work areas */
+    size = len << 3;
+    out = static_cast<unsigned char *>(malloc(size));
+    assert(out != NULL);
+    win = static_cast<unsigned char *>(malloc(32768));
+    assert(win != NULL);
+    prefix = static_cast<char *>(malloc(strlen(id) + 6));
+    assert(prefix != NULL);
+
+    /* first with inflate */
+    strcpy(prefix, id);
+    strcat(prefix, "-late");
+    mem_setup(&strm);
+    strm.avail_in = 0;
+    strm.next_in = Z_NULL;
+    ret = inflateInit2(&strm, err < 0 ? 47 : -15);
+    assert(ret == Z_OK);
+    strm.avail_in = len;
+    strm.next_in = in;
+    do {
+        strm.avail_out = size;
+        strm.next_out = out;
+        ret = inflate(&strm, Z_TREES);
+        assert(ret != Z_STREAM_ERROR && ret != Z_MEM_ERROR);
+        if (ret == Z_DATA_ERROR || ret == Z_NEED_DICT)
+            break;
+    } while (strm.avail_in || strm.avail_out == 0);
+    if (err) {
+        assert(ret == Z_DATA_ERROR);
+        assert(strcmp(id, strm.msg) == 0);
+    }
+    inflateEnd(&strm);
+    mem_done(&strm, prefix);
+
+    /* then with inflateBack */
+    if (err >= 0) {
+        strcpy(prefix, id);
+        strcat(prefix, "-back");
+        mem_setup(&strm);
+        ret = inflateBackInit(&strm, 15, win);
+        assert(ret == Z_OK);
+        strm.avail_in = len;
+        strm.next_in = in;
+        ret = inflateBack(&strm, pull, Z_NULL, push, Z_NULL);
+        assert(ret != Z_STREAM_ERROR);
+        if (err) {
+            assert(ret == Z_DATA_ERROR);
+            assert(strcmp(id, strm.msg) == 0);
+        }
+        inflateBackEnd(&strm);
+        mem_done(&strm, prefix);
+    }
+
+    /* clean up */
+    free(prefix);
+    free(win);
+    free(out);
+    free(in);
+    return ret;
+}
+
+/* cover deflate data cases in both inflate() and inflateBack() */
+void cover_inflate(void)
+{
+    try("0 0 0 0 0", "invalid stored block lengths", 1);
+    try("3 0", "fixed", 0);
+    try("6", "invalid block type", 1);
+    try("1 1 0 fe ff 0", "stored", 0);
+    try("fc 0 0", "too many length or distance symbols", 1);
+    try("4 0 fe ff", "invalid code lengths set", 1);
+    try("4 0 24 49 0", "invalid bit length repeat", 1);
+    try("4 0 24 e9 ff ff", "invalid bit length repeat", 1);
+    try("4 0 24 e9 ff 6d", "invalid code -- missing end-of-block", 1);
+    try("4 80 49 92 24 49 92 24 71 ff ff 93 11 0",
+        "invalid literal/lengths set", 1);
+    try("4 80 49 92 24 49 92 24 f b4 ff ff c3 84", "invalid distances set", 1);
+    try("4 c0 81 8 0 0 0 0 20 7f eb b 0 0", "invalid literal/length code", 1);
+    try("2 7e ff ff", "invalid distance code", 1);
+    try("c c0 81 0 0 0 0 0 90 ff 6b 4 0", "invalid distance too far back", 1);
+
+    /* also trailer mismatch just in inflate() */
+    try("1f 8b 8 0 0 0 0 0 0 0 3 0 0 0 0 1", "incorrect data check", -1);
+    try("1f 8b 8 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 1",
+        "incorrect length check", -1);
+    try("5 c0 21 d 0 0 0 80 b0 fe 6d 2f 91 6c", "pull 17", 0);
+    try("5 e0 81 91 24 cb b2 2c 49 e2 f 2e 8b 9a 47 56 9f fb fe ec d2 ff 1f",
+        "long code", 0);
+    try("ed c0 1 1 0 0 0 40 20 ff 57 1b 42 2c 4f", "length extra", 0);
+    try("ed cf c1 b1 2c 47 10 c4 30 fa 6f 35 1d 1 82 59 3d fb be 2e 2a fc f c",
+        "long distance and extra", 0);
+    try("ed c0 81 0 0 0 0 80 a0 fd a9 17 a9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "
+        "0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6", "window end", 0);
+    inf("2 8 20 80 0 3 0", "inflate_fast TYPE return", 0, -15, 258,
+        Z_STREAM_END);
+    inf("63 18 5 40 c 0", "window wrap", 3, -8, 300, Z_OK);
+}
+
+/* XXX(cavalcantii): fix linking error due inflate_table. */
+/* cover remaining lines in inftrees.c */
+/* void cover_trees(void) */
+/* { */
+/*     int ret; */
+/*     unsigned bits; */
+/*     unsigned short lens[16], work[16]; */
+/*     code *next, table[ENOUGH_DISTS]; */
+
+/*     /\* we need to call inflate_table() directly in order to manifest not- */
+/*        enough errors, since zlib insures that enough is always enough *\/ */
+/*     for (bits = 0; bits < 15; bits++) */
+/*         lens[bits] = (unsigned short)(bits + 1); */
+/*     lens[15] = 15; */
+/*     next = table; */
+/*     bits = 15; */
+/*     ret = inflate_table(DISTS, lens, 16, &next, &bits, work); */
+/*                                                 assert(ret == 1); */
+/*     next = table; */
+/*     bits = 1; */
+/*     ret = inflate_table(DISTS, lens, 16, &next, &bits, work); */
+/*                                                 assert(ret == 1); */
+/*     fputs("inflate_table not enough errors\n", stderr); */
+/* } */
+
+/* cover remaining inffast.c decoding and window copying */
+void cover_fast(void)
+{
+    inf("e5 e0 81 ad 6d cb b2 2c c9 01 1e 59 63 ae 7d ee fb 4d fd b5 35 41 68"
+        " ff 7f 0f 0 0 0", "fast length extra bits", 0, -8, 258, Z_DATA_ERROR);
+    inf("25 fd 81 b5 6d 59 b6 6a 49 ea af 35 6 34 eb 8c b9 f6 b9 1e ef 67 49"
+        " 50 fe ff ff 3f 0 0", "fast distance extra bits", 0, -8, 258,
+        Z_DATA_ERROR);
+    inf("3 7e 0 0 0 0 0", "fast invalid distance code", 0, -8, 258,
+        Z_DATA_ERROR);
+    inf("1b 7 0 0 0 0 0", "fast invalid literal/length code", 0, -8, 258,
+        Z_DATA_ERROR);
+    inf("d c7 1 ae eb 38 c 4 41 a0 87 72 de df fb 1f b8 36 b1 38 5d ff ff 0",
+        "fast 2nd level codes and too far back", 0, -8, 258, Z_DATA_ERROR);
+    inf("63 18 5 8c 10 8 0 0 0 0", "very common case", 0, -8, 259, Z_OK);
+    inf("63 60 60 18 c9 0 8 18 18 18 26 c0 28 0 29 0 0 0",
+        "contiguous and wrap around window", 6, -8, 259, Z_OK);
+    inf("63 0 3 0 0 0 0 0", "copy direct from output", 0, -8, 259,
+        Z_STREAM_END);
+}
+
+/* Adapted from Evgeny Legerov PoC (https://github.com/ivd38/zlib_overflow)
+ * this test case crashes in ASAN builds with the correct payload.
+ */
+local void inf_cve_2022_37434(char *hex, char *what, unsigned step, int win, unsigned len,
+                              int err)
+{
+    int ret;
+    unsigned have;
+    unsigned char *in, *out;
+    z_stream strm, copy;
+    gz_header head;
+
+    mem_setup(&strm);
+    strm.avail_in = 0;
+    strm.next_in = Z_NULL;
+    ret = inflateInit2(&strm, win);
+    if (ret != Z_OK) {
+        mem_done(&strm, what);
+        return;
+    }
+    out = static_cast<unsigned char *>(malloc(len));                          assert(out != NULL);
+    if (win == 47) {
+        head.extra = out;
+        head.extra_max = len;
+        head.name = out;
+        head.name_max = len;
+        head.comment = out;
+        head.comm_max = len;
+        ret = inflateGetHeader(&strm, &head);   assert(ret == Z_OK);
+    }
+    in = h2b(hex, &have);                       assert(in != NULL);
+    if (step == 0 || step > have)
+        step = have;
+    strm.avail_in = step;
+    have -= step;
+    strm.next_in = in;
+    do {
+        strm.avail_out = len;
+        strm.next_out = out;
+        ret = inflate(&strm, Z_NO_FLUSH);
+        if (ret != Z_OK && ret != Z_BUF_ERROR && ret != Z_NEED_DICT)
+            break;
+        have += strm.avail_in;
+        strm.avail_in = step > have ? have : step;
+        have -= strm.avail_in;
+    } while (strm.avail_in);
+    free(in);
+    free(out);
+    ret = inflateReset2(&strm, -8);
+    ret = inflateEnd(&strm);
+    mem_done(&strm, what);
+}
+
+void cover_CVE_2022_37434(void)
+{
+    char payload[] = "1f 8b 08 04 61 62 63 64 61 62 52 51 1f 8b 08 04 61 62 63 64 61 62 52 51 1f 8b 08 04 61 62 63 64 61 62 52 51 1f 8b 08 04 61 62 63 64 61 62 52 51";
+    char cve[] = "wtf";
+    inf_cve_2022_37434(payload, cve, 13, 47, 12, Z_OK);
+}
+
+// clang-format on
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/infcover.h b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/infcover.h
new file mode 100644
index 000000000..dbf67d7b4
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/infcover.h
@@ -0,0 +1,12 @@
+#ifndef __INF_COVER_H__
+#define __INF_COVER_H__
+
+void cover_support(void);
+void cover_wrap(void);
+void cover_back(void);
+void cover_inflate(void);
+void cover_trees(void);
+void cover_fast(void);
+
+void cover_CVE_2022_37434(void);
+#endif
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/run_all_unittests.cc b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/run_all_unittests.cc
new file mode 100644
index 000000000..4b6115b07
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/run_all_unittests.cc
@@ -0,0 +1,14 @@
+// Copyright 2020 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "base/functional/bind.h"
+#include "base/test/launcher/unit_test_launcher.h"
+#include "base/test/test_suite.h"
+
+int main(int argc, char** argv) {
+  base::TestSuite test_suite(argc, argv);
+  return base::LaunchUnitTests(
+      argc, argv,
+      base::BindOnce(&base::TestSuite::Run, base::Unretained(&test_suite)));
+}
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/standalone_test_runner.cc b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/standalone_test_runner.cc
new file mode 100644
index 000000000..1ec9c30ba
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/standalone_test_runner.cc
@@ -0,0 +1,9 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the Chromium source repository LICENSE file.
+#include <gtest/gtest.h>
+
+int main(int argc, char** argv) {
+  ::testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/utils_unittest.cc b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/utils_unittest.cc
new file mode 100644
index 000000000..d06dbc981
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/contrib/tests/utils_unittest.cc
@@ -0,0 +1,1150 @@
+// Copyright 2020 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the Chromium source repository LICENSE file.
+
+#include "infcover.h"
+
+#include <cstddef>
+#include <vector>
+
+#include "compression_utils_portable.h"
+#include "gtest.h"
+
+#if !defined(CMAKE_STANDALONE_UNITTESTS)
+#include "base/files/file_path.h"
+#include "base/files/scoped_temp_dir.h"
+
+#include "third_party/zlib/contrib/minizip/unzip.h"
+#include "third_party/zlib/contrib/minizip/zip.h"
+#endif
+
+#include "zlib.h"
+
+void TestPayloads(size_t input_size, zlib_internal::WrapperType type) {
+  std::vector<unsigned char> input;
+  input.reserve(input_size);
+  for (size_t i = 1; i <= input_size; ++i)
+    input.push_back(i & 0xff);
+
+  // If it is big enough for GZIP, will work for other wrappers.
+  std::vector<unsigned char> compressed(
+      zlib_internal::GzipExpectedCompressedSize(input.size()));
+  std::vector<unsigned char> decompressed(input.size());
+
+  // Libcores's java/util/zip/Deflater default settings: ZLIB,
+  // DEFAULT_COMPRESSION and DEFAULT_STRATEGY.
+  unsigned long compressed_size = static_cast<unsigned long>(compressed.size());
+  int result = zlib_internal::CompressHelper(
+      type, compressed.data(), &compressed_size, input.data(), input.size(),
+      Z_DEFAULT_COMPRESSION, nullptr, nullptr);
+  ASSERT_EQ(result, Z_OK);
+
+  unsigned long decompressed_size =
+      static_cast<unsigned long>(decompressed.size());
+  result = zlib_internal::UncompressHelper(type, decompressed.data(),
+                                           &decompressed_size,
+                                           compressed.data(), compressed_size);
+  ASSERT_EQ(result, Z_OK);
+  EXPECT_EQ(input, decompressed);
+}
+
+TEST(ZlibTest, ZlibWrapper) {
+  // Minimal ZLIB wrapped short stream size is about 8 bytes.
+  for (size_t i = 1; i < 1024; ++i)
+    TestPayloads(i, zlib_internal::WrapperType::ZLIB);
+}
+
+TEST(ZlibTest, GzipWrapper) {
+  // GZIP should be 12 bytes bigger than ZLIB wrapper.
+  for (size_t i = 1; i < 1024; ++i)
+    TestPayloads(i, zlib_internal::WrapperType::GZIP);
+}
+
+TEST(ZlibTest, RawWrapper) {
+  // RAW has no wrapper (V8 Blobs is a known user), size
+  // should be payload_size + 2 for short payloads.
+  for (size_t i = 1; i < 1024; ++i)
+    TestPayloads(i, zlib_internal::WrapperType::ZRAW);
+}
+
+TEST(ZlibTest, InflateCover) {
+  cover_support();
+  cover_wrap();
+  cover_back();
+  cover_inflate();
+  // TODO(cavalcantii): enable this last test.
+  // cover_trees();
+  cover_fast();
+}
+
+TEST(ZlibTest, InflateCVE) {
+  cover_CVE_2022_37434();
+}
+
+TEST(ZlibTest, DeflateStored) {
+  const int no_compression = 0;
+  const zlib_internal::WrapperType type = zlib_internal::WrapperType::GZIP;
+  std::vector<unsigned char> input(1 << 10, 42);
+  std::vector<unsigned char> compressed(
+      zlib_internal::GzipExpectedCompressedSize(input.size()));
+  std::vector<unsigned char> decompressed(input.size());
+  unsigned long compressed_size = static_cast<unsigned long>(compressed.size());
+  int result = zlib_internal::CompressHelper(
+      type, compressed.data(), &compressed_size, input.data(), input.size(),
+      no_compression, nullptr, nullptr);
+  ASSERT_EQ(result, Z_OK);
+
+  unsigned long decompressed_size =
+      static_cast<unsigned long>(decompressed.size());
+  result = zlib_internal::UncompressHelper(type, decompressed.data(),
+                                           &decompressed_size,
+                                           compressed.data(), compressed_size);
+  ASSERT_EQ(result, Z_OK);
+  EXPECT_EQ(input, decompressed);
+}
+
+TEST(ZlibTest, StreamingInflate) {
+  uint8_t comp_buf[4096], decomp_buf[4096];
+  z_stream comp_strm, decomp_strm;
+  int ret;
+
+  std::vector<uint8_t> src;
+  for (size_t i = 0; i < 1000; i++) {
+    for (size_t j = 0; j < 40; j++) {
+      src.push_back(j);
+    }
+  }
+
+  // Deflate src into comp_buf.
+  comp_strm.zalloc = Z_NULL;
+  comp_strm.zfree = Z_NULL;
+  comp_strm.opaque = Z_NULL;
+  ret = deflateInit(&comp_strm, Z_BEST_COMPRESSION);
+  ASSERT_EQ(ret, Z_OK);
+  comp_strm.next_out = comp_buf;
+  comp_strm.avail_out = sizeof(comp_buf);
+  comp_strm.next_in = src.data();
+  comp_strm.avail_in = src.size();
+  ret = deflate(&comp_strm, Z_FINISH);
+  ASSERT_EQ(ret, Z_STREAM_END);
+  size_t comp_sz = sizeof(comp_buf) - comp_strm.avail_out;
+
+  // Inflate comp_buf one 4096-byte buffer at a time.
+  decomp_strm.zalloc = Z_NULL;
+  decomp_strm.zfree = Z_NULL;
+  decomp_strm.opaque = Z_NULL;
+  ret = inflateInit(&decomp_strm);
+  ASSERT_EQ(ret, Z_OK);
+  decomp_strm.next_in = comp_buf;
+  decomp_strm.avail_in = comp_sz;
+
+  while (decomp_strm.avail_in > 0) {
+    decomp_strm.next_out = decomp_buf;
+    decomp_strm.avail_out = sizeof(decomp_buf);
+    ret = inflate(&decomp_strm, Z_FINISH);
+    ASSERT_TRUE(ret == Z_OK || ret == Z_STREAM_END || ret == Z_BUF_ERROR);
+
+    // Verify the output bytes.
+    size_t num_out = sizeof(decomp_buf) - decomp_strm.avail_out;
+    for (size_t i = 0; i < num_out; i++) {
+      EXPECT_EQ(decomp_buf[i], src[decomp_strm.total_out - num_out + i]);
+    }
+  }
+
+  // Cleanup memory (i.e. makes ASAN bot happy).
+  ret = deflateEnd(&comp_strm);
+  EXPECT_EQ(ret, Z_OK);
+  ret = inflateEnd(&decomp_strm);
+  EXPECT_EQ(ret, Z_OK);
+}
+
+TEST(ZlibTest, CRCHashBitsCollision) {
+  // The CRC32c of the hex sequences 2a,14,14,14 and 2a,14,db,14 have the same
+  // lower 9 bits. Since longest_match doesn't check match[2], a bad match could
+  // be chosen when the number of hash bits is <= 9. For this reason, the number
+  // of hash bits must be set higher, regardless of the memlevel parameter, when
+  // using CRC32c hashing for string matching. See https://crbug.com/1113596
+
+  std::vector<uint8_t> src = {
+      // Random byte; zlib doesn't match at offset 0.
+      123,
+
+      // This will look like 5-byte match.
+      0x2a,
+      0x14,
+      0xdb,
+      0x14,
+      0x15,
+
+      // Offer a 4-byte match to bump the next expected match length to 5.
+      0x2a,
+      0x14,
+      0x14,
+      0x14,
+
+      0x2a,
+      0x14,
+      0x14,
+      0x14,
+      0x15,
+  };
+
+  z_stream stream;
+  stream.zalloc = nullptr;
+  stream.zfree = nullptr;
+
+  // Using a low memlevel to try to reduce the number of hash bits. Negative
+  // windowbits means raw deflate, i.e. without the zlib header.
+  int ret = deflateInit2(&stream, /*comp level*/ 2, /*method*/ Z_DEFLATED,
+                         /*windowbits*/ -15, /*memlevel*/ 2,
+                         /*strategy*/ Z_DEFAULT_STRATEGY);
+  ASSERT_EQ(ret, Z_OK);
+  std::vector<uint8_t> compressed(100, '\0');
+  stream.next_out = compressed.data();
+  stream.avail_out = compressed.size();
+  stream.next_in = src.data();
+  stream.avail_in = src.size();
+  ret = deflate(&stream, Z_FINISH);
+  ASSERT_EQ(ret, Z_STREAM_END);
+  compressed.resize(compressed.size() - stream.avail_out);
+  deflateEnd(&stream);
+
+  ret = inflateInit2(&stream, /*windowbits*/ -15);
+  ASSERT_EQ(ret, Z_OK);
+  std::vector<uint8_t> decompressed(src.size(), '\0');
+  stream.next_in = compressed.data();
+  stream.avail_in = compressed.size();
+  stream.next_out = decompressed.data();
+  stream.avail_out = decompressed.size();
+  ret = inflate(&stream, Z_FINISH);
+  ASSERT_EQ(ret, Z_STREAM_END);
+  EXPECT_EQ(0U, stream.avail_out);
+  inflateEnd(&stream);
+
+  EXPECT_EQ(src, decompressed);
+}
+
+TEST(ZlibTest, CRCHashAssert) {
+  // The CRC32c of the hex sequences ff,ff,5e,6f and ff,ff,13,ff have the same
+  // lower 15 bits. This means longest_match's assert that match[2] == scan[2]
+  // won't hold. However, such hash collisions are only possible when one of the
+  // other four bytes also mismatch. This tests that zlib's assert handles this
+  // case.
+
+  std::vector<uint8_t> src = {
+      // Random byte; zlib doesn't match at offset 0.
+      123,
+
+      // This has the same hash as the last byte sequence, and the first two and
+      // last two bytes match; though the third and the fourth don't.
+      0xff,
+      0xff,
+      0x5e,
+      0x6f,
+      0x12,
+      0x34,
+
+      // Offer a 5-byte match to bump the next expected match length to 6
+      // (because the two first and two last bytes need to match).
+      0xff,
+      0xff,
+      0x13,
+      0xff,
+      0x12,
+
+      0xff,
+      0xff,
+      0x13,
+      0xff,
+      0x12,
+      0x34,
+  };
+
+  z_stream stream;
+  stream.zalloc = nullptr;
+  stream.zfree = nullptr;
+
+  int ret = deflateInit2(&stream, /*comp level*/ 5, /*method*/ Z_DEFLATED,
+                         /*windowbits*/ -15, /*memlevel*/ 8,
+                         /*strategy*/ Z_DEFAULT_STRATEGY);
+  ASSERT_EQ(ret, Z_OK);
+  std::vector<uint8_t> compressed(100, '\0');
+  stream.next_out = compressed.data();
+  stream.avail_out = compressed.size();
+  stream.next_in = src.data();
+  stream.avail_in = src.size();
+  ret = deflate(&stream, Z_FINISH);
+  ASSERT_EQ(ret, Z_STREAM_END);
+  compressed.resize(compressed.size() - stream.avail_out);
+  deflateEnd(&stream);
+
+  ret = inflateInit2(&stream, /*windowbits*/ -15);
+  ASSERT_EQ(ret, Z_OK);
+  std::vector<uint8_t> decompressed(src.size(), '\0');
+  stream.next_in = compressed.data();
+  stream.avail_in = compressed.size();
+  stream.next_out = decompressed.data();
+  stream.avail_out = decompressed.size();
+  ret = inflate(&stream, Z_FINISH);
+  ASSERT_EQ(ret, Z_STREAM_END);
+  EXPECT_EQ(0U, stream.avail_out);
+  inflateEnd(&stream);
+
+  EXPECT_EQ(src, decompressed);
+}
+
+// Fuzzer generated.
+static const uint8_t checkMatchCrashData[] = {
+    0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc5, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x00,
+    0x6e, 0x6e, 0x6e, 0x00, 0x00, 0x00, 0x00, 0x6e, 0x01, 0x39, 0x6e, 0x6e,
+    0x00, 0x00, 0x00, 0x00, 0xf7, 0xff, 0x00, 0x00, 0x00, 0x00, 0x6e, 0x6e,
+    0x00, 0x00, 0x0a, 0x9a, 0x00, 0x00, 0x6e, 0x6e, 0x6e, 0x2a, 0x00, 0x00,
+    0x00, 0xd5, 0xf0, 0x00, 0x81, 0x02, 0xf3, 0xfd, 0xff, 0xab, 0xf3, 0x6e,
+    0x7e, 0x04, 0x5b, 0xf6, 0x2a, 0x2c, 0xf8, 0x00, 0x54, 0xf3, 0xa5, 0x0e,
+    0xfd, 0x6e, 0xff, 0x00, 0xfd, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0xa4, 0x0b, 0xa5, 0x2a, 0x0d, 0x10, 0x01, 0x26, 0xf6, 0x04, 0x0e,
+    0xff, 0x6e, 0x6e, 0x6e, 0x76, 0x00, 0x00, 0x87, 0x01, 0xfe, 0x0d, 0xb6,
+    0x6e, 0x6e, 0xf7, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0xfd, 0x00, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x29, 0x00, 0x9b,
+    0x02, 0x00, 0x00, 0x00, 0x00, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a,
+    0x8a, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a, 0x6e, 0xff, 0xff, 0x00,
+    0x00, 0xd5, 0xf0, 0x00, 0xff, 0x40, 0x7e, 0x0b, 0xa5, 0x10, 0x67, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x40, 0x7e, 0x0b, 0xa5, 0x10, 0x67,
+    0x7e, 0x32, 0x6e, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x40, 0x0b, 0xa5,
+    0x10, 0x67, 0x01, 0xfe, 0x0d, 0xb6, 0x2a, 0x00, 0x00, 0x58, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x6e, 0xfd, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x3d, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3d, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xd6, 0x2d, 0x2d, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a,
+    0x8a, 0x8a, 0x8a, 0x8a, 0x66, 0x8a, 0x8a, 0x8a, 0xee, 0x1d, 0x00, 0x00,
+    0x00, 0x02, 0x00, 0x00, 0x00, 0xee, 0x0a, 0x00, 0x00, 0x00, 0x54, 0x40,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0xf3, 0x00, 0x00, 0xff, 0xff, 0x23, 0x7e, 0x00, 0x1e,
+    0x00, 0x00, 0xd5, 0xf0, 0x00, 0xff, 0x40, 0x0b, 0xa5, 0x10, 0x67, 0x01,
+    0xfe, 0x0d, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a,
+    0x8a, 0x8a, 0x8a, 0x2d, 0x6e, 0x2d, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x0e,
+    0xfb, 0x00, 0x10, 0x24, 0x00, 0x00, 0xfb, 0xff, 0x00, 0x00, 0xff, 0x1f,
+    0xb3, 0x00, 0x04, 0x3d, 0x00, 0xee, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3d, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x3d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00,
+    0x01, 0x45, 0x3d, 0x00, 0x00, 0x00, 0xfd, 0x00, 0x11, 0x21, 0x00, 0x1e,
+    0x00, 0x0c, 0xb3, 0xfe, 0x0e, 0xee, 0x02, 0x00, 0x1d, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x6e, 0x6e, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x6e, 0x00,
+    0x00, 0x87, 0x00, 0x33, 0x38, 0x6e, 0x6e, 0x6e, 0x6e, 0x6e, 0x00, 0x00,
+    0x00, 0x38, 0x00, 0x00, 0xff, 0xff, 0xff, 0x04, 0x3f, 0xff, 0xff, 0xff,
+    0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0xff, 0x00, 0x31, 0x13, 0x13, 0x13,
+    0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xab, 0x30, 0x83, 0x33,
+    0x00, 0x00, 0x01, 0x05, 0x00, 0x00, 0xff, 0xff, 0x7d, 0xff, 0x00, 0x01,
+    0x10, 0x0d, 0x2a, 0xa5, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfd, 0x00, 0x11,
+    0x21, 0x00, 0xa5, 0x00, 0x68, 0x68, 0x68, 0x67, 0x00, 0x00, 0xff, 0xff,
+    0x02, 0x00, 0x00, 0x68, 0x68, 0x68, 0x68, 0x00, 0x00, 0xfa, 0xff, 0xff,
+    0x03, 0x01, 0xff, 0x02, 0x00, 0x00, 0x68, 0x68, 0x68, 0x68, 0x0a, 0x10,
+    0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff,
+    0x06, 0x00, 0x00, 0x2b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0xfa, 0xff, 0xff, 0x08, 0xff, 0xff, 0xff, 0x00, 0x06, 0x04,
+    0x00, 0xf8, 0xff, 0xff, 0x00, 0x01, 0x00, 0x00, 0x25, 0x00, 0x00, 0x00,
+    0x00, 0xff, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x78, 0x00, 0x00, 0x01, 0x00, 0xff, 0xff, 0xff, 0x00, 0x06, 0x04, 0x6e,
+    0x7e, 0x87, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3d, 0x00, 0x00,
+    0x00, 0x6e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x87, 0x6e, 0x6e, 0x6e,
+    0x00, 0x01, 0x38, 0xd5, 0xf0, 0x00, 0x00, 0x2a, 0xfe, 0x04, 0x5b, 0x0d,
+    0xfd, 0x6e, 0x92, 0x28, 0xf9, 0xfb, 0xff, 0x07, 0xd2, 0xd6, 0x2d, 0x2d,
+    0x8a, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a,
+    0x8a, 0x8a, 0xc2, 0x91, 0x00, 0x5b, 0xef, 0xde, 0xf2, 0x6e, 0x6e, 0xfd,
+    0x0c, 0x02, 0x91, 0x62, 0x91, 0xfd, 0x6e, 0x6e, 0xd3, 0x06, 0x00, 0x00,
+    0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x00,
+    0xd5, 0xf0, 0x00, 0xff, 0x00, 0x00, 0x31, 0x13, 0x13, 0x13, 0x04, 0x00,
+    0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x04, 0x00, 0x13, 0x0a, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x6e, 0x00, 0x00, 0x01,
+    0x00, 0x00, 0x09, 0x00, 0x6a, 0x24, 0x26, 0x30, 0x01, 0x2e, 0x2a, 0xfe,
+    0x04, 0x5b, 0x0d, 0xfd, 0x6e, 0x6e, 0xd7, 0x06, 0x6e, 0x6e, 0x6e, 0x00,
+    0x00, 0xb1, 0xb1, 0xb1, 0xb1, 0x00, 0x00, 0x00, 0x6e, 0x5b, 0x00, 0x00,
+    0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x01, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x1e, 0x00, 0x00, 0x00, 0x87, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6b, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x0b,
+    0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x24, 0x2a, 0x6e, 0x5c, 0x24,
+    0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x87, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xeb,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x40, 0x00, 0x40, 0x00, 0x00, 0x00, 0x58, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+    0x05, 0x00, 0x00, 0x00, 0x5d, 0x10, 0x6e, 0x6e, 0xa5, 0x2f, 0x00, 0x00,
+    0x95, 0x87, 0x00, 0x6e};
+
+TEST(ZlibTest, CheckMatchCrash) {
+  // See https://crbug.com/1113142.
+  z_stream stream;
+  stream.zalloc = nullptr;
+  stream.zfree = nullptr;
+
+  // Low windowbits to hit window sliding also with a relatively small input.
+  int ret = deflateInit2(&stream, /*comp level*/ 5, /*method*/ Z_DEFLATED,
+                         /*windowbits*/ -9, /*memlevel*/ 8,
+                         /*strategy*/ Z_DEFAULT_STRATEGY);
+  ASSERT_EQ(ret, Z_OK);
+
+  uint8_t compressed[sizeof(checkMatchCrashData) * 2];
+  stream.next_out = compressed;
+  stream.avail_out = sizeof(compressed);
+
+  for (size_t i = 0; i < sizeof(checkMatchCrashData); i++) {
+    ASSERT_GT(stream.avail_out, 0U);
+    stream.next_in = (uint8_t*)&checkMatchCrashData[i];
+    stream.avail_in = 1;
+    ret = deflate(&stream, Z_NO_FLUSH);
+    ASSERT_EQ(ret, Z_OK);
+  }
+
+  stream.next_in = nullptr;
+  stream.avail_in = 0;
+  ASSERT_GT(stream.avail_out, 0U);
+  ret = deflate(&stream, Z_FINISH);
+  ASSERT_EQ(ret, Z_STREAM_END);
+  size_t compressed_sz = sizeof(compressed) - stream.avail_out;
+  deflateEnd(&stream);
+
+  uint8_t decompressed[sizeof(checkMatchCrashData)];
+  ret = inflateInit2(&stream, -15);
+  ASSERT_EQ(ret, Z_OK);
+  stream.next_in = compressed;
+  stream.avail_in = compressed_sz;
+  stream.next_out = decompressed;
+  stream.avail_out = sizeof(decompressed);
+  ret = inflate(&stream, Z_FINISH);
+  ASSERT_EQ(ret, Z_STREAM_END);
+  inflateEnd(&stream);
+  ASSERT_EQ(
+      memcmp(checkMatchCrashData, decompressed, sizeof(checkMatchCrashData)),
+      0);
+}
+
+TEST(ZlibTest, DeflateRLEUninitUse) {
+  // MSan would complain about use of uninitialized values in deflate_rle if the
+  // window isn't zero-initialized. See crbug.com/1137613. Similar problems
+  // exist in other places in zlib, e.g. longest_match (crbug.com/1144420) but
+  // we don't have as nice test cases.
+
+  int level = 9;
+  int windowBits = 9;
+  int memLevel = 8;
+  int strategy = Z_RLE;
+  const std::vector<uint8_t> src{
+      0x31, 0x64, 0x38, 0x32, 0x30, 0x32, 0x30, 0x36, 0x65, 0x35, 0x38, 0x35,
+      0x32, 0x61, 0x30, 0x36, 0x65, 0x35, 0x32, 0x66, 0x30, 0x34, 0x38, 0x37,
+      0x61, 0x31, 0x38, 0x36, 0x37, 0x37, 0x31, 0x39, 0x0a, 0x65, 0x62, 0x00,
+      0x9f, 0xff, 0xc6, 0xc6, 0xc6, 0xff, 0x09, 0x00, 0x62, 0x00, 0x9f, 0xff,
+      0xc6, 0xc6, 0xc6, 0xff, 0x09, 0x00, 0x62, 0x00, 0x9f, 0xff, 0xc6, 0xc6,
+      0xc6, 0xff, 0x09, 0x00, 0x62, 0x00, 0x9f, 0xff, 0xc6, 0xc6, 0xc6, 0x95,
+      0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x0e, 0x0a, 0x54, 0x52,
+      0x58, 0x56, 0xab, 0x26, 0x13, 0x53, 0x5a, 0xb5, 0x30, 0xbb, 0x96, 0x44,
+      0x80, 0xe6, 0xc5, 0x0a, 0xd0, 0x47, 0x7a, 0xa0, 0x4e, 0xbe, 0x30, 0xdc,
+      0xa1, 0x08, 0x54, 0xe1, 0x51, 0xd1, 0xea, 0xef, 0xdb, 0xa1, 0x2d, 0xb4,
+      0xb9, 0x58, 0xb1, 0x2f, 0xf0, 0xae, 0xbc, 0x07, 0xd1, 0xba, 0x7f, 0x14,
+      0xa4, 0xde, 0x99, 0x7f, 0x4d, 0x3e, 0x25, 0xd9, 0xef, 0xee, 0x4f, 0x38,
+      0x7b, 0xaf, 0x3f, 0x6b, 0x53, 0x5a, 0xcb, 0x1f, 0x97, 0xb5, 0x43, 0xa3,
+      0xe8, 0xff, 0x09, 0x00, 0x62, 0x00, 0x9f, 0xff, 0xc6, 0xc6, 0xc6, 0xff,
+      0x09, 0x00, 0x62, 0x00, 0x9f, 0xff, 0xc6, 0xc6, 0xc6, 0xff, 0x09, 0x00,
+      0x62, 0x00, 0x9f, 0xff, 0xc6, 0xc6, 0xc6, 0xff, 0x09, 0x00, 0x62, 0x00,
+      0x9f, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x3c,
+      0x73, 0x70, 0x23, 0x87, 0xec, 0xf8, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0xc1, 0x00, 0x00, 0x9f, 0xc6, 0xc6, 0xff, 0x09, 0x00, 0x62, 0x00, 0x9f,
+      0xff, 0xc6, 0xc6, 0xc6, 0xff, 0x09, 0x00, 0x62, 0x00, 0x9f, 0xff, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00,
+  };
+
+  z_stream stream;
+  stream.zalloc = Z_NULL;
+  stream.zfree = Z_NULL;
+
+  // Compress the data one byte at a time to exercise the streaming code.
+  int ret =
+      deflateInit2(&stream, level, Z_DEFLATED, windowBits, memLevel, strategy);
+  ASSERT_EQ(ret, Z_OK);
+  std::vector<uint8_t> compressed(src.size() * 2 + 1000);
+  stream.next_out = compressed.data();
+  stream.avail_out = compressed.size();
+  for (uint8_t b : src) {
+    stream.next_in = &b;
+    stream.avail_in = 1;
+    ret = deflate(&stream, Z_NO_FLUSH);
+    ASSERT_EQ(ret, Z_OK);
+  }
+  stream.next_in = Z_NULL;
+  stream.avail_in = 0;
+  ret = deflate(&stream, Z_FINISH);
+  ASSERT_EQ(ret, Z_STREAM_END);
+  deflateEnd(&stream);
+}
+
+static const char zFixedCorruptionData[] =
+    "AAABAACAADAAEAAFAAGAAHAAIAAJAAKAALAAMAANAAOAAPAAQAARAASAATAAUAAVAAWAAXAAYA"
+    "AZABBABCABDABEABFABGABHABIABJABKABLABMABNABOABPABQABRABSABTABUABVABWABXABY"
+    "ABZACBACCACDACEACFACGACHACIACJACKACLACMACNACOACPACQACRACSACTACUACVACWACXAC"
+    "YACZADBADCADDADEADFADGADHADIADJADKADLADMADNADOADPADQADRADSADTADUADVADWADXA"
+    "DYADZAEBAECAEDAEEAEFAEGAEHAEIAEJAEKAELAEMAENAEOAEPAEQAERAESAETAEUAEVAEWAEX"
+    "AEYAEZAFBAFCAFDAFEAFFAFGAFHAFIAFJAFKAFLAFMAFNAFOAFPAFQAFRAFSAFTAFUAFVAFWAF"
+    "XAFYAFZAGBAGCAGDAGEAGFAGGAGHAGIAGJAGKAGLAGMAGNAGOAGPAGQAGRAGSAGTAGUAGVAGWA"
+    "GXAGYAGZAHBAHCAHDAHEAHFAHGAHHAHIAHJAHKAHLAHMAHNAHOAHPAHQAHRAHSAHTAHUAHVAHW"
+    "AHXAHYAHZAIBAICAIDAIEAIFAIGAIHAIIAIJAIKAILAIMAINAIOAIPAIQAIRAISAITAIUAIVAI"
+    "WAIXAIYAIZAJBAJCAJDAJEAJFAJGAJHAJIAJJAJKAJLAJMAJNAJOAJPAJQAJRAJSAJTAJUAJVA"
+    "JWAJXAJYAJZAKBAKCAKDAKEAKFAKGAKHAKIAKJAKKAKLAKMAKNAKOAKPAKQAKRAKSAKTAKUAKV"
+    "AKWAKXAKYAKZALBALCALDALEALFALGALHALIALJALKALLALMALNALOALPALQALRALSALTALUAL"
+    "VALWALXALYALZAMBAMCAMDAMEAMFAMGAMHAMIAMJAMKAMLAMMAMNAMOAMPAMQAMRAMSAMTAMUA"
+    "MVAMWAMXAMYAMZANBANCANDANEANFANGANHANIANJANKANLANMANNANOANPANQANRANSANTANU"
+    "ANVANWANXANYANZAOBAOCAODAOEAOFAOGAOHAOIAOJAOKAOLAOMAONAOOAOPAOQAORAOSAOTAO"
+    "UAOVAOWAOXAOYAOZAPBAPCAPDAPEAPFAPGAPHAPIAPJAPKAPLAPMAPNAPOAPPAPQAPRAPSAPTA"
+    "PUAPVAPWAPXAPYAPZAQBAQCAQDAQEAQFAQGAQHAQIAQJAQKAQLAQMAQNAQOAQPAQQAQRAQSAQT"
+    "AQUAQVAQWAQXAQYAQZARBARCARDAREARFARGARHARIARJARKARLARMARNAROARPARQARRARSAR"
+    "TARUARVARWARXARYARZASBASCASDASEASFASGASHASIASJASKASLASMASNASOASPASQASRASSA"
+    "STASUASVASWASXASYASZATBATCATDATEATFATGATHATIATJATKATLATMATNATOATPATQATRATS"
+    "ATTATUATVATWATXATYATZAUBAUCAUDAUEAUFAUGAUHAUIAUJAUKAULAUMAUNAUOAUPAUQAURAU"
+    "SAUTAUUAUVAUWAUXAUYAUZAVBAVCAVDAVEAVFAVGAVHAVIAVJAVKAVLAVMAVNAVOAVPAVQAVRA"
+    "VSAVTAVUAVVAVWAVXAVYAVZAWBAWCAWDAWEAWFAWGAWHAWIAWJAWKAWLAWMAWNAWOAWPAWQAWR"
+    "AWSAWTAWUAWVAWWAWXAWYAWZAXBAXCAXDAXEAXFAXGAXHAXIAXJAXKAXLAXMAXNAXOAXPAXQAX"
+    "RAXSAXTAXUAXVAXWAXXAXYAXZAYBAYCAYDAYEAYFAYGAYHAYIAYJAYKAYLAYMAYNAYOAYPAYQA"
+    "YRAYSAYTAYUAYVAYWAYXAYYAYZAZBAZCAZDAZEAZFAZGAZHAZIAZJAZKAZLAZMAZNAZOAZPAZQ"
+    "AZRAZSAZTAZUAZVAZWAZXAZYAZZBBBCBBDBBEBBFBBGBBHBBIBBJBBKBBLBBMBBNBBOBBPBBQB"
+    "BRBBSBBTBBUBBVBBWBBXBBYBBZBCCBCDBCEBCFBCGBCHBCIBCJBCKBCLBCMBCNBCOBCPBCQBCR"
+    "BCSBCTBCUBCVBCWBCXBCYBCZBDCBDDBDEBDFBDGBDHBDIBDJBDKBDLBDMBDNBDOBDPBDQBDRBD"
+    "SBDTBDUBDVBDWBDXBDYBDZBECBEDBEEBEFBEGBEHBEIBEJBEKBELBEMBENBEOBEPBEQBERBESB"
+    "ETBEUBEVBEWBEXBEYBEZBFCBFDBFEBFFBFGBFHBFIBFJBFKBFLBFMBFNBFOBFPBFQBFRBFSBFT"
+    "BFUBFVBFWBFXBFYBFZBGCBGDBGEBGFBGGBGHBGIBGJBGKBGLBGMBGNBGOBGPBGQBGRBGSBGTBG"
+    "UBGVBGWBGXBGYBGZBHCBHDBHEBHFBHGBHHBHIBHJBHKBHLBHMBHNBHOBHPBHQBHRBHSBHTBHUB"
+    "HVBHWBHXBHYBHZBICBIDBIEBIFBIGBIHBIIBIJBIKBILBIMBINBIOBIPBIQBIRBISBITBIUBIV"
+    "BIWBIXBIYBIZBJCBJDBJEBJFBJGBJHBJIBJJBJKBJLBJMBJNBJOBJPBJQBJRBJSBJTBJUBJVBJ"
+    "WBJXBJYBJZBKCBKDBKEBKFBKGBKHBKIBKJBKKBKLBKMBKNBKOBKPBKQBKRBKSBKTBKUBKVBKWB"
+    "KXBKYBKZBLCBLDBLEBLFBLGBLHBLIBLJBLKBLLBLMBLNBLOBLPBLQBLRBLSBLTBLUBLVBLWBLX"
+    "BLYBLZBMCBMDBMEBMFBMGBMHBMIBMJBMKBMLBMMBMNBMOBMPBMQBMRBMSBMTBMUBMVBMWBMXBM"
+    "YBMZBNCBNDBNEBNFBNGBNHBNIBNJBNKBNLBNMBNNBNOBNPBNQBNRBNSBNTBNUBNVBNWBNXBNYB"
+    "NZBOCBODBOEBOFBOGBOHBOIBOJBOKBOLBOMBONBOOBOPBOQBORBOSBOTBOUBOVBOWBOXBOYBOZ"
+    "BPCBPDBPEBPFBPGBPHBPIBPJBPKBPLBPMBPNBPOBPPBPQBPRBPSBPTBPUBPVBPWBPXBPYBPZBQ"
+    "CBQDBQEBQFBQGBQHBQIBQJBQKBQLBQMBQNBQOBQPBQQBQRBQSBQTBQUBQVBQWBQXBQYBQZBRCB"
+    "RDBREBRFBRGBRHBRIBRJBRKBRLBRMBRNBROBRPBRQBRRBRSBRTBRUBRVBRWBRXBRYBRZBSCBSD"
+    "BSEBSFBSGBSHBSIBSJBSKBSLBSMBSNBSOBSPBSQBSRBSSBSTBSUBSVBSWBSXBSYBSZBTCBTDBT"
+    "EBTFBTGBTHBTIBTJBTKBTLBTMBTNBTOBTPBTQBTRBTSBTTBTUBTVBTWBTXBTYBTZBUCBUDBUEB"
+    "UFBUGBUHBUIBUJBUKBULBUMBUNBUOBUPBUQBURBUSBUTBUUBUVBUWBUXBUYBUZBVCBVDBVEBVF"
+    "BVGBVHBVIBVJBVKBVLBVMBVNBVOBVPBVQBVRBVSBVTBVUBVVBVWBVXBVYBVZBWCBWDBWEBWFBW"
+    "GBWHBWIBWJBWKBWLBWMBWNBWOBWPBWQBWRBWSBWTBWUBWVBWWBWXBWYBWZBXCBXDBXEBXFBXGB"
+    "XHBXIBXJBXKBXLBXMBXNBXOBXPBXQBXRBXSBXTBXUBXVBXWBXXBXYBXZBYCBYDBYEBYFBYGBYH"
+    "BYIBYJBYKBYLBYMBYNBYOBYPBYQBYRBYSBYTBYUBYVBYWBYXBYYBYZBZCBZDBZEBZFBZGBZHBZ"
+    "IBZJBZKBZLBZMBZNBZOBZPBZQBZRBZSBZTBZUBZVBZWBZXBZYBZZCCCDCCECCFCCGCCHCCICCJ"
+    "CCKCCLCCMCCNCCOCCPCCQCCRCCSCCTCCUCCVCCWCCXCCYCCZCDDCDECDFCDGCDHCDICDJCDKCD"
+    "LCDMCDNCDOCDPCDQCDRCDSCDTCDUCDVCDWCDXCDYCDZCEDCEECEFCEGCEHCEICEJCEKCELCEMC"
+    "ENCEOCEPCEQCERCESCETCEUCEVCEWCEXCEYCEZCFDCFECFFCFGCFHCFICFJCFKCFLCFMCFNCFO"
+    "CFPCFQCFRCFSCFTCFUCFVCFWCFXCFYCFZCGDCGECGFCGGCGHCGICGJCGKCGLCGMCGNCGOCGPCG"
+    "QCGRCGSCGTCGUCGVCGWCGXCGYCGZCHDCHECHFCHGCHHCHICHJCHKCHLCHMCHNCHOCHPCHQCHRC"
+    "HSCHTCHUCHVCHWCHXCHYCHZCIDCIECIFCIGCIHCIICIJCIKCILCIMCINCIOCIPCIQCIRCISCIT"
+    "CIUCIVCIWCIXCIYCIZCJDCJECJFCJGCJHCJICJJCJKCJLCJMCJNCJOCJPCJQCJRCJSCJTCJUCJ"
+    "VCJWCJXCJYCJZCKDCKECKFCKGCKHCKICKJCKKCKLCKMCKNCKOCKPCKQCKRCKSCKTCKUCKVCKWC"
+    "KXCKYCKZCLDCLECLFCLGCLHCLICLJCLKCLLCLMCLNCLOCLPCLQCLRCLSCLTCLUCLVCLWCLXCLY"
+    "CLZCMDCMECMFCMGCMHCMICMJCMKCMLCMMCMNCMOCMPCMQCMRCMSCMTCMUCMVCMWCMXCMYCMZCN"
+    "DCNECNFCNGCNHCNICNJCNKCNLCNMCNNCNOCNPCNQCNRCNSCNTCNUCNVCNWCNXCNYCNZCODCOEC"
+    "OFCOGCOHCOICOJCOKCOLCOMCONCOOCOPCOQCORCOSCOTCOUCOVCOWCOXCOYCOZCPDCPECPFCPG"
+    "CPHCPICPJCPKCPLCPMCPNCPOCPPCPQCPRCPSCPTCPUCPVCPWCPXCPYCPZCQDCQECQFCQGCQHCQ"
+    "ICQJCQKCQLCQMCQNCQOCQPCQQCQRCQSCQTCQUCQVCQWCQXCQYCQZCRDCRECRFCRGCRHCRICRJC"
+    "RKCRLCRMCRNCROCRPCRQCRRCRSCRTCRUCRVCRWCRXCRYCRZCSDCSECSFCSGCSHCSICSJCSKCSL"
+    "CSMCSNCSOCSPCSQCSRCSSCSTCSUCSVCSWCSXCSYCSZCTDCTECTFCTGCTHCTICTJCTKCTLCTMCT"
+    "NCTOCTPCTQCTRCTSCTTCTUCTVCTWCTXCTYCTZCUDCUECUFCUGCUHCUICUJCUKCULCUMCUNCUOC"
+    "UPCUQCURCUSCUTCUUCUVCUWCUXCUYCUZCVDCVECVFCVGCVHCVICVJCVKCVLCVMCVNCVOCVPCVQ"
+    "CVRCVSCVTCVUCVVCVWCVXCVYCVZCWDCWECWFCWGCWHCWICWJCWKCWLCWMCWNCWOCWPCWQCWRCW"
+    "SCWTCWUCWVCWWCWXCWYCWZCXDCXECXFCXGCXHCXICXJCXKCXLCXMCXNCXOCXPCXQCXRCXSCXTC"
+    "XUCXVCXWCXXCXYCXZCYDCYECYFCYGCYHCYICYJCYKCYLCYMCYNCYOCYPCYQCYRCYSCYTCYUCYV"
+    "CYWCYXCYYCYZCZDCZECZFCZGCZHCZICZJCZKCZLCZMCZNCZOCZPCZQCZRCZSCZTCZUCZVCZWCZ"
+    "XCZYCZZDDDEDDFDDGDDHDDIDDJDDKDDLDDMDDNDDODDPDDQDDRDDSDDTDDUDDVDDWDDXDDYDDZ"
+    "DEEDEFDEGDEHDEIDEJDEKDELDEMDENDEODEPDEQDERDESDETDEUDEVDEWDEXDEYDEZDFEDFFDF"
+    "GDFHDFIDFJDFKDFLDFMDFNDFODFPDFQDFRDFSDFTDFUDFVDFWDFXDFYDFZDGEDGFDGGDGHDGID"
+    "GJDGKDGLDGMDGNDGODGPDGQDGRDGSDGTDGUDGVDGWDGXDGYDGZDHEDHFDHGDHHDHIDHJDHKDHL"
+    "DHMDHNDHODHPDHQDHRDHSDHTDHUDHVDHWDHXDHYDHZDIEDIFDIGDIHDIIDIJDIKDILDIMDINDI"
+    "ODIPDIQDIRDISDITDIUDIVDIWDIXDIYDIZDJEDJFDJGDJHDJIDJJDJKDJLDJMDJNDJODJPDJQD"
+    "JRDJSDJTDJUDJVDJWDJXDJYDJZDKEDKFDKGDKHDKIDKJDKKDKLDKMDKNDKODKPDKQDKRDKSDKT"
+    "DKUDKVDKWDKXDKYDKZDLEDLFDLGDLHDLIDLJDLKDLLDLMDLNDLODLPDLQDLRDLSDLTDLUDLVDL"
+    "WDLXDLYDLZDMEDMFDMGDMHDMIDMJDMKDMLDMMDMNDMODMPDMQDMRDMSDMTDMUDMVDMWDMXDMYD"
+    "MZDNEDNFDNGDNHDNIDNJDNKDNLDNMDNNDNODNPDNQDNRDNSDNTDNUDNVDNWDNXDNYDNZDOEDOF"
+    "DOGDOHDOIDOJDOKDOLDOMDONDOODOPDOQDORDOSDOTDOUDOVDOWDOXDOYDOZDPEDPFDPGDPHDP"
+    "IDPJDPKDPLDPMDPNDPODPPDPQDPRDPSDPTDPUDPVDPWDPXDPYDPZDQEDQFDQGDQHDQIDQJDQKD"
+    "QLDQMDQNDQODQPDQQDQRDQSDQTDQUDQVDQWDQXDQYDQZDREDRFDRGDRHDRIDRJDRKDRLDRMDRN"
+    "DRODRPDRQDRRDRSDRTDRUDRVDRWDRXDRYDRZDSEDSFDSGDSHDSIDSJDSKDSLDSMDSNDSODSPDS"
+    "QDSRDSSDSTDSUDSVDSWDSXDSYDSZDTEDTFDTGDTHDTIDTJDTKDTLDTMDTNDTODTPDTQDTRDTSD"
+    "TTDTUDTVDTWDTXDTYDTZDUEDUFDUGDUHDUIDUJDUKDULDUMDUNDUODUPDUQDURDUSDUTDUUDUV"
+    "DUWDUXDUYDUZDVEDVFDVGDVHDVIDVJDVKDVLDVMDVNDVODVPDVQDVRDVSDVTDVUDVVDVWDVXDV"
+    "YDVZDWEDWFDWGDWHDWIDWJDWKDWLDWMDWNDWODWPDWQDWRDWSDWTDWUDWVDWWDWXDWYDWZDXED"
+    "XFDXGDXHDXIDXJDXKDXLDXMDXNDXODXPDXQDXRDXSDXTDXUDXVDXWDXXDXYDXZDYEDYFDYGDYH"
+    "DYIDYJDYKDYLDYMDYNDYODYPDYQDYRDYSDYTDYUDYVDYWDYXDYYDYZDZEDZFDZGDZHDZIDZJDZ"
+    "KDZLDZMDZNDZODZPDZQDZRDZSDZTDZUDZVDZWDZXDZYDZZEEEFEEGEEHEEIEEJEEKEELEEMEEN"
+    "EEOEEPEEQEEREESEETEEUEEVEEWEEXEEYEEZEFFEFGEFHEFIEFJEFKEFLEFMEFNEFOEFPEFQEF"
+    "REFSEFTEFUEFVEFWEFXEFYEFZEGFEGGEGHEGIEGJEGKEGLEGMEGNEGOEGPEGQEGREGSEGTEGUE"
+    "GVEGWEGXEGYEGZEHFEHGEHHEHIEHJEHKEHLEHMEHNEHOEHPEHQEHREHSEHTEHUEHVEHWEHXEHY"
+    "EHZEIFEIGEIHEIIEIJEIKEILEIMEINEIOEIPEIQEIREISEITEIUEIVEIWEIXEIYEIZEJFEJGEJ"
+    "HEJIEJJEJKEJLEJMEJNEJOEJPEJQEJREJSEJTEJUEJVEJWEJXEJYEJZEKFEKGEKHEKIEKJEKKE"
+    "KLEKMEKNEKOEKPEKQEKREKSEKTEKUEKVEKWEKXEKYEKZELFELGELHELIELJELKELLELMELNELO"
+    "ELPELQELRELSELTELUELVELWELXELYELZEMFEMGEMHEMIEMJEMKEMLEMMEMNEMOEMPEMQEMREM"
+    "SEMTEMUEMVEMWEMXEMYEMZENFENGENHENIENJENKENLENMENNENOENPENQENRENSENTENUENVE"
+    "NWENXENYENZEOFEOGEOHEOIEOJEOKEOLEOMEONEOOEOPEOQEOREOSEOTEOUEOVEOWEOXEOYEOZ"
+    "EPFEPGEPHEPIEPJEPKEPLEPMEPNEPOEPPEPQEPREPSEPTEPUEPVEPWEPXEPYEPZEQFEQGEQHEQ"
+    "IEQJEQKEQLEQMEQNEQOEQPEQQEQREQSEQTEQUEQVEQWEQXEQYEQZERFERGERHERIERJERKERLE"
+    "RMERNEROERPERQERRERSERTERUERVERWERXERYERZESFESGESHESIESJESKESLESMESNESOESP"
+    "ESQESRESSESTESUESVESWESXESYESZETFETGETHETIETJETKETLETMETNETOETPETQETRETSET"
+    "TETUETVETWETXETYETZEUFEUGEUHEUIEUJEUKEULEUMEUNEUOEUPEUQEUREUSEUTEUUEUVEUWE"
+    "UXEUYEUZEVFEVGEVHEVIEVJEVKEVLEVMEVNEVOEVPEVQEVREVSEVTEVUEVVEVWEVXEVYEVZEWF"
+    "EWGEWHEWIEWJEWKEWLEWMEWNEWOEWPEWQEWREWSEWTEWUEWVEWWEWXEWYEWZEXFEXGEXHEXIEX"
+    "JEXKEXLEXMEXNEXOEXPEXQEXREXSEXTEXUEXVEXWEXXEXYEXZEYFEYGEYHEYIEYJEYKEYLEYME"
+    "YNEYOEYPEYQEYREYSEYTEYUEYVEYWEYXEYYEYZEZFEZGEZHEZIEZJEZKEZLEZMEZNEZOEZPEZQ"
+    "EZREZSEZTEZUEZVEZWEZXEZYEZZFFFGFFHFFIFFJFFKFFLFFMFFNFFOFFPFFQFFRFFSFFTFFUF"
+    "FVFFWFFXFFYFFZFGGFGHFGIFGJFGKFGLFGMFGNFGOFGPFGQFGRFGSFGTFGUFGVFGWFGXFGYFGZ"
+    "FHGFHHFHIFHJFHKFHLFHMFHNFHOFHPFHQFHRFHSFHTFHUFHVFHWFHXFHYFHZFIGFIHFIIFIJFI"
+    "KFILFIMFINFIOFIPFIQFIRFISFITFIUFIVFIWFIXFIYFIZFJGFJHFJIFJJFJKFJLFJMFJNFJOF"
+    "JPFJQFJRFJSFJTFJUFJVFJWFJXFJYFJZFKGFKHFKIFKJFKKFKLFKMFKNFKOFKPFKQFKRFKSFKT"
+    "FKUFKVFKWFKXFKYFKZFLGFLHFLIFLJFLKFLLFLMFLNFLOFLPFLQFLRFLSFLTFLUFLVFLWFLXFL"
+    "YFLZFMGFMHFMIFMJFMKFMLFMMFMNFMOFMPFMQFMRFMSFMTFMUFMVFMWFMXFMYFMZFNGFNHFNIF"
+    "NJFNKFNLFNMFNNFNOFNPFNQFNRFNSFNTFNUFNVFNWFNXFNYFNZFOGFOHFOIFOJFOKFOLFOMFON"
+    "FOOFOPFOQFORFOSFOTFOUFOVFOWFOXFOYFOZFPGFPHFPIFPJFPKFPLFPMFPNFPOFPPFPQFPRFP"
+    "SFPTFPUFPVFPWFPXFPYFPZFQGFQHFQIFQJFQKFQLFQMFQNFQOFQPFQQFQRFQSFQTFQUFQVFQWF"
+    "QXFQYFQZFRGFRHFRIFRJFRKFRLFRMFRNFROFRPFRQFRRFRSFRTFRUFRVFRWFRXFRYFRZFSGFSH"
+    "FSIFSJFSKFSLFSMFSNFSOFSPFSQFSRFSSFSTFSUFSVFSWFSXFSYFSZFTGFTHFTIFTJFTKFTLFT"
+    "MFTNFTOFTPFTQFTRFTSFTTFTUFTVFTWFTXFTYFTZFUGFUHFUIFUJFUKFULFUMFUNFUOFUPFUQF"
+    "URFUSFUTFUUFUVFUWFUXFUYFUZFVGFVHFVIFVJFVKFVLFVMFVNFVOFVPFVQFVRFVSFVTFVUFVV"
+    "FVWFVXFVYFVZFWGFWHFWIFWJFWKFWLFWMFWNFWOFWPFWQFWRFWSFWTFWUFWVFWWFWXFWYFWZFX"
+    "GFXHFXIFXJFXKFXLFXMFXNFXOFXPFXQFXRFXSFXTFXUFXVFXWFXXFXYFXZFYGFYHFYIFYJFYKF"
+    "YLFYMFYNFYOFYPFYQFYRFYSFYTFYUFYVFYWFYXFYYFYZFZGFZHFZIFZJFZKFZLFZMFZNFZOFZP"
+    "FZQFZRFZSFZTFZUFZVFZWFZXFZYFZZGGGHGGIGGJGGKGGLGGMGGNGGOGGPGGQGGRGGSGGTGGUG"
+    "GVGGWGGXGGYGGZGHHGHIGHJGHKGHLGHMGHNGHOGHPGHQGHRGHSGHTGHUGHVGHWGHXGHYGHZGIH"
+    "GIIGIJGIKGILGIMGINGIOGIPGIQGIRGISGITGIUGIVGIWGIXGIYGIZGJHGJIGJJGJKGJLGJMGJ"
+    "NGJOGJPGJQGJRGJSGJTGJUGJVGJWGJXGJYGJZGKHGKIGKJGKKGKLGKMGKNGKOGKPGKQGKRGKSG"
+    "KTGKUGKVGKWGKXGKYGKZGLHGLIGLJGLKGLLGLMGLNGLOGLPGLQGLRGLSGLTGLUGLVGLWGLXGLY"
+    "GLZGMHGMIGMJGMKGMLGMMGMNGMOGMPGMQGMRGMSGMTGMUGMVGMWGMXGMYGMZGNHGNIGNJGNKGN"
+    "LGNMGNNGNOGNPGNQGNRGNSGNTGNUGNVGNWGNXGNYGNZGOHGOIGOJGOKGOLGOMGONGOOGOPGOQG"
+    "ORGOSGOTGOUGOVGOWGOXGOYGOZGPHGPIGPJGPKGPLGPMGPNGPOGPPGPQGPRGPSGPTGPUGPVGPW"
+    "GPXGPYGPZGQHGQIGQJGQKGQLGQMGQNGQOGQPGQQGQRGQSGQTGQUGQVGQWGQXGQYGQZGRHGRIGR"
+    "JGRKGRLGRMGRNGROGRPGRQGRRGRSGRTGRUGRVGRWGRXGRYGRZGSHGSIGSJGSKGSLGSMGSNGSOG"
+    "SPGSQGSRGSSGSTGSUGSVGSWGSXGSYGSZGTHGTIGTJGTKGTLGTMGTNGTOGTPGTQGTRGTSGTTGTU"
+    "GTVGTWGTXGTYGTZGUHGUIGUJGUKGULGUMGUNGUOGUPGUQGURGUSGUTGUUGUVGUWGUXGUYGUZGV"
+    "HGVIGVJGVKGVLGVMGVNGVOGVPGVQGVRGVSGVTGVUGVVGVWGVXGVYGVZGWHGWIGWJGWKGWLGWMG"
+    "WNGWOGWPGWQGWRGWSGWTGWUGWVGWWGWXGWYGWZGXHGXIGXJGXKGXLGXMGXNGXOGXPGXQGXRGXS"
+    "GXTGXUGXVGXWGXXGXYGXZGYHGYIGYJGYKGYLGYMGYNGYOGYPGYQGYRGYSGYTGYUGYVGYWGYXGY"
+    "YGYZGZHGZIGZJGZKGZLGZMGZNGZOGZPGZQGZRGZSGZTGZUGZVGZWGZXGZYGZZHHHIHHJHHKHHL"
+    "HHMHHNHHOHHPHHQHHRHHSHHTHHUHHVHHWHHXHHYHHZHIIHIJHIKHILHIMHINHIOHIPHIQHIRHI"
+    "SHITHIUHIVHIWHIXHIYHIZHJIHJJHJKHJLHJMHJNHJOHJPHJQHJRHJSHJTHJUHJVHJWHJXHJYH"
+    "JZHKIHKJHKKHKLHKMHKNHKOHKPHKQHKRHKSHKTHKUHKVHKWHKXHKYHKZHLIHLJHLKHLLHLMHLN"
+    "HLOHLPHLQHLRHLSHLTHLUHLVHLWHLXHLYHLZHMIHMJHMKHMLHMMHMNHMOHMPHMQHMRHMSHMTHM"
+    "UHMVHMWHMXHMYHMZHNIHNJHNKHNLHNMHNNHNOHNPHNQHNRHNSHNTHNUHNVHNWHNXHNYHNZHOIH"
+    "OJHOKHOLHOMHONHOOHOPHOQHORHOSHOTHOUHOVHOWHOXHOYHOZHPIHPJHPKHPLHPMHPNHPOHPP"
+    "HPQHPRHPSHPTHPUHPVHPWHPXHPYHPZHQIHQJHQKHQLHQMHQNHQOHQPHQQHQRHQSHQTHQUHQVHQ"
+    "WHQXHQYHQZHRIHRJHRKHRLHRMHRNHROHRPHRQHRRHRSHRTHRUHRVHRWHRXHRYHRZHSIHSJHSKH"
+    "SLHSMHSNHSOHSPHSQHSRHSSHSTHSUHSVHSWHSXHSYHSZHTIHTJHTKHTLHTMHTNHTOHTPHTQHTR"
+    "HTSHTTHTUHTVHTWHTXHTYHTZHUIHUJHUKHULHUMHUNHUOHUPHUQHURHUSHUTHUUHUVHUWHUXHU"
+    "YHUZHVIHVJHVKHVLHVMHVNHVOHVPHVQHVRHVSHVTHVUHVVHVWHVXHVYHVZHWIHWJHWKHWLHWMH"
+    "WNHWOHWPHWQHWRHWSHWTHWUHWVHWWHWXHWYHWZHXIHXJHXKHXLHXMHXNHXOHXPHXQHXRHXSHXT"
+    "HXUHXVHXWHXXHXYHXZHYIHYJHYKHYLHYMHYNHYOHYPHYQHYRHYSHYTHYUHYVHYWHYXHYYHYZHZ"
+    "IHZJHZKHZLHZMHZNHZOHZPHZQHZRHZSHZTHZUHZVHZWHZXHZYHZZIIIJIIKIILIIMIINIIOIIP"
+    "IIQIIRIISIITIIUIIVIIWIIXIIYIIZIJJIJKIJLIJMIJNIJOIJPIJQIJRIJSIJTIJUIJVIJWIJ"
+    "XIJYIJZIKJIKKIKLIKMIKNIKOIKPIKQIKRIKSIKTIKUIKVIKWIKXIKYIKZILJILKILLILMILNI"
+    "LOILPILQILRILSILTILUILVILWILXILYILZIMJIMKIMLIMMIMNIMOIMPIMQIMRIMSIMTIMUIMV"
+    "IMWIMXIMYIMZINJINKINLINMINNINOINPINQINRINSINTINUINVINWINXINYINZIOJIOKIOLIO"
+    "MIONIOOIOPIOQIORIOSIOTIOUIOVIOWIOXIOYIOZIPJIPKIPLIPMIPNIPOIPPIPQIPRIPSIPTI"
+    "PUIPVIPWIPXIPYIPZIQJIQKIQLIQMIQNIQOIQPIQQIQRIQSIQTIQUIQVIQWIQXIQYIQZIRJIRK"
+    "IRLIRMIRNIROIRPIRQIRRIRSIRTIRUIRVIRWIRXIRYIRZISJISKISLISMISNISOISPISQISRIS"
+    "SISTISUISVISWISXISYISZITJITKITLITMITNITOITPITQITRITSITTITUITVITWITXITYITZI"
+    "UJIUKIULIUMIUNIUOIUPIUQIURIUSIUTIUUIUVIUWIUXIUYIUZIVJIVKIVLIVMIVNIVOIVPIVQ"
+    "IVRIVSIVTIVUIVVIVWIVXIVYIVZIWJIWKIWLIWMIWNIWOIWPIWQIWRIWSIWTIWUIWVIWWIWXIW"
+    "YIWZIXJIXKIXLIXMIXNIXOIXPIXQIXRIXSIXTIXUIXVIXWIXXIXYIXZIYJIYKIYLIYMIYNIYOI"
+    "YPIYQIYRIYSIYTIYUIYVIYWIYXIYYIYZIZJIZKIZLIZMIZNIZOIZPIZQIZRIZSIZTIZUIZVIZW"
+    "IZXIZYIZZJJJKJJLJJMJJNJJOJJPJJQJJRJJSJJTJJUJJVJJWJJXJJYJJZJKKJKLJKMJKNJKOJ"
+    "KPJKQJKRJKSJKTJKUJKVJKWJKXJKYJKZJLKJLLJLMJLNJLOJLPJLQJLRJLSJLTJLUJLVJLWJLX"
+    "JLYJLZJMKJMLJMMJMNJMOJMPJMQJMRJMSJMTJMUJMVJMWJMXJMYJMZJNKJNLJNMJNNJNOJNPJN"
+    "QJNRJNSJNTJNUJNVJNWJNXJNYJNZJOKJOLJOMJONJOOJOPJOQJORJOSJOTJOUJOVJOWJOXJOYJ"
+    "OZJPKJPLJPMJPNJPOJPPJPQJPRJPSJPTJPUJPVJPWJPXJPYJPZJQKJQLJQMJQNJQOJQPJQQJQR"
+    "JQSJQTJQUJQVJQWJQXJQYJQZJRKJRLJRMJRNJROJRPJRQJRRJRSJRTJRUJRVJRWJRXJRYJRZJS"
+    "KJSLJSMJSNJSOJSPJSQJSRJSSJSTJSUJSVJSWJSXJSYJSZJTKJTLJTMJTNJTOJTPJTQJTRJTSJ"
+    "TTJTUJTVJTWJTXJTYJTZJUKJULJUMJUNJUOJUPJUQJURJUSJUTJUUJUVJUWJUXJUYJUZJVKJVL"
+    "JVMJVNJVOJVPJVQJVRJVSJVTJVUJVVJVWJVXJVYJVZJWKJWLJWMJWNJWOJWPJWQJWRJWSJWTJW"
+    "UJWVJWWJWXJWYJWZJXKJXLJXMJXNJXOJXPJXQJXRJXSJXTJXUJXVJXWJXXJXYJXZJYKJYLJYMJ"
+    "YNJYOJYPJYQJYRJYSJYTJYUJYVJYWJYXJYYJYZJZKJZLJZMJZNJZOJZPJZQJZRJZSJZTJZUJZV"
+    "JZWJZXJZYJZZKKKLKKMKKNKKOKKPKKQKKRKKSKKTKKUKKVKKWKKXKKYKKZKLLKLMKLNKLOKLPK"
+    "LQKLRKLSKLTKLUKLVKLWKLXKLYKLZKMLKMMKMNKMOKMPKMQKMRKMSKMTKMUKMVKMWKMXKMYKMZ"
+    "KNLKNMKNNKNOKNPKNQKNRKNSKNTKNUKNVKNWKNXKNYKNZKOLKOMKONKOOKOPKOQKORKOSKOTKO"
+    "UKOVKOWKOXKOYKOZKPLKPMKPNKPOKPPKPQKPRKPSKPTKPUKPVKPWKPXKPYKPZKQLKQMKQNKQOK"
+    "QPKQQKQRKQSKQTKQUKQVKQWKQXKQYKQZKRLKRMKRNKROKRPKRQKRRKRSKRTKRUKRVKRWKRXKRY"
+    "KRZKSLKSMKSNKSOKSPKSQKSRKSSKSTKSUKSVKSWKSXKSYKSZKTLKTMKTNKTOKTPKTQKTRKTSKT"
+    "TKTUKTVKTWKTXKTYKTZKULKUMKUNKUOKUPKUQKURKUSKUTKUUKUVKUWKUXKUYKUZKVLKVMKVNK"
+    "VOKVPKVQKVRKVSKVTKVUKVVKVWKVXKVYKVZKWLKWMKWNKWOKWPKWQKWRKWSKWTKWUKWVKWWKWX"
+    "KWYKWZKXLKXMKXNKXOKXPKXQKXRKXSKXTKXUKXVKXWKXXKXYKXZKYLKYMKYNKYOKYPKYQKYRKY"
+    "SKYTKYUKYVKYWKYXKYYKYZKZLKZMKZNKZOKZPKZQKZRKZSKZTKZUKZVKZWKZXKZYKZZLLLMLLN"
+    "LLOLLPLLQLLRLLSLLTLLULLVLLWLLXLLYLLZLMMLMNLMOLMPLMQLMRLMSLMTLMULMVLMWLMXLM"
+    "YLMZLNMLNNLNOLNPLNQLNRLNSLNTLNULNVLNWLNXLNYLNZLOMLONLOOLOPLOQLORLOSLOTLOUL"
+    "OVLOWLOXLOYLOZLPMLPNLPOLPPLPQLPRLPSLPTLPULPVLPWLPXLPYLPZLQMLQNLQOLQPLQQLQR"
+    "LQSLQTLQULQVLQWLQXLQYLQZLRMLRNLROLRPLRQLRRLRSLRTLRULRVLRWLRXLRYLRZLSMLSNLS"
+    "OLSPLSQLSRLSSLSTLSULSVLSWLSXLSYLSZLTMLTNLTOLTPLTQLTRLTSLTTLTULTVLTWLTXLTYL"
+    "TZLUMLUNLUOLUPLUQLURLUSLUTLUULUVLUWLUXLUYLUZLVMLVNLVOLVPLVQLVRLVSLVTLVULVV"
+    "LVWLVXLVYLVZLWMLWNLWOLWPLWQLWRLWSLWTLWULWVLWWLWXLWYLWZLXMLXNLXOLXPLXQLXRLX"
+    "SLXTLXULXVLXWLXXLXYLXZLYMLYNLYOLYPLYQLYRLYSLYTLYULYVLYWLYXLYYLYZLZMLZNLZOL"
+    "ZPLZQLZRLZSLZTLZULZVLZWLZXLZYLZZMMMNMMOMMPMMQMMRMMSMMTMMUMMVMMWMMXMMYMMZMN"
+    "NMNOMNPMNQMNRMNSMNTMNUMNVMNWMNXMNYMNZMONMOOMOPMOQMORMOSMOTMOUMOVMOWMOXMOYM"
+    "OZMPNMPOMPPMPQMPRMPSMPTMPUMPVMPWMPXMPYMPZMQNMQOMQPMQQMQRMQSMQTMQUMQVMQWMQX"
+    "MQYMQZMRNMROMRPMRQMRRMRSMRTMRUMRVMRWMRXMRYMRZMSNMSOMSPMSQMSRMSSMSTMSUMSVMS"
+    "WMSXMSYMSZMTNMTOMTPMTQMTRMTSMTTMTUMTVMTWMTXMTYMTZMUNMUOMUPMUQMURMUSMUTMUUM"
+    "UVMUWMUXMUYMUZMVNMVOMVPMVQMVRMVSMVTMVUMVVMVWMVXMVYMVZMWNMWOMWPMWQMWRMWSMWT"
+    "MWUMWVMWWMWXMWYMWZMXNMXOMXPMXQMXRMXSMXTMXUMXVMXWMXXMXYMXZMYNMYOMYPMYQMYRMY"
+    "SMYTMYUMYVMYWMYXMYYMYZMZNMZOMZPMZQMZRMZSMZTMZUMZVMZWMZXMZYMZZNNNONNPNNQNNR"
+    "NNSNNTNNUNNVNNWNNXNNYNNZNOONOPNOQNORNOSNOTNOUNOVNOWNOXNOYNOZNPONPPNPQNPRNP"
+    "SNPTNPUNPVNPWNPXNPYNPZNQONQPNQQNQRNQSNQTNQUNQVNQWNQXNQYNQZNRONRPNRQNRRNRSN"
+    "RTNRUNRVNRWNRXNRYNRZNSONSPNSQNSRNSSNSTNSUNSVNSWNSXNSYNSZNTONTPNTQNTRNTSNTT"
+    "NTUNTVNTWNTXNTYNTZNUONUPNUQNURNUSNUTNUUNUVNUWNUXNUYNUZNVONVPNVQNVRNVSNVTNV"
+    "UNVVNVWNVXNVYNVZNWONWPNWQNWRNWSNWTNWUNWVNWWNWXNWYNWZNXONXPNXQNXRNXSNXTNXUN"
+    "XVNXWNXXNXYNXZNYONYPNYQNYRNYSNYTNYUNYVNYWNYXNYYNYZNZONZPNZQNZRNZSNZTNZUNZV"
+    "NZWNZXNZYNZZOOOPOOQOOROOSOOTOOUOOVOOWOOXOOYOOZOPPOPQOPROPSOPTOPUOPVOPWOPXO"
+    "PYOPZOQPOQQOQROQSOQTOQUOQVOQWOQXOQYOQZORPORQORRORSORTORUORVORWORXORYORZOSP"
+    "OSQOSROSSOSTOSUOSVOSWOSXOSYOSZOTPOTQOTROTSOTTOTUOTVOTWOTXOTYOTZOUPOUQOUROU"
+    "SOUTOUUOUVOUWOUXOUYOUZOVPOVQOVROVSOVTOVUOVVOVWOVXOVYOVZOWPOWQOWROWSOWTOWUO"
+    "WVOWWOWXOWYOWZOXPOXQOXROXSOXTOXUOXVOXWOXXOXYOXZOYPOYQOYROYSOYTOYUOYVOYWOYX"
+    "OYYOYZOZPOZQOZROZSOZTOZUOZVOZWOZXOZYOZZPPPQPPRPPSPPTPPUPPVPPWPPXPPYPPZPQQP"
+    "QRPQSPQTPQUPQVPQWPQXPQYPQZPRQPRRPRSPRTPRUPRVPRWPRXPRYPRZPSQPSRPSSPSTPSUPSV"
+    "PSWPSXPSYPSZPTQPTRPTSPTTPTUPTVTABUABVABWABXABYABZACBACCACDACEACFACGACHACIA"
+    "CJACKACLACMACNACOACPACQACRACSACTACUACVACWACXACYACZADBADCADDADEADFADGADHADI"
+    "ADJADKADLADMADAAABAACAADAAEAAFAAGAAHAAIAAJAAKAALAAMAANAAOAAPAAQAARAASAATAA"
+    "UAAVAAWAAXAAYAAZABBABCABDABEABFABGABHABIABJABKABLABMABNABOABPABQABRABSABHA"
+    "FIAFJAFKAFLAFMAFNAFOAFPAFQAFRAFSAFTAFUAFVAFWAFXAFYAFZAGBAGCAGDAGEAGFAGGAGH"
+    "AGIAGJAGKAGLAGMAGNAGOAGPAGQAGRAGSAGTAGUAGVAGWAGXAGYAGZAHNADOADPADQADRADSAD"
+    "TADUADVADWADXADYADZAEBAECAEDAEEAEFAEGAEHAEIAEJAEKAELAEMAENAEOAEPAEQAERAESA"
+    "ETAEUAEVAEWAEXAEYAEZAFBAFCAFDAFEAFFAFGAFUAIVAIWAIXAIYAIZAJBAJCAJDAJEAJFAJG"
+    "AJHAJIAJJAJKAJLAJMAJNAJOAJPAJQAJRAJSAJTAJUAJVAJWAJXAJYAJZAKBAKCAKDAKEAKFAK"
+    "GAKHAKIAKJAKKAKLAKMAKNAKBAHCAHDAHEAHFAHGAHHAHIAHJAHKAHLAHMAHNAHOAHPAHQAHRA"
+    "HSAHTAHUAHVAHWAHXAHYAHZAIBAICAIDAIEAIFAIGAIHAIIAIJAIKAILAIMAINAIOAIPAIQAIR"
+    "AISAITAIIAMJAMKAMLAMMAMNAMOAMPAMQAMRAMSAMTAMUAMVAMWAMXAMYAMZANBANCANDANEAN"
+    "FANGANHANIANJANKANLANMANNANOANPANQANRANSANTANUANVANWANXANYANZAOBAOOAKPAKQA"
+    "KRAKSAKTAKUAKVAKWAKXAKYAKZALBALCALDALEALFALGALHALIALJALKALLALMALNALOALPALQ"
+    "ALRALSALTALUALVALWALXALYALZAMBAMCAMDAMEAMFAMGAMHAMVAPWAPXAPYAPZAQBAQCAQDAQ"
+    "EAQFAQGAQHAQIAQJAQKAQLAQMAQNAQOAQPAQQAQRAQSAQTAQUAQVAQWAQXAQYAQZARBARCARDA"
+    "REARFARGARHARIARJARKARLARMARNAROARCAODAOEAOFAOGAOHAOIAOJAOKAOLAOMAONAOOAOP"
+    "AOQAORAOSAOTAOUAOVAOWAOXAOYAOZAPBAPCAPDAPEAPFAPGAPHAPIAPJAPKAPLAPMAPNAPOAP"
+    "PAPQAPRAPSAPTAPUAPJATKATLATMATNATOATPATQATRATSATTATUATVATWATXATYATZAUBAUCA"
+    "UDAUEAUFAUGAUHAUIAUJAUKAULAUMAUNAUOAUPAUQAURAUSAUTAUUAUVAUWAUXAUYAUZAVBAVC"
+    "AVPARQARRARSARTARUARVARWARXARYARZASBASCASDASEASFASGASHASIASJASKASLASMASNAS"
+    "OASPASQASRASSASTASUASVASWASXASYASZATBATCATDATEATFATGATHATIATWAWXAWYAWZAXBA"
+    "XCAXDAXEAXFAXGAXHAXIAXJAXKAXLAXMAXNAXOAXPAXQAXRAXSAXTAXUAXVAXWAXXAXYAXZAYB"
+    "AYCAYDAYEAYFAYGAYHAYIAYJAYKAYLAYMAYNAYOAYPAYDAVEAVFAVGAVHAVIAVJAVKAVLAVMAV"
+    "NAVOAVPAVQAVRAVSAVTAVUAVVAVWAVXAVYAVZAWBAWCAWDAWEAWFAWGAWHAWIAWJAWKAWLAWMA"
+    "WNAWOAWPAWQAWRAWSAWTAWUAWVAWBLBBMBBNBBOBBPBBQBBRBBSBBTBBUBBVBBWBBXBBYBBZBC"
+    "CBCDBCEBCFBCGBCHBCIBCJBCKBCLBCMBCNBCOBCPBCQBCRBCSBCTBCUBCVBCWBCXBCYBCZBDCB"
+    "DDBDEBDFBDGBQAYRAYSAYTAYUAYVAYWAYXAYYAYZAZBAZCAZDAZEAZFAZGAZHAZIAZJAZKAZLA"
+    "ZMAZNAZOAZPAZQAZRAZSAZTAZUAZVAZWAZXAZYAZZBBBCBBDBBEBBFBBGBBHBBIBBJBBKBFDBF"
+    "EBFFBFGBFHBFIBFJBFKBFLBFMBFNBFOBFPBFQBFRBFSBFTBFUBFVBFWBFXBFYBFZBGCBGDBGEB"
+    "GFBGGBGHBGIBGJBGKBGLBGMBGNBGOBGPBGQBGRBGSBGTBGUBGVBGWBDHBDIBDJBDKBDLBDMBDN"
+    "BDOBDPBDQBDRBDSBDTBDUBDVBDWBDXBDYBDZBECBEDBEEBEFBEGBEHBEIBEJBEKBELBEMBENBE"
+    "OBEPBEQBERBESBETBEUBEVBEWBEXBEYBEZBFCBITBIUBIVBIWBIXBIYBIZBJCBJDBJEBJFBJGB"
+    "JHBJIBJJBJKBJLBJMBJNBJOBJPBJQBJRBJSBJTBJUBJVBJWBJXBJYBJZBKCBKDBKEBKFBKGBKH"
+    "BKIBKJBKKBKLBKMBKNBKOBGXBGYBGZBHCBHDBHEBHFBHGBHHBHIBHJBHKBHLBHMBHNBHOBHPBH"
+    "QBHRBHSBHTBHUBHVBHWBHXBHYBHZBICBIDBIEBIFBIGBIHBIIBIJBIKBILBIMBINBIOBIPBIQB"
+    "IRBISBMLBMMBMNBMOBMPBMQBMRBMSBMTBMUBMVBMWBMXBMYBMZBNCBNDBNEBNFBNGBNHBNIBNJ"
+    "BNKBNLBNMBNNBNOBNPBNQBNRBNSBNTBNUBNVBNWBNXBNYBNZBOCBODBOEBOFBOGBKPBKQBKRBK"
+    "SBKTBKUBKVBKWBKXBKYBKZBLCBLDBLEBLFBLGBLHBLIBLJBLKBLLBLMBLNBLOBLPBLQBLRBLSB"
+    "LTBLUBLVBLWBLXBLYBLZBMCBMDBMEBMFBMGBMHBMIBMJBMKBQDBQEBQFBQGBQHBQIBQJBQKBQL"
+    "BQMBQNBQOBQPBQQBQRBQSBQTBQUBQVBQWBQXBQYBQZBRCBRDBREBRFBRGBRHBRIBRJBRKBRLBR"
+    "MBRNBROBRPBRQBRRBRSBRTBRUBRVBRWBOHBOIBOJBOKBOLBOMBONBOOBOPBOQBORBOSBOTBOUB"
+    "OVBOWBOXBOYBOZBPCBPDBPEBPFBPGBPHBPIBPJBPKBPLBPMBPNBPOBPPBPQBPRBPSBPTBPUBPV"
+    "BPWBPXBPYBPZBQCBTTBTUBTVBTWBTXBTYBTZBUCBUDBUEBUFBUGBUHBUIBUJBUKBULBUMBUNBU"
+    "OBUPBUQBURBUSBUTBUUBUVBUWBUXBUYBUZBVCBVDBVEBVFBVGBVHBVIBVJBVKBVLBVMBVNBVOB"
+    "RXBRYBRZBSCBSDBSEBSFBSGBSHBSIBSJBSKBSLBSMBSNBSOBSPBSQBSRBSSBSTBSUBSVBSWBSX"
+    "BSYBSZBTCBTDBTEBTFBTGBTHBTIBTJBTKBTLBTMBTNBTOBTPBTQBTRBTSBXLBXMBXNBXOBXPBX"
+    "QBXRBXSBXTBXUBXVBXWBXXBXYBXZBYCBYDBYEBYFBYGBYHBYIBYJBYKBYLBYMBYNBYOBYPBYQB"
+    "YRBYSBYTBYUBYVBYWBYXBYYBYZBZCBZDBZEBZFBZGBVPBVQBVRBVSBVTBVUBVVBVWBVXBVYBVZ"
+    "BWCBWDBWEBWFBWGBWHBWIBWJBWKBWLBWMBWNBWOBWPBWQBWRBWSBWTBWUBWVBWWBWXBWYBWZBX"
+    "CBXDBXEBXFBXGBXHBXIBXJBXKBCDFCDGCDHCDICDJCDKCDLCDMCDNCDOCDPCDQCDRCDSCDTCDU"
+    "CDVCDWCDXCDYCDZCEDCEECEFCEGCEHCEICEJCEKCELCEMCENCEOCEPCEQCERCESCETCEUCEVCE"
+    "WCEXCEYCEZZHBZIBZJBZKBZLBZMBZNBZOBZPBZQBZRBZSBZTBZUBZVBZWBZXBZYBZZCCCDCCEC"
+    "CFCCGCCHCCICCJCCKCCLCCMCCNCCOCCPCCQCCRCCSCCTCCUCCVCCWCCXCCYCCZCDDCDECGYCGZ"
+    "CHDCHECHFCHGCHHCHICHJCHKCHLCHMCHNCHOCHPCHQCHRCHSCHTCHUCHVCHWCHXCHYCHZCIDCI"
+    "ECIFCIGCIHCIICIJCIKCILCIMCINCIOCIPCIQCIRCISCITCIUCIVCFDCFECFFCFGCFHCFICFJC"
+    "FKCFLCFMCFNCFOCFPCFQCFRCFSCFTCFUCFVCFWCFXCFYCFZCGDCGECGFCGGCGHCGICGJCGKCGL"
+    "CGMCGNCGOCGPCGQCGRCGSCGTCGUCGVCGWCGXCKUCKVCKWCKXCKYCKZCLDCLECLFCLGCLHCLICL"
+    "JCLKCLLCLMCLNCLOCLPCLQCLRCLSCLTCLUCLVCLWCLXCLYCLZCMDCMECMFCMGCMHCMICMJCMKC"
+    "MLCMMCMNCMOCMPCMQCMRCIWCIXCIYCIZCJDCJECJFCJGCJHCJICJJCJKCJLCJMCJNCJOCJPCJQ"
+    "CJRCJSCJTCJUCJVCJWCJXCJYCJZCKDCKECKFCKGCKHCKICKJCKKCKLCKMCKNCKOCKPCKQCKRCK"
+    "SCKTCOQCORCOSCOTCOUCOVCOWCOXCOYCOZCPDCPECPFCPGCPHCPICPJCPKCPLCPMCPNCPOCPPC"
+    "PQCPRCPSCPTCPUCPVCPWCPXCPYCPZCQDCQECQFCQGCQHCQICQJCQKCQLCQMCQNCMSCMTCMUCMV"
+    "CMWCMXCMYCMZCNDCNECNFCNGCNHCNICNJCNKCNLCNMCNNCNOCNPCNQCNRCNSCNTCNUCNVCNWCN"
+    "XCNYCNZCODCOECOFCOGCOHCOICOJCOKCOLCOMCONCOOCOPCSMCSNCSOCSPCSQCSRCSSCSTCSUC"
+    "SVCSWCSXCSYCSZCTDCTECTFCTGCTHCTICTJCTKCTLCTMCTNCTOCTPCTQCTRCTSCTTCTUCTVCTW"
+    "CTXCTYCTZCUDCUECUFCUGCUHCUICUJCQOCQPCQQCQRCQSCQTCQUCQVCQWCQXCQYCQZCRDCRECR"
+    "FCRGCRHCRICRJCRKCRLCRMCRNCROCRPCRQCRRCRSCRTCRUCRVCRWCRXCRYCRZCSDCSECSFCSGC"
+    "SHCSICSJCSKCSLCWICWJCWKCWLCWMCWNCWOCWPCWQCWRCWSCWTCWUCWVCWWCWXCWYCWZCXDCXE"
+    "CXFCXGCXHCXICXJCXKCXLCXMCXNCXOCXPCXQCXRCXSCXTCXUCXVCXWCXXCXYCXZCYDCYECYFCU"
+    "KCULCUMCUNCUOCUPCUQCURCUSCUTCUUCUVCUWCUXCUYCUZCVDCVECVFCVGCVHCVICVJCVKCVLC"
+    "VMCVNCVOCVPCVQCVRCVSCVTCVUCVVCVWCVXCVYCVZCWDCWECWFCWGCWHEDDFDDGDDHDDIDDJDD"
+    "KDDLDDMDDNDDODDPDDQDDRDDSDDTDDUDDVDDWDDXDDYDDZDEEDEFDEGDEHDEIDEJDEKDELDEMD"
+    "ENDEODEPDEQDERDESDETDEUDEVDEWDEXDEYDEZDFCYGCYHCYICYJCYKCYLCYMCYNCYOCYPCYQC"
+    "YRCYSCYTCYUCYVCYWCYXCYYCYZCZDCZECZFCZGCZHCZICZJCZKCZLCZMCZNCZOCZPCZQCZRCZS"
+    "CZTCZUCZVCZWCZXCZYCZZDDDEDHFDHGDHHDHIDHJDHKDHLDHMDHNDHODHPDHQDHRDHSDHTDHUD"
+    "HVDHWDHXDHYDHZDIEDIFDIGDIHDIIDIJDIKDILDIMDINDIODIPDIQDIRDISDITDIUDIVDIWDIX"
+    "DIYDIZDJEDFFDFGDFHDFIDFJDFKDFLDFMDFNDFODFPDFQDFRDFSDFTDFUDFVDFWDFXDFYDFZDG"
+    "EDGFDGGDGHDGIDGJDGKDGLDGMDGNDGODGPDGQDGRDGSDGTDGUDGVDGWDGXDGYDGZDHEDLFDLGD"
+    "LHDLIDLJDLKDLLDLMDLNDLODLPDLQDLRDLSDLTDLUDLVDLWDLXDLYDLZDMEDMFDMGDMHDMIDMJ"
+    "DMKDMLDMMDMNDMODMPDMQDMRDMSDMTDMUDMVDMWDMXDMYDMZDNEDJFDJGDJHDJIDJJDJKDJLDJ"
+    "MDJNDJODJPDJQDJRDJSDJTDJUDJVDJWDJXDJYDJZDKEDKFDKGDKHDKIDKJDKKDKLDKMDKNDKOD"
+    "KPDKQDKRDKSDKTDKUDKVDKWDKXDKYDKZDLEDPFDPGDPHDPIDPJDPKDPLDPMDPNDPODPPDPQDPR"
+    "DPSDPTDPUDPVDPWDPXDPYDPZDQEDQFDQGDQHDQIDQJDQKDQLDQMDQNDQODQPDQQDQRDQSDQTDQ"
+    "UDQVDQWDQXDQYDQZDREDNFDNGDNHDNIDNJDNKDNLDNMDNNDNODNPDNQDNRDNSDNTDNUDNVDNWD"
+    "NXDNYDNZDOEDOFDOGDOHDOIDOJDOKDOLDOMDONDOODOPDOQDORDOSDOTDOUDOVDOWDOXDOYDOZ"
+    "DPEDTFDTGDTHDTIDTJDTKDTLDTMDTNDTODTPDTQDTRDTSDTTDTUDTVDTWDTXDTYDTZDUEDUFDU"
+    "GDUHDUIDUJDUKDULDUMDUNDUODUPDUQDURDUSDUTDUUDUVDUWDUXDUYDUZDVEDRFDRGDRHDRID"
+    "RJDRKDRLDRMDRNDRODRPDRQDRRDRSDRTDRUDRVDRWDRXDRYDRZDSEDSFDSGDSHDSIDSJDSKDSL"
+    "DSMDSNDSODSPDSQDSRDSSDSTDSUDSVDSWDSXDSYDSZDTEDXFDXGDXHDXIDXJDXKDXLDXMDXNDX"
+    "ODXPDXQDXRDXSDXTDXUDXVDXWDXXDXYDXZDYEDYFDYGDYHDYIDYJDYKDYLDYMDYNDYODYPDYQD"
+    "YRDYSDYTDYUDYVDYWDYXDYYDYZDZEDVFDVGDVHDVIDVJDVKDVLDVMDVNDVODVPDVQDVRDVSDVT"
+    "DVUDVVDVWDVXDVYDVZDWEDWFDWGDWHDWIDWJDWKDWLDWMDWNDWODWPDWQDWRDWSDWTDWUDWVDW"
+    "WDWXDWYDWZDXFGEFHEFIEFJEFKEFLEFMEFNEFOEFPEFQEFREFSEFTEFUEFVEFWEFXEFYEFZEGF"
+    "EGGEGHEGIEGJEGKEGLEGMEGNEGOEGPEGQEGREGSEGTEGUEGVEGWEGXEGYEGZEHFEHGEHHEEDZF"
+    "DZGDZHDZIDZJDZKDZLDZMDZNDZODZPDZQDZRDZSDZTDZUDZVDZWDZXDZYDZZEEEFEEGEEHEEIE"
+    "EJEEKEELEEMEENEEOEEPEEQEEREESEETEEUEEVEEWEEXEEYEEZEFFEJKEJLEJMEJNEJOEJPEJQ"
+    "EJREJSEJTEJUEJVEJWEJXEJYEJZEKFEKGEKHEKIEKJEKKEKLEKMEKNEKOEKPEKQEKREKSEKTEK"
+    "UEKVEKWEKXEKYEKZELFELGELHELIELJELKELLEHIEHJEHKEHLEHMEHNEHOEHPEHQEHREHSEHTE"
+    "HUEHVEHWEHXEHYEHZEIFEIGEIHEIIEIJEIKEILEIMEINEIOEIPEIQEIREISEITEIUEIVEIWEIX"
+    "EIYEIZEJFEJGEJHEJIEJJENOENPENQENRENSENTENUENVENWENXENYENZEOFEOGEOHEOIEOJEO"
+    "KEOLEOMEONEOOEOPEOQEOREOSEOTEOUEOVEOWEOXEOYEOZEPFEPGEPHEPIEPJEPKEPLEPMEPNE"
+    "POEPPELMELNELOELPELQELRELSELTELUELVELWELXELYELZEMFEMGEMHEMIEMJEMKEMLEMMEMN"
+    "EMOEMPEMQEMREMSEMTEMUEMVEMWEMXEMYEMZENFENGENHENIENJENKENLENMENNERSERTERUER"
+    "VERWERXERYERZESFESGESHESIESJESKESLESMESNESOESPESQESRESSESTESUESVESWESXESYE"
+    "SZETFETGETHETIETJETKETLETMETNETOETPETQETRETSETTEPQEPREPSEPTEPUEPVEPWEPXEPY"
+    "EPZEQFEQGEQHEQIEQJEQKEQLEQMEQNEQOEQPEQQEQREQSEQTEQUEQVEQWEQXEQYEQZERFERGER"
+    "HERIERJERKERLERMERNEROERPERQERREVWEVXEVYEVZEWFEWGEWHEWIEWJEWKEWLEWMEWNEWOE"
+    "WPEWQEWREWSEWTEWUEWVEWWEWXEWYEWZEXFEXGEXHEXIEXJEXKEXLEXMEXNEXOEXPEXQEXREXS"
+    "EXTEXUEXVEXWEXXETUETVETWETXETYETZEUFEUGEUHEUIEUJEUKEULEUMEUNEUOEUPEUQEUREU"
+    "SEUTEUUEUVEUWEUXEUYEUZEVFEVGEVHEVIEVJEVKEVLEVMEVNEVOEVPEVQEVREVSEVTEVUEVVE"
+    "FFGFFHFFIFFJFFKFFLFFMFFNFFOFFPFFQFFRFFSFFTFFUFFVFFWFFXFFYFFZFGGFGHFGIFGJFG"
+    "KFGLFGMFGNFGOFGPFGQFGRFGSFGTFGUFGVFGWFGXFGYFGZFHGFHHFHIFHJXYEXZEYFEYGEYHEY"
+    "IEYJEYKEYLEYMEYNEYOEYPEYQEYREYSEYTEYUEYVEYWEYXEYYEYZEZFEZGEZHEZIEZJEZKEZLE"
+    "ZMEZNEZOEZPEZQEZREZSEZTEZUEZVEZWEZXEZYEZZFFJOFJPFJQFJRFJSFJTFJUFJVFJWFJXFJ"
+    "YFJZFKGFKHFKIFKJFKKFKLFKMFKNFKOFKPFKQFKRFKSFKTFKUFKVFKWFKXFKYFKZFLGFLHFLIF"
+    "LJFLKFLLFLMFLNFLOFLPFLQFLRFHKFHLFHMFHNFHOFHPFHQFHRFHSFHTFHUFHVFHWFHXFHYFHZ"
+    "FIGFIHFIIFIJFIKFILFIMFINFIOFIPFIQFIRFISFITFIUFIVFIWFIXFIYFIZFJGFJHFJIFJJFJ"
+    "KFJLFJMFJNFNWFNXFNYFNZFOGFOHFOIFOJFOKFOLFOMFONFOOFOPFOQFORFOSFOTFOUFOVFOWF"
+    "OXFOYFOZFPGFPHFPIFPJFPKFPLFPMFPNFPOFPPFPQFPRFPSFPTFPUFPVFPWFPXFPYFPZFLSFLT"
+    "FLUFLVFLWFLXFLYFLZFMGFMHFMIFMJFMKFMLFMMFMNFMOFMPFMQFMRFMSFMTFMUFMVFMWFMXFM"
+    "YFMZFNGFNHFNIFNJFNKFNLFNMFNNFNOFNPFNQFNRFNSFNTFNUFNVFSKFSLFSMFSNFSOFSPFSQF"
+    "SRFSSFSTFSUFSVFSWFSXFSYFSZFTGFTHFTIFTJFTKFTLFTMFTNFTOFTPFTQFTRFTSFTTFTUFTV"
+    "FTWFTXFTYFTZFUGFUHFUIFUJFUKFULFUMFUNFQGFQHFQIFQJFQKFQLFQMFQNFQOFQPFQQFQRFQ"
+    "SFQTFQUFQVFQWFQXFQYFQZFRGFRHFRIFRJFRKFRLFRMFRNFROFRPFRQFRRFRSFRTFRUFRVFRWF"
+    "RXFRYFRZFSGFSHFSIFSJFWSFWTFWUFWVFWWFWXFWYFWZFXGFXHFXIFXJFXKFXLFXMFXNFXOFXP"
+    "FXQFXRFXSFXTFXUFXVFXWFXXFXYFXZFYGFYHFYIFYJFYKFYLFYMFYNFYOFYPFYQFYRFYSFYTFY"
+    "UFYVFUOFUPFUQFURFUSFUTFUUFUVFUWFUXFUYFUZFVGFVHFVIFVJFVKFVLFVMFVNFVOFVPFVQF"
+    "VRFVSFVTFVUFVVFVWFVXFVYFVZFWGFWHFWIFWJFWKFWLFWMFWNFWOFWPFWQFWRHGHIGHJGHKGH"
+    "LGHMGHNGHOGHPGHQGHRGHSGHTGHUGHVGHWGHXGHYGHZGIHGIIGIJGIKGILGIMGINGIOGIPGIQG"
+    "IRGISGITGIUGIVGIWGIXGIYGIZGJHGJIGJJGJKGJLGJMGJFYWFYXFYYFYZFZGFZHFZIFZJFZKF"
+    "ZLFZMFZNFZOFZPFZQFZRFZSFZTFZUFZVFZWFZXFZYFZZGGGHGGIGGJGGKGGLGGMGGNGGOGGPGG"
+    "QGGRGGSGGTGGUGGVGGWGGXGGYGGZGHTGLUGLVGLWGLXGLYGLZGMHGMIGMJGMKGMLGMMGMNGMOG"
+    "MPGMQGMRGMSGMTGMUGMVGMWGMXGMYGMZGNHGNIGNJGNKGNLGNMGNNGNOGNPGNQGNRGNSGNTGNU"
+    "GNVGNWGNXGNYGNNGJOGJPGJQGJRGJSGJTGJUGJVGJWGJXGJYGJZGKHGKIGKJGKKGKLGKMGKNGK"
+    "OGKPGKQGKRGKSGKTGKUGKVGKWGKXGKYGKZGLHGLIGLJGLKGLLGLMGLNGLOGLPGLQGLRGLSGLMG"
+    "QNGQOGQPGQQGQRGQSGQTGQUGQVGQWGQXGQYGQZGRHGRIGRJGRKGRLGRMGRNGROGRPGRQGRRGRS"
+    "GRTGRUGRVGRWGRXGRYGRZGSHGSIGSJGSKGSLGSMGSNGSOGSPGSQGSRGSZGOHGOIGOJGOKGOLGO"
+    "MGONGOOGOPGOQGORGOSGOTGOUGOVGOWGOXGOYGOZGPHGPIGPJGPKGPLGPMGPNGPOGPPGPQGPRG"
+    "PSGPTGPUGPVGPWGPXGPYGPZGQHGQIGQJGQKGQLGQYGUZGVHGVIGVJGVKGVLGVMGVNGVOGVPGVQ"
+    "GVRGVSGVTGVUGVVGVWGVXGVYGVZGWHGWIGWJGWKGWLGWMGWNGWOGWPGWQGWRGWSGWTGWUGWVGW"
+    "WGWXGWYGWZGXHGXIGXJGXKGXSGSTGSUGSVGSWGSXGSYGSZGTHGTIGTJGTKGTLGTMGTNGTOGTPG"
+    "TQGTRGTSGTTGTUGTVGTWGTXGTYGTZGUHGUIGUJGUKGULGUMGUNGUOGUPGUQGURGUSGUTGUUGUV"
+    "GUWGUXGURGZSGZTGZUGZVGZWGZXGZYGZZHHHIHHJHHKHHLHHMHHNHHOHHPHHQHHRHHSHHTHHUH"
+    "HVHHWHHXHHYHHZHIIHIJHIKHILHIMHINHIOHIPHIQHIRHISHITHIUHIVHIWHIXHIYHLGXMGXNG"
+    "XOGXPGXQGXRGXSGXTGXUGXVGXWGXXGXYGXZGYHGYIGYJGYKGYLGYMGYNGYOGYPGYQGYRGYSGYT"
+    "GYUGYVGYWGYXGYYGYZGZHGZIGZJGZKGZLGZMGZNGZOGZPGZQGZLPHLQHLRHLSHLTHLUHLVHLWH"
+    "LXHLYHLZHMIHMJHMKHMLHMMHMNHMOHMPHMQHMRHMSHMTHMUHMVHMWHMXHMYHMZHNIHNJHNKHNL"
+    "HNMHNNHNOHNPHNQHNRHNSHNTHNUHNVHNWHIZHJIHJJHJKHJLHJMHJNHJOHJPHJQHJRHJSHJTHJ"
+    "UHJVHJWHJXHJYHJZHKIHKJHKKHKLHKMHKNHKOHKPHKQHKRHKSHKTHKUHKVHKWHKXHKYHKZHLIH"
+    "LJHLKHLLHLMHLNHLOHQNHQOHQPHQQHQRHQSHQTHQUHQVHQWHQXHQYHQZHRIHRJHRKHRLHRMHRN"
+    "HROHRPHRQHRRHRSHRTHRUHRVHRWHRXHRYHRZHSIHSJHSKHSLHSMHSNHSOHSPHSQHSRHSSHSTHS"
+    "UHNXHNYHNZHOIHOJHOKHOLHOMHONHOOHOPHOQHORHOSHOTHOUHOVHOWHOXHOYHOZHPIHPJHPKH"
+    "PLHPMHPNHPOHPPHPQHPRHPSHPTHPUHPVHPWHPXHPYHPZHQIHQJHQKHQLHQMHVLHVMHVNHVOHVP"
+    "HVQHVRHVSHVTHVUHVVHVWHVXHVYHVZHWIHWJHWKHWLHWMHWNHWOHWPHWQHWRHWSHWTHWUHWVHW"
+    "WHWXHWYHWZHXIHXJHXKHXLHXMHXNHXOHXPHXQHXRHXSHSVHSWHSXHSYHSZHTIHTJHTKHTLHTMH"
+    "TNHTOHTPHTQHTRHTSHTTHTUHTVHTWHTXHTYHTZHUIHUJHUKHULHUMHUNHUOHUPHUQHURHUSHUT"
+    "HUUHUVHUWHUXHUYHUZHVIHVJHVKHIIKIILIIMIINIIOIIPIIQIIRIISIITIIUIIVIIWIIXIIYI"
+    "IZIJJIJKIJLIJMIJNIJOIJPIJQIJRIJSIJTIJUIJVIJWIJXIJYIJZIKJIKKIKLIKMIKNIKOIKP"
+    "IKQIKRIKSIKTXTHXUHXVHXWHXXHXYHXZHYIHYJHYKHYLHYMHYNHYOHYPHYQHYRHYSHYTHYUHYV"
+    "HYWHYXHYYHYZHZIHZJHZKHZLHZMHZNHZOHZPHZQHZRHZSHZTHZUHZVHZWHZXHZYHZZIIIJINNI"
+    "NOINPINQINRINSINTINUINVINWINXINYINZIOJIOKIOLIOMIONIOOIOPIOQIORIOSIOTIOUIOV"
+    "IOWIOXIOYIOZIPJIPKIPLIPMIPNIPOIPPIPQIPRIPSIPTIPUIPVIPWIKUIKVIKWIKXIKYIKZIL"
+    "JILKILLILMILNILOILPILQILRILSILTILUILVILWILXILYILZIMJIMKIMLIMMIMNIMOIMPIMQI"
+    "MRIMSIMTIMUIMVIMWIMXIMYIMZINJINKINLINMISQISRISSISTISUISVISWISXISYISZITJITK"
+    "ITLITMITNITOITPITQITRITSITTITUITVITWITXITYITZIUJIUKIULIUMIUNIUOIUPIUQIURIU"
+    "SIUTIUUIUVIUWIUXIUYIUZIPXIPYIPZIQJIQKIQLIQMIQNIQOIQPIQQIQRIQSIQTIQUIQVIQWI"
+    "QXIQYIQZIRJIRKIRLIRMIRNIROIRPIRQIRRIRSIRTIRUIRVIRWIRXIRYIRZISJISKISLISMISN"
+    "ISOISPIXTIXUIXVIXWIXXIXYIXZIYJIYKIYLIYMIYNIYOIYPIYQIYRIYSIYTIYUIYVIYWIYXIY"
+    "YIYZIZJIZKIZLIZMIZNIZOIZPIZQIZRIZSIZTIZUIZVIZWIZXIZYIZZJJJKJJLJJIVJIVKIVLI"
+    "VMIVNIVOIVPIVQIVRIVSIVTIVUIVVIVWIVXIVYIVZIWJIWKIWLIWMIWNIWOIWPIWQIWRIWSIWT"
+    "IWUIWVIWWIWXIWYIWZIXJIXKIXLIXMIXNIXOIXPIXQIXRIXSYJLZJMKJMLJMMJMNJMOJMPJMQJ"
+    "MRJMSJMTJMUJMVJMWJMXJMYJMZJNKJNLJNMJNNJNOJNPJNQJNRJNSJNTJNUJNVJNWJNXJNYJNZ"
+    "JOKJOLJOMJONJOOJOPJOQJORJOSJOTJOMJJNJJOJJPJJQJJRJJSJJTJJUJJVJJWJJXJJYJJZJK"
+    "KJKLJKMJKNJKOJKPJKQJKRJKSJKTJKUJKVJKWJKXJKYJKZJLKJLLJLMJLNJLOJLPJLQJLRJLSJ"
+    "LTJLUJLVJLWJLXJLQJRRJRSJRTJRUJRVJRWJRXJRYJRZJSKJSLJSMJSNJSOJSPJSQJSRJSSJST"
+    "JSUJSVJSWJSXJSYJSZJTKJTLJTMJTNJTOJTPJTQJTRJTSJTTJTUJTVJTWJTXJTYJTZJUKJULJU"
+    "UJOVJOWJOXJOYJOZJPKJPLJPMJPNJPOJPPJPQJPRJPSJPTJPUJPVJPWJPXJPYJPZJQKJQLJQMJ"
+    "QNJQOJQPJQQJQRJQSJQTJQUJQVJQWJQXJQYJQZJRKJRLJRMJRNJROJRPJRYJWZJXKJXLJXMJXN"
+    "JXOJXPJXQJXRJXSJXTJXUJXVJXWJXXJXYJXZJYKJYLJYMJYNJYOJYPJYQJYRJYSJYTJYUJYVJY"
+    "WJYXJYYJYZJZKJZLJZMJZNJZOJZPJZQJZRJZSJZTJZMJUNJUOJUPJUQJURJUSJUTJUUJUVJUWJ"
+    "UXJUYJUZJVKJVLJVMJVNJVOJVPJVQJVRJVSJVTJVUJVVJVWJVXJVYJVZJWKJWLJWMJWNJWOJWP"
+    "JWQJWRJWSJWTJWUJWVJWWJWXJWMTKMUKMVKMWKMXKMYKMZKNLKNMKNNKNOKNPKNQKNRKNSKNTK"
+    "NUKNVKNWKNXKNYKNZKOLKOMKONKOOKOPKOQKORKOSKOTKOUKOVKOWKOXKOYKOZKPLKPMKPNKPO"
+    "KPPKPQKPRKUJZVJZWJZXJZYJZZKKKLKKMKKNKKOKKPKKQKKRKKSKKTKKUKKVKKWKKXKKYKKZKL"
+    "LKLMKLNKLOKLPKLQKLRKLSKLTKLUKLVKLWKLXKLYKLZKMLKMMKMNKMOKMPKMQKMRKMSKSRKSSK"
+    "STKSUKSVKSWKSXKSYKSZKTLKTMKTNKTOKTPKTQKTRKTSKTTKTUKTVKTWKTXKTYKTZKULKUMKUN"
+    "KUOKUPKUQKURKUSKUTKUUKUVKUWKUXKUYKUZKVLKVMKVNKVOKVPKPSKPTKPUKPVKPWKPXKPYKP"
+    "ZKQLKQMKQNKQOKQPKQQKQRKQSKQTKQUKQVKQWKQXKQYKQZKRLKRMKRNKROKRPKRQKRRKRSKRTK"
+    "RUKRVKRWKRXKRYKRZKSLKSMKSNKSOKSPKSQKYPKYQKYRKYSKYTKYUKYVKYWKYXKYYKYZKZLKZM"
+    "KZNKZOKZPKZQKZRKZSKZTKZUKZVKZWKZXKZYKZZLLLMLLNLLOLLPLLQLLRLLSLLTLLULLVLLWL"
+    "LXLLYLLZLMMLMNLMOLMPVQKVRKVSKVTKVUKVVKVWKVXKVYKVZKWLKWMKWNKWOKWPKWQKWRKWSK"
+    "WTKWUKWVKWWKWXKWYKWZKXLKXMKXNKXOKXPKXQKXRKXSKXTKXUKXVKXWKXXKXYKXZKYLKYMKYN"
+    "KYOKLPSLPTLPULPVLPWLPXLPYLPZLQMLQNLQOLQPLQQLQRLQSLQTLQULQVLQWLQXLQYLQZLRML"
+    "RNLROLRPLRQLRRLRSLRTLRULRVLRWLRXLRYLRZLSMLSNLSOLSPLSQLSRLSSLSTLMQLMRLMSLMT"
+    "LMULMVLMWLMXLMYLMZLNMLNNLNOLNPLNQLNRLNSLNTLNULNVLNWLNXLNYLNZLOMLONLOOLOPLO"
+    "QLORLOSLOTLOULOVLOWLOXLOYLOZLPMLPNLPOLPPLPQLPRLVWLVXLVYLVZLWMLWNLWOLWPLWQL"
+    "WRLWSLWTLWULWVLWWLWXLWYLWZLXMLXNLXOLXPLXQLXRLXSLXTLXULXVLXWLXXLXYLXZLYMLYN"
+    "LYOLYPLYQLYRLYSLYTLYULYVLYWLYXLSULSVLSWLSXLSYLSZLTMLTNLTOLTPLTQLTRLTSLTTLT"
+    "ULTVLTWLTXLTYLTZLUMLUNLUOLUPLUQLURLUSLUTLUULUVLUWLUXLUYLUZLVMLVNLVOLVPLVQL"
+    "VRLVSLVTLVULVVOMOPMOQMORMOSMOTMOUMOVMOWMOXMOYMOZMPNMPOMPPMPQMPRMPSMPTMPUMP"
+    "VMPWMPXMPYMPZMQNMQOMQPMQQMQRMQSMQTMQUMQVMQWMQXMQYMQZMRNMROMRPMRQMRRMRSMRLY"
+    "YLYZLZMLZNLZOLZPLZQLZRLZSLZTLZULZVLZWLZXLZYLZZMMMNMMOMMPMMQMMRMMSMMTMMUMMV"
+    "MMWMMXMMYMMZMNNMNOMNPMNQMNRMNSMNTMNUMNVMNWMNXMNYMNZMONMOYMUZMVNMVOMVPMVQMV"
+    "RMVSMVTMVUMVVMVWMVXMVYMVZMWNMWOMWPMWQMWRMWSMWTMWUMWVMWWMWXMWYMWZMXNMXOMXPM"
+    "XQMXRMXSMXTMXUMXVMXWMXXMXYMXZMYNMYOMYPMYTMRUMRVMRWMRXMRYMRZMSNMSOMSPMSQMSR"
+    "MSSMSTMSUMSVMSWMSXMSYMSZMTNMTOMTPMTQMTRMTSMTTMTUMTVMTWMTXMTYMTZMUNMUOMUPMU"
+    "QMURMUSMUTMUUMUVMUWMUXMUOXNOYNOZNPONPPNPQNPRNPSNPTNPUNPVNPWNPXNPYNPZNQONQP"
+    "NQQNQRNQSNQTNQUNQVNQWNQXNQYNQZNRONRPNRQNRRNRSNRTNRUNRVNRWNRXNRYNRZNSONSPNS"
+    "QNSRNSSNQMYRMYSMYTMYUMYVMYWMYXMYYMYZMZNMZOMZPMZQMZRMZSMZTMZUMZVMZWMZXMZYMZ"
+    "ZNNNONNPNNQNNRNNSNNTNNUNNVNNWNNXNNYNNZNOONOPNOQNORNOSNOTNOUNOVNOWNWPNWQNWR"
+    "NWSNWTNWUNWVNWWNWXNWYNWZNXONXPNXQNXRNXSNXTNXUNXVNXWNXXNXYNXZNYONYPNYQNYRNY"
+    "SNYTNYUNYVNYWNYXNYYNYZNZONZPNZQNZRNZSNZTNZUNZVNZWNSTNSUNSVNSWNSXNSYNSZNTON"
+    "TPNTQNTRNTSNTTNTUNTVNTWNTXNTYNTZNUONUPNUQNURNUSNUTNUUNUVNUWNUXNUYNUZNVONVP"
+    "NVQNVRNVSNVTNVUNVVNVWNVXNVYNVZNWONORXORYORZOSPOSQOSROSSOSTOSUOSVOSWOSXOSYO"
+    "SZOTPOTQOTROTSOTTOTUOTVOTWOTXOTYOTZOUPOUQOUROUSOUTOUUOUVOUWOUXOUYOUZOVPOVQ"
+    "OVROVSOVTOVUOVVOVWZXNZYNZZOOOPOOQOOROOSOOTOOUOOVOOWOOXOOYOOZOPPOPQOPROPSOP"
+    "TOPUOPVOPWOPXOPYOPZOQPOQQOQROQSOQTOQUOQVOQWOQXOQYOQZORPORQORRORSORTORUORVO"
+    "RWOZXOZYOZZPPPQPPRPPSPPTPPUPPVPPWPPXPPYPPZPQQPQRPQSPQTPQUPQVPQWPQXPQYPQZPR"
+    "QPRRPRSPRTPRUPRVPRWPRXPRYPRZPSQPSRPSSPSTPSUPSVPSWPSXPSYPSZPTOVXOVYOVZOWPOW"
+    "QOWROWSOWTOWUOWVOWWOWXOWYOWZOXPOXQOXROXSOXTOXUOXVOXWOXXOXYOXZOYPOYQOYROYSO"
+    "YTOYUOYVOYWOYXOYYOYZOZPOZQOZROZSOZTOZUOZVOZWQPTRPTSPTTPTUPTV";
+
+TEST(ZlibTest, DeflateZFixedCorruption) {
+  // Tavis's test case from
+  // https://www.openwall.com/lists/oss-security/2022/03/26/1
+  // The upstream fix,
+  // https://github.com/madler/zlib/commit/5c44459c3b28a9bd3283aaceab7c615f8020c531,
+  // was merged in Chromium in #583975.
+
+  z_stream stream;
+  stream.zalloc = Z_NULL;
+  stream.zfree = Z_NULL;
+
+  int level = Z_DEFAULT_COMPRESSION;
+  int windowBits = 15;
+  int memLevel = 1;
+  int strategy = Z_FIXED;
+
+  int ret =
+      deflateInit2(&stream, level, Z_DEFLATED, windowBits, memLevel, strategy);
+  ASSERT_EQ(ret, Z_OK);
+  std::vector<uint8_t> compressed(
+      deflateBound(&stream, strlen(zFixedCorruptionData)));
+  stream.next_out = compressed.data();
+  stream.avail_out = compressed.size();
+  stream.next_in = (uint8_t*)zFixedCorruptionData;
+  stream.avail_in = strlen(zFixedCorruptionData);
+  ret = deflate(&stream, Z_FINISH);
+  ASSERT_EQ(ret, Z_STREAM_END);
+  size_t compressed_sz = compressed.size() - stream.avail_out;
+  deflateEnd(&stream);
+
+  std::vector<uint8_t> decompressed(strlen(zFixedCorruptionData));
+  ret = inflateInit2(&stream, windowBits);
+  ASSERT_EQ(ret, Z_OK);
+  stream.next_in = compressed.data();
+  stream.avail_in = compressed_sz;
+  stream.next_out = decompressed.data();
+  stream.avail_out = decompressed.size();
+  ret = inflate(&stream, Z_FINISH);
+  ASSERT_EQ(ret, Z_STREAM_END);
+  inflateEnd(&stream);
+
+  EXPECT_EQ(decompressed.size(), strlen(zFixedCorruptionData));
+  EXPECT_EQ(
+      memcmp(zFixedCorruptionData, decompressed.data(), decompressed.size()),
+      0);
+}
+
+// TODO(gustavoa): make these tests run standalone.
+#ifndef CMAKE_STANDALONE_UNITTESTS
+
+TEST(ZlibTest, ZipFilenameCommentSize) {
+  // Check that minizip rejects zip member filenames or comments longer than
+  // the zip format can represent.
+
+  base::ScopedTempDir temp_dir;
+  ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
+  base::FilePath zip_file = temp_dir.GetPath().AppendASCII("crbug1470539.zip");
+
+  zipFile zf = zipOpen(zip_file.AsUTF8Unsafe().c_str(), APPEND_STATUS_CREATE);
+  ASSERT_NE(zf, nullptr);
+
+  // Adding a member with 2^16 byte filename is okay.
+  std::string long_filename(UINT16_MAX, 'a');
+  EXPECT_EQ(zipOpenNewFileInZip(zf, long_filename.c_str(), nullptr, nullptr, 0,
+                                nullptr, 0, nullptr, Z_DEFLATED,
+                                Z_DEFAULT_COMPRESSION),
+            ZIP_OK);
+  EXPECT_EQ(zipWriteInFileInZip(zf, "1", 1), ZIP_OK);
+  EXPECT_EQ(zipCloseFileInZip(zf), ZIP_OK);
+
+  // Adding a member with 2^16+1 byte filename is NOT okay.
+  std::string too_long_filename = long_filename + 'a';
+  EXPECT_EQ(zipOpenNewFileInZip(zf, too_long_filename.c_str(), nullptr, nullptr,
+                                0, nullptr, 0, nullptr, Z_DEFLATED,
+                                Z_DEFAULT_COMPRESSION),
+            ZIP_PARAMERROR);
+
+  // Adding a member with 2^16 byte comment is okay.
+  std::string long_comment(UINT16_MAX, 'x');
+  EXPECT_EQ(zipOpenNewFileInZip(zf, "x", nullptr, nullptr, 0, nullptr, 0,
+                                long_comment.c_str(), Z_DEFLATED,
+                                Z_DEFAULT_COMPRESSION),
+            ZIP_OK);
+  EXPECT_EQ(zipCloseFileInZip(zf), ZIP_OK);
+
+  // Adding a member with 2^16+1 byte comment is NOT okay.
+  std::string too_long_comment = long_comment + 'x';
+  EXPECT_EQ(zipOpenNewFileInZip(zf, "x", nullptr, nullptr, 0, nullptr, 0,
+                                too_long_comment.c_str(), Z_DEFLATED,
+                                Z_DEFAULT_COMPRESSION),
+            ZIP_PARAMERROR);
+
+  EXPECT_EQ(zipClose(zf, nullptr), ZIP_OK);
+
+  // Check that the long filename and comment members were successfully added.
+  unzFile uzf = unzOpen(zip_file.AsUTF8Unsafe().c_str());
+  ASSERT_NE(uzf, nullptr);
+  char buf[UINT16_MAX + 2];
+
+  ASSERT_EQ(unzGoToFirstFile(uzf), UNZ_OK);
+  ASSERT_EQ(unzGetCurrentFileInfo(uzf, nullptr, buf, sizeof(buf), nullptr, 0,
+                                  nullptr, 0),
+            UNZ_OK);
+  EXPECT_EQ(std::string(buf), long_filename);
+
+  ASSERT_EQ(unzGoToNextFile(uzf), UNZ_OK);
+  ASSERT_EQ(unzGetCurrentFileInfo(uzf, nullptr, nullptr, 0, nullptr, 0, buf,
+                                  sizeof(buf)),
+            UNZ_OK);
+  EXPECT_EQ(std::string(buf), long_comment);
+
+  EXPECT_EQ(unzGoToNextFile(uzf), UNZ_END_OF_LIST_OF_FILE);
+  EXPECT_EQ(unzClose(uzf), UNZ_OK);
+}
+
+TEST(ZlibTest, ZipExtraFieldSize) {
+  // Check that minizip rejects zip members with too large extra fields.
+
+  std::string extra_field;
+  extra_field.append("\x12\x34");  // Header ID.
+  extra_field.append("\xfb\xff");  // Data size (not including the header).
+  extra_field.append(UINT16_MAX - 4, 'a');
+
+  base::ScopedTempDir temp_dir;
+  ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
+  base::FilePath zip_file = temp_dir.GetPath().AppendASCII("extrafield.zip");
+
+  zipFile zf = zipOpen(zip_file.AsUTF8Unsafe().c_str(), APPEND_STATUS_CREATE);
+  ASSERT_NE(zf, nullptr);
+
+  // Adding a member with 2^16 byte extra field should work.
+  EXPECT_EQ(zipOpenNewFileInZip(zf, "a", nullptr, extra_field.data(),
+                                extra_field.size(), extra_field.data(),
+                                extra_field.size(), nullptr, Z_DEFLATED,
+                                Z_DEFAULT_COMPRESSION),
+            ZIP_OK);
+  EXPECT_EQ(zipWriteInFileInZip(zf, "1", 1), ZIP_OK);
+  EXPECT_EQ(zipCloseFileInZip(zf), ZIP_OK);
+
+  // More then 2^16 bytes doesn't work. Neither for size_extrafield_local, nor
+  // size_extrafield_global.
+  std::string extra_field_long = extra_field + 'x';
+  EXPECT_EQ(
+      zipOpenNewFileInZip(zf, "b", nullptr, nullptr, 0, extra_field_long.data(),
+                          extra_field_long.size(), nullptr, Z_DEFLATED,
+                          Z_DEFAULT_COMPRESSION),
+      ZIP_PARAMERROR);
+  EXPECT_EQ(zipOpenNewFileInZip(zf, "b", nullptr, extra_field_long.data(),
+                                extra_field_long.size(), nullptr, 0, nullptr,
+                                Z_DEFLATED, Z_DEFAULT_COMPRESSION),
+            ZIP_PARAMERROR);
+
+  EXPECT_EQ(zipClose(zf, nullptr), ZIP_OK);
+
+  // Check that the data can be read back.
+  unzFile uzf = unzOpen(zip_file.AsUTF8Unsafe().c_str());
+  ASSERT_NE(uzf, nullptr);
+  char buf[UINT16_MAX + 1] = {0};
+
+  ASSERT_EQ(unzGoToFirstFile(uzf), UNZ_OK);
+  ASSERT_EQ(unzGetCurrentFileInfo(uzf, nullptr, nullptr, 0, buf,
+                                  sizeof(buf) - 1, nullptr, 0),
+            UNZ_OK);
+  EXPECT_EQ(std::string(buf), extra_field);
+
+  EXPECT_EQ(unzGoToNextFile(uzf), UNZ_END_OF_LIST_OF_FILE);
+  EXPECT_EQ(unzClose(uzf), UNZ_OK);
+}
+
+#endif
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/cpu_features.c b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/cpu_features.c
new file mode 100644
index 000000000..64e0428cd
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/cpu_features.c
@@ -0,0 +1,189 @@
+/* cpu_features.c -- Processor features detection.
+ *
+ * Copyright 2018 The Chromium Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the Chromium source repository LICENSE file.
+ */
+
+#include "cpu_features.h"
+#include "zutil.h"
+
+#include <stdint.h>
+#if defined(_MSC_VER)
+#include <intrin.h>
+#elif defined(ADLER32_SIMD_SSSE3)
+#include <cpuid.h>
+#endif
+
+/* TODO(cavalcantii): remove checks for x86_flags on deflate.
+ */
+#if defined(ARMV8_OS_MACOS)
+/* Crypto extensions (crc32/pmull) are a baseline feature in ARMv8.1-A, and
+ * OSX running on arm64 is new enough that these can be assumed without
+ * runtime detection.
+ */
+int ZLIB_INTERNAL arm_cpu_enable_crc32 = 1;
+int ZLIB_INTERNAL arm_cpu_enable_pmull = 1;
+#else
+int ZLIB_INTERNAL arm_cpu_enable_crc32 = 0;
+int ZLIB_INTERNAL arm_cpu_enable_pmull = 0;
+#endif
+int ZLIB_INTERNAL x86_cpu_enable_sse2 = 0;
+int ZLIB_INTERNAL x86_cpu_enable_ssse3 = 0;
+int ZLIB_INTERNAL x86_cpu_enable_simd = 0;
+int ZLIB_INTERNAL x86_cpu_enable_avx512 = 0;
+
+#ifndef CPU_NO_SIMD
+
+#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_FUCHSIA) || defined(ARMV8_OS_IOS)
+#include <pthread.h>
+#endif
+
+#if defined(ARMV8_OS_ANDROID)
+#include <cpu-features.h>
+#elif defined(ARMV8_OS_LINUX)
+#include <asm/hwcap.h>
+#include <sys/auxv.h>
+#elif defined(ARMV8_OS_FUCHSIA)
+#include <zircon/features.h>
+#include <zircon/syscalls.h>
+#include <zircon/types.h>
+#elif defined(ARMV8_OS_WINDOWS) || defined(X86_WINDOWS)
+#include <windows.h>
+#elif defined(ARMV8_OS_IOS)
+#include <sys/sysctl.h>
+#elif !defined(_MSC_VER)
+#include <pthread.h>
+#else
+#error cpu_features.c CPU feature detection in not defined for your platform
+#endif
+
+#if !defined(CPU_NO_SIMD) && !defined(ARMV8_OS_MACOS)
+static void _cpu_check_features(void);
+#endif
+
+#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_MACOS) || defined(ARMV8_OS_FUCHSIA) || defined(X86_NOT_WINDOWS) || defined(ARMV8_OS_IOS)
+#if !defined(ARMV8_OS_MACOS)
+// _cpu_check_features() doesn't need to do anything on mac/arm since all
+// features are known at build time, so don't call it.
+// Do provide cpu_check_features() (with a no-op implementation) so that we
+// don't have to make all callers of it check for mac/arm.
+static pthread_once_t cpu_check_inited_once = PTHREAD_ONCE_INIT;
+#endif
+void ZLIB_INTERNAL cpu_check_features(void)
+{
+#if !defined(ARMV8_OS_MACOS)
+    pthread_once(&cpu_check_inited_once, _cpu_check_features);
+#endif
+}
+#elif defined(ARMV8_OS_WINDOWS) || defined(X86_WINDOWS)
+static INIT_ONCE cpu_check_inited_once = INIT_ONCE_STATIC_INIT;
+static BOOL CALLBACK _cpu_check_features_forwarder(PINIT_ONCE once, PVOID param, PVOID* context)
+{
+    _cpu_check_features();
+    return TRUE;
+}
+void ZLIB_INTERNAL cpu_check_features(void)
+{
+    InitOnceExecuteOnce(&cpu_check_inited_once, _cpu_check_features_forwarder,
+                        NULL, NULL);
+}
+#endif
+
+#if (defined(__ARM_NEON__) || defined(__ARM_NEON))
+#if !defined(ARMV8_OS_MACOS)
+/*
+ * See http://bit.ly/2CcoEsr for run-time detection of ARM features and also
+ * crbug.com/931275 for android_getCpuFeatures() use in the Android sandbox.
+ */
+static void _cpu_check_features(void)
+{
+#if defined(ARMV8_OS_ANDROID) && defined(__aarch64__)
+    uint64_t features = android_getCpuFeatures();
+    arm_cpu_enable_crc32 = !!(features & ANDROID_CPU_ARM64_FEATURE_CRC32);
+    arm_cpu_enable_pmull = !!(features & ANDROID_CPU_ARM64_FEATURE_PMULL);
+#elif defined(ARMV8_OS_ANDROID) /* aarch32 */
+    uint64_t features = android_getCpuFeatures();
+    arm_cpu_enable_crc32 = !!(features & ANDROID_CPU_ARM_FEATURE_CRC32);
+    arm_cpu_enable_pmull = !!(features & ANDROID_CPU_ARM_FEATURE_PMULL);
+#elif defined(ARMV8_OS_LINUX) && defined(__aarch64__)
+    unsigned long features = getauxval(AT_HWCAP);
+    arm_cpu_enable_crc32 = !!(features & HWCAP_CRC32);
+    arm_cpu_enable_pmull = !!(features & HWCAP_PMULL);
+#elif defined(ARMV8_OS_LINUX) && (defined(__ARM_NEON) || defined(__ARM_NEON__))
+    /* Query HWCAP2 for ARMV8-A SoCs running in aarch32 mode */
+    unsigned long features = getauxval(AT_HWCAP2);
+    arm_cpu_enable_crc32 = !!(features & HWCAP2_CRC32);
+    arm_cpu_enable_pmull = !!(features & HWCAP2_PMULL);
+#elif defined(ARMV8_OS_FUCHSIA)
+    uint32_t features;
+    zx_status_t rc = zx_system_get_features(ZX_FEATURE_KIND_CPU, &features);
+    if (rc != ZX_OK || (features & ZX_ARM64_FEATURE_ISA_ASIMD) == 0)
+        return;  /* Report nothing if ASIMD(NEON) is missing */
+    arm_cpu_enable_crc32 = !!(features & ZX_ARM64_FEATURE_ISA_CRC32);
+    arm_cpu_enable_pmull = !!(features & ZX_ARM64_FEATURE_ISA_PMULL);
+#elif defined(ARMV8_OS_WINDOWS)
+    arm_cpu_enable_crc32 = IsProcessorFeaturePresent(PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE);
+    arm_cpu_enable_pmull = IsProcessorFeaturePresent(PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE);
+#elif defined(ARMV8_OS_IOS)
+    // Determine what features are supported dynamically. This code is applicable to macOS
+    // as well if we wish to do that dynamically on that platform in the future.
+    // See https://developer.apple.com/documentation/kernel/1387446-sysctlbyname/determining_instruction_set_characteristics
+    int val = 0;
+    size_t len = sizeof(val);
+    arm_cpu_enable_crc32 = sysctlbyname("hw.optional.armv8_crc32", &val, &len, 0, 0) == 0
+               && val != 0;
+    val = 0;
+    len = sizeof(val);
+    arm_cpu_enable_pmull = sysctlbyname("hw.optional.arm.FEAT_PMULL", &val, &len, 0, 0) == 0
+               && val != 0;
+#endif
+}
+#endif
+#elif defined(X86_NOT_WINDOWS) || defined(X86_WINDOWS)
+/*
+ * iOS@x86 (i.e. emulator) is another special case where we disable
+ * SIMD optimizations.
+ */
+#ifndef CPU_NO_SIMD
+/* On x86 we simply use a instruction to check the CPU features.
+ * (i.e. CPUID).
+ */
+#ifdef CRC32_SIMD_AVX512_PCLMUL
+#include <immintrin.h>
+#include <xsaveintrin.h>
+#endif
+static void _cpu_check_features(void)
+{
+    int x86_cpu_has_sse2;
+    int x86_cpu_has_ssse3;
+    int x86_cpu_has_sse42;
+    int x86_cpu_has_pclmulqdq;
+    int abcd[4];
+
+#ifdef _MSC_VER
+    __cpuid(abcd, 1);
+#else
+    __cpuid(1, abcd[0], abcd[1], abcd[2], abcd[3]);
+#endif
+
+    x86_cpu_has_sse2 = abcd[3] & 0x4000000;
+    x86_cpu_has_ssse3 = abcd[2] & 0x000200;
+    x86_cpu_has_sse42 = abcd[2] & 0x100000;
+    x86_cpu_has_pclmulqdq = abcd[2] & 0x2;
+
+    x86_cpu_enable_sse2 = x86_cpu_has_sse2;
+
+    x86_cpu_enable_ssse3 = x86_cpu_has_ssse3;
+
+    x86_cpu_enable_simd = x86_cpu_has_sse2 &&
+                          x86_cpu_has_sse42 &&
+                          x86_cpu_has_pclmulqdq;
+
+#ifdef CRC32_SIMD_AVX512_PCLMUL
+    x86_cpu_enable_avx512 = _xgetbv(0) & 0x00000040;
+#endif
+}
+#endif
+#endif
+#endif
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/cpu_features.h b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/cpu_features.h
new file mode 100644
index 000000000..aed3e834c
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/cpu_features.h
@@ -0,0 +1,19 @@
+/* cpu_features.h -- Processor features detection.
+ *
+ * Copyright 2018 The Chromium Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the Chromium source repository LICENSE file.
+ */
+
+#include "zlib.h"
+
+/* TODO(cavalcantii): remove checks for x86_flags on deflate.
+ */
+extern int arm_cpu_enable_crc32;
+extern int arm_cpu_enable_pmull;
+extern int x86_cpu_enable_sse2;
+extern int x86_cpu_enable_ssse3;
+extern int x86_cpu_enable_simd;
+extern int x86_cpu_enable_avx512;
+
+void cpu_check_features(void);
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/crc32.c b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/crc32.c
index 9162429cc..1e1a57519 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/crc32.c
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/crc32.c
@@ -1,12 +1,10 @@
 /* crc32.c -- compute the CRC-32 of a data stream
- * Copyright (C) 1995-2006, 2010, 2011, 2012, 2016 Mark Adler
+ * Copyright (C) 1995-2022 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  *
- * Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster
- * CRC methods: exclusive-oring 32 bits of data at a time, and pre-computing
- * tables for updating the shift register in one step with three exclusive-ors
- * instead of four steps with four exclusive-ors.  This results in about a
- * factor of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3.
+ * This interleaved implementation of a CRC makes use of pipelined multiple
+ * arithmetic-logic units, commonly found in modern CPU cores. It is due to
+ * Kadatch and Jenkins (2010). See doc/crc-doc.1.0.pdf in this distribution.
  */
 
 /* @(#) $Id$ */
@@ -14,11 +12,12 @@
 /*
   Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore
   protection on the static variables used to control the first-use generation
-  of the crc tables.  Therefore, if you #define DYNAMIC_CRC_TABLE, you should
+  of the crc tables. Therefore, if you #define DYNAMIC_CRC_TABLE, you should
   first call get_crc_table() to initialize the tables before allowing more than
   one thread to use crc32().
 
-  DYNAMIC_CRC_TABLE and MAKECRCH can be #defined to write out crc32.h.
+  MAKECRCH can be #defined to write out crc32.h. A main() routine is also
+  produced, so that this one source file can be compiled to an executable.
  */
 
 #ifdef MAKECRCH
@@ -29,441 +28,1155 @@
 #endif /* MAKECRCH */
 
 #include "deflate.h"
-#include "x86.h"
-#include "zutil.h"      /* for STDC and FAR definitions */
-
-/* Definitions for doing the crc four data bytes at a time. */
-#if !defined(NOBYFOUR) && defined(Z_U4)
-#  define BYFOUR
-#endif
-#ifdef BYFOUR
-   local unsigned long crc32_little OF((unsigned long,
-                        const unsigned char FAR *, z_size_t));
-   local unsigned long crc32_big OF((unsigned long,
-                        const unsigned char FAR *, z_size_t));
-#  define TBLS 8
+#include "cpu_features.h"
+#include "zutil.h"      /* for Z_U4, Z_U8, z_crc_t, and FAR definitions */
+
+#if defined(CRC32_SIMD_SSE42_PCLMUL) || defined(CRC32_ARMV8_CRC32)
+#include "crc32_simd.h"
+#endif
+
+ /*
+  A CRC of a message is computed on N braids of words in the message, where
+  each word consists of W bytes (4 or 8). If N is 3, for example, then three
+  running sparse CRCs are calculated respectively on each braid, at these
+  indices in the array of words: 0, 3, 6, ..., 1, 4, 7, ..., and 2, 5, 8, ...
+  This is done starting at a word boundary, and continues until as many blocks
+  of N * W bytes as are available have been processed. The results are combined
+  into a single CRC at the end. For this code, N must be in the range 1..6 and
+  W must be 4 or 8. The upper limit on N can be increased if desired by adding
+  more #if blocks, extending the patterns apparent in the code. In addition,
+  crc32.h would need to be regenerated, if the maximum N value is increased.
+
+  N and W are chosen empirically by benchmarking the execution time on a given
+  processor. The choices for N and W below were based on testing on Intel Kaby
+  Lake i7, AMD Ryzen 7, ARM Cortex-A57, Sparc64-VII, PowerPC POWER9, and MIPS64
+  Octeon II processors. The Intel, AMD, and ARM processors were all fastest
+  with N=5, W=8. The Sparc, PowerPC, and MIPS64 were all fastest at N=5, W=4.
+  They were all tested with either gcc or clang, all using the -O3 optimization
+  level. Your mileage may vary.
+ */
+
+/* Define N */
+#ifdef Z_TESTN
+#  define N Z_TESTN
+#else
+#  define N 5
+#endif
+#if N < 1 || N > 6
+#  error N must be in 1..6
+#endif
+
+/*
+  z_crc_t must be at least 32 bits. z_word_t must be at least as long as
+  z_crc_t. It is assumed here that z_word_t is either 32 bits or 64 bits, and
+  that bytes are eight bits.
+ */
+
+/*
+  Define W and the associated z_word_t type. If W is not defined, then a
+  braided calculation is not used, and the associated tables and code are not
+  compiled.
+ */
+#ifdef Z_TESTW
+#  if Z_TESTW-1 != -1
+#    define W Z_TESTW
+#  endif
 #else
-#  define TBLS 1
-#endif /* BYFOUR */
+#  ifdef MAKECRCH
+#    define W 8         /* required for MAKECRCH */
+#  else
+#    if defined(__x86_64__) || defined(__aarch64__)
+#      define W 8
+#    else
+#      define W 4
+#    endif
+#  endif
+#endif
+#ifdef W
+#  if W == 8 && defined(Z_U8)
+     typedef Z_U8 z_word_t;
+#  elif defined(Z_U4)
+#    undef W
+#    define W 4
+     typedef Z_U4 z_word_t;
+#  else
+#    undef W
+#  endif
+#endif
 
-/* Local functions for crc concatenation */
-local unsigned long gf2_matrix_times OF((unsigned long *mat,
-                                         unsigned long vec));
-local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat));
-local uLong crc32_combine_ OF((uLong crc1, uLong crc2, z_off64_t len2));
+/* If available, use the ARM processor CRC32 instruction. */
+#if defined(__aarch64__) && defined(__ARM_FEATURE_CRC32) && W == 8 \
+    && defined(USE_CANONICAL_ARMV8_CRC32)
+#  define ARMCRC32_CANONICAL_ZLIB
+#endif
 
+#if defined(W) && (!defined(ARMCRC32_CANONICAL_ZLIB) || defined(DYNAMIC_CRC_TABLE))
+/*
+  Swap the bytes in a z_word_t to convert between little and big endian. Any
+  self-respecting compiler will optimize this to a single machine byte-swap
+  instruction, if one is available. This assumes that word_t is either 32 bits
+  or 64 bits.
+ */
+local z_word_t byte_swap(z_word_t word) {
+#  if W == 8
+    return
+        (word & 0xff00000000000000) >> 56 |
+        (word & 0xff000000000000) >> 40 |
+        (word & 0xff0000000000) >> 24 |
+        (word & 0xff00000000) >> 8 |
+        (word & 0xff000000) << 8 |
+        (word & 0xff0000) << 24 |
+        (word & 0xff00) << 40 |
+        (word & 0xff) << 56;
+#  else   /* W == 4 */
+    return
+        (word & 0xff000000) >> 24 |
+        (word & 0xff0000) >> 8 |
+        (word & 0xff00) << 8 |
+        (word & 0xff) << 24;
+#  endif
+}
+#endif
 
 #ifdef DYNAMIC_CRC_TABLE
+/* =========================================================================
+ * Table of powers of x for combining CRC-32s, filled in by make_crc_table()
+ * below.
+ */
+   local z_crc_t FAR x2n_table[32];
+#else
+/* =========================================================================
+ * Tables for byte-wise and braided CRC-32 calculations, and a table of powers
+ * of x for combining CRC-32s, all made by make_crc_table().
+ */
+#  include "crc32.h"
+#endif
+
+/* CRC polynomial. */
+#define POLY 0xedb88320         /* p(x) reflected, with x^32 implied */
+
+/*
+  Return a(x) multiplied by b(x) modulo p(x), where p(x) is the CRC polynomial,
+  reflected. For speed, this requires that a not be zero.
+ */
+local z_crc_t multmodp(z_crc_t a, z_crc_t b) {
+    z_crc_t m, p;
+
+    m = (z_crc_t)1 << 31;
+    p = 0;
+    for (;;) {
+        if (a & m) {
+            p ^= b;
+            if ((a & (m - 1)) == 0)
+                break;
+        }
+        m >>= 1;
+        b = b & 1 ? (b >> 1) ^ POLY : b >> 1;
+    }
+    return p;
+}
 
-local volatile int crc_table_empty = 1;
-local z_crc_t FAR crc_table[TBLS][256];
-local void make_crc_table OF((void));
+/*
+  Return x^(n * 2^k) modulo p(x). Requires that x2n_table[] has been
+  initialized.
+ */
+local z_crc_t x2nmodp(z_off64_t n, unsigned k) {
+    z_crc_t p;
+
+    p = (z_crc_t)1 << 31;           /* x^0 == 1 */
+    while (n) {
+        if (n & 1)
+            p = multmodp(x2n_table[k & 31], p);
+        n >>= 1;
+        k++;
+    }
+    return p;
+}
+
+#ifdef DYNAMIC_CRC_TABLE
+/* =========================================================================
+ * Build the tables for byte-wise and braided CRC-32 calculations, and a table
+ * of powers of x for combining CRC-32s.
+ */
+local z_crc_t FAR crc_table[256];
+#ifdef W
+   local z_word_t FAR crc_big_table[256];
+   local z_crc_t FAR crc_braid_table[W][256];
+   local z_word_t FAR crc_braid_big_table[W][256];
+   local void braid(z_crc_t [][256], z_word_t [][256], int, int);
+#endif
 #ifdef MAKECRCH
-   local void write_table OF((FILE *, const z_crc_t FAR *));
+   local void write_table(FILE *, const z_crc_t FAR *, int);
+   local void write_table32hi(FILE *, const z_word_t FAR *, int);
+   local void write_table64(FILE *, const z_word_t FAR *, int);
 #endif /* MAKECRCH */
+
+/*
+  Define a once() function depending on the availability of atomics. If this is
+  compiled with DYNAMIC_CRC_TABLE defined, and if CRCs will be computed in
+  multiple threads, and if atomics are not available, then get_crc_table() must
+  be called to initialize the tables and must return before any threads are
+  allowed to compute or combine CRCs.
+ */
+
+/* Definition of once functionality. */
+typedef struct once_s once_t;
+
+/* Check for the availability of atomics. */
+#if defined(__STDC__) && __STDC_VERSION__ >= 201112L && \
+    !defined(__STDC_NO_ATOMICS__)
+
+#include <stdatomic.h>
+
+/* Structure for once(), which must be initialized with ONCE_INIT. */
+struct once_s {
+    atomic_flag begun;
+    atomic_int done;
+};
+#define ONCE_INIT {ATOMIC_FLAG_INIT, 0}
+
+/*
+  Run the provided init() function exactly once, even if multiple threads
+  invoke once() at the same time. The state must be a once_t initialized with
+  ONCE_INIT.
+ */
+local void once(once_t *state, void (*init)(void)) {
+    if (!atomic_load(&state->done)) {
+        if (atomic_flag_test_and_set(&state->begun))
+            while (!atomic_load(&state->done))
+                ;
+        else {
+            init();
+            atomic_store(&state->done, 1);
+        }
+    }
+}
+
+#else   /* no atomics */
+
+/* Structure for once(), which must be initialized with ONCE_INIT. */
+struct once_s {
+    volatile int begun;
+    volatile int done;
+};
+#define ONCE_INIT {0, 0}
+
+/* Test and set. Alas, not atomic, but tries to minimize the period of
+   vulnerability. */
+local int test_and_set(int volatile *flag) {
+    int was;
+
+    was = *flag;
+    *flag = 1;
+    return was;
+}
+
+/* Run the provided init() function once. This is not thread-safe. */
+local void once(once_t *state, void (*init)(void)) {
+    if (!state->done) {
+        if (test_and_set(&state->begun))
+            while (!state->done)
+                ;
+        else {
+            init();
+            state->done = 1;
+        }
+    }
+}
+
+#endif
+
+/* State for once(). */
+local once_t made = ONCE_INIT;
+
 /*
   Generate tables for a byte-wise 32-bit CRC calculation on the polynomial:
   x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1.
 
   Polynomials over GF(2) are represented in binary, one bit per coefficient,
-  with the lowest powers in the most significant bit.  Then adding polynomials
+  with the lowest powers in the most significant bit. Then adding polynomials
   is just exclusive-or, and multiplying a polynomial by x is a right shift by
-  one.  If we call the above polynomial p, and represent a byte as the
+  one. If we call the above polynomial p, and represent a byte as the
   polynomial q, also with the lowest power in the most significant bit (so the
-  byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p,
+  byte 0xb1 is the polynomial x^7+x^3+x^2+1), then the CRC is (q*x^32) mod p,
   where a mod b means the remainder after dividing a by b.
 
   This calculation is done using the shift-register method of multiplying and
-  taking the remainder.  The register is initialized to zero, and for each
+  taking the remainder. The register is initialized to zero, and for each
   incoming bit, x^32 is added mod p to the register if the bit is a one (where
-  x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by
-  x (which is shifting right by one and adding x^32 mod p if the bit shifted
-  out is a one).  We start with the highest power (least significant bit) of
-  q and repeat for all eight bits of q.
-
-  The first table is simply the CRC of all possible eight bit values.  This is
-  all the information needed to generate CRCs on data a byte at a time for all
-  combinations of CRC register values and incoming bytes.  The remaining tables
-  allow for word-at-a-time CRC calculation for both big-endian and little-
-  endian machines, where a word is four bytes.
-*/
-local void make_crc_table()
-{
-    z_crc_t c;
-    int n, k;
-    z_crc_t poly;                       /* polynomial exclusive-or pattern */
-    /* terms of polynomial defining this crc (except x^32): */
-    static volatile int first = 1;      /* flag to limit concurrent making */
-    static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
-
-    /* See if another task is already doing this (not thread-safe, but better
-       than nothing -- significantly reduces duration of vulnerability in
-       case the advice about DYNAMIC_CRC_TABLE is ignored) */
-    if (first) {
-        first = 0;
-
-        /* make exclusive-or pattern from polynomial (0xedb88320UL) */
-        poly = 0;
-        for (n = 0; n < (int)(sizeof(p)/sizeof(unsigned char)); n++)
-            poly |= (z_crc_t)1 << (31 - p[n]);
-
-        /* generate a crc for every 8-bit value */
-        for (n = 0; n < 256; n++) {
-            c = (z_crc_t)n;
-            for (k = 0; k < 8; k++)
-                c = c & 1 ? poly ^ (c >> 1) : c >> 1;
-            crc_table[0][n] = c;
-        }
+  x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by x
+  (which is shifting right by one and adding x^32 mod p if the bit shifted out
+  is a one). We start with the highest power (least significant bit) of q and
+  repeat for all eight bits of q.
 
-#ifdef BYFOUR
-        /* generate crc for each value followed by one, two, and three zeros,
-           and then the byte reversal of those as well as the first table */
-        for (n = 0; n < 256; n++) {
-            c = crc_table[0][n];
-            crc_table[4][n] = ZSWAP32(c);
-            for (k = 1; k < 4; k++) {
-                c = crc_table[0][c & 0xff] ^ (c >> 8);
-                crc_table[k][n] = c;
-                crc_table[k + 4][n] = ZSWAP32(c);
-            }
-        }
-#endif /* BYFOUR */
+  The table is simply the CRC of all possible eight bit values. This is all the
+  information needed to generate CRCs on data a byte at a time for all
+  combinations of CRC register values and incoming bytes.
+ */
+local void make_crc_table(void)
+{
+    unsigned i, j, n;
+    z_crc_t p;
 
-        crc_table_empty = 0;
-    }
-    else {      /* not first */
-        /* wait for the other guy to finish (not efficient, but rare) */
-        while (crc_table_empty)
-            ;
+    /* initialize the CRC of bytes tables */
+    for (i = 0; i < 256; i++) {
+        p = i;
+        for (j = 0; j < 8; j++)
+            p = p & 1 ? (p >> 1) ^ POLY : p >> 1;
+        crc_table[i] = p;
+#ifdef W
+        crc_big_table[i] = byte_swap(p);
+#endif
     }
 
+    /* initialize the x^2^n mod p(x) table */
+    p = (z_crc_t)1 << 30;         /* x^1 */
+    x2n_table[0] = p;
+    for (n = 1; n < 32; n++)
+        x2n_table[n] = p = multmodp(p, p);
+
+#ifdef W
+    /* initialize the braiding tables -- needs x2n_table[] */
+    braid(crc_braid_table, crc_braid_big_table, N, W);
+#endif
+
 #ifdef MAKECRCH
-    /* write out CRC tables to crc32.h */
     {
+        /*
+          The crc32.h header file contains tables for both 32-bit and 64-bit
+          z_word_t's, and so requires a 64-bit type be available. In that case,
+          z_word_t must be defined to be 64-bits. This code then also generates
+          and writes out the tables for the case that z_word_t is 32 bits.
+         */
+#if !defined(W) || W != 8
+#  error Need a 64-bit integer type in order to generate crc32.h.
+#endif
         FILE *out;
+        int k, n;
+        z_crc_t ltl[8][256];
+        z_word_t big[8][256];
 
         out = fopen("crc32.h", "w");
         if (out == NULL) return;
-        fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n");
-        fprintf(out, " * Generated automatically by crc32.c\n */\n\n");
-        fprintf(out, "local const z_crc_t FAR ");
-        fprintf(out, "crc_table[TBLS][256] =\n{\n  {\n");
-        write_table(out, crc_table[0]);
-#  ifdef BYFOUR
-        fprintf(out, "#ifdef BYFOUR\n");
-        for (k = 1; k < 8; k++) {
-            fprintf(out, "  },\n  {\n");
-            write_table(out, crc_table[k]);
+
+        /* write out little-endian CRC table to crc32.h */
+        fprintf(out,
+            "/* crc32.h -- tables for rapid CRC calculation\n"
+            " * Generated automatically by crc32.c\n */\n"
+            "\n"
+            "local const z_crc_t FAR crc_table[] = {\n"
+            "    ");
+        write_table(out, crc_table, 256);
+        fprintf(out,
+            "};\n");
+
+        /* write out big-endian CRC table for 64-bit z_word_t to crc32.h */
+        fprintf(out,
+            "\n"
+            "#ifdef W\n"
+            "\n"
+            "#if W == 8\n"
+            "\n"
+            "local const z_word_t FAR crc_big_table[] = {\n"
+            "    ");
+        write_table64(out, crc_big_table, 256);
+        fprintf(out,
+            "};\n");
+
+        /* write out big-endian CRC table for 32-bit z_word_t to crc32.h */
+        fprintf(out,
+            "\n"
+            "#else /* W == 4 */\n"
+            "\n"
+            "local const z_word_t FAR crc_big_table[] = {\n"
+            "    ");
+        write_table32hi(out, crc_big_table, 256);
+        fprintf(out,
+            "};\n"
+            "\n"
+            "#endif\n");
+
+        /* write out braid tables for each value of N */
+        for (n = 1; n <= 6; n++) {
+            fprintf(out,
+            "\n"
+            "#if N == %d\n", n);
+
+            /* compute braid tables for this N and 64-bit word_t */
+            braid(ltl, big, n, 8);
+
+            /* write out braid tables for 64-bit z_word_t to crc32.h */
+            fprintf(out,
+            "\n"
+            "#if W == 8\n"
+            "\n"
+            "local const z_crc_t FAR crc_braid_table[][256] = {\n");
+            for (k = 0; k < 8; k++) {
+                fprintf(out, "   {");
+                write_table(out, ltl[k], 256);
+                fprintf(out, "}%s", k < 7 ? ",\n" : "");
+            }
+            fprintf(out,
+            "};\n"
+            "\n"
+            "local const z_word_t FAR crc_braid_big_table[][256] = {\n");
+            for (k = 0; k < 8; k++) {
+                fprintf(out, "   {");
+                write_table64(out, big[k], 256);
+                fprintf(out, "}%s", k < 7 ? ",\n" : "");
+            }
+            fprintf(out,
+            "};\n");
+
+            /* compute braid tables for this N and 32-bit word_t */
+            braid(ltl, big, n, 4);
+
+            /* write out braid tables for 32-bit z_word_t to crc32.h */
+            fprintf(out,
+            "\n"
+            "#else /* W == 4 */\n"
+            "\n"
+            "local const z_crc_t FAR crc_braid_table[][256] = {\n");
+            for (k = 0; k < 4; k++) {
+                fprintf(out, "   {");
+                write_table(out, ltl[k], 256);
+                fprintf(out, "}%s", k < 3 ? ",\n" : "");
+            }
+            fprintf(out,
+            "};\n"
+            "\n"
+            "local const z_word_t FAR crc_braid_big_table[][256] = {\n");
+            for (k = 0; k < 4; k++) {
+                fprintf(out, "   {");
+                write_table32hi(out, big[k], 256);
+                fprintf(out, "}%s", k < 3 ? ",\n" : "");
+            }
+            fprintf(out,
+            "};\n"
+            "\n"
+            "#endif\n"
+            "\n"
+            "#endif\n");
         }
-        fprintf(out, "#endif\n");
-#  endif /* BYFOUR */
-        fprintf(out, "  }\n};\n");
+        fprintf(out,
+            "\n"
+            "#endif\n");
+
+        /* write out zeros operator table to crc32.h */
+        fprintf(out,
+            "\n"
+            "local const z_crc_t FAR x2n_table[] = {\n"
+            "    ");
+        write_table(out, x2n_table, 32);
+        fprintf(out,
+            "};\n");
         fclose(out);
     }
 #endif /* MAKECRCH */
 }
 
 #ifdef MAKECRCH
-local void write_table(out, table)
-    FILE *out;
-    const z_crc_t FAR *table;
-{
+
+/*
+   Write the 32-bit values in table[0..k-1] to out, five per line in
+   hexadecimal separated by commas.
+ */
+local void write_table(FILE *out, const z_crc_t FAR *table, int k) {
     int n;
 
-    for (n = 0; n < 256; n++)
-        fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : "    ",
+    for (n = 0; n < k; n++)
+        fprintf(out, "%s0x%08lx%s", n == 0 || n % 5 ? "" : "    ",
                 (unsigned long)(table[n]),
-                n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", "));
+                n == k - 1 ? "" : (n % 5 == 4 ? ",\n" : ", "));
+}
+
+/*
+   Write the high 32-bits of each value in table[0..k-1] to out, five per line
+   in hexadecimal separated by commas.
+ */
+local void write_table32hi(FILE *out, const z_word_t FAR *table, int k) {
+    int n;
+
+    for (n = 0; n < k; n++)
+        fprintf(out, "%s0x%08lx%s", n == 0 || n % 5 ? "" : "    ",
+                (unsigned long)(table[n] >> 32),
+                n == k - 1 ? "" : (n % 5 == 4 ? ",\n" : ", "));
 }
+
+/*
+  Write the 64-bit values in table[0..k-1] to out, three per line in
+  hexadecimal separated by commas. This assumes that if there is a 64-bit
+  type, then there is also a long long integer type, and it is at least 64
+  bits. If not, then the type cast and format string can be adjusted
+  accordingly.
+ */
+local void write_table64(FILE *out, const z_word_t FAR *table, int k) {
+    int n;
+
+    for (n = 0; n < k; n++)
+        fprintf(out, "%s0x%016llx%s", n == 0 || n % 3 ? "" : "    ",
+                (unsigned long long)(table[n]),
+                n == k - 1 ? "" : (n % 3 == 2 ? ",\n" : ", "));
+}
+
+/* Actually do the deed. */
+int main(void) {
+    make_crc_table();
+    return 0;
+}
+
 #endif /* MAKECRCH */
 
-#else /* !DYNAMIC_CRC_TABLE */
-/* ========================================================================
- * Tables of CRC-32s of all single-byte values, made by make_crc_table().
+#ifdef W
+/*
+  Generate the little and big-endian braid tables for the given n and z_word_t
+  size w. Each array must have room for w blocks of 256 elements.
  */
-#include "crc32.h"
+local void braid(z_crc_t ltl[][256], z_word_t big[][256], int n, int w) {
+    int k;
+    z_crc_t i, p, q;
+    for (k = 0; k < w; k++) {
+        p = x2nmodp((n * w + 3 - k) << 3, 0);
+        ltl[k][0] = 0;
+        big[w - 1 - k][0] = 0;
+        for (i = 1; i < 256; i++) {
+            ltl[k][i] = q = multmodp(i << 24, p);
+            big[w - 1 - k][i] = byte_swap(q);
+        }
+    }
+}
+#endif
+
 #endif /* DYNAMIC_CRC_TABLE */
 
 /* =========================================================================
- * This function can be used by asm versions of crc32()
+ * This function can be used by asm versions of crc32(), and to force the
+ * generation of the CRC tables in a threaded application.
  */
-const z_crc_t FAR * ZEXPORT get_crc_table()
-{
+const z_crc_t FAR * ZEXPORT get_crc_table(void) {
 #ifdef DYNAMIC_CRC_TABLE
-    if (crc_table_empty)
-        make_crc_table();
+    once(&made, make_crc_table);
 #endif /* DYNAMIC_CRC_TABLE */
     return (const z_crc_t FAR *)crc_table;
 }
 
-/* ========================================================================= */
-#define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8)
-#define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
+/* =========================================================================
+ * Use ARM machine instructions if available. This will compute the CRC about
+ * ten times faster than the braided calculation. This code does not check for
+ * the presence of the CRC instruction at run time. __ARM_FEATURE_CRC32 will
+ * only be defined if the compilation specifies an ARM processor architecture
+ * that has the instructions. For example, compiling with -march=armv8.1-a or
+ * -march=armv8-a+crc, or -march=native if the compile machine has the crc32
+ * instructions.
+ */
+#if ARMCRC32_CANONICAL_ZLIB
 
-/* ========================================================================= */
-unsigned long ZEXPORT crc32_z(crc, buf, len)
-    unsigned long crc;
-    const unsigned char FAR *buf;
-    z_size_t len;
-{
-    if (buf == Z_NULL) return 0UL;
+/*
+   Constants empirically determined to maximize speed. These values are from
+   measurements on a Cortex-A57. Your mileage may vary.
+ */
+#define Z_BATCH 3990                /* number of words in a batch */
+#define Z_BATCH_ZEROS 0xa10d3d0c    /* computed from Z_BATCH = 3990 */
+#define Z_BATCH_MIN 800             /* fewest words in a final batch */
+
+unsigned long ZEXPORT crc32_z(unsigned long crc, const unsigned char FAR *buf,
+                              z_size_t len) {
+    z_crc_t val;
+    z_word_t crc1, crc2;
+    const z_word_t *word;
+    z_word_t val0, val1, val2;
+    z_size_t last, last2, i;
+    z_size_t num;
+
+    /* Return initial CRC, if requested. */
+    if (buf == Z_NULL) return 0;
 
 #ifdef DYNAMIC_CRC_TABLE
-    if (crc_table_empty)
-        make_crc_table();
+    once(&made, make_crc_table);
 #endif /* DYNAMIC_CRC_TABLE */
 
-#ifdef BYFOUR
-    if (sizeof(void *) == sizeof(ptrdiff_t)) {
-        z_crc_t endian;
+    /* Pre-condition the CRC */
+    crc = (~crc) & 0xffffffff;
 
-        endian = 1;
-        if (*((unsigned char *)(&endian)))
-            return crc32_little(crc, buf, len);
-        else
-            return crc32_big(crc, buf, len);
+    /* Compute the CRC up to a word boundary. */
+    while (len && ((z_size_t)buf & 7) != 0) {
+        len--;
+        val = *buf++;
+        __asm__ volatile("crc32b %w0, %w0, %w1" : "+r"(crc) : "r"(val));
     }
-#endif /* BYFOUR */
-    crc = crc ^ 0xffffffffUL;
-    while (len >= 8) {
-        DO8;
-        len -= 8;
+
+    /* Prepare to compute the CRC on full 64-bit words word[0..num-1]. */
+    word = (z_word_t const *)buf;
+    num = len >> 3;
+    len &= 7;
+
+    /* Do three interleaved CRCs to realize the throughput of one crc32x
+       instruction per cycle. Each CRC is calculated on Z_BATCH words. The
+       three CRCs are combined into a single CRC after each set of batches. */
+    while (num >= 3 * Z_BATCH) {
+        crc1 = 0;
+        crc2 = 0;
+        for (i = 0; i < Z_BATCH; i++) {
+            val0 = word[i];
+            val1 = word[i + Z_BATCH];
+            val2 = word[i + 2 * Z_BATCH];
+            __asm__ volatile("crc32x %w0, %w0, %x1" : "+r"(crc) : "r"(val0));
+            __asm__ volatile("crc32x %w0, %w0, %x1" : "+r"(crc1) : "r"(val1));
+            __asm__ volatile("crc32x %w0, %w0, %x1" : "+r"(crc2) : "r"(val2));
+        }
+        word += 3 * Z_BATCH;
+        num -= 3 * Z_BATCH;
+        crc = multmodp(Z_BATCH_ZEROS, crc) ^ crc1;
+        crc = multmodp(Z_BATCH_ZEROS, crc) ^ crc2;
     }
-    if (len) do {
-        DO1;
-    } while (--len);
-    return crc ^ 0xffffffffUL;
-}
 
-/* ========================================================================= */
-unsigned long ZEXPORT crc32(crc, buf, len)
-    unsigned long crc;
-    const unsigned char FAR *buf;
-    uInt len;
-{
-    return crc32_z(crc, buf, len);
+    /* Do one last smaller batch with the remaining words, if there are enough
+       to pay for the combination of CRCs. */
+    last = num / 3;
+    if (last >= Z_BATCH_MIN) {
+        last2 = last << 1;
+        crc1 = 0;
+        crc2 = 0;
+        for (i = 0; i < last; i++) {
+            val0 = word[i];
+            val1 = word[i + last];
+            val2 = word[i + last2];
+            __asm__ volatile("crc32x %w0, %w0, %x1" : "+r"(crc) : "r"(val0));
+            __asm__ volatile("crc32x %w0, %w0, %x1" : "+r"(crc1) : "r"(val1));
+            __asm__ volatile("crc32x %w0, %w0, %x1" : "+r"(crc2) : "r"(val2));
+        }
+        word += 3 * last;
+        num -= 3 * last;
+        val = x2nmodp(last, 6);
+        crc = multmodp(val, crc) ^ crc1;
+        crc = multmodp(val, crc) ^ crc2;
+    }
+
+    /* Compute the CRC on any remaining words. */
+    for (i = 0; i < num; i++) {
+        val0 = word[i];
+        __asm__ volatile("crc32x %w0, %w0, %x1" : "+r"(crc) : "r"(val0));
+    }
+    word += num;
+
+    /* Complete the CRC on any remaining bytes. */
+    buf = (const unsigned char FAR *)word;
+    while (len) {
+        len--;
+        val = *buf++;
+        __asm__ volatile("crc32b %w0, %w0, %w1" : "+r"(crc) : "r"(val));
+    }
+
+    /* Return the CRC, post-conditioned. */
+    return crc ^ 0xffffffff;
 }
 
-#ifdef BYFOUR
+#else
+
+#ifdef W
 
 /*
-   This BYFOUR code accesses the passed unsigned char * buffer with a 32-bit
-   integer pointer type. This violates the strict aliasing rule, where a
-   compiler can assume, for optimization purposes, that two pointers to
-   fundamentally different types won't ever point to the same memory. This can
-   manifest as a problem only if one of the pointers is written to. This code
-   only reads from those pointers. So long as this code remains isolated in
-   this compilation unit, there won't be a problem. For this reason, this code
-   should not be copied and pasted into a compilation unit in which other code
-   writes to the buffer that is passed to these routines.
+  Return the CRC of the W bytes in the word_t data, taking the
+  least-significant byte of the word as the first byte of data, without any pre
+  or post conditioning. This is used to combine the CRCs of each braid.
  */
+local z_crc_t crc_word(z_word_t data) {
+    int k;
+    for (k = 0; k < W; k++)
+        data = (data >> 8) ^ crc_table[data & 0xff];
+    return (z_crc_t)data;
+}
 
-/* ========================================================================= */
-#define DOLIT4 c ^= *buf4++; \
-        c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \
-            crc_table[1][(c >> 16) & 0xff] ^ crc_table[0][c >> 24]
-#define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4
+local z_word_t crc_word_big(z_word_t data) {
+    int k;
+    for (k = 0; k < W; k++)
+        data = (data << 8) ^
+            crc_big_table[(data >> ((W - 1) << 3)) & 0xff];
+    return data;
+}
+
+#endif
 
 /* ========================================================================= */
-local unsigned long crc32_little(crc, buf, len)
-    unsigned long crc;
-    const unsigned char FAR *buf;
-    z_size_t len;
-{
-    register z_crc_t c;
-    register const z_crc_t FAR *buf4;
+unsigned long ZEXPORT crc32_z(unsigned long crc, const unsigned char FAR *buf,
+                              z_size_t len) {
+    /*
+     * zlib convention is to call crc32(0, NULL, 0); before making
+     * calls to crc32(). So this is a good, early (and infrequent)
+     * place to cache CPU features if needed for those later, more
+     * interesting crc32() calls.
+     */
+#if defined(CRC32_SIMD_SSE42_PCLMUL) || defined(CRC32_ARMV8_CRC32)
+    /*
+     * Since this routine can be freely used, check CPU features here.
+     */
+    if (buf == Z_NULL) {
+        if (!len) /* Assume user is calling crc32(0, NULL, 0); */
+            cpu_check_features();
+        return 0UL;
+    }
 
-    c = (z_crc_t)crc;
-    c = ~c;
-    while (len && ((ptrdiff_t)buf & 3)) {
-        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
-        len--;
+#endif
+#if defined(CRC32_SIMD_AVX512_PCLMUL)
+    if (x86_cpu_enable_avx512 && len >= Z_CRC32_AVX512_MINIMUM_LENGTH) {
+        /* crc32 64-byte chunks */
+        z_size_t chunk_size = len & ~Z_CRC32_AVX512_CHUNKSIZE_MASK;
+        crc = ~crc32_avx512_simd_(buf, chunk_size, ~(uint32_t)crc);
+        /* check remaining data */
+        len -= chunk_size;
+        if (!len)
+            return crc;
+        /* Fall into the default crc32 for the remaining data. */
+        buf += chunk_size;
+    }
+#elif defined(CRC32_SIMD_SSE42_PCLMUL)
+    if (x86_cpu_enable_simd && len >= Z_CRC32_SSE42_MINIMUM_LENGTH) {
+        /* crc32 16-byte chunks */
+        z_size_t chunk_size = len & ~Z_CRC32_SSE42_CHUNKSIZE_MASK;
+        crc = ~crc32_sse42_simd_(buf, chunk_size, ~(uint32_t)crc);
+        /* check remaining data */
+        len -= chunk_size;
+        if (!len)
+            return crc;
+        /* Fall into the default crc32 for the remaining data. */
+        buf += chunk_size;
     }
+#elif defined(CRC32_ARMV8_CRC32)
+    if (arm_cpu_enable_crc32) {
+#if defined(__aarch64__)
+        /* PMULL is 64bit only, plus code needs at least a 64 bytes buffer. */
+        if (arm_cpu_enable_pmull && (len > Z_CRC32_PMULL_MINIMUM_LENGTH)) {
+            const size_t chunk_size = len & ~Z_CRC32_PMULL_CHUNKSIZE_MASK;
+            crc = ~armv8_crc32_pmull_little(buf, chunk_size, ~(uint32_t)crc);
+            /* Check remaining data. */
+            len -= chunk_size;
+            if (!len)
+                return crc;
 
-    buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
-    while (len >= 32) {
-        DOLIT32;
-        len -= 32;
+            /* Fall through for the remaining data. */
+            buf += chunk_size;
+        }
+#endif
+        return armv8_crc32_little(buf, len, crc); /* Armv8@32bit or tail. */
     }
-    while (len >= 4) {
-        DOLIT4;
-        len -= 4;
+#else
+    if (buf == Z_NULL) {
+        return 0UL;
     }
-    buf = (const unsigned char FAR *)buf4;
+#endif /* CRC32_SIMD */
 
-    if (len) do {
-        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
-    } while (--len);
-    c = ~c;
-    return (unsigned long)c;
-}
+#ifdef DYNAMIC_CRC_TABLE
+    once(&made, make_crc_table);
+#endif /* DYNAMIC_CRC_TABLE */
+    /* Pre-condition the CRC */
+    crc = (~crc) & 0xffffffff;
 
-/* ========================================================================= */
-#define DOBIG4 c ^= *buf4++; \
-        c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \
-            crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24]
-#define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4
+#ifdef W
 
-/* ========================================================================= */
-local unsigned long crc32_big(crc, buf, len)
-    unsigned long crc;
-    const unsigned char FAR *buf;
-    z_size_t len;
-{
-    register z_crc_t c;
-    register const z_crc_t FAR *buf4;
+    /* If provided enough bytes, do a braided CRC calculation. */
+    if (len >= N * W + W - 1) {
+        z_size_t blks;
+        z_word_t const *words;
+        unsigned endian;
+        int k;
 
-    c = ZSWAP32((z_crc_t)crc);
-    c = ~c;
-    while (len && ((ptrdiff_t)buf & 3)) {
-        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
-        len--;
+        /* Compute the CRC up to a z_word_t boundary. */
+        while (len && ((z_size_t)buf & (W - 1)) != 0) {
+            len--;
+            crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+        }
+
+        /* Compute the CRC on as many N z_word_t blocks as are available. */
+        blks = len / (N * W);
+        len -= blks * N * W;
+        words = (z_word_t const *)buf;
+
+        /* Do endian check at execution time instead of compile time, since ARM
+           processors can change the endianess at execution time. If the
+           compiler knows what the endianess will be, it can optimize out the
+           check and the unused branch. */
+        endian = 1;
+        if (*(unsigned char *)&endian) {
+            /* Little endian. */
+
+            z_crc_t crc0;
+            z_word_t word0;
+#if N > 1
+            z_crc_t crc1;
+            z_word_t word1;
+#if N > 2
+            z_crc_t crc2;
+            z_word_t word2;
+#if N > 3
+            z_crc_t crc3;
+            z_word_t word3;
+#if N > 4
+            z_crc_t crc4;
+            z_word_t word4;
+#if N > 5
+            z_crc_t crc5;
+            z_word_t word5;
+#endif
+#endif
+#endif
+#endif
+#endif
+
+            /* Initialize the CRC for each braid. */
+            crc0 = crc;
+#if N > 1
+            crc1 = 0;
+#if N > 2
+            crc2 = 0;
+#if N > 3
+            crc3 = 0;
+#if N > 4
+            crc4 = 0;
+#if N > 5
+            crc5 = 0;
+#endif
+#endif
+#endif
+#endif
+#endif
+
+            /*
+              Process the first blks-1 blocks, computing the CRCs on each braid
+              independently.
+             */
+            while (--blks) {
+                /* Load the word for each braid into registers. */
+                word0 = crc0 ^ words[0];
+#if N > 1
+                word1 = crc1 ^ words[1];
+#if N > 2
+                word2 = crc2 ^ words[2];
+#if N > 3
+                word3 = crc3 ^ words[3];
+#if N > 4
+                word4 = crc4 ^ words[4];
+#if N > 5
+                word5 = crc5 ^ words[5];
+#endif
+#endif
+#endif
+#endif
+#endif
+                words += N;
+
+                /* Compute and update the CRC for each word. The loop should
+                   get unrolled. */
+                crc0 = crc_braid_table[0][word0 & 0xff];
+#if N > 1
+                crc1 = crc_braid_table[0][word1 & 0xff];
+#if N > 2
+                crc2 = crc_braid_table[0][word2 & 0xff];
+#if N > 3
+                crc3 = crc_braid_table[0][word3 & 0xff];
+#if N > 4
+                crc4 = crc_braid_table[0][word4 & 0xff];
+#if N > 5
+                crc5 = crc_braid_table[0][word5 & 0xff];
+#endif
+#endif
+#endif
+#endif
+#endif
+                for (k = 1; k < W; k++) {
+                    crc0 ^= crc_braid_table[k][(word0 >> (k << 3)) & 0xff];
+#if N > 1
+                    crc1 ^= crc_braid_table[k][(word1 >> (k << 3)) & 0xff];
+#if N > 2
+                    crc2 ^= crc_braid_table[k][(word2 >> (k << 3)) & 0xff];
+#if N > 3
+                    crc3 ^= crc_braid_table[k][(word3 >> (k << 3)) & 0xff];
+#if N > 4
+                    crc4 ^= crc_braid_table[k][(word4 >> (k << 3)) & 0xff];
+#if N > 5
+                    crc5 ^= crc_braid_table[k][(word5 >> (k << 3)) & 0xff];
+#endif
+#endif
+#endif
+#endif
+#endif
+                }
+            }
+
+            /*
+              Process the last block, combining the CRCs of the N braids at the
+              same time.
+             */
+            crc = crc_word(crc0 ^ words[0]);
+#if N > 1
+            crc = crc_word(crc1 ^ words[1] ^ crc);
+#if N > 2
+            crc = crc_word(crc2 ^ words[2] ^ crc);
+#if N > 3
+            crc = crc_word(crc3 ^ words[3] ^ crc);
+#if N > 4
+            crc = crc_word(crc4 ^ words[4] ^ crc);
+#if N > 5
+            crc = crc_word(crc5 ^ words[5] ^ crc);
+#endif
+#endif
+#endif
+#endif
+#endif
+            words += N;
+        }
+        else {
+            /* Big endian. */
+
+            z_word_t crc0, word0, comb;
+#if N > 1
+            z_word_t crc1, word1;
+#if N > 2
+            z_word_t crc2, word2;
+#if N > 3
+            z_word_t crc3, word3;
+#if N > 4
+            z_word_t crc4, word4;
+#if N > 5
+            z_word_t crc5, word5;
+#endif
+#endif
+#endif
+#endif
+#endif
+
+            /* Initialize the CRC for each braid. */
+            crc0 = byte_swap(crc);
+#if N > 1
+            crc1 = 0;
+#if N > 2
+            crc2 = 0;
+#if N > 3
+            crc3 = 0;
+#if N > 4
+            crc4 = 0;
+#if N > 5
+            crc5 = 0;
+#endif
+#endif
+#endif
+#endif
+#endif
+
+            /*
+              Process the first blks-1 blocks, computing the CRCs on each braid
+              independently.
+             */
+            while (--blks) {
+                /* Load the word for each braid into registers. */
+                word0 = crc0 ^ words[0];
+#if N > 1
+                word1 = crc1 ^ words[1];
+#if N > 2
+                word2 = crc2 ^ words[2];
+#if N > 3
+                word3 = crc3 ^ words[3];
+#if N > 4
+                word4 = crc4 ^ words[4];
+#if N > 5
+                word5 = crc5 ^ words[5];
+#endif
+#endif
+#endif
+#endif
+#endif
+                words += N;
+
+                /* Compute and update the CRC for each word. The loop should
+                   get unrolled. */
+                crc0 = crc_braid_big_table[0][word0 & 0xff];
+#if N > 1
+                crc1 = crc_braid_big_table[0][word1 & 0xff];
+#if N > 2
+                crc2 = crc_braid_big_table[0][word2 & 0xff];
+#if N > 3
+                crc3 = crc_braid_big_table[0][word3 & 0xff];
+#if N > 4
+                crc4 = crc_braid_big_table[0][word4 & 0xff];
+#if N > 5
+                crc5 = crc_braid_big_table[0][word5 & 0xff];
+#endif
+#endif
+#endif
+#endif
+#endif
+                for (k = 1; k < W; k++) {
+                    crc0 ^= crc_braid_big_table[k][(word0 >> (k << 3)) & 0xff];
+#if N > 1
+                    crc1 ^= crc_braid_big_table[k][(word1 >> (k << 3)) & 0xff];
+#if N > 2
+                    crc2 ^= crc_braid_big_table[k][(word2 >> (k << 3)) & 0xff];
+#if N > 3
+                    crc3 ^= crc_braid_big_table[k][(word3 >> (k << 3)) & 0xff];
+#if N > 4
+                    crc4 ^= crc_braid_big_table[k][(word4 >> (k << 3)) & 0xff];
+#if N > 5
+                    crc5 ^= crc_braid_big_table[k][(word5 >> (k << 3)) & 0xff];
+#endif
+#endif
+#endif
+#endif
+#endif
+                }
+            }
+
+            /*
+              Process the last block, combining the CRCs of the N braids at the
+              same time.
+             */
+            comb = crc_word_big(crc0 ^ words[0]);
+#if N > 1
+            comb = crc_word_big(crc1 ^ words[1] ^ comb);
+#if N > 2
+            comb = crc_word_big(crc2 ^ words[2] ^ comb);
+#if N > 3
+            comb = crc_word_big(crc3 ^ words[3] ^ comb);
+#if N > 4
+            comb = crc_word_big(crc4 ^ words[4] ^ comb);
+#if N > 5
+            comb = crc_word_big(crc5 ^ words[5] ^ comb);
+#endif
+#endif
+#endif
+#endif
+#endif
+            words += N;
+            crc = byte_swap(comb);
+        }
+
+        /*
+          Update the pointer to the remaining bytes to process.
+         */
+        buf = (unsigned char const *)words;
     }
 
-    buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
-    while (len >= 32) {
-        DOBIG32;
-        len -= 32;
+#endif /* W */
+
+    /* Complete the computation of the CRC on any remaining bytes. */
+    while (len >= 8) {
+        len -= 8;
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
     }
-    while (len >= 4) {
-        DOBIG4;
-        len -= 4;
+    while (len) {
+        len--;
+        crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
     }
-    buf = (const unsigned char FAR *)buf4;
 
-    if (len) do {
-        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
-    } while (--len);
-    c = ~c;
-    return (unsigned long)(ZSWAP32(c));
+    /* Return the CRC, post-conditioned. */
+    return crc ^ 0xffffffff;
 }
 
-#endif /* BYFOUR */
-
-#define GF2_DIM 32      /* dimension of GF(2) vectors (length of CRC) */
+#endif
 
 /* ========================================================================= */
-local unsigned long gf2_matrix_times(mat, vec)
-    unsigned long *mat;
-    unsigned long vec;
-{
-    unsigned long sum;
-
-    sum = 0;
-    while (vec) {
-        if (vec & 1)
-            sum ^= *mat;
-        vec >>= 1;
-        mat++;
+unsigned long ZEXPORT crc32(unsigned long crc, const unsigned char FAR *buf,
+                            uInt len) {
+    /* Some bots compile with optimizations disabled, others will emulate
+     * ARM on x86 and other weird combinations.
+     */
+#if defined(CRC32_SIMD_SSE42_PCLMUL) || defined(CRC32_ARMV8_CRC32)
+    /* We got to verify CPU features, so exploit the common usage pattern
+     * of calling this function with Z_NULL for an initial valid crc value.
+     * This allows to cache the result of the feature check and avoid extraneous
+     * function calls.
+     */
+    if (buf == Z_NULL) {
+        if (!len) /* Assume user is calling crc32(0, NULL, 0); */
+            cpu_check_features();
+        return 0UL;
     }
-    return sum;
-}
+#endif
 
-/* ========================================================================= */
-local void gf2_matrix_square(square, mat)
-    unsigned long *square;
-    unsigned long *mat;
-{
-    int n;
+#if defined(CRC32_ARMV8_CRC32)
+    if (arm_cpu_enable_crc32) {
+#if defined(__aarch64__)
+        /* PMULL is 64bit only, plus code needs at least a 64 bytes buffer. */
+        if (arm_cpu_enable_pmull && (len > Z_CRC32_PMULL_MINIMUM_LENGTH)) {
+            const size_t chunk_size = len & ~Z_CRC32_PMULL_CHUNKSIZE_MASK;
+            crc = ~armv8_crc32_pmull_little(buf, chunk_size, ~(uint32_t)crc);
+            /* Check remaining data. */
+            len -= chunk_size;
+            if (!len)
+                return crc;
 
-    for (n = 0; n < GF2_DIM; n++)
-        square[n] = gf2_matrix_times(mat, mat[n]);
+            /* Fall through for the remaining data. */
+            buf += chunk_size;
+        }
+#endif
+        return armv8_crc32_little(buf, len, crc); /* Armv8@32bit or tail. */
+    }
+#endif
+    return crc32_z(crc, buf, len); /* Armv7 or Armv8 w/o crypto extensions. */
 }
 
 /* ========================================================================= */
-local uLong crc32_combine_(crc1, crc2, len2)
-    uLong crc1;
-    uLong crc2;
-    z_off64_t len2;
-{
-    int n;
-    unsigned long row;
-    unsigned long even[GF2_DIM];    /* even-power-of-two zeros operator */
-    unsigned long odd[GF2_DIM];     /* odd-power-of-two zeros operator */
-
-    /* degenerate case (also disallow negative lengths) */
-    if (len2 <= 0)
-        return crc1;
-
-    /* put operator for one zero bit in odd */
-    odd[0] = 0xedb88320UL;          /* CRC-32 polynomial */
-    row = 1;
-    for (n = 1; n < GF2_DIM; n++) {
-        odd[n] = row;
-        row <<= 1;
-    }
+uLong ZEXPORT crc32_combine64(uLong crc1, uLong crc2, z_off64_t len2) {
+#ifdef DYNAMIC_CRC_TABLE
+    once(&made, make_crc_table);
+#endif /* DYNAMIC_CRC_TABLE */
+    return multmodp(x2nmodp(len2, 3), crc1) ^ (crc2 & 0xffffffff);
+}
 
-    /* put operator for two zero bits in even */
-    gf2_matrix_square(even, odd);
-
-    /* put operator for four zero bits in odd */
-    gf2_matrix_square(odd, even);
-
-    /* apply len2 zeros to crc1 (first square will put the operator for one
-       zero byte, eight zero bits, in even) */
-    do {
-        /* apply zeros operator for this bit of len2 */
-        gf2_matrix_square(even, odd);
-        if (len2 & 1)
-            crc1 = gf2_matrix_times(even, crc1);
-        len2 >>= 1;
-
-        /* if no more bits set, then done */
-        if (len2 == 0)
-            break;
-
-        /* another iteration of the loop with odd and even swapped */
-        gf2_matrix_square(odd, even);
-        if (len2 & 1)
-            crc1 = gf2_matrix_times(odd, crc1);
-        len2 >>= 1;
-
-        /* if no more bits set, then done */
-    } while (len2 != 0);
-
-    /* return combined crc */
-    crc1 ^= crc2;
-    return crc1;
+/* ========================================================================= */
+uLong ZEXPORT crc32_combine(uLong crc1, uLong crc2, z_off_t len2) {
+    return crc32_combine64(crc1, crc2, (z_off64_t)len2);
+}
+/* ========================================================================= */
+uLong ZEXPORT crc32_combine_gen64(z_off64_t len2) {
+#ifdef DYNAMIC_CRC_TABLE
+    once(&made, make_crc_table);
+#endif /* DYNAMIC_CRC_TABLE */
+    return x2nmodp(len2, 3);
 }
 
 /* ========================================================================= */
-uLong ZEXPORT crc32_combine(crc1, crc2, len2)
-    uLong crc1;
-    uLong crc2;
-    z_off_t len2;
-{
-    return crc32_combine_(crc1, crc2, len2);
+uLong ZEXPORT crc32_combine_gen(z_off_t len2) {
+    return crc32_combine_gen64((z_off64_t)len2);
 }
 
-uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
-    uLong crc1;
-    uLong crc2;
-    z_off64_t len2;
-{
-    return crc32_combine_(crc1, crc2, len2);
+/* ========================================================================= */
+uLong ZEXPORT crc32_combine_op(uLong crc1, uLong crc2, uLong op) {
+    return multmodp(op, crc1) ^ (crc2 & 0xffffffff);
 }
 
 ZLIB_INTERNAL void crc_reset(deflate_state *const s)
 {
+#ifdef CRC32_SIMD_SSE42_PCLMUL
     if (x86_cpu_enable_simd) {
         crc_fold_init(s);
         return;
     }
+#endif
     s->strm->adler = crc32(0L, Z_NULL, 0);
 }
 
 ZLIB_INTERNAL void crc_finalize(deflate_state *const s)
 {
+#ifdef CRC32_SIMD_SSE42_PCLMUL
     if (x86_cpu_enable_simd)
         s->strm->adler = crc_fold_512to32(s);
+#endif
 }
 
 ZLIB_INTERNAL void copy_with_crc(z_streamp strm, Bytef *dst, long size)
 {
+#ifdef CRC32_SIMD_SSE42_PCLMUL
     if (x86_cpu_enable_simd) {
         crc_fold_copy(strm->state, dst, strm->next_in, size);
         return;
     }
+#endif
     zmemcpy(dst, strm->next_in, size);
     strm->adler = crc32(strm->adler, dst, size);
 }
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/crc32.h b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/crc32.h
index 9e0c77810..137df68d6 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/crc32.h
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/crc32.h
@@ -2,440 +2,9445 @@
  * Generated automatically by crc32.c
  */
 
-local const z_crc_t FAR crc_table[TBLS][256] =
-{
-  {
-    0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,
-    0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL,
-    0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL,
-    0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL,
-    0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL,
-    0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL,
-    0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL,
-    0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL,
-    0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL,
-    0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL,
-    0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL,
-    0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL,
-    0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL,
-    0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL,
-    0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL,
-    0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL,
-    0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL,
-    0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL,
-    0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL,
-    0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL,
-    0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL,
-    0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL,
-    0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL,
-    0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL,
-    0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL,
-    0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL,
-    0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL,
-    0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL,
-    0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL,
-    0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL,
-    0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL,
-    0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL,
-    0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL,
-    0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL,
-    0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL,
-    0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL,
-    0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL,
-    0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL,
-    0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL,
-    0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL,
-    0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL,
-    0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL,
-    0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL,
-    0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL,
-    0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL,
-    0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL,
-    0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL,
-    0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL,
-    0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL,
-    0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
-    0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
-    0x2d02ef8dUL
-#ifdef BYFOUR
-  },
-  {
-    0x00000000UL, 0x191b3141UL, 0x32366282UL, 0x2b2d53c3UL, 0x646cc504UL,
-    0x7d77f445UL, 0x565aa786UL, 0x4f4196c7UL, 0xc8d98a08UL, 0xd1c2bb49UL,
-    0xfaefe88aUL, 0xe3f4d9cbUL, 0xacb54f0cUL, 0xb5ae7e4dUL, 0x9e832d8eUL,
-    0x87981ccfUL, 0x4ac21251UL, 0x53d92310UL, 0x78f470d3UL, 0x61ef4192UL,
-    0x2eaed755UL, 0x37b5e614UL, 0x1c98b5d7UL, 0x05838496UL, 0x821b9859UL,
-    0x9b00a918UL, 0xb02dfadbUL, 0xa936cb9aUL, 0xe6775d5dUL, 0xff6c6c1cUL,
-    0xd4413fdfUL, 0xcd5a0e9eUL, 0x958424a2UL, 0x8c9f15e3UL, 0xa7b24620UL,
-    0xbea97761UL, 0xf1e8e1a6UL, 0xe8f3d0e7UL, 0xc3de8324UL, 0xdac5b265UL,
-    0x5d5daeaaUL, 0x44469febUL, 0x6f6bcc28UL, 0x7670fd69UL, 0x39316baeUL,
-    0x202a5aefUL, 0x0b07092cUL, 0x121c386dUL, 0xdf4636f3UL, 0xc65d07b2UL,
-    0xed705471UL, 0xf46b6530UL, 0xbb2af3f7UL, 0xa231c2b6UL, 0x891c9175UL,
-    0x9007a034UL, 0x179fbcfbUL, 0x0e848dbaUL, 0x25a9de79UL, 0x3cb2ef38UL,
-    0x73f379ffUL, 0x6ae848beUL, 0x41c51b7dUL, 0x58de2a3cUL, 0xf0794f05UL,
-    0xe9627e44UL, 0xc24f2d87UL, 0xdb541cc6UL, 0x94158a01UL, 0x8d0ebb40UL,
-    0xa623e883UL, 0xbf38d9c2UL, 0x38a0c50dUL, 0x21bbf44cUL, 0x0a96a78fUL,
-    0x138d96ceUL, 0x5ccc0009UL, 0x45d73148UL, 0x6efa628bUL, 0x77e153caUL,
-    0xbabb5d54UL, 0xa3a06c15UL, 0x888d3fd6UL, 0x91960e97UL, 0xded79850UL,
-    0xc7cca911UL, 0xece1fad2UL, 0xf5facb93UL, 0x7262d75cUL, 0x6b79e61dUL,
-    0x4054b5deUL, 0x594f849fUL, 0x160e1258UL, 0x0f152319UL, 0x243870daUL,
-    0x3d23419bUL, 0x65fd6ba7UL, 0x7ce65ae6UL, 0x57cb0925UL, 0x4ed03864UL,
-    0x0191aea3UL, 0x188a9fe2UL, 0x33a7cc21UL, 0x2abcfd60UL, 0xad24e1afUL,
-    0xb43fd0eeUL, 0x9f12832dUL, 0x8609b26cUL, 0xc94824abUL, 0xd05315eaUL,
-    0xfb7e4629UL, 0xe2657768UL, 0x2f3f79f6UL, 0x362448b7UL, 0x1d091b74UL,
-    0x04122a35UL, 0x4b53bcf2UL, 0x52488db3UL, 0x7965de70UL, 0x607eef31UL,
-    0xe7e6f3feUL, 0xfefdc2bfUL, 0xd5d0917cUL, 0xcccba03dUL, 0x838a36faUL,
-    0x9a9107bbUL, 0xb1bc5478UL, 0xa8a76539UL, 0x3b83984bUL, 0x2298a90aUL,
-    0x09b5fac9UL, 0x10aecb88UL, 0x5fef5d4fUL, 0x46f46c0eUL, 0x6dd93fcdUL,
-    0x74c20e8cUL, 0xf35a1243UL, 0xea412302UL, 0xc16c70c1UL, 0xd8774180UL,
-    0x9736d747UL, 0x8e2de606UL, 0xa500b5c5UL, 0xbc1b8484UL, 0x71418a1aUL,
-    0x685abb5bUL, 0x4377e898UL, 0x5a6cd9d9UL, 0x152d4f1eUL, 0x0c367e5fUL,
-    0x271b2d9cUL, 0x3e001cddUL, 0xb9980012UL, 0xa0833153UL, 0x8bae6290UL,
-    0x92b553d1UL, 0xddf4c516UL, 0xc4eff457UL, 0xefc2a794UL, 0xf6d996d5UL,
-    0xae07bce9UL, 0xb71c8da8UL, 0x9c31de6bUL, 0x852aef2aUL, 0xca6b79edUL,
-    0xd37048acUL, 0xf85d1b6fUL, 0xe1462a2eUL, 0x66de36e1UL, 0x7fc507a0UL,
-    0x54e85463UL, 0x4df36522UL, 0x02b2f3e5UL, 0x1ba9c2a4UL, 0x30849167UL,
-    0x299fa026UL, 0xe4c5aeb8UL, 0xfdde9ff9UL, 0xd6f3cc3aUL, 0xcfe8fd7bUL,
-    0x80a96bbcUL, 0x99b25afdUL, 0xb29f093eUL, 0xab84387fUL, 0x2c1c24b0UL,
-    0x350715f1UL, 0x1e2a4632UL, 0x07317773UL, 0x4870e1b4UL, 0x516bd0f5UL,
-    0x7a468336UL, 0x635db277UL, 0xcbfad74eUL, 0xd2e1e60fUL, 0xf9ccb5ccUL,
-    0xe0d7848dUL, 0xaf96124aUL, 0xb68d230bUL, 0x9da070c8UL, 0x84bb4189UL,
-    0x03235d46UL, 0x1a386c07UL, 0x31153fc4UL, 0x280e0e85UL, 0x674f9842UL,
-    0x7e54a903UL, 0x5579fac0UL, 0x4c62cb81UL, 0x8138c51fUL, 0x9823f45eUL,
-    0xb30ea79dUL, 0xaa1596dcUL, 0xe554001bUL, 0xfc4f315aUL, 0xd7626299UL,
-    0xce7953d8UL, 0x49e14f17UL, 0x50fa7e56UL, 0x7bd72d95UL, 0x62cc1cd4UL,
-    0x2d8d8a13UL, 0x3496bb52UL, 0x1fbbe891UL, 0x06a0d9d0UL, 0x5e7ef3ecUL,
-    0x4765c2adUL, 0x6c48916eUL, 0x7553a02fUL, 0x3a1236e8UL, 0x230907a9UL,
-    0x0824546aUL, 0x113f652bUL, 0x96a779e4UL, 0x8fbc48a5UL, 0xa4911b66UL,
-    0xbd8a2a27UL, 0xf2cbbce0UL, 0xebd08da1UL, 0xc0fdde62UL, 0xd9e6ef23UL,
-    0x14bce1bdUL, 0x0da7d0fcUL, 0x268a833fUL, 0x3f91b27eUL, 0x70d024b9UL,
-    0x69cb15f8UL, 0x42e6463bUL, 0x5bfd777aUL, 0xdc656bb5UL, 0xc57e5af4UL,
-    0xee530937UL, 0xf7483876UL, 0xb809aeb1UL, 0xa1129ff0UL, 0x8a3fcc33UL,
-    0x9324fd72UL
-  },
-  {
-    0x00000000UL, 0x01c26a37UL, 0x0384d46eUL, 0x0246be59UL, 0x0709a8dcUL,
-    0x06cbc2ebUL, 0x048d7cb2UL, 0x054f1685UL, 0x0e1351b8UL, 0x0fd13b8fUL,
-    0x0d9785d6UL, 0x0c55efe1UL, 0x091af964UL, 0x08d89353UL, 0x0a9e2d0aUL,
-    0x0b5c473dUL, 0x1c26a370UL, 0x1de4c947UL, 0x1fa2771eUL, 0x1e601d29UL,
-    0x1b2f0bacUL, 0x1aed619bUL, 0x18abdfc2UL, 0x1969b5f5UL, 0x1235f2c8UL,
-    0x13f798ffUL, 0x11b126a6UL, 0x10734c91UL, 0x153c5a14UL, 0x14fe3023UL,
-    0x16b88e7aUL, 0x177ae44dUL, 0x384d46e0UL, 0x398f2cd7UL, 0x3bc9928eUL,
-    0x3a0bf8b9UL, 0x3f44ee3cUL, 0x3e86840bUL, 0x3cc03a52UL, 0x3d025065UL,
-    0x365e1758UL, 0x379c7d6fUL, 0x35dac336UL, 0x3418a901UL, 0x3157bf84UL,
-    0x3095d5b3UL, 0x32d36beaUL, 0x331101ddUL, 0x246be590UL, 0x25a98fa7UL,
-    0x27ef31feUL, 0x262d5bc9UL, 0x23624d4cUL, 0x22a0277bUL, 0x20e69922UL,
-    0x2124f315UL, 0x2a78b428UL, 0x2bbade1fUL, 0x29fc6046UL, 0x283e0a71UL,
-    0x2d711cf4UL, 0x2cb376c3UL, 0x2ef5c89aUL, 0x2f37a2adUL, 0x709a8dc0UL,
-    0x7158e7f7UL, 0x731e59aeUL, 0x72dc3399UL, 0x7793251cUL, 0x76514f2bUL,
-    0x7417f172UL, 0x75d59b45UL, 0x7e89dc78UL, 0x7f4bb64fUL, 0x7d0d0816UL,
-    0x7ccf6221UL, 0x798074a4UL, 0x78421e93UL, 0x7a04a0caUL, 0x7bc6cafdUL,
-    0x6cbc2eb0UL, 0x6d7e4487UL, 0x6f38fadeUL, 0x6efa90e9UL, 0x6bb5866cUL,
-    0x6a77ec5bUL, 0x68315202UL, 0x69f33835UL, 0x62af7f08UL, 0x636d153fUL,
-    0x612bab66UL, 0x60e9c151UL, 0x65a6d7d4UL, 0x6464bde3UL, 0x662203baUL,
-    0x67e0698dUL, 0x48d7cb20UL, 0x4915a117UL, 0x4b531f4eUL, 0x4a917579UL,
-    0x4fde63fcUL, 0x4e1c09cbUL, 0x4c5ab792UL, 0x4d98dda5UL, 0x46c49a98UL,
-    0x4706f0afUL, 0x45404ef6UL, 0x448224c1UL, 0x41cd3244UL, 0x400f5873UL,
-    0x4249e62aUL, 0x438b8c1dUL, 0x54f16850UL, 0x55330267UL, 0x5775bc3eUL,
-    0x56b7d609UL, 0x53f8c08cUL, 0x523aaabbUL, 0x507c14e2UL, 0x51be7ed5UL,
-    0x5ae239e8UL, 0x5b2053dfUL, 0x5966ed86UL, 0x58a487b1UL, 0x5deb9134UL,
-    0x5c29fb03UL, 0x5e6f455aUL, 0x5fad2f6dUL, 0xe1351b80UL, 0xe0f771b7UL,
-    0xe2b1cfeeUL, 0xe373a5d9UL, 0xe63cb35cUL, 0xe7fed96bUL, 0xe5b86732UL,
-    0xe47a0d05UL, 0xef264a38UL, 0xeee4200fUL, 0xeca29e56UL, 0xed60f461UL,
-    0xe82fe2e4UL, 0xe9ed88d3UL, 0xebab368aUL, 0xea695cbdUL, 0xfd13b8f0UL,
-    0xfcd1d2c7UL, 0xfe976c9eUL, 0xff5506a9UL, 0xfa1a102cUL, 0xfbd87a1bUL,
-    0xf99ec442UL, 0xf85cae75UL, 0xf300e948UL, 0xf2c2837fUL, 0xf0843d26UL,
-    0xf1465711UL, 0xf4094194UL, 0xf5cb2ba3UL, 0xf78d95faUL, 0xf64fffcdUL,
-    0xd9785d60UL, 0xd8ba3757UL, 0xdafc890eUL, 0xdb3ee339UL, 0xde71f5bcUL,
-    0xdfb39f8bUL, 0xddf521d2UL, 0xdc374be5UL, 0xd76b0cd8UL, 0xd6a966efUL,
-    0xd4efd8b6UL, 0xd52db281UL, 0xd062a404UL, 0xd1a0ce33UL, 0xd3e6706aUL,
-    0xd2241a5dUL, 0xc55efe10UL, 0xc49c9427UL, 0xc6da2a7eUL, 0xc7184049UL,
-    0xc25756ccUL, 0xc3953cfbUL, 0xc1d382a2UL, 0xc011e895UL, 0xcb4dafa8UL,
-    0xca8fc59fUL, 0xc8c97bc6UL, 0xc90b11f1UL, 0xcc440774UL, 0xcd866d43UL,
-    0xcfc0d31aUL, 0xce02b92dUL, 0x91af9640UL, 0x906dfc77UL, 0x922b422eUL,
-    0x93e92819UL, 0x96a63e9cUL, 0x976454abUL, 0x9522eaf2UL, 0x94e080c5UL,
-    0x9fbcc7f8UL, 0x9e7eadcfUL, 0x9c381396UL, 0x9dfa79a1UL, 0x98b56f24UL,
-    0x99770513UL, 0x9b31bb4aUL, 0x9af3d17dUL, 0x8d893530UL, 0x8c4b5f07UL,
-    0x8e0de15eUL, 0x8fcf8b69UL, 0x8a809decUL, 0x8b42f7dbUL, 0x89044982UL,
-    0x88c623b5UL, 0x839a6488UL, 0x82580ebfUL, 0x801eb0e6UL, 0x81dcdad1UL,
-    0x8493cc54UL, 0x8551a663UL, 0x8717183aUL, 0x86d5720dUL, 0xa9e2d0a0UL,
-    0xa820ba97UL, 0xaa6604ceUL, 0xaba46ef9UL, 0xaeeb787cUL, 0xaf29124bUL,
-    0xad6fac12UL, 0xacadc625UL, 0xa7f18118UL, 0xa633eb2fUL, 0xa4755576UL,
-    0xa5b73f41UL, 0xa0f829c4UL, 0xa13a43f3UL, 0xa37cfdaaUL, 0xa2be979dUL,
-    0xb5c473d0UL, 0xb40619e7UL, 0xb640a7beUL, 0xb782cd89UL, 0xb2cddb0cUL,
-    0xb30fb13bUL, 0xb1490f62UL, 0xb08b6555UL, 0xbbd72268UL, 0xba15485fUL,
-    0xb853f606UL, 0xb9919c31UL, 0xbcde8ab4UL, 0xbd1ce083UL, 0xbf5a5edaUL,
-    0xbe9834edUL
-  },
-  {
-    0x00000000UL, 0xb8bc6765UL, 0xaa09c88bUL, 0x12b5afeeUL, 0x8f629757UL,
-    0x37def032UL, 0x256b5fdcUL, 0x9dd738b9UL, 0xc5b428efUL, 0x7d084f8aUL,
-    0x6fbde064UL, 0xd7018701UL, 0x4ad6bfb8UL, 0xf26ad8ddUL, 0xe0df7733UL,
-    0x58631056UL, 0x5019579fUL, 0xe8a530faUL, 0xfa109f14UL, 0x42acf871UL,
-    0xdf7bc0c8UL, 0x67c7a7adUL, 0x75720843UL, 0xcdce6f26UL, 0x95ad7f70UL,
-    0x2d111815UL, 0x3fa4b7fbUL, 0x8718d09eUL, 0x1acfe827UL, 0xa2738f42UL,
-    0xb0c620acUL, 0x087a47c9UL, 0xa032af3eUL, 0x188ec85bUL, 0x0a3b67b5UL,
-    0xb28700d0UL, 0x2f503869UL, 0x97ec5f0cUL, 0x8559f0e2UL, 0x3de59787UL,
-    0x658687d1UL, 0xdd3ae0b4UL, 0xcf8f4f5aUL, 0x7733283fUL, 0xeae41086UL,
-    0x525877e3UL, 0x40edd80dUL, 0xf851bf68UL, 0xf02bf8a1UL, 0x48979fc4UL,
-    0x5a22302aUL, 0xe29e574fUL, 0x7f496ff6UL, 0xc7f50893UL, 0xd540a77dUL,
-    0x6dfcc018UL, 0x359fd04eUL, 0x8d23b72bUL, 0x9f9618c5UL, 0x272a7fa0UL,
-    0xbafd4719UL, 0x0241207cUL, 0x10f48f92UL, 0xa848e8f7UL, 0x9b14583dUL,
-    0x23a83f58UL, 0x311d90b6UL, 0x89a1f7d3UL, 0x1476cf6aUL, 0xaccaa80fUL,
-    0xbe7f07e1UL, 0x06c36084UL, 0x5ea070d2UL, 0xe61c17b7UL, 0xf4a9b859UL,
-    0x4c15df3cUL, 0xd1c2e785UL, 0x697e80e0UL, 0x7bcb2f0eUL, 0xc377486bUL,
-    0xcb0d0fa2UL, 0x73b168c7UL, 0x6104c729UL, 0xd9b8a04cUL, 0x446f98f5UL,
-    0xfcd3ff90UL, 0xee66507eUL, 0x56da371bUL, 0x0eb9274dUL, 0xb6054028UL,
-    0xa4b0efc6UL, 0x1c0c88a3UL, 0x81dbb01aUL, 0x3967d77fUL, 0x2bd27891UL,
-    0x936e1ff4UL, 0x3b26f703UL, 0x839a9066UL, 0x912f3f88UL, 0x299358edUL,
-    0xb4446054UL, 0x0cf80731UL, 0x1e4da8dfUL, 0xa6f1cfbaUL, 0xfe92dfecUL,
-    0x462eb889UL, 0x549b1767UL, 0xec277002UL, 0x71f048bbUL, 0xc94c2fdeUL,
-    0xdbf98030UL, 0x6345e755UL, 0x6b3fa09cUL, 0xd383c7f9UL, 0xc1366817UL,
-    0x798a0f72UL, 0xe45d37cbUL, 0x5ce150aeUL, 0x4e54ff40UL, 0xf6e89825UL,
-    0xae8b8873UL, 0x1637ef16UL, 0x048240f8UL, 0xbc3e279dUL, 0x21e91f24UL,
-    0x99557841UL, 0x8be0d7afUL, 0x335cb0caUL, 0xed59b63bUL, 0x55e5d15eUL,
-    0x47507eb0UL, 0xffec19d5UL, 0x623b216cUL, 0xda874609UL, 0xc832e9e7UL,
-    0x708e8e82UL, 0x28ed9ed4UL, 0x9051f9b1UL, 0x82e4565fUL, 0x3a58313aUL,
-    0xa78f0983UL, 0x1f336ee6UL, 0x0d86c108UL, 0xb53aa66dUL, 0xbd40e1a4UL,
-    0x05fc86c1UL, 0x1749292fUL, 0xaff54e4aUL, 0x322276f3UL, 0x8a9e1196UL,
-    0x982bbe78UL, 0x2097d91dUL, 0x78f4c94bUL, 0xc048ae2eUL, 0xd2fd01c0UL,
-    0x6a4166a5UL, 0xf7965e1cUL, 0x4f2a3979UL, 0x5d9f9697UL, 0xe523f1f2UL,
-    0x4d6b1905UL, 0xf5d77e60UL, 0xe762d18eUL, 0x5fdeb6ebUL, 0xc2098e52UL,
-    0x7ab5e937UL, 0x680046d9UL, 0xd0bc21bcUL, 0x88df31eaUL, 0x3063568fUL,
-    0x22d6f961UL, 0x9a6a9e04UL, 0x07bda6bdUL, 0xbf01c1d8UL, 0xadb46e36UL,
-    0x15080953UL, 0x1d724e9aUL, 0xa5ce29ffUL, 0xb77b8611UL, 0x0fc7e174UL,
-    0x9210d9cdUL, 0x2aacbea8UL, 0x38191146UL, 0x80a57623UL, 0xd8c66675UL,
-    0x607a0110UL, 0x72cfaefeUL, 0xca73c99bUL, 0x57a4f122UL, 0xef189647UL,
-    0xfdad39a9UL, 0x45115eccUL, 0x764dee06UL, 0xcef18963UL, 0xdc44268dUL,
-    0x64f841e8UL, 0xf92f7951UL, 0x41931e34UL, 0x5326b1daUL, 0xeb9ad6bfUL,
-    0xb3f9c6e9UL, 0x0b45a18cUL, 0x19f00e62UL, 0xa14c6907UL, 0x3c9b51beUL,
-    0x842736dbUL, 0x96929935UL, 0x2e2efe50UL, 0x2654b999UL, 0x9ee8defcUL,
-    0x8c5d7112UL, 0x34e11677UL, 0xa9362eceUL, 0x118a49abUL, 0x033fe645UL,
-    0xbb838120UL, 0xe3e09176UL, 0x5b5cf613UL, 0x49e959fdUL, 0xf1553e98UL,
-    0x6c820621UL, 0xd43e6144UL, 0xc68bceaaUL, 0x7e37a9cfUL, 0xd67f4138UL,
-    0x6ec3265dUL, 0x7c7689b3UL, 0xc4caeed6UL, 0x591dd66fUL, 0xe1a1b10aUL,
-    0xf3141ee4UL, 0x4ba87981UL, 0x13cb69d7UL, 0xab770eb2UL, 0xb9c2a15cUL,
-    0x017ec639UL, 0x9ca9fe80UL, 0x241599e5UL, 0x36a0360bUL, 0x8e1c516eUL,
-    0x866616a7UL, 0x3eda71c2UL, 0x2c6fde2cUL, 0x94d3b949UL, 0x090481f0UL,
-    0xb1b8e695UL, 0xa30d497bUL, 0x1bb12e1eUL, 0x43d23e48UL, 0xfb6e592dUL,
-    0xe9dbf6c3UL, 0x516791a6UL, 0xccb0a91fUL, 0x740cce7aUL, 0x66b96194UL,
-    0xde0506f1UL
-  },
-  {
-    0x00000000UL, 0x96300777UL, 0x2c610eeeUL, 0xba510999UL, 0x19c46d07UL,
-    0x8ff46a70UL, 0x35a563e9UL, 0xa395649eUL, 0x3288db0eUL, 0xa4b8dc79UL,
-    0x1ee9d5e0UL, 0x88d9d297UL, 0x2b4cb609UL, 0xbd7cb17eUL, 0x072db8e7UL,
-    0x911dbf90UL, 0x6410b71dUL, 0xf220b06aUL, 0x4871b9f3UL, 0xde41be84UL,
-    0x7dd4da1aUL, 0xebe4dd6dUL, 0x51b5d4f4UL, 0xc785d383UL, 0x56986c13UL,
-    0xc0a86b64UL, 0x7af962fdUL, 0xecc9658aUL, 0x4f5c0114UL, 0xd96c0663UL,
-    0x633d0ffaUL, 0xf50d088dUL, 0xc8206e3bUL, 0x5e10694cUL, 0xe44160d5UL,
-    0x727167a2UL, 0xd1e4033cUL, 0x47d4044bUL, 0xfd850dd2UL, 0x6bb50aa5UL,
-    0xfaa8b535UL, 0x6c98b242UL, 0xd6c9bbdbUL, 0x40f9bcacUL, 0xe36cd832UL,
-    0x755cdf45UL, 0xcf0dd6dcUL, 0x593dd1abUL, 0xac30d926UL, 0x3a00de51UL,
-    0x8051d7c8UL, 0x1661d0bfUL, 0xb5f4b421UL, 0x23c4b356UL, 0x9995bacfUL,
-    0x0fa5bdb8UL, 0x9eb80228UL, 0x0888055fUL, 0xb2d90cc6UL, 0x24e90bb1UL,
-    0x877c6f2fUL, 0x114c6858UL, 0xab1d61c1UL, 0x3d2d66b6UL, 0x9041dc76UL,
-    0x0671db01UL, 0xbc20d298UL, 0x2a10d5efUL, 0x8985b171UL, 0x1fb5b606UL,
-    0xa5e4bf9fUL, 0x33d4b8e8UL, 0xa2c90778UL, 0x34f9000fUL, 0x8ea80996UL,
-    0x18980ee1UL, 0xbb0d6a7fUL, 0x2d3d6d08UL, 0x976c6491UL, 0x015c63e6UL,
-    0xf4516b6bUL, 0x62616c1cUL, 0xd8306585UL, 0x4e0062f2UL, 0xed95066cUL,
-    0x7ba5011bUL, 0xc1f40882UL, 0x57c40ff5UL, 0xc6d9b065UL, 0x50e9b712UL,
-    0xeab8be8bUL, 0x7c88b9fcUL, 0xdf1ddd62UL, 0x492dda15UL, 0xf37cd38cUL,
-    0x654cd4fbUL, 0x5861b24dUL, 0xce51b53aUL, 0x7400bca3UL, 0xe230bbd4UL,
-    0x41a5df4aUL, 0xd795d83dUL, 0x6dc4d1a4UL, 0xfbf4d6d3UL, 0x6ae96943UL,
-    0xfcd96e34UL, 0x468867adUL, 0xd0b860daUL, 0x732d0444UL, 0xe51d0333UL,
-    0x5f4c0aaaUL, 0xc97c0dddUL, 0x3c710550UL, 0xaa410227UL, 0x10100bbeUL,
-    0x86200cc9UL, 0x25b56857UL, 0xb3856f20UL, 0x09d466b9UL, 0x9fe461ceUL,
-    0x0ef9de5eUL, 0x98c9d929UL, 0x2298d0b0UL, 0xb4a8d7c7UL, 0x173db359UL,
-    0x810db42eUL, 0x3b5cbdb7UL, 0xad6cbac0UL, 0x2083b8edUL, 0xb6b3bf9aUL,
-    0x0ce2b603UL, 0x9ad2b174UL, 0x3947d5eaUL, 0xaf77d29dUL, 0x1526db04UL,
-    0x8316dc73UL, 0x120b63e3UL, 0x843b6494UL, 0x3e6a6d0dUL, 0xa85a6a7aUL,
-    0x0bcf0ee4UL, 0x9dff0993UL, 0x27ae000aUL, 0xb19e077dUL, 0x44930ff0UL,
-    0xd2a30887UL, 0x68f2011eUL, 0xfec20669UL, 0x5d5762f7UL, 0xcb676580UL,
-    0x71366c19UL, 0xe7066b6eUL, 0x761bd4feUL, 0xe02bd389UL, 0x5a7ada10UL,
-    0xcc4add67UL, 0x6fdfb9f9UL, 0xf9efbe8eUL, 0x43beb717UL, 0xd58eb060UL,
-    0xe8a3d6d6UL, 0x7e93d1a1UL, 0xc4c2d838UL, 0x52f2df4fUL, 0xf167bbd1UL,
-    0x6757bca6UL, 0xdd06b53fUL, 0x4b36b248UL, 0xda2b0dd8UL, 0x4c1b0aafUL,
-    0xf64a0336UL, 0x607a0441UL, 0xc3ef60dfUL, 0x55df67a8UL, 0xef8e6e31UL,
-    0x79be6946UL, 0x8cb361cbUL, 0x1a8366bcUL, 0xa0d26f25UL, 0x36e26852UL,
-    0x95770cccUL, 0x03470bbbUL, 0xb9160222UL, 0x2f260555UL, 0xbe3bbac5UL,
-    0x280bbdb2UL, 0x925ab42bUL, 0x046ab35cUL, 0xa7ffd7c2UL, 0x31cfd0b5UL,
-    0x8b9ed92cUL, 0x1daede5bUL, 0xb0c2649bUL, 0x26f263ecUL, 0x9ca36a75UL,
-    0x0a936d02UL, 0xa906099cUL, 0x3f360eebUL, 0x85670772UL, 0x13570005UL,
-    0x824abf95UL, 0x147ab8e2UL, 0xae2bb17bUL, 0x381bb60cUL, 0x9b8ed292UL,
-    0x0dbed5e5UL, 0xb7efdc7cUL, 0x21dfdb0bUL, 0xd4d2d386UL, 0x42e2d4f1UL,
-    0xf8b3dd68UL, 0x6e83da1fUL, 0xcd16be81UL, 0x5b26b9f6UL, 0xe177b06fUL,
-    0x7747b718UL, 0xe65a0888UL, 0x706a0fffUL, 0xca3b0666UL, 0x5c0b0111UL,
-    0xff9e658fUL, 0x69ae62f8UL, 0xd3ff6b61UL, 0x45cf6c16UL, 0x78e20aa0UL,
-    0xeed20dd7UL, 0x5483044eUL, 0xc2b30339UL, 0x612667a7UL, 0xf71660d0UL,
-    0x4d476949UL, 0xdb776e3eUL, 0x4a6ad1aeUL, 0xdc5ad6d9UL, 0x660bdf40UL,
-    0xf03bd837UL, 0x53aebca9UL, 0xc59ebbdeUL, 0x7fcfb247UL, 0xe9ffb530UL,
-    0x1cf2bdbdUL, 0x8ac2bacaUL, 0x3093b353UL, 0xa6a3b424UL, 0x0536d0baUL,
-    0x9306d7cdUL, 0x2957de54UL, 0xbf67d923UL, 0x2e7a66b3UL, 0xb84a61c4UL,
-    0x021b685dUL, 0x942b6f2aUL, 0x37be0bb4UL, 0xa18e0cc3UL, 0x1bdf055aUL,
-    0x8def022dUL
-  },
-  {
-    0x00000000UL, 0x41311b19UL, 0x82623632UL, 0xc3532d2bUL, 0x04c56c64UL,
-    0x45f4777dUL, 0x86a75a56UL, 0xc796414fUL, 0x088ad9c8UL, 0x49bbc2d1UL,
-    0x8ae8effaUL, 0xcbd9f4e3UL, 0x0c4fb5acUL, 0x4d7eaeb5UL, 0x8e2d839eUL,
-    0xcf1c9887UL, 0x5112c24aUL, 0x1023d953UL, 0xd370f478UL, 0x9241ef61UL,
-    0x55d7ae2eUL, 0x14e6b537UL, 0xd7b5981cUL, 0x96848305UL, 0x59981b82UL,
-    0x18a9009bUL, 0xdbfa2db0UL, 0x9acb36a9UL, 0x5d5d77e6UL, 0x1c6c6cffUL,
-    0xdf3f41d4UL, 0x9e0e5acdUL, 0xa2248495UL, 0xe3159f8cUL, 0x2046b2a7UL,
-    0x6177a9beUL, 0xa6e1e8f1UL, 0xe7d0f3e8UL, 0x2483dec3UL, 0x65b2c5daUL,
-    0xaaae5d5dUL, 0xeb9f4644UL, 0x28cc6b6fUL, 0x69fd7076UL, 0xae6b3139UL,
-    0xef5a2a20UL, 0x2c09070bUL, 0x6d381c12UL, 0xf33646dfUL, 0xb2075dc6UL,
-    0x715470edUL, 0x30656bf4UL, 0xf7f32abbUL, 0xb6c231a2UL, 0x75911c89UL,
-    0x34a00790UL, 0xfbbc9f17UL, 0xba8d840eUL, 0x79dea925UL, 0x38efb23cUL,
-    0xff79f373UL, 0xbe48e86aUL, 0x7d1bc541UL, 0x3c2ade58UL, 0x054f79f0UL,
-    0x447e62e9UL, 0x872d4fc2UL, 0xc61c54dbUL, 0x018a1594UL, 0x40bb0e8dUL,
-    0x83e823a6UL, 0xc2d938bfUL, 0x0dc5a038UL, 0x4cf4bb21UL, 0x8fa7960aUL,
-    0xce968d13UL, 0x0900cc5cUL, 0x4831d745UL, 0x8b62fa6eUL, 0xca53e177UL,
-    0x545dbbbaUL, 0x156ca0a3UL, 0xd63f8d88UL, 0x970e9691UL, 0x5098d7deUL,
-    0x11a9ccc7UL, 0xd2fae1ecUL, 0x93cbfaf5UL, 0x5cd76272UL, 0x1de6796bUL,
-    0xdeb55440UL, 0x9f844f59UL, 0x58120e16UL, 0x1923150fUL, 0xda703824UL,
-    0x9b41233dUL, 0xa76bfd65UL, 0xe65ae67cUL, 0x2509cb57UL, 0x6438d04eUL,
-    0xa3ae9101UL, 0xe29f8a18UL, 0x21cca733UL, 0x60fdbc2aUL, 0xafe124adUL,
-    0xeed03fb4UL, 0x2d83129fUL, 0x6cb20986UL, 0xab2448c9UL, 0xea1553d0UL,
-    0x29467efbUL, 0x687765e2UL, 0xf6793f2fUL, 0xb7482436UL, 0x741b091dUL,
-    0x352a1204UL, 0xf2bc534bUL, 0xb38d4852UL, 0x70de6579UL, 0x31ef7e60UL,
-    0xfef3e6e7UL, 0xbfc2fdfeUL, 0x7c91d0d5UL, 0x3da0cbccUL, 0xfa368a83UL,
-    0xbb07919aUL, 0x7854bcb1UL, 0x3965a7a8UL, 0x4b98833bUL, 0x0aa99822UL,
-    0xc9fab509UL, 0x88cbae10UL, 0x4f5def5fUL, 0x0e6cf446UL, 0xcd3fd96dUL,
-    0x8c0ec274UL, 0x43125af3UL, 0x022341eaUL, 0xc1706cc1UL, 0x804177d8UL,
-    0x47d73697UL, 0x06e62d8eUL, 0xc5b500a5UL, 0x84841bbcUL, 0x1a8a4171UL,
-    0x5bbb5a68UL, 0x98e87743UL, 0xd9d96c5aUL, 0x1e4f2d15UL, 0x5f7e360cUL,
-    0x9c2d1b27UL, 0xdd1c003eUL, 0x120098b9UL, 0x533183a0UL, 0x9062ae8bUL,
-    0xd153b592UL, 0x16c5f4ddUL, 0x57f4efc4UL, 0x94a7c2efUL, 0xd596d9f6UL,
-    0xe9bc07aeUL, 0xa88d1cb7UL, 0x6bde319cUL, 0x2aef2a85UL, 0xed796bcaUL,
-    0xac4870d3UL, 0x6f1b5df8UL, 0x2e2a46e1UL, 0xe136de66UL, 0xa007c57fUL,
-    0x6354e854UL, 0x2265f34dUL, 0xe5f3b202UL, 0xa4c2a91bUL, 0x67918430UL,
-    0x26a09f29UL, 0xb8aec5e4UL, 0xf99fdefdUL, 0x3accf3d6UL, 0x7bfde8cfUL,
-    0xbc6ba980UL, 0xfd5ab299UL, 0x3e099fb2UL, 0x7f3884abUL, 0xb0241c2cUL,
-    0xf1150735UL, 0x32462a1eUL, 0x73773107UL, 0xb4e17048UL, 0xf5d06b51UL,
-    0x3683467aUL, 0x77b25d63UL, 0x4ed7facbUL, 0x0fe6e1d2UL, 0xccb5ccf9UL,
-    0x8d84d7e0UL, 0x4a1296afUL, 0x0b238db6UL, 0xc870a09dUL, 0x8941bb84UL,
-    0x465d2303UL, 0x076c381aUL, 0xc43f1531UL, 0x850e0e28UL, 0x42984f67UL,
-    0x03a9547eUL, 0xc0fa7955UL, 0x81cb624cUL, 0x1fc53881UL, 0x5ef42398UL,
-    0x9da70eb3UL, 0xdc9615aaUL, 0x1b0054e5UL, 0x5a314ffcUL, 0x996262d7UL,
-    0xd85379ceUL, 0x174fe149UL, 0x567efa50UL, 0x952dd77bUL, 0xd41ccc62UL,
-    0x138a8d2dUL, 0x52bb9634UL, 0x91e8bb1fUL, 0xd0d9a006UL, 0xecf37e5eUL,
-    0xadc26547UL, 0x6e91486cUL, 0x2fa05375UL, 0xe836123aUL, 0xa9070923UL,
-    0x6a542408UL, 0x2b653f11UL, 0xe479a796UL, 0xa548bc8fUL, 0x661b91a4UL,
-    0x272a8abdUL, 0xe0bccbf2UL, 0xa18dd0ebUL, 0x62defdc0UL, 0x23efe6d9UL,
-    0xbde1bc14UL, 0xfcd0a70dUL, 0x3f838a26UL, 0x7eb2913fUL, 0xb924d070UL,
-    0xf815cb69UL, 0x3b46e642UL, 0x7a77fd5bUL, 0xb56b65dcUL, 0xf45a7ec5UL,
-    0x370953eeUL, 0x763848f7UL, 0xb1ae09b8UL, 0xf09f12a1UL, 0x33cc3f8aUL,
-    0x72fd2493UL
-  },
-  {
-    0x00000000UL, 0x376ac201UL, 0x6ed48403UL, 0x59be4602UL, 0xdca80907UL,
-    0xebc2cb06UL, 0xb27c8d04UL, 0x85164f05UL, 0xb851130eUL, 0x8f3bd10fUL,
-    0xd685970dUL, 0xe1ef550cUL, 0x64f91a09UL, 0x5393d808UL, 0x0a2d9e0aUL,
-    0x3d475c0bUL, 0x70a3261cUL, 0x47c9e41dUL, 0x1e77a21fUL, 0x291d601eUL,
-    0xac0b2f1bUL, 0x9b61ed1aUL, 0xc2dfab18UL, 0xf5b56919UL, 0xc8f23512UL,
-    0xff98f713UL, 0xa626b111UL, 0x914c7310UL, 0x145a3c15UL, 0x2330fe14UL,
-    0x7a8eb816UL, 0x4de47a17UL, 0xe0464d38UL, 0xd72c8f39UL, 0x8e92c93bUL,
-    0xb9f80b3aUL, 0x3cee443fUL, 0x0b84863eUL, 0x523ac03cUL, 0x6550023dUL,
-    0x58175e36UL, 0x6f7d9c37UL, 0x36c3da35UL, 0x01a91834UL, 0x84bf5731UL,
-    0xb3d59530UL, 0xea6bd332UL, 0xdd011133UL, 0x90e56b24UL, 0xa78fa925UL,
-    0xfe31ef27UL, 0xc95b2d26UL, 0x4c4d6223UL, 0x7b27a022UL, 0x2299e620UL,
-    0x15f32421UL, 0x28b4782aUL, 0x1fdeba2bUL, 0x4660fc29UL, 0x710a3e28UL,
-    0xf41c712dUL, 0xc376b32cUL, 0x9ac8f52eUL, 0xada2372fUL, 0xc08d9a70UL,
-    0xf7e75871UL, 0xae591e73UL, 0x9933dc72UL, 0x1c259377UL, 0x2b4f5176UL,
-    0x72f11774UL, 0x459bd575UL, 0x78dc897eUL, 0x4fb64b7fUL, 0x16080d7dUL,
-    0x2162cf7cUL, 0xa4748079UL, 0x931e4278UL, 0xcaa0047aUL, 0xfdcac67bUL,
-    0xb02ebc6cUL, 0x87447e6dUL, 0xdefa386fUL, 0xe990fa6eUL, 0x6c86b56bUL,
-    0x5bec776aUL, 0x02523168UL, 0x3538f369UL, 0x087faf62UL, 0x3f156d63UL,
-    0x66ab2b61UL, 0x51c1e960UL, 0xd4d7a665UL, 0xe3bd6464UL, 0xba032266UL,
-    0x8d69e067UL, 0x20cbd748UL, 0x17a11549UL, 0x4e1f534bUL, 0x7975914aUL,
-    0xfc63de4fUL, 0xcb091c4eUL, 0x92b75a4cUL, 0xa5dd984dUL, 0x989ac446UL,
-    0xaff00647UL, 0xf64e4045UL, 0xc1248244UL, 0x4432cd41UL, 0x73580f40UL,
-    0x2ae64942UL, 0x1d8c8b43UL, 0x5068f154UL, 0x67023355UL, 0x3ebc7557UL,
-    0x09d6b756UL, 0x8cc0f853UL, 0xbbaa3a52UL, 0xe2147c50UL, 0xd57ebe51UL,
-    0xe839e25aUL, 0xdf53205bUL, 0x86ed6659UL, 0xb187a458UL, 0x3491eb5dUL,
-    0x03fb295cUL, 0x5a456f5eUL, 0x6d2fad5fUL, 0x801b35e1UL, 0xb771f7e0UL,
-    0xeecfb1e2UL, 0xd9a573e3UL, 0x5cb33ce6UL, 0x6bd9fee7UL, 0x3267b8e5UL,
-    0x050d7ae4UL, 0x384a26efUL, 0x0f20e4eeUL, 0x569ea2ecUL, 0x61f460edUL,
-    0xe4e22fe8UL, 0xd388ede9UL, 0x8a36abebUL, 0xbd5c69eaUL, 0xf0b813fdUL,
-    0xc7d2d1fcUL, 0x9e6c97feUL, 0xa90655ffUL, 0x2c101afaUL, 0x1b7ad8fbUL,
-    0x42c49ef9UL, 0x75ae5cf8UL, 0x48e900f3UL, 0x7f83c2f2UL, 0x263d84f0UL,
-    0x115746f1UL, 0x944109f4UL, 0xa32bcbf5UL, 0xfa958df7UL, 0xcdff4ff6UL,
-    0x605d78d9UL, 0x5737bad8UL, 0x0e89fcdaUL, 0x39e33edbUL, 0xbcf571deUL,
-    0x8b9fb3dfUL, 0xd221f5ddUL, 0xe54b37dcUL, 0xd80c6bd7UL, 0xef66a9d6UL,
-    0xb6d8efd4UL, 0x81b22dd5UL, 0x04a462d0UL, 0x33cea0d1UL, 0x6a70e6d3UL,
-    0x5d1a24d2UL, 0x10fe5ec5UL, 0x27949cc4UL, 0x7e2adac6UL, 0x494018c7UL,
-    0xcc5657c2UL, 0xfb3c95c3UL, 0xa282d3c1UL, 0x95e811c0UL, 0xa8af4dcbUL,
-    0x9fc58fcaUL, 0xc67bc9c8UL, 0xf1110bc9UL, 0x740744ccUL, 0x436d86cdUL,
-    0x1ad3c0cfUL, 0x2db902ceUL, 0x4096af91UL, 0x77fc6d90UL, 0x2e422b92UL,
-    0x1928e993UL, 0x9c3ea696UL, 0xab546497UL, 0xf2ea2295UL, 0xc580e094UL,
-    0xf8c7bc9fUL, 0xcfad7e9eUL, 0x9613389cUL, 0xa179fa9dUL, 0x246fb598UL,
-    0x13057799UL, 0x4abb319bUL, 0x7dd1f39aUL, 0x3035898dUL, 0x075f4b8cUL,
-    0x5ee10d8eUL, 0x698bcf8fUL, 0xec9d808aUL, 0xdbf7428bUL, 0x82490489UL,
-    0xb523c688UL, 0x88649a83UL, 0xbf0e5882UL, 0xe6b01e80UL, 0xd1dadc81UL,
-    0x54cc9384UL, 0x63a65185UL, 0x3a181787UL, 0x0d72d586UL, 0xa0d0e2a9UL,
-    0x97ba20a8UL, 0xce0466aaUL, 0xf96ea4abUL, 0x7c78ebaeUL, 0x4b1229afUL,
-    0x12ac6fadUL, 0x25c6adacUL, 0x1881f1a7UL, 0x2feb33a6UL, 0x765575a4UL,
-    0x413fb7a5UL, 0xc429f8a0UL, 0xf3433aa1UL, 0xaafd7ca3UL, 0x9d97bea2UL,
-    0xd073c4b5UL, 0xe71906b4UL, 0xbea740b6UL, 0x89cd82b7UL, 0x0cdbcdb2UL,
-    0x3bb10fb3UL, 0x620f49b1UL, 0x55658bb0UL, 0x6822d7bbUL, 0x5f4815baUL,
-    0x06f653b8UL, 0x319c91b9UL, 0xb48adebcUL, 0x83e01cbdUL, 0xda5e5abfUL,
-    0xed3498beUL
-  },
-  {
-    0x00000000UL, 0x6567bcb8UL, 0x8bc809aaUL, 0xeeafb512UL, 0x5797628fUL,
-    0x32f0de37UL, 0xdc5f6b25UL, 0xb938d79dUL, 0xef28b4c5UL, 0x8a4f087dUL,
-    0x64e0bd6fUL, 0x018701d7UL, 0xb8bfd64aUL, 0xddd86af2UL, 0x3377dfe0UL,
-    0x56106358UL, 0x9f571950UL, 0xfa30a5e8UL, 0x149f10faUL, 0x71f8ac42UL,
-    0xc8c07bdfUL, 0xada7c767UL, 0x43087275UL, 0x266fcecdUL, 0x707fad95UL,
-    0x1518112dUL, 0xfbb7a43fUL, 0x9ed01887UL, 0x27e8cf1aUL, 0x428f73a2UL,
-    0xac20c6b0UL, 0xc9477a08UL, 0x3eaf32a0UL, 0x5bc88e18UL, 0xb5673b0aUL,
-    0xd00087b2UL, 0x6938502fUL, 0x0c5fec97UL, 0xe2f05985UL, 0x8797e53dUL,
-    0xd1878665UL, 0xb4e03addUL, 0x5a4f8fcfUL, 0x3f283377UL, 0x8610e4eaUL,
-    0xe3775852UL, 0x0dd8ed40UL, 0x68bf51f8UL, 0xa1f82bf0UL, 0xc49f9748UL,
-    0x2a30225aUL, 0x4f579ee2UL, 0xf66f497fUL, 0x9308f5c7UL, 0x7da740d5UL,
-    0x18c0fc6dUL, 0x4ed09f35UL, 0x2bb7238dUL, 0xc518969fUL, 0xa07f2a27UL,
-    0x1947fdbaUL, 0x7c204102UL, 0x928ff410UL, 0xf7e848a8UL, 0x3d58149bUL,
-    0x583fa823UL, 0xb6901d31UL, 0xd3f7a189UL, 0x6acf7614UL, 0x0fa8caacUL,
-    0xe1077fbeUL, 0x8460c306UL, 0xd270a05eUL, 0xb7171ce6UL, 0x59b8a9f4UL,
-    0x3cdf154cUL, 0x85e7c2d1UL, 0xe0807e69UL, 0x0e2fcb7bUL, 0x6b4877c3UL,
-    0xa20f0dcbUL, 0xc768b173UL, 0x29c70461UL, 0x4ca0b8d9UL, 0xf5986f44UL,
-    0x90ffd3fcUL, 0x7e5066eeUL, 0x1b37da56UL, 0x4d27b90eUL, 0x284005b6UL,
-    0xc6efb0a4UL, 0xa3880c1cUL, 0x1ab0db81UL, 0x7fd76739UL, 0x9178d22bUL,
-    0xf41f6e93UL, 0x03f7263bUL, 0x66909a83UL, 0x883f2f91UL, 0xed589329UL,
-    0x546044b4UL, 0x3107f80cUL, 0xdfa84d1eUL, 0xbacff1a6UL, 0xecdf92feUL,
-    0x89b82e46UL, 0x67179b54UL, 0x027027ecUL, 0xbb48f071UL, 0xde2f4cc9UL,
-    0x3080f9dbUL, 0x55e74563UL, 0x9ca03f6bUL, 0xf9c783d3UL, 0x176836c1UL,
-    0x720f8a79UL, 0xcb375de4UL, 0xae50e15cUL, 0x40ff544eUL, 0x2598e8f6UL,
-    0x73888baeUL, 0x16ef3716UL, 0xf8408204UL, 0x9d273ebcUL, 0x241fe921UL,
-    0x41785599UL, 0xafd7e08bUL, 0xcab05c33UL, 0x3bb659edUL, 0x5ed1e555UL,
-    0xb07e5047UL, 0xd519ecffUL, 0x6c213b62UL, 0x094687daUL, 0xe7e932c8UL,
-    0x828e8e70UL, 0xd49eed28UL, 0xb1f95190UL, 0x5f56e482UL, 0x3a31583aUL,
-    0x83098fa7UL, 0xe66e331fUL, 0x08c1860dUL, 0x6da63ab5UL, 0xa4e140bdUL,
-    0xc186fc05UL, 0x2f294917UL, 0x4a4ef5afUL, 0xf3762232UL, 0x96119e8aUL,
-    0x78be2b98UL, 0x1dd99720UL, 0x4bc9f478UL, 0x2eae48c0UL, 0xc001fdd2UL,
-    0xa566416aUL, 0x1c5e96f7UL, 0x79392a4fUL, 0x97969f5dUL, 0xf2f123e5UL,
-    0x05196b4dUL, 0x607ed7f5UL, 0x8ed162e7UL, 0xebb6de5fUL, 0x528e09c2UL,
-    0x37e9b57aUL, 0xd9460068UL, 0xbc21bcd0UL, 0xea31df88UL, 0x8f566330UL,
-    0x61f9d622UL, 0x049e6a9aUL, 0xbda6bd07UL, 0xd8c101bfUL, 0x366eb4adUL,
-    0x53090815UL, 0x9a4e721dUL, 0xff29cea5UL, 0x11867bb7UL, 0x74e1c70fUL,
-    0xcdd91092UL, 0xa8beac2aUL, 0x46111938UL, 0x2376a580UL, 0x7566c6d8UL,
-    0x10017a60UL, 0xfeaecf72UL, 0x9bc973caUL, 0x22f1a457UL, 0x479618efUL,
-    0xa939adfdUL, 0xcc5e1145UL, 0x06ee4d76UL, 0x6389f1ceUL, 0x8d2644dcUL,
-    0xe841f864UL, 0x51792ff9UL, 0x341e9341UL, 0xdab12653UL, 0xbfd69aebUL,
-    0xe9c6f9b3UL, 0x8ca1450bUL, 0x620ef019UL, 0x07694ca1UL, 0xbe519b3cUL,
-    0xdb362784UL, 0x35999296UL, 0x50fe2e2eUL, 0x99b95426UL, 0xfcdee89eUL,
-    0x12715d8cUL, 0x7716e134UL, 0xce2e36a9UL, 0xab498a11UL, 0x45e63f03UL,
-    0x208183bbUL, 0x7691e0e3UL, 0x13f65c5bUL, 0xfd59e949UL, 0x983e55f1UL,
-    0x2106826cUL, 0x44613ed4UL, 0xaace8bc6UL, 0xcfa9377eUL, 0x38417fd6UL,
-    0x5d26c36eUL, 0xb389767cUL, 0xd6eecac4UL, 0x6fd61d59UL, 0x0ab1a1e1UL,
-    0xe41e14f3UL, 0x8179a84bUL, 0xd769cb13UL, 0xb20e77abUL, 0x5ca1c2b9UL,
-    0x39c67e01UL, 0x80fea99cUL, 0xe5991524UL, 0x0b36a036UL, 0x6e511c8eUL,
-    0xa7166686UL, 0xc271da3eUL, 0x2cde6f2cUL, 0x49b9d394UL, 0xf0810409UL,
-    0x95e6b8b1UL, 0x7b490da3UL, 0x1e2eb11bUL, 0x483ed243UL, 0x2d596efbUL,
-    0xc3f6dbe9UL, 0xa6916751UL, 0x1fa9b0ccUL, 0x7ace0c74UL, 0x9461b966UL,
-    0xf10605deUL
+local const z_crc_t FAR crc_table[] = {
+    0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419,
+    0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4,
+    0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07,
+    0x90bf1d91, 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
+    0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856,
+    0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
+    0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4,
+    0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
+    0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3,
+    0x45df5c75, 0xdcd60dcf, 0xabd13d59, 0x26d930ac, 0x51de003a,
+    0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599,
+    0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
+    0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190,
+    0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f,
+    0x9fbfe4a5, 0xe8b8d433, 0x7807c9a2, 0x0f00f934, 0x9609a88e,
+    0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
+    0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed,
+    0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
+    0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3,
+    0xfbd44c65, 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,
+    0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a,
+    0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5,
+    0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, 0xbe0b1010,
+    0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+    0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17,
+    0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6,
+    0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615,
+    0x73dc1683, 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
+    0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, 0xf00f9344,
+    0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
+    0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a,
+    0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
+    0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1,
+    0xa6bc5767, 0x3fb506dd, 0x48b2364b, 0xd80d2bda, 0xaf0a1b4c,
+    0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef,
+    0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
+    0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe,
+    0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31,
+    0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c,
+    0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
+    0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b,
+    0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
+    0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1,
+    0x18b74777, 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
+    0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, 0xa00ae278,
+    0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7,
+    0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66,
+    0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+    0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605,
+    0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8,
+    0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b,
+    0x2d02ef8d};
+
+#ifdef W
+
+#if W == 8
+
+local const z_word_t FAR crc_big_table[] = {
+    0x0000000000000000, 0x9630077700000000, 0x2c610eee00000000,
+    0xba51099900000000, 0x19c46d0700000000, 0x8ff46a7000000000,
+    0x35a563e900000000, 0xa395649e00000000, 0x3288db0e00000000,
+    0xa4b8dc7900000000, 0x1ee9d5e000000000, 0x88d9d29700000000,
+    0x2b4cb60900000000, 0xbd7cb17e00000000, 0x072db8e700000000,
+    0x911dbf9000000000, 0x6410b71d00000000, 0xf220b06a00000000,
+    0x4871b9f300000000, 0xde41be8400000000, 0x7dd4da1a00000000,
+    0xebe4dd6d00000000, 0x51b5d4f400000000, 0xc785d38300000000,
+    0x56986c1300000000, 0xc0a86b6400000000, 0x7af962fd00000000,
+    0xecc9658a00000000, 0x4f5c011400000000, 0xd96c066300000000,
+    0x633d0ffa00000000, 0xf50d088d00000000, 0xc8206e3b00000000,
+    0x5e10694c00000000, 0xe44160d500000000, 0x727167a200000000,
+    0xd1e4033c00000000, 0x47d4044b00000000, 0xfd850dd200000000,
+    0x6bb50aa500000000, 0xfaa8b53500000000, 0x6c98b24200000000,
+    0xd6c9bbdb00000000, 0x40f9bcac00000000, 0xe36cd83200000000,
+    0x755cdf4500000000, 0xcf0dd6dc00000000, 0x593dd1ab00000000,
+    0xac30d92600000000, 0x3a00de5100000000, 0x8051d7c800000000,
+    0x1661d0bf00000000, 0xb5f4b42100000000, 0x23c4b35600000000,
+    0x9995bacf00000000, 0x0fa5bdb800000000, 0x9eb8022800000000,
+    0x0888055f00000000, 0xb2d90cc600000000, 0x24e90bb100000000,
+    0x877c6f2f00000000, 0x114c685800000000, 0xab1d61c100000000,
+    0x3d2d66b600000000, 0x9041dc7600000000, 0x0671db0100000000,
+    0xbc20d29800000000, 0x2a10d5ef00000000, 0x8985b17100000000,
+    0x1fb5b60600000000, 0xa5e4bf9f00000000, 0x33d4b8e800000000,
+    0xa2c9077800000000, 0x34f9000f00000000, 0x8ea8099600000000,
+    0x18980ee100000000, 0xbb0d6a7f00000000, 0x2d3d6d0800000000,
+    0x976c649100000000, 0x015c63e600000000, 0xf4516b6b00000000,
+    0x62616c1c00000000, 0xd830658500000000, 0x4e0062f200000000,
+    0xed95066c00000000, 0x7ba5011b00000000, 0xc1f4088200000000,
+    0x57c40ff500000000, 0xc6d9b06500000000, 0x50e9b71200000000,
+    0xeab8be8b00000000, 0x7c88b9fc00000000, 0xdf1ddd6200000000,
+    0x492dda1500000000, 0xf37cd38c00000000, 0x654cd4fb00000000,
+    0x5861b24d00000000, 0xce51b53a00000000, 0x7400bca300000000,
+    0xe230bbd400000000, 0x41a5df4a00000000, 0xd795d83d00000000,
+    0x6dc4d1a400000000, 0xfbf4d6d300000000, 0x6ae9694300000000,
+    0xfcd96e3400000000, 0x468867ad00000000, 0xd0b860da00000000,
+    0x732d044400000000, 0xe51d033300000000, 0x5f4c0aaa00000000,
+    0xc97c0ddd00000000, 0x3c71055000000000, 0xaa41022700000000,
+    0x10100bbe00000000, 0x86200cc900000000, 0x25b5685700000000,
+    0xb3856f2000000000, 0x09d466b900000000, 0x9fe461ce00000000,
+    0x0ef9de5e00000000, 0x98c9d92900000000, 0x2298d0b000000000,
+    0xb4a8d7c700000000, 0x173db35900000000, 0x810db42e00000000,
+    0x3b5cbdb700000000, 0xad6cbac000000000, 0x2083b8ed00000000,
+    0xb6b3bf9a00000000, 0x0ce2b60300000000, 0x9ad2b17400000000,
+    0x3947d5ea00000000, 0xaf77d29d00000000, 0x1526db0400000000,
+    0x8316dc7300000000, 0x120b63e300000000, 0x843b649400000000,
+    0x3e6a6d0d00000000, 0xa85a6a7a00000000, 0x0bcf0ee400000000,
+    0x9dff099300000000, 0x27ae000a00000000, 0xb19e077d00000000,
+    0x44930ff000000000, 0xd2a3088700000000, 0x68f2011e00000000,
+    0xfec2066900000000, 0x5d5762f700000000, 0xcb67658000000000,
+    0x71366c1900000000, 0xe7066b6e00000000, 0x761bd4fe00000000,
+    0xe02bd38900000000, 0x5a7ada1000000000, 0xcc4add6700000000,
+    0x6fdfb9f900000000, 0xf9efbe8e00000000, 0x43beb71700000000,
+    0xd58eb06000000000, 0xe8a3d6d600000000, 0x7e93d1a100000000,
+    0xc4c2d83800000000, 0x52f2df4f00000000, 0xf167bbd100000000,
+    0x6757bca600000000, 0xdd06b53f00000000, 0x4b36b24800000000,
+    0xda2b0dd800000000, 0x4c1b0aaf00000000, 0xf64a033600000000,
+    0x607a044100000000, 0xc3ef60df00000000, 0x55df67a800000000,
+    0xef8e6e3100000000, 0x79be694600000000, 0x8cb361cb00000000,
+    0x1a8366bc00000000, 0xa0d26f2500000000, 0x36e2685200000000,
+    0x95770ccc00000000, 0x03470bbb00000000, 0xb916022200000000,
+    0x2f26055500000000, 0xbe3bbac500000000, 0x280bbdb200000000,
+    0x925ab42b00000000, 0x046ab35c00000000, 0xa7ffd7c200000000,
+    0x31cfd0b500000000, 0x8b9ed92c00000000, 0x1daede5b00000000,
+    0xb0c2649b00000000, 0x26f263ec00000000, 0x9ca36a7500000000,
+    0x0a936d0200000000, 0xa906099c00000000, 0x3f360eeb00000000,
+    0x8567077200000000, 0x1357000500000000, 0x824abf9500000000,
+    0x147ab8e200000000, 0xae2bb17b00000000, 0x381bb60c00000000,
+    0x9b8ed29200000000, 0x0dbed5e500000000, 0xb7efdc7c00000000,
+    0x21dfdb0b00000000, 0xd4d2d38600000000, 0x42e2d4f100000000,
+    0xf8b3dd6800000000, 0x6e83da1f00000000, 0xcd16be8100000000,
+    0x5b26b9f600000000, 0xe177b06f00000000, 0x7747b71800000000,
+    0xe65a088800000000, 0x706a0fff00000000, 0xca3b066600000000,
+    0x5c0b011100000000, 0xff9e658f00000000, 0x69ae62f800000000,
+    0xd3ff6b6100000000, 0x45cf6c1600000000, 0x78e20aa000000000,
+    0xeed20dd700000000, 0x5483044e00000000, 0xc2b3033900000000,
+    0x612667a700000000, 0xf71660d000000000, 0x4d47694900000000,
+    0xdb776e3e00000000, 0x4a6ad1ae00000000, 0xdc5ad6d900000000,
+    0x660bdf4000000000, 0xf03bd83700000000, 0x53aebca900000000,
+    0xc59ebbde00000000, 0x7fcfb24700000000, 0xe9ffb53000000000,
+    0x1cf2bdbd00000000, 0x8ac2baca00000000, 0x3093b35300000000,
+    0xa6a3b42400000000, 0x0536d0ba00000000, 0x9306d7cd00000000,
+    0x2957de5400000000, 0xbf67d92300000000, 0x2e7a66b300000000,
+    0xb84a61c400000000, 0x021b685d00000000, 0x942b6f2a00000000,
+    0x37be0bb400000000, 0xa18e0cc300000000, 0x1bdf055a00000000,
+    0x8def022d00000000};
+
+#else /* W == 4 */
+
+local const z_word_t FAR crc_big_table[] = {
+    0x00000000, 0x96300777, 0x2c610eee, 0xba510999, 0x19c46d07,
+    0x8ff46a70, 0x35a563e9, 0xa395649e, 0x3288db0e, 0xa4b8dc79,
+    0x1ee9d5e0, 0x88d9d297, 0x2b4cb609, 0xbd7cb17e, 0x072db8e7,
+    0x911dbf90, 0x6410b71d, 0xf220b06a, 0x4871b9f3, 0xde41be84,
+    0x7dd4da1a, 0xebe4dd6d, 0x51b5d4f4, 0xc785d383, 0x56986c13,
+    0xc0a86b64, 0x7af962fd, 0xecc9658a, 0x4f5c0114, 0xd96c0663,
+    0x633d0ffa, 0xf50d088d, 0xc8206e3b, 0x5e10694c, 0xe44160d5,
+    0x727167a2, 0xd1e4033c, 0x47d4044b, 0xfd850dd2, 0x6bb50aa5,
+    0xfaa8b535, 0x6c98b242, 0xd6c9bbdb, 0x40f9bcac, 0xe36cd832,
+    0x755cdf45, 0xcf0dd6dc, 0x593dd1ab, 0xac30d926, 0x3a00de51,
+    0x8051d7c8, 0x1661d0bf, 0xb5f4b421, 0x23c4b356, 0x9995bacf,
+    0x0fa5bdb8, 0x9eb80228, 0x0888055f, 0xb2d90cc6, 0x24e90bb1,
+    0x877c6f2f, 0x114c6858, 0xab1d61c1, 0x3d2d66b6, 0x9041dc76,
+    0x0671db01, 0xbc20d298, 0x2a10d5ef, 0x8985b171, 0x1fb5b606,
+    0xa5e4bf9f, 0x33d4b8e8, 0xa2c90778, 0x34f9000f, 0x8ea80996,
+    0x18980ee1, 0xbb0d6a7f, 0x2d3d6d08, 0x976c6491, 0x015c63e6,
+    0xf4516b6b, 0x62616c1c, 0xd8306585, 0x4e0062f2, 0xed95066c,
+    0x7ba5011b, 0xc1f40882, 0x57c40ff5, 0xc6d9b065, 0x50e9b712,
+    0xeab8be8b, 0x7c88b9fc, 0xdf1ddd62, 0x492dda15, 0xf37cd38c,
+    0x654cd4fb, 0x5861b24d, 0xce51b53a, 0x7400bca3, 0xe230bbd4,
+    0x41a5df4a, 0xd795d83d, 0x6dc4d1a4, 0xfbf4d6d3, 0x6ae96943,
+    0xfcd96e34, 0x468867ad, 0xd0b860da, 0x732d0444, 0xe51d0333,
+    0x5f4c0aaa, 0xc97c0ddd, 0x3c710550, 0xaa410227, 0x10100bbe,
+    0x86200cc9, 0x25b56857, 0xb3856f20, 0x09d466b9, 0x9fe461ce,
+    0x0ef9de5e, 0x98c9d929, 0x2298d0b0, 0xb4a8d7c7, 0x173db359,
+    0x810db42e, 0x3b5cbdb7, 0xad6cbac0, 0x2083b8ed, 0xb6b3bf9a,
+    0x0ce2b603, 0x9ad2b174, 0x3947d5ea, 0xaf77d29d, 0x1526db04,
+    0x8316dc73, 0x120b63e3, 0x843b6494, 0x3e6a6d0d, 0xa85a6a7a,
+    0x0bcf0ee4, 0x9dff0993, 0x27ae000a, 0xb19e077d, 0x44930ff0,
+    0xd2a30887, 0x68f2011e, 0xfec20669, 0x5d5762f7, 0xcb676580,
+    0x71366c19, 0xe7066b6e, 0x761bd4fe, 0xe02bd389, 0x5a7ada10,
+    0xcc4add67, 0x6fdfb9f9, 0xf9efbe8e, 0x43beb717, 0xd58eb060,
+    0xe8a3d6d6, 0x7e93d1a1, 0xc4c2d838, 0x52f2df4f, 0xf167bbd1,
+    0x6757bca6, 0xdd06b53f, 0x4b36b248, 0xda2b0dd8, 0x4c1b0aaf,
+    0xf64a0336, 0x607a0441, 0xc3ef60df, 0x55df67a8, 0xef8e6e31,
+    0x79be6946, 0x8cb361cb, 0x1a8366bc, 0xa0d26f25, 0x36e26852,
+    0x95770ccc, 0x03470bbb, 0xb9160222, 0x2f260555, 0xbe3bbac5,
+    0x280bbdb2, 0x925ab42b, 0x046ab35c, 0xa7ffd7c2, 0x31cfd0b5,
+    0x8b9ed92c, 0x1daede5b, 0xb0c2649b, 0x26f263ec, 0x9ca36a75,
+    0x0a936d02, 0xa906099c, 0x3f360eeb, 0x85670772, 0x13570005,
+    0x824abf95, 0x147ab8e2, 0xae2bb17b, 0x381bb60c, 0x9b8ed292,
+    0x0dbed5e5, 0xb7efdc7c, 0x21dfdb0b, 0xd4d2d386, 0x42e2d4f1,
+    0xf8b3dd68, 0x6e83da1f, 0xcd16be81, 0x5b26b9f6, 0xe177b06f,
+    0x7747b718, 0xe65a0888, 0x706a0fff, 0xca3b0666, 0x5c0b0111,
+    0xff9e658f, 0x69ae62f8, 0xd3ff6b61, 0x45cf6c16, 0x78e20aa0,
+    0xeed20dd7, 0x5483044e, 0xc2b30339, 0x612667a7, 0xf71660d0,
+    0x4d476949, 0xdb776e3e, 0x4a6ad1ae, 0xdc5ad6d9, 0x660bdf40,
+    0xf03bd837, 0x53aebca9, 0xc59ebbde, 0x7fcfb247, 0xe9ffb530,
+    0x1cf2bdbd, 0x8ac2baca, 0x3093b353, 0xa6a3b424, 0x0536d0ba,
+    0x9306d7cd, 0x2957de54, 0xbf67d923, 0x2e7a66b3, 0xb84a61c4,
+    0x021b685d, 0x942b6f2a, 0x37be0bb4, 0xa18e0cc3, 0x1bdf055a,
+    0x8def022d};
+
+#endif
+
+#if N == 1
+
+#if W == 8
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0xccaa009e, 0x4225077d, 0x8e8f07e3, 0x844a0efa,
+    0x48e00e64, 0xc66f0987, 0x0ac50919, 0xd3e51bb5, 0x1f4f1b2b,
+    0x91c01cc8, 0x5d6a1c56, 0x57af154f, 0x9b0515d1, 0x158a1232,
+    0xd92012ac, 0x7cbb312b, 0xb01131b5, 0x3e9e3656, 0xf23436c8,
+    0xf8f13fd1, 0x345b3f4f, 0xbad438ac, 0x767e3832, 0xaf5e2a9e,
+    0x63f42a00, 0xed7b2de3, 0x21d12d7d, 0x2b142464, 0xe7be24fa,
+    0x69312319, 0xa59b2387, 0xf9766256, 0x35dc62c8, 0xbb53652b,
+    0x77f965b5, 0x7d3c6cac, 0xb1966c32, 0x3f196bd1, 0xf3b36b4f,
+    0x2a9379e3, 0xe639797d, 0x68b67e9e, 0xa41c7e00, 0xaed97719,
+    0x62737787, 0xecfc7064, 0x205670fa, 0x85cd537d, 0x496753e3,
+    0xc7e85400, 0x0b42549e, 0x01875d87, 0xcd2d5d19, 0x43a25afa,
+    0x8f085a64, 0x562848c8, 0x9a824856, 0x140d4fb5, 0xd8a74f2b,
+    0xd2624632, 0x1ec846ac, 0x9047414f, 0x5ced41d1, 0x299dc2ed,
+    0xe537c273, 0x6bb8c590, 0xa712c50e, 0xadd7cc17, 0x617dcc89,
+    0xeff2cb6a, 0x2358cbf4, 0xfa78d958, 0x36d2d9c6, 0xb85dde25,
+    0x74f7debb, 0x7e32d7a2, 0xb298d73c, 0x3c17d0df, 0xf0bdd041,
+    0x5526f3c6, 0x998cf358, 0x1703f4bb, 0xdba9f425, 0xd16cfd3c,
+    0x1dc6fda2, 0x9349fa41, 0x5fe3fadf, 0x86c3e873, 0x4a69e8ed,
+    0xc4e6ef0e, 0x084cef90, 0x0289e689, 0xce23e617, 0x40ace1f4,
+    0x8c06e16a, 0xd0eba0bb, 0x1c41a025, 0x92cea7c6, 0x5e64a758,
+    0x54a1ae41, 0x980baedf, 0x1684a93c, 0xda2ea9a2, 0x030ebb0e,
+    0xcfa4bb90, 0x412bbc73, 0x8d81bced, 0x8744b5f4, 0x4beeb56a,
+    0xc561b289, 0x09cbb217, 0xac509190, 0x60fa910e, 0xee7596ed,
+    0x22df9673, 0x281a9f6a, 0xe4b09ff4, 0x6a3f9817, 0xa6959889,
+    0x7fb58a25, 0xb31f8abb, 0x3d908d58, 0xf13a8dc6, 0xfbff84df,
+    0x37558441, 0xb9da83a2, 0x7570833c, 0x533b85da, 0x9f918544,
+    0x111e82a7, 0xddb48239, 0xd7718b20, 0x1bdb8bbe, 0x95548c5d,
+    0x59fe8cc3, 0x80de9e6f, 0x4c749ef1, 0xc2fb9912, 0x0e51998c,
+    0x04949095, 0xc83e900b, 0x46b197e8, 0x8a1b9776, 0x2f80b4f1,
+    0xe32ab46f, 0x6da5b38c, 0xa10fb312, 0xabcaba0b, 0x6760ba95,
+    0xe9efbd76, 0x2545bde8, 0xfc65af44, 0x30cfafda, 0xbe40a839,
+    0x72eaa8a7, 0x782fa1be, 0xb485a120, 0x3a0aa6c3, 0xf6a0a65d,
+    0xaa4de78c, 0x66e7e712, 0xe868e0f1, 0x24c2e06f, 0x2e07e976,
+    0xe2ade9e8, 0x6c22ee0b, 0xa088ee95, 0x79a8fc39, 0xb502fca7,
+    0x3b8dfb44, 0xf727fbda, 0xfde2f2c3, 0x3148f25d, 0xbfc7f5be,
+    0x736df520, 0xd6f6d6a7, 0x1a5cd639, 0x94d3d1da, 0x5879d144,
+    0x52bcd85d, 0x9e16d8c3, 0x1099df20, 0xdc33dfbe, 0x0513cd12,
+    0xc9b9cd8c, 0x4736ca6f, 0x8b9ccaf1, 0x8159c3e8, 0x4df3c376,
+    0xc37cc495, 0x0fd6c40b, 0x7aa64737, 0xb60c47a9, 0x3883404a,
+    0xf42940d4, 0xfeec49cd, 0x32464953, 0xbcc94eb0, 0x70634e2e,
+    0xa9435c82, 0x65e95c1c, 0xeb665bff, 0x27cc5b61, 0x2d095278,
+    0xe1a352e6, 0x6f2c5505, 0xa386559b, 0x061d761c, 0xcab77682,
+    0x44387161, 0x889271ff, 0x825778e6, 0x4efd7878, 0xc0727f9b,
+    0x0cd87f05, 0xd5f86da9, 0x19526d37, 0x97dd6ad4, 0x5b776a4a,
+    0x51b26353, 0x9d1863cd, 0x1397642e, 0xdf3d64b0, 0x83d02561,
+    0x4f7a25ff, 0xc1f5221c, 0x0d5f2282, 0x079a2b9b, 0xcb302b05,
+    0x45bf2ce6, 0x89152c78, 0x50353ed4, 0x9c9f3e4a, 0x121039a9,
+    0xdeba3937, 0xd47f302e, 0x18d530b0, 0x965a3753, 0x5af037cd,
+    0xff6b144a, 0x33c114d4, 0xbd4e1337, 0x71e413a9, 0x7b211ab0,
+    0xb78b1a2e, 0x39041dcd, 0xf5ae1d53, 0x2c8e0fff, 0xe0240f61,
+    0x6eab0882, 0xa201081c, 0xa8c40105, 0x646e019b, 0xeae10678,
+    0x264b06e6},
+   {0x00000000, 0xa6770bb4, 0x979f1129, 0x31e81a9d, 0xf44f2413,
+    0x52382fa7, 0x63d0353a, 0xc5a73e8e, 0x33ef4e67, 0x959845d3,
+    0xa4705f4e, 0x020754fa, 0xc7a06a74, 0x61d761c0, 0x503f7b5d,
+    0xf64870e9, 0x67de9cce, 0xc1a9977a, 0xf0418de7, 0x56368653,
+    0x9391b8dd, 0x35e6b369, 0x040ea9f4, 0xa279a240, 0x5431d2a9,
+    0xf246d91d, 0xc3aec380, 0x65d9c834, 0xa07ef6ba, 0x0609fd0e,
+    0x37e1e793, 0x9196ec27, 0xcfbd399c, 0x69ca3228, 0x582228b5,
+    0xfe552301, 0x3bf21d8f, 0x9d85163b, 0xac6d0ca6, 0x0a1a0712,
+    0xfc5277fb, 0x5a257c4f, 0x6bcd66d2, 0xcdba6d66, 0x081d53e8,
+    0xae6a585c, 0x9f8242c1, 0x39f54975, 0xa863a552, 0x0e14aee6,
+    0x3ffcb47b, 0x998bbfcf, 0x5c2c8141, 0xfa5b8af5, 0xcbb39068,
+    0x6dc49bdc, 0x9b8ceb35, 0x3dfbe081, 0x0c13fa1c, 0xaa64f1a8,
+    0x6fc3cf26, 0xc9b4c492, 0xf85cde0f, 0x5e2bd5bb, 0x440b7579,
+    0xe27c7ecd, 0xd3946450, 0x75e36fe4, 0xb044516a, 0x16335ade,
+    0x27db4043, 0x81ac4bf7, 0x77e43b1e, 0xd19330aa, 0xe07b2a37,
+    0x460c2183, 0x83ab1f0d, 0x25dc14b9, 0x14340e24, 0xb2430590,
+    0x23d5e9b7, 0x85a2e203, 0xb44af89e, 0x123df32a, 0xd79acda4,
+    0x71edc610, 0x4005dc8d, 0xe672d739, 0x103aa7d0, 0xb64dac64,
+    0x87a5b6f9, 0x21d2bd4d, 0xe47583c3, 0x42028877, 0x73ea92ea,
+    0xd59d995e, 0x8bb64ce5, 0x2dc14751, 0x1c295dcc, 0xba5e5678,
+    0x7ff968f6, 0xd98e6342, 0xe86679df, 0x4e11726b, 0xb8590282,
+    0x1e2e0936, 0x2fc613ab, 0x89b1181f, 0x4c162691, 0xea612d25,
+    0xdb8937b8, 0x7dfe3c0c, 0xec68d02b, 0x4a1fdb9f, 0x7bf7c102,
+    0xdd80cab6, 0x1827f438, 0xbe50ff8c, 0x8fb8e511, 0x29cfeea5,
+    0xdf879e4c, 0x79f095f8, 0x48188f65, 0xee6f84d1, 0x2bc8ba5f,
+    0x8dbfb1eb, 0xbc57ab76, 0x1a20a0c2, 0x8816eaf2, 0x2e61e146,
+    0x1f89fbdb, 0xb9fef06f, 0x7c59cee1, 0xda2ec555, 0xebc6dfc8,
+    0x4db1d47c, 0xbbf9a495, 0x1d8eaf21, 0x2c66b5bc, 0x8a11be08,
+    0x4fb68086, 0xe9c18b32, 0xd82991af, 0x7e5e9a1b, 0xefc8763c,
+    0x49bf7d88, 0x78576715, 0xde206ca1, 0x1b87522f, 0xbdf0599b,
+    0x8c184306, 0x2a6f48b2, 0xdc27385b, 0x7a5033ef, 0x4bb82972,
+    0xedcf22c6, 0x28681c48, 0x8e1f17fc, 0xbff70d61, 0x198006d5,
+    0x47abd36e, 0xe1dcd8da, 0xd034c247, 0x7643c9f3, 0xb3e4f77d,
+    0x1593fcc9, 0x247be654, 0x820cede0, 0x74449d09, 0xd23396bd,
+    0xe3db8c20, 0x45ac8794, 0x800bb91a, 0x267cb2ae, 0x1794a833,
+    0xb1e3a387, 0x20754fa0, 0x86024414, 0xb7ea5e89, 0x119d553d,
+    0xd43a6bb3, 0x724d6007, 0x43a57a9a, 0xe5d2712e, 0x139a01c7,
+    0xb5ed0a73, 0x840510ee, 0x22721b5a, 0xe7d525d4, 0x41a22e60,
+    0x704a34fd, 0xd63d3f49, 0xcc1d9f8b, 0x6a6a943f, 0x5b828ea2,
+    0xfdf58516, 0x3852bb98, 0x9e25b02c, 0xafcdaab1, 0x09baa105,
+    0xfff2d1ec, 0x5985da58, 0x686dc0c5, 0xce1acb71, 0x0bbdf5ff,
+    0xadcafe4b, 0x9c22e4d6, 0x3a55ef62, 0xabc30345, 0x0db408f1,
+    0x3c5c126c, 0x9a2b19d8, 0x5f8c2756, 0xf9fb2ce2, 0xc813367f,
+    0x6e643dcb, 0x982c4d22, 0x3e5b4696, 0x0fb35c0b, 0xa9c457bf,
+    0x6c636931, 0xca146285, 0xfbfc7818, 0x5d8b73ac, 0x03a0a617,
+    0xa5d7ada3, 0x943fb73e, 0x3248bc8a, 0xf7ef8204, 0x519889b0,
+    0x6070932d, 0xc6079899, 0x304fe870, 0x9638e3c4, 0xa7d0f959,
+    0x01a7f2ed, 0xc400cc63, 0x6277c7d7, 0x539fdd4a, 0xf5e8d6fe,
+    0x647e3ad9, 0xc209316d, 0xf3e12bf0, 0x55962044, 0x90311eca,
+    0x3646157e, 0x07ae0fe3, 0xa1d90457, 0x579174be, 0xf1e67f0a,
+    0xc00e6597, 0x66796e23, 0xa3de50ad, 0x05a95b19, 0x34414184,
+    0x92364a30},
+   {0x00000000, 0xcb5cd3a5, 0x4dc8a10b, 0x869472ae, 0x9b914216,
+    0x50cd91b3, 0xd659e31d, 0x1d0530b8, 0xec53826d, 0x270f51c8,
+    0xa19b2366, 0x6ac7f0c3, 0x77c2c07b, 0xbc9e13de, 0x3a0a6170,
+    0xf156b2d5, 0x03d6029b, 0xc88ad13e, 0x4e1ea390, 0x85427035,
+    0x9847408d, 0x531b9328, 0xd58fe186, 0x1ed33223, 0xef8580f6,
+    0x24d95353, 0xa24d21fd, 0x6911f258, 0x7414c2e0, 0xbf481145,
+    0x39dc63eb, 0xf280b04e, 0x07ac0536, 0xccf0d693, 0x4a64a43d,
+    0x81387798, 0x9c3d4720, 0x57619485, 0xd1f5e62b, 0x1aa9358e,
+    0xebff875b, 0x20a354fe, 0xa6372650, 0x6d6bf5f5, 0x706ec54d,
+    0xbb3216e8, 0x3da66446, 0xf6fab7e3, 0x047a07ad, 0xcf26d408,
+    0x49b2a6a6, 0x82ee7503, 0x9feb45bb, 0x54b7961e, 0xd223e4b0,
+    0x197f3715, 0xe82985c0, 0x23755665, 0xa5e124cb, 0x6ebdf76e,
+    0x73b8c7d6, 0xb8e41473, 0x3e7066dd, 0xf52cb578, 0x0f580a6c,
+    0xc404d9c9, 0x4290ab67, 0x89cc78c2, 0x94c9487a, 0x5f959bdf,
+    0xd901e971, 0x125d3ad4, 0xe30b8801, 0x28575ba4, 0xaec3290a,
+    0x659ffaaf, 0x789aca17, 0xb3c619b2, 0x35526b1c, 0xfe0eb8b9,
+    0x0c8e08f7, 0xc7d2db52, 0x4146a9fc, 0x8a1a7a59, 0x971f4ae1,
+    0x5c439944, 0xdad7ebea, 0x118b384f, 0xe0dd8a9a, 0x2b81593f,
+    0xad152b91, 0x6649f834, 0x7b4cc88c, 0xb0101b29, 0x36846987,
+    0xfdd8ba22, 0x08f40f5a, 0xc3a8dcff, 0x453cae51, 0x8e607df4,
+    0x93654d4c, 0x58399ee9, 0xdeadec47, 0x15f13fe2, 0xe4a78d37,
+    0x2ffb5e92, 0xa96f2c3c, 0x6233ff99, 0x7f36cf21, 0xb46a1c84,
+    0x32fe6e2a, 0xf9a2bd8f, 0x0b220dc1, 0xc07ede64, 0x46eaacca,
+    0x8db67f6f, 0x90b34fd7, 0x5bef9c72, 0xdd7beedc, 0x16273d79,
+    0xe7718fac, 0x2c2d5c09, 0xaab92ea7, 0x61e5fd02, 0x7ce0cdba,
+    0xb7bc1e1f, 0x31286cb1, 0xfa74bf14, 0x1eb014d8, 0xd5ecc77d,
+    0x5378b5d3, 0x98246676, 0x852156ce, 0x4e7d856b, 0xc8e9f7c5,
+    0x03b52460, 0xf2e396b5, 0x39bf4510, 0xbf2b37be, 0x7477e41b,
+    0x6972d4a3, 0xa22e0706, 0x24ba75a8, 0xefe6a60d, 0x1d661643,
+    0xd63ac5e6, 0x50aeb748, 0x9bf264ed, 0x86f75455, 0x4dab87f0,
+    0xcb3ff55e, 0x006326fb, 0xf135942e, 0x3a69478b, 0xbcfd3525,
+    0x77a1e680, 0x6aa4d638, 0xa1f8059d, 0x276c7733, 0xec30a496,
+    0x191c11ee, 0xd240c24b, 0x54d4b0e5, 0x9f886340, 0x828d53f8,
+    0x49d1805d, 0xcf45f2f3, 0x04192156, 0xf54f9383, 0x3e134026,
+    0xb8873288, 0x73dbe12d, 0x6eded195, 0xa5820230, 0x2316709e,
+    0xe84aa33b, 0x1aca1375, 0xd196c0d0, 0x5702b27e, 0x9c5e61db,
+    0x815b5163, 0x4a0782c6, 0xcc93f068, 0x07cf23cd, 0xf6999118,
+    0x3dc542bd, 0xbb513013, 0x700de3b6, 0x6d08d30e, 0xa65400ab,
+    0x20c07205, 0xeb9ca1a0, 0x11e81eb4, 0xdab4cd11, 0x5c20bfbf,
+    0x977c6c1a, 0x8a795ca2, 0x41258f07, 0xc7b1fda9, 0x0ced2e0c,
+    0xfdbb9cd9, 0x36e74f7c, 0xb0733dd2, 0x7b2fee77, 0x662adecf,
+    0xad760d6a, 0x2be27fc4, 0xe0beac61, 0x123e1c2f, 0xd962cf8a,
+    0x5ff6bd24, 0x94aa6e81, 0x89af5e39, 0x42f38d9c, 0xc467ff32,
+    0x0f3b2c97, 0xfe6d9e42, 0x35314de7, 0xb3a53f49, 0x78f9ecec,
+    0x65fcdc54, 0xaea00ff1, 0x28347d5f, 0xe368aefa, 0x16441b82,
+    0xdd18c827, 0x5b8cba89, 0x90d0692c, 0x8dd55994, 0x46898a31,
+    0xc01df89f, 0x0b412b3a, 0xfa1799ef, 0x314b4a4a, 0xb7df38e4,
+    0x7c83eb41, 0x6186dbf9, 0xaada085c, 0x2c4e7af2, 0xe712a957,
+    0x15921919, 0xdececabc, 0x585ab812, 0x93066bb7, 0x8e035b0f,
+    0x455f88aa, 0xc3cbfa04, 0x089729a1, 0xf9c19b74, 0x329d48d1,
+    0xb4093a7f, 0x7f55e9da, 0x6250d962, 0xa90c0ac7, 0x2f987869,
+    0xe4c4abcc},
+   {0x00000000, 0x3d6029b0, 0x7ac05360, 0x47a07ad0, 0xf580a6c0,
+    0xc8e08f70, 0x8f40f5a0, 0xb220dc10, 0x30704bc1, 0x0d106271,
+    0x4ab018a1, 0x77d03111, 0xc5f0ed01, 0xf890c4b1, 0xbf30be61,
+    0x825097d1, 0x60e09782, 0x5d80be32, 0x1a20c4e2, 0x2740ed52,
+    0x95603142, 0xa80018f2, 0xefa06222, 0xd2c04b92, 0x5090dc43,
+    0x6df0f5f3, 0x2a508f23, 0x1730a693, 0xa5107a83, 0x98705333,
+    0xdfd029e3, 0xe2b00053, 0xc1c12f04, 0xfca106b4, 0xbb017c64,
+    0x866155d4, 0x344189c4, 0x0921a074, 0x4e81daa4, 0x73e1f314,
+    0xf1b164c5, 0xccd14d75, 0x8b7137a5, 0xb6111e15, 0x0431c205,
+    0x3951ebb5, 0x7ef19165, 0x4391b8d5, 0xa121b886, 0x9c419136,
+    0xdbe1ebe6, 0xe681c256, 0x54a11e46, 0x69c137f6, 0x2e614d26,
+    0x13016496, 0x9151f347, 0xac31daf7, 0xeb91a027, 0xd6f18997,
+    0x64d15587, 0x59b17c37, 0x1e1106e7, 0x23712f57, 0x58f35849,
+    0x659371f9, 0x22330b29, 0x1f532299, 0xad73fe89, 0x9013d739,
+    0xd7b3ade9, 0xead38459, 0x68831388, 0x55e33a38, 0x124340e8,
+    0x2f236958, 0x9d03b548, 0xa0639cf8, 0xe7c3e628, 0xdaa3cf98,
+    0x3813cfcb, 0x0573e67b, 0x42d39cab, 0x7fb3b51b, 0xcd93690b,
+    0xf0f340bb, 0xb7533a6b, 0x8a3313db, 0x0863840a, 0x3503adba,
+    0x72a3d76a, 0x4fc3feda, 0xfde322ca, 0xc0830b7a, 0x872371aa,
+    0xba43581a, 0x9932774d, 0xa4525efd, 0xe3f2242d, 0xde920d9d,
+    0x6cb2d18d, 0x51d2f83d, 0x167282ed, 0x2b12ab5d, 0xa9423c8c,
+    0x9422153c, 0xd3826fec, 0xeee2465c, 0x5cc29a4c, 0x61a2b3fc,
+    0x2602c92c, 0x1b62e09c, 0xf9d2e0cf, 0xc4b2c97f, 0x8312b3af,
+    0xbe729a1f, 0x0c52460f, 0x31326fbf, 0x7692156f, 0x4bf23cdf,
+    0xc9a2ab0e, 0xf4c282be, 0xb362f86e, 0x8e02d1de, 0x3c220dce,
+    0x0142247e, 0x46e25eae, 0x7b82771e, 0xb1e6b092, 0x8c869922,
+    0xcb26e3f2, 0xf646ca42, 0x44661652, 0x79063fe2, 0x3ea64532,
+    0x03c66c82, 0x8196fb53, 0xbcf6d2e3, 0xfb56a833, 0xc6368183,
+    0x74165d93, 0x49767423, 0x0ed60ef3, 0x33b62743, 0xd1062710,
+    0xec660ea0, 0xabc67470, 0x96a65dc0, 0x248681d0, 0x19e6a860,
+    0x5e46d2b0, 0x6326fb00, 0xe1766cd1, 0xdc164561, 0x9bb63fb1,
+    0xa6d61601, 0x14f6ca11, 0x2996e3a1, 0x6e369971, 0x5356b0c1,
+    0x70279f96, 0x4d47b626, 0x0ae7ccf6, 0x3787e546, 0x85a73956,
+    0xb8c710e6, 0xff676a36, 0xc2074386, 0x4057d457, 0x7d37fde7,
+    0x3a978737, 0x07f7ae87, 0xb5d77297, 0x88b75b27, 0xcf1721f7,
+    0xf2770847, 0x10c70814, 0x2da721a4, 0x6a075b74, 0x576772c4,
+    0xe547aed4, 0xd8278764, 0x9f87fdb4, 0xa2e7d404, 0x20b743d5,
+    0x1dd76a65, 0x5a7710b5, 0x67173905, 0xd537e515, 0xe857cca5,
+    0xaff7b675, 0x92979fc5, 0xe915e8db, 0xd475c16b, 0x93d5bbbb,
+    0xaeb5920b, 0x1c954e1b, 0x21f567ab, 0x66551d7b, 0x5b3534cb,
+    0xd965a31a, 0xe4058aaa, 0xa3a5f07a, 0x9ec5d9ca, 0x2ce505da,
+    0x11852c6a, 0x562556ba, 0x6b457f0a, 0x89f57f59, 0xb49556e9,
+    0xf3352c39, 0xce550589, 0x7c75d999, 0x4115f029, 0x06b58af9,
+    0x3bd5a349, 0xb9853498, 0x84e51d28, 0xc34567f8, 0xfe254e48,
+    0x4c059258, 0x7165bbe8, 0x36c5c138, 0x0ba5e888, 0x28d4c7df,
+    0x15b4ee6f, 0x521494bf, 0x6f74bd0f, 0xdd54611f, 0xe03448af,
+    0xa794327f, 0x9af41bcf, 0x18a48c1e, 0x25c4a5ae, 0x6264df7e,
+    0x5f04f6ce, 0xed242ade, 0xd044036e, 0x97e479be, 0xaa84500e,
+    0x4834505d, 0x755479ed, 0x32f4033d, 0x0f942a8d, 0xbdb4f69d,
+    0x80d4df2d, 0xc774a5fd, 0xfa148c4d, 0x78441b9c, 0x4524322c,
+    0x028448fc, 0x3fe4614c, 0x8dc4bd5c, 0xb0a494ec, 0xf704ee3c,
+    0xca64c78c},
+   {0x00000000, 0xb8bc6765, 0xaa09c88b, 0x12b5afee, 0x8f629757,
+    0x37def032, 0x256b5fdc, 0x9dd738b9, 0xc5b428ef, 0x7d084f8a,
+    0x6fbde064, 0xd7018701, 0x4ad6bfb8, 0xf26ad8dd, 0xe0df7733,
+    0x58631056, 0x5019579f, 0xe8a530fa, 0xfa109f14, 0x42acf871,
+    0xdf7bc0c8, 0x67c7a7ad, 0x75720843, 0xcdce6f26, 0x95ad7f70,
+    0x2d111815, 0x3fa4b7fb, 0x8718d09e, 0x1acfe827, 0xa2738f42,
+    0xb0c620ac, 0x087a47c9, 0xa032af3e, 0x188ec85b, 0x0a3b67b5,
+    0xb28700d0, 0x2f503869, 0x97ec5f0c, 0x8559f0e2, 0x3de59787,
+    0x658687d1, 0xdd3ae0b4, 0xcf8f4f5a, 0x7733283f, 0xeae41086,
+    0x525877e3, 0x40edd80d, 0xf851bf68, 0xf02bf8a1, 0x48979fc4,
+    0x5a22302a, 0xe29e574f, 0x7f496ff6, 0xc7f50893, 0xd540a77d,
+    0x6dfcc018, 0x359fd04e, 0x8d23b72b, 0x9f9618c5, 0x272a7fa0,
+    0xbafd4719, 0x0241207c, 0x10f48f92, 0xa848e8f7, 0x9b14583d,
+    0x23a83f58, 0x311d90b6, 0x89a1f7d3, 0x1476cf6a, 0xaccaa80f,
+    0xbe7f07e1, 0x06c36084, 0x5ea070d2, 0xe61c17b7, 0xf4a9b859,
+    0x4c15df3c, 0xd1c2e785, 0x697e80e0, 0x7bcb2f0e, 0xc377486b,
+    0xcb0d0fa2, 0x73b168c7, 0x6104c729, 0xd9b8a04c, 0x446f98f5,
+    0xfcd3ff90, 0xee66507e, 0x56da371b, 0x0eb9274d, 0xb6054028,
+    0xa4b0efc6, 0x1c0c88a3, 0x81dbb01a, 0x3967d77f, 0x2bd27891,
+    0x936e1ff4, 0x3b26f703, 0x839a9066, 0x912f3f88, 0x299358ed,
+    0xb4446054, 0x0cf80731, 0x1e4da8df, 0xa6f1cfba, 0xfe92dfec,
+    0x462eb889, 0x549b1767, 0xec277002, 0x71f048bb, 0xc94c2fde,
+    0xdbf98030, 0x6345e755, 0x6b3fa09c, 0xd383c7f9, 0xc1366817,
+    0x798a0f72, 0xe45d37cb, 0x5ce150ae, 0x4e54ff40, 0xf6e89825,
+    0xae8b8873, 0x1637ef16, 0x048240f8, 0xbc3e279d, 0x21e91f24,
+    0x99557841, 0x8be0d7af, 0x335cb0ca, 0xed59b63b, 0x55e5d15e,
+    0x47507eb0, 0xffec19d5, 0x623b216c, 0xda874609, 0xc832e9e7,
+    0x708e8e82, 0x28ed9ed4, 0x9051f9b1, 0x82e4565f, 0x3a58313a,
+    0xa78f0983, 0x1f336ee6, 0x0d86c108, 0xb53aa66d, 0xbd40e1a4,
+    0x05fc86c1, 0x1749292f, 0xaff54e4a, 0x322276f3, 0x8a9e1196,
+    0x982bbe78, 0x2097d91d, 0x78f4c94b, 0xc048ae2e, 0xd2fd01c0,
+    0x6a4166a5, 0xf7965e1c, 0x4f2a3979, 0x5d9f9697, 0xe523f1f2,
+    0x4d6b1905, 0xf5d77e60, 0xe762d18e, 0x5fdeb6eb, 0xc2098e52,
+    0x7ab5e937, 0x680046d9, 0xd0bc21bc, 0x88df31ea, 0x3063568f,
+    0x22d6f961, 0x9a6a9e04, 0x07bda6bd, 0xbf01c1d8, 0xadb46e36,
+    0x15080953, 0x1d724e9a, 0xa5ce29ff, 0xb77b8611, 0x0fc7e174,
+    0x9210d9cd, 0x2aacbea8, 0x38191146, 0x80a57623, 0xd8c66675,
+    0x607a0110, 0x72cfaefe, 0xca73c99b, 0x57a4f122, 0xef189647,
+    0xfdad39a9, 0x45115ecc, 0x764dee06, 0xcef18963, 0xdc44268d,
+    0x64f841e8, 0xf92f7951, 0x41931e34, 0x5326b1da, 0xeb9ad6bf,
+    0xb3f9c6e9, 0x0b45a18c, 0x19f00e62, 0xa14c6907, 0x3c9b51be,
+    0x842736db, 0x96929935, 0x2e2efe50, 0x2654b999, 0x9ee8defc,
+    0x8c5d7112, 0x34e11677, 0xa9362ece, 0x118a49ab, 0x033fe645,
+    0xbb838120, 0xe3e09176, 0x5b5cf613, 0x49e959fd, 0xf1553e98,
+    0x6c820621, 0xd43e6144, 0xc68bceaa, 0x7e37a9cf, 0xd67f4138,
+    0x6ec3265d, 0x7c7689b3, 0xc4caeed6, 0x591dd66f, 0xe1a1b10a,
+    0xf3141ee4, 0x4ba87981, 0x13cb69d7, 0xab770eb2, 0xb9c2a15c,
+    0x017ec639, 0x9ca9fe80, 0x241599e5, 0x36a0360b, 0x8e1c516e,
+    0x866616a7, 0x3eda71c2, 0x2c6fde2c, 0x94d3b949, 0x090481f0,
+    0xb1b8e695, 0xa30d497b, 0x1bb12e1e, 0x43d23e48, 0xfb6e592d,
+    0xe9dbf6c3, 0x516791a6, 0xccb0a91f, 0x740cce7a, 0x66b96194,
+    0xde0506f1},
+   {0x00000000, 0x01c26a37, 0x0384d46e, 0x0246be59, 0x0709a8dc,
+    0x06cbc2eb, 0x048d7cb2, 0x054f1685, 0x0e1351b8, 0x0fd13b8f,
+    0x0d9785d6, 0x0c55efe1, 0x091af964, 0x08d89353, 0x0a9e2d0a,
+    0x0b5c473d, 0x1c26a370, 0x1de4c947, 0x1fa2771e, 0x1e601d29,
+    0x1b2f0bac, 0x1aed619b, 0x18abdfc2, 0x1969b5f5, 0x1235f2c8,
+    0x13f798ff, 0x11b126a6, 0x10734c91, 0x153c5a14, 0x14fe3023,
+    0x16b88e7a, 0x177ae44d, 0x384d46e0, 0x398f2cd7, 0x3bc9928e,
+    0x3a0bf8b9, 0x3f44ee3c, 0x3e86840b, 0x3cc03a52, 0x3d025065,
+    0x365e1758, 0x379c7d6f, 0x35dac336, 0x3418a901, 0x3157bf84,
+    0x3095d5b3, 0x32d36bea, 0x331101dd, 0x246be590, 0x25a98fa7,
+    0x27ef31fe, 0x262d5bc9, 0x23624d4c, 0x22a0277b, 0x20e69922,
+    0x2124f315, 0x2a78b428, 0x2bbade1f, 0x29fc6046, 0x283e0a71,
+    0x2d711cf4, 0x2cb376c3, 0x2ef5c89a, 0x2f37a2ad, 0x709a8dc0,
+    0x7158e7f7, 0x731e59ae, 0x72dc3399, 0x7793251c, 0x76514f2b,
+    0x7417f172, 0x75d59b45, 0x7e89dc78, 0x7f4bb64f, 0x7d0d0816,
+    0x7ccf6221, 0x798074a4, 0x78421e93, 0x7a04a0ca, 0x7bc6cafd,
+    0x6cbc2eb0, 0x6d7e4487, 0x6f38fade, 0x6efa90e9, 0x6bb5866c,
+    0x6a77ec5b, 0x68315202, 0x69f33835, 0x62af7f08, 0x636d153f,
+    0x612bab66, 0x60e9c151, 0x65a6d7d4, 0x6464bde3, 0x662203ba,
+    0x67e0698d, 0x48d7cb20, 0x4915a117, 0x4b531f4e, 0x4a917579,
+    0x4fde63fc, 0x4e1c09cb, 0x4c5ab792, 0x4d98dda5, 0x46c49a98,
+    0x4706f0af, 0x45404ef6, 0x448224c1, 0x41cd3244, 0x400f5873,
+    0x4249e62a, 0x438b8c1d, 0x54f16850, 0x55330267, 0x5775bc3e,
+    0x56b7d609, 0x53f8c08c, 0x523aaabb, 0x507c14e2, 0x51be7ed5,
+    0x5ae239e8, 0x5b2053df, 0x5966ed86, 0x58a487b1, 0x5deb9134,
+    0x5c29fb03, 0x5e6f455a, 0x5fad2f6d, 0xe1351b80, 0xe0f771b7,
+    0xe2b1cfee, 0xe373a5d9, 0xe63cb35c, 0xe7fed96b, 0xe5b86732,
+    0xe47a0d05, 0xef264a38, 0xeee4200f, 0xeca29e56, 0xed60f461,
+    0xe82fe2e4, 0xe9ed88d3, 0xebab368a, 0xea695cbd, 0xfd13b8f0,
+    0xfcd1d2c7, 0xfe976c9e, 0xff5506a9, 0xfa1a102c, 0xfbd87a1b,
+    0xf99ec442, 0xf85cae75, 0xf300e948, 0xf2c2837f, 0xf0843d26,
+    0xf1465711, 0xf4094194, 0xf5cb2ba3, 0xf78d95fa, 0xf64fffcd,
+    0xd9785d60, 0xd8ba3757, 0xdafc890e, 0xdb3ee339, 0xde71f5bc,
+    0xdfb39f8b, 0xddf521d2, 0xdc374be5, 0xd76b0cd8, 0xd6a966ef,
+    0xd4efd8b6, 0xd52db281, 0xd062a404, 0xd1a0ce33, 0xd3e6706a,
+    0xd2241a5d, 0xc55efe10, 0xc49c9427, 0xc6da2a7e, 0xc7184049,
+    0xc25756cc, 0xc3953cfb, 0xc1d382a2, 0xc011e895, 0xcb4dafa8,
+    0xca8fc59f, 0xc8c97bc6, 0xc90b11f1, 0xcc440774, 0xcd866d43,
+    0xcfc0d31a, 0xce02b92d, 0x91af9640, 0x906dfc77, 0x922b422e,
+    0x93e92819, 0x96a63e9c, 0x976454ab, 0x9522eaf2, 0x94e080c5,
+    0x9fbcc7f8, 0x9e7eadcf, 0x9c381396, 0x9dfa79a1, 0x98b56f24,
+    0x99770513, 0x9b31bb4a, 0x9af3d17d, 0x8d893530, 0x8c4b5f07,
+    0x8e0de15e, 0x8fcf8b69, 0x8a809dec, 0x8b42f7db, 0x89044982,
+    0x88c623b5, 0x839a6488, 0x82580ebf, 0x801eb0e6, 0x81dcdad1,
+    0x8493cc54, 0x8551a663, 0x8717183a, 0x86d5720d, 0xa9e2d0a0,
+    0xa820ba97, 0xaa6604ce, 0xaba46ef9, 0xaeeb787c, 0xaf29124b,
+    0xad6fac12, 0xacadc625, 0xa7f18118, 0xa633eb2f, 0xa4755576,
+    0xa5b73f41, 0xa0f829c4, 0xa13a43f3, 0xa37cfdaa, 0xa2be979d,
+    0xb5c473d0, 0xb40619e7, 0xb640a7be, 0xb782cd89, 0xb2cddb0c,
+    0xb30fb13b, 0xb1490f62, 0xb08b6555, 0xbbd72268, 0xba15485f,
+    0xb853f606, 0xb9919c31, 0xbcde8ab4, 0xbd1ce083, 0xbf5a5eda,
+    0xbe9834ed},
+   {0x00000000, 0x191b3141, 0x32366282, 0x2b2d53c3, 0x646cc504,
+    0x7d77f445, 0x565aa786, 0x4f4196c7, 0xc8d98a08, 0xd1c2bb49,
+    0xfaefe88a, 0xe3f4d9cb, 0xacb54f0c, 0xb5ae7e4d, 0x9e832d8e,
+    0x87981ccf, 0x4ac21251, 0x53d92310, 0x78f470d3, 0x61ef4192,
+    0x2eaed755, 0x37b5e614, 0x1c98b5d7, 0x05838496, 0x821b9859,
+    0x9b00a918, 0xb02dfadb, 0xa936cb9a, 0xe6775d5d, 0xff6c6c1c,
+    0xd4413fdf, 0xcd5a0e9e, 0x958424a2, 0x8c9f15e3, 0xa7b24620,
+    0xbea97761, 0xf1e8e1a6, 0xe8f3d0e7, 0xc3de8324, 0xdac5b265,
+    0x5d5daeaa, 0x44469feb, 0x6f6bcc28, 0x7670fd69, 0x39316bae,
+    0x202a5aef, 0x0b07092c, 0x121c386d, 0xdf4636f3, 0xc65d07b2,
+    0xed705471, 0xf46b6530, 0xbb2af3f7, 0xa231c2b6, 0x891c9175,
+    0x9007a034, 0x179fbcfb, 0x0e848dba, 0x25a9de79, 0x3cb2ef38,
+    0x73f379ff, 0x6ae848be, 0x41c51b7d, 0x58de2a3c, 0xf0794f05,
+    0xe9627e44, 0xc24f2d87, 0xdb541cc6, 0x94158a01, 0x8d0ebb40,
+    0xa623e883, 0xbf38d9c2, 0x38a0c50d, 0x21bbf44c, 0x0a96a78f,
+    0x138d96ce, 0x5ccc0009, 0x45d73148, 0x6efa628b, 0x77e153ca,
+    0xbabb5d54, 0xa3a06c15, 0x888d3fd6, 0x91960e97, 0xded79850,
+    0xc7cca911, 0xece1fad2, 0xf5facb93, 0x7262d75c, 0x6b79e61d,
+    0x4054b5de, 0x594f849f, 0x160e1258, 0x0f152319, 0x243870da,
+    0x3d23419b, 0x65fd6ba7, 0x7ce65ae6, 0x57cb0925, 0x4ed03864,
+    0x0191aea3, 0x188a9fe2, 0x33a7cc21, 0x2abcfd60, 0xad24e1af,
+    0xb43fd0ee, 0x9f12832d, 0x8609b26c, 0xc94824ab, 0xd05315ea,
+    0xfb7e4629, 0xe2657768, 0x2f3f79f6, 0x362448b7, 0x1d091b74,
+    0x04122a35, 0x4b53bcf2, 0x52488db3, 0x7965de70, 0x607eef31,
+    0xe7e6f3fe, 0xfefdc2bf, 0xd5d0917c, 0xcccba03d, 0x838a36fa,
+    0x9a9107bb, 0xb1bc5478, 0xa8a76539, 0x3b83984b, 0x2298a90a,
+    0x09b5fac9, 0x10aecb88, 0x5fef5d4f, 0x46f46c0e, 0x6dd93fcd,
+    0x74c20e8c, 0xf35a1243, 0xea412302, 0xc16c70c1, 0xd8774180,
+    0x9736d747, 0x8e2de606, 0xa500b5c5, 0xbc1b8484, 0x71418a1a,
+    0x685abb5b, 0x4377e898, 0x5a6cd9d9, 0x152d4f1e, 0x0c367e5f,
+    0x271b2d9c, 0x3e001cdd, 0xb9980012, 0xa0833153, 0x8bae6290,
+    0x92b553d1, 0xddf4c516, 0xc4eff457, 0xefc2a794, 0xf6d996d5,
+    0xae07bce9, 0xb71c8da8, 0x9c31de6b, 0x852aef2a, 0xca6b79ed,
+    0xd37048ac, 0xf85d1b6f, 0xe1462a2e, 0x66de36e1, 0x7fc507a0,
+    0x54e85463, 0x4df36522, 0x02b2f3e5, 0x1ba9c2a4, 0x30849167,
+    0x299fa026, 0xe4c5aeb8, 0xfdde9ff9, 0xd6f3cc3a, 0xcfe8fd7b,
+    0x80a96bbc, 0x99b25afd, 0xb29f093e, 0xab84387f, 0x2c1c24b0,
+    0x350715f1, 0x1e2a4632, 0x07317773, 0x4870e1b4, 0x516bd0f5,
+    0x7a468336, 0x635db277, 0xcbfad74e, 0xd2e1e60f, 0xf9ccb5cc,
+    0xe0d7848d, 0xaf96124a, 0xb68d230b, 0x9da070c8, 0x84bb4189,
+    0x03235d46, 0x1a386c07, 0x31153fc4, 0x280e0e85, 0x674f9842,
+    0x7e54a903, 0x5579fac0, 0x4c62cb81, 0x8138c51f, 0x9823f45e,
+    0xb30ea79d, 0xaa1596dc, 0xe554001b, 0xfc4f315a, 0xd7626299,
+    0xce7953d8, 0x49e14f17, 0x50fa7e56, 0x7bd72d95, 0x62cc1cd4,
+    0x2d8d8a13, 0x3496bb52, 0x1fbbe891, 0x06a0d9d0, 0x5e7ef3ec,
+    0x4765c2ad, 0x6c48916e, 0x7553a02f, 0x3a1236e8, 0x230907a9,
+    0x0824546a, 0x113f652b, 0x96a779e4, 0x8fbc48a5, 0xa4911b66,
+    0xbd8a2a27, 0xf2cbbce0, 0xebd08da1, 0xc0fdde62, 0xd9e6ef23,
+    0x14bce1bd, 0x0da7d0fc, 0x268a833f, 0x3f91b27e, 0x70d024b9,
+    0x69cb15f8, 0x42e6463b, 0x5bfd777a, 0xdc656bb5, 0xc57e5af4,
+    0xee530937, 0xf7483876, 0xb809aeb1, 0xa1129ff0, 0x8a3fcc33,
+    0x9324fd72},
+   {0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419,
+    0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4,
+    0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07,
+    0x90bf1d91, 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
+    0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856,
+    0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
+    0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4,
+    0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
+    0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3,
+    0x45df5c75, 0xdcd60dcf, 0xabd13d59, 0x26d930ac, 0x51de003a,
+    0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599,
+    0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
+    0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190,
+    0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f,
+    0x9fbfe4a5, 0xe8b8d433, 0x7807c9a2, 0x0f00f934, 0x9609a88e,
+    0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
+    0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed,
+    0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
+    0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3,
+    0xfbd44c65, 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,
+    0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a,
+    0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5,
+    0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, 0xbe0b1010,
+    0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+    0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17,
+    0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6,
+    0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615,
+    0x73dc1683, 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
+    0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, 0xf00f9344,
+    0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
+    0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a,
+    0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
+    0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1,
+    0xa6bc5767, 0x3fb506dd, 0x48b2364b, 0xd80d2bda, 0xaf0a1b4c,
+    0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef,
+    0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
+    0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe,
+    0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31,
+    0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c,
+    0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
+    0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b,
+    0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
+    0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1,
+    0x18b74777, 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
+    0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, 0xa00ae278,
+    0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7,
+    0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66,
+    0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+    0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605,
+    0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8,
+    0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b,
+    0x2d02ef8d}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x0000000000000000, 0x9630077700000000, 0x2c610eee00000000,
+    0xba51099900000000, 0x19c46d0700000000, 0x8ff46a7000000000,
+    0x35a563e900000000, 0xa395649e00000000, 0x3288db0e00000000,
+    0xa4b8dc7900000000, 0x1ee9d5e000000000, 0x88d9d29700000000,
+    0x2b4cb60900000000, 0xbd7cb17e00000000, 0x072db8e700000000,
+    0x911dbf9000000000, 0x6410b71d00000000, 0xf220b06a00000000,
+    0x4871b9f300000000, 0xde41be8400000000, 0x7dd4da1a00000000,
+    0xebe4dd6d00000000, 0x51b5d4f400000000, 0xc785d38300000000,
+    0x56986c1300000000, 0xc0a86b6400000000, 0x7af962fd00000000,
+    0xecc9658a00000000, 0x4f5c011400000000, 0xd96c066300000000,
+    0x633d0ffa00000000, 0xf50d088d00000000, 0xc8206e3b00000000,
+    0x5e10694c00000000, 0xe44160d500000000, 0x727167a200000000,
+    0xd1e4033c00000000, 0x47d4044b00000000, 0xfd850dd200000000,
+    0x6bb50aa500000000, 0xfaa8b53500000000, 0x6c98b24200000000,
+    0xd6c9bbdb00000000, 0x40f9bcac00000000, 0xe36cd83200000000,
+    0x755cdf4500000000, 0xcf0dd6dc00000000, 0x593dd1ab00000000,
+    0xac30d92600000000, 0x3a00de5100000000, 0x8051d7c800000000,
+    0x1661d0bf00000000, 0xb5f4b42100000000, 0x23c4b35600000000,
+    0x9995bacf00000000, 0x0fa5bdb800000000, 0x9eb8022800000000,
+    0x0888055f00000000, 0xb2d90cc600000000, 0x24e90bb100000000,
+    0x877c6f2f00000000, 0x114c685800000000, 0xab1d61c100000000,
+    0x3d2d66b600000000, 0x9041dc7600000000, 0x0671db0100000000,
+    0xbc20d29800000000, 0x2a10d5ef00000000, 0x8985b17100000000,
+    0x1fb5b60600000000, 0xa5e4bf9f00000000, 0x33d4b8e800000000,
+    0xa2c9077800000000, 0x34f9000f00000000, 0x8ea8099600000000,
+    0x18980ee100000000, 0xbb0d6a7f00000000, 0x2d3d6d0800000000,
+    0x976c649100000000, 0x015c63e600000000, 0xf4516b6b00000000,
+    0x62616c1c00000000, 0xd830658500000000, 0x4e0062f200000000,
+    0xed95066c00000000, 0x7ba5011b00000000, 0xc1f4088200000000,
+    0x57c40ff500000000, 0xc6d9b06500000000, 0x50e9b71200000000,
+    0xeab8be8b00000000, 0x7c88b9fc00000000, 0xdf1ddd6200000000,
+    0x492dda1500000000, 0xf37cd38c00000000, 0x654cd4fb00000000,
+    0x5861b24d00000000, 0xce51b53a00000000, 0x7400bca300000000,
+    0xe230bbd400000000, 0x41a5df4a00000000, 0xd795d83d00000000,
+    0x6dc4d1a400000000, 0xfbf4d6d300000000, 0x6ae9694300000000,
+    0xfcd96e3400000000, 0x468867ad00000000, 0xd0b860da00000000,
+    0x732d044400000000, 0xe51d033300000000, 0x5f4c0aaa00000000,
+    0xc97c0ddd00000000, 0x3c71055000000000, 0xaa41022700000000,
+    0x10100bbe00000000, 0x86200cc900000000, 0x25b5685700000000,
+    0xb3856f2000000000, 0x09d466b900000000, 0x9fe461ce00000000,
+    0x0ef9de5e00000000, 0x98c9d92900000000, 0x2298d0b000000000,
+    0xb4a8d7c700000000, 0x173db35900000000, 0x810db42e00000000,
+    0x3b5cbdb700000000, 0xad6cbac000000000, 0x2083b8ed00000000,
+    0xb6b3bf9a00000000, 0x0ce2b60300000000, 0x9ad2b17400000000,
+    0x3947d5ea00000000, 0xaf77d29d00000000, 0x1526db0400000000,
+    0x8316dc7300000000, 0x120b63e300000000, 0x843b649400000000,
+    0x3e6a6d0d00000000, 0xa85a6a7a00000000, 0x0bcf0ee400000000,
+    0x9dff099300000000, 0x27ae000a00000000, 0xb19e077d00000000,
+    0x44930ff000000000, 0xd2a3088700000000, 0x68f2011e00000000,
+    0xfec2066900000000, 0x5d5762f700000000, 0xcb67658000000000,
+    0x71366c1900000000, 0xe7066b6e00000000, 0x761bd4fe00000000,
+    0xe02bd38900000000, 0x5a7ada1000000000, 0xcc4add6700000000,
+    0x6fdfb9f900000000, 0xf9efbe8e00000000, 0x43beb71700000000,
+    0xd58eb06000000000, 0xe8a3d6d600000000, 0x7e93d1a100000000,
+    0xc4c2d83800000000, 0x52f2df4f00000000, 0xf167bbd100000000,
+    0x6757bca600000000, 0xdd06b53f00000000, 0x4b36b24800000000,
+    0xda2b0dd800000000, 0x4c1b0aaf00000000, 0xf64a033600000000,
+    0x607a044100000000, 0xc3ef60df00000000, 0x55df67a800000000,
+    0xef8e6e3100000000, 0x79be694600000000, 0x8cb361cb00000000,
+    0x1a8366bc00000000, 0xa0d26f2500000000, 0x36e2685200000000,
+    0x95770ccc00000000, 0x03470bbb00000000, 0xb916022200000000,
+    0x2f26055500000000, 0xbe3bbac500000000, 0x280bbdb200000000,
+    0x925ab42b00000000, 0x046ab35c00000000, 0xa7ffd7c200000000,
+    0x31cfd0b500000000, 0x8b9ed92c00000000, 0x1daede5b00000000,
+    0xb0c2649b00000000, 0x26f263ec00000000, 0x9ca36a7500000000,
+    0x0a936d0200000000, 0xa906099c00000000, 0x3f360eeb00000000,
+    0x8567077200000000, 0x1357000500000000, 0x824abf9500000000,
+    0x147ab8e200000000, 0xae2bb17b00000000, 0x381bb60c00000000,
+    0x9b8ed29200000000, 0x0dbed5e500000000, 0xb7efdc7c00000000,
+    0x21dfdb0b00000000, 0xd4d2d38600000000, 0x42e2d4f100000000,
+    0xf8b3dd6800000000, 0x6e83da1f00000000, 0xcd16be8100000000,
+    0x5b26b9f600000000, 0xe177b06f00000000, 0x7747b71800000000,
+    0xe65a088800000000, 0x706a0fff00000000, 0xca3b066600000000,
+    0x5c0b011100000000, 0xff9e658f00000000, 0x69ae62f800000000,
+    0xd3ff6b6100000000, 0x45cf6c1600000000, 0x78e20aa000000000,
+    0xeed20dd700000000, 0x5483044e00000000, 0xc2b3033900000000,
+    0x612667a700000000, 0xf71660d000000000, 0x4d47694900000000,
+    0xdb776e3e00000000, 0x4a6ad1ae00000000, 0xdc5ad6d900000000,
+    0x660bdf4000000000, 0xf03bd83700000000, 0x53aebca900000000,
+    0xc59ebbde00000000, 0x7fcfb24700000000, 0xe9ffb53000000000,
+    0x1cf2bdbd00000000, 0x8ac2baca00000000, 0x3093b35300000000,
+    0xa6a3b42400000000, 0x0536d0ba00000000, 0x9306d7cd00000000,
+    0x2957de5400000000, 0xbf67d92300000000, 0x2e7a66b300000000,
+    0xb84a61c400000000, 0x021b685d00000000, 0x942b6f2a00000000,
+    0x37be0bb400000000, 0xa18e0cc300000000, 0x1bdf055a00000000,
+    0x8def022d00000000},
+   {0x0000000000000000, 0x41311b1900000000, 0x8262363200000000,
+    0xc3532d2b00000000, 0x04c56c6400000000, 0x45f4777d00000000,
+    0x86a75a5600000000, 0xc796414f00000000, 0x088ad9c800000000,
+    0x49bbc2d100000000, 0x8ae8effa00000000, 0xcbd9f4e300000000,
+    0x0c4fb5ac00000000, 0x4d7eaeb500000000, 0x8e2d839e00000000,
+    0xcf1c988700000000, 0x5112c24a00000000, 0x1023d95300000000,
+    0xd370f47800000000, 0x9241ef6100000000, 0x55d7ae2e00000000,
+    0x14e6b53700000000, 0xd7b5981c00000000, 0x9684830500000000,
+    0x59981b8200000000, 0x18a9009b00000000, 0xdbfa2db000000000,
+    0x9acb36a900000000, 0x5d5d77e600000000, 0x1c6c6cff00000000,
+    0xdf3f41d400000000, 0x9e0e5acd00000000, 0xa224849500000000,
+    0xe3159f8c00000000, 0x2046b2a700000000, 0x6177a9be00000000,
+    0xa6e1e8f100000000, 0xe7d0f3e800000000, 0x2483dec300000000,
+    0x65b2c5da00000000, 0xaaae5d5d00000000, 0xeb9f464400000000,
+    0x28cc6b6f00000000, 0x69fd707600000000, 0xae6b313900000000,
+    0xef5a2a2000000000, 0x2c09070b00000000, 0x6d381c1200000000,
+    0xf33646df00000000, 0xb2075dc600000000, 0x715470ed00000000,
+    0x30656bf400000000, 0xf7f32abb00000000, 0xb6c231a200000000,
+    0x75911c8900000000, 0x34a0079000000000, 0xfbbc9f1700000000,
+    0xba8d840e00000000, 0x79dea92500000000, 0x38efb23c00000000,
+    0xff79f37300000000, 0xbe48e86a00000000, 0x7d1bc54100000000,
+    0x3c2ade5800000000, 0x054f79f000000000, 0x447e62e900000000,
+    0x872d4fc200000000, 0xc61c54db00000000, 0x018a159400000000,
+    0x40bb0e8d00000000, 0x83e823a600000000, 0xc2d938bf00000000,
+    0x0dc5a03800000000, 0x4cf4bb2100000000, 0x8fa7960a00000000,
+    0xce968d1300000000, 0x0900cc5c00000000, 0x4831d74500000000,
+    0x8b62fa6e00000000, 0xca53e17700000000, 0x545dbbba00000000,
+    0x156ca0a300000000, 0xd63f8d8800000000, 0x970e969100000000,
+    0x5098d7de00000000, 0x11a9ccc700000000, 0xd2fae1ec00000000,
+    0x93cbfaf500000000, 0x5cd7627200000000, 0x1de6796b00000000,
+    0xdeb5544000000000, 0x9f844f5900000000, 0x58120e1600000000,
+    0x1923150f00000000, 0xda70382400000000, 0x9b41233d00000000,
+    0xa76bfd6500000000, 0xe65ae67c00000000, 0x2509cb5700000000,
+    0x6438d04e00000000, 0xa3ae910100000000, 0xe29f8a1800000000,
+    0x21cca73300000000, 0x60fdbc2a00000000, 0xafe124ad00000000,
+    0xeed03fb400000000, 0x2d83129f00000000, 0x6cb2098600000000,
+    0xab2448c900000000, 0xea1553d000000000, 0x29467efb00000000,
+    0x687765e200000000, 0xf6793f2f00000000, 0xb748243600000000,
+    0x741b091d00000000, 0x352a120400000000, 0xf2bc534b00000000,
+    0xb38d485200000000, 0x70de657900000000, 0x31ef7e6000000000,
+    0xfef3e6e700000000, 0xbfc2fdfe00000000, 0x7c91d0d500000000,
+    0x3da0cbcc00000000, 0xfa368a8300000000, 0xbb07919a00000000,
+    0x7854bcb100000000, 0x3965a7a800000000, 0x4b98833b00000000,
+    0x0aa9982200000000, 0xc9fab50900000000, 0x88cbae1000000000,
+    0x4f5def5f00000000, 0x0e6cf44600000000, 0xcd3fd96d00000000,
+    0x8c0ec27400000000, 0x43125af300000000, 0x022341ea00000000,
+    0xc1706cc100000000, 0x804177d800000000, 0x47d7369700000000,
+    0x06e62d8e00000000, 0xc5b500a500000000, 0x84841bbc00000000,
+    0x1a8a417100000000, 0x5bbb5a6800000000, 0x98e8774300000000,
+    0xd9d96c5a00000000, 0x1e4f2d1500000000, 0x5f7e360c00000000,
+    0x9c2d1b2700000000, 0xdd1c003e00000000, 0x120098b900000000,
+    0x533183a000000000, 0x9062ae8b00000000, 0xd153b59200000000,
+    0x16c5f4dd00000000, 0x57f4efc400000000, 0x94a7c2ef00000000,
+    0xd596d9f600000000, 0xe9bc07ae00000000, 0xa88d1cb700000000,
+    0x6bde319c00000000, 0x2aef2a8500000000, 0xed796bca00000000,
+    0xac4870d300000000, 0x6f1b5df800000000, 0x2e2a46e100000000,
+    0xe136de6600000000, 0xa007c57f00000000, 0x6354e85400000000,
+    0x2265f34d00000000, 0xe5f3b20200000000, 0xa4c2a91b00000000,
+    0x6791843000000000, 0x26a09f2900000000, 0xb8aec5e400000000,
+    0xf99fdefd00000000, 0x3accf3d600000000, 0x7bfde8cf00000000,
+    0xbc6ba98000000000, 0xfd5ab29900000000, 0x3e099fb200000000,
+    0x7f3884ab00000000, 0xb0241c2c00000000, 0xf115073500000000,
+    0x32462a1e00000000, 0x7377310700000000, 0xb4e1704800000000,
+    0xf5d06b5100000000, 0x3683467a00000000, 0x77b25d6300000000,
+    0x4ed7facb00000000, 0x0fe6e1d200000000, 0xccb5ccf900000000,
+    0x8d84d7e000000000, 0x4a1296af00000000, 0x0b238db600000000,
+    0xc870a09d00000000, 0x8941bb8400000000, 0x465d230300000000,
+    0x076c381a00000000, 0xc43f153100000000, 0x850e0e2800000000,
+    0x42984f6700000000, 0x03a9547e00000000, 0xc0fa795500000000,
+    0x81cb624c00000000, 0x1fc5388100000000, 0x5ef4239800000000,
+    0x9da70eb300000000, 0xdc9615aa00000000, 0x1b0054e500000000,
+    0x5a314ffc00000000, 0x996262d700000000, 0xd85379ce00000000,
+    0x174fe14900000000, 0x567efa5000000000, 0x952dd77b00000000,
+    0xd41ccc6200000000, 0x138a8d2d00000000, 0x52bb963400000000,
+    0x91e8bb1f00000000, 0xd0d9a00600000000, 0xecf37e5e00000000,
+    0xadc2654700000000, 0x6e91486c00000000, 0x2fa0537500000000,
+    0xe836123a00000000, 0xa907092300000000, 0x6a54240800000000,
+    0x2b653f1100000000, 0xe479a79600000000, 0xa548bc8f00000000,
+    0x661b91a400000000, 0x272a8abd00000000, 0xe0bccbf200000000,
+    0xa18dd0eb00000000, 0x62defdc000000000, 0x23efe6d900000000,
+    0xbde1bc1400000000, 0xfcd0a70d00000000, 0x3f838a2600000000,
+    0x7eb2913f00000000, 0xb924d07000000000, 0xf815cb6900000000,
+    0x3b46e64200000000, 0x7a77fd5b00000000, 0xb56b65dc00000000,
+    0xf45a7ec500000000, 0x370953ee00000000, 0x763848f700000000,
+    0xb1ae09b800000000, 0xf09f12a100000000, 0x33cc3f8a00000000,
+    0x72fd249300000000},
+   {0x0000000000000000, 0x376ac20100000000, 0x6ed4840300000000,
+    0x59be460200000000, 0xdca8090700000000, 0xebc2cb0600000000,
+    0xb27c8d0400000000, 0x85164f0500000000, 0xb851130e00000000,
+    0x8f3bd10f00000000, 0xd685970d00000000, 0xe1ef550c00000000,
+    0x64f91a0900000000, 0x5393d80800000000, 0x0a2d9e0a00000000,
+    0x3d475c0b00000000, 0x70a3261c00000000, 0x47c9e41d00000000,
+    0x1e77a21f00000000, 0x291d601e00000000, 0xac0b2f1b00000000,
+    0x9b61ed1a00000000, 0xc2dfab1800000000, 0xf5b5691900000000,
+    0xc8f2351200000000, 0xff98f71300000000, 0xa626b11100000000,
+    0x914c731000000000, 0x145a3c1500000000, 0x2330fe1400000000,
+    0x7a8eb81600000000, 0x4de47a1700000000, 0xe0464d3800000000,
+    0xd72c8f3900000000, 0x8e92c93b00000000, 0xb9f80b3a00000000,
+    0x3cee443f00000000, 0x0b84863e00000000, 0x523ac03c00000000,
+    0x6550023d00000000, 0x58175e3600000000, 0x6f7d9c3700000000,
+    0x36c3da3500000000, 0x01a9183400000000, 0x84bf573100000000,
+    0xb3d5953000000000, 0xea6bd33200000000, 0xdd01113300000000,
+    0x90e56b2400000000, 0xa78fa92500000000, 0xfe31ef2700000000,
+    0xc95b2d2600000000, 0x4c4d622300000000, 0x7b27a02200000000,
+    0x2299e62000000000, 0x15f3242100000000, 0x28b4782a00000000,
+    0x1fdeba2b00000000, 0x4660fc2900000000, 0x710a3e2800000000,
+    0xf41c712d00000000, 0xc376b32c00000000, 0x9ac8f52e00000000,
+    0xada2372f00000000, 0xc08d9a7000000000, 0xf7e7587100000000,
+    0xae591e7300000000, 0x9933dc7200000000, 0x1c25937700000000,
+    0x2b4f517600000000, 0x72f1177400000000, 0x459bd57500000000,
+    0x78dc897e00000000, 0x4fb64b7f00000000, 0x16080d7d00000000,
+    0x2162cf7c00000000, 0xa474807900000000, 0x931e427800000000,
+    0xcaa0047a00000000, 0xfdcac67b00000000, 0xb02ebc6c00000000,
+    0x87447e6d00000000, 0xdefa386f00000000, 0xe990fa6e00000000,
+    0x6c86b56b00000000, 0x5bec776a00000000, 0x0252316800000000,
+    0x3538f36900000000, 0x087faf6200000000, 0x3f156d6300000000,
+    0x66ab2b6100000000, 0x51c1e96000000000, 0xd4d7a66500000000,
+    0xe3bd646400000000, 0xba03226600000000, 0x8d69e06700000000,
+    0x20cbd74800000000, 0x17a1154900000000, 0x4e1f534b00000000,
+    0x7975914a00000000, 0xfc63de4f00000000, 0xcb091c4e00000000,
+    0x92b75a4c00000000, 0xa5dd984d00000000, 0x989ac44600000000,
+    0xaff0064700000000, 0xf64e404500000000, 0xc124824400000000,
+    0x4432cd4100000000, 0x73580f4000000000, 0x2ae6494200000000,
+    0x1d8c8b4300000000, 0x5068f15400000000, 0x6702335500000000,
+    0x3ebc755700000000, 0x09d6b75600000000, 0x8cc0f85300000000,
+    0xbbaa3a5200000000, 0xe2147c5000000000, 0xd57ebe5100000000,
+    0xe839e25a00000000, 0xdf53205b00000000, 0x86ed665900000000,
+    0xb187a45800000000, 0x3491eb5d00000000, 0x03fb295c00000000,
+    0x5a456f5e00000000, 0x6d2fad5f00000000, 0x801b35e100000000,
+    0xb771f7e000000000, 0xeecfb1e200000000, 0xd9a573e300000000,
+    0x5cb33ce600000000, 0x6bd9fee700000000, 0x3267b8e500000000,
+    0x050d7ae400000000, 0x384a26ef00000000, 0x0f20e4ee00000000,
+    0x569ea2ec00000000, 0x61f460ed00000000, 0xe4e22fe800000000,
+    0xd388ede900000000, 0x8a36abeb00000000, 0xbd5c69ea00000000,
+    0xf0b813fd00000000, 0xc7d2d1fc00000000, 0x9e6c97fe00000000,
+    0xa90655ff00000000, 0x2c101afa00000000, 0x1b7ad8fb00000000,
+    0x42c49ef900000000, 0x75ae5cf800000000, 0x48e900f300000000,
+    0x7f83c2f200000000, 0x263d84f000000000, 0x115746f100000000,
+    0x944109f400000000, 0xa32bcbf500000000, 0xfa958df700000000,
+    0xcdff4ff600000000, 0x605d78d900000000, 0x5737bad800000000,
+    0x0e89fcda00000000, 0x39e33edb00000000, 0xbcf571de00000000,
+    0x8b9fb3df00000000, 0xd221f5dd00000000, 0xe54b37dc00000000,
+    0xd80c6bd700000000, 0xef66a9d600000000, 0xb6d8efd400000000,
+    0x81b22dd500000000, 0x04a462d000000000, 0x33cea0d100000000,
+    0x6a70e6d300000000, 0x5d1a24d200000000, 0x10fe5ec500000000,
+    0x27949cc400000000, 0x7e2adac600000000, 0x494018c700000000,
+    0xcc5657c200000000, 0xfb3c95c300000000, 0xa282d3c100000000,
+    0x95e811c000000000, 0xa8af4dcb00000000, 0x9fc58fca00000000,
+    0xc67bc9c800000000, 0xf1110bc900000000, 0x740744cc00000000,
+    0x436d86cd00000000, 0x1ad3c0cf00000000, 0x2db902ce00000000,
+    0x4096af9100000000, 0x77fc6d9000000000, 0x2e422b9200000000,
+    0x1928e99300000000, 0x9c3ea69600000000, 0xab54649700000000,
+    0xf2ea229500000000, 0xc580e09400000000, 0xf8c7bc9f00000000,
+    0xcfad7e9e00000000, 0x9613389c00000000, 0xa179fa9d00000000,
+    0x246fb59800000000, 0x1305779900000000, 0x4abb319b00000000,
+    0x7dd1f39a00000000, 0x3035898d00000000, 0x075f4b8c00000000,
+    0x5ee10d8e00000000, 0x698bcf8f00000000, 0xec9d808a00000000,
+    0xdbf7428b00000000, 0x8249048900000000, 0xb523c68800000000,
+    0x88649a8300000000, 0xbf0e588200000000, 0xe6b01e8000000000,
+    0xd1dadc8100000000, 0x54cc938400000000, 0x63a6518500000000,
+    0x3a18178700000000, 0x0d72d58600000000, 0xa0d0e2a900000000,
+    0x97ba20a800000000, 0xce0466aa00000000, 0xf96ea4ab00000000,
+    0x7c78ebae00000000, 0x4b1229af00000000, 0x12ac6fad00000000,
+    0x25c6adac00000000, 0x1881f1a700000000, 0x2feb33a600000000,
+    0x765575a400000000, 0x413fb7a500000000, 0xc429f8a000000000,
+    0xf3433aa100000000, 0xaafd7ca300000000, 0x9d97bea200000000,
+    0xd073c4b500000000, 0xe71906b400000000, 0xbea740b600000000,
+    0x89cd82b700000000, 0x0cdbcdb200000000, 0x3bb10fb300000000,
+    0x620f49b100000000, 0x55658bb000000000, 0x6822d7bb00000000,
+    0x5f4815ba00000000, 0x06f653b800000000, 0x319c91b900000000,
+    0xb48adebc00000000, 0x83e01cbd00000000, 0xda5e5abf00000000,
+    0xed3498be00000000},
+   {0x0000000000000000, 0x6567bcb800000000, 0x8bc809aa00000000,
+    0xeeafb51200000000, 0x5797628f00000000, 0x32f0de3700000000,
+    0xdc5f6b2500000000, 0xb938d79d00000000, 0xef28b4c500000000,
+    0x8a4f087d00000000, 0x64e0bd6f00000000, 0x018701d700000000,
+    0xb8bfd64a00000000, 0xddd86af200000000, 0x3377dfe000000000,
+    0x5610635800000000, 0x9f57195000000000, 0xfa30a5e800000000,
+    0x149f10fa00000000, 0x71f8ac4200000000, 0xc8c07bdf00000000,
+    0xada7c76700000000, 0x4308727500000000, 0x266fcecd00000000,
+    0x707fad9500000000, 0x1518112d00000000, 0xfbb7a43f00000000,
+    0x9ed0188700000000, 0x27e8cf1a00000000, 0x428f73a200000000,
+    0xac20c6b000000000, 0xc9477a0800000000, 0x3eaf32a000000000,
+    0x5bc88e1800000000, 0xb5673b0a00000000, 0xd00087b200000000,
+    0x6938502f00000000, 0x0c5fec9700000000, 0xe2f0598500000000,
+    0x8797e53d00000000, 0xd187866500000000, 0xb4e03add00000000,
+    0x5a4f8fcf00000000, 0x3f28337700000000, 0x8610e4ea00000000,
+    0xe377585200000000, 0x0dd8ed4000000000, 0x68bf51f800000000,
+    0xa1f82bf000000000, 0xc49f974800000000, 0x2a30225a00000000,
+    0x4f579ee200000000, 0xf66f497f00000000, 0x9308f5c700000000,
+    0x7da740d500000000, 0x18c0fc6d00000000, 0x4ed09f3500000000,
+    0x2bb7238d00000000, 0xc518969f00000000, 0xa07f2a2700000000,
+    0x1947fdba00000000, 0x7c20410200000000, 0x928ff41000000000,
+    0xf7e848a800000000, 0x3d58149b00000000, 0x583fa82300000000,
+    0xb6901d3100000000, 0xd3f7a18900000000, 0x6acf761400000000,
+    0x0fa8caac00000000, 0xe1077fbe00000000, 0x8460c30600000000,
+    0xd270a05e00000000, 0xb7171ce600000000, 0x59b8a9f400000000,
+    0x3cdf154c00000000, 0x85e7c2d100000000, 0xe0807e6900000000,
+    0x0e2fcb7b00000000, 0x6b4877c300000000, 0xa20f0dcb00000000,
+    0xc768b17300000000, 0x29c7046100000000, 0x4ca0b8d900000000,
+    0xf5986f4400000000, 0x90ffd3fc00000000, 0x7e5066ee00000000,
+    0x1b37da5600000000, 0x4d27b90e00000000, 0x284005b600000000,
+    0xc6efb0a400000000, 0xa3880c1c00000000, 0x1ab0db8100000000,
+    0x7fd7673900000000, 0x9178d22b00000000, 0xf41f6e9300000000,
+    0x03f7263b00000000, 0x66909a8300000000, 0x883f2f9100000000,
+    0xed58932900000000, 0x546044b400000000, 0x3107f80c00000000,
+    0xdfa84d1e00000000, 0xbacff1a600000000, 0xecdf92fe00000000,
+    0x89b82e4600000000, 0x67179b5400000000, 0x027027ec00000000,
+    0xbb48f07100000000, 0xde2f4cc900000000, 0x3080f9db00000000,
+    0x55e7456300000000, 0x9ca03f6b00000000, 0xf9c783d300000000,
+    0x176836c100000000, 0x720f8a7900000000, 0xcb375de400000000,
+    0xae50e15c00000000, 0x40ff544e00000000, 0x2598e8f600000000,
+    0x73888bae00000000, 0x16ef371600000000, 0xf840820400000000,
+    0x9d273ebc00000000, 0x241fe92100000000, 0x4178559900000000,
+    0xafd7e08b00000000, 0xcab05c3300000000, 0x3bb659ed00000000,
+    0x5ed1e55500000000, 0xb07e504700000000, 0xd519ecff00000000,
+    0x6c213b6200000000, 0x094687da00000000, 0xe7e932c800000000,
+    0x828e8e7000000000, 0xd49eed2800000000, 0xb1f9519000000000,
+    0x5f56e48200000000, 0x3a31583a00000000, 0x83098fa700000000,
+    0xe66e331f00000000, 0x08c1860d00000000, 0x6da63ab500000000,
+    0xa4e140bd00000000, 0xc186fc0500000000, 0x2f29491700000000,
+    0x4a4ef5af00000000, 0xf376223200000000, 0x96119e8a00000000,
+    0x78be2b9800000000, 0x1dd9972000000000, 0x4bc9f47800000000,
+    0x2eae48c000000000, 0xc001fdd200000000, 0xa566416a00000000,
+    0x1c5e96f700000000, 0x79392a4f00000000, 0x97969f5d00000000,
+    0xf2f123e500000000, 0x05196b4d00000000, 0x607ed7f500000000,
+    0x8ed162e700000000, 0xebb6de5f00000000, 0x528e09c200000000,
+    0x37e9b57a00000000, 0xd946006800000000, 0xbc21bcd000000000,
+    0xea31df8800000000, 0x8f56633000000000, 0x61f9d62200000000,
+    0x049e6a9a00000000, 0xbda6bd0700000000, 0xd8c101bf00000000,
+    0x366eb4ad00000000, 0x5309081500000000, 0x9a4e721d00000000,
+    0xff29cea500000000, 0x11867bb700000000, 0x74e1c70f00000000,
+    0xcdd9109200000000, 0xa8beac2a00000000, 0x4611193800000000,
+    0x2376a58000000000, 0x7566c6d800000000, 0x10017a6000000000,
+    0xfeaecf7200000000, 0x9bc973ca00000000, 0x22f1a45700000000,
+    0x479618ef00000000, 0xa939adfd00000000, 0xcc5e114500000000,
+    0x06ee4d7600000000, 0x6389f1ce00000000, 0x8d2644dc00000000,
+    0xe841f86400000000, 0x51792ff900000000, 0x341e934100000000,
+    0xdab1265300000000, 0xbfd69aeb00000000, 0xe9c6f9b300000000,
+    0x8ca1450b00000000, 0x620ef01900000000, 0x07694ca100000000,
+    0xbe519b3c00000000, 0xdb36278400000000, 0x3599929600000000,
+    0x50fe2e2e00000000, 0x99b9542600000000, 0xfcdee89e00000000,
+    0x12715d8c00000000, 0x7716e13400000000, 0xce2e36a900000000,
+    0xab498a1100000000, 0x45e63f0300000000, 0x208183bb00000000,
+    0x7691e0e300000000, 0x13f65c5b00000000, 0xfd59e94900000000,
+    0x983e55f100000000, 0x2106826c00000000, 0x44613ed400000000,
+    0xaace8bc600000000, 0xcfa9377e00000000, 0x38417fd600000000,
+    0x5d26c36e00000000, 0xb389767c00000000, 0xd6eecac400000000,
+    0x6fd61d5900000000, 0x0ab1a1e100000000, 0xe41e14f300000000,
+    0x8179a84b00000000, 0xd769cb1300000000, 0xb20e77ab00000000,
+    0x5ca1c2b900000000, 0x39c67e0100000000, 0x80fea99c00000000,
+    0xe599152400000000, 0x0b36a03600000000, 0x6e511c8e00000000,
+    0xa716668600000000, 0xc271da3e00000000, 0x2cde6f2c00000000,
+    0x49b9d39400000000, 0xf081040900000000, 0x95e6b8b100000000,
+    0x7b490da300000000, 0x1e2eb11b00000000, 0x483ed24300000000,
+    0x2d596efb00000000, 0xc3f6dbe900000000, 0xa691675100000000,
+    0x1fa9b0cc00000000, 0x7ace0c7400000000, 0x9461b96600000000,
+    0xf10605de00000000},
+   {0x0000000000000000, 0xb029603d00000000, 0x6053c07a00000000,
+    0xd07aa04700000000, 0xc0a680f500000000, 0x708fe0c800000000,
+    0xa0f5408f00000000, 0x10dc20b200000000, 0xc14b703000000000,
+    0x7162100d00000000, 0xa118b04a00000000, 0x1131d07700000000,
+    0x01edf0c500000000, 0xb1c490f800000000, 0x61be30bf00000000,
+    0xd197508200000000, 0x8297e06000000000, 0x32be805d00000000,
+    0xe2c4201a00000000, 0x52ed402700000000, 0x4231609500000000,
+    0xf21800a800000000, 0x2262a0ef00000000, 0x924bc0d200000000,
+    0x43dc905000000000, 0xf3f5f06d00000000, 0x238f502a00000000,
+    0x93a6301700000000, 0x837a10a500000000, 0x3353709800000000,
+    0xe329d0df00000000, 0x5300b0e200000000, 0x042fc1c100000000,
+    0xb406a1fc00000000, 0x647c01bb00000000, 0xd455618600000000,
+    0xc489413400000000, 0x74a0210900000000, 0xa4da814e00000000,
+    0x14f3e17300000000, 0xc564b1f100000000, 0x754dd1cc00000000,
+    0xa537718b00000000, 0x151e11b600000000, 0x05c2310400000000,
+    0xb5eb513900000000, 0x6591f17e00000000, 0xd5b8914300000000,
+    0x86b821a100000000, 0x3691419c00000000, 0xe6ebe1db00000000,
+    0x56c281e600000000, 0x461ea15400000000, 0xf637c16900000000,
+    0x264d612e00000000, 0x9664011300000000, 0x47f3519100000000,
+    0xf7da31ac00000000, 0x27a091eb00000000, 0x9789f1d600000000,
+    0x8755d16400000000, 0x377cb15900000000, 0xe706111e00000000,
+    0x572f712300000000, 0x4958f35800000000, 0xf971936500000000,
+    0x290b332200000000, 0x9922531f00000000, 0x89fe73ad00000000,
+    0x39d7139000000000, 0xe9adb3d700000000, 0x5984d3ea00000000,
+    0x8813836800000000, 0x383ae35500000000, 0xe840431200000000,
+    0x5869232f00000000, 0x48b5039d00000000, 0xf89c63a000000000,
+    0x28e6c3e700000000, 0x98cfa3da00000000, 0xcbcf133800000000,
+    0x7be6730500000000, 0xab9cd34200000000, 0x1bb5b37f00000000,
+    0x0b6993cd00000000, 0xbb40f3f000000000, 0x6b3a53b700000000,
+    0xdb13338a00000000, 0x0a84630800000000, 0xbaad033500000000,
+    0x6ad7a37200000000, 0xdafec34f00000000, 0xca22e3fd00000000,
+    0x7a0b83c000000000, 0xaa71238700000000, 0x1a5843ba00000000,
+    0x4d77329900000000, 0xfd5e52a400000000, 0x2d24f2e300000000,
+    0x9d0d92de00000000, 0x8dd1b26c00000000, 0x3df8d25100000000,
+    0xed82721600000000, 0x5dab122b00000000, 0x8c3c42a900000000,
+    0x3c15229400000000, 0xec6f82d300000000, 0x5c46e2ee00000000,
+    0x4c9ac25c00000000, 0xfcb3a26100000000, 0x2cc9022600000000,
+    0x9ce0621b00000000, 0xcfe0d2f900000000, 0x7fc9b2c400000000,
+    0xafb3128300000000, 0x1f9a72be00000000, 0x0f46520c00000000,
+    0xbf6f323100000000, 0x6f15927600000000, 0xdf3cf24b00000000,
+    0x0eaba2c900000000, 0xbe82c2f400000000, 0x6ef862b300000000,
+    0xded1028e00000000, 0xce0d223c00000000, 0x7e24420100000000,
+    0xae5ee24600000000, 0x1e77827b00000000, 0x92b0e6b100000000,
+    0x2299868c00000000, 0xf2e326cb00000000, 0x42ca46f600000000,
+    0x5216664400000000, 0xe23f067900000000, 0x3245a63e00000000,
+    0x826cc60300000000, 0x53fb968100000000, 0xe3d2f6bc00000000,
+    0x33a856fb00000000, 0x838136c600000000, 0x935d167400000000,
+    0x2374764900000000, 0xf30ed60e00000000, 0x4327b63300000000,
+    0x102706d100000000, 0xa00e66ec00000000, 0x7074c6ab00000000,
+    0xc05da69600000000, 0xd081862400000000, 0x60a8e61900000000,
+    0xb0d2465e00000000, 0x00fb266300000000, 0xd16c76e100000000,
+    0x614516dc00000000, 0xb13fb69b00000000, 0x0116d6a600000000,
+    0x11caf61400000000, 0xa1e3962900000000, 0x7199366e00000000,
+    0xc1b0565300000000, 0x969f277000000000, 0x26b6474d00000000,
+    0xf6cce70a00000000, 0x46e5873700000000, 0x5639a78500000000,
+    0xe610c7b800000000, 0x366a67ff00000000, 0x864307c200000000,
+    0x57d4574000000000, 0xe7fd377d00000000, 0x3787973a00000000,
+    0x87aef70700000000, 0x9772d7b500000000, 0x275bb78800000000,
+    0xf72117cf00000000, 0x470877f200000000, 0x1408c71000000000,
+    0xa421a72d00000000, 0x745b076a00000000, 0xc472675700000000,
+    0xd4ae47e500000000, 0x648727d800000000, 0xb4fd879f00000000,
+    0x04d4e7a200000000, 0xd543b72000000000, 0x656ad71d00000000,
+    0xb510775a00000000, 0x0539176700000000, 0x15e537d500000000,
+    0xa5cc57e800000000, 0x75b6f7af00000000, 0xc59f979200000000,
+    0xdbe815e900000000, 0x6bc175d400000000, 0xbbbbd59300000000,
+    0x0b92b5ae00000000, 0x1b4e951c00000000, 0xab67f52100000000,
+    0x7b1d556600000000, 0xcb34355b00000000, 0x1aa365d900000000,
+    0xaa8a05e400000000, 0x7af0a5a300000000, 0xcad9c59e00000000,
+    0xda05e52c00000000, 0x6a2c851100000000, 0xba56255600000000,
+    0x0a7f456b00000000, 0x597ff58900000000, 0xe95695b400000000,
+    0x392c35f300000000, 0x890555ce00000000, 0x99d9757c00000000,
+    0x29f0154100000000, 0xf98ab50600000000, 0x49a3d53b00000000,
+    0x983485b900000000, 0x281de58400000000, 0xf86745c300000000,
+    0x484e25fe00000000, 0x5892054c00000000, 0xe8bb657100000000,
+    0x38c1c53600000000, 0x88e8a50b00000000, 0xdfc7d42800000000,
+    0x6feeb41500000000, 0xbf94145200000000, 0x0fbd746f00000000,
+    0x1f6154dd00000000, 0xaf4834e000000000, 0x7f3294a700000000,
+    0xcf1bf49a00000000, 0x1e8ca41800000000, 0xaea5c42500000000,
+    0x7edf646200000000, 0xcef6045f00000000, 0xde2a24ed00000000,
+    0x6e0344d000000000, 0xbe79e49700000000, 0x0e5084aa00000000,
+    0x5d50344800000000, 0xed79547500000000, 0x3d03f43200000000,
+    0x8d2a940f00000000, 0x9df6b4bd00000000, 0x2ddfd48000000000,
+    0xfda574c700000000, 0x4d8c14fa00000000, 0x9c1b447800000000,
+    0x2c32244500000000, 0xfc48840200000000, 0x4c61e43f00000000,
+    0x5cbdc48d00000000, 0xec94a4b000000000, 0x3cee04f700000000,
+    0x8cc764ca00000000},
+   {0x0000000000000000, 0xa5d35ccb00000000, 0x0ba1c84d00000000,
+    0xae72948600000000, 0x1642919b00000000, 0xb391cd5000000000,
+    0x1de359d600000000, 0xb830051d00000000, 0x6d8253ec00000000,
+    0xc8510f2700000000, 0x66239ba100000000, 0xc3f0c76a00000000,
+    0x7bc0c27700000000, 0xde139ebc00000000, 0x70610a3a00000000,
+    0xd5b256f100000000, 0x9b02d60300000000, 0x3ed18ac800000000,
+    0x90a31e4e00000000, 0x3570428500000000, 0x8d40479800000000,
+    0x28931b5300000000, 0x86e18fd500000000, 0x2332d31e00000000,
+    0xf68085ef00000000, 0x5353d92400000000, 0xfd214da200000000,
+    0x58f2116900000000, 0xe0c2147400000000, 0x451148bf00000000,
+    0xeb63dc3900000000, 0x4eb080f200000000, 0x3605ac0700000000,
+    0x93d6f0cc00000000, 0x3da4644a00000000, 0x9877388100000000,
+    0x20473d9c00000000, 0x8594615700000000, 0x2be6f5d100000000,
+    0x8e35a91a00000000, 0x5b87ffeb00000000, 0xfe54a32000000000,
+    0x502637a600000000, 0xf5f56b6d00000000, 0x4dc56e7000000000,
+    0xe81632bb00000000, 0x4664a63d00000000, 0xe3b7faf600000000,
+    0xad077a0400000000, 0x08d426cf00000000, 0xa6a6b24900000000,
+    0x0375ee8200000000, 0xbb45eb9f00000000, 0x1e96b75400000000,
+    0xb0e423d200000000, 0x15377f1900000000, 0xc08529e800000000,
+    0x6556752300000000, 0xcb24e1a500000000, 0x6ef7bd6e00000000,
+    0xd6c7b87300000000, 0x7314e4b800000000, 0xdd66703e00000000,
+    0x78b52cf500000000, 0x6c0a580f00000000, 0xc9d904c400000000,
+    0x67ab904200000000, 0xc278cc8900000000, 0x7a48c99400000000,
+    0xdf9b955f00000000, 0x71e901d900000000, 0xd43a5d1200000000,
+    0x01880be300000000, 0xa45b572800000000, 0x0a29c3ae00000000,
+    0xaffa9f6500000000, 0x17ca9a7800000000, 0xb219c6b300000000,
+    0x1c6b523500000000, 0xb9b80efe00000000, 0xf7088e0c00000000,
+    0x52dbd2c700000000, 0xfca9464100000000, 0x597a1a8a00000000,
+    0xe14a1f9700000000, 0x4499435c00000000, 0xeaebd7da00000000,
+    0x4f388b1100000000, 0x9a8adde000000000, 0x3f59812b00000000,
+    0x912b15ad00000000, 0x34f8496600000000, 0x8cc84c7b00000000,
+    0x291b10b000000000, 0x8769843600000000, 0x22bad8fd00000000,
+    0x5a0ff40800000000, 0xffdca8c300000000, 0x51ae3c4500000000,
+    0xf47d608e00000000, 0x4c4d659300000000, 0xe99e395800000000,
+    0x47ecadde00000000, 0xe23ff11500000000, 0x378da7e400000000,
+    0x925efb2f00000000, 0x3c2c6fa900000000, 0x99ff336200000000,
+    0x21cf367f00000000, 0x841c6ab400000000, 0x2a6efe3200000000,
+    0x8fbda2f900000000, 0xc10d220b00000000, 0x64de7ec000000000,
+    0xcaacea4600000000, 0x6f7fb68d00000000, 0xd74fb39000000000,
+    0x729cef5b00000000, 0xdcee7bdd00000000, 0x793d271600000000,
+    0xac8f71e700000000, 0x095c2d2c00000000, 0xa72eb9aa00000000,
+    0x02fde56100000000, 0xbacde07c00000000, 0x1f1ebcb700000000,
+    0xb16c283100000000, 0x14bf74fa00000000, 0xd814b01e00000000,
+    0x7dc7ecd500000000, 0xd3b5785300000000, 0x7666249800000000,
+    0xce56218500000000, 0x6b857d4e00000000, 0xc5f7e9c800000000,
+    0x6024b50300000000, 0xb596e3f200000000, 0x1045bf3900000000,
+    0xbe372bbf00000000, 0x1be4777400000000, 0xa3d4726900000000,
+    0x06072ea200000000, 0xa875ba2400000000, 0x0da6e6ef00000000,
+    0x4316661d00000000, 0xe6c53ad600000000, 0x48b7ae5000000000,
+    0xed64f29b00000000, 0x5554f78600000000, 0xf087ab4d00000000,
+    0x5ef53fcb00000000, 0xfb26630000000000, 0x2e9435f100000000,
+    0x8b47693a00000000, 0x2535fdbc00000000, 0x80e6a17700000000,
+    0x38d6a46a00000000, 0x9d05f8a100000000, 0x33776c2700000000,
+    0x96a430ec00000000, 0xee111c1900000000, 0x4bc240d200000000,
+    0xe5b0d45400000000, 0x4063889f00000000, 0xf8538d8200000000,
+    0x5d80d14900000000, 0xf3f245cf00000000, 0x5621190400000000,
+    0x83934ff500000000, 0x2640133e00000000, 0x883287b800000000,
+    0x2de1db7300000000, 0x95d1de6e00000000, 0x300282a500000000,
+    0x9e70162300000000, 0x3ba34ae800000000, 0x7513ca1a00000000,
+    0xd0c096d100000000, 0x7eb2025700000000, 0xdb615e9c00000000,
+    0x63515b8100000000, 0xc682074a00000000, 0x68f093cc00000000,
+    0xcd23cf0700000000, 0x189199f600000000, 0xbd42c53d00000000,
+    0x133051bb00000000, 0xb6e30d7000000000, 0x0ed3086d00000000,
+    0xab0054a600000000, 0x0572c02000000000, 0xa0a19ceb00000000,
+    0xb41ee81100000000, 0x11cdb4da00000000, 0xbfbf205c00000000,
+    0x1a6c7c9700000000, 0xa25c798a00000000, 0x078f254100000000,
+    0xa9fdb1c700000000, 0x0c2eed0c00000000, 0xd99cbbfd00000000,
+    0x7c4fe73600000000, 0xd23d73b000000000, 0x77ee2f7b00000000,
+    0xcfde2a6600000000, 0x6a0d76ad00000000, 0xc47fe22b00000000,
+    0x61acbee000000000, 0x2f1c3e1200000000, 0x8acf62d900000000,
+    0x24bdf65f00000000, 0x816eaa9400000000, 0x395eaf8900000000,
+    0x9c8df34200000000, 0x32ff67c400000000, 0x972c3b0f00000000,
+    0x429e6dfe00000000, 0xe74d313500000000, 0x493fa5b300000000,
+    0xececf97800000000, 0x54dcfc6500000000, 0xf10fa0ae00000000,
+    0x5f7d342800000000, 0xfaae68e300000000, 0x821b441600000000,
+    0x27c818dd00000000, 0x89ba8c5b00000000, 0x2c69d09000000000,
+    0x9459d58d00000000, 0x318a894600000000, 0x9ff81dc000000000,
+    0x3a2b410b00000000, 0xef9917fa00000000, 0x4a4a4b3100000000,
+    0xe438dfb700000000, 0x41eb837c00000000, 0xf9db866100000000,
+    0x5c08daaa00000000, 0xf27a4e2c00000000, 0x57a912e700000000,
+    0x1919921500000000, 0xbccacede00000000, 0x12b85a5800000000,
+    0xb76b069300000000, 0x0f5b038e00000000, 0xaa885f4500000000,
+    0x04facbc300000000, 0xa129970800000000, 0x749bc1f900000000,
+    0xd1489d3200000000, 0x7f3a09b400000000, 0xdae9557f00000000,
+    0x62d9506200000000, 0xc70a0ca900000000, 0x6978982f00000000,
+    0xccabc4e400000000},
+   {0x0000000000000000, 0xb40b77a600000000, 0x29119f9700000000,
+    0x9d1ae83100000000, 0x13244ff400000000, 0xa72f385200000000,
+    0x3a35d06300000000, 0x8e3ea7c500000000, 0x674eef3300000000,
+    0xd345989500000000, 0x4e5f70a400000000, 0xfa54070200000000,
+    0x746aa0c700000000, 0xc061d76100000000, 0x5d7b3f5000000000,
+    0xe97048f600000000, 0xce9cde6700000000, 0x7a97a9c100000000,
+    0xe78d41f000000000, 0x5386365600000000, 0xddb8919300000000,
+    0x69b3e63500000000, 0xf4a90e0400000000, 0x40a279a200000000,
+    0xa9d2315400000000, 0x1dd946f200000000, 0x80c3aec300000000,
+    0x34c8d96500000000, 0xbaf67ea000000000, 0x0efd090600000000,
+    0x93e7e13700000000, 0x27ec969100000000, 0x9c39bdcf00000000,
+    0x2832ca6900000000, 0xb528225800000000, 0x012355fe00000000,
+    0x8f1df23b00000000, 0x3b16859d00000000, 0xa60c6dac00000000,
+    0x12071a0a00000000, 0xfb7752fc00000000, 0x4f7c255a00000000,
+    0xd266cd6b00000000, 0x666dbacd00000000, 0xe8531d0800000000,
+    0x5c586aae00000000, 0xc142829f00000000, 0x7549f53900000000,
+    0x52a563a800000000, 0xe6ae140e00000000, 0x7bb4fc3f00000000,
+    0xcfbf8b9900000000, 0x41812c5c00000000, 0xf58a5bfa00000000,
+    0x6890b3cb00000000, 0xdc9bc46d00000000, 0x35eb8c9b00000000,
+    0x81e0fb3d00000000, 0x1cfa130c00000000, 0xa8f164aa00000000,
+    0x26cfc36f00000000, 0x92c4b4c900000000, 0x0fde5cf800000000,
+    0xbbd52b5e00000000, 0x79750b4400000000, 0xcd7e7ce200000000,
+    0x506494d300000000, 0xe46fe37500000000, 0x6a5144b000000000,
+    0xde5a331600000000, 0x4340db2700000000, 0xf74bac8100000000,
+    0x1e3be47700000000, 0xaa3093d100000000, 0x372a7be000000000,
+    0x83210c4600000000, 0x0d1fab8300000000, 0xb914dc2500000000,
+    0x240e341400000000, 0x900543b200000000, 0xb7e9d52300000000,
+    0x03e2a28500000000, 0x9ef84ab400000000, 0x2af33d1200000000,
+    0xa4cd9ad700000000, 0x10c6ed7100000000, 0x8ddc054000000000,
+    0x39d772e600000000, 0xd0a73a1000000000, 0x64ac4db600000000,
+    0xf9b6a58700000000, 0x4dbdd22100000000, 0xc38375e400000000,
+    0x7788024200000000, 0xea92ea7300000000, 0x5e999dd500000000,
+    0xe54cb68b00000000, 0x5147c12d00000000, 0xcc5d291c00000000,
+    0x78565eba00000000, 0xf668f97f00000000, 0x42638ed900000000,
+    0xdf7966e800000000, 0x6b72114e00000000, 0x820259b800000000,
+    0x36092e1e00000000, 0xab13c62f00000000, 0x1f18b18900000000,
+    0x9126164c00000000, 0x252d61ea00000000, 0xb83789db00000000,
+    0x0c3cfe7d00000000, 0x2bd068ec00000000, 0x9fdb1f4a00000000,
+    0x02c1f77b00000000, 0xb6ca80dd00000000, 0x38f4271800000000,
+    0x8cff50be00000000, 0x11e5b88f00000000, 0xa5eecf2900000000,
+    0x4c9e87df00000000, 0xf895f07900000000, 0x658f184800000000,
+    0xd1846fee00000000, 0x5fbac82b00000000, 0xebb1bf8d00000000,
+    0x76ab57bc00000000, 0xc2a0201a00000000, 0xf2ea168800000000,
+    0x46e1612e00000000, 0xdbfb891f00000000, 0x6ff0feb900000000,
+    0xe1ce597c00000000, 0x55c52eda00000000, 0xc8dfc6eb00000000,
+    0x7cd4b14d00000000, 0x95a4f9bb00000000, 0x21af8e1d00000000,
+    0xbcb5662c00000000, 0x08be118a00000000, 0x8680b64f00000000,
+    0x328bc1e900000000, 0xaf9129d800000000, 0x1b9a5e7e00000000,
+    0x3c76c8ef00000000, 0x887dbf4900000000, 0x1567577800000000,
+    0xa16c20de00000000, 0x2f52871b00000000, 0x9b59f0bd00000000,
+    0x0643188c00000000, 0xb2486f2a00000000, 0x5b3827dc00000000,
+    0xef33507a00000000, 0x7229b84b00000000, 0xc622cfed00000000,
+    0x481c682800000000, 0xfc171f8e00000000, 0x610df7bf00000000,
+    0xd506801900000000, 0x6ed3ab4700000000, 0xdad8dce100000000,
+    0x47c234d000000000, 0xf3c9437600000000, 0x7df7e4b300000000,
+    0xc9fc931500000000, 0x54e67b2400000000, 0xe0ed0c8200000000,
+    0x099d447400000000, 0xbd9633d200000000, 0x208cdbe300000000,
+    0x9487ac4500000000, 0x1ab90b8000000000, 0xaeb27c2600000000,
+    0x33a8941700000000, 0x87a3e3b100000000, 0xa04f752000000000,
+    0x1444028600000000, 0x895eeab700000000, 0x3d559d1100000000,
+    0xb36b3ad400000000, 0x07604d7200000000, 0x9a7aa54300000000,
+    0x2e71d2e500000000, 0xc7019a1300000000, 0x730aedb500000000,
+    0xee10058400000000, 0x5a1b722200000000, 0xd425d5e700000000,
+    0x602ea24100000000, 0xfd344a7000000000, 0x493f3dd600000000,
+    0x8b9f1dcc00000000, 0x3f946a6a00000000, 0xa28e825b00000000,
+    0x1685f5fd00000000, 0x98bb523800000000, 0x2cb0259e00000000,
+    0xb1aacdaf00000000, 0x05a1ba0900000000, 0xecd1f2ff00000000,
+    0x58da855900000000, 0xc5c06d6800000000, 0x71cb1ace00000000,
+    0xfff5bd0b00000000, 0x4bfecaad00000000, 0xd6e4229c00000000,
+    0x62ef553a00000000, 0x4503c3ab00000000, 0xf108b40d00000000,
+    0x6c125c3c00000000, 0xd8192b9a00000000, 0x56278c5f00000000,
+    0xe22cfbf900000000, 0x7f3613c800000000, 0xcb3d646e00000000,
+    0x224d2c9800000000, 0x96465b3e00000000, 0x0b5cb30f00000000,
+    0xbf57c4a900000000, 0x3169636c00000000, 0x856214ca00000000,
+    0x1878fcfb00000000, 0xac738b5d00000000, 0x17a6a00300000000,
+    0xa3add7a500000000, 0x3eb73f9400000000, 0x8abc483200000000,
+    0x0482eff700000000, 0xb089985100000000, 0x2d93706000000000,
+    0x999807c600000000, 0x70e84f3000000000, 0xc4e3389600000000,
+    0x59f9d0a700000000, 0xedf2a70100000000, 0x63cc00c400000000,
+    0xd7c7776200000000, 0x4add9f5300000000, 0xfed6e8f500000000,
+    0xd93a7e6400000000, 0x6d3109c200000000, 0xf02be1f300000000,
+    0x4420965500000000, 0xca1e319000000000, 0x7e15463600000000,
+    0xe30fae0700000000, 0x5704d9a100000000, 0xbe74915700000000,
+    0x0a7fe6f100000000, 0x97650ec000000000, 0x236e796600000000,
+    0xad50dea300000000, 0x195ba90500000000, 0x8441413400000000,
+    0x304a369200000000},
+   {0x0000000000000000, 0x9e00aacc00000000, 0x7d07254200000000,
+    0xe3078f8e00000000, 0xfa0e4a8400000000, 0x640ee04800000000,
+    0x87096fc600000000, 0x1909c50a00000000, 0xb51be5d300000000,
+    0x2b1b4f1f00000000, 0xc81cc09100000000, 0x561c6a5d00000000,
+    0x4f15af5700000000, 0xd115059b00000000, 0x32128a1500000000,
+    0xac1220d900000000, 0x2b31bb7c00000000, 0xb53111b000000000,
+    0x56369e3e00000000, 0xc83634f200000000, 0xd13ff1f800000000,
+    0x4f3f5b3400000000, 0xac38d4ba00000000, 0x32387e7600000000,
+    0x9e2a5eaf00000000, 0x002af46300000000, 0xe32d7bed00000000,
+    0x7d2dd12100000000, 0x6424142b00000000, 0xfa24bee700000000,
+    0x1923316900000000, 0x87239ba500000000, 0x566276f900000000,
+    0xc862dc3500000000, 0x2b6553bb00000000, 0xb565f97700000000,
+    0xac6c3c7d00000000, 0x326c96b100000000, 0xd16b193f00000000,
+    0x4f6bb3f300000000, 0xe379932a00000000, 0x7d7939e600000000,
+    0x9e7eb66800000000, 0x007e1ca400000000, 0x1977d9ae00000000,
+    0x8777736200000000, 0x6470fcec00000000, 0xfa70562000000000,
+    0x7d53cd8500000000, 0xe353674900000000, 0x0054e8c700000000,
+    0x9e54420b00000000, 0x875d870100000000, 0x195d2dcd00000000,
+    0xfa5aa24300000000, 0x645a088f00000000, 0xc848285600000000,
+    0x5648829a00000000, 0xb54f0d1400000000, 0x2b4fa7d800000000,
+    0x324662d200000000, 0xac46c81e00000000, 0x4f41479000000000,
+    0xd141ed5c00000000, 0xedc29d2900000000, 0x73c237e500000000,
+    0x90c5b86b00000000, 0x0ec512a700000000, 0x17ccd7ad00000000,
+    0x89cc7d6100000000, 0x6acbf2ef00000000, 0xf4cb582300000000,
+    0x58d978fa00000000, 0xc6d9d23600000000, 0x25de5db800000000,
+    0xbbdef77400000000, 0xa2d7327e00000000, 0x3cd798b200000000,
+    0xdfd0173c00000000, 0x41d0bdf000000000, 0xc6f3265500000000,
+    0x58f38c9900000000, 0xbbf4031700000000, 0x25f4a9db00000000,
+    0x3cfd6cd100000000, 0xa2fdc61d00000000, 0x41fa499300000000,
+    0xdffae35f00000000, 0x73e8c38600000000, 0xede8694a00000000,
+    0x0eefe6c400000000, 0x90ef4c0800000000, 0x89e6890200000000,
+    0x17e623ce00000000, 0xf4e1ac4000000000, 0x6ae1068c00000000,
+    0xbba0ebd000000000, 0x25a0411c00000000, 0xc6a7ce9200000000,
+    0x58a7645e00000000, 0x41aea15400000000, 0xdfae0b9800000000,
+    0x3ca9841600000000, 0xa2a92eda00000000, 0x0ebb0e0300000000,
+    0x90bba4cf00000000, 0x73bc2b4100000000, 0xedbc818d00000000,
+    0xf4b5448700000000, 0x6ab5ee4b00000000, 0x89b261c500000000,
+    0x17b2cb0900000000, 0x909150ac00000000, 0x0e91fa6000000000,
+    0xed9675ee00000000, 0x7396df2200000000, 0x6a9f1a2800000000,
+    0xf49fb0e400000000, 0x17983f6a00000000, 0x899895a600000000,
+    0x258ab57f00000000, 0xbb8a1fb300000000, 0x588d903d00000000,
+    0xc68d3af100000000, 0xdf84fffb00000000, 0x4184553700000000,
+    0xa283dab900000000, 0x3c83707500000000, 0xda853b5300000000,
+    0x4485919f00000000, 0xa7821e1100000000, 0x3982b4dd00000000,
+    0x208b71d700000000, 0xbe8bdb1b00000000, 0x5d8c549500000000,
+    0xc38cfe5900000000, 0x6f9ede8000000000, 0xf19e744c00000000,
+    0x1299fbc200000000, 0x8c99510e00000000, 0x9590940400000000,
+    0x0b903ec800000000, 0xe897b14600000000, 0x76971b8a00000000,
+    0xf1b4802f00000000, 0x6fb42ae300000000, 0x8cb3a56d00000000,
+    0x12b30fa100000000, 0x0bbacaab00000000, 0x95ba606700000000,
+    0x76bdefe900000000, 0xe8bd452500000000, 0x44af65fc00000000,
+    0xdaafcf3000000000, 0x39a840be00000000, 0xa7a8ea7200000000,
+    0xbea12f7800000000, 0x20a185b400000000, 0xc3a60a3a00000000,
+    0x5da6a0f600000000, 0x8ce74daa00000000, 0x12e7e76600000000,
+    0xf1e068e800000000, 0x6fe0c22400000000, 0x76e9072e00000000,
+    0xe8e9ade200000000, 0x0bee226c00000000, 0x95ee88a000000000,
+    0x39fca87900000000, 0xa7fc02b500000000, 0x44fb8d3b00000000,
+    0xdafb27f700000000, 0xc3f2e2fd00000000, 0x5df2483100000000,
+    0xbef5c7bf00000000, 0x20f56d7300000000, 0xa7d6f6d600000000,
+    0x39d65c1a00000000, 0xdad1d39400000000, 0x44d1795800000000,
+    0x5dd8bc5200000000, 0xc3d8169e00000000, 0x20df991000000000,
+    0xbedf33dc00000000, 0x12cd130500000000, 0x8ccdb9c900000000,
+    0x6fca364700000000, 0xf1ca9c8b00000000, 0xe8c3598100000000,
+    0x76c3f34d00000000, 0x95c47cc300000000, 0x0bc4d60f00000000,
+    0x3747a67a00000000, 0xa9470cb600000000, 0x4a40833800000000,
+    0xd44029f400000000, 0xcd49ecfe00000000, 0x5349463200000000,
+    0xb04ec9bc00000000, 0x2e4e637000000000, 0x825c43a900000000,
+    0x1c5ce96500000000, 0xff5b66eb00000000, 0x615bcc2700000000,
+    0x7852092d00000000, 0xe652a3e100000000, 0x05552c6f00000000,
+    0x9b5586a300000000, 0x1c761d0600000000, 0x8276b7ca00000000,
+    0x6171384400000000, 0xff71928800000000, 0xe678578200000000,
+    0x7878fd4e00000000, 0x9b7f72c000000000, 0x057fd80c00000000,
+    0xa96df8d500000000, 0x376d521900000000, 0xd46add9700000000,
+    0x4a6a775b00000000, 0x5363b25100000000, 0xcd63189d00000000,
+    0x2e64971300000000, 0xb0643ddf00000000, 0x6125d08300000000,
+    0xff257a4f00000000, 0x1c22f5c100000000, 0x82225f0d00000000,
+    0x9b2b9a0700000000, 0x052b30cb00000000, 0xe62cbf4500000000,
+    0x782c158900000000, 0xd43e355000000000, 0x4a3e9f9c00000000,
+    0xa939101200000000, 0x3739bade00000000, 0x2e307fd400000000,
+    0xb030d51800000000, 0x53375a9600000000, 0xcd37f05a00000000,
+    0x4a146bff00000000, 0xd414c13300000000, 0x37134ebd00000000,
+    0xa913e47100000000, 0xb01a217b00000000, 0x2e1a8bb700000000,
+    0xcd1d043900000000, 0x531daef500000000, 0xff0f8e2c00000000,
+    0x610f24e000000000, 0x8208ab6e00000000, 0x1c0801a200000000,
+    0x0501c4a800000000, 0x9b016e6400000000, 0x7806e1ea00000000,
+    0xe6064b2600000000}};
+
+#else /* W == 4 */
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0xb8bc6765, 0xaa09c88b, 0x12b5afee, 0x8f629757,
+    0x37def032, 0x256b5fdc, 0x9dd738b9, 0xc5b428ef, 0x7d084f8a,
+    0x6fbde064, 0xd7018701, 0x4ad6bfb8, 0xf26ad8dd, 0xe0df7733,
+    0x58631056, 0x5019579f, 0xe8a530fa, 0xfa109f14, 0x42acf871,
+    0xdf7bc0c8, 0x67c7a7ad, 0x75720843, 0xcdce6f26, 0x95ad7f70,
+    0x2d111815, 0x3fa4b7fb, 0x8718d09e, 0x1acfe827, 0xa2738f42,
+    0xb0c620ac, 0x087a47c9, 0xa032af3e, 0x188ec85b, 0x0a3b67b5,
+    0xb28700d0, 0x2f503869, 0x97ec5f0c, 0x8559f0e2, 0x3de59787,
+    0x658687d1, 0xdd3ae0b4, 0xcf8f4f5a, 0x7733283f, 0xeae41086,
+    0x525877e3, 0x40edd80d, 0xf851bf68, 0xf02bf8a1, 0x48979fc4,
+    0x5a22302a, 0xe29e574f, 0x7f496ff6, 0xc7f50893, 0xd540a77d,
+    0x6dfcc018, 0x359fd04e, 0x8d23b72b, 0x9f9618c5, 0x272a7fa0,
+    0xbafd4719, 0x0241207c, 0x10f48f92, 0xa848e8f7, 0x9b14583d,
+    0x23a83f58, 0x311d90b6, 0x89a1f7d3, 0x1476cf6a, 0xaccaa80f,
+    0xbe7f07e1, 0x06c36084, 0x5ea070d2, 0xe61c17b7, 0xf4a9b859,
+    0x4c15df3c, 0xd1c2e785, 0x697e80e0, 0x7bcb2f0e, 0xc377486b,
+    0xcb0d0fa2, 0x73b168c7, 0x6104c729, 0xd9b8a04c, 0x446f98f5,
+    0xfcd3ff90, 0xee66507e, 0x56da371b, 0x0eb9274d, 0xb6054028,
+    0xa4b0efc6, 0x1c0c88a3, 0x81dbb01a, 0x3967d77f, 0x2bd27891,
+    0x936e1ff4, 0x3b26f703, 0x839a9066, 0x912f3f88, 0x299358ed,
+    0xb4446054, 0x0cf80731, 0x1e4da8df, 0xa6f1cfba, 0xfe92dfec,
+    0x462eb889, 0x549b1767, 0xec277002, 0x71f048bb, 0xc94c2fde,
+    0xdbf98030, 0x6345e755, 0x6b3fa09c, 0xd383c7f9, 0xc1366817,
+    0x798a0f72, 0xe45d37cb, 0x5ce150ae, 0x4e54ff40, 0xf6e89825,
+    0xae8b8873, 0x1637ef16, 0x048240f8, 0xbc3e279d, 0x21e91f24,
+    0x99557841, 0x8be0d7af, 0x335cb0ca, 0xed59b63b, 0x55e5d15e,
+    0x47507eb0, 0xffec19d5, 0x623b216c, 0xda874609, 0xc832e9e7,
+    0x708e8e82, 0x28ed9ed4, 0x9051f9b1, 0x82e4565f, 0x3a58313a,
+    0xa78f0983, 0x1f336ee6, 0x0d86c108, 0xb53aa66d, 0xbd40e1a4,
+    0x05fc86c1, 0x1749292f, 0xaff54e4a, 0x322276f3, 0x8a9e1196,
+    0x982bbe78, 0x2097d91d, 0x78f4c94b, 0xc048ae2e, 0xd2fd01c0,
+    0x6a4166a5, 0xf7965e1c, 0x4f2a3979, 0x5d9f9697, 0xe523f1f2,
+    0x4d6b1905, 0xf5d77e60, 0xe762d18e, 0x5fdeb6eb, 0xc2098e52,
+    0x7ab5e937, 0x680046d9, 0xd0bc21bc, 0x88df31ea, 0x3063568f,
+    0x22d6f961, 0x9a6a9e04, 0x07bda6bd, 0xbf01c1d8, 0xadb46e36,
+    0x15080953, 0x1d724e9a, 0xa5ce29ff, 0xb77b8611, 0x0fc7e174,
+    0x9210d9cd, 0x2aacbea8, 0x38191146, 0x80a57623, 0xd8c66675,
+    0x607a0110, 0x72cfaefe, 0xca73c99b, 0x57a4f122, 0xef189647,
+    0xfdad39a9, 0x45115ecc, 0x764dee06, 0xcef18963, 0xdc44268d,
+    0x64f841e8, 0xf92f7951, 0x41931e34, 0x5326b1da, 0xeb9ad6bf,
+    0xb3f9c6e9, 0x0b45a18c, 0x19f00e62, 0xa14c6907, 0x3c9b51be,
+    0x842736db, 0x96929935, 0x2e2efe50, 0x2654b999, 0x9ee8defc,
+    0x8c5d7112, 0x34e11677, 0xa9362ece, 0x118a49ab, 0x033fe645,
+    0xbb838120, 0xe3e09176, 0x5b5cf613, 0x49e959fd, 0xf1553e98,
+    0x6c820621, 0xd43e6144, 0xc68bceaa, 0x7e37a9cf, 0xd67f4138,
+    0x6ec3265d, 0x7c7689b3, 0xc4caeed6, 0x591dd66f, 0xe1a1b10a,
+    0xf3141ee4, 0x4ba87981, 0x13cb69d7, 0xab770eb2, 0xb9c2a15c,
+    0x017ec639, 0x9ca9fe80, 0x241599e5, 0x36a0360b, 0x8e1c516e,
+    0x866616a7, 0x3eda71c2, 0x2c6fde2c, 0x94d3b949, 0x090481f0,
+    0xb1b8e695, 0xa30d497b, 0x1bb12e1e, 0x43d23e48, 0xfb6e592d,
+    0xe9dbf6c3, 0x516791a6, 0xccb0a91f, 0x740cce7a, 0x66b96194,
+    0xde0506f1},
+   {0x00000000, 0x01c26a37, 0x0384d46e, 0x0246be59, 0x0709a8dc,
+    0x06cbc2eb, 0x048d7cb2, 0x054f1685, 0x0e1351b8, 0x0fd13b8f,
+    0x0d9785d6, 0x0c55efe1, 0x091af964, 0x08d89353, 0x0a9e2d0a,
+    0x0b5c473d, 0x1c26a370, 0x1de4c947, 0x1fa2771e, 0x1e601d29,
+    0x1b2f0bac, 0x1aed619b, 0x18abdfc2, 0x1969b5f5, 0x1235f2c8,
+    0x13f798ff, 0x11b126a6, 0x10734c91, 0x153c5a14, 0x14fe3023,
+    0x16b88e7a, 0x177ae44d, 0x384d46e0, 0x398f2cd7, 0x3bc9928e,
+    0x3a0bf8b9, 0x3f44ee3c, 0x3e86840b, 0x3cc03a52, 0x3d025065,
+    0x365e1758, 0x379c7d6f, 0x35dac336, 0x3418a901, 0x3157bf84,
+    0x3095d5b3, 0x32d36bea, 0x331101dd, 0x246be590, 0x25a98fa7,
+    0x27ef31fe, 0x262d5bc9, 0x23624d4c, 0x22a0277b, 0x20e69922,
+    0x2124f315, 0x2a78b428, 0x2bbade1f, 0x29fc6046, 0x283e0a71,
+    0x2d711cf4, 0x2cb376c3, 0x2ef5c89a, 0x2f37a2ad, 0x709a8dc0,
+    0x7158e7f7, 0x731e59ae, 0x72dc3399, 0x7793251c, 0x76514f2b,
+    0x7417f172, 0x75d59b45, 0x7e89dc78, 0x7f4bb64f, 0x7d0d0816,
+    0x7ccf6221, 0x798074a4, 0x78421e93, 0x7a04a0ca, 0x7bc6cafd,
+    0x6cbc2eb0, 0x6d7e4487, 0x6f38fade, 0x6efa90e9, 0x6bb5866c,
+    0x6a77ec5b, 0x68315202, 0x69f33835, 0x62af7f08, 0x636d153f,
+    0x612bab66, 0x60e9c151, 0x65a6d7d4, 0x6464bde3, 0x662203ba,
+    0x67e0698d, 0x48d7cb20, 0x4915a117, 0x4b531f4e, 0x4a917579,
+    0x4fde63fc, 0x4e1c09cb, 0x4c5ab792, 0x4d98dda5, 0x46c49a98,
+    0x4706f0af, 0x45404ef6, 0x448224c1, 0x41cd3244, 0x400f5873,
+    0x4249e62a, 0x438b8c1d, 0x54f16850, 0x55330267, 0x5775bc3e,
+    0x56b7d609, 0x53f8c08c, 0x523aaabb, 0x507c14e2, 0x51be7ed5,
+    0x5ae239e8, 0x5b2053df, 0x5966ed86, 0x58a487b1, 0x5deb9134,
+    0x5c29fb03, 0x5e6f455a, 0x5fad2f6d, 0xe1351b80, 0xe0f771b7,
+    0xe2b1cfee, 0xe373a5d9, 0xe63cb35c, 0xe7fed96b, 0xe5b86732,
+    0xe47a0d05, 0xef264a38, 0xeee4200f, 0xeca29e56, 0xed60f461,
+    0xe82fe2e4, 0xe9ed88d3, 0xebab368a, 0xea695cbd, 0xfd13b8f0,
+    0xfcd1d2c7, 0xfe976c9e, 0xff5506a9, 0xfa1a102c, 0xfbd87a1b,
+    0xf99ec442, 0xf85cae75, 0xf300e948, 0xf2c2837f, 0xf0843d26,
+    0xf1465711, 0xf4094194, 0xf5cb2ba3, 0xf78d95fa, 0xf64fffcd,
+    0xd9785d60, 0xd8ba3757, 0xdafc890e, 0xdb3ee339, 0xde71f5bc,
+    0xdfb39f8b, 0xddf521d2, 0xdc374be5, 0xd76b0cd8, 0xd6a966ef,
+    0xd4efd8b6, 0xd52db281, 0xd062a404, 0xd1a0ce33, 0xd3e6706a,
+    0xd2241a5d, 0xc55efe10, 0xc49c9427, 0xc6da2a7e, 0xc7184049,
+    0xc25756cc, 0xc3953cfb, 0xc1d382a2, 0xc011e895, 0xcb4dafa8,
+    0xca8fc59f, 0xc8c97bc6, 0xc90b11f1, 0xcc440774, 0xcd866d43,
+    0xcfc0d31a, 0xce02b92d, 0x91af9640, 0x906dfc77, 0x922b422e,
+    0x93e92819, 0x96a63e9c, 0x976454ab, 0x9522eaf2, 0x94e080c5,
+    0x9fbcc7f8, 0x9e7eadcf, 0x9c381396, 0x9dfa79a1, 0x98b56f24,
+    0x99770513, 0x9b31bb4a, 0x9af3d17d, 0x8d893530, 0x8c4b5f07,
+    0x8e0de15e, 0x8fcf8b69, 0x8a809dec, 0x8b42f7db, 0x89044982,
+    0x88c623b5, 0x839a6488, 0x82580ebf, 0x801eb0e6, 0x81dcdad1,
+    0x8493cc54, 0x8551a663, 0x8717183a, 0x86d5720d, 0xa9e2d0a0,
+    0xa820ba97, 0xaa6604ce, 0xaba46ef9, 0xaeeb787c, 0xaf29124b,
+    0xad6fac12, 0xacadc625, 0xa7f18118, 0xa633eb2f, 0xa4755576,
+    0xa5b73f41, 0xa0f829c4, 0xa13a43f3, 0xa37cfdaa, 0xa2be979d,
+    0xb5c473d0, 0xb40619e7, 0xb640a7be, 0xb782cd89, 0xb2cddb0c,
+    0xb30fb13b, 0xb1490f62, 0xb08b6555, 0xbbd72268, 0xba15485f,
+    0xb853f606, 0xb9919c31, 0xbcde8ab4, 0xbd1ce083, 0xbf5a5eda,
+    0xbe9834ed},
+   {0x00000000, 0x191b3141, 0x32366282, 0x2b2d53c3, 0x646cc504,
+    0x7d77f445, 0x565aa786, 0x4f4196c7, 0xc8d98a08, 0xd1c2bb49,
+    0xfaefe88a, 0xe3f4d9cb, 0xacb54f0c, 0xb5ae7e4d, 0x9e832d8e,
+    0x87981ccf, 0x4ac21251, 0x53d92310, 0x78f470d3, 0x61ef4192,
+    0x2eaed755, 0x37b5e614, 0x1c98b5d7, 0x05838496, 0x821b9859,
+    0x9b00a918, 0xb02dfadb, 0xa936cb9a, 0xe6775d5d, 0xff6c6c1c,
+    0xd4413fdf, 0xcd5a0e9e, 0x958424a2, 0x8c9f15e3, 0xa7b24620,
+    0xbea97761, 0xf1e8e1a6, 0xe8f3d0e7, 0xc3de8324, 0xdac5b265,
+    0x5d5daeaa, 0x44469feb, 0x6f6bcc28, 0x7670fd69, 0x39316bae,
+    0x202a5aef, 0x0b07092c, 0x121c386d, 0xdf4636f3, 0xc65d07b2,
+    0xed705471, 0xf46b6530, 0xbb2af3f7, 0xa231c2b6, 0x891c9175,
+    0x9007a034, 0x179fbcfb, 0x0e848dba, 0x25a9de79, 0x3cb2ef38,
+    0x73f379ff, 0x6ae848be, 0x41c51b7d, 0x58de2a3c, 0xf0794f05,
+    0xe9627e44, 0xc24f2d87, 0xdb541cc6, 0x94158a01, 0x8d0ebb40,
+    0xa623e883, 0xbf38d9c2, 0x38a0c50d, 0x21bbf44c, 0x0a96a78f,
+    0x138d96ce, 0x5ccc0009, 0x45d73148, 0x6efa628b, 0x77e153ca,
+    0xbabb5d54, 0xa3a06c15, 0x888d3fd6, 0x91960e97, 0xded79850,
+    0xc7cca911, 0xece1fad2, 0xf5facb93, 0x7262d75c, 0x6b79e61d,
+    0x4054b5de, 0x594f849f, 0x160e1258, 0x0f152319, 0x243870da,
+    0x3d23419b, 0x65fd6ba7, 0x7ce65ae6, 0x57cb0925, 0x4ed03864,
+    0x0191aea3, 0x188a9fe2, 0x33a7cc21, 0x2abcfd60, 0xad24e1af,
+    0xb43fd0ee, 0x9f12832d, 0x8609b26c, 0xc94824ab, 0xd05315ea,
+    0xfb7e4629, 0xe2657768, 0x2f3f79f6, 0x362448b7, 0x1d091b74,
+    0x04122a35, 0x4b53bcf2, 0x52488db3, 0x7965de70, 0x607eef31,
+    0xe7e6f3fe, 0xfefdc2bf, 0xd5d0917c, 0xcccba03d, 0x838a36fa,
+    0x9a9107bb, 0xb1bc5478, 0xa8a76539, 0x3b83984b, 0x2298a90a,
+    0x09b5fac9, 0x10aecb88, 0x5fef5d4f, 0x46f46c0e, 0x6dd93fcd,
+    0x74c20e8c, 0xf35a1243, 0xea412302, 0xc16c70c1, 0xd8774180,
+    0x9736d747, 0x8e2de606, 0xa500b5c5, 0xbc1b8484, 0x71418a1a,
+    0x685abb5b, 0x4377e898, 0x5a6cd9d9, 0x152d4f1e, 0x0c367e5f,
+    0x271b2d9c, 0x3e001cdd, 0xb9980012, 0xa0833153, 0x8bae6290,
+    0x92b553d1, 0xddf4c516, 0xc4eff457, 0xefc2a794, 0xf6d996d5,
+    0xae07bce9, 0xb71c8da8, 0x9c31de6b, 0x852aef2a, 0xca6b79ed,
+    0xd37048ac, 0xf85d1b6f, 0xe1462a2e, 0x66de36e1, 0x7fc507a0,
+    0x54e85463, 0x4df36522, 0x02b2f3e5, 0x1ba9c2a4, 0x30849167,
+    0x299fa026, 0xe4c5aeb8, 0xfdde9ff9, 0xd6f3cc3a, 0xcfe8fd7b,
+    0x80a96bbc, 0x99b25afd, 0xb29f093e, 0xab84387f, 0x2c1c24b0,
+    0x350715f1, 0x1e2a4632, 0x07317773, 0x4870e1b4, 0x516bd0f5,
+    0x7a468336, 0x635db277, 0xcbfad74e, 0xd2e1e60f, 0xf9ccb5cc,
+    0xe0d7848d, 0xaf96124a, 0xb68d230b, 0x9da070c8, 0x84bb4189,
+    0x03235d46, 0x1a386c07, 0x31153fc4, 0x280e0e85, 0x674f9842,
+    0x7e54a903, 0x5579fac0, 0x4c62cb81, 0x8138c51f, 0x9823f45e,
+    0xb30ea79d, 0xaa1596dc, 0xe554001b, 0xfc4f315a, 0xd7626299,
+    0xce7953d8, 0x49e14f17, 0x50fa7e56, 0x7bd72d95, 0x62cc1cd4,
+    0x2d8d8a13, 0x3496bb52, 0x1fbbe891, 0x06a0d9d0, 0x5e7ef3ec,
+    0x4765c2ad, 0x6c48916e, 0x7553a02f, 0x3a1236e8, 0x230907a9,
+    0x0824546a, 0x113f652b, 0x96a779e4, 0x8fbc48a5, 0xa4911b66,
+    0xbd8a2a27, 0xf2cbbce0, 0xebd08da1, 0xc0fdde62, 0xd9e6ef23,
+    0x14bce1bd, 0x0da7d0fc, 0x268a833f, 0x3f91b27e, 0x70d024b9,
+    0x69cb15f8, 0x42e6463b, 0x5bfd777a, 0xdc656bb5, 0xc57e5af4,
+    0xee530937, 0xf7483876, 0xb809aeb1, 0xa1129ff0, 0x8a3fcc33,
+    0x9324fd72},
+   {0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419,
+    0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4,
+    0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07,
+    0x90bf1d91, 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
+    0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856,
+    0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
+    0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4,
+    0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
+    0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3,
+    0x45df5c75, 0xdcd60dcf, 0xabd13d59, 0x26d930ac, 0x51de003a,
+    0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599,
+    0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
+    0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190,
+    0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f,
+    0x9fbfe4a5, 0xe8b8d433, 0x7807c9a2, 0x0f00f934, 0x9609a88e,
+    0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
+    0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed,
+    0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
+    0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3,
+    0xfbd44c65, 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,
+    0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a,
+    0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5,
+    0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, 0xbe0b1010,
+    0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+    0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17,
+    0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6,
+    0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615,
+    0x73dc1683, 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
+    0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, 0xf00f9344,
+    0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
+    0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a,
+    0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
+    0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1,
+    0xa6bc5767, 0x3fb506dd, 0x48b2364b, 0xd80d2bda, 0xaf0a1b4c,
+    0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef,
+    0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
+    0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe,
+    0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31,
+    0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c,
+    0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
+    0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b,
+    0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
+    0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1,
+    0x18b74777, 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
+    0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, 0xa00ae278,
+    0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7,
+    0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66,
+    0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+    0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605,
+    0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8,
+    0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b,
+    0x2d02ef8d}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x00000000, 0x96300777, 0x2c610eee, 0xba510999, 0x19c46d07,
+    0x8ff46a70, 0x35a563e9, 0xa395649e, 0x3288db0e, 0xa4b8dc79,
+    0x1ee9d5e0, 0x88d9d297, 0x2b4cb609, 0xbd7cb17e, 0x072db8e7,
+    0x911dbf90, 0x6410b71d, 0xf220b06a, 0x4871b9f3, 0xde41be84,
+    0x7dd4da1a, 0xebe4dd6d, 0x51b5d4f4, 0xc785d383, 0x56986c13,
+    0xc0a86b64, 0x7af962fd, 0xecc9658a, 0x4f5c0114, 0xd96c0663,
+    0x633d0ffa, 0xf50d088d, 0xc8206e3b, 0x5e10694c, 0xe44160d5,
+    0x727167a2, 0xd1e4033c, 0x47d4044b, 0xfd850dd2, 0x6bb50aa5,
+    0xfaa8b535, 0x6c98b242, 0xd6c9bbdb, 0x40f9bcac, 0xe36cd832,
+    0x755cdf45, 0xcf0dd6dc, 0x593dd1ab, 0xac30d926, 0x3a00de51,
+    0x8051d7c8, 0x1661d0bf, 0xb5f4b421, 0x23c4b356, 0x9995bacf,
+    0x0fa5bdb8, 0x9eb80228, 0x0888055f, 0xb2d90cc6, 0x24e90bb1,
+    0x877c6f2f, 0x114c6858, 0xab1d61c1, 0x3d2d66b6, 0x9041dc76,
+    0x0671db01, 0xbc20d298, 0x2a10d5ef, 0x8985b171, 0x1fb5b606,
+    0xa5e4bf9f, 0x33d4b8e8, 0xa2c90778, 0x34f9000f, 0x8ea80996,
+    0x18980ee1, 0xbb0d6a7f, 0x2d3d6d08, 0x976c6491, 0x015c63e6,
+    0xf4516b6b, 0x62616c1c, 0xd8306585, 0x4e0062f2, 0xed95066c,
+    0x7ba5011b, 0xc1f40882, 0x57c40ff5, 0xc6d9b065, 0x50e9b712,
+    0xeab8be8b, 0x7c88b9fc, 0xdf1ddd62, 0x492dda15, 0xf37cd38c,
+    0x654cd4fb, 0x5861b24d, 0xce51b53a, 0x7400bca3, 0xe230bbd4,
+    0x41a5df4a, 0xd795d83d, 0x6dc4d1a4, 0xfbf4d6d3, 0x6ae96943,
+    0xfcd96e34, 0x468867ad, 0xd0b860da, 0x732d0444, 0xe51d0333,
+    0x5f4c0aaa, 0xc97c0ddd, 0x3c710550, 0xaa410227, 0x10100bbe,
+    0x86200cc9, 0x25b56857, 0xb3856f20, 0x09d466b9, 0x9fe461ce,
+    0x0ef9de5e, 0x98c9d929, 0x2298d0b0, 0xb4a8d7c7, 0x173db359,
+    0x810db42e, 0x3b5cbdb7, 0xad6cbac0, 0x2083b8ed, 0xb6b3bf9a,
+    0x0ce2b603, 0x9ad2b174, 0x3947d5ea, 0xaf77d29d, 0x1526db04,
+    0x8316dc73, 0x120b63e3, 0x843b6494, 0x3e6a6d0d, 0xa85a6a7a,
+    0x0bcf0ee4, 0x9dff0993, 0x27ae000a, 0xb19e077d, 0x44930ff0,
+    0xd2a30887, 0x68f2011e, 0xfec20669, 0x5d5762f7, 0xcb676580,
+    0x71366c19, 0xe7066b6e, 0x761bd4fe, 0xe02bd389, 0x5a7ada10,
+    0xcc4add67, 0x6fdfb9f9, 0xf9efbe8e, 0x43beb717, 0xd58eb060,
+    0xe8a3d6d6, 0x7e93d1a1, 0xc4c2d838, 0x52f2df4f, 0xf167bbd1,
+    0x6757bca6, 0xdd06b53f, 0x4b36b248, 0xda2b0dd8, 0x4c1b0aaf,
+    0xf64a0336, 0x607a0441, 0xc3ef60df, 0x55df67a8, 0xef8e6e31,
+    0x79be6946, 0x8cb361cb, 0x1a8366bc, 0xa0d26f25, 0x36e26852,
+    0x95770ccc, 0x03470bbb, 0xb9160222, 0x2f260555, 0xbe3bbac5,
+    0x280bbdb2, 0x925ab42b, 0x046ab35c, 0xa7ffd7c2, 0x31cfd0b5,
+    0x8b9ed92c, 0x1daede5b, 0xb0c2649b, 0x26f263ec, 0x9ca36a75,
+    0x0a936d02, 0xa906099c, 0x3f360eeb, 0x85670772, 0x13570005,
+    0x824abf95, 0x147ab8e2, 0xae2bb17b, 0x381bb60c, 0x9b8ed292,
+    0x0dbed5e5, 0xb7efdc7c, 0x21dfdb0b, 0xd4d2d386, 0x42e2d4f1,
+    0xf8b3dd68, 0x6e83da1f, 0xcd16be81, 0x5b26b9f6, 0xe177b06f,
+    0x7747b718, 0xe65a0888, 0x706a0fff, 0xca3b0666, 0x5c0b0111,
+    0xff9e658f, 0x69ae62f8, 0xd3ff6b61, 0x45cf6c16, 0x78e20aa0,
+    0xeed20dd7, 0x5483044e, 0xc2b30339, 0x612667a7, 0xf71660d0,
+    0x4d476949, 0xdb776e3e, 0x4a6ad1ae, 0xdc5ad6d9, 0x660bdf40,
+    0xf03bd837, 0x53aebca9, 0xc59ebbde, 0x7fcfb247, 0xe9ffb530,
+    0x1cf2bdbd, 0x8ac2baca, 0x3093b353, 0xa6a3b424, 0x0536d0ba,
+    0x9306d7cd, 0x2957de54, 0xbf67d923, 0x2e7a66b3, 0xb84a61c4,
+    0x021b685d, 0x942b6f2a, 0x37be0bb4, 0xa18e0cc3, 0x1bdf055a,
+    0x8def022d},
+   {0x00000000, 0x41311b19, 0x82623632, 0xc3532d2b, 0x04c56c64,
+    0x45f4777d, 0x86a75a56, 0xc796414f, 0x088ad9c8, 0x49bbc2d1,
+    0x8ae8effa, 0xcbd9f4e3, 0x0c4fb5ac, 0x4d7eaeb5, 0x8e2d839e,
+    0xcf1c9887, 0x5112c24a, 0x1023d953, 0xd370f478, 0x9241ef61,
+    0x55d7ae2e, 0x14e6b537, 0xd7b5981c, 0x96848305, 0x59981b82,
+    0x18a9009b, 0xdbfa2db0, 0x9acb36a9, 0x5d5d77e6, 0x1c6c6cff,
+    0xdf3f41d4, 0x9e0e5acd, 0xa2248495, 0xe3159f8c, 0x2046b2a7,
+    0x6177a9be, 0xa6e1e8f1, 0xe7d0f3e8, 0x2483dec3, 0x65b2c5da,
+    0xaaae5d5d, 0xeb9f4644, 0x28cc6b6f, 0x69fd7076, 0xae6b3139,
+    0xef5a2a20, 0x2c09070b, 0x6d381c12, 0xf33646df, 0xb2075dc6,
+    0x715470ed, 0x30656bf4, 0xf7f32abb, 0xb6c231a2, 0x75911c89,
+    0x34a00790, 0xfbbc9f17, 0xba8d840e, 0x79dea925, 0x38efb23c,
+    0xff79f373, 0xbe48e86a, 0x7d1bc541, 0x3c2ade58, 0x054f79f0,
+    0x447e62e9, 0x872d4fc2, 0xc61c54db, 0x018a1594, 0x40bb0e8d,
+    0x83e823a6, 0xc2d938bf, 0x0dc5a038, 0x4cf4bb21, 0x8fa7960a,
+    0xce968d13, 0x0900cc5c, 0x4831d745, 0x8b62fa6e, 0xca53e177,
+    0x545dbbba, 0x156ca0a3, 0xd63f8d88, 0x970e9691, 0x5098d7de,
+    0x11a9ccc7, 0xd2fae1ec, 0x93cbfaf5, 0x5cd76272, 0x1de6796b,
+    0xdeb55440, 0x9f844f59, 0x58120e16, 0x1923150f, 0xda703824,
+    0x9b41233d, 0xa76bfd65, 0xe65ae67c, 0x2509cb57, 0x6438d04e,
+    0xa3ae9101, 0xe29f8a18, 0x21cca733, 0x60fdbc2a, 0xafe124ad,
+    0xeed03fb4, 0x2d83129f, 0x6cb20986, 0xab2448c9, 0xea1553d0,
+    0x29467efb, 0x687765e2, 0xf6793f2f, 0xb7482436, 0x741b091d,
+    0x352a1204, 0xf2bc534b, 0xb38d4852, 0x70de6579, 0x31ef7e60,
+    0xfef3e6e7, 0xbfc2fdfe, 0x7c91d0d5, 0x3da0cbcc, 0xfa368a83,
+    0xbb07919a, 0x7854bcb1, 0x3965a7a8, 0x4b98833b, 0x0aa99822,
+    0xc9fab509, 0x88cbae10, 0x4f5def5f, 0x0e6cf446, 0xcd3fd96d,
+    0x8c0ec274, 0x43125af3, 0x022341ea, 0xc1706cc1, 0x804177d8,
+    0x47d73697, 0x06e62d8e, 0xc5b500a5, 0x84841bbc, 0x1a8a4171,
+    0x5bbb5a68, 0x98e87743, 0xd9d96c5a, 0x1e4f2d15, 0x5f7e360c,
+    0x9c2d1b27, 0xdd1c003e, 0x120098b9, 0x533183a0, 0x9062ae8b,
+    0xd153b592, 0x16c5f4dd, 0x57f4efc4, 0x94a7c2ef, 0xd596d9f6,
+    0xe9bc07ae, 0xa88d1cb7, 0x6bde319c, 0x2aef2a85, 0xed796bca,
+    0xac4870d3, 0x6f1b5df8, 0x2e2a46e1, 0xe136de66, 0xa007c57f,
+    0x6354e854, 0x2265f34d, 0xe5f3b202, 0xa4c2a91b, 0x67918430,
+    0x26a09f29, 0xb8aec5e4, 0xf99fdefd, 0x3accf3d6, 0x7bfde8cf,
+    0xbc6ba980, 0xfd5ab299, 0x3e099fb2, 0x7f3884ab, 0xb0241c2c,
+    0xf1150735, 0x32462a1e, 0x73773107, 0xb4e17048, 0xf5d06b51,
+    0x3683467a, 0x77b25d63, 0x4ed7facb, 0x0fe6e1d2, 0xccb5ccf9,
+    0x8d84d7e0, 0x4a1296af, 0x0b238db6, 0xc870a09d, 0x8941bb84,
+    0x465d2303, 0x076c381a, 0xc43f1531, 0x850e0e28, 0x42984f67,
+    0x03a9547e, 0xc0fa7955, 0x81cb624c, 0x1fc53881, 0x5ef42398,
+    0x9da70eb3, 0xdc9615aa, 0x1b0054e5, 0x5a314ffc, 0x996262d7,
+    0xd85379ce, 0x174fe149, 0x567efa50, 0x952dd77b, 0xd41ccc62,
+    0x138a8d2d, 0x52bb9634, 0x91e8bb1f, 0xd0d9a006, 0xecf37e5e,
+    0xadc26547, 0x6e91486c, 0x2fa05375, 0xe836123a, 0xa9070923,
+    0x6a542408, 0x2b653f11, 0xe479a796, 0xa548bc8f, 0x661b91a4,
+    0x272a8abd, 0xe0bccbf2, 0xa18dd0eb, 0x62defdc0, 0x23efe6d9,
+    0xbde1bc14, 0xfcd0a70d, 0x3f838a26, 0x7eb2913f, 0xb924d070,
+    0xf815cb69, 0x3b46e642, 0x7a77fd5b, 0xb56b65dc, 0xf45a7ec5,
+    0x370953ee, 0x763848f7, 0xb1ae09b8, 0xf09f12a1, 0x33cc3f8a,
+    0x72fd2493},
+   {0x00000000, 0x376ac201, 0x6ed48403, 0x59be4602, 0xdca80907,
+    0xebc2cb06, 0xb27c8d04, 0x85164f05, 0xb851130e, 0x8f3bd10f,
+    0xd685970d, 0xe1ef550c, 0x64f91a09, 0x5393d808, 0x0a2d9e0a,
+    0x3d475c0b, 0x70a3261c, 0x47c9e41d, 0x1e77a21f, 0x291d601e,
+    0xac0b2f1b, 0x9b61ed1a, 0xc2dfab18, 0xf5b56919, 0xc8f23512,
+    0xff98f713, 0xa626b111, 0x914c7310, 0x145a3c15, 0x2330fe14,
+    0x7a8eb816, 0x4de47a17, 0xe0464d38, 0xd72c8f39, 0x8e92c93b,
+    0xb9f80b3a, 0x3cee443f, 0x0b84863e, 0x523ac03c, 0x6550023d,
+    0x58175e36, 0x6f7d9c37, 0x36c3da35, 0x01a91834, 0x84bf5731,
+    0xb3d59530, 0xea6bd332, 0xdd011133, 0x90e56b24, 0xa78fa925,
+    0xfe31ef27, 0xc95b2d26, 0x4c4d6223, 0x7b27a022, 0x2299e620,
+    0x15f32421, 0x28b4782a, 0x1fdeba2b, 0x4660fc29, 0x710a3e28,
+    0xf41c712d, 0xc376b32c, 0x9ac8f52e, 0xada2372f, 0xc08d9a70,
+    0xf7e75871, 0xae591e73, 0x9933dc72, 0x1c259377, 0x2b4f5176,
+    0x72f11774, 0x459bd575, 0x78dc897e, 0x4fb64b7f, 0x16080d7d,
+    0x2162cf7c, 0xa4748079, 0x931e4278, 0xcaa0047a, 0xfdcac67b,
+    0xb02ebc6c, 0x87447e6d, 0xdefa386f, 0xe990fa6e, 0x6c86b56b,
+    0x5bec776a, 0x02523168, 0x3538f369, 0x087faf62, 0x3f156d63,
+    0x66ab2b61, 0x51c1e960, 0xd4d7a665, 0xe3bd6464, 0xba032266,
+    0x8d69e067, 0x20cbd748, 0x17a11549, 0x4e1f534b, 0x7975914a,
+    0xfc63de4f, 0xcb091c4e, 0x92b75a4c, 0xa5dd984d, 0x989ac446,
+    0xaff00647, 0xf64e4045, 0xc1248244, 0x4432cd41, 0x73580f40,
+    0x2ae64942, 0x1d8c8b43, 0x5068f154, 0x67023355, 0x3ebc7557,
+    0x09d6b756, 0x8cc0f853, 0xbbaa3a52, 0xe2147c50, 0xd57ebe51,
+    0xe839e25a, 0xdf53205b, 0x86ed6659, 0xb187a458, 0x3491eb5d,
+    0x03fb295c, 0x5a456f5e, 0x6d2fad5f, 0x801b35e1, 0xb771f7e0,
+    0xeecfb1e2, 0xd9a573e3, 0x5cb33ce6, 0x6bd9fee7, 0x3267b8e5,
+    0x050d7ae4, 0x384a26ef, 0x0f20e4ee, 0x569ea2ec, 0x61f460ed,
+    0xe4e22fe8, 0xd388ede9, 0x8a36abeb, 0xbd5c69ea, 0xf0b813fd,
+    0xc7d2d1fc, 0x9e6c97fe, 0xa90655ff, 0x2c101afa, 0x1b7ad8fb,
+    0x42c49ef9, 0x75ae5cf8, 0x48e900f3, 0x7f83c2f2, 0x263d84f0,
+    0x115746f1, 0x944109f4, 0xa32bcbf5, 0xfa958df7, 0xcdff4ff6,
+    0x605d78d9, 0x5737bad8, 0x0e89fcda, 0x39e33edb, 0xbcf571de,
+    0x8b9fb3df, 0xd221f5dd, 0xe54b37dc, 0xd80c6bd7, 0xef66a9d6,
+    0xb6d8efd4, 0x81b22dd5, 0x04a462d0, 0x33cea0d1, 0x6a70e6d3,
+    0x5d1a24d2, 0x10fe5ec5, 0x27949cc4, 0x7e2adac6, 0x494018c7,
+    0xcc5657c2, 0xfb3c95c3, 0xa282d3c1, 0x95e811c0, 0xa8af4dcb,
+    0x9fc58fca, 0xc67bc9c8, 0xf1110bc9, 0x740744cc, 0x436d86cd,
+    0x1ad3c0cf, 0x2db902ce, 0x4096af91, 0x77fc6d90, 0x2e422b92,
+    0x1928e993, 0x9c3ea696, 0xab546497, 0xf2ea2295, 0xc580e094,
+    0xf8c7bc9f, 0xcfad7e9e, 0x9613389c, 0xa179fa9d, 0x246fb598,
+    0x13057799, 0x4abb319b, 0x7dd1f39a, 0x3035898d, 0x075f4b8c,
+    0x5ee10d8e, 0x698bcf8f, 0xec9d808a, 0xdbf7428b, 0x82490489,
+    0xb523c688, 0x88649a83, 0xbf0e5882, 0xe6b01e80, 0xd1dadc81,
+    0x54cc9384, 0x63a65185, 0x3a181787, 0x0d72d586, 0xa0d0e2a9,
+    0x97ba20a8, 0xce0466aa, 0xf96ea4ab, 0x7c78ebae, 0x4b1229af,
+    0x12ac6fad, 0x25c6adac, 0x1881f1a7, 0x2feb33a6, 0x765575a4,
+    0x413fb7a5, 0xc429f8a0, 0xf3433aa1, 0xaafd7ca3, 0x9d97bea2,
+    0xd073c4b5, 0xe71906b4, 0xbea740b6, 0x89cd82b7, 0x0cdbcdb2,
+    0x3bb10fb3, 0x620f49b1, 0x55658bb0, 0x6822d7bb, 0x5f4815ba,
+    0x06f653b8, 0x319c91b9, 0xb48adebc, 0x83e01cbd, 0xda5e5abf,
+    0xed3498be},
+   {0x00000000, 0x6567bcb8, 0x8bc809aa, 0xeeafb512, 0x5797628f,
+    0x32f0de37, 0xdc5f6b25, 0xb938d79d, 0xef28b4c5, 0x8a4f087d,
+    0x64e0bd6f, 0x018701d7, 0xb8bfd64a, 0xddd86af2, 0x3377dfe0,
+    0x56106358, 0x9f571950, 0xfa30a5e8, 0x149f10fa, 0x71f8ac42,
+    0xc8c07bdf, 0xada7c767, 0x43087275, 0x266fcecd, 0x707fad95,
+    0x1518112d, 0xfbb7a43f, 0x9ed01887, 0x27e8cf1a, 0x428f73a2,
+    0xac20c6b0, 0xc9477a08, 0x3eaf32a0, 0x5bc88e18, 0xb5673b0a,
+    0xd00087b2, 0x6938502f, 0x0c5fec97, 0xe2f05985, 0x8797e53d,
+    0xd1878665, 0xb4e03add, 0x5a4f8fcf, 0x3f283377, 0x8610e4ea,
+    0xe3775852, 0x0dd8ed40, 0x68bf51f8, 0xa1f82bf0, 0xc49f9748,
+    0x2a30225a, 0x4f579ee2, 0xf66f497f, 0x9308f5c7, 0x7da740d5,
+    0x18c0fc6d, 0x4ed09f35, 0x2bb7238d, 0xc518969f, 0xa07f2a27,
+    0x1947fdba, 0x7c204102, 0x928ff410, 0xf7e848a8, 0x3d58149b,
+    0x583fa823, 0xb6901d31, 0xd3f7a189, 0x6acf7614, 0x0fa8caac,
+    0xe1077fbe, 0x8460c306, 0xd270a05e, 0xb7171ce6, 0x59b8a9f4,
+    0x3cdf154c, 0x85e7c2d1, 0xe0807e69, 0x0e2fcb7b, 0x6b4877c3,
+    0xa20f0dcb, 0xc768b173, 0x29c70461, 0x4ca0b8d9, 0xf5986f44,
+    0x90ffd3fc, 0x7e5066ee, 0x1b37da56, 0x4d27b90e, 0x284005b6,
+    0xc6efb0a4, 0xa3880c1c, 0x1ab0db81, 0x7fd76739, 0x9178d22b,
+    0xf41f6e93, 0x03f7263b, 0x66909a83, 0x883f2f91, 0xed589329,
+    0x546044b4, 0x3107f80c, 0xdfa84d1e, 0xbacff1a6, 0xecdf92fe,
+    0x89b82e46, 0x67179b54, 0x027027ec, 0xbb48f071, 0xde2f4cc9,
+    0x3080f9db, 0x55e74563, 0x9ca03f6b, 0xf9c783d3, 0x176836c1,
+    0x720f8a79, 0xcb375de4, 0xae50e15c, 0x40ff544e, 0x2598e8f6,
+    0x73888bae, 0x16ef3716, 0xf8408204, 0x9d273ebc, 0x241fe921,
+    0x41785599, 0xafd7e08b, 0xcab05c33, 0x3bb659ed, 0x5ed1e555,
+    0xb07e5047, 0xd519ecff, 0x6c213b62, 0x094687da, 0xe7e932c8,
+    0x828e8e70, 0xd49eed28, 0xb1f95190, 0x5f56e482, 0x3a31583a,
+    0x83098fa7, 0xe66e331f, 0x08c1860d, 0x6da63ab5, 0xa4e140bd,
+    0xc186fc05, 0x2f294917, 0x4a4ef5af, 0xf3762232, 0x96119e8a,
+    0x78be2b98, 0x1dd99720, 0x4bc9f478, 0x2eae48c0, 0xc001fdd2,
+    0xa566416a, 0x1c5e96f7, 0x79392a4f, 0x97969f5d, 0xf2f123e5,
+    0x05196b4d, 0x607ed7f5, 0x8ed162e7, 0xebb6de5f, 0x528e09c2,
+    0x37e9b57a, 0xd9460068, 0xbc21bcd0, 0xea31df88, 0x8f566330,
+    0x61f9d622, 0x049e6a9a, 0xbda6bd07, 0xd8c101bf, 0x366eb4ad,
+    0x53090815, 0x9a4e721d, 0xff29cea5, 0x11867bb7, 0x74e1c70f,
+    0xcdd91092, 0xa8beac2a, 0x46111938, 0x2376a580, 0x7566c6d8,
+    0x10017a60, 0xfeaecf72, 0x9bc973ca, 0x22f1a457, 0x479618ef,
+    0xa939adfd, 0xcc5e1145, 0x06ee4d76, 0x6389f1ce, 0x8d2644dc,
+    0xe841f864, 0x51792ff9, 0x341e9341, 0xdab12653, 0xbfd69aeb,
+    0xe9c6f9b3, 0x8ca1450b, 0x620ef019, 0x07694ca1, 0xbe519b3c,
+    0xdb362784, 0x35999296, 0x50fe2e2e, 0x99b95426, 0xfcdee89e,
+    0x12715d8c, 0x7716e134, 0xce2e36a9, 0xab498a11, 0x45e63f03,
+    0x208183bb, 0x7691e0e3, 0x13f65c5b, 0xfd59e949, 0x983e55f1,
+    0x2106826c, 0x44613ed4, 0xaace8bc6, 0xcfa9377e, 0x38417fd6,
+    0x5d26c36e, 0xb389767c, 0xd6eecac4, 0x6fd61d59, 0x0ab1a1e1,
+    0xe41e14f3, 0x8179a84b, 0xd769cb13, 0xb20e77ab, 0x5ca1c2b9,
+    0x39c67e01, 0x80fea99c, 0xe5991524, 0x0b36a036, 0x6e511c8e,
+    0xa7166686, 0xc271da3e, 0x2cde6f2c, 0x49b9d394, 0xf0810409,
+    0x95e6b8b1, 0x7b490da3, 0x1e2eb11b, 0x483ed243, 0x2d596efb,
+    0xc3f6dbe9, 0xa6916751, 0x1fa9b0cc, 0x7ace0c74, 0x9461b966,
+    0xf10605de}};
+
+#endif
+
+#endif
+
+#if N == 2
+
+#if W == 8
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0xae689191, 0x87a02563, 0x29c8b4f2, 0xd4314c87,
+    0x7a59dd16, 0x539169e4, 0xfdf9f875, 0x73139f4f, 0xdd7b0ede,
+    0xf4b3ba2c, 0x5adb2bbd, 0xa722d3c8, 0x094a4259, 0x2082f6ab,
+    0x8eea673a, 0xe6273e9e, 0x484faf0f, 0x61871bfd, 0xcfef8a6c,
+    0x32167219, 0x9c7ee388, 0xb5b6577a, 0x1bdec6eb, 0x9534a1d1,
+    0x3b5c3040, 0x129484b2, 0xbcfc1523, 0x4105ed56, 0xef6d7cc7,
+    0xc6a5c835, 0x68cd59a4, 0x173f7b7d, 0xb957eaec, 0x909f5e1e,
+    0x3ef7cf8f, 0xc30e37fa, 0x6d66a66b, 0x44ae1299, 0xeac68308,
+    0x642ce432, 0xca4475a3, 0xe38cc151, 0x4de450c0, 0xb01da8b5,
+    0x1e753924, 0x37bd8dd6, 0x99d51c47, 0xf11845e3, 0x5f70d472,
+    0x76b86080, 0xd8d0f111, 0x25290964, 0x8b4198f5, 0xa2892c07,
+    0x0ce1bd96, 0x820bdaac, 0x2c634b3d, 0x05abffcf, 0xabc36e5e,
+    0x563a962b, 0xf85207ba, 0xd19ab348, 0x7ff222d9, 0x2e7ef6fa,
+    0x8016676b, 0xa9ded399, 0x07b64208, 0xfa4fba7d, 0x54272bec,
+    0x7def9f1e, 0xd3870e8f, 0x5d6d69b5, 0xf305f824, 0xdacd4cd6,
+    0x74a5dd47, 0x895c2532, 0x2734b4a3, 0x0efc0051, 0xa09491c0,
+    0xc859c864, 0x663159f5, 0x4ff9ed07, 0xe1917c96, 0x1c6884e3,
+    0xb2001572, 0x9bc8a180, 0x35a03011, 0xbb4a572b, 0x1522c6ba,
+    0x3cea7248, 0x9282e3d9, 0x6f7b1bac, 0xc1138a3d, 0xe8db3ecf,
+    0x46b3af5e, 0x39418d87, 0x97291c16, 0xbee1a8e4, 0x10893975,
+    0xed70c100, 0x43185091, 0x6ad0e463, 0xc4b875f2, 0x4a5212c8,
+    0xe43a8359, 0xcdf237ab, 0x639aa63a, 0x9e635e4f, 0x300bcfde,
+    0x19c37b2c, 0xb7abeabd, 0xdf66b319, 0x710e2288, 0x58c6967a,
+    0xf6ae07eb, 0x0b57ff9e, 0xa53f6e0f, 0x8cf7dafd, 0x229f4b6c,
+    0xac752c56, 0x021dbdc7, 0x2bd50935, 0x85bd98a4, 0x784460d1,
+    0xd62cf140, 0xffe445b2, 0x518cd423, 0x5cfdedf4, 0xf2957c65,
+    0xdb5dc897, 0x75355906, 0x88cca173, 0x26a430e2, 0x0f6c8410,
+    0xa1041581, 0x2fee72bb, 0x8186e32a, 0xa84e57d8, 0x0626c649,
+    0xfbdf3e3c, 0x55b7afad, 0x7c7f1b5f, 0xd2178ace, 0xbadad36a,
+    0x14b242fb, 0x3d7af609, 0x93126798, 0x6eeb9fed, 0xc0830e7c,
+    0xe94bba8e, 0x47232b1f, 0xc9c94c25, 0x67a1ddb4, 0x4e696946,
+    0xe001f8d7, 0x1df800a2, 0xb3909133, 0x9a5825c1, 0x3430b450,
+    0x4bc29689, 0xe5aa0718, 0xcc62b3ea, 0x620a227b, 0x9ff3da0e,
+    0x319b4b9f, 0x1853ff6d, 0xb63b6efc, 0x38d109c6, 0x96b99857,
+    0xbf712ca5, 0x1119bd34, 0xece04541, 0x4288d4d0, 0x6b406022,
+    0xc528f1b3, 0xade5a817, 0x038d3986, 0x2a458d74, 0x842d1ce5,
+    0x79d4e490, 0xd7bc7501, 0xfe74c1f3, 0x501c5062, 0xdef63758,
+    0x709ea6c9, 0x5956123b, 0xf73e83aa, 0x0ac77bdf, 0xa4afea4e,
+    0x8d675ebc, 0x230fcf2d, 0x72831b0e, 0xdceb8a9f, 0xf5233e6d,
+    0x5b4baffc, 0xa6b25789, 0x08dac618, 0x211272ea, 0x8f7ae37b,
+    0x01908441, 0xaff815d0, 0x8630a122, 0x285830b3, 0xd5a1c8c6,
+    0x7bc95957, 0x5201eda5, 0xfc697c34, 0x94a42590, 0x3accb401,
+    0x130400f3, 0xbd6c9162, 0x40956917, 0xeefdf886, 0xc7354c74,
+    0x695ddde5, 0xe7b7badf, 0x49df2b4e, 0x60179fbc, 0xce7f0e2d,
+    0x3386f658, 0x9dee67c9, 0xb426d33b, 0x1a4e42aa, 0x65bc6073,
+    0xcbd4f1e2, 0xe21c4510, 0x4c74d481, 0xb18d2cf4, 0x1fe5bd65,
+    0x362d0997, 0x98459806, 0x16afff3c, 0xb8c76ead, 0x910fda5f,
+    0x3f674bce, 0xc29eb3bb, 0x6cf6222a, 0x453e96d8, 0xeb560749,
+    0x839b5eed, 0x2df3cf7c, 0x043b7b8e, 0xaa53ea1f, 0x57aa126a,
+    0xf9c283fb, 0xd00a3709, 0x7e62a698, 0xf088c1a2, 0x5ee05033,
+    0x7728e4c1, 0xd9407550, 0x24b98d25, 0x8ad11cb4, 0xa319a846,
+    0x0d7139d7},
+   {0x00000000, 0xb9fbdbe8, 0xa886b191, 0x117d6a79, 0x8a7c6563,
+    0x3387be8b, 0x22fad4f2, 0x9b010f1a, 0xcf89cc87, 0x7672176f,
+    0x670f7d16, 0xdef4a6fe, 0x45f5a9e4, 0xfc0e720c, 0xed731875,
+    0x5488c39d, 0x44629f4f, 0xfd9944a7, 0xece42ede, 0x551ff536,
+    0xce1efa2c, 0x77e521c4, 0x66984bbd, 0xdf639055, 0x8beb53c8,
+    0x32108820, 0x236de259, 0x9a9639b1, 0x019736ab, 0xb86ced43,
+    0xa911873a, 0x10ea5cd2, 0x88c53e9e, 0x313ee576, 0x20438f0f,
+    0x99b854e7, 0x02b95bfd, 0xbb428015, 0xaa3fea6c, 0x13c43184,
+    0x474cf219, 0xfeb729f1, 0xefca4388, 0x56319860, 0xcd30977a,
+    0x74cb4c92, 0x65b626eb, 0xdc4dfd03, 0xcca7a1d1, 0x755c7a39,
+    0x64211040, 0xdddacba8, 0x46dbc4b2, 0xff201f5a, 0xee5d7523,
+    0x57a6aecb, 0x032e6d56, 0xbad5b6be, 0xaba8dcc7, 0x1253072f,
+    0x89520835, 0x30a9d3dd, 0x21d4b9a4, 0x982f624c, 0xcafb7b7d,
+    0x7300a095, 0x627dcaec, 0xdb861104, 0x40871e1e, 0xf97cc5f6,
+    0xe801af8f, 0x51fa7467, 0x0572b7fa, 0xbc896c12, 0xadf4066b,
+    0x140fdd83, 0x8f0ed299, 0x36f50971, 0x27886308, 0x9e73b8e0,
+    0x8e99e432, 0x37623fda, 0x261f55a3, 0x9fe48e4b, 0x04e58151,
+    0xbd1e5ab9, 0xac6330c0, 0x1598eb28, 0x411028b5, 0xf8ebf35d,
+    0xe9969924, 0x506d42cc, 0xcb6c4dd6, 0x7297963e, 0x63eafc47,
+    0xda1127af, 0x423e45e3, 0xfbc59e0b, 0xeab8f472, 0x53432f9a,
+    0xc8422080, 0x71b9fb68, 0x60c49111, 0xd93f4af9, 0x8db78964,
+    0x344c528c, 0x253138f5, 0x9ccae31d, 0x07cbec07, 0xbe3037ef,
+    0xaf4d5d96, 0x16b6867e, 0x065cdaac, 0xbfa70144, 0xaeda6b3d,
+    0x1721b0d5, 0x8c20bfcf, 0x35db6427, 0x24a60e5e, 0x9d5dd5b6,
+    0xc9d5162b, 0x702ecdc3, 0x6153a7ba, 0xd8a87c52, 0x43a97348,
+    0xfa52a8a0, 0xeb2fc2d9, 0x52d41931, 0x4e87f0bb, 0xf77c2b53,
+    0xe601412a, 0x5ffa9ac2, 0xc4fb95d8, 0x7d004e30, 0x6c7d2449,
+    0xd586ffa1, 0x810e3c3c, 0x38f5e7d4, 0x29888dad, 0x90735645,
+    0x0b72595f, 0xb28982b7, 0xa3f4e8ce, 0x1a0f3326, 0x0ae56ff4,
+    0xb31eb41c, 0xa263de65, 0x1b98058d, 0x80990a97, 0x3962d17f,
+    0x281fbb06, 0x91e460ee, 0xc56ca373, 0x7c97789b, 0x6dea12e2,
+    0xd411c90a, 0x4f10c610, 0xf6eb1df8, 0xe7967781, 0x5e6dac69,
+    0xc642ce25, 0x7fb915cd, 0x6ec47fb4, 0xd73fa45c, 0x4c3eab46,
+    0xf5c570ae, 0xe4b81ad7, 0x5d43c13f, 0x09cb02a2, 0xb030d94a,
+    0xa14db333, 0x18b668db, 0x83b767c1, 0x3a4cbc29, 0x2b31d650,
+    0x92ca0db8, 0x8220516a, 0x3bdb8a82, 0x2aa6e0fb, 0x935d3b13,
+    0x085c3409, 0xb1a7efe1, 0xa0da8598, 0x19215e70, 0x4da99ded,
+    0xf4524605, 0xe52f2c7c, 0x5cd4f794, 0xc7d5f88e, 0x7e2e2366,
+    0x6f53491f, 0xd6a892f7, 0x847c8bc6, 0x3d87502e, 0x2cfa3a57,
+    0x9501e1bf, 0x0e00eea5, 0xb7fb354d, 0xa6865f34, 0x1f7d84dc,
+    0x4bf54741, 0xf20e9ca9, 0xe373f6d0, 0x5a882d38, 0xc1892222,
+    0x7872f9ca, 0x690f93b3, 0xd0f4485b, 0xc01e1489, 0x79e5cf61,
+    0x6898a518, 0xd1637ef0, 0x4a6271ea, 0xf399aa02, 0xe2e4c07b,
+    0x5b1f1b93, 0x0f97d80e, 0xb66c03e6, 0xa711699f, 0x1eeab277,
+    0x85ebbd6d, 0x3c106685, 0x2d6d0cfc, 0x9496d714, 0x0cb9b558,
+    0xb5426eb0, 0xa43f04c9, 0x1dc4df21, 0x86c5d03b, 0x3f3e0bd3,
+    0x2e4361aa, 0x97b8ba42, 0xc33079df, 0x7acba237, 0x6bb6c84e,
+    0xd24d13a6, 0x494c1cbc, 0xf0b7c754, 0xe1caad2d, 0x583176c5,
+    0x48db2a17, 0xf120f1ff, 0xe05d9b86, 0x59a6406e, 0xc2a74f74,
+    0x7b5c949c, 0x6a21fee5, 0xd3da250d, 0x8752e690, 0x3ea93d78,
+    0x2fd45701, 0x962f8ce9, 0x0d2e83f3, 0xb4d5581b, 0xa5a83262,
+    0x1c53e98a},
+   {0x00000000, 0x9d0fe176, 0xe16ec4ad, 0x7c6125db, 0x19ac8f1b,
+    0x84a36e6d, 0xf8c24bb6, 0x65cdaac0, 0x33591e36, 0xae56ff40,
+    0xd237da9b, 0x4f383bed, 0x2af5912d, 0xb7fa705b, 0xcb9b5580,
+    0x5694b4f6, 0x66b23c6c, 0xfbbddd1a, 0x87dcf8c1, 0x1ad319b7,
+    0x7f1eb377, 0xe2115201, 0x9e7077da, 0x037f96ac, 0x55eb225a,
+    0xc8e4c32c, 0xb485e6f7, 0x298a0781, 0x4c47ad41, 0xd1484c37,
+    0xad2969ec, 0x3026889a, 0xcd6478d8, 0x506b99ae, 0x2c0abc75,
+    0xb1055d03, 0xd4c8f7c3, 0x49c716b5, 0x35a6336e, 0xa8a9d218,
+    0xfe3d66ee, 0x63328798, 0x1f53a243, 0x825c4335, 0xe791e9f5,
+    0x7a9e0883, 0x06ff2d58, 0x9bf0cc2e, 0xabd644b4, 0x36d9a5c2,
+    0x4ab88019, 0xd7b7616f, 0xb27acbaf, 0x2f752ad9, 0x53140f02,
+    0xce1bee74, 0x988f5a82, 0x0580bbf4, 0x79e19e2f, 0xe4ee7f59,
+    0x8123d599, 0x1c2c34ef, 0x604d1134, 0xfd42f042, 0x41b9f7f1,
+    0xdcb61687, 0xa0d7335c, 0x3dd8d22a, 0x581578ea, 0xc51a999c,
+    0xb97bbc47, 0x24745d31, 0x72e0e9c7, 0xefef08b1, 0x938e2d6a,
+    0x0e81cc1c, 0x6b4c66dc, 0xf64387aa, 0x8a22a271, 0x172d4307,
+    0x270bcb9d, 0xba042aeb, 0xc6650f30, 0x5b6aee46, 0x3ea74486,
+    0xa3a8a5f0, 0xdfc9802b, 0x42c6615d, 0x1452d5ab, 0x895d34dd,
+    0xf53c1106, 0x6833f070, 0x0dfe5ab0, 0x90f1bbc6, 0xec909e1d,
+    0x719f7f6b, 0x8cdd8f29, 0x11d26e5f, 0x6db34b84, 0xf0bcaaf2,
+    0x95710032, 0x087ee144, 0x741fc49f, 0xe91025e9, 0xbf84911f,
+    0x228b7069, 0x5eea55b2, 0xc3e5b4c4, 0xa6281e04, 0x3b27ff72,
+    0x4746daa9, 0xda493bdf, 0xea6fb345, 0x77605233, 0x0b0177e8,
+    0x960e969e, 0xf3c33c5e, 0x6eccdd28, 0x12adf8f3, 0x8fa21985,
+    0xd936ad73, 0x44394c05, 0x385869de, 0xa55788a8, 0xc09a2268,
+    0x5d95c31e, 0x21f4e6c5, 0xbcfb07b3, 0x8373efe2, 0x1e7c0e94,
+    0x621d2b4f, 0xff12ca39, 0x9adf60f9, 0x07d0818f, 0x7bb1a454,
+    0xe6be4522, 0xb02af1d4, 0x2d2510a2, 0x51443579, 0xcc4bd40f,
+    0xa9867ecf, 0x34899fb9, 0x48e8ba62, 0xd5e75b14, 0xe5c1d38e,
+    0x78ce32f8, 0x04af1723, 0x99a0f655, 0xfc6d5c95, 0x6162bde3,
+    0x1d039838, 0x800c794e, 0xd698cdb8, 0x4b972cce, 0x37f60915,
+    0xaaf9e863, 0xcf3442a3, 0x523ba3d5, 0x2e5a860e, 0xb3556778,
+    0x4e17973a, 0xd318764c, 0xaf795397, 0x3276b2e1, 0x57bb1821,
+    0xcab4f957, 0xb6d5dc8c, 0x2bda3dfa, 0x7d4e890c, 0xe041687a,
+    0x9c204da1, 0x012facd7, 0x64e20617, 0xf9ede761, 0x858cc2ba,
+    0x188323cc, 0x28a5ab56, 0xb5aa4a20, 0xc9cb6ffb, 0x54c48e8d,
+    0x3109244d, 0xac06c53b, 0xd067e0e0, 0x4d680196, 0x1bfcb560,
+    0x86f35416, 0xfa9271cd, 0x679d90bb, 0x02503a7b, 0x9f5fdb0d,
+    0xe33efed6, 0x7e311fa0, 0xc2ca1813, 0x5fc5f965, 0x23a4dcbe,
+    0xbeab3dc8, 0xdb669708, 0x4669767e, 0x3a0853a5, 0xa707b2d3,
+    0xf1930625, 0x6c9ce753, 0x10fdc288, 0x8df223fe, 0xe83f893e,
+    0x75306848, 0x09514d93, 0x945eace5, 0xa478247f, 0x3977c509,
+    0x4516e0d2, 0xd81901a4, 0xbdd4ab64, 0x20db4a12, 0x5cba6fc9,
+    0xc1b58ebf, 0x97213a49, 0x0a2edb3f, 0x764ffee4, 0xeb401f92,
+    0x8e8db552, 0x13825424, 0x6fe371ff, 0xf2ec9089, 0x0fae60cb,
+    0x92a181bd, 0xeec0a466, 0x73cf4510, 0x1602efd0, 0x8b0d0ea6,
+    0xf76c2b7d, 0x6a63ca0b, 0x3cf77efd, 0xa1f89f8b, 0xdd99ba50,
+    0x40965b26, 0x255bf1e6, 0xb8541090, 0xc435354b, 0x593ad43d,
+    0x691c5ca7, 0xf413bdd1, 0x8872980a, 0x157d797c, 0x70b0d3bc,
+    0xedbf32ca, 0x91de1711, 0x0cd1f667, 0x5a454291, 0xc74aa3e7,
+    0xbb2b863c, 0x2624674a, 0x43e9cd8a, 0xdee62cfc, 0xa2870927,
+    0x3f88e851},
+   {0x00000000, 0xdd96d985, 0x605cb54b, 0xbdca6cce, 0xc0b96a96,
+    0x1d2fb313, 0xa0e5dfdd, 0x7d730658, 0x5a03d36d, 0x87950ae8,
+    0x3a5f6626, 0xe7c9bfa3, 0x9abab9fb, 0x472c607e, 0xfae60cb0,
+    0x2770d535, 0xb407a6da, 0x69917f5f, 0xd45b1391, 0x09cdca14,
+    0x74becc4c, 0xa92815c9, 0x14e27907, 0xc974a082, 0xee0475b7,
+    0x3392ac32, 0x8e58c0fc, 0x53ce1979, 0x2ebd1f21, 0xf32bc6a4,
+    0x4ee1aa6a, 0x937773ef, 0xb37e4bf5, 0x6ee89270, 0xd322febe,
+    0x0eb4273b, 0x73c72163, 0xae51f8e6, 0x139b9428, 0xce0d4dad,
+    0xe97d9898, 0x34eb411d, 0x89212dd3, 0x54b7f456, 0x29c4f20e,
+    0xf4522b8b, 0x49984745, 0x940e9ec0, 0x0779ed2f, 0xdaef34aa,
+    0x67255864, 0xbab381e1, 0xc7c087b9, 0x1a565e3c, 0xa79c32f2,
+    0x7a0aeb77, 0x5d7a3e42, 0x80ece7c7, 0x3d268b09, 0xe0b0528c,
+    0x9dc354d4, 0x40558d51, 0xfd9fe19f, 0x2009381a, 0xbd8d91ab,
+    0x601b482e, 0xddd124e0, 0x0047fd65, 0x7d34fb3d, 0xa0a222b8,
+    0x1d684e76, 0xc0fe97f3, 0xe78e42c6, 0x3a189b43, 0x87d2f78d,
+    0x5a442e08, 0x27372850, 0xfaa1f1d5, 0x476b9d1b, 0x9afd449e,
+    0x098a3771, 0xd41ceef4, 0x69d6823a, 0xb4405bbf, 0xc9335de7,
+    0x14a58462, 0xa96fe8ac, 0x74f93129, 0x5389e41c, 0x8e1f3d99,
+    0x33d55157, 0xee4388d2, 0x93308e8a, 0x4ea6570f, 0xf36c3bc1,
+    0x2efae244, 0x0ef3da5e, 0xd36503db, 0x6eaf6f15, 0xb339b690,
+    0xce4ab0c8, 0x13dc694d, 0xae160583, 0x7380dc06, 0x54f00933,
+    0x8966d0b6, 0x34acbc78, 0xe93a65fd, 0x944963a5, 0x49dfba20,
+    0xf415d6ee, 0x29830f6b, 0xbaf47c84, 0x6762a501, 0xdaa8c9cf,
+    0x073e104a, 0x7a4d1612, 0xa7dbcf97, 0x1a11a359, 0xc7877adc,
+    0xe0f7afe9, 0x3d61766c, 0x80ab1aa2, 0x5d3dc327, 0x204ec57f,
+    0xfdd81cfa, 0x40127034, 0x9d84a9b1, 0xa06a2517, 0x7dfcfc92,
+    0xc036905c, 0x1da049d9, 0x60d34f81, 0xbd459604, 0x008ffaca,
+    0xdd19234f, 0xfa69f67a, 0x27ff2fff, 0x9a354331, 0x47a39ab4,
+    0x3ad09cec, 0xe7464569, 0x5a8c29a7, 0x871af022, 0x146d83cd,
+    0xc9fb5a48, 0x74313686, 0xa9a7ef03, 0xd4d4e95b, 0x094230de,
+    0xb4885c10, 0x691e8595, 0x4e6e50a0, 0x93f88925, 0x2e32e5eb,
+    0xf3a43c6e, 0x8ed73a36, 0x5341e3b3, 0xee8b8f7d, 0x331d56f8,
+    0x13146ee2, 0xce82b767, 0x7348dba9, 0xaede022c, 0xd3ad0474,
+    0x0e3bddf1, 0xb3f1b13f, 0x6e6768ba, 0x4917bd8f, 0x9481640a,
+    0x294b08c4, 0xf4ddd141, 0x89aed719, 0x54380e9c, 0xe9f26252,
+    0x3464bbd7, 0xa713c838, 0x7a8511bd, 0xc74f7d73, 0x1ad9a4f6,
+    0x67aaa2ae, 0xba3c7b2b, 0x07f617e5, 0xda60ce60, 0xfd101b55,
+    0x2086c2d0, 0x9d4cae1e, 0x40da779b, 0x3da971c3, 0xe03fa846,
+    0x5df5c488, 0x80631d0d, 0x1de7b4bc, 0xc0716d39, 0x7dbb01f7,
+    0xa02dd872, 0xdd5ede2a, 0x00c807af, 0xbd026b61, 0x6094b2e4,
+    0x47e467d1, 0x9a72be54, 0x27b8d29a, 0xfa2e0b1f, 0x875d0d47,
+    0x5acbd4c2, 0xe701b80c, 0x3a976189, 0xa9e01266, 0x7476cbe3,
+    0xc9bca72d, 0x142a7ea8, 0x695978f0, 0xb4cfa175, 0x0905cdbb,
+    0xd493143e, 0xf3e3c10b, 0x2e75188e, 0x93bf7440, 0x4e29adc5,
+    0x335aab9d, 0xeecc7218, 0x53061ed6, 0x8e90c753, 0xae99ff49,
+    0x730f26cc, 0xcec54a02, 0x13539387, 0x6e2095df, 0xb3b64c5a,
+    0x0e7c2094, 0xd3eaf911, 0xf49a2c24, 0x290cf5a1, 0x94c6996f,
+    0x495040ea, 0x342346b2, 0xe9b59f37, 0x547ff3f9, 0x89e92a7c,
+    0x1a9e5993, 0xc7088016, 0x7ac2ecd8, 0xa754355d, 0xda273305,
+    0x07b1ea80, 0xba7b864e, 0x67ed5fcb, 0x409d8afe, 0x9d0b537b,
+    0x20c13fb5, 0xfd57e630, 0x8024e068, 0x5db239ed, 0xe0785523,
+    0x3dee8ca6},
+   {0x00000000, 0x9ba54c6f, 0xec3b9e9f, 0x779ed2f0, 0x03063b7f,
+    0x98a37710, 0xef3da5e0, 0x7498e98f, 0x060c76fe, 0x9da93a91,
+    0xea37e861, 0x7192a40e, 0x050a4d81, 0x9eaf01ee, 0xe931d31e,
+    0x72949f71, 0x0c18edfc, 0x97bda193, 0xe0237363, 0x7b863f0c,
+    0x0f1ed683, 0x94bb9aec, 0xe325481c, 0x78800473, 0x0a149b02,
+    0x91b1d76d, 0xe62f059d, 0x7d8a49f2, 0x0912a07d, 0x92b7ec12,
+    0xe5293ee2, 0x7e8c728d, 0x1831dbf8, 0x83949797, 0xf40a4567,
+    0x6faf0908, 0x1b37e087, 0x8092ace8, 0xf70c7e18, 0x6ca93277,
+    0x1e3dad06, 0x8598e169, 0xf2063399, 0x69a37ff6, 0x1d3b9679,
+    0x869eda16, 0xf10008e6, 0x6aa54489, 0x14293604, 0x8f8c7a6b,
+    0xf812a89b, 0x63b7e4f4, 0x172f0d7b, 0x8c8a4114, 0xfb1493e4,
+    0x60b1df8b, 0x122540fa, 0x89800c95, 0xfe1ede65, 0x65bb920a,
+    0x11237b85, 0x8a8637ea, 0xfd18e51a, 0x66bda975, 0x3063b7f0,
+    0xabc6fb9f, 0xdc58296f, 0x47fd6500, 0x33658c8f, 0xa8c0c0e0,
+    0xdf5e1210, 0x44fb5e7f, 0x366fc10e, 0xadca8d61, 0xda545f91,
+    0x41f113fe, 0x3569fa71, 0xaeccb61e, 0xd95264ee, 0x42f72881,
+    0x3c7b5a0c, 0xa7de1663, 0xd040c493, 0x4be588fc, 0x3f7d6173,
+    0xa4d82d1c, 0xd346ffec, 0x48e3b383, 0x3a772cf2, 0xa1d2609d,
+    0xd64cb26d, 0x4de9fe02, 0x3971178d, 0xa2d45be2, 0xd54a8912,
+    0x4eefc57d, 0x28526c08, 0xb3f72067, 0xc469f297, 0x5fccbef8,
+    0x2b545777, 0xb0f11b18, 0xc76fc9e8, 0x5cca8587, 0x2e5e1af6,
+    0xb5fb5699, 0xc2658469, 0x59c0c806, 0x2d582189, 0xb6fd6de6,
+    0xc163bf16, 0x5ac6f379, 0x244a81f4, 0xbfefcd9b, 0xc8711f6b,
+    0x53d45304, 0x274cba8b, 0xbce9f6e4, 0xcb772414, 0x50d2687b,
+    0x2246f70a, 0xb9e3bb65, 0xce7d6995, 0x55d825fa, 0x2140cc75,
+    0xbae5801a, 0xcd7b52ea, 0x56de1e85, 0x60c76fe0, 0xfb62238f,
+    0x8cfcf17f, 0x1759bd10, 0x63c1549f, 0xf86418f0, 0x8ffaca00,
+    0x145f866f, 0x66cb191e, 0xfd6e5571, 0x8af08781, 0x1155cbee,
+    0x65cd2261, 0xfe686e0e, 0x89f6bcfe, 0x1253f091, 0x6cdf821c,
+    0xf77ace73, 0x80e41c83, 0x1b4150ec, 0x6fd9b963, 0xf47cf50c,
+    0x83e227fc, 0x18476b93, 0x6ad3f4e2, 0xf176b88d, 0x86e86a7d,
+    0x1d4d2612, 0x69d5cf9d, 0xf27083f2, 0x85ee5102, 0x1e4b1d6d,
+    0x78f6b418, 0xe353f877, 0x94cd2a87, 0x0f6866e8, 0x7bf08f67,
+    0xe055c308, 0x97cb11f8, 0x0c6e5d97, 0x7efac2e6, 0xe55f8e89,
+    0x92c15c79, 0x09641016, 0x7dfcf999, 0xe659b5f6, 0x91c76706,
+    0x0a622b69, 0x74ee59e4, 0xef4b158b, 0x98d5c77b, 0x03708b14,
+    0x77e8629b, 0xec4d2ef4, 0x9bd3fc04, 0x0076b06b, 0x72e22f1a,
+    0xe9476375, 0x9ed9b185, 0x057cfdea, 0x71e41465, 0xea41580a,
+    0x9ddf8afa, 0x067ac695, 0x50a4d810, 0xcb01947f, 0xbc9f468f,
+    0x273a0ae0, 0x53a2e36f, 0xc807af00, 0xbf997df0, 0x243c319f,
+    0x56a8aeee, 0xcd0de281, 0xba933071, 0x21367c1e, 0x55ae9591,
+    0xce0bd9fe, 0xb9950b0e, 0x22304761, 0x5cbc35ec, 0xc7197983,
+    0xb087ab73, 0x2b22e71c, 0x5fba0e93, 0xc41f42fc, 0xb381900c,
+    0x2824dc63, 0x5ab04312, 0xc1150f7d, 0xb68bdd8d, 0x2d2e91e2,
+    0x59b6786d, 0xc2133402, 0xb58de6f2, 0x2e28aa9d, 0x489503e8,
+    0xd3304f87, 0xa4ae9d77, 0x3f0bd118, 0x4b933897, 0xd03674f8,
+    0xa7a8a608, 0x3c0dea67, 0x4e997516, 0xd53c3979, 0xa2a2eb89,
+    0x3907a7e6, 0x4d9f4e69, 0xd63a0206, 0xa1a4d0f6, 0x3a019c99,
+    0x448dee14, 0xdf28a27b, 0xa8b6708b, 0x33133ce4, 0x478bd56b,
+    0xdc2e9904, 0xabb04bf4, 0x3015079b, 0x428198ea, 0xd924d485,
+    0xaeba0675, 0x351f4a1a, 0x4187a395, 0xda22effa, 0xadbc3d0a,
+    0x36197165},
+   {0x00000000, 0xc18edfc0, 0x586cb9c1, 0x99e26601, 0xb0d97382,
+    0x7157ac42, 0xe8b5ca43, 0x293b1583, 0xbac3e145, 0x7b4d3e85,
+    0xe2af5884, 0x23218744, 0x0a1a92c7, 0xcb944d07, 0x52762b06,
+    0x93f8f4c6, 0xaef6c4cb, 0x6f781b0b, 0xf69a7d0a, 0x3714a2ca,
+    0x1e2fb749, 0xdfa16889, 0x46430e88, 0x87cdd148, 0x1435258e,
+    0xd5bbfa4e, 0x4c599c4f, 0x8dd7438f, 0xa4ec560c, 0x656289cc,
+    0xfc80efcd, 0x3d0e300d, 0x869c8fd7, 0x47125017, 0xdef03616,
+    0x1f7ee9d6, 0x3645fc55, 0xf7cb2395, 0x6e294594, 0xafa79a54,
+    0x3c5f6e92, 0xfdd1b152, 0x6433d753, 0xa5bd0893, 0x8c861d10,
+    0x4d08c2d0, 0xd4eaa4d1, 0x15647b11, 0x286a4b1c, 0xe9e494dc,
+    0x7006f2dd, 0xb1882d1d, 0x98b3389e, 0x593de75e, 0xc0df815f,
+    0x01515e9f, 0x92a9aa59, 0x53277599, 0xcac51398, 0x0b4bcc58,
+    0x2270d9db, 0xe3fe061b, 0x7a1c601a, 0xbb92bfda, 0xd64819ef,
+    0x17c6c62f, 0x8e24a02e, 0x4faa7fee, 0x66916a6d, 0xa71fb5ad,
+    0x3efdd3ac, 0xff730c6c, 0x6c8bf8aa, 0xad05276a, 0x34e7416b,
+    0xf5699eab, 0xdc528b28, 0x1ddc54e8, 0x843e32e9, 0x45b0ed29,
+    0x78bedd24, 0xb93002e4, 0x20d264e5, 0xe15cbb25, 0xc867aea6,
+    0x09e97166, 0x900b1767, 0x5185c8a7, 0xc27d3c61, 0x03f3e3a1,
+    0x9a1185a0, 0x5b9f5a60, 0x72a44fe3, 0xb32a9023, 0x2ac8f622,
+    0xeb4629e2, 0x50d49638, 0x915a49f8, 0x08b82ff9, 0xc936f039,
+    0xe00de5ba, 0x21833a7a, 0xb8615c7b, 0x79ef83bb, 0xea17777d,
+    0x2b99a8bd, 0xb27bcebc, 0x73f5117c, 0x5ace04ff, 0x9b40db3f,
+    0x02a2bd3e, 0xc32c62fe, 0xfe2252f3, 0x3fac8d33, 0xa64eeb32,
+    0x67c034f2, 0x4efb2171, 0x8f75feb1, 0x169798b0, 0xd7194770,
+    0x44e1b3b6, 0x856f6c76, 0x1c8d0a77, 0xdd03d5b7, 0xf438c034,
+    0x35b61ff4, 0xac5479f5, 0x6ddaa635, 0x77e1359f, 0xb66fea5f,
+    0x2f8d8c5e, 0xee03539e, 0xc738461d, 0x06b699dd, 0x9f54ffdc,
+    0x5eda201c, 0xcd22d4da, 0x0cac0b1a, 0x954e6d1b, 0x54c0b2db,
+    0x7dfba758, 0xbc757898, 0x25971e99, 0xe419c159, 0xd917f154,
+    0x18992e94, 0x817b4895, 0x40f59755, 0x69ce82d6, 0xa8405d16,
+    0x31a23b17, 0xf02ce4d7, 0x63d41011, 0xa25acfd1, 0x3bb8a9d0,
+    0xfa367610, 0xd30d6393, 0x1283bc53, 0x8b61da52, 0x4aef0592,
+    0xf17dba48, 0x30f36588, 0xa9110389, 0x689fdc49, 0x41a4c9ca,
+    0x802a160a, 0x19c8700b, 0xd846afcb, 0x4bbe5b0d, 0x8a3084cd,
+    0x13d2e2cc, 0xd25c3d0c, 0xfb67288f, 0x3ae9f74f, 0xa30b914e,
+    0x62854e8e, 0x5f8b7e83, 0x9e05a143, 0x07e7c742, 0xc6691882,
+    0xef520d01, 0x2edcd2c1, 0xb73eb4c0, 0x76b06b00, 0xe5489fc6,
+    0x24c64006, 0xbd242607, 0x7caaf9c7, 0x5591ec44, 0x941f3384,
+    0x0dfd5585, 0xcc738a45, 0xa1a92c70, 0x6027f3b0, 0xf9c595b1,
+    0x384b4a71, 0x11705ff2, 0xd0fe8032, 0x491ce633, 0x889239f3,
+    0x1b6acd35, 0xdae412f5, 0x430674f4, 0x8288ab34, 0xabb3beb7,
+    0x6a3d6177, 0xf3df0776, 0x3251d8b6, 0x0f5fe8bb, 0xced1377b,
+    0x5733517a, 0x96bd8eba, 0xbf869b39, 0x7e0844f9, 0xe7ea22f8,
+    0x2664fd38, 0xb59c09fe, 0x7412d63e, 0xedf0b03f, 0x2c7e6fff,
+    0x05457a7c, 0xc4cba5bc, 0x5d29c3bd, 0x9ca71c7d, 0x2735a3a7,
+    0xe6bb7c67, 0x7f591a66, 0xbed7c5a6, 0x97ecd025, 0x56620fe5,
+    0xcf8069e4, 0x0e0eb624, 0x9df642e2, 0x5c789d22, 0xc59afb23,
+    0x041424e3, 0x2d2f3160, 0xeca1eea0, 0x754388a1, 0xb4cd5761,
+    0x89c3676c, 0x484db8ac, 0xd1afdead, 0x1021016d, 0x391a14ee,
+    0xf894cb2e, 0x6176ad2f, 0xa0f872ef, 0x33008629, 0xf28e59e9,
+    0x6b6c3fe8, 0xaae2e028, 0x83d9f5ab, 0x42572a6b, 0xdbb54c6a,
+    0x1a3b93aa},
+   {0x00000000, 0xefc26b3e, 0x04f5d03d, 0xeb37bb03, 0x09eba07a,
+    0xe629cb44, 0x0d1e7047, 0xe2dc1b79, 0x13d740f4, 0xfc152bca,
+    0x172290c9, 0xf8e0fbf7, 0x1a3ce08e, 0xf5fe8bb0, 0x1ec930b3,
+    0xf10b5b8d, 0x27ae81e8, 0xc86cead6, 0x235b51d5, 0xcc993aeb,
+    0x2e452192, 0xc1874aac, 0x2ab0f1af, 0xc5729a91, 0x3479c11c,
+    0xdbbbaa22, 0x308c1121, 0xdf4e7a1f, 0x3d926166, 0xd2500a58,
+    0x3967b15b, 0xd6a5da65, 0x4f5d03d0, 0xa09f68ee, 0x4ba8d3ed,
+    0xa46ab8d3, 0x46b6a3aa, 0xa974c894, 0x42437397, 0xad8118a9,
+    0x5c8a4324, 0xb348281a, 0x587f9319, 0xb7bdf827, 0x5561e35e,
+    0xbaa38860, 0x51943363, 0xbe56585d, 0x68f38238, 0x8731e906,
+    0x6c065205, 0x83c4393b, 0x61182242, 0x8eda497c, 0x65edf27f,
+    0x8a2f9941, 0x7b24c2cc, 0x94e6a9f2, 0x7fd112f1, 0x901379cf,
+    0x72cf62b6, 0x9d0d0988, 0x763ab28b, 0x99f8d9b5, 0x9eba07a0,
+    0x71786c9e, 0x9a4fd79d, 0x758dbca3, 0x9751a7da, 0x7893cce4,
+    0x93a477e7, 0x7c661cd9, 0x8d6d4754, 0x62af2c6a, 0x89989769,
+    0x665afc57, 0x8486e72e, 0x6b448c10, 0x80733713, 0x6fb15c2d,
+    0xb9148648, 0x56d6ed76, 0xbde15675, 0x52233d4b, 0xb0ff2632,
+    0x5f3d4d0c, 0xb40af60f, 0x5bc89d31, 0xaac3c6bc, 0x4501ad82,
+    0xae361681, 0x41f47dbf, 0xa32866c6, 0x4cea0df8, 0xa7ddb6fb,
+    0x481fddc5, 0xd1e70470, 0x3e256f4e, 0xd512d44d, 0x3ad0bf73,
+    0xd80ca40a, 0x37cecf34, 0xdcf97437, 0x333b1f09, 0xc2304484,
+    0x2df22fba, 0xc6c594b9, 0x2907ff87, 0xcbdbe4fe, 0x24198fc0,
+    0xcf2e34c3, 0x20ec5ffd, 0xf6498598, 0x198beea6, 0xf2bc55a5,
+    0x1d7e3e9b, 0xffa225e2, 0x10604edc, 0xfb57f5df, 0x14959ee1,
+    0xe59ec56c, 0x0a5cae52, 0xe16b1551, 0x0ea97e6f, 0xec756516,
+    0x03b70e28, 0xe880b52b, 0x0742de15, 0xe6050901, 0x09c7623f,
+    0xe2f0d93c, 0x0d32b202, 0xefeea97b, 0x002cc245, 0xeb1b7946,
+    0x04d91278, 0xf5d249f5, 0x1a1022cb, 0xf12799c8, 0x1ee5f2f6,
+    0xfc39e98f, 0x13fb82b1, 0xf8cc39b2, 0x170e528c, 0xc1ab88e9,
+    0x2e69e3d7, 0xc55e58d4, 0x2a9c33ea, 0xc8402893, 0x278243ad,
+    0xccb5f8ae, 0x23779390, 0xd27cc81d, 0x3dbea323, 0xd6891820,
+    0x394b731e, 0xdb976867, 0x34550359, 0xdf62b85a, 0x30a0d364,
+    0xa9580ad1, 0x469a61ef, 0xadaddaec, 0x426fb1d2, 0xa0b3aaab,
+    0x4f71c195, 0xa4467a96, 0x4b8411a8, 0xba8f4a25, 0x554d211b,
+    0xbe7a9a18, 0x51b8f126, 0xb364ea5f, 0x5ca68161, 0xb7913a62,
+    0x5853515c, 0x8ef68b39, 0x6134e007, 0x8a035b04, 0x65c1303a,
+    0x871d2b43, 0x68df407d, 0x83e8fb7e, 0x6c2a9040, 0x9d21cbcd,
+    0x72e3a0f3, 0x99d41bf0, 0x761670ce, 0x94ca6bb7, 0x7b080089,
+    0x903fbb8a, 0x7ffdd0b4, 0x78bf0ea1, 0x977d659f, 0x7c4ade9c,
+    0x9388b5a2, 0x7154aedb, 0x9e96c5e5, 0x75a17ee6, 0x9a6315d8,
+    0x6b684e55, 0x84aa256b, 0x6f9d9e68, 0x805ff556, 0x6283ee2f,
+    0x8d418511, 0x66763e12, 0x89b4552c, 0x5f118f49, 0xb0d3e477,
+    0x5be45f74, 0xb426344a, 0x56fa2f33, 0xb938440d, 0x520fff0e,
+    0xbdcd9430, 0x4cc6cfbd, 0xa304a483, 0x48331f80, 0xa7f174be,
+    0x452d6fc7, 0xaaef04f9, 0x41d8bffa, 0xae1ad4c4, 0x37e20d71,
+    0xd820664f, 0x3317dd4c, 0xdcd5b672, 0x3e09ad0b, 0xd1cbc635,
+    0x3afc7d36, 0xd53e1608, 0x24354d85, 0xcbf726bb, 0x20c09db8,
+    0xcf02f686, 0x2ddeedff, 0xc21c86c1, 0x292b3dc2, 0xc6e956fc,
+    0x104c8c99, 0xff8ee7a7, 0x14b95ca4, 0xfb7b379a, 0x19a72ce3,
+    0xf66547dd, 0x1d52fcde, 0xf29097e0, 0x039bcc6d, 0xec59a753,
+    0x076e1c50, 0xe8ac776e, 0x0a706c17, 0xe5b20729, 0x0e85bc2a,
+    0xe147d714},
+   {0x00000000, 0x177b1443, 0x2ef62886, 0x398d3cc5, 0x5dec510c,
+    0x4a97454f, 0x731a798a, 0x64616dc9, 0xbbd8a218, 0xaca3b65b,
+    0x952e8a9e, 0x82559edd, 0xe634f314, 0xf14fe757, 0xc8c2db92,
+    0xdfb9cfd1, 0xacc04271, 0xbbbb5632, 0x82366af7, 0x954d7eb4,
+    0xf12c137d, 0xe657073e, 0xdfda3bfb, 0xc8a12fb8, 0x1718e069,
+    0x0063f42a, 0x39eec8ef, 0x2e95dcac, 0x4af4b165, 0x5d8fa526,
+    0x640299e3, 0x73798da0, 0x82f182a3, 0x958a96e0, 0xac07aa25,
+    0xbb7cbe66, 0xdf1dd3af, 0xc866c7ec, 0xf1ebfb29, 0xe690ef6a,
+    0x392920bb, 0x2e5234f8, 0x17df083d, 0x00a41c7e, 0x64c571b7,
+    0x73be65f4, 0x4a335931, 0x5d484d72, 0x2e31c0d2, 0x394ad491,
+    0x00c7e854, 0x17bcfc17, 0x73dd91de, 0x64a6859d, 0x5d2bb958,
+    0x4a50ad1b, 0x95e962ca, 0x82927689, 0xbb1f4a4c, 0xac645e0f,
+    0xc80533c6, 0xdf7e2785, 0xe6f31b40, 0xf1880f03, 0xde920307,
+    0xc9e91744, 0xf0642b81, 0xe71f3fc2, 0x837e520b, 0x94054648,
+    0xad887a8d, 0xbaf36ece, 0x654aa11f, 0x7231b55c, 0x4bbc8999,
+    0x5cc79dda, 0x38a6f013, 0x2fdde450, 0x1650d895, 0x012bccd6,
+    0x72524176, 0x65295535, 0x5ca469f0, 0x4bdf7db3, 0x2fbe107a,
+    0x38c50439, 0x014838fc, 0x16332cbf, 0xc98ae36e, 0xdef1f72d,
+    0xe77ccbe8, 0xf007dfab, 0x9466b262, 0x831da621, 0xba909ae4,
+    0xadeb8ea7, 0x5c6381a4, 0x4b1895e7, 0x7295a922, 0x65eebd61,
+    0x018fd0a8, 0x16f4c4eb, 0x2f79f82e, 0x3802ec6d, 0xe7bb23bc,
+    0xf0c037ff, 0xc94d0b3a, 0xde361f79, 0xba5772b0, 0xad2c66f3,
+    0x94a15a36, 0x83da4e75, 0xf0a3c3d5, 0xe7d8d796, 0xde55eb53,
+    0xc92eff10, 0xad4f92d9, 0xba34869a, 0x83b9ba5f, 0x94c2ae1c,
+    0x4b7b61cd, 0x5c00758e, 0x658d494b, 0x72f65d08, 0x169730c1,
+    0x01ec2482, 0x38611847, 0x2f1a0c04, 0x6655004f, 0x712e140c,
+    0x48a328c9, 0x5fd83c8a, 0x3bb95143, 0x2cc24500, 0x154f79c5,
+    0x02346d86, 0xdd8da257, 0xcaf6b614, 0xf37b8ad1, 0xe4009e92,
+    0x8061f35b, 0x971ae718, 0xae97dbdd, 0xb9eccf9e, 0xca95423e,
+    0xddee567d, 0xe4636ab8, 0xf3187efb, 0x97791332, 0x80020771,
+    0xb98f3bb4, 0xaef42ff7, 0x714de026, 0x6636f465, 0x5fbbc8a0,
+    0x48c0dce3, 0x2ca1b12a, 0x3bdaa569, 0x025799ac, 0x152c8def,
+    0xe4a482ec, 0xf3df96af, 0xca52aa6a, 0xdd29be29, 0xb948d3e0,
+    0xae33c7a3, 0x97befb66, 0x80c5ef25, 0x5f7c20f4, 0x480734b7,
+    0x718a0872, 0x66f11c31, 0x029071f8, 0x15eb65bb, 0x2c66597e,
+    0x3b1d4d3d, 0x4864c09d, 0x5f1fd4de, 0x6692e81b, 0x71e9fc58,
+    0x15889191, 0x02f385d2, 0x3b7eb917, 0x2c05ad54, 0xf3bc6285,
+    0xe4c776c6, 0xdd4a4a03, 0xca315e40, 0xae503389, 0xb92b27ca,
+    0x80a61b0f, 0x97dd0f4c, 0xb8c70348, 0xafbc170b, 0x96312bce,
+    0x814a3f8d, 0xe52b5244, 0xf2504607, 0xcbdd7ac2, 0xdca66e81,
+    0x031fa150, 0x1464b513, 0x2de989d6, 0x3a929d95, 0x5ef3f05c,
+    0x4988e41f, 0x7005d8da, 0x677ecc99, 0x14074139, 0x037c557a,
+    0x3af169bf, 0x2d8a7dfc, 0x49eb1035, 0x5e900476, 0x671d38b3,
+    0x70662cf0, 0xafdfe321, 0xb8a4f762, 0x8129cba7, 0x9652dfe4,
+    0xf233b22d, 0xe548a66e, 0xdcc59aab, 0xcbbe8ee8, 0x3a3681eb,
+    0x2d4d95a8, 0x14c0a96d, 0x03bbbd2e, 0x67dad0e7, 0x70a1c4a4,
+    0x492cf861, 0x5e57ec22, 0x81ee23f3, 0x969537b0, 0xaf180b75,
+    0xb8631f36, 0xdc0272ff, 0xcb7966bc, 0xf2f45a79, 0xe58f4e3a,
+    0x96f6c39a, 0x818dd7d9, 0xb800eb1c, 0xaf7bff5f, 0xcb1a9296,
+    0xdc6186d5, 0xe5ecba10, 0xf297ae53, 0x2d2e6182, 0x3a5575c1,
+    0x03d84904, 0x14a35d47, 0x70c2308e, 0x67b924cd, 0x5e341808,
+    0x494f0c4b}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x0000000000000000, 0x43147b1700000000, 0x8628f62e00000000,
+    0xc53c8d3900000000, 0x0c51ec5d00000000, 0x4f45974a00000000,
+    0x8a791a7300000000, 0xc96d616400000000, 0x18a2d8bb00000000,
+    0x5bb6a3ac00000000, 0x9e8a2e9500000000, 0xdd9e558200000000,
+    0x14f334e600000000, 0x57e74ff100000000, 0x92dbc2c800000000,
+    0xd1cfb9df00000000, 0x7142c0ac00000000, 0x3256bbbb00000000,
+    0xf76a368200000000, 0xb47e4d9500000000, 0x7d132cf100000000,
+    0x3e0757e600000000, 0xfb3bdadf00000000, 0xb82fa1c800000000,
+    0x69e0181700000000, 0x2af4630000000000, 0xefc8ee3900000000,
+    0xacdc952e00000000, 0x65b1f44a00000000, 0x26a58f5d00000000,
+    0xe399026400000000, 0xa08d797300000000, 0xa382f18200000000,
+    0xe0968a9500000000, 0x25aa07ac00000000, 0x66be7cbb00000000,
+    0xafd31ddf00000000, 0xecc766c800000000, 0x29fbebf100000000,
+    0x6aef90e600000000, 0xbb20293900000000, 0xf834522e00000000,
+    0x3d08df1700000000, 0x7e1ca40000000000, 0xb771c56400000000,
+    0xf465be7300000000, 0x3159334a00000000, 0x724d485d00000000,
+    0xd2c0312e00000000, 0x91d44a3900000000, 0x54e8c70000000000,
+    0x17fcbc1700000000, 0xde91dd7300000000, 0x9d85a66400000000,
+    0x58b92b5d00000000, 0x1bad504a00000000, 0xca62e99500000000,
+    0x8976928200000000, 0x4c4a1fbb00000000, 0x0f5e64ac00000000,
+    0xc63305c800000000, 0x85277edf00000000, 0x401bf3e600000000,
+    0x030f88f100000000, 0x070392de00000000, 0x4417e9c900000000,
+    0x812b64f000000000, 0xc23f1fe700000000, 0x0b527e8300000000,
+    0x4846059400000000, 0x8d7a88ad00000000, 0xce6ef3ba00000000,
+    0x1fa14a6500000000, 0x5cb5317200000000, 0x9989bc4b00000000,
+    0xda9dc75c00000000, 0x13f0a63800000000, 0x50e4dd2f00000000,
+    0x95d8501600000000, 0xd6cc2b0100000000, 0x7641527200000000,
+    0x3555296500000000, 0xf069a45c00000000, 0xb37ddf4b00000000,
+    0x7a10be2f00000000, 0x3904c53800000000, 0xfc38480100000000,
+    0xbf2c331600000000, 0x6ee38ac900000000, 0x2df7f1de00000000,
+    0xe8cb7ce700000000, 0xabdf07f000000000, 0x62b2669400000000,
+    0x21a61d8300000000, 0xe49a90ba00000000, 0xa78eebad00000000,
+    0xa481635c00000000, 0xe795184b00000000, 0x22a9957200000000,
+    0x61bdee6500000000, 0xa8d08f0100000000, 0xebc4f41600000000,
+    0x2ef8792f00000000, 0x6dec023800000000, 0xbc23bbe700000000,
+    0xff37c0f000000000, 0x3a0b4dc900000000, 0x791f36de00000000,
+    0xb07257ba00000000, 0xf3662cad00000000, 0x365aa19400000000,
+    0x754eda8300000000, 0xd5c3a3f000000000, 0x96d7d8e700000000,
+    0x53eb55de00000000, 0x10ff2ec900000000, 0xd9924fad00000000,
+    0x9a8634ba00000000, 0x5fbab98300000000, 0x1caec29400000000,
+    0xcd617b4b00000000, 0x8e75005c00000000, 0x4b498d6500000000,
+    0x085df67200000000, 0xc130971600000000, 0x8224ec0100000000,
+    0x4718613800000000, 0x040c1a2f00000000, 0x4f00556600000000,
+    0x0c142e7100000000, 0xc928a34800000000, 0x8a3cd85f00000000,
+    0x4351b93b00000000, 0x0045c22c00000000, 0xc5794f1500000000,
+    0x866d340200000000, 0x57a28ddd00000000, 0x14b6f6ca00000000,
+    0xd18a7bf300000000, 0x929e00e400000000, 0x5bf3618000000000,
+    0x18e71a9700000000, 0xdddb97ae00000000, 0x9ecfecb900000000,
+    0x3e4295ca00000000, 0x7d56eedd00000000, 0xb86a63e400000000,
+    0xfb7e18f300000000, 0x3213799700000000, 0x7107028000000000,
+    0xb43b8fb900000000, 0xf72ff4ae00000000, 0x26e04d7100000000,
+    0x65f4366600000000, 0xa0c8bb5f00000000, 0xe3dcc04800000000,
+    0x2ab1a12c00000000, 0x69a5da3b00000000, 0xac99570200000000,
+    0xef8d2c1500000000, 0xec82a4e400000000, 0xaf96dff300000000,
+    0x6aaa52ca00000000, 0x29be29dd00000000, 0xe0d348b900000000,
+    0xa3c733ae00000000, 0x66fbbe9700000000, 0x25efc58000000000,
+    0xf4207c5f00000000, 0xb734074800000000, 0x72088a7100000000,
+    0x311cf16600000000, 0xf871900200000000, 0xbb65eb1500000000,
+    0x7e59662c00000000, 0x3d4d1d3b00000000, 0x9dc0644800000000,
+    0xded41f5f00000000, 0x1be8926600000000, 0x58fce97100000000,
+    0x9191881500000000, 0xd285f30200000000, 0x17b97e3b00000000,
+    0x54ad052c00000000, 0x8562bcf300000000, 0xc676c7e400000000,
+    0x034a4add00000000, 0x405e31ca00000000, 0x893350ae00000000,
+    0xca272bb900000000, 0x0f1ba68000000000, 0x4c0fdd9700000000,
+    0x4803c7b800000000, 0x0b17bcaf00000000, 0xce2b319600000000,
+    0x8d3f4a8100000000, 0x44522be500000000, 0x074650f200000000,
+    0xc27addcb00000000, 0x816ea6dc00000000, 0x50a11f0300000000,
+    0x13b5641400000000, 0xd689e92d00000000, 0x959d923a00000000,
+    0x5cf0f35e00000000, 0x1fe4884900000000, 0xdad8057000000000,
+    0x99cc7e6700000000, 0x3941071400000000, 0x7a557c0300000000,
+    0xbf69f13a00000000, 0xfc7d8a2d00000000, 0x3510eb4900000000,
+    0x7604905e00000000, 0xb3381d6700000000, 0xf02c667000000000,
+    0x21e3dfaf00000000, 0x62f7a4b800000000, 0xa7cb298100000000,
+    0xe4df529600000000, 0x2db233f200000000, 0x6ea648e500000000,
+    0xab9ac5dc00000000, 0xe88ebecb00000000, 0xeb81363a00000000,
+    0xa8954d2d00000000, 0x6da9c01400000000, 0x2ebdbb0300000000,
+    0xe7d0da6700000000, 0xa4c4a17000000000, 0x61f82c4900000000,
+    0x22ec575e00000000, 0xf323ee8100000000, 0xb037959600000000,
+    0x750b18af00000000, 0x361f63b800000000, 0xff7202dc00000000,
+    0xbc6679cb00000000, 0x795af4f200000000, 0x3a4e8fe500000000,
+    0x9ac3f69600000000, 0xd9d78d8100000000, 0x1ceb00b800000000,
+    0x5fff7baf00000000, 0x96921acb00000000, 0xd58661dc00000000,
+    0x10baece500000000, 0x53ae97f200000000, 0x82612e2d00000000,
+    0xc175553a00000000, 0x0449d80300000000, 0x475da31400000000,
+    0x8e30c27000000000, 0xcd24b96700000000, 0x0818345e00000000,
+    0x4b0c4f4900000000},
+   {0x0000000000000000, 0x3e6bc2ef00000000, 0x3dd0f50400000000,
+    0x03bb37eb00000000, 0x7aa0eb0900000000, 0x44cb29e600000000,
+    0x47701e0d00000000, 0x791bdce200000000, 0xf440d71300000000,
+    0xca2b15fc00000000, 0xc990221700000000, 0xf7fbe0f800000000,
+    0x8ee03c1a00000000, 0xb08bfef500000000, 0xb330c91e00000000,
+    0x8d5b0bf100000000, 0xe881ae2700000000, 0xd6ea6cc800000000,
+    0xd5515b2300000000, 0xeb3a99cc00000000, 0x9221452e00000000,
+    0xac4a87c100000000, 0xaff1b02a00000000, 0x919a72c500000000,
+    0x1cc1793400000000, 0x22aabbdb00000000, 0x21118c3000000000,
+    0x1f7a4edf00000000, 0x6661923d00000000, 0x580a50d200000000,
+    0x5bb1673900000000, 0x65daa5d600000000, 0xd0035d4f00000000,
+    0xee689fa000000000, 0xedd3a84b00000000, 0xd3b86aa400000000,
+    0xaaa3b64600000000, 0x94c874a900000000, 0x9773434200000000,
+    0xa91881ad00000000, 0x24438a5c00000000, 0x1a2848b300000000,
+    0x19937f5800000000, 0x27f8bdb700000000, 0x5ee3615500000000,
+    0x6088a3ba00000000, 0x6333945100000000, 0x5d5856be00000000,
+    0x3882f36800000000, 0x06e9318700000000, 0x0552066c00000000,
+    0x3b39c48300000000, 0x4222186100000000, 0x7c49da8e00000000,
+    0x7ff2ed6500000000, 0x41992f8a00000000, 0xccc2247b00000000,
+    0xf2a9e69400000000, 0xf112d17f00000000, 0xcf79139000000000,
+    0xb662cf7200000000, 0x88090d9d00000000, 0x8bb23a7600000000,
+    0xb5d9f89900000000, 0xa007ba9e00000000, 0x9e6c787100000000,
+    0x9dd74f9a00000000, 0xa3bc8d7500000000, 0xdaa7519700000000,
+    0xe4cc937800000000, 0xe777a49300000000, 0xd91c667c00000000,
+    0x54476d8d00000000, 0x6a2caf6200000000, 0x6997988900000000,
+    0x57fc5a6600000000, 0x2ee7868400000000, 0x108c446b00000000,
+    0x1337738000000000, 0x2d5cb16f00000000, 0x488614b900000000,
+    0x76edd65600000000, 0x7556e1bd00000000, 0x4b3d235200000000,
+    0x3226ffb000000000, 0x0c4d3d5f00000000, 0x0ff60ab400000000,
+    0x319dc85b00000000, 0xbcc6c3aa00000000, 0x82ad014500000000,
+    0x811636ae00000000, 0xbf7df44100000000, 0xc66628a300000000,
+    0xf80dea4c00000000, 0xfbb6dda700000000, 0xc5dd1f4800000000,
+    0x7004e7d100000000, 0x4e6f253e00000000, 0x4dd412d500000000,
+    0x73bfd03a00000000, 0x0aa40cd800000000, 0x34cfce3700000000,
+    0x3774f9dc00000000, 0x091f3b3300000000, 0x844430c200000000,
+    0xba2ff22d00000000, 0xb994c5c600000000, 0x87ff072900000000,
+    0xfee4dbcb00000000, 0xc08f192400000000, 0xc3342ecf00000000,
+    0xfd5fec2000000000, 0x988549f600000000, 0xa6ee8b1900000000,
+    0xa555bcf200000000, 0x9b3e7e1d00000000, 0xe225a2ff00000000,
+    0xdc4e601000000000, 0xdff557fb00000000, 0xe19e951400000000,
+    0x6cc59ee500000000, 0x52ae5c0a00000000, 0x51156be100000000,
+    0x6f7ea90e00000000, 0x166575ec00000000, 0x280eb70300000000,
+    0x2bb580e800000000, 0x15de420700000000, 0x010905e600000000,
+    0x3f62c70900000000, 0x3cd9f0e200000000, 0x02b2320d00000000,
+    0x7ba9eeef00000000, 0x45c22c0000000000, 0x46791beb00000000,
+    0x7812d90400000000, 0xf549d2f500000000, 0xcb22101a00000000,
+    0xc89927f100000000, 0xf6f2e51e00000000, 0x8fe939fc00000000,
+    0xb182fb1300000000, 0xb239ccf800000000, 0x8c520e1700000000,
+    0xe988abc100000000, 0xd7e3692e00000000, 0xd4585ec500000000,
+    0xea339c2a00000000, 0x932840c800000000, 0xad43822700000000,
+    0xaef8b5cc00000000, 0x9093772300000000, 0x1dc87cd200000000,
+    0x23a3be3d00000000, 0x201889d600000000, 0x1e734b3900000000,
+    0x676897db00000000, 0x5903553400000000, 0x5ab862df00000000,
+    0x64d3a03000000000, 0xd10a58a900000000, 0xef619a4600000000,
+    0xecdaadad00000000, 0xd2b16f4200000000, 0xabaab3a000000000,
+    0x95c1714f00000000, 0x967a46a400000000, 0xa811844b00000000,
+    0x254a8fba00000000, 0x1b214d5500000000, 0x189a7abe00000000,
+    0x26f1b85100000000, 0x5fea64b300000000, 0x6181a65c00000000,
+    0x623a91b700000000, 0x5c51535800000000, 0x398bf68e00000000,
+    0x07e0346100000000, 0x045b038a00000000, 0x3a30c16500000000,
+    0x432b1d8700000000, 0x7d40df6800000000, 0x7efbe88300000000,
+    0x40902a6c00000000, 0xcdcb219d00000000, 0xf3a0e37200000000,
+    0xf01bd49900000000, 0xce70167600000000, 0xb76bca9400000000,
+    0x8900087b00000000, 0x8abb3f9000000000, 0xb4d0fd7f00000000,
+    0xa10ebf7800000000, 0x9f657d9700000000, 0x9cde4a7c00000000,
+    0xa2b5889300000000, 0xdbae547100000000, 0xe5c5969e00000000,
+    0xe67ea17500000000, 0xd815639a00000000, 0x554e686b00000000,
+    0x6b25aa8400000000, 0x689e9d6f00000000, 0x56f55f8000000000,
+    0x2fee836200000000, 0x1185418d00000000, 0x123e766600000000,
+    0x2c55b48900000000, 0x498f115f00000000, 0x77e4d3b000000000,
+    0x745fe45b00000000, 0x4a3426b400000000, 0x332ffa5600000000,
+    0x0d4438b900000000, 0x0eff0f5200000000, 0x3094cdbd00000000,
+    0xbdcfc64c00000000, 0x83a404a300000000, 0x801f334800000000,
+    0xbe74f1a700000000, 0xc76f2d4500000000, 0xf904efaa00000000,
+    0xfabfd84100000000, 0xc4d41aae00000000, 0x710de23700000000,
+    0x4f6620d800000000, 0x4cdd173300000000, 0x72b6d5dc00000000,
+    0x0bad093e00000000, 0x35c6cbd100000000, 0x367dfc3a00000000,
+    0x08163ed500000000, 0x854d352400000000, 0xbb26f7cb00000000,
+    0xb89dc02000000000, 0x86f602cf00000000, 0xffedde2d00000000,
+    0xc1861cc200000000, 0xc23d2b2900000000, 0xfc56e9c600000000,
+    0x998c4c1000000000, 0xa7e78eff00000000, 0xa45cb91400000000,
+    0x9a377bfb00000000, 0xe32ca71900000000, 0xdd4765f600000000,
+    0xdefc521d00000000, 0xe09790f200000000, 0x6dcc9b0300000000,
+    0x53a759ec00000000, 0x501c6e0700000000, 0x6e77ace800000000,
+    0x176c700a00000000, 0x2907b2e500000000, 0x2abc850e00000000,
+    0x14d747e100000000},
+   {0x0000000000000000, 0xc0df8ec100000000, 0xc1b96c5800000000,
+    0x0166e29900000000, 0x8273d9b000000000, 0x42ac577100000000,
+    0x43cab5e800000000, 0x83153b2900000000, 0x45e1c3ba00000000,
+    0x853e4d7b00000000, 0x8458afe200000000, 0x4487212300000000,
+    0xc7921a0a00000000, 0x074d94cb00000000, 0x062b765200000000,
+    0xc6f4f89300000000, 0xcbc4f6ae00000000, 0x0b1b786f00000000,
+    0x0a7d9af600000000, 0xcaa2143700000000, 0x49b72f1e00000000,
+    0x8968a1df00000000, 0x880e434600000000, 0x48d1cd8700000000,
+    0x8e25351400000000, 0x4efabbd500000000, 0x4f9c594c00000000,
+    0x8f43d78d00000000, 0x0c56eca400000000, 0xcc89626500000000,
+    0xcdef80fc00000000, 0x0d300e3d00000000, 0xd78f9c8600000000,
+    0x1750124700000000, 0x1636f0de00000000, 0xd6e97e1f00000000,
+    0x55fc453600000000, 0x9523cbf700000000, 0x9445296e00000000,
+    0x549aa7af00000000, 0x926e5f3c00000000, 0x52b1d1fd00000000,
+    0x53d7336400000000, 0x9308bda500000000, 0x101d868c00000000,
+    0xd0c2084d00000000, 0xd1a4ead400000000, 0x117b641500000000,
+    0x1c4b6a2800000000, 0xdc94e4e900000000, 0xddf2067000000000,
+    0x1d2d88b100000000, 0x9e38b39800000000, 0x5ee73d5900000000,
+    0x5f81dfc000000000, 0x9f5e510100000000, 0x59aaa99200000000,
+    0x9975275300000000, 0x9813c5ca00000000, 0x58cc4b0b00000000,
+    0xdbd9702200000000, 0x1b06fee300000000, 0x1a601c7a00000000,
+    0xdabf92bb00000000, 0xef1948d600000000, 0x2fc6c61700000000,
+    0x2ea0248e00000000, 0xee7faa4f00000000, 0x6d6a916600000000,
+    0xadb51fa700000000, 0xacd3fd3e00000000, 0x6c0c73ff00000000,
+    0xaaf88b6c00000000, 0x6a2705ad00000000, 0x6b41e73400000000,
+    0xab9e69f500000000, 0x288b52dc00000000, 0xe854dc1d00000000,
+    0xe9323e8400000000, 0x29edb04500000000, 0x24ddbe7800000000,
+    0xe40230b900000000, 0xe564d22000000000, 0x25bb5ce100000000,
+    0xa6ae67c800000000, 0x6671e90900000000, 0x67170b9000000000,
+    0xa7c8855100000000, 0x613c7dc200000000, 0xa1e3f30300000000,
+    0xa085119a00000000, 0x605a9f5b00000000, 0xe34fa47200000000,
+    0x23902ab300000000, 0x22f6c82a00000000, 0xe22946eb00000000,
+    0x3896d45000000000, 0xf8495a9100000000, 0xf92fb80800000000,
+    0x39f036c900000000, 0xbae50de000000000, 0x7a3a832100000000,
+    0x7b5c61b800000000, 0xbb83ef7900000000, 0x7d7717ea00000000,
+    0xbda8992b00000000, 0xbcce7bb200000000, 0x7c11f57300000000,
+    0xff04ce5a00000000, 0x3fdb409b00000000, 0x3ebda20200000000,
+    0xfe622cc300000000, 0xf35222fe00000000, 0x338dac3f00000000,
+    0x32eb4ea600000000, 0xf234c06700000000, 0x7121fb4e00000000,
+    0xb1fe758f00000000, 0xb098971600000000, 0x704719d700000000,
+    0xb6b3e14400000000, 0x766c6f8500000000, 0x770a8d1c00000000,
+    0xb7d503dd00000000, 0x34c038f400000000, 0xf41fb63500000000,
+    0xf57954ac00000000, 0x35a6da6d00000000, 0x9f35e17700000000,
+    0x5fea6fb600000000, 0x5e8c8d2f00000000, 0x9e5303ee00000000,
+    0x1d4638c700000000, 0xdd99b60600000000, 0xdcff549f00000000,
+    0x1c20da5e00000000, 0xdad422cd00000000, 0x1a0bac0c00000000,
+    0x1b6d4e9500000000, 0xdbb2c05400000000, 0x58a7fb7d00000000,
+    0x987875bc00000000, 0x991e972500000000, 0x59c119e400000000,
+    0x54f117d900000000, 0x942e991800000000, 0x95487b8100000000,
+    0x5597f54000000000, 0xd682ce6900000000, 0x165d40a800000000,
+    0x173ba23100000000, 0xd7e42cf000000000, 0x1110d46300000000,
+    0xd1cf5aa200000000, 0xd0a9b83b00000000, 0x107636fa00000000,
+    0x93630dd300000000, 0x53bc831200000000, 0x52da618b00000000,
+    0x9205ef4a00000000, 0x48ba7df100000000, 0x8865f33000000000,
+    0x890311a900000000, 0x49dc9f6800000000, 0xcac9a44100000000,
+    0x0a162a8000000000, 0x0b70c81900000000, 0xcbaf46d800000000,
+    0x0d5bbe4b00000000, 0xcd84308a00000000, 0xcce2d21300000000,
+    0x0c3d5cd200000000, 0x8f2867fb00000000, 0x4ff7e93a00000000,
+    0x4e910ba300000000, 0x8e4e856200000000, 0x837e8b5f00000000,
+    0x43a1059e00000000, 0x42c7e70700000000, 0x821869c600000000,
+    0x010d52ef00000000, 0xc1d2dc2e00000000, 0xc0b43eb700000000,
+    0x006bb07600000000, 0xc69f48e500000000, 0x0640c62400000000,
+    0x072624bd00000000, 0xc7f9aa7c00000000, 0x44ec915500000000,
+    0x84331f9400000000, 0x8555fd0d00000000, 0x458a73cc00000000,
+    0x702ca9a100000000, 0xb0f3276000000000, 0xb195c5f900000000,
+    0x714a4b3800000000, 0xf25f701100000000, 0x3280fed000000000,
+    0x33e61c4900000000, 0xf339928800000000, 0x35cd6a1b00000000,
+    0xf512e4da00000000, 0xf474064300000000, 0x34ab888200000000,
+    0xb7beb3ab00000000, 0x77613d6a00000000, 0x7607dff300000000,
+    0xb6d8513200000000, 0xbbe85f0f00000000, 0x7b37d1ce00000000,
+    0x7a51335700000000, 0xba8ebd9600000000, 0x399b86bf00000000,
+    0xf944087e00000000, 0xf822eae700000000, 0x38fd642600000000,
+    0xfe099cb500000000, 0x3ed6127400000000, 0x3fb0f0ed00000000,
+    0xff6f7e2c00000000, 0x7c7a450500000000, 0xbca5cbc400000000,
+    0xbdc3295d00000000, 0x7d1ca79c00000000, 0xa7a3352700000000,
+    0x677cbbe600000000, 0x661a597f00000000, 0xa6c5d7be00000000,
+    0x25d0ec9700000000, 0xe50f625600000000, 0xe46980cf00000000,
+    0x24b60e0e00000000, 0xe242f69d00000000, 0x229d785c00000000,
+    0x23fb9ac500000000, 0xe324140400000000, 0x60312f2d00000000,
+    0xa0eea1ec00000000, 0xa188437500000000, 0x6157cdb400000000,
+    0x6c67c38900000000, 0xacb84d4800000000, 0xaddeafd100000000,
+    0x6d01211000000000, 0xee141a3900000000, 0x2ecb94f800000000,
+    0x2fad766100000000, 0xef72f8a000000000, 0x2986003300000000,
+    0xe9598ef200000000, 0xe83f6c6b00000000, 0x28e0e2aa00000000,
+    0xabf5d98300000000, 0x6b2a574200000000, 0x6a4cb5db00000000,
+    0xaa933b1a00000000},
+   {0x0000000000000000, 0x6f4ca59b00000000, 0x9f9e3bec00000000,
+    0xf0d29e7700000000, 0x7f3b060300000000, 0x1077a39800000000,
+    0xe0a53def00000000, 0x8fe9987400000000, 0xfe760c0600000000,
+    0x913aa99d00000000, 0x61e837ea00000000, 0x0ea4927100000000,
+    0x814d0a0500000000, 0xee01af9e00000000, 0x1ed331e900000000,
+    0x719f947200000000, 0xfced180c00000000, 0x93a1bd9700000000,
+    0x637323e000000000, 0x0c3f867b00000000, 0x83d61e0f00000000,
+    0xec9abb9400000000, 0x1c4825e300000000, 0x7304807800000000,
+    0x029b140a00000000, 0x6dd7b19100000000, 0x9d052fe600000000,
+    0xf2498a7d00000000, 0x7da0120900000000, 0x12ecb79200000000,
+    0xe23e29e500000000, 0x8d728c7e00000000, 0xf8db311800000000,
+    0x9797948300000000, 0x67450af400000000, 0x0809af6f00000000,
+    0x87e0371b00000000, 0xe8ac928000000000, 0x187e0cf700000000,
+    0x7732a96c00000000, 0x06ad3d1e00000000, 0x69e1988500000000,
+    0x993306f200000000, 0xf67fa36900000000, 0x79963b1d00000000,
+    0x16da9e8600000000, 0xe60800f100000000, 0x8944a56a00000000,
+    0x0436291400000000, 0x6b7a8c8f00000000, 0x9ba812f800000000,
+    0xf4e4b76300000000, 0x7b0d2f1700000000, 0x14418a8c00000000,
+    0xe49314fb00000000, 0x8bdfb16000000000, 0xfa40251200000000,
+    0x950c808900000000, 0x65de1efe00000000, 0x0a92bb6500000000,
+    0x857b231100000000, 0xea37868a00000000, 0x1ae518fd00000000,
+    0x75a9bd6600000000, 0xf0b7633000000000, 0x9ffbc6ab00000000,
+    0x6f2958dc00000000, 0x0065fd4700000000, 0x8f8c653300000000,
+    0xe0c0c0a800000000, 0x10125edf00000000, 0x7f5efb4400000000,
+    0x0ec16f3600000000, 0x618dcaad00000000, 0x915f54da00000000,
+    0xfe13f14100000000, 0x71fa693500000000, 0x1eb6ccae00000000,
+    0xee6452d900000000, 0x8128f74200000000, 0x0c5a7b3c00000000,
+    0x6316dea700000000, 0x93c440d000000000, 0xfc88e54b00000000,
+    0x73617d3f00000000, 0x1c2dd8a400000000, 0xecff46d300000000,
+    0x83b3e34800000000, 0xf22c773a00000000, 0x9d60d2a100000000,
+    0x6db24cd600000000, 0x02fee94d00000000, 0x8d17713900000000,
+    0xe25bd4a200000000, 0x12894ad500000000, 0x7dc5ef4e00000000,
+    0x086c522800000000, 0x6720f7b300000000, 0x97f269c400000000,
+    0xf8becc5f00000000, 0x7757542b00000000, 0x181bf1b000000000,
+    0xe8c96fc700000000, 0x8785ca5c00000000, 0xf61a5e2e00000000,
+    0x9956fbb500000000, 0x698465c200000000, 0x06c8c05900000000,
+    0x8921582d00000000, 0xe66dfdb600000000, 0x16bf63c100000000,
+    0x79f3c65a00000000, 0xf4814a2400000000, 0x9bcdefbf00000000,
+    0x6b1f71c800000000, 0x0453d45300000000, 0x8bba4c2700000000,
+    0xe4f6e9bc00000000, 0x142477cb00000000, 0x7b68d25000000000,
+    0x0af7462200000000, 0x65bbe3b900000000, 0x95697dce00000000,
+    0xfa25d85500000000, 0x75cc402100000000, 0x1a80e5ba00000000,
+    0xea527bcd00000000, 0x851ede5600000000, 0xe06fc76000000000,
+    0x8f2362fb00000000, 0x7ff1fc8c00000000, 0x10bd591700000000,
+    0x9f54c16300000000, 0xf01864f800000000, 0x00cafa8f00000000,
+    0x6f865f1400000000, 0x1e19cb6600000000, 0x71556efd00000000,
+    0x8187f08a00000000, 0xeecb551100000000, 0x6122cd6500000000,
+    0x0e6e68fe00000000, 0xfebcf68900000000, 0x91f0531200000000,
+    0x1c82df6c00000000, 0x73ce7af700000000, 0x831ce48000000000,
+    0xec50411b00000000, 0x63b9d96f00000000, 0x0cf57cf400000000,
+    0xfc27e28300000000, 0x936b471800000000, 0xe2f4d36a00000000,
+    0x8db876f100000000, 0x7d6ae88600000000, 0x12264d1d00000000,
+    0x9dcfd56900000000, 0xf28370f200000000, 0x0251ee8500000000,
+    0x6d1d4b1e00000000, 0x18b4f67800000000, 0x77f853e300000000,
+    0x872acd9400000000, 0xe866680f00000000, 0x678ff07b00000000,
+    0x08c355e000000000, 0xf811cb9700000000, 0x975d6e0c00000000,
+    0xe6c2fa7e00000000, 0x898e5fe500000000, 0x795cc19200000000,
+    0x1610640900000000, 0x99f9fc7d00000000, 0xf6b559e600000000,
+    0x0667c79100000000, 0x692b620a00000000, 0xe459ee7400000000,
+    0x8b154bef00000000, 0x7bc7d59800000000, 0x148b700300000000,
+    0x9b62e87700000000, 0xf42e4dec00000000, 0x04fcd39b00000000,
+    0x6bb0760000000000, 0x1a2fe27200000000, 0x756347e900000000,
+    0x85b1d99e00000000, 0xeafd7c0500000000, 0x6514e47100000000,
+    0x0a5841ea00000000, 0xfa8adf9d00000000, 0x95c67a0600000000,
+    0x10d8a45000000000, 0x7f9401cb00000000, 0x8f469fbc00000000,
+    0xe00a3a2700000000, 0x6fe3a25300000000, 0x00af07c800000000,
+    0xf07d99bf00000000, 0x9f313c2400000000, 0xeeaea85600000000,
+    0x81e20dcd00000000, 0x713093ba00000000, 0x1e7c362100000000,
+    0x9195ae5500000000, 0xfed90bce00000000, 0x0e0b95b900000000,
+    0x6147302200000000, 0xec35bc5c00000000, 0x837919c700000000,
+    0x73ab87b000000000, 0x1ce7222b00000000, 0x930eba5f00000000,
+    0xfc421fc400000000, 0x0c9081b300000000, 0x63dc242800000000,
+    0x1243b05a00000000, 0x7d0f15c100000000, 0x8ddd8bb600000000,
+    0xe2912e2d00000000, 0x6d78b65900000000, 0x023413c200000000,
+    0xf2e68db500000000, 0x9daa282e00000000, 0xe803954800000000,
+    0x874f30d300000000, 0x779daea400000000, 0x18d10b3f00000000,
+    0x9738934b00000000, 0xf87436d000000000, 0x08a6a8a700000000,
+    0x67ea0d3c00000000, 0x1675994e00000000, 0x79393cd500000000,
+    0x89eba2a200000000, 0xe6a7073900000000, 0x694e9f4d00000000,
+    0x06023ad600000000, 0xf6d0a4a100000000, 0x999c013a00000000,
+    0x14ee8d4400000000, 0x7ba228df00000000, 0x8b70b6a800000000,
+    0xe43c133300000000, 0x6bd58b4700000000, 0x04992edc00000000,
+    0xf44bb0ab00000000, 0x9b07153000000000, 0xea98814200000000,
+    0x85d424d900000000, 0x7506baae00000000, 0x1a4a1f3500000000,
+    0x95a3874100000000, 0xfaef22da00000000, 0x0a3dbcad00000000,
+    0x6571193600000000},
+   {0x0000000000000000, 0x85d996dd00000000, 0x4bb55c6000000000,
+    0xce6ccabd00000000, 0x966ab9c000000000, 0x13b32f1d00000000,
+    0xdddfe5a000000000, 0x5806737d00000000, 0x6dd3035a00000000,
+    0xe80a958700000000, 0x26665f3a00000000, 0xa3bfc9e700000000,
+    0xfbb9ba9a00000000, 0x7e602c4700000000, 0xb00ce6fa00000000,
+    0x35d5702700000000, 0xdaa607b400000000, 0x5f7f916900000000,
+    0x91135bd400000000, 0x14cacd0900000000, 0x4cccbe7400000000,
+    0xc91528a900000000, 0x0779e21400000000, 0x82a074c900000000,
+    0xb77504ee00000000, 0x32ac923300000000, 0xfcc0588e00000000,
+    0x7919ce5300000000, 0x211fbd2e00000000, 0xa4c62bf300000000,
+    0x6aaae14e00000000, 0xef73779300000000, 0xf54b7eb300000000,
+    0x7092e86e00000000, 0xbefe22d300000000, 0x3b27b40e00000000,
+    0x6321c77300000000, 0xe6f851ae00000000, 0x28949b1300000000,
+    0xad4d0dce00000000, 0x98987de900000000, 0x1d41eb3400000000,
+    0xd32d218900000000, 0x56f4b75400000000, 0x0ef2c42900000000,
+    0x8b2b52f400000000, 0x4547984900000000, 0xc09e0e9400000000,
+    0x2fed790700000000, 0xaa34efda00000000, 0x6458256700000000,
+    0xe181b3ba00000000, 0xb987c0c700000000, 0x3c5e561a00000000,
+    0xf2329ca700000000, 0x77eb0a7a00000000, 0x423e7a5d00000000,
+    0xc7e7ec8000000000, 0x098b263d00000000, 0x8c52b0e000000000,
+    0xd454c39d00000000, 0x518d554000000000, 0x9fe19ffd00000000,
+    0x1a38092000000000, 0xab918dbd00000000, 0x2e481b6000000000,
+    0xe024d1dd00000000, 0x65fd470000000000, 0x3dfb347d00000000,
+    0xb822a2a000000000, 0x764e681d00000000, 0xf397fec000000000,
+    0xc6428ee700000000, 0x439b183a00000000, 0x8df7d28700000000,
+    0x082e445a00000000, 0x5028372700000000, 0xd5f1a1fa00000000,
+    0x1b9d6b4700000000, 0x9e44fd9a00000000, 0x71378a0900000000,
+    0xf4ee1cd400000000, 0x3a82d66900000000, 0xbf5b40b400000000,
+    0xe75d33c900000000, 0x6284a51400000000, 0xace86fa900000000,
+    0x2931f97400000000, 0x1ce4895300000000, 0x993d1f8e00000000,
+    0x5751d53300000000, 0xd28843ee00000000, 0x8a8e309300000000,
+    0x0f57a64e00000000, 0xc13b6cf300000000, 0x44e2fa2e00000000,
+    0x5edaf30e00000000, 0xdb0365d300000000, 0x156faf6e00000000,
+    0x90b639b300000000, 0xc8b04ace00000000, 0x4d69dc1300000000,
+    0x830516ae00000000, 0x06dc807300000000, 0x3309f05400000000,
+    0xb6d0668900000000, 0x78bcac3400000000, 0xfd653ae900000000,
+    0xa563499400000000, 0x20badf4900000000, 0xeed615f400000000,
+    0x6b0f832900000000, 0x847cf4ba00000000, 0x01a5626700000000,
+    0xcfc9a8da00000000, 0x4a103e0700000000, 0x12164d7a00000000,
+    0x97cfdba700000000, 0x59a3111a00000000, 0xdc7a87c700000000,
+    0xe9aff7e000000000, 0x6c76613d00000000, 0xa21aab8000000000,
+    0x27c33d5d00000000, 0x7fc54e2000000000, 0xfa1cd8fd00000000,
+    0x3470124000000000, 0xb1a9849d00000000, 0x17256aa000000000,
+    0x92fcfc7d00000000, 0x5c9036c000000000, 0xd949a01d00000000,
+    0x814fd36000000000, 0x049645bd00000000, 0xcafa8f0000000000,
+    0x4f2319dd00000000, 0x7af669fa00000000, 0xff2fff2700000000,
+    0x3143359a00000000, 0xb49aa34700000000, 0xec9cd03a00000000,
+    0x694546e700000000, 0xa7298c5a00000000, 0x22f01a8700000000,
+    0xcd836d1400000000, 0x485afbc900000000, 0x8636317400000000,
+    0x03efa7a900000000, 0x5be9d4d400000000, 0xde30420900000000,
+    0x105c88b400000000, 0x95851e6900000000, 0xa0506e4e00000000,
+    0x2589f89300000000, 0xebe5322e00000000, 0x6e3ca4f300000000,
+    0x363ad78e00000000, 0xb3e3415300000000, 0x7d8f8bee00000000,
+    0xf8561d3300000000, 0xe26e141300000000, 0x67b782ce00000000,
+    0xa9db487300000000, 0x2c02deae00000000, 0x7404add300000000,
+    0xf1dd3b0e00000000, 0x3fb1f1b300000000, 0xba68676e00000000,
+    0x8fbd174900000000, 0x0a64819400000000, 0xc4084b2900000000,
+    0x41d1ddf400000000, 0x19d7ae8900000000, 0x9c0e385400000000,
+    0x5262f2e900000000, 0xd7bb643400000000, 0x38c813a700000000,
+    0xbd11857a00000000, 0x737d4fc700000000, 0xf6a4d91a00000000,
+    0xaea2aa6700000000, 0x2b7b3cba00000000, 0xe517f60700000000,
+    0x60ce60da00000000, 0x551b10fd00000000, 0xd0c2862000000000,
+    0x1eae4c9d00000000, 0x9b77da4000000000, 0xc371a93d00000000,
+    0x46a83fe000000000, 0x88c4f55d00000000, 0x0d1d638000000000,
+    0xbcb4e71d00000000, 0x396d71c000000000, 0xf701bb7d00000000,
+    0x72d82da000000000, 0x2ade5edd00000000, 0xaf07c80000000000,
+    0x616b02bd00000000, 0xe4b2946000000000, 0xd167e44700000000,
+    0x54be729a00000000, 0x9ad2b82700000000, 0x1f0b2efa00000000,
+    0x470d5d8700000000, 0xc2d4cb5a00000000, 0x0cb801e700000000,
+    0x8961973a00000000, 0x6612e0a900000000, 0xe3cb767400000000,
+    0x2da7bcc900000000, 0xa87e2a1400000000, 0xf078596900000000,
+    0x75a1cfb400000000, 0xbbcd050900000000, 0x3e1493d400000000,
+    0x0bc1e3f300000000, 0x8e18752e00000000, 0x4074bf9300000000,
+    0xc5ad294e00000000, 0x9dab5a3300000000, 0x1872ccee00000000,
+    0xd61e065300000000, 0x53c7908e00000000, 0x49ff99ae00000000,
+    0xcc260f7300000000, 0x024ac5ce00000000, 0x8793531300000000,
+    0xdf95206e00000000, 0x5a4cb6b300000000, 0x94207c0e00000000,
+    0x11f9ead300000000, 0x242c9af400000000, 0xa1f50c2900000000,
+    0x6f99c69400000000, 0xea40504900000000, 0xb246233400000000,
+    0x379fb5e900000000, 0xf9f37f5400000000, 0x7c2ae98900000000,
+    0x93599e1a00000000, 0x168008c700000000, 0xd8ecc27a00000000,
+    0x5d3554a700000000, 0x053327da00000000, 0x80eab10700000000,
+    0x4e867bba00000000, 0xcb5fed6700000000, 0xfe8a9d4000000000,
+    0x7b530b9d00000000, 0xb53fc12000000000, 0x30e657fd00000000,
+    0x68e0248000000000, 0xed39b25d00000000, 0x235578e000000000,
+    0xa68cee3d00000000},
+   {0x0000000000000000, 0x76e10f9d00000000, 0xadc46ee100000000,
+    0xdb25617c00000000, 0x1b8fac1900000000, 0x6d6ea38400000000,
+    0xb64bc2f800000000, 0xc0aacd6500000000, 0x361e593300000000,
+    0x40ff56ae00000000, 0x9bda37d200000000, 0xed3b384f00000000,
+    0x2d91f52a00000000, 0x5b70fab700000000, 0x80559bcb00000000,
+    0xf6b4945600000000, 0x6c3cb26600000000, 0x1addbdfb00000000,
+    0xc1f8dc8700000000, 0xb719d31a00000000, 0x77b31e7f00000000,
+    0x015211e200000000, 0xda77709e00000000, 0xac967f0300000000,
+    0x5a22eb5500000000, 0x2cc3e4c800000000, 0xf7e685b400000000,
+    0x81078a2900000000, 0x41ad474c00000000, 0x374c48d100000000,
+    0xec6929ad00000000, 0x9a88263000000000, 0xd87864cd00000000,
+    0xae996b5000000000, 0x75bc0a2c00000000, 0x035d05b100000000,
+    0xc3f7c8d400000000, 0xb516c74900000000, 0x6e33a63500000000,
+    0x18d2a9a800000000, 0xee663dfe00000000, 0x9887326300000000,
+    0x43a2531f00000000, 0x35435c8200000000, 0xf5e991e700000000,
+    0x83089e7a00000000, 0x582dff0600000000, 0x2eccf09b00000000,
+    0xb444d6ab00000000, 0xc2a5d93600000000, 0x1980b84a00000000,
+    0x6f61b7d700000000, 0xafcb7ab200000000, 0xd92a752f00000000,
+    0x020f145300000000, 0x74ee1bce00000000, 0x825a8f9800000000,
+    0xf4bb800500000000, 0x2f9ee17900000000, 0x597feee400000000,
+    0x99d5238100000000, 0xef342c1c00000000, 0x34114d6000000000,
+    0x42f042fd00000000, 0xf1f7b94100000000, 0x8716b6dc00000000,
+    0x5c33d7a000000000, 0x2ad2d83d00000000, 0xea78155800000000,
+    0x9c991ac500000000, 0x47bc7bb900000000, 0x315d742400000000,
+    0xc7e9e07200000000, 0xb108efef00000000, 0x6a2d8e9300000000,
+    0x1ccc810e00000000, 0xdc664c6b00000000, 0xaa8743f600000000,
+    0x71a2228a00000000, 0x07432d1700000000, 0x9dcb0b2700000000,
+    0xeb2a04ba00000000, 0x300f65c600000000, 0x46ee6a5b00000000,
+    0x8644a73e00000000, 0xf0a5a8a300000000, 0x2b80c9df00000000,
+    0x5d61c64200000000, 0xabd5521400000000, 0xdd345d8900000000,
+    0x06113cf500000000, 0x70f0336800000000, 0xb05afe0d00000000,
+    0xc6bbf19000000000, 0x1d9e90ec00000000, 0x6b7f9f7100000000,
+    0x298fdd8c00000000, 0x5f6ed21100000000, 0x844bb36d00000000,
+    0xf2aabcf000000000, 0x3200719500000000, 0x44e17e0800000000,
+    0x9fc41f7400000000, 0xe92510e900000000, 0x1f9184bf00000000,
+    0x69708b2200000000, 0xb255ea5e00000000, 0xc4b4e5c300000000,
+    0x041e28a600000000, 0x72ff273b00000000, 0xa9da464700000000,
+    0xdf3b49da00000000, 0x45b36fea00000000, 0x3352607700000000,
+    0xe877010b00000000, 0x9e960e9600000000, 0x5e3cc3f300000000,
+    0x28ddcc6e00000000, 0xf3f8ad1200000000, 0x8519a28f00000000,
+    0x73ad36d900000000, 0x054c394400000000, 0xde69583800000000,
+    0xa88857a500000000, 0x68229ac000000000, 0x1ec3955d00000000,
+    0xc5e6f42100000000, 0xb307fbbc00000000, 0xe2ef738300000000,
+    0x940e7c1e00000000, 0x4f2b1d6200000000, 0x39ca12ff00000000,
+    0xf960df9a00000000, 0x8f81d00700000000, 0x54a4b17b00000000,
+    0x2245bee600000000, 0xd4f12ab000000000, 0xa210252d00000000,
+    0x7935445100000000, 0x0fd44bcc00000000, 0xcf7e86a900000000,
+    0xb99f893400000000, 0x62bae84800000000, 0x145be7d500000000,
+    0x8ed3c1e500000000, 0xf832ce7800000000, 0x2317af0400000000,
+    0x55f6a09900000000, 0x955c6dfc00000000, 0xe3bd626100000000,
+    0x3898031d00000000, 0x4e790c8000000000, 0xb8cd98d600000000,
+    0xce2c974b00000000, 0x1509f63700000000, 0x63e8f9aa00000000,
+    0xa34234cf00000000, 0xd5a33b5200000000, 0x0e865a2e00000000,
+    0x786755b300000000, 0x3a97174e00000000, 0x4c7618d300000000,
+    0x975379af00000000, 0xe1b2763200000000, 0x2118bb5700000000,
+    0x57f9b4ca00000000, 0x8cdcd5b600000000, 0xfa3dda2b00000000,
+    0x0c894e7d00000000, 0x7a6841e000000000, 0xa14d209c00000000,
+    0xd7ac2f0100000000, 0x1706e26400000000, 0x61e7edf900000000,
+    0xbac28c8500000000, 0xcc23831800000000, 0x56aba52800000000,
+    0x204aaab500000000, 0xfb6fcbc900000000, 0x8d8ec45400000000,
+    0x4d24093100000000, 0x3bc506ac00000000, 0xe0e067d000000000,
+    0x9601684d00000000, 0x60b5fc1b00000000, 0x1654f38600000000,
+    0xcd7192fa00000000, 0xbb909d6700000000, 0x7b3a500200000000,
+    0x0ddb5f9f00000000, 0xd6fe3ee300000000, 0xa01f317e00000000,
+    0x1318cac200000000, 0x65f9c55f00000000, 0xbedca42300000000,
+    0xc83dabbe00000000, 0x089766db00000000, 0x7e76694600000000,
+    0xa553083a00000000, 0xd3b207a700000000, 0x250693f100000000,
+    0x53e79c6c00000000, 0x88c2fd1000000000, 0xfe23f28d00000000,
+    0x3e893fe800000000, 0x4868307500000000, 0x934d510900000000,
+    0xe5ac5e9400000000, 0x7f2478a400000000, 0x09c5773900000000,
+    0xd2e0164500000000, 0xa40119d800000000, 0x64abd4bd00000000,
+    0x124adb2000000000, 0xc96fba5c00000000, 0xbf8eb5c100000000,
+    0x493a219700000000, 0x3fdb2e0a00000000, 0xe4fe4f7600000000,
+    0x921f40eb00000000, 0x52b58d8e00000000, 0x2454821300000000,
+    0xff71e36f00000000, 0x8990ecf200000000, 0xcb60ae0f00000000,
+    0xbd81a19200000000, 0x66a4c0ee00000000, 0x1045cf7300000000,
+    0xd0ef021600000000, 0xa60e0d8b00000000, 0x7d2b6cf700000000,
+    0x0bca636a00000000, 0xfd7ef73c00000000, 0x8b9ff8a100000000,
+    0x50ba99dd00000000, 0x265b964000000000, 0xe6f15b2500000000,
+    0x901054b800000000, 0x4b3535c400000000, 0x3dd43a5900000000,
+    0xa75c1c6900000000, 0xd1bd13f400000000, 0x0a98728800000000,
+    0x7c797d1500000000, 0xbcd3b07000000000, 0xca32bfed00000000,
+    0x1117de9100000000, 0x67f6d10c00000000, 0x9142455a00000000,
+    0xe7a34ac700000000, 0x3c862bbb00000000, 0x4a67242600000000,
+    0x8acde94300000000, 0xfc2ce6de00000000, 0x270987a200000000,
+    0x51e8883f00000000},
+   {0x0000000000000000, 0xe8dbfbb900000000, 0x91b186a800000000,
+    0x796a7d1100000000, 0x63657c8a00000000, 0x8bbe873300000000,
+    0xf2d4fa2200000000, 0x1a0f019b00000000, 0x87cc89cf00000000,
+    0x6f17727600000000, 0x167d0f6700000000, 0xfea6f4de00000000,
+    0xe4a9f54500000000, 0x0c720efc00000000, 0x751873ed00000000,
+    0x9dc3885400000000, 0x4f9f624400000000, 0xa74499fd00000000,
+    0xde2ee4ec00000000, 0x36f51f5500000000, 0x2cfa1ece00000000,
+    0xc421e57700000000, 0xbd4b986600000000, 0x559063df00000000,
+    0xc853eb8b00000000, 0x2088103200000000, 0x59e26d2300000000,
+    0xb139969a00000000, 0xab36970100000000, 0x43ed6cb800000000,
+    0x3a8711a900000000, 0xd25cea1000000000, 0x9e3ec58800000000,
+    0x76e53e3100000000, 0x0f8f432000000000, 0xe754b89900000000,
+    0xfd5bb90200000000, 0x158042bb00000000, 0x6cea3faa00000000,
+    0x8431c41300000000, 0x19f24c4700000000, 0xf129b7fe00000000,
+    0x8843caef00000000, 0x6098315600000000, 0x7a9730cd00000000,
+    0x924ccb7400000000, 0xeb26b66500000000, 0x03fd4ddc00000000,
+    0xd1a1a7cc00000000, 0x397a5c7500000000, 0x4010216400000000,
+    0xa8cbdadd00000000, 0xb2c4db4600000000, 0x5a1f20ff00000000,
+    0x23755dee00000000, 0xcbaea65700000000, 0x566d2e0300000000,
+    0xbeb6d5ba00000000, 0xc7dca8ab00000000, 0x2f07531200000000,
+    0x3508528900000000, 0xddd3a93000000000, 0xa4b9d42100000000,
+    0x4c622f9800000000, 0x7d7bfbca00000000, 0x95a0007300000000,
+    0xecca7d6200000000, 0x041186db00000000, 0x1e1e874000000000,
+    0xf6c57cf900000000, 0x8faf01e800000000, 0x6774fa5100000000,
+    0xfab7720500000000, 0x126c89bc00000000, 0x6b06f4ad00000000,
+    0x83dd0f1400000000, 0x99d20e8f00000000, 0x7109f53600000000,
+    0x0863882700000000, 0xe0b8739e00000000, 0x32e4998e00000000,
+    0xda3f623700000000, 0xa3551f2600000000, 0x4b8ee49f00000000,
+    0x5181e50400000000, 0xb95a1ebd00000000, 0xc03063ac00000000,
+    0x28eb981500000000, 0xb528104100000000, 0x5df3ebf800000000,
+    0x249996e900000000, 0xcc426d5000000000, 0xd64d6ccb00000000,
+    0x3e96977200000000, 0x47fcea6300000000, 0xaf2711da00000000,
+    0xe3453e4200000000, 0x0b9ec5fb00000000, 0x72f4b8ea00000000,
+    0x9a2f435300000000, 0x802042c800000000, 0x68fbb97100000000,
+    0x1191c46000000000, 0xf94a3fd900000000, 0x6489b78d00000000,
+    0x8c524c3400000000, 0xf538312500000000, 0x1de3ca9c00000000,
+    0x07eccb0700000000, 0xef3730be00000000, 0x965d4daf00000000,
+    0x7e86b61600000000, 0xacda5c0600000000, 0x4401a7bf00000000,
+    0x3d6bdaae00000000, 0xd5b0211700000000, 0xcfbf208c00000000,
+    0x2764db3500000000, 0x5e0ea62400000000, 0xb6d55d9d00000000,
+    0x2b16d5c900000000, 0xc3cd2e7000000000, 0xbaa7536100000000,
+    0x527ca8d800000000, 0x4873a94300000000, 0xa0a852fa00000000,
+    0xd9c22feb00000000, 0x3119d45200000000, 0xbbf0874e00000000,
+    0x532b7cf700000000, 0x2a4101e600000000, 0xc29afa5f00000000,
+    0xd895fbc400000000, 0x304e007d00000000, 0x49247d6c00000000,
+    0xa1ff86d500000000, 0x3c3c0e8100000000, 0xd4e7f53800000000,
+    0xad8d882900000000, 0x4556739000000000, 0x5f59720b00000000,
+    0xb78289b200000000, 0xcee8f4a300000000, 0x26330f1a00000000,
+    0xf46fe50a00000000, 0x1cb41eb300000000, 0x65de63a200000000,
+    0x8d05981b00000000, 0x970a998000000000, 0x7fd1623900000000,
+    0x06bb1f2800000000, 0xee60e49100000000, 0x73a36cc500000000,
+    0x9b78977c00000000, 0xe212ea6d00000000, 0x0ac911d400000000,
+    0x10c6104f00000000, 0xf81debf600000000, 0x817796e700000000,
+    0x69ac6d5e00000000, 0x25ce42c600000000, 0xcd15b97f00000000,
+    0xb47fc46e00000000, 0x5ca43fd700000000, 0x46ab3e4c00000000,
+    0xae70c5f500000000, 0xd71ab8e400000000, 0x3fc1435d00000000,
+    0xa202cb0900000000, 0x4ad930b000000000, 0x33b34da100000000,
+    0xdb68b61800000000, 0xc167b78300000000, 0x29bc4c3a00000000,
+    0x50d6312b00000000, 0xb80dca9200000000, 0x6a51208200000000,
+    0x828adb3b00000000, 0xfbe0a62a00000000, 0x133b5d9300000000,
+    0x09345c0800000000, 0xe1efa7b100000000, 0x9885daa000000000,
+    0x705e211900000000, 0xed9da94d00000000, 0x054652f400000000,
+    0x7c2c2fe500000000, 0x94f7d45c00000000, 0x8ef8d5c700000000,
+    0x66232e7e00000000, 0x1f49536f00000000, 0xf792a8d600000000,
+    0xc68b7c8400000000, 0x2e50873d00000000, 0x573afa2c00000000,
+    0xbfe1019500000000, 0xa5ee000e00000000, 0x4d35fbb700000000,
+    0x345f86a600000000, 0xdc847d1f00000000, 0x4147f54b00000000,
+    0xa99c0ef200000000, 0xd0f673e300000000, 0x382d885a00000000,
+    0x222289c100000000, 0xcaf9727800000000, 0xb3930f6900000000,
+    0x5b48f4d000000000, 0x89141ec000000000, 0x61cfe57900000000,
+    0x18a5986800000000, 0xf07e63d100000000, 0xea71624a00000000,
+    0x02aa99f300000000, 0x7bc0e4e200000000, 0x931b1f5b00000000,
+    0x0ed8970f00000000, 0xe6036cb600000000, 0x9f6911a700000000,
+    0x77b2ea1e00000000, 0x6dbdeb8500000000, 0x8566103c00000000,
+    0xfc0c6d2d00000000, 0x14d7969400000000, 0x58b5b90c00000000,
+    0xb06e42b500000000, 0xc9043fa400000000, 0x21dfc41d00000000,
+    0x3bd0c58600000000, 0xd30b3e3f00000000, 0xaa61432e00000000,
+    0x42bab89700000000, 0xdf7930c300000000, 0x37a2cb7a00000000,
+    0x4ec8b66b00000000, 0xa6134dd200000000, 0xbc1c4c4900000000,
+    0x54c7b7f000000000, 0x2dadcae100000000, 0xc576315800000000,
+    0x172adb4800000000, 0xfff120f100000000, 0x869b5de000000000,
+    0x6e40a65900000000, 0x744fa7c200000000, 0x9c945c7b00000000,
+    0xe5fe216a00000000, 0x0d25dad300000000, 0x90e6528700000000,
+    0x783da93e00000000, 0x0157d42f00000000, 0xe98c2f9600000000,
+    0xf3832e0d00000000, 0x1b58d5b400000000, 0x6232a8a500000000,
+    0x8ae9531c00000000},
+   {0x0000000000000000, 0x919168ae00000000, 0x6325a08700000000,
+    0xf2b4c82900000000, 0x874c31d400000000, 0x16dd597a00000000,
+    0xe469915300000000, 0x75f8f9fd00000000, 0x4f9f137300000000,
+    0xde0e7bdd00000000, 0x2cbab3f400000000, 0xbd2bdb5a00000000,
+    0xc8d322a700000000, 0x59424a0900000000, 0xabf6822000000000,
+    0x3a67ea8e00000000, 0x9e3e27e600000000, 0x0faf4f4800000000,
+    0xfd1b876100000000, 0x6c8aefcf00000000, 0x1972163200000000,
+    0x88e37e9c00000000, 0x7a57b6b500000000, 0xebc6de1b00000000,
+    0xd1a1349500000000, 0x40305c3b00000000, 0xb284941200000000,
+    0x2315fcbc00000000, 0x56ed054100000000, 0xc77c6def00000000,
+    0x35c8a5c600000000, 0xa459cd6800000000, 0x7d7b3f1700000000,
+    0xecea57b900000000, 0x1e5e9f9000000000, 0x8fcff73e00000000,
+    0xfa370ec300000000, 0x6ba6666d00000000, 0x9912ae4400000000,
+    0x0883c6ea00000000, 0x32e42c6400000000, 0xa37544ca00000000,
+    0x51c18ce300000000, 0xc050e44d00000000, 0xb5a81db000000000,
+    0x2439751e00000000, 0xd68dbd3700000000, 0x471cd59900000000,
+    0xe34518f100000000, 0x72d4705f00000000, 0x8060b87600000000,
+    0x11f1d0d800000000, 0x6409292500000000, 0xf598418b00000000,
+    0x072c89a200000000, 0x96bde10c00000000, 0xacda0b8200000000,
+    0x3d4b632c00000000, 0xcfffab0500000000, 0x5e6ec3ab00000000,
+    0x2b963a5600000000, 0xba0752f800000000, 0x48b39ad100000000,
+    0xd922f27f00000000, 0xfaf67e2e00000000, 0x6b67168000000000,
+    0x99d3dea900000000, 0x0842b60700000000, 0x7dba4ffa00000000,
+    0xec2b275400000000, 0x1e9fef7d00000000, 0x8f0e87d300000000,
+    0xb5696d5d00000000, 0x24f805f300000000, 0xd64ccdda00000000,
+    0x47dda57400000000, 0x32255c8900000000, 0xa3b4342700000000,
+    0x5100fc0e00000000, 0xc09194a000000000, 0x64c859c800000000,
+    0xf559316600000000, 0x07edf94f00000000, 0x967c91e100000000,
+    0xe384681c00000000, 0x721500b200000000, 0x80a1c89b00000000,
+    0x1130a03500000000, 0x2b574abb00000000, 0xbac6221500000000,
+    0x4872ea3c00000000, 0xd9e3829200000000, 0xac1b7b6f00000000,
+    0x3d8a13c100000000, 0xcf3edbe800000000, 0x5eafb34600000000,
+    0x878d413900000000, 0x161c299700000000, 0xe4a8e1be00000000,
+    0x7539891000000000, 0x00c170ed00000000, 0x9150184300000000,
+    0x63e4d06a00000000, 0xf275b8c400000000, 0xc812524a00000000,
+    0x59833ae400000000, 0xab37f2cd00000000, 0x3aa69a6300000000,
+    0x4f5e639e00000000, 0xdecf0b3000000000, 0x2c7bc31900000000,
+    0xbdeaabb700000000, 0x19b366df00000000, 0x88220e7100000000,
+    0x7a96c65800000000, 0xeb07aef600000000, 0x9eff570b00000000,
+    0x0f6e3fa500000000, 0xfddaf78c00000000, 0x6c4b9f2200000000,
+    0x562c75ac00000000, 0xc7bd1d0200000000, 0x3509d52b00000000,
+    0xa498bd8500000000, 0xd160447800000000, 0x40f12cd600000000,
+    0xb245e4ff00000000, 0x23d48c5100000000, 0xf4edfd5c00000000,
+    0x657c95f200000000, 0x97c85ddb00000000, 0x0659357500000000,
+    0x73a1cc8800000000, 0xe230a42600000000, 0x10846c0f00000000,
+    0x811504a100000000, 0xbb72ee2f00000000, 0x2ae3868100000000,
+    0xd8574ea800000000, 0x49c6260600000000, 0x3c3edffb00000000,
+    0xadafb75500000000, 0x5f1b7f7c00000000, 0xce8a17d200000000,
+    0x6ad3daba00000000, 0xfb42b21400000000, 0x09f67a3d00000000,
+    0x9867129300000000, 0xed9feb6e00000000, 0x7c0e83c000000000,
+    0x8eba4be900000000, 0x1f2b234700000000, 0x254cc9c900000000,
+    0xb4dda16700000000, 0x4669694e00000000, 0xd7f801e000000000,
+    0xa200f81d00000000, 0x339190b300000000, 0xc125589a00000000,
+    0x50b4303400000000, 0x8996c24b00000000, 0x1807aae500000000,
+    0xeab362cc00000000, 0x7b220a6200000000, 0x0edaf39f00000000,
+    0x9f4b9b3100000000, 0x6dff531800000000, 0xfc6e3bb600000000,
+    0xc609d13800000000, 0x5798b99600000000, 0xa52c71bf00000000,
+    0x34bd191100000000, 0x4145e0ec00000000, 0xd0d4884200000000,
+    0x2260406b00000000, 0xb3f128c500000000, 0x17a8e5ad00000000,
+    0x86398d0300000000, 0x748d452a00000000, 0xe51c2d8400000000,
+    0x90e4d47900000000, 0x0175bcd700000000, 0xf3c174fe00000000,
+    0x62501c5000000000, 0x5837f6de00000000, 0xc9a69e7000000000,
+    0x3b12565900000000, 0xaa833ef700000000, 0xdf7bc70a00000000,
+    0x4eeaafa400000000, 0xbc5e678d00000000, 0x2dcf0f2300000000,
+    0x0e1b837200000000, 0x9f8aebdc00000000, 0x6d3e23f500000000,
+    0xfcaf4b5b00000000, 0x8957b2a600000000, 0x18c6da0800000000,
+    0xea72122100000000, 0x7be37a8f00000000, 0x4184900100000000,
+    0xd015f8af00000000, 0x22a1308600000000, 0xb330582800000000,
+    0xc6c8a1d500000000, 0x5759c97b00000000, 0xa5ed015200000000,
+    0x347c69fc00000000, 0x9025a49400000000, 0x01b4cc3a00000000,
+    0xf300041300000000, 0x62916cbd00000000, 0x1769954000000000,
+    0x86f8fdee00000000, 0x744c35c700000000, 0xe5dd5d6900000000,
+    0xdfbab7e700000000, 0x4e2bdf4900000000, 0xbc9f176000000000,
+    0x2d0e7fce00000000, 0x58f6863300000000, 0xc967ee9d00000000,
+    0x3bd326b400000000, 0xaa424e1a00000000, 0x7360bc6500000000,
+    0xe2f1d4cb00000000, 0x10451ce200000000, 0x81d4744c00000000,
+    0xf42c8db100000000, 0x65bde51f00000000, 0x97092d3600000000,
+    0x0698459800000000, 0x3cffaf1600000000, 0xad6ec7b800000000,
+    0x5fda0f9100000000, 0xce4b673f00000000, 0xbbb39ec200000000,
+    0x2a22f66c00000000, 0xd8963e4500000000, 0x490756eb00000000,
+    0xed5e9b8300000000, 0x7ccff32d00000000, 0x8e7b3b0400000000,
+    0x1fea53aa00000000, 0x6a12aa5700000000, 0xfb83c2f900000000,
+    0x09370ad000000000, 0x98a6627e00000000, 0xa2c188f000000000,
+    0x3350e05e00000000, 0xc1e4287700000000, 0x507540d900000000,
+    0x258db92400000000, 0xb41cd18a00000000, 0x46a819a300000000,
+    0xd739710d00000000}};
+
+#else /* W == 4 */
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0xccaa009e, 0x4225077d, 0x8e8f07e3, 0x844a0efa,
+    0x48e00e64, 0xc66f0987, 0x0ac50919, 0xd3e51bb5, 0x1f4f1b2b,
+    0x91c01cc8, 0x5d6a1c56, 0x57af154f, 0x9b0515d1, 0x158a1232,
+    0xd92012ac, 0x7cbb312b, 0xb01131b5, 0x3e9e3656, 0xf23436c8,
+    0xf8f13fd1, 0x345b3f4f, 0xbad438ac, 0x767e3832, 0xaf5e2a9e,
+    0x63f42a00, 0xed7b2de3, 0x21d12d7d, 0x2b142464, 0xe7be24fa,
+    0x69312319, 0xa59b2387, 0xf9766256, 0x35dc62c8, 0xbb53652b,
+    0x77f965b5, 0x7d3c6cac, 0xb1966c32, 0x3f196bd1, 0xf3b36b4f,
+    0x2a9379e3, 0xe639797d, 0x68b67e9e, 0xa41c7e00, 0xaed97719,
+    0x62737787, 0xecfc7064, 0x205670fa, 0x85cd537d, 0x496753e3,
+    0xc7e85400, 0x0b42549e, 0x01875d87, 0xcd2d5d19, 0x43a25afa,
+    0x8f085a64, 0x562848c8, 0x9a824856, 0x140d4fb5, 0xd8a74f2b,
+    0xd2624632, 0x1ec846ac, 0x9047414f, 0x5ced41d1, 0x299dc2ed,
+    0xe537c273, 0x6bb8c590, 0xa712c50e, 0xadd7cc17, 0x617dcc89,
+    0xeff2cb6a, 0x2358cbf4, 0xfa78d958, 0x36d2d9c6, 0xb85dde25,
+    0x74f7debb, 0x7e32d7a2, 0xb298d73c, 0x3c17d0df, 0xf0bdd041,
+    0x5526f3c6, 0x998cf358, 0x1703f4bb, 0xdba9f425, 0xd16cfd3c,
+    0x1dc6fda2, 0x9349fa41, 0x5fe3fadf, 0x86c3e873, 0x4a69e8ed,
+    0xc4e6ef0e, 0x084cef90, 0x0289e689, 0xce23e617, 0x40ace1f4,
+    0x8c06e16a, 0xd0eba0bb, 0x1c41a025, 0x92cea7c6, 0x5e64a758,
+    0x54a1ae41, 0x980baedf, 0x1684a93c, 0xda2ea9a2, 0x030ebb0e,
+    0xcfa4bb90, 0x412bbc73, 0x8d81bced, 0x8744b5f4, 0x4beeb56a,
+    0xc561b289, 0x09cbb217, 0xac509190, 0x60fa910e, 0xee7596ed,
+    0x22df9673, 0x281a9f6a, 0xe4b09ff4, 0x6a3f9817, 0xa6959889,
+    0x7fb58a25, 0xb31f8abb, 0x3d908d58, 0xf13a8dc6, 0xfbff84df,
+    0x37558441, 0xb9da83a2, 0x7570833c, 0x533b85da, 0x9f918544,
+    0x111e82a7, 0xddb48239, 0xd7718b20, 0x1bdb8bbe, 0x95548c5d,
+    0x59fe8cc3, 0x80de9e6f, 0x4c749ef1, 0xc2fb9912, 0x0e51998c,
+    0x04949095, 0xc83e900b, 0x46b197e8, 0x8a1b9776, 0x2f80b4f1,
+    0xe32ab46f, 0x6da5b38c, 0xa10fb312, 0xabcaba0b, 0x6760ba95,
+    0xe9efbd76, 0x2545bde8, 0xfc65af44, 0x30cfafda, 0xbe40a839,
+    0x72eaa8a7, 0x782fa1be, 0xb485a120, 0x3a0aa6c3, 0xf6a0a65d,
+    0xaa4de78c, 0x66e7e712, 0xe868e0f1, 0x24c2e06f, 0x2e07e976,
+    0xe2ade9e8, 0x6c22ee0b, 0xa088ee95, 0x79a8fc39, 0xb502fca7,
+    0x3b8dfb44, 0xf727fbda, 0xfde2f2c3, 0x3148f25d, 0xbfc7f5be,
+    0x736df520, 0xd6f6d6a7, 0x1a5cd639, 0x94d3d1da, 0x5879d144,
+    0x52bcd85d, 0x9e16d8c3, 0x1099df20, 0xdc33dfbe, 0x0513cd12,
+    0xc9b9cd8c, 0x4736ca6f, 0x8b9ccaf1, 0x8159c3e8, 0x4df3c376,
+    0xc37cc495, 0x0fd6c40b, 0x7aa64737, 0xb60c47a9, 0x3883404a,
+    0xf42940d4, 0xfeec49cd, 0x32464953, 0xbcc94eb0, 0x70634e2e,
+    0xa9435c82, 0x65e95c1c, 0xeb665bff, 0x27cc5b61, 0x2d095278,
+    0xe1a352e6, 0x6f2c5505, 0xa386559b, 0x061d761c, 0xcab77682,
+    0x44387161, 0x889271ff, 0x825778e6, 0x4efd7878, 0xc0727f9b,
+    0x0cd87f05, 0xd5f86da9, 0x19526d37, 0x97dd6ad4, 0x5b776a4a,
+    0x51b26353, 0x9d1863cd, 0x1397642e, 0xdf3d64b0, 0x83d02561,
+    0x4f7a25ff, 0xc1f5221c, 0x0d5f2282, 0x079a2b9b, 0xcb302b05,
+    0x45bf2ce6, 0x89152c78, 0x50353ed4, 0x9c9f3e4a, 0x121039a9,
+    0xdeba3937, 0xd47f302e, 0x18d530b0, 0x965a3753, 0x5af037cd,
+    0xff6b144a, 0x33c114d4, 0xbd4e1337, 0x71e413a9, 0x7b211ab0,
+    0xb78b1a2e, 0x39041dcd, 0xf5ae1d53, 0x2c8e0fff, 0xe0240f61,
+    0x6eab0882, 0xa201081c, 0xa8c40105, 0x646e019b, 0xeae10678,
+    0x264b06e6},
+   {0x00000000, 0xa6770bb4, 0x979f1129, 0x31e81a9d, 0xf44f2413,
+    0x52382fa7, 0x63d0353a, 0xc5a73e8e, 0x33ef4e67, 0x959845d3,
+    0xa4705f4e, 0x020754fa, 0xc7a06a74, 0x61d761c0, 0x503f7b5d,
+    0xf64870e9, 0x67de9cce, 0xc1a9977a, 0xf0418de7, 0x56368653,
+    0x9391b8dd, 0x35e6b369, 0x040ea9f4, 0xa279a240, 0x5431d2a9,
+    0xf246d91d, 0xc3aec380, 0x65d9c834, 0xa07ef6ba, 0x0609fd0e,
+    0x37e1e793, 0x9196ec27, 0xcfbd399c, 0x69ca3228, 0x582228b5,
+    0xfe552301, 0x3bf21d8f, 0x9d85163b, 0xac6d0ca6, 0x0a1a0712,
+    0xfc5277fb, 0x5a257c4f, 0x6bcd66d2, 0xcdba6d66, 0x081d53e8,
+    0xae6a585c, 0x9f8242c1, 0x39f54975, 0xa863a552, 0x0e14aee6,
+    0x3ffcb47b, 0x998bbfcf, 0x5c2c8141, 0xfa5b8af5, 0xcbb39068,
+    0x6dc49bdc, 0x9b8ceb35, 0x3dfbe081, 0x0c13fa1c, 0xaa64f1a8,
+    0x6fc3cf26, 0xc9b4c492, 0xf85cde0f, 0x5e2bd5bb, 0x440b7579,
+    0xe27c7ecd, 0xd3946450, 0x75e36fe4, 0xb044516a, 0x16335ade,
+    0x27db4043, 0x81ac4bf7, 0x77e43b1e, 0xd19330aa, 0xe07b2a37,
+    0x460c2183, 0x83ab1f0d, 0x25dc14b9, 0x14340e24, 0xb2430590,
+    0x23d5e9b7, 0x85a2e203, 0xb44af89e, 0x123df32a, 0xd79acda4,
+    0x71edc610, 0x4005dc8d, 0xe672d739, 0x103aa7d0, 0xb64dac64,
+    0x87a5b6f9, 0x21d2bd4d, 0xe47583c3, 0x42028877, 0x73ea92ea,
+    0xd59d995e, 0x8bb64ce5, 0x2dc14751, 0x1c295dcc, 0xba5e5678,
+    0x7ff968f6, 0xd98e6342, 0xe86679df, 0x4e11726b, 0xb8590282,
+    0x1e2e0936, 0x2fc613ab, 0x89b1181f, 0x4c162691, 0xea612d25,
+    0xdb8937b8, 0x7dfe3c0c, 0xec68d02b, 0x4a1fdb9f, 0x7bf7c102,
+    0xdd80cab6, 0x1827f438, 0xbe50ff8c, 0x8fb8e511, 0x29cfeea5,
+    0xdf879e4c, 0x79f095f8, 0x48188f65, 0xee6f84d1, 0x2bc8ba5f,
+    0x8dbfb1eb, 0xbc57ab76, 0x1a20a0c2, 0x8816eaf2, 0x2e61e146,
+    0x1f89fbdb, 0xb9fef06f, 0x7c59cee1, 0xda2ec555, 0xebc6dfc8,
+    0x4db1d47c, 0xbbf9a495, 0x1d8eaf21, 0x2c66b5bc, 0x8a11be08,
+    0x4fb68086, 0xe9c18b32, 0xd82991af, 0x7e5e9a1b, 0xefc8763c,
+    0x49bf7d88, 0x78576715, 0xde206ca1, 0x1b87522f, 0xbdf0599b,
+    0x8c184306, 0x2a6f48b2, 0xdc27385b, 0x7a5033ef, 0x4bb82972,
+    0xedcf22c6, 0x28681c48, 0x8e1f17fc, 0xbff70d61, 0x198006d5,
+    0x47abd36e, 0xe1dcd8da, 0xd034c247, 0x7643c9f3, 0xb3e4f77d,
+    0x1593fcc9, 0x247be654, 0x820cede0, 0x74449d09, 0xd23396bd,
+    0xe3db8c20, 0x45ac8794, 0x800bb91a, 0x267cb2ae, 0x1794a833,
+    0xb1e3a387, 0x20754fa0, 0x86024414, 0xb7ea5e89, 0x119d553d,
+    0xd43a6bb3, 0x724d6007, 0x43a57a9a, 0xe5d2712e, 0x139a01c7,
+    0xb5ed0a73, 0x840510ee, 0x22721b5a, 0xe7d525d4, 0x41a22e60,
+    0x704a34fd, 0xd63d3f49, 0xcc1d9f8b, 0x6a6a943f, 0x5b828ea2,
+    0xfdf58516, 0x3852bb98, 0x9e25b02c, 0xafcdaab1, 0x09baa105,
+    0xfff2d1ec, 0x5985da58, 0x686dc0c5, 0xce1acb71, 0x0bbdf5ff,
+    0xadcafe4b, 0x9c22e4d6, 0x3a55ef62, 0xabc30345, 0x0db408f1,
+    0x3c5c126c, 0x9a2b19d8, 0x5f8c2756, 0xf9fb2ce2, 0xc813367f,
+    0x6e643dcb, 0x982c4d22, 0x3e5b4696, 0x0fb35c0b, 0xa9c457bf,
+    0x6c636931, 0xca146285, 0xfbfc7818, 0x5d8b73ac, 0x03a0a617,
+    0xa5d7ada3, 0x943fb73e, 0x3248bc8a, 0xf7ef8204, 0x519889b0,
+    0x6070932d, 0xc6079899, 0x304fe870, 0x9638e3c4, 0xa7d0f959,
+    0x01a7f2ed, 0xc400cc63, 0x6277c7d7, 0x539fdd4a, 0xf5e8d6fe,
+    0x647e3ad9, 0xc209316d, 0xf3e12bf0, 0x55962044, 0x90311eca,
+    0x3646157e, 0x07ae0fe3, 0xa1d90457, 0x579174be, 0xf1e67f0a,
+    0xc00e6597, 0x66796e23, 0xa3de50ad, 0x05a95b19, 0x34414184,
+    0x92364a30},
+   {0x00000000, 0xcb5cd3a5, 0x4dc8a10b, 0x869472ae, 0x9b914216,
+    0x50cd91b3, 0xd659e31d, 0x1d0530b8, 0xec53826d, 0x270f51c8,
+    0xa19b2366, 0x6ac7f0c3, 0x77c2c07b, 0xbc9e13de, 0x3a0a6170,
+    0xf156b2d5, 0x03d6029b, 0xc88ad13e, 0x4e1ea390, 0x85427035,
+    0x9847408d, 0x531b9328, 0xd58fe186, 0x1ed33223, 0xef8580f6,
+    0x24d95353, 0xa24d21fd, 0x6911f258, 0x7414c2e0, 0xbf481145,
+    0x39dc63eb, 0xf280b04e, 0x07ac0536, 0xccf0d693, 0x4a64a43d,
+    0x81387798, 0x9c3d4720, 0x57619485, 0xd1f5e62b, 0x1aa9358e,
+    0xebff875b, 0x20a354fe, 0xa6372650, 0x6d6bf5f5, 0x706ec54d,
+    0xbb3216e8, 0x3da66446, 0xf6fab7e3, 0x047a07ad, 0xcf26d408,
+    0x49b2a6a6, 0x82ee7503, 0x9feb45bb, 0x54b7961e, 0xd223e4b0,
+    0x197f3715, 0xe82985c0, 0x23755665, 0xa5e124cb, 0x6ebdf76e,
+    0x73b8c7d6, 0xb8e41473, 0x3e7066dd, 0xf52cb578, 0x0f580a6c,
+    0xc404d9c9, 0x4290ab67, 0x89cc78c2, 0x94c9487a, 0x5f959bdf,
+    0xd901e971, 0x125d3ad4, 0xe30b8801, 0x28575ba4, 0xaec3290a,
+    0x659ffaaf, 0x789aca17, 0xb3c619b2, 0x35526b1c, 0xfe0eb8b9,
+    0x0c8e08f7, 0xc7d2db52, 0x4146a9fc, 0x8a1a7a59, 0x971f4ae1,
+    0x5c439944, 0xdad7ebea, 0x118b384f, 0xe0dd8a9a, 0x2b81593f,
+    0xad152b91, 0x6649f834, 0x7b4cc88c, 0xb0101b29, 0x36846987,
+    0xfdd8ba22, 0x08f40f5a, 0xc3a8dcff, 0x453cae51, 0x8e607df4,
+    0x93654d4c, 0x58399ee9, 0xdeadec47, 0x15f13fe2, 0xe4a78d37,
+    0x2ffb5e92, 0xa96f2c3c, 0x6233ff99, 0x7f36cf21, 0xb46a1c84,
+    0x32fe6e2a, 0xf9a2bd8f, 0x0b220dc1, 0xc07ede64, 0x46eaacca,
+    0x8db67f6f, 0x90b34fd7, 0x5bef9c72, 0xdd7beedc, 0x16273d79,
+    0xe7718fac, 0x2c2d5c09, 0xaab92ea7, 0x61e5fd02, 0x7ce0cdba,
+    0xb7bc1e1f, 0x31286cb1, 0xfa74bf14, 0x1eb014d8, 0xd5ecc77d,
+    0x5378b5d3, 0x98246676, 0x852156ce, 0x4e7d856b, 0xc8e9f7c5,
+    0x03b52460, 0xf2e396b5, 0x39bf4510, 0xbf2b37be, 0x7477e41b,
+    0x6972d4a3, 0xa22e0706, 0x24ba75a8, 0xefe6a60d, 0x1d661643,
+    0xd63ac5e6, 0x50aeb748, 0x9bf264ed, 0x86f75455, 0x4dab87f0,
+    0xcb3ff55e, 0x006326fb, 0xf135942e, 0x3a69478b, 0xbcfd3525,
+    0x77a1e680, 0x6aa4d638, 0xa1f8059d, 0x276c7733, 0xec30a496,
+    0x191c11ee, 0xd240c24b, 0x54d4b0e5, 0x9f886340, 0x828d53f8,
+    0x49d1805d, 0xcf45f2f3, 0x04192156, 0xf54f9383, 0x3e134026,
+    0xb8873288, 0x73dbe12d, 0x6eded195, 0xa5820230, 0x2316709e,
+    0xe84aa33b, 0x1aca1375, 0xd196c0d0, 0x5702b27e, 0x9c5e61db,
+    0x815b5163, 0x4a0782c6, 0xcc93f068, 0x07cf23cd, 0xf6999118,
+    0x3dc542bd, 0xbb513013, 0x700de3b6, 0x6d08d30e, 0xa65400ab,
+    0x20c07205, 0xeb9ca1a0, 0x11e81eb4, 0xdab4cd11, 0x5c20bfbf,
+    0x977c6c1a, 0x8a795ca2, 0x41258f07, 0xc7b1fda9, 0x0ced2e0c,
+    0xfdbb9cd9, 0x36e74f7c, 0xb0733dd2, 0x7b2fee77, 0x662adecf,
+    0xad760d6a, 0x2be27fc4, 0xe0beac61, 0x123e1c2f, 0xd962cf8a,
+    0x5ff6bd24, 0x94aa6e81, 0x89af5e39, 0x42f38d9c, 0xc467ff32,
+    0x0f3b2c97, 0xfe6d9e42, 0x35314de7, 0xb3a53f49, 0x78f9ecec,
+    0x65fcdc54, 0xaea00ff1, 0x28347d5f, 0xe368aefa, 0x16441b82,
+    0xdd18c827, 0x5b8cba89, 0x90d0692c, 0x8dd55994, 0x46898a31,
+    0xc01df89f, 0x0b412b3a, 0xfa1799ef, 0x314b4a4a, 0xb7df38e4,
+    0x7c83eb41, 0x6186dbf9, 0xaada085c, 0x2c4e7af2, 0xe712a957,
+    0x15921919, 0xdececabc, 0x585ab812, 0x93066bb7, 0x8e035b0f,
+    0x455f88aa, 0xc3cbfa04, 0x089729a1, 0xf9c19b74, 0x329d48d1,
+    0xb4093a7f, 0x7f55e9da, 0x6250d962, 0xa90c0ac7, 0x2f987869,
+    0xe4c4abcc},
+   {0x00000000, 0x3d6029b0, 0x7ac05360, 0x47a07ad0, 0xf580a6c0,
+    0xc8e08f70, 0x8f40f5a0, 0xb220dc10, 0x30704bc1, 0x0d106271,
+    0x4ab018a1, 0x77d03111, 0xc5f0ed01, 0xf890c4b1, 0xbf30be61,
+    0x825097d1, 0x60e09782, 0x5d80be32, 0x1a20c4e2, 0x2740ed52,
+    0x95603142, 0xa80018f2, 0xefa06222, 0xd2c04b92, 0x5090dc43,
+    0x6df0f5f3, 0x2a508f23, 0x1730a693, 0xa5107a83, 0x98705333,
+    0xdfd029e3, 0xe2b00053, 0xc1c12f04, 0xfca106b4, 0xbb017c64,
+    0x866155d4, 0x344189c4, 0x0921a074, 0x4e81daa4, 0x73e1f314,
+    0xf1b164c5, 0xccd14d75, 0x8b7137a5, 0xb6111e15, 0x0431c205,
+    0x3951ebb5, 0x7ef19165, 0x4391b8d5, 0xa121b886, 0x9c419136,
+    0xdbe1ebe6, 0xe681c256, 0x54a11e46, 0x69c137f6, 0x2e614d26,
+    0x13016496, 0x9151f347, 0xac31daf7, 0xeb91a027, 0xd6f18997,
+    0x64d15587, 0x59b17c37, 0x1e1106e7, 0x23712f57, 0x58f35849,
+    0x659371f9, 0x22330b29, 0x1f532299, 0xad73fe89, 0x9013d739,
+    0xd7b3ade9, 0xead38459, 0x68831388, 0x55e33a38, 0x124340e8,
+    0x2f236958, 0x9d03b548, 0xa0639cf8, 0xe7c3e628, 0xdaa3cf98,
+    0x3813cfcb, 0x0573e67b, 0x42d39cab, 0x7fb3b51b, 0xcd93690b,
+    0xf0f340bb, 0xb7533a6b, 0x8a3313db, 0x0863840a, 0x3503adba,
+    0x72a3d76a, 0x4fc3feda, 0xfde322ca, 0xc0830b7a, 0x872371aa,
+    0xba43581a, 0x9932774d, 0xa4525efd, 0xe3f2242d, 0xde920d9d,
+    0x6cb2d18d, 0x51d2f83d, 0x167282ed, 0x2b12ab5d, 0xa9423c8c,
+    0x9422153c, 0xd3826fec, 0xeee2465c, 0x5cc29a4c, 0x61a2b3fc,
+    0x2602c92c, 0x1b62e09c, 0xf9d2e0cf, 0xc4b2c97f, 0x8312b3af,
+    0xbe729a1f, 0x0c52460f, 0x31326fbf, 0x7692156f, 0x4bf23cdf,
+    0xc9a2ab0e, 0xf4c282be, 0xb362f86e, 0x8e02d1de, 0x3c220dce,
+    0x0142247e, 0x46e25eae, 0x7b82771e, 0xb1e6b092, 0x8c869922,
+    0xcb26e3f2, 0xf646ca42, 0x44661652, 0x79063fe2, 0x3ea64532,
+    0x03c66c82, 0x8196fb53, 0xbcf6d2e3, 0xfb56a833, 0xc6368183,
+    0x74165d93, 0x49767423, 0x0ed60ef3, 0x33b62743, 0xd1062710,
+    0xec660ea0, 0xabc67470, 0x96a65dc0, 0x248681d0, 0x19e6a860,
+    0x5e46d2b0, 0x6326fb00, 0xe1766cd1, 0xdc164561, 0x9bb63fb1,
+    0xa6d61601, 0x14f6ca11, 0x2996e3a1, 0x6e369971, 0x5356b0c1,
+    0x70279f96, 0x4d47b626, 0x0ae7ccf6, 0x3787e546, 0x85a73956,
+    0xb8c710e6, 0xff676a36, 0xc2074386, 0x4057d457, 0x7d37fde7,
+    0x3a978737, 0x07f7ae87, 0xb5d77297, 0x88b75b27, 0xcf1721f7,
+    0xf2770847, 0x10c70814, 0x2da721a4, 0x6a075b74, 0x576772c4,
+    0xe547aed4, 0xd8278764, 0x9f87fdb4, 0xa2e7d404, 0x20b743d5,
+    0x1dd76a65, 0x5a7710b5, 0x67173905, 0xd537e515, 0xe857cca5,
+    0xaff7b675, 0x92979fc5, 0xe915e8db, 0xd475c16b, 0x93d5bbbb,
+    0xaeb5920b, 0x1c954e1b, 0x21f567ab, 0x66551d7b, 0x5b3534cb,
+    0xd965a31a, 0xe4058aaa, 0xa3a5f07a, 0x9ec5d9ca, 0x2ce505da,
+    0x11852c6a, 0x562556ba, 0x6b457f0a, 0x89f57f59, 0xb49556e9,
+    0xf3352c39, 0xce550589, 0x7c75d999, 0x4115f029, 0x06b58af9,
+    0x3bd5a349, 0xb9853498, 0x84e51d28, 0xc34567f8, 0xfe254e48,
+    0x4c059258, 0x7165bbe8, 0x36c5c138, 0x0ba5e888, 0x28d4c7df,
+    0x15b4ee6f, 0x521494bf, 0x6f74bd0f, 0xdd54611f, 0xe03448af,
+    0xa794327f, 0x9af41bcf, 0x18a48c1e, 0x25c4a5ae, 0x6264df7e,
+    0x5f04f6ce, 0xed242ade, 0xd044036e, 0x97e479be, 0xaa84500e,
+    0x4834505d, 0x755479ed, 0x32f4033d, 0x0f942a8d, 0xbdb4f69d,
+    0x80d4df2d, 0xc774a5fd, 0xfa148c4d, 0x78441b9c, 0x4524322c,
+    0x028448fc, 0x3fe4614c, 0x8dc4bd5c, 0xb0a494ec, 0xf704ee3c,
+    0xca64c78c}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x00000000, 0xb029603d, 0x6053c07a, 0xd07aa047, 0xc0a680f5,
+    0x708fe0c8, 0xa0f5408f, 0x10dc20b2, 0xc14b7030, 0x7162100d,
+    0xa118b04a, 0x1131d077, 0x01edf0c5, 0xb1c490f8, 0x61be30bf,
+    0xd1975082, 0x8297e060, 0x32be805d, 0xe2c4201a, 0x52ed4027,
+    0x42316095, 0xf21800a8, 0x2262a0ef, 0x924bc0d2, 0x43dc9050,
+    0xf3f5f06d, 0x238f502a, 0x93a63017, 0x837a10a5, 0x33537098,
+    0xe329d0df, 0x5300b0e2, 0x042fc1c1, 0xb406a1fc, 0x647c01bb,
+    0xd4556186, 0xc4894134, 0x74a02109, 0xa4da814e, 0x14f3e173,
+    0xc564b1f1, 0x754dd1cc, 0xa537718b, 0x151e11b6, 0x05c23104,
+    0xb5eb5139, 0x6591f17e, 0xd5b89143, 0x86b821a1, 0x3691419c,
+    0xe6ebe1db, 0x56c281e6, 0x461ea154, 0xf637c169, 0x264d612e,
+    0x96640113, 0x47f35191, 0xf7da31ac, 0x27a091eb, 0x9789f1d6,
+    0x8755d164, 0x377cb159, 0xe706111e, 0x572f7123, 0x4958f358,
+    0xf9719365, 0x290b3322, 0x9922531f, 0x89fe73ad, 0x39d71390,
+    0xe9adb3d7, 0x5984d3ea, 0x88138368, 0x383ae355, 0xe8404312,
+    0x5869232f, 0x48b5039d, 0xf89c63a0, 0x28e6c3e7, 0x98cfa3da,
+    0xcbcf1338, 0x7be67305, 0xab9cd342, 0x1bb5b37f, 0x0b6993cd,
+    0xbb40f3f0, 0x6b3a53b7, 0xdb13338a, 0x0a846308, 0xbaad0335,
+    0x6ad7a372, 0xdafec34f, 0xca22e3fd, 0x7a0b83c0, 0xaa712387,
+    0x1a5843ba, 0x4d773299, 0xfd5e52a4, 0x2d24f2e3, 0x9d0d92de,
+    0x8dd1b26c, 0x3df8d251, 0xed827216, 0x5dab122b, 0x8c3c42a9,
+    0x3c152294, 0xec6f82d3, 0x5c46e2ee, 0x4c9ac25c, 0xfcb3a261,
+    0x2cc90226, 0x9ce0621b, 0xcfe0d2f9, 0x7fc9b2c4, 0xafb31283,
+    0x1f9a72be, 0x0f46520c, 0xbf6f3231, 0x6f159276, 0xdf3cf24b,
+    0x0eaba2c9, 0xbe82c2f4, 0x6ef862b3, 0xded1028e, 0xce0d223c,
+    0x7e244201, 0xae5ee246, 0x1e77827b, 0x92b0e6b1, 0x2299868c,
+    0xf2e326cb, 0x42ca46f6, 0x52166644, 0xe23f0679, 0x3245a63e,
+    0x826cc603, 0x53fb9681, 0xe3d2f6bc, 0x33a856fb, 0x838136c6,
+    0x935d1674, 0x23747649, 0xf30ed60e, 0x4327b633, 0x102706d1,
+    0xa00e66ec, 0x7074c6ab, 0xc05da696, 0xd0818624, 0x60a8e619,
+    0xb0d2465e, 0x00fb2663, 0xd16c76e1, 0x614516dc, 0xb13fb69b,
+    0x0116d6a6, 0x11caf614, 0xa1e39629, 0x7199366e, 0xc1b05653,
+    0x969f2770, 0x26b6474d, 0xf6cce70a, 0x46e58737, 0x5639a785,
+    0xe610c7b8, 0x366a67ff, 0x864307c2, 0x57d45740, 0xe7fd377d,
+    0x3787973a, 0x87aef707, 0x9772d7b5, 0x275bb788, 0xf72117cf,
+    0x470877f2, 0x1408c710, 0xa421a72d, 0x745b076a, 0xc4726757,
+    0xd4ae47e5, 0x648727d8, 0xb4fd879f, 0x04d4e7a2, 0xd543b720,
+    0x656ad71d, 0xb510775a, 0x05391767, 0x15e537d5, 0xa5cc57e8,
+    0x75b6f7af, 0xc59f9792, 0xdbe815e9, 0x6bc175d4, 0xbbbbd593,
+    0x0b92b5ae, 0x1b4e951c, 0xab67f521, 0x7b1d5566, 0xcb34355b,
+    0x1aa365d9, 0xaa8a05e4, 0x7af0a5a3, 0xcad9c59e, 0xda05e52c,
+    0x6a2c8511, 0xba562556, 0x0a7f456b, 0x597ff589, 0xe95695b4,
+    0x392c35f3, 0x890555ce, 0x99d9757c, 0x29f01541, 0xf98ab506,
+    0x49a3d53b, 0x983485b9, 0x281de584, 0xf86745c3, 0x484e25fe,
+    0x5892054c, 0xe8bb6571, 0x38c1c536, 0x88e8a50b, 0xdfc7d428,
+    0x6feeb415, 0xbf941452, 0x0fbd746f, 0x1f6154dd, 0xaf4834e0,
+    0x7f3294a7, 0xcf1bf49a, 0x1e8ca418, 0xaea5c425, 0x7edf6462,
+    0xcef6045f, 0xde2a24ed, 0x6e0344d0, 0xbe79e497, 0x0e5084aa,
+    0x5d503448, 0xed795475, 0x3d03f432, 0x8d2a940f, 0x9df6b4bd,
+    0x2ddfd480, 0xfda574c7, 0x4d8c14fa, 0x9c1b4478, 0x2c322445,
+    0xfc488402, 0x4c61e43f, 0x5cbdc48d, 0xec94a4b0, 0x3cee04f7,
+    0x8cc764ca},
+   {0x00000000, 0xa5d35ccb, 0x0ba1c84d, 0xae729486, 0x1642919b,
+    0xb391cd50, 0x1de359d6, 0xb830051d, 0x6d8253ec, 0xc8510f27,
+    0x66239ba1, 0xc3f0c76a, 0x7bc0c277, 0xde139ebc, 0x70610a3a,
+    0xd5b256f1, 0x9b02d603, 0x3ed18ac8, 0x90a31e4e, 0x35704285,
+    0x8d404798, 0x28931b53, 0x86e18fd5, 0x2332d31e, 0xf68085ef,
+    0x5353d924, 0xfd214da2, 0x58f21169, 0xe0c21474, 0x451148bf,
+    0xeb63dc39, 0x4eb080f2, 0x3605ac07, 0x93d6f0cc, 0x3da4644a,
+    0x98773881, 0x20473d9c, 0x85946157, 0x2be6f5d1, 0x8e35a91a,
+    0x5b87ffeb, 0xfe54a320, 0x502637a6, 0xf5f56b6d, 0x4dc56e70,
+    0xe81632bb, 0x4664a63d, 0xe3b7faf6, 0xad077a04, 0x08d426cf,
+    0xa6a6b249, 0x0375ee82, 0xbb45eb9f, 0x1e96b754, 0xb0e423d2,
+    0x15377f19, 0xc08529e8, 0x65567523, 0xcb24e1a5, 0x6ef7bd6e,
+    0xd6c7b873, 0x7314e4b8, 0xdd66703e, 0x78b52cf5, 0x6c0a580f,
+    0xc9d904c4, 0x67ab9042, 0xc278cc89, 0x7a48c994, 0xdf9b955f,
+    0x71e901d9, 0xd43a5d12, 0x01880be3, 0xa45b5728, 0x0a29c3ae,
+    0xaffa9f65, 0x17ca9a78, 0xb219c6b3, 0x1c6b5235, 0xb9b80efe,
+    0xf7088e0c, 0x52dbd2c7, 0xfca94641, 0x597a1a8a, 0xe14a1f97,
+    0x4499435c, 0xeaebd7da, 0x4f388b11, 0x9a8adde0, 0x3f59812b,
+    0x912b15ad, 0x34f84966, 0x8cc84c7b, 0x291b10b0, 0x87698436,
+    0x22bad8fd, 0x5a0ff408, 0xffdca8c3, 0x51ae3c45, 0xf47d608e,
+    0x4c4d6593, 0xe99e3958, 0x47ecadde, 0xe23ff115, 0x378da7e4,
+    0x925efb2f, 0x3c2c6fa9, 0x99ff3362, 0x21cf367f, 0x841c6ab4,
+    0x2a6efe32, 0x8fbda2f9, 0xc10d220b, 0x64de7ec0, 0xcaacea46,
+    0x6f7fb68d, 0xd74fb390, 0x729cef5b, 0xdcee7bdd, 0x793d2716,
+    0xac8f71e7, 0x095c2d2c, 0xa72eb9aa, 0x02fde561, 0xbacde07c,
+    0x1f1ebcb7, 0xb16c2831, 0x14bf74fa, 0xd814b01e, 0x7dc7ecd5,
+    0xd3b57853, 0x76662498, 0xce562185, 0x6b857d4e, 0xc5f7e9c8,
+    0x6024b503, 0xb596e3f2, 0x1045bf39, 0xbe372bbf, 0x1be47774,
+    0xa3d47269, 0x06072ea2, 0xa875ba24, 0x0da6e6ef, 0x4316661d,
+    0xe6c53ad6, 0x48b7ae50, 0xed64f29b, 0x5554f786, 0xf087ab4d,
+    0x5ef53fcb, 0xfb266300, 0x2e9435f1, 0x8b47693a, 0x2535fdbc,
+    0x80e6a177, 0x38d6a46a, 0x9d05f8a1, 0x33776c27, 0x96a430ec,
+    0xee111c19, 0x4bc240d2, 0xe5b0d454, 0x4063889f, 0xf8538d82,
+    0x5d80d149, 0xf3f245cf, 0x56211904, 0x83934ff5, 0x2640133e,
+    0x883287b8, 0x2de1db73, 0x95d1de6e, 0x300282a5, 0x9e701623,
+    0x3ba34ae8, 0x7513ca1a, 0xd0c096d1, 0x7eb20257, 0xdb615e9c,
+    0x63515b81, 0xc682074a, 0x68f093cc, 0xcd23cf07, 0x189199f6,
+    0xbd42c53d, 0x133051bb, 0xb6e30d70, 0x0ed3086d, 0xab0054a6,
+    0x0572c020, 0xa0a19ceb, 0xb41ee811, 0x11cdb4da, 0xbfbf205c,
+    0x1a6c7c97, 0xa25c798a, 0x078f2541, 0xa9fdb1c7, 0x0c2eed0c,
+    0xd99cbbfd, 0x7c4fe736, 0xd23d73b0, 0x77ee2f7b, 0xcfde2a66,
+    0x6a0d76ad, 0xc47fe22b, 0x61acbee0, 0x2f1c3e12, 0x8acf62d9,
+    0x24bdf65f, 0x816eaa94, 0x395eaf89, 0x9c8df342, 0x32ff67c4,
+    0x972c3b0f, 0x429e6dfe, 0xe74d3135, 0x493fa5b3, 0xececf978,
+    0x54dcfc65, 0xf10fa0ae, 0x5f7d3428, 0xfaae68e3, 0x821b4416,
+    0x27c818dd, 0x89ba8c5b, 0x2c69d090, 0x9459d58d, 0x318a8946,
+    0x9ff81dc0, 0x3a2b410b, 0xef9917fa, 0x4a4a4b31, 0xe438dfb7,
+    0x41eb837c, 0xf9db8661, 0x5c08daaa, 0xf27a4e2c, 0x57a912e7,
+    0x19199215, 0xbccacede, 0x12b85a58, 0xb76b0693, 0x0f5b038e,
+    0xaa885f45, 0x04facbc3, 0xa1299708, 0x749bc1f9, 0xd1489d32,
+    0x7f3a09b4, 0xdae9557f, 0x62d95062, 0xc70a0ca9, 0x6978982f,
+    0xccabc4e4},
+   {0x00000000, 0xb40b77a6, 0x29119f97, 0x9d1ae831, 0x13244ff4,
+    0xa72f3852, 0x3a35d063, 0x8e3ea7c5, 0x674eef33, 0xd3459895,
+    0x4e5f70a4, 0xfa540702, 0x746aa0c7, 0xc061d761, 0x5d7b3f50,
+    0xe97048f6, 0xce9cde67, 0x7a97a9c1, 0xe78d41f0, 0x53863656,
+    0xddb89193, 0x69b3e635, 0xf4a90e04, 0x40a279a2, 0xa9d23154,
+    0x1dd946f2, 0x80c3aec3, 0x34c8d965, 0xbaf67ea0, 0x0efd0906,
+    0x93e7e137, 0x27ec9691, 0x9c39bdcf, 0x2832ca69, 0xb5282258,
+    0x012355fe, 0x8f1df23b, 0x3b16859d, 0xa60c6dac, 0x12071a0a,
+    0xfb7752fc, 0x4f7c255a, 0xd266cd6b, 0x666dbacd, 0xe8531d08,
+    0x5c586aae, 0xc142829f, 0x7549f539, 0x52a563a8, 0xe6ae140e,
+    0x7bb4fc3f, 0xcfbf8b99, 0x41812c5c, 0xf58a5bfa, 0x6890b3cb,
+    0xdc9bc46d, 0x35eb8c9b, 0x81e0fb3d, 0x1cfa130c, 0xa8f164aa,
+    0x26cfc36f, 0x92c4b4c9, 0x0fde5cf8, 0xbbd52b5e, 0x79750b44,
+    0xcd7e7ce2, 0x506494d3, 0xe46fe375, 0x6a5144b0, 0xde5a3316,
+    0x4340db27, 0xf74bac81, 0x1e3be477, 0xaa3093d1, 0x372a7be0,
+    0x83210c46, 0x0d1fab83, 0xb914dc25, 0x240e3414, 0x900543b2,
+    0xb7e9d523, 0x03e2a285, 0x9ef84ab4, 0x2af33d12, 0xa4cd9ad7,
+    0x10c6ed71, 0x8ddc0540, 0x39d772e6, 0xd0a73a10, 0x64ac4db6,
+    0xf9b6a587, 0x4dbdd221, 0xc38375e4, 0x77880242, 0xea92ea73,
+    0x5e999dd5, 0xe54cb68b, 0x5147c12d, 0xcc5d291c, 0x78565eba,
+    0xf668f97f, 0x42638ed9, 0xdf7966e8, 0x6b72114e, 0x820259b8,
+    0x36092e1e, 0xab13c62f, 0x1f18b189, 0x9126164c, 0x252d61ea,
+    0xb83789db, 0x0c3cfe7d, 0x2bd068ec, 0x9fdb1f4a, 0x02c1f77b,
+    0xb6ca80dd, 0x38f42718, 0x8cff50be, 0x11e5b88f, 0xa5eecf29,
+    0x4c9e87df, 0xf895f079, 0x658f1848, 0xd1846fee, 0x5fbac82b,
+    0xebb1bf8d, 0x76ab57bc, 0xc2a0201a, 0xf2ea1688, 0x46e1612e,
+    0xdbfb891f, 0x6ff0feb9, 0xe1ce597c, 0x55c52eda, 0xc8dfc6eb,
+    0x7cd4b14d, 0x95a4f9bb, 0x21af8e1d, 0xbcb5662c, 0x08be118a,
+    0x8680b64f, 0x328bc1e9, 0xaf9129d8, 0x1b9a5e7e, 0x3c76c8ef,
+    0x887dbf49, 0x15675778, 0xa16c20de, 0x2f52871b, 0x9b59f0bd,
+    0x0643188c, 0xb2486f2a, 0x5b3827dc, 0xef33507a, 0x7229b84b,
+    0xc622cfed, 0x481c6828, 0xfc171f8e, 0x610df7bf, 0xd5068019,
+    0x6ed3ab47, 0xdad8dce1, 0x47c234d0, 0xf3c94376, 0x7df7e4b3,
+    0xc9fc9315, 0x54e67b24, 0xe0ed0c82, 0x099d4474, 0xbd9633d2,
+    0x208cdbe3, 0x9487ac45, 0x1ab90b80, 0xaeb27c26, 0x33a89417,
+    0x87a3e3b1, 0xa04f7520, 0x14440286, 0x895eeab7, 0x3d559d11,
+    0xb36b3ad4, 0x07604d72, 0x9a7aa543, 0x2e71d2e5, 0xc7019a13,
+    0x730aedb5, 0xee100584, 0x5a1b7222, 0xd425d5e7, 0x602ea241,
+    0xfd344a70, 0x493f3dd6, 0x8b9f1dcc, 0x3f946a6a, 0xa28e825b,
+    0x1685f5fd, 0x98bb5238, 0x2cb0259e, 0xb1aacdaf, 0x05a1ba09,
+    0xecd1f2ff, 0x58da8559, 0xc5c06d68, 0x71cb1ace, 0xfff5bd0b,
+    0x4bfecaad, 0xd6e4229c, 0x62ef553a, 0x4503c3ab, 0xf108b40d,
+    0x6c125c3c, 0xd8192b9a, 0x56278c5f, 0xe22cfbf9, 0x7f3613c8,
+    0xcb3d646e, 0x224d2c98, 0x96465b3e, 0x0b5cb30f, 0xbf57c4a9,
+    0x3169636c, 0x856214ca, 0x1878fcfb, 0xac738b5d, 0x17a6a003,
+    0xa3add7a5, 0x3eb73f94, 0x8abc4832, 0x0482eff7, 0xb0899851,
+    0x2d937060, 0x999807c6, 0x70e84f30, 0xc4e33896, 0x59f9d0a7,
+    0xedf2a701, 0x63cc00c4, 0xd7c77762, 0x4add9f53, 0xfed6e8f5,
+    0xd93a7e64, 0x6d3109c2, 0xf02be1f3, 0x44209655, 0xca1e3190,
+    0x7e154636, 0xe30fae07, 0x5704d9a1, 0xbe749157, 0x0a7fe6f1,
+    0x97650ec0, 0x236e7966, 0xad50dea3, 0x195ba905, 0x84414134,
+    0x304a3692},
+   {0x00000000, 0x9e00aacc, 0x7d072542, 0xe3078f8e, 0xfa0e4a84,
+    0x640ee048, 0x87096fc6, 0x1909c50a, 0xb51be5d3, 0x2b1b4f1f,
+    0xc81cc091, 0x561c6a5d, 0x4f15af57, 0xd115059b, 0x32128a15,
+    0xac1220d9, 0x2b31bb7c, 0xb53111b0, 0x56369e3e, 0xc83634f2,
+    0xd13ff1f8, 0x4f3f5b34, 0xac38d4ba, 0x32387e76, 0x9e2a5eaf,
+    0x002af463, 0xe32d7bed, 0x7d2dd121, 0x6424142b, 0xfa24bee7,
+    0x19233169, 0x87239ba5, 0x566276f9, 0xc862dc35, 0x2b6553bb,
+    0xb565f977, 0xac6c3c7d, 0x326c96b1, 0xd16b193f, 0x4f6bb3f3,
+    0xe379932a, 0x7d7939e6, 0x9e7eb668, 0x007e1ca4, 0x1977d9ae,
+    0x87777362, 0x6470fcec, 0xfa705620, 0x7d53cd85, 0xe3536749,
+    0x0054e8c7, 0x9e54420b, 0x875d8701, 0x195d2dcd, 0xfa5aa243,
+    0x645a088f, 0xc8482856, 0x5648829a, 0xb54f0d14, 0x2b4fa7d8,
+    0x324662d2, 0xac46c81e, 0x4f414790, 0xd141ed5c, 0xedc29d29,
+    0x73c237e5, 0x90c5b86b, 0x0ec512a7, 0x17ccd7ad, 0x89cc7d61,
+    0x6acbf2ef, 0xf4cb5823, 0x58d978fa, 0xc6d9d236, 0x25de5db8,
+    0xbbdef774, 0xa2d7327e, 0x3cd798b2, 0xdfd0173c, 0x41d0bdf0,
+    0xc6f32655, 0x58f38c99, 0xbbf40317, 0x25f4a9db, 0x3cfd6cd1,
+    0xa2fdc61d, 0x41fa4993, 0xdffae35f, 0x73e8c386, 0xede8694a,
+    0x0eefe6c4, 0x90ef4c08, 0x89e68902, 0x17e623ce, 0xf4e1ac40,
+    0x6ae1068c, 0xbba0ebd0, 0x25a0411c, 0xc6a7ce92, 0x58a7645e,
+    0x41aea154, 0xdfae0b98, 0x3ca98416, 0xa2a92eda, 0x0ebb0e03,
+    0x90bba4cf, 0x73bc2b41, 0xedbc818d, 0xf4b54487, 0x6ab5ee4b,
+    0x89b261c5, 0x17b2cb09, 0x909150ac, 0x0e91fa60, 0xed9675ee,
+    0x7396df22, 0x6a9f1a28, 0xf49fb0e4, 0x17983f6a, 0x899895a6,
+    0x258ab57f, 0xbb8a1fb3, 0x588d903d, 0xc68d3af1, 0xdf84fffb,
+    0x41845537, 0xa283dab9, 0x3c837075, 0xda853b53, 0x4485919f,
+    0xa7821e11, 0x3982b4dd, 0x208b71d7, 0xbe8bdb1b, 0x5d8c5495,
+    0xc38cfe59, 0x6f9ede80, 0xf19e744c, 0x1299fbc2, 0x8c99510e,
+    0x95909404, 0x0b903ec8, 0xe897b146, 0x76971b8a, 0xf1b4802f,
+    0x6fb42ae3, 0x8cb3a56d, 0x12b30fa1, 0x0bbacaab, 0x95ba6067,
+    0x76bdefe9, 0xe8bd4525, 0x44af65fc, 0xdaafcf30, 0x39a840be,
+    0xa7a8ea72, 0xbea12f78, 0x20a185b4, 0xc3a60a3a, 0x5da6a0f6,
+    0x8ce74daa, 0x12e7e766, 0xf1e068e8, 0x6fe0c224, 0x76e9072e,
+    0xe8e9ade2, 0x0bee226c, 0x95ee88a0, 0x39fca879, 0xa7fc02b5,
+    0x44fb8d3b, 0xdafb27f7, 0xc3f2e2fd, 0x5df24831, 0xbef5c7bf,
+    0x20f56d73, 0xa7d6f6d6, 0x39d65c1a, 0xdad1d394, 0x44d17958,
+    0x5dd8bc52, 0xc3d8169e, 0x20df9910, 0xbedf33dc, 0x12cd1305,
+    0x8ccdb9c9, 0x6fca3647, 0xf1ca9c8b, 0xe8c35981, 0x76c3f34d,
+    0x95c47cc3, 0x0bc4d60f, 0x3747a67a, 0xa9470cb6, 0x4a408338,
+    0xd44029f4, 0xcd49ecfe, 0x53494632, 0xb04ec9bc, 0x2e4e6370,
+    0x825c43a9, 0x1c5ce965, 0xff5b66eb, 0x615bcc27, 0x7852092d,
+    0xe652a3e1, 0x05552c6f, 0x9b5586a3, 0x1c761d06, 0x8276b7ca,
+    0x61713844, 0xff719288, 0xe6785782, 0x7878fd4e, 0x9b7f72c0,
+    0x057fd80c, 0xa96df8d5, 0x376d5219, 0xd46add97, 0x4a6a775b,
+    0x5363b251, 0xcd63189d, 0x2e649713, 0xb0643ddf, 0x6125d083,
+    0xff257a4f, 0x1c22f5c1, 0x82225f0d, 0x9b2b9a07, 0x052b30cb,
+    0xe62cbf45, 0x782c1589, 0xd43e3550, 0x4a3e9f9c, 0xa9391012,
+    0x3739bade, 0x2e307fd4, 0xb030d518, 0x53375a96, 0xcd37f05a,
+    0x4a146bff, 0xd414c133, 0x37134ebd, 0xa913e471, 0xb01a217b,
+    0x2e1a8bb7, 0xcd1d0439, 0x531daef5, 0xff0f8e2c, 0x610f24e0,
+    0x8208ab6e, 0x1c0801a2, 0x0501c4a8, 0x9b016e64, 0x7806e1ea,
+    0xe6064b26}};
+
 #endif
-  }
-};
+
+#endif
+
+#if N == 3
+
+#if W == 8
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0x81256527, 0xd93bcc0f, 0x581ea928, 0x69069e5f,
+    0xe823fb78, 0xb03d5250, 0x31183777, 0xd20d3cbe, 0x53285999,
+    0x0b36f0b1, 0x8a139596, 0xbb0ba2e1, 0x3a2ec7c6, 0x62306eee,
+    0xe3150bc9, 0x7f6b7f3d, 0xfe4e1a1a, 0xa650b332, 0x2775d615,
+    0x166de162, 0x97488445, 0xcf562d6d, 0x4e73484a, 0xad664383,
+    0x2c4326a4, 0x745d8f8c, 0xf578eaab, 0xc460dddc, 0x4545b8fb,
+    0x1d5b11d3, 0x9c7e74f4, 0xfed6fe7a, 0x7ff39b5d, 0x27ed3275,
+    0xa6c85752, 0x97d06025, 0x16f50502, 0x4eebac2a, 0xcfcec90d,
+    0x2cdbc2c4, 0xadfea7e3, 0xf5e00ecb, 0x74c56bec, 0x45dd5c9b,
+    0xc4f839bc, 0x9ce69094, 0x1dc3f5b3, 0x81bd8147, 0x0098e460,
+    0x58864d48, 0xd9a3286f, 0xe8bb1f18, 0x699e7a3f, 0x3180d317,
+    0xb0a5b630, 0x53b0bdf9, 0xd295d8de, 0x8a8b71f6, 0x0bae14d1,
+    0x3ab623a6, 0xbb934681, 0xe38defa9, 0x62a88a8e, 0x26dcfab5,
+    0xa7f99f92, 0xffe736ba, 0x7ec2539d, 0x4fda64ea, 0xceff01cd,
+    0x96e1a8e5, 0x17c4cdc2, 0xf4d1c60b, 0x75f4a32c, 0x2dea0a04,
+    0xaccf6f23, 0x9dd75854, 0x1cf23d73, 0x44ec945b, 0xc5c9f17c,
+    0x59b78588, 0xd892e0af, 0x808c4987, 0x01a92ca0, 0x30b11bd7,
+    0xb1947ef0, 0xe98ad7d8, 0x68afb2ff, 0x8bbab936, 0x0a9fdc11,
+    0x52817539, 0xd3a4101e, 0xe2bc2769, 0x6399424e, 0x3b87eb66,
+    0xbaa28e41, 0xd80a04cf, 0x592f61e8, 0x0131c8c0, 0x8014ade7,
+    0xb10c9a90, 0x3029ffb7, 0x6837569f, 0xe91233b8, 0x0a073871,
+    0x8b225d56, 0xd33cf47e, 0x52199159, 0x6301a62e, 0xe224c309,
+    0xba3a6a21, 0x3b1f0f06, 0xa7617bf2, 0x26441ed5, 0x7e5ab7fd,
+    0xff7fd2da, 0xce67e5ad, 0x4f42808a, 0x175c29a2, 0x96794c85,
+    0x756c474c, 0xf449226b, 0xac578b43, 0x2d72ee64, 0x1c6ad913,
+    0x9d4fbc34, 0xc551151c, 0x4474703b, 0x4db9f56a, 0xcc9c904d,
+    0x94823965, 0x15a75c42, 0x24bf6b35, 0xa59a0e12, 0xfd84a73a,
+    0x7ca1c21d, 0x9fb4c9d4, 0x1e91acf3, 0x468f05db, 0xc7aa60fc,
+    0xf6b2578b, 0x779732ac, 0x2f899b84, 0xaeacfea3, 0x32d28a57,
+    0xb3f7ef70, 0xebe94658, 0x6acc237f, 0x5bd41408, 0xdaf1712f,
+    0x82efd807, 0x03cabd20, 0xe0dfb6e9, 0x61fad3ce, 0x39e47ae6,
+    0xb8c11fc1, 0x89d928b6, 0x08fc4d91, 0x50e2e4b9, 0xd1c7819e,
+    0xb36f0b10, 0x324a6e37, 0x6a54c71f, 0xeb71a238, 0xda69954f,
+    0x5b4cf068, 0x03525940, 0x82773c67, 0x616237ae, 0xe0475289,
+    0xb859fba1, 0x397c9e86, 0x0864a9f1, 0x8941ccd6, 0xd15f65fe,
+    0x507a00d9, 0xcc04742d, 0x4d21110a, 0x153fb822, 0x941add05,
+    0xa502ea72, 0x24278f55, 0x7c39267d, 0xfd1c435a, 0x1e094893,
+    0x9f2c2db4, 0xc732849c, 0x4617e1bb, 0x770fd6cc, 0xf62ab3eb,
+    0xae341ac3, 0x2f117fe4, 0x6b650fdf, 0xea406af8, 0xb25ec3d0,
+    0x337ba6f7, 0x02639180, 0x8346f4a7, 0xdb585d8f, 0x5a7d38a8,
+    0xb9683361, 0x384d5646, 0x6053ff6e, 0xe1769a49, 0xd06ead3e,
+    0x514bc819, 0x09556131, 0x88700416, 0x140e70e2, 0x952b15c5,
+    0xcd35bced, 0x4c10d9ca, 0x7d08eebd, 0xfc2d8b9a, 0xa43322b2,
+    0x25164795, 0xc6034c5c, 0x4726297b, 0x1f388053, 0x9e1de574,
+    0xaf05d203, 0x2e20b724, 0x763e1e0c, 0xf71b7b2b, 0x95b3f1a5,
+    0x14969482, 0x4c883daa, 0xcdad588d, 0xfcb56ffa, 0x7d900add,
+    0x258ea3f5, 0xa4abc6d2, 0x47becd1b, 0xc69ba83c, 0x9e850114,
+    0x1fa06433, 0x2eb85344, 0xaf9d3663, 0xf7839f4b, 0x76a6fa6c,
+    0xead88e98, 0x6bfdebbf, 0x33e34297, 0xb2c627b0, 0x83de10c7,
+    0x02fb75e0, 0x5ae5dcc8, 0xdbc0b9ef, 0x38d5b226, 0xb9f0d701,
+    0xe1ee7e29, 0x60cb1b0e, 0x51d32c79, 0xd0f6495e, 0x88e8e076,
+    0x09cd8551},
+   {0x00000000, 0x9b73ead4, 0xed96d3e9, 0x76e5393d, 0x005ca193,
+    0x9b2f4b47, 0xedca727a, 0x76b998ae, 0x00b94326, 0x9bcaa9f2,
+    0xed2f90cf, 0x765c7a1b, 0x00e5e2b5, 0x9b960861, 0xed73315c,
+    0x7600db88, 0x0172864c, 0x9a016c98, 0xece455a5, 0x7797bf71,
+    0x012e27df, 0x9a5dcd0b, 0xecb8f436, 0x77cb1ee2, 0x01cbc56a,
+    0x9ab82fbe, 0xec5d1683, 0x772efc57, 0x019764f9, 0x9ae48e2d,
+    0xec01b710, 0x77725dc4, 0x02e50c98, 0x9996e64c, 0xef73df71,
+    0x740035a5, 0x02b9ad0b, 0x99ca47df, 0xef2f7ee2, 0x745c9436,
+    0x025c4fbe, 0x992fa56a, 0xefca9c57, 0x74b97683, 0x0200ee2d,
+    0x997304f9, 0xef963dc4, 0x74e5d710, 0x03978ad4, 0x98e46000,
+    0xee01593d, 0x7572b3e9, 0x03cb2b47, 0x98b8c193, 0xee5df8ae,
+    0x752e127a, 0x032ec9f2, 0x985d2326, 0xeeb81a1b, 0x75cbf0cf,
+    0x03726861, 0x980182b5, 0xeee4bb88, 0x7597515c, 0x05ca1930,
+    0x9eb9f3e4, 0xe85ccad9, 0x732f200d, 0x0596b8a3, 0x9ee55277,
+    0xe8006b4a, 0x7373819e, 0x05735a16, 0x9e00b0c2, 0xe8e589ff,
+    0x7396632b, 0x052ffb85, 0x9e5c1151, 0xe8b9286c, 0x73cac2b8,
+    0x04b89f7c, 0x9fcb75a8, 0xe92e4c95, 0x725da641, 0x04e43eef,
+    0x9f97d43b, 0xe972ed06, 0x720107d2, 0x0401dc5a, 0x9f72368e,
+    0xe9970fb3, 0x72e4e567, 0x045d7dc9, 0x9f2e971d, 0xe9cbae20,
+    0x72b844f4, 0x072f15a8, 0x9c5cff7c, 0xeab9c641, 0x71ca2c95,
+    0x0773b43b, 0x9c005eef, 0xeae567d2, 0x71968d06, 0x0796568e,
+    0x9ce5bc5a, 0xea008567, 0x71736fb3, 0x07caf71d, 0x9cb91dc9,
+    0xea5c24f4, 0x712fce20, 0x065d93e4, 0x9d2e7930, 0xebcb400d,
+    0x70b8aad9, 0x06013277, 0x9d72d8a3, 0xeb97e19e, 0x70e40b4a,
+    0x06e4d0c2, 0x9d973a16, 0xeb72032b, 0x7001e9ff, 0x06b87151,
+    0x9dcb9b85, 0xeb2ea2b8, 0x705d486c, 0x0b943260, 0x90e7d8b4,
+    0xe602e189, 0x7d710b5d, 0x0bc893f3, 0x90bb7927, 0xe65e401a,
+    0x7d2daace, 0x0b2d7146, 0x905e9b92, 0xe6bba2af, 0x7dc8487b,
+    0x0b71d0d5, 0x90023a01, 0xe6e7033c, 0x7d94e9e8, 0x0ae6b42c,
+    0x91955ef8, 0xe77067c5, 0x7c038d11, 0x0aba15bf, 0x91c9ff6b,
+    0xe72cc656, 0x7c5f2c82, 0x0a5ff70a, 0x912c1dde, 0xe7c924e3,
+    0x7cbace37, 0x0a035699, 0x9170bc4d, 0xe7958570, 0x7ce66fa4,
+    0x09713ef8, 0x9202d42c, 0xe4e7ed11, 0x7f9407c5, 0x092d9f6b,
+    0x925e75bf, 0xe4bb4c82, 0x7fc8a656, 0x09c87dde, 0x92bb970a,
+    0xe45eae37, 0x7f2d44e3, 0x0994dc4d, 0x92e73699, 0xe4020fa4,
+    0x7f71e570, 0x0803b8b4, 0x93705260, 0xe5956b5d, 0x7ee68189,
+    0x085f1927, 0x932cf3f3, 0xe5c9cace, 0x7eba201a, 0x08bafb92,
+    0x93c91146, 0xe52c287b, 0x7e5fc2af, 0x08e65a01, 0x9395b0d5,
+    0xe57089e8, 0x7e03633c, 0x0e5e2b50, 0x952dc184, 0xe3c8f8b9,
+    0x78bb126d, 0x0e028ac3, 0x95716017, 0xe394592a, 0x78e7b3fe,
+    0x0ee76876, 0x959482a2, 0xe371bb9f, 0x7802514b, 0x0ebbc9e5,
+    0x95c82331, 0xe32d1a0c, 0x785ef0d8, 0x0f2cad1c, 0x945f47c8,
+    0xe2ba7ef5, 0x79c99421, 0x0f700c8f, 0x9403e65b, 0xe2e6df66,
+    0x799535b2, 0x0f95ee3a, 0x94e604ee, 0xe2033dd3, 0x7970d707,
+    0x0fc94fa9, 0x94baa57d, 0xe25f9c40, 0x792c7694, 0x0cbb27c8,
+    0x97c8cd1c, 0xe12df421, 0x7a5e1ef5, 0x0ce7865b, 0x97946c8f,
+    0xe17155b2, 0x7a02bf66, 0x0c0264ee, 0x97718e3a, 0xe194b707,
+    0x7ae75dd3, 0x0c5ec57d, 0x972d2fa9, 0xe1c81694, 0x7abbfc40,
+    0x0dc9a184, 0x96ba4b50, 0xe05f726d, 0x7b2c98b9, 0x0d950017,
+    0x96e6eac3, 0xe003d3fe, 0x7b70392a, 0x0d70e2a2, 0x96030876,
+    0xe0e6314b, 0x7b95db9f, 0x0d2c4331, 0x965fa9e5, 0xe0ba90d8,
+    0x7bc97a0c},
+   {0x00000000, 0x172864c0, 0x2e50c980, 0x3978ad40, 0x5ca19300,
+    0x4b89f7c0, 0x72f15a80, 0x65d93e40, 0xb9432600, 0xae6b42c0,
+    0x9713ef80, 0x803b8b40, 0xe5e2b500, 0xf2cad1c0, 0xcbb27c80,
+    0xdc9a1840, 0xa9f74a41, 0xbedf2e81, 0x87a783c1, 0x908fe701,
+    0xf556d941, 0xe27ebd81, 0xdb0610c1, 0xcc2e7401, 0x10b46c41,
+    0x079c0881, 0x3ee4a5c1, 0x29ccc101, 0x4c15ff41, 0x5b3d9b81,
+    0x624536c1, 0x756d5201, 0x889f92c3, 0x9fb7f603, 0xa6cf5b43,
+    0xb1e73f83, 0xd43e01c3, 0xc3166503, 0xfa6ec843, 0xed46ac83,
+    0x31dcb4c3, 0x26f4d003, 0x1f8c7d43, 0x08a41983, 0x6d7d27c3,
+    0x7a554303, 0x432dee43, 0x54058a83, 0x2168d882, 0x3640bc42,
+    0x0f381102, 0x181075c2, 0x7dc94b82, 0x6ae12f42, 0x53998202,
+    0x44b1e6c2, 0x982bfe82, 0x8f039a42, 0xb67b3702, 0xa15353c2,
+    0xc48a6d82, 0xd3a20942, 0xeadaa402, 0xfdf2c0c2, 0xca4e23c7,
+    0xdd664707, 0xe41eea47, 0xf3368e87, 0x96efb0c7, 0x81c7d407,
+    0xb8bf7947, 0xaf971d87, 0x730d05c7, 0x64256107, 0x5d5dcc47,
+    0x4a75a887, 0x2fac96c7, 0x3884f207, 0x01fc5f47, 0x16d43b87,
+    0x63b96986, 0x74910d46, 0x4de9a006, 0x5ac1c4c6, 0x3f18fa86,
+    0x28309e46, 0x11483306, 0x066057c6, 0xdafa4f86, 0xcdd22b46,
+    0xf4aa8606, 0xe382e2c6, 0x865bdc86, 0x9173b846, 0xa80b1506,
+    0xbf2371c6, 0x42d1b104, 0x55f9d5c4, 0x6c817884, 0x7ba91c44,
+    0x1e702204, 0x095846c4, 0x3020eb84, 0x27088f44, 0xfb929704,
+    0xecbaf3c4, 0xd5c25e84, 0xc2ea3a44, 0xa7330404, 0xb01b60c4,
+    0x8963cd84, 0x9e4ba944, 0xeb26fb45, 0xfc0e9f85, 0xc57632c5,
+    0xd25e5605, 0xb7876845, 0xa0af0c85, 0x99d7a1c5, 0x8effc505,
+    0x5265dd45, 0x454db985, 0x7c3514c5, 0x6b1d7005, 0x0ec44e45,
+    0x19ec2a85, 0x209487c5, 0x37bce305, 0x4fed41cf, 0x58c5250f,
+    0x61bd884f, 0x7695ec8f, 0x134cd2cf, 0x0464b60f, 0x3d1c1b4f,
+    0x2a347f8f, 0xf6ae67cf, 0xe186030f, 0xd8feae4f, 0xcfd6ca8f,
+    0xaa0ff4cf, 0xbd27900f, 0x845f3d4f, 0x9377598f, 0xe61a0b8e,
+    0xf1326f4e, 0xc84ac20e, 0xdf62a6ce, 0xbabb988e, 0xad93fc4e,
+    0x94eb510e, 0x83c335ce, 0x5f592d8e, 0x4871494e, 0x7109e40e,
+    0x662180ce, 0x03f8be8e, 0x14d0da4e, 0x2da8770e, 0x3a8013ce,
+    0xc772d30c, 0xd05ab7cc, 0xe9221a8c, 0xfe0a7e4c, 0x9bd3400c,
+    0x8cfb24cc, 0xb583898c, 0xa2abed4c, 0x7e31f50c, 0x691991cc,
+    0x50613c8c, 0x4749584c, 0x2290660c, 0x35b802cc, 0x0cc0af8c,
+    0x1be8cb4c, 0x6e85994d, 0x79adfd8d, 0x40d550cd, 0x57fd340d,
+    0x32240a4d, 0x250c6e8d, 0x1c74c3cd, 0x0b5ca70d, 0xd7c6bf4d,
+    0xc0eedb8d, 0xf99676cd, 0xeebe120d, 0x8b672c4d, 0x9c4f488d,
+    0xa537e5cd, 0xb21f810d, 0x85a36208, 0x928b06c8, 0xabf3ab88,
+    0xbcdbcf48, 0xd902f108, 0xce2a95c8, 0xf7523888, 0xe07a5c48,
+    0x3ce04408, 0x2bc820c8, 0x12b08d88, 0x0598e948, 0x6041d708,
+    0x7769b3c8, 0x4e111e88, 0x59397a48, 0x2c542849, 0x3b7c4c89,
+    0x0204e1c9, 0x152c8509, 0x70f5bb49, 0x67dddf89, 0x5ea572c9,
+    0x498d1609, 0x95170e49, 0x823f6a89, 0xbb47c7c9, 0xac6fa309,
+    0xc9b69d49, 0xde9ef989, 0xe7e654c9, 0xf0ce3009, 0x0d3cf0cb,
+    0x1a14940b, 0x236c394b, 0x34445d8b, 0x519d63cb, 0x46b5070b,
+    0x7fcdaa4b, 0x68e5ce8b, 0xb47fd6cb, 0xa357b20b, 0x9a2f1f4b,
+    0x8d077b8b, 0xe8de45cb, 0xfff6210b, 0xc68e8c4b, 0xd1a6e88b,
+    0xa4cbba8a, 0xb3e3de4a, 0x8a9b730a, 0x9db317ca, 0xf86a298a,
+    0xef424d4a, 0xd63ae00a, 0xc11284ca, 0x1d889c8a, 0x0aa0f84a,
+    0x33d8550a, 0x24f031ca, 0x41290f8a, 0x56016b4a, 0x6f79c60a,
+    0x7851a2ca},
+   {0x00000000, 0x9fda839e, 0xe4c4017d, 0x7b1e82e3, 0x12f904bb,
+    0x8d238725, 0xf63d05c6, 0x69e78658, 0x25f20976, 0xba288ae8,
+    0xc136080b, 0x5eec8b95, 0x370b0dcd, 0xa8d18e53, 0xd3cf0cb0,
+    0x4c158f2e, 0x4be412ec, 0xd43e9172, 0xaf201391, 0x30fa900f,
+    0x591d1657, 0xc6c795c9, 0xbdd9172a, 0x220394b4, 0x6e161b9a,
+    0xf1cc9804, 0x8ad21ae7, 0x15089979, 0x7cef1f21, 0xe3359cbf,
+    0x982b1e5c, 0x07f19dc2, 0x97c825d8, 0x0812a646, 0x730c24a5,
+    0xecd6a73b, 0x85312163, 0x1aeba2fd, 0x61f5201e, 0xfe2fa380,
+    0xb23a2cae, 0x2de0af30, 0x56fe2dd3, 0xc924ae4d, 0xa0c32815,
+    0x3f19ab8b, 0x44072968, 0xdbddaaf6, 0xdc2c3734, 0x43f6b4aa,
+    0x38e83649, 0xa732b5d7, 0xced5338f, 0x510fb011, 0x2a1132f2,
+    0xb5cbb16c, 0xf9de3e42, 0x6604bddc, 0x1d1a3f3f, 0x82c0bca1,
+    0xeb273af9, 0x74fdb967, 0x0fe33b84, 0x9039b81a, 0xf4e14df1,
+    0x6b3bce6f, 0x10254c8c, 0x8fffcf12, 0xe618494a, 0x79c2cad4,
+    0x02dc4837, 0x9d06cba9, 0xd1134487, 0x4ec9c719, 0x35d745fa,
+    0xaa0dc664, 0xc3ea403c, 0x5c30c3a2, 0x272e4141, 0xb8f4c2df,
+    0xbf055f1d, 0x20dfdc83, 0x5bc15e60, 0xc41bddfe, 0xadfc5ba6,
+    0x3226d838, 0x49385adb, 0xd6e2d945, 0x9af7566b, 0x052dd5f5,
+    0x7e335716, 0xe1e9d488, 0x880e52d0, 0x17d4d14e, 0x6cca53ad,
+    0xf310d033, 0x63296829, 0xfcf3ebb7, 0x87ed6954, 0x1837eaca,
+    0x71d06c92, 0xee0aef0c, 0x95146def, 0x0aceee71, 0x46db615f,
+    0xd901e2c1, 0xa21f6022, 0x3dc5e3bc, 0x542265e4, 0xcbf8e67a,
+    0xb0e66499, 0x2f3ce707, 0x28cd7ac5, 0xb717f95b, 0xcc097bb8,
+    0x53d3f826, 0x3a347e7e, 0xa5eefde0, 0xdef07f03, 0x412afc9d,
+    0x0d3f73b3, 0x92e5f02d, 0xe9fb72ce, 0x7621f150, 0x1fc67708,
+    0x801cf496, 0xfb027675, 0x64d8f5eb, 0x32b39da3, 0xad691e3d,
+    0xd6779cde, 0x49ad1f40, 0x204a9918, 0xbf901a86, 0xc48e9865,
+    0x5b541bfb, 0x174194d5, 0x889b174b, 0xf38595a8, 0x6c5f1636,
+    0x05b8906e, 0x9a6213f0, 0xe17c9113, 0x7ea6128d, 0x79578f4f,
+    0xe68d0cd1, 0x9d938e32, 0x02490dac, 0x6bae8bf4, 0xf474086a,
+    0x8f6a8a89, 0x10b00917, 0x5ca58639, 0xc37f05a7, 0xb8618744,
+    0x27bb04da, 0x4e5c8282, 0xd186011c, 0xaa9883ff, 0x35420061,
+    0xa57bb87b, 0x3aa13be5, 0x41bfb906, 0xde653a98, 0xb782bcc0,
+    0x28583f5e, 0x5346bdbd, 0xcc9c3e23, 0x8089b10d, 0x1f533293,
+    0x644db070, 0xfb9733ee, 0x9270b5b6, 0x0daa3628, 0x76b4b4cb,
+    0xe96e3755, 0xee9faa97, 0x71452909, 0x0a5babea, 0x95812874,
+    0xfc66ae2c, 0x63bc2db2, 0x18a2af51, 0x87782ccf, 0xcb6da3e1,
+    0x54b7207f, 0x2fa9a29c, 0xb0732102, 0xd994a75a, 0x464e24c4,
+    0x3d50a627, 0xa28a25b9, 0xc652d052, 0x598853cc, 0x2296d12f,
+    0xbd4c52b1, 0xd4abd4e9, 0x4b715777, 0x306fd594, 0xafb5560a,
+    0xe3a0d924, 0x7c7a5aba, 0x0764d859, 0x98be5bc7, 0xf159dd9f,
+    0x6e835e01, 0x159ddce2, 0x8a475f7c, 0x8db6c2be, 0x126c4120,
+    0x6972c3c3, 0xf6a8405d, 0x9f4fc605, 0x0095459b, 0x7b8bc778,
+    0xe45144e6, 0xa844cbc8, 0x379e4856, 0x4c80cab5, 0xd35a492b,
+    0xbabdcf73, 0x25674ced, 0x5e79ce0e, 0xc1a34d90, 0x519af58a,
+    0xce407614, 0xb55ef4f7, 0x2a847769, 0x4363f131, 0xdcb972af,
+    0xa7a7f04c, 0x387d73d2, 0x7468fcfc, 0xebb27f62, 0x90acfd81,
+    0x0f767e1f, 0x6691f847, 0xf94b7bd9, 0x8255f93a, 0x1d8f7aa4,
+    0x1a7ee766, 0x85a464f8, 0xfebae61b, 0x61606585, 0x0887e3dd,
+    0x975d6043, 0xec43e2a0, 0x7399613e, 0x3f8cee10, 0xa0566d8e,
+    0xdb48ef6d, 0x44926cf3, 0x2d75eaab, 0xb2af6935, 0xc9b1ebd6,
+    0x566b6848},
+   {0x00000000, 0x65673b46, 0xcace768c, 0xafa94dca, 0x4eedeb59,
+    0x2b8ad01f, 0x84239dd5, 0xe144a693, 0x9ddbd6b2, 0xf8bcedf4,
+    0x5715a03e, 0x32729b78, 0xd3363deb, 0xb65106ad, 0x19f84b67,
+    0x7c9f7021, 0xe0c6ab25, 0x85a19063, 0x2a08dda9, 0x4f6fe6ef,
+    0xae2b407c, 0xcb4c7b3a, 0x64e536f0, 0x01820db6, 0x7d1d7d97,
+    0x187a46d1, 0xb7d30b1b, 0xd2b4305d, 0x33f096ce, 0x5697ad88,
+    0xf93ee042, 0x9c59db04, 0x1afc500b, 0x7f9b6b4d, 0xd0322687,
+    0xb5551dc1, 0x5411bb52, 0x31768014, 0x9edfcdde, 0xfbb8f698,
+    0x872786b9, 0xe240bdff, 0x4de9f035, 0x288ecb73, 0xc9ca6de0,
+    0xacad56a6, 0x03041b6c, 0x6663202a, 0xfa3afb2e, 0x9f5dc068,
+    0x30f48da2, 0x5593b6e4, 0xb4d71077, 0xd1b02b31, 0x7e1966fb,
+    0x1b7e5dbd, 0x67e12d9c, 0x028616da, 0xad2f5b10, 0xc8486056,
+    0x290cc6c5, 0x4c6bfd83, 0xe3c2b049, 0x86a58b0f, 0x35f8a016,
+    0x509f9b50, 0xff36d69a, 0x9a51eddc, 0x7b154b4f, 0x1e727009,
+    0xb1db3dc3, 0xd4bc0685, 0xa82376a4, 0xcd444de2, 0x62ed0028,
+    0x078a3b6e, 0xe6ce9dfd, 0x83a9a6bb, 0x2c00eb71, 0x4967d037,
+    0xd53e0b33, 0xb0593075, 0x1ff07dbf, 0x7a9746f9, 0x9bd3e06a,
+    0xfeb4db2c, 0x511d96e6, 0x347aada0, 0x48e5dd81, 0x2d82e6c7,
+    0x822bab0d, 0xe74c904b, 0x060836d8, 0x636f0d9e, 0xccc64054,
+    0xa9a17b12, 0x2f04f01d, 0x4a63cb5b, 0xe5ca8691, 0x80adbdd7,
+    0x61e91b44, 0x048e2002, 0xab276dc8, 0xce40568e, 0xb2df26af,
+    0xd7b81de9, 0x78115023, 0x1d766b65, 0xfc32cdf6, 0x9955f6b0,
+    0x36fcbb7a, 0x539b803c, 0xcfc25b38, 0xaaa5607e, 0x050c2db4,
+    0x606b16f2, 0x812fb061, 0xe4488b27, 0x4be1c6ed, 0x2e86fdab,
+    0x52198d8a, 0x377eb6cc, 0x98d7fb06, 0xfdb0c040, 0x1cf466d3,
+    0x79935d95, 0xd63a105f, 0xb35d2b19, 0x6bf1402c, 0x0e967b6a,
+    0xa13f36a0, 0xc4580de6, 0x251cab75, 0x407b9033, 0xefd2ddf9,
+    0x8ab5e6bf, 0xf62a969e, 0x934dadd8, 0x3ce4e012, 0x5983db54,
+    0xb8c77dc7, 0xdda04681, 0x72090b4b, 0x176e300d, 0x8b37eb09,
+    0xee50d04f, 0x41f99d85, 0x249ea6c3, 0xc5da0050, 0xa0bd3b16,
+    0x0f1476dc, 0x6a734d9a, 0x16ec3dbb, 0x738b06fd, 0xdc224b37,
+    0xb9457071, 0x5801d6e2, 0x3d66eda4, 0x92cfa06e, 0xf7a89b28,
+    0x710d1027, 0x146a2b61, 0xbbc366ab, 0xdea45ded, 0x3fe0fb7e,
+    0x5a87c038, 0xf52e8df2, 0x9049b6b4, 0xecd6c695, 0x89b1fdd3,
+    0x2618b019, 0x437f8b5f, 0xa23b2dcc, 0xc75c168a, 0x68f55b40,
+    0x0d926006, 0x91cbbb02, 0xf4ac8044, 0x5b05cd8e, 0x3e62f6c8,
+    0xdf26505b, 0xba416b1d, 0x15e826d7, 0x708f1d91, 0x0c106db0,
+    0x697756f6, 0xc6de1b3c, 0xa3b9207a, 0x42fd86e9, 0x279abdaf,
+    0x8833f065, 0xed54cb23, 0x5e09e03a, 0x3b6edb7c, 0x94c796b6,
+    0xf1a0adf0, 0x10e40b63, 0x75833025, 0xda2a7def, 0xbf4d46a9,
+    0xc3d23688, 0xa6b50dce, 0x091c4004, 0x6c7b7b42, 0x8d3fddd1,
+    0xe858e697, 0x47f1ab5d, 0x2296901b, 0xbecf4b1f, 0xdba87059,
+    0x74013d93, 0x116606d5, 0xf022a046, 0x95459b00, 0x3aecd6ca,
+    0x5f8bed8c, 0x23149dad, 0x4673a6eb, 0xe9daeb21, 0x8cbdd067,
+    0x6df976f4, 0x089e4db2, 0xa7370078, 0xc2503b3e, 0x44f5b031,
+    0x21928b77, 0x8e3bc6bd, 0xeb5cfdfb, 0x0a185b68, 0x6f7f602e,
+    0xc0d62de4, 0xa5b116a2, 0xd92e6683, 0xbc495dc5, 0x13e0100f,
+    0x76872b49, 0x97c38dda, 0xf2a4b69c, 0x5d0dfb56, 0x386ac010,
+    0xa4331b14, 0xc1542052, 0x6efd6d98, 0x0b9a56de, 0xeadef04d,
+    0x8fb9cb0b, 0x201086c1, 0x4577bd87, 0x39e8cda6, 0x5c8ff6e0,
+    0xf326bb2a, 0x9641806c, 0x770526ff, 0x12621db9, 0xbdcb5073,
+    0xd8ac6b35},
+   {0x00000000, 0xd7e28058, 0x74b406f1, 0xa35686a9, 0xe9680de2,
+    0x3e8a8dba, 0x9ddc0b13, 0x4a3e8b4b, 0x09a11d85, 0xde439ddd,
+    0x7d151b74, 0xaaf79b2c, 0xe0c91067, 0x372b903f, 0x947d1696,
+    0x439f96ce, 0x13423b0a, 0xc4a0bb52, 0x67f63dfb, 0xb014bda3,
+    0xfa2a36e8, 0x2dc8b6b0, 0x8e9e3019, 0x597cb041, 0x1ae3268f,
+    0xcd01a6d7, 0x6e57207e, 0xb9b5a026, 0xf38b2b6d, 0x2469ab35,
+    0x873f2d9c, 0x50ddadc4, 0x26847614, 0xf166f64c, 0x523070e5,
+    0x85d2f0bd, 0xcfec7bf6, 0x180efbae, 0xbb587d07, 0x6cbafd5f,
+    0x2f256b91, 0xf8c7ebc9, 0x5b916d60, 0x8c73ed38, 0xc64d6673,
+    0x11afe62b, 0xb2f96082, 0x651be0da, 0x35c64d1e, 0xe224cd46,
+    0x41724bef, 0x9690cbb7, 0xdcae40fc, 0x0b4cc0a4, 0xa81a460d,
+    0x7ff8c655, 0x3c67509b, 0xeb85d0c3, 0x48d3566a, 0x9f31d632,
+    0xd50f5d79, 0x02eddd21, 0xa1bb5b88, 0x7659dbd0, 0x4d08ec28,
+    0x9aea6c70, 0x39bcead9, 0xee5e6a81, 0xa460e1ca, 0x73826192,
+    0xd0d4e73b, 0x07366763, 0x44a9f1ad, 0x934b71f5, 0x301df75c,
+    0xe7ff7704, 0xadc1fc4f, 0x7a237c17, 0xd975fabe, 0x0e977ae6,
+    0x5e4ad722, 0x89a8577a, 0x2afed1d3, 0xfd1c518b, 0xb722dac0,
+    0x60c05a98, 0xc396dc31, 0x14745c69, 0x57ebcaa7, 0x80094aff,
+    0x235fcc56, 0xf4bd4c0e, 0xbe83c745, 0x6961471d, 0xca37c1b4,
+    0x1dd541ec, 0x6b8c9a3c, 0xbc6e1a64, 0x1f389ccd, 0xc8da1c95,
+    0x82e497de, 0x55061786, 0xf650912f, 0x21b21177, 0x622d87b9,
+    0xb5cf07e1, 0x16998148, 0xc17b0110, 0x8b458a5b, 0x5ca70a03,
+    0xfff18caa, 0x28130cf2, 0x78cea136, 0xaf2c216e, 0x0c7aa7c7,
+    0xdb98279f, 0x91a6acd4, 0x46442c8c, 0xe512aa25, 0x32f02a7d,
+    0x716fbcb3, 0xa68d3ceb, 0x05dbba42, 0xd2393a1a, 0x9807b151,
+    0x4fe53109, 0xecb3b7a0, 0x3b5137f8, 0x9a11d850, 0x4df35808,
+    0xeea5dea1, 0x39475ef9, 0x7379d5b2, 0xa49b55ea, 0x07cdd343,
+    0xd02f531b, 0x93b0c5d5, 0x4452458d, 0xe704c324, 0x30e6437c,
+    0x7ad8c837, 0xad3a486f, 0x0e6ccec6, 0xd98e4e9e, 0x8953e35a,
+    0x5eb16302, 0xfde7e5ab, 0x2a0565f3, 0x603beeb8, 0xb7d96ee0,
+    0x148fe849, 0xc36d6811, 0x80f2fedf, 0x57107e87, 0xf446f82e,
+    0x23a47876, 0x699af33d, 0xbe787365, 0x1d2ef5cc, 0xcacc7594,
+    0xbc95ae44, 0x6b772e1c, 0xc821a8b5, 0x1fc328ed, 0x55fda3a6,
+    0x821f23fe, 0x2149a557, 0xf6ab250f, 0xb534b3c1, 0x62d63399,
+    0xc180b530, 0x16623568, 0x5c5cbe23, 0x8bbe3e7b, 0x28e8b8d2,
+    0xff0a388a, 0xafd7954e, 0x78351516, 0xdb6393bf, 0x0c8113e7,
+    0x46bf98ac, 0x915d18f4, 0x320b9e5d, 0xe5e91e05, 0xa67688cb,
+    0x71940893, 0xd2c28e3a, 0x05200e62, 0x4f1e8529, 0x98fc0571,
+    0x3baa83d8, 0xec480380, 0xd7193478, 0x00fbb420, 0xa3ad3289,
+    0x744fb2d1, 0x3e71399a, 0xe993b9c2, 0x4ac53f6b, 0x9d27bf33,
+    0xdeb829fd, 0x095aa9a5, 0xaa0c2f0c, 0x7deeaf54, 0x37d0241f,
+    0xe032a447, 0x436422ee, 0x9486a2b6, 0xc45b0f72, 0x13b98f2a,
+    0xb0ef0983, 0x670d89db, 0x2d330290, 0xfad182c8, 0x59870461,
+    0x8e658439, 0xcdfa12f7, 0x1a1892af, 0xb94e1406, 0x6eac945e,
+    0x24921f15, 0xf3709f4d, 0x502619e4, 0x87c499bc, 0xf19d426c,
+    0x267fc234, 0x8529449d, 0x52cbc4c5, 0x18f54f8e, 0xcf17cfd6,
+    0x6c41497f, 0xbba3c927, 0xf83c5fe9, 0x2fdedfb1, 0x8c885918,
+    0x5b6ad940, 0x1154520b, 0xc6b6d253, 0x65e054fa, 0xb202d4a2,
+    0xe2df7966, 0x353df93e, 0x966b7f97, 0x4189ffcf, 0x0bb77484,
+    0xdc55f4dc, 0x7f037275, 0xa8e1f22d, 0xeb7e64e3, 0x3c9ce4bb,
+    0x9fca6212, 0x4828e24a, 0x02166901, 0xd5f4e959, 0x76a26ff0,
+    0xa140efa8},
+   {0x00000000, 0xef52b6e1, 0x05d46b83, 0xea86dd62, 0x0ba8d706,
+    0xe4fa61e7, 0x0e7cbc85, 0xe12e0a64, 0x1751ae0c, 0xf80318ed,
+    0x1285c58f, 0xfdd7736e, 0x1cf9790a, 0xf3abcfeb, 0x192d1289,
+    0xf67fa468, 0x2ea35c18, 0xc1f1eaf9, 0x2b77379b, 0xc425817a,
+    0x250b8b1e, 0xca593dff, 0x20dfe09d, 0xcf8d567c, 0x39f2f214,
+    0xd6a044f5, 0x3c269997, 0xd3742f76, 0x325a2512, 0xdd0893f3,
+    0x378e4e91, 0xd8dcf870, 0x5d46b830, 0xb2140ed1, 0x5892d3b3,
+    0xb7c06552, 0x56ee6f36, 0xb9bcd9d7, 0x533a04b5, 0xbc68b254,
+    0x4a17163c, 0xa545a0dd, 0x4fc37dbf, 0xa091cb5e, 0x41bfc13a,
+    0xaeed77db, 0x446baab9, 0xab391c58, 0x73e5e428, 0x9cb752c9,
+    0x76318fab, 0x9963394a, 0x784d332e, 0x971f85cf, 0x7d9958ad,
+    0x92cbee4c, 0x64b44a24, 0x8be6fcc5, 0x616021a7, 0x8e329746,
+    0x6f1c9d22, 0x804e2bc3, 0x6ac8f6a1, 0x859a4040, 0xba8d7060,
+    0x55dfc681, 0xbf591be3, 0x500bad02, 0xb125a766, 0x5e771187,
+    0xb4f1cce5, 0x5ba37a04, 0xaddcde6c, 0x428e688d, 0xa808b5ef,
+    0x475a030e, 0xa674096a, 0x4926bf8b, 0xa3a062e9, 0x4cf2d408,
+    0x942e2c78, 0x7b7c9a99, 0x91fa47fb, 0x7ea8f11a, 0x9f86fb7e,
+    0x70d44d9f, 0x9a5290fd, 0x7500261c, 0x837f8274, 0x6c2d3495,
+    0x86abe9f7, 0x69f95f16, 0x88d75572, 0x6785e393, 0x8d033ef1,
+    0x62518810, 0xe7cbc850, 0x08997eb1, 0xe21fa3d3, 0x0d4d1532,
+    0xec631f56, 0x0331a9b7, 0xe9b774d5, 0x06e5c234, 0xf09a665c,
+    0x1fc8d0bd, 0xf54e0ddf, 0x1a1cbb3e, 0xfb32b15a, 0x146007bb,
+    0xfee6dad9, 0x11b46c38, 0xc9689448, 0x263a22a9, 0xccbcffcb,
+    0x23ee492a, 0xc2c0434e, 0x2d92f5af, 0xc71428cd, 0x28469e2c,
+    0xde393a44, 0x316b8ca5, 0xdbed51c7, 0x34bfe726, 0xd591ed42,
+    0x3ac35ba3, 0xd04586c1, 0x3f173020, 0xae6be681, 0x41395060,
+    0xabbf8d02, 0x44ed3be3, 0xa5c33187, 0x4a918766, 0xa0175a04,
+    0x4f45ece5, 0xb93a488d, 0x5668fe6c, 0xbcee230e, 0x53bc95ef,
+    0xb2929f8b, 0x5dc0296a, 0xb746f408, 0x581442e9, 0x80c8ba99,
+    0x6f9a0c78, 0x851cd11a, 0x6a4e67fb, 0x8b606d9f, 0x6432db7e,
+    0x8eb4061c, 0x61e6b0fd, 0x97991495, 0x78cba274, 0x924d7f16,
+    0x7d1fc9f7, 0x9c31c393, 0x73637572, 0x99e5a810, 0x76b71ef1,
+    0xf32d5eb1, 0x1c7fe850, 0xf6f93532, 0x19ab83d3, 0xf88589b7,
+    0x17d73f56, 0xfd51e234, 0x120354d5, 0xe47cf0bd, 0x0b2e465c,
+    0xe1a89b3e, 0x0efa2ddf, 0xefd427bb, 0x0086915a, 0xea004c38,
+    0x0552fad9, 0xdd8e02a9, 0x32dcb448, 0xd85a692a, 0x3708dfcb,
+    0xd626d5af, 0x3974634e, 0xd3f2be2c, 0x3ca008cd, 0xcadfaca5,
+    0x258d1a44, 0xcf0bc726, 0x205971c7, 0xc1777ba3, 0x2e25cd42,
+    0xc4a31020, 0x2bf1a6c1, 0x14e696e1, 0xfbb42000, 0x1132fd62,
+    0xfe604b83, 0x1f4e41e7, 0xf01cf706, 0x1a9a2a64, 0xf5c89c85,
+    0x03b738ed, 0xece58e0c, 0x0663536e, 0xe931e58f, 0x081fefeb,
+    0xe74d590a, 0x0dcb8468, 0xe2993289, 0x3a45caf9, 0xd5177c18,
+    0x3f91a17a, 0xd0c3179b, 0x31ed1dff, 0xdebfab1e, 0x3439767c,
+    0xdb6bc09d, 0x2d1464f5, 0xc246d214, 0x28c00f76, 0xc792b997,
+    0x26bcb3f3, 0xc9ee0512, 0x2368d870, 0xcc3a6e91, 0x49a02ed1,
+    0xa6f29830, 0x4c744552, 0xa326f3b3, 0x4208f9d7, 0xad5a4f36,
+    0x47dc9254, 0xa88e24b5, 0x5ef180dd, 0xb1a3363c, 0x5b25eb5e,
+    0xb4775dbf, 0x555957db, 0xba0be13a, 0x508d3c58, 0xbfdf8ab9,
+    0x670372c9, 0x8851c428, 0x62d7194a, 0x8d85afab, 0x6caba5cf,
+    0x83f9132e, 0x697fce4c, 0x862d78ad, 0x7052dcc5, 0x9f006a24,
+    0x7586b746, 0x9ad401a7, 0x7bfa0bc3, 0x94a8bd22, 0x7e2e6040,
+    0x917cd6a1},
+   {0x00000000, 0x87a6cb43, 0xd43c90c7, 0x539a5b84, 0x730827cf,
+    0xf4aeec8c, 0xa734b708, 0x20927c4b, 0xe6104f9e, 0x61b684dd,
+    0x322cdf59, 0xb58a141a, 0x95186851, 0x12bea312, 0x4124f896,
+    0xc68233d5, 0x1751997d, 0x90f7523e, 0xc36d09ba, 0x44cbc2f9,
+    0x6459beb2, 0xe3ff75f1, 0xb0652e75, 0x37c3e536, 0xf141d6e3,
+    0x76e71da0, 0x257d4624, 0xa2db8d67, 0x8249f12c, 0x05ef3a6f,
+    0x567561eb, 0xd1d3aaa8, 0x2ea332fa, 0xa905f9b9, 0xfa9fa23d,
+    0x7d39697e, 0x5dab1535, 0xda0dde76, 0x899785f2, 0x0e314eb1,
+    0xc8b37d64, 0x4f15b627, 0x1c8feda3, 0x9b2926e0, 0xbbbb5aab,
+    0x3c1d91e8, 0x6f87ca6c, 0xe821012f, 0x39f2ab87, 0xbe5460c4,
+    0xedce3b40, 0x6a68f003, 0x4afa8c48, 0xcd5c470b, 0x9ec61c8f,
+    0x1960d7cc, 0xdfe2e419, 0x58442f5a, 0x0bde74de, 0x8c78bf9d,
+    0xaceac3d6, 0x2b4c0895, 0x78d65311, 0xff709852, 0x5d4665f4,
+    0xdae0aeb7, 0x897af533, 0x0edc3e70, 0x2e4e423b, 0xa9e88978,
+    0xfa72d2fc, 0x7dd419bf, 0xbb562a6a, 0x3cf0e129, 0x6f6abaad,
+    0xe8cc71ee, 0xc85e0da5, 0x4ff8c6e6, 0x1c629d62, 0x9bc45621,
+    0x4a17fc89, 0xcdb137ca, 0x9e2b6c4e, 0x198da70d, 0x391fdb46,
+    0xbeb91005, 0xed234b81, 0x6a8580c2, 0xac07b317, 0x2ba17854,
+    0x783b23d0, 0xff9de893, 0xdf0f94d8, 0x58a95f9b, 0x0b33041f,
+    0x8c95cf5c, 0x73e5570e, 0xf4439c4d, 0xa7d9c7c9, 0x207f0c8a,
+    0x00ed70c1, 0x874bbb82, 0xd4d1e006, 0x53772b45, 0x95f51890,
+    0x1253d3d3, 0x41c98857, 0xc66f4314, 0xe6fd3f5f, 0x615bf41c,
+    0x32c1af98, 0xb56764db, 0x64b4ce73, 0xe3120530, 0xb0885eb4,
+    0x372e95f7, 0x17bce9bc, 0x901a22ff, 0xc380797b, 0x4426b238,
+    0x82a481ed, 0x05024aae, 0x5698112a, 0xd13eda69, 0xf1aca622,
+    0x760a6d61, 0x259036e5, 0xa236fda6, 0xba8ccbe8, 0x3d2a00ab,
+    0x6eb05b2f, 0xe916906c, 0xc984ec27, 0x4e222764, 0x1db87ce0,
+    0x9a1eb7a3, 0x5c9c8476, 0xdb3a4f35, 0x88a014b1, 0x0f06dff2,
+    0x2f94a3b9, 0xa83268fa, 0xfba8337e, 0x7c0ef83d, 0xaddd5295,
+    0x2a7b99d6, 0x79e1c252, 0xfe470911, 0xded5755a, 0x5973be19,
+    0x0ae9e59d, 0x8d4f2ede, 0x4bcd1d0b, 0xcc6bd648, 0x9ff18dcc,
+    0x1857468f, 0x38c53ac4, 0xbf63f187, 0xecf9aa03, 0x6b5f6140,
+    0x942ff912, 0x13893251, 0x401369d5, 0xc7b5a296, 0xe727dedd,
+    0x6081159e, 0x331b4e1a, 0xb4bd8559, 0x723fb68c, 0xf5997dcf,
+    0xa603264b, 0x21a5ed08, 0x01379143, 0x86915a00, 0xd50b0184,
+    0x52adcac7, 0x837e606f, 0x04d8ab2c, 0x5742f0a8, 0xd0e43beb,
+    0xf07647a0, 0x77d08ce3, 0x244ad767, 0xa3ec1c24, 0x656e2ff1,
+    0xe2c8e4b2, 0xb152bf36, 0x36f47475, 0x1666083e, 0x91c0c37d,
+    0xc25a98f9, 0x45fc53ba, 0xe7caae1c, 0x606c655f, 0x33f63edb,
+    0xb450f598, 0x94c289d3, 0x13644290, 0x40fe1914, 0xc758d257,
+    0x01dae182, 0x867c2ac1, 0xd5e67145, 0x5240ba06, 0x72d2c64d,
+    0xf5740d0e, 0xa6ee568a, 0x21489dc9, 0xf09b3761, 0x773dfc22,
+    0x24a7a7a6, 0xa3016ce5, 0x839310ae, 0x0435dbed, 0x57af8069,
+    0xd0094b2a, 0x168b78ff, 0x912db3bc, 0xc2b7e838, 0x4511237b,
+    0x65835f30, 0xe2259473, 0xb1bfcff7, 0x361904b4, 0xc9699ce6,
+    0x4ecf57a5, 0x1d550c21, 0x9af3c762, 0xba61bb29, 0x3dc7706a,
+    0x6e5d2bee, 0xe9fbe0ad, 0x2f79d378, 0xa8df183b, 0xfb4543bf,
+    0x7ce388fc, 0x5c71f4b7, 0xdbd73ff4, 0x884d6470, 0x0febaf33,
+    0xde38059b, 0x599eced8, 0x0a04955c, 0x8da25e1f, 0xad302254,
+    0x2a96e917, 0x790cb293, 0xfeaa79d0, 0x38284a05, 0xbf8e8146,
+    0xec14dac2, 0x6bb21181, 0x4b206dca, 0xcc86a689, 0x9f1cfd0d,
+    0x18ba364e}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x0000000000000000, 0x43cba68700000000, 0xc7903cd400000000,
+    0x845b9a5300000000, 0xcf27087300000000, 0x8cecaef400000000,
+    0x08b734a700000000, 0x4b7c922000000000, 0x9e4f10e600000000,
+    0xdd84b66100000000, 0x59df2c3200000000, 0x1a148ab500000000,
+    0x5168189500000000, 0x12a3be1200000000, 0x96f8244100000000,
+    0xd53382c600000000, 0x7d99511700000000, 0x3e52f79000000000,
+    0xba096dc300000000, 0xf9c2cb4400000000, 0xb2be596400000000,
+    0xf175ffe300000000, 0x752e65b000000000, 0x36e5c33700000000,
+    0xe3d641f100000000, 0xa01de77600000000, 0x24467d2500000000,
+    0x678ddba200000000, 0x2cf1498200000000, 0x6f3aef0500000000,
+    0xeb61755600000000, 0xa8aad3d100000000, 0xfa32a32e00000000,
+    0xb9f905a900000000, 0x3da29ffa00000000, 0x7e69397d00000000,
+    0x3515ab5d00000000, 0x76de0dda00000000, 0xf285978900000000,
+    0xb14e310e00000000, 0x647db3c800000000, 0x27b6154f00000000,
+    0xa3ed8f1c00000000, 0xe026299b00000000, 0xab5abbbb00000000,
+    0xe8911d3c00000000, 0x6cca876f00000000, 0x2f0121e800000000,
+    0x87abf23900000000, 0xc46054be00000000, 0x403bceed00000000,
+    0x03f0686a00000000, 0x488cfa4a00000000, 0x0b475ccd00000000,
+    0x8f1cc69e00000000, 0xccd7601900000000, 0x19e4e2df00000000,
+    0x5a2f445800000000, 0xde74de0b00000000, 0x9dbf788c00000000,
+    0xd6c3eaac00000000, 0x95084c2b00000000, 0x1153d67800000000,
+    0x529870ff00000000, 0xf465465d00000000, 0xb7aee0da00000000,
+    0x33f57a8900000000, 0x703edc0e00000000, 0x3b424e2e00000000,
+    0x7889e8a900000000, 0xfcd272fa00000000, 0xbf19d47d00000000,
+    0x6a2a56bb00000000, 0x29e1f03c00000000, 0xadba6a6f00000000,
+    0xee71cce800000000, 0xa50d5ec800000000, 0xe6c6f84f00000000,
+    0x629d621c00000000, 0x2156c49b00000000, 0x89fc174a00000000,
+    0xca37b1cd00000000, 0x4e6c2b9e00000000, 0x0da78d1900000000,
+    0x46db1f3900000000, 0x0510b9be00000000, 0x814b23ed00000000,
+    0xc280856a00000000, 0x17b307ac00000000, 0x5478a12b00000000,
+    0xd0233b7800000000, 0x93e89dff00000000, 0xd8940fdf00000000,
+    0x9b5fa95800000000, 0x1f04330b00000000, 0x5ccf958c00000000,
+    0x0e57e57300000000, 0x4d9c43f400000000, 0xc9c7d9a700000000,
+    0x8a0c7f2000000000, 0xc170ed0000000000, 0x82bb4b8700000000,
+    0x06e0d1d400000000, 0x452b775300000000, 0x9018f59500000000,
+    0xd3d3531200000000, 0x5788c94100000000, 0x14436fc600000000,
+    0x5f3ffde600000000, 0x1cf45b6100000000, 0x98afc13200000000,
+    0xdb6467b500000000, 0x73ceb46400000000, 0x300512e300000000,
+    0xb45e88b000000000, 0xf7952e3700000000, 0xbce9bc1700000000,
+    0xff221a9000000000, 0x7b7980c300000000, 0x38b2264400000000,
+    0xed81a48200000000, 0xae4a020500000000, 0x2a11985600000000,
+    0x69da3ed100000000, 0x22a6acf100000000, 0x616d0a7600000000,
+    0xe536902500000000, 0xa6fd36a200000000, 0xe8cb8cba00000000,
+    0xab002a3d00000000, 0x2f5bb06e00000000, 0x6c9016e900000000,
+    0x27ec84c900000000, 0x6427224e00000000, 0xe07cb81d00000000,
+    0xa3b71e9a00000000, 0x76849c5c00000000, 0x354f3adb00000000,
+    0xb114a08800000000, 0xf2df060f00000000, 0xb9a3942f00000000,
+    0xfa6832a800000000, 0x7e33a8fb00000000, 0x3df80e7c00000000,
+    0x9552ddad00000000, 0xd6997b2a00000000, 0x52c2e17900000000,
+    0x110947fe00000000, 0x5a75d5de00000000, 0x19be735900000000,
+    0x9de5e90a00000000, 0xde2e4f8d00000000, 0x0b1dcd4b00000000,
+    0x48d66bcc00000000, 0xcc8df19f00000000, 0x8f46571800000000,
+    0xc43ac53800000000, 0x87f163bf00000000, 0x03aaf9ec00000000,
+    0x40615f6b00000000, 0x12f92f9400000000, 0x5132891300000000,
+    0xd569134000000000, 0x96a2b5c700000000, 0xddde27e700000000,
+    0x9e15816000000000, 0x1a4e1b3300000000, 0x5985bdb400000000,
+    0x8cb63f7200000000, 0xcf7d99f500000000, 0x4b2603a600000000,
+    0x08eda52100000000, 0x4391370100000000, 0x005a918600000000,
+    0x84010bd500000000, 0xc7caad5200000000, 0x6f607e8300000000,
+    0x2cabd80400000000, 0xa8f0425700000000, 0xeb3be4d000000000,
+    0xa04776f000000000, 0xe38cd07700000000, 0x67d74a2400000000,
+    0x241ceca300000000, 0xf12f6e6500000000, 0xb2e4c8e200000000,
+    0x36bf52b100000000, 0x7574f43600000000, 0x3e08661600000000,
+    0x7dc3c09100000000, 0xf9985ac200000000, 0xba53fc4500000000,
+    0x1caecae700000000, 0x5f656c6000000000, 0xdb3ef63300000000,
+    0x98f550b400000000, 0xd389c29400000000, 0x9042641300000000,
+    0x1419fe4000000000, 0x57d258c700000000, 0x82e1da0100000000,
+    0xc12a7c8600000000, 0x4571e6d500000000, 0x06ba405200000000,
+    0x4dc6d27200000000, 0x0e0d74f500000000, 0x8a56eea600000000,
+    0xc99d482100000000, 0x61379bf000000000, 0x22fc3d7700000000,
+    0xa6a7a72400000000, 0xe56c01a300000000, 0xae10938300000000,
+    0xeddb350400000000, 0x6980af5700000000, 0x2a4b09d000000000,
+    0xff788b1600000000, 0xbcb32d9100000000, 0x38e8b7c200000000,
+    0x7b23114500000000, 0x305f836500000000, 0x739425e200000000,
+    0xf7cfbfb100000000, 0xb404193600000000, 0xe69c69c900000000,
+    0xa557cf4e00000000, 0x210c551d00000000, 0x62c7f39a00000000,
+    0x29bb61ba00000000, 0x6a70c73d00000000, 0xee2b5d6e00000000,
+    0xade0fbe900000000, 0x78d3792f00000000, 0x3b18dfa800000000,
+    0xbf4345fb00000000, 0xfc88e37c00000000, 0xb7f4715c00000000,
+    0xf43fd7db00000000, 0x70644d8800000000, 0x33afeb0f00000000,
+    0x9b0538de00000000, 0xd8ce9e5900000000, 0x5c95040a00000000,
+    0x1f5ea28d00000000, 0x542230ad00000000, 0x17e9962a00000000,
+    0x93b20c7900000000, 0xd079aafe00000000, 0x054a283800000000,
+    0x46818ebf00000000, 0xc2da14ec00000000, 0x8111b26b00000000,
+    0xca6d204b00000000, 0x89a686cc00000000, 0x0dfd1c9f00000000,
+    0x4e36ba1800000000},
+   {0x0000000000000000, 0xe1b652ef00000000, 0x836bd40500000000,
+    0x62dd86ea00000000, 0x06d7a80b00000000, 0xe761fae400000000,
+    0x85bc7c0e00000000, 0x640a2ee100000000, 0x0cae511700000000,
+    0xed1803f800000000, 0x8fc5851200000000, 0x6e73d7fd00000000,
+    0x0a79f91c00000000, 0xebcfabf300000000, 0x89122d1900000000,
+    0x68a47ff600000000, 0x185ca32e00000000, 0xf9eaf1c100000000,
+    0x9b37772b00000000, 0x7a8125c400000000, 0x1e8b0b2500000000,
+    0xff3d59ca00000000, 0x9de0df2000000000, 0x7c568dcf00000000,
+    0x14f2f23900000000, 0xf544a0d600000000, 0x9799263c00000000,
+    0x762f74d300000000, 0x12255a3200000000, 0xf39308dd00000000,
+    0x914e8e3700000000, 0x70f8dcd800000000, 0x30b8465d00000000,
+    0xd10e14b200000000, 0xb3d3925800000000, 0x5265c0b700000000,
+    0x366fee5600000000, 0xd7d9bcb900000000, 0xb5043a5300000000,
+    0x54b268bc00000000, 0x3c16174a00000000, 0xdda045a500000000,
+    0xbf7dc34f00000000, 0x5ecb91a000000000, 0x3ac1bf4100000000,
+    0xdb77edae00000000, 0xb9aa6b4400000000, 0x581c39ab00000000,
+    0x28e4e57300000000, 0xc952b79c00000000, 0xab8f317600000000,
+    0x4a39639900000000, 0x2e334d7800000000, 0xcf851f9700000000,
+    0xad58997d00000000, 0x4ceecb9200000000, 0x244ab46400000000,
+    0xc5fce68b00000000, 0xa721606100000000, 0x4697328e00000000,
+    0x229d1c6f00000000, 0xc32b4e8000000000, 0xa1f6c86a00000000,
+    0x40409a8500000000, 0x60708dba00000000, 0x81c6df5500000000,
+    0xe31b59bf00000000, 0x02ad0b5000000000, 0x66a725b100000000,
+    0x8711775e00000000, 0xe5ccf1b400000000, 0x047aa35b00000000,
+    0x6cdedcad00000000, 0x8d688e4200000000, 0xefb508a800000000,
+    0x0e035a4700000000, 0x6a0974a600000000, 0x8bbf264900000000,
+    0xe962a0a300000000, 0x08d4f24c00000000, 0x782c2e9400000000,
+    0x999a7c7b00000000, 0xfb47fa9100000000, 0x1af1a87e00000000,
+    0x7efb869f00000000, 0x9f4dd47000000000, 0xfd90529a00000000,
+    0x1c26007500000000, 0x74827f8300000000, 0x95342d6c00000000,
+    0xf7e9ab8600000000, 0x165ff96900000000, 0x7255d78800000000,
+    0x93e3856700000000, 0xf13e038d00000000, 0x1088516200000000,
+    0x50c8cbe700000000, 0xb17e990800000000, 0xd3a31fe200000000,
+    0x32154d0d00000000, 0x561f63ec00000000, 0xb7a9310300000000,
+    0xd574b7e900000000, 0x34c2e50600000000, 0x5c669af000000000,
+    0xbdd0c81f00000000, 0xdf0d4ef500000000, 0x3ebb1c1a00000000,
+    0x5ab132fb00000000, 0xbb07601400000000, 0xd9dae6fe00000000,
+    0x386cb41100000000, 0x489468c900000000, 0xa9223a2600000000,
+    0xcbffbccc00000000, 0x2a49ee2300000000, 0x4e43c0c200000000,
+    0xaff5922d00000000, 0xcd2814c700000000, 0x2c9e462800000000,
+    0x443a39de00000000, 0xa58c6b3100000000, 0xc751eddb00000000,
+    0x26e7bf3400000000, 0x42ed91d500000000, 0xa35bc33a00000000,
+    0xc18645d000000000, 0x2030173f00000000, 0x81e66bae00000000,
+    0x6050394100000000, 0x028dbfab00000000, 0xe33bed4400000000,
+    0x8731c3a500000000, 0x6687914a00000000, 0x045a17a000000000,
+    0xe5ec454f00000000, 0x8d483ab900000000, 0x6cfe685600000000,
+    0x0e23eebc00000000, 0xef95bc5300000000, 0x8b9f92b200000000,
+    0x6a29c05d00000000, 0x08f446b700000000, 0xe942145800000000,
+    0x99bac88000000000, 0x780c9a6f00000000, 0x1ad11c8500000000,
+    0xfb674e6a00000000, 0x9f6d608b00000000, 0x7edb326400000000,
+    0x1c06b48e00000000, 0xfdb0e66100000000, 0x9514999700000000,
+    0x74a2cb7800000000, 0x167f4d9200000000, 0xf7c91f7d00000000,
+    0x93c3319c00000000, 0x7275637300000000, 0x10a8e59900000000,
+    0xf11eb77600000000, 0xb15e2df300000000, 0x50e87f1c00000000,
+    0x3235f9f600000000, 0xd383ab1900000000, 0xb78985f800000000,
+    0x563fd71700000000, 0x34e251fd00000000, 0xd554031200000000,
+    0xbdf07ce400000000, 0x5c462e0b00000000, 0x3e9ba8e100000000,
+    0xdf2dfa0e00000000, 0xbb27d4ef00000000, 0x5a91860000000000,
+    0x384c00ea00000000, 0xd9fa520500000000, 0xa9028edd00000000,
+    0x48b4dc3200000000, 0x2a695ad800000000, 0xcbdf083700000000,
+    0xafd526d600000000, 0x4e63743900000000, 0x2cbef2d300000000,
+    0xcd08a03c00000000, 0xa5acdfca00000000, 0x441a8d2500000000,
+    0x26c70bcf00000000, 0xc771592000000000, 0xa37b77c100000000,
+    0x42cd252e00000000, 0x2010a3c400000000, 0xc1a6f12b00000000,
+    0xe196e61400000000, 0x0020b4fb00000000, 0x62fd321100000000,
+    0x834b60fe00000000, 0xe7414e1f00000000, 0x06f71cf000000000,
+    0x642a9a1a00000000, 0x859cc8f500000000, 0xed38b70300000000,
+    0x0c8ee5ec00000000, 0x6e53630600000000, 0x8fe531e900000000,
+    0xebef1f0800000000, 0x0a594de700000000, 0x6884cb0d00000000,
+    0x893299e200000000, 0xf9ca453a00000000, 0x187c17d500000000,
+    0x7aa1913f00000000, 0x9b17c3d000000000, 0xff1ded3100000000,
+    0x1eabbfde00000000, 0x7c76393400000000, 0x9dc06bdb00000000,
+    0xf564142d00000000, 0x14d246c200000000, 0x760fc02800000000,
+    0x97b992c700000000, 0xf3b3bc2600000000, 0x1205eec900000000,
+    0x70d8682300000000, 0x916e3acc00000000, 0xd12ea04900000000,
+    0x3098f2a600000000, 0x5245744c00000000, 0xb3f326a300000000,
+    0xd7f9084200000000, 0x364f5aad00000000, 0x5492dc4700000000,
+    0xb5248ea800000000, 0xdd80f15e00000000, 0x3c36a3b100000000,
+    0x5eeb255b00000000, 0xbf5d77b400000000, 0xdb57595500000000,
+    0x3ae10bba00000000, 0x583c8d5000000000, 0xb98adfbf00000000,
+    0xc972036700000000, 0x28c4518800000000, 0x4a19d76200000000,
+    0xabaf858d00000000, 0xcfa5ab6c00000000, 0x2e13f98300000000,
+    0x4cce7f6900000000, 0xad782d8600000000, 0xc5dc527000000000,
+    0x246a009f00000000, 0x46b7867500000000, 0xa701d49a00000000,
+    0xc30bfa7b00000000, 0x22bda89400000000, 0x40602e7e00000000,
+    0xa1d67c9100000000},
+   {0x0000000000000000, 0x5880e2d700000000, 0xf106b47400000000,
+    0xa98656a300000000, 0xe20d68e900000000, 0xba8d8a3e00000000,
+    0x130bdc9d00000000, 0x4b8b3e4a00000000, 0x851da10900000000,
+    0xdd9d43de00000000, 0x741b157d00000000, 0x2c9bf7aa00000000,
+    0x6710c9e000000000, 0x3f902b3700000000, 0x96167d9400000000,
+    0xce969f4300000000, 0x0a3b421300000000, 0x52bba0c400000000,
+    0xfb3df66700000000, 0xa3bd14b000000000, 0xe8362afa00000000,
+    0xb0b6c82d00000000, 0x19309e8e00000000, 0x41b07c5900000000,
+    0x8f26e31a00000000, 0xd7a601cd00000000, 0x7e20576e00000000,
+    0x26a0b5b900000000, 0x6d2b8bf300000000, 0x35ab692400000000,
+    0x9c2d3f8700000000, 0xc4addd5000000000, 0x1476842600000000,
+    0x4cf666f100000000, 0xe570305200000000, 0xbdf0d28500000000,
+    0xf67beccf00000000, 0xaefb0e1800000000, 0x077d58bb00000000,
+    0x5ffdba6c00000000, 0x916b252f00000000, 0xc9ebc7f800000000,
+    0x606d915b00000000, 0x38ed738c00000000, 0x73664dc600000000,
+    0x2be6af1100000000, 0x8260f9b200000000, 0xdae01b6500000000,
+    0x1e4dc63500000000, 0x46cd24e200000000, 0xef4b724100000000,
+    0xb7cb909600000000, 0xfc40aedc00000000, 0xa4c04c0b00000000,
+    0x0d461aa800000000, 0x55c6f87f00000000, 0x9b50673c00000000,
+    0xc3d085eb00000000, 0x6a56d34800000000, 0x32d6319f00000000,
+    0x795d0fd500000000, 0x21dded0200000000, 0x885bbba100000000,
+    0xd0db597600000000, 0x28ec084d00000000, 0x706cea9a00000000,
+    0xd9eabc3900000000, 0x816a5eee00000000, 0xcae160a400000000,
+    0x9261827300000000, 0x3be7d4d000000000, 0x6367360700000000,
+    0xadf1a94400000000, 0xf5714b9300000000, 0x5cf71d3000000000,
+    0x0477ffe700000000, 0x4ffcc1ad00000000, 0x177c237a00000000,
+    0xbefa75d900000000, 0xe67a970e00000000, 0x22d74a5e00000000,
+    0x7a57a88900000000, 0xd3d1fe2a00000000, 0x8b511cfd00000000,
+    0xc0da22b700000000, 0x985ac06000000000, 0x31dc96c300000000,
+    0x695c741400000000, 0xa7caeb5700000000, 0xff4a098000000000,
+    0x56cc5f2300000000, 0x0e4cbdf400000000, 0x45c783be00000000,
+    0x1d47616900000000, 0xb4c137ca00000000, 0xec41d51d00000000,
+    0x3c9a8c6b00000000, 0x641a6ebc00000000, 0xcd9c381f00000000,
+    0x951cdac800000000, 0xde97e48200000000, 0x8617065500000000,
+    0x2f9150f600000000, 0x7711b22100000000, 0xb9872d6200000000,
+    0xe107cfb500000000, 0x4881991600000000, 0x10017bc100000000,
+    0x5b8a458b00000000, 0x030aa75c00000000, 0xaa8cf1ff00000000,
+    0xf20c132800000000, 0x36a1ce7800000000, 0x6e212caf00000000,
+    0xc7a77a0c00000000, 0x9f2798db00000000, 0xd4aca69100000000,
+    0x8c2c444600000000, 0x25aa12e500000000, 0x7d2af03200000000,
+    0xb3bc6f7100000000, 0xeb3c8da600000000, 0x42badb0500000000,
+    0x1a3a39d200000000, 0x51b1079800000000, 0x0931e54f00000000,
+    0xa0b7b3ec00000000, 0xf837513b00000000, 0x50d8119a00000000,
+    0x0858f34d00000000, 0xa1dea5ee00000000, 0xf95e473900000000,
+    0xb2d5797300000000, 0xea559ba400000000, 0x43d3cd0700000000,
+    0x1b532fd000000000, 0xd5c5b09300000000, 0x8d45524400000000,
+    0x24c304e700000000, 0x7c43e63000000000, 0x37c8d87a00000000,
+    0x6f483aad00000000, 0xc6ce6c0e00000000, 0x9e4e8ed900000000,
+    0x5ae3538900000000, 0x0263b15e00000000, 0xabe5e7fd00000000,
+    0xf365052a00000000, 0xb8ee3b6000000000, 0xe06ed9b700000000,
+    0x49e88f1400000000, 0x11686dc300000000, 0xdffef28000000000,
+    0x877e105700000000, 0x2ef846f400000000, 0x7678a42300000000,
+    0x3df39a6900000000, 0x657378be00000000, 0xccf52e1d00000000,
+    0x9475ccca00000000, 0x44ae95bc00000000, 0x1c2e776b00000000,
+    0xb5a821c800000000, 0xed28c31f00000000, 0xa6a3fd5500000000,
+    0xfe231f8200000000, 0x57a5492100000000, 0x0f25abf600000000,
+    0xc1b334b500000000, 0x9933d66200000000, 0x30b580c100000000,
+    0x6835621600000000, 0x23be5c5c00000000, 0x7b3ebe8b00000000,
+    0xd2b8e82800000000, 0x8a380aff00000000, 0x4e95d7af00000000,
+    0x1615357800000000, 0xbf9363db00000000, 0xe713810c00000000,
+    0xac98bf4600000000, 0xf4185d9100000000, 0x5d9e0b3200000000,
+    0x051ee9e500000000, 0xcb8876a600000000, 0x9308947100000000,
+    0x3a8ec2d200000000, 0x620e200500000000, 0x29851e4f00000000,
+    0x7105fc9800000000, 0xd883aa3b00000000, 0x800348ec00000000,
+    0x783419d700000000, 0x20b4fb0000000000, 0x8932ada300000000,
+    0xd1b24f7400000000, 0x9a39713e00000000, 0xc2b993e900000000,
+    0x6b3fc54a00000000, 0x33bf279d00000000, 0xfd29b8de00000000,
+    0xa5a95a0900000000, 0x0c2f0caa00000000, 0x54afee7d00000000,
+    0x1f24d03700000000, 0x47a432e000000000, 0xee22644300000000,
+    0xb6a2869400000000, 0x720f5bc400000000, 0x2a8fb91300000000,
+    0x8309efb000000000, 0xdb890d6700000000, 0x9002332d00000000,
+    0xc882d1fa00000000, 0x6104875900000000, 0x3984658e00000000,
+    0xf712facd00000000, 0xaf92181a00000000, 0x06144eb900000000,
+    0x5e94ac6e00000000, 0x151f922400000000, 0x4d9f70f300000000,
+    0xe419265000000000, 0xbc99c48700000000, 0x6c429df100000000,
+    0x34c27f2600000000, 0x9d44298500000000, 0xc5c4cb5200000000,
+    0x8e4ff51800000000, 0xd6cf17cf00000000, 0x7f49416c00000000,
+    0x27c9a3bb00000000, 0xe95f3cf800000000, 0xb1dfde2f00000000,
+    0x1859888c00000000, 0x40d96a5b00000000, 0x0b52541100000000,
+    0x53d2b6c600000000, 0xfa54e06500000000, 0xa2d402b200000000,
+    0x6679dfe200000000, 0x3ef93d3500000000, 0x977f6b9600000000,
+    0xcfff894100000000, 0x8474b70b00000000, 0xdcf455dc00000000,
+    0x7572037f00000000, 0x2df2e1a800000000, 0xe3647eeb00000000,
+    0xbbe49c3c00000000, 0x1262ca9f00000000, 0x4ae2284800000000,
+    0x0169160200000000, 0x59e9f4d500000000, 0xf06fa27600000000,
+    0xa8ef40a100000000},
+   {0x0000000000000000, 0x463b676500000000, 0x8c76ceca00000000,
+    0xca4da9af00000000, 0x59ebed4e00000000, 0x1fd08a2b00000000,
+    0xd59d238400000000, 0x93a644e100000000, 0xb2d6db9d00000000,
+    0xf4edbcf800000000, 0x3ea0155700000000, 0x789b723200000000,
+    0xeb3d36d300000000, 0xad0651b600000000, 0x674bf81900000000,
+    0x21709f7c00000000, 0x25abc6e000000000, 0x6390a18500000000,
+    0xa9dd082a00000000, 0xefe66f4f00000000, 0x7c402bae00000000,
+    0x3a7b4ccb00000000, 0xf036e56400000000, 0xb60d820100000000,
+    0x977d1d7d00000000, 0xd1467a1800000000, 0x1b0bd3b700000000,
+    0x5d30b4d200000000, 0xce96f03300000000, 0x88ad975600000000,
+    0x42e03ef900000000, 0x04db599c00000000, 0x0b50fc1a00000000,
+    0x4d6b9b7f00000000, 0x872632d000000000, 0xc11d55b500000000,
+    0x52bb115400000000, 0x1480763100000000, 0xdecddf9e00000000,
+    0x98f6b8fb00000000, 0xb986278700000000, 0xffbd40e200000000,
+    0x35f0e94d00000000, 0x73cb8e2800000000, 0xe06dcac900000000,
+    0xa656adac00000000, 0x6c1b040300000000, 0x2a20636600000000,
+    0x2efb3afa00000000, 0x68c05d9f00000000, 0xa28df43000000000,
+    0xe4b6935500000000, 0x7710d7b400000000, 0x312bb0d100000000,
+    0xfb66197e00000000, 0xbd5d7e1b00000000, 0x9c2de16700000000,
+    0xda16860200000000, 0x105b2fad00000000, 0x566048c800000000,
+    0xc5c60c2900000000, 0x83fd6b4c00000000, 0x49b0c2e300000000,
+    0x0f8ba58600000000, 0x16a0f83500000000, 0x509b9f5000000000,
+    0x9ad636ff00000000, 0xdced519a00000000, 0x4f4b157b00000000,
+    0x0970721e00000000, 0xc33ddbb100000000, 0x8506bcd400000000,
+    0xa47623a800000000, 0xe24d44cd00000000, 0x2800ed6200000000,
+    0x6e3b8a0700000000, 0xfd9dcee600000000, 0xbba6a98300000000,
+    0x71eb002c00000000, 0x37d0674900000000, 0x330b3ed500000000,
+    0x753059b000000000, 0xbf7df01f00000000, 0xf946977a00000000,
+    0x6ae0d39b00000000, 0x2cdbb4fe00000000, 0xe6961d5100000000,
+    0xa0ad7a3400000000, 0x81dde54800000000, 0xc7e6822d00000000,
+    0x0dab2b8200000000, 0x4b904ce700000000, 0xd836080600000000,
+    0x9e0d6f6300000000, 0x5440c6cc00000000, 0x127ba1a900000000,
+    0x1df0042f00000000, 0x5bcb634a00000000, 0x9186cae500000000,
+    0xd7bdad8000000000, 0x441be96100000000, 0x02208e0400000000,
+    0xc86d27ab00000000, 0x8e5640ce00000000, 0xaf26dfb200000000,
+    0xe91db8d700000000, 0x2350117800000000, 0x656b761d00000000,
+    0xf6cd32fc00000000, 0xb0f6559900000000, 0x7abbfc3600000000,
+    0x3c809b5300000000, 0x385bc2cf00000000, 0x7e60a5aa00000000,
+    0xb42d0c0500000000, 0xf2166b6000000000, 0x61b02f8100000000,
+    0x278b48e400000000, 0xedc6e14b00000000, 0xabfd862e00000000,
+    0x8a8d195200000000, 0xccb67e3700000000, 0x06fbd79800000000,
+    0x40c0b0fd00000000, 0xd366f41c00000000, 0x955d937900000000,
+    0x5f103ad600000000, 0x192b5db300000000, 0x2c40f16b00000000,
+    0x6a7b960e00000000, 0xa0363fa100000000, 0xe60d58c400000000,
+    0x75ab1c2500000000, 0x33907b4000000000, 0xf9ddd2ef00000000,
+    0xbfe6b58a00000000, 0x9e962af600000000, 0xd8ad4d9300000000,
+    0x12e0e43c00000000, 0x54db835900000000, 0xc77dc7b800000000,
+    0x8146a0dd00000000, 0x4b0b097200000000, 0x0d306e1700000000,
+    0x09eb378b00000000, 0x4fd050ee00000000, 0x859df94100000000,
+    0xc3a69e2400000000, 0x5000dac500000000, 0x163bbda000000000,
+    0xdc76140f00000000, 0x9a4d736a00000000, 0xbb3dec1600000000,
+    0xfd068b7300000000, 0x374b22dc00000000, 0x717045b900000000,
+    0xe2d6015800000000, 0xa4ed663d00000000, 0x6ea0cf9200000000,
+    0x289ba8f700000000, 0x27100d7100000000, 0x612b6a1400000000,
+    0xab66c3bb00000000, 0xed5da4de00000000, 0x7efbe03f00000000,
+    0x38c0875a00000000, 0xf28d2ef500000000, 0xb4b6499000000000,
+    0x95c6d6ec00000000, 0xd3fdb18900000000, 0x19b0182600000000,
+    0x5f8b7f4300000000, 0xcc2d3ba200000000, 0x8a165cc700000000,
+    0x405bf56800000000, 0x0660920d00000000, 0x02bbcb9100000000,
+    0x4480acf400000000, 0x8ecd055b00000000, 0xc8f6623e00000000,
+    0x5b5026df00000000, 0x1d6b41ba00000000, 0xd726e81500000000,
+    0x911d8f7000000000, 0xb06d100c00000000, 0xf656776900000000,
+    0x3c1bdec600000000, 0x7a20b9a300000000, 0xe986fd4200000000,
+    0xafbd9a2700000000, 0x65f0338800000000, 0x23cb54ed00000000,
+    0x3ae0095e00000000, 0x7cdb6e3b00000000, 0xb696c79400000000,
+    0xf0ada0f100000000, 0x630be41000000000, 0x2530837500000000,
+    0xef7d2ada00000000, 0xa9464dbf00000000, 0x8836d2c300000000,
+    0xce0db5a600000000, 0x04401c0900000000, 0x427b7b6c00000000,
+    0xd1dd3f8d00000000, 0x97e658e800000000, 0x5dabf14700000000,
+    0x1b90962200000000, 0x1f4bcfbe00000000, 0x5970a8db00000000,
+    0x933d017400000000, 0xd506661100000000, 0x46a022f000000000,
+    0x009b459500000000, 0xcad6ec3a00000000, 0x8ced8b5f00000000,
+    0xad9d142300000000, 0xeba6734600000000, 0x21ebdae900000000,
+    0x67d0bd8c00000000, 0xf476f96d00000000, 0xb24d9e0800000000,
+    0x780037a700000000, 0x3e3b50c200000000, 0x31b0f54400000000,
+    0x778b922100000000, 0xbdc63b8e00000000, 0xfbfd5ceb00000000,
+    0x685b180a00000000, 0x2e607f6f00000000, 0xe42dd6c000000000,
+    0xa216b1a500000000, 0x83662ed900000000, 0xc55d49bc00000000,
+    0x0f10e01300000000, 0x492b877600000000, 0xda8dc39700000000,
+    0x9cb6a4f200000000, 0x56fb0d5d00000000, 0x10c06a3800000000,
+    0x141b33a400000000, 0x522054c100000000, 0x986dfd6e00000000,
+    0xde569a0b00000000, 0x4df0deea00000000, 0x0bcbb98f00000000,
+    0xc186102000000000, 0x87bd774500000000, 0xa6cde83900000000,
+    0xe0f68f5c00000000, 0x2abb26f300000000, 0x6c80419600000000,
+    0xff26057700000000, 0xb91d621200000000, 0x7350cbbd00000000,
+    0x356bacd800000000},
+   {0x0000000000000000, 0x9e83da9f00000000, 0x7d01c4e400000000,
+    0xe3821e7b00000000, 0xbb04f91200000000, 0x2587238d00000000,
+    0xc6053df600000000, 0x5886e76900000000, 0x7609f22500000000,
+    0xe88a28ba00000000, 0x0b0836c100000000, 0x958bec5e00000000,
+    0xcd0d0b3700000000, 0x538ed1a800000000, 0xb00ccfd300000000,
+    0x2e8f154c00000000, 0xec12e44b00000000, 0x72913ed400000000,
+    0x911320af00000000, 0x0f90fa3000000000, 0x57161d5900000000,
+    0xc995c7c600000000, 0x2a17d9bd00000000, 0xb494032200000000,
+    0x9a1b166e00000000, 0x0498ccf100000000, 0xe71ad28a00000000,
+    0x7999081500000000, 0x211fef7c00000000, 0xbf9c35e300000000,
+    0x5c1e2b9800000000, 0xc29df10700000000, 0xd825c89700000000,
+    0x46a6120800000000, 0xa5240c7300000000, 0x3ba7d6ec00000000,
+    0x6321318500000000, 0xfda2eb1a00000000, 0x1e20f56100000000,
+    0x80a32ffe00000000, 0xae2c3ab200000000, 0x30afe02d00000000,
+    0xd32dfe5600000000, 0x4dae24c900000000, 0x1528c3a000000000,
+    0x8bab193f00000000, 0x6829074400000000, 0xf6aadddb00000000,
+    0x34372cdc00000000, 0xaab4f64300000000, 0x4936e83800000000,
+    0xd7b532a700000000, 0x8f33d5ce00000000, 0x11b00f5100000000,
+    0xf232112a00000000, 0x6cb1cbb500000000, 0x423edef900000000,
+    0xdcbd046600000000, 0x3f3f1a1d00000000, 0xa1bcc08200000000,
+    0xf93a27eb00000000, 0x67b9fd7400000000, 0x843be30f00000000,
+    0x1ab8399000000000, 0xf14de1f400000000, 0x6fce3b6b00000000,
+    0x8c4c251000000000, 0x12cfff8f00000000, 0x4a4918e600000000,
+    0xd4cac27900000000, 0x3748dc0200000000, 0xa9cb069d00000000,
+    0x874413d100000000, 0x19c7c94e00000000, 0xfa45d73500000000,
+    0x64c60daa00000000, 0x3c40eac300000000, 0xa2c3305c00000000,
+    0x41412e2700000000, 0xdfc2f4b800000000, 0x1d5f05bf00000000,
+    0x83dcdf2000000000, 0x605ec15b00000000, 0xfedd1bc400000000,
+    0xa65bfcad00000000, 0x38d8263200000000, 0xdb5a384900000000,
+    0x45d9e2d600000000, 0x6b56f79a00000000, 0xf5d52d0500000000,
+    0x1657337e00000000, 0x88d4e9e100000000, 0xd0520e8800000000,
+    0x4ed1d41700000000, 0xad53ca6c00000000, 0x33d010f300000000,
+    0x2968296300000000, 0xb7ebf3fc00000000, 0x5469ed8700000000,
+    0xcaea371800000000, 0x926cd07100000000, 0x0cef0aee00000000,
+    0xef6d149500000000, 0x71eece0a00000000, 0x5f61db4600000000,
+    0xc1e201d900000000, 0x22601fa200000000, 0xbce3c53d00000000,
+    0xe465225400000000, 0x7ae6f8cb00000000, 0x9964e6b000000000,
+    0x07e73c2f00000000, 0xc57acd2800000000, 0x5bf917b700000000,
+    0xb87b09cc00000000, 0x26f8d35300000000, 0x7e7e343a00000000,
+    0xe0fdeea500000000, 0x037ff0de00000000, 0x9dfc2a4100000000,
+    0xb3733f0d00000000, 0x2df0e59200000000, 0xce72fbe900000000,
+    0x50f1217600000000, 0x0877c61f00000000, 0x96f41c8000000000,
+    0x757602fb00000000, 0xebf5d86400000000, 0xa39db33200000000,
+    0x3d1e69ad00000000, 0xde9c77d600000000, 0x401fad4900000000,
+    0x18994a2000000000, 0x861a90bf00000000, 0x65988ec400000000,
+    0xfb1b545b00000000, 0xd594411700000000, 0x4b179b8800000000,
+    0xa89585f300000000, 0x36165f6c00000000, 0x6e90b80500000000,
+    0xf013629a00000000, 0x13917ce100000000, 0x8d12a67e00000000,
+    0x4f8f577900000000, 0xd10c8de600000000, 0x328e939d00000000,
+    0xac0d490200000000, 0xf48bae6b00000000, 0x6a0874f400000000,
+    0x898a6a8f00000000, 0x1709b01000000000, 0x3986a55c00000000,
+    0xa7057fc300000000, 0x448761b800000000, 0xda04bb2700000000,
+    0x82825c4e00000000, 0x1c0186d100000000, 0xff8398aa00000000,
+    0x6100423500000000, 0x7bb87ba500000000, 0xe53ba13a00000000,
+    0x06b9bf4100000000, 0x983a65de00000000, 0xc0bc82b700000000,
+    0x5e3f582800000000, 0xbdbd465300000000, 0x233e9ccc00000000,
+    0x0db1898000000000, 0x9332531f00000000, 0x70b04d6400000000,
+    0xee3397fb00000000, 0xb6b5709200000000, 0x2836aa0d00000000,
+    0xcbb4b47600000000, 0x55376ee900000000, 0x97aa9fee00000000,
+    0x0929457100000000, 0xeaab5b0a00000000, 0x7428819500000000,
+    0x2cae66fc00000000, 0xb22dbc6300000000, 0x51afa21800000000,
+    0xcf2c788700000000, 0xe1a36dcb00000000, 0x7f20b75400000000,
+    0x9ca2a92f00000000, 0x022173b000000000, 0x5aa794d900000000,
+    0xc4244e4600000000, 0x27a6503d00000000, 0xb9258aa200000000,
+    0x52d052c600000000, 0xcc53885900000000, 0x2fd1962200000000,
+    0xb1524cbd00000000, 0xe9d4abd400000000, 0x7757714b00000000,
+    0x94d56f3000000000, 0x0a56b5af00000000, 0x24d9a0e300000000,
+    0xba5a7a7c00000000, 0x59d8640700000000, 0xc75bbe9800000000,
+    0x9fdd59f100000000, 0x015e836e00000000, 0xe2dc9d1500000000,
+    0x7c5f478a00000000, 0xbec2b68d00000000, 0x20416c1200000000,
+    0xc3c3726900000000, 0x5d40a8f600000000, 0x05c64f9f00000000,
+    0x9b45950000000000, 0x78c78b7b00000000, 0xe64451e400000000,
+    0xc8cb44a800000000, 0x56489e3700000000, 0xb5ca804c00000000,
+    0x2b495ad300000000, 0x73cfbdba00000000, 0xed4c672500000000,
+    0x0ece795e00000000, 0x904da3c100000000, 0x8af59a5100000000,
+    0x147640ce00000000, 0xf7f45eb500000000, 0x6977842a00000000,
+    0x31f1634300000000, 0xaf72b9dc00000000, 0x4cf0a7a700000000,
+    0xd2737d3800000000, 0xfcfc687400000000, 0x627fb2eb00000000,
+    0x81fdac9000000000, 0x1f7e760f00000000, 0x47f8916600000000,
+    0xd97b4bf900000000, 0x3af9558200000000, 0xa47a8f1d00000000,
+    0x66e77e1a00000000, 0xf864a48500000000, 0x1be6bafe00000000,
+    0x8565606100000000, 0xdde3870800000000, 0x43605d9700000000,
+    0xa0e243ec00000000, 0x3e61997300000000, 0x10ee8c3f00000000,
+    0x8e6d56a000000000, 0x6def48db00000000, 0xf36c924400000000,
+    0xabea752d00000000, 0x3569afb200000000, 0xd6ebb1c900000000,
+    0x48686b5600000000},
+   {0x0000000000000000, 0xc064281700000000, 0x80c9502e00000000,
+    0x40ad783900000000, 0x0093a15c00000000, 0xc0f7894b00000000,
+    0x805af17200000000, 0x403ed96500000000, 0x002643b900000000,
+    0xc0426bae00000000, 0x80ef139700000000, 0x408b3b8000000000,
+    0x00b5e2e500000000, 0xc0d1caf200000000, 0x807cb2cb00000000,
+    0x40189adc00000000, 0x414af7a900000000, 0x812edfbe00000000,
+    0xc183a78700000000, 0x01e78f9000000000, 0x41d956f500000000,
+    0x81bd7ee200000000, 0xc11006db00000000, 0x01742ecc00000000,
+    0x416cb41000000000, 0x81089c0700000000, 0xc1a5e43e00000000,
+    0x01c1cc2900000000, 0x41ff154c00000000, 0x819b3d5b00000000,
+    0xc136456200000000, 0x01526d7500000000, 0xc3929f8800000000,
+    0x03f6b79f00000000, 0x435bcfa600000000, 0x833fe7b100000000,
+    0xc3013ed400000000, 0x036516c300000000, 0x43c86efa00000000,
+    0x83ac46ed00000000, 0xc3b4dc3100000000, 0x03d0f42600000000,
+    0x437d8c1f00000000, 0x8319a40800000000, 0xc3277d6d00000000,
+    0x0343557a00000000, 0x43ee2d4300000000, 0x838a055400000000,
+    0x82d8682100000000, 0x42bc403600000000, 0x0211380f00000000,
+    0xc275101800000000, 0x824bc97d00000000, 0x422fe16a00000000,
+    0x0282995300000000, 0xc2e6b14400000000, 0x82fe2b9800000000,
+    0x429a038f00000000, 0x02377bb600000000, 0xc25353a100000000,
+    0x826d8ac400000000, 0x4209a2d300000000, 0x02a4daea00000000,
+    0xc2c0f2fd00000000, 0xc7234eca00000000, 0x074766dd00000000,
+    0x47ea1ee400000000, 0x878e36f300000000, 0xc7b0ef9600000000,
+    0x07d4c78100000000, 0x4779bfb800000000, 0x871d97af00000000,
+    0xc7050d7300000000, 0x0761256400000000, 0x47cc5d5d00000000,
+    0x87a8754a00000000, 0xc796ac2f00000000, 0x07f2843800000000,
+    0x475ffc0100000000, 0x873bd41600000000, 0x8669b96300000000,
+    0x460d917400000000, 0x06a0e94d00000000, 0xc6c4c15a00000000,
+    0x86fa183f00000000, 0x469e302800000000, 0x0633481100000000,
+    0xc657600600000000, 0x864ffada00000000, 0x462bd2cd00000000,
+    0x0686aaf400000000, 0xc6e282e300000000, 0x86dc5b8600000000,
+    0x46b8739100000000, 0x06150ba800000000, 0xc67123bf00000000,
+    0x04b1d14200000000, 0xc4d5f95500000000, 0x8478816c00000000,
+    0x441ca97b00000000, 0x0422701e00000000, 0xc446580900000000,
+    0x84eb203000000000, 0x448f082700000000, 0x049792fb00000000,
+    0xc4f3baec00000000, 0x845ec2d500000000, 0x443aeac200000000,
+    0x040433a700000000, 0xc4601bb000000000, 0x84cd638900000000,
+    0x44a94b9e00000000, 0x45fb26eb00000000, 0x859f0efc00000000,
+    0xc53276c500000000, 0x05565ed200000000, 0x456887b700000000,
+    0x850cafa000000000, 0xc5a1d79900000000, 0x05c5ff8e00000000,
+    0x45dd655200000000, 0x85b94d4500000000, 0xc514357c00000000,
+    0x05701d6b00000000, 0x454ec40e00000000, 0x852aec1900000000,
+    0xc587942000000000, 0x05e3bc3700000000, 0xcf41ed4f00000000,
+    0x0f25c55800000000, 0x4f88bd6100000000, 0x8fec957600000000,
+    0xcfd24c1300000000, 0x0fb6640400000000, 0x4f1b1c3d00000000,
+    0x8f7f342a00000000, 0xcf67aef600000000, 0x0f0386e100000000,
+    0x4faefed800000000, 0x8fcad6cf00000000, 0xcff40faa00000000,
+    0x0f9027bd00000000, 0x4f3d5f8400000000, 0x8f59779300000000,
+    0x8e0b1ae600000000, 0x4e6f32f100000000, 0x0ec24ac800000000,
+    0xcea662df00000000, 0x8e98bbba00000000, 0x4efc93ad00000000,
+    0x0e51eb9400000000, 0xce35c38300000000, 0x8e2d595f00000000,
+    0x4e49714800000000, 0x0ee4097100000000, 0xce80216600000000,
+    0x8ebef80300000000, 0x4edad01400000000, 0x0e77a82d00000000,
+    0xce13803a00000000, 0x0cd372c700000000, 0xccb75ad000000000,
+    0x8c1a22e900000000, 0x4c7e0afe00000000, 0x0c40d39b00000000,
+    0xcc24fb8c00000000, 0x8c8983b500000000, 0x4cedaba200000000,
+    0x0cf5317e00000000, 0xcc91196900000000, 0x8c3c615000000000,
+    0x4c58494700000000, 0x0c66902200000000, 0xcc02b83500000000,
+    0x8cafc00c00000000, 0x4ccbe81b00000000, 0x4d99856e00000000,
+    0x8dfdad7900000000, 0xcd50d54000000000, 0x0d34fd5700000000,
+    0x4d0a243200000000, 0x8d6e0c2500000000, 0xcdc3741c00000000,
+    0x0da75c0b00000000, 0x4dbfc6d700000000, 0x8ddbeec000000000,
+    0xcd7696f900000000, 0x0d12beee00000000, 0x4d2c678b00000000,
+    0x8d484f9c00000000, 0xcde537a500000000, 0x0d811fb200000000,
+    0x0862a38500000000, 0xc8068b9200000000, 0x88abf3ab00000000,
+    0x48cfdbbc00000000, 0x08f102d900000000, 0xc8952ace00000000,
+    0x883852f700000000, 0x485c7ae000000000, 0x0844e03c00000000,
+    0xc820c82b00000000, 0x888db01200000000, 0x48e9980500000000,
+    0x08d7416000000000, 0xc8b3697700000000, 0x881e114e00000000,
+    0x487a395900000000, 0x4928542c00000000, 0x894c7c3b00000000,
+    0xc9e1040200000000, 0x09852c1500000000, 0x49bbf57000000000,
+    0x89dfdd6700000000, 0xc972a55e00000000, 0x09168d4900000000,
+    0x490e179500000000, 0x896a3f8200000000, 0xc9c747bb00000000,
+    0x09a36fac00000000, 0x499db6c900000000, 0x89f99ede00000000,
+    0xc954e6e700000000, 0x0930cef000000000, 0xcbf03c0d00000000,
+    0x0b94141a00000000, 0x4b396c2300000000, 0x8b5d443400000000,
+    0xcb639d5100000000, 0x0b07b54600000000, 0x4baacd7f00000000,
+    0x8bcee56800000000, 0xcbd67fb400000000, 0x0bb257a300000000,
+    0x4b1f2f9a00000000, 0x8b7b078d00000000, 0xcb45dee800000000,
+    0x0b21f6ff00000000, 0x4b8c8ec600000000, 0x8be8a6d100000000,
+    0x8abacba400000000, 0x4adee3b300000000, 0x0a739b8a00000000,
+    0xca17b39d00000000, 0x8a296af800000000, 0x4a4d42ef00000000,
+    0x0ae03ad600000000, 0xca8412c100000000, 0x8a9c881d00000000,
+    0x4af8a00a00000000, 0x0a55d83300000000, 0xca31f02400000000,
+    0x8a0f294100000000, 0x4a6b015600000000, 0x0ac6796f00000000,
+    0xcaa2517800000000},
+   {0x0000000000000000, 0xd4ea739b00000000, 0xe9d396ed00000000,
+    0x3d39e57600000000, 0x93a15c0000000000, 0x474b2f9b00000000,
+    0x7a72caed00000000, 0xae98b97600000000, 0x2643b90000000000,
+    0xf2a9ca9b00000000, 0xcf902fed00000000, 0x1b7a5c7600000000,
+    0xb5e2e50000000000, 0x6108969b00000000, 0x5c3173ed00000000,
+    0x88db007600000000, 0x4c86720100000000, 0x986c019a00000000,
+    0xa555e4ec00000000, 0x71bf977700000000, 0xdf272e0100000000,
+    0x0bcd5d9a00000000, 0x36f4b8ec00000000, 0xe21ecb7700000000,
+    0x6ac5cb0100000000, 0xbe2fb89a00000000, 0x83165dec00000000,
+    0x57fc2e7700000000, 0xf964970100000000, 0x2d8ee49a00000000,
+    0x10b701ec00000000, 0xc45d727700000000, 0x980ce50200000000,
+    0x4ce6969900000000, 0x71df73ef00000000, 0xa535007400000000,
+    0x0badb90200000000, 0xdf47ca9900000000, 0xe27e2fef00000000,
+    0x36945c7400000000, 0xbe4f5c0200000000, 0x6aa52f9900000000,
+    0x579ccaef00000000, 0x8376b97400000000, 0x2dee000200000000,
+    0xf904739900000000, 0xc43d96ef00000000, 0x10d7e57400000000,
+    0xd48a970300000000, 0x0060e49800000000, 0x3d5901ee00000000,
+    0xe9b3727500000000, 0x472bcb0300000000, 0x93c1b89800000000,
+    0xaef85dee00000000, 0x7a122e7500000000, 0xf2c92e0300000000,
+    0x26235d9800000000, 0x1b1ab8ee00000000, 0xcff0cb7500000000,
+    0x6168720300000000, 0xb582019800000000, 0x88bbe4ee00000000,
+    0x5c51977500000000, 0x3019ca0500000000, 0xe4f3b99e00000000,
+    0xd9ca5ce800000000, 0x0d202f7300000000, 0xa3b8960500000000,
+    0x7752e59e00000000, 0x4a6b00e800000000, 0x9e81737300000000,
+    0x165a730500000000, 0xc2b0009e00000000, 0xff89e5e800000000,
+    0x2b63967300000000, 0x85fb2f0500000000, 0x51115c9e00000000,
+    0x6c28b9e800000000, 0xb8c2ca7300000000, 0x7c9fb80400000000,
+    0xa875cb9f00000000, 0x954c2ee900000000, 0x41a65d7200000000,
+    0xef3ee40400000000, 0x3bd4979f00000000, 0x06ed72e900000000,
+    0xd207017200000000, 0x5adc010400000000, 0x8e36729f00000000,
+    0xb30f97e900000000, 0x67e5e47200000000, 0xc97d5d0400000000,
+    0x1d972e9f00000000, 0x20aecbe900000000, 0xf444b87200000000,
+    0xa8152f0700000000, 0x7cff5c9c00000000, 0x41c6b9ea00000000,
+    0x952cca7100000000, 0x3bb4730700000000, 0xef5e009c00000000,
+    0xd267e5ea00000000, 0x068d967100000000, 0x8e56960700000000,
+    0x5abce59c00000000, 0x678500ea00000000, 0xb36f737100000000,
+    0x1df7ca0700000000, 0xc91db99c00000000, 0xf4245cea00000000,
+    0x20ce2f7100000000, 0xe4935d0600000000, 0x30792e9d00000000,
+    0x0d40cbeb00000000, 0xd9aab87000000000, 0x7732010600000000,
+    0xa3d8729d00000000, 0x9ee197eb00000000, 0x4a0be47000000000,
+    0xc2d0e40600000000, 0x163a979d00000000, 0x2b0372eb00000000,
+    0xffe9017000000000, 0x5171b80600000000, 0x859bcb9d00000000,
+    0xb8a22eeb00000000, 0x6c485d7000000000, 0x6032940b00000000,
+    0xb4d8e79000000000, 0x89e102e600000000, 0x5d0b717d00000000,
+    0xf393c80b00000000, 0x2779bb9000000000, 0x1a405ee600000000,
+    0xceaa2d7d00000000, 0x46712d0b00000000, 0x929b5e9000000000,
+    0xafa2bbe600000000, 0x7b48c87d00000000, 0xd5d0710b00000000,
+    0x013a029000000000, 0x3c03e7e600000000, 0xe8e9947d00000000,
+    0x2cb4e60a00000000, 0xf85e959100000000, 0xc56770e700000000,
+    0x118d037c00000000, 0xbf15ba0a00000000, 0x6bffc99100000000,
+    0x56c62ce700000000, 0x822c5f7c00000000, 0x0af75f0a00000000,
+    0xde1d2c9100000000, 0xe324c9e700000000, 0x37ceba7c00000000,
+    0x9956030a00000000, 0x4dbc709100000000, 0x708595e700000000,
+    0xa46fe67c00000000, 0xf83e710900000000, 0x2cd4029200000000,
+    0x11ede7e400000000, 0xc507947f00000000, 0x6b9f2d0900000000,
+    0xbf755e9200000000, 0x824cbbe400000000, 0x56a6c87f00000000,
+    0xde7dc80900000000, 0x0a97bb9200000000, 0x37ae5ee400000000,
+    0xe3442d7f00000000, 0x4ddc940900000000, 0x9936e79200000000,
+    0xa40f02e400000000, 0x70e5717f00000000, 0xb4b8030800000000,
+    0x6052709300000000, 0x5d6b95e500000000, 0x8981e67e00000000,
+    0x27195f0800000000, 0xf3f32c9300000000, 0xcecac9e500000000,
+    0x1a20ba7e00000000, 0x92fbba0800000000, 0x4611c99300000000,
+    0x7b282ce500000000, 0xafc25f7e00000000, 0x015ae60800000000,
+    0xd5b0959300000000, 0xe88970e500000000, 0x3c63037e00000000,
+    0x502b5e0e00000000, 0x84c12d9500000000, 0xb9f8c8e300000000,
+    0x6d12bb7800000000, 0xc38a020e00000000, 0x1760719500000000,
+    0x2a5994e300000000, 0xfeb3e77800000000, 0x7668e70e00000000,
+    0xa282949500000000, 0x9fbb71e300000000, 0x4b51027800000000,
+    0xe5c9bb0e00000000, 0x3123c89500000000, 0x0c1a2de300000000,
+    0xd8f05e7800000000, 0x1cad2c0f00000000, 0xc8475f9400000000,
+    0xf57ebae200000000, 0x2194c97900000000, 0x8f0c700f00000000,
+    0x5be6039400000000, 0x66dfe6e200000000, 0xb235957900000000,
+    0x3aee950f00000000, 0xee04e69400000000, 0xd33d03e200000000,
+    0x07d7707900000000, 0xa94fc90f00000000, 0x7da5ba9400000000,
+    0x409c5fe200000000, 0x94762c7900000000, 0xc827bb0c00000000,
+    0x1ccdc89700000000, 0x21f42de100000000, 0xf51e5e7a00000000,
+    0x5b86e70c00000000, 0x8f6c949700000000, 0xb25571e100000000,
+    0x66bf027a00000000, 0xee64020c00000000, 0x3a8e719700000000,
+    0x07b794e100000000, 0xd35de77a00000000, 0x7dc55e0c00000000,
+    0xa92f2d9700000000, 0x9416c8e100000000, 0x40fcbb7a00000000,
+    0x84a1c90d00000000, 0x504bba9600000000, 0x6d725fe000000000,
+    0xb9982c7b00000000, 0x1700950d00000000, 0xc3eae69600000000,
+    0xfed303e000000000, 0x2a39707b00000000, 0xa2e2700d00000000,
+    0x7608039600000000, 0x4b31e6e000000000, 0x9fdb957b00000000,
+    0x31432c0d00000000, 0xe5a95f9600000000, 0xd890bae000000000,
+    0x0c7ac97b00000000},
+   {0x0000000000000000, 0x2765258100000000, 0x0fcc3bd900000000,
+    0x28a91e5800000000, 0x5f9e066900000000, 0x78fb23e800000000,
+    0x50523db000000000, 0x7737183100000000, 0xbe3c0dd200000000,
+    0x9959285300000000, 0xb1f0360b00000000, 0x9695138a00000000,
+    0xe1a20bbb00000000, 0xc6c72e3a00000000, 0xee6e306200000000,
+    0xc90b15e300000000, 0x3d7f6b7f00000000, 0x1a1a4efe00000000,
+    0x32b350a600000000, 0x15d6752700000000, 0x62e16d1600000000,
+    0x4584489700000000, 0x6d2d56cf00000000, 0x4a48734e00000000,
+    0x834366ad00000000, 0xa426432c00000000, 0x8c8f5d7400000000,
+    0xabea78f500000000, 0xdcdd60c400000000, 0xfbb8454500000000,
+    0xd3115b1d00000000, 0xf4747e9c00000000, 0x7afed6fe00000000,
+    0x5d9bf37f00000000, 0x7532ed2700000000, 0x5257c8a600000000,
+    0x2560d09700000000, 0x0205f51600000000, 0x2aaceb4e00000000,
+    0x0dc9cecf00000000, 0xc4c2db2c00000000, 0xe3a7fead00000000,
+    0xcb0ee0f500000000, 0xec6bc57400000000, 0x9b5cdd4500000000,
+    0xbc39f8c400000000, 0x9490e69c00000000, 0xb3f5c31d00000000,
+    0x4781bd8100000000, 0x60e4980000000000, 0x484d865800000000,
+    0x6f28a3d900000000, 0x181fbbe800000000, 0x3f7a9e6900000000,
+    0x17d3803100000000, 0x30b6a5b000000000, 0xf9bdb05300000000,
+    0xded895d200000000, 0xf6718b8a00000000, 0xd114ae0b00000000,
+    0xa623b63a00000000, 0x814693bb00000000, 0xa9ef8de300000000,
+    0x8e8aa86200000000, 0xb5fadc2600000000, 0x929ff9a700000000,
+    0xba36e7ff00000000, 0x9d53c27e00000000, 0xea64da4f00000000,
+    0xcd01ffce00000000, 0xe5a8e19600000000, 0xc2cdc41700000000,
+    0x0bc6d1f400000000, 0x2ca3f47500000000, 0x040aea2d00000000,
+    0x236fcfac00000000, 0x5458d79d00000000, 0x733df21c00000000,
+    0x5b94ec4400000000, 0x7cf1c9c500000000, 0x8885b75900000000,
+    0xafe092d800000000, 0x87498c8000000000, 0xa02ca90100000000,
+    0xd71bb13000000000, 0xf07e94b100000000, 0xd8d78ae900000000,
+    0xffb2af6800000000, 0x36b9ba8b00000000, 0x11dc9f0a00000000,
+    0x3975815200000000, 0x1e10a4d300000000, 0x6927bce200000000,
+    0x4e42996300000000, 0x66eb873b00000000, 0x418ea2ba00000000,
+    0xcf040ad800000000, 0xe8612f5900000000, 0xc0c8310100000000,
+    0xe7ad148000000000, 0x909a0cb100000000, 0xb7ff293000000000,
+    0x9f56376800000000, 0xb83312e900000000, 0x7138070a00000000,
+    0x565d228b00000000, 0x7ef43cd300000000, 0x5991195200000000,
+    0x2ea6016300000000, 0x09c324e200000000, 0x216a3aba00000000,
+    0x060f1f3b00000000, 0xf27b61a700000000, 0xd51e442600000000,
+    0xfdb75a7e00000000, 0xdad27fff00000000, 0xade567ce00000000,
+    0x8a80424f00000000, 0xa2295c1700000000, 0x854c799600000000,
+    0x4c476c7500000000, 0x6b2249f400000000, 0x438b57ac00000000,
+    0x64ee722d00000000, 0x13d96a1c00000000, 0x34bc4f9d00000000,
+    0x1c1551c500000000, 0x3b70744400000000, 0x6af5b94d00000000,
+    0x4d909ccc00000000, 0x6539829400000000, 0x425ca71500000000,
+    0x356bbf2400000000, 0x120e9aa500000000, 0x3aa784fd00000000,
+    0x1dc2a17c00000000, 0xd4c9b49f00000000, 0xf3ac911e00000000,
+    0xdb058f4600000000, 0xfc60aac700000000, 0x8b57b2f600000000,
+    0xac32977700000000, 0x849b892f00000000, 0xa3feacae00000000,
+    0x578ad23200000000, 0x70eff7b300000000, 0x5846e9eb00000000,
+    0x7f23cc6a00000000, 0x0814d45b00000000, 0x2f71f1da00000000,
+    0x07d8ef8200000000, 0x20bdca0300000000, 0xe9b6dfe000000000,
+    0xced3fa6100000000, 0xe67ae43900000000, 0xc11fc1b800000000,
+    0xb628d98900000000, 0x914dfc0800000000, 0xb9e4e25000000000,
+    0x9e81c7d100000000, 0x100b6fb300000000, 0x376e4a3200000000,
+    0x1fc7546a00000000, 0x38a271eb00000000, 0x4f9569da00000000,
+    0x68f04c5b00000000, 0x4059520300000000, 0x673c778200000000,
+    0xae37626100000000, 0x895247e000000000, 0xa1fb59b800000000,
+    0x869e7c3900000000, 0xf1a9640800000000, 0xd6cc418900000000,
+    0xfe655fd100000000, 0xd9007a5000000000, 0x2d7404cc00000000,
+    0x0a11214d00000000, 0x22b83f1500000000, 0x05dd1a9400000000,
+    0x72ea02a500000000, 0x558f272400000000, 0x7d26397c00000000,
+    0x5a431cfd00000000, 0x9348091e00000000, 0xb42d2c9f00000000,
+    0x9c8432c700000000, 0xbbe1174600000000, 0xccd60f7700000000,
+    0xebb32af600000000, 0xc31a34ae00000000, 0xe47f112f00000000,
+    0xdf0f656b00000000, 0xf86a40ea00000000, 0xd0c35eb200000000,
+    0xf7a67b3300000000, 0x8091630200000000, 0xa7f4468300000000,
+    0x8f5d58db00000000, 0xa8387d5a00000000, 0x613368b900000000,
+    0x46564d3800000000, 0x6eff536000000000, 0x499a76e100000000,
+    0x3ead6ed000000000, 0x19c84b5100000000, 0x3161550900000000,
+    0x1604708800000000, 0xe2700e1400000000, 0xc5152b9500000000,
+    0xedbc35cd00000000, 0xcad9104c00000000, 0xbdee087d00000000,
+    0x9a8b2dfc00000000, 0xb22233a400000000, 0x9547162500000000,
+    0x5c4c03c600000000, 0x7b29264700000000, 0x5380381f00000000,
+    0x74e51d9e00000000, 0x03d205af00000000, 0x24b7202e00000000,
+    0x0c1e3e7600000000, 0x2b7b1bf700000000, 0xa5f1b39500000000,
+    0x8294961400000000, 0xaa3d884c00000000, 0x8d58adcd00000000,
+    0xfa6fb5fc00000000, 0xdd0a907d00000000, 0xf5a38e2500000000,
+    0xd2c6aba400000000, 0x1bcdbe4700000000, 0x3ca89bc600000000,
+    0x1401859e00000000, 0x3364a01f00000000, 0x4453b82e00000000,
+    0x63369daf00000000, 0x4b9f83f700000000, 0x6cfaa67600000000,
+    0x988ed8ea00000000, 0xbfebfd6b00000000, 0x9742e33300000000,
+    0xb027c6b200000000, 0xc710de8300000000, 0xe075fb0200000000,
+    0xc8dce55a00000000, 0xefb9c0db00000000, 0x26b2d53800000000,
+    0x01d7f0b900000000, 0x297eeee100000000, 0x0e1bcb6000000000,
+    0x792cd35100000000, 0x5e49f6d000000000, 0x76e0e88800000000,
+    0x5185cd0900000000}};
+
+#else /* W == 4 */
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0x9ba54c6f, 0xec3b9e9f, 0x779ed2f0, 0x03063b7f,
+    0x98a37710, 0xef3da5e0, 0x7498e98f, 0x060c76fe, 0x9da93a91,
+    0xea37e861, 0x7192a40e, 0x050a4d81, 0x9eaf01ee, 0xe931d31e,
+    0x72949f71, 0x0c18edfc, 0x97bda193, 0xe0237363, 0x7b863f0c,
+    0x0f1ed683, 0x94bb9aec, 0xe325481c, 0x78800473, 0x0a149b02,
+    0x91b1d76d, 0xe62f059d, 0x7d8a49f2, 0x0912a07d, 0x92b7ec12,
+    0xe5293ee2, 0x7e8c728d, 0x1831dbf8, 0x83949797, 0xf40a4567,
+    0x6faf0908, 0x1b37e087, 0x8092ace8, 0xf70c7e18, 0x6ca93277,
+    0x1e3dad06, 0x8598e169, 0xf2063399, 0x69a37ff6, 0x1d3b9679,
+    0x869eda16, 0xf10008e6, 0x6aa54489, 0x14293604, 0x8f8c7a6b,
+    0xf812a89b, 0x63b7e4f4, 0x172f0d7b, 0x8c8a4114, 0xfb1493e4,
+    0x60b1df8b, 0x122540fa, 0x89800c95, 0xfe1ede65, 0x65bb920a,
+    0x11237b85, 0x8a8637ea, 0xfd18e51a, 0x66bda975, 0x3063b7f0,
+    0xabc6fb9f, 0xdc58296f, 0x47fd6500, 0x33658c8f, 0xa8c0c0e0,
+    0xdf5e1210, 0x44fb5e7f, 0x366fc10e, 0xadca8d61, 0xda545f91,
+    0x41f113fe, 0x3569fa71, 0xaeccb61e, 0xd95264ee, 0x42f72881,
+    0x3c7b5a0c, 0xa7de1663, 0xd040c493, 0x4be588fc, 0x3f7d6173,
+    0xa4d82d1c, 0xd346ffec, 0x48e3b383, 0x3a772cf2, 0xa1d2609d,
+    0xd64cb26d, 0x4de9fe02, 0x3971178d, 0xa2d45be2, 0xd54a8912,
+    0x4eefc57d, 0x28526c08, 0xb3f72067, 0xc469f297, 0x5fccbef8,
+    0x2b545777, 0xb0f11b18, 0xc76fc9e8, 0x5cca8587, 0x2e5e1af6,
+    0xb5fb5699, 0xc2658469, 0x59c0c806, 0x2d582189, 0xb6fd6de6,
+    0xc163bf16, 0x5ac6f379, 0x244a81f4, 0xbfefcd9b, 0xc8711f6b,
+    0x53d45304, 0x274cba8b, 0xbce9f6e4, 0xcb772414, 0x50d2687b,
+    0x2246f70a, 0xb9e3bb65, 0xce7d6995, 0x55d825fa, 0x2140cc75,
+    0xbae5801a, 0xcd7b52ea, 0x56de1e85, 0x60c76fe0, 0xfb62238f,
+    0x8cfcf17f, 0x1759bd10, 0x63c1549f, 0xf86418f0, 0x8ffaca00,
+    0x145f866f, 0x66cb191e, 0xfd6e5571, 0x8af08781, 0x1155cbee,
+    0x65cd2261, 0xfe686e0e, 0x89f6bcfe, 0x1253f091, 0x6cdf821c,
+    0xf77ace73, 0x80e41c83, 0x1b4150ec, 0x6fd9b963, 0xf47cf50c,
+    0x83e227fc, 0x18476b93, 0x6ad3f4e2, 0xf176b88d, 0x86e86a7d,
+    0x1d4d2612, 0x69d5cf9d, 0xf27083f2, 0x85ee5102, 0x1e4b1d6d,
+    0x78f6b418, 0xe353f877, 0x94cd2a87, 0x0f6866e8, 0x7bf08f67,
+    0xe055c308, 0x97cb11f8, 0x0c6e5d97, 0x7efac2e6, 0xe55f8e89,
+    0x92c15c79, 0x09641016, 0x7dfcf999, 0xe659b5f6, 0x91c76706,
+    0x0a622b69, 0x74ee59e4, 0xef4b158b, 0x98d5c77b, 0x03708b14,
+    0x77e8629b, 0xec4d2ef4, 0x9bd3fc04, 0x0076b06b, 0x72e22f1a,
+    0xe9476375, 0x9ed9b185, 0x057cfdea, 0x71e41465, 0xea41580a,
+    0x9ddf8afa, 0x067ac695, 0x50a4d810, 0xcb01947f, 0xbc9f468f,
+    0x273a0ae0, 0x53a2e36f, 0xc807af00, 0xbf997df0, 0x243c319f,
+    0x56a8aeee, 0xcd0de281, 0xba933071, 0x21367c1e, 0x55ae9591,
+    0xce0bd9fe, 0xb9950b0e, 0x22304761, 0x5cbc35ec, 0xc7197983,
+    0xb087ab73, 0x2b22e71c, 0x5fba0e93, 0xc41f42fc, 0xb381900c,
+    0x2824dc63, 0x5ab04312, 0xc1150f7d, 0xb68bdd8d, 0x2d2e91e2,
+    0x59b6786d, 0xc2133402, 0xb58de6f2, 0x2e28aa9d, 0x489503e8,
+    0xd3304f87, 0xa4ae9d77, 0x3f0bd118, 0x4b933897, 0xd03674f8,
+    0xa7a8a608, 0x3c0dea67, 0x4e997516, 0xd53c3979, 0xa2a2eb89,
+    0x3907a7e6, 0x4d9f4e69, 0xd63a0206, 0xa1a4d0f6, 0x3a019c99,
+    0x448dee14, 0xdf28a27b, 0xa8b6708b, 0x33133ce4, 0x478bd56b,
+    0xdc2e9904, 0xabb04bf4, 0x3015079b, 0x428198ea, 0xd924d485,
+    0xaeba0675, 0x351f4a1a, 0x4187a395, 0xda22effa, 0xadbc3d0a,
+    0x36197165},
+   {0x00000000, 0xc18edfc0, 0x586cb9c1, 0x99e26601, 0xb0d97382,
+    0x7157ac42, 0xe8b5ca43, 0x293b1583, 0xbac3e145, 0x7b4d3e85,
+    0xe2af5884, 0x23218744, 0x0a1a92c7, 0xcb944d07, 0x52762b06,
+    0x93f8f4c6, 0xaef6c4cb, 0x6f781b0b, 0xf69a7d0a, 0x3714a2ca,
+    0x1e2fb749, 0xdfa16889, 0x46430e88, 0x87cdd148, 0x1435258e,
+    0xd5bbfa4e, 0x4c599c4f, 0x8dd7438f, 0xa4ec560c, 0x656289cc,
+    0xfc80efcd, 0x3d0e300d, 0x869c8fd7, 0x47125017, 0xdef03616,
+    0x1f7ee9d6, 0x3645fc55, 0xf7cb2395, 0x6e294594, 0xafa79a54,
+    0x3c5f6e92, 0xfdd1b152, 0x6433d753, 0xa5bd0893, 0x8c861d10,
+    0x4d08c2d0, 0xd4eaa4d1, 0x15647b11, 0x286a4b1c, 0xe9e494dc,
+    0x7006f2dd, 0xb1882d1d, 0x98b3389e, 0x593de75e, 0xc0df815f,
+    0x01515e9f, 0x92a9aa59, 0x53277599, 0xcac51398, 0x0b4bcc58,
+    0x2270d9db, 0xe3fe061b, 0x7a1c601a, 0xbb92bfda, 0xd64819ef,
+    0x17c6c62f, 0x8e24a02e, 0x4faa7fee, 0x66916a6d, 0xa71fb5ad,
+    0x3efdd3ac, 0xff730c6c, 0x6c8bf8aa, 0xad05276a, 0x34e7416b,
+    0xf5699eab, 0xdc528b28, 0x1ddc54e8, 0x843e32e9, 0x45b0ed29,
+    0x78bedd24, 0xb93002e4, 0x20d264e5, 0xe15cbb25, 0xc867aea6,
+    0x09e97166, 0x900b1767, 0x5185c8a7, 0xc27d3c61, 0x03f3e3a1,
+    0x9a1185a0, 0x5b9f5a60, 0x72a44fe3, 0xb32a9023, 0x2ac8f622,
+    0xeb4629e2, 0x50d49638, 0x915a49f8, 0x08b82ff9, 0xc936f039,
+    0xe00de5ba, 0x21833a7a, 0xb8615c7b, 0x79ef83bb, 0xea17777d,
+    0x2b99a8bd, 0xb27bcebc, 0x73f5117c, 0x5ace04ff, 0x9b40db3f,
+    0x02a2bd3e, 0xc32c62fe, 0xfe2252f3, 0x3fac8d33, 0xa64eeb32,
+    0x67c034f2, 0x4efb2171, 0x8f75feb1, 0x169798b0, 0xd7194770,
+    0x44e1b3b6, 0x856f6c76, 0x1c8d0a77, 0xdd03d5b7, 0xf438c034,
+    0x35b61ff4, 0xac5479f5, 0x6ddaa635, 0x77e1359f, 0xb66fea5f,
+    0x2f8d8c5e, 0xee03539e, 0xc738461d, 0x06b699dd, 0x9f54ffdc,
+    0x5eda201c, 0xcd22d4da, 0x0cac0b1a, 0x954e6d1b, 0x54c0b2db,
+    0x7dfba758, 0xbc757898, 0x25971e99, 0xe419c159, 0xd917f154,
+    0x18992e94, 0x817b4895, 0x40f59755, 0x69ce82d6, 0xa8405d16,
+    0x31a23b17, 0xf02ce4d7, 0x63d41011, 0xa25acfd1, 0x3bb8a9d0,
+    0xfa367610, 0xd30d6393, 0x1283bc53, 0x8b61da52, 0x4aef0592,
+    0xf17dba48, 0x30f36588, 0xa9110389, 0x689fdc49, 0x41a4c9ca,
+    0x802a160a, 0x19c8700b, 0xd846afcb, 0x4bbe5b0d, 0x8a3084cd,
+    0x13d2e2cc, 0xd25c3d0c, 0xfb67288f, 0x3ae9f74f, 0xa30b914e,
+    0x62854e8e, 0x5f8b7e83, 0x9e05a143, 0x07e7c742, 0xc6691882,
+    0xef520d01, 0x2edcd2c1, 0xb73eb4c0, 0x76b06b00, 0xe5489fc6,
+    0x24c64006, 0xbd242607, 0x7caaf9c7, 0x5591ec44, 0x941f3384,
+    0x0dfd5585, 0xcc738a45, 0xa1a92c70, 0x6027f3b0, 0xf9c595b1,
+    0x384b4a71, 0x11705ff2, 0xd0fe8032, 0x491ce633, 0x889239f3,
+    0x1b6acd35, 0xdae412f5, 0x430674f4, 0x8288ab34, 0xabb3beb7,
+    0x6a3d6177, 0xf3df0776, 0x3251d8b6, 0x0f5fe8bb, 0xced1377b,
+    0x5733517a, 0x96bd8eba, 0xbf869b39, 0x7e0844f9, 0xe7ea22f8,
+    0x2664fd38, 0xb59c09fe, 0x7412d63e, 0xedf0b03f, 0x2c7e6fff,
+    0x05457a7c, 0xc4cba5bc, 0x5d29c3bd, 0x9ca71c7d, 0x2735a3a7,
+    0xe6bb7c67, 0x7f591a66, 0xbed7c5a6, 0x97ecd025, 0x56620fe5,
+    0xcf8069e4, 0x0e0eb624, 0x9df642e2, 0x5c789d22, 0xc59afb23,
+    0x041424e3, 0x2d2f3160, 0xeca1eea0, 0x754388a1, 0xb4cd5761,
+    0x89c3676c, 0x484db8ac, 0xd1afdead, 0x1021016d, 0x391a14ee,
+    0xf894cb2e, 0x6176ad2f, 0xa0f872ef, 0x33008629, 0xf28e59e9,
+    0x6b6c3fe8, 0xaae2e028, 0x83d9f5ab, 0x42572a6b, 0xdbb54c6a,
+    0x1a3b93aa},
+   {0x00000000, 0xefc26b3e, 0x04f5d03d, 0xeb37bb03, 0x09eba07a,
+    0xe629cb44, 0x0d1e7047, 0xe2dc1b79, 0x13d740f4, 0xfc152bca,
+    0x172290c9, 0xf8e0fbf7, 0x1a3ce08e, 0xf5fe8bb0, 0x1ec930b3,
+    0xf10b5b8d, 0x27ae81e8, 0xc86cead6, 0x235b51d5, 0xcc993aeb,
+    0x2e452192, 0xc1874aac, 0x2ab0f1af, 0xc5729a91, 0x3479c11c,
+    0xdbbbaa22, 0x308c1121, 0xdf4e7a1f, 0x3d926166, 0xd2500a58,
+    0x3967b15b, 0xd6a5da65, 0x4f5d03d0, 0xa09f68ee, 0x4ba8d3ed,
+    0xa46ab8d3, 0x46b6a3aa, 0xa974c894, 0x42437397, 0xad8118a9,
+    0x5c8a4324, 0xb348281a, 0x587f9319, 0xb7bdf827, 0x5561e35e,
+    0xbaa38860, 0x51943363, 0xbe56585d, 0x68f38238, 0x8731e906,
+    0x6c065205, 0x83c4393b, 0x61182242, 0x8eda497c, 0x65edf27f,
+    0x8a2f9941, 0x7b24c2cc, 0x94e6a9f2, 0x7fd112f1, 0x901379cf,
+    0x72cf62b6, 0x9d0d0988, 0x763ab28b, 0x99f8d9b5, 0x9eba07a0,
+    0x71786c9e, 0x9a4fd79d, 0x758dbca3, 0x9751a7da, 0x7893cce4,
+    0x93a477e7, 0x7c661cd9, 0x8d6d4754, 0x62af2c6a, 0x89989769,
+    0x665afc57, 0x8486e72e, 0x6b448c10, 0x80733713, 0x6fb15c2d,
+    0xb9148648, 0x56d6ed76, 0xbde15675, 0x52233d4b, 0xb0ff2632,
+    0x5f3d4d0c, 0xb40af60f, 0x5bc89d31, 0xaac3c6bc, 0x4501ad82,
+    0xae361681, 0x41f47dbf, 0xa32866c6, 0x4cea0df8, 0xa7ddb6fb,
+    0x481fddc5, 0xd1e70470, 0x3e256f4e, 0xd512d44d, 0x3ad0bf73,
+    0xd80ca40a, 0x37cecf34, 0xdcf97437, 0x333b1f09, 0xc2304484,
+    0x2df22fba, 0xc6c594b9, 0x2907ff87, 0xcbdbe4fe, 0x24198fc0,
+    0xcf2e34c3, 0x20ec5ffd, 0xf6498598, 0x198beea6, 0xf2bc55a5,
+    0x1d7e3e9b, 0xffa225e2, 0x10604edc, 0xfb57f5df, 0x14959ee1,
+    0xe59ec56c, 0x0a5cae52, 0xe16b1551, 0x0ea97e6f, 0xec756516,
+    0x03b70e28, 0xe880b52b, 0x0742de15, 0xe6050901, 0x09c7623f,
+    0xe2f0d93c, 0x0d32b202, 0xefeea97b, 0x002cc245, 0xeb1b7946,
+    0x04d91278, 0xf5d249f5, 0x1a1022cb, 0xf12799c8, 0x1ee5f2f6,
+    0xfc39e98f, 0x13fb82b1, 0xf8cc39b2, 0x170e528c, 0xc1ab88e9,
+    0x2e69e3d7, 0xc55e58d4, 0x2a9c33ea, 0xc8402893, 0x278243ad,
+    0xccb5f8ae, 0x23779390, 0xd27cc81d, 0x3dbea323, 0xd6891820,
+    0x394b731e, 0xdb976867, 0x34550359, 0xdf62b85a, 0x30a0d364,
+    0xa9580ad1, 0x469a61ef, 0xadaddaec, 0x426fb1d2, 0xa0b3aaab,
+    0x4f71c195, 0xa4467a96, 0x4b8411a8, 0xba8f4a25, 0x554d211b,
+    0xbe7a9a18, 0x51b8f126, 0xb364ea5f, 0x5ca68161, 0xb7913a62,
+    0x5853515c, 0x8ef68b39, 0x6134e007, 0x8a035b04, 0x65c1303a,
+    0x871d2b43, 0x68df407d, 0x83e8fb7e, 0x6c2a9040, 0x9d21cbcd,
+    0x72e3a0f3, 0x99d41bf0, 0x761670ce, 0x94ca6bb7, 0x7b080089,
+    0x903fbb8a, 0x7ffdd0b4, 0x78bf0ea1, 0x977d659f, 0x7c4ade9c,
+    0x9388b5a2, 0x7154aedb, 0x9e96c5e5, 0x75a17ee6, 0x9a6315d8,
+    0x6b684e55, 0x84aa256b, 0x6f9d9e68, 0x805ff556, 0x6283ee2f,
+    0x8d418511, 0x66763e12, 0x89b4552c, 0x5f118f49, 0xb0d3e477,
+    0x5be45f74, 0xb426344a, 0x56fa2f33, 0xb938440d, 0x520fff0e,
+    0xbdcd9430, 0x4cc6cfbd, 0xa304a483, 0x48331f80, 0xa7f174be,
+    0x452d6fc7, 0xaaef04f9, 0x41d8bffa, 0xae1ad4c4, 0x37e20d71,
+    0xd820664f, 0x3317dd4c, 0xdcd5b672, 0x3e09ad0b, 0xd1cbc635,
+    0x3afc7d36, 0xd53e1608, 0x24354d85, 0xcbf726bb, 0x20c09db8,
+    0xcf02f686, 0x2ddeedff, 0xc21c86c1, 0x292b3dc2, 0xc6e956fc,
+    0x104c8c99, 0xff8ee7a7, 0x14b95ca4, 0xfb7b379a, 0x19a72ce3,
+    0xf66547dd, 0x1d52fcde, 0xf29097e0, 0x039bcc6d, 0xec59a753,
+    0x076e1c50, 0xe8ac776e, 0x0a706c17, 0xe5b20729, 0x0e85bc2a,
+    0xe147d714},
+   {0x00000000, 0x177b1443, 0x2ef62886, 0x398d3cc5, 0x5dec510c,
+    0x4a97454f, 0x731a798a, 0x64616dc9, 0xbbd8a218, 0xaca3b65b,
+    0x952e8a9e, 0x82559edd, 0xe634f314, 0xf14fe757, 0xc8c2db92,
+    0xdfb9cfd1, 0xacc04271, 0xbbbb5632, 0x82366af7, 0x954d7eb4,
+    0xf12c137d, 0xe657073e, 0xdfda3bfb, 0xc8a12fb8, 0x1718e069,
+    0x0063f42a, 0x39eec8ef, 0x2e95dcac, 0x4af4b165, 0x5d8fa526,
+    0x640299e3, 0x73798da0, 0x82f182a3, 0x958a96e0, 0xac07aa25,
+    0xbb7cbe66, 0xdf1dd3af, 0xc866c7ec, 0xf1ebfb29, 0xe690ef6a,
+    0x392920bb, 0x2e5234f8, 0x17df083d, 0x00a41c7e, 0x64c571b7,
+    0x73be65f4, 0x4a335931, 0x5d484d72, 0x2e31c0d2, 0x394ad491,
+    0x00c7e854, 0x17bcfc17, 0x73dd91de, 0x64a6859d, 0x5d2bb958,
+    0x4a50ad1b, 0x95e962ca, 0x82927689, 0xbb1f4a4c, 0xac645e0f,
+    0xc80533c6, 0xdf7e2785, 0xe6f31b40, 0xf1880f03, 0xde920307,
+    0xc9e91744, 0xf0642b81, 0xe71f3fc2, 0x837e520b, 0x94054648,
+    0xad887a8d, 0xbaf36ece, 0x654aa11f, 0x7231b55c, 0x4bbc8999,
+    0x5cc79dda, 0x38a6f013, 0x2fdde450, 0x1650d895, 0x012bccd6,
+    0x72524176, 0x65295535, 0x5ca469f0, 0x4bdf7db3, 0x2fbe107a,
+    0x38c50439, 0x014838fc, 0x16332cbf, 0xc98ae36e, 0xdef1f72d,
+    0xe77ccbe8, 0xf007dfab, 0x9466b262, 0x831da621, 0xba909ae4,
+    0xadeb8ea7, 0x5c6381a4, 0x4b1895e7, 0x7295a922, 0x65eebd61,
+    0x018fd0a8, 0x16f4c4eb, 0x2f79f82e, 0x3802ec6d, 0xe7bb23bc,
+    0xf0c037ff, 0xc94d0b3a, 0xde361f79, 0xba5772b0, 0xad2c66f3,
+    0x94a15a36, 0x83da4e75, 0xf0a3c3d5, 0xe7d8d796, 0xde55eb53,
+    0xc92eff10, 0xad4f92d9, 0xba34869a, 0x83b9ba5f, 0x94c2ae1c,
+    0x4b7b61cd, 0x5c00758e, 0x658d494b, 0x72f65d08, 0x169730c1,
+    0x01ec2482, 0x38611847, 0x2f1a0c04, 0x6655004f, 0x712e140c,
+    0x48a328c9, 0x5fd83c8a, 0x3bb95143, 0x2cc24500, 0x154f79c5,
+    0x02346d86, 0xdd8da257, 0xcaf6b614, 0xf37b8ad1, 0xe4009e92,
+    0x8061f35b, 0x971ae718, 0xae97dbdd, 0xb9eccf9e, 0xca95423e,
+    0xddee567d, 0xe4636ab8, 0xf3187efb, 0x97791332, 0x80020771,
+    0xb98f3bb4, 0xaef42ff7, 0x714de026, 0x6636f465, 0x5fbbc8a0,
+    0x48c0dce3, 0x2ca1b12a, 0x3bdaa569, 0x025799ac, 0x152c8def,
+    0xe4a482ec, 0xf3df96af, 0xca52aa6a, 0xdd29be29, 0xb948d3e0,
+    0xae33c7a3, 0x97befb66, 0x80c5ef25, 0x5f7c20f4, 0x480734b7,
+    0x718a0872, 0x66f11c31, 0x029071f8, 0x15eb65bb, 0x2c66597e,
+    0x3b1d4d3d, 0x4864c09d, 0x5f1fd4de, 0x6692e81b, 0x71e9fc58,
+    0x15889191, 0x02f385d2, 0x3b7eb917, 0x2c05ad54, 0xf3bc6285,
+    0xe4c776c6, 0xdd4a4a03, 0xca315e40, 0xae503389, 0xb92b27ca,
+    0x80a61b0f, 0x97dd0f4c, 0xb8c70348, 0xafbc170b, 0x96312bce,
+    0x814a3f8d, 0xe52b5244, 0xf2504607, 0xcbdd7ac2, 0xdca66e81,
+    0x031fa150, 0x1464b513, 0x2de989d6, 0x3a929d95, 0x5ef3f05c,
+    0x4988e41f, 0x7005d8da, 0x677ecc99, 0x14074139, 0x037c557a,
+    0x3af169bf, 0x2d8a7dfc, 0x49eb1035, 0x5e900476, 0x671d38b3,
+    0x70662cf0, 0xafdfe321, 0xb8a4f762, 0x8129cba7, 0x9652dfe4,
+    0xf233b22d, 0xe548a66e, 0xdcc59aab, 0xcbbe8ee8, 0x3a3681eb,
+    0x2d4d95a8, 0x14c0a96d, 0x03bbbd2e, 0x67dad0e7, 0x70a1c4a4,
+    0x492cf861, 0x5e57ec22, 0x81ee23f3, 0x969537b0, 0xaf180b75,
+    0xb8631f36, 0xdc0272ff, 0xcb7966bc, 0xf2f45a79, 0xe58f4e3a,
+    0x96f6c39a, 0x818dd7d9, 0xb800eb1c, 0xaf7bff5f, 0xcb1a9296,
+    0xdc6186d5, 0xe5ecba10, 0xf297ae53, 0x2d2e6182, 0x3a5575c1,
+    0x03d84904, 0x14a35d47, 0x70c2308e, 0x67b924cd, 0x5e341808,
+    0x494f0c4b}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x00000000, 0x43147b17, 0x8628f62e, 0xc53c8d39, 0x0c51ec5d,
+    0x4f45974a, 0x8a791a73, 0xc96d6164, 0x18a2d8bb, 0x5bb6a3ac,
+    0x9e8a2e95, 0xdd9e5582, 0x14f334e6, 0x57e74ff1, 0x92dbc2c8,
+    0xd1cfb9df, 0x7142c0ac, 0x3256bbbb, 0xf76a3682, 0xb47e4d95,
+    0x7d132cf1, 0x3e0757e6, 0xfb3bdadf, 0xb82fa1c8, 0x69e01817,
+    0x2af46300, 0xefc8ee39, 0xacdc952e, 0x65b1f44a, 0x26a58f5d,
+    0xe3990264, 0xa08d7973, 0xa382f182, 0xe0968a95, 0x25aa07ac,
+    0x66be7cbb, 0xafd31ddf, 0xecc766c8, 0x29fbebf1, 0x6aef90e6,
+    0xbb202939, 0xf834522e, 0x3d08df17, 0x7e1ca400, 0xb771c564,
+    0xf465be73, 0x3159334a, 0x724d485d, 0xd2c0312e, 0x91d44a39,
+    0x54e8c700, 0x17fcbc17, 0xde91dd73, 0x9d85a664, 0x58b92b5d,
+    0x1bad504a, 0xca62e995, 0x89769282, 0x4c4a1fbb, 0x0f5e64ac,
+    0xc63305c8, 0x85277edf, 0x401bf3e6, 0x030f88f1, 0x070392de,
+    0x4417e9c9, 0x812b64f0, 0xc23f1fe7, 0x0b527e83, 0x48460594,
+    0x8d7a88ad, 0xce6ef3ba, 0x1fa14a65, 0x5cb53172, 0x9989bc4b,
+    0xda9dc75c, 0x13f0a638, 0x50e4dd2f, 0x95d85016, 0xd6cc2b01,
+    0x76415272, 0x35552965, 0xf069a45c, 0xb37ddf4b, 0x7a10be2f,
+    0x3904c538, 0xfc384801, 0xbf2c3316, 0x6ee38ac9, 0x2df7f1de,
+    0xe8cb7ce7, 0xabdf07f0, 0x62b26694, 0x21a61d83, 0xe49a90ba,
+    0xa78eebad, 0xa481635c, 0xe795184b, 0x22a99572, 0x61bdee65,
+    0xa8d08f01, 0xebc4f416, 0x2ef8792f, 0x6dec0238, 0xbc23bbe7,
+    0xff37c0f0, 0x3a0b4dc9, 0x791f36de, 0xb07257ba, 0xf3662cad,
+    0x365aa194, 0x754eda83, 0xd5c3a3f0, 0x96d7d8e7, 0x53eb55de,
+    0x10ff2ec9, 0xd9924fad, 0x9a8634ba, 0x5fbab983, 0x1caec294,
+    0xcd617b4b, 0x8e75005c, 0x4b498d65, 0x085df672, 0xc1309716,
+    0x8224ec01, 0x47186138, 0x040c1a2f, 0x4f005566, 0x0c142e71,
+    0xc928a348, 0x8a3cd85f, 0x4351b93b, 0x0045c22c, 0xc5794f15,
+    0x866d3402, 0x57a28ddd, 0x14b6f6ca, 0xd18a7bf3, 0x929e00e4,
+    0x5bf36180, 0x18e71a97, 0xdddb97ae, 0x9ecfecb9, 0x3e4295ca,
+    0x7d56eedd, 0xb86a63e4, 0xfb7e18f3, 0x32137997, 0x71070280,
+    0xb43b8fb9, 0xf72ff4ae, 0x26e04d71, 0x65f43666, 0xa0c8bb5f,
+    0xe3dcc048, 0x2ab1a12c, 0x69a5da3b, 0xac995702, 0xef8d2c15,
+    0xec82a4e4, 0xaf96dff3, 0x6aaa52ca, 0x29be29dd, 0xe0d348b9,
+    0xa3c733ae, 0x66fbbe97, 0x25efc580, 0xf4207c5f, 0xb7340748,
+    0x72088a71, 0x311cf166, 0xf8719002, 0xbb65eb15, 0x7e59662c,
+    0x3d4d1d3b, 0x9dc06448, 0xded41f5f, 0x1be89266, 0x58fce971,
+    0x91918815, 0xd285f302, 0x17b97e3b, 0x54ad052c, 0x8562bcf3,
+    0xc676c7e4, 0x034a4add, 0x405e31ca, 0x893350ae, 0xca272bb9,
+    0x0f1ba680, 0x4c0fdd97, 0x4803c7b8, 0x0b17bcaf, 0xce2b3196,
+    0x8d3f4a81, 0x44522be5, 0x074650f2, 0xc27addcb, 0x816ea6dc,
+    0x50a11f03, 0x13b56414, 0xd689e92d, 0x959d923a, 0x5cf0f35e,
+    0x1fe48849, 0xdad80570, 0x99cc7e67, 0x39410714, 0x7a557c03,
+    0xbf69f13a, 0xfc7d8a2d, 0x3510eb49, 0x7604905e, 0xb3381d67,
+    0xf02c6670, 0x21e3dfaf, 0x62f7a4b8, 0xa7cb2981, 0xe4df5296,
+    0x2db233f2, 0x6ea648e5, 0xab9ac5dc, 0xe88ebecb, 0xeb81363a,
+    0xa8954d2d, 0x6da9c014, 0x2ebdbb03, 0xe7d0da67, 0xa4c4a170,
+    0x61f82c49, 0x22ec575e, 0xf323ee81, 0xb0379596, 0x750b18af,
+    0x361f63b8, 0xff7202dc, 0xbc6679cb, 0x795af4f2, 0x3a4e8fe5,
+    0x9ac3f696, 0xd9d78d81, 0x1ceb00b8, 0x5fff7baf, 0x96921acb,
+    0xd58661dc, 0x10baece5, 0x53ae97f2, 0x82612e2d, 0xc175553a,
+    0x0449d803, 0x475da314, 0x8e30c270, 0xcd24b967, 0x0818345e,
+    0x4b0c4f49},
+   {0x00000000, 0x3e6bc2ef, 0x3dd0f504, 0x03bb37eb, 0x7aa0eb09,
+    0x44cb29e6, 0x47701e0d, 0x791bdce2, 0xf440d713, 0xca2b15fc,
+    0xc9902217, 0xf7fbe0f8, 0x8ee03c1a, 0xb08bfef5, 0xb330c91e,
+    0x8d5b0bf1, 0xe881ae27, 0xd6ea6cc8, 0xd5515b23, 0xeb3a99cc,
+    0x9221452e, 0xac4a87c1, 0xaff1b02a, 0x919a72c5, 0x1cc17934,
+    0x22aabbdb, 0x21118c30, 0x1f7a4edf, 0x6661923d, 0x580a50d2,
+    0x5bb16739, 0x65daa5d6, 0xd0035d4f, 0xee689fa0, 0xedd3a84b,
+    0xd3b86aa4, 0xaaa3b646, 0x94c874a9, 0x97734342, 0xa91881ad,
+    0x24438a5c, 0x1a2848b3, 0x19937f58, 0x27f8bdb7, 0x5ee36155,
+    0x6088a3ba, 0x63339451, 0x5d5856be, 0x3882f368, 0x06e93187,
+    0x0552066c, 0x3b39c483, 0x42221861, 0x7c49da8e, 0x7ff2ed65,
+    0x41992f8a, 0xccc2247b, 0xf2a9e694, 0xf112d17f, 0xcf791390,
+    0xb662cf72, 0x88090d9d, 0x8bb23a76, 0xb5d9f899, 0xa007ba9e,
+    0x9e6c7871, 0x9dd74f9a, 0xa3bc8d75, 0xdaa75197, 0xe4cc9378,
+    0xe777a493, 0xd91c667c, 0x54476d8d, 0x6a2caf62, 0x69979889,
+    0x57fc5a66, 0x2ee78684, 0x108c446b, 0x13377380, 0x2d5cb16f,
+    0x488614b9, 0x76edd656, 0x7556e1bd, 0x4b3d2352, 0x3226ffb0,
+    0x0c4d3d5f, 0x0ff60ab4, 0x319dc85b, 0xbcc6c3aa, 0x82ad0145,
+    0x811636ae, 0xbf7df441, 0xc66628a3, 0xf80dea4c, 0xfbb6dda7,
+    0xc5dd1f48, 0x7004e7d1, 0x4e6f253e, 0x4dd412d5, 0x73bfd03a,
+    0x0aa40cd8, 0x34cfce37, 0x3774f9dc, 0x091f3b33, 0x844430c2,
+    0xba2ff22d, 0xb994c5c6, 0x87ff0729, 0xfee4dbcb, 0xc08f1924,
+    0xc3342ecf, 0xfd5fec20, 0x988549f6, 0xa6ee8b19, 0xa555bcf2,
+    0x9b3e7e1d, 0xe225a2ff, 0xdc4e6010, 0xdff557fb, 0xe19e9514,
+    0x6cc59ee5, 0x52ae5c0a, 0x51156be1, 0x6f7ea90e, 0x166575ec,
+    0x280eb703, 0x2bb580e8, 0x15de4207, 0x010905e6, 0x3f62c709,
+    0x3cd9f0e2, 0x02b2320d, 0x7ba9eeef, 0x45c22c00, 0x46791beb,
+    0x7812d904, 0xf549d2f5, 0xcb22101a, 0xc89927f1, 0xf6f2e51e,
+    0x8fe939fc, 0xb182fb13, 0xb239ccf8, 0x8c520e17, 0xe988abc1,
+    0xd7e3692e, 0xd4585ec5, 0xea339c2a, 0x932840c8, 0xad438227,
+    0xaef8b5cc, 0x90937723, 0x1dc87cd2, 0x23a3be3d, 0x201889d6,
+    0x1e734b39, 0x676897db, 0x59035534, 0x5ab862df, 0x64d3a030,
+    0xd10a58a9, 0xef619a46, 0xecdaadad, 0xd2b16f42, 0xabaab3a0,
+    0x95c1714f, 0x967a46a4, 0xa811844b, 0x254a8fba, 0x1b214d55,
+    0x189a7abe, 0x26f1b851, 0x5fea64b3, 0x6181a65c, 0x623a91b7,
+    0x5c515358, 0x398bf68e, 0x07e03461, 0x045b038a, 0x3a30c165,
+    0x432b1d87, 0x7d40df68, 0x7efbe883, 0x40902a6c, 0xcdcb219d,
+    0xf3a0e372, 0xf01bd499, 0xce701676, 0xb76bca94, 0x8900087b,
+    0x8abb3f90, 0xb4d0fd7f, 0xa10ebf78, 0x9f657d97, 0x9cde4a7c,
+    0xa2b58893, 0xdbae5471, 0xe5c5969e, 0xe67ea175, 0xd815639a,
+    0x554e686b, 0x6b25aa84, 0x689e9d6f, 0x56f55f80, 0x2fee8362,
+    0x1185418d, 0x123e7666, 0x2c55b489, 0x498f115f, 0x77e4d3b0,
+    0x745fe45b, 0x4a3426b4, 0x332ffa56, 0x0d4438b9, 0x0eff0f52,
+    0x3094cdbd, 0xbdcfc64c, 0x83a404a3, 0x801f3348, 0xbe74f1a7,
+    0xc76f2d45, 0xf904efaa, 0xfabfd841, 0xc4d41aae, 0x710de237,
+    0x4f6620d8, 0x4cdd1733, 0x72b6d5dc, 0x0bad093e, 0x35c6cbd1,
+    0x367dfc3a, 0x08163ed5, 0x854d3524, 0xbb26f7cb, 0xb89dc020,
+    0x86f602cf, 0xffedde2d, 0xc1861cc2, 0xc23d2b29, 0xfc56e9c6,
+    0x998c4c10, 0xa7e78eff, 0xa45cb914, 0x9a377bfb, 0xe32ca719,
+    0xdd4765f6, 0xdefc521d, 0xe09790f2, 0x6dcc9b03, 0x53a759ec,
+    0x501c6e07, 0x6e77ace8, 0x176c700a, 0x2907b2e5, 0x2abc850e,
+    0x14d747e1},
+   {0x00000000, 0xc0df8ec1, 0xc1b96c58, 0x0166e299, 0x8273d9b0,
+    0x42ac5771, 0x43cab5e8, 0x83153b29, 0x45e1c3ba, 0x853e4d7b,
+    0x8458afe2, 0x44872123, 0xc7921a0a, 0x074d94cb, 0x062b7652,
+    0xc6f4f893, 0xcbc4f6ae, 0x0b1b786f, 0x0a7d9af6, 0xcaa21437,
+    0x49b72f1e, 0x8968a1df, 0x880e4346, 0x48d1cd87, 0x8e253514,
+    0x4efabbd5, 0x4f9c594c, 0x8f43d78d, 0x0c56eca4, 0xcc896265,
+    0xcdef80fc, 0x0d300e3d, 0xd78f9c86, 0x17501247, 0x1636f0de,
+    0xd6e97e1f, 0x55fc4536, 0x9523cbf7, 0x9445296e, 0x549aa7af,
+    0x926e5f3c, 0x52b1d1fd, 0x53d73364, 0x9308bda5, 0x101d868c,
+    0xd0c2084d, 0xd1a4ead4, 0x117b6415, 0x1c4b6a28, 0xdc94e4e9,
+    0xddf20670, 0x1d2d88b1, 0x9e38b398, 0x5ee73d59, 0x5f81dfc0,
+    0x9f5e5101, 0x59aaa992, 0x99752753, 0x9813c5ca, 0x58cc4b0b,
+    0xdbd97022, 0x1b06fee3, 0x1a601c7a, 0xdabf92bb, 0xef1948d6,
+    0x2fc6c617, 0x2ea0248e, 0xee7faa4f, 0x6d6a9166, 0xadb51fa7,
+    0xacd3fd3e, 0x6c0c73ff, 0xaaf88b6c, 0x6a2705ad, 0x6b41e734,
+    0xab9e69f5, 0x288b52dc, 0xe854dc1d, 0xe9323e84, 0x29edb045,
+    0x24ddbe78, 0xe40230b9, 0xe564d220, 0x25bb5ce1, 0xa6ae67c8,
+    0x6671e909, 0x67170b90, 0xa7c88551, 0x613c7dc2, 0xa1e3f303,
+    0xa085119a, 0x605a9f5b, 0xe34fa472, 0x23902ab3, 0x22f6c82a,
+    0xe22946eb, 0x3896d450, 0xf8495a91, 0xf92fb808, 0x39f036c9,
+    0xbae50de0, 0x7a3a8321, 0x7b5c61b8, 0xbb83ef79, 0x7d7717ea,
+    0xbda8992b, 0xbcce7bb2, 0x7c11f573, 0xff04ce5a, 0x3fdb409b,
+    0x3ebda202, 0xfe622cc3, 0xf35222fe, 0x338dac3f, 0x32eb4ea6,
+    0xf234c067, 0x7121fb4e, 0xb1fe758f, 0xb0989716, 0x704719d7,
+    0xb6b3e144, 0x766c6f85, 0x770a8d1c, 0xb7d503dd, 0x34c038f4,
+    0xf41fb635, 0xf57954ac, 0x35a6da6d, 0x9f35e177, 0x5fea6fb6,
+    0x5e8c8d2f, 0x9e5303ee, 0x1d4638c7, 0xdd99b606, 0xdcff549f,
+    0x1c20da5e, 0xdad422cd, 0x1a0bac0c, 0x1b6d4e95, 0xdbb2c054,
+    0x58a7fb7d, 0x987875bc, 0x991e9725, 0x59c119e4, 0x54f117d9,
+    0x942e9918, 0x95487b81, 0x5597f540, 0xd682ce69, 0x165d40a8,
+    0x173ba231, 0xd7e42cf0, 0x1110d463, 0xd1cf5aa2, 0xd0a9b83b,
+    0x107636fa, 0x93630dd3, 0x53bc8312, 0x52da618b, 0x9205ef4a,
+    0x48ba7df1, 0x8865f330, 0x890311a9, 0x49dc9f68, 0xcac9a441,
+    0x0a162a80, 0x0b70c819, 0xcbaf46d8, 0x0d5bbe4b, 0xcd84308a,
+    0xcce2d213, 0x0c3d5cd2, 0x8f2867fb, 0x4ff7e93a, 0x4e910ba3,
+    0x8e4e8562, 0x837e8b5f, 0x43a1059e, 0x42c7e707, 0x821869c6,
+    0x010d52ef, 0xc1d2dc2e, 0xc0b43eb7, 0x006bb076, 0xc69f48e5,
+    0x0640c624, 0x072624bd, 0xc7f9aa7c, 0x44ec9155, 0x84331f94,
+    0x8555fd0d, 0x458a73cc, 0x702ca9a1, 0xb0f32760, 0xb195c5f9,
+    0x714a4b38, 0xf25f7011, 0x3280fed0, 0x33e61c49, 0xf3399288,
+    0x35cd6a1b, 0xf512e4da, 0xf4740643, 0x34ab8882, 0xb7beb3ab,
+    0x77613d6a, 0x7607dff3, 0xb6d85132, 0xbbe85f0f, 0x7b37d1ce,
+    0x7a513357, 0xba8ebd96, 0x399b86bf, 0xf944087e, 0xf822eae7,
+    0x38fd6426, 0xfe099cb5, 0x3ed61274, 0x3fb0f0ed, 0xff6f7e2c,
+    0x7c7a4505, 0xbca5cbc4, 0xbdc3295d, 0x7d1ca79c, 0xa7a33527,
+    0x677cbbe6, 0x661a597f, 0xa6c5d7be, 0x25d0ec97, 0xe50f6256,
+    0xe46980cf, 0x24b60e0e, 0xe242f69d, 0x229d785c, 0x23fb9ac5,
+    0xe3241404, 0x60312f2d, 0xa0eea1ec, 0xa1884375, 0x6157cdb4,
+    0x6c67c389, 0xacb84d48, 0xaddeafd1, 0x6d012110, 0xee141a39,
+    0x2ecb94f8, 0x2fad7661, 0xef72f8a0, 0x29860033, 0xe9598ef2,
+    0xe83f6c6b, 0x28e0e2aa, 0xabf5d983, 0x6b2a5742, 0x6a4cb5db,
+    0xaa933b1a},
+   {0x00000000, 0x6f4ca59b, 0x9f9e3bec, 0xf0d29e77, 0x7f3b0603,
+    0x1077a398, 0xe0a53def, 0x8fe99874, 0xfe760c06, 0x913aa99d,
+    0x61e837ea, 0x0ea49271, 0x814d0a05, 0xee01af9e, 0x1ed331e9,
+    0x719f9472, 0xfced180c, 0x93a1bd97, 0x637323e0, 0x0c3f867b,
+    0x83d61e0f, 0xec9abb94, 0x1c4825e3, 0x73048078, 0x029b140a,
+    0x6dd7b191, 0x9d052fe6, 0xf2498a7d, 0x7da01209, 0x12ecb792,
+    0xe23e29e5, 0x8d728c7e, 0xf8db3118, 0x97979483, 0x67450af4,
+    0x0809af6f, 0x87e0371b, 0xe8ac9280, 0x187e0cf7, 0x7732a96c,
+    0x06ad3d1e, 0x69e19885, 0x993306f2, 0xf67fa369, 0x79963b1d,
+    0x16da9e86, 0xe60800f1, 0x8944a56a, 0x04362914, 0x6b7a8c8f,
+    0x9ba812f8, 0xf4e4b763, 0x7b0d2f17, 0x14418a8c, 0xe49314fb,
+    0x8bdfb160, 0xfa402512, 0x950c8089, 0x65de1efe, 0x0a92bb65,
+    0x857b2311, 0xea37868a, 0x1ae518fd, 0x75a9bd66, 0xf0b76330,
+    0x9ffbc6ab, 0x6f2958dc, 0x0065fd47, 0x8f8c6533, 0xe0c0c0a8,
+    0x10125edf, 0x7f5efb44, 0x0ec16f36, 0x618dcaad, 0x915f54da,
+    0xfe13f141, 0x71fa6935, 0x1eb6ccae, 0xee6452d9, 0x8128f742,
+    0x0c5a7b3c, 0x6316dea7, 0x93c440d0, 0xfc88e54b, 0x73617d3f,
+    0x1c2dd8a4, 0xecff46d3, 0x83b3e348, 0xf22c773a, 0x9d60d2a1,
+    0x6db24cd6, 0x02fee94d, 0x8d177139, 0xe25bd4a2, 0x12894ad5,
+    0x7dc5ef4e, 0x086c5228, 0x6720f7b3, 0x97f269c4, 0xf8becc5f,
+    0x7757542b, 0x181bf1b0, 0xe8c96fc7, 0x8785ca5c, 0xf61a5e2e,
+    0x9956fbb5, 0x698465c2, 0x06c8c059, 0x8921582d, 0xe66dfdb6,
+    0x16bf63c1, 0x79f3c65a, 0xf4814a24, 0x9bcdefbf, 0x6b1f71c8,
+    0x0453d453, 0x8bba4c27, 0xe4f6e9bc, 0x142477cb, 0x7b68d250,
+    0x0af74622, 0x65bbe3b9, 0x95697dce, 0xfa25d855, 0x75cc4021,
+    0x1a80e5ba, 0xea527bcd, 0x851ede56, 0xe06fc760, 0x8f2362fb,
+    0x7ff1fc8c, 0x10bd5917, 0x9f54c163, 0xf01864f8, 0x00cafa8f,
+    0x6f865f14, 0x1e19cb66, 0x71556efd, 0x8187f08a, 0xeecb5511,
+    0x6122cd65, 0x0e6e68fe, 0xfebcf689, 0x91f05312, 0x1c82df6c,
+    0x73ce7af7, 0x831ce480, 0xec50411b, 0x63b9d96f, 0x0cf57cf4,
+    0xfc27e283, 0x936b4718, 0xe2f4d36a, 0x8db876f1, 0x7d6ae886,
+    0x12264d1d, 0x9dcfd569, 0xf28370f2, 0x0251ee85, 0x6d1d4b1e,
+    0x18b4f678, 0x77f853e3, 0x872acd94, 0xe866680f, 0x678ff07b,
+    0x08c355e0, 0xf811cb97, 0x975d6e0c, 0xe6c2fa7e, 0x898e5fe5,
+    0x795cc192, 0x16106409, 0x99f9fc7d, 0xf6b559e6, 0x0667c791,
+    0x692b620a, 0xe459ee74, 0x8b154bef, 0x7bc7d598, 0x148b7003,
+    0x9b62e877, 0xf42e4dec, 0x04fcd39b, 0x6bb07600, 0x1a2fe272,
+    0x756347e9, 0x85b1d99e, 0xeafd7c05, 0x6514e471, 0x0a5841ea,
+    0xfa8adf9d, 0x95c67a06, 0x10d8a450, 0x7f9401cb, 0x8f469fbc,
+    0xe00a3a27, 0x6fe3a253, 0x00af07c8, 0xf07d99bf, 0x9f313c24,
+    0xeeaea856, 0x81e20dcd, 0x713093ba, 0x1e7c3621, 0x9195ae55,
+    0xfed90bce, 0x0e0b95b9, 0x61473022, 0xec35bc5c, 0x837919c7,
+    0x73ab87b0, 0x1ce7222b, 0x930eba5f, 0xfc421fc4, 0x0c9081b3,
+    0x63dc2428, 0x1243b05a, 0x7d0f15c1, 0x8ddd8bb6, 0xe2912e2d,
+    0x6d78b659, 0x023413c2, 0xf2e68db5, 0x9daa282e, 0xe8039548,
+    0x874f30d3, 0x779daea4, 0x18d10b3f, 0x9738934b, 0xf87436d0,
+    0x08a6a8a7, 0x67ea0d3c, 0x1675994e, 0x79393cd5, 0x89eba2a2,
+    0xe6a70739, 0x694e9f4d, 0x06023ad6, 0xf6d0a4a1, 0x999c013a,
+    0x14ee8d44, 0x7ba228df, 0x8b70b6a8, 0xe43c1333, 0x6bd58b47,
+    0x04992edc, 0xf44bb0ab, 0x9b071530, 0xea988142, 0x85d424d9,
+    0x7506baae, 0x1a4a1f35, 0x95a38741, 0xfaef22da, 0x0a3dbcad,
+    0x65711936}};
+
+#endif
+
+#endif
+
+#if N == 4
+
+#if W == 8
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0xf1da05aa, 0x38c50d15, 0xc91f08bf, 0x718a1a2a,
+    0x80501f80, 0x494f173f, 0xb8951295, 0xe3143454, 0x12ce31fe,
+    0xdbd13941, 0x2a0b3ceb, 0x929e2e7e, 0x63442bd4, 0xaa5b236b,
+    0x5b8126c1, 0x1d596ee9, 0xec836b43, 0x259c63fc, 0xd4466656,
+    0x6cd374c3, 0x9d097169, 0x541679d6, 0xa5cc7c7c, 0xfe4d5abd,
+    0x0f975f17, 0xc68857a8, 0x37525202, 0x8fc74097, 0x7e1d453d,
+    0xb7024d82, 0x46d84828, 0x3ab2ddd2, 0xcb68d878, 0x0277d0c7,
+    0xf3add56d, 0x4b38c7f8, 0xbae2c252, 0x73fdcaed, 0x8227cf47,
+    0xd9a6e986, 0x287cec2c, 0xe163e493, 0x10b9e139, 0xa82cf3ac,
+    0x59f6f606, 0x90e9feb9, 0x6133fb13, 0x27ebb33b, 0xd631b691,
+    0x1f2ebe2e, 0xeef4bb84, 0x5661a911, 0xa7bbacbb, 0x6ea4a404,
+    0x9f7ea1ae, 0xc4ff876f, 0x352582c5, 0xfc3a8a7a, 0x0de08fd0,
+    0xb5759d45, 0x44af98ef, 0x8db09050, 0x7c6a95fa, 0x7565bba4,
+    0x84bfbe0e, 0x4da0b6b1, 0xbc7ab31b, 0x04efa18e, 0xf535a424,
+    0x3c2aac9b, 0xcdf0a931, 0x96718ff0, 0x67ab8a5a, 0xaeb482e5,
+    0x5f6e874f, 0xe7fb95da, 0x16219070, 0xdf3e98cf, 0x2ee49d65,
+    0x683cd54d, 0x99e6d0e7, 0x50f9d858, 0xa123ddf2, 0x19b6cf67,
+    0xe86ccacd, 0x2173c272, 0xd0a9c7d8, 0x8b28e119, 0x7af2e4b3,
+    0xb3edec0c, 0x4237e9a6, 0xfaa2fb33, 0x0b78fe99, 0xc267f626,
+    0x33bdf38c, 0x4fd76676, 0xbe0d63dc, 0x77126b63, 0x86c86ec9,
+    0x3e5d7c5c, 0xcf8779f6, 0x06987149, 0xf74274e3, 0xacc35222,
+    0x5d195788, 0x94065f37, 0x65dc5a9d, 0xdd494808, 0x2c934da2,
+    0xe58c451d, 0x145640b7, 0x528e089f, 0xa3540d35, 0x6a4b058a,
+    0x9b910020, 0x230412b5, 0xd2de171f, 0x1bc11fa0, 0xea1b1a0a,
+    0xb19a3ccb, 0x40403961, 0x895f31de, 0x78853474, 0xc01026e1,
+    0x31ca234b, 0xf8d52bf4, 0x090f2e5e, 0xeacb7748, 0x1b1172e2,
+    0xd20e7a5d, 0x23d47ff7, 0x9b416d62, 0x6a9b68c8, 0xa3846077,
+    0x525e65dd, 0x09df431c, 0xf80546b6, 0x311a4e09, 0xc0c04ba3,
+    0x78555936, 0x898f5c9c, 0x40905423, 0xb14a5189, 0xf79219a1,
+    0x06481c0b, 0xcf5714b4, 0x3e8d111e, 0x8618038b, 0x77c20621,
+    0xbedd0e9e, 0x4f070b34, 0x14862df5, 0xe55c285f, 0x2c4320e0,
+    0xdd99254a, 0x650c37df, 0x94d63275, 0x5dc93aca, 0xac133f60,
+    0xd079aa9a, 0x21a3af30, 0xe8bca78f, 0x1966a225, 0xa1f3b0b0,
+    0x5029b51a, 0x9936bda5, 0x68ecb80f, 0x336d9ece, 0xc2b79b64,
+    0x0ba893db, 0xfa729671, 0x42e784e4, 0xb33d814e, 0x7a2289f1,
+    0x8bf88c5b, 0xcd20c473, 0x3cfac1d9, 0xf5e5c966, 0x043fcccc,
+    0xbcaade59, 0x4d70dbf3, 0x846fd34c, 0x75b5d6e6, 0x2e34f027,
+    0xdfeef58d, 0x16f1fd32, 0xe72bf898, 0x5fbeea0d, 0xae64efa7,
+    0x677be718, 0x96a1e2b2, 0x9faeccec, 0x6e74c946, 0xa76bc1f9,
+    0x56b1c453, 0xee24d6c6, 0x1ffed36c, 0xd6e1dbd3, 0x273bde79,
+    0x7cbaf8b8, 0x8d60fd12, 0x447ff5ad, 0xb5a5f007, 0x0d30e292,
+    0xfceae738, 0x35f5ef87, 0xc42fea2d, 0x82f7a205, 0x732da7af,
+    0xba32af10, 0x4be8aaba, 0xf37db82f, 0x02a7bd85, 0xcbb8b53a,
+    0x3a62b090, 0x61e39651, 0x903993fb, 0x59269b44, 0xa8fc9eee,
+    0x10698c7b, 0xe1b389d1, 0x28ac816e, 0xd97684c4, 0xa51c113e,
+    0x54c61494, 0x9dd91c2b, 0x6c031981, 0xd4960b14, 0x254c0ebe,
+    0xec530601, 0x1d8903ab, 0x4608256a, 0xb7d220c0, 0x7ecd287f,
+    0x8f172dd5, 0x37823f40, 0xc6583aea, 0x0f473255, 0xfe9d37ff,
+    0xb8457fd7, 0x499f7a7d, 0x808072c2, 0x715a7768, 0xc9cf65fd,
+    0x38156057, 0xf10a68e8, 0x00d06d42, 0x5b514b83, 0xaa8b4e29,
+    0x63944696, 0x924e433c, 0x2adb51a9, 0xdb015403, 0x121e5cbc,
+    0xe3c45916},
+   {0x00000000, 0x0ee7e8d1, 0x1dcfd1a2, 0x13283973, 0x3b9fa344,
+    0x35784b95, 0x265072e6, 0x28b79a37, 0x773f4688, 0x79d8ae59,
+    0x6af0972a, 0x64177ffb, 0x4ca0e5cc, 0x42470d1d, 0x516f346e,
+    0x5f88dcbf, 0xee7e8d10, 0xe09965c1, 0xf3b15cb2, 0xfd56b463,
+    0xd5e12e54, 0xdb06c685, 0xc82efff6, 0xc6c91727, 0x9941cb98,
+    0x97a62349, 0x848e1a3a, 0x8a69f2eb, 0xa2de68dc, 0xac39800d,
+    0xbf11b97e, 0xb1f651af, 0x078c1c61, 0x096bf4b0, 0x1a43cdc3,
+    0x14a42512, 0x3c13bf25, 0x32f457f4, 0x21dc6e87, 0x2f3b8656,
+    0x70b35ae9, 0x7e54b238, 0x6d7c8b4b, 0x639b639a, 0x4b2cf9ad,
+    0x45cb117c, 0x56e3280f, 0x5804c0de, 0xe9f29171, 0xe71579a0,
+    0xf43d40d3, 0xfadaa802, 0xd26d3235, 0xdc8adae4, 0xcfa2e397,
+    0xc1450b46, 0x9ecdd7f9, 0x902a3f28, 0x8302065b, 0x8de5ee8a,
+    0xa55274bd, 0xabb59c6c, 0xb89da51f, 0xb67a4dce, 0x0f1838c2,
+    0x01ffd013, 0x12d7e960, 0x1c3001b1, 0x34879b86, 0x3a607357,
+    0x29484a24, 0x27afa2f5, 0x78277e4a, 0x76c0969b, 0x65e8afe8,
+    0x6b0f4739, 0x43b8dd0e, 0x4d5f35df, 0x5e770cac, 0x5090e47d,
+    0xe166b5d2, 0xef815d03, 0xfca96470, 0xf24e8ca1, 0xdaf91696,
+    0xd41efe47, 0xc736c734, 0xc9d12fe5, 0x9659f35a, 0x98be1b8b,
+    0x8b9622f8, 0x8571ca29, 0xadc6501e, 0xa321b8cf, 0xb00981bc,
+    0xbeee696d, 0x089424a3, 0x0673cc72, 0x155bf501, 0x1bbc1dd0,
+    0x330b87e7, 0x3dec6f36, 0x2ec45645, 0x2023be94, 0x7fab622b,
+    0x714c8afa, 0x6264b389, 0x6c835b58, 0x4434c16f, 0x4ad329be,
+    0x59fb10cd, 0x571cf81c, 0xe6eaa9b3, 0xe80d4162, 0xfb257811,
+    0xf5c290c0, 0xdd750af7, 0xd392e226, 0xc0badb55, 0xce5d3384,
+    0x91d5ef3b, 0x9f3207ea, 0x8c1a3e99, 0x82fdd648, 0xaa4a4c7f,
+    0xa4ada4ae, 0xb7859ddd, 0xb962750c, 0x1e307184, 0x10d79955,
+    0x03ffa026, 0x0d1848f7, 0x25afd2c0, 0x2b483a11, 0x38600362,
+    0x3687ebb3, 0x690f370c, 0x67e8dfdd, 0x74c0e6ae, 0x7a270e7f,
+    0x52909448, 0x5c777c99, 0x4f5f45ea, 0x41b8ad3b, 0xf04efc94,
+    0xfea91445, 0xed812d36, 0xe366c5e7, 0xcbd15fd0, 0xc536b701,
+    0xd61e8e72, 0xd8f966a3, 0x8771ba1c, 0x899652cd, 0x9abe6bbe,
+    0x9459836f, 0xbcee1958, 0xb209f189, 0xa121c8fa, 0xafc6202b,
+    0x19bc6de5, 0x175b8534, 0x0473bc47, 0x0a945496, 0x2223cea1,
+    0x2cc42670, 0x3fec1f03, 0x310bf7d2, 0x6e832b6d, 0x6064c3bc,
+    0x734cfacf, 0x7dab121e, 0x551c8829, 0x5bfb60f8, 0x48d3598b,
+    0x4634b15a, 0xf7c2e0f5, 0xf9250824, 0xea0d3157, 0xe4ead986,
+    0xcc5d43b1, 0xc2baab60, 0xd1929213, 0xdf757ac2, 0x80fda67d,
+    0x8e1a4eac, 0x9d3277df, 0x93d59f0e, 0xbb620539, 0xb585ede8,
+    0xa6add49b, 0xa84a3c4a, 0x11284946, 0x1fcfa197, 0x0ce798e4,
+    0x02007035, 0x2ab7ea02, 0x245002d3, 0x37783ba0, 0x399fd371,
+    0x66170fce, 0x68f0e71f, 0x7bd8de6c, 0x753f36bd, 0x5d88ac8a,
+    0x536f445b, 0x40477d28, 0x4ea095f9, 0xff56c456, 0xf1b12c87,
+    0xe29915f4, 0xec7efd25, 0xc4c96712, 0xca2e8fc3, 0xd906b6b0,
+    0xd7e15e61, 0x886982de, 0x868e6a0f, 0x95a6537c, 0x9b41bbad,
+    0xb3f6219a, 0xbd11c94b, 0xae39f038, 0xa0de18e9, 0x16a45527,
+    0x1843bdf6, 0x0b6b8485, 0x058c6c54, 0x2d3bf663, 0x23dc1eb2,
+    0x30f427c1, 0x3e13cf10, 0x619b13af, 0x6f7cfb7e, 0x7c54c20d,
+    0x72b32adc, 0x5a04b0eb, 0x54e3583a, 0x47cb6149, 0x492c8998,
+    0xf8dad837, 0xf63d30e6, 0xe5150995, 0xebf2e144, 0xc3457b73,
+    0xcda293a2, 0xde8aaad1, 0xd06d4200, 0x8fe59ebf, 0x8102766e,
+    0x922a4f1d, 0x9ccda7cc, 0xb47a3dfb, 0xba9dd52a, 0xa9b5ec59,
+    0xa7520488},
+   {0x00000000, 0x3c60e308, 0x78c1c610, 0x44a12518, 0xf1838c20,
+    0xcde36f28, 0x89424a30, 0xb522a938, 0x38761e01, 0x0416fd09,
+    0x40b7d811, 0x7cd73b19, 0xc9f59221, 0xf5957129, 0xb1345431,
+    0x8d54b739, 0x70ec3c02, 0x4c8cdf0a, 0x082dfa12, 0x344d191a,
+    0x816fb022, 0xbd0f532a, 0xf9ae7632, 0xc5ce953a, 0x489a2203,
+    0x74fac10b, 0x305be413, 0x0c3b071b, 0xb919ae23, 0x85794d2b,
+    0xc1d86833, 0xfdb88b3b, 0xe1d87804, 0xddb89b0c, 0x9919be14,
+    0xa5795d1c, 0x105bf424, 0x2c3b172c, 0x689a3234, 0x54fad13c,
+    0xd9ae6605, 0xe5ce850d, 0xa16fa015, 0x9d0f431d, 0x282dea25,
+    0x144d092d, 0x50ec2c35, 0x6c8ccf3d, 0x91344406, 0xad54a70e,
+    0xe9f58216, 0xd595611e, 0x60b7c826, 0x5cd72b2e, 0x18760e36,
+    0x2416ed3e, 0xa9425a07, 0x9522b90f, 0xd1839c17, 0xede37f1f,
+    0x58c1d627, 0x64a1352f, 0x20001037, 0x1c60f33f, 0x18c1f649,
+    0x24a11541, 0x60003059, 0x5c60d351, 0xe9427a69, 0xd5229961,
+    0x9183bc79, 0xade35f71, 0x20b7e848, 0x1cd70b40, 0x58762e58,
+    0x6416cd50, 0xd1346468, 0xed548760, 0xa9f5a278, 0x95954170,
+    0x682dca4b, 0x544d2943, 0x10ec0c5b, 0x2c8cef53, 0x99ae466b,
+    0xa5cea563, 0xe16f807b, 0xdd0f6373, 0x505bd44a, 0x6c3b3742,
+    0x289a125a, 0x14faf152, 0xa1d8586a, 0x9db8bb62, 0xd9199e7a,
+    0xe5797d72, 0xf9198e4d, 0xc5796d45, 0x81d8485d, 0xbdb8ab55,
+    0x089a026d, 0x34fae165, 0x705bc47d, 0x4c3b2775, 0xc16f904c,
+    0xfd0f7344, 0xb9ae565c, 0x85ceb554, 0x30ec1c6c, 0x0c8cff64,
+    0x482dda7c, 0x744d3974, 0x89f5b24f, 0xb5955147, 0xf134745f,
+    0xcd549757, 0x78763e6f, 0x4416dd67, 0x00b7f87f, 0x3cd71b77,
+    0xb183ac4e, 0x8de34f46, 0xc9426a5e, 0xf5228956, 0x4000206e,
+    0x7c60c366, 0x38c1e67e, 0x04a10576, 0x3183ec92, 0x0de30f9a,
+    0x49422a82, 0x7522c98a, 0xc00060b2, 0xfc6083ba, 0xb8c1a6a2,
+    0x84a145aa, 0x09f5f293, 0x3595119b, 0x71343483, 0x4d54d78b,
+    0xf8767eb3, 0xc4169dbb, 0x80b7b8a3, 0xbcd75bab, 0x416fd090,
+    0x7d0f3398, 0x39ae1680, 0x05cef588, 0xb0ec5cb0, 0x8c8cbfb8,
+    0xc82d9aa0, 0xf44d79a8, 0x7919ce91, 0x45792d99, 0x01d80881,
+    0x3db8eb89, 0x889a42b1, 0xb4faa1b9, 0xf05b84a1, 0xcc3b67a9,
+    0xd05b9496, 0xec3b779e, 0xa89a5286, 0x94fab18e, 0x21d818b6,
+    0x1db8fbbe, 0x5919dea6, 0x65793dae, 0xe82d8a97, 0xd44d699f,
+    0x90ec4c87, 0xac8caf8f, 0x19ae06b7, 0x25cee5bf, 0x616fc0a7,
+    0x5d0f23af, 0xa0b7a894, 0x9cd74b9c, 0xd8766e84, 0xe4168d8c,
+    0x513424b4, 0x6d54c7bc, 0x29f5e2a4, 0x159501ac, 0x98c1b695,
+    0xa4a1559d, 0xe0007085, 0xdc60938d, 0x69423ab5, 0x5522d9bd,
+    0x1183fca5, 0x2de31fad, 0x29421adb, 0x1522f9d3, 0x5183dccb,
+    0x6de33fc3, 0xd8c196fb, 0xe4a175f3, 0xa00050eb, 0x9c60b3e3,
+    0x113404da, 0x2d54e7d2, 0x69f5c2ca, 0x559521c2, 0xe0b788fa,
+    0xdcd76bf2, 0x98764eea, 0xa416ade2, 0x59ae26d9, 0x65cec5d1,
+    0x216fe0c9, 0x1d0f03c1, 0xa82daaf9, 0x944d49f1, 0xd0ec6ce9,
+    0xec8c8fe1, 0x61d838d8, 0x5db8dbd0, 0x1919fec8, 0x25791dc0,
+    0x905bb4f8, 0xac3b57f0, 0xe89a72e8, 0xd4fa91e0, 0xc89a62df,
+    0xf4fa81d7, 0xb05ba4cf, 0x8c3b47c7, 0x3919eeff, 0x05790df7,
+    0x41d828ef, 0x7db8cbe7, 0xf0ec7cde, 0xcc8c9fd6, 0x882dbace,
+    0xb44d59c6, 0x016ff0fe, 0x3d0f13f6, 0x79ae36ee, 0x45ced5e6,
+    0xb8765edd, 0x8416bdd5, 0xc0b798cd, 0xfcd77bc5, 0x49f5d2fd,
+    0x759531f5, 0x313414ed, 0x0d54f7e5, 0x800040dc, 0xbc60a3d4,
+    0xf8c186cc, 0xc4a165c4, 0x7183ccfc, 0x4de32ff4, 0x09420aec,
+    0x3522e9e4},
+   {0x00000000, 0x6307d924, 0xc60fb248, 0xa5086b6c, 0x576e62d1,
+    0x3469bbf5, 0x9161d099, 0xf26609bd, 0xaedcc5a2, 0xcddb1c86,
+    0x68d377ea, 0x0bd4aece, 0xf9b2a773, 0x9ab57e57, 0x3fbd153b,
+    0x5cbacc1f, 0x86c88d05, 0xe5cf5421, 0x40c73f4d, 0x23c0e669,
+    0xd1a6efd4, 0xb2a136f0, 0x17a95d9c, 0x74ae84b8, 0x281448a7,
+    0x4b139183, 0xee1bfaef, 0x8d1c23cb, 0x7f7a2a76, 0x1c7df352,
+    0xb975983e, 0xda72411a, 0xd6e01c4b, 0xb5e7c56f, 0x10efae03,
+    0x73e87727, 0x818e7e9a, 0xe289a7be, 0x4781ccd2, 0x248615f6,
+    0x783cd9e9, 0x1b3b00cd, 0xbe336ba1, 0xdd34b285, 0x2f52bb38,
+    0x4c55621c, 0xe95d0970, 0x8a5ad054, 0x5028914e, 0x332f486a,
+    0x96272306, 0xf520fa22, 0x0746f39f, 0x64412abb, 0xc14941d7,
+    0xa24e98f3, 0xfef454ec, 0x9df38dc8, 0x38fbe6a4, 0x5bfc3f80,
+    0xa99a363d, 0xca9def19, 0x6f958475, 0x0c925d51, 0x76b13ed7,
+    0x15b6e7f3, 0xb0be8c9f, 0xd3b955bb, 0x21df5c06, 0x42d88522,
+    0xe7d0ee4e, 0x84d7376a, 0xd86dfb75, 0xbb6a2251, 0x1e62493d,
+    0x7d659019, 0x8f0399a4, 0xec044080, 0x490c2bec, 0x2a0bf2c8,
+    0xf079b3d2, 0x937e6af6, 0x3676019a, 0x5571d8be, 0xa717d103,
+    0xc4100827, 0x6118634b, 0x021fba6f, 0x5ea57670, 0x3da2af54,
+    0x98aac438, 0xfbad1d1c, 0x09cb14a1, 0x6acccd85, 0xcfc4a6e9,
+    0xacc37fcd, 0xa051229c, 0xc356fbb8, 0x665e90d4, 0x055949f0,
+    0xf73f404d, 0x94389969, 0x3130f205, 0x52372b21, 0x0e8de73e,
+    0x6d8a3e1a, 0xc8825576, 0xab858c52, 0x59e385ef, 0x3ae45ccb,
+    0x9fec37a7, 0xfcebee83, 0x2699af99, 0x459e76bd, 0xe0961dd1,
+    0x8391c4f5, 0x71f7cd48, 0x12f0146c, 0xb7f87f00, 0xd4ffa624,
+    0x88456a3b, 0xeb42b31f, 0x4e4ad873, 0x2d4d0157, 0xdf2b08ea,
+    0xbc2cd1ce, 0x1924baa2, 0x7a236386, 0xed627dae, 0x8e65a48a,
+    0x2b6dcfe6, 0x486a16c2, 0xba0c1f7f, 0xd90bc65b, 0x7c03ad37,
+    0x1f047413, 0x43beb80c, 0x20b96128, 0x85b10a44, 0xe6b6d360,
+    0x14d0dadd, 0x77d703f9, 0xd2df6895, 0xb1d8b1b1, 0x6baaf0ab,
+    0x08ad298f, 0xada542e3, 0xcea29bc7, 0x3cc4927a, 0x5fc34b5e,
+    0xfacb2032, 0x99ccf916, 0xc5763509, 0xa671ec2d, 0x03798741,
+    0x607e5e65, 0x921857d8, 0xf11f8efc, 0x5417e590, 0x37103cb4,
+    0x3b8261e5, 0x5885b8c1, 0xfd8dd3ad, 0x9e8a0a89, 0x6cec0334,
+    0x0febda10, 0xaae3b17c, 0xc9e46858, 0x955ea447, 0xf6597d63,
+    0x5351160f, 0x3056cf2b, 0xc230c696, 0xa1371fb2, 0x043f74de,
+    0x6738adfa, 0xbd4aece0, 0xde4d35c4, 0x7b455ea8, 0x1842878c,
+    0xea248e31, 0x89235715, 0x2c2b3c79, 0x4f2ce55d, 0x13962942,
+    0x7091f066, 0xd5999b0a, 0xb69e422e, 0x44f84b93, 0x27ff92b7,
+    0x82f7f9db, 0xe1f020ff, 0x9bd34379, 0xf8d49a5d, 0x5ddcf131,
+    0x3edb2815, 0xccbd21a8, 0xafbaf88c, 0x0ab293e0, 0x69b54ac4,
+    0x350f86db, 0x56085fff, 0xf3003493, 0x9007edb7, 0x6261e40a,
+    0x01663d2e, 0xa46e5642, 0xc7698f66, 0x1d1bce7c, 0x7e1c1758,
+    0xdb147c34, 0xb813a510, 0x4a75acad, 0x29727589, 0x8c7a1ee5,
+    0xef7dc7c1, 0xb3c70bde, 0xd0c0d2fa, 0x75c8b996, 0x16cf60b2,
+    0xe4a9690f, 0x87aeb02b, 0x22a6db47, 0x41a10263, 0x4d335f32,
+    0x2e348616, 0x8b3ced7a, 0xe83b345e, 0x1a5d3de3, 0x795ae4c7,
+    0xdc528fab, 0xbf55568f, 0xe3ef9a90, 0x80e843b4, 0x25e028d8,
+    0x46e7f1fc, 0xb481f841, 0xd7862165, 0x728e4a09, 0x1189932d,
+    0xcbfbd237, 0xa8fc0b13, 0x0df4607f, 0x6ef3b95b, 0x9c95b0e6,
+    0xff9269c2, 0x5a9a02ae, 0x399ddb8a, 0x65271795, 0x0620ceb1,
+    0xa328a5dd, 0xc02f7cf9, 0x32497544, 0x514eac60, 0xf446c70c,
+    0x97411e28},
+   {0x00000000, 0x01b5fd1d, 0x036bfa3a, 0x02de0727, 0x06d7f474,
+    0x07620969, 0x05bc0e4e, 0x0409f353, 0x0dafe8e8, 0x0c1a15f5,
+    0x0ec412d2, 0x0f71efcf, 0x0b781c9c, 0x0acde181, 0x0813e6a6,
+    0x09a61bbb, 0x1b5fd1d0, 0x1aea2ccd, 0x18342bea, 0x1981d6f7,
+    0x1d8825a4, 0x1c3dd8b9, 0x1ee3df9e, 0x1f562283, 0x16f03938,
+    0x1745c425, 0x159bc302, 0x142e3e1f, 0x1027cd4c, 0x11923051,
+    0x134c3776, 0x12f9ca6b, 0x36bfa3a0, 0x370a5ebd, 0x35d4599a,
+    0x3461a487, 0x306857d4, 0x31ddaac9, 0x3303adee, 0x32b650f3,
+    0x3b104b48, 0x3aa5b655, 0x387bb172, 0x39ce4c6f, 0x3dc7bf3c,
+    0x3c724221, 0x3eac4506, 0x3f19b81b, 0x2de07270, 0x2c558f6d,
+    0x2e8b884a, 0x2f3e7557, 0x2b378604, 0x2a827b19, 0x285c7c3e,
+    0x29e98123, 0x204f9a98, 0x21fa6785, 0x232460a2, 0x22919dbf,
+    0x26986eec, 0x272d93f1, 0x25f394d6, 0x244669cb, 0x6d7f4740,
+    0x6ccaba5d, 0x6e14bd7a, 0x6fa14067, 0x6ba8b334, 0x6a1d4e29,
+    0x68c3490e, 0x6976b413, 0x60d0afa8, 0x616552b5, 0x63bb5592,
+    0x620ea88f, 0x66075bdc, 0x67b2a6c1, 0x656ca1e6, 0x64d95cfb,
+    0x76209690, 0x77956b8d, 0x754b6caa, 0x74fe91b7, 0x70f762e4,
+    0x71429ff9, 0x739c98de, 0x722965c3, 0x7b8f7e78, 0x7a3a8365,
+    0x78e48442, 0x7951795f, 0x7d588a0c, 0x7ced7711, 0x7e337036,
+    0x7f868d2b, 0x5bc0e4e0, 0x5a7519fd, 0x58ab1eda, 0x591ee3c7,
+    0x5d171094, 0x5ca2ed89, 0x5e7ceaae, 0x5fc917b3, 0x566f0c08,
+    0x57daf115, 0x5504f632, 0x54b10b2f, 0x50b8f87c, 0x510d0561,
+    0x53d30246, 0x5266ff5b, 0x409f3530, 0x412ac82d, 0x43f4cf0a,
+    0x42413217, 0x4648c144, 0x47fd3c59, 0x45233b7e, 0x4496c663,
+    0x4d30ddd8, 0x4c8520c5, 0x4e5b27e2, 0x4feedaff, 0x4be729ac,
+    0x4a52d4b1, 0x488cd396, 0x49392e8b, 0xdafe8e80, 0xdb4b739d,
+    0xd99574ba, 0xd82089a7, 0xdc297af4, 0xdd9c87e9, 0xdf4280ce,
+    0xdef77dd3, 0xd7516668, 0xd6e49b75, 0xd43a9c52, 0xd58f614f,
+    0xd186921c, 0xd0336f01, 0xd2ed6826, 0xd358953b, 0xc1a15f50,
+    0xc014a24d, 0xc2caa56a, 0xc37f5877, 0xc776ab24, 0xc6c35639,
+    0xc41d511e, 0xc5a8ac03, 0xcc0eb7b8, 0xcdbb4aa5, 0xcf654d82,
+    0xced0b09f, 0xcad943cc, 0xcb6cbed1, 0xc9b2b9f6, 0xc80744eb,
+    0xec412d20, 0xedf4d03d, 0xef2ad71a, 0xee9f2a07, 0xea96d954,
+    0xeb232449, 0xe9fd236e, 0xe848de73, 0xe1eec5c8, 0xe05b38d5,
+    0xe2853ff2, 0xe330c2ef, 0xe73931bc, 0xe68ccca1, 0xe452cb86,
+    0xe5e7369b, 0xf71efcf0, 0xf6ab01ed, 0xf47506ca, 0xf5c0fbd7,
+    0xf1c90884, 0xf07cf599, 0xf2a2f2be, 0xf3170fa3, 0xfab11418,
+    0xfb04e905, 0xf9daee22, 0xf86f133f, 0xfc66e06c, 0xfdd31d71,
+    0xff0d1a56, 0xfeb8e74b, 0xb781c9c0, 0xb63434dd, 0xb4ea33fa,
+    0xb55fcee7, 0xb1563db4, 0xb0e3c0a9, 0xb23dc78e, 0xb3883a93,
+    0xba2e2128, 0xbb9bdc35, 0xb945db12, 0xb8f0260f, 0xbcf9d55c,
+    0xbd4c2841, 0xbf922f66, 0xbe27d27b, 0xacde1810, 0xad6be50d,
+    0xafb5e22a, 0xae001f37, 0xaa09ec64, 0xabbc1179, 0xa962165e,
+    0xa8d7eb43, 0xa171f0f8, 0xa0c40de5, 0xa21a0ac2, 0xa3aff7df,
+    0xa7a6048c, 0xa613f991, 0xa4cdfeb6, 0xa57803ab, 0x813e6a60,
+    0x808b977d, 0x8255905a, 0x83e06d47, 0x87e99e14, 0x865c6309,
+    0x8482642e, 0x85379933, 0x8c918288, 0x8d247f95, 0x8ffa78b2,
+    0x8e4f85af, 0x8a4676fc, 0x8bf38be1, 0x892d8cc6, 0x889871db,
+    0x9a61bbb0, 0x9bd446ad, 0x990a418a, 0x98bfbc97, 0x9cb64fc4,
+    0x9d03b2d9, 0x9fddb5fe, 0x9e6848e3, 0x97ce5358, 0x967bae45,
+    0x94a5a962, 0x9510547f, 0x9119a72c, 0x90ac5a31, 0x92725d16,
+    0x93c7a00b},
+   {0x00000000, 0x6e8c1b41, 0xdd183682, 0xb3942dc3, 0x61416b45,
+    0x0fcd7004, 0xbc595dc7, 0xd2d54686, 0xc282d68a, 0xac0ecdcb,
+    0x1f9ae008, 0x7116fb49, 0xa3c3bdcf, 0xcd4fa68e, 0x7edb8b4d,
+    0x1057900c, 0x5e74ab55, 0x30f8b014, 0x836c9dd7, 0xede08696,
+    0x3f35c010, 0x51b9db51, 0xe22df692, 0x8ca1edd3, 0x9cf67ddf,
+    0xf27a669e, 0x41ee4b5d, 0x2f62501c, 0xfdb7169a, 0x933b0ddb,
+    0x20af2018, 0x4e233b59, 0xbce956aa, 0xd2654deb, 0x61f16028,
+    0x0f7d7b69, 0xdda83def, 0xb32426ae, 0x00b00b6d, 0x6e3c102c,
+    0x7e6b8020, 0x10e79b61, 0xa373b6a2, 0xcdffade3, 0x1f2aeb65,
+    0x71a6f024, 0xc232dde7, 0xacbec6a6, 0xe29dfdff, 0x8c11e6be,
+    0x3f85cb7d, 0x5109d03c, 0x83dc96ba, 0xed508dfb, 0x5ec4a038,
+    0x3048bb79, 0x201f2b75, 0x4e933034, 0xfd071df7, 0x938b06b6,
+    0x415e4030, 0x2fd25b71, 0x9c4676b2, 0xf2ca6df3, 0xa2a3ab15,
+    0xcc2fb054, 0x7fbb9d97, 0x113786d6, 0xc3e2c050, 0xad6edb11,
+    0x1efaf6d2, 0x7076ed93, 0x60217d9f, 0x0ead66de, 0xbd394b1d,
+    0xd3b5505c, 0x016016da, 0x6fec0d9b, 0xdc782058, 0xb2f43b19,
+    0xfcd70040, 0x925b1b01, 0x21cf36c2, 0x4f432d83, 0x9d966b05,
+    0xf31a7044, 0x408e5d87, 0x2e0246c6, 0x3e55d6ca, 0x50d9cd8b,
+    0xe34de048, 0x8dc1fb09, 0x5f14bd8f, 0x3198a6ce, 0x820c8b0d,
+    0xec80904c, 0x1e4afdbf, 0x70c6e6fe, 0xc352cb3d, 0xadded07c,
+    0x7f0b96fa, 0x11878dbb, 0xa213a078, 0xcc9fbb39, 0xdcc82b35,
+    0xb2443074, 0x01d01db7, 0x6f5c06f6, 0xbd894070, 0xd3055b31,
+    0x609176f2, 0x0e1d6db3, 0x403e56ea, 0x2eb24dab, 0x9d266068,
+    0xf3aa7b29, 0x217f3daf, 0x4ff326ee, 0xfc670b2d, 0x92eb106c,
+    0x82bc8060, 0xec309b21, 0x5fa4b6e2, 0x3128ada3, 0xe3fdeb25,
+    0x8d71f064, 0x3ee5dda7, 0x5069c6e6, 0x9e36506b, 0xf0ba4b2a,
+    0x432e66e9, 0x2da27da8, 0xff773b2e, 0x91fb206f, 0x226f0dac,
+    0x4ce316ed, 0x5cb486e1, 0x32389da0, 0x81acb063, 0xef20ab22,
+    0x3df5eda4, 0x5379f6e5, 0xe0eddb26, 0x8e61c067, 0xc042fb3e,
+    0xaecee07f, 0x1d5acdbc, 0x73d6d6fd, 0xa103907b, 0xcf8f8b3a,
+    0x7c1ba6f9, 0x1297bdb8, 0x02c02db4, 0x6c4c36f5, 0xdfd81b36,
+    0xb1540077, 0x638146f1, 0x0d0d5db0, 0xbe997073, 0xd0156b32,
+    0x22df06c1, 0x4c531d80, 0xffc73043, 0x914b2b02, 0x439e6d84,
+    0x2d1276c5, 0x9e865b06, 0xf00a4047, 0xe05dd04b, 0x8ed1cb0a,
+    0x3d45e6c9, 0x53c9fd88, 0x811cbb0e, 0xef90a04f, 0x5c048d8c,
+    0x328896cd, 0x7cabad94, 0x1227b6d5, 0xa1b39b16, 0xcf3f8057,
+    0x1deac6d1, 0x7366dd90, 0xc0f2f053, 0xae7eeb12, 0xbe297b1e,
+    0xd0a5605f, 0x63314d9c, 0x0dbd56dd, 0xdf68105b, 0xb1e40b1a,
+    0x027026d9, 0x6cfc3d98, 0x3c95fb7e, 0x5219e03f, 0xe18dcdfc,
+    0x8f01d6bd, 0x5dd4903b, 0x33588b7a, 0x80cca6b9, 0xee40bdf8,
+    0xfe172df4, 0x909b36b5, 0x230f1b76, 0x4d830037, 0x9f5646b1,
+    0xf1da5df0, 0x424e7033, 0x2cc26b72, 0x62e1502b, 0x0c6d4b6a,
+    0xbff966a9, 0xd1757de8, 0x03a03b6e, 0x6d2c202f, 0xdeb80dec,
+    0xb03416ad, 0xa06386a1, 0xceef9de0, 0x7d7bb023, 0x13f7ab62,
+    0xc122ede4, 0xafaef6a5, 0x1c3adb66, 0x72b6c027, 0x807cadd4,
+    0xeef0b695, 0x5d649b56, 0x33e88017, 0xe13dc691, 0x8fb1ddd0,
+    0x3c25f013, 0x52a9eb52, 0x42fe7b5e, 0x2c72601f, 0x9fe64ddc,
+    0xf16a569d, 0x23bf101b, 0x4d330b5a, 0xfea72699, 0x902b3dd8,
+    0xde080681, 0xb0841dc0, 0x03103003, 0x6d9c2b42, 0xbf496dc4,
+    0xd1c57685, 0x62515b46, 0x0cdd4007, 0x1c8ad00b, 0x7206cb4a,
+    0xc192e689, 0xaf1efdc8, 0x7dcbbb4e, 0x1347a00f, 0xa0d38dcc,
+    0xce5f968d},
+   {0x00000000, 0xe71da697, 0x154a4b6f, 0xf257edf8, 0x2a9496de,
+    0xcd893049, 0x3fdeddb1, 0xd8c37b26, 0x55292dbc, 0xb2348b2b,
+    0x406366d3, 0xa77ec044, 0x7fbdbb62, 0x98a01df5, 0x6af7f00d,
+    0x8dea569a, 0xaa525b78, 0x4d4ffdef, 0xbf181017, 0x5805b680,
+    0x80c6cda6, 0x67db6b31, 0x958c86c9, 0x7291205e, 0xff7b76c4,
+    0x1866d053, 0xea313dab, 0x0d2c9b3c, 0xd5efe01a, 0x32f2468d,
+    0xc0a5ab75, 0x27b80de2, 0x8fd5b0b1, 0x68c81626, 0x9a9ffbde,
+    0x7d825d49, 0xa541266f, 0x425c80f8, 0xb00b6d00, 0x5716cb97,
+    0xdafc9d0d, 0x3de13b9a, 0xcfb6d662, 0x28ab70f5, 0xf0680bd3,
+    0x1775ad44, 0xe52240bc, 0x023fe62b, 0x2587ebc9, 0xc29a4d5e,
+    0x30cda0a6, 0xd7d00631, 0x0f137d17, 0xe80edb80, 0x1a593678,
+    0xfd4490ef, 0x70aec675, 0x97b360e2, 0x65e48d1a, 0x82f92b8d,
+    0x5a3a50ab, 0xbd27f63c, 0x4f701bc4, 0xa86dbd53, 0xc4da6723,
+    0x23c7c1b4, 0xd1902c4c, 0x368d8adb, 0xee4ef1fd, 0x0953576a,
+    0xfb04ba92, 0x1c191c05, 0x91f34a9f, 0x76eeec08, 0x84b901f0,
+    0x63a4a767, 0xbb67dc41, 0x5c7a7ad6, 0xae2d972e, 0x493031b9,
+    0x6e883c5b, 0x89959acc, 0x7bc27734, 0x9cdfd1a3, 0x441caa85,
+    0xa3010c12, 0x5156e1ea, 0xb64b477d, 0x3ba111e7, 0xdcbcb770,
+    0x2eeb5a88, 0xc9f6fc1f, 0x11358739, 0xf62821ae, 0x047fcc56,
+    0xe3626ac1, 0x4b0fd792, 0xac127105, 0x5e459cfd, 0xb9583a6a,
+    0x619b414c, 0x8686e7db, 0x74d10a23, 0x93ccacb4, 0x1e26fa2e,
+    0xf93b5cb9, 0x0b6cb141, 0xec7117d6, 0x34b26cf0, 0xd3afca67,
+    0x21f8279f, 0xc6e58108, 0xe15d8cea, 0x06402a7d, 0xf417c785,
+    0x130a6112, 0xcbc91a34, 0x2cd4bca3, 0xde83515b, 0x399ef7cc,
+    0xb474a156, 0x536907c1, 0xa13eea39, 0x46234cae, 0x9ee03788,
+    0x79fd911f, 0x8baa7ce7, 0x6cb7da70, 0x52c5c807, 0xb5d86e90,
+    0x478f8368, 0xa09225ff, 0x78515ed9, 0x9f4cf84e, 0x6d1b15b6,
+    0x8a06b321, 0x07ece5bb, 0xe0f1432c, 0x12a6aed4, 0xf5bb0843,
+    0x2d787365, 0xca65d5f2, 0x3832380a, 0xdf2f9e9d, 0xf897937f,
+    0x1f8a35e8, 0xedddd810, 0x0ac07e87, 0xd20305a1, 0x351ea336,
+    0xc7494ece, 0x2054e859, 0xadbebec3, 0x4aa31854, 0xb8f4f5ac,
+    0x5fe9533b, 0x872a281d, 0x60378e8a, 0x92606372, 0x757dc5e5,
+    0xdd1078b6, 0x3a0dde21, 0xc85a33d9, 0x2f47954e, 0xf784ee68,
+    0x109948ff, 0xe2cea507, 0x05d30390, 0x8839550a, 0x6f24f39d,
+    0x9d731e65, 0x7a6eb8f2, 0xa2adc3d4, 0x45b06543, 0xb7e788bb,
+    0x50fa2e2c, 0x774223ce, 0x905f8559, 0x620868a1, 0x8515ce36,
+    0x5dd6b510, 0xbacb1387, 0x489cfe7f, 0xaf8158e8, 0x226b0e72,
+    0xc576a8e5, 0x3721451d, 0xd03ce38a, 0x08ff98ac, 0xefe23e3b,
+    0x1db5d3c3, 0xfaa87554, 0x961faf24, 0x710209b3, 0x8355e44b,
+    0x644842dc, 0xbc8b39fa, 0x5b969f6d, 0xa9c17295, 0x4edcd402,
+    0xc3368298, 0x242b240f, 0xd67cc9f7, 0x31616f60, 0xe9a21446,
+    0x0ebfb2d1, 0xfce85f29, 0x1bf5f9be, 0x3c4df45c, 0xdb5052cb,
+    0x2907bf33, 0xce1a19a4, 0x16d96282, 0xf1c4c415, 0x039329ed,
+    0xe48e8f7a, 0x6964d9e0, 0x8e797f77, 0x7c2e928f, 0x9b333418,
+    0x43f04f3e, 0xa4ede9a9, 0x56ba0451, 0xb1a7a2c6, 0x19ca1f95,
+    0xfed7b902, 0x0c8054fa, 0xeb9df26d, 0x335e894b, 0xd4432fdc,
+    0x2614c224, 0xc10964b3, 0x4ce33229, 0xabfe94be, 0x59a97946,
+    0xbeb4dfd1, 0x6677a4f7, 0x816a0260, 0x733def98, 0x9420490f,
+    0xb39844ed, 0x5485e27a, 0xa6d20f82, 0x41cfa915, 0x990cd233,
+    0x7e1174a4, 0x8c46995c, 0x6b5b3fcb, 0xe6b16951, 0x01accfc6,
+    0xf3fb223e, 0x14e684a9, 0xcc25ff8f, 0x2b385918, 0xd96fb4e0,
+    0x3e721277},
+   {0x00000000, 0xa58b900e, 0x9066265d, 0x35edb653, 0xfbbd4afb,
+    0x5e36daf5, 0x6bdb6ca6, 0xce50fca8, 0x2c0b93b7, 0x898003b9,
+    0xbc6db5ea, 0x19e625e4, 0xd7b6d94c, 0x723d4942, 0x47d0ff11,
+    0xe25b6f1f, 0x5817276e, 0xfd9cb760, 0xc8710133, 0x6dfa913d,
+    0xa3aa6d95, 0x0621fd9b, 0x33cc4bc8, 0x9647dbc6, 0x741cb4d9,
+    0xd19724d7, 0xe47a9284, 0x41f1028a, 0x8fa1fe22, 0x2a2a6e2c,
+    0x1fc7d87f, 0xba4c4871, 0xb02e4edc, 0x15a5ded2, 0x20486881,
+    0x85c3f88f, 0x4b930427, 0xee189429, 0xdbf5227a, 0x7e7eb274,
+    0x9c25dd6b, 0x39ae4d65, 0x0c43fb36, 0xa9c86b38, 0x67989790,
+    0xc213079e, 0xf7feb1cd, 0x527521c3, 0xe83969b2, 0x4db2f9bc,
+    0x785f4fef, 0xddd4dfe1, 0x13842349, 0xb60fb347, 0x83e20514,
+    0x2669951a, 0xc432fa05, 0x61b96a0b, 0x5454dc58, 0xf1df4c56,
+    0x3f8fb0fe, 0x9a0420f0, 0xafe996a3, 0x0a6206ad, 0xbb2d9bf9,
+    0x1ea60bf7, 0x2b4bbda4, 0x8ec02daa, 0x4090d102, 0xe51b410c,
+    0xd0f6f75f, 0x757d6751, 0x9726084e, 0x32ad9840, 0x07402e13,
+    0xa2cbbe1d, 0x6c9b42b5, 0xc910d2bb, 0xfcfd64e8, 0x5976f4e6,
+    0xe33abc97, 0x46b12c99, 0x735c9aca, 0xd6d70ac4, 0x1887f66c,
+    0xbd0c6662, 0x88e1d031, 0x2d6a403f, 0xcf312f20, 0x6ababf2e,
+    0x5f57097d, 0xfadc9973, 0x348c65db, 0x9107f5d5, 0xa4ea4386,
+    0x0161d388, 0x0b03d525, 0xae88452b, 0x9b65f378, 0x3eee6376,
+    0xf0be9fde, 0x55350fd0, 0x60d8b983, 0xc553298d, 0x27084692,
+    0x8283d69c, 0xb76e60cf, 0x12e5f0c1, 0xdcb50c69, 0x793e9c67,
+    0x4cd32a34, 0xe958ba3a, 0x5314f24b, 0xf69f6245, 0xc372d416,
+    0x66f94418, 0xa8a9b8b0, 0x0d2228be, 0x38cf9eed, 0x9d440ee3,
+    0x7f1f61fc, 0xda94f1f2, 0xef7947a1, 0x4af2d7af, 0x84a22b07,
+    0x2129bb09, 0x14c40d5a, 0xb14f9d54, 0xad2a31b3, 0x08a1a1bd,
+    0x3d4c17ee, 0x98c787e0, 0x56977b48, 0xf31ceb46, 0xc6f15d15,
+    0x637acd1b, 0x8121a204, 0x24aa320a, 0x11478459, 0xb4cc1457,
+    0x7a9ce8ff, 0xdf1778f1, 0xeafacea2, 0x4f715eac, 0xf53d16dd,
+    0x50b686d3, 0x655b3080, 0xc0d0a08e, 0x0e805c26, 0xab0bcc28,
+    0x9ee67a7b, 0x3b6dea75, 0xd936856a, 0x7cbd1564, 0x4950a337,
+    0xecdb3339, 0x228bcf91, 0x87005f9f, 0xb2ede9cc, 0x176679c2,
+    0x1d047f6f, 0xb88fef61, 0x8d625932, 0x28e9c93c, 0xe6b93594,
+    0x4332a59a, 0x76df13c9, 0xd35483c7, 0x310fecd8, 0x94847cd6,
+    0xa169ca85, 0x04e25a8b, 0xcab2a623, 0x6f39362d, 0x5ad4807e,
+    0xff5f1070, 0x45135801, 0xe098c80f, 0xd5757e5c, 0x70feee52,
+    0xbeae12fa, 0x1b2582f4, 0x2ec834a7, 0x8b43a4a9, 0x6918cbb6,
+    0xcc935bb8, 0xf97eedeb, 0x5cf57de5, 0x92a5814d, 0x372e1143,
+    0x02c3a710, 0xa748371e, 0x1607aa4a, 0xb38c3a44, 0x86618c17,
+    0x23ea1c19, 0xedbae0b1, 0x483170bf, 0x7ddcc6ec, 0xd85756e2,
+    0x3a0c39fd, 0x9f87a9f3, 0xaa6a1fa0, 0x0fe18fae, 0xc1b17306,
+    0x643ae308, 0x51d7555b, 0xf45cc555, 0x4e108d24, 0xeb9b1d2a,
+    0xde76ab79, 0x7bfd3b77, 0xb5adc7df, 0x102657d1, 0x25cbe182,
+    0x8040718c, 0x621b1e93, 0xc7908e9d, 0xf27d38ce, 0x57f6a8c0,
+    0x99a65468, 0x3c2dc466, 0x09c07235, 0xac4be23b, 0xa629e496,
+    0x03a27498, 0x364fc2cb, 0x93c452c5, 0x5d94ae6d, 0xf81f3e63,
+    0xcdf28830, 0x6879183e, 0x8a227721, 0x2fa9e72f, 0x1a44517c,
+    0xbfcfc172, 0x719f3dda, 0xd414add4, 0xe1f91b87, 0x44728b89,
+    0xfe3ec3f8, 0x5bb553f6, 0x6e58e5a5, 0xcbd375ab, 0x05838903,
+    0xa008190d, 0x95e5af5e, 0x306e3f50, 0xd235504f, 0x77bec041,
+    0x42537612, 0xe7d8e61c, 0x29881ab4, 0x8c038aba, 0xb9ee3ce9,
+    0x1c65ace7}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x0000000000000000, 0x0e908ba500000000, 0x5d26669000000000,
+    0x53b6ed3500000000, 0xfb4abdfb00000000, 0xf5da365e00000000,
+    0xa66cdb6b00000000, 0xa8fc50ce00000000, 0xb7930b2c00000000,
+    0xb903808900000000, 0xeab56dbc00000000, 0xe425e61900000000,
+    0x4cd9b6d700000000, 0x42493d7200000000, 0x11ffd04700000000,
+    0x1f6f5be200000000, 0x6e27175800000000, 0x60b79cfd00000000,
+    0x330171c800000000, 0x3d91fa6d00000000, 0x956daaa300000000,
+    0x9bfd210600000000, 0xc84bcc3300000000, 0xc6db479600000000,
+    0xd9b41c7400000000, 0xd72497d100000000, 0x84927ae400000000,
+    0x8a02f14100000000, 0x22fea18f00000000, 0x2c6e2a2a00000000,
+    0x7fd8c71f00000000, 0x71484cba00000000, 0xdc4e2eb000000000,
+    0xd2dea51500000000, 0x8168482000000000, 0x8ff8c38500000000,
+    0x2704934b00000000, 0x299418ee00000000, 0x7a22f5db00000000,
+    0x74b27e7e00000000, 0x6bdd259c00000000, 0x654dae3900000000,
+    0x36fb430c00000000, 0x386bc8a900000000, 0x9097986700000000,
+    0x9e0713c200000000, 0xcdb1fef700000000, 0xc321755200000000,
+    0xb26939e800000000, 0xbcf9b24d00000000, 0xef4f5f7800000000,
+    0xe1dfd4dd00000000, 0x4923841300000000, 0x47b30fb600000000,
+    0x1405e28300000000, 0x1a95692600000000, 0x05fa32c400000000,
+    0x0b6ab96100000000, 0x58dc545400000000, 0x564cdff100000000,
+    0xfeb08f3f00000000, 0xf020049a00000000, 0xa396e9af00000000,
+    0xad06620a00000000, 0xf99b2dbb00000000, 0xf70ba61e00000000,
+    0xa4bd4b2b00000000, 0xaa2dc08e00000000, 0x02d1904000000000,
+    0x0c411be500000000, 0x5ff7f6d000000000, 0x51677d7500000000,
+    0x4e08269700000000, 0x4098ad3200000000, 0x132e400700000000,
+    0x1dbecba200000000, 0xb5429b6c00000000, 0xbbd210c900000000,
+    0xe864fdfc00000000, 0xe6f4765900000000, 0x97bc3ae300000000,
+    0x992cb14600000000, 0xca9a5c7300000000, 0xc40ad7d600000000,
+    0x6cf6871800000000, 0x62660cbd00000000, 0x31d0e18800000000,
+    0x3f406a2d00000000, 0x202f31cf00000000, 0x2ebfba6a00000000,
+    0x7d09575f00000000, 0x7399dcfa00000000, 0xdb658c3400000000,
+    0xd5f5079100000000, 0x8643eaa400000000, 0x88d3610100000000,
+    0x25d5030b00000000, 0x2b4588ae00000000, 0x78f3659b00000000,
+    0x7663ee3e00000000, 0xde9fbef000000000, 0xd00f355500000000,
+    0x83b9d86000000000, 0x8d2953c500000000, 0x9246082700000000,
+    0x9cd6838200000000, 0xcf606eb700000000, 0xc1f0e51200000000,
+    0x690cb5dc00000000, 0x679c3e7900000000, 0x342ad34c00000000,
+    0x3aba58e900000000, 0x4bf2145300000000, 0x45629ff600000000,
+    0x16d472c300000000, 0x1844f96600000000, 0xb0b8a9a800000000,
+    0xbe28220d00000000, 0xed9ecf3800000000, 0xe30e449d00000000,
+    0xfc611f7f00000000, 0xf2f194da00000000, 0xa14779ef00000000,
+    0xafd7f24a00000000, 0x072ba28400000000, 0x09bb292100000000,
+    0x5a0dc41400000000, 0x549d4fb100000000, 0xb3312aad00000000,
+    0xbda1a10800000000, 0xee174c3d00000000, 0xe087c79800000000,
+    0x487b975600000000, 0x46eb1cf300000000, 0x155df1c600000000,
+    0x1bcd7a6300000000, 0x04a2218100000000, 0x0a32aa2400000000,
+    0x5984471100000000, 0x5714ccb400000000, 0xffe89c7a00000000,
+    0xf17817df00000000, 0xa2cefaea00000000, 0xac5e714f00000000,
+    0xdd163df500000000, 0xd386b65000000000, 0x80305b6500000000,
+    0x8ea0d0c000000000, 0x265c800e00000000, 0x28cc0bab00000000,
+    0x7b7ae69e00000000, 0x75ea6d3b00000000, 0x6a8536d900000000,
+    0x6415bd7c00000000, 0x37a3504900000000, 0x3933dbec00000000,
+    0x91cf8b2200000000, 0x9f5f008700000000, 0xcce9edb200000000,
+    0xc279661700000000, 0x6f7f041d00000000, 0x61ef8fb800000000,
+    0x3259628d00000000, 0x3cc9e92800000000, 0x9435b9e600000000,
+    0x9aa5324300000000, 0xc913df7600000000, 0xc78354d300000000,
+    0xd8ec0f3100000000, 0xd67c849400000000, 0x85ca69a100000000,
+    0x8b5ae20400000000, 0x23a6b2ca00000000, 0x2d36396f00000000,
+    0x7e80d45a00000000, 0x70105fff00000000, 0x0158134500000000,
+    0x0fc898e000000000, 0x5c7e75d500000000, 0x52eefe7000000000,
+    0xfa12aebe00000000, 0xf482251b00000000, 0xa734c82e00000000,
+    0xa9a4438b00000000, 0xb6cb186900000000, 0xb85b93cc00000000,
+    0xebed7ef900000000, 0xe57df55c00000000, 0x4d81a59200000000,
+    0x43112e3700000000, 0x10a7c30200000000, 0x1e3748a700000000,
+    0x4aaa071600000000, 0x443a8cb300000000, 0x178c618600000000,
+    0x191cea2300000000, 0xb1e0baed00000000, 0xbf70314800000000,
+    0xecc6dc7d00000000, 0xe25657d800000000, 0xfd390c3a00000000,
+    0xf3a9879f00000000, 0xa01f6aaa00000000, 0xae8fe10f00000000,
+    0x0673b1c100000000, 0x08e33a6400000000, 0x5b55d75100000000,
+    0x55c55cf400000000, 0x248d104e00000000, 0x2a1d9beb00000000,
+    0x79ab76de00000000, 0x773bfd7b00000000, 0xdfc7adb500000000,
+    0xd157261000000000, 0x82e1cb2500000000, 0x8c71408000000000,
+    0x931e1b6200000000, 0x9d8e90c700000000, 0xce387df200000000,
+    0xc0a8f65700000000, 0x6854a69900000000, 0x66c42d3c00000000,
+    0x3572c00900000000, 0x3be24bac00000000, 0x96e429a600000000,
+    0x9874a20300000000, 0xcbc24f3600000000, 0xc552c49300000000,
+    0x6dae945d00000000, 0x633e1ff800000000, 0x3088f2cd00000000,
+    0x3e18796800000000, 0x2177228a00000000, 0x2fe7a92f00000000,
+    0x7c51441a00000000, 0x72c1cfbf00000000, 0xda3d9f7100000000,
+    0xd4ad14d400000000, 0x871bf9e100000000, 0x898b724400000000,
+    0xf8c33efe00000000, 0xf653b55b00000000, 0xa5e5586e00000000,
+    0xab75d3cb00000000, 0x0389830500000000, 0x0d1908a000000000,
+    0x5eafe59500000000, 0x503f6e3000000000, 0x4f5035d200000000,
+    0x41c0be7700000000, 0x1276534200000000, 0x1ce6d8e700000000,
+    0xb41a882900000000, 0xba8a038c00000000, 0xe93ceeb900000000,
+    0xe7ac651c00000000},
+   {0x0000000000000000, 0x97a61de700000000, 0x6f4b4a1500000000,
+    0xf8ed57f200000000, 0xde96942a00000000, 0x493089cd00000000,
+    0xb1ddde3f00000000, 0x267bc3d800000000, 0xbc2d295500000000,
+    0x2b8b34b200000000, 0xd366634000000000, 0x44c07ea700000000,
+    0x62bbbd7f00000000, 0xf51da09800000000, 0x0df0f76a00000000,
+    0x9a56ea8d00000000, 0x785b52aa00000000, 0xeffd4f4d00000000,
+    0x171018bf00000000, 0x80b6055800000000, 0xa6cdc68000000000,
+    0x316bdb6700000000, 0xc9868c9500000000, 0x5e20917200000000,
+    0xc4767bff00000000, 0x53d0661800000000, 0xab3d31ea00000000,
+    0x3c9b2c0d00000000, 0x1ae0efd500000000, 0x8d46f23200000000,
+    0x75aba5c000000000, 0xe20db82700000000, 0xb1b0d58f00000000,
+    0x2616c86800000000, 0xdefb9f9a00000000, 0x495d827d00000000,
+    0x6f2641a500000000, 0xf8805c4200000000, 0x006d0bb000000000,
+    0x97cb165700000000, 0x0d9dfcda00000000, 0x9a3be13d00000000,
+    0x62d6b6cf00000000, 0xf570ab2800000000, 0xd30b68f000000000,
+    0x44ad751700000000, 0xbc4022e500000000, 0x2be63f0200000000,
+    0xc9eb872500000000, 0x5e4d9ac200000000, 0xa6a0cd3000000000,
+    0x3106d0d700000000, 0x177d130f00000000, 0x80db0ee800000000,
+    0x7836591a00000000, 0xef9044fd00000000, 0x75c6ae7000000000,
+    0xe260b39700000000, 0x1a8de46500000000, 0x8d2bf98200000000,
+    0xab503a5a00000000, 0x3cf627bd00000000, 0xc41b704f00000000,
+    0x53bd6da800000000, 0x2367dac400000000, 0xb4c1c72300000000,
+    0x4c2c90d100000000, 0xdb8a8d3600000000, 0xfdf14eee00000000,
+    0x6a57530900000000, 0x92ba04fb00000000, 0x051c191c00000000,
+    0x9f4af39100000000, 0x08ecee7600000000, 0xf001b98400000000,
+    0x67a7a46300000000, 0x41dc67bb00000000, 0xd67a7a5c00000000,
+    0x2e972dae00000000, 0xb931304900000000, 0x5b3c886e00000000,
+    0xcc9a958900000000, 0x3477c27b00000000, 0xa3d1df9c00000000,
+    0x85aa1c4400000000, 0x120c01a300000000, 0xeae1565100000000,
+    0x7d474bb600000000, 0xe711a13b00000000, 0x70b7bcdc00000000,
+    0x885aeb2e00000000, 0x1ffcf6c900000000, 0x3987351100000000,
+    0xae2128f600000000, 0x56cc7f0400000000, 0xc16a62e300000000,
+    0x92d70f4b00000000, 0x057112ac00000000, 0xfd9c455e00000000,
+    0x6a3a58b900000000, 0x4c419b6100000000, 0xdbe7868600000000,
+    0x230ad17400000000, 0xb4accc9300000000, 0x2efa261e00000000,
+    0xb95c3bf900000000, 0x41b16c0b00000000, 0xd61771ec00000000,
+    0xf06cb23400000000, 0x67caafd300000000, 0x9f27f82100000000,
+    0x0881e5c600000000, 0xea8c5de100000000, 0x7d2a400600000000,
+    0x85c717f400000000, 0x12610a1300000000, 0x341ac9cb00000000,
+    0xa3bcd42c00000000, 0x5b5183de00000000, 0xccf79e3900000000,
+    0x56a174b400000000, 0xc107695300000000, 0x39ea3ea100000000,
+    0xae4c234600000000, 0x8837e09e00000000, 0x1f91fd7900000000,
+    0xe77caa8b00000000, 0x70dab76c00000000, 0x07c8c55200000000,
+    0x906ed8b500000000, 0x68838f4700000000, 0xff2592a000000000,
+    0xd95e517800000000, 0x4ef84c9f00000000, 0xb6151b6d00000000,
+    0x21b3068a00000000, 0xbbe5ec0700000000, 0x2c43f1e000000000,
+    0xd4aea61200000000, 0x4308bbf500000000, 0x6573782d00000000,
+    0xf2d565ca00000000, 0x0a38323800000000, 0x9d9e2fdf00000000,
+    0x7f9397f800000000, 0xe8358a1f00000000, 0x10d8dded00000000,
+    0x877ec00a00000000, 0xa10503d200000000, 0x36a31e3500000000,
+    0xce4e49c700000000, 0x59e8542000000000, 0xc3bebead00000000,
+    0x5418a34a00000000, 0xacf5f4b800000000, 0x3b53e95f00000000,
+    0x1d282a8700000000, 0x8a8e376000000000, 0x7263609200000000,
+    0xe5c57d7500000000, 0xb67810dd00000000, 0x21de0d3a00000000,
+    0xd9335ac800000000, 0x4e95472f00000000, 0x68ee84f700000000,
+    0xff48991000000000, 0x07a5cee200000000, 0x9003d30500000000,
+    0x0a55398800000000, 0x9df3246f00000000, 0x651e739d00000000,
+    0xf2b86e7a00000000, 0xd4c3ada200000000, 0x4365b04500000000,
+    0xbb88e7b700000000, 0x2c2efa5000000000, 0xce23427700000000,
+    0x59855f9000000000, 0xa168086200000000, 0x36ce158500000000,
+    0x10b5d65d00000000, 0x8713cbba00000000, 0x7ffe9c4800000000,
+    0xe85881af00000000, 0x720e6b2200000000, 0xe5a876c500000000,
+    0x1d45213700000000, 0x8ae33cd000000000, 0xac98ff0800000000,
+    0x3b3ee2ef00000000, 0xc3d3b51d00000000, 0x5475a8fa00000000,
+    0x24af1f9600000000, 0xb309027100000000, 0x4be4558300000000,
+    0xdc42486400000000, 0xfa398bbc00000000, 0x6d9f965b00000000,
+    0x9572c1a900000000, 0x02d4dc4e00000000, 0x988236c300000000,
+    0x0f242b2400000000, 0xf7c97cd600000000, 0x606f613100000000,
+    0x4614a2e900000000, 0xd1b2bf0e00000000, 0x295fe8fc00000000,
+    0xbef9f51b00000000, 0x5cf44d3c00000000, 0xcb5250db00000000,
+    0x33bf072900000000, 0xa4191ace00000000, 0x8262d91600000000,
+    0x15c4c4f100000000, 0xed29930300000000, 0x7a8f8ee400000000,
+    0xe0d9646900000000, 0x777f798e00000000, 0x8f922e7c00000000,
+    0x1834339b00000000, 0x3e4ff04300000000, 0xa9e9eda400000000,
+    0x5104ba5600000000, 0xc6a2a7b100000000, 0x951fca1900000000,
+    0x02b9d7fe00000000, 0xfa54800c00000000, 0x6df29deb00000000,
+    0x4b895e3300000000, 0xdc2f43d400000000, 0x24c2142600000000,
+    0xb36409c100000000, 0x2932e34c00000000, 0xbe94feab00000000,
+    0x4679a95900000000, 0xd1dfb4be00000000, 0xf7a4776600000000,
+    0x60026a8100000000, 0x98ef3d7300000000, 0x0f49209400000000,
+    0xed4498b300000000, 0x7ae2855400000000, 0x820fd2a600000000,
+    0x15a9cf4100000000, 0x33d20c9900000000, 0xa474117e00000000,
+    0x5c99468c00000000, 0xcb3f5b6b00000000, 0x5169b1e600000000,
+    0xc6cfac0100000000, 0x3e22fbf300000000, 0xa984e61400000000,
+    0x8fff25cc00000000, 0x1859382b00000000, 0xe0b46fd900000000,
+    0x7712723e00000000},
+   {0x0000000000000000, 0x411b8c6e00000000, 0x823618dd00000000,
+    0xc32d94b300000000, 0x456b416100000000, 0x0470cd0f00000000,
+    0xc75d59bc00000000, 0x8646d5d200000000, 0x8ad682c200000000,
+    0xcbcd0eac00000000, 0x08e09a1f00000000, 0x49fb167100000000,
+    0xcfbdc3a300000000, 0x8ea64fcd00000000, 0x4d8bdb7e00000000,
+    0x0c90571000000000, 0x55ab745e00000000, 0x14b0f83000000000,
+    0xd79d6c8300000000, 0x9686e0ed00000000, 0x10c0353f00000000,
+    0x51dbb95100000000, 0x92f62de200000000, 0xd3eda18c00000000,
+    0xdf7df69c00000000, 0x9e667af200000000, 0x5d4bee4100000000,
+    0x1c50622f00000000, 0x9a16b7fd00000000, 0xdb0d3b9300000000,
+    0x1820af2000000000, 0x593b234e00000000, 0xaa56e9bc00000000,
+    0xeb4d65d200000000, 0x2860f16100000000, 0x697b7d0f00000000,
+    0xef3da8dd00000000, 0xae2624b300000000, 0x6d0bb00000000000,
+    0x2c103c6e00000000, 0x20806b7e00000000, 0x619be71000000000,
+    0xa2b673a300000000, 0xe3adffcd00000000, 0x65eb2a1f00000000,
+    0x24f0a67100000000, 0xe7dd32c200000000, 0xa6c6beac00000000,
+    0xfffd9de200000000, 0xbee6118c00000000, 0x7dcb853f00000000,
+    0x3cd0095100000000, 0xba96dc8300000000, 0xfb8d50ed00000000,
+    0x38a0c45e00000000, 0x79bb483000000000, 0x752b1f2000000000,
+    0x3430934e00000000, 0xf71d07fd00000000, 0xb6068b9300000000,
+    0x30405e4100000000, 0x715bd22f00000000, 0xb276469c00000000,
+    0xf36dcaf200000000, 0x15aba3a200000000, 0x54b02fcc00000000,
+    0x979dbb7f00000000, 0xd686371100000000, 0x50c0e2c300000000,
+    0x11db6ead00000000, 0xd2f6fa1e00000000, 0x93ed767000000000,
+    0x9f7d216000000000, 0xde66ad0e00000000, 0x1d4b39bd00000000,
+    0x5c50b5d300000000, 0xda16600100000000, 0x9b0dec6f00000000,
+    0x582078dc00000000, 0x193bf4b200000000, 0x4000d7fc00000000,
+    0x011b5b9200000000, 0xc236cf2100000000, 0x832d434f00000000,
+    0x056b969d00000000, 0x44701af300000000, 0x875d8e4000000000,
+    0xc646022e00000000, 0xcad6553e00000000, 0x8bcdd95000000000,
+    0x48e04de300000000, 0x09fbc18d00000000, 0x8fbd145f00000000,
+    0xcea6983100000000, 0x0d8b0c8200000000, 0x4c9080ec00000000,
+    0xbffd4a1e00000000, 0xfee6c67000000000, 0x3dcb52c300000000,
+    0x7cd0dead00000000, 0xfa960b7f00000000, 0xbb8d871100000000,
+    0x78a013a200000000, 0x39bb9fcc00000000, 0x352bc8dc00000000,
+    0x743044b200000000, 0xb71dd00100000000, 0xf6065c6f00000000,
+    0x704089bd00000000, 0x315b05d300000000, 0xf276916000000000,
+    0xb36d1d0e00000000, 0xea563e4000000000, 0xab4db22e00000000,
+    0x6860269d00000000, 0x297baaf300000000, 0xaf3d7f2100000000,
+    0xee26f34f00000000, 0x2d0b67fc00000000, 0x6c10eb9200000000,
+    0x6080bc8200000000, 0x219b30ec00000000, 0xe2b6a45f00000000,
+    0xa3ad283100000000, 0x25ebfde300000000, 0x64f0718d00000000,
+    0xa7dde53e00000000, 0xe6c6695000000000, 0x6b50369e00000000,
+    0x2a4bbaf000000000, 0xe9662e4300000000, 0xa87da22d00000000,
+    0x2e3b77ff00000000, 0x6f20fb9100000000, 0xac0d6f2200000000,
+    0xed16e34c00000000, 0xe186b45c00000000, 0xa09d383200000000,
+    0x63b0ac8100000000, 0x22ab20ef00000000, 0xa4edf53d00000000,
+    0xe5f6795300000000, 0x26dbede000000000, 0x67c0618e00000000,
+    0x3efb42c000000000, 0x7fe0ceae00000000, 0xbccd5a1d00000000,
+    0xfdd6d67300000000, 0x7b9003a100000000, 0x3a8b8fcf00000000,
+    0xf9a61b7c00000000, 0xb8bd971200000000, 0xb42dc00200000000,
+    0xf5364c6c00000000, 0x361bd8df00000000, 0x770054b100000000,
+    0xf146816300000000, 0xb05d0d0d00000000, 0x737099be00000000,
+    0x326b15d000000000, 0xc106df2200000000, 0x801d534c00000000,
+    0x4330c7ff00000000, 0x022b4b9100000000, 0x846d9e4300000000,
+    0xc576122d00000000, 0x065b869e00000000, 0x47400af000000000,
+    0x4bd05de000000000, 0x0acbd18e00000000, 0xc9e6453d00000000,
+    0x88fdc95300000000, 0x0ebb1c8100000000, 0x4fa090ef00000000,
+    0x8c8d045c00000000, 0xcd96883200000000, 0x94adab7c00000000,
+    0xd5b6271200000000, 0x169bb3a100000000, 0x57803fcf00000000,
+    0xd1c6ea1d00000000, 0x90dd667300000000, 0x53f0f2c000000000,
+    0x12eb7eae00000000, 0x1e7b29be00000000, 0x5f60a5d000000000,
+    0x9c4d316300000000, 0xdd56bd0d00000000, 0x5b1068df00000000,
+    0x1a0be4b100000000, 0xd926700200000000, 0x983dfc6c00000000,
+    0x7efb953c00000000, 0x3fe0195200000000, 0xfccd8de100000000,
+    0xbdd6018f00000000, 0x3b90d45d00000000, 0x7a8b583300000000,
+    0xb9a6cc8000000000, 0xf8bd40ee00000000, 0xf42d17fe00000000,
+    0xb5369b9000000000, 0x761b0f2300000000, 0x3700834d00000000,
+    0xb146569f00000000, 0xf05ddaf100000000, 0x33704e4200000000,
+    0x726bc22c00000000, 0x2b50e16200000000, 0x6a4b6d0c00000000,
+    0xa966f9bf00000000, 0xe87d75d100000000, 0x6e3ba00300000000,
+    0x2f202c6d00000000, 0xec0db8de00000000, 0xad1634b000000000,
+    0xa18663a000000000, 0xe09defce00000000, 0x23b07b7d00000000,
+    0x62abf71300000000, 0xe4ed22c100000000, 0xa5f6aeaf00000000,
+    0x66db3a1c00000000, 0x27c0b67200000000, 0xd4ad7c8000000000,
+    0x95b6f0ee00000000, 0x569b645d00000000, 0x1780e83300000000,
+    0x91c63de100000000, 0xd0ddb18f00000000, 0x13f0253c00000000,
+    0x52eba95200000000, 0x5e7bfe4200000000, 0x1f60722c00000000,
+    0xdc4de69f00000000, 0x9d566af100000000, 0x1b10bf2300000000,
+    0x5a0b334d00000000, 0x9926a7fe00000000, 0xd83d2b9000000000,
+    0x810608de00000000, 0xc01d84b000000000, 0x0330100300000000,
+    0x422b9c6d00000000, 0xc46d49bf00000000, 0x8576c5d100000000,
+    0x465b516200000000, 0x0740dd0c00000000, 0x0bd08a1c00000000,
+    0x4acb067200000000, 0x89e692c100000000, 0xc8fd1eaf00000000,
+    0x4ebbcb7d00000000, 0x0fa0471300000000, 0xcc8dd3a000000000,
+    0x8d965fce00000000},
+   {0x0000000000000000, 0x1dfdb50100000000, 0x3afa6b0300000000,
+    0x2707de0200000000, 0x74f4d70600000000, 0x6909620700000000,
+    0x4e0ebc0500000000, 0x53f3090400000000, 0xe8e8af0d00000000,
+    0xf5151a0c00000000, 0xd212c40e00000000, 0xcfef710f00000000,
+    0x9c1c780b00000000, 0x81e1cd0a00000000, 0xa6e6130800000000,
+    0xbb1ba60900000000, 0xd0d15f1b00000000, 0xcd2cea1a00000000,
+    0xea2b341800000000, 0xf7d6811900000000, 0xa425881d00000000,
+    0xb9d83d1c00000000, 0x9edfe31e00000000, 0x8322561f00000000,
+    0x3839f01600000000, 0x25c4451700000000, 0x02c39b1500000000,
+    0x1f3e2e1400000000, 0x4ccd271000000000, 0x5130921100000000,
+    0x76374c1300000000, 0x6bcaf91200000000, 0xa0a3bf3600000000,
+    0xbd5e0a3700000000, 0x9a59d43500000000, 0x87a4613400000000,
+    0xd457683000000000, 0xc9aadd3100000000, 0xeead033300000000,
+    0xf350b63200000000, 0x484b103b00000000, 0x55b6a53a00000000,
+    0x72b17b3800000000, 0x6f4cce3900000000, 0x3cbfc73d00000000,
+    0x2142723c00000000, 0x0645ac3e00000000, 0x1bb8193f00000000,
+    0x7072e02d00000000, 0x6d8f552c00000000, 0x4a888b2e00000000,
+    0x57753e2f00000000, 0x0486372b00000000, 0x197b822a00000000,
+    0x3e7c5c2800000000, 0x2381e92900000000, 0x989a4f2000000000,
+    0x8567fa2100000000, 0xa260242300000000, 0xbf9d912200000000,
+    0xec6e982600000000, 0xf1932d2700000000, 0xd694f32500000000,
+    0xcb69462400000000, 0x40477f6d00000000, 0x5dbaca6c00000000,
+    0x7abd146e00000000, 0x6740a16f00000000, 0x34b3a86b00000000,
+    0x294e1d6a00000000, 0x0e49c36800000000, 0x13b4766900000000,
+    0xa8afd06000000000, 0xb552656100000000, 0x9255bb6300000000,
+    0x8fa80e6200000000, 0xdc5b076600000000, 0xc1a6b26700000000,
+    0xe6a16c6500000000, 0xfb5cd96400000000, 0x9096207600000000,
+    0x8d6b957700000000, 0xaa6c4b7500000000, 0xb791fe7400000000,
+    0xe462f77000000000, 0xf99f427100000000, 0xde989c7300000000,
+    0xc365297200000000, 0x787e8f7b00000000, 0x65833a7a00000000,
+    0x4284e47800000000, 0x5f79517900000000, 0x0c8a587d00000000,
+    0x1177ed7c00000000, 0x3670337e00000000, 0x2b8d867f00000000,
+    0xe0e4c05b00000000, 0xfd19755a00000000, 0xda1eab5800000000,
+    0xc7e31e5900000000, 0x9410175d00000000, 0x89eda25c00000000,
+    0xaeea7c5e00000000, 0xb317c95f00000000, 0x080c6f5600000000,
+    0x15f1da5700000000, 0x32f6045500000000, 0x2f0bb15400000000,
+    0x7cf8b85000000000, 0x61050d5100000000, 0x4602d35300000000,
+    0x5bff665200000000, 0x30359f4000000000, 0x2dc82a4100000000,
+    0x0acff44300000000, 0x1732414200000000, 0x44c1484600000000,
+    0x593cfd4700000000, 0x7e3b234500000000, 0x63c6964400000000,
+    0xd8dd304d00000000, 0xc520854c00000000, 0xe2275b4e00000000,
+    0xffdaee4f00000000, 0xac29e74b00000000, 0xb1d4524a00000000,
+    0x96d38c4800000000, 0x8b2e394900000000, 0x808efeda00000000,
+    0x9d734bdb00000000, 0xba7495d900000000, 0xa78920d800000000,
+    0xf47a29dc00000000, 0xe9879cdd00000000, 0xce8042df00000000,
+    0xd37df7de00000000, 0x686651d700000000, 0x759be4d600000000,
+    0x529c3ad400000000, 0x4f618fd500000000, 0x1c9286d100000000,
+    0x016f33d000000000, 0x2668edd200000000, 0x3b9558d300000000,
+    0x505fa1c100000000, 0x4da214c000000000, 0x6aa5cac200000000,
+    0x77587fc300000000, 0x24ab76c700000000, 0x3956c3c600000000,
+    0x1e511dc400000000, 0x03aca8c500000000, 0xb8b70ecc00000000,
+    0xa54abbcd00000000, 0x824d65cf00000000, 0x9fb0d0ce00000000,
+    0xcc43d9ca00000000, 0xd1be6ccb00000000, 0xf6b9b2c900000000,
+    0xeb4407c800000000, 0x202d41ec00000000, 0x3dd0f4ed00000000,
+    0x1ad72aef00000000, 0x072a9fee00000000, 0x54d996ea00000000,
+    0x492423eb00000000, 0x6e23fde900000000, 0x73de48e800000000,
+    0xc8c5eee100000000, 0xd5385be000000000, 0xf23f85e200000000,
+    0xefc230e300000000, 0xbc3139e700000000, 0xa1cc8ce600000000,
+    0x86cb52e400000000, 0x9b36e7e500000000, 0xf0fc1ef700000000,
+    0xed01abf600000000, 0xca0675f400000000, 0xd7fbc0f500000000,
+    0x8408c9f100000000, 0x99f57cf000000000, 0xbef2a2f200000000,
+    0xa30f17f300000000, 0x1814b1fa00000000, 0x05e904fb00000000,
+    0x22eedaf900000000, 0x3f136ff800000000, 0x6ce066fc00000000,
+    0x711dd3fd00000000, 0x561a0dff00000000, 0x4be7b8fe00000000,
+    0xc0c981b700000000, 0xdd3434b600000000, 0xfa33eab400000000,
+    0xe7ce5fb500000000, 0xb43d56b100000000, 0xa9c0e3b000000000,
+    0x8ec73db200000000, 0x933a88b300000000, 0x28212eba00000000,
+    0x35dc9bbb00000000, 0x12db45b900000000, 0x0f26f0b800000000,
+    0x5cd5f9bc00000000, 0x41284cbd00000000, 0x662f92bf00000000,
+    0x7bd227be00000000, 0x1018deac00000000, 0x0de56bad00000000,
+    0x2ae2b5af00000000, 0x371f00ae00000000, 0x64ec09aa00000000,
+    0x7911bcab00000000, 0x5e1662a900000000, 0x43ebd7a800000000,
+    0xf8f071a100000000, 0xe50dc4a000000000, 0xc20a1aa200000000,
+    0xdff7afa300000000, 0x8c04a6a700000000, 0x91f913a600000000,
+    0xb6fecda400000000, 0xab0378a500000000, 0x606a3e8100000000,
+    0x7d978b8000000000, 0x5a90558200000000, 0x476de08300000000,
+    0x149ee98700000000, 0x09635c8600000000, 0x2e64828400000000,
+    0x3399378500000000, 0x8882918c00000000, 0x957f248d00000000,
+    0xb278fa8f00000000, 0xaf854f8e00000000, 0xfc76468a00000000,
+    0xe18bf38b00000000, 0xc68c2d8900000000, 0xdb71988800000000,
+    0xb0bb619a00000000, 0xad46d49b00000000, 0x8a410a9900000000,
+    0x97bcbf9800000000, 0xc44fb69c00000000, 0xd9b2039d00000000,
+    0xfeb5dd9f00000000, 0xe348689e00000000, 0x5853ce9700000000,
+    0x45ae7b9600000000, 0x62a9a59400000000, 0x7f54109500000000,
+    0x2ca7199100000000, 0x315aac9000000000, 0x165d729200000000,
+    0x0ba0c79300000000},
+   {0x0000000000000000, 0x24d9076300000000, 0x48b20fc600000000,
+    0x6c6b08a500000000, 0xd1626e5700000000, 0xf5bb693400000000,
+    0x99d0619100000000, 0xbd0966f200000000, 0xa2c5dcae00000000,
+    0x861cdbcd00000000, 0xea77d36800000000, 0xceaed40b00000000,
+    0x73a7b2f900000000, 0x577eb59a00000000, 0x3b15bd3f00000000,
+    0x1fccba5c00000000, 0x058dc88600000000, 0x2154cfe500000000,
+    0x4d3fc74000000000, 0x69e6c02300000000, 0xd4efa6d100000000,
+    0xf036a1b200000000, 0x9c5da91700000000, 0xb884ae7400000000,
+    0xa748142800000000, 0x8391134b00000000, 0xeffa1bee00000000,
+    0xcb231c8d00000000, 0x762a7a7f00000000, 0x52f37d1c00000000,
+    0x3e9875b900000000, 0x1a4172da00000000, 0x4b1ce0d600000000,
+    0x6fc5e7b500000000, 0x03aeef1000000000, 0x2777e87300000000,
+    0x9a7e8e8100000000, 0xbea789e200000000, 0xd2cc814700000000,
+    0xf615862400000000, 0xe9d93c7800000000, 0xcd003b1b00000000,
+    0xa16b33be00000000, 0x85b234dd00000000, 0x38bb522f00000000,
+    0x1c62554c00000000, 0x70095de900000000, 0x54d05a8a00000000,
+    0x4e91285000000000, 0x6a482f3300000000, 0x0623279600000000,
+    0x22fa20f500000000, 0x9ff3460700000000, 0xbb2a416400000000,
+    0xd74149c100000000, 0xf3984ea200000000, 0xec54f4fe00000000,
+    0xc88df39d00000000, 0xa4e6fb3800000000, 0x803ffc5b00000000,
+    0x3d369aa900000000, 0x19ef9dca00000000, 0x7584956f00000000,
+    0x515d920c00000000, 0xd73eb17600000000, 0xf3e7b61500000000,
+    0x9f8cbeb000000000, 0xbb55b9d300000000, 0x065cdf2100000000,
+    0x2285d84200000000, 0x4eeed0e700000000, 0x6a37d78400000000,
+    0x75fb6dd800000000, 0x51226abb00000000, 0x3d49621e00000000,
+    0x1990657d00000000, 0xa499038f00000000, 0x804004ec00000000,
+    0xec2b0c4900000000, 0xc8f20b2a00000000, 0xd2b379f000000000,
+    0xf66a7e9300000000, 0x9a01763600000000, 0xbed8715500000000,
+    0x03d117a700000000, 0x270810c400000000, 0x4b63186100000000,
+    0x6fba1f0200000000, 0x7076a55e00000000, 0x54afa23d00000000,
+    0x38c4aa9800000000, 0x1c1dadfb00000000, 0xa114cb0900000000,
+    0x85cdcc6a00000000, 0xe9a6c4cf00000000, 0xcd7fc3ac00000000,
+    0x9c2251a000000000, 0xb8fb56c300000000, 0xd4905e6600000000,
+    0xf049590500000000, 0x4d403ff700000000, 0x6999389400000000,
+    0x05f2303100000000, 0x212b375200000000, 0x3ee78d0e00000000,
+    0x1a3e8a6d00000000, 0x765582c800000000, 0x528c85ab00000000,
+    0xef85e35900000000, 0xcb5ce43a00000000, 0xa737ec9f00000000,
+    0x83eeebfc00000000, 0x99af992600000000, 0xbd769e4500000000,
+    0xd11d96e000000000, 0xf5c4918300000000, 0x48cdf77100000000,
+    0x6c14f01200000000, 0x007ff8b700000000, 0x24a6ffd400000000,
+    0x3b6a458800000000, 0x1fb342eb00000000, 0x73d84a4e00000000,
+    0x57014d2d00000000, 0xea082bdf00000000, 0xced12cbc00000000,
+    0xa2ba241900000000, 0x8663237a00000000, 0xae7d62ed00000000,
+    0x8aa4658e00000000, 0xe6cf6d2b00000000, 0xc2166a4800000000,
+    0x7f1f0cba00000000, 0x5bc60bd900000000, 0x37ad037c00000000,
+    0x1374041f00000000, 0x0cb8be4300000000, 0x2861b92000000000,
+    0x440ab18500000000, 0x60d3b6e600000000, 0xdddad01400000000,
+    0xf903d77700000000, 0x9568dfd200000000, 0xb1b1d8b100000000,
+    0xabf0aa6b00000000, 0x8f29ad0800000000, 0xe342a5ad00000000,
+    0xc79ba2ce00000000, 0x7a92c43c00000000, 0x5e4bc35f00000000,
+    0x3220cbfa00000000, 0x16f9cc9900000000, 0x093576c500000000,
+    0x2dec71a600000000, 0x4187790300000000, 0x655e7e6000000000,
+    0xd857189200000000, 0xfc8e1ff100000000, 0x90e5175400000000,
+    0xb43c103700000000, 0xe561823b00000000, 0xc1b8855800000000,
+    0xadd38dfd00000000, 0x890a8a9e00000000, 0x3403ec6c00000000,
+    0x10daeb0f00000000, 0x7cb1e3aa00000000, 0x5868e4c900000000,
+    0x47a45e9500000000, 0x637d59f600000000, 0x0f16515300000000,
+    0x2bcf563000000000, 0x96c630c200000000, 0xb21f37a100000000,
+    0xde743f0400000000, 0xfaad386700000000, 0xe0ec4abd00000000,
+    0xc4354dde00000000, 0xa85e457b00000000, 0x8c87421800000000,
+    0x318e24ea00000000, 0x1557238900000000, 0x793c2b2c00000000,
+    0x5de52c4f00000000, 0x4229961300000000, 0x66f0917000000000,
+    0x0a9b99d500000000, 0x2e429eb600000000, 0x934bf84400000000,
+    0xb792ff2700000000, 0xdbf9f78200000000, 0xff20f0e100000000,
+    0x7943d39b00000000, 0x5d9ad4f800000000, 0x31f1dc5d00000000,
+    0x1528db3e00000000, 0xa821bdcc00000000, 0x8cf8baaf00000000,
+    0xe093b20a00000000, 0xc44ab56900000000, 0xdb860f3500000000,
+    0xff5f085600000000, 0x933400f300000000, 0xb7ed079000000000,
+    0x0ae4616200000000, 0x2e3d660100000000, 0x42566ea400000000,
+    0x668f69c700000000, 0x7cce1b1d00000000, 0x58171c7e00000000,
+    0x347c14db00000000, 0x10a513b800000000, 0xadac754a00000000,
+    0x8975722900000000, 0xe51e7a8c00000000, 0xc1c77def00000000,
+    0xde0bc7b300000000, 0xfad2c0d000000000, 0x96b9c87500000000,
+    0xb260cf1600000000, 0x0f69a9e400000000, 0x2bb0ae8700000000,
+    0x47dba62200000000, 0x6302a14100000000, 0x325f334d00000000,
+    0x1686342e00000000, 0x7aed3c8b00000000, 0x5e343be800000000,
+    0xe33d5d1a00000000, 0xc7e45a7900000000, 0xab8f52dc00000000,
+    0x8f5655bf00000000, 0x909aefe300000000, 0xb443e88000000000,
+    0xd828e02500000000, 0xfcf1e74600000000, 0x41f881b400000000,
+    0x652186d700000000, 0x094a8e7200000000, 0x2d93891100000000,
+    0x37d2fbcb00000000, 0x130bfca800000000, 0x7f60f40d00000000,
+    0x5bb9f36e00000000, 0xe6b0959c00000000, 0xc26992ff00000000,
+    0xae029a5a00000000, 0x8adb9d3900000000, 0x9517276500000000,
+    0xb1ce200600000000, 0xdda528a300000000, 0xf97c2fc000000000,
+    0x4475493200000000, 0x60ac4e5100000000, 0x0cc746f400000000,
+    0x281e419700000000},
+   {0x0000000000000000, 0x08e3603c00000000, 0x10c6c17800000000,
+    0x1825a14400000000, 0x208c83f100000000, 0x286fe3cd00000000,
+    0x304a428900000000, 0x38a922b500000000, 0x011e763800000000,
+    0x09fd160400000000, 0x11d8b74000000000, 0x193bd77c00000000,
+    0x2192f5c900000000, 0x297195f500000000, 0x315434b100000000,
+    0x39b7548d00000000, 0x023cec7000000000, 0x0adf8c4c00000000,
+    0x12fa2d0800000000, 0x1a194d3400000000, 0x22b06f8100000000,
+    0x2a530fbd00000000, 0x3276aef900000000, 0x3a95cec500000000,
+    0x03229a4800000000, 0x0bc1fa7400000000, 0x13e45b3000000000,
+    0x1b073b0c00000000, 0x23ae19b900000000, 0x2b4d798500000000,
+    0x3368d8c100000000, 0x3b8bb8fd00000000, 0x0478d8e100000000,
+    0x0c9bb8dd00000000, 0x14be199900000000, 0x1c5d79a500000000,
+    0x24f45b1000000000, 0x2c173b2c00000000, 0x34329a6800000000,
+    0x3cd1fa5400000000, 0x0566aed900000000, 0x0d85cee500000000,
+    0x15a06fa100000000, 0x1d430f9d00000000, 0x25ea2d2800000000,
+    0x2d094d1400000000, 0x352cec5000000000, 0x3dcf8c6c00000000,
+    0x0644349100000000, 0x0ea754ad00000000, 0x1682f5e900000000,
+    0x1e6195d500000000, 0x26c8b76000000000, 0x2e2bd75c00000000,
+    0x360e761800000000, 0x3eed162400000000, 0x075a42a900000000,
+    0x0fb9229500000000, 0x179c83d100000000, 0x1f7fe3ed00000000,
+    0x27d6c15800000000, 0x2f35a16400000000, 0x3710002000000000,
+    0x3ff3601c00000000, 0x49f6c11800000000, 0x4115a12400000000,
+    0x5930006000000000, 0x51d3605c00000000, 0x697a42e900000000,
+    0x619922d500000000, 0x79bc839100000000, 0x715fe3ad00000000,
+    0x48e8b72000000000, 0x400bd71c00000000, 0x582e765800000000,
+    0x50cd166400000000, 0x686434d100000000, 0x608754ed00000000,
+    0x78a2f5a900000000, 0x7041959500000000, 0x4bca2d6800000000,
+    0x43294d5400000000, 0x5b0cec1000000000, 0x53ef8c2c00000000,
+    0x6b46ae9900000000, 0x63a5cea500000000, 0x7b806fe100000000,
+    0x73630fdd00000000, 0x4ad45b5000000000, 0x42373b6c00000000,
+    0x5a129a2800000000, 0x52f1fa1400000000, 0x6a58d8a100000000,
+    0x62bbb89d00000000, 0x7a9e19d900000000, 0x727d79e500000000,
+    0x4d8e19f900000000, 0x456d79c500000000, 0x5d48d88100000000,
+    0x55abb8bd00000000, 0x6d029a0800000000, 0x65e1fa3400000000,
+    0x7dc45b7000000000, 0x75273b4c00000000, 0x4c906fc100000000,
+    0x44730ffd00000000, 0x5c56aeb900000000, 0x54b5ce8500000000,
+    0x6c1cec3000000000, 0x64ff8c0c00000000, 0x7cda2d4800000000,
+    0x74394d7400000000, 0x4fb2f58900000000, 0x475195b500000000,
+    0x5f7434f100000000, 0x579754cd00000000, 0x6f3e767800000000,
+    0x67dd164400000000, 0x7ff8b70000000000, 0x771bd73c00000000,
+    0x4eac83b100000000, 0x464fe38d00000000, 0x5e6a42c900000000,
+    0x568922f500000000, 0x6e20004000000000, 0x66c3607c00000000,
+    0x7ee6c13800000000, 0x7605a10400000000, 0x92ec833100000000,
+    0x9a0fe30d00000000, 0x822a424900000000, 0x8ac9227500000000,
+    0xb26000c000000000, 0xba8360fc00000000, 0xa2a6c1b800000000,
+    0xaa45a18400000000, 0x93f2f50900000000, 0x9b11953500000000,
+    0x8334347100000000, 0x8bd7544d00000000, 0xb37e76f800000000,
+    0xbb9d16c400000000, 0xa3b8b78000000000, 0xab5bd7bc00000000,
+    0x90d06f4100000000, 0x98330f7d00000000, 0x8016ae3900000000,
+    0x88f5ce0500000000, 0xb05cecb000000000, 0xb8bf8c8c00000000,
+    0xa09a2dc800000000, 0xa8794df400000000, 0x91ce197900000000,
+    0x992d794500000000, 0x8108d80100000000, 0x89ebb83d00000000,
+    0xb1429a8800000000, 0xb9a1fab400000000, 0xa1845bf000000000,
+    0xa9673bcc00000000, 0x96945bd000000000, 0x9e773bec00000000,
+    0x86529aa800000000, 0x8eb1fa9400000000, 0xb618d82100000000,
+    0xbefbb81d00000000, 0xa6de195900000000, 0xae3d796500000000,
+    0x978a2de800000000, 0x9f694dd400000000, 0x874cec9000000000,
+    0x8faf8cac00000000, 0xb706ae1900000000, 0xbfe5ce2500000000,
+    0xa7c06f6100000000, 0xaf230f5d00000000, 0x94a8b7a000000000,
+    0x9c4bd79c00000000, 0x846e76d800000000, 0x8c8d16e400000000,
+    0xb424345100000000, 0xbcc7546d00000000, 0xa4e2f52900000000,
+    0xac01951500000000, 0x95b6c19800000000, 0x9d55a1a400000000,
+    0x857000e000000000, 0x8d9360dc00000000, 0xb53a426900000000,
+    0xbdd9225500000000, 0xa5fc831100000000, 0xad1fe32d00000000,
+    0xdb1a422900000000, 0xd3f9221500000000, 0xcbdc835100000000,
+    0xc33fe36d00000000, 0xfb96c1d800000000, 0xf375a1e400000000,
+    0xeb5000a000000000, 0xe3b3609c00000000, 0xda04341100000000,
+    0xd2e7542d00000000, 0xcac2f56900000000, 0xc221955500000000,
+    0xfa88b7e000000000, 0xf26bd7dc00000000, 0xea4e769800000000,
+    0xe2ad16a400000000, 0xd926ae5900000000, 0xd1c5ce6500000000,
+    0xc9e06f2100000000, 0xc1030f1d00000000, 0xf9aa2da800000000,
+    0xf1494d9400000000, 0xe96cecd000000000, 0xe18f8cec00000000,
+    0xd838d86100000000, 0xd0dbb85d00000000, 0xc8fe191900000000,
+    0xc01d792500000000, 0xf8b45b9000000000, 0xf0573bac00000000,
+    0xe8729ae800000000, 0xe091fad400000000, 0xdf629ac800000000,
+    0xd781faf400000000, 0xcfa45bb000000000, 0xc7473b8c00000000,
+    0xffee193900000000, 0xf70d790500000000, 0xef28d84100000000,
+    0xe7cbb87d00000000, 0xde7cecf000000000, 0xd69f8ccc00000000,
+    0xceba2d8800000000, 0xc6594db400000000, 0xfef06f0100000000,
+    0xf6130f3d00000000, 0xee36ae7900000000, 0xe6d5ce4500000000,
+    0xdd5e76b800000000, 0xd5bd168400000000, 0xcd98b7c000000000,
+    0xc57bd7fc00000000, 0xfdd2f54900000000, 0xf531957500000000,
+    0xed14343100000000, 0xe5f7540d00000000, 0xdc40008000000000,
+    0xd4a360bc00000000, 0xcc86c1f800000000, 0xc465a1c400000000,
+    0xfccc837100000000, 0xf42fe34d00000000, 0xec0a420900000000,
+    0xe4e9223500000000},
+   {0x0000000000000000, 0xd1e8e70e00000000, 0xa2d1cf1d00000000,
+    0x7339281300000000, 0x44a39f3b00000000, 0x954b783500000000,
+    0xe672502600000000, 0x379ab72800000000, 0x88463f7700000000,
+    0x59aed87900000000, 0x2a97f06a00000000, 0xfb7f176400000000,
+    0xcce5a04c00000000, 0x1d0d474200000000, 0x6e346f5100000000,
+    0xbfdc885f00000000, 0x108d7eee00000000, 0xc16599e000000000,
+    0xb25cb1f300000000, 0x63b456fd00000000, 0x542ee1d500000000,
+    0x85c606db00000000, 0xf6ff2ec800000000, 0x2717c9c600000000,
+    0x98cb419900000000, 0x4923a69700000000, 0x3a1a8e8400000000,
+    0xebf2698a00000000, 0xdc68dea200000000, 0x0d8039ac00000000,
+    0x7eb911bf00000000, 0xaf51f6b100000000, 0x611c8c0700000000,
+    0xb0f46b0900000000, 0xc3cd431a00000000, 0x1225a41400000000,
+    0x25bf133c00000000, 0xf457f43200000000, 0x876edc2100000000,
+    0x56863b2f00000000, 0xe95ab37000000000, 0x38b2547e00000000,
+    0x4b8b7c6d00000000, 0x9a639b6300000000, 0xadf92c4b00000000,
+    0x7c11cb4500000000, 0x0f28e35600000000, 0xdec0045800000000,
+    0x7191f2e900000000, 0xa07915e700000000, 0xd3403df400000000,
+    0x02a8dafa00000000, 0x35326dd200000000, 0xe4da8adc00000000,
+    0x97e3a2cf00000000, 0x460b45c100000000, 0xf9d7cd9e00000000,
+    0x283f2a9000000000, 0x5b06028300000000, 0x8aeee58d00000000,
+    0xbd7452a500000000, 0x6c9cb5ab00000000, 0x1fa59db800000000,
+    0xce4d7ab600000000, 0xc238180f00000000, 0x13d0ff0100000000,
+    0x60e9d71200000000, 0xb101301c00000000, 0x869b873400000000,
+    0x5773603a00000000, 0x244a482900000000, 0xf5a2af2700000000,
+    0x4a7e277800000000, 0x9b96c07600000000, 0xe8afe86500000000,
+    0x39470f6b00000000, 0x0eddb84300000000, 0xdf355f4d00000000,
+    0xac0c775e00000000, 0x7de4905000000000, 0xd2b566e100000000,
+    0x035d81ef00000000, 0x7064a9fc00000000, 0xa18c4ef200000000,
+    0x9616f9da00000000, 0x47fe1ed400000000, 0x34c736c700000000,
+    0xe52fd1c900000000, 0x5af3599600000000, 0x8b1bbe9800000000,
+    0xf822968b00000000, 0x29ca718500000000, 0x1e50c6ad00000000,
+    0xcfb821a300000000, 0xbc8109b000000000, 0x6d69eebe00000000,
+    0xa324940800000000, 0x72cc730600000000, 0x01f55b1500000000,
+    0xd01dbc1b00000000, 0xe7870b3300000000, 0x366fec3d00000000,
+    0x4556c42e00000000, 0x94be232000000000, 0x2b62ab7f00000000,
+    0xfa8a4c7100000000, 0x89b3646200000000, 0x585b836c00000000,
+    0x6fc1344400000000, 0xbe29d34a00000000, 0xcd10fb5900000000,
+    0x1cf81c5700000000, 0xb3a9eae600000000, 0x62410de800000000,
+    0x117825fb00000000, 0xc090c2f500000000, 0xf70a75dd00000000,
+    0x26e292d300000000, 0x55dbbac000000000, 0x84335dce00000000,
+    0x3befd59100000000, 0xea07329f00000000, 0x993e1a8c00000000,
+    0x48d6fd8200000000, 0x7f4c4aaa00000000, 0xaea4ada400000000,
+    0xdd9d85b700000000, 0x0c7562b900000000, 0x8471301e00000000,
+    0x5599d71000000000, 0x26a0ff0300000000, 0xf748180d00000000,
+    0xc0d2af2500000000, 0x113a482b00000000, 0x6203603800000000,
+    0xb3eb873600000000, 0x0c370f6900000000, 0xdddfe86700000000,
+    0xaee6c07400000000, 0x7f0e277a00000000, 0x4894905200000000,
+    0x997c775c00000000, 0xea455f4f00000000, 0x3badb84100000000,
+    0x94fc4ef000000000, 0x4514a9fe00000000, 0x362d81ed00000000,
+    0xe7c566e300000000, 0xd05fd1cb00000000, 0x01b736c500000000,
+    0x728e1ed600000000, 0xa366f9d800000000, 0x1cba718700000000,
+    0xcd52968900000000, 0xbe6bbe9a00000000, 0x6f83599400000000,
+    0x5819eebc00000000, 0x89f109b200000000, 0xfac821a100000000,
+    0x2b20c6af00000000, 0xe56dbc1900000000, 0x34855b1700000000,
+    0x47bc730400000000, 0x9654940a00000000, 0xa1ce232200000000,
+    0x7026c42c00000000, 0x031fec3f00000000, 0xd2f70b3100000000,
+    0x6d2b836e00000000, 0xbcc3646000000000, 0xcffa4c7300000000,
+    0x1e12ab7d00000000, 0x29881c5500000000, 0xf860fb5b00000000,
+    0x8b59d34800000000, 0x5ab1344600000000, 0xf5e0c2f700000000,
+    0x240825f900000000, 0x57310dea00000000, 0x86d9eae400000000,
+    0xb1435dcc00000000, 0x60abbac200000000, 0x139292d100000000,
+    0xc27a75df00000000, 0x7da6fd8000000000, 0xac4e1a8e00000000,
+    0xdf77329d00000000, 0x0e9fd59300000000, 0x390562bb00000000,
+    0xe8ed85b500000000, 0x9bd4ada600000000, 0x4a3c4aa800000000,
+    0x4649281100000000, 0x97a1cf1f00000000, 0xe498e70c00000000,
+    0x3570000200000000, 0x02eab72a00000000, 0xd302502400000000,
+    0xa03b783700000000, 0x71d39f3900000000, 0xce0f176600000000,
+    0x1fe7f06800000000, 0x6cded87b00000000, 0xbd363f7500000000,
+    0x8aac885d00000000, 0x5b446f5300000000, 0x287d474000000000,
+    0xf995a04e00000000, 0x56c456ff00000000, 0x872cb1f100000000,
+    0xf41599e200000000, 0x25fd7eec00000000, 0x1267c9c400000000,
+    0xc38f2eca00000000, 0xb0b606d900000000, 0x615ee1d700000000,
+    0xde82698800000000, 0x0f6a8e8600000000, 0x7c53a69500000000,
+    0xadbb419b00000000, 0x9a21f6b300000000, 0x4bc911bd00000000,
+    0x38f039ae00000000, 0xe918dea000000000, 0x2755a41600000000,
+    0xf6bd431800000000, 0x85846b0b00000000, 0x546c8c0500000000,
+    0x63f63b2d00000000, 0xb21edc2300000000, 0xc127f43000000000,
+    0x10cf133e00000000, 0xaf139b6100000000, 0x7efb7c6f00000000,
+    0x0dc2547c00000000, 0xdc2ab37200000000, 0xebb0045a00000000,
+    0x3a58e35400000000, 0x4961cb4700000000, 0x98892c4900000000,
+    0x37d8daf800000000, 0xe6303df600000000, 0x950915e500000000,
+    0x44e1f2eb00000000, 0x737b45c300000000, 0xa293a2cd00000000,
+    0xd1aa8ade00000000, 0x00426dd000000000, 0xbf9ee58f00000000,
+    0x6e76028100000000, 0x1d4f2a9200000000, 0xcca7cd9c00000000,
+    0xfb3d7ab400000000, 0x2ad59dba00000000, 0x59ecb5a900000000,
+    0x880452a700000000},
+   {0x0000000000000000, 0xaa05daf100000000, 0x150dc53800000000,
+    0xbf081fc900000000, 0x2a1a8a7100000000, 0x801f508000000000,
+    0x3f174f4900000000, 0x951295b800000000, 0x543414e300000000,
+    0xfe31ce1200000000, 0x4139d1db00000000, 0xeb3c0b2a00000000,
+    0x7e2e9e9200000000, 0xd42b446300000000, 0x6b235baa00000000,
+    0xc126815b00000000, 0xe96e591d00000000, 0x436b83ec00000000,
+    0xfc639c2500000000, 0x566646d400000000, 0xc374d36c00000000,
+    0x6971099d00000000, 0xd679165400000000, 0x7c7ccca500000000,
+    0xbd5a4dfe00000000, 0x175f970f00000000, 0xa85788c600000000,
+    0x0252523700000000, 0x9740c78f00000000, 0x3d451d7e00000000,
+    0x824d02b700000000, 0x2848d84600000000, 0xd2ddb23a00000000,
+    0x78d868cb00000000, 0xc7d0770200000000, 0x6dd5adf300000000,
+    0xf8c7384b00000000, 0x52c2e2ba00000000, 0xedcafd7300000000,
+    0x47cf278200000000, 0x86e9a6d900000000, 0x2cec7c2800000000,
+    0x93e463e100000000, 0x39e1b91000000000, 0xacf32ca800000000,
+    0x06f6f65900000000, 0xb9fee99000000000, 0x13fb336100000000,
+    0x3bb3eb2700000000, 0x91b631d600000000, 0x2ebe2e1f00000000,
+    0x84bbf4ee00000000, 0x11a9615600000000, 0xbbacbba700000000,
+    0x04a4a46e00000000, 0xaea17e9f00000000, 0x6f87ffc400000000,
+    0xc582253500000000, 0x7a8a3afc00000000, 0xd08fe00d00000000,
+    0x459d75b500000000, 0xef98af4400000000, 0x5090b08d00000000,
+    0xfa956a7c00000000, 0xa4bb657500000000, 0x0ebebf8400000000,
+    0xb1b6a04d00000000, 0x1bb37abc00000000, 0x8ea1ef0400000000,
+    0x24a435f500000000, 0x9bac2a3c00000000, 0x31a9f0cd00000000,
+    0xf08f719600000000, 0x5a8aab6700000000, 0xe582b4ae00000000,
+    0x4f876e5f00000000, 0xda95fbe700000000, 0x7090211600000000,
+    0xcf983edf00000000, 0x659de42e00000000, 0x4dd53c6800000000,
+    0xe7d0e69900000000, 0x58d8f95000000000, 0xf2dd23a100000000,
+    0x67cfb61900000000, 0xcdca6ce800000000, 0x72c2732100000000,
+    0xd8c7a9d000000000, 0x19e1288b00000000, 0xb3e4f27a00000000,
+    0x0cecedb300000000, 0xa6e9374200000000, 0x33fba2fa00000000,
+    0x99fe780b00000000, 0x26f667c200000000, 0x8cf3bd3300000000,
+    0x7666d74f00000000, 0xdc630dbe00000000, 0x636b127700000000,
+    0xc96ec88600000000, 0x5c7c5d3e00000000, 0xf67987cf00000000,
+    0x4971980600000000, 0xe37442f700000000, 0x2252c3ac00000000,
+    0x8857195d00000000, 0x375f069400000000, 0x9d5adc6500000000,
+    0x084849dd00000000, 0xa24d932c00000000, 0x1d458ce500000000,
+    0xb740561400000000, 0x9f088e5200000000, 0x350d54a300000000,
+    0x8a054b6a00000000, 0x2000919b00000000, 0xb512042300000000,
+    0x1f17ded200000000, 0xa01fc11b00000000, 0x0a1a1bea00000000,
+    0xcb3c9ab100000000, 0x6139404000000000, 0xde315f8900000000,
+    0x7434857800000000, 0xe12610c000000000, 0x4b23ca3100000000,
+    0xf42bd5f800000000, 0x5e2e0f0900000000, 0x4877cbea00000000,
+    0xe272111b00000000, 0x5d7a0ed200000000, 0xf77fd42300000000,
+    0x626d419b00000000, 0xc8689b6a00000000, 0x776084a300000000,
+    0xdd655e5200000000, 0x1c43df0900000000, 0xb64605f800000000,
+    0x094e1a3100000000, 0xa34bc0c000000000, 0x3659557800000000,
+    0x9c5c8f8900000000, 0x2354904000000000, 0x89514ab100000000,
+    0xa11992f700000000, 0x0b1c480600000000, 0xb41457cf00000000,
+    0x1e118d3e00000000, 0x8b03188600000000, 0x2106c27700000000,
+    0x9e0eddbe00000000, 0x340b074f00000000, 0xf52d861400000000,
+    0x5f285ce500000000, 0xe020432c00000000, 0x4a2599dd00000000,
+    0xdf370c6500000000, 0x7532d69400000000, 0xca3ac95d00000000,
+    0x603f13ac00000000, 0x9aaa79d000000000, 0x30afa32100000000,
+    0x8fa7bce800000000, 0x25a2661900000000, 0xb0b0f3a100000000,
+    0x1ab5295000000000, 0xa5bd369900000000, 0x0fb8ec6800000000,
+    0xce9e6d3300000000, 0x649bb7c200000000, 0xdb93a80b00000000,
+    0x719672fa00000000, 0xe484e74200000000, 0x4e813db300000000,
+    0xf189227a00000000, 0x5b8cf88b00000000, 0x73c420cd00000000,
+    0xd9c1fa3c00000000, 0x66c9e5f500000000, 0xcccc3f0400000000,
+    0x59deaabc00000000, 0xf3db704d00000000, 0x4cd36f8400000000,
+    0xe6d6b57500000000, 0x27f0342e00000000, 0x8df5eedf00000000,
+    0x32fdf11600000000, 0x98f82be700000000, 0x0deabe5f00000000,
+    0xa7ef64ae00000000, 0x18e77b6700000000, 0xb2e2a19600000000,
+    0xecccae9f00000000, 0x46c9746e00000000, 0xf9c16ba700000000,
+    0x53c4b15600000000, 0xc6d624ee00000000, 0x6cd3fe1f00000000,
+    0xd3dbe1d600000000, 0x79de3b2700000000, 0xb8f8ba7c00000000,
+    0x12fd608d00000000, 0xadf57f4400000000, 0x07f0a5b500000000,
+    0x92e2300d00000000, 0x38e7eafc00000000, 0x87eff53500000000,
+    0x2dea2fc400000000, 0x05a2f78200000000, 0xafa72d7300000000,
+    0x10af32ba00000000, 0xbaaae84b00000000, 0x2fb87df300000000,
+    0x85bda70200000000, 0x3ab5b8cb00000000, 0x90b0623a00000000,
+    0x5196e36100000000, 0xfb93399000000000, 0x449b265900000000,
+    0xee9efca800000000, 0x7b8c691000000000, 0xd189b3e100000000,
+    0x6e81ac2800000000, 0xc48476d900000000, 0x3e111ca500000000,
+    0x9414c65400000000, 0x2b1cd99d00000000, 0x8119036c00000000,
+    0x140b96d400000000, 0xbe0e4c2500000000, 0x010653ec00000000,
+    0xab03891d00000000, 0x6a25084600000000, 0xc020d2b700000000,
+    0x7f28cd7e00000000, 0xd52d178f00000000, 0x403f823700000000,
+    0xea3a58c600000000, 0x5532470f00000000, 0xff379dfe00000000,
+    0xd77f45b800000000, 0x7d7a9f4900000000, 0xc272808000000000,
+    0x68775a7100000000, 0xfd65cfc900000000, 0x5760153800000000,
+    0xe8680af100000000, 0x426dd00000000000, 0x834b515b00000000,
+    0x294e8baa00000000, 0x9646946300000000, 0x3c434e9200000000,
+    0xa951db2a00000000, 0x035401db00000000, 0xbc5c1e1200000000,
+    0x1659c4e300000000}};
+
+#else /* W == 4 */
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0xae689191, 0x87a02563, 0x29c8b4f2, 0xd4314c87,
+    0x7a59dd16, 0x539169e4, 0xfdf9f875, 0x73139f4f, 0xdd7b0ede,
+    0xf4b3ba2c, 0x5adb2bbd, 0xa722d3c8, 0x094a4259, 0x2082f6ab,
+    0x8eea673a, 0xe6273e9e, 0x484faf0f, 0x61871bfd, 0xcfef8a6c,
+    0x32167219, 0x9c7ee388, 0xb5b6577a, 0x1bdec6eb, 0x9534a1d1,
+    0x3b5c3040, 0x129484b2, 0xbcfc1523, 0x4105ed56, 0xef6d7cc7,
+    0xc6a5c835, 0x68cd59a4, 0x173f7b7d, 0xb957eaec, 0x909f5e1e,
+    0x3ef7cf8f, 0xc30e37fa, 0x6d66a66b, 0x44ae1299, 0xeac68308,
+    0x642ce432, 0xca4475a3, 0xe38cc151, 0x4de450c0, 0xb01da8b5,
+    0x1e753924, 0x37bd8dd6, 0x99d51c47, 0xf11845e3, 0x5f70d472,
+    0x76b86080, 0xd8d0f111, 0x25290964, 0x8b4198f5, 0xa2892c07,
+    0x0ce1bd96, 0x820bdaac, 0x2c634b3d, 0x05abffcf, 0xabc36e5e,
+    0x563a962b, 0xf85207ba, 0xd19ab348, 0x7ff222d9, 0x2e7ef6fa,
+    0x8016676b, 0xa9ded399, 0x07b64208, 0xfa4fba7d, 0x54272bec,
+    0x7def9f1e, 0xd3870e8f, 0x5d6d69b5, 0xf305f824, 0xdacd4cd6,
+    0x74a5dd47, 0x895c2532, 0x2734b4a3, 0x0efc0051, 0xa09491c0,
+    0xc859c864, 0x663159f5, 0x4ff9ed07, 0xe1917c96, 0x1c6884e3,
+    0xb2001572, 0x9bc8a180, 0x35a03011, 0xbb4a572b, 0x1522c6ba,
+    0x3cea7248, 0x9282e3d9, 0x6f7b1bac, 0xc1138a3d, 0xe8db3ecf,
+    0x46b3af5e, 0x39418d87, 0x97291c16, 0xbee1a8e4, 0x10893975,
+    0xed70c100, 0x43185091, 0x6ad0e463, 0xc4b875f2, 0x4a5212c8,
+    0xe43a8359, 0xcdf237ab, 0x639aa63a, 0x9e635e4f, 0x300bcfde,
+    0x19c37b2c, 0xb7abeabd, 0xdf66b319, 0x710e2288, 0x58c6967a,
+    0xf6ae07eb, 0x0b57ff9e, 0xa53f6e0f, 0x8cf7dafd, 0x229f4b6c,
+    0xac752c56, 0x021dbdc7, 0x2bd50935, 0x85bd98a4, 0x784460d1,
+    0xd62cf140, 0xffe445b2, 0x518cd423, 0x5cfdedf4, 0xf2957c65,
+    0xdb5dc897, 0x75355906, 0x88cca173, 0x26a430e2, 0x0f6c8410,
+    0xa1041581, 0x2fee72bb, 0x8186e32a, 0xa84e57d8, 0x0626c649,
+    0xfbdf3e3c, 0x55b7afad, 0x7c7f1b5f, 0xd2178ace, 0xbadad36a,
+    0x14b242fb, 0x3d7af609, 0x93126798, 0x6eeb9fed, 0xc0830e7c,
+    0xe94bba8e, 0x47232b1f, 0xc9c94c25, 0x67a1ddb4, 0x4e696946,
+    0xe001f8d7, 0x1df800a2, 0xb3909133, 0x9a5825c1, 0x3430b450,
+    0x4bc29689, 0xe5aa0718, 0xcc62b3ea, 0x620a227b, 0x9ff3da0e,
+    0x319b4b9f, 0x1853ff6d, 0xb63b6efc, 0x38d109c6, 0x96b99857,
+    0xbf712ca5, 0x1119bd34, 0xece04541, 0x4288d4d0, 0x6b406022,
+    0xc528f1b3, 0xade5a817, 0x038d3986, 0x2a458d74, 0x842d1ce5,
+    0x79d4e490, 0xd7bc7501, 0xfe74c1f3, 0x501c5062, 0xdef63758,
+    0x709ea6c9, 0x5956123b, 0xf73e83aa, 0x0ac77bdf, 0xa4afea4e,
+    0x8d675ebc, 0x230fcf2d, 0x72831b0e, 0xdceb8a9f, 0xf5233e6d,
+    0x5b4baffc, 0xa6b25789, 0x08dac618, 0x211272ea, 0x8f7ae37b,
+    0x01908441, 0xaff815d0, 0x8630a122, 0x285830b3, 0xd5a1c8c6,
+    0x7bc95957, 0x5201eda5, 0xfc697c34, 0x94a42590, 0x3accb401,
+    0x130400f3, 0xbd6c9162, 0x40956917, 0xeefdf886, 0xc7354c74,
+    0x695ddde5, 0xe7b7badf, 0x49df2b4e, 0x60179fbc, 0xce7f0e2d,
+    0x3386f658, 0x9dee67c9, 0xb426d33b, 0x1a4e42aa, 0x65bc6073,
+    0xcbd4f1e2, 0xe21c4510, 0x4c74d481, 0xb18d2cf4, 0x1fe5bd65,
+    0x362d0997, 0x98459806, 0x16afff3c, 0xb8c76ead, 0x910fda5f,
+    0x3f674bce, 0xc29eb3bb, 0x6cf6222a, 0x453e96d8, 0xeb560749,
+    0x839b5eed, 0x2df3cf7c, 0x043b7b8e, 0xaa53ea1f, 0x57aa126a,
+    0xf9c283fb, 0xd00a3709, 0x7e62a698, 0xf088c1a2, 0x5ee05033,
+    0x7728e4c1, 0xd9407550, 0x24b98d25, 0x8ad11cb4, 0xa319a846,
+    0x0d7139d7},
+   {0x00000000, 0xb9fbdbe8, 0xa886b191, 0x117d6a79, 0x8a7c6563,
+    0x3387be8b, 0x22fad4f2, 0x9b010f1a, 0xcf89cc87, 0x7672176f,
+    0x670f7d16, 0xdef4a6fe, 0x45f5a9e4, 0xfc0e720c, 0xed731875,
+    0x5488c39d, 0x44629f4f, 0xfd9944a7, 0xece42ede, 0x551ff536,
+    0xce1efa2c, 0x77e521c4, 0x66984bbd, 0xdf639055, 0x8beb53c8,
+    0x32108820, 0x236de259, 0x9a9639b1, 0x019736ab, 0xb86ced43,
+    0xa911873a, 0x10ea5cd2, 0x88c53e9e, 0x313ee576, 0x20438f0f,
+    0x99b854e7, 0x02b95bfd, 0xbb428015, 0xaa3fea6c, 0x13c43184,
+    0x474cf219, 0xfeb729f1, 0xefca4388, 0x56319860, 0xcd30977a,
+    0x74cb4c92, 0x65b626eb, 0xdc4dfd03, 0xcca7a1d1, 0x755c7a39,
+    0x64211040, 0xdddacba8, 0x46dbc4b2, 0xff201f5a, 0xee5d7523,
+    0x57a6aecb, 0x032e6d56, 0xbad5b6be, 0xaba8dcc7, 0x1253072f,
+    0x89520835, 0x30a9d3dd, 0x21d4b9a4, 0x982f624c, 0xcafb7b7d,
+    0x7300a095, 0x627dcaec, 0xdb861104, 0x40871e1e, 0xf97cc5f6,
+    0xe801af8f, 0x51fa7467, 0x0572b7fa, 0xbc896c12, 0xadf4066b,
+    0x140fdd83, 0x8f0ed299, 0x36f50971, 0x27886308, 0x9e73b8e0,
+    0x8e99e432, 0x37623fda, 0x261f55a3, 0x9fe48e4b, 0x04e58151,
+    0xbd1e5ab9, 0xac6330c0, 0x1598eb28, 0x411028b5, 0xf8ebf35d,
+    0xe9969924, 0x506d42cc, 0xcb6c4dd6, 0x7297963e, 0x63eafc47,
+    0xda1127af, 0x423e45e3, 0xfbc59e0b, 0xeab8f472, 0x53432f9a,
+    0xc8422080, 0x71b9fb68, 0x60c49111, 0xd93f4af9, 0x8db78964,
+    0x344c528c, 0x253138f5, 0x9ccae31d, 0x07cbec07, 0xbe3037ef,
+    0xaf4d5d96, 0x16b6867e, 0x065cdaac, 0xbfa70144, 0xaeda6b3d,
+    0x1721b0d5, 0x8c20bfcf, 0x35db6427, 0x24a60e5e, 0x9d5dd5b6,
+    0xc9d5162b, 0x702ecdc3, 0x6153a7ba, 0xd8a87c52, 0x43a97348,
+    0xfa52a8a0, 0xeb2fc2d9, 0x52d41931, 0x4e87f0bb, 0xf77c2b53,
+    0xe601412a, 0x5ffa9ac2, 0xc4fb95d8, 0x7d004e30, 0x6c7d2449,
+    0xd586ffa1, 0x810e3c3c, 0x38f5e7d4, 0x29888dad, 0x90735645,
+    0x0b72595f, 0xb28982b7, 0xa3f4e8ce, 0x1a0f3326, 0x0ae56ff4,
+    0xb31eb41c, 0xa263de65, 0x1b98058d, 0x80990a97, 0x3962d17f,
+    0x281fbb06, 0x91e460ee, 0xc56ca373, 0x7c97789b, 0x6dea12e2,
+    0xd411c90a, 0x4f10c610, 0xf6eb1df8, 0xe7967781, 0x5e6dac69,
+    0xc642ce25, 0x7fb915cd, 0x6ec47fb4, 0xd73fa45c, 0x4c3eab46,
+    0xf5c570ae, 0xe4b81ad7, 0x5d43c13f, 0x09cb02a2, 0xb030d94a,
+    0xa14db333, 0x18b668db, 0x83b767c1, 0x3a4cbc29, 0x2b31d650,
+    0x92ca0db8, 0x8220516a, 0x3bdb8a82, 0x2aa6e0fb, 0x935d3b13,
+    0x085c3409, 0xb1a7efe1, 0xa0da8598, 0x19215e70, 0x4da99ded,
+    0xf4524605, 0xe52f2c7c, 0x5cd4f794, 0xc7d5f88e, 0x7e2e2366,
+    0x6f53491f, 0xd6a892f7, 0x847c8bc6, 0x3d87502e, 0x2cfa3a57,
+    0x9501e1bf, 0x0e00eea5, 0xb7fb354d, 0xa6865f34, 0x1f7d84dc,
+    0x4bf54741, 0xf20e9ca9, 0xe373f6d0, 0x5a882d38, 0xc1892222,
+    0x7872f9ca, 0x690f93b3, 0xd0f4485b, 0xc01e1489, 0x79e5cf61,
+    0x6898a518, 0xd1637ef0, 0x4a6271ea, 0xf399aa02, 0xe2e4c07b,
+    0x5b1f1b93, 0x0f97d80e, 0xb66c03e6, 0xa711699f, 0x1eeab277,
+    0x85ebbd6d, 0x3c106685, 0x2d6d0cfc, 0x9496d714, 0x0cb9b558,
+    0xb5426eb0, 0xa43f04c9, 0x1dc4df21, 0x86c5d03b, 0x3f3e0bd3,
+    0x2e4361aa, 0x97b8ba42, 0xc33079df, 0x7acba237, 0x6bb6c84e,
+    0xd24d13a6, 0x494c1cbc, 0xf0b7c754, 0xe1caad2d, 0x583176c5,
+    0x48db2a17, 0xf120f1ff, 0xe05d9b86, 0x59a6406e, 0xc2a74f74,
+    0x7b5c949c, 0x6a21fee5, 0xd3da250d, 0x8752e690, 0x3ea93d78,
+    0x2fd45701, 0x962f8ce9, 0x0d2e83f3, 0xb4d5581b, 0xa5a83262,
+    0x1c53e98a},
+   {0x00000000, 0x9d0fe176, 0xe16ec4ad, 0x7c6125db, 0x19ac8f1b,
+    0x84a36e6d, 0xf8c24bb6, 0x65cdaac0, 0x33591e36, 0xae56ff40,
+    0xd237da9b, 0x4f383bed, 0x2af5912d, 0xb7fa705b, 0xcb9b5580,
+    0x5694b4f6, 0x66b23c6c, 0xfbbddd1a, 0x87dcf8c1, 0x1ad319b7,
+    0x7f1eb377, 0xe2115201, 0x9e7077da, 0x037f96ac, 0x55eb225a,
+    0xc8e4c32c, 0xb485e6f7, 0x298a0781, 0x4c47ad41, 0xd1484c37,
+    0xad2969ec, 0x3026889a, 0xcd6478d8, 0x506b99ae, 0x2c0abc75,
+    0xb1055d03, 0xd4c8f7c3, 0x49c716b5, 0x35a6336e, 0xa8a9d218,
+    0xfe3d66ee, 0x63328798, 0x1f53a243, 0x825c4335, 0xe791e9f5,
+    0x7a9e0883, 0x06ff2d58, 0x9bf0cc2e, 0xabd644b4, 0x36d9a5c2,
+    0x4ab88019, 0xd7b7616f, 0xb27acbaf, 0x2f752ad9, 0x53140f02,
+    0xce1bee74, 0x988f5a82, 0x0580bbf4, 0x79e19e2f, 0xe4ee7f59,
+    0x8123d599, 0x1c2c34ef, 0x604d1134, 0xfd42f042, 0x41b9f7f1,
+    0xdcb61687, 0xa0d7335c, 0x3dd8d22a, 0x581578ea, 0xc51a999c,
+    0xb97bbc47, 0x24745d31, 0x72e0e9c7, 0xefef08b1, 0x938e2d6a,
+    0x0e81cc1c, 0x6b4c66dc, 0xf64387aa, 0x8a22a271, 0x172d4307,
+    0x270bcb9d, 0xba042aeb, 0xc6650f30, 0x5b6aee46, 0x3ea74486,
+    0xa3a8a5f0, 0xdfc9802b, 0x42c6615d, 0x1452d5ab, 0x895d34dd,
+    0xf53c1106, 0x6833f070, 0x0dfe5ab0, 0x90f1bbc6, 0xec909e1d,
+    0x719f7f6b, 0x8cdd8f29, 0x11d26e5f, 0x6db34b84, 0xf0bcaaf2,
+    0x95710032, 0x087ee144, 0x741fc49f, 0xe91025e9, 0xbf84911f,
+    0x228b7069, 0x5eea55b2, 0xc3e5b4c4, 0xa6281e04, 0x3b27ff72,
+    0x4746daa9, 0xda493bdf, 0xea6fb345, 0x77605233, 0x0b0177e8,
+    0x960e969e, 0xf3c33c5e, 0x6eccdd28, 0x12adf8f3, 0x8fa21985,
+    0xd936ad73, 0x44394c05, 0x385869de, 0xa55788a8, 0xc09a2268,
+    0x5d95c31e, 0x21f4e6c5, 0xbcfb07b3, 0x8373efe2, 0x1e7c0e94,
+    0x621d2b4f, 0xff12ca39, 0x9adf60f9, 0x07d0818f, 0x7bb1a454,
+    0xe6be4522, 0xb02af1d4, 0x2d2510a2, 0x51443579, 0xcc4bd40f,
+    0xa9867ecf, 0x34899fb9, 0x48e8ba62, 0xd5e75b14, 0xe5c1d38e,
+    0x78ce32f8, 0x04af1723, 0x99a0f655, 0xfc6d5c95, 0x6162bde3,
+    0x1d039838, 0x800c794e, 0xd698cdb8, 0x4b972cce, 0x37f60915,
+    0xaaf9e863, 0xcf3442a3, 0x523ba3d5, 0x2e5a860e, 0xb3556778,
+    0x4e17973a, 0xd318764c, 0xaf795397, 0x3276b2e1, 0x57bb1821,
+    0xcab4f957, 0xb6d5dc8c, 0x2bda3dfa, 0x7d4e890c, 0xe041687a,
+    0x9c204da1, 0x012facd7, 0x64e20617, 0xf9ede761, 0x858cc2ba,
+    0x188323cc, 0x28a5ab56, 0xb5aa4a20, 0xc9cb6ffb, 0x54c48e8d,
+    0x3109244d, 0xac06c53b, 0xd067e0e0, 0x4d680196, 0x1bfcb560,
+    0x86f35416, 0xfa9271cd, 0x679d90bb, 0x02503a7b, 0x9f5fdb0d,
+    0xe33efed6, 0x7e311fa0, 0xc2ca1813, 0x5fc5f965, 0x23a4dcbe,
+    0xbeab3dc8, 0xdb669708, 0x4669767e, 0x3a0853a5, 0xa707b2d3,
+    0xf1930625, 0x6c9ce753, 0x10fdc288, 0x8df223fe, 0xe83f893e,
+    0x75306848, 0x09514d93, 0x945eace5, 0xa478247f, 0x3977c509,
+    0x4516e0d2, 0xd81901a4, 0xbdd4ab64, 0x20db4a12, 0x5cba6fc9,
+    0xc1b58ebf, 0x97213a49, 0x0a2edb3f, 0x764ffee4, 0xeb401f92,
+    0x8e8db552, 0x13825424, 0x6fe371ff, 0xf2ec9089, 0x0fae60cb,
+    0x92a181bd, 0xeec0a466, 0x73cf4510, 0x1602efd0, 0x8b0d0ea6,
+    0xf76c2b7d, 0x6a63ca0b, 0x3cf77efd, 0xa1f89f8b, 0xdd99ba50,
+    0x40965b26, 0x255bf1e6, 0xb8541090, 0xc435354b, 0x593ad43d,
+    0x691c5ca7, 0xf413bdd1, 0x8872980a, 0x157d797c, 0x70b0d3bc,
+    0xedbf32ca, 0x91de1711, 0x0cd1f667, 0x5a454291, 0xc74aa3e7,
+    0xbb2b863c, 0x2624674a, 0x43e9cd8a, 0xdee62cfc, 0xa2870927,
+    0x3f88e851},
+   {0x00000000, 0xdd96d985, 0x605cb54b, 0xbdca6cce, 0xc0b96a96,
+    0x1d2fb313, 0xa0e5dfdd, 0x7d730658, 0x5a03d36d, 0x87950ae8,
+    0x3a5f6626, 0xe7c9bfa3, 0x9abab9fb, 0x472c607e, 0xfae60cb0,
+    0x2770d535, 0xb407a6da, 0x69917f5f, 0xd45b1391, 0x09cdca14,
+    0x74becc4c, 0xa92815c9, 0x14e27907, 0xc974a082, 0xee0475b7,
+    0x3392ac32, 0x8e58c0fc, 0x53ce1979, 0x2ebd1f21, 0xf32bc6a4,
+    0x4ee1aa6a, 0x937773ef, 0xb37e4bf5, 0x6ee89270, 0xd322febe,
+    0x0eb4273b, 0x73c72163, 0xae51f8e6, 0x139b9428, 0xce0d4dad,
+    0xe97d9898, 0x34eb411d, 0x89212dd3, 0x54b7f456, 0x29c4f20e,
+    0xf4522b8b, 0x49984745, 0x940e9ec0, 0x0779ed2f, 0xdaef34aa,
+    0x67255864, 0xbab381e1, 0xc7c087b9, 0x1a565e3c, 0xa79c32f2,
+    0x7a0aeb77, 0x5d7a3e42, 0x80ece7c7, 0x3d268b09, 0xe0b0528c,
+    0x9dc354d4, 0x40558d51, 0xfd9fe19f, 0x2009381a, 0xbd8d91ab,
+    0x601b482e, 0xddd124e0, 0x0047fd65, 0x7d34fb3d, 0xa0a222b8,
+    0x1d684e76, 0xc0fe97f3, 0xe78e42c6, 0x3a189b43, 0x87d2f78d,
+    0x5a442e08, 0x27372850, 0xfaa1f1d5, 0x476b9d1b, 0x9afd449e,
+    0x098a3771, 0xd41ceef4, 0x69d6823a, 0xb4405bbf, 0xc9335de7,
+    0x14a58462, 0xa96fe8ac, 0x74f93129, 0x5389e41c, 0x8e1f3d99,
+    0x33d55157, 0xee4388d2, 0x93308e8a, 0x4ea6570f, 0xf36c3bc1,
+    0x2efae244, 0x0ef3da5e, 0xd36503db, 0x6eaf6f15, 0xb339b690,
+    0xce4ab0c8, 0x13dc694d, 0xae160583, 0x7380dc06, 0x54f00933,
+    0x8966d0b6, 0x34acbc78, 0xe93a65fd, 0x944963a5, 0x49dfba20,
+    0xf415d6ee, 0x29830f6b, 0xbaf47c84, 0x6762a501, 0xdaa8c9cf,
+    0x073e104a, 0x7a4d1612, 0xa7dbcf97, 0x1a11a359, 0xc7877adc,
+    0xe0f7afe9, 0x3d61766c, 0x80ab1aa2, 0x5d3dc327, 0x204ec57f,
+    0xfdd81cfa, 0x40127034, 0x9d84a9b1, 0xa06a2517, 0x7dfcfc92,
+    0xc036905c, 0x1da049d9, 0x60d34f81, 0xbd459604, 0x008ffaca,
+    0xdd19234f, 0xfa69f67a, 0x27ff2fff, 0x9a354331, 0x47a39ab4,
+    0x3ad09cec, 0xe7464569, 0x5a8c29a7, 0x871af022, 0x146d83cd,
+    0xc9fb5a48, 0x74313686, 0xa9a7ef03, 0xd4d4e95b, 0x094230de,
+    0xb4885c10, 0x691e8595, 0x4e6e50a0, 0x93f88925, 0x2e32e5eb,
+    0xf3a43c6e, 0x8ed73a36, 0x5341e3b3, 0xee8b8f7d, 0x331d56f8,
+    0x13146ee2, 0xce82b767, 0x7348dba9, 0xaede022c, 0xd3ad0474,
+    0x0e3bddf1, 0xb3f1b13f, 0x6e6768ba, 0x4917bd8f, 0x9481640a,
+    0x294b08c4, 0xf4ddd141, 0x89aed719, 0x54380e9c, 0xe9f26252,
+    0x3464bbd7, 0xa713c838, 0x7a8511bd, 0xc74f7d73, 0x1ad9a4f6,
+    0x67aaa2ae, 0xba3c7b2b, 0x07f617e5, 0xda60ce60, 0xfd101b55,
+    0x2086c2d0, 0x9d4cae1e, 0x40da779b, 0x3da971c3, 0xe03fa846,
+    0x5df5c488, 0x80631d0d, 0x1de7b4bc, 0xc0716d39, 0x7dbb01f7,
+    0xa02dd872, 0xdd5ede2a, 0x00c807af, 0xbd026b61, 0x6094b2e4,
+    0x47e467d1, 0x9a72be54, 0x27b8d29a, 0xfa2e0b1f, 0x875d0d47,
+    0x5acbd4c2, 0xe701b80c, 0x3a976189, 0xa9e01266, 0x7476cbe3,
+    0xc9bca72d, 0x142a7ea8, 0x695978f0, 0xb4cfa175, 0x0905cdbb,
+    0xd493143e, 0xf3e3c10b, 0x2e75188e, 0x93bf7440, 0x4e29adc5,
+    0x335aab9d, 0xeecc7218, 0x53061ed6, 0x8e90c753, 0xae99ff49,
+    0x730f26cc, 0xcec54a02, 0x13539387, 0x6e2095df, 0xb3b64c5a,
+    0x0e7c2094, 0xd3eaf911, 0xf49a2c24, 0x290cf5a1, 0x94c6996f,
+    0x495040ea, 0x342346b2, 0xe9b59f37, 0x547ff3f9, 0x89e92a7c,
+    0x1a9e5993, 0xc7088016, 0x7ac2ecd8, 0xa754355d, 0xda273305,
+    0x07b1ea80, 0xba7b864e, 0x67ed5fcb, 0x409d8afe, 0x9d0b537b,
+    0x20c13fb5, 0xfd57e630, 0x8024e068, 0x5db239ed, 0xe0785523,
+    0x3dee8ca6}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x00000000, 0x85d996dd, 0x4bb55c60, 0xce6ccabd, 0x966ab9c0,
+    0x13b32f1d, 0xdddfe5a0, 0x5806737d, 0x6dd3035a, 0xe80a9587,
+    0x26665f3a, 0xa3bfc9e7, 0xfbb9ba9a, 0x7e602c47, 0xb00ce6fa,
+    0x35d57027, 0xdaa607b4, 0x5f7f9169, 0x91135bd4, 0x14cacd09,
+    0x4cccbe74, 0xc91528a9, 0x0779e214, 0x82a074c9, 0xb77504ee,
+    0x32ac9233, 0xfcc0588e, 0x7919ce53, 0x211fbd2e, 0xa4c62bf3,
+    0x6aaae14e, 0xef737793, 0xf54b7eb3, 0x7092e86e, 0xbefe22d3,
+    0x3b27b40e, 0x6321c773, 0xe6f851ae, 0x28949b13, 0xad4d0dce,
+    0x98987de9, 0x1d41eb34, 0xd32d2189, 0x56f4b754, 0x0ef2c429,
+    0x8b2b52f4, 0x45479849, 0xc09e0e94, 0x2fed7907, 0xaa34efda,
+    0x64582567, 0xe181b3ba, 0xb987c0c7, 0x3c5e561a, 0xf2329ca7,
+    0x77eb0a7a, 0x423e7a5d, 0xc7e7ec80, 0x098b263d, 0x8c52b0e0,
+    0xd454c39d, 0x518d5540, 0x9fe19ffd, 0x1a380920, 0xab918dbd,
+    0x2e481b60, 0xe024d1dd, 0x65fd4700, 0x3dfb347d, 0xb822a2a0,
+    0x764e681d, 0xf397fec0, 0xc6428ee7, 0x439b183a, 0x8df7d287,
+    0x082e445a, 0x50283727, 0xd5f1a1fa, 0x1b9d6b47, 0x9e44fd9a,
+    0x71378a09, 0xf4ee1cd4, 0x3a82d669, 0xbf5b40b4, 0xe75d33c9,
+    0x6284a514, 0xace86fa9, 0x2931f974, 0x1ce48953, 0x993d1f8e,
+    0x5751d533, 0xd28843ee, 0x8a8e3093, 0x0f57a64e, 0xc13b6cf3,
+    0x44e2fa2e, 0x5edaf30e, 0xdb0365d3, 0x156faf6e, 0x90b639b3,
+    0xc8b04ace, 0x4d69dc13, 0x830516ae, 0x06dc8073, 0x3309f054,
+    0xb6d06689, 0x78bcac34, 0xfd653ae9, 0xa5634994, 0x20badf49,
+    0xeed615f4, 0x6b0f8329, 0x847cf4ba, 0x01a56267, 0xcfc9a8da,
+    0x4a103e07, 0x12164d7a, 0x97cfdba7, 0x59a3111a, 0xdc7a87c7,
+    0xe9aff7e0, 0x6c76613d, 0xa21aab80, 0x27c33d5d, 0x7fc54e20,
+    0xfa1cd8fd, 0x34701240, 0xb1a9849d, 0x17256aa0, 0x92fcfc7d,
+    0x5c9036c0, 0xd949a01d, 0x814fd360, 0x049645bd, 0xcafa8f00,
+    0x4f2319dd, 0x7af669fa, 0xff2fff27, 0x3143359a, 0xb49aa347,
+    0xec9cd03a, 0x694546e7, 0xa7298c5a, 0x22f01a87, 0xcd836d14,
+    0x485afbc9, 0x86363174, 0x03efa7a9, 0x5be9d4d4, 0xde304209,
+    0x105c88b4, 0x95851e69, 0xa0506e4e, 0x2589f893, 0xebe5322e,
+    0x6e3ca4f3, 0x363ad78e, 0xb3e34153, 0x7d8f8bee, 0xf8561d33,
+    0xe26e1413, 0x67b782ce, 0xa9db4873, 0x2c02deae, 0x7404add3,
+    0xf1dd3b0e, 0x3fb1f1b3, 0xba68676e, 0x8fbd1749, 0x0a648194,
+    0xc4084b29, 0x41d1ddf4, 0x19d7ae89, 0x9c0e3854, 0x5262f2e9,
+    0xd7bb6434, 0x38c813a7, 0xbd11857a, 0x737d4fc7, 0xf6a4d91a,
+    0xaea2aa67, 0x2b7b3cba, 0xe517f607, 0x60ce60da, 0x551b10fd,
+    0xd0c28620, 0x1eae4c9d, 0x9b77da40, 0xc371a93d, 0x46a83fe0,
+    0x88c4f55d, 0x0d1d6380, 0xbcb4e71d, 0x396d71c0, 0xf701bb7d,
+    0x72d82da0, 0x2ade5edd, 0xaf07c800, 0x616b02bd, 0xe4b29460,
+    0xd167e447, 0x54be729a, 0x9ad2b827, 0x1f0b2efa, 0x470d5d87,
+    0xc2d4cb5a, 0x0cb801e7, 0x8961973a, 0x6612e0a9, 0xe3cb7674,
+    0x2da7bcc9, 0xa87e2a14, 0xf0785969, 0x75a1cfb4, 0xbbcd0509,
+    0x3e1493d4, 0x0bc1e3f3, 0x8e18752e, 0x4074bf93, 0xc5ad294e,
+    0x9dab5a33, 0x1872ccee, 0xd61e0653, 0x53c7908e, 0x49ff99ae,
+    0xcc260f73, 0x024ac5ce, 0x87935313, 0xdf95206e, 0x5a4cb6b3,
+    0x94207c0e, 0x11f9ead3, 0x242c9af4, 0xa1f50c29, 0x6f99c694,
+    0xea405049, 0xb2462334, 0x379fb5e9, 0xf9f37f54, 0x7c2ae989,
+    0x93599e1a, 0x168008c7, 0xd8ecc27a, 0x5d3554a7, 0x053327da,
+    0x80eab107, 0x4e867bba, 0xcb5fed67, 0xfe8a9d40, 0x7b530b9d,
+    0xb53fc120, 0x30e657fd, 0x68e02480, 0xed39b25d, 0x235578e0,
+    0xa68cee3d},
+   {0x00000000, 0x76e10f9d, 0xadc46ee1, 0xdb25617c, 0x1b8fac19,
+    0x6d6ea384, 0xb64bc2f8, 0xc0aacd65, 0x361e5933, 0x40ff56ae,
+    0x9bda37d2, 0xed3b384f, 0x2d91f52a, 0x5b70fab7, 0x80559bcb,
+    0xf6b49456, 0x6c3cb266, 0x1addbdfb, 0xc1f8dc87, 0xb719d31a,
+    0x77b31e7f, 0x015211e2, 0xda77709e, 0xac967f03, 0x5a22eb55,
+    0x2cc3e4c8, 0xf7e685b4, 0x81078a29, 0x41ad474c, 0x374c48d1,
+    0xec6929ad, 0x9a882630, 0xd87864cd, 0xae996b50, 0x75bc0a2c,
+    0x035d05b1, 0xc3f7c8d4, 0xb516c749, 0x6e33a635, 0x18d2a9a8,
+    0xee663dfe, 0x98873263, 0x43a2531f, 0x35435c82, 0xf5e991e7,
+    0x83089e7a, 0x582dff06, 0x2eccf09b, 0xb444d6ab, 0xc2a5d936,
+    0x1980b84a, 0x6f61b7d7, 0xafcb7ab2, 0xd92a752f, 0x020f1453,
+    0x74ee1bce, 0x825a8f98, 0xf4bb8005, 0x2f9ee179, 0x597feee4,
+    0x99d52381, 0xef342c1c, 0x34114d60, 0x42f042fd, 0xf1f7b941,
+    0x8716b6dc, 0x5c33d7a0, 0x2ad2d83d, 0xea781558, 0x9c991ac5,
+    0x47bc7bb9, 0x315d7424, 0xc7e9e072, 0xb108efef, 0x6a2d8e93,
+    0x1ccc810e, 0xdc664c6b, 0xaa8743f6, 0x71a2228a, 0x07432d17,
+    0x9dcb0b27, 0xeb2a04ba, 0x300f65c6, 0x46ee6a5b, 0x8644a73e,
+    0xf0a5a8a3, 0x2b80c9df, 0x5d61c642, 0xabd55214, 0xdd345d89,
+    0x06113cf5, 0x70f03368, 0xb05afe0d, 0xc6bbf190, 0x1d9e90ec,
+    0x6b7f9f71, 0x298fdd8c, 0x5f6ed211, 0x844bb36d, 0xf2aabcf0,
+    0x32007195, 0x44e17e08, 0x9fc41f74, 0xe92510e9, 0x1f9184bf,
+    0x69708b22, 0xb255ea5e, 0xc4b4e5c3, 0x041e28a6, 0x72ff273b,
+    0xa9da4647, 0xdf3b49da, 0x45b36fea, 0x33526077, 0xe877010b,
+    0x9e960e96, 0x5e3cc3f3, 0x28ddcc6e, 0xf3f8ad12, 0x8519a28f,
+    0x73ad36d9, 0x054c3944, 0xde695838, 0xa88857a5, 0x68229ac0,
+    0x1ec3955d, 0xc5e6f421, 0xb307fbbc, 0xe2ef7383, 0x940e7c1e,
+    0x4f2b1d62, 0x39ca12ff, 0xf960df9a, 0x8f81d007, 0x54a4b17b,
+    0x2245bee6, 0xd4f12ab0, 0xa210252d, 0x79354451, 0x0fd44bcc,
+    0xcf7e86a9, 0xb99f8934, 0x62bae848, 0x145be7d5, 0x8ed3c1e5,
+    0xf832ce78, 0x2317af04, 0x55f6a099, 0x955c6dfc, 0xe3bd6261,
+    0x3898031d, 0x4e790c80, 0xb8cd98d6, 0xce2c974b, 0x1509f637,
+    0x63e8f9aa, 0xa34234cf, 0xd5a33b52, 0x0e865a2e, 0x786755b3,
+    0x3a97174e, 0x4c7618d3, 0x975379af, 0xe1b27632, 0x2118bb57,
+    0x57f9b4ca, 0x8cdcd5b6, 0xfa3dda2b, 0x0c894e7d, 0x7a6841e0,
+    0xa14d209c, 0xd7ac2f01, 0x1706e264, 0x61e7edf9, 0xbac28c85,
+    0xcc238318, 0x56aba528, 0x204aaab5, 0xfb6fcbc9, 0x8d8ec454,
+    0x4d240931, 0x3bc506ac, 0xe0e067d0, 0x9601684d, 0x60b5fc1b,
+    0x1654f386, 0xcd7192fa, 0xbb909d67, 0x7b3a5002, 0x0ddb5f9f,
+    0xd6fe3ee3, 0xa01f317e, 0x1318cac2, 0x65f9c55f, 0xbedca423,
+    0xc83dabbe, 0x089766db, 0x7e766946, 0xa553083a, 0xd3b207a7,
+    0x250693f1, 0x53e79c6c, 0x88c2fd10, 0xfe23f28d, 0x3e893fe8,
+    0x48683075, 0x934d5109, 0xe5ac5e94, 0x7f2478a4, 0x09c57739,
+    0xd2e01645, 0xa40119d8, 0x64abd4bd, 0x124adb20, 0xc96fba5c,
+    0xbf8eb5c1, 0x493a2197, 0x3fdb2e0a, 0xe4fe4f76, 0x921f40eb,
+    0x52b58d8e, 0x24548213, 0xff71e36f, 0x8990ecf2, 0xcb60ae0f,
+    0xbd81a192, 0x66a4c0ee, 0x1045cf73, 0xd0ef0216, 0xa60e0d8b,
+    0x7d2b6cf7, 0x0bca636a, 0xfd7ef73c, 0x8b9ff8a1, 0x50ba99dd,
+    0x265b9640, 0xe6f15b25, 0x901054b8, 0x4b3535c4, 0x3dd43a59,
+    0xa75c1c69, 0xd1bd13f4, 0x0a987288, 0x7c797d15, 0xbcd3b070,
+    0xca32bfed, 0x1117de91, 0x67f6d10c, 0x9142455a, 0xe7a34ac7,
+    0x3c862bbb, 0x4a672426, 0x8acde943, 0xfc2ce6de, 0x270987a2,
+    0x51e8883f},
+   {0x00000000, 0xe8dbfbb9, 0x91b186a8, 0x796a7d11, 0x63657c8a,
+    0x8bbe8733, 0xf2d4fa22, 0x1a0f019b, 0x87cc89cf, 0x6f177276,
+    0x167d0f67, 0xfea6f4de, 0xe4a9f545, 0x0c720efc, 0x751873ed,
+    0x9dc38854, 0x4f9f6244, 0xa74499fd, 0xde2ee4ec, 0x36f51f55,
+    0x2cfa1ece, 0xc421e577, 0xbd4b9866, 0x559063df, 0xc853eb8b,
+    0x20881032, 0x59e26d23, 0xb139969a, 0xab369701, 0x43ed6cb8,
+    0x3a8711a9, 0xd25cea10, 0x9e3ec588, 0x76e53e31, 0x0f8f4320,
+    0xe754b899, 0xfd5bb902, 0x158042bb, 0x6cea3faa, 0x8431c413,
+    0x19f24c47, 0xf129b7fe, 0x8843caef, 0x60983156, 0x7a9730cd,
+    0x924ccb74, 0xeb26b665, 0x03fd4ddc, 0xd1a1a7cc, 0x397a5c75,
+    0x40102164, 0xa8cbdadd, 0xb2c4db46, 0x5a1f20ff, 0x23755dee,
+    0xcbaea657, 0x566d2e03, 0xbeb6d5ba, 0xc7dca8ab, 0x2f075312,
+    0x35085289, 0xddd3a930, 0xa4b9d421, 0x4c622f98, 0x7d7bfbca,
+    0x95a00073, 0xecca7d62, 0x041186db, 0x1e1e8740, 0xf6c57cf9,
+    0x8faf01e8, 0x6774fa51, 0xfab77205, 0x126c89bc, 0x6b06f4ad,
+    0x83dd0f14, 0x99d20e8f, 0x7109f536, 0x08638827, 0xe0b8739e,
+    0x32e4998e, 0xda3f6237, 0xa3551f26, 0x4b8ee49f, 0x5181e504,
+    0xb95a1ebd, 0xc03063ac, 0x28eb9815, 0xb5281041, 0x5df3ebf8,
+    0x249996e9, 0xcc426d50, 0xd64d6ccb, 0x3e969772, 0x47fcea63,
+    0xaf2711da, 0xe3453e42, 0x0b9ec5fb, 0x72f4b8ea, 0x9a2f4353,
+    0x802042c8, 0x68fbb971, 0x1191c460, 0xf94a3fd9, 0x6489b78d,
+    0x8c524c34, 0xf5383125, 0x1de3ca9c, 0x07eccb07, 0xef3730be,
+    0x965d4daf, 0x7e86b616, 0xacda5c06, 0x4401a7bf, 0x3d6bdaae,
+    0xd5b02117, 0xcfbf208c, 0x2764db35, 0x5e0ea624, 0xb6d55d9d,
+    0x2b16d5c9, 0xc3cd2e70, 0xbaa75361, 0x527ca8d8, 0x4873a943,
+    0xa0a852fa, 0xd9c22feb, 0x3119d452, 0xbbf0874e, 0x532b7cf7,
+    0x2a4101e6, 0xc29afa5f, 0xd895fbc4, 0x304e007d, 0x49247d6c,
+    0xa1ff86d5, 0x3c3c0e81, 0xd4e7f538, 0xad8d8829, 0x45567390,
+    0x5f59720b, 0xb78289b2, 0xcee8f4a3, 0x26330f1a, 0xf46fe50a,
+    0x1cb41eb3, 0x65de63a2, 0x8d05981b, 0x970a9980, 0x7fd16239,
+    0x06bb1f28, 0xee60e491, 0x73a36cc5, 0x9b78977c, 0xe212ea6d,
+    0x0ac911d4, 0x10c6104f, 0xf81debf6, 0x817796e7, 0x69ac6d5e,
+    0x25ce42c6, 0xcd15b97f, 0xb47fc46e, 0x5ca43fd7, 0x46ab3e4c,
+    0xae70c5f5, 0xd71ab8e4, 0x3fc1435d, 0xa202cb09, 0x4ad930b0,
+    0x33b34da1, 0xdb68b618, 0xc167b783, 0x29bc4c3a, 0x50d6312b,
+    0xb80dca92, 0x6a512082, 0x828adb3b, 0xfbe0a62a, 0x133b5d93,
+    0x09345c08, 0xe1efa7b1, 0x9885daa0, 0x705e2119, 0xed9da94d,
+    0x054652f4, 0x7c2c2fe5, 0x94f7d45c, 0x8ef8d5c7, 0x66232e7e,
+    0x1f49536f, 0xf792a8d6, 0xc68b7c84, 0x2e50873d, 0x573afa2c,
+    0xbfe10195, 0xa5ee000e, 0x4d35fbb7, 0x345f86a6, 0xdc847d1f,
+    0x4147f54b, 0xa99c0ef2, 0xd0f673e3, 0x382d885a, 0x222289c1,
+    0xcaf97278, 0xb3930f69, 0x5b48f4d0, 0x89141ec0, 0x61cfe579,
+    0x18a59868, 0xf07e63d1, 0xea71624a, 0x02aa99f3, 0x7bc0e4e2,
+    0x931b1f5b, 0x0ed8970f, 0xe6036cb6, 0x9f6911a7, 0x77b2ea1e,
+    0x6dbdeb85, 0x8566103c, 0xfc0c6d2d, 0x14d79694, 0x58b5b90c,
+    0xb06e42b5, 0xc9043fa4, 0x21dfc41d, 0x3bd0c586, 0xd30b3e3f,
+    0xaa61432e, 0x42bab897, 0xdf7930c3, 0x37a2cb7a, 0x4ec8b66b,
+    0xa6134dd2, 0xbc1c4c49, 0x54c7b7f0, 0x2dadcae1, 0xc5763158,
+    0x172adb48, 0xfff120f1, 0x869b5de0, 0x6e40a659, 0x744fa7c2,
+    0x9c945c7b, 0xe5fe216a, 0x0d25dad3, 0x90e65287, 0x783da93e,
+    0x0157d42f, 0xe98c2f96, 0xf3832e0d, 0x1b58d5b4, 0x6232a8a5,
+    0x8ae9531c},
+   {0x00000000, 0x919168ae, 0x6325a087, 0xf2b4c829, 0x874c31d4,
+    0x16dd597a, 0xe4699153, 0x75f8f9fd, 0x4f9f1373, 0xde0e7bdd,
+    0x2cbab3f4, 0xbd2bdb5a, 0xc8d322a7, 0x59424a09, 0xabf68220,
+    0x3a67ea8e, 0x9e3e27e6, 0x0faf4f48, 0xfd1b8761, 0x6c8aefcf,
+    0x19721632, 0x88e37e9c, 0x7a57b6b5, 0xebc6de1b, 0xd1a13495,
+    0x40305c3b, 0xb2849412, 0x2315fcbc, 0x56ed0541, 0xc77c6def,
+    0x35c8a5c6, 0xa459cd68, 0x7d7b3f17, 0xecea57b9, 0x1e5e9f90,
+    0x8fcff73e, 0xfa370ec3, 0x6ba6666d, 0x9912ae44, 0x0883c6ea,
+    0x32e42c64, 0xa37544ca, 0x51c18ce3, 0xc050e44d, 0xb5a81db0,
+    0x2439751e, 0xd68dbd37, 0x471cd599, 0xe34518f1, 0x72d4705f,
+    0x8060b876, 0x11f1d0d8, 0x64092925, 0xf598418b, 0x072c89a2,
+    0x96bde10c, 0xacda0b82, 0x3d4b632c, 0xcfffab05, 0x5e6ec3ab,
+    0x2b963a56, 0xba0752f8, 0x48b39ad1, 0xd922f27f, 0xfaf67e2e,
+    0x6b671680, 0x99d3dea9, 0x0842b607, 0x7dba4ffa, 0xec2b2754,
+    0x1e9fef7d, 0x8f0e87d3, 0xb5696d5d, 0x24f805f3, 0xd64ccdda,
+    0x47dda574, 0x32255c89, 0xa3b43427, 0x5100fc0e, 0xc09194a0,
+    0x64c859c8, 0xf5593166, 0x07edf94f, 0x967c91e1, 0xe384681c,
+    0x721500b2, 0x80a1c89b, 0x1130a035, 0x2b574abb, 0xbac62215,
+    0x4872ea3c, 0xd9e38292, 0xac1b7b6f, 0x3d8a13c1, 0xcf3edbe8,
+    0x5eafb346, 0x878d4139, 0x161c2997, 0xe4a8e1be, 0x75398910,
+    0x00c170ed, 0x91501843, 0x63e4d06a, 0xf275b8c4, 0xc812524a,
+    0x59833ae4, 0xab37f2cd, 0x3aa69a63, 0x4f5e639e, 0xdecf0b30,
+    0x2c7bc319, 0xbdeaabb7, 0x19b366df, 0x88220e71, 0x7a96c658,
+    0xeb07aef6, 0x9eff570b, 0x0f6e3fa5, 0xfddaf78c, 0x6c4b9f22,
+    0x562c75ac, 0xc7bd1d02, 0x3509d52b, 0xa498bd85, 0xd1604478,
+    0x40f12cd6, 0xb245e4ff, 0x23d48c51, 0xf4edfd5c, 0x657c95f2,
+    0x97c85ddb, 0x06593575, 0x73a1cc88, 0xe230a426, 0x10846c0f,
+    0x811504a1, 0xbb72ee2f, 0x2ae38681, 0xd8574ea8, 0x49c62606,
+    0x3c3edffb, 0xadafb755, 0x5f1b7f7c, 0xce8a17d2, 0x6ad3daba,
+    0xfb42b214, 0x09f67a3d, 0x98671293, 0xed9feb6e, 0x7c0e83c0,
+    0x8eba4be9, 0x1f2b2347, 0x254cc9c9, 0xb4dda167, 0x4669694e,
+    0xd7f801e0, 0xa200f81d, 0x339190b3, 0xc125589a, 0x50b43034,
+    0x8996c24b, 0x1807aae5, 0xeab362cc, 0x7b220a62, 0x0edaf39f,
+    0x9f4b9b31, 0x6dff5318, 0xfc6e3bb6, 0xc609d138, 0x5798b996,
+    0xa52c71bf, 0x34bd1911, 0x4145e0ec, 0xd0d48842, 0x2260406b,
+    0xb3f128c5, 0x17a8e5ad, 0x86398d03, 0x748d452a, 0xe51c2d84,
+    0x90e4d479, 0x0175bcd7, 0xf3c174fe, 0x62501c50, 0x5837f6de,
+    0xc9a69e70, 0x3b125659, 0xaa833ef7, 0xdf7bc70a, 0x4eeaafa4,
+    0xbc5e678d, 0x2dcf0f23, 0x0e1b8372, 0x9f8aebdc, 0x6d3e23f5,
+    0xfcaf4b5b, 0x8957b2a6, 0x18c6da08, 0xea721221, 0x7be37a8f,
+    0x41849001, 0xd015f8af, 0x22a13086, 0xb3305828, 0xc6c8a1d5,
+    0x5759c97b, 0xa5ed0152, 0x347c69fc, 0x9025a494, 0x01b4cc3a,
+    0xf3000413, 0x62916cbd, 0x17699540, 0x86f8fdee, 0x744c35c7,
+    0xe5dd5d69, 0xdfbab7e7, 0x4e2bdf49, 0xbc9f1760, 0x2d0e7fce,
+    0x58f68633, 0xc967ee9d, 0x3bd326b4, 0xaa424e1a, 0x7360bc65,
+    0xe2f1d4cb, 0x10451ce2, 0x81d4744c, 0xf42c8db1, 0x65bde51f,
+    0x97092d36, 0x06984598, 0x3cffaf16, 0xad6ec7b8, 0x5fda0f91,
+    0xce4b673f, 0xbbb39ec2, 0x2a22f66c, 0xd8963e45, 0x490756eb,
+    0xed5e9b83, 0x7ccff32d, 0x8e7b3b04, 0x1fea53aa, 0x6a12aa57,
+    0xfb83c2f9, 0x09370ad0, 0x98a6627e, 0xa2c188f0, 0x3350e05e,
+    0xc1e42877, 0x507540d9, 0x258db924, 0xb41cd18a, 0x46a819a3,
+    0xd739710d}};
+
+#endif
+
+#endif
+
+#if N == 5
+
+#if W == 8
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0xaf449247, 0x85f822cf, 0x2abcb088, 0xd08143df,
+    0x7fc5d198, 0x55796110, 0xfa3df357, 0x7a7381ff, 0xd53713b8,
+    0xff8ba330, 0x50cf3177, 0xaaf2c220, 0x05b65067, 0x2f0ae0ef,
+    0x804e72a8, 0xf4e703fe, 0x5ba391b9, 0x711f2131, 0xde5bb376,
+    0x24664021, 0x8b22d266, 0xa19e62ee, 0x0edaf0a9, 0x8e948201,
+    0x21d01046, 0x0b6ca0ce, 0xa4283289, 0x5e15c1de, 0xf1515399,
+    0xdbede311, 0x74a97156, 0x32bf01bd, 0x9dfb93fa, 0xb7472372,
+    0x1803b135, 0xe23e4262, 0x4d7ad025, 0x67c660ad, 0xc882f2ea,
+    0x48cc8042, 0xe7881205, 0xcd34a28d, 0x627030ca, 0x984dc39d,
+    0x370951da, 0x1db5e152, 0xb2f17315, 0xc6580243, 0x691c9004,
+    0x43a0208c, 0xece4b2cb, 0x16d9419c, 0xb99dd3db, 0x93216353,
+    0x3c65f114, 0xbc2b83bc, 0x136f11fb, 0x39d3a173, 0x96973334,
+    0x6caac063, 0xc3ee5224, 0xe952e2ac, 0x461670eb, 0x657e037a,
+    0xca3a913d, 0xe08621b5, 0x4fc2b3f2, 0xb5ff40a5, 0x1abbd2e2,
+    0x3007626a, 0x9f43f02d, 0x1f0d8285, 0xb04910c2, 0x9af5a04a,
+    0x35b1320d, 0xcf8cc15a, 0x60c8531d, 0x4a74e395, 0xe53071d2,
+    0x91990084, 0x3edd92c3, 0x1461224b, 0xbb25b00c, 0x4118435b,
+    0xee5cd11c, 0xc4e06194, 0x6ba4f3d3, 0xebea817b, 0x44ae133c,
+    0x6e12a3b4, 0xc15631f3, 0x3b6bc2a4, 0x942f50e3, 0xbe93e06b,
+    0x11d7722c, 0x57c102c7, 0xf8859080, 0xd2392008, 0x7d7db24f,
+    0x87404118, 0x2804d35f, 0x02b863d7, 0xadfcf190, 0x2db28338,
+    0x82f6117f, 0xa84aa1f7, 0x070e33b0, 0xfd33c0e7, 0x527752a0,
+    0x78cbe228, 0xd78f706f, 0xa3260139, 0x0c62937e, 0x26de23f6,
+    0x899ab1b1, 0x73a742e6, 0xdce3d0a1, 0xf65f6029, 0x591bf26e,
+    0xd95580c6, 0x76111281, 0x5cada209, 0xf3e9304e, 0x09d4c319,
+    0xa690515e, 0x8c2ce1d6, 0x23687391, 0xcafc06f4, 0x65b894b3,
+    0x4f04243b, 0xe040b67c, 0x1a7d452b, 0xb539d76c, 0x9f8567e4,
+    0x30c1f5a3, 0xb08f870b, 0x1fcb154c, 0x3577a5c4, 0x9a333783,
+    0x600ec4d4, 0xcf4a5693, 0xe5f6e61b, 0x4ab2745c, 0x3e1b050a,
+    0x915f974d, 0xbbe327c5, 0x14a7b582, 0xee9a46d5, 0x41ded492,
+    0x6b62641a, 0xc426f65d, 0x446884f5, 0xeb2c16b2, 0xc190a63a,
+    0x6ed4347d, 0x94e9c72a, 0x3bad556d, 0x1111e5e5, 0xbe5577a2,
+    0xf8430749, 0x5707950e, 0x7dbb2586, 0xd2ffb7c1, 0x28c24496,
+    0x8786d6d1, 0xad3a6659, 0x027ef41e, 0x823086b6, 0x2d7414f1,
+    0x07c8a479, 0xa88c363e, 0x52b1c569, 0xfdf5572e, 0xd749e7a6,
+    0x780d75e1, 0x0ca404b7, 0xa3e096f0, 0x895c2678, 0x2618b43f,
+    0xdc254768, 0x7361d52f, 0x59dd65a7, 0xf699f7e0, 0x76d78548,
+    0xd993170f, 0xf32fa787, 0x5c6b35c0, 0xa656c697, 0x091254d0,
+    0x23aee458, 0x8cea761f, 0xaf82058e, 0x00c697c9, 0x2a7a2741,
+    0x853eb506, 0x7f034651, 0xd047d416, 0xfafb649e, 0x55bff6d9,
+    0xd5f18471, 0x7ab51636, 0x5009a6be, 0xff4d34f9, 0x0570c7ae,
+    0xaa3455e9, 0x8088e561, 0x2fcc7726, 0x5b650670, 0xf4219437,
+    0xde9d24bf, 0x71d9b6f8, 0x8be445af, 0x24a0d7e8, 0x0e1c6760,
+    0xa158f527, 0x2116878f, 0x8e5215c8, 0xa4eea540, 0x0baa3707,
+    0xf197c450, 0x5ed35617, 0x746fe69f, 0xdb2b74d8, 0x9d3d0433,
+    0x32799674, 0x18c526fc, 0xb781b4bb, 0x4dbc47ec, 0xe2f8d5ab,
+    0xc8446523, 0x6700f764, 0xe74e85cc, 0x480a178b, 0x62b6a703,
+    0xcdf23544, 0x37cfc613, 0x988b5454, 0xb237e4dc, 0x1d73769b,
+    0x69da07cd, 0xc69e958a, 0xec222502, 0x4366b745, 0xb95b4412,
+    0x161fd655, 0x3ca366dd, 0x93e7f49a, 0x13a98632, 0xbced1475,
+    0x9651a4fd, 0x391536ba, 0xc328c5ed, 0x6c6c57aa, 0x46d0e722,
+    0xe9947565},
+   {0x00000000, 0x4e890ba9, 0x9d121752, 0xd39b1cfb, 0xe15528e5,
+    0xafdc234c, 0x7c473fb7, 0x32ce341e, 0x19db578b, 0x57525c22,
+    0x84c940d9, 0xca404b70, 0xf88e7f6e, 0xb60774c7, 0x659c683c,
+    0x2b156395, 0x33b6af16, 0x7d3fa4bf, 0xaea4b844, 0xe02db3ed,
+    0xd2e387f3, 0x9c6a8c5a, 0x4ff190a1, 0x01789b08, 0x2a6df89d,
+    0x64e4f334, 0xb77fefcf, 0xf9f6e466, 0xcb38d078, 0x85b1dbd1,
+    0x562ac72a, 0x18a3cc83, 0x676d5e2c, 0x29e45585, 0xfa7f497e,
+    0xb4f642d7, 0x863876c9, 0xc8b17d60, 0x1b2a619b, 0x55a36a32,
+    0x7eb609a7, 0x303f020e, 0xe3a41ef5, 0xad2d155c, 0x9fe32142,
+    0xd16a2aeb, 0x02f13610, 0x4c783db9, 0x54dbf13a, 0x1a52fa93,
+    0xc9c9e668, 0x8740edc1, 0xb58ed9df, 0xfb07d276, 0x289cce8d,
+    0x6615c524, 0x4d00a6b1, 0x0389ad18, 0xd012b1e3, 0x9e9bba4a,
+    0xac558e54, 0xe2dc85fd, 0x31479906, 0x7fce92af, 0xcedabc58,
+    0x8053b7f1, 0x53c8ab0a, 0x1d41a0a3, 0x2f8f94bd, 0x61069f14,
+    0xb29d83ef, 0xfc148846, 0xd701ebd3, 0x9988e07a, 0x4a13fc81,
+    0x049af728, 0x3654c336, 0x78ddc89f, 0xab46d464, 0xe5cfdfcd,
+    0xfd6c134e, 0xb3e518e7, 0x607e041c, 0x2ef70fb5, 0x1c393bab,
+    0x52b03002, 0x812b2cf9, 0xcfa22750, 0xe4b744c5, 0xaa3e4f6c,
+    0x79a55397, 0x372c583e, 0x05e26c20, 0x4b6b6789, 0x98f07b72,
+    0xd67970db, 0xa9b7e274, 0xe73ee9dd, 0x34a5f526, 0x7a2cfe8f,
+    0x48e2ca91, 0x066bc138, 0xd5f0ddc3, 0x9b79d66a, 0xb06cb5ff,
+    0xfee5be56, 0x2d7ea2ad, 0x63f7a904, 0x51399d1a, 0x1fb096b3,
+    0xcc2b8a48, 0x82a281e1, 0x9a014d62, 0xd48846cb, 0x07135a30,
+    0x499a5199, 0x7b546587, 0x35dd6e2e, 0xe64672d5, 0xa8cf797c,
+    0x83da1ae9, 0xcd531140, 0x1ec80dbb, 0x50410612, 0x628f320c,
+    0x2c0639a5, 0xff9d255e, 0xb1142ef7, 0x46c47ef1, 0x084d7558,
+    0xdbd669a3, 0x955f620a, 0xa7915614, 0xe9185dbd, 0x3a834146,
+    0x740a4aef, 0x5f1f297a, 0x119622d3, 0xc20d3e28, 0x8c843581,
+    0xbe4a019f, 0xf0c30a36, 0x235816cd, 0x6dd11d64, 0x7572d1e7,
+    0x3bfbda4e, 0xe860c6b5, 0xa6e9cd1c, 0x9427f902, 0xdaaef2ab,
+    0x0935ee50, 0x47bce5f9, 0x6ca9866c, 0x22208dc5, 0xf1bb913e,
+    0xbf329a97, 0x8dfcae89, 0xc375a520, 0x10eeb9db, 0x5e67b272,
+    0x21a920dd, 0x6f202b74, 0xbcbb378f, 0xf2323c26, 0xc0fc0838,
+    0x8e750391, 0x5dee1f6a, 0x136714c3, 0x38727756, 0x76fb7cff,
+    0xa5606004, 0xebe96bad, 0xd9275fb3, 0x97ae541a, 0x443548e1,
+    0x0abc4348, 0x121f8fcb, 0x5c968462, 0x8f0d9899, 0xc1849330,
+    0xf34aa72e, 0xbdc3ac87, 0x6e58b07c, 0x20d1bbd5, 0x0bc4d840,
+    0x454dd3e9, 0x96d6cf12, 0xd85fc4bb, 0xea91f0a5, 0xa418fb0c,
+    0x7783e7f7, 0x390aec5e, 0x881ec2a9, 0xc697c900, 0x150cd5fb,
+    0x5b85de52, 0x694bea4c, 0x27c2e1e5, 0xf459fd1e, 0xbad0f6b7,
+    0x91c59522, 0xdf4c9e8b, 0x0cd78270, 0x425e89d9, 0x7090bdc7,
+    0x3e19b66e, 0xed82aa95, 0xa30ba13c, 0xbba86dbf, 0xf5216616,
+    0x26ba7aed, 0x68337144, 0x5afd455a, 0x14744ef3, 0xc7ef5208,
+    0x896659a1, 0xa2733a34, 0xecfa319d, 0x3f612d66, 0x71e826cf,
+    0x432612d1, 0x0daf1978, 0xde340583, 0x90bd0e2a, 0xef739c85,
+    0xa1fa972c, 0x72618bd7, 0x3ce8807e, 0x0e26b460, 0x40afbfc9,
+    0x9334a332, 0xddbda89b, 0xf6a8cb0e, 0xb821c0a7, 0x6bbadc5c,
+    0x2533d7f5, 0x17fde3eb, 0x5974e842, 0x8aeff4b9, 0xc466ff10,
+    0xdcc53393, 0x924c383a, 0x41d724c1, 0x0f5e2f68, 0x3d901b76,
+    0x731910df, 0xa0820c24, 0xee0b078d, 0xc51e6418, 0x8b976fb1,
+    0x580c734a, 0x168578e3, 0x244b4cfd, 0x6ac24754, 0xb9595baf,
+    0xf7d05006},
+   {0x00000000, 0x8d88fde2, 0xc060fd85, 0x4de80067, 0x5bb0fd4b,
+    0xd63800a9, 0x9bd000ce, 0x1658fd2c, 0xb761fa96, 0x3ae90774,
+    0x77010713, 0xfa89faf1, 0xecd107dd, 0x6159fa3f, 0x2cb1fa58,
+    0xa13907ba, 0xb5b2f36d, 0x383a0e8f, 0x75d20ee8, 0xf85af30a,
+    0xee020e26, 0x638af3c4, 0x2e62f3a3, 0xa3ea0e41, 0x02d309fb,
+    0x8f5bf419, 0xc2b3f47e, 0x4f3b099c, 0x5963f4b0, 0xd4eb0952,
+    0x99030935, 0x148bf4d7, 0xb014e09b, 0x3d9c1d79, 0x70741d1e,
+    0xfdfce0fc, 0xeba41dd0, 0x662ce032, 0x2bc4e055, 0xa64c1db7,
+    0x07751a0d, 0x8afde7ef, 0xc715e788, 0x4a9d1a6a, 0x5cc5e746,
+    0xd14d1aa4, 0x9ca51ac3, 0x112de721, 0x05a613f6, 0x882eee14,
+    0xc5c6ee73, 0x484e1391, 0x5e16eebd, 0xd39e135f, 0x9e761338,
+    0x13feeeda, 0xb2c7e960, 0x3f4f1482, 0x72a714e5, 0xff2fe907,
+    0xe977142b, 0x64ffe9c9, 0x2917e9ae, 0xa49f144c, 0xbb58c777,
+    0x36d03a95, 0x7b383af2, 0xf6b0c710, 0xe0e83a3c, 0x6d60c7de,
+    0x2088c7b9, 0xad003a5b, 0x0c393de1, 0x81b1c003, 0xcc59c064,
+    0x41d13d86, 0x5789c0aa, 0xda013d48, 0x97e93d2f, 0x1a61c0cd,
+    0x0eea341a, 0x8362c9f8, 0xce8ac99f, 0x4302347d, 0x555ac951,
+    0xd8d234b3, 0x953a34d4, 0x18b2c936, 0xb98bce8c, 0x3403336e,
+    0x79eb3309, 0xf463ceeb, 0xe23b33c7, 0x6fb3ce25, 0x225bce42,
+    0xafd333a0, 0x0b4c27ec, 0x86c4da0e, 0xcb2cda69, 0x46a4278b,
+    0x50fcdaa7, 0xdd742745, 0x909c2722, 0x1d14dac0, 0xbc2ddd7a,
+    0x31a52098, 0x7c4d20ff, 0xf1c5dd1d, 0xe79d2031, 0x6a15ddd3,
+    0x27fdddb4, 0xaa752056, 0xbefed481, 0x33762963, 0x7e9e2904,
+    0xf316d4e6, 0xe54e29ca, 0x68c6d428, 0x252ed44f, 0xa8a629ad,
+    0x099f2e17, 0x8417d3f5, 0xc9ffd392, 0x44772e70, 0x522fd35c,
+    0xdfa72ebe, 0x924f2ed9, 0x1fc7d33b, 0xadc088af, 0x2048754d,
+    0x6da0752a, 0xe02888c8, 0xf67075e4, 0x7bf88806, 0x36108861,
+    0xbb987583, 0x1aa17239, 0x97298fdb, 0xdac18fbc, 0x5749725e,
+    0x41118f72, 0xcc997290, 0x817172f7, 0x0cf98f15, 0x18727bc2,
+    0x95fa8620, 0xd8128647, 0x559a7ba5, 0x43c28689, 0xce4a7b6b,
+    0x83a27b0c, 0x0e2a86ee, 0xaf138154, 0x229b7cb6, 0x6f737cd1,
+    0xe2fb8133, 0xf4a37c1f, 0x792b81fd, 0x34c3819a, 0xb94b7c78,
+    0x1dd46834, 0x905c95d6, 0xddb495b1, 0x503c6853, 0x4664957f,
+    0xcbec689d, 0x860468fa, 0x0b8c9518, 0xaab592a2, 0x273d6f40,
+    0x6ad56f27, 0xe75d92c5, 0xf1056fe9, 0x7c8d920b, 0x3165926c,
+    0xbced6f8e, 0xa8669b59, 0x25ee66bb, 0x680666dc, 0xe58e9b3e,
+    0xf3d66612, 0x7e5e9bf0, 0x33b69b97, 0xbe3e6675, 0x1f0761cf,
+    0x928f9c2d, 0xdf679c4a, 0x52ef61a8, 0x44b79c84, 0xc93f6166,
+    0x84d76101, 0x095f9ce3, 0x16984fd8, 0x9b10b23a, 0xd6f8b25d,
+    0x5b704fbf, 0x4d28b293, 0xc0a04f71, 0x8d484f16, 0x00c0b2f4,
+    0xa1f9b54e, 0x2c7148ac, 0x619948cb, 0xec11b529, 0xfa494805,
+    0x77c1b5e7, 0x3a29b580, 0xb7a14862, 0xa32abcb5, 0x2ea24157,
+    0x634a4130, 0xeec2bcd2, 0xf89a41fe, 0x7512bc1c, 0x38fabc7b,
+    0xb5724199, 0x144b4623, 0x99c3bbc1, 0xd42bbba6, 0x59a34644,
+    0x4ffbbb68, 0xc273468a, 0x8f9b46ed, 0x0213bb0f, 0xa68caf43,
+    0x2b0452a1, 0x66ec52c6, 0xeb64af24, 0xfd3c5208, 0x70b4afea,
+    0x3d5caf8d, 0xb0d4526f, 0x11ed55d5, 0x9c65a837, 0xd18da850,
+    0x5c0555b2, 0x4a5da89e, 0xc7d5557c, 0x8a3d551b, 0x07b5a8f9,
+    0x133e5c2e, 0x9eb6a1cc, 0xd35ea1ab, 0x5ed65c49, 0x488ea165,
+    0xc5065c87, 0x88ee5ce0, 0x0566a102, 0xa45fa6b8, 0x29d75b5a,
+    0x643f5b3d, 0xe9b7a6df, 0xffef5bf3, 0x7267a611, 0x3f8fa676,
+    0xb2075b94},
+   {0x00000000, 0x80f0171f, 0xda91287f, 0x5a613f60, 0x6e5356bf,
+    0xeea341a0, 0xb4c27ec0, 0x343269df, 0xdca6ad7e, 0x5c56ba61,
+    0x06378501, 0x86c7921e, 0xb2f5fbc1, 0x3205ecde, 0x6864d3be,
+    0xe894c4a1, 0x623c5cbd, 0xe2cc4ba2, 0xb8ad74c2, 0x385d63dd,
+    0x0c6f0a02, 0x8c9f1d1d, 0xd6fe227d, 0x560e3562, 0xbe9af1c3,
+    0x3e6ae6dc, 0x640bd9bc, 0xe4fbcea3, 0xd0c9a77c, 0x5039b063,
+    0x0a588f03, 0x8aa8981c, 0xc478b97a, 0x4488ae65, 0x1ee99105,
+    0x9e19861a, 0xaa2befc5, 0x2adbf8da, 0x70bac7ba, 0xf04ad0a5,
+    0x18de1404, 0x982e031b, 0xc24f3c7b, 0x42bf2b64, 0x768d42bb,
+    0xf67d55a4, 0xac1c6ac4, 0x2cec7ddb, 0xa644e5c7, 0x26b4f2d8,
+    0x7cd5cdb8, 0xfc25daa7, 0xc817b378, 0x48e7a467, 0x12869b07,
+    0x92768c18, 0x7ae248b9, 0xfa125fa6, 0xa07360c6, 0x208377d9,
+    0x14b11e06, 0x94410919, 0xce203679, 0x4ed02166, 0x538074b5,
+    0xd37063aa, 0x89115cca, 0x09e14bd5, 0x3dd3220a, 0xbd233515,
+    0xe7420a75, 0x67b21d6a, 0x8f26d9cb, 0x0fd6ced4, 0x55b7f1b4,
+    0xd547e6ab, 0xe1758f74, 0x6185986b, 0x3be4a70b, 0xbb14b014,
+    0x31bc2808, 0xb14c3f17, 0xeb2d0077, 0x6bdd1768, 0x5fef7eb7,
+    0xdf1f69a8, 0x857e56c8, 0x058e41d7, 0xed1a8576, 0x6dea9269,
+    0x378bad09, 0xb77bba16, 0x8349d3c9, 0x03b9c4d6, 0x59d8fbb6,
+    0xd928eca9, 0x97f8cdcf, 0x1708dad0, 0x4d69e5b0, 0xcd99f2af,
+    0xf9ab9b70, 0x795b8c6f, 0x233ab30f, 0xa3caa410, 0x4b5e60b1,
+    0xcbae77ae, 0x91cf48ce, 0x113f5fd1, 0x250d360e, 0xa5fd2111,
+    0xff9c1e71, 0x7f6c096e, 0xf5c49172, 0x7534866d, 0x2f55b90d,
+    0xafa5ae12, 0x9b97c7cd, 0x1b67d0d2, 0x4106efb2, 0xc1f6f8ad,
+    0x29623c0c, 0xa9922b13, 0xf3f31473, 0x7303036c, 0x47316ab3,
+    0xc7c17dac, 0x9da042cc, 0x1d5055d3, 0xa700e96a, 0x27f0fe75,
+    0x7d91c115, 0xfd61d60a, 0xc953bfd5, 0x49a3a8ca, 0x13c297aa,
+    0x933280b5, 0x7ba64414, 0xfb56530b, 0xa1376c6b, 0x21c77b74,
+    0x15f512ab, 0x950505b4, 0xcf643ad4, 0x4f942dcb, 0xc53cb5d7,
+    0x45cca2c8, 0x1fad9da8, 0x9f5d8ab7, 0xab6fe368, 0x2b9ff477,
+    0x71fecb17, 0xf10edc08, 0x199a18a9, 0x996a0fb6, 0xc30b30d6,
+    0x43fb27c9, 0x77c94e16, 0xf7395909, 0xad586669, 0x2da87176,
+    0x63785010, 0xe388470f, 0xb9e9786f, 0x39196f70, 0x0d2b06af,
+    0x8ddb11b0, 0xd7ba2ed0, 0x574a39cf, 0xbfdefd6e, 0x3f2eea71,
+    0x654fd511, 0xe5bfc20e, 0xd18dabd1, 0x517dbcce, 0x0b1c83ae,
+    0x8bec94b1, 0x01440cad, 0x81b41bb2, 0xdbd524d2, 0x5b2533cd,
+    0x6f175a12, 0xefe74d0d, 0xb586726d, 0x35766572, 0xdde2a1d3,
+    0x5d12b6cc, 0x077389ac, 0x87839eb3, 0xb3b1f76c, 0x3341e073,
+    0x6920df13, 0xe9d0c80c, 0xf4809ddf, 0x74708ac0, 0x2e11b5a0,
+    0xaee1a2bf, 0x9ad3cb60, 0x1a23dc7f, 0x4042e31f, 0xc0b2f400,
+    0x282630a1, 0xa8d627be, 0xf2b718de, 0x72470fc1, 0x4675661e,
+    0xc6857101, 0x9ce44e61, 0x1c14597e, 0x96bcc162, 0x164cd67d,
+    0x4c2de91d, 0xccddfe02, 0xf8ef97dd, 0x781f80c2, 0x227ebfa2,
+    0xa28ea8bd, 0x4a1a6c1c, 0xcaea7b03, 0x908b4463, 0x107b537c,
+    0x24493aa3, 0xa4b92dbc, 0xfed812dc, 0x7e2805c3, 0x30f824a5,
+    0xb00833ba, 0xea690cda, 0x6a991bc5, 0x5eab721a, 0xde5b6505,
+    0x843a5a65, 0x04ca4d7a, 0xec5e89db, 0x6cae9ec4, 0x36cfa1a4,
+    0xb63fb6bb, 0x820ddf64, 0x02fdc87b, 0x589cf71b, 0xd86ce004,
+    0x52c47818, 0xd2346f07, 0x88555067, 0x08a54778, 0x3c972ea7,
+    0xbc6739b8, 0xe60606d8, 0x66f611c7, 0x8e62d566, 0x0e92c279,
+    0x54f3fd19, 0xd403ea06, 0xe03183d9, 0x60c194c6, 0x3aa0aba6,
+    0xba50bcb9},
+   {0x00000000, 0x9570d495, 0xf190af6b, 0x64e07bfe, 0x38505897,
+    0xad208c02, 0xc9c0f7fc, 0x5cb02369, 0x70a0b12e, 0xe5d065bb,
+    0x81301e45, 0x1440cad0, 0x48f0e9b9, 0xdd803d2c, 0xb96046d2,
+    0x2c109247, 0xe141625c, 0x7431b6c9, 0x10d1cd37, 0x85a119a2,
+    0xd9113acb, 0x4c61ee5e, 0x288195a0, 0xbdf14135, 0x91e1d372,
+    0x049107e7, 0x60717c19, 0xf501a88c, 0xa9b18be5, 0x3cc15f70,
+    0x5821248e, 0xcd51f01b, 0x19f3c2f9, 0x8c83166c, 0xe8636d92,
+    0x7d13b907, 0x21a39a6e, 0xb4d34efb, 0xd0333505, 0x4543e190,
+    0x695373d7, 0xfc23a742, 0x98c3dcbc, 0x0db30829, 0x51032b40,
+    0xc473ffd5, 0xa093842b, 0x35e350be, 0xf8b2a0a5, 0x6dc27430,
+    0x09220fce, 0x9c52db5b, 0xc0e2f832, 0x55922ca7, 0x31725759,
+    0xa40283cc, 0x8812118b, 0x1d62c51e, 0x7982bee0, 0xecf26a75,
+    0xb042491c, 0x25329d89, 0x41d2e677, 0xd4a232e2, 0x33e785f2,
+    0xa6975167, 0xc2772a99, 0x5707fe0c, 0x0bb7dd65, 0x9ec709f0,
+    0xfa27720e, 0x6f57a69b, 0x434734dc, 0xd637e049, 0xb2d79bb7,
+    0x27a74f22, 0x7b176c4b, 0xee67b8de, 0x8a87c320, 0x1ff717b5,
+    0xd2a6e7ae, 0x47d6333b, 0x233648c5, 0xb6469c50, 0xeaf6bf39,
+    0x7f866bac, 0x1b661052, 0x8e16c4c7, 0xa2065680, 0x37768215,
+    0x5396f9eb, 0xc6e62d7e, 0x9a560e17, 0x0f26da82, 0x6bc6a17c,
+    0xfeb675e9, 0x2a14470b, 0xbf64939e, 0xdb84e860, 0x4ef43cf5,
+    0x12441f9c, 0x8734cb09, 0xe3d4b0f7, 0x76a46462, 0x5ab4f625,
+    0xcfc422b0, 0xab24594e, 0x3e548ddb, 0x62e4aeb2, 0xf7947a27,
+    0x937401d9, 0x0604d54c, 0xcb552557, 0x5e25f1c2, 0x3ac58a3c,
+    0xafb55ea9, 0xf3057dc0, 0x6675a955, 0x0295d2ab, 0x97e5063e,
+    0xbbf59479, 0x2e8540ec, 0x4a653b12, 0xdf15ef87, 0x83a5ccee,
+    0x16d5187b, 0x72356385, 0xe745b710, 0x67cf0be4, 0xf2bfdf71,
+    0x965fa48f, 0x032f701a, 0x5f9f5373, 0xcaef87e6, 0xae0ffc18,
+    0x3b7f288d, 0x176fbaca, 0x821f6e5f, 0xe6ff15a1, 0x738fc134,
+    0x2f3fe25d, 0xba4f36c8, 0xdeaf4d36, 0x4bdf99a3, 0x868e69b8,
+    0x13febd2d, 0x771ec6d3, 0xe26e1246, 0xbede312f, 0x2baee5ba,
+    0x4f4e9e44, 0xda3e4ad1, 0xf62ed896, 0x635e0c03, 0x07be77fd,
+    0x92cea368, 0xce7e8001, 0x5b0e5494, 0x3fee2f6a, 0xaa9efbff,
+    0x7e3cc91d, 0xeb4c1d88, 0x8fac6676, 0x1adcb2e3, 0x466c918a,
+    0xd31c451f, 0xb7fc3ee1, 0x228cea74, 0x0e9c7833, 0x9becaca6,
+    0xff0cd758, 0x6a7c03cd, 0x36cc20a4, 0xa3bcf431, 0xc75c8fcf,
+    0x522c5b5a, 0x9f7dab41, 0x0a0d7fd4, 0x6eed042a, 0xfb9dd0bf,
+    0xa72df3d6, 0x325d2743, 0x56bd5cbd, 0xc3cd8828, 0xefdd1a6f,
+    0x7aadcefa, 0x1e4db504, 0x8b3d6191, 0xd78d42f8, 0x42fd966d,
+    0x261ded93, 0xb36d3906, 0x54288e16, 0xc1585a83, 0xa5b8217d,
+    0x30c8f5e8, 0x6c78d681, 0xf9080214, 0x9de879ea, 0x0898ad7f,
+    0x24883f38, 0xb1f8ebad, 0xd5189053, 0x406844c6, 0x1cd867af,
+    0x89a8b33a, 0xed48c8c4, 0x78381c51, 0xb569ec4a, 0x201938df,
+    0x44f94321, 0xd18997b4, 0x8d39b4dd, 0x18496048, 0x7ca91bb6,
+    0xe9d9cf23, 0xc5c95d64, 0x50b989f1, 0x3459f20f, 0xa129269a,
+    0xfd9905f3, 0x68e9d166, 0x0c09aa98, 0x99797e0d, 0x4ddb4cef,
+    0xd8ab987a, 0xbc4be384, 0x293b3711, 0x758b1478, 0xe0fbc0ed,
+    0x841bbb13, 0x116b6f86, 0x3d7bfdc1, 0xa80b2954, 0xcceb52aa,
+    0x599b863f, 0x052ba556, 0x905b71c3, 0xf4bb0a3d, 0x61cbdea8,
+    0xac9a2eb3, 0x39eafa26, 0x5d0a81d8, 0xc87a554d, 0x94ca7624,
+    0x01baa2b1, 0x655ad94f, 0xf02a0dda, 0xdc3a9f9d, 0x494a4b08,
+    0x2daa30f6, 0xb8dae463, 0xe46ac70a, 0x711a139f, 0x15fa6861,
+    0x808abcf4},
+   {0x00000000, 0xcf9e17c8, 0x444d29d1, 0x8bd33e19, 0x889a53a2,
+    0x4704446a, 0xccd77a73, 0x03496dbb, 0xca45a105, 0x05dbb6cd,
+    0x8e0888d4, 0x41969f1c, 0x42dff2a7, 0x8d41e56f, 0x0692db76,
+    0xc90cccbe, 0x4ffa444b, 0x80645383, 0x0bb76d9a, 0xc4297a52,
+    0xc76017e9, 0x08fe0021, 0x832d3e38, 0x4cb329f0, 0x85bfe54e,
+    0x4a21f286, 0xc1f2cc9f, 0x0e6cdb57, 0x0d25b6ec, 0xc2bba124,
+    0x49689f3d, 0x86f688f5, 0x9ff48896, 0x506a9f5e, 0xdbb9a147,
+    0x1427b68f, 0x176edb34, 0xd8f0ccfc, 0x5323f2e5, 0x9cbde52d,
+    0x55b12993, 0x9a2f3e5b, 0x11fc0042, 0xde62178a, 0xdd2b7a31,
+    0x12b56df9, 0x996653e0, 0x56f84428, 0xd00eccdd, 0x1f90db15,
+    0x9443e50c, 0x5bddf2c4, 0x58949f7f, 0x970a88b7, 0x1cd9b6ae,
+    0xd347a166, 0x1a4b6dd8, 0xd5d57a10, 0x5e064409, 0x919853c1,
+    0x92d13e7a, 0x5d4f29b2, 0xd69c17ab, 0x19020063, 0xe498176d,
+    0x2b0600a5, 0xa0d53ebc, 0x6f4b2974, 0x6c0244cf, 0xa39c5307,
+    0x284f6d1e, 0xe7d17ad6, 0x2eddb668, 0xe143a1a0, 0x6a909fb9,
+    0xa50e8871, 0xa647e5ca, 0x69d9f202, 0xe20acc1b, 0x2d94dbd3,
+    0xab625326, 0x64fc44ee, 0xef2f7af7, 0x20b16d3f, 0x23f80084,
+    0xec66174c, 0x67b52955, 0xa82b3e9d, 0x6127f223, 0xaeb9e5eb,
+    0x256adbf2, 0xeaf4cc3a, 0xe9bda181, 0x2623b649, 0xadf08850,
+    0x626e9f98, 0x7b6c9ffb, 0xb4f28833, 0x3f21b62a, 0xf0bfa1e2,
+    0xf3f6cc59, 0x3c68db91, 0xb7bbe588, 0x7825f240, 0xb1293efe,
+    0x7eb72936, 0xf564172f, 0x3afa00e7, 0x39b36d5c, 0xf62d7a94,
+    0x7dfe448d, 0xb2605345, 0x3496dbb0, 0xfb08cc78, 0x70dbf261,
+    0xbf45e5a9, 0xbc0c8812, 0x73929fda, 0xf841a1c3, 0x37dfb60b,
+    0xfed37ab5, 0x314d6d7d, 0xba9e5364, 0x750044ac, 0x76492917,
+    0xb9d73edf, 0x320400c6, 0xfd9a170e, 0x1241289b, 0xdddf3f53,
+    0x560c014a, 0x99921682, 0x9adb7b39, 0x55456cf1, 0xde9652e8,
+    0x11084520, 0xd804899e, 0x179a9e56, 0x9c49a04f, 0x53d7b787,
+    0x509eda3c, 0x9f00cdf4, 0x14d3f3ed, 0xdb4de425, 0x5dbb6cd0,
+    0x92257b18, 0x19f64501, 0xd66852c9, 0xd5213f72, 0x1abf28ba,
+    0x916c16a3, 0x5ef2016b, 0x97fecdd5, 0x5860da1d, 0xd3b3e404,
+    0x1c2df3cc, 0x1f649e77, 0xd0fa89bf, 0x5b29b7a6, 0x94b7a06e,
+    0x8db5a00d, 0x422bb7c5, 0xc9f889dc, 0x06669e14, 0x052ff3af,
+    0xcab1e467, 0x4162da7e, 0x8efccdb6, 0x47f00108, 0x886e16c0,
+    0x03bd28d9, 0xcc233f11, 0xcf6a52aa, 0x00f44562, 0x8b277b7b,
+    0x44b96cb3, 0xc24fe446, 0x0dd1f38e, 0x8602cd97, 0x499cda5f,
+    0x4ad5b7e4, 0x854ba02c, 0x0e989e35, 0xc10689fd, 0x080a4543,
+    0xc794528b, 0x4c476c92, 0x83d97b5a, 0x809016e1, 0x4f0e0129,
+    0xc4dd3f30, 0x0b4328f8, 0xf6d93ff6, 0x3947283e, 0xb2941627,
+    0x7d0a01ef, 0x7e436c54, 0xb1dd7b9c, 0x3a0e4585, 0xf590524d,
+    0x3c9c9ef3, 0xf302893b, 0x78d1b722, 0xb74fa0ea, 0xb406cd51,
+    0x7b98da99, 0xf04be480, 0x3fd5f348, 0xb9237bbd, 0x76bd6c75,
+    0xfd6e526c, 0x32f045a4, 0x31b9281f, 0xfe273fd7, 0x75f401ce,
+    0xba6a1606, 0x7366dab8, 0xbcf8cd70, 0x372bf369, 0xf8b5e4a1,
+    0xfbfc891a, 0x34629ed2, 0xbfb1a0cb, 0x702fb703, 0x692db760,
+    0xa6b3a0a8, 0x2d609eb1, 0xe2fe8979, 0xe1b7e4c2, 0x2e29f30a,
+    0xa5facd13, 0x6a64dadb, 0xa3681665, 0x6cf601ad, 0xe7253fb4,
+    0x28bb287c, 0x2bf245c7, 0xe46c520f, 0x6fbf6c16, 0xa0217bde,
+    0x26d7f32b, 0xe949e4e3, 0x629adafa, 0xad04cd32, 0xae4da089,
+    0x61d3b741, 0xea008958, 0x259e9e90, 0xec92522e, 0x230c45e6,
+    0xa8df7bff, 0x67416c37, 0x6408018c, 0xab961644, 0x2045285d,
+    0xefdb3f95},
+   {0x00000000, 0x24825136, 0x4904a26c, 0x6d86f35a, 0x920944d8,
+    0xb68b15ee, 0xdb0de6b4, 0xff8fb782, 0xff638ff1, 0xdbe1dec7,
+    0xb6672d9d, 0x92e57cab, 0x6d6acb29, 0x49e89a1f, 0x246e6945,
+    0x00ec3873, 0x25b619a3, 0x01344895, 0x6cb2bbcf, 0x4830eaf9,
+    0xb7bf5d7b, 0x933d0c4d, 0xfebbff17, 0xda39ae21, 0xdad59652,
+    0xfe57c764, 0x93d1343e, 0xb7536508, 0x48dcd28a, 0x6c5e83bc,
+    0x01d870e6, 0x255a21d0, 0x4b6c3346, 0x6fee6270, 0x0268912a,
+    0x26eac01c, 0xd965779e, 0xfde726a8, 0x9061d5f2, 0xb4e384c4,
+    0xb40fbcb7, 0x908ded81, 0xfd0b1edb, 0xd9894fed, 0x2606f86f,
+    0x0284a959, 0x6f025a03, 0x4b800b35, 0x6eda2ae5, 0x4a587bd3,
+    0x27de8889, 0x035cd9bf, 0xfcd36e3d, 0xd8513f0b, 0xb5d7cc51,
+    0x91559d67, 0x91b9a514, 0xb53bf422, 0xd8bd0778, 0xfc3f564e,
+    0x03b0e1cc, 0x2732b0fa, 0x4ab443a0, 0x6e361296, 0x96d8668c,
+    0xb25a37ba, 0xdfdcc4e0, 0xfb5e95d6, 0x04d12254, 0x20537362,
+    0x4dd58038, 0x6957d10e, 0x69bbe97d, 0x4d39b84b, 0x20bf4b11,
+    0x043d1a27, 0xfbb2ada5, 0xdf30fc93, 0xb2b60fc9, 0x96345eff,
+    0xb36e7f2f, 0x97ec2e19, 0xfa6add43, 0xdee88c75, 0x21673bf7,
+    0x05e56ac1, 0x6863999b, 0x4ce1c8ad, 0x4c0df0de, 0x688fa1e8,
+    0x050952b2, 0x218b0384, 0xde04b406, 0xfa86e530, 0x9700166a,
+    0xb382475c, 0xddb455ca, 0xf93604fc, 0x94b0f7a6, 0xb032a690,
+    0x4fbd1112, 0x6b3f4024, 0x06b9b37e, 0x223be248, 0x22d7da3b,
+    0x06558b0d, 0x6bd37857, 0x4f512961, 0xb0de9ee3, 0x945ccfd5,
+    0xf9da3c8f, 0xdd586db9, 0xf8024c69, 0xdc801d5f, 0xb106ee05,
+    0x9584bf33, 0x6a0b08b1, 0x4e895987, 0x230faadd, 0x078dfbeb,
+    0x0761c398, 0x23e392ae, 0x4e6561f4, 0x6ae730c2, 0x95688740,
+    0xb1ead676, 0xdc6c252c, 0xf8ee741a, 0xf6c1cb59, 0xd2439a6f,
+    0xbfc56935, 0x9b473803, 0x64c88f81, 0x404adeb7, 0x2dcc2ded,
+    0x094e7cdb, 0x09a244a8, 0x2d20159e, 0x40a6e6c4, 0x6424b7f2,
+    0x9bab0070, 0xbf295146, 0xd2afa21c, 0xf62df32a, 0xd377d2fa,
+    0xf7f583cc, 0x9a737096, 0xbef121a0, 0x417e9622, 0x65fcc714,
+    0x087a344e, 0x2cf86578, 0x2c145d0b, 0x08960c3d, 0x6510ff67,
+    0x4192ae51, 0xbe1d19d3, 0x9a9f48e5, 0xf719bbbf, 0xd39bea89,
+    0xbdadf81f, 0x992fa929, 0xf4a95a73, 0xd02b0b45, 0x2fa4bcc7,
+    0x0b26edf1, 0x66a01eab, 0x42224f9d, 0x42ce77ee, 0x664c26d8,
+    0x0bcad582, 0x2f4884b4, 0xd0c73336, 0xf4456200, 0x99c3915a,
+    0xbd41c06c, 0x981be1bc, 0xbc99b08a, 0xd11f43d0, 0xf59d12e6,
+    0x0a12a564, 0x2e90f452, 0x43160708, 0x6794563e, 0x67786e4d,
+    0x43fa3f7b, 0x2e7ccc21, 0x0afe9d17, 0xf5712a95, 0xd1f37ba3,
+    0xbc7588f9, 0x98f7d9cf, 0x6019add5, 0x449bfce3, 0x291d0fb9,
+    0x0d9f5e8f, 0xf210e90d, 0xd692b83b, 0xbb144b61, 0x9f961a57,
+    0x9f7a2224, 0xbbf87312, 0xd67e8048, 0xf2fcd17e, 0x0d7366fc,
+    0x29f137ca, 0x4477c490, 0x60f595a6, 0x45afb476, 0x612de540,
+    0x0cab161a, 0x2829472c, 0xd7a6f0ae, 0xf324a198, 0x9ea252c2,
+    0xba2003f4, 0xbacc3b87, 0x9e4e6ab1, 0xf3c899eb, 0xd74ac8dd,
+    0x28c57f5f, 0x0c472e69, 0x61c1dd33, 0x45438c05, 0x2b759e93,
+    0x0ff7cfa5, 0x62713cff, 0x46f36dc9, 0xb97cda4b, 0x9dfe8b7d,
+    0xf0787827, 0xd4fa2911, 0xd4161162, 0xf0944054, 0x9d12b30e,
+    0xb990e238, 0x461f55ba, 0x629d048c, 0x0f1bf7d6, 0x2b99a6e0,
+    0x0ec38730, 0x2a41d606, 0x47c7255c, 0x6345746a, 0x9ccac3e8,
+    0xb84892de, 0xd5ce6184, 0xf14c30b2, 0xf1a008c1, 0xd52259f7,
+    0xb8a4aaad, 0x9c26fb9b, 0x63a94c19, 0x472b1d2f, 0x2aadee75,
+    0x0e2fbf43},
+   {0x00000000, 0x36f290f3, 0x6de521e6, 0x5b17b115, 0xdbca43cc,
+    0xed38d33f, 0xb62f622a, 0x80ddf2d9, 0x6ce581d9, 0x5a17112a,
+    0x0100a03f, 0x37f230cc, 0xb72fc215, 0x81dd52e6, 0xdacae3f3,
+    0xec387300, 0xd9cb03b2, 0xef399341, 0xb42e2254, 0x82dcb2a7,
+    0x0201407e, 0x34f3d08d, 0x6fe46198, 0x5916f16b, 0xb52e826b,
+    0x83dc1298, 0xd8cba38d, 0xee39337e, 0x6ee4c1a7, 0x58165154,
+    0x0301e041, 0x35f370b2, 0x68e70125, 0x5e1591d6, 0x050220c3,
+    0x33f0b030, 0xb32d42e9, 0x85dfd21a, 0xdec8630f, 0xe83af3fc,
+    0x040280fc, 0x32f0100f, 0x69e7a11a, 0x5f1531e9, 0xdfc8c330,
+    0xe93a53c3, 0xb22de2d6, 0x84df7225, 0xb12c0297, 0x87de9264,
+    0xdcc92371, 0xea3bb382, 0x6ae6415b, 0x5c14d1a8, 0x070360bd,
+    0x31f1f04e, 0xddc9834e, 0xeb3b13bd, 0xb02ca2a8, 0x86de325b,
+    0x0603c082, 0x30f15071, 0x6be6e164, 0x5d147197, 0xd1ce024a,
+    0xe73c92b9, 0xbc2b23ac, 0x8ad9b35f, 0x0a044186, 0x3cf6d175,
+    0x67e16060, 0x5113f093, 0xbd2b8393, 0x8bd91360, 0xd0cea275,
+    0xe63c3286, 0x66e1c05f, 0x501350ac, 0x0b04e1b9, 0x3df6714a,
+    0x080501f8, 0x3ef7910b, 0x65e0201e, 0x5312b0ed, 0xd3cf4234,
+    0xe53dd2c7, 0xbe2a63d2, 0x88d8f321, 0x64e08021, 0x521210d2,
+    0x0905a1c7, 0x3ff73134, 0xbf2ac3ed, 0x89d8531e, 0xd2cfe20b,
+    0xe43d72f8, 0xb929036f, 0x8fdb939c, 0xd4cc2289, 0xe23eb27a,
+    0x62e340a3, 0x5411d050, 0x0f066145, 0x39f4f1b6, 0xd5cc82b6,
+    0xe33e1245, 0xb829a350, 0x8edb33a3, 0x0e06c17a, 0x38f45189,
+    0x63e3e09c, 0x5511706f, 0x60e200dd, 0x5610902e, 0x0d07213b,
+    0x3bf5b1c8, 0xbb284311, 0x8ddad3e2, 0xd6cd62f7, 0xe03ff204,
+    0x0c078104, 0x3af511f7, 0x61e2a0e2, 0x57103011, 0xd7cdc2c8,
+    0xe13f523b, 0xba28e32e, 0x8cda73dd, 0x78ed02d5, 0x4e1f9226,
+    0x15082333, 0x23fab3c0, 0xa3274119, 0x95d5d1ea, 0xcec260ff,
+    0xf830f00c, 0x1408830c, 0x22fa13ff, 0x79eda2ea, 0x4f1f3219,
+    0xcfc2c0c0, 0xf9305033, 0xa227e126, 0x94d571d5, 0xa1260167,
+    0x97d49194, 0xccc32081, 0xfa31b072, 0x7aec42ab, 0x4c1ed258,
+    0x1709634d, 0x21fbf3be, 0xcdc380be, 0xfb31104d, 0xa026a158,
+    0x96d431ab, 0x1609c372, 0x20fb5381, 0x7bece294, 0x4d1e7267,
+    0x100a03f0, 0x26f89303, 0x7def2216, 0x4b1db2e5, 0xcbc0403c,
+    0xfd32d0cf, 0xa62561da, 0x90d7f129, 0x7cef8229, 0x4a1d12da,
+    0x110aa3cf, 0x27f8333c, 0xa725c1e5, 0x91d75116, 0xcac0e003,
+    0xfc3270f0, 0xc9c10042, 0xff3390b1, 0xa42421a4, 0x92d6b157,
+    0x120b438e, 0x24f9d37d, 0x7fee6268, 0x491cf29b, 0xa524819b,
+    0x93d61168, 0xc8c1a07d, 0xfe33308e, 0x7eeec257, 0x481c52a4,
+    0x130be3b1, 0x25f97342, 0xa923009f, 0x9fd1906c, 0xc4c62179,
+    0xf234b18a, 0x72e94353, 0x441bd3a0, 0x1f0c62b5, 0x29fef246,
+    0xc5c68146, 0xf33411b5, 0xa823a0a0, 0x9ed13053, 0x1e0cc28a,
+    0x28fe5279, 0x73e9e36c, 0x451b739f, 0x70e8032d, 0x461a93de,
+    0x1d0d22cb, 0x2bffb238, 0xab2240e1, 0x9dd0d012, 0xc6c76107,
+    0xf035f1f4, 0x1c0d82f4, 0x2aff1207, 0x71e8a312, 0x471a33e1,
+    0xc7c7c138, 0xf13551cb, 0xaa22e0de, 0x9cd0702d, 0xc1c401ba,
+    0xf7369149, 0xac21205c, 0x9ad3b0af, 0x1a0e4276, 0x2cfcd285,
+    0x77eb6390, 0x4119f363, 0xad218063, 0x9bd31090, 0xc0c4a185,
+    0xf6363176, 0x76ebc3af, 0x4019535c, 0x1b0ee249, 0x2dfc72ba,
+    0x180f0208, 0x2efd92fb, 0x75ea23ee, 0x4318b31d, 0xc3c541c4,
+    0xf537d137, 0xae206022, 0x98d2f0d1, 0x74ea83d1, 0x42181322,
+    0x190fa237, 0x2ffd32c4, 0xaf20c01d, 0x99d250ee, 0xc2c5e1fb,
+    0xf4377108}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x0000000000000000, 0xf390f23600000000, 0xe621e56d00000000,
+    0x15b1175b00000000, 0xcc43cadb00000000, 0x3fd338ed00000000,
+    0x2a622fb600000000, 0xd9f2dd8000000000, 0xd981e56c00000000,
+    0x2a11175a00000000, 0x3fa0000100000000, 0xcc30f23700000000,
+    0x15c22fb700000000, 0xe652dd8100000000, 0xf3e3cada00000000,
+    0x007338ec00000000, 0xb203cbd900000000, 0x419339ef00000000,
+    0x54222eb400000000, 0xa7b2dc8200000000, 0x7e40010200000000,
+    0x8dd0f33400000000, 0x9861e46f00000000, 0x6bf1165900000000,
+    0x6b822eb500000000, 0x9812dc8300000000, 0x8da3cbd800000000,
+    0x7e3339ee00000000, 0xa7c1e46e00000000, 0x5451165800000000,
+    0x41e0010300000000, 0xb270f33500000000, 0x2501e76800000000,
+    0xd691155e00000000, 0xc320020500000000, 0x30b0f03300000000,
+    0xe9422db300000000, 0x1ad2df8500000000, 0x0f63c8de00000000,
+    0xfcf33ae800000000, 0xfc80020400000000, 0x0f10f03200000000,
+    0x1aa1e76900000000, 0xe931155f00000000, 0x30c3c8df00000000,
+    0xc3533ae900000000, 0xd6e22db200000000, 0x2572df8400000000,
+    0x97022cb100000000, 0x6492de8700000000, 0x7123c9dc00000000,
+    0x82b33bea00000000, 0x5b41e66a00000000, 0xa8d1145c00000000,
+    0xbd60030700000000, 0x4ef0f13100000000, 0x4e83c9dd00000000,
+    0xbd133beb00000000, 0xa8a22cb000000000, 0x5b32de8600000000,
+    0x82c0030600000000, 0x7150f13000000000, 0x64e1e66b00000000,
+    0x9771145d00000000, 0x4a02ced100000000, 0xb9923ce700000000,
+    0xac232bbc00000000, 0x5fb3d98a00000000, 0x8641040a00000000,
+    0x75d1f63c00000000, 0x6060e16700000000, 0x93f0135100000000,
+    0x93832bbd00000000, 0x6013d98b00000000, 0x75a2ced000000000,
+    0x86323ce600000000, 0x5fc0e16600000000, 0xac50135000000000,
+    0xb9e1040b00000000, 0x4a71f63d00000000, 0xf801050800000000,
+    0x0b91f73e00000000, 0x1e20e06500000000, 0xedb0125300000000,
+    0x3442cfd300000000, 0xc7d23de500000000, 0xd2632abe00000000,
+    0x21f3d88800000000, 0x2180e06400000000, 0xd210125200000000,
+    0xc7a1050900000000, 0x3431f73f00000000, 0xedc32abf00000000,
+    0x1e53d88900000000, 0x0be2cfd200000000, 0xf8723de400000000,
+    0x6f0329b900000000, 0x9c93db8f00000000, 0x8922ccd400000000,
+    0x7ab23ee200000000, 0xa340e36200000000, 0x50d0115400000000,
+    0x4561060f00000000, 0xb6f1f43900000000, 0xb682ccd500000000,
+    0x45123ee300000000, 0x50a329b800000000, 0xa333db8e00000000,
+    0x7ac1060e00000000, 0x8951f43800000000, 0x9ce0e36300000000,
+    0x6f70115500000000, 0xdd00e26000000000, 0x2e90105600000000,
+    0x3b21070d00000000, 0xc8b1f53b00000000, 0x114328bb00000000,
+    0xe2d3da8d00000000, 0xf762cdd600000000, 0x04f23fe000000000,
+    0x0481070c00000000, 0xf711f53a00000000, 0xe2a0e26100000000,
+    0x1130105700000000, 0xc8c2cdd700000000, 0x3b523fe100000000,
+    0x2ee328ba00000000, 0xdd73da8c00000000, 0xd502ed7800000000,
+    0x26921f4e00000000, 0x3323081500000000, 0xc0b3fa2300000000,
+    0x194127a300000000, 0xead1d59500000000, 0xff60c2ce00000000,
+    0x0cf030f800000000, 0x0c83081400000000, 0xff13fa2200000000,
+    0xeaa2ed7900000000, 0x19321f4f00000000, 0xc0c0c2cf00000000,
+    0x335030f900000000, 0x26e127a200000000, 0xd571d59400000000,
+    0x670126a100000000, 0x9491d49700000000, 0x8120c3cc00000000,
+    0x72b031fa00000000, 0xab42ec7a00000000, 0x58d21e4c00000000,
+    0x4d63091700000000, 0xbef3fb2100000000, 0xbe80c3cd00000000,
+    0x4d1031fb00000000, 0x58a126a000000000, 0xab31d49600000000,
+    0x72c3091600000000, 0x8153fb2000000000, 0x94e2ec7b00000000,
+    0x67721e4d00000000, 0xf0030a1000000000, 0x0393f82600000000,
+    0x1622ef7d00000000, 0xe5b21d4b00000000, 0x3c40c0cb00000000,
+    0xcfd032fd00000000, 0xda6125a600000000, 0x29f1d79000000000,
+    0x2982ef7c00000000, 0xda121d4a00000000, 0xcfa30a1100000000,
+    0x3c33f82700000000, 0xe5c125a700000000, 0x1651d79100000000,
+    0x03e0c0ca00000000, 0xf07032fc00000000, 0x4200c1c900000000,
+    0xb19033ff00000000, 0xa42124a400000000, 0x57b1d69200000000,
+    0x8e430b1200000000, 0x7dd3f92400000000, 0x6862ee7f00000000,
+    0x9bf21c4900000000, 0x9b8124a500000000, 0x6811d69300000000,
+    0x7da0c1c800000000, 0x8e3033fe00000000, 0x57c2ee7e00000000,
+    0xa4521c4800000000, 0xb1e30b1300000000, 0x4273f92500000000,
+    0x9f0023a900000000, 0x6c90d19f00000000, 0x7921c6c400000000,
+    0x8ab134f200000000, 0x5343e97200000000, 0xa0d31b4400000000,
+    0xb5620c1f00000000, 0x46f2fe2900000000, 0x4681c6c500000000,
+    0xb51134f300000000, 0xa0a023a800000000, 0x5330d19e00000000,
+    0x8ac20c1e00000000, 0x7952fe2800000000, 0x6ce3e97300000000,
+    0x9f731b4500000000, 0x2d03e87000000000, 0xde931a4600000000,
+    0xcb220d1d00000000, 0x38b2ff2b00000000, 0xe14022ab00000000,
+    0x12d0d09d00000000, 0x0761c7c600000000, 0xf4f135f000000000,
+    0xf4820d1c00000000, 0x0712ff2a00000000, 0x12a3e87100000000,
+    0xe1331a4700000000, 0x38c1c7c700000000, 0xcb5135f100000000,
+    0xdee022aa00000000, 0x2d70d09c00000000, 0xba01c4c100000000,
+    0x499136f700000000, 0x5c2021ac00000000, 0xafb0d39a00000000,
+    0x76420e1a00000000, 0x85d2fc2c00000000, 0x9063eb7700000000,
+    0x63f3194100000000, 0x638021ad00000000, 0x9010d39b00000000,
+    0x85a1c4c000000000, 0x763136f600000000, 0xafc3eb7600000000,
+    0x5c53194000000000, 0x49e20e1b00000000, 0xba72fc2d00000000,
+    0x08020f1800000000, 0xfb92fd2e00000000, 0xee23ea7500000000,
+    0x1db3184300000000, 0xc441c5c300000000, 0x37d137f500000000,
+    0x226020ae00000000, 0xd1f0d29800000000, 0xd183ea7400000000,
+    0x2213184200000000, 0x37a20f1900000000, 0xc432fd2f00000000,
+    0x1dc020af00000000, 0xee50d29900000000, 0xfbe1c5c200000000,
+    0x087137f400000000},
+   {0x0000000000000000, 0x3651822400000000, 0x6ca2044900000000,
+    0x5af3866d00000000, 0xd844099200000000, 0xee158bb600000000,
+    0xb4e60ddb00000000, 0x82b78fff00000000, 0xf18f63ff00000000,
+    0xc7dee1db00000000, 0x9d2d67b600000000, 0xab7ce59200000000,
+    0x29cb6a6d00000000, 0x1f9ae84900000000, 0x45696e2400000000,
+    0x7338ec0000000000, 0xa319b62500000000, 0x9548340100000000,
+    0xcfbbb26c00000000, 0xf9ea304800000000, 0x7b5dbfb700000000,
+    0x4d0c3d9300000000, 0x17ffbbfe00000000, 0x21ae39da00000000,
+    0x5296d5da00000000, 0x64c757fe00000000, 0x3e34d19300000000,
+    0x086553b700000000, 0x8ad2dc4800000000, 0xbc835e6c00000000,
+    0xe670d80100000000, 0xd0215a2500000000, 0x46336c4b00000000,
+    0x7062ee6f00000000, 0x2a91680200000000, 0x1cc0ea2600000000,
+    0x9e7765d900000000, 0xa826e7fd00000000, 0xf2d5619000000000,
+    0xc484e3b400000000, 0xb7bc0fb400000000, 0x81ed8d9000000000,
+    0xdb1e0bfd00000000, 0xed4f89d900000000, 0x6ff8062600000000,
+    0x59a9840200000000, 0x035a026f00000000, 0x350b804b00000000,
+    0xe52ada6e00000000, 0xd37b584a00000000, 0x8988de2700000000,
+    0xbfd95c0300000000, 0x3d6ed3fc00000000, 0x0b3f51d800000000,
+    0x51ccd7b500000000, 0x679d559100000000, 0x14a5b99100000000,
+    0x22f43bb500000000, 0x7807bdd800000000, 0x4e563ffc00000000,
+    0xcce1b00300000000, 0xfab0322700000000, 0xa043b44a00000000,
+    0x9612366e00000000, 0x8c66d89600000000, 0xba375ab200000000,
+    0xe0c4dcdf00000000, 0xd6955efb00000000, 0x5422d10400000000,
+    0x6273532000000000, 0x3880d54d00000000, 0x0ed1576900000000,
+    0x7de9bb6900000000, 0x4bb8394d00000000, 0x114bbf2000000000,
+    0x271a3d0400000000, 0xa5adb2fb00000000, 0x93fc30df00000000,
+    0xc90fb6b200000000, 0xff5e349600000000, 0x2f7f6eb300000000,
+    0x192eec9700000000, 0x43dd6afa00000000, 0x758ce8de00000000,
+    0xf73b672100000000, 0xc16ae50500000000, 0x9b99636800000000,
+    0xadc8e14c00000000, 0xdef00d4c00000000, 0xe8a18f6800000000,
+    0xb252090500000000, 0x84038b2100000000, 0x06b404de00000000,
+    0x30e586fa00000000, 0x6a16009700000000, 0x5c4782b300000000,
+    0xca55b4dd00000000, 0xfc0436f900000000, 0xa6f7b09400000000,
+    0x90a632b000000000, 0x1211bd4f00000000, 0x24403f6b00000000,
+    0x7eb3b90600000000, 0x48e23b2200000000, 0x3bdad72200000000,
+    0x0d8b550600000000, 0x5778d36b00000000, 0x6129514f00000000,
+    0xe39edeb000000000, 0xd5cf5c9400000000, 0x8f3cdaf900000000,
+    0xb96d58dd00000000, 0x694c02f800000000, 0x5f1d80dc00000000,
+    0x05ee06b100000000, 0x33bf849500000000, 0xb1080b6a00000000,
+    0x8759894e00000000, 0xddaa0f2300000000, 0xebfb8d0700000000,
+    0x98c3610700000000, 0xae92e32300000000, 0xf461654e00000000,
+    0xc230e76a00000000, 0x4087689500000000, 0x76d6eab100000000,
+    0x2c256cdc00000000, 0x1a74eef800000000, 0x59cbc1f600000000,
+    0x6f9a43d200000000, 0x3569c5bf00000000, 0x0338479b00000000,
+    0x818fc86400000000, 0xb7de4a4000000000, 0xed2dcc2d00000000,
+    0xdb7c4e0900000000, 0xa844a20900000000, 0x9e15202d00000000,
+    0xc4e6a64000000000, 0xf2b7246400000000, 0x7000ab9b00000000,
+    0x465129bf00000000, 0x1ca2afd200000000, 0x2af32df600000000,
+    0xfad277d300000000, 0xcc83f5f700000000, 0x9670739a00000000,
+    0xa021f1be00000000, 0x22967e4100000000, 0x14c7fc6500000000,
+    0x4e347a0800000000, 0x7865f82c00000000, 0x0b5d142c00000000,
+    0x3d0c960800000000, 0x67ff106500000000, 0x51ae924100000000,
+    0xd3191dbe00000000, 0xe5489f9a00000000, 0xbfbb19f700000000,
+    0x89ea9bd300000000, 0x1ff8adbd00000000, 0x29a92f9900000000,
+    0x735aa9f400000000, 0x450b2bd000000000, 0xc7bca42f00000000,
+    0xf1ed260b00000000, 0xab1ea06600000000, 0x9d4f224200000000,
+    0xee77ce4200000000, 0xd8264c6600000000, 0x82d5ca0b00000000,
+    0xb484482f00000000, 0x3633c7d000000000, 0x006245f400000000,
+    0x5a91c39900000000, 0x6cc041bd00000000, 0xbce11b9800000000,
+    0x8ab099bc00000000, 0xd0431fd100000000, 0xe6129df500000000,
+    0x64a5120a00000000, 0x52f4902e00000000, 0x0807164300000000,
+    0x3e56946700000000, 0x4d6e786700000000, 0x7b3ffa4300000000,
+    0x21cc7c2e00000000, 0x179dfe0a00000000, 0x952a71f500000000,
+    0xa37bf3d100000000, 0xf98875bc00000000, 0xcfd9f79800000000,
+    0xd5ad196000000000, 0xe3fc9b4400000000, 0xb90f1d2900000000,
+    0x8f5e9f0d00000000, 0x0de910f200000000, 0x3bb892d600000000,
+    0x614b14bb00000000, 0x571a969f00000000, 0x24227a9f00000000,
+    0x1273f8bb00000000, 0x48807ed600000000, 0x7ed1fcf200000000,
+    0xfc66730d00000000, 0xca37f12900000000, 0x90c4774400000000,
+    0xa695f56000000000, 0x76b4af4500000000, 0x40e52d6100000000,
+    0x1a16ab0c00000000, 0x2c47292800000000, 0xaef0a6d700000000,
+    0x98a124f300000000, 0xc252a29e00000000, 0xf40320ba00000000,
+    0x873bccba00000000, 0xb16a4e9e00000000, 0xeb99c8f300000000,
+    0xddc84ad700000000, 0x5f7fc52800000000, 0x692e470c00000000,
+    0x33ddc16100000000, 0x058c434500000000, 0x939e752b00000000,
+    0xa5cff70f00000000, 0xff3c716200000000, 0xc96df34600000000,
+    0x4bda7cb900000000, 0x7d8bfe9d00000000, 0x277878f000000000,
+    0x1129fad400000000, 0x621116d400000000, 0x544094f000000000,
+    0x0eb3129d00000000, 0x38e290b900000000, 0xba551f4600000000,
+    0x8c049d6200000000, 0xd6f71b0f00000000, 0xe0a6992b00000000,
+    0x3087c30e00000000, 0x06d6412a00000000, 0x5c25c74700000000,
+    0x6a74456300000000, 0xe8c3ca9c00000000, 0xde9248b800000000,
+    0x8461ced500000000, 0xb2304cf100000000, 0xc108a0f100000000,
+    0xf75922d500000000, 0xadaaa4b800000000, 0x9bfb269c00000000,
+    0x194ca96300000000, 0x2f1d2b4700000000, 0x75eead2a00000000,
+    0x43bf2f0e00000000},
+   {0x0000000000000000, 0xc8179ecf00000000, 0xd1294d4400000000,
+    0x193ed38b00000000, 0xa2539a8800000000, 0x6a44044700000000,
+    0x737ad7cc00000000, 0xbb6d490300000000, 0x05a145ca00000000,
+    0xcdb6db0500000000, 0xd488088e00000000, 0x1c9f964100000000,
+    0xa7f2df4200000000, 0x6fe5418d00000000, 0x76db920600000000,
+    0xbecc0cc900000000, 0x4b44fa4f00000000, 0x8353648000000000,
+    0x9a6db70b00000000, 0x527a29c400000000, 0xe91760c700000000,
+    0x2100fe0800000000, 0x383e2d8300000000, 0xf029b34c00000000,
+    0x4ee5bf8500000000, 0x86f2214a00000000, 0x9fccf2c100000000,
+    0x57db6c0e00000000, 0xecb6250d00000000, 0x24a1bbc200000000,
+    0x3d9f684900000000, 0xf588f68600000000, 0x9688f49f00000000,
+    0x5e9f6a5000000000, 0x47a1b9db00000000, 0x8fb6271400000000,
+    0x34db6e1700000000, 0xfcccf0d800000000, 0xe5f2235300000000,
+    0x2de5bd9c00000000, 0x9329b15500000000, 0x5b3e2f9a00000000,
+    0x4200fc1100000000, 0x8a1762de00000000, 0x317a2bdd00000000,
+    0xf96db51200000000, 0xe053669900000000, 0x2844f85600000000,
+    0xddcc0ed000000000, 0x15db901f00000000, 0x0ce5439400000000,
+    0xc4f2dd5b00000000, 0x7f9f945800000000, 0xb7880a9700000000,
+    0xaeb6d91c00000000, 0x66a147d300000000, 0xd86d4b1a00000000,
+    0x107ad5d500000000, 0x0944065e00000000, 0xc153989100000000,
+    0x7a3ed19200000000, 0xb2294f5d00000000, 0xab179cd600000000,
+    0x6300021900000000, 0x6d1798e400000000, 0xa500062b00000000,
+    0xbc3ed5a000000000, 0x74294b6f00000000, 0xcf44026c00000000,
+    0x07539ca300000000, 0x1e6d4f2800000000, 0xd67ad1e700000000,
+    0x68b6dd2e00000000, 0xa0a143e100000000, 0xb99f906a00000000,
+    0x71880ea500000000, 0xcae547a600000000, 0x02f2d96900000000,
+    0x1bcc0ae200000000, 0xd3db942d00000000, 0x265362ab00000000,
+    0xee44fc6400000000, 0xf77a2fef00000000, 0x3f6db12000000000,
+    0x8400f82300000000, 0x4c1766ec00000000, 0x5529b56700000000,
+    0x9d3e2ba800000000, 0x23f2276100000000, 0xebe5b9ae00000000,
+    0xf2db6a2500000000, 0x3accf4ea00000000, 0x81a1bde900000000,
+    0x49b6232600000000, 0x5088f0ad00000000, 0x989f6e6200000000,
+    0xfb9f6c7b00000000, 0x3388f2b400000000, 0x2ab6213f00000000,
+    0xe2a1bff000000000, 0x59ccf6f300000000, 0x91db683c00000000,
+    0x88e5bbb700000000, 0x40f2257800000000, 0xfe3e29b100000000,
+    0x3629b77e00000000, 0x2f1764f500000000, 0xe700fa3a00000000,
+    0x5c6db33900000000, 0x947a2df600000000, 0x8d44fe7d00000000,
+    0x455360b200000000, 0xb0db963400000000, 0x78cc08fb00000000,
+    0x61f2db7000000000, 0xa9e545bf00000000, 0x12880cbc00000000,
+    0xda9f927300000000, 0xc3a141f800000000, 0x0bb6df3700000000,
+    0xb57ad3fe00000000, 0x7d6d4d3100000000, 0x64539eba00000000,
+    0xac44007500000000, 0x1729497600000000, 0xdf3ed7b900000000,
+    0xc600043200000000, 0x0e179afd00000000, 0x9b28411200000000,
+    0x533fdfdd00000000, 0x4a010c5600000000, 0x8216929900000000,
+    0x397bdb9a00000000, 0xf16c455500000000, 0xe85296de00000000,
+    0x2045081100000000, 0x9e8904d800000000, 0x569e9a1700000000,
+    0x4fa0499c00000000, 0x87b7d75300000000, 0x3cda9e5000000000,
+    0xf4cd009f00000000, 0xedf3d31400000000, 0x25e44ddb00000000,
+    0xd06cbb5d00000000, 0x187b259200000000, 0x0145f61900000000,
+    0xc95268d600000000, 0x723f21d500000000, 0xba28bf1a00000000,
+    0xa3166c9100000000, 0x6b01f25e00000000, 0xd5cdfe9700000000,
+    0x1dda605800000000, 0x04e4b3d300000000, 0xccf32d1c00000000,
+    0x779e641f00000000, 0xbf89fad000000000, 0xa6b7295b00000000,
+    0x6ea0b79400000000, 0x0da0b58d00000000, 0xc5b72b4200000000,
+    0xdc89f8c900000000, 0x149e660600000000, 0xaff32f0500000000,
+    0x67e4b1ca00000000, 0x7eda624100000000, 0xb6cdfc8e00000000,
+    0x0801f04700000000, 0xc0166e8800000000, 0xd928bd0300000000,
+    0x113f23cc00000000, 0xaa526acf00000000, 0x6245f40000000000,
+    0x7b7b278b00000000, 0xb36cb94400000000, 0x46e44fc200000000,
+    0x8ef3d10d00000000, 0x97cd028600000000, 0x5fda9c4900000000,
+    0xe4b7d54a00000000, 0x2ca04b8500000000, 0x359e980e00000000,
+    0xfd8906c100000000, 0x43450a0800000000, 0x8b5294c700000000,
+    0x926c474c00000000, 0x5a7bd98300000000, 0xe116908000000000,
+    0x29010e4f00000000, 0x303fddc400000000, 0xf828430b00000000,
+    0xf63fd9f600000000, 0x3e28473900000000, 0x271694b200000000,
+    0xef010a7d00000000, 0x546c437e00000000, 0x9c7bddb100000000,
+    0x85450e3a00000000, 0x4d5290f500000000, 0xf39e9c3c00000000,
+    0x3b8902f300000000, 0x22b7d17800000000, 0xeaa04fb700000000,
+    0x51cd06b400000000, 0x99da987b00000000, 0x80e44bf000000000,
+    0x48f3d53f00000000, 0xbd7b23b900000000, 0x756cbd7600000000,
+    0x6c526efd00000000, 0xa445f03200000000, 0x1f28b93100000000,
+    0xd73f27fe00000000, 0xce01f47500000000, 0x06166aba00000000,
+    0xb8da667300000000, 0x70cdf8bc00000000, 0x69f32b3700000000,
+    0xa1e4b5f800000000, 0x1a89fcfb00000000, 0xd29e623400000000,
+    0xcba0b1bf00000000, 0x03b72f7000000000, 0x60b72d6900000000,
+    0xa8a0b3a600000000, 0xb19e602d00000000, 0x7989fee200000000,
+    0xc2e4b7e100000000, 0x0af3292e00000000, 0x13cdfaa500000000,
+    0xdbda646a00000000, 0x651668a300000000, 0xad01f66c00000000,
+    0xb43f25e700000000, 0x7c28bb2800000000, 0xc745f22b00000000,
+    0x0f526ce400000000, 0x166cbf6f00000000, 0xde7b21a000000000,
+    0x2bf3d72600000000, 0xe3e449e900000000, 0xfada9a6200000000,
+    0x32cd04ad00000000, 0x89a04dae00000000, 0x41b7d36100000000,
+    0x588900ea00000000, 0x909e9e2500000000, 0x2e5292ec00000000,
+    0xe6450c2300000000, 0xff7bdfa800000000, 0x376c416700000000,
+    0x8c01086400000000, 0x441696ab00000000, 0x5d28452000000000,
+    0x953fdbef00000000},
+   {0x0000000000000000, 0x95d4709500000000, 0x6baf90f100000000,
+    0xfe7be06400000000, 0x9758503800000000, 0x028c20ad00000000,
+    0xfcf7c0c900000000, 0x6923b05c00000000, 0x2eb1a07000000000,
+    0xbb65d0e500000000, 0x451e308100000000, 0xd0ca401400000000,
+    0xb9e9f04800000000, 0x2c3d80dd00000000, 0xd24660b900000000,
+    0x4792102c00000000, 0x5c6241e100000000, 0xc9b6317400000000,
+    0x37cdd11000000000, 0xa219a18500000000, 0xcb3a11d900000000,
+    0x5eee614c00000000, 0xa095812800000000, 0x3541f1bd00000000,
+    0x72d3e19100000000, 0xe707910400000000, 0x197c716000000000,
+    0x8ca801f500000000, 0xe58bb1a900000000, 0x705fc13c00000000,
+    0x8e24215800000000, 0x1bf051cd00000000, 0xf9c2f31900000000,
+    0x6c16838c00000000, 0x926d63e800000000, 0x07b9137d00000000,
+    0x6e9aa32100000000, 0xfb4ed3b400000000, 0x053533d000000000,
+    0x90e1434500000000, 0xd773536900000000, 0x42a723fc00000000,
+    0xbcdcc39800000000, 0x2908b30d00000000, 0x402b035100000000,
+    0xd5ff73c400000000, 0x2b8493a000000000, 0xbe50e33500000000,
+    0xa5a0b2f800000000, 0x3074c26d00000000, 0xce0f220900000000,
+    0x5bdb529c00000000, 0x32f8e2c000000000, 0xa72c925500000000,
+    0x5957723100000000, 0xcc8302a400000000, 0x8b11128800000000,
+    0x1ec5621d00000000, 0xe0be827900000000, 0x756af2ec00000000,
+    0x1c4942b000000000, 0x899d322500000000, 0x77e6d24100000000,
+    0xe232a2d400000000, 0xf285e73300000000, 0x675197a600000000,
+    0x992a77c200000000, 0x0cfe075700000000, 0x65ddb70b00000000,
+    0xf009c79e00000000, 0x0e7227fa00000000, 0x9ba6576f00000000,
+    0xdc34474300000000, 0x49e037d600000000, 0xb79bd7b200000000,
+    0x224fa72700000000, 0x4b6c177b00000000, 0xdeb867ee00000000,
+    0x20c3878a00000000, 0xb517f71f00000000, 0xaee7a6d200000000,
+    0x3b33d64700000000, 0xc548362300000000, 0x509c46b600000000,
+    0x39bff6ea00000000, 0xac6b867f00000000, 0x5210661b00000000,
+    0xc7c4168e00000000, 0x805606a200000000, 0x1582763700000000,
+    0xebf9965300000000, 0x7e2de6c600000000, 0x170e569a00000000,
+    0x82da260f00000000, 0x7ca1c66b00000000, 0xe975b6fe00000000,
+    0x0b47142a00000000, 0x9e9364bf00000000, 0x60e884db00000000,
+    0xf53cf44e00000000, 0x9c1f441200000000, 0x09cb348700000000,
+    0xf7b0d4e300000000, 0x6264a47600000000, 0x25f6b45a00000000,
+    0xb022c4cf00000000, 0x4e5924ab00000000, 0xdb8d543e00000000,
+    0xb2aee46200000000, 0x277a94f700000000, 0xd901749300000000,
+    0x4cd5040600000000, 0x572555cb00000000, 0xc2f1255e00000000,
+    0x3c8ac53a00000000, 0xa95eb5af00000000, 0xc07d05f300000000,
+    0x55a9756600000000, 0xabd2950200000000, 0x3e06e59700000000,
+    0x7994f5bb00000000, 0xec40852e00000000, 0x123b654a00000000,
+    0x87ef15df00000000, 0xeecca58300000000, 0x7b18d51600000000,
+    0x8563357200000000, 0x10b745e700000000, 0xe40bcf6700000000,
+    0x71dfbff200000000, 0x8fa45f9600000000, 0x1a702f0300000000,
+    0x73539f5f00000000, 0xe687efca00000000, 0x18fc0fae00000000,
+    0x8d287f3b00000000, 0xcaba6f1700000000, 0x5f6e1f8200000000,
+    0xa115ffe600000000, 0x34c18f7300000000, 0x5de23f2f00000000,
+    0xc8364fba00000000, 0x364dafde00000000, 0xa399df4b00000000,
+    0xb8698e8600000000, 0x2dbdfe1300000000, 0xd3c61e7700000000,
+    0x46126ee200000000, 0x2f31debe00000000, 0xbae5ae2b00000000,
+    0x449e4e4f00000000, 0xd14a3eda00000000, 0x96d82ef600000000,
+    0x030c5e6300000000, 0xfd77be0700000000, 0x68a3ce9200000000,
+    0x01807ece00000000, 0x94540e5b00000000, 0x6a2fee3f00000000,
+    0xfffb9eaa00000000, 0x1dc93c7e00000000, 0x881d4ceb00000000,
+    0x7666ac8f00000000, 0xe3b2dc1a00000000, 0x8a916c4600000000,
+    0x1f451cd300000000, 0xe13efcb700000000, 0x74ea8c2200000000,
+    0x33789c0e00000000, 0xa6acec9b00000000, 0x58d70cff00000000,
+    0xcd037c6a00000000, 0xa420cc3600000000, 0x31f4bca300000000,
+    0xcf8f5cc700000000, 0x5a5b2c5200000000, 0x41ab7d9f00000000,
+    0xd47f0d0a00000000, 0x2a04ed6e00000000, 0xbfd09dfb00000000,
+    0xd6f32da700000000, 0x43275d3200000000, 0xbd5cbd5600000000,
+    0x2888cdc300000000, 0x6f1addef00000000, 0xfacead7a00000000,
+    0x04b54d1e00000000, 0x91613d8b00000000, 0xf8428dd700000000,
+    0x6d96fd4200000000, 0x93ed1d2600000000, 0x06396db300000000,
+    0x168e285400000000, 0x835a58c100000000, 0x7d21b8a500000000,
+    0xe8f5c83000000000, 0x81d6786c00000000, 0x140208f900000000,
+    0xea79e89d00000000, 0x7fad980800000000, 0x383f882400000000,
+    0xadebf8b100000000, 0x539018d500000000, 0xc644684000000000,
+    0xaf67d81c00000000, 0x3ab3a88900000000, 0xc4c848ed00000000,
+    0x511c387800000000, 0x4aec69b500000000, 0xdf38192000000000,
+    0x2143f94400000000, 0xb49789d100000000, 0xddb4398d00000000,
+    0x4860491800000000, 0xb61ba97c00000000, 0x23cfd9e900000000,
+    0x645dc9c500000000, 0xf189b95000000000, 0x0ff2593400000000,
+    0x9a2629a100000000, 0xf30599fd00000000, 0x66d1e96800000000,
+    0x98aa090c00000000, 0x0d7e799900000000, 0xef4cdb4d00000000,
+    0x7a98abd800000000, 0x84e34bbc00000000, 0x11373b2900000000,
+    0x78148b7500000000, 0xedc0fbe000000000, 0x13bb1b8400000000,
+    0x866f6b1100000000, 0xc1fd7b3d00000000, 0x54290ba800000000,
+    0xaa52ebcc00000000, 0x3f869b5900000000, 0x56a52b0500000000,
+    0xc3715b9000000000, 0x3d0abbf400000000, 0xa8decb6100000000,
+    0xb32e9aac00000000, 0x26faea3900000000, 0xd8810a5d00000000,
+    0x4d557ac800000000, 0x2476ca9400000000, 0xb1a2ba0100000000,
+    0x4fd95a6500000000, 0xda0d2af000000000, 0x9d9f3adc00000000,
+    0x084b4a4900000000, 0xf630aa2d00000000, 0x63e4dab800000000,
+    0x0ac76ae400000000, 0x9f131a7100000000, 0x6168fa1500000000,
+    0xf4bc8a8000000000},
+   {0x0000000000000000, 0x1f17f08000000000, 0x7f2891da00000000,
+    0x603f615a00000000, 0xbf56536e00000000, 0xa041a3ee00000000,
+    0xc07ec2b400000000, 0xdf69323400000000, 0x7eada6dc00000000,
+    0x61ba565c00000000, 0x0185370600000000, 0x1e92c78600000000,
+    0xc1fbf5b200000000, 0xdeec053200000000, 0xbed3646800000000,
+    0xa1c494e800000000, 0xbd5c3c6200000000, 0xa24bcce200000000,
+    0xc274adb800000000, 0xdd635d3800000000, 0x020a6f0c00000000,
+    0x1d1d9f8c00000000, 0x7d22fed600000000, 0x62350e5600000000,
+    0xc3f19abe00000000, 0xdce66a3e00000000, 0xbcd90b6400000000,
+    0xa3cefbe400000000, 0x7ca7c9d000000000, 0x63b0395000000000,
+    0x038f580a00000000, 0x1c98a88a00000000, 0x7ab978c400000000,
+    0x65ae884400000000, 0x0591e91e00000000, 0x1a86199e00000000,
+    0xc5ef2baa00000000, 0xdaf8db2a00000000, 0xbac7ba7000000000,
+    0xa5d04af000000000, 0x0414de1800000000, 0x1b032e9800000000,
+    0x7b3c4fc200000000, 0x642bbf4200000000, 0xbb428d7600000000,
+    0xa4557df600000000, 0xc46a1cac00000000, 0xdb7dec2c00000000,
+    0xc7e544a600000000, 0xd8f2b42600000000, 0xb8cdd57c00000000,
+    0xa7da25fc00000000, 0x78b317c800000000, 0x67a4e74800000000,
+    0x079b861200000000, 0x188c769200000000, 0xb948e27a00000000,
+    0xa65f12fa00000000, 0xc66073a000000000, 0xd977832000000000,
+    0x061eb11400000000, 0x1909419400000000, 0x793620ce00000000,
+    0x6621d04e00000000, 0xb574805300000000, 0xaa6370d300000000,
+    0xca5c118900000000, 0xd54be10900000000, 0x0a22d33d00000000,
+    0x153523bd00000000, 0x750a42e700000000, 0x6a1db26700000000,
+    0xcbd9268f00000000, 0xd4ced60f00000000, 0xb4f1b75500000000,
+    0xabe647d500000000, 0x748f75e100000000, 0x6b98856100000000,
+    0x0ba7e43b00000000, 0x14b014bb00000000, 0x0828bc3100000000,
+    0x173f4cb100000000, 0x77002deb00000000, 0x6817dd6b00000000,
+    0xb77eef5f00000000, 0xa8691fdf00000000, 0xc8567e8500000000,
+    0xd7418e0500000000, 0x76851aed00000000, 0x6992ea6d00000000,
+    0x09ad8b3700000000, 0x16ba7bb700000000, 0xc9d3498300000000,
+    0xd6c4b90300000000, 0xb6fbd85900000000, 0xa9ec28d900000000,
+    0xcfcdf89700000000, 0xd0da081700000000, 0xb0e5694d00000000,
+    0xaff299cd00000000, 0x709babf900000000, 0x6f8c5b7900000000,
+    0x0fb33a2300000000, 0x10a4caa300000000, 0xb1605e4b00000000,
+    0xae77aecb00000000, 0xce48cf9100000000, 0xd15f3f1100000000,
+    0x0e360d2500000000, 0x1121fda500000000, 0x711e9cff00000000,
+    0x6e096c7f00000000, 0x7291c4f500000000, 0x6d86347500000000,
+    0x0db9552f00000000, 0x12aea5af00000000, 0xcdc7979b00000000,
+    0xd2d0671b00000000, 0xb2ef064100000000, 0xadf8f6c100000000,
+    0x0c3c622900000000, 0x132b92a900000000, 0x7314f3f300000000,
+    0x6c03037300000000, 0xb36a314700000000, 0xac7dc1c700000000,
+    0xcc42a09d00000000, 0xd355501d00000000, 0x6ae900a700000000,
+    0x75fef02700000000, 0x15c1917d00000000, 0x0ad661fd00000000,
+    0xd5bf53c900000000, 0xcaa8a34900000000, 0xaa97c21300000000,
+    0xb580329300000000, 0x1444a67b00000000, 0x0b5356fb00000000,
+    0x6b6c37a100000000, 0x747bc72100000000, 0xab12f51500000000,
+    0xb405059500000000, 0xd43a64cf00000000, 0xcb2d944f00000000,
+    0xd7b53cc500000000, 0xc8a2cc4500000000, 0xa89dad1f00000000,
+    0xb78a5d9f00000000, 0x68e36fab00000000, 0x77f49f2b00000000,
+    0x17cbfe7100000000, 0x08dc0ef100000000, 0xa9189a1900000000,
+    0xb60f6a9900000000, 0xd6300bc300000000, 0xc927fb4300000000,
+    0x164ec97700000000, 0x095939f700000000, 0x696658ad00000000,
+    0x7671a82d00000000, 0x1050786300000000, 0x0f4788e300000000,
+    0x6f78e9b900000000, 0x706f193900000000, 0xaf062b0d00000000,
+    0xb011db8d00000000, 0xd02ebad700000000, 0xcf394a5700000000,
+    0x6efddebf00000000, 0x71ea2e3f00000000, 0x11d54f6500000000,
+    0x0ec2bfe500000000, 0xd1ab8dd100000000, 0xcebc7d5100000000,
+    0xae831c0b00000000, 0xb194ec8b00000000, 0xad0c440100000000,
+    0xb21bb48100000000, 0xd224d5db00000000, 0xcd33255b00000000,
+    0x125a176f00000000, 0x0d4de7ef00000000, 0x6d7286b500000000,
+    0x7265763500000000, 0xd3a1e2dd00000000, 0xccb6125d00000000,
+    0xac89730700000000, 0xb39e838700000000, 0x6cf7b1b300000000,
+    0x73e0413300000000, 0x13df206900000000, 0x0cc8d0e900000000,
+    0xdf9d80f400000000, 0xc08a707400000000, 0xa0b5112e00000000,
+    0xbfa2e1ae00000000, 0x60cbd39a00000000, 0x7fdc231a00000000,
+    0x1fe3424000000000, 0x00f4b2c000000000, 0xa130262800000000,
+    0xbe27d6a800000000, 0xde18b7f200000000, 0xc10f477200000000,
+    0x1e66754600000000, 0x017185c600000000, 0x614ee49c00000000,
+    0x7e59141c00000000, 0x62c1bc9600000000, 0x7dd64c1600000000,
+    0x1de92d4c00000000, 0x02feddcc00000000, 0xdd97eff800000000,
+    0xc2801f7800000000, 0xa2bf7e2200000000, 0xbda88ea200000000,
+    0x1c6c1a4a00000000, 0x037beaca00000000, 0x63448b9000000000,
+    0x7c537b1000000000, 0xa33a492400000000, 0xbc2db9a400000000,
+    0xdc12d8fe00000000, 0xc305287e00000000, 0xa524f83000000000,
+    0xba3308b000000000, 0xda0c69ea00000000, 0xc51b996a00000000,
+    0x1a72ab5e00000000, 0x05655bde00000000, 0x655a3a8400000000,
+    0x7a4dca0400000000, 0xdb895eec00000000, 0xc49eae6c00000000,
+    0xa4a1cf3600000000, 0xbbb63fb600000000, 0x64df0d8200000000,
+    0x7bc8fd0200000000, 0x1bf79c5800000000, 0x04e06cd800000000,
+    0x1878c45200000000, 0x076f34d200000000, 0x6750558800000000,
+    0x7847a50800000000, 0xa72e973c00000000, 0xb83967bc00000000,
+    0xd80606e600000000, 0xc711f66600000000, 0x66d5628e00000000,
+    0x79c2920e00000000, 0x19fdf35400000000, 0x06ea03d400000000,
+    0xd98331e000000000, 0xc694c16000000000, 0xa6aba03a00000000,
+    0xb9bc50ba00000000},
+   {0x0000000000000000, 0xe2fd888d00000000, 0x85fd60c000000000,
+    0x6700e84d00000000, 0x4bfdb05b00000000, 0xa90038d600000000,
+    0xce00d09b00000000, 0x2cfd581600000000, 0x96fa61b700000000,
+    0x7407e93a00000000, 0x1307017700000000, 0xf1fa89fa00000000,
+    0xdd07d1ec00000000, 0x3ffa596100000000, 0x58fab12c00000000,
+    0xba0739a100000000, 0x6df3b2b500000000, 0x8f0e3a3800000000,
+    0xe80ed27500000000, 0x0af35af800000000, 0x260e02ee00000000,
+    0xc4f38a6300000000, 0xa3f3622e00000000, 0x410eeaa300000000,
+    0xfb09d30200000000, 0x19f45b8f00000000, 0x7ef4b3c200000000,
+    0x9c093b4f00000000, 0xb0f4635900000000, 0x5209ebd400000000,
+    0x3509039900000000, 0xd7f48b1400000000, 0x9be014b000000000,
+    0x791d9c3d00000000, 0x1e1d747000000000, 0xfce0fcfd00000000,
+    0xd01da4eb00000000, 0x32e02c6600000000, 0x55e0c42b00000000,
+    0xb71d4ca600000000, 0x0d1a750700000000, 0xefe7fd8a00000000,
+    0x88e715c700000000, 0x6a1a9d4a00000000, 0x46e7c55c00000000,
+    0xa41a4dd100000000, 0xc31aa59c00000000, 0x21e72d1100000000,
+    0xf613a60500000000, 0x14ee2e8800000000, 0x73eec6c500000000,
+    0x91134e4800000000, 0xbdee165e00000000, 0x5f139ed300000000,
+    0x3813769e00000000, 0xdaeefe1300000000, 0x60e9c7b200000000,
+    0x82144f3f00000000, 0xe514a77200000000, 0x07e92fff00000000,
+    0x2b1477e900000000, 0xc9e9ff6400000000, 0xaee9172900000000,
+    0x4c149fa400000000, 0x77c758bb00000000, 0x953ad03600000000,
+    0xf23a387b00000000, 0x10c7b0f600000000, 0x3c3ae8e000000000,
+    0xdec7606d00000000, 0xb9c7882000000000, 0x5b3a00ad00000000,
+    0xe13d390c00000000, 0x03c0b18100000000, 0x64c059cc00000000,
+    0x863dd14100000000, 0xaac0895700000000, 0x483d01da00000000,
+    0x2f3de99700000000, 0xcdc0611a00000000, 0x1a34ea0e00000000,
+    0xf8c9628300000000, 0x9fc98ace00000000, 0x7d34024300000000,
+    0x51c95a5500000000, 0xb334d2d800000000, 0xd4343a9500000000,
+    0x36c9b21800000000, 0x8cce8bb900000000, 0x6e33033400000000,
+    0x0933eb7900000000, 0xebce63f400000000, 0xc7333be200000000,
+    0x25ceb36f00000000, 0x42ce5b2200000000, 0xa033d3af00000000,
+    0xec274c0b00000000, 0x0edac48600000000, 0x69da2ccb00000000,
+    0x8b27a44600000000, 0xa7dafc5000000000, 0x452774dd00000000,
+    0x22279c9000000000, 0xc0da141d00000000, 0x7add2dbc00000000,
+    0x9820a53100000000, 0xff204d7c00000000, 0x1dddc5f100000000,
+    0x31209de700000000, 0xd3dd156a00000000, 0xb4ddfd2700000000,
+    0x562075aa00000000, 0x81d4febe00000000, 0x6329763300000000,
+    0x04299e7e00000000, 0xe6d416f300000000, 0xca294ee500000000,
+    0x28d4c66800000000, 0x4fd42e2500000000, 0xad29a6a800000000,
+    0x172e9f0900000000, 0xf5d3178400000000, 0x92d3ffc900000000,
+    0x702e774400000000, 0x5cd32f5200000000, 0xbe2ea7df00000000,
+    0xd92e4f9200000000, 0x3bd3c71f00000000, 0xaf88c0ad00000000,
+    0x4d75482000000000, 0x2a75a06d00000000, 0xc88828e000000000,
+    0xe47570f600000000, 0x0688f87b00000000, 0x6188103600000000,
+    0x837598bb00000000, 0x3972a11a00000000, 0xdb8f299700000000,
+    0xbc8fc1da00000000, 0x5e72495700000000, 0x728f114100000000,
+    0x907299cc00000000, 0xf772718100000000, 0x158ff90c00000000,
+    0xc27b721800000000, 0x2086fa9500000000, 0x478612d800000000,
+    0xa57b9a5500000000, 0x8986c24300000000, 0x6b7b4ace00000000,
+    0x0c7ba28300000000, 0xee862a0e00000000, 0x548113af00000000,
+    0xb67c9b2200000000, 0xd17c736f00000000, 0x3381fbe200000000,
+    0x1f7ca3f400000000, 0xfd812b7900000000, 0x9a81c33400000000,
+    0x787c4bb900000000, 0x3468d41d00000000, 0xd6955c9000000000,
+    0xb195b4dd00000000, 0x53683c5000000000, 0x7f95644600000000,
+    0x9d68eccb00000000, 0xfa68048600000000, 0x18958c0b00000000,
+    0xa292b5aa00000000, 0x406f3d2700000000, 0x276fd56a00000000,
+    0xc5925de700000000, 0xe96f05f100000000, 0x0b928d7c00000000,
+    0x6c92653100000000, 0x8e6fedbc00000000, 0x599b66a800000000,
+    0xbb66ee2500000000, 0xdc66066800000000, 0x3e9b8ee500000000,
+    0x1266d6f300000000, 0xf09b5e7e00000000, 0x979bb63300000000,
+    0x75663ebe00000000, 0xcf61071f00000000, 0x2d9c8f9200000000,
+    0x4a9c67df00000000, 0xa861ef5200000000, 0x849cb74400000000,
+    0x66613fc900000000, 0x0161d78400000000, 0xe39c5f0900000000,
+    0xd84f981600000000, 0x3ab2109b00000000, 0x5db2f8d600000000,
+    0xbf4f705b00000000, 0x93b2284d00000000, 0x714fa0c000000000,
+    0x164f488d00000000, 0xf4b2c00000000000, 0x4eb5f9a100000000,
+    0xac48712c00000000, 0xcb48996100000000, 0x29b511ec00000000,
+    0x054849fa00000000, 0xe7b5c17700000000, 0x80b5293a00000000,
+    0x6248a1b700000000, 0xb5bc2aa300000000, 0x5741a22e00000000,
+    0x30414a6300000000, 0xd2bcc2ee00000000, 0xfe419af800000000,
+    0x1cbc127500000000, 0x7bbcfa3800000000, 0x994172b500000000,
+    0x23464b1400000000, 0xc1bbc39900000000, 0xa6bb2bd400000000,
+    0x4446a35900000000, 0x68bbfb4f00000000, 0x8a4673c200000000,
+    0xed469b8f00000000, 0x0fbb130200000000, 0x43af8ca600000000,
+    0xa152042b00000000, 0xc652ec6600000000, 0x24af64eb00000000,
+    0x08523cfd00000000, 0xeaafb47000000000, 0x8daf5c3d00000000,
+    0x6f52d4b000000000, 0xd555ed1100000000, 0x37a8659c00000000,
+    0x50a88dd100000000, 0xb255055c00000000, 0x9ea85d4a00000000,
+    0x7c55d5c700000000, 0x1b553d8a00000000, 0xf9a8b50700000000,
+    0x2e5c3e1300000000, 0xcca1b69e00000000, 0xaba15ed300000000,
+    0x495cd65e00000000, 0x65a18e4800000000, 0x875c06c500000000,
+    0xe05cee8800000000, 0x02a1660500000000, 0xb8a65fa400000000,
+    0x5a5bd72900000000, 0x3d5b3f6400000000, 0xdfa6b7e900000000,
+    0xf35befff00000000, 0x11a6677200000000, 0x76a68f3f00000000,
+    0x945b07b200000000},
+   {0x0000000000000000, 0xa90b894e00000000, 0x5217129d00000000,
+    0xfb1c9bd300000000, 0xe52855e100000000, 0x4c23dcaf00000000,
+    0xb73f477c00000000, 0x1e34ce3200000000, 0x8b57db1900000000,
+    0x225c525700000000, 0xd940c98400000000, 0x704b40ca00000000,
+    0x6e7f8ef800000000, 0xc77407b600000000, 0x3c689c6500000000,
+    0x9563152b00000000, 0x16afb63300000000, 0xbfa43f7d00000000,
+    0x44b8a4ae00000000, 0xedb32de000000000, 0xf387e3d200000000,
+    0x5a8c6a9c00000000, 0xa190f14f00000000, 0x089b780100000000,
+    0x9df86d2a00000000, 0x34f3e46400000000, 0xcfef7fb700000000,
+    0x66e4f6f900000000, 0x78d038cb00000000, 0xd1dbb18500000000,
+    0x2ac72a5600000000, 0x83cca31800000000, 0x2c5e6d6700000000,
+    0x8555e42900000000, 0x7e497ffa00000000, 0xd742f6b400000000,
+    0xc976388600000000, 0x607db1c800000000, 0x9b612a1b00000000,
+    0x326aa35500000000, 0xa709b67e00000000, 0x0e023f3000000000,
+    0xf51ea4e300000000, 0x5c152dad00000000, 0x4221e39f00000000,
+    0xeb2a6ad100000000, 0x1036f10200000000, 0xb93d784c00000000,
+    0x3af1db5400000000, 0x93fa521a00000000, 0x68e6c9c900000000,
+    0xc1ed408700000000, 0xdfd98eb500000000, 0x76d207fb00000000,
+    0x8dce9c2800000000, 0x24c5156600000000, 0xb1a6004d00000000,
+    0x18ad890300000000, 0xe3b112d000000000, 0x4aba9b9e00000000,
+    0x548e55ac00000000, 0xfd85dce200000000, 0x0699473100000000,
+    0xaf92ce7f00000000, 0x58bcdace00000000, 0xf1b7538000000000,
+    0x0aabc85300000000, 0xa3a0411d00000000, 0xbd948f2f00000000,
+    0x149f066100000000, 0xef839db200000000, 0x468814fc00000000,
+    0xd3eb01d700000000, 0x7ae0889900000000, 0x81fc134a00000000,
+    0x28f79a0400000000, 0x36c3543600000000, 0x9fc8dd7800000000,
+    0x64d446ab00000000, 0xcddfcfe500000000, 0x4e136cfd00000000,
+    0xe718e5b300000000, 0x1c047e6000000000, 0xb50ff72e00000000,
+    0xab3b391c00000000, 0x0230b05200000000, 0xf92c2b8100000000,
+    0x5027a2cf00000000, 0xc544b7e400000000, 0x6c4f3eaa00000000,
+    0x9753a57900000000, 0x3e582c3700000000, 0x206ce20500000000,
+    0x89676b4b00000000, 0x727bf09800000000, 0xdb7079d600000000,
+    0x74e2b7a900000000, 0xdde93ee700000000, 0x26f5a53400000000,
+    0x8ffe2c7a00000000, 0x91cae24800000000, 0x38c16b0600000000,
+    0xc3ddf0d500000000, 0x6ad6799b00000000, 0xffb56cb000000000,
+    0x56bee5fe00000000, 0xada27e2d00000000, 0x04a9f76300000000,
+    0x1a9d395100000000, 0xb396b01f00000000, 0x488a2bcc00000000,
+    0xe181a28200000000, 0x624d019a00000000, 0xcb4688d400000000,
+    0x305a130700000000, 0x99519a4900000000, 0x8765547b00000000,
+    0x2e6edd3500000000, 0xd57246e600000000, 0x7c79cfa800000000,
+    0xe91ada8300000000, 0x401153cd00000000, 0xbb0dc81e00000000,
+    0x1206415000000000, 0x0c328f6200000000, 0xa539062c00000000,
+    0x5e259dff00000000, 0xf72e14b100000000, 0xf17ec44600000000,
+    0x58754d0800000000, 0xa369d6db00000000, 0x0a625f9500000000,
+    0x145691a700000000, 0xbd5d18e900000000, 0x4641833a00000000,
+    0xef4a0a7400000000, 0x7a291f5f00000000, 0xd322961100000000,
+    0x283e0dc200000000, 0x8135848c00000000, 0x9f014abe00000000,
+    0x360ac3f000000000, 0xcd16582300000000, 0x641dd16d00000000,
+    0xe7d1727500000000, 0x4edafb3b00000000, 0xb5c660e800000000,
+    0x1ccde9a600000000, 0x02f9279400000000, 0xabf2aeda00000000,
+    0x50ee350900000000, 0xf9e5bc4700000000, 0x6c86a96c00000000,
+    0xc58d202200000000, 0x3e91bbf100000000, 0x979a32bf00000000,
+    0x89aefc8d00000000, 0x20a575c300000000, 0xdbb9ee1000000000,
+    0x72b2675e00000000, 0xdd20a92100000000, 0x742b206f00000000,
+    0x8f37bbbc00000000, 0x263c32f200000000, 0x3808fcc000000000,
+    0x9103758e00000000, 0x6a1fee5d00000000, 0xc314671300000000,
+    0x5677723800000000, 0xff7cfb7600000000, 0x046060a500000000,
+    0xad6be9eb00000000, 0xb35f27d900000000, 0x1a54ae9700000000,
+    0xe148354400000000, 0x4843bc0a00000000, 0xcb8f1f1200000000,
+    0x6284965c00000000, 0x99980d8f00000000, 0x309384c100000000,
+    0x2ea74af300000000, 0x87acc3bd00000000, 0x7cb0586e00000000,
+    0xd5bbd12000000000, 0x40d8c40b00000000, 0xe9d34d4500000000,
+    0x12cfd69600000000, 0xbbc45fd800000000, 0xa5f091ea00000000,
+    0x0cfb18a400000000, 0xf7e7837700000000, 0x5eec0a3900000000,
+    0xa9c21e8800000000, 0x00c997c600000000, 0xfbd50c1500000000,
+    0x52de855b00000000, 0x4cea4b6900000000, 0xe5e1c22700000000,
+    0x1efd59f400000000, 0xb7f6d0ba00000000, 0x2295c59100000000,
+    0x8b9e4cdf00000000, 0x7082d70c00000000, 0xd9895e4200000000,
+    0xc7bd907000000000, 0x6eb6193e00000000, 0x95aa82ed00000000,
+    0x3ca10ba300000000, 0xbf6da8bb00000000, 0x166621f500000000,
+    0xed7aba2600000000, 0x4471336800000000, 0x5a45fd5a00000000,
+    0xf34e741400000000, 0x0852efc700000000, 0xa159668900000000,
+    0x343a73a200000000, 0x9d31faec00000000, 0x662d613f00000000,
+    0xcf26e87100000000, 0xd112264300000000, 0x7819af0d00000000,
+    0x830534de00000000, 0x2a0ebd9000000000, 0x859c73ef00000000,
+    0x2c97faa100000000, 0xd78b617200000000, 0x7e80e83c00000000,
+    0x60b4260e00000000, 0xc9bfaf4000000000, 0x32a3349300000000,
+    0x9ba8bddd00000000, 0x0ecba8f600000000, 0xa7c021b800000000,
+    0x5cdcba6b00000000, 0xf5d7332500000000, 0xebe3fd1700000000,
+    0x42e8745900000000, 0xb9f4ef8a00000000, 0x10ff66c400000000,
+    0x9333c5dc00000000, 0x3a384c9200000000, 0xc124d74100000000,
+    0x682f5e0f00000000, 0x761b903d00000000, 0xdf10197300000000,
+    0x240c82a000000000, 0x8d070bee00000000, 0x18641ec500000000,
+    0xb16f978b00000000, 0x4a730c5800000000, 0xe378851600000000,
+    0xfd4c4b2400000000, 0x5447c26a00000000, 0xaf5b59b900000000,
+    0x0650d0f700000000},
+   {0x0000000000000000, 0x479244af00000000, 0xcf22f88500000000,
+    0x88b0bc2a00000000, 0xdf4381d000000000, 0x98d1c57f00000000,
+    0x1061795500000000, 0x57f33dfa00000000, 0xff81737a00000000,
+    0xb81337d500000000, 0x30a38bff00000000, 0x7731cf5000000000,
+    0x20c2f2aa00000000, 0x6750b60500000000, 0xefe00a2f00000000,
+    0xa8724e8000000000, 0xfe03e7f400000000, 0xb991a35b00000000,
+    0x31211f7100000000, 0x76b35bde00000000, 0x2140662400000000,
+    0x66d2228b00000000, 0xee629ea100000000, 0xa9f0da0e00000000,
+    0x0182948e00000000, 0x4610d02100000000, 0xcea06c0b00000000,
+    0x893228a400000000, 0xdec1155e00000000, 0x995351f100000000,
+    0x11e3eddb00000000, 0x5671a97400000000, 0xbd01bf3200000000,
+    0xfa93fb9d00000000, 0x722347b700000000, 0x35b1031800000000,
+    0x62423ee200000000, 0x25d07a4d00000000, 0xad60c66700000000,
+    0xeaf282c800000000, 0x4280cc4800000000, 0x051288e700000000,
+    0x8da234cd00000000, 0xca30706200000000, 0x9dc34d9800000000,
+    0xda51093700000000, 0x52e1b51d00000000, 0x1573f1b200000000,
+    0x430258c600000000, 0x04901c6900000000, 0x8c20a04300000000,
+    0xcbb2e4ec00000000, 0x9c41d91600000000, 0xdbd39db900000000,
+    0x5363219300000000, 0x14f1653c00000000, 0xbc832bbc00000000,
+    0xfb116f1300000000, 0x73a1d33900000000, 0x3433979600000000,
+    0x63c0aa6c00000000, 0x2452eec300000000, 0xace252e900000000,
+    0xeb70164600000000, 0x7a037e6500000000, 0x3d913aca00000000,
+    0xb52186e000000000, 0xf2b3c24f00000000, 0xa540ffb500000000,
+    0xe2d2bb1a00000000, 0x6a62073000000000, 0x2df0439f00000000,
+    0x85820d1f00000000, 0xc21049b000000000, 0x4aa0f59a00000000,
+    0x0d32b13500000000, 0x5ac18ccf00000000, 0x1d53c86000000000,
+    0x95e3744a00000000, 0xd27130e500000000, 0x8400999100000000,
+    0xc392dd3e00000000, 0x4b22611400000000, 0x0cb025bb00000000,
+    0x5b43184100000000, 0x1cd15cee00000000, 0x9461e0c400000000,
+    0xd3f3a46b00000000, 0x7b81eaeb00000000, 0x3c13ae4400000000,
+    0xb4a3126e00000000, 0xf33156c100000000, 0xa4c26b3b00000000,
+    0xe3502f9400000000, 0x6be093be00000000, 0x2c72d71100000000,
+    0xc702c15700000000, 0x809085f800000000, 0x082039d200000000,
+    0x4fb27d7d00000000, 0x1841408700000000, 0x5fd3042800000000,
+    0xd763b80200000000, 0x90f1fcad00000000, 0x3883b22d00000000,
+    0x7f11f68200000000, 0xf7a14aa800000000, 0xb0330e0700000000,
+    0xe7c033fd00000000, 0xa052775200000000, 0x28e2cb7800000000,
+    0x6f708fd700000000, 0x390126a300000000, 0x7e93620c00000000,
+    0xf623de2600000000, 0xb1b19a8900000000, 0xe642a77300000000,
+    0xa1d0e3dc00000000, 0x29605ff600000000, 0x6ef21b5900000000,
+    0xc68055d900000000, 0x8112117600000000, 0x09a2ad5c00000000,
+    0x4e30e9f300000000, 0x19c3d40900000000, 0x5e5190a600000000,
+    0xd6e12c8c00000000, 0x9173682300000000, 0xf406fcca00000000,
+    0xb394b86500000000, 0x3b24044f00000000, 0x7cb640e000000000,
+    0x2b457d1a00000000, 0x6cd739b500000000, 0xe467859f00000000,
+    0xa3f5c13000000000, 0x0b878fb000000000, 0x4c15cb1f00000000,
+    0xc4a5773500000000, 0x8337339a00000000, 0xd4c40e6000000000,
+    0x93564acf00000000, 0x1be6f6e500000000, 0x5c74b24a00000000,
+    0x0a051b3e00000000, 0x4d975f9100000000, 0xc527e3bb00000000,
+    0x82b5a71400000000, 0xd5469aee00000000, 0x92d4de4100000000,
+    0x1a64626b00000000, 0x5df626c400000000, 0xf584684400000000,
+    0xb2162ceb00000000, 0x3aa690c100000000, 0x7d34d46e00000000,
+    0x2ac7e99400000000, 0x6d55ad3b00000000, 0xe5e5111100000000,
+    0xa27755be00000000, 0x490743f800000000, 0x0e95075700000000,
+    0x8625bb7d00000000, 0xc1b7ffd200000000, 0x9644c22800000000,
+    0xd1d6868700000000, 0x59663aad00000000, 0x1ef47e0200000000,
+    0xb686308200000000, 0xf114742d00000000, 0x79a4c80700000000,
+    0x3e368ca800000000, 0x69c5b15200000000, 0x2e57f5fd00000000,
+    0xa6e749d700000000, 0xe1750d7800000000, 0xb704a40c00000000,
+    0xf096e0a300000000, 0x78265c8900000000, 0x3fb4182600000000,
+    0x684725dc00000000, 0x2fd5617300000000, 0xa765dd5900000000,
+    0xe0f799f600000000, 0x4885d77600000000, 0x0f1793d900000000,
+    0x87a72ff300000000, 0xc0356b5c00000000, 0x97c656a600000000,
+    0xd054120900000000, 0x58e4ae2300000000, 0x1f76ea8c00000000,
+    0x8e0582af00000000, 0xc997c60000000000, 0x41277a2a00000000,
+    0x06b53e8500000000, 0x5146037f00000000, 0x16d447d000000000,
+    0x9e64fbfa00000000, 0xd9f6bf5500000000, 0x7184f1d500000000,
+    0x3616b57a00000000, 0xbea6095000000000, 0xf9344dff00000000,
+    0xaec7700500000000, 0xe95534aa00000000, 0x61e5888000000000,
+    0x2677cc2f00000000, 0x7006655b00000000, 0x379421f400000000,
+    0xbf249dde00000000, 0xf8b6d97100000000, 0xaf45e48b00000000,
+    0xe8d7a02400000000, 0x60671c0e00000000, 0x27f558a100000000,
+    0x8f87162100000000, 0xc815528e00000000, 0x40a5eea400000000,
+    0x0737aa0b00000000, 0x50c497f100000000, 0x1756d35e00000000,
+    0x9fe66f7400000000, 0xd8742bdb00000000, 0x33043d9d00000000,
+    0x7496793200000000, 0xfc26c51800000000, 0xbbb481b700000000,
+    0xec47bc4d00000000, 0xabd5f8e200000000, 0x236544c800000000,
+    0x64f7006700000000, 0xcc854ee700000000, 0x8b170a4800000000,
+    0x03a7b66200000000, 0x4435f2cd00000000, 0x13c6cf3700000000,
+    0x54548b9800000000, 0xdce437b200000000, 0x9b76731d00000000,
+    0xcd07da6900000000, 0x8a959ec600000000, 0x022522ec00000000,
+    0x45b7664300000000, 0x12445bb900000000, 0x55d61f1600000000,
+    0xdd66a33c00000000, 0x9af4e79300000000, 0x3286a91300000000,
+    0x7514edbc00000000, 0xfda4519600000000, 0xba36153900000000,
+    0xedc528c300000000, 0xaa576c6c00000000, 0x22e7d04600000000,
+    0x657594e900000000}};
+
+#else /* W == 4 */
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0x65673b46, 0xcace768c, 0xafa94dca, 0x4eedeb59,
+    0x2b8ad01f, 0x84239dd5, 0xe144a693, 0x9ddbd6b2, 0xf8bcedf4,
+    0x5715a03e, 0x32729b78, 0xd3363deb, 0xb65106ad, 0x19f84b67,
+    0x7c9f7021, 0xe0c6ab25, 0x85a19063, 0x2a08dda9, 0x4f6fe6ef,
+    0xae2b407c, 0xcb4c7b3a, 0x64e536f0, 0x01820db6, 0x7d1d7d97,
+    0x187a46d1, 0xb7d30b1b, 0xd2b4305d, 0x33f096ce, 0x5697ad88,
+    0xf93ee042, 0x9c59db04, 0x1afc500b, 0x7f9b6b4d, 0xd0322687,
+    0xb5551dc1, 0x5411bb52, 0x31768014, 0x9edfcdde, 0xfbb8f698,
+    0x872786b9, 0xe240bdff, 0x4de9f035, 0x288ecb73, 0xc9ca6de0,
+    0xacad56a6, 0x03041b6c, 0x6663202a, 0xfa3afb2e, 0x9f5dc068,
+    0x30f48da2, 0x5593b6e4, 0xb4d71077, 0xd1b02b31, 0x7e1966fb,
+    0x1b7e5dbd, 0x67e12d9c, 0x028616da, 0xad2f5b10, 0xc8486056,
+    0x290cc6c5, 0x4c6bfd83, 0xe3c2b049, 0x86a58b0f, 0x35f8a016,
+    0x509f9b50, 0xff36d69a, 0x9a51eddc, 0x7b154b4f, 0x1e727009,
+    0xb1db3dc3, 0xd4bc0685, 0xa82376a4, 0xcd444de2, 0x62ed0028,
+    0x078a3b6e, 0xe6ce9dfd, 0x83a9a6bb, 0x2c00eb71, 0x4967d037,
+    0xd53e0b33, 0xb0593075, 0x1ff07dbf, 0x7a9746f9, 0x9bd3e06a,
+    0xfeb4db2c, 0x511d96e6, 0x347aada0, 0x48e5dd81, 0x2d82e6c7,
+    0x822bab0d, 0xe74c904b, 0x060836d8, 0x636f0d9e, 0xccc64054,
+    0xa9a17b12, 0x2f04f01d, 0x4a63cb5b, 0xe5ca8691, 0x80adbdd7,
+    0x61e91b44, 0x048e2002, 0xab276dc8, 0xce40568e, 0xb2df26af,
+    0xd7b81de9, 0x78115023, 0x1d766b65, 0xfc32cdf6, 0x9955f6b0,
+    0x36fcbb7a, 0x539b803c, 0xcfc25b38, 0xaaa5607e, 0x050c2db4,
+    0x606b16f2, 0x812fb061, 0xe4488b27, 0x4be1c6ed, 0x2e86fdab,
+    0x52198d8a, 0x377eb6cc, 0x98d7fb06, 0xfdb0c040, 0x1cf466d3,
+    0x79935d95, 0xd63a105f, 0xb35d2b19, 0x6bf1402c, 0x0e967b6a,
+    0xa13f36a0, 0xc4580de6, 0x251cab75, 0x407b9033, 0xefd2ddf9,
+    0x8ab5e6bf, 0xf62a969e, 0x934dadd8, 0x3ce4e012, 0x5983db54,
+    0xb8c77dc7, 0xdda04681, 0x72090b4b, 0x176e300d, 0x8b37eb09,
+    0xee50d04f, 0x41f99d85, 0x249ea6c3, 0xc5da0050, 0xa0bd3b16,
+    0x0f1476dc, 0x6a734d9a, 0x16ec3dbb, 0x738b06fd, 0xdc224b37,
+    0xb9457071, 0x5801d6e2, 0x3d66eda4, 0x92cfa06e, 0xf7a89b28,
+    0x710d1027, 0x146a2b61, 0xbbc366ab, 0xdea45ded, 0x3fe0fb7e,
+    0x5a87c038, 0xf52e8df2, 0x9049b6b4, 0xecd6c695, 0x89b1fdd3,
+    0x2618b019, 0x437f8b5f, 0xa23b2dcc, 0xc75c168a, 0x68f55b40,
+    0x0d926006, 0x91cbbb02, 0xf4ac8044, 0x5b05cd8e, 0x3e62f6c8,
+    0xdf26505b, 0xba416b1d, 0x15e826d7, 0x708f1d91, 0x0c106db0,
+    0x697756f6, 0xc6de1b3c, 0xa3b9207a, 0x42fd86e9, 0x279abdaf,
+    0x8833f065, 0xed54cb23, 0x5e09e03a, 0x3b6edb7c, 0x94c796b6,
+    0xf1a0adf0, 0x10e40b63, 0x75833025, 0xda2a7def, 0xbf4d46a9,
+    0xc3d23688, 0xa6b50dce, 0x091c4004, 0x6c7b7b42, 0x8d3fddd1,
+    0xe858e697, 0x47f1ab5d, 0x2296901b, 0xbecf4b1f, 0xdba87059,
+    0x74013d93, 0x116606d5, 0xf022a046, 0x95459b00, 0x3aecd6ca,
+    0x5f8bed8c, 0x23149dad, 0x4673a6eb, 0xe9daeb21, 0x8cbdd067,
+    0x6df976f4, 0x089e4db2, 0xa7370078, 0xc2503b3e, 0x44f5b031,
+    0x21928b77, 0x8e3bc6bd, 0xeb5cfdfb, 0x0a185b68, 0x6f7f602e,
+    0xc0d62de4, 0xa5b116a2, 0xd92e6683, 0xbc495dc5, 0x13e0100f,
+    0x76872b49, 0x97c38dda, 0xf2a4b69c, 0x5d0dfb56, 0x386ac010,
+    0xa4331b14, 0xc1542052, 0x6efd6d98, 0x0b9a56de, 0xeadef04d,
+    0x8fb9cb0b, 0x201086c1, 0x4577bd87, 0x39e8cda6, 0x5c8ff6e0,
+    0xf326bb2a, 0x9641806c, 0x770526ff, 0x12621db9, 0xbdcb5073,
+    0xd8ac6b35},
+   {0x00000000, 0xd7e28058, 0x74b406f1, 0xa35686a9, 0xe9680de2,
+    0x3e8a8dba, 0x9ddc0b13, 0x4a3e8b4b, 0x09a11d85, 0xde439ddd,
+    0x7d151b74, 0xaaf79b2c, 0xe0c91067, 0x372b903f, 0x947d1696,
+    0x439f96ce, 0x13423b0a, 0xc4a0bb52, 0x67f63dfb, 0xb014bda3,
+    0xfa2a36e8, 0x2dc8b6b0, 0x8e9e3019, 0x597cb041, 0x1ae3268f,
+    0xcd01a6d7, 0x6e57207e, 0xb9b5a026, 0xf38b2b6d, 0x2469ab35,
+    0x873f2d9c, 0x50ddadc4, 0x26847614, 0xf166f64c, 0x523070e5,
+    0x85d2f0bd, 0xcfec7bf6, 0x180efbae, 0xbb587d07, 0x6cbafd5f,
+    0x2f256b91, 0xf8c7ebc9, 0x5b916d60, 0x8c73ed38, 0xc64d6673,
+    0x11afe62b, 0xb2f96082, 0x651be0da, 0x35c64d1e, 0xe224cd46,
+    0x41724bef, 0x9690cbb7, 0xdcae40fc, 0x0b4cc0a4, 0xa81a460d,
+    0x7ff8c655, 0x3c67509b, 0xeb85d0c3, 0x48d3566a, 0x9f31d632,
+    0xd50f5d79, 0x02eddd21, 0xa1bb5b88, 0x7659dbd0, 0x4d08ec28,
+    0x9aea6c70, 0x39bcead9, 0xee5e6a81, 0xa460e1ca, 0x73826192,
+    0xd0d4e73b, 0x07366763, 0x44a9f1ad, 0x934b71f5, 0x301df75c,
+    0xe7ff7704, 0xadc1fc4f, 0x7a237c17, 0xd975fabe, 0x0e977ae6,
+    0x5e4ad722, 0x89a8577a, 0x2afed1d3, 0xfd1c518b, 0xb722dac0,
+    0x60c05a98, 0xc396dc31, 0x14745c69, 0x57ebcaa7, 0x80094aff,
+    0x235fcc56, 0xf4bd4c0e, 0xbe83c745, 0x6961471d, 0xca37c1b4,
+    0x1dd541ec, 0x6b8c9a3c, 0xbc6e1a64, 0x1f389ccd, 0xc8da1c95,
+    0x82e497de, 0x55061786, 0xf650912f, 0x21b21177, 0x622d87b9,
+    0xb5cf07e1, 0x16998148, 0xc17b0110, 0x8b458a5b, 0x5ca70a03,
+    0xfff18caa, 0x28130cf2, 0x78cea136, 0xaf2c216e, 0x0c7aa7c7,
+    0xdb98279f, 0x91a6acd4, 0x46442c8c, 0xe512aa25, 0x32f02a7d,
+    0x716fbcb3, 0xa68d3ceb, 0x05dbba42, 0xd2393a1a, 0x9807b151,
+    0x4fe53109, 0xecb3b7a0, 0x3b5137f8, 0x9a11d850, 0x4df35808,
+    0xeea5dea1, 0x39475ef9, 0x7379d5b2, 0xa49b55ea, 0x07cdd343,
+    0xd02f531b, 0x93b0c5d5, 0x4452458d, 0xe704c324, 0x30e6437c,
+    0x7ad8c837, 0xad3a486f, 0x0e6ccec6, 0xd98e4e9e, 0x8953e35a,
+    0x5eb16302, 0xfde7e5ab, 0x2a0565f3, 0x603beeb8, 0xb7d96ee0,
+    0x148fe849, 0xc36d6811, 0x80f2fedf, 0x57107e87, 0xf446f82e,
+    0x23a47876, 0x699af33d, 0xbe787365, 0x1d2ef5cc, 0xcacc7594,
+    0xbc95ae44, 0x6b772e1c, 0xc821a8b5, 0x1fc328ed, 0x55fda3a6,
+    0x821f23fe, 0x2149a557, 0xf6ab250f, 0xb534b3c1, 0x62d63399,
+    0xc180b530, 0x16623568, 0x5c5cbe23, 0x8bbe3e7b, 0x28e8b8d2,
+    0xff0a388a, 0xafd7954e, 0x78351516, 0xdb6393bf, 0x0c8113e7,
+    0x46bf98ac, 0x915d18f4, 0x320b9e5d, 0xe5e91e05, 0xa67688cb,
+    0x71940893, 0xd2c28e3a, 0x05200e62, 0x4f1e8529, 0x98fc0571,
+    0x3baa83d8, 0xec480380, 0xd7193478, 0x00fbb420, 0xa3ad3289,
+    0x744fb2d1, 0x3e71399a, 0xe993b9c2, 0x4ac53f6b, 0x9d27bf33,
+    0xdeb829fd, 0x095aa9a5, 0xaa0c2f0c, 0x7deeaf54, 0x37d0241f,
+    0xe032a447, 0x436422ee, 0x9486a2b6, 0xc45b0f72, 0x13b98f2a,
+    0xb0ef0983, 0x670d89db, 0x2d330290, 0xfad182c8, 0x59870461,
+    0x8e658439, 0xcdfa12f7, 0x1a1892af, 0xb94e1406, 0x6eac945e,
+    0x24921f15, 0xf3709f4d, 0x502619e4, 0x87c499bc, 0xf19d426c,
+    0x267fc234, 0x8529449d, 0x52cbc4c5, 0x18f54f8e, 0xcf17cfd6,
+    0x6c41497f, 0xbba3c927, 0xf83c5fe9, 0x2fdedfb1, 0x8c885918,
+    0x5b6ad940, 0x1154520b, 0xc6b6d253, 0x65e054fa, 0xb202d4a2,
+    0xe2df7966, 0x353df93e, 0x966b7f97, 0x4189ffcf, 0x0bb77484,
+    0xdc55f4dc, 0x7f037275, 0xa8e1f22d, 0xeb7e64e3, 0x3c9ce4bb,
+    0x9fca6212, 0x4828e24a, 0x02166901, 0xd5f4e959, 0x76a26ff0,
+    0xa140efa8},
+   {0x00000000, 0xef52b6e1, 0x05d46b83, 0xea86dd62, 0x0ba8d706,
+    0xe4fa61e7, 0x0e7cbc85, 0xe12e0a64, 0x1751ae0c, 0xf80318ed,
+    0x1285c58f, 0xfdd7736e, 0x1cf9790a, 0xf3abcfeb, 0x192d1289,
+    0xf67fa468, 0x2ea35c18, 0xc1f1eaf9, 0x2b77379b, 0xc425817a,
+    0x250b8b1e, 0xca593dff, 0x20dfe09d, 0xcf8d567c, 0x39f2f214,
+    0xd6a044f5, 0x3c269997, 0xd3742f76, 0x325a2512, 0xdd0893f3,
+    0x378e4e91, 0xd8dcf870, 0x5d46b830, 0xb2140ed1, 0x5892d3b3,
+    0xb7c06552, 0x56ee6f36, 0xb9bcd9d7, 0x533a04b5, 0xbc68b254,
+    0x4a17163c, 0xa545a0dd, 0x4fc37dbf, 0xa091cb5e, 0x41bfc13a,
+    0xaeed77db, 0x446baab9, 0xab391c58, 0x73e5e428, 0x9cb752c9,
+    0x76318fab, 0x9963394a, 0x784d332e, 0x971f85cf, 0x7d9958ad,
+    0x92cbee4c, 0x64b44a24, 0x8be6fcc5, 0x616021a7, 0x8e329746,
+    0x6f1c9d22, 0x804e2bc3, 0x6ac8f6a1, 0x859a4040, 0xba8d7060,
+    0x55dfc681, 0xbf591be3, 0x500bad02, 0xb125a766, 0x5e771187,
+    0xb4f1cce5, 0x5ba37a04, 0xaddcde6c, 0x428e688d, 0xa808b5ef,
+    0x475a030e, 0xa674096a, 0x4926bf8b, 0xa3a062e9, 0x4cf2d408,
+    0x942e2c78, 0x7b7c9a99, 0x91fa47fb, 0x7ea8f11a, 0x9f86fb7e,
+    0x70d44d9f, 0x9a5290fd, 0x7500261c, 0x837f8274, 0x6c2d3495,
+    0x86abe9f7, 0x69f95f16, 0x88d75572, 0x6785e393, 0x8d033ef1,
+    0x62518810, 0xe7cbc850, 0x08997eb1, 0xe21fa3d3, 0x0d4d1532,
+    0xec631f56, 0x0331a9b7, 0xe9b774d5, 0x06e5c234, 0xf09a665c,
+    0x1fc8d0bd, 0xf54e0ddf, 0x1a1cbb3e, 0xfb32b15a, 0x146007bb,
+    0xfee6dad9, 0x11b46c38, 0xc9689448, 0x263a22a9, 0xccbcffcb,
+    0x23ee492a, 0xc2c0434e, 0x2d92f5af, 0xc71428cd, 0x28469e2c,
+    0xde393a44, 0x316b8ca5, 0xdbed51c7, 0x34bfe726, 0xd591ed42,
+    0x3ac35ba3, 0xd04586c1, 0x3f173020, 0xae6be681, 0x41395060,
+    0xabbf8d02, 0x44ed3be3, 0xa5c33187, 0x4a918766, 0xa0175a04,
+    0x4f45ece5, 0xb93a488d, 0x5668fe6c, 0xbcee230e, 0x53bc95ef,
+    0xb2929f8b, 0x5dc0296a, 0xb746f408, 0x581442e9, 0x80c8ba99,
+    0x6f9a0c78, 0x851cd11a, 0x6a4e67fb, 0x8b606d9f, 0x6432db7e,
+    0x8eb4061c, 0x61e6b0fd, 0x97991495, 0x78cba274, 0x924d7f16,
+    0x7d1fc9f7, 0x9c31c393, 0x73637572, 0x99e5a810, 0x76b71ef1,
+    0xf32d5eb1, 0x1c7fe850, 0xf6f93532, 0x19ab83d3, 0xf88589b7,
+    0x17d73f56, 0xfd51e234, 0x120354d5, 0xe47cf0bd, 0x0b2e465c,
+    0xe1a89b3e, 0x0efa2ddf, 0xefd427bb, 0x0086915a, 0xea004c38,
+    0x0552fad9, 0xdd8e02a9, 0x32dcb448, 0xd85a692a, 0x3708dfcb,
+    0xd626d5af, 0x3974634e, 0xd3f2be2c, 0x3ca008cd, 0xcadfaca5,
+    0x258d1a44, 0xcf0bc726, 0x205971c7, 0xc1777ba3, 0x2e25cd42,
+    0xc4a31020, 0x2bf1a6c1, 0x14e696e1, 0xfbb42000, 0x1132fd62,
+    0xfe604b83, 0x1f4e41e7, 0xf01cf706, 0x1a9a2a64, 0xf5c89c85,
+    0x03b738ed, 0xece58e0c, 0x0663536e, 0xe931e58f, 0x081fefeb,
+    0xe74d590a, 0x0dcb8468, 0xe2993289, 0x3a45caf9, 0xd5177c18,
+    0x3f91a17a, 0xd0c3179b, 0x31ed1dff, 0xdebfab1e, 0x3439767c,
+    0xdb6bc09d, 0x2d1464f5, 0xc246d214, 0x28c00f76, 0xc792b997,
+    0x26bcb3f3, 0xc9ee0512, 0x2368d870, 0xcc3a6e91, 0x49a02ed1,
+    0xa6f29830, 0x4c744552, 0xa326f3b3, 0x4208f9d7, 0xad5a4f36,
+    0x47dc9254, 0xa88e24b5, 0x5ef180dd, 0xb1a3363c, 0x5b25eb5e,
+    0xb4775dbf, 0x555957db, 0xba0be13a, 0x508d3c58, 0xbfdf8ab9,
+    0x670372c9, 0x8851c428, 0x62d7194a, 0x8d85afab, 0x6caba5cf,
+    0x83f9132e, 0x697fce4c, 0x862d78ad, 0x7052dcc5, 0x9f006a24,
+    0x7586b746, 0x9ad401a7, 0x7bfa0bc3, 0x94a8bd22, 0x7e2e6040,
+    0x917cd6a1},
+   {0x00000000, 0x87a6cb43, 0xd43c90c7, 0x539a5b84, 0x730827cf,
+    0xf4aeec8c, 0xa734b708, 0x20927c4b, 0xe6104f9e, 0x61b684dd,
+    0x322cdf59, 0xb58a141a, 0x95186851, 0x12bea312, 0x4124f896,
+    0xc68233d5, 0x1751997d, 0x90f7523e, 0xc36d09ba, 0x44cbc2f9,
+    0x6459beb2, 0xe3ff75f1, 0xb0652e75, 0x37c3e536, 0xf141d6e3,
+    0x76e71da0, 0x257d4624, 0xa2db8d67, 0x8249f12c, 0x05ef3a6f,
+    0x567561eb, 0xd1d3aaa8, 0x2ea332fa, 0xa905f9b9, 0xfa9fa23d,
+    0x7d39697e, 0x5dab1535, 0xda0dde76, 0x899785f2, 0x0e314eb1,
+    0xc8b37d64, 0x4f15b627, 0x1c8feda3, 0x9b2926e0, 0xbbbb5aab,
+    0x3c1d91e8, 0x6f87ca6c, 0xe821012f, 0x39f2ab87, 0xbe5460c4,
+    0xedce3b40, 0x6a68f003, 0x4afa8c48, 0xcd5c470b, 0x9ec61c8f,
+    0x1960d7cc, 0xdfe2e419, 0x58442f5a, 0x0bde74de, 0x8c78bf9d,
+    0xaceac3d6, 0x2b4c0895, 0x78d65311, 0xff709852, 0x5d4665f4,
+    0xdae0aeb7, 0x897af533, 0x0edc3e70, 0x2e4e423b, 0xa9e88978,
+    0xfa72d2fc, 0x7dd419bf, 0xbb562a6a, 0x3cf0e129, 0x6f6abaad,
+    0xe8cc71ee, 0xc85e0da5, 0x4ff8c6e6, 0x1c629d62, 0x9bc45621,
+    0x4a17fc89, 0xcdb137ca, 0x9e2b6c4e, 0x198da70d, 0x391fdb46,
+    0xbeb91005, 0xed234b81, 0x6a8580c2, 0xac07b317, 0x2ba17854,
+    0x783b23d0, 0xff9de893, 0xdf0f94d8, 0x58a95f9b, 0x0b33041f,
+    0x8c95cf5c, 0x73e5570e, 0xf4439c4d, 0xa7d9c7c9, 0x207f0c8a,
+    0x00ed70c1, 0x874bbb82, 0xd4d1e006, 0x53772b45, 0x95f51890,
+    0x1253d3d3, 0x41c98857, 0xc66f4314, 0xe6fd3f5f, 0x615bf41c,
+    0x32c1af98, 0xb56764db, 0x64b4ce73, 0xe3120530, 0xb0885eb4,
+    0x372e95f7, 0x17bce9bc, 0x901a22ff, 0xc380797b, 0x4426b238,
+    0x82a481ed, 0x05024aae, 0x5698112a, 0xd13eda69, 0xf1aca622,
+    0x760a6d61, 0x259036e5, 0xa236fda6, 0xba8ccbe8, 0x3d2a00ab,
+    0x6eb05b2f, 0xe916906c, 0xc984ec27, 0x4e222764, 0x1db87ce0,
+    0x9a1eb7a3, 0x5c9c8476, 0xdb3a4f35, 0x88a014b1, 0x0f06dff2,
+    0x2f94a3b9, 0xa83268fa, 0xfba8337e, 0x7c0ef83d, 0xaddd5295,
+    0x2a7b99d6, 0x79e1c252, 0xfe470911, 0xded5755a, 0x5973be19,
+    0x0ae9e59d, 0x8d4f2ede, 0x4bcd1d0b, 0xcc6bd648, 0x9ff18dcc,
+    0x1857468f, 0x38c53ac4, 0xbf63f187, 0xecf9aa03, 0x6b5f6140,
+    0x942ff912, 0x13893251, 0x401369d5, 0xc7b5a296, 0xe727dedd,
+    0x6081159e, 0x331b4e1a, 0xb4bd8559, 0x723fb68c, 0xf5997dcf,
+    0xa603264b, 0x21a5ed08, 0x01379143, 0x86915a00, 0xd50b0184,
+    0x52adcac7, 0x837e606f, 0x04d8ab2c, 0x5742f0a8, 0xd0e43beb,
+    0xf07647a0, 0x77d08ce3, 0x244ad767, 0xa3ec1c24, 0x656e2ff1,
+    0xe2c8e4b2, 0xb152bf36, 0x36f47475, 0x1666083e, 0x91c0c37d,
+    0xc25a98f9, 0x45fc53ba, 0xe7caae1c, 0x606c655f, 0x33f63edb,
+    0xb450f598, 0x94c289d3, 0x13644290, 0x40fe1914, 0xc758d257,
+    0x01dae182, 0x867c2ac1, 0xd5e67145, 0x5240ba06, 0x72d2c64d,
+    0xf5740d0e, 0xa6ee568a, 0x21489dc9, 0xf09b3761, 0x773dfc22,
+    0x24a7a7a6, 0xa3016ce5, 0x839310ae, 0x0435dbed, 0x57af8069,
+    0xd0094b2a, 0x168b78ff, 0x912db3bc, 0xc2b7e838, 0x4511237b,
+    0x65835f30, 0xe2259473, 0xb1bfcff7, 0x361904b4, 0xc9699ce6,
+    0x4ecf57a5, 0x1d550c21, 0x9af3c762, 0xba61bb29, 0x3dc7706a,
+    0x6e5d2bee, 0xe9fbe0ad, 0x2f79d378, 0xa8df183b, 0xfb4543bf,
+    0x7ce388fc, 0x5c71f4b7, 0xdbd73ff4, 0x884d6470, 0x0febaf33,
+    0xde38059b, 0x599eced8, 0x0a04955c, 0x8da25e1f, 0xad302254,
+    0x2a96e917, 0x790cb293, 0xfeaa79d0, 0x38284a05, 0xbf8e8146,
+    0xec14dac2, 0x6bb21181, 0x4b206dca, 0xcc86a689, 0x9f1cfd0d,
+    0x18ba364e}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x00000000, 0x43cba687, 0xc7903cd4, 0x845b9a53, 0xcf270873,
+    0x8cecaef4, 0x08b734a7, 0x4b7c9220, 0x9e4f10e6, 0xdd84b661,
+    0x59df2c32, 0x1a148ab5, 0x51681895, 0x12a3be12, 0x96f82441,
+    0xd53382c6, 0x7d995117, 0x3e52f790, 0xba096dc3, 0xf9c2cb44,
+    0xb2be5964, 0xf175ffe3, 0x752e65b0, 0x36e5c337, 0xe3d641f1,
+    0xa01de776, 0x24467d25, 0x678ddba2, 0x2cf14982, 0x6f3aef05,
+    0xeb617556, 0xa8aad3d1, 0xfa32a32e, 0xb9f905a9, 0x3da29ffa,
+    0x7e69397d, 0x3515ab5d, 0x76de0dda, 0xf2859789, 0xb14e310e,
+    0x647db3c8, 0x27b6154f, 0xa3ed8f1c, 0xe026299b, 0xab5abbbb,
+    0xe8911d3c, 0x6cca876f, 0x2f0121e8, 0x87abf239, 0xc46054be,
+    0x403bceed, 0x03f0686a, 0x488cfa4a, 0x0b475ccd, 0x8f1cc69e,
+    0xccd76019, 0x19e4e2df, 0x5a2f4458, 0xde74de0b, 0x9dbf788c,
+    0xd6c3eaac, 0x95084c2b, 0x1153d678, 0x529870ff, 0xf465465d,
+    0xb7aee0da, 0x33f57a89, 0x703edc0e, 0x3b424e2e, 0x7889e8a9,
+    0xfcd272fa, 0xbf19d47d, 0x6a2a56bb, 0x29e1f03c, 0xadba6a6f,
+    0xee71cce8, 0xa50d5ec8, 0xe6c6f84f, 0x629d621c, 0x2156c49b,
+    0x89fc174a, 0xca37b1cd, 0x4e6c2b9e, 0x0da78d19, 0x46db1f39,
+    0x0510b9be, 0x814b23ed, 0xc280856a, 0x17b307ac, 0x5478a12b,
+    0xd0233b78, 0x93e89dff, 0xd8940fdf, 0x9b5fa958, 0x1f04330b,
+    0x5ccf958c, 0x0e57e573, 0x4d9c43f4, 0xc9c7d9a7, 0x8a0c7f20,
+    0xc170ed00, 0x82bb4b87, 0x06e0d1d4, 0x452b7753, 0x9018f595,
+    0xd3d35312, 0x5788c941, 0x14436fc6, 0x5f3ffde6, 0x1cf45b61,
+    0x98afc132, 0xdb6467b5, 0x73ceb464, 0x300512e3, 0xb45e88b0,
+    0xf7952e37, 0xbce9bc17, 0xff221a90, 0x7b7980c3, 0x38b22644,
+    0xed81a482, 0xae4a0205, 0x2a119856, 0x69da3ed1, 0x22a6acf1,
+    0x616d0a76, 0xe5369025, 0xa6fd36a2, 0xe8cb8cba, 0xab002a3d,
+    0x2f5bb06e, 0x6c9016e9, 0x27ec84c9, 0x6427224e, 0xe07cb81d,
+    0xa3b71e9a, 0x76849c5c, 0x354f3adb, 0xb114a088, 0xf2df060f,
+    0xb9a3942f, 0xfa6832a8, 0x7e33a8fb, 0x3df80e7c, 0x9552ddad,
+    0xd6997b2a, 0x52c2e179, 0x110947fe, 0x5a75d5de, 0x19be7359,
+    0x9de5e90a, 0xde2e4f8d, 0x0b1dcd4b, 0x48d66bcc, 0xcc8df19f,
+    0x8f465718, 0xc43ac538, 0x87f163bf, 0x03aaf9ec, 0x40615f6b,
+    0x12f92f94, 0x51328913, 0xd5691340, 0x96a2b5c7, 0xddde27e7,
+    0x9e158160, 0x1a4e1b33, 0x5985bdb4, 0x8cb63f72, 0xcf7d99f5,
+    0x4b2603a6, 0x08eda521, 0x43913701, 0x005a9186, 0x84010bd5,
+    0xc7caad52, 0x6f607e83, 0x2cabd804, 0xa8f04257, 0xeb3be4d0,
+    0xa04776f0, 0xe38cd077, 0x67d74a24, 0x241ceca3, 0xf12f6e65,
+    0xb2e4c8e2, 0x36bf52b1, 0x7574f436, 0x3e086616, 0x7dc3c091,
+    0xf9985ac2, 0xba53fc45, 0x1caecae7, 0x5f656c60, 0xdb3ef633,
+    0x98f550b4, 0xd389c294, 0x90426413, 0x1419fe40, 0x57d258c7,
+    0x82e1da01, 0xc12a7c86, 0x4571e6d5, 0x06ba4052, 0x4dc6d272,
+    0x0e0d74f5, 0x8a56eea6, 0xc99d4821, 0x61379bf0, 0x22fc3d77,
+    0xa6a7a724, 0xe56c01a3, 0xae109383, 0xeddb3504, 0x6980af57,
+    0x2a4b09d0, 0xff788b16, 0xbcb32d91, 0x38e8b7c2, 0x7b231145,
+    0x305f8365, 0x739425e2, 0xf7cfbfb1, 0xb4041936, 0xe69c69c9,
+    0xa557cf4e, 0x210c551d, 0x62c7f39a, 0x29bb61ba, 0x6a70c73d,
+    0xee2b5d6e, 0xade0fbe9, 0x78d3792f, 0x3b18dfa8, 0xbf4345fb,
+    0xfc88e37c, 0xb7f4715c, 0xf43fd7db, 0x70644d88, 0x33afeb0f,
+    0x9b0538de, 0xd8ce9e59, 0x5c95040a, 0x1f5ea28d, 0x542230ad,
+    0x17e9962a, 0x93b20c79, 0xd079aafe, 0x054a2838, 0x46818ebf,
+    0xc2da14ec, 0x8111b26b, 0xca6d204b, 0x89a686cc, 0x0dfd1c9f,
+    0x4e36ba18},
+   {0x00000000, 0xe1b652ef, 0x836bd405, 0x62dd86ea, 0x06d7a80b,
+    0xe761fae4, 0x85bc7c0e, 0x640a2ee1, 0x0cae5117, 0xed1803f8,
+    0x8fc58512, 0x6e73d7fd, 0x0a79f91c, 0xebcfabf3, 0x89122d19,
+    0x68a47ff6, 0x185ca32e, 0xf9eaf1c1, 0x9b37772b, 0x7a8125c4,
+    0x1e8b0b25, 0xff3d59ca, 0x9de0df20, 0x7c568dcf, 0x14f2f239,
+    0xf544a0d6, 0x9799263c, 0x762f74d3, 0x12255a32, 0xf39308dd,
+    0x914e8e37, 0x70f8dcd8, 0x30b8465d, 0xd10e14b2, 0xb3d39258,
+    0x5265c0b7, 0x366fee56, 0xd7d9bcb9, 0xb5043a53, 0x54b268bc,
+    0x3c16174a, 0xdda045a5, 0xbf7dc34f, 0x5ecb91a0, 0x3ac1bf41,
+    0xdb77edae, 0xb9aa6b44, 0x581c39ab, 0x28e4e573, 0xc952b79c,
+    0xab8f3176, 0x4a396399, 0x2e334d78, 0xcf851f97, 0xad58997d,
+    0x4ceecb92, 0x244ab464, 0xc5fce68b, 0xa7216061, 0x4697328e,
+    0x229d1c6f, 0xc32b4e80, 0xa1f6c86a, 0x40409a85, 0x60708dba,
+    0x81c6df55, 0xe31b59bf, 0x02ad0b50, 0x66a725b1, 0x8711775e,
+    0xe5ccf1b4, 0x047aa35b, 0x6cdedcad, 0x8d688e42, 0xefb508a8,
+    0x0e035a47, 0x6a0974a6, 0x8bbf2649, 0xe962a0a3, 0x08d4f24c,
+    0x782c2e94, 0x999a7c7b, 0xfb47fa91, 0x1af1a87e, 0x7efb869f,
+    0x9f4dd470, 0xfd90529a, 0x1c260075, 0x74827f83, 0x95342d6c,
+    0xf7e9ab86, 0x165ff969, 0x7255d788, 0x93e38567, 0xf13e038d,
+    0x10885162, 0x50c8cbe7, 0xb17e9908, 0xd3a31fe2, 0x32154d0d,
+    0x561f63ec, 0xb7a93103, 0xd574b7e9, 0x34c2e506, 0x5c669af0,
+    0xbdd0c81f, 0xdf0d4ef5, 0x3ebb1c1a, 0x5ab132fb, 0xbb076014,
+    0xd9dae6fe, 0x386cb411, 0x489468c9, 0xa9223a26, 0xcbffbccc,
+    0x2a49ee23, 0x4e43c0c2, 0xaff5922d, 0xcd2814c7, 0x2c9e4628,
+    0x443a39de, 0xa58c6b31, 0xc751eddb, 0x26e7bf34, 0x42ed91d5,
+    0xa35bc33a, 0xc18645d0, 0x2030173f, 0x81e66bae, 0x60503941,
+    0x028dbfab, 0xe33bed44, 0x8731c3a5, 0x6687914a, 0x045a17a0,
+    0xe5ec454f, 0x8d483ab9, 0x6cfe6856, 0x0e23eebc, 0xef95bc53,
+    0x8b9f92b2, 0x6a29c05d, 0x08f446b7, 0xe9421458, 0x99bac880,
+    0x780c9a6f, 0x1ad11c85, 0xfb674e6a, 0x9f6d608b, 0x7edb3264,
+    0x1c06b48e, 0xfdb0e661, 0x95149997, 0x74a2cb78, 0x167f4d92,
+    0xf7c91f7d, 0x93c3319c, 0x72756373, 0x10a8e599, 0xf11eb776,
+    0xb15e2df3, 0x50e87f1c, 0x3235f9f6, 0xd383ab19, 0xb78985f8,
+    0x563fd717, 0x34e251fd, 0xd5540312, 0xbdf07ce4, 0x5c462e0b,
+    0x3e9ba8e1, 0xdf2dfa0e, 0xbb27d4ef, 0x5a918600, 0x384c00ea,
+    0xd9fa5205, 0xa9028edd, 0x48b4dc32, 0x2a695ad8, 0xcbdf0837,
+    0xafd526d6, 0x4e637439, 0x2cbef2d3, 0xcd08a03c, 0xa5acdfca,
+    0x441a8d25, 0x26c70bcf, 0xc7715920, 0xa37b77c1, 0x42cd252e,
+    0x2010a3c4, 0xc1a6f12b, 0xe196e614, 0x0020b4fb, 0x62fd3211,
+    0x834b60fe, 0xe7414e1f, 0x06f71cf0, 0x642a9a1a, 0x859cc8f5,
+    0xed38b703, 0x0c8ee5ec, 0x6e536306, 0x8fe531e9, 0xebef1f08,
+    0x0a594de7, 0x6884cb0d, 0x893299e2, 0xf9ca453a, 0x187c17d5,
+    0x7aa1913f, 0x9b17c3d0, 0xff1ded31, 0x1eabbfde, 0x7c763934,
+    0x9dc06bdb, 0xf564142d, 0x14d246c2, 0x760fc028, 0x97b992c7,
+    0xf3b3bc26, 0x1205eec9, 0x70d86823, 0x916e3acc, 0xd12ea049,
+    0x3098f2a6, 0x5245744c, 0xb3f326a3, 0xd7f90842, 0x364f5aad,
+    0x5492dc47, 0xb5248ea8, 0xdd80f15e, 0x3c36a3b1, 0x5eeb255b,
+    0xbf5d77b4, 0xdb575955, 0x3ae10bba, 0x583c8d50, 0xb98adfbf,
+    0xc9720367, 0x28c45188, 0x4a19d762, 0xabaf858d, 0xcfa5ab6c,
+    0x2e13f983, 0x4cce7f69, 0xad782d86, 0xc5dc5270, 0x246a009f,
+    0x46b78675, 0xa701d49a, 0xc30bfa7b, 0x22bda894, 0x40602e7e,
+    0xa1d67c91},
+   {0x00000000, 0x5880e2d7, 0xf106b474, 0xa98656a3, 0xe20d68e9,
+    0xba8d8a3e, 0x130bdc9d, 0x4b8b3e4a, 0x851da109, 0xdd9d43de,
+    0x741b157d, 0x2c9bf7aa, 0x6710c9e0, 0x3f902b37, 0x96167d94,
+    0xce969f43, 0x0a3b4213, 0x52bba0c4, 0xfb3df667, 0xa3bd14b0,
+    0xe8362afa, 0xb0b6c82d, 0x19309e8e, 0x41b07c59, 0x8f26e31a,
+    0xd7a601cd, 0x7e20576e, 0x26a0b5b9, 0x6d2b8bf3, 0x35ab6924,
+    0x9c2d3f87, 0xc4addd50, 0x14768426, 0x4cf666f1, 0xe5703052,
+    0xbdf0d285, 0xf67beccf, 0xaefb0e18, 0x077d58bb, 0x5ffdba6c,
+    0x916b252f, 0xc9ebc7f8, 0x606d915b, 0x38ed738c, 0x73664dc6,
+    0x2be6af11, 0x8260f9b2, 0xdae01b65, 0x1e4dc635, 0x46cd24e2,
+    0xef4b7241, 0xb7cb9096, 0xfc40aedc, 0xa4c04c0b, 0x0d461aa8,
+    0x55c6f87f, 0x9b50673c, 0xc3d085eb, 0x6a56d348, 0x32d6319f,
+    0x795d0fd5, 0x21dded02, 0x885bbba1, 0xd0db5976, 0x28ec084d,
+    0x706cea9a, 0xd9eabc39, 0x816a5eee, 0xcae160a4, 0x92618273,
+    0x3be7d4d0, 0x63673607, 0xadf1a944, 0xf5714b93, 0x5cf71d30,
+    0x0477ffe7, 0x4ffcc1ad, 0x177c237a, 0xbefa75d9, 0xe67a970e,
+    0x22d74a5e, 0x7a57a889, 0xd3d1fe2a, 0x8b511cfd, 0xc0da22b7,
+    0x985ac060, 0x31dc96c3, 0x695c7414, 0xa7caeb57, 0xff4a0980,
+    0x56cc5f23, 0x0e4cbdf4, 0x45c783be, 0x1d476169, 0xb4c137ca,
+    0xec41d51d, 0x3c9a8c6b, 0x641a6ebc, 0xcd9c381f, 0x951cdac8,
+    0xde97e482, 0x86170655, 0x2f9150f6, 0x7711b221, 0xb9872d62,
+    0xe107cfb5, 0x48819916, 0x10017bc1, 0x5b8a458b, 0x030aa75c,
+    0xaa8cf1ff, 0xf20c1328, 0x36a1ce78, 0x6e212caf, 0xc7a77a0c,
+    0x9f2798db, 0xd4aca691, 0x8c2c4446, 0x25aa12e5, 0x7d2af032,
+    0xb3bc6f71, 0xeb3c8da6, 0x42badb05, 0x1a3a39d2, 0x51b10798,
+    0x0931e54f, 0xa0b7b3ec, 0xf837513b, 0x50d8119a, 0x0858f34d,
+    0xa1dea5ee, 0xf95e4739, 0xb2d57973, 0xea559ba4, 0x43d3cd07,
+    0x1b532fd0, 0xd5c5b093, 0x8d455244, 0x24c304e7, 0x7c43e630,
+    0x37c8d87a, 0x6f483aad, 0xc6ce6c0e, 0x9e4e8ed9, 0x5ae35389,
+    0x0263b15e, 0xabe5e7fd, 0xf365052a, 0xb8ee3b60, 0xe06ed9b7,
+    0x49e88f14, 0x11686dc3, 0xdffef280, 0x877e1057, 0x2ef846f4,
+    0x7678a423, 0x3df39a69, 0x657378be, 0xccf52e1d, 0x9475ccca,
+    0x44ae95bc, 0x1c2e776b, 0xb5a821c8, 0xed28c31f, 0xa6a3fd55,
+    0xfe231f82, 0x57a54921, 0x0f25abf6, 0xc1b334b5, 0x9933d662,
+    0x30b580c1, 0x68356216, 0x23be5c5c, 0x7b3ebe8b, 0xd2b8e828,
+    0x8a380aff, 0x4e95d7af, 0x16153578, 0xbf9363db, 0xe713810c,
+    0xac98bf46, 0xf4185d91, 0x5d9e0b32, 0x051ee9e5, 0xcb8876a6,
+    0x93089471, 0x3a8ec2d2, 0x620e2005, 0x29851e4f, 0x7105fc98,
+    0xd883aa3b, 0x800348ec, 0x783419d7, 0x20b4fb00, 0x8932ada3,
+    0xd1b24f74, 0x9a39713e, 0xc2b993e9, 0x6b3fc54a, 0x33bf279d,
+    0xfd29b8de, 0xa5a95a09, 0x0c2f0caa, 0x54afee7d, 0x1f24d037,
+    0x47a432e0, 0xee226443, 0xb6a28694, 0x720f5bc4, 0x2a8fb913,
+    0x8309efb0, 0xdb890d67, 0x9002332d, 0xc882d1fa, 0x61048759,
+    0x3984658e, 0xf712facd, 0xaf92181a, 0x06144eb9, 0x5e94ac6e,
+    0x151f9224, 0x4d9f70f3, 0xe4192650, 0xbc99c487, 0x6c429df1,
+    0x34c27f26, 0x9d442985, 0xc5c4cb52, 0x8e4ff518, 0xd6cf17cf,
+    0x7f49416c, 0x27c9a3bb, 0xe95f3cf8, 0xb1dfde2f, 0x1859888c,
+    0x40d96a5b, 0x0b525411, 0x53d2b6c6, 0xfa54e065, 0xa2d402b2,
+    0x6679dfe2, 0x3ef93d35, 0x977f6b96, 0xcfff8941, 0x8474b70b,
+    0xdcf455dc, 0x7572037f, 0x2df2e1a8, 0xe3647eeb, 0xbbe49c3c,
+    0x1262ca9f, 0x4ae22848, 0x01691602, 0x59e9f4d5, 0xf06fa276,
+    0xa8ef40a1},
+   {0x00000000, 0x463b6765, 0x8c76ceca, 0xca4da9af, 0x59ebed4e,
+    0x1fd08a2b, 0xd59d2384, 0x93a644e1, 0xb2d6db9d, 0xf4edbcf8,
+    0x3ea01557, 0x789b7232, 0xeb3d36d3, 0xad0651b6, 0x674bf819,
+    0x21709f7c, 0x25abc6e0, 0x6390a185, 0xa9dd082a, 0xefe66f4f,
+    0x7c402bae, 0x3a7b4ccb, 0xf036e564, 0xb60d8201, 0x977d1d7d,
+    0xd1467a18, 0x1b0bd3b7, 0x5d30b4d2, 0xce96f033, 0x88ad9756,
+    0x42e03ef9, 0x04db599c, 0x0b50fc1a, 0x4d6b9b7f, 0x872632d0,
+    0xc11d55b5, 0x52bb1154, 0x14807631, 0xdecddf9e, 0x98f6b8fb,
+    0xb9862787, 0xffbd40e2, 0x35f0e94d, 0x73cb8e28, 0xe06dcac9,
+    0xa656adac, 0x6c1b0403, 0x2a206366, 0x2efb3afa, 0x68c05d9f,
+    0xa28df430, 0xe4b69355, 0x7710d7b4, 0x312bb0d1, 0xfb66197e,
+    0xbd5d7e1b, 0x9c2de167, 0xda168602, 0x105b2fad, 0x566048c8,
+    0xc5c60c29, 0x83fd6b4c, 0x49b0c2e3, 0x0f8ba586, 0x16a0f835,
+    0x509b9f50, 0x9ad636ff, 0xdced519a, 0x4f4b157b, 0x0970721e,
+    0xc33ddbb1, 0x8506bcd4, 0xa47623a8, 0xe24d44cd, 0x2800ed62,
+    0x6e3b8a07, 0xfd9dcee6, 0xbba6a983, 0x71eb002c, 0x37d06749,
+    0x330b3ed5, 0x753059b0, 0xbf7df01f, 0xf946977a, 0x6ae0d39b,
+    0x2cdbb4fe, 0xe6961d51, 0xa0ad7a34, 0x81dde548, 0xc7e6822d,
+    0x0dab2b82, 0x4b904ce7, 0xd8360806, 0x9e0d6f63, 0x5440c6cc,
+    0x127ba1a9, 0x1df0042f, 0x5bcb634a, 0x9186cae5, 0xd7bdad80,
+    0x441be961, 0x02208e04, 0xc86d27ab, 0x8e5640ce, 0xaf26dfb2,
+    0xe91db8d7, 0x23501178, 0x656b761d, 0xf6cd32fc, 0xb0f65599,
+    0x7abbfc36, 0x3c809b53, 0x385bc2cf, 0x7e60a5aa, 0xb42d0c05,
+    0xf2166b60, 0x61b02f81, 0x278b48e4, 0xedc6e14b, 0xabfd862e,
+    0x8a8d1952, 0xccb67e37, 0x06fbd798, 0x40c0b0fd, 0xd366f41c,
+    0x955d9379, 0x5f103ad6, 0x192b5db3, 0x2c40f16b, 0x6a7b960e,
+    0xa0363fa1, 0xe60d58c4, 0x75ab1c25, 0x33907b40, 0xf9ddd2ef,
+    0xbfe6b58a, 0x9e962af6, 0xd8ad4d93, 0x12e0e43c, 0x54db8359,
+    0xc77dc7b8, 0x8146a0dd, 0x4b0b0972, 0x0d306e17, 0x09eb378b,
+    0x4fd050ee, 0x859df941, 0xc3a69e24, 0x5000dac5, 0x163bbda0,
+    0xdc76140f, 0x9a4d736a, 0xbb3dec16, 0xfd068b73, 0x374b22dc,
+    0x717045b9, 0xe2d60158, 0xa4ed663d, 0x6ea0cf92, 0x289ba8f7,
+    0x27100d71, 0x612b6a14, 0xab66c3bb, 0xed5da4de, 0x7efbe03f,
+    0x38c0875a, 0xf28d2ef5, 0xb4b64990, 0x95c6d6ec, 0xd3fdb189,
+    0x19b01826, 0x5f8b7f43, 0xcc2d3ba2, 0x8a165cc7, 0x405bf568,
+    0x0660920d, 0x02bbcb91, 0x4480acf4, 0x8ecd055b, 0xc8f6623e,
+    0x5b5026df, 0x1d6b41ba, 0xd726e815, 0x911d8f70, 0xb06d100c,
+    0xf6567769, 0x3c1bdec6, 0x7a20b9a3, 0xe986fd42, 0xafbd9a27,
+    0x65f03388, 0x23cb54ed, 0x3ae0095e, 0x7cdb6e3b, 0xb696c794,
+    0xf0ada0f1, 0x630be410, 0x25308375, 0xef7d2ada, 0xa9464dbf,
+    0x8836d2c3, 0xce0db5a6, 0x04401c09, 0x427b7b6c, 0xd1dd3f8d,
+    0x97e658e8, 0x5dabf147, 0x1b909622, 0x1f4bcfbe, 0x5970a8db,
+    0x933d0174, 0xd5066611, 0x46a022f0, 0x009b4595, 0xcad6ec3a,
+    0x8ced8b5f, 0xad9d1423, 0xeba67346, 0x21ebdae9, 0x67d0bd8c,
+    0xf476f96d, 0xb24d9e08, 0x780037a7, 0x3e3b50c2, 0x31b0f544,
+    0x778b9221, 0xbdc63b8e, 0xfbfd5ceb, 0x685b180a, 0x2e607f6f,
+    0xe42dd6c0, 0xa216b1a5, 0x83662ed9, 0xc55d49bc, 0x0f10e013,
+    0x492b8776, 0xda8dc397, 0x9cb6a4f2, 0x56fb0d5d, 0x10c06a38,
+    0x141b33a4, 0x522054c1, 0x986dfd6e, 0xde569a0b, 0x4df0deea,
+    0x0bcbb98f, 0xc1861020, 0x87bd7745, 0xa6cde839, 0xe0f68f5c,
+    0x2abb26f3, 0x6c804196, 0xff260577, 0xb91d6212, 0x7350cbbd,
+    0x356bacd8}};
+
+#endif
+
+#endif
+
+#if N == 6
+
+#if W == 8
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0x3db1ecdc, 0x7b63d9b8, 0x46d23564, 0xf6c7b370,
+    0xcb765fac, 0x8da46ac8, 0xb0158614, 0x36fe60a1, 0x0b4f8c7d,
+    0x4d9db919, 0x702c55c5, 0xc039d3d1, 0xfd883f0d, 0xbb5a0a69,
+    0x86ebe6b5, 0x6dfcc142, 0x504d2d9e, 0x169f18fa, 0x2b2ef426,
+    0x9b3b7232, 0xa68a9eee, 0xe058ab8a, 0xdde94756, 0x5b02a1e3,
+    0x66b34d3f, 0x2061785b, 0x1dd09487, 0xadc51293, 0x9074fe4f,
+    0xd6a6cb2b, 0xeb1727f7, 0xdbf98284, 0xe6486e58, 0xa09a5b3c,
+    0x9d2bb7e0, 0x2d3e31f4, 0x108fdd28, 0x565de84c, 0x6bec0490,
+    0xed07e225, 0xd0b60ef9, 0x96643b9d, 0xabd5d741, 0x1bc05155,
+    0x2671bd89, 0x60a388ed, 0x5d126431, 0xb60543c6, 0x8bb4af1a,
+    0xcd669a7e, 0xf0d776a2, 0x40c2f0b6, 0x7d731c6a, 0x3ba1290e,
+    0x0610c5d2, 0x80fb2367, 0xbd4acfbb, 0xfb98fadf, 0xc6291603,
+    0x763c9017, 0x4b8d7ccb, 0x0d5f49af, 0x30eea573, 0x6c820349,
+    0x5133ef95, 0x17e1daf1, 0x2a50362d, 0x9a45b039, 0xa7f45ce5,
+    0xe1266981, 0xdc97855d, 0x5a7c63e8, 0x67cd8f34, 0x211fba50,
+    0x1cae568c, 0xacbbd098, 0x910a3c44, 0xd7d80920, 0xea69e5fc,
+    0x017ec20b, 0x3ccf2ed7, 0x7a1d1bb3, 0x47acf76f, 0xf7b9717b,
+    0xca089da7, 0x8cdaa8c3, 0xb16b441f, 0x3780a2aa, 0x0a314e76,
+    0x4ce37b12, 0x715297ce, 0xc14711da, 0xfcf6fd06, 0xba24c862,
+    0x879524be, 0xb77b81cd, 0x8aca6d11, 0xcc185875, 0xf1a9b4a9,
+    0x41bc32bd, 0x7c0dde61, 0x3adfeb05, 0x076e07d9, 0x8185e16c,
+    0xbc340db0, 0xfae638d4, 0xc757d408, 0x7742521c, 0x4af3bec0,
+    0x0c218ba4, 0x31906778, 0xda87408f, 0xe736ac53, 0xa1e49937,
+    0x9c5575eb, 0x2c40f3ff, 0x11f11f23, 0x57232a47, 0x6a92c69b,
+    0xec79202e, 0xd1c8ccf2, 0x971af996, 0xaaab154a, 0x1abe935e,
+    0x270f7f82, 0x61dd4ae6, 0x5c6ca63a, 0xd9040692, 0xe4b5ea4e,
+    0xa267df2a, 0x9fd633f6, 0x2fc3b5e2, 0x1272593e, 0x54a06c5a,
+    0x69118086, 0xeffa6633, 0xd24b8aef, 0x9499bf8b, 0xa9285357,
+    0x193dd543, 0x248c399f, 0x625e0cfb, 0x5fefe027, 0xb4f8c7d0,
+    0x89492b0c, 0xcf9b1e68, 0xf22af2b4, 0x423f74a0, 0x7f8e987c,
+    0x395cad18, 0x04ed41c4, 0x8206a771, 0xbfb74bad, 0xf9657ec9,
+    0xc4d49215, 0x74c11401, 0x4970f8dd, 0x0fa2cdb9, 0x32132165,
+    0x02fd8416, 0x3f4c68ca, 0x799e5dae, 0x442fb172, 0xf43a3766,
+    0xc98bdbba, 0x8f59eede, 0xb2e80202, 0x3403e4b7, 0x09b2086b,
+    0x4f603d0f, 0x72d1d1d3, 0xc2c457c7, 0xff75bb1b, 0xb9a78e7f,
+    0x841662a3, 0x6f014554, 0x52b0a988, 0x14629cec, 0x29d37030,
+    0x99c6f624, 0xa4771af8, 0xe2a52f9c, 0xdf14c340, 0x59ff25f5,
+    0x644ec929, 0x229cfc4d, 0x1f2d1091, 0xaf389685, 0x92897a59,
+    0xd45b4f3d, 0xe9eaa3e1, 0xb58605db, 0x8837e907, 0xcee5dc63,
+    0xf35430bf, 0x4341b6ab, 0x7ef05a77, 0x38226f13, 0x059383cf,
+    0x8378657a, 0xbec989a6, 0xf81bbcc2, 0xc5aa501e, 0x75bfd60a,
+    0x480e3ad6, 0x0edc0fb2, 0x336de36e, 0xd87ac499, 0xe5cb2845,
+    0xa3191d21, 0x9ea8f1fd, 0x2ebd77e9, 0x130c9b35, 0x55deae51,
+    0x686f428d, 0xee84a438, 0xd33548e4, 0x95e77d80, 0xa856915c,
+    0x18431748, 0x25f2fb94, 0x6320cef0, 0x5e91222c, 0x6e7f875f,
+    0x53ce6b83, 0x151c5ee7, 0x28adb23b, 0x98b8342f, 0xa509d8f3,
+    0xe3dbed97, 0xde6a014b, 0x5881e7fe, 0x65300b22, 0x23e23e46,
+    0x1e53d29a, 0xae46548e, 0x93f7b852, 0xd5258d36, 0xe89461ea,
+    0x0383461d, 0x3e32aac1, 0x78e09fa5, 0x45517379, 0xf544f56d,
+    0xc8f519b1, 0x8e272cd5, 0xb396c009, 0x357d26bc, 0x08ccca60,
+    0x4e1eff04, 0x73af13d8, 0xc3ba95cc, 0xfe0b7910, 0xb8d94c74,
+    0x8568a0a8},
+   {0x00000000, 0x69790b65, 0xd2f216ca, 0xbb8b1daf, 0x7e952bd5,
+    0x17ec20b0, 0xac673d1f, 0xc51e367a, 0xfd2a57aa, 0x94535ccf,
+    0x2fd84160, 0x46a14a05, 0x83bf7c7f, 0xeac6771a, 0x514d6ab5,
+    0x383461d0, 0x2125a915, 0x485ca270, 0xf3d7bfdf, 0x9aaeb4ba,
+    0x5fb082c0, 0x36c989a5, 0x8d42940a, 0xe43b9f6f, 0xdc0ffebf,
+    0xb576f5da, 0x0efde875, 0x6784e310, 0xa29ad56a, 0xcbe3de0f,
+    0x7068c3a0, 0x1911c8c5, 0x424b522a, 0x2b32594f, 0x90b944e0,
+    0xf9c04f85, 0x3cde79ff, 0x55a7729a, 0xee2c6f35, 0x87556450,
+    0xbf610580, 0xd6180ee5, 0x6d93134a, 0x04ea182f, 0xc1f42e55,
+    0xa88d2530, 0x1306389f, 0x7a7f33fa, 0x636efb3f, 0x0a17f05a,
+    0xb19cedf5, 0xd8e5e690, 0x1dfbd0ea, 0x7482db8f, 0xcf09c620,
+    0xa670cd45, 0x9e44ac95, 0xf73da7f0, 0x4cb6ba5f, 0x25cfb13a,
+    0xe0d18740, 0x89a88c25, 0x3223918a, 0x5b5a9aef, 0x8496a454,
+    0xedefaf31, 0x5664b29e, 0x3f1db9fb, 0xfa038f81, 0x937a84e4,
+    0x28f1994b, 0x4188922e, 0x79bcf3fe, 0x10c5f89b, 0xab4ee534,
+    0xc237ee51, 0x0729d82b, 0x6e50d34e, 0xd5dbcee1, 0xbca2c584,
+    0xa5b30d41, 0xccca0624, 0x77411b8b, 0x1e3810ee, 0xdb262694,
+    0xb25f2df1, 0x09d4305e, 0x60ad3b3b, 0x58995aeb, 0x31e0518e,
+    0x8a6b4c21, 0xe3124744, 0x260c713e, 0x4f757a5b, 0xf4fe67f4,
+    0x9d876c91, 0xc6ddf67e, 0xafa4fd1b, 0x142fe0b4, 0x7d56ebd1,
+    0xb848ddab, 0xd131d6ce, 0x6abacb61, 0x03c3c004, 0x3bf7a1d4,
+    0x528eaab1, 0xe905b71e, 0x807cbc7b, 0x45628a01, 0x2c1b8164,
+    0x97909ccb, 0xfee997ae, 0xe7f85f6b, 0x8e81540e, 0x350a49a1,
+    0x5c7342c4, 0x996d74be, 0xf0147fdb, 0x4b9f6274, 0x22e66911,
+    0x1ad208c1, 0x73ab03a4, 0xc8201e0b, 0xa159156e, 0x64472314,
+    0x0d3e2871, 0xb6b535de, 0xdfcc3ebb, 0xd25c4ee9, 0xbb25458c,
+    0x00ae5823, 0x69d75346, 0xacc9653c, 0xc5b06e59, 0x7e3b73f6,
+    0x17427893, 0x2f761943, 0x460f1226, 0xfd840f89, 0x94fd04ec,
+    0x51e33296, 0x389a39f3, 0x8311245c, 0xea682f39, 0xf379e7fc,
+    0x9a00ec99, 0x218bf136, 0x48f2fa53, 0x8deccc29, 0xe495c74c,
+    0x5f1edae3, 0x3667d186, 0x0e53b056, 0x672abb33, 0xdca1a69c,
+    0xb5d8adf9, 0x70c69b83, 0x19bf90e6, 0xa2348d49, 0xcb4d862c,
+    0x90171cc3, 0xf96e17a6, 0x42e50a09, 0x2b9c016c, 0xee823716,
+    0x87fb3c73, 0x3c7021dc, 0x55092ab9, 0x6d3d4b69, 0x0444400c,
+    0xbfcf5da3, 0xd6b656c6, 0x13a860bc, 0x7ad16bd9, 0xc15a7676,
+    0xa8237d13, 0xb132b5d6, 0xd84bbeb3, 0x63c0a31c, 0x0ab9a879,
+    0xcfa79e03, 0xa6de9566, 0x1d5588c9, 0x742c83ac, 0x4c18e27c,
+    0x2561e919, 0x9eeaf4b6, 0xf793ffd3, 0x328dc9a9, 0x5bf4c2cc,
+    0xe07fdf63, 0x8906d406, 0x56caeabd, 0x3fb3e1d8, 0x8438fc77,
+    0xed41f712, 0x285fc168, 0x4126ca0d, 0xfaadd7a2, 0x93d4dcc7,
+    0xabe0bd17, 0xc299b672, 0x7912abdd, 0x106ba0b8, 0xd57596c2,
+    0xbc0c9da7, 0x07878008, 0x6efe8b6d, 0x77ef43a8, 0x1e9648cd,
+    0xa51d5562, 0xcc645e07, 0x097a687d, 0x60036318, 0xdb887eb7,
+    0xb2f175d2, 0x8ac51402, 0xe3bc1f67, 0x583702c8, 0x314e09ad,
+    0xf4503fd7, 0x9d2934b2, 0x26a2291d, 0x4fdb2278, 0x1481b897,
+    0x7df8b3f2, 0xc673ae5d, 0xaf0aa538, 0x6a149342, 0x036d9827,
+    0xb8e68588, 0xd19f8eed, 0xe9abef3d, 0x80d2e458, 0x3b59f9f7,
+    0x5220f292, 0x973ec4e8, 0xfe47cf8d, 0x45ccd222, 0x2cb5d947,
+    0x35a41182, 0x5cdd1ae7, 0xe7560748, 0x8e2f0c2d, 0x4b313a57,
+    0x22483132, 0x99c32c9d, 0xf0ba27f8, 0xc88e4628, 0xa1f74d4d,
+    0x1a7c50e2, 0x73055b87, 0xb61b6dfd, 0xdf626698, 0x64e97b37,
+    0x0d907052},
+   {0x00000000, 0x7fc99b93, 0xff933726, 0x805aacb5, 0x2457680d,
+    0x5b9ef39e, 0xdbc45f2b, 0xa40dc4b8, 0x48aed01a, 0x37674b89,
+    0xb73de73c, 0xc8f47caf, 0x6cf9b817, 0x13302384, 0x936a8f31,
+    0xeca314a2, 0x915da034, 0xee943ba7, 0x6ece9712, 0x11070c81,
+    0xb50ac839, 0xcac353aa, 0x4a99ff1f, 0x3550648c, 0xd9f3702e,
+    0xa63aebbd, 0x26604708, 0x59a9dc9b, 0xfda41823, 0x826d83b0,
+    0x02372f05, 0x7dfeb496, 0xf9ca4629, 0x8603ddba, 0x0659710f,
+    0x7990ea9c, 0xdd9d2e24, 0xa254b5b7, 0x220e1902, 0x5dc78291,
+    0xb1649633, 0xcead0da0, 0x4ef7a115, 0x313e3a86, 0x9533fe3e,
+    0xeafa65ad, 0x6aa0c918, 0x1569528b, 0x6897e61d, 0x175e7d8e,
+    0x9704d13b, 0xe8cd4aa8, 0x4cc08e10, 0x33091583, 0xb353b936,
+    0xcc9a22a5, 0x20393607, 0x5ff0ad94, 0xdfaa0121, 0xa0639ab2,
+    0x046e5e0a, 0x7ba7c599, 0xfbfd692c, 0x8434f2bf, 0x28e58a13,
+    0x572c1180, 0xd776bd35, 0xa8bf26a6, 0x0cb2e21e, 0x737b798d,
+    0xf321d538, 0x8ce84eab, 0x604b5a09, 0x1f82c19a, 0x9fd86d2f,
+    0xe011f6bc, 0x441c3204, 0x3bd5a997, 0xbb8f0522, 0xc4469eb1,
+    0xb9b82a27, 0xc671b1b4, 0x462b1d01, 0x39e28692, 0x9def422a,
+    0xe226d9b9, 0x627c750c, 0x1db5ee9f, 0xf116fa3d, 0x8edf61ae,
+    0x0e85cd1b, 0x714c5688, 0xd5419230, 0xaa8809a3, 0x2ad2a516,
+    0x551b3e85, 0xd12fcc3a, 0xaee657a9, 0x2ebcfb1c, 0x5175608f,
+    0xf578a437, 0x8ab13fa4, 0x0aeb9311, 0x75220882, 0x99811c20,
+    0xe64887b3, 0x66122b06, 0x19dbb095, 0xbdd6742d, 0xc21fefbe,
+    0x4245430b, 0x3d8cd898, 0x40726c0e, 0x3fbbf79d, 0xbfe15b28,
+    0xc028c0bb, 0x64250403, 0x1bec9f90, 0x9bb63325, 0xe47fa8b6,
+    0x08dcbc14, 0x77152787, 0xf74f8b32, 0x888610a1, 0x2c8bd419,
+    0x53424f8a, 0xd318e33f, 0xacd178ac, 0x51cb1426, 0x2e028fb5,
+    0xae582300, 0xd191b893, 0x759c7c2b, 0x0a55e7b8, 0x8a0f4b0d,
+    0xf5c6d09e, 0x1965c43c, 0x66ac5faf, 0xe6f6f31a, 0x993f6889,
+    0x3d32ac31, 0x42fb37a2, 0xc2a19b17, 0xbd680084, 0xc096b412,
+    0xbf5f2f81, 0x3f058334, 0x40cc18a7, 0xe4c1dc1f, 0x9b08478c,
+    0x1b52eb39, 0x649b70aa, 0x88386408, 0xf7f1ff9b, 0x77ab532e,
+    0x0862c8bd, 0xac6f0c05, 0xd3a69796, 0x53fc3b23, 0x2c35a0b0,
+    0xa801520f, 0xd7c8c99c, 0x57926529, 0x285bfeba, 0x8c563a02,
+    0xf39fa191, 0x73c50d24, 0x0c0c96b7, 0xe0af8215, 0x9f661986,
+    0x1f3cb533, 0x60f52ea0, 0xc4f8ea18, 0xbb31718b, 0x3b6bdd3e,
+    0x44a246ad, 0x395cf23b, 0x469569a8, 0xc6cfc51d, 0xb9065e8e,
+    0x1d0b9a36, 0x62c201a5, 0xe298ad10, 0x9d513683, 0x71f22221,
+    0x0e3bb9b2, 0x8e611507, 0xf1a88e94, 0x55a54a2c, 0x2a6cd1bf,
+    0xaa367d0a, 0xd5ffe699, 0x792e9e35, 0x06e705a6, 0x86bda913,
+    0xf9743280, 0x5d79f638, 0x22b06dab, 0xa2eac11e, 0xdd235a8d,
+    0x31804e2f, 0x4e49d5bc, 0xce137909, 0xb1dae29a, 0x15d72622,
+    0x6a1ebdb1, 0xea441104, 0x958d8a97, 0xe8733e01, 0x97baa592,
+    0x17e00927, 0x682992b4, 0xcc24560c, 0xb3edcd9f, 0x33b7612a,
+    0x4c7efab9, 0xa0ddee1b, 0xdf147588, 0x5f4ed93d, 0x208742ae,
+    0x848a8616, 0xfb431d85, 0x7b19b130, 0x04d02aa3, 0x80e4d81c,
+    0xff2d438f, 0x7f77ef3a, 0x00be74a9, 0xa4b3b011, 0xdb7a2b82,
+    0x5b208737, 0x24e91ca4, 0xc84a0806, 0xb7839395, 0x37d93f20,
+    0x4810a4b3, 0xec1d600b, 0x93d4fb98, 0x138e572d, 0x6c47ccbe,
+    0x11b97828, 0x6e70e3bb, 0xee2a4f0e, 0x91e3d49d, 0x35ee1025,
+    0x4a278bb6, 0xca7d2703, 0xb5b4bc90, 0x5917a832, 0x26de33a1,
+    0xa6849f14, 0xd94d0487, 0x7d40c03f, 0x02895bac, 0x82d3f719,
+    0xfd1a6c8a},
+   {0x00000000, 0xa396284c, 0x9c5d56d9, 0x3fcb7e95, 0xe3cbabf3,
+    0x405d83bf, 0x7f96fd2a, 0xdc00d566, 0x1ce651a7, 0xbf7079eb,
+    0x80bb077e, 0x232d2f32, 0xff2dfa54, 0x5cbbd218, 0x6370ac8d,
+    0xc0e684c1, 0x39cca34e, 0x9a5a8b02, 0xa591f597, 0x0607dddb,
+    0xda0708bd, 0x799120f1, 0x465a5e64, 0xe5cc7628, 0x252af2e9,
+    0x86bcdaa5, 0xb977a430, 0x1ae18c7c, 0xc6e1591a, 0x65777156,
+    0x5abc0fc3, 0xf92a278f, 0x7399469c, 0xd00f6ed0, 0xefc41045,
+    0x4c523809, 0x9052ed6f, 0x33c4c523, 0x0c0fbbb6, 0xaf9993fa,
+    0x6f7f173b, 0xcce93f77, 0xf32241e2, 0x50b469ae, 0x8cb4bcc8,
+    0x2f229484, 0x10e9ea11, 0xb37fc25d, 0x4a55e5d2, 0xe9c3cd9e,
+    0xd608b30b, 0x759e9b47, 0xa99e4e21, 0x0a08666d, 0x35c318f8,
+    0x965530b4, 0x56b3b475, 0xf5259c39, 0xcaeee2ac, 0x6978cae0,
+    0xb5781f86, 0x16ee37ca, 0x2925495f, 0x8ab36113, 0xe7328d38,
+    0x44a4a574, 0x7b6fdbe1, 0xd8f9f3ad, 0x04f926cb, 0xa76f0e87,
+    0x98a47012, 0x3b32585e, 0xfbd4dc9f, 0x5842f4d3, 0x67898a46,
+    0xc41fa20a, 0x181f776c, 0xbb895f20, 0x844221b5, 0x27d409f9,
+    0xdefe2e76, 0x7d68063a, 0x42a378af, 0xe13550e3, 0x3d358585,
+    0x9ea3adc9, 0xa168d35c, 0x02fefb10, 0xc2187fd1, 0x618e579d,
+    0x5e452908, 0xfdd30144, 0x21d3d422, 0x8245fc6e, 0xbd8e82fb,
+    0x1e18aab7, 0x94abcba4, 0x373de3e8, 0x08f69d7d, 0xab60b531,
+    0x77606057, 0xd4f6481b, 0xeb3d368e, 0x48ab1ec2, 0x884d9a03,
+    0x2bdbb24f, 0x1410ccda, 0xb786e496, 0x6b8631f0, 0xc81019bc,
+    0xf7db6729, 0x544d4f65, 0xad6768ea, 0x0ef140a6, 0x313a3e33,
+    0x92ac167f, 0x4eacc319, 0xed3aeb55, 0xd2f195c0, 0x7167bd8c,
+    0xb181394d, 0x12171101, 0x2ddc6f94, 0x8e4a47d8, 0x524a92be,
+    0xf1dcbaf2, 0xce17c467, 0x6d81ec2b, 0x15141c31, 0xb682347d,
+    0x89494ae8, 0x2adf62a4, 0xf6dfb7c2, 0x55499f8e, 0x6a82e11b,
+    0xc914c957, 0x09f24d96, 0xaa6465da, 0x95af1b4f, 0x36393303,
+    0xea39e665, 0x49afce29, 0x7664b0bc, 0xd5f298f0, 0x2cd8bf7f,
+    0x8f4e9733, 0xb085e9a6, 0x1313c1ea, 0xcf13148c, 0x6c853cc0,
+    0x534e4255, 0xf0d86a19, 0x303eeed8, 0x93a8c694, 0xac63b801,
+    0x0ff5904d, 0xd3f5452b, 0x70636d67, 0x4fa813f2, 0xec3e3bbe,
+    0x668d5aad, 0xc51b72e1, 0xfad00c74, 0x59462438, 0x8546f15e,
+    0x26d0d912, 0x191ba787, 0xba8d8fcb, 0x7a6b0b0a, 0xd9fd2346,
+    0xe6365dd3, 0x45a0759f, 0x99a0a0f9, 0x3a3688b5, 0x05fdf620,
+    0xa66bde6c, 0x5f41f9e3, 0xfcd7d1af, 0xc31caf3a, 0x608a8776,
+    0xbc8a5210, 0x1f1c7a5c, 0x20d704c9, 0x83412c85, 0x43a7a844,
+    0xe0318008, 0xdffafe9d, 0x7c6cd6d1, 0xa06c03b7, 0x03fa2bfb,
+    0x3c31556e, 0x9fa77d22, 0xf2269109, 0x51b0b945, 0x6e7bc7d0,
+    0xcdedef9c, 0x11ed3afa, 0xb27b12b6, 0x8db06c23, 0x2e26446f,
+    0xeec0c0ae, 0x4d56e8e2, 0x729d9677, 0xd10bbe3b, 0x0d0b6b5d,
+    0xae9d4311, 0x91563d84, 0x32c015c8, 0xcbea3247, 0x687c1a0b,
+    0x57b7649e, 0xf4214cd2, 0x282199b4, 0x8bb7b1f8, 0xb47ccf6d,
+    0x17eae721, 0xd70c63e0, 0x749a4bac, 0x4b513539, 0xe8c71d75,
+    0x34c7c813, 0x9751e05f, 0xa89a9eca, 0x0b0cb686, 0x81bfd795,
+    0x2229ffd9, 0x1de2814c, 0xbe74a900, 0x62747c66, 0xc1e2542a,
+    0xfe292abf, 0x5dbf02f3, 0x9d598632, 0x3ecfae7e, 0x0104d0eb,
+    0xa292f8a7, 0x7e922dc1, 0xdd04058d, 0xe2cf7b18, 0x41595354,
+    0xb87374db, 0x1be55c97, 0x242e2202, 0x87b80a4e, 0x5bb8df28,
+    0xf82ef764, 0xc7e589f1, 0x6473a1bd, 0xa495257c, 0x07030d30,
+    0x38c873a5, 0x9b5e5be9, 0x475e8e8f, 0xe4c8a6c3, 0xdb03d856,
+    0x7895f01a},
+   {0x00000000, 0x2a283862, 0x545070c4, 0x7e7848a6, 0xa8a0e188,
+    0x8288d9ea, 0xfcf0914c, 0xd6d8a92e, 0x8a30c551, 0xa018fd33,
+    0xde60b595, 0xf4488df7, 0x229024d9, 0x08b81cbb, 0x76c0541d,
+    0x5ce86c7f, 0xcf108ce3, 0xe538b481, 0x9b40fc27, 0xb168c445,
+    0x67b06d6b, 0x4d985509, 0x33e01daf, 0x19c825cd, 0x452049b2,
+    0x6f0871d0, 0x11703976, 0x3b580114, 0xed80a83a, 0xc7a89058,
+    0xb9d0d8fe, 0x93f8e09c, 0x45501f87, 0x6f7827e5, 0x11006f43,
+    0x3b285721, 0xedf0fe0f, 0xc7d8c66d, 0xb9a08ecb, 0x9388b6a9,
+    0xcf60dad6, 0xe548e2b4, 0x9b30aa12, 0xb1189270, 0x67c03b5e,
+    0x4de8033c, 0x33904b9a, 0x19b873f8, 0x8a409364, 0xa068ab06,
+    0xde10e3a0, 0xf438dbc2, 0x22e072ec, 0x08c84a8e, 0x76b00228,
+    0x5c983a4a, 0x00705635, 0x2a586e57, 0x542026f1, 0x7e081e93,
+    0xa8d0b7bd, 0x82f88fdf, 0xfc80c779, 0xd6a8ff1b, 0x8aa03f0e,
+    0xa088076c, 0xdef04fca, 0xf4d877a8, 0x2200de86, 0x0828e6e4,
+    0x7650ae42, 0x5c789620, 0x0090fa5f, 0x2ab8c23d, 0x54c08a9b,
+    0x7ee8b2f9, 0xa8301bd7, 0x821823b5, 0xfc606b13, 0xd6485371,
+    0x45b0b3ed, 0x6f988b8f, 0x11e0c329, 0x3bc8fb4b, 0xed105265,
+    0xc7386a07, 0xb94022a1, 0x93681ac3, 0xcf8076bc, 0xe5a84ede,
+    0x9bd00678, 0xb1f83e1a, 0x67209734, 0x4d08af56, 0x3370e7f0,
+    0x1958df92, 0xcff02089, 0xe5d818eb, 0x9ba0504d, 0xb188682f,
+    0x6750c101, 0x4d78f963, 0x3300b1c5, 0x192889a7, 0x45c0e5d8,
+    0x6fe8ddba, 0x1190951c, 0x3bb8ad7e, 0xed600450, 0xc7483c32,
+    0xb9307494, 0x93184cf6, 0x00e0ac6a, 0x2ac89408, 0x54b0dcae,
+    0x7e98e4cc, 0xa8404de2, 0x82687580, 0xfc103d26, 0xd6380544,
+    0x8ad0693b, 0xa0f85159, 0xde8019ff, 0xf4a8219d, 0x227088b3,
+    0x0858b0d1, 0x7620f877, 0x5c08c015, 0xce31785d, 0xe419403f,
+    0x9a610899, 0xb04930fb, 0x669199d5, 0x4cb9a1b7, 0x32c1e911,
+    0x18e9d173, 0x4401bd0c, 0x6e29856e, 0x1051cdc8, 0x3a79f5aa,
+    0xeca15c84, 0xc68964e6, 0xb8f12c40, 0x92d91422, 0x0121f4be,
+    0x2b09ccdc, 0x5571847a, 0x7f59bc18, 0xa9811536, 0x83a92d54,
+    0xfdd165f2, 0xd7f95d90, 0x8b1131ef, 0xa139098d, 0xdf41412b,
+    0xf5697949, 0x23b1d067, 0x0999e805, 0x77e1a0a3, 0x5dc998c1,
+    0x8b6167da, 0xa1495fb8, 0xdf31171e, 0xf5192f7c, 0x23c18652,
+    0x09e9be30, 0x7791f696, 0x5db9cef4, 0x0151a28b, 0x2b799ae9,
+    0x5501d24f, 0x7f29ea2d, 0xa9f14303, 0x83d97b61, 0xfda133c7,
+    0xd7890ba5, 0x4471eb39, 0x6e59d35b, 0x10219bfd, 0x3a09a39f,
+    0xecd10ab1, 0xc6f932d3, 0xb8817a75, 0x92a94217, 0xce412e68,
+    0xe469160a, 0x9a115eac, 0xb03966ce, 0x66e1cfe0, 0x4cc9f782,
+    0x32b1bf24, 0x18998746, 0x44914753, 0x6eb97f31, 0x10c13797,
+    0x3ae90ff5, 0xec31a6db, 0xc6199eb9, 0xb861d61f, 0x9249ee7d,
+    0xcea18202, 0xe489ba60, 0x9af1f2c6, 0xb0d9caa4, 0x6601638a,
+    0x4c295be8, 0x3251134e, 0x18792b2c, 0x8b81cbb0, 0xa1a9f3d2,
+    0xdfd1bb74, 0xf5f98316, 0x23212a38, 0x0909125a, 0x77715afc,
+    0x5d59629e, 0x01b10ee1, 0x2b993683, 0x55e17e25, 0x7fc94647,
+    0xa911ef69, 0x8339d70b, 0xfd419fad, 0xd769a7cf, 0x01c158d4,
+    0x2be960b6, 0x55912810, 0x7fb91072, 0xa961b95c, 0x8349813e,
+    0xfd31c998, 0xd719f1fa, 0x8bf19d85, 0xa1d9a5e7, 0xdfa1ed41,
+    0xf589d523, 0x23517c0d, 0x0979446f, 0x77010cc9, 0x5d2934ab,
+    0xced1d437, 0xe4f9ec55, 0x9a81a4f3, 0xb0a99c91, 0x667135bf,
+    0x4c590ddd, 0x3221457b, 0x18097d19, 0x44e11166, 0x6ec92904,
+    0x10b161a2, 0x3a9959c0, 0xec41f0ee, 0xc669c88c, 0xb811802a,
+    0x9239b848},
+   {0x00000000, 0x4713f6fb, 0x8e27edf6, 0xc9341b0d, 0xc73eddad,
+    0x802d2b56, 0x4919305b, 0x0e0ac6a0, 0x550cbd1b, 0x121f4be0,
+    0xdb2b50ed, 0x9c38a616, 0x923260b6, 0xd521964d, 0x1c158d40,
+    0x5b067bbb, 0xaa197a36, 0xed0a8ccd, 0x243e97c0, 0x632d613b,
+    0x6d27a79b, 0x2a345160, 0xe3004a6d, 0xa413bc96, 0xff15c72d,
+    0xb80631d6, 0x71322adb, 0x3621dc20, 0x382b1a80, 0x7f38ec7b,
+    0xb60cf776, 0xf11f018d, 0x8f43f22d, 0xc85004d6, 0x01641fdb,
+    0x4677e920, 0x487d2f80, 0x0f6ed97b, 0xc65ac276, 0x8149348d,
+    0xda4f4f36, 0x9d5cb9cd, 0x5468a2c0, 0x137b543b, 0x1d71929b,
+    0x5a626460, 0x93567f6d, 0xd4458996, 0x255a881b, 0x62497ee0,
+    0xab7d65ed, 0xec6e9316, 0xe26455b6, 0xa577a34d, 0x6c43b840,
+    0x2b504ebb, 0x70563500, 0x3745c3fb, 0xfe71d8f6, 0xb9622e0d,
+    0xb768e8ad, 0xf07b1e56, 0x394f055b, 0x7e5cf3a0, 0xc5f6e21b,
+    0x82e514e0, 0x4bd10fed, 0x0cc2f916, 0x02c83fb6, 0x45dbc94d,
+    0x8cefd240, 0xcbfc24bb, 0x90fa5f00, 0xd7e9a9fb, 0x1eddb2f6,
+    0x59ce440d, 0x57c482ad, 0x10d77456, 0xd9e36f5b, 0x9ef099a0,
+    0x6fef982d, 0x28fc6ed6, 0xe1c875db, 0xa6db8320, 0xa8d14580,
+    0xefc2b37b, 0x26f6a876, 0x61e55e8d, 0x3ae32536, 0x7df0d3cd,
+    0xb4c4c8c0, 0xf3d73e3b, 0xfdddf89b, 0xbace0e60, 0x73fa156d,
+    0x34e9e396, 0x4ab51036, 0x0da6e6cd, 0xc492fdc0, 0x83810b3b,
+    0x8d8bcd9b, 0xca983b60, 0x03ac206d, 0x44bfd696, 0x1fb9ad2d,
+    0x58aa5bd6, 0x919e40db, 0xd68db620, 0xd8877080, 0x9f94867b,
+    0x56a09d76, 0x11b36b8d, 0xe0ac6a00, 0xa7bf9cfb, 0x6e8b87f6,
+    0x2998710d, 0x2792b7ad, 0x60814156, 0xa9b55a5b, 0xeea6aca0,
+    0xb5a0d71b, 0xf2b321e0, 0x3b873aed, 0x7c94cc16, 0x729e0ab6,
+    0x358dfc4d, 0xfcb9e740, 0xbbaa11bb, 0x509cc277, 0x178f348c,
+    0xdebb2f81, 0x99a8d97a, 0x97a21fda, 0xd0b1e921, 0x1985f22c,
+    0x5e9604d7, 0x05907f6c, 0x42838997, 0x8bb7929a, 0xcca46461,
+    0xc2aea2c1, 0x85bd543a, 0x4c894f37, 0x0b9ab9cc, 0xfa85b841,
+    0xbd964eba, 0x74a255b7, 0x33b1a34c, 0x3dbb65ec, 0x7aa89317,
+    0xb39c881a, 0xf48f7ee1, 0xaf89055a, 0xe89af3a1, 0x21aee8ac,
+    0x66bd1e57, 0x68b7d8f7, 0x2fa42e0c, 0xe6903501, 0xa183c3fa,
+    0xdfdf305a, 0x98ccc6a1, 0x51f8ddac, 0x16eb2b57, 0x18e1edf7,
+    0x5ff21b0c, 0x96c60001, 0xd1d5f6fa, 0x8ad38d41, 0xcdc07bba,
+    0x04f460b7, 0x43e7964c, 0x4ded50ec, 0x0afea617, 0xc3cabd1a,
+    0x84d94be1, 0x75c64a6c, 0x32d5bc97, 0xfbe1a79a, 0xbcf25161,
+    0xb2f897c1, 0xf5eb613a, 0x3cdf7a37, 0x7bcc8ccc, 0x20caf777,
+    0x67d9018c, 0xaeed1a81, 0xe9feec7a, 0xe7f42ada, 0xa0e7dc21,
+    0x69d3c72c, 0x2ec031d7, 0x956a206c, 0xd279d697, 0x1b4dcd9a,
+    0x5c5e3b61, 0x5254fdc1, 0x15470b3a, 0xdc731037, 0x9b60e6cc,
+    0xc0669d77, 0x87756b8c, 0x4e417081, 0x0952867a, 0x075840da,
+    0x404bb621, 0x897fad2c, 0xce6c5bd7, 0x3f735a5a, 0x7860aca1,
+    0xb154b7ac, 0xf6474157, 0xf84d87f7, 0xbf5e710c, 0x766a6a01,
+    0x31799cfa, 0x6a7fe741, 0x2d6c11ba, 0xe4580ab7, 0xa34bfc4c,
+    0xad413aec, 0xea52cc17, 0x2366d71a, 0x647521e1, 0x1a29d241,
+    0x5d3a24ba, 0x940e3fb7, 0xd31dc94c, 0xdd170fec, 0x9a04f917,
+    0x5330e21a, 0x142314e1, 0x4f256f5a, 0x083699a1, 0xc10282ac,
+    0x86117457, 0x881bb2f7, 0xcf08440c, 0x063c5f01, 0x412fa9fa,
+    0xb030a877, 0xf7235e8c, 0x3e174581, 0x7904b37a, 0x770e75da,
+    0x301d8321, 0xf929982c, 0xbe3a6ed7, 0xe53c156c, 0xa22fe397,
+    0x6b1bf89a, 0x2c080e61, 0x2202c8c1, 0x65113e3a, 0xac252537,
+    0xeb36d3cc},
+   {0x00000000, 0xa13984ee, 0x99020f9d, 0x383b8b73, 0xe975197b,
+    0x484c9d95, 0x707716e6, 0xd14e9208, 0x099b34b7, 0xa8a2b059,
+    0x90993b2a, 0x31a0bfc4, 0xe0ee2dcc, 0x41d7a922, 0x79ec2251,
+    0xd8d5a6bf, 0x1336696e, 0xb20fed80, 0x8a3466f3, 0x2b0de21d,
+    0xfa437015, 0x5b7af4fb, 0x63417f88, 0xc278fb66, 0x1aad5dd9,
+    0xbb94d937, 0x83af5244, 0x2296d6aa, 0xf3d844a2, 0x52e1c04c,
+    0x6ada4b3f, 0xcbe3cfd1, 0x266cd2dc, 0x87555632, 0xbf6edd41,
+    0x1e5759af, 0xcf19cba7, 0x6e204f49, 0x561bc43a, 0xf72240d4,
+    0x2ff7e66b, 0x8ece6285, 0xb6f5e9f6, 0x17cc6d18, 0xc682ff10,
+    0x67bb7bfe, 0x5f80f08d, 0xfeb97463, 0x355abbb2, 0x94633f5c,
+    0xac58b42f, 0x0d6130c1, 0xdc2fa2c9, 0x7d162627, 0x452dad54,
+    0xe41429ba, 0x3cc18f05, 0x9df80beb, 0xa5c38098, 0x04fa0476,
+    0xd5b4967e, 0x748d1290, 0x4cb699e3, 0xed8f1d0d, 0x4cd9a5b8,
+    0xede02156, 0xd5dbaa25, 0x74e22ecb, 0xa5acbcc3, 0x0495382d,
+    0x3caeb35e, 0x9d9737b0, 0x4542910f, 0xe47b15e1, 0xdc409e92,
+    0x7d791a7c, 0xac378874, 0x0d0e0c9a, 0x353587e9, 0x940c0307,
+    0x5fefccd6, 0xfed64838, 0xc6edc34b, 0x67d447a5, 0xb69ad5ad,
+    0x17a35143, 0x2f98da30, 0x8ea15ede, 0x5674f861, 0xf74d7c8f,
+    0xcf76f7fc, 0x6e4f7312, 0xbf01e11a, 0x1e3865f4, 0x2603ee87,
+    0x873a6a69, 0x6ab57764, 0xcb8cf38a, 0xf3b778f9, 0x528efc17,
+    0x83c06e1f, 0x22f9eaf1, 0x1ac26182, 0xbbfbe56c, 0x632e43d3,
+    0xc217c73d, 0xfa2c4c4e, 0x5b15c8a0, 0x8a5b5aa8, 0x2b62de46,
+    0x13595535, 0xb260d1db, 0x79831e0a, 0xd8ba9ae4, 0xe0811197,
+    0x41b89579, 0x90f60771, 0x31cf839f, 0x09f408ec, 0xa8cd8c02,
+    0x70182abd, 0xd121ae53, 0xe91a2520, 0x4823a1ce, 0x996d33c6,
+    0x3854b728, 0x006f3c5b, 0xa156b8b5, 0x99b34b70, 0x388acf9e,
+    0x00b144ed, 0xa188c003, 0x70c6520b, 0xd1ffd6e5, 0xe9c45d96,
+    0x48fdd978, 0x90287fc7, 0x3111fb29, 0x092a705a, 0xa813f4b4,
+    0x795d66bc, 0xd864e252, 0xe05f6921, 0x4166edcf, 0x8a85221e,
+    0x2bbca6f0, 0x13872d83, 0xb2bea96d, 0x63f03b65, 0xc2c9bf8b,
+    0xfaf234f8, 0x5bcbb016, 0x831e16a9, 0x22279247, 0x1a1c1934,
+    0xbb259dda, 0x6a6b0fd2, 0xcb528b3c, 0xf369004f, 0x525084a1,
+    0xbfdf99ac, 0x1ee61d42, 0x26dd9631, 0x87e412df, 0x56aa80d7,
+    0xf7930439, 0xcfa88f4a, 0x6e910ba4, 0xb644ad1b, 0x177d29f5,
+    0x2f46a286, 0x8e7f2668, 0x5f31b460, 0xfe08308e, 0xc633bbfd,
+    0x670a3f13, 0xace9f0c2, 0x0dd0742c, 0x35ebff5f, 0x94d27bb1,
+    0x459ce9b9, 0xe4a56d57, 0xdc9ee624, 0x7da762ca, 0xa572c475,
+    0x044b409b, 0x3c70cbe8, 0x9d494f06, 0x4c07dd0e, 0xed3e59e0,
+    0xd505d293, 0x743c567d, 0xd56aeec8, 0x74536a26, 0x4c68e155,
+    0xed5165bb, 0x3c1ff7b3, 0x9d26735d, 0xa51df82e, 0x04247cc0,
+    0xdcf1da7f, 0x7dc85e91, 0x45f3d5e2, 0xe4ca510c, 0x3584c304,
+    0x94bd47ea, 0xac86cc99, 0x0dbf4877, 0xc65c87a6, 0x67650348,
+    0x5f5e883b, 0xfe670cd5, 0x2f299edd, 0x8e101a33, 0xb62b9140,
+    0x171215ae, 0xcfc7b311, 0x6efe37ff, 0x56c5bc8c, 0xf7fc3862,
+    0x26b2aa6a, 0x878b2e84, 0xbfb0a5f7, 0x1e892119, 0xf3063c14,
+    0x523fb8fa, 0x6a043389, 0xcb3db767, 0x1a73256f, 0xbb4aa181,
+    0x83712af2, 0x2248ae1c, 0xfa9d08a3, 0x5ba48c4d, 0x639f073e,
+    0xc2a683d0, 0x13e811d8, 0xb2d19536, 0x8aea1e45, 0x2bd39aab,
+    0xe030557a, 0x4109d194, 0x79325ae7, 0xd80bde09, 0x09454c01,
+    0xa87cc8ef, 0x9047439c, 0x317ec772, 0xe9ab61cd, 0x4892e523,
+    0x70a96e50, 0xd190eabe, 0x00de78b6, 0xa1e7fc58, 0x99dc772b,
+    0x38e5f3c5},
+   {0x00000000, 0xe81790a1, 0x0b5e2703, 0xe349b7a2, 0x16bc4e06,
+    0xfeabdea7, 0x1de26905, 0xf5f5f9a4, 0x2d789c0c, 0xc56f0cad,
+    0x2626bb0f, 0xce312bae, 0x3bc4d20a, 0xd3d342ab, 0x309af509,
+    0xd88d65a8, 0x5af13818, 0xb2e6a8b9, 0x51af1f1b, 0xb9b88fba,
+    0x4c4d761e, 0xa45ae6bf, 0x4713511d, 0xaf04c1bc, 0x7789a414,
+    0x9f9e34b5, 0x7cd78317, 0x94c013b6, 0x6135ea12, 0x89227ab3,
+    0x6a6bcd11, 0x827c5db0, 0xb5e27030, 0x5df5e091, 0xbebc5733,
+    0x56abc792, 0xa35e3e36, 0x4b49ae97, 0xa8001935, 0x40178994,
+    0x989aec3c, 0x708d7c9d, 0x93c4cb3f, 0x7bd35b9e, 0x8e26a23a,
+    0x6631329b, 0x85788539, 0x6d6f1598, 0xef134828, 0x0704d889,
+    0xe44d6f2b, 0x0c5aff8a, 0xf9af062e, 0x11b8968f, 0xf2f1212d,
+    0x1ae6b18c, 0xc26bd424, 0x2a7c4485, 0xc935f327, 0x21226386,
+    0xd4d79a22, 0x3cc00a83, 0xdf89bd21, 0x379e2d80, 0xb0b5e621,
+    0x58a27680, 0xbbebc122, 0x53fc5183, 0xa609a827, 0x4e1e3886,
+    0xad578f24, 0x45401f85, 0x9dcd7a2d, 0x75daea8c, 0x96935d2e,
+    0x7e84cd8f, 0x8b71342b, 0x6366a48a, 0x802f1328, 0x68388389,
+    0xea44de39, 0x02534e98, 0xe11af93a, 0x090d699b, 0xfcf8903f,
+    0x14ef009e, 0xf7a6b73c, 0x1fb1279d, 0xc73c4235, 0x2f2bd294,
+    0xcc626536, 0x2475f597, 0xd1800c33, 0x39979c92, 0xdade2b30,
+    0x32c9bb91, 0x05579611, 0xed4006b0, 0x0e09b112, 0xe61e21b3,
+    0x13ebd817, 0xfbfc48b6, 0x18b5ff14, 0xf0a26fb5, 0x282f0a1d,
+    0xc0389abc, 0x23712d1e, 0xcb66bdbf, 0x3e93441b, 0xd684d4ba,
+    0x35cd6318, 0xdddaf3b9, 0x5fa6ae09, 0xb7b13ea8, 0x54f8890a,
+    0xbcef19ab, 0x491ae00f, 0xa10d70ae, 0x4244c70c, 0xaa5357ad,
+    0x72de3205, 0x9ac9a2a4, 0x79801506, 0x919785a7, 0x64627c03,
+    0x8c75eca2, 0x6f3c5b00, 0x872bcba1, 0xba1aca03, 0x520d5aa2,
+    0xb144ed00, 0x59537da1, 0xaca68405, 0x44b114a4, 0xa7f8a306,
+    0x4fef33a7, 0x9762560f, 0x7f75c6ae, 0x9c3c710c, 0x742be1ad,
+    0x81de1809, 0x69c988a8, 0x8a803f0a, 0x6297afab, 0xe0ebf21b,
+    0x08fc62ba, 0xebb5d518, 0x03a245b9, 0xf657bc1d, 0x1e402cbc,
+    0xfd099b1e, 0x151e0bbf, 0xcd936e17, 0x2584feb6, 0xc6cd4914,
+    0x2edad9b5, 0xdb2f2011, 0x3338b0b0, 0xd0710712, 0x386697b3,
+    0x0ff8ba33, 0xe7ef2a92, 0x04a69d30, 0xecb10d91, 0x1944f435,
+    0xf1536494, 0x121ad336, 0xfa0d4397, 0x2280263f, 0xca97b69e,
+    0x29de013c, 0xc1c9919d, 0x343c6839, 0xdc2bf898, 0x3f624f3a,
+    0xd775df9b, 0x5509822b, 0xbd1e128a, 0x5e57a528, 0xb6403589,
+    0x43b5cc2d, 0xaba25c8c, 0x48ebeb2e, 0xa0fc7b8f, 0x78711e27,
+    0x90668e86, 0x732f3924, 0x9b38a985, 0x6ecd5021, 0x86dac080,
+    0x65937722, 0x8d84e783, 0x0aaf2c22, 0xe2b8bc83, 0x01f10b21,
+    0xe9e69b80, 0x1c136224, 0xf404f285, 0x174d4527, 0xff5ad586,
+    0x27d7b02e, 0xcfc0208f, 0x2c89972d, 0xc49e078c, 0x316bfe28,
+    0xd97c6e89, 0x3a35d92b, 0xd222498a, 0x505e143a, 0xb849849b,
+    0x5b003339, 0xb317a398, 0x46e25a3c, 0xaef5ca9d, 0x4dbc7d3f,
+    0xa5abed9e, 0x7d268836, 0x95311897, 0x7678af35, 0x9e6f3f94,
+    0x6b9ac630, 0x838d5691, 0x60c4e133, 0x88d37192, 0xbf4d5c12,
+    0x575accb3, 0xb4137b11, 0x5c04ebb0, 0xa9f11214, 0x41e682b5,
+    0xa2af3517, 0x4ab8a5b6, 0x9235c01e, 0x7a2250bf, 0x996be71d,
+    0x717c77bc, 0x84898e18, 0x6c9e1eb9, 0x8fd7a91b, 0x67c039ba,
+    0xe5bc640a, 0x0dabf4ab, 0xeee24309, 0x06f5d3a8, 0xf3002a0c,
+    0x1b17baad, 0xf85e0d0f, 0x10499dae, 0xc8c4f806, 0x20d368a7,
+    0xc39adf05, 0x2b8d4fa4, 0xde78b600, 0x366f26a1, 0xd5269103,
+    0x3d3101a2}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x0000000000000000, 0xa19017e800000000, 0x03275e0b00000000,
+    0xa2b749e300000000, 0x064ebc1600000000, 0xa7deabfe00000000,
+    0x0569e21d00000000, 0xa4f9f5f500000000, 0x0c9c782d00000000,
+    0xad0c6fc500000000, 0x0fbb262600000000, 0xae2b31ce00000000,
+    0x0ad2c43b00000000, 0xab42d3d300000000, 0x09f59a3000000000,
+    0xa8658dd800000000, 0x1838f15a00000000, 0xb9a8e6b200000000,
+    0x1b1faf5100000000, 0xba8fb8b900000000, 0x1e764d4c00000000,
+    0xbfe65aa400000000, 0x1d51134700000000, 0xbcc104af00000000,
+    0x14a4897700000000, 0xb5349e9f00000000, 0x1783d77c00000000,
+    0xb613c09400000000, 0x12ea356100000000, 0xb37a228900000000,
+    0x11cd6b6a00000000, 0xb05d7c8200000000, 0x3070e2b500000000,
+    0x91e0f55d00000000, 0x3357bcbe00000000, 0x92c7ab5600000000,
+    0x363e5ea300000000, 0x97ae494b00000000, 0x351900a800000000,
+    0x9489174000000000, 0x3cec9a9800000000, 0x9d7c8d7000000000,
+    0x3fcbc49300000000, 0x9e5bd37b00000000, 0x3aa2268e00000000,
+    0x9b32316600000000, 0x3985788500000000, 0x98156f6d00000000,
+    0x284813ef00000000, 0x89d8040700000000, 0x2b6f4de400000000,
+    0x8aff5a0c00000000, 0x2e06aff900000000, 0x8f96b81100000000,
+    0x2d21f1f200000000, 0x8cb1e61a00000000, 0x24d46bc200000000,
+    0x85447c2a00000000, 0x27f335c900000000, 0x8663222100000000,
+    0x229ad7d400000000, 0x830ac03c00000000, 0x21bd89df00000000,
+    0x802d9e3700000000, 0x21e6b5b000000000, 0x8076a25800000000,
+    0x22c1ebbb00000000, 0x8351fc5300000000, 0x27a809a600000000,
+    0x86381e4e00000000, 0x248f57ad00000000, 0x851f404500000000,
+    0x2d7acd9d00000000, 0x8ceada7500000000, 0x2e5d939600000000,
+    0x8fcd847e00000000, 0x2b34718b00000000, 0x8aa4666300000000,
+    0x28132f8000000000, 0x8983386800000000, 0x39de44ea00000000,
+    0x984e530200000000, 0x3af91ae100000000, 0x9b690d0900000000,
+    0x3f90f8fc00000000, 0x9e00ef1400000000, 0x3cb7a6f700000000,
+    0x9d27b11f00000000, 0x35423cc700000000, 0x94d22b2f00000000,
+    0x366562cc00000000, 0x97f5752400000000, 0x330c80d100000000,
+    0x929c973900000000, 0x302bdeda00000000, 0x91bbc93200000000,
+    0x1196570500000000, 0xb00640ed00000000, 0x12b1090e00000000,
+    0xb3211ee600000000, 0x17d8eb1300000000, 0xb648fcfb00000000,
+    0x14ffb51800000000, 0xb56fa2f000000000, 0x1d0a2f2800000000,
+    0xbc9a38c000000000, 0x1e2d712300000000, 0xbfbd66cb00000000,
+    0x1b44933e00000000, 0xbad484d600000000, 0x1863cd3500000000,
+    0xb9f3dadd00000000, 0x09aea65f00000000, 0xa83eb1b700000000,
+    0x0a89f85400000000, 0xab19efbc00000000, 0x0fe01a4900000000,
+    0xae700da100000000, 0x0cc7444200000000, 0xad5753aa00000000,
+    0x0532de7200000000, 0xa4a2c99a00000000, 0x0615807900000000,
+    0xa785979100000000, 0x037c626400000000, 0xa2ec758c00000000,
+    0x005b3c6f00000000, 0xa1cb2b8700000000, 0x03ca1aba00000000,
+    0xa25a0d5200000000, 0x00ed44b100000000, 0xa17d535900000000,
+    0x0584a6ac00000000, 0xa414b14400000000, 0x06a3f8a700000000,
+    0xa733ef4f00000000, 0x0f56629700000000, 0xaec6757f00000000,
+    0x0c713c9c00000000, 0xade12b7400000000, 0x0918de8100000000,
+    0xa888c96900000000, 0x0a3f808a00000000, 0xabaf976200000000,
+    0x1bf2ebe000000000, 0xba62fc0800000000, 0x18d5b5eb00000000,
+    0xb945a20300000000, 0x1dbc57f600000000, 0xbc2c401e00000000,
+    0x1e9b09fd00000000, 0xbf0b1e1500000000, 0x176e93cd00000000,
+    0xb6fe842500000000, 0x1449cdc600000000, 0xb5d9da2e00000000,
+    0x11202fdb00000000, 0xb0b0383300000000, 0x120771d000000000,
+    0xb397663800000000, 0x33baf80f00000000, 0x922aefe700000000,
+    0x309da60400000000, 0x910db1ec00000000, 0x35f4441900000000,
+    0x946453f100000000, 0x36d31a1200000000, 0x97430dfa00000000,
+    0x3f26802200000000, 0x9eb697ca00000000, 0x3c01de2900000000,
+    0x9d91c9c100000000, 0x39683c3400000000, 0x98f82bdc00000000,
+    0x3a4f623f00000000, 0x9bdf75d700000000, 0x2b82095500000000,
+    0x8a121ebd00000000, 0x28a5575e00000000, 0x893540b600000000,
+    0x2dccb54300000000, 0x8c5ca2ab00000000, 0x2eebeb4800000000,
+    0x8f7bfca000000000, 0x271e717800000000, 0x868e669000000000,
+    0x24392f7300000000, 0x85a9389b00000000, 0x2150cd6e00000000,
+    0x80c0da8600000000, 0x2277936500000000, 0x83e7848d00000000,
+    0x222caf0a00000000, 0x83bcb8e200000000, 0x210bf10100000000,
+    0x809be6e900000000, 0x2462131c00000000, 0x85f204f400000000,
+    0x27454d1700000000, 0x86d55aff00000000, 0x2eb0d72700000000,
+    0x8f20c0cf00000000, 0x2d97892c00000000, 0x8c079ec400000000,
+    0x28fe6b3100000000, 0x896e7cd900000000, 0x2bd9353a00000000,
+    0x8a4922d200000000, 0x3a145e5000000000, 0x9b8449b800000000,
+    0x3933005b00000000, 0x98a317b300000000, 0x3c5ae24600000000,
+    0x9dcaf5ae00000000, 0x3f7dbc4d00000000, 0x9eedaba500000000,
+    0x3688267d00000000, 0x9718319500000000, 0x35af787600000000,
+    0x943f6f9e00000000, 0x30c69a6b00000000, 0x91568d8300000000,
+    0x33e1c46000000000, 0x9271d38800000000, 0x125c4dbf00000000,
+    0xb3cc5a5700000000, 0x117b13b400000000, 0xb0eb045c00000000,
+    0x1412f1a900000000, 0xb582e64100000000, 0x1735afa200000000,
+    0xb6a5b84a00000000, 0x1ec0359200000000, 0xbf50227a00000000,
+    0x1de76b9900000000, 0xbc777c7100000000, 0x188e898400000000,
+    0xb91e9e6c00000000, 0x1ba9d78f00000000, 0xba39c06700000000,
+    0x0a64bce500000000, 0xabf4ab0d00000000, 0x0943e2ee00000000,
+    0xa8d3f50600000000, 0x0c2a00f300000000, 0xadba171b00000000,
+    0x0f0d5ef800000000, 0xae9d491000000000, 0x06f8c4c800000000,
+    0xa768d32000000000, 0x05df9ac300000000, 0xa44f8d2b00000000,
+    0x00b678de00000000, 0xa1266f3600000000, 0x039126d500000000,
+    0xa201313d00000000},
+   {0x0000000000000000, 0xee8439a100000000, 0x9d0f029900000000,
+    0x738b3b3800000000, 0x7b1975e900000000, 0x959d4c4800000000,
+    0xe616777000000000, 0x08924ed100000000, 0xb7349b0900000000,
+    0x59b0a2a800000000, 0x2a3b999000000000, 0xc4bfa03100000000,
+    0xcc2deee000000000, 0x22a9d74100000000, 0x5122ec7900000000,
+    0xbfa6d5d800000000, 0x6e69361300000000, 0x80ed0fb200000000,
+    0xf366348a00000000, 0x1de20d2b00000000, 0x157043fa00000000,
+    0xfbf47a5b00000000, 0x887f416300000000, 0x66fb78c200000000,
+    0xd95dad1a00000000, 0x37d994bb00000000, 0x4452af8300000000,
+    0xaad6962200000000, 0xa244d8f300000000, 0x4cc0e15200000000,
+    0x3f4bda6a00000000, 0xd1cfe3cb00000000, 0xdcd26c2600000000,
+    0x3256558700000000, 0x41dd6ebf00000000, 0xaf59571e00000000,
+    0xa7cb19cf00000000, 0x494f206e00000000, 0x3ac41b5600000000,
+    0xd44022f700000000, 0x6be6f72f00000000, 0x8562ce8e00000000,
+    0xf6e9f5b600000000, 0x186dcc1700000000, 0x10ff82c600000000,
+    0xfe7bbb6700000000, 0x8df0805f00000000, 0x6374b9fe00000000,
+    0xb2bb5a3500000000, 0x5c3f639400000000, 0x2fb458ac00000000,
+    0xc130610d00000000, 0xc9a22fdc00000000, 0x2726167d00000000,
+    0x54ad2d4500000000, 0xba2914e400000000, 0x058fc13c00000000,
+    0xeb0bf89d00000000, 0x9880c3a500000000, 0x7604fa0400000000,
+    0x7e96b4d500000000, 0x90128d7400000000, 0xe399b64c00000000,
+    0x0d1d8fed00000000, 0xb8a5d94c00000000, 0x5621e0ed00000000,
+    0x25aadbd500000000, 0xcb2ee27400000000, 0xc3bcaca500000000,
+    0x2d38950400000000, 0x5eb3ae3c00000000, 0xb037979d00000000,
+    0x0f91424500000000, 0xe1157be400000000, 0x929e40dc00000000,
+    0x7c1a797d00000000, 0x748837ac00000000, 0x9a0c0e0d00000000,
+    0xe987353500000000, 0x07030c9400000000, 0xd6ccef5f00000000,
+    0x3848d6fe00000000, 0x4bc3edc600000000, 0xa547d46700000000,
+    0xadd59ab600000000, 0x4351a31700000000, 0x30da982f00000000,
+    0xde5ea18e00000000, 0x61f8745600000000, 0x8f7c4df700000000,
+    0xfcf776cf00000000, 0x12734f6e00000000, 0x1ae101bf00000000,
+    0xf465381e00000000, 0x87ee032600000000, 0x696a3a8700000000,
+    0x6477b56a00000000, 0x8af38ccb00000000, 0xf978b7f300000000,
+    0x17fc8e5200000000, 0x1f6ec08300000000, 0xf1eaf92200000000,
+    0x8261c21a00000000, 0x6ce5fbbb00000000, 0xd3432e6300000000,
+    0x3dc717c200000000, 0x4e4c2cfa00000000, 0xa0c8155b00000000,
+    0xa85a5b8a00000000, 0x46de622b00000000, 0x3555591300000000,
+    0xdbd160b200000000, 0x0a1e837900000000, 0xe49abad800000000,
+    0x971181e000000000, 0x7995b84100000000, 0x7107f69000000000,
+    0x9f83cf3100000000, 0xec08f40900000000, 0x028ccda800000000,
+    0xbd2a187000000000, 0x53ae21d100000000, 0x20251ae900000000,
+    0xcea1234800000000, 0xc6336d9900000000, 0x28b7543800000000,
+    0x5b3c6f0000000000, 0xb5b856a100000000, 0x704bb39900000000,
+    0x9ecf8a3800000000, 0xed44b10000000000, 0x03c088a100000000,
+    0x0b52c67000000000, 0xe5d6ffd100000000, 0x965dc4e900000000,
+    0x78d9fd4800000000, 0xc77f289000000000, 0x29fb113100000000,
+    0x5a702a0900000000, 0xb4f413a800000000, 0xbc665d7900000000,
+    0x52e264d800000000, 0x21695fe000000000, 0xcfed664100000000,
+    0x1e22858a00000000, 0xf0a6bc2b00000000, 0x832d871300000000,
+    0x6da9beb200000000, 0x653bf06300000000, 0x8bbfc9c200000000,
+    0xf834f2fa00000000, 0x16b0cb5b00000000, 0xa9161e8300000000,
+    0x4792272200000000, 0x34191c1a00000000, 0xda9d25bb00000000,
+    0xd20f6b6a00000000, 0x3c8b52cb00000000, 0x4f0069f300000000,
+    0xa184505200000000, 0xac99dfbf00000000, 0x421de61e00000000,
+    0x3196dd2600000000, 0xdf12e48700000000, 0xd780aa5600000000,
+    0x390493f700000000, 0x4a8fa8cf00000000, 0xa40b916e00000000,
+    0x1bad44b600000000, 0xf5297d1700000000, 0x86a2462f00000000,
+    0x68267f8e00000000, 0x60b4315f00000000, 0x8e3008fe00000000,
+    0xfdbb33c600000000, 0x133f0a6700000000, 0xc2f0e9ac00000000,
+    0x2c74d00d00000000, 0x5fffeb3500000000, 0xb17bd29400000000,
+    0xb9e99c4500000000, 0x576da5e400000000, 0x24e69edc00000000,
+    0xca62a77d00000000, 0x75c472a500000000, 0x9b404b0400000000,
+    0xe8cb703c00000000, 0x064f499d00000000, 0x0edd074c00000000,
+    0xe0593eed00000000, 0x93d205d500000000, 0x7d563c7400000000,
+    0xc8ee6ad500000000, 0x266a537400000000, 0x55e1684c00000000,
+    0xbb6551ed00000000, 0xb3f71f3c00000000, 0x5d73269d00000000,
+    0x2ef81da500000000, 0xc07c240400000000, 0x7fdaf1dc00000000,
+    0x915ec87d00000000, 0xe2d5f34500000000, 0x0c51cae400000000,
+    0x04c3843500000000, 0xea47bd9400000000, 0x99cc86ac00000000,
+    0x7748bf0d00000000, 0xa6875cc600000000, 0x4803656700000000,
+    0x3b885e5f00000000, 0xd50c67fe00000000, 0xdd9e292f00000000,
+    0x331a108e00000000, 0x40912bb600000000, 0xae15121700000000,
+    0x11b3c7cf00000000, 0xff37fe6e00000000, 0x8cbcc55600000000,
+    0x6238fcf700000000, 0x6aaab22600000000, 0x842e8b8700000000,
+    0xf7a5b0bf00000000, 0x1921891e00000000, 0x143c06f300000000,
+    0xfab83f5200000000, 0x8933046a00000000, 0x67b73dcb00000000,
+    0x6f25731a00000000, 0x81a14abb00000000, 0xf22a718300000000,
+    0x1cae482200000000, 0xa3089dfa00000000, 0x4d8ca45b00000000,
+    0x3e079f6300000000, 0xd083a6c200000000, 0xd811e81300000000,
+    0x3695d1b200000000, 0x451eea8a00000000, 0xab9ad32b00000000,
+    0x7a5530e000000000, 0x94d1094100000000, 0xe75a327900000000,
+    0x09de0bd800000000, 0x014c450900000000, 0xefc87ca800000000,
+    0x9c43479000000000, 0x72c77e3100000000, 0xcd61abe900000000,
+    0x23e5924800000000, 0x506ea97000000000, 0xbeea90d100000000,
+    0xb678de0000000000, 0x58fce7a100000000, 0x2b77dc9900000000,
+    0xc5f3e53800000000},
+   {0x0000000000000000, 0xfbf6134700000000, 0xf6ed278e00000000,
+    0x0d1b34c900000000, 0xaddd3ec700000000, 0x562b2d8000000000,
+    0x5b30194900000000, 0xa0c60a0e00000000, 0x1bbd0c5500000000,
+    0xe04b1f1200000000, 0xed502bdb00000000, 0x16a6389c00000000,
+    0xb660329200000000, 0x4d9621d500000000, 0x408d151c00000000,
+    0xbb7b065b00000000, 0x367a19aa00000000, 0xcd8c0aed00000000,
+    0xc0973e2400000000, 0x3b612d6300000000, 0x9ba7276d00000000,
+    0x6051342a00000000, 0x6d4a00e300000000, 0x96bc13a400000000,
+    0x2dc715ff00000000, 0xd63106b800000000, 0xdb2a327100000000,
+    0x20dc213600000000, 0x801a2b3800000000, 0x7bec387f00000000,
+    0x76f70cb600000000, 0x8d011ff100000000, 0x2df2438f00000000,
+    0xd60450c800000000, 0xdb1f640100000000, 0x20e9774600000000,
+    0x802f7d4800000000, 0x7bd96e0f00000000, 0x76c25ac600000000,
+    0x8d34498100000000, 0x364f4fda00000000, 0xcdb95c9d00000000,
+    0xc0a2685400000000, 0x3b547b1300000000, 0x9b92711d00000000,
+    0x6064625a00000000, 0x6d7f569300000000, 0x968945d400000000,
+    0x1b885a2500000000, 0xe07e496200000000, 0xed657dab00000000,
+    0x16936eec00000000, 0xb65564e200000000, 0x4da377a500000000,
+    0x40b8436c00000000, 0xbb4e502b00000000, 0x0035567000000000,
+    0xfbc3453700000000, 0xf6d871fe00000000, 0x0d2e62b900000000,
+    0xade868b700000000, 0x561e7bf000000000, 0x5b054f3900000000,
+    0xa0f35c7e00000000, 0x1be2f6c500000000, 0xe014e58200000000,
+    0xed0fd14b00000000, 0x16f9c20c00000000, 0xb63fc80200000000,
+    0x4dc9db4500000000, 0x40d2ef8c00000000, 0xbb24fccb00000000,
+    0x005ffa9000000000, 0xfba9e9d700000000, 0xf6b2dd1e00000000,
+    0x0d44ce5900000000, 0xad82c45700000000, 0x5674d71000000000,
+    0x5b6fe3d900000000, 0xa099f09e00000000, 0x2d98ef6f00000000,
+    0xd66efc2800000000, 0xdb75c8e100000000, 0x2083dba600000000,
+    0x8045d1a800000000, 0x7bb3c2ef00000000, 0x76a8f62600000000,
+    0x8d5ee56100000000, 0x3625e33a00000000, 0xcdd3f07d00000000,
+    0xc0c8c4b400000000, 0x3b3ed7f300000000, 0x9bf8ddfd00000000,
+    0x600eceba00000000, 0x6d15fa7300000000, 0x96e3e93400000000,
+    0x3610b54a00000000, 0xcde6a60d00000000, 0xc0fd92c400000000,
+    0x3b0b818300000000, 0x9bcd8b8d00000000, 0x603b98ca00000000,
+    0x6d20ac0300000000, 0x96d6bf4400000000, 0x2dadb91f00000000,
+    0xd65baa5800000000, 0xdb409e9100000000, 0x20b68dd600000000,
+    0x807087d800000000, 0x7b86949f00000000, 0x769da05600000000,
+    0x8d6bb31100000000, 0x006aace000000000, 0xfb9cbfa700000000,
+    0xf6878b6e00000000, 0x0d71982900000000, 0xadb7922700000000,
+    0x5641816000000000, 0x5b5ab5a900000000, 0xa0aca6ee00000000,
+    0x1bd7a0b500000000, 0xe021b3f200000000, 0xed3a873b00000000,
+    0x16cc947c00000000, 0xb60a9e7200000000, 0x4dfc8d3500000000,
+    0x40e7b9fc00000000, 0xbb11aabb00000000, 0x77c29c5000000000,
+    0x8c348f1700000000, 0x812fbbde00000000, 0x7ad9a89900000000,
+    0xda1fa29700000000, 0x21e9b1d000000000, 0x2cf2851900000000,
+    0xd704965e00000000, 0x6c7f900500000000, 0x9789834200000000,
+    0x9a92b78b00000000, 0x6164a4cc00000000, 0xc1a2aec200000000,
+    0x3a54bd8500000000, 0x374f894c00000000, 0xccb99a0b00000000,
+    0x41b885fa00000000, 0xba4e96bd00000000, 0xb755a27400000000,
+    0x4ca3b13300000000, 0xec65bb3d00000000, 0x1793a87a00000000,
+    0x1a889cb300000000, 0xe17e8ff400000000, 0x5a0589af00000000,
+    0xa1f39ae800000000, 0xace8ae2100000000, 0x571ebd6600000000,
+    0xf7d8b76800000000, 0x0c2ea42f00000000, 0x013590e600000000,
+    0xfac383a100000000, 0x5a30dfdf00000000, 0xa1c6cc9800000000,
+    0xacddf85100000000, 0x572beb1600000000, 0xf7ede11800000000,
+    0x0c1bf25f00000000, 0x0100c69600000000, 0xfaf6d5d100000000,
+    0x418dd38a00000000, 0xba7bc0cd00000000, 0xb760f40400000000,
+    0x4c96e74300000000, 0xec50ed4d00000000, 0x17a6fe0a00000000,
+    0x1abdcac300000000, 0xe14bd98400000000, 0x6c4ac67500000000,
+    0x97bcd53200000000, 0x9aa7e1fb00000000, 0x6151f2bc00000000,
+    0xc197f8b200000000, 0x3a61ebf500000000, 0x377adf3c00000000,
+    0xcc8ccc7b00000000, 0x77f7ca2000000000, 0x8c01d96700000000,
+    0x811aedae00000000, 0x7aecfee900000000, 0xda2af4e700000000,
+    0x21dce7a000000000, 0x2cc7d36900000000, 0xd731c02e00000000,
+    0x6c206a9500000000, 0x97d679d200000000, 0x9acd4d1b00000000,
+    0x613b5e5c00000000, 0xc1fd545200000000, 0x3a0b471500000000,
+    0x371073dc00000000, 0xcce6609b00000000, 0x779d66c000000000,
+    0x8c6b758700000000, 0x8170414e00000000, 0x7a86520900000000,
+    0xda40580700000000, 0x21b64b4000000000, 0x2cad7f8900000000,
+    0xd75b6cce00000000, 0x5a5a733f00000000, 0xa1ac607800000000,
+    0xacb754b100000000, 0x574147f600000000, 0xf7874df800000000,
+    0x0c715ebf00000000, 0x016a6a7600000000, 0xfa9c793100000000,
+    0x41e77f6a00000000, 0xba116c2d00000000, 0xb70a58e400000000,
+    0x4cfc4ba300000000, 0xec3a41ad00000000, 0x17cc52ea00000000,
+    0x1ad7662300000000, 0xe121756400000000, 0x41d2291a00000000,
+    0xba243a5d00000000, 0xb73f0e9400000000, 0x4cc91dd300000000,
+    0xec0f17dd00000000, 0x17f9049a00000000, 0x1ae2305300000000,
+    0xe114231400000000, 0x5a6f254f00000000, 0xa199360800000000,
+    0xac8202c100000000, 0x5774118600000000, 0xf7b21b8800000000,
+    0x0c4408cf00000000, 0x015f3c0600000000, 0xfaa92f4100000000,
+    0x77a830b000000000, 0x8c5e23f700000000, 0x8145173e00000000,
+    0x7ab3047900000000, 0xda750e7700000000, 0x21831d3000000000,
+    0x2c9829f900000000, 0xd76e3abe00000000, 0x6c153ce500000000,
+    0x97e32fa200000000, 0x9af81b6b00000000, 0x610e082c00000000,
+    0xc1c8022200000000, 0x3a3e116500000000, 0x372525ac00000000,
+    0xccd336eb00000000},
+   {0x0000000000000000, 0x6238282a00000000, 0xc470505400000000,
+    0xa648787e00000000, 0x88e1a0a800000000, 0xead9888200000000,
+    0x4c91f0fc00000000, 0x2ea9d8d600000000, 0x51c5308a00000000,
+    0x33fd18a000000000, 0x95b560de00000000, 0xf78d48f400000000,
+    0xd924902200000000, 0xbb1cb80800000000, 0x1d54c07600000000,
+    0x7f6ce85c00000000, 0xe38c10cf00000000, 0x81b438e500000000,
+    0x27fc409b00000000, 0x45c468b100000000, 0x6b6db06700000000,
+    0x0955984d00000000, 0xaf1de03300000000, 0xcd25c81900000000,
+    0xb249204500000000, 0xd071086f00000000, 0x7639701100000000,
+    0x1401583b00000000, 0x3aa880ed00000000, 0x5890a8c700000000,
+    0xfed8d0b900000000, 0x9ce0f89300000000, 0x871f504500000000,
+    0xe527786f00000000, 0x436f001100000000, 0x2157283b00000000,
+    0x0ffef0ed00000000, 0x6dc6d8c700000000, 0xcb8ea0b900000000,
+    0xa9b6889300000000, 0xd6da60cf00000000, 0xb4e248e500000000,
+    0x12aa309b00000000, 0x709218b100000000, 0x5e3bc06700000000,
+    0x3c03e84d00000000, 0x9a4b903300000000, 0xf873b81900000000,
+    0x6493408a00000000, 0x06ab68a000000000, 0xa0e310de00000000,
+    0xc2db38f400000000, 0xec72e02200000000, 0x8e4ac80800000000,
+    0x2802b07600000000, 0x4a3a985c00000000, 0x3556700000000000,
+    0x576e582a00000000, 0xf126205400000000, 0x931e087e00000000,
+    0xbdb7d0a800000000, 0xdf8ff88200000000, 0x79c780fc00000000,
+    0x1bffa8d600000000, 0x0e3fa08a00000000, 0x6c0788a000000000,
+    0xca4ff0de00000000, 0xa877d8f400000000, 0x86de002200000000,
+    0xe4e6280800000000, 0x42ae507600000000, 0x2096785c00000000,
+    0x5ffa900000000000, 0x3dc2b82a00000000, 0x9b8ac05400000000,
+    0xf9b2e87e00000000, 0xd71b30a800000000, 0xb523188200000000,
+    0x136b60fc00000000, 0x715348d600000000, 0xedb3b04500000000,
+    0x8f8b986f00000000, 0x29c3e01100000000, 0x4bfbc83b00000000,
+    0x655210ed00000000, 0x076a38c700000000, 0xa12240b900000000,
+    0xc31a689300000000, 0xbc7680cf00000000, 0xde4ea8e500000000,
+    0x7806d09b00000000, 0x1a3ef8b100000000, 0x3497206700000000,
+    0x56af084d00000000, 0xf0e7703300000000, 0x92df581900000000,
+    0x8920f0cf00000000, 0xeb18d8e500000000, 0x4d50a09b00000000,
+    0x2f6888b100000000, 0x01c1506700000000, 0x63f9784d00000000,
+    0xc5b1003300000000, 0xa789281900000000, 0xd8e5c04500000000,
+    0xbadde86f00000000, 0x1c95901100000000, 0x7eadb83b00000000,
+    0x500460ed00000000, 0x323c48c700000000, 0x947430b900000000,
+    0xf64c189300000000, 0x6aace00000000000, 0x0894c82a00000000,
+    0xaedcb05400000000, 0xcce4987e00000000, 0xe24d40a800000000,
+    0x8075688200000000, 0x263d10fc00000000, 0x440538d600000000,
+    0x3b69d08a00000000, 0x5951f8a000000000, 0xff1980de00000000,
+    0x9d21a8f400000000, 0xb388702200000000, 0xd1b0580800000000,
+    0x77f8207600000000, 0x15c0085c00000000, 0x5d7831ce00000000,
+    0x3f4019e400000000, 0x9908619a00000000, 0xfb3049b000000000,
+    0xd599916600000000, 0xb7a1b94c00000000, 0x11e9c13200000000,
+    0x73d1e91800000000, 0x0cbd014400000000, 0x6e85296e00000000,
+    0xc8cd511000000000, 0xaaf5793a00000000, 0x845ca1ec00000000,
+    0xe66489c600000000, 0x402cf1b800000000, 0x2214d99200000000,
+    0xbef4210100000000, 0xdccc092b00000000, 0x7a84715500000000,
+    0x18bc597f00000000, 0x361581a900000000, 0x542da98300000000,
+    0xf265d1fd00000000, 0x905df9d700000000, 0xef31118b00000000,
+    0x8d0939a100000000, 0x2b4141df00000000, 0x497969f500000000,
+    0x67d0b12300000000, 0x05e8990900000000, 0xa3a0e17700000000,
+    0xc198c95d00000000, 0xda67618b00000000, 0xb85f49a100000000,
+    0x1e1731df00000000, 0x7c2f19f500000000, 0x5286c12300000000,
+    0x30bee90900000000, 0x96f6917700000000, 0xf4ceb95d00000000,
+    0x8ba2510100000000, 0xe99a792b00000000, 0x4fd2015500000000,
+    0x2dea297f00000000, 0x0343f1a900000000, 0x617bd98300000000,
+    0xc733a1fd00000000, 0xa50b89d700000000, 0x39eb714400000000,
+    0x5bd3596e00000000, 0xfd9b211000000000, 0x9fa3093a00000000,
+    0xb10ad1ec00000000, 0xd332f9c600000000, 0x757a81b800000000,
+    0x1742a99200000000, 0x682e41ce00000000, 0x0a1669e400000000,
+    0xac5e119a00000000, 0xce6639b000000000, 0xe0cfe16600000000,
+    0x82f7c94c00000000, 0x24bfb13200000000, 0x4687991800000000,
+    0x5347914400000000, 0x317fb96e00000000, 0x9737c11000000000,
+    0xf50fe93a00000000, 0xdba631ec00000000, 0xb99e19c600000000,
+    0x1fd661b800000000, 0x7dee499200000000, 0x0282a1ce00000000,
+    0x60ba89e400000000, 0xc6f2f19a00000000, 0xa4cad9b000000000,
+    0x8a63016600000000, 0xe85b294c00000000, 0x4e13513200000000,
+    0x2c2b791800000000, 0xb0cb818b00000000, 0xd2f3a9a100000000,
+    0x74bbd1df00000000, 0x1683f9f500000000, 0x382a212300000000,
+    0x5a12090900000000, 0xfc5a717700000000, 0x9e62595d00000000,
+    0xe10eb10100000000, 0x8336992b00000000, 0x257ee15500000000,
+    0x4746c97f00000000, 0x69ef11a900000000, 0x0bd7398300000000,
+    0xad9f41fd00000000, 0xcfa769d700000000, 0xd458c10100000000,
+    0xb660e92b00000000, 0x1028915500000000, 0x7210b97f00000000,
+    0x5cb961a900000000, 0x3e81498300000000, 0x98c931fd00000000,
+    0xfaf119d700000000, 0x859df18b00000000, 0xe7a5d9a100000000,
+    0x41eda1df00000000, 0x23d589f500000000, 0x0d7c512300000000,
+    0x6f44790900000000, 0xc90c017700000000, 0xab34295d00000000,
+    0x37d4d1ce00000000, 0x55ecf9e400000000, 0xf3a4819a00000000,
+    0x919ca9b000000000, 0xbf35716600000000, 0xdd0d594c00000000,
+    0x7b45213200000000, 0x197d091800000000, 0x6611e14400000000,
+    0x0429c96e00000000, 0xa261b11000000000, 0xc059993a00000000,
+    0xeef041ec00000000, 0x8cc869c600000000, 0x2a8011b800000000,
+    0x48b8399200000000},
+   {0x0000000000000000, 0x4c2896a300000000, 0xd9565d9c00000000,
+    0x957ecb3f00000000, 0xf3abcbe300000000, 0xbf835d4000000000,
+    0x2afd967f00000000, 0x66d500dc00000000, 0xa751e61c00000000,
+    0xeb7970bf00000000, 0x7e07bb8000000000, 0x322f2d2300000000,
+    0x54fa2dff00000000, 0x18d2bb5c00000000, 0x8dac706300000000,
+    0xc184e6c000000000, 0x4ea3cc3900000000, 0x028b5a9a00000000,
+    0x97f591a500000000, 0xdbdd070600000000, 0xbd0807da00000000,
+    0xf120917900000000, 0x645e5a4600000000, 0x2876cce500000000,
+    0xe9f22a2500000000, 0xa5dabc8600000000, 0x30a477b900000000,
+    0x7c8ce11a00000000, 0x1a59e1c600000000, 0x5671776500000000,
+    0xc30fbc5a00000000, 0x8f272af900000000, 0x9c46997300000000,
+    0xd06e0fd000000000, 0x4510c4ef00000000, 0x0938524c00000000,
+    0x6fed529000000000, 0x23c5c43300000000, 0xb6bb0f0c00000000,
+    0xfa9399af00000000, 0x3b177f6f00000000, 0x773fe9cc00000000,
+    0xe24122f300000000, 0xae69b45000000000, 0xc8bcb48c00000000,
+    0x8494222f00000000, 0x11eae91000000000, 0x5dc27fb300000000,
+    0xd2e5554a00000000, 0x9ecdc3e900000000, 0x0bb308d600000000,
+    0x479b9e7500000000, 0x214e9ea900000000, 0x6d66080a00000000,
+    0xf818c33500000000, 0xb430559600000000, 0x75b4b35600000000,
+    0x399c25f500000000, 0xace2eeca00000000, 0xe0ca786900000000,
+    0x861f78b500000000, 0xca37ee1600000000, 0x5f49252900000000,
+    0x1361b38a00000000, 0x388d32e700000000, 0x74a5a44400000000,
+    0xe1db6f7b00000000, 0xadf3f9d800000000, 0xcb26f90400000000,
+    0x870e6fa700000000, 0x1270a49800000000, 0x5e58323b00000000,
+    0x9fdcd4fb00000000, 0xd3f4425800000000, 0x468a896700000000,
+    0x0aa21fc400000000, 0x6c771f1800000000, 0x205f89bb00000000,
+    0xb521428400000000, 0xf909d42700000000, 0x762efede00000000,
+    0x3a06687d00000000, 0xaf78a34200000000, 0xe35035e100000000,
+    0x8585353d00000000, 0xc9ada39e00000000, 0x5cd368a100000000,
+    0x10fbfe0200000000, 0xd17f18c200000000, 0x9d578e6100000000,
+    0x0829455e00000000, 0x4401d3fd00000000, 0x22d4d32100000000,
+    0x6efc458200000000, 0xfb828ebd00000000, 0xb7aa181e00000000,
+    0xa4cbab9400000000, 0xe8e33d3700000000, 0x7d9df60800000000,
+    0x31b560ab00000000, 0x5760607700000000, 0x1b48f6d400000000,
+    0x8e363deb00000000, 0xc21eab4800000000, 0x039a4d8800000000,
+    0x4fb2db2b00000000, 0xdacc101400000000, 0x96e486b700000000,
+    0xf031866b00000000, 0xbc1910c800000000, 0x2967dbf700000000,
+    0x654f4d5400000000, 0xea6867ad00000000, 0xa640f10e00000000,
+    0x333e3a3100000000, 0x7f16ac9200000000, 0x19c3ac4e00000000,
+    0x55eb3aed00000000, 0xc095f1d200000000, 0x8cbd677100000000,
+    0x4d3981b100000000, 0x0111171200000000, 0x946fdc2d00000000,
+    0xd8474a8e00000000, 0xbe924a5200000000, 0xf2badcf100000000,
+    0x67c417ce00000000, 0x2bec816d00000000, 0x311c141500000000,
+    0x7d3482b600000000, 0xe84a498900000000, 0xa462df2a00000000,
+    0xc2b7dff600000000, 0x8e9f495500000000, 0x1be1826a00000000,
+    0x57c914c900000000, 0x964df20900000000, 0xda6564aa00000000,
+    0x4f1baf9500000000, 0x0333393600000000, 0x65e639ea00000000,
+    0x29ceaf4900000000, 0xbcb0647600000000, 0xf098f2d500000000,
+    0x7fbfd82c00000000, 0x33974e8f00000000, 0xa6e985b000000000,
+    0xeac1131300000000, 0x8c1413cf00000000, 0xc03c856c00000000,
+    0x55424e5300000000, 0x196ad8f000000000, 0xd8ee3e3000000000,
+    0x94c6a89300000000, 0x01b863ac00000000, 0x4d90f50f00000000,
+    0x2b45f5d300000000, 0x676d637000000000, 0xf213a84f00000000,
+    0xbe3b3eec00000000, 0xad5a8d6600000000, 0xe1721bc500000000,
+    0x740cd0fa00000000, 0x3824465900000000, 0x5ef1468500000000,
+    0x12d9d02600000000, 0x87a71b1900000000, 0xcb8f8dba00000000,
+    0x0a0b6b7a00000000, 0x4623fdd900000000, 0xd35d36e600000000,
+    0x9f75a04500000000, 0xf9a0a09900000000, 0xb588363a00000000,
+    0x20f6fd0500000000, 0x6cde6ba600000000, 0xe3f9415f00000000,
+    0xafd1d7fc00000000, 0x3aaf1cc300000000, 0x76878a6000000000,
+    0x10528abc00000000, 0x5c7a1c1f00000000, 0xc904d72000000000,
+    0x852c418300000000, 0x44a8a74300000000, 0x088031e000000000,
+    0x9dfefadf00000000, 0xd1d66c7c00000000, 0xb7036ca000000000,
+    0xfb2bfa0300000000, 0x6e55313c00000000, 0x227da79f00000000,
+    0x099126f200000000, 0x45b9b05100000000, 0xd0c77b6e00000000,
+    0x9cefedcd00000000, 0xfa3aed1100000000, 0xb6127bb200000000,
+    0x236cb08d00000000, 0x6f44262e00000000, 0xaec0c0ee00000000,
+    0xe2e8564d00000000, 0x77969d7200000000, 0x3bbe0bd100000000,
+    0x5d6b0b0d00000000, 0x11439dae00000000, 0x843d569100000000,
+    0xc815c03200000000, 0x4732eacb00000000, 0x0b1a7c6800000000,
+    0x9e64b75700000000, 0xd24c21f400000000, 0xb499212800000000,
+    0xf8b1b78b00000000, 0x6dcf7cb400000000, 0x21e7ea1700000000,
+    0xe0630cd700000000, 0xac4b9a7400000000, 0x3935514b00000000,
+    0x751dc7e800000000, 0x13c8c73400000000, 0x5fe0519700000000,
+    0xca9e9aa800000000, 0x86b60c0b00000000, 0x95d7bf8100000000,
+    0xd9ff292200000000, 0x4c81e21d00000000, 0x00a974be00000000,
+    0x667c746200000000, 0x2a54e2c100000000, 0xbf2a29fe00000000,
+    0xf302bf5d00000000, 0x3286599d00000000, 0x7eaecf3e00000000,
+    0xebd0040100000000, 0xa7f892a200000000, 0xc12d927e00000000,
+    0x8d0504dd00000000, 0x187bcfe200000000, 0x5453594100000000,
+    0xdb7473b800000000, 0x975ce51b00000000, 0x02222e2400000000,
+    0x4e0ab88700000000, 0x28dfb85b00000000, 0x64f72ef800000000,
+    0xf189e5c700000000, 0xbda1736400000000, 0x7c2595a400000000,
+    0x300d030700000000, 0xa573c83800000000, 0xe95b5e9b00000000,
+    0x8f8e5e4700000000, 0xc3a6c8e400000000, 0x56d803db00000000,
+    0x1af0957800000000},
+   {0x0000000000000000, 0x939bc97f00000000, 0x263793ff00000000,
+    0xb5ac5a8000000000, 0x0d68572400000000, 0x9ef39e5b00000000,
+    0x2b5fc4db00000000, 0xb8c40da400000000, 0x1ad0ae4800000000,
+    0x894b673700000000, 0x3ce73db700000000, 0xaf7cf4c800000000,
+    0x17b8f96c00000000, 0x8423301300000000, 0x318f6a9300000000,
+    0xa214a3ec00000000, 0x34a05d9100000000, 0xa73b94ee00000000,
+    0x1297ce6e00000000, 0x810c071100000000, 0x39c80ab500000000,
+    0xaa53c3ca00000000, 0x1fff994a00000000, 0x8c64503500000000,
+    0x2e70f3d900000000, 0xbdeb3aa600000000, 0x0847602600000000,
+    0x9bdca95900000000, 0x2318a4fd00000000, 0xb0836d8200000000,
+    0x052f370200000000, 0x96b4fe7d00000000, 0x2946caf900000000,
+    0xbadd038600000000, 0x0f71590600000000, 0x9cea907900000000,
+    0x242e9ddd00000000, 0xb7b554a200000000, 0x02190e2200000000,
+    0x9182c75d00000000, 0x339664b100000000, 0xa00dadce00000000,
+    0x15a1f74e00000000, 0x863a3e3100000000, 0x3efe339500000000,
+    0xad65faea00000000, 0x18c9a06a00000000, 0x8b52691500000000,
+    0x1de6976800000000, 0x8e7d5e1700000000, 0x3bd1049700000000,
+    0xa84acde800000000, 0x108ec04c00000000, 0x8315093300000000,
+    0x36b953b300000000, 0xa5229acc00000000, 0x0736392000000000,
+    0x94adf05f00000000, 0x2101aadf00000000, 0xb29a63a000000000,
+    0x0a5e6e0400000000, 0x99c5a77b00000000, 0x2c69fdfb00000000,
+    0xbff2348400000000, 0x138ae52800000000, 0x80112c5700000000,
+    0x35bd76d700000000, 0xa626bfa800000000, 0x1ee2b20c00000000,
+    0x8d797b7300000000, 0x38d521f300000000, 0xab4ee88c00000000,
+    0x095a4b6000000000, 0x9ac1821f00000000, 0x2f6dd89f00000000,
+    0xbcf611e000000000, 0x04321c4400000000, 0x97a9d53b00000000,
+    0x22058fbb00000000, 0xb19e46c400000000, 0x272ab8b900000000,
+    0xb4b171c600000000, 0x011d2b4600000000, 0x9286e23900000000,
+    0x2a42ef9d00000000, 0xb9d926e200000000, 0x0c757c6200000000,
+    0x9feeb51d00000000, 0x3dfa16f100000000, 0xae61df8e00000000,
+    0x1bcd850e00000000, 0x88564c7100000000, 0x309241d500000000,
+    0xa30988aa00000000, 0x16a5d22a00000000, 0x853e1b5500000000,
+    0x3acc2fd100000000, 0xa957e6ae00000000, 0x1cfbbc2e00000000,
+    0x8f60755100000000, 0x37a478f500000000, 0xa43fb18a00000000,
+    0x1193eb0a00000000, 0x8208227500000000, 0x201c819900000000,
+    0xb38748e600000000, 0x062b126600000000, 0x95b0db1900000000,
+    0x2d74d6bd00000000, 0xbeef1fc200000000, 0x0b43454200000000,
+    0x98d88c3d00000000, 0x0e6c724000000000, 0x9df7bb3f00000000,
+    0x285be1bf00000000, 0xbbc028c000000000, 0x0304256400000000,
+    0x909fec1b00000000, 0x2533b69b00000000, 0xb6a87fe400000000,
+    0x14bcdc0800000000, 0x8727157700000000, 0x328b4ff700000000,
+    0xa110868800000000, 0x19d48b2c00000000, 0x8a4f425300000000,
+    0x3fe318d300000000, 0xac78d1ac00000000, 0x2614cb5100000000,
+    0xb58f022e00000000, 0x002358ae00000000, 0x93b891d100000000,
+    0x2b7c9c7500000000, 0xb8e7550a00000000, 0x0d4b0f8a00000000,
+    0x9ed0c6f500000000, 0x3cc4651900000000, 0xaf5fac6600000000,
+    0x1af3f6e600000000, 0x89683f9900000000, 0x31ac323d00000000,
+    0xa237fb4200000000, 0x179ba1c200000000, 0x840068bd00000000,
+    0x12b496c000000000, 0x812f5fbf00000000, 0x3483053f00000000,
+    0xa718cc4000000000, 0x1fdcc1e400000000, 0x8c47089b00000000,
+    0x39eb521b00000000, 0xaa709b6400000000, 0x0864388800000000,
+    0x9bfff1f700000000, 0x2e53ab7700000000, 0xbdc8620800000000,
+    0x050c6fac00000000, 0x9697a6d300000000, 0x233bfc5300000000,
+    0xb0a0352c00000000, 0x0f5201a800000000, 0x9cc9c8d700000000,
+    0x2965925700000000, 0xbafe5b2800000000, 0x023a568c00000000,
+    0x91a19ff300000000, 0x240dc57300000000, 0xb7960c0c00000000,
+    0x1582afe000000000, 0x8619669f00000000, 0x33b53c1f00000000,
+    0xa02ef56000000000, 0x18eaf8c400000000, 0x8b7131bb00000000,
+    0x3edd6b3b00000000, 0xad46a24400000000, 0x3bf25c3900000000,
+    0xa869954600000000, 0x1dc5cfc600000000, 0x8e5e06b900000000,
+    0x369a0b1d00000000, 0xa501c26200000000, 0x10ad98e200000000,
+    0x8336519d00000000, 0x2122f27100000000, 0xb2b93b0e00000000,
+    0x0715618e00000000, 0x948ea8f100000000, 0x2c4aa55500000000,
+    0xbfd16c2a00000000, 0x0a7d36aa00000000, 0x99e6ffd500000000,
+    0x359e2e7900000000, 0xa605e70600000000, 0x13a9bd8600000000,
+    0x803274f900000000, 0x38f6795d00000000, 0xab6db02200000000,
+    0x1ec1eaa200000000, 0x8d5a23dd00000000, 0x2f4e803100000000,
+    0xbcd5494e00000000, 0x097913ce00000000, 0x9ae2dab100000000,
+    0x2226d71500000000, 0xb1bd1e6a00000000, 0x041144ea00000000,
+    0x978a8d9500000000, 0x013e73e800000000, 0x92a5ba9700000000,
+    0x2709e01700000000, 0xb492296800000000, 0x0c5624cc00000000,
+    0x9fcdedb300000000, 0x2a61b73300000000, 0xb9fa7e4c00000000,
+    0x1beedda000000000, 0x887514df00000000, 0x3dd94e5f00000000,
+    0xae42872000000000, 0x16868a8400000000, 0x851d43fb00000000,
+    0x30b1197b00000000, 0xa32ad00400000000, 0x1cd8e48000000000,
+    0x8f432dff00000000, 0x3aef777f00000000, 0xa974be0000000000,
+    0x11b0b3a400000000, 0x822b7adb00000000, 0x3787205b00000000,
+    0xa41ce92400000000, 0x06084ac800000000, 0x959383b700000000,
+    0x203fd93700000000, 0xb3a4104800000000, 0x0b601dec00000000,
+    0x98fbd49300000000, 0x2d578e1300000000, 0xbecc476c00000000,
+    0x2878b91100000000, 0xbbe3706e00000000, 0x0e4f2aee00000000,
+    0x9dd4e39100000000, 0x2510ee3500000000, 0xb68b274a00000000,
+    0x03277dca00000000, 0x90bcb4b500000000, 0x32a8175900000000,
+    0xa133de2600000000, 0x149f84a600000000, 0x87044dd900000000,
+    0x3fc0407d00000000, 0xac5b890200000000, 0x19f7d38200000000,
+    0x8a6c1afd00000000},
+   {0x0000000000000000, 0x650b796900000000, 0xca16f2d200000000,
+    0xaf1d8bbb00000000, 0xd52b957e00000000, 0xb020ec1700000000,
+    0x1f3d67ac00000000, 0x7a361ec500000000, 0xaa572afd00000000,
+    0xcf5c539400000000, 0x6041d82f00000000, 0x054aa14600000000,
+    0x7f7cbf8300000000, 0x1a77c6ea00000000, 0xb56a4d5100000000,
+    0xd061343800000000, 0x15a9252100000000, 0x70a25c4800000000,
+    0xdfbfd7f300000000, 0xbab4ae9a00000000, 0xc082b05f00000000,
+    0xa589c93600000000, 0x0a94428d00000000, 0x6f9f3be400000000,
+    0xbffe0fdc00000000, 0xdaf576b500000000, 0x75e8fd0e00000000,
+    0x10e3846700000000, 0x6ad59aa200000000, 0x0fdee3cb00000000,
+    0xa0c3687000000000, 0xc5c8111900000000, 0x2a524b4200000000,
+    0x4f59322b00000000, 0xe044b99000000000, 0x854fc0f900000000,
+    0xff79de3c00000000, 0x9a72a75500000000, 0x356f2cee00000000,
+    0x5064558700000000, 0x800561bf00000000, 0xe50e18d600000000,
+    0x4a13936d00000000, 0x2f18ea0400000000, 0x552ef4c100000000,
+    0x30258da800000000, 0x9f38061300000000, 0xfa337f7a00000000,
+    0x3ffb6e6300000000, 0x5af0170a00000000, 0xf5ed9cb100000000,
+    0x90e6e5d800000000, 0xead0fb1d00000000, 0x8fdb827400000000,
+    0x20c609cf00000000, 0x45cd70a600000000, 0x95ac449e00000000,
+    0xf0a73df700000000, 0x5fbab64c00000000, 0x3ab1cf2500000000,
+    0x4087d1e000000000, 0x258ca88900000000, 0x8a91233200000000,
+    0xef9a5a5b00000000, 0x54a4968400000000, 0x31afefed00000000,
+    0x9eb2645600000000, 0xfbb91d3f00000000, 0x818f03fa00000000,
+    0xe4847a9300000000, 0x4b99f12800000000, 0x2e92884100000000,
+    0xfef3bc7900000000, 0x9bf8c51000000000, 0x34e54eab00000000,
+    0x51ee37c200000000, 0x2bd8290700000000, 0x4ed3506e00000000,
+    0xe1cedbd500000000, 0x84c5a2bc00000000, 0x410db3a500000000,
+    0x2406cacc00000000, 0x8b1b417700000000, 0xee10381e00000000,
+    0x942626db00000000, 0xf12d5fb200000000, 0x5e30d40900000000,
+    0x3b3bad6000000000, 0xeb5a995800000000, 0x8e51e03100000000,
+    0x214c6b8a00000000, 0x444712e300000000, 0x3e710c2600000000,
+    0x5b7a754f00000000, 0xf467fef400000000, 0x916c879d00000000,
+    0x7ef6ddc600000000, 0x1bfda4af00000000, 0xb4e02f1400000000,
+    0xd1eb567d00000000, 0xabdd48b800000000, 0xced631d100000000,
+    0x61cbba6a00000000, 0x04c0c30300000000, 0xd4a1f73b00000000,
+    0xb1aa8e5200000000, 0x1eb705e900000000, 0x7bbc7c8000000000,
+    0x018a624500000000, 0x64811b2c00000000, 0xcb9c909700000000,
+    0xae97e9fe00000000, 0x6b5ff8e700000000, 0x0e54818e00000000,
+    0xa1490a3500000000, 0xc442735c00000000, 0xbe746d9900000000,
+    0xdb7f14f000000000, 0x74629f4b00000000, 0x1169e62200000000,
+    0xc108d21a00000000, 0xa403ab7300000000, 0x0b1e20c800000000,
+    0x6e1559a100000000, 0x1423476400000000, 0x71283e0d00000000,
+    0xde35b5b600000000, 0xbb3eccdf00000000, 0xe94e5cd200000000,
+    0x8c4525bb00000000, 0x2358ae0000000000, 0x4653d76900000000,
+    0x3c65c9ac00000000, 0x596eb0c500000000, 0xf6733b7e00000000,
+    0x9378421700000000, 0x4319762f00000000, 0x26120f4600000000,
+    0x890f84fd00000000, 0xec04fd9400000000, 0x9632e35100000000,
+    0xf3399a3800000000, 0x5c24118300000000, 0x392f68ea00000000,
+    0xfce779f300000000, 0x99ec009a00000000, 0x36f18b2100000000,
+    0x53faf24800000000, 0x29ccec8d00000000, 0x4cc795e400000000,
+    0xe3da1e5f00000000, 0x86d1673600000000, 0x56b0530e00000000,
+    0x33bb2a6700000000, 0x9ca6a1dc00000000, 0xf9add8b500000000,
+    0x839bc67000000000, 0xe690bf1900000000, 0x498d34a200000000,
+    0x2c864dcb00000000, 0xc31c179000000000, 0xa6176ef900000000,
+    0x090ae54200000000, 0x6c019c2b00000000, 0x163782ee00000000,
+    0x733cfb8700000000, 0xdc21703c00000000, 0xb92a095500000000,
+    0x694b3d6d00000000, 0x0c40440400000000, 0xa35dcfbf00000000,
+    0xc656b6d600000000, 0xbc60a81300000000, 0xd96bd17a00000000,
+    0x76765ac100000000, 0x137d23a800000000, 0xd6b532b100000000,
+    0xb3be4bd800000000, 0x1ca3c06300000000, 0x79a8b90a00000000,
+    0x039ea7cf00000000, 0x6695dea600000000, 0xc988551d00000000,
+    0xac832c7400000000, 0x7ce2184c00000000, 0x19e9612500000000,
+    0xb6f4ea9e00000000, 0xd3ff93f700000000, 0xa9c98d3200000000,
+    0xccc2f45b00000000, 0x63df7fe000000000, 0x06d4068900000000,
+    0xbdeaca5600000000, 0xd8e1b33f00000000, 0x77fc388400000000,
+    0x12f741ed00000000, 0x68c15f2800000000, 0x0dca264100000000,
+    0xa2d7adfa00000000, 0xc7dcd49300000000, 0x17bde0ab00000000,
+    0x72b699c200000000, 0xddab127900000000, 0xb8a06b1000000000,
+    0xc29675d500000000, 0xa79d0cbc00000000, 0x0880870700000000,
+    0x6d8bfe6e00000000, 0xa843ef7700000000, 0xcd48961e00000000,
+    0x62551da500000000, 0x075e64cc00000000, 0x7d687a0900000000,
+    0x1863036000000000, 0xb77e88db00000000, 0xd275f1b200000000,
+    0x0214c58a00000000, 0x671fbce300000000, 0xc802375800000000,
+    0xad094e3100000000, 0xd73f50f400000000, 0xb234299d00000000,
+    0x1d29a22600000000, 0x7822db4f00000000, 0x97b8811400000000,
+    0xf2b3f87d00000000, 0x5dae73c600000000, 0x38a50aaf00000000,
+    0x4293146a00000000, 0x27986d0300000000, 0x8885e6b800000000,
+    0xed8e9fd100000000, 0x3defabe900000000, 0x58e4d28000000000,
+    0xf7f9593b00000000, 0x92f2205200000000, 0xe8c43e9700000000,
+    0x8dcf47fe00000000, 0x22d2cc4500000000, 0x47d9b52c00000000,
+    0x8211a43500000000, 0xe71add5c00000000, 0x480756e700000000,
+    0x2d0c2f8e00000000, 0x573a314b00000000, 0x3231482200000000,
+    0x9d2cc39900000000, 0xf827baf000000000, 0x28468ec800000000,
+    0x4d4df7a100000000, 0xe2507c1a00000000, 0x875b057300000000,
+    0xfd6d1bb600000000, 0x986662df00000000, 0x377be96400000000,
+    0x5270900d00000000},
+   {0x0000000000000000, 0xdcecb13d00000000, 0xb8d9637b00000000,
+    0x6435d24600000000, 0x70b3c7f600000000, 0xac5f76cb00000000,
+    0xc86aa48d00000000, 0x148615b000000000, 0xa160fe3600000000,
+    0x7d8c4f0b00000000, 0x19b99d4d00000000, 0xc5552c7000000000,
+    0xd1d339c000000000, 0x0d3f88fd00000000, 0x690a5abb00000000,
+    0xb5e6eb8600000000, 0x42c1fc6d00000000, 0x9e2d4d5000000000,
+    0xfa189f1600000000, 0x26f42e2b00000000, 0x32723b9b00000000,
+    0xee9e8aa600000000, 0x8aab58e000000000, 0x5647e9dd00000000,
+    0xe3a1025b00000000, 0x3f4db36600000000, 0x5b78612000000000,
+    0x8794d01d00000000, 0x9312c5ad00000000, 0x4ffe749000000000,
+    0x2bcba6d600000000, 0xf72717eb00000000, 0x8482f9db00000000,
+    0x586e48e600000000, 0x3c5b9aa000000000, 0xe0b72b9d00000000,
+    0xf4313e2d00000000, 0x28dd8f1000000000, 0x4ce85d5600000000,
+    0x9004ec6b00000000, 0x25e207ed00000000, 0xf90eb6d000000000,
+    0x9d3b649600000000, 0x41d7d5ab00000000, 0x5551c01b00000000,
+    0x89bd712600000000, 0xed88a36000000000, 0x3164125d00000000,
+    0xc64305b600000000, 0x1aafb48b00000000, 0x7e9a66cd00000000,
+    0xa276d7f000000000, 0xb6f0c24000000000, 0x6a1c737d00000000,
+    0x0e29a13b00000000, 0xd2c5100600000000, 0x6723fb8000000000,
+    0xbbcf4abd00000000, 0xdffa98fb00000000, 0x031629c600000000,
+    0x17903c7600000000, 0xcb7c8d4b00000000, 0xaf495f0d00000000,
+    0x73a5ee3000000000, 0x4903826c00000000, 0x95ef335100000000,
+    0xf1dae11700000000, 0x2d36502a00000000, 0x39b0459a00000000,
+    0xe55cf4a700000000, 0x816926e100000000, 0x5d8597dc00000000,
+    0xe8637c5a00000000, 0x348fcd6700000000, 0x50ba1f2100000000,
+    0x8c56ae1c00000000, 0x98d0bbac00000000, 0x443c0a9100000000,
+    0x2009d8d700000000, 0xfce569ea00000000, 0x0bc27e0100000000,
+    0xd72ecf3c00000000, 0xb31b1d7a00000000, 0x6ff7ac4700000000,
+    0x7b71b9f700000000, 0xa79d08ca00000000, 0xc3a8da8c00000000,
+    0x1f446bb100000000, 0xaaa2803700000000, 0x764e310a00000000,
+    0x127be34c00000000, 0xce97527100000000, 0xda1147c100000000,
+    0x06fdf6fc00000000, 0x62c824ba00000000, 0xbe24958700000000,
+    0xcd817bb700000000, 0x116dca8a00000000, 0x755818cc00000000,
+    0xa9b4a9f100000000, 0xbd32bc4100000000, 0x61de0d7c00000000,
+    0x05ebdf3a00000000, 0xd9076e0700000000, 0x6ce1858100000000,
+    0xb00d34bc00000000, 0xd438e6fa00000000, 0x08d457c700000000,
+    0x1c52427700000000, 0xc0bef34a00000000, 0xa48b210c00000000,
+    0x7867903100000000, 0x8f4087da00000000, 0x53ac36e700000000,
+    0x3799e4a100000000, 0xeb75559c00000000, 0xfff3402c00000000,
+    0x231ff11100000000, 0x472a235700000000, 0x9bc6926a00000000,
+    0x2e2079ec00000000, 0xf2ccc8d100000000, 0x96f91a9700000000,
+    0x4a15abaa00000000, 0x5e93be1a00000000, 0x827f0f2700000000,
+    0xe64add6100000000, 0x3aa66c5c00000000, 0x920604d900000000,
+    0x4eeab5e400000000, 0x2adf67a200000000, 0xf633d69f00000000,
+    0xe2b5c32f00000000, 0x3e59721200000000, 0x5a6ca05400000000,
+    0x8680116900000000, 0x3366faef00000000, 0xef8a4bd200000000,
+    0x8bbf999400000000, 0x575328a900000000, 0x43d53d1900000000,
+    0x9f398c2400000000, 0xfb0c5e6200000000, 0x27e0ef5f00000000,
+    0xd0c7f8b400000000, 0x0c2b498900000000, 0x681e9bcf00000000,
+    0xb4f22af200000000, 0xa0743f4200000000, 0x7c988e7f00000000,
+    0x18ad5c3900000000, 0xc441ed0400000000, 0x71a7068200000000,
+    0xad4bb7bf00000000, 0xc97e65f900000000, 0x1592d4c400000000,
+    0x0114c17400000000, 0xddf8704900000000, 0xb9cda20f00000000,
+    0x6521133200000000, 0x1684fd0200000000, 0xca684c3f00000000,
+    0xae5d9e7900000000, 0x72b12f4400000000, 0x66373af400000000,
+    0xbadb8bc900000000, 0xdeee598f00000000, 0x0202e8b200000000,
+    0xb7e4033400000000, 0x6b08b20900000000, 0x0f3d604f00000000,
+    0xd3d1d17200000000, 0xc757c4c200000000, 0x1bbb75ff00000000,
+    0x7f8ea7b900000000, 0xa362168400000000, 0x5445016f00000000,
+    0x88a9b05200000000, 0xec9c621400000000, 0x3070d32900000000,
+    0x24f6c69900000000, 0xf81a77a400000000, 0x9c2fa5e200000000,
+    0x40c314df00000000, 0xf525ff5900000000, 0x29c94e6400000000,
+    0x4dfc9c2200000000, 0x91102d1f00000000, 0x859638af00000000,
+    0x597a899200000000, 0x3d4f5bd400000000, 0xe1a3eae900000000,
+    0xdb0586b500000000, 0x07e9378800000000, 0x63dce5ce00000000,
+    0xbf3054f300000000, 0xabb6414300000000, 0x775af07e00000000,
+    0x136f223800000000, 0xcf83930500000000, 0x7a65788300000000,
+    0xa689c9be00000000, 0xc2bc1bf800000000, 0x1e50aac500000000,
+    0x0ad6bf7500000000, 0xd63a0e4800000000, 0xb20fdc0e00000000,
+    0x6ee36d3300000000, 0x99c47ad800000000, 0x4528cbe500000000,
+    0x211d19a300000000, 0xfdf1a89e00000000, 0xe977bd2e00000000,
+    0x359b0c1300000000, 0x51aede5500000000, 0x8d426f6800000000,
+    0x38a484ee00000000, 0xe44835d300000000, 0x807de79500000000,
+    0x5c9156a800000000, 0x4817431800000000, 0x94fbf22500000000,
+    0xf0ce206300000000, 0x2c22915e00000000, 0x5f877f6e00000000,
+    0x836bce5300000000, 0xe75e1c1500000000, 0x3bb2ad2800000000,
+    0x2f34b89800000000, 0xf3d809a500000000, 0x97eddbe300000000,
+    0x4b016ade00000000, 0xfee7815800000000, 0x220b306500000000,
+    0x463ee22300000000, 0x9ad2531e00000000, 0x8e5446ae00000000,
+    0x52b8f79300000000, 0x368d25d500000000, 0xea6194e800000000,
+    0x1d46830300000000, 0xc1aa323e00000000, 0xa59fe07800000000,
+    0x7973514500000000, 0x6df544f500000000, 0xb119f5c800000000,
+    0xd52c278e00000000, 0x09c096b300000000, 0xbc267d3500000000,
+    0x60cacc0800000000, 0x04ff1e4e00000000, 0xd813af7300000000,
+    0xcc95bac300000000, 0x10790bfe00000000, 0x744cd9b800000000,
+    0xa8a0688500000000}};
+
+#else /* W == 4 */
+
+local const z_crc_t FAR crc_braid_table[][256] = {
+   {0x00000000, 0x81256527, 0xd93bcc0f, 0x581ea928, 0x69069e5f,
+    0xe823fb78, 0xb03d5250, 0x31183777, 0xd20d3cbe, 0x53285999,
+    0x0b36f0b1, 0x8a139596, 0xbb0ba2e1, 0x3a2ec7c6, 0x62306eee,
+    0xe3150bc9, 0x7f6b7f3d, 0xfe4e1a1a, 0xa650b332, 0x2775d615,
+    0x166de162, 0x97488445, 0xcf562d6d, 0x4e73484a, 0xad664383,
+    0x2c4326a4, 0x745d8f8c, 0xf578eaab, 0xc460dddc, 0x4545b8fb,
+    0x1d5b11d3, 0x9c7e74f4, 0xfed6fe7a, 0x7ff39b5d, 0x27ed3275,
+    0xa6c85752, 0x97d06025, 0x16f50502, 0x4eebac2a, 0xcfcec90d,
+    0x2cdbc2c4, 0xadfea7e3, 0xf5e00ecb, 0x74c56bec, 0x45dd5c9b,
+    0xc4f839bc, 0x9ce69094, 0x1dc3f5b3, 0x81bd8147, 0x0098e460,
+    0x58864d48, 0xd9a3286f, 0xe8bb1f18, 0x699e7a3f, 0x3180d317,
+    0xb0a5b630, 0x53b0bdf9, 0xd295d8de, 0x8a8b71f6, 0x0bae14d1,
+    0x3ab623a6, 0xbb934681, 0xe38defa9, 0x62a88a8e, 0x26dcfab5,
+    0xa7f99f92, 0xffe736ba, 0x7ec2539d, 0x4fda64ea, 0xceff01cd,
+    0x96e1a8e5, 0x17c4cdc2, 0xf4d1c60b, 0x75f4a32c, 0x2dea0a04,
+    0xaccf6f23, 0x9dd75854, 0x1cf23d73, 0x44ec945b, 0xc5c9f17c,
+    0x59b78588, 0xd892e0af, 0x808c4987, 0x01a92ca0, 0x30b11bd7,
+    0xb1947ef0, 0xe98ad7d8, 0x68afb2ff, 0x8bbab936, 0x0a9fdc11,
+    0x52817539, 0xd3a4101e, 0xe2bc2769, 0x6399424e, 0x3b87eb66,
+    0xbaa28e41, 0xd80a04cf, 0x592f61e8, 0x0131c8c0, 0x8014ade7,
+    0xb10c9a90, 0x3029ffb7, 0x6837569f, 0xe91233b8, 0x0a073871,
+    0x8b225d56, 0xd33cf47e, 0x52199159, 0x6301a62e, 0xe224c309,
+    0xba3a6a21, 0x3b1f0f06, 0xa7617bf2, 0x26441ed5, 0x7e5ab7fd,
+    0xff7fd2da, 0xce67e5ad, 0x4f42808a, 0x175c29a2, 0x96794c85,
+    0x756c474c, 0xf449226b, 0xac578b43, 0x2d72ee64, 0x1c6ad913,
+    0x9d4fbc34, 0xc551151c, 0x4474703b, 0x4db9f56a, 0xcc9c904d,
+    0x94823965, 0x15a75c42, 0x24bf6b35, 0xa59a0e12, 0xfd84a73a,
+    0x7ca1c21d, 0x9fb4c9d4, 0x1e91acf3, 0x468f05db, 0xc7aa60fc,
+    0xf6b2578b, 0x779732ac, 0x2f899b84, 0xaeacfea3, 0x32d28a57,
+    0xb3f7ef70, 0xebe94658, 0x6acc237f, 0x5bd41408, 0xdaf1712f,
+    0x82efd807, 0x03cabd20, 0xe0dfb6e9, 0x61fad3ce, 0x39e47ae6,
+    0xb8c11fc1, 0x89d928b6, 0x08fc4d91, 0x50e2e4b9, 0xd1c7819e,
+    0xb36f0b10, 0x324a6e37, 0x6a54c71f, 0xeb71a238, 0xda69954f,
+    0x5b4cf068, 0x03525940, 0x82773c67, 0x616237ae, 0xe0475289,
+    0xb859fba1, 0x397c9e86, 0x0864a9f1, 0x8941ccd6, 0xd15f65fe,
+    0x507a00d9, 0xcc04742d, 0x4d21110a, 0x153fb822, 0x941add05,
+    0xa502ea72, 0x24278f55, 0x7c39267d, 0xfd1c435a, 0x1e094893,
+    0x9f2c2db4, 0xc732849c, 0x4617e1bb, 0x770fd6cc, 0xf62ab3eb,
+    0xae341ac3, 0x2f117fe4, 0x6b650fdf, 0xea406af8, 0xb25ec3d0,
+    0x337ba6f7, 0x02639180, 0x8346f4a7, 0xdb585d8f, 0x5a7d38a8,
+    0xb9683361, 0x384d5646, 0x6053ff6e, 0xe1769a49, 0xd06ead3e,
+    0x514bc819, 0x09556131, 0x88700416, 0x140e70e2, 0x952b15c5,
+    0xcd35bced, 0x4c10d9ca, 0x7d08eebd, 0xfc2d8b9a, 0xa43322b2,
+    0x25164795, 0xc6034c5c, 0x4726297b, 0x1f388053, 0x9e1de574,
+    0xaf05d203, 0x2e20b724, 0x763e1e0c, 0xf71b7b2b, 0x95b3f1a5,
+    0x14969482, 0x4c883daa, 0xcdad588d, 0xfcb56ffa, 0x7d900add,
+    0x258ea3f5, 0xa4abc6d2, 0x47becd1b, 0xc69ba83c, 0x9e850114,
+    0x1fa06433, 0x2eb85344, 0xaf9d3663, 0xf7839f4b, 0x76a6fa6c,
+    0xead88e98, 0x6bfdebbf, 0x33e34297, 0xb2c627b0, 0x83de10c7,
+    0x02fb75e0, 0x5ae5dcc8, 0xdbc0b9ef, 0x38d5b226, 0xb9f0d701,
+    0xe1ee7e29, 0x60cb1b0e, 0x51d32c79, 0xd0f6495e, 0x88e8e076,
+    0x09cd8551},
+   {0x00000000, 0x9b73ead4, 0xed96d3e9, 0x76e5393d, 0x005ca193,
+    0x9b2f4b47, 0xedca727a, 0x76b998ae, 0x00b94326, 0x9bcaa9f2,
+    0xed2f90cf, 0x765c7a1b, 0x00e5e2b5, 0x9b960861, 0xed73315c,
+    0x7600db88, 0x0172864c, 0x9a016c98, 0xece455a5, 0x7797bf71,
+    0x012e27df, 0x9a5dcd0b, 0xecb8f436, 0x77cb1ee2, 0x01cbc56a,
+    0x9ab82fbe, 0xec5d1683, 0x772efc57, 0x019764f9, 0x9ae48e2d,
+    0xec01b710, 0x77725dc4, 0x02e50c98, 0x9996e64c, 0xef73df71,
+    0x740035a5, 0x02b9ad0b, 0x99ca47df, 0xef2f7ee2, 0x745c9436,
+    0x025c4fbe, 0x992fa56a, 0xefca9c57, 0x74b97683, 0x0200ee2d,
+    0x997304f9, 0xef963dc4, 0x74e5d710, 0x03978ad4, 0x98e46000,
+    0xee01593d, 0x7572b3e9, 0x03cb2b47, 0x98b8c193, 0xee5df8ae,
+    0x752e127a, 0x032ec9f2, 0x985d2326, 0xeeb81a1b, 0x75cbf0cf,
+    0x03726861, 0x980182b5, 0xeee4bb88, 0x7597515c, 0x05ca1930,
+    0x9eb9f3e4, 0xe85ccad9, 0x732f200d, 0x0596b8a3, 0x9ee55277,
+    0xe8006b4a, 0x7373819e, 0x05735a16, 0x9e00b0c2, 0xe8e589ff,
+    0x7396632b, 0x052ffb85, 0x9e5c1151, 0xe8b9286c, 0x73cac2b8,
+    0x04b89f7c, 0x9fcb75a8, 0xe92e4c95, 0x725da641, 0x04e43eef,
+    0x9f97d43b, 0xe972ed06, 0x720107d2, 0x0401dc5a, 0x9f72368e,
+    0xe9970fb3, 0x72e4e567, 0x045d7dc9, 0x9f2e971d, 0xe9cbae20,
+    0x72b844f4, 0x072f15a8, 0x9c5cff7c, 0xeab9c641, 0x71ca2c95,
+    0x0773b43b, 0x9c005eef, 0xeae567d2, 0x71968d06, 0x0796568e,
+    0x9ce5bc5a, 0xea008567, 0x71736fb3, 0x07caf71d, 0x9cb91dc9,
+    0xea5c24f4, 0x712fce20, 0x065d93e4, 0x9d2e7930, 0xebcb400d,
+    0x70b8aad9, 0x06013277, 0x9d72d8a3, 0xeb97e19e, 0x70e40b4a,
+    0x06e4d0c2, 0x9d973a16, 0xeb72032b, 0x7001e9ff, 0x06b87151,
+    0x9dcb9b85, 0xeb2ea2b8, 0x705d486c, 0x0b943260, 0x90e7d8b4,
+    0xe602e189, 0x7d710b5d, 0x0bc893f3, 0x90bb7927, 0xe65e401a,
+    0x7d2daace, 0x0b2d7146, 0x905e9b92, 0xe6bba2af, 0x7dc8487b,
+    0x0b71d0d5, 0x90023a01, 0xe6e7033c, 0x7d94e9e8, 0x0ae6b42c,
+    0x91955ef8, 0xe77067c5, 0x7c038d11, 0x0aba15bf, 0x91c9ff6b,
+    0xe72cc656, 0x7c5f2c82, 0x0a5ff70a, 0x912c1dde, 0xe7c924e3,
+    0x7cbace37, 0x0a035699, 0x9170bc4d, 0xe7958570, 0x7ce66fa4,
+    0x09713ef8, 0x9202d42c, 0xe4e7ed11, 0x7f9407c5, 0x092d9f6b,
+    0x925e75bf, 0xe4bb4c82, 0x7fc8a656, 0x09c87dde, 0x92bb970a,
+    0xe45eae37, 0x7f2d44e3, 0x0994dc4d, 0x92e73699, 0xe4020fa4,
+    0x7f71e570, 0x0803b8b4, 0x93705260, 0xe5956b5d, 0x7ee68189,
+    0x085f1927, 0x932cf3f3, 0xe5c9cace, 0x7eba201a, 0x08bafb92,
+    0x93c91146, 0xe52c287b, 0x7e5fc2af, 0x08e65a01, 0x9395b0d5,
+    0xe57089e8, 0x7e03633c, 0x0e5e2b50, 0x952dc184, 0xe3c8f8b9,
+    0x78bb126d, 0x0e028ac3, 0x95716017, 0xe394592a, 0x78e7b3fe,
+    0x0ee76876, 0x959482a2, 0xe371bb9f, 0x7802514b, 0x0ebbc9e5,
+    0x95c82331, 0xe32d1a0c, 0x785ef0d8, 0x0f2cad1c, 0x945f47c8,
+    0xe2ba7ef5, 0x79c99421, 0x0f700c8f, 0x9403e65b, 0xe2e6df66,
+    0x799535b2, 0x0f95ee3a, 0x94e604ee, 0xe2033dd3, 0x7970d707,
+    0x0fc94fa9, 0x94baa57d, 0xe25f9c40, 0x792c7694, 0x0cbb27c8,
+    0x97c8cd1c, 0xe12df421, 0x7a5e1ef5, 0x0ce7865b, 0x97946c8f,
+    0xe17155b2, 0x7a02bf66, 0x0c0264ee, 0x97718e3a, 0xe194b707,
+    0x7ae75dd3, 0x0c5ec57d, 0x972d2fa9, 0xe1c81694, 0x7abbfc40,
+    0x0dc9a184, 0x96ba4b50, 0xe05f726d, 0x7b2c98b9, 0x0d950017,
+    0x96e6eac3, 0xe003d3fe, 0x7b70392a, 0x0d70e2a2, 0x96030876,
+    0xe0e6314b, 0x7b95db9f, 0x0d2c4331, 0x965fa9e5, 0xe0ba90d8,
+    0x7bc97a0c},
+   {0x00000000, 0x172864c0, 0x2e50c980, 0x3978ad40, 0x5ca19300,
+    0x4b89f7c0, 0x72f15a80, 0x65d93e40, 0xb9432600, 0xae6b42c0,
+    0x9713ef80, 0x803b8b40, 0xe5e2b500, 0xf2cad1c0, 0xcbb27c80,
+    0xdc9a1840, 0xa9f74a41, 0xbedf2e81, 0x87a783c1, 0x908fe701,
+    0xf556d941, 0xe27ebd81, 0xdb0610c1, 0xcc2e7401, 0x10b46c41,
+    0x079c0881, 0x3ee4a5c1, 0x29ccc101, 0x4c15ff41, 0x5b3d9b81,
+    0x624536c1, 0x756d5201, 0x889f92c3, 0x9fb7f603, 0xa6cf5b43,
+    0xb1e73f83, 0xd43e01c3, 0xc3166503, 0xfa6ec843, 0xed46ac83,
+    0x31dcb4c3, 0x26f4d003, 0x1f8c7d43, 0x08a41983, 0x6d7d27c3,
+    0x7a554303, 0x432dee43, 0x54058a83, 0x2168d882, 0x3640bc42,
+    0x0f381102, 0x181075c2, 0x7dc94b82, 0x6ae12f42, 0x53998202,
+    0x44b1e6c2, 0x982bfe82, 0x8f039a42, 0xb67b3702, 0xa15353c2,
+    0xc48a6d82, 0xd3a20942, 0xeadaa402, 0xfdf2c0c2, 0xca4e23c7,
+    0xdd664707, 0xe41eea47, 0xf3368e87, 0x96efb0c7, 0x81c7d407,
+    0xb8bf7947, 0xaf971d87, 0x730d05c7, 0x64256107, 0x5d5dcc47,
+    0x4a75a887, 0x2fac96c7, 0x3884f207, 0x01fc5f47, 0x16d43b87,
+    0x63b96986, 0x74910d46, 0x4de9a006, 0x5ac1c4c6, 0x3f18fa86,
+    0x28309e46, 0x11483306, 0x066057c6, 0xdafa4f86, 0xcdd22b46,
+    0xf4aa8606, 0xe382e2c6, 0x865bdc86, 0x9173b846, 0xa80b1506,
+    0xbf2371c6, 0x42d1b104, 0x55f9d5c4, 0x6c817884, 0x7ba91c44,
+    0x1e702204, 0x095846c4, 0x3020eb84, 0x27088f44, 0xfb929704,
+    0xecbaf3c4, 0xd5c25e84, 0xc2ea3a44, 0xa7330404, 0xb01b60c4,
+    0x8963cd84, 0x9e4ba944, 0xeb26fb45, 0xfc0e9f85, 0xc57632c5,
+    0xd25e5605, 0xb7876845, 0xa0af0c85, 0x99d7a1c5, 0x8effc505,
+    0x5265dd45, 0x454db985, 0x7c3514c5, 0x6b1d7005, 0x0ec44e45,
+    0x19ec2a85, 0x209487c5, 0x37bce305, 0x4fed41cf, 0x58c5250f,
+    0x61bd884f, 0x7695ec8f, 0x134cd2cf, 0x0464b60f, 0x3d1c1b4f,
+    0x2a347f8f, 0xf6ae67cf, 0xe186030f, 0xd8feae4f, 0xcfd6ca8f,
+    0xaa0ff4cf, 0xbd27900f, 0x845f3d4f, 0x9377598f, 0xe61a0b8e,
+    0xf1326f4e, 0xc84ac20e, 0xdf62a6ce, 0xbabb988e, 0xad93fc4e,
+    0x94eb510e, 0x83c335ce, 0x5f592d8e, 0x4871494e, 0x7109e40e,
+    0x662180ce, 0x03f8be8e, 0x14d0da4e, 0x2da8770e, 0x3a8013ce,
+    0xc772d30c, 0xd05ab7cc, 0xe9221a8c, 0xfe0a7e4c, 0x9bd3400c,
+    0x8cfb24cc, 0xb583898c, 0xa2abed4c, 0x7e31f50c, 0x691991cc,
+    0x50613c8c, 0x4749584c, 0x2290660c, 0x35b802cc, 0x0cc0af8c,
+    0x1be8cb4c, 0x6e85994d, 0x79adfd8d, 0x40d550cd, 0x57fd340d,
+    0x32240a4d, 0x250c6e8d, 0x1c74c3cd, 0x0b5ca70d, 0xd7c6bf4d,
+    0xc0eedb8d, 0xf99676cd, 0xeebe120d, 0x8b672c4d, 0x9c4f488d,
+    0xa537e5cd, 0xb21f810d, 0x85a36208, 0x928b06c8, 0xabf3ab88,
+    0xbcdbcf48, 0xd902f108, 0xce2a95c8, 0xf7523888, 0xe07a5c48,
+    0x3ce04408, 0x2bc820c8, 0x12b08d88, 0x0598e948, 0x6041d708,
+    0x7769b3c8, 0x4e111e88, 0x59397a48, 0x2c542849, 0x3b7c4c89,
+    0x0204e1c9, 0x152c8509, 0x70f5bb49, 0x67dddf89, 0x5ea572c9,
+    0x498d1609, 0x95170e49, 0x823f6a89, 0xbb47c7c9, 0xac6fa309,
+    0xc9b69d49, 0xde9ef989, 0xe7e654c9, 0xf0ce3009, 0x0d3cf0cb,
+    0x1a14940b, 0x236c394b, 0x34445d8b, 0x519d63cb, 0x46b5070b,
+    0x7fcdaa4b, 0x68e5ce8b, 0xb47fd6cb, 0xa357b20b, 0x9a2f1f4b,
+    0x8d077b8b, 0xe8de45cb, 0xfff6210b, 0xc68e8c4b, 0xd1a6e88b,
+    0xa4cbba8a, 0xb3e3de4a, 0x8a9b730a, 0x9db317ca, 0xf86a298a,
+    0xef424d4a, 0xd63ae00a, 0xc11284ca, 0x1d889c8a, 0x0aa0f84a,
+    0x33d8550a, 0x24f031ca, 0x41290f8a, 0x56016b4a, 0x6f79c60a,
+    0x7851a2ca},
+   {0x00000000, 0x9fda839e, 0xe4c4017d, 0x7b1e82e3, 0x12f904bb,
+    0x8d238725, 0xf63d05c6, 0x69e78658, 0x25f20976, 0xba288ae8,
+    0xc136080b, 0x5eec8b95, 0x370b0dcd, 0xa8d18e53, 0xd3cf0cb0,
+    0x4c158f2e, 0x4be412ec, 0xd43e9172, 0xaf201391, 0x30fa900f,
+    0x591d1657, 0xc6c795c9, 0xbdd9172a, 0x220394b4, 0x6e161b9a,
+    0xf1cc9804, 0x8ad21ae7, 0x15089979, 0x7cef1f21, 0xe3359cbf,
+    0x982b1e5c, 0x07f19dc2, 0x97c825d8, 0x0812a646, 0x730c24a5,
+    0xecd6a73b, 0x85312163, 0x1aeba2fd, 0x61f5201e, 0xfe2fa380,
+    0xb23a2cae, 0x2de0af30, 0x56fe2dd3, 0xc924ae4d, 0xa0c32815,
+    0x3f19ab8b, 0x44072968, 0xdbddaaf6, 0xdc2c3734, 0x43f6b4aa,
+    0x38e83649, 0xa732b5d7, 0xced5338f, 0x510fb011, 0x2a1132f2,
+    0xb5cbb16c, 0xf9de3e42, 0x6604bddc, 0x1d1a3f3f, 0x82c0bca1,
+    0xeb273af9, 0x74fdb967, 0x0fe33b84, 0x9039b81a, 0xf4e14df1,
+    0x6b3bce6f, 0x10254c8c, 0x8fffcf12, 0xe618494a, 0x79c2cad4,
+    0x02dc4837, 0x9d06cba9, 0xd1134487, 0x4ec9c719, 0x35d745fa,
+    0xaa0dc664, 0xc3ea403c, 0x5c30c3a2, 0x272e4141, 0xb8f4c2df,
+    0xbf055f1d, 0x20dfdc83, 0x5bc15e60, 0xc41bddfe, 0xadfc5ba6,
+    0x3226d838, 0x49385adb, 0xd6e2d945, 0x9af7566b, 0x052dd5f5,
+    0x7e335716, 0xe1e9d488, 0x880e52d0, 0x17d4d14e, 0x6cca53ad,
+    0xf310d033, 0x63296829, 0xfcf3ebb7, 0x87ed6954, 0x1837eaca,
+    0x71d06c92, 0xee0aef0c, 0x95146def, 0x0aceee71, 0x46db615f,
+    0xd901e2c1, 0xa21f6022, 0x3dc5e3bc, 0x542265e4, 0xcbf8e67a,
+    0xb0e66499, 0x2f3ce707, 0x28cd7ac5, 0xb717f95b, 0xcc097bb8,
+    0x53d3f826, 0x3a347e7e, 0xa5eefde0, 0xdef07f03, 0x412afc9d,
+    0x0d3f73b3, 0x92e5f02d, 0xe9fb72ce, 0x7621f150, 0x1fc67708,
+    0x801cf496, 0xfb027675, 0x64d8f5eb, 0x32b39da3, 0xad691e3d,
+    0xd6779cde, 0x49ad1f40, 0x204a9918, 0xbf901a86, 0xc48e9865,
+    0x5b541bfb, 0x174194d5, 0x889b174b, 0xf38595a8, 0x6c5f1636,
+    0x05b8906e, 0x9a6213f0, 0xe17c9113, 0x7ea6128d, 0x79578f4f,
+    0xe68d0cd1, 0x9d938e32, 0x02490dac, 0x6bae8bf4, 0xf474086a,
+    0x8f6a8a89, 0x10b00917, 0x5ca58639, 0xc37f05a7, 0xb8618744,
+    0x27bb04da, 0x4e5c8282, 0xd186011c, 0xaa9883ff, 0x35420061,
+    0xa57bb87b, 0x3aa13be5, 0x41bfb906, 0xde653a98, 0xb782bcc0,
+    0x28583f5e, 0x5346bdbd, 0xcc9c3e23, 0x8089b10d, 0x1f533293,
+    0x644db070, 0xfb9733ee, 0x9270b5b6, 0x0daa3628, 0x76b4b4cb,
+    0xe96e3755, 0xee9faa97, 0x71452909, 0x0a5babea, 0x95812874,
+    0xfc66ae2c, 0x63bc2db2, 0x18a2af51, 0x87782ccf, 0xcb6da3e1,
+    0x54b7207f, 0x2fa9a29c, 0xb0732102, 0xd994a75a, 0x464e24c4,
+    0x3d50a627, 0xa28a25b9, 0xc652d052, 0x598853cc, 0x2296d12f,
+    0xbd4c52b1, 0xd4abd4e9, 0x4b715777, 0x306fd594, 0xafb5560a,
+    0xe3a0d924, 0x7c7a5aba, 0x0764d859, 0x98be5bc7, 0xf159dd9f,
+    0x6e835e01, 0x159ddce2, 0x8a475f7c, 0x8db6c2be, 0x126c4120,
+    0x6972c3c3, 0xf6a8405d, 0x9f4fc605, 0x0095459b, 0x7b8bc778,
+    0xe45144e6, 0xa844cbc8, 0x379e4856, 0x4c80cab5, 0xd35a492b,
+    0xbabdcf73, 0x25674ced, 0x5e79ce0e, 0xc1a34d90, 0x519af58a,
+    0xce407614, 0xb55ef4f7, 0x2a847769, 0x4363f131, 0xdcb972af,
+    0xa7a7f04c, 0x387d73d2, 0x7468fcfc, 0xebb27f62, 0x90acfd81,
+    0x0f767e1f, 0x6691f847, 0xf94b7bd9, 0x8255f93a, 0x1d8f7aa4,
+    0x1a7ee766, 0x85a464f8, 0xfebae61b, 0x61606585, 0x0887e3dd,
+    0x975d6043, 0xec43e2a0, 0x7399613e, 0x3f8cee10, 0xa0566d8e,
+    0xdb48ef6d, 0x44926cf3, 0x2d75eaab, 0xb2af6935, 0xc9b1ebd6,
+    0x566b6848}};
+
+local const z_word_t FAR crc_braid_big_table[][256] = {
+   {0x00000000, 0x9e83da9f, 0x7d01c4e4, 0xe3821e7b, 0xbb04f912,
+    0x2587238d, 0xc6053df6, 0x5886e769, 0x7609f225, 0xe88a28ba,
+    0x0b0836c1, 0x958bec5e, 0xcd0d0b37, 0x538ed1a8, 0xb00ccfd3,
+    0x2e8f154c, 0xec12e44b, 0x72913ed4, 0x911320af, 0x0f90fa30,
+    0x57161d59, 0xc995c7c6, 0x2a17d9bd, 0xb4940322, 0x9a1b166e,
+    0x0498ccf1, 0xe71ad28a, 0x79990815, 0x211fef7c, 0xbf9c35e3,
+    0x5c1e2b98, 0xc29df107, 0xd825c897, 0x46a61208, 0xa5240c73,
+    0x3ba7d6ec, 0x63213185, 0xfda2eb1a, 0x1e20f561, 0x80a32ffe,
+    0xae2c3ab2, 0x30afe02d, 0xd32dfe56, 0x4dae24c9, 0x1528c3a0,
+    0x8bab193f, 0x68290744, 0xf6aadddb, 0x34372cdc, 0xaab4f643,
+    0x4936e838, 0xd7b532a7, 0x8f33d5ce, 0x11b00f51, 0xf232112a,
+    0x6cb1cbb5, 0x423edef9, 0xdcbd0466, 0x3f3f1a1d, 0xa1bcc082,
+    0xf93a27eb, 0x67b9fd74, 0x843be30f, 0x1ab83990, 0xf14de1f4,
+    0x6fce3b6b, 0x8c4c2510, 0x12cfff8f, 0x4a4918e6, 0xd4cac279,
+    0x3748dc02, 0xa9cb069d, 0x874413d1, 0x19c7c94e, 0xfa45d735,
+    0x64c60daa, 0x3c40eac3, 0xa2c3305c, 0x41412e27, 0xdfc2f4b8,
+    0x1d5f05bf, 0x83dcdf20, 0x605ec15b, 0xfedd1bc4, 0xa65bfcad,
+    0x38d82632, 0xdb5a3849, 0x45d9e2d6, 0x6b56f79a, 0xf5d52d05,
+    0x1657337e, 0x88d4e9e1, 0xd0520e88, 0x4ed1d417, 0xad53ca6c,
+    0x33d010f3, 0x29682963, 0xb7ebf3fc, 0x5469ed87, 0xcaea3718,
+    0x926cd071, 0x0cef0aee, 0xef6d1495, 0x71eece0a, 0x5f61db46,
+    0xc1e201d9, 0x22601fa2, 0xbce3c53d, 0xe4652254, 0x7ae6f8cb,
+    0x9964e6b0, 0x07e73c2f, 0xc57acd28, 0x5bf917b7, 0xb87b09cc,
+    0x26f8d353, 0x7e7e343a, 0xe0fdeea5, 0x037ff0de, 0x9dfc2a41,
+    0xb3733f0d, 0x2df0e592, 0xce72fbe9, 0x50f12176, 0x0877c61f,
+    0x96f41c80, 0x757602fb, 0xebf5d864, 0xa39db332, 0x3d1e69ad,
+    0xde9c77d6, 0x401fad49, 0x18994a20, 0x861a90bf, 0x65988ec4,
+    0xfb1b545b, 0xd5944117, 0x4b179b88, 0xa89585f3, 0x36165f6c,
+    0x6e90b805, 0xf013629a, 0x13917ce1, 0x8d12a67e, 0x4f8f5779,
+    0xd10c8de6, 0x328e939d, 0xac0d4902, 0xf48bae6b, 0x6a0874f4,
+    0x898a6a8f, 0x1709b010, 0x3986a55c, 0xa7057fc3, 0x448761b8,
+    0xda04bb27, 0x82825c4e, 0x1c0186d1, 0xff8398aa, 0x61004235,
+    0x7bb87ba5, 0xe53ba13a, 0x06b9bf41, 0x983a65de, 0xc0bc82b7,
+    0x5e3f5828, 0xbdbd4653, 0x233e9ccc, 0x0db18980, 0x9332531f,
+    0x70b04d64, 0xee3397fb, 0xb6b57092, 0x2836aa0d, 0xcbb4b476,
+    0x55376ee9, 0x97aa9fee, 0x09294571, 0xeaab5b0a, 0x74288195,
+    0x2cae66fc, 0xb22dbc63, 0x51afa218, 0xcf2c7887, 0xe1a36dcb,
+    0x7f20b754, 0x9ca2a92f, 0x022173b0, 0x5aa794d9, 0xc4244e46,
+    0x27a6503d, 0xb9258aa2, 0x52d052c6, 0xcc538859, 0x2fd19622,
+    0xb1524cbd, 0xe9d4abd4, 0x7757714b, 0x94d56f30, 0x0a56b5af,
+    0x24d9a0e3, 0xba5a7a7c, 0x59d86407, 0xc75bbe98, 0x9fdd59f1,
+    0x015e836e, 0xe2dc9d15, 0x7c5f478a, 0xbec2b68d, 0x20416c12,
+    0xc3c37269, 0x5d40a8f6, 0x05c64f9f, 0x9b459500, 0x78c78b7b,
+    0xe64451e4, 0xc8cb44a8, 0x56489e37, 0xb5ca804c, 0x2b495ad3,
+    0x73cfbdba, 0xed4c6725, 0x0ece795e, 0x904da3c1, 0x8af59a51,
+    0x147640ce, 0xf7f45eb5, 0x6977842a, 0x31f16343, 0xaf72b9dc,
+    0x4cf0a7a7, 0xd2737d38, 0xfcfc6874, 0x627fb2eb, 0x81fdac90,
+    0x1f7e760f, 0x47f89166, 0xd97b4bf9, 0x3af95582, 0xa47a8f1d,
+    0x66e77e1a, 0xf864a485, 0x1be6bafe, 0x85656061, 0xdde38708,
+    0x43605d97, 0xa0e243ec, 0x3e619973, 0x10ee8c3f, 0x8e6d56a0,
+    0x6def48db, 0xf36c9244, 0xabea752d, 0x3569afb2, 0xd6ebb1c9,
+    0x48686b56},
+   {0x00000000, 0xc0642817, 0x80c9502e, 0x40ad7839, 0x0093a15c,
+    0xc0f7894b, 0x805af172, 0x403ed965, 0x002643b9, 0xc0426bae,
+    0x80ef1397, 0x408b3b80, 0x00b5e2e5, 0xc0d1caf2, 0x807cb2cb,
+    0x40189adc, 0x414af7a9, 0x812edfbe, 0xc183a787, 0x01e78f90,
+    0x41d956f5, 0x81bd7ee2, 0xc11006db, 0x01742ecc, 0x416cb410,
+    0x81089c07, 0xc1a5e43e, 0x01c1cc29, 0x41ff154c, 0x819b3d5b,
+    0xc1364562, 0x01526d75, 0xc3929f88, 0x03f6b79f, 0x435bcfa6,
+    0x833fe7b1, 0xc3013ed4, 0x036516c3, 0x43c86efa, 0x83ac46ed,
+    0xc3b4dc31, 0x03d0f426, 0x437d8c1f, 0x8319a408, 0xc3277d6d,
+    0x0343557a, 0x43ee2d43, 0x838a0554, 0x82d86821, 0x42bc4036,
+    0x0211380f, 0xc2751018, 0x824bc97d, 0x422fe16a, 0x02829953,
+    0xc2e6b144, 0x82fe2b98, 0x429a038f, 0x02377bb6, 0xc25353a1,
+    0x826d8ac4, 0x4209a2d3, 0x02a4daea, 0xc2c0f2fd, 0xc7234eca,
+    0x074766dd, 0x47ea1ee4, 0x878e36f3, 0xc7b0ef96, 0x07d4c781,
+    0x4779bfb8, 0x871d97af, 0xc7050d73, 0x07612564, 0x47cc5d5d,
+    0x87a8754a, 0xc796ac2f, 0x07f28438, 0x475ffc01, 0x873bd416,
+    0x8669b963, 0x460d9174, 0x06a0e94d, 0xc6c4c15a, 0x86fa183f,
+    0x469e3028, 0x06334811, 0xc6576006, 0x864ffada, 0x462bd2cd,
+    0x0686aaf4, 0xc6e282e3, 0x86dc5b86, 0x46b87391, 0x06150ba8,
+    0xc67123bf, 0x04b1d142, 0xc4d5f955, 0x8478816c, 0x441ca97b,
+    0x0422701e, 0xc4465809, 0x84eb2030, 0x448f0827, 0x049792fb,
+    0xc4f3baec, 0x845ec2d5, 0x443aeac2, 0x040433a7, 0xc4601bb0,
+    0x84cd6389, 0x44a94b9e, 0x45fb26eb, 0x859f0efc, 0xc53276c5,
+    0x05565ed2, 0x456887b7, 0x850cafa0, 0xc5a1d799, 0x05c5ff8e,
+    0x45dd6552, 0x85b94d45, 0xc514357c, 0x05701d6b, 0x454ec40e,
+    0x852aec19, 0xc5879420, 0x05e3bc37, 0xcf41ed4f, 0x0f25c558,
+    0x4f88bd61, 0x8fec9576, 0xcfd24c13, 0x0fb66404, 0x4f1b1c3d,
+    0x8f7f342a, 0xcf67aef6, 0x0f0386e1, 0x4faefed8, 0x8fcad6cf,
+    0xcff40faa, 0x0f9027bd, 0x4f3d5f84, 0x8f597793, 0x8e0b1ae6,
+    0x4e6f32f1, 0x0ec24ac8, 0xcea662df, 0x8e98bbba, 0x4efc93ad,
+    0x0e51eb94, 0xce35c383, 0x8e2d595f, 0x4e497148, 0x0ee40971,
+    0xce802166, 0x8ebef803, 0x4edad014, 0x0e77a82d, 0xce13803a,
+    0x0cd372c7, 0xccb75ad0, 0x8c1a22e9, 0x4c7e0afe, 0x0c40d39b,
+    0xcc24fb8c, 0x8c8983b5, 0x4cedaba2, 0x0cf5317e, 0xcc911969,
+    0x8c3c6150, 0x4c584947, 0x0c669022, 0xcc02b835, 0x8cafc00c,
+    0x4ccbe81b, 0x4d99856e, 0x8dfdad79, 0xcd50d540, 0x0d34fd57,
+    0x4d0a2432, 0x8d6e0c25, 0xcdc3741c, 0x0da75c0b, 0x4dbfc6d7,
+    0x8ddbeec0, 0xcd7696f9, 0x0d12beee, 0x4d2c678b, 0x8d484f9c,
+    0xcde537a5, 0x0d811fb2, 0x0862a385, 0xc8068b92, 0x88abf3ab,
+    0x48cfdbbc, 0x08f102d9, 0xc8952ace, 0x883852f7, 0x485c7ae0,
+    0x0844e03c, 0xc820c82b, 0x888db012, 0x48e99805, 0x08d74160,
+    0xc8b36977, 0x881e114e, 0x487a3959, 0x4928542c, 0x894c7c3b,
+    0xc9e10402, 0x09852c15, 0x49bbf570, 0x89dfdd67, 0xc972a55e,
+    0x09168d49, 0x490e1795, 0x896a3f82, 0xc9c747bb, 0x09a36fac,
+    0x499db6c9, 0x89f99ede, 0xc954e6e7, 0x0930cef0, 0xcbf03c0d,
+    0x0b94141a, 0x4b396c23, 0x8b5d4434, 0xcb639d51, 0x0b07b546,
+    0x4baacd7f, 0x8bcee568, 0xcbd67fb4, 0x0bb257a3, 0x4b1f2f9a,
+    0x8b7b078d, 0xcb45dee8, 0x0b21f6ff, 0x4b8c8ec6, 0x8be8a6d1,
+    0x8abacba4, 0x4adee3b3, 0x0a739b8a, 0xca17b39d, 0x8a296af8,
+    0x4a4d42ef, 0x0ae03ad6, 0xca8412c1, 0x8a9c881d, 0x4af8a00a,
+    0x0a55d833, 0xca31f024, 0x8a0f2941, 0x4a6b0156, 0x0ac6796f,
+    0xcaa25178},
+   {0x00000000, 0xd4ea739b, 0xe9d396ed, 0x3d39e576, 0x93a15c00,
+    0x474b2f9b, 0x7a72caed, 0xae98b976, 0x2643b900, 0xf2a9ca9b,
+    0xcf902fed, 0x1b7a5c76, 0xb5e2e500, 0x6108969b, 0x5c3173ed,
+    0x88db0076, 0x4c867201, 0x986c019a, 0xa555e4ec, 0x71bf9777,
+    0xdf272e01, 0x0bcd5d9a, 0x36f4b8ec, 0xe21ecb77, 0x6ac5cb01,
+    0xbe2fb89a, 0x83165dec, 0x57fc2e77, 0xf9649701, 0x2d8ee49a,
+    0x10b701ec, 0xc45d7277, 0x980ce502, 0x4ce69699, 0x71df73ef,
+    0xa5350074, 0x0badb902, 0xdf47ca99, 0xe27e2fef, 0x36945c74,
+    0xbe4f5c02, 0x6aa52f99, 0x579ccaef, 0x8376b974, 0x2dee0002,
+    0xf9047399, 0xc43d96ef, 0x10d7e574, 0xd48a9703, 0x0060e498,
+    0x3d5901ee, 0xe9b37275, 0x472bcb03, 0x93c1b898, 0xaef85dee,
+    0x7a122e75, 0xf2c92e03, 0x26235d98, 0x1b1ab8ee, 0xcff0cb75,
+    0x61687203, 0xb5820198, 0x88bbe4ee, 0x5c519775, 0x3019ca05,
+    0xe4f3b99e, 0xd9ca5ce8, 0x0d202f73, 0xa3b89605, 0x7752e59e,
+    0x4a6b00e8, 0x9e817373, 0x165a7305, 0xc2b0009e, 0xff89e5e8,
+    0x2b639673, 0x85fb2f05, 0x51115c9e, 0x6c28b9e8, 0xb8c2ca73,
+    0x7c9fb804, 0xa875cb9f, 0x954c2ee9, 0x41a65d72, 0xef3ee404,
+    0x3bd4979f, 0x06ed72e9, 0xd2070172, 0x5adc0104, 0x8e36729f,
+    0xb30f97e9, 0x67e5e472, 0xc97d5d04, 0x1d972e9f, 0x20aecbe9,
+    0xf444b872, 0xa8152f07, 0x7cff5c9c, 0x41c6b9ea, 0x952cca71,
+    0x3bb47307, 0xef5e009c, 0xd267e5ea, 0x068d9671, 0x8e569607,
+    0x5abce59c, 0x678500ea, 0xb36f7371, 0x1df7ca07, 0xc91db99c,
+    0xf4245cea, 0x20ce2f71, 0xe4935d06, 0x30792e9d, 0x0d40cbeb,
+    0xd9aab870, 0x77320106, 0xa3d8729d, 0x9ee197eb, 0x4a0be470,
+    0xc2d0e406, 0x163a979d, 0x2b0372eb, 0xffe90170, 0x5171b806,
+    0x859bcb9d, 0xb8a22eeb, 0x6c485d70, 0x6032940b, 0xb4d8e790,
+    0x89e102e6, 0x5d0b717d, 0xf393c80b, 0x2779bb90, 0x1a405ee6,
+    0xceaa2d7d, 0x46712d0b, 0x929b5e90, 0xafa2bbe6, 0x7b48c87d,
+    0xd5d0710b, 0x013a0290, 0x3c03e7e6, 0xe8e9947d, 0x2cb4e60a,
+    0xf85e9591, 0xc56770e7, 0x118d037c, 0xbf15ba0a, 0x6bffc991,
+    0x56c62ce7, 0x822c5f7c, 0x0af75f0a, 0xde1d2c91, 0xe324c9e7,
+    0x37ceba7c, 0x9956030a, 0x4dbc7091, 0x708595e7, 0xa46fe67c,
+    0xf83e7109, 0x2cd40292, 0x11ede7e4, 0xc507947f, 0x6b9f2d09,
+    0xbf755e92, 0x824cbbe4, 0x56a6c87f, 0xde7dc809, 0x0a97bb92,
+    0x37ae5ee4, 0xe3442d7f, 0x4ddc9409, 0x9936e792, 0xa40f02e4,
+    0x70e5717f, 0xb4b80308, 0x60527093, 0x5d6b95e5, 0x8981e67e,
+    0x27195f08, 0xf3f32c93, 0xcecac9e5, 0x1a20ba7e, 0x92fbba08,
+    0x4611c993, 0x7b282ce5, 0xafc25f7e, 0x015ae608, 0xd5b09593,
+    0xe88970e5, 0x3c63037e, 0x502b5e0e, 0x84c12d95, 0xb9f8c8e3,
+    0x6d12bb78, 0xc38a020e, 0x17607195, 0x2a5994e3, 0xfeb3e778,
+    0x7668e70e, 0xa2829495, 0x9fbb71e3, 0x4b510278, 0xe5c9bb0e,
+    0x3123c895, 0x0c1a2de3, 0xd8f05e78, 0x1cad2c0f, 0xc8475f94,
+    0xf57ebae2, 0x2194c979, 0x8f0c700f, 0x5be60394, 0x66dfe6e2,
+    0xb2359579, 0x3aee950f, 0xee04e694, 0xd33d03e2, 0x07d77079,
+    0xa94fc90f, 0x7da5ba94, 0x409c5fe2, 0x94762c79, 0xc827bb0c,
+    0x1ccdc897, 0x21f42de1, 0xf51e5e7a, 0x5b86e70c, 0x8f6c9497,
+    0xb25571e1, 0x66bf027a, 0xee64020c, 0x3a8e7197, 0x07b794e1,
+    0xd35de77a, 0x7dc55e0c, 0xa92f2d97, 0x9416c8e1, 0x40fcbb7a,
+    0x84a1c90d, 0x504bba96, 0x6d725fe0, 0xb9982c7b, 0x1700950d,
+    0xc3eae696, 0xfed303e0, 0x2a39707b, 0xa2e2700d, 0x76080396,
+    0x4b31e6e0, 0x9fdb957b, 0x31432c0d, 0xe5a95f96, 0xd890bae0,
+    0x0c7ac97b},
+   {0x00000000, 0x27652581, 0x0fcc3bd9, 0x28a91e58, 0x5f9e0669,
+    0x78fb23e8, 0x50523db0, 0x77371831, 0xbe3c0dd2, 0x99592853,
+    0xb1f0360b, 0x9695138a, 0xe1a20bbb, 0xc6c72e3a, 0xee6e3062,
+    0xc90b15e3, 0x3d7f6b7f, 0x1a1a4efe, 0x32b350a6, 0x15d67527,
+    0x62e16d16, 0x45844897, 0x6d2d56cf, 0x4a48734e, 0x834366ad,
+    0xa426432c, 0x8c8f5d74, 0xabea78f5, 0xdcdd60c4, 0xfbb84545,
+    0xd3115b1d, 0xf4747e9c, 0x7afed6fe, 0x5d9bf37f, 0x7532ed27,
+    0x5257c8a6, 0x2560d097, 0x0205f516, 0x2aaceb4e, 0x0dc9cecf,
+    0xc4c2db2c, 0xe3a7fead, 0xcb0ee0f5, 0xec6bc574, 0x9b5cdd45,
+    0xbc39f8c4, 0x9490e69c, 0xb3f5c31d, 0x4781bd81, 0x60e49800,
+    0x484d8658, 0x6f28a3d9, 0x181fbbe8, 0x3f7a9e69, 0x17d38031,
+    0x30b6a5b0, 0xf9bdb053, 0xded895d2, 0xf6718b8a, 0xd114ae0b,
+    0xa623b63a, 0x814693bb, 0xa9ef8de3, 0x8e8aa862, 0xb5fadc26,
+    0x929ff9a7, 0xba36e7ff, 0x9d53c27e, 0xea64da4f, 0xcd01ffce,
+    0xe5a8e196, 0xc2cdc417, 0x0bc6d1f4, 0x2ca3f475, 0x040aea2d,
+    0x236fcfac, 0x5458d79d, 0x733df21c, 0x5b94ec44, 0x7cf1c9c5,
+    0x8885b759, 0xafe092d8, 0x87498c80, 0xa02ca901, 0xd71bb130,
+    0xf07e94b1, 0xd8d78ae9, 0xffb2af68, 0x36b9ba8b, 0x11dc9f0a,
+    0x39758152, 0x1e10a4d3, 0x6927bce2, 0x4e429963, 0x66eb873b,
+    0x418ea2ba, 0xcf040ad8, 0xe8612f59, 0xc0c83101, 0xe7ad1480,
+    0x909a0cb1, 0xb7ff2930, 0x9f563768, 0xb83312e9, 0x7138070a,
+    0x565d228b, 0x7ef43cd3, 0x59911952, 0x2ea60163, 0x09c324e2,
+    0x216a3aba, 0x060f1f3b, 0xf27b61a7, 0xd51e4426, 0xfdb75a7e,
+    0xdad27fff, 0xade567ce, 0x8a80424f, 0xa2295c17, 0x854c7996,
+    0x4c476c75, 0x6b2249f4, 0x438b57ac, 0x64ee722d, 0x13d96a1c,
+    0x34bc4f9d, 0x1c1551c5, 0x3b707444, 0x6af5b94d, 0x4d909ccc,
+    0x65398294, 0x425ca715, 0x356bbf24, 0x120e9aa5, 0x3aa784fd,
+    0x1dc2a17c, 0xd4c9b49f, 0xf3ac911e, 0xdb058f46, 0xfc60aac7,
+    0x8b57b2f6, 0xac329777, 0x849b892f, 0xa3feacae, 0x578ad232,
+    0x70eff7b3, 0x5846e9eb, 0x7f23cc6a, 0x0814d45b, 0x2f71f1da,
+    0x07d8ef82, 0x20bdca03, 0xe9b6dfe0, 0xced3fa61, 0xe67ae439,
+    0xc11fc1b8, 0xb628d989, 0x914dfc08, 0xb9e4e250, 0x9e81c7d1,
+    0x100b6fb3, 0x376e4a32, 0x1fc7546a, 0x38a271eb, 0x4f9569da,
+    0x68f04c5b, 0x40595203, 0x673c7782, 0xae376261, 0x895247e0,
+    0xa1fb59b8, 0x869e7c39, 0xf1a96408, 0xd6cc4189, 0xfe655fd1,
+    0xd9007a50, 0x2d7404cc, 0x0a11214d, 0x22b83f15, 0x05dd1a94,
+    0x72ea02a5, 0x558f2724, 0x7d26397c, 0x5a431cfd, 0x9348091e,
+    0xb42d2c9f, 0x9c8432c7, 0xbbe11746, 0xccd60f77, 0xebb32af6,
+    0xc31a34ae, 0xe47f112f, 0xdf0f656b, 0xf86a40ea, 0xd0c35eb2,
+    0xf7a67b33, 0x80916302, 0xa7f44683, 0x8f5d58db, 0xa8387d5a,
+    0x613368b9, 0x46564d38, 0x6eff5360, 0x499a76e1, 0x3ead6ed0,
+    0x19c84b51, 0x31615509, 0x16047088, 0xe2700e14, 0xc5152b95,
+    0xedbc35cd, 0xcad9104c, 0xbdee087d, 0x9a8b2dfc, 0xb22233a4,
+    0x95471625, 0x5c4c03c6, 0x7b292647, 0x5380381f, 0x74e51d9e,
+    0x03d205af, 0x24b7202e, 0x0c1e3e76, 0x2b7b1bf7, 0xa5f1b395,
+    0x82949614, 0xaa3d884c, 0x8d58adcd, 0xfa6fb5fc, 0xdd0a907d,
+    0xf5a38e25, 0xd2c6aba4, 0x1bcdbe47, 0x3ca89bc6, 0x1401859e,
+    0x3364a01f, 0x4453b82e, 0x63369daf, 0x4b9f83f7, 0x6cfaa676,
+    0x988ed8ea, 0xbfebfd6b, 0x9742e333, 0xb027c6b2, 0xc710de83,
+    0xe075fb02, 0xc8dce55a, 0xefb9c0db, 0x26b2d538, 0x01d7f0b9,
+    0x297eeee1, 0x0e1bcb60, 0x792cd351, 0x5e49f6d0, 0x76e0e888,
+    0x5185cd09}};
+
+#endif
+
+#endif
+
+#endif
+
+local const z_crc_t FAR x2n_table[] = {
+    0x40000000, 0x20000000, 0x08000000, 0x00800000, 0x00008000,
+    0xedb88320, 0xb1e6b092, 0xa06a2517, 0xed627dae, 0x88d14467,
+    0xd7bbfe6a, 0xec447f11, 0x8e7ea170, 0x6427800e, 0x4d47bae0,
+    0x09fe548f, 0x83852d0f, 0x30362f1a, 0x7b5a9cc3, 0x31fec169,
+    0x9fec022a, 0x6c8dedc4, 0x15d6874d, 0x5fde7a4e, 0xbad90e37,
+    0x2e4e5eef, 0x4eaba214, 0xa8a472c0, 0x429a969e, 0x148d302a,
+    0xc40ba6d0, 0xc4e22c3c};
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/crc32_simd.c b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/crc32_simd.c
new file mode 100644
index 000000000..742827092
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/crc32_simd.c
@@ -0,0 +1,621 @@
+/* crc32_simd.c
+ *
+ * Copyright 2017 The Chromium Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the Chromium source repository LICENSE file.
+ */
+
+#include "crc32_simd.h"
+#if defined(CRC32_SIMD_AVX512_PCLMUL)
+
+/*
+ * crc32_avx512_simd_(): compute the crc32 of the buffer, where the buffer
+ * length must be at least 256, and a multiple of 64. Based on:
+ *
+ * "Fast CRC Computation for Generic Polynomials Using PCLMULQDQ Instruction"
+ *  V. Gopal, E. Ozturk, et al., 2009, http://intel.ly/2ySEwL0
+ */
+
+#include <emmintrin.h>
+#include <smmintrin.h>
+#include <wmmintrin.h>
+#include <immintrin.h>
+
+uint32_t ZLIB_INTERNAL crc32_avx512_simd_(  /* AVX512+PCLMUL */
+    const unsigned char *buf,
+    z_size_t len,
+    uint32_t crc)
+{
+    /*
+     * Definitions of the bit-reflected domain constants k1,k2,k3,k4
+     * are similar to those given at the end of the paper, and remaining
+     * constants and CRC32+Barrett polynomials remain unchanged.
+     *
+     * Replace the index of x from 128 to 512. As follows:
+     * k1 = ( x ^ ( 512 * 4 + 32 ) mod P(x) << 32 )' << 1 = 0x011542778a
+     * k2 = ( x ^ ( 512 * 4 - 32 ) mod P(x) << 32 )' << 1 = 0x01322d1430
+     * k3 = ( x ^ ( 512 + 32 ) mod P(x) << 32 )' << 1 = 0x0154442bd4
+     * k4 = ( x ^ ( 512 - 32 ) mod P(x) << 32 )' << 1 = 0x01c6e41596
+     */
+    static const uint64_t zalign(64) k1k2[] = { 0x011542778a, 0x01322d1430,
+                                                0x011542778a, 0x01322d1430,
+                                                0x011542778a, 0x01322d1430,
+                                                0x011542778a, 0x01322d1430 };
+    static const uint64_t zalign(64) k3k4[] = { 0x0154442bd4, 0x01c6e41596,
+                                                0x0154442bd4, 0x01c6e41596,
+                                                0x0154442bd4, 0x01c6e41596,
+                                                0x0154442bd4, 0x01c6e41596 };
+    static const uint64_t zalign(16) k5k6[] = { 0x01751997d0, 0x00ccaa009e };
+    static const uint64_t zalign(16) k7k8[] = { 0x0163cd6124, 0x0000000000 };
+    static const uint64_t zalign(16) poly[] = { 0x01db710641, 0x01f7011641 };
+    __m512i x0, x1, x2, x3, x4, x5, x6, x7, x8, y5, y6, y7, y8;
+    __m128i a0, a1, a2, a3;
+
+    /*
+     * There's at least one block of 256.
+     */
+    x1 = _mm512_loadu_si512((__m512i *)(buf + 0x00));
+    x2 = _mm512_loadu_si512((__m512i *)(buf + 0x40));
+    x3 = _mm512_loadu_si512((__m512i *)(buf + 0x80));
+    x4 = _mm512_loadu_si512((__m512i *)(buf + 0xC0));
+
+    x1 = _mm512_xor_si512(x1, _mm512_castsi128_si512(_mm_cvtsi32_si128(crc)));
+
+    x0 = _mm512_load_si512((__m512i *)k1k2);
+
+    buf += 256;
+    len -= 256;
+
+    /*
+     * Parallel fold blocks of 256, if any.
+     */
+    while (len >= 256)
+    {
+        x5 = _mm512_clmulepi64_epi128(x1, x0, 0x00);
+        x6 = _mm512_clmulepi64_epi128(x2, x0, 0x00);
+        x7 = _mm512_clmulepi64_epi128(x3, x0, 0x00);
+        x8 = _mm512_clmulepi64_epi128(x4, x0, 0x00);
+
+
+        x1 = _mm512_clmulepi64_epi128(x1, x0, 0x11);
+        x2 = _mm512_clmulepi64_epi128(x2, x0, 0x11);
+        x3 = _mm512_clmulepi64_epi128(x3, x0, 0x11);
+        x4 = _mm512_clmulepi64_epi128(x4, x0, 0x11);
+
+        y5 = _mm512_loadu_si512((__m512i *)(buf + 0x00));
+        y6 = _mm512_loadu_si512((__m512i *)(buf + 0x40));
+        y7 = _mm512_loadu_si512((__m512i *)(buf + 0x80));
+        y8 = _mm512_loadu_si512((__m512i *)(buf + 0xC0));
+
+        x1 = _mm512_xor_si512(x1, x5);
+        x2 = _mm512_xor_si512(x2, x6);
+        x3 = _mm512_xor_si512(x3, x7);
+        x4 = _mm512_xor_si512(x4, x8);
+
+        x1 = _mm512_xor_si512(x1, y5);
+        x2 = _mm512_xor_si512(x2, y6);
+        x3 = _mm512_xor_si512(x3, y7);
+        x4 = _mm512_xor_si512(x4, y8);
+
+        buf += 256;
+        len -= 256;
+    }
+
+    /*
+     * Fold into 512-bits.
+     */
+    x0 = _mm512_load_si512((__m512i *)k3k4);
+
+    x5 = _mm512_clmulepi64_epi128(x1, x0, 0x00);
+    x1 = _mm512_clmulepi64_epi128(x1, x0, 0x11);
+    x1 = _mm512_xor_si512(x1, x2);
+    x1 = _mm512_xor_si512(x1, x5);
+
+    x5 = _mm512_clmulepi64_epi128(x1, x0, 0x00);
+    x1 = _mm512_clmulepi64_epi128(x1, x0, 0x11);
+    x1 = _mm512_xor_si512(x1, x3);
+    x1 = _mm512_xor_si512(x1, x5);
+
+    x5 = _mm512_clmulepi64_epi128(x1, x0, 0x00);
+    x1 = _mm512_clmulepi64_epi128(x1, x0, 0x11);
+    x1 = _mm512_xor_si512(x1, x4);
+    x1 = _mm512_xor_si512(x1, x5);
+
+    /*
+     * Single fold blocks of 64, if any.
+     */
+    while (len >= 64)
+    {
+        x2 = _mm512_loadu_si512((__m512i *)buf);
+
+        x5 = _mm512_clmulepi64_epi128(x1, x0, 0x00);
+        x1 = _mm512_clmulepi64_epi128(x1, x0, 0x11);
+        x1 = _mm512_xor_si512(x1, x2);
+        x1 = _mm512_xor_si512(x1, x5);
+
+        buf += 64;
+        len -= 64;
+    }
+
+    /*
+     * Fold 512-bits to 384-bits.
+     */
+    a0 = _mm_load_si128((__m128i *)k5k6);
+
+    a1 = _mm512_extracti32x4_epi32(x1, 0);
+    a2 = _mm512_extracti32x4_epi32(x1, 1);
+
+    a3 = _mm_clmulepi64_si128(a1, a0, 0x00);
+    a1 = _mm_clmulepi64_si128(a1, a0, 0x11);
+
+    a1 = _mm_xor_si128(a1, a3);
+    a1 = _mm_xor_si128(a1, a2);
+
+    /*
+     * Fold 384-bits to 256-bits.
+     */
+    a2 = _mm512_extracti32x4_epi32(x1, 2);
+    a3 = _mm_clmulepi64_si128(a1, a0, 0x00);
+    a1 = _mm_clmulepi64_si128(a1, a0, 0x11);
+    a1 = _mm_xor_si128(a1, a3);
+    a1 = _mm_xor_si128(a1, a2);
+
+    /*
+     * Fold 256-bits to 128-bits.
+     */
+    a2 = _mm512_extracti32x4_epi32(x1, 3);
+    a3 = _mm_clmulepi64_si128(a1, a0, 0x00);
+    a1 = _mm_clmulepi64_si128(a1, a0, 0x11);
+    a1 = _mm_xor_si128(a1, a3);
+    a1 = _mm_xor_si128(a1, a2);
+
+    /*
+     * Fold 128-bits to 64-bits.
+     */
+    a2 = _mm_clmulepi64_si128(a1, a0, 0x10);
+    a3 = _mm_setr_epi32(~0, 0, ~0, 0);
+    a1 = _mm_srli_si128(a1, 8);
+    a1 = _mm_xor_si128(a1, a2);
+
+    a0 = _mm_loadl_epi64((__m128i*)k7k8);
+    a2 = _mm_srli_si128(a1, 4);
+    a1 = _mm_and_si128(a1, a3);
+    a1 = _mm_clmulepi64_si128(a1, a0, 0x00);
+    a1 = _mm_xor_si128(a1, a2);
+
+    /*
+     * Barret reduce to 32-bits.
+     */
+    a0 = _mm_load_si128((__m128i*)poly);
+
+    a2 = _mm_and_si128(a1, a3);
+    a2 = _mm_clmulepi64_si128(a2, a0, 0x10);
+    a2 = _mm_and_si128(a2, a3);
+    a2 = _mm_clmulepi64_si128(a2, a0, 0x00);
+    a1 = _mm_xor_si128(a1, a2);
+
+    /*
+     * Return the crc32.
+     */
+    return _mm_extract_epi32(a1, 1);
+}
+
+#elif defined(CRC32_SIMD_SSE42_PCLMUL)
+
+/*
+ * crc32_sse42_simd_(): compute the crc32 of the buffer, where the buffer
+ * length must be at least 64, and a multiple of 16.
+ */
+
+#include <emmintrin.h>
+#include <smmintrin.h>
+#include <wmmintrin.h>
+
+uint32_t ZLIB_INTERNAL crc32_sse42_simd_(  /* SSE4.2+PCLMUL */
+    const unsigned char *buf,
+    z_size_t len,
+    uint32_t crc)
+{
+    /*
+     * Definitions of the bit-reflected domain constants k1,k2,k3, etc and
+     * the CRC32+Barrett polynomials given at the end of the paper.
+     */
+    static const uint64_t zalign(16) k1k2[] = { 0x0154442bd4, 0x01c6e41596 };
+    static const uint64_t zalign(16) k3k4[] = { 0x01751997d0, 0x00ccaa009e };
+    static const uint64_t zalign(16) k5k0[] = { 0x0163cd6124, 0x0000000000 };
+    static const uint64_t zalign(16) poly[] = { 0x01db710641, 0x01f7011641 };
+
+    __m128i x0, x1, x2, x3, x4, x5, x6, x7, x8, y5, y6, y7, y8;
+
+    /*
+     * There's at least one block of 64.
+     */
+    x1 = _mm_loadu_si128((__m128i *)(buf + 0x00));
+    x2 = _mm_loadu_si128((__m128i *)(buf + 0x10));
+    x3 = _mm_loadu_si128((__m128i *)(buf + 0x20));
+    x4 = _mm_loadu_si128((__m128i *)(buf + 0x30));
+
+    x1 = _mm_xor_si128(x1, _mm_cvtsi32_si128(crc));
+
+    x0 = _mm_load_si128((__m128i *)k1k2);
+
+    buf += 64;
+    len -= 64;
+
+    /*
+     * Parallel fold blocks of 64, if any.
+     */
+    while (len >= 64)
+    {
+        x5 = _mm_clmulepi64_si128(x1, x0, 0x00);
+        x6 = _mm_clmulepi64_si128(x2, x0, 0x00);
+        x7 = _mm_clmulepi64_si128(x3, x0, 0x00);
+        x8 = _mm_clmulepi64_si128(x4, x0, 0x00);
+
+        x1 = _mm_clmulepi64_si128(x1, x0, 0x11);
+        x2 = _mm_clmulepi64_si128(x2, x0, 0x11);
+        x3 = _mm_clmulepi64_si128(x3, x0, 0x11);
+        x4 = _mm_clmulepi64_si128(x4, x0, 0x11);
+
+        y5 = _mm_loadu_si128((__m128i *)(buf + 0x00));
+        y6 = _mm_loadu_si128((__m128i *)(buf + 0x10));
+        y7 = _mm_loadu_si128((__m128i *)(buf + 0x20));
+        y8 = _mm_loadu_si128((__m128i *)(buf + 0x30));
+
+        x1 = _mm_xor_si128(x1, x5);
+        x2 = _mm_xor_si128(x2, x6);
+        x3 = _mm_xor_si128(x3, x7);
+        x4 = _mm_xor_si128(x4, x8);
+
+        x1 = _mm_xor_si128(x1, y5);
+        x2 = _mm_xor_si128(x2, y6);
+        x3 = _mm_xor_si128(x3, y7);
+        x4 = _mm_xor_si128(x4, y8);
+
+        buf += 64;
+        len -= 64;
+    }
+
+    /*
+     * Fold into 128-bits.
+     */
+    x0 = _mm_load_si128((__m128i *)k3k4);
+
+    x5 = _mm_clmulepi64_si128(x1, x0, 0x00);
+    x1 = _mm_clmulepi64_si128(x1, x0, 0x11);
+    x1 = _mm_xor_si128(x1, x2);
+    x1 = _mm_xor_si128(x1, x5);
+
+    x5 = _mm_clmulepi64_si128(x1, x0, 0x00);
+    x1 = _mm_clmulepi64_si128(x1, x0, 0x11);
+    x1 = _mm_xor_si128(x1, x3);
+    x1 = _mm_xor_si128(x1, x5);
+
+    x5 = _mm_clmulepi64_si128(x1, x0, 0x00);
+    x1 = _mm_clmulepi64_si128(x1, x0, 0x11);
+    x1 = _mm_xor_si128(x1, x4);
+    x1 = _mm_xor_si128(x1, x5);
+
+    /*
+     * Single fold blocks of 16, if any.
+     */
+    while (len >= 16)
+    {
+        x2 = _mm_loadu_si128((__m128i *)buf);
+
+        x5 = _mm_clmulepi64_si128(x1, x0, 0x00);
+        x1 = _mm_clmulepi64_si128(x1, x0, 0x11);
+        x1 = _mm_xor_si128(x1, x2);
+        x1 = _mm_xor_si128(x1, x5);
+
+        buf += 16;
+        len -= 16;
+    }
+
+    /*
+     * Fold 128-bits to 64-bits.
+     */
+    x2 = _mm_clmulepi64_si128(x1, x0, 0x10);
+    x3 = _mm_setr_epi32(~0, 0, ~0, 0);
+    x1 = _mm_srli_si128(x1, 8);
+    x1 = _mm_xor_si128(x1, x2);
+
+    x0 = _mm_loadl_epi64((__m128i*)k5k0);
+
+    x2 = _mm_srli_si128(x1, 4);
+    x1 = _mm_and_si128(x1, x3);
+    x1 = _mm_clmulepi64_si128(x1, x0, 0x00);
+    x1 = _mm_xor_si128(x1, x2);
+
+    /*
+     * Barret reduce to 32-bits.
+     */
+    x0 = _mm_load_si128((__m128i*)poly);
+
+    x2 = _mm_and_si128(x1, x3);
+    x2 = _mm_clmulepi64_si128(x2, x0, 0x10);
+    x2 = _mm_and_si128(x2, x3);
+    x2 = _mm_clmulepi64_si128(x2, x0, 0x00);
+    x1 = _mm_xor_si128(x1, x2);
+
+    /*
+     * Return the crc32.
+     */
+    return _mm_extract_epi32(x1, 1);
+}
+
+#elif defined(CRC32_ARMV8_CRC32)
+
+/* CRC32 checksums using ARMv8-a crypto instructions.
+ */
+
+#if defined(__clang__)
+/* We need some extra types for using PMULL.
+ */
+#if defined(__aarch64__)
+#include <arm_neon.h>
+#include <arm_acle.h>
+#endif
+
+/* CRC32 intrinsics are #ifdef'ed out of arm_acle.h unless we build with an
+ * armv8 target, which is incompatible with ThinLTO optimizations on Android.
+ * (Namely, mixing and matching different module-level targets makes ThinLTO
+ * warn, and Android defaults to armv7-a. This restriction does not apply to
+ * function-level `target`s, however.)
+ *
+ * Since we only need four crc intrinsics, and since clang's implementation of
+ * those are just wrappers around compiler builtins, it's simplest to #define
+ * those builtins directly. If this #define list grows too much (or we depend on
+ * an intrinsic that isn't a trivial wrapper), we may have to find a better way
+ * to go about this.
+ *
+ * NOTE: clang currently complains that "'+soft-float-abi' is not a recognized
+ * feature for this target (ignoring feature)." This appears to be a harmless
+ * bug in clang.
+ *
+ * These definitions must appear *after* including arm_acle.h otherwise that
+ * header may end up defining functions named __builtin_arm_crc32* that call
+ * themselves, creating an infinite loop when the intrinsic is called.
+ */
+/* XXX: Cannot hook into builtins with XCode for arm64. */
+#if !defined(ARMV8_OS_MACOS)
+#define __crc32b __builtin_arm_crc32b
+#define __crc32d __builtin_arm_crc32d
+#define __crc32w __builtin_arm_crc32w
+#define __crc32cw __builtin_arm_crc32cw
+#endif
+
+#if defined(__aarch64__)
+#define TARGET_ARMV8_WITH_CRC __attribute__((target("aes,crc")))
+#else  // !defined(__aarch64__)
+#define TARGET_ARMV8_WITH_CRC __attribute__((target("armv8-a,crc")))
+#endif  // defined(__aarch64__)
+
+#elif defined(__GNUC__)
+/* For GCC, we are setting CRC extensions at module level, so ThinLTO is not
+ * allowed. We can just include arm_acle.h.
+ */
+#include <arm_acle.h>
+#include <arm_neon.h>
+#define TARGET_ARMV8_WITH_CRC
+#else  // !defined(__GNUC__) && !defined(_aarch64__)
+#error ARM CRC32 SIMD extensions only supported for Clang and GCC
+#endif
+
+TARGET_ARMV8_WITH_CRC
+uint32_t ZLIB_INTERNAL armv8_crc32_little(
+    const unsigned char *buf,
+    z_size_t len,
+    uint32_t crc)
+{
+    uint32_t c = (uint32_t) ~crc;
+
+    while (len && ((uintptr_t)buf & 7)) {
+        c = __crc32b(c, *buf++);
+        --len;
+    }
+
+    const uint64_t *buf8 = (const uint64_t *)buf;
+
+    while (len >= 64) {
+        c = __crc32d(c, *buf8++);
+        c = __crc32d(c, *buf8++);
+        c = __crc32d(c, *buf8++);
+        c = __crc32d(c, *buf8++);
+
+        c = __crc32d(c, *buf8++);
+        c = __crc32d(c, *buf8++);
+        c = __crc32d(c, *buf8++);
+        c = __crc32d(c, *buf8++);
+        len -= 64;
+    }
+
+    while (len >= 8) {
+        c = __crc32d(c, *buf8++);
+        len -= 8;
+    }
+
+    buf = (const unsigned char *)buf8;
+
+    while (len--) {
+        c = __crc32b(c, *buf++);
+    }
+
+    return ~c;
+}
+
+#if defined(__aarch64__) || defined(ARMV8_OS_MACOS) /* aarch64 specific code. */
+
+/*
+ * crc32_pmull_simd_(): compute the crc32 of the buffer, where the buffer
+ * length must be at least 64, and a multiple of 16. Based on:
+ *
+ * "Fast CRC Computation for Generic Polynomials Using PCLMULQDQ Instruction"
+ *  V. Gopal, E. Ozturk, et al., 2009, http://intel.ly/2ySEwL0
+ */
+TARGET_ARMV8_WITH_CRC
+static inline uint8x16_t pmull_lo(const uint64x2_t a, const uint64x2_t b)
+{
+    uint8x16_t r;
+    __asm__ __volatile__ ("pmull  %0.1q, %1.1d, %2.1d \n\t"
+        : "=w" (r) : "w" (a), "w" (b) );
+    return r;
+}
+
+TARGET_ARMV8_WITH_CRC
+static inline uint8x16_t pmull_01(const uint64x2_t a, const uint64x2_t b)
+{
+    uint8x16_t r;
+    __asm__ __volatile__ ("pmull  %0.1q, %1.1d, %2.1d \n\t"
+        : "=w" (r) : "w" (a), "w" (vgetq_lane_u64(b, 1)) );
+    return r;
+}
+
+TARGET_ARMV8_WITH_CRC
+static inline uint8x16_t pmull_hi(const uint64x2_t a, const uint64x2_t b)
+{
+    uint8x16_t r;
+    __asm__ __volatile__ ("pmull2 %0.1q, %1.2d, %2.2d \n\t"
+        : "=w" (r) : "w" (a), "w" (b) );
+    return r;
+}
+
+TARGET_ARMV8_WITH_CRC
+uint32_t ZLIB_INTERNAL armv8_crc32_pmull_little(
+    const unsigned char *buf,
+    z_size_t len,
+    uint32_t crc)
+{
+    /*
+     * Definitions of the bit-reflected domain constants k1,k2,k3, etc and
+     * the CRC32+Barrett polynomials given at the end of the paper.
+     */
+    static const uint64_t zalign(16) k1k2[] = { 0x0154442bd4, 0x01c6e41596 };
+    static const uint64_t zalign(16) k3k4[] = { 0x01751997d0, 0x00ccaa009e };
+    static const uint64_t zalign(16) k5k0[] = { 0x0163cd6124, 0x0000000000 };
+    static const uint64_t zalign(16) poly[] = { 0x01db710641, 0x01f7011641 };
+
+    uint64x2_t x0, x1, x2, x3, x4, x5, x6, x7, x8, y5, y6, y7, y8;
+
+    /*
+     * There's at least one block of 64.
+     */
+    x1 = vld1q_u64((const uint64_t *)(buf + 0x00));
+    x2 = vld1q_u64((const uint64_t *)(buf + 0x10));
+    x3 = vld1q_u64((const uint64_t *)(buf + 0x20));
+    x4 = vld1q_u64((const uint64_t *)(buf + 0x30));
+
+    x1 = veorq_u64(x1, (uint64x2_t) vsetq_lane_u32(crc, vdupq_n_u32(0), 0));
+
+    x0 = vld1q_u64(k1k2);
+
+    buf += 64;
+    len -= 64;
+
+    /*
+     * Parallel fold blocks of 64, if any.
+     */
+    while (len >= 64)
+    {
+        x5 = (uint64x2_t) pmull_lo(x1, x0);
+        x6 = (uint64x2_t) pmull_lo(x2, x0);
+        x7 = (uint64x2_t) pmull_lo(x3, x0);
+        x8 = (uint64x2_t) pmull_lo(x4, x0);
+
+        y5 = vld1q_u64((const uint64_t *)(buf + 0x00));
+        y6 = vld1q_u64((const uint64_t *)(buf + 0x10));
+        y7 = vld1q_u64((const uint64_t *)(buf + 0x20));
+        y8 = vld1q_u64((const uint64_t *)(buf + 0x30));
+
+        x1 = (uint64x2_t) pmull_hi(x1, x0);
+        x2 = (uint64x2_t) pmull_hi(x2, x0);
+        x3 = (uint64x2_t) pmull_hi(x3, x0);
+        x4 = (uint64x2_t) pmull_hi(x4, x0);
+
+        x1 = veorq_u64(x1, x5);
+        x2 = veorq_u64(x2, x6);
+        x3 = veorq_u64(x3, x7);
+        x4 = veorq_u64(x4, x8);
+
+        x1 = veorq_u64(x1, y5);
+        x2 = veorq_u64(x2, y6);
+        x3 = veorq_u64(x3, y7);
+        x4 = veorq_u64(x4, y8);
+
+        buf += 64;
+        len -= 64;
+    }
+
+    /*
+     * Fold into 128-bits.
+     */
+    x0 = vld1q_u64(k3k4);
+
+    x5 = (uint64x2_t) pmull_lo(x1, x0);
+    x1 = (uint64x2_t) pmull_hi(x1, x0);
+    x1 = veorq_u64(x1, x2);
+    x1 = veorq_u64(x1, x5);
+
+    x5 = (uint64x2_t) pmull_lo(x1, x0);
+    x1 = (uint64x2_t) pmull_hi(x1, x0);
+    x1 = veorq_u64(x1, x3);
+    x1 = veorq_u64(x1, x5);
+
+    x5 = (uint64x2_t) pmull_lo(x1, x0);
+    x1 = (uint64x2_t) pmull_hi(x1, x0);
+    x1 = veorq_u64(x1, x4);
+    x1 = veorq_u64(x1, x5);
+
+    /*
+     * Single fold blocks of 16, if any.
+     */
+    while (len >= 16)
+    {
+        x2 = vld1q_u64((const uint64_t *)buf);
+
+        x5 = (uint64x2_t) pmull_lo(x1, x0);
+        x1 = (uint64x2_t) pmull_hi(x1, x0);
+        x1 = veorq_u64(x1, x2);
+        x1 = veorq_u64(x1, x5);
+
+        buf += 16;
+        len -= 16;
+    }
+
+    /*
+     * Fold 128-bits to 64-bits.
+     */
+    static uint32_t zalign(16) mask[] = { ~0u, 0u, ~0u, 0u };
+
+    x2 = (uint64x2_t) pmull_01(x1, x0);
+    x1 = (uint64x2_t) vextq_u8(vreinterpretq_u8_u64(x1), vdupq_n_u8(0), 8);
+    x3 = (uint64x2_t) vld1q_u32(mask);
+    x1 = veorq_u64(x1, x2);
+
+    x0 = vld1q_u64(k5k0);
+
+    x2 = (uint64x2_t) pmull_01(x2, x0);
+    x2 = (uint64x2_t) vextq_u8(vreinterpretq_u8_u64(x1), vdupq_n_u8(0), 4);
+    x1 = vandq_u64(x1, x3);
+    x1 = (uint64x2_t) pmull_lo(x1, x0);
+    x1 = veorq_u64(x1, x2);
+
+    /*
+     * Barret reduce to 32-bits.
+     */
+    x0 = vld1q_u64(poly);
+
+    x2 = vandq_u64(x1, x3);
+    x2 = (uint64x2_t) pmull_01(x2, x0);
+    x2 = vandq_u64(x2, x3);
+    x2 = (uint64x2_t) pmull_lo(x2, x0);
+    x1 = veorq_u64(x1, x2);
+
+    /*
+     * Return the crc32.
+     */
+    return vgetq_lane_u32(vreinterpretq_u32_u64(x1), 1);
+}
+#endif /* aarch64 specific code. */
+
+#endif
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/crc32_simd.h b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/crc32_simd.h
new file mode 100644
index 000000000..84624647b
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/crc32_simd.h
@@ -0,0 +1,57 @@
+/* crc32_simd.h
+ *
+ * Copyright 2017 The Chromium Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the Chromium source repository LICENSE file.
+ */
+
+#include <stdint.h>
+
+#include "zconf.h"
+#include "zutil.h"
+#include "deflate.h"
+
+/*
+ * crc32_sse42_simd_(): compute the crc32 of the buffer, where the buffer
+ * length must be at least 64, and a multiple of 16.
+ */
+uint32_t ZLIB_INTERNAL crc32_sse42_simd_(const unsigned char* buf,
+                                         z_size_t len,
+                                         uint32_t crc);
+
+uint32_t ZLIB_INTERNAL crc32_avx512_simd_(const unsigned char* buf,
+                                          z_size_t len,
+                                          uint32_t crc);
+
+/*
+ * crc32_sse42_simd_ buffer size constraints: see the use in zlib/crc32.c
+ * for computing the crc32 of an arbitrary length buffer.
+ */
+#define Z_CRC32_SSE42_MINIMUM_LENGTH 64
+#define Z_CRC32_SSE42_CHUNKSIZE_MASK 15
+#define Z_CRC32_AVX512_MINIMUM_LENGTH 256
+#define Z_CRC32_AVX512_CHUNKSIZE_MASK 63
+
+/*
+ * CRC32 checksums using ARMv8-a crypto instructions.
+ */
+uint32_t ZLIB_INTERNAL armv8_crc32_little(const unsigned char* buf,
+                                          z_size_t len,
+                                          uint32_t crc);
+
+/* aarch64 specific code. */
+#if defined(__aarch64__)
+
+/* 128 is the sweet spot at the time of coding (late 2020). */
+#define Z_CRC32_PMULL_MINIMUM_LENGTH 128
+#define Z_CRC32_PMULL_CHUNKSIZE_MASK 15
+
+/*
+ * CRC32 checksums using ARMv8-a PMULL instructions, where the buffer
+ * length must be at least 64, and a multiple of 16.
+ */
+uint32_t ZLIB_INTERNAL armv8_crc32_pmull_little(const unsigned char* buf,
+                                                z_size_t len,
+                                                uint32_t crc);
+
+#endif
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/crc_folding.c b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/crc_folding.c
index 48d77744a..1b4f4e1d1 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/crc_folding.c
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/crc_folding.c
@@ -18,6 +18,8 @@
 
 #include "deflate.h"
 
+#ifdef CRC32_SIMD_SSE42_PCLMUL
+
 #include <inttypes.h>
 #include <emmintrin.h>
 #include <immintrin.h>
@@ -283,7 +285,7 @@ ZLIB_INTERNAL void crc_fold_copy(deflate_state *const s,
         goto partial;
     }
 
-    algn_diff = 0 - (uintptr_t)src & 0xF;
+    algn_diff = (0 - (uintptr_t)src) & 0xF;
     if (algn_diff) {
         xmm_crc_part = _mm_loadu_si128((__m128i *)src);
         _mm_storeu_si128((__m128i *)dst, xmm_crc_part);
@@ -433,7 +435,10 @@ unsigned ZLIB_INTERNAL crc_fold_512to32(deflate_state *const s)
     unsigned crc;
     __m128i x_tmp0, x_tmp1, x_tmp2, crc_fold;
 
-    CRC_LOAD(s)
+    __m128i xmm_crc0 = _mm_loadu_si128((__m128i *)s->crc0 + 0);
+    __m128i xmm_crc1 = _mm_loadu_si128((__m128i *)s->crc0 + 1);
+    __m128i xmm_crc2 = _mm_loadu_si128((__m128i *)s->crc0 + 2);
+    __m128i xmm_crc3 = _mm_loadu_si128((__m128i *)s->crc0 + 3);
 
     /*
      * k1
@@ -489,5 +494,6 @@ unsigned ZLIB_INTERNAL crc_fold_512to32(deflate_state *const s)
 
     crc = _mm_extract_epi32(xmm_crc3, 2);
     return ~crc;
-    CRC_SAVE(s)
 }
+
+#endif  /* CRC32_SIMD_SSE42_PCLMUL */
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/deflate.c b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/deflate.c
index aa0c9c67a..173ce596b 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/deflate.c
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/deflate.c
@@ -1,5 +1,5 @@
 /* deflate.c -- compress data using the deflation algorithm
- * Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
+ * Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -50,10 +50,22 @@
 /* @(#) $Id$ */
 #include <assert.h>
 #include "deflate.h"
-#include "x86.h"
+
+#include "cpu_features.h"
+
+#if defined(DEFLATE_SLIDE_HASH_SSE2) || defined(DEFLATE_SLIDE_HASH_NEON)
+#include "slide_hash_simd.h"
+#endif
+
+#include "contrib/optimizations/insert_string.h"
+
+#ifdef FASTEST
+/* See http://crbug.com/1113596 */
+#error "FASTEST is not supported in Chromium's zlib."
+#endif
 
 const char deflate_copyright[] =
-   " deflate 1.2.11 Copyright 1995-2017 Jean-loup Gailly and Mark Adler ";
+   " deflate 1.2.13.1 Copyright 1995-2022 Jean-loup Gailly and Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
@@ -61,9 +73,6 @@ const char deflate_copyright[] =
   copyright string in the executable of your product.
  */
 
-/* ===========================================================================
- *  Function prototypes.
- */
 typedef enum {
     need_more,      /* block not completed, need more input or more output */
     block_done,     /* block flush performed */
@@ -71,50 +80,22 @@ typedef enum {
     finish_done     /* finish done, accept no more input or output */
 } block_state;
 
-typedef block_state (*compress_func) OF((deflate_state *s, int flush));
+typedef block_state (*compress_func)(deflate_state *s, int flush);
 /* Compression function. Returns the block state after the call. */
 
-local int deflateStateCheck      OF((z_streamp strm));
-local void slide_hash     OF((deflate_state *s));
-local void fill_window    OF((deflate_state *s));
-local block_state deflate_stored OF((deflate_state *s, int flush));
-local block_state deflate_fast   OF((deflate_state *s, int flush));
+local block_state deflate_stored(deflate_state *s, int flush);
+local block_state deflate_fast(deflate_state *s, int flush);
 #ifndef FASTEST
-local block_state deflate_slow   OF((deflate_state *s, int flush));
-#endif
-local block_state deflate_rle    OF((deflate_state *s, int flush));
-local block_state deflate_huff   OF((deflate_state *s, int flush));
-local void lm_init        OF((deflate_state *s));
-local void putShortMSB    OF((deflate_state *s, uInt b));
-local void flush_pending  OF((z_streamp strm));
-unsigned ZLIB_INTERNAL read_buf OF((z_streamp strm, Bytef *buf, unsigned size));
-#ifdef ASMV
-#  pragma message("Assembler code may have bugs -- use at your own risk")
-      void match_init OF((void)); /* asm code initialization */
-      uInt longest_match  OF((deflate_state *s, IPos cur_match));
-#else
-local uInt longest_match  OF((deflate_state *s, IPos cur_match));
-#endif
-
-#ifdef ZLIB_DEBUG
-local  void check_match OF((deflate_state *s, IPos start, IPos match,
-                            int length));
+local block_state deflate_slow(deflate_state *s, int flush);
 #endif
+local block_state deflate_rle(deflate_state *s, int flush);
+local block_state deflate_huff(deflate_state *s, int flush);
 
 /* From crc32.c */
 extern void ZLIB_INTERNAL crc_reset(deflate_state *const s);
 extern void ZLIB_INTERNAL crc_finalize(deflate_state *const s);
 extern void ZLIB_INTERNAL copy_with_crc(z_streamp strm, Bytef *dst, long size);
 
-#ifdef _MSC_VER
-#define INLINE __inline
-#else
-#define INLINE inline
-#endif
-
-/* Inline optimisation */
-local INLINE Pos insert_string_sse(deflate_state *const s, const Pos str);
-
 /* ===========================================================================
  * Local data
  */
@@ -169,63 +150,30 @@ local const config configuration_table[10] = {
 /* rank Z_BLOCK between Z_NO_FLUSH and Z_PARTIAL_FLUSH */
 #define RANK(f) (((f) * 2) - ((f) > 4 ? 9 : 0))
 
-/* ===========================================================================
- * Update a hash value with the given input byte
- * IN  assertion: all calls to UPDATE_HASH are made with consecutive input
- *    characters, so that a running hash key can be computed from the previous
- *    key instead of complete recalculation each time.
- */
-#define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask)
-
-/* ===========================================================================
- * Insert string str in the dictionary and set match_head to the previous head
- * of the hash chain (the most recent string with same hash key). Return
- * the previous length of the hash chain.
- * If this file is compiled with -DFASTEST, the compression level is forced
- * to 1, and no hash chains are maintained.
- * IN  assertion: all calls to INSERT_STRING are made with consecutive input
- *    characters and the first MIN_MATCH bytes of str are valid (except for
- *    the last MIN_MATCH-1 bytes of the input file).
- */
-local INLINE Pos insert_string_c(deflate_state *const s, const Pos str)
-{
-    Pos ret;
-
-    UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]);
-#ifdef FASTEST
-    ret = s->head[s->ins_h];
-#else
-    ret = s->prev[str & s->w_mask] = s->head[s->ins_h];
-#endif
-    s->head[s->ins_h] = str;
-
-    return ret;
-}
-
-local INLINE Pos insert_string(deflate_state *const s, const Pos str)
-{
-    if (x86_cpu_enable_simd)
-        return insert_string_sse(s, str);
-    return insert_string_c(s, str);
-}
-
-
 /* ===========================================================================
  * Initialize the hash table (avoiding 64K overflow for 16 bit systems).
  * prev[] will be initialized on the fly.
+ * TODO(cavalcantii): optimization opportunity, check comments on:
+ * https://chromium-review.googlesource.com/c/chromium/src/+/3561506/
  */
 #define CLEAR_HASH(s) \
-    s->head[s->hash_size-1] = NIL; \
-    zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
+    do { \
+        s->head[s->hash_size - 1] = NIL; \
+        zmemzero((Bytef *)s->head, \
+                 (unsigned)(s->hash_size - 1)*sizeof(*s->head)); \
+    } while (0)
 
 /* ===========================================================================
  * Slide the hash table when sliding the window down (could be avoided with 32
  * bit values at the expense of memory usage). We slide even when level == 0 to
  * keep the hash table consistent if we switch back to level > 0 later.
  */
-local void slide_hash(s)
-    deflate_state *s;
-{
+local void slide_hash(deflate_state *s) {
+#if defined(DEFLATE_SLIDE_HASH_SSE2) || defined(DEFLATE_SLIDE_HASH_NEON)
+    slide_hash_simd(s->head, s->prev, s->w_size, s->hash_size);
+    return;
+#endif
+
     unsigned n, m;
     Posf *p;
     uInt wsize = s->w_size;
@@ -249,41 +197,207 @@ local void slide_hash(s)
 #endif
 }
 
+/* ===========================================================================
+ * Read a new buffer from the current input stream, update the adler32
+ * and total number of bytes read.  All deflate() input goes through
+ * this function so some applications may wish to modify it to avoid
+ * allocating a large strm->next_in buffer and copying from it.
+ * (See also flush_pending()).
+ */
+local unsigned read_buf(z_streamp strm, Bytef *buf, unsigned size) {
+    unsigned len = strm->avail_in;
+
+    if (len > size) len = size;
+    if (len == 0) return 0;
+
+    strm->avail_in  -= len;
+
+    /* TODO(cavalcantii): verify if we can remove 'copy_with_crc', it is legacy
+     * of the Intel optimizations dating back to 2015.
+     */
+#ifdef GZIP
+    if (strm->state->wrap == 2)
+        copy_with_crc(strm, buf, len);
+    else
+#endif
+    {
+        zmemcpy(buf, strm->next_in, len);
+        if (strm->state->wrap == 1)
+            strm->adler = adler32(strm->adler, buf, len);
+    }
+    strm->next_in  += len;
+    strm->total_in += len;
+
+    return len;
+}
+
+/* ===========================================================================
+ * Fill the window when the lookahead becomes insufficient.
+ * Updates strstart and lookahead.
+ *
+ * IN assertion: lookahead < MIN_LOOKAHEAD
+ * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD
+ *    At least one byte has been read, or avail_in == 0; reads are
+ *    performed for at least two bytes (required for the zip translate_eol
+ *    option -- not supported here).
+ */
+local void fill_window(deflate_state *s) {
+    unsigned n;
+    unsigned more;    /* Amount of free space at the end of the window. */
+    uInt wsize = s->w_size;
+
+    Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead");
+
+    do {
+        more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
+
+        /* Deal with !@#$% 64K limit: */
+        if (sizeof(int) <= 2) {
+            if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
+                more = wsize;
+
+            } else if (more == (unsigned)(-1)) {
+                /* Very unlikely, but possible on 16 bit machine if
+                 * strstart == 0 && lookahead == 1 (input done a byte at time)
+                 */
+                more--;
+            }
+        }
+
+        /* If the window is almost full and there is insufficient lookahead,
+         * move the upper half to the lower one to make room in the upper half.
+         */
+        if (s->strstart >= wsize + MAX_DIST(s)) {
+
+            zmemcpy(s->window, s->window + wsize, (unsigned)wsize - more);
+            s->match_start -= wsize;
+            s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */
+            s->block_start -= (long) wsize;
+            if (s->insert > s->strstart)
+                s->insert = s->strstart;
+            slide_hash(s);
+            more += wsize;
+        }
+        if (s->strm->avail_in == 0) break;
+
+        /* If there was no sliding:
+         *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
+         *    more == window_size - lookahead - strstart
+         * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)
+         * => more >= window_size - 2*WSIZE + 2
+         * In the BIG_MEM or MMAP case (not yet supported),
+         *   window_size == input_size + MIN_LOOKAHEAD  &&
+         *   strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.
+         * Otherwise, window_size == 2*WSIZE so more >= 2.
+         * If there was sliding, more >= WSIZE. So in all cases, more >= 2.
+         */
+        Assert(more >= 2, "more < 2");
+
+        n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more);
+        s->lookahead += n;
+
+        /* Initialize the hash value now that we have some input: */
+        if (s->chromium_zlib_hash) {
+            /* chromium hash reads 4 bytes */
+            if (s->lookahead + s->insert > MIN_MATCH) {
+                uInt str = s->strstart - s->insert;
+                while (s->insert) {
+                    insert_string(s, str);
+                    str++;
+                    s->insert--;
+                    if (s->lookahead + s->insert <= MIN_MATCH)
+                        break;
+                }
+            }
+        } else
+        /* Initialize the hash value now that we have some input: */
+        if (s->lookahead + s->insert >= MIN_MATCH) {
+            uInt str = s->strstart - s->insert;
+            s->ins_h = s->window[str];
+            UPDATE_HASH(s, s->ins_h, s->window[str + 1]);
+#if MIN_MATCH != 3
+            Call UPDATE_HASH() MIN_MATCH-3 more times
+#endif
+            while (s->insert) {
+                UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);
+#ifndef FASTEST
+                s->prev[str & s->w_mask] = s->head[s->ins_h];
+#endif
+                s->head[s->ins_h] = (Pos)str;
+                str++;
+                s->insert--;
+                if (s->lookahead + s->insert < MIN_MATCH)
+                    break;
+            }
+        }
+        /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
+         * but this is not important since only literal bytes will be emitted.
+         */
+
+    } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0);
+
+    /* If the WIN_INIT bytes after the end of the current data have never been
+     * written, then zero those bytes in order to avoid memory check reports of
+     * the use of uninitialized (or uninitialised as Julian writes) bytes by
+     * the longest match routines.  Update the high water mark for the next
+     * time through here.  WIN_INIT is set to MAX_MATCH since the longest match
+     * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead.
+     */
+    if (s->high_water < s->window_size) {
+        ulg curr = s->strstart + (ulg)(s->lookahead);
+        ulg init;
+
+        if (s->high_water < curr) {
+            /* Previous high water mark below current data -- zero WIN_INIT
+             * bytes or up to end of window, whichever is less.
+             */
+            init = s->window_size - curr;
+            if (init > WIN_INIT)
+                init = WIN_INIT;
+            zmemzero(s->window + curr, (unsigned)init);
+            s->high_water = curr + init;
+        }
+        else if (s->high_water < (ulg)curr + WIN_INIT) {
+            /* High water mark at or above current data, but below current data
+             * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up
+             * to end of window, whichever is less.
+             */
+            init = (ulg)curr + WIN_INIT - s->high_water;
+            if (init > s->window_size - s->high_water)
+                init = s->window_size - s->high_water;
+            zmemzero(s->window + s->high_water, (unsigned)init);
+            s->high_water += init;
+        }
+    }
+
+    Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
+           "not enough room for search");
+}
+
 /* ========================================================================= */
-int ZEXPORT deflateInit_(strm, level, version, stream_size)
-    z_streamp strm;
-    int level;
-    const char *version;
-    int stream_size;
-{
+int ZEXPORT deflateInit_(z_streamp strm, int level, const char *version,
+                         int stream_size) {
     return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL,
                          Z_DEFAULT_STRATEGY, version, stream_size);
     /* To do: ignore strm->next_in if we use it as window */
 }
 
 /* ========================================================================= */
-int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
-                  version, stream_size)
-    z_streamp strm;
-    int  level;
-    int  method;
-    int  windowBits;
-    int  memLevel;
-    int  strategy;
-    const char *version;
-    int stream_size;
-{
+int ZEXPORT deflateInit2_(z_streamp strm, int level, int method,
+                          int windowBits, int memLevel, int strategy,
+                          const char *version, int stream_size) {
     unsigned window_padding = 8;
     deflate_state *s;
     int wrap = 1;
     static const char my_version[] = ZLIB_VERSION;
 
-    ushf *overlay;
-    /* We overlay pending_buf and d_buf+l_buf. This works since the average
-     * output size for (length,distance) codes is <= 24 bits.
-     */
-
-    x86_check_features();
+    // Needed to activate optimized insert_string() that helps compression
+    // for all wrapper formats (e.g. RAW, ZLIB, GZIP).
+    // Feature detection is not triggered while using RAW mode (i.e. we never
+    // call crc32() with a NULL buffer).
+#if defined(CRC32_ARMV8_CRC32) || defined(CRC32_SIMD_SSE42_PCLMUL)
+    cpu_check_features();
+#endif
 
     if (version == Z_NULL || version[0] != my_version[0] ||
         stream_size != sizeof(z_stream)) {
@@ -315,6 +429,8 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
 
     if (windowBits < 0) { /* suppress zlib wrapper */
         wrap = 0;
+        if (windowBits < -15)
+            return Z_STREAM_ERROR;
         windowBits = -windowBits;
     }
 #ifdef GZIP
@@ -341,29 +457,77 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
     s->w_size = 1 << s->w_bits;
     s->w_mask = s->w_size - 1;
 
-    if (x86_cpu_enable_simd) {
+    s->chromium_zlib_hash = 1;
+#if defined(USE_ZLIB_RABIN_KARP_ROLLING_HASH)
+    s->chromium_zlib_hash = 0;
+#endif
+
+    s->hash_bits = memLevel + 7;
+    if (s->chromium_zlib_hash && s->hash_bits < 15) {
         s->hash_bits = 15;
-    } else {
-        s->hash_bits = memLevel + 7;
     }
 
     s->hash_size = 1 << s->hash_bits;
     s->hash_mask = s->hash_size - 1;
-    s->hash_shift =  ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH);
+    s->hash_shift =  ((s->hash_bits + MIN_MATCH-1) / MIN_MATCH);
 
     s->window = (Bytef *) ZALLOC(strm,
                                  s->w_size + window_padding,
                                  2*sizeof(Byte));
+    /* Avoid use of unitialized values in the window, see crbug.com/1137613 and
+     * crbug.com/1144420 */
+    zmemzero(s->window, (s->w_size + window_padding) * (2 * sizeof(Byte)));
     s->prev   = (Posf *)  ZALLOC(strm, s->w_size, sizeof(Pos));
+    /* Avoid use of uninitialized value, see:
+     * https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11360
+     */
+    zmemzero(s->prev, s->w_size * sizeof(Pos));
     s->head   = (Posf *)  ZALLOC(strm, s->hash_size, sizeof(Pos));
 
     s->high_water = 0;      /* nothing written to s->window yet */
 
     s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
 
-    overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2);
-    s->pending_buf = (uchf *) overlay;
-    s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L);
+    /* We overlay pending_buf and sym_buf. This works since the average size
+     * for length/distance pairs over any compressed block is assured to be 31
+     * bits or less.
+     *
+     * Analysis: The longest fixed codes are a length code of 8 bits plus 5
+     * extra bits, for lengths 131 to 257. The longest fixed distance codes are
+     * 5 bits plus 13 extra bits, for distances 16385 to 32768. The longest
+     * possible fixed-codes length/distance pair is then 31 bits total.
+     *
+     * sym_buf starts one-fourth of the way into pending_buf. So there are
+     * three bytes in sym_buf for every four bytes in pending_buf. Each symbol
+     * in sym_buf is three bytes -- two for the distance and one for the
+     * literal/length. As each symbol is consumed, the pointer to the next
+     * sym_buf value to read moves forward three bytes. From that symbol, up to
+     * 31 bits are written to pending_buf. The closest the written pending_buf
+     * bits gets to the next sym_buf symbol to read is just before the last
+     * code is written. At that time, 31*(n - 2) bits have been written, just
+     * after 24*(n - 2) bits have been consumed from sym_buf. sym_buf starts at
+     * 8*n bits into pending_buf. (Note that the symbol buffer fills when n - 1
+     * symbols are written.) The closest the writing gets to what is unread is
+     * then n + 14 bits. Here n is lit_bufsize, which is 16384 by default, and
+     * can range from 128 to 32768.
+     *
+     * Therefore, at a minimum, there are 142 bits of space between what is
+     * written and what is read in the overlain buffers, so the symbols cannot
+     * be overwritten by the compressed data. That space is actually 139 bits,
+     * due to the three-bit fixed-code block header.
+     *
+     * That covers the case where either Z_FIXED is specified, forcing fixed
+     * codes, or when the use of fixed codes is chosen, because that choice
+     * results in a smaller compressed block than dynamic codes. That latter
+     * condition then assures that the above analysis also covers all dynamic
+     * blocks. A dynamic-code block will only be chosen to be emitted if it has
+     * fewer bits than a fixed-code block would for the same set of symbols.
+     * Therefore its average symbol length is assured to be less than 31. So
+     * the compressed data for a dynamic block also cannot overwrite the
+     * symbols from which it is being constructed.
+     */
+    s->pending_buf = (uchf *) ZALLOC(strm, s->lit_bufsize, 4);
+    s->pending_buf_size = (ulg)s->lit_bufsize * 4;
 
     if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
         s->pending_buf == Z_NULL) {
@@ -372,8 +536,12 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
         deflateEnd (strm);
         return Z_MEM_ERROR;
     }
-    s->d_buf = overlay + s->lit_bufsize/sizeof(ush);
-    s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize;
+    s->sym_buf = s->pending_buf + s->lit_bufsize;
+    s->sym_end = (s->lit_bufsize - 1) * 3;
+    /* We avoid equality with lit_bufsize*3 because of wraparound at 64K
+     * on 16 bit machines and because stored blocks are restricted to
+     * 64K-1 bytes.
+     */
 
     s->level = level;
     s->strategy = strategy;
@@ -385,9 +553,7 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
 /* =========================================================================
  * Check for a valid deflate stream state. Return 0 if ok, 1 if not.
  */
-local int deflateStateCheck (strm)
-    z_streamp strm;
-{
+local int deflateStateCheck(z_streamp strm) {
     deflate_state *s;
     if (strm == Z_NULL ||
         strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0)
@@ -408,11 +574,8 @@ local int deflateStateCheck (strm)
 }
 
 /* ========================================================================= */
-int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
-    z_streamp strm;
-    const Bytef *dictionary;
-    uInt  dictLength;
-{
+int ZEXPORT deflateSetDictionary(z_streamp strm, const Bytef *dictionary,
+                                 uInt  dictLength) {
     deflate_state *s;
     uInt str, n;
     int wrap;
@@ -473,11 +636,8 @@ int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
 }
 
 /* ========================================================================= */
-int ZEXPORT deflateGetDictionary (strm, dictionary, dictLength)
-    z_streamp strm;
-    Bytef *dictionary;
-    uInt  *dictLength;
-{
+int ZEXPORT deflateGetDictionary(z_streamp strm, Bytef *dictionary,
+                                 uInt *dictLength) {
     deflate_state *s;
     uInt len;
 
@@ -495,9 +655,7 @@ int ZEXPORT deflateGetDictionary (strm, dictionary, dictLength)
 }
 
 /* ========================================================================= */
-int ZEXPORT deflateResetKeep (strm)
-    z_streamp strm;
-{
+int ZEXPORT deflateResetKeep(z_streamp strm) {
     deflate_state *s;
 
     if (deflateStateCheck(strm)) {
@@ -519,23 +677,45 @@ int ZEXPORT deflateResetKeep (strm)
 #ifdef GZIP
         s->wrap == 2 ? GZIP_STATE :
 #endif
-        s->wrap ? INIT_STATE : BUSY_STATE;
+        INIT_STATE;
     strm->adler =
 #ifdef GZIP
         s->wrap == 2 ? crc32(0L, Z_NULL, 0) :
 #endif
         adler32(0L, Z_NULL, 0);
-    s->last_flush = Z_NO_FLUSH;
+    s->last_flush = -2;
 
     _tr_init(s);
 
     return Z_OK;
 }
 
+/* ===========================================================================
+ * Initialize the "longest match" routines for a new zlib stream
+ */
+local void lm_init(deflate_state *s) {
+    s->window_size = (ulg)2L*s->w_size;
+
+    CLEAR_HASH(s);
+
+    /* Set the default configuration parameters:
+     */
+    s->max_lazy_match   = configuration_table[s->level].max_lazy;
+    s->good_match       = configuration_table[s->level].good_length;
+    s->nice_match       = configuration_table[s->level].nice_length;
+    s->max_chain_length = configuration_table[s->level].max_chain;
+
+    s->strstart = 0;
+    s->block_start = 0L;
+    s->lookahead = 0;
+    s->insert = 0;
+    s->match_length = s->prev_length = MIN_MATCH-1;
+    s->match_available = 0;
+    s->ins_h = 0;
+}
+
 /* ========================================================================= */
-int ZEXPORT deflateReset (strm)
-    z_streamp strm;
-{
+int ZEXPORT deflateReset(z_streamp strm) {
     int ret;
 
     ret = deflateResetKeep(strm);
@@ -545,10 +725,7 @@ int ZEXPORT deflateReset (strm)
 }
 
 /* ========================================================================= */
-int ZEXPORT deflateSetHeader (strm, head)
-    z_streamp strm;
-    gz_headerp head;
-{
+int ZEXPORT deflateSetHeader(z_streamp strm, gz_headerp head) {
     if (deflateStateCheck(strm) || strm->state->wrap != 2)
         return Z_STREAM_ERROR;
     strm->state->gzhead = head;
@@ -556,11 +733,7 @@ int ZEXPORT deflateSetHeader (strm, head)
 }
 
 /* ========================================================================= */
-int ZEXPORT deflatePending (strm, pending, bits)
-    unsigned *pending;
-    int *bits;
-    z_streamp strm;
-{
+int ZEXPORT deflatePending(z_streamp strm, unsigned *pending, int *bits) {
     if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
     if (pending != Z_NULL)
         *pending = strm->state->pending;
@@ -570,17 +743,14 @@ int ZEXPORT deflatePending (strm, pending, bits)
 }
 
 /* ========================================================================= */
-int ZEXPORT deflatePrime (strm, bits, value)
-    z_streamp strm;
-    int bits;
-    int value;
-{
+int ZEXPORT deflatePrime(z_streamp strm, int bits, int value) {
     deflate_state *s;
     int put;
 
     if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
     s = strm->state;
-    if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3))
+    if (bits < 0 || bits > 16 ||
+        s->sym_buf < s->pending_out + ((Buf_size + 7) >> 3))
         return Z_BUF_ERROR;
     do {
         put = Buf_size - s->bi_valid;
@@ -596,11 +766,7 @@ int ZEXPORT deflatePrime (strm, bits, value)
 }
 
 /* ========================================================================= */
-int ZEXPORT deflateParams(strm, level, strategy)
-    z_streamp strm;
-    int level;
-    int strategy;
-{
+int ZEXPORT deflateParams(z_streamp strm, int level, int strategy) {
     deflate_state *s;
     compress_func func;
 
@@ -618,12 +784,12 @@ int ZEXPORT deflateParams(strm, level, strategy)
     func = configuration_table[s->level].func;
 
     if ((strategy != s->strategy || func != configuration_table[level].func) &&
-        s->high_water) {
+        s->last_flush != -2) {
         /* Flush the last buffer: */
         int err = deflate(strm, Z_BLOCK);
         if (err == Z_STREAM_ERROR)
             return err;
-        if (strm->avail_out == 0)
+        if (strm->avail_in || (s->strstart - s->block_start) + s->lookahead)
             return Z_BUF_ERROR;
     }
     if (s->level != level) {
@@ -645,13 +811,8 @@ int ZEXPORT deflateParams(strm, level, strategy)
 }
 
 /* ========================================================================= */
-int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain)
-    z_streamp strm;
-    int good_length;
-    int max_lazy;
-    int nice_length;
-    int max_chain;
-{
+int ZEXPORT deflateTune(z_streamp strm, int good_length, int max_lazy,
+                        int nice_length, int max_chain) {
     deflate_state *s;
 
     if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
@@ -664,36 +825,47 @@ int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain)
 }
 
 /* =========================================================================
- * For the default windowBits of 15 and memLevel of 8, this function returns
- * a close to exact, as well as small, upper bound on the compressed size.
- * They are coded as constants here for a reason--if the #define's are
- * changed, then this function needs to be changed as well.  The return
- * value for 15 and 8 only works for those exact settings.
+ * For the default windowBits of 15 and memLevel of 8, this function returns a
+ * close to exact, as well as small, upper bound on the compressed size. This
+ * is an expansion of ~0.03%, plus a small constant.
+ *
+ * For any setting other than those defaults for windowBits and memLevel, one
+ * of two worst case bounds is returned. This is at most an expansion of ~4% or
+ * ~13%, plus a small constant.
+ *
+ * Both the 0.03% and 4% derive from the overhead of stored blocks. The first
+ * one is for stored blocks of 16383 bytes (memLevel == 8), whereas the second
+ * is for stored blocks of 127 bytes (the worst case memLevel == 1). The
+ * expansion results from five bytes of header for each stored block.
  *
- * For any setting other than those defaults for windowBits and memLevel,
- * the value returned is a conservative worst case for the maximum expansion
- * resulting from using fixed blocks instead of stored blocks, which deflate
- * can emit on compressed data for some combinations of the parameters.
+ * The larger expansion of 13% results from a window size less than or equal to
+ * the symbols buffer size (windowBits <= memLevel + 7). In that case some of
+ * the data being compressed may have slid out of the sliding window, impeding
+ * a stored block from being emitted. Then the only choice is a fixed or
+ * dynamic block, where a fixed block limits the maximum expansion to 9 bits
+ * per 8-bit byte, plus 10 bits for every block. The smallest block size for
+ * which this can occur is 255 (memLevel == 2).
  *
- * This function could be more sophisticated to provide closer upper bounds for
- * every combination of windowBits and memLevel.  But even the conservative
- * upper bound of about 14% expansion does not seem onerous for output buffer
- * allocation.
+ * Shifts are used to approximate divisions, for speed.
  */
-uLong ZEXPORT deflateBound(strm, sourceLen)
-    z_streamp strm;
-    uLong sourceLen;
-{
+uLong ZEXPORT deflateBound(z_streamp strm, uLong sourceLen) {
     deflate_state *s;
-    uLong complen, wraplen;
+    uLong fixedlen, storelen, wraplen;
 
-    /* conservative upper bound for compressed data */
-    complen = sourceLen +
-              ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 5;
+    /* upper bound for fixed blocks with 9-bit literals and length 255
+       (memLevel == 2, which is the lowest that may not use stored blocks) --
+       ~13% overhead plus a small constant */
+    fixedlen = sourceLen + (sourceLen >> 3) + (sourceLen >> 8) +
+               (sourceLen >> 9) + 4;
 
-    /* if can't get parameters, return conservative bound plus zlib wrapper */
+    /* upper bound for stored blocks with length 127 (memLevel == 1) --
+       ~4% overhead plus a small constant */
+    storelen = sourceLen + (sourceLen >> 5) + (sourceLen >> 7) +
+               (sourceLen >> 11) + 7;
+
+    /* if can't get parameters, return larger bound plus a zlib wrapper */
     if (deflateStateCheck(strm))
-        return complen + 6;
+        return (fixedlen > storelen ? fixedlen : storelen) + 6;
 
     /* compute wrapper length */
     s = strm->state;
@@ -730,11 +902,13 @@ uLong ZEXPORT deflateBound(strm, sourceLen)
         wraplen = 6;
     }
 
-    /* if not default parameters, return conservative bound */
+    /* if not default parameters, return one of the conservative bounds */
     if (s->w_bits != 15 || s->hash_bits != 8 + 7)
-        return complen + wraplen;
+        return (s->w_bits <= s->hash_bits && s->level ? fixedlen : storelen) +
+               wraplen;
 
-    /* default settings: return tight bound for that case */
+    /* default settings: return tight bound for that case -- ~0.03% overhead
+       plus a small constant */
     return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
            (sourceLen >> 25) + 13 - 6 + wraplen;
 }
@@ -744,10 +918,7 @@ uLong ZEXPORT deflateBound(strm, sourceLen)
  * IN assertion: the stream state is correct and there is enough room in
  * pending_buf.
  */
-local void putShortMSB (s, b)
-    deflate_state *s;
-    uInt b;
-{
+local void putShortMSB(deflate_state *s, uInt b) {
     put_byte(s, (Byte)(b >> 8));
     put_byte(s, (Byte)(b & 0xff));
 }
@@ -758,9 +929,7 @@ local void putShortMSB (s, b)
  * applications may wish to modify it to avoid allocating a large
  * strm->next_out buffer and copying into it. (See also read_buf()).
  */
-local void flush_pending(strm)
-    z_streamp strm;
-{
+local void flush_pending(z_streamp strm) {
     unsigned len;
     deflate_state *s = strm->state;
 
@@ -791,10 +960,7 @@ local void flush_pending(strm)
     } while (0)
 
 /* ========================================================================= */
-int ZEXPORT deflate (strm, flush)
-    z_streamp strm;
-    int flush;
-{
+int ZEXPORT deflate(z_streamp strm, int flush) {
     int old_flush; /* value of flush param for previous deflate call */
     deflate_state *s;
 
@@ -842,9 +1008,11 @@ int ZEXPORT deflate (strm, flush)
     }
 
     /* Write the header */
+    if (s->status == INIT_STATE && s->wrap == 0)
+        s->status = BUSY_STATE;
     if (s->status == INIT_STATE) {
         /* zlib header */
-        uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8;
+        uInt header = (Z_DEFLATED + ((s->w_bits - 8) << 4)) << 8;
         uInt level_flags;
 
         if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2)
@@ -1105,9 +1273,7 @@ int ZEXPORT deflate (strm, flush)
 }
 
 /* ========================================================================= */
-int ZEXPORT deflateEnd (strm)
-    z_streamp strm;
-{
+int ZEXPORT deflateEnd(z_streamp strm) {
     int status;
 
     if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
@@ -1131,16 +1297,14 @@ int ZEXPORT deflateEnd (strm)
  * To simplify the source, this is not supported for 16-bit MSDOS (which
  * doesn't have enough memory anyway to duplicate compression states).
  */
-int ZEXPORT deflateCopy (dest, source)
-    z_streamp dest;
-    z_streamp source;
-{
+int ZEXPORT deflateCopy(z_streamp dest, z_streamp source) {
 #ifdef MAXSEG_64K
+    (void)dest;
+    (void)source;
     return Z_STREAM_ERROR;
 #else
     deflate_state *ds;
     deflate_state *ss;
-    ushf *overlay;
 
 
     if (deflateStateCheck(source) || dest == Z_NULL) {
@@ -1160,8 +1324,7 @@ int ZEXPORT deflateCopy (dest, source)
     ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
     ds->prev   = (Posf *)  ZALLOC(dest, ds->w_size, sizeof(Pos));
     ds->head   = (Posf *)  ZALLOC(dest, ds->hash_size, sizeof(Pos));
-    overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2);
-    ds->pending_buf = (uchf *) overlay;
+    ds->pending_buf = (uchf *) ZALLOC(dest, ds->lit_bufsize, 4);
 
     if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL ||
         ds->pending_buf == Z_NULL) {
@@ -1175,8 +1338,7 @@ int ZEXPORT deflateCopy (dest, source)
     zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
 
     ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
-    ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush);
-    ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize;
+    ds->sym_buf = ds->pending_buf + ds->lit_bufsize;
 
     ds->l_desc.dyn_tree = ds->dyn_ltree;
     ds->d_desc.dyn_tree = ds->dyn_dtree;
@@ -1186,72 +1348,6 @@ int ZEXPORT deflateCopy (dest, source)
 #endif /* MAXSEG_64K */
 }
 
-/* ===========================================================================
- * Read a new buffer from the current input stream, update the adler32
- * and total number of bytes read.  All deflate() input goes through
- * this function so some applications may wish to modify it to avoid
- * allocating a large strm->next_in buffer and copying from it.
- * (See also flush_pending()).
- */
-ZLIB_INTERNAL unsigned read_buf(strm, buf, size)
-    z_streamp strm;
-    Bytef *buf;
-    unsigned size;
-{
-    unsigned len = strm->avail_in;
-
-    if (len > size) len = size;
-    if (len == 0) return 0;
-
-    strm->avail_in  -= len;
-
-#ifdef GZIP
-    if (strm->state->wrap == 2)
-        copy_with_crc(strm, buf, len);
-    else 
-#endif
-    {
-        zmemcpy(buf, strm->next_in, len);
-        if (strm->state->wrap == 1)
-            strm->adler = adler32(strm->adler, buf, len);
-    }
-    strm->next_in  += len;
-    strm->total_in += len;
-
-    return len;
-}
-
-/* ===========================================================================
- * Initialize the "longest match" routines for a new zlib stream
- */
-local void lm_init (s)
-    deflate_state *s;
-{
-    s->window_size = (ulg)2L*s->w_size;
-
-    CLEAR_HASH(s);
-
-    /* Set the default configuration parameters:
-     */
-    s->max_lazy_match   = configuration_table[s->level].max_lazy;
-    s->good_match       = configuration_table[s->level].good_length;
-    s->nice_match       = configuration_table[s->level].nice_length;
-    s->max_chain_length = configuration_table[s->level].max_chain;
-
-    s->strstart = 0;
-    s->block_start = 0L;
-    s->lookahead = 0;
-    s->insert = 0;
-    s->match_length = s->prev_length = MIN_MATCH-1;
-    s->match_available = 0;
-    s->ins_h = 0;
-#ifndef FASTEST
-#ifdef ASMV
-    match_init(); /* initialize the asm code */
-#endif
-#endif
-}
-
 #ifndef FASTEST
 /* ===========================================================================
  * Set match_start to the longest match starting at the given string and
@@ -1262,14 +1358,7 @@ local void lm_init (s)
  *   string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1
  * OUT assertion: the match length is not greater than s->lookahead.
  */
-#ifndef ASMV
-/* For 80x86 and 680x0, an optimized version will be provided in match.asm or
- * match.S. The code will be functionally equivalent.
- */
-local uInt longest_match(s, cur_match)
-    deflate_state *s;
-    IPos cur_match;                             /* current match */
-{
+local uInt longest_match(deflate_state *s, IPos cur_match) {
     unsigned chain_length = s->max_chain_length;/* max hash chain length */
     register Bytef *scan = s->window + s->strstart; /* current string */
     register Bytef *match;                      /* matched string */
@@ -1290,10 +1379,10 @@ local uInt longest_match(s, cur_match)
      */
     register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
     register ush scan_start = *(ushf*)scan;
-    register ush scan_end   = *(ushf*)(scan+best_len-1);
+    register ush scan_end   = *(ushf*)(scan + best_len - 1);
 #else
     register Bytef *strend = s->window + s->strstart + MAX_MATCH;
-    register Byte scan_end1  = scan[best_len-1];
+    register Byte scan_end1  = scan[best_len - 1];
     register Byte scan_end   = scan[best_len];
 #endif
 
@@ -1311,7 +1400,8 @@ local uInt longest_match(s, cur_match)
      */
     if ((uInt)nice_match > s->lookahead) nice_match = (int)s->lookahead;
 
-    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
+    Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
+           "need lookahead");
 
     do {
         Assert(cur_match < s->strstart, "no future");
@@ -1329,53 +1419,72 @@ local uInt longest_match(s, cur_match)
         /* This code assumes sizeof(unsigned short) == 2. Do not use
          * UNALIGNED_OK if your compiler uses a different size.
          */
-        if (*(ushf*)(match+best_len-1) != scan_end ||
+        if (*(ushf*)(match + best_len - 1) != scan_end ||
             *(ushf*)match != scan_start) continue;
 
         /* It is not necessary to compare scan[2] and match[2] since they are
          * always equal when the other bytes match, given that the hash keys
          * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at
-         * strstart+3, +5, ... up to strstart+257. We check for insufficient
+         * strstart + 3, + 5, up to strstart + 257. We check for insufficient
          * lookahead only every 4th comparison; the 128th check will be made
-         * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is
+         * at strstart + 257. If MAX_MATCH-2 is not a multiple of 8, it is
          * necessary to put more guard bytes at the end of the window, or
          * to check more often for insufficient lookahead.
          */
-        Assert(scan[2] == match[2], "scan[2]?");
+        if (!s->chromium_zlib_hash) {
+          Assert(scan[2] == match[2], "scan[2]?");
+        } else {
+          /* When using CRC hashing, scan[2] and match[2] may mismatch, but in
+           * that case at least one of the other hashed bytes will mismatch
+           * also. Bytes 0 and 1 were already checked above, and we know there
+           * are at least four bytes to check otherwise the mismatch would have
+           * been found by the scan_end comparison above, so: */
+          Assert(scan[2] == match[2] || scan[3] != match[3], "scan[2]??");
+        }
         scan++, match++;
         do {
-        } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+        } while (*(ushf*)(scan += 2) == *(ushf*)(match += 2) &&
+                 *(ushf*)(scan += 2) == *(ushf*)(match += 2) &&
+                 *(ushf*)(scan += 2) == *(ushf*)(match += 2) &&
+                 *(ushf*)(scan += 2) == *(ushf*)(match += 2) &&
                  scan < strend);
         /* The funny "do {}" generates better code on most compilers */
 
-        /* Here, scan <= window+strstart+257 */
-        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+        /* Here, scan <= window + strstart + 257 */
+        Assert(scan <= s->window+(unsigned)(s->window_size - 1),
+               "wild scan");
         if (*scan == *match) scan++;
 
-        len = (MAX_MATCH - 1) - (int)(strend-scan);
+        len = (MAX_MATCH - 1) - (int)(strend - scan);
         scan = strend - (MAX_MATCH-1);
 
 #else /* UNALIGNED_OK */
 
         if (match[best_len]   != scan_end  ||
-            match[best_len-1] != scan_end1 ||
+            match[best_len - 1] != scan_end1 ||
             *match            != *scan     ||
             *++match          != scan[1])      continue;
 
-        /* The check at best_len-1 can be removed because it will be made
+        /* The check at best_len - 1 can be removed because it will be made
          * again later. (This heuristic is not always a win.)
          * It is not necessary to compare scan[2] and match[2] since they
          * are always equal when the other bytes match, given that
          * the hash keys are equal and that HASH_BITS >= 8.
          */
         scan += 2, match++;
-        Assert(*scan == *match, "match[2]?");
+        if (!s->chromium_zlib_hash) {
+          Assert(*scan == *match, "match[2]?");
+        } else {
+          /* When using CRC hashing, scan[2] and match[2] may mismatch, but in
+           * that case at least one of the other hashed bytes will mismatch
+           * also. Bytes 0 and 1 were already checked above, and we know there
+           * are at least four bytes to check otherwise the mismatch would have
+           * been found by the scan_end comparison above, so: */
+          Assert(*scan == *match || scan[1] != match[1], "match[2]??");
+        }
 
         /* We check for insufficient lookahead only every 8th comparison;
-         * the 256th check will be made at strstart+258.
+         * the 256th check will be made at strstart + 258.
          */
         do {
         } while (*++scan == *++match && *++scan == *++match &&
@@ -1384,7 +1493,8 @@ local uInt longest_match(s, cur_match)
                  *++scan == *++match && *++scan == *++match &&
                  scan < strend);
 
-        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+        Assert(scan <= s->window + (unsigned)(s->window_size - 1),
+               "wild scan");
 
         len = MAX_MATCH - (int)(strend - scan);
         scan = strend - MAX_MATCH;
@@ -1396,9 +1506,9 @@ local uInt longest_match(s, cur_match)
             best_len = len;
             if (len >= nice_match) break;
 #ifdef UNALIGNED_OK
-            scan_end = *(ushf*)(scan+best_len-1);
+            scan_end = *(ushf*)(scan + best_len - 1);
 #else
-            scan_end1  = scan[best_len-1];
+            scan_end1  = scan[best_len - 1];
             scan_end   = scan[best_len];
 #endif
         }
@@ -1408,17 +1518,13 @@ local uInt longest_match(s, cur_match)
     if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
     return s->lookahead;
 }
-#endif /* ASMV */
 
 #else /* FASTEST */
 
 /* ---------------------------------------------------------------------------
  * Optimized version for FASTEST only
  */
-local uInt longest_match(s, cur_match)
-    deflate_state *s;
-    IPos cur_match;                             /* current match */
-{
+local uInt longest_match(deflate_state *s, IPos cur_match) {
     register Bytef *scan = s->window + s->strstart; /* current string */
     register Bytef *match;                       /* matched string */
     register int len;                           /* length of current match */
@@ -1429,7 +1535,8 @@ local uInt longest_match(s, cur_match)
      */
     Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
 
-    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
+    Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
+           "need lookahead");
 
     Assert(cur_match < s->strstart, "no future");
 
@@ -1439,7 +1546,7 @@ local uInt longest_match(s, cur_match)
      */
     if (match[0] != scan[0] || match[1] != scan[1]) return MIN_MATCH-1;
 
-    /* The check at best_len-1 can be removed because it will be made
+    /* The check at best_len - 1 can be removed because it will be made
      * again later. (This heuristic is not always a win.)
      * It is not necessary to compare scan[2] and match[2] since they
      * are always equal when the other bytes match, given that
@@ -1449,7 +1556,7 @@ local uInt longest_match(s, cur_match)
     Assert(*scan == *match, "match[2]?");
 
     /* We check for insufficient lookahead only every 8th comparison;
-     * the 256th check will be made at strstart+258.
+     * the 256th check will be made at strstart + 258.
      */
     do {
     } while (*++scan == *++match && *++scan == *++match &&
@@ -1458,7 +1565,7 @@ local uInt longest_match(s, cur_match)
              *++scan == *++match && *++scan == *++match &&
              scan < strend);
 
-    Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+    Assert(scan <= s->window + (unsigned)(s->window_size - 1), "wild scan");
 
     len = MAX_MATCH - (int)(strend - scan);
 
@@ -1478,11 +1585,7 @@ local uInt longest_match(s, cur_match)
 /* ===========================================================================
  * Check that the match at match_start is indeed a match.
  */
-local void check_match(s, start, match, length)
-    deflate_state *s;
-    IPos start, match;
-    int length;
-{
+local void check_match(deflate_state *s, IPos start, IPos match, int length) {
     /* check that the match is indeed a match */
     if (zmemcmp(s->window + match,
                 s->window + start, length) != EQUAL) {
@@ -1494,7 +1597,7 @@ local void check_match(s, start, match, length)
         z_error("invalid match");
     }
     if (z_verbose > 1) {
-        fprintf(stderr,"\\[%d,%d]", start-match, length);
+        fprintf(stderr,"\\[%d,%d]", start - match, length);
         do { putc(s->window[start++], stderr); } while (--length != 0);
     }
 }
@@ -1502,147 +1605,6 @@ local void check_match(s, start, match, length)
 #  define check_match(s, start, match, length)
 #endif /* ZLIB_DEBUG */
 
-/* ===========================================================================
- * Fill the window when the lookahead becomes insufficient.
- * Updates strstart and lookahead.
- *
- * IN assertion: lookahead < MIN_LOOKAHEAD
- * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD
- *    At least one byte has been read, or avail_in == 0; reads are
- *    performed for at least two bytes (required for the zip translate_eol
- *    option -- not supported here).
- */
-local void fill_window_c(deflate_state *s);
-
-local void fill_window(deflate_state *s)
-{
-    if (x86_cpu_enable_simd) {
-        fill_window_sse(s);
-        return;
-    }
-
-    fill_window_c(s);
-}
-
-local void fill_window_c(s)
-    deflate_state *s;
-{
-    unsigned n;
-    unsigned more;    /* Amount of free space at the end of the window. */
-    uInt wsize = s->w_size;
-
-    Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead");
-
-    do {
-        more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
-
-        /* Deal with !@#$% 64K limit: */
-        if (sizeof(int) <= 2) {
-            if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
-                more = wsize;
-
-            } else if (more == (unsigned)(-1)) {
-                /* Very unlikely, but possible on 16 bit machine if
-                 * strstart == 0 && lookahead == 1 (input done a byte at time)
-                 */
-                more--;
-            }
-        }
-
-        /* If the window is almost full and there is insufficient lookahead,
-         * move the upper half to the lower one to make room in the upper half.
-         */
-        if (s->strstart >= wsize+MAX_DIST(s)) {
-
-            zmemcpy(s->window, s->window+wsize, (unsigned)wsize - more);
-            s->match_start -= wsize;
-            s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */
-            s->block_start -= (long) wsize;
-            slide_hash(s);
-            more += wsize;
-        }
-        if (s->strm->avail_in == 0) break;
-
-        /* If there was no sliding:
-         *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
-         *    more == window_size - lookahead - strstart
-         * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)
-         * => more >= window_size - 2*WSIZE + 2
-         * In the BIG_MEM or MMAP case (not yet supported),
-         *   window_size == input_size + MIN_LOOKAHEAD  &&
-         *   strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.
-         * Otherwise, window_size == 2*WSIZE so more >= 2.
-         * If there was sliding, more >= WSIZE. So in all cases, more >= 2.
-         */
-        Assert(more >= 2, "more < 2");
-
-        n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more);
-        s->lookahead += n;
-
-        /* Initialize the hash value now that we have some input: */
-        if (s->lookahead + s->insert >= MIN_MATCH) {
-            uInt str = s->strstart - s->insert;
-            s->ins_h = s->window[str];
-            UPDATE_HASH(s, s->ins_h, s->window[str + 1]);
-#if MIN_MATCH != 3
-            Call UPDATE_HASH() MIN_MATCH-3 more times
-#endif
-            while (s->insert) {
-                UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);
-#ifndef FASTEST
-                s->prev[str & s->w_mask] = s->head[s->ins_h];
-#endif
-                s->head[s->ins_h] = (Pos)str;
-                str++;
-                s->insert--;
-                if (s->lookahead + s->insert < MIN_MATCH)
-                    break;
-            }
-        }
-        /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
-         * but this is not important since only literal bytes will be emitted.
-         */
-
-    } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0);
-
-    /* If the WIN_INIT bytes after the end of the current data have never been
-     * written, then zero those bytes in order to avoid memory check reports of
-     * the use of uninitialized (or uninitialised as Julian writes) bytes by
-     * the longest match routines.  Update the high water mark for the next
-     * time through here.  WIN_INIT is set to MAX_MATCH since the longest match
-     * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead.
-     */
-    if (s->high_water < s->window_size) {
-        ulg curr = s->strstart + (ulg)(s->lookahead);
-        ulg init;
-
-        if (s->high_water < curr) {
-            /* Previous high water mark below current data -- zero WIN_INIT
-             * bytes or up to end of window, whichever is less.
-             */
-            init = s->window_size - curr;
-            if (init > WIN_INIT)
-                init = WIN_INIT;
-            zmemzero(s->window + curr, (unsigned)init);
-            s->high_water = curr + init;
-        }
-        else if (s->high_water < (ulg)curr + WIN_INIT) {
-            /* High water mark at or above current data, but below current data
-             * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up
-             * to end of window, whichever is less.
-             */
-            init = (ulg)curr + WIN_INIT - s->high_water;
-            if (init > s->window_size - s->high_water)
-                init = s->window_size - s->high_water;
-            zmemzero(s->window + s->high_water, (unsigned)init);
-            s->high_water += init;
-        }
-    }
-
-    Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
-           "not enough room for search");
-}
-
 /* ===========================================================================
  * Flush the current block, with given end-of-file flag.
  * IN assertion: strstart is set to the end of the current match.
@@ -1683,12 +1645,9 @@ local void fill_window_c(s)
  *
  * deflate_stored() is written to minimize the number of times an input byte is
  * copied. It is most efficient with large input and output buffers, which
- * maximizes the opportunites to have a single copy from next_in to next_out.
+ * maximizes the opportunities to have a single copy from next_in to next_out.
  */
-local block_state deflate_stored(s, flush)
-    deflate_state *s;
-    int flush;
-{
+local block_state deflate_stored(deflate_state *s, int flush) {
     /* Smallest worthy block size when not flushing or finishing. By default
      * this is 32K. This can be as small as 507 bytes for memLevel == 1. For
      * large input and output buffers, the stored block size will be larger.
@@ -1787,6 +1746,7 @@ local block_state deflate_stored(s, flush)
             s->matches = 2;         /* clear hash */
             zmemcpy(s->window, s->strm->next_in - s->w_size, s->w_size);
             s->strstart = s->w_size;
+            s->insert = s->strstart;
         }
         else {
             if (s->window_size - s->strstart <= used) {
@@ -1795,12 +1755,14 @@ local block_state deflate_stored(s, flush)
                 zmemcpy(s->window, s->window + s->w_size, s->strstart);
                 if (s->matches < 2)
                     s->matches++;   /* add a pending slide_hash() */
+                if (s->insert > s->strstart)
+                    s->insert = s->strstart;
             }
             zmemcpy(s->window + s->strstart, s->strm->next_in - used, used);
             s->strstart += used;
+            s->insert += MIN(used, s->w_size - s->insert);
         }
         s->block_start = s->strstart;
-        s->insert += MIN(used, s->w_size - s->insert);
     }
     if (s->high_water < s->strstart)
         s->high_water = s->strstart;
@@ -1815,7 +1777,7 @@ local block_state deflate_stored(s, flush)
         return block_done;
 
     /* Fill the window with any remaining input. */
-    have = s->window_size - s->strstart - 1;
+    have = s->window_size - s->strstart;
     if (s->strm->avail_in > have && s->block_start >= (long)s->w_size) {
         /* Slide the window down. */
         s->block_start -= s->w_size;
@@ -1824,12 +1786,15 @@ local block_state deflate_stored(s, flush)
         if (s->matches < 2)
             s->matches++;           /* add a pending slide_hash() */
         have += s->w_size;          /* more space now */
+        if (s->insert > s->strstart)
+            s->insert = s->strstart;
     }
     if (have > s->strm->avail_in)
         have = s->strm->avail_in;
     if (have) {
         read_buf(s->strm, s->window + s->strstart, have);
         s->strstart += have;
+        s->insert += MIN(have, s->w_size - s->insert);
     }
     if (s->high_water < s->strstart)
         s->high_water = s->strstart;
@@ -1866,10 +1831,7 @@ local block_state deflate_stored(s, flush)
  * new strings in the dictionary only for unmatched strings or for short
  * matches. It is used only for the fast compression options.
  */
-local block_state deflate_fast(s, flush)
-    deflate_state *s;
-    int flush;
-{
+local block_state deflate_fast(deflate_state *s, int flush) {
     IPos hash_head;       /* head of the hash chain */
     int bflush;           /* set if current block must be flushed */
 
@@ -1887,7 +1849,7 @@ local block_state deflate_fast(s, flush)
             if (s->lookahead == 0) break; /* flush the current block */
         }
 
-        /* Insert the string window[strstart .. strstart+2] in the
+        /* Insert the string window[strstart .. strstart + 2] in the
          * dictionary, and set hash_head to the head of the hash chain:
          */
         hash_head = NIL;
@@ -1934,19 +1896,22 @@ local block_state deflate_fast(s, flush)
             {
                 s->strstart += s->match_length;
                 s->match_length = 0;
-                s->ins_h = s->window[s->strstart];
-                UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
+
+                if (!s->chromium_zlib_hash) {
+                  s->ins_h = s->window[s->strstart];
+                  UPDATE_HASH(s, s->ins_h, s->window[s->strstart + 1]);
 #if MIN_MATCH != 3
-                Call UPDATE_HASH() MIN_MATCH-3 more times
+                  Call UPDATE_HASH() MIN_MATCH-3 more times
 #endif
-                /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not
-                 * matter since it will be recomputed at next deflate call.
-                 */
+                  /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not
+                   * matter since it will be recomputed at next deflate call.
+                   */
+                }
             }
         } else {
             /* No match, output a literal byte */
             Tracevv((stderr,"%c", s->window[s->strstart]));
-            _tr_tally_lit (s, s->window[s->strstart], bflush);
+            _tr_tally_lit(s, s->window[s->strstart], bflush);
             s->lookahead--;
             s->strstart++;
         }
@@ -1957,7 +1922,7 @@ local block_state deflate_fast(s, flush)
         FLUSH_BLOCK(s, 1);
         return finish_done;
     }
-    if (s->last_lit)
+    if (s->sym_next)
         FLUSH_BLOCK(s, 0);
     return block_done;
 }
@@ -1968,10 +1933,7 @@ local block_state deflate_fast(s, flush)
  * evaluation for matches: a match is finally adopted only if there is
  * no better match at the next window position.
  */
-local block_state deflate_slow(s, flush)
-    deflate_state *s;
-    int flush;
-{
+local block_state deflate_slow(deflate_state *s, int flush) {
     IPos hash_head;          /* head of hash chain */
     int bflush;              /* set if current block must be flushed */
 
@@ -1990,7 +1952,7 @@ local block_state deflate_slow(s, flush)
             if (s->lookahead == 0) break; /* flush the current block */
         }
 
-        /* Insert the string window[strstart .. strstart+2] in the
+        /* Insert the string window[strstart .. strstart + 2] in the
          * dictionary, and set hash_head to the head of the hash chain:
          */
         hash_head = NIL;
@@ -2032,17 +1994,23 @@ local block_state deflate_slow(s, flush)
             uInt max_insert = s->strstart + s->lookahead - MIN_MATCH;
             /* Do not insert strings in hash table beyond this. */
 
-            check_match(s, s->strstart-1, s->prev_match, s->prev_length);
+            if (s->prev_match == -1) {
+                /* The window has slid one byte past the previous match,
+                 * so the first byte cannot be compared. */
+                check_match(s, s->strstart, s->prev_match + 1, s->prev_length - 1);
+            } else {
+                check_match(s, s->strstart - 1, s->prev_match, s->prev_length);
+            }
 
-            _tr_tally_dist(s, s->strstart -1 - s->prev_match,
+            _tr_tally_dist(s, s->strstart - 1 - s->prev_match,
                            s->prev_length - MIN_MATCH, bflush);
 
             /* Insert in hash table all strings up to the end of the match.
-             * strstart-1 and strstart are already inserted. If there is not
+             * strstart - 1 and strstart are already inserted. If there is not
              * enough lookahead, the last two strings are not inserted in
              * the hash table.
              */
-            s->lookahead -= s->prev_length-1;
+            s->lookahead -= s->prev_length - 1;
             s->prev_length -= 2;
             do {
                 if (++s->strstart <= max_insert) {
@@ -2060,8 +2028,8 @@ local block_state deflate_slow(s, flush)
              * single literal. If there was a match but the current match
              * is longer, truncate the previous match to a single literal.
              */
-            Tracevv((stderr,"%c", s->window[s->strstart-1]));
-            _tr_tally_lit(s, s->window[s->strstart-1], bflush);
+            Tracevv((stderr,"%c", s->window[s->strstart - 1]));
+            _tr_tally_lit(s, s->window[s->strstart - 1], bflush);
             if (bflush) {
                 FLUSH_BLOCK_ONLY(s, 0);
             }
@@ -2079,8 +2047,8 @@ local block_state deflate_slow(s, flush)
     }
     Assert (flush != Z_NO_FLUSH, "no flush?");
     if (s->match_available) {
-        Tracevv((stderr,"%c", s->window[s->strstart-1]));
-        _tr_tally_lit(s, s->window[s->strstart-1], bflush);
+        Tracevv((stderr,"%c", s->window[s->strstart - 1]));
+        _tr_tally_lit(s, s->window[s->strstart - 1], bflush);
         s->match_available = 0;
     }
     s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;
@@ -2088,7 +2056,7 @@ local block_state deflate_slow(s, flush)
         FLUSH_BLOCK(s, 1);
         return finish_done;
     }
-    if (s->last_lit)
+    if (s->sym_next)
         FLUSH_BLOCK(s, 0);
     return block_done;
 }
@@ -2099,10 +2067,7 @@ local block_state deflate_slow(s, flush)
  * one.  Do not maintain a hash table.  (It will be regenerated if this run of
  * deflate switches away from Z_RLE.)
  */
-local block_state deflate_rle(s, flush)
-    deflate_state *s;
-    int flush;
-{
+local block_state deflate_rle(deflate_state *s, int flush) {
     int bflush;             /* set if current block must be flushed */
     uInt prev;              /* byte at distance one to match */
     Bytef *scan, *strend;   /* scan goes up to strend for length of run */
@@ -2137,7 +2102,8 @@ local block_state deflate_rle(s, flush)
                 if (s->match_length > s->lookahead)
                     s->match_length = s->lookahead;
             }
-            Assert(scan <= s->window+(uInt)(s->window_size-1), "wild scan");
+            Assert(scan <= s->window + (uInt)(s->window_size - 1),
+                   "wild scan");
         }
 
         /* Emit match if have run of MIN_MATCH or longer, else emit literal */
@@ -2152,7 +2118,7 @@ local block_state deflate_rle(s, flush)
         } else {
             /* No match, output a literal byte */
             Tracevv((stderr,"%c", s->window[s->strstart]));
-            _tr_tally_lit (s, s->window[s->strstart], bflush);
+            _tr_tally_lit(s, s->window[s->strstart], bflush);
             s->lookahead--;
             s->strstart++;
         }
@@ -2163,7 +2129,7 @@ local block_state deflate_rle(s, flush)
         FLUSH_BLOCK(s, 1);
         return finish_done;
     }
-    if (s->last_lit)
+    if (s->sym_next)
         FLUSH_BLOCK(s, 0);
     return block_done;
 }
@@ -2172,10 +2138,7 @@ local block_state deflate_rle(s, flush)
  * For Z_HUFFMAN_ONLY, do not look for matches.  Do not maintain a hash table.
  * (It will be regenerated if this run of deflate switches away from Huffman.)
  */
-local block_state deflate_huff(s, flush)
-    deflate_state *s;
-    int flush;
-{
+local block_state deflate_huff(deflate_state *s, int flush) {
     int bflush;             /* set if current block must be flushed */
 
     for (;;) {
@@ -2192,7 +2155,7 @@ local block_state deflate_huff(s, flush)
         /* Output a literal byte */
         s->match_length = 0;
         Tracevv((stderr,"%c", s->window[s->strstart]));
-        _tr_tally_lit (s, s->window[s->strstart], bflush);
+        _tr_tally_lit(s, s->window[s->strstart], bflush);
         s->lookahead--;
         s->strstart++;
         if (bflush) FLUSH_BLOCK(s, 0);
@@ -2202,41 +2165,7 @@ local block_state deflate_huff(s, flush)
         FLUSH_BLOCK(s, 1);
         return finish_done;
     }
-    if (s->last_lit)
+    if (s->sym_next)
         FLUSH_BLOCK(s, 0);
     return block_done;
 }
-
-/* Safe to inline this as GCC/clang will use inline asm and Visual Studio will
- * use intrinsic without extra params
- */
-local INLINE Pos insert_string_sse(deflate_state *const s, const Pos str)
-{
-    Pos ret;
-    unsigned *ip, val, h = 0;
-
-    ip = (unsigned *)&s->window[str];
-    val = *ip;
-
-    if (s->level >= 6)
-        val &= 0xFFFFFF;
-
-/* Windows clang should use inline asm */
-#if defined(_MSC_VER) && !defined(__clang__)
-    h = _mm_crc32_u32(h, val);
-#elif defined(__i386__) || defined(__amd64__)
-    __asm__ __volatile__ (
-        "crc32 %1,%0\n\t"
-    : "+r" (h)
-    : "r" (val)
-    );
-#else
-    /* This should never happen */
-    assert(0);
-#endif
-
-    ret = s->head[h & s->hash_mask];
-    s->head[h & s->hash_mask] = str;
-    s->prev[str & s->w_mask] = ret;
-    return ret;
-}
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/deflate.h b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/deflate.h
index ab56df766..f16419110 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/deflate.h
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/deflate.h
@@ -1,5 +1,5 @@
 /* deflate.h -- internal compression state
- * Copyright (C) 1995-2016 Jean-loup Gailly
+ * Copyright (C) 1995-2018 Jean-loup Gailly
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -109,8 +109,8 @@ typedef struct internal_state {
     ulg   gzindex;       /* where in extra, name, or comment */
     Byte  method;        /* can only be DEFLATED */
     int   last_flush;    /* value of flush param for previous deflate call */
-    unsigned zalign(16) crc0[4 * 5];
-                /* used by deflate.c: */
+    unsigned crc0[4 * 5];
+    /* used by deflate.c: */
 
     uInt  w_size;        /* LZ77 window size (32K by default) */
     uInt  w_bits;        /* log2(w_size)  (8..16) */
@@ -217,7 +217,7 @@ typedef struct internal_state {
     /* Depth of each subtree used as tie breaker for trees of equal frequency
      */
 
-    uchf *l_buf;          /* buffer for literals or lengths */
+    uchf *sym_buf;        /* buffer for distances and literals/lengths */
 
     uInt  lit_bufsize;
     /* Size of match buffer for literals/lengths.  There are 4 reasons for
@@ -239,13 +239,8 @@ typedef struct internal_state {
      *   - I can't count above 4
      */
 
-    uInt last_lit;      /* running index in l_buf */
-
-    ushf *d_buf;
-    /* Buffer for distances. To simplify the code, d_buf and l_buf have
-     * the same number of elements. To use different lengths, an extra flag
-     * array would be necessary.
-     */
+    uInt sym_next;      /* running index in sym_buf */
+    uInt sym_end;       /* symbol table full when sym_next reaches this */
 
     ulg opt_len;        /* bit length of current block with optimal trees */
     ulg static_len;     /* bit length of current block with static trees */
@@ -273,6 +268,11 @@ typedef struct internal_state {
      * updated to the new high water mark.
      */
 
+    uInt chromium_zlib_hash;
+    /* 0 if Rabin-Karp rolling hash is enabled, non-zero if chromium zlib
+     * hash is enabled.
+     */
+
 } FAR deflate_state;
 
 /* Output a byte on the stream.
@@ -296,14 +296,14 @@ typedef struct internal_state {
    memory checker errors from longest match routines */
 
         /* in trees.c */
-void ZLIB_INTERNAL _tr_init OF((deflate_state *s));
-int ZLIB_INTERNAL _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc));
-void ZLIB_INTERNAL _tr_flush_block OF((deflate_state *s, charf *buf,
-                        ulg stored_len, int last));
-void ZLIB_INTERNAL _tr_flush_bits OF((deflate_state *s));
-void ZLIB_INTERNAL _tr_align OF((deflate_state *s));
-void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
-                        ulg stored_len, int last));
+void ZLIB_INTERNAL _tr_init(deflate_state *s);
+int ZLIB_INTERNAL _tr_tally(deflate_state *s, unsigned dist, unsigned lc);
+void ZLIB_INTERNAL _tr_flush_block(deflate_state *s, charf *buf,
+                                   ulg stored_len, int last);
+void ZLIB_INTERNAL _tr_flush_bits(deflate_state *s);
+void ZLIB_INTERNAL _tr_align(deflate_state *s);
+void ZLIB_INTERNAL _tr_stored_block(deflate_state *s, charf *buf,
+                                    ulg stored_len, int last);
 
 #define d_code(dist) \
    ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)])
@@ -325,20 +325,22 @@ void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
 
 # define _tr_tally_lit(s, c, flush) \
   { uch cc = (c); \
-    s->d_buf[s->last_lit] = 0; \
-    s->l_buf[s->last_lit++] = cc; \
+    s->sym_buf[s->sym_next++] = 0; \
+    s->sym_buf[s->sym_next++] = 0; \
+    s->sym_buf[s->sym_next++] = cc; \
     s->dyn_ltree[cc].Freq++; \
-    flush = (s->last_lit == s->lit_bufsize-1); \
+    flush = (s->sym_next == s->sym_end); \
    }
 # define _tr_tally_dist(s, distance, length, flush) \
   { uch len = (uch)(length); \
     ush dist = (ush)(distance); \
-    s->d_buf[s->last_lit] = dist; \
-    s->l_buf[s->last_lit++] = len; \
+    s->sym_buf[s->sym_next++] = (uch)dist; \
+    s->sym_buf[s->sym_next++] = (uch)(dist >> 8); \
+    s->sym_buf[s->sym_next++] = len; \
     dist--; \
     s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
     s->dyn_dtree[d_code(dist)].Freq++; \
-    flush = (s->last_lit == s->lit_bufsize-1); \
+    flush = (s->sym_next == s->sym_end); \
   }
 #else
 # define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)
@@ -354,6 +356,4 @@ void ZLIB_INTERNAL crc_fold_copy(deflate_state* const s,
                                  long len);
 unsigned ZLIB_INTERNAL crc_fold_512to32(deflate_state* const s);
 
-void ZLIB_INTERNAL fill_window_sse(deflate_state* s);
-
 #endif /* DEFLATE_H */
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/fill_window_sse.c b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/fill_window_sse.c
deleted file mode 100644
index 949ccce1b..000000000
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/fill_window_sse.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Fill Window with SSE2-optimized hash shifting
- *
- * Copyright (C) 2013 Intel Corporation
- * Authors:
- *  Arjan van de Ven    <arjan@linux.intel.com>
- *  Jim Kukunas         <james.t.kukunas@linux.intel.com>
- *
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include <immintrin.h>
-#include "deflate.h"
-
-#define UPDATE_HASH(s,h,i) \
-    {\
-        if (s->level < 6) { \
-            h = (3483 * (s->window[i]) +\
-                 23081* (s->window[i+1]) +\
-                 6954 * (s->window[i+2]) +\
-                 20947* (s->window[i+3])) & s->hash_mask;\
-        } else {\
-            h = (25881* (s->window[i]) +\
-                 24674* (s->window[i+1]) +\
-                 25811* (s->window[i+2])) & s->hash_mask;\
-        }\
-    }\
-
-extern int read_buf OF((z_streamp strm, Bytef *buf, unsigned size));
-
-void fill_window_sse(deflate_state *s)
-{
-    const __m128i xmm_wsize = _mm_set1_epi16(s->w_size);
-
-    register unsigned n;
-    register Posf *p;
-    unsigned more;    /* Amount of free space at the end of the window. */
-    uInt wsize = s->w_size;
-
-    Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead");
-
-    do {
-        more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
-
-        /* Deal with !@#$% 64K limit: */
-        if (sizeof(int) <= 2) {
-            if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
-                more = wsize;
-
-            } else if (more == (unsigned)(-1)) {
-                /* Very unlikely, but possible on 16 bit machine if
-                 * strstart == 0 && lookahead == 1 (input done a byte at time)
-                 */
-                more--;
-            }
-        }
-
-        /* If the window is almost full and there is insufficient lookahead,
-         * move the upper half to the lower one to make room in the upper half.
-         */
-        if (s->strstart >= wsize+MAX_DIST(s)) {
-
-            zmemcpy(s->window, s->window+wsize, (unsigned)wsize);
-            s->match_start -= wsize;
-            s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */
-            s->block_start -= (long) wsize;
-
-            /* Slide the hash table (could be avoided with 32 bit values
-               at the expense of memory usage). We slide even when level == 0
-               to keep the hash table consistent if we switch back to level > 0
-               later. (Using level 0 permanently is not an optimal usage of
-               zlib, so we don't care about this pathological case.)
-             */
-            n = s->hash_size;
-            p = &s->head[n];
-            p -= 8;
-            do {
-                __m128i value, result;
-
-                value = _mm_loadu_si128((__m128i *)p);
-                result = _mm_subs_epu16(value, xmm_wsize);
-                _mm_storeu_si128((__m128i *)p, result);
-
-                p -= 8;
-                n -= 8;
-            } while (n > 0);
-
-            n = wsize;
-#ifndef FASTEST
-            p = &s->prev[n];
-            p -= 8;
-            do {
-                __m128i value, result;
-
-                value = _mm_loadu_si128((__m128i *)p);
-                result = _mm_subs_epu16(value, xmm_wsize);
-                _mm_storeu_si128((__m128i *)p, result);
-
-                p -= 8;
-                n -= 8;
-            } while (n > 0);
-#endif
-            more += wsize;
-        }
-        if (s->strm->avail_in == 0) break;
-
-        /* If there was no sliding:
-         *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
-         *    more == window_size - lookahead - strstart
-         * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)
-         * => more >= window_size - 2*WSIZE + 2
-         * In the BIG_MEM or MMAP case (not yet supported),
-         *   window_size == input_size + MIN_LOOKAHEAD  &&
-         *   strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.
-         * Otherwise, window_size == 2*WSIZE so more >= 2.
-         * If there was sliding, more >= WSIZE. So in all cases, more >= 2.
-         */
-        Assert(more >= 2, "more < 2");
-
-        n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more);
-        s->lookahead += n;
-
-        /* Initialize the hash value now that we have some input: */
-        if (s->lookahead >= MIN_MATCH) {
-            uInt str = s->strstart;
-            s->ins_h = s->window[str];
-            if (str >= 1)
-                UPDATE_HASH(s, s->ins_h, str + 1 - (MIN_MATCH-1));
-#if MIN_MATCH != 3
-            Call UPDATE_HASH() MIN_MATCH-3 more times
-#endif
-        }
-        /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
-         * but this is not important since only literal bytes will be emitted.
-         */
-
-    } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0);
-
-    /* If the WIN_INIT bytes after the end of the current data have never been
-     * written, then zero those bytes in order to avoid memory check reports of
-     * the use of uninitialized (or uninitialised as Julian writes) bytes by
-     * the longest match routines.  Update the high water mark for the next
-     * time through here.  WIN_INIT is set to MAX_MATCH since the longest match
-     * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead.
-     */
-    if (s->high_water < s->window_size) {
-        ulg curr = s->strstart + (ulg)(s->lookahead);
-        ulg init;
-
-        if (s->high_water < curr) {
-            /* Previous high water mark below current data -- zero WIN_INIT
-             * bytes or up to end of window, whichever is less.
-             */
-            init = s->window_size - curr;
-            if (init > WIN_INIT)
-                init = WIN_INIT;
-            zmemzero(s->window + curr, (unsigned)init);
-            s->high_water = curr + init;
-        }
-        else if (s->high_water < (ulg)curr + WIN_INIT) {
-            /* High water mark at or above current data, but below current data
-             * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up
-             * to end of window, whichever is less.
-             */
-            init = (ulg)curr + WIN_INIT - s->high_water;
-            if (init > s->window_size - s->high_water)
-                init = s->window_size - s->high_water;
-            zmemzero(s->window + s->high_water, (unsigned)init);
-            s->high_water += init;
-        }
-    }
-
-    Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
-           "not enough room for search");
-}
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google.patch b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google.patch
deleted file mode 100644
index f16dacced..000000000
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google.patch
+++ /dev/null
@@ -1,399 +0,0 @@
-diff --git a/contrib/minizip/ioapi.h b/contrib/minizip/ioapi.h
-index 8dcbdb06e35a..c1b7a54847f5 100644
---- a/contrib/minizip/ioapi.h
-+++ b/contrib/minizip/ioapi.h
-@@ -43,7 +43,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
--#include "zlib.h"
-+#include "third_party/zlib/zlib.h"
- 
- #if defined(USE_FILE32API)
- #define fopen64 fopen
-diff --git a/contrib/minizip/iowin32.c b/contrib/minizip/iowin32.c
-index 274f39eb1dd2..246ceb91a139 100644
---- a/contrib/minizip/iowin32.c
-+++ b/contrib/minizip/iowin32.c
-@@ -26,12 +26,19 @@
- #endif
- 
- 
-+#ifdef _WIN32_WINNT
-+#undef _WIN32_WINNT
-+#define _WIN32_WINNT 0x601
-+#endif
-+
-+#if _WIN32_WINNT >= _WIN32_WINNT_WIN8
- // see Include/shared/winapifamily.h in the Windows Kit
- #if defined(WINAPI_FAMILY_PARTITION) && (!(defined(IOWIN32_USING_WINRT_API)))
- #if WINAPI_FAMILY_ONE_PARTITION(WINAPI_FAMILY, WINAPI_PARTITION_APP)
- #define IOWIN32_USING_WINRT_API 1
- #endif
- #endif
-+#endif
- 
- voidpf  ZCALLBACK win32_open_file_func  OF((voidpf opaque, const char* filename, int mode));
- uLong   ZCALLBACK win32_read_file_func  OF((voidpf opaque, voidpf stream, void* buf, uLong size));
-diff --git a/contrib/minizip/mztools.c b/contrib/minizip/mztools.c
-index 96891c2e0b71..8bf9cca32633 100644
---- a/contrib/minizip/mztools.c
-+++ b/contrib/minizip/mztools.c
-@@ -8,7 +8,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include "zlib.h"
-+#include "third_party/zlib/zlib.h"
- #include "unzip.h"
- 
- #define READ_8(adr)  ((unsigned char)*(adr))
-diff --git a/contrib/minizip/mztools.h b/contrib/minizip/mztools.h
-index a49a426ec2fc..f295ffeda6af 100644
---- a/contrib/minizip/mztools.h
-+++ b/contrib/minizip/mztools.h
-@@ -12,7 +12,7 @@ extern "C" {
- #endif
- 
- #ifndef _ZLIB_H
--#include "zlib.h"
-+#include "third_party/zlib/zlib.h"
- #endif
- 
- #include "unzip.h"
-diff --git a/contrib/minizip/unzip.c b/contrib/minizip/unzip.c
-index bcfb9416ec35..199b4723fcfc 100644
---- a/contrib/minizip/unzip.c
-+++ b/contrib/minizip/unzip.c
-@@ -72,7 +72,7 @@
-         #define NOUNCRYPT
- #endif
- 
--#include "zlib.h"
-+#include "third_party/zlib/zlib.h"
- #include "unzip.h"
- 
- #ifdef STDC
-@@ -1705,11 +1705,6 @@ extern int ZEXPORT unzReadCurrentFile  (unzFile file, voidp buf, unsigned len)
- 
-     pfile_in_zip_read_info->stream.avail_out = (uInt)len;
- 
--    if ((len>pfile_in_zip_read_info->rest_read_uncompressed) &&
--        (!(pfile_in_zip_read_info->raw)))
--        pfile_in_zip_read_info->stream.avail_out =
--            (uInt)pfile_in_zip_read_info->rest_read_uncompressed;
--
-     if ((len>pfile_in_zip_read_info->rest_read_compressed+
-            pfile_in_zip_read_info->stream.avail_in) &&
-          (pfile_in_zip_read_info->raw))
-diff --git a/contrib/minizip/unzip.h b/contrib/minizip/unzip.h
-index 2104e3915074..3c0143529b91 100644
---- a/contrib/minizip/unzip.h
-+++ b/contrib/minizip/unzip.h
-@@ -48,7 +48,7 @@ extern "C" {
- #endif
- 
- #ifndef _ZLIB_H
--#include "zlib.h"
-+#include "third_party/zlib/zlib.h"
- #endif
- 
- #ifndef  _ZLIBIOAPI_H
-diff --git a/contrib/minizip/zip.c b/contrib/minizip/zip.c
-index 44e88a9cb989..65c0c7251843 100644
---- a/contrib/minizip/zip.c
-+++ b/contrib/minizip/zip.c
-@@ -26,7 +26,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <time.h>
--#include "zlib.h"
-+#include "third_party/zlib/zlib.h"
- #include "zip.h"
- 
- #ifdef STDC
-diff --git a/contrib/minizip/zip.h b/contrib/minizip/zip.h
-index 8aaebb623430..8c06c0aa7bb0 100644
---- a/contrib/minizip/zip.h
-+++ b/contrib/minizip/zip.h
-@@ -47,7 +47,7 @@ extern "C" {
- //#define HAVE_BZIP2
- 
- #ifndef _ZLIB_H
--#include "zlib.h"
-+#include "third_party/zlib/zlib.h"
- #endif
- 
- #ifndef _ZLIBIOAPI_H
-diff --git a/gzread.c b/gzread.c
-index 956b91ea7d9e..832d3ef98c59 100644
---- a/gzread.c
-+++ b/gzread.c
-@@ -443,7 +443,11 @@ z_size_t ZEXPORT gzfread(buf, size, nitems, file)
- #  undef z_gzgetc
- #else
- #  undef gzgetc
-+#  ifdef Z_CR_PREFIX_SET
-+#    define gzgetc Cr_z_gzgetc
-+#  endif
- #endif
-+
- int ZEXPORT gzgetc(file)
-     gzFile file;
- {
-diff --git a/names.h b/names.h
-new file mode 100644
-index 000000000000..f18df5684dc5
---- /dev/null
-+++ b/names.h
-@@ -0,0 +1,155 @@
-+/* Copyright 2017 The Chromium Authors. All rights reserved.
-+ * Use of this source code is governed by a BSD-style license that can be
-+ * found in the LICENSE file. */
-+
-+#ifndef THIRD_PARTY_ZLIB_NAMES_H_
-+#define THIRD_PARTY_ZLIB_NAMES_H_
-+
-+/* Rename all zlib names with a Cr_z_ prefix. This is based on the Z_PREFIX
-+ * option from zconf.h, but with a custom prefix. Where zconf.h would rename
-+ * both a macro and its underscore-suffixed internal implementation (such as
-+ * deflateInit2 and deflateInit2_), only the implementation is renamed here.
-+ * The Byte type is also omitted.
-+ *
-+ * To generate this list, run
-+ * sed -rn -e 's/^# *define +([^ ]+) +(z_[^ ]+)$/#define \1 Cr_\2/p' zconf.h
-+ * (use -E instead of -r on macOS).
-+ *
-+ * gzread is also addressed by modifications in gzread.c and zlib.h. */
-+
-+#define Z_CR_PREFIX_SET
-+
-+#define _dist_code Cr_z__dist_code
-+#define _length_code Cr_z__length_code
-+#define _tr_align Cr_z__tr_align
-+#define _tr_flush_bits Cr_z__tr_flush_bits
-+#define _tr_flush_block Cr_z__tr_flush_block
-+#define _tr_init Cr_z__tr_init
-+#define _tr_stored_block Cr_z__tr_stored_block
-+#define _tr_tally Cr_z__tr_tally
-+#define adler32 Cr_z_adler32
-+#define adler32_combine Cr_z_adler32_combine
-+#define adler32_combine64 Cr_z_adler32_combine64
-+#define adler32_z Cr_z_adler32_z
-+#define compress Cr_z_compress
-+#define compress2 Cr_z_compress2
-+#define compressBound Cr_z_compressBound
-+#define crc32 Cr_z_crc32
-+#define crc32_combine Cr_z_crc32_combine
-+#define crc32_combine64 Cr_z_crc32_combine64
-+#define crc32_z Cr_z_crc32_z
-+#define deflate Cr_z_deflate
-+#define deflateBound Cr_z_deflateBound
-+#define deflateCopy Cr_z_deflateCopy
-+#define deflateEnd Cr_z_deflateEnd
-+#define deflateGetDictionary Cr_z_deflateGetDictionary
-+/* #undef deflateInit */
-+/* #undef deflateInit2 */
-+#define deflateInit2_ Cr_z_deflateInit2_
-+#define deflateInit_ Cr_z_deflateInit_
-+#define deflateParams Cr_z_deflateParams
-+#define deflatePending Cr_z_deflatePending
-+#define deflatePrime Cr_z_deflatePrime
-+#define deflateReset Cr_z_deflateReset
-+#define deflateResetKeep Cr_z_deflateResetKeep
-+#define deflateSetDictionary Cr_z_deflateSetDictionary
-+#define deflateSetHeader Cr_z_deflateSetHeader
-+#define deflateTune Cr_z_deflateTune
-+#define deflate_copyright Cr_z_deflate_copyright
-+#define get_crc_table Cr_z_get_crc_table
-+#define gz_error Cr_z_gz_error
-+#define gz_intmax Cr_z_gz_intmax
-+#define gz_strwinerror Cr_z_gz_strwinerror
-+#define gzbuffer Cr_z_gzbuffer
-+#define gzclearerr Cr_z_gzclearerr
-+#define gzclose Cr_z_gzclose
-+#define gzclose_r Cr_z_gzclose_r
-+#define gzclose_w Cr_z_gzclose_w
-+#define gzdirect Cr_z_gzdirect
-+#define gzdopen Cr_z_gzdopen
-+#define gzeof Cr_z_gzeof
-+#define gzerror Cr_z_gzerror
-+#define gzflush Cr_z_gzflush
-+#define gzfread Cr_z_gzfread
-+#define gzfwrite Cr_z_gzfwrite
-+#define gzgetc Cr_z_gzgetc
-+#define gzgetc_ Cr_z_gzgetc_
-+#define gzgets Cr_z_gzgets
-+#define gzoffset Cr_z_gzoffset
-+#define gzoffset64 Cr_z_gzoffset64
-+#define gzopen Cr_z_gzopen
-+#define gzopen64 Cr_z_gzopen64
-+#define gzopen_w Cr_z_gzopen_w
-+#define gzprintf Cr_z_gzprintf
-+#define gzputc Cr_z_gzputc
-+#define gzputs Cr_z_gzputs
-+#define gzread Cr_z_gzread
-+#define gzrewind Cr_z_gzrewind
-+#define gzseek Cr_z_gzseek
-+#define gzseek64 Cr_z_gzseek64
-+#define gzsetparams Cr_z_gzsetparams
-+#define gztell Cr_z_gztell
-+#define gztell64 Cr_z_gztell64
-+#define gzungetc Cr_z_gzungetc
-+#define gzvprintf Cr_z_gzvprintf
-+#define gzwrite Cr_z_gzwrite
-+#define inflate Cr_z_inflate
-+#define inflateBack Cr_z_inflateBack
-+#define inflateBackEnd Cr_z_inflateBackEnd
-+/* #undef inflateBackInit */
-+#define inflateBackInit_ Cr_z_inflateBackInit_
-+#define inflateCodesUsed Cr_z_inflateCodesUsed
-+#define inflateCopy Cr_z_inflateCopy
-+#define inflateEnd Cr_z_inflateEnd
-+#define inflateGetDictionary Cr_z_inflateGetDictionary
-+#define inflateGetHeader Cr_z_inflateGetHeader
-+/* #undef inflateInit */
-+/* #undef inflateInit2 */
-+#define inflateInit2_ Cr_z_inflateInit2_
-+#define inflateInit_ Cr_z_inflateInit_
-+#define inflateMark Cr_z_inflateMark
-+#define inflatePrime Cr_z_inflatePrime
-+#define inflateReset Cr_z_inflateReset
-+#define inflateReset2 Cr_z_inflateReset2
-+#define inflateResetKeep Cr_z_inflateResetKeep
-+#define inflateSetDictionary Cr_z_inflateSetDictionary
-+#define inflateSync Cr_z_inflateSync
-+#define inflateSyncPoint Cr_z_inflateSyncPoint
-+#define inflateUndermine Cr_z_inflateUndermine
-+#define inflateValidate Cr_z_inflateValidate
-+#define inflate_copyright Cr_z_inflate_copyright
-+#define inflate_fast Cr_z_inflate_fast
-+#define inflate_table Cr_z_inflate_table
-+#define uncompress Cr_z_uncompress
-+#define uncompress2 Cr_z_uncompress2
-+#define zError Cr_z_zError
-+#define zcalloc Cr_z_zcalloc
-+#define zcfree Cr_z_zcfree
-+#define zlibCompileFlags Cr_z_zlibCompileFlags
-+#define zlibVersion Cr_z_zlibVersion
-+/* #undef Byte */
-+#define Bytef Cr_z_Bytef
-+#define alloc_func Cr_z_alloc_func
-+#define charf Cr_z_charf
-+#define free_func Cr_z_free_func
-+#define gzFile Cr_z_gzFile
-+#define gz_header Cr_z_gz_header
-+#define gz_headerp Cr_z_gz_headerp
-+#define in_func Cr_z_in_func
-+#define intf Cr_z_intf
-+#define out_func Cr_z_out_func
-+#define uInt Cr_z_uInt
-+#define uIntf Cr_z_uIntf
-+#define uLong Cr_z_uLong
-+#define uLongf Cr_z_uLongf
-+#define voidp Cr_z_voidp
-+#define voidpc Cr_z_voidpc
-+#define voidpf Cr_z_voidpf
-+#define gz_header_s Cr_z_gz_header_s
-+#define internal_state Cr_z_internal_state
-+/* #undef z_off64_t */
-+
-+/* An exported symbol that isn't handled by Z_PREFIX in zconf.h */
-+#define z_errmsg Cr_z_z_errmsg
-+
-+#endif  /* THIRD_PARTY_ZLIB_NAMES_H_ */
-diff --git a/zconf.h b/zconf.h
-index 5e1d68a004e9..a7a815f575a7 100644
---- a/zconf.h
-+++ b/zconf.h
-@@ -8,6 +8,9 @@
- #ifndef ZCONF_H
- #define ZCONF_H
- 
-+/* This include does prefixing as below, but with an updated set of names */
-+#include "names.h"
-+
- /*
-  * If you *really* need a unique prefix for all types and library functions,
-  * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
-@@ -431,7 +434,7 @@ typedef uLong FAR uLongf;
-    typedef unsigned long z_crc_t;
- #endif
- 
--#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
-+#if !defined(_WIN32)
- #  define Z_HAVE_UNISTD_H
- #endif
- 
-diff --git a/zlib.h b/zlib.h
-index f09cdaf1e054..99fd467f6b1a 100644
---- a/zlib.h
-+++ b/zlib.h
-@@ -1824,6 +1824,11 @@ ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
- #  undef z_gzgetc
- #  define z_gzgetc(g) \
-           ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g))
-+#elif defined(Z_CR_PREFIX_SET)
-+#    undef gzgetc
-+#    define gzgetc(g) \
-+          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) \
-+                     : (Cr_z_gzgetc)(g))
- #else
- #  define gzgetc(g) \
-           ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g))
-@@ -1853,11 +1858,29 @@ ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
- #    define z_adler32_combine z_adler32_combine64
- #    define z_crc32_combine z_crc32_combine64
- #  else
-+#    ifdef gzopen
-+#      undef gzopen
-+#    endif
- #    define gzopen gzopen64
-+#    ifdef gzseek
-+#      undef gzseek
-+#    endif
- #    define gzseek gzseek64
-+#    ifdef gztell
-+#      undef gztell
-+#    endif
- #    define gztell gztell64
-+#    ifdef gzoffset
-+#      undef gzoffset
-+#    endif
- #    define gzoffset gzoffset64
-+#    ifdef adler32_combine
-+#      undef adler32_combine
-+#    endif
- #    define adler32_combine adler32_combine64
-+#    ifdef crc32_combine
-+#      undef crc32_combine
-+#    endif
- #    define crc32_combine crc32_combine64
- #  endif
- #  ifndef Z_LARGE64
-diff --git a/zutil.h b/zutil.h
-index b079ea6a80f5..80375b8b6109 100644
---- a/zutil.h
-+++ b/zutil.h
-@@ -28,6 +28,21 @@
- #  include <string.h>
- #  include <stdlib.h>
- #endif
-+#ifdef NO_ERRNO_H
-+#   ifdef _WIN32_WCE
-+      /* The Microsoft C Run-Time Library for Windows CE doesn't have
-+       * errno.  We define it as a global variable to simplify porting.
-+       * Its value is always 0 and should not be used.  We rename it to
-+       * avoid conflict with other libraries that use the same workaround.
-+       */
-+#     define errno z_errno
-+#   endif
-+    extern int errno;
-+#else
-+#  ifndef _WIN32_WCE
-+#    include <errno.h>
-+#  endif
-+#endif
- 
- #ifdef Z_SOLO
-    typedef long ptrdiff_t;  /* guess -- will be caught if guess is wrong */
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/BUILD.gn b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/BUILD.gn
new file mode 100644
index 000000000..122cef573
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/BUILD.gn
@@ -0,0 +1,59 @@
+# Copyright 2017 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build_overrides/build.gni")
+
+if (build_with_chromium && is_ios) {
+  import("//build/config/ios/bundle_data_from_filelist.gni")
+}
+
+if (build_with_chromium) {
+  static_library("zip") {
+    sources = [
+      "redact.h",
+      "zip.cc",
+      "zip.h",
+      "zip_internal.cc",
+      "zip_internal.h",
+      "zip_reader.cc",
+      "zip_reader.h",
+      "zip_writer.cc",
+      "zip_writer.h",
+    ]
+    deps = [
+      "..:minizip",
+      "//base",
+      "//base:i18n",
+    ]
+  }
+
+  static_library("compression_utils") {
+    sources = [
+      "compression_utils.cc",
+      "compression_utils.h",
+    ]
+    deps = [
+      "..",
+      "//base",
+    ]
+    public_deps = [ ":compression_utils_portable" ]
+  }
+
+  if (is_ios) {
+    bundle_data_from_filelist("zlib_pak_bundle_data") {
+      testonly = true
+      filelist_name = "test_data.filelist"
+    }
+  }
+}
+
+# This allows other users of Chromium's zlib library, but don't use Chromium's
+# //base, to reuse some boilerplate code.
+static_library("compression_utils_portable") {
+  sources = [
+    "compression_utils_portable.cc",
+    "compression_utils_portable.h",
+  ]
+  public_deps = [ ".." ]
+}
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/DEPS b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/DEPS
index 144fbd149..7ec5343ee 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/DEPS
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/DEPS
@@ -2,4 +2,6 @@ include_rules = [
   '+base',
   '+build',
   '+testing',
+  '+third_party/icu/source/i18n/unicode',
+  '+third_party/zlib/zlib.h',
 ]
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/OWNERS b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/OWNERS
index 1ca253146..868af3cc6 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/OWNERS
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/OWNERS
@@ -3,3 +3,4 @@ satorux@chromium.org
 # compression_utils*
 asvitkine@chromium.org
 isherman@chromium.org
+cavalcantii@chromium.org
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/compression_utils.cc b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/compression_utils.cc
index 575aa1261..279ea0732 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/compression_utils.cc
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/compression_utils.cc
@@ -1,165 +1,134 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "third_party/zlib/google/compression_utils.h"
 
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
-
-#include <vector>
-
 #include "base/bit_cast.h"
-#include "base/logging.h"
+#include "base/check_op.h"
+#include "base/process/memory.h"
 #include "base/sys_byteorder.h"
-#include "third_party/zlib/zlib.h"
-
-namespace {
-
-// The difference in bytes between a zlib header and a gzip header.
-const size_t kGzipZlibHeaderDifferenceBytes = 16;
-
-// Pass an integer greater than the following get a gzip header instead of a
-// zlib header when calling deflateInit2() and inflateInit2().
-const int kWindowBitsToGetGzipHeader = 16;
-
-// This describes the amount of memory zlib uses to compress data. It can go
-// from 1 to 9, with 8 being the default. For details, see:
-// http://www.zlib.net/manual.html (search for memLevel).
-const int kZlibMemoryLevel = 8;
-
-// This code is taken almost verbatim from third_party/zlib/compress.c. The only
-// difference is deflateInit2() is called which sets the window bits to be > 16.
-// That causes a gzip header to be emitted rather than a zlib header.
-int GzipCompressHelper(Bytef* dest,
-                       uLongf* dest_length,
-                       const Bytef* source,
-                       uLong source_length) {
-  z_stream stream;
-
-  stream.next_in = bit_cast<Bytef*>(source);
-  stream.avail_in = static_cast<uInt>(source_length);
-  stream.next_out = dest;
-  stream.avail_out = static_cast<uInt>(*dest_length);
-  if (static_cast<uLong>(stream.avail_out) != *dest_length)
-    return Z_BUF_ERROR;
-
-  stream.zalloc = static_cast<alloc_func>(0);
-  stream.zfree = static_cast<free_func>(0);
-  stream.opaque = static_cast<voidpf>(0);
-
-  gz_header gzip_header;
-  memset(&gzip_header, 0, sizeof(gzip_header));
-  int err = deflateInit2(&stream,
-                         Z_DEFAULT_COMPRESSION,
-                         Z_DEFLATED,
-                         MAX_WBITS + kWindowBitsToGetGzipHeader,
-                         kZlibMemoryLevel,
-                         Z_DEFAULT_STRATEGY);
-  if (err != Z_OK)
-    return err;
-
-  err = deflateSetHeader(&stream, &gzip_header);
-  if (err != Z_OK)
-    return err;
-
-  err = deflate(&stream, Z_FINISH);
-  if (err != Z_STREAM_END) {
-    deflateEnd(&stream);
-    return err == Z_OK ? Z_BUF_ERROR : err;
-  }
-  *dest_length = stream.total_out;
 
-  err = deflateEnd(&stream);
-  return err;
-}
+#include "third_party/zlib/google/compression_utils_portable.h"
 
-// This code is taken almost verbatim from third_party/zlib/uncompr.c. The only
-// difference is inflateInit2() is called which sets the window bits to be > 16.
-// That causes a gzip header to be parsed rather than a zlib header.
-int GzipUncompressHelper(Bytef* dest,
-                         uLongf* dest_length,
-                         const Bytef* source,
-                         uLong source_length) {
-  z_stream stream;
-
-  stream.next_in = bit_cast<Bytef*>(source);
-  stream.avail_in = static_cast<uInt>(source_length);
-  if (static_cast<uLong>(stream.avail_in) != source_length)
-    return Z_BUF_ERROR;
-
-  stream.next_out = dest;
-  stream.avail_out = static_cast<uInt>(*dest_length);
-  if (static_cast<uLong>(stream.avail_out) != *dest_length)
-    return Z_BUF_ERROR;
-
-  stream.zalloc = static_cast<alloc_func>(0);
-  stream.zfree = static_cast<free_func>(0);
-
-  int err = inflateInit2(&stream, MAX_WBITS + kWindowBitsToGetGzipHeader);
-  if (err != Z_OK)
-    return err;
-
-  err = inflate(&stream, Z_FINISH);
-  if (err != Z_STREAM_END) {
-    inflateEnd(&stream);
-    if (err == Z_NEED_DICT || (err == Z_BUF_ERROR && stream.avail_in == 0))
-      return Z_DATA_ERROR;
-    return err;
-  }
-  *dest_length = stream.total_out;
+namespace compression {
 
-  err = inflateEnd(&stream);
-  return err;
+bool GzipCompress(base::span<const char> input,
+                  char* output_buffer,
+                  size_t output_buffer_size,
+                  size_t* compressed_size,
+                  void* (*malloc_fn)(size_t),
+                  void (*free_fn)(void*)) {
+  static_assert(sizeof(Bytef) == 1, "");
+
+  // uLongf can be larger than size_t.
+  uLongf compressed_size_long = static_cast<uLongf>(output_buffer_size);
+  if (zlib_internal::GzipCompressHelper(
+          base::bit_cast<Bytef*>(output_buffer), &compressed_size_long,
+          base::bit_cast<const Bytef*>(input.data()),
+          static_cast<uLongf>(input.size()), malloc_fn, free_fn) != Z_OK) {
+    return false;
+  }
+  // No overflow, as compressed_size_long <= output.size() which is a size_t.
+  *compressed_size = static_cast<size_t>(compressed_size_long);
+  return true;
 }
 
-// Returns the uncompressed size from GZIP-compressed |compressed_data|.
-uint32_t GetUncompressedSize(const std::string& compressed_data) {
-  // The uncompressed size is stored in the last 4 bytes of |input| in LE.
-  uint32_t size;
-  if (compressed_data.length() < sizeof(size))
-    return 0;
-  memcpy(&size, &compressed_data[compressed_data.length() - sizeof(size)],
-         sizeof(size));
-  return base::ByteSwapToLE32(size);
+bool GzipCompress(base::span<const char> input, std::string* output) {
+  return GzipCompress(base::as_bytes(input), output);
 }
 
-}  // namespace
+bool GzipCompress(base::span<const uint8_t> input, std::string* output) {
+  // Not using std::vector<> because allocation failures are recoverable,
+  // which is hidden by std::vector<>.
+  static_assert(sizeof(Bytef) == 1, "");
+  const uLongf input_size = static_cast<uLongf>(input.size());
 
-namespace compression {
+  uLongf compressed_data_size =
+      zlib_internal::GzipExpectedCompressedSize(input_size);
 
-bool GzipCompress(const std::string& input, std::string* output) {
-  const uLongf input_size = static_cast<uLongf>(input.size());
-  std::vector<Bytef> compressed_data(kGzipZlibHeaderDifferenceBytes +
-                                     compressBound(input_size));
-
-  uLongf compressed_size = static_cast<uLongf>(compressed_data.size());
-  if (GzipCompressHelper(&compressed_data.front(),
-                         &compressed_size,
-                         bit_cast<const Bytef*>(input.data()),
-                         input_size) != Z_OK) {
+  Bytef* compressed_data;
+  if (!base::UncheckedMalloc(compressed_data_size,
+                             reinterpret_cast<void**>(&compressed_data))) {
+    return false;
+  }
+
+  if (zlib_internal::GzipCompressHelper(
+          compressed_data, &compressed_data_size,
+          base::bit_cast<const Bytef*>(input.data()), input_size, nullptr,
+          nullptr) != Z_OK) {
+    free(compressed_data);
     return false;
   }
 
-  compressed_data.resize(compressed_size);
-  output->assign(compressed_data.begin(), compressed_data.end());
+  Bytef* resized_data =
+      reinterpret_cast<Bytef*>(realloc(compressed_data, compressed_data_size));
+  if (!resized_data) {
+    free(compressed_data);
+    return false;
+  }
+  output->assign(resized_data, resized_data + compressed_data_size);
   DCHECK_EQ(input_size, GetUncompressedSize(*output));
+
+  free(resized_data);
   return true;
 }
 
 bool GzipUncompress(const std::string& input, std::string* output) {
   std::string uncompressed_output;
   uLongf uncompressed_size = static_cast<uLongf>(GetUncompressedSize(input));
+  if (size_t{uncompressed_size} > uncompressed_output.max_size())
+    return false;
+
   uncompressed_output.resize(uncompressed_size);
-  if (GzipUncompressHelper(bit_cast<Bytef*>(uncompressed_output.data()),
-                           &uncompressed_size,
-                           bit_cast<const Bytef*>(input.data()),
-                           static_cast<uLongf>(input.length())) == Z_OK) {
+  if (zlib_internal::GzipUncompressHelper(
+          base::bit_cast<Bytef*>(uncompressed_output.data()),
+          &uncompressed_size, base::bit_cast<const Bytef*>(input.data()),
+          static_cast<uLongf>(input.length())) == Z_OK) {
     output->swap(uncompressed_output);
     return true;
   }
   return false;
 }
 
+bool GzipUncompress(base::span<const char> input,
+                    base::span<const char> output) {
+  return GzipUncompress(base::as_bytes(input), base::as_bytes(output));
+}
+
+bool GzipUncompress(base::span<const uint8_t> input,
+                    base::span<const uint8_t> output) {
+  uLongf uncompressed_size = GetUncompressedSize(input);
+  if (uncompressed_size > output.size())
+    return false;
+  return zlib_internal::GzipUncompressHelper(
+             base::bit_cast<Bytef*>(output.data()), &uncompressed_size,
+             base::bit_cast<const Bytef*>(input.data()),
+             static_cast<uLongf>(input.size())) == Z_OK;
+}
+
+bool GzipUncompress(base::span<const char> input, std::string* output) {
+  return GzipUncompress(base::as_bytes(input), output);
+}
+
+bool GzipUncompress(base::span<const uint8_t> input, std::string* output) {
+  // Disallow in-place usage, i.e., |input| using |*output| as underlying data.
+  DCHECK_NE(reinterpret_cast<const char*>(input.data()), output->data());
+  uLongf uncompressed_size = GetUncompressedSize(input);
+  output->resize(uncompressed_size);
+  return zlib_internal::GzipUncompressHelper(
+             base::bit_cast<Bytef*>(output->data()), &uncompressed_size,
+             base::bit_cast<const Bytef*>(input.data()),
+             static_cast<uLongf>(input.size())) == Z_OK;
+}
+
+uint32_t GetUncompressedSize(base::span<const char> compressed_data) {
+  return GetUncompressedSize(base::as_bytes(compressed_data));
+}
+
+uint32_t GetUncompressedSize(base::span<const uint8_t> compressed_data) {
+  return zlib_internal::GetGzipUncompressedSize(
+      base::bit_cast<Bytef*>(compressed_data.data()), compressed_data.size());
+}
+
 }  // namespace compression
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/compression_utils.h b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/compression_utils.h
index 3bd68c57e..ea399816f 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/compression_utils.h
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/compression_utils.h
@@ -1,4 +1,4 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -7,16 +7,64 @@
 
 #include <string>
 
+#include "base/containers/span.h"
+
 namespace compression {
 
+// Compresses the data in |input| using gzip, storing the result in
+// |output_buffer|, of size |output_buffer_size|. If the buffer is large enough
+// and compression succeeds, |compressed_size| points to the compressed data
+// size after the call.
+// |malloc_fn| and |free_fn| are pointers to malloc() and free()-like functions,
+// or nullptr to use the standard ones.
+// Returns true for success.
+bool GzipCompress(base::span<const char> input,
+                  char* output_buffer,
+                  size_t output_buffer_size,
+                  size_t* compressed_size,
+                  void* (*malloc_fn)(size_t),
+                  void (*free_fn)(void*));
+
 // Compresses the data in |input| using gzip, storing the result in |output|.
-// |input| and |output| are allowed to be the same string (in-place operation).
-bool GzipCompress(const std::string& input, std::string* output);
+// |input| and |output| are allowed to point to the same string (in-place
+// operation).
+// Returns true for success.
+bool GzipCompress(base::span<const char> input, std::string* output);
+
+// Like the above method, but using uint8_t instead.
+bool GzipCompress(base::span<const uint8_t> input, std::string* output);
 
 // Uncompresses the data in |input| using gzip, storing the result in |output|.
 // |input| and |output| are allowed to be the same string (in-place operation).
+// Returns true for success.
 bool GzipUncompress(const std::string& input, std::string* output);
 
+// Like the above method, but uses base::span to avoid allocations if
+// needed. |output|'s size must be at least as large as the return value from
+// GetUncompressedSize.
+// Returns true for success.
+bool GzipUncompress(base::span<const char> input,
+                    base::span<const char> output);
+
+// Like the above method, but using uint8_t instead.
+bool GzipUncompress(base::span<const uint8_t> input,
+                    base::span<const uint8_t> output);
+
+// Uncompresses the data in |input| using gzip, and writes the results to
+// |output|, which must NOT be the underlying string of |input|, and is resized
+// if necessary.
+// Returns true for success.
+bool GzipUncompress(base::span<const char> input, std::string* output);
+
+// Like the above method, but using uint8_t instead.
+bool GzipUncompress(base::span<const uint8_t> input, std::string* output);
+
+// Returns the uncompressed size from GZIP-compressed |compressed_data|.
+uint32_t GetUncompressedSize(base::span<const char> compressed_data);
+
+// Like the above method, but using uint8_t instead.
+uint32_t GetUncompressedSize(base::span<const uint8_t> compressed_data);
+
 }  // namespace compression
 
 #endif  // THIRD_PARTY_ZLIB_GOOGLE_COMPRESSION_UTILS_H_
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/compression_utils_portable.cc b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/compression_utils_portable.cc
new file mode 100644
index 000000000..49d6bfe9e
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/compression_utils_portable.cc
@@ -0,0 +1,205 @@
+/* compression_utils_portable.cc
+ *
+ * Copyright 2019 The Chromium Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the Chromium source repository LICENSE file.
+ */
+
+#include "compression_utils_portable.h"
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
+namespace zlib_internal {
+
+// The difference in bytes between a zlib header and a gzip header.
+const size_t kGzipZlibHeaderDifferenceBytes = 16;
+
+// Pass an integer greater than the following get a gzip header instead of a
+// zlib header when calling deflateInit2() and inflateInit2().
+const int kWindowBitsToGetGzipHeader = 16;
+
+// This describes the amount of memory zlib uses to compress data. It can go
+// from 1 to 9, with 8 being the default. For details, see:
+// http://www.zlib.net/manual.html (search for memLevel).
+const int kZlibMemoryLevel = 8;
+
+// The expected compressed size is based on the input size factored by
+// internal Zlib constants (e.g. window size, etc) plus the wrapper
+// header size.
+uLongf GzipExpectedCompressedSize(uLongf input_size) {
+  return kGzipZlibHeaderDifferenceBytes + compressBound(input_size);
+}
+
+// The expected decompressed size is stored in the last
+// 4 bytes of |input| in LE. See https://tools.ietf.org/html/rfc1952#page-5
+uint32_t GetGzipUncompressedSize(const Bytef* compressed_data, size_t length) {
+  uint32_t size;
+  if (length < sizeof(size))
+    return 0;
+
+  memcpy(&size, &compressed_data[length - sizeof(size)], sizeof(size));
+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+  return size;
+#else
+  return __builtin_bswap32(size);
+#endif
+}
+
+// The number of window bits determines the type of wrapper to use - see
+// https://cs.chromium.org/chromium/src/third_party/zlib/zlib.h?l=566
+inline int ZlibStreamWrapperType(WrapperType type) {
+  if (type == ZLIB)  // zlib DEFLATE stream wrapper
+    return MAX_WBITS;
+  if (type == GZIP)  // gzip DEFLATE stream wrapper
+    return MAX_WBITS + kWindowBitsToGetGzipHeader;
+  if (type == ZRAW)  // no wrapper, use raw DEFLATE
+    return -MAX_WBITS;
+  return 0;
+}
+
+int GzipCompressHelper(Bytef* dest,
+                       uLongf* dest_length,
+                       const Bytef* source,
+                       uLong source_length,
+                       void* (*malloc_fn)(size_t),
+                       void (*free_fn)(void*)) {
+  return CompressHelper(GZIP, dest, dest_length, source, source_length,
+                        Z_DEFAULT_COMPRESSION, malloc_fn, free_fn);
+}
+
+// This code is taken almost verbatim from third_party/zlib/compress.c. The only
+// difference is deflateInit2() is called which allows different window bits to
+// be set. > 16 causes a gzip header to be emitted rather than a zlib header,
+// and negative causes no header to emitted.
+//
+// Compression level can be a number from 1-9, with 1 being the fastest, 9 being
+// the best compression. The default, which the GZIP helper uses, is 6.
+int CompressHelper(WrapperType wrapper_type,
+                   Bytef* dest,
+                   uLongf* dest_length,
+                   const Bytef* source,
+                   uLong source_length,
+                   int compression_level,
+                   void* (*malloc_fn)(size_t),
+                   void (*free_fn)(void*)) {
+  if (compression_level < 0 || compression_level > 9) {
+    compression_level = Z_DEFAULT_COMPRESSION;
+  }
+
+  z_stream stream;
+
+  // FIXME(cavalcantii): z_const is not defined as 'const'.
+  stream.next_in = static_cast<z_const Bytef*>(const_cast<Bytef*>(source));
+  stream.avail_in = static_cast<uInt>(source_length);
+  stream.next_out = dest;
+  stream.avail_out = static_cast<uInt>(*dest_length);
+  if (static_cast<uLong>(stream.avail_out) != *dest_length)
+    return Z_BUF_ERROR;
+
+  // Cannot convert capturing lambdas to function pointers directly, hence the
+  // structure.
+  struct MallocFreeFunctions {
+    void* (*malloc_fn)(size_t);
+    void (*free_fn)(void*);
+  } malloc_free = {malloc_fn, free_fn};
+
+  if (malloc_fn) {
+    if (!free_fn)
+      return Z_BUF_ERROR;
+
+    auto zalloc = [](void* opaque, uInt items, uInt size) {
+      return reinterpret_cast<MallocFreeFunctions*>(opaque)->malloc_fn(items *
+                                                                       size);
+    };
+    auto zfree = [](void* opaque, void* address) {
+      return reinterpret_cast<MallocFreeFunctions*>(opaque)->free_fn(address);
+    };
+
+    stream.zalloc = static_cast<alloc_func>(zalloc);
+    stream.zfree = static_cast<free_func>(zfree);
+    stream.opaque = static_cast<voidpf>(&malloc_free);
+  } else {
+    stream.zalloc = static_cast<alloc_func>(0);
+    stream.zfree = static_cast<free_func>(0);
+    stream.opaque = static_cast<voidpf>(0);
+  }
+
+  int err = deflateInit2(&stream, compression_level, Z_DEFLATED,
+                         ZlibStreamWrapperType(wrapper_type), kZlibMemoryLevel,
+                         Z_DEFAULT_STRATEGY);
+  if (err != Z_OK)
+    return err;
+
+  // This has to exist outside of the if statement to prevent it going off the
+  // stack before deflate(), which will use this object.
+  gz_header gzip_header;
+  if (wrapper_type == GZIP) {
+    memset(&gzip_header, 0, sizeof(gzip_header));
+    err = deflateSetHeader(&stream, &gzip_header);
+    if (err != Z_OK)
+      return err;
+  }
+
+  err = deflate(&stream, Z_FINISH);
+  if (err != Z_STREAM_END) {
+    deflateEnd(&stream);
+    return err == Z_OK ? Z_BUF_ERROR : err;
+  }
+  *dest_length = stream.total_out;
+
+  err = deflateEnd(&stream);
+  return err;
+}
+
+int GzipUncompressHelper(Bytef* dest,
+                         uLongf* dest_length,
+                         const Bytef* source,
+                         uLong source_length) {
+  return UncompressHelper(GZIP, dest, dest_length, source, source_length);
+}
+
+// This code is taken almost verbatim from third_party/zlib/uncompr.c. The only
+// difference is inflateInit2() is called which allows different window bits to
+// be set. > 16 causes a gzip header to be emitted rather than a zlib header,
+// and negative causes no header to emitted.
+int UncompressHelper(WrapperType wrapper_type,
+                     Bytef* dest,
+                     uLongf* dest_length,
+                     const Bytef* source,
+                     uLong source_length) {
+  z_stream stream;
+
+  // FIXME(cavalcantii): z_const is not defined as 'const'.
+  stream.next_in = static_cast<z_const Bytef*>(const_cast<Bytef*>(source));
+  stream.avail_in = static_cast<uInt>(source_length);
+  if (static_cast<uLong>(stream.avail_in) != source_length)
+    return Z_BUF_ERROR;
+
+  stream.next_out = dest;
+  stream.avail_out = static_cast<uInt>(*dest_length);
+  if (static_cast<uLong>(stream.avail_out) != *dest_length)
+    return Z_BUF_ERROR;
+
+  stream.zalloc = static_cast<alloc_func>(0);
+  stream.zfree = static_cast<free_func>(0);
+
+  int err = inflateInit2(&stream, ZlibStreamWrapperType(wrapper_type));
+  if (err != Z_OK)
+    return err;
+
+  err = inflate(&stream, Z_FINISH);
+  if (err != Z_STREAM_END) {
+    inflateEnd(&stream);
+    if (err == Z_NEED_DICT || (err == Z_BUF_ERROR && stream.avail_in == 0))
+      return Z_DATA_ERROR;
+    return err;
+  }
+  *dest_length = stream.total_out;
+
+  err = inflateEnd(&stream);
+  return err;
+}
+
+}  // namespace zlib_internal
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/compression_utils_portable.h b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/compression_utils_portable.h
new file mode 100644
index 000000000..92b033e88
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/compression_utils_portable.h
@@ -0,0 +1,63 @@
+/* compression_utils_portable.h
+ *
+ * Copyright 2019 The Chromium Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the Chromium source repository LICENSE file.
+ */
+#ifndef THIRD_PARTY_ZLIB_GOOGLE_COMPRESSION_UTILS_PORTABLE_H_
+#define THIRD_PARTY_ZLIB_GOOGLE_COMPRESSION_UTILS_PORTABLE_H_
+
+#include <stdint.h>
+
+/* TODO(cavalcantii): remove support for Chromium ever building with a system
+ * zlib.
+ */
+#if defined(USE_SYSTEM_ZLIB)
+#include <zlib.h>
+/* AOSP build requires relative paths. */
+#else
+#include "zlib.h"
+#endif
+
+namespace zlib_internal {
+
+enum WrapperType {
+  ZLIB,
+  GZIP,
+  ZRAW,
+};
+
+uLongf GzipExpectedCompressedSize(uLongf input_size);
+
+uint32_t GetGzipUncompressedSize(const Bytef* compressed_data, size_t length);
+
+int GzipCompressHelper(Bytef* dest,
+                       uLongf* dest_length,
+                       const Bytef* source,
+                       uLong source_length,
+                       void* (*malloc_fn)(size_t),
+                       void (*free_fn)(void*));
+
+int CompressHelper(WrapperType wrapper_type,
+                   Bytef* dest,
+                   uLongf* dest_length,
+                   const Bytef* source,
+                   uLong source_length,
+                   int compression_level,
+                   void* (*malloc_fn)(size_t),
+                   void (*free_fn)(void*));
+
+int GzipUncompressHelper(Bytef* dest,
+                         uLongf* dest_length,
+                         const Bytef* source,
+                         uLong source_length);
+
+int UncompressHelper(WrapperType wrapper_type,
+                     Bytef* dest,
+                     uLongf* dest_length,
+                     const Bytef* source,
+                     uLong source_length);
+
+}  // namespace zlib_internal
+
+#endif  // THIRD_PARTY_ZLIB_GOOGLE_COMPRESSION_UTILS_PORTABLE_H_
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/compression_utils_unittest.cc b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/compression_utils_unittest.cc
index adcb77376..8e24387ee 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/compression_utils_unittest.cc
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/compression_utils_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -7,10 +7,9 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include <iterator>
 #include <string>
 
-#include "base/logging.h"
-#include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace compression {
@@ -34,24 +33,33 @@ const uint8_t kCompressedData[] = {
 }  // namespace
 
 TEST(CompressionUtilsTest, GzipCompression) {
-  std::string data(reinterpret_cast<const char*>(kData), arraysize(kData));
+  std::string data(reinterpret_cast<const char*>(kData), std::size(kData));
   std::string compressed_data;
   EXPECT_TRUE(GzipCompress(data, &compressed_data));
   std::string golden_compressed_data(
       reinterpret_cast<const char*>(kCompressedData),
-      arraysize(kCompressedData));
+      std::size(kCompressedData));
   EXPECT_EQ(golden_compressed_data, compressed_data);
 }
 
 TEST(CompressionUtilsTest, GzipUncompression) {
   std::string compressed_data(reinterpret_cast<const char*>(kCompressedData),
-                              arraysize(kCompressedData));
+                              std::size(kCompressedData));
 
   std::string uncompressed_data;
   EXPECT_TRUE(GzipUncompress(compressed_data, &uncompressed_data));
 
   std::string golden_data(reinterpret_cast<const char*>(kData),
-                          arraysize(kData));
+                          std::size(kData));
+  EXPECT_EQ(golden_data, uncompressed_data);
+}
+
+TEST(CompressionUtilsTest, GzipUncompressionFromSpanToString) {
+  std::string uncompressed_data;
+  EXPECT_TRUE(GzipUncompress(kCompressedData, &uncompressed_data));
+
+  std::string golden_data(reinterpret_cast<const char*>(kData),
+                          std::size(kData));
   EXPECT_EQ(golden_data, uncompressed_data);
 }
 
@@ -76,10 +84,10 @@ TEST(CompressionUtilsTest, LargeInput) {
 
 TEST(CompressionUtilsTest, InPlace) {
   const std::string original_data(reinterpret_cast<const char*>(kData),
-                                  arraysize(kData));
+                                  std::size(kData));
   const std::string golden_compressed_data(
       reinterpret_cast<const char*>(kCompressedData),
-      arraysize(kCompressedData));
+      std::size(kCompressedData));
 
   std::string data(original_data);
   EXPECT_TRUE(GzipCompress(data, &data));
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/redact.h b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/redact.h
new file mode 100644
index 000000000..df6bcafc2
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/redact.h
@@ -0,0 +1,31 @@
+// Copyright 2022 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+#ifndef THIRD_PARTY_ZLIB_GOOGLE_REDACT_H_
+#define THIRD_PARTY_ZLIB_GOOGLE_REDACT_H_
+
+#include <ostream>
+
+#include "base/files/file_path.h"
+#include "base/logging.h"
+
+namespace zip {
+
+// Redacts file paths in log messages.
+// Example:
+// LOG(ERROR) << "Cannot open " << Redact(path);
+class Redact {
+ public:
+  explicit Redact(const base::FilePath& path) : path_(path) {}
+
+  friend std::ostream& operator<<(std::ostream& out, const Redact&& r) {
+    return LOG_IS_ON(INFO) ? out << "'" << r.path_ << "'" : out << "(redacted)";
+  }
+
+ private:
+  const base::FilePath& path_;
+};
+
+}  // namespace zip
+
+#endif  // THIRD_PARTY_ZLIB_GOOGLE_REDACT_H_
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/Different Encryptions.zip b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/Different Encryptions.zip
new file mode 100644
index 000000000..858e7c74b
Binary files /dev/null and b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/Different Encryptions.zip differ
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/Empty Dir Same Name As File.zip b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/Empty Dir Same Name As File.zip
new file mode 100644
index 000000000..e26c42d15
Binary files /dev/null and b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/Empty Dir Same Name As File.zip differ
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/Mixed Paths.zip b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/Mixed Paths.zip
new file mode 100644
index 000000000..881f49859
Binary files /dev/null and b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/Mixed Paths.zip differ
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/Parent Dir Same Name As File.zip b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/Parent Dir Same Name As File.zip
new file mode 100644
index 000000000..76cfd906e
Binary files /dev/null and b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/Parent Dir Same Name As File.zip differ
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/README.md b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/README.md
new file mode 100644
index 000000000..c76648fb0
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/README.md
@@ -0,0 +1,15 @@
+## test\_posix\_permissions.zip
+Rebuild this zip by running:
+```
+rm test_posix_permissions.zip &&
+mkdir z &&
+cd z &&
+touch 0.txt 1.txt 2.txt 3.txt &&
+chmod a+x 0.txt &&
+chmod o+x 1.txt &&
+chmod u+x 2.txt &&
+zip test_posix_permissions.zip * &&
+mv test_posix_permissions.zip .. &&
+cd .. &&
+rm -r z
+```
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/Repeated Dir Name.zip b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/Repeated Dir Name.zip
new file mode 100644
index 000000000..2375bc769
Binary files /dev/null and b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/Repeated Dir Name.zip differ
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/Repeated File Name With Different Cases.zip b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/Repeated File Name With Different Cases.zip
new file mode 100644
index 000000000..9eb44e1a5
Binary files /dev/null and b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/Repeated File Name With Different Cases.zip differ
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/Repeated File Name.zip b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/Repeated File Name.zip
new file mode 100644
index 000000000..4a3e7b13c
Binary files /dev/null and b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/Repeated File Name.zip differ
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/SJIS Bug 846195.zip b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/SJIS Bug 846195.zip
new file mode 100644
index 000000000..078300284
Binary files /dev/null and b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/SJIS Bug 846195.zip differ
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/Windows Special Names.zip b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/Windows Special Names.zip
new file mode 100644
index 000000000..4fac907fa
Binary files /dev/null and b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/Windows Special Names.zip differ
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/Wrong CRC.zip b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/Wrong CRC.zip
new file mode 100644
index 000000000..ee9a1ef05
Binary files /dev/null and b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/Wrong CRC.zip differ
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/create_test_zip.sh b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/create_test_zip.sh
index e19d67537..620e8f6d6 100755
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/create_test_zip.sh
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/create_test_zip.sh
@@ -1,15 +1,17 @@
 #!/bin/bash
 #
-# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# Copyright 2011 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
-# Run this script in its directory to recreate test.zip
-# and test_nocompress.zip.
+# Run this script in its directory to recreate test.zip, test_nocompress.zip,
+# and test_encrypted.zip
 
 rm test.zip
 rm test_nocompress.zip
+rm test_encrypted.zip
 pushd test
 zip -r ../test.zip .
 zip -r -0 ../test_nocompress.zip .
+zip -P "fake_password" -r ../test_encrypted.zip .
 popd
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/empty.zip b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/empty.zip
new file mode 100644
index 000000000..15cb0ecb3
Binary files /dev/null and b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/empty.zip differ
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/test_encrypted.zip b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/test_encrypted.zip
new file mode 100644
index 000000000..5e2a75759
Binary files /dev/null and b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/test_encrypted.zip differ
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/test_posix_permissions.zip b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/test_posix_permissions.zip
new file mode 100644
index 000000000..a058ba174
Binary files /dev/null and b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test/data/test_posix_permissions.zip differ
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test_data.filelist b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test_data.filelist
new file mode 100644
index 000000000..0a9d20bce
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test_data.filelist
@@ -0,0 +1,32 @@
+# Copyright 2023 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+# NOTE: this file is generated by build/ios/update_bundle_filelist.py
+#       If it requires updating, you should get a presubmit error with
+#       instructions on how to regenerate. Otherwise, do not edit.
+test/data/Different Encryptions.zip
+test/data/Empty Dir Same Name As File.zip
+test/data/Mixed Paths.zip
+test/data/Parent Dir Same Name As File.zip
+test/data/README.md
+test/data/Repeated Dir Name.zip
+test/data/Repeated File Name With Different Cases.zip
+test/data/Repeated File Name.zip
+test/data/SJIS Bug 846195.zip
+test/data/Windows Special Names.zip
+test/data/Wrong CRC.zip
+test/data/create_test_zip.sh
+test/data/empty.zip
+test/data/evil.zip
+test/data/evil_via_absolute_file_name.zip
+test/data/evil_via_invalid_utf8.zip
+test/data/test.zip
+test/data/test/foo.txt
+test/data/test/foo/bar.txt
+test/data/test/foo/bar/.hidden
+test/data/test/foo/bar/baz.txt
+test/data/test/foo/bar/quux.txt
+test/data/test_encrypted.zip
+test/data/test_mismatch_size.zip
+test/data/test_nocompress.zip
+test/data/test_posix_permissions.zip
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test_data.globlist b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test_data.globlist
new file mode 100644
index 000000000..117a1e507
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/test_data.globlist
@@ -0,0 +1,8 @@
+# Copyright 2023 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+#
+# See build/ios/update_bundle_filelist.py for details on how .globlist
+# files are used to update their .filelist counterparts.
+test/data/**
+test/data/test/foo/bar/.hidden
\ No newline at end of file
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/zip.cc b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/zip.cc
index f0183d3f3..87065b918 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/zip.cc
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/zip.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2012 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -7,213 +7,268 @@
 #include <string>
 #include <vector>
 
-#include "base/bind.h"
 #include "base/files/file.h"
 #include "base/files/file_enumerator.h"
+#include "base/files/file_util.h"
+#include "base/functional/bind.h"
 #include "base/logging.h"
-#include "base/strings/string16.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
+#include "third_party/zlib/google/redact.h"
 #include "third_party/zlib/google/zip_internal.h"
 #include "third_party/zlib/google/zip_reader.h"
+#include "third_party/zlib/google/zip_writer.h"
 
-#if defined(USE_SYSTEM_MINIZIP)
-#include <minizip/unzip.h>
-#include <minizip/zip.h>
-#else
-#include "third_party/zlib/contrib/minizip/unzip.h"
-#include "third_party/zlib/contrib/minizip/zip.h"
-#endif
-
+namespace zip {
 namespace {
 
-bool AddFileToZip(zipFile zip_file, const base::FilePath& src_dir) {
-  base::File file(src_dir, base::File::FLAG_OPEN | base::File::FLAG_READ);
-  if (!file.IsValid()) {
-    DLOG(ERROR) << "Could not open file for path " << src_dir.value();
-    return false;
-  }
+bool IsHiddenFile(const base::FilePath& file_path) {
+  return file_path.BaseName().value()[0] == '.';
+}
 
-  int num_bytes;
-  char buf[zip::internal::kZipBufSize];
-  do {
-    num_bytes = file.ReadAtCurrentPos(buf, zip::internal::kZipBufSize);
-    if (num_bytes > 0) {
-      if (ZIP_OK != zipWriteInFileInZip(zip_file, buf, num_bytes)) {
-        DLOG(ERROR) << "Could not write data to zip for path "
-                    << src_dir.value();
-        return false;
-      }
-    }
-  } while (num_bytes > 0);
+// Creates a directory at |extract_dir|/|entry_path|, including any parents.
+bool CreateDirectory(const base::FilePath& extract_dir,
+                     const base::FilePath& entry_path) {
+  const base::FilePath dir = extract_dir.Append(entry_path);
+  const bool ok = base::CreateDirectory(dir);
+  PLOG_IF(ERROR, !ok) << "Cannot create directory " << Redact(dir);
+  return ok;
+}
 
-  return true;
+// Creates a WriterDelegate that can write a file at |extract_dir|/|entry_path|.
+std::unique_ptr<WriterDelegate> CreateFilePathWriterDelegate(
+    const base::FilePath& extract_dir,
+    const base::FilePath& entry_path) {
+  return std::make_unique<FilePathWriterDelegate>(
+      extract_dir.Append(entry_path));
 }
 
-bool AddEntryToZip(zipFile zip_file, const base::FilePath& path,
-                   const base::FilePath& root_path) {
-  base::FilePath relative_path;
-  bool result = root_path.AppendRelativePath(path, &relative_path);
-  DCHECK(result);
-  std::string str_path = relative_path.AsUTF8Unsafe();
-#if defined(OS_WIN)
-  base::ReplaceSubstringsAfterOffset(&str_path, 0u, "\\", "/");
-#endif
+class DirectFileAccessor : public FileAccessor {
+ public:
+  explicit DirectFileAccessor(base::FilePath src_dir)
+      : src_dir_(std::move(src_dir)) {}
+
+  ~DirectFileAccessor() override = default;
+
+  bool Open(const Paths paths, std::vector<base::File>* const files) override {
+    DCHECK(files);
+    files->reserve(files->size() + paths.size());
+
+    for (const base::FilePath& path : paths) {
+      DCHECK(!path.IsAbsolute());
+      const base::FilePath absolute_path = src_dir_.Append(path);
+      if (base::DirectoryExists(absolute_path)) {
+        files->emplace_back();
+        LOG(ERROR) << "Cannot open " << Redact(path) << ": It is a directory";
+      } else {
+        const base::File& file = files->emplace_back(
+            absolute_path, base::File::FLAG_OPEN | base::File::FLAG_READ);
+        LOG_IF(ERROR, !file.IsValid())
+            << "Cannot open " << Redact(path) << ": "
+            << base::File::ErrorToString(file.error_details());
+      }
+    }
 
-  bool is_directory = base::DirectoryExists(path);
-  if (is_directory)
-    str_path += "/";
+    return true;
+  }
 
-  zip_fileinfo file_info = zip::internal::GetFileInfoForZipping(path);
-  if (!zip::internal::ZipOpenNewFileInZip(zip_file, str_path, &file_info))
-    return false;
+  bool List(const base::FilePath& path,
+            std::vector<base::FilePath>* const files,
+            std::vector<base::FilePath>* const subdirs) override {
+    DCHECK(!path.IsAbsolute());
+    DCHECK(files);
+    DCHECK(subdirs);
+
+    base::FileEnumerator file_enumerator(
+        src_dir_.Append(path), false /* recursive */,
+        base::FileEnumerator::FILES | base::FileEnumerator::DIRECTORIES);
+
+    while (!file_enumerator.Next().empty()) {
+      const base::FileEnumerator::FileInfo info = file_enumerator.GetInfo();
+      (info.IsDirectory() ? subdirs : files)
+          ->push_back(path.Append(info.GetName()));
+    }
 
-  bool success = true;
-  if (!is_directory) {
-    success = AddFileToZip(zip_file, path);
+    return true;
   }
 
-  if (ZIP_OK != zipCloseFileInZip(zip_file)) {
-    DLOG(ERROR) << "Could not close zip file entry " << str_path;
-    return false;
-  }
+  bool GetInfo(const base::FilePath& path, Info* const info) override {
+    DCHECK(!path.IsAbsolute());
+    DCHECK(info);
 
-  return success;
-}
+    base::File::Info file_info;
+    if (!base::GetFileInfo(src_dir_.Append(path), &file_info)) {
+      PLOG(ERROR) << "Cannot get info of " << Redact(path);
+      return false;
+    }
 
-bool ExcludeNoFilesFilter(const base::FilePath& file_path) {
-  return true;
-}
+    info->is_directory = file_info.is_directory;
+    info->last_modified = file_info.last_modified;
 
-bool ExcludeHiddenFilesFilter(const base::FilePath& file_path) {
-  return file_path.BaseName().value()[0] != '.';
-}
+    return true;
+  }
 
-}  // namespace
+ private:
+  const base::FilePath src_dir_;
+};
 
-namespace zip {
+}  // namespace
 
-bool Unzip(const base::FilePath& src_file, const base::FilePath& dest_dir) {
-  return UnzipWithFilterCallback(src_file, dest_dir,
-                                 base::Bind(&ExcludeNoFilesFilter), true);
+std::ostream& operator<<(std::ostream& out, const Progress& progress) {
+  return out << progress.bytes << " bytes, " << progress.files << " files, "
+             << progress.directories << " dirs, " << progress.errors
+             << " errors";
 }
 
-bool UnzipWithFilterCallback(const base::FilePath& src_file,
-                             const base::FilePath& dest_dir,
-                             const FilterCallback& filter_cb,
-                             bool log_skipped_files) {
-  ZipReader reader;
-  if (!reader.Open(src_file)) {
-    DLOG(WARNING) << "Failed to open " << src_file.value();
-    return false;
-  }
-  while (reader.HasMore()) {
-    if (!reader.OpenCurrentEntryInZip()) {
-      DLOG(WARNING) << "Failed to open the current file in zip";
+bool Zip(const ZipParams& params) {
+  DirectFileAccessor default_accessor(params.src_dir);
+  FileAccessor* const file_accessor = params.file_accessor ?: &default_accessor;
+
+  std::unique_ptr<internal::ZipWriter> zip_writer;
+
+#if defined(OS_POSIX) || defined(OS_FUCHSIA)
+  if (params.dest_fd != base::kInvalidPlatformFile) {
+    DCHECK(params.dest_file.empty());
+    zip_writer =
+        internal::ZipWriter::CreateWithFd(params.dest_fd, file_accessor);
+    if (!zip_writer)
       return false;
-    }
-    if (reader.current_entry_info()->is_unsafe()) {
-      DLOG(WARNING) << "Found an unsafe file in zip "
-                    << reader.current_entry_info()->file_path().value();
+  }
+#endif
+
+  if (!zip_writer) {
+    zip_writer = internal::ZipWriter::Create(params.dest_file, file_accessor);
+    if (!zip_writer)
       return false;
-    }
-    if (filter_cb.Run(reader.current_entry_info()->file_path())) {
-      if (!reader.ExtractCurrentEntryIntoDirectory(dest_dir)) {
-        DLOG(WARNING) << "Failed to extract "
-                      << reader.current_entry_info()->file_path().value();
-        return false;
-      }
-    } else if (log_skipped_files) {
-      DLOG(WARNING) << "Skipped file "
-                    << reader.current_entry_info()->file_path().value();
-    }
+  }
 
-    if (!reader.AdvanceToNextEntry()) {
-      DLOG(WARNING) << "Failed to advance to the next file";
+  zip_writer->SetProgressCallback(params.progress_callback,
+                                  params.progress_period);
+  zip_writer->SetRecursive(params.recursive);
+  zip_writer->ContinueOnError(params.continue_on_error);
+
+  if (!params.include_hidden_files || params.filter_callback)
+    zip_writer->SetFilterCallback(base::BindRepeating(
+        [](const ZipParams* const params, const base::FilePath& path) -> bool {
+          return (params->include_hidden_files || !IsHiddenFile(path)) &&
+                 (!params->filter_callback ||
+                  params->filter_callback.Run(params->src_dir.Append(path)));
+        },
+        &params));
+
+  if (params.src_files.empty()) {
+    // No source items are specified. Zip the entire source directory.
+    zip_writer->SetRecursive(true);
+    if (!zip_writer->AddDirectoryContents(base::FilePath()))
+      return false;
+  } else {
+    // Only zip the specified source items.
+    if (!zip_writer->AddMixedEntries(params.src_files))
       return false;
-    }
   }
-  return true;
+
+  return zip_writer->Close();
 }
 
-bool ZipWithFilterCallback(const base::FilePath& src_dir,
-                           const base::FilePath& dest_file,
-                           const FilterCallback& filter_cb) {
-  DCHECK(base::DirectoryExists(src_dir));
+bool Unzip(const base::FilePath& src_file,
+           const base::FilePath& dest_dir,
+           UnzipOptions options) {
+  base::File file(src_file, base::File::FLAG_OPEN | base::File::FLAG_READ);
+  if (!file.IsValid()) {
+    PLOG(ERROR) << "Cannot open " << Redact(src_file) << ": "
+                << base::File::ErrorToString(file.error_details());
+    return false;
+  }
 
-  zipFile zip_file = internal::OpenForZipping(dest_file.AsUTF8Unsafe(),
-                                              APPEND_STATUS_CREATE);
+  DLOG_IF(WARNING, !base::IsDirectoryEmpty(dest_dir))
+      << "ZIP extraction directory is not empty: " << dest_dir;
 
-  if (!zip_file) {
-    DLOG(WARNING) << "couldn't create file " << dest_file.value();
+  return Unzip(file.GetPlatformFile(),
+               base::BindRepeating(&CreateFilePathWriterDelegate, dest_dir),
+               base::BindRepeating(&CreateDirectory, dest_dir),
+               std::move(options));
+}
+
+bool Unzip(const base::PlatformFile& src_file,
+           WriterFactory writer_factory,
+           DirectoryCreator directory_creator,
+           UnzipOptions options) {
+  ZipReader reader;
+  reader.SetEncoding(std::move(options.encoding));
+  reader.SetPassword(std::move(options.password));
+
+  if (!reader.OpenFromPlatformFile(src_file)) {
+    LOG(ERROR) << "Cannot open ZIP from file handle " << src_file;
     return false;
   }
 
-  bool success = true;
-  base::FileEnumerator file_enumerator(src_dir, true /* recursive */,
-      base::FileEnumerator::FILES | base::FileEnumerator::DIRECTORIES);
-  for (base::FilePath path = file_enumerator.Next(); !path.value().empty();
-       path = file_enumerator.Next()) {
-    if (!filter_cb.Run(path)) {
+  while (const ZipReader::Entry* const entry = reader.Next()) {
+    if (entry->is_unsafe) {
+      LOG(ERROR) << "Found unsafe entry " << Redact(entry->path) << " in ZIP";
+      if (!options.continue_on_error)
+        return false;
       continue;
     }
 
-    if (!AddEntryToZip(zip_file, path, src_dir)) {
-      success = false;
-      break;
+    if (options.filter && !options.filter.Run(entry->path)) {
+      VLOG(1) << "Skipped ZIP entry " << Redact(entry->path);
+      continue;
     }
-  }
 
-  if (ZIP_OK != zipClose(zip_file, NULL)) {
-    DLOG(ERROR) << "Error closing zip file " << dest_file.value();
-    return false;
+    if (entry->is_directory) {
+      // It's a directory.
+      if (!directory_creator.Run(entry->path)) {
+        LOG(ERROR) << "Cannot create directory " << Redact(entry->path);
+        if (!options.continue_on_error)
+          return false;
+      }
+
+      continue;
+    }
+
+    // It's a file.
+    std::unique_ptr<WriterDelegate> writer = writer_factory.Run(entry->path);
+    if (!writer ||
+        (options.progress ? !reader.ExtractCurrentEntryWithListener(
+                                writer.get(), options.progress)
+                          : !reader.ExtractCurrentEntry(writer.get()))) {
+      LOG(ERROR) << "Cannot extract file " << Redact(entry->path)
+                 << " from ZIP";
+      if (!options.continue_on_error)
+        return false;
+    }
   }
 
-  return success;
+  return reader.ok();
+}
+
+bool ZipWithFilterCallback(const base::FilePath& src_dir,
+                           const base::FilePath& dest_file,
+                           FilterCallback filter) {
+  DCHECK(base::DirectoryExists(src_dir));
+  return Zip({.src_dir = src_dir,
+              .dest_file = dest_file,
+              .filter_callback = std::move(filter)});
 }
 
-bool Zip(const base::FilePath& src_dir, const base::FilePath& dest_file,
+bool Zip(const base::FilePath& src_dir,
+         const base::FilePath& dest_file,
          bool include_hidden_files) {
-  if (include_hidden_files) {
-    return ZipWithFilterCallback(
-        src_dir, dest_file, base::Bind(&ExcludeNoFilesFilter));
-  } else {
-    return ZipWithFilterCallback(
-        src_dir, dest_file, base::Bind(&ExcludeHiddenFilesFilter));
-  }
+  return Zip({.src_dir = src_dir,
+              .dest_file = dest_file,
+              .include_hidden_files = include_hidden_files});
 }
 
-#if defined(OS_POSIX)
+#if defined(OS_POSIX) || defined(OS_FUCHSIA)
 bool ZipFiles(const base::FilePath& src_dir,
-              const std::vector<base::FilePath>& src_relative_paths,
+              Paths src_relative_paths,
               int dest_fd) {
   DCHECK(base::DirectoryExists(src_dir));
-  zipFile zip_file = internal::OpenFdForZipping(dest_fd, APPEND_STATUS_CREATE);
-
-  if (!zip_file) {
-    DLOG(ERROR) << "couldn't create file for fd " << dest_fd;
-    return false;
-  }
-
-  bool success = true;
-  for (std::vector<base::FilePath>::const_iterator iter =
-           src_relative_paths.begin();
-      iter != src_relative_paths.end(); ++iter) {
-    const base::FilePath& path = src_dir.Append(*iter);
-    if (!AddEntryToZip(zip_file, path, src_dir)) {
-      // TODO(hshi): clean up the partial zip file when error occurs.
-      success = false;
-      break;
-    }
-  }
-
-  if (ZIP_OK != zipClose(zip_file, NULL)) {
-    DLOG(ERROR) << "Error closing zip file for fd " << dest_fd;
-    success = false;
-  }
-
-  return success;
+  return Zip({.src_dir = src_dir,
+              .dest_fd = dest_fd,
+              .src_files = src_relative_paths});
 }
-#endif  // defined(OS_POSIX)
+#endif  // defined(OS_POSIX) || defined(OS_FUCHSIA)
 
 }  // namespace zip
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/zip.h b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/zip.h
index 68bed0b30..ea8778681 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/zip.h
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/zip.h
@@ -1,58 +1,218 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2011 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef THIRD_PARTY_ZLIB_GOOGLE_ZIP_H_
 #define THIRD_PARTY_ZLIB_GOOGLE_ZIP_H_
 
+#include <cstdint>
+#include <ostream>
+#include <utility>
 #include <vector>
 
-#include "base/callback.h"
+#include "base/containers/span.h"
 #include "base/files/file_path.h"
+#include "base/files/platform_file.h"
+#include "base/functional/callback.h"
+#include "base/time/time.h"
 #include "build/build_config.h"
 
+namespace base {
+class File;
+}
+
 namespace zip {
 
+class WriterDelegate;
+
+// Paths passed as span to avoid copying them.
+using Paths = base::span<const base::FilePath>;
+
+// Abstraction for file access operation required by Zip().
+//
+// Can be passed to the ZipParams for providing custom access to the files,
+// for example over IPC.
+//
+// All parameters paths are expected to be relative to the source directory.
+class FileAccessor {
+ public:
+  virtual ~FileAccessor() = default;
+
+  struct Info {
+    bool is_directory = false;
+    base::Time last_modified;
+  };
+
+  // Opens files specified in |paths|.
+  // Directories should be mapped to invalid files.
+  virtual bool Open(Paths paths, std::vector<base::File>* files) = 0;
+
+  // Lists contents of a directory at |path|.
+  virtual bool List(const base::FilePath& path,
+                    std::vector<base::FilePath>* files,
+                    std::vector<base::FilePath>* subdirs) = 0;
+
+  // Gets info about a file or directory.
+  virtual bool GetInfo(const base::FilePath& path, Info* info) = 0;
+};
+
+// Progress of a ZIP creation operation.
+struct Progress {
+  // Total number of bytes read from files getting zipped so far.
+  std::int64_t bytes = 0;
+
+  // Number of file entries added to the ZIP so far.
+  // A file entry is added after its bytes have been processed.
+  int files = 0;
+
+  // Number of directory entries added to the ZIP so far.
+  // A directory entry is added before items in it.
+  int directories = 0;
+
+  // Number of errors encountered so far (files that cannot be opened,
+  // directories that cannot be listed).
+  int errors = 0;
+};
+
+// Prints Progress to output stream.
+std::ostream& operator<<(std::ostream& out, const Progress& progress);
+
+// Callback reporting the progress of a ZIP creation operation.
+//
+// This callback returns a boolean indicating whether the ZIP creation operation
+// should continue. If it returns false once, then the ZIP creation operation is
+// immediately cancelled and the callback won't be called again.
+using ProgressCallback = base::RepeatingCallback<bool(const Progress&)>;
+
+using FilterCallback = base::RepeatingCallback<bool(const base::FilePath&)>;
+
+// ZIP creation parameters and options.
+struct ZipParams {
+  // Source directory. Ignored if |file_accessor| is set.
+  base::FilePath src_dir;
+
+  // Abstraction around file system access used to read files.
+  // If left null, an implementation that accesses files directly is used.
+  FileAccessor* file_accessor = nullptr;  // Not owned
+
+  // Destination file path.
+  // Either dest_file or dest_fd should be set, but not both.
+  base::FilePath dest_file;
+
+#if defined(OS_POSIX) || defined(OS_FUCHSIA)
+  // Destination file passed a file descriptor.
+  // Either dest_file or dest_fd should be set, but not both.
+  int dest_fd = base::kInvalidPlatformFile;
+#endif
+
+  // The relative paths to the files and directories that should be included in
+  // the ZIP file. If this is empty, the whole contents of |src_dir| are
+  // included.
+  //
+  // These paths must be relative to |src_dir| and will be used as the file
+  // names in the created ZIP file. All files must be under |src_dir| in the
+  // file system hierarchy.
+  //
+  // All the paths in |src_files| are included in the created ZIP file,
+  // irrespective of |include_hidden_files| and |filter_callback|.
+  Paths src_files;
+
+  // Filter used to exclude files from the ZIP file. This is only taken in
+  // account when recursively adding subdirectory contents.
+  FilterCallback filter_callback;
+
+  // Optional progress reporting callback.
+  ProgressCallback progress_callback;
+
+  // Progress reporting period. The final callback is always called when the ZIP
+  // creation operation completes.
+  base::TimeDelta progress_period;
+
+  // Should add hidden files? This is only taken in account when recursively
+  // adding subdirectory contents.
+  bool include_hidden_files = true;
+
+  // Should recursively add subdirectory contents?
+  bool recursive = false;
+
+  // Should ignore errors when discovering files and zipping them?
+  bool continue_on_error = false;
+};
+
+// Zip files specified into a ZIP archives. The source files and ZIP destination
+// files (as well as other settings) are specified in |params|.
+bool Zip(const ZipParams& params);
+
 // Zip the contents of src_dir into dest_file. src_path must be a directory.
 // An entry will *not* be created in the zip for the root folder -- children
 // of src_dir will be at the root level of the created zip. For each file in
 // src_dir, include it only if the callback |filter_cb| returns true. Otherwise
 // omit it.
-typedef base::Callback<bool(const base::FilePath&)> FilterCallback;
 bool ZipWithFilterCallback(const base::FilePath& src_dir,
                            const base::FilePath& dest_file,
-                           const FilterCallback& filter_cb);
+                           FilterCallback filter_cb);
 
 // Convenience method for callers who don't need to set up the filter callback.
 // If |include_hidden_files| is true, files starting with "." are included.
 // Otherwise they are omitted.
-bool Zip(const base::FilePath& src_dir, const base::FilePath& dest_file,
+bool Zip(const base::FilePath& src_dir,
+         const base::FilePath& dest_file,
          bool include_hidden_files);
 
-#if defined(OS_POSIX)
+#if defined(OS_POSIX) || defined(OS_FUCHSIA)
 // Zips files listed in |src_relative_paths| to destination specified by file
 // descriptor |dest_fd|, without taking ownership of |dest_fd|. The paths listed
 // in |src_relative_paths| are relative to the |src_dir| and will be used as the
 // file names in the created zip file. All source paths must be under |src_dir|
 // in the file system hierarchy.
 bool ZipFiles(const base::FilePath& src_dir,
-              const std::vector<base::FilePath>& src_relative_paths,
+              Paths src_relative_paths,
               int dest_fd);
-#endif  // defined(OS_POSIX)
-
-// Unzip the contents of zip_file into dest_dir.
-// For each file in zip_file, include it only if the callback |filter_cb|
-// returns true. Otherwise omit it.
-// If |log_skipped_files| is true, files skipped during extraction are printed
-// to debug log.
-typedef base::Callback<bool(const base::FilePath&)> FilterCallback;
-bool UnzipWithFilterCallback(const base::FilePath& zip_file,
-                             const base::FilePath& dest_dir,
-                             const FilterCallback& filter_cb,
-                             bool log_skipped_files);
-
-// Unzip the contents of zip_file into dest_dir.
-bool Unzip(const base::FilePath& zip_file, const base::FilePath& dest_dir);
+#endif  // defined(OS_POSIX) || defined(OS_FUCHSIA)
+
+// Callback reporting the number of bytes written during Unzip.
+using UnzipProgressCallback = base::RepeatingCallback<void(uint64_t bytes)>;
+
+// Options of the Unzip function, with valid default values.
+struct UnzipOptions {
+  // Encoding of entry paths in the ZIP archive. By default, paths are assumed
+  // to be in UTF-8.
+  std::string encoding;
+
+  // Only extract the entries for which |filter_cb| returns true. By default,
+  // everything gets extracted.
+  FilterCallback filter;
+
+  // Callback to report bytes extracted from the ZIP.
+  UnzipProgressCallback progress;
+
+  // Password to decrypt the encrypted files.
+  std::string password;
+
+  // Should ignore errors when extracting files?
+  bool continue_on_error = false;
+};
+
+typedef base::RepeatingCallback<std::unique_ptr<WriterDelegate>(
+    const base::FilePath&)>
+    WriterFactory;
+
+typedef base::RepeatingCallback<bool(const base::FilePath&)> DirectoryCreator;
+
+// Unzips the contents of |zip_file|, using the writers provided by
+// |writer_factory|.
+bool Unzip(const base::PlatformFile& zip_file,
+           WriterFactory writer_factory,
+           DirectoryCreator directory_creator,
+           UnzipOptions options = {});
+
+// Unzips the contents of |zip_file| into |dest_dir|.
+// This function does not overwrite any existing file.
+// A filename collision will result in an error.
+// Therefore, |dest_dir| should initially be an empty directory.
+bool Unzip(const base::FilePath& zip_file,
+           const base::FilePath& dest_dir,
+           UnzipOptions options = {});
 
 }  // namespace zip
 
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/zip_internal.cc b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/zip_internal.cc
index 77f2b1748..b9976d63e 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/zip_internal.cc
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/zip_internal.cc
@@ -1,18 +1,21 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2011 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "third_party/zlib/google/zip_internal.h"
 
 #include <stddef.h>
+#include <string.h>
 
 #include <algorithm>
 
-#include "base/files/file_util.h"
+#include "base/containers/fixed_flat_set.h"
+#include "base/files/file_path.h"
 #include "base/logging.h"
+#include "base/notreached.h"
+#include "base/strings/string_piece.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/time/time.h"
-#include "build/build_config.h"
 
 #if defined(USE_SYSTEM_MINIZIP)
 #include <minizip/ioapi.h>
@@ -37,9 +40,9 @@ typedef struct {
 } WIN32FILE_IOWIN;
 
 // This function is derived from third_party/minizip/iowin32.c.
-// Its only difference is that it treats the char* as UTF8 and
+// Its only difference is that it treats the filename as UTF-8 and
 // uses the Unicode version of CreateFile.
-void* ZipOpenFunc(void *opaque, const char* filename, int mode) {
+void* ZipOpenFunc(void* opaque, const void* filename, int mode) {
   DWORD desired_access = 0, creation_disposition = 0;
   DWORD share_mode = 0, flags_and_attributes = 0;
   HANDLE file = 0;
@@ -57,10 +60,11 @@ void* ZipOpenFunc(void *opaque, const char* filename, int mode) {
     creation_disposition = CREATE_ALWAYS;
   }
 
-  base::string16 filename16 = base::UTF8ToUTF16(filename);
-  if ((filename != NULL) && (desired_access != 0)) {
-    file = CreateFile(filename16.c_str(), desired_access, share_mode,
-        NULL, creation_disposition, flags_and_attributes, NULL);
+  if (filename != nullptr && desired_access != 0) {
+    file = CreateFileW(
+        base::UTF8ToWide(static_cast<const char*>(filename)).c_str(),
+        desired_access, share_mode, nullptr, creation_disposition,
+        flags_and_attributes, nullptr);
   }
 
   if (file == INVALID_HANDLE_VALUE)
@@ -80,11 +84,11 @@ void* ZipOpenFunc(void *opaque, const char* filename, int mode) {
 }
 #endif
 
-#if defined(OS_POSIX)
+#if defined(OS_POSIX) || defined(OS_FUCHSIA)
 // Callback function for zlib that opens a file stream from a file descriptor.
 // Since we do not own the file descriptor, dup it so that we can fdopen/fclose
 // a file stream.
-void* FdOpenFileFunc(void* opaque, const char* filename, int mode) {
+void* FdOpenFileFunc(void* opaque, const void* filename, int mode) {
   FILE* file = NULL;
   const char* mode_fopen = NULL;
 
@@ -106,15 +110,15 @@ void* FdOpenFileFunc(void* opaque, const char* filename, int mode) {
 
 int FdCloseFileFunc(void* opaque, void* stream) {
   fclose(static_cast<FILE*>(stream));
-  free(opaque); // malloc'ed in FillFdOpenFileFunc()
+  free(opaque);  // malloc'ed in FillFdOpenFileFunc()
   return 0;
 }
 
 // Fills |pzlib_filecunc_def| appropriately to handle the zip file
 // referred to by |fd|.
-void FillFdOpenFileFunc(zlib_filefunc_def* pzlib_filefunc_def, int fd) {
-  fill_fopen_filefunc(pzlib_filefunc_def);
-  pzlib_filefunc_def->zopen_file = FdOpenFileFunc;
+void FillFdOpenFileFunc(zlib_filefunc64_def* pzlib_filefunc_def, int fd) {
+  fill_fopen64_filefunc(pzlib_filefunc_def);
+  pzlib_filefunc_def->zopen64_file = FdOpenFileFunc;
   pzlib_filefunc_def->zclose_file = FdCloseFileFunc;
   int* ptr_fd = static_cast<int*>(malloc(sizeof(fd)));
   *ptr_fd = fd;
@@ -125,7 +129,7 @@ void FillFdOpenFileFunc(zlib_filefunc_def* pzlib_filefunc_def, int fd) {
 #if defined(OS_WIN)
 // Callback function for zlib that opens a file stream from a Windows handle.
 // Does not take ownership of the handle.
-void* HandleOpenFileFunc(void* opaque, const char* filename, int mode) {
+void* HandleOpenFileFunc(void* opaque, const void* /*filename*/, int mode) {
   WIN32FILE_IOWIN file_ret;
   file_ret.hf = static_cast<HANDLE>(opaque);
   file_ret.error = 0;
@@ -139,7 +143,7 @@ void* HandleOpenFileFunc(void* opaque, const char* filename, int mode) {
 }
 
 int HandleCloseFileFunc(void* opaque, void* stream) {
-  free(stream); // malloc'ed in HandleOpenFileFunc()
+  free(stream);  // malloc'ed in HandleOpenFileFunc()
   return 0;
 }
 #endif
@@ -149,8 +153,8 @@ int HandleCloseFileFunc(void* opaque, void* stream) {
 // expect their opaque parameters refer to this struct.
 struct ZipBuffer {
   const char* data;  // weak
-  size_t length;
-  size_t offset;
+  ZPOS64_T length;
+  ZPOS64_T offset;
 };
 
 // Opens the specified file. When this function returns a non-NULL pointer, zlib
@@ -159,7 +163,7 @@ struct ZipBuffer {
 // given opaque parameter and returns it because this parameter stores all
 // information needed for uncompressing data. (This function does not support
 // writing compressed data and it returns NULL for this case.)
-void* OpenZipBuffer(void* opaque, const char* /*filename*/, int mode) {
+void* OpenZipBuffer(void* opaque, const void* /*filename*/, int mode) {
   if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER) != ZLIB_FILEFUNC_MODE_READ) {
     NOTREACHED();
     return NULL;
@@ -176,10 +180,11 @@ void* OpenZipBuffer(void* opaque, const char* /*filename*/, int mode) {
 uLong ReadZipBuffer(void* opaque, void* /*stream*/, void* buf, uLong size) {
   ZipBuffer* buffer = static_cast<ZipBuffer*>(opaque);
   DCHECK_LE(buffer->offset, buffer->length);
-  size_t remaining_bytes = buffer->length - buffer->offset;
+  ZPOS64_T remaining_bytes = buffer->length - buffer->offset;
   if (!buffer || !buffer->data || !remaining_bytes)
     return 0;
-  size = std::min(size, static_cast<uLong>(remaining_bytes));
+  if (size > remaining_bytes)
+    size = remaining_bytes;
   memcpy(buf, &buffer->data[buffer->offset], size);
   buffer->offset += size;
   return size;
@@ -196,21 +201,23 @@ uLong WriteZipBuffer(void* /*opaque*/,
 }
 
 // Returns the offset from the beginning of the data.
-long GetOffsetOfZipBuffer(void* opaque, void* /*stream*/) {
+ZPOS64_T GetOffsetOfZipBuffer(void* opaque, void* /*stream*/) {
   ZipBuffer* buffer = static_cast<ZipBuffer*>(opaque);
   if (!buffer)
     return -1;
-  return static_cast<long>(buffer->offset);
+  return buffer->offset;
 }
 
 // Moves the current offset to the specified position.
-long SeekZipBuffer(void* opaque, void* /*stream*/, uLong offset, int origin) {
+long SeekZipBuffer(void* opaque,
+                   void* /*stream*/,
+                   ZPOS64_T offset,
+                   int origin) {
   ZipBuffer* buffer = static_cast<ZipBuffer*>(opaque);
   if (!buffer)
     return -1;
   if (origin == ZLIB_FILEFUNC_SEEK_CUR) {
-    buffer->offset = std::min(buffer->offset + static_cast<size_t>(offset),
-                              buffer->length);
+    buffer->offset = std::min(buffer->offset + offset, buffer->length);
     return 0;
   }
   if (origin == ZLIB_FILEFUNC_SEEK_END) {
@@ -218,7 +225,7 @@ long SeekZipBuffer(void* opaque, void* /*stream*/, uLong offset, int origin) {
     return 0;
   }
   if (origin == ZLIB_FILEFUNC_SEEK_SET) {
-    buffer->offset = std::min(buffer->length, static_cast<size_t>(offset));
+    buffer->offset = std::min(buffer->length, offset);
     return 0;
   }
   NOTREACHED();
@@ -244,7 +251,7 @@ int GetErrorOfZipBuffer(void* /*opaque*/, void* /*stream*/) {
 // Returns a zip_fileinfo struct with the time represented by |file_time|.
 zip_fileinfo TimeToZipFileInfo(const base::Time& file_time) {
   base::Time::Exploded file_time_parts;
-  file_time.LocalExplode(&file_time_parts);
+  file_time.UTCExplode(&file_time_parts);
 
   zip_fileinfo zip_info = {};
   if (file_time_parts.year >= 1980) {
@@ -253,12 +260,13 @@ zip_fileinfo TimeToZipFileInfo(const base::Time& file_time) {
     // It assumes that dates below 1980 are in the double digit format.
     // Hence the fail safe option is to leave the date unset. Some programs
     // might show the unset date as 1980-0-0 which is invalid.
-    zip_info.tmz_date.tm_year = file_time_parts.year;
-    zip_info.tmz_date.tm_mon = file_time_parts.month - 1;
-    zip_info.tmz_date.tm_mday = file_time_parts.day_of_month;
-    zip_info.tmz_date.tm_hour = file_time_parts.hour;
-    zip_info.tmz_date.tm_min = file_time_parts.minute;
-    zip_info.tmz_date.tm_sec = file_time_parts.second;
+    zip_info.tmz_date = {
+        .tm_sec = static_cast<uInt>(file_time_parts.second),
+        .tm_min = static_cast<uInt>(file_time_parts.minute),
+        .tm_hour = static_cast<uInt>(file_time_parts.hour),
+        .tm_mday = static_cast<uInt>(file_time_parts.day_of_month),
+        .tm_mon = static_cast<uInt>(file_time_parts.month - 1),
+        .tm_year = static_cast<uInt>(file_time_parts.year)};
   }
 
   return zip_info;
@@ -269,33 +277,33 @@ namespace zip {
 namespace internal {
 
 unzFile OpenForUnzipping(const std::string& file_name_utf8) {
-  zlib_filefunc_def* zip_func_ptrs = NULL;
+  zlib_filefunc64_def* zip_func_ptrs = nullptr;
 #if defined(OS_WIN)
-  zlib_filefunc_def zip_funcs;
-  fill_win32_filefunc(&zip_funcs);
-  zip_funcs.zopen_file = ZipOpenFunc;
+  zlib_filefunc64_def zip_funcs;
+  fill_win32_filefunc64(&zip_funcs);
+  zip_funcs.zopen64_file = ZipOpenFunc;
   zip_func_ptrs = &zip_funcs;
 #endif
-  return unzOpen2(file_name_utf8.c_str(), zip_func_ptrs);
+  return unzOpen2_64(file_name_utf8.c_str(), zip_func_ptrs);
 }
 
-#if defined(OS_POSIX)
+#if defined(OS_POSIX) || defined(OS_FUCHSIA)
 unzFile OpenFdForUnzipping(int zip_fd) {
-  zlib_filefunc_def zip_funcs;
+  zlib_filefunc64_def zip_funcs;
   FillFdOpenFileFunc(&zip_funcs, zip_fd);
   // Passing dummy "fd" filename to zlib.
-  return unzOpen2("fd", &zip_funcs);
+  return unzOpen2_64("fd", &zip_funcs);
 }
 #endif
 
 #if defined(OS_WIN)
 unzFile OpenHandleForUnzipping(HANDLE zip_handle) {
-  zlib_filefunc_def zip_funcs;
-  fill_win32_filefunc(&zip_funcs);
-  zip_funcs.zopen_file = HandleOpenFileFunc;
+  zlib_filefunc64_def zip_funcs;
+  fill_win32_filefunc64(&zip_funcs);
+  zip_funcs.zopen64_file = HandleOpenFileFunc;
   zip_funcs.zclose_file = HandleCloseFileFunc;
   zip_funcs.opaque = zip_handle;
-  return unzOpen2("fd", &zip_funcs);
+  return unzOpen2_64("fd", &zip_funcs);
 }
 #endif
 
@@ -311,80 +319,151 @@ unzFile PrepareMemoryForUnzipping(const std::string& data) {
   buffer->length = data.length();
   buffer->offset = 0;
 
-  zlib_filefunc_def zip_functions;
-  zip_functions.zopen_file = OpenZipBuffer;
+  zlib_filefunc64_def zip_functions;
+  zip_functions.zopen64_file = OpenZipBuffer;
   zip_functions.zread_file = ReadZipBuffer;
   zip_functions.zwrite_file = WriteZipBuffer;
-  zip_functions.ztell_file = GetOffsetOfZipBuffer;
-  zip_functions.zseek_file = SeekZipBuffer;
+  zip_functions.ztell64_file = GetOffsetOfZipBuffer;
+  zip_functions.zseek64_file = SeekZipBuffer;
   zip_functions.zclose_file = CloseZipBuffer;
   zip_functions.zerror_file = GetErrorOfZipBuffer;
-  zip_functions.opaque = static_cast<void*>(buffer);
-  return unzOpen2(NULL, &zip_functions);
+  zip_functions.opaque = buffer;
+  return unzOpen2_64(nullptr, &zip_functions);
 }
 
 zipFile OpenForZipping(const std::string& file_name_utf8, int append_flag) {
-  zlib_filefunc_def* zip_func_ptrs = NULL;
+  zlib_filefunc64_def* zip_func_ptrs = nullptr;
 #if defined(OS_WIN)
-  zlib_filefunc_def zip_funcs;
-  fill_win32_filefunc(&zip_funcs);
-  zip_funcs.zopen_file = ZipOpenFunc;
+  zlib_filefunc64_def zip_funcs;
+  fill_win32_filefunc64(&zip_funcs);
+  zip_funcs.zopen64_file = ZipOpenFunc;
   zip_func_ptrs = &zip_funcs;
 #endif
-  return zipOpen2(file_name_utf8.c_str(),
-                  append_flag,
-                  NULL,  // global comment
-                  zip_func_ptrs);
+  return zipOpen2_64(file_name_utf8.c_str(), append_flag, nullptr,
+                     zip_func_ptrs);
 }
 
-#if defined(OS_POSIX)
+#if defined(OS_POSIX) || defined(OS_FUCHSIA)
 zipFile OpenFdForZipping(int zip_fd, int append_flag) {
-  zlib_filefunc_def zip_funcs;
+  zlib_filefunc64_def zip_funcs;
   FillFdOpenFileFunc(&zip_funcs, zip_fd);
   // Passing dummy "fd" filename to zlib.
-  return zipOpen2("fd", append_flag, NULL, &zip_funcs);
+  return zipOpen2_64("fd", append_flag, nullptr, &zip_funcs);
 }
 #endif
 
-zip_fileinfo GetFileInfoForZipping(const base::FilePath& path) {
-  base::Time file_time;
-  base::File::Info file_info;
-  if (base::GetFileInfo(path, &file_info))
-    file_time = file_info.last_modified;
-  return TimeToZipFileInfo(file_time);
-}
-
 bool ZipOpenNewFileInZip(zipFile zip_file,
                          const std::string& str_path,
-                         const zip_fileinfo* file_info) {
+                         base::Time last_modified_time,
+                         Compression compression) {
   // Section 4.4.4 http://www.pkware.com/documents/casestudies/APPNOTE.TXT
   // Setting the Language encoding flag so the file is told to be in utf-8.
   const uLong LANGUAGE_ENCODING_FLAG = 0x1 << 11;
 
-  if (ZIP_OK != zipOpenNewFileInZip4(
-                    zip_file,  // file
-                    str_path.c_str(),  // filename
-                    file_info,  // zipfi
-                    NULL,  // extrafield_local,
-                    0u,  // size_extrafield_local
-                    NULL,  // extrafield_global
-                    0u,  // size_extrafield_global
-                    NULL,  // comment
-                    Z_DEFLATED,  // method
-                    Z_DEFAULT_COMPRESSION,  // level
-                    0,  // raw
-                    -MAX_WBITS,  // windowBits
-                    DEF_MEM_LEVEL,  // memLevel
-                    Z_DEFAULT_STRATEGY,  // strategy
-                    NULL,  // password
-                    0,  // crcForCrypting
-                    0,  // versionMadeBy
-                    LANGUAGE_ENCODING_FLAG)) {  // flagBase
-    DLOG(ERROR) << "Could not open zip file entry " << str_path;
+  const zip_fileinfo file_info = TimeToZipFileInfo(last_modified_time);
+  const int err = zipOpenNewFileInZip4_64(
+      /*file=*/zip_file,
+      /*filename=*/str_path.c_str(),
+      /*zip_fileinfo=*/&file_info,
+      /*extrafield_local=*/nullptr,
+      /*size_extrafield_local=*/0u,
+      /*extrafield_global=*/nullptr,
+      /*size_extrafield_global=*/0u,
+      /*comment=*/nullptr,
+      /*method=*/compression,
+      /*level=*/Z_DEFAULT_COMPRESSION,
+      /*raw=*/0,
+      /*windowBits=*/-MAX_WBITS,
+      /*memLevel=*/DEF_MEM_LEVEL,
+      /*strategy=*/Z_DEFAULT_STRATEGY,
+      /*password=*/nullptr,
+      /*crcForCrypting=*/0,
+      /*versionMadeBy=*/0,
+      /*flagBase=*/LANGUAGE_ENCODING_FLAG,
+      /*zip64=*/1);
+
+  if (err != ZIP_OK) {
+    DLOG(ERROR) << "Cannot open ZIP file entry '" << str_path
+                << "': zipOpenNewFileInZip4_64 returned " << err;
     return false;
   }
+
   return true;
 }
 
+Compression GetCompressionMethod(const base::FilePath& path) {
+  // Get the filename extension in lower case.
+  const base::FilePath::StringType ext =
+      base::ToLowerASCII(path.FinalExtension());
+
+  if (ext.empty())
+    return kDeflated;
+
+  using StringPiece = base::FilePath::StringPieceType;
+
+  // Skip the leading dot.
+  StringPiece ext_without_dot = ext;
+  DCHECK_EQ(ext_without_dot.front(), FILE_PATH_LITERAL('.'));
+  ext_without_dot.remove_prefix(1);
+
+  // Well known filename extensions of files that a likely to be already
+  // compressed. The extensions are in lower case without the leading dot.
+  static constexpr auto kExts = base::MakeFixedFlatSet<StringPiece>({
+      FILE_PATH_LITERAL("3g2"),   //
+      FILE_PATH_LITERAL("3gp"),   //
+      FILE_PATH_LITERAL("7z"),    //
+      FILE_PATH_LITERAL("7zip"),  //
+      FILE_PATH_LITERAL("aac"),   //
+      FILE_PATH_LITERAL("avi"),   //
+      FILE_PATH_LITERAL("bz"),    //
+      FILE_PATH_LITERAL("bz2"),   //
+      FILE_PATH_LITERAL("crx"),   //
+      FILE_PATH_LITERAL("gif"),   //
+      FILE_PATH_LITERAL("gz"),    //
+      FILE_PATH_LITERAL("jar"),   //
+      FILE_PATH_LITERAL("jpeg"),  //
+      FILE_PATH_LITERAL("jpg"),   //
+      FILE_PATH_LITERAL("lz"),    //
+      FILE_PATH_LITERAL("m2v"),   //
+      FILE_PATH_LITERAL("m4p"),   //
+      FILE_PATH_LITERAL("m4v"),   //
+      FILE_PATH_LITERAL("mng"),   //
+      FILE_PATH_LITERAL("mov"),   //
+      FILE_PATH_LITERAL("mp2"),   //
+      FILE_PATH_LITERAL("mp3"),   //
+      FILE_PATH_LITERAL("mp4"),   //
+      FILE_PATH_LITERAL("mpe"),   //
+      FILE_PATH_LITERAL("mpeg"),  //
+      FILE_PATH_LITERAL("mpg"),   //
+      FILE_PATH_LITERAL("mpv"),   //
+      FILE_PATH_LITERAL("ogg"),   //
+      FILE_PATH_LITERAL("ogv"),   //
+      FILE_PATH_LITERAL("png"),   //
+      FILE_PATH_LITERAL("qt"),    //
+      FILE_PATH_LITERAL("rar"),   //
+      FILE_PATH_LITERAL("taz"),   //
+      FILE_PATH_LITERAL("tb2"),   //
+      FILE_PATH_LITERAL("tbz"),   //
+      FILE_PATH_LITERAL("tbz2"),  //
+      FILE_PATH_LITERAL("tgz"),   //
+      FILE_PATH_LITERAL("tlz"),   //
+      FILE_PATH_LITERAL("tz"),    //
+      FILE_PATH_LITERAL("tz2"),   //
+      FILE_PATH_LITERAL("vob"),   //
+      FILE_PATH_LITERAL("webm"),  //
+      FILE_PATH_LITERAL("wma"),   //
+      FILE_PATH_LITERAL("wmv"),   //
+      FILE_PATH_LITERAL("xz"),    //
+      FILE_PATH_LITERAL("z"),     //
+      FILE_PATH_LITERAL("zip"),   //
+  });
+
+  if (kExts.count(ext_without_dot)) {
+    return kStored;
+  }
+
+  return kDeflated;
+}
+
 }  // namespace internal
 }  // namespace zip
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/zip_internal.h b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/zip_internal.h
index 0ebf0c94a..f107d7fe8 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/zip_internal.h
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/zip_internal.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2011 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/time/time.h"
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
@@ -34,7 +35,7 @@ namespace internal {
 // Windows.
 unzFile OpenForUnzipping(const std::string& file_name_utf8);
 
-#if defined(OS_POSIX)
+#if defined(OS_POSIX) || defined(OS_FUCHSIA)
 // Opens the file referred to by |zip_fd| for unzipping.
 unzFile OpenFdForUnzipping(int zip_fd);
 #endif
@@ -53,19 +54,30 @@ unzFile PrepareMemoryForUnzipping(const std::string& data);
 // Windows. |append_flag| will be passed to zipOpen2().
 zipFile OpenForZipping(const std::string& file_name_utf8, int append_flag);
 
-#if defined(OS_POSIX)
+#if defined(OS_POSIX) || defined(OS_FUCHSIA)
 // Opens the file referred to by |zip_fd| for zipping. |append_flag| will be
 // passed to zipOpen2().
 zipFile OpenFdForZipping(int zip_fd, int append_flag);
 #endif
 
-// Returns a zip_fileinfo with the last modification date of |path| set.
-zip_fileinfo GetFileInfoForZipping(const base::FilePath& path);
+// Compression methods.
+enum Compression {
+  kStored = 0,             // Stored (no compression)
+  kDeflated = Z_DEFLATED,  // Deflated
+};
 
-// Wrapper around zipOpenNewFileInZip4 which passes most common options.
+// Adds a file (or directory) entry to the ZIP archive.
 bool ZipOpenNewFileInZip(zipFile zip_file,
                          const std::string& str_path,
-                         const zip_fileinfo* file_info);
+                         base::Time last_modified_time,
+                         Compression compression);
+
+// Selects the best compression method for the given file. The heuristic is
+// based on the filename extension. By default, the compression method is
+// kDeflated. But if the given path has an extension indicating a well known
+// file format which is likely to be already compressed (eg ZIP, RAR, JPG,
+// PNG...) then the compression method is simply kStored.
+Compression GetCompressionMethod(const base::FilePath& path);
 
 const int kZipMaxPath = 256;
 const int kZipBufSize = 8192;
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/zip_reader.cc b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/zip_reader.cc
index ff5a39514..34a815e5f 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/zip_reader.cc
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/zip_reader.cc
@@ -1,20 +1,26 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2012 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "third_party/zlib/google/zip_reader.h"
 
+#include <algorithm>
 #include <utility>
 
-#include "base/bind.h"
+#include "base/check.h"
 #include "base/files/file.h"
+#include "base/files/file_util.h"
+#include "base/functional/bind.h"
+#include "base/i18n/icu_string_conversions.h"
 #include "base/logging.h"
-#include "base/macros.h"
-#include "base/single_thread_task_runner.h"
+#include "base/numerics/safe_conversions.h"
+#include "base/strings/strcat.h"
+#include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/threading/thread_task_runner_handle.h"
+#include "base/task/sequenced_task_runner.h"
 #include "build/build_config.h"
+#include "third_party/zlib/google/redact.h"
 #include "third_party/zlib/google/zip_internal.h"
 
 #if defined(USE_SYSTEM_MINIZIP)
@@ -26,153 +32,94 @@
 #endif  // defined(OS_WIN)
 #endif  // defined(USE_SYSTEM_MINIZIP)
 
-namespace zip {
+#if defined(OS_POSIX)
+#include <sys/stat.h>
+#endif
 
+namespace zip {
 namespace {
 
-// FilePathWriterDelegate ------------------------------------------------------
-
-// A writer delegate that writes a file at a given path.
-class FilePathWriterDelegate : public WriterDelegate {
- public:
-  explicit FilePathWriterDelegate(const base::FilePath& output_file_path);
-  ~FilePathWriterDelegate() override;
-
-  // WriterDelegate methods:
-
-  // Creates the output file and any necessary intermediate directories.
-  bool PrepareOutput() override;
-
-  // Writes |num_bytes| bytes of |data| to the file, returning false if not all
-  // bytes could be written.
-  bool WriteBytes(const char* data, int num_bytes) override;
-
- private:
-  base::FilePath output_file_path_;
-  base::File file_;
-
-  DISALLOW_COPY_AND_ASSIGN(FilePathWriterDelegate);
-};
-
-FilePathWriterDelegate::FilePathWriterDelegate(
-    const base::FilePath& output_file_path)
-    : output_file_path_(output_file_path) {
-}
-
-FilePathWriterDelegate::~FilePathWriterDelegate() {
+enum UnzipError : int;
+
+std::ostream& operator<<(std::ostream& out, UnzipError error) {
+#define SWITCH_ERR(X) \
+  case X:             \
+    return out << #X;
+  switch (error) {
+    SWITCH_ERR(UNZ_OK);
+    SWITCH_ERR(UNZ_END_OF_LIST_OF_FILE);
+    SWITCH_ERR(UNZ_ERRNO);
+    SWITCH_ERR(UNZ_PARAMERROR);
+    SWITCH_ERR(UNZ_BADZIPFILE);
+    SWITCH_ERR(UNZ_INTERNALERROR);
+    SWITCH_ERR(UNZ_CRCERROR);
+    default:
+      return out << "UNZ" << static_cast<int>(error);
+  }
+#undef SWITCH_ERR
 }
 
-bool FilePathWriterDelegate::PrepareOutput() {
-  // We can't rely on parent directory entries being specified in the
-  // zip, so we make sure they are created.
-  if (!base::CreateDirectory(output_file_path_.DirName()))
+bool IsValidFileNameCharacterOnWindows(char16_t c) {
+  if (c < 32)
     return false;
 
-  file_.Initialize(output_file_path_,
-                   base::File::FLAG_CREATE_ALWAYS | base::File::FLAG_WRITE);
-  return file_.IsValid();
-}
+  switch (c) {
+    case '<':   // Less than
+    case '>':   // Greater than
+    case ':':   // Colon
+    case '"':   // Double quote
+    case '|':   // Vertical bar or pipe
+    case '?':   // Question mark
+    case '*':   // Asterisk
+    case '/':   // Forward slash
+    case '\\':  // Backslash
+      return false;
+  }
 
-bool FilePathWriterDelegate::WriteBytes(const char* data, int num_bytes) {
-  return num_bytes == file_.WriteAtCurrentPos(data, num_bytes);
+  return true;
 }
 
-
-// StringWriterDelegate --------------------------------------------------------
-
-// A writer delegate that writes no more than |max_read_bytes| to a given
-// std::string.
+// A writer delegate that writes to a given string.
 class StringWriterDelegate : public WriterDelegate {
  public:
-  StringWriterDelegate(size_t max_read_bytes, std::string* output);
-  ~StringWriterDelegate() override;
+  explicit StringWriterDelegate(std::string* output) : output_(output) {}
 
   // WriterDelegate methods:
-
-  // Returns true.
-  bool PrepareOutput() override;
-
-  // Appends |num_bytes| bytes from |data| to the output string. Returns false
-  // if |num_bytes| will cause the string to exceed |max_read_bytes|.
-  bool WriteBytes(const char* data, int num_bytes) override;
+  bool WriteBytes(const char* data, int num_bytes) override {
+    output_->append(data, num_bytes);
+    return true;
+  }
 
  private:
-  size_t max_read_bytes_;
-  std::string* output_;
-
-  DISALLOW_COPY_AND_ASSIGN(StringWriterDelegate);
+  std::string* const output_;
 };
 
-StringWriterDelegate::StringWriterDelegate(size_t max_read_bytes,
-                                           std::string* output)
-    : max_read_bytes_(max_read_bytes),
-      output_(output) {
-}
-
-StringWriterDelegate::~StringWriterDelegate() {
-}
-
-bool StringWriterDelegate::PrepareOutput() {
-  return true;
-}
-
-bool StringWriterDelegate::WriteBytes(const char* data, int num_bytes) {
-  if (output_->size() + num_bytes > max_read_bytes_)
-    return false;
-  output_->append(data, num_bytes);
-  return true;
+#if defined(OS_POSIX)
+void SetPosixFilePermissions(int fd, int mode) {
+  base::stat_wrapper_t sb;
+  if (base::File::Fstat(fd, &sb)) {
+    return;
+  }
+  mode_t new_mode = sb.st_mode;
+  // Transfer the executable bit only if the file is readable.
+  if ((sb.st_mode & S_IRUSR) == S_IRUSR && (mode & S_IXUSR) == S_IXUSR) {
+    new_mode |= S_IXUSR;
+  }
+  if ((sb.st_mode & S_IRGRP) == S_IRGRP && (mode & S_IXGRP) == S_IXGRP) {
+    new_mode |= S_IXGRP;
+  }
+  if ((sb.st_mode & S_IROTH) == S_IROTH && (mode & S_IXOTH) == S_IXOTH) {
+    new_mode |= S_IXOTH;
+  }
+  if (new_mode != sb.st_mode) {
+    fchmod(fd, new_mode);
+  }
 }
+#endif
 
 }  // namespace
 
-// TODO(satorux): The implementation assumes that file names in zip files
-// are encoded in UTF-8. This is true for zip files created by Zip()
-// function in zip.h, but not true for user-supplied random zip files.
-ZipReader::EntryInfo::EntryInfo(const std::string& file_name_in_zip,
-                                const unz_file_info& raw_file_info)
-    : file_path_(base::FilePath::FromUTF8Unsafe(file_name_in_zip)),
-      is_directory_(false) {
-  original_size_ = raw_file_info.uncompressed_size;
-
-  // Directory entries in zip files end with "/".
-  is_directory_ = base::EndsWith(file_name_in_zip, "/",
-                                 base::CompareCase::INSENSITIVE_ASCII);
-
-  // Check the file name here for directory traversal issues.
-  is_unsafe_ = file_path_.ReferencesParent();
-
-  // We also consider that the file name is unsafe, if it's invalid UTF-8.
-  base::string16 file_name_utf16;
-  if (!base::UTF8ToUTF16(file_name_in_zip.data(), file_name_in_zip.size(),
-                         &file_name_utf16)) {
-    is_unsafe_ = true;
-  }
-
-  // We also consider that the file name is unsafe, if it's absolute.
-  // On Windows, IsAbsolute() returns false for paths starting with "/".
-  if (file_path_.IsAbsolute() ||
-      base::StartsWith(file_name_in_zip, "/",
-                       base::CompareCase::INSENSITIVE_ASCII))
-    is_unsafe_ = true;
-
-  // Construct the last modified time. The timezone info is not present in
-  // zip files, so we construct the time as local time.
-  base::Time::Exploded exploded_time = {};  // Zero-clear.
-  exploded_time.year = raw_file_info.tmu_date.tm_year;
-  // The month in zip file is 0-based, whereas ours is 1-based.
-  exploded_time.month = raw_file_info.tmu_date.tm_mon + 1;
-  exploded_time.day_of_month = raw_file_info.tmu_date.tm_mday;
-  exploded_time.hour = raw_file_info.tmu_date.tm_hour;
-  exploded_time.minute = raw_file_info.tmu_date.tm_min;
-  exploded_time.second = raw_file_info.tmu_date.tm_sec;
-  exploded_time.millisecond = 0;
-
-  if (!base::Time::FromLocalExploded(exploded_time, &last_modified_))
-    last_modified_ = base::Time::UnixEpoch();
-}
-
-ZipReader::ZipReader()
-    : weak_ptr_factory_(this) {
+ZipReader::ZipReader() {
   Reset();
 }
 
@@ -180,13 +127,14 @@ ZipReader::~ZipReader() {
   Close();
 }
 
-bool ZipReader::Open(const base::FilePath& zip_file_path) {
+bool ZipReader::Open(const base::FilePath& zip_path) {
   DCHECK(!zip_file_);
 
   // Use of "Unsafe" function does not look good, but there is no way to do
   // this safely on Linux. See file_util.h for details.
-  zip_file_ = internal::OpenForUnzipping(zip_file_path.AsUTF8Unsafe());
+  zip_file_ = internal::OpenForUnzipping(zip_path.AsUTF8Unsafe());
   if (!zip_file_) {
+    LOG(ERROR) << "Cannot open ZIP archive " << Redact(zip_path);
     return false;
   }
 
@@ -196,12 +144,13 @@ bool ZipReader::Open(const base::FilePath& zip_file_path) {
 bool ZipReader::OpenFromPlatformFile(base::PlatformFile zip_fd) {
   DCHECK(!zip_file_);
 
-#if defined(OS_POSIX)
+#if defined(OS_POSIX) || defined(OS_FUCHSIA)
   zip_file_ = internal::OpenFdForUnzipping(zip_fd);
 #elif defined(OS_WIN)
   zip_file_ = internal::OpenHandleForUnzipping(zip_fd);
 #endif
   if (!zip_file_) {
+    LOG(ERROR) << "Cannot open ZIP from file handle " << zip_fd;
     return false;
   }
 
@@ -217,167 +166,329 @@ bool ZipReader::OpenFromString(const std::string& data) {
 
 void ZipReader::Close() {
   if (zip_file_) {
-    unzClose(zip_file_);
+    if (const UnzipError err{unzClose(zip_file_)}; err != UNZ_OK) {
+      LOG(ERROR) << "Error while closing ZIP archive: " << err;
+    }
   }
   Reset();
 }
 
-bool ZipReader::HasMore() {
-  return !reached_end_;
-}
-
-bool ZipReader::AdvanceToNextEntry() {
+const ZipReader::Entry* ZipReader::Next() {
   DCHECK(zip_file_);
 
-  // Should not go further if we already reached the end.
   if (reached_end_)
-    return false;
+    return nullptr;
 
-  unz_file_pos position = {};
-  if (unzGetFilePos(zip_file_, &position) != UNZ_OK)
-    return false;
-  const int current_entry_index = position.num_of_file;
-  // If we are currently at the last entry, then the next position is the
-  // end of the zip file, so mark that we reached the end.
-  if (current_entry_index + 1 == num_entries_) {
-    reached_end_ = true;
-  } else {
-    DCHECK_LT(current_entry_index + 1, num_entries_);
-    if (unzGoToNextFile(zip_file_) != UNZ_OK) {
-      return false;
+  DCHECK(ok_);
+
+  // Move to the next entry if we're not trying to open the first entry.
+  if (next_index_ > 0) {
+    if (const UnzipError err{unzGoToNextFile(zip_file_)}; err != UNZ_OK) {
+      reached_end_ = true;
+      if (err != UNZ_END_OF_LIST_OF_FILE) {
+        LOG(ERROR) << "Cannot go to next entry in ZIP: " << err;
+        ok_ = false;
+      }
+      return nullptr;
     }
   }
-  current_entry_info_.reset();
-  return true;
+
+  next_index_++;
+
+  if (!OpenEntry()) {
+    reached_end_ = true;
+    ok_ = false;
+    return nullptr;
+  }
+
+  return &entry_;
 }
 
-bool ZipReader::OpenCurrentEntryInZip() {
+bool ZipReader::OpenEntry() {
   DCHECK(zip_file_);
 
-  unz_file_info raw_file_info = {};
-  char raw_file_name_in_zip[internal::kZipMaxPath] = {};
-  const int result = unzGetCurrentFileInfo(zip_file_,
-                                           &raw_file_info,
-                                           raw_file_name_in_zip,
-                                           sizeof(raw_file_name_in_zip) - 1,
-                                           NULL,  // extraField.
-                                           0,  // extraFieldBufferSize.
-                                           NULL,  // szComment.
-                                           0);  // commentBufferSize.
-  if (result != UNZ_OK)
+  // Get entry info.
+  unz_file_info64 info = {};
+  char path_in_zip[internal::kZipMaxPath] = {};
+  if (const UnzipError err{unzGetCurrentFileInfo64(
+          zip_file_, &info, path_in_zip, sizeof(path_in_zip) - 1, nullptr, 0,
+          nullptr, 0)};
+      err != UNZ_OK) {
+    LOG(ERROR) << "Cannot get entry from ZIP: " << err;
     return false;
-  if (raw_file_name_in_zip[0] == '\0')
+  }
+
+  entry_.path_in_original_encoding = path_in_zip;
+
+  // Convert path from original encoding to Unicode.
+  std::u16string path_in_utf16;
+  const char* const encoding = encoding_.empty() ? "UTF-8" : encoding_.c_str();
+  if (!base::CodepageToUTF16(entry_.path_in_original_encoding, encoding,
+                             base::OnStringConversionError::SUBSTITUTE,
+                             &path_in_utf16)) {
+    LOG(ERROR) << "Cannot convert path from encoding " << encoding;
     return false;
-  current_entry_info_.reset(
-      new EntryInfo(raw_file_name_in_zip, raw_file_info));
+  }
+
+  // Normalize path.
+  Normalize(path_in_utf16);
+
+  entry_.original_size = info.uncompressed_size;
+
+  // The file content of this entry is encrypted if flag bit 0 is set.
+  entry_.is_encrypted = info.flag & 1;
+  if (entry_.is_encrypted) {
+    // Is the entry AES encrypted.
+    entry_.uses_aes_encryption = info.compression_method == 99;
+  } else {
+    entry_.uses_aes_encryption = false;
+  }
+
+  // Construct the last modified time. The timezone info is not present in ZIP
+  // archives, so we construct the time as UTC.
+  const base::Time::Exploded exploded_time = {
+      .year = static_cast<int>(info.tmu_date.tm_year),
+      .month =
+          static_cast<int>(info.tmu_date.tm_mon + 1),  // 0-based vs 1-based
+      .day_of_month = static_cast<int>(info.tmu_date.tm_mday),
+      .hour = static_cast<int>(info.tmu_date.tm_hour),
+      .minute = static_cast<int>(info.tmu_date.tm_min),
+      .second = static_cast<int>(info.tmu_date.tm_sec)};
+
+  if (!base::Time::FromUTCExploded(exploded_time, &entry_.last_modified))
+    entry_.last_modified = base::Time::UnixEpoch();
+
+#if defined(OS_POSIX)
+  entry_.posix_mode = (info.external_fa >> 16L) & (S_IRWXU | S_IRWXG | S_IRWXO);
+#else
+  entry_.posix_mode = 0;
+#endif
+
   return true;
 }
 
-bool ZipReader::LocateAndOpenEntry(const base::FilePath& path_in_zip) {
-  DCHECK(zip_file_);
+void ZipReader::Normalize(base::StringPiece16 in) {
+  entry_.is_unsafe = true;
 
-  current_entry_info_.reset();
-  reached_end_ = false;
-  const int kDefaultCaseSensivityOfOS = 0;
-  const int result = unzLocateFile(zip_file_,
-                                   path_in_zip.AsUTF8Unsafe().c_str(),
-                                   kDefaultCaseSensivityOfOS);
-  if (result != UNZ_OK)
-    return false;
+  // Directory entries in ZIP have a path ending with "/".
+  entry_.is_directory = base::EndsWith(in, u"/");
+
+  std::u16string normalized_path;
+  if (base::StartsWith(in, u"/")) {
+    normalized_path = u"ROOT";
+    entry_.is_unsafe = false;
+  }
+
+  for (;;) {
+    // Consume initial path separators.
+    const base::StringPiece16::size_type i = in.find_first_not_of(u'/');
+    if (i == base::StringPiece16::npos)
+      break;
 
-  // Then Open the entry.
-  return OpenCurrentEntryInZip();
+    in.remove_prefix(i);
+    DCHECK(!in.empty());
+
+    // Isolate next path component.
+    const base::StringPiece16 part = in.substr(0, in.find_first_of(u'/'));
+    DCHECK(!part.empty());
+
+    in.remove_prefix(part.size());
+
+    if (!normalized_path.empty())
+      normalized_path += u'/';
+
+    if (part == u".") {
+      normalized_path += u"DOT";
+      entry_.is_unsafe = true;
+      continue;
+    }
+
+    if (part == u"..") {
+      normalized_path += u"UP";
+      entry_.is_unsafe = true;
+      continue;
+    }
+
+    // Windows has more restrictions than other systems when it comes to valid
+    // file paths. Replace Windows-invalid characters on all systems for
+    // consistency. In particular, this prevents a path component containing
+    // colon and backslash from being misinterpreted as an absolute path on
+    // Windows.
+    for (const char16_t c : part) {
+      normalized_path += IsValidFileNameCharacterOnWindows(c) ? c : 0xFFFD;
+    }
+
+    entry_.is_unsafe = false;
+  }
+
+  // If the entry is a directory, add the final path separator to the entry
+  // path.
+  if (entry_.is_directory && !normalized_path.empty()) {
+    normalized_path += u'/';
+    entry_.is_unsafe = false;
+  }
+
+  entry_.path = base::FilePath::FromUTF16Unsafe(normalized_path);
+
+  // By construction, we should always get a relative path.
+  DCHECK(!entry_.path.IsAbsolute()) << entry_.path;
 }
 
-bool ZipReader::ExtractCurrentEntry(WriterDelegate* delegate) const {
-  DCHECK(zip_file_);
+void ZipReader::ReportProgress(ListenerCallback listener_callback,
+                               uint64_t bytes) const {
+  delta_bytes_read_ += bytes;
+
+  const base::TimeTicks now = base::TimeTicks::Now();
+  if (next_progress_report_time_ > now)
+    return;
+
+  next_progress_report_time_ = now + progress_period_;
+  listener_callback.Run(delta_bytes_read_);
+  delta_bytes_read_ = 0;
+}
 
-  const int open_result = unzOpenCurrentFile(zip_file_);
-  if (open_result != UNZ_OK)
+bool ZipReader::ExtractCurrentEntry(WriterDelegate* delegate,
+                                    ListenerCallback listener_callback,
+                                    uint64_t num_bytes_to_extract) const {
+  DCHECK(zip_file_);
+  DCHECK_LT(0, next_index_);
+  DCHECK(ok_);
+  DCHECK(!reached_end_);
+
+  // Use password only for encrypted files. For non-encrypted files, no password
+  // is needed, and must be nullptr.
+  const char* const password =
+      entry_.is_encrypted ? password_.c_str() : nullptr;
+  if (const UnzipError err{unzOpenCurrentFilePassword(zip_file_, password)};
+      err != UNZ_OK) {
+    LOG(ERROR) << "Cannot open file " << Redact(entry_.path)
+               << " from ZIP: " << err;
     return false;
+  }
 
+  DCHECK(delegate);
   if (!delegate->PrepareOutput())
     return false;
 
-  bool success = true;  // This becomes false when something bad happens.
-  std::unique_ptr<char[]> buf(new char[internal::kZipBufSize]);
-  while (true) {
-    const int num_bytes_read = unzReadCurrentFile(zip_file_, buf.get(),
-                                                  internal::kZipBufSize);
+  uint64_t remaining_capacity = num_bytes_to_extract;
+  bool entire_file_extracted = false;
+
+  while (remaining_capacity > 0) {
+    char buf[internal::kZipBufSize];
+    const int num_bytes_read =
+        unzReadCurrentFile(zip_file_, buf, internal::kZipBufSize);
+
     if (num_bytes_read == 0) {
-      // Reached the end of the file.
+      entire_file_extracted = true;
       break;
-    } else if (num_bytes_read < 0) {
-      // If num_bytes_read < 0, then it's a specific UNZ_* error code.
-      success = false;
+    }
+
+    if (num_bytes_read < 0) {
+      LOG(ERROR) << "Cannot read file " << Redact(entry_.path)
+                 << " from ZIP: " << UnzipError(num_bytes_read);
       break;
-    } else if (num_bytes_read > 0) {
-      // Some data is read.
-      if (!delegate->WriteBytes(buf.get(), num_bytes_read)) {
-        success = false;
-        break;
-      }
     }
-  }
 
-  unzCloseCurrentFile(zip_file_);
+    if (listener_callback) {
+      ReportProgress(listener_callback, num_bytes_read);
+    }
 
-  return success;
-}
+    DCHECK_LT(0, num_bytes_read);
+    CHECK_LE(num_bytes_read, internal::kZipBufSize);
 
-bool ZipReader::ExtractCurrentEntryToFilePath(
-    const base::FilePath& output_file_path) const {
-  DCHECK(zip_file_);
+    uint64_t num_bytes_to_write = std::min<uint64_t>(
+        remaining_capacity, base::checked_cast<uint64_t>(num_bytes_read));
+    if (!delegate->WriteBytes(buf, num_bytes_to_write))
+      break;
 
-  // If this is a directory, just create it and return.
-  if (current_entry_info()->is_directory())
-    return base::CreateDirectory(output_file_path);
+    if (remaining_capacity == base::checked_cast<uint64_t>(num_bytes_read)) {
+      // Ensures function returns true if the entire file has been read.
+      const int n = unzReadCurrentFile(zip_file_, buf, 1);
+      entire_file_extracted = (n == 0);
+      LOG_IF(ERROR, n < 0) << "Cannot read file " << Redact(entry_.path)
+                           << " from ZIP: " << UnzipError(n);
+    }
+
+    CHECK_GE(remaining_capacity, num_bytes_to_write);
+    remaining_capacity -= num_bytes_to_write;
+  }
 
-  bool success = false;
-  {
-    FilePathWriterDelegate writer(output_file_path);
-    success = ExtractCurrentEntry(&writer);
+  if (const UnzipError err{unzCloseCurrentFile(zip_file_)}; err != UNZ_OK) {
+    LOG(ERROR) << "Cannot extract file " << Redact(entry_.path)
+               << " from ZIP: " << err;
+    entire_file_extracted = false;
+  }
+
+  if (entire_file_extracted) {
+    delegate->SetPosixFilePermissions(entry_.posix_mode);
+    if (entry_.last_modified != base::Time::UnixEpoch()) {
+      delegate->SetTimeModified(entry_.last_modified);
+    }
+  } else {
+    delegate->OnError();
   }
 
-  if (success &&
-      current_entry_info()->last_modified() != base::Time::UnixEpoch()) {
-    base::TouchFile(output_file_path,
-                    base::Time::Now(),
-                    current_entry_info()->last_modified());
+  if (listener_callback) {
+    listener_callback.Run(delta_bytes_read_);
+    delta_bytes_read_ = 0;
   }
 
-  return success;
+  return entire_file_extracted;
+}
+
+bool ZipReader::ExtractCurrentEntry(WriterDelegate* delegate,
+                                    uint64_t num_bytes_to_extract) const {
+  return ExtractCurrentEntry(delegate, ListenerCallback(),
+                             num_bytes_to_extract);
+}
+
+bool ZipReader::ExtractCurrentEntryWithListener(
+    WriterDelegate* delegate,
+    ListenerCallback listener_callback) const {
+  return ExtractCurrentEntry(delegate, listener_callback);
 }
 
 void ZipReader::ExtractCurrentEntryToFilePathAsync(
     const base::FilePath& output_file_path,
-    const SuccessCallback& success_callback,
-    const FailureCallback& failure_callback,
-    const ProgressCallback& progress_callback) {
+    SuccessCallback success_callback,
+    FailureCallback failure_callback,
+    ProgressCallback progress_callback) {
   DCHECK(zip_file_);
-  DCHECK(current_entry_info_.get());
+  DCHECK_LT(0, next_index_);
+  DCHECK(ok_);
+  DCHECK(!reached_end_);
 
   // If this is a directory, just create it and return.
-  if (current_entry_info()->is_directory()) {
+  if (entry_.is_directory) {
     if (base::CreateDirectory(output_file_path)) {
-      base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, success_callback);
+      base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
+          FROM_HERE, std::move(success_callback));
     } else {
-      DVLOG(1) << "Unzip failed: unable to create directory.";
-      base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, failure_callback);
+      LOG(ERROR) << "Cannot create directory " << Redact(output_file_path);
+      base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
+          FROM_HERE, std::move(failure_callback));
     }
     return;
   }
 
-  if (unzOpenCurrentFile(zip_file_) != UNZ_OK) {
-    DVLOG(1) << "Unzip failed: unable to open current zip entry.";
-    base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, failure_callback);
+  // Use password only for encrypted files. For non-encrypted files, no password
+  // is needed, and must be nullptr.
+  const char* const password =
+      entry_.is_encrypted ? password_.c_str() : nullptr;
+  if (const UnzipError err{unzOpenCurrentFilePassword(zip_file_, password)};
+      err != UNZ_OK) {
+    LOG(ERROR) << "Cannot open file " << Redact(entry_.path)
+               << " from ZIP: " << err;
+    base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
+        FROM_HERE, std::move(failure_callback));
     return;
   }
 
   base::FilePath output_dir_path = output_file_path.DirName();
   if (!base::CreateDirectory(output_dir_path)) {
-    DVLOG(1) << "Unzip failed: unable to create containing directory.";
-    base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, failure_callback);
+    LOG(ERROR) << "Cannot create directory " << Redact(output_dir_path);
+    base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
+        FROM_HERE, std::move(failure_callback));
     return;
   }
 
@@ -385,142 +496,155 @@ void ZipReader::ExtractCurrentEntryToFilePathAsync(
   base::File output_file(output_file_path, flags);
 
   if (!output_file.IsValid()) {
-    DVLOG(1) << "Unzip failed: unable to create platform file at "
-             << output_file_path.value();
-    base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, failure_callback);
+    LOG(ERROR) << "Cannot create file " << Redact(output_file_path);
+    base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
+        FROM_HERE, std::move(failure_callback));
     return;
   }
 
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
+  base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
       FROM_HERE,
-      base::Bind(&ZipReader::ExtractChunk, weak_ptr_factory_.GetWeakPtr(),
-                 Passed(std::move(output_file)), success_callback,
-                 failure_callback, progress_callback, 0 /* initial offset */));
-}
-
-bool ZipReader::ExtractCurrentEntryIntoDirectory(
-    const base::FilePath& output_directory_path) const {
-  DCHECK(current_entry_info_.get());
-
-  base::FilePath output_file_path = output_directory_path.Append(
-      current_entry_info()->file_path());
-  return ExtractCurrentEntryToFilePath(output_file_path);
-}
-
-bool ZipReader::ExtractCurrentEntryToFile(base::File* file) const {
-  DCHECK(zip_file_);
-
-  // If this is a directory, there's nothing to extract to the file, so return
-  // false.
-  if (current_entry_info()->is_directory())
-    return false;
-
-  FileWriterDelegate writer(file);
-  return ExtractCurrentEntry(&writer);
+      base::BindOnce(&ZipReader::ExtractChunk, weak_ptr_factory_.GetWeakPtr(),
+                     std::move(output_file), std::move(success_callback),
+                     std::move(failure_callback), std::move(progress_callback),
+                     0 /* initial offset */));
 }
 
-bool ZipReader::ExtractCurrentEntryToString(size_t max_read_bytes,
+bool ZipReader::ExtractCurrentEntryToString(uint64_t max_read_bytes,
                                             std::string* output) const {
   DCHECK(output);
   DCHECK(zip_file_);
-  DCHECK_NE(0U, max_read_bytes);
+  DCHECK_LT(0, next_index_);
+  DCHECK(ok_);
+  DCHECK(!reached_end_);
+
+  output->clear();
 
-  if (current_entry_info()->is_directory()) {
-    output->clear();
+  if (max_read_bytes == 0)
     return true;
-  }
 
-  // The original_size() is the best hint for the real size, so it saves
-  // doing reallocations for the common case when the uncompressed size is
-  // correct. However, we need to assume that the uncompressed size could be
-  // incorrect therefore this function needs to read as much data as possible.
-  std::string contents;
-  contents.reserve(
-      static_cast<size_t>(std::min(static_cast<int64_t>(max_read_bytes),
-                                   current_entry_info()->original_size())));
+  if (entry_.is_directory)
+    return true;
 
-  StringWriterDelegate writer(max_read_bytes, &contents);
-  if (!ExtractCurrentEntry(&writer))
-    return false;
-  output->swap(contents);
-  return true;
+  // The original_size is the best hint for the real size, so it saves doing
+  // reallocations for the common case when the uncompressed size is correct.
+  // However, we need to assume that the uncompressed size could be incorrect
+  // therefore this function needs to read as much data as possible.
+  output->reserve(base::checked_cast<size_t>(std::min<uint64_t>(
+      max_read_bytes, base::checked_cast<uint64_t>(entry_.original_size))));
+
+  StringWriterDelegate writer(output);
+  return ExtractCurrentEntry(&writer, max_read_bytes);
 }
 
 bool ZipReader::OpenInternal() {
   DCHECK(zip_file_);
 
   unz_global_info zip_info = {};  // Zero-clear.
-  if (unzGetGlobalInfo(zip_file_, &zip_info) != UNZ_OK) {
+  if (const UnzipError err{unzGetGlobalInfo(zip_file_, &zip_info)};
+      err != UNZ_OK) {
+    LOG(ERROR) << "Cannot get ZIP info: " << err;
     return false;
   }
-  num_entries_ = zip_info.number_entry;
-  if (num_entries_ < 0)
-    return false;
 
-  // We are already at the end if the zip file is empty.
-  reached_end_ = (num_entries_ == 0);
+  num_entries_ = zip_info.number_entry;
+  reached_end_ = (num_entries_ <= 0);
+  ok_ = true;
   return true;
 }
 
 void ZipReader::Reset() {
-  zip_file_ = NULL;
+  zip_file_ = nullptr;
   num_entries_ = 0;
-  reached_end_ = false;
-  current_entry_info_.reset();
+  next_index_ = 0;
+  reached_end_ = true;
+  ok_ = false;
+  delta_bytes_read_ = 0;
+  entry_ = {};
 }
 
 void ZipReader::ExtractChunk(base::File output_file,
-                             const SuccessCallback& success_callback,
-                             const FailureCallback& failure_callback,
-                             const ProgressCallback& progress_callback,
-                             const int64_t offset) {
+                             SuccessCallback success_callback,
+                             FailureCallback failure_callback,
+                             ProgressCallback progress_callback,
+                             int64_t offset) {
   char buffer[internal::kZipBufSize];
 
-  const int num_bytes_read = unzReadCurrentFile(zip_file_,
-                                                buffer,
-                                                internal::kZipBufSize);
+  const int num_bytes_read =
+      unzReadCurrentFile(zip_file_, buffer, internal::kZipBufSize);
 
   if (num_bytes_read == 0) {
-    unzCloseCurrentFile(zip_file_);
-    success_callback.Run();
-  } else if (num_bytes_read < 0) {
-    DVLOG(1) << "Unzip failed: error while reading zipfile "
-             << "(" << num_bytes_read << ")";
-    failure_callback.Run();
-  } else {
-    if (num_bytes_read != output_file.Write(offset, buffer, num_bytes_read)) {
-      DVLOG(1) << "Unzip failed: unable to write all bytes to target.";
-      failure_callback.Run();
+    if (const UnzipError err{unzCloseCurrentFile(zip_file_)}; err != UNZ_OK) {
+      LOG(ERROR) << "Cannot extract file " << Redact(entry_.path)
+                 << " from ZIP: " << err;
+      std::move(failure_callback).Run();
       return;
     }
 
-    int64_t current_progress = offset + num_bytes_read;
+    std::move(success_callback).Run();
+    return;
+  }
 
-    progress_callback.Run(current_progress);
+  if (num_bytes_read < 0) {
+    LOG(ERROR) << "Cannot read file " << Redact(entry_.path)
+               << " from ZIP: " << UnzipError(num_bytes_read);
+    std::move(failure_callback).Run();
+    return;
+  }
 
-    base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE,
-        base::Bind(&ZipReader::ExtractChunk, weak_ptr_factory_.GetWeakPtr(),
-                   Passed(std::move(output_file)), success_callback,
-                   failure_callback, progress_callback, current_progress));
+  if (num_bytes_read != output_file.Write(offset, buffer, num_bytes_read)) {
+    LOG(ERROR) << "Cannot write " << num_bytes_read
+               << " bytes to file at offset " << offset;
+    std::move(failure_callback).Run();
+    return;
   }
+
+  offset += num_bytes_read;
+  progress_callback.Run(offset);
+
+  base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
+      FROM_HERE,
+      base::BindOnce(&ZipReader::ExtractChunk, weak_ptr_factory_.GetWeakPtr(),
+                     std::move(output_file), std::move(success_callback),
+                     std::move(failure_callback), std::move(progress_callback),
+                     offset));
 }
 
 // FileWriterDelegate ----------------------------------------------------------
 
-FileWriterDelegate::FileWriterDelegate(base::File* file)
-    : file_(file),
-      file_length_(0) {
+FileWriterDelegate::FileWriterDelegate(base::File* file) : file_(file) {
+  DCHECK(file_);
 }
 
-FileWriterDelegate::~FileWriterDelegate() {
-  if (!file_->SetLength(file_length_)) {
-    DPLOG(ERROR) << "Failed updating length of written file";
-  }
+FileWriterDelegate::FileWriterDelegate(base::File owned_file)
+    : owned_file_(std::move(owned_file)) {
+  DCHECK_EQ(file_, &owned_file_);
 }
 
+FileWriterDelegate::~FileWriterDelegate() {}
+
 bool FileWriterDelegate::PrepareOutput() {
-  return file_->Seek(base::File::FROM_BEGIN, 0) >= 0;
+  DCHECK(file_);
+
+  if (!file_->IsValid()) {
+    LOG(ERROR) << "File is not valid";
+    return false;
+  }
+
+  const int64_t length = file_->GetLength();
+  if (length < 0) {
+    PLOG(ERROR) << "Cannot get length of file handle "
+                << file_->GetPlatformFile();
+    return false;
+  }
+
+  // Just log a warning if the file is not empty.
+  // See crbug.com/1309879 and crbug.com/774762.
+  LOG_IF(WARNING, length > 0)
+      << "File handle " << file_->GetPlatformFile()
+      << " is not empty: Its length is " << length << " bytes";
+
+  return true;
 }
 
 bool FileWriterDelegate::WriteBytes(const char* data, int num_bytes) {
@@ -530,4 +654,69 @@ bool FileWriterDelegate::WriteBytes(const char* data, int num_bytes) {
   return bytes_written == num_bytes;
 }
 
+void FileWriterDelegate::SetTimeModified(const base::Time& time) {
+  file_->SetTimes(base::Time::Now(), time);
+}
+
+void FileWriterDelegate::SetPosixFilePermissions(int mode) {
+#if defined(OS_POSIX)
+  zip::SetPosixFilePermissions(file_->GetPlatformFile(), mode);
+#endif
+}
+
+void FileWriterDelegate::OnError() {
+  file_length_ = 0;
+  file_->SetLength(0);
+}
+
+// FilePathWriterDelegate ------------------------------------------------------
+
+FilePathWriterDelegate::FilePathWriterDelegate(base::FilePath output_file_path)
+    : FileWriterDelegate(base::File()),
+      output_file_path_(std::move(output_file_path)) {}
+
+FilePathWriterDelegate::~FilePathWriterDelegate() {}
+
+bool FilePathWriterDelegate::PrepareOutput() {
+  // We can't rely on parent directory entries being specified in the
+  // zip, so we make sure they are created.
+  if (const base::FilePath dir = output_file_path_.DirName();
+      !base::CreateDirectory(dir)) {
+    PLOG(ERROR) << "Cannot create directory " << Redact(dir);
+    return false;
+  }
+
+  owned_file_.Initialize(output_file_path_,
+                         base::File::FLAG_CREATE | base::File::FLAG_WRITE);
+  if (!owned_file_.IsValid()) {
+    PLOG(ERROR) << "Cannot create file " << Redact(output_file_path_) << ": "
+                << base::File::ErrorToString(owned_file_.error_details());
+    return false;
+  }
+
+  const int64_t length = owned_file_.GetLength();
+  if (length < 0) {
+    PLOG(ERROR) << "Cannot get length of file " << Redact(output_file_path_);
+    return false;
+  }
+
+  if (length > 0) {
+    LOG(ERROR) << "File " << Redact(output_file_path_)
+               << " is not empty: Its length is " << length << " bytes";
+    return false;
+  }
+
+  return true;
+}
+
+void FilePathWriterDelegate::OnError() {
+  FileWriterDelegate::OnError();
+  owned_file_.Close();
+
+  if (!base::DeleteFile(output_file_path_)) {
+    LOG(ERROR) << "Cannot delete partially extracted file "
+               << Redact(output_file_path_);
+  }
+}
+
 }  // namespace zip
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/zip_reader.h b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/zip_reader.h
index c1b6fb336..b7680cc83 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/zip_reader.h
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/zip_reader.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2011 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 #ifndef THIRD_PARTY_ZLIB_GOOGLE_ZIP_READER_H_
@@ -7,15 +7,15 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include <limits>
 #include <memory>
 #include <string>
 
-#include "base/callback.h"
 #include "base/files/file.h"
 #include "base/files/file_path.h"
-#include "base/files/file_util.h"
-#include "base/macros.h"
+#include "base/functional/callback.h"
 #include "base/memory/weak_ptr.h"
+#include "base/numerics/safe_conversions.h"
 #include "base/time/time.h"
 
 #if defined(USE_SYSTEM_MINIZIP)
@@ -34,93 +34,128 @@ class WriterDelegate {
 
   // Invoked once before any data is streamed out to pave the way (e.g., to open
   // the output file). Return false on failure to cancel extraction.
-  virtual bool PrepareOutput() = 0;
+  virtual bool PrepareOutput() { return true; }
 
   // Invoked to write the next chunk of data. Return false on failure to cancel
   // extraction.
-  virtual bool WriteBytes(const char* data, int num_bytes) = 0;
+  virtual bool WriteBytes(const char* data, int num_bytes) { return true; }
+
+  // Sets the last-modified time of the data.
+  virtual void SetTimeModified(const base::Time& time) {}
+
+  // Called with the POSIX file permissions of the data; POSIX implementations
+  // may apply some of the permissions (for example, the executable bit) to the
+  // output file.
+  virtual void SetPosixFilePermissions(int mode) {}
+
+  // Called if an error occurred while extracting the file. The WriterDelegate
+  // can then remove and clean up the partially extracted data.
+  virtual void OnError() {}
 };
 
-// This class is used for reading zip files. A typical use case of this
-// class is to scan entries in a zip file and extract them. The code will
-// look like:
+// This class is used for reading ZIP archives. A typical use case of this class
+// is to scan entries in a ZIP archive and extract them. The code will look
+// like:
 //
 //   ZipReader reader;
-//   reader.Open(zip_file_path);
-//   while (reader.HasMore()) {
-//     reader.OpenCurrentEntryInZip();
-//     reader.ExtractCurrentEntryToDirectory(output_directory_path);
-//     reader.AdvanceToNextEntry();
+//   if (!reader.Open(zip_path)) {
+//     // Cannot open
+//     return;
 //   }
 //
-// For simplicity, error checking is omitted in the example code above. The
-// production code should check return values from all of these functions.
+//   while (const ZipReader::entry* entry = reader.Next()) {
+//     auto writer = CreateFilePathWriterDelegate(extract_dir, entry->path);
+//     if (!reader.ExtractCurrentEntry(writer)) {
+//           // Cannot extract
+//           return;
+//     }
+//   }
 //
-// This calls can also be used for random access of contents in a zip file
-// using LocateAndOpenEntry().
+//   if (!reader.ok()) {
+//     // Error while enumerating entries
+//     return;
+//   }
 //
 class ZipReader {
  public:
   // A callback that is called when the operation is successful.
-  typedef base::Closure SuccessCallback;
+  using SuccessCallback = base::OnceClosure;
   // A callback that is called when the operation fails.
-  typedef base::Closure FailureCallback;
+  using FailureCallback = base::OnceClosure;
   // A callback that is called periodically during the operation with the number
   // of bytes that have been processed so far.
-  typedef base::Callback<void(int64_t)> ProgressCallback;
-
-  // This class represents information of an entry (file or directory) in
-  // a zip file.
-  class EntryInfo {
-   public:
-    EntryInfo(const std::string& filename_in_zip,
-              const unz_file_info& raw_file_info);
-
-    // Returns the file path. The path is usually relative like
-    // "foo/bar.txt", but if it's absolute, is_unsafe() returns true.
-    const base::FilePath& file_path() const { return file_path_; }
-
-    // Returns the size of the original file (i.e. after uncompressed).
-    // Returns 0 if the entry is a directory.
-    // Note: this value should not be trusted, because it is stored as metadata
-    // in the zip archive and can be different from the real uncompressed size.
-    int64_t original_size() const { return original_size_; }
-
-    // Returns the last modified time. If the time stored in the zip file was
-    // not valid, the unix epoch will be returned.
+  using ProgressCallback = base::RepeatingCallback<void(int64_t)>;
+  // A callback that is called periodically during the operation with the number
+  // of bytes that have been processed since the previous call (i.e. delta).
+  using ListenerCallback = base::RepeatingCallback<void(uint64_t)>;
+
+  // Information of an entry (file or directory) in a ZIP archive.
+  struct Entry {
+    // Path of this entry, in its original encoding as it is stored in the ZIP
+    // archive. The encoding is not specified here. It might or might not be
+    // UTF-8, and the caller needs to use other means to determine the encoding
+    // if it wants to interpret this path correctly.
+    std::string path_in_original_encoding;
+
+    // Path of the entry, converted to Unicode. This path is relative (eg
+    // "foo/bar.txt"). Absolute paths (eg "/foo/bar.txt") or paths containing
+    // ".." or "." components (eg "../foo/bar.txt") are converted to safe
+    // relative paths. Eg:
+    // (In ZIP) -> (Entry.path)
+    // /foo/bar -> ROOT/foo/bar
+    // ../a     -> UP/a
+    // ./a      -> DOT/a
+    base::FilePath path;
+
+    // Size of the original uncompressed file, or 0 if the entry is a directory.
+    // This value should not be trusted, because it is stored as metadata in the
+    // ZIP archive and can be different from the real uncompressed size.
+    int64_t original_size;
+
+    // Last modified time. If the timestamp stored in the ZIP archive is not
+    // valid, the Unix epoch will be returned.
+    //
+    // The timestamp stored in the ZIP archive uses the MS-DOS date and time
+    // format.
     //
-    // The time stored in the zip archive uses the MS-DOS date and time format.
     // http://msdn.microsoft.com/en-us/library/ms724247(v=vs.85).aspx
+    //
     // As such the following limitations apply:
-    // * only years from 1980 to 2107 can be represented.
-    // * the time stamp has a 2 second resolution.
-    // * there's no timezone information, so the time is interpreted as local.
-    base::Time last_modified() const { return last_modified_; }
-
-    // Returns true if the entry is a directory.
-    bool is_directory() const { return is_directory_; }
-
-    // Returns true if the entry is unsafe, like having ".." or invalid
-    // UTF-8 characters in its file name, or the file path is absolute.
-    bool is_unsafe() const { return is_unsafe_; }
-
-   private:
-    const base::FilePath file_path_;
-    int64_t original_size_;
-    base::Time last_modified_;
-    bool is_directory_;
-    bool is_unsafe_;
-    DISALLOW_COPY_AND_ASSIGN(EntryInfo);
+    // * Only years from 1980 to 2107 can be represented.
+    // * The timestamp has a 2-second resolution.
+    // * There is no timezone information, so the time is interpreted as UTC.
+    base::Time last_modified;
+
+    // True if the entry is a directory.
+    // False if the entry is a file.
+    bool is_directory = false;
+
+    // True if the entry path cannot be converted to a safe relative path. This
+    // happens if a file entry (not a directory) has a filename "." or "..".
+    bool is_unsafe = false;
+
+    // True if the file content is encrypted.
+    bool is_encrypted = false;
+
+    // True if the encryption scheme is AES.
+    bool uses_aes_encryption = false;
+
+    // Entry POSIX permissions (POSIX systems only).
+    int posix_mode;
   };
 
   ZipReader();
+
+  ZipReader(const ZipReader&) = delete;
+  ZipReader& operator=(const ZipReader&) = delete;
+
   ~ZipReader();
 
-  // Opens the zip file specified by |zip_file_path|. Returns true on
+  // Opens the ZIP archive specified by |zip_path|. Returns true on
   // success.
-  bool Open(const base::FilePath& zip_file_path);
+  bool Open(const base::FilePath& zip_path);
 
-  // Opens the zip file referred to by the platform file |zip_fd|, without
+  // Opens the ZIP archive referred to by the platform file |zip_fd|, without
   // taking ownership of |zip_fd|. Returns true on success.
   bool OpenFromPlatformFile(base::PlatformFile zip_fd);
 
@@ -129,102 +164,105 @@ class ZipReader {
   // string until it finishes extracting files.
   bool OpenFromString(const std::string& data);
 
-  // Closes the currently opened zip file. This function is called in the
+  // Closes the currently opened ZIP archive. This function is called in the
   // destructor of the class, so you usually don't need to call this.
   void Close();
 
-  // Returns true if there is at least one entry to read. This function is
-  // used to scan entries with AdvanceToNextEntry(), like:
+  // Sets the encoding of entry paths in the ZIP archive.
+  // By default, paths are assumed to be in UTF-8.
+  void SetEncoding(std::string encoding) { encoding_ = std::move(encoding); }
+
+  // Sets the decryption password that will be used to decrypt encrypted file in
+  // the ZIP archive.
+  void SetPassword(std::string password) { password_ = std::move(password); }
+
+  // Gets the next entry. Returns null if there is no more entry, or if an error
+  // occurred while scanning entries. The returned Entry is owned by this
+  // ZipReader, and is valid until Next() is called again or until this
+  // ZipReader is closed.
+  //
+  // This function should be called before operations over the current entry
+  // like ExtractCurrentEntryToFile().
   //
-  // while (reader.HasMore()) {
-  //   // Do something with the current file here.
-  //   reader.AdvanceToNextEntry();
+  // while (const ZipReader::Entry* entry = reader.Next()) {
+  //   // Do something with the current entry here.
+  //   ...
   // }
-  bool HasMore();
+  //
+  // // Finished scanning entries.
+  // // Check if the scanning stopped because of an error.
+  // if (!reader.ok()) {
+  //   // There was an error.
+  //   ...
+  // }
+  const Entry* Next();
 
-  // Advances the next entry. Returns true on success.
-  bool AdvanceToNextEntry();
+  // Returns true if the enumeration of entries was successful, or false if it
+  // stopped because of an error.
+  bool ok() const { return ok_; }
 
-  // Opens the current entry in the zip file. On success, returns true and
-  // updates the the current entry state (i.e. current_entry_info() is
-  // updated). This function should be called before operations over the
-  // current entry like ExtractCurrentEntryToFile().
+  // Extracts |num_bytes_to_extract| bytes of the current entry to |delegate|,
+  // starting from the beginning of the entry.
+  //
+  // Returns true if the entire file was extracted without error.
   //
-  // Note that there is no CloseCurrentEntryInZip(). The the current entry
-  // state is reset automatically as needed.
-  bool OpenCurrentEntryInZip();
-
-  // Locates an entry in the zip file and opens it. Returns true on
-  // success. This function internally calls OpenCurrentEntryInZip() on
-  // success. On failure, current_entry_info() becomes NULL.
-  bool LocateAndOpenEntry(const base::FilePath& path_in_zip);
-
-  // Extracts the current entry in chunks to |delegate|.
-  bool ExtractCurrentEntry(WriterDelegate* delegate) const;
-
-  // Extracts the current entry to the given output file path. If the
-  // current file is a directory, just creates a directory
-  // instead. Returns true on success. OpenCurrentEntryInZip() must be
-  // called beforehand.
+  // Precondition: Next() returned a non-null Entry.
+  bool ExtractCurrentEntry(WriterDelegate* delegate,
+                           uint64_t num_bytes_to_extract =
+                               std::numeric_limits<uint64_t>::max()) const;
+
+  // Extracts the current entry to |delegate|, starting from the beginning
+  // of the entry, calling |listener_callback| regularly with the number of
+  // bytes extracted.
   //
-  // This function preserves the timestamp of the original entry. If that
-  // timestamp is not valid, the timestamp will be set to the current time.
-  bool ExtractCurrentEntryToFilePath(
-      const base::FilePath& output_file_path) const;
-
-  // Asynchronously extracts the current entry to the given output file path.
-  // If the current entry is a directory it just creates the directory
-  // synchronously instead.  OpenCurrentEntryInZip() must be called beforehand.
-  // success_callback will be called on success and failure_callback will be
-  // called on failure.  progress_callback will be called at least once.
+  // Returns true if the entire file was extracted without error.
+  //
+  // Precondition: Next() returned a non-null Entry.
+  bool ExtractCurrentEntryWithListener(
+      WriterDelegate* delegate,
+      ListenerCallback listener_callback) const;
+
+  // Asynchronously extracts the current entry to the given output file path. If
+  // the current entry is a directory it just creates the directory
+  // synchronously instead.
+  //
+  // |success_callback| will be called on success and |failure_callback| will be
+  // called on failure. |progress_callback| will be called at least once.
   // Callbacks will be posted to the current MessageLoop in-order.
+  //
+  // Precondition: Next() returned a non-null Entry.
   void ExtractCurrentEntryToFilePathAsync(
       const base::FilePath& output_file_path,
-      const SuccessCallback& success_callback,
-      const FailureCallback& failure_callback,
-      const ProgressCallback& progress_callback);
-
-  // Extracts the current entry to the given output directory path using
-  // ExtractCurrentEntryToFilePath(). Sub directories are created as needed
-  // based on the file path of the current entry. For example, if the file
-  // path in zip is "foo/bar.txt", and the output directory is "output",
-  // "output/foo/bar.txt" will be created.
+      SuccessCallback success_callback,
+      FailureCallback failure_callback,
+      ProgressCallback progress_callback);
+
+  // Extracts the current entry into memory. If the current entry is a
+  // directory, |*output| is set to the empty string. If the current entry is a
+  // file, |*output| is filled with its contents.
   //
-  // Returns true on success. OpenCurrentEntryInZip() must be called
-  // beforehand.
+  // The value in |Entry::original_size| cannot be trusted, so the real size of
+  // the uncompressed contents can be different. |max_read_bytes| limits the
+  // amount of memory used to carry the entry.
   //
-  // This function preserves the timestamp of the original entry. If that
-  // timestamp is not valid, the timestamp will be set to the current time.
-  bool ExtractCurrentEntryIntoDirectory(
-      const base::FilePath& output_directory_path) const;
-
-  // Extracts the current entry by writing directly to a platform file.
-  // Does not close the file. Returns true on success.
-  bool ExtractCurrentEntryToFile(base::File* file) const;
-
-  // Extracts the current entry into memory. If the current entry is a directory
-  // the |output| parameter is set to the empty string. If the current entry is
-  // a file, the |output| parameter is filled with its contents. Returns true on
-  // success. OpenCurrentEntryInZip() must be called beforehand.
-  // Note: the |output| parameter can be filled with a big amount of data, avoid
-  // passing it around by value, but by reference or pointer.
-  // Note: the value returned by EntryInfo::original_size() cannot be
-  // trusted, so the real size of the uncompressed contents can be different.
-  // Use max_read_bytes to limit the ammount of memory used to carry the entry.
-  // If the real size of the uncompressed data is bigger than max_read_bytes
-  // then false is returned. |max_read_bytes| must be non-zero.
-  bool ExtractCurrentEntryToString(
-      size_t max_read_bytes,
-      std::string* output) const;
-
-  // Returns the current entry info. Returns NULL if the current entry is
-  // not yet opened. OpenCurrentEntryInZip() must be called beforehand.
-  EntryInfo* current_entry_info() const {
-    return current_entry_info_.get();
+  // Returns true if the entire content is read without error. If the content is
+  // bigger than |max_read_bytes|, this function returns false and |*output| is
+  // filled with |max_read_bytes| of data. If an error occurs, this function
+  // returns false and |*output| contains the content extracted so far, which
+  // might be garbage data.
+  //
+  // Precondition: Next() returned a non-null Entry.
+  bool ExtractCurrentEntryToString(uint64_t max_read_bytes,
+                                   std::string* output) const;
+
+  bool ExtractCurrentEntryToString(std::string* output) const {
+    return ExtractCurrentEntryToString(
+        base::checked_cast<uint64_t>(output->max_size()), output);
   }
 
-  // Returns the number of entries in the zip file.
-  // Open() must be called beforehand.
+  // Returns the number of entries in the ZIP archive.
+  //
+  // Precondition: one of the Open() methods returned true.
   int num_entries() const { return num_entries_; }
 
  private:
@@ -234,46 +272,131 @@ class ZipReader {
   // Resets the internal state.
   void Reset();
 
+  // Opens the current entry in the ZIP archive. On success, returns true and
+  // updates the current entry state |entry_|.
+  //
+  // Note that there is no matching CloseEntry(). The current entry state is
+  // reset automatically as needed.
+  bool OpenEntry();
+
+  // Normalizes the given path passed as UTF-16 string piece. Sets entry_.path,
+  // entry_.is_directory and entry_.is_unsafe.
+  void Normalize(base::StringPiece16 in);
+
+  // Runs the ListenerCallback at a throttled rate.
+  void ReportProgress(ListenerCallback listener_callback, uint64_t bytes) const;
+
+  // Extracts |num_bytes_to_extract| bytes of the current entry to |delegate|,
+  // starting from the beginning of the entry calling |listener_callback| if
+  // its supplied.
+  //
+  // Returns true if the entire file was extracted without error.
+  //
+  // Precondition: Next() returned a non-null Entry.
+  bool ExtractCurrentEntry(WriterDelegate* delegate,
+                           ListenerCallback listener_callback,
+                           uint64_t num_bytes_to_extract =
+                               std::numeric_limits<uint64_t>::max()) const;
+
   // Extracts a chunk of the file to the target.  Will post a task for the next
   // chunk and success/failure/progress callbacks as necessary.
   void ExtractChunk(base::File target_file,
-                    const SuccessCallback& success_callback,
-                    const FailureCallback& failure_callback,
-                    const ProgressCallback& progress_callback,
+                    SuccessCallback success_callback,
+                    FailureCallback failure_callback,
+                    ProgressCallback progress_callback,
                     const int64_t offset);
 
+  std::string encoding_;
+  std::string password_;
   unzFile zip_file_;
   int num_entries_;
+  int next_index_;
   bool reached_end_;
-  std::unique_ptr<EntryInfo> current_entry_info_;
+  bool ok_;
+  Entry entry_;
 
-  base::WeakPtrFactory<ZipReader> weak_ptr_factory_;
+  // Next time to report progress.
+  mutable base::TimeTicks next_progress_report_time_ = base::TimeTicks::Now();
 
-  DISALLOW_COPY_AND_ASSIGN(ZipReader);
+  // Progress time delta.
+  // TODO(crbug.com/953256) Add this as parameter to the unzip options.
+  base::TimeDelta progress_period_ = base::Milliseconds(1000);
+
+  // Number of bytes read since last progress report callback executed.
+  mutable uint64_t delta_bytes_read_ = 0;
+
+  base::WeakPtrFactory<ZipReader> weak_ptr_factory_{this};
 };
 
-// A writer delegate that writes to a given File.
+// A writer delegate that writes to a given File. It is recommended that this
+// file be initially empty.
 class FileWriterDelegate : public WriterDelegate {
  public:
+  // Constructs a FileWriterDelegate that manipulates |file|. The delegate will
+  // not own |file|, therefore the caller must guarantee |file| will outlive the
+  // delegate.
   explicit FileWriterDelegate(base::File* file);
 
-  // Truncates the file to the number of bytes written.
-  ~FileWriterDelegate() override;
+  // Constructs a FileWriterDelegate that takes ownership of |file|.
+  explicit FileWriterDelegate(base::File owned_file);
 
-  // WriterDelegate methods:
+  FileWriterDelegate(const FileWriterDelegate&) = delete;
+  FileWriterDelegate& operator=(const FileWriterDelegate&) = delete;
 
-  // Seeks to the beginning of the file, returning false if the seek fails.
+  ~FileWriterDelegate() override;
+
+  // Returns true if the file handle passed to the constructor is valid.
   bool PrepareOutput() override;
 
   // Writes |num_bytes| bytes of |data| to the file, returning false on error or
   // if not all bytes could be written.
   bool WriteBytes(const char* data, int num_bytes) override;
 
- private:
-  base::File* file_;
-  int64_t file_length_;
+  // Sets the last-modified time of the data.
+  void SetTimeModified(const base::Time& time) override;
+
+  // On POSIX systems, sets the file to be executable if the source file was
+  // executable.
+  void SetPosixFilePermissions(int mode) override;
 
-  DISALLOW_COPY_AND_ASSIGN(FileWriterDelegate);
+  // Empties the file to avoid leaving garbage data in it.
+  void OnError() override;
+
+  // Gets the number of bytes written into the file.
+  int64_t file_length() { return file_length_; }
+
+ protected:
+  // The delegate can optionally own the file it modifies, in which case
+  // owned_file_ is set and file_ is an alias for owned_file_.
+  base::File owned_file_;
+
+  // The file the delegate modifies.
+  base::File* const file_ = &owned_file_;
+
+  int64_t file_length_ = 0;
+};
+
+// A writer delegate that creates and writes a file at a given path. This does
+// not overwrite any existing file.
+class FilePathWriterDelegate : public FileWriterDelegate {
+ public:
+  explicit FilePathWriterDelegate(base::FilePath output_file_path);
+
+  FilePathWriterDelegate(const FilePathWriterDelegate&) = delete;
+  FilePathWriterDelegate& operator=(const FilePathWriterDelegate&) = delete;
+
+  ~FilePathWriterDelegate() override;
+
+  // Creates the output file and any necessary intermediate directories. Does
+  // not overwrite any existing file, and returns false if the output file
+  // cannot be created because another file conflicts with it.
+  bool PrepareOutput() override;
+
+  // Deletes the output file.
+  void OnError() override;
+
+ private:
+  const base::FilePath output_file_path_;
 };
 
 }  // namespace zip
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/zip_reader_unittest.cc b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/zip_reader_unittest.cc
index 4e023dc28..6086c97c4 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/zip_reader_unittest.cc
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/zip_reader_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2011 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -8,28 +8,38 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <set>
+#include <iterator>
 #include <string>
+#include <vector>
 
-#include "base/bind.h"
+#include "base/check.h"
 #include "base/files/file.h"
+#include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
-#include "base/logging.h"
-#include "base/macros.h"
-#include "base/md5.h"
+#include "base/functional/bind.h"
+#include "base/hash/md5.h"
+#include "base/i18n/time_formatting.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
+#include "base/strings/string_piece.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/test/bind.h"
+#include "base/test/task_environment.h"
 #include "base/time/time.h"
+#include "build/build_config.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
+#include "third_party/icu/source/i18n/unicode/timezone.h"
 #include "third_party/zlib/google/zip_internal.h"
 
-using ::testing::Return;
 using ::testing::_;
+using ::testing::ElementsAre;
+using ::testing::ElementsAreArray;
+using ::testing::Return;
+using ::testing::SizeIs;
 
 namespace {
 
@@ -37,10 +47,7 @@ const static std::string kQuuxExpectedMD5 = "d1ae4ac8a17a0e09317113ab284b57a6";
 
 class FileWrapper {
  public:
-  typedef enum {
-    READ_ONLY,
-    READ_WRITE
-  } AccessMode;
+  typedef enum { READ_ONLY, READ_WRITE } AccessMode;
 
   FileWrapper(const base::FilePath& path, AccessMode mode) {
     int flags = base::File::FLAG_READ;
@@ -71,18 +78,13 @@ class MockUnzipListener : public base::SupportsWeakPtr<MockUnzipListener> {
       : success_calls_(0),
         failure_calls_(0),
         progress_calls_(0),
-        current_progress_(0) {
-  }
+        current_progress_(0) {}
 
   // Success callback for async functions.
-  void OnUnzipSuccess() {
-    success_calls_++;
-  }
+  void OnUnzipSuccess() { success_calls_++; }
 
   // Failure callback for async functions.
-  void OnUnzipFailure() {
-    failure_calls_++;
-  }
+  void OnUnzipFailure() { failure_calls_++; }
 
   // Progress callback for async functions.
   void OnUnzipProgress(int64_t progress) {
@@ -108,340 +110,375 @@ class MockWriterDelegate : public zip::WriterDelegate {
  public:
   MOCK_METHOD0(PrepareOutput, bool());
   MOCK_METHOD2(WriteBytes, bool(const char*, int));
+  MOCK_METHOD1(SetTimeModified, void(const base::Time&));
+  MOCK_METHOD1(SetPosixFilePermissions, void(int));
+  MOCK_METHOD0(OnError, void());
 };
 
-}   // namespace
+bool ExtractCurrentEntryToFilePath(zip::ZipReader* reader,
+                                   base::FilePath path) {
+  zip::FilePathWriterDelegate writer(path);
+  return reader->ExtractCurrentEntry(&writer);
+}
+
+const zip::ZipReader::Entry* LocateAndOpenEntry(
+    zip::ZipReader* const reader,
+    const base::FilePath& path_in_zip) {
+  DCHECK(reader);
+  EXPECT_TRUE(reader->ok());
+
+  // The underlying library can do O(1) access, but ZipReader does not expose
+  // that. O(N) access is acceptable for these tests.
+  while (const zip::ZipReader::Entry* const entry = reader->Next()) {
+    EXPECT_TRUE(reader->ok());
+    if (entry->path == path_in_zip)
+      return entry;
+  }
+
+  EXPECT_TRUE(reader->ok());
+  return nullptr;
+}
+
+using Paths = std::vector<base::FilePath>;
+
+}  // namespace
 
 namespace zip {
 
 // Make the test a PlatformTest to setup autorelease pools properly on Mac.
 class ZipReaderTest : public PlatformTest {
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
     PlatformTest::SetUp();
 
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     test_dir_ = temp_dir_.GetPath();
-
-    ASSERT_TRUE(GetTestDataDirectory(&test_data_dir_));
-
-    test_zip_file_ = test_data_dir_.AppendASCII("test.zip");
-    evil_zip_file_ = test_data_dir_.AppendASCII("evil.zip");
-    evil_via_invalid_utf8_zip_file_ = test_data_dir_.AppendASCII(
-        "evil_via_invalid_utf8.zip");
-    evil_via_absolute_file_name_zip_file_ = test_data_dir_.AppendASCII(
-        "evil_via_absolute_file_name.zip");
-
-    test_zip_contents_.insert(base::FilePath(FILE_PATH_LITERAL("foo/")));
-    test_zip_contents_.insert(base::FilePath(FILE_PATH_LITERAL("foo/bar/")));
-    test_zip_contents_.insert(
-        base::FilePath(FILE_PATH_LITERAL("foo/bar/baz.txt")));
-    test_zip_contents_.insert(
-        base::FilePath(FILE_PATH_LITERAL("foo/bar/quux.txt")));
-    test_zip_contents_.insert(
-        base::FilePath(FILE_PATH_LITERAL("foo/bar.txt")));
-    test_zip_contents_.insert(base::FilePath(FILE_PATH_LITERAL("foo.txt")));
-    test_zip_contents_.insert(
-        base::FilePath(FILE_PATH_LITERAL("foo/bar/.hidden")));
   }
 
-  virtual void TearDown() {
-    PlatformTest::TearDown();
+  static base::FilePath GetTestDataDirectory() {
+    base::FilePath path;
+    CHECK(base::PathService::Get(base::DIR_SOURCE_ROOT, &path));
+    return path.AppendASCII("third_party")
+        .AppendASCII("zlib")
+        .AppendASCII("google")
+        .AppendASCII("test")
+        .AppendASCII("data");
   }
 
-  bool GetTestDataDirectory(base::FilePath* path) {
-    bool success = PathService::Get(base::DIR_SOURCE_ROOT, path);
-    EXPECT_TRUE(success);
-    if (!success)
-      return false;
-    *path = path->AppendASCII("third_party");
-    *path = path->AppendASCII("zlib");
-    *path = path->AppendASCII("google");
-    *path = path->AppendASCII("test");
-    *path = path->AppendASCII("data");
-    return true;
-  }
+  static Paths GetPaths(const base::FilePath& zip_path,
+                        base::StringPiece encoding = {}) {
+    Paths paths;
+
+    if (ZipReader reader; reader.Open(zip_path)) {
+      if (!encoding.empty())
+        reader.SetEncoding(std::string(encoding));
+
+      while (const ZipReader::Entry* const entry = reader.Next()) {
+        EXPECT_TRUE(reader.ok());
+        paths.push_back(entry->path);
+      }
 
-  bool CompareFileAndMD5(const base::FilePath& path,
-                         const std::string expected_md5) {
-    // Read the output file and compute the MD5.
-    std::string output;
-    if (!base::ReadFileToString(path, &output))
-      return false;
-    const std::string md5 = base::MD5String(output);
-    return expected_md5 == md5;
+      EXPECT_TRUE(reader.ok());
+    }
+
+    return paths;
   }
 
   // The path to temporary directory used to contain the test operations.
   base::FilePath test_dir_;
   // The path to the test data directory where test.zip etc. are located.
-  base::FilePath test_data_dir_;
+  const base::FilePath data_dir_ = GetTestDataDirectory();
   // The path to test.zip in the test data directory.
-  base::FilePath test_zip_file_;
-  // The path to evil.zip in the test data directory.
-  base::FilePath evil_zip_file_;
-  // The path to evil_via_invalid_utf8.zip in the test data directory.
-  base::FilePath evil_via_invalid_utf8_zip_file_;
-  // The path to evil_via_absolute_file_name.zip in the test data directory.
-  base::FilePath evil_via_absolute_file_name_zip_file_;
-  std::set<base::FilePath> test_zip_contents_;
-
+  const base::FilePath test_zip_file_ = data_dir_.AppendASCII("test.zip");
+  const Paths test_zip_contents_ = {
+      base::FilePath(FILE_PATH_LITERAL("foo/")),
+      base::FilePath(FILE_PATH_LITERAL("foo/bar/")),
+      base::FilePath(FILE_PATH_LITERAL("foo/bar/baz.txt")),
+      base::FilePath(FILE_PATH_LITERAL("foo/bar/quux.txt")),
+      base::FilePath(FILE_PATH_LITERAL("foo/bar.txt")),
+      base::FilePath(FILE_PATH_LITERAL("foo.txt")),
+      base::FilePath(FILE_PATH_LITERAL("foo/bar/.hidden")),
+  };
   base::ScopedTempDir temp_dir_;
-
-  base::MessageLoop message_loop_;
+  base::test::TaskEnvironment task_environment_;
 };
 
 TEST_F(ZipReaderTest, Open_ValidZipFile) {
   ZipReader reader;
-  ASSERT_TRUE(reader.Open(test_zip_file_));
+  EXPECT_TRUE(reader.Open(test_zip_file_));
+  EXPECT_TRUE(reader.ok());
 }
 
 TEST_F(ZipReaderTest, Open_ValidZipPlatformFile) {
   ZipReader reader;
+  EXPECT_FALSE(reader.ok());
   FileWrapper zip_fd_wrapper(test_zip_file_, FileWrapper::READ_ONLY);
-  ASSERT_TRUE(reader.OpenFromPlatformFile(zip_fd_wrapper.platform_file()));
+  EXPECT_TRUE(reader.OpenFromPlatformFile(zip_fd_wrapper.platform_file()));
+  EXPECT_TRUE(reader.ok());
 }
 
 TEST_F(ZipReaderTest, Open_NonExistentFile) {
   ZipReader reader;
-  ASSERT_FALSE(reader.Open(test_data_dir_.AppendASCII("nonexistent.zip")));
+  EXPECT_FALSE(reader.ok());
+  EXPECT_FALSE(reader.Open(data_dir_.AppendASCII("nonexistent.zip")));
+  EXPECT_FALSE(reader.ok());
 }
 
 TEST_F(ZipReaderTest, Open_ExistentButNonZipFile) {
   ZipReader reader;
-  ASSERT_FALSE(reader.Open(test_data_dir_.AppendASCII("create_test_zip.sh")));
+  EXPECT_FALSE(reader.ok());
+  EXPECT_FALSE(reader.Open(data_dir_.AppendASCII("create_test_zip.sh")));
+  EXPECT_FALSE(reader.ok());
 }
 
-// Iterate through the contents in the test zip file, and compare that the
-// contents collected from the zip reader matches the expected contents.
+TEST_F(ZipReaderTest, Open_EmptyFile) {
+  ZipReader reader;
+  EXPECT_FALSE(reader.ok());
+  EXPECT_FALSE(reader.Open(data_dir_.AppendASCII("empty.zip")));
+  EXPECT_FALSE(reader.ok());
+}
+
+// Iterate through the contents in the test ZIP archive, and compare that the
+// contents collected from the ZipReader matches the expected contents.
 TEST_F(ZipReaderTest, Iteration) {
-  std::set<base::FilePath> actual_contents;
+  Paths actual_contents;
   ZipReader reader;
-  ASSERT_TRUE(reader.Open(test_zip_file_));
-  while (reader.HasMore()) {
-    ASSERT_TRUE(reader.OpenCurrentEntryInZip());
-    actual_contents.insert(reader.current_entry_info()->file_path());
-    ASSERT_TRUE(reader.AdvanceToNextEntry());
+  EXPECT_FALSE(reader.ok());
+  EXPECT_TRUE(reader.Open(test_zip_file_));
+  EXPECT_TRUE(reader.ok());
+  while (const ZipReader::Entry* const entry = reader.Next()) {
+    EXPECT_TRUE(reader.ok());
+    actual_contents.push_back(entry->path);
   }
-  EXPECT_FALSE(reader.AdvanceToNextEntry());  // Shouldn't go further.
-  EXPECT_EQ(test_zip_contents_.size(),
-            static_cast<size_t>(reader.num_entries()));
-  EXPECT_EQ(test_zip_contents_.size(), actual_contents.size());
-  EXPECT_EQ(test_zip_contents_, actual_contents);
+
+  EXPECT_TRUE(reader.ok());
+  EXPECT_FALSE(reader.Next());  // Shouldn't go further.
+  EXPECT_TRUE(reader.ok());
+
+  EXPECT_THAT(actual_contents, SizeIs(reader.num_entries()));
+  EXPECT_THAT(actual_contents, ElementsAreArray(test_zip_contents_));
 }
 
-// Open the test zip file from a file descriptor, iterate through its contents,
-// and compare that they match the expected contents.
+// Open the test ZIP archive from a file descriptor, iterate through its
+// contents, and compare that they match the expected contents.
 TEST_F(ZipReaderTest, PlatformFileIteration) {
-  std::set<base::FilePath> actual_contents;
+  Paths actual_contents;
   ZipReader reader;
   FileWrapper zip_fd_wrapper(test_zip_file_, FileWrapper::READ_ONLY);
-  ASSERT_TRUE(reader.OpenFromPlatformFile(zip_fd_wrapper.platform_file()));
-  while (reader.HasMore()) {
-    ASSERT_TRUE(reader.OpenCurrentEntryInZip());
-    actual_contents.insert(reader.current_entry_info()->file_path());
-    ASSERT_TRUE(reader.AdvanceToNextEntry());
+  EXPECT_TRUE(reader.OpenFromPlatformFile(zip_fd_wrapper.platform_file()));
+  EXPECT_TRUE(reader.ok());
+  while (const ZipReader::Entry* const entry = reader.Next()) {
+    EXPECT_TRUE(reader.ok());
+    actual_contents.push_back(entry->path);
   }
-  EXPECT_FALSE(reader.AdvanceToNextEntry());  // Shouldn't go further.
-  EXPECT_EQ(test_zip_contents_.size(),
-            static_cast<size_t>(reader.num_entries()));
-  EXPECT_EQ(test_zip_contents_.size(), actual_contents.size());
-  EXPECT_EQ(test_zip_contents_, actual_contents);
+
+  EXPECT_TRUE(reader.ok());
+  EXPECT_FALSE(reader.Next());  // Shouldn't go further.
+  EXPECT_TRUE(reader.ok());
+
+  EXPECT_THAT(actual_contents, SizeIs(reader.num_entries()));
+  EXPECT_THAT(actual_contents, ElementsAreArray(test_zip_contents_));
 }
 
-TEST_F(ZipReaderTest, LocateAndOpenEntry_ValidFile) {
-  std::set<base::FilePath> actual_contents;
+TEST_F(ZipReaderTest, RegularFile) {
   ZipReader reader;
   ASSERT_TRUE(reader.Open(test_zip_file_));
   base::FilePath target_path(FILE_PATH_LITERAL("foo/bar/quux.txt"));
-  ASSERT_TRUE(reader.LocateAndOpenEntry(target_path));
-  EXPECT_EQ(target_path, reader.current_entry_info()->file_path());
+
+  const ZipReader::Entry* entry = LocateAndOpenEntry(&reader, target_path);
+  ASSERT_TRUE(entry);
+
+  EXPECT_EQ(target_path, entry->path);
+  EXPECT_EQ(13527, entry->original_size);
+  EXPECT_EQ("2009-05-29 06:22:20.000",
+            base::UnlocalizedTimeFormatWithPattern(entry->last_modified,
+                                                   "y-MM-dd HH:mm:ss.SSS",
+                                                   icu::TimeZone::getGMT()));
+  EXPECT_FALSE(entry->is_unsafe);
+  EXPECT_FALSE(entry->is_directory);
 }
 
-TEST_F(ZipReaderTest, LocateAndOpenEntry_NonExistentFile) {
-  std::set<base::FilePath> actual_contents;
+TEST_F(ZipReaderTest, DotDotFile) {
   ZipReader reader;
-  ASSERT_TRUE(reader.Open(test_zip_file_));
-  base::FilePath target_path(FILE_PATH_LITERAL("nonexistent.txt"));
-  ASSERT_FALSE(reader.LocateAndOpenEntry(target_path));
-  EXPECT_EQ(NULL, reader.current_entry_info());
+  ASSERT_TRUE(reader.Open(data_dir_.AppendASCII("evil.zip")));
+  base::FilePath target_path(FILE_PATH_LITERAL(
+      "UP/levilevilevilevilevilevilevilevilevilevilevilevil"));
+  const ZipReader::Entry* entry = LocateAndOpenEntry(&reader, target_path);
+  ASSERT_TRUE(entry);
+  EXPECT_EQ(target_path, entry->path);
+  EXPECT_FALSE(entry->is_unsafe);
+  EXPECT_FALSE(entry->is_directory);
 }
 
-TEST_F(ZipReaderTest, ExtractCurrentEntryToFilePath_RegularFile) {
+TEST_F(ZipReaderTest, InvalidUTF8File) {
   ZipReader reader;
-  ASSERT_TRUE(reader.Open(test_zip_file_));
-  base::FilePath target_path(FILE_PATH_LITERAL("foo/bar/quux.txt"));
-  ASSERT_TRUE(reader.LocateAndOpenEntry(target_path));
-  ASSERT_TRUE(reader.ExtractCurrentEntryToFilePath(
-      test_dir_.AppendASCII("quux.txt")));
-  // Read the output file ans compute the MD5.
-  std::string output;
-  ASSERT_TRUE(base::ReadFileToString(test_dir_.AppendASCII("quux.txt"),
-                                     &output));
-  const std::string md5 = base::MD5String(output);
-  EXPECT_EQ(kQuuxExpectedMD5, md5);
-  // quux.txt should be larger than kZipBufSize so that we can exercise
-  // the loop in ExtractCurrentEntry().
-  EXPECT_LT(static_cast<size_t>(internal::kZipBufSize), output.size());
+  ASSERT_TRUE(reader.Open(data_dir_.AppendASCII("evil_via_invalid_utf8.zip")));
+  base::FilePath target_path = base::FilePath::FromUTF8Unsafe(".�.�evil.txt");
+  const ZipReader::Entry* entry = LocateAndOpenEntry(&reader, target_path);
+  ASSERT_TRUE(entry);
+  EXPECT_EQ(target_path, entry->path);
+  EXPECT_FALSE(entry->is_unsafe);
+  EXPECT_FALSE(entry->is_directory);
 }
 
-TEST_F(ZipReaderTest, PlatformFileExtractCurrentEntryToFilePath_RegularFile) {
-  ZipReader reader;
-  FileWrapper zip_fd_wrapper(test_zip_file_, FileWrapper::READ_ONLY);
-  ASSERT_TRUE(reader.OpenFromPlatformFile(zip_fd_wrapper.platform_file()));
-  base::FilePath target_path(FILE_PATH_LITERAL("foo/bar/quux.txt"));
-  ASSERT_TRUE(reader.LocateAndOpenEntry(target_path));
-  ASSERT_TRUE(reader.ExtractCurrentEntryToFilePath(
-      test_dir_.AppendASCII("quux.txt")));
-  // Read the output file and compute the MD5.
-  std::string output;
-  ASSERT_TRUE(base::ReadFileToString(test_dir_.AppendASCII("quux.txt"),
-                                     &output));
-  const std::string md5 = base::MD5String(output);
-  EXPECT_EQ(kQuuxExpectedMD5, md5);
-  // quux.txt should be larger than kZipBufSize so that we can exercise
-  // the loop in ExtractCurrentEntry().
-  EXPECT_LT(static_cast<size_t>(internal::kZipBufSize), output.size());
+// By default, file paths in ZIPs are interpreted as UTF-8. But in this test,
+// the ZIP archive contains file paths that are actually encoded in Shift JIS.
+// The SJIS-encoded paths are thus wrongly interpreted as UTF-8, resulting in
+// garbled paths. Invalid UTF-8 sequences are safely converted to the
+// replacement character �.
+TEST_F(ZipReaderTest, EncodingSjisAsUtf8) {
+  EXPECT_THAT(
+      GetPaths(data_dir_.AppendASCII("SJIS Bug 846195.zip")),
+      ElementsAre(
+          base::FilePath::FromUTF8Unsafe("�V�����t�H���_/SJIS_835C_��.txt"),
+          base::FilePath::FromUTF8Unsafe(
+              "�V�����t�H���_/�V�����e�L�X�g �h�L�������g.txt")));
 }
 
-TEST_F(ZipReaderTest, PlatformFileExtractCurrentEntryToFile_RegularFile) {
-  ZipReader reader;
-  FileWrapper zip_fd_wrapper(test_zip_file_, FileWrapper::READ_ONLY);
-  ASSERT_TRUE(reader.OpenFromPlatformFile(zip_fd_wrapper.platform_file()));
-  base::FilePath target_path(FILE_PATH_LITERAL("foo/bar/quux.txt"));
-  base::FilePath out_path = test_dir_.AppendASCII("quux.txt");
-  FileWrapper out_fd_w(out_path, FileWrapper::READ_WRITE);
-  ASSERT_TRUE(reader.LocateAndOpenEntry(target_path));
-  ASSERT_TRUE(reader.ExtractCurrentEntryToFile(out_fd_w.file()));
-  // Read the output file and compute the MD5.
-  std::string output;
-  ASSERT_TRUE(base::ReadFileToString(out_path, &output));
-  const std::string md5 = base::MD5String(output);
-  EXPECT_EQ(kQuuxExpectedMD5, md5);
-  // quux.txt should be larger than kZipBufSize so that we can exercise
-  // the loop in ExtractCurrentEntry().
-  EXPECT_LT(static_cast<size_t>(internal::kZipBufSize), output.size());
+// In this test, SJIS-encoded paths are interpreted as Code Page 1252. This
+// results in garbled paths. Note the presence of C1 control codes U+0090 and
+// U+0081 in the garbled paths.
+TEST_F(ZipReaderTest, EncodingSjisAs1252) {
+  EXPECT_THAT(
+      GetPaths(data_dir_.AppendASCII("SJIS Bug 846195.zip"), "windows-1252"),
+      ElementsAre(base::FilePath::FromUTF8Unsafe(
+                      "\u0090V‚µ‚¢ƒtƒHƒ‹ƒ_/SJIS_835C_ƒ�.txt"),
+                  base::FilePath::FromUTF8Unsafe(
+                      "\u0090V‚µ‚¢ƒtƒHƒ‹ƒ_/\u0090V‚µ‚¢ƒeƒLƒXƒg "
+                      "ƒhƒLƒ…ƒ\u0081ƒ“ƒg.txt")));
 }
 
-TEST_F(ZipReaderTest, ExtractCurrentEntryToFilePath_Directory) {
-  ZipReader reader;
-  ASSERT_TRUE(reader.Open(test_zip_file_));
-  base::FilePath target_path(FILE_PATH_LITERAL("foo/"));
-  ASSERT_TRUE(reader.LocateAndOpenEntry(target_path));
-  ASSERT_TRUE(reader.ExtractCurrentEntryToFilePath(
-      test_dir_.AppendASCII("foo")));
-  // The directory should be created.
-  ASSERT_TRUE(base::DirectoryExists(test_dir_.AppendASCII("foo")));
+// In this test, SJIS-encoded paths are interpreted as Code Page 866. This
+// results in garbled paths.
+TEST_F(ZipReaderTest, EncodingSjisAsIbm866) {
+  EXPECT_THAT(
+      GetPaths(data_dir_.AppendASCII("SJIS Bug 846195.zip"), "IBM866"),
+      ElementsAre(
+          base::FilePath::FromUTF8Unsafe("РVВ╡ВвГtГHГЛГ_/SJIS_835C_Г�.txt"),
+          base::FilePath::FromUTF8Unsafe(
+              "РVВ╡ВвГtГHГЛГ_/РVВ╡ВвГeГLГXГg ГhГLГЕГБГУГg.txt")));
 }
 
-TEST_F(ZipReaderTest, ExtractCurrentEntryIntoDirectory_RegularFile) {
-  ZipReader reader;
-  ASSERT_TRUE(reader.Open(test_zip_file_));
-  base::FilePath target_path(FILE_PATH_LITERAL("foo/bar/quux.txt"));
-  ASSERT_TRUE(reader.LocateAndOpenEntry(target_path));
-  ASSERT_TRUE(reader.ExtractCurrentEntryIntoDirectory(test_dir_));
-  // Sub directories should be created.
-  ASSERT_TRUE(base::DirectoryExists(test_dir_.AppendASCII("foo/bar")));
-  // And the file should be created.
-  std::string output;
-  ASSERT_TRUE(base::ReadFileToString(
-      test_dir_.AppendASCII("foo/bar/quux.txt"), &output));
-  const std::string md5 = base::MD5String(output);
-  EXPECT_EQ(kQuuxExpectedMD5, md5);
+// Tests that SJIS-encoded paths are correctly converted to Unicode.
+TEST_F(ZipReaderTest, EncodingSjis) {
+  EXPECT_THAT(
+      GetPaths(data_dir_.AppendASCII("SJIS Bug 846195.zip"), "Shift_JIS"),
+      ElementsAre(
+          base::FilePath::FromUTF8Unsafe("新��フォルダ/SJIS_835C_ソ.txt"),
+          base::FilePath::FromUTF8Unsafe(
+              "新��フォルダ/新��テキスト ドキュメント.txt")));
 }
 
-TEST_F(ZipReaderTest, current_entry_info_RegularFile) {
+TEST_F(ZipReaderTest, AbsoluteFile) {
   ZipReader reader;
-  ASSERT_TRUE(reader.Open(test_zip_file_));
-  base::FilePath target_path(FILE_PATH_LITERAL("foo/bar/quux.txt"));
-  ASSERT_TRUE(reader.LocateAndOpenEntry(target_path));
-  ZipReader::EntryInfo* current_entry_info = reader.current_entry_info();
-
-  EXPECT_EQ(target_path, current_entry_info->file_path());
-  EXPECT_EQ(13527, current_entry_info->original_size());
-
-  // The expected time stamp: 2009-05-29 06:22:20
-  base::Time::Exploded exploded = {};  // Zero-clear.
-  current_entry_info->last_modified().LocalExplode(&exploded);
-  EXPECT_EQ(2009, exploded.year);
-  EXPECT_EQ(5, exploded.month);
-  EXPECT_EQ(29, exploded.day_of_month);
-  EXPECT_EQ(6, exploded.hour);
-  EXPECT_EQ(22, exploded.minute);
-  EXPECT_EQ(20, exploded.second);
-  EXPECT_EQ(0, exploded.millisecond);
-
-  EXPECT_FALSE(current_entry_info->is_unsafe());
-  EXPECT_FALSE(current_entry_info->is_directory());
+  ASSERT_TRUE(
+      reader.Open(data_dir_.AppendASCII("evil_via_absolute_file_name.zip")));
+  base::FilePath target_path(FILE_PATH_LITERAL("ROOT/evil.txt"));
+  const ZipReader::Entry* entry = LocateAndOpenEntry(&reader, target_path);
+  ASSERT_TRUE(entry);
+  EXPECT_EQ(target_path, entry->path);
+  EXPECT_FALSE(entry->is_unsafe);
+  EXPECT_FALSE(entry->is_directory);
 }
 
-TEST_F(ZipReaderTest, current_entry_info_DotDotFile) {
+TEST_F(ZipReaderTest, Directory) {
   ZipReader reader;
-  ASSERT_TRUE(reader.Open(evil_zip_file_));
-  base::FilePath target_path(FILE_PATH_LITERAL(
-      "../levilevilevilevilevilevilevilevilevilevilevilevil"));
-  ASSERT_TRUE(reader.LocateAndOpenEntry(target_path));
-  ZipReader::EntryInfo* current_entry_info = reader.current_entry_info();
-  EXPECT_EQ(target_path, current_entry_info->file_path());
-
-  // This file is unsafe because of ".." in the file name.
-  EXPECT_TRUE(current_entry_info->is_unsafe());
-  EXPECT_FALSE(current_entry_info->is_directory());
+  ASSERT_TRUE(reader.Open(test_zip_file_));
+  base::FilePath target_path(FILE_PATH_LITERAL("foo/bar/"));
+  const ZipReader::Entry* entry = LocateAndOpenEntry(&reader, target_path);
+  ASSERT_TRUE(entry);
+  EXPECT_EQ(target_path, entry->path);
+  // The directory size should be zero.
+  EXPECT_EQ(0, entry->original_size);
+  EXPECT_EQ("2009-05-31 15:49:52.000",
+            base::UnlocalizedTimeFormatWithPattern(entry->last_modified,
+                                                   "y-MM-dd HH:mm:ss.SSS",
+                                                   icu::TimeZone::getGMT()));
+  EXPECT_FALSE(entry->is_unsafe);
+  EXPECT_TRUE(entry->is_directory);
 }
 
-TEST_F(ZipReaderTest, current_entry_info_InvalidUTF8File) {
+TEST_F(ZipReaderTest, EncryptedFile_WrongPassword) {
   ZipReader reader;
-  ASSERT_TRUE(reader.Open(evil_via_invalid_utf8_zip_file_));
-  // The evil file is the 2nd file in the zip file.
-  // We cannot locate by the file name ".\x80.\\evil.txt",
-  // as FilePath may internally convert the string.
-  ASSERT_TRUE(reader.AdvanceToNextEntry());
-  ASSERT_TRUE(reader.OpenCurrentEntryInZip());
-  ZipReader::EntryInfo* current_entry_info = reader.current_entry_info();
+  ASSERT_TRUE(reader.Open(data_dir_.AppendASCII("Different Encryptions.zip")));
+  reader.SetPassword("wrong password");
 
-  // This file is unsafe because of invalid UTF-8 in the file name.
-  EXPECT_TRUE(current_entry_info->is_unsafe());
-  EXPECT_FALSE(current_entry_info->is_directory());
-}
+  {
+    const ZipReader::Entry* entry = reader.Next();
+    ASSERT_TRUE(entry);
+    EXPECT_EQ(base::FilePath::FromASCII("ClearText.txt"), entry->path);
+    EXPECT_FALSE(entry->is_directory);
+    EXPECT_FALSE(entry->is_encrypted);
+    std::string contents = "dummy";
+    EXPECT_TRUE(reader.ExtractCurrentEntryToString(&contents));
+    EXPECT_EQ("This is not encrypted.\n", contents);
+  }
 
-TEST_F(ZipReaderTest, current_entry_info_AbsoluteFile) {
-  ZipReader reader;
-  ASSERT_TRUE(reader.Open(evil_via_absolute_file_name_zip_file_));
-  base::FilePath target_path(FILE_PATH_LITERAL("/evil.txt"));
-  ASSERT_TRUE(reader.LocateAndOpenEntry(target_path));
-  ZipReader::EntryInfo* current_entry_info = reader.current_entry_info();
-  EXPECT_EQ(target_path, current_entry_info->file_path());
+  for (const base::StringPiece path : {
+           "Encrypted AES-128.txt",
+           "Encrypted AES-192.txt",
+           "Encrypted AES-256.txt",
+           "Encrypted ZipCrypto.txt",
+       }) {
+    const ZipReader::Entry* entry = reader.Next();
+    ASSERT_TRUE(entry);
+    EXPECT_EQ(base::FilePath::FromASCII(path), entry->path);
+    EXPECT_FALSE(entry->is_directory);
+    EXPECT_TRUE(entry->is_encrypted);
+    std::string contents = "dummy";
+    EXPECT_FALSE(reader.ExtractCurrentEntryToString(&contents));
+  }
 
-  // This file is unsafe because of the absolute file name.
-  EXPECT_TRUE(current_entry_info->is_unsafe());
-  EXPECT_FALSE(current_entry_info->is_directory());
+  EXPECT_FALSE(reader.Next());
+  EXPECT_TRUE(reader.ok());
 }
 
-TEST_F(ZipReaderTest, current_entry_info_Directory) {
+TEST_F(ZipReaderTest, EncryptedFile_RightPassword) {
   ZipReader reader;
-  ASSERT_TRUE(reader.Open(test_zip_file_));
-  base::FilePath target_path(FILE_PATH_LITERAL("foo/bar/"));
-  ASSERT_TRUE(reader.LocateAndOpenEntry(target_path));
-  ZipReader::EntryInfo* current_entry_info = reader.current_entry_info();
+  ASSERT_TRUE(reader.Open(data_dir_.AppendASCII("Different Encryptions.zip")));
+  reader.SetPassword("password");
 
-  EXPECT_EQ(base::FilePath(FILE_PATH_LITERAL("foo/bar/")),
-            current_entry_info->file_path());
-  // The directory size should be zero.
-  EXPECT_EQ(0, current_entry_info->original_size());
+  {
+    const ZipReader::Entry* entry = reader.Next();
+    ASSERT_TRUE(entry);
+    EXPECT_EQ(base::FilePath::FromASCII("ClearText.txt"), entry->path);
+    EXPECT_FALSE(entry->is_directory);
+    EXPECT_FALSE(entry->is_encrypted);
+    std::string contents = "dummy";
+    EXPECT_TRUE(reader.ExtractCurrentEntryToString(&contents));
+    EXPECT_EQ("This is not encrypted.\n", contents);
+  }
+
+  // TODO(crbug.com/1296838) Support AES encryption.
+  for (const base::StringPiece path : {
+           "Encrypted AES-128.txt",
+           "Encrypted AES-192.txt",
+           "Encrypted AES-256.txt",
+       }) {
+    const ZipReader::Entry* entry = reader.Next();
+    ASSERT_TRUE(entry);
+    EXPECT_EQ(base::FilePath::FromASCII(path), entry->path);
+    EXPECT_FALSE(entry->is_directory);
+    EXPECT_TRUE(entry->is_encrypted);
+    std::string contents = "dummy";
+    EXPECT_FALSE(reader.ExtractCurrentEntryToString(&contents));
+    EXPECT_EQ("", contents);
+  }
 
-  // The expected time stamp: 2009-05-31 15:49:52
-  base::Time::Exploded exploded = {};  // Zero-clear.
-  current_entry_info->last_modified().LocalExplode(&exploded);
-  EXPECT_EQ(2009, exploded.year);
-  EXPECT_EQ(5, exploded.month);
-  EXPECT_EQ(31, exploded.day_of_month);
-  EXPECT_EQ(15, exploded.hour);
-  EXPECT_EQ(49, exploded.minute);
-  EXPECT_EQ(52, exploded.second);
-  EXPECT_EQ(0, exploded.millisecond);
+  {
+    const ZipReader::Entry* entry = reader.Next();
+    ASSERT_TRUE(entry);
+    EXPECT_EQ(base::FilePath::FromASCII("Encrypted ZipCrypto.txt"),
+              entry->path);
+    EXPECT_FALSE(entry->is_directory);
+    EXPECT_TRUE(entry->is_encrypted);
+    std::string contents = "dummy";
+    EXPECT_TRUE(reader.ExtractCurrentEntryToString(&contents));
+    EXPECT_EQ("This is encrypted with ZipCrypto.\n", contents);
+  }
 
-  EXPECT_FALSE(current_entry_info->is_unsafe());
-  EXPECT_TRUE(current_entry_info->is_directory());
+  EXPECT_FALSE(reader.Next());
+  EXPECT_TRUE(reader.ok());
 }
 
 // Verifies that the ZipReader class can extract a file from a zip archive
@@ -464,17 +501,17 @@ TEST_F(ZipReaderTest, OpenFromString) {
       "\x50\x75\x78\x0b\x00\x01\x04\x8e\xf0\x00\x00\x04\x88\x13\x00\x00"
       "\x50\x4b\x05\x06\x00\x00\x00\x00\x01\x00\x01\x00\x4e\x00\x00\x00"
       "\x52\x00\x00\x00\x00\x00";
-  std::string data(kTestData, arraysize(kTestData));
+  std::string data(kTestData, std::size(kTestData));
   ZipReader reader;
   ASSERT_TRUE(reader.OpenFromString(data));
   base::FilePath target_path(FILE_PATH_LITERAL("test.txt"));
-  ASSERT_TRUE(reader.LocateAndOpenEntry(target_path));
-  ASSERT_TRUE(reader.ExtractCurrentEntryToFilePath(
-      test_dir_.AppendASCII("test.txt")));
+  ASSERT_TRUE(LocateAndOpenEntry(&reader, target_path));
+  ASSERT_TRUE(ExtractCurrentEntryToFilePath(&reader,
+                                            test_dir_.AppendASCII("test.txt")));
 
   std::string actual;
-  ASSERT_TRUE(base::ReadFileToString(
-      test_dir_.AppendASCII("test.txt"), &actual));
+  ASSERT_TRUE(
+      base::ReadFileToString(test_dir_.AppendASCII("test.txt"), &actual));
   EXPECT_EQ(std::string("This is a test.\n"), actual);
 }
 
@@ -486,15 +523,13 @@ TEST_F(ZipReaderTest, ExtractToFileAsync_RegularFile) {
   base::FilePath target_file = test_dir_.AppendASCII("quux.txt");
   base::FilePath target_path(FILE_PATH_LITERAL("foo/bar/quux.txt"));
   ASSERT_TRUE(reader.Open(test_zip_file_));
-  ASSERT_TRUE(reader.LocateAndOpenEntry(target_path));
+  ASSERT_TRUE(LocateAndOpenEntry(&reader, target_path));
   reader.ExtractCurrentEntryToFilePathAsync(
       target_file,
-      base::Bind(&MockUnzipListener::OnUnzipSuccess,
-                 listener.AsWeakPtr()),
-      base::Bind(&MockUnzipListener::OnUnzipFailure,
-                 listener.AsWeakPtr()),
-      base::Bind(&MockUnzipListener::OnUnzipProgress,
-                 listener.AsWeakPtr()));
+      base::BindOnce(&MockUnzipListener::OnUnzipSuccess, listener.AsWeakPtr()),
+      base::BindOnce(&MockUnzipListener::OnUnzipFailure, listener.AsWeakPtr()),
+      base::BindRepeating(&MockUnzipListener::OnUnzipProgress,
+                          listener.AsWeakPtr()));
 
   EXPECT_EQ(0, listener.success_calls());
   EXPECT_EQ(0, listener.failure_calls());
@@ -507,8 +542,8 @@ TEST_F(ZipReaderTest, ExtractToFileAsync_RegularFile) {
   EXPECT_LE(1, listener.progress_calls());
 
   std::string output;
-  ASSERT_TRUE(base::ReadFileToString(test_dir_.AppendASCII("quux.txt"),
-                                     &output));
+  ASSERT_TRUE(
+      base::ReadFileToString(test_dir_.AppendASCII("quux.txt"), &output));
   const std::string md5 = base::MD5String(output);
   EXPECT_EQ(kQuuxExpectedMD5, md5);
 
@@ -518,6 +553,103 @@ TEST_F(ZipReaderTest, ExtractToFileAsync_RegularFile) {
   EXPECT_EQ(file_size, listener.current_progress());
 }
 
+TEST_F(ZipReaderTest, ExtractToFileAsync_Encrypted_NoPassword) {
+  MockUnzipListener listener;
+
+  ZipReader reader;
+  ASSERT_TRUE(reader.Open(data_dir_.AppendASCII("Different Encryptions.zip")));
+  ASSERT_TRUE(LocateAndOpenEntry(
+      &reader, base::FilePath::FromASCII("Encrypted ZipCrypto.txt")));
+  const base::FilePath target_path = test_dir_.AppendASCII("extracted");
+  reader.ExtractCurrentEntryToFilePathAsync(
+      target_path,
+      base::BindOnce(&MockUnzipListener::OnUnzipSuccess, listener.AsWeakPtr()),
+      base::BindOnce(&MockUnzipListener::OnUnzipFailure, listener.AsWeakPtr()),
+      base::BindRepeating(&MockUnzipListener::OnUnzipProgress,
+                          listener.AsWeakPtr()));
+
+  EXPECT_EQ(0, listener.success_calls());
+  EXPECT_EQ(0, listener.failure_calls());
+  EXPECT_EQ(0, listener.progress_calls());
+
+  base::RunLoop().RunUntilIdle();
+
+  EXPECT_EQ(0, listener.success_calls());
+  EXPECT_EQ(1, listener.failure_calls());
+  EXPECT_LE(1, listener.progress_calls());
+
+  // The extracted file contains rubbish data.
+  // We probably shouldn't even look at it.
+  std::string contents;
+  ASSERT_TRUE(base::ReadFileToString(target_path, &contents));
+  EXPECT_NE("", contents);
+  EXPECT_EQ(contents.size(), listener.current_progress());
+}
+
+TEST_F(ZipReaderTest, ExtractToFileAsync_Encrypted_RightPassword) {
+  MockUnzipListener listener;
+
+  ZipReader reader;
+  reader.SetPassword("password");
+  ASSERT_TRUE(reader.Open(data_dir_.AppendASCII("Different Encryptions.zip")));
+  ASSERT_TRUE(LocateAndOpenEntry(
+      &reader, base::FilePath::FromASCII("Encrypted ZipCrypto.txt")));
+  const base::FilePath target_path = test_dir_.AppendASCII("extracted");
+  reader.ExtractCurrentEntryToFilePathAsync(
+      target_path,
+      base::BindOnce(&MockUnzipListener::OnUnzipSuccess, listener.AsWeakPtr()),
+      base::BindOnce(&MockUnzipListener::OnUnzipFailure, listener.AsWeakPtr()),
+      base::BindRepeating(&MockUnzipListener::OnUnzipProgress,
+                          listener.AsWeakPtr()));
+
+  EXPECT_EQ(0, listener.success_calls());
+  EXPECT_EQ(0, listener.failure_calls());
+  EXPECT_EQ(0, listener.progress_calls());
+
+  base::RunLoop().RunUntilIdle();
+
+  EXPECT_EQ(1, listener.success_calls());
+  EXPECT_EQ(0, listener.failure_calls());
+  EXPECT_LE(1, listener.progress_calls());
+
+  std::string contents;
+  ASSERT_TRUE(base::ReadFileToString(target_path, &contents));
+  EXPECT_EQ("This is encrypted with ZipCrypto.\n", contents);
+  EXPECT_EQ(contents.size(), listener.current_progress());
+}
+
+TEST_F(ZipReaderTest, ExtractToFileAsync_WrongCrc) {
+  MockUnzipListener listener;
+
+  ZipReader reader;
+  ASSERT_TRUE(reader.Open(data_dir_.AppendASCII("Wrong CRC.zip")));
+  ASSERT_TRUE(
+      LocateAndOpenEntry(&reader, base::FilePath::FromASCII("Corrupted.txt")));
+  const base::FilePath target_path = test_dir_.AppendASCII("extracted");
+  reader.ExtractCurrentEntryToFilePathAsync(
+      target_path,
+      base::BindOnce(&MockUnzipListener::OnUnzipSuccess, listener.AsWeakPtr()),
+      base::BindOnce(&MockUnzipListener::OnUnzipFailure, listener.AsWeakPtr()),
+      base::BindRepeating(&MockUnzipListener::OnUnzipProgress,
+                          listener.AsWeakPtr()));
+
+  EXPECT_EQ(0, listener.success_calls());
+  EXPECT_EQ(0, listener.failure_calls());
+  EXPECT_EQ(0, listener.progress_calls());
+
+  base::RunLoop().RunUntilIdle();
+
+  EXPECT_EQ(0, listener.success_calls());
+  EXPECT_EQ(1, listener.failure_calls());
+  EXPECT_LE(1, listener.progress_calls());
+
+  std::string contents;
+  ASSERT_TRUE(base::ReadFileToString(target_path, &contents));
+  EXPECT_EQ("This file has been changed after its CRC was computed.\n",
+            contents);
+  EXPECT_EQ(contents.size(), listener.current_progress());
+}
+
 // Verifies that the asynchronous extraction to a file works.
 TEST_F(ZipReaderTest, ExtractToFileAsync_Directory) {
   MockUnzipListener listener;
@@ -526,15 +658,13 @@ TEST_F(ZipReaderTest, ExtractToFileAsync_Directory) {
   base::FilePath target_file = test_dir_.AppendASCII("foo");
   base::FilePath target_path(FILE_PATH_LITERAL("foo/"));
   ASSERT_TRUE(reader.Open(test_zip_file_));
-  ASSERT_TRUE(reader.LocateAndOpenEntry(target_path));
+  ASSERT_TRUE(LocateAndOpenEntry(&reader, target_path));
   reader.ExtractCurrentEntryToFilePathAsync(
       target_file,
-      base::Bind(&MockUnzipListener::OnUnzipSuccess,
-                 listener.AsWeakPtr()),
-      base::Bind(&MockUnzipListener::OnUnzipFailure,
-                 listener.AsWeakPtr()),
-      base::Bind(&MockUnzipListener::OnUnzipProgress,
-                 listener.AsWeakPtr()));
+      base::BindOnce(&MockUnzipListener::OnUnzipSuccess, listener.AsWeakPtr()),
+      base::BindOnce(&MockUnzipListener::OnUnzipFailure, listener.AsWeakPtr()),
+      base::BindRepeating(&MockUnzipListener::OnUnzipProgress,
+                          listener.AsWeakPtr()));
 
   EXPECT_EQ(0, listener.success_calls());
   EXPECT_EQ(0, listener.failure_calls());
@@ -554,7 +684,7 @@ TEST_F(ZipReaderTest, ExtractCurrentEntryToString) {
   // sizes from 0 to 7 bytes respectively, being the contents of each file a
   // substring of "0123456" starting at '0'.
   base::FilePath test_zip_file =
-      test_data_dir_.AppendASCII("test_mismatch_size.zip");
+      data_dir_.AppendASCII("test_mismatch_size.zip");
 
   ZipReader reader;
   std::string contents;
@@ -565,7 +695,7 @@ TEST_F(ZipReaderTest, ExtractCurrentEntryToString) {
 
     base::FilePath file_name = base::FilePath::FromUTF8Unsafe(
         base::StringPrintf("%d.txt", static_cast<int>(i)));
-    ASSERT_TRUE(reader.LocateAndOpenEntry(file_name));
+    ASSERT_TRUE(LocateAndOpenEntry(&reader, file_name));
 
     if (i > 1) {
       // Off by one byte read limit: must fail.
@@ -575,16 +705,88 @@ TEST_F(ZipReaderTest, ExtractCurrentEntryToString) {
     if (i > 0) {
       // Exact byte read limit: must pass.
       EXPECT_TRUE(reader.ExtractCurrentEntryToString(i, &contents));
-      EXPECT_EQ(i, contents.size());
-      EXPECT_EQ(0, memcmp(contents.c_str(), "0123456", i));
+      EXPECT_EQ(std::string(base::StringPiece("0123456", i)), contents);
     }
 
     // More than necessary byte read limit: must pass.
-    EXPECT_TRUE(reader.ExtractCurrentEntryToString(16, &contents));
-    EXPECT_EQ(i, contents.size());
-    EXPECT_EQ(0, memcmp(contents.c_str(), "0123456", i));
+    EXPECT_TRUE(reader.ExtractCurrentEntryToString(&contents));
+    EXPECT_EQ(std::string(base::StringPiece("0123456", i)), contents);
+  }
+  reader.Close();
+}
+
+TEST_F(ZipReaderTest, ExtractPartOfCurrentEntry) {
+  // test_mismatch_size.zip contains files with names from 0.txt to 7.txt with
+  // sizes from 0 to 7 bytes respectively, being the contents of each file a
+  // substring of "0123456" starting at '0'.
+  base::FilePath test_zip_file =
+      data_dir_.AppendASCII("test_mismatch_size.zip");
+
+  ZipReader reader;
+  std::string contents;
+  ASSERT_TRUE(reader.Open(test_zip_file));
+
+  base::FilePath file_name0 = base::FilePath::FromUTF8Unsafe("0.txt");
+  ASSERT_TRUE(LocateAndOpenEntry(&reader, file_name0));
+  EXPECT_TRUE(reader.ExtractCurrentEntryToString(0, &contents));
+  EXPECT_EQ("", contents);
+  EXPECT_TRUE(reader.ExtractCurrentEntryToString(1, &contents));
+  EXPECT_EQ("", contents);
+
+  base::FilePath file_name1 = base::FilePath::FromUTF8Unsafe("1.txt");
+  ASSERT_TRUE(LocateAndOpenEntry(&reader, file_name1));
+  EXPECT_TRUE(reader.ExtractCurrentEntryToString(0, &contents));
+  EXPECT_EQ("", contents);
+  EXPECT_TRUE(reader.ExtractCurrentEntryToString(1, &contents));
+  EXPECT_EQ("0", contents);
+  EXPECT_TRUE(reader.ExtractCurrentEntryToString(2, &contents));
+  EXPECT_EQ("0", contents);
+
+  base::FilePath file_name4 = base::FilePath::FromUTF8Unsafe("4.txt");
+  ASSERT_TRUE(LocateAndOpenEntry(&reader, file_name4));
+  EXPECT_TRUE(reader.ExtractCurrentEntryToString(0, &contents));
+  EXPECT_EQ("", contents);
+  EXPECT_FALSE(reader.ExtractCurrentEntryToString(2, &contents));
+  EXPECT_EQ("01", contents);
+  EXPECT_TRUE(reader.ExtractCurrentEntryToString(4, &contents));
+  EXPECT_EQ("0123", contents);
+  // Checks that entire file is extracted and function returns true when
+  // |max_read_bytes| is larger than file size.
+  EXPECT_TRUE(reader.ExtractCurrentEntryToString(5, &contents));
+  EXPECT_EQ("0123", contents);
+
+  reader.Close();
+}
+
+TEST_F(ZipReaderTest, ExtractPosixPermissions) {
+  base::ScopedTempDir temp_dir;
+  ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
+
+  ZipReader reader;
+  ASSERT_TRUE(reader.Open(data_dir_.AppendASCII("test_posix_permissions.zip")));
+  for (auto entry : {"0.txt", "1.txt", "2.txt", "3.txt"}) {
+    ASSERT_TRUE(LocateAndOpenEntry(&reader, base::FilePath::FromASCII(entry)));
+    FilePathWriterDelegate delegate(temp_dir.GetPath().AppendASCII(entry));
+    ASSERT_TRUE(reader.ExtractCurrentEntry(&delegate));
   }
   reader.Close();
+
+#if defined(OS_POSIX)
+  // This assumes a umask of at least 0400.
+  int mode = 0;
+  EXPECT_TRUE(base::GetPosixFilePermissions(
+      temp_dir.GetPath().AppendASCII("0.txt"), &mode));
+  EXPECT_EQ(mode & 0700, 0700);
+  EXPECT_TRUE(base::GetPosixFilePermissions(
+      temp_dir.GetPath().AppendASCII("1.txt"), &mode));
+  EXPECT_EQ(mode & 0700, 0600);
+  EXPECT_TRUE(base::GetPosixFilePermissions(
+      temp_dir.GetPath().AppendASCII("2.txt"), &mode));
+  EXPECT_EQ(mode & 0700, 0700);
+  EXPECT_TRUE(base::GetPosixFilePermissions(
+      temp_dir.GetPath().AppendASCII("3.txt"), &mode));
+  EXPECT_EQ(mode & 0700, 0600);
+#endif
 }
 
 // This test exposes http://crbug.com/430959, at least on OS X
@@ -601,32 +803,30 @@ TEST_F(ZipReaderTest, DISABLED_LeakDetectionTest) {
 TEST_F(ZipReaderTest, ExtractCurrentEntryPrepareFailure) {
   testing::StrictMock<MockWriterDelegate> mock_writer;
 
-  EXPECT_CALL(mock_writer, PrepareOutput())
-      .WillOnce(Return(false));
+  EXPECT_CALL(mock_writer, PrepareOutput()).WillOnce(Return(false));
 
   base::FilePath target_path(FILE_PATH_LITERAL("foo/bar/quux.txt"));
   ZipReader reader;
 
   ASSERT_TRUE(reader.Open(test_zip_file_));
-  ASSERT_TRUE(reader.LocateAndOpenEntry(target_path));
+  ASSERT_TRUE(LocateAndOpenEntry(&reader, target_path));
   ASSERT_FALSE(reader.ExtractCurrentEntry(&mock_writer));
 }
 
-// Test that when WriterDelegate::WriteBytes returns false, no other methods on
-// the delegate are called and the extraction fails.
+// Test that when WriterDelegate::WriteBytes returns false, only the OnError
+// method on the delegate is called and the extraction fails.
 TEST_F(ZipReaderTest, ExtractCurrentEntryWriteBytesFailure) {
   testing::StrictMock<MockWriterDelegate> mock_writer;
 
-  EXPECT_CALL(mock_writer, PrepareOutput())
-      .WillOnce(Return(true));
-  EXPECT_CALL(mock_writer, WriteBytes(_, _))
-      .WillOnce(Return(false));
+  EXPECT_CALL(mock_writer, PrepareOutput()).WillOnce(Return(true));
+  EXPECT_CALL(mock_writer, WriteBytes(_, _)).WillOnce(Return(false));
+  EXPECT_CALL(mock_writer, OnError());
 
   base::FilePath target_path(FILE_PATH_LITERAL("foo/bar/quux.txt"));
   ZipReader reader;
 
   ASSERT_TRUE(reader.Open(test_zip_file_));
-  ASSERT_TRUE(reader.LocateAndOpenEntry(target_path));
+  ASSERT_TRUE(LocateAndOpenEntry(&reader, target_path));
   ASSERT_FALSE(reader.ExtractCurrentEntry(&mock_writer));
 }
 
@@ -634,59 +834,94 @@ TEST_F(ZipReaderTest, ExtractCurrentEntryWriteBytesFailure) {
 TEST_F(ZipReaderTest, ExtractCurrentEntrySuccess) {
   testing::StrictMock<MockWriterDelegate> mock_writer;
 
-  EXPECT_CALL(mock_writer, PrepareOutput())
-      .WillOnce(Return(true));
-  EXPECT_CALL(mock_writer, WriteBytes(_, _))
-      .WillRepeatedly(Return(true));
+  EXPECT_CALL(mock_writer, PrepareOutput()).WillOnce(Return(true));
+  EXPECT_CALL(mock_writer, WriteBytes(_, _)).WillRepeatedly(Return(true));
+  EXPECT_CALL(mock_writer, SetPosixFilePermissions(_));
+  EXPECT_CALL(mock_writer, SetTimeModified(_));
 
   base::FilePath target_path(FILE_PATH_LITERAL("foo/bar/quux.txt"));
   ZipReader reader;
 
   ASSERT_TRUE(reader.Open(test_zip_file_));
-  ASSERT_TRUE(reader.LocateAndOpenEntry(target_path));
+  ASSERT_TRUE(LocateAndOpenEntry(&reader, target_path));
   ASSERT_TRUE(reader.ExtractCurrentEntry(&mock_writer));
 }
 
+TEST_F(ZipReaderTest, WrongCrc) {
+  ZipReader reader;
+  ASSERT_TRUE(reader.Open(data_dir_.AppendASCII("Wrong CRC.zip")));
+
+  const ZipReader::Entry* const entry =
+      LocateAndOpenEntry(&reader, base::FilePath::FromASCII("Corrupted.txt"));
+  ASSERT_TRUE(entry);
+
+  std::string contents = "dummy";
+  EXPECT_FALSE(reader.ExtractCurrentEntryToString(&contents));
+  EXPECT_EQ("This file has been changed after its CRC was computed.\n",
+            contents);
+
+  contents = "dummy";
+  EXPECT_FALSE(
+      reader.ExtractCurrentEntryToString(entry->original_size + 1, &contents));
+  EXPECT_EQ("This file has been changed after its CRC was computed.\n",
+            contents);
+
+  contents = "dummy";
+  EXPECT_FALSE(
+      reader.ExtractCurrentEntryToString(entry->original_size, &contents));
+  EXPECT_EQ("This file has been changed after its CRC was computed.\n",
+            contents);
+
+  contents = "dummy";
+  EXPECT_FALSE(
+      reader.ExtractCurrentEntryToString(entry->original_size - 1, &contents));
+  EXPECT_EQ("This file has been changed after its CRC was computed.", contents);
+}
+
 class FileWriterDelegateTest : public ::testing::Test {
  protected:
   void SetUp() override {
     ASSERT_TRUE(base::CreateTemporaryFile(&temp_file_path_));
-    file_.Initialize(temp_file_path_, (base::File::FLAG_CREATE_ALWAYS |
-                                       base::File::FLAG_READ |
-                                       base::File::FLAG_WRITE |
-                                       base::File::FLAG_TEMPORARY |
-                                       base::File::FLAG_DELETE_ON_CLOSE));
+    file_.Initialize(temp_file_path_,
+                     (base::File::FLAG_CREATE_ALWAYS | base::File::FLAG_READ |
+                      base::File::FLAG_WRITE | base::File::FLAG_WIN_TEMPORARY |
+                      base::File::FLAG_DELETE_ON_CLOSE));
     ASSERT_TRUE(file_.IsValid());
   }
 
-  // Writes data to the file, leaving the current position at the end of the
-  // write.
-  void PopulateFile() {
-    static const char kSomeData[] = "this sure is some data.";
-    static const size_t kSomeDataLen = sizeof(kSomeData) - 1;
-    ASSERT_NE(-1LL, file_.Write(0LL, kSomeData, kSomeDataLen));
-  }
-
   base::FilePath temp_file_path_;
   base::File file_;
 };
 
-TEST_F(FileWriterDelegateTest, WriteToStartAndTruncate) {
-  // Write stuff and advance.
-  PopulateFile();
+TEST_F(FileWriterDelegateTest, WriteToEnd) {
+  const std::string payload = "This is the actualy payload data.\n";
+
+  {
+    FileWriterDelegate writer(&file_);
+    EXPECT_EQ(0, writer.file_length());
+    ASSERT_TRUE(writer.PrepareOutput());
+    ASSERT_TRUE(writer.WriteBytes(payload.data(), payload.size()));
+    EXPECT_EQ(payload.size(), writer.file_length());
+  }
+
+  EXPECT_EQ(payload.size(), file_.GetLength());
+}
+
+TEST_F(FileWriterDelegateTest, EmptyOnError) {
+  const std::string payload = "This is the actualy payload data.\n";
 
-  // This should rewind, write, then truncate.
-  static const char kSomeData[] = "short";
-  static const int kSomeDataLen = sizeof(kSomeData) - 1;
   {
     FileWriterDelegate writer(&file_);
+    EXPECT_EQ(0, writer.file_length());
     ASSERT_TRUE(writer.PrepareOutput());
-    ASSERT_TRUE(writer.WriteBytes(kSomeData, kSomeDataLen));
+    ASSERT_TRUE(writer.WriteBytes(payload.data(), payload.size()));
+    EXPECT_EQ(payload.size(), writer.file_length());
+    EXPECT_EQ(payload.size(), file_.GetLength());
+    writer.OnError();
+    EXPECT_EQ(0, writer.file_length());
   }
-  ASSERT_EQ(kSomeDataLen, file_.GetLength());
-  char buf[kSomeDataLen] = {};
-  ASSERT_EQ(kSomeDataLen, file_.Read(0LL, buf, kSomeDataLen));
-  ASSERT_EQ(std::string(kSomeData), std::string(buf, kSomeDataLen));
+
+  EXPECT_EQ(0, file_.GetLength());
 }
 
 }  // namespace zip
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/zip_unittest.cc b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/zip_unittest.cc
index 2d969d7d9..d0fc02fd9 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/zip_unittest.cc
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/zip_unittest.cc
@@ -1,12 +1,15 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2011 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 #include <stdint.h>
 
-#include <set>
+#include <iomanip>
+#include <limits>
 #include <string>
+#include <unordered_map>
+#include <unordered_set>
 #include <vector>
 
 #include "base/files/file.h"
@@ -14,24 +17,217 @@
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
+#include "base/functional/bind.h"
+#include "base/logging.h"
 #include "base/path_service.h"
+#include "base/strings/strcat.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
+#include "base/test/bind.h"
+#include "base/time/time.h"
 #include "build/build_config.h"
+#include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 #include "third_party/zlib/google/zip.h"
+#include "third_party/zlib/google/zip_internal.h"
 #include "third_party/zlib/google/zip_reader.h"
 
+// Convenience macro to create a file path from a string literal.
+#define FP(path) base::FilePath(FILE_PATH_LITERAL(path))
+
 namespace {
 
+using testing::UnorderedElementsAre;
+using testing::UnorderedElementsAreArray;
+
+std::vector<std::string> GetRelativePaths(const base::FilePath& dir,
+                                          base::FileEnumerator::FileType type) {
+  std::vector<std::string> got_paths;
+  base::FileEnumerator files(dir, true, type);
+  for (base::FilePath path = files.Next(); !path.empty(); path = files.Next()) {
+    base::FilePath relative;
+    EXPECT_TRUE(dir.AppendRelativePath(path, &relative));
+    got_paths.push_back(relative.NormalizePathSeparatorsTo('/').AsUTF8Unsafe());
+  }
+
+  EXPECT_EQ(base::File::FILE_OK, files.GetError());
+  return got_paths;
+}
+
+bool CreateFile(const std::string& content,
+                base::FilePath* file_path,
+                base::File* file) {
+  if (!base::CreateTemporaryFile(file_path))
+    return false;
+
+  if (base::WriteFile(*file_path, content.data(), content.size()) == -1)
+    return false;
+
+  *file = base::File(
+      *file_path, base::File::Flags::FLAG_OPEN | base::File::Flags::FLAG_READ);
+  return file->IsValid();
+}
+
+// A WriterDelegate that logs progress once per second.
+class ProgressWriterDelegate : public zip::WriterDelegate {
+ public:
+  explicit ProgressWriterDelegate(int64_t expected_size)
+      : expected_size_(expected_size) {
+    CHECK_GT(expected_size_, 0);
+  }
+
+  bool WriteBytes(const char* data, int num_bytes) override {
+    received_bytes_ += num_bytes;
+    LogProgressIfNecessary();
+    return true;
+  }
+
+  void SetTimeModified(const base::Time& time) override { LogProgress(); }
+
+  int64_t received_bytes() const { return received_bytes_; }
+
+ private:
+  void LogProgressIfNecessary() {
+    const base::TimeTicks now = base::TimeTicks::Now();
+    if (next_progress_report_time_ > now)
+      return;
+
+    next_progress_report_time_ = now + progress_period_;
+    LogProgress();
+  }
+
+  void LogProgress() const {
+    LOG(INFO) << "Unzipping... " << std::setw(3)
+              << (100 * received_bytes_ / expected_size_) << "%";
+  }
+
+  const base::TimeDelta progress_period_ = base::Seconds(1);
+  base::TimeTicks next_progress_report_time_ =
+      base::TimeTicks::Now() + progress_period_;
+  const uint64_t expected_size_;
+  int64_t received_bytes_ = 0;
+};
+
+// A virtual file system containing:
+// /test
+// /test/foo.txt
+// /test/bar/bar1.txt
+// /test/bar/bar2.txt
+// Used to test providing a custom zip::FileAccessor when unzipping.
+class VirtualFileSystem : public zip::FileAccessor {
+ public:
+  static constexpr char kFooContent[] = "This is foo.";
+  static constexpr char kBar1Content[] = "This is bar.";
+  static constexpr char kBar2Content[] = "This is bar too.";
+
+  VirtualFileSystem() {
+    base::FilePath test_dir;
+    base::FilePath foo_txt_path = test_dir.AppendASCII("foo.txt");
+
+    base::FilePath file_path;
+    base::File file;
+    bool success = CreateFile(kFooContent, &file_path, &file);
+    DCHECK(success);
+    files_[foo_txt_path] = std::move(file);
+
+    base::FilePath bar_dir = test_dir.AppendASCII("bar");
+    base::FilePath bar1_txt_path = bar_dir.AppendASCII("bar1.txt");
+    success = CreateFile(kBar1Content, &file_path, &file);
+    DCHECK(success);
+    files_[bar1_txt_path] = std::move(file);
+
+    base::FilePath bar2_txt_path = bar_dir.AppendASCII("bar2.txt");
+    success = CreateFile(kBar2Content, &file_path, &file);
+    DCHECK(success);
+    files_[bar2_txt_path] = std::move(file);
+
+    file_tree_[base::FilePath()] = {{foo_txt_path}, {bar_dir}};
+    file_tree_[bar_dir] = {{bar1_txt_path, bar2_txt_path}};
+    file_tree_[foo_txt_path] = {};
+    file_tree_[bar1_txt_path] = {};
+    file_tree_[bar2_txt_path] = {};
+  }
+
+  VirtualFileSystem(const VirtualFileSystem&) = delete;
+  VirtualFileSystem& operator=(const VirtualFileSystem&) = delete;
+
+  ~VirtualFileSystem() override = default;
+
+ private:
+  bool Open(const zip::Paths paths,
+            std::vector<base::File>* const files) override {
+    DCHECK(files);
+    files->reserve(files->size() + paths.size());
+
+    for (const base::FilePath& path : paths) {
+      const auto it = files_.find(path);
+      if (it == files_.end()) {
+        files->emplace_back();
+      } else {
+        EXPECT_TRUE(it->second.IsValid());
+        files->push_back(std::move(it->second));
+      }
+    }
+
+    return true;
+  }
+
+  bool List(const base::FilePath& path,
+            std::vector<base::FilePath>* const files,
+            std::vector<base::FilePath>* const subdirs) override {
+    DCHECK(!path.IsAbsolute());
+    DCHECK(files);
+    DCHECK(subdirs);
+
+    const auto it = file_tree_.find(path);
+    if (it == file_tree_.end())
+      return false;
+
+    for (const base::FilePath& file : it->second.files) {
+      DCHECK(!file.empty());
+      files->push_back(file);
+    }
+
+    for (const base::FilePath& subdir : it->second.subdirs) {
+      DCHECK(!subdir.empty());
+      subdirs->push_back(subdir);
+    }
+
+    return true;
+  }
+
+  bool GetInfo(const base::FilePath& path, Info* const info) override {
+    DCHECK(!path.IsAbsolute());
+    DCHECK(info);
+
+    if (!file_tree_.count(path))
+      return false;
+
+    info->is_directory = !files_.count(path);
+    info->last_modified =
+        base::Time::FromDoubleT(172097977);  // Some random date.
+
+    return true;
+  }
+
+  struct DirContents {
+    std::vector<base::FilePath> files, subdirs;
+  };
+
+  std::unordered_map<base::FilePath, DirContents> file_tree_;
+  std::unordered_map<base::FilePath, base::File> files_;
+};
+
+// static
+constexpr char VirtualFileSystem::kFooContent[];
+constexpr char VirtualFileSystem::kBar1Content[];
+constexpr char VirtualFileSystem::kBar2Content[];
+
 // Make the test a PlatformTest to setup autorelease pools properly on Mac.
 class ZipTest : public PlatformTest {
  protected:
-  enum ValidYearType {
-    VALID_YEAR,
-    INVALID_YEAR
-  };
+  enum ValidYearType { VALID_YEAR, INVALID_YEAR };
 
   virtual void SetUp() {
     PlatformTest::SetUp();
@@ -51,59 +247,66 @@ class ZipTest : public PlatformTest {
     zip_contents_.insert(zip_path.AppendASCII(".hidden"));
 
     // Include a subset of files in |zip_file_list_| to test ZipFiles().
-    zip_file_list_.push_back(base::FilePath(FILE_PATH_LITERAL("foo.txt")));
-    zip_file_list_.push_back(
-        base::FilePath(FILE_PATH_LITERAL("foo/bar/quux.txt")));
-    zip_file_list_.push_back(
-        base::FilePath(FILE_PATH_LITERAL("foo/bar/.hidden")));
+    zip_file_list_.push_back(FP("foo.txt"));
+    zip_file_list_.push_back(FP("foo/bar/quux.txt"));
+    zip_file_list_.push_back(FP("foo/bar/.hidden"));
   }
 
-  virtual void TearDown() {
-    PlatformTest::TearDown();
-  }
+  virtual void TearDown() { PlatformTest::TearDown(); }
 
-  bool GetTestDataDirectory(base::FilePath* path) {
-    bool success = PathService::Get(base::DIR_SOURCE_ROOT, path);
+  static base::FilePath GetDataDirectory() {
+    base::FilePath path;
+    bool success = base::PathService::Get(base::DIR_SOURCE_ROOT, &path);
     EXPECT_TRUE(success);
-    if (!success)
-      return false;
-    *path = path->AppendASCII("third_party");
-    *path = path->AppendASCII("zlib");
-    *path = path->AppendASCII("google");
-    *path = path->AppendASCII("test");
-    *path = path->AppendASCII("data");
-    return true;
+    return std::move(path)
+        .AppendASCII("third_party")
+        .AppendASCII("zlib")
+        .AppendASCII("google")
+        .AppendASCII("test")
+        .AppendASCII("data");
   }
 
   void TestUnzipFile(const base::FilePath::StringType& filename,
                      bool expect_hidden_files) {
-    base::FilePath test_dir;
-    ASSERT_TRUE(GetTestDataDirectory(&test_dir));
-    TestUnzipFile(test_dir.Append(filename), expect_hidden_files);
+    TestUnzipFile(GetDataDirectory().Append(filename), expect_hidden_files);
   }
 
   void TestUnzipFile(const base::FilePath& path, bool expect_hidden_files) {
-    ASSERT_TRUE(base::PathExists(path)) << "no file " << path.value();
+    ASSERT_TRUE(base::PathExists(path)) << "no file " << path;
     ASSERT_TRUE(zip::Unzip(path, test_dir_));
 
-    base::FileEnumerator files(test_dir_, true,
+    base::FilePath original_dir = GetDataDirectory().AppendASCII("test");
+
+    base::FileEnumerator files(
+        test_dir_, true,
         base::FileEnumerator::FILES | base::FileEnumerator::DIRECTORIES);
-    base::FilePath next_path = files.Next();
+
     size_t count = 0;
-    while (!next_path.value().empty()) {
-      if (next_path.value().find(FILE_PATH_LITERAL(".svn")) ==
-          base::FilePath::StringType::npos) {
-        EXPECT_EQ(zip_contents_.count(next_path), 1U) <<
-            "Couldn't find " << next_path.value();
-        count++;
+    for (base::FilePath unzipped_entry_path = files.Next();
+         !unzipped_entry_path.empty(); unzipped_entry_path = files.Next()) {
+      EXPECT_EQ(zip_contents_.count(unzipped_entry_path), 1U)
+          << "Couldn't find " << unzipped_entry_path;
+      count++;
+
+      if (base::PathExists(unzipped_entry_path) &&
+          !base::DirectoryExists(unzipped_entry_path)) {
+        // It's a file, check its contents are what we zipped.
+        base::FilePath relative_path;
+        ASSERT_TRUE(
+            test_dir_.AppendRelativePath(unzipped_entry_path, &relative_path))
+            << "Cannot append relative path failed, params: '" << test_dir_
+            << "' and '" << unzipped_entry_path << "'";
+        base::FilePath original_path = original_dir.Append(relative_path);
+        EXPECT_TRUE(base::ContentsEqual(original_path, unzipped_entry_path))
+            << "Original file '" << original_path << "' and unzipped file '"
+            << unzipped_entry_path << "' have different contents";
       }
-      next_path = files.Next();
     }
+    EXPECT_EQ(base::File::FILE_OK, files.GetError());
 
     size_t expected_count = 0;
-    for (std::set<base::FilePath>::iterator iter = zip_contents_.begin();
-         iter != zip_contents_.end(); ++iter) {
-      if (expect_hidden_files || iter->BaseName().value()[0] != '.')
+    for (const base::FilePath& path : zip_contents_) {
+      if (expect_hidden_files || path.BaseName().value()[0] != '.')
         ++expected_count;
     }
 
@@ -139,11 +342,11 @@ class ZipTest : public PlatformTest {
     // supports, which is 2 seconds. Note that between this call to Time::Now()
     // and zip::Zip() the clock can advance a bit, hence the use of EXPECT_GE.
     base::Time::Exploded now_parts;
-    base::Time::Now().LocalExplode(&now_parts);
+    base::Time::Now().UTCExplode(&now_parts);
     now_parts.second = now_parts.second & ~1;
     now_parts.millisecond = 0;
     base::Time now_time;
-    EXPECT_TRUE(base::Time::FromLocalExploded(now_parts, &now_time));
+    EXPECT_TRUE(base::Time::FromUTCExploded(now_parts, &now_time));
 
     EXPECT_EQ(1, base::WriteFile(src_file, "1", 1));
     EXPECT_TRUE(base::TouchFile(src_file, base::Time::Now(), test_mtime));
@@ -169,12 +372,23 @@ class ZipTest : public PlatformTest {
   base::ScopedTempDir temp_dir_;
 
   // Hard-coded contents of a known zip file.
-  std::set<base::FilePath> zip_contents_;
+  std::unordered_set<base::FilePath> zip_contents_;
 
   // Hard-coded list of relative paths for a zip file created with ZipFiles.
   std::vector<base::FilePath> zip_file_list_;
 };
 
+TEST_F(ZipTest, UnzipNoSuchFile) {
+  EXPECT_FALSE(zip::Unzip(GetDataDirectory().AppendASCII("No Such File.zip"),
+                          test_dir_));
+  EXPECT_THAT(
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::FILES),
+      UnorderedElementsAre());
+  EXPECT_THAT(
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::DIRECTORIES),
+      UnorderedElementsAre());
+}
+
 TEST_F(ZipTest, Unzip) {
   TestUnzipFile(FILE_PATH_LITERAL("test.zip"), true);
 }
@@ -184,65 +398,639 @@ TEST_F(ZipTest, UnzipUncompressed) {
 }
 
 TEST_F(ZipTest, UnzipEvil) {
-  base::FilePath path;
-  ASSERT_TRUE(GetTestDataDirectory(&path));
-  path = path.AppendASCII("evil.zip");
+  base::FilePath path = GetDataDirectory().AppendASCII("evil.zip");
   // Unzip the zip file into a sub directory of test_dir_ so evil.zip
   // won't create a persistent file outside test_dir_ in case of a
   // failure.
   base::FilePath output_dir = test_dir_.AppendASCII("out");
-  ASSERT_FALSE(zip::Unzip(path, output_dir));
-  base::FilePath evil_file = output_dir;
-  evil_file = evil_file.AppendASCII(
-      "../levilevilevilevilevilevilevilevilevilevilevilevil");
-  ASSERT_FALSE(base::PathExists(evil_file));
+  EXPECT_TRUE(zip::Unzip(path, output_dir));
+  EXPECT_TRUE(base::PathExists(output_dir.AppendASCII(
+      "UP/levilevilevilevilevilevilevilevilevilevilevilevil")));
 }
 
 TEST_F(ZipTest, UnzipEvil2) {
-  base::FilePath path;
-  ASSERT_TRUE(GetTestDataDirectory(&path));
-  // The zip file contains an evil file with invalid UTF-8 in its file
-  // name.
-  path = path.AppendASCII("evil_via_invalid_utf8.zip");
+  // The ZIP file contains a file with invalid UTF-8 in its file name.
+  base::FilePath path =
+      GetDataDirectory().AppendASCII("evil_via_invalid_utf8.zip");
   // See the comment at UnzipEvil() for why we do this.
   base::FilePath output_dir = test_dir_.AppendASCII("out");
-  // This should fail as it contains an evil file.
-  ASSERT_FALSE(zip::Unzip(path, output_dir));
-  base::FilePath evil_file = output_dir;
-  evil_file = evil_file.AppendASCII("../evil.txt");
-  ASSERT_FALSE(base::PathExists(evil_file));
+  ASSERT_TRUE(zip::Unzip(path, output_dir));
+  ASSERT_TRUE(base::PathExists(
+      output_dir.Append(base::FilePath::FromUTF8Unsafe(".�.�evil.txt"))));
+  ASSERT_FALSE(base::PathExists(output_dir.AppendASCII("../evil.txt")));
+}
+
+TEST_F(ZipTest, UnzipWithFilter) {
+  auto filter = base::BindRepeating([](const base::FilePath& path) {
+    return path.BaseName().MaybeAsASCII() == "foo.txt";
+  });
+  ASSERT_TRUE(zip::Unzip(GetDataDirectory().AppendASCII("test.zip"), test_dir_,
+                         {.filter = std::move(filter)}));
+  // Only foo.txt should have been extracted.
+  EXPECT_THAT(
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::FILES),
+      UnorderedElementsAre("foo.txt"));
+  EXPECT_THAT(
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::DIRECTORIES),
+      UnorderedElementsAre());
+}
+
+TEST_F(ZipTest, UnzipEncryptedWithRightPassword) {
+  // TODO(crbug.com/1296838) Also check the AES-encrypted files.
+  auto filter = base::BindRepeating([](const base::FilePath& path) {
+    return !base::StartsWith(path.MaybeAsASCII(), "Encrypted AES");
+  });
+
+  ASSERT_TRUE(zip::Unzip(
+      GetDataDirectory().AppendASCII("Different Encryptions.zip"), test_dir_,
+      {.filter = std::move(filter), .password = "password"}));
+
+  std::string contents;
+  ASSERT_TRUE(base::ReadFileToString(test_dir_.AppendASCII("ClearText.txt"),
+                                     &contents));
+  EXPECT_EQ("This is not encrypted.\n", contents);
+
+  ASSERT_TRUE(base::ReadFileToString(
+      test_dir_.AppendASCII("Encrypted ZipCrypto.txt"), &contents));
+  EXPECT_EQ("This is encrypted with ZipCrypto.\n", contents);
+}
+
+TEST_F(ZipTest, UnzipEncryptedWithWrongPassword) {
+  // TODO(crbug.com/1296838) Also check the AES-encrypted files.
+  auto filter = base::BindRepeating([](const base::FilePath& path) {
+    return !base::StartsWith(path.MaybeAsASCII(), "Encrypted AES");
+  });
+
+  ASSERT_FALSE(zip::Unzip(
+      GetDataDirectory().AppendASCII("Different Encryptions.zip"), test_dir_,
+      {.filter = std::move(filter), .password = "wrong"}));
+
+  std::string contents;
+  ASSERT_TRUE(base::ReadFileToString(test_dir_.AppendASCII("ClearText.txt"),
+                                     &contents));
+  EXPECT_EQ("This is not encrypted.\n", contents);
+
+  // No rubbish file should be left behind.
+  EXPECT_THAT(
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::FILES),
+      UnorderedElementsAre("ClearText.txt"));
+}
+
+TEST_F(ZipTest, UnzipEncryptedWithNoPassword) {
+  // TODO(crbug.com/1296838) Also check the AES-encrypted files.
+  auto filter = base::BindRepeating([](const base::FilePath& path) {
+    return !base::StartsWith(path.MaybeAsASCII(), "Encrypted AES");
+  });
+
+  ASSERT_FALSE(
+      zip::Unzip(GetDataDirectory().AppendASCII("Different Encryptions.zip"),
+                 test_dir_, {.filter = std::move(filter)}));
+
+  std::string contents;
+  ASSERT_TRUE(base::ReadFileToString(test_dir_.AppendASCII("ClearText.txt"),
+                                     &contents));
+  EXPECT_EQ("This is not encrypted.\n", contents);
+
+  // No rubbish file should be left behind.
+  EXPECT_THAT(
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::FILES),
+      UnorderedElementsAre("ClearText.txt"));
+}
+
+TEST_F(ZipTest, UnzipEncryptedContinueOnError) {
+  EXPECT_TRUE(
+      zip::Unzip(GetDataDirectory().AppendASCII("Different Encryptions.zip"),
+                 test_dir_, {.continue_on_error = true}));
+
+  std::string contents;
+  EXPECT_TRUE(base::ReadFileToString(test_dir_.AppendASCII("ClearText.txt"),
+                                     &contents));
+  EXPECT_EQ("This is not encrypted.\n", contents);
+
+  // No rubbish file should be left behind.
+  EXPECT_THAT(
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::FILES),
+      UnorderedElementsAre("ClearText.txt"));
+}
+
+TEST_F(ZipTest, UnzipWrongCrc) {
+  ASSERT_FALSE(
+      zip::Unzip(GetDataDirectory().AppendASCII("Wrong CRC.zip"), test_dir_));
+
+  // No rubbish file should be left behind.
+  EXPECT_THAT(
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::FILES),
+      UnorderedElementsAre());
+}
+
+TEST_F(ZipTest, UnzipRepeatedDirName) {
+  EXPECT_TRUE(zip::Unzip(
+      GetDataDirectory().AppendASCII("Repeated Dir Name.zip"), test_dir_));
+
+  EXPECT_THAT(
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::FILES),
+      UnorderedElementsAre());
+
+  EXPECT_THAT(
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::DIRECTORIES),
+      UnorderedElementsAre("repeated"));
+}
+
+TEST_F(ZipTest, UnzipRepeatedFileName) {
+  EXPECT_FALSE(zip::Unzip(
+      GetDataDirectory().AppendASCII("Repeated File Name.zip"), test_dir_));
+
+  EXPECT_THAT(
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::FILES),
+      UnorderedElementsAre("repeated"));
+
+  std::string contents;
+  EXPECT_TRUE(
+      base::ReadFileToString(test_dir_.AppendASCII("repeated"), &contents));
+  EXPECT_EQ("First file", contents);
+}
+
+TEST_F(ZipTest, UnzipCannotCreateEmptyDir) {
+  EXPECT_FALSE(zip::Unzip(
+      GetDataDirectory().AppendASCII("Empty Dir Same Name As File.zip"),
+      test_dir_));
+
+  EXPECT_THAT(
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::FILES),
+      UnorderedElementsAre("repeated"));
+
+  EXPECT_THAT(
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::DIRECTORIES),
+      UnorderedElementsAre());
+
+  std::string contents;
+  EXPECT_TRUE(
+      base::ReadFileToString(test_dir_.AppendASCII("repeated"), &contents));
+  EXPECT_EQ("First file", contents);
+}
+
+TEST_F(ZipTest, UnzipCannotCreateParentDir) {
+  EXPECT_FALSE(zip::Unzip(
+      GetDataDirectory().AppendASCII("Parent Dir Same Name As File.zip"),
+      test_dir_));
+
+  EXPECT_THAT(
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::FILES),
+      UnorderedElementsAre("repeated"));
+
+  EXPECT_THAT(
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::DIRECTORIES),
+      UnorderedElementsAre());
+
+  std::string contents;
+  EXPECT_TRUE(
+      base::ReadFileToString(test_dir_.AppendASCII("repeated"), &contents));
+  EXPECT_EQ("First file", contents);
+}
+
+// TODO(crbug.com/1311140) Detect and rename reserved file names on Windows.
+TEST_F(ZipTest, UnzipWindowsSpecialNames) {
+  EXPECT_TRUE(
+      zip::Unzip(GetDataDirectory().AppendASCII("Windows Special Names.zip"),
+                 test_dir_, {.continue_on_error = true}));
+
+  std::unordered_set<std::string> want_paths = {
+      "First",
+      "Last",
+      "CLOCK$",
+      " NUL.txt",
+#ifndef OS_WIN
+      "NUL",
+      "NUL ",
+      "NUL.",
+      "NUL .",
+      "NUL.txt",
+      "NUL.tar.gz",
+      "NUL..txt",
+      "NUL...txt",
+      "NUL .txt",
+      "NUL  .txt",
+      "NUL  ..txt",
+#ifndef OS_APPLE
+      "Nul.txt",
+#endif
+      "nul.very long extension",
+      "a/NUL",
+      "CON",
+      "PRN",
+      "AUX",
+      "COM1",
+      "COM2",
+      "COM3",
+      "COM4",
+      "COM5",
+      "COM6",
+      "COM7",
+      "COM8",
+      "COM9",
+      "LPT1",
+      "LPT2",
+      "LPT3",
+      "LPT4",
+      "LPT5",
+      "LPT6",
+      "LPT7",
+      "LPT8",
+      "LPT9",
+#endif
+  };
+
+  const std::vector<std::string> got_paths =
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::FILES);
+
+  for (const std::string& path : got_paths) {
+    const bool ok = want_paths.erase(path);
+
+#ifdef OS_WIN
+    if (!ok) {
+      // See crbug.com/1313991: Different versions of Windows treat these
+      // filenames differently. No hard error here if there is an unexpected
+      // file.
+      LOG(WARNING) << "Found unexpected file: " << std::quoted(path);
+      continue;
+    }
+#else
+    EXPECT_TRUE(ok) << "Found unexpected file: " << std::quoted(path);
+#endif
+
+    std::string contents;
+    EXPECT_TRUE(base::ReadFileToString(test_dir_.AppendASCII(path), &contents));
+    EXPECT_EQ(base::StrCat({"This is: ", path}), contents);
+  }
+
+  for (const std::string& path : want_paths) {
+    EXPECT_TRUE(false) << "Cannot find expected file: " << std::quoted(path);
+  }
+}
+
+TEST_F(ZipTest, UnzipDifferentCases) {
+#if defined(OS_WIN) || defined(OS_APPLE)
+  // Only the first file (with mixed case) is extracted.
+  EXPECT_FALSE(zip::Unzip(GetDataDirectory().AppendASCII(
+                              "Repeated File Name With Different Cases.zip"),
+                          test_dir_));
+
+  EXPECT_THAT(
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::FILES),
+      UnorderedElementsAre("Case"));
+
+  std::string contents;
+  EXPECT_TRUE(base::ReadFileToString(test_dir_.AppendASCII("Case"), &contents));
+  EXPECT_EQ("Mixed case 111", contents);
+#else
+  // All the files are extracted.
+  EXPECT_TRUE(zip::Unzip(GetDataDirectory().AppendASCII(
+                             "Repeated File Name With Different Cases.zip"),
+                         test_dir_));
+
+  EXPECT_THAT(
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::FILES),
+      UnorderedElementsAre("Case", "case", "CASE"));
+
+  std::string contents;
+  EXPECT_TRUE(base::ReadFileToString(test_dir_.AppendASCII("Case"), &contents));
+  EXPECT_EQ("Mixed case 111", contents);
+
+  EXPECT_TRUE(base::ReadFileToString(test_dir_.AppendASCII("case"), &contents));
+  EXPECT_EQ("Lower case 22", contents);
+
+  EXPECT_TRUE(base::ReadFileToString(test_dir_.AppendASCII("CASE"), &contents));
+  EXPECT_EQ("Upper case 3", contents);
+#endif
+}
+
+TEST_F(ZipTest, UnzipDifferentCasesContinueOnError) {
+  EXPECT_TRUE(zip::Unzip(GetDataDirectory().AppendASCII(
+                             "Repeated File Name With Different Cases.zip"),
+                         test_dir_, {.continue_on_error = true}));
+
+  std::string contents;
+
+#if defined(OS_WIN) || defined(OS_APPLE)
+  // Only the first file (with mixed case) has been extracted.
+  EXPECT_THAT(
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::FILES),
+      UnorderedElementsAre("Case"));
+
+  EXPECT_TRUE(base::ReadFileToString(test_dir_.AppendASCII("Case"), &contents));
+  EXPECT_EQ("Mixed case 111", contents);
+#else
+  // All the files have been extracted.
+  EXPECT_THAT(
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::FILES),
+      UnorderedElementsAre("Case", "case", "CASE"));
+
+  EXPECT_TRUE(base::ReadFileToString(test_dir_.AppendASCII("Case"), &contents));
+  EXPECT_EQ("Mixed case 111", contents);
+
+  EXPECT_TRUE(base::ReadFileToString(test_dir_.AppendASCII("case"), &contents));
+  EXPECT_EQ("Lower case 22", contents);
+
+  EXPECT_TRUE(base::ReadFileToString(test_dir_.AppendASCII("CASE"), &contents));
+  EXPECT_EQ("Upper case 3", contents);
+#endif
+}
+
+TEST_F(ZipTest, UnzipMixedPaths) {
+  EXPECT_TRUE(zip::Unzip(GetDataDirectory().AppendASCII("Mixed Paths.zip"),
+                         test_dir_, {.continue_on_error = true}));
+
+  std::unordered_set<std::string> want_paths = {
+#ifdef OS_WIN
+      "Dot",     //
+      "Space→",  //
+#else
+      " ",                        //
+      "AUX",                      // Disappears on Windows
+      "COM1",                     // Disappears on Windows
+      "COM2",                     // Disappears on Windows
+      "COM3",                     // Disappears on Windows
+      "COM4",                     // Disappears on Windows
+      "COM5",                     // Disappears on Windows
+      "COM6",                     // Disappears on Windows
+      "COM7",                     // Disappears on Windows
+      "COM8",                     // Disappears on Windows
+      "COM9",                     // Disappears on Windows
+      "CON",                      // Disappears on Windows
+      "Dot .",                    //
+      "LPT1",                     // Disappears on Windows
+      "LPT2",                     // Disappears on Windows
+      "LPT3",                     // Disappears on Windows
+      "LPT4",                     // Disappears on Windows
+      "LPT5",                     // Disappears on Windows
+      "LPT6",                     // Disappears on Windows
+      "LPT7",                     // Disappears on Windows
+      "LPT8",                     // Disappears on Windows
+      "LPT9",                     // Disappears on Windows
+      "NUL  ..txt",               // Disappears on Windows
+      "NUL  .txt",                // Disappears on Windows
+      "NUL ",                     // Disappears on Windows
+      "NUL .",                    // Disappears on Windows
+      "NUL .txt",                 // Disappears on Windows
+      "NUL",                      // Disappears on Windows
+      "NUL.",                     // Disappears on Windows
+      "NUL...txt",                // Disappears on Windows
+      "NUL..txt",                 // Disappears on Windows
+      "NUL.tar.gz",               // Disappears on Windows
+      "NUL.txt",                  // Disappears on Windows
+      "PRN",                      // Disappears on Windows
+      "Space→ ",                  //
+      "c/NUL",                    // Disappears on Windows
+      "nul.very long extension",  // Disappears on Windows
+#ifndef OS_APPLE
+      "CASE",                     // Conflicts with "Case"
+      "case",                     // Conflicts with "Case"
+#endif
+#endif
+      " NUL.txt",                  //
+      " �Space",                   //
+      "$HOME",                     //
+      "%TMP",                      //
+      "-",                         //
+      "...Three",                  //
+      "..Two",                     //
+      ".One",                      //
+      "Ampersand &",               //
+      "Angle ��",                  //
+      "At @",                      //
+      "Backslash1→�",              //
+      "Backslash3→��Backslash4",   //
+      "Backspace �",               //
+      "Backtick `",                //
+      "Bell �",                    //
+      "CLOCK$",                    //
+      "Caret ^",                   //
+      "Carriage Return �",         //
+      "Case",                      //
+      "Colon �",                   //
+      "Comma ,",                   //
+      "Curly {}",                  //
+      "C�",                        //
+      "C��",                       //
+      "C��Temp",                   //
+      "C��Temp�",                  //
+      "C��Temp�File",              //
+      "Dash -",                    //
+      "Delete \x7F",               //
+      "Dollar $",                  //
+      "Double quote �",            //
+      "Equal =",                   //
+      "Escape �",                  //
+      "Euro €",                    //
+      "Exclamation !",             //
+      "FileOrDir",                 //
+      "First",                     //
+      "Hash #",                    //
+      "Last",                      //
+      "Line Feed �",               //
+      "Percent %",                 //
+      "Pipe �",                    //
+      "Plus +",                    //
+      "Question �",                //
+      "Quote '",                   //
+      "ROOT/At The Top",           //
+      "ROOT/UP/Over The Top",      //
+      "ROOT/dev/null",             //
+      "Round ()",                  //
+      "Semicolon ;",               //
+      "Smile \U0001F642",          //
+      "Square []",                 //
+      "Star �",                    //
+      "String Terminator \u009C",  //
+      "Tab �",                     //
+      "Tilde ~",                   //
+      "UP/One Level Up",           //
+      "UP/UP/Two Levels Up",       //
+      "Underscore _",              //
+      "a/DOT/b",                   //
+      "a/UP/b",                    //
+      "u/v/w/x/y/z",               //
+      "~",                         //
+      "��Backslash2",              //
+      "��server�share�file",       //
+  };
+
+  const std::vector<std::string> got_paths =
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::FILES);
+
+  for (const std::string& path : got_paths) {
+    const bool ok = want_paths.erase(path);
+#ifdef OS_WIN
+    // See crbug.com/1313991: Different versions of Windows treat reserved
+    // Windows filenames differently. No hard error here if there is an
+    // unexpected file.
+    LOG_IF(WARNING, !ok) << "Found unexpected file: " << std::quoted(path);
+#else
+    EXPECT_TRUE(ok) << "Found unexpected file: " << std::quoted(path);
+#endif
+  }
+
+  for (const std::string& path : want_paths) {
+    EXPECT_TRUE(false) << "Cannot find expected file: " << std::quoted(path);
+  }
+
+  EXPECT_THAT(
+      GetRelativePaths(test_dir_, base::FileEnumerator::FileType::DIRECTORIES),
+      UnorderedElementsAreArray({
+          "Empty",
+          "ROOT",
+          "ROOT/Empty",
+          "ROOT/UP",
+          "ROOT/dev",
+          "UP",
+          "UP/UP",
+          "a",
+          "a/DOT",
+          "a/UP",
+          "c",
+          "u",
+          "u/v",
+          "u/v/w",
+          "u/v/w/x",
+          "u/v/w/x/y",
+      }));
+}
+
+TEST_F(ZipTest, UnzipWithDelegates) {
+  auto dir_creator =
+      base::BindLambdaForTesting([this](const base::FilePath& entry_path) {
+        return base::CreateDirectory(test_dir_.Append(entry_path));
+      });
+  auto writer =
+      base::BindLambdaForTesting([this](const base::FilePath& entry_path)
+                                     -> std::unique_ptr<zip::WriterDelegate> {
+        return std::make_unique<zip::FilePathWriterDelegate>(
+            test_dir_.Append(entry_path));
+      });
+
+  base::File file(GetDataDirectory().AppendASCII("test.zip"),
+                  base::File::Flags::FLAG_OPEN | base::File::Flags::FLAG_READ);
+  EXPECT_TRUE(zip::Unzip(file.GetPlatformFile(), writer, dir_creator));
+  base::FilePath dir = test_dir_;
+  base::FilePath dir_foo = dir.AppendASCII("foo");
+  base::FilePath dir_foo_bar = dir_foo.AppendASCII("bar");
+  EXPECT_TRUE(base::PathExists(dir.AppendASCII("foo.txt")));
+  EXPECT_TRUE(base::DirectoryExists(dir_foo));
+  EXPECT_TRUE(base::PathExists(dir_foo.AppendASCII("bar.txt")));
+  EXPECT_TRUE(base::DirectoryExists(dir_foo_bar));
+  EXPECT_TRUE(base::PathExists(dir_foo_bar.AppendASCII(".hidden")));
+  EXPECT_TRUE(base::PathExists(dir_foo_bar.AppendASCII("baz.txt")));
+  EXPECT_TRUE(base::PathExists(dir_foo_bar.AppendASCII("quux.txt")));
+}
+
+TEST_F(ZipTest, UnzipOnlyDirectories) {
+  auto dir_creator =
+      base::BindLambdaForTesting([this](const base::FilePath& entry_path) {
+        return base::CreateDirectory(test_dir_.Append(entry_path));
+      });
+
+  // Always return a null WriterDelegate.
+  auto writer =
+      base::BindLambdaForTesting([](const base::FilePath& entry_path) {
+        return std::unique_ptr<zip::WriterDelegate>();
+      });
+
+  base::File file(GetDataDirectory().AppendASCII("test.zip"),
+                  base::File::Flags::FLAG_OPEN | base::File::Flags::FLAG_READ);
+  EXPECT_TRUE(zip::Unzip(file.GetPlatformFile(), writer, dir_creator,
+                         {.continue_on_error = true}));
+  base::FilePath dir = test_dir_;
+  base::FilePath dir_foo = dir.AppendASCII("foo");
+  base::FilePath dir_foo_bar = dir_foo.AppendASCII("bar");
+  EXPECT_FALSE(base::PathExists(dir.AppendASCII("foo.txt")));
+  EXPECT_TRUE(base::DirectoryExists(dir_foo));
+  EXPECT_FALSE(base::PathExists(dir_foo.AppendASCII("bar.txt")));
+  EXPECT_TRUE(base::DirectoryExists(dir_foo_bar));
+  EXPECT_FALSE(base::PathExists(dir_foo_bar.AppendASCII(".hidden")));
+  EXPECT_FALSE(base::PathExists(dir_foo_bar.AppendASCII("baz.txt")));
+  EXPECT_FALSE(base::PathExists(dir_foo_bar.AppendASCII("quux.txt")));
+}
+
+// Tests that a ZIP archive containing SJIS-encoded file names can be correctly
+// extracted if the encoding is specified.
+TEST_F(ZipTest, UnzipSjis) {
+  ASSERT_TRUE(zip::Unzip(GetDataDirectory().AppendASCII("SJIS Bug 846195.zip"),
+                         test_dir_, {.encoding = "Shift_JIS"}));
+
+  const base::FilePath dir =
+      test_dir_.Append(base::FilePath::FromUTF8Unsafe("新��フォルダ"));
+  EXPECT_TRUE(base::DirectoryExists(dir));
+
+  std::string contents;
+  ASSERT_TRUE(base::ReadFileToString(
+      dir.Append(base::FilePath::FromUTF8Unsafe("SJIS_835C_ソ.txt")),
+      &contents));
+  EXPECT_EQ(
+      "This file's name contains 0x5c (backslash) as the 2nd byte of Japanese "
+      "characater \"\x83\x5c\" when encoded in Shift JIS.",
+      contents);
+
+  ASSERT_TRUE(base::ReadFileToString(dir.Append(base::FilePath::FromUTF8Unsafe(
+                                         "新��テキスト ドキュメント.txt")),
+                                     &contents));
+  EXPECT_EQ("This file name is coded in Shift JIS in the archive.", contents);
+}
+
+// Tests that a ZIP archive containing SJIS-encoded file names can be extracted
+// even if the encoding is not specified. In this case, file names are
+// interpreted as UTF-8, which leads to garbled names where invalid UTF-8
+// sequences are replaced with the character �. Nevertheless, the files are
+// safely extracted and readable.
+TEST_F(ZipTest, UnzipSjisAsUtf8) {
+  ASSERT_TRUE(zip::Unzip(GetDataDirectory().AppendASCII("SJIS Bug 846195.zip"),
+                         test_dir_));
+
+  EXPECT_FALSE(base::DirectoryExists(
+      test_dir_.Append(base::FilePath::FromUTF8Unsafe("新��フォルダ"))));
+
+  const base::FilePath dir =
+      test_dir_.Append(base::FilePath::FromUTF8Unsafe("�V�����t�H���_"));
+  EXPECT_TRUE(base::DirectoryExists(dir));
+
+  std::string contents;
+  ASSERT_TRUE(base::ReadFileToString(
+      dir.Append(base::FilePath::FromUTF8Unsafe("SJIS_835C_��.txt")),
+      &contents));
+  EXPECT_EQ(
+      "This file's name contains 0x5c (backslash) as the 2nd byte of Japanese "
+      "characater \"\x83\x5c\" when encoded in Shift JIS.",
+      contents);
+
+  ASSERT_TRUE(base::ReadFileToString(dir.Append(base::FilePath::FromUTF8Unsafe(
+                                         "�V�����e�L�X�g �h�L�������g.txt")),
+                                     &contents));
+  EXPECT_EQ("This file name is coded in Shift JIS in the archive.", contents);
 }
 
 TEST_F(ZipTest, Zip) {
-  base::FilePath src_dir;
-  ASSERT_TRUE(GetTestDataDirectory(&src_dir));
-  src_dir = src_dir.AppendASCII("test");
+  base::FilePath src_dir = GetDataDirectory().AppendASCII("test");
 
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   base::FilePath zip_file = temp_dir.GetPath().AppendASCII("out.zip");
 
-  EXPECT_TRUE(zip::Zip(src_dir, zip_file, true));
+  EXPECT_TRUE(zip::Zip(src_dir, zip_file, /*include_hidden_files=*/true));
   TestUnzipFile(zip_file, true);
 }
 
 TEST_F(ZipTest, ZipIgnoreHidden) {
-  base::FilePath src_dir;
-  ASSERT_TRUE(GetTestDataDirectory(&src_dir));
-  src_dir = src_dir.AppendASCII("test");
+  base::FilePath src_dir = GetDataDirectory().AppendASCII("test");
 
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   base::FilePath zip_file = temp_dir.GetPath().AppendASCII("out.zip");
 
-  EXPECT_TRUE(zip::Zip(src_dir, zip_file, false));
+  EXPECT_TRUE(zip::Zip(src_dir, zip_file, /*include_hidden_files=*/false));
   TestUnzipFile(zip_file, false);
 }
 
 TEST_F(ZipTest, ZipNonASCIIDir) {
-  base::FilePath src_dir;
-  ASSERT_TRUE(GetTestDataDirectory(&src_dir));
-  src_dir = src_dir.AppendASCII("test");
+  base::FilePath src_dir = GetDataDirectory().AppendASCII("test");
 
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
@@ -278,11 +1066,9 @@ TEST_F(ZipTest, ZipTimeStamp) {
   TestTimeStamp("02 Jan 2038 23:59:58", VALID_YEAR);
 }
 
-#if defined(OS_POSIX)
+#if defined(OS_POSIX) || defined(OS_FUCHSIA)
 TEST_F(ZipTest, ZipFiles) {
-  base::FilePath src_dir;
-  ASSERT_TRUE(GetTestDataDirectory(&src_dir));
-  src_dir = src_dir.AppendASCII("test");
+  base::FilePath src_dir = GetDataDirectory().AppendASCII("test");
 
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
@@ -291,32 +1077,28 @@ TEST_F(ZipTest, ZipFiles) {
   base::File zip_file(zip_name,
                       base::File::FLAG_CREATE | base::File::FLAG_WRITE);
   ASSERT_TRUE(zip_file.IsValid());
-  EXPECT_TRUE(zip::ZipFiles(src_dir, zip_file_list_,
-                            zip_file.GetPlatformFile()));
+  EXPECT_TRUE(
+      zip::ZipFiles(src_dir, zip_file_list_, zip_file.GetPlatformFile()));
   zip_file.Close();
 
   zip::ZipReader reader;
   EXPECT_TRUE(reader.Open(zip_name));
   EXPECT_EQ(zip_file_list_.size(), static_cast<size_t>(reader.num_entries()));
   for (size_t i = 0; i < zip_file_list_.size(); ++i) {
-    EXPECT_TRUE(reader.LocateAndOpenEntry(zip_file_list_[i]));
-    // Check the path in the entry just in case.
-    const zip::ZipReader::EntryInfo* entry_info = reader.current_entry_info();
-    EXPECT_EQ(entry_info->file_path(), zip_file_list_[i]);
+    const zip::ZipReader::Entry* const entry = reader.Next();
+    ASSERT_TRUE(entry);
+    EXPECT_EQ(entry->path, zip_file_list_[i]);
   }
 }
-#endif  // defined(OS_POSIX)
+#endif  // defined(OS_POSIX) || defined(OS_FUCHSIA)
 
 TEST_F(ZipTest, UnzipFilesWithIncorrectSize) {
-  base::FilePath test_data_folder;
-  ASSERT_TRUE(GetTestDataDirectory(&test_data_folder));
-
   // test_mismatch_size.zip contains files with names from 0.txt to 7.txt with
   // sizes from 0 to 7 bytes respectively, but the metadata in the zip file says
   // the uncompressed size is 3 bytes. The ZipReader and minizip code needs to
   // be clever enough to get all the data out.
   base::FilePath test_zip_file =
-      test_data_folder.AppendASCII("test_mismatch_size.zip");
+      GetDataDirectory().AppendASCII("test_mismatch_size.zip");
 
   base::ScopedTempDir scoped_temp_dir;
   ASSERT_TRUE(scoped_temp_dir.CreateUniqueTempDir());
@@ -327,12 +1109,320 @@ TEST_F(ZipTest, UnzipFilesWithIncorrectSize) {
 
   for (int i = 0; i < 8; i++) {
     SCOPED_TRACE(base::StringPrintf("Processing %d.txt", i));
-    base::FilePath file_path = temp_dir.AppendASCII(
-        base::StringPrintf("%d.txt", i));
+    base::FilePath file_path =
+        temp_dir.AppendASCII(base::StringPrintf("%d.txt", i));
     int64_t file_size = -1;
     EXPECT_TRUE(base::GetFileSize(file_path, &file_size));
     EXPECT_EQ(static_cast<int64_t>(i), file_size);
   }
 }
 
+TEST_F(ZipTest, ZipWithFileAccessor) {
+  base::FilePath zip_file;
+  ASSERT_TRUE(base::CreateTemporaryFile(&zip_file));
+  VirtualFileSystem file_accessor;
+  const zip::ZipParams params{.file_accessor = &file_accessor,
+                              .dest_file = zip_file};
+  ASSERT_TRUE(zip::Zip(params));
+
+  base::ScopedTempDir scoped_temp_dir;
+  ASSERT_TRUE(scoped_temp_dir.CreateUniqueTempDir());
+  const base::FilePath& temp_dir = scoped_temp_dir.GetPath();
+  ASSERT_TRUE(zip::Unzip(zip_file, temp_dir));
+  base::FilePath bar_dir = temp_dir.AppendASCII("bar");
+  EXPECT_TRUE(base::DirectoryExists(bar_dir));
+  std::string file_content;
+  EXPECT_TRUE(
+      base::ReadFileToString(temp_dir.AppendASCII("foo.txt"), &file_content));
+  EXPECT_EQ(VirtualFileSystem::kFooContent, file_content);
+  EXPECT_TRUE(
+      base::ReadFileToString(bar_dir.AppendASCII("bar1.txt"), &file_content));
+  EXPECT_EQ(VirtualFileSystem::kBar1Content, file_content);
+  EXPECT_TRUE(
+      base::ReadFileToString(bar_dir.AppendASCII("bar2.txt"), &file_content));
+  EXPECT_EQ(VirtualFileSystem::kBar2Content, file_content);
+}
+
+// Tests progress reporting while zipping files.
+TEST_F(ZipTest, ZipProgress) {
+  base::FilePath src_dir = GetDataDirectory().AppendASCII("test");
+
+  base::ScopedTempDir temp_dir;
+  ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
+  base::FilePath zip_file = temp_dir.GetPath().AppendASCII("out.zip");
+
+  int progress_count = 0;
+  zip::Progress last_progress;
+
+  zip::ProgressCallback progress_callback =
+      base::BindLambdaForTesting([&](const zip::Progress& progress) {
+        progress_count++;
+        LOG(INFO) << "Progress #" << progress_count << ": " << progress;
+
+        // Progress should only go forwards.
+        EXPECT_GE(progress.bytes, last_progress.bytes);
+        EXPECT_GE(progress.files, last_progress.files);
+        EXPECT_GE(progress.directories, last_progress.directories);
+
+        last_progress = progress;
+        return true;
+      });
+
+  EXPECT_TRUE(zip::Zip({.src_dir = src_dir,
+                        .dest_file = zip_file,
+                        .progress_callback = std::move(progress_callback)}));
+
+  EXPECT_EQ(progress_count, 14);
+  EXPECT_EQ(last_progress.bytes, 13546);
+  EXPECT_EQ(last_progress.files, 5);
+  EXPECT_EQ(last_progress.directories, 2);
+
+  TestUnzipFile(zip_file, true);
+}
+
+// Tests throttling of progress reporting while zipping files.
+TEST_F(ZipTest, ZipProgressPeriod) {
+  base::FilePath src_dir = GetDataDirectory().AppendASCII("test");
+
+  base::ScopedTempDir temp_dir;
+  ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
+  base::FilePath zip_file = temp_dir.GetPath().AppendASCII("out.zip");
+
+  int progress_count = 0;
+  zip::Progress last_progress;
+
+  zip::ProgressCallback progress_callback =
+      base::BindLambdaForTesting([&](const zip::Progress& progress) {
+        progress_count++;
+        LOG(INFO) << "Progress #" << progress_count << ": " << progress;
+
+        // Progress should only go forwards.
+        EXPECT_GE(progress.bytes, last_progress.bytes);
+        EXPECT_GE(progress.files, last_progress.files);
+        EXPECT_GE(progress.directories, last_progress.directories);
+
+        last_progress = progress;
+        return true;
+      });
+
+  EXPECT_TRUE(zip::Zip({.src_dir = src_dir,
+                        .dest_file = zip_file,
+                        .progress_callback = std::move(progress_callback),
+                        .progress_period = base::Hours(1)}));
+
+  // We expect only 2 progress reports: the first one, and the last one.
+  EXPECT_EQ(progress_count, 2);
+  EXPECT_EQ(last_progress.bytes, 13546);
+  EXPECT_EQ(last_progress.files, 5);
+  EXPECT_EQ(last_progress.directories, 2);
+
+  TestUnzipFile(zip_file, true);
+}
+
+// Tests cancellation while zipping files.
+TEST_F(ZipTest, ZipCancel) {
+  base::FilePath src_dir = GetDataDirectory().AppendASCII("test");
+
+  base::ScopedTempDir temp_dir;
+  ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
+  base::FilePath zip_file = temp_dir.GetPath().AppendASCII("out.zip");
+
+  // First: establish the number of possible interruption points.
+  int progress_count = 0;
+
+  EXPECT_TRUE(zip::Zip({.src_dir = src_dir,
+                        .dest_file = zip_file,
+                        .progress_callback = base::BindLambdaForTesting(
+                            [&progress_count](const zip::Progress&) {
+                              progress_count++;
+                              return true;
+                            })}));
+
+  EXPECT_EQ(progress_count, 14);
+
+  // Second: exercise each and every interruption point.
+  for (int i = progress_count; i > 0; i--) {
+    int j = 0;
+    EXPECT_FALSE(zip::Zip({.src_dir = src_dir,
+                           .dest_file = zip_file,
+                           .progress_callback = base::BindLambdaForTesting(
+                               [i, &j](const zip::Progress&) {
+                                 j++;
+                                 // Callback shouldn't be called again after
+                                 // having returned false once.
+                                 EXPECT_LE(j, i);
+                                 return j < i;
+                               })}));
+
+    EXPECT_EQ(j, i);
+  }
+}
+
+// Tests zip::internal::GetCompressionMethod()
+TEST_F(ZipTest, GetCompressionMethod) {
+  using zip::internal::GetCompressionMethod;
+  using zip::internal::kDeflated;
+  using zip::internal::kStored;
+
+  EXPECT_EQ(GetCompressionMethod(FP("")), kDeflated);
+  EXPECT_EQ(GetCompressionMethod(FP("NoExtension")), kDeflated);
+  EXPECT_EQ(GetCompressionMethod(FP("Folder.zip").Append(FP("NoExtension"))),
+            kDeflated);
+  EXPECT_EQ(GetCompressionMethod(FP("Name.txt")), kDeflated);
+  EXPECT_EQ(GetCompressionMethod(FP("Name.zip")), kStored);
+  EXPECT_EQ(GetCompressionMethod(FP("Name....zip")), kStored);
+  EXPECT_EQ(GetCompressionMethod(FP("Name.zip")), kStored);
+  EXPECT_EQ(GetCompressionMethod(FP("NAME.ZIP")), kStored);
+  EXPECT_EQ(GetCompressionMethod(FP("Name.gz")), kStored);
+  EXPECT_EQ(GetCompressionMethod(FP("Name.tar.gz")), kStored);
+  EXPECT_EQ(GetCompressionMethod(FP("Name.tar")), kDeflated);
+
+  // This one is controversial.
+  EXPECT_EQ(GetCompressionMethod(FP(".zip")), kStored);
+}
+
+// Tests that files put inside a ZIP are effectively compressed.
+TEST_F(ZipTest, Compressed) {
+  base::ScopedTempDir temp_dir;
+  ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
+
+  const base::FilePath src_dir = temp_dir.GetPath().AppendASCII("input");
+  EXPECT_TRUE(base::CreateDirectory(src_dir));
+
+  // Create some dummy source files.
+  for (const base::StringPiece s : {"foo", "bar.txt", ".hidden"}) {
+    base::File f(src_dir.AppendASCII(s),
+                 base::File::FLAG_CREATE | base::File::FLAG_WRITE);
+    ASSERT_TRUE(f.SetLength(5000));
+  }
+
+  // Zip the source files.
+  const base::FilePath dest_file = temp_dir.GetPath().AppendASCII("dest.zip");
+  EXPECT_TRUE(zip::Zip({.src_dir = src_dir,
+                        .dest_file = dest_file,
+                        .include_hidden_files = true}));
+
+  // Since the source files compress well, the destination ZIP file should be
+  // smaller than the source files.
+  int64_t dest_file_size;
+  ASSERT_TRUE(base::GetFileSize(dest_file, &dest_file_size));
+  EXPECT_GT(dest_file_size, 300);
+  EXPECT_LT(dest_file_size, 1000);
+}
+
+// Tests that a ZIP put inside a ZIP is simply stored instead of being
+// compressed.
+TEST_F(ZipTest, NestedZip) {
+  base::ScopedTempDir temp_dir;
+  ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
+
+  const base::FilePath src_dir = temp_dir.GetPath().AppendASCII("input");
+  EXPECT_TRUE(base::CreateDirectory(src_dir));
+
+  // Create a dummy ZIP file. This is not a valid ZIP file, but for the purpose
+  // of this test, it doesn't really matter.
+  const int64_t src_size = 5000;
+
+  {
+    base::File f(src_dir.AppendASCII("src.zip"),
+                 base::File::FLAG_CREATE | base::File::FLAG_WRITE);
+    ASSERT_TRUE(f.SetLength(src_size));
+  }
+
+  // Zip the dummy ZIP file.
+  const base::FilePath dest_file = temp_dir.GetPath().AppendASCII("dest.zip");
+  EXPECT_TRUE(zip::Zip({.src_dir = src_dir, .dest_file = dest_file}));
+
+  // Since the dummy source (inner) ZIP file should simply be stored in the
+  // destination (outer) ZIP file, the destination file should be bigger than
+  // the source file, but not much bigger.
+  int64_t dest_file_size;
+  ASSERT_TRUE(base::GetFileSize(dest_file, &dest_file_size));
+  EXPECT_GT(dest_file_size, src_size + 100);
+  EXPECT_LT(dest_file_size, src_size + 300);
+}
+
+// Tests that there is no 2GB or 4GB limits. Tests that big files can be zipped
+// (crbug.com/1207737) and that big ZIP files can be created
+// (crbug.com/1221447). Tests that the big ZIP can be opened, that its entries
+// are correctly enumerated (crbug.com/1298347), and that the big file can be
+// extracted.
+//
+// Because this test is dealing with big files, it tends to take a lot of disk
+// space and time (crbug.com/1299736). Therefore, it only gets run on a few bots
+// (ChromeOS and Windows).
+//
+// This test is too slow with TSAN.
+// OS Fuchsia does not seem to support large files.
+// Some 32-bit Android waterfall and CQ try bots are running out of space when
+// performing this test (android-asan, android-11-x86-rel,
+// android-marshmallow-x86-rel-non-cq).
+// Some Mac, Linux and Debug (dbg) bots tend to time out when performing this
+// test (crbug.com/1299736, crbug.com/1300448, crbug.com/1369958).
+#if defined(THREAD_SANITIZER) || BUILDFLAG(IS_FUCHSIA) ||                \
+    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+    BUILDFLAG(IS_CHROMEOS) || !defined(NDEBUG)
+TEST_F(ZipTest, DISABLED_BigFile) {
+#else
+TEST_F(ZipTest, BigFile) {
+#endif
+  base::ScopedTempDir temp_dir;
+  ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
+
+  const base::FilePath src_dir = temp_dir.GetPath().AppendASCII("input");
+  EXPECT_TRUE(base::CreateDirectory(src_dir));
+
+  // Create a big dummy ZIP file. This is not a valid ZIP file, but for the
+  // purpose of this test, it doesn't really matter.
+  const int64_t src_size = 5'000'000'000;
+
+  const base::FilePath src_file = src_dir.AppendASCII("src.zip");
+  LOG(INFO) << "Creating big file " << src_file;
+  {
+    base::File f(src_file, base::File::FLAG_CREATE | base::File::FLAG_WRITE);
+    ASSERT_TRUE(f.SetLength(src_size));
+  }
+
+  // Zip the dummy ZIP file.
+  const base::FilePath dest_file = temp_dir.GetPath().AppendASCII("dest.zip");
+  LOG(INFO) << "Zipping big file into " << dest_file;
+  zip::ProgressCallback progress_callback =
+      base::BindLambdaForTesting([&](const zip::Progress& progress) {
+        LOG(INFO) << "Zipping... " << std::setw(3)
+                  << (100 * progress.bytes / src_size) << "%";
+        return true;
+      });
+  EXPECT_TRUE(zip::Zip({.src_dir = src_dir,
+                        .dest_file = dest_file,
+                        .progress_callback = std::move(progress_callback),
+                        .progress_period = base::Seconds(1)}));
+
+  // Since the dummy source (inner) ZIP file should simply be stored in the
+  // destination (outer) ZIP file, the destination file should be bigger than
+  // the source file, but not much bigger.
+  int64_t dest_file_size;
+  ASSERT_TRUE(base::GetFileSize(dest_file, &dest_file_size));
+  EXPECT_GT(dest_file_size, src_size + 100);
+  EXPECT_LT(dest_file_size, src_size + 300);
+
+  LOG(INFO) << "Reading big ZIP " << dest_file;
+  zip::ZipReader reader;
+  ASSERT_TRUE(reader.Open(dest_file));
+
+  const zip::ZipReader::Entry* const entry = reader.Next();
+  ASSERT_TRUE(entry);
+  EXPECT_EQ(FP("src.zip"), entry->path);
+  EXPECT_EQ(src_size, entry->original_size);
+  EXPECT_FALSE(entry->is_directory);
+  EXPECT_FALSE(entry->is_encrypted);
+
+  ProgressWriterDelegate writer(src_size);
+  EXPECT_TRUE(reader.ExtractCurrentEntry(&writer,
+                                         std::numeric_limits<uint64_t>::max()));
+  EXPECT_EQ(src_size, writer.received_bytes());
+
+  EXPECT_FALSE(reader.Next());
+  EXPECT_TRUE(reader.ok());
+}
+
 }  // namespace
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/zip_writer.cc b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/zip_writer.cc
new file mode 100644
index 000000000..31161ae86
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/zip_writer.cc
@@ -0,0 +1,308 @@
+// Copyright 2017 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "third_party/zlib/google/zip_writer.h"
+
+#include <algorithm>
+
+#include "base/files/file.h"
+#include "base/logging.h"
+#include "base/strings/strcat.h"
+#include "base/strings/string_util.h"
+#include "third_party/zlib/google/redact.h"
+#include "third_party/zlib/google/zip_internal.h"
+
+namespace zip {
+namespace internal {
+
+bool ZipWriter::ShouldContinue() {
+  if (!progress_callback_)
+    return true;
+
+  const base::TimeTicks now = base::TimeTicks::Now();
+  if (next_progress_report_time_ > now)
+    return true;
+
+  next_progress_report_time_ = now + progress_period_;
+  if (progress_callback_.Run(progress_))
+    return true;
+
+  LOG(ERROR) << "Cancelling ZIP creation";
+  return false;
+}
+
+bool ZipWriter::AddFileContent(const base::FilePath& path, base::File file) {
+  char buf[zip::internal::kZipBufSize];
+
+  while (ShouldContinue()) {
+    const int num_bytes =
+        file.ReadAtCurrentPos(buf, zip::internal::kZipBufSize);
+
+    if (num_bytes < 0) {
+      PLOG(ERROR) << "Cannot read file " << Redact(path);
+      return false;
+    }
+
+    if (num_bytes == 0)
+      return true;
+
+    if (zipWriteInFileInZip(zip_file_, buf, num_bytes) != ZIP_OK) {
+      PLOG(ERROR) << "Cannot write data from file " << Redact(path)
+                  << " to ZIP";
+      return false;
+    }
+
+    progress_.bytes += num_bytes;
+  }
+
+  return false;
+}
+
+bool ZipWriter::OpenNewFileEntry(const base::FilePath& path,
+                                 bool is_directory,
+                                 base::Time last_modified) {
+  std::string str_path = path.AsUTF8Unsafe();
+
+#if defined(OS_WIN)
+  base::ReplaceSubstringsAfterOffset(&str_path, 0u, "\\", "/");
+#endif
+
+  Compression compression = kDeflated;
+
+  if (is_directory) {
+    str_path += "/";
+  } else {
+    compression = GetCompressionMethod(path);
+  }
+
+  return zip::internal::ZipOpenNewFileInZip(zip_file_, str_path, last_modified,
+                                            compression);
+}
+
+bool ZipWriter::CloseNewFileEntry() {
+  return zipCloseFileInZip(zip_file_) == ZIP_OK;
+}
+
+bool ZipWriter::AddFileEntry(const base::FilePath& path, base::File file) {
+  base::File::Info info;
+  if (!file.GetInfo(&info))
+    return false;
+
+  if (!OpenNewFileEntry(path, /*is_directory=*/false, info.last_modified))
+    return false;
+
+  if (!AddFileContent(path, std::move(file)))
+    return false;
+
+  progress_.files++;
+  return CloseNewFileEntry();
+}
+
+bool ZipWriter::AddDirectoryEntry(const base::FilePath& path) {
+  FileAccessor::Info info;
+  if (!file_accessor_->GetInfo(path, &info) || !info.is_directory) {
+    LOG(ERROR) << "Not a directory: " << Redact(path);
+    progress_.errors++;
+    return continue_on_error_;
+  }
+
+  if (!OpenNewFileEntry(path, /*is_directory=*/true, info.last_modified))
+    return false;
+
+  if (!CloseNewFileEntry())
+    return false;
+
+  progress_.directories++;
+  if (!ShouldContinue())
+    return false;
+
+  if (!recursive_)
+    return true;
+
+  return AddDirectoryContents(path);
+}
+
+#if defined(OS_POSIX) || defined(OS_FUCHSIA)
+// static
+std::unique_ptr<ZipWriter> ZipWriter::CreateWithFd(
+    int zip_file_fd,
+    FileAccessor* file_accessor) {
+  DCHECK(zip_file_fd != base::kInvalidPlatformFile);
+  zipFile zip_file =
+      internal::OpenFdForZipping(zip_file_fd, APPEND_STATUS_CREATE);
+
+  if (!zip_file) {
+    DLOG(ERROR) << "Cannot create ZIP file for FD " << zip_file_fd;
+    return nullptr;
+  }
+
+  return std::unique_ptr<ZipWriter>(new ZipWriter(zip_file, file_accessor));
+}
+#endif
+
+// static
+std::unique_ptr<ZipWriter> ZipWriter::Create(
+    const base::FilePath& zip_file_path,
+    FileAccessor* file_accessor) {
+  DCHECK(!zip_file_path.empty());
+  zipFile zip_file = internal::OpenForZipping(zip_file_path.AsUTF8Unsafe(),
+                                              APPEND_STATUS_CREATE);
+
+  if (!zip_file) {
+    PLOG(ERROR) << "Cannot create ZIP file " << Redact(zip_file_path);
+    return nullptr;
+  }
+
+  return std::unique_ptr<ZipWriter>(new ZipWriter(zip_file, file_accessor));
+}
+
+ZipWriter::ZipWriter(zipFile zip_file, FileAccessor* file_accessor)
+    : zip_file_(zip_file), file_accessor_(file_accessor) {}
+
+ZipWriter::~ZipWriter() {
+  if (zip_file_)
+    zipClose(zip_file_, nullptr);
+}
+
+bool ZipWriter::Close() {
+  const bool success = zipClose(zip_file_, nullptr) == ZIP_OK;
+  zip_file_ = nullptr;
+
+  // Call the progress callback one last time with the final progress status.
+  if (progress_callback_ && !progress_callback_.Run(progress_)) {
+    LOG(ERROR) << "Cancelling ZIP creation at the end";
+    return false;
+  }
+
+  return success;
+}
+
+bool ZipWriter::AddMixedEntries(Paths paths) {
+  // Pointers to directory paths in |paths|.
+  std::vector<const base::FilePath*> directories;
+
+  // Declared outside loop to reuse internal buffer.
+  std::vector<base::File> files;
+
+  // First pass. We don't know which paths are files and which ones are
+  // directories, and we want to avoid making a call to file_accessor_ for each
+  // path. Try to open all of the paths as files. We'll get invalid file
+  // descriptors for directories, and we'll process these directories in the
+  // second pass.
+  while (!paths.empty()) {
+    // Work with chunks of 50 paths at most.
+    const size_t n = std::min<size_t>(paths.size(), 50);
+    const Paths relative_paths = paths.subspan(0, n);
+    paths = paths.subspan(n, paths.size() - n);
+
+    files.clear();
+    if (!file_accessor_->Open(relative_paths, &files) || files.size() != n)
+      return false;
+
+    for (size_t i = 0; i < n; i++) {
+      const base::FilePath& relative_path = relative_paths[i];
+      DCHECK(!relative_path.empty());
+      base::File& file = files[i];
+
+      if (file.IsValid()) {
+        // It's a file.
+        if (!AddFileEntry(relative_path, std::move(file)))
+          return false;
+      } else {
+        // It's probably a directory. Remember its path for the second pass.
+        directories.push_back(&relative_path);
+      }
+    }
+  }
+
+  // Second pass for directories discovered during the first pass.
+  for (const base::FilePath* const path : directories) {
+    DCHECK(path);
+    if (!AddDirectoryEntry(*path))
+      return false;
+  }
+
+  return true;
+}
+
+bool ZipWriter::AddFileEntries(Paths paths) {
+  // Declared outside loop to reuse internal buffer.
+  std::vector<base::File> files;
+
+  while (!paths.empty()) {
+    // Work with chunks of 50 paths at most.
+    const size_t n = std::min<size_t>(paths.size(), 50);
+    const Paths relative_paths = paths.subspan(0, n);
+    paths = paths.subspan(n, paths.size() - n);
+
+    DCHECK_EQ(relative_paths.size(), n);
+
+    files.clear();
+    if (!file_accessor_->Open(relative_paths, &files) || files.size() != n)
+      return false;
+
+    for (size_t i = 0; i < n; i++) {
+      const base::FilePath& relative_path = relative_paths[i];
+      DCHECK(!relative_path.empty());
+      base::File& file = files[i];
+
+      if (!file.IsValid()) {
+        LOG(ERROR) << "Cannot open " << Redact(relative_path);
+        progress_.errors++;
+
+        if (continue_on_error_)
+          continue;
+
+        return false;
+      }
+
+      if (!AddFileEntry(relative_path, std::move(file)))
+        return false;
+    }
+  }
+
+  return true;
+}
+
+bool ZipWriter::AddDirectoryEntries(Paths paths) {
+  for (const base::FilePath& path : paths) {
+    if (!AddDirectoryEntry(path))
+      return false;
+  }
+
+  return true;
+}
+
+bool ZipWriter::AddDirectoryContents(const base::FilePath& path) {
+  std::vector<base::FilePath> files, subdirs;
+
+  if (!file_accessor_->List(path, &files, &subdirs)) {
+    progress_.errors++;
+    return continue_on_error_;
+  }
+
+  Filter(&files);
+  Filter(&subdirs);
+
+  if (!AddFileEntries(files))
+    return false;
+
+  return AddDirectoryEntries(subdirs);
+}
+
+void ZipWriter::Filter(std::vector<base::FilePath>* const paths) {
+  DCHECK(paths);
+
+  if (!filter_callback_)
+    return;
+
+  const auto end = std::remove_if(paths->begin(), paths->end(),
+                                  [this](const base::FilePath& path) {
+                                    return !filter_callback_.Run(path);
+                                  });
+  paths->erase(end, paths->end());
+}
+
+}  // namespace internal
+}  // namespace zip
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/zip_writer.h b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/zip_writer.h
new file mode 100644
index 000000000..dd109293d
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/google/zip_writer.h
@@ -0,0 +1,154 @@
+// Copyright 2017 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef THIRD_PARTY_ZLIB_GOOGLE_ZIP_WRITER_H_
+#define THIRD_PARTY_ZLIB_GOOGLE_ZIP_WRITER_H_
+
+#include <memory>
+#include <vector>
+
+#include "base/files/file_path.h"
+#include "base/time/time.h"
+#include "build/build_config.h"
+#include "third_party/zlib/google/zip.h"
+
+#if defined(USE_SYSTEM_MINIZIP)
+#include <minizip/unzip.h>
+#include <minizip/zip.h>
+#else
+#include "third_party/zlib/contrib/minizip/unzip.h"
+#include "third_party/zlib/contrib/minizip/zip.h"
+#endif
+
+namespace zip {
+namespace internal {
+
+// A class used to write entries to a ZIP file and buffering the reading of
+// files to limit the number of calls to the FileAccessor. This is for
+// performance reasons as these calls may be expensive when IPC based).
+// This class is so far internal and only used by zip.cc, but could be made
+// public if needed.
+//
+// All methods returning a bool return true on success and false on error.
+class ZipWriter {
+ public:
+// Creates a writer that will write a ZIP file to |zip_file_fd| or |zip_file|
+// and which entries are relative to |file_accessor|'s source directory.
+// All file reads are performed using |file_accessor|.
+#if defined(OS_POSIX) || defined(OS_FUCHSIA)
+  static std::unique_ptr<ZipWriter> CreateWithFd(int zip_file_fd,
+                                                 FileAccessor* file_accessor);
+#endif
+
+  static std::unique_ptr<ZipWriter> Create(const base::FilePath& zip_file,
+                                           FileAccessor* file_accessor);
+
+  ZipWriter(const ZipWriter&) = delete;
+  ZipWriter& operator=(const ZipWriter&) = delete;
+
+  ~ZipWriter();
+
+  // Sets the optional progress callback. The callback is called once for each
+  // time |period|. The final callback is always called when the ZIP operation
+  // completes.
+  void SetProgressCallback(ProgressCallback callback, base::TimeDelta period) {
+    progress_callback_ = std::move(callback);
+    progress_period_ = std::move(period);
+  }
+
+  // Should ignore missing files and directories?
+  void ContinueOnError(bool continue_on_error) {
+    continue_on_error_ = continue_on_error;
+  }
+
+  // Sets the recursive flag, indicating whether the contents of subdirectories
+  // should be included.
+  void SetRecursive(bool b) { recursive_ = b; }
+
+  // Sets the filter callback.
+  void SetFilterCallback(FilterCallback callback) {
+    filter_callback_ = std::move(callback);
+  }
+
+  // Adds the contents of a directory. If the recursive flag is set, the
+  // contents of subdirectories are also added.
+  bool AddDirectoryContents(const base::FilePath& path);
+
+  // Adds the entries at |paths| to the ZIP file. These can be a mixed bag of
+  // files and directories. If the recursive flag is set, the contents of
+  // subdirectories is also added.
+  bool AddMixedEntries(Paths paths);
+
+  // Closes the ZIP file.
+  bool Close();
+
+ private:
+  // Takes ownership of |zip_file|.
+  ZipWriter(zipFile zip_file, FileAccessor* file_accessor);
+
+  // Regularly called during processing to check whether zipping should continue
+  // or should be cancelled.
+  bool ShouldContinue();
+
+  // Adds file content to currently open file entry.
+  bool AddFileContent(const base::FilePath& path, base::File file);
+
+  // Adds a file entry (including file contents).
+  bool AddFileEntry(const base::FilePath& path, base::File file);
+
+  // Adds file entries. All the paths should be existing files.
+  bool AddFileEntries(Paths paths);
+
+  // Adds a directory entry. If the recursive flag is set, the contents of this
+  // directory are also added.
+  bool AddDirectoryEntry(const base::FilePath& path);
+
+  // Adds directory entries. All the paths should be existing directories. If
+  // the recursive flag is set, the contents of these directories are also
+  // added.
+  bool AddDirectoryEntries(Paths paths);
+
+  // Opens a file or directory entry.
+  bool OpenNewFileEntry(const base::FilePath& path,
+                        bool is_directory,
+                        base::Time last_modified);
+
+  // Closes the currently open entry.
+  bool CloseNewFileEntry();
+
+  // Filters entries.
+  void Filter(std::vector<base::FilePath>* paths);
+
+  // The actual zip file.
+  zipFile zip_file_;
+
+  // Abstraction over file access methods used to read files.
+  FileAccessor* const file_accessor_;
+
+  // Progress stats.
+  Progress progress_;
+
+  // Optional progress callback.
+  ProgressCallback progress_callback_;
+
+  // Optional progress reporting period.
+  base::TimeDelta progress_period_;
+
+  // Next time to report progress.
+  base::TimeTicks next_progress_report_time_ = base::TimeTicks::Now();
+
+  // Filter used to exclude files from the ZIP file.
+  FilterCallback filter_callback_;
+
+  // Should recursively add directories?
+  bool recursive_ = false;
+
+  // Should ignore missing files and directories?
+  bool continue_on_error_ = false;
+};
+
+}  // namespace internal
+}  // namespace zip
+
+#endif  // THIRD_PARTY_ZLIB_GOOGLE_ZIP_WRITER_H_
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/gzclose.c b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/gzclose.c
index caeb99a31..48d6a86f0 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/gzclose.c
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/gzclose.c
@@ -8,9 +8,7 @@
 /* gzclose() is in a separate file so that it is linked in only if it is used.
    That way the other gzclose functions can be used instead to avoid linking in
    unneeded compression or decompression routines. */
-int ZEXPORT gzclose(file)
-    gzFile file;
-{
+int ZEXPORT gzclose(gzFile file) {
 #ifndef NO_GZCOMPRESS
     gz_statep state;
 
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/gzguts.h b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/gzguts.h
index 990a4d251..e23f831f5 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/gzguts.h
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/gzguts.h
@@ -1,5 +1,5 @@
 /* gzguts.h -- zlib internal header definitions for gz* operations
- * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler
+ * Copyright (C) 2004-2019 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -39,7 +39,7 @@
 #  include <io.h>
 #endif
 
-#if defined(_WIN32) || defined(__CYGWIN__)
+#if defined(_WIN32)
 #  define WIDECHAR
 #endif
 
@@ -119,8 +119,8 @@
 
 /* gz* functions always use library allocation functions */
 #ifndef STDC
-  extern voidp  malloc OF((uInt size));
-  extern void   free   OF((voidpf ptr));
+  extern voidp  malloc(uInt size);
+  extern void   free(voidpf ptr);
 #endif
 
 /* get errno and strerror definition */
@@ -138,10 +138,10 @@
 
 /* provide prototypes for these when building zlib without LFS */
 #if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0
-    ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-    ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
-    ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
-    ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
+    ZEXTERN gzFile ZEXPORT gzopen64(const char *, const char *);
+    ZEXTERN z_off64_t ZEXPORT gzseek64(gzFile, z_off64_t, int);
+    ZEXTERN z_off64_t ZEXPORT gztell64(gzFile);
+    ZEXTERN z_off64_t ZEXPORT gzoffset64(gzFile);
 #endif
 
 /* default memLevel */
@@ -190,6 +190,7 @@ typedef struct {
         /* just for writing */
     int level;              /* compression level */
     int strategy;           /* compression strategy */
+    int reset;              /* true if a reset is pending after a Z_FINISH */
         /* seek request */
     z_off64_t skip;         /* amount to skip (already rewound if backwards) */
     int seek;               /* true if seek request pending */
@@ -202,9 +203,9 @@ typedef struct {
 typedef gz_state FAR *gz_statep;
 
 /* shared functions */
-void ZLIB_INTERNAL gz_error OF((gz_statep, int, const char *));
+void ZLIB_INTERNAL gz_error(gz_statep, int, const char *);
 #if defined UNDER_CE
-char ZLIB_INTERNAL *gz_strwinerror OF((DWORD error));
+char ZLIB_INTERNAL *gz_strwinerror(DWORD error);
 #endif
 
 /* GT_OFF(x), where x is an unsigned value, is true if x > maximum z_off64_t
@@ -213,6 +214,6 @@ char ZLIB_INTERNAL *gz_strwinerror OF((DWORD error));
 #ifdef INT_MAX
 #  define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > INT_MAX)
 #else
-unsigned ZLIB_INTERNAL gz_intmax OF((void));
+unsigned ZLIB_INTERNAL gz_intmax(void);
 #  define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > gz_intmax())
 #endif
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/gzlib.c b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/gzlib.c
index 4105e6aff..9810e3553 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/gzlib.c
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/gzlib.c
@@ -1,24 +1,23 @@
 /* gzlib.c -- zlib functions common to reading and writing gzip files
- * Copyright (C) 2004-2017 Mark Adler
+ * Copyright (C) 2004-2019 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
 #include "gzguts.h"
 
-#if defined(_WIN32) && !defined(__BORLANDC__) && !defined(__MINGW32__)
+#if defined(_WIN32) && !defined(__BORLANDC__)
 #  define LSEEK _lseeki64
+#  define OPEN  open
 #else
 #if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
 #  define LSEEK lseek64
+#  define OPEN  open64
 #else
 #  define LSEEK lseek
+#  define OPEN  open
 #endif
 #endif
 
-/* Local functions */
-local void gz_reset OF((gz_statep));
-local gzFile gz_open OF((const void *, int, const char *));
-
 #if defined UNDER_CE
 
 /* Map the Windows error number in ERROR to a locale-dependent error message
@@ -30,9 +29,7 @@ local gzFile gz_open OF((const void *, int, const char *));
 
    The gz_strwinerror function does not change the current setting of
    GetLastError. */
-char ZLIB_INTERNAL *gz_strwinerror (error)
-     DWORD error;
-{
+char ZLIB_INTERNAL *gz_strwinerror(DWORD error) {
     static char buf[1024];
 
     wchar_t *msgbuf;
@@ -72,15 +69,15 @@ char ZLIB_INTERNAL *gz_strwinerror (error)
 #endif /* UNDER_CE */
 
 /* Reset gzip file state */
-local void gz_reset(state)
-    gz_statep state;
-{
+local void gz_reset(gz_statep state) {
     state->x.have = 0;              /* no output data available */
     if (state->mode == GZ_READ) {   /* for reading ... */
         state->eof = 0;             /* not at end of file */
         state->past = 0;            /* have not read past end yet */
         state->how = LOOK;          /* look for gzip header */
     }
+    else                            /* for writing ... */
+        state->reset = 0;           /* no deflateReset pending */
     state->seek = 0;                /* no seek request pending */
     gz_error(state, Z_OK, NULL);    /* clear error */
     state->x.pos = 0;               /* no uncompressed data yet */
@@ -88,11 +85,7 @@ local void gz_reset(state)
 }
 
 /* Open a gzip file either by name or file descriptor. */
-local gzFile gz_open(path, fd, mode)
-    const void *path;
-    int fd;
-    const char *mode;
-{
+local gzFile gz_open(const void *path, int fd, const char *mode) {
     gz_statep state;
     z_size_t len;
     int oflag;
@@ -242,7 +235,7 @@ local gzFile gz_open(path, fd, mode)
 #ifdef WIDECHAR
         fd == -2 ? _wopen(path, oflag, 0666) :
 #endif
-        open((const char *)path, oflag, 0666));
+        OPEN((const char *)path, oflag, 0666));
     if (state->fd == -1) {
         free(state->path);
         free(state);
@@ -267,26 +260,17 @@ local gzFile gz_open(path, fd, mode)
 }
 
 /* -- see zlib.h -- */
-gzFile ZEXPORT gzopen(path, mode)
-    const char *path;
-    const char *mode;
-{
+gzFile ZEXPORT gzopen(const char *path, const char *mode) {
     return gz_open(path, -1, mode);
 }
 
 /* -- see zlib.h -- */
-gzFile ZEXPORT gzopen64(path, mode)
-    const char *path;
-    const char *mode;
-{
+gzFile ZEXPORT gzopen64(const char *path, const char *mode) {
     return gz_open(path, -1, mode);
 }
 
 /* -- see zlib.h -- */
-gzFile ZEXPORT gzdopen(fd, mode)
-    int fd;
-    const char *mode;
-{
+gzFile ZEXPORT gzdopen(int fd, const char *mode) {
     char *path;         /* identifier for error messages */
     gzFile gz;
 
@@ -304,19 +288,13 @@ gzFile ZEXPORT gzdopen(fd, mode)
 
 /* -- see zlib.h -- */
 #ifdef WIDECHAR
-gzFile ZEXPORT gzopen_w(path, mode)
-    const wchar_t *path;
-    const char *mode;
-{
+gzFile ZEXPORT gzopen_w(const wchar_t *path, const char *mode) {
     return gz_open(path, -2, mode);
 }
 #endif
 
 /* -- see zlib.h -- */
-int ZEXPORT gzbuffer(file, size)
-    gzFile file;
-    unsigned size;
-{
+int ZEXPORT gzbuffer(gzFile file, unsigned size) {
     gz_statep state;
 
     /* get internal structure and check integrity */
@@ -340,9 +318,7 @@ int ZEXPORT gzbuffer(file, size)
 }
 
 /* -- see zlib.h -- */
-int ZEXPORT gzrewind(file)
-    gzFile file;
-{
+int ZEXPORT gzrewind(gzFile file) {
     gz_statep state;
 
     /* get internal structure */
@@ -363,11 +339,7 @@ int ZEXPORT gzrewind(file)
 }
 
 /* -- see zlib.h -- */
-z_off64_t ZEXPORT gzseek64(file, offset, whence)
-    gzFile file;
-    z_off64_t offset;
-    int whence;
-{
+z_off64_t ZEXPORT gzseek64(gzFile file, z_off64_t offset, int whence) {
     unsigned n;
     z_off64_t ret;
     gz_statep state;
@@ -397,7 +369,7 @@ z_off64_t ZEXPORT gzseek64(file, offset, whence)
     /* if within raw area while reading, just go there */
     if (state->mode == GZ_READ && state->how == COPY &&
             state->x.pos + offset >= 0) {
-        ret = LSEEK(state->fd, offset - state->x.have, SEEK_CUR);
+        ret = LSEEK(state->fd, offset - (z_off64_t)state->x.have, SEEK_CUR);
         if (ret == -1)
             return -1;
         state->x.have = 0;
@@ -440,11 +412,7 @@ z_off64_t ZEXPORT gzseek64(file, offset, whence)
 }
 
 /* -- see zlib.h -- */
-z_off_t ZEXPORT gzseek(file, offset, whence)
-    gzFile file;
-    z_off_t offset;
-    int whence;
-{
+z_off_t ZEXPORT gzseek(gzFile file, z_off_t offset, int whence) {
     z_off64_t ret;
 
     ret = gzseek64(file, (z_off64_t)offset, whence);
@@ -452,9 +420,7 @@ z_off_t ZEXPORT gzseek(file, offset, whence)
 }
 
 /* -- see zlib.h -- */
-z_off64_t ZEXPORT gztell64(file)
-    gzFile file;
-{
+z_off64_t ZEXPORT gztell64(gzFile file) {
     gz_statep state;
 
     /* get internal structure and check integrity */
@@ -469,9 +435,7 @@ z_off64_t ZEXPORT gztell64(file)
 }
 
 /* -- see zlib.h -- */
-z_off_t ZEXPORT gztell(file)
-    gzFile file;
-{
+z_off_t ZEXPORT gztell(gzFile file) {
     z_off64_t ret;
 
     ret = gztell64(file);
@@ -479,9 +443,7 @@ z_off_t ZEXPORT gztell(file)
 }
 
 /* -- see zlib.h -- */
-z_off64_t ZEXPORT gzoffset64(file)
-    gzFile file;
-{
+z_off64_t ZEXPORT gzoffset64(gzFile file) {
     z_off64_t offset;
     gz_statep state;
 
@@ -502,9 +464,7 @@ z_off64_t ZEXPORT gzoffset64(file)
 }
 
 /* -- see zlib.h -- */
-z_off_t ZEXPORT gzoffset(file)
-    gzFile file;
-{
+z_off_t ZEXPORT gzoffset(gzFile file) {
     z_off64_t ret;
 
     ret = gzoffset64(file);
@@ -512,9 +472,7 @@ z_off_t ZEXPORT gzoffset(file)
 }
 
 /* -- see zlib.h -- */
-int ZEXPORT gzeof(file)
-    gzFile file;
-{
+int ZEXPORT gzeof(gzFile file) {
     gz_statep state;
 
     /* get internal structure and check integrity */
@@ -529,10 +487,7 @@ int ZEXPORT gzeof(file)
 }
 
 /* -- see zlib.h -- */
-const char * ZEXPORT gzerror(file, errnum)
-    gzFile file;
-    int *errnum;
-{
+const char * ZEXPORT gzerror(gzFile file, int *errnum) {
     gz_statep state;
 
     /* get internal structure and check integrity */
@@ -550,9 +505,7 @@ const char * ZEXPORT gzerror(file, errnum)
 }
 
 /* -- see zlib.h -- */
-void ZEXPORT gzclearerr(file)
-    gzFile file;
-{
+void ZEXPORT gzclearerr(gzFile file) {
     gz_statep state;
 
     /* get internal structure and check integrity */
@@ -576,11 +529,7 @@ void ZEXPORT gzclearerr(file)
    memory).  Simply save the error message as a static string.  If there is an
    allocation failure constructing the error message, then convert the error to
    out of memory. */
-void ZLIB_INTERNAL gz_error(state, err, msg)
-    gz_statep state;
-    int err;
-    const char *msg;
-{
+void ZLIB_INTERNAL gz_error(gz_statep state, int err, const char *msg) {
     /* free previously allocated message and clear */
     if (state->msg != NULL) {
         if (state->err != Z_MEM_ERROR)
@@ -622,8 +571,7 @@ void ZLIB_INTERNAL gz_error(state, err, msg)
    available) -- we need to do this to cover cases where 2's complement not
    used, since C standard permits 1's complement and sign-bit representations,
    otherwise we could just use ((unsigned)-1) >> 1 */
-unsigned ZLIB_INTERNAL gz_intmax()
-{
+unsigned ZLIB_INTERNAL gz_intmax(void) {
     unsigned p, q;
 
     p = 1;
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/gzread.c b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/gzread.c
index 832d3ef98..9a9f7847c 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/gzread.c
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/gzread.c
@@ -1,29 +1,16 @@
 /* gzread.c -- zlib functions for reading gzip files
- * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler
+ * Copyright (C) 2004-2017 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
 #include "gzguts.h"
 
-/* Local functions */
-local int gz_load OF((gz_statep, unsigned char *, unsigned, unsigned *));
-local int gz_avail OF((gz_statep));
-local int gz_look OF((gz_statep));
-local int gz_decomp OF((gz_statep));
-local int gz_fetch OF((gz_statep));
-local int gz_skip OF((gz_statep, z_off64_t));
-local z_size_t gz_read OF((gz_statep, voidp, z_size_t));
-
 /* Use read() to load a buffer -- return -1 on error, otherwise 0.  Read from
    state->fd, and update state->eof, state->err, and state->msg as appropriate.
    This function needs to loop on read(), since read() is not guaranteed to
    read the number of bytes requested, depending on the type of descriptor. */
-local int gz_load(state, buf, len, have)
-    gz_statep state;
-    unsigned char *buf;
-    unsigned len;
-    unsigned *have;
-{
+local int gz_load(gz_statep state, unsigned char *buf, unsigned len,
+                  unsigned *have) {
     int ret;
     unsigned get, max = ((unsigned)-1 >> 2) + 1;
 
@@ -53,9 +40,7 @@ local int gz_load(state, buf, len, have)
    If strm->avail_in != 0, then the current data is moved to the beginning of
    the input buffer, and then the remainder of the buffer is loaded with the
    available data from the input file. */
-local int gz_avail(state)
-    gz_statep state;
-{
+local int gz_avail(gz_statep state) {
     unsigned got;
     z_streamp strm = &(state->strm);
 
@@ -88,9 +73,7 @@ local int gz_avail(state)
    case, all further file reads will be directly to either the output buffer or
    a user buffer.  If decompressing, the inflate state will be initialized.
    gz_look() will return 0 on success or -1 on failure. */
-local int gz_look(state)
-    gz_statep state;
-{
+local int gz_look(gz_statep state) {
     z_streamp strm = &(state->strm);
 
     /* allocate read buffers and inflate memory */
@@ -157,11 +140,9 @@ local int gz_look(state)
        the output buffer is larger than the input buffer, which also assures
        space for gzungetc() */
     state->x.next = state->out;
-    if (strm->avail_in) {
-        memcpy(state->x.next, strm->next_in, strm->avail_in);
-        state->x.have = strm->avail_in;
-        strm->avail_in = 0;
-    }
+    memcpy(state->x.next, strm->next_in, strm->avail_in);
+    state->x.have = strm->avail_in;
+    strm->avail_in = 0;
     state->how = COPY;
     state->direct = 1;
     return 0;
@@ -172,9 +153,7 @@ local int gz_look(state)
    data.  If the gzip stream completes, state->how is reset to LOOK to look for
    the next gzip stream or raw data, once state->x.have is depleted.  Returns 0
    on success, -1 on failure. */
-local int gz_decomp(state)
-    gz_statep state;
-{
+local int gz_decomp(gz_statep state) {
     int ret = Z_OK;
     unsigned had;
     z_streamp strm = &(state->strm);
@@ -226,9 +205,7 @@ local int gz_decomp(state)
    looked for to determine whether to copy or decompress.  Returns -1 on error,
    otherwise 0.  gz_fetch() will leave state->how as COPY or GZIP unless the
    end of the input file has been reached and all data has been processed.  */
-local int gz_fetch(state)
-    gz_statep state;
-{
+local int gz_fetch(gz_statep state) {
     z_streamp strm = &(state->strm);
 
     do {
@@ -256,10 +233,7 @@ local int gz_fetch(state)
 }
 
 /* Skip len uncompressed bytes of output.  Return -1 on error, 0 on success. */
-local int gz_skip(state, len)
-    gz_statep state;
-    z_off64_t len;
-{
+local int gz_skip(gz_statep state, z_off64_t len) {
     unsigned n;
 
     /* skip over len bytes or reach end-of-file, whichever comes first */
@@ -291,11 +265,7 @@ local int gz_skip(state, len)
    input.  Return the number of bytes read.  If zero is returned, either the
    end of file was reached, or there was an error.  state->err must be
    consulted in that case to determine which. */
-local z_size_t gz_read(state, buf, len)
-    gz_statep state;
-    voidp buf;
-    z_size_t len;
-{
+local z_size_t gz_read(gz_statep state, voidp buf, z_size_t len) {
     z_size_t got;
     unsigned n;
 
@@ -314,9 +284,9 @@ local z_size_t gz_read(state, buf, len)
     got = 0;
     do {
         /* set n to the maximum amount of len that fits in an unsigned int */
-        n = -1;
+        n = (unsigned)-1;
         if (n > len)
-            n = len;
+            n = (unsigned)len;
 
         /* first just try copying data from the output buffer */
         if (state->x.have) {
@@ -372,11 +342,7 @@ local z_size_t gz_read(state, buf, len)
 }
 
 /* -- see zlib.h -- */
-int ZEXPORT gzread(file, buf, len)
-    gzFile file;
-    voidp buf;
-    unsigned len;
-{
+int ZEXPORT gzread(gzFile file, voidp buf, unsigned len) {
     gz_statep state;
 
     /* get internal structure */
@@ -397,7 +363,7 @@ int ZEXPORT gzread(file, buf, len)
     }
 
     /* read len or fewer bytes to buf */
-    len = gz_read(state, buf, len);
+    len = (unsigned)gz_read(state, buf, len);
 
     /* check for an error */
     if (len == 0 && state->err != Z_OK && state->err != Z_BUF_ERROR)
@@ -408,12 +374,7 @@ int ZEXPORT gzread(file, buf, len)
 }
 
 /* -- see zlib.h -- */
-z_size_t ZEXPORT gzfread(buf, size, nitems, file)
-    voidp buf;
-    z_size_t size;
-    z_size_t nitems;
-    gzFile file;
-{
+z_size_t ZEXPORT gzfread(voidp buf, z_size_t size, z_size_t nitems, gzFile file) {
     z_size_t len;
     gz_statep state;
 
@@ -448,10 +409,7 @@ z_size_t ZEXPORT gzfread(buf, size, nitems, file)
 #  endif
 #endif
 
-int ZEXPORT gzgetc(file)
-    gzFile file;
-{
-    int ret;
+int ZEXPORT gzgetc(gzFile file) {
     unsigned char buf[1];
     gz_statep state;
 
@@ -473,21 +431,15 @@ int ZEXPORT gzgetc(file)
     }
 
     /* nothing there -- try gz_read() */
-    ret = gz_read(state, buf, 1);
-    return ret < 1 ? -1 : buf[0];
+    return gz_read(state, buf, 1) < 1 ? -1 : buf[0];
 }
 
-int ZEXPORT gzgetc_(file)
-gzFile file;
-{
+int ZEXPORT gzgetc_(gzFile file) {
     return gzgetc(file);
 }
 
 /* -- see zlib.h -- */
-int ZEXPORT gzungetc(c, file)
-    int c;
-    gzFile file;
-{
+int ZEXPORT gzungetc(int c, gzFile file) {
     gz_statep state;
 
     /* get internal structure */
@@ -544,11 +496,7 @@ int ZEXPORT gzungetc(c, file)
 }
 
 /* -- see zlib.h -- */
-char * ZEXPORT gzgets(file, buf, len)
-    gzFile file;
-    char *buf;
-    int len;
-{
+char * ZEXPORT gzgets(gzFile file, char *buf, int len) {
     unsigned left, n;
     char *str;
     unsigned char *eol;
@@ -608,9 +556,7 @@ char * ZEXPORT gzgets(file, buf, len)
 }
 
 /* -- see zlib.h -- */
-int ZEXPORT gzdirect(file)
-    gzFile file;
-{
+int ZEXPORT gzdirect(gzFile file) {
     gz_statep state;
 
     /* get internal structure */
@@ -628,9 +574,7 @@ int ZEXPORT gzdirect(file)
 }
 
 /* -- see zlib.h -- */
-int ZEXPORT gzclose_r(file)
-    gzFile file;
-{
+int ZEXPORT gzclose_r(gzFile file) {
     int ret, err;
     gz_statep state;
 
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/gzwrite.c b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/gzwrite.c
index c7b5651d7..435b4621b 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/gzwrite.c
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/gzwrite.c
@@ -1,22 +1,14 @@
 /* gzwrite.c -- zlib functions for writing gzip files
- * Copyright (C) 2004-2017 Mark Adler
+ * Copyright (C) 2004-2019 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
 #include "gzguts.h"
 
-/* Local functions */
-local int gz_init OF((gz_statep));
-local int gz_comp OF((gz_statep, int));
-local int gz_zero OF((gz_statep, z_off64_t));
-local z_size_t gz_write OF((gz_statep, voidpc, z_size_t));
-
 /* Initialize state for writing a gzip file.  Mark initialization by setting
    state->size to non-zero.  Return -1 on a memory allocation failure, or 0 on
    success. */
-local int gz_init(state)
-    gz_statep state;
-{
+local int gz_init(gz_statep state) {
     int ret;
     z_streamp strm = &(state->strm);
 
@@ -70,10 +62,7 @@ local int gz_init(state)
    deflate() flush value.  If flush is Z_FINISH, then the deflate() state is
    reset to start a new gzip stream.  If gz->direct is true, then simply write
    to the output file without compressing, and ignore flush. */
-local int gz_comp(state, flush)
-    gz_statep state;
-    int flush;
-{
+local int gz_comp(gz_statep state, int flush) {
     int ret, writ;
     unsigned have, put, max = ((unsigned)-1 >> 2) + 1;
     z_streamp strm = &(state->strm);
@@ -97,6 +86,15 @@ local int gz_comp(state, flush)
         return 0;
     }
 
+    /* check for a pending reset */
+    if (state->reset) {
+        /* don't start a new gzip member unless there is data to write */
+        if (strm->avail_in == 0)
+            return 0;
+        deflateReset(strm);
+        state->reset = 0;
+    }
+
     /* run deflate() on provided input until it produces no more output */
     ret = Z_OK;
     do {
@@ -134,7 +132,7 @@ local int gz_comp(state, flush)
 
     /* if that completed a deflate stream, allow another to start */
     if (flush == Z_FINISH)
-        deflateReset(strm);
+        state->reset = 1;
 
     /* all done, no errors */
     return 0;
@@ -142,10 +140,7 @@ local int gz_comp(state, flush)
 
 /* Compress len zeros to output.  Return -1 on a write error or memory
    allocation failure by gz_comp(), or 0 on success. */
-local int gz_zero(state, len)
-    gz_statep state;
-    z_off64_t len;
-{
+local int gz_zero(gz_statep state, z_off64_t len) {
     int first;
     unsigned n;
     z_streamp strm = &(state->strm);
@@ -175,11 +170,7 @@ local int gz_zero(state, len)
 
 /* Write len bytes from buf to file.  Return the number of bytes written.  If
    the returned value is less than len, then there was an error. */
-local z_size_t gz_write(state, buf, len)
-    gz_statep state;
-    voidpc buf;
-    z_size_t len;
-{
+local z_size_t gz_write(gz_statep state, voidpc buf, z_size_t len) {
     z_size_t put = len;
 
     /* if len is zero, avoid unnecessary operations */
@@ -209,7 +200,7 @@ local z_size_t gz_write(state, buf, len)
                               state->in);
             copy = state->size - have;
             if (copy > len)
-                copy = len;
+                copy = (unsigned)len;
             memcpy(state->in + have, buf, copy);
             state->strm.avail_in += copy;
             state->x.pos += copy;
@@ -229,7 +220,7 @@ local z_size_t gz_write(state, buf, len)
         do {
             unsigned n = (unsigned)-1;
             if (n > len)
-                n = len;
+                n = (unsigned)len;
             state->strm.avail_in = n;
             state->x.pos += n;
             if (gz_comp(state, Z_NO_FLUSH) == -1)
@@ -243,11 +234,7 @@ local z_size_t gz_write(state, buf, len)
 }
 
 /* -- see zlib.h -- */
-int ZEXPORT gzwrite(file, buf, len)
-    gzFile file;
-    voidpc buf;
-    unsigned len;
-{
+int ZEXPORT gzwrite(gzFile file, voidpc buf, unsigned len) {
     gz_statep state;
 
     /* get internal structure */
@@ -271,12 +258,8 @@ int ZEXPORT gzwrite(file, buf, len)
 }
 
 /* -- see zlib.h -- */
-z_size_t ZEXPORT gzfwrite(buf, size, nitems, file)
-    voidpc buf;
-    z_size_t size;
-    z_size_t nitems;
-    gzFile file;
-{
+z_size_t ZEXPORT gzfwrite(voidpc buf, z_size_t size, z_size_t nitems,
+                          gzFile file) {
     z_size_t len;
     gz_statep state;
 
@@ -301,10 +284,7 @@ z_size_t ZEXPORT gzfwrite(buf, size, nitems, file)
 }
 
 /* -- see zlib.h -- */
-int ZEXPORT gzputc(file, c)
-    gzFile file;
-    int c;
-{
+int ZEXPORT gzputc(gzFile file, int c) {
     unsigned have;
     unsigned char buf[1];
     gz_statep state;
@@ -349,12 +329,8 @@ int ZEXPORT gzputc(file, c)
 }
 
 /* -- see zlib.h -- */
-int ZEXPORT gzputs(file, str)
-    gzFile file;
-    const char *str;
-{
-    int ret;
-    z_size_t len;
+int ZEXPORT gzputs(gzFile file, const char *s) {
+    z_size_t len, put;
     gz_statep state;
 
     /* get internal structure */
@@ -367,17 +343,20 @@ int ZEXPORT gzputs(file, str)
         return -1;
 
     /* write string */
-    len = strlen(str);
-    ret = gz_write(state, str, len);
-    return ret == 0 && len != 0 ? -1 : ret;
+    len = strlen(s);
+    if ((int)len < 0 || (unsigned)len != len) {
+        gz_error(state, Z_STREAM_ERROR, "string length does not fit in int");
+        return -1;
+    }
+    put = gz_write(state, s, len);
+    return put < len ? -1 : (int)len;
 }
 
 #if defined(STDC) || defined(Z_HAVE_STDARG_H)
 #include <stdarg.h>
 
 /* -- see zlib.h -- */
-int ZEXPORTVA gzvprintf(gzFile file, const char *format, va_list va)
-{
+int ZEXPORTVA gzvprintf(gzFile file, const char *format, va_list va) {
     int len;
     unsigned left;
     char *next;
@@ -441,15 +420,14 @@ int ZEXPORTVA gzvprintf(gzFile file, const char *format, va_list va)
         strm->avail_in = state->size;
         if (gz_comp(state, Z_NO_FLUSH) == -1)
             return state->err;
-        memcpy(state->in, state->in + state->size, left);
+        memmove(state->in, state->in + state->size, left);
         strm->next_in = state->in;
         strm->avail_in = left;
     }
     return len;
 }
 
-int ZEXPORTVA gzprintf(gzFile file, const char *format, ...)
-{
+int ZEXPORTVA gzprintf(gzFile file, const char *format, ...) {
     va_list va;
     int ret;
 
@@ -462,13 +440,10 @@ int ZEXPORTVA gzprintf(gzFile file, const char *format, ...)
 #else /* !STDC && !Z_HAVE_STDARG_H */
 
 /* -- see zlib.h -- */
-int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
-                       a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)
-    gzFile file;
-    const char *format;
-    int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
-        a11, a12, a13, a14, a15, a16, a17, a18, a19, a20;
-{
+int ZEXPORTVA gzprintf(gzFile file, const char *format, int a1, int a2, int a3,
+                       int a4, int a5, int a6, int a7, int a8, int a9, int a10,
+                       int a11, int a12, int a13, int a14, int a15, int a16,
+                       int a17, int a18, int a19, int a20) {
     unsigned len, left;
     char *next;
     gz_statep state;
@@ -540,7 +515,7 @@ int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
         strm->avail_in = state->size;
         if (gz_comp(state, Z_NO_FLUSH) == -1)
             return state->err;
-        memcpy(state->in, state->in + state->size, left);
+        memmove(state->in, state->in + state->size, left);
         strm->next_in = state->in;
         strm->avail_in = left;
     }
@@ -550,10 +525,7 @@ int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
 #endif
 
 /* -- see zlib.h -- */
-int ZEXPORT gzflush(file, flush)
-    gzFile file;
-    int flush;
-{
+int ZEXPORT gzflush(gzFile file, int flush) {
     gz_statep state;
 
     /* get internal structure */
@@ -582,11 +554,7 @@ int ZEXPORT gzflush(file, flush)
 }
 
 /* -- see zlib.h -- */
-int ZEXPORT gzsetparams(file, level, strategy)
-    gzFile file;
-    int level;
-    int strategy;
-{
+int ZEXPORT gzsetparams(gzFile file, int level, int strategy) {
     gz_statep state;
     z_streamp strm;
 
@@ -597,7 +565,7 @@ int ZEXPORT gzsetparams(file, level, strategy)
     strm = &(state->strm);
 
     /* check that we're writing and that there's no error */
-    if (state->mode != GZ_WRITE || state->err != Z_OK)
+    if (state->mode != GZ_WRITE || state->err != Z_OK || state->direct)
         return Z_STREAM_ERROR;
 
     /* if no change is requested, then do nothing */
@@ -624,9 +592,7 @@ int ZEXPORT gzsetparams(file, level, strategy)
 }
 
 /* -- see zlib.h -- */
-int ZEXPORT gzclose_w(file)
-    gzFile file;
-{
+int ZEXPORT gzclose_w(gzFile file) {
     int ret = Z_OK;
     gz_statep state;
 
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/infback.c b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/infback.c
index 59679ecbf..9bfc30fe5 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/infback.c
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/infback.c
@@ -1,5 +1,5 @@
 /* infback.c -- inflate using a call-back interface
- * Copyright (C) 1995-2016 Mark Adler
+ * Copyright (C) 1995-2022 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -15,9 +15,6 @@
 #include "inflate.h"
 #include "inffast.h"
 
-/* function prototypes */
-local void fixedtables OF((struct inflate_state FAR *state));
-
 /*
    strm provides memory allocation functions in zalloc and zfree, or
    Z_NULL to use the library memory allocation functions.
@@ -25,13 +22,9 @@ local void fixedtables OF((struct inflate_state FAR *state));
    windowBits is in the range 8..15, and window is a user-supplied
    window and output buffer that is 2**windowBits bytes.
  */
-int ZEXPORT inflateBackInit_(strm, windowBits, window, version, stream_size)
-z_streamp strm;
-int windowBits;
-unsigned char FAR *window;
-const char *version;
-int stream_size;
-{
+int ZEXPORT inflateBackInit_(z_streamp strm, int windowBits,
+                             unsigned char FAR *window, const char *version,
+                             int stream_size) {
     struct inflate_state FAR *state;
 
     if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
@@ -66,6 +59,7 @@ int stream_size;
     state->window = window;
     state->wnext = 0;
     state->whave = 0;
+    state->sane = 1;
     return Z_OK;
 }
 
@@ -79,9 +73,7 @@ int stream_size;
    used for threaded applications, since the rewriting of the tables and virgin
    may not be thread-safe.
  */
-local void fixedtables(state)
-struct inflate_state FAR *state;
-{
+local void fixedtables(struct inflate_state FAR *state) {
 #ifdef BUILDFIXED
     static int virgin = 1;
     static code *lenfix, *distfix;
@@ -247,13 +239,8 @@ struct inflate_state FAR *state;
    inflateBack() can also return Z_STREAM_ERROR if the input parameters
    are not correct, i.e. strm is Z_NULL or the state was not initialized.
  */
-int ZEXPORT inflateBack(strm, in, in_desc, out, out_desc)
-z_streamp strm;
-in_func in;
-void FAR *in_desc;
-out_func out;
-void FAR *out_desc;
-{
+int ZEXPORT inflateBack(z_streamp strm, in_func in, void FAR *in_desc,
+                        out_func out, void FAR *out_desc) {
     struct inflate_state FAR *state;
     z_const unsigned char FAR *next;    /* next input */
     unsigned char FAR *put;     /* next output */
@@ -454,11 +441,11 @@ void FAR *out_desc;
             }
 
             /* build code tables -- note: do not change the lenbits or distbits
-               values here (9 and 6) without reading the comments in inftrees.h
+               values here (10 and 9) without reading the comments in inftrees.h
                concerning the ENOUGH constants, which depend on those values */
             state->next = state->codes;
             state->lencode = (code const FAR *)(state->next);
-            state->lenbits = 9;
+            state->lenbits = 10;
             ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
                                 &(state->lenbits), state->work);
             if (ret) {
@@ -467,7 +454,7 @@ void FAR *out_desc;
                 break;
             }
             state->distcode = (code const FAR *)(state->next);
-            state->distbits = 6;
+            state->distbits = 9;
             ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
                             &(state->next), &(state->distbits), state->work);
             if (ret) {
@@ -477,10 +464,12 @@ void FAR *out_desc;
             }
             Tracev((stderr, "inflate:       codes ok\n"));
             state->mode = LEN;
+                /* fallthrough */
 
         case LEN:
             /* use inflate_fast() if we have enough input and output */
-            if (have >= 6 && left >= 258) {
+            if (have >= INFLATE_FAST_MIN_INPUT &&
+                left >= INFLATE_FAST_MIN_OUTPUT) {
                 RESTORE();
                 if (state->whave < state->wsize)
                     state->whave = state->wsize - left;
@@ -604,33 +593,33 @@ void FAR *out_desc;
             break;
 
         case DONE:
-            /* inflate stream terminated properly -- write leftover output */
+            /* inflate stream terminated properly */
             ret = Z_STREAM_END;
-            if (left < state->wsize) {
-                if (out(out_desc, state->window, state->wsize - left))
-                    ret = Z_BUF_ERROR;
-            }
             goto inf_leave;
 
         case BAD:
             ret = Z_DATA_ERROR;
             goto inf_leave;
 
-        default:                /* can't happen, but makes compilers happy */
+        default:
+            /* can't happen, but makes compilers happy */
             ret = Z_STREAM_ERROR;
             goto inf_leave;
         }
 
-    /* Return unused input */
+    /* Write leftover output and return unused input */
   inf_leave:
+    if (left < state->wsize) {
+        if (out(out_desc, state->window, state->wsize - left) &&
+            ret == Z_STREAM_END)
+            ret = Z_BUF_ERROR;
+    }
     strm->next_in = next;
     strm->avail_in = have;
     return ret;
 }
 
-int ZEXPORT inflateBackEnd(strm)
-z_streamp strm;
-{
+int ZEXPORT inflateBackEnd(z_streamp strm) {
     if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
         return Z_STREAM_ERROR;
     ZFREE(strm, strm->state);
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/inffast.c b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/inffast.c
index 0dbd1dbc0..52ed8ca2d 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/inffast.c
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/inffast.c
@@ -18,13 +18,13 @@
    available, an end-of-block is encountered, or a data error is encountered.
    When large enough input and output buffers are supplied to inflate(), for
    example, a 16K input buffer and a 64K output buffer, more than 95% of the
-   inflate execution time is spent in this routine.
+   inflate() execution time is spent in this routine.
 
    Entry assumptions:
 
         state->mode == LEN
-        strm->avail_in >= 6
-        strm->avail_out >= 258
+        strm->avail_in >= INFLATE_FAST_MIN_INPUT (6 bytes)
+        strm->avail_out >= INFLATE_FAST_MIN_OUTPUT (258 bytes)
         start >= strm->avail_out
         state->bits < 8
 
@@ -36,21 +36,22 @@
 
    Notes:
 
+    INFLATE_FAST_MIN_INPUT: 6 bytes
+
     - The maximum input bits used by a length/distance pair is 15 bits for the
       length code, 5 bits for the length extra, 15 bits for the distance code,
       and 13 bits for the distance extra.  This totals 48 bits, or six bytes.
       Therefore if strm->avail_in >= 6, then there is enough input to avoid
       checking for available input while decoding.
 
+    INFLATE_FAST_MIN_OUTPUT: 258 bytes
+
     - The maximum bytes that a single length/distance pair can output is 258
       bytes, which is the maximum length that can be coded.  inflate_fast()
       requires strm->avail_out >= 258 for each loop to avoid checking for
-      output space.
+      available output space while decoding.
  */
-void ZLIB_INTERNAL inflate_fast(strm, start)
-z_streamp strm;
-unsigned start;         /* inflate()'s starting value for strm->avail_out */
-{
+void ZLIB_INTERNAL inflate_fast(z_streamp strm, unsigned start) {
     struct inflate_state FAR *state;
     z_const unsigned char FAR *in;      /* local strm->next_in */
     z_const unsigned char FAR *last;    /* have enough input while in < last */
@@ -70,7 +71,7 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
     code const FAR *dcode;      /* local strm->distcode */
     unsigned lmask;             /* mask for first level of length codes */
     unsigned dmask;             /* mask for first level of distance codes */
-    code here;                  /* retrieved table entry */
+    code const *here;           /* retrieved table entry */
     unsigned op;                /* code bits, operation, extra bits, or */
                                 /*  window position, window bytes to copy */
     unsigned len;               /* match length, unused bytes */
@@ -80,10 +81,10 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
     /* copy state to local variables */
     state = (struct inflate_state FAR *)strm->state;
     in = strm->next_in;
-    last = in + (strm->avail_in - 5);
+    last = in + (strm->avail_in - (INFLATE_FAST_MIN_INPUT - 1));
     out = strm->next_out;
     beg = out - (start - strm->avail_out);
-    end = out + (strm->avail_out - 257);
+    end = out + (strm->avail_out - (INFLATE_FAST_MIN_OUTPUT - 1));
 #ifdef INFLATE_STRICT
     dmax = state->dmax;
 #endif
@@ -107,20 +108,20 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
             hold += (unsigned long)(*in++) << bits;
             bits += 8;
         }
-        here = lcode[hold & lmask];
+        here = lcode + (hold & lmask);
       dolen:
-        op = (unsigned)(here.bits);
+        op = (unsigned)(here->bits);
         hold >>= op;
         bits -= op;
-        op = (unsigned)(here.op);
+        op = (unsigned)(here->op);
         if (op == 0) {                          /* literal */
-            Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
+            Tracevv((stderr, here->val >= 0x20 && here->val < 0x7f ?
                     "inflate:         literal '%c'\n" :
-                    "inflate:         literal 0x%02x\n", here.val));
-            *out++ = (unsigned char)(here.val);
+                    "inflate:         literal 0x%02x\n", here->val));
+            *out++ = (unsigned char)(here->val);
         }
         else if (op & 16) {                     /* length base */
-            len = (unsigned)(here.val);
+            len = (unsigned)(here->val);
             op &= 15;                           /* number of extra bits */
             if (op) {
                 if (bits < op) {
@@ -138,14 +139,14 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
                 hold += (unsigned long)(*in++) << bits;
                 bits += 8;
             }
-            here = dcode[hold & dmask];
+            here = dcode + (hold & dmask);
           dodist:
-            op = (unsigned)(here.bits);
+            op = (unsigned)(here->bits);
             hold >>= op;
             bits -= op;
-            op = (unsigned)(here.op);
+            op = (unsigned)(here->op);
             if (op & 16) {                      /* distance base */
-                dist = (unsigned)(here.val);
+                dist = (unsigned)(here->val);
                 op &= 15;                       /* number of extra bits */
                 if (bits < op) {
                     hold += (unsigned long)(*in++) << bits;
@@ -264,7 +265,7 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
                 }
             }
             else if ((op & 64) == 0) {          /* 2nd level distance code */
-                here = dcode[here.val + (hold & ((1U << op) - 1))];
+                here = dcode + here->val + (hold & ((1U << op) - 1));
                 goto dodist;
             }
             else {
@@ -274,7 +275,7 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
             }
         }
         else if ((op & 64) == 0) {              /* 2nd level length code */
-            here = lcode[here.val + (hold & ((1U << op) - 1))];
+            here = lcode + here->val + (hold & ((1U << op) - 1));
             goto dolen;
         }
         else if (op & 32) {                     /* end-of-block */
@@ -298,9 +299,12 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
     /* update state and return */
     strm->next_in = in;
     strm->next_out = out;
-    strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last));
+    strm->avail_in = (unsigned)(in < last ?
+        (INFLATE_FAST_MIN_INPUT - 1) + (last - in) :
+        (INFLATE_FAST_MIN_INPUT - 1) - (in - last));
     strm->avail_out = (unsigned)(out < end ?
-                                 257 + (end - out) : 257 - (out - end));
+        (INFLATE_FAST_MIN_OUTPUT - 1) + (end - out) :
+        (INFLATE_FAST_MIN_OUTPUT - 1) - (out - end));
     state->hold = hold;
     state->bits = bits;
     return;
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/inffast.h b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/inffast.h
index e5c1aa4ca..9ff6ce3b6 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/inffast.h
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/inffast.h
@@ -8,4 +8,19 @@
    subject to change. Applications should only use zlib.h.
  */
 
-void ZLIB_INTERNAL inflate_fast OF((z_streamp strm, unsigned start));
+/* INFLATE_FAST_MIN_INPUT: the minimum number of input bytes needed so that
+   we can safely call inflate_fast() with only one up-front bounds check. One
+   length/distance code pair (15 bits for the length code, 5 bits for length
+   extra, 15 bits for the distance code, 13 bits for distance extra) requires
+   reading up to 48 input bits (6 bytes).
+*/
+#define INFLATE_FAST_MIN_INPUT 6
+
+/* INFLATE_FAST_MIN_OUTPUT: the minimum number of output bytes needed so that
+   we can safely call inflate_fast() with only one up-front bounds check. One
+   length/distance code pair can output up to 258 bytes, which is the maximum
+   length that can be coded.
+ */
+#define INFLATE_FAST_MIN_OUTPUT 258
+
+void ZLIB_INTERNAL inflate_fast(z_streamp strm, unsigned start);
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/inflate.c b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/inflate.c
index ac333e8c2..5abbd0746 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/inflate.c
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/inflate.c
@@ -1,5 +1,5 @@
 /* inflate.c -- zlib decompression
- * Copyright (C) 1995-2016 Mark Adler
+ * Copyright (C) 1995-2022 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -91,20 +91,7 @@
 #  endif
 #endif
 
-/* function prototypes */
-local int inflateStateCheck OF((z_streamp strm));
-local void fixedtables OF((struct inflate_state FAR *state));
-local int updatewindow OF((z_streamp strm, const unsigned char FAR *end,
-                           unsigned copy));
-#ifdef BUILDFIXED
-   void makefixed OF((void));
-#endif
-local unsigned syncsearch OF((unsigned FAR *have, const unsigned char FAR *buf,
-                              unsigned len));
-
-local int inflateStateCheck(strm)
-z_streamp strm;
-{
+local int inflateStateCheck(z_streamp strm) {
     struct inflate_state FAR *state;
     if (strm == Z_NULL ||
         strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0)
@@ -116,9 +103,7 @@ z_streamp strm;
     return 0;
 }
 
-int ZEXPORT inflateResetKeep(strm)
-z_streamp strm;
-{
+int ZEXPORT inflateResetKeep(z_streamp strm) {
     struct inflate_state FAR *state;
 
     if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
@@ -130,6 +115,7 @@ z_streamp strm;
     state->mode = HEAD;
     state->last = 0;
     state->havedict = 0;
+    state->flags = -1;
     state->dmax = 32768U;
     state->head = Z_NULL;
     state->hold = 0;
@@ -141,9 +127,7 @@ z_streamp strm;
     return Z_OK;
 }
 
-int ZEXPORT inflateReset(strm)
-z_streamp strm;
-{
+int ZEXPORT inflateReset(z_streamp strm) {
     struct inflate_state FAR *state;
 
     if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
@@ -154,10 +138,7 @@ z_streamp strm;
     return inflateResetKeep(strm);
 }
 
-int ZEXPORT inflateReset2(strm, windowBits)
-z_streamp strm;
-int windowBits;
-{
+int ZEXPORT inflateReset2(z_streamp strm, int windowBits) {
     int wrap;
     struct inflate_state FAR *state;
 
@@ -167,6 +148,8 @@ int windowBits;
 
     /* extract wrap request from windowBits parameter */
     if (windowBits < 0) {
+        if (windowBits < -15)
+            return Z_STREAM_ERROR;
         wrap = 0;
         windowBits = -windowBits;
     }
@@ -192,12 +175,8 @@ int windowBits;
     return inflateReset(strm);
 }
 
-int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size)
-z_streamp strm;
-int windowBits;
-const char *version;
-int stream_size;
-{
+int ZEXPORT inflateInit2_(z_streamp strm, int windowBits,
+                          const char *version, int stream_size) {
     int ret;
     struct inflate_state FAR *state;
 
@@ -228,6 +207,7 @@ int stream_size;
     state->strm = strm;
     state->window = Z_NULL;
     state->mode = HEAD;     /* to pass state test in inflateReset2() */
+    state->check = 1L;      /* 1L is the result of adler32() zero length data */
     ret = inflateReset2(strm, windowBits);
     if (ret != Z_OK) {
         ZFREE(strm, state);
@@ -236,22 +216,17 @@ int stream_size;
     return ret;
 }
 
-int ZEXPORT inflateInit_(strm, version, stream_size)
-z_streamp strm;
-const char *version;
-int stream_size;
-{
+int ZEXPORT inflateInit_(z_streamp strm, const char *version,
+                         int stream_size) {
     return inflateInit2_(strm, DEF_WBITS, version, stream_size);
 }
 
-int ZEXPORT inflatePrime(strm, bits, value)
-z_streamp strm;
-int bits;
-int value;
-{
+int ZEXPORT inflatePrime(z_streamp strm, int bits, int value) {
     struct inflate_state FAR *state;
 
     if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    if (bits == 0)
+        return Z_OK;
     state = (struct inflate_state FAR *)strm->state;
     if (bits < 0) {
         state->hold = 0;
@@ -275,9 +250,7 @@ int value;
    used for threaded applications, since the rewriting of the tables and virgin
    may not be thread-safe.
  */
-local void fixedtables(state)
-struct inflate_state FAR *state;
-{
+local void fixedtables(struct inflate_state FAR *state) {
 #ifdef BUILDFIXED
     static int virgin = 1;
     static code *lenfix, *distfix;
@@ -339,7 +312,7 @@ struct inflate_state FAR *state;
 
     a.out > inffixed.h
  */
-void makefixed()
+void makefixed(void)
 {
     unsigned low, size;
     struct inflate_state state;
@@ -393,11 +366,7 @@ void makefixed()
    output will fall in the output data, making match copies simpler and faster.
    The advantage may be dependent on the size of the processor's data caches.
  */
-local int updatewindow(strm, end, copy)
-z_streamp strm;
-const Bytef *end;
-unsigned copy;
-{
+local int updatewindow(z_streamp strm, const Bytef *end, unsigned copy) {
     struct inflate_state FAR *state;
     unsigned dist;
 
@@ -447,10 +416,10 @@ unsigned copy;
 
 /* check function to use adler32() for zlib or crc32() for gzip */
 #ifdef GUNZIP
-#  define UPDATE(check, buf, len) \
+#  define UPDATE_CHECK(check, buf, len) \
     (state->flags ? crc32(check, buf, len) : adler32(check, buf, len))
 #else
-#  define UPDATE(check, buf, len) adler32(check, buf, len)
+#  define UPDATE_CHECK(check, buf, len) adler32(check, buf, len)
 #endif
 
 /* check macros for header crc */
@@ -619,10 +588,7 @@ unsigned copy;
    will return Z_BUF_ERROR if it has not reached the end of the stream.
  */
 
-int ZEXPORT inflate(strm, flush)
-z_streamp strm;
-int flush;
-{
+int ZEXPORT inflate(z_streamp strm, int flush) {
     struct inflate_state FAR *state;
     z_const unsigned char FAR *next;    /* next input */
     unsigned char FAR *put;     /* next output */
@@ -670,7 +636,6 @@ int flush;
                 state->mode = FLAGS;
                 break;
             }
-            state->flags = 0;           /* expect zlib header */
             if (state->head != Z_NULL)
                 state->head->done = -1;
             if (!(state->wrap & 1) ||   /* check if zlib header allowed */
@@ -697,6 +662,7 @@ int flush;
                 break;
             }
             state->dmax = 1U << len;
+            state->flags = 0;               /* indicate zlib header */
             Tracev((stderr, "inflate:   zlib header ok\n"));
             strm->adler = state->check = adler32(0L, Z_NULL, 0);
             state->mode = hold & 0x200 ? DICTID : TYPE;
@@ -722,6 +688,7 @@ int flush;
                 CRC2(state->check, hold);
             INITBITS();
             state->mode = TIME;
+                /* fallthrough */
         case TIME:
             NEEDBITS(32);
             if (state->head != Z_NULL)
@@ -730,6 +697,7 @@ int flush;
                 CRC4(state->check, hold);
             INITBITS();
             state->mode = OS;
+                /* fallthrough */
         case OS:
             NEEDBITS(16);
             if (state->head != Z_NULL) {
@@ -740,6 +708,7 @@ int flush;
                 CRC2(state->check, hold);
             INITBITS();
             state->mode = EXLEN;
+                /* fallthrough */
         case EXLEN:
             if (state->flags & 0x0400) {
                 NEEDBITS(16);
@@ -753,14 +722,16 @@ int flush;
             else if (state->head != Z_NULL)
                 state->head->extra = Z_NULL;
             state->mode = EXTRA;
+                /* fallthrough */
         case EXTRA:
             if (state->flags & 0x0400) {
                 copy = state->length;
                 if (copy > have) copy = have;
                 if (copy) {
                     if (state->head != Z_NULL &&
-                        state->head->extra != Z_NULL) {
-                        len = state->head->extra_len - state->length;
+                        state->head->extra != Z_NULL &&
+                        (len = state->head->extra_len - state->length) <
+                            state->head->extra_max) {
                         zmemcpy(state->head->extra + len, next,
                                 len + copy > state->head->extra_max ?
                                 state->head->extra_max - len : copy);
@@ -775,6 +746,7 @@ int flush;
             }
             state->length = 0;
             state->mode = NAME;
+                /* fallthrough */
         case NAME:
             if (state->flags & 0x0800) {
                 if (have == 0) goto inf_leave;
@@ -796,6 +768,7 @@ int flush;
                 state->head->name = Z_NULL;
             state->length = 0;
             state->mode = COMMENT;
+                /* fallthrough */
         case COMMENT:
             if (state->flags & 0x1000) {
                 if (have == 0) goto inf_leave;
@@ -816,6 +789,7 @@ int flush;
             else if (state->head != Z_NULL)
                 state->head->comment = Z_NULL;
             state->mode = HCRC;
+                /* fallthrough */
         case HCRC:
             if (state->flags & 0x0200) {
                 NEEDBITS(16);
@@ -839,6 +813,7 @@ int flush;
             strm->adler = state->check = ZSWAP32(hold);
             INITBITS();
             state->mode = DICT;
+                /* fallthrough */
         case DICT:
             if (state->havedict == 0) {
                 RESTORE();
@@ -846,8 +821,10 @@ int flush;
             }
             strm->adler = state->check = adler32(0L, Z_NULL, 0);
             state->mode = TYPE;
+                /* fallthrough */
         case TYPE:
             if (flush == Z_BLOCK || flush == Z_TREES) goto inf_leave;
+                /* fallthrough */
         case TYPEDO:
             if (state->last) {
                 BYTEBITS();
@@ -898,8 +875,10 @@ int flush;
             INITBITS();
             state->mode = COPY_;
             if (flush == Z_TREES) goto inf_leave;
+                /* fallthrough */
         case COPY_:
             state->mode = COPY;
+                /* fallthrough */
         case COPY:
             copy = state->length;
             if (copy) {
@@ -935,6 +914,7 @@ int flush;
             Tracev((stderr, "inflate:       table sizes ok\n"));
             state->have = 0;
             state->mode = LENLENS;
+                /* fallthrough */
         case LENLENS:
             while (state->have < state->ncode) {
                 NEEDBITS(3);
@@ -956,6 +936,7 @@ int flush;
             Tracev((stderr, "inflate:       code lengths ok\n"));
             state->have = 0;
             state->mode = CODELENS;
+                /* fallthrough */
         case CODELENS:
             while (state->have < state->nlen + state->ndist) {
                 for (;;) {
@@ -1015,11 +996,11 @@ int flush;
             }
 
             /* build code tables -- note: do not change the lenbits or distbits
-               values here (9 and 6) without reading the comments in inftrees.h
+               values here (10 and 9) without reading the comments in inftrees.h
                concerning the ENOUGH constants, which depend on those values */
             state->next = state->codes;
             state->lencode = (const code FAR *)(state->next);
-            state->lenbits = 9;
+            state->lenbits = 10;
             ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
                                 &(state->lenbits), state->work);
             if (ret) {
@@ -1028,7 +1009,7 @@ int flush;
                 break;
             }
             state->distcode = (const code FAR *)(state->next);
-            state->distbits = 6;
+            state->distbits = 9;
             ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
                             &(state->next), &(state->distbits), state->work);
             if (ret) {
@@ -1039,10 +1020,13 @@ int flush;
             Tracev((stderr, "inflate:       codes ok\n"));
             state->mode = LEN_;
             if (flush == Z_TREES) goto inf_leave;
+                /* fallthrough */
         case LEN_:
             state->mode = LEN;
+                /* fallthrough */
         case LEN:
-            if (have >= 6 && left >= 258) {
+            if (have >= INFLATE_FAST_MIN_INPUT &&
+                left >= INFLATE_FAST_MIN_OUTPUT) {
                 RESTORE();
                 inflate_fast(strm, out);
                 LOAD();
@@ -1090,6 +1074,7 @@ int flush;
             }
             state->extra = (unsigned)(here.op) & 15;
             state->mode = LENEXT;
+                /* fallthrough */
         case LENEXT:
             if (state->extra) {
                 NEEDBITS(state->extra);
@@ -1100,6 +1085,7 @@ int flush;
             Tracevv((stderr, "inflate:         length %u\n", state->length));
             state->was = state->length;
             state->mode = DIST;
+                /* fallthrough */
         case DIST:
             for (;;) {
                 here = state->distcode[BITS(state->distbits)];
@@ -1127,6 +1113,7 @@ int flush;
             state->offset = (unsigned)here.val;
             state->extra = (unsigned)(here.op) & 15;
             state->mode = DISTEXT;
+                /* fallthrough */
         case DISTEXT:
             if (state->extra) {
                 NEEDBITS(state->extra);
@@ -1143,6 +1130,7 @@ int flush;
 #endif
             Tracevv((stderr, "inflate:         distance %u\n", state->offset));
             state->mode = MATCH;
+                /* fallthrough */
         case MATCH:
             if (left == 0) goto inf_leave;
             copy = out - left;
@@ -1202,7 +1190,7 @@ int flush;
                 state->total += out;
                 if ((state->wrap & 4) && out)
                     strm->adler = state->check =
-                        UPDATE(state->check, put - out, out);
+                        UPDATE_CHECK(state->check, put - out, out);
                 out = left;
                 if ((state->wrap & 4) && (
 #ifdef GUNZIP
@@ -1218,10 +1206,11 @@ int flush;
             }
 #ifdef GUNZIP
             state->mode = LENGTH;
+                /* fallthrough */
         case LENGTH:
             if (state->wrap && state->flags) {
                 NEEDBITS(32);
-                if (hold != (state->total & 0xffffffffUL)) {
+                if ((state->wrap & 4) && hold != (state->total & 0xffffffff)) {
                     strm->msg = (char *)"incorrect length check";
                     state->mode = BAD;
                     break;
@@ -1231,6 +1220,7 @@ int flush;
             }
 #endif
             state->mode = DONE;
+                /* fallthrough */
         case DONE:
             ret = Z_STREAM_END;
             goto inf_leave;
@@ -1240,6 +1230,7 @@ int flush;
         case MEM:
             return Z_MEM_ERROR;
         case SYNC:
+                /* fallthrough */
         default:
             return Z_STREAM_ERROR;
         }
@@ -1265,7 +1256,7 @@ int flush;
     state->total += out;
     if ((state->wrap & 4) && out)
         strm->adler = state->check =
-            UPDATE(state->check, strm->next_out - out, out);
+            UPDATE_CHECK(state->check, strm->next_out - out, out);
     strm->data_type = (int)state->bits + (state->last ? 64 : 0) +
                       (state->mode == TYPE ? 128 : 0) +
                       (state->mode == LEN_ || state->mode == COPY_ ? 256 : 0);
@@ -1274,9 +1265,7 @@ int flush;
     return ret;
 }
 
-int ZEXPORT inflateEnd(strm)
-z_streamp strm;
-{
+int ZEXPORT inflateEnd(z_streamp strm) {
     struct inflate_state FAR *state;
     if (inflateStateCheck(strm))
         return Z_STREAM_ERROR;
@@ -1288,11 +1277,8 @@ z_streamp strm;
     return Z_OK;
 }
 
-int ZEXPORT inflateGetDictionary(strm, dictionary, dictLength)
-z_streamp strm;
-Bytef *dictionary;
-uInt *dictLength;
-{
+int ZEXPORT inflateGetDictionary(z_streamp strm, Bytef *dictionary,
+                                 uInt *dictLength) {
     struct inflate_state FAR *state;
 
     /* check state */
@@ -1311,11 +1297,8 @@ uInt *dictLength;
     return Z_OK;
 }
 
-int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength)
-z_streamp strm;
-const Bytef *dictionary;
-uInt dictLength;
-{
+int ZEXPORT inflateSetDictionary(z_streamp strm, const Bytef *dictionary,
+                                 uInt dictLength) {
     struct inflate_state FAR *state;
     unsigned long dictid;
     int ret;
@@ -1346,10 +1329,7 @@ uInt dictLength;
     return Z_OK;
 }
 
-int ZEXPORT inflateGetHeader(strm, head)
-z_streamp strm;
-gz_headerp head;
-{
+int ZEXPORT inflateGetHeader(z_streamp strm, gz_headerp head) {
     struct inflate_state FAR *state;
 
     /* check state */
@@ -1374,11 +1354,8 @@ gz_headerp head;
    called again with more data and the *have state.  *have is initialized to
    zero for the first call.
  */
-local unsigned syncsearch(have, buf, len)
-unsigned FAR *have;
-const unsigned char FAR *buf;
-unsigned len;
-{
+local unsigned syncsearch(unsigned FAR *have, const unsigned char FAR *buf,
+                          unsigned len) {
     unsigned got;
     unsigned next;
 
@@ -1397,10 +1374,9 @@ unsigned len;
     return next;
 }
 
-int ZEXPORT inflateSync(strm)
-z_streamp strm;
-{
+int ZEXPORT inflateSync(z_streamp strm) {
     unsigned len;               /* number of bytes to look at or looked at */
+    int flags;                  /* temporary to save header status */
     unsigned long in, out;      /* temporary to save total_in and total_out */
     unsigned char buf[4];       /* to restore bit buffer to byte string */
     struct inflate_state FAR *state;
@@ -1433,9 +1409,15 @@ z_streamp strm;
 
     /* return no joy or set up to restart inflate() on a new block */
     if (state->have != 4) return Z_DATA_ERROR;
+    if (state->flags == -1)
+        state->wrap = 0;    /* if no header yet, treat as raw */
+    else
+        state->wrap &= ~4;  /* no point in computing a check value now */
+    flags = state->flags;
     in = strm->total_in;  out = strm->total_out;
     inflateReset(strm);
     strm->total_in = in;  strm->total_out = out;
+    state->flags = flags;
     state->mode = TYPE;
     return Z_OK;
 }
@@ -1448,9 +1430,7 @@ z_streamp strm;
    block. When decompressing, PPP checks that at the end of input packet,
    inflate is waiting for these length bytes.
  */
-int ZEXPORT inflateSyncPoint(strm)
-z_streamp strm;
-{
+int ZEXPORT inflateSyncPoint(z_streamp strm) {
     struct inflate_state FAR *state;
 
     if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
@@ -1458,10 +1438,7 @@ z_streamp strm;
     return state->mode == STORED && state->bits == 0;
 }
 
-int ZEXPORT inflateCopy(dest, source)
-z_streamp dest;
-z_streamp source;
-{
+int ZEXPORT inflateCopy(z_streamp dest, z_streamp source) {
     struct inflate_state FAR *state;
     struct inflate_state FAR *copy;
     unsigned char FAR *window;
@@ -1505,10 +1482,7 @@ z_streamp source;
     return Z_OK;
 }
 
-int ZEXPORT inflateUndermine(strm, subvert)
-z_streamp strm;
-int subvert;
-{
+int ZEXPORT inflateUndermine(z_streamp strm, int subvert) {
     struct inflate_state FAR *state;
 
     if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
@@ -1523,24 +1497,19 @@ int subvert;
 #endif
 }
 
-int ZEXPORT inflateValidate(strm, check)
-z_streamp strm;
-int check;
-{
+int ZEXPORT inflateValidate(z_streamp strm, int check) {
     struct inflate_state FAR *state;
 
     if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
     state = (struct inflate_state FAR *)strm->state;
-    if (check)
+    if (check && state->wrap)
         state->wrap |= 4;
     else
         state->wrap &= ~4;
     return Z_OK;
 }
 
-long ZEXPORT inflateMark(strm)
-z_streamp strm;
-{
+long ZEXPORT inflateMark(z_streamp strm) {
     struct inflate_state FAR *state;
 
     if (inflateStateCheck(strm))
@@ -1551,9 +1520,7 @@ z_streamp strm;
             (state->mode == MATCH ? state->was - state->length : 0));
 }
 
-unsigned long ZEXPORT inflateCodesUsed(strm)
-z_streamp strm;
-{
+unsigned long ZEXPORT inflateCodesUsed(z_streamp strm) {
     struct inflate_state FAR *state;
     if (inflateStateCheck(strm)) return (unsigned long)-1;
     state = (struct inflate_state FAR *)strm->state;
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/inflate.h b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/inflate.h
index a46cce6b6..f127b6b1f 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/inflate.h
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/inflate.h
@@ -1,5 +1,5 @@
 /* inflate.h -- internal inflate state definition
- * Copyright (C) 1995-2016 Mark Adler
+ * Copyright (C) 1995-2019 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -86,7 +86,8 @@ struct inflate_state {
     int wrap;                   /* bit 0 true for zlib, bit 1 true for gzip,
                                    bit 2 true to validate check value */
     int havedict;               /* true if dictionary provided */
-    int flags;                  /* gzip header method and flags (0 if zlib) */
+    int flags;                  /* gzip header method and flags, 0 if zlib, or
+                                   -1 if raw or no header yet */
     unsigned dmax;              /* zlib header max distance (INFLATE_STRICT) */
     unsigned long check;        /* protected copy of check value */
     unsigned long total;        /* protected copy of output count */
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/inftrees.c b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/inftrees.c
index 2ea08fc13..afc4c4212 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/inftrees.c
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/inftrees.c
@@ -1,5 +1,5 @@
 /* inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2017 Mark Adler
+ * Copyright (C) 1995-2022 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -9,7 +9,7 @@
 #define MAXBITS 15
 
 const char inflate_copyright[] =
-   " inflate 1.2.11 Copyright 1995-2017 Mark Adler ";
+   " inflate 1.2.13.1 Copyright 1995-2022 Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
@@ -29,14 +29,9 @@ const char inflate_copyright[] =
    table index bits.  It will differ if the request is greater than the
    longest code or if it is less than the shortest code.
  */
-int ZLIB_INTERNAL inflate_table(type, lens, codes, table, bits, work)
-codetype type;
-unsigned short FAR *lens;
-unsigned codes;
-code FAR * FAR *table;
-unsigned FAR *bits;
-unsigned short FAR *work;
-{
+int ZLIB_INTERNAL inflate_table(codetype type, unsigned short FAR *lens,
+                                unsigned codes, code FAR * FAR *table,
+                                unsigned FAR *bits, unsigned short FAR *work) {
     unsigned len;               /* a code's length in bits */
     unsigned sym;               /* index of code symbols */
     unsigned min, max;          /* minimum and maximum code lengths */
@@ -62,7 +57,7 @@ unsigned short FAR *work;
         35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
     static const unsigned short lext[31] = { /* Length codes 257..285 extra */
         16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
-        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 77, 202};
+        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 77, 76};
     static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
         1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
         257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/inftrees.h b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/inftrees.h
index baa53a0b1..f11f29c07 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/inftrees.h
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/inftrees.h
@@ -36,17 +36,17 @@ typedef struct {
  */
 
 /* Maximum size of the dynamic table.  The maximum number of code structures is
-   1444, which is the sum of 852 for literal/length codes and 592 for distance
+   1924, which is the sum of 1332 for literal/length codes and 592 for distance
    codes.  These values were found by exhaustive searches using the program
-   examples/enough.c found in the zlib distribtution.  The arguments to that
+   examples/enough.c found in the zlib distribution.  The arguments to that
    program are the number of symbols, the initial root table size, and the
-   maximum bit length of a code.  "enough 286 9 15" for literal/length codes
-   returns returns 852, and "enough 30 6 15" for distance codes returns 592.
-   The initial root table size (9 or 6) is found in the fifth argument of the
+   maximum bit length of a code.  "enough 286 10 15" for literal/length codes
+   returns returns 1332, and "enough 30 9 15" for distance codes returns 592.
+   The initial root table size (10 or 9) is found in the fifth argument of the
    inflate_table() calls in inflate.c and infback.c.  If the root table size is
    changed, then these maximum sizes would be need to be recalculated and
    updated. */
-#define ENOUGH_LENS 852
+#define ENOUGH_LENS 1332
 #define ENOUGH_DISTS 592
 #define ENOUGH (ENOUGH_LENS+ENOUGH_DISTS)
 
@@ -57,6 +57,6 @@ typedef enum {
     DISTS
 } codetype;
 
-int ZLIB_INTERNAL inflate_table OF((codetype type, unsigned short FAR *lens,
-                             unsigned codes, code FAR * FAR *table,
-                             unsigned FAR *bits, unsigned short FAR *work));
+int ZLIB_INTERNAL inflate_table(codetype type, unsigned short FAR *lens,
+                                unsigned codes, code FAR * FAR *table,
+                                unsigned FAR *bits, unsigned short FAR *work);
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/names.h b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/names.h
deleted file mode 100644
index 3436baa4e..000000000
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/names.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/* Copyright 2017 The Chromium Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file. */
-
-#ifndef THIRD_PARTY_ZLIB_NAMES_H_
-#define THIRD_PARTY_ZLIB_NAMES_H_
-
-/* Rename all zlib names with a Cr_z_ prefix. This is based on the Z_PREFIX
- * option from zconf.h, but with a custom prefix. Where zconf.h would rename
- * both a macro and its underscore-suffixed internal implementation (such as
- * deflateInit2 and deflateInit2_), only the implementation is renamed here.
- * The Byte type is also omitted.
- *
- * To generate this list, run
- * sed -rn -e 's/^# *define +([^ ]+) +(z_[^ ]+)$/#define \1 Cr_\2/p' zconf.h
- * (use -E instead of -r on macOS).
- *
- * gzread is also addressed by modifications in gzread.c and zlib.h. */
-
-#define Z_CR_PREFIX_SET
-
-#define _dist_code Cr_z__dist_code
-#define _length_code Cr_z__length_code
-#define _tr_align Cr_z__tr_align
-#define _tr_flush_bits Cr_z__tr_flush_bits
-#define _tr_flush_block Cr_z__tr_flush_block
-#define _tr_init Cr_z__tr_init
-#define _tr_stored_block Cr_z__tr_stored_block
-#define _tr_tally Cr_z__tr_tally
-#define adler32 Cr_z_adler32
-#define adler32_combine Cr_z_adler32_combine
-#define adler32_combine64 Cr_z_adler32_combine64
-#define adler32_z Cr_z_adler32_z
-#define compress Cr_z_compress
-#define compress2 Cr_z_compress2
-#define compressBound Cr_z_compressBound
-#define crc32 Cr_z_crc32
-#define crc32_combine Cr_z_crc32_combine
-#define crc32_combine64 Cr_z_crc32_combine64
-#define crc32_z Cr_z_crc32_z
-#define deflate Cr_z_deflate
-#define deflateBound Cr_z_deflateBound
-#define deflateCopy Cr_z_deflateCopy
-#define deflateEnd Cr_z_deflateEnd
-#define deflateGetDictionary Cr_z_deflateGetDictionary
-/* #undef deflateInit */
-/* #undef deflateInit2 */
-#define deflateInit2_ Cr_z_deflateInit2_
-#define deflateInit_ Cr_z_deflateInit_
-#define deflateParams Cr_z_deflateParams
-#define deflatePending Cr_z_deflatePending
-#define deflatePrime Cr_z_deflatePrime
-#define deflateReset Cr_z_deflateReset
-#define deflateResetKeep Cr_z_deflateResetKeep
-#define deflateSetDictionary Cr_z_deflateSetDictionary
-#define deflateSetHeader Cr_z_deflateSetHeader
-#define deflateTune Cr_z_deflateTune
-#define deflate_copyright Cr_z_deflate_copyright
-#define get_crc_table Cr_z_get_crc_table
-#define gz_error Cr_z_gz_error
-#define gz_intmax Cr_z_gz_intmax
-#define gz_strwinerror Cr_z_gz_strwinerror
-#define gzbuffer Cr_z_gzbuffer
-#define gzclearerr Cr_z_gzclearerr
-#define gzclose Cr_z_gzclose
-#define gzclose_r Cr_z_gzclose_r
-#define gzclose_w Cr_z_gzclose_w
-#define gzdirect Cr_z_gzdirect
-#define gzdopen Cr_z_gzdopen
-#define gzeof Cr_z_gzeof
-#define gzerror Cr_z_gzerror
-#define gzflush Cr_z_gzflush
-#define gzfread Cr_z_gzfread
-#define gzfwrite Cr_z_gzfwrite
-#define gzgetc Cr_z_gzgetc
-#define gzgetc_ Cr_z_gzgetc_
-#define gzgets Cr_z_gzgets
-#define gzoffset Cr_z_gzoffset
-#define gzoffset64 Cr_z_gzoffset64
-#define gzopen Cr_z_gzopen
-#define gzopen64 Cr_z_gzopen64
-#define gzopen_w Cr_z_gzopen_w
-#define gzprintf Cr_z_gzprintf
-#define gzputc Cr_z_gzputc
-#define gzputs Cr_z_gzputs
-#define gzread Cr_z_gzread
-#define gzrewind Cr_z_gzrewind
-#define gzseek Cr_z_gzseek
-#define gzseek64 Cr_z_gzseek64
-#define gzsetparams Cr_z_gzsetparams
-#define gztell Cr_z_gztell
-#define gztell64 Cr_z_gztell64
-#define gzungetc Cr_z_gzungetc
-#define gzvprintf Cr_z_gzvprintf
-#define gzwrite Cr_z_gzwrite
-#define inflate Cr_z_inflate
-#define inflateBack Cr_z_inflateBack
-#define inflateBackEnd Cr_z_inflateBackEnd
-/* #undef inflateBackInit */
-#define inflateBackInit_ Cr_z_inflateBackInit_
-#define inflateCodesUsed Cr_z_inflateCodesUsed
-#define inflateCopy Cr_z_inflateCopy
-#define inflateEnd Cr_z_inflateEnd
-#define inflateGetDictionary Cr_z_inflateGetDictionary
-#define inflateGetHeader Cr_z_inflateGetHeader
-/* #undef inflateInit */
-/* #undef inflateInit2 */
-#define inflateInit2_ Cr_z_inflateInit2_
-#define inflateInit_ Cr_z_inflateInit_
-#define inflateMark Cr_z_inflateMark
-#define inflatePrime Cr_z_inflatePrime
-#define inflateReset Cr_z_inflateReset
-#define inflateReset2 Cr_z_inflateReset2
-#define inflateResetKeep Cr_z_inflateResetKeep
-#define inflateSetDictionary Cr_z_inflateSetDictionary
-#define inflateSync Cr_z_inflateSync
-#define inflateSyncPoint Cr_z_inflateSyncPoint
-#define inflateUndermine Cr_z_inflateUndermine
-#define inflateValidate Cr_z_inflateValidate
-#define inflate_copyright Cr_z_inflate_copyright
-#define inflate_fast Cr_z_inflate_fast
-#define inflate_table Cr_z_inflate_table
-#define uncompress Cr_z_uncompress
-#define uncompress2 Cr_z_uncompress2
-#define zError Cr_z_zError
-#define zcalloc Cr_z_zcalloc
-#define zcfree Cr_z_zcfree
-#define zlibCompileFlags Cr_z_zlibCompileFlags
-#define zlibVersion Cr_z_zlibVersion
-/* #undef Byte */
-#define Bytef Cr_z_Bytef
-#define alloc_func Cr_z_alloc_func
-#define charf Cr_z_charf
-#define free_func Cr_z_free_func
-#define gzFile Cr_z_gzFile
-#define gz_header Cr_z_gz_header
-#define gz_headerp Cr_z_gz_headerp
-#define in_func Cr_z_in_func
-#define intf Cr_z_intf
-#define out_func Cr_z_out_func
-#define uInt Cr_z_uInt
-#define uIntf Cr_z_uIntf
-#define uLong Cr_z_uLong
-#define uLongf Cr_z_uLongf
-#define voidp Cr_z_voidp
-#define voidpc Cr_z_voidpc
-#define voidpf Cr_z_voidpf
-#define gz_header_s Cr_z_gz_header_s
-#define internal_state Cr_z_internal_state
-/* #undef z_off64_t */
-
-/* An exported symbol that isn't handled by Z_PREFIX in zconf.h */
-#define z_errmsg Cr_z_z_errmsg
-
-/* Symbols added in simd.patch */
-#define copy_with_crc Cr_z_copy_with_crc
-#define crc_finalize Cr_z_crc_finalize
-#define crc_fold_512to32 Cr_z_crc_fold_512to32
-#define crc_fold_copy Cr_z_crc_fold_copy
-#define crc_fold_init Cr_z_crc_fold_init
-#define crc_reset Cr_z_crc_reset
-#define fill_window_sse Cr_z_fill_window_sse
-#define read_buf Cr_z_read_buf
-#define x86_check_features Cr_z_x86_check_features
-#define x86_cpu_enable_simd Cr_z_x86_cpu_enable_simd
-
-#endif  /* THIRD_PARTY_ZLIB_NAMES_H_ */
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/0000-build.patch b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/0000-build.patch
new file mode 100644
index 000000000..6119f09c0
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/0000-build.patch
@@ -0,0 +1,160 @@
+diff --git a/contrib/minizip/iowin32.c b/contrib/minizip/iowin32.c
+index 274f39eb1dd2..246ceb91a139 100644
+--- a/contrib/minizip/iowin32.c
++++ b/contrib/minizip/iowin32.c
+@@ -26,12 +26,19 @@
+ #endif
+ 
+ 
++#ifdef _WIN32_WINNT
++#undef _WIN32_WINNT
++#define _WIN32_WINNT 0x601
++#endif
++
++#if _WIN32_WINNT >= _WIN32_WINNT_WIN8
+ // see Include/shared/winapifamily.h in the Windows Kit
+ #if defined(WINAPI_FAMILY_PARTITION) && (!(defined(IOWIN32_USING_WINRT_API)))
+ #if WINAPI_FAMILY_ONE_PARTITION(WINAPI_FAMILY, WINAPI_PARTITION_APP)
+ #define IOWIN32_USING_WINRT_API 1
+ #endif
+ #endif
++#endif
+ 
+ voidpf  ZCALLBACK win32_open_file_func  OF((voidpf opaque, const char* filename, int mode));
+ uLong   ZCALLBACK win32_read_file_func  OF((voidpf opaque, voidpf stream, void* buf, uLong size));
+diff --git a/contrib/minizip/unzip.c b/contrib/minizip/unzip.c
+index bcfb9416ec35..199b4723fcfc 100644
+--- a/contrib/minizip/unzip.c
++++ b/contrib/minizip/unzip.c
+@@ -1705,11 +1705,6 @@ extern int ZEXPORT unzReadCurrentFile  (unzFile file, voidp buf, unsigned len)
+ 
+     pfile_in_zip_read_info->stream.avail_out = (uInt)len;
+ 
+-    if ((len>pfile_in_zip_read_info->rest_read_uncompressed) &&
+-        (!(pfile_in_zip_read_info->raw)))
+-        pfile_in_zip_read_info->stream.avail_out =
+-            (uInt)pfile_in_zip_read_info->rest_read_uncompressed;
+-
+     if ((len>pfile_in_zip_read_info->rest_read_compressed+
+            pfile_in_zip_read_info->stream.avail_in) &&
+          (pfile_in_zip_read_info->raw))
+diff --git a/gzread.c b/gzread.c
+index 956b91ea7d9e..832d3ef98c59 100644
+--- a/gzread.c
++++ b/gzread.c
+@@ -443,7 +443,11 @@ z_size_t ZEXPORT gzfread(buf, size, nitems, file)
+ #  undef z_gzgetc
+ #else
+ #  undef gzgetc
++#  ifdef Z_CR_PREFIX_SET
++#    define gzgetc Cr_z_gzgetc
++#  endif
+ #endif
++
+ int ZEXPORT gzgetc(file)
+     gzFile file;
+ {
+diff --git a/zconf.h b/zconf.h
+index 5e1d68a004e9..a7a815f575a7 100644
+--- a/zconf.h
++++ b/zconf.h
+@@ -8,6 +8,10 @@
+ #ifndef ZCONF_H
+ #define ZCONF_H
+ 
++/*
++ * This library is also built as a part of AOSP, which does not need to include
++ * chromeconf.h. This config does not want chromeconf.h, so it can set this
++ * macro to opt out. While this works today, there's no guarantee that building
++ * zlib outside of Chromium keeps working in the future.
++ */
++#if !defined(CHROMIUM_ZLIB_NO_CHROMECONF)
++/* This include does prefixing as below, but with an updated set of names.  Also
++ * sets up export macros in component builds. */
++#include "chromeconf.h"
++#endif
++
+ /*
+  * If you *really* need a unique prefix for all types and library functions,
+  * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
+@@ -431,7 +434,7 @@ typedef uLong FAR uLongf;
+    typedef unsigned long z_crc_t;
+ #endif
+ 
+-#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
++#if !defined(_WIN32)
+ #  define Z_HAVE_UNISTD_H
+ #endif
+ 
+diff --git a/zlib.h b/zlib.h
+index f09cdaf1e054..99fd467f6b1a 100644
+--- a/zlib.h
++++ b/zlib.h
+@@ -1824,6 +1824,11 @@ ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
+ #  undef z_gzgetc
+ #  define z_gzgetc(g) \
+           ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g))
++#elif defined(Z_CR_PREFIX_SET)
++#    undef gzgetc
++#    define gzgetc(g) \
++          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) \
++                     : (Cr_z_gzgetc)(g))
+ #else
+ #  define gzgetc(g) \
+           ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g))
+@@ -1853,11 +1858,29 @@ ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
+ #    define z_adler32_combine z_adler32_combine64
+ #    define z_crc32_combine z_crc32_combine64
+ #  else
++#    ifdef gzopen
++#      undef gzopen
++#    endif
+ #    define gzopen gzopen64
++#    ifdef gzseek
++#      undef gzseek
++#    endif
+ #    define gzseek gzseek64
++#    ifdef gztell
++#      undef gztell
++#    endif
+ #    define gztell gztell64
++#    ifdef gzoffset
++#      undef gzoffset
++#    endif
+ #    define gzoffset gzoffset64
++#    ifdef adler32_combine
++#      undef adler32_combine
++#    endif
+ #    define adler32_combine adler32_combine64
++#    ifdef crc32_combine
++#      undef crc32_combine
++#    endif
+ #    define crc32_combine crc32_combine64
+ #  endif
+ #  ifndef Z_LARGE64
+diff --git a/zutil.h b/zutil.h
+index b079ea6a80f5..80375b8b6109 100644
+--- a/zutil.h
++++ b/zutil.h
+@@ -28,6 +28,21 @@
+ #  include <string.h>
+ #  include <stdlib.h>
+ #endif
++#ifdef NO_ERRNO_H
++#   ifdef _WIN32_WCE
++      /* The Microsoft C Run-Time Library for Windows CE doesn't have
++       * errno.  We define it as a global variable to simplify porting.
++       * Its value is always 0 and should not be used.  We rename it to
++       * avoid conflict with other libraries that use the same workaround.
++       */
++#     define errno z_errno
++#   endif
++    extern int errno;
++#else
++#  ifndef _WIN32_WCE
++#    include <errno.h>
++#  endif
++#endif
+ 
+ #ifdef Z_SOLO
+    typedef long ptrdiff_t;  /* guess -- will be caught if guess is wrong */
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/0001-simd.patch b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/0001-simd.patch
new file mode 100644
index 000000000..9434ca0cc
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/0001-simd.patch
@@ -0,0 +1,1214 @@
+diff --git a/crc32.c b/crc32.c
+index 9580440c0e6b..9162429cc7b4 100644
+--- a/crc32.c
++++ b/crc32.c
+@@ -28,6 +28,8 @@
+ #  endif /* !DYNAMIC_CRC_TABLE */
+ #endif /* MAKECRCH */
+ 
++#include "deflate.h"
++#include "x86.h"
+ #include "zutil.h"      /* for STDC and FAR definitions */
+ 
+ /* Definitions for doing the crc four data bytes at a time. */
+@@ -440,3 +442,28 @@ uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
+ {
+     return crc32_combine_(crc1, crc2, len2);
+ }
++
++ZLIB_INTERNAL void crc_reset(deflate_state *const s)
++{
++    if (x86_cpu_enable_simd) {
++        crc_fold_init(s);
++        return;
++    }
++    s->strm->adler = crc32(0L, Z_NULL, 0);
++}
++
++ZLIB_INTERNAL void crc_finalize(deflate_state *const s)
++{
++    if (x86_cpu_enable_simd)
++        s->strm->adler = crc_fold_512to32(s);
++}
++
++ZLIB_INTERNAL void copy_with_crc(z_streamp strm, Bytef *dst, long size)
++{
++    if (x86_cpu_enable_simd) {
++        crc_fold_copy(strm->state, dst, strm->next_in, size);
++        return;
++    }
++    zmemcpy(dst, strm->next_in, size);
++    strm->adler = crc32(strm->adler, dst, size);
++}
+diff --git a/crc_folding.c b/crc_folding.c
+new file mode 100644
+index 000000000000..48d77744aaf4
+--- /dev/null
++++ b/crc_folding.c
+@@ -0,0 +1,493 @@
++/*
++ * Compute the CRC32 using a parallelized folding approach with the PCLMULQDQ
++ * instruction.
++ *
++ * A white paper describing this algorithm can be found at:
++ * http://www.intel.com/content/dam/www/public/us/en/documents/white-papers/fast-crc-computation-generic-polynomials-pclmulqdq-paper.pdf
++ *
++ * Copyright (C) 2013 Intel Corporation. All rights reserved.
++ * Authors:
++ * 	Wajdi Feghali   <wajdi.k.feghali@intel.com>
++ * 	Jim Guilford    <james.guilford@intel.com>
++ * 	Vinodh Gopal    <vinodh.gopal@intel.com>
++ * 	Erdinc Ozturk   <erdinc.ozturk@intel.com>
++ * 	Jim Kukunas     <james.t.kukunas@linux.intel.com>
++ *
++ * For conditions of distribution and use, see copyright notice in zlib.h
++ */
++
++#include "deflate.h"
++
++#include <inttypes.h>
++#include <emmintrin.h>
++#include <immintrin.h>
++#include <wmmintrin.h>
++
++#define CRC_LOAD(s) \
++    do { \
++        __m128i xmm_crc0 = _mm_loadu_si128((__m128i *)s->crc0 + 0);\
++        __m128i xmm_crc1 = _mm_loadu_si128((__m128i *)s->crc0 + 1);\
++        __m128i xmm_crc2 = _mm_loadu_si128((__m128i *)s->crc0 + 2);\
++        __m128i xmm_crc3 = _mm_loadu_si128((__m128i *)s->crc0 + 3);\
++        __m128i xmm_crc_part = _mm_loadu_si128((__m128i *)s->crc0 + 4);
++
++#define CRC_SAVE(s) \
++        _mm_storeu_si128((__m128i *)s->crc0 + 0, xmm_crc0);\
++        _mm_storeu_si128((__m128i *)s->crc0 + 1, xmm_crc1);\
++        _mm_storeu_si128((__m128i *)s->crc0 + 2, xmm_crc2);\
++        _mm_storeu_si128((__m128i *)s->crc0 + 3, xmm_crc3);\
++        _mm_storeu_si128((__m128i *)s->crc0 + 4, xmm_crc_part);\
++    } while (0);
++
++ZLIB_INTERNAL void crc_fold_init(deflate_state *const s)
++{
++    CRC_LOAD(s)
++
++    xmm_crc0 = _mm_cvtsi32_si128(0x9db42487);
++    xmm_crc1 = _mm_setzero_si128();
++    xmm_crc2 = _mm_setzero_si128();
++    xmm_crc3 = _mm_setzero_si128();
++
++    CRC_SAVE(s)
++
++    s->strm->adler = 0;
++}
++
++local void fold_1(deflate_state *const s,
++        __m128i *xmm_crc0, __m128i *xmm_crc1,
++        __m128i *xmm_crc2, __m128i *xmm_crc3)
++{
++    const __m128i xmm_fold4 = _mm_set_epi32(
++            0x00000001, 0x54442bd4,
++            0x00000001, 0xc6e41596);
++
++    __m128i x_tmp3;
++    __m128 ps_crc0, ps_crc3, ps_res;
++
++    x_tmp3 = *xmm_crc3;
++
++    *xmm_crc3 = *xmm_crc0;
++    *xmm_crc0 = _mm_clmulepi64_si128(*xmm_crc0, xmm_fold4, 0x01);
++    *xmm_crc3 = _mm_clmulepi64_si128(*xmm_crc3, xmm_fold4, 0x10);
++    ps_crc0 = _mm_castsi128_ps(*xmm_crc0);
++    ps_crc3 = _mm_castsi128_ps(*xmm_crc3);
++    ps_res = _mm_xor_ps(ps_crc0, ps_crc3);
++
++    *xmm_crc0 = *xmm_crc1;
++    *xmm_crc1 = *xmm_crc2;
++    *xmm_crc2 = x_tmp3;
++    *xmm_crc3 = _mm_castps_si128(ps_res);
++}
++
++local void fold_2(deflate_state *const s,
++        __m128i *xmm_crc0, __m128i *xmm_crc1,
++        __m128i *xmm_crc2, __m128i *xmm_crc3)
++{
++    const __m128i xmm_fold4 = _mm_set_epi32(
++            0x00000001, 0x54442bd4,
++            0x00000001, 0xc6e41596);
++
++    __m128i x_tmp3, x_tmp2;
++    __m128 ps_crc0, ps_crc1, ps_crc2, ps_crc3, ps_res31, ps_res20;
++
++    x_tmp3 = *xmm_crc3;
++    x_tmp2 = *xmm_crc2;
++
++    *xmm_crc3 = *xmm_crc1;
++    *xmm_crc1 = _mm_clmulepi64_si128(*xmm_crc1, xmm_fold4, 0x01);
++    *xmm_crc3 = _mm_clmulepi64_si128(*xmm_crc3, xmm_fold4, 0x10);
++    ps_crc3 = _mm_castsi128_ps(*xmm_crc3);
++    ps_crc1 = _mm_castsi128_ps(*xmm_crc1);
++    ps_res31= _mm_xor_ps(ps_crc3, ps_crc1);
++
++    *xmm_crc2 = *xmm_crc0;
++    *xmm_crc0 = _mm_clmulepi64_si128(*xmm_crc0, xmm_fold4, 0x01);
++    *xmm_crc2 = _mm_clmulepi64_si128(*xmm_crc2, xmm_fold4, 0x10);
++    ps_crc0 = _mm_castsi128_ps(*xmm_crc0);
++    ps_crc2 = _mm_castsi128_ps(*xmm_crc2);
++    ps_res20= _mm_xor_ps(ps_crc0, ps_crc2);
++
++    *xmm_crc0 = x_tmp2;
++    *xmm_crc1 = x_tmp3;
++    *xmm_crc2 = _mm_castps_si128(ps_res20);
++    *xmm_crc3 = _mm_castps_si128(ps_res31);
++}
++
++local void fold_3(deflate_state *const s,
++        __m128i *xmm_crc0, __m128i *xmm_crc1,
++        __m128i *xmm_crc2, __m128i *xmm_crc3)
++{
++    const __m128i xmm_fold4 = _mm_set_epi32(
++            0x00000001, 0x54442bd4,
++            0x00000001, 0xc6e41596);
++
++    __m128i x_tmp3;
++    __m128 ps_crc0, ps_crc1, ps_crc2, ps_crc3, ps_res32, ps_res21, ps_res10;
++
++    x_tmp3 = *xmm_crc3;
++
++    *xmm_crc3 = *xmm_crc2;
++    *xmm_crc2 = _mm_clmulepi64_si128(*xmm_crc2, xmm_fold4, 0x01);
++    *xmm_crc3 = _mm_clmulepi64_si128(*xmm_crc3, xmm_fold4, 0x10);
++    ps_crc2 = _mm_castsi128_ps(*xmm_crc2);
++    ps_crc3 = _mm_castsi128_ps(*xmm_crc3);
++    ps_res32 = _mm_xor_ps(ps_crc2, ps_crc3);
++
++    *xmm_crc2 = *xmm_crc1;
++    *xmm_crc1 = _mm_clmulepi64_si128(*xmm_crc1, xmm_fold4, 0x01);
++    *xmm_crc2 = _mm_clmulepi64_si128(*xmm_crc2, xmm_fold4, 0x10);
++    ps_crc1 = _mm_castsi128_ps(*xmm_crc1);
++    ps_crc2 = _mm_castsi128_ps(*xmm_crc2);
++    ps_res21= _mm_xor_ps(ps_crc1, ps_crc2);
++
++    *xmm_crc1 = *xmm_crc0;
++    *xmm_crc0 = _mm_clmulepi64_si128(*xmm_crc0, xmm_fold4, 0x01);
++    *xmm_crc1 = _mm_clmulepi64_si128(*xmm_crc1, xmm_fold4, 0x10);
++    ps_crc0 = _mm_castsi128_ps(*xmm_crc0);
++    ps_crc1 = _mm_castsi128_ps(*xmm_crc1);
++    ps_res10= _mm_xor_ps(ps_crc0, ps_crc1);
++
++    *xmm_crc0 = x_tmp3;
++    *xmm_crc1 = _mm_castps_si128(ps_res10);
++    *xmm_crc2 = _mm_castps_si128(ps_res21);
++    *xmm_crc3 = _mm_castps_si128(ps_res32);
++}
++
++local void fold_4(deflate_state *const s,
++        __m128i *xmm_crc0, __m128i *xmm_crc1,
++        __m128i *xmm_crc2, __m128i *xmm_crc3)
++{
++    const __m128i xmm_fold4 = _mm_set_epi32(
++            0x00000001, 0x54442bd4,
++            0x00000001, 0xc6e41596);
++
++    __m128i x_tmp0, x_tmp1, x_tmp2, x_tmp3;
++    __m128 ps_crc0, ps_crc1, ps_crc2, ps_crc3;
++    __m128 ps_t0, ps_t1, ps_t2, ps_t3;
++    __m128 ps_res0, ps_res1, ps_res2, ps_res3;
++
++    x_tmp0 = *xmm_crc0;
++    x_tmp1 = *xmm_crc1;
++    x_tmp2 = *xmm_crc2;
++    x_tmp3 = *xmm_crc3;
++
++    *xmm_crc0 = _mm_clmulepi64_si128(*xmm_crc0, xmm_fold4, 0x01);
++    x_tmp0 = _mm_clmulepi64_si128(x_tmp0, xmm_fold4, 0x10);
++    ps_crc0 = _mm_castsi128_ps(*xmm_crc0);
++    ps_t0 = _mm_castsi128_ps(x_tmp0);
++    ps_res0 = _mm_xor_ps(ps_crc0, ps_t0);
++
++    *xmm_crc1 = _mm_clmulepi64_si128(*xmm_crc1, xmm_fold4, 0x01);
++    x_tmp1 = _mm_clmulepi64_si128(x_tmp1, xmm_fold4, 0x10);
++    ps_crc1 = _mm_castsi128_ps(*xmm_crc1);
++    ps_t1 = _mm_castsi128_ps(x_tmp1);
++    ps_res1 = _mm_xor_ps(ps_crc1, ps_t1);
++
++    *xmm_crc2 = _mm_clmulepi64_si128(*xmm_crc2, xmm_fold4, 0x01);
++    x_tmp2 = _mm_clmulepi64_si128(x_tmp2, xmm_fold4, 0x10);
++    ps_crc2 = _mm_castsi128_ps(*xmm_crc2);
++    ps_t2 = _mm_castsi128_ps(x_tmp2);
++    ps_res2 = _mm_xor_ps(ps_crc2, ps_t2);
++
++    *xmm_crc3 = _mm_clmulepi64_si128(*xmm_crc3, xmm_fold4, 0x01);
++    x_tmp3 = _mm_clmulepi64_si128(x_tmp3, xmm_fold4, 0x10);
++    ps_crc3 = _mm_castsi128_ps(*xmm_crc3);
++    ps_t3 = _mm_castsi128_ps(x_tmp3);
++    ps_res3 = _mm_xor_ps(ps_crc3, ps_t3);
++
++    *xmm_crc0 = _mm_castps_si128(ps_res0);
++    *xmm_crc1 = _mm_castps_si128(ps_res1);
++    *xmm_crc2 = _mm_castps_si128(ps_res2);
++    *xmm_crc3 = _mm_castps_si128(ps_res3);
++}
++
++local const unsigned zalign(32) pshufb_shf_table[60] = {
++	0x84838281,0x88878685,0x8c8b8a89,0x008f8e8d, /* shl 15 (16 - 1)/shr1 */
++	0x85848382,0x89888786,0x8d8c8b8a,0x01008f8e, /* shl 14 (16 - 3)/shr2 */
++	0x86858483,0x8a898887,0x8e8d8c8b,0x0201008f, /* shl 13 (16 - 4)/shr3 */
++	0x87868584,0x8b8a8988,0x8f8e8d8c,0x03020100, /* shl 12 (16 - 4)/shr4 */
++	0x88878685,0x8c8b8a89,0x008f8e8d,0x04030201, /* shl 11 (16 - 5)/shr5 */
++	0x89888786,0x8d8c8b8a,0x01008f8e,0x05040302, /* shl 10 (16 - 6)/shr6 */
++	0x8a898887,0x8e8d8c8b,0x0201008f,0x06050403, /* shl  9 (16 - 7)/shr7 */
++	0x8b8a8988,0x8f8e8d8c,0x03020100,0x07060504, /* shl  8 (16 - 8)/shr8 */
++	0x8c8b8a89,0x008f8e8d,0x04030201,0x08070605, /* shl  7 (16 - 9)/shr9 */
++	0x8d8c8b8a,0x01008f8e,0x05040302,0x09080706, /* shl  6 (16 -10)/shr10*/
++	0x8e8d8c8b,0x0201008f,0x06050403,0x0a090807, /* shl  5 (16 -11)/shr11*/
++	0x8f8e8d8c,0x03020100,0x07060504,0x0b0a0908, /* shl  4 (16 -12)/shr12*/
++	0x008f8e8d,0x04030201,0x08070605,0x0c0b0a09, /* shl  3 (16 -13)/shr13*/
++	0x01008f8e,0x05040302,0x09080706,0x0d0c0b0a, /* shl  2 (16 -14)/shr14*/
++	0x0201008f,0x06050403,0x0a090807,0x0e0d0c0b  /* shl  1 (16 -15)/shr15*/
++};
++
++local void partial_fold(deflate_state *const s, const size_t len,
++        __m128i *xmm_crc0, __m128i *xmm_crc1,
++        __m128i *xmm_crc2, __m128i *xmm_crc3,
++        __m128i *xmm_crc_part)
++{
++
++    const __m128i xmm_fold4 = _mm_set_epi32(
++            0x00000001, 0x54442bd4,
++            0x00000001, 0xc6e41596);
++    const __m128i xmm_mask3 = _mm_set1_epi32(0x80808080);
++
++    __m128i xmm_shl, xmm_shr, xmm_tmp1, xmm_tmp2, xmm_tmp3;
++    __m128i xmm_a0_0, xmm_a0_1;
++    __m128 ps_crc3, psa0_0, psa0_1, ps_res;
++
++    xmm_shl = _mm_load_si128((__m128i *)pshufb_shf_table + (len - 1));
++    xmm_shr = xmm_shl;
++    xmm_shr = _mm_xor_si128(xmm_shr, xmm_mask3);
++
++    xmm_a0_0 = _mm_shuffle_epi8(*xmm_crc0, xmm_shl);
++
++    *xmm_crc0 = _mm_shuffle_epi8(*xmm_crc0, xmm_shr);
++    xmm_tmp1 = _mm_shuffle_epi8(*xmm_crc1, xmm_shl);
++    *xmm_crc0 = _mm_or_si128(*xmm_crc0, xmm_tmp1);
++
++    *xmm_crc1 = _mm_shuffle_epi8(*xmm_crc1, xmm_shr);
++    xmm_tmp2 = _mm_shuffle_epi8(*xmm_crc2, xmm_shl);
++    *xmm_crc1 = _mm_or_si128(*xmm_crc1, xmm_tmp2);
++
++    *xmm_crc2 = _mm_shuffle_epi8(*xmm_crc2, xmm_shr);
++    xmm_tmp3 = _mm_shuffle_epi8(*xmm_crc3, xmm_shl);
++    *xmm_crc2 = _mm_or_si128(*xmm_crc2, xmm_tmp3);
++
++    *xmm_crc3 = _mm_shuffle_epi8(*xmm_crc3, xmm_shr);
++    *xmm_crc_part = _mm_shuffle_epi8(*xmm_crc_part, xmm_shl);
++    *xmm_crc3 = _mm_or_si128(*xmm_crc3, *xmm_crc_part);
++
++    xmm_a0_1 = _mm_clmulepi64_si128(xmm_a0_0, xmm_fold4, 0x10);
++    xmm_a0_0 = _mm_clmulepi64_si128(xmm_a0_0, xmm_fold4, 0x01);
++
++    ps_crc3 = _mm_castsi128_ps(*xmm_crc3);
++    psa0_0 = _mm_castsi128_ps(xmm_a0_0);
++    psa0_1 = _mm_castsi128_ps(xmm_a0_1);
++
++    ps_res = _mm_xor_ps(ps_crc3, psa0_0);
++    ps_res = _mm_xor_ps(ps_res, psa0_1);
++
++    *xmm_crc3 = _mm_castps_si128(ps_res);
++}
++
++ZLIB_INTERNAL void crc_fold_copy(deflate_state *const s,
++        unsigned char *dst, const unsigned char *src, long len)
++{
++    unsigned long algn_diff;
++    __m128i xmm_t0, xmm_t1, xmm_t2, xmm_t3;
++
++    CRC_LOAD(s)
++
++    if (len < 16) {
++        if (len == 0)
++            return;
++        goto partial;
++    }
++
++    algn_diff = 0 - (uintptr_t)src & 0xF;
++    if (algn_diff) {
++        xmm_crc_part = _mm_loadu_si128((__m128i *)src);
++        _mm_storeu_si128((__m128i *)dst, xmm_crc_part);
++
++        dst += algn_diff;
++        src += algn_diff;
++        len -= algn_diff;
++
++        partial_fold(s, algn_diff, &xmm_crc0, &xmm_crc1, &xmm_crc2, &xmm_crc3,
++            &xmm_crc_part);
++    }
++
++    while ((len -= 64) >= 0) {
++        xmm_t0 = _mm_load_si128((__m128i *)src);
++        xmm_t1 = _mm_load_si128((__m128i *)src + 1);
++        xmm_t2 = _mm_load_si128((__m128i *)src + 2);
++        xmm_t3 = _mm_load_si128((__m128i *)src + 3);
++
++        fold_4(s, &xmm_crc0, &xmm_crc1, &xmm_crc2, &xmm_crc3);
++
++        _mm_storeu_si128((__m128i *)dst, xmm_t0);
++        _mm_storeu_si128((__m128i *)dst + 1, xmm_t1);
++        _mm_storeu_si128((__m128i *)dst + 2, xmm_t2);
++        _mm_storeu_si128((__m128i *)dst + 3, xmm_t3);
++
++        xmm_crc0 = _mm_xor_si128(xmm_crc0, xmm_t0);
++        xmm_crc1 = _mm_xor_si128(xmm_crc1, xmm_t1);
++        xmm_crc2 = _mm_xor_si128(xmm_crc2, xmm_t2);
++        xmm_crc3 = _mm_xor_si128(xmm_crc3, xmm_t3);
++
++        src += 64;
++        dst += 64;
++    }
++
++    /*
++     * len = num bytes left - 64
++     */
++    if (len + 16 >= 0) {
++        len += 16;
++
++        xmm_t0 = _mm_load_si128((__m128i *)src);
++        xmm_t1 = _mm_load_si128((__m128i *)src + 1);
++        xmm_t2 = _mm_load_si128((__m128i *)src + 2);
++
++        fold_3(s, &xmm_crc0, &xmm_crc1, &xmm_crc2, &xmm_crc3);
++
++        _mm_storeu_si128((__m128i *)dst, xmm_t0);
++        _mm_storeu_si128((__m128i *)dst + 1, xmm_t1);
++        _mm_storeu_si128((__m128i *)dst + 2, xmm_t2);
++
++        xmm_crc1 = _mm_xor_si128(xmm_crc1, xmm_t0);
++        xmm_crc2 = _mm_xor_si128(xmm_crc2, xmm_t1);
++        xmm_crc3 = _mm_xor_si128(xmm_crc3, xmm_t2);
++
++        if (len == 0)
++            goto done;
++
++        dst += 48;
++        src += 48;
++    } else if (len + 32 >= 0) {
++        len += 32;
++
++        xmm_t0 = _mm_load_si128((__m128i *)src);
++        xmm_t1 = _mm_load_si128((__m128i *)src + 1);
++
++        fold_2(s, &xmm_crc0, &xmm_crc1, &xmm_crc2, &xmm_crc3);
++
++        _mm_storeu_si128((__m128i *)dst, xmm_t0);
++        _mm_storeu_si128((__m128i *)dst + 1, xmm_t1);
++
++        xmm_crc2 = _mm_xor_si128(xmm_crc2, xmm_t0);
++        xmm_crc3 = _mm_xor_si128(xmm_crc3, xmm_t1);
++
++        if (len == 0)
++            goto done;
++
++        dst += 32;
++        src += 32;
++    } else if (len + 48 >= 0) {
++        len += 48;
++
++        xmm_t0 = _mm_load_si128((__m128i *)src);
++
++        fold_1(s, &xmm_crc0, &xmm_crc1, &xmm_crc2, &xmm_crc3);
++
++        _mm_storeu_si128((__m128i *)dst, xmm_t0);
++
++        xmm_crc3 = _mm_xor_si128(xmm_crc3, xmm_t0);
++
++        if (len == 0)
++            goto done;
++
++        dst += 16;
++        src += 16;
++    } else {
++        len += 64;
++        if (len == 0)
++            goto done;
++    }
++
++partial:
++
++#if defined(_MSC_VER)
++    /* VS does not permit the use of _mm_set_epi64x in 32-bit builds */
++    {
++        int32_t parts[4] = {0, 0, 0, 0};
++        memcpy(&parts, src, len);
++        xmm_crc_part = _mm_set_epi32(parts[3], parts[2], parts[1], parts[0]);
++    }
++#else
++    {
++        int64_t parts[2] = {0, 0};
++        memcpy(&parts, src, len);
++        xmm_crc_part = _mm_set_epi64x(parts[1], parts[0]);
++    }
++#endif
++
++    _mm_storeu_si128((__m128i *)dst, xmm_crc_part);
++    partial_fold(s, len, &xmm_crc0, &xmm_crc1, &xmm_crc2, &xmm_crc3,
++        &xmm_crc_part);
++done:
++    CRC_SAVE(s)
++}
++
++local const unsigned zalign(16) crc_k[] = {
++    0xccaa009e, 0x00000000, /* rk1 */
++    0x751997d0, 0x00000001, /* rk2 */
++    0xccaa009e, 0x00000000, /* rk5 */
++    0x63cd6124, 0x00000001, /* rk6 */
++    0xf7011640, 0x00000001, /* rk7 */
++    0xdb710640, 0x00000001  /* rk8 */
++};
++
++local const unsigned zalign(16) crc_mask[4] = {
++    0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00000000
++};
++
++local const unsigned zalign(16) crc_mask2[4] = {
++    0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF
++};
++
++unsigned ZLIB_INTERNAL crc_fold_512to32(deflate_state *const s)
++{
++    const __m128i xmm_mask  = _mm_load_si128((__m128i *)crc_mask);
++    const __m128i xmm_mask2 = _mm_load_si128((__m128i *)crc_mask2);
++
++    unsigned crc;
++    __m128i x_tmp0, x_tmp1, x_tmp2, crc_fold;
++
++    CRC_LOAD(s)
++
++    /*
++     * k1
++     */
++    crc_fold = _mm_load_si128((__m128i *)crc_k);
++
++    x_tmp0 = _mm_clmulepi64_si128(xmm_crc0, crc_fold, 0x10);
++    xmm_crc0 = _mm_clmulepi64_si128(xmm_crc0, crc_fold, 0x01);
++    xmm_crc1 = _mm_xor_si128(xmm_crc1, x_tmp0);
++    xmm_crc1 = _mm_xor_si128(xmm_crc1, xmm_crc0);
++
++    x_tmp1 = _mm_clmulepi64_si128(xmm_crc1, crc_fold, 0x10);
++    xmm_crc1 = _mm_clmulepi64_si128(xmm_crc1, crc_fold, 0x01);
++    xmm_crc2 = _mm_xor_si128(xmm_crc2, x_tmp1);
++    xmm_crc2 = _mm_xor_si128(xmm_crc2, xmm_crc1);
++
++    x_tmp2 = _mm_clmulepi64_si128(xmm_crc2, crc_fold, 0x10);
++    xmm_crc2 = _mm_clmulepi64_si128(xmm_crc2, crc_fold, 0x01);
++    xmm_crc3 = _mm_xor_si128(xmm_crc3, x_tmp2);
++    xmm_crc3 = _mm_xor_si128(xmm_crc3, xmm_crc2);
++
++    /*
++     * k5
++     */
++    crc_fold = _mm_load_si128((__m128i *)crc_k + 1);
++
++    xmm_crc0 = xmm_crc3;
++    xmm_crc3 = _mm_clmulepi64_si128(xmm_crc3, crc_fold, 0);
++    xmm_crc0 = _mm_srli_si128(xmm_crc0, 8);
++    xmm_crc3 = _mm_xor_si128(xmm_crc3, xmm_crc0);
++
++    xmm_crc0 = xmm_crc3;
++    xmm_crc3 = _mm_slli_si128(xmm_crc3, 4);
++    xmm_crc3 = _mm_clmulepi64_si128(xmm_crc3, crc_fold, 0x10);
++    xmm_crc3 = _mm_xor_si128(xmm_crc3, xmm_crc0);
++    xmm_crc3 = _mm_and_si128(xmm_crc3, xmm_mask2);
++
++    /*
++     * k7
++     */
++    xmm_crc1 = xmm_crc3;
++    xmm_crc2 = xmm_crc3;
++    crc_fold = _mm_load_si128((__m128i *)crc_k + 2);
++
++    xmm_crc3 = _mm_clmulepi64_si128(xmm_crc3, crc_fold, 0);
++    xmm_crc3 = _mm_xor_si128(xmm_crc3, xmm_crc2);
++    xmm_crc3 = _mm_and_si128(xmm_crc3, xmm_mask);
++
++    xmm_crc2 = xmm_crc3;
++    xmm_crc3 = _mm_clmulepi64_si128(xmm_crc3, crc_fold, 0x10);
++    xmm_crc3 = _mm_xor_si128(xmm_crc3, xmm_crc2);
++    xmm_crc3 = _mm_xor_si128(xmm_crc3, xmm_crc1);
++
++    crc = _mm_extract_epi32(xmm_crc3, 2);
++    return ~crc;
++    CRC_SAVE(s)
++}
+diff --git a/deflate.c b/deflate.c
+index 1ec761448de9..aa0c9c67a6dc 100644
+--- a/deflate.c
++++ b/deflate.c
+@@ -48,8 +48,9 @@
+  */
+ 
+ /* @(#) $Id$ */
+-
++#include <assert.h>
+ #include "deflate.h"
++#include "x86.h"
+ 
+ const char deflate_copyright[] =
+    " deflate 1.2.11 Copyright 1995-2017 Jean-loup Gailly and Mark Adler ";
+@@ -86,7 +87,7 @@ local block_state deflate_huff   OF((deflate_state *s, int flush));
+ local void lm_init        OF((deflate_state *s));
+ local void putShortMSB    OF((deflate_state *s, uInt b));
+ local void flush_pending  OF((z_streamp strm));
+-local unsigned read_buf   OF((z_streamp strm, Bytef *buf, unsigned size));
++unsigned ZLIB_INTERNAL deflate_read_buf OF((z_streamp strm, Bytef *buf, unsigned size));
+ #ifdef ASMV
+ #  pragma message("Assembler code may have bugs -- use at your own risk")
+       void match_init OF((void)); /* asm code initialization */
+@@ -100,6 +101,20 @@ local  void check_match OF((deflate_state *s, IPos start, IPos match,
+                             int length));
+ #endif
+ 
++/* From crc32.c */
++extern void ZLIB_INTERNAL crc_reset(deflate_state *const s);
++extern void ZLIB_INTERNAL crc_finalize(deflate_state *const s);
++extern void ZLIB_INTERNAL copy_with_crc(z_streamp strm, Bytef *dst, long size);
++
++#ifdef _MSC_VER
++#define INLINE __inline
++#else
++#define INLINE inline
++#endif
++
++/* Inline optimisation */
++local INLINE Pos insert_string_sse(deflate_state *const s, const Pos str);
++
+ /* ===========================================================================
+  * Local data
+  */
+@@ -162,7 +177,6 @@ local const config configuration_table[10] = {
+  */
+ #define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask)
+ 
+-
+ /* ===========================================================================
+  * Insert string str in the dictionary and set match_head to the previous head
+  * of the hash chain (the most recent string with same hash key). Return
+@@ -173,17 +187,28 @@ local const config configuration_table[10] = {
+  *    characters and the first MIN_MATCH bytes of str are valid (except for
+  *    the last MIN_MATCH-1 bytes of the input file).
+  */
++local INLINE Pos insert_string_c(deflate_state *const s, const Pos str)
++{
++    Pos ret;
++
++    UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]);
+ #ifdef FASTEST
+-#define INSERT_STRING(s, str, match_head) \
+-   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
+-    match_head = s->head[s->ins_h], \
+-    s->head[s->ins_h] = (Pos)(str))
++    ret = s->head[s->ins_h];
+ #else
+-#define INSERT_STRING(s, str, match_head) \
+-   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
+-    match_head = s->prev[(str) & s->w_mask] = s->head[s->ins_h], \
+-    s->head[s->ins_h] = (Pos)(str))
++    ret = s->prev[str & s->w_mask] = s->head[s->ins_h];
+ #endif
++    s->head[s->ins_h] = str;
++
++    return ret;
++}
++
++local INLINE Pos insert_string(deflate_state *const s, const Pos str)
++{
++    if (x86_cpu_enable_simd)
++        return insert_string_sse(s, str);
++    return insert_string_c(s, str);
++}
++
+ 
+ /* ===========================================================================
+  * Initialize the hash table (avoiding 64K overflow for 16 bit systems).
+@@ -248,6 +273,7 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
+     const char *version;
+     int stream_size;
+ {
++    unsigned window_padding = 8;
+     deflate_state *s;
+     int wrap = 1;
+     static const char my_version[] = ZLIB_VERSION;
+@@ -257,6 +283,8 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
+      * output size for (length,distance) codes is <= 24 bits.
+      */
+ 
++    x86_check_features();
++
+     if (version == Z_NULL || version[0] != my_version[0] ||
+         stream_size != sizeof(z_stream)) {
+         return Z_VERSION_ERROR;
+@@ -313,12 +341,19 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
+     s->w_size = 1 << s->w_bits;
+     s->w_mask = s->w_size - 1;
+ 
+-    s->hash_bits = (uInt)memLevel + 7;
++    if (x86_cpu_enable_simd) {
++        s->hash_bits = 15;
++    } else {
++        s->hash_bits = memLevel + 7;
++    }
++
+     s->hash_size = 1 << s->hash_bits;
+     s->hash_mask = s->hash_size - 1;
+     s->hash_shift =  ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH);
+ 
+-    s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte));
++    s->window = (Bytef *) ZALLOC(strm,
++                                 s->w_size + window_padding,
++                                 2*sizeof(Byte));
+     s->prev   = (Posf *)  ZALLOC(strm, s->w_size, sizeof(Pos));
+     s->head   = (Posf *)  ZALLOC(strm, s->hash_size, sizeof(Pos));
+ 
+@@ -418,11 +453,7 @@ int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
+         str = s->strstart;
+         n = s->lookahead - (MIN_MATCH-1);
+         do {
+-            UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);
+-#ifndef FASTEST
+-            s->prev[str & s->w_mask] = s->head[s->ins_h];
+-#endif
+-            s->head[s->ins_h] = (Pos)str;
++            insert_string(s, str);
+             str++;
+         } while (--n);
+         s->strstart = str;
+@@ -848,7 +879,7 @@ int ZEXPORT deflate (strm, flush)
+ #ifdef GZIP
+     if (s->status == GZIP_STATE) {
+         /* gzip header */
+-        strm->adler = crc32(0L, Z_NULL, 0);
++        crc_reset(s);
+         put_byte(s, 31);
+         put_byte(s, 139);
+         put_byte(s, 8);
+@@ -1049,6 +1080,7 @@ int ZEXPORT deflate (strm, flush)
+     /* Write the trailer */
+ #ifdef GZIP
+     if (s->wrap == 2) {
++        crc_finalize(s);
+         put_byte(s, (Byte)(strm->adler & 0xff));
+         put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
+         put_byte(s, (Byte)((strm->adler >> 16) & 0xff));
+@@ -1161,7 +1193,7 @@ int ZEXPORT deflateCopy (dest, source)
+  * allocating a large strm->next_in buffer and copying from it.
+  * (See also flush_pending()).
+  */
+-local unsigned read_buf(strm, buf, size)
++ZLIB_INTERNAL unsigned deflate_read_buf(strm, buf, size)
+     z_streamp strm;
+     Bytef *buf;
+     unsigned size;
+@@ -1173,15 +1205,16 @@ local unsigned read_buf(strm, buf, size)
+ 
+     strm->avail_in  -= len;
+ 
+-    zmemcpy(buf, strm->next_in, len);
+-    if (strm->state->wrap == 1) {
+-        strm->adler = adler32(strm->adler, buf, len);
+-    }
+ #ifdef GZIP
+-    else if (strm->state->wrap == 2) {
+-        strm->adler = crc32(strm->adler, buf, len);
+-    }
++    if (strm->state->wrap == 2)
++        copy_with_crc(strm, buf, len);
++    else 
+ #endif
++    {
++        zmemcpy(buf, strm->next_in, len);
++        if (strm->state->wrap == 1)
++            strm->adler = adler32(strm->adler, buf, len);
++    }
+     strm->next_in  += len;
+     strm->total_in += len;
+ 
+@@ -1479,7 +1512,19 @@ local void check_match(s, start, match, length)
+  *    performed for at least two bytes (required for the zip translate_eol
+  *    option -- not supported here).
+  */
+-local void fill_window(s)
++local void fill_window_c(deflate_state *s);
++
++local void fill_window(deflate_state *s)
++{
++    if (x86_cpu_enable_simd) {
++        fill_window_sse(s);
++        return;
++    }
++
++    fill_window_c(s);
++}
++
++local void fill_window_c(s)
+     deflate_state *s;
+ {
+     unsigned n;
+@@ -1847,7 +1892,7 @@ local block_state deflate_fast(s, flush)
+          */
+         hash_head = NIL;
+         if (s->lookahead >= MIN_MATCH) {
+-            INSERT_STRING(s, s->strstart, hash_head);
++            hash_head = insert_string(s, s->strstart);
+         }
+ 
+         /* Find the longest match, discarding those <= prev_length.
+@@ -1878,7 +1923,7 @@ local block_state deflate_fast(s, flush)
+                 s->match_length--; /* string at strstart already in table */
+                 do {
+                     s->strstart++;
+-                    INSERT_STRING(s, s->strstart, hash_head);
++                    hash_head = insert_string(s, s->strstart);
+                     /* strstart never exceeds WSIZE-MAX_MATCH, so there are
+                      * always MIN_MATCH bytes ahead.
+                      */
+@@ -1950,7 +1995,7 @@ local block_state deflate_slow(s, flush)
+          */
+         hash_head = NIL;
+         if (s->lookahead >= MIN_MATCH) {
+-            INSERT_STRING(s, s->strstart, hash_head);
++            hash_head = insert_string(s, s->strstart);
+         }
+ 
+         /* Find the longest match, discarding those <= prev_length.
+@@ -2001,7 +2046,7 @@ local block_state deflate_slow(s, flush)
+             s->prev_length -= 2;
+             do {
+                 if (++s->strstart <= max_insert) {
+-                    INSERT_STRING(s, s->strstart, hash_head);
++                    hash_head = insert_string(s, s->strstart);
+                 }
+             } while (--s->prev_length != 0);
+             s->match_available = 0;
+@@ -2161,3 +2206,37 @@ local block_state deflate_huff(s, flush)
+         FLUSH_BLOCK(s, 0);
+     return block_done;
+ }
++
++/* Safe to inline this as GCC/clang will use inline asm and Visual Studio will
++ * use intrinsic without extra params
++ */
++local INLINE Pos insert_string_sse(deflate_state *const s, const Pos str)
++{
++    Pos ret;
++    unsigned *ip, val, h = 0;
++
++    ip = (unsigned *)&s->window[str];
++    val = *ip;
++
++    if (s->level >= 6)
++        val &= 0xFFFFFF;
++
++/* Windows clang should use inline asm */
++#if defined(_MSC_VER) && !defined(__clang__)
++    h = _mm_crc32_u32(h, val);
++#elif defined(__i386__) || defined(__amd64__)
++    __asm__ __volatile__ (
++        "crc32 %1,%0\n\t"
++    : "+r" (h)
++    : "r" (val)
++    );
++#else
++    /* This should never happen */
++    assert(0);
++#endif
++
++    ret = s->head[h & s->hash_mask];
++    s->head[h & s->hash_mask] = str;
++    s->prev[str & s->w_mask] = ret;
++    return ret;
++}
+diff --git a/deflate.h b/deflate.h
+index 23ecdd312bc0..ab56df7663b6 100644
+--- a/deflate.h
++++ b/deflate.h
+@@ -109,7 +109,7 @@ typedef struct internal_state {
+     ulg   gzindex;       /* where in extra, name, or comment */
+     Byte  method;        /* can only be DEFLATED */
+     int   last_flush;    /* value of flush param for previous deflate call */
+-
++    unsigned zalign(16) crc0[4 * 5];
+                 /* used by deflate.c: */
+ 
+     uInt  w_size;        /* LZ77 window size (32K by default) */
+@@ -346,4 +346,14 @@ void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
+               flush = _tr_tally(s, distance, length)
+ #endif
+ 
++/* Functions that are SIMD optimised on x86 */
++void ZLIB_INTERNAL crc_fold_init(deflate_state* const s);
++void ZLIB_INTERNAL crc_fold_copy(deflate_state* const s,
++                                 unsigned char* dst,
++                                 const unsigned char* src,
++                                 long len);
++unsigned ZLIB_INTERNAL crc_fold_512to32(deflate_state* const s);
++
++void ZLIB_INTERNAL fill_window_sse(deflate_state* s);
++
+ #endif /* DEFLATE_H */
+diff --git a/fill_window_sse.c b/fill_window_sse.c
+new file mode 100644
+index 000000000000..949ccce1ba9c
+--- /dev/null
++++ b/fill_window_sse.c
+@@ -0,0 +1,177 @@
++/*
++ * Fill Window with SSE2-optimized hash shifting
++ *
++ * Copyright (C) 2013 Intel Corporation
++ * Authors:
++ *  Arjan van de Ven    <arjan@linux.intel.com>
++ *  Jim Kukunas         <james.t.kukunas@linux.intel.com>
++ *
++ * For conditions of distribution and use, see copyright notice in zlib.h
++ */
++
++#include <immintrin.h>
++#include "deflate.h"
++
++#define UPDATE_HASH(s,h,i) \
++    {\
++        if (s->level < 6) { \
++            h = (3483 * (s->window[i]) +\
++                 23081* (s->window[i+1]) +\
++                 6954 * (s->window[i+2]) +\
++                 20947* (s->window[i+3])) & s->hash_mask;\
++        } else {\
++            h = (25881* (s->window[i]) +\
++                 24674* (s->window[i+1]) +\
++                 25811* (s->window[i+2])) & s->hash_mask;\
++        }\
++    }\
++
++extern int deflate_read_buf OF((z_streamp strm, Bytef *buf, unsigned size));
++
++void fill_window_sse(deflate_state *s)
++{
++    const __m128i xmm_wsize = _mm_set1_epi16(s->w_size);
++
++    register unsigned n;
++    register Posf *p;
++    unsigned more;    /* Amount of free space at the end of the window. */
++    uInt wsize = s->w_size;
++
++    Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead");
++
++    do {
++        more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
++
++        /* Deal with !@#$% 64K limit: */
++        if (sizeof(int) <= 2) {
++            if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
++                more = wsize;
++
++            } else if (more == (unsigned)(-1)) {
++                /* Very unlikely, but possible on 16 bit machine if
++                 * strstart == 0 && lookahead == 1 (input done a byte at time)
++                 */
++                more--;
++            }
++        }
++
++        /* If the window is almost full and there is insufficient lookahead,
++         * move the upper half to the lower one to make room in the upper half.
++         */
++        if (s->strstart >= wsize+MAX_DIST(s)) {
++
++            zmemcpy(s->window, s->window+wsize, (unsigned)wsize);
++            s->match_start -= wsize;
++            s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */
++            s->block_start -= (long) wsize;
++
++            /* Slide the hash table (could be avoided with 32 bit values
++               at the expense of memory usage). We slide even when level == 0
++               to keep the hash table consistent if we switch back to level > 0
++               later. (Using level 0 permanently is not an optimal usage of
++               zlib, so we don't care about this pathological case.)
++             */
++            n = s->hash_size;
++            p = &s->head[n];
++            p -= 8;
++            do {
++                __m128i value, result;
++
++                value = _mm_loadu_si128((__m128i *)p);
++                result = _mm_subs_epu16(value, xmm_wsize);
++                _mm_storeu_si128((__m128i *)p, result);
++
++                p -= 8;
++                n -= 8;
++            } while (n > 0);
++
++            n = wsize;
++#ifndef FASTEST
++            p = &s->prev[n];
++            p -= 8;
++            do {
++                __m128i value, result;
++
++                value = _mm_loadu_si128((__m128i *)p);
++                result = _mm_subs_epu16(value, xmm_wsize);
++                _mm_storeu_si128((__m128i *)p, result);
++
++                p -= 8;
++                n -= 8;
++            } while (n > 0);
++#endif
++            more += wsize;
++        }
++        if (s->strm->avail_in == 0) break;
++
++        /* If there was no sliding:
++         *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
++         *    more == window_size - lookahead - strstart
++         * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)
++         * => more >= window_size - 2*WSIZE + 2
++         * In the BIG_MEM or MMAP case (not yet supported),
++         *   window_size == input_size + MIN_LOOKAHEAD  &&
++         *   strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.
++         * Otherwise, window_size == 2*WSIZE so more >= 2.
++         * If there was sliding, more >= WSIZE. So in all cases, more >= 2.
++         */
++        Assert(more >= 2, "more < 2");
++
++        n = deflate_read_buf(s->strm,
++                             s->window + s->strstart + s->lookahead,
++                             more);
++        s->lookahead += n;
++
++        /* Initialize the hash value now that we have some input: */
++        if (s->lookahead >= MIN_MATCH) {
++            uInt str = s->strstart;
++            s->ins_h = s->window[str];
++            if (str >= 1)
++                UPDATE_HASH(s, s->ins_h, str + 1 - (MIN_MATCH-1));
++#if MIN_MATCH != 3
++            Call UPDATE_HASH() MIN_MATCH-3 more times
++#endif
++        }
++        /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
++         * but this is not important since only literal bytes will be emitted.
++         */
++
++    } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0);
++
++    /* If the WIN_INIT bytes after the end of the current data have never been
++     * written, then zero those bytes in order to avoid memory check reports of
++     * the use of uninitialized (or uninitialised as Julian writes) bytes by
++     * the longest match routines.  Update the high water mark for the next
++     * time through here.  WIN_INIT is set to MAX_MATCH since the longest match
++     * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead.
++     */
++    if (s->high_water < s->window_size) {
++        ulg curr = s->strstart + (ulg)(s->lookahead);
++        ulg init;
++
++        if (s->high_water < curr) {
++            /* Previous high water mark below current data -- zero WIN_INIT
++             * bytes or up to end of window, whichever is less.
++             */
++            init = s->window_size - curr;
++            if (init > WIN_INIT)
++                init = WIN_INIT;
++            zmemzero(s->window + curr, (unsigned)init);
++            s->high_water = curr + init;
++        }
++        else if (s->high_water < (ulg)curr + WIN_INIT) {
++            /* High water mark at or above current data, but below current data
++             * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up
++             * to end of window, whichever is less.
++             */
++            init = (ulg)curr + WIN_INIT - s->high_water;
++            if (init > s->window_size - s->high_water)
++                init = s->window_size - s->high_water;
++            zmemzero(s->window + s->high_water, (unsigned)init);
++            s->high_water += init;
++        }
++    }
++
++    Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
++           "not enough room for search");
++}
+diff --git a/simd_stub.c b/simd_stub.c
+new file mode 100644
+index 000000000000..c6d46051498f
+--- /dev/null
++++ b/simd_stub.c
+@@ -0,0 +1,35 @@
++/* simd_stub.c -- stub implementations
++* Copyright (C) 2014 Intel Corporation
++* For conditions of distribution and use, see copyright notice in zlib.h
++*/
++#include <assert.h>
++
++#include "deflate.h"
++#include "x86.h"
++
++int ZLIB_INTERNAL x86_cpu_enable_simd = 0;
++
++void ZLIB_INTERNAL crc_fold_init(deflate_state *const s) {
++    assert(0);
++}
++
++void ZLIB_INTERNAL crc_fold_copy(deflate_state *const s,
++                                 unsigned char *dst,
++                                 const unsigned char *src,
++                                 long len) {
++    assert(0);
++}
++
++unsigned ZLIB_INTERNAL crc_fold_512to32(deflate_state *const s) {
++    assert(0);
++    return 0;
++}
++
++void ZLIB_INTERNAL fill_window_sse(deflate_state *s)
++{
++    assert(0);
++}
++
++void x86_check_features(void)
++{
++}
+diff --git a/x86.c b/x86.c
+new file mode 100644
+index 000000000000..e56fe8b85a39
+--- /dev/null
++++ b/x86.c
+@@ -0,0 +1,92 @@
++/*
++ * x86 feature check
++ *
++ * Copyright (C) 2013 Intel Corporation. All rights reserved.
++ * Author:
++ *  Jim Kukunas
++ * 
++ * For conditions of distribution and use, see copyright notice in zlib.h
++ */
++
++#include "x86.h"
++#include "zutil.h"
++
++int ZLIB_INTERNAL x86_cpu_enable_simd = 0;
++
++#ifndef _MSC_VER
++#include <pthread.h>
++
++pthread_once_t cpu_check_inited_once = PTHREAD_ONCE_INIT;
++static void _x86_check_features(void);
++
++void x86_check_features(void)
++{
++  pthread_once(&cpu_check_inited_once, _x86_check_features);
++}
++
++static void _x86_check_features(void)
++{
++    int x86_cpu_has_sse2;
++    int x86_cpu_has_sse42;
++    int x86_cpu_has_pclmulqdq;
++    unsigned eax, ebx, ecx, edx;
++
++    eax = 1;
++#ifdef __i386__
++    __asm__ __volatile__ (
++        "xchg %%ebx, %1\n\t"
++        "cpuid\n\t"
++        "xchg %1, %%ebx\n\t"
++    : "+a" (eax), "=S" (ebx), "=c" (ecx), "=d" (edx)
++    );
++#else
++    __asm__ __volatile__ (
++        "cpuid\n\t"
++    : "+a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx)
++    );
++#endif  /* (__i386__) */
++
++    x86_cpu_has_sse2 = edx & 0x4000000;
++    x86_cpu_has_sse42 = ecx & 0x100000;
++    x86_cpu_has_pclmulqdq = ecx & 0x2;
++
++    x86_cpu_enable_simd = x86_cpu_has_sse2 &&
++                          x86_cpu_has_sse42 &&
++                          x86_cpu_has_pclmulqdq;
++}
++#else
++#include <intrin.h>
++#include <windows.h>
++
++static BOOL CALLBACK _x86_check_features(PINIT_ONCE once,
++                                         PVOID param,
++                                         PVOID *context);
++static INIT_ONCE cpu_check_inited_once = INIT_ONCE_STATIC_INIT;
++
++void x86_check_features(void)
++{
++    InitOnceExecuteOnce(&cpu_check_inited_once, _x86_check_features,
++                        NULL, NULL);
++}
++
++static BOOL CALLBACK _x86_check_features(PINIT_ONCE once,
++                                         PVOID param,
++                                         PVOID *context)
++{
++    int x86_cpu_has_sse2;
++    int x86_cpu_has_sse42;
++    int x86_cpu_has_pclmulqdq;
++    int regs[4];
++
++    __cpuid(regs, 1);
++
++    x86_cpu_has_sse2 = regs[3] & 0x4000000;
++    x86_cpu_has_sse42= regs[2] & 0x100000;
++    x86_cpu_has_pclmulqdq = regs[2] & 0x2;
++
++    x86_cpu_enable_simd = x86_cpu_has_sse2 &&
++                          x86_cpu_has_sse42 &&
++                          x86_cpu_has_pclmulqdq;
++    return TRUE;
++}
++#endif  /* _MSC_VER */
+diff --git a/x86.h b/x86.h
+new file mode 100644
+index 000000000000..ebcf10ab09d2
+--- /dev/null
++++ b/x86.h
+@@ -0,0 +1,15 @@
++/* x86.h -- check for x86 CPU features
++* Copyright (C) 2013 Intel Corporation Jim Kukunas
++* For conditions of distribution and use, see copyright notice in zlib.h
++*/
++
++#ifndef X86_H
++#define X86_H
++
++#include "zlib.h"
++
++extern int x86_cpu_enable_simd;
++
++void x86_check_features(void);
++
++#endif  /* X86_H */
+diff --git a/zutil.h b/zutil.h
+index 80375b8b6109..4425bcf75eb3 100644
+--- a/zutil.h
++++ b/zutil.h
+@@ -283,4 +283,10 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
+ #define ZSWAP32(q) ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \
+                     (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
+ 
++#ifdef _MSC_VER
++#define zalign(x) __declspec(align(x))
++#else
++#define zalign(x) __attribute__((aligned((x))))
++#endif
++
+ #endif /* ZUTIL_H */
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/0002-uninitializedcheck.patch b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/0002-uninitializedcheck.patch
new file mode 100644
index 000000000..7c497839d
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/0002-uninitializedcheck.patch
@@ -0,0 +1,27 @@
+From 1a03e7aec95d89c659fd91f195b99893b6458cd7 Mon Sep 17 00:00:00 2001
+From: Adenilson Cavalcanti <adenilson.cavalcanti@arm.com>
+Date: Wed, 27 Sep 2017 13:59:04 -0700
+Subject: [PATCH] Zlib patch: prevent uninitialized use of state->check
+
+No need to call the Adler32 checksum function, just set
+the struct field to the expected value.
+
+Upstream bug: madler/zlib#245
+---
+ third_party/zlib/inflate.c                             |  2 +-
+ 1 files changed, 1 insertion(+), 1 deletions(-)
+ delete mode 100644 third_party/zlib/patches/0002-uninitializedcheck.patch
+
+diff --git a/third_party/zlib/inflate.c b/third_party/zlib/inflate.c
+index bec9497..5c40cf1 100644
+--- a/third_party/zlib/inflate.c
++++ b/third_party/zlib/inflate.c
+@@ -228,7 +228,7 @@ int stream_size;
+     state->strm = strm;
+     state->window = Z_NULL;
+     state->mode = HEAD;     /* to pass state test in inflateReset2() */
+-    state->check = adler32(0L, Z_NULL, 0);
++    state->check = 1L;      /* 1L is the result of adler32() zero length data */
+     ret = inflateReset2(strm, windowBits);
+     if (ret != Z_OK) {
+         ZFREE(strm, state);
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/0003-uninitializedjump.patch b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/0003-uninitializedjump.patch
new file mode 100644
index 000000000..7aae3238a
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/0003-uninitializedjump.patch
@@ -0,0 +1,15 @@
+diff --git a/third_party/zlib/deflate.c b/third_party/zlib/deflate.c
+index a39e62787862..c6053fd1c7ea 100644
+--- a/third_party/zlib/deflate.c
++++ b/third_party/zlib/deflate.c
+@@ -318,6 +318,10 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
+                                  s->w_size + window_padding,
+                                  2*sizeof(Byte));
+     s->prev   = (Posf *)  ZALLOC(strm, s->w_size, sizeof(Pos));
++    /* Avoid use of uninitialized value, see:
++     * https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11360
++     */
++    zmemzero(s->prev, s->w_size * sizeof(Pos));
+     s->head   = (Posf *)  ZALLOC(strm, s->hash_size, sizeof(Pos));
+ 
+     s->high_water = 0;      /* nothing written to s->window yet */
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/0004-fix-uwp.patch b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/0004-fix-uwp.patch
new file mode 100644
index 000000000..23145a7ae
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/0004-fix-uwp.patch
@@ -0,0 +1,22 @@
+diff --git a/third_party/zlib/contrib/minizip/iowin32.c b/third_party/zlib/contrib/minizip/iowin32.c
+index 246ceb91a139..c6bc314b3c28 100644
+--- a/third_party/zlib/contrib/minizip/iowin32.c
++++ b/third_party/zlib/contrib/minizip/iowin32.c
+@@ -31,14 +31,12 @@
+ #define _WIN32_WINNT 0x601
+ #endif
+ 
+-#if _WIN32_WINNT >= _WIN32_WINNT_WIN8
+-// see Include/shared/winapifamily.h in the Windows Kit
+-#if defined(WINAPI_FAMILY_PARTITION) && (!(defined(IOWIN32_USING_WINRT_API)))
+-#if WINAPI_FAMILY_ONE_PARTITION(WINAPI_FAMILY, WINAPI_PARTITION_APP)
++#if !defined(IOWIN32_USING_WINRT_API)
++#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)
++// Windows Store or Universal Windows Platform
+ #define IOWIN32_USING_WINRT_API 1
+ #endif
+ #endif
+-#endif
+ 
+ voidpf  ZCALLBACK win32_open_file_func  OF((voidpf opaque, const char* filename, int mode));
+ uLong   ZCALLBACK win32_read_file_func  OF((voidpf opaque, voidpf stream, void* buf, uLong size));
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/0005-infcover-gtest.patch b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/0005-infcover-gtest.patch
new file mode 100644
index 000000000..f5443bd7d
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/0005-infcover-gtest.patch
@@ -0,0 +1,405 @@
+From 409594639f15d825202971db7a275023e05772ff Mon Sep 17 00:00:00 2001
+From: Adenilson Cavalcanti <adenilson.cavalcanti@arm.com>
+Date: Tue, 28 Apr 2020 10:48:01 -0700
+Subject: [PATCH] Local Changes:   - make C tests build as C++ code so we can
+ use gtest.   - use gtest EXPECT_TRUE instead of C assert.   - replace C
+ streams for C++ (portability issues).
+
+---
+ test/infcover.c | 167 ++++++++++++++++++++++++++----------------------
+ 1 file changed, 90 insertions(+), 77 deletions(-)
+
+diff --git a/test/infcover.c b/test/infcover.c
+index 2be0164..a8c51c7 100644
+--- a/test/infcover.c
++++ b/test/infcover.c
+@@ -4,11 +4,12 @@
+  */
+ 
+ /* to use, do: ./configure --cover && make cover */
+-
++// clang-format off
++#include "infcover.h"
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <assert.h>
++
+ #include "zlib.h"
+ 
+ /* get definition of internal structure so we can mess with it (see pull()),
+@@ -17,8 +18,22 @@
+ #include "inftrees.h"
+ #include "inflate.h"
+ 
++/* XXX: use C++ streams instead of printf/fputs/etc due to portability
++ * as type sizes can vary between platforms.
++ */
++#include <iostream>
+ #define local static
+ 
++/* XXX: hacking C assert and plugging into GTest. */
++#include "gtest.h"
++#if defined(assert)
++#undef assert
++#define assert EXPECT_TRUE
++#endif
++
++/* XXX: handle what is a reserved word in C++. */
++#define try try_f
++
+ /* -- memory tracking routines -- */
+ 
+ /*
+@@ -72,7 +87,7 @@ local void *mem_alloc(void *mem, unsigned count, unsigned size)
+ {
+     void *ptr;
+     struct mem_item *item;
+-    struct mem_zone *zone = mem;
++    struct mem_zone *zone = static_cast<struct mem_zone *>(mem);
+     size_t len = count * (size_t)size;
+ 
+     /* induced allocation failure */
+@@ -87,7 +102,7 @@ local void *mem_alloc(void *mem, unsigned count, unsigned size)
+     memset(ptr, 0xa5, len);
+ 
+     /* create a new item for the list */
+-    item = malloc(sizeof(struct mem_item));
++    item = static_cast<struct mem_item *>(malloc(sizeof(struct mem_item)));
+     if (item == NULL) {
+         free(ptr);
+         return NULL;
+@@ -112,7 +127,7 @@ local void *mem_alloc(void *mem, unsigned count, unsigned size)
+ local void mem_free(void *mem, void *ptr)
+ {
+     struct mem_item *item, *next;
+-    struct mem_zone *zone = mem;
++    struct mem_zone *zone = static_cast<struct mem_zone *>(mem);
+ 
+     /* if no zone, just do a free */
+     if (zone == NULL) {
+@@ -159,7 +174,7 @@ local void mem_setup(z_stream *strm)
+ {
+     struct mem_zone *zone;
+ 
+-    zone = malloc(sizeof(struct mem_zone));
++    zone = static_cast<struct mem_zone *>(malloc(sizeof(struct mem_zone)));
+     assert(zone != NULL);
+     zone->first = NULL;
+     zone->total = 0;
+@@ -175,33 +190,33 @@ local void mem_setup(z_stream *strm)
+ /* set a limit on the total memory allocation, or 0 to remove the limit */
+ local void mem_limit(z_stream *strm, size_t limit)
+ {
+-    struct mem_zone *zone = strm->opaque;
++    struct mem_zone *zone = static_cast<struct mem_zone *>(strm->opaque);
+ 
+     zone->limit = limit;
+ }
+ 
+ /* show the current total requested allocations in bytes */
+-local void mem_used(z_stream *strm, char *prefix)
++local void mem_used(z_stream *strm, const char *prefix)
+ {
+-    struct mem_zone *zone = strm->opaque;
++    struct mem_zone *zone = static_cast<struct mem_zone *>(strm->opaque);
+ 
+-    fprintf(stderr, "%s: %lu allocated\n", prefix, zone->total);
++    std::cout << prefix << ": " << zone->total << " allocated" << std::endl;
+ }
+ 
+ /* show the high water allocation in bytes */
+-local void mem_high(z_stream *strm, char *prefix)
++local void mem_high(z_stream *strm, const char *prefix)
+ {
+-    struct mem_zone *zone = strm->opaque;
++    struct mem_zone *zone = static_cast<struct mem_zone *>(strm->opaque);
+ 
+-    fprintf(stderr, "%s: %lu high water mark\n", prefix, zone->highwater);
++    std::cout << prefix << ": " << zone->highwater << " high water mark" << std::endl;
+ }
+ 
+ /* release the memory allocation zone -- if there are any surprises, notify */
+-local void mem_done(z_stream *strm, char *prefix)
++local void mem_done(z_stream *strm, const char *prefix)
+ {
+     int count = 0;
+     struct mem_item *item, *next;
+-    struct mem_zone *zone = strm->opaque;
++    struct mem_zone *zone = static_cast<struct mem_zone *>(strm->opaque);
+ 
+     /* show high water mark */
+     mem_high(strm, prefix);
+@@ -218,13 +233,20 @@ local void mem_done(z_stream *strm, char *prefix)
+ 
+     /* issue alerts about anything unexpected */
+     if (count || zone->total)
+-        fprintf(stderr, "** %s: %lu bytes in %d blocks not freed\n",
+-                prefix, zone->total, count);
++        std::cout << "** " << prefix << ": "
++                  << zone->total << " bytes in "
++                  << count << " blocks not freed"
++                  << std::endl;
++
+     if (zone->notlifo)
+-        fprintf(stderr, "** %s: %d frees not LIFO\n", prefix, zone->notlifo);
++        std::cout << "** " << prefix << ": "
++                  << zone->notlifo << " frees not LIFO"
++                  << std::endl;
++
+     if (zone->rogue)
+-        fprintf(stderr, "** %s: %d frees not recognized\n",
+-                prefix, zone->rogue);
++        std::cout << "** " << prefix << ": "
++                  << zone->rogue << " frees not recognized"
++                  << std::endl;
+ 
+     /* free the zone and delete from the stream */
+     free(zone);
+@@ -247,7 +269,7 @@ local unsigned char *h2b(const char *hex, unsigned *len)
+     unsigned char *in, *re;
+     unsigned next, val;
+ 
+-    in = malloc((strlen(hex) + 1) >> 1);
++    in = static_cast<unsigned char *>(malloc((strlen(hex) + 1) >> 1));
+     if (in == NULL)
+         return NULL;
+     next = 0;
+@@ -268,7 +290,7 @@ local unsigned char *h2b(const char *hex, unsigned *len)
+     } while (*hex++);       /* go through the loop with the terminating null */
+     if (len != NULL)
+         *len = next;
+-    re = realloc(in, next);
++    re = static_cast<unsigned char *>(realloc(in, next));
+     return re == NULL ? in : re;
+ }
+ 
+@@ -281,7 +303,7 @@ local unsigned char *h2b(const char *hex, unsigned *len)
+    header information is collected with inflateGetHeader().  If a zlib stream
+    is looking for a dictionary, then an empty dictionary is provided.
+    inflate() is run until all of the input data is consumed. */
+-local void inf(char *hex, char *what, unsigned step, int win, unsigned len,
++local void inf(const char *hex, const char *what, unsigned step, int win, unsigned len,
+                int err)
+ {
+     int ret;
+@@ -298,7 +320,7 @@ local void inf(char *hex, char *what, unsigned step, int win, unsigned len,
+         mem_done(&strm, what);
+         return;
+     }
+-    out = malloc(len);                          assert(out != NULL);
++    out = static_cast<unsigned char *>(malloc(len));                          assert(out != NULL);
+     if (win == 47) {
+         head.extra = out;
+         head.extra_max = len;
+@@ -347,7 +369,7 @@ local void inf(char *hex, char *what, unsigned step, int win, unsigned len,
+ }
+ 
+ /* cover all of the lines in inflate.c up to inflate() */
+-local void cover_support(void)
++void cover_support(void)
+ {
+     int ret;
+     z_stream strm;
+@@ -381,11 +403,11 @@ local void cover_support(void)
+     strm.next_in = Z_NULL;
+     ret = inflateInit(&strm);                   assert(ret == Z_OK);
+     ret = inflateEnd(&strm);                    assert(ret == Z_OK);
+-    fputs("inflate built-in memory routines\n", stderr);
++    std::cout << "inflate built-in memory routines" << std::endl;;
+ }
+ 
+ /* cover all inflate() header and trailer cases and code after inflate() */
+-local void cover_wrap(void)
++void cover_wrap(void)
+ {
+     int ret;
+     z_stream strm, copy;
+@@ -394,7 +416,7 @@ local void cover_wrap(void)
+     ret = inflate(Z_NULL, 0);                   assert(ret == Z_STREAM_ERROR);
+     ret = inflateEnd(Z_NULL);                   assert(ret == Z_STREAM_ERROR);
+     ret = inflateCopy(Z_NULL, Z_NULL);          assert(ret == Z_STREAM_ERROR);
+-    fputs("inflate bad parameters\n", stderr);
++    std::cout << "inflate bad parameters" << std::endl;
+ 
+     inf("1f 8b 0 0", "bad gzip method", 0, 31, 0, Z_DATA_ERROR);
+     inf("1f 8b 8 80", "bad gzip flags", 0, 31, 0, Z_DATA_ERROR);
+@@ -415,9 +437,9 @@ local void cover_wrap(void)
+     strm.next_in = Z_NULL;
+     ret = inflateInit2(&strm, -8);
+     strm.avail_in = 2;
+-    strm.next_in = (void *)"\x63";
++    strm.next_in = (Bytef *)"\x63";
+     strm.avail_out = 1;
+-    strm.next_out = (void *)&ret;
++    strm.next_out = (Bytef *)&ret;
+     mem_limit(&strm, 1);
+     ret = inflate(&strm, Z_NO_FLUSH);           assert(ret == Z_MEM_ERROR);
+     ret = inflate(&strm, Z_NO_FLUSH);           assert(ret == Z_MEM_ERROR);
+@@ -428,11 +450,11 @@ local void cover_wrap(void)
+     mem_limit(&strm, (sizeof(struct inflate_state) << 1) + 256);
+     ret = inflatePrime(&strm, 16, 0);           assert(ret == Z_OK);
+     strm.avail_in = 2;
+-    strm.next_in = (void *)"\x80";
++    strm.next_in = (Bytef *)"\x80";
+     ret = inflateSync(&strm);                   assert(ret == Z_DATA_ERROR);
+     ret = inflate(&strm, Z_NO_FLUSH);           assert(ret == Z_STREAM_ERROR);
+     strm.avail_in = 4;
+-    strm.next_in = (void *)"\0\0\xff\xff";
++    strm.next_in = (Bytef *)"\0\0\xff\xff";
+     ret = inflateSync(&strm);                   assert(ret == Z_OK);
+     (void)inflateSyncPoint(&strm);
+     ret = inflateCopy(&copy, &strm);            assert(ret == Z_MEM_ERROR);
+@@ -454,7 +476,7 @@ local unsigned pull(void *desc, unsigned char **buf)
+         next = 0;
+         return 0;   /* no input (already provided at next_in) */
+     }
+-    state = (void *)((z_stream *)desc)->state;
++    state = reinterpret_cast<struct inflate_state *>(((z_stream *)desc)->state);
+     if (state != Z_NULL)
+         state->mode = SYNC;     /* force an otherwise impossible situation */
+     return next < sizeof(dat) ? (*buf = dat + next++, 1) : 0;
+@@ -467,7 +489,7 @@ local int push(void *desc, unsigned char *buf, unsigned len)
+ }
+ 
+ /* cover inflateBack() up to common deflate data cases and after those */
+-local void cover_back(void)
++void cover_back(void)
+ {
+     int ret;
+     z_stream strm;
+@@ -479,17 +501,17 @@ local void cover_back(void)
+     ret = inflateBack(Z_NULL, Z_NULL, Z_NULL, Z_NULL, Z_NULL);
+                                                 assert(ret == Z_STREAM_ERROR);
+     ret = inflateBackEnd(Z_NULL);               assert(ret == Z_STREAM_ERROR);
+-    fputs("inflateBack bad parameters\n", stderr);
++    std::cout << "inflateBack bad parameters" << std::endl;;
+ 
+     mem_setup(&strm);
+     ret = inflateBackInit(&strm, 15, win);      assert(ret == Z_OK);
+     strm.avail_in = 2;
+-    strm.next_in = (void *)"\x03";
++    strm.next_in = (Bytef *)"\x03";
+     ret = inflateBack(&strm, pull, Z_NULL, push, Z_NULL);
+                                                 assert(ret == Z_STREAM_END);
+         /* force output error */
+     strm.avail_in = 3;
+-    strm.next_in = (void *)"\x63\x00";
++    strm.next_in = (Bytef *)"\x63\x00";
+     ret = inflateBack(&strm, pull, Z_NULL, push, &strm);
+                                                 assert(ret == Z_BUF_ERROR);
+         /* force mode error by mucking with state */
+@@ -500,11 +522,11 @@ local void cover_back(void)
+ 
+     ret = inflateBackInit(&strm, 15, win);      assert(ret == Z_OK);
+     ret = inflateBackEnd(&strm);                assert(ret == Z_OK);
+-    fputs("inflateBack built-in memory routines\n", stderr);
++    std::cout << "inflateBack built-in memory routines" << std::endl;;
+ }
+ 
+ /* do a raw inflate of data in hexadecimal with both inflate and inflateBack */
+-local int try(char *hex, char *id, int err)
++local int try(const char *hex, const char *id, int err)
+ {
+     int ret;
+     unsigned len, size;
+@@ -518,11 +540,11 @@ local int try(char *hex, char *id, int err)
+ 
+     /* allocate work areas */
+     size = len << 3;
+-    out = malloc(size);
++    out = static_cast<unsigned char *>(malloc(size));
+     assert(out != NULL);
+-    win = malloc(32768);
++    win = static_cast<unsigned char *>(malloc(32768));
+     assert(win != NULL);
+-    prefix = malloc(strlen(id) + 6);
++    prefix = static_cast<char *>(malloc(strlen(id) + 6));
+     assert(prefix != NULL);
+ 
+     /* first with inflate */
+@@ -578,7 +600,7 @@ local int try(char *hex, char *id, int err)
+ }
+ 
+ /* cover deflate data cases in both inflate() and inflateBack() */
+-local void cover_inflate(void)
++void cover_inflate(void)
+ {
+     try("0 0 0 0 0", "invalid stored block lengths", 1);
+     try("3 0", "fixed", 0);
+@@ -613,32 +635,33 @@ local void cover_inflate(void)
+     inf("63 18 5 40 c 0", "window wrap", 3, -8, 300, Z_OK);
+ }
+ 
++/* XXX(cavalcantii): fix linking error due inflate_table. */
+ /* cover remaining lines in inftrees.c */
+-local void cover_trees(void)
+-{
+-    int ret;
+-    unsigned bits;
+-    unsigned short lens[16], work[16];
+-    code *next, table[ENOUGH_DISTS];
+-
+-    /* we need to call inflate_table() directly in order to manifest not-
+-       enough errors, since zlib insures that enough is always enough */
+-    for (bits = 0; bits < 15; bits++)
+-        lens[bits] = (unsigned short)(bits + 1);
+-    lens[15] = 15;
+-    next = table;
+-    bits = 15;
+-    ret = inflate_table(DISTS, lens, 16, &next, &bits, work);
+-                                                assert(ret == 1);
+-    next = table;
+-    bits = 1;
+-    ret = inflate_table(DISTS, lens, 16, &next, &bits, work);
+-                                                assert(ret == 1);
+-    fputs("inflate_table not enough errors\n", stderr);
+-}
++/* void cover_trees(void) */
++/* { */
++/*     int ret; */
++/*     unsigned bits; */
++/*     unsigned short lens[16], work[16]; */
++/*     code *next, table[ENOUGH_DISTS]; */
++
++/*     /\* we need to call inflate_table() directly in order to manifest not- */
++/*        enough errors, since zlib insures that enough is always enough *\/ */
++/*     for (bits = 0; bits < 15; bits++) */
++/*         lens[bits] = (unsigned short)(bits + 1); */
++/*     lens[15] = 15; */
++/*     next = table; */
++/*     bits = 15; */
++/*     ret = inflate_table(DISTS, lens, 16, &next, &bits, work); */
++/*                                                 assert(ret == 1); */
++/*     next = table; */
++/*     bits = 1; */
++/*     ret = inflate_table(DISTS, lens, 16, &next, &bits, work); */
++/*                                                 assert(ret == 1); */
++/*     fputs("inflate_table not enough errors\n", stderr); */
++/* } */
+ 
+ /* cover remaining inffast.c decoding and window copying */
+-local void cover_fast(void)
++void cover_fast(void)
+ {
+     inf("e5 e0 81 ad 6d cb b2 2c c9 01 1e 59 63 ae 7d ee fb 4d fd b5 35 41 68"
+         " ff 7f 0f 0 0 0", "fast length extra bits", 0, -8, 258, Z_DATA_ERROR);
+@@ -658,14 +681,4 @@ local void cover_fast(void)
+         Z_STREAM_END);
+ }
+ 
+-int main(void)
+-{
+-    fprintf(stderr, "%s\n", zlibVersion());
+-    cover_support();
+-    cover_wrap();
+-    cover_back();
+-    cover_inflate();
+-    cover_trees();
+-    cover_fast();
+-    return 0;
+-}
++// clang-format on
+-- 
+2.21.1 (Apple Git-122.3)
+
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/0006-fix-check_match.patch b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/0006-fix-check_match.patch
new file mode 100644
index 000000000..b21c363b1
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/0006-fix-check_match.patch
@@ -0,0 +1,42 @@
+From 8304bdda5293ffd5b3efce8e4f54904b387029d6 Mon Sep 17 00:00:00 2001
+From: Hans Wennborg <hans@chromium.org>
+Date: Wed, 23 Sep 2020 16:36:38 +0200
+Subject: [PATCH] Avoid crashing in check_match when prev_match == -1
+
+prev_match can be set to -1 after sliding the window. In that case, the
+window has slid past the first byte of the last match, which means it
+cannot be compared in check_match.
+
+This would cause zlib to crash on some inputs to deflate when built
+with ZLIB_DEBUG enabled.
+
+Check for this situation and avoid crashing by not trying to compare
+the first byte.
+
+Bug: 1113142
+---
+ third_party/zlib/deflate.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/third_party/zlib/deflate.c b/third_party/zlib/deflate.c
+index cfdd2f46b230..d70732ec6fc2 100644
+--- a/third_party/zlib/deflate.c
++++ b/third_party/zlib/deflate.c
+@@ -2060,7 +2060,13 @@ local block_state deflate_slow(s, flush)
+             uInt max_insert = s->strstart + s->lookahead - MIN_MATCH;
+             /* Do not insert strings in hash table beyond this. */
+ 
+-            check_match(s, s->strstart-1, s->prev_match, s->prev_length);
++            if (s->prev_match == -1) {
++                /* The window has slid one byte past the previous match,
++                 * so the first byte cannot be compared. */
++                check_match(s, s->strstart, s->prev_match+1, s->prev_length-1);
++            } else {
++                check_match(s, s->strstart-1, s->prev_match, s->prev_length);
++            }
+ 
+             _tr_tally_dist(s, s->strstart -1 - s->prev_match,
+                            s->prev_length - MIN_MATCH, bflush);
+-- 
+2.28.0.681.g6f77f65b4e-goog
+
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/0007-zero-init-deflate-window.patch b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/0007-zero-init-deflate-window.patch
new file mode 100644
index 000000000..9dbbf53a8
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/0007-zero-init-deflate-window.patch
@@ -0,0 +1,40 @@
+From 92537ee19784e0e545f06d89b7d89ab532a18cff Mon Sep 17 00:00:00 2001
+From: Hans Wennborg <hans@chromium.org>
+Date: Tue, 3 Nov 2020 15:54:09 +0100
+Subject: [PATCH] [zlib] Zero-initialize the window used for deflation
+
+Otherwise MSan complains about use-of-uninitialized values in the
+window.
+This happens in both regular deflate's longest_match and deflate_rle.
+
+Before crrev.com/822755 we used to suppress those reports, but it seems
+better to fix it properly. That will also allow us to catch other
+potential issues with MSan in these functions.
+
+The instances of this that we've seen only reproduce with
+fill_window_sse(), not with the regular fill_window() function. Since
+the former doesn't exist in upstream zlib, I'm not planning to send this
+patch upstream.
+
+Bug: 1137613, 1144420
+---
+ third_party/zlib/deflate.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/third_party/zlib/deflate.c b/third_party/zlib/deflate.c
+index 8bf93e524875..fc7ae45905ff 100644
+--- a/third_party/zlib/deflate.c
++++ b/third_party/zlib/deflate.c
+@@ -321,6 +321,9 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
+     s->window = (Bytef *) ZALLOC(strm,
+                                  s->w_size + window_padding,
+                                  2*sizeof(Byte));
++    /* Avoid use of unitialized values in the window, see crbug.com/1137613 and
++     * crbug.com/1144420 */
++    zmemzero(s->window, (s->w_size + window_padding) * (2 * sizeof(Byte)));
+     s->prev   = (Posf *)  ZALLOC(strm, s->w_size, sizeof(Pos));
+     /* Avoid use of uninitialized value, see:
+      * https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11360
+-- 
+2.29.1.341.ge80a0c044ae-goog
+
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/0008-minizip-zip-unzip-tools.patch b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/0008-minizip-zip-unzip-tools.patch
new file mode 100644
index 000000000..48ceb02d4
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/0008-minizip-zip-unzip-tools.patch
@@ -0,0 +1,98 @@
+From 0c7de17000659f4f79de878296892c46be0aff77 Mon Sep 17 00:00:00 2001
+From: Noel Gordon <noel@chromium.org>
+Date: Wed, 26 May 2021 21:57:43 +1000
+Subject: [PATCH] Build minizip zip and unzip tools
+
+---
+ third_party/zlib/contrib/minizip/miniunz.c | 13 ++++++-------
+ third_party/zlib/contrib/minizip/minizip.c |  7 +++----
+ 2 files changed, 9 insertions(+), 11 deletions(-)
+
+diff --git a/third_party/zlib/contrib/minizip/miniunz.c b/third_party/zlib/contrib/minizip/miniunz.c
+index 3d65401be5cd..08737f689a96 100644
+--- a/third_party/zlib/contrib/minizip/miniunz.c
++++ b/third_party/zlib/contrib/minizip/miniunz.c
+@@ -12,7 +12,7 @@
+          Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+ */
+
+-#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
++#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__)) && (!defined(__ANDROID_API__))
+         #ifndef __USE_FILE_OFFSET64
+                 #define __USE_FILE_OFFSET64
+         #endif
+@@ -27,7 +27,7 @@
+         #endif
+ #endif
+
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__Fuchsia__) || defined(__ANDROID_API__)
+ // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
+ #define FOPEN_FUNC(filename, mode) fopen(filename, mode)
+ #define FTELLO_FUNC(stream) ftello(stream)
+@@ -45,6 +45,7 @@
+ #include <time.h>
+ #include <errno.h>
+ #include <fcntl.h>
++#include <sys/stat.h>
+
+ #ifdef _WIN32
+ # include <direct.h>
+@@ -97,7 +98,7 @@ void change_file_date(filename,dosdate,tmu_date)
+   SetFileTime(hFile,&ftm,&ftLastAcc,&ftm);
+   CloseHandle(hFile);
+ #else
+-#ifdef unix || __APPLE__
++#if defined(unix) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__ANDROID_API__)
+   struct utimbuf ut;
+   struct tm newdate;
+   newdate.tm_sec = tmu_date.tm_sec;
+@@ -125,11 +126,9 @@ int mymkdir(dirname)
+     const char* dirname;
+ {
+     int ret=0;
+-#ifdef _WIN32
++#if defined(_WIN32)
+     ret = _mkdir(dirname);
+-#elif unix
+-    ret = mkdir (dirname,0775);
+-#elif __APPLE__
++#elif defined(unix) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__ANDROID_API__)
+     ret = mkdir (dirname,0775);
+ #endif
+     return ret;
+diff --git a/third_party/zlib/contrib/minizip/minizip.c b/third_party/zlib/contrib/minizip/minizip.c
+index 4288962ecef0..b794953c5c23 100644
+--- a/third_party/zlib/contrib/minizip/minizip.c
++++ b/third_party/zlib/contrib/minizip/minizip.c
+@@ -12,8 +12,7 @@
+          Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+ */
+
+-
+-#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
++#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__)) && (!defined(__ANDROID_API__))
+         #ifndef __USE_FILE_OFFSET64
+                 #define __USE_FILE_OFFSET64
+         #endif
+@@ -28,7 +27,7 @@
+         #endif
+ #endif
+
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__Fuchsia__) || defined(__ANDROID_API__)
+ // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
+ #define FOPEN_FUNC(filename, mode) fopen(filename, mode)
+ #define FTELLO_FUNC(stream) ftello(stream)
+@@ -94,7 +93,7 @@ uLong filetime(f, tmzip, dt)
+   return ret;
+ }
+ #else
+-#ifdef unix || __APPLE__
++#if defined(unix) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__ANDROID_API__)
+ uLong filetime(f, tmzip, dt)
+     char *f;               /* name of file to get info on */
+     tm_zip *tmzip;         /* return value: access, modific. and creation times */
+--
+2.31.1.818.g46aad6cb9e-goog
+
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/0009-infcover-oob.patch b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/0009-infcover-oob.patch
new file mode 100644
index 000000000..648360f33
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/0009-infcover-oob.patch
@@ -0,0 +1,24 @@
+From 75690b2683667be5535ac6243438115dc9c40f6a Mon Sep 17 00:00:00 2001
+From: Florian Mayer <fmayer@google.com>
+Date: Wed, 16 Mar 2022 16:38:36 -0700
+Subject: [PATCH] Fix out of bounds in infcover.c.
+
+---
+ test/infcover.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/test/infcover.c b/test/infcover.c
+index 2be01646c..a6d83693c 100644
+--- a/test/infcover.c
++++ b/test/infcover.c
+@@ -373,7 +373,9 @@ local void cover_support(void)
+     mem_setup(&strm);
+     strm.avail_in = 0;
+     strm.next_in = Z_NULL;
+-    ret = inflateInit_(&strm, ZLIB_VERSION - 1, (int)sizeof(z_stream));
++    char versioncpy[] = ZLIB_VERSION;
++    versioncpy[0] -= 1;
++    ret = inflateInit_(&strm, versioncpy, (int)sizeof(z_stream));
+                                                 assert(ret == Z_VERSION_ERROR);
+     mem_done(&strm, "wrong version");
+ 
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/0010-cmake-enable-simd.patch b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/0010-cmake-enable-simd.patch
new file mode 100644
index 000000000..3893101b7
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/0010-cmake-enable-simd.patch
@@ -0,0 +1,96 @@
+diff --git a/third_party/zlib/CMakeLists.txt b/third_party/zlib/CMakeLists.txt
+index b412dc7feb732..0431278405046 100644
+--- a/third_party/zlib/CMakeLists.txt
++++ b/third_party/zlib/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.4.4)
++cmake_minimum_required(VERSION 3.0)
+ set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
+ 
+ project(zlib C)
+@@ -21,6 +21,26 @@ check_include_file(sys/types.h HAVE_SYS_TYPES_H)
+ check_include_file(stdint.h    HAVE_STDINT_H)
+ check_include_file(stddef.h    HAVE_STDDEF_H)
+ 
++option(ENABLE_SIMD_OPTIMIZATIONS "Enable all SIMD optimizations" OFF)
++
++# TODO(cavalcantii): add support for other OSes (e.g. Android, fuchsia, osx)
++# and architectures (e.g. Arm).
++if (ENABLE_SIMD_OPTIMIZATIONS)
++   add_definitions(-DINFLATE_CHUNK_SIMD_SSE2)
++   add_definitions(-DADLER32_SIMD_SSSE3)
++   add_definitions(-DINFLATE_CHUNK_READ_64LE)
++   add_definitions(-DCRC32_SIMD_SSE42_PCLMUL)
++   add_definitions(-DDEFLATE_SLIDE_HASH_SSE2)
++   add_compile_options(-msse4.2 -mpclmul)
++   # Required by CPU features detection code.
++   add_definitions(-DX86_NOT_WINDOWS)
++   # Apparently some environments (e.g. CentOS) require to explicitly link
++   # with pthread and that is required by the CPU features detection code.
++   find_package (Threads REQUIRED)
++   SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread")
++   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
++endif()
++
+ #
+ # Check to see if we have large file support
+ #
+@@ -120,10 +140,25 @@ set(ZLIB_SRCS
+     zutil.c
+ )
+ 
+-if(NOT MINGW)
+-    set(ZLIB_DLL_SRCS
+-        win32/zlib1.rc # If present will override custom build rule below.
+-    )
++
++#============================================================================
++# Update list of source files if optimizations were enabled
++#============================================================================
++if (ENABLE_SIMD_OPTIMIZATIONS)
++  list(REMOVE_ITEM ZLIB_SRCS inflate.c)
++
++  list(APPEND ZLIB_PRIVATE_HDRS ${CMAKE_CURRENT_SOURCE_DIR}/adler32_simd.h)
++  list(APPEND ZLIB_PRIVATE_HDRS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/optimizations/chunkcopy.h)
++  list(APPEND ZLIB_PRIVATE_HDRS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/optimizations/inffast_chunk.h)
++  list(APPEND ZLIB_PRIVATE_HDRS ${CMAKE_CURRENT_SOURCE_DIR}/cpu_features.h)
++  list(APPEND ZLIB_PRIVATE_HDRS ${CMAKE_CURRENT_SOURCE_DIR}/crc32_simd.h)
++
++  list(APPEND ZLIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/adler32_simd.c)
++  list(APPEND ZLIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/optimizations/inffast_chunk.c)
++  list(APPEND ZLIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/optimizations/inflate.c)
++  list(APPEND ZLIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/cpu_features.c)
++  list(APPEND ZLIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/crc32_simd.c)
++  list(APPEND ZLIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/crc_folding.c)
+ endif()
+ 
+ # parse the full version number from zlib.h and include in ZLIB_FULL_VERSION
+@@ -191,23 +226,9 @@ if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
+ endif()
+ 
+ #============================================================================
+-# Example binaries
++# Benchmarker
+ #============================================================================
+-
+-add_executable(example test/example.c)
+-target_link_libraries(example zlib)
+-add_test(example example)
+-
+-add_executable(minigzip test/minigzip.c)
+-target_link_libraries(minigzip zlib)
+-
+-if(HAVE_OFF64_T)
+-    add_executable(example64 test/example.c)
+-    target_link_libraries(example64 zlib)
+-    set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
+-    add_test(example64 example64)
+-
+-    add_executable(minigzip64 test/minigzip.c)
+-    target_link_libraries(minigzip64 zlib)
+-    set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
+-endif()
++enable_language(CXX)
++set(CMAKE_CXX_STANDARD 14) # workaround for older compilers (e.g. g++ 5.4).
++add_executable(zlib_bench contrib/bench/zlib_bench.cc)
++target_link_libraries(zlib_bench zlib)
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/0011-avx512.patch b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/0011-avx512.patch
new file mode 100644
index 000000000..6d409b773
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/0011-avx512.patch
@@ -0,0 +1,357 @@
+From 87fc8e3e38323cfdabf8da3927488e3e57073b02 Mon Sep 17 00:00:00 2001
+From: Jia Liu <jia3.liu@intel.com>
+Date: Thu, 30 Mar 2023 11:13:16 +0800
+Subject: [PATCH] Enabled AVX512 for CRC32
+
+Enabled AVX512 for CRC32 that provide best of known performance
+beyond current SSE SIMD optimization. It enables multiple folding
+operations and AVX512 new instructions, providing ~3.5X CRC32
+performance and ~3.7% gain on Zlib_bench gzip performance.
+---
+ CMakeLists.txt |   8 +-
+ cpu_features.c |   9 +++
+ cpu_features.h |   1 +
+ crc32.c        |  14 +++-
+ crc32_simd.c   | 198 ++++++++++++++++++++++++++++++++++++++++++++++++-
+ crc32_simd.h   |   6 ++
+ 6 files changed, 230 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f06e193..d45b902 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -22,6 +22,7 @@ check_include_file(stdint.h    HAVE_STDINT_H)
+ check_include_file(stddef.h    HAVE_STDDEF_H)
+ 
+ option(ENABLE_SIMD_OPTIMIZATIONS "Enable all SIMD optimizations" OFF)
++option(ENABLE_SIMD_AVX512 "Enable SIMD AXV512 optimizations" OFF)
+ 
+ # TODO(cavalcantii): add support for other OSes (e.g. Android, fuchsia, osx)
+ # and architectures (e.g. Arm).
+@@ -30,8 +31,13 @@ if (ENABLE_SIMD_OPTIMIZATIONS)
+    add_definitions(-DADLER32_SIMD_SSSE3)
+    add_definitions(-DINFLATE_CHUNK_READ_64LE)
+    add_definitions(-DCRC32_SIMD_SSE42_PCLMUL)
++   if (ENABLE_SIMD_AVX512)
++    add_definitions(-DCRC32_SIMD_AVX512_PCLMUL)
++    add_compile_options(-mvpclmulqdq -msse2 -mavx512f -mpclmul)
++   else()
++    add_compile_options(-msse4.2 -mpclmul)
++   endif()
+    add_definitions(-DDEFLATE_SLIDE_HASH_SSE2)
+-   add_compile_options(-msse4.2 -mpclmul)
+    # Required by CPU features detection code.
+    add_definitions(-DX86_NOT_WINDOWS)
+    # Apparently some environments (e.g. CentOS) require to explicitly link
+diff --git a/cpu_features.c b/cpu_features.c
+index 877d5f2..ac6ee88 100644
+--- a/cpu_features.c
++++ b/cpu_features.c
+@@ -31,6 +31,7 @@ int ZLIB_INTERNAL arm_cpu_enable_pmull = 0;
+ int ZLIB_INTERNAL x86_cpu_enable_sse2 = 0;
+ int ZLIB_INTERNAL x86_cpu_enable_ssse3 = 0;
+ int ZLIB_INTERNAL x86_cpu_enable_simd = 0;
++int ZLIB_INTERNAL x86_cpu_enable_avx512 = 0;
+ 
+ #ifndef CPU_NO_SIMD
+ 
+@@ -138,6 +139,10 @@ static void _cpu_check_features(void)
+ /* On x86 we simply use a instruction to check the CPU features.
+  * (i.e. CPUID).
+  */
++#ifdef CRC32_SIMD_AVX512_PCLMUL
++#include <immintrin.h>
++#include <xsaveintrin.h>
++#endif
+ static void _cpu_check_features(void)
+ {
+     int x86_cpu_has_sse2;
+@@ -164,6 +169,10 @@ static void _cpu_check_features(void)
+     x86_cpu_enable_simd = x86_cpu_has_sse2 &&
+                           x86_cpu_has_sse42 &&
+                           x86_cpu_has_pclmulqdq;
++
++#ifdef CRC32_SIMD_AVX512_PCLMUL
++    x86_cpu_enable_avx512 = _xgetbv(0) & 0x00000040;
++#endif
+ }
+ #endif
+ #endif
+diff --git a/cpu_features.h b/cpu_features.h
+index 279246c..aed3e83 100644
+--- a/cpu_features.h
++++ b/cpu_features.h
+@@ -14,5 +14,6 @@ extern int arm_cpu_enable_pmull;
+ extern int x86_cpu_enable_sse2;
+ extern int x86_cpu_enable_ssse3;
+ extern int x86_cpu_enable_simd;
++extern int x86_cpu_enable_avx512;
+ 
+ void cpu_check_features(void);
+diff --git a/crc32.c b/crc32.c
+index 4486098..acb6972 100644
+--- a/crc32.c
++++ b/crc32.c
+@@ -773,7 +773,19 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
+     }
+ 
+ #endif
+-#if defined(CRC32_SIMD_SSE42_PCLMUL)
++#if defined(CRC32_SIMD_AVX512_PCLMUL)
++    if (x86_cpu_enable_avx512 && len >= Z_CRC32_AVX512_MINIMUM_LENGTH) {
++        /* crc32 64-byte chunks */
++        z_size_t chunk_size = len & ~Z_CRC32_AVX512_CHUNKSIZE_MASK;
++        crc = ~crc32_avx512_simd_(buf, chunk_size, ~(uint32_t)crc);
++        /* check remaining data */
++        len -= chunk_size;
++        if (!len)
++            return crc;
++        /* Fall into the default crc32 for the remaining data. */
++        buf += chunk_size;
++    }
++#elif defined(CRC32_SIMD_SSE42_PCLMUL)
+     if (x86_cpu_enable_simd && len >= Z_CRC32_SSE42_MINIMUM_LENGTH) {
+         /* crc32 16-byte chunks */
+         z_size_t chunk_size = len & ~Z_CRC32_SSE42_CHUNKSIZE_MASK;
+diff --git a/crc32_simd.c b/crc32_simd.c
+index d80beba..7428270 100644
+--- a/crc32_simd.c
++++ b/crc32_simd.c
+@@ -6,17 +6,207 @@
+  */
+ 
+ #include "crc32_simd.h"
+-
+-#if defined(CRC32_SIMD_SSE42_PCLMUL)
++#if defined(CRC32_SIMD_AVX512_PCLMUL)
+ 
+ /*
+- * crc32_sse42_simd_(): compute the crc32 of the buffer, where the buffer
+- * length must be at least 64, and a multiple of 16. Based on:
++ * crc32_avx512_simd_(): compute the crc32 of the buffer, where the buffer
++ * length must be at least 256, and a multiple of 64. Based on:
+  *
+  * "Fast CRC Computation for Generic Polynomials Using PCLMULQDQ Instruction"
+  *  V. Gopal, E. Ozturk, et al., 2009, http://intel.ly/2ySEwL0
+  */
+ 
++#include <emmintrin.h>
++#include <smmintrin.h>
++#include <wmmintrin.h>
++#include <immintrin.h>
++
++uint32_t ZLIB_INTERNAL crc32_avx512_simd_(  /* AVX512+PCLMUL */
++    const unsigned char *buf,
++    z_size_t len,
++    uint32_t crc)
++{
++    /*
++     * Definitions of the bit-reflected domain constants k1,k2,k3,k4
++     * are similar to those given at the end of the paper, and remaining
++     * constants and CRC32+Barrett polynomials remain unchanged.
++     *
++     * Replace the index of x from 128 to 512. As follows:
++     * k1 = ( x ^ ( 512 * 4 + 32 ) mod P(x) << 32 )' << 1 = 0x011542778a
++     * k2 = ( x ^ ( 512 * 4 - 32 ) mod P(x) << 32 )' << 1 = 0x01322d1430
++     * k3 = ( x ^ ( 512 + 32 ) mod P(x) << 32 )' << 1 = 0x0154442bd4
++     * k4 = ( x ^ ( 512 - 32 ) mod P(x) << 32 )' << 1 = 0x01c6e41596
++     */
++    static const uint64_t zalign(64) k1k2[] = { 0x011542778a, 0x01322d1430,
++                                                0x011542778a, 0x01322d1430,
++                                                0x011542778a, 0x01322d1430,
++                                                0x011542778a, 0x01322d1430 };
++    static const uint64_t zalign(64) k3k4[] = { 0x0154442bd4, 0x01c6e41596,
++                                                0x0154442bd4, 0x01c6e41596,
++                                                0x0154442bd4, 0x01c6e41596,
++                                                0x0154442bd4, 0x01c6e41596 };
++    static const uint64_t zalign(16) k5k6[] = { 0x01751997d0, 0x00ccaa009e };
++    static const uint64_t zalign(16) k7k8[] = { 0x0163cd6124, 0x0000000000 };
++    static const uint64_t zalign(16) poly[] = { 0x01db710641, 0x01f7011641 };
++    __m512i x0, x1, x2, x3, x4, x5, x6, x7, x8, y5, y6, y7, y8;
++    __m128i a0, a1, a2, a3;
++
++    /*
++     * There's at least one block of 256.
++     */
++    x1 = _mm512_loadu_si512((__m512i *)(buf + 0x00));
++    x2 = _mm512_loadu_si512((__m512i *)(buf + 0x40));
++    x3 = _mm512_loadu_si512((__m512i *)(buf + 0x80));
++    x4 = _mm512_loadu_si512((__m512i *)(buf + 0xC0));
++
++    x1 = _mm512_xor_si512(x1, _mm512_castsi128_si512(_mm_cvtsi32_si128(crc)));
++
++    x0 = _mm512_load_si512((__m512i *)k1k2);
++
++    buf += 256;
++    len -= 256;
++
++    /*
++     * Parallel fold blocks of 256, if any.
++     */
++    while (len >= 256)
++    {
++        x5 = _mm512_clmulepi64_epi128(x1, x0, 0x00);
++        x6 = _mm512_clmulepi64_epi128(x2, x0, 0x00);
++        x7 = _mm512_clmulepi64_epi128(x3, x0, 0x00);
++        x8 = _mm512_clmulepi64_epi128(x4, x0, 0x00);
++
++
++        x1 = _mm512_clmulepi64_epi128(x1, x0, 0x11);
++        x2 = _mm512_clmulepi64_epi128(x2, x0, 0x11);
++        x3 = _mm512_clmulepi64_epi128(x3, x0, 0x11);
++        x4 = _mm512_clmulepi64_epi128(x4, x0, 0x11);
++
++        y5 = _mm512_loadu_si512((__m512i *)(buf + 0x00));
++        y6 = _mm512_loadu_si512((__m512i *)(buf + 0x40));
++        y7 = _mm512_loadu_si512((__m512i *)(buf + 0x80));
++        y8 = _mm512_loadu_si512((__m512i *)(buf + 0xC0));
++
++        x1 = _mm512_xor_si512(x1, x5);
++        x2 = _mm512_xor_si512(x2, x6);
++        x3 = _mm512_xor_si512(x3, x7);
++        x4 = _mm512_xor_si512(x4, x8);
++
++        x1 = _mm512_xor_si512(x1, y5);
++        x2 = _mm512_xor_si512(x2, y6);
++        x3 = _mm512_xor_si512(x3, y7);
++        x4 = _mm512_xor_si512(x4, y8);
++
++        buf += 256;
++        len -= 256;
++    }
++
++    /*
++     * Fold into 512-bits.
++     */
++    x0 = _mm512_load_si512((__m512i *)k3k4);
++
++    x5 = _mm512_clmulepi64_epi128(x1, x0, 0x00);
++    x1 = _mm512_clmulepi64_epi128(x1, x0, 0x11);
++    x1 = _mm512_xor_si512(x1, x2);
++    x1 = _mm512_xor_si512(x1, x5);
++
++    x5 = _mm512_clmulepi64_epi128(x1, x0, 0x00);
++    x1 = _mm512_clmulepi64_epi128(x1, x0, 0x11);
++    x1 = _mm512_xor_si512(x1, x3);
++    x1 = _mm512_xor_si512(x1, x5);
++
++    x5 = _mm512_clmulepi64_epi128(x1, x0, 0x00);
++    x1 = _mm512_clmulepi64_epi128(x1, x0, 0x11);
++    x1 = _mm512_xor_si512(x1, x4);
++    x1 = _mm512_xor_si512(x1, x5);
++
++    /*
++     * Single fold blocks of 64, if any.
++     */
++    while (len >= 64)
++    {
++        x2 = _mm512_loadu_si512((__m512i *)buf);
++
++        x5 = _mm512_clmulepi64_epi128(x1, x0, 0x00);
++        x1 = _mm512_clmulepi64_epi128(x1, x0, 0x11);
++        x1 = _mm512_xor_si512(x1, x2);
++        x1 = _mm512_xor_si512(x1, x5);
++
++        buf += 64;
++        len -= 64;
++    }
++
++    /*
++     * Fold 512-bits to 384-bits.
++     */
++    a0 = _mm_load_si128((__m128i *)k5k6);
++
++    a1 = _mm512_extracti32x4_epi32(x1, 0);
++    a2 = _mm512_extracti32x4_epi32(x1, 1);
++
++    a3 = _mm_clmulepi64_si128(a1, a0, 0x00);
++    a1 = _mm_clmulepi64_si128(a1, a0, 0x11);
++
++    a1 = _mm_xor_si128(a1, a3);
++    a1 = _mm_xor_si128(a1, a2);
++
++    /*
++     * Fold 384-bits to 256-bits.
++     */
++    a2 = _mm512_extracti32x4_epi32(x1, 2);
++    a3 = _mm_clmulepi64_si128(a1, a0, 0x00);
++    a1 = _mm_clmulepi64_si128(a1, a0, 0x11);
++    a1 = _mm_xor_si128(a1, a3);
++    a1 = _mm_xor_si128(a1, a2);
++
++    /*
++     * Fold 256-bits to 128-bits.
++     */
++    a2 = _mm512_extracti32x4_epi32(x1, 3);
++    a3 = _mm_clmulepi64_si128(a1, a0, 0x00);
++    a1 = _mm_clmulepi64_si128(a1, a0, 0x11);
++    a1 = _mm_xor_si128(a1, a3);
++    a1 = _mm_xor_si128(a1, a2);
++
++    /*
++     * Fold 128-bits to 64-bits.
++     */
++    a2 = _mm_clmulepi64_si128(a1, a0, 0x10);
++    a3 = _mm_setr_epi32(~0, 0, ~0, 0);
++    a1 = _mm_srli_si128(a1, 8);
++    a1 = _mm_xor_si128(a1, a2);
++
++    a0 = _mm_loadl_epi64((__m128i*)k7k8);
++    a2 = _mm_srli_si128(a1, 4);
++    a1 = _mm_and_si128(a1, a3);
++    a1 = _mm_clmulepi64_si128(a1, a0, 0x00);
++    a1 = _mm_xor_si128(a1, a2);
++
++    /*
++     * Barret reduce to 32-bits.
++     */
++    a0 = _mm_load_si128((__m128i*)poly);
++
++    a2 = _mm_and_si128(a1, a3);
++    a2 = _mm_clmulepi64_si128(a2, a0, 0x10);
++    a2 = _mm_and_si128(a2, a3);
++    a2 = _mm_clmulepi64_si128(a2, a0, 0x00);
++    a1 = _mm_xor_si128(a1, a2);
++
++    /*
++     * Return the crc32.
++     */
++    return _mm_extract_epi32(a1, 1);
++}
++
++#elif defined(CRC32_SIMD_SSE42_PCLMUL)
++
++/*
++ * crc32_sse42_simd_(): compute the crc32 of the buffer, where the buffer
++ * length must be at least 64, and a multiple of 16.
++ */
++
+ #include <emmintrin.h>
+ #include <smmintrin.h>
+ #include <wmmintrin.h>
+diff --git a/crc32_simd.h b/crc32_simd.h
+index c0346dc..8462464 100644
+--- a/crc32_simd.h
++++ b/crc32_simd.h
+@@ -19,12 +19,18 @@ uint32_t ZLIB_INTERNAL crc32_sse42_simd_(const unsigned char* buf,
+                                          z_size_t len,
+                                          uint32_t crc);
+ 
++uint32_t ZLIB_INTERNAL crc32_avx512_simd_(const unsigned char* buf,
++                                          z_size_t len,
++                                          uint32_t crc);
++
+ /*
+  * crc32_sse42_simd_ buffer size constraints: see the use in zlib/crc32.c
+  * for computing the crc32 of an arbitrary length buffer.
+  */
+ #define Z_CRC32_SSE42_MINIMUM_LENGTH 64
+ #define Z_CRC32_SSE42_CHUNKSIZE_MASK 15
++#define Z_CRC32_AVX512_MINIMUM_LENGTH 256
++#define Z_CRC32_AVX512_CHUNKSIZE_MASK 63
+ 
+ /*
+  * CRC32 checksums using ARMv8-a crypto instructions.
+-- 
+2.34.1
+
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/0012-lfs-open64.patch b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/0012-lfs-open64.patch
new file mode 100644
index 000000000..70e7b687a
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/0012-lfs-open64.patch
@@ -0,0 +1,40 @@
+From 6f21cb4b209d750486ede5472fdf7e35cf5ac3aa Mon Sep 17 00:00:00 2001
+From: Ramin Halavati <rhalavati@chromium.org>
+Date: Wed, 17 May 2023 15:21:43 +0200
+Subject: [PATCH] Add open64 for Large File System support to gzlib.
+
+---
+ third_party/zlib/gzlib.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/third_party/zlib/gzlib.c b/third_party/zlib/gzlib.c
+index 55da46a453fd1..bbdb797e8079d 100644
+--- a/third_party/zlib/gzlib.c
++++ b/third_party/zlib/gzlib.c
+@@ -7,11 +7,14 @@
+ 
+ #if defined(_WIN32) && !defined(__BORLANDC__)
+ #  define LSEEK _lseeki64
++#  define OPEN  open
+ #else
+ #if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
+ #  define LSEEK lseek64
++#  define OPEN  open64
+ #else
+ #  define LSEEK lseek
++#  define OPEN  open
+ #endif
+ #endif
+ 
+@@ -244,7 +247,7 @@ local gzFile gz_open(path, fd, mode)
+ #ifdef WIDECHAR
+         fd == -2 ? _wopen(path, oflag, 0666) :
+ #endif
+-        open((const char *)path, oflag, 0666));
++        OPEN((const char *)path, oflag, 0666));
+     if (state->fd == -1) {
+         free(state->path);
+         free(state);
+-- 
+2.40.1.606.ga4b1b128d6-goog
+
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/0013-cpu-feature-detection-for-arm.patch b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/0013-cpu-feature-detection-for-arm.patch
new file mode 100644
index 000000000..0547851fe
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/0013-cpu-feature-detection-for-arm.patch
@@ -0,0 +1,30 @@
+From c43ba7a55f091c0dcbfd8d89f7a5121269ce1b81 Mon Sep 17 00:00:00 2001
+From: Ho Cheung <uioptt24@gmail.com>
+Date: Thu, 27 Jul 2023 09:47:52 +0800
+Subject: [PATCH] [zlib] Perform CPU feature detection for ARM inside adler32()
+
+Perform CPU feature detection for ARM within adler32() to have the same
+behavior as x86.
+
+---
+ third_party/zlib/adler32.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/third_party/zlib/adler32.c b/third_party/zlib/adler32.c
+index 81c584f68e233..99a294496f7eb 100644
+--- a/third_party/zlib/adler32.c
++++ b/third_party/zlib/adler32.c
+@@ -90,9 +90,9 @@ uLong ZEXPORT adler32_z(uLong adler, const Bytef *buf, z_size_t len) {
+         return adler | (sum2 << 16);
+     }
+
+-#if defined(ADLER32_SIMD_SSSE3)
++#if defined(ADLER32_SIMD_SSSE3) || defined(ADLER32_SIMD_NEON)
+     /*
+-     * Use SSSE3 to compute the adler32. Since this routine can be
++     * Use SIMD to compute the adler32. Since this function can be
+      * freely used, check CPU features here. zlib convention is to
+      * call adler32(0, NULL, 0), before making calls to adler32().
+      * So this is a good early (and infrequent) place to cache CPU
+--
+2.41.0.windows.3
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/README b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/README
new file mode 100644
index 000000000..b21d309ff
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/patches/README
@@ -0,0 +1,43 @@
+== Patches applied on top of zlib ==
+
+ - 0000-build.patch: changes from the upstream version, mostly related to the
+   build.
+ - 0001-simd.patch: integrate Intel SIMD optimizations from
+   https://github.com/jtkukunas/zlib/
+ - 0002-uninitializedcheck.patch: prevent uninitialized use of state->check
+
+== Procedure to create a patch file ==
+
+  Assuming you are working in a new feature branch:
+ - git format-patch master --stdout > foo.patch # where naming follows a growing
+                                                # number plus patch description.
+ - git add foo.patch
+ - git commit -a -m "Local patch."
+ - git rebase -i HEAD~2 # Squashing the second commit
+
+  As patches created in this way will feature a ChangeLog, there is no longer
+the need to append this file with a description of what the patch does. This
+should help to solve frequent conflicts in pending new patches on
+Chromium's zlib.
+
+  The plan for the near future is to better insulate the platform specific
+changes to ease update adoption with new releases of zlib. This insulation
+happens by making changes inside contrib/ rather than the root directory
+(where conflicts can happen).
+
+  If a change modifies enough things inside the root directory that the
+intention is not immediately clear, generate a .patch file to go with your
+change. If the change's modifications in the root directory are small, like:
+
+#ifdef FEATURE_FLAG
+use_special_feature();
+#elif
+use_default_behavior();
+#endif
+
+  then the intent is clear and a .patch file doesn't need to be generated (since
+it would not provide much value).
+
+  Ideally local changes should have a merge request featured in either:
+ - canonical zlib: https://github.com/madler/zlib/
+ - zlib-ng: https://github.com/Dead2/zlib-ng
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/simd.patch b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/simd.patch
deleted file mode 100644
index 75828d26e..000000000
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/simd.patch
+++ /dev/null
@@ -1,1233 +0,0 @@
-diff --git a/crc32.c b/crc32.c
-index 9580440c0e6b..9162429cc7b4 100644
---- a/crc32.c
-+++ b/crc32.c
-@@ -28,6 +28,8 @@
- #  endif /* !DYNAMIC_CRC_TABLE */
- #endif /* MAKECRCH */
- 
-+#include "deflate.h"
-+#include "x86.h"
- #include "zutil.h"      /* for STDC and FAR definitions */
- 
- /* Definitions for doing the crc four data bytes at a time. */
-@@ -440,3 +442,28 @@ uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
- {
-     return crc32_combine_(crc1, crc2, len2);
- }
-+
-+ZLIB_INTERNAL void crc_reset(deflate_state *const s)
-+{
-+    if (x86_cpu_enable_simd) {
-+        crc_fold_init(s);
-+        return;
-+    }
-+    s->strm->adler = crc32(0L, Z_NULL, 0);
-+}
-+
-+ZLIB_INTERNAL void crc_finalize(deflate_state *const s)
-+{
-+    if (x86_cpu_enable_simd)
-+        s->strm->adler = crc_fold_512to32(s);
-+}
-+
-+ZLIB_INTERNAL void copy_with_crc(z_streamp strm, Bytef *dst, long size)
-+{
-+    if (x86_cpu_enable_simd) {
-+        crc_fold_copy(strm->state, dst, strm->next_in, size);
-+        return;
-+    }
-+    zmemcpy(dst, strm->next_in, size);
-+    strm->adler = crc32(strm->adler, dst, size);
-+}
-diff --git a/crc_folding.c b/crc_folding.c
-new file mode 100644
-index 000000000000..48d77744aaf4
---- /dev/null
-+++ b/crc_folding.c
-@@ -0,0 +1,493 @@
-+/*
-+ * Compute the CRC32 using a parallelized folding approach with the PCLMULQDQ
-+ * instruction.
-+ *
-+ * A white paper describing this algorithm can be found at:
-+ * http://www.intel.com/content/dam/www/public/us/en/documents/white-papers/fast-crc-computation-generic-polynomials-pclmulqdq-paper.pdf
-+ *
-+ * Copyright (C) 2013 Intel Corporation. All rights reserved.
-+ * Authors:
-+ * 	Wajdi Feghali   <wajdi.k.feghali@intel.com>
-+ * 	Jim Guilford    <james.guilford@intel.com>
-+ * 	Vinodh Gopal    <vinodh.gopal@intel.com>
-+ * 	Erdinc Ozturk   <erdinc.ozturk@intel.com>
-+ * 	Jim Kukunas     <james.t.kukunas@linux.intel.com>
-+ *
-+ * For conditions of distribution and use, see copyright notice in zlib.h
-+ */
-+
-+#include "deflate.h"
-+
-+#include <inttypes.h>
-+#include <emmintrin.h>
-+#include <immintrin.h>
-+#include <wmmintrin.h>
-+
-+#define CRC_LOAD(s) \
-+    do { \
-+        __m128i xmm_crc0 = _mm_loadu_si128((__m128i *)s->crc0 + 0);\
-+        __m128i xmm_crc1 = _mm_loadu_si128((__m128i *)s->crc0 + 1);\
-+        __m128i xmm_crc2 = _mm_loadu_si128((__m128i *)s->crc0 + 2);\
-+        __m128i xmm_crc3 = _mm_loadu_si128((__m128i *)s->crc0 + 3);\
-+        __m128i xmm_crc_part = _mm_loadu_si128((__m128i *)s->crc0 + 4);
-+
-+#define CRC_SAVE(s) \
-+        _mm_storeu_si128((__m128i *)s->crc0 + 0, xmm_crc0);\
-+        _mm_storeu_si128((__m128i *)s->crc0 + 1, xmm_crc1);\
-+        _mm_storeu_si128((__m128i *)s->crc0 + 2, xmm_crc2);\
-+        _mm_storeu_si128((__m128i *)s->crc0 + 3, xmm_crc3);\
-+        _mm_storeu_si128((__m128i *)s->crc0 + 4, xmm_crc_part);\
-+    } while (0);
-+
-+ZLIB_INTERNAL void crc_fold_init(deflate_state *const s)
-+{
-+    CRC_LOAD(s)
-+
-+    xmm_crc0 = _mm_cvtsi32_si128(0x9db42487);
-+    xmm_crc1 = _mm_setzero_si128();
-+    xmm_crc2 = _mm_setzero_si128();
-+    xmm_crc3 = _mm_setzero_si128();
-+
-+    CRC_SAVE(s)
-+
-+    s->strm->adler = 0;
-+}
-+
-+local void fold_1(deflate_state *const s,
-+        __m128i *xmm_crc0, __m128i *xmm_crc1,
-+        __m128i *xmm_crc2, __m128i *xmm_crc3)
-+{
-+    const __m128i xmm_fold4 = _mm_set_epi32(
-+            0x00000001, 0x54442bd4,
-+            0x00000001, 0xc6e41596);
-+
-+    __m128i x_tmp3;
-+    __m128 ps_crc0, ps_crc3, ps_res;
-+
-+    x_tmp3 = *xmm_crc3;
-+
-+    *xmm_crc3 = *xmm_crc0;
-+    *xmm_crc0 = _mm_clmulepi64_si128(*xmm_crc0, xmm_fold4, 0x01);
-+    *xmm_crc3 = _mm_clmulepi64_si128(*xmm_crc3, xmm_fold4, 0x10);
-+    ps_crc0 = _mm_castsi128_ps(*xmm_crc0);
-+    ps_crc3 = _mm_castsi128_ps(*xmm_crc3);
-+    ps_res = _mm_xor_ps(ps_crc0, ps_crc3);
-+
-+    *xmm_crc0 = *xmm_crc1;
-+    *xmm_crc1 = *xmm_crc2;
-+    *xmm_crc2 = x_tmp3;
-+    *xmm_crc3 = _mm_castps_si128(ps_res);
-+}
-+
-+local void fold_2(deflate_state *const s,
-+        __m128i *xmm_crc0, __m128i *xmm_crc1,
-+        __m128i *xmm_crc2, __m128i *xmm_crc3)
-+{
-+    const __m128i xmm_fold4 = _mm_set_epi32(
-+            0x00000001, 0x54442bd4,
-+            0x00000001, 0xc6e41596);
-+
-+    __m128i x_tmp3, x_tmp2;
-+    __m128 ps_crc0, ps_crc1, ps_crc2, ps_crc3, ps_res31, ps_res20;
-+
-+    x_tmp3 = *xmm_crc3;
-+    x_tmp2 = *xmm_crc2;
-+
-+    *xmm_crc3 = *xmm_crc1;
-+    *xmm_crc1 = _mm_clmulepi64_si128(*xmm_crc1, xmm_fold4, 0x01);
-+    *xmm_crc3 = _mm_clmulepi64_si128(*xmm_crc3, xmm_fold4, 0x10);
-+    ps_crc3 = _mm_castsi128_ps(*xmm_crc3);
-+    ps_crc1 = _mm_castsi128_ps(*xmm_crc1);
-+    ps_res31= _mm_xor_ps(ps_crc3, ps_crc1);
-+
-+    *xmm_crc2 = *xmm_crc0;
-+    *xmm_crc0 = _mm_clmulepi64_si128(*xmm_crc0, xmm_fold4, 0x01);
-+    *xmm_crc2 = _mm_clmulepi64_si128(*xmm_crc2, xmm_fold4, 0x10);
-+    ps_crc0 = _mm_castsi128_ps(*xmm_crc0);
-+    ps_crc2 = _mm_castsi128_ps(*xmm_crc2);
-+    ps_res20= _mm_xor_ps(ps_crc0, ps_crc2);
-+
-+    *xmm_crc0 = x_tmp2;
-+    *xmm_crc1 = x_tmp3;
-+    *xmm_crc2 = _mm_castps_si128(ps_res20);
-+    *xmm_crc3 = _mm_castps_si128(ps_res31);
-+}
-+
-+local void fold_3(deflate_state *const s,
-+        __m128i *xmm_crc0, __m128i *xmm_crc1,
-+        __m128i *xmm_crc2, __m128i *xmm_crc3)
-+{
-+    const __m128i xmm_fold4 = _mm_set_epi32(
-+            0x00000001, 0x54442bd4,
-+            0x00000001, 0xc6e41596);
-+
-+    __m128i x_tmp3;
-+    __m128 ps_crc0, ps_crc1, ps_crc2, ps_crc3, ps_res32, ps_res21, ps_res10;
-+
-+    x_tmp3 = *xmm_crc3;
-+
-+    *xmm_crc3 = *xmm_crc2;
-+    *xmm_crc2 = _mm_clmulepi64_si128(*xmm_crc2, xmm_fold4, 0x01);
-+    *xmm_crc3 = _mm_clmulepi64_si128(*xmm_crc3, xmm_fold4, 0x10);
-+    ps_crc2 = _mm_castsi128_ps(*xmm_crc2);
-+    ps_crc3 = _mm_castsi128_ps(*xmm_crc3);
-+    ps_res32 = _mm_xor_ps(ps_crc2, ps_crc3);
-+
-+    *xmm_crc2 = *xmm_crc1;
-+    *xmm_crc1 = _mm_clmulepi64_si128(*xmm_crc1, xmm_fold4, 0x01);
-+    *xmm_crc2 = _mm_clmulepi64_si128(*xmm_crc2, xmm_fold4, 0x10);
-+    ps_crc1 = _mm_castsi128_ps(*xmm_crc1);
-+    ps_crc2 = _mm_castsi128_ps(*xmm_crc2);
-+    ps_res21= _mm_xor_ps(ps_crc1, ps_crc2);
-+
-+    *xmm_crc1 = *xmm_crc0;
-+    *xmm_crc0 = _mm_clmulepi64_si128(*xmm_crc0, xmm_fold4, 0x01);
-+    *xmm_crc1 = _mm_clmulepi64_si128(*xmm_crc1, xmm_fold4, 0x10);
-+    ps_crc0 = _mm_castsi128_ps(*xmm_crc0);
-+    ps_crc1 = _mm_castsi128_ps(*xmm_crc1);
-+    ps_res10= _mm_xor_ps(ps_crc0, ps_crc1);
-+
-+    *xmm_crc0 = x_tmp3;
-+    *xmm_crc1 = _mm_castps_si128(ps_res10);
-+    *xmm_crc2 = _mm_castps_si128(ps_res21);
-+    *xmm_crc3 = _mm_castps_si128(ps_res32);
-+}
-+
-+local void fold_4(deflate_state *const s,
-+        __m128i *xmm_crc0, __m128i *xmm_crc1,
-+        __m128i *xmm_crc2, __m128i *xmm_crc3)
-+{
-+    const __m128i xmm_fold4 = _mm_set_epi32(
-+            0x00000001, 0x54442bd4,
-+            0x00000001, 0xc6e41596);
-+
-+    __m128i x_tmp0, x_tmp1, x_tmp2, x_tmp3;
-+    __m128 ps_crc0, ps_crc1, ps_crc2, ps_crc3;
-+    __m128 ps_t0, ps_t1, ps_t2, ps_t3;
-+    __m128 ps_res0, ps_res1, ps_res2, ps_res3;
-+
-+    x_tmp0 = *xmm_crc0;
-+    x_tmp1 = *xmm_crc1;
-+    x_tmp2 = *xmm_crc2;
-+    x_tmp3 = *xmm_crc3;
-+
-+    *xmm_crc0 = _mm_clmulepi64_si128(*xmm_crc0, xmm_fold4, 0x01);
-+    x_tmp0 = _mm_clmulepi64_si128(x_tmp0, xmm_fold4, 0x10);
-+    ps_crc0 = _mm_castsi128_ps(*xmm_crc0);
-+    ps_t0 = _mm_castsi128_ps(x_tmp0);
-+    ps_res0 = _mm_xor_ps(ps_crc0, ps_t0);
-+
-+    *xmm_crc1 = _mm_clmulepi64_si128(*xmm_crc1, xmm_fold4, 0x01);
-+    x_tmp1 = _mm_clmulepi64_si128(x_tmp1, xmm_fold4, 0x10);
-+    ps_crc1 = _mm_castsi128_ps(*xmm_crc1);
-+    ps_t1 = _mm_castsi128_ps(x_tmp1);
-+    ps_res1 = _mm_xor_ps(ps_crc1, ps_t1);
-+
-+    *xmm_crc2 = _mm_clmulepi64_si128(*xmm_crc2, xmm_fold4, 0x01);
-+    x_tmp2 = _mm_clmulepi64_si128(x_tmp2, xmm_fold4, 0x10);
-+    ps_crc2 = _mm_castsi128_ps(*xmm_crc2);
-+    ps_t2 = _mm_castsi128_ps(x_tmp2);
-+    ps_res2 = _mm_xor_ps(ps_crc2, ps_t2);
-+
-+    *xmm_crc3 = _mm_clmulepi64_si128(*xmm_crc3, xmm_fold4, 0x01);
-+    x_tmp3 = _mm_clmulepi64_si128(x_tmp3, xmm_fold4, 0x10);
-+    ps_crc3 = _mm_castsi128_ps(*xmm_crc3);
-+    ps_t3 = _mm_castsi128_ps(x_tmp3);
-+    ps_res3 = _mm_xor_ps(ps_crc3, ps_t3);
-+
-+    *xmm_crc0 = _mm_castps_si128(ps_res0);
-+    *xmm_crc1 = _mm_castps_si128(ps_res1);
-+    *xmm_crc2 = _mm_castps_si128(ps_res2);
-+    *xmm_crc3 = _mm_castps_si128(ps_res3);
-+}
-+
-+local const unsigned zalign(32) pshufb_shf_table[60] = {
-+	0x84838281,0x88878685,0x8c8b8a89,0x008f8e8d, /* shl 15 (16 - 1)/shr1 */
-+	0x85848382,0x89888786,0x8d8c8b8a,0x01008f8e, /* shl 14 (16 - 3)/shr2 */
-+	0x86858483,0x8a898887,0x8e8d8c8b,0x0201008f, /* shl 13 (16 - 4)/shr3 */
-+	0x87868584,0x8b8a8988,0x8f8e8d8c,0x03020100, /* shl 12 (16 - 4)/shr4 */
-+	0x88878685,0x8c8b8a89,0x008f8e8d,0x04030201, /* shl 11 (16 - 5)/shr5 */
-+	0x89888786,0x8d8c8b8a,0x01008f8e,0x05040302, /* shl 10 (16 - 6)/shr6 */
-+	0x8a898887,0x8e8d8c8b,0x0201008f,0x06050403, /* shl  9 (16 - 7)/shr7 */
-+	0x8b8a8988,0x8f8e8d8c,0x03020100,0x07060504, /* shl  8 (16 - 8)/shr8 */
-+	0x8c8b8a89,0x008f8e8d,0x04030201,0x08070605, /* shl  7 (16 - 9)/shr9 */
-+	0x8d8c8b8a,0x01008f8e,0x05040302,0x09080706, /* shl  6 (16 -10)/shr10*/
-+	0x8e8d8c8b,0x0201008f,0x06050403,0x0a090807, /* shl  5 (16 -11)/shr11*/
-+	0x8f8e8d8c,0x03020100,0x07060504,0x0b0a0908, /* shl  4 (16 -12)/shr12*/
-+	0x008f8e8d,0x04030201,0x08070605,0x0c0b0a09, /* shl  3 (16 -13)/shr13*/
-+	0x01008f8e,0x05040302,0x09080706,0x0d0c0b0a, /* shl  2 (16 -14)/shr14*/
-+	0x0201008f,0x06050403,0x0a090807,0x0e0d0c0b  /* shl  1 (16 -15)/shr15*/
-+};
-+
-+local void partial_fold(deflate_state *const s, const size_t len,
-+        __m128i *xmm_crc0, __m128i *xmm_crc1,
-+        __m128i *xmm_crc2, __m128i *xmm_crc3,
-+        __m128i *xmm_crc_part)
-+{
-+
-+    const __m128i xmm_fold4 = _mm_set_epi32(
-+            0x00000001, 0x54442bd4,
-+            0x00000001, 0xc6e41596);
-+    const __m128i xmm_mask3 = _mm_set1_epi32(0x80808080);
-+
-+    __m128i xmm_shl, xmm_shr, xmm_tmp1, xmm_tmp2, xmm_tmp3;
-+    __m128i xmm_a0_0, xmm_a0_1;
-+    __m128 ps_crc3, psa0_0, psa0_1, ps_res;
-+
-+    xmm_shl = _mm_load_si128((__m128i *)pshufb_shf_table + (len - 1));
-+    xmm_shr = xmm_shl;
-+    xmm_shr = _mm_xor_si128(xmm_shr, xmm_mask3);
-+
-+    xmm_a0_0 = _mm_shuffle_epi8(*xmm_crc0, xmm_shl);
-+
-+    *xmm_crc0 = _mm_shuffle_epi8(*xmm_crc0, xmm_shr);
-+    xmm_tmp1 = _mm_shuffle_epi8(*xmm_crc1, xmm_shl);
-+    *xmm_crc0 = _mm_or_si128(*xmm_crc0, xmm_tmp1);
-+
-+    *xmm_crc1 = _mm_shuffle_epi8(*xmm_crc1, xmm_shr);
-+    xmm_tmp2 = _mm_shuffle_epi8(*xmm_crc2, xmm_shl);
-+    *xmm_crc1 = _mm_or_si128(*xmm_crc1, xmm_tmp2);
-+
-+    *xmm_crc2 = _mm_shuffle_epi8(*xmm_crc2, xmm_shr);
-+    xmm_tmp3 = _mm_shuffle_epi8(*xmm_crc3, xmm_shl);
-+    *xmm_crc2 = _mm_or_si128(*xmm_crc2, xmm_tmp3);
-+
-+    *xmm_crc3 = _mm_shuffle_epi8(*xmm_crc3, xmm_shr);
-+    *xmm_crc_part = _mm_shuffle_epi8(*xmm_crc_part, xmm_shl);
-+    *xmm_crc3 = _mm_or_si128(*xmm_crc3, *xmm_crc_part);
-+
-+    xmm_a0_1 = _mm_clmulepi64_si128(xmm_a0_0, xmm_fold4, 0x10);
-+    xmm_a0_0 = _mm_clmulepi64_si128(xmm_a0_0, xmm_fold4, 0x01);
-+
-+    ps_crc3 = _mm_castsi128_ps(*xmm_crc3);
-+    psa0_0 = _mm_castsi128_ps(xmm_a0_0);
-+    psa0_1 = _mm_castsi128_ps(xmm_a0_1);
-+
-+    ps_res = _mm_xor_ps(ps_crc3, psa0_0);
-+    ps_res = _mm_xor_ps(ps_res, psa0_1);
-+
-+    *xmm_crc3 = _mm_castps_si128(ps_res);
-+}
-+
-+ZLIB_INTERNAL void crc_fold_copy(deflate_state *const s,
-+        unsigned char *dst, const unsigned char *src, long len)
-+{
-+    unsigned long algn_diff;
-+    __m128i xmm_t0, xmm_t1, xmm_t2, xmm_t3;
-+
-+    CRC_LOAD(s)
-+
-+    if (len < 16) {
-+        if (len == 0)
-+            return;
-+        goto partial;
-+    }
-+
-+    algn_diff = 0 - (uintptr_t)src & 0xF;
-+    if (algn_diff) {
-+        xmm_crc_part = _mm_loadu_si128((__m128i *)src);
-+        _mm_storeu_si128((__m128i *)dst, xmm_crc_part);
-+
-+        dst += algn_diff;
-+        src += algn_diff;
-+        len -= algn_diff;
-+
-+        partial_fold(s, algn_diff, &xmm_crc0, &xmm_crc1, &xmm_crc2, &xmm_crc3,
-+            &xmm_crc_part);
-+    }
-+
-+    while ((len -= 64) >= 0) {
-+        xmm_t0 = _mm_load_si128((__m128i *)src);
-+        xmm_t1 = _mm_load_si128((__m128i *)src + 1);
-+        xmm_t2 = _mm_load_si128((__m128i *)src + 2);
-+        xmm_t3 = _mm_load_si128((__m128i *)src + 3);
-+
-+        fold_4(s, &xmm_crc0, &xmm_crc1, &xmm_crc2, &xmm_crc3);
-+
-+        _mm_storeu_si128((__m128i *)dst, xmm_t0);
-+        _mm_storeu_si128((__m128i *)dst + 1, xmm_t1);
-+        _mm_storeu_si128((__m128i *)dst + 2, xmm_t2);
-+        _mm_storeu_si128((__m128i *)dst + 3, xmm_t3);
-+
-+        xmm_crc0 = _mm_xor_si128(xmm_crc0, xmm_t0);
-+        xmm_crc1 = _mm_xor_si128(xmm_crc1, xmm_t1);
-+        xmm_crc2 = _mm_xor_si128(xmm_crc2, xmm_t2);
-+        xmm_crc3 = _mm_xor_si128(xmm_crc3, xmm_t3);
-+
-+        src += 64;
-+        dst += 64;
-+    }
-+
-+    /*
-+     * len = num bytes left - 64
-+     */
-+    if (len + 16 >= 0) {
-+        len += 16;
-+
-+        xmm_t0 = _mm_load_si128((__m128i *)src);
-+        xmm_t1 = _mm_load_si128((__m128i *)src + 1);
-+        xmm_t2 = _mm_load_si128((__m128i *)src + 2);
-+
-+        fold_3(s, &xmm_crc0, &xmm_crc1, &xmm_crc2, &xmm_crc3);
-+
-+        _mm_storeu_si128((__m128i *)dst, xmm_t0);
-+        _mm_storeu_si128((__m128i *)dst + 1, xmm_t1);
-+        _mm_storeu_si128((__m128i *)dst + 2, xmm_t2);
-+
-+        xmm_crc1 = _mm_xor_si128(xmm_crc1, xmm_t0);
-+        xmm_crc2 = _mm_xor_si128(xmm_crc2, xmm_t1);
-+        xmm_crc3 = _mm_xor_si128(xmm_crc3, xmm_t2);
-+
-+        if (len == 0)
-+            goto done;
-+
-+        dst += 48;
-+        src += 48;
-+    } else if (len + 32 >= 0) {
-+        len += 32;
-+
-+        xmm_t0 = _mm_load_si128((__m128i *)src);
-+        xmm_t1 = _mm_load_si128((__m128i *)src + 1);
-+
-+        fold_2(s, &xmm_crc0, &xmm_crc1, &xmm_crc2, &xmm_crc3);
-+
-+        _mm_storeu_si128((__m128i *)dst, xmm_t0);
-+        _mm_storeu_si128((__m128i *)dst + 1, xmm_t1);
-+
-+        xmm_crc2 = _mm_xor_si128(xmm_crc2, xmm_t0);
-+        xmm_crc3 = _mm_xor_si128(xmm_crc3, xmm_t1);
-+
-+        if (len == 0)
-+            goto done;
-+
-+        dst += 32;
-+        src += 32;
-+    } else if (len + 48 >= 0) {
-+        len += 48;
-+
-+        xmm_t0 = _mm_load_si128((__m128i *)src);
-+
-+        fold_1(s, &xmm_crc0, &xmm_crc1, &xmm_crc2, &xmm_crc3);
-+
-+        _mm_storeu_si128((__m128i *)dst, xmm_t0);
-+
-+        xmm_crc3 = _mm_xor_si128(xmm_crc3, xmm_t0);
-+
-+        if (len == 0)
-+            goto done;
-+
-+        dst += 16;
-+        src += 16;
-+    } else {
-+        len += 64;
-+        if (len == 0)
-+            goto done;
-+    }
-+
-+partial:
-+
-+#if defined(_MSC_VER)
-+    /* VS does not permit the use of _mm_set_epi64x in 32-bit builds */
-+    {
-+        int32_t parts[4] = {0, 0, 0, 0};
-+        memcpy(&parts, src, len);
-+        xmm_crc_part = _mm_set_epi32(parts[3], parts[2], parts[1], parts[0]);
-+    }
-+#else
-+    {
-+        int64_t parts[2] = {0, 0};
-+        memcpy(&parts, src, len);
-+        xmm_crc_part = _mm_set_epi64x(parts[1], parts[0]);
-+    }
-+#endif
-+
-+    _mm_storeu_si128((__m128i *)dst, xmm_crc_part);
-+    partial_fold(s, len, &xmm_crc0, &xmm_crc1, &xmm_crc2, &xmm_crc3,
-+        &xmm_crc_part);
-+done:
-+    CRC_SAVE(s)
-+}
-+
-+local const unsigned zalign(16) crc_k[] = {
-+    0xccaa009e, 0x00000000, /* rk1 */
-+    0x751997d0, 0x00000001, /* rk2 */
-+    0xccaa009e, 0x00000000, /* rk5 */
-+    0x63cd6124, 0x00000001, /* rk6 */
-+    0xf7011640, 0x00000001, /* rk7 */
-+    0xdb710640, 0x00000001  /* rk8 */
-+};
-+
-+local const unsigned zalign(16) crc_mask[4] = {
-+    0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00000000
-+};
-+
-+local const unsigned zalign(16) crc_mask2[4] = {
-+    0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF
-+};
-+
-+unsigned ZLIB_INTERNAL crc_fold_512to32(deflate_state *const s)
-+{
-+    const __m128i xmm_mask  = _mm_load_si128((__m128i *)crc_mask);
-+    const __m128i xmm_mask2 = _mm_load_si128((__m128i *)crc_mask2);
-+
-+    unsigned crc;
-+    __m128i x_tmp0, x_tmp1, x_tmp2, crc_fold;
-+
-+    CRC_LOAD(s)
-+
-+    /*
-+     * k1
-+     */
-+    crc_fold = _mm_load_si128((__m128i *)crc_k);
-+
-+    x_tmp0 = _mm_clmulepi64_si128(xmm_crc0, crc_fold, 0x10);
-+    xmm_crc0 = _mm_clmulepi64_si128(xmm_crc0, crc_fold, 0x01);
-+    xmm_crc1 = _mm_xor_si128(xmm_crc1, x_tmp0);
-+    xmm_crc1 = _mm_xor_si128(xmm_crc1, xmm_crc0);
-+
-+    x_tmp1 = _mm_clmulepi64_si128(xmm_crc1, crc_fold, 0x10);
-+    xmm_crc1 = _mm_clmulepi64_si128(xmm_crc1, crc_fold, 0x01);
-+    xmm_crc2 = _mm_xor_si128(xmm_crc2, x_tmp1);
-+    xmm_crc2 = _mm_xor_si128(xmm_crc2, xmm_crc1);
-+
-+    x_tmp2 = _mm_clmulepi64_si128(xmm_crc2, crc_fold, 0x10);
-+    xmm_crc2 = _mm_clmulepi64_si128(xmm_crc2, crc_fold, 0x01);
-+    xmm_crc3 = _mm_xor_si128(xmm_crc3, x_tmp2);
-+    xmm_crc3 = _mm_xor_si128(xmm_crc3, xmm_crc2);
-+
-+    /*
-+     * k5
-+     */
-+    crc_fold = _mm_load_si128((__m128i *)crc_k + 1);
-+
-+    xmm_crc0 = xmm_crc3;
-+    xmm_crc3 = _mm_clmulepi64_si128(xmm_crc3, crc_fold, 0);
-+    xmm_crc0 = _mm_srli_si128(xmm_crc0, 8);
-+    xmm_crc3 = _mm_xor_si128(xmm_crc3, xmm_crc0);
-+
-+    xmm_crc0 = xmm_crc3;
-+    xmm_crc3 = _mm_slli_si128(xmm_crc3, 4);
-+    xmm_crc3 = _mm_clmulepi64_si128(xmm_crc3, crc_fold, 0x10);
-+    xmm_crc3 = _mm_xor_si128(xmm_crc3, xmm_crc0);
-+    xmm_crc3 = _mm_and_si128(xmm_crc3, xmm_mask2);
-+
-+    /*
-+     * k7
-+     */
-+    xmm_crc1 = xmm_crc3;
-+    xmm_crc2 = xmm_crc3;
-+    crc_fold = _mm_load_si128((__m128i *)crc_k + 2);
-+
-+    xmm_crc3 = _mm_clmulepi64_si128(xmm_crc3, crc_fold, 0);
-+    xmm_crc3 = _mm_xor_si128(xmm_crc3, xmm_crc2);
-+    xmm_crc3 = _mm_and_si128(xmm_crc3, xmm_mask);
-+
-+    xmm_crc2 = xmm_crc3;
-+    xmm_crc3 = _mm_clmulepi64_si128(xmm_crc3, crc_fold, 0x10);
-+    xmm_crc3 = _mm_xor_si128(xmm_crc3, xmm_crc2);
-+    xmm_crc3 = _mm_xor_si128(xmm_crc3, xmm_crc1);
-+
-+    crc = _mm_extract_epi32(xmm_crc3, 2);
-+    return ~crc;
-+    CRC_SAVE(s)
-+}
-diff --git a/deflate.c b/deflate.c
-index 1ec761448de9..aa0c9c67a6dc 100644
---- a/deflate.c
-+++ b/deflate.c
-@@ -48,8 +48,9 @@
-  */
- 
- /* @(#) $Id$ */
--
-+#include <assert.h>
- #include "deflate.h"
-+#include "x86.h"
- 
- const char deflate_copyright[] =
-    " deflate 1.2.11 Copyright 1995-2017 Jean-loup Gailly and Mark Adler ";
-@@ -86,7 +87,7 @@ local block_state deflate_huff   OF((deflate_state *s, int flush));
- local void lm_init        OF((deflate_state *s));
- local void putShortMSB    OF((deflate_state *s, uInt b));
- local void flush_pending  OF((z_streamp strm));
--local unsigned read_buf   OF((z_streamp strm, Bytef *buf, unsigned size));
-+unsigned ZLIB_INTERNAL read_buf OF((z_streamp strm, Bytef *buf, unsigned size));
- #ifdef ASMV
- #  pragma message("Assembler code may have bugs -- use at your own risk")
-       void match_init OF((void)); /* asm code initialization */
-@@ -100,6 +101,20 @@ local  void check_match OF((deflate_state *s, IPos start, IPos match,
-                             int length));
- #endif
- 
-+/* From crc32.c */
-+extern void ZLIB_INTERNAL crc_reset(deflate_state *const s);
-+extern void ZLIB_INTERNAL crc_finalize(deflate_state *const s);
-+extern void ZLIB_INTERNAL copy_with_crc(z_streamp strm, Bytef *dst, long size);
-+
-+#ifdef _MSC_VER
-+#define INLINE __inline
-+#else
-+#define INLINE inline
-+#endif
-+
-+/* Inline optimisation */
-+local INLINE Pos insert_string_sse(deflate_state *const s, const Pos str);
-+
- /* ===========================================================================
-  * Local data
-  */
-@@ -162,7 +177,6 @@ local const config configuration_table[10] = {
-  */
- #define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask)
- 
--
- /* ===========================================================================
-  * Insert string str in the dictionary and set match_head to the previous head
-  * of the hash chain (the most recent string with same hash key). Return
-@@ -173,17 +187,28 @@ local const config configuration_table[10] = {
-  *    characters and the first MIN_MATCH bytes of str are valid (except for
-  *    the last MIN_MATCH-1 bytes of the input file).
-  */
-+local INLINE Pos insert_string_c(deflate_state *const s, const Pos str)
-+{
-+    Pos ret;
-+
-+    UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]);
- #ifdef FASTEST
--#define INSERT_STRING(s, str, match_head) \
--   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
--    match_head = s->head[s->ins_h], \
--    s->head[s->ins_h] = (Pos)(str))
-+    ret = s->head[s->ins_h];
- #else
--#define INSERT_STRING(s, str, match_head) \
--   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
--    match_head = s->prev[(str) & s->w_mask] = s->head[s->ins_h], \
--    s->head[s->ins_h] = (Pos)(str))
-+    ret = s->prev[str & s->w_mask] = s->head[s->ins_h];
- #endif
-+    s->head[s->ins_h] = str;
-+
-+    return ret;
-+}
-+
-+local INLINE Pos insert_string(deflate_state *const s, const Pos str)
-+{
-+    if (x86_cpu_enable_simd)
-+        return insert_string_sse(s, str);
-+    return insert_string_c(s, str);
-+}
-+
- 
- /* ===========================================================================
-  * Initialize the hash table (avoiding 64K overflow for 16 bit systems).
-@@ -248,6 +273,7 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
-     const char *version;
-     int stream_size;
- {
-+    unsigned window_padding = 8;
-     deflate_state *s;
-     int wrap = 1;
-     static const char my_version[] = ZLIB_VERSION;
-@@ -257,6 +283,8 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
-      * output size for (length,distance) codes is <= 24 bits.
-      */
- 
-+    x86_check_features();
-+
-     if (version == Z_NULL || version[0] != my_version[0] ||
-         stream_size != sizeof(z_stream)) {
-         return Z_VERSION_ERROR;
-@@ -313,12 +341,19 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
-     s->w_size = 1 << s->w_bits;
-     s->w_mask = s->w_size - 1;
- 
--    s->hash_bits = (uInt)memLevel + 7;
-+    if (x86_cpu_enable_simd) {
-+        s->hash_bits = 15;
-+    } else {
-+        s->hash_bits = memLevel + 7;
-+    }
-+
-     s->hash_size = 1 << s->hash_bits;
-     s->hash_mask = s->hash_size - 1;
-     s->hash_shift =  ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH);
- 
--    s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte));
-+    s->window = (Bytef *) ZALLOC(strm,
-+                                 s->w_size + window_padding,
-+                                 2*sizeof(Byte));
-     s->prev   = (Posf *)  ZALLOC(strm, s->w_size, sizeof(Pos));
-     s->head   = (Posf *)  ZALLOC(strm, s->hash_size, sizeof(Pos));
- 
-@@ -418,11 +453,7 @@ int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
-         str = s->strstart;
-         n = s->lookahead - (MIN_MATCH-1);
-         do {
--            UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);
--#ifndef FASTEST
--            s->prev[str & s->w_mask] = s->head[s->ins_h];
--#endif
--            s->head[s->ins_h] = (Pos)str;
-+            insert_string(s, str);
-             str++;
-         } while (--n);
-         s->strstart = str;
-@@ -848,7 +879,7 @@ int ZEXPORT deflate (strm, flush)
- #ifdef GZIP
-     if (s->status == GZIP_STATE) {
-         /* gzip header */
--        strm->adler = crc32(0L, Z_NULL, 0);
-+        crc_reset(s);
-         put_byte(s, 31);
-         put_byte(s, 139);
-         put_byte(s, 8);
-@@ -1049,6 +1080,7 @@ int ZEXPORT deflate (strm, flush)
-     /* Write the trailer */
- #ifdef GZIP
-     if (s->wrap == 2) {
-+        crc_finalize(s);
-         put_byte(s, (Byte)(strm->adler & 0xff));
-         put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
-         put_byte(s, (Byte)((strm->adler >> 16) & 0xff));
-@@ -1161,7 +1193,7 @@ int ZEXPORT deflateCopy (dest, source)
-  * allocating a large strm->next_in buffer and copying from it.
-  * (See also flush_pending()).
-  */
--local unsigned read_buf(strm, buf, size)
-+ZLIB_INTERNAL unsigned read_buf(strm, buf, size)
-     z_streamp strm;
-     Bytef *buf;
-     unsigned size;
-@@ -1173,15 +1205,16 @@ local unsigned read_buf(strm, buf, size)
- 
-     strm->avail_in  -= len;
- 
--    zmemcpy(buf, strm->next_in, len);
--    if (strm->state->wrap == 1) {
--        strm->adler = adler32(strm->adler, buf, len);
--    }
- #ifdef GZIP
--    else if (strm->state->wrap == 2) {
--        strm->adler = crc32(strm->adler, buf, len);
--    }
-+    if (strm->state->wrap == 2)
-+        copy_with_crc(strm, buf, len);
-+    else 
- #endif
-+    {
-+        zmemcpy(buf, strm->next_in, len);
-+        if (strm->state->wrap == 1)
-+            strm->adler = adler32(strm->adler, buf, len);
-+    }
-     strm->next_in  += len;
-     strm->total_in += len;
- 
-@@ -1479,7 +1512,19 @@ local void check_match(s, start, match, length)
-  *    performed for at least two bytes (required for the zip translate_eol
-  *    option -- not supported here).
-  */
--local void fill_window(s)
-+local void fill_window_c(deflate_state *s);
-+
-+local void fill_window(deflate_state *s)
-+{
-+    if (x86_cpu_enable_simd) {
-+        fill_window_sse(s);
-+        return;
-+    }
-+
-+    fill_window_c(s);
-+}
-+
-+local void fill_window_c(s)
-     deflate_state *s;
- {
-     unsigned n;
-@@ -1847,7 +1892,7 @@ local block_state deflate_fast(s, flush)
-          */
-         hash_head = NIL;
-         if (s->lookahead >= MIN_MATCH) {
--            INSERT_STRING(s, s->strstart, hash_head);
-+            hash_head = insert_string(s, s->strstart);
-         }
- 
-         /* Find the longest match, discarding those <= prev_length.
-@@ -1878,7 +1923,7 @@ local block_state deflate_fast(s, flush)
-                 s->match_length--; /* string at strstart already in table */
-                 do {
-                     s->strstart++;
--                    INSERT_STRING(s, s->strstart, hash_head);
-+                    hash_head = insert_string(s, s->strstart);
-                     /* strstart never exceeds WSIZE-MAX_MATCH, so there are
-                      * always MIN_MATCH bytes ahead.
-                      */
-@@ -1950,7 +1995,7 @@ local block_state deflate_slow(s, flush)
-          */
-         hash_head = NIL;
-         if (s->lookahead >= MIN_MATCH) {
--            INSERT_STRING(s, s->strstart, hash_head);
-+            hash_head = insert_string(s, s->strstart);
-         }
- 
-         /* Find the longest match, discarding those <= prev_length.
-@@ -2001,7 +2046,7 @@ local block_state deflate_slow(s, flush)
-             s->prev_length -= 2;
-             do {
-                 if (++s->strstart <= max_insert) {
--                    INSERT_STRING(s, s->strstart, hash_head);
-+                    hash_head = insert_string(s, s->strstart);
-                 }
-             } while (--s->prev_length != 0);
-             s->match_available = 0;
-@@ -2161,3 +2206,37 @@ local block_state deflate_huff(s, flush)
-         FLUSH_BLOCK(s, 0);
-     return block_done;
- }
-+
-+/* Safe to inline this as GCC/clang will use inline asm and Visual Studio will
-+ * use intrinsic without extra params
-+ */
-+local INLINE Pos insert_string_sse(deflate_state *const s, const Pos str)
-+{
-+    Pos ret;
-+    unsigned *ip, val, h = 0;
-+
-+    ip = (unsigned *)&s->window[str];
-+    val = *ip;
-+
-+    if (s->level >= 6)
-+        val &= 0xFFFFFF;
-+
-+/* Windows clang should use inline asm */
-+#if defined(_MSC_VER) && !defined(__clang__)
-+    h = _mm_crc32_u32(h, val);
-+#elif defined(__i386__) || defined(__amd64__)
-+    __asm__ __volatile__ (
-+        "crc32 %1,%0\n\t"
-+    : "+r" (h)
-+    : "r" (val)
-+    );
-+#else
-+    /* This should never happen */
-+    assert(0);
-+#endif
-+
-+    ret = s->head[h & s->hash_mask];
-+    s->head[h & s->hash_mask] = str;
-+    s->prev[str & s->w_mask] = ret;
-+    return ret;
-+}
-diff --git a/deflate.h b/deflate.h
-index 23ecdd312bc0..ab56df7663b6 100644
---- a/deflate.h
-+++ b/deflate.h
-@@ -109,7 +109,7 @@ typedef struct internal_state {
-     ulg   gzindex;       /* where in extra, name, or comment */
-     Byte  method;        /* can only be DEFLATED */
-     int   last_flush;    /* value of flush param for previous deflate call */
--
-+    unsigned zalign(16) crc0[4 * 5];
-                 /* used by deflate.c: */
- 
-     uInt  w_size;        /* LZ77 window size (32K by default) */
-@@ -346,4 +346,14 @@ void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
-               flush = _tr_tally(s, distance, length)
- #endif
- 
-+/* Functions that are SIMD optimised on x86 */
-+void ZLIB_INTERNAL crc_fold_init(deflate_state* const s);
-+void ZLIB_INTERNAL crc_fold_copy(deflate_state* const s,
-+                                 unsigned char* dst,
-+                                 const unsigned char* src,
-+                                 long len);
-+unsigned ZLIB_INTERNAL crc_fold_512to32(deflate_state* const s);
-+
-+void ZLIB_INTERNAL fill_window_sse(deflate_state* s);
-+
- #endif /* DEFLATE_H */
-diff --git a/fill_window_sse.c b/fill_window_sse.c
-new file mode 100644
-index 000000000000..949ccce1ba9c
---- /dev/null
-+++ b/fill_window_sse.c
-@@ -0,0 +1,175 @@
-+/*
-+ * Fill Window with SSE2-optimized hash shifting
-+ *
-+ * Copyright (C) 2013 Intel Corporation
-+ * Authors:
-+ *  Arjan van de Ven    <arjan@linux.intel.com>
-+ *  Jim Kukunas         <james.t.kukunas@linux.intel.com>
-+ *
-+ * For conditions of distribution and use, see copyright notice in zlib.h
-+ */
-+
-+#include <immintrin.h>
-+#include "deflate.h"
-+
-+#define UPDATE_HASH(s,h,i) \
-+    {\
-+        if (s->level < 6) { \
-+            h = (3483 * (s->window[i]) +\
-+                 23081* (s->window[i+1]) +\
-+                 6954 * (s->window[i+2]) +\
-+                 20947* (s->window[i+3])) & s->hash_mask;\
-+        } else {\
-+            h = (25881* (s->window[i]) +\
-+                 24674* (s->window[i+1]) +\
-+                 25811* (s->window[i+2])) & s->hash_mask;\
-+        }\
-+    }\
-+
-+extern int read_buf OF((z_streamp strm, Bytef *buf, unsigned size));
-+
-+void fill_window_sse(deflate_state *s)
-+{
-+    const __m128i xmm_wsize = _mm_set1_epi16(s->w_size);
-+
-+    register unsigned n;
-+    register Posf *p;
-+    unsigned more;    /* Amount of free space at the end of the window. */
-+    uInt wsize = s->w_size;
-+
-+    Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead");
-+
-+    do {
-+        more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
-+
-+        /* Deal with !@#$% 64K limit: */
-+        if (sizeof(int) <= 2) {
-+            if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
-+                more = wsize;
-+
-+            } else if (more == (unsigned)(-1)) {
-+                /* Very unlikely, but possible on 16 bit machine if
-+                 * strstart == 0 && lookahead == 1 (input done a byte at time)
-+                 */
-+                more--;
-+            }
-+        }
-+
-+        /* If the window is almost full and there is insufficient lookahead,
-+         * move the upper half to the lower one to make room in the upper half.
-+         */
-+        if (s->strstart >= wsize+MAX_DIST(s)) {
-+
-+            zmemcpy(s->window, s->window+wsize, (unsigned)wsize);
-+            s->match_start -= wsize;
-+            s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */
-+            s->block_start -= (long) wsize;
-+
-+            /* Slide the hash table (could be avoided with 32 bit values
-+               at the expense of memory usage). We slide even when level == 0
-+               to keep the hash table consistent if we switch back to level > 0
-+               later. (Using level 0 permanently is not an optimal usage of
-+               zlib, so we don't care about this pathological case.)
-+             */
-+            n = s->hash_size;
-+            p = &s->head[n];
-+            p -= 8;
-+            do {
-+                __m128i value, result;
-+
-+                value = _mm_loadu_si128((__m128i *)p);
-+                result = _mm_subs_epu16(value, xmm_wsize);
-+                _mm_storeu_si128((__m128i *)p, result);
-+
-+                p -= 8;
-+                n -= 8;
-+            } while (n > 0);
-+
-+            n = wsize;
-+#ifndef FASTEST
-+            p = &s->prev[n];
-+            p -= 8;
-+            do {
-+                __m128i value, result;
-+
-+                value = _mm_loadu_si128((__m128i *)p);
-+                result = _mm_subs_epu16(value, xmm_wsize);
-+                _mm_storeu_si128((__m128i *)p, result);
-+
-+                p -= 8;
-+                n -= 8;
-+            } while (n > 0);
-+#endif
-+            more += wsize;
-+        }
-+        if (s->strm->avail_in == 0) break;
-+
-+        /* If there was no sliding:
-+         *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
-+         *    more == window_size - lookahead - strstart
-+         * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)
-+         * => more >= window_size - 2*WSIZE + 2
-+         * In the BIG_MEM or MMAP case (not yet supported),
-+         *   window_size == input_size + MIN_LOOKAHEAD  &&
-+         *   strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.
-+         * Otherwise, window_size == 2*WSIZE so more >= 2.
-+         * If there was sliding, more >= WSIZE. So in all cases, more >= 2.
-+         */
-+        Assert(more >= 2, "more < 2");
-+
-+        n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more);
-+        s->lookahead += n;
-+
-+        /* Initialize the hash value now that we have some input: */
-+        if (s->lookahead >= MIN_MATCH) {
-+            uInt str = s->strstart;
-+            s->ins_h = s->window[str];
-+            if (str >= 1)
-+                UPDATE_HASH(s, s->ins_h, str + 1 - (MIN_MATCH-1));
-+#if MIN_MATCH != 3
-+            Call UPDATE_HASH() MIN_MATCH-3 more times
-+#endif
-+        }
-+        /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
-+         * but this is not important since only literal bytes will be emitted.
-+         */
-+
-+    } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0);
-+
-+    /* If the WIN_INIT bytes after the end of the current data have never been
-+     * written, then zero those bytes in order to avoid memory check reports of
-+     * the use of uninitialized (or uninitialised as Julian writes) bytes by
-+     * the longest match routines.  Update the high water mark for the next
-+     * time through here.  WIN_INIT is set to MAX_MATCH since the longest match
-+     * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead.
-+     */
-+    if (s->high_water < s->window_size) {
-+        ulg curr = s->strstart + (ulg)(s->lookahead);
-+        ulg init;
-+
-+        if (s->high_water < curr) {
-+            /* Previous high water mark below current data -- zero WIN_INIT
-+             * bytes or up to end of window, whichever is less.
-+             */
-+            init = s->window_size - curr;
-+            if (init > WIN_INIT)
-+                init = WIN_INIT;
-+            zmemzero(s->window + curr, (unsigned)init);
-+            s->high_water = curr + init;
-+        }
-+        else if (s->high_water < (ulg)curr + WIN_INIT) {
-+            /* High water mark at or above current data, but below current data
-+             * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up
-+             * to end of window, whichever is less.
-+             */
-+            init = (ulg)curr + WIN_INIT - s->high_water;
-+            if (init > s->window_size - s->high_water)
-+                init = s->window_size - s->high_water;
-+            zmemzero(s->window + s->high_water, (unsigned)init);
-+            s->high_water += init;
-+        }
-+    }
-+
-+    Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
-+           "not enough room for search");
-+}
-diff --git a/names.h b/names.h
-index f18df5684dc5..3436baa4eb57 100644
---- a/names.h
-+++ b/names.h
-@@ -152,4 +152,16 @@
- /* An exported symbol that isn't handled by Z_PREFIX in zconf.h */
- #define z_errmsg Cr_z_z_errmsg
- 
-+/* Symbols added in simd.patch */
-+#define copy_with_crc Cr_z_copy_with_crc
-+#define crc_finalize Cr_z_crc_finalize
-+#define crc_fold_512to32 Cr_z_crc_fold_512to32
-+#define crc_fold_copy Cr_z_crc_fold_copy
-+#define crc_fold_init Cr_z_crc_fold_init
-+#define crc_reset Cr_z_crc_reset
-+#define fill_window_sse Cr_z_fill_window_sse
-+#define read_buf Cr_z_read_buf
-+#define x86_check_features Cr_z_x86_check_features
-+#define x86_cpu_enable_simd Cr_z_x86_cpu_enable_simd
-+
- #endif  /* THIRD_PARTY_ZLIB_NAMES_H_ */
-diff --git a/simd_stub.c b/simd_stub.c
-new file mode 100644
-index 000000000000..c6d46051498f
---- /dev/null
-+++ b/simd_stub.c
-@@ -0,0 +1,35 @@
-+/* simd_stub.c -- stub implementations
-+* Copyright (C) 2014 Intel Corporation
-+* For conditions of distribution and use, see copyright notice in zlib.h
-+*/
-+#include <assert.h>
-+
-+#include "deflate.h"
-+#include "x86.h"
-+
-+int ZLIB_INTERNAL x86_cpu_enable_simd = 0;
-+
-+void ZLIB_INTERNAL crc_fold_init(deflate_state *const s) {
-+    assert(0);
-+}
-+
-+void ZLIB_INTERNAL crc_fold_copy(deflate_state *const s,
-+                                 unsigned char *dst,
-+                                 const unsigned char *src,
-+                                 long len) {
-+    assert(0);
-+}
-+
-+unsigned ZLIB_INTERNAL crc_fold_512to32(deflate_state *const s) {
-+    assert(0);
-+    return 0;
-+}
-+
-+void ZLIB_INTERNAL fill_window_sse(deflate_state *s)
-+{
-+    assert(0);
-+}
-+
-+void x86_check_features(void)
-+{
-+}
-diff --git a/x86.c b/x86.c
-new file mode 100644
-index 000000000000..e56fe8b85a39
---- /dev/null
-+++ b/x86.c
-@@ -0,0 +1,92 @@
-+/*
-+ * x86 feature check
-+ *
-+ * Copyright (C) 2013 Intel Corporation. All rights reserved.
-+ * Author:
-+ *  Jim Kukunas
-+ * 
-+ * For conditions of distribution and use, see copyright notice in zlib.h
-+ */
-+
-+#include "x86.h"
-+#include "zutil.h"
-+
-+int ZLIB_INTERNAL x86_cpu_enable_simd = 0;
-+
-+#ifndef _MSC_VER
-+#include <pthread.h>
-+
-+pthread_once_t cpu_check_inited_once = PTHREAD_ONCE_INIT;
-+static void _x86_check_features(void);
-+
-+void x86_check_features(void)
-+{
-+  pthread_once(&cpu_check_inited_once, _x86_check_features);
-+}
-+
-+static void _x86_check_features(void)
-+{
-+    int x86_cpu_has_sse2;
-+    int x86_cpu_has_sse42;
-+    int x86_cpu_has_pclmulqdq;
-+    unsigned eax, ebx, ecx, edx;
-+
-+    eax = 1;
-+#ifdef __i386__
-+    __asm__ __volatile__ (
-+        "xchg %%ebx, %1\n\t"
-+        "cpuid\n\t"
-+        "xchg %1, %%ebx\n\t"
-+    : "+a" (eax), "=S" (ebx), "=c" (ecx), "=d" (edx)
-+    );
-+#else
-+    __asm__ __volatile__ (
-+        "cpuid\n\t"
-+    : "+a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx)
-+    );
-+#endif  /* (__i386__) */
-+
-+    x86_cpu_has_sse2 = edx & 0x4000000;
-+    x86_cpu_has_sse42 = ecx & 0x100000;
-+    x86_cpu_has_pclmulqdq = ecx & 0x2;
-+
-+    x86_cpu_enable_simd = x86_cpu_has_sse2 &&
-+                          x86_cpu_has_sse42 &&
-+                          x86_cpu_has_pclmulqdq;
-+}
-+#else
-+#include <intrin.h>
-+#include <windows.h>
-+
-+static BOOL CALLBACK _x86_check_features(PINIT_ONCE once,
-+                                         PVOID param,
-+                                         PVOID *context);
-+static INIT_ONCE cpu_check_inited_once = INIT_ONCE_STATIC_INIT;
-+
-+void x86_check_features(void)
-+{
-+    InitOnceExecuteOnce(&cpu_check_inited_once, _x86_check_features,
-+                        NULL, NULL);
-+}
-+
-+static BOOL CALLBACK _x86_check_features(PINIT_ONCE once,
-+                                         PVOID param,
-+                                         PVOID *context)
-+{
-+    int x86_cpu_has_sse2;
-+    int x86_cpu_has_sse42;
-+    int x86_cpu_has_pclmulqdq;
-+    int regs[4];
-+
-+    __cpuid(regs, 1);
-+
-+    x86_cpu_has_sse2 = regs[3] & 0x4000000;
-+    x86_cpu_has_sse42= regs[2] & 0x100000;
-+    x86_cpu_has_pclmulqdq = regs[2] & 0x2;
-+
-+    x86_cpu_enable_simd = x86_cpu_has_sse2 &&
-+                          x86_cpu_has_sse42 &&
-+                          x86_cpu_has_pclmulqdq;
-+    return TRUE;
-+}
-+#endif  /* _MSC_VER */
-diff --git a/x86.h b/x86.h
-new file mode 100644
-index 000000000000..ebcf10ab09d2
---- /dev/null
-+++ b/x86.h
-@@ -0,0 +1,15 @@
-+/* x86.h -- check for x86 CPU features
-+* Copyright (C) 2013 Intel Corporation Jim Kukunas
-+* For conditions of distribution and use, see copyright notice in zlib.h
-+*/
-+
-+#ifndef X86_H
-+#define X86_H
-+
-+#include "zlib.h"
-+
-+extern int x86_cpu_enable_simd;
-+
-+void x86_check_features(void);
-+
-+#endif  /* X86_H */
-diff --git a/zutil.h b/zutil.h
-index 80375b8b6109..4425bcf75eb3 100644
---- a/zutil.h
-+++ b/zutil.h
-@@ -283,4 +283,10 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
- #define ZSWAP32(q) ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \
-                     (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
- 
-+#ifdef _MSC_VER
-+#define zalign(x) __declspec(align(x))
-+#else
-+#define zalign(x) __attribute__((aligned((x))))
-+#endif
-+
- #endif /* ZUTIL_H */
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/simd_stub.c b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/simd_stub.c
deleted file mode 100644
index c6d460514..000000000
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/simd_stub.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* simd_stub.c -- stub implementations
-* Copyright (C) 2014 Intel Corporation
-* For conditions of distribution and use, see copyright notice in zlib.h
-*/
-#include <assert.h>
-
-#include "deflate.h"
-#include "x86.h"
-
-int ZLIB_INTERNAL x86_cpu_enable_simd = 0;
-
-void ZLIB_INTERNAL crc_fold_init(deflate_state *const s) {
-    assert(0);
-}
-
-void ZLIB_INTERNAL crc_fold_copy(deflate_state *const s,
-                                 unsigned char *dst,
-                                 const unsigned char *src,
-                                 long len) {
-    assert(0);
-}
-
-unsigned ZLIB_INTERNAL crc_fold_512to32(deflate_state *const s) {
-    assert(0);
-    return 0;
-}
-
-void ZLIB_INTERNAL fill_window_sse(deflate_state *s)
-{
-    assert(0);
-}
-
-void x86_check_features(void)
-{
-}
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/slide_hash_simd.h b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/slide_hash_simd.h
new file mode 100644
index 000000000..1000b774c
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/slide_hash_simd.h
@@ -0,0 +1,116 @@
+/* slide_hash_simd.h
+ *
+ * Copyright 2022 The Chromium Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the Chromium source repository LICENSE file.
+ */
+
+#ifndef SLIDE_HASH_SIMD_H
+#define SLIDE_HASH_SIMD_H
+
+#include "deflate.h"
+
+#ifndef INLINE
+#if defined(_MSC_VER) && !defined(__clang__)
+#define INLINE __inline
+#else
+#define INLINE inline
+#endif
+#endif
+
+#if defined(CPU_NO_SIMD)
+
+#error SIMD has been disabled for your build target
+
+#elif defined(DEFLATE_SLIDE_HASH_SSE2)
+
+#include <emmintrin.h>  /* SSE2 */
+
+#define Z_SLIDE_INIT_SIMD(wsize) _mm_set1_epi16((ush)(wsize))
+
+#define Z_SLIDE_HASH_SIMD(table, size, vector_wsize) \
+    for (const Posf* const end = table + size; table != end;) { \
+        __m128i vO = _mm_loadu_si128((__m128i *)(table + 0)); \
+        vO = _mm_subs_epu16(vO, vector_wsize); \
+        _mm_storeu_si128((__m128i *)(table + 0), vO); \
+        table += 8; \
+    }
+
+typedef __m128i z_vec128i_u16x8_t;
+
+#elif defined(DEFLATE_SLIDE_HASH_NEON)
+
+#include <arm_neon.h>  /* NEON */
+
+#define Z_SLIDE_INIT_SIMD(wsize) vdupq_n_u16((ush)(wsize))
+
+#define Z_SLIDE_HASH_SIMD(table, size, vector_wsize) \
+    for (const Posf* const end = table + size; table != end;) { \
+        uint16x8_t vO = vld1q_u16(table + 0); \
+        uint16x8_t v8 = vld1q_u16(table + 8); \
+        vO = vqsubq_u16(vO, vector_wsize); \
+        v8 = vqsubq_u16(v8, vector_wsize); \
+        vst1q_u16(table + 0, vO); \
+        vst1q_u16(table + 8, v8); \
+        table += 8 + 8; \
+    }
+
+typedef uint16x8_t z_vec128i_u16x8_t;
+
+#else
+
+#error slide_hash_simd is not defined for your build target
+
+#endif
+
+/* ===========================================================================
+ * Slide the hash table when sliding the window down (could be avoided with 32
+ * bit values at the expense of memory usage). We slide even when level == 0 to
+ * keep the hash table consistent if we switch back to level > 0 later.
+ */
+local INLINE void slide_hash_simd(
+    Posf *head, Posf *prev, const uInt w_size, const uInt hash_size) {
+    /*
+     * The SIMD implementation of the hash table slider assumes:
+     *
+     * 1. hash chain offset is 2 bytes. Should be true as Pos is "ush" type.
+     */
+    Assert(sizeof(Pos) == 2, "Pos type size error: should be 2 bytes");
+    Assert(sizeof(ush) == 2, "ush type size error: should be 2 bytes");
+
+    Assert(hash_size <= (1 << 16), "Hash table maximum size error");
+    Assert(hash_size >= (1 << 8), "Hash table minimum size error");
+    Assert(w_size == (ush)w_size, "Prev table size error");
+
+    /*
+     * 2. The hash & prev table sizes are a multiple of 32 bytes (256 bits),
+     * since the NEON table slider moves two 128-bit items per loop (loop is
+     * unrolled on NEON for performance, see http://crbug.com/863257).
+     */
+    Assert(!((hash_size * sizeof(head[0])) & (32 - 1)),
+        "Hash table size error: should be a multiple of 32 bytes");
+    Assert(!((w_size * sizeof(prev[0])) & (32 - 1)),
+        "Prev table size error: should be a multiple of 32 bytes");
+
+    /*
+     * Duplicate (ush)w_size in each uint16_t component of a 128-bit vector.
+     */
+    const z_vec128i_u16x8_t vec_wsize = Z_SLIDE_INIT_SIMD(w_size);
+
+    /*
+     * Slide {head,prev} hash chain values: subtracts (ush)w_size from every
+     * value with a saturating SIMD subtract, to clamp the result to 0(NIL),
+     * to implement slide_hash() `(m >= wsize ? m - wsize : NIL);` code.
+     */
+    Z_SLIDE_HASH_SIMD(head, hash_size, vec_wsize);
+#ifndef FASTEST
+    Z_SLIDE_HASH_SIMD(prev, w_size, vec_wsize);
+#endif
+
+}
+
+#undef z_vec128i_u16x8_t
+#undef Z_SLIDE_HASH_SIMD
+#undef Z_SLIDE_INIT_SIMD
+
+#endif  /* SLIDE_HASH_SIMD_H */
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/trees.c b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/trees.c
index 50cf4b457..8dbdc40ba 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/trees.c
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/trees.c
@@ -1,5 +1,5 @@
 /* trees.c -- output deflated data using Huffman coding
- * Copyright (C) 1995-2017 Jean-loup Gailly
+ * Copyright (C) 1995-2021 Jean-loup Gailly
  * detect_data_type() function provided freely by Cosmin Truta, 2006
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
@@ -122,39 +122,116 @@ struct static_tree_desc_s {
     int     max_length;          /* max bit length for the codes */
 };
 
-local const static_tree_desc  static_l_desc =
+#ifdef NO_INIT_GLOBAL_POINTERS
+#  define TCONST
+#else
+#  define TCONST const
+#endif
+
+local TCONST static_tree_desc static_l_desc =
 {static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS};
 
-local const static_tree_desc  static_d_desc =
+local TCONST static_tree_desc static_d_desc =
 {static_dtree, extra_dbits, 0,          D_CODES, MAX_BITS};
 
-local const static_tree_desc  static_bl_desc =
+local TCONST static_tree_desc static_bl_desc =
 {(const ct_data *)0, extra_blbits, 0,   BL_CODES, MAX_BL_BITS};
 
 /* ===========================================================================
- * Local (static) routines in this file.
+ * Output a short LSB first on the stream.
+ * IN assertion: there is enough room in pendingBuf.
  */
+#define put_short(s, w) { \
+    put_byte(s, (uch)((w) & 0xff)); \
+    put_byte(s, (uch)((ush)(w) >> 8)); \
+}
 
-local void tr_static_init OF((void));
-local void init_block     OF((deflate_state *s));
-local void pqdownheap     OF((deflate_state *s, ct_data *tree, int k));
-local void gen_bitlen     OF((deflate_state *s, tree_desc *desc));
-local void gen_codes      OF((ct_data *tree, int max_code, ushf *bl_count));
-local void build_tree     OF((deflate_state *s, tree_desc *desc));
-local void scan_tree      OF((deflate_state *s, ct_data *tree, int max_code));
-local void send_tree      OF((deflate_state *s, ct_data *tree, int max_code));
-local int  build_bl_tree  OF((deflate_state *s));
-local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes,
-                              int blcodes));
-local void compress_block OF((deflate_state *s, const ct_data *ltree,
-                              const ct_data *dtree));
-local int  detect_data_type OF((deflate_state *s));
-local unsigned bi_reverse OF((unsigned value, int length));
-local void bi_windup      OF((deflate_state *s));
-local void bi_flush       OF((deflate_state *s));
+/* ===========================================================================
+ * Reverse the first len bits of a code, using straightforward code (a faster
+ * method would use a table)
+ * IN assertion: 1 <= len <= 15
+ */
+local unsigned bi_reverse(unsigned code, int len) {
+    register unsigned res = 0;
+    do {
+        res |= code & 1;
+        code >>= 1, res <<= 1;
+    } while (--len > 0);
+    return res >> 1;
+}
+
+/* ===========================================================================
+ * Flush the bit buffer, keeping at most 7 bits in it.
+ */
+local void bi_flush(deflate_state *s) {
+    if (s->bi_valid == 16) {
+        put_short(s, s->bi_buf);
+        s->bi_buf = 0;
+        s->bi_valid = 0;
+    } else if (s->bi_valid >= 8) {
+        put_byte(s, (Byte)s->bi_buf);
+        s->bi_buf >>= 8;
+        s->bi_valid -= 8;
+    }
+}
+
+/* ===========================================================================
+ * Flush the bit buffer and align the output on a byte boundary
+ */
+local void bi_windup(deflate_state *s) {
+    if (s->bi_valid > 8) {
+        put_short(s, s->bi_buf);
+    } else if (s->bi_valid > 0) {
+        put_byte(s, (Byte)s->bi_buf);
+    }
+    s->bi_buf = 0;
+    s->bi_valid = 0;
+#ifdef ZLIB_DEBUG
+    s->bits_sent = (s->bits_sent + 7) & ~7;
+#endif
+}
+
+/* ===========================================================================
+ * Generate the codes for a given tree and bit counts (which need not be
+ * optimal).
+ * IN assertion: the array bl_count contains the bit length statistics for
+ * the given tree and the field len is set for all tree elements.
+ * OUT assertion: the field code is set for all tree elements of non
+ *     zero code length.
+ */
+local void gen_codes(ct_data *tree, int max_code, ushf *bl_count) {
+    ush next_code[MAX_BITS+1]; /* next code value for each bit length */
+    unsigned code = 0;         /* running code value */
+    int bits;                  /* bit index */
+    int n;                     /* code index */
+
+    /* The distribution counts are first used to generate the code values
+     * without bit reversal.
+     */
+    for (bits = 1; bits <= MAX_BITS; bits++) {
+        code = (code + bl_count[bits - 1]) << 1;
+        next_code[bits] = (ush)code;
+    }
+    /* Check that the bit counts in bl_count are consistent. The last code
+     * must be all ones.
+     */
+    Assert (code + bl_count[MAX_BITS] - 1 == (1 << MAX_BITS) - 1,
+            "inconsistent bit counts");
+    Tracev((stderr,"\ngen_codes: max_code %d ", max_code));
+
+    for (n = 0;  n <= max_code; n++) {
+        int len = tree[n].Len;
+        if (len == 0) continue;
+        /* Now reverse the bits */
+        tree[n].Code = (ush)bi_reverse(next_code[len]++, len);
+
+        Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
+            n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len] - 1));
+    }
+}
 
 #ifdef GEN_TREES_H
-local void gen_trees_header OF((void));
+local void gen_trees_header(void);
 #endif
 
 #ifndef ZLIB_DEBUG
@@ -167,33 +244,18 @@ local void gen_trees_header OF((void));
        send_bits(s, tree[c].Code, tree[c].Len); }
 #endif
 
-/* ===========================================================================
- * Output a short LSB first on the stream.
- * IN assertion: there is enough room in pendingBuf.
- */
-#define put_short(s, w) { \
-    put_byte(s, (uch)((w) & 0xff)); \
-    put_byte(s, (uch)((ush)(w) >> 8)); \
-}
-
 /* ===========================================================================
  * Send a value on a given number of bits.
  * IN assertion: length <= 16 and value fits in length bits.
  */
 #ifdef ZLIB_DEBUG
-local void send_bits      OF((deflate_state *s, int value, int length));
-
-local void send_bits(s, value, length)
-    deflate_state *s;
-    int value;  /* value to send */
-    int length; /* number of bits */
-{
+local void send_bits(deflate_state *s, int value, int length) {
     Tracevv((stderr," l %2d v %4x ", length, value));
     Assert(length > 0 && length <= 15, "invalid length");
     s->bits_sent += (ulg)length;
 
     /* If not enough room in bi_buf, use (valid) bits from bi_buf and
-     * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid))
+     * (16 - bi_valid) bits from value, leaving (width - (16 - bi_valid))
      * unused bits in value.
      */
     if (s->bi_valid > (int)Buf_size - length) {
@@ -229,8 +291,7 @@ local void send_bits(s, value, length)
 /* ===========================================================================
  * Initialize the various 'constant' tables.
  */
-local void tr_static_init()
-{
+local void tr_static_init(void) {
 #if defined(GEN_TREES_H) || !defined(STDC)
     static int static_init_done = 0;
     int n;        /* iterates over tree elements */
@@ -256,7 +317,7 @@ local void tr_static_init()
     length = 0;
     for (code = 0; code < LENGTH_CODES-1; code++) {
         base_length[code] = length;
-        for (n = 0; n < (1<<extra_lbits[code]); n++) {
+        for (n = 0; n < (1 << extra_lbits[code]); n++) {
             _length_code[length++] = (uch)code;
         }
     }
@@ -265,13 +326,13 @@ local void tr_static_init()
      * in two different ways: code 284 + 5 bits or code 285, so we
      * overwrite length_code[255] to use the best encoding:
      */
-    _length_code[length-1] = (uch)code;
+    _length_code[length - 1] = (uch)code;
 
     /* Initialize the mapping dist (0..32K) -> dist code (0..29) */
     dist = 0;
     for (code = 0 ; code < 16; code++) {
         base_dist[code] = dist;
-        for (n = 0; n < (1<<extra_dbits[code]); n++) {
+        for (n = 0; n < (1 << extra_dbits[code]); n++) {
             _dist_code[dist++] = (uch)code;
         }
     }
@@ -279,11 +340,11 @@ local void tr_static_init()
     dist >>= 7; /* from now on, all distances are divided by 128 */
     for ( ; code < D_CODES; code++) {
         base_dist[code] = dist << 7;
-        for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) {
+        for (n = 0; n < (1 << (extra_dbits[code] - 7)); n++) {
             _dist_code[256 + dist++] = (uch)code;
         }
     }
-    Assert (dist == 256, "tr_static_init: 256+dist != 512");
+    Assert (dist == 256, "tr_static_init: 256 + dist != 512");
 
     /* Construct the codes of the static literal tree */
     for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0;
@@ -312,7 +373,7 @@ local void tr_static_init()
 }
 
 /* ===========================================================================
- * Genererate the file trees.h describing the static trees.
+ * Generate the file trees.h describing the static trees.
  */
 #ifdef GEN_TREES_H
 #  ifndef ZLIB_DEBUG
@@ -321,10 +382,9 @@ local void tr_static_init()
 
 #  define SEPARATOR(i, last, width) \
       ((i) == (last)? "\n};\n\n" :    \
-       ((i) % (width) == (width)-1 ? ",\n" : ", "))
+       ((i) % (width) == (width) - 1 ? ",\n" : ", "))
 
-void gen_trees_header()
-{
+void gen_trees_header(void) {
     FILE *header = fopen("trees.h", "w");
     int i;
 
@@ -373,12 +433,26 @@ void gen_trees_header()
 }
 #endif /* GEN_TREES_H */
 
+/* ===========================================================================
+ * Initialize a new block.
+ */
+local void init_block(deflate_state *s) {
+    int n; /* iterates over tree elements */
+
+    /* Initialize the trees. */
+    for (n = 0; n < L_CODES;  n++) s->dyn_ltree[n].Freq = 0;
+    for (n = 0; n < D_CODES;  n++) s->dyn_dtree[n].Freq = 0;
+    for (n = 0; n < BL_CODES; n++) s->bl_tree[n].Freq = 0;
+
+    s->dyn_ltree[END_BLOCK].Freq = 1;
+    s->opt_len = s->static_len = 0L;
+    s->sym_next = s->matches = 0;
+}
+
 /* ===========================================================================
  * Initialize the tree data structures for a new zlib stream.
  */
-void ZLIB_INTERNAL _tr_init(s)
-    deflate_state *s;
-{
+void ZLIB_INTERNAL _tr_init(deflate_state *s) {
     tr_static_init();
 
     s->l_desc.dyn_tree = s->dyn_ltree;
@@ -401,24 +475,6 @@ void ZLIB_INTERNAL _tr_init(s)
     init_block(s);
 }
 
-/* ===========================================================================
- * Initialize a new block.
- */
-local void init_block(s)
-    deflate_state *s;
-{
-    int n; /* iterates over tree elements */
-
-    /* Initialize the trees. */
-    for (n = 0; n < L_CODES;  n++) s->dyn_ltree[n].Freq = 0;
-    for (n = 0; n < D_CODES;  n++) s->dyn_dtree[n].Freq = 0;
-    for (n = 0; n < BL_CODES; n++) s->bl_tree[n].Freq = 0;
-
-    s->dyn_ltree[END_BLOCK].Freq = 1;
-    s->opt_len = s->static_len = 0L;
-    s->last_lit = s->matches = 0;
-}
-
 #define SMALLEST 1
 /* Index within the heap array of least frequent node in the Huffman tree */
 
@@ -448,17 +504,13 @@ local void init_block(s)
  * when the heap property is re-established (each father smaller than its
  * two sons).
  */
-local void pqdownheap(s, tree, k)
-    deflate_state *s;
-    ct_data *tree;  /* the tree to restore */
-    int k;               /* node to move down */
-{
+local void pqdownheap(deflate_state *s, ct_data *tree, int k) {
     int v = s->heap[k];
     int j = k << 1;  /* left son of k */
     while (j <= s->heap_len) {
         /* Set j to the smallest of the two sons: */
         if (j < s->heap_len &&
-            smaller(tree, s->heap[j+1], s->heap[j], s->depth)) {
+            smaller(tree, s->heap[j + 1], s->heap[j], s->depth)) {
             j++;
         }
         /* Exit if v is smaller than both sons */
@@ -483,10 +535,7 @@ local void pqdownheap(s, tree, k)
  *     The length opt_len is updated; static_len is also updated if stree is
  *     not null.
  */
-local void gen_bitlen(s, desc)
-    deflate_state *s;
-    tree_desc *desc;    /* the tree descriptor */
-{
+local void gen_bitlen(deflate_state *s, tree_desc *desc) {
     ct_data *tree        = desc->dyn_tree;
     int max_code         = desc->max_code;
     const ct_data *stree = desc->stat_desc->static_tree;
@@ -507,7 +556,7 @@ local void gen_bitlen(s, desc)
      */
     tree[s->heap[s->heap_max]].Len = 0; /* root of the heap */
 
-    for (h = s->heap_max+1; h < HEAP_SIZE; h++) {
+    for (h = s->heap_max + 1; h < HEAP_SIZE; h++) {
         n = s->heap[h];
         bits = tree[tree[n].Dad].Len + 1;
         if (bits > max_length) bits = max_length, overflow++;
@@ -518,7 +567,7 @@ local void gen_bitlen(s, desc)
 
         s->bl_count[bits]++;
         xbits = 0;
-        if (n >= base) xbits = extra[n-base];
+        if (n >= base) xbits = extra[n - base];
         f = tree[n].Freq;
         s->opt_len += (ulg)f * (unsigned)(bits + xbits);
         if (stree) s->static_len += (ulg)f * (unsigned)(stree[n].Len + xbits);
@@ -530,10 +579,10 @@ local void gen_bitlen(s, desc)
 
     /* Find the first bit length which could increase: */
     do {
-        bits = max_length-1;
+        bits = max_length - 1;
         while (s->bl_count[bits] == 0) bits--;
-        s->bl_count[bits]--;      /* move one leaf down the tree */
-        s->bl_count[bits+1] += 2; /* move one overflow item as its brother */
+        s->bl_count[bits]--;        /* move one leaf down the tree */
+        s->bl_count[bits + 1] += 2; /* move one overflow item as its brother */
         s->bl_count[max_length]--;
         /* The brother of the overflow item also moves one step up,
          * but this does not affect bl_count[max_length]
@@ -561,48 +610,9 @@ local void gen_bitlen(s, desc)
     }
 }
 
-/* ===========================================================================
- * Generate the codes for a given tree and bit counts (which need not be
- * optimal).
- * IN assertion: the array bl_count contains the bit length statistics for
- * the given tree and the field len is set for all tree elements.
- * OUT assertion: the field code is set for all tree elements of non
- *     zero code length.
- */
-local void gen_codes (tree, max_code, bl_count)
-    ct_data *tree;             /* the tree to decorate */
-    int max_code;              /* largest code with non zero frequency */
-    ushf *bl_count;            /* number of codes at each bit length */
-{
-    ush next_code[MAX_BITS+1]; /* next code value for each bit length */
-    unsigned code = 0;         /* running code value */
-    int bits;                  /* bit index */
-    int n;                     /* code index */
-
-    /* The distribution counts are first used to generate the code values
-     * without bit reversal.
-     */
-    for (bits = 1; bits <= MAX_BITS; bits++) {
-        code = (code + bl_count[bits-1]) << 1;
-        next_code[bits] = (ush)code;
-    }
-    /* Check that the bit counts in bl_count are consistent. The last code
-     * must be all ones.
-     */
-    Assert (code + bl_count[MAX_BITS]-1 == (1<<MAX_BITS)-1,
-            "inconsistent bit counts");
-    Tracev((stderr,"\ngen_codes: max_code %d ", max_code));
-
-    for (n = 0;  n <= max_code; n++) {
-        int len = tree[n].Len;
-        if (len == 0) continue;
-        /* Now reverse the bits */
-        tree[n].Code = (ush)bi_reverse(next_code[len]++, len);
-
-        Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
-             n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1));
-    }
-}
+#ifdef DUMP_BL_TREE
+#  include <stdio.h>
+#endif
 
 /* ===========================================================================
  * Construct one Huffman tree and assigns the code bit strings and lengths.
@@ -612,10 +622,7 @@ local void gen_codes (tree, max_code, bl_count)
  *     and corresponding code. The length opt_len is updated; static_len is
  *     also updated if stree is not null. The field max_code is set.
  */
-local void build_tree(s, desc)
-    deflate_state *s;
-    tree_desc *desc; /* the tree descriptor */
-{
+local void build_tree(deflate_state *s, tree_desc *desc) {
     ct_data *tree         = desc->dyn_tree;
     const ct_data *stree  = desc->stat_desc->static_tree;
     int elems             = desc->stat_desc->elems;
@@ -624,7 +631,7 @@ local void build_tree(s, desc)
     int node;          /* new node being created */
 
     /* Construct the initial heap, with least frequent element in
-     * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1].
+     * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n + 1].
      * heap[0] is not used.
      */
     s->heap_len = 0, s->heap_max = HEAP_SIZE;
@@ -652,7 +659,7 @@ local void build_tree(s, desc)
     }
     desc->max_code = max_code;
 
-    /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree,
+    /* The elements heap[heap_len/2 + 1 .. heap_len] are leaves of the tree,
      * establish sub-heaps of increasing lengths:
      */
     for (n = s->heap_len/2; n >= 1; n--) pqdownheap(s, tree, n);
@@ -700,11 +707,7 @@ local void build_tree(s, desc)
  * Scan a literal or distance tree to determine the frequencies of the codes
  * in the bit length tree.
  */
-local void scan_tree (s, tree, max_code)
-    deflate_state *s;
-    ct_data *tree;   /* the tree to be scanned */
-    int max_code;    /* and its largest code of non zero frequency */
-{
+local void scan_tree(deflate_state *s, ct_data *tree, int max_code) {
     int n;                     /* iterates over all tree elements */
     int prevlen = -1;          /* last emitted length */
     int curlen;                /* length of current code */
@@ -714,10 +717,10 @@ local void scan_tree (s, tree, max_code)
     int min_count = 4;         /* min repeat count */
 
     if (nextlen == 0) max_count = 138, min_count = 3;
-    tree[max_code+1].Len = (ush)0xffff; /* guard */
+    tree[max_code + 1].Len = (ush)0xffff; /* guard */
 
     for (n = 0; n <= max_code; n++) {
-        curlen = nextlen; nextlen = tree[n+1].Len;
+        curlen = nextlen; nextlen = tree[n + 1].Len;
         if (++count < max_count && curlen == nextlen) {
             continue;
         } else if (count < min_count) {
@@ -745,11 +748,7 @@ local void scan_tree (s, tree, max_code)
  * Send a literal or distance tree in compressed form, using the codes in
  * bl_tree.
  */
-local void send_tree (s, tree, max_code)
-    deflate_state *s;
-    ct_data *tree; /* the tree to be scanned */
-    int max_code;       /* and its largest code of non zero frequency */
-{
+local void send_tree(deflate_state *s, ct_data *tree, int max_code) {
     int n;                     /* iterates over all tree elements */
     int prevlen = -1;          /* last emitted length */
     int curlen;                /* length of current code */
@@ -758,11 +757,11 @@ local void send_tree (s, tree, max_code)
     int max_count = 7;         /* max repeat count */
     int min_count = 4;         /* min repeat count */
 
-    /* tree[max_code+1].Len = -1; */  /* guard already set */
+    /* tree[max_code + 1].Len = -1; */  /* guard already set */
     if (nextlen == 0) max_count = 138, min_count = 3;
 
     for (n = 0; n <= max_code; n++) {
-        curlen = nextlen; nextlen = tree[n+1].Len;
+        curlen = nextlen; nextlen = tree[n + 1].Len;
         if (++count < max_count && curlen == nextlen) {
             continue;
         } else if (count < min_count) {
@@ -773,13 +772,13 @@ local void send_tree (s, tree, max_code)
                 send_code(s, curlen, s->bl_tree); count--;
             }
             Assert(count >= 3 && count <= 6, " 3_6?");
-            send_code(s, REP_3_6, s->bl_tree); send_bits(s, count-3, 2);
+            send_code(s, REP_3_6, s->bl_tree); send_bits(s, count - 3, 2);
 
         } else if (count <= 10) {
-            send_code(s, REPZ_3_10, s->bl_tree); send_bits(s, count-3, 3);
+            send_code(s, REPZ_3_10, s->bl_tree); send_bits(s, count - 3, 3);
 
         } else {
-            send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count-11, 7);
+            send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count - 11, 7);
         }
         count = 0; prevlen = curlen;
         if (nextlen == 0) {
@@ -796,9 +795,7 @@ local void send_tree (s, tree, max_code)
  * Construct the Huffman tree for the bit lengths and return the index in
  * bl_order of the last bit length code to send.
  */
-local int build_bl_tree(s)
-    deflate_state *s;
-{
+local int build_bl_tree(deflate_state *s) {
     int max_blindex;  /* index of last bit length code of non zero freq */
 
     /* Determine the bit length frequencies for literal and distance trees */
@@ -807,8 +804,8 @@ local int build_bl_tree(s)
 
     /* Build the bit length tree: */
     build_tree(s, (tree_desc *)(&(s->bl_desc)));
-    /* opt_len now includes the length of the tree representations, except
-     * the lengths of the bit lengths codes and the 5+5+4 bits for the counts.
+    /* opt_len now includes the length of the tree representations, except the
+     * lengths of the bit lengths codes and the 5 + 5 + 4 bits for the counts.
      */
 
     /* Determine the number of bit length codes to send. The pkzip format
@@ -819,7 +816,7 @@ local int build_bl_tree(s)
         if (s->bl_tree[bl_order[max_blindex]].Len != 0) break;
     }
     /* Update opt_len to include the bit length tree and counts */
-    s->opt_len += 3*((ulg)max_blindex+1) + 5+5+4;
+    s->opt_len += 3*((ulg)max_blindex + 1) + 5 + 5 + 4;
     Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld",
             s->opt_len, s->static_len));
 
@@ -831,61 +828,54 @@ local int build_bl_tree(s)
  * lengths of the bit length codes, the literal tree and the distance tree.
  * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4.
  */
-local void send_all_trees(s, lcodes, dcodes, blcodes)
-    deflate_state *s;
-    int lcodes, dcodes, blcodes; /* number of codes for each tree */
-{
+local void send_all_trees(deflate_state *s, int lcodes, int dcodes,
+                          int blcodes) {
     int rank;                    /* index in bl_order */
 
     Assert (lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes");
     Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES,
             "too many codes");
     Tracev((stderr, "\nbl counts: "));
-    send_bits(s, lcodes-257, 5); /* not +255 as stated in appnote.txt */
-    send_bits(s, dcodes-1,   5);
-    send_bits(s, blcodes-4,  4); /* not -3 as stated in appnote.txt */
+    send_bits(s, lcodes - 257, 5);  /* not +255 as stated in appnote.txt */
+    send_bits(s, dcodes - 1,   5);
+    send_bits(s, blcodes - 4,  4);  /* not -3 as stated in appnote.txt */
     for (rank = 0; rank < blcodes; rank++) {
         Tracev((stderr, "\nbl code %2d ", bl_order[rank]));
         send_bits(s, s->bl_tree[bl_order[rank]].Len, 3);
     }
     Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent));
 
-    send_tree(s, (ct_data *)s->dyn_ltree, lcodes-1); /* literal tree */
+    send_tree(s, (ct_data *)s->dyn_ltree, lcodes - 1);  /* literal tree */
     Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent));
 
-    send_tree(s, (ct_data *)s->dyn_dtree, dcodes-1); /* distance tree */
+    send_tree(s, (ct_data *)s->dyn_dtree, dcodes - 1);  /* distance tree */
     Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent));
 }
 
 /* ===========================================================================
  * Send a stored block
  */
-void ZLIB_INTERNAL _tr_stored_block(s, buf, stored_len, last)
-    deflate_state *s;
-    charf *buf;       /* input block */
-    ulg stored_len;   /* length of input block */
-    int last;         /* one if this is the last block for a file */
-{
-    send_bits(s, (STORED_BLOCK<<1)+last, 3);    /* send block type */
+void ZLIB_INTERNAL _tr_stored_block(deflate_state *s, charf *buf,
+                                    ulg stored_len, int last) {
+    send_bits(s, (STORED_BLOCK<<1) + last, 3);  /* send block type */
     bi_windup(s);        /* align on byte boundary */
     put_short(s, (ush)stored_len);
     put_short(s, (ush)~stored_len);
-    zmemcpy(s->pending_buf + s->pending, (Bytef *)buf, stored_len);
+    if (stored_len)
+        zmemcpy(s->pending_buf + s->pending, (Bytef *)buf, stored_len);
     s->pending += stored_len;
 #ifdef ZLIB_DEBUG
     s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L;
     s->compressed_len += (stored_len + 4) << 3;
     s->bits_sent += 2*16;
-    s->bits_sent += stored_len<<3;
+    s->bits_sent += stored_len << 3;
 #endif
 }
 
 /* ===========================================================================
  * Flush the bits in the bit buffer to pending output (leaves at most 7 bits)
  */
-void ZLIB_INTERNAL _tr_flush_bits(s)
-    deflate_state *s;
-{
+void ZLIB_INTERNAL _tr_flush_bits(deflate_state *s) {
     bi_flush(s);
 }
 
@@ -893,9 +883,7 @@ void ZLIB_INTERNAL _tr_flush_bits(s)
  * Send one empty static block to give enough lookahead for inflate.
  * This takes 10 bits, of which 7 may remain in the bit buffer.
  */
-void ZLIB_INTERNAL _tr_align(s)
-    deflate_state *s;
-{
+void ZLIB_INTERNAL _tr_align(deflate_state *s) {
     send_bits(s, STATIC_TREES<<1, 3);
     send_code(s, END_BLOCK, static_ltree);
 #ifdef ZLIB_DEBUG
@@ -904,16 +892,99 @@ void ZLIB_INTERNAL _tr_align(s)
     bi_flush(s);
 }
 
+/* ===========================================================================
+ * Send the block data compressed using the given Huffman trees
+ */
+local void compress_block(deflate_state *s, const ct_data *ltree,
+                          const ct_data *dtree) {
+    unsigned dist;      /* distance of matched string */
+    int lc;             /* match length or unmatched char (if dist == 0) */
+    unsigned sx = 0;    /* running index in sym_buf */
+    unsigned code;      /* the code to send */
+    int extra;          /* number of extra bits to send */
+
+    if (s->sym_next != 0) do {
+        dist = s->sym_buf[sx++] & 0xff;
+        dist += (unsigned)(s->sym_buf[sx++] & 0xff) << 8;
+        lc = s->sym_buf[sx++];
+        if (dist == 0) {
+            send_code(s, lc, ltree); /* send a literal byte */
+            Tracecv(isgraph(lc), (stderr," '%c' ", lc));
+        } else {
+            /* Here, lc is the match length - MIN_MATCH */
+            code = _length_code[lc];
+            send_code(s, code + LITERALS + 1, ltree);   /* send length code */
+            extra = extra_lbits[code];
+            if (extra != 0) {
+                lc -= base_length[code];
+                send_bits(s, lc, extra);       /* send the extra length bits */
+            }
+            dist--; /* dist is now the match distance - 1 */
+            code = d_code(dist);
+            Assert (code < D_CODES, "bad d_code");
+
+            send_code(s, code, dtree);       /* send the distance code */
+            extra = extra_dbits[code];
+            if (extra != 0) {
+                dist -= (unsigned)base_dist[code];
+                send_bits(s, dist, extra);   /* send the extra distance bits */
+            }
+        } /* literal or match pair ? */
+
+        /* Check that the overlay between pending_buf and sym_buf is ok: */
+        Assert(s->pending < s->lit_bufsize + sx, "pendingBuf overflow");
+
+    } while (sx < s->sym_next);
+
+    send_code(s, END_BLOCK, ltree);
+}
+
+/* ===========================================================================
+ * Check if the data type is TEXT or BINARY, using the following algorithm:
+ * - TEXT if the two conditions below are satisfied:
+ *    a) There are no non-portable control characters belonging to the
+ *       "block list" (0..6, 14..25, 28..31).
+ *    b) There is at least one printable character belonging to the
+ *       "allow list" (9 {TAB}, 10 {LF}, 13 {CR}, 32..255).
+ * - BINARY otherwise.
+ * - The following partially-portable control characters form a
+ *   "gray list" that is ignored in this detection algorithm:
+ *   (7 {BEL}, 8 {BS}, 11 {VT}, 12 {FF}, 26 {SUB}, 27 {ESC}).
+ * IN assertion: the fields Freq of dyn_ltree are set.
+ */
+local int detect_data_type(deflate_state *s) {
+    /* block_mask is the bit mask of block-listed bytes
+     * set bits 0..6, 14..25, and 28..31
+     * 0xf3ffc07f = binary 11110011111111111100000001111111
+     */
+    unsigned long block_mask = 0xf3ffc07fUL;
+    int n;
+
+    /* Check for non-textual ("block-listed") bytes. */
+    for (n = 0; n <= 31; n++, block_mask >>= 1)
+        if ((block_mask & 1) && (s->dyn_ltree[n].Freq != 0))
+            return Z_BINARY;
+
+    /* Check for textual ("allow-listed") bytes. */
+    if (s->dyn_ltree[9].Freq != 0 || s->dyn_ltree[10].Freq != 0
+            || s->dyn_ltree[13].Freq != 0)
+        return Z_TEXT;
+    for (n = 32; n < LITERALS; n++)
+        if (s->dyn_ltree[n].Freq != 0)
+            return Z_TEXT;
+
+    /* There are no "block-listed" or "allow-listed" bytes:
+     * this stream either is empty or has tolerated ("gray-listed") bytes only.
+     */
+    return Z_BINARY;
+}
+
 /* ===========================================================================
  * Determine the best encoding for the current block: dynamic trees, static
  * trees or store, and write out the encoded block.
  */
-void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
-    deflate_state *s;
-    charf *buf;       /* input block, or NULL if too old */
-    ulg stored_len;   /* length of input block */
-    int last;         /* one if this is the last block for a file */
-{
+void ZLIB_INTERNAL _tr_flush_block(deflate_state *s, charf *buf,
+                                   ulg stored_len, int last) {
     ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */
     int max_blindex = 0;  /* index of last bit length code of non zero freq */
 
@@ -942,14 +1013,17 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
         max_blindex = build_bl_tree(s);
 
         /* Determine the best encoding. Compute the block lengths in bytes. */
-        opt_lenb = (s->opt_len+3+7)>>3;
-        static_lenb = (s->static_len+3+7)>>3;
+        opt_lenb = (s->opt_len + 3 + 7) >> 3;
+        static_lenb = (s->static_len + 3 + 7) >> 3;
 
         Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ",
                 opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,
-                s->last_lit));
+                s->sym_next / 3));
 
-        if (static_lenb <= opt_lenb) opt_lenb = static_lenb;
+#ifndef FORCE_STATIC
+        if (static_lenb <= opt_lenb || s->strategy == Z_FIXED)
+#endif
+            opt_lenb = static_lenb;
 
     } else {
         Assert(buf != (char*)0, "lost buf");
@@ -959,7 +1033,7 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
 #ifdef FORCE_STORED
     if (buf != (char*)0) { /* force stored block */
 #else
-    if (stored_len+4 <= opt_lenb && buf != (char*)0) {
+    if (stored_len + 4 <= opt_lenb && buf != (char*)0) {
                        /* 4: two words for the lengths */
 #endif
         /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE.
@@ -970,21 +1044,17 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
          */
         _tr_stored_block(s, buf, stored_len, last);
 
-#ifdef FORCE_STATIC
-    } else if (static_lenb >= 0) { /* force static trees */
-#else
-    } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) {
-#endif
-        send_bits(s, (STATIC_TREES<<1)+last, 3);
+    } else if (static_lenb == opt_lenb) {
+        send_bits(s, (STATIC_TREES<<1) + last, 3);
         compress_block(s, (const ct_data *)static_ltree,
                        (const ct_data *)static_dtree);
 #ifdef ZLIB_DEBUG
         s->compressed_len += 3 + s->static_len;
 #endif
     } else {
-        send_bits(s, (DYN_TREES<<1)+last, 3);
-        send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1,
-                       max_blindex+1);
+        send_bits(s, (DYN_TREES<<1) + last, 3);
+        send_all_trees(s, s->l_desc.max_code + 1, s->d_desc.max_code + 1,
+                       max_blindex + 1);
         compress_block(s, (const ct_data *)s->dyn_ltree,
                        (const ct_data *)s->dyn_dtree);
 #ifdef ZLIB_DEBUG
@@ -1003,21 +1073,18 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
         s->compressed_len += 7;  /* align on byte boundary */
 #endif
     }
-    Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3,
-           s->compressed_len-7*last));
+    Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len >> 3,
+           s->compressed_len - 7*last));
 }
 
 /* ===========================================================================
  * Save the match info and tally the frequency counts. Return true if
  * the current block must be flushed.
  */
-int ZLIB_INTERNAL _tr_tally (s, dist, lc)
-    deflate_state *s;
-    unsigned dist;  /* distance of matched string */
-    unsigned lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */
-{
-    s->d_buf[s->last_lit] = (ush)dist;
-    s->l_buf[s->last_lit++] = (uch)lc;
+int ZLIB_INTERNAL _tr_tally(deflate_state *s, unsigned dist, unsigned lc) {
+    s->sym_buf[s->sym_next++] = (uch)dist;
+    s->sym_buf[s->sym_next++] = (uch)(dist >> 8);
+    s->sym_buf[s->sym_next++] = (uch)lc;
     if (dist == 0) {
         /* lc is the unmatched char */
         s->dyn_ltree[lc].Freq++;
@@ -1029,175 +1096,8 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc)
                (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) &&
                (ush)d_code(dist) < (ush)D_CODES,  "_tr_tally: bad match");
 
-        s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++;
+        s->dyn_ltree[_length_code[lc] + LITERALS + 1].Freq++;
         s->dyn_dtree[d_code(dist)].Freq++;
     }
-
-#ifdef TRUNCATE_BLOCK
-    /* Try to guess if it is profitable to stop the current block here */
-    if ((s->last_lit & 0x1fff) == 0 && s->level > 2) {
-        /* Compute an upper bound for the compressed length */
-        ulg out_length = (ulg)s->last_lit*8L;
-        ulg in_length = (ulg)((long)s->strstart - s->block_start);
-        int dcode;
-        for (dcode = 0; dcode < D_CODES; dcode++) {
-            out_length += (ulg)s->dyn_dtree[dcode].Freq *
-                (5L+extra_dbits[dcode]);
-        }
-        out_length >>= 3;
-        Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ",
-               s->last_lit, in_length, out_length,
-               100L - out_length*100L/in_length));
-        if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1;
-    }
-#endif
-    return (s->last_lit == s->lit_bufsize-1);
-    /* We avoid equality with lit_bufsize because of wraparound at 64K
-     * on 16 bit machines and because stored blocks are restricted to
-     * 64K-1 bytes.
-     */
-}
-
-/* ===========================================================================
- * Send the block data compressed using the given Huffman trees
- */
-local void compress_block(s, ltree, dtree)
-    deflate_state *s;
-    const ct_data *ltree; /* literal tree */
-    const ct_data *dtree; /* distance tree */
-{
-    unsigned dist;      /* distance of matched string */
-    int lc;             /* match length or unmatched char (if dist == 0) */
-    unsigned lx = 0;    /* running index in l_buf */
-    unsigned code;      /* the code to send */
-    int extra;          /* number of extra bits to send */
-
-    if (s->last_lit != 0) do {
-        dist = s->d_buf[lx];
-        lc = s->l_buf[lx++];
-        if (dist == 0) {
-            send_code(s, lc, ltree); /* send a literal byte */
-            Tracecv(isgraph(lc), (stderr," '%c' ", lc));
-        } else {
-            /* Here, lc is the match length - MIN_MATCH */
-            code = _length_code[lc];
-            send_code(s, code+LITERALS+1, ltree); /* send the length code */
-            extra = extra_lbits[code];
-            if (extra != 0) {
-                lc -= base_length[code];
-                send_bits(s, lc, extra);       /* send the extra length bits */
-            }
-            dist--; /* dist is now the match distance - 1 */
-            code = d_code(dist);
-            Assert (code < D_CODES, "bad d_code");
-
-            send_code(s, code, dtree);       /* send the distance code */
-            extra = extra_dbits[code];
-            if (extra != 0) {
-                dist -= (unsigned)base_dist[code];
-                send_bits(s, dist, extra);   /* send the extra distance bits */
-            }
-        } /* literal or match pair ? */
-
-        /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */
-        Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx,
-               "pendingBuf overflow");
-
-    } while (lx < s->last_lit);
-
-    send_code(s, END_BLOCK, ltree);
-}
-
-/* ===========================================================================
- * Check if the data type is TEXT or BINARY, using the following algorithm:
- * - TEXT if the two conditions below are satisfied:
- *    a) There are no non-portable control characters belonging to the
- *       "black list" (0..6, 14..25, 28..31).
- *    b) There is at least one printable character belonging to the
- *       "white list" (9 {TAB}, 10 {LF}, 13 {CR}, 32..255).
- * - BINARY otherwise.
- * - The following partially-portable control characters form a
- *   "gray list" that is ignored in this detection algorithm:
- *   (7 {BEL}, 8 {BS}, 11 {VT}, 12 {FF}, 26 {SUB}, 27 {ESC}).
- * IN assertion: the fields Freq of dyn_ltree are set.
- */
-local int detect_data_type(s)
-    deflate_state *s;
-{
-    /* black_mask is the bit mask of black-listed bytes
-     * set bits 0..6, 14..25, and 28..31
-     * 0xf3ffc07f = binary 11110011111111111100000001111111
-     */
-    unsigned long black_mask = 0xf3ffc07fUL;
-    int n;
-
-    /* Check for non-textual ("black-listed") bytes. */
-    for (n = 0; n <= 31; n++, black_mask >>= 1)
-        if ((black_mask & 1) && (s->dyn_ltree[n].Freq != 0))
-            return Z_BINARY;
-
-    /* Check for textual ("white-listed") bytes. */
-    if (s->dyn_ltree[9].Freq != 0 || s->dyn_ltree[10].Freq != 0
-            || s->dyn_ltree[13].Freq != 0)
-        return Z_TEXT;
-    for (n = 32; n < LITERALS; n++)
-        if (s->dyn_ltree[n].Freq != 0)
-            return Z_TEXT;
-
-    /* There are no "black-listed" or "white-listed" bytes:
-     * this stream either is empty or has tolerated ("gray-listed") bytes only.
-     */
-    return Z_BINARY;
-}
-
-/* ===========================================================================
- * Reverse the first len bits of a code, using straightforward code (a faster
- * method would use a table)
- * IN assertion: 1 <= len <= 15
- */
-local unsigned bi_reverse(code, len)
-    unsigned code; /* the value to invert */
-    int len;       /* its bit length */
-{
-    register unsigned res = 0;
-    do {
-        res |= code & 1;
-        code >>= 1, res <<= 1;
-    } while (--len > 0);
-    return res >> 1;
-}
-
-/* ===========================================================================
- * Flush the bit buffer, keeping at most 7 bits in it.
- */
-local void bi_flush(s)
-    deflate_state *s;
-{
-    if (s->bi_valid == 16) {
-        put_short(s, s->bi_buf);
-        s->bi_buf = 0;
-        s->bi_valid = 0;
-    } else if (s->bi_valid >= 8) {
-        put_byte(s, (Byte)s->bi_buf);
-        s->bi_buf >>= 8;
-        s->bi_valid -= 8;
-    }
-}
-
-/* ===========================================================================
- * Flush the bit buffer and align the output on a byte boundary
- */
-local void bi_windup(s)
-    deflate_state *s;
-{
-    if (s->bi_valid > 8) {
-        put_short(s, s->bi_buf);
-    } else if (s->bi_valid > 0) {
-        put_byte(s, (Byte)s->bi_buf);
-    }
-    s->bi_buf = 0;
-    s->bi_valid = 0;
-#ifdef ZLIB_DEBUG
-    s->bits_sent = (s->bits_sent+7) & ~7;
-#endif
+    return (s->sym_next == s->sym_end);
 }
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/uncompr.c b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/uncompr.c
index f03a1a865..5e256663b 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/uncompr.c
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/uncompr.c
@@ -24,12 +24,8 @@
    Z_DATA_ERROR if the input data was corrupted, including if the input data is
    an incomplete zlib stream.
 */
-int ZEXPORT uncompress2 (dest, destLen, source, sourceLen)
-    Bytef *dest;
-    uLongf *destLen;
-    const Bytef *source;
-    uLong *sourceLen;
-{
+int ZEXPORT uncompress2(Bytef *dest, uLongf *destLen, const Bytef *source,
+                        uLong *sourceLen) {
     z_stream stream;
     int err;
     const uInt max = (uInt)-1;
@@ -83,11 +79,7 @@ int ZEXPORT uncompress2 (dest, destLen, source, sourceLen)
            err;
 }
 
-int ZEXPORT uncompress (dest, destLen, source, sourceLen)
-    Bytef *dest;
-    uLongf *destLen;
-    const Bytef *source;
-    uLong sourceLen;
-{
+int ZEXPORT uncompress(Bytef *dest, uLongf *destLen, const Bytef *source,
+                       uLong sourceLen) {
     return uncompress2(dest, destLen, source, &sourceLen);
 }
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/x86.c b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/x86.c
deleted file mode 100644
index e56fe8b85..000000000
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/x86.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * x86 feature check
- *
- * Copyright (C) 2013 Intel Corporation. All rights reserved.
- * Author:
- *  Jim Kukunas
- * 
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "x86.h"
-#include "zutil.h"
-
-int ZLIB_INTERNAL x86_cpu_enable_simd = 0;
-
-#ifndef _MSC_VER
-#include <pthread.h>
-
-pthread_once_t cpu_check_inited_once = PTHREAD_ONCE_INIT;
-static void _x86_check_features(void);
-
-void x86_check_features(void)
-{
-  pthread_once(&cpu_check_inited_once, _x86_check_features);
-}
-
-static void _x86_check_features(void)
-{
-    int x86_cpu_has_sse2;
-    int x86_cpu_has_sse42;
-    int x86_cpu_has_pclmulqdq;
-    unsigned eax, ebx, ecx, edx;
-
-    eax = 1;
-#ifdef __i386__
-    __asm__ __volatile__ (
-        "xchg %%ebx, %1\n\t"
-        "cpuid\n\t"
-        "xchg %1, %%ebx\n\t"
-    : "+a" (eax), "=S" (ebx), "=c" (ecx), "=d" (edx)
-    );
-#else
-    __asm__ __volatile__ (
-        "cpuid\n\t"
-    : "+a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx)
-    );
-#endif  /* (__i386__) */
-
-    x86_cpu_has_sse2 = edx & 0x4000000;
-    x86_cpu_has_sse42 = ecx & 0x100000;
-    x86_cpu_has_pclmulqdq = ecx & 0x2;
-
-    x86_cpu_enable_simd = x86_cpu_has_sse2 &&
-                          x86_cpu_has_sse42 &&
-                          x86_cpu_has_pclmulqdq;
-}
-#else
-#include <intrin.h>
-#include <windows.h>
-
-static BOOL CALLBACK _x86_check_features(PINIT_ONCE once,
-                                         PVOID param,
-                                         PVOID *context);
-static INIT_ONCE cpu_check_inited_once = INIT_ONCE_STATIC_INIT;
-
-void x86_check_features(void)
-{
-    InitOnceExecuteOnce(&cpu_check_inited_once, _x86_check_features,
-                        NULL, NULL);
-}
-
-static BOOL CALLBACK _x86_check_features(PINIT_ONCE once,
-                                         PVOID param,
-                                         PVOID *context)
-{
-    int x86_cpu_has_sse2;
-    int x86_cpu_has_sse42;
-    int x86_cpu_has_pclmulqdq;
-    int regs[4];
-
-    __cpuid(regs, 1);
-
-    x86_cpu_has_sse2 = regs[3] & 0x4000000;
-    x86_cpu_has_sse42= regs[2] & 0x100000;
-    x86_cpu_has_pclmulqdq = regs[2] & 0x2;
-
-    x86_cpu_enable_simd = x86_cpu_has_sse2 &&
-                          x86_cpu_has_sse42 &&
-                          x86_cpu_has_pclmulqdq;
-    return TRUE;
-}
-#endif  /* _MSC_VER */
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/x86.h b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/x86.h
deleted file mode 100644
index ebcf10ab0..000000000
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/x86.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* x86.h -- check for x86 CPU features
-* Copyright (C) 2013 Intel Corporation Jim Kukunas
-* For conditions of distribution and use, see copyright notice in zlib.h
-*/
-
-#ifndef X86_H
-#define X86_H
-
-#include "zlib.h"
-
-extern int x86_cpu_enable_simd;
-
-void x86_check_features(void);
-
-#endif  /* X86_H */
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/zconf.h b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/zconf.h
index a7a815f57..55fe101da 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/zconf.h
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/zconf.h
@@ -8,8 +8,17 @@
 #ifndef ZCONF_H
 #define ZCONF_H
 
-/* This include does prefixing as below, but with an updated set of names */
-#include "names.h"
+/*
+ * This library is also built as a part of AOSP, which does not need to include
+ * chromeconf.h. This config does not want chromeconf.h, so it can set this
+ * macro to opt out. While this works today, there's no guarantee that building
+ * zlib outside of Chromium keeps working in the future.
+ */
+#if !defined(CHROMIUM_ZLIB_NO_CHROMECONF)
+/* This include does prefixing as below, but with an updated set of names.  Also
+ * sets up export macros in component builds. */
+#include "chromeconf.h"
+#endif
 
 /*
  * If you *really* need a unique prefix for all types and library functions,
@@ -41,6 +50,9 @@
 #  define crc32                 z_crc32
 #  define crc32_combine         z_crc32_combine
 #  define crc32_combine64       z_crc32_combine64
+#  define crc32_combine_gen     z_crc32_combine_gen
+#  define crc32_combine_gen64   z_crc32_combine_gen64
+#  define crc32_combine_op      z_crc32_combine_op
 #  define crc32_z               z_crc32_z
 #  define deflate               z_deflate
 #  define deflateBound          z_deflateBound
@@ -241,7 +253,11 @@
 #endif
 
 #ifdef Z_SOLO
-   typedef unsigned long z_size_t;
+#  ifdef _WIN64
+     typedef unsigned long long z_size_t;
+#  else
+     typedef unsigned long z_size_t;
+#  endif
 #else
 #  define z_longlong long long
 #  if defined(NO_SIZE_T)
@@ -352,6 +368,9 @@
 #    ifdef FAR
 #      undef FAR
 #    endif
+#    ifndef WIN32_LEAN_AND_MEAN
+#      define WIN32_LEAN_AND_MEAN
+#    endif
 #    include <windows.h>
      /* No need for _export, use ZLIB.DEF instead. */
      /* For complete Windows compatibility, use WINAPI, not __stdcall. */
@@ -389,6 +408,9 @@
 #ifndef FAR
 #  define FAR
 #endif
+#ifndef far
+#  define far
+#endif
 
 #if !defined(__MACTYPES__)
 typedef unsigned char  Byte;  /* 8 bits */
@@ -470,11 +492,18 @@ typedef uLong FAR uLongf;
 #  undef _LARGEFILE64_SOURCE
 #endif
 
-#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
-#  define Z_HAVE_UNISTD_H
+#ifndef Z_HAVE_UNISTD_H
+#  ifdef __WATCOMC__
+#    define Z_HAVE_UNISTD_H
+#  endif
+#endif
+#ifndef Z_HAVE_UNISTD_H
+#  if defined(_LARGEFILE64_SOURCE) && !defined(_WIN32)
+#    define Z_HAVE_UNISTD_H
+#  endif
 #endif
 #ifndef Z_SOLO
-#  if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
+#  if defined(Z_HAVE_UNISTD_H)
 #    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
 #    ifdef VMS
 #      include <unixio.h>       /* for off_t */
@@ -510,7 +539,7 @@ typedef uLong FAR uLongf;
 #if !defined(_WIN32) && defined(Z_LARGE64)
 #  define z_off64_t off64_t
 #else
-#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
+#  if defined(_WIN32) && !defined(__GNUC__)
 #    define z_off64_t __int64
 #  else
 #    define z_off64_t z_off_t
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/zconf.h.cmakein b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/zconf.h.cmakein
new file mode 100644
index 000000000..310c43928
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/zconf.h.cmakein
@@ -0,0 +1,553 @@
+/* zconf.h -- configuration of the zlib compression library
+ * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#ifndef ZCONF_H
+#define ZCONF_H
+#cmakedefine Z_PREFIX
+#cmakedefine Z_HAVE_UNISTD_H
+
+/*
+ * If you *really* need a unique prefix for all types and library functions,
+ * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
+ * Even better than compiling with -DZ_PREFIX would be to use configure to set
+ * this permanently in zconf.h using "./configure --zprefix".
+ */
+#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
+#  define Z_PREFIX_SET
+
+/* all linked symbols and init macros */
+#  define _dist_code            z__dist_code
+#  define _length_code          z__length_code
+#  define _tr_align             z__tr_align
+#  define _tr_flush_bits        z__tr_flush_bits
+#  define _tr_flush_block       z__tr_flush_block
+#  define _tr_init              z__tr_init
+#  define _tr_stored_block      z__tr_stored_block
+#  define _tr_tally             z__tr_tally
+#  define adler32               z_adler32
+#  define adler32_combine       z_adler32_combine
+#  define adler32_combine64     z_adler32_combine64
+#  define adler32_z             z_adler32_z
+#  ifndef Z_SOLO
+#    define compress              z_compress
+#    define compress2             z_compress2
+#    define compressBound         z_compressBound
+#  endif
+#  define crc32                 z_crc32
+#  define crc32_combine         z_crc32_combine
+#  define crc32_combine64       z_crc32_combine64
+#  define crc32_combine_gen     z_crc32_combine_gen
+#  define crc32_combine_gen64   z_crc32_combine_gen64
+#  define crc32_combine_op      z_crc32_combine_op
+#  define crc32_z               z_crc32_z
+#  define deflate               z_deflate
+#  define deflateBound          z_deflateBound
+#  define deflateCopy           z_deflateCopy
+#  define deflateEnd            z_deflateEnd
+#  define deflateGetDictionary  z_deflateGetDictionary
+#  define deflateInit           z_deflateInit
+#  define deflateInit2          z_deflateInit2
+#  define deflateInit2_         z_deflateInit2_
+#  define deflateInit_          z_deflateInit_
+#  define deflateParams         z_deflateParams
+#  define deflatePending        z_deflatePending
+#  define deflatePrime          z_deflatePrime
+#  define deflateReset          z_deflateReset
+#  define deflateResetKeep      z_deflateResetKeep
+#  define deflateSetDictionary  z_deflateSetDictionary
+#  define deflateSetHeader      z_deflateSetHeader
+#  define deflateTune           z_deflateTune
+#  define deflate_copyright     z_deflate_copyright
+#  define get_crc_table         z_get_crc_table
+#  ifndef Z_SOLO
+#    define gz_error              z_gz_error
+#    define gz_intmax             z_gz_intmax
+#    define gz_strwinerror        z_gz_strwinerror
+#    define gzbuffer              z_gzbuffer
+#    define gzclearerr            z_gzclearerr
+#    define gzclose               z_gzclose
+#    define gzclose_r             z_gzclose_r
+#    define gzclose_w             z_gzclose_w
+#    define gzdirect              z_gzdirect
+#    define gzdopen               z_gzdopen
+#    define gzeof                 z_gzeof
+#    define gzerror               z_gzerror
+#    define gzflush               z_gzflush
+#    define gzfread               z_gzfread
+#    define gzfwrite              z_gzfwrite
+#    define gzgetc                z_gzgetc
+#    define gzgetc_               z_gzgetc_
+#    define gzgets                z_gzgets
+#    define gzoffset              z_gzoffset
+#    define gzoffset64            z_gzoffset64
+#    define gzopen                z_gzopen
+#    define gzopen64              z_gzopen64
+#    ifdef _WIN32
+#      define gzopen_w              z_gzopen_w
+#    endif
+#    define gzprintf              z_gzprintf
+#    define gzputc                z_gzputc
+#    define gzputs                z_gzputs
+#    define gzread                z_gzread
+#    define gzrewind              z_gzrewind
+#    define gzseek                z_gzseek
+#    define gzseek64              z_gzseek64
+#    define gzsetparams           z_gzsetparams
+#    define gztell                z_gztell
+#    define gztell64              z_gztell64
+#    define gzungetc              z_gzungetc
+#    define gzvprintf             z_gzvprintf
+#    define gzwrite               z_gzwrite
+#  endif
+#  define inflate               z_inflate
+#  define inflateBack           z_inflateBack
+#  define inflateBackEnd        z_inflateBackEnd
+#  define inflateBackInit       z_inflateBackInit
+#  define inflateBackInit_      z_inflateBackInit_
+#  define inflateCodesUsed      z_inflateCodesUsed
+#  define inflateCopy           z_inflateCopy
+#  define inflateEnd            z_inflateEnd
+#  define inflateGetDictionary  z_inflateGetDictionary
+#  define inflateGetHeader      z_inflateGetHeader
+#  define inflateInit           z_inflateInit
+#  define inflateInit2          z_inflateInit2
+#  define inflateInit2_         z_inflateInit2_
+#  define inflateInit_          z_inflateInit_
+#  define inflateMark           z_inflateMark
+#  define inflatePrime          z_inflatePrime
+#  define inflateReset          z_inflateReset
+#  define inflateReset2         z_inflateReset2
+#  define inflateResetKeep      z_inflateResetKeep
+#  define inflateSetDictionary  z_inflateSetDictionary
+#  define inflateSync           z_inflateSync
+#  define inflateSyncPoint      z_inflateSyncPoint
+#  define inflateUndermine      z_inflateUndermine
+#  define inflateValidate       z_inflateValidate
+#  define inflate_copyright     z_inflate_copyright
+#  define inflate_fast          z_inflate_fast
+#  define inflate_table         z_inflate_table
+#  ifndef Z_SOLO
+#    define uncompress            z_uncompress
+#    define uncompress2           z_uncompress2
+#  endif
+#  define zError                z_zError
+#  ifndef Z_SOLO
+#    define zcalloc               z_zcalloc
+#    define zcfree                z_zcfree
+#  endif
+#  define zlibCompileFlags      z_zlibCompileFlags
+#  define zlibVersion           z_zlibVersion
+
+/* all zlib typedefs in zlib.h and zconf.h */
+#  define Byte                  z_Byte
+#  define Bytef                 z_Bytef
+#  define alloc_func            z_alloc_func
+#  define charf                 z_charf
+#  define free_func             z_free_func
+#  ifndef Z_SOLO
+#    define gzFile                z_gzFile
+#  endif
+#  define gz_header             z_gz_header
+#  define gz_headerp            z_gz_headerp
+#  define in_func               z_in_func
+#  define intf                  z_intf
+#  define out_func              z_out_func
+#  define uInt                  z_uInt
+#  define uIntf                 z_uIntf
+#  define uLong                 z_uLong
+#  define uLongf                z_uLongf
+#  define voidp                 z_voidp
+#  define voidpc                z_voidpc
+#  define voidpf                z_voidpf
+
+/* all zlib structs in zlib.h and zconf.h */
+#  define gz_header_s           z_gz_header_s
+#  define internal_state        z_internal_state
+
+#endif
+
+#if defined(__MSDOS__) && !defined(MSDOS)
+#  define MSDOS
+#endif
+#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
+#  define OS2
+#endif
+#if defined(_WINDOWS) && !defined(WINDOWS)
+#  define WINDOWS
+#endif
+#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
+#  ifndef WIN32
+#    define WIN32
+#  endif
+#endif
+#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
+#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
+#    ifndef SYS16BIT
+#      define SYS16BIT
+#    endif
+#  endif
+#endif
+
+/*
+ * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
+ * than 64k bytes at a time (needed on systems with 16-bit int).
+ */
+#ifdef SYS16BIT
+#  define MAXSEG_64K
+#endif
+#ifdef MSDOS
+#  define UNALIGNED_OK
+#endif
+
+#ifdef __STDC_VERSION__
+#  ifndef STDC
+#    define STDC
+#  endif
+#  if __STDC_VERSION__ >= 199901L
+#    ifndef STDC99
+#      define STDC99
+#    endif
+#  endif
+#endif
+#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
+#  define STDC
+#endif
+
+#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
+#  define STDC
+#endif
+
+#ifndef STDC
+#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
+#    define const       /* note: need a more gentle solution here */
+#  endif
+#endif
+
+#if defined(ZLIB_CONST) && !defined(z_const)
+#  define z_const const
+#else
+#  define z_const
+#endif
+
+#ifdef Z_SOLO
+#  ifdef _WIN64
+     typedef unsigned long long z_size_t;
+#  else
+     typedef unsigned long z_size_t;
+#  endif
+#else
+#  define z_longlong long long
+#  if defined(NO_SIZE_T)
+     typedef unsigned NO_SIZE_T z_size_t;
+#  elif defined(STDC)
+#    include <stddef.h>
+     typedef size_t z_size_t;
+#  else
+     typedef unsigned long z_size_t;
+#  endif
+#  undef z_longlong
+#endif
+
+/* Maximum value for memLevel in deflateInit2 */
+#ifndef MAX_MEM_LEVEL
+#  ifdef MAXSEG_64K
+#    define MAX_MEM_LEVEL 8
+#  else
+#    define MAX_MEM_LEVEL 9
+#  endif
+#endif
+
+/* Maximum value for windowBits in deflateInit2 and inflateInit2.
+ * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
+ * created by gzip. (Files created by minigzip can still be extracted by
+ * gzip.)
+ */
+#ifndef MAX_WBITS
+#  define MAX_WBITS   15 /* 32K LZ77 window */
+#endif
+
+/* The memory requirements for deflate are (in bytes):
+            (1 << (windowBits+2)) +  (1 << (memLevel+9))
+ that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
+ plus a few kilobytes for small objects. For example, if you want to reduce
+ the default memory requirements from 256K to 128K, compile with
+     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
+ Of course this will generally degrade compression (there's no free lunch).
+
+   The memory requirements for inflate are (in bytes) 1 << windowBits
+ that is, 32K for windowBits=15 (default value) plus about 7 kilobytes
+ for small objects.
+*/
+
+                        /* Type declarations */
+
+#ifndef OF /* function prototypes */
+#  ifdef STDC
+#    define OF(args)  args
+#  else
+#    define OF(args)  ()
+#  endif
+#endif
+
+#ifndef Z_ARG /* function prototypes for stdarg */
+#  if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#    define Z_ARG(args)  args
+#  else
+#    define Z_ARG(args)  ()
+#  endif
+#endif
+
+/* The following definitions for FAR are needed only for MSDOS mixed
+ * model programming (small or medium model with some far allocations).
+ * This was tested only with MSC; for other MSDOS compilers you may have
+ * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
+ * just define FAR to be empty.
+ */
+#ifdef SYS16BIT
+#  if defined(M_I86SM) || defined(M_I86MM)
+     /* MSC small or medium model */
+#    define SMALL_MEDIUM
+#    ifdef _MSC_VER
+#      define FAR _far
+#    else
+#      define FAR far
+#    endif
+#  endif
+#  if (defined(__SMALL__) || defined(__MEDIUM__))
+     /* Turbo C small or medium model */
+#    define SMALL_MEDIUM
+#    ifdef __BORLANDC__
+#      define FAR _far
+#    else
+#      define FAR far
+#    endif
+#  endif
+#endif
+
+#if defined(WINDOWS) || defined(WIN32)
+   /* If building or using zlib as a DLL, define ZLIB_DLL.
+    * This is not mandatory, but it offers a little performance increase.
+    */
+#  ifdef ZLIB_DLL
+#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
+#      ifdef ZLIB_INTERNAL
+#        define ZEXTERN extern __declspec(dllexport)
+#      else
+#        define ZEXTERN extern __declspec(dllimport)
+#      endif
+#    endif
+#  endif  /* ZLIB_DLL */
+   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
+    * define ZLIB_WINAPI.
+    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
+    */
+#  ifdef ZLIB_WINAPI
+#    ifdef FAR
+#      undef FAR
+#    endif
+#    ifndef WIN32_LEAN_AND_MEAN
+#      define WIN32_LEAN_AND_MEAN
+#    endif
+#    include <windows.h>
+     /* No need for _export, use ZLIB.DEF instead. */
+     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
+#    define ZEXPORT WINAPI
+#    ifdef WIN32
+#      define ZEXPORTVA WINAPIV
+#    else
+#      define ZEXPORTVA FAR CDECL
+#    endif
+#  endif
+#endif
+
+#if defined (__BEOS__)
+#  ifdef ZLIB_DLL
+#    ifdef ZLIB_INTERNAL
+#      define ZEXPORT   __declspec(dllexport)
+#      define ZEXPORTVA __declspec(dllexport)
+#    else
+#      define ZEXPORT   __declspec(dllimport)
+#      define ZEXPORTVA __declspec(dllimport)
+#    endif
+#  endif
+#endif
+
+#ifndef ZEXTERN
+#  define ZEXTERN extern
+#endif
+#ifndef ZEXPORT
+#  define ZEXPORT
+#endif
+#ifndef ZEXPORTVA
+#  define ZEXPORTVA
+#endif
+
+#ifndef FAR
+#  define FAR
+#endif
+
+#if !defined(__MACTYPES__)
+typedef unsigned char  Byte;  /* 8 bits */
+#endif
+typedef unsigned int   uInt;  /* 16 bits or more */
+typedef unsigned long  uLong; /* 32 bits or more */
+
+#ifdef SMALL_MEDIUM
+   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
+#  define Bytef Byte FAR
+#else
+   typedef Byte  FAR Bytef;
+#endif
+typedef char  FAR charf;
+typedef int   FAR intf;
+typedef uInt  FAR uIntf;
+typedef uLong FAR uLongf;
+
+#ifdef STDC
+   typedef void const *voidpc;
+   typedef void FAR   *voidpf;
+   typedef void       *voidp;
+#else
+   typedef Byte const *voidpc;
+   typedef Byte FAR   *voidpf;
+   typedef Byte       *voidp;
+#endif
+
+#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
+#  include <limits.h>
+#  if (UINT_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned
+#  elif (ULONG_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned long
+#  elif (USHRT_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned short
+#  endif
+#endif
+
+#ifdef Z_U4
+   typedef Z_U4 z_crc_t;
+#else
+   typedef unsigned long z_crc_t;
+#endif
+
+#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
+#  define Z_HAVE_UNISTD_H
+#endif
+
+#ifdef HAVE_STDARG_H    /* may be set to #if 1 by ./configure */
+#  define Z_HAVE_STDARG_H
+#endif
+
+#ifdef STDC
+#  ifndef Z_SOLO
+#    include <sys/types.h>      /* for off_t */
+#  endif
+#endif
+
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#  ifndef Z_SOLO
+#    include <stdarg.h>         /* for va_list */
+#  endif
+#endif
+
+#ifdef _WIN32
+#  ifndef Z_SOLO
+#    include <stddef.h>         /* for wchar_t */
+#  endif
+#endif
+
+/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
+ * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
+ * though the former does not conform to the LFS document), but considering
+ * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
+ * equivalently requesting no 64-bit operations
+ */
+#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
+#  undef _LARGEFILE64_SOURCE
+#endif
+
+#ifndef Z_HAVE_UNISTD_H
+#  ifdef __WATCOMC__
+#    define Z_HAVE_UNISTD_H
+#  endif
+#endif
+#ifndef Z_HAVE_UNISTD_H
+#  if defined(_LARGEFILE64_SOURCE) && !defined(_WIN32)
+#    define Z_HAVE_UNISTD_H
+#  endif
+#endif
+#ifndef Z_SOLO
+#  if defined(Z_HAVE_UNISTD_H)
+#    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
+#    ifdef VMS
+#      include <unixio.h>       /* for off_t */
+#    endif
+#    ifndef z_off_t
+#      define z_off_t off_t
+#    endif
+#  endif
+#endif
+
+#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
+#  define Z_LFS64
+#endif
+
+#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
+#  define Z_LARGE64
+#endif
+
+#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
+#  define Z_WANT64
+#endif
+
+#if !defined(SEEK_SET) && !defined(Z_SOLO)
+#  define SEEK_SET        0       /* Seek from beginning of file.  */
+#  define SEEK_CUR        1       /* Seek from current position.  */
+#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
+#endif
+
+#ifndef z_off_t
+#  define z_off_t long
+#endif
+
+#if !defined(_WIN32) && defined(Z_LARGE64)
+#  define z_off64_t off64_t
+#else
+#  if defined(_WIN32) && !defined(__GNUC__)
+#    define z_off64_t __int64
+#  else
+#    define z_off64_t z_off_t
+#  endif
+#endif
+
+/* MVS linker does not support external names larger than 8 bytes */
+#if defined(__MVS__)
+  #pragma map(deflateInit_,"DEIN")
+  #pragma map(deflateInit2_,"DEIN2")
+  #pragma map(deflateEnd,"DEEND")
+  #pragma map(deflateBound,"DEBND")
+  #pragma map(inflateInit_,"ININ")
+  #pragma map(inflateInit2_,"ININ2")
+  #pragma map(inflateEnd,"INEND")
+  #pragma map(inflateSync,"INSY")
+  #pragma map(inflateSetDictionary,"INSEDI")
+  #pragma map(compressBound,"CMBND")
+  #pragma map(inflate_table,"INTABL")
+  #pragma map(inflate_fast,"INFA")
+  #pragma map(inflate_copyright,"INCOPY")
+#endif
+
+#endif /* ZCONF_H */
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/zconf.h.in b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/zconf.h.in
new file mode 100644
index 000000000..fb76ffe31
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/zconf.h.in
@@ -0,0 +1,551 @@
+/* zconf.h -- configuration of the zlib compression library
+ * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#ifndef ZCONF_H
+#define ZCONF_H
+
+/*
+ * If you *really* need a unique prefix for all types and library functions,
+ * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
+ * Even better than compiling with -DZ_PREFIX would be to use configure to set
+ * this permanently in zconf.h using "./configure --zprefix".
+ */
+#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
+#  define Z_PREFIX_SET
+
+/* all linked symbols and init macros */
+#  define _dist_code            z__dist_code
+#  define _length_code          z__length_code
+#  define _tr_align             z__tr_align
+#  define _tr_flush_bits        z__tr_flush_bits
+#  define _tr_flush_block       z__tr_flush_block
+#  define _tr_init              z__tr_init
+#  define _tr_stored_block      z__tr_stored_block
+#  define _tr_tally             z__tr_tally
+#  define adler32               z_adler32
+#  define adler32_combine       z_adler32_combine
+#  define adler32_combine64     z_adler32_combine64
+#  define adler32_z             z_adler32_z
+#  ifndef Z_SOLO
+#    define compress              z_compress
+#    define compress2             z_compress2
+#    define compressBound         z_compressBound
+#  endif
+#  define crc32                 z_crc32
+#  define crc32_combine         z_crc32_combine
+#  define crc32_combine64       z_crc32_combine64
+#  define crc32_combine_gen     z_crc32_combine_gen
+#  define crc32_combine_gen64   z_crc32_combine_gen64
+#  define crc32_combine_op      z_crc32_combine_op
+#  define crc32_z               z_crc32_z
+#  define deflate               z_deflate
+#  define deflateBound          z_deflateBound
+#  define deflateCopy           z_deflateCopy
+#  define deflateEnd            z_deflateEnd
+#  define deflateGetDictionary  z_deflateGetDictionary
+#  define deflateInit           z_deflateInit
+#  define deflateInit2          z_deflateInit2
+#  define deflateInit2_         z_deflateInit2_
+#  define deflateInit_          z_deflateInit_
+#  define deflateParams         z_deflateParams
+#  define deflatePending        z_deflatePending
+#  define deflatePrime          z_deflatePrime
+#  define deflateReset          z_deflateReset
+#  define deflateResetKeep      z_deflateResetKeep
+#  define deflateSetDictionary  z_deflateSetDictionary
+#  define deflateSetHeader      z_deflateSetHeader
+#  define deflateTune           z_deflateTune
+#  define deflate_copyright     z_deflate_copyright
+#  define get_crc_table         z_get_crc_table
+#  ifndef Z_SOLO
+#    define gz_error              z_gz_error
+#    define gz_intmax             z_gz_intmax
+#    define gz_strwinerror        z_gz_strwinerror
+#    define gzbuffer              z_gzbuffer
+#    define gzclearerr            z_gzclearerr
+#    define gzclose               z_gzclose
+#    define gzclose_r             z_gzclose_r
+#    define gzclose_w             z_gzclose_w
+#    define gzdirect              z_gzdirect
+#    define gzdopen               z_gzdopen
+#    define gzeof                 z_gzeof
+#    define gzerror               z_gzerror
+#    define gzflush               z_gzflush
+#    define gzfread               z_gzfread
+#    define gzfwrite              z_gzfwrite
+#    define gzgetc                z_gzgetc
+#    define gzgetc_               z_gzgetc_
+#    define gzgets                z_gzgets
+#    define gzoffset              z_gzoffset
+#    define gzoffset64            z_gzoffset64
+#    define gzopen                z_gzopen
+#    define gzopen64              z_gzopen64
+#    ifdef _WIN32
+#      define gzopen_w              z_gzopen_w
+#    endif
+#    define gzprintf              z_gzprintf
+#    define gzputc                z_gzputc
+#    define gzputs                z_gzputs
+#    define gzread                z_gzread
+#    define gzrewind              z_gzrewind
+#    define gzseek                z_gzseek
+#    define gzseek64              z_gzseek64
+#    define gzsetparams           z_gzsetparams
+#    define gztell                z_gztell
+#    define gztell64              z_gztell64
+#    define gzungetc              z_gzungetc
+#    define gzvprintf             z_gzvprintf
+#    define gzwrite               z_gzwrite
+#  endif
+#  define inflate               z_inflate
+#  define inflateBack           z_inflateBack
+#  define inflateBackEnd        z_inflateBackEnd
+#  define inflateBackInit       z_inflateBackInit
+#  define inflateBackInit_      z_inflateBackInit_
+#  define inflateCodesUsed      z_inflateCodesUsed
+#  define inflateCopy           z_inflateCopy
+#  define inflateEnd            z_inflateEnd
+#  define inflateGetDictionary  z_inflateGetDictionary
+#  define inflateGetHeader      z_inflateGetHeader
+#  define inflateInit           z_inflateInit
+#  define inflateInit2          z_inflateInit2
+#  define inflateInit2_         z_inflateInit2_
+#  define inflateInit_          z_inflateInit_
+#  define inflateMark           z_inflateMark
+#  define inflatePrime          z_inflatePrime
+#  define inflateReset          z_inflateReset
+#  define inflateReset2         z_inflateReset2
+#  define inflateResetKeep      z_inflateResetKeep
+#  define inflateSetDictionary  z_inflateSetDictionary
+#  define inflateSync           z_inflateSync
+#  define inflateSyncPoint      z_inflateSyncPoint
+#  define inflateUndermine      z_inflateUndermine
+#  define inflateValidate       z_inflateValidate
+#  define inflate_copyright     z_inflate_copyright
+#  define inflate_fast          z_inflate_fast
+#  define inflate_table         z_inflate_table
+#  ifndef Z_SOLO
+#    define uncompress            z_uncompress
+#    define uncompress2           z_uncompress2
+#  endif
+#  define zError                z_zError
+#  ifndef Z_SOLO
+#    define zcalloc               z_zcalloc
+#    define zcfree                z_zcfree
+#  endif
+#  define zlibCompileFlags      z_zlibCompileFlags
+#  define zlibVersion           z_zlibVersion
+
+/* all zlib typedefs in zlib.h and zconf.h */
+#  define Byte                  z_Byte
+#  define Bytef                 z_Bytef
+#  define alloc_func            z_alloc_func
+#  define charf                 z_charf
+#  define free_func             z_free_func
+#  ifndef Z_SOLO
+#    define gzFile                z_gzFile
+#  endif
+#  define gz_header             z_gz_header
+#  define gz_headerp            z_gz_headerp
+#  define in_func               z_in_func
+#  define intf                  z_intf
+#  define out_func              z_out_func
+#  define uInt                  z_uInt
+#  define uIntf                 z_uIntf
+#  define uLong                 z_uLong
+#  define uLongf                z_uLongf
+#  define voidp                 z_voidp
+#  define voidpc                z_voidpc
+#  define voidpf                z_voidpf
+
+/* all zlib structs in zlib.h and zconf.h */
+#  define gz_header_s           z_gz_header_s
+#  define internal_state        z_internal_state
+
+#endif
+
+#if defined(__MSDOS__) && !defined(MSDOS)
+#  define MSDOS
+#endif
+#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
+#  define OS2
+#endif
+#if defined(_WINDOWS) && !defined(WINDOWS)
+#  define WINDOWS
+#endif
+#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
+#  ifndef WIN32
+#    define WIN32
+#  endif
+#endif
+#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
+#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
+#    ifndef SYS16BIT
+#      define SYS16BIT
+#    endif
+#  endif
+#endif
+
+/*
+ * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
+ * than 64k bytes at a time (needed on systems with 16-bit int).
+ */
+#ifdef SYS16BIT
+#  define MAXSEG_64K
+#endif
+#ifdef MSDOS
+#  define UNALIGNED_OK
+#endif
+
+#ifdef __STDC_VERSION__
+#  ifndef STDC
+#    define STDC
+#  endif
+#  if __STDC_VERSION__ >= 199901L
+#    ifndef STDC99
+#      define STDC99
+#    endif
+#  endif
+#endif
+#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
+#  define STDC
+#endif
+
+#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
+#  define STDC
+#endif
+
+#ifndef STDC
+#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
+#    define const       /* note: need a more gentle solution here */
+#  endif
+#endif
+
+#if defined(ZLIB_CONST) && !defined(z_const)
+#  define z_const const
+#else
+#  define z_const
+#endif
+
+#ifdef Z_SOLO
+#  ifdef _WIN64
+     typedef unsigned long long z_size_t;
+#  else
+     typedef unsigned long z_size_t;
+#  endif
+#else
+#  define z_longlong long long
+#  if defined(NO_SIZE_T)
+     typedef unsigned NO_SIZE_T z_size_t;
+#  elif defined(STDC)
+#    include <stddef.h>
+     typedef size_t z_size_t;
+#  else
+     typedef unsigned long z_size_t;
+#  endif
+#  undef z_longlong
+#endif
+
+/* Maximum value for memLevel in deflateInit2 */
+#ifndef MAX_MEM_LEVEL
+#  ifdef MAXSEG_64K
+#    define MAX_MEM_LEVEL 8
+#  else
+#    define MAX_MEM_LEVEL 9
+#  endif
+#endif
+
+/* Maximum value for windowBits in deflateInit2 and inflateInit2.
+ * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
+ * created by gzip. (Files created by minigzip can still be extracted by
+ * gzip.)
+ */
+#ifndef MAX_WBITS
+#  define MAX_WBITS   15 /* 32K LZ77 window */
+#endif
+
+/* The memory requirements for deflate are (in bytes):
+            (1 << (windowBits+2)) +  (1 << (memLevel+9))
+ that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
+ plus a few kilobytes for small objects. For example, if you want to reduce
+ the default memory requirements from 256K to 128K, compile with
+     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
+ Of course this will generally degrade compression (there's no free lunch).
+
+   The memory requirements for inflate are (in bytes) 1 << windowBits
+ that is, 32K for windowBits=15 (default value) plus about 7 kilobytes
+ for small objects.
+*/
+
+                        /* Type declarations */
+
+#ifndef OF /* function prototypes */
+#  ifdef STDC
+#    define OF(args)  args
+#  else
+#    define OF(args)  ()
+#  endif
+#endif
+
+#ifndef Z_ARG /* function prototypes for stdarg */
+#  if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#    define Z_ARG(args)  args
+#  else
+#    define Z_ARG(args)  ()
+#  endif
+#endif
+
+/* The following definitions for FAR are needed only for MSDOS mixed
+ * model programming (small or medium model with some far allocations).
+ * This was tested only with MSC; for other MSDOS compilers you may have
+ * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
+ * just define FAR to be empty.
+ */
+#ifdef SYS16BIT
+#  if defined(M_I86SM) || defined(M_I86MM)
+     /* MSC small or medium model */
+#    define SMALL_MEDIUM
+#    ifdef _MSC_VER
+#      define FAR _far
+#    else
+#      define FAR far
+#    endif
+#  endif
+#  if (defined(__SMALL__) || defined(__MEDIUM__))
+     /* Turbo C small or medium model */
+#    define SMALL_MEDIUM
+#    ifdef __BORLANDC__
+#      define FAR _far
+#    else
+#      define FAR far
+#    endif
+#  endif
+#endif
+
+#if defined(WINDOWS) || defined(WIN32)
+   /* If building or using zlib as a DLL, define ZLIB_DLL.
+    * This is not mandatory, but it offers a little performance increase.
+    */
+#  ifdef ZLIB_DLL
+#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
+#      ifdef ZLIB_INTERNAL
+#        define ZEXTERN extern __declspec(dllexport)
+#      else
+#        define ZEXTERN extern __declspec(dllimport)
+#      endif
+#    endif
+#  endif  /* ZLIB_DLL */
+   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
+    * define ZLIB_WINAPI.
+    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
+    */
+#  ifdef ZLIB_WINAPI
+#    ifdef FAR
+#      undef FAR
+#    endif
+#    ifndef WIN32_LEAN_AND_MEAN
+#      define WIN32_LEAN_AND_MEAN
+#    endif
+#    include <windows.h>
+     /* No need for _export, use ZLIB.DEF instead. */
+     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
+#    define ZEXPORT WINAPI
+#    ifdef WIN32
+#      define ZEXPORTVA WINAPIV
+#    else
+#      define ZEXPORTVA FAR CDECL
+#    endif
+#  endif
+#endif
+
+#if defined (__BEOS__)
+#  ifdef ZLIB_DLL
+#    ifdef ZLIB_INTERNAL
+#      define ZEXPORT   __declspec(dllexport)
+#      define ZEXPORTVA __declspec(dllexport)
+#    else
+#      define ZEXPORT   __declspec(dllimport)
+#      define ZEXPORTVA __declspec(dllimport)
+#    endif
+#  endif
+#endif
+
+#ifndef ZEXTERN
+#  define ZEXTERN extern
+#endif
+#ifndef ZEXPORT
+#  define ZEXPORT
+#endif
+#ifndef ZEXPORTVA
+#  define ZEXPORTVA
+#endif
+
+#ifndef FAR
+#  define FAR
+#endif
+
+#if !defined(__MACTYPES__)
+typedef unsigned char  Byte;  /* 8 bits */
+#endif
+typedef unsigned int   uInt;  /* 16 bits or more */
+typedef unsigned long  uLong; /* 32 bits or more */
+
+#ifdef SMALL_MEDIUM
+   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
+#  define Bytef Byte FAR
+#else
+   typedef Byte  FAR Bytef;
+#endif
+typedef char  FAR charf;
+typedef int   FAR intf;
+typedef uInt  FAR uIntf;
+typedef uLong FAR uLongf;
+
+#ifdef STDC
+   typedef void const *voidpc;
+   typedef void FAR   *voidpf;
+   typedef void       *voidp;
+#else
+   typedef Byte const *voidpc;
+   typedef Byte FAR   *voidpf;
+   typedef Byte       *voidp;
+#endif
+
+#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
+#  include <limits.h>
+#  if (UINT_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned
+#  elif (ULONG_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned long
+#  elif (USHRT_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned short
+#  endif
+#endif
+
+#ifdef Z_U4
+   typedef Z_U4 z_crc_t;
+#else
+   typedef unsigned long z_crc_t;
+#endif
+
+#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
+#  define Z_HAVE_UNISTD_H
+#endif
+
+#ifdef HAVE_STDARG_H    /* may be set to #if 1 by ./configure */
+#  define Z_HAVE_STDARG_H
+#endif
+
+#ifdef STDC
+#  ifndef Z_SOLO
+#    include <sys/types.h>      /* for off_t */
+#  endif
+#endif
+
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#  ifndef Z_SOLO
+#    include <stdarg.h>         /* for va_list */
+#  endif
+#endif
+
+#ifdef _WIN32
+#  ifndef Z_SOLO
+#    include <stddef.h>         /* for wchar_t */
+#  endif
+#endif
+
+/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
+ * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
+ * though the former does not conform to the LFS document), but considering
+ * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
+ * equivalently requesting no 64-bit operations
+ */
+#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
+#  undef _LARGEFILE64_SOURCE
+#endif
+
+#ifndef Z_HAVE_UNISTD_H
+#  ifdef __WATCOMC__
+#    define Z_HAVE_UNISTD_H
+#  endif
+#endif
+#ifndef Z_HAVE_UNISTD_H
+#  if defined(_LARGEFILE64_SOURCE) && !defined(_WIN32)
+#    define Z_HAVE_UNISTD_H
+#  endif
+#endif
+#ifndef Z_SOLO
+#  if defined(Z_HAVE_UNISTD_H)
+#    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
+#    ifdef VMS
+#      include <unixio.h>       /* for off_t */
+#    endif
+#    ifndef z_off_t
+#      define z_off_t off_t
+#    endif
+#  endif
+#endif
+
+#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
+#  define Z_LFS64
+#endif
+
+#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
+#  define Z_LARGE64
+#endif
+
+#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
+#  define Z_WANT64
+#endif
+
+#if !defined(SEEK_SET) && !defined(Z_SOLO)
+#  define SEEK_SET        0       /* Seek from beginning of file.  */
+#  define SEEK_CUR        1       /* Seek from current position.  */
+#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
+#endif
+
+#ifndef z_off_t
+#  define z_off_t long
+#endif
+
+#if !defined(_WIN32) && defined(Z_LARGE64)
+#  define z_off64_t off64_t
+#else
+#  if defined(_WIN32) && !defined(__GNUC__)
+#    define z_off64_t __int64
+#  else
+#    define z_off64_t z_off_t
+#  endif
+#endif
+
+/* MVS linker does not support external names larger than 8 bytes */
+#if defined(__MVS__)
+  #pragma map(deflateInit_,"DEIN")
+  #pragma map(deflateInit2_,"DEIN2")
+  #pragma map(deflateEnd,"DEEND")
+  #pragma map(deflateBound,"DEBND")
+  #pragma map(inflateInit_,"ININ")
+  #pragma map(inflateInit2_,"ININ2")
+  #pragma map(inflateEnd,"INEND")
+  #pragma map(inflateSync,"INSY")
+  #pragma map(inflateSetDictionary,"INSEDI")
+  #pragma map(compressBound,"CMBND")
+  #pragma map(inflate_table,"INTABL")
+  #pragma map(inflate_fast,"INFA")
+  #pragma map(inflate_copyright,"INCOPY")
+#endif
+
+#endif /* ZCONF_H */
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/zlib.3 b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/zlib.3
new file mode 100644
index 000000000..e733b5ab6
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/zlib.3
@@ -0,0 +1,149 @@
+.TH ZLIB 3 "xx Oct 2022"
+.SH NAME
+zlib \- compression/decompression library
+.SH SYNOPSIS
+[see
+.I zlib.h
+for full description]
+.SH DESCRIPTION
+The
+.I zlib
+library is a general purpose data compression library.
+The code is thread safe, assuming that the standard library functions
+used are thread safe, such as memory allocation routines.
+It provides in-memory compression and decompression functions,
+including integrity checks of the uncompressed data.
+This version of the library supports only one compression method (deflation)
+but other algorithms may be added later
+with the same stream interface.
+.LP
+Compression can be done in a single step if the buffers are large enough
+or can be done by repeated calls of the compression function.
+In the latter case,
+the application must provide more input and/or consume the output
+(providing more output space) before each call.
+.LP
+The library also supports reading and writing files in
+.IR gzip (1)
+(.gz) format
+with an interface similar to that of stdio.
+.LP
+The library does not install any signal handler.
+The decoder checks the consistency of the compressed data,
+so the library should never crash even in the case of corrupted input.
+.LP
+All functions of the compression library are documented in the file
+.IR zlib.h .
+The distribution source includes examples of use of the library
+in the files
+.I test/example.c
+and
+.IR test/minigzip.c,
+as well as other examples in the
+.IR examples/
+directory.
+.LP
+Changes to this version are documented in the file
+.I ChangeLog
+that accompanies the source.
+.LP
+.I zlib
+is built in to many languages and operating systems, including but not limited to
+Java, Python, .NET, PHP, Perl, Ruby, Swift, and Go.
+.LP
+An experimental package to read and write files in the .zip format,
+written on top of
+.I zlib
+by Gilles Vollant (info@winimage.com),
+is available at:
+.IP
+http://www.winimage.com/zLibDll/minizip.html
+and also in the
+.I contrib/minizip
+directory of the main
+.I zlib
+source distribution.
+.SH "SEE ALSO"
+The
+.I zlib
+web site can be found at:
+.IP
+http://zlib.net/
+.LP
+The data format used by the
+.I zlib
+library is described by RFC
+(Request for Comments) 1950 to 1952 in the files:
+.IP
+http://tools.ietf.org/html/rfc1950 (for the zlib header and trailer format)
+.br
+http://tools.ietf.org/html/rfc1951 (for the deflate compressed data format)
+.br
+http://tools.ietf.org/html/rfc1952 (for the gzip header and trailer format)
+.LP
+Mark Nelson wrote an article about
+.I zlib
+for the Jan. 1997 issue of  Dr. Dobb's Journal;
+a copy of the article is available at:
+.IP
+http://marknelson.us/1997/01/01/zlib-engine/
+.SH "REPORTING PROBLEMS"
+Before reporting a problem,
+please check the
+.I zlib
+web site to verify that you have the latest version of
+.IR zlib ;
+otherwise,
+obtain the latest version and see if the problem still exists.
+Please read the
+.I zlib
+FAQ at:
+.IP
+http://zlib.net/zlib_faq.html
+.LP
+before asking for help.
+Send questions and/or comments to zlib@gzip.org,
+or (for the Windows DLL version) to Gilles Vollant (info@winimage.com).
+.SH AUTHORS AND LICENSE
+Version 1.2.13.1
+.LP
+Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
+.LP
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+.LP
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+.LP
+.nr step 1 1
+.IP \n[step]. 3
+The origin of this software must not be misrepresented; you must not
+claim that you wrote the original software. If you use this software
+in a product, an acknowledgment in the product documentation would be
+appreciated but is not required.
+.IP \n+[step].
+Altered source versions must be plainly marked as such, and must not be
+misrepresented as being the original software.
+.IP \n+[step].
+This notice may not be removed or altered from any source distribution.
+.LP
+Jean-loup Gailly        Mark Adler
+.br
+jloup@gzip.org          madler@alumni.caltech.edu
+.LP
+The deflate format used by
+.I zlib
+was defined by Phil Katz.
+The deflate and
+.I zlib
+specifications were written by L. Peter Deutsch.
+Thanks to all the people who reported problems and suggested various
+improvements in
+.IR zlib ;
+who are too numerous to cite here.
+.LP
+UNIX manual page by R. P. C. Rodgers,
+U.S. National Library of Medicine (rodgers@nlm.nih.gov).
+.\" end of man page
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/zlib.h b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/zlib.h
index 99fd467f6..014331fc8 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/zlib.h
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/zlib.h
@@ -1,7 +1,7 @@
 /* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.11, January 15th, 2017
+  version 1.2.13.1, October xxth, 2022
 
-  Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
+  Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -37,12 +37,12 @@
 extern "C" {
 #endif
 
-#define ZLIB_VERSION "1.2.11"
-#define ZLIB_VERNUM 0x12b0
+#define ZLIB_VERSION "1.2.13.1-motley"
+#define ZLIB_VERNUM 0x12d1
 #define ZLIB_VER_MAJOR 1
 #define ZLIB_VER_MINOR 2
-#define ZLIB_VER_REVISION 11
-#define ZLIB_VER_SUBREVISION 0
+#define ZLIB_VER_REVISION 13
+#define ZLIB_VER_SUBREVISION 1
 
 /*
     The 'zlib' compression library provides in-memory compression and
@@ -78,8 +78,8 @@ extern "C" {
   even in the case of corrupted input.
 */
 
-typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
-typedef void   (*free_func)  OF((voidpf opaque, voidpf address));
+typedef voidpf (*alloc_func)(voidpf opaque, uInt items, uInt size);
+typedef void   (*free_func)(voidpf opaque, voidpf address);
 
 struct internal_state;
 
@@ -217,7 +217,7 @@ typedef gz_header FAR *gz_headerp;
 
                         /* basic functions */
 
-ZEXTERN const char * ZEXPORT zlibVersion OF((void));
+ZEXTERN const char * ZEXPORT zlibVersion(void);
 /* The application can compare zlibVersion and ZLIB_VERSION for consistency.
    If the first character differs, the library code actually used is not
    compatible with the zlib.h header file used by the application.  This check
@@ -225,7 +225,7 @@ ZEXTERN const char * ZEXPORT zlibVersion OF((void));
  */
 
 /*
-ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
+ZEXTERN int ZEXPORT deflateInit(z_streamp strm, int level);
 
      Initializes the internal stream state for compression.  The fields
    zalloc, zfree and opaque must be initialized before by the caller.  If
@@ -247,7 +247,7 @@ ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
 */
 
 
-ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
+ZEXTERN int ZEXPORT deflate(z_streamp strm, int flush);
 /*
     deflate compresses as much data as possible, and stops when the input
   buffer becomes empty or the output buffer becomes full.  It may introduce
@@ -276,7 +276,7 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
   == 0), or after each call of deflate().  If deflate returns Z_OK and with
   zero avail_out, it must be called again after making room in the output
   buffer because there might be more output pending. See deflatePending(),
-  which can be used if desired to determine whether or not there is more ouput
+  which can be used if desired to determine whether or not there is more output
   in that case.
 
     Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
@@ -359,8 +359,7 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
   continue compressing.
 */
 
-
-ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
+ZEXTERN int ZEXPORT deflateEnd(z_streamp strm);
 /*
      All dynamically allocated data structures for this stream are freed.
    This function discards any unprocessed input and does not flush any pending
@@ -375,7 +374,7 @@ ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
 
 
 /*
-ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
+ZEXTERN int ZEXPORT inflateInit(z_streamp strm);
 
      Initializes the internal stream state for decompression.  The fields
    next_in, avail_in, zalloc, zfree and opaque must be initialized before by
@@ -397,7 +396,7 @@ ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
 */
 
 
-ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
+ZEXTERN int ZEXPORT inflate(z_streamp strm, int flush);
 /*
     inflate decompresses as much data as possible, and stops when the input
   buffer becomes empty or the output buffer becomes full.  It may introduce
@@ -517,7 +516,7 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
 */
 
 
-ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
+ZEXTERN int ZEXPORT inflateEnd(z_streamp strm);
 /*
      All dynamically allocated data structures for this stream are freed.
    This function discards any unprocessed input and does not flush any pending
@@ -535,16 +534,15 @@ ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
 */
 
 /*
-ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
-                                     int  level,
-                                     int  method,
-                                     int  windowBits,
-                                     int  memLevel,
-                                     int  strategy));
+ZEXTERN int ZEXPORT deflateInit2(z_streamp strm,
+                                 int level,
+                                 int method,
+                                 int windowBits,
+                                 int memLevel,
+                                 int strategy);
 
      This is another version of deflateInit with more compression options.  The
-   fields next_in, zalloc, zfree and opaque must be initialized before by the
-   caller.
+   fields zalloc, zfree and opaque must be initialized before by the caller.
 
      The method parameter is the compression method.  It must be Z_DEFLATED in
    this version of the library.
@@ -608,9 +606,9 @@ ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
    compression: this will be done by deflate().
 */
 
-ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength));
+ZEXTERN int ZEXPORT deflateSetDictionary(z_streamp strm,
+                                         const Bytef *dictionary,
+                                         uInt  dictLength);
 /*
      Initializes the compression dictionary from the given byte sequence
    without producing any compressed output.  When using the zlib format, this
@@ -652,16 +650,16 @@ ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
    not perform any compression: this will be done by deflate().
 */
 
-ZEXTERN int ZEXPORT deflateGetDictionary OF((z_streamp strm,
-                                             Bytef *dictionary,
-                                             uInt  *dictLength));
+ZEXTERN int ZEXPORT deflateGetDictionary(z_streamp strm,
+                                         Bytef *dictionary,
+                                         uInt  *dictLength);
 /*
      Returns the sliding dictionary being maintained by deflate.  dictLength is
    set to the number of bytes in the dictionary, and that many bytes are copied
    to dictionary.  dictionary must have enough space, where 32768 bytes is
    always enough.  If deflateGetDictionary() is called with dictionary equal to
    Z_NULL, then only the dictionary length is returned, and nothing is copied.
-   Similary, if dictLength is Z_NULL, then it is not set.
+   Similarly, if dictLength is Z_NULL, then it is not set.
 
      deflateGetDictionary() may return a length less than the window size, even
    when more than the window size in input has been provided. It may return up
@@ -674,8 +672,8 @@ ZEXTERN int ZEXPORT deflateGetDictionary OF((z_streamp strm,
    stream state is inconsistent.
 */
 
-ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
-                                    z_streamp source));
+ZEXTERN int ZEXPORT deflateCopy(z_streamp dest,
+                                z_streamp source);
 /*
      Sets the destination stream as a complete copy of the source stream.
 
@@ -692,7 +690,7 @@ ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
    destination.
 */
 
-ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
+ZEXTERN int ZEXPORT deflateReset(z_streamp strm);
 /*
      This function is equivalent to deflateEnd followed by deflateInit, but
    does not free and reallocate the internal compression state.  The stream
@@ -703,20 +701,21 @@ ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
    stream state was inconsistent (such as zalloc or state being Z_NULL).
 */
 
-ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
-                                      int level,
-                                      int strategy));
+ZEXTERN int ZEXPORT deflateParams(z_streamp strm,
+                                  int level,
+                                  int strategy);
 /*
      Dynamically update the compression level and compression strategy.  The
    interpretation of level and strategy is as in deflateInit2().  This can be
    used to switch between compression and straight copy of the input data, or
    to switch to a different kind of input data requiring a different strategy.
    If the compression approach (which is a function of the level) or the
-   strategy is changed, and if any input has been consumed in a previous
-   deflate() call, then the input available so far is compressed with the old
-   level and strategy using deflate(strm, Z_BLOCK).  There are three approaches
-   for the compression levels 0, 1..3, and 4..9 respectively.  The new level
-   and strategy will take effect at the next call of deflate().
+   strategy is changed, and if there have been any deflate() calls since the
+   state was initialized or reset, then the input available so far is
+   compressed with the old level and strategy using deflate(strm, Z_BLOCK).
+   There are three approaches for the compression levels 0, 1..3, and 4..9
+   respectively.  The new level and strategy will take effect at the next call
+   of deflate().
 
      If a deflate(strm, Z_BLOCK) is performed by deflateParams(), and it does
    not have enough output space to complete, then the parameter change will not
@@ -729,7 +728,7 @@ ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
    Then no more input data should be provided before the deflateParams() call.
    If this is done, the old level and strategy will be applied to the data
    compressed before deflateParams(), and the new level and strategy will be
-   applied to the the data compressed after deflateParams().
+   applied to the data compressed after deflateParams().
 
      deflateParams returns Z_OK on success, Z_STREAM_ERROR if the source stream
    state was inconsistent or if a parameter was invalid, or Z_BUF_ERROR if
@@ -740,11 +739,11 @@ ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
    retried with more output space.
 */
 
-ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
-                                    int good_length,
-                                    int max_lazy,
-                                    int nice_length,
-                                    int max_chain));
+ZEXTERN int ZEXPORT deflateTune(z_streamp strm,
+                                int good_length,
+                                int max_lazy,
+                                int nice_length,
+                                int max_chain);
 /*
      Fine tune deflate's internal compression parameters.  This should only be
    used by someone who understands the algorithm used by zlib's deflate for
@@ -757,8 +756,8 @@ ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
    returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.
  */
 
-ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
-                                       uLong sourceLen));
+ZEXTERN uLong ZEXPORT deflateBound(z_streamp strm,
+                                   uLong sourceLen);
 /*
      deflateBound() returns an upper bound on the compressed size after
    deflation of sourceLen bytes.  It must be called after deflateInit() or
@@ -772,9 +771,9 @@ ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
    than Z_FINISH or Z_NO_FLUSH are used.
 */
 
-ZEXTERN int ZEXPORT deflatePending OF((z_streamp strm,
-                                       unsigned *pending,
-                                       int *bits));
+ZEXTERN int ZEXPORT deflatePending(z_streamp strm,
+                                   unsigned *pending,
+                                   int *bits);
 /*
      deflatePending() returns the number of bytes and bits of output that have
    been generated, but not yet provided in the available output.  The bytes not
@@ -787,9 +786,9 @@ ZEXTERN int ZEXPORT deflatePending OF((z_streamp strm,
    stream state was inconsistent.
  */
 
-ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
-                                     int bits,
-                                     int value));
+ZEXTERN int ZEXPORT deflatePrime(z_streamp strm,
+                                 int bits,
+                                 int value);
 /*
      deflatePrime() inserts bits in the deflate output stream.  The intent
    is that this function is used to start off the deflate output with the bits
@@ -804,8 +803,8 @@ ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
    source stream state was inconsistent.
 */
 
-ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
-                                         gz_headerp head));
+ZEXTERN int ZEXPORT deflateSetHeader(z_streamp strm,
+                                     gz_headerp head);
 /*
      deflateSetHeader() provides gzip header information for when a gzip
    stream is requested by deflateInit2().  deflateSetHeader() may be called
@@ -829,8 +828,8 @@ ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
 */
 
 /*
-ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
-                                     int  windowBits));
+ZEXTERN int ZEXPORT inflateInit2(z_streamp strm,
+                                 int windowBits);
 
      This is another version of inflateInit with an extra parameter.  The
    fields next_in, avail_in, zalloc, zfree and opaque must be initialized
@@ -865,9 +864,11 @@ ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
    detection, or add 16 to decode only the gzip format (the zlib format will
    return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is a
    CRC-32 instead of an Adler-32.  Unlike the gunzip utility and gzread() (see
-   below), inflate() will not automatically decode concatenated gzip streams.
-   inflate() will return Z_STREAM_END at the end of the gzip stream.  The state
-   would need to be reset to continue decoding a subsequent gzip stream.
+   below), inflate() will *not* automatically decode concatenated gzip members.
+   inflate() will return Z_STREAM_END at the end of the gzip member.  The state
+   would need to be reset to continue decoding a subsequent gzip member.  This
+   *must* be done if there is more data after a gzip member, in order for the
+   decompression to be compliant with the gzip standard (RFC 1952).
 
      inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
    memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
@@ -881,9 +882,9 @@ ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
    deferred until inflate() is called.
 */
 
-ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength));
+ZEXTERN int ZEXPORT inflateSetDictionary(z_streamp strm,
+                                         const Bytef *dictionary,
+                                         uInt  dictLength);
 /*
      Initializes the decompression dictionary from the given uncompressed byte
    sequence.  This function must be called immediately after a call of inflate,
@@ -904,22 +905,22 @@ ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
    inflate().
 */
 
-ZEXTERN int ZEXPORT inflateGetDictionary OF((z_streamp strm,
-                                             Bytef *dictionary,
-                                             uInt  *dictLength));
+ZEXTERN int ZEXPORT inflateGetDictionary(z_streamp strm,
+                                         Bytef *dictionary,
+                                         uInt  *dictLength);
 /*
      Returns the sliding dictionary being maintained by inflate.  dictLength is
    set to the number of bytes in the dictionary, and that many bytes are copied
    to dictionary.  dictionary must have enough space, where 32768 bytes is
    always enough.  If inflateGetDictionary() is called with dictionary equal to
    Z_NULL, then only the dictionary length is returned, and nothing is copied.
-   Similary, if dictLength is Z_NULL, then it is not set.
+   Similarly, if dictLength is Z_NULL, then it is not set.
 
      inflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
    stream state is inconsistent.
 */
 
-ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
+ZEXTERN int ZEXPORT inflateSync(z_streamp strm);
 /*
      Skips invalid compressed data until a possible full flush point (see above
    for the description of deflate with Z_FULL_FLUSH) can be found, or until all
@@ -938,8 +939,8 @@ ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
    input each time, until success or end of the input data.
 */
 
-ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
-                                    z_streamp source));
+ZEXTERN int ZEXPORT inflateCopy(z_streamp dest,
+                                z_streamp source);
 /*
      Sets the destination stream as a complete copy of the source stream.
 
@@ -954,7 +955,7 @@ ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
    destination.
 */
 
-ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
+ZEXTERN int ZEXPORT inflateReset(z_streamp strm);
 /*
      This function is equivalent to inflateEnd followed by inflateInit,
    but does not free and reallocate the internal decompression state.  The
@@ -964,8 +965,8 @@ ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
    stream state was inconsistent (such as zalloc or state being Z_NULL).
 */
 
-ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm,
-                                      int windowBits));
+ZEXTERN int ZEXPORT inflateReset2(z_streamp strm,
+                                  int windowBits);
 /*
      This function is the same as inflateReset, but it also permits changing
    the wrap and window size requests.  The windowBits parameter is interpreted
@@ -978,9 +979,9 @@ ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm,
    the windowBits parameter is invalid.
 */
 
-ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
-                                     int bits,
-                                     int value));
+ZEXTERN int ZEXPORT inflatePrime(z_streamp strm,
+                                 int bits,
+                                 int value);
 /*
      This function inserts bits in the inflate input stream.  The intent is
    that this function is used to start inflating at a bit position in the
@@ -999,7 +1000,7 @@ ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
    stream state was inconsistent.
 */
 
-ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm));
+ZEXTERN long ZEXPORT inflateMark(z_streamp strm);
 /*
      This function returns two values, one in the lower 16 bits of the return
    value, and the other in the remaining upper bits, obtained by shifting the
@@ -1027,8 +1028,8 @@ ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm));
    source stream state was inconsistent.
 */
 
-ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
-                                         gz_headerp head));
+ZEXTERN int ZEXPORT inflateGetHeader(z_streamp strm,
+                                     gz_headerp head);
 /*
      inflateGetHeader() requests that gzip header information be stored in the
    provided gz_header structure.  inflateGetHeader() may be called after
@@ -1068,8 +1069,8 @@ ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
 */
 
 /*
-ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
-                                        unsigned char FAR *window));
+ZEXTERN int ZEXPORT inflateBackInit(z_streamp strm, int windowBits,
+                                    unsigned char FAR *window);
 
      Initialize the internal stream state for decompression using inflateBack()
    calls.  The fields zalloc, zfree and opaque in strm must be initialized
@@ -1089,13 +1090,13 @@ ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
    the version of the header file.
 */
 
-typedef unsigned (*in_func) OF((void FAR *,
-                                z_const unsigned char FAR * FAR *));
-typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
+typedef unsigned (*in_func)(void FAR *,
+                            z_const unsigned char FAR * FAR *);
+typedef int (*out_func)(void FAR *, unsigned char FAR *, unsigned);
 
-ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
-                                    in_func in, void FAR *in_desc,
-                                    out_func out, void FAR *out_desc));
+ZEXTERN int ZEXPORT inflateBack(z_streamp strm,
+                                in_func in, void FAR *in_desc,
+                                out_func out, void FAR *out_desc);
 /*
      inflateBack() does a raw inflate with a single call using a call-back
    interface for input and output.  This is potentially more efficient than
@@ -1163,7 +1164,7 @@ ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
    cannot return Z_OK.
 */
 
-ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
+ZEXTERN int ZEXPORT inflateBackEnd(z_streamp strm);
 /*
      All memory allocated by inflateBackInit() is freed.
 
@@ -1171,7 +1172,7 @@ ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
    state was inconsistent.
 */
 
-ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
+ZEXTERN uLong ZEXPORT zlibCompileFlags(void);
 /* Return flags indicating compile-time options.
 
     Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
@@ -1224,8 +1225,8 @@ ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
    you need special options.
 */
 
-ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
-                                 const Bytef *source, uLong sourceLen));
+ZEXTERN int ZEXPORT compress(Bytef *dest,   uLongf *destLen,
+                             const Bytef *source, uLong sourceLen);
 /*
      Compresses the source buffer into the destination buffer.  sourceLen is
    the byte length of the source buffer.  Upon entry, destLen is the total size
@@ -1239,9 +1240,9 @@ ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
    buffer.
 */
 
-ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
-                                  const Bytef *source, uLong sourceLen,
-                                  int level));
+ZEXTERN int ZEXPORT compress2(Bytef *dest,   uLongf *destLen,
+                              const Bytef *source, uLong sourceLen,
+                              int level);
 /*
      Compresses the source buffer into the destination buffer.  The level
    parameter has the same meaning as in deflateInit.  sourceLen is the byte
@@ -1255,15 +1256,15 @@ ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
    Z_STREAM_ERROR if the level parameter is invalid.
 */
 
-ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));
+ZEXTERN uLong ZEXPORT compressBound(uLong sourceLen);
 /*
      compressBound() returns an upper bound on the compressed size after
    compress() or compress2() on sourceLen bytes.  It would be used before a
    compress() or compress2() call to allocate the destination buffer.
 */
 
-ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
-                                   const Bytef *source, uLong sourceLen));
+ZEXTERN int ZEXPORT uncompress(Bytef *dest,   uLongf *destLen,
+                               const Bytef *source, uLong sourceLen);
 /*
      Decompresses the source buffer into the destination buffer.  sourceLen is
    the byte length of the source buffer.  Upon entry, destLen is the total size
@@ -1280,8 +1281,8 @@ ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
    buffer with the uncompressed data up to that point.
 */
 
-ZEXTERN int ZEXPORT uncompress2 OF((Bytef *dest,   uLongf *destLen,
-                                    const Bytef *source, uLong *sourceLen));
+ZEXTERN int ZEXPORT uncompress2(Bytef *dest,   uLongf *destLen,
+                                const Bytef *source, uLong *sourceLen);
 /*
      Same as uncompress, except that sourceLen is a pointer, where the
    length of the source is *sourceLen.  On return, *sourceLen is the number of
@@ -1300,16 +1301,16 @@ ZEXTERN int ZEXPORT uncompress2 OF((Bytef *dest,   uLongf *destLen,
 typedef struct gzFile_s *gzFile;    /* semi-opaque gzip file descriptor */
 
 /*
-ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode));
+ZEXTERN gzFile ZEXPORT gzopen(const char *path, const char *mode);
 
-     Opens a gzip (.gz) file for reading or writing.  The mode parameter is as
-   in fopen ("rb" or "wb") but can also include a compression level ("wb9") or
-   a strategy: 'f' for filtered data as in "wb6f", 'h' for Huffman-only
-   compression as in "wb1h", 'R' for run-length encoding as in "wb1R", or 'F'
-   for fixed code compression as in "wb9F".  (See the description of
-   deflateInit2 for more information about the strategy parameter.)  'T' will
-   request transparent writing or appending with no compression and not using
-   the gzip format.
+     Open the gzip (.gz) file at path for reading and decompressing, or
+   compressing and writing.  The mode parameter is as in fopen ("rb" or "wb")
+   but can also include a compression level ("wb9") or a strategy: 'f' for
+   filtered data as in "wb6f", 'h' for Huffman-only compression as in "wb1h",
+   'R' for run-length encoding as in "wb1R", or 'F' for fixed code compression
+   as in "wb9F".  (See the description of deflateInit2 for more information
+   about the strategy parameter.)  'T' will request transparent writing or
+   appending with no compression and not using the gzip format.
 
      "a" can be used instead of "w" to request that the gzip stream that will
    be written be appended to the file.  "+" will result in an error, since
@@ -1337,11 +1338,11 @@ ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode));
    file could not be opened.
 */
 
-ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode));
+ZEXTERN gzFile ZEXPORT gzdopen(int fd, const char *mode);
 /*
-     gzdopen associates a gzFile with the file descriptor fd.  File descriptors
-   are obtained from calls like open, dup, creat, pipe or fileno (if the file
-   has been previously opened with fopen).  The mode parameter is as in gzopen.
+     Associate a gzFile with the file descriptor fd.  File descriptors are
+   obtained from calls like open, dup, creat, pipe or fileno (if the file has
+   been previously opened with fopen).  The mode parameter is as in gzopen.
 
      The next call of gzclose on the returned gzFile will also close the file
    descriptor fd, just like fclose(fdopen(fd, mode)) closes the file descriptor
@@ -1360,15 +1361,15 @@ ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode));
    will not detect if fd is invalid (unless fd is -1).
 */
 
-ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size));
+ZEXTERN int ZEXPORT gzbuffer(gzFile file, unsigned size);
 /*
-     Set the internal buffer size used by this library's functions.  The
-   default buffer size is 8192 bytes.  This function must be called after
-   gzopen() or gzdopen(), and before any other calls that read or write the
-   file.  The buffer memory allocation is always deferred to the first read or
-   write.  Three times that size in buffer space is allocated.  A larger buffer
-   size of, for example, 64K or 128K bytes will noticeably increase the speed
-   of decompression (reading).
+     Set the internal buffer size used by this library's functions for file to
+   size.  The default buffer size is 8192 bytes.  This function must be called
+   after gzopen() or gzdopen(), and before any other calls that read or write
+   the file.  The buffer memory allocation is always deferred to the first read
+   or write.  Three times that size in buffer space is allocated.  A larger
+   buffer size of, for example, 64K or 128K bytes will noticeably increase the
+   speed of decompression (reading).
 
      The new buffer size also affects the maximum length for gzprintf().
 
@@ -1376,20 +1377,20 @@ ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size));
    too late.
 */
 
-ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
+ZEXTERN int ZEXPORT gzsetparams(gzFile file, int level, int strategy);
 /*
-     Dynamically update the compression level or strategy.  See the description
-   of deflateInit2 for the meaning of these parameters.  Previously provided
-   data is flushed before the parameter change.
+     Dynamically update the compression level and strategy for file.  See the
+   description of deflateInit2 for the meaning of these parameters. Previously
+   provided data is flushed before applying the parameter changes.
 
      gzsetparams returns Z_OK if success, Z_STREAM_ERROR if the file was not
    opened for writing, Z_ERRNO if there is an error writing the flushed data,
    or Z_MEM_ERROR if there is a memory allocation error.
 */
 
-ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
+ZEXTERN int ZEXPORT gzread(gzFile file, voidp buf, unsigned len);
 /*
-     Reads the given number of uncompressed bytes from the compressed file.  If
+     Read and decompress up to len uncompressed bytes from file into buf.  If
    the input file is not in gzip format, gzread copies the given number of
    bytes into the buffer directly from the file.
 
@@ -1417,14 +1418,14 @@ ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
    Z_STREAM_ERROR.
 */
 
-ZEXTERN z_size_t ZEXPORT gzfread OF((voidp buf, z_size_t size, z_size_t nitems,
-                                     gzFile file));
+ZEXTERN z_size_t ZEXPORT gzfread(voidp buf, z_size_t size, z_size_t nitems,
+                                 gzFile file);
 /*
-     Read up to nitems items of size size from file to buf, otherwise operating
-   as gzread() does.  This duplicates the interface of stdio's fread(), with
-   size_t request and return types.  If the library defines size_t, then
-   z_size_t is identical to size_t.  If not, then z_size_t is an unsigned
-   integer type that can contain a pointer.
+     Read and decompress up to nitems items of size size from file into buf,
+   otherwise operating as gzread() does.  This duplicates the interface of
+   stdio's fread(), with size_t request and return types.  If the library
+   defines size_t, then z_size_t is identical to size_t.  If not, then z_size_t
+   is an unsigned integer type that can contain a pointer.
 
      gzfread() returns the number of full items read of size size, or zero if
    the end of the file was reached and a full item could not be read, or if
@@ -1435,26 +1436,24 @@ ZEXTERN z_size_t ZEXPORT gzfread OF((voidp buf, z_size_t size, z_size_t nitems,
 
      In the event that the end of file is reached and only a partial item is
    available at the end, i.e. the remaining uncompressed data length is not a
-   multiple of size, then the final partial item is nevetheless read into buf
+   multiple of size, then the final partial item is nevertheless read into buf
    and the end-of-file flag is set.  The length of the partial item read is not
    provided, but could be inferred from the result of gztell().  This behavior
    is the same as the behavior of fread() implementations in common libraries,
    but it prevents the direct use of gzfread() to read a concurrently written
-   file, reseting and retrying on end-of-file, when size is not 1.
+   file, resetting and retrying on end-of-file, when size is not 1.
 */
 
-ZEXTERN int ZEXPORT gzwrite OF((gzFile file,
-                                voidpc buf, unsigned len));
+ZEXTERN int ZEXPORT gzwrite(gzFile file, voidpc buf, unsigned len);
 /*
-     Writes the given number of uncompressed bytes into the compressed file.
-   gzwrite returns the number of uncompressed bytes written or 0 in case of
-   error.
+     Compress and write the len uncompressed bytes at buf to file. gzwrite
+   returns the number of uncompressed bytes written or 0 in case of error.
 */
 
-ZEXTERN z_size_t ZEXPORT gzfwrite OF((voidpc buf, z_size_t size,
-                                      z_size_t nitems, gzFile file));
+ZEXTERN z_size_t ZEXPORT gzfwrite(voidpc buf, z_size_t size,
+                                  z_size_t nitems, gzFile file);
 /*
-     gzfwrite() writes nitems items of size size from buf to file, duplicating
+     Compress and write nitems items of size size from buf to file, duplicating
    the interface of stdio's fwrite(), with size_t request and return types.  If
    the library defines size_t, then z_size_t is identical to size_t.  If not,
    then z_size_t is an unsigned integer type that can contain a pointer.
@@ -1465,61 +1464,62 @@ ZEXTERN z_size_t ZEXPORT gzfwrite OF((voidpc buf, z_size_t size,
    is returned, and the error state is set to Z_STREAM_ERROR.
 */
 
-ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...));
+ZEXTERN int ZEXPORTVA gzprintf(gzFile file, const char *format, ...);
 /*
-     Converts, formats, and writes the arguments to the compressed file under
-   control of the format string, as in fprintf.  gzprintf returns the number of
+     Convert, format, compress, and write the arguments (...) to file under
+   control of the string format, as in fprintf.  gzprintf returns the number of
    uncompressed bytes actually written, or a negative zlib error code in case
    of error.  The number of uncompressed bytes written is limited to 8191, or
    one less than the buffer size given to gzbuffer().  The caller should assure
    that this limit is not exceeded.  If it is exceeded, then gzprintf() will
    return an error (0) with nothing written.  In this case, there may also be a
    buffer overflow with unpredictable consequences, which is possible only if
-   zlib was compiled with the insecure functions sprintf() or vsprintf()
+   zlib was compiled with the insecure functions sprintf() or vsprintf(),
    because the secure snprintf() or vsnprintf() functions were not available.
    This can be determined using zlibCompileFlags().
 */
 
-ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
+ZEXTERN int ZEXPORT gzputs(gzFile file, const char *s);
 /*
-     Writes the given null-terminated string to the compressed file, excluding
+     Compress and write the given null-terminated string s to file, excluding
    the terminating null character.
 
      gzputs returns the number of characters written, or -1 in case of error.
 */
 
-ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
+ZEXTERN char * ZEXPORT gzgets(gzFile file, char *buf, int len);
 /*
-     Reads bytes from the compressed file until len-1 characters are read, or a
-   newline character is read and transferred to buf, or an end-of-file
-   condition is encountered.  If any characters are read or if len == 1, the
-   string is terminated with a null character.  If no characters are read due
-   to an end-of-file or len < 1, then the buffer is left untouched.
+     Read and decompress bytes from file into buf, until len-1 characters are
+   read, or until a newline character is read and transferred to buf, or an
+   end-of-file condition is encountered.  If any characters are read or if len
+   is one, the string is terminated with a null character.  If no characters
+   are read due to an end-of-file or len is less than one, then the buffer is
+   left untouched.
 
      gzgets returns buf which is a null-terminated string, or it returns NULL
    for end-of-file or in case of error.  If there was an error, the contents at
    buf are indeterminate.
 */
 
-ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c));
+ZEXTERN int ZEXPORT gzputc(gzFile file, int c);
 /*
-     Writes c, converted to an unsigned char, into the compressed file.  gzputc
+     Compress and write c, converted to an unsigned char, into file.  gzputc
    returns the value that was written, or -1 in case of error.
 */
 
-ZEXTERN int ZEXPORT gzgetc OF((gzFile file));
+ZEXTERN int ZEXPORT gzgetc(gzFile file);
 /*
-     Reads one byte from the compressed file.  gzgetc returns this byte or -1
+     Read and decompress one byte from file.  gzgetc returns this byte or -1
    in case of end of file or error.  This is implemented as a macro for speed.
    As such, it does not do all of the checking the other functions do.  I.e.
    it does not check to see if file is NULL, nor whether the structure file
    points to has been clobbered or not.
 */
 
-ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file));
+ZEXTERN int ZEXPORT gzungetc(int c, gzFile file);
 /*
-     Push one character back onto the stream to be read as the first character
-   on the next read.  At least one character of push-back is allowed.
+     Push c back onto the stream for file to be read as the first character on
+   the next read.  At least one character of push-back is always allowed.
    gzungetc() returns the character pushed, or -1 on failure.  gzungetc() will
    fail if c is -1, and may fail if a character has been pushed but not read
    yet.  If gzungetc is used immediately after gzopen or gzdopen, at least the
@@ -1528,11 +1528,11 @@ ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file));
    gzseek() or gzrewind().
 */
 
-ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush));
+ZEXTERN int ZEXPORT gzflush(gzFile file, int flush);
 /*
-     Flushes all pending output into the compressed file.  The parameter flush
-   is as in the deflate() function.  The return value is the zlib error number
-   (see function gzerror below).  gzflush is only permitted when writing.
+     Flush all pending output to file.  The parameter flush is as in the
+   deflate() function.  The return value is the zlib error number (see function
+   gzerror below).  gzflush is only permitted when writing.
 
      If the flush parameter is Z_FINISH, the remaining data is written and the
    gzip stream is completed in the output.  If gzwrite() is called again, a new
@@ -1544,11 +1544,11 @@ ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush));
 */
 
 /*
-ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file,
-                                   z_off_t offset, int whence));
+ZEXTERN z_off_t ZEXPORT gzseek(gzFile file,
+                               z_off_t offset, int whence);
 
-     Sets the starting position for the next gzread or gzwrite on the given
-   compressed file.  The offset represents a number of bytes in the
+     Set the starting position to offset relative to whence for the next gzread
+   or gzwrite on file.  The offset represents a number of bytes in the
    uncompressed data stream.  The whence parameter is defined as in lseek(2);
    the value SEEK_END is not supported.
 
@@ -1563,52 +1563,52 @@ ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file,
    would be before the current position.
 */
 
-ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));
+ZEXTERN int ZEXPORT    gzrewind(gzFile file);
 /*
-     Rewinds the given file. This function is supported only for reading.
+     Rewind file. This function is supported only for reading.
 
-     gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
+     gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET).
 */
 
 /*
-ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
+ZEXTERN z_off_t ZEXPORT    gztell(gzFile file);
 
-     Returns the starting position for the next gzread or gzwrite on the given
-   compressed file.  This position represents a number of bytes in the
-   uncompressed data stream, and is zero when starting, even if appending or
-   reading a gzip stream from the middle of a file using gzdopen().
+     Return the starting position for the next gzread or gzwrite on file.
+   This position represents a number of bytes in the uncompressed data stream,
+   and is zero when starting, even if appending or reading a gzip stream from
+   the middle of a file using gzdopen().
 
      gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
 */
 
 /*
-ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile file));
+ZEXTERN z_off_t ZEXPORT gzoffset(gzFile file);
 
-     Returns the current offset in the file being read or written.  This offset
-   includes the count of bytes that precede the gzip stream, for example when
-   appending or when using gzdopen() for reading.  When reading, the offset
-   does not include as yet unused buffered input.  This information can be used
-   for a progress indicator.  On error, gzoffset() returns -1.
+     Return the current compressed (actual) read or write offset of file.  This
+   offset includes the count of bytes that precede the gzip stream, for example
+   when appending or when using gzdopen() for reading.  When reading, the
+   offset does not include as yet unused buffered input.  This information can
+   be used for a progress indicator.  On error, gzoffset() returns -1.
 */
 
-ZEXTERN int ZEXPORT gzeof OF((gzFile file));
+ZEXTERN int ZEXPORT gzeof(gzFile file);
 /*
-     Returns true (1) if the end-of-file indicator has been set while reading,
-   false (0) otherwise.  Note that the end-of-file indicator is set only if the
-   read tried to go past the end of the input, but came up short.  Therefore,
-   just like feof(), gzeof() may return false even if there is no more data to
-   read, in the event that the last read request was for the exact number of
-   bytes remaining in the input file.  This will happen if the input file size
-   is an exact multiple of the buffer size.
+     Return true (1) if the end-of-file indicator for file has been set while
+   reading, false (0) otherwise.  Note that the end-of-file indicator is set
+   only if the read tried to go past the end of the input, but came up short.
+   Therefore, just like feof(), gzeof() may return false even if there is no
+   more data to read, in the event that the last read request was for the exact
+   number of bytes remaining in the input file.  This will happen if the input
+   file size is an exact multiple of the buffer size.
 
      If gzeof() returns true, then the read functions will return no more data,
    unless the end-of-file indicator is reset by gzclearerr() and the input file
    has grown since the previous end of file was detected.
 */
 
-ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
+ZEXTERN int ZEXPORT gzdirect(gzFile file);
 /*
-     Returns true (1) if file is being copied directly while reading, or false
+     Return true (1) if file is being copied directly while reading, or false
    (0) if file is a gzip stream being decompressed.
 
      If the input file is empty, gzdirect() will return true, since the input
@@ -1627,10 +1627,10 @@ ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
    gzip file reading and decompression, which may not be desired.)
 */
 
-ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
+ZEXTERN int ZEXPORT    gzclose(gzFile file);
 /*
-     Flushes all pending output if necessary, closes the compressed file and
-   deallocates the (de)compression state.  Note that once file is closed, you
+     Flush all pending output for file, if necessary, close file and
+   deallocate the (de)compression state.  Note that once file is closed, you
    cannot call gzerror with file, since its structures have been deallocated.
    gzclose must not be called more than once on the same file, just as free
    must not be called more than once on the same allocation.
@@ -1640,8 +1640,8 @@ ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
    last read ended in the middle of a gzip stream, or Z_OK on success.
 */
 
-ZEXTERN int ZEXPORT gzclose_r OF((gzFile file));
-ZEXTERN int ZEXPORT gzclose_w OF((gzFile file));
+ZEXTERN int ZEXPORT gzclose_r(gzFile file);
+ZEXTERN int ZEXPORT gzclose_w(gzFile file);
 /*
      Same as gzclose(), but gzclose_r() is only for use when reading, and
    gzclose_w() is only for use when writing or appending.  The advantage to
@@ -1652,12 +1652,12 @@ ZEXTERN int ZEXPORT gzclose_w OF((gzFile file));
    zlib library.
 */
 
-ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
+ZEXTERN const char * ZEXPORT gzerror(gzFile file, int *errnum);
 /*
-     Returns the error message for the last error which occurred on the given
-   compressed file.  errnum is set to zlib error number.  If an error occurred
-   in the file system and not in the compression library, errnum is set to
-   Z_ERRNO and the application may consult errno to get the exact error code.
+     Return the error message for the last error which occurred on file.
+   errnum is set to zlib error number.  If an error occurred in the file system
+   and not in the compression library, errnum is set to Z_ERRNO and the
+   application may consult errno to get the exact error code.
 
      The application must not modify the returned string.  Future calls to
    this function may invalidate the previously returned string.  If file is
@@ -1668,9 +1668,9 @@ ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
    functions above that do not distinguish those cases in their return values.
 */
 
-ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
+ZEXTERN void ZEXPORT gzclearerr(gzFile file);
 /*
-     Clears the error and end-of-file flags for file.  This is analogous to the
+     Clear the error and end-of-file flags for file.  This is analogous to the
    clearerr() function in stdio.  This is useful for continuing to read a gzip
    file that is being written concurrently.
 */
@@ -1685,11 +1685,12 @@ ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
    library.
 */
 
-ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
+ZEXTERN uLong ZEXPORT adler32(uLong adler, const Bytef *buf, uInt len);
 /*
      Update a running Adler-32 checksum with the bytes buf[0..len-1] and
-   return the updated checksum.  If buf is Z_NULL, this function returns the
-   required initial value for the checksum.
+   return the updated checksum. An Adler-32 value is in the range of a 32-bit
+   unsigned integer. If buf is Z_NULL, this function returns the required
+   initial value for the checksum.
 
      An Adler-32 checksum is almost as reliable as a CRC-32 but can be computed
    much faster.
@@ -1704,15 +1705,15 @@ ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
      if (adler != original_adler) error();
 */
 
-ZEXTERN uLong ZEXPORT adler32_z OF((uLong adler, const Bytef *buf,
-                                    z_size_t len));
+ZEXTERN uLong ZEXPORT adler32_z(uLong adler, const Bytef *buf,
+                                z_size_t len);
 /*
      Same as adler32(), but with a size_t length.
 */
 
 /*
-ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
-                                          z_off_t len2));
+ZEXTERN uLong ZEXPORT adler32_combine(uLong adler1, uLong adler2,
+                                      z_off_t len2);
 
      Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1
    and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
@@ -1722,12 +1723,13 @@ ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
    negative, the result has no meaning or utility.
 */
 
-ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
+ZEXTERN uLong ZEXPORT crc32(uLong crc, const Bytef *buf, uInt len);
 /*
      Update a running CRC-32 with the bytes buf[0..len-1] and return the
-   updated CRC-32.  If buf is Z_NULL, this function returns the required
-   initial value for the crc.  Pre- and post-conditioning (one's complement) is
-   performed within this function so it shouldn't be done by the application.
+   updated CRC-32. A CRC-32 value is in the range of a 32-bit unsigned integer.
+   If buf is Z_NULL, this function returns the required initial value for the
+   crc. Pre- and post-conditioning (one's complement) is performed within this
+   function so it shouldn't be done by the application.
 
    Usage example:
 
@@ -1739,14 +1741,14 @@ ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
      if (crc != original_crc) error();
 */
 
-ZEXTERN uLong ZEXPORT crc32_z OF((uLong adler, const Bytef *buf,
-                                  z_size_t len));
+ZEXTERN uLong ZEXPORT crc32_z(uLong crc, const Bytef *buf,
+                              z_size_t len);
 /*
      Same as crc32(), but with a size_t length.
 */
 
 /*
-ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
+ZEXTERN uLong ZEXPORT crc32_combine(uLong crc1, uLong crc2, z_off_t len2);
 
      Combine two CRC-32 check values into one.  For two sequences of bytes,
    seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
@@ -1755,26 +1757,40 @@ ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
    len2.
 */
 
+/*
+ZEXTERN uLong ZEXPORT crc32_combine_gen(z_off_t len2);
+
+     Return the operator corresponding to length len2, to be used with
+   crc32_combine_op().
+*/
+
+ZEXTERN uLong ZEXPORT crc32_combine_op(uLong crc1, uLong crc2, uLong op);
+/*
+     Give the same result as crc32_combine(), using op in place of len2. op is
+   is generated from len2 by crc32_combine_gen(). This will be faster than
+   crc32_combine() if the generated op is used more than once.
+*/
+
 
                         /* various hacks, don't look :) */
 
 /* deflateInit and inflateInit are macros to allow checking the zlib version
  * and the compiler's view of z_stream:
  */
-ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
-                                     const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
-                                     const char *version, int stream_size));
-ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,
-                                      int windowBits, int memLevel,
-                                      int strategy, const char *version,
-                                      int stream_size));
-ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
-                                      const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
-                                         unsigned char FAR *window,
-                                         const char *version,
-                                         int stream_size));
+ZEXTERN int ZEXPORT deflateInit_(z_streamp strm, int level,
+                                 const char *version, int stream_size);
+ZEXTERN int ZEXPORT inflateInit_(z_streamp strm,
+                                 const char *version, int stream_size);
+ZEXTERN int ZEXPORT deflateInit2_(z_streamp strm, int  level, int  method,
+                                  int windowBits, int memLevel,
+                                  int strategy, const char *version,
+                                  int stream_size);
+ZEXTERN int ZEXPORT inflateInit2_(z_streamp strm, int  windowBits,
+                                  const char *version, int stream_size);
+ZEXTERN int ZEXPORT inflateBackInit_(z_streamp strm, int windowBits,
+                                     unsigned char FAR *window,
+                                     const char *version,
+                                     int stream_size);
 #ifdef Z_PREFIX_SET
 #  define z_deflateInit(strm, level) \
           deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
@@ -1819,7 +1835,7 @@ struct gzFile_s {
     unsigned char *next;
     z_off64_t pos;
 };
-ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
+ZEXTERN int ZEXPORT gzgetc_(gzFile file);       /* backward compatibility */
 #ifdef Z_PREFIX_SET
 #  undef z_gzgetc
 #  define z_gzgetc(g) \
@@ -1841,12 +1857,13 @@ ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
  * without large file support, _LFS64_LARGEFILE must also be true
  */
 #ifdef Z_LARGE64
-   ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-   ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
-   ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
-   ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
-   ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off64_t));
-   ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));
+   ZEXTERN gzFile ZEXPORT gzopen64(const char *, const char *);
+   ZEXTERN z_off64_t ZEXPORT gzseek64(gzFile, z_off64_t, int);
+   ZEXTERN z_off64_t ZEXPORT gztell64(gzFile);
+   ZEXTERN z_off64_t ZEXPORT gzoffset64(gzFile);
+   ZEXTERN uLong ZEXPORT adler32_combine64(uLong, uLong, z_off64_t);
+   ZEXTERN uLong ZEXPORT crc32_combine64(uLong, uLong, z_off64_t);
+   ZEXTERN uLong ZEXPORT crc32_combine_gen64(z_off64_t);
 #endif
 
 #if !defined(ZLIB_INTERNAL) && defined(Z_WANT64)
@@ -1857,6 +1874,7 @@ ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
 #    define z_gzoffset z_gzoffset64
 #    define z_adler32_combine z_adler32_combine64
 #    define z_crc32_combine z_crc32_combine64
+#    define z_crc32_combine_gen z_crc32_combine_gen64
 #  else
 #    ifdef gzopen
 #      undef gzopen
@@ -1881,50 +1899,61 @@ ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
 #    ifdef crc32_combine
 #      undef crc32_combine
 #    endif
-#    define crc32_combine crc32_combine64
+#    ifdef crc32_combine64
+#      undef crc32_combine64
+#    endif
+#    ifdef crc32_combine_gen
+#      undef crc32_combine_gen
+#    endif
+#    ifdef crc32_combine_op
+#      undef crc32_combine_op
+#    endif
 #  endif
 #  ifndef Z_LARGE64
-     ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-     ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
-     ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
-     ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));
-     ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
-     ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
+     ZEXTERN gzFile ZEXPORT gzopen64(const char *, const char *);
+     ZEXTERN z_off_t ZEXPORT gzseek64(gzFile, z_off_t, int);
+     ZEXTERN z_off_t ZEXPORT gztell64(gzFile);
+     ZEXTERN z_off_t ZEXPORT gzoffset64(gzFile);
+     ZEXTERN uLong ZEXPORT adler32_combine64(uLong, uLong, z_off_t);
+     ZEXTERN uLong ZEXPORT crc32_combine64(uLong, uLong, z_off_t);
+     ZEXTERN uLong ZEXPORT crc32_combine_gen64(z_off_t);
 #  endif
 #else
-   ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *));
-   ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int));
-   ZEXTERN z_off_t ZEXPORT gztell OF((gzFile));
-   ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile));
-   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
-   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
+   ZEXTERN gzFile ZEXPORT gzopen(const char *, const char *);
+   ZEXTERN z_off_t ZEXPORT gzseek(gzFile, z_off_t, int);
+   ZEXTERN z_off_t ZEXPORT gztell(gzFile);
+   ZEXTERN z_off_t ZEXPORT gzoffset(gzFile);
+   ZEXTERN uLong ZEXPORT adler32_combine(uLong, uLong, z_off_t);
+   ZEXTERN uLong ZEXPORT crc32_combine(uLong, uLong, z_off_t);
+   ZEXTERN uLong ZEXPORT crc32_combine_gen(z_off_t);
 #endif
 
 #else /* Z_SOLO */
 
-   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
-   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
+   ZEXTERN uLong ZEXPORT adler32_combine(uLong, uLong, z_off_t);
+   ZEXTERN uLong ZEXPORT crc32_combine(uLong, uLong, z_off_t);
+   ZEXTERN uLong ZEXPORT crc32_combine_gen(z_off_t);
 
 #endif /* !Z_SOLO */
 
 /* undocumented functions */
-ZEXTERN const char   * ZEXPORT zError           OF((int));
-ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp));
-ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table    OF((void));
-ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int));
-ZEXTERN int            ZEXPORT inflateValidate OF((z_streamp, int));
-ZEXTERN unsigned long  ZEXPORT inflateCodesUsed OF ((z_streamp));
-ZEXTERN int            ZEXPORT inflateResetKeep OF((z_streamp));
-ZEXTERN int            ZEXPORT deflateResetKeep OF((z_streamp));
-#if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(Z_SOLO)
-ZEXTERN gzFile         ZEXPORT gzopen_w OF((const wchar_t *path,
-                                            const char *mode));
+ZEXTERN const char   * ZEXPORT zError(int);
+ZEXTERN int            ZEXPORT inflateSyncPoint(z_streamp);
+ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table(void);
+ZEXTERN int            ZEXPORT inflateUndermine(z_streamp, int);
+ZEXTERN int            ZEXPORT inflateValidate(z_streamp, int);
+ZEXTERN unsigned long  ZEXPORT inflateCodesUsed(z_streamp);
+ZEXTERN int            ZEXPORT inflateResetKeep(z_streamp);
+ZEXTERN int            ZEXPORT deflateResetKeep(z_streamp);
+#if defined(_WIN32) && !defined(Z_SOLO)
+ZEXTERN gzFile         ZEXPORT gzopen_w(const wchar_t *path,
+                                        const char *mode);
 #endif
 #if defined(STDC) || defined(Z_HAVE_STDARG_H)
 #  ifndef Z_SOLO
-ZEXTERN int            ZEXPORTVA gzvprintf Z_ARG((gzFile file,
-                                                  const char *format,
-                                                  va_list va));
+ZEXTERN int            ZEXPORTVA gzvprintf(gzFile file,
+                                           const char *format,
+                                           va_list va);
 #  endif
 #endif
 
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/zlib.map b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/zlib.map
new file mode 100644
index 000000000..b330b606f
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/zlib.map
@@ -0,0 +1,100 @@
+ZLIB_1.2.0 {
+  global:
+    compressBound;
+    deflateBound;
+    inflateBack;
+    inflateBackEnd;
+    inflateBackInit_;
+    inflateCopy;
+  local:
+    deflate_copyright;
+    inflate_copyright;
+    inflate_fast;
+    inflate_table;
+    zcalloc;
+    zcfree;
+    z_errmsg;
+    gz_error;
+    gz_intmax;
+    _*;
+};
+
+ZLIB_1.2.0.2 {
+    gzclearerr;
+    gzungetc;
+    zlibCompileFlags;
+} ZLIB_1.2.0;
+
+ZLIB_1.2.0.8 {
+    deflatePrime;
+} ZLIB_1.2.0.2;
+
+ZLIB_1.2.2 {
+    adler32_combine;
+    crc32_combine;
+    deflateSetHeader;
+    inflateGetHeader;
+} ZLIB_1.2.0.8;
+
+ZLIB_1.2.2.3 {
+    deflateTune;
+    gzdirect;
+} ZLIB_1.2.2;
+
+ZLIB_1.2.2.4 {
+    inflatePrime;
+} ZLIB_1.2.2.3;
+
+ZLIB_1.2.3.3 {
+    adler32_combine64;
+    crc32_combine64;
+    gzopen64;
+    gzseek64;
+    gztell64;
+    inflateUndermine;
+} ZLIB_1.2.2.4;
+
+ZLIB_1.2.3.4 {
+    inflateReset2;
+    inflateMark;
+} ZLIB_1.2.3.3;
+
+ZLIB_1.2.3.5 {
+    gzbuffer;
+    gzoffset;
+    gzoffset64;
+    gzclose_r;
+    gzclose_w;
+} ZLIB_1.2.3.4;
+
+ZLIB_1.2.5.1 {
+    deflatePending;
+} ZLIB_1.2.3.5;
+
+ZLIB_1.2.5.2 {
+    deflateResetKeep;
+    gzgetc_;
+    inflateResetKeep;
+} ZLIB_1.2.5.1;
+
+ZLIB_1.2.7.1 {
+    inflateGetDictionary;
+    gzvprintf;
+} ZLIB_1.2.5.2;
+
+ZLIB_1.2.9 {
+    inflateCodesUsed;
+    inflateValidate;
+    uncompress2;
+    gzfread;
+    gzfwrite;
+    deflateGetDictionary;
+    adler32_z;
+    crc32_z;
+} ZLIB_1.2.7.1;
+
+ZLIB_1.2.12 {
+	crc32_combine_gen;
+	crc32_combine_gen64;
+	crc32_combine_op;
+} ZLIB_1.2.9;
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/zlib.pc.cmakein b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/zlib.pc.cmakein
new file mode 100644
index 000000000..a5e642938
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/zlib.pc.cmakein
@@ -0,0 +1,13 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=@CMAKE_INSTALL_PREFIX@
+libdir=@INSTALL_LIB_DIR@
+sharedlibdir=@INSTALL_LIB_DIR@
+includedir=@INSTALL_INC_DIR@
+
+Name: zlib
+Description: zlib compression library
+Version: @VERSION@
+
+Requires:
+Libs: -L${libdir} -L${sharedlibdir} -lz
+Cflags: -I${includedir}
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/zutil.c b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/zutil.c
index a76c6b0c7..b1c5d2d3c 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/zutil.c
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/zutil.c
@@ -24,13 +24,11 @@ z_const char * const z_errmsg[10] = {
 };
 
 
-const char * ZEXPORT zlibVersion()
-{
+const char * ZEXPORT zlibVersion(void) {
     return ZLIB_VERSION;
 }
 
-uLong ZEXPORT zlibCompileFlags()
-{
+uLong ZEXPORT zlibCompileFlags(void) {
     uLong flags;
 
     flags = 0;
@@ -61,9 +59,11 @@ uLong ZEXPORT zlibCompileFlags()
 #ifdef ZLIB_DEBUG
     flags += 1 << 8;
 #endif
+    /*
 #if defined(ASMV) || defined(ASMINF)
     flags += 1 << 9;
 #endif
+     */
 #ifdef ZLIB_WINAPI
     flags += 1 << 10;
 #endif
@@ -119,9 +119,7 @@ uLong ZEXPORT zlibCompileFlags()
 #  endif
 int ZLIB_INTERNAL z_verbose = verbose;
 
-void ZLIB_INTERNAL z_error (m)
-    char *m;
-{
+void ZLIB_INTERNAL z_error(char *m) {
     fprintf(stderr, "%s\n", m);
     exit(1);
 }
@@ -130,14 +128,12 @@ void ZLIB_INTERNAL z_error (m)
 /* exported to allow conversion of error code to string for compress() and
  * uncompress()
  */
-const char * ZEXPORT zError(err)
-    int err;
-{
+const char * ZEXPORT zError(int err) {
     return ERR_MSG(err);
 }
 
-#if defined(_WIN32_WCE)
-    /* The Microsoft C Run-Time Library for Windows CE doesn't have
+#if defined(_WIN32_WCE) && _WIN32_WCE < 0x800
+    /* The older Microsoft C Run-Time Library for Windows CE doesn't have
      * errno.  We define it as a global variable to simplify porting.
      * Its value is always 0 and should not be used.
      */
@@ -146,22 +142,14 @@ const char * ZEXPORT zError(err)
 
 #ifndef HAVE_MEMCPY
 
-void ZLIB_INTERNAL zmemcpy(dest, source, len)
-    Bytef* dest;
-    const Bytef* source;
-    uInt  len;
-{
+void ZLIB_INTERNAL zmemcpy(Bytef* dest, const Bytef* source, uInt len) {
     if (len == 0) return;
     do {
         *dest++ = *source++; /* ??? to be unrolled */
     } while (--len != 0);
 }
 
-int ZLIB_INTERNAL zmemcmp(s1, s2, len)
-    const Bytef* s1;
-    const Bytef* s2;
-    uInt  len;
-{
+int ZLIB_INTERNAL zmemcmp(const Bytef* s1, const Bytef* s2, uInt len) {
     uInt j;
 
     for (j = 0; j < len; j++) {
@@ -170,10 +158,7 @@ int ZLIB_INTERNAL zmemcmp(s1, s2, len)
     return 0;
 }
 
-void ZLIB_INTERNAL zmemzero(dest, len)
-    Bytef* dest;
-    uInt  len;
-{
+void ZLIB_INTERNAL zmemzero(Bytef* dest, uInt len) {
     if (len == 0) return;
     do {
         *dest++ = 0;  /* ??? to be unrolled */
@@ -214,8 +199,7 @@ local ptr_table table[MAX_PTR];
  * a protected system like OS/2. Use Microsoft C instead.
  */
 
-voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size)
-{
+voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, unsigned items, unsigned size) {
     voidpf buf;
     ulg bsize = (ulg)items*size;
 
@@ -240,8 +224,7 @@ voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size)
     return buf;
 }
 
-void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
-{
+void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr) {
     int n;
 
     (void)opaque;
@@ -277,14 +260,12 @@ void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
 #  define _hfree   hfree
 #endif
 
-voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size)
-{
+voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, uInt items, uInt size) {
     (void)opaque;
     return _halloc((long)items, size);
 }
 
-void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
-{
+void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr) {
     (void)opaque;
     _hfree(ptr);
 }
@@ -297,25 +278,18 @@ void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
 #ifndef MY_ZCALLOC /* Any system without a special alloc function */
 
 #ifndef STDC
-extern voidp  malloc OF((uInt size));
-extern voidp  calloc OF((uInt items, uInt size));
-extern void   free   OF((voidpf ptr));
+extern voidp malloc(uInt size);
+extern voidp calloc(uInt items, uInt size);
+extern void free(voidpf ptr);
 #endif
 
-voidpf ZLIB_INTERNAL zcalloc (opaque, items, size)
-    voidpf opaque;
-    unsigned items;
-    unsigned size;
-{
+voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, unsigned items, unsigned size) {
     (void)opaque;
     return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) :
                               (voidpf)calloc(items, size);
 }
 
-void ZLIB_INTERNAL zcfree (opaque, ptr)
-    voidpf opaque;
-    voidpf ptr;
-{
+void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr) {
     (void)opaque;
     free(ptr);
 }
diff --git a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/zutil.h b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/zutil.h
index 4425bcf75..6980a5f4e 100644
--- a/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/zutil.h
+++ b/external_imported/sentry-native/external/crashpad/third_party/zlib/zlib/zutil.h
@@ -1,5 +1,5 @@
 /* zutil.h -- internal interface and configuration of the compression library
- * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
+ * Copyright (C) 1995-2022 Jean-loup Gailly, Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -44,10 +44,6 @@
 #  endif
 #endif
 
-#ifdef Z_SOLO
-   typedef long ptrdiff_t;  /* guess -- will be caught if guess is wrong */
-#endif
-
 #ifndef local
 #  define local static
 #endif
@@ -61,6 +57,17 @@ typedef unsigned short ush;
 typedef ush FAR ushf;
 typedef unsigned long  ulg;
 
+#if !defined(Z_U8) && !defined(Z_SOLO) && defined(STDC)
+#  include <limits.h>
+#  if (ULONG_MAX == 0xffffffffffffffff)
+#    define Z_U8 unsigned long
+#  elif (ULLONG_MAX == 0xffffffffffffffff)
+#    define Z_U8 unsigned long long
+#  elif (UINT_MAX == 0xffffffffffffffff)
+#    define Z_U8 unsigned
+#  endif
+#endif
+
 extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 /* (size given to avoid silly warnings with Visual C++) */
 
@@ -185,10 +192,6 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX
 #  if defined(_WIN32_WCE)
 #    define fdopen(fd,mode) NULL /* No fdopen() */
-#    ifndef _PTRDIFF_T_DEFINED
-       typedef int ptrdiff_t;
-#      define _PTRDIFF_T_DEFINED
-#    endif
 #  else
 #    define fdopen(fd,type)  _fdopen(fd,type)
 #  endif
@@ -203,8 +206,9 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 /* provide prototypes for these when building zlib without LFS */
 #if !defined(_WIN32) && \
     (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
-    ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
-    ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
+    ZEXTERN uLong ZEXPORT adler32_combine64(uLong, uLong, z_off_t);
+    ZEXTERN uLong ZEXPORT crc32_combine64(uLong, uLong, z_off_t);
+    ZEXTERN uLong ZEXPORT crc32_combine_gen64(z_off_t);
 #endif
 
         /* common defaults */
@@ -243,16 +247,16 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #    define zmemzero(dest, len) memset(dest, 0, len)
 #  endif
 #else
-   void ZLIB_INTERNAL zmemcpy OF((Bytef* dest, const Bytef* source, uInt len));
-   int ZLIB_INTERNAL zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len));
-   void ZLIB_INTERNAL zmemzero OF((Bytef* dest, uInt len));
+   void ZLIB_INTERNAL zmemcpy(Bytef* dest, const Bytef* source, uInt len);
+   int ZLIB_INTERNAL zmemcmp(const Bytef* s1, const Bytef* s2, uInt len);
+   void ZLIB_INTERNAL zmemzero(Bytef* dest, uInt len);
 #endif
 
 /* Diagnostic functions */
 #ifdef ZLIB_DEBUG
 #  include <stdio.h>
    extern int ZLIB_INTERNAL z_verbose;
-   extern void ZLIB_INTERNAL z_error OF((char *m));
+   extern void ZLIB_INTERNAL z_error(char *m);
 #  define Assert(cond,msg) {if(!(cond)) z_error(msg);}
 #  define Trace(x) {if (z_verbose>=0) fprintf x ;}
 #  define Tracev(x) {if (z_verbose>0) fprintf x ;}
@@ -269,9 +273,9 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #endif
 
 #ifndef Z_SOLO
-   voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items,
-                                    unsigned size));
-   void ZLIB_INTERNAL zcfree  OF((voidpf opaque, voidpf ptr));
+   voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, unsigned items,
+                                unsigned size);
+   void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr);
 #endif
 
 #define ZALLOC(strm, items, size) \
diff --git a/external_imported/sentry-native/external/crashpad/tools/BUILD.gn b/external_imported/sentry-native/external/crashpad/tools/BUILD.gn
index 4c5d446bb..157ee9291 100644
--- a/external_imported/sentry-native/external/crashpad/tools/BUILD.gn
+++ b/external_imported/sentry-native/external/crashpad/tools/BUILD.gn
@@ -25,16 +25,31 @@ source_set("tool_support") {
   deps = [ "$mini_chromium_source_parent:base" ]
 }
 
-if (!crashpad_is_ios) {
+crashpad_executable("dump_minidump_annotations") {
+  sources = [ "dump_minidump_annotations.cc" ]
+
+  deps = [
+    ":tool_support",
+    "../client",
+    "../snapshot",
+    "../util",
+  ]
+
+  if (crashpad_is_win) {
+    cflags = [ "/wd4201" ]  # nonstandard extension used : nameless struct/union
+  }
+}
+
+if (!crashpad_is_ios && !crashpad_is_fuchsia) {
   crashpad_executable("crashpad_database_util") {
     sources = [ "crashpad_database_util.cc" ]
 
     deps = [
       ":tool_support",
+      "$mini_chromium_source_parent:base",
       "../build:default_exe_manifest_win",
       "../client",
       "../compat",
-      "$mini_chromium_source_parent:base",
       "../util",
     ]
   }
@@ -44,9 +59,9 @@ if (!crashpad_is_ios) {
 
     deps = [
       ":tool_support",
+      "$mini_chromium_source_parent:base",
       "../build:default_exe_manifest_win",
       "../compat",
-      "$mini_chromium_source_parent:base",
       "../util",
       "../util:net",
     ]
@@ -57,8 +72,8 @@ crashpad_executable("base94_encoder") {
   sources = [ "base94_encoder.cc" ]
   deps = [
     ":tool_support",
-    "../build:default_exe_manifest_win",
     "$mini_chromium_source_parent:base",
+    "../build:default_exe_manifest_win",
     "../util",
   ]
 }
@@ -69,11 +84,11 @@ if (!crashpad_is_fuchsia && !crashpad_is_ios) {
 
     deps = [
       ":tool_support",
+      "$mini_chromium_source_parent:base",
       "../build:default_exe_manifest_win",
       "../compat",
       "../minidump",
       "../snapshot",
-      "$mini_chromium_source_parent:base",
       "../util",
     ]
 
@@ -103,9 +118,9 @@ if (crashpad_is_mac || crashpad_is_fuchsia) {
 
     deps = [
       ":tool_support",
+      "$mini_chromium_source_parent:base",
       "../client",
       "../compat",
-      "$mini_chromium_source_parent:base",
       "../util",
     ]
   }
@@ -117,8 +132,8 @@ if (crashpad_is_mac) {
 
     deps = [
       ":tool_support",
-      "../compat",
       "$mini_chromium_source_parent:base",
+      "../compat",
       "../util",
     ]
   }
@@ -138,8 +153,8 @@ if (crashpad_is_mac) {
 
     deps = [
       ":tool_support",
-      "../compat",
       "$mini_chromium_source_parent:base",
+      "../compat",
       "../util",
     ]
   }
@@ -154,8 +169,9 @@ if (crashpad_is_mac) {
 
     deps = [
       ":tool_support",
-      "../compat",
       "$mini_chromium_source_parent:base",
+      "../build:apple_enable_arc",
+      "../compat",
       "../util",
     ]
   }
diff --git a/external_imported/sentry-native/external/crashpad/tools/CMakeLists.txt b/external_imported/sentry-native/external/crashpad/tools/CMakeLists.txt
index 5ad79d5d5..4dfd7b2f6 100644
--- a/external_imported/sentry-native/external/crashpad/tools/CMakeLists.txt
+++ b/external_imported/sentry-native/external/crashpad/tools/CMakeLists.txt
@@ -12,6 +12,27 @@ add_library(crashpad::tools ALIAS crashpad_tools)
 crashpad_install_target(crashpad_tools)
 
 if(CRASHPAD_BUILD_TOOLS)
+    add_executable(dump_minidump_annotations
+        dump_minidump_annotations.cc
+    )
+    target_link_libraries(dump_minidump_annotations PRIVATE
+        crashpad_client
+        crashpad_snapshot
+        crashpad_util
+        crashpad_getopt
+        crashpad_tools
+    )
+    if(MSVC)
+        target_compile_options(dump_minidump_annotations PRIVATE
+            $<$<COMPILE_LANGUAGE:C,CXX>:/wd4201> # nonstandard extension used : nameless struct/union
+        )
+        target_compile_definitions(dump_minidump_annotations PRIVATE
+            WIN32_LEAN_AND_MEAN
+            NOMINMAX
+        )
+    endif()
+    crashpad_install_target(dump_minidump_annotations)
+
     add_executable(crashpad_database_util
         crashpad_database_util.cc
     )
@@ -21,6 +42,12 @@ if(CRASHPAD_BUILD_TOOLS)
         crashpad_getopt
         crashpad_tools
     )
+    if(MSVC)
+        target_compile_definitions(crashpad_database_util PRIVATE
+            WIN32_LEAN_AND_MEAN
+            NOMINMAX
+        )
+    endif()
     crashpad_install_target(crashpad_database_util)
 
     add_executable(crashpad_http_upload
@@ -34,6 +61,12 @@ if(CRASHPAD_BUILD_TOOLS)
         crashpad_zlib
         mini_chromium
     )
+    if(MSVC)
+        target_compile_definitions(crashpad_http_upload PRIVATE
+            WIN32_LEAN_AND_MEAN
+            NOMINMAX
+        )
+    endif()
     crashpad_install_target(crashpad_http_upload)
 
     add_executable(crashpad_generate_dump
@@ -46,16 +79,24 @@ if(CRASHPAD_BUILD_TOOLS)
         crashpad_tools
         mini_chromium
     )
-    if(APPLE)
-        # FIXME: cmake 3.13 added target_link_options
-        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -sectcreate __TEXT __info_plist \"${CMAKE_CURRENT_SOURCE_DIR}/mac/sectaskaccess_info.plist\"")
+    if(MSVC)
+        target_compile_definitions(crashpad_generate_dump PRIVATE
+            WIN32_LEAN_AND_MEAN
+            NOMINMAX
+        )
     endif()
     crashpad_install_target(crashpad_generate_dump)
 
     if(APPLE)
+        function(setup_apple_tool target)
+            target_link_options(${target} PRIVATE LINKER:-sectcreate,__TEXT,__info_plist,${CMAKE_CURRENT_SOURCE_DIR}/mac/sectaskaccess_info.plist)
+            target_include_directories(${target} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/..")
+        endfunction()
+
         add_executable(run_with_crashpad
             run_with_crashpad.cc
         )
+        setup_apple_tool(run_with_crashpad)
         target_link_libraries(run_with_crashpad PRIVATE
             crashpad_client
             crashpad_compat
@@ -68,6 +109,7 @@ if(CRASHPAD_BUILD_TOOLS)
         add_executable(catch_exception_tool
             mac/catch_exception_tool.cc
         )
+        setup_apple_tool(catch_exception_tool)
         target_link_libraries(catch_exception_tool PRIVATE
             crashpad_compat
             crashpad_tools
@@ -79,22 +121,21 @@ if(CRASHPAD_BUILD_TOOLS)
         add_executable(exception_port_tool
             mac/exception_port_tool.cc
         )
+        setup_apple_tool(exception_port_tool)
         target_link_libraries(exception_port_tool PRIVATE
             crashpad_compat
             crashpad_tools
             crashpad_util
             mini_chromium
         )
-        # FIXME: cmake 3.13 added target_link_options
-        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -sectcreate __TEXT __info_plist \"${CMAKE_CURRENT_SOURCE_DIR}/mac/sectaskaccess_info.plist\"")
-        crashpad_install_target(exception_port_tool)
 
         add_executable(on_demand_service_tool
             mac/on_demand_service_tool.mm
         )
+        setup_apple_tool(on_demand_service_tool)
         target_link_libraries(on_demand_service_tool PRIVATE
-            -framework CoreFoundation
-            -framework Foundation
+            "-framework CoreFoundation"
+            "-framework Foundation"
             crashpad_compat
             crashpad_tools
             crashpad_util
diff --git a/external_imported/sentry-native/external/crashpad/tools/dump_minidump_annotations.cc b/external_imported/sentry-native/external/crashpad/tools/dump_minidump_annotations.cc
new file mode 100644
index 000000000..1c26c1b3d
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/tools/dump_minidump_annotations.cc
@@ -0,0 +1,147 @@
+// Copyright 2023 The Crashpad Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include <getopt.h>
+
+#include "base/files/file_path.h"
+#include "client/annotation.h"
+#include "util/file/file_reader.h"
+#include "snapshot/minidump/process_snapshot_minidump.h"
+#include "tools/tool_support.h"
+
+namespace crashpad {
+namespace {
+
+void Usage(const base::FilePath& me) {
+  // clang-format off
+  fprintf(stderr,
+"Usage: %" PRFilePath " [OPTION]... PATH\n"
+"Dump annotations from minidumps.\n"
+"\n"
+"      --help                      display this help and exit\n"
+"      --version                   output version information and exit\n",
+          me.value().c_str());
+  // clang-format on
+  ToolSupport::UsageTail(me);
+}
+
+struct Options {
+  const char* minidump;
+};
+
+int DumpMinidumpAnnotationsMain(int argc, char* argv[]) {
+  const base::FilePath argv0(
+      ToolSupport::CommandLineArgumentToFilePathStringType(argv[0]));
+  const base::FilePath me(argv0.BaseName());
+
+  enum OptionFlags {
+    // Long options without short equivalents.
+    kOptionLastChar = 255,
+    kOptionMinidump,
+
+    // Standard options.
+    kOptionHelp = -2,
+    kOptionVersion = -3,
+  };
+
+  static constexpr option long_options[] = {
+      {"minidump", required_argument, nullptr, kOptionMinidump},
+      {"help", no_argument, nullptr, kOptionHelp},
+      {"version", no_argument, nullptr, kOptionVersion},
+      {nullptr, 0, nullptr, 0},
+  };
+
+  Options options = {};
+
+  int opt;
+  while ((opt = getopt_long(argc, argv, "", long_options, nullptr)) != -1) {
+    switch (opt) {
+      case kOptionMinidump: {
+        options.minidump = optarg;
+        break;
+      }
+      case kOptionHelp: {
+        Usage(me);
+        return EXIT_SUCCESS;
+      }
+      case kOptionVersion: {
+        ToolSupport::Version(me);
+        return EXIT_SUCCESS;
+      }
+      default: {
+        ToolSupport::UsageHint(me, nullptr);
+        return EXIT_FAILURE;
+      }
+    }
+  }
+  argc -= optind;
+  argv += optind;
+
+  if (!options.minidump) {
+    ToolSupport::UsageHint(me, "--minidump is required");
+    return EXIT_FAILURE;
+  }
+
+  FileReader reader;
+  if (!reader.Open(base::FilePath(
+      ToolSupport::CommandLineArgumentToFilePathStringType(
+          options.minidump)))) {
+    return EXIT_FAILURE;
+  }
+
+  ProcessSnapshotMinidump snapshot;
+  if (!snapshot.Initialize(&reader)) {
+    return EXIT_FAILURE;
+  }
+
+  for (const ModuleSnapshot* module : snapshot.Modules()) {
+    printf("Module: %s\n", module->Name().c_str());
+    printf("  Simple Annotations\n");
+    for (const auto& kv : module->AnnotationsSimpleMap()) {
+      printf("    simple_annotations[\"%s\"] = %s\n",
+             kv.first.c_str(), kv.second.c_str());
+    }
+
+    printf("  Vectored Annotations\n");
+    int index = 0;
+    for (const std::string& annotation : module->AnnotationsVector()) {
+      printf("    vectored_annotations[%d] = %s\n", index, annotation.c_str());
+      index++;
+    }
+
+    printf("  Annotation Objects\n");
+    for (const AnnotationSnapshot& annotation : module->AnnotationObjects()) {
+      printf("    annotation_objects[\"%s\"] = ", annotation.name.c_str());
+      if (annotation.type != static_cast<uint16_t>(Annotation::Type::kString)) {
+
+        printf("<non-string value, not printing>\n");
+        continue;
+      }
+
+      std::string value(reinterpret_cast<const char*>(annotation.value.data()),
+                        annotation.value.size());
+
+      printf("%s\n", value.c_str());
+    }
+  }
+
+  return EXIT_SUCCESS;
+}
+
+}  // namespace
+}  // namespace crashpad
+
+int main(int argc, char* argv[]) {
+  return crashpad::DumpMinidumpAnnotationsMain(argc, argv);
+}
diff --git a/external_imported/sentry-native/external/crashpad/tools/generate_dump.cc b/external_imported/sentry-native/external/crashpad/tools/generate_dump.cc
index f0aad1ba2..75e0e5351 100644
--- a/external_imported/sentry-native/external/crashpad/tools/generate_dump.cc
+++ b/external_imported/sentry-native/external/crashpad/tools/generate_dump.cc
@@ -38,7 +38,7 @@
 #if BUILDFLAG(IS_APPLE)
 #include <mach/mach.h>
 
-#include "base/mac/scoped_mach_port.h"
+#include "base/apple/scoped_mach_port.h"
 #include "snapshot/mac/process_snapshot_mac.h"
 #include "util/mach/scoped_task_suspend.h"
 #include "util/mach/task_for_pid.h"
@@ -144,7 +144,7 @@ int GenerateDumpMain(int argc, char* argv[]) {
   if (task == TASK_NULL) {
     return EXIT_FAILURE;
   }
-  base::mac::ScopedMachSendRight task_owner(task);
+  base::apple::ScopedMachSendRight task_owner(task);
 
   // This tool may have been installed as a setuid binary so that TaskForPID()
   // could succeed. Drop any privileges now that they’re no longer necessary.
diff --git a/external_imported/sentry-native/external/crashpad/tools/mac/catch_exception_tool.cc b/external_imported/sentry-native/external/crashpad/tools/mac/catch_exception_tool.cc
index 8d71a3372..3f2265972 100644
--- a/external_imported/sentry-native/external/crashpad/tools/mac/catch_exception_tool.cc
+++ b/external_imported/sentry-native/external/crashpad/tools/mac/catch_exception_tool.cc
@@ -24,9 +24,9 @@
 #include <string>
 #include <vector>
 
+#include "base/apple/mach_logging.h"
 #include "base/files/scoped_file.h"
 #include "base/logging.h"
-#include "base/mac/mach_logging.h"
 #include "tools/tool_support.h"
 #include "util/mach/bootstrap.h"
 #include "util/mach/exc_server_variants.h"
@@ -267,8 +267,8 @@ int CatchExceptionToolMain(int argc, char* argv[]) {
     return EXIT_FAILURE;
   }
 
-  base::mac::ScopedMachReceiveRight
-      service_port(BootstrapCheckIn(options.mach_service));
+  base::apple::ScopedMachReceiveRight service_port(
+      BootstrapCheckIn(options.mach_service));
   if (service_port == kMachPortNull) {
     return EXIT_FAILURE;
   }
diff --git a/external_imported/sentry-native/external/crashpad/tools/mac/exception_port_tool.cc b/external_imported/sentry-native/external/crashpad/tools/mac/exception_port_tool.cc
index 0c0a2aa8d..437c15f48 100644
--- a/external_imported/sentry-native/external/crashpad/tools/mac/exception_port_tool.cc
+++ b/external_imported/sentry-native/external/crashpad/tools/mac/exception_port_tool.cc
@@ -25,8 +25,8 @@
 #include <string>
 #include <vector>
 
-#include "base/mac/mach_logging.h"
-#include "base/mac/scoped_mach_port.h"
+#include "base/apple/mach_logging.h"
+#include "base/apple/scoped_mach_port.h"
 #include "tools/tool_support.h"
 #include "util/mach/bootstrap.h"
 #include "util/mach/exception_ports.h"
@@ -43,7 +43,7 @@ namespace {
 //!     destruction.
 //!
 //! This class effectively implements what a vector of
-//! base::mac::ScopedMachSendRight objects would be.
+//! base::apple::ScopedMachSendRight objects would be.
 //!
 //! The various “show� operations performed by this program display Mach ports
 //! by their names as they are known in this task. For this to be useful, rights
@@ -191,7 +191,7 @@ bool ParseHandlerString(const char* handler_string_ro,
 // |mach_send_right_pool|.
 void ShowBootstrapService(const std::string& service_name,
                           MachSendRightPool* mach_send_right_pool) {
-  base::mac::ScopedMachSendRight service_port(BootstrapLookUp(service_name));
+  base::apple::ScopedMachSendRight service_port(BootstrapLookUp(service_name));
   if (service_port == kMachPortNull) {
     return;
   }
@@ -283,7 +283,7 @@ void ShowExceptionPorts(const ExceptionPorts& exception_ports,
 // desired.
 bool SetExceptionPort(const ExceptionHandlerDescription* description,
                       mach_port_t target_port) {
-  base::mac::ScopedMachSendRight service_port;
+  base::apple::ScopedMachSendRight service_port;
   if (description->handler.compare(
           0, strlen(kHandlerBootstrapColon), kHandlerBootstrapColon) == 0) {
     const char* service_name =
@@ -490,7 +490,7 @@ int ExceptionPortToolMain(int argc, char* argv[]) {
     return kExitFailure;
   }
 
-  base::mac::ScopedMachSendRight alternate_task_owner;
+  base::apple::ScopedMachSendRight alternate_task_owner;
   if (options.pid) {
     if (argc) {
       ToolSupport::UsageHint(me, "cannot combine -p with COMMAND");
diff --git a/external_imported/sentry-native/external/crashpad/tools/mac/on_demand_service_tool.mm b/external_imported/sentry-native/external/crashpad/tools/mac/on_demand_service_tool.mm
index 41896ff8f..05ddae1d4 100644
--- a/external_imported/sentry-native/external/crashpad/tools/mac/on_demand_service_tool.mm
+++ b/external_imported/sentry-native/external/crashpad/tools/mac/on_demand_service_tool.mm
@@ -24,7 +24,7 @@
 #include <string>
 #include <vector>
 
-#include "base/mac/foundation_util.h"
+#include "base/apple/bridging.h"
 #include "base/strings/sys_string_conversions.h"
 #include "tools/tool_support.h"
 #include "util/mac/service_management.h"
@@ -158,13 +158,13 @@ int OnDemandServiceToolMain(int argc, char* argv[]) {
           }
 
           NSMutableDictionary* mutable_job_dictionary =
-              [[job_dictionary mutableCopy] autorelease];
+              [job_dictionary mutableCopy];
           mutable_job_dictionary[@LAUNCH_JOBKEY_MACHSERVICES] = mach_services;
           job_dictionary = mutable_job_dictionary;
         }
 
         CFDictionaryRef job_dictionary_cf =
-            base::mac::NSToCFCast(job_dictionary);
+            base::apple::NSToCFPtrCast(job_dictionary);
         if (!ServiceManagementSubmitJob(job_dictionary_cf)) {
           fprintf(stderr, "%s: failed to submit job\n", me.c_str());
           return EXIT_FAILURE;
diff --git a/external_imported/sentry-native/external/crashpad/tools/run_with_crashpad.cc b/external_imported/sentry-native/external/crashpad/tools/run_with_crashpad.cc
index 1f60081d6..59abff1e9 100644
--- a/external_imported/sentry-native/external/crashpad/tools/run_with_crashpad.cc
+++ b/external_imported/sentry-native/external/crashpad/tools/run_with_crashpad.cc
@@ -102,6 +102,7 @@ int RunWithCrashpadMain(int argc, char* argv[]) {
     kOptionAnnotation,
     kOptionDatabase,
     kOptionURL,
+    kOptionHTTPProxy,
 
     // Standard options.
     kOptionHelp = -2,
@@ -113,6 +114,7 @@ int RunWithCrashpadMain(int argc, char* argv[]) {
       {"annotation", required_argument, nullptr, kOptionAnnotation},
       {"database", required_argument, nullptr, kOptionDatabase},
       {"url", required_argument, nullptr, kOptionURL},
+      {"http-proxy", optional_argument, nullptr, kOptionHTTPProxy},
       {"argument", required_argument, nullptr, kOptionArgument},
       {"help", no_argument, nullptr, kOptionHelp},
       {"version", no_argument, nullptr, kOptionVersion},
@@ -124,6 +126,7 @@ int RunWithCrashpadMain(int argc, char* argv[]) {
     std::map<std::string, std::string> annotations;
     std::string database;
     std::string url;
+    std::string httpProxy;
     std::vector<std::string> arguments;
   } options = {};
   options.handler = "crashpad_handler";
@@ -158,6 +161,10 @@ int RunWithCrashpadMain(int argc, char* argv[]) {
         options.url = optarg;
         break;
       }
+      case kOptionHTTPProxy: {
+        options.httpProxy = optarg;
+        break;
+      }
       case kOptionArgument: {
         options.arguments.push_back(optarg);
         break;
@@ -190,6 +197,7 @@ int RunWithCrashpadMain(int argc, char* argv[]) {
                                     base::FilePath(options.database),
                                     base::FilePath(),
                                     options.url,
+                                    options.httpProxy,
                                     options.annotations,
                                     options.arguments,
                                     false,
diff --git a/external_imported/sentry-native/external/crashpad/tools/run_with_crashpad.md b/external_imported/sentry-native/external/crashpad/tools/run_with_crashpad.md
index 7210c1d41..69302eef8 100644
--- a/external_imported/sentry-native/external/crashpad/tools/run_with_crashpad.md
+++ b/external_imported/sentry-native/external/crashpad/tools/run_with_crashpad.md
@@ -27,7 +27,7 @@ run_with_crashpad—Run a program with a Crashpad exception handler
 ## Description
 
 Starts a Crashpad exception handler server such as
-[crashpad_handler(8)](../../handler/crashpad_handler.md) and becomes its client,
+[crashpad_handler(8)](../handler/crashpad_handler.md) and becomes its client,
 setting an exception port referencing the handler. Then, executes _COMMAND_
 along with any arguments specified (_ARG…_) with the new exception port in
 effect.
@@ -88,7 +88,7 @@ Illegal instruction: 4
 ```
 
 Starts a Crashpad exception handler server at a nonstandard path, and runs
-[exception_port_tool(1)](exception_port_tool.md) to show the task-level
+[exception_port_tool(1)](mac/exception_port_tool.md) to show the task-level
 exception ports.
 
 ```
@@ -118,8 +118,8 @@ task exception port 0, mask 0x1c00 (CRASH|RESOURCE|GUARD), port 0x30b, behavior
 
 ## See Also
 
-[crashpad_handler(8)](../../handler/crashpad_handler.md),
-[exception_port_tool(1)](exception_port_tool.md)
+[crashpad_handler(8)](../handler/crashpad_handler.md),
+[exception_port_tool(1)](mac/exception_port_tool.md)
 
 ## Resources
 
diff --git a/external_imported/sentry-native/external/crashpad/util/BUILD.gn b/external_imported/sentry-native/external/crashpad/util/BUILD.gn
index b84a251a5..7e06fcdac 100644
--- a/external_imported/sentry-native/external/crashpad/util/BUILD.gn
+++ b/external_imported/sentry-native/external/crashpad/util/BUILD.gn
@@ -19,7 +19,7 @@ if (crashpad_is_in_chromium) {
   import("//build/config/sanitizers/sanitizers.gni")
 }
 
-if (crashpad_is_mac || crashpad_is_ios) {
+if (crashpad_is_apple) {
   if (crashpad_is_in_chromium || crashpad_is_in_fuchsia) {
     import("//build/config/sysroot.gni")
   } else {
@@ -317,7 +317,7 @@ crashpad_static_library("util") {
     }
   }
 
-  if (crashpad_is_mac || crashpad_is_ios) {
+  if (crashpad_is_apple) {
     sources += [
       "mac/xattr.cc",
       "mac/xattr.h",
@@ -401,10 +401,10 @@ crashpad_static_library("util") {
       "ios/raw_logging.h",
       "ios/scoped_background_task.h",
       "ios/scoped_background_task.mm",
-      "ios/scoped_vm_read.cc",
-      "ios/scoped_vm_read.h",
       "ios/scoped_vm_map.cc",
       "ios/scoped_vm_map.h",
+      "ios/scoped_vm_read.cc",
+      "ios/scoped_vm_read.h",
     ]
   }
 
@@ -432,6 +432,8 @@ crashpad_static_library("util") {
       "linux/exception_information.h",
       "linux/memory_map.cc",
       "linux/memory_map.h",
+      "linux/pac_helper.cc",
+      "linux/pac_helper.h",
       "linux/proc_stat_reader.cc",
       "linux/proc_stat_reader.h",
       "linux/proc_task_reader.cc",
@@ -553,11 +555,12 @@ crashpad_static_library("util") {
       "fuchsia/scoped_task_suspend.cc",
       "fuchsia/scoped_task_suspend.h",
       "fuchsia/traits.h",
-      "misc/capture_context_fuchsia.S",
       "misc/paths_fuchsia.cc",
       "process/process_memory_fuchsia.cc",
       "process/process_memory_fuchsia.h",
     ]
+
+    sources -= [ "misc/capture_context.h" ]
   }
 
   public_configs = [ "..:crashpad_config" ]
@@ -583,13 +586,12 @@ crashpad_static_library("util") {
 
   configs = [ "../build:flock_always_supported_defines" ]
 
-  if (crashpad_is_mac || crashpad_is_ios) {
+  if (crashpad_is_apple) {
     include_dirs += [ "$root_gen_dir" ]
-    deps += [ ":mig_output" ]
-  }
-
-  if (crashpad_is_ios) {
-    deps += [ "../build:ios_enable_arc" ]
+    deps += [
+      ":mig_output",
+      "../build:apple_enable_arc",
+    ]
   }
 
   if (crashpad_is_mac && !crashpad_is_in_fuchsia) {
@@ -650,6 +652,10 @@ crashpad_static_library("net") {
     "$mini_chromium_source_parent:base",
   ]
 
+  if (crashpad_is_apple) {
+    deps += [ "../build:apple_enable_arc" ]
+  }
+
   if (crashpad_is_mac && !crashpad_is_in_fuchsia) {
     sources += [ "net/http_transport_mac.mm" ]
   }
@@ -802,7 +808,7 @@ source_set("util_test") {
     sources += [ "posix/scoped_mmap_test.cc" ]
   }
 
-  if (crashpad_is_mac || crashpad_is_ios) {
+  if (crashpad_is_apple) {
     sources += [
       "mac/xattr_test.cc",
       "mach/composite_mach_message_server_test.cc",
@@ -838,8 +844,8 @@ source_set("util_test") {
     sources += [
       "ios/ios_intermediate_dump_reader_test.cc",
       "ios/ios_intermediate_dump_writer_test.cc",
-      "ios/scoped_vm_read_test.cc",
       "ios/scoped_vm_map_test.cc",
+      "ios/scoped_vm_read_test.cc",
     ]
 
     sources -= [
@@ -864,7 +870,10 @@ source_set("util_test") {
   }
 
   if (crashpad_is_fuchsia) {
-    sources += [ "misc/capture_context_test_util_fuchsia.cc" ]
+    sources -= [
+      "misc/capture_context_test.cc",
+      "misc/capture_context_test_util.h",
+    ]
   }
 
   if (crashpad_is_win) {
@@ -917,6 +926,10 @@ source_set("util_test") {
     }
   }
 
+  if (crashpad_is_apple) {
+    deps += [ "../build:apple_enable_arc" ]
+  }
+
   if (crashpad_is_mac) {
     frameworks = [ "Foundation.framework" ]
   }
diff --git a/external_imported/sentry-native/external/crashpad/util/CMakeLists.txt b/external_imported/sentry-native/external/crashpad/util/CMakeLists.txt
index b8918f2e8..02ff865a4 100644
--- a/external_imported/sentry-native/external/crashpad/util/CMakeLists.txt
+++ b/external_imported/sentry-native/external/crashpad/util/CMakeLists.txt
@@ -267,6 +267,10 @@ if(LINUX OR ANDROID)
 
         SET(HTTP_TRANSPORT_IMPL net/http_transport_libcurl.cc)
     else()
+        find_package(OpenSSL)
+        if(OPENSSL_FOUND)
+            set(CRASHPAD_USE_BORINGSSL ON)
+        endif()
         SET(HTTP_TRANSPORT_IMPL net/http_transport_socket.cc)
     endif()
     
@@ -285,6 +289,8 @@ if(LINUX OR ANDROID)
         linux/exception_information.h
         linux/memory_map.cc
         linux/memory_map.h
+        linux/pac_helper.cc
+        linux/pac_helper.h
         linux/proc_stat_reader.cc
         linux/proc_stat_reader.h
         linux/proc_task_reader.cc
@@ -379,7 +385,7 @@ if(WIN32)
         win/traits.h
         win/xp_compat.h
     )
-    if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm")
+    if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm|ARM64")
         target_sources(crashpad_util PRIVATE
             misc/capture_context_win_arm64.asm
         )
@@ -520,7 +526,9 @@ endif()
 if(WIN32)
     target_link_libraries(crashpad_util PRIVATE user32 version winhttp)
     if(MSVC)
-        target_compile_options(crashpad_util PRIVATE "/wd4201")
+        target_compile_options(crashpad_util PRIVATE
+            $<$<COMPILE_LANGUAGE:C,CXX>:/wd4201> # nonstandard extension used : nameless struct/union.
+        )
         if(CMAKE_SIZEOF_VOID_P EQUAL 4)
             set(CMAKE_ASM_MASM_FLAGS "${CMAKE_ASM_MASM_FLAGS} /safeseh")
         endif()
diff --git a/external_imported/sentry-native/external/crashpad/util/file/directory_reader_posix.cc b/external_imported/sentry-native/external/crashpad/util/file/directory_reader_posix.cc
index d046eb114..352991d61 100644
--- a/external_imported/sentry-native/external/crashpad/util/file/directory_reader_posix.cc
+++ b/external_imported/sentry-native/external/crashpad/util/file/directory_reader_posix.cc
@@ -19,6 +19,7 @@
 #include <string.h>
 #include <sys/types.h>
 
+#include "base/check.h"
 #include "base/logging.h"
 
 namespace crashpad {
diff --git a/external_imported/sentry-native/external/crashpad/util/file/directory_reader_win.cc b/external_imported/sentry-native/external/crashpad/util/file/directory_reader_win.cc
index e1bb38ec7..952511831 100644
--- a/external_imported/sentry-native/external/crashpad/util/file/directory_reader_win.cc
+++ b/external_imported/sentry-native/external/crashpad/util/file/directory_reader_win.cc
@@ -16,6 +16,7 @@
 
 #include <string.h>
 
+#include "base/check.h"
 #include "base/logging.h"
 
 namespace crashpad {
diff --git a/external_imported/sentry-native/external/crashpad/util/file/file_io_posix.cc b/external_imported/sentry-native/external/crashpad/util/file/file_io_posix.cc
index 07c24c311..6d02462bd 100644
--- a/external_imported/sentry-native/external/crashpad/util/file/file_io_posix.cc
+++ b/external_imported/sentry-native/external/crashpad/util/file/file_io_posix.cc
@@ -24,6 +24,7 @@
 #include <algorithm>
 #include <limits>
 
+#include "base/check_op.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/notreached.h"
diff --git a/external_imported/sentry-native/external/crashpad/util/file/file_io_win.cc b/external_imported/sentry-native/external/crashpad/util/file/file_io_win.cc
index 595e35794..cb9ea1474 100644
--- a/external_imported/sentry-native/external/crashpad/util/file/file_io_win.cc
+++ b/external_imported/sentry-native/external/crashpad/util/file/file_io_win.cc
@@ -17,6 +17,7 @@
 #include <algorithm>
 #include <limits>
 
+#include "base/check_op.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/notreached.h"
diff --git a/external_imported/sentry-native/external/crashpad/util/file/file_reader.cc b/external_imported/sentry-native/external/crashpad/util/file/file_reader.cc
index b4e895634..f8fcf818f 100644
--- a/external_imported/sentry-native/external/crashpad/util/file/file_reader.cc
+++ b/external_imported/sentry-native/external/crashpad/util/file/file_reader.cc
@@ -14,6 +14,7 @@
 
 #include "util/file/file_reader.h"
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "build/build_config.h"
diff --git a/external_imported/sentry-native/external/crashpad/util/file/file_writer.cc b/external_imported/sentry-native/external/crashpad/util/file/file_writer.cc
index 74c55d64c..a5bfa0811 100644
--- a/external_imported/sentry-native/external/crashpad/util/file/file_writer.cc
+++ b/external_imported/sentry-native/external/crashpad/util/file/file_writer.cc
@@ -20,6 +20,7 @@
 
 #include <algorithm>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "build/build_config.h"
diff --git a/external_imported/sentry-native/external/crashpad/util/file/filesystem_test.cc b/external_imported/sentry-native/external/crashpad/util/file/filesystem_test.cc
index eb492cdfc..bff3e3235 100644
--- a/external_imported/sentry-native/external/crashpad/util/file/filesystem_test.cc
+++ b/external_imported/sentry-native/external/crashpad/util/file/filesystem_test.cc
@@ -487,6 +487,10 @@ TEST(Filesystem, GetFileSize) {
   EXPECT_EQ(filesize, sizeof(kTestFileContent));
 
 #if !BUILDFLAG(IS_FUCHSIA)
+  if (!CanCreateSymbolicLinks()) {
+    GTEST_SKIP();
+  }
+
   // Create a link to a file.
   base::FilePath link(temp_dir.path().Append(FILE_PATH_LITERAL("link")));
   ASSERT_TRUE(CreateSymbolicLink(filepath, link));
@@ -517,13 +521,15 @@ TEST(Filesystem, GetDirectorySize) {
   writer2.Close();
 
 #if !BUILDFLAG(IS_FUCHSIA)
-  // Create a link to a file.
-  base::FilePath link(dir.Append(FILE_PATH_LITERAL("link")));
-  ASSERT_TRUE(CreateSymbolicLink(filepath2, link));
-
-  // Create a link to a dir.
-  base::FilePath linkdir(temp_dir.path().Append(FILE_PATH_LITERAL("link")));
-  ASSERT_TRUE(CreateSymbolicLink(dir, linkdir));
+  if (CanCreateSymbolicLinks()) {
+    // Create a link to a file.
+    base::FilePath link(dir.Append(FILE_PATH_LITERAL("link")));
+    ASSERT_TRUE(CreateSymbolicLink(filepath2, link));
+
+    // Create a link to a dir.
+    base::FilePath linkdir(temp_dir.path().Append(FILE_PATH_LITERAL("link")));
+    ASSERT_TRUE(CreateSymbolicLink(dir, linkdir));
+  }
 #endif  // !BUILDFLAG(IS_FUCHSIA)
 
   uint64_t filesize = GetDirectorySize(temp_dir.path());
diff --git a/external_imported/sentry-native/external/crashpad/util/file/filesystem_win.cc b/external_imported/sentry-native/external/crashpad/util/file/filesystem_win.cc
index 510d8e447..b6454b3ab 100644
--- a/external_imported/sentry-native/external/crashpad/util/file/filesystem_win.cc
+++ b/external_imported/sentry-native/external/crashpad/util/file/filesystem_win.cc
@@ -18,7 +18,6 @@
 #include <windows.h>
 
 #include "base/logging.h"
-#include "base/strings/utf_string_conversions.h"
 #include "util/file/directory_reader.h"
 #include "util/misc/time.h"
 
@@ -35,7 +34,7 @@ bool IsSymbolicLink(const base::FilePath& path) {
                                             nullptr,
                                             0));
   if (!handle.is_valid()) {
-    PLOG(ERROR) << "FindFirstFileEx " << base::WideToUTF8(path.value());
+    PLOG(ERROR) << "FindFirstFileEx " << path;
     return false;
   }
 
@@ -45,7 +44,7 @@ bool IsSymbolicLink(const base::FilePath& path) {
 
 bool LoggingRemoveDirectoryImpl(const base::FilePath& path) {
   if (!RemoveDirectory(path.value().c_str())) {
-    PLOG(ERROR) << "RemoveDirectory " << base::WideToUTF8(path.value());
+    PLOG(ERROR) << "RemoveDirectory " << path;
     return false;
   }
   return true;
@@ -69,13 +68,13 @@ bool FileModificationTime(const base::FilePath& path, timespec* mtime) {
                    flags,
                    nullptr));
   if (!handle.is_valid()) {
-    PLOG(ERROR) << "CreateFile " << base::WideToUTF8(path.value());
+    PLOG(ERROR) << "CreateFile " << path;
     return false;
   }
 
   FILETIME file_mtime;
   if (!GetFileTime(handle.get(), nullptr, nullptr, &file_mtime)) {
-    PLOG(ERROR) << "GetFileTime " << base::WideToUTF8(path.value());
+    PLOG(ERROR) << "GetFileTime " << path;
     return false;
   }
   *mtime = FiletimeToTimespecEpoch(file_mtime);
@@ -90,12 +89,12 @@ bool LoggingCreateDirectory(const base::FilePath& path,
   }
   if (may_reuse && GetLastError() == ERROR_ALREADY_EXISTS) {
     if (!IsDirectory(path, true)) {
-      LOG(ERROR) << base::WideToUTF8(path.value()) << " not a directory";
+      LOG(ERROR) << path << " not a directory";
       return false;
     }
     return true;
   }
-  PLOG(ERROR) << "CreateDirectory " << base::WideToUTF8(path.value());
+  PLOG(ERROR) << "CreateDirectory " << path;
   return false;
 }
 
@@ -104,8 +103,7 @@ bool MoveFileOrDirectory(const base::FilePath& source,
   if (!MoveFileEx(source.value().c_str(),
                   dest.value().c_str(),
                   IsDirectory(source, false) ? 0 : MOVEFILE_REPLACE_EXISTING)) {
-    PLOG(ERROR) << "MoveFileEx" << base::WideToUTF8(source.value()) << ", "
-                << base::WideToUTF8(dest.value());
+    PLOG(ERROR) << "MoveFileEx" << source << ", " << dest;
     return false;
   }
   return true;
@@ -114,7 +112,7 @@ bool MoveFileOrDirectory(const base::FilePath& source,
 bool IsRegularFile(const base::FilePath& path) {
   DWORD fileattr = GetFileAttributes(path.value().c_str());
   if (fileattr == INVALID_FILE_ATTRIBUTES) {
-    PLOG(ERROR) << "GetFileAttributes " << base::WideToUTF8(path.value());
+    PLOG(ERROR) << "GetFileAttributes " << path;
     return false;
   }
   if ((fileattr & FILE_ATTRIBUTE_DIRECTORY) != 0 ||
@@ -127,7 +125,7 @@ bool IsRegularFile(const base::FilePath& path) {
 bool IsDirectory(const base::FilePath& path, bool allow_symlinks) {
   DWORD fileattr = GetFileAttributes(path.value().c_str());
   if (fileattr == INVALID_FILE_ATTRIBUTES) {
-    PLOG(ERROR) << "GetFileAttributes " << base::WideToUTF8(path.value());
+    PLOG(ERROR) << "GetFileAttributes " << path;
     return false;
   }
   if (!allow_symlinks && (fileattr & FILE_ATTRIBUTE_REPARSE_POINT) != 0) {
@@ -146,7 +144,7 @@ bool LoggingRemoveFile(const base::FilePath& path) {
   }
 
   if (!DeleteFile(path.value().c_str())) {
-    PLOG(ERROR) << "DeleteFile " << base::WideToUTF8(path.value());
+    PLOG(ERROR) << "DeleteFile " << path;
     return false;
   }
   return true;
@@ -154,7 +152,7 @@ bool LoggingRemoveFile(const base::FilePath& path) {
 
 bool LoggingRemoveDirectory(const base::FilePath& path) {
   if (IsSymbolicLink(path)) {
-    LOG(ERROR) << "Not a directory " << base::WideToUTF8(path.value());
+    LOG(ERROR) << "Not a directory " << path;
     return false;
   }
   return LoggingRemoveDirectoryImpl(path);
@@ -169,7 +167,7 @@ uint64_t GetFileSize(const base::FilePath& filepath) {
   if (ret_value == 0) {
     return statbuf.st_size;
   }
-  PLOG(ERROR) << "stat " << filepath.value().c_str();
+  PLOG(ERROR) << "stat " << filepath;
   return 0;
 }
 
diff --git a/external_imported/sentry-native/external/crashpad/util/file/string_file.cc b/external_imported/sentry-native/external/crashpad/util/file/string_file.cc
index 93a4f3209..959d04740 100644
--- a/external_imported/sentry-native/external/crashpad/util/file/string_file.cc
+++ b/external_imported/sentry-native/external/crashpad/util/file/string_file.cc
@@ -19,6 +19,7 @@
 #include <algorithm>
 #include <limits>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "base/numerics/safe_math.h"
 #include "util/misc/implicit_cast.h"
diff --git a/external_imported/sentry-native/external/crashpad/util/fuchsia/scoped_task_suspend.cc b/external_imported/sentry-native/external/crashpad/util/fuchsia/scoped_task_suspend.cc
index 0dd542518..ef057ae3c 100644
--- a/external_imported/sentry-native/external/crashpad/util/fuchsia/scoped_task_suspend.cc
+++ b/external_imported/sentry-native/external/crashpad/util/fuchsia/scoped_task_suspend.cc
@@ -21,6 +21,7 @@
 
 #include <vector>
 
+#include "base/check_op.h"
 #include "base/fuchsia/fuchsia_logging.h"
 #include "base/logging.h"
 #include "util/fuchsia/koid_utilities.h"
diff --git a/external_imported/sentry-native/external/crashpad/util/ios/ios_intermediate_dump_writer.cc b/external_imported/sentry-native/external/crashpad/util/ios/ios_intermediate_dump_writer.cc
index bccd1539c..67d804b30 100644
--- a/external_imported/sentry-native/external/crashpad/util/ios/ios_intermediate_dump_writer.cc
+++ b/external_imported/sentry-native/external/crashpad/util/ios/ios_intermediate_dump_writer.cc
@@ -23,6 +23,7 @@
 #include <ostream>
 
 #include "base/check.h"
+#include "base/check_op.h"
 #include "base/posix/eintr_wrapper.h"
 #include "build/build_config.h"
 #include "util/ios/raw_logging.h"
@@ -83,12 +84,10 @@ bool IOSIntermediateDumpWriter::Close() {
   if (fd_ < 0) {
     return true;
   }
-  if (!FlushWriteBuffer()) {
-    return false;
-  }
-  int fd = fd_;
+  const bool flushed = FlushWriteBuffer();
+  const bool closed = RawLoggingCloseFile(fd_);
   fd_ = -1;
-  return RawLoggingCloseFile(fd);
+  return flushed && closed;
 }
 
 bool IOSIntermediateDumpWriter::AddPropertyCString(IntermediateDumpKey key,
diff --git a/external_imported/sentry-native/external/crashpad/util/ios/ios_intermediate_dump_writer_test.cc b/external_imported/sentry-native/external/crashpad/util/ios/ios_intermediate_dump_writer_test.cc
index d1eb583e5..2bf2b780e 100644
--- a/external_imported/sentry-native/external/crashpad/util/ios/ios_intermediate_dump_writer_test.cc
+++ b/external_imported/sentry-native/external/crashpad/util/ios/ios_intermediate_dump_writer_test.cc
@@ -17,8 +17,8 @@
 #include <fcntl.h>
 #include <mach/mach.h>
 
+#include "base/apple/scoped_mach_vm.h"
 #include "base/files/scoped_file.h"
-#include "base/mac/scoped_mach_vm.h"
 #include "base/posix/eintr_wrapper.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
@@ -141,8 +141,8 @@ TEST_F(IOSIntermediateDumpWriterTest, MissingPropertyString) {
                         region_size,
                         VM_FLAGS_ANYWHERE),
             0);
-  base::mac::ScopedMachVM vm_owner(reinterpret_cast<vm_address_t>(region),
-                                   region_size);
+  base::apple::ScopedMachVM vm_owner(reinterpret_cast<vm_address_t>(region),
+                                     region_size);
 
   // Fill first page with 'A' and second with 'B'.
   memset(region, 'A', page_size);
diff --git a/external_imported/sentry-native/external/crashpad/util/ios/ios_system_data_collector.mm b/external_imported/sentry-native/external/crashpad/util/ios/ios_system_data_collector.mm
index 564c8e792..28ede1824 100644
--- a/external_imported/sentry-native/external/crashpad/util/ios/ios_system_data_collector.mm
+++ b/external_imported/sentry-native/external/crashpad/util/ios/ios_system_data_collector.mm
@@ -21,7 +21,7 @@
 #include <TargetConditionals.h>
 #import <UIKit/UIKit.h>
 
-#include "base/mac/mach_logging.h"
+#include "base/apple/mach_logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
diff --git a/external_imported/sentry-native/external/crashpad/util/ios/scoped_background_task.mm b/external_imported/sentry-native/external/crashpad/util/ios/scoped_background_task.mm
index b4900963e..2af7bb8e5 100644
--- a/external_imported/sentry-native/external/crashpad/util/ios/scoped_background_task.mm
+++ b/external_imported/sentry-native/external/crashpad/util/ios/scoped_background_task.mm
@@ -16,10 +16,6 @@
 
 #import <Foundation/Foundation.h>
 
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 namespace crashpad {
 namespace internal {
 
diff --git a/external_imported/sentry-native/external/crashpad/util/ios/scoped_vm_map_test.cc b/external_imported/sentry-native/external/crashpad/util/ios/scoped_vm_map_test.cc
index e88568a7a..6a6b3ebc9 100644
--- a/external_imported/sentry-native/external/crashpad/util/ios/scoped_vm_map_test.cc
+++ b/external_imported/sentry-native/external/crashpad/util/ios/scoped_vm_map_test.cc
@@ -16,7 +16,7 @@
 
 #include <sys/time.h>
 
-#include "base/mac/scoped_mach_vm.h"
+#include "base/apple/scoped_mach_vm.h"
 #include "gtest/gtest.h"
 #include "test/mac/mach_errors.h"
 
@@ -73,8 +73,8 @@ TEST(ScopedVMMapTest, MissingMiddleVM) {
                                  VM_FLAGS_ANYWHERE);
   ASSERT_EQ(kr, KERN_SUCCESS) << MachErrorMessage(kr, "vm_allocate");
 
-  base::mac::ScopedMachVM vm_owner(reinterpret_cast<vm_address_t>(region),
-                                   region_size);
+  base::apple::ScopedMachVM vm_owner(reinterpret_cast<vm_address_t>(region),
+                                     region_size);
 
   internal::ScopedVMMap<char> vmmap_missing_middle;
   ASSERT_TRUE(vmmap_missing_middle.Map(region, region_size));
diff --git a/external_imported/sentry-native/external/crashpad/util/ios/scoped_vm_read_test.cc b/external_imported/sentry-native/external/crashpad/util/ios/scoped_vm_read_test.cc
index c8b2e7583..29e5c232e 100644
--- a/external_imported/sentry-native/external/crashpad/util/ios/scoped_vm_read_test.cc
+++ b/external_imported/sentry-native/external/crashpad/util/ios/scoped_vm_read_test.cc
@@ -16,7 +16,7 @@
 
 #include <sys/time.h>
 
-#include "base/mac/scoped_mach_vm.h"
+#include "base/apple/scoped_mach_vm.h"
 #include "gtest/gtest.h"
 #include "test/mac/mach_errors.h"
 
@@ -68,8 +68,8 @@ TEST(ScopedVMReadTest, MissingMiddleVM) {
                                  VM_FLAGS_ANYWHERE);
   ASSERT_EQ(kr, KERN_SUCCESS) << MachErrorMessage(kr, "vm_allocate");
 
-  base::mac::ScopedMachVM vm_owner(reinterpret_cast<vm_address_t>(region),
-                                   region_size);
+  base::apple::ScopedMachVM vm_owner(reinterpret_cast<vm_address_t>(region),
+                                     region_size);
 
   internal::ScopedVMRead<char> vmread_missing_middle;
   ASSERT_TRUE(vmread_missing_middle.Read(region, region_size));
diff --git a/external_imported/sentry-native/external/crashpad/util/linux/auxiliary_vector_test.cc b/external_imported/sentry-native/external/crashpad/util/linux/auxiliary_vector_test.cc
index 045549740..0c97781fa 100644
--- a/external_imported/sentry-native/external/crashpad/util/linux/auxiliary_vector_test.cc
+++ b/external_imported/sentry-native/external/crashpad/util/linux/auxiliary_vector_test.cc
@@ -96,10 +96,15 @@ void TestAgainstCloneOrSelf(pid_t pid) {
 
   ProcessMemoryLinux memory(&connection);
 
+// AT_PLATFORM is null for RISC-V:
+// https://elixir.bootlin.com/linux/v6.4-rc4/C/ident/ELF_PLATFORM
+#if !defined(ARCH_CPU_RISCV64)
   LinuxVMAddress platform_addr;
   ASSERT_TRUE(aux.GetValue(AT_PLATFORM, &platform_addr));
   std::string platform;
   ASSERT_TRUE(memory.ReadCStringSizeLimited(platform_addr, 10, &platform));
+#endif  // ARCH_CPU_RISCV64
+
 #if defined(ARCH_CPU_X86)
   EXPECT_STREQ(platform.c_str(), "i686");
 #elif defined(ARCH_CPU_X86_64)
diff --git a/external_imported/sentry-native/external/crashpad/util/linux/exception_handler_client.cc b/external_imported/sentry-native/external/crashpad/util/linux/exception_handler_client.cc
index cef493df7..68dc67eff 100644
--- a/external_imported/sentry-native/external/crashpad/util/linux/exception_handler_client.cc
+++ b/external_imported/sentry-native/external/crashpad/util/linux/exception_handler_client.cc
@@ -20,6 +20,7 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "base/posix/eintr_wrapper.h"
 #include "build/build_config.h"
diff --git a/external_imported/sentry-native/external/crashpad/util/linux/memory_map.cc b/external_imported/sentry-native/external/crashpad/util/linux/memory_map.cc
index 2c18f30b6..58de835ed 100644
--- a/external_imported/sentry-native/external/crashpad/util/linux/memory_map.cc
+++ b/external_imported/sentry-native/external/crashpad/util/linux/memory_map.cc
@@ -19,6 +19,7 @@
 #include <sys/sysmacros.h>
 
 #include "base/bit_cast.h"
+#include "base/check_op.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "build/build_config.h"
diff --git a/external_imported/sentry-native/external/crashpad/util/linux/pac_helper.cc b/external_imported/sentry-native/external/crashpad/util/linux/pac_helper.cc
new file mode 100644
index 000000000..a9d5f0456
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/util/linux/pac_helper.cc
@@ -0,0 +1,44 @@
+// Copyright 2023 The Crashpad Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "util/linux/pac_helper.h"
+
+#if defined(__has_feature)
+#define CRASHPAD_HAS_FEATURE(x) __has_feature(x)
+#else
+#define CRASHPAD_HAS_FEATURE(x) 0
+#endif
+
+#if CRASHPAD_HAS_FEATURE(ptrauth_intrinsics)
+  #include <ptrauth.h>
+#endif
+
+#include "util/misc/address_types.h"
+
+namespace crashpad {
+
+VMAddress StripPACBits(VMAddress address) {
+#if CRASHPAD_HAS_FEATURE(ptrauth_intrinsics)
+    address = ptrauth_strip(address, ptrauth_key_function_pointer);
+#elif defined(ARCH_CPU_ARM64)
+    // Strip any pointer authentication bits that are assigned to the address.
+    register uintptr_t x30 __asm("x30") = address;
+    asm("xpaclri" : "+r"(x30));
+    address = x30;
+#endif
+    return address;
+}
+
+}  // namespace crashpad
+
diff --git a/external_imported/sentry-native/external/crashpad/util/linux/pac_helper.h b/external_imported/sentry-native/external/crashpad/util/linux/pac_helper.h
new file mode 100644
index 000000000..6fcea652a
--- /dev/null
+++ b/external_imported/sentry-native/external/crashpad/util/linux/pac_helper.h
@@ -0,0 +1,29 @@
+// Copyright 2023 The Crashpad Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef CRASHPAD_UTIL_LINUX_PAC_HELPER_H_
+#define CRASHPAD_UTIL_LINUX_PAC_HELPER_H_
+
+#include "util/misc/address_types.h"
+
+namespace crashpad {
+
+//! \brief Strips PAC bits from an address
+VMAddress StripPACBits(VMAddress address);
+
+}  // namespace crashpad
+
+
+#endif  // CRASHPAD_UTIL_LINUX_PAC_HELPER_H_
+
diff --git a/external_imported/sentry-native/external/crashpad/util/linux/proc_task_reader.cc b/external_imported/sentry-native/external/crashpad/util/linux/proc_task_reader.cc
index ee8422beb..159d8cac9 100644
--- a/external_imported/sentry-native/external/crashpad/util/linux/proc_task_reader.cc
+++ b/external_imported/sentry-native/external/crashpad/util/linux/proc_task_reader.cc
@@ -18,6 +18,7 @@
 
 #include <iterator>
 
+#include "base/check_op.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
diff --git a/external_imported/sentry-native/external/crashpad/util/linux/ptrace_broker_test.cc b/external_imported/sentry-native/external/crashpad/util/linux/ptrace_broker_test.cc
index 0b9e917c9..11f1684ab 100644
--- a/external_imported/sentry-native/external/crashpad/util/linux/ptrace_broker_test.cc
+++ b/external_imported/sentry-native/external/crashpad/util/linux/ptrace_broker_test.cc
@@ -277,7 +277,10 @@ class SameBitnessTest : public Multiprocess {
   ScopedMmap mapping_;
 };
 
-TEST(PtraceBroker, SameBitness) {
+// TODO(https://crbug.com/1459865): This test consistently fails on ASAN/LSAN
+// but it's not clear if this test is correct in the general case (see comment 2
+// on that issue).
+TEST(PtraceBroker, DISABLED_SameBitness) {
   SameBitnessTest test;
   test.Run();
 }
diff --git a/external_imported/sentry-native/external/crashpad/util/linux/ptrace_client.cc b/external_imported/sentry-native/external/crashpad/util/linux/ptrace_client.cc
index c04ca5b4f..56bc55568 100644
--- a/external_imported/sentry-native/external/crashpad/util/linux/ptrace_client.cc
+++ b/external_imported/sentry-native/external/crashpad/util/linux/ptrace_client.cc
@@ -21,6 +21,7 @@
 #include <iterator>
 #include <string>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "util/file/file_io.h"
diff --git a/external_imported/sentry-native/external/crashpad/util/linux/ptracer.cc b/external_imported/sentry-native/external/crashpad/util/linux/ptracer.cc
index 25c89ea95..a985cb1d1 100644
--- a/external_imported/sentry-native/external/crashpad/util/linux/ptracer.cc
+++ b/external_imported/sentry-native/external/crashpad/util/linux/ptracer.cc
@@ -20,6 +20,7 @@
 #include <sys/ptrace.h>
 #include <sys/uio.h>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "util/misc/from_pointer_cast.h"
@@ -398,6 +399,37 @@ bool GetThreadArea64(pid_t tid,
   return true;
 }
 
+#elif defined(ARCH_CPU_RISCV64)
+
+bool GetFloatingPointRegisters64(pid_t tid,
+                                 FloatContext* context,
+                                 bool can_log) {
+  iovec iov;
+  iov.iov_base = context;
+  iov.iov_len = sizeof(*context);
+  if (ptrace(
+          PTRACE_GETREGSET, tid, reinterpret_cast<void*>(NT_PRFPREG), &iov) !=
+      0) {
+    PLOG_IF(ERROR, can_log) << "ptrace";
+    return false;
+  }
+  if (iov.iov_len != sizeof(context->f64)) {
+    LOG_IF(ERROR, can_log) << "Unexpected registers size " << iov.iov_len
+                           << " != " << sizeof(context->f64);
+    return false;
+  }
+  return true;
+}
+
+bool GetThreadArea64(pid_t tid,
+                     const ThreadContext& context,
+                     LinuxVMAddress* address,
+                     bool can_log) {
+  // Thread pointer register
+  *address = context.t64.regs[3];
+  return true;
+}
+
 #else
 #error Port.
 #endif  // ARCH_CPU_X86_FAMILY
@@ -426,6 +458,7 @@ size_t GetGeneralPurposeRegistersAndLength(pid_t tid,
   return iov.iov_len;
 }
 
+#if !defined(ARCH_CPU_RISCV64)
 bool GetGeneralPurposeRegisters32(pid_t tid,
                                   ThreadContext* context,
                                   bool can_log) {
@@ -437,6 +470,7 @@ bool GetGeneralPurposeRegisters32(pid_t tid,
   }
   return true;
 }
+#endif
 
 bool GetGeneralPurposeRegisters64(pid_t tid,
                                   ThreadContext* context,
@@ -500,12 +534,16 @@ bool Ptracer::GetThreadInfo(pid_t tid, ThreadInfo* info) {
                            can_log_);
   }
 
+#if !defined(ARCH_CPU_RISCV64)
   return GetGeneralPurposeRegisters32(tid, &info->thread_context, can_log_) &&
          GetFloatingPointRegisters32(tid, &info->float_context, can_log_) &&
          GetThreadArea32(tid,
                          info->thread_context,
                          &info->thread_specific_data_address,
                          can_log_);
+#else
+  return false;
+#endif
 }
 
 ssize_t Ptracer::ReadUpTo(pid_t pid,
diff --git a/external_imported/sentry-native/external/crashpad/util/linux/thread_info.h b/external_imported/sentry-native/external/crashpad/util/linux/thread_info.h
index 8b94effef..808b35a3a 100644
--- a/external_imported/sentry-native/external/crashpad/util/linux/thread_info.h
+++ b/external_imported/sentry-native/external/crashpad/util/linux/thread_info.h
@@ -15,6 +15,7 @@
 #ifndef CRASHPAD_UTIL_LINUX_THREAD_INFO_H_
 #define CRASHPAD_UTIL_LINUX_THREAD_INFO_H_
 
+#include <features.h>
 #include <stdint.h>
 #include <sys/user.h>
 
@@ -28,6 +29,11 @@
 #include <android/api-level.h>
 #endif
 
+// x86_64 has compilation errors if asm/ptrace.h is #included.
+#if defined(ARCH_CPU_RISCV64)
+#include <asm/ptrace.h>
+#endif
+
 namespace crashpad {
 
 //! \brief The set of general purpose registers for an architecture family.
@@ -79,6 +85,8 @@ union ThreadContext {
     uint32_t cp0_status;
     uint32_t cp0_cause;
     uint32_t padding1_;
+#elif defined(ARCH_CPU_RISCV64)
+    // 32 bit RISC-V not supported
 #else
 #error Port.
 #endif  // ARCH_CPU_X86_FAMILY
@@ -132,12 +140,17 @@ union ThreadContext {
     uint64_t cp0_badvaddr;
     uint64_t cp0_status;
     uint64_t cp0_cause;
+#elif defined(ARCH_CPU_RISCV64)
+    // Reflects user_regs_struct in asm/ptrace.h.
+    uint64_t pc;
+    uint64_t regs[31];
 #else
 #error Port.
 #endif  // ARCH_CPU_X86_FAMILY
   } t64;
 
-#if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM64)
+#if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM64) || \
+    defined(ARCH_CPU_RISCV64)
   using NativeThreadContext = user_regs_struct;
 #elif defined(ARCH_CPU_ARMEL)
   using NativeThreadContext = user_regs;
@@ -145,7 +158,7 @@ union ThreadContext {
 // No appropriate NativeThreadsContext type available for MIPS
 #else
 #error Port.
-#endif  // ARCH_CPU_X86_FAMILY || ARCH_CPU_ARM64
+#endif  // ARCH_CPU_X86_FAMILY || ARCH_CPU_ARM64 || ARCH_CPU_RISCV64
 
 #if !defined(ARCH_CPU_MIPS_FAMILY)
 #if defined(ARCH_CPU_32_BITS)
@@ -218,6 +231,8 @@ union FloatContext {
     } fpregs[32];
     uint32_t fpcsr;
     uint32_t fpu_id;
+#elif defined(ARCH_CPU_RISCV64)
+    // 32 bit RISC-V not supported
 #else
 #error Port.
 #endif  // ARCH_CPU_X86_FAMILY
@@ -252,6 +267,10 @@ union FloatContext {
     double fpregs[32];
     uint32_t fpcsr;
     uint32_t fpu_id;
+#elif defined(ARCH_CPU_RISCV64)
+    // Reflects __riscv_d_ext_state in asm/ptrace.h
+    uint64_t fpregs[32];
+    uint64_t fcsr;
 #else
 #error Port.
 #endif  // ARCH_CPU_X86_FAMILY
@@ -274,13 +293,15 @@ union FloatContext {
                 "Size mismatch");
 #elif defined(ARCH_CPU_ARMEL)
   static_assert(sizeof(f32_t::fpregs) == sizeof(user_fpregs), "Size mismatch");
-#if !defined(__GLIBC__)
+#if defined(__BIONIC__)
   static_assert(sizeof(f32_t::vfp) == sizeof(user_vfp), "Size mismatch");
 #endif
 #elif defined(ARCH_CPU_ARM64)
   static_assert(sizeof(f64) == sizeof(user_fpsimd_struct), "Size mismatch");
 #elif defined(ARCH_CPU_MIPS_FAMILY)
 // No appropriate floating point context native type for available MIPS.
+#elif defined(ARCH_CPU_RISCV64)
+  static_assert(sizeof(f64) == sizeof(__riscv_d_ext_state), "Size mismatch");
 #else
 #error Port.
 #endif  // ARCH_CPU_X86
diff --git a/external_imported/sentry-native/external/crashpad/util/mac/launchd.mm b/external_imported/sentry-native/external/crashpad/util/mac/launchd.mm
index eb94ff37d..e2ced32de 100644
--- a/external_imported/sentry-native/external/crashpad/util/mac/launchd.mm
+++ b/external_imported/sentry-native/external/crashpad/util/mac/launchd.mm
@@ -16,9 +16,10 @@
 
 #import <Foundation/Foundation.h>
 
-#include "base/mac/foundation_util.h"
+#include "base/apple/bridging.h"
+#include "base/apple/foundation_util.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/mac/scoped_launch_data.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/strings/sys_string_conversions.h"
 #include "util/misc/implicit_cast.h"
 
@@ -34,8 +35,8 @@ launch_data_t CFPropertyToLaunchData(CFPropertyListRef property_cf) {
     CFTypeID type_id_cf = CFGetTypeID(property_cf);
 
     if (type_id_cf == CFDictionaryGetTypeID()) {
-      NSDictionary* dictionary_ns = base::mac::CFToNSCast(
-          base::mac::CFCastStrict<CFDictionaryRef>(property_cf));
+      NSDictionary* dictionary_ns = base::apple::CFToNSPtrCast(
+          base::apple::CFCastStrict<CFDictionaryRef>(property_cf));
       base::mac::ScopedLaunchData dictionary_launch(
           LaunchDataAlloc(LAUNCH_DATA_DICTIONARY));
 
@@ -45,7 +46,7 @@ launch_data_t CFPropertyToLaunchData(CFPropertyListRef property_cf) {
         }
 
         CFPropertyListRef value_cf =
-            implicit_cast<CFPropertyListRef>(dictionary_ns[key]);
+            (__bridge CFPropertyListRef)dictionary_ns[key];
         launch_data_t value_launch = CFPropertyToLaunchData(value_cf);
         if (!value_launch) {
           return nullptr;
@@ -58,15 +59,14 @@ launch_data_t CFPropertyToLaunchData(CFPropertyListRef property_cf) {
       data_launch = dictionary_launch.release();
 
     } else if (type_id_cf == CFArrayGetTypeID()) {
-      NSArray* array_ns = base::mac::CFToNSCast(
-          base::mac::CFCastStrict<CFArrayRef>(property_cf));
+      NSArray* array_ns = base::apple::CFToNSPtrCast(
+          base::apple::CFCastStrict<CFArrayRef>(property_cf));
       base::mac::ScopedLaunchData array_launch(
           LaunchDataAlloc(LAUNCH_DATA_ARRAY));
       size_t index = 0;
 
       for (id element_ns in array_ns) {
-        CFPropertyListRef element_cf =
-            implicit_cast<CFPropertyListRef>(element_ns);
+        CFPropertyListRef element_cf = (__bridge CFPropertyListRef)element_ns;
         launch_data_t element_launch = CFPropertyToLaunchData(element_cf);
         if (!element_launch) {
           return nullptr;
@@ -78,8 +78,9 @@ launch_data_t CFPropertyToLaunchData(CFPropertyListRef property_cf) {
       data_launch = array_launch.release();
 
     } else if (type_id_cf == CFNumberGetTypeID()) {
-      CFNumberRef number_cf = base::mac::CFCastStrict<CFNumberRef>(property_cf);
-      NSNumber* number_ns = base::mac::CFToNSCast(number_cf);
+      CFNumberRef number_cf =
+          base::apple::CFCastStrict<CFNumberRef>(property_cf);
+      NSNumber* number_ns = base::apple::CFToNSPtrCast(number_cf);
       switch (CFNumberGetType(number_cf)) {
         case kCFNumberSInt8Type:
         case kCFNumberSInt16Type:
@@ -109,12 +110,12 @@ launch_data_t CFPropertyToLaunchData(CFPropertyListRef property_cf) {
 
     } else if (type_id_cf == CFBooleanGetTypeID()) {
       CFBooleanRef boolean_cf =
-          base::mac::CFCastStrict<CFBooleanRef>(property_cf);
+          base::apple::CFCastStrict<CFBooleanRef>(property_cf);
       data_launch = LaunchDataNewBool(CFBooleanGetValue(boolean_cf));
 
     } else if (type_id_cf == CFStringGetTypeID()) {
-      NSString* string_ns = base::mac::CFToNSCast(
-          base::mac::CFCastStrict<CFStringRef>(property_cf));
+      NSString* string_ns = base::apple::CFToNSPtrCast(
+          base::apple::CFCastStrict<CFStringRef>(property_cf));
 
       // -fileSystemRepresentation might be more correct than -UTF8String,
       // because these strings can hold paths. The analogous function in
@@ -125,14 +126,14 @@ launch_data_t CFPropertyToLaunchData(CFPropertyListRef property_cf) {
       data_launch = LaunchDataNewString([string_ns UTF8String]);
 
     } else if (type_id_cf == CFDataGetTypeID()) {
-      NSData* data_ns = base::mac::CFToNSCast(
-          base::mac::CFCastStrict<CFDataRef>(property_cf));
+      NSData* data_ns = base::apple::CFToNSPtrCast(
+          base::apple::CFCastStrict<CFDataRef>(property_cf));
       data_launch = LaunchDataNewOpaque([data_ns bytes], [data_ns length]);
     } else {
-      base::ScopedCFTypeRef<CFStringRef> type_name_cf(
+      base::apple::ScopedCFTypeRef<CFStringRef> type_name_cf(
           CFCopyTypeIDDescription(type_id_cf));
       DLOG(ERROR) << "unable to convert CFTypeID " << type_id_cf << " ("
-                  << base::SysCFStringRefToUTF8(type_name_cf) << ")";
+                  << base::SysCFStringRefToUTF8(type_name_cf.get()) << ")";
     }
 
     return data_launch;
diff --git a/external_imported/sentry-native/external/crashpad/util/mac/launchd_test.mm b/external_imported/sentry-native/external/crashpad/util/mac/launchd_test.mm
index 5949594ca..27e0bdeaf 100644
--- a/external_imported/sentry-native/external/crashpad/util/mac/launchd_test.mm
+++ b/external_imported/sentry-native/external/crashpad/util/mac/launchd_test.mm
@@ -23,6 +23,7 @@
 #include <iterator>
 #include <limits>
 
+#include "base/apple/bridging.h"
 #include "base/mac/scoped_launch_data.h"
 #include "gtest/gtest.h"
 #include "util/stdlib/objc.h"
@@ -60,7 +61,8 @@
 
     for (size_t index = 0; index < std::size(integer_nses); ++index) {
       NSNumber* integer_ns = integer_nses[index];
-      launch_data.reset(CFPropertyToLaunchData(integer_ns));
+      launch_data.reset(
+          CFPropertyToLaunchData(base::apple::NSToCFPtrCast(integer_ns)));
       ASSERT_TRUE(launch_data.get());
       ASSERT_EQ(LaunchDataGetType(launch_data.get()), LAUNCH_DATA_INTEGER);
       EXPECT_EQ(LaunchDataGetInteger(launch_data.get()),
@@ -90,7 +92,8 @@
 
     for (size_t index = 0; index < std::size(double_nses); ++index) {
       NSNumber* double_ns = double_nses[index];
-      launch_data.reset(CFPropertyToLaunchData(double_ns));
+      launch_data.reset(
+          CFPropertyToLaunchData(base::apple::NSToCFPtrCast(double_ns)));
       ASSERT_TRUE(launch_data.get());
       ASSERT_EQ(LaunchDataGetType(launch_data.get()), LAUNCH_DATA_REAL);
       double expected_double_value = [double_ns doubleValue];
@@ -109,17 +112,19 @@
   @autoreleasepool {
     base::mac::ScopedLaunchData launch_data;
 
-    NSNumber* bool_nses[] = {
-      @NO,
-      @YES,
+    // Use CFBooleanRefs here because calling NSToCFPtrCast on an NSNumber
+    // boolean can fail. Casting an NSNumber expects a CFNumberRef as a result
+    // but a cast boolean will end up as a CFBooleanRef.
+    CFBooleanRef bools[] = {
+        kCFBooleanFalse,
+        kCFBooleanTrue,
     };
 
-    for (size_t index = 0; index < std::size(bool_nses); ++index) {
-      NSNumber* bool_ns = bool_nses[index];
-      launch_data.reset(CFPropertyToLaunchData(bool_ns));
+    for (CFBooleanRef bool_cf : bools) {
+      launch_data.reset(CFPropertyToLaunchData(bool_cf));
       ASSERT_TRUE(launch_data.get());
       ASSERT_EQ(LaunchDataGetType(launch_data.get()), LAUNCH_DATA_BOOL);
-      if ([bool_ns boolValue]) {
+      if (CFBooleanGetValue(bool_cf)) {
         EXPECT_TRUE(LaunchDataGetBool(launch_data.get()));
       } else {
         EXPECT_FALSE(LaunchDataGetBool(launch_data.get()));
@@ -140,7 +145,8 @@
 
     for (size_t index = 0; index < std::size(string_nses); ++index) {
       NSString* string_ns = string_nses[index];
-      launch_data.reset(CFPropertyToLaunchData(string_ns));
+      launch_data.reset(
+          CFPropertyToLaunchData(base::apple::NSToCFPtrCast(string_ns)));
       ASSERT_TRUE(launch_data.get());
       ASSERT_EQ(LaunchDataGetType(launch_data.get()), LAUNCH_DATA_STRING);
       EXPECT_STREQ([string_ns UTF8String],
@@ -156,7 +162,8 @@
     static constexpr uint8_t data_c[] = {
         1, 2, 3, 4, 5, 6, 7, 8, 0, 0, 0, 0, 0, 0, 0, 0, 9, 8, 7, 6, 5, 4, 3, 2};
     NSData* data_ns = [NSData dataWithBytes:data_c length:sizeof(data_c)];
-    launch_data.reset(CFPropertyToLaunchData(data_ns));
+    launch_data.reset(
+        CFPropertyToLaunchData(base::apple::NSToCFPtrCast(data_ns)));
     ASSERT_TRUE(launch_data.get());
     ASSERT_EQ(LaunchDataGetType(launch_data.get()), LAUNCH_DATA_OPAQUE);
     EXPECT_EQ(LaunchDataGetOpaqueSize(launch_data.get()), sizeof(data_c));
@@ -174,7 +181,8 @@
       @"key" : @"value",
     };
 
-    launch_data.reset(CFPropertyToLaunchData(dictionary_ns));
+    launch_data.reset(
+        CFPropertyToLaunchData(base::apple::NSToCFPtrCast(dictionary_ns)));
     ASSERT_TRUE(launch_data.get());
     ASSERT_EQ(LaunchDataGetType(launch_data.get()), LAUNCH_DATA_DICTIONARY);
     EXPECT_EQ(LaunchDataDictGetCount(launch_data.get()), [dictionary_ns count]);
@@ -193,7 +201,8 @@
 
     NSArray* array_ns = @[ @"element_1", @"element_2", ];
 
-    launch_data.reset(CFPropertyToLaunchData(array_ns));
+    launch_data.reset(
+        CFPropertyToLaunchData(base::apple::NSToCFPtrCast(array_ns)));
     ASSERT_TRUE(launch_data.get());
     ASSERT_EQ(LaunchDataGetType(launch_data.get()), LAUNCH_DATA_ARRAY);
     EXPECT_EQ(LaunchDataArrayGetCount(launch_data.get()), [array_ns count]);
@@ -219,18 +228,20 @@
     base::mac::ScopedLaunchData launch_data;
 
     NSDate* date = [NSDate date];
-    launch_data.reset(CFPropertyToLaunchData(date));
+    launch_data.reset(CFPropertyToLaunchData(base::apple::NSToCFPtrCast(date)));
     EXPECT_FALSE(launch_data.get());
 
     NSDictionary* date_dictionary = @{
       @"key" : @"value",
       @"date" : date,
     };
-    launch_data.reset(CFPropertyToLaunchData(date_dictionary));
+    launch_data.reset(
+        CFPropertyToLaunchData(base::apple::NSToCFPtrCast(date_dictionary)));
     EXPECT_FALSE(launch_data.get());
 
     NSArray* date_array = @[ @"string_1", date, @"string_2", ];
-    launch_data.reset(CFPropertyToLaunchData(date_array));
+    launch_data.reset(
+        CFPropertyToLaunchData(base::apple::NSToCFPtrCast(date_array)));
     EXPECT_FALSE(launch_data.get());
   }
 }
@@ -249,7 +260,8 @@
       },
     };
 
-    launch_data.reset(CFPropertyToLaunchData(job_dictionary));
+    launch_data.reset(
+        CFPropertyToLaunchData(base::apple::NSToCFPtrCast(job_dictionary)));
     ASSERT_TRUE(launch_data.get());
     ASSERT_EQ(LaunchDataGetType(launch_data.get()), LAUNCH_DATA_DICTIONARY);
     EXPECT_EQ(LaunchDataDictGetCount(launch_data.get()), 4u);
diff --git a/external_imported/sentry-native/external/crashpad/util/mac/mac_util.cc b/external_imported/sentry-native/external/crashpad/util/mac/mac_util.cc
index a13823435..cef238729 100644
--- a/external_imported/sentry-native/external/crashpad/util/mac/mac_util.cc
+++ b/external_imported/sentry-native/external/crashpad/util/mac/mac_util.cc
@@ -21,10 +21,10 @@
 #include <sys/types.h>
 #include <sys/utsname.h>
 
+#include "base/apple/foundation_util.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/check_op.h"
 #include "base/logging.h"
-#include "base/mac/foundation_util.h"
-#include "base/mac/scoped_cftyperef.h"
 #include "base/mac/scoped_ioobject.h"
 #include "base/notreached.h"
 #include "base/strings/string_number_conversions.h"
@@ -45,7 +45,6 @@ extern "C" {
 // TryCFCopy*VersionDictionary() helpers to account for the possibility that
 // they may not be present at runtime.
 CFDictionaryRef _CFCopySystemVersionDictionary() WEAK_IMPORT;
-CFDictionaryRef _CFCopyServerVersionDictionary() WEAK_IMPORT;
 
 // Don’t use these constants with CFDictionaryGetValue() directly, use them with
 // the TryCFDictionaryGetValue() wrapper to account for the possibility that
@@ -85,8 +84,8 @@ int DarwinMajorVersion() {
   int rv = uname(&uname_info);
   PCHECK(rv == 0) << "uname";
 
-  DCHECK_EQ(strcmp(uname_info.sysname, "Darwin"), 0) << "unexpected sysname "
-                                                     << uname_info.sysname;
+  DCHECK_EQ(strcmp(uname_info.sysname, "Darwin"), 0)
+      << "unexpected sysname " << uname_info.sysname;
 
   char* dot = strchr(uname_info.release, '.');
   CHECK(dot);
@@ -109,13 +108,6 @@ CFDictionaryRef TryCFCopySystemVersionDictionary() {
   return nullptr;
 }
 
-CFDictionaryRef TryCFCopyServerVersionDictionary() {
-  if (_CFCopyServerVersionDictionary) {
-    return _CFCopyServerVersionDictionary();
-  }
-  return nullptr;
-}
-
 const void* TryCFDictionaryGetValue(CFDictionaryRef dictionary,
                                     const void* value) {
   if (value) {
@@ -174,9 +166,9 @@ bool StringToVersionNumbers(const std::string& version,
 
 std::string IORegistryEntryDataPropertyAsString(io_registry_entry_t entry,
                                                 CFStringRef key) {
-  base::ScopedCFTypeRef<CFTypeRef> property(
+  base::apple::ScopedCFTypeRef<CFTypeRef> property(
       IORegistryEntryCreateCFProperty(entry, key, kCFAllocatorDefault, 0));
-  CFDataRef data = base::mac::CFCast<CFDataRef>(property);
+  CFDataRef data = base::apple::CFCast<CFDataRef>(property.get());
   if (data && CFDataGetLength(data) > 0) {
     return reinterpret_cast<const char*>(CFDataGetBytePtr(data));
   }
@@ -242,25 +234,19 @@ bool MacOSVersionComponents(int* major,
                             int* minor,
                             int* bugfix,
                             std::string* build,
-                            bool* server,
                             std::string* version_string) {
-  base::ScopedCFTypeRef<CFDictionaryRef> dictionary(
-      TryCFCopyServerVersionDictionary());
-  if (dictionary) {
-    *server = true;
-  } else {
-    dictionary.reset(TryCFCopySystemVersionDictionary());
-    if (!dictionary) {
-      LOG(ERROR) << "_CFCopySystemVersionDictionary failed";
-      return false;
-    }
-    *server = false;
+  base::apple::ScopedCFTypeRef<CFDictionaryRef> dictionary(
+      TryCFCopySystemVersionDictionary());
+  if (!dictionary) {
+    LOG(ERROR) << "_CFCopySystemVersionDictionary failed";
+    return false;
   }
 
   bool success = true;
 
-  CFStringRef version_cf = base::mac::CFCast<CFStringRef>(
-      TryCFDictionaryGetValue(dictionary, _kCFSystemVersionProductVersionKey));
+  CFStringRef version_cf =
+      base::apple::CFCast<CFStringRef>(TryCFDictionaryGetValue(
+          dictionary.get(), _kCFSystemVersionProductVersionKey));
   std::string version;
   if (!version_cf) {
     LOG(ERROR) << "version_cf not found";
@@ -279,8 +265,9 @@ bool MacOSVersionComponents(int* major,
     }
   }
 
-  CFStringRef build_cf = base::mac::CFCast<CFStringRef>(
-      TryCFDictionaryGetValue(dictionary, _kCFSystemVersionBuildVersionKey));
+  CFStringRef build_cf =
+      base::apple::CFCast<CFStringRef>(TryCFDictionaryGetValue(
+          dictionary.get(), _kCFSystemVersionBuildVersionKey));
   if (!build_cf) {
     LOG(ERROR) << "build_cf not found";
     success = false;
@@ -288,8 +275,9 @@ bool MacOSVersionComponents(int* major,
     build->assign(base::SysCFStringRefToUTF8(build_cf));
   }
 
-  CFStringRef product_cf = base::mac::CFCast<CFStringRef>(
-      TryCFDictionaryGetValue(dictionary, _kCFSystemVersionProductNameKey));
+  CFStringRef product_cf =
+      base::apple::CFCast<CFStringRef>(TryCFDictionaryGetValue(
+          dictionary.get(), _kCFSystemVersionProductNameKey));
   std::string product;
   if (!product_cf) {
     LOG(ERROR) << "product_cf not found";
@@ -299,8 +287,9 @@ bool MacOSVersionComponents(int* major,
   }
 
   // This key is not required, and in fact is normally not present.
-  CFStringRef extra_cf = base::mac::CFCast<CFStringRef>(TryCFDictionaryGetValue(
-      dictionary, _kCFSystemVersionProductVersionExtraKey));
+  CFStringRef extra_cf =
+      base::apple::CFCast<CFStringRef>(TryCFDictionaryGetValue(
+          dictionary.get(), _kCFSystemVersionProductVersionExtraKey));
   std::string extra;
   if (extra_cf) {
     extra = base::SysCFStringRefToUTF8(extra_cf);
@@ -327,8 +316,8 @@ void MacModelAndBoard(std::string* model, std::string* board_id) {
       IOServiceGetMatchingService(kIOMasterPortDefault,
                                   IOServiceMatching("IOPlatformExpertDevice")));
   if (platform_expert) {
-    model->assign(
-        IORegistryEntryDataPropertyAsString(platform_expert, CFSTR("model")));
+    model->assign(IORegistryEntryDataPropertyAsString(platform_expert.get(),
+                                                      CFSTR("model")));
 #if defined(ARCH_CPU_X86_FAMILY)
     CFStringRef kBoardProperty = CFSTR("board-id");
 #elif defined(ARCH_CPU_ARM64)
@@ -338,7 +327,7 @@ void MacModelAndBoard(std::string* model, std::string* board_id) {
     // alternative.
     CFStringRef kBoardProperty = CFSTR("target-type");
 #endif
-    board_id->assign(IORegistryEntryDataPropertyAsString(platform_expert,
+    board_id->assign(IORegistryEntryDataPropertyAsString(platform_expert.get(),
                                                          kBoardProperty));
   } else {
     model->clear();
diff --git a/external_imported/sentry-native/external/crashpad/util/mac/mac_util.h b/external_imported/sentry-native/external/crashpad/util/mac/mac_util.h
index c6215e0d8..7a32b5f9e 100644
--- a/external_imported/sentry-native/external/crashpad/util/mac/mac_util.h
+++ b/external_imported/sentry-native/external/crashpad/util/mac/mac_util.h
@@ -65,7 +65,6 @@ bool MacOSVersionComponents(int* major,
                             int* minor,
                             int* bugfix,
                             std::string* build,
-                            bool* server,
                             std::string* version_string);
 
 //! \brief Returns the model name and board ID of the running system.
diff --git a/external_imported/sentry-native/external/crashpad/util/mac/mac_util_test.mm b/external_imported/sentry-native/external/crashpad/util/mac/mac_util_test.mm
index 49ee0903a..e1cc3ad73 100644
--- a/external_imported/sentry-native/external/crashpad/util/mac/mac_util_test.mm
+++ b/external_imported/sentry-native/external/crashpad/util/mac/mac_util_test.mm
@@ -19,7 +19,6 @@
 
 #include <string>
 
-#include "base/mac/scoped_nsobject.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
 
@@ -33,8 +32,8 @@
 // check for with ASSERT_NO_FATAL_FAILURE() or testing::Test::HasFatalFailure().
 void SwVers(NSString* argument, std::string* output) {
   @autoreleasepool {
-    base::scoped_nsobject<NSPipe> pipe([[NSPipe alloc] init]);
-    base::scoped_nsobject<NSTask> task([[NSTask alloc] init]);
+    NSPipe* pipe = [[NSPipe alloc] init];
+    NSTask* task = [[NSTask alloc] init];
     [task setStandardOutput:pipe];
     [task setLaunchPath:@"/usr/bin/sw_vers"];
     [task setArguments:@[ argument ]];
@@ -65,10 +64,9 @@ void SwVers(NSString* argument, std::string* output) {
   int minor;
   int bugfix;
   std::string build;
-  bool server;
   std::string version_string;
-  ASSERT_TRUE(MacOSVersionComponents(
-      &major, &minor, &bugfix, &build, &server, &version_string));
+  ASSERT_TRUE(
+      MacOSVersionComponents(&major, &minor, &bugfix, &build, &version_string));
 
   EXPECT_GE(major, 10);
   EXPECT_LE(major, 99);
@@ -116,10 +114,9 @@ void SwVers(NSString* argument, std::string* output) {
   int minor;
   int bugfix;
   std::string build;
-  bool server;
   std::string version_string;
-  ASSERT_TRUE(MacOSVersionComponents(
-      &major, &minor, &bugfix, &build, &server, &version_string));
+  ASSERT_TRUE(
+      MacOSVersionComponents(&major, &minor, &bugfix, &build, &version_string));
 
   EXPECT_EQ(macos_version_number,
             major * 1'00'00 + minor * 1'00 +
diff --git a/external_imported/sentry-native/external/crashpad/util/mac/service_management_test.mm b/external_imported/sentry-native/external/crashpad/util/mac/service_management_test.mm
index 461228d8c..26c96049c 100644
--- a/external_imported/sentry-native/external/crashpad/util/mac/service_management_test.mm
+++ b/external_imported/sentry-native/external/crashpad/util/mac/service_management_test.mm
@@ -20,8 +20,8 @@
 #include <string>
 #include <vector>
 
-#include "base/mac/foundation_util.h"
-#include "base/mac/scoped_cftyperef.h"
+#include "base/apple/bridging.h"
+#include "base/apple/scoped_cftyperef.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
 #include "gtest/gtest.h"
@@ -124,7 +124,7 @@ void ExpectProcessIsNotRunning(pid_t pid, std::string& last_arg) {
           @[ @"/bin/sh", @"-c", shell_script_ns, ],
     };
     CFDictionaryRef job_dictionary_cf =
-        base::mac::NSToCFCast(job_dictionary_ns);
+        base::apple::NSToCFPtrCast(job_dictionary_ns);
 
     // The job may be left over from a failed previous run.
     if (ServiceManagementIsJobLoaded(kJobLabel)) {
diff --git a/external_imported/sentry-native/external/crashpad/util/mac/xattr.cc b/external_imported/sentry-native/external/crashpad/util/mac/xattr.cc
index ae3555d7a..6c12e9136 100644
--- a/external_imported/sentry-native/external/crashpad/util/mac/xattr.cc
+++ b/external_imported/sentry-native/external/crashpad/util/mac/xattr.cc
@@ -19,6 +19,7 @@
 #include <sys/types.h>
 #include <sys/xattr.h>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/string_number_conversions.h"
diff --git a/external_imported/sentry-native/external/crashpad/util/mach/bootstrap.cc b/external_imported/sentry-native/external/crashpad/util/mach/bootstrap.cc
index be2769b2c..f369f7f30 100644
--- a/external_imported/sentry-native/external/crashpad/util/mach/bootstrap.cc
+++ b/external_imported/sentry-native/external/crashpad/util/mach/bootstrap.cc
@@ -17,7 +17,7 @@
 #include <mach/mach.h>
 #include <servers/bootstrap.h>
 
-#include "base/mac/mach_logging.h"
+#include "base/apple/mach_logging.h"
 
 namespace {
 
@@ -26,7 +26,7 @@ namespace {
 // and the right type returned.
 
 struct BootstrapCheckInTraits {
-  using Type = base::mac::ScopedMachReceiveRight;
+  using Type = base::apple::ScopedMachReceiveRight;
   static kern_return_t Call(mach_port_t bootstrap_port,
                             const char* service_name,
                             mach_port_t* service_port) {
@@ -37,7 +37,7 @@ struct BootstrapCheckInTraits {
 constexpr char BootstrapCheckInTraits::kName[];
 
 struct BootstrapLookUpTraits {
-  using Type = base::mac::ScopedMachSendRight;
+  using Type = base::apple::ScopedMachSendRight;
   static kern_return_t Call(mach_port_t bootstrap_port,
                             const char* service_name,
                             mach_port_t* service_port) {
@@ -73,14 +73,14 @@ typename Traits::Type BootstrapCheckInOrLookUp(
 
 namespace crashpad {
 
-base::mac::ScopedMachReceiveRight BootstrapCheckIn(
+base::apple::ScopedMachReceiveRight BootstrapCheckIn(
     const std::string& service_name) {
   return BootstrapCheckInOrLookUp<BootstrapCheckInTraits>(service_name);
 }
 
-base::mac::ScopedMachSendRight BootstrapLookUp(
+base::apple::ScopedMachSendRight BootstrapLookUp(
     const std::string& service_name) {
-  base::mac::ScopedMachSendRight send(
+  base::apple::ScopedMachSendRight send(
       BootstrapCheckInOrLookUp<BootstrapLookUpTraits>(service_name));
 
   // It’s possible to race the bootstrap server when the receive right
@@ -102,7 +102,7 @@ base::mac::ScopedMachSendRight BootstrapLookUp(
   return send;
 }
 
-base::mac::ScopedMachSendRight SystemCrashReporterHandler() {
+base::apple::ScopedMachSendRight SystemCrashReporterHandler() {
   return BootstrapLookUp("com.apple.ReportCrash");
 }
 
diff --git a/external_imported/sentry-native/external/crashpad/util/mach/bootstrap.h b/external_imported/sentry-native/external/crashpad/util/mach/bootstrap.h
index 362627ebd..35004c329 100644
--- a/external_imported/sentry-native/external/crashpad/util/mach/bootstrap.h
+++ b/external_imported/sentry-native/external/crashpad/util/mach/bootstrap.h
@@ -17,7 +17,7 @@
 
 #include <string>
 
-#include "base/mac/scoped_mach_port.h"
+#include "base/apple/scoped_mach_port.h"
 
 namespace crashpad {
 
@@ -30,7 +30,7 @@ namespace crashpad {
 //!
 //! \return On success, a receive right to the service port. On failure,
 //!     `MACH_PORT_NULL` with a message logged.
-base::mac::ScopedMachReceiveRight BootstrapCheckIn(
+base::apple::ScopedMachReceiveRight BootstrapCheckIn(
     const std::string& service_name);
 
 //! \brief Makes a `boostrap_look_up()` call to the process’ bootstrap server.
@@ -42,7 +42,8 @@ base::mac::ScopedMachReceiveRight BootstrapCheckIn(
 //!
 //! \return On success, a send right to the service port. On failure,
 //!     `MACH_PORT_NULL` with a message logged.
-base::mac::ScopedMachSendRight BootstrapLookUp(const std::string& service_name);
+base::apple::ScopedMachSendRight BootstrapLookUp(
+    const std::string& service_name);
 
 //! \brief Obtains the system’s default Mach exception handler for crash-type
 //!     exceptions.
@@ -56,7 +57,7 @@ base::mac::ScopedMachSendRight BootstrapLookUp(const std::string& service_name);
 //! \return On success, a send right to an `exception_handler_t` corresponding
 //!     to the system’s default crash reporter. On failure, `MACH_PORT_NULL`,
 //!     with a message logged.
-base::mac::ScopedMachSendRight SystemCrashReporterHandler();
+base::apple::ScopedMachSendRight SystemCrashReporterHandler();
 
 }  // namespace crashpad
 
diff --git a/external_imported/sentry-native/external/crashpad/util/mach/bootstrap_test.cc b/external_imported/sentry-native/external/crashpad/util/mach/bootstrap_test.cc
index a4089bf1d..196f59491 100644
--- a/external_imported/sentry-native/external/crashpad/util/mach/bootstrap_test.cc
+++ b/external_imported/sentry-native/external/crashpad/util/mach/bootstrap_test.cc
@@ -14,7 +14,7 @@
 
 #include "util/mach/bootstrap.h"
 
-#include "base/mac/scoped_mach_port.h"
+#include "base/apple/scoped_mach_port.h"
 #include "gtest/gtest.h"
 #include "util/mach/mach_extensions.h"
 #include "util/misc/random_string.h"
@@ -25,7 +25,7 @@ namespace {
 
 TEST(Bootstrap, BootstrapCheckInAndLookUp) {
   // This should always exist.
-  base::mac::ScopedMachSendRight report_crash(
+  base::apple::ScopedMachSendRight report_crash(
       BootstrapLookUp("com.apple.ReportCrash"));
   EXPECT_NE(report_crash, kMachPortNull);
 
@@ -34,11 +34,11 @@ TEST(Bootstrap, BootstrapCheckInAndLookUp) {
 
   {
     // The new service hasn’t checked in yet, so this should fail.
-    base::mac::ScopedMachSendRight send(BootstrapLookUp(service_name));
+    base::apple::ScopedMachSendRight send(BootstrapLookUp(service_name));
     EXPECT_EQ(send, kMachPortNull);
 
     // Check it in.
-    base::mac::ScopedMachReceiveRight receive(BootstrapCheckIn(service_name));
+    base::apple::ScopedMachReceiveRight receive(BootstrapCheckIn(service_name));
     EXPECT_NE(receive, kMachPortNull);
 
     // Now it should be possible to look up the new service.
@@ -46,21 +46,22 @@ TEST(Bootstrap, BootstrapCheckInAndLookUp) {
     EXPECT_NE(send, kMachPortNull);
 
     // It shouldn’t be possible to check the service in while it’s active.
-    base::mac::ScopedMachReceiveRight receive_2(BootstrapCheckIn(service_name));
+    base::apple::ScopedMachReceiveRight receive_2(
+        BootstrapCheckIn(service_name));
     EXPECT_EQ(receive_2, kMachPortNull);
   }
 
   // The new service should be gone now.
-  base::mac::ScopedMachSendRight send(BootstrapLookUp(service_name));
+  base::apple::ScopedMachSendRight send(BootstrapLookUp(service_name));
   EXPECT_EQ(send, kMachPortNull);
 
   // It should be possible to check it in again.
-  base::mac::ScopedMachReceiveRight receive(BootstrapCheckIn(service_name));
+  base::apple::ScopedMachReceiveRight receive(BootstrapCheckIn(service_name));
   EXPECT_NE(receive, kMachPortNull);
 }
 
 TEST(Bootstrap, SystemCrashReporterHandler) {
-  base::mac::ScopedMachSendRight system_crash_reporter_handler(
+  base::apple::ScopedMachSendRight system_crash_reporter_handler(
       SystemCrashReporterHandler());
   EXPECT_TRUE(system_crash_reporter_handler.is_valid());
 }
diff --git a/external_imported/sentry-native/external/crashpad/util/mach/child_port_handshake.cc b/external_imported/sentry-native/external/crashpad/util/mach/child_port_handshake.cc
index 6277a144d..afbf55f19 100644
--- a/external_imported/sentry-native/external/crashpad/util/mach/child_port_handshake.cc
+++ b/external_imported/sentry-native/external/crashpad/util/mach/child_port_handshake.cc
@@ -27,10 +27,10 @@
 #include <iterator>
 #include <utility>
 
+#include "base/apple/mach_logging.h"
+#include "base/apple/scoped_mach_port.h"
 #include "base/check_op.h"
 #include "base/logging.h"
-#include "base/mac/mach_logging.h"
-#include "base/mac/scoped_mach_port.h"
 #include "base/notreached.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/rand_util.h"
@@ -113,7 +113,8 @@ mach_port_t ChildPortHandshakeServer::RunServer(
 
   // Check the new service in with the bootstrap server, obtaining a receive
   // right for it.
-  base::mac::ScopedMachReceiveRight server_port(BootstrapCheckIn(service_name));
+  base::apple::ScopedMachReceiveRight server_port(
+      BootstrapCheckIn(service_name));
   CHECK(server_port.is_valid());
 
   // Share the service name with the client via the pipe.
@@ -137,7 +138,7 @@ mach_port_t ChildPortHandshakeServer::RunServer(
   // MACH_PORT_RIGHT_PORT_SET, to 10.12.0 xnu-3789.1.32/osfmk/ipc/ipc_pset.c
   // filt_machportattach(), which also handles MACH_PORT_TYPE_RECEIVE. Create a
   // new port set and add the receive right to it.
-  base::mac::ScopedMachPortSet server_port_set(
+  base::apple::ScopedMachPortSet server_port_set(
       NewMachPort(MACH_PORT_RIGHT_PORT_SET));
   CHECK(server_port_set.is_valid());
 
@@ -442,7 +443,7 @@ bool ChildPortHandshake::RunClientInternal_SendCheckIn(
     mach_msg_type_name_t right_type) {
   // Get a send right to the server by looking up the service with the bootstrap
   // server by name.
-  base::mac::ScopedMachSendRight server_port(BootstrapLookUp(service_name));
+  base::apple::ScopedMachSendRight server_port(BootstrapLookUp(service_name));
   if (server_port == kMachPortNull) {
     return false;
   }
diff --git a/external_imported/sentry-native/external/crashpad/util/mach/child_port_handshake.h b/external_imported/sentry-native/external/crashpad/util/mach/child_port_handshake.h
index 77a177143..9a0b8e104 100644
--- a/external_imported/sentry-native/external/crashpad/util/mach/child_port_handshake.h
+++ b/external_imported/sentry-native/external/crashpad/util/mach/child_port_handshake.h
@@ -107,7 +107,7 @@ class ChildPortHandshakeTest;
 //!   server_write_fd.reset();
 //!
 //!   // Make a new Mach receive right.
-//!   base::mac::ScopedMachReceiveRight
+//!   base::apple::ScopedMachReceiveRight
 //!       receive_right(NewMachPort(MACH_PORT_RIGHT_RECEIVE));
 //!
 //!   // Make a send right corresponding to the receive right.
@@ -118,7 +118,7 @@ class ChildPortHandshakeTest;
 //!                           MACH_MSG_TYPE_MAKE_SEND,
 //!                           &send_right,
 //!                           &send_right_type);
-//!   base::mac::ScopedMachSendRight send_right_owner(send_right);
+//!   base::apple::ScopedMachSendRight send_right_owner(send_right);
 //!
 //!   // Send the receive right to the child process, retaining the send right
 //!   // for use in the parent process.
@@ -136,7 +136,7 @@ class ChildPortHandshakeTest;
 //!     base::ScopedFD server_write_fd(atoi(argv[1]));
 //!
 //!     // Obtain a receive right from the parent process.
-//!     base::mac::ScopedMachReceiveRight receive_right(
+//!     base::apple::ScopedMachReceiveRight receive_right(
 //!         ChildPortHandshake::RunServerForFD(
 //!             std::move(server_write_fd),
 //!             ChildPortHandshake::PortRightType::kReceiveRight));
diff --git a/external_imported/sentry-native/external/crashpad/util/mach/child_port_handshake_test.cc b/external_imported/sentry-native/external/crashpad/util/mach/child_port_handshake_test.cc
index fc85f5590..e8fe91b72 100644
--- a/external_imported/sentry-native/external/crashpad/util/mach/child_port_handshake_test.cc
+++ b/external_imported/sentry-native/external/crashpad/util/mach/child_port_handshake_test.cc
@@ -14,7 +14,7 @@
 
 #include "util/mach/child_port_handshake.h"
 
-#include "base/mac/scoped_mach_port.h"
+#include "base/apple/scoped_mach_port.h"
 #include "gtest/gtest.h"
 #include "test/multiprocess.h"
 #include "util/mach/child_port_types.h"
@@ -99,8 +99,8 @@ class ChildPortHandshakeTest : public Multiprocess {
       return;
     }
 
-    base::mac::ScopedMachReceiveRight receive_right;
-    base::mac::ScopedMachSendRight send_right;
+    base::apple::ScopedMachReceiveRight receive_right;
+    base::apple::ScopedMachSendRight send_right;
     if (test_type_ == TestType::kClientChecksIn_ReceiveRight) {
       receive_right.reset(child_port_handshake_.RunServer(
           ChildPortHandshake::PortRightType::kReceiveRight));
@@ -152,7 +152,7 @@ class ChildPortHandshakeTest : public Multiprocess {
       }
 
       case TestType::kClientChecksIn_SendOnceRight: {
-        base::mac::ScopedMachReceiveRight receive_right(
+        base::apple::ScopedMachReceiveRight receive_right(
             NewMachPort(MACH_PORT_RIGHT_RECEIVE));
         ASSERT_TRUE(child_port_handshake_.RunClient(
             receive_right.get(), MACH_MSG_TYPE_MAKE_SEND_ONCE));
@@ -372,7 +372,7 @@ TEST(ChildPortHandshake, NoClient) {
   // is similar to kClientDoesNotCheckIn, but because there’s no client at all,
   // the server is guaranteed to see that its pipe partner is gone.
   ChildPortHandshake child_port_handshake;
-  base::mac::ScopedMachSendRight child_port(child_port_handshake.RunServer(
+  base::apple::ScopedMachSendRight child_port(child_port_handshake.RunServer(
       ChildPortHandshake::PortRightType::kSendRight));
   EXPECT_FALSE(child_port.is_valid());
 }
diff --git a/external_imported/sentry-native/external/crashpad/util/mach/exception_ports.cc b/external_imported/sentry-native/external/crashpad/util/mach/exception_ports.cc
index 1184045c3..b983cc6c5 100644
--- a/external_imported/sentry-native/external/crashpad/util/mach/exception_ports.cc
+++ b/external_imported/sentry-native/external/crashpad/util/mach/exception_ports.cc
@@ -14,8 +14,8 @@
 
 #include "util/mach/exception_ports.h"
 
+#include "base/apple/mach_logging.h"
 #include "base/logging.h"
-#include "base/mac/mach_logging.h"
 #include "base/notreached.h"
 
 namespace crashpad {
diff --git a/external_imported/sentry-native/external/crashpad/util/mach/exception_ports_test.cc b/external_imported/sentry-native/external/crashpad/util/mach/exception_ports_test.cc
index f6a886727..b37a99a24 100644
--- a/external_imported/sentry-native/external/crashpad/util/mach/exception_ports_test.cc
+++ b/external_imported/sentry-native/external/crashpad/util/mach/exception_ports_test.cc
@@ -19,9 +19,9 @@
 #include <signal.h>
 #include <unistd.h>
 
+#include "base/apple/mach_logging.h"
+#include "base/apple/scoped_mach_port.h"
 #include "base/check.h"
-#include "base/mac/mach_logging.h"
-#include "base/mac/scoped_mach_port.h"
 #include "base/notreached.h"
 #include "build/build_config.h"
 #include "gtest/gtest.h"
@@ -444,8 +444,8 @@ class TestExceptionPorts : public MachMultiprocess,
 
     ScopedForbidReturn threads_need_owners;
     ASSERT_EQ(thread_count, 2u);
-    base::mac::ScopedMachSendRight main_thread(threads[0]);
-    base::mac::ScopedMachSendRight other_thread(threads[1]);
+    base::apple::ScopedMachSendRight main_thread(threads[0]);
+    base::apple::ScopedMachSendRight other_thread(threads[1]);
     threads_need_owners.Disarm();
 
     ExceptionPorts main_thread_ports(ExceptionPorts::kTargetTypeThread,
@@ -467,7 +467,7 @@ class TestExceptionPorts : public MachMultiprocess,
           mach_task_self(), local_port, local_port, MACH_MSG_TYPE_MAKE_SEND);
       ASSERT_EQ(kr, KERN_SUCCESS)
           << MachErrorMessage(kr, "mach_port_insert_right");
-      base::mac::ScopedMachSendRight send_owner(local_port);
+      base::apple::ScopedMachSendRight send_owner(local_port);
 
       switch (set_or_swap_) {
         case kSetExceptionPort: {
@@ -819,7 +819,7 @@ TEST(ExceptionPorts, HostExceptionPorts) {
 
   const bool expect_success = geteuid() == 0;
 
-  base::mac::ScopedMachSendRight host(mach_host_self());
+  base::apple::ScopedMachSendRight host(mach_host_self());
   ExceptionPorts explicit_host_ports(ExceptionPorts::kTargetTypeHost,
                                      host.get());
   EXPECT_STREQ("host", explicit_host_ports.TargetTypeName());
diff --git a/external_imported/sentry-native/external/crashpad/util/mach/exception_types.cc b/external_imported/sentry-native/external/crashpad/util/mach/exception_types.cc
index c050b2856..e73b7c8be 100644
--- a/external_imported/sentry-native/external/crashpad/util/mach/exception_types.cc
+++ b/external_imported/sentry-native/external/crashpad/util/mach/exception_types.cc
@@ -21,9 +21,9 @@
 #include <libproc.h>
 #include <strings.h>
 
+#include "base/apple/mach_logging.h"
 #include "base/check_op.h"
 #include "base/logging.h"
-#include "base/mac/mach_logging.h"
 #include "util/mac/mac_util.h"
 #include "util/mach/mach_extensions.h"
 #include "util/misc/no_cfi_icall.h"
diff --git a/external_imported/sentry-native/external/crashpad/util/mach/mach_extensions.cc b/external_imported/sentry-native/external/crashpad/util/mach/mach_extensions.cc
index 885d6074a..463d364a0 100644
--- a/external_imported/sentry-native/external/crashpad/util/mach/mach_extensions.cc
+++ b/external_imported/sentry-native/external/crashpad/util/mach/mach_extensions.cc
@@ -17,7 +17,7 @@
 #include <Availability.h>
 #include <pthread.h>
 
-#include "base/mac/mach_logging.h"
+#include "base/apple/mach_logging.h"
 #include "build/build_config.h"
 #include "util/mac/mac_util.h"
 
diff --git a/external_imported/sentry-native/external/crashpad/util/mach/mach_extensions_test.cc b/external_imported/sentry-native/external/crashpad/util/mach/mach_extensions_test.cc
index 0314b6989..31042f7ca 100644
--- a/external_imported/sentry-native/external/crashpad/util/mach/mach_extensions_test.cc
+++ b/external_imported/sentry-native/external/crashpad/util/mach/mach_extensions_test.cc
@@ -14,7 +14,7 @@
 
 #include "util/mach/mach_extensions.h"
 
-#include "base/mac/scoped_mach_port.h"
+#include "base/apple/scoped_mach_port.h"
 #include "build/build_config.h"
 #include "gtest/gtest.h"
 #include "test/mac/mach_errors.h"
@@ -25,12 +25,13 @@ namespace test {
 namespace {
 
 TEST(MachExtensions, MachThreadSelf) {
-  base::mac::ScopedMachSendRight thread_self(mach_thread_self());
+  base::apple::ScopedMachSendRight thread_self(mach_thread_self());
   EXPECT_EQ(MachThreadSelf(), thread_self);
 }
 
 TEST(MachExtensions, NewMachPort_Receive) {
-  base::mac::ScopedMachReceiveRight port(NewMachPort(MACH_PORT_RIGHT_RECEIVE));
+  base::apple::ScopedMachReceiveRight port(
+      NewMachPort(MACH_PORT_RIGHT_RECEIVE));
   ASSERT_NE(port, kMachPortNull);
 
   mach_port_type_t type;
@@ -41,7 +42,7 @@ TEST(MachExtensions, NewMachPort_Receive) {
 }
 
 TEST(MachExtensions, NewMachPort_PortSet) {
-  base::mac::ScopedMachPortSet port(NewMachPort(MACH_PORT_RIGHT_PORT_SET));
+  base::apple::ScopedMachPortSet port(NewMachPort(MACH_PORT_RIGHT_PORT_SET));
   ASSERT_NE(port, kMachPortNull);
 
   mach_port_type_t type;
@@ -52,7 +53,7 @@ TEST(MachExtensions, NewMachPort_PortSet) {
 }
 
 TEST(MachExtensions, NewMachPort_DeadName) {
-  base::mac::ScopedMachSendRight port(NewMachPort(MACH_PORT_RIGHT_DEAD_NAME));
+  base::apple::ScopedMachSendRight port(NewMachPort(MACH_PORT_RIGHT_DEAD_NAME));
   ASSERT_NE(port, kMachPortNull);
 
   mach_port_type_t type;
diff --git a/external_imported/sentry-native/external/crashpad/util/mach/mach_message.cc b/external_imported/sentry-native/external/crashpad/util/mach/mach_message.cc
index 008724fb4..28e422791 100644
--- a/external_imported/sentry-native/external/crashpad/util/mach/mach_message.cc
+++ b/external_imported/sentry-native/external/crashpad/util/mach/mach_message.cc
@@ -18,8 +18,8 @@
 
 #include <limits>
 
+#include "base/apple/mach_logging.h"
 #include "base/logging.h"
-#include "base/mac/mach_logging.h"
 #include "build/build_config.h"
 #include "util/misc/clock.h"
 #include "util/misc/implicit_cast.h"
diff --git a/external_imported/sentry-native/external/crashpad/util/mach/mach_message_server.cc b/external_imported/sentry-native/external/crashpad/util/mach/mach_message_server.cc
index e1529c66a..b4509a9a3 100644
--- a/external_imported/sentry-native/external/crashpad/util/mach/mach_message_server.cc
+++ b/external_imported/sentry-native/external/crashpad/util/mach/mach_message_server.cc
@@ -18,9 +18,10 @@
 
 #include <limits>
 
+#include "base/apple/mach_logging.h"
+#include "base/apple/scoped_mach_vm.h"
+#include "base/check_op.h"
 #include "base/logging.h"
-#include "base/mac/mach_logging.h"
-#include "base/mac/scoped_mach_vm.h"
 #include "util/mach/mach_message.h"
 
 namespace crashpad {
@@ -83,7 +84,7 @@ class MachMessageBuffer {
   }
 
  private:
-  base::mac::ScopedMachVM vm_;
+  base::apple::ScopedMachVM vm_;
 };
 
 // Wraps MachMessageWithDeadline(), using a MachMessageBuffer argument which
diff --git a/external_imported/sentry-native/external/crashpad/util/mach/mach_message_server_test.cc b/external_imported/sentry-native/external/crashpad/util/mach/mach_message_server_test.cc
index dd6c1b2c3..335aa7bfd 100644
--- a/external_imported/sentry-native/external/crashpad/util/mach/mach_message_server_test.cc
+++ b/external_imported/sentry-native/external/crashpad/util/mach/mach_message_server_test.cc
@@ -22,7 +22,7 @@
 #include <iterator>
 #include <set>
 
-#include "base/mac/scoped_mach_port.h"
+#include "base/apple/scoped_mach_port.h"
 #include "gtest/gtest.h"
 #include "test/mac/mach_errors.h"
 #include "test/mac/mach_multiprocess.h"
@@ -445,7 +445,7 @@ class TestMachMessageServer : public MachMessageServer::Interface,
     // local_receive_port_owner will the receive right that is created in this
     // scope and intended to be destroyed when leaving this scope, after it has
     // been carried in a Mach message.
-    base::mac::ScopedMachReceiveRight local_receive_port_owner;
+    base::apple::ScopedMachReceiveRight local_receive_port_owner;
 
     // A LargeRequestMessage is always allocated, but the message that will be
     // sent will be a normal RequestMessage due to the msgh_size field
@@ -582,7 +582,7 @@ class TestMachMessageServer : public MachMessageServer::Interface,
   // A receive right allocated in the child process. A send right will be
   // created from this right and sent to the parent parent process in the
   // request message.
-  base::mac::ScopedMachReceiveRight child_complex_message_port_;
+  base::apple::ScopedMachReceiveRight child_complex_message_port_;
 
   // The send right received in the parent process. This right is stored in a
   // member variable to test that resources carried in complex messages are
diff --git a/external_imported/sentry-native/external/crashpad/util/mach/mach_message_test.cc b/external_imported/sentry-native/external/crashpad/util/mach/mach_message_test.cc
index b77781325..5698179ea 100644
--- a/external_imported/sentry-native/external/crashpad/util/mach/mach_message_test.cc
+++ b/external_imported/sentry-native/external/crashpad/util/mach/mach_message_test.cc
@@ -18,7 +18,7 @@
 
 #include <tuple>
 
-#include "base/mac/scoped_mach_port.h"
+#include "base/apple/scoped_mach_port.h"
 #include "build/build_config.h"
 #include "gtest/gtest.h"
 #include "test/mac/mach_errors.h"
@@ -116,7 +116,7 @@ TEST(MachMessage, MachMessageDestroyReceivedPort) {
   ASSERT_NE(port, kMachPortNull);
   EXPECT_TRUE(MachMessageDestroyReceivedPort(port, MACH_MSG_TYPE_PORT_RECEIVE));
 
-  base::mac::ScopedMachReceiveRight receive(
+  base::apple::ScopedMachReceiveRight receive(
       NewMachPort(MACH_PORT_RIGHT_RECEIVE));
   mach_msg_type_name_t right_type;
   kern_return_t kr = mach_port_extract_right(mach_task_self(),
@@ -163,7 +163,8 @@ TEST(MachMessage, MachMessageDestroyReceivedPort) {
 #if BUILDFLAG(IS_MAC)
 
 TEST(MachMessage, AuditPIDFromMachMessageTrailer) {
-  base::mac::ScopedMachReceiveRight port(NewMachPort(MACH_PORT_RIGHT_RECEIVE));
+  base::apple::ScopedMachReceiveRight port(
+      NewMachPort(MACH_PORT_RIGHT_RECEIVE));
   ASSERT_NE(port, kMachPortNull);
 
   mach_msg_empty_send_t send = {};
diff --git a/external_imported/sentry-native/external/crashpad/util/mach/notify_server_test.cc b/external_imported/sentry-native/external/crashpad/util/mach/notify_server_test.cc
index 324439ed7..2c9e7e6ad 100644
--- a/external_imported/sentry-native/external/crashpad/util/mach/notify_server_test.cc
+++ b/external_imported/sentry-native/external/crashpad/util/mach/notify_server_test.cc
@@ -16,8 +16,8 @@
 
 #include <stddef.h>
 
+#include "base/apple/scoped_mach_port.h"
 #include "base/compiler_specific.h"
-#include "base/mac/scoped_mach_port.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 #include "test/mac/mach_errors.h"
@@ -234,7 +234,7 @@ class NotifyServerTestBase : public testing::Test,
       return false;
     }
 
-    base::mac::ScopedMachSendRight previous_owner(previous);
+    base::apple::ScopedMachSendRight previous_owner(previous);
     EXPECT_EQ(previous, kMachPortNull);
 
     return true;
@@ -284,7 +284,7 @@ class NotifyServerTestBase : public testing::Test,
   void TearDown() override { server_port_.reset(); }
 
  private:
-  base::mac::ScopedMachReceiveRight server_port_;
+  base::apple::ScopedMachReceiveRight server_port_;
 };
 
 using NotifyServerTest = StrictMock<NotifyServerTestBase>;
@@ -319,11 +319,11 @@ TEST_F(NotifyServerTest, NoNotification) {
 // When a send-once right with a dead-name notification request is deallocated,
 // a port-deleted notification should be generated.
 TEST_F(NotifyServerTest, MachNotifyPortDeleted) {
-  base::mac::ScopedMachReceiveRight receive_right(
+  base::apple::ScopedMachReceiveRight receive_right(
       NewMachPort(MACH_PORT_RIGHT_RECEIVE));
   ASSERT_TRUE(receive_right.is_valid());
 
-  base::mac::ScopedMachSendRight send_once_right(
+  base::apple::ScopedMachSendRight send_once_right(
       SendOnceRightFromReceiveRight(receive_right.get()));
   ASSERT_TRUE(send_once_right.is_valid());
 
@@ -346,7 +346,7 @@ TEST_F(NotifyServerTest, MachNotifyPortDeleted) {
 // When a receive right with a port-destroyed notification request is destroyed,
 // a port-destroyed notification should be generated.
 TEST_F(NotifyServerTest, MachNotifyPortDestroyed) {
-  base::mac::ScopedMachReceiveRight receive_right(
+  base::apple::ScopedMachReceiveRight receive_right(
       NewMachPort(MACH_PORT_RIGHT_RECEIVE));
   ASSERT_TRUE(receive_right.is_valid());
 
@@ -370,7 +370,7 @@ TEST_F(NotifyServerTest, MachNotifyPortDestroyed) {
 // When a receive right with a port-destroyed notification request is not
 // destroyed, no port-destroyed notification should be generated.
 TEST_F(NotifyServerTest, MachNotifyPortDestroyed_NoNotification) {
-  base::mac::ScopedMachReceiveRight receive_right(
+  base::apple::ScopedMachReceiveRight receive_right(
       NewMachPort(MACH_PORT_RIGHT_RECEIVE));
   ASSERT_TRUE(receive_right.is_valid());
 
@@ -383,7 +383,7 @@ TEST_F(NotifyServerTest, MachNotifyPortDestroyed_NoNotification) {
 // When a no-senders notification request is registered for a receive right with
 // no senders, a no-senders notification should be generated.
 TEST_F(NotifyServerTest, MachNotifyNoSenders_NoSendRight) {
-  base::mac::ScopedMachReceiveRight receive_right(
+  base::apple::ScopedMachReceiveRight receive_right(
       NewMachPort(MACH_PORT_RIGHT_RECEIVE));
   ASSERT_TRUE(receive_right.is_valid());
 
@@ -403,11 +403,11 @@ TEST_F(NotifyServerTest, MachNotifyNoSenders_NoSendRight) {
 // notification request is deallocated, a no-senders notification should be
 // generated.
 TEST_F(NotifyServerTest, MachNotifyNoSenders_SendRightDeallocated) {
-  base::mac::ScopedMachReceiveRight receive_right(
+  base::apple::ScopedMachReceiveRight receive_right(
       NewMachPort(MACH_PORT_RIGHT_RECEIVE));
   ASSERT_TRUE(receive_right.is_valid());
 
-  base::mac::ScopedMachSendRight send_right(
+  base::apple::ScopedMachSendRight send_right(
       SendRightFromReceiveRight(receive_right.get()));
   ASSERT_TRUE(send_right.is_valid());
 
@@ -428,15 +428,15 @@ TEST_F(NotifyServerTest, MachNotifyNoSenders_SendRightDeallocated) {
 // When the a receive right with a no-senders notification request never loses
 // all senders, no no-senders notification should be generated.
 TEST_F(NotifyServerTest, MachNotifyNoSenders_NoNotification) {
-  base::mac::ScopedMachReceiveRight receive_right(
+  base::apple::ScopedMachReceiveRight receive_right(
       NewMachPort(MACH_PORT_RIGHT_RECEIVE));
   ASSERT_TRUE(receive_right.is_valid());
 
-  base::mac::ScopedMachSendRight send_right_0(
+  base::apple::ScopedMachSendRight send_right_0(
       SendRightFromReceiveRight(receive_right.get()));
   ASSERT_TRUE(send_right_0.is_valid());
 
-  base::mac::ScopedMachSendRight send_right_1(
+  base::apple::ScopedMachSendRight send_right_1(
       SendRightFromReceiveRight(receive_right.get()));
   ASSERT_TRUE(send_right_1.is_valid());
 
@@ -454,7 +454,7 @@ TEST_F(NotifyServerTest, MachNotifyNoSenders_NoNotification) {
 // When a send-once right is deallocated without being used, a send-once
 // notification notification should be sent via the send-once right.
 TEST_F(NotifyServerTest, MachNotifySendOnce_ExplicitDeallocation) {
-  base::mac::ScopedMachSendRight send_once_right(
+  base::apple::ScopedMachSendRight send_once_right(
       SendOnceRightFromReceiveRight(ServerPort()));
   ASSERT_TRUE(send_once_right.is_valid());
 
@@ -473,7 +473,7 @@ TEST_F(NotifyServerTest, MachNotifySendOnce_ExplicitDeallocation) {
 // the send-once right is destroyed, and a send-once notification should appear
 // on the reply port.
 TEST_F(NotifyServerTest, MachNotifySendOnce_ImplicitDeallocation) {
-  base::mac::ScopedMachReceiveRight receive_right(
+  base::apple::ScopedMachReceiveRight receive_right(
       NewMachPort(MACH_PORT_RIGHT_RECEIVE));
   ASSERT_TRUE(receive_right.is_valid());
 
@@ -507,11 +507,11 @@ TEST_F(NotifyServerTest, MachNotifySendOnce_ImplicitDeallocation) {
 // notification request is destroyed, a dead-name notification should be
 // generated.
 TEST_F(NotifyServerTest, MachNotifyDeadName) {
-  base::mac::ScopedMachReceiveRight receive_right(
+  base::apple::ScopedMachReceiveRight receive_right(
       NewMachPort(MACH_PORT_RIGHT_RECEIVE));
   ASSERT_TRUE(receive_right.is_valid());
 
-  base::mac::ScopedMachSendRight send_once_right(
+  base::apple::ScopedMachSendRight send_once_right(
       SendOnceRightFromReceiveRight(receive_right.get()));
   ASSERT_TRUE(send_once_right.is_valid());
 
@@ -546,11 +546,11 @@ TEST_F(NotifyServerTest, MachNotifyDeadName) {
 // notification request is not destroyed, no dead-name notification should be
 // generated.
 TEST_F(NotifyServerTest, MachNotifyDeadName_NoNotification) {
-  base::mac::ScopedMachReceiveRight receive_right(
+  base::apple::ScopedMachReceiveRight receive_right(
       NewMachPort(MACH_PORT_RIGHT_RECEIVE));
   ASSERT_TRUE(receive_right.is_valid());
 
-  base::mac::ScopedMachSendRight send_once_right(
+  base::apple::ScopedMachSendRight send_once_right(
       SendOnceRightFromReceiveRight(receive_right.get()));
   ASSERT_TRUE(send_once_right.is_valid());
 
diff --git a/external_imported/sentry-native/external/crashpad/util/mach/scoped_task_suspend.cc b/external_imported/sentry-native/external/crashpad/util/mach/scoped_task_suspend.cc
index b91a16a60..67cad4f1e 100644
--- a/external_imported/sentry-native/external/crashpad/util/mach/scoped_task_suspend.cc
+++ b/external_imported/sentry-native/external/crashpad/util/mach/scoped_task_suspend.cc
@@ -14,9 +14,9 @@
 
 #include "util/mach/scoped_task_suspend.h"
 
+#include "base/apple/mach_logging.h"
 #include "base/check_op.h"
 #include "base/logging.h"
-#include "base/mac/mach_logging.h"
 
 namespace crashpad {
 
diff --git a/external_imported/sentry-native/external/crashpad/util/mach/task_for_pid.cc b/external_imported/sentry-native/external/crashpad/util/mach/task_for_pid.cc
index 08e031d70..5827dc45e 100644
--- a/external_imported/sentry-native/external/crashpad/util/mach/task_for_pid.cc
+++ b/external_imported/sentry-native/external/crashpad/util/mach/task_for_pid.cc
@@ -21,8 +21,8 @@
 #include <iterator>
 #include <set>
 
-#include "base/mac/mach_logging.h"
-#include "base/mac/scoped_mach_port.h"
+#include "base/apple/mach_logging.h"
+#include "base/apple/scoped_mach_port.h"
 #include "util/posix/process_info.h"
 
 namespace crashpad {
@@ -154,7 +154,7 @@ task_t TaskForPID(pid_t pid) {
     return TASK_NULL;
   }
 
-  base::mac::ScopedMachSendRight task_owner(task);
+  base::apple::ScopedMachSendRight task_owner(task);
 
   if (!TaskForPIDCheck(task)) {
     return TASK_NULL;
diff --git a/external_imported/sentry-native/external/crashpad/util/misc/capture_context.h b/external_imported/sentry-native/external/crashpad/util/misc/capture_context.h
index a5503d682..ac7707b48 100644
--- a/external_imported/sentry-native/external/crashpad/util/misc/capture_context.h
+++ b/external_imported/sentry-native/external/crashpad/util/misc/capture_context.h
@@ -23,8 +23,6 @@
 #include <windows.h>
 #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
 #include <ucontext.h>
-#elif BUILDFLAG(IS_FUCHSIA)
-#include <signal.h>
 #endif  // BUILDFLAG(IS_APPLE)
 
 namespace crashpad {
@@ -37,8 +35,7 @@ using NativeCPUContext = arm_unified_thread_state;
 #endif
 #elif BUILDFLAG(IS_WIN)
 using NativeCPUContext = CONTEXT;
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
-    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
 using NativeCPUContext = ucontext_t;
 #endif  // BUILDFLAG(IS_APPLE)
 
@@ -57,6 +54,9 @@ using NativeCPUContext = ucontext_t;
 //! `RtlCaptureContext()` capture only the state of the integer registers,
 //! ignoring floating-point and vector state.
 //!
+//! CaptureContext isn't used on Fuchsia, nor does a concept of `ucontext_t`
+//! exist on Fuchsia.
+//!
 //! \param[out] cpu_context The structure to store the context in.
 //!
 //! \note The ABI may require that this function's argument is passed by
@@ -66,9 +66,10 @@ using NativeCPUContext = ucontext_t;
 //!     OS                  | Architecture | Register
 //!     --------------------|--------------|---------
 //!     Win                 | x86_64       | `%%rcx`
-//!     macOS/Linux/Fuchsia | x86_64       | `%%rdi`
+//!     macOS/Linux         | x86_64       | `%%rdi`
 //!     Linux               | ARM/ARM64    | `r0`/`x0`
 //!     Linux               | MIPS/MIPS64  | `$a0`
+//!     Linux               | RISCV64      | `a0`
 //!
 //!     Additionally, the value `LR` on ARM/ARM64 will be the return address of
 //!     this function.
diff --git a/external_imported/sentry-native/external/crashpad/util/misc/capture_context_fuchsia.S b/external_imported/sentry-native/external/crashpad/util/misc/capture_context_fuchsia.S
deleted file mode 100644
index 97954f021..000000000
--- a/external_imported/sentry-native/external/crashpad/util/misc/capture_context_fuchsia.S
+++ /dev/null
@@ -1,173 +0,0 @@
-// Copyright 2018 The Crashpad Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// namespace crashpad {
-// void CaptureContext(ucontext_t* context);
-// }  // namespace crashpad
-
-#define CAPTURECONTEXT_SYMBOL _ZN8crashpad14CaptureContextEP8ucontext
-
-  .text
-  .globl CAPTURECONTEXT_SYMBOL
-#if defined(__x86_64__)
-  .balign 16, 0x90
-#elif defined(__aarch64__)
-  .balign 4, 0x0
-#endif
-
-CAPTURECONTEXT_SYMBOL:
-
-#if defined(__x86_64__)
-
-  .cfi_startproc
-
-  pushq %rbp
-  .cfi_def_cfa_offset 16
-  .cfi_offset %rbp, -16
-  movq %rsp, %rbp
-  .cfi_def_cfa_register %rbp
-
-  // Note that 16-byte stack alignment is not maintained because this function
-  // does not call out to any other.
-
-  // pushfq first, because some instructions (but probably none used here)
-  // affect %rflags. %rflags will be in -8(%rbp).
-  pushfq
-
-  // General-purpose registers whose values haven’t changed can be captured
-  // directly.
-  movq %r8, 0x28(%rdi)  // context->uc_mcontext.r8
-  movq %r9, 0x30(%rdi)  // context->uc_mcontext.r9
-  movq %r10, 0x38(%rdi)  // context->uc_mcontext.r10
-  movq %r11, 0x40(%rdi)  // context->uc_mcontext.r11
-  movq %r12, 0x48(%rdi)  // context->uc_mcontext.r12
-  movq %r13, 0x50(%rdi)  // context->uc_mcontext.r13
-  movq %r14, 0x58(%rdi)  // context->uc_mcontext.r14
-  movq %r15, 0x60(%rdi)  // context->uc_mcontext.r15
-
-  // Because of the calling convention, there’s no way to recover the value of
-  // the caller’s %rdi as it existed prior to calling this function. This
-  // function captures a snapshot of the register state at its return, which
-  // involves %rdi containing a pointer to its first argument. Callers that
-  // require the value of %rdi prior to calling this function should obtain it
-  // separately. For example:
-  //   uint64_t rdi;
-  //   asm("movq %%rdi, %0" : "=m"(rdi));
-  movq %rdi, 0x68(%rdi)  // context->uc_mcontext.rdi
-
-  movq %rsi, 0x70(%rdi)  // context->uc_mcontext.rsi
-
-  // Use %r8 as a scratch register now that it has been saved.
-  // The original %rbp was saved on the stack in this function’s prologue.
-  movq (%rbp), %r8
-  movq %r8, 0x78(%rdi)  // context->uc_mcontext.rbp
-
-  // Save the remaining general-purpose registers.
-  movq %rbx, 0x80(%rdi)  // context->uc_mcontext.rbx
-  movq %rdx, 0x88(%rdi)  // context->uc_mcontext.rdx
-  movq %rax, 0x90(%rdi)  // context->uc_mcontext.rax
-  movq %rcx, 0x98(%rdi)  // context->uc_mcontext.rcx
-
-  // %rsp was saved in %rbp in this function’s prologue, but the caller’s %rsp
-  // is 16 more than this value: 8 for the original %rbp saved on the stack in
-  // this function’s prologue, and 8 for the return address saved on the stack
-  // by the call instruction that reached this function.
-  leaq 16(%rbp), %r8
-  movq %r8, 0xa0(%rdi)  // context->uc_mcontext.rsp
-
-  // The return address saved on the stack used by the call of this function is
-  // likely more useful than the current RIP here.
-  movq 8(%rbp), %r8
-  movq %r8, 0xa8(%rdi)  // context->uc_mcontext.rip
-
-  // The original %rflags was saved on the stack above.
-  movq -8(%rbp), %r8
-  movq %r8, 0xb0(%rdi)  // context->uc_mcontext.eflags
-
-  // Save the segment registers
-  movw %cs, 0xb8(%rdi)  // context->uc_mcontext.cs
-  movw %gs, 0xba(%rdi)  // context->uc_mcontext.gs
-  movw %fs, 0xbc(%rdi)  // context->uc_mcontext.fs
-
-  xorw %ax, %ax
-  movw %ax, 0xbe(%rdi)  // context->uc_mcontext.padding
-
-  // Zero out the remainder of the unused pseudo-registers
-  xorq %r8, %r8
-  movq %r8, 0xc0(%rdi)  // context->uc_mcontext.err
-  movq %r8, 0xc8(%rdi)  // context->uc_mcontext.trapno
-  movq %r8, 0xd0(%rdi)  // context->uc_mcontext.oldmask
-  movq %r8, 0xd8(%rdi)  // context->uc_mcontext.cr2
-
-  // Clean up by restoring clobbered registers, even those considered volatile
-  // by the ABI, so that the captured context represents the state at this
-  // function’s exit.
-  movq 0x90(%rdi), %rax
-  movq 0x28(%rdi), %r8
-
-  // TODO(https://crashpad.chromium.org/bug/300): save floating-point registers.
-
-  popfq
-
-  popq %rbp
-
-  ret
-
-  .cfi_endproc
-
-#elif defined(__aarch64__)
-
-  // Zero out fault_address, which is unused.
-  str x31, [x0, #0xb0]  // context->uc_mcontext.fault_address
-
-  // Save general purpose registers in context->uc_mcontext.regs[i].
-  // The original x0 can't be recovered.
-  stp x0, x1, [x0, #0xb8]
-  stp x2, x3, [x0, #0xc8]
-  stp x4, x5, [x0, #0xd8]
-  stp x6, x7, [x0, #0xe8]
-  stp x8, x9, [x0, #0xf8]
-  stp x10, x11, [x0, #0x108]
-  stp x12, x13, [x0, #0x118]
-  stp x14, x15, [x0, #0x128]
-  stp x16, x17, [x0, #0x138]
-  stp x18, x19, [x0, #0x148]
-  stp x20, x21, [x0, #0x158]
-  stp x22, x23, [x0, #0x168]
-  stp x24, x25, [x0, #0x178]
-  stp x26, x27, [x0, #0x188]
-  stp x28, x29, [x0, #0x198]
-
-  // The original LR can't be recovered.
-  str LR, [x0, #0x1a8]
-
-  // Use x1 as a scratch register.
-  mov x1, SP
-  str x1, [x0, #0x1b0] // context->uc_mcontext.sp
-
-  // The link register holds the return address for this function.
-  str LR, [x0, #0x1b8]  // context->uc_mcontext.pc
-
-  // pstate should hold SPSR but NZCV are the only bits we know about.
-  mrs x1, NZCV
-  str x1, [x0, #0x1c0]  // context->uc_mcontext.pstate
-
-  // Restore x1 from the saved context.
-  ldr x1, [x0, #0xc0]
-
-  // TODO(https://crashpad.chromium.org/bug/300): save floating-point registers.
-
-  ret
-
-#endif  // __x86_64__
diff --git a/external_imported/sentry-native/external/crashpad/util/misc/capture_context_linux.S b/external_imported/sentry-native/external/crashpad/util/misc/capture_context_linux.S
index 9c3a72638..cfad85738 100644
--- a/external_imported/sentry-native/external/crashpad/util/misc/capture_context_linux.S
+++ b/external_imported/sentry-native/external/crashpad/util/misc/capture_context_linux.S
@@ -36,6 +36,8 @@
   .type CAPTURECONTEXT_SYMBOL2, %function
 #elif defined(__mips__)
   .balign 4, 0x0
+#elif defined(__riscv)
+  .balign 4, 0x0
 #endif
 
 CAPTURECONTEXT_SYMBOL:
@@ -427,4 +429,85 @@ CAPTURECONTEXT_SYMBOL2:
   jr $ra
 
   .set at
+
+#elif defined(__riscv)
+
+  #define MCONTEXT_GREGS_OFFSET 176
+
+  // x1/ra is the return address. Store it as the pc.
+  // The original x10/a0 can't be recovered.
+  sd x1, (0 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x1, (1 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x2, (2 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x3, (3 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x4, (4 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x5, (5 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x6, (6 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x7, (7 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x8, (8 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x9, (9 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x10, (10 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x11, (11 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x12, (12 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x13, (13 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x14, (14 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x15, (15 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x16, (16 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x17, (17 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x18, (18 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x19, (19 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x20, (20 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x21, (21 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x22, (22 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x23, (23 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x24, (24 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x25, (25 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x26, (26 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x27, (27 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x28, (28 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x29, (29 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x30, (30 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+  sd x31, (31 * 8 + MCONTEXT_GREGS_OFFSET)(a0)
+
+  #define MCONTEXT_FPREGS_OFFSET MCONTEXT_GREGS_OFFSET + 32*8
+
+  // Use x31/t6 as scratch register.
+  frcsr x31
+  sw x31, (32 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+
+  fsd f0, (0 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f1, (1 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f2, (2 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f3, (3 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f4, (4 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f5, (5 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f6, (6 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f7, (7 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f8, (8 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f9, (9 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f10, (10 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f11, (11 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f12, (12 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f13, (13 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f14, (14 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f15, (15 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f16, (16 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f17, (17 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f18, (18 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f19, (19 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f20, (20 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f21, (21 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f22, (22 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f23, (23 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f24, (24 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f25, (25 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f26, (26 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f27, (27 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f28, (28 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f29, (29 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f30, (30 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+  fsd f31, (31 * 8 + MCONTEXT_FPREGS_OFFSET)(a0)
+
+  ret
+
 #endif  // __i386__
diff --git a/external_imported/sentry-native/external/crashpad/util/misc/capture_context_test.cc b/external_imported/sentry-native/external/crashpad/util/misc/capture_context_test.cc
index f353aebe6..2cd92c841 100644
--- a/external_imported/sentry-native/external/crashpad/util/misc/capture_context_test.cc
+++ b/external_imported/sentry-native/external/crashpad/util/misc/capture_context_test.cc
@@ -28,15 +28,6 @@ namespace crashpad {
 namespace test {
 namespace {
 
-#if BUILDFLAG(IS_FUCHSIA)
-// Fuchsia uses -fsanitize=safe-stack by default, which splits local variables
-// and the call stack into separate regions (see
-// https://clang.llvm.org/docs/SafeStack.html). Because this test would like to
-// find an approximately valid stack pointer by comparing locals to the
-// captured one, disable safe-stack for this function.
-__attribute__((no_sanitize("safe-stack")))
-#endif  // BUILDFLAG(IS_FUCHSIA)
-
 #if defined(MEMORY_SANITIZER)
 // CaptureContext() calls inline assembly and is incompatible with MSan.
 __attribute__((no_sanitize("memory")))
diff --git a/external_imported/sentry-native/external/crashpad/util/misc/capture_context_test_util_fuchsia.cc b/external_imported/sentry-native/external/crashpad/util/misc/capture_context_test_util_fuchsia.cc
deleted file mode 100644
index ef38afeb7..000000000
--- a/external_imported/sentry-native/external/crashpad/util/misc/capture_context_test_util_fuchsia.cc
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2018 The Crashpad Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "util/misc/capture_context_test_util.h"
-
-#include "gtest/gtest.h"
-#include "util/misc/from_pointer_cast.h"
-
-namespace crashpad {
-namespace test {
-
-#if defined(ARCH_CPU_X86_64)
-static_assert(offsetof(NativeCPUContext, uc_mcontext) == 0x28,
-              "unexpected mcontext offset");
-static_assert(offsetof(NativeCPUContext, uc_mcontext.gregs[REG_RSP]) == 0xa0,
-              "unexpected rsp offset");
-static_assert(offsetof(NativeCPUContext, uc_mcontext.gregs[REG_RIP]) == 0xa8,
-              "unexpected rip offset");
-#endif  // ARCH_CPU_X86_64
-
-void SanityCheckContext(const NativeCPUContext& context) {
-#if defined(ARCH_CPU_X86_64)
-  EXPECT_EQ(context.uc_mcontext.gregs[REG_RDI],
-            FromPointerCast<intptr_t>(&context));
-#elif defined(ARCH_CPU_ARM64)
-  EXPECT_EQ(context.uc_mcontext.regs[0], FromPointerCast<uintptr_t>(&context));
-#endif
-}
-
-uintptr_t ProgramCounterFromContext(const NativeCPUContext& context) {
-#if defined(ARCH_CPU_X86_64)
-  return context.uc_mcontext.gregs[REG_RIP];
-#elif defined(ARCH_CPU_ARM64)
-  return context.uc_mcontext.pc;
-#endif
-}
-
-uintptr_t StackPointerFromContext(const NativeCPUContext& context) {
-#if defined(ARCH_CPU_X86_64)
-  return context.uc_mcontext.gregs[REG_RSP];
-#elif defined(ARCH_CPU_ARM64)
-  return context.uc_mcontext.sp;
-#endif
-}
-
-}  // namespace test
-}  // namespace crashpad
diff --git a/external_imported/sentry-native/external/crashpad/util/misc/capture_context_test_util_linux.cc b/external_imported/sentry-native/external/crashpad/util/misc/capture_context_test_util_linux.cc
index 35751bf8b..55820b9ee 100644
--- a/external_imported/sentry-native/external/crashpad/util/misc/capture_context_test_util_linux.cc
+++ b/external_imported/sentry-native/external/crashpad/util/misc/capture_context_test_util_linux.cc
@@ -35,6 +35,9 @@ void SanityCheckContext(const NativeCPUContext& context) {
   EXPECT_EQ(context.uc_mcontext.regs[0], FromPointerCast<uintptr_t>(&context));
 #elif defined(ARCH_CPU_MIPS_FAMILY)
   EXPECT_EQ(context.uc_mcontext.gregs[4], FromPointerCast<uintptr_t>(&context));
+#elif defined(ARCH_CPU_RISCV64)
+  EXPECT_EQ(context.uc_mcontext.__gregs[10],
+            FromPointerCast<uintptr_t>(&context));
 #endif
 }
 
@@ -49,6 +52,8 @@ uintptr_t ProgramCounterFromContext(const NativeCPUContext& context) {
   return context.uc_mcontext.pc;
 #elif defined(ARCH_CPU_MIPS_FAMILY)
   return context.uc_mcontext.pc;
+#elif defined(ARCH_CPU_RISCV64)
+  return context.uc_mcontext.__gregs[0];
 #endif
 }
 
@@ -63,6 +68,8 @@ uintptr_t StackPointerFromContext(const NativeCPUContext& context) {
   return context.uc_mcontext.sp;
 #elif defined(ARCH_CPU_MIPS_FAMILY)
   return context.uc_mcontext.gregs[29];
+#elif defined(ARCH_CPU_RISCV64)
+  return context.uc_mcontext.__gregs[2];
 #endif
 }
 
diff --git a/external_imported/sentry-native/external/crashpad/util/misc/clock_mac.cc b/external_imported/sentry-native/external/crashpad/util/misc/clock_mac.cc
index e2142ed40..81e53170b 100644
--- a/external_imported/sentry-native/external/crashpad/util/misc/clock_mac.cc
+++ b/external_imported/sentry-native/external/crashpad/util/misc/clock_mac.cc
@@ -16,7 +16,7 @@
 
 #include <mach/mach_time.h>
 
-#include "base/mac/mach_logging.h"
+#include "base/apple/mach_logging.h"
 
 namespace {
 
diff --git a/external_imported/sentry-native/external/crashpad/util/misc/lexing.cc b/external_imported/sentry-native/external/crashpad/util/misc/lexing.cc
index b65bdf141..36d239c95 100644
--- a/external_imported/sentry-native/external/crashpad/util/misc/lexing.cc
+++ b/external_imported/sentry-native/external/crashpad/util/misc/lexing.cc
@@ -14,7 +14,6 @@
 
 #include "util/misc/lexing.h"
 
-#include <ctype.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <string.h>
@@ -23,6 +22,7 @@
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
+#include "base/strings/string_util.h"
 
 namespace crashpad {
 
@@ -55,7 +55,7 @@ bool AdvancePastNumber(const char** input, T* value) {
   if (std::numeric_limits<T>::is_signed && **input == '-') {
     ++length;
   }
-  while (isdigit((*input)[length])) {
+  while (base::IsAsciiDigit((*input)[length])) {
     ++length;
   }
   bool success =
diff --git a/external_imported/sentry-native/external/crashpad/util/misc/uuid.cc b/external_imported/sentry-native/external/crashpad/util/misc/uuid.cc
index 3c4bd482d..15870709e 100644
--- a/external_imported/sentry-native/external/crashpad/util/misc/uuid.cc
+++ b/external_imported/sentry-native/external/crashpad/util/misc/uuid.cc
@@ -23,6 +23,7 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <string_view>
 #include <type_traits>
 
 #include "base/rand_util.h"
@@ -89,8 +90,8 @@ bool UUID::InitializeFromString(const base::StringPiece& string) {
 }
 
 #if BUILDFLAG(IS_WIN)
-bool UUID::InitializeFromString(const base::WStringPiece& string) {
-  return InitializeFromString(WideToUTF8(string));
+bool UUID::InitializeFromString(const std::wstring_view& string) {
+  return InitializeFromString(base::WideToUTF8(string));
 }
 #endif
 
diff --git a/external_imported/sentry-native/external/crashpad/util/misc/uuid.h b/external_imported/sentry-native/external/crashpad/util/misc/uuid.h
index be005aaf7..3e401ab00 100644
--- a/external_imported/sentry-native/external/crashpad/util/misc/uuid.h
+++ b/external_imported/sentry-native/external/crashpad/util/misc/uuid.h
@@ -18,6 +18,7 @@
 #include <stdint.h>
 
 #include <string>
+#include <string_view>
 
 #include "base/strings/string_piece.h"
 #include "build/build_config.h"
@@ -64,7 +65,7 @@ struct UUID {
   //!     parsed, with the object state untouched.
   bool InitializeFromString(const base::StringPiece& string);
 #if BUILDFLAG(IS_WIN) || DOXYGEN
-  bool InitializeFromString(const base::WStringPiece& string);
+  bool InitializeFromString(const std::wstring_view& string);
 #endif  // BUILDFLAG(IS_WIN)
 
   //! \brief Initializes the %UUID using a standard system facility to generate
diff --git a/external_imported/sentry-native/external/crashpad/util/net/http_body_gzip.cc b/external_imported/sentry-native/external/crashpad/util/net/http_body_gzip.cc
index bd0ec5f88..a7882ea82 100644
--- a/external_imported/sentry-native/external/crashpad/util/net/http_body_gzip.cc
+++ b/external_imported/sentry-native/external/crashpad/util/net/http_body_gzip.cc
@@ -16,6 +16,7 @@
 
 #include <utility>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "third_party/zlib/zlib_crashpad.h"
diff --git a/external_imported/sentry-native/external/crashpad/util/net/http_transport.cc b/external_imported/sentry-native/external/crashpad/util/net/http_transport.cc
index dcc8d80a5..6c1a9b087 100644
--- a/external_imported/sentry-native/external/crashpad/util/net/http_transport.cc
+++ b/external_imported/sentry-native/external/crashpad/util/net/http_transport.cc
@@ -35,6 +35,10 @@ void HTTPTransport::SetURL(const std::string& url) {
   url_ = url;
 }
 
+void HTTPTransport::SetHTTPProxy(const std::string& http_proxy) {
+  http_proxy_ = http_proxy;
+}
+
 void HTTPTransport::SetMethod(const std::string& method) {
   method_ = method;
 }
diff --git a/external_imported/sentry-native/external/crashpad/util/net/http_transport.h b/external_imported/sentry-native/external/crashpad/util/net/http_transport.h
index b046173b6..49742b85c 100644
--- a/external_imported/sentry-native/external/crashpad/util/net/http_transport.h
+++ b/external_imported/sentry-native/external/crashpad/util/net/http_transport.h
@@ -50,6 +50,11 @@ class HTTPTransport {
   //! \param[in] url The request URL.
   void SetURL(const std::string& url);
 
+  //! \brief Sets the optional HTTP proxy through which to send the request
+  //!
+  //! \param[in] http_proxy the fully specified URL
+  void SetHTTPProxy(const std::string& http_proxy);
+
   //! \brief Sets the HTTP method to execute. E.g., GET, POST, etc. The default
   //!     method is `"POST"`.
   //!
@@ -99,6 +104,7 @@ class HTTPTransport {
   HTTPTransport();
 
   const std::string& url() const { return url_; }
+  const std::string& http_proxy() const { return http_proxy_; }
   const std::string& method() const { return method_; }
   const HTTPHeaders& headers() const { return headers_; }
   HTTPBodyStream* body_stream() const { return body_stream_.get(); }
@@ -109,6 +115,7 @@ class HTTPTransport {
 
  private:
   std::string url_;
+  std::string http_proxy_;
   std::string method_;
   base::FilePath root_ca_certificate_path_;
   HTTPHeaders headers_;
diff --git a/external_imported/sentry-native/external/crashpad/util/net/http_transport_libcurl.cc b/external_imported/sentry-native/external/crashpad/util/net/http_transport_libcurl.cc
index d5c9177f9..ba31d6a9b 100644
--- a/external_imported/sentry-native/external/crashpad/util/net/http_transport_libcurl.cc
+++ b/external_imported/sentry-native/external/crashpad/util/net/http_transport_libcurl.cc
@@ -237,6 +237,8 @@ std::string UserAgent() {
 #elif defined(ARCH_CPU_BIG_ENDIAN)
     static constexpr char arch[] = "aarch64_be";
 #endif
+#elif defined (ARCH_CPU_RISCV64)
+    static constexpr char arch[] = "riscv64";
 #else
 #error Port
 #endif
@@ -456,6 +458,9 @@ bool HTTPTransportLibcurl::ExecuteSynchronously(std::string* response_body) {
   TRY_CURL_EASY_SETOPT(curl.get(), CURLOPT_READDATA, this);
   TRY_CURL_EASY_SETOPT(curl.get(), CURLOPT_WRITEFUNCTION, WriteResponseBody);
   TRY_CURL_EASY_SETOPT(curl.get(), CURLOPT_WRITEDATA, response_body);
+  if (!http_proxy().empty()) {
+    TRY_CURL_EASY_SETOPT(curl.get(), CURLOPT_PROXY, http_proxy().c_str());
+  }
 
 #undef TRY_CURL_EASY_SETOPT
 #undef TRY_CURL_SLIST_APPEND
@@ -480,7 +485,8 @@ bool HTTPTransportLibcurl::ExecuteSynchronously(std::string* response_body) {
   }
 
   if (status != 200) {
-    LOG(ERROR) << base::StringPrintf("HTTP status %ld", status);
+    LOG(ERROR) << base::StringPrintf(
+        "HTTP status %ld, response = \"%s\"", status, response_body->c_str());
     return false;
   }
 
diff --git a/external_imported/sentry-native/external/crashpad/util/net/http_transport_mac.mm b/external_imported/sentry-native/external/crashpad/util/net/http_transport_mac.mm
index 04f5c3479..8b5ef4902 100644
--- a/external_imported/sentry-native/external/crashpad/util/net/http_transport_mac.mm
+++ b/external_imported/sentry-native/external/crashpad/util/net/http_transport_mac.mm
@@ -17,23 +17,23 @@
 #import <Foundation/Foundation.h>
 #include <sys/utsname.h>
 
-#include "base/mac/foundation_util.h"
-#import "base/mac/scoped_nsobject.h"
+#include "base/apple/bridging.h"
+#include "base/apple/foundation_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
 #include "build/build_config.h"
 #include "package.h"
-#include "util/file/file_io.h"
 #include "util/misc/implicit_cast.h"
 #include "util/misc/metrics.h"
 #include "util/net/http_body.h"
+#include "util/net/url.h"
 
 // An implementation of NSInputStream that reads from a
 // crashpad::HTTPBodyStream.
 @interface CrashpadHTTPBodyStreamTransport : NSInputStream {
  @private
   NSStreamStatus _streamStatus;
-  id<NSStreamDelegate> _delegate;
+  id<NSStreamDelegate> __strong _delegate;
   crashpad::HTTPBodyStream* _bodyStream;  // weak
 }
 - (instancetype)initWithBodyStream:(crashpad::HTTPBodyStream*)bodyStream;
@@ -153,13 +153,14 @@ - (BOOL)setProperty:(id)property forKey:(NSStreamPropertyKey)key {
 
   // Expected to be CFNetwork.
   NSBundle* nsurl_bundle = [NSBundle bundleForClass:[NSURLRequest class]];
-  NSString* bundle_name = base::mac::ObjCCast<NSString>([nsurl_bundle
-      objectForInfoDictionaryKey:base::mac::CFToNSCast(kCFBundleNameKey)]);
+  NSString* bundle_name = base::apple::ObjCCast<NSString>([nsurl_bundle
+      objectForInfoDictionaryKey:base::apple::CFToNSPtrCast(kCFBundleNameKey)]);
   if (bundle_name) {
     user_agent = AppendEscapedFormat(user_agent, @" %@", bundle_name);
 
-    NSString* bundle_version = base::mac::ObjCCast<NSString>([nsurl_bundle
-        objectForInfoDictionaryKey:base::mac::CFToNSCast(kCFBundleVersionKey)]);
+    NSString* bundle_version = base::apple::ObjCCast<NSString>(
+        [nsurl_bundle objectForInfoDictionaryKey:base::apple::CFToNSPtrCast(
+                                                     kCFBundleVersionKey)]);
     if (bundle_version) {
       user_agent = AppendEscapedFormat(user_agent, @"/%@", bundle_version);
     }
@@ -208,43 +209,22 @@ - (BOOL)setProperty:(id)property forKey:(NSStreamPropertyKey)key {
   ~HTTPTransportMac() override;
 
   bool ExecuteSynchronously(std::string* response_body) override;
-};
 
-HTTPTransportMac::HTTPTransportMac() : HTTPTransport() {
-}
+ private:
+  static bool ExecuteNormalRequest(NSMutableURLRequest* request,
+                                   std::string* response_body);
+  static bool ExecuteProxyRequest(NSMutableURLRequest* request,
+                                  const std::string& proxy,
+                                  std::string* response_body);
+};
 
-HTTPTransportMac::~HTTPTransportMac() {
-}
+HTTPTransportMac::HTTPTransportMac() : HTTPTransport() {}
 
-bool HTTPTransportMac::ExecuteSynchronously(std::string* response_body) {
-  DCHECK(body_stream());
+HTTPTransportMac::~HTTPTransportMac() = default;
 
+bool HTTPTransportMac::ExecuteNormalRequest(NSMutableURLRequest* request,
+                                            std::string* response_body) {
   @autoreleasepool {
-    NSString* url_ns_string = base::SysUTF8ToNSString(url());
-    NSURL* url = [NSURL URLWithString:url_ns_string];
-    NSMutableURLRequest* request =
-        [NSMutableURLRequest requestWithURL:url
-                                cachePolicy:NSURLRequestUseProtocolCachePolicy
-                            timeoutInterval:timeout()];
-    [request setHTTPMethod:base::SysUTF8ToNSString(method())];
-
-    // If left to its own devices, CFNetwork would build a user-agent string
-    // based on keys in the main bundle’s Info.plist, giving ugly results if
-    // there is no Info.plist. Provide a User-Agent string similar to the one
-    // that CFNetwork would use, but with appropriate values in place of the
-    // Info.plist-derived strings.
-    [request setValue:UserAgentString() forHTTPHeaderField:@"User-Agent"];
-
-    for (const auto& pair : headers()) {
-      [request setValue:base::SysUTF8ToNSString(pair.second)
-          forHTTPHeaderField:base::SysUTF8ToNSString(pair.first)];
-    }
-
-    base::scoped_nsobject<NSInputStream> input_stream(
-        [[CrashpadHTTPBodyStreamTransport alloc]
-            initWithBodyStream:body_stream()]);
-    [request setHTTPBodyStream:input_stream.get()];
-
     NSURLResponse* response = nil;
     NSError* error = nil;
 #pragma clang diagnostic push
@@ -267,8 +247,7 @@ - (BOOL)setProperty:(id)property forKey:(NSStreamPropertyKey)key {
       LOG(ERROR) << "no response";
       return false;
     }
-    NSHTTPURLResponse* http_response =
-        base::mac::ObjCCast<NSHTTPURLResponse>(response);
+    auto http_response = base::apple::ObjCCast<NSHTTPURLResponse>(response);
     if (!http_response) {
       LOG(ERROR) << "no http_response";
       return false;
@@ -289,6 +268,117 @@ - (BOOL)setProperty:(id)property forKey:(NSStreamPropertyKey)key {
   }
 }
 
+bool HTTPTransportMac::ExecuteProxyRequest(NSMutableURLRequest* request,
+                                           const std::string& proxy,
+                                           std::string* response_body) {
+  __block bool sync_rv = false;
+  @autoreleasepool {
+    NSURLSessionConfiguration* sessionConfig =
+        [NSURLSessionConfiguration ephemeralSessionConfiguration];
+
+    std::string scheme, host, port, rest_ignored;
+    CrackURL(proxy, &scheme, &host, &port, &rest_ignored);
+    NSString* schemeNS = base::SysUTF8ToNSString(scheme);
+    NSString* hostNS = base::SysUTF8ToNSString(host);
+    NSNumber* proxy_port = @(std::stoi(port));
+
+    NSDictionary* proxyDict = @{
+      (__bridge id)kCFNetworkProxiesHTTPEnable : @YES,
+      (__bridge id)kCFNetworkProxiesHTTPPort : proxy_port,
+      (__bridge id)kCFNetworkProxiesHTTPProxy : hostNS,
+      @"HTTPSEnable" : @YES,
+      @"HTTPSPort" : proxy_port,
+      @"HTTPSProxy" : hostNS,
+    };
+    sessionConfig.connectionProxyDictionary = proxyDict;
+    NSURLSession* session =
+        [NSURLSession sessionWithConfiguration:sessionConfig];
+    dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
+    [[session dataTaskWithRequest:request
+                completionHandler:^(
+                    NSData* body, NSURLResponse* response, NSError* error) {
+                  if (error) {
+                    Metrics::CrashUploadErrorCode(error.code);
+                    LOG(ERROR) << [[error localizedDescription] UTF8String]
+                               << " (" << [[error domain] UTF8String] << " "
+                               << [error code] << ")";
+                    sync_rv = false;
+                    dispatch_semaphore_signal(semaphore);
+                    return;
+                  }
+                  if (!response) {
+                    LOG(ERROR) << "no response";
+                    sync_rv = false;
+                    dispatch_semaphore_signal(semaphore);
+                    return;
+                  }
+                  auto http_response =
+                      base::apple::ObjCCast<NSHTTPURLResponse>(response);
+                  if (!http_response) {
+                    LOG(ERROR) << "no http_response";
+                    sync_rv = false;
+                    dispatch_semaphore_signal(semaphore);
+                    return;
+                  }
+                  NSInteger http_status = [http_response statusCode];
+                  if (http_status < 200 || http_status > 203) {
+                    LOG(ERROR) << base::StringPrintf(
+                        "HTTP status %ld", implicit_cast<long>(http_status));
+                    sync_rv = false;
+                    dispatch_semaphore_signal(semaphore);
+                    return;
+                  }
+
+                  if (response_body) {
+                    response_body->assign(
+                        static_cast<const char*>([body bytes]), [body length]);
+                  }
+                  sync_rv = true;
+                  dispatch_semaphore_signal(semaphore);
+                }] resume];
+
+    dispatch_semaphore_wait(semaphore, (dispatch_time_t)(10 * NSEC_PER_SEC));
+  }
+  return sync_rv;
+}
+
+bool HTTPTransportMac::ExecuteSynchronously(std::string* response_body) {
+  DCHECK(body_stream());
+
+  @autoreleasepool {
+    NSString* url_ns_string = base::SysUTF8ToNSString(url());
+    NSURL* url = [NSURL URLWithString:url_ns_string];
+    NSMutableURLRequest* request =
+        [NSMutableURLRequest requestWithURL:url
+                                cachePolicy:NSURLRequestUseProtocolCachePolicy
+                            timeoutInterval:timeout()];
+    [request setHTTPMethod:base::SysUTF8ToNSString(method())];
+
+    // If left to its own devices, CFNetwork would build a user-agent string
+    // based on keys in the main bundle’s Info.plist, giving ugly results if
+    // there is no Info.plist. Provide a User-Agent string similar to the one
+    // that CFNetwork would use, but with appropriate values in place of the
+    // Info.plist-derived strings.
+    [request setValue:UserAgentString() forHTTPHeaderField:@"User-Agent"];
+
+    for (const auto& pair : headers()) {
+      [request setValue:base::SysUTF8ToNSString(pair.second)
+          forHTTPHeaderField:base::SysUTF8ToNSString(pair.first)];
+    }
+
+    NSInputStream* input_stream = [[CrashpadHTTPBodyStreamTransport alloc]
+        initWithBodyStream:body_stream()];
+    [request setHTTPBodyStream:input_stream];
+
+    if (http_proxy().empty()) {
+      return ExecuteNormalRequest(request, response_body);
+    } else {
+      std::string proxy = http_proxy() + "/";
+      return ExecuteProxyRequest(request, proxy, response_body);
+    }
+  }
+}
+
 }  // namespace
 
 // static
diff --git a/external_imported/sentry-native/external/crashpad/util/net/http_transport_socket.cc b/external_imported/sentry-native/external/crashpad/util/net/http_transport_socket.cc
index aba801542..100abba5d 100644
--- a/external_imported/sentry-native/external/crashpad/util/net/http_transport_socket.cc
+++ b/external_imported/sentry-native/external/crashpad/util/net/http_transport_socket.cc
@@ -20,6 +20,7 @@
 
 #include <iterator>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/posix/eintr_wrapper.h"
diff --git a/external_imported/sentry-native/external/crashpad/util/net/http_transport_win.cc b/external_imported/sentry-native/external/crashpad/util/net/http_transport_win.cc
index 6bc2481d7..15be3cd04 100644
--- a/external_imported/sentry-native/external/crashpad/util/net/http_transport_win.cc
+++ b/external_imported/sentry-native/external/crashpad/util/net/http_transport_win.cc
@@ -23,7 +23,9 @@
 #include <winhttp.h>
 
 #include <iterator>
+#include <memory>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/scoped_generic.h"
@@ -115,9 +117,7 @@ std::string WinHttpMessage(const char* extra) {
 }
 
 struct ScopedHINTERNETTraits {
-  static HINTERNET InvalidValue() {
-    return nullptr;
-  }
+  static HINTERNET InvalidValue() { return nullptr; }
   static void Free(HINTERNET handle) {
     if (handle) {
       if (!WinHttpCloseHandle(handle)) {
@@ -141,18 +141,46 @@ class HTTPTransportWin final : public HTTPTransport {
   bool ExecuteSynchronously(std::string* response_body) override;
 };
 
-HTTPTransportWin::HTTPTransportWin() : HTTPTransport() {
-}
+HTTPTransportWin::HTTPTransportWin() : HTTPTransport() {}
 
-HTTPTransportWin::~HTTPTransportWin() {
-}
+HTTPTransportWin::~HTTPTransportWin() {}
 
 bool HTTPTransportWin::ExecuteSynchronously(std::string* response_body) {
-  ScopedHINTERNET session(WinHttpOpen(base::UTF8ToWide(UserAgent()).c_str(),
+  // ensure the proxy starts with `http://`, otherwise ignore it
+  const char proto[] = "http://";
+  ScopedHINTERNET session;
+  if (http_proxy().rfind(proto, 0) == 0) {
+    size_t proto_len = sizeof(proto) - 1;
+    size_t next_slash_pos = http_proxy().find('/', proto_len);
+    std::string proxy = http_proxy().substr(proto_len,
+                                            next_slash_pos != std::string::npos
+                                                ? next_slash_pos - proto_len
+                                                : std::string::npos);
+    session = ScopedHINTERNET(WinHttpOpen(base::UTF8ToWide(UserAgent()).c_str(),
+                                          WINHTTP_ACCESS_TYPE_NAMED_PROXY,
+                                          base::UTF8ToWide(proxy).c_str(),
+                                          WINHTTP_NO_PROXY_BYPASS,
+                                          0));
+  } else {
+#if _WIN32_WINNT >= 0x0603
+    session = ScopedHINTERNET(WinHttpOpen(base::UTF8ToWide(UserAgent()).c_str(),
+                                          WINHTTP_ACCESS_TYPE_AUTOMATIC_PROXY,
+                                          WINHTTP_NO_PROXY_NAME,
+                                          WINHTTP_NO_PROXY_BYPASS,
+                                          0));
+#endif
+    // On Windows 8.0 or lower, WINHTTP_ACCESS_TYPE_AUTOMATIC_PROXY does
+    // not work on error we fall back to WINHTTP_ACCESS_TYPE_DEFAULT_PROXY
+    if (!session.get()) {
+      session =
+          ScopedHINTERNET(WinHttpOpen(base::UTF8ToWide(UserAgent()).c_str(),
                                       WINHTTP_ACCESS_TYPE_DEFAULT_PROXY,
                                       WINHTTP_NO_PROXY_NAME,
                                       WINHTTP_NO_PROXY_BYPASS,
                                       0));
+    }
+  }
+
   if (!session.get()) {
     LOG(ERROR) << WinHttpMessage("WinHttpOpen");
     return false;
@@ -175,8 +203,7 @@ bool HTTPTransportWin::ExecuteSynchronously(std::string* response_body) {
   url_components.dwExtraInfoLength = 1;
   std::wstring url_wide(base::UTF8ToWide(url()));
   // dwFlags = ICU_REJECT_USERPWD fails on XP.
-  if (!WinHttpCrackUrl(
-          url_wide.c_str(), 0, 0, &url_components)) {
+  if (!WinHttpCrackUrl(url_wide.c_str(), 0, 0, &url_components)) {
     LOG(ERROR) << WinHttpMessage("WinHttpCrackUrl");
     return false;
   }
@@ -412,7 +439,7 @@ bool HTTPTransportWin::ExecuteSynchronously(std::string* response_body) {
 
 // static
 std::unique_ptr<HTTPTransport> HTTPTransport::Create() {
-  return std::unique_ptr<HTTPTransportWin>(new HTTPTransportWin);
+  return std::make_unique<HTTPTransportWin>();
 }
 
 }  // namespace crashpad
diff --git a/external_imported/sentry-native/external/crashpad/util/posix/close_multiple.cc b/external_imported/sentry-native/external/crashpad/util/posix/close_multiple.cc
index 628beeab5..8c94e7501 100644
--- a/external_imported/sentry-native/external/crashpad/util/posix/close_multiple.cc
+++ b/external_imported/sentry-native/external/crashpad/util/posix/close_multiple.cc
@@ -23,6 +23,7 @@
 #include <algorithm>
 #include <iterator>
 
+#include "base/check_op.h"
 #include "base/files/scoped_file.h"
 #include "base/logging.h"
 #include "base/posix/eintr_wrapper.h"
diff --git a/external_imported/sentry-native/external/crashpad/util/posix/process_info_linux.cc b/external_imported/sentry-native/external/crashpad/util/posix/process_info_linux.cc
index 27387616e..1aca699c5 100644
--- a/external_imported/sentry-native/external/crashpad/util/posix/process_info_linux.cc
+++ b/external_imported/sentry-native/external/crashpad/util/posix/process_info_linux.cc
@@ -16,6 +16,7 @@
 
 #include <stdio.h>
 
+#include "base/check.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "util/file/delimited_file_reader.h"
diff --git a/external_imported/sentry-native/external/crashpad/util/posix/process_info_mac.cc b/external_imported/sentry-native/external/crashpad/util/posix/process_info_mac.cc
index 23f8b72f2..cf615194a 100644
--- a/external_imported/sentry-native/external/crashpad/util/posix/process_info_mac.cc
+++ b/external_imported/sentry-native/external/crashpad/util/posix/process_info_mac.cc
@@ -18,8 +18,9 @@
 
 #include <iterator>
 
+#include "base/apple/mach_logging.h"
+#include "base/check_op.h"
 #include "base/logging.h"
-#include "base/mac/mach_logging.h"
 
 namespace crashpad {
 
diff --git a/external_imported/sentry-native/external/crashpad/util/posix/signals_test.cc b/external_imported/sentry-native/external/crashpad/util/posix/signals_test.cc
index de8deb22c..15c449955 100644
--- a/external_imported/sentry-native/external/crashpad/util/posix/signals_test.cc
+++ b/external_imported/sentry-native/external/crashpad/util/posix/signals_test.cc
@@ -164,9 +164,12 @@ void CauseSignal(int sig, int code) {
  * Arm architecture.
  */
 #if defined(ARCH_CPU_X86_FAMILY)
-      [[maybe_unused]] volatile int a = 42;
-      volatile int b = 0;
-      a = a / b;
+      // Dividing by zero is undefined in C, so the compiler is permitted to
+      // optimize out the division. Instead, divide using inline assembly. As
+      // this instruction will trap anyway, we skip declaring any clobbers or
+      // output registers.
+      int a = 42, b = 0;
+      asm volatile("idivl %2" : : "a"(0), "d"(a), "r"(b));
 #endif
       break;
     }
diff --git a/external_imported/sentry-native/external/crashpad/util/process/process_memory_fuchsia.cc b/external_imported/sentry-native/external/crashpad/util/process/process_memory_fuchsia.cc
index 7129f8a75..a14c2ac68 100644
--- a/external_imported/sentry-native/external/crashpad/util/process/process_memory_fuchsia.cc
+++ b/external_imported/sentry-native/external/crashpad/util/process/process_memory_fuchsia.cc
@@ -16,8 +16,9 @@
 
 #include <limits>
 
-#include "base/logging.h"
+#include "base/check_op.h"
 #include "base/fuchsia/fuchsia_logging.h"
+#include "base/logging.h"
 
 namespace crashpad {
 
diff --git a/external_imported/sentry-native/external/crashpad/util/process/process_memory_linux.cc b/external_imported/sentry-native/external/crashpad/util/process/process_memory_linux.cc
index 1e9002d79..9c2edea30 100644
--- a/external_imported/sentry-native/external/crashpad/util/process/process_memory_linux.cc
+++ b/external_imported/sentry-native/external/crashpad/util/process/process_memory_linux.cc
@@ -22,6 +22,7 @@
 #include <algorithm>
 #include <limits>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "base/posix/eintr_wrapper.h"
 #include "build/build_config.h"
diff --git a/external_imported/sentry-native/external/crashpad/util/process/process_memory_mac.cc b/external_imported/sentry-native/external/crashpad/util/process/process_memory_mac.cc
index fc8719b49..a972401dc 100644
--- a/external_imported/sentry-native/external/crashpad/util/process/process_memory_mac.cc
+++ b/external_imported/sentry-native/external/crashpad/util/process/process_memory_mac.cc
@@ -19,8 +19,9 @@
 
 #include <algorithm>
 
+#include "base/apple/mach_logging.h"
+#include "base/check_op.h"
 #include "base/logging.h"
-#include "base/mac/mach_logging.h"
 #include "base/strings/stringprintf.h"
 #include "util/stdlib/strnlen.h"
 
diff --git a/external_imported/sentry-native/external/crashpad/util/process/process_memory_mac.h b/external_imported/sentry-native/external/crashpad/util/process/process_memory_mac.h
index 6c76e3d23..9803daf9d 100644
--- a/external_imported/sentry-native/external/crashpad/util/process/process_memory_mac.h
+++ b/external_imported/sentry-native/external/crashpad/util/process/process_memory_mac.h
@@ -21,7 +21,7 @@
 #include <memory>
 #include <string>
 
-#include "base/mac/scoped_mach_vm.h"
+#include "base/apple/scoped_mach_vm.h"
 #include "util/misc/address_types.h"
 #include "util/misc/initialization_state_dcheck.h"
 #include "util/process/process_memory.h"
@@ -82,7 +82,7 @@ class ProcessMemoryMac : public ProcessMemory {
                  size_t user_offset,
                  size_t user_size);
 
-    base::mac::ScopedMachVM vm_;
+    base::apple::ScopedMachVM vm_;
     const void* data_;
     size_t user_size_;
 
diff --git a/external_imported/sentry-native/external/crashpad/util/process/process_memory_mac_test.cc b/external_imported/sentry-native/external/crashpad/util/process/process_memory_mac_test.cc
index 9e2b7b060..296b536df 100644
--- a/external_imported/sentry-native/external/crashpad/util/process/process_memory_mac_test.cc
+++ b/external_imported/sentry-native/external/crashpad/util/process/process_memory_mac_test.cc
@@ -21,8 +21,8 @@
 #include <memory>
 #include <string>
 
-#include "base/mac/scoped_mach_port.h"
-#include "base/mac/scoped_mach_vm.h"
+#include "base/apple/scoped_mach_port.h"
+#include "base/apple/scoped_mach_vm.h"
 #include "gtest/gtest.h"
 #include "test/mac/mach_errors.h"
 #include "util/misc/from_pointer_cast.h"
@@ -37,7 +37,7 @@ TEST(ProcessMemoryMac, ReadMappedSelf) {
   kern_return_t kr =
       vm_allocate(mach_task_self(), &address, kSize, VM_FLAGS_ANYWHERE);
   ASSERT_EQ(kr, KERN_SUCCESS) << MachErrorMessage(kr, "vm_allocate");
-  base::mac::ScopedMachVM vm_owner(address, mach_vm_round_page(kSize));
+  base::apple::ScopedMachVM vm_owner(address, mach_vm_round_page(kSize));
 
   char* region = reinterpret_cast<char*>(address);
   for (size_t index = 0; index < kSize; ++index) {
@@ -92,7 +92,7 @@ TEST(ProcessMemoryMac, ReadSelfUnmapped) {
   kern_return_t kr =
       vm_allocate(mach_task_self(), &address, kSize, VM_FLAGS_ANYWHERE);
   ASSERT_EQ(kr, KERN_SUCCESS) << MachErrorMessage(kr, "vm_allocate");
-  base::mac::ScopedMachVM vm_owner(address, mach_vm_round_page(kSize));
+  base::apple::ScopedMachVM vm_owner(address, mach_vm_round_page(kSize));
 
   char* region = reinterpret_cast<char*>(address);
   for (size_t index = 0; index < kSize; ++index) {
@@ -154,7 +154,7 @@ TEST(ProcessMemoryMac, ReadCStringSelfUnmapped) {
   kern_return_t kr =
       vm_allocate(mach_task_self(), &address, kSize, VM_FLAGS_ANYWHERE);
   ASSERT_EQ(kr, KERN_SUCCESS) << MachErrorMessage(kr, "vm_allocate");
-  base::mac::ScopedMachVM vm_owner(address, mach_vm_round_page(kSize));
+  base::apple::ScopedMachVM vm_owner(address, mach_vm_round_page(kSize));
 
   char* region = reinterpret_cast<char*>(address);
   for (size_t index = 0; index < kSize; ++index) {
@@ -219,7 +219,7 @@ bool IsAddressMapped(vm_address_t address) {
     // |object| will be MACH_PORT_NULL (10.9.4 xnu-2422.110.17/osfmk/vm/vm_map.c
     // vm_map_region()), but the interface acts as if it might carry a send
     // right, so treat it as documented.
-    base::mac::ScopedMachSendRight object_owner(object);
+    base::apple::ScopedMachSendRight object_owner(object);
 
     return address >= region_address && address <= region_address + region_size;
   }
diff --git a/external_imported/sentry-native/external/crashpad/util/process/process_memory_win.cc b/external_imported/sentry-native/external/crashpad/util/process/process_memory_win.cc
index 8c5a1679e..c120827ad 100644
--- a/external_imported/sentry-native/external/crashpad/util/process/process_memory_win.cc
+++ b/external_imported/sentry-native/external/crashpad/util/process/process_memory_win.cc
@@ -19,6 +19,7 @@
 #include <algorithm>
 #include <limits>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "base/memory/page_size.h"
 #include "base/numerics/safe_conversions.h"
diff --git a/external_imported/sentry-native/external/crashpad/util/stdlib/string_number_conversion.cc b/external_imported/sentry-native/external/crashpad/util/stdlib/string_number_conversion.cc
index 91a6abe47..1be546876 100644
--- a/external_imported/sentry-native/external/crashpad/util/stdlib/string_number_conversion.cc
+++ b/external_imported/sentry-native/external/crashpad/util/stdlib/string_number_conversion.cc
@@ -14,7 +14,6 @@
 
 #include "util/stdlib/string_number_conversion.h"
 
-#include <ctype.h>
 #include <errno.h>
 #include <inttypes.h>
 #include <stdlib.h>
@@ -22,6 +21,7 @@
 
 #include <limits>
 
+#include "base/strings/string_util.h"
 
 namespace {
 
@@ -141,7 +141,7 @@ bool StringToIntegerInternal(const std::string& string,
 
   Traits::TypeCheck();
 
-  if (string.empty() || isspace(string[0])) {
+  if (string.empty() || base::IsAsciiWhitespace(string[0])) {
     return false;
   }
 
diff --git a/external_imported/sentry-native/external/crashpad/util/stream/file_output_stream.cc b/external_imported/sentry-native/external/crashpad/util/stream/file_output_stream.cc
index 91aed9043..a3633f9de 100644
--- a/external_imported/sentry-native/external/crashpad/util/stream/file_output_stream.cc
+++ b/external_imported/sentry-native/external/crashpad/util/stream/file_output_stream.cc
@@ -14,6 +14,7 @@
 
 #include "util/stream/file_output_stream.h"
 
+#include "base/check.h"
 #include "base/logging.h"
 
 namespace crashpad {
diff --git a/external_imported/sentry-native/external/crashpad/util/thread/thread_log_messages.cc b/external_imported/sentry-native/external/crashpad/util/thread/thread_log_messages.cc
index 9674d3cce..efc6e2e11 100644
--- a/external_imported/sentry-native/external/crashpad/util/thread/thread_log_messages.cc
+++ b/external_imported/sentry-native/external/crashpad/util/thread/thread_log_messages.cc
@@ -18,71 +18,38 @@
 
 #include "base/check_op.h"
 #include "base/logging.h"
-#include "base/threading/thread_local_storage.h"
 
 namespace crashpad {
 
 namespace {
 
-// While an object of this class exists, it will be set as the log message
-// handler. A thread may register its thread-specific log message list to
-// receive messages produced just on that thread.
-//
-// Only one object of this class may exist in the program at a time as created
-// by GetInstance(). There must not be any log message handler in effect when it
-// is created, and nothing else can be set as a log message handler while an
-// object of this class exists.
-class ThreadLogMessagesMaster {
- public:
-  ThreadLogMessagesMaster(const ThreadLogMessagesMaster&) = delete;
-  ThreadLogMessagesMaster& operator=(const ThreadLogMessagesMaster&) = delete;
-
-  void SetThreadMessageList(std::vector<std::string>* message_list) {
-    DCHECK_EQ(logging::GetLogMessageHandler(), &LogMessageHandler);
-    DCHECK_NE(tls_.Get() != nullptr, message_list != nullptr);
-    tls_.Set(message_list);
-  }
-
-  static ThreadLogMessagesMaster* GetInstance() {
-    static auto master = new ThreadLogMessagesMaster();
-    return master;
-  }
-
- private:
-  ThreadLogMessagesMaster() {
-    DCHECK(!logging::GetLogMessageHandler());
-    logging::SetLogMessageHandler(LogMessageHandler);
-  }
-
-  ~ThreadLogMessagesMaster() = delete;
+thread_local std::vector<std::string>* thread_local_log_messages;
 
-  static bool LogMessageHandler(logging::LogSeverity severity,
-                                const char* file_path,
-                                int line,
-                                size_t message_start,
-                                const std::string& string) {
-    std::vector<std::string>* log_messages =
-        reinterpret_cast<std::vector<std::string>*>(GetInstance()->tls_.Get());
-    if (log_messages) {
-      log_messages->push_back(string);
-    }
-
-    // Don’t consume the message. Allow it to be logged as if nothing was set as
-    // the log message handler.
-    return false;
+bool LogMessageHandler(logging::LogSeverity severity,
+                       const char* file_path,
+                       int line,
+                       size_t message_start,
+                       const std::string& string) {
+  if (thread_local_log_messages) {
+    thread_local_log_messages->push_back(string);
   }
 
-  base::ThreadLocalStorage::Slot tls_;
-};
+  // Don’t consume the message. Allow it to be logged as if nothing was set as
+  // the log message handler.
+  return false;
+}
 
 }  // namespace
 
-ThreadLogMessages::ThreadLogMessages() : log_messages_() {
-  ThreadLogMessagesMaster::GetInstance()->SetThreadMessageList(&log_messages_);
-}
-
-ThreadLogMessages::~ThreadLogMessages() {
-  ThreadLogMessagesMaster::GetInstance()->SetThreadMessageList(nullptr);
+ThreadLogMessages::ThreadLogMessages()
+    : log_messages_(),
+      reset_thread_local_log_messages_(&thread_local_log_messages,
+                                       &log_messages_) {
+  [[maybe_unused]] static bool initialized = [] {
+    DCHECK(!logging::GetLogMessageHandler());
+    logging::SetLogMessageHandler(LogMessageHandler);
+    return true;
+  }();
 }
 
 }  // namespace crashpad
diff --git a/external_imported/sentry-native/external/crashpad/util/thread/thread_log_messages.h b/external_imported/sentry-native/external/crashpad/util/thread/thread_log_messages.h
index 0136f6f2a..43e3cd0df 100644
--- a/external_imported/sentry-native/external/crashpad/util/thread/thread_log_messages.h
+++ b/external_imported/sentry-native/external/crashpad/util/thread/thread_log_messages.h
@@ -18,6 +18,7 @@
 #include <string>
 #include <vector>
 
+#include "base/auto_reset.h"
 
 namespace crashpad {
 
@@ -34,7 +35,7 @@ class ThreadLogMessages {
   ThreadLogMessages(const ThreadLogMessages&) = delete;
   ThreadLogMessages& operator=(const ThreadLogMessages&) = delete;
 
-  ~ThreadLogMessages();
+  ~ThreadLogMessages() = default;
 
   //! \return The log messages collected on the thread that this object was
   //!     created on since the time it was created.
@@ -42,6 +43,8 @@ class ThreadLogMessages {
 
  private:
   std::vector<std::string> log_messages_;
+  const base::AutoReset<std::vector<std::string>*>
+      reset_thread_local_log_messages_;
 };
 
 }  // namespace crashpad
diff --git a/external_imported/sentry-native/external/crashpad/util/win/exception_handler_server.cc b/external_imported/sentry-native/external/crashpad/util/win/exception_handler_server.cc
index ba938ec93..e641c7fb9 100644
--- a/external_imported/sentry-native/external/crashpad/util/win/exception_handler_server.cc
+++ b/external_imported/sentry-native/external/crashpad/util/win/exception_handler_server.cc
@@ -21,6 +21,7 @@
 #include <iterator>
 #include <utility>
 
+#include "base/check.h"
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/rand_util.h"
diff --git a/external_imported/sentry-native/external/crashpad/util/win/initial_client_data.cc b/external_imported/sentry-native/external/crashpad/util/win/initial_client_data.cc
index c119ad954..d74d66c26 100644
--- a/external_imported/sentry-native/external/crashpad/util/win/initial_client_data.cc
+++ b/external_imported/sentry-native/external/crashpad/util/win/initial_client_data.cc
@@ -16,6 +16,7 @@
 
 #include <vector>
 
+#include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "util/stdlib/string_number_conversion.h"
@@ -99,7 +100,8 @@ bool InitialClientData::InitializeFromString(const std::string& str) {
 }
 
 std::string InitialClientData::StringRepresentation() const {
-  return base::StringPrintf("0x%x,0x%x,0x%x,0x%x,0x%x,0x%I64x,0x%I64x,0x%I64x",
+  return base::StringPrintf("0x%x,0x%x,0x%x,0x%x,0x%x,0x%" PRIx64 ",0x%" PRIx64
+                            ",0x%" PRIx64,
                             HandleToInt(request_crash_dump_),
                             HandleToInt(request_non_crash_dump_),
                             HandleToInt(non_crash_dump_completed_),
diff --git a/external_imported/sentry-native/external/crashpad/util/win/process_info.cc b/external_imported/sentry-native/external/crashpad/util/win/process_info.cc
index 85653885b..6c23cd009 100644
--- a/external_imported/sentry-native/external/crashpad/util/win/process_info.cc
+++ b/external_imported/sentry-native/external/crashpad/util/win/process_info.cc
@@ -23,6 +23,7 @@
 #include <new>
 #include <type_traits>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "base/memory/free_deleter.h"
 #include "base/process/memory.h"
diff --git a/external_imported/sentry-native/external/crashpad/util/win/registration_protocol_win.cc b/external_imported/sentry-native/external/crashpad/util/win/registration_protocol_win.cc
index d71c56030..95111f9c5 100644
--- a/external_imported/sentry-native/external/crashpad/util/win/registration_protocol_win.cc
+++ b/external_imported/sentry-native/external/crashpad/util/win/registration_protocol_win.cc
@@ -21,6 +21,7 @@
 
 #include <iterator>
 
+#include "base/check.h"
 #include "base/logging.h"
 #include "util/win/exception_handler_server.h"
 #include "util/win/loader_lock.h"
diff --git a/external_imported/sentry-native/external/crashpad/util/win/scoped_handle.cc b/external_imported/sentry-native/external/crashpad/util/win/scoped_handle.cc
index e9f7a9a73..b979134a2 100644
--- a/external_imported/sentry-native/external/crashpad/util/win/scoped_handle.cc
+++ b/external_imported/sentry-native/external/crashpad/util/win/scoped_handle.cc
@@ -32,5 +32,9 @@ void ScopedSearchHANDLECloseTraits::Free(HANDLE handle) {
   PCHECK(FindClose(handle)) << "FindClose";
 }
 
+void ScopedVectoredExceptionRegistrationCloseTraits::Free(PVOID handle) {
+  PCHECK(::RemoveVectoredExceptionHandler(handle));
+}
+
 }  // namespace internal
 }  // namespace crashpad
diff --git a/external_imported/sentry-native/external/crashpad/util/win/scoped_handle.h b/external_imported/sentry-native/external/crashpad/util/win/scoped_handle.h
index 5d629104f..62e7e8075 100644
--- a/external_imported/sentry-native/external/crashpad/util/win/scoped_handle.h
+++ b/external_imported/sentry-native/external/crashpad/util/win/scoped_handle.h
@@ -38,6 +38,11 @@ struct ScopedSearchHANDLECloseTraits {
   static void Free(HANDLE handle);
 };
 
+struct ScopedVectoredExceptionRegistrationCloseTraits {
+  static PVOID InvalidValue() { return nullptr; }
+  static void Free(PVOID handle);
+};
+
 }  // namespace internal
 
 using ScopedFileHANDLE =
@@ -46,6 +51,9 @@ using ScopedKernelHANDLE =
     base::ScopedGeneric<HANDLE, internal::ScopedKernelHANDLECloseTraits>;
 using ScopedSearchHANDLE =
     base::ScopedGeneric<HANDLE, internal::ScopedSearchHANDLECloseTraits>;
+using ScopedVectoredExceptionRegistration = base::ScopedGeneric<
+    PVOID,
+    internal::ScopedVectoredExceptionRegistrationCloseTraits>;
 
 }  // namespace crashpad
 
diff --git a/external_imported/sentry-native/external/crashpad/util/win/session_end_watcher.cc b/external_imported/sentry-native/external/crashpad/util/win/session_end_watcher.cc
index d685a995f..ead6b7fc6 100644
--- a/external_imported/sentry-native/external/crashpad/util/win/session_end_watcher.cc
+++ b/external_imported/sentry-native/external/crashpad/util/win/session_end_watcher.cc
@@ -14,6 +14,7 @@
 
 #include "util/win/session_end_watcher.h"
 
+#include "base/check.h"
 #include "base/logging.h"
 #include "base/scoped_generic.h"
 #include "util/win/scoped_set_event.h"
diff --git a/external_imported/sentry-native/external/libunwindstack-ndk/Demangle.cpp b/external_imported/sentry-native/external/libunwindstack-ndk/Demangle.cpp
new file mode 100644
index 000000000..d7ca4856a
--- /dev/null
+++ b/external_imported/sentry-native/external/libunwindstack-ndk/Demangle.cpp
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <cxxabi.h>
+#include <stdlib.h>
+
+#include <string>
+
+#ifdef SENTRY_REMOVED
+#include <rustc_demangle.h>
+#endif //SENTRY_REMOVED
+
+#include <unwindstack/Demangle.h>
+
+namespace unwindstack {
+
+std::string DemangleNameIfNeeded(const std::string& name) {
+  if (name.length() < 2 || name[0] != '_') {
+    return name;
+  }
+
+  char* demangled_str = nullptr;
+  if (name[1] == 'Z') {
+    // Try to demangle C++ name.
+    demangled_str = abi::__cxa_demangle(name.c_str(), nullptr, nullptr, nullptr);
+#ifdef SENTRY_REMOVED
+  } else if (name[1] == 'R') {
+    // Try to demangle rust name.
+    demangled_str = rustc_demangle(name.c_str(), nullptr, nullptr, nullptr);
+#endif //SENTRY_REMOVED
+  }
+
+  if (demangled_str == nullptr) {
+    return name;
+  }
+
+  std::string demangled_name(demangled_str);
+  free(demangled_str);
+  return demangled_name;
+}
+
+}  // namespace unwindstack
diff --git a/external_imported/sentry-native/external/libunwindstack-ndk/Elf.cpp b/external_imported/sentry-native/external/libunwindstack-ndk/Elf.cpp
index d34b015b2..23eeb18ca 100644
--- a/external_imported/sentry-native/external/libunwindstack-ndk/Elf.cpp
+++ b/external_imported/sentry-native/external/libunwindstack-ndk/Elf.cpp
@@ -304,11 +304,6 @@ ElfInterface* Elf::CreateInterfaceFromMemory(Memory* memory) {
     } else if (e_machine == EM_386) {
       arch_ = ARCH_X86;
       interface.reset(new ElfInterface32(memory));
-#ifdef SENTRY_REMOVED
-    } else if (e_machine == EM_MIPS) {
-      arch_ = ARCH_MIPS;
-      interface.reset(new ElfInterface32(memory));
-#endif // SENTRY_REMOVED
     } else {
       // Unsupported.
       return nullptr;
@@ -325,8 +320,6 @@ ElfInterface* Elf::CreateInterfaceFromMemory(Memory* memory) {
     } else if (e_machine == EM_X86_64) {
       arch_ = ARCH_X86_64;
 #ifdef SENTRY_REMOVED
-    } else if (e_machine == EM_MIPS) {
-      arch_ = ARCH_MIPS64;
     } else if (e_machine == EM_RISCV) {
       arch_ = ARCH_RISCV64;
 #endif // SENTRY_REMOVED
diff --git a/external_imported/sentry-native/external/libunwindstack-ndk/ElfInterface.cpp b/external_imported/sentry-native/external/libunwindstack-ndk/ElfInterface.cpp
index fbc5a4811..9ff23d32c 100644
--- a/external_imported/sentry-native/external/libunwindstack-ndk/ElfInterface.cpp
+++ b/external_imported/sentry-native/external/libunwindstack-ndk/ElfInterface.cpp
@@ -528,12 +528,33 @@ template <typename ElfTypes>
 void ElfInterfaceImpl<ElfTypes>::GetMaxSize(Memory* memory, uint64_t* size) {
   EhdrType ehdr;
   if (!memory->ReadFully(0, &ehdr, sizeof(ehdr))) {
+    *size = 0;
     return;
   }
-  if (ehdr.e_shnum == 0) {
-    return;
+
+  // If this winds up as zero, the PT_LOAD reading will get a better value.
+  uint64_t elf_size = ehdr.e_shoff + ehdr.e_shentsize * ehdr.e_shnum;
+
+  // Search through the PT_LOAD values and if any result in a larger elf
+  // size, use that.
+  uint64_t offset = ehdr.e_phoff;
+  for (size_t i = 0; i < ehdr.e_phnum; i++, offset += ehdr.e_phentsize) {
+    PhdrType phdr;
+    if (!memory->ReadFully(offset, &phdr, sizeof(phdr))) {
+      break;
+    }
+    if (phdr.p_type == PT_LOAD) {
+      uint64_t end_offset;
+      if (__builtin_add_overflow(phdr.p_offset, phdr.p_memsz, &end_offset)) {
+        continue;
+      }
+      if (end_offset > elf_size) {
+        elf_size = end_offset;
+      }
+    }
   }
-  *size = ehdr.e_shoff + ehdr.e_shentsize * ehdr.e_shnum;
+
+  *size = elf_size;
 }
 
 template <typename EhdrType, typename ShdrType>
diff --git a/external_imported/sentry-native/external/libunwindstack-ndk/ElfInterfaceArm.h b/external_imported/sentry-native/external/libunwindstack-ndk/ElfInterfaceArm.h
index 6ee6dc984..d8cad48f5 100644
--- a/external_imported/sentry-native/external/libunwindstack-ndk/ElfInterfaceArm.h
+++ b/external_imported/sentry-native/external/libunwindstack-ndk/ElfInterfaceArm.h
@@ -19,7 +19,6 @@
 #include <elf.h>
 #include <stdint.h>
 
-#include <iterator>
 #include <unordered_map>
 
 #include <unwindstack/ElfInterface.h>
@@ -32,8 +31,14 @@ class ElfInterfaceArm : public ElfInterface32 {
   ElfInterfaceArm(Memory* memory) : ElfInterface32(memory) {}
   virtual ~ElfInterfaceArm() = default;
 
-  class iterator : public std::iterator<std::bidirectional_iterator_tag, uint32_t> {
+  class iterator {
    public:
+    using iterator_category = std::bidirectional_iterator_tag;
+    using value_type = uint32_t;
+    using difference_type = std::ptrdiff_t;
+    using pointer = uint32_t*;
+    using reference = uint32_t&;
+
     iterator(ElfInterfaceArm* interface, size_t index) : interface_(interface), index_(index) { }
 
     iterator& operator++() { index_++; return *this; }
diff --git a/external_imported/sentry-native/external/libunwindstack-ndk/GlobalDebugImpl.h b/external_imported/sentry-native/external/libunwindstack-ndk/GlobalDebugImpl.h
index 3da1fbf17..93bc8cfa8 100644
--- a/external_imported/sentry-native/external/libunwindstack-ndk/GlobalDebugImpl.h
+++ b/external_imported/sentry-native/external/libunwindstack-ndk/GlobalDebugImpl.h
@@ -410,9 +410,6 @@ std::unique_ptr<GlobalDebugInterface<Symfile>> CreateGlobalDebugImpl(
       return std::make_unique<Impl>(arch, jit_memory, search_libs, global_variable_name);
     }
     case ARCH_ARM: {
-#ifdef SENTRY_REMOVED
-    case ARCH_MIPS: {
-#endif // SENTRY_REMOVED
       using Impl = GlobalDebugImpl<Symfile, uint32_t, Uint64_A>;
       static_assert(offsetof(typename Impl::JITCodeEntry, symfile_size) == 16, "layout");
       static_assert(offsetof(typename Impl::JITCodeEntry, seqlock) == 32, "layout");
@@ -423,7 +420,6 @@ std::unique_ptr<GlobalDebugInterface<Symfile>> CreateGlobalDebugImpl(
     case ARCH_ARM64:
     case ARCH_X86_64: {
 #ifdef SENTRY_REMOVED
-    case ARCH_MIPS64:
     case ARCH_RISCV64: {
 #endif // SENTRY_REMOVED
       using Impl = GlobalDebugImpl<Symfile, uint64_t, Uint64_A>;
diff --git a/external_imported/sentry-native/external/libunwindstack-ndk/Regs.cpp b/external_imported/sentry-native/external/libunwindstack-ndk/Regs.cpp
index b4574c3fa..9c99d730f 100644
--- a/external_imported/sentry-native/external/libunwindstack-ndk/Regs.cpp
+++ b/external_imported/sentry-native/external/libunwindstack-ndk/Regs.cpp
@@ -117,6 +117,10 @@ ArchEnum Regs::RemoteGetArch(pid_t pid, ErrorCode* error_code) {
       return ARCH_ARM;
     case sizeof(arm64_user_regs):
       return ARCH_ARM64;
+#ifdef SENTRY_REMOVED
+    case sizeof(riscv64_user_regs):
+      return ARCH_RISCV64;
+#endif // SENTRY_REMOVED
   }
 
   Log::Error("No matching size of user regs structure for pid %d: size %zu", pid, io.iov_len);
@@ -224,16 +228,6 @@ uint64_t GetPcAdjustment(uint64_t rel_pc, Elf* elf, ArchEnum arch) {
         return 0;
       }
       return 4;
-#ifdef SENTRY_REMOVED
-    }
-  case ARCH_MIPS:
-  case ARCH_MIPS64: {
-    if (rel_pc < 8) {
-      return 0;
-    }
-    // For now, just assume no compact branches
-    return 8;
-#endif // SENTRY_REMOVED
   }
   case ARCH_X86:
   case ARCH_X86_64: {
diff --git a/external_imported/sentry-native/external/libunwindstack-ndk/Unwinder.cpp b/external_imported/sentry-native/external/libunwindstack-ndk/Unwinder.cpp
index b8025142b..64ad92dfa 100644
--- a/external_imported/sentry-native/external/libunwindstack-ndk/Unwinder.cpp
+++ b/external_imported/sentry-native/external/libunwindstack-ndk/Unwinder.cpp
@@ -406,13 +406,17 @@ bool UnwinderFromPid::Init() {
     }
   }
 
-  jit_debug_ptr_ = CreateJitDebug(arch_, process_memory_);
-  jit_debug_ = jit_debug_ptr_.get();
-  SetJitDebug(jit_debug_);
+  // jit_debug_ and dex_files_ may have already been set, for example in
+  // AndroidLocalUnwinder::InternalUnwind.
+  if (jit_debug_ == nullptr) {
+    jit_debug_ptr_ = CreateJitDebug(arch_, process_memory_);
+    SetJitDebug(jit_debug_ptr_.get());
+  }
 #if defined(DEXFILE_SUPPORT)
-  dex_files_ptr_ = CreateDexFiles(arch_, process_memory_);
-  dex_files_ = dex_files_ptr_.get();
-  SetDexFiles(dex_files_);
+  if (dex_files_ == nullptr) {
+    dex_files_ptr_ = CreateDexFiles(arch_, process_memory_);
+    SetDexFiles(dex_files_ptr_.get());
+  }
 #endif
 
   return true;
diff --git a/external_imported/sentry-native/external/libunwindstack-ndk/include/unwindstack/Arch.h b/external_imported/sentry-native/external/libunwindstack-ndk/include/unwindstack/Arch.h
index 41dc00e13..44d0de026 100644
--- a/external_imported/sentry-native/external/libunwindstack-ndk/include/unwindstack/Arch.h
+++ b/external_imported/sentry-native/external/libunwindstack-ndk/include/unwindstack/Arch.h
@@ -27,8 +27,6 @@ enum ArchEnum : uint8_t {
   ARCH_X86,
   ARCH_X86_64,
 #ifdef SENTRY_REMOVED
-  ARCH_MIPS,
-  ARCH_MIPS64,
   ARCH_RISCV64,
 #endif // SENTRY_REMOVED
 };
@@ -37,9 +35,6 @@ static inline bool ArchIs32Bit(ArchEnum arch) {
   switch (arch) {
     case ARCH_ARM:
     case ARCH_X86:
-#ifdef SENTRY_REMOVED
-    case ARCH_MIPS:
-#endif // SENTRY_REMOVED
       return true;
     default:
       return false;
diff --git a/external_imported/sentry-native/external/libunwindstack-ndk/include/unwindstack/Demangle.h b/external_imported/sentry-native/external/libunwindstack-ndk/include/unwindstack/Demangle.h
new file mode 100644
index 000000000..8ea51bc0b
--- /dev/null
+++ b/external_imported/sentry-native/external/libunwindstack-ndk/include/unwindstack/Demangle.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include <string>
+
+namespace unwindstack {
+
+std::string DemangleNameIfNeeded(const std::string& name);
+
+}  // namespace unwindstack
diff --git a/external_imported/sentry-native/external/libunwindstack-ndk/include/unwindstack/DwarfSection.h b/external_imported/sentry-native/external/libunwindstack-ndk/include/unwindstack/DwarfSection.h
index 33435b22a..2318f2f3f 100644
--- a/external_imported/sentry-native/external/libunwindstack-ndk/include/unwindstack/DwarfSection.h
+++ b/external_imported/sentry-native/external/libunwindstack-ndk/include/unwindstack/DwarfSection.h
@@ -18,7 +18,6 @@
 
 #include <stdint.h>
 
-#include <iterator>
 #include <map>
 #include <optional>
 #include <unordered_map>
@@ -42,8 +41,14 @@ class DwarfSection {
   DwarfSection(Memory* memory);
   virtual ~DwarfSection() = default;
 
-  class iterator : public std::iterator<std::bidirectional_iterator_tag, DwarfFde*> {
+  class iterator {
    public:
+    using iterator_category = std::bidirectional_iterator_tag;
+    using value_type = DwarfFde*;
+    using difference_type = std::ptrdiff_t;
+    using pointer = DwarfFde**;
+    using reference = DwarfFde*&;
+
     iterator(DwarfSection* section, size_t index) : index_(index) {
       section->GetFdes(&fdes_);
       if (index_ == static_cast<size_t>(-1)) {
diff --git a/external_imported/sentry-native/external/third_party/lss/DIR_METADATA b/external_imported/sentry-native/external/third_party/lss/DIR_METADATA
new file mode 100644
index 000000000..eccfd35fa
--- /dev/null
+++ b/external_imported/sentry-native/external/third_party/lss/DIR_METADATA
@@ -0,0 +1,12 @@
+# Metadata information for this directory.
+#
+# For more information on DIR_METADATA files, see:
+#   https://source.chromium.org/chromium/infra/infra/+/HEAD:go/src/infra/tools/dirmd/README.md
+#
+# For the schema of this file, see Metadata message:
+#   https://source.chromium.org/chromium/infra/infra/+/HEAD:go/src/infra/tools/dirmd/proto/dir_metadata.proto
+
+os: LINUX
+monorail {
+  project: "linux-syscall-support"
+}
diff --git a/external_imported/sentry-native/external/third_party/lss/LICENSE b/external_imported/sentry-native/external/third_party/lss/LICENSE
new file mode 100644
index 000000000..b66a6b273
--- /dev/null
+++ b/external_imported/sentry-native/external/third_party/lss/LICENSE
@@ -0,0 +1,27 @@
+Copyright 2005-2011 Google LLC
+
+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 LLC 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.
diff --git a/external_imported/sentry-native/external/third_party/lss/OWNERS b/external_imported/sentry-native/external/third_party/lss/OWNERS
new file mode 100644
index 000000000..29b02fa11
--- /dev/null
+++ b/external_imported/sentry-native/external/third_party/lss/OWNERS
@@ -0,0 +1,2 @@
+mseaborn@chromium.org
+vapier@chromium.org
diff --git a/external_imported/sentry-native/external/third_party/lss/README.md b/external_imported/sentry-native/external/third_party/lss/README.md
index 70cbc8531..e25abdd21 100644
--- a/external_imported/sentry-native/external/third_party/lss/README.md
+++ b/external_imported/sentry-native/external/third_party/lss/README.md
@@ -39,6 +39,7 @@ the header itself as this list might be out of date.
 * MIPS 32-bit o32 ABI
 * MIPS 32-bit n32 ABI
 * MIPS 64-bit n64 ABI
+* LOONGARCH 64-bit ABI
 
 ## API
 
@@ -130,7 +131,7 @@ It only compiles things (does not execute at all).
 
 If you commit a change to LSS, please also commit a Chromium change to update
 `lss_revision` in
-[Chromium's DEPS](https://chromium.googlesource.com/chromium/src/+/master/DEPS)
+[Chromium's DEPS](https://chromium.googlesource.com/chromium/src/+/HEAD/DEPS)
 file.
 
 This ensures that the LSS change gets tested, so that people who commit later
diff --git a/external_imported/sentry-native/external/third_party/lss/linux_syscall_support.h b/external_imported/sentry-native/external/third_party/lss/linux_syscall_support.h
index be7ea9d50..aab95e698 100644
--- a/external_imported/sentry-native/external/third_party/lss/linux_syscall_support.h
+++ b/external_imported/sentry-native/external/third_party/lss/linux_syscall_support.h
@@ -1,5 +1,4 @@
-/* Copyright (c) 2005-2011, Google Inc.
- * All rights reserved.
+/* Copyright 2005-2011 Google LLC
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -11,7 +10,7 @@
  * 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
+ *     * Neither the name of Google LLC nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
  *
@@ -47,7 +46,7 @@
  *   the necessary definitions.
  *
  * SYS_ERRNO:
- *   All system calls will update "errno" unless overriden by setting the
+ *   All system calls will update "errno" unless overridden by setting the
  *   SYS_ERRNO macro prior to including this file. SYS_ERRNO should be
  *   an l-value.
  *
@@ -88,7 +87,8 @@
  */
 #if (defined(__i386__) || defined(__x86_64__) || defined(__ARM_ARCH_3__) ||   \
      defined(__mips__) || defined(__PPC__) || defined(__ARM_EABI__) || \
-     defined(__aarch64__) || defined(__s390__)) \
+     defined(__aarch64__) || defined(__s390__) || defined(__e2k__) ||  \
+     (defined(__riscv) && __riscv_xlen == 64) || defined(__loongarch_lp64))  \
   && (defined(__linux) || defined(__ANDROID__))
 
 #ifndef SYS_CPLUSPLUS
@@ -142,11 +142,13 @@ extern "C" {
 #pragma push_macro("lstat64")
 #pragma push_macro("pread64")
 #pragma push_macro("pwrite64")
+#pragma push_macro("getdents64")
 #undef stat64
 #undef fstat64
 #undef lstat64
 #undef pread64
 #undef pwrite64
+#undef getdents64
 
 #if defined(__ANDROID__) && defined(__x86_64__)
 // A number of x86_64 syscalls are blocked by seccomp on recent Android;
@@ -264,6 +266,12 @@ struct kernel_timeval {
   long               tv_usec;
 };
 
+/* include/linux/time.h                                                      */
+struct kernel_itimerval {
+  struct kernel_timeval it_interval;
+  struct kernel_timeval it_value;
+};
+
 /* include/linux/resource.h                                                  */
 struct kernel_rusage {
   struct kernel_timeval ru_utime;
@@ -285,7 +293,8 @@ struct kernel_rusage {
 };
 
 #if defined(__i386__) || defined(__ARM_EABI__) || defined(__ARM_ARCH_3__) \
-  || defined(__PPC__) || (defined(__s390__) && !defined(__s390x__))
+  || defined(__PPC__) || (defined(__s390__) && !defined(__s390x__)) \
+  || defined(__e2k__)
 
 /* include/asm-{arm,i386,mips,ppc}/signal.h                                  */
 struct kernel_old_sigaction {
@@ -299,8 +308,8 @@ struct kernel_old_sigaction {
 } __attribute__((packed,aligned(4)));
 #elif (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32)
   #define kernel_old_sigaction kernel_sigaction
-#elif defined(__aarch64__)
-  // No kernel_old_sigaction defined for arm64.
+#elif defined(__aarch64__) || defined(__riscv) || defined(__loongarch_lp64)
+  // No kernel_old_sigaction defined for arm64 riscv and loongarch64.
 #endif
 
 /* Some kernel functions (e.g. sigaction() in 2.6.23) require that the
@@ -339,7 +348,9 @@ struct kernel_sigaction {
     void             (*sa_sigaction_)(int, siginfo_t *, void *);
   };
   unsigned long      sa_flags;
+#if !defined(__riscv) && !defined(__loongarch_lp64)
   void               (*sa_restorer)(void);
+#endif
   struct kernel_sigset_t sa_mask;
 #endif
 };
@@ -353,6 +364,16 @@ struct kernel_sockaddr {
 /* include/asm-{arm,aarch64,i386,mips,ppc,s390}/stat.h                       */
 #ifdef __mips__
 #if _MIPS_SIM == _MIPS_SIM_ABI64
+typedef unsigned long long kernel_blkcnt_t;
+typedef unsigned kernel_blksize_t;
+typedef unsigned kernel_dev_t;
+typedef unsigned kernel_gid_t;
+typedef unsigned long long kernel_ino_t;
+typedef unsigned kernel_mode_t;
+typedef unsigned kernel_nlink_t;
+typedef long long kernel_off_t;
+typedef unsigned kernel_time_t;
+typedef unsigned kernel_uid_t;
 struct kernel_stat {
 #else
 struct kernel_stat64 {
@@ -399,6 +420,28 @@ struct kernel_stat64 {
   unsigned long      __unused4;
   unsigned long      __unused5;
 };
+#elif defined(__e2k__)
+struct kernel_stat64 {
+  unsigned long long st_dev;
+  unsigned long long st_ino;
+  unsigned int       st_mode;
+  unsigned int       st_nlink;
+  unsigned int       st_uid;
+  unsigned int       st_gid;
+  unsigned long long st_rdev;
+  long long          st_size;
+  int                st_blksize;
+  int                __pad2;
+  unsigned long long st_blocks;
+  int                st_atime_;
+  unsigned int       st_atime_nsec_;
+  int                st_mtime_;
+  unsigned int       st_mtime_nsec_;
+  int                st_ctime_;
+  unsigned int       st_ctime_nsec_;
+  unsigned int       __unused4;
+  unsigned int       __unused5;
+};
 #else
 struct kernel_stat64 {
   unsigned long long st_dev;
@@ -425,165 +468,264 @@ struct kernel_stat64 {
 
 /* include/asm-{arm,aarch64,i386,mips,x86_64,ppc,s390}/stat.h                */
 #if defined(__i386__) || defined(__ARM_ARCH_3__) || defined(__ARM_EABI__)
+typedef unsigned kernel_blkcnt_t;
+typedef unsigned kernel_blksize_t;
+typedef unsigned short kernel_dev_t;
+typedef unsigned short kernel_gid_t;
+typedef unsigned kernel_ino_t;
+typedef unsigned short kernel_mode_t;
+typedef unsigned short kernel_nlink_t;
+typedef unsigned kernel_off_t;
+typedef unsigned kernel_time_t;
+typedef unsigned short kernel_uid_t;
 struct kernel_stat {
   /* The kernel headers suggest that st_dev and st_rdev should be 32bit
    * quantities encoding 12bit major and 20bit minor numbers in an interleaved
    * format. In reality, we do not see useful data in the top bits. So,
    * we'll leave the padding in here, until we find a better solution.
    */
-  unsigned short     st_dev;
+  kernel_dev_t       st_dev;
   short              pad1;
-  unsigned           st_ino;
-  unsigned short     st_mode;
-  unsigned short     st_nlink;
-  unsigned short     st_uid;
-  unsigned short     st_gid;
-  unsigned short     st_rdev;
+  kernel_ino_t       st_ino;
+  kernel_mode_t      st_mode;
+  kernel_nlink_t     st_nlink;
+  kernel_uid_t       st_uid;
+  kernel_gid_t       st_gid;
+  kernel_dev_t       st_rdev;
   short              pad2;
-  unsigned           st_size;
-  unsigned           st_blksize;
-  unsigned           st_blocks;
-  unsigned           st_atime_;
+  kernel_off_t       st_size;
+  kernel_blksize_t   st_blksize;
+  kernel_blkcnt_t    st_blocks;
+  kernel_time_t      st_atime_;
   unsigned           st_atime_nsec_;
-  unsigned           st_mtime_;
+  kernel_time_t      st_mtime_;
   unsigned           st_mtime_nsec_;
-  unsigned           st_ctime_;
+  kernel_time_t      st_ctime_;
   unsigned           st_ctime_nsec_;
   unsigned           __unused4;
   unsigned           __unused5;
 };
 #elif defined(__x86_64__)
+typedef int64_t kernel_blkcnt_t;
+typedef int64_t kernel_blksize_t;
+typedef uint64_t kernel_dev_t;
+typedef unsigned kernel_gid_t;
+typedef uint64_t kernel_ino_t;
+typedef unsigned kernel_mode_t;
+typedef uint64_t kernel_nlink_t;
+typedef int64_t kernel_off_t;
+typedef uint64_t kernel_time_t;
+typedef unsigned kernel_uid_t;
 struct kernel_stat {
-  uint64_t           st_dev;
-  uint64_t           st_ino;
-  uint64_t           st_nlink;
-  unsigned           st_mode;
-  unsigned           st_uid;
-  unsigned           st_gid;
+  kernel_dev_t       st_dev;
+  kernel_ino_t       st_ino;
+  kernel_nlink_t     st_nlink;
+  kernel_mode_t      st_mode;
+  kernel_uid_t       st_uid;
+  kernel_gid_t       st_gid;
   unsigned           __pad0;
-  uint64_t           st_rdev;
-  int64_t            st_size;
-  int64_t            st_blksize;
-  int64_t            st_blocks;
-  uint64_t           st_atime_;
+  kernel_dev_t       st_rdev;
+  kernel_off_t       st_size;
+  kernel_blksize_t   st_blksize;
+  kernel_blkcnt_t    st_blocks;
+  kernel_time_t      st_atime_;
   uint64_t           st_atime_nsec_;
-  uint64_t           st_mtime_;
+  kernel_time_t      st_mtime_;
   uint64_t           st_mtime_nsec_;
-  uint64_t           st_ctime_;
+  kernel_time_t      st_ctime_;
   uint64_t           st_ctime_nsec_;
   int64_t            __unused4[3];
 };
 #elif defined(__PPC__)
+typedef unsigned long kernel_blkcnt_t;
+typedef unsigned long kernel_blksize_t;
+typedef unsigned kernel_dev_t;
+typedef unsigned kernel_gid_t;
+typedef unsigned long kernel_ino_t;
+typedef unsigned long kernel_mode_t;
+typedef unsigned short kernel_nlink_t;
+typedef long kernel_off_t;
+typedef unsigned long kernel_time_t;
+typedef unsigned kernel_uid_t;
 struct kernel_stat {
-  unsigned           st_dev;
-  unsigned long      st_ino;      // ino_t
-  unsigned long      st_mode;     // mode_t
-  unsigned short     st_nlink;    // nlink_t
-  unsigned           st_uid;      // uid_t
-  unsigned           st_gid;      // gid_t
-  unsigned           st_rdev;
-  long               st_size;     // off_t
-  unsigned long      st_blksize;
-  unsigned long      st_blocks;
-  unsigned long      st_atime_;
+  kernel_dev_t       st_dev;
+  kernel_ino_t       st_ino;
+  kernel_mode_t      st_mode;
+  kernel_nlink_t     st_nlink;
+  kernel_gid_t       st_uid;
+  kernel_uid_t       st_gid;
+  kernel_dev_t       st_rdev;
+  kernel_off_t       st_size;
+  kernel_blksize_t   st_blksize;
+  kernel_blkcnt_t    st_blocks;
+  kernel_time_t      st_atime_;
   unsigned long      st_atime_nsec_;
-  unsigned long      st_mtime_;
+  kernel_time_t      st_mtime_;
   unsigned long      st_mtime_nsec_;
-  unsigned long      st_ctime_;
+  kernel_time_t      st_ctime_;
   unsigned long      st_ctime_nsec_;
   unsigned long      __unused4;
   unsigned long      __unused5;
 };
 #elif (defined(__mips__) && _MIPS_SIM != _MIPS_SIM_ABI64)
+typedef int kernel_blkcnt_t;
+typedef int kernel_blksize_t;
+typedef unsigned kernel_dev_t;
+typedef unsigned kernel_gid_t;
+typedef unsigned kernel_ino_t;
+typedef unsigned kernel_mode_t;
+typedef unsigned kernel_nlink_t;
+typedef long kernel_off_t;
+typedef long kernel_time_t;
+typedef unsigned kernel_uid_t;
 struct kernel_stat {
-  unsigned           st_dev;
+  kernel_dev_t       st_dev;
   int                st_pad1[3];
-  unsigned           st_ino;
-  unsigned           st_mode;
-  unsigned           st_nlink;
-  unsigned           st_uid;
-  unsigned           st_gid;
-  unsigned           st_rdev;
+  kernel_ino_t       st_ino;
+  kernel_mode_t      st_mode;
+  kernel_nlink_t     st_nlink;
+  kernel_uid_t       st_uid;
+  kernel_gid_t       st_gid;
+  kernel_dev_t       st_rdev;
   int                st_pad2[2];
-  long               st_size;
+  kernel_off_t       st_size;
   int                st_pad3;
-  long               st_atime_;
+  kernel_time_t      st_atime_;
   long               st_atime_nsec_;
-  long               st_mtime_;
+  kernel_time_t      st_mtime_;
   long               st_mtime_nsec_;
-  long               st_ctime_;
+  kernel_time_t      st_ctime_;
   long               st_ctime_nsec_;
-  int                st_blksize;
-  int                st_blocks;
+  kernel_blksize_t   st_blksize;
+  kernel_blkcnt_t    st_blocks;
   int                st_pad4[14];
 };
-#elif defined(__aarch64__)
+#elif defined(__aarch64__) || defined(__riscv) || defined(__loongarch_lp64)
+typedef long kernel_blkcnt_t;
+typedef int kernel_blksize_t;
+typedef unsigned long kernel_dev_t;
+typedef unsigned int kernel_gid_t;
+typedef unsigned long kernel_ino_t;
+typedef unsigned int kernel_mode_t;
+typedef unsigned int kernel_nlink_t;
+typedef long kernel_off_t;
+typedef long kernel_time_t;
+typedef unsigned int kernel_uid_t;
 struct kernel_stat {
-  unsigned long      st_dev;
-  unsigned long      st_ino;
-  unsigned int       st_mode;
-  unsigned int       st_nlink;
-  unsigned int       st_uid;
-  unsigned int       st_gid;
-  unsigned long      st_rdev;
+  kernel_dev_t       st_dev;
+  kernel_ino_t       st_ino;
+  kernel_mode_t      st_mode;
+  kernel_nlink_t     st_nlink;
+  kernel_uid_t       st_uid;
+  kernel_gid_t       st_gid;
+  kernel_dev_t       st_rdev;
   unsigned long      __pad1;
-  long               st_size;
-  int                st_blksize;
+  kernel_off_t       st_size;
+  kernel_blksize_t   st_blksize;
   int                __pad2;
-  long               st_blocks;
-  long               st_atime_;
+  kernel_blkcnt_t    st_blocks;
+  kernel_time_t      st_atime_;
   unsigned long      st_atime_nsec_;
-  long               st_mtime_;
+  kernel_time_t      st_mtime_;
   unsigned long      st_mtime_nsec_;
-  long               st_ctime_;
+  kernel_time_t      st_ctime_;
   unsigned long      st_ctime_nsec_;
   unsigned int       __unused4;
   unsigned int       __unused5;
 };
 #elif defined(__s390x__)
+typedef long kernel_blkcnt_t;
+typedef unsigned long kernel_blksize_t;
+typedef unsigned long kernel_dev_t;
+typedef unsigned int kernel_gid_t;
+typedef unsigned long kernel_ino_t;
+typedef unsigned int kernel_mode_t;
+typedef unsigned long kernel_nlink_t;
+typedef unsigned long kernel_off_t;
+typedef unsigned long kernel_time_t;
+typedef unsigned int kernel_uid_t;
 struct kernel_stat {
-  unsigned long      st_dev;
-  unsigned long      st_ino;
-  unsigned long      st_nlink;
-  unsigned int       st_mode;
-  unsigned int       st_uid;
-  unsigned int       st_gid;
+  kernel_dev_t       st_dev;
+  kernel_ino_t       st_ino;
+  kernel_nlink_t     st_nlink;
+  kernel_mode_t      st_mode;
+  kernel_uid_t       st_uid;
+  kernel_gid_t       st_gid;
   unsigned int       __pad1;
-  unsigned long      st_rdev;
-  unsigned long      st_size;
-  unsigned long      st_atime_;
+  kernel_dev_t       st_rdev;
+  kernel_off_t       st_size;
+  kernel_time_t      st_atime_;
   unsigned long      st_atime_nsec_;
-  unsigned long      st_mtime_;
+  kernel_time_t      st_mtime_;
   unsigned long      st_mtime_nsec_;
-  unsigned long      st_ctime_;
+  kernel_time_t      st_ctime_;
   unsigned long      st_ctime_nsec_;
-  unsigned long      st_blksize;
-  long               st_blocks;
+  kernel_blksize_t   st_blksize;
+  kernel_blkcnt_t    st_blocks;
   unsigned long      __unused[3];
 };
 #elif defined(__s390__)
+typedef unsigned long kernel_blkcnt_t;
+typedef unsigned long kernel_blksize_t;
+typedef unsigned short kernel_dev_t;
+typedef unsigned short kernel_gid_t;
+typedef unsigned long kernel_ino_t;
+typedef unsigned short kernel_mode_t;
+typedef unsigned short kernel_nlink_t;
+typedef unsigned long kernel_off_t;
+typedef unsigned long kernel_time_t;
+typedef unsigned short kernel_uid_t;
 struct kernel_stat {
-  unsigned short     st_dev;
+  kernel_dev_t       st_dev;
   unsigned short     __pad1;
-  unsigned long      st_ino;
-  unsigned short     st_mode;
-  unsigned short     st_nlink;
-  unsigned short     st_uid;
-  unsigned short     st_gid;
-  unsigned short     st_rdev;
+  kernel_ino_t       st_ino;
+  kernel_mode_t      st_mode;
+  kernel_nlink_t     st_nlink;
+  kernel_uid_t       st_uid;
+  kernel_gid_t       st_gid;
+  kernel_dev_t       st_rdev;
   unsigned short     __pad2;
-  unsigned long      st_size;
-  unsigned long      st_blksize;
-  unsigned long      st_blocks;
-  unsigned long      st_atime_;
+  kernel_off_t       st_size;
+  kernel_blksize_t   st_blksize;
+  kernel_blkcnt_t    st_blocks;
+  kernel_time_t      st_atime_;
   unsigned long      st_atime_nsec_;
-  unsigned long      st_mtime_;
+  kernel_time_t      st_mtime_;
   unsigned long      st_mtime_nsec_;
-  unsigned long      st_ctime_;
+  kernel_time_t      st_ctime_;
   unsigned long      st_ctime_nsec_;
   unsigned long      __unused4;
   unsigned long      __unused5;
 };
+#elif defined(__e2k__)
+typedef unsigned long kernel_blkcnt_t;
+typedef unsigned long kernel_blksize_t;
+typedef unsigned long kernel_dev_t;
+typedef unsigned int kernel_gid_t;
+typedef unsigned long kernel_ino_t;
+typedef unsigned int kernel_mode_t;
+typedef unsigned long kernel_nlink_t;
+typedef unsigned long kernel_off_t;
+typedef unsigned long kernel_time_t;
+typedef unsigned int kernel_uid_t;
+struct kernel_stat {
+  kernel_dev_t       st_dev;
+  kernel_ino_t       st_ino;
+  kernel_mode_t      st_mode;
+  kernel_nlink_t     st_nlink;
+  kernel_uid_t       st_uid;
+  kernel_gid_t       st_gid;
+  kernel_dev_t       st_rdev;
+  kernel_off_t       st_size;
+  kernel_blksize_t   st_blksize;
+  kernel_blkcnt_t    st_blocks;
+  kernel_time_t      st_atime_;
+  unsigned long      st_atime_nsec_;
+  kernel_time_t      st_mtime_;
+  unsigned long      st_mtime_nsec_;
+  kernel_time_t      st_ctime_;
+  unsigned long      st_ctime_nsec_;
+};
 #endif
 
 /* include/asm-{arm,aarch64,i386,mips,x86_64,ppc,s390}/statfs.h              */
@@ -699,6 +841,37 @@ struct kernel_statfs {
 };
 #endif
 
+struct kernel_statx_timestamp {
+  int64_t   tv_sec;
+  uint32_t  tv_nsec;
+  int32_t   __reserved;
+};
+
+struct kernel_statx {
+  uint32_t  stx_mask;
+  uint32_t  stx_blksize;
+  uint64_t  stx_attributes;
+  uint32_t  stx_nlink;
+  uint32_t  stx_uid;
+  uint32_t  stx_gid;
+  uint16_t  stx_mode;
+  uint16_t  __spare0[1];
+  uint64_t  stx_ino;
+  uint64_t  stx_size;
+  uint64_t  stx_blocks;
+  uint64_t  stx_attributes_mask;
+  struct kernel_statx_timestamp  stx_atime;
+  struct kernel_statx_timestamp  stx_btime;
+  struct kernel_statx_timestamp  stx_ctime;
+  struct kernel_statx_timestamp  stx_mtime;
+  uint32_t  stx_rdev_major;
+  uint32_t  stx_rdev_minor;
+  uint32_t  stx_dev_major;
+  uint32_t  stx_dev_minor;
+  uint64_t  stx_mnt_id;
+  uint64_t  __spare2;
+  uint64_t  __spare3[12];
+};
 
 /* Definitions missing from the standard header files                        */
 #ifndef O_DIRECTORY
@@ -735,6 +908,18 @@ struct kernel_statfs {
 #ifndef AT_REMOVEDIR
 #define AT_REMOVEDIR            0x200
 #endif
+#ifndef AT_NO_AUTOMOUNT
+#define AT_NO_AUTOMOUNT         0x800
+#endif
+#ifndef AT_EMPTY_PATH
+#define AT_EMPTY_PATH           0x1000
+#endif
+#ifndef STATX_BASIC_STATS
+#define STATX_BASIC_STATS       0x000007ffU
+#endif
+#ifndef AT_STATX_SYNC_AS_STAT
+#define AT_STATX_SYNC_AS_STAT   0x0000
+#endif
 #ifndef MREMAP_FIXED
 #define MREMAP_FIXED            2
 #endif
@@ -952,6 +1137,9 @@ struct kernel_statfs {
 #ifndef __NR_fallocate
 #define __NR_fallocate          324
 #endif
+#ifndef __NR_getrandom
+#define __NR_getrandom          355
+#endif
 /* End of i386 definitions                                                   */
 #elif defined(__ARM_ARCH_3__) || defined(__ARM_EABI__)
 #ifndef __NR_setresuid
@@ -1050,14 +1238,20 @@ struct kernel_statfs {
 #ifndef __NR_ioprio_get
 #define __NR_ioprio_get         (__NR_SYSCALL_BASE + 315)
 #endif
+#ifndef __NR_fstatat64
+#define __NR_fstatat64          (__NR_SYSCALL_BASE + 327)
+#endif
 #ifndef __NR_move_pages
 #define __NR_move_pages         (__NR_SYSCALL_BASE + 344)
 #endif
 #ifndef __NR_getcpu
 #define __NR_getcpu             (__NR_SYSCALL_BASE + 345)
 #endif
+#ifndef __NR_getrandom
+#define __NR_getrandom          (__NR_SYSCALL_BASE + 384)
+#endif
 /* End of ARM 3/EABI definitions                                             */
-#elif defined(__aarch64__)
+#elif defined(__aarch64__) || defined(__riscv) || defined(__loongarch_lp64)
 #ifndef __NR_setxattr
 #define __NR_setxattr             5
 #endif
@@ -1113,9 +1307,11 @@ struct kernel_statfs {
 #ifndef __NR_readlinkat
 #define __NR_readlinkat          78
 #endif
+#if !defined(__loongarch_lp64)
 #ifndef __NR_newfstatat
 #define __NR_newfstatat          79
 #endif
+#endif
 #ifndef __NR_set_tid_address
 #define __NR_set_tid_address     96
 #endif
@@ -1153,7 +1349,12 @@ struct kernel_statfs {
 #ifndef __NR_move_pages
 #define __NR_move_pages         239
 #endif
-/* End of aarch64 definitions                                                */
+#ifndef __NR_getrandom
+#define __NR_getrandom          278
+#endif
+#ifndef __NR_statx
+#define __NR_statx              291
+#endif
 #elif defined(__x86_64__)
 #ifndef __NR_pread64
 #define __NR_pread64             17
@@ -1244,6 +1445,9 @@ struct kernel_statfs {
 #ifndef __NR_fallocate
 #define __NR_fallocate          285
 #endif
+#ifndef __NR_getrandom
+#define __NR_getrandom          318
+#endif
 /* End of x86-64 definitions                                                 */
 #elif defined(__mips__)
 #if _MIPS_SIM == _MIPS_SIM_ABI32
@@ -1345,6 +1549,9 @@ struct kernel_statfs {
 #ifndef __NR_ioprio_get
 #define __NR_ioprio_get         (__NR_Linux + 315)
 #endif
+#ifndef __NR_getrandom
+#define __NR_getrandom          (__NR_Linux + 353)
+#endif
 /* End of MIPS (old 32bit API) definitions */
 #elif  _MIPS_SIM == _MIPS_SIM_ABI64
 #ifndef __NR_pread64
@@ -1423,6 +1630,9 @@ struct kernel_statfs {
 #ifndef __NR_ioprio_get
 #define __NR_ioprio_get         (__NR_Linux + 274)
 #endif
+#ifndef __NR_getrandom
+#define __NR_getrandom          (__NR_Linux + 313)
+#endif
 /* End of MIPS (64bit API) definitions */
 #else
 #ifndef __NR_setresuid
@@ -1613,7 +1823,7 @@ struct kernel_statfs {
 #ifndef __NR_getcpu
 #define __NR_getcpu             302
 #endif
-/* End of powerpc defininitions                                              */
+/* End of powerpc definitions                                              */
 #elif defined(__s390__)
 #ifndef __NR_quotactl
 #define __NR_quotactl           131
@@ -1859,15 +2069,16 @@ struct kernel_statfs {
   #endif
 
   #undef  LSS_RETURN
-  #if (defined(__i386__) || defined(__x86_64__) || defined(__ARM_ARCH_3__) \
-       || defined(__ARM_EABI__) || defined(__aarch64__) || defined(__s390__))
+  #if defined(__i386__) || defined(__x86_64__) || defined(__ARM_ARCH_3__) \
+       || defined(__ARM_EABI__) || defined(__aarch64__) || defined(__s390__) \
+       || defined(__e2k__) || defined(__riscv) || defined(__loongarch_lp64)
   /* Failing system calls return a negative result in the range of
    * -1..-4095. These are "errno" values with the sign inverted.
    */
   #define LSS_RETURN(type, res)                                               \
     do {                                                                      \
       if ((unsigned long)(res) >= (unsigned long)(-4095)) {                   \
-        LSS_ERRNO = -(res);                                                   \
+        LSS_ERRNO = (int)(-(res));                                            \
         res = -1;                                                             \
       }                                                                       \
       return (type) (res);                                                    \
@@ -1960,7 +2171,7 @@ struct kernel_statfs {
                            LSS_ENTRYPOINT                                     \
                            "pop %%ebx"                                        \
                            args                                               \
-                           : "esp", "memory");                                \
+                           : "memory");                                       \
       LSS_RETURN(type,__res)
     #undef  _syscall0
     #define _syscall0(type,name)                                              \
@@ -2017,7 +2228,7 @@ struct kernel_statfs {
                              : "i" (__NR_##name), "ri" ((long)(arg1)),        \
                                "c" ((long)(arg2)), "d" ((long)(arg3)),        \
                                "S" ((long)(arg4)), "D" ((long)(arg5))         \
-                             : "esp", "memory");                              \
+                             : "memory");                                     \
         LSS_RETURN(type,__res);                                               \
       }
     #undef  _syscall6
@@ -2039,7 +2250,7 @@ struct kernel_statfs {
                              : "i" (__NR_##name),  "0" ((long)(&__s)),        \
                                "c" ((long)(arg2)), "d" ((long)(arg3)),        \
                                "S" ((long)(arg4)), "D" ((long)(arg5))         \
-                             : "esp", "memory");                              \
+                             : "memory");                                     \
         LSS_RETURN(type,__res);                                               \
       }
     LSS_INLINE int LSS_NAME(clone)(int (*fn)(void *), void *child_stack,
@@ -2125,7 +2336,7 @@ struct kernel_statfs {
                            : "0"(-EINVAL), "i"(__NR_clone),
                              "m"(fn), "m"(child_stack), "m"(flags), "m"(arg),
                              "m"(parent_tidptr), "m"(newtls), "m"(child_tidptr)
-                           : "esp", "memory", "ecx", "edx", "esi", "edi");
+                           : "memory", "ecx", "edx", "esi", "edi");
       LSS_RETURN(int, __res);
     }
 
@@ -2221,7 +2432,7 @@ struct kernel_statfs {
     #define _LSS_RETURN(type, res, cast)                                      \
       do {                                                                    \
         if ((uint64_t)(res) >= (uint64_t)(-4095)) {                           \
-          LSS_ERRNO = -(res);                                                 \
+          LSS_ERRNO = (int)(-(res));                                          \
           res = -1;                                                           \
         }                                                                     \
         return (type)(cast)(res);                                             \
@@ -2770,7 +2981,7 @@ struct kernel_statfs {
                                    void *newtls, int *child_tidptr) {
       int64_t __res;
       {
-        register uint64_t __flags __asm__("x0") = flags;
+        register uint64_t __flags __asm__("x0") = (uint64_t)flags;
         register void *__stack __asm__("x1") = child_stack;
         register void *__ptid  __asm__("x2") = parent_tidptr;
         register void *__tls   __asm__("x3") = newtls;
@@ -3353,6 +3564,503 @@ struct kernel_statfs {
       }
       LSS_RETURN(int, __ret);
     }
+  #elif defined(__riscv) && __riscv_xlen == 64
+    #undef LSS_REG
+    #define LSS_REG(r,a) register int64_t __r##r __asm__("a"#r) = (int64_t)a
+    #undef  LSS_BODY
+    #define LSS_BODY(type,name,args...)                                       \
+          register int64_t __res_a0 __asm__("a0");                            \
+          register int64_t __a7 __asm__("a7") = __NR_##name;                  \
+          int64_t __res;                                                      \
+          __asm__ __volatile__ ("scall\n"                                     \
+                                : "=r"(__res_a0)                              \
+                                : "r"(__a7) , ## args                         \
+                                : "memory");                                  \
+          __res = __res_a0;                                                   \
+          LSS_RETURN(type, __res)
+    #undef _syscall0
+    #define _syscall0(type, name)                                             \
+      type LSS_NAME(name)(void) {                                             \
+        LSS_BODY(type, name);                                                 \
+      }
+    #undef _syscall1
+    #define _syscall1(type, name, type1, arg1)                                \
+      type LSS_NAME(name)(type1 arg1) {                                       \
+        LSS_REG(0, arg1); LSS_BODY(type, name, "r"(__r0));                    \
+      }
+    #undef _syscall2
+    #define _syscall2(type, name, type1, arg1, type2, arg2)                   \
+      type LSS_NAME(name)(type1 arg1, type2 arg2) {                           \
+        LSS_REG(0, arg1); LSS_REG(1, arg2);                                   \
+        LSS_BODY(type, name, "r"(__r0), "r"(__r1));                           \
+      }
+    #undef _syscall3
+    #define _syscall3(type, name, type1, arg1, type2, arg2, type3, arg3)      \
+      type LSS_NAME(name)(type1 arg1, type2 arg2, type3 arg3) {               \
+        LSS_REG(0, arg1); LSS_REG(1, arg2); LSS_REG(2, arg3);                 \
+        LSS_BODY(type, name, "r"(__r0), "r"(__r1), "r"(__r2));                \
+      }
+    #undef _syscall4
+    #define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4)  \
+      type LSS_NAME(name)(type1 arg1, type2 arg2, type3 arg3, type4 arg4) {   \
+        LSS_REG(0, arg1); LSS_REG(1, arg2); LSS_REG(2, arg3);                 \
+        LSS_REG(3, arg4);                                                     \
+        LSS_BODY(type, name, "r"(__r0), "r"(__r1), "r"(__r2), "r"(__r3));     \
+      }
+    #undef _syscall5
+    #define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,  \
+                      type5,arg5)                                             \
+      type LSS_NAME(name)(type1 arg1, type2 arg2, type3 arg3, type4 arg4,     \
+                          type5 arg5) {                                       \
+        LSS_REG(0, arg1); LSS_REG(1, arg2); LSS_REG(2, arg3);                 \
+        LSS_REG(3, arg4); LSS_REG(4, arg5);                                   \
+        LSS_BODY(type, name, "r"(__r0), "r"(__r1), "r"(__r2), "r"(__r3),      \
+                             "r"(__r4));                                      \
+      }
+    #undef _syscall6
+    #define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,  \
+                      type5,arg5,type6,arg6)                                  \
+      type LSS_NAME(name)(type1 arg1, type2 arg2, type3 arg3, type4 arg4,     \
+                          type5 arg5, type6 arg6) {                           \
+        LSS_REG(0, arg1); LSS_REG(1, arg2); LSS_REG(2, arg3);                 \
+        LSS_REG(3, arg4); LSS_REG(4, arg5); LSS_REG(5, arg6);                 \
+        LSS_BODY(type, name, "r"(__r0), "r"(__r1), "r"(__r2), "r"(__r3),      \
+                             "r"(__r4), "r"(__r5));                           \
+      }
+
+    LSS_INLINE int LSS_NAME(clone)(int (*fn)(void *), void *child_stack,
+                                   int flags, void *arg, int *parent_tidptr,
+                                   void *newtls, int *child_tidptr) {
+      int64_t __res;
+      {
+        register int64_t __res_a0 __asm__("a0");
+        register uint64_t __flags __asm__("a0") = flags;
+        register void *__stack __asm__("a1") = child_stack;
+        register void *__ptid  __asm__("a2") = parent_tidptr;
+        register void *__tls   __asm__("a3") = newtls;
+        register int  *__ctid  __asm__("a4") = child_tidptr;
+        __asm__ __volatile__(/* Push "arg" and "fn" onto the stack that will be
+                              * used by the child.
+                              */
+                             "addi    %2,%2,-16\n"
+                             "sd      %1, 0(%2)\n"
+                             "sd      %4, 8(%2)\n"
+
+                             /* %a0 = syscall(%a0 = flags,
+                              *               %a1 = child_stack,
+                              *               %a2 = parent_tidptr,
+                              *               %a3 = newtls,
+                              *               %a4 = child_tidptr)
+                              */
+                             "li      a7, %8\n"
+                             "scall\n"
+
+                             /* if (%a0 != 0)
+                              *   return %a0;
+                              */
+                             "bnez    %0, 1f\n"
+
+                             /* In the child, now. Call "fn(arg)".
+                              */
+                             "ld      a1, 0(sp)\n"
+                             "ld      a0, 8(sp)\n"
+                             "jalr    a1\n"
+
+                             /* Call _exit(%a0).
+                              */
+                             "li      a7, %9\n"
+                             "scall\n"
+                           "1:\n"
+                             : "=r" (__res_a0)
+                             : "r"(fn), "r"(__stack), "r"(__flags), "r"(arg),
+                               "r"(__ptid), "r"(__tls), "r"(__ctid),
+                               "i"(__NR_clone), "i"(__NR_exit)
+                             : "cc", "memory");
+        __res = __res_a0;
+      }
+      LSS_RETURN(int, __res);
+    }
+  #elif defined(__e2k__)
+
+    #undef _LSS_BODY
+    #define _LSS_BODY(nr, type, name, ...)                                    \
+      register unsigned long long __res;                                      \
+      __asm__ __volatile__                                                    \
+      (                                                                       \
+       "{\n\t"                                                                \
+       "  sdisp %%ctpr1, 0x3\n\t"                                             \
+       "  addd, s 0x0, %[sys_num], %%b[0]\n\t"                                \
+       LSS_BODY_ASM##nr                                                       \
+       "}\n\t"                                                                \
+       "{\n\t"                                                                \
+       "  call %%ctpr1, wbs = %#\n\t"                                         \
+       "}\n\t"                                                                \
+       "{\n\t"                                                                \
+       "  addd, s 0x0, %%b[0], %[res]\n\t"                                    \
+       "}\n\t"                                                                \
+       : [res] "=r" (__res)                                                   \
+       :                                                                      \
+       LSS_BODY_ARG##nr(__VA_ARGS__)                                          \
+       [sys_num] "ri" (__NR_##name)                                           \
+       : "ctpr1", "ctpr2", "ctpr3",                                           \
+       "b[0]", "b[1]", "b[2]", "b[3]",                                        \
+       "b[4]", "b[5]", "b[6]", "b[7]"                                         \
+       );                                                                     \
+       LSS_RETURN(type, __res);
+
+    #undef LSS_BODY
+    #define LSS_BODY(nr, type, name, args...) \
+      _LSS_BODY(nr, type, name, ## args)
+
+    #undef LSS_BODY_ASM0
+    #undef LSS_BODY_ASM1
+    #undef LSS_BODY_ASM2
+    #undef LSS_BODY_ASM3
+    #undef LSS_BODY_ASM4
+    #undef LSS_BODY_ASM5
+    #undef LSS_BODY_ASM6
+
+    #define LSS_BODY_ASM0
+    #define LSS_BODY_ASM1 LSS_BODY_ASM0 \
+      "  addd, s 0x0, %[arg1], %%b[1]\n\t"
+    #define LSS_BODY_ASM2 LSS_BODY_ASM1 \
+      "  addd, s 0x0, %[arg2], %%b[2]\n\t"
+    #define LSS_BODY_ASM3 LSS_BODY_ASM2 \
+      "  addd, s 0x0, %[arg3], %%b[3]\n\t"
+    #define LSS_BODY_ASM4 LSS_BODY_ASM3 \
+      "  addd, s 0x0, %[arg4], %%b[4]\n\t"
+    #define LSS_BODY_ASM5 LSS_BODY_ASM4 \
+      "  addd, s 0x0, %[arg5], %%b[5]\n\t"
+    #define LSS_BODY_ASM6 LSS_BODY_ASM5 \
+      "}\n\t" \
+      "{\n\t" \
+      "  addd, s 0x0, %[arg6], %%b[6]\n\t"
+
+    #undef LSS_SYSCALL_ARG
+    #define LSS_SYSCALL_ARG(a) ((unsigned long long)(uintptr_t)(a))
+
+    #undef LSS_BODY_ARG0
+    #undef LSS_BODY_ARG1
+    #undef LSS_BODY_ARG2
+    #undef LSS_BODY_ARG3
+    #undef LSS_BODY_ARG4
+    #undef LSS_BODY_ARG5
+    #undef LSS_BODY_ARG6
+
+    #define LSS_BODY_ARG0()
+    #define LSS_BODY_ARG1(_arg1) \
+      [arg1] "ri" LSS_SYSCALL_ARG(_arg1),
+    #define LSS_BODY_ARG2(_arg1, _arg2) \
+      LSS_BODY_ARG1(_arg1) \
+      [arg2] "ri" LSS_SYSCALL_ARG(_arg2),
+    #define LSS_BODY_ARG3(_arg1, _arg2, _arg3) \
+      LSS_BODY_ARG2(_arg1, _arg2) \
+      [arg3] "ri" LSS_SYSCALL_ARG(_arg3),
+    #define LSS_BODY_ARG4(_arg1, _arg2, _arg3, _arg4) \
+      LSS_BODY_ARG3(_arg1, _arg2, _arg3) \
+      [arg4] "ri" LSS_SYSCALL_ARG(_arg4),
+    #define LSS_BODY_ARG5(_arg1, _arg2, _arg3, _arg4, _arg5) \
+      LSS_BODY_ARG4(_arg1, _arg2, _arg3, _arg4) \
+      [arg5] "ri" LSS_SYSCALL_ARG(_arg5),
+    #define LSS_BODY_ARG6(_arg1, _arg2, _arg3, _arg4, _arg5, _arg6) \
+      LSS_BODY_ARG5(_arg1, _arg2, _arg3, _arg4, _arg5) \
+      [arg6] "ri" LSS_SYSCALL_ARG(_arg6),
+
+    #undef _syscall0
+    #define _syscall0(type, name) \
+      type LSS_NAME(name)(void) { \
+        LSS_BODY(0, type, name);     \
+      }
+
+    #undef _syscall1
+    #define _syscall1(type, name, type1, arg1) \
+      type LSS_NAME(name)(type1 arg1) { \
+         LSS_BODY(1, type, name, arg1) \
+      }
+
+    #undef _syscall2
+    #define _syscall2(type, name, type1, arg1, type2, arg2) \
+      type LSS_NAME(name)(type1 arg1, type2 arg2) { \
+          LSS_BODY(2, type, name, arg1, arg2) \
+      }
+
+    #undef _syscall3
+    #define _syscall3(type, name, type1, arg1, type2, arg2, type3, arg3) \
+      type LSS_NAME(name)(type1 arg1, type2 arg2, type3 arg3) { \
+          LSS_BODY(3, type, name, arg1, arg2, arg3) \
+      }
+
+    #undef _syscall4
+    #define _syscall4(type, name, type1, arg1, type2, arg2, type3, arg3, \
+                      type4, arg4) \
+      type LSS_NAME(name)(type1 arg1, type2 arg2, type3 arg3, type4 arg4) { \
+          LSS_BODY(4, type, name, arg1, arg2, arg3, arg4) \
+      }
+
+    #undef _syscall5
+    #define _syscall5(type, name, type1, arg1, type2, arg2, type3, arg3, \
+                      type4, arg4, type5, arg5) \
+      type LSS_NAME(name)(type1 arg1, type2 arg2, type3 arg3, type4 arg4, \
+                          type5 arg5) { \
+          LSS_BODY(5, type, name, arg1, arg2, arg3, arg4, arg5) \
+      }
+
+    #undef _syscall6
+    #define _syscall6(type, name, type1, arg1, type2, arg2, type3, arg3, \
+                      type4, arg4, type5, arg5, type6, arg6) \
+      type LSS_NAME(name)(type1 arg1, type2 arg2, type3 arg3, type4 arg4, \
+                          type5 arg5, type6 arg6) { \
+          LSS_BODY(6, type, name, arg1, arg2, arg3, arg4, arg5, arg6) \
+      }
+
+    LSS_INLINE int LSS_NAME(clone)(int (*fn)(void *), void *child_stack,
+                                   int flags, void *arg, int *parent_tidptr,
+                                   void *newtls, int *child_tidptr) {
+      unsigned long long __res;
+
+      __asm__ __volatile__ (
+                            "{\n\t"
+                            "  addd,s 0x0, %[nr_clone], %%b[0]\n\t"
+                            "  addd,s 0x0, %[flags], %%db[1]\n\t"
+                            "  addd,s 0x0, %[child_stack], %%db[2]\n\t"
+                            "  addd,s 0x0, %[parent_tidptr], %%db[3]\n\t"
+                            "  addd,s 0x0, %[child_tidptr], %%db[4]\n\t"
+                            "  addd,s 0x0, %[newtls], %%db[5]\n\t"
+                            "}\n\t"
+                            /* if (fn == NULL)
+                             *   return -EINVAL;
+                             */
+
+                            "{\n\t"
+                            "  disp %%ctpr1, .L1\n\t"
+                            "}\n\t"
+                            "{\n\t"
+                            "  cmpesb,s 0x0, %[fn], %%pred0\n\t"
+                            "}\n\t"
+                            "{\n\t"
+                            "  ct %%ctpr1 ? %%pred0\n\t"
+                            "}\n\t"
+
+                            /* if (child_stack == NULL)
+                             *   return -EINVAL;
+                             */
+                            "{\n\t"
+                            "  cmpesb,s 0x0, %%db[2], %%pred0\n\t"
+                            "}\n\t"
+                            "{\n\t"
+                            "  ct %%ctpr1 ? %%pred0\n\t"
+                            "}\n\t"
+
+                            /* b[0] = syscall(%b[0] = __NR_clone,
+                             *                %db[1] = flags,
+                             *                %db[2] = child_stack,
+                             *                %db[3] = parent_tidptr,
+                             *                %db[4] = child_tidptr,
+                             *                %db[5] = newtls)
+                             */
+                            "{\n\t"
+                            "  sdisp %%ctpr1, 0x3\n\t"
+                            "}\n\t"
+                            "{\n\t"
+                            "  call %%ctpr1, wbs = %#\n\t"
+                            "}\n\t"
+
+                            /* if (%[b0] != 0)
+                             *   return %b[0];
+                             */
+                            "{\n\t"
+                            "  disp %%ctpr1, .L2\n\t"
+                            "  cmpesb,s 0x0, %%b[0], %%pred0\n\t"
+                            "}\n\t"
+                            "{\n\t"
+                            "  ct %%ctpr1 ? ~%%pred0\n\t"
+                            "}\n\t"
+                            /* In the child, now. Call "fn(arg)".
+                             */
+
+                            "{\n\t"
+                            "  movtd,s %[fn], %%ctpr1\n\t"
+                            "}\n\t"
+                            "{\n\t"
+                            "  addd,s 0x0, %[arg], %%db[0]\n\t"
+                            "}\n\t"
+                            "{\n\t"
+                            "  call %%ctpr1, wbs = %#\n\t"
+                            "}\n\t"
+                            /* Call _exit(%b[0]).
+                             */
+
+                            "{\n\t"
+                            "  sdisp %%ctpr1, 0x3\n\t"
+                            "  addd,s 0x0, %%b[0], %%b[1]\n\t"
+                            "}\n\t"
+                            "{\n\t"
+                            "  addd,s 0x0, %[nr_exit], %%b[0]\n\t"
+                            "}\n\t"
+                            "{\n\t"
+                            "  call %%ctpr1, wbs = %#\n\t"
+                            "}\n\t"
+                            "{\n\t"
+                            "  disp %%ctpr1, .L2\n\t"
+                            "  adds,s 0x0, 0x0, %%b[0]\n\t"
+                            "}\n\t"
+                            "{\n\t"
+                            "  ct %%ctpr1\n\t"
+                            "}\n\t"
+                            ".L1:\n\t"
+                            "{\n\t"
+                            "  addd,s 0x0, %[einval], %%b[0]\n\t"
+                            "}\n\t"
+                            ".L2:\n\t"
+                            "{\n\t"
+                            "  addd,s 0x0, %%b[0], %[res]\n\t"
+                            "}\n\t"
+                            : [res] "=r" LSS_SYSCALL_ARG(__res)
+                            : [nr_clone] "ri" LSS_SYSCALL_ARG(__NR_clone)
+                              [arg] "ri" LSS_SYSCALL_ARG(arg)
+                              [nr_exit] "ri" LSS_SYSCALL_ARG(__NR_exit)
+                              [flags] "ri" LSS_SYSCALL_ARG(flags)
+                              [child_stack] "ri" LSS_SYSCALL_ARG(child_stack)
+                              [parent_tidptr] "ri"
+                              LSS_SYSCALL_ARG(parent_tidptr)
+                              [newtls] "ri" LSS_SYSCALL_ARG(newtls)
+                              [child_tidptr] "ri"
+                              LSS_SYSCALL_ARG(child_tidptr)
+                              [fn] "ri" LSS_SYSCALL_ARG(fn)
+                              [einval] "ri" LSS_SYSCALL_ARG(-EINVAL)
+                            : "ctpr1", "b[0]", "b[1]", "b[2]", "b[3]",
+                              "b[4]", "b[5]", "pred0");
+      LSS_RETURN(int, __res);
+    }
+  #elif defined(__loongarch_lp64)
+    /* Most definitions of _syscallX() neglect to mark "memory" as being
+     * clobbered. This causes problems with compilers, that do a better job
+     * at optimizing across __asm__ calls.
+     * So, we just have to redefine all of the _syscallX() macros.
+     */
+    #undef LSS_REG
+    #define LSS_REG(ar,a) register int64_t __r##ar __asm__("a"#ar) = (int64_t)a
+    /* syscall is like subroutine calls, all caller-saved registers may be
+     * clobbered, we should add them to the |Clobbers| list.
+     * a0 is not included because it's in the output list.
+     */
+    #define LSS_SYSCALL_CLOBBERS "t0", "t1", "t2", "t3", "t4", "t5", "t6",    \
+                                 "t7", "t8", "memory"
+    #undef  LSS_BODY
+    #define LSS_BODY(type,name,args...)                                       \
+          register int64_t __res_a0 __asm__("a0");                            \
+          register int64_t __a7 __asm__("a7") = __NR_##name;                  \
+          int64_t __res;                                                      \
+          __asm__ __volatile__ ("syscall 0x0\n"                               \
+                                : "=r"(__res_a0)                              \
+                                : "r"(__a7), ## args                          \
+                                : LSS_SYSCALL_CLOBBERS);                      \
+          __res = __res_a0;                                                   \
+          LSS_RETURN(type, __res)
+    #undef _syscall0
+    #define _syscall0(type, name)                                             \
+      type LSS_NAME(name)(void) {                                             \
+        LSS_BODY(type, name);                                                 \
+      }
+    #undef _syscall1
+    #define _syscall1(type, name, type1, arg1)                                \
+      type LSS_NAME(name)(type1 arg1) {                                       \
+        LSS_REG(0, arg1); LSS_BODY(type, name, "r"(__r0));                    \
+      }
+    #undef _syscall2
+    #define _syscall2(type, name, type1, arg1, type2, arg2)                   \
+      type LSS_NAME(name)(type1 arg1, type2 arg2) {                           \
+        LSS_REG(0, arg1); LSS_REG(1, arg2);                                   \
+        LSS_BODY(type, name, "r"(__r0), "r"(__r1));                           \
+      }
+    #undef _syscall3
+    #define _syscall3(type, name, type1, arg1, type2, arg2, type3, arg3)      \
+      type LSS_NAME(name)(type1 arg1, type2 arg2, type3 arg3) {               \
+        LSS_REG(0, arg1); LSS_REG(1, arg2); LSS_REG(2, arg3);                 \
+        LSS_BODY(type, name, "r"(__r0), "r"(__r1), "r"(__r2));                \
+      }
+    #undef _syscall4
+    #define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4)  \
+      type LSS_NAME(name)(type1 arg1, type2 arg2, type3 arg3, type4 arg4) {   \
+        LSS_REG(0, arg1); LSS_REG(1, arg2); LSS_REG(2, arg3);                 \
+        LSS_REG(3, arg4);                                                     \
+        LSS_BODY(type, name, "r"(__r0), "r"(__r1), "r"(__r2), "r"(__r3));     \
+      }
+    #undef _syscall5
+    #define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,  \
+                      type5,arg5)                                             \
+      type LSS_NAME(name)(type1 arg1, type2 arg2, type3 arg3, type4 arg4,     \
+                          type5 arg5) {                                       \
+        LSS_REG(0, arg1); LSS_REG(1, arg2); LSS_REG(2, arg3);                 \
+        LSS_REG(3, arg4); LSS_REG(4, arg5);                                   \
+        LSS_BODY(type, name, "r"(__r0), "r"(__r1), "r"(__r2), "r"(__r3),      \
+                             "r"(__r4));                                      \
+      }
+    #undef _syscall6
+    #define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,  \
+                      type5,arg5,type6,arg6)                                  \
+      type LSS_NAME(name)(type1 arg1, type2 arg2, type3 arg3, type4 arg4,     \
+                          type5 arg5, type6 arg6) {                           \
+        LSS_REG(0, arg1); LSS_REG(1, arg2); LSS_REG(2, arg3);                 \
+        LSS_REG(3, arg4); LSS_REG(4, arg5); LSS_REG(5, arg6);                 \
+        LSS_BODY(type, name, "r"(__r0), "r"(__r1), "r"(__r2), "r"(__r3),      \
+                             "r"(__r4), "r"(__r5));                           \
+      }
+
+    LSS_INLINE int LSS_NAME(clone)(int (*fn)(void *), void *child_stack,
+                                   int flags, void *arg, int *parent_tidptr,
+                                   void *newtls, int *child_tidptr) {
+      int64_t __res;
+      {
+        register int64_t __res_a0 __asm__("a0");
+        register uint64_t __flags __asm__("a0") = flags;
+        register void *__stack __asm__("a1") = child_stack;
+        register void *__ptid  __asm__("a2") = parent_tidptr;
+        register void *__tls   __asm__("a3") = newtls;
+        register int  *__ctid  __asm__("a4") = child_tidptr;
+        __asm__ __volatile__(/* Push "arg" and "fn" onto the stack that will be
+                              * used by the child.
+                              */
+                             "addi.d  %2, %2, -16\n"
+                             "st.d    %1, %2, 8\n"
+                             "st.d    %4, %2, 0\n"
+
+                             /* %a0 = syscall(%a0 = flags,
+                              *               %a1 = child_stack,
+                              *               %a2 = parent_tidptr,
+                              *               %a3 = newtls,
+                              *               %a4 = child_tidptr)
+                              */
+                             "li.d      $a7, %8\n"
+                             "syscall   0x0\n"
+
+                             /* if (%a0 != 0)
+                              *   return %a0;
+                              */
+                             "bnez    $a0, 1f\n"
+
+                             /* In the child, now. Call "fn(arg)".
+                              */
+                             "ld.d    $a0, $sp, 0\n"
+                             "ld.d    $a1, $sp, 8\n"
+                             "addi.d  $sp, $sp, 16\n"
+                             "jirl    $ra, $a1, 0\n"
+
+                             /* Call _exit(%a0).
+                              */
+                             "li.d     $a7, %9\n"
+                             "syscall  0x0\n"
+                           "1:\n"
+                             : "=r" (__res_a0)
+                             : "r"(fn), "r"(__stack), "r"(__flags), "r"(arg),
+                               "r"(__ptid), "r"(__tls), "r"(__ctid),
+                               "i"(__NR_clone), "i"(__NR_exit)
+                             : "a7", LSS_SYSCALL_CLOBBERS);
+      __res = __res_a0;
+      }
+      LSS_RETURN(int, __res);
+    }
+
   #endif
   #define __NR__exit   __NR_exit
   #define __NR__gettid __NR_gettid
@@ -3383,8 +4091,10 @@ struct kernel_statfs {
     // fork is polyfilled below when not available.
     LSS_INLINE _syscall0(pid_t,   fork)
   #endif
+  #if defined(__NR_fstat)
   LSS_INLINE _syscall2(int,     fstat,           int,         f,
                       struct kernel_stat*,   b)
+  #endif
   LSS_INLINE _syscall2(int,     fstatfs,         int,         f,
                       struct kernel_statfs*, b)
   #if defined(__x86_64__)
@@ -3406,6 +4116,8 @@ struct kernel_statfs {
                       struct kernel_dirent64*, d, int,    c)
   LSS_INLINE _syscall0(gid_t,   getegid)
   LSS_INLINE _syscall0(uid_t,   geteuid)
+  LSS_INLINE _syscall2(int,     getitimer,       int,        w,
+                       struct kernel_itimerval*, c)
   #if defined(__NR_getpgrp)
     LSS_INLINE _syscall0(pid_t,   getpgrp)
   #endif
@@ -3417,10 +4129,10 @@ struct kernel_statfs {
                        gid_t *,         e,       gid_t *,     s)
   LSS_INLINE _syscall3(int,     getresuid,       uid_t *,     r,
                        uid_t *,         e,       uid_t *,     s)
-#if !defined(__ARM_EABI__)
+  #if defined(__NR_getrlimit)
   LSS_INLINE _syscall2(int,     getrlimit,       int,         r,
                       struct kernel_rlimit*, l)
-#endif
+  #endif
   LSS_INLINE _syscall1(pid_t,   getsid,          pid_t,       p)
   LSS_INLINE _syscall0(pid_t,   _gettid)
   LSS_INLINE _syscall2(pid_t,   gettimeofday,    struct kernel_timeval*, t,
@@ -3527,6 +4239,9 @@ struct kernel_statfs {
   LSS_INLINE _syscall1(int,     setfsuid,        uid_t,       u)
   LSS_INLINE _syscall1(int,     setuid,          uid_t,       u)
   LSS_INLINE _syscall1(int,     setgid,          gid_t,       g)
+  LSS_INLINE _syscall3(int,     setitimer,       int,         w,
+                       const struct kernel_itimerval*,        n,
+                       struct kernel_itimerval*, o)
   LSS_INLINE _syscall2(int,     setpgid,         pid_t,       p,
                        pid_t,          g)
   LSS_INLINE _syscall3(int,     setpriority,     int,         a,
@@ -3535,8 +4250,10 @@ struct kernel_statfs {
                        gid_t,          e, gid_t,  s)
   LSS_INLINE _syscall3(int,     setresuid,       uid_t,       r,
                        uid_t,          e, uid_t,  s)
+  #if defined(__NR_setrlimit)
   LSS_INLINE _syscall2(int,     setrlimit,       int,         r,
                        const struct kernel_rlimit*, l)
+  #endif
   LSS_INLINE _syscall0(pid_t,    setsid)
   LSS_INLINE _syscall2(int,     sigaltstack,     const stack_t*, s,
                        const stack_t*, o)
@@ -3544,10 +4261,14 @@ struct kernel_statfs {
     LSS_INLINE _syscall1(int,     sigreturn,       unsigned long, u)
   #endif
   #if defined(__NR_stat)
-    // stat is polyfilled below when not available.
+    // stat and lstat are polyfilled below when not available.
     LSS_INLINE _syscall2(int,     stat,            const char*, f,
                         struct kernel_stat*,   b)
   #endif
+  #if defined(__NR_lstat)
+    LSS_INLINE _syscall2(int,     lstat,           const char*, f,
+                         struct kernel_stat*,   b)
+  #endif
   LSS_INLINE _syscall2(int,     statfs,          const char*, f,
                       struct kernel_statfs*, b)
   LSS_INLINE _syscall3(int,     tgkill,          pid_t,       p,
@@ -3566,23 +4287,6 @@ struct kernel_statfs {
     LSS_INLINE _syscall3(long, getcpu, unsigned *, cpu,
                          unsigned *, node, void *, unused)
   #endif
-  #if defined(__x86_64__) ||                                                  \
-     (defined(__mips__) && _MIPS_SIM != _MIPS_SIM_ABI32)
-    LSS_INLINE _syscall3(int, recvmsg,            int,   s,
-                        struct kernel_msghdr*,     m, int, f)
-    LSS_INLINE _syscall3(int, sendmsg,            int,   s,
-                         const struct kernel_msghdr*, m, int, f)
-    LSS_INLINE _syscall6(int, sendto,             int,   s,
-                         const void*,             m, size_t, l,
-                         int,                     f,
-                         const struct kernel_sockaddr*, a, int, t)
-    LSS_INLINE _syscall2(int, shutdown,           int,   s,
-                         int,                     h)
-    LSS_INLINE _syscall3(int, socket,             int,   d,
-                         int,                     t, int,       p)
-    LSS_INLINE _syscall4(int, socketpair,         int,   d,
-                         int,                     t, int,       p, int*, s)
-  #endif
   #if defined(__NR_fadvise64)
     #if defined(__x86_64__)
     /* Need to make sure loff_t isn't truncated to 32-bits under x32.  */
@@ -3656,11 +4360,21 @@ struct kernel_statfs {
                          int, f, int, mode, loff_t, offset, loff_t, len)
     #endif
   #endif
+  #if defined(__NR_getrandom)
+    LSS_INLINE _syscall3(ssize_t, getrandom, void*, buffer, size_t, length,
+                         unsigned int, flags)
+  #endif
   #if defined(__NR_newfstatat)
     LSS_INLINE _syscall4(int, newfstatat,         int,   d,
                          const char *,            p,
                          struct kernel_stat*,     b, int, f)
   #endif
+  #if defined(__NR_statx)
+    LSS_INLINE _syscall5(int, statx,              int,   d,
+                         const char *,            p,
+                         int, f,                  int,   m,
+                         struct kernel_statx*,    b)
+  #endif
   #if defined(__x86_64__) || defined(__s390x__)
     LSS_INLINE int LSS_NAME(getresgid32)(gid_t *rgid,
                                          gid_t *egid,
@@ -3867,43 +4581,43 @@ struct kernel_statfs {
 
   LSS_INLINE int LSS_NAME(sigaddset)(struct kernel_sigset_t *set,
                                      int signum) {
-    if (signum < 1 || signum > (int)(8*sizeof(set->sig))) {
+    if (signum < 1 || (size_t)signum > (8*sizeof(set->sig))) {
       LSS_ERRNO = EINVAL;
       return -1;
     } else {
-      set->sig[(signum - 1)/(8*sizeof(set->sig[0]))]
-          |= 1UL << ((signum - 1) % (8*sizeof(set->sig[0])));
+      set->sig[(size_t)(signum - 1)/(8*sizeof(set->sig[0]))]
+          |= 1UL << ((size_t)(signum - 1) % (8*sizeof(set->sig[0])));
       return 0;
     }
   }
 
   LSS_INLINE int LSS_NAME(sigdelset)(struct kernel_sigset_t *set,
                                         int signum) {
-    if (signum < 1 || signum > (int)(8*sizeof(set->sig))) {
+    if (signum < 1 || (size_t)signum > (8*sizeof(set->sig))) {
       LSS_ERRNO = EINVAL;
       return -1;
     } else {
-      set->sig[(signum - 1)/(8*sizeof(set->sig[0]))]
-          &= ~(1UL << ((signum - 1) % (8*sizeof(set->sig[0]))));
+      set->sig[(size_t)(signum - 1)/(8*sizeof(set->sig[0]))]
+          &= ~(1UL << ((size_t)(signum - 1) % (8*sizeof(set->sig[0]))));
       return 0;
     }
   }
 
   LSS_INLINE int LSS_NAME(sigismember)(struct kernel_sigset_t *set,
                                           int signum) {
-    if (signum < 1 || signum > (int)(8*sizeof(set->sig))) {
+    if (signum < 1 || (size_t)signum > (8*sizeof(set->sig))) {
       LSS_ERRNO = EINVAL;
       return -1;
     } else {
-      return !!(set->sig[(signum - 1)/(8*sizeof(set->sig[0]))] &
-                (1UL << ((signum - 1) % (8*sizeof(set->sig[0])))));
+      return !!(set->sig[(size_t)(signum - 1)/(8*sizeof(set->sig[0]))] &
+                (1UL << ((size_t)(signum - 1) % (8*sizeof(set->sig[0])))));
     }
   }
   #if defined(__i386__) ||                                                    \
       defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) ||                     \
      (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32) ||                   \
       defined(__PPC__) ||                                                     \
-     (defined(__s390__) && !defined(__s390x__))
+     (defined(__s390__) && !defined(__s390x__)) || defined(__e2k__)
     #define __NR__sigaction   __NR_sigaction
     #define __NR__sigpending  __NR_sigpending
     #define __NR__sigsuspend  __NR_sigsuspend
@@ -4157,23 +4871,31 @@ struct kernel_statfs {
       LSS_SC_BODY(4, int, 8, d, type, protocol, sv);
     }
   #endif
-  #if defined(__ARM_EABI__) || defined (__aarch64__)
+  #if defined(__NR_recvmsg)
     LSS_INLINE _syscall3(ssize_t, recvmsg, int, s, struct kernel_msghdr*, msg,
                          int, flags)
+  #endif
+  #if defined(__NR_sendmsg)
     LSS_INLINE _syscall3(ssize_t, sendmsg, int, s, const struct kernel_msghdr*,
                          msg, int, flags)
+  #endif
+  #if defined(__NR_sendto)
     LSS_INLINE _syscall6(ssize_t, sendto, int, s, const void*, buf, size_t,len,
                          int, flags, const struct kernel_sockaddr*, to,
                          unsigned int, tolen)
+  #endif
+  #if defined(__NR_shutdown)
     LSS_INLINE _syscall2(int, shutdown, int, s, int, how)
+  #endif
+  #if defined(__NR_socket)
     LSS_INLINE _syscall3(int, socket, int, domain, int, type, int, protocol)
+  #endif
+  #if defined(__NR_socketpair)
     LSS_INLINE _syscall4(int, socketpair, int, d, int, type, int, protocol,
                          int*, sv)
   #endif
-  #if defined(__i386__) || defined(__ARM_ARCH_3__) ||                         \
-      (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32) ||                  \
-      defined(__s390__)
-    #define __NR__socketcall  __NR_socketcall
+
+  #if defined(__NR_socketcall)
     LSS_INLINE _syscall2(int,      _socketcall,    int,   c,
                          va_list,                  a)
     LSS_INLINE int LSS_NAME(socketcall)(int op, ...) {
@@ -4185,36 +4907,43 @@ struct kernel_statfs {
       return rc;
     }
 
+  # if !defined(__NR_recvmsg)
     LSS_INLINE ssize_t LSS_NAME(recvmsg)(int s,struct kernel_msghdr *msg,
                                          int flags){
       return (ssize_t)LSS_NAME(socketcall)(17, s, msg, flags);
     }
-
+  # endif
+  # if !defined(__NR_sendmsg)
     LSS_INLINE ssize_t LSS_NAME(sendmsg)(int s,
                                          const struct kernel_msghdr *msg,
                                          int flags) {
       return (ssize_t)LSS_NAME(socketcall)(16, s, msg, flags);
     }
-
+  # endif
+  # if !defined(__NR_sendto)
     LSS_INLINE ssize_t LSS_NAME(sendto)(int s, const void *buf, size_t len,
                                         int flags,
                                         const struct kernel_sockaddr *to,
                                         unsigned int tolen) {
       return (ssize_t)LSS_NAME(socketcall)(11, s, buf, len, flags, to, tolen);
     }
-
+  # endif
+  # if !defined(__NR_shutdown)
     LSS_INLINE int LSS_NAME(shutdown)(int s, int how) {
       return LSS_NAME(socketcall)(13, s, how);
     }
-
+  # endif
+  # if !defined(__NR_socket)
     LSS_INLINE int LSS_NAME(socket)(int domain, int type, int protocol) {
       return LSS_NAME(socketcall)(1, domain, type, protocol);
     }
-
+  # endif
+  # if !defined(__NR_socketpair)
     LSS_INLINE int LSS_NAME(socketpair)(int d, int type, int protocol,
                                         int sv[2]) {
       return LSS_NAME(socketcall)(8, d, type, protocol, sv);
     }
+  # endif
   #endif
   #if defined(__NR_fstatat64)
     LSS_INLINE _syscall4(int,   fstatat64,        int,   d,
@@ -4296,12 +5025,12 @@ struct kernel_statfs {
     va_start(ap, flags);
     new_address = va_arg(ap, void *);
     rc = LSS_NAME(_mremap)(old_address, old_size, new_size,
-                           flags, new_address);
+                           (unsigned long)flags, new_address);
     va_end(ap);
     return rc;
   }
 
-  LSS_INLINE int LSS_NAME(ptrace_detach)(pid_t pid) {
+  LSS_INLINE long LSS_NAME(ptrace_detach)(pid_t pid) {
     /* PTRACE_DETACH can sometimes forget to wake up the tracee and it
      * then sends job control signals to the real parent, rather than to
      * the tracer. We reduce the risk of this happening by starting a
@@ -4312,7 +5041,8 @@ struct kernel_statfs {
      * detached.  Large multi threaded apps can take a long time in the kernel
      * processing SIGCONT.
      */
-    int rc, err;
+    long rc;
+    int err;
     LSS_NAME(sched_yield)();
     rc = LSS_NAME(ptrace)(PTRACE_DETACH, pid, (void *)0, (void *)0);
     err = LSS_ERRNO;
@@ -4345,7 +5075,7 @@ struct kernel_statfs {
                                      LSS_SYSCALL_ARG(c), (uint64_t)(o));
     }
 
-    LSS_INLINE int LSS_NAME(readahead)(int f, loff_t o, unsigned c) {
+    LSS_INLINE int LSS_NAME(readahead)(int f, loff_t o, size_t c) {
       LSS_BODY(3, int, readahead, LSS_SYSCALL_ARG(f), (uint64_t)(o),
                                   LSS_SYSCALL_ARG(c));
     }
@@ -4384,7 +5114,7 @@ struct kernel_statfs {
                            unsigned, o2)
       LSS_INLINE _syscall5(ssize_t, _pwrite64,       int,         f,
                            const void *,   b, size_t, c, unsigned, o1,
-                           long, o2)
+                           unsigned, o2)
       LSS_INLINE _syscall4(int, _readahead,          int,         f,
                            unsigned,       o1, unsigned, o2, size_t, c)
     #endif
@@ -4405,9 +5135,9 @@ struct kernel_statfs {
       return LSS_NAME(_pwrite64)(fd, buf, count,
                                  LSS_LLARG_PAD o.arg[0], o.arg[1]);
     }
-    LSS_INLINE int LSS_NAME(readahead)(int fd, loff_t off, int len) {
+    LSS_INLINE int LSS_NAME(readahead)(int fd, loff_t off, size_t count) {
       union { loff_t off; unsigned arg[2]; } o = { off };
-      return LSS_NAME(_readahead)(fd, LSS_LLARG_PAD o.arg[0], o.arg[1], len);
+      return LSS_NAME(_readahead)(fd, LSS_LLARG_PAD o.arg[0], o.arg[1], count);
     }
   #endif
 #endif
@@ -4462,10 +5192,79 @@ struct kernel_statfs {
   }
 #endif
 
+#if defined(__NR_statx)
+  /* copy the contents of kernel_statx to the kernel_stat structure.  */
+  LSS_INLINE void LSS_NAME(cp_stat_statx)(struct kernel_stat  *to,
+                                          struct kernel_statx *from) {
+    memset(to, 0, sizeof(struct kernel_stat));
+    to->st_dev = (kernel_dev_t)((from->stx_dev_minor & 0xff) |
+                                ((from->stx_dev_major & 0xfff) << 8) |
+                                ((from->stx_dev_minor & ~0xffu) << 12));
+    to->st_rdev = (kernel_dev_t)((from->stx_rdev_minor & 0xff) |
+                                 ((from->stx_rdev_major & 0xfff) << 8) |
+                                 ((from->stx_rdev_minor & ~0xffu) << 12));
+    to->st_ino = (kernel_ino_t)from->stx_ino;
+    to->st_mode = (kernel_mode_t)from->stx_mode;
+    to->st_nlink = (kernel_nlink_t)from->stx_nlink;
+    to->st_uid = (kernel_uid_t)from->stx_uid;
+    to->st_gid = (kernel_gid_t)from->stx_gid;
+    to->st_atime_ = (kernel_time_t)(from->stx_atime.tv_sec);
+    to->st_atime_nsec_ = from->stx_atime.tv_nsec;
+    to->st_mtime_ = (kernel_time_t)(from->stx_mtime.tv_sec);
+    to->st_mtime_nsec_ = from->stx_mtime.tv_nsec;
+    to->st_ctime_ = (kernel_time_t)(from->stx_ctime.tv_sec);
+    to->st_ctime_nsec_ = from->stx_ctime.tv_nsec;
+    to->st_size = (kernel_off_t)(from->stx_size);
+    to->st_blocks = (kernel_blkcnt_t)(from->stx_blocks);
+    to->st_blksize = (kernel_blksize_t)from->stx_blksize;
+  }
+#endif
+
+#if !defined(__NR_fstat)
+  LSS_INLINE int LSS_NAME(fstat)(int fd,
+                                 struct kernel_stat *buf) {
+    #if defined(__NR_newfstatat)
+      return LSS_NAME(newfstatat)(fd, "", buf, AT_EMPTY_PATH);
+    #elif defined(__NR_statx)
+      struct kernel_statx stx;
+      int flags = AT_NO_AUTOMOUNT | AT_EMPTY_PATH;
+      int mask = STATX_BASIC_STATS;
+      int res = LSS_NAME(statx)(fd, "", flags, mask, &stx);
+      LSS_NAME(cp_stat_statx)(buf, &stx);
+      return res;
+    #endif
+  }
+#endif
+
 #if !defined(__NR_stat)
   LSS_INLINE int LSS_NAME(stat)(const char *pathname,
                                 struct kernel_stat *buf) {
-    return LSS_NAME(newfstatat)(AT_FDCWD, pathname, buf, 0);
+    #if defined(__NR_newfstatat)
+      return LSS_NAME(newfstatat)(AT_FDCWD, pathname, buf, 0);
+    #elif defined(__NR_statx)
+      struct kernel_statx stx;
+      int flags = AT_NO_AUTOMOUNT | AT_STATX_SYNC_AS_STAT;
+      int mask = STATX_BASIC_STATS;
+      int res = LSS_NAME(statx)(AT_FDCWD, pathname, flags, mask, &stx);
+      LSS_NAME(cp_stat_statx)(buf, &stx);
+      return res;
+    #endif
+  }
+#endif
+
+#if !defined(__NR_lstat)
+  LSS_INLINE int LSS_NAME(lstat)(const char *pathname,
+                                 struct kernel_stat *buf) {
+    #if defined(__NR_newfstatat)
+      return LSS_NAME(newfstatat)(AT_FDCWD, pathname, buf, AT_SYMLINK_NOFOLLOW);
+    #elif defined(__NR_statx)
+      struct kernel_statx stx;
+      int flags = AT_NO_AUTOMOUNT | AT_SYMLINK_NOFOLLOW;
+      int mask = STATX_BASIC_STATS;
+      int res = LSS_NAME(statx)(AT_FDCWD, pathname, flags, mask, &stx);
+      LSS_NAME(cp_stat_statx)(buf, &stx);
+      return res;
+    #endif
   }
 #endif
 
@@ -4479,7 +5278,7 @@ struct kernel_statfs {
 // TODO: define this in an arch-independant way instead of inlining the clone
 //       syscall body.
 
-# if defined(__aarch64__)
+# if defined(__aarch64__) || defined(__riscv) || defined(__loongarch_lp64)
   LSS_INLINE pid_t LSS_NAME(fork)(void) {
     // No fork syscall on aarch64 - implement by means of the clone syscall.
     // Note that this does not reset glibc's cached view of the PID/TID, so
@@ -4524,6 +5323,7 @@ struct kernel_statfs {
 #pragma pop_macro("lstat64")
 #pragma pop_macro("pread64")
 #pragma pop_macro("pwrite64")
+#pragma pop_macro("getdents64")
 
 #if defined(__cplusplus) && !defined(SYS_CPLUSPLUS)
 }
diff --git a/external_imported/sentry-native/external/third_party/lss/tests/Makefile b/external_imported/sentry-native/external/third_party/lss/tests/Makefile
index 5e37345f1..a4e2f3873 100644
--- a/external_imported/sentry-native/external/third_party/lss/tests/Makefile
+++ b/external_imported/sentry-native/external/third_party/lss/tests/Makefile
@@ -1,4 +1,4 @@
-# Copyright 2018, Google Inc.  All rights reserved.
+# Copyright 2018 Google LLC
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
@@ -10,7 +10,7 @@
 # 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
+#     * Neither the name of Google LLC nor the names of its
 # contributors may be used to endorse or promote products derived from
 # this software without specific prior written permission.
 #
@@ -41,7 +41,13 @@ LDFLAGS += -static
 
 TESTS = \
 	fallocate \
+	getitimer \
+	getrandom \
+	lstat \
+	setitimer \
+	sigaction \
 	sigtimedwait \
+	stat \
 	unlink \
 
 all: check
@@ -49,22 +55,31 @@ all: check
 %_test: %.c test_skel.h $(top_srcdir)/linux_syscall_support.h
 	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $<
 
+# Force building C as C++ code to improve compile-time coverage.
+%_cc_test: %.c test_skel.h $(top_srcdir)/linux_syscall_support.h
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $<
+
 %_test: %.cc test_skel.h $(top_srcdir)/linux_syscall_support.h
 	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $<
 
 %_run: %_test
 	@t=$(@:_run=_test); \
 	echo "./$$t"; \
-	if ! env -i ./$$t; then \
+	env -i ./$$t; \
+	exit_status=$$?; \
+	if [ $$exit_status = 77 ]; then \
+		echo "SKIP: $$t"; \
+	elif [ $$exit_status != 0 ]; then \
+		echo "FAIL: $$t"; \
 		env -i strace -f -v ./$$t; \
 		echo "TRY: gdb -q -ex r -ex bt ./$$t"; \
 		exit 1; \
 	fi
 
-ALL_TEST_TARGETS = $(TESTS:=_test)
+ALL_TEST_TARGETS = $(TESTS:=_test) $(TESTS:=_cc_test)
 compile_tests: $(ALL_TEST_TARGETS)
 
-ALL_RUN_TARGETS = $(TESTS:=_run)
+ALL_RUN_TARGETS = $(TESTS:=_run) $(TESTS:=_cc_run)
 check: $(ALL_RUN_TARGETS)
 
 # The "tempfile" targets are the names we use with temp files.
@@ -105,6 +120,7 @@ cross:
 		"mips64-unknown-linux-gnu-gcc -mabi=n32" \
 		"s390-ibm-linux-gnu-gcc" \
 		"s390x-ibm-linux-gnu-gcc" \
+		"loongarch64-unknown-linux-gnu-gcc" \
 	; do \
 		cxx=`echo "$$cc" | sed 's:-gcc:-g++:'`; \
 		$(MAKE) --no-print-directory CC="$$cc" CXX="$$cxx" cross_compile; \
diff --git a/external_imported/sentry-native/external/third_party/lss/tests/fallocate.c b/external_imported/sentry-native/external/third_party/lss/tests/fallocate.c
index c156e5898..1a26fed55 100644
--- a/external_imported/sentry-native/external/third_party/lss/tests/fallocate.c
+++ b/external_imported/sentry-native/external/third_party/lss/tests/fallocate.c
@@ -1,4 +1,4 @@
-/* Copyright 2019, Google Inc.  All rights reserved.
+/* Copyright 2019 Google LLC
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -10,7 +10,7 @@
  * 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
+ *     * Neither the name of Google LLC nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
  *
@@ -63,5 +63,7 @@ int main(int argc, char *argv[]) {
 #endif
   assert(st.st_size == offset + len);
 
+  sys_unlink(filename);
+
   return 0;
 }
diff --git a/external_imported/sentry-native/external/third_party/lss/tests/getitimer.c b/external_imported/sentry-native/external/third_party/lss/tests/getitimer.c
new file mode 100644
index 000000000..860538a0f
--- /dev/null
+++ b/external_imported/sentry-native/external/third_party/lss/tests/getitimer.c
@@ -0,0 +1,84 @@
+/* Copyright 2022 Google LLC
+ *
+ * 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 LLC 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.
+ */
+
+#include "test_skel.h"
+
+int main(int argc, char *argv[]) {
+  // We need an invalid timer value. The assert()'s below should
+  // be static asserts but it is not available in older C versions.
+#define kInvalidTimer 9999
+  assert(kInvalidTimer != ITIMER_REAL);
+  assert(kInvalidTimer != ITIMER_VIRTUAL);
+  assert(kInvalidTimer != ITIMER_PROF);
+
+  // This should fail with EINVAL.
+  struct kernel_itimerval curr_itimer;
+  assert(sys_getitimer(kInvalidTimer, &curr_itimer) == -1);
+  assert(errno == EINVAL);
+
+  // Create a read-only page.
+  size_t page_size = getpagesize();
+  void* read_only_page = sys_mmap(NULL, page_size, PROT_READ,
+                                  MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+  assert(read_only_page != MAP_FAILED);
+
+  // This should fail with EFAULT.
+  assert(sys_getitimer(ITIMER_REAL,
+                       (struct kernel_itimerval*) read_only_page) == -1);
+  assert(errno == EFAULT);
+
+  // This should complete without an error.
+  assert(sys_getitimer(ITIMER_REAL, &curr_itimer) == 0);
+
+  // Set up a real time timer with very long interval and value so that
+  // we do not need to handle SIGALARM in test.
+  struct kernel_itimerval new_itimer;
+  const time_t kIntervalSec = 60 * 60 * 24 * 365;  // One year.
+  const long kIntervalUSec = 123;
+  new_itimer.it_interval.tv_sec = kIntervalSec;
+  new_itimer.it_interval.tv_usec = kIntervalUSec;
+  new_itimer.it_value = new_itimer.it_interval;
+  assert(sys_setitimer(ITIMER_REAL, &new_itimer, NULL) == 0);
+
+  assert(sys_getitimer(ITIMER_REAL, &curr_itimer) == 0);
+  assert(kernel_timeval_eq(&curr_itimer.it_interval, &new_itimer.it_interval));
+
+  // Disable timer.
+  struct kernel_itimerval empty_itimer;
+  empty_itimer.it_interval.tv_sec = 0;
+  empty_itimer.it_interval.tv_usec = 0;
+  empty_itimer.it_value = empty_itimer.it_interval;
+  assert(sys_setitimer(ITIMER_REAL, &empty_itimer, NULL) == 0);
+
+  // We should read back an empty itimer.
+  assert(sys_getitimer(ITIMER_REAL, &curr_itimer) == 0);
+  assert(kernel_itimerval_eq(&curr_itimer, &empty_itimer));
+
+  return 0;
+}
diff --git a/external_imported/sentry-native/external/third_party/lss/tests/getrandom.c b/external_imported/sentry-native/external/third_party/lss/tests/getrandom.c
new file mode 100644
index 000000000..0ec38b3c9
--- /dev/null
+++ b/external_imported/sentry-native/external/third_party/lss/tests/getrandom.c
@@ -0,0 +1,59 @@
+/* Copyright 2020 Google LLC
+ *
+ * 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 LLC 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.
+ */
+
+#include "test_skel.h"
+
+#define BUFFER_SIZE 256
+
+int main(int argc, char *argv[]) {
+  char buffer[BUFFER_SIZE];
+  // Zero it out so we can check later that it's at least not all 0s.
+  memset(buffer, 0, BUFFER_SIZE);
+  bool buffer_contains_all_zeros = true;
+
+  // Don't bother passing any flags. (If we're using lss, we might not have the
+  // right header files with the flags defined anyway, and we'd have to copy
+  // this in here too, and risk getting out of sync in yet another way.)
+  const ssize_t r = sys_getrandom(buffer, BUFFER_SIZE, 0);
+
+  // Make sure it either worked, or that it's just not supported.
+  assert(r == BUFFER_SIZE || errno == ENOSYS);
+
+  if (r == BUFFER_SIZE) {
+    // If all the bytes are 0, it didn't really work.
+    for (size_t i = 0; i < BUFFER_SIZE; ++i) {
+      if (buffer[i] != 0) {
+        buffer_contains_all_zeros = false;
+      }
+    }
+    assert(!buffer_contains_all_zeros);
+  }
+
+  return 0;
+}
diff --git a/external_imported/sentry-native/external/third_party/lss/tests/lstat.c b/external_imported/sentry-native/external/third_party/lss/tests/lstat.c
new file mode 100644
index 000000000..816ba9faa
--- /dev/null
+++ b/external_imported/sentry-native/external/third_party/lss/tests/lstat.c
@@ -0,0 +1,97 @@
+/* Copyright 2021 Google LLC
+ *
+ * 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 LLC 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.
+ */
+
+#include "test_skel.h"
+
+int main(int argc, char *argv[]) {
+  int exit_status = 0;
+
+  // Get two unique paths to play with.
+  char foo[] = "tempfile.XXXXXX";
+  char bar[] = "tempfile.XXXXXX";
+  int fd_foo = mkstemp(foo);
+  int fd_bar = mkstemp(bar);
+  assert(fd_foo != -1);
+  assert(fd_bar != -1);
+
+  // Then delete foo.
+  assert(sys_unlink(foo) == 0);
+
+  // Now make foo a symlink to bar.
+  assert(symlink(bar, foo) == 0);
+
+  // Make sure sys_stat() and sys_lstat() implementation return different
+  // information.
+
+  // We need to check our stat syscalls for EOVERFLOW, as sometimes the integer
+  // types used in the stat structures are too small to fit the actual value.
+  // E.g. on some systems st_ino is 32-bit, but some filesystems have 64-bit
+  // inodes.
+
+  struct kernel_stat lstat_info;
+  int rc = sys_lstat(foo, &lstat_info);
+  if (rc < 0 && errno == EOVERFLOW) {
+    // Bail out since we had an overflow in the stat structure.
+    exit_status = SKIP_TEST_EXIT_STATUS;
+    goto cleanup;
+  }
+  assert(rc == 0);
+
+  struct kernel_stat stat_info;
+  rc = sys_stat(foo, &stat_info);
+  if (rc < 0 && errno == EOVERFLOW) {
+    // Bail out since we had an overflow in the stat structure.
+    exit_status = SKIP_TEST_EXIT_STATUS;
+    goto cleanup;
+  }
+  assert(rc == 0);
+
+  struct kernel_stat bar_stat_info;
+  rc = sys_stat(bar, &bar_stat_info);
+  if (rc < 0 && errno == EOVERFLOW) {
+    // Bail out since we had an overflow in the stat structure.
+    exit_status = SKIP_TEST_EXIT_STATUS;
+    goto cleanup;
+  }
+  assert(rc == 0);
+
+  // lstat should produce information about a symlink.
+  assert((lstat_info.st_mode & S_IFMT) == S_IFLNK);
+
+  // stat-ing foo and bar should produce the same inode.
+  assert(stat_info.st_ino == bar_stat_info.st_ino);
+
+  // lstat-ing foo should give a different inode than stat-ing foo.
+  assert(stat_info.st_ino != lstat_info.st_ino);
+
+cleanup:
+  sys_unlink(foo);
+  sys_unlink(bar);
+  return exit_status;
+}
diff --git a/external_imported/sentry-native/external/third_party/lss/tests/setitimer.c b/external_imported/sentry-native/external/third_party/lss/tests/setitimer.c
new file mode 100644
index 000000000..dd2ccfe5c
--- /dev/null
+++ b/external_imported/sentry-native/external/third_party/lss/tests/setitimer.c
@@ -0,0 +1,90 @@
+/* Copyright 2022 Google LLC
+ *
+ * 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 LLC 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.
+ */
+
+#include "test_skel.h"
+
+int main(int argc, char *argv[]) {
+  // We need an invalid timer value. The assert()'s below should
+  // be static asserts but it is not avalible in older C versions.
+#define kInvalidTimer 9999
+  assert(kInvalidTimer != ITIMER_REAL);
+  assert(kInvalidTimer != ITIMER_VIRTUAL);
+  assert(kInvalidTimer != ITIMER_PROF);
+
+  // Invalid timer returns EINVAL.
+  assert(sys_setitimer(kInvalidTimer, NULL, NULL) == -1);
+  assert(errno == EINVAL);
+
+  const int kSignal = SIGALRM;
+  const size_t kSigsetSize = sizeof(struct kernel_sigset_t);
+
+  // Block SIGALRM.
+  struct kernel_sigset_t sigalarm_only;
+  struct kernel_sigset_t old_sigset;
+  assert(sys_sigemptyset(&sigalarm_only) == 0);
+  assert(sys_sigaddset(&sigalarm_only, kSignal) == 0);
+  assert(sys_rt_sigprocmask(SIG_BLOCK, &sigalarm_only, &old_sigset,
+                            kSigsetSize) == 0);
+
+  // Set up a real time timer.
+  struct kernel_itimerval new_itimer = {};
+  const long kIntervalUSec = 123;
+  new_itimer.it_interval.tv_sec = 0;
+  new_itimer.it_interval.tv_usec = kIntervalUSec;
+  new_itimer.it_value = new_itimer.it_interval;
+  assert(sys_setitimer(ITIMER_REAL, &new_itimer, NULL) == 0);
+
+  // Wait for alarm.
+  struct timespec timeout;
+  const unsigned long kNanoSecsPerSec = 1000000000;
+  const unsigned long kNanoSecsPerMicroSec = 1000;
+
+  // Use a timeout 3 times of the timer interval.
+  unsigned long duration_ns = kIntervalUSec * kNanoSecsPerMicroSec * 3;
+  timeout.tv_sec = duration_ns / kNanoSecsPerSec ;
+  timeout.tv_nsec = duration_ns % kNanoSecsPerSec;
+
+  int sig;
+  do {
+    sig = sys_sigtimedwait(&sigalarm_only, NULL, &timeout);
+  } while (sig == -1 && errno == EINTR);
+  assert(sig == kSignal);
+
+  // Disable timer, check saving of old timer value.
+  struct kernel_itimerval empty_itimer = {};
+  struct kernel_itimerval old_itimer;
+  empty_itimer.it_interval.tv_sec = 0;
+  empty_itimer.it_interval.tv_usec = 0;
+  empty_itimer.it_value = empty_itimer.it_interval;
+
+  assert(sys_setitimer(ITIMER_REAL, &empty_itimer, &old_itimer) == 0);
+  assert(kernel_timeval_eq(&old_itimer.it_interval, &new_itimer.it_interval));
+
+  return 0;
+}
diff --git a/external_imported/sentry-native/external/third_party/lss/tests/sigaction.c b/external_imported/sentry-native/external/third_party/lss/tests/sigaction.c
new file mode 100644
index 000000000..db3658f40
--- /dev/null
+++ b/external_imported/sentry-native/external/third_party/lss/tests/sigaction.c
@@ -0,0 +1,54 @@
+/* Copyright 2020 Google LLC
+ *
+ * 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 LLC 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.
+ */
+
+#include "test_skel.h"
+
+void test_handler(int sig) {}
+
+int main(int argc, char *argv[]) {
+  const size_t kSigsetSize = sizeof(struct kernel_sigset_t);
+  struct kernel_sigaction action = {};
+  // Invalid signal returns EINVAL.
+  assert(sys_rt_sigaction(SIGKILL, &action, NULL, kSigsetSize) == -1);
+  assert(errno == EINVAL);
+
+  // Set an action.
+  action.sa_handler_ = test_handler;
+  action.sa_flags = SA_SIGINFO;
+  assert(sys_sigemptyset(&action.sa_mask) == 0);
+  assert(sys_sigaddset(&action.sa_mask, SIGPIPE) == 0);
+  assert(sys_rt_sigaction(SIGSEGV, &action, NULL, kSigsetSize) == 0);
+
+  // Retrieve the action.
+  struct kernel_sigaction old_action = {};
+  assert(sys_rt_sigaction(SIGSEGV, NULL, &old_action, kSigsetSize) == 0);
+  assert(memcmp(&action, &old_action, sizeof(action)) == 0);
+
+  return 0;
+}
diff --git a/external_imported/sentry-native/external/third_party/lss/tests/sigtimedwait.c b/external_imported/sentry-native/external/third_party/lss/tests/sigtimedwait.c
index ee2f740fe..d56d30460 100644
--- a/external_imported/sentry-native/external/third_party/lss/tests/sigtimedwait.c
+++ b/external_imported/sentry-native/external/third_party/lss/tests/sigtimedwait.c
@@ -1,4 +1,4 @@
-/* Copyright 2019, Google Inc.  All rights reserved.
+/* Copyright 2019 Google LLC
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -10,7 +10,7 @@
  * 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
+ *     * Neither the name of Google LLC nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
  *
diff --git a/external_imported/sentry-native/external/third_party/lss/tests/stat.c b/external_imported/sentry-native/external/third_party/lss/tests/stat.c
new file mode 100644
index 000000000..5ae66852d
--- /dev/null
+++ b/external_imported/sentry-native/external/third_party/lss/tests/stat.c
@@ -0,0 +1,67 @@
+/* Copyright 2021 Google LLC
+ *
+ * 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 LLC 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.
+ */
+
+#include "test_skel.h"
+
+int main(int argc, char *argv[]) {
+  int exit_status = 0;
+
+  // Get two unique paths to play with.
+  char foo[] = "tempfile.XXXXXX";
+  int fd_foo = mkstemp(foo);
+  assert(fd_foo != -1);
+
+  // Make sure it exists.
+  assert(access(foo, F_OK) == 0);
+
+  // Make sure sys_stat() and a libc stat() implementation return the same
+  // information.
+  struct stat libc_stat;
+  assert(stat(foo, &libc_stat) == 0);
+
+  struct kernel_stat raw_stat;
+  // We need to check our stat syscall for EOVERFLOW, as sometimes the integer
+  // types used in the stat structures are too small to fit the actual value.
+  // E.g. on some systems st_ino is 32-bit, but some filesystems have 64-bit
+  // inodes.
+  int rc = sys_stat(foo, &raw_stat);
+  if (rc < 0 && errno == EOVERFLOW) {
+    // Bail out since we had an overflow in the stat structure.
+    exit_status = SKIP_TEST_EXIT_STATUS;
+    goto cleanup;
+  }
+  assert(rc == 0);
+
+  assert(libc_stat.st_ino == raw_stat.st_ino);
+
+
+cleanup:
+  sys_unlink(foo);
+  return exit_status;
+}
diff --git a/external_imported/sentry-native/external/third_party/lss/tests/test_skel.h b/external_imported/sentry-native/external/third_party/lss/tests/test_skel.h
index 9ff0eb371..89077c95d 100644
--- a/external_imported/sentry-native/external/third_party/lss/tests/test_skel.h
+++ b/external_imported/sentry-native/external/third_party/lss/tests/test_skel.h
@@ -1,4 +1,4 @@
-/* Copyright 2018, Google Inc.  All rights reserved.
+/* Copyright 2018 Google LLC
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -10,7 +10,7 @@
  * 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
+ *     * Neither the name of Google LLC nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
  *
@@ -44,19 +44,24 @@
 #include <assert.h>
 #include <fcntl.h>
 #include <sched.h>
+#include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/mman.h>
 #include <sys/prctl.h>
 #include <sys/stat.h>
 #include <sys/vfs.h>
 #include <sys/wait.h>
+#include <unistd.h>
 
 #include <linux/capability.h>
 
 #include "linux_syscall_support.h"
 
+#define SKIP_TEST_EXIT_STATUS 77
+
 void assert_buffers_eq_len(const void *buf1, const void *buf2, size_t len) {
   const uint8_t *u8_1 = (const uint8_t *)buf1;
   const uint8_t *u8_2 = (const uint8_t *)buf2;
@@ -68,3 +73,17 @@ void assert_buffers_eq_len(const void *buf1, const void *buf2, size_t len) {
   }
 }
 #define assert_buffers_eq(obj1, obj2) assert_buffers_eq_len(obj1, obj2, sizeof(*obj1))
+
+// Returns true iff pointed timevals are equal.
+static inline bool kernel_timeval_eq(const struct kernel_timeval* lhs,
+                                     const struct kernel_timeval* rhs) {
+  return (lhs->tv_sec == rhs->tv_sec) && (lhs->tv_usec == rhs->tv_usec);
+}
+
+// Returns true iff pointed itimervals are equal.
+static inline bool kernel_itimerval_eq(const struct kernel_itimerval* lhs,
+                                       const struct kernel_itimerval* rhs) {
+  return kernel_timeval_eq(&lhs->it_interval, &rhs->it_interval) &&
+         kernel_timeval_eq(&lhs->it_value, &rhs->it_value);
+}
+
diff --git a/external_imported/sentry-native/external/third_party/lss/tests/unlink.c b/external_imported/sentry-native/external/third_party/lss/tests/unlink.c
index 70c8bc9a5..191e36792 100644
--- a/external_imported/sentry-native/external/third_party/lss/tests/unlink.c
+++ b/external_imported/sentry-native/external/third_party/lss/tests/unlink.c
@@ -1,4 +1,4 @@
-/* Copyright 2018, Google Inc.  All rights reserved.
+/* Copyright 2018 Google LLC
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -10,7 +10,7 @@
  * 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
+ *     * Neither the name of Google LLC nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
  *
diff --git a/external_imported/sentry-native/include/sentry.h b/external_imported/sentry-native/include/sentry.h
index b5381642d..bba0dd0e7 100644
--- a/external_imported/sentry-native/include/sentry.h
+++ b/external_imported/sentry-native/include/sentry.h
@@ -30,7 +30,7 @@ extern "C" {
 #        define SENTRY_SDK_NAME "sentry.native"
 #    endif
 #endif
-#define SENTRY_SDK_VERSION "0.6.0"
+#define SENTRY_SDK_VERSION "0.7.0"
 #define SENTRY_SDK_USER_AGENT SENTRY_SDK_NAME "/" SENTRY_SDK_VERSION
 
 /* common platform detection */
@@ -90,7 +90,7 @@ extern "C" {
 
 /* context type dependencies */
 #ifdef _WIN32
-#    include <wtypes.h>
+#    include <windows.h>
 #else
 #    include <signal.h>
 #endif
@@ -207,6 +207,8 @@ SENTRY_API sentry_value_t sentry_value_new_bool(int value);
  * Creates a new null terminated string.
  */
 SENTRY_API sentry_value_t sentry_value_new_string(const char *value);
+SENTRY_API sentry_value_t sentry_value_new_string_n(
+    const char *value, size_t value_len);
 
 /**
  * Creates a new list value.
@@ -232,10 +234,15 @@ SENTRY_API sentry_value_type_t sentry_value_get_type(sentry_value_t value);
 SENTRY_API int sentry_value_set_by_key(
     sentry_value_t value, const char *k, sentry_value_t v);
 
+SENTRY_API int sentry_value_set_by_key_n(
+    sentry_value_t value, const char *k, size_t k_len, sentry_value_t v);
+
 /**
  * This removes a value from the map by key.
  */
 SENTRY_API int sentry_value_remove_by_key(sentry_value_t value, const char *k);
+SENTRY_API int sentry_value_remove_by_key_n(
+    sentry_value_t value, const char *k, size_t k_len);
 
 /**
  * Appends a value to a list.
@@ -268,6 +275,8 @@ SENTRY_API int sentry_value_remove_by_index(sentry_value_t value, size_t index);
  */
 SENTRY_API sentry_value_t sentry_value_get_by_key(
     sentry_value_t value, const char *k);
+SENTRY_API sentry_value_t sentry_value_get_by_key_n(
+    sentry_value_t value, const char *k, size_t k_len);
 
 /**
  * Looks up a value in a map by key.  If missing a null value is returned.
@@ -278,6 +287,8 @@ SENTRY_API sentry_value_t sentry_value_get_by_key(
  */
 SENTRY_API sentry_value_t sentry_value_get_by_key_owned(
     sentry_value_t value, const char *k);
+SENTRY_API sentry_value_t sentry_value_get_by_key_owned_n(
+    sentry_value_t value, const char *k, size_t k_len);
 
 /**
  * Looks up a value in a list by index.  If missing a null value is returned.
@@ -365,6 +376,8 @@ SENTRY_API sentry_value_t sentry_value_new_event(void);
  */
 SENTRY_API sentry_value_t sentry_value_new_message_event(
     sentry_level_t level, const char *logger, const char *text);
+SENTRY_API sentry_value_t sentry_value_new_message_event_n(sentry_level_t level,
+    const char *logger, size_t logger_len, const char *text, size_t text_len);
 
 /**
  * Creates a new Breadcrumb with a specific type and message.
@@ -375,6 +388,8 @@ SENTRY_API sentry_value_t sentry_value_new_message_event(
  */
 SENTRY_API sentry_value_t sentry_value_new_breadcrumb(
     const char *type, const char *message);
+SENTRY_API sentry_value_t sentry_value_new_breadcrumb_n(
+    const char *type, size_t type_len, const char *message, size_t message_len);
 
 /**
  * Creates a new Exception value.
@@ -390,6 +405,8 @@ SENTRY_API sentry_value_t sentry_value_new_breadcrumb(
  */
 SENTRY_EXPERIMENTAL_API sentry_value_t sentry_value_new_exception(
     const char *type, const char *value);
+SENTRY_EXPERIMENTAL_API sentry_value_t sentry_value_new_exception_n(
+    const char *type, size_t type_len, const char *value, size_t value_len);
 
 /**
  * Creates a new Thread value.
@@ -403,6 +420,8 @@ SENTRY_EXPERIMENTAL_API sentry_value_t sentry_value_new_exception(
  */
 SENTRY_EXPERIMENTAL_API sentry_value_t sentry_value_new_thread(
     uint64_t id, const char *name);
+SENTRY_EXPERIMENTAL_API sentry_value_t sentry_value_new_thread_n(
+    uint64_t id, const char *name, size_t name_len);
 
 /**
  * Creates a new Stack Trace conforming to the Stack Trace Interface.
@@ -534,6 +553,8 @@ SENTRY_API sentry_uuid_t sentry_uuid_new_v4(void);
  * Parses a uuid from a string.
  */
 SENTRY_API sentry_uuid_t sentry_uuid_from_string(const char *str);
+SENTRY_API sentry_uuid_t sentry_uuid_from_string_n(
+    const char *str, size_t str_len);
 
 /**
  * Creates a uuid from bytes.
@@ -603,6 +624,8 @@ SENTRY_API char *sentry_envelope_serialize(
  */
 SENTRY_API int sentry_envelope_write_to_file(
     const sentry_envelope_t *envelope, const char *path);
+SENTRY_API int sentry_envelope_write_to_file_n(
+    const sentry_envelope_t *envelope, const char *path, size_t path_len);
 
 /**
  * The Sentry Client Options.
@@ -866,6 +889,8 @@ SENTRY_API void sentry_options_set_on_crash(
  * Sets the DSN.
  */
 SENTRY_API void sentry_options_set_dsn(sentry_options_t *opts, const char *dsn);
+SENTRY_API void sentry_options_set_dsn_n(
+    sentry_options_t *opts, const char *dsn, size_t dsn_len);
 
 /**
  * Gets the DSN.
@@ -903,6 +928,8 @@ SENTRY_API double sentry_options_get_sample_rate(const sentry_options_t *opts);
  */
 SENTRY_API void sentry_options_set_release(
     sentry_options_t *opts, const char *release);
+SENTRY_API void sentry_options_set_release_n(
+    sentry_options_t *opts, const char *release, size_t release_len);
 
 /**
  * Gets the release.
@@ -914,6 +941,8 @@ SENTRY_API const char *sentry_options_get_release(const sentry_options_t *opts);
  */
 SENTRY_API void sentry_options_set_environment(
     sentry_options_t *opts, const char *environment);
+SENTRY_API void sentry_options_set_environment_n(
+    sentry_options_t *opts, const char *environment, size_t environment_len);
 
 /**
  * Gets the environment.
@@ -926,6 +955,8 @@ SENTRY_API const char *sentry_options_get_environment(
  */
 SENTRY_API void sentry_options_set_dist(
     sentry_options_t *opts, const char *dist);
+SENTRY_API void sentry_options_set_dist_n(
+    sentry_options_t *opts, const char *dist, size_t dist_len);
 
 /**
  * Gets the dist.
@@ -939,6 +970,8 @@ SENTRY_API const char *sentry_options_get_dist(const sentry_options_t *opts);
  */
 SENTRY_API void sentry_options_set_http_proxy(
     sentry_options_t *opts, const char *proxy);
+SENTRY_API void sentry_options_set_http_proxy_n(
+    sentry_options_t *opts, const char *proxy, size_t proxy_len);
 
 /**
  * Returns the configured http proxy.
@@ -952,6 +985,8 @@ SENTRY_API const char *sentry_options_get_http_proxy(
  */
 SENTRY_API void sentry_options_set_ca_certs(
     sentry_options_t *opts, const char *path);
+SENTRY_API void sentry_options_set_ca_certs_n(
+    sentry_options_t *opts, const char *path, size_t path_len);
 
 /**
  * Returns the configured path for ca certificates.
@@ -964,6 +999,8 @@ SENTRY_API const char *sentry_options_get_ca_certs(
  */
 SENTRY_API void sentry_options_set_transport_thread_name(
     sentry_options_t *opts, const char *name);
+SENTRY_API void sentry_options_set_transport_thread_name_n(
+    sentry_options_t *opts, const char *name, size_t name_len);
 
 /**
  * Returns the configured http transport thread name.
@@ -971,6 +1008,32 @@ SENTRY_API void sentry_options_set_transport_thread_name(
 SENTRY_API const char *sentry_options_get_transport_thread_name(
     const sentry_options_t *opts);
 
+/*
+ * Configures the name of the sentry SDK. Returns 0 on success.
+ */
+SENTRY_API int sentry_options_set_sdk_name(
+    sentry_options_t *opts, const char *sdk_name);
+
+/*
+ * Configures the name of the sentry SDK. Returns 0 on success.
+ */
+SENTRY_API int sentry_options_set_sdk_name_n(
+    sentry_options_t *opts, const char *sdk_name, size_t sdk_name_len);
+
+/**
+ * Returns the configured sentry SDK name. Unless overwritten this defaults to
+ * SENTRY_SDK_NAME.
+ */
+SENTRY_API const char *sentry_options_get_sdk_name(
+    const sentry_options_t *opts);
+
+/**
+ * Returns the user agent. Unless overwritten this defaults to
+ * "SENTRY_SDK_NAME / SENTRY_SDK_VERSION".
+ */
+SENTRY_API const char *sentry_options_get_user_agent(
+    const sentry_options_t *opts);
+
 /**
  * Enables or disables debug printing mode.
  */
@@ -1069,6 +1132,8 @@ SENTRY_API int sentry_options_get_symbolize_stacktraces(
  */
 SENTRY_API void sentry_options_add_attachment(
     sentry_options_t *opts, const char *path);
+SENTRY_API void sentry_options_add_attachment_n(
+    sentry_options_t *opts, const char *path, size_t path_len);
 
 /**
  * Sets the path to the crashpad handler if the crashpad backend is used.
@@ -1086,6 +1151,8 @@ SENTRY_API void sentry_options_add_attachment(
  */
 SENTRY_API void sentry_options_set_handler_path(
     sentry_options_t *opts, const char *path);
+SENTRY_API void sentry_options_set_handler_path_n(
+    sentry_options_t *opts, const char *path, size_t path_len);
 
 /**
  * Sets the path to the Sentry Database Directory.
@@ -1118,6 +1185,8 @@ SENTRY_API void sentry_options_set_handler_path(
  */
 SENTRY_API void sentry_options_set_database_path(
     sentry_options_t *opts, const char *path);
+SENTRY_API void sentry_options_set_database_path_n(
+    sentry_options_t *opts, const char *path, size_t path_len);
 
 #ifdef SENTRY_PLATFORM_WINDOWS
 /**
@@ -1125,18 +1194,24 @@ SENTRY_API void sentry_options_set_database_path(
  */
 SENTRY_API void sentry_options_add_attachmentw(
     sentry_options_t *opts, const wchar_t *path);
+SENTRY_API void sentry_options_add_attachmentw_n(
+    sentry_options_t *opts, const wchar_t *path, size_t path_len);
 
 /**
  * Wide char version of `sentry_options_set_handler_path`.
  */
 SENTRY_API void sentry_options_set_handler_pathw(
     sentry_options_t *opts, const wchar_t *path);
+SENTRY_API void sentry_options_set_handler_pathw_n(
+    sentry_options_t *opts, const wchar_t *path, size_t path_len);
 
 /**
  * Wide char version of `sentry_options_set_database_path`.
  */
 SENTRY_API void sentry_options_set_database_pathw(
     sentry_options_t *opts, const wchar_t *path);
+SENTRY_API void sentry_options_set_database_pathw_n(
+    sentry_options_t *opts, const wchar_t *path, size_t path_len);
 #endif
 
 /**
@@ -1192,6 +1267,10 @@ SENTRY_API int sentry_init(sentry_options_t *options);
  * The `timeout` parameter is in milliseconds.
  *
  * Returns 0 on success, or a non-zero return value in case the timeout is hit.
+ *
+ * Note that this function will block the thread it was called from until the
+ * sentry background worker has finished its work or it timed out, whichever
+ * comes first.
  */
 SENTRY_API int sentry_flush(uint64_t timeout);
 
@@ -1199,6 +1278,14 @@ SENTRY_API int sentry_flush(uint64_t timeout);
  * Shuts down the sentry client and forces transports to flush out.
  *
  * Returns 0 on success.
+ *
+ * Note that this does not uninstall any crash handler installed by our
+ * backends, which will still process crashes after `sentry_close()`, except
+ * when using `crashpad` on Linux or the `inproc` backend.
+ *
+ * Further note that this function will block the thread it was called from
+ * until the sentry background worker has finished its work or it timed out,
+ * whichever comes first.
  */
 SENTRY_API int sentry_close(void);
 
@@ -1297,31 +1384,40 @@ SENTRY_API void sentry_remove_user(void);
  * Sets a tag.
  */
 SENTRY_API void sentry_set_tag(const char *key, const char *value);
+SENTRY_API void sentry_set_tag_n(
+    const char *key, size_t key_len, const char *value, size_t value_len);
 
 /**
  * Removes the tag with the specified key.
  */
 SENTRY_API void sentry_remove_tag(const char *key);
+SENTRY_API void sentry_remove_tag_n(const char *key, size_t key_len);
 
 /**
  * Sets extra information.
  */
 SENTRY_API void sentry_set_extra(const char *key, sentry_value_t value);
+SENTRY_API void sentry_set_extra_n(
+    const char *key, size_t key_len, sentry_value_t value);
 
 /**
  * Removes the extra with the specified key.
  */
 SENTRY_API void sentry_remove_extra(const char *key);
+SENTRY_API void sentry_remove_extra_n(const char *key, size_t key_len);
 
 /**
  * Sets a context object.
  */
 SENTRY_API void sentry_set_context(const char *key, sentry_value_t value);
+SENTRY_API void sentry_set_context_n(
+    const char *key, size_t key_len, sentry_value_t value);
 
 /**
  * Removes the context object with the specified key.
  */
 SENTRY_API void sentry_remove_context(const char *key);
+SENTRY_API void sentry_remove_context_n(const char *key, size_t key_len);
 
 /**
  * Sets the event fingerprint.
@@ -1330,6 +1426,8 @@ SENTRY_API void sentry_remove_context(const char *key);
  * trailing `NULL`.
  */
 SENTRY_API void sentry_set_fingerprint(const char *fingerprint, ...);
+SENTRY_API void sentry_set_fingerprint_n(
+    const char *fingerprint, size_t fingerprint_len, ...);
 
 /**
  * Removes the fingerprint.
@@ -1340,6 +1438,8 @@ SENTRY_API void sentry_remove_fingerprint(void);
  * Sets the transaction.
  */
 SENTRY_API void sentry_set_transaction(const char *transaction);
+SENTRY_API void sentry_set_transaction_n(
+    const char *transaction, size_t transaction_len);
 
 /**
  * Sets the event level.
@@ -1448,6 +1548,9 @@ typedef struct sentry_span_s sentry_span_t;
  */
 SENTRY_EXPERIMENTAL_API sentry_transaction_context_t *
 sentry_transaction_context_new(const char *name, const char *operation);
+SENTRY_EXPERIMENTAL_API sentry_transaction_context_t *
+sentry_transaction_context_new_n(const char *name, size_t name_len,
+    const char *operation, size_t operation_len);
 
 /**
  * Sets the `name` on a Transaction Context, which will be used in the
@@ -1458,6 +1561,8 @@ sentry_transaction_context_new(const char *name, const char *operation);
  */
 SENTRY_EXPERIMENTAL_API void sentry_transaction_context_set_name(
     sentry_transaction_context_t *tx_cxt, const char *name);
+SENTRY_EXPERIMENTAL_API void sentry_transaction_context_set_name_n(
+    sentry_transaction_context_t *tx_cxt, const char *name, size_t name_len);
 
 /**
  * Sets the `operation` on a Transaction Context, which will be used in the
@@ -1471,6 +1576,9 @@ SENTRY_EXPERIMENTAL_API void sentry_transaction_context_set_name(
  */
 SENTRY_EXPERIMENTAL_API void sentry_transaction_context_set_operation(
     sentry_transaction_context_t *tx_cxt, const char *operation);
+SENTRY_EXPERIMENTAL_API void sentry_transaction_context_set_operation_n(
+    sentry_transaction_context_t *tx_cxt, const char *operation,
+    size_t operation_len);
 
 /**
  * Sets the `sampled` field on a Transaction Context, which will be used in the
@@ -1508,6 +1616,9 @@ SENTRY_EXPERIMENTAL_API void sentry_transaction_context_remove_sampled(
  */
 SENTRY_EXPERIMENTAL_API void sentry_transaction_context_update_from_header(
     sentry_transaction_context_t *tx_cxt, const char *key, const char *value);
+SENTRY_EXPERIMENTAL_API void sentry_transaction_context_update_from_header_n(
+    sentry_transaction_context_t *tx_cxt, const char *key, size_t key_len,
+    const char *value, size_t value_len);
 
 /**
  * Starts a new Transaction based on the provided context, restored from an
@@ -1618,7 +1729,11 @@ SENTRY_EXPERIMENTAL_API void sentry_set_span(sentry_span_t *span);
  * in a thread-safe way.
  */
 SENTRY_EXPERIMENTAL_API sentry_span_t *sentry_transaction_start_child(
-    sentry_transaction_t *parent, char *operation, char *description);
+    sentry_transaction_t *parent, const char *operation,
+    const char *description);
+SENTRY_EXPERIMENTAL_API sentry_span_t *sentry_transaction_start_child_n(
+    sentry_transaction_t *parent, const char *operation, size_t operation_len,
+    const char *description, size_t description_len);
 
 /**
  * Starts a new Span.
@@ -1651,7 +1766,10 @@ SENTRY_EXPERIMENTAL_API sentry_span_t *sentry_transaction_start_child(
  * in a thread-safe way.
  */
 SENTRY_EXPERIMENTAL_API sentry_span_t *sentry_span_start_child(
-    sentry_span_t *parent, char *operation, char *description);
+    sentry_span_t *parent, const char *operation, const char *description);
+SENTRY_EXPERIMENTAL_API sentry_span_t *sentry_span_start_child_n(
+    sentry_span_t *parent, const char *operation, size_t operation_len,
+    const char *description, size_t description_len);
 
 /**
  * Finishes a Span.
@@ -1675,6 +1793,9 @@ SENTRY_EXPERIMENTAL_API void sentry_span_finish(sentry_span_t *span);
  */
 SENTRY_EXPERIMENTAL_API void sentry_transaction_set_tag(
     sentry_transaction_t *transaction, const char *tag, const char *value);
+SENTRY_EXPERIMENTAL_API void sentry_transaction_set_tag_n(
+    sentry_transaction_t *transaction, const char *tag, size_t tag_len,
+    const char *value, size_t value_len);
 
 /**
  * Removes a tag from a Transaction.
@@ -1684,6 +1805,8 @@ SENTRY_EXPERIMENTAL_API void sentry_transaction_set_tag(
  */
 SENTRY_EXPERIMENTAL_API void sentry_transaction_remove_tag(
     sentry_transaction_t *transaction, const char *tag);
+SENTRY_EXPERIMENTAL_API void sentry_transaction_remove_tag_n(
+    sentry_transaction_t *transaction, const char *tag, size_t tag_len);
 
 /**
  * Sets the given key in a Transaction's "data" section to the given value.
@@ -1693,6 +1816,9 @@ SENTRY_EXPERIMENTAL_API void sentry_transaction_remove_tag(
  */
 SENTRY_EXPERIMENTAL_API void sentry_transaction_set_data(
     sentry_transaction_t *transaction, const char *key, sentry_value_t value);
+SENTRY_EXPERIMENTAL_API void sentry_transaction_set_data_n(
+    sentry_transaction_t *transaction, const char *key, size_t key_len,
+    sentry_value_t value);
 
 /**
  * Removes a key from a Transaction's "data" section.
@@ -1702,6 +1828,8 @@ SENTRY_EXPERIMENTAL_API void sentry_transaction_set_data(
  */
 SENTRY_EXPERIMENTAL_API void sentry_transaction_remove_data(
     sentry_transaction_t *transaction, const char *key);
+SENTRY_EXPERIMENTAL_API void sentry_transaction_remove_data_n(
+    sentry_transaction_t *transaction, const char *key, size_t key_len);
 
 /**
  * Sets a tag on a Span to the given string value.
@@ -1713,6 +1841,8 @@ SENTRY_EXPERIMENTAL_API void sentry_transaction_remove_data(
  */
 SENTRY_EXPERIMENTAL_API void sentry_span_set_tag(
     sentry_span_t *span, const char *tag, const char *value);
+SENTRY_EXPERIMENTAL_API void sentry_span_set_tag_n(sentry_span_t *span,
+    const char *tag, size_t tag_len, const char *value, size_t value_len);
 
 /**
  * Removes a tag from a Span.
@@ -1722,6 +1852,8 @@ SENTRY_EXPERIMENTAL_API void sentry_span_set_tag(
  */
 SENTRY_EXPERIMENTAL_API void sentry_span_remove_tag(
     sentry_span_t *span, const char *tag);
+SENTRY_EXPERIMENTAL_API void sentry_span_remove_tag_n(
+    sentry_span_t *span, const char *tag, size_t tag_len);
 
 /**
  * Sets the given key in a Span's "data" section to the given value.
@@ -1731,6 +1863,8 @@ SENTRY_EXPERIMENTAL_API void sentry_span_remove_tag(
  */
 SENTRY_EXPERIMENTAL_API void sentry_span_set_data(
     sentry_span_t *span, const char *key, sentry_value_t value);
+SENTRY_EXPERIMENTAL_API void sentry_span_set_data_n(
+    sentry_span_t *span, const char *key, size_t key_len, sentry_value_t value);
 
 /**
  * Removes a key from a Span's "data" section.
@@ -1740,6 +1874,8 @@ SENTRY_EXPERIMENTAL_API void sentry_span_set_data(
  */
 SENTRY_EXPERIMENTAL_API void sentry_span_remove_data(
     sentry_span_t *span, const char *key);
+SENTRY_EXPERIMENTAL_API void sentry_span_remove_data_n(
+    sentry_span_t *span, const char *key, size_t key_len);
 
 /**
  * Sets a Transaction's name.
@@ -1749,6 +1885,8 @@ SENTRY_EXPERIMENTAL_API void sentry_span_remove_data(
  */
 SENTRY_EXPERIMENTAL_API void sentry_transaction_set_name(
     sentry_transaction_t *transaction, const char *name);
+SENTRY_EXPERIMENTAL_API void sentry_transaction_set_name_n(
+    sentry_transaction_t *transaction, const char *name, size_t name_len);
 
 /**
  * The status of a Span or Transaction.
@@ -1883,12 +2021,14 @@ SENTRY_EXPERIMENTAL_API int sentry_clear_crashed_last_run(void);
 SENTRY_EXPERIMENTAL_API const char *sentry_sdk_version(void);
 
 /**
- * Sentry SDK name.
+ * Sentry SDK name set during build time.
+ * Deprecated: Please use sentry_options_get_sdk_name instead.
  */
 SENTRY_EXPERIMENTAL_API const char *sentry_sdk_name(void);
 
 /**
- * Sentry SDK User-Agent.
+ * Sentry SDK User-Agent set during build time.
+ * Deprecated: Please use sentry_options_get_user_agent instead.
  */
 SENTRY_EXPERIMENTAL_API const char *sentry_sdk_user_agent(void);
 
diff --git a/external_imported/sentry-native/scripts/install-llvm-mingw.ps1 b/external_imported/sentry-native/scripts/install-llvm-mingw.ps1
index a81acaf4d..835c884f6 100755
--- a/external_imported/sentry-native/scripts/install-llvm-mingw.ps1
+++ b/external_imported/sentry-native/scripts/install-llvm-mingw.ps1
@@ -49,6 +49,7 @@ New-Item -ItemType Directory -Force -Path "${NINJA_INSTALL_PATH}"
 Expand-Archive -LiteralPath "${NINJA_DL_PATH}" -DestinationPath "${NINJA_INSTALL_PATH}"
 # Export the NINJA executable path
 echo "NINJA_INSTALL_PATH=${NINJA_INSTALL_PATH}" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+echo "PATH=${NINJA_INSTALL_PATH};$env:PATH" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
 # Add CMAKE_DEFINES
 echo "CMAKE_DEFINES=-DCMAKE_C_COMPILER=${env:MINGW_PKG_PREFIX}-gcc -DCMAKE_CXX_COMPILER=${env:MINGW_PKG_PREFIX}-g++ -DCMAKE_RC_COMPILER=${env:MINGW_PKG_PREFIX}-windres -DCMAKE_ASM_MASM_COMPILER=${env:MINGW_ASM_MASM_COMPILER} -GNinja" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
diff --git a/external_imported/sentry-native/scripts/start-android.sh b/external_imported/sentry-native/scripts/start-android.sh
index d313c00ed..6b7fecb5d 100755
--- a/external_imported/sentry-native/scripts/start-android.sh
+++ b/external_imported/sentry-native/scripts/start-android.sh
@@ -17,7 +17,7 @@ echo "Starting emulator..."
 
 # Start emulator in background
 nohup $ANDROID_HOME/emulator/emulator -avd $AVD_EMULATOR_NAME -no-snapshot > /dev/null 2>&1 &
-$ANDROID_HOME/platform-tools/adb wait-for-device shell 'while [[ -z $(getprop sys.boot_completed) ]]; do sleep 1; done; input keyevent 82'
+$ANDROID_HOME/platform-tools/adb wait-for-device shell 'ls'
 $ANDROID_HOME/platform-tools/adb devices
 
 echo "Emulator started."
diff --git a/external_imported/sentry-native/sentry-config.cmake.in b/external_imported/sentry-native/sentry-config.cmake.in
index 89ea34511..70ce7d3c5 100644
--- a/external_imported/sentry-native/sentry-config.cmake.in
+++ b/external_imported/sentry-native/sentry-config.cmake.in
@@ -2,19 +2,32 @@
 
 set(SENTRY_BACKEND @SENTRY_BACKEND@)
 set(SENTRY_TRANSPORT @SENTRY_TRANSPORT@)
+set(SENTRY_BUILD_SHARED_LIBS @SENTRY_BUILD_SHARED_LIBS@)
+set(SENTRY_LINK_PTHREAD @SENTRY_LINK_PTHREAD@)
 
-if(SENTRY_BACKEND STREQUAL "crashpad")
-	if(@SENTRY_CRASHPAD_SYSTEM@)
-		find_package(crashpad REQUIRED)
-	else()
-		include("${CMAKE_CURRENT_LIST_DIR}/sentry_crashpad-targets.cmake")
+if(SENTRY_BACKEND STREQUAL "crashpad" AND NOT SENTRY_BUILD_SHARED_LIBS)
+	include("${CMAKE_CURRENT_LIST_DIR}/sentry_crashpad-targets.cmake")
+	if(NOT MSVC AND NOT SENTRY_BUILD_SHARED_LIBS)
+		find_package(ZLIB REQUIRED)
+	endif()
+endif()
+
+if(SENTRY_BACKEND STREQUAL "breakpad" AND NOT SENTRY_BUILD_SHARED_LIBS)
+	set(SENTRY_BREAKPAD_SYSTEM @SENTRY_BREAKPAD_SYSTEM@)
+	if(SENTRY_BREAKPAD_SYSTEM)
+		find_package(PkgConfig REQUIRED)
+		pkg_check_modules(BREAKPAD REQUIRED IMPORTED_TARGET breakpad-client)
 	endif()
 endif()
 
 include("${CMAKE_CURRENT_LIST_DIR}/sentry-targets.cmake")
 
-if(SENTRY_TRANSPORT STREQUAL "curl" AND NOT @BUILD_SHARED_LIBS@)
+if(SENTRY_TRANSPORT STREQUAL "curl" AND (NOT @BUILD_SHARED_LIBS@ OR NOT SENTRY_BUILD_SHARED_LIBS))
 	find_package(CURL REQUIRED)
 	set_property(TARGET sentry::sentry APPEND
 		PROPERTY INTERFACE_LINK_LIBRARIES ${CURL_LIBRARIES})
 endif()
+
+if(SENTRY_LINK_PTHREAD AND NOT SENTRY_BUILD_SHARED_LIBS)
+	find_package(Threads REQUIRED)
+endif()
diff --git a/external_imported/sentry-native/src/backends/sentry_backend_breakpad.cpp b/external_imported/sentry-native/src/backends/sentry_backend_breakpad.cpp
index 1c22e43e9..40dc6a189 100644
--- a/external_imported/sentry-native/src/backends/sentry_backend_breakpad.cpp
+++ b/external_imported/sentry-native/src/backends/sentry_backend_breakpad.cpp
@@ -92,6 +92,8 @@ sentry__breakpad_backend_callback(
     dump_path = sentry__path_new(descriptor.path());
 #endif
     sentry_value_t event = sentry_value_new_event();
+    sentry_value_set_by_key(
+        event, "level", sentry__value_new_level(SENTRY_LEVEL_FATAL));
 
     SENTRY_WITH_OPTIONS (options) {
         sentry__write_crash_marker(options);
@@ -116,9 +118,6 @@ sentry__breakpad_backend_callback(
         if (should_handle) {
             sentry_envelope_t *envelope = sentry__prepare_event(
                 options, event, nullptr, !options->on_crash_func);
-            // the event we just prepared is empty,
-            // so no error is recorded for it
-            sentry__record_errors_on_current_session(1);
             sentry_session_t *session = sentry__end_current_session_with_status(
                 SENTRY_SESSION_STATUS_CRASHED);
             sentry__envelope_add_session(envelope, session);
diff --git a/external_imported/sentry-native/src/backends/sentry_backend_crashpad.cpp b/external_imported/sentry-native/src/backends/sentry_backend_crashpad.cpp
index c44672341..96d961657 100644
--- a/external_imported/sentry-native/src/backends/sentry_backend_crashpad.cpp
+++ b/external_imported/sentry-native/src/backends/sentry_backend_crashpad.cpp
@@ -43,6 +43,14 @@ extern "C" {
 #    pragma warning(pop)
 #endif
 
+template <typename T>
+static void
+safe_delete(T *&ptr)
+{
+    delete ptr;
+    ptr = nullptr;
+}
+
 extern "C" {
 
 #ifdef SENTRY_PLATFORM_LINUX
@@ -74,16 +82,28 @@ constexpr int g_CrashSignals[] = {
 
 typedef struct {
     crashpad::CrashReportDatabase *db;
+    crashpad::CrashpadClient *client;
     sentry_path_t *event_path;
     sentry_path_t *breadcrumb1_path;
     sentry_path_t *breadcrumb2_path;
     size_t num_breadcrumbs;
+    sentry_value_t crash_event;
 } crashpad_state_t;
 
+/**
+ * Correctly destruct C++ members of the crashpad state.
+ */
+static void
+crashpad_state_dtor(crashpad_state_t *state)
+{
+    safe_delete(state->client);
+    safe_delete(state->db);
+}
+
 static void
-sentry__crashpad_backend_user_consent_changed(sentry_backend_t *backend)
+crashpad_backend_user_consent_changed(sentry_backend_t *backend)
 {
-    crashpad_state_t *data = (crashpad_state_t *)backend->data;
+    auto *data = static_cast<crashpad_state_t *>(backend->data);
     if (!data->db || !data->db->GetSettings()) {
         return;
     }
@@ -91,18 +111,28 @@ sentry__crashpad_backend_user_consent_changed(sentry_backend_t *backend)
 }
 
 static void
-sentry__crashpad_backend_flush_scope(
+crashpad_backend_flush_scope(
     sentry_backend_t *backend, const sentry_options_t *options)
 {
-    const crashpad_state_t *data = (crashpad_state_t *)backend->data;
+    auto *data = static_cast<crashpad_state_t *>(backend->data);
     if (!data->event_path) {
         return;
     }
 
     // This here is an empty object that we copy the scope into.
     // Even though the API is specific to `event`, an `event` has a few default
-    // properties that we do not want here.
-    sentry_value_t event = sentry_value_new_object();
+    // properties that we do not want here. But in case of a crash we use the
+    // crash-event filled in the crash-handler and on_crash/before_send
+    // respectively.
+    sentry_value_t event = data->crash_event;
+    if (sentry_value_is_null(event)) {
+        event = sentry_value_new_object();
+        // FIXME: This should be handled in the FirstChanceHandler but that does
+        // not exist for macOS just yet.
+        sentry_value_set_by_key(
+            event, "level", sentry__value_new_level(SENTRY_LEVEL_FATAL));
+    }
+
     SENTRY_WITH_SCOPE (scope) {
         // we want the scope without any modules or breadcrumbs
         sentry__scope_apply_to_event(scope, options, event, SENTRY_SCOPE_NONE);
@@ -138,9 +168,13 @@ sentry__crashpad_handler(int signum, siginfo_t *info, ucontext_t *user_context)
     SENTRY_DEBUG("flushing session and queue before crashpad handler");
 
     bool should_dump = true;
-    sentry_value_t event = sentry_value_new_event();
 
     SENTRY_WITH_OPTIONS (options) {
+        auto *data = static_cast<crashpad_state_t *>(options->backend->data);
+        sentry_value_decref(data->crash_event);
+        data->crash_event = sentry_value_new_event();
+        sentry_value_set_by_key(data->crash_event, "level",
+            sentry__value_new_level(SENTRY_LEVEL_FATAL));
 
         if (options->on_crash_func) {
             sentry_ucontext_t uctx;
@@ -153,17 +187,18 @@ sentry__crashpad_handler(int signum, siginfo_t *info, ucontext_t *user_context)
 #    endif
 
             SENTRY_TRACE("invoking `on_crash` hook");
-            event
-                = options->on_crash_func(&uctx, event, options->on_crash_data);
+            data->crash_event = options->on_crash_func(
+                &uctx, data->crash_event, options->on_crash_data);
         } else if (options->before_send_func) {
             SENTRY_TRACE("invoking `before_send` hook");
-            event = options->before_send_func(
-                event, nullptr, options->before_send_data);
+            data->crash_event = options->before_send_func(
+                data->crash_event, nullptr, options->before_send_data);
         }
-        should_dump = !sentry_value_is_null(event);
-        sentry_value_decref(event);
+        should_dump = !sentry_value_is_null(data->crash_event);
 
         if (should_dump) {
+            crashpad_backend_flush_scope(options->backend, options);
+
             sentry__write_crash_marker(options);
 
             sentry__record_errors_on_current_session(1);
@@ -231,10 +266,10 @@ sentry__crashpad_handler(int signum, siginfo_t *info, ucontext_t *user_context)
 #endif
 
 static int
-sentry__crashpad_backend_startup(
+crashpad_backend_startup(
     sentry_backend_t *backend, const sentry_options_t *options)
 {
-    sentry_path_t *owned_handler_path = NULL;
+    sentry_path_t *owned_handler_path = nullptr;
     sentry_path_t *handler_path = options->handler_path;
     if (!handler_path) {
         sentry_path_t *current_exe = sentry__path_current_exe();
@@ -272,7 +307,7 @@ sentry__crashpad_backend_startup(
                   "\"%" SENTRY_PATH_PRI "\"",
         absolute_handler_path->path);
     sentry_path_t *current_run_folder = options->run->run_path;
-    crashpad_state_t *data = (crashpad_state_t *)backend->data;
+    auto *data = static_cast<crashpad_state_t *>(backend->data);
 
     base::FilePath database(options->database_path->path);
     base::FilePath handler(absolute_handler_path->path);
@@ -283,7 +318,7 @@ sentry__crashpad_backend_startup(
     // register attachments
     for (sentry_attachment_t *attachment = options->attachments; attachment;
          attachment = attachment->next) {
-        attachments.push_back(base::FilePath(attachment->path->path));
+        attachments.emplace_back(attachment->path->path);
     }
 
     // and add the serialized event, and two rotating breadcrumb files
@@ -299,25 +334,34 @@ sentry__crashpad_backend_startup(
     sentry__path_touch(data->breadcrumb1_path);
     sentry__path_touch(data->breadcrumb2_path);
 
-    attachments.push_back(base::FilePath(data->event_path->path));
-    attachments.push_back(base::FilePath(data->breadcrumb1_path->path));
-    attachments.push_back(base::FilePath(data->breadcrumb2_path->path));
+    attachments.insert(attachments.end(),
+        { base::FilePath(data->event_path->path),
+            base::FilePath(data->breadcrumb1_path->path),
+            base::FilePath(data->breadcrumb2_path->path) });
 
-    std::vector<std::string> arguments;
-    arguments.push_back("--no-rate-limit");
+    std::vector<std::string> arguments { "--no-rate-limit" };
 
     // Initialize database first, flushing the consent later on as part of
     // `sentry_init` will persist the upload flag.
     data->db = crashpad::CrashReportDatabase::Initialize(database).release();
-
-    crashpad::CrashpadClient client;
-    char *minidump_url = sentry__dsn_get_minidump_url(options->dsn);
-    SENTRY_TRACEF("using minidump url \"%s\"", minidump_url);
-    std::string url = minidump_url ? std::string(minidump_url) : std::string();
-    sentry_free(minidump_url);
-    bool success = client.StartHandler(handler, database, database, url,
-        annotations, arguments, /* restartable */ true,
-        /* asynchronous_start */ false, attachments);
+    data->client = new crashpad::CrashpadClient;
+    bool success;
+    char *minidump_url
+        = sentry__dsn_get_minidump_url(options->dsn, options->user_agent);
+    if (minidump_url) {
+        SENTRY_TRACEF("using minidump URL \"%s\"", minidump_url);
+        success = data->client->StartHandler(handler, database, database,
+            minidump_url, options->http_proxy ? options->http_proxy : "",
+            annotations, arguments,
+            /* restartable */ true,
+            /* asynchronous_start */ false, attachments);
+        sentry_free(minidump_url);
+    } else {
+        SENTRY_WARN(
+            "failed to construct minidump URL (check DSN or user-agent)");
+        crashpad_state_dtor(data);
+        return 1;
+    }
 
 #ifdef CRASHPAD_WER_ENABLED
     sentry_path_t *handler_dir = sentry__path_dir(absolute_handler_path);
@@ -342,7 +386,7 @@ sentry__crashpad_backend_startup(
             SENTRY_WARN("registering crashpad WER handler in registry failed");
         } else {
             std::wstring wer_path_string(wer_path->path);
-            if (!client.RegisterWerModule(wer_path_string)) {
+            if (!data->client->RegisterWerModule(wer_path_string)) {
                 SENTRY_WARN("registering crashpad WER handler module failed");
             }
         }
@@ -360,8 +404,7 @@ sentry__crashpad_backend_startup(
     } else {
         SENTRY_WARN("failed to start crashpad client handler");
         // not calling `shutdown`
-        delete data->db;
-        data->db = nullptr;
+        crashpad_state_dtor(data);
         return 1;
     }
 
@@ -394,7 +437,7 @@ sentry__crashpad_backend_startup(
 }
 
 static void
-sentry__crashpad_backend_shutdown(sentry_backend_t *backend)
+crashpad_backend_shutdown(sentry_backend_t *backend)
 {
 #ifdef SENTRY_PLATFORM_LINUX
     // restore signal handlers to their default state
@@ -405,9 +448,7 @@ sentry__crashpad_backend_shutdown(sentry_backend_t *backend)
     }
 #endif
 
-    crashpad_state_t *data = (crashpad_state_t *)backend->data;
-    delete data->db;
-    data->db = nullptr;
+    crashpad_state_dtor(static_cast<crashpad_state_t *>(backend->data));
 
 #ifdef SENTRY_PLATFORM_LINUX
     g_signal_stack.ss_flags = SS_DISABLE;
@@ -418,10 +459,10 @@ sentry__crashpad_backend_shutdown(sentry_backend_t *backend)
 }
 
 static void
-sentry__crashpad_backend_add_breadcrumb(sentry_backend_t *backend,
+crashpad_backend_add_breadcrumb(sentry_backend_t *backend,
     sentry_value_t breadcrumb, const sentry_options_t *options)
 {
-    crashpad_state_t *data = (crashpad_state_t *)backend->data;
+    auto *data = static_cast<crashpad_state_t *>(backend->data);
 
     size_t max_breadcrumbs = options->max_breadcrumbs;
     if (!max_breadcrumbs) {
@@ -456,17 +497,18 @@ sentry__crashpad_backend_add_breadcrumb(sentry_backend_t *backend,
 }
 
 static void
-sentry__crashpad_backend_free(sentry_backend_t *backend)
+crashpad_backend_free(sentry_backend_t *backend)
 {
-    crashpad_state_t *data = (crashpad_state_t *)backend->data;
+    auto *data = static_cast<crashpad_state_t *>(backend->data);
     sentry__path_free(data->event_path);
     sentry__path_free(data->breadcrumb1_path);
     sentry__path_free(data->breadcrumb2_path);
+    sentry_value_decref(data->crash_event);
     sentry_free(data);
 }
 
 static void
-sentry__crashpad_backend_except(
+crashpad_backend_except(
     sentry_backend_t *UNUSED(backend), const sentry_ucontext_t *context)
 {
 #ifdef SENTRY_PLATFORM_WINDOWS
@@ -485,7 +527,7 @@ report_crash_time(
 {
     // we do a `+ 1` here, because crashpad timestamps are second resolution,
     // but our sessions are ms resolution. at least in our integration tests, we
-    // can have a session that starts at, eg. `0.471`, whereas the crashpad
+    // can have a session that starts at, e.g. `0.471`, whereas the crashpad
     // report will be `0`, which would mean our heuristic does not trigger due
     // to rounding.
     uint64_t time = ((uint64_t)report.creation_time + 1) * 1000;
@@ -495,9 +537,9 @@ report_crash_time(
 }
 
 static uint64_t
-sentry__crashpad_backend_last_crash(sentry_backend_t *backend)
+crashpad_backend_last_crash(sentry_backend_t *backend)
 {
-    crashpad_state_t *data = (crashpad_state_t *)backend->data;
+    auto *data = static_cast<crashpad_state_t *>(backend->data);
 
     uint64_t crash_time = 0;
 
@@ -513,9 +555,9 @@ sentry__crashpad_backend_last_crash(sentry_backend_t *backend)
 }
 
 static void
-sentry__crashpad_backend_prune_database(sentry_backend_t *backend)
+crashpad_backend_prune_database(sentry_backend_t *backend)
 {
-    crashpad_state_t *data = (crashpad_state_t *)backend->data;
+    auto *data = static_cast<crashpad_state_t *>(backend->data);
 
     // We want to eagerly clean up reports older than 2 days, and limit the
     // complete database to a maximum of 8M. That might still be a lot for
@@ -531,29 +573,29 @@ sentry__crashpad_backend_prune_database(sentry_backend_t *backend)
 sentry_backend_t *
 sentry__backend_new(void)
 {
-    sentry_backend_t *backend = SENTRY_MAKE(sentry_backend_t);
+    auto *backend = SENTRY_MAKE(sentry_backend_t);
     if (!backend) {
-        return NULL;
+        return nullptr;
     }
     memset(backend, 0, sizeof(sentry_backend_t));
 
-    crashpad_state_t *data = SENTRY_MAKE(crashpad_state_t);
+    auto *data = SENTRY_MAKE(crashpad_state_t);
     if (!data) {
         sentry_free(backend);
-        return NULL;
+        return nullptr;
     }
     memset(data, 0, sizeof(crashpad_state_t));
-
-    backend->startup_func = sentry__crashpad_backend_startup;
-    backend->shutdown_func = sentry__crashpad_backend_shutdown;
-    backend->except_func = sentry__crashpad_backend_except;
-    backend->free_func = sentry__crashpad_backend_free;
-    backend->flush_scope_func = sentry__crashpad_backend_flush_scope;
-    backend->add_breadcrumb_func = sentry__crashpad_backend_add_breadcrumb;
-    backend->user_consent_changed_func
-        = sentry__crashpad_backend_user_consent_changed;
-    backend->get_last_crash_func = sentry__crashpad_backend_last_crash;
-    backend->prune_database_func = sentry__crashpad_backend_prune_database;
+    data->crash_event = sentry_value_new_null();
+
+    backend->startup_func = crashpad_backend_startup;
+    backend->shutdown_func = crashpad_backend_shutdown;
+    backend->except_func = crashpad_backend_except;
+    backend->free_func = crashpad_backend_free;
+    backend->flush_scope_func = crashpad_backend_flush_scope;
+    backend->add_breadcrumb_func = crashpad_backend_add_breadcrumb;
+    backend->user_consent_changed_func = crashpad_backend_user_consent_changed;
+    backend->get_last_crash_func = crashpad_backend_last_crash;
+    backend->prune_database_func = crashpad_backend_prune_database;
     backend->data = data;
     backend->can_capture_after_shutdown = true;
 
diff --git a/external_imported/sentry-native/src/backends/sentry_backend_inproc.c b/external_imported/sentry-native/src/backends/sentry_backend_inproc.c
index 32887a033..a18b2944b 100644
--- a/external_imported/sentry-native/src/backends/sentry_backend_inproc.c
+++ b/external_imported/sentry-native/src/backends/sentry_backend_inproc.c
@@ -13,6 +13,31 @@
 #include "transports/sentry_disk_transport.h"
 #include <string.h>
 
+/**
+ * Android's bionic libc seems to allocate alternate signal handler stacks for
+ * every thread and also references them from their internal maintenance
+ * structs.
+ *
+ * The way we currently set up our sigaltstack seems to interfere with this
+ * setup and causes crashes whenever an ART signal handler touches the thread
+ * that called `sentry_init()`.
+ *
+ * In addition to this problem, it also means there is no need for our own
+ * sigaltstack on Android since our signal handler will always be running on
+ * an alternate stack managed by bionic.
+ *
+ * Note: In bionic the sigaltstacks for 32-bit devices have a size of 16KiB and
+ * on 64-bit devices they have 32KiB. The size of our own was set to 64KiB
+ * independent of the device. If this is a problem, we need figure out
+ * together with Google if there is a way in which our configs can coexist.
+ *
+ * Both breakpad and crashpad are way more defensive in the setup of their
+ * signal stacks and take existing stacks into account (or reuse them).
+ */
+#ifndef SENTRY_PLATFORM_ANDROID
+#    define SETUP_SIGALTSTACK
+#endif
+
 #define SIGNAL_DEF(Sig, Desc)                                                  \
     {                                                                          \
         Sig, #Sig, Desc                                                        \
@@ -32,8 +57,9 @@ struct signal_slot {
 #    define SIGNAL_STACK_SIZE 65536
 static struct sigaction g_sigaction;
 static struct sigaction g_previous_handlers[SIGNAL_COUNT];
+#    ifdef SETUP_SIGALTSTACK
 static stack_t g_signal_stack;
-
+#    endif
 static const struct signal_slot SIGNAL_DEFINITIONS[SIGNAL_COUNT] = {
     SIGNAL_DEF(SIGILL, "IllegalInstruction"),
     SIGNAL_DEF(SIGTRAP, "Trap"),
@@ -87,6 +113,7 @@ startup_inproc_backend(
     }
 
     // install our own signal handler
+#    ifdef SETUP_SIGALTSTACK
     g_signal_stack.ss_sp = sentry_malloc(SIGNAL_STACK_SIZE);
     if (!g_signal_stack.ss_sp) {
         return 1;
@@ -94,7 +121,7 @@ startup_inproc_backend(
     g_signal_stack.ss_size = SIGNAL_STACK_SIZE;
     g_signal_stack.ss_flags = 0;
     sigaltstack(&g_signal_stack, 0);
-
+#    endif
     sigemptyset(&g_sigaction.sa_mask);
     g_sigaction.sa_sigaction = handle_signal;
     g_sigaction.sa_flags = SA_SIGINFO | SA_ONSTACK;
@@ -107,10 +134,12 @@ startup_inproc_backend(
 static void
 shutdown_inproc_backend(sentry_backend_t *UNUSED(backend))
 {
+#    ifdef SETUP_SIGALTSTACK
     g_signal_stack.ss_flags = SS_DISABLE;
     sigaltstack(&g_signal_stack, 0);
     sentry_free(g_signal_stack.ss_sp);
     g_signal_stack.ss_sp = NULL;
+#    endif
     reset_signal_handlers();
 }
 
@@ -472,6 +501,8 @@ make_signal_event(
     void *backtrace[MAX_FRAMES];
     size_t frame_count
         = sentry_unwind_stack_from_ucontext(uctx, &backtrace[0], MAX_FRAMES);
+    SENTRY_TRACEF(
+        "captured backtrace from ucontext with %lu frames", frame_count);
     // if unwinding from a ucontext didn't yield any results, try again with a
     // direct unwind. this is most likely the case when using `libbacktrace`,
     // since that does not allow to unwind from a ucontext at all.
@@ -486,6 +517,14 @@ make_signal_event(
     sentry_value_t registers = sentry__registers_from_uctx(uctx);
     sentry_value_set_by_key(stacktrace, "registers", registers);
 
+#ifdef SENTRY_WITH_UNWINDER_LIBUNWINDSTACK
+    // libunwindstack already adjusts the PC according to `GetPcAdjustment()`
+    // https://github.com/getsentry/libunwindstack-ndk/blob/1929f7b601797fc8b2cac092d563b31d01d46a76/Regs.cpp#L187
+    // so there is no need to adjust the PC in the backend processing.
+    sentry_value_set_by_key(stacktrace, "instruction_addr_adjustment",
+        sentry_value_new_string("none"));
+#endif
+
     sentry_value_set_by_key(exc, "stacktrace", stacktrace);
     sentry_event_add_exception(event, exc);
 
diff --git a/external_imported/sentry-native/src/path/sentry_path_unix.c b/external_imported/sentry-native/src/path/sentry_path_unix.c
index d75a0eb8f..298913996 100644
--- a/external_imported/sentry-native/src/path/sentry_path_unix.c
+++ b/external_imported/sentry-native/src/path/sentry_path_unix.c
@@ -169,9 +169,9 @@ sentry__path_dir(const sentry_path_t *path)
 }
 
 sentry_path_t *
-sentry__path_from_str(const char *s)
+sentry__path_from_str_n(const char *s, size_t s_len)
 {
-    char *path = sentry__string_clone(s);
+    char *path = sentry__string_clone_n(s, s_len);
     if (!path) {
         return NULL;
     }
@@ -179,6 +179,12 @@ sentry__path_from_str(const char *s)
     return sentry__path_from_str_owned(path);
 }
 
+sentry_path_t *
+sentry__path_from_str(const char *s)
+{
+    return s ? sentry__path_from_str_n(s, strlen(s)) : NULL;
+}
+
 sentry_path_t *
 sentry__path_from_str_owned(char *s)
 {
diff --git a/external_imported/sentry-native/src/path/sentry_path_windows.c b/external_imported/sentry-native/src/path/sentry_path_windows.c
index ea2a7097e..b953af9a6 100644
--- a/external_imported/sentry-native/src/path/sentry_path_windows.c
+++ b/external_imported/sentry-native/src/path/sentry_path_windows.c
@@ -135,16 +135,28 @@ sentry__path_dir(const sentry_path_t *path)
 }
 
 sentry_path_t *
-sentry__path_from_wstr(const wchar_t *s)
+sentry__path_from_wstr_n(const wchar_t *s, size_t s_len)
 {
-    size_t len = wcslen(s) + 1;
-    sentry_path_t *rv = path_with_len(len);
+    if (!s) {
+        return NULL;
+    }
+    sentry_path_t *rv = path_with_len(s_len + 1);
     if (rv) {
-        memcpy(rv->path, s, len * sizeof(wchar_t));
+        memcpy(rv->path, s, s_len * sizeof(wchar_t));
+        rv->path[s_len] = 0;
     }
     return rv;
 }
 
+sentry_path_t *
+sentry__path_from_wstr(const wchar_t *s)
+{
+    if (!s) {
+        return NULL;
+    }
+    return sentry__path_from_wstr_n(s, wcslen(s));
+}
+
 sentry_path_t *
 sentry__path_join_wstr(const sentry_path_t *base, const wchar_t *other)
 {
@@ -189,20 +201,42 @@ sentry__path_join_wstr(const sentry_path_t *base, const wchar_t *other)
 }
 
 sentry_path_t *
-sentry__path_from_str(const char *s)
+sentry__path_from_str_n(const char *s, size_t s_len)
 {
-    size_t len = MultiByteToWideChar(CP_ACP, 0, s, -1, NULL, 0);
+    if (!s) {
+        return NULL;
+    }
     sentry_path_t *rv = SENTRY_MAKE(sentry_path_t);
     if (!rv) {
         return NULL;
     }
-    rv->path = sentry_malloc(sizeof(wchar_t) * len);
+    size_t src_size = sizeof(char) * s_len;
+    size_t dst_size = sizeof(wchar_t) * (s_len + 1);
+    rv->path = sentry_malloc(dst_size);
     if (!rv->path) {
-        sentry_free(rv);
-        return NULL;
+        goto error;
+    }
+    int conv_len = MultiByteToWideChar(
+        CP_ACP, 0, s, (int)src_size, rv->path, (int)s_len);
+    if (conv_len == 0) {
+        goto error;
     }
-    MultiByteToWideChar(CP_ACP, 0, s, -1, rv->path, (int)len);
+    rv->path[conv_len] = 0;
     return rv;
+
+error:
+    sentry_free(rv);
+    return NULL;
+}
+
+sentry_path_t *
+sentry__path_from_str(const char *s)
+{
+    if (!s) {
+        return NULL;
+    }
+
+    return sentry__path_from_str_n(s, strlen(s));
 }
 
 sentry_path_t *
diff --git a/external_imported/sentry-native/src/sentry_core.c b/external_imported/sentry-native/src/sentry_core.c
index b10d6065d..24cf52539 100644
--- a/external_imported/sentry-native/src/sentry_core.c
+++ b/external_imported/sentry-native/src/sentry_core.c
@@ -1,10 +1,8 @@
 #include "sentry_boot.h"
 
 #include <stdarg.h>
-#include <stdlib.h>
 #include <string.h>
 
-#include "sentry_alloc.h"
 #include "sentry_backend.h"
 #include "sentry_core.h"
 #include "sentry_database.h"
@@ -165,11 +163,16 @@ sentry_init(sentry_options_t *options)
     g_options = options;
 
     // *after* setting the global options, trigger a scope and consent flush,
-    // since at least crashpad needs that.
-    // the only way to get a reference to the scope is by locking it, the macro
-    // does all that at once, including invoking the backends scope flush hook
+    // since at least crashpad needs that. At this point we also freeze the
+    // `client_sdk` in the `scope` because some downstream SDKs want to override
+    // it at runtime via the options interface.
     SENTRY_WITH_SCOPE_MUT (scope) {
-        (void)scope;
+        if (options->sdk_name) {
+            sentry_value_t sdk_name
+                = sentry_value_new_string(options->sdk_name);
+            sentry_value_set_by_key(scope->client_sdk, "name", sdk_name);
+        }
+        sentry_value_freeze(scope->client_sdk);
     }
     if (backend && backend->user_consent_changed_func) {
         backend->user_consent_changed_func(backend);
@@ -289,29 +292,27 @@ set_user_consent(sentry_user_consent_t new_val)
 {
     SENTRY_WITH_OPTIONS (options) {
         if (sentry__atomic_store((long *)&options->user_consent, new_val)
-            == new_val) {
-            // nothing was changed
-            break; // SENTRY_WITH_OPTIONS
-        }
-
-        if (options->backend && options->backend->user_consent_changed_func) {
-            options->backend->user_consent_changed_func(options->backend);
-        }
+            != new_val) {
+            if (options->backend
+                && options->backend->user_consent_changed_func) {
+                options->backend->user_consent_changed_func(options->backend);
+            }
 
-        sentry_path_t *consent_path
-            = sentry__path_join_str(options->database_path, "user-consent");
-        switch (new_val) {
-        case SENTRY_USER_CONSENT_GIVEN:
-            sentry__path_write_buffer(consent_path, "1\n", 2);
-            break;
-        case SENTRY_USER_CONSENT_REVOKED:
-            sentry__path_write_buffer(consent_path, "0\n", 2);
-            break;
-        case SENTRY_USER_CONSENT_UNKNOWN:
-            sentry__path_remove(consent_path);
-            break;
+            sentry_path_t *consent_path
+                = sentry__path_join_str(options->database_path, "user-consent");
+            switch (new_val) {
+            case SENTRY_USER_CONSENT_GIVEN:
+                sentry__path_write_buffer(consent_path, "1\n", 2);
+                break;
+            case SENTRY_USER_CONSENT_REVOKED:
+                sentry__path_write_buffer(consent_path, "0\n", 2);
+                break;
+            case SENTRY_USER_CONSENT_UNKNOWN:
+                sentry__path_remove(consent_path);
+                break;
+            }
+            sentry__path_free(consent_path);
         }
-        sentry__path_free(consent_path);
     }
 }
 
@@ -640,6 +641,16 @@ sentry_set_tag(const char *key, const char *value)
     }
 }
 
+void
+sentry_set_tag_n(
+    const char *key, size_t key_len, const char *value, size_t value_len)
+{
+    SENTRY_WITH_SCOPE_MUT (scope) {
+        sentry_value_set_by_key_n(scope->tags, key, key_len,
+            sentry_value_new_string_n(value, value_len));
+    }
+}
+
 void
 sentry_remove_tag(const char *key)
 {
@@ -648,6 +659,14 @@ sentry_remove_tag(const char *key)
     }
 }
 
+void
+sentry_remove_tag_n(const char *key, size_t key_len)
+{
+    SENTRY_WITH_SCOPE_MUT (scope) {
+        sentry_value_remove_by_key_n(scope->tags, key, key_len);
+    }
+}
+
 void
 sentry_set_extra(const char *key, sentry_value_t value)
 {
@@ -656,6 +675,14 @@ sentry_set_extra(const char *key, sentry_value_t value)
     }
 }
 
+void
+sentry_set_extra_n(const char *key, size_t key_len, sentry_value_t value)
+{
+    SENTRY_WITH_SCOPE_MUT (scope) {
+        sentry_value_set_by_key_n(scope->extra, key, key_len, value);
+    }
+}
+
 void
 sentry_remove_extra(const char *key)
 {
@@ -664,6 +691,14 @@ sentry_remove_extra(const char *key)
     }
 }
 
+void
+sentry_remove_extra_n(const char *key, size_t key_len)
+{
+    SENTRY_WITH_SCOPE_MUT (scope) {
+        sentry_value_remove_by_key_n(scope->extra, key, key_len);
+    }
+}
+
 void
 sentry_set_context(const char *key, sentry_value_t value)
 {
@@ -672,6 +707,14 @@ sentry_set_context(const char *key, sentry_value_t value)
     }
 }
 
+void
+sentry_set_context_n(const char *key, size_t key_len, sentry_value_t value)
+{
+    SENTRY_WITH_SCOPE_MUT (scope) {
+        sentry_value_set_by_key_n(scope->contexts, key, key_len, value);
+    }
+}
+
 void
 sentry_remove_context(const char *key)
 {
@@ -680,6 +723,33 @@ sentry_remove_context(const char *key)
     }
 }
 
+void
+sentry_remove_context_n(const char *key, size_t key_len)
+{
+    SENTRY_WITH_SCOPE_MUT (scope) {
+        sentry_value_remove_by_key_n(scope->contexts, key, key_len);
+    }
+}
+
+void
+sentry_set_fingerprint_n(const char *fingerprint, size_t fingerprint_len, ...)
+{
+    sentry_value_t fingerprint_value = sentry_value_new_list();
+
+    va_list va;
+    va_start(va, fingerprint_len);
+    for (; fingerprint; fingerprint = va_arg(va, const char *)) {
+        sentry_value_append(fingerprint_value,
+            sentry_value_new_string_n(fingerprint, fingerprint_len));
+    }
+    va_end(va);
+
+    SENTRY_WITH_SCOPE_MUT (scope) {
+        sentry_value_decref(scope->fingerprint);
+        scope->fingerprint = fingerprint_value;
+    }
+}
+
 void
 sentry_set_fingerprint(const char *fingerprint, ...)
 {
@@ -696,7 +766,7 @@ sentry_set_fingerprint(const char *fingerprint, ...)
     SENTRY_WITH_SCOPE_MUT (scope) {
         sentry_value_decref(scope->fingerprint);
         scope->fingerprint = fingerprint_value;
-    };
+    }
 }
 
 void
@@ -705,7 +775,7 @@ sentry_remove_fingerprint(void)
     SENTRY_WITH_SCOPE_MUT (scope) {
         sentry_value_decref(scope->fingerprint);
         scope->fingerprint = sentry_value_new_null();
-    };
+    }
 }
 
 void
@@ -721,6 +791,21 @@ sentry_set_transaction(const char *transaction)
     }
 }
 
+void
+sentry_set_transaction_n(const char *transaction, size_t transaction_len)
+{
+    SENTRY_WITH_SCOPE_MUT (scope) {
+        sentry_free(scope->transaction);
+        scope->transaction
+            = sentry__string_clone_n(transaction, transaction_len);
+
+        if (scope->transaction_object) {
+            sentry_transaction_set_name_n(
+                scope->transaction_object, transaction, transaction_len);
+        }
+    }
+}
+
 void
 sentry_set_level(sentry_level_t level)
 {
@@ -870,8 +955,9 @@ sentry_set_span(sentry_span_t *span)
 }
 
 sentry_span_t *
-sentry_transaction_start_child(
-    sentry_transaction_t *opaque_parent, char *operation, char *description)
+sentry_transaction_start_child_n(sentry_transaction_t *opaque_parent,
+    const char *operation, size_t operation_len, const char *description,
+    size_t description_len)
 {
     if (!opaque_parent || sentry_value_is_null(opaque_parent->inner)) {
         SENTRY_DEBUG("no transaction available to create a child under");
@@ -886,14 +972,25 @@ sentry_transaction_start_child(
         max_spans = options->max_spans;
     }
 
-    sentry_value_t span
-        = sentry__value_span_new(max_spans, parent, operation, description);
+    sentry_value_t span = sentry__value_span_new_n(max_spans, parent,
+        (sentry_slice_t) { operation, operation_len },
+        (sentry_slice_t) { description, description_len });
     return sentry__span_new(opaque_parent, span);
 }
 
 sentry_span_t *
-sentry_span_start_child(
-    sentry_span_t *opaque_parent, char *operation, char *description)
+sentry_transaction_start_child(sentry_transaction_t *opaque_parent,
+    const char *operation, const char *description)
+{
+    const size_t operation_len = operation ? strlen(operation) : 0;
+    const size_t description_len = description ? strlen(description) : 0;
+    return sentry_transaction_start_child_n(
+        opaque_parent, operation, operation_len, description, description_len);
+}
+
+sentry_span_t *
+sentry_span_start_child_n(sentry_span_t *opaque_parent, const char *operation,
+    size_t operation_len, const char *description, size_t description_len)
 {
     if (!opaque_parent || sentry_value_is_null(opaque_parent->inner)) {
         SENTRY_DEBUG("no parent span available to create a child span under");
@@ -912,12 +1009,23 @@ sentry_span_start_child(
         max_spans = options->max_spans;
     }
 
-    sentry_value_t span
-        = sentry__value_span_new(max_spans, parent, operation, description);
+    sentry_value_t span = sentry__value_span_new_n(max_spans, parent,
+        (sentry_slice_t) { operation, operation_len },
+        (sentry_slice_t) { description, description_len });
 
     return sentry__span_new(opaque_parent->transaction, span);
 }
 
+sentry_span_t *
+sentry_span_start_child(sentry_span_t *opaque_parent, const char *operation,
+    const char *description)
+{
+    size_t operation_len = operation ? strlen(operation) : 0;
+    size_t description_len = description ? strlen(description) : 0;
+    return sentry_span_start_child_n(
+        opaque_parent, operation, operation_len, description, description_len);
+}
+
 void
 sentry_span_finish(sentry_span_t *opaque_span)
 {
@@ -1010,7 +1118,6 @@ sentry_span_finish(sentry_span_t *opaque_span)
 
 fail:
     sentry__span_decref(opaque_span);
-    return;
 }
 
 int
diff --git a/external_imported/sentry-native/src/sentry_envelope.c b/external_imported/sentry-native/src/sentry_envelope.c
index cfcf5af82..4b68a2787 100644
--- a/external_imported/sentry-native/src/sentry_envelope.c
+++ b/external_imported/sentry-native/src/sentry_envelope.c
@@ -322,7 +322,7 @@ sentry__envelope_add_from_buffer(sentry_envelope_t *envelope, const char *buf,
     // NOTE: function will check for the clone of `buf` internally and free it
     // on error
     return envelope_add_from_owned_buffer(
-        envelope, sentry__string_clonen(buf, buf_len), buf_len, type);
+        envelope, sentry__string_clone_n(buf, buf_len), buf_len, type);
 }
 
 sentry_envelope_item_t *
@@ -459,10 +459,13 @@ sentry_envelope_write_to_path(
 }
 
 int
-sentry_envelope_write_to_file(
-    const sentry_envelope_t *envelope, const char *path)
+sentry_envelope_write_to_file_n(
+    const sentry_envelope_t *envelope, const char *path, size_t path_len)
 {
-    sentry_path_t *path_obj = sentry__path_from_str(path);
+    if (!envelope || !path) {
+        return 1;
+    }
+    sentry_path_t *path_obj = sentry__path_from_str_n(path, path_len);
 
     int rv = sentry_envelope_write_to_path(envelope, path_obj);
 
@@ -471,6 +474,17 @@ sentry_envelope_write_to_file(
     return rv;
 }
 
+int
+sentry_envelope_write_to_file(
+    const sentry_envelope_t *envelope, const char *path)
+{
+    if (!envelope || !path) {
+        return 1;
+    }
+
+    return sentry_envelope_write_to_file_n(envelope, path, strlen(path));
+}
+
 #ifdef SENTRY_UNITTEST
 size_t
 sentry__envelope_get_item_count(const sentry_envelope_t *envelope)
diff --git a/external_imported/sentry-native/src/sentry_json.c b/external_imported/sentry-native/src/sentry_json.c
index cf02c7f1b..f83cd1886 100644
--- a/external_imported/sentry-native/src/sentry_json.c
+++ b/external_imported/sentry-native/src/sentry_json.c
@@ -471,8 +471,8 @@ tokens_to_value(jsmntok_t *tokens, size_t token_count, const char *buf,
         break;
     }
     case JSMN_STRING: {
-        char *string
-            = sentry__string_clonen(buf + root->start, root->end - root->start);
+        char *string = sentry__string_clone_n_unchecked(
+            buf + root->start, root->end - root->start);
         if (decode_string_inplace(string)) {
             rv = sentry__value_new_string_owned(string);
         } else {
@@ -492,7 +492,7 @@ tokens_to_value(jsmntok_t *tokens, size_t token_count, const char *buf,
             sentry_value_t child;
             NESTED_PARSE(&child);
 
-            char *key = sentry__string_clonen(
+            char *key = sentry__string_clone_n_unchecked(
                 buf + token->start, token->end - token->start);
             if (decode_string_inplace(key)) {
                 sentry_value_set_by_key(rv, key, child);
diff --git a/external_imported/sentry-native/src/sentry_options.c b/external_imported/sentry-native/src/sentry_options.c
index b0a6fe8aa..014ec491f 100644
--- a/external_imported/sentry-native/src/sentry_options.c
+++ b/external_imported/sentry-native/src/sentry_options.c
@@ -36,6 +36,7 @@ sentry_options_new(void)
     if (!opts->environment) {
         opts->environment = sentry__string_clone("production");
     }
+    sentry_options_set_sdk_name(opts, SENTRY_SDK_NAME);
     opts->max_breadcrumbs = SENTRY_BREADCRUMBS_MAX;
     opts->user_consent = SENTRY_USER_CONSENT_UNKNOWN;
     opts->auto_session_tracking = true;
@@ -84,6 +85,8 @@ sentry_options_free(sentry_options_t *opts)
     }
     sentry__dsn_decref(opts->dsn);
     sentry_free(opts->release);
+    sentry_free(opts->sdk_name);
+    sentry_free(opts->user_agent);
     sentry_free(opts->environment);
     sentry_free(opts->dist);
     sentry_free(opts->http_proxy);
@@ -130,6 +133,14 @@ sentry_options_set_on_crash(
     opts->on_crash_data = data;
 }
 
+void
+sentry_options_set_dsn_n(
+    sentry_options_t *opts, const char *raw_dsn, size_t raw_dsn_len)
+{
+    sentry__dsn_decref(opts->dsn);
+    opts->dsn = sentry__dsn_new_n(raw_dsn, raw_dsn_len);
+}
+
 void
 sentry_options_set_dsn(sentry_options_t *opts, const char *raw_dsn)
 {
@@ -160,6 +171,14 @@ sentry_options_get_sample_rate(const sentry_options_t *opts)
     return opts->sample_rate;
 }
 
+void
+sentry_options_set_release_n(
+    sentry_options_t *opts, const char *release, size_t release_len)
+{
+    sentry_free(opts->release);
+    opts->release = sentry__string_clone_n(release, release_len);
+}
+
 void
 sentry_options_set_release(sentry_options_t *opts, const char *release)
 {
@@ -173,6 +192,14 @@ sentry_options_get_release(const sentry_options_t *opts)
     return opts->release;
 }
 
+void
+sentry_options_set_environment_n(
+    sentry_options_t *opts, const char *environment, size_t environment_len)
+{
+    sentry_free(opts->environment);
+    opts->environment = sentry__string_clone_n(environment, environment_len);
+}
+
 void
 sentry_options_set_environment(sentry_options_t *opts, const char *environment)
 {
@@ -186,6 +213,14 @@ sentry_options_get_environment(const sentry_options_t *opts)
     return opts->environment;
 }
 
+void
+sentry_options_set_dist_n(
+    sentry_options_t *opts, const char *dist, size_t dist_len)
+{
+    sentry_free(opts->dist);
+    opts->dist = sentry__string_clone_n(dist, dist_len);
+}
+
 void
 sentry_options_set_dist(sentry_options_t *opts, const char *dist)
 {
@@ -199,6 +234,14 @@ sentry_options_get_dist(const sentry_options_t *opts)
     return opts->dist;
 }
 
+void
+sentry_options_set_http_proxy_n(
+    sentry_options_t *opts, const char *proxy, size_t proxy_len)
+{
+    sentry_free(opts->http_proxy);
+    opts->http_proxy = sentry__string_clone_n(proxy, proxy_len);
+}
+
 void
 sentry_options_set_http_proxy(sentry_options_t *opts, const char *proxy)
 {
@@ -219,6 +262,14 @@ sentry_options_set_ca_certs(sentry_options_t *opts, const char *path)
     opts->ca_certs = sentry__string_clone(path);
 }
 
+void
+sentry_options_set_ca_certs_n(
+    sentry_options_t *opts, const char *path, size_t path_len)
+{
+    sentry_free(opts->ca_certs);
+    opts->ca_certs = sentry__string_clone_n(path, path_len);
+}
+
 const char *
 sentry_options_get_ca_certs(const sentry_options_t *opts)
 {
@@ -233,12 +284,65 @@ sentry_options_set_transport_thread_name(
     opts->transport_thread_name = sentry__string_clone(name);
 }
 
+void
+sentry_options_set_transport_thread_name_n(
+    sentry_options_t *opts, const char *name, size_t name_len)
+{
+    sentry_free(opts->transport_thread_name);
+    opts->transport_thread_name = sentry__string_clone_n(name, name_len);
+}
+
 const char *
 sentry_options_get_transport_thread_name(const sentry_options_t *opts)
 {
     return opts->transport_thread_name;
 }
 
+int
+sentry_options_set_sdk_name(sentry_options_t *opts, const char *sdk_name)
+{
+    if (!opts || !sdk_name) {
+        return 1;
+    }
+    const size_t sdk_name_len = strlen(sdk_name);
+    return sentry_options_set_sdk_name_n(opts, sdk_name, sdk_name_len);
+}
+
+int
+sentry_options_set_sdk_name_n(
+    sentry_options_t *opts, const char *sdk_name, size_t sdk_name_len)
+{
+    if (!opts || !sdk_name) {
+        return 1;
+    }
+
+    sentry_free(opts->sdk_name);
+    opts->sdk_name = sentry__string_clone_n(sdk_name, sdk_name_len);
+
+    sentry_stringbuilder_t sb;
+    sentry__stringbuilder_init(&sb);
+    sentry__stringbuilder_append(&sb, opts->sdk_name);
+    sentry__stringbuilder_append(&sb, "/");
+    sentry__stringbuilder_append(&sb, SENTRY_SDK_VERSION);
+
+    sentry_free(opts->user_agent);
+    opts->user_agent = sentry__stringbuilder_into_string(&sb);
+
+    return 0;
+}
+
+const char *
+sentry_options_get_sdk_name(const sentry_options_t *opts)
+{
+    return opts->sdk_name;
+}
+
+const char *
+sentry_options_get_user_agent(const sentry_options_t *opts)
+{
+    return opts->user_agent;
+}
+
 void
 sentry_options_set_debug(sentry_options_t *opts, int debug)
 {
@@ -350,6 +454,13 @@ sentry_options_add_attachment(sentry_options_t *opts, const char *path)
     add_attachment(opts, sentry__path_from_str(path));
 }
 
+void
+sentry_options_add_attachment_n(
+    sentry_options_t *opts, const char *path, size_t path_len)
+{
+    add_attachment(opts, sentry__path_from_str_n(path, path_len));
+}
+
 void
 sentry_options_set_handler_path(sentry_options_t *opts, const char *path)
 {
@@ -357,6 +468,14 @@ sentry_options_set_handler_path(sentry_options_t *opts, const char *path)
     opts->handler_path = sentry__path_from_str(path);
 }
 
+void
+sentry_options_set_handler_path_n(
+    sentry_options_t *opts, const char *path, size_t path_len)
+{
+    sentry__path_free(opts->handler_path);
+    opts->handler_path = sentry__path_from_str_n(path, path_len);
+}
+
 void
 sentry_options_set_database_path(sentry_options_t *opts, const char *path)
 {
@@ -364,25 +483,57 @@ sentry_options_set_database_path(sentry_options_t *opts, const char *path)
     opts->database_path = sentry__path_from_str(path);
 }
 
+void
+sentry_options_set_database_path_n(
+    sentry_options_t *opts, const char *path, size_t path_len)
+{
+    sentry__path_free(opts->database_path);
+    opts->database_path = sentry__path_from_str_n(path, path_len);
+}
+
 #ifdef SENTRY_PLATFORM_WINDOWS
+void
+sentry_options_add_attachmentw_n(
+    sentry_options_t *opts, const wchar_t *path, size_t path_len)
+{
+    add_attachment(opts, sentry__path_from_wstr_n(path, path_len));
+}
+
 void
 sentry_options_add_attachmentw(sentry_options_t *opts, const wchar_t *path)
 {
-    add_attachment(opts, sentry__path_from_wstr(path));
+    size_t path_len = path ? wcslen(path) : 0;
+    sentry_options_add_attachmentw_n(opts, path, path_len);
 }
 
 void
-sentry_options_set_handler_pathw(sentry_options_t *opts, const wchar_t *path)
+sentry_options_set_handler_pathw_n(
+    sentry_options_t *opts, const wchar_t *path, size_t path_len)
 {
     sentry__path_free(opts->handler_path);
-    opts->handler_path = sentry__path_from_wstr(path);
+    opts->handler_path = sentry__path_from_wstr_n(path, path_len);
 }
 
 void
-sentry_options_set_database_pathw(sentry_options_t *opts, const wchar_t *path)
+sentry_options_set_handler_pathw(sentry_options_t *opts, const wchar_t *path)
+{
+    size_t path_len = path ? wcslen(path) : 0;
+    sentry_options_set_handler_pathw_n(opts, path, path_len);
+}
+
+void
+sentry_options_set_database_pathw_n(
+    sentry_options_t *opts, const wchar_t *path, size_t path_len)
 {
     sentry__path_free(opts->database_path);
-    opts->database_path = sentry__path_from_wstr(path);
+    opts->database_path = sentry__path_from_wstr_n(path, path_len);
+}
+
+void
+sentry_options_set_database_pathw(sentry_options_t *opts, const wchar_t *path)
+{
+    size_t path_len = path ? wcslen(path) : 0;
+    sentry_options_set_database_pathw_n(opts, path, path_len);
 }
 #endif
 
diff --git a/external_imported/sentry-native/src/sentry_options.h b/external_imported/sentry-native/src/sentry_options.h
index c6b3c10dc..060b17f70 100644
--- a/external_imported/sentry-native/src/sentry_options.h
+++ b/external_imported/sentry-native/src/sentry_options.h
@@ -38,6 +38,8 @@ typedef struct sentry_options_s {
     char *http_proxy;
     char *ca_certs;
     char *transport_thread_name;
+    char *sdk_name;
+    char *user_agent;
     sentry_path_t *database_path;
     sentry_path_t *handler_path;
     sentry_logger_t logger;
diff --git a/external_imported/sentry-native/src/sentry_path.h b/external_imported/sentry-native/src/sentry_path.h
index 8cedd1d21..02e42d5fe 100644
--- a/external_imported/sentry-native/src/sentry_path.h
+++ b/external_imported/sentry-native/src/sentry_path.h
@@ -53,6 +53,7 @@ sentry_path_t *sentry__path_dir(const sentry_path_t *path);
  * Create a new path from the given string.
  */
 sentry_path_t *sentry__path_from_str(const char *s);
+sentry_path_t *sentry__path_from_str_n(const char *s, size_t s_len);
 
 /**
  * Create a new path from the given string.
@@ -205,6 +206,7 @@ void sentry__filelock_free(sentry_filelock_t *lock);
  * Create a new path from a Wide String.
  */
 sentry_path_t *sentry__path_from_wstr(const wchar_t *s);
+sentry_path_t *sentry__path_from_wstr_n(const wchar_t *s, size_t s_len);
 
 /**
  * Create another path by appending a new path segment.
diff --git a/external_imported/sentry-native/src/sentry_scope.c b/external_imported/sentry-native/src/sentry_scope.c
index 0201a673b..ba246ab2e 100644
--- a/external_imported/sentry-native/src/sentry_scope.c
+++ b/external_imported/sentry-native/src/sentry_scope.c
@@ -29,8 +29,9 @@ get_client_sdk(void)
 {
     sentry_value_t client_sdk = sentry_value_new_object();
 
-    sentry_value_t name = sentry_value_new_string(SENTRY_SDK_NAME);
-    sentry_value_set_by_key(client_sdk, "name", name);
+    // the SDK is not initialized yet, fallback to build-time value
+    sentry_value_t sdk_name = sentry_value_new_string(SENTRY_SDK_NAME);
+    sentry_value_set_by_key(client_sdk, "name", sdk_name);
 
     sentry_value_t version = sentry_value_new_string(SENTRY_SDK_VERSION);
     sentry_value_set_by_key(client_sdk, "version", version);
@@ -54,7 +55,6 @@ get_client_sdk(void)
     sentry_value_set_by_key(client_sdk, "integrations", integrations);
 #endif
 
-    sentry_value_freeze(client_sdk);
     return client_sdk;
 }
 
diff --git a/external_imported/sentry-native/src/sentry_slice.c b/external_imported/sentry-native/src/sentry_slice.c
index 79894b7de..0f68311b2 100644
--- a/external_imported/sentry-native/src/sentry_slice.c
+++ b/external_imported/sentry-native/src/sentry_slice.c
@@ -15,7 +15,7 @@ sentry__slice_from_str(const char *str)
 char *
 sentry__slice_to_owned(sentry_slice_t slice)
 {
-    return sentry__string_clonen(slice.ptr, slice.len);
+    return sentry__string_clone_n_unchecked(slice.ptr, slice.len);
 }
 
 bool
diff --git a/external_imported/sentry-native/src/sentry_string.h b/external_imported/sentry-native/src/sentry_string.h
index 255d55d17..95e1e4f61 100644
--- a/external_imported/sentry-native/src/sentry_string.h
+++ b/external_imported/sentry-native/src/sentry_string.h
@@ -110,10 +110,11 @@ size_t sentry__stringbuilder_len(const sentry_stringbuilder_t *sb);
 void sentry__stringbuilder_set_len(sentry_stringbuilder_t *sb, size_t len);
 
 /**
- * Duplicates a zero terminated string with a length limit.
+ * Duplicates a zero terminated string with a length limit. Does not check
+ * if `str` is NULL.
  */
 static inline char *
-sentry__string_clonen(const char *str, size_t n)
+sentry__string_clone_n_unchecked(const char *str, size_t n)
 {
     size_t len = n + 1;
     char *rv = (char *)sentry_malloc(len);
@@ -124,13 +125,32 @@ sentry__string_clonen(const char *str, size_t n)
     return rv;
 }
 
+/**
+ * Duplicates a ptr/len string into a zero terminated string.
+ */
+static inline char *
+sentry__string_clone_n(const char *str, size_t n)
+{
+    return str ? sentry__string_clone_n_unchecked(str, n) : NULL;
+}
+
 /**
  * Duplicates a zero terminated string.
  */
 static inline char *
 sentry__string_clone(const char *str)
 {
-    return str ? sentry__string_clonen(str, strlen(str)) : NULL;
+    return str ? sentry__string_clone_n_unchecked(str, strlen(str)) : NULL;
+}
+
+static inline char *
+sentry__string_clone_max_n(const char *str, size_t str_len, size_t max_len)
+{
+    if (!str) {
+        return NULL;
+    }
+    size_t min_len = str_len < max_len ? str_len : max_len;
+    return sentry__string_clone_n_unchecked(str, min_len);
 }
 
 /**
diff --git a/external_imported/sentry-native/src/sentry_sync.c b/external_imported/sentry-native/src/sentry_sync.c
index 3e4c1940b..bcc44b374 100644
--- a/external_imported/sentry-native/src/sentry_sync.c
+++ b/external_imported/sentry-native/src/sentry_sync.c
@@ -21,7 +21,7 @@ typedef struct {
 #    pragma pack(pop)
 
 sentry_threadid_t
-sentry__thread_get_current_threadid()
+sentry__thread_get_current_threadid(void)
 {
     return GetCurrentThread();
 }
diff --git a/external_imported/sentry-native/src/sentry_sync.h b/external_imported/sentry-native/src/sentry_sync.h
index 0741c3070..73531235b 100644
--- a/external_imported/sentry-native/src/sentry_sync.h
+++ b/external_imported/sentry-native/src/sentry_sync.h
@@ -167,7 +167,10 @@ typedef HANDLE sentry_threadid_t;
 typedef struct sentry__winmutex_s sentry_mutex_t;
 #    define SENTRY__MUTEX_INIT                                                 \
         {                                                                      \
-            INIT_ONCE_STATIC_INIT, { 0 }                                       \
+            INIT_ONCE_STATIC_INIT,                                             \
+            {                                                                  \
+                0                                                              \
+            }                                                                  \
         }
 #    define sentry__mutex_init(Lock) sentry__winmutex_init(Lock)
 #    define sentry__mutex_lock(Lock) sentry__winmutex_lock(Lock)
diff --git a/external_imported/sentry-native/src/sentry_tracing.c b/external_imported/sentry-native/src/sentry_tracing.c
index 9b9139a17..b32c30496 100644
--- a/external_imported/sentry-native/src/sentry_tracing.c
+++ b/external_imported/sentry-native/src/sentry_tracing.c
@@ -1,17 +1,20 @@
 #include "sentry_tracing.h"
+#include "sentry.h"
 #include "sentry_alloc.h"
 #include "sentry_logger.h"
+#include "sentry_slice.h"
 #include "sentry_string.h"
 #include "sentry_utils.h"
 #include "sentry_value.h"
 #include <string.h>
 
 sentry_value_t
-sentry__value_new_span(sentry_value_t parent, const char *operation)
+sentry__value_new_span_n(sentry_value_t parent, sentry_slice_t operation)
 {
     sentry_value_t span = sentry_value_new_object();
 
-    sentry_value_set_by_key(span, "op", sentry_value_new_string(operation));
+    sentry_value_set_by_key(
+        span, "op", sentry_value_new_string_n(operation.ptr, operation.len));
 
     sentry_uuid_t span_id = sentry_uuid_new_v4();
     sentry_value_set_by_key(
@@ -32,30 +35,34 @@ sentry__value_new_span(sentry_value_t parent, const char *operation)
 }
 
 sentry_value_t
-sentry__value_transaction_context_new(const char *name, const char *operation)
+sentry__value_transaction_context_new_n(
+    sentry_slice_t name, sentry_slice_t operation)
 {
     sentry_value_t transaction_context
-        = sentry__value_new_span(sentry_value_new_null(), operation);
+        = sentry__value_new_span_n(sentry_value_new_null(), operation);
 
     sentry_uuid_t trace_id = sentry_uuid_new_v4();
     sentry_value_set_by_key(transaction_context, "trace_id",
         sentry__value_new_internal_uuid(&trace_id));
 
-    sentry_value_set_by_key(
-        transaction_context, "transaction", sentry_value_new_string(name));
+    sentry_value_set_by_key(transaction_context, "transaction",
+        sentry_value_new_string_n(name.ptr, name.len));
 
     return transaction_context;
 }
 
 sentry_transaction_context_t *
-sentry_transaction_context_new(const char *name, const char *operation)
+sentry_transaction_context_new_n(const char *name, size_t name_len,
+    const char *operation, size_t operation_len)
 {
     sentry_transaction_context_t *tx_cxt
         = SENTRY_MAKE(sentry_transaction_context_t);
     if (!tx_cxt) {
         return NULL;
     }
-    tx_cxt->inner = sentry__value_transaction_context_new(name, operation);
+    tx_cxt->inner = sentry__value_transaction_context_new_n(
+        (sentry_slice_t) { name, name_len },
+        (sentry_slice_t) { operation, operation_len });
 
     if (sentry_value_is_null(tx_cxt->inner)) {
         sentry_free(tx_cxt);
@@ -65,6 +72,16 @@ sentry_transaction_context_new(const char *name, const char *operation)
     return tx_cxt;
 }
 
+sentry_transaction_context_t *
+sentry_transaction_context_new(const char *name, const char *operation)
+{
+    size_t name_len = name ? strlen(name) : 0;
+    size_t operation_len = operation ? strlen(operation) : 0;
+
+    return sentry_transaction_context_new_n(
+        name, name_len, operation, operation_len);
+}
+
 void
 sentry__transaction_context_free(sentry_transaction_context_t *tx_cxt)
 {
@@ -76,7 +93,7 @@ sentry__transaction_context_free(sentry_transaction_context_t *tx_cxt)
         sentry_free(tx_cxt);
     } else {
         sentry_value_decref(tx_cxt->inner);
-    };
+    }
 }
 
 void
@@ -89,6 +106,16 @@ sentry_transaction_context_set_name(
     }
 }
 
+void
+sentry_transaction_context_set_name_n(
+    sentry_transaction_context_t *tx_cxt, const char *name, size_t name_len)
+{
+    if (tx_cxt) {
+        sentry_value_set_by_key(tx_cxt->inner, "transaction",
+            sentry_value_new_string_n(name, name_len));
+    }
+}
+
 void
 sentry_transaction_context_set_operation(
     sentry_transaction_context_t *tx_cxt, const char *operation)
@@ -99,6 +126,16 @@ sentry_transaction_context_set_operation(
     }
 }
 
+void
+sentry_transaction_context_set_operation_n(sentry_transaction_context_t *tx_cxt,
+    const char *operation, size_t operation_len)
+{
+    if (tx_cxt) {
+        sentry_value_set_by_key(tx_cxt->inner, "op",
+            sentry_value_new_string_n(operation, operation_len));
+    }
+}
+
 void
 sentry_transaction_context_set_sampled(
     sentry_transaction_context_t *tx_cxt, int sampled)
@@ -118,8 +155,9 @@ sentry_transaction_context_remove_sampled(sentry_transaction_context_t *tx_cxt)
 }
 
 void
-sentry_transaction_context_update_from_header(
-    sentry_transaction_context_t *tx_cxt, const char *key, const char *value)
+sentry_transaction_context_update_from_header_n(
+    sentry_transaction_context_t *tx_cxt, const char *key, size_t key_len,
+    const char *value, size_t value_len)
 {
     if (!tx_cxt) {
         return;
@@ -127,7 +165,11 @@ sentry_transaction_context_update_from_header(
 
     // do case-insensitive header key comparison
     const char sentry_trace[] = "sentry-trace";
-    for (size_t i = 0; i < sizeof(sentry_trace); i++) {
+    const size_t sentry_trace_len = sizeof(sentry_trace) - 1;
+    if (key_len != sentry_trace_len) {
+        return;
+    }
+    for (size_t i = 0; i < sentry_trace_len; i++) {
         if (tolower(key[i]) != sentry_trace[i]) {
             return;
         }
@@ -136,7 +178,7 @@ sentry_transaction_context_update_from_header(
     // https://develop.sentry.dev/sdk/performance/#header-sentry-trace
     // sentry-trace = traceid-spanid(-sampled)?
     const char *trace_id_start = value;
-    const char *trace_id_end = strchr(trace_id_start, '-');
+    const char *trace_id_end = memchr(trace_id_start, '-', value_len);
     if (!trace_id_end) {
         return;
     }
@@ -144,7 +186,7 @@ sentry_transaction_context_update_from_header(
     sentry_value_t inner = tx_cxt->inner;
 
     char *s
-        = sentry__string_clonen(trace_id_start, trace_id_end - trace_id_start);
+        = sentry__string_clone_n(trace_id_start, trace_id_end - trace_id_start);
     sentry_value_t trace_id = sentry__value_new_string_owned(s);
     sentry_value_set_by_key(inner, "trace_id", trace_id);
 
@@ -158,7 +200,7 @@ sentry_transaction_context_update_from_header(
     }
     // else: we have a sampled flag
 
-    s = sentry__string_clonen(span_id_start, span_id_end - span_id_start);
+    s = sentry__string_clone_n(span_id_start, span_id_end - span_id_start);
     sentry_value_t parent_span_id = sentry__value_new_string_owned(s);
     sentry_value_set_by_key(inner, "parent_span_id", parent_span_id);
 
@@ -166,6 +208,17 @@ sentry_transaction_context_update_from_header(
     sentry_value_set_by_key(inner, "sampled", sentry_value_new_bool(sampled));
 }
 
+void
+sentry_transaction_context_update_from_header(
+    sentry_transaction_context_t *tx_cxt, const char *key, const char *value)
+{
+    size_t key_len = key ? strlen(key) : 0;
+    size_t value_len = value ? strlen(value) : 0;
+
+    sentry_transaction_context_update_from_header_n(
+        tx_cxt, key, key_len, value, value_len);
+}
+
 sentry_transaction_t *
 sentry__transaction_new(sentry_value_t inner)
 {
@@ -203,7 +256,7 @@ sentry__transaction_decref(sentry_transaction_t *tx)
         sentry_free(tx);
     } else {
         sentry_value_decref(tx->inner);
-    };
+    }
 }
 
 void
@@ -227,7 +280,7 @@ sentry__span_decref(sentry_span_t *span)
         sentry_free(span);
     } else {
         sentry_value_decref(span->inner);
-    };
+    }
 }
 
 sentry_span_t *
@@ -251,8 +304,8 @@ sentry__span_new(sentry_transaction_t *tx, sentry_value_t inner)
 }
 
 sentry_value_t
-sentry__value_span_new(
-    size_t max_spans, sentry_value_t parent, char *operation, char *description)
+sentry__value_span_new_n(size_t max_spans, sentry_value_t parent,
+    sentry_slice_t operation, sentry_slice_t description)
 {
     if (!sentry_value_is_null(sentry_value_get_by_key(parent, "timestamp"))) {
         SENTRY_DEBUG("span's parent is already finished, not creating span");
@@ -269,9 +322,9 @@ sentry__value_span_new(
         goto fail;
     }
 
-    sentry_value_t child = sentry__value_new_span(parent, operation);
-    sentry_value_set_by_key(
-        child, "description", sentry_value_new_string(description));
+    sentry_value_t child = sentry__value_new_span_n(parent, operation);
+    sentry_value_set_by_key(child, "description",
+        sentry_value_new_string_n(description.ptr, description.len));
     sentry_value_set_by_key(child, "start_timestamp",
         sentry__value_new_string_owned(
             sentry__msec_time_to_iso8601(sentry__msec_time())));
@@ -281,6 +334,17 @@ sentry__value_span_new(
     return sentry_value_new_null();
 }
 
+sentry_value_t
+sentry__value_span_new(size_t max_spans, sentry_value_t parent,
+    const char *operation, const char *description)
+{
+    const size_t operation_len = operation ? strlen(operation) : 0;
+    const size_t description_len = description ? strlen(description) : 0;
+    return sentry__value_span_new_n(max_spans, parent,
+        (sentry_slice_t) { operation, operation_len },
+        (sentry_slice_t) { description, description_len });
+}
+
 sentry_value_t
 sentry__value_get_trace_context(sentry_value_t span)
 {
@@ -326,21 +390,37 @@ sentry_transaction_set_name(sentry_transaction_t *tx, const char *name)
     }
 }
 
+void
+sentry_transaction_set_name_n(
+    sentry_transaction_t *tx, const char *name, size_t name_len)
+{
+    if (tx) {
+        sentry_value_set_by_key(tx->inner, "transaction",
+            sentry_value_new_string_n(name, name_len));
+    }
+}
+
 static void
-set_tag(sentry_value_t item, const char *tag, const char *value)
+set_tag_n(sentry_value_t item, sentry_slice_t tag, sentry_slice_t value)
 {
     sentry_value_t tags = sentry_value_get_by_key(item, "tags");
     if (sentry_value_is_null(tags)) {
         tags = sentry_value_new_object();
         sentry_value_set_by_key(item, "tags", tags);
     }
+    char *s = sentry__string_clone_max_n(value.ptr, value.len, 200);
+    sentry_value_t tag_value
+        = s ? sentry__value_new_string_owned(s) : sentry_value_new_null();
+    sentry_value_set_by_key_n(tags, tag.ptr, tag.len, tag_value);
+}
 
-    char *s = sentry__string_clonen(value, 200);
-    if (s) {
-        sentry_value_set_by_key(tags, tag, sentry__value_new_string_owned(s));
-    } else {
-        sentry_value_set_by_key(tags, tag, sentry_value_new_null());
-    }
+static void
+set_tag(sentry_value_t item, const char *tag, const char *value)
+{
+    const size_t tag_len = tag ? strlen(tag) : 0;
+    const size_t value_len = value ? strlen(value) : 0;
+    set_tag_n(item, (sentry_slice_t) { tag, tag_len },
+        (sentry_slice_t) { value, value_len });
 }
 
 void
@@ -352,6 +432,16 @@ sentry_transaction_set_tag(
     }
 }
 
+void
+sentry_transaction_set_tag_n(sentry_transaction_t *tx, const char *tag,
+    size_t tag_len, const char *value, size_t value_len)
+{
+    if (tx) {
+        set_tag_n(tx->inner, (sentry_slice_t) { tag, tag_len },
+            (sentry_slice_t) { value, value_len });
+    }
+}
+
 void
 sentry_span_set_tag(sentry_span_t *span, const char *tag, const char *value)
 {
@@ -360,6 +450,16 @@ sentry_span_set_tag(sentry_span_t *span, const char *tag, const char *value)
     }
 }
 
+void
+sentry_span_set_tag_n(sentry_span_t *span, const char *tag, size_t tag_len,
+    const char *value, size_t value_len)
+{
+    if (span) {
+        set_tag_n(span->inner, (sentry_slice_t) { tag, tag_len },
+            (sentry_slice_t) { value, value_len });
+    }
+}
+
 static void
 remove_tag(sentry_value_t item, const char *tag)
 {
@@ -369,6 +469,15 @@ remove_tag(sentry_value_t item, const char *tag)
     }
 }
 
+static void
+remove_tag_n(sentry_value_t item, const char *tag, size_t tag_len)
+{
+    sentry_value_t tags = sentry_value_get_by_key(item, "tags");
+    if (!sentry_value_is_null(tags)) {
+        sentry_value_remove_by_key_n(tags, tag, tag_len);
+    }
+}
+
 void
 sentry_transaction_remove_tag(sentry_transaction_t *tx, const char *tag)
 {
@@ -377,6 +486,15 @@ sentry_transaction_remove_tag(sentry_transaction_t *tx, const char *tag)
     }
 }
 
+void
+sentry_transaction_remove_tag_n(
+    sentry_transaction_t *tx, const char *tag, size_t tag_len)
+{
+    if (tx) {
+        remove_tag_n(tx->inner, tag, tag_len);
+    }
+}
+
 void
 sentry_span_remove_tag(sentry_span_t *span, const char *tag)
 {
@@ -385,6 +503,14 @@ sentry_span_remove_tag(sentry_span_t *span, const char *tag)
     }
 }
 
+void
+sentry_span_remove_tag_n(sentry_span_t *span, const char *tag, size_t tag_len)
+{
+    if (span) {
+        remove_tag_n(span->inner, tag, tag_len);
+    }
+}
+
 static void
 set_data(sentry_value_t item, const char *key, sentry_value_t value)
 {
@@ -396,6 +522,18 @@ set_data(sentry_value_t item, const char *key, sentry_value_t value)
     sentry_value_set_by_key(data, key, value);
 }
 
+static void
+set_data_n(
+    sentry_value_t item, const char *key, size_t key_len, sentry_value_t value)
+{
+    sentry_value_t data = sentry_value_get_by_key(item, "data");
+    if (sentry_value_is_null(data)) {
+        data = sentry_value_new_object();
+        sentry_value_set_by_key(item, "data", data);
+    }
+    sentry_value_set_by_key_n(data, key, key_len, value);
+}
+
 void
 sentry_transaction_set_data(
     sentry_transaction_t *tx, const char *key, sentry_value_t value)
@@ -405,6 +543,15 @@ sentry_transaction_set_data(
     }
 }
 
+void
+sentry_transaction_set_data_n(sentry_transaction_t *tx, const char *key,
+    size_t key_len, sentry_value_t value)
+{
+    if (tx) {
+        set_data_n(tx->inner, key, key_len, value);
+    }
+}
+
 void
 sentry_span_set_data(sentry_span_t *span, const char *key, sentry_value_t value)
 {
@@ -413,6 +560,15 @@ sentry_span_set_data(sentry_span_t *span, const char *key, sentry_value_t value)
     }
 }
 
+void
+sentry_span_set_data_n(
+    sentry_span_t *span, const char *key, size_t key_len, sentry_value_t value)
+{
+    if (span) {
+        set_data_n(span->inner, key, key_len, value);
+    }
+}
+
 static void
 remove_data(sentry_value_t item, const char *key)
 {
@@ -422,6 +578,15 @@ remove_data(sentry_value_t item, const char *key)
     }
 }
 
+static void
+remove_data_n(sentry_value_t item, const char *key, size_t key_len)
+{
+    sentry_value_t data = sentry_value_get_by_key(item, "data");
+    if (!sentry_value_is_null(data)) {
+        sentry_value_remove_by_key_n(data, key, key_len);
+    }
+}
+
 void
 sentry_transaction_remove_data(sentry_transaction_t *tx, const char *key)
 {
@@ -430,6 +595,15 @@ sentry_transaction_remove_data(sentry_transaction_t *tx, const char *key)
     }
 }
 
+void
+sentry_transaction_remove_data_n(
+    sentry_transaction_t *tx, const char *key, size_t key_len)
+{
+    if (tx) {
+        remove_data_n(tx->inner, key, key_len);
+    }
+}
+
 void
 sentry_span_remove_data(sentry_span_t *span, const char *key)
 {
@@ -438,6 +612,14 @@ sentry_span_remove_data(sentry_span_t *span, const char *key)
     }
 }
 
+void
+sentry_span_remove_data_n(sentry_span_t *span, const char *key, size_t key_len)
+{
+    if (span) {
+        remove_data_n(span->inner, key, key_len);
+    }
+}
+
 sentry_value_t
 sentry_status_to_string(sentry_span_status_t status)
 {
@@ -481,7 +663,7 @@ sentry_status_to_string(sentry_span_status_t status)
     }
 }
 
-void
+static void
 set_status(sentry_value_t item, sentry_span_status_t status)
 {
     sentry_value_set_by_key(item, "status", sentry_status_to_string(status));
diff --git a/external_imported/sentry-native/src/sentry_tracing.h b/external_imported/sentry-native/src/sentry_tracing.h
index e04e5ee2f..d312b1cd4 100644
--- a/external_imported/sentry-native/src/sentry_tracing.h
+++ b/external_imported/sentry-native/src/sentry_tracing.h
@@ -1,6 +1,7 @@
 #ifndef SENTRY_TRACING_H_INCLUDED
 #define SENTRY_TRACING_H_INCLUDED
 
+#include "sentry_slice.h"
 #include "sentry_value.h"
 
 /**
@@ -36,7 +37,10 @@ void sentry__span_incref(sentry_span_t *span);
 void sentry__span_decref(sentry_span_t *span);
 
 sentry_value_t sentry__value_span_new(size_t max_spans, sentry_value_t parent,
-    char *operation, char *description);
+    const char *operation, const char *description);
+sentry_value_t sentry__value_span_new_n(size_t max_spans, sentry_value_t parent,
+    sentry_slice_t operation, sentry_slice_t description);
+
 sentry_span_t *sentry__span_new(
     sentry_transaction_t *parent_tx, sentry_value_t inner);
 
diff --git a/external_imported/sentry-native/src/sentry_transport.c b/external_imported/sentry-native/src/sentry_transport.c
index 4ff909e03..ea62c5620 100644
--- a/external_imported/sentry-native/src/sentry_transport.c
+++ b/external_imported/sentry-native/src/sentry_transport.c
@@ -150,7 +150,8 @@ sentry_transport_free(sentry_transport_t *transport)
 
 sentry_prepared_http_request_t *
 sentry__prepare_http_request(sentry_envelope_t *envelope,
-    const sentry_dsn_t *dsn, const sentry_rate_limiter_t *rl)
+    const sentry_dsn_t *dsn, const sentry_rate_limiter_t *rl,
+    const char *user_agent)
 {
     if (!dsn || !dsn->is_valid) {
         return NULL;
@@ -189,7 +190,7 @@ sentry__prepare_http_request(sentry_envelope_t *envelope,
     sentry_prepared_http_header_t *h;
     h = &req->headers[req->headers_len++];
     h->key = "x-sentry-auth";
-    h->value = sentry__dsn_get_auth_header(dsn);
+    h->value = sentry__dsn_get_auth_header(dsn, user_agent);
 
     h = &req->headers[req->headers_len++];
     h->key = "content-type";
diff --git a/external_imported/sentry-native/src/sentry_transport.h b/external_imported/sentry-native/src/sentry_transport.h
index f30788107..e29dc09f5 100644
--- a/external_imported/sentry-native/src/sentry_transport.h
+++ b/external_imported/sentry-native/src/sentry_transport.h
@@ -82,7 +82,7 @@ typedef struct sentry_prepared_http_request_s {
  */
 sentry_prepared_http_request_t *sentry__prepare_http_request(
     sentry_envelope_t *envelope, const sentry_dsn_t *dsn,
-    const sentry_rate_limiter_t *rl);
+    const sentry_rate_limiter_t *rl, const char *user_agent);
 
 /**
  * Free a previously allocated HTTP request.
diff --git a/external_imported/sentry-native/src/sentry_utils.c b/external_imported/sentry-native/src/sentry_utils.c
index dbafea811..45f32081e 100644
--- a/external_imported/sentry-native/src/sentry_utils.c
+++ b/external_imported/sentry-native/src/sentry_utils.c
@@ -4,7 +4,6 @@
 #include "sentry_boot.h"
 
 #include "sentry_alloc.h"
-#include "sentry_core.h"
 #include "sentry_string.h"
 #include "sentry_sync.h"
 #include "sentry_utils.h"
@@ -64,7 +63,7 @@ sentry__url_parse(sentry_url_t *url_out, const char *url)
     if (!tmp) {
         goto error;
     }
-    url_out->scheme = sentry__string_clonen(ptr, tmp - ptr);
+    url_out->scheme = sentry__string_clone_n_unchecked(ptr, tmp - ptr);
 
     if (!url_out->scheme || !is_scheme_valid(url_out->scheme)) {
         goto error;
@@ -97,13 +96,14 @@ sentry__url_parse(sentry_url_t *url_out, const char *url)
     tmp = ptr;
     if (has_username) {
         SKIP_WHILE_NOT2(tmp, '@', ':');
-        url_out->username = sentry__string_clonen(ptr, tmp - ptr);
+        url_out->username = sentry__string_clone_n_unchecked(ptr, tmp - ptr);
         ptr = tmp;
         if (*ptr == ':') {
             ptr++;
             tmp = ptr;
             SKIP_WHILE_NOT(tmp, '@');
-            url_out->password = sentry__string_clonen(ptr, tmp - ptr);
+            url_out->password
+                = sentry__string_clone_n_unchecked(ptr, tmp - ptr);
             ptr = tmp;
         }
         if (*ptr != '@') {
@@ -126,7 +126,7 @@ sentry__url_parse(sentry_url_t *url_out, const char *url)
         tmp++;
     }
 
-    url_out->host = sentry__string_clonen(ptr, tmp - ptr);
+    url_out->host = sentry__string_clone_n_unchecked(ptr, tmp - ptr);
 
     /* port */
     ptr = tmp;
@@ -134,7 +134,7 @@ sentry__url_parse(sentry_url_t *url_out, const char *url)
         ptr++;
         tmp = ptr;
         SKIP_WHILE_NOT(tmp, '/');
-        aux_buf = sentry__string_clonen(ptr, tmp - ptr);
+        aux_buf = sentry__string_clone_n_unchecked(ptr, tmp - ptr);
         char *end;
         url_out->port = (int)strtol(aux_buf, &end, 10);
         if (end != aux_buf + strlen(aux_buf)) {
@@ -157,7 +157,7 @@ sentry__url_parse(sentry_url_t *url_out, const char *url)
     /* path */
     tmp = ptr;
     SKIP_WHILE_NOT2(tmp, '#', '?');
-    url_out->path = sentry__string_clonen(ptr, tmp - ptr);
+    url_out->path = sentry__string_clone_n_unchecked(ptr, tmp - ptr);
     ptr = tmp;
 
     /* query */
@@ -165,7 +165,7 @@ sentry__url_parse(sentry_url_t *url_out, const char *url)
         ptr++;
         tmp = ptr;
         SKIP_WHILE_NOT(tmp, '#');
-        url_out->query = sentry__string_clonen(ptr, tmp - ptr);
+        url_out->query = sentry__string_clone_n_unchecked(ptr, tmp - ptr);
         ptr = tmp;
     }
 
@@ -174,7 +174,7 @@ sentry__url_parse(sentry_url_t *url_out, const char *url)
         ptr++;
         tmp = ptr;
         SKIP_WHILE_NOT(tmp, 0);
-        url_out->fragment = sentry__string_clonen(ptr, tmp - ptr);
+        url_out->fragment = sentry__string_clone_n_unchecked(ptr, tmp - ptr);
     }
 
     if (url_out->port == 0) {
@@ -213,7 +213,7 @@ sentry__url_cleanup(sentry_url_t *url)
 }
 
 sentry_dsn_t *
-sentry__dsn_new(const char *raw_dsn)
+sentry__dsn_new_n(const char *raw_dsn, size_t raw_dsn_len)
 {
     sentry_url_t url;
     memset(&url, 0, sizeof(sentry_url_t));
@@ -227,7 +227,7 @@ sentry__dsn_new(const char *raw_dsn)
     memset(dsn, 0, sizeof(sentry_dsn_t));
     dsn->refcount = 1;
 
-    dsn->raw = sentry__string_clone(raw_dsn);
+    dsn->raw = sentry__string_clone_n(raw_dsn, raw_dsn_len);
     if (!dsn->raw || !dsn->raw[0] || sentry__url_parse(&url, dsn->raw) != 0) {
         goto exit;
     }
@@ -274,6 +274,16 @@ sentry__dsn_new(const char *raw_dsn)
     return dsn;
 }
 
+sentry_dsn_t *
+sentry__dsn_new(const char *raw_dsn)
+{
+    if (!raw_dsn) {
+        return NULL;
+    }
+
+    return sentry__dsn_new_n(raw_dsn, strlen(raw_dsn));
+}
+
 sentry_dsn_t *
 sentry__dsn_incref(sentry_dsn_t *dsn)
 {
@@ -302,7 +312,7 @@ sentry__dsn_decref(sentry_dsn_t *dsn)
 }
 
 char *
-sentry__dsn_get_auth_header(const sentry_dsn_t *dsn)
+sentry__dsn_get_auth_header(const sentry_dsn_t *dsn, const char *user_agent)
 {
     if (!dsn || !dsn->is_valid) {
         return NULL;
@@ -311,8 +321,14 @@ sentry__dsn_get_auth_header(const sentry_dsn_t *dsn)
     sentry__stringbuilder_init(&sb);
     sentry__stringbuilder_append(&sb, "Sentry sentry_key=");
     sentry__stringbuilder_append(&sb, dsn->public_key);
-    sentry__stringbuilder_append(
-        &sb, ", sentry_version=7, sentry_client=" SENTRY_SDK_USER_AGENT);
+    sentry__stringbuilder_append(&sb, ", sentry_version=7");
+
+    sentry__stringbuilder_append(&sb, ", sentry_client=");
+    if (user_agent) {
+        sentry__stringbuilder_append(&sb, user_agent);
+    } else {
+        sentry__stringbuilder_append(&sb, SENTRY_SDK_USER_AGENT);
+    }
     return sentry__stringbuilder_into_string(&sb);
 }
 
@@ -343,15 +359,16 @@ sentry__dsn_get_envelope_url(const sentry_dsn_t *dsn)
 }
 
 char *
-sentry__dsn_get_minidump_url(const sentry_dsn_t *dsn)
+sentry__dsn_get_minidump_url(const sentry_dsn_t *dsn, const char *user_agent)
 {
-    if (!dsn || !dsn->is_valid) {
+    if (!dsn || !dsn->is_valid || !user_agent) {
         return NULL;
     }
     sentry_stringbuilder_t sb;
     init_string_builder_for_url(&sb, dsn);
-    sentry__stringbuilder_append(
-        &sb, "/minidump/?sentry_client=" SENTRY_SDK_USER_AGENT "&sentry_key=");
+    sentry__stringbuilder_append(&sb, "/minidump/?sentry_client=");
+    sentry__stringbuilder_append(&sb, user_agent);
+    sentry__stringbuilder_append(&sb, "&sentry_key=");
     sentry__stringbuilder_append(&sb, dsn->public_key);
     return sentry__stringbuilder_into_string(&sb);
 }
@@ -529,3 +546,20 @@ sentry__snprintf_c(char *buf, size_t buf_size, const char *fmt, ...)
     va_end(args);
     return rv;
 }
+
+bool
+sentry__check_min_version(sentry_version_t actual, sentry_version_t expected)
+{
+    if (actual.major < expected.major) {
+        return false;
+    }
+    if (actual.major == expected.major && actual.minor < expected.minor) {
+        return false;
+    }
+    if (actual.major == expected.major && actual.minor == expected.minor
+        && actual.patch < expected.patch) {
+        return false;
+    }
+
+    return true;
+}
diff --git a/external_imported/sentry-native/src/sentry_utils.h b/external_imported/sentry-native/src/sentry_utils.h
index 8b19e65c2..b5b8e9d3e 100644
--- a/external_imported/sentry-native/src/sentry_utils.h
+++ b/external_imported/sentry-native/src/sentry_utils.h
@@ -63,6 +63,7 @@ typedef struct sentry_dsn_s {
  * DSN has been successfully parsed.
  */
 sentry_dsn_t *sentry__dsn_new(const char *dsn);
+sentry_dsn_t *sentry__dsn_new_n(const char *dsn, size_t raw_dsn_len);
 
 /**
  * Increases the reference-count of the DSN.
@@ -79,7 +80,8 @@ void sentry__dsn_decref(sentry_dsn_t *dsn);
  * described here:
  * https://docs.sentry.io/development/sdk-dev/overview/#authentication
  */
-char *sentry__dsn_get_auth_header(const sentry_dsn_t *dsn);
+char *sentry__dsn_get_auth_header(
+    const sentry_dsn_t *dsn, const char *user_agent);
 
 /**
  * Returns the envelope endpoint url used for normal uploads as a newly
@@ -91,7 +93,8 @@ char *sentry__dsn_get_envelope_url(const sentry_dsn_t *dsn);
  * Returns the minidump endpoint url used for uploads done by the out-of-process
  * crashpad backend as a newly allocated string.
  */
-char *sentry__dsn_get_minidump_url(const sentry_dsn_t *dsn);
+char *sentry__dsn_get_minidump_url(
+    const sentry_dsn_t *dsn, const char *user_agent);
 
 /**
  * Returns the number of milliseconds since the unix epoch.
@@ -198,4 +201,20 @@ double sentry__strtod_c(const char *ptr, char **endptr);
  */
 int sentry__snprintf_c(char *buf, size_t buf_size, const char *fmt, ...);
 
+/**
+ * Represents a version of a software artifact.
+ */
+typedef struct {
+    unsigned int major;
+    unsigned int minor;
+    unsigned int patch;
+} sentry_version_t;
+
+/**
+ * Checks whether `actual` is the same or a later version than `expected`.
+ * Returns `true` if that is the case.
+ */
+bool sentry__check_min_version(
+    sentry_version_t actual, sentry_version_t expected);
+
 #endif
diff --git a/external_imported/sentry-native/src/sentry_uuid.c b/external_imported/sentry-native/src/sentry_uuid.c
index ad5e34999..bd1ee66da 100644
--- a/external_imported/sentry-native/src/sentry_uuid.c
+++ b/external_imported/sentry-native/src/sentry_uuid.c
@@ -25,13 +25,13 @@ sentry_uuid_new_v4(void)
 }
 
 sentry_uuid_t
-sentry_uuid_from_string(const char *str)
+sentry_uuid_from_string_n(const char *str, size_t str_len)
 {
     sentry_uuid_t rv;
     memset(&rv, 0, sizeof(rv));
 
     size_t i = 0;
-    size_t len = strlen(str);
+    size_t len = str_len;
     size_t pos = 0;
     bool is_nibble = true;
     char nibble = 0;
@@ -65,6 +65,12 @@ sentry_uuid_from_string(const char *str)
     return rv;
 }
 
+sentry_uuid_t
+sentry_uuid_from_string(const char *str)
+{
+    return str ? sentry_uuid_from_string_n(str, strlen(str))
+               : sentry_uuid_nil();
+}
 sentry_uuid_t
 sentry_uuid_from_bytes(const char bytes[16])
 {
diff --git a/external_imported/sentry-native/src/sentry_value.c b/external_imported/sentry-native/src/sentry_value.c
index 9d78efd9e..e46eb79f5 100644
--- a/external_imported/sentry-native/src/sentry_value.c
+++ b/external_imported/sentry-native/src/sentry_value.c
@@ -5,7 +5,6 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
-#include <time.h>
 
 #if defined(_MSC_VER)
 #    pragma warning(push)
@@ -21,6 +20,7 @@
 #include "sentry_alloc.h"
 #include "sentry_core.h"
 #include "sentry_json.h"
+#include "sentry_slice.h"
 #include "sentry_string.h"
 #include "sentry_sync.h"
 #include "sentry_utils.h"
@@ -320,15 +320,22 @@ sentry_value_new_bool(int value)
 }
 
 sentry_value_t
-sentry_value_new_string(const char *value)
+sentry_value_new_string_n(const char *value, size_t value_len)
 {
-    char *s = sentry__string_clone(value);
+    char *s = sentry__string_clone_n(value, value_len);
     if (!s) {
         return sentry_value_new_null();
     }
     return sentry__value_new_string_owned(s);
 }
 
+sentry_value_t
+sentry_value_new_string(const char *value)
+{
+    return value ? sentry_value_new_string_n(value, strlen(value))
+                 : sentry_value_new_null();
+}
+
 sentry_value_t
 sentry_value_new_list(void)
 {
@@ -440,8 +447,13 @@ sentry_value_get_type(sentry_value_t value)
 }
 
 int
-sentry_value_set_by_key(sentry_value_t value, const char *k, sentry_value_t v)
+sentry_value_set_by_key_n(
+    sentry_value_t value, const char *k, size_t k_len, sentry_value_t v)
 {
+    if (!k) {
+        goto fail;
+    }
+    sentry_slice_t k_slice = { k, k_len };
     thing_t *thing = value_as_unfrozen_thing(value);
     if (!thing || thing_get_type(thing) != THING_TYPE_OBJECT) {
         goto fail;
@@ -449,7 +461,7 @@ sentry_value_set_by_key(sentry_value_t value, const char *k, sentry_value_t v)
     obj_t *o = thing->payload._ptr;
     for (size_t i = 0; i < o->len; i++) {
         obj_pair_t *pair = &o->pairs[i];
-        if (sentry__string_eq(pair->k, k)) {
+        if (sentry__slice_eqs(k_slice, pair->k)) {
             sentry_value_decref(pair->v);
             pair->v = v;
             return 0;
@@ -462,7 +474,7 @@ sentry_value_set_by_key(sentry_value_t value, const char *k, sentry_value_t v)
     }
 
     obj_pair_t pair;
-    pair.k = sentry__string_clone(k);
+    pair.k = sentry__slice_to_owned(k_slice);
     if (!pair.k) {
         goto fail;
     }
@@ -476,8 +488,23 @@ sentry_value_set_by_key(sentry_value_t value, const char *k, sentry_value_t v)
 }
 
 int
-sentry_value_remove_by_key(sentry_value_t value, const char *k)
+sentry_value_set_by_key(sentry_value_t value, const char *k, sentry_value_t v)
 {
+    if (k) {
+        return sentry_value_set_by_key_n(value, k, strlen(k), v);
+    }
+
+    sentry_value_decref(v);
+    return 1;
+}
+
+int
+sentry_value_remove_by_key_n(sentry_value_t value, const char *k, size_t k_len)
+{
+    if (!k) {
+        return 1;
+    }
+    sentry_slice_t k_slice = { k, k_len };
     thing_t *thing = value_as_unfrozen_thing(value);
     if (!thing || thing_get_type(thing) != THING_TYPE_OBJECT) {
         return 1;
@@ -485,7 +512,7 @@ sentry_value_remove_by_key(sentry_value_t value, const char *k)
     obj_t *o = thing->payload._ptr;
     for (size_t i = 0; i < o->len; i++) {
         obj_pair_t *pair = &o->pairs[i];
-        if (sentry__string_eq(pair->k, k)) {
+        if (sentry__slice_eqs(k_slice, pair->k)) {
             sentry_free(pair->k);
             sentry_value_decref(pair->v);
             memmove(o->pairs + i, o->pairs + i + 1,
@@ -497,6 +524,16 @@ sentry_value_remove_by_key(sentry_value_t value, const char *k)
     return 1;
 }
 
+int
+sentry_value_remove_by_key(sentry_value_t value, const char *k)
+{
+    if (k) {
+        return sentry_value_remove_by_key_n(value, k, strlen(k));
+    }
+
+    return 1;
+}
+
 int
 sentry_value_append(sentry_value_t value, sentry_value_t v)
 {
@@ -684,14 +721,17 @@ sentry_value_remove_by_index(sentry_value_t value, size_t index)
 }
 
 sentry_value_t
-sentry_value_get_by_key(sentry_value_t value, const char *k)
+sentry_value_get_by_key_n(sentry_value_t value, const char *k, size_t k_len)
 {
+    if (!k) {
+        return sentry_value_new_null();
+    }
     const thing_t *thing = value_as_thing(value);
     if (thing && thing_get_type(thing) == THING_TYPE_OBJECT) {
         obj_t *o = thing->payload._ptr;
         for (size_t i = 0; i < o->len; i++) {
             obj_pair_t *pair = &o->pairs[i];
-            if (sentry__string_eq(pair->k, k)) {
+            if (sentry__slice_eqs((sentry_slice_t) { k, k_len }, pair->k)) {
                 return pair->v;
             }
         }
@@ -699,10 +739,30 @@ sentry_value_get_by_key(sentry_value_t value, const char *k)
     return sentry_value_new_null();
 }
 
+sentry_value_t
+sentry_value_get_by_key(sentry_value_t value, const char *k)
+{
+    const size_t k_len = k ? strlen(k) : 0;
+    return sentry_value_get_by_key_n(value, k, k_len);
+}
+
+sentry_value_t
+sentry_value_get_by_key_owned_n(
+    sentry_value_t value, const char *k, size_t k_len)
+{
+    sentry_value_t rv = sentry_value_get_by_key_n(value, k, k_len);
+    sentry_value_incref(rv);
+    return rv;
+}
+
 sentry_value_t
 sentry_value_get_by_key_owned(sentry_value_t value, const char *k)
 {
-    sentry_value_t rv = sentry_value_get_by_key(value, k);
+    if (k) {
+        return sentry_value_get_by_key_owned_n(value, k, strlen(k));
+    }
+
+    sentry_value_t rv = sentry_value_new_null();
     sentry_value_incref(rv);
     return rv;
 }
@@ -1069,52 +1129,90 @@ sentry_value_new_event(void)
 }
 
 sentry_value_t
-sentry_value_new_message_event(
-    sentry_level_t level, const char *logger, const char *text)
+sentry_value_new_message_event_n(sentry_level_t level, const char *logger,
+    size_t logger_len, const char *text, size_t text_len)
 {
     sentry_value_t rv = sentry_value_new_event();
     sentry_value_set_by_key(rv, "level", sentry__value_new_level(level));
     if (logger) {
-        sentry_value_set_by_key(rv, "logger", sentry_value_new_string(logger));
+        sentry_value_set_by_key(
+            rv, "logger", sentry_value_new_string_n(logger, logger_len));
     }
     if (text) {
         sentry_value_t container = sentry_value_new_object();
         sentry_value_set_by_key(
-            container, "formatted", sentry_value_new_string(text));
+            container, "formatted", sentry_value_new_string_n(text, text_len));
         sentry_value_set_by_key(rv, "message", container);
     }
     return rv;
 }
 
 sentry_value_t
-sentry_value_new_breadcrumb(const char *type, const char *message)
+sentry_value_new_message_event(
+    sentry_level_t level, const char *logger, const char *text)
 {
-    sentry_value_t rv = sentry_value_new_object();
-    sentry_value_set_by_key(rv, "timestamp",
+    size_t logger_len = logger ? strlen(logger) : 0;
+    size_t text_len = text ? strlen(text) : 0;
+    return sentry_value_new_message_event_n(
+        level, logger, logger_len, text, text_len);
+}
+
+static void
+timestamp_value(sentry_value_t value)
+{
+    sentry_value_set_by_key(value, "timestamp",
         sentry__value_new_string_owned(
             sentry__msec_time_to_iso8601(sentry__msec_time())));
+}
+
+sentry_value_t
+sentry_value_new_breadcrumb_n(
+    const char *type, size_t type_len, const char *message, size_t message_len)
+{
+    sentry_value_t rv = sentry_value_new_object();
+    timestamp_value(rv);
 
     if (type) {
-        sentry_value_set_by_key(rv, "type", sentry_value_new_string(type));
+        sentry_value_set_by_key(
+            rv, "type", sentry_value_new_string_n(type, type_len));
     }
     if (message) {
         sentry_value_set_by_key(
-            rv, "message", sentry_value_new_string(message));
+            rv, "message", sentry_value_new_string_n(message, message_len));
     }
     return rv;
 }
 
 sentry_value_t
-sentry_value_new_exception(const char *type, const char *value)
+sentry_value_new_breadcrumb(const char *type, const char *message)
+{
+    const size_t type_len = type ? strlen(type) : 0;
+    const size_t message_len = message ? strlen(message) : 0;
+    return sentry_value_new_breadcrumb_n(type, type_len, message, message_len);
+}
+
+sentry_value_t
+sentry_value_new_exception_n(
+    const char *type, size_t type_len, const char *value, size_t value_len)
 {
     sentry_value_t exc = sentry_value_new_object();
-    sentry_value_set_by_key(exc, "type", sentry_value_new_string(type));
-    sentry_value_set_by_key(exc, "value", sentry_value_new_string(value));
+    sentry_value_set_by_key(
+        exc, "type", sentry_value_new_string_n(type, type_len));
+    sentry_value_set_by_key(
+        exc, "value", sentry_value_new_string_n(value, value_len));
     return exc;
 }
 
 sentry_value_t
-sentry_value_new_thread(uint64_t id, const char *name)
+sentry_value_new_exception(const char *type, const char *value)
+{
+    const size_t type_len = type ? strlen(type) : 0;
+    const size_t value_len = value ? strlen(value) : 0;
+    return sentry_value_new_exception_n(type, type_len, value, value_len);
+}
+
+sentry_value_t
+sentry_value_new_thread_n(uint64_t id, const char *name, size_t name_len)
 {
     sentry_value_t thread = sentry_value_new_object();
 
@@ -1128,12 +1226,20 @@ sentry_value_new_thread(uint64_t id, const char *name)
     }
 
     if (name) {
-        sentry_value_set_by_key(thread, "name", sentry_value_new_string(name));
+        sentry_value_set_by_key(
+            thread, "name", sentry_value_new_string_n(name, name_len));
     }
 
     return thread;
 }
 
+sentry_value_t
+sentry_value_new_thread(uint64_t id, const char *name)
+{
+    const size_t name_len = name ? strlen(name) : 0;
+    return sentry_value_new_thread_n(id, name, name_len);
+}
+
 sentry_value_t
 sentry_value_new_stacktrace(void **ips, size_t len)
 {
diff --git a/external_imported/sentry-native/src/transports/sentry_transport_curl.c b/external_imported/sentry-native/src/transports/sentry_transport_curl.c
index 05efc6d0e..11f87e5d2 100644
--- a/external_imported/sentry-native/src/transports/sentry_transport_curl.c
+++ b/external_imported/sentry-native/src/transports/sentry_transport_curl.c
@@ -11,12 +11,12 @@
 
 #include <curl/curl.h>
 #include <curl/easy.h>
-#include <stdlib.h>
 #include <string.h>
 
 typedef struct curl_transport_state_s {
     sentry_dsn_t *dsn;
     CURL *curl_handle;
+    char *user_agent;
     char *http_proxy;
     char *ca_certs;
     sentry_rate_limiter_t *ratelimiter;
@@ -48,10 +48,12 @@ sentry__curl_bgworker_state_free(void *_state)
     curl_bgworker_state_t *state = _state;
     if (state->curl_handle) {
         curl_easy_cleanup(state->curl_handle);
+        curl_global_cleanup();
     }
     sentry__dsn_decref(state->dsn);
     sentry__rate_limiter_free(state->ratelimiter);
     sentry_free(state->ca_certs);
+    sentry_free(state->user_agent);
     sentry_free(state->http_proxy);
     sentry_free(state);
 }
@@ -67,6 +69,32 @@ sentry__curl_transport_start(
             SENTRY_WARNF("`curl_global_init` failed with code `%d`", (int)rv);
             return 1;
         }
+
+        curl_version_info_data *version_data
+            = curl_version_info(CURLVERSION_NOW);
+
+        if (!version_data) {
+            SENTRY_WARN("Failed to retrieve `curl_version_info`");
+            return 1;
+        }
+
+        sentry_version_t curl_version = {
+            .major = (version_data->version_num >> 16) & 0xff,
+            .minor = (version_data->version_num >> 8) & 0xff,
+            .patch = version_data->version_num & 0xff,
+        };
+
+        if (!sentry__check_min_version(
+                curl_version, (sentry_version_t) { 7, 10, 7 })) {
+            SENTRY_WARNF("`libcurl` is at unsupported version `%u.%u.%u`",
+                curl_version.major, curl_version.minor, curl_version.patch);
+            return 1;
+        }
+
+        if ((version_data->features & CURL_VERSION_ASYNCHDNS) == 0) {
+            SENTRY_WARN("`libcurl` was not compiled with feature `AsynchDNS`");
+            return 1;
+        }
     }
 
     sentry_bgworker_t *bgworker = (sentry_bgworker_t *)transport_state;
@@ -74,6 +102,7 @@ sentry__curl_transport_start(
 
     state->dsn = sentry__dsn_incref(options->dsn);
     state->http_proxy = sentry__string_clone(options->http_proxy);
+    state->user_agent = sentry__string_clone(options->user_agent);
     state->ca_certs = sentry__string_clone(options->ca_certs);
     state->curl_handle = curl_easy_init();
     state->debug = options->debug;
@@ -115,7 +144,7 @@ header_callback(char *buffer, size_t size, size_t nitems, void *userdata)
 {
     size_t bytes = size * nitems;
     struct header_info *info = userdata;
-    char *header = sentry__string_clonen(buffer, bytes);
+    char *header = sentry__string_clone_n(buffer, bytes);
     if (!header) {
         return bytes;
     }
@@ -142,7 +171,7 @@ sentry__curl_send_task(void *_envelope, void *_state)
     curl_bgworker_state_t *state = (curl_bgworker_state_t *)_state;
 
     sentry_prepared_http_request_t *req = sentry__prepare_http_request(
-        envelope, state->dsn, state->ratelimiter);
+        envelope, state->dsn, state->ratelimiter, state->user_agent);
     if (!req) {
         return;
     }
diff --git a/external_imported/sentry-native/src/transports/sentry_transport_winhttp.c b/external_imported/sentry-native/src/transports/sentry_transport_winhttp.c
index 9d509f23d..ffb114eb9 100644
--- a/external_imported/sentry-native/src/transports/sentry_transport_winhttp.c
+++ b/external_imported/sentry-native/src/transports/sentry_transport_winhttp.c
@@ -63,7 +63,7 @@ sentry__winhttp_transport_start(
     winhttp_bgworker_state_t *state = sentry__bgworker_get_state(bgworker);
 
     state->dsn = sentry__dsn_incref(opts->dsn);
-    state->user_agent = sentry__string_to_wstr(SENTRY_SDK_USER_AGENT);
+    state->user_agent = sentry__string_to_wstr(opts->user_agent);
     state->debug = opts->debug;
 
     sentry__bgworker_setname(bgworker, opts->transport_thread_name);
@@ -74,7 +74,7 @@ sentry__winhttp_transport_start(
         const char *ptr = opts->http_proxy + 7;
         const char *slash = strchr(ptr, '/');
         if (slash) {
-            char *copy = sentry__string_clonen(ptr, slash - ptr);
+            char *copy = sentry__string_clone_n(ptr, slash - ptr);
             state->proxy = sentry__string_to_wstr(copy);
             sentry_free(copy);
         } else {
@@ -152,9 +152,11 @@ sentry__winhttp_send_task(void *_envelope, void *_state)
 
     uint64_t started = sentry__monotonic_time();
 
+    char *user_agent = sentry__string_from_wstr(state->user_agent);
     sentry_prepared_http_request_t *req = sentry__prepare_http_request(
-        envelope, state->dsn, state->ratelimiter);
+        envelope, state->dsn, state->ratelimiter, user_agent);
     if (!req) {
+        sentry_free(user_agent);
         return;
     }
 
@@ -283,6 +285,7 @@ sentry__winhttp_send_task(void *_envelope, void *_state)
         state->request = NULL;
         WinHttpCloseHandle(request);
     }
+    sentry_free(user_agent);
     sentry_free(url);
     sentry_free(headers);
     sentry__prepared_http_request_free(req);
diff --git a/external_imported/sentry-native/tests/assertions.py b/external_imported/sentry-native/tests/assertions.py
index 934858cea..f12ec9972 100644
--- a/external_imported/sentry-native/tests/assertions.py
+++ b/external_imported/sentry-native/tests/assertions.py
@@ -1,13 +1,16 @@
-import datetime
 import email
 import gzip
 import platform
 import re
 import sys
+from dataclasses import dataclass
+from datetime import datetime
+
+import msgpack
 
 from .conditions import is_android
 
-VERSION_RE = re.compile(r"(\d+\.\d+\.\d+)(?:[-\.]?)(.*)")
+VERSION_RE = re.compile(r"(\d+\.\d+\.\d+)[-.]?(.*)")
 
 
 def matches(actual, expected):
@@ -55,9 +58,9 @@ def assert_meta(
     }
     expected_sdk = {
         "name": "sentry.native",
-        "version": "0.6.0",
+        "version": "0.7.0",
         "packages": [
-            {"name": "github:getsentry/sentry-native", "version": "0.6.0"},
+            {"name": "github:getsentry/sentry-native", "version": "0.7.0"},
         ],
     }
     if is_android:
@@ -95,7 +98,7 @@ def assert_meta(
             )
             assert event["contexts"]["os"]["build"] is not None
 
-    if sdk_override != None:
+    if sdk_override is not None:
         expected_sdk["name"] = sdk_override
 
     assert_matches(event, expected)
@@ -161,7 +164,7 @@ def assert_minidump(envelope):
     assert minidump.payload.bytes.startswith(b"MDMP")
 
 
-def assert_timestamp(ts, now=datetime.datetime.utcnow()):
+def assert_timestamp(ts, now=datetime.utcnow()):
     assert ts[:11] == now.isoformat()[:11]
 
 
@@ -176,6 +179,14 @@ def assert_event(envelope):
     assert_timestamp(event["timestamp"])
 
 
+def assert_breakpad_crash(envelope):
+    event = envelope.get_event()
+    expected = {
+        "level": "fatal",
+    }
+    assert_matches(event, expected)
+
+
 def assert_exception(envelope):
     event = envelope.get_event()
     exception = {
@@ -186,7 +197,7 @@ def assert_exception(envelope):
     assert_timestamp(event["timestamp"])
 
 
-def assert_crash(envelope):
+def assert_inproc_crash(envelope):
     event = envelope.get_event()
     assert_matches(event, {"level": "fatal"})
     # depending on the unwinder, we currently don’t get any stack frames from
@@ -213,16 +224,62 @@ def assert_no_before_send(envelope):
     assert ("adapted_by", "before_send") not in event.items()
 
 
+@dataclass(frozen=True)
+class CrashpadAttachments:
+    event: dict
+    breadcrumb1: list
+    breadcrumb2: list
+
+
+def _unpack_breadcrumbs(payload):
+    unpacker = msgpack.Unpacker()
+    unpacker.feed(payload)
+    return [unpacked for unpacked in unpacker]
+
+
+def _load_crashpad_attachments(msg):
+    event = {}
+    breadcrumb1 = []
+    breadcrumb2 = []
+    for part in msg.walk():
+        match part.get_filename():
+            case "__sentry-event":
+                event = msgpack.unpackb(part.get_payload(decode=True))
+            case "__sentry-breadcrumb1":
+                breadcrumb1 = _unpack_breadcrumbs(part.get_payload(decode=True))
+            case "__sentry-breadcrumb2":
+                breadcrumb2 = _unpack_breadcrumbs(part.get_payload(decode=True))
+
+    return CrashpadAttachments(event, breadcrumb1, breadcrumb2)
+
+
+def is_valid_timestamp(timestamp):
+    try:
+        datetime.fromisoformat(timestamp)
+        return True
+    except ValueError:
+        return False
+
+
+def _validate_breadcrumb_seq(seq, breadcrumb_func):
+    for i in seq:
+        breadcrumb = breadcrumb_func(i)
+        assert breadcrumb["message"] == str(i)
+        assert is_valid_timestamp(breadcrumb["timestamp"])
+
+
 def assert_crashpad_upload(req):
     multipart = gzip.decompress(req.get_data())
     msg = email.message_from_bytes(bytes(str(req.headers), encoding="utf8") + multipart)
-    files = [part.get_filename() for part in msg.walk()]
+    attachments = _load_crashpad_attachments(msg)
+
+    if len(attachments.breadcrumb1) > 3:
+        _validate_breadcrumb_seq(range(97), lambda i: attachments.breadcrumb1[3 + i])
+        _validate_breadcrumb_seq(
+            range(97, 101), lambda i: attachments.breadcrumb2[i - 97]
+        )
 
-    # TODO:
-    # Actually assert that we get a correct event/breadcrumbs payload
-    assert "__sentry-breadcrumb1" in files
-    assert "__sentry-breadcrumb2" in files
-    assert "__sentry-event" in files
+    assert attachments.event["level"] == "fatal"
 
     assert any(
         b'name="upload_file_minidump"' in part.as_bytes()
diff --git a/external_imported/sentry-native/tests/conftest.py b/external_imported/sentry-native/tests/conftest.py
index b2ba2e67a..c2f1383c7 100644
--- a/external_imported/sentry-native/tests/conftest.py
+++ b/external_imported/sentry-native/tests/conftest.py
@@ -43,3 +43,10 @@ def pytest_runtest_setup(item):
         "--with_crashpad_wer"
     ):
         pytest.skip("need --with_crashpad_wer to run this test")
+
+
+def pytest_configure(config):
+    config.addinivalue_line(
+        "markers",
+        "with_crashpad_wer: mark test to only run when WER testing is enabled",
+    )
diff --git a/external_imported/sentry-native/tests/leaks.txt b/external_imported/sentry-native/tests/leaks.txt
index 2ba3e9dc8..4ca4e4b68 100644
--- a/external_imported/sentry-native/tests/leaks.txt
+++ b/external_imported/sentry-native/tests/leaks.txt
@@ -3,3 +3,4 @@
 # Adding a manual `[paths release]` "fixes" the `crashpad_handler` leak, but leads to a use-after-free in sentry.
 # https://github.com/getsentry/crashpad/blob/9cd1a4dadb51b31665f5e50c5ffc25bb9d10571a/client/crash_report_database_mac.mm#L705
 leak:contentsOfDirectoryAtPath
+leak:SCDynamicStoreCopyProxiesWithOptions
diff --git a/external_imported/sentry-native/tests/requirements.txt b/external_imported/sentry-native/tests/requirements.txt
index dd2fd18e8..c90370ba0 100644
--- a/external_imported/sentry-native/tests/requirements.txt
+++ b/external_imported/sentry-native/tests/requirements.txt
@@ -1,3 +1,4 @@
-black==22.3.0
-pytest==6.2.5
-pytest-httpserver==1.0.1
+black==23.3.0
+pytest==7.4.0
+pytest-httpserver==1.0.8
+msgpack==1.0.5
diff --git a/external_imported/sentry-native/tests/test_integration_http.py b/external_imported/sentry-native/tests/test_integration_http.py
index b1a3f2210..ee915f00e 100644
--- a/external_imported/sentry-native/tests/test_integration_http.py
+++ b/external_imported/sentry-native/tests/test_integration_http.py
@@ -1,14 +1,12 @@
-import time
-import pytest
-import subprocess
-import sys
+import itertools
+import json
 import os
 import time
-import itertools
 import uuid
-import json
-from . import make_dsn, check_output, run, Envelope
-from .conditions import has_http, has_breakpad, has_files
+
+import pytest
+
+from . import make_dsn, run, Envelope
 from .assertions import (
     assert_attachment,
     assert_meta,
@@ -16,15 +14,17 @@
     assert_stacktrace,
     assert_event,
     assert_exception,
-    assert_crash,
+    assert_inproc_crash,
     assert_session,
     assert_minidump,
+    assert_breakpad_crash,
 )
+from .conditions import has_http, has_breakpad, has_files
 
 pytestmark = pytest.mark.skipif(not has_http, reason="tests need http")
 
 auth_header = (
-    "Sentry sentry_key=uiaeosnrtdy, sentry_version=7, sentry_client=sentry.native/0.6.0"
+    "Sentry sentry_key=uiaeosnrtdy, sentry_version=7, sentry_client=sentry.native/0.7.0"
 )
 
 
@@ -217,7 +217,7 @@ def test_inproc_crash_http(cmake, httpserver):
         ["log", "start-session", "attachment", "crash"],
         env=env,
     )
-    assert child.returncode  # well, its a crash after all
+    assert child.returncode  # well, it's a crash after all
 
     run(
         tmp_path,
@@ -236,7 +236,7 @@ def test_inproc_crash_http(cmake, httpserver):
     assert_breadcrumb(envelope)
     assert_attachment(envelope)
 
-    assert_crash(envelope)
+    assert_inproc_crash(envelope)
 
 
 def test_inproc_reinstall(cmake, httpserver):
@@ -254,7 +254,7 @@ def test_inproc_reinstall(cmake, httpserver):
         ["log", "reinstall", "crash"],
         env=env,
     )
-    assert child.returncode  # well, its a crash after all
+    assert child.returncode  # well, it's a crash after all
 
     run(
         tmp_path,
@@ -279,8 +279,7 @@ def test_inproc_dump_inflight(cmake, httpserver):
     child = run(
         tmp_path, "sentry_example", ["log", "capture-multiple", "crash"], env=env
     )
-    assert child.returncode  # well, its a crash after all
-
+    assert child.returncode  # well, it's a crash after all
     run(tmp_path, "sentry_example", ["log", "no-setup"], check=True, env=env)
 
     # we trigger 10 normal events, and 1 crash
@@ -303,7 +302,7 @@ def test_breakpad_crash_http(cmake, httpserver):
         ["log", "start-session", "attachment", "crash"],
         env=env,
     )
-    assert child.returncode  # well, its a crash after all
+    assert child.returncode  # well, it's a crash after all
 
     run(
         tmp_path,
@@ -322,6 +321,7 @@ def test_breakpad_crash_http(cmake, httpserver):
     assert_breadcrumb(envelope)
     assert_attachment(envelope)
 
+    assert_breakpad_crash(envelope)
     assert_minidump(envelope)
 
 
@@ -341,7 +341,7 @@ def test_breakpad_reinstall(cmake, httpserver):
         ["log", "reinstall", "crash"],
         env=env,
     )
-    assert child.returncode  # well, its a crash after all
+    assert child.returncode  # well, it's a crash after all
 
     run(
         tmp_path,
@@ -367,7 +367,7 @@ def test_breakpad_dump_inflight(cmake, httpserver):
     child = run(
         tmp_path, "sentry_example", ["log", "capture-multiple", "crash"], env=env
     )
-    assert child.returncode  # well, its a crash after all
+    assert child.returncode  # well, it's a crash after all
 
     run(tmp_path, "sentry_example", ["log", "no-setup"], check=True, env=env)
 
@@ -405,6 +405,7 @@ def delayed(req):
         env=env,
         check=True,
     )
+    assert child.returncode == 0
 
     httpserver.clear_all_handlers()
     httpserver.clear_log()
@@ -419,6 +420,9 @@ def delayed(req):
     assert len(httpserver.log) == 10
 
 
+RFC3339_FORMAT = "%Y-%m-%dT%H:%M:%S.%fZ"
+
+
 def test_transaction_only(cmake, httpserver):
     tmp_path = cmake(["sentry_example"], {"SENTRY_BACKEND": "none"})
 
@@ -450,10 +454,10 @@ def test_transaction_only(cmake, httpserver):
     (event,) = envelope.items
 
     assert event.headers["type"] == "transaction"
-    json = event.payload.json
+    payload = event.payload.json
 
     # See https://develop.sentry.dev/sdk/performance/trace-context/#trace-context
-    trace_context = json["contexts"]["trace"]
+    trace_context = payload["contexts"]["trace"]
 
     assert (
         trace_context["op"] == "Short and stout here is my handle and here is my spout"
@@ -469,8 +473,7 @@ def test_transaction_only(cmake, httpserver):
     assert trace_context["span_id"]
     assert trace_context["status"] == "ok"
 
-    RFC3339_FORMAT = "%Y-%m-%dT%H:%M:%S.%fZ"
-    start_timestamp = time.strptime(json["start_timestamp"], RFC3339_FORMAT)
+    start_timestamp = time.strptime(payload["start_timestamp"], RFC3339_FORMAT)
     assert start_timestamp
-    timestamp = time.strptime(json["timestamp"], RFC3339_FORMAT)
+    timestamp = time.strptime(payload["timestamp"], RFC3339_FORMAT)
     assert timestamp >= start_timestamp
diff --git a/external_imported/sentry-native/tests/test_integration_stdout.py b/external_imported/sentry-native/tests/test_integration_stdout.py
index ecb2c6f95..e44a90ead 100644
--- a/external_imported/sentry-native/tests/test_integration_stdout.py
+++ b/external_imported/sentry-native/tests/test_integration_stdout.py
@@ -12,12 +12,12 @@
     assert_breadcrumb,
     assert_stacktrace,
     assert_event,
-    assert_crash,
+    assert_inproc_crash,
     assert_minidump,
-    assert_timestamp,
     assert_before_send,
     assert_no_before_send,
     assert_crash_timestamp,
+    assert_breakpad_crash,
 )
 from .conditions import has_breakpad, has_files
 
@@ -46,6 +46,26 @@ def test_capture_stdout(cmake):
     assert_event(envelope)
 
 
+def test_dynamic_sdk_name_override(cmake):
+    tmp_path = cmake(
+        ["sentry_example"],
+        {
+            "SENTRY_BACKEND": "none",
+            "SENTRY_TRANSPORT": "none",
+        },
+    )
+
+    output = check_output(
+        tmp_path,
+        "sentry_example",
+        ["stdout", "override-sdk-name", "capture-event"],
+    )
+    envelope = Envelope.deserialize(output)
+
+    assert_meta(envelope, sdk_override="sentry.native.android.flutter")
+    assert_event(envelope)
+
+
 def test_sdk_name_override(cmake):
     sdk_name = "cUsToM.SDK"
     tmp_path = cmake(
@@ -92,9 +112,9 @@ def test_multi_process(cmake):
 
     # while the processes are running, we expect two runs
     runs = [
-        run
-        for run in os.listdir(os.path.join(cwd, ".sentry-native"))
-        if run.endswith(".run")
+        db_run
+        for db_run in os.listdir(os.path.join(cwd, ".sentry-native"))
+        if db_run.endswith(".run")
     ]
     assert len(runs) == 2
 
@@ -108,9 +128,9 @@ def test_multi_process(cmake):
     subprocess.run([cmd], cwd=cwd)
 
     runs = [
-        run
-        for run in os.listdir(os.path.join(cwd, ".sentry-native"))
-        if run.endswith(".run") or run.endswith(".lock")
+        db_run
+        for db_run in os.listdir(os.path.join(cwd, ".sentry-native"))
+        if db_run.endswith(".run") or db_run.endswith(".lock")
     ]
     assert len(runs) == 0
 
@@ -136,7 +156,7 @@ def test_inproc_crash_stdout(cmake):
     assert_meta(envelope, integration="inproc")
     assert_breadcrumb(envelope)
     assert_attachment(envelope)
-    assert_crash(envelope)
+    assert_inproc_crash(envelope)
 
 
 def test_inproc_crash_stdout_before_send(cmake):
@@ -148,7 +168,7 @@ def test_inproc_crash_stdout_before_send(cmake):
     assert_meta(envelope, integration="inproc")
     assert_breadcrumb(envelope)
     assert_attachment(envelope)
-    assert_crash(envelope)
+    assert_inproc_crash(envelope)
     assert_before_send(envelope)
 
 
@@ -175,7 +195,7 @@ def test_inproc_crash_stdout_before_send_and_on_crash(cmake):
     assert_meta(envelope, integration="inproc")
     assert_breadcrumb(envelope)
     assert_attachment(envelope)
-    assert_crash(envelope)
+    assert_inproc_crash(envelope)
 
 
 @pytest.mark.skipif(not has_breakpad, reason="test needs breakpad backend")
@@ -189,6 +209,7 @@ def test_breakpad_crash_stdout(cmake):
     assert_breadcrumb(envelope)
     assert_attachment(envelope)
     assert_minidump(envelope)
+    assert_breakpad_crash(envelope)
 
 
 @pytest.mark.skipif(not has_breakpad, reason="test needs breakpad backend")
@@ -203,6 +224,7 @@ def test_breakpad_crash_stdout_before_send(cmake):
     assert_attachment(envelope)
     assert_minidump(envelope)
     assert_before_send(envelope)
+    assert_breakpad_crash(envelope)
 
 
 @pytest.mark.skipif(not has_breakpad, reason="test needs breakpad backend")
@@ -230,3 +252,4 @@ def test_breakpad_crash_stdout_before_send_and_on_crash(cmake):
     assert_meta(envelope, integration="breakpad")
     assert_breadcrumb(envelope)
     assert_attachment(envelope)
+    assert_breakpad_crash(envelope)
diff --git a/external_imported/sentry-native/tests/unit/CMakeLists.txt b/external_imported/sentry-native/tests/unit/CMakeLists.txt
index 93acedf27..840c85561 100644
--- a/external_imported/sentry-native/tests/unit/CMakeLists.txt
+++ b/external_imported/sentry-native/tests/unit/CMakeLists.txt
@@ -28,6 +28,7 @@ add_executable(sentry_test_unit
 	test_logger.c
 	test_modulefinder.c
 	test_mpack.c
+	test_options.c
 	test_path.c
 	test_ratelimiter.c
 	test_sampling.c
diff --git a/external_imported/sentry-native/tests/unit/sentry_testsupport.h b/external_imported/sentry-native/tests/unit/sentry_testsupport.h
index 81927db1b..bd6f112a7 100644
--- a/external_imported/sentry-native/tests/unit/sentry_testsupport.h
+++ b/external_imported/sentry-native/tests/unit/sentry_testsupport.h
@@ -23,6 +23,13 @@
         TEST_MSG("Received: %s", Val);                                         \
     } while (0)
 
+#define TEST_CHECK_WSTRING_EQUAL(Val, ReferenceVal)                            \
+    do {                                                                       \
+        TEST_CHECK(wcscmp(Val, ReferenceVal) == 0);                            \
+        TEST_MSG("Expected: %s", ReferenceVal);                                \
+        TEST_MSG("Received: %s", Val);                                         \
+    } while (0)
+
 #define TEST_CHECK_JSON_VALUE(Val, ReferenceJson)                              \
     do {                                                                       \
         char *json = sentry_value_to_json(Val);                                \
diff --git a/external_imported/sentry-native/tests/unit/test_attachments.c b/external_imported/sentry-native/tests/unit/test_attachments.c
index bd4d2d065..62dcf0af7 100644
--- a/external_imported/sentry-native/tests/unit/test_attachments.c
+++ b/external_imported/sentry-native/tests/unit/test_attachments.c
@@ -35,7 +35,8 @@ SENTRY_TEST(lazy_attachments)
     sentry_options_set_transport(options,
         sentry_new_function_transport(
             send_envelope_test_attachments, &testdata));
-    sentry_options_set_release(options, "prod");
+    char rel[] = { 't', 'e', 's', 't' };
+    sentry_options_set_release_n(options, rel, sizeof(rel));
 
     sentry_options_add_attachment(options, PREFIX ".existing-file-attachment");
     sentry_options_add_attachment(
@@ -53,6 +54,7 @@ SENTRY_TEST(lazy_attachments)
 
     char *serialized
         = sentry_stringbuilder_take_string(&testdata.serialized_envelope);
+    TEST_CHECK(strstr(serialized, "\"release\":\"test\"") != NULL);
     TEST_CHECK(strstr(serialized,
                    "{\"type\":\"attachment\",\"length\":3,"
                    "\"filename\":\".existing-file-attachment\"}\n"
diff --git a/external_imported/sentry-native/tests/unit/test_basic.c b/external_imported/sentry-native/tests/unit/test_basic.c
index d8a51e461..fc508bbd2 100644
--- a/external_imported/sentry-native/tests/unit/test_basic.c
+++ b/external_imported/sentry-native/tests/unit/test_basic.c
@@ -176,14 +176,19 @@ SENTRY_TEST(crashed_last_run)
     TEST_CHECK_INT_EQUAL(sentry_get_crashed_last_run(), -1);
 
     options = sentry_options_new();
-    sentry_options_set_dsn(options, "https://foo@sentry.invalid/42");
+    const char *dsn_str = "https://foo@sentry.invalid/42";
+    const char dsn[] = { 'h', 't', 't', 'p', 's', ':', '/', '/', 'f', 'o', 'o',
+        '@', 's', 'e', 'n', 't', 'r', 'y', '.', 'i', 'n', 'v', 'a', 'l', 'i',
+        'd', '/', '4', '2' };
+    sentry_options_set_dsn_n(options, dsn, sizeof(dsn));
+    TEST_CHECK_STRING_EQUAL(sentry_options_get_dsn(options), dsn_str);
     TEST_CHECK_INT_EQUAL(sentry_init(options), 0);
     sentry_close();
 
     TEST_CHECK_INT_EQUAL(sentry_get_crashed_last_run(), 0);
 
     options = sentry_options_new();
-    sentry_options_set_dsn(options, "https://foo@sentry.invalid/42");
+    sentry_options_set_dsn_n(options, dsn, sizeof(dsn));
 
     // simulate a crash
     TEST_CHECK(sentry__write_crash_marker(options));
@@ -201,7 +206,7 @@ SENTRY_TEST(crashed_last_run)
     TEST_CHECK_INT_EQUAL(sentry_get_crashed_last_run(), 1);
 
     options = sentry_options_new();
-    sentry_options_set_dsn(options, "https://foo@sentry.invalid/42");
+    sentry_options_set_dsn_n(options, dsn, sizeof(dsn));
     TEST_CHECK_INT_EQUAL(sentry_init(options), 0);
     sentry_close();
 
diff --git a/external_imported/sentry-native/tests/unit/test_concurrency.c b/external_imported/sentry-native/tests/unit/test_concurrency.c
index 946081dba..47fc691a9 100644
--- a/external_imported/sentry-native/tests/unit/test_concurrency.c
+++ b/external_imported/sentry-native/tests/unit/test_concurrency.c
@@ -43,7 +43,7 @@ SENTRY_TEST(multiple_inits)
         SENTRY_LEVEL_INFO, "root", "Hello World!"));
 
     sentry_value_t obj = sentry_value_new_object();
-    // something that is not a uuid, as this will be forcibly changed
+    // something that is not a UUID, as this will be forcibly changed
     sentry_value_set_by_key(obj, "event_id", sentry_value_new_int32(1234));
     sentry_capture_event(obj);
 
@@ -64,7 +64,7 @@ thread_worker(void *called)
         SENTRY_LEVEL_INFO, "root", "Hello World!"));
 
     sentry_value_t obj = sentry_value_new_object();
-    // something that is not a uuid, as this will be forcibly changed
+    // something that is not a UUID, as this will be forcibly changed
     sentry_value_set_by_key(obj, "event_id", sentry_value_new_int32(1234));
     sentry_capture_event(obj);
 
@@ -75,7 +75,7 @@ SENTRY_TEST(concurrent_init)
 {
     long called = 0;
 
-#define THREADS_NUM 10
+#define THREADS_NUM 100
     sentry_threadid_t threads[THREADS_NUM];
 
     for (size_t i = 0; i < THREADS_NUM; i++) {
diff --git a/external_imported/sentry-native/tests/unit/test_consent.c b/external_imported/sentry-native/tests/unit/test_consent.c
index f26af345b..d81476c27 100644
--- a/external_imported/sentry-native/tests/unit/test_consent.c
+++ b/external_imported/sentry-native/tests/unit/test_consent.c
@@ -28,6 +28,10 @@ SENTRY_TEST(basic_consent_tracking)
 
     init_consenting_sentry();
     sentry_user_consent_give();
+    // testing correct options ref/decref during double
+    // `sentry_user_consent_give` call see
+    // https://github.com/getsentry/sentry-native/pull/922
+    sentry_user_consent_give();
     TEST_CHECK_INT_EQUAL(sentry_user_consent_get(), SENTRY_USER_CONSENT_GIVEN);
     sentry_close();
     init_consenting_sentry();
diff --git a/external_imported/sentry-native/tests/unit/test_envelopes.c b/external_imported/sentry-native/tests/unit/test_envelopes.c
index 2e6128a9c..7be59db4a 100644
--- a/external_imported/sentry-native/tests/unit/test_envelopes.c
+++ b/external_imported/sentry-native/tests/unit/test_envelopes.c
@@ -1,9 +1,21 @@
 #include "sentry_envelope.h"
+#include "sentry_path.h"
 #include "sentry_testsupport.h"
 #include "sentry_transport.h"
 #include "sentry_utils.h"
 #include "sentry_value.h"
 
+static char *const SERIALIZED_ENVELOPE_STR
+    = "{\"dsn\":\"https://foo@sentry.invalid/42\","
+      "\"event_id\":\"c993afb6-b4ac-48a6-b61b-2558e601d65d\"}\n"
+      "{\"type\":\"event\",\"length\":71}\n"
+      "{\"event_id\":\"c993afb6-b4ac-48a6-b61b-2558e601d65d\",\"some-"
+      "context\":null}\n"
+      "{\"type\":\"minidump\",\"length\":4}\n"
+      "MDMP\n"
+      "{\"type\":\"attachment\",\"length\":12}\n"
+      "Hello World!";
+
 SENTRY_TEST(basic_http_request_preparation_for_event)
 {
     sentry_dsn_t *dsn = sentry__dsn_new("https://foo@sentry.invalid/42");
@@ -17,7 +29,7 @@ SENTRY_TEST(basic_http_request_preparation_for_event)
     sentry__envelope_add_event(envelope, event);
 
     sentry_prepared_http_request_t *req
-        = sentry__prepare_http_request(envelope, dsn, NULL);
+        = sentry__prepare_http_request(envelope, dsn, NULL, NULL);
     TEST_CHECK_STRING_EQUAL(req->method, "POST");
     TEST_CHECK_STRING_EQUAL(
         req->url, "https://sentry.invalid:443/api/42/envelope/");
@@ -46,7 +58,7 @@ SENTRY_TEST(basic_http_request_preparation_for_transaction)
     sentry__envelope_add_transaction(envelope, transaction);
 
     sentry_prepared_http_request_t *req
-        = sentry__prepare_http_request(envelope, dsn, NULL);
+        = sentry__prepare_http_request(envelope, dsn, NULL, NULL);
     TEST_CHECK_STRING_EQUAL(req->method, "POST");
     TEST_CHECK_STRING_EQUAL(
         req->url, "https://sentry.invalid:443/api/42/envelope/");
@@ -79,7 +91,7 @@ SENTRY_TEST(basic_http_request_preparation_for_event_with_attachment)
         envelope, msg, sizeof(msg) - 1, "attachment");
 
     sentry_prepared_http_request_t *req
-        = sentry__prepare_http_request(envelope, dsn, NULL);
+        = sentry__prepare_http_request(envelope, dsn, NULL, NULL);
     TEST_CHECK_STRING_EQUAL(req->method, "POST");
     TEST_CHECK_STRING_EQUAL(
         req->url, "https://sentry.invalid:443/api/42/envelope/");
@@ -108,7 +120,7 @@ SENTRY_TEST(basic_http_request_preparation_for_minidump)
         envelope, msg, sizeof(msg) - 1, "attachment");
 
     sentry_prepared_http_request_t *req
-        = sentry__prepare_http_request(envelope, dsn, NULL);
+        = sentry__prepare_http_request(envelope, dsn, NULL, NULL);
     TEST_CHECK_STRING_EQUAL(req->method, "POST");
     TEST_CHECK_STRING_EQUAL(
         req->url, "https://sentry.invalid:443/api/42/envelope/");
@@ -124,7 +136,8 @@ SENTRY_TEST(basic_http_request_preparation_for_minidump)
     sentry__dsn_decref(dsn);
 }
 
-SENTRY_TEST(serialize_envelope)
+sentry_envelope_t *
+create_test_envelope()
 {
     sentry_options_t *options = sentry_options_new();
     sentry_options_set_dsn(options, "https://foo@sentry.invalid/42");
@@ -145,25 +158,60 @@ SENTRY_TEST(serialize_envelope)
     char msg[] = "Hello World!";
     sentry__envelope_add_from_buffer(
         envelope, msg, sizeof(msg) - 1, "attachment");
+    return envelope;
+}
+
+SENTRY_TEST(serialize_envelope)
+{
+    sentry_envelope_t *envelope = create_test_envelope();
 
     sentry_stringbuilder_t sb;
     sentry__stringbuilder_init(&sb);
     sentry__envelope_serialize_into_stringbuilder(envelope, &sb);
     char *str = sentry__stringbuilder_into_string(&sb);
 
-    TEST_CHECK_STRING_EQUAL(str,
-        "{\"dsn\":\"https://foo@sentry.invalid/42\","
-        "\"event_id\":\"c993afb6-b4ac-48a6-b61b-2558e601d65d\"}\n"
-        "{\"type\":\"event\",\"length\":71}\n"
-        "{\"event_id\":\"c993afb6-b4ac-48a6-b61b-2558e601d65d\",\"some-"
-        "context\":null}\n"
-        "{\"type\":\"minidump\",\"length\":4}\n"
-        "MDMP\n"
-        "{\"type\":\"attachment\",\"length\":12}\n"
-        "Hello World!");
+    TEST_CHECK_STRING_EQUAL(str, SERIALIZED_ENVELOPE_STR);
 
     sentry_envelope_free(envelope);
     sentry_free(str);
 
     sentry_close();
 }
+
+SENTRY_TEST(basic_write_envelope_to_file)
+{
+    sentry_envelope_t *envelope = create_test_envelope();
+    const char *test_file_str = "sentry_test_envelope";
+    sentry_path_t *test_file_path = sentry__path_from_str(test_file_str);
+    int rv = sentry_envelope_write_to_file(envelope, test_file_str);
+    TEST_CHECK_INT_EQUAL(rv, 0);
+    TEST_ASSERT(sentry__path_is_file(test_file_path));
+
+    size_t test_file_size;
+    char *test_file_content
+        = sentry__path_read_to_buffer(test_file_path, &test_file_size);
+    TEST_CHECK_INT_EQUAL(test_file_size, strlen(SERIALIZED_ENVELOPE_STR));
+    TEST_CHECK_STRING_EQUAL(test_file_content, SERIALIZED_ENVELOPE_STR);
+
+    sentry_free(test_file_content);
+    sentry__path_remove(test_file_path);
+    sentry__path_free(test_file_path);
+    sentry_envelope_free(envelope);
+    sentry_close();
+}
+
+SENTRY_TEST(write_envelope_to_file_null)
+{
+    sentry_envelope_t *empty_envelope = sentry__envelope_new();
+
+    TEST_CHECK_INT_EQUAL(
+        sentry_envelope_write_to_file(NULL, "irrelevant/path"), 1);
+    TEST_CHECK_INT_EQUAL(
+        sentry_envelope_write_to_file(empty_envelope, NULL), 1);
+    TEST_CHECK_INT_EQUAL(
+        sentry_envelope_write_to_file_n(NULL, "irrelevant/path", 0), 1);
+    TEST_CHECK_INT_EQUAL(
+        sentry_envelope_write_to_file_n(empty_envelope, NULL, 0), 1);
+
+    sentry_envelope_free(empty_envelope);
+}
diff --git a/external_imported/sentry-native/tests/unit/test_options.c b/external_imported/sentry-native/tests/unit/test_options.c
new file mode 100644
index 000000000..c9115a434
--- /dev/null
+++ b/external_imported/sentry-native/tests/unit/test_options.c
@@ -0,0 +1,54 @@
+#include "sentry_options.h"
+#include "sentry_testsupport.h"
+
+SENTRY_TEST(options_sdk_name_defaults)
+{
+    sentry_options_t *options = sentry_options_new();
+    // when nothing is set
+
+    // then both sdk name and user agent should default to the build time
+    // directives
+    TEST_CHECK_STRING_EQUAL(
+        sentry_options_get_sdk_name(options), SENTRY_SDK_NAME);
+    TEST_CHECK_STRING_EQUAL(
+        sentry_options_get_user_agent(options), SENTRY_SDK_USER_AGENT);
+
+    sentry_options_free(options);
+}
+
+SENTRY_TEST(options_sdk_name_custom)
+{
+    sentry_options_t *options = sentry_options_new();
+
+    // when the sdk name is set to a custom string
+    const int result
+        = sentry_options_set_sdk_name(options, "sentry.native.android.flutter");
+
+    // both the sdk_name and user_agent should reflect this change
+    TEST_CHECK_INT_EQUAL(result, 0);
+    TEST_CHECK_STRING_EQUAL(
+        sentry_options_get_sdk_name(options), "sentry.native.android.flutter");
+
+    TEST_CHECK_STRING_EQUAL(sentry_options_get_user_agent(options),
+        "sentry.native.android.flutter/" SENTRY_SDK_VERSION);
+
+    sentry_options_free(options);
+}
+
+SENTRY_TEST(options_sdk_name_invalid)
+{
+    sentry_options_t *options = sentry_options_new();
+
+    // when the sdk name is set to an invalid value
+    const char *sdk_name = NULL;
+    const int result = sentry_options_set_sdk_name(options, sdk_name);
+
+    // then the value should be ignored
+    TEST_CHECK_INT_EQUAL(result, 1);
+    TEST_CHECK_STRING_EQUAL(
+        sentry_options_get_sdk_name(options), SENTRY_SDK_NAME);
+    TEST_CHECK_STRING_EQUAL(
+        sentry_options_get_user_agent(options), SENTRY_SDK_USER_AGENT);
+
+    sentry_options_free(options);
+}
diff --git a/external_imported/sentry-native/tests/unit/test_path.c b/external_imported/sentry-native/tests/unit/test_path.c
index 3f25d77a5..8424d1f0b 100644
--- a/external_imported/sentry-native/tests/unit/test_path.c
+++ b/external_imported/sentry-native/tests/unit/test_path.c
@@ -58,6 +58,26 @@ SENTRY_TEST(path_joining_unix)
 #endif
 }
 
+SENTRY_TEST(path_from_str_null)
+{
+    TEST_CHECK(NULL == sentry__path_from_str(NULL));
+    TEST_CHECK(NULL == sentry__path_from_str_n(NULL, 0));
+    TEST_CHECK(NULL == sentry__path_from_str_n(NULL, 10));
+}
+
+SENTRY_TEST(path_from_str_n_wo_null_termination)
+{
+    // provide non-null-terminated path string with buffer character at the end.
+    char path_str[] = { 't', 'e', 's', 't', 'X' };
+    sentry_path_t *test_path = sentry__path_from_str_n(path_str, 4);
+#ifdef SENTRY_PLATFORM_WINDOWS
+    TEST_CHECK_WSTRING_EQUAL(test_path->path, L"test");
+#else
+    TEST_CHECK_STRING_EQUAL(test_path->path, "test");
+#endif
+    sentry__path_free(test_path);
+}
+
 SENTRY_TEST(path_joining_windows)
 {
 #ifndef SENTRY_PLATFORM_WINDOWS
diff --git a/external_imported/sentry-native/tests/unit/test_session.c b/external_imported/sentry-native/tests/unit/test_session.c
index fbe586a02..ebaaed389 100644
--- a/external_imported/sentry-native/tests/unit/test_session.c
+++ b/external_imported/sentry-native/tests/unit/test_session.c
@@ -47,7 +47,7 @@ send_envelope(const sentry_envelope_t *envelope, void *data)
         "my_release");
     TEST_CHECK_STRING_EQUAL(
         sentry_value_as_string(sentry_value_get_by_key(attrs, "environment")),
-        "my_environment");
+        "test");
 
     sentry_value_decref(session);
 }
@@ -67,6 +67,10 @@ SENTRY_TEST(session_basics)
     TEST_CHECK_STRING_EQUAL(
         sentry_options_get_environment(options), "production");
     sentry_options_set_environment(options, "my_environment");
+    TEST_CHECK_STRING_EQUAL(
+        sentry_options_get_environment(options), "my_environment");
+    char env[] = { 't', 'e', 's', 't' };
+    sentry_options_set_environment_n(options, env, sizeof(env));
     sentry_init(options);
 
     // a session was already started by automatic session tracking
diff --git a/external_imported/sentry-native/tests/unit/test_tracing.c b/external_imported/sentry-native/tests/unit/test_tracing.c
index a960273e0..bdac0921f 100644
--- a/external_imported/sentry-native/tests/unit/test_tracing.c
+++ b/external_imported/sentry-native/tests/unit/test_tracing.c
@@ -94,9 +94,19 @@ SENTRY_TEST(basic_transaction)
         sentry_transaction_context_set_name(opaque_tx_cxt, "");
         CHECK_STRING_PROPERTY(tx_cxt, "transaction", "");
 
+        char txn_ctx_name[] = { 'h', 'o', 'n', 'k', '.', 'b', 'e', 'e', 'p' };
+        sentry_transaction_context_set_name_n(
+            opaque_tx_cxt, txn_ctx_name, sizeof(txn_ctx_name));
+        CHECK_STRING_PROPERTY(tx_cxt, "transaction", "honk.beep");
+
         sentry_transaction_context_set_operation(opaque_tx_cxt, "");
         CHECK_STRING_PROPERTY(tx_cxt, "op", "");
 
+        char txn_ctx_op[] = { 'b', 'e', 'e', 'p', 'b', 'e', 'e', 'p' };
+        sentry_transaction_context_set_operation_n(
+            opaque_tx_cxt, txn_ctx_op, sizeof(txn_ctx_op));
+        CHECK_STRING_PROPERTY(tx_cxt, "op", "beepbeep");
+
         sentry_transaction_context_set_sampled(opaque_tx_cxt, 1);
         TEST_CHECK(
             sentry_value_is_true(sentry_value_get_by_key(tx_cxt, "sampled"))
@@ -195,9 +205,13 @@ SENTRY_TEST(basic_function_transport_transaction)
     // consent was not given
     TEST_CHECK(!sentry_uuid_is_nil(&event_id));
     sentry_user_consent_give();
-
-    tx_cxt = sentry_transaction_context_new("honk", "beep");
+    char name[] = { 'h', 'o', 'n', 'k' };
+    char op[] = { 'b', 'e', 'e', 'p' };
+    tx_cxt
+        = sentry_transaction_context_new_n(name, sizeof(name), op, sizeof(op));
     tx = sentry_transaction_start(tx_cxt, sentry_value_new_null());
+    CHECK_STRING_PROPERTY(tx->inner, "transaction", "honk");
+    CHECK_STRING_PROPERTY(tx->inner, "op", "beep");
     event_id = sentry_transaction_finish(tx);
     TEST_CHECK(!sentry_uuid_is_nil(&event_id));
 
@@ -697,6 +711,43 @@ forward_headers_to(const char *key, const char *value, void *userdata)
     sentry_transaction_context_update_from_header(tx_ctx, key, value);
 }
 
+SENTRY_TEST(update_from_header_null_ctx)
+{
+    sentry_transaction_context_update_from_header(
+        NULL, "irrelevant-key", "irrelevant-value");
+}
+
+SENTRY_TEST(update_from_header_no_sampled_flag)
+{
+    sentry_options_t *options = sentry_options_new();
+    sentry_options_set_dsn(options, "https://foo@sentry.invalid/42");
+
+    sentry_options_set_traces_sample_rate(options, 1.0);
+    sentry_options_set_max_spans(options, 2);
+    sentry_init(options);
+
+    sentry_transaction_context_update_from_header(
+        NULL, "irrelevant-key", "irrelevant-value");
+    const char *trace_header
+        = "2674eb52d5874b13b560236d6c79ce8a-a0f9fdf04f1a63df";
+    sentry_transaction_context_t *tx_ctx
+        = sentry_transaction_context_new("wow!", NULL);
+    sentry_transaction_context_update_from_header(
+        tx_ctx, "sentry-trace", trace_header);
+    sentry_transaction_t *tx
+        = sentry_transaction_start(tx_ctx, sentry_value_new_null());
+
+    CHECK_STRING_PROPERTY(
+        tx->inner, "trace_id", "2674eb52d5874b13b560236d6c79ce8a");
+    CHECK_STRING_PROPERTY(tx->inner, "parent_span_id", "a0f9fdf04f1a63df");
+    sentry_value_t sampled = sentry_value_get_by_key(tx->inner, "sampled");
+    TEST_CHECK(sentry_value_get_type(sampled) == SENTRY_VALUE_TYPE_BOOL);
+    TEST_CHECK(sentry_value_is_true(sampled));
+
+    sentry__transaction_decref(tx);
+    sentry_close();
+}
+
 SENTRY_TEST(distributed_headers)
 {
     sentry_options_t *options = sentry_options_new();
@@ -715,9 +766,14 @@ SENTRY_TEST(distributed_headers)
     sentry_transaction_context_t *tx_ctx
         = sentry_transaction_context_new("wow!", NULL);
 
-    // check case insensitive headers, and bogus header names
+    // check case-insensitive headers, and bogus header names
     sentry_transaction_context_update_from_header(
         tx_ctx, "SeNtry-TrAcE", trace_header);
+    sentry_transaction_context_update_from_header(
+        tx_ctx, "sentry_trace", not_expected_header);
+    sentry_transaction_context_update_from_header(
+        tx_ctx, NULL, not_expected_header);
+    sentry_transaction_context_update_from_header(tx_ctx, "sentry-trace", NULL);
     sentry_transaction_context_update_from_header(
         tx_ctx, "nop", not_expected_header);
     sentry_transaction_context_update_from_header(
@@ -807,5 +863,246 @@ SENTRY_TEST(distributed_headers)
     sentry_close();
 }
 
+void
+check_after_set(sentry_value_t inner, const char *inner_key,
+    const char *item_key, const char *expected)
+{
+    sentry_value_t inner_tags = sentry_value_get_by_key(inner, inner_key);
+    TEST_CHECK_INT_EQUAL(1, sentry_value_get_length(inner_tags));
+    TEST_CHECK(
+        sentry_value_get_type(sentry_value_get_by_key(inner_tags, item_key))
+        == SENTRY_VALUE_TYPE_STRING);
+    CHECK_STRING_PROPERTY(inner_tags, item_key, expected);
+}
+
+void
+check_after_remove(
+    sentry_value_t inner, const char *inner_key, const char *item_key)
+{
+    sentry_value_t inner_tags = sentry_value_get_by_key(inner, inner_key);
+    TEST_CHECK_INT_EQUAL(0, sentry_value_get_length(inner_tags));
+    TEST_CHECK(IS_NULL(inner_tags, item_key));
+}
+
+SENTRY_TEST(txn_tagging)
+{
+    sentry_transaction_t *txn
+        = sentry__transaction_new(sentry_value_new_object());
+
+    sentry_transaction_set_tag(txn, "os.name", "Linux");
+    check_after_set(txn->inner, "tags", "os.name", "Linux");
+
+    sentry_transaction_remove_tag(txn, "os.name");
+    check_after_remove(txn->inner, "tags", "os.name");
+
+    sentry__transaction_decref(txn);
+}
+
+SENTRY_TEST(span_tagging)
+{
+    sentry_transaction_t *txn
+        = sentry__transaction_new(sentry_value_new_object());
+    sentry_span_t *span = sentry__span_new(txn, sentry_value_new_object());
+
+    sentry_span_set_tag(span, "os.name", "Linux");
+    check_after_set(span->inner, "tags", "os.name", "Linux");
+
+    sentry_span_remove_tag(span, "os.name");
+    check_after_remove(span->inner, "tags", "os.name");
+
+    sentry__span_decref(span);
+    sentry__transaction_decref(txn);
+}
+
+SENTRY_TEST(txn_tagging_n)
+{
+    sentry_transaction_t *txn
+        = sentry__transaction_new(sentry_value_new_object());
+
+    char tag[] = { 'o', 's', '.', 'n', 'a', 'm', 'e' };
+    char tag_val[] = { 'L', 'i', 'n', 'u', 'x' };
+    sentry_transaction_set_tag_n(
+        txn, tag, sizeof(tag), tag_val, sizeof(tag_val));
+    check_after_set(txn->inner, "tags", "os.name", "Linux");
+
+    sentry_transaction_remove_tag_n(txn, tag, sizeof(tag));
+    check_after_remove(txn->inner, "tags", "os.name");
+
+    sentry__transaction_decref(txn);
+}
+
+SENTRY_TEST(span_tagging_n)
+{
+    sentry_transaction_t *txn
+        = sentry__transaction_new(sentry_value_new_object());
+    sentry_span_t *span = sentry__span_new(txn, sentry_value_new_object());
+
+    char tag[] = { 'o', 's', '.', 'n', 'a', 'm', 'e' };
+    char tag_val[] = { 'L', 'i', 'n', 'u', 'x' };
+    sentry_span_set_tag_n(span, tag, sizeof(tag), tag_val, sizeof(tag_val));
+    check_after_set(span->inner, "tags", "os.name", "Linux");
+
+    sentry_span_remove_tag_n(span, tag, sizeof(tag));
+    check_after_remove(span->inner, "tags", "os.name");
+
+    sentry__span_decref(span);
+    sentry__transaction_decref(txn);
+}
+
+SENTRY_TEST(txn_name)
+{
+    sentry_transaction_t *txn
+        = sentry__transaction_new(sentry_value_new_object());
+
+    char *txn_name = "the_txn";
+    sentry_transaction_set_name(txn, txn_name);
+    sentry_value_t txn_name_value
+        = sentry_value_get_by_key(txn->inner, "transaction");
+    TEST_CHECK(
+        sentry_value_get_type(txn_name_value) == SENTRY_VALUE_TYPE_STRING);
+    TEST_CHECK_STRING_EQUAL(sentry_value_as_string(txn_name_value), txn_name);
+
+    sentry__transaction_decref(txn);
+}
+
+SENTRY_TEST(txn_data)
+{
+    sentry_transaction_t *txn
+        = sentry__transaction_new(sentry_value_new_object());
+
+    sentry_transaction_set_data(
+        txn, "os.name", sentry_value_new_string("Linux"));
+    check_after_set(txn->inner, "data", "os.name", "Linux");
+
+    sentry_transaction_remove_data(txn, "os.name");
+    check_after_remove(txn->inner, "data", "os.name");
+
+    sentry__transaction_decref(txn);
+}
+
+SENTRY_TEST(span_data)
+{
+    sentry_transaction_t *txn
+        = sentry__transaction_new(sentry_value_new_object());
+    sentry_span_t *span = sentry__span_new(txn, sentry_value_new_object());
+
+    sentry_span_set_data(span, "os.name", sentry_value_new_string("Linux"));
+    check_after_set(span->inner, "data", "os.name", "Linux");
+
+    sentry_span_remove_data(span, "os.name");
+    check_after_remove(span->inner, "data", "os.name");
+
+    sentry__span_decref(span);
+    sentry__transaction_decref(txn);
+}
+
+SENTRY_TEST(txn_name_n)
+{
+    sentry_transaction_t *txn
+        = sentry__transaction_new(sentry_value_new_object());
+    char txn_name[] = { 't', 'h', 'e', '_', 't', 'x', 'n' };
+    sentry_transaction_set_name_n(txn, txn_name, sizeof(txn_name));
+
+    sentry_value_t txn_name_value
+        = sentry_value_get_by_key(txn->inner, "transaction");
+    TEST_CHECK(
+        sentry_value_get_type(txn_name_value) == SENTRY_VALUE_TYPE_STRING);
+    TEST_CHECK_STRING_EQUAL(sentry_value_as_string(txn_name_value), "the_txn");
+
+    sentry__transaction_decref(txn);
+}
+
+SENTRY_TEST(txn_data_n)
+{
+    sentry_transaction_t *txn
+        = sentry__transaction_new(sentry_value_new_object());
+
+    char data_k[] = { 'o', 's', '.', 'n', 'a', 'm', 'e' };
+    char data_v[] = { 'L', 'i', 'n', 'u', 'x' };
+    sentry_value_t data_value
+        = sentry_value_new_string_n(data_v, sizeof(data_v));
+    sentry_transaction_set_data_n(txn, data_k, sizeof(data_k), data_value);
+    check_after_set(txn->inner, "data", "os.name", "Linux");
+
+    sentry_transaction_remove_data_n(txn, data_k, sizeof(data_k));
+    check_after_remove(txn->inner, "data", "os.name");
+
+    sentry__transaction_decref(txn);
+}
+
+SENTRY_TEST(span_data_n)
+{
+    sentry_transaction_t *txn
+        = sentry__transaction_new(sentry_value_new_object());
+    sentry_span_t *span = sentry__span_new(txn, sentry_value_new_object());
+
+    char data_k[] = { 'o', 's', '.', 'n', 'a', 'm', 'e' };
+    char data_v[] = { 'L', 'i', 'n', 'u', 'x' };
+    sentry_value_t data_value
+        = sentry_value_new_string_n(data_v, sizeof(data_v));
+    sentry_span_set_data_n(span, data_k, sizeof(data_k), data_value);
+    check_after_set(span->inner, "data", "os.name", "Linux");
+
+    sentry_span_remove_data_n(span, data_k, sizeof(data_k));
+    check_after_remove(span->inner, "data", "os.name");
+
+    sentry__span_decref(span);
+    sentry__transaction_decref(txn);
+}
+
+SENTRY_TEST(sentry__value_span_new_requires_unfinished_parent)
+{
+    sentry_value_t parent = sentry_value_new_object();
+    // timestamps are typically iso8601 strings, but this is irrelevant to
+    // `sentry__value_span_new` which just wants `timestamp` to not be null.
+    sentry_value_set_by_key(parent, "timestamp", sentry_value_new_object());
+    sentry_value_t inner_span = sentry__value_span_new(0, parent, NULL, NULL);
+    TEST_CHECK(sentry_value_is_null(inner_span));
+
+    sentry_value_decref(parent);
+}
+
+SENTRY_TEST(set_tag_allows_null_tag_and_value)
+{
+    sentry_transaction_t *txn
+        = sentry__transaction_new(sentry_value_new_object());
+    sentry_transaction_set_tag(txn, NULL, NULL);
+    sentry_value_t tags = sentry_value_get_by_key(txn->inner, "tags");
+    TEST_CHECK(!sentry_value_is_null(tags));
+    TEST_CHECK(sentry_value_get_type(tags) == SENTRY_VALUE_TYPE_OBJECT);
+    TEST_CHECK(sentry_value_get_length(tags) == 0);
+
+    sentry_transaction_set_tag(txn, "os.name", NULL);
+    tags = sentry_value_get_by_key(txn->inner, "tags");
+    TEST_CHECK(!sentry_value_is_null(tags));
+    TEST_CHECK(sentry_value_get_type(tags) == SENTRY_VALUE_TYPE_OBJECT);
+    TEST_CHECK(sentry_value_get_length(tags) == 1);
+    TEST_CHECK(IS_NULL(tags, "os.name"));
+
+    sentry__transaction_decref(txn);
+}
+
+SENTRY_TEST(set_tag_cuts_value_at_length_200)
+{
+    const char test_value[]
+        = "012345678901234567890123456789012345678901234567890123456789"
+          "012345678901234567890123456789012345678901234567890123456789"
+          "012345678901234567890123456789012345678901234567890123456789"
+          "012345678901234567890123456789012345678901234567890123456789";
+
+    sentry_transaction_t *txn
+        = sentry__transaction_new(sentry_value_new_object());
+    sentry_transaction_set_tag(txn, "cut-off", test_value);
+    sentry_value_t tags = sentry_value_get_by_key(txn->inner, "tags");
+    TEST_CHECK(!sentry_value_is_null(tags));
+    TEST_CHECK(sentry_value_get_type(tags) == SENTRY_VALUE_TYPE_OBJECT);
+    TEST_CHECK(sentry_value_get_length(tags) == 1);
+    TEST_CHECK_INT_EQUAL(strlen(sentry_value_as_string(
+                             sentry_value_get_by_key(tags, "cut-off"))),
+        200);
+
+    sentry__transaction_decref(txn);
+}
+
 #undef IS_NULL
 #undef CHECK_STRING_PROPERTY
diff --git a/external_imported/sentry-native/tests/unit/test_utils.c b/external_imported/sentry-native/tests/unit/test_utils.c
index f280f59f7..232303415 100644
--- a/external_imported/sentry-native/tests/unit/test_utils.c
+++ b/external_imported/sentry-native/tests/unit/test_utils.c
@@ -152,7 +152,7 @@ SENTRY_TEST(dsn_store_url_with_path)
     TEST_CHECK_STRING_EQUAL(
         url, "http://example.com:80/foo/bar/api/42/envelope/");
     sentry_free(url);
-    url = sentry__dsn_get_minidump_url(dsn);
+    url = sentry__dsn_get_minidump_url(dsn, SENTRY_SDK_USER_AGENT);
     TEST_CHECK_STRING_EQUAL(url,
         "http://example.com:80/foo/bar/api/42/minidump/"
         "?sentry_client=" SENTRY_SDK_USER_AGENT "&sentry_key=username");
@@ -168,7 +168,7 @@ SENTRY_TEST(dsn_store_url_without_path)
     url = sentry__dsn_get_envelope_url(dsn);
     TEST_CHECK_STRING_EQUAL(url, "http://example.com:80/api/42/envelope/");
     sentry_free(url);
-    url = sentry__dsn_get_minidump_url(dsn);
+    url = sentry__dsn_get_minidump_url(dsn, SENTRY_SDK_USER_AGENT);
     TEST_CHECK_STRING_EQUAL(url,
         "http://example.com:80/api/42/minidump/"
         "?sentry_client=" SENTRY_SDK_USER_AGENT "&sentry_key=username");
@@ -176,6 +176,18 @@ SENTRY_TEST(dsn_store_url_without_path)
     sentry__dsn_decref(dsn);
 }
 
+SENTRY_TEST(dsn_store_url_custom_agent)
+{
+    sentry_dsn_t *dsn
+        = sentry__dsn_new("http://username:password@example.com/42?x=y#z");
+    char *url = sentry__dsn_get_minidump_url(dsn, "custom_user_agent");
+    TEST_CHECK_STRING_EQUAL(url,
+        "http://example.com:80/api/42/minidump/"
+        "?sentry_client=custom_user_agent&sentry_key=username");
+    sentry_free(url);
+    sentry__dsn_decref(dsn);
+}
+
 SENTRY_TEST(page_allocator)
 {
 #ifndef SENTRY_PLATFORM_UNIX
@@ -221,3 +233,104 @@ SENTRY_TEST(os)
 
     sentry_value_decref(os);
 }
+
+SENTRY_TEST(check_version)
+{
+    TEST_CHECK(sentry__check_min_version(
+        (sentry_version_t) { .major = 7, .minor = 10, .patch = 7 },
+        (sentry_version_t) { .major = 7, .minor = 10, .patch = 7 }));
+    TEST_CHECK(sentry__check_min_version(
+        (sentry_version_t) { .major = 7, .minor = 11, .patch = 7 },
+        (sentry_version_t) { .major = 7, .minor = 10, .patch = 7 }));
+    TEST_CHECK(sentry__check_min_version(
+        (sentry_version_t) { .major = 7, .minor = 10, .patch = 8 },
+        (sentry_version_t) { .major = 7, .minor = 10, .patch = 7 }));
+    TEST_CHECK(sentry__check_min_version(
+        (sentry_version_t) { .major = 8, .minor = 9, .patch = 7 },
+        (sentry_version_t) { .major = 7, .minor = 10, .patch = 7 }));
+    TEST_CHECK(sentry__check_min_version(
+        (sentry_version_t) { .major = 7, .minor = 11, .patch = 6 },
+        (sentry_version_t) { .major = 7, .minor = 10, .patch = 7 }));
+
+    TEST_CHECK(!sentry__check_min_version(
+        (sentry_version_t) { .major = 6, .minor = 10, .patch = 7 },
+        (sentry_version_t) { .major = 7, .minor = 10, .patch = 7 }));
+    TEST_CHECK(!sentry__check_min_version(
+        (sentry_version_t) { .major = 7, .minor = 9, .patch = 7 },
+        (sentry_version_t) { .major = 7, .minor = 10, .patch = 7 }));
+    TEST_CHECK(!sentry__check_min_version(
+        (sentry_version_t) { .major = 7, .minor = 10, .patch = 6 },
+        (sentry_version_t) { .major = 7, .minor = 10, .patch = 7 }));
+}
+
+SENTRY_TEST(dsn_without_url_scheme_is_invalid)
+{
+    sentry_dsn_t *dsn = sentry__dsn_new("//without-scheme-separator");
+    TEST_CHECK(dsn->is_valid == false);
+    sentry__dsn_decref(dsn);
+}
+
+SENTRY_TEST(dsn_with_non_http_scheme_is_invalid)
+{
+    sentry_dsn_t *dsn = sentry__dsn_new("ftp://ftp-server/");
+    TEST_CHECK(dsn->is_valid == false);
+    sentry__dsn_decref(dsn);
+}
+
+SENTRY_TEST(dsn_without_project_id_is_invalid)
+{
+    sentry_dsn_t *dsn = sentry__dsn_new("https://foo@sentry.io/");
+    TEST_CHECK(dsn->is_valid == false);
+    sentry__dsn_decref(dsn);
+}
+
+SENTRY_TEST(dsn_with_ending_forward_slash_will_be_cleaned)
+{
+    sentry_dsn_t *dsn = sentry__dsn_new("https://foo@sentry.io/42/43/44////");
+
+    TEST_CHECK_STRING_EQUAL(dsn->path, "/42/43");
+    TEST_CHECK_STRING_EQUAL(dsn->project_id, "44");
+    TEST_CHECK(dsn->is_valid == true);
+
+    sentry__dsn_decref(dsn);
+}
+
+SENTRY_TEST(dsn_auth_header_no_user_agent)
+{
+    sentry_dsn_t *dsn = sentry__dsn_new("https://key@sentry.io/42");
+    char *auth_header = sentry__dsn_get_auth_header(dsn, NULL);
+    TEST_CHECK_STRING_EQUAL(auth_header,
+        "Sentry sentry_key=key, sentry_version=7, "
+        "sentry_client=" SENTRY_SDK_NAME "/" SENTRY_SDK_VERSION);
+
+    sentry_free(auth_header);
+    sentry__dsn_decref(dsn);
+}
+
+SENTRY_TEST(dsn_auth_header_custom_user_agent)
+{
+    sentry_dsn_t *dsn = sentry__dsn_new("https://key@sentry.io/42");
+    char *auth_header = sentry__dsn_get_auth_header(dsn, "user_agent");
+    TEST_CHECK_STRING_EQUAL(auth_header,
+        "Sentry sentry_key=key, sentry_version=7, "
+        "sentry_client=user_agent");
+
+    sentry_free(auth_header);
+    sentry__dsn_decref(dsn);
+}
+
+SENTRY_TEST(dsn_auth_header_null_dsn)
+{
+    char *auth_header = sentry__dsn_get_auth_header(NULL, NULL);
+    TEST_CHECK(!auth_header);
+}
+
+SENTRY_TEST(dsn_auth_header_invalid_dsn)
+{
+    sentry_dsn_t *dsn = sentry__dsn_new("whatever");
+    char *auth_header = sentry__dsn_get_auth_header(dsn, NULL);
+    TEST_CHECK(!auth_header);
+
+    sentry_free(auth_header);
+    sentry__dsn_decref(dsn);
+}
diff --git a/external_imported/sentry-native/tests/unit/test_value.c b/external_imported/sentry-native/tests/unit/test_value.c
index 6a4044c13..92e195d58 100644
--- a/external_imported/sentry-native/tests/unit/test_value.c
+++ b/external_imported/sentry-native/tests/unit/test_value.c
@@ -102,16 +102,31 @@ SENTRY_TEST(value_string)
     sentry_value_decref(val);
 }
 
+SENTRY_TEST(value_string_n)
+{
+    sentry_value_t val = sentry_value_new_string_n(NULL, 0);
+    TEST_CHECK(sentry_value_is_null(val));
+    TEST_CHECK(sentry_value_get_type(val) == SENTRY_VALUE_TYPE_NULL);
+    TEST_CHECK(sentry_value_is_true(val) == false);
+    sentry_value_decref(val);
+
+    char non_null_term_empty_str[] = { 'h', 'e', 'l', 'l', 'o' };
+    val = sentry_value_new_string_n(
+        non_null_term_empty_str, sizeof(non_null_term_empty_str));
+    TEST_CHECK_STRING_EQUAL(sentry_value_as_string(val), "hello");
+    TEST_CHECK(sentry_value_get_type(val) == SENTRY_VALUE_TYPE_STRING);
+    TEST_CHECK(sentry_value_is_true(val) == true);
+    sentry_value_decref(val);
+}
+
 SENTRY_TEST(value_unicode)
 {
     // https://xkcd.com/1813/ :-)
-    sentry_value_t val
-        = sentry_value_new_string("őá…–🤮🚀¿ 한글 테스트 \a\v");
-    TEST_CHECK_STRING_EQUAL(sentry_value_as_string(val),
-        "őá…–🤮🚀¿ 한글 테스트 \a\v");
+    sentry_value_t val = sentry_value_new_string("őá…–🤮🚀¿ 한글 테스트 \a\v");
+    TEST_CHECK_STRING_EQUAL(
+        sentry_value_as_string(val), "őá…–🤮🚀¿ 한글 테스트 \a\v");
     // json does not need to escape unicode, except for control characters
-    TEST_CHECK_JSON_VALUE(
-        val, "\"őá…–🤮🚀¿ 한글 테스트 \\u0007\\u000b\"");
+    TEST_CHECK_JSON_VALUE(val, "\"őá…–🤮🚀¿ 한글 테스트 \\u0007\\u000b\"");
     sentry_value_decref(val);
     char zalgo[] = "z̴̢̈͜ä̴̺̟�ͅl̸̛̦͎̺͂̃̚�g̷̦̲͊͋̄̌�o̸͇̞̪͙̞͌̇̀̓�͜";
     val = sentry_value_new_string(zalgo);
@@ -161,7 +176,7 @@ SENTRY_TEST(value_list)
     sentry_value_decref(val);
 
     val = sentry_value_new_list();
-    for (uint32_t i = 1; i <= 10; i++) {
+    for (int32_t i = 1; i <= 10; i++) {
         sentry_value_append(val, sentry_value_new_int32(i));
     }
     sentry__value_append_bounded(val, sentry_value_new_int32(1010), 5);
@@ -547,6 +562,89 @@ SENTRY_TEST(value_collections_leak)
     sentry_value_decref(obj);
 }
 
+SENTRY_TEST(value_set_by_null_key)
+{
+    sentry_value_t value = sentry_value_new_object();
+    sentry_value_t payload = sentry_value_new_object();
+
+    TEST_CHECK(sentry_value_refcount(payload) == 1);
+    TEST_CHECK_INT_EQUAL(1, sentry_value_set_by_key(value, NULL, payload));
+    TEST_CHECK(sentry_value_get_length(value) == 0);
+
+    payload = sentry_value_new_object();
+    TEST_CHECK(sentry_value_refcount(payload) == 1);
+    TEST_CHECK_INT_EQUAL(1, sentry_value_set_by_key_n(value, NULL, 0, payload));
+    TEST_CHECK(sentry_value_get_length(value) == 0);
+
+    payload = sentry_value_new_object();
+    TEST_CHECK(sentry_value_refcount(payload) == 1);
+    TEST_CHECK_INT_EQUAL(
+        1, sentry_value_set_by_key_n(value, NULL, 10, payload));
+    TEST_CHECK(sentry_value_get_length(value) == 0);
+
+    sentry_value_decref(value);
+}
+
+SENTRY_TEST(value_remove_by_null_key)
+{
+    sentry_value_t value = sentry_value_new_object();
+
+    TEST_CHECK_INT_EQUAL(0,
+        sentry_value_set_by_key(value, "some_key", sentry_value_new_object()));
+    TEST_CHECK(sentry_value_get_length(value) == 1);
+
+    TEST_CHECK_INT_EQUAL(1, sentry_value_remove_by_key(value, NULL));
+    TEST_CHECK_INT_EQUAL(1, sentry_value_get_length(value));
+    TEST_CHECK_INT_EQUAL(1, sentry_value_remove_by_key_n(value, NULL, 0));
+    TEST_CHECK_INT_EQUAL(1, sentry_value_get_length(value));
+    TEST_CHECK_INT_EQUAL(1, sentry_value_remove_by_key_n(value, NULL, 10));
+    TEST_CHECK_INT_EQUAL(1, sentry_value_get_length(value));
+
+    sentry_value_decref(value);
+}
+
+SENTRY_TEST(value_get_by_null_key)
+{
+    sentry_value_t value = sentry_value_new_object();
+
+    const char *some_key = "some_key";
+    TEST_CHECK_INT_EQUAL(
+        0, sentry_value_set_by_key(value, some_key, sentry_value_new_object()));
+    TEST_CHECK(sentry_value_get_length(value) == 1);
+
+    sentry_value_t rv = sentry_value_get_by_key(value, NULL);
+    TEST_CHECK(sentry_value_is_null(rv));
+    TEST_CHECK_INT_EQUAL(1, sentry_value_refcount(rv));
+
+    rv = sentry_value_get_by_key_owned(value, NULL);
+    TEST_CHECK(sentry_value_is_null(rv));
+    TEST_CHECK_INT_EQUAL(1, sentry_value_refcount(rv));
+    sentry_value_decref(rv);
+    TEST_CHECK_INT_EQUAL(1, sentry_value_refcount(rv));
+
+    rv = sentry_value_get_by_key_owned(value, some_key);
+    TEST_CHECK(!sentry_value_is_null(rv));
+    TEST_CHECK_INT_EQUAL(2, sentry_value_refcount(rv));
+    sentry_value_decref(rv);
+    TEST_CHECK_INT_EQUAL(1, sentry_value_refcount(rv));
+
+    // if `k_len` != any length of keys stored in the object this won't
+    // segfault because the `sentry_slice_t` equality check already fails due to
+    // the length-inequality and never reaches `memcmp()`.
+    TEST_CHECK(sentry_value_is_null(sentry_value_get_by_key_n(value, NULL, 0)));
+    // If `k_len' == any key-length, we'd segfault without a NULL-check.
+    TEST_CHECK(sentry_value_is_null(
+        sentry_value_get_by_key_n(value, NULL, strlen(some_key))));
+
+    rv = sentry_value_get_by_key_owned_n(value, NULL, strlen(some_key));
+    TEST_CHECK(sentry_value_is_null(rv));
+    TEST_CHECK_INT_EQUAL(1, sentry_value_refcount(rv));
+    sentry_value_decref(rv);
+    TEST_CHECK_INT_EQUAL(1, sentry_value_refcount(rv));
+
+    sentry_value_decref(value);
+}
+
 SENTRY_TEST(value_set_stacktrace)
 {
     sentry_value_t exc
@@ -564,3 +662,113 @@ SENTRY_TEST(value_set_stacktrace)
 
     sentry_value_decref(exc);
 }
+
+SENTRY_TEST(message_with_null_text_is_valid)
+{
+    sentry_value_t message_event = sentry_value_new_message_event(
+        SENTRY_LEVEL_WARNING, "some-logger", NULL);
+
+    TEST_CHECK(!sentry_value_is_null(message_event));
+    TEST_CHECK_STRING_EQUAL(sentry_value_as_string(sentry_value_get_by_key(
+                                message_event, "logger")),
+        "some-logger");
+    TEST_CHECK_STRING_EQUAL(
+        sentry_value_as_string(sentry_value_get_by_key(message_event, "level")),
+        "warning");
+
+    sentry_value_decref(message_event);
+}
+
+SENTRY_TEST(breadcrumb_without_type_or_message_still_valid)
+{
+    sentry_value_t breadcrumb = sentry_value_new_breadcrumb(NULL, NULL);
+    TEST_CHECK(!sentry_value_is_null(breadcrumb));
+    TEST_CHECK(!sentry_value_is_null(
+        sentry_value_get_by_key(breadcrumb, "timestamp")));
+    TEST_CHECK(
+        sentry_value_is_null(sentry_value_get_by_key(breadcrumb, "type")));
+    TEST_CHECK(
+        sentry_value_is_null(sentry_value_get_by_key(breadcrumb, "message")));
+    sentry_value_decref(breadcrumb);
+
+    char *const test_type = "navigation";
+    breadcrumb = sentry_value_new_breadcrumb(test_type, NULL);
+    TEST_CHECK(!sentry_value_is_null(breadcrumb));
+    TEST_CHECK(!sentry_value_is_null(
+        sentry_value_get_by_key(breadcrumb, "timestamp")));
+    TEST_CHECK_STRING_EQUAL(
+        sentry_value_as_string(sentry_value_get_by_key(breadcrumb, "type")),
+        test_type);
+    TEST_CHECK(
+        sentry_value_is_null(sentry_value_get_by_key(breadcrumb, "message")));
+    sentry_value_decref(breadcrumb);
+
+    char *const test_message = "a fork in the road, take it";
+    breadcrumb = sentry_value_new_breadcrumb(NULL, test_message);
+    TEST_CHECK(!sentry_value_is_null(breadcrumb));
+    TEST_CHECK(!sentry_value_is_null(
+        sentry_value_get_by_key(breadcrumb, "timestamp")));
+    TEST_CHECK(
+        sentry_value_is_null(sentry_value_get_by_key(breadcrumb, "type")));
+    TEST_CHECK_STRING_EQUAL(
+        sentry_value_as_string(sentry_value_get_by_key(breadcrumb, "message")),
+        test_message);
+    sentry_value_decref(breadcrumb);
+}
+
+SENTRY_TEST(exception_without_type_or_value_still_valid)
+{
+    sentry_value_t exception = sentry_value_new_exception(NULL, NULL);
+    TEST_CHECK(!sentry_value_is_null(exception));
+    TEST_CHECK(
+        sentry_value_is_null(sentry_value_get_by_key(exception, "type")));
+    TEST_CHECK(
+        sentry_value_is_null(sentry_value_get_by_key(exception, "value")));
+    sentry_value_decref(exception);
+
+    char *const test_type = "EXC_BAD_ACCESS / KERN_INVALID_ADDRESS / 0x61";
+    exception = sentry_value_new_exception(test_type, NULL);
+    TEST_CHECK(!sentry_value_is_null(exception));
+    TEST_CHECK_STRING_EQUAL(
+        sentry_value_as_string(sentry_value_get_by_key(exception, "type")),
+        test_type);
+    TEST_CHECK(
+        sentry_value_is_null(sentry_value_get_by_key(exception, "value")));
+    sentry_value_decref(exception);
+
+    char *const test_value
+        = "Fatal Error: EXC_BAD_ACCESS / KERN_INVALID_ADDRESS / 0x61";
+    exception = sentry_value_new_exception(NULL, test_value);
+    TEST_CHECK(!sentry_value_is_null(exception));
+    TEST_CHECK(
+        sentry_value_is_null(sentry_value_get_by_key(exception, "type")));
+    TEST_CHECK_STRING_EQUAL(
+        sentry_value_as_string(sentry_value_get_by_key(exception, "value")),
+        test_value);
+    sentry_value_decref(exception);
+}
+
+SENTRY_TEST(thread_without_name_still_valid)
+{
+    sentry_value_t thread = sentry_value_new_thread(0xFF00FF00FF00FF00, NULL);
+    TEST_CHECK(!sentry_value_is_null(thread));
+    TEST_CHECK(!sentry_value_is_null(sentry_value_get_by_key(thread, "id")));
+    TEST_CHECK_STRING_EQUAL(
+        sentry_value_as_string(sentry_value_get_by_key(thread, "id")),
+        "18374966859414961920");
+    TEST_CHECK(sentry_value_is_null(sentry_value_get_by_key(thread, "name")));
+    sentry_value_decref(thread);
+
+    char *const test_name = "worker";
+    thread = sentry_value_new_thread(0xAA00AA00AA00AA00, test_name);
+    TEST_CHECK(!sentry_value_is_null(thread));
+    TEST_CHECK(!sentry_value_is_null(sentry_value_get_by_key(thread, "id")));
+    TEST_CHECK_STRING_EQUAL(
+        sentry_value_as_string(sentry_value_get_by_key(thread, "id")),
+        "12249977906276641280");
+    TEST_CHECK(!sentry_value_is_null(sentry_value_get_by_key(thread, "name")));
+    TEST_CHECK_STRING_EQUAL(
+        sentry_value_as_string(sentry_value_get_by_key(thread, "name")),
+        test_name);
+    sentry_value_decref(thread);
+}
diff --git a/external_imported/sentry-native/tests/unit/tests.inc b/external_imported/sentry-native/tests/unit/tests.inc
index 0a7d22232..1770edfc1 100644
--- a/external_imported/sentry-native/tests/unit/tests.inc
+++ b/external_imported/sentry-native/tests/unit/tests.inc
@@ -12,23 +12,36 @@ XX(basic_http_request_preparation_for_transaction)
 XX(basic_spans)
 XX(basic_tracing_context)
 XX(basic_transaction)
+XX(basic_write_envelope_to_file)
 XX(bgworker_flush)
+XX(breadcrumb_without_type_or_message_still_valid)
 XX(build_id_parser)
+XX(check_version)
 XX(child_spans)
 XX(concurrent_init)
 XX(concurrent_uninit)
 XX(count_sampled_events)
-XX(crashed_last_run)
 XX(crash_marker)
+XX(crashed_last_run)
 XX(custom_logger)
 XX(discarding_before_send)
 XX(distributed_headers)
 XX(drop_unfinished_spans)
+XX(dsn_auth_header_custom_user_agent)
+XX(dsn_auth_header_invalid_dsn)
+XX(dsn_auth_header_no_user_agent)
+XX(dsn_auth_header_null_dsn)
 XX(dsn_parsing_complete)
 XX(dsn_parsing_invalid)
-XX(dsn_store_url_without_path)
+XX(dsn_store_url_custom_agent)
 XX(dsn_store_url_with_path)
+XX(dsn_store_url_without_path)
+XX(dsn_with_ending_forward_slash_will_be_cleaned)
+XX(dsn_with_non_http_scheme_is_invalid)
+XX(dsn_without_project_id_is_invalid)
+XX(dsn_without_url_scheme_is_invalid)
 XX(empty_transport)
+XX(exception_without_type_or_value_still_valid)
 XX(fuzz_json)
 XX(init_failure)
 XX(internal_uuid_api)
@@ -36,18 +49,24 @@ XX(invalid_dsn)
 XX(invalid_proxy)
 XX(iso_time)
 XX(lazy_attachments)
+XX(message_with_null_text_is_valid)
 XX(module_addr)
 XX(module_finder)
 XX(mpack_newlines)
 XX(mpack_removed_tags)
 XX(multiple_inits)
 XX(multiple_transactions)
+XX(options_sdk_name_custom)
+XX(options_sdk_name_defaults)
+XX(options_sdk_name_invalid)
 XX(os)
 XX(overflow_spans)
 XX(page_allocator)
 XX(path_basics)
 XX(path_current_exe)
 XX(path_directory)
+XX(path_from_str_n_wo_null_termination)
+XX(path_from_str_null)
 XX(path_joining_unix)
 XX(path_joining_windows)
 XX(path_relative_filename)
@@ -57,18 +76,34 @@ XX(recursive_paths)
 XX(sampling_before_send)
 XX(sampling_decision)
 XX(sampling_transaction)
+XX(sentry__value_span_new_requires_unfinished_parent)
 XX(serialize_envelope)
 XX(session_basics)
+XX(set_tag_allows_null_tag_and_value)
+XX(set_tag_cuts_value_at_length_200)
 XX(slice)
+XX(span_data)
+XX(span_data_n)
+XX(span_tagging)
+XX(span_tagging_n)
 XX(spans_on_scope)
 XX(symbolizer)
 XX(task_queue)
+XX(thread_without_name_still_valid)
 XX(transaction_name_backfill_on_finish)
 XX(transactions_skip_before_send)
 XX(transport_sampling_transactions)
+XX(txn_data)
+XX(txn_data_n)
+XX(txn_name)
+XX(txn_name_n)
+XX(txn_tagging)
+XX(txn_tagging_n)
 XX(uninitialized)
 XX(unsampled_spans)
 XX(unwinder)
+XX(update_from_header_no_sampled_flag)
+XX(update_from_header_null_ctx)
 XX(url_parsing_complete)
 XX(url_parsing_invalid)
 XX(url_parsing_partial)
@@ -78,6 +113,7 @@ XX(value_bool)
 XX(value_collections_leak)
 XX(value_double)
 XX(value_freezing)
+XX(value_get_by_null_key)
 XX(value_int32)
 XX(value_json_deeply_nested)
 XX(value_json_escaping)
@@ -90,7 +126,11 @@ XX(value_null)
 XX(value_object)
 XX(value_object_merge)
 XX(value_object_merge_nested)
+XX(value_remove_by_null_key)
+XX(value_set_by_null_key)
 XX(value_set_stacktrace)
 XX(value_string)
+XX(value_string_n)
 XX(value_unicode)
 XX(value_wrong_type)
+XX(write_envelope_to_file_null)
diff --git a/external_imported/simpleini/.github/workflows/test.yml b/external_imported/simpleini/.github/workflows/test.yml
new file mode 100644
index 000000000..9bc80ef70
--- /dev/null
+++ b/external_imported/simpleini/.github/workflows/test.yml
@@ -0,0 +1,23 @@
+name: Test SimpleIni
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  Ubuntu:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Install requirements
+      run: sudo apt install libgtest-dev
+    - uses: actions/checkout@v2
+    - run: make all && make test
+  MacOS:
+    runs-on: macos-latest
+    steps:
+    - name: Install requirements
+      run: brew install googletest
+    - uses: actions/checkout@v2
+    - run: make all && make test
diff --git a/external_imported/simpleini/.travis.yml b/external_imported/simpleini/.travis.yml
deleted file mode 100644
index c1f1852ca..000000000
--- a/external_imported/simpleini/.travis.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-language: cpp
-
-os:
-  - linux
-  - osx
-
-compiler:
-  - gcc
-  - clang
-
-script:
-  - make all
-  - make test
diff --git a/external_imported/simpleini/README.md b/external_imported/simpleini/README.md
index 697df5fbc..d6d9fc774 100644
--- a/external_imported/simpleini/README.md
+++ b/external_imported/simpleini/README.md
@@ -1,7 +1,8 @@
 simpleini
 =========
 
-[![Build Status](https://api.travis-ci.org/brofield/simpleini.svg?branch=master)](https://travis-ci.org/brofield/simpleini)
+![Test Results Linux](https://github.com/brofield/simpleini/actions/workflows/test.yml/badge.svg)
+![Test Results Windows](https://ci.appveyor.com/api/projects/status/github/brofield/simpleini?svg=true)
 
 A cross-platform library that provides a simple API to read and write INI-style configuration files. It supports data files in ASCII, MBCS and Unicode. It is designed explicitly to be portable to any platform and has been tested on Windows, WinCE and Linux. Released as open-source and free using the MIT licence.
 
@@ -12,7 +13,7 @@ A cross-platform library that provides a simple API to read and write INI-style
 - loading and saving of INI-style configuration files
 - configuration files can have any newline format on all platforms
 - liberal acceptance of file format
-  * key/values with no section
+  * key/values with no section, keys with no value
   * removal of whitespace around sections, keys and values
 - support for multi-line values (values with embedded newline characters)
 - optional support for multiple keys with the same name
diff --git a/external_imported/simpleini/SimpleIni.h b/external_imported/simpleini/SimpleIni.h
index d6336db36..ef3c7d0bd 100644
--- a/external_imported/simpleini/SimpleIni.h
+++ b/external_imported/simpleini/SimpleIni.h
@@ -3,9 +3,9 @@
     <table>
         <tr><th>Library     <td>SimpleIni
         <tr><th>File        <td>SimpleIni.h
-        <tr><th>Author      <td>Brodie Thiesfield [brofield at gmail dot com]
+        <tr><th>Author      <td>Brodie Thiesfield
         <tr><th>Source      <td>https://github.com/brofield/simpleini
-        <tr><th>Version     <td>4.17
+        <tr><th>Version     <td>4.19
     </table>
 
     Jump to the @link CSimpleIniTempl CSimpleIni @endlink interface documentation.
@@ -42,22 +42,31 @@
         - Windows/VC6 (warning level 3)
         - Windows/VC.NET 2003 (warning level 4)
         - Windows/VC 2005 (warning level 4)
+        - Windows/VC 2019 (warning level 4)
         - Linux/gcc (-Wall)
 
 
     @section usage USAGE SUMMARY
 
+    -#  Decide if you will be using utf8 or MBCS files, and working with the
+        data in utf8, wchar_t or ICU chars. 
+    -#  If you will only be using straight utf8 files and access the data via the 
+        char interface, then you do not need any conversion library and could define 
+        SI_NO_CONVERSION. Note that no conversion also means no validation of the data.
+        If no converter is specified then the default converter is SI_CONVERT_GENERIC 
+        on Mac/Linux and SI_CONVERT_WIN32 on Windows. If you need widechar support on 
+        Mac/Linux then use either SI_CONVERT_GENERIC or SI_CONVERT_ICU. These are also
+        supported on all platforms.
     -#  Define the appropriate symbol for the converter you wish to use and
-        include the SimpleIni.h header file. If no specific converter is defined
-        then the default converter is used. The default conversion mode uses
-        SI_CONVERT_WIN32 on Windows and SI_CONVERT_GENERIC on all other
-        platforms. If you are using ICU then SI_CONVERT_ICU is supported on all
-        platforms.
-    -#  Declare an instance the appropriate class. Note that the following
+        include the SimpleIni.h header file. 
+    -#  Declare an instance of the appropriate class. Note that the following
         definitions are just shortcuts for commonly used types. Other types
         (PRUnichar, unsigned short, unsigned char) are also possible.
         <table>
-            <tr><th>Interface   <th>Case-sensitive  <th>Load UTF-8  <th>Load MBCS   <th>Typedef
+        <tr><th>Interface       <th>Case-sensitive  <th>Load UTF-8  <th>Load MBCS   <th>Typedef
+        <tr><th>SI_NO_CONVERSION
+            <tr><td>char        <td>No              <td>Yes         <td>No          <td>CSimpleIniA
+            <tr><td>char        <td>Yes             <td>Yes         <td>No          <td>CSimpleIniCaseA
         <tr><th>SI_CONVERT_GENERIC
             <tr><td>char        <td>No              <td>Yes         <td>Yes #1      <td>CSimpleIniA
             <tr><td>char        <td>Yes             <td>Yes         <td>Yes         <td>CSimpleIniCaseA
@@ -88,6 +97,8 @@
             <tr><td>GetValue        <td>Return a value for a section & key
             <tr><td>SetValue        <td>Add or update a value for a section & key
             <tr><td>Delete          <td>Remove a section, or a key from a section
+            <tr><td>SectionExists   <td>Does a section exist?
+            <tr><td>KeyExists       <td>Does a key exist?
         </table>
     -# Call Save() or SaveFile() to save the INI configuration data
 
@@ -234,16 +245,16 @@
 # define SI_ASSERT(x)
 #endif
 
-enum SI_Error {
-    SI_OK       =  0,   //!< No error
-    SI_UPDATED  =  1,   //!< An existing value was updated
-    SI_INSERTED =  2,   //!< A new value was inserted
+using SI_Error = int;
 
-    // note: test for any error with (retval < 0)
-    SI_FAIL     = -1,   //!< Generic failure
-    SI_NOMEM    = -2,   //!< Out of memory error
-    SI_FILE     = -3    //!< File error (see errno for detail error)
-};
+constexpr int SI_OK = 0;        //!< No error
+constexpr int SI_UPDATED = 1;   //!< An existing value was updated
+constexpr int SI_INSERTED = 2;  //!< A new value was inserted
+
+// note: test for any error with (retval < 0)
+constexpr int SI_FAIL = -1;     //!< Generic failure
+constexpr int SI_NOMEM = -2;    //!< Out of memory error
+constexpr int SI_FILE = -3;     //!< File error (see errno for detail error)
 
 #define SI_UTF8_SIGNATURE     "\xEF\xBB\xBF"
 
@@ -542,6 +553,35 @@ class CSimpleIniTempl
     /** Query the status of spaces output */
     bool UsingSpaces() const { return m_bSpaces; }
     
+
+    /** Should we recognise and parse quotes in single line values?
+
+        \param a_bParseQuotes  Parse quoted data in values?
+     */
+    void SetQuotes(bool a_bParseQuotes = true) {
+        m_bParseQuotes = a_bParseQuotes;
+    }
+
+    /** Are we permitting keys and values to be quoted? */
+    bool UsingQuotes() const { return m_bParseQuotes; }
+
+    /** When reading/writing an ini file, do we require every key to have an equals
+        sign to delineate a valid key value. If false, then every valid key must
+        have an equals sign and any lines without an equals sign is ignored. If
+        true then keys do not require an equals sign to be considered a key. Note 
+        that this means that any non-commented line of text would become a key.
+
+        \param a_bAllowKeyOnly  Permit keys without an equals sign or value.
+     */
+    void SetAllowKeyOnly(bool a_bAllowKeyOnly = true) {
+        m_bAllowKeyOnly = a_bAllowKeyOnly;
+    }
+
+    /** Do we allow keys to exist without a value or equals sign? */
+    bool GetAllowKeyOnly() const { return m_bAllowKeyOnly; }
+
+
+
     /*-----------------------------------------------------------------------*/
     /** @}
         @{ @name Loading INI Data */
@@ -838,13 +878,27 @@ class CSimpleIniTempl
         are in use!
 
         @param a_pSection       Name of the section to return
-        @return boolean         Was a section matching the supplied
-                                name found.
+        @return                 Section data
      */
     const TKeyVal * GetSection(
         const SI_CHAR * a_pSection
         ) const;
 
+    /** Test if a section exists. Convenience function */
+    inline const bool SectionExists(
+        const SI_CHAR * a_pSection
+    ) const {
+        return GetSection(a_pSection) != NULL;
+    }
+
+    /** Test if the key exists in a section. Convenience function. */
+    inline const bool KeyExists(
+        const SI_CHAR * a_pSection,
+        const SI_CHAR * a_pKey
+    ) const {
+        return GetValue(a_pSection, a_pKey) != NULL;
+    }
+
     /** Retrieve the value for a specific key. If multiple keys are enabled
         (see SetMultiKey) then only the first value associated with that key
         will be returned, see GetAllValues for getting all values with multikey.
@@ -1214,6 +1268,7 @@ class CSimpleIniTempl
 
     bool IsMultiLineTag(const SI_CHAR * a_pData) const;
     bool IsMultiLineData(const SI_CHAR * a_pData) const;
+    bool IsSingleLineQuotedValue(const SI_CHAR* a_pData) const;
     bool LoadMultiLineText(
         SI_CHAR *&          a_pData,
         const SI_CHAR *&    a_pVal,
@@ -1245,6 +1300,9 @@ class CSimpleIniTempl
     /** File comment for this data, if one exists. */
     const SI_CHAR * m_pFileComment;
 
+    /** constant empty string */
+    const SI_CHAR m_cEmptyString;
+
     /** Parsed INI data. Section -> (Key -> Value). */
     TSection m_data;
 
@@ -1266,6 +1324,12 @@ class CSimpleIniTempl
     /** Should spaces be written out surrounding the equals sign? */
     bool m_bSpaces;
     
+    /** Should quoted data in values be recognized and parsed? */
+    bool m_bParseQuotes;
+
+    /** Do keys always need to have an equals sign when reading/writing? */
+    bool m_bAllowKeyOnly;
+
     /** Next order value, used to ensure sections and keys are output in the
         same order that they are loaded/added.
      */
@@ -1285,10 +1349,13 @@ CSimpleIniTempl<SI_CHAR,SI_STRLESS,SI_CONVERTER>::CSimpleIniTempl(
   : m_pData(0)
   , m_uDataLen(0)
   , m_pFileComment(NULL)
+  , m_cEmptyString(0)
   , m_bStoreIsUtf8(a_bIsUtf8)
   , m_bAllowMultiKey(a_bAllowMultiKey)
   , m_bAllowMultiLine(a_bAllowMultiLine)
   , m_bSpaces(true)
+  , m_bParseQuotes(false)
+  , m_bAllowKeyOnly(false)
   , m_nOrder(0)
 { }
 
@@ -1387,7 +1454,7 @@ CSimpleIniTempl<SI_CHAR,SI_STRLESS,SI_CONVERTER>::LoadFile(
     }
     
     // allocate and ensure NULL terminated
-    char * pData = new(std::nothrow) char[lSize+1];
+    char * pData = new(std::nothrow) char[lSize+static_cast<size_t>(1)];
     if (!pData) {
         return SI_NOMEM;
     }
@@ -1545,6 +1612,7 @@ CSimpleIniTempl<SI_CHAR,SI_STRLESS,SI_CONVERTER>::FindEntry(
 {
     a_pComment = NULL;
 
+    bool bHaveValue = false;
     SI_CHAR * pTrail = NULL;
     while (*a_pData) {
         // skip spaces and empty lines
@@ -1602,19 +1670,20 @@ CSimpleIniTempl<SI_CHAR,SI_STRLESS,SI_CONVERTER>::FindEntry(
         }
 
         // find the end of the key name (it may contain spaces)
-        // and convert it to lowercase as necessary
         a_pKey = a_pData;
         while (*a_pData && *a_pData != '=' && !IsNewLineChar(*a_pData)) {
             ++a_pData;
         }
+        // *a_pData is null, equals, or newline
 
-        // if it's an invalid line, just skip it
-        if (*a_pData != '=') {
+        // if no value and we don't allow no value, then invalid
+        bHaveValue = (*a_pData == '=');
+        if (!bHaveValue && !m_bAllowKeyOnly) {
             continue;
         }
 
         // empty keys are invalid
-        if (a_pKey == a_pData) {
+        if (bHaveValue && a_pKey == a_pData) {
             while (*a_pData && !IsNewLineChar(*a_pData)) {
                 ++a_pData;
             }
@@ -1627,36 +1696,56 @@ CSimpleIniTempl<SI_CHAR,SI_STRLESS,SI_CONVERTER>::FindEntry(
             --pTrail;
         }
         ++pTrail;
-        *pTrail = 0;
 
-        // skip leading whitespace on the value
-        ++a_pData;  // safe as checked that it == '=' above
-        while (*a_pData && !IsNewLineChar(*a_pData) && IsSpace(*a_pData)) {
-            ++a_pData;
-        }
+        if (bHaveValue) {
+            // process the value 
+            *pTrail = 0;
 
-        // find the end of the value which is the end of this line
-        a_pVal = a_pData;
-        while (*a_pData && !IsNewLineChar(*a_pData)) {
-            ++a_pData;
-        }
+            // skip leading whitespace on the value
+            ++a_pData;  // safe as checked that it == '=' above
+            while (*a_pData && !IsNewLineChar(*a_pData) && IsSpace(*a_pData)) {
+                ++a_pData;
+            }
 
-        // remove trailing spaces from the value
-        pTrail = a_pData - 1;
-        if (*a_pData) { // prepare for the next round
-            SkipNewLine(a_pData);
-        }
-        while (pTrail >= a_pVal && IsSpace(*pTrail)) {
-            --pTrail;
-        }
-        ++pTrail;
-        *pTrail = 0;
+            // find the end of the value which is the end of this line
+            a_pVal = a_pData;
+            while (*a_pData && !IsNewLineChar(*a_pData)) {
+                ++a_pData;
+            }
+
+            // remove trailing spaces from the value
+            pTrail = a_pData - 1;
+            if (*a_pData) { // prepare for the next round
+                SkipNewLine(a_pData);
+            }
+            while (pTrail >= a_pVal && IsSpace(*pTrail)) {
+                --pTrail;
+            }
+            ++pTrail;
+            *pTrail = 0;
+
+            // check for multi-line entries
+            if (m_bAllowMultiLine && IsMultiLineTag(a_pVal)) {
+                // skip the "<<<" to get the tag that will end the multiline
+                const SI_CHAR* pTagName = a_pVal + 3;
+                return LoadMultiLineText(a_pData, a_pVal, pTagName);
+            }
 
-        // check for multi-line entries
-        if (m_bAllowMultiLine && IsMultiLineTag(a_pVal)) {
-            // skip the "<<<" to get the tag that will end the multiline
-            const SI_CHAR * pTagName = a_pVal + 3;
-            return LoadMultiLineText(a_pData, a_pVal, pTagName);
+            // check for quoted values, we are not supporting escapes in quoted values (yet)
+            if (m_bParseQuotes) {
+                --pTrail;
+                if (pTrail > a_pVal && *a_pVal == '"' && *pTrail == '"') {
+                    ++a_pVal;
+                    *pTrail = 0;
+                }
+            }
+        }
+        else {
+            // no value to process, just prepare for the next
+            if (*a_pData) { 
+                SkipNewLine(a_pData);
+            }
+            *pTrail = 0;
         }
 
         // return the standard entry
@@ -1716,6 +1805,41 @@ CSimpleIniTempl<SI_CHAR,SI_STRLESS,SI_CONVERTER>::IsMultiLineData(
     return false;
 }
 
+template<class SI_CHAR, class SI_STRLESS, class SI_CONVERTER>
+bool
+CSimpleIniTempl<SI_CHAR, SI_STRLESS, SI_CONVERTER>::IsSingleLineQuotedValue(
+    const SI_CHAR* a_pData
+) const
+{
+    // data needs quoting if it starts or ends with whitespace 
+    // and doesn't have embedded newlines
+
+    // empty string
+    if (!*a_pData) {
+        return false;
+    }
+
+    // check for prefix
+    if (IsSpace(*a_pData)) {
+        return true;
+    }
+
+    // embedded newlines
+    while (*a_pData) {
+        if (IsNewLineChar(*a_pData)) {
+            return false;
+        }
+        ++a_pData;
+    }
+
+    // check for suffix
+    if (IsSpace(*--a_pData)) {
+        return true;
+    }
+
+    return false;
+}
+
 template<class SI_CHAR, class SI_STRLESS, class SI_CONVERTER>
 bool
 CSimpleIniTempl<SI_CHAR,SI_STRLESS,SI_CONVERTER>::IsNewLineChar(
@@ -1919,7 +2043,7 @@ CSimpleIniTempl<SI_CHAR,SI_STRLESS,SI_CONVERTER>::AddEntry(
 
         // only set the comment if this is a section only entry
         Entry oSection(a_pSection, ++m_nOrder);
-        if (a_pComment && (!a_pKey || !a_pValue)) {
+        if (a_pComment && !a_pKey) {
             oSection.pComment = a_pComment;
         }
 
@@ -1929,8 +2053,8 @@ CSimpleIniTempl<SI_CHAR,SI_STRLESS,SI_CONVERTER>::AddEntry(
         iSection = i.first;
         bInserted = true;
     }
-    if (!a_pKey || !a_pValue) {
-        // section only entries are specified with pItem and pVal as NULL
+    if (!a_pKey) {
+        // section only entries are specified with pItem as NULL
         return bInserted ? SI_INSERTED : SI_UPDATED;
     }
 
@@ -1960,6 +2084,11 @@ CSimpleIniTempl<SI_CHAR,SI_STRLESS,SI_CONVERTER>::AddEntry(
         iKey = keyval.end();
     }
 
+    // values need to be a valid string, even if they are an empty string
+    if (!a_pValue) {
+        a_pValue = &m_cEmptyString;
+    }
+
     // make string copies if necessary
     bool bForceCreateNewKey = m_bAllowMultiKey && !a_bForceReplace;
     if (a_bCopyStrings) {
@@ -2051,7 +2180,7 @@ CSimpleIniTempl<SI_CHAR,SI_STRLESS,SI_CONVERTER>::GetLongValue(
     long nValue = a_nDefault;
     char * pszSuffix = szValue;
     if (szValue[0] == '0' && (szValue[1] == 'x' || szValue[1] == 'X')) {
-    	if (!szValue[2]) return a_nDefault;
+        if (!szValue[2]) return a_nDefault;
         nValue = strtol(&szValue[2], &pszSuffix, 16);
     }
     else {
@@ -2132,32 +2261,32 @@ CSimpleIniTempl<SI_CHAR,SI_STRLESS,SI_CONVERTER>::GetDoubleValue(
 template<class SI_CHAR, class SI_STRLESS, class SI_CONVERTER>
 SI_Error 
 CSimpleIniTempl<SI_CHAR,SI_STRLESS,SI_CONVERTER>::SetDoubleValue(
-	const SI_CHAR * a_pSection,
-	const SI_CHAR * a_pKey,
-	double          a_nValue,
-	const SI_CHAR * a_pComment,
-	bool            a_bForceReplace
-	)
+    const SI_CHAR * a_pSection,
+    const SI_CHAR * a_pKey,
+    double          a_nValue,
+    const SI_CHAR * a_pComment,
+    bool            a_bForceReplace
+    )
 {
-	// use SetValue to create sections
-	if (!a_pSection || !a_pKey) return SI_FAIL;
+    // use SetValue to create sections
+    if (!a_pSection || !a_pKey) return SI_FAIL;
 
-	// convert to an ASCII string
-	char szInput[64];
+    // convert to an ASCII string
+    char szInput[64];
 #if __STDC_WANT_SECURE_LIB__ && !_WIN32_WCE
-	sprintf_s(szInput, "%f", a_nValue);
+    sprintf_s(szInput, "%f", a_nValue);
 #else // !__STDC_WANT_SECURE_LIB__
-	sprintf(szInput, "%f", a_nValue);
+    sprintf(szInput, "%f", a_nValue);
 #endif // __STDC_WANT_SECURE_LIB__
 
-	// convert to output text
-	SI_CHAR szOutput[64];
-	SI_CONVERTER c(m_bStoreIsUtf8);
-	c.ConvertFromStore(szInput, strlen(szInput) + 1, 
-		szOutput, sizeof(szOutput) / sizeof(SI_CHAR));
+    // convert to output text
+    SI_CHAR szOutput[64];
+    SI_CONVERTER c(m_bStoreIsUtf8);
+    c.ConvertFromStore(szInput, strlen(szInput) + 1, 
+        szOutput, sizeof(szOutput) / sizeof(SI_CHAR));
 
-	// actually add it
-	return AddEntry(a_pSection, a_pKey, szOutput, a_pComment, a_bForceReplace, true);
+    // actually add it
+    return AddEntry(a_pSection, a_pKey, szOutput, a_pComment, a_bForceReplace, true);
 }
 
 template<class SI_CHAR, class SI_STRLESS, class SI_CONVERTER>
@@ -2520,22 +2649,31 @@ CSimpleIniTempl<SI_CHAR,SI_STRLESS,SI_CONVERTER>::Save(
                 }
                 a_oOutput.Write(convert.Data());
 
-                // write the value
-                if (!convert.ConvertToStore(iValue->pItem)) {
-                    return SI_FAIL;
-                }
-                a_oOutput.Write(m_bSpaces ? " = " : "=");
-                if (m_bAllowMultiLine && IsMultiLineData(iValue->pItem)) {
-                    // multi-line data needs to be processed specially to ensure
-                    // that we use the correct newline format for the current system
-                    a_oOutput.Write("<<<END_OF_TEXT" SI_NEWLINE_A);
-                    if (!OutputMultiLineText(a_oOutput, convert, iValue->pItem)) {
+                // write the value as long 
+                if (*iValue->pItem || !m_bAllowKeyOnly) {
+                    if (!convert.ConvertToStore(iValue->pItem)) {
                         return SI_FAIL;
                     }
-                    a_oOutput.Write("END_OF_TEXT");
-                }
-                else {
-                    a_oOutput.Write(convert.Data());
+                    a_oOutput.Write(m_bSpaces ? " = " : "=");
+                    if (m_bParseQuotes && IsSingleLineQuotedValue(iValue->pItem)) {
+                        // the only way to preserve external whitespace on a value (i.e. before or after)
+                        // is to quote it. This is simple quoting, we don't escape quotes within the data. 
+                        a_oOutput.Write("\"");
+                        a_oOutput.Write(convert.Data());
+                        a_oOutput.Write("\"");
+                    }
+                    else if (m_bAllowMultiLine && IsMultiLineData(iValue->pItem)) {
+                        // multi-line data needs to be processed specially to ensure
+                        // that we use the correct newline format for the current system
+                        a_oOutput.Write("<<<END_OF_TEXT" SI_NEWLINE_A);
+                        if (!OutputMultiLineText(a_oOutput, convert, iValue->pItem)) {
+                            return SI_FAIL;
+                        }
+                        a_oOutput.Write("END_OF_TEXT");
+                    }
+                    else {
+                        a_oOutput.Write(convert.Data());
+                    }
                 }
                 a_oOutput.Write(SI_NEWLINE_A);
             }
@@ -3427,6 +3565,19 @@ class SI_ConvertW {
 #endif // SI_CONVERT_WIN32
 
 
+
+// ---------------------------------------------------------------------------
+//                              SI_NO_CONVERSION
+// ---------------------------------------------------------------------------
+#ifdef SI_NO_CONVERSION
+
+#define SI_Case     SI_GenericCase
+#define SI_NoCase   SI_GenericNoCase
+
+#endif // SI_NO_CONVERSION
+
+
+
 // ---------------------------------------------------------------------------
 //                                  TYPE DEFINITIONS
 // ---------------------------------------------------------------------------
diff --git a/external_imported/simpleini/tests/Makefile b/external_imported/simpleini/tests/Makefile
index 09049f70e..3b2980f4b 100644
--- a/external_imported/simpleini/tests/Makefile
+++ b/external_imported/simpleini/tests/Makefile
@@ -1,9 +1,9 @@
 CC=g++
 CFLAGS=-Wall -std=c++11
 CPPFLAGS=-Wall -std=c++11
-LDFLAGS=-lpthread -lgtest -lgtest_main -lpthread -L/usr/lib
+LDFLAGS=-lpthread -lgtest -lgtest_main -lpthread -L/usr/lib -L/usr/lib/x86_64-linux-gnu
 
-OBJS=ts-roundtrip.o ts-snippets.o ts-utf8.o ts-bugfix.o
+OBJS=ts-roundtrip.o ts-snippets.o ts-utf8.o ts-bugfix.o ts-quotes.o ts-noconvert.o
 
 BIN=./tests
 
diff --git a/external_imported/simpleini/tests/packages.config b/external_imported/simpleini/tests/packages.config
index 6c6422e88..88f987c91 100644
--- a/external_imported/simpleini/tests/packages.config
+++ b/external_imported/simpleini/tests/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn" version="1.8.1.3" targetFramework="native" />
+  <package id="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn" version="1.8.1.5" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/external_imported/simpleini/tests/tests.vcxproj b/external_imported/simpleini/tests/tests.vcxproj
index dc4211303..df55a27e6 100644
--- a/external_imported/simpleini/tests/tests.vcxproj
+++ b/external_imported/simpleini/tests/tests.vcxproj
@@ -38,6 +38,8 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="ts-bugfix.cpp" />
+    <ClCompile Include="ts-noconvert.cpp" />
+    <ClCompile Include="ts-quotes.cpp" />
     <ClCompile Include="ts-roundtrip.cpp" />
     <ClCompile Include="ts-snippets.cpp" />
     <ClCompile Include="ts-utf8.cpp" />
@@ -57,7 +59,7 @@
   <ItemDefinitionGroup />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\vcproj\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.3\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets" Condition="Exists('..\vcproj\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.3\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets')" />
+    <Import Project="..\vcproj\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.5\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets" Condition="Exists('..\vcproj\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.5\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets')" />
   </ImportGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -82,7 +84,7 @@
       <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -125,6 +127,6 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\vcproj\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.3\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\vcproj\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.3\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets'))" />
+    <Error Condition="!Exists('..\vcproj\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.5\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\vcproj\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.5\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/external_imported/simpleini/tests/ts-noconvert.cpp b/external_imported/simpleini/tests/ts-noconvert.cpp
new file mode 100644
index 000000000..d1951e44a
--- /dev/null
+++ b/external_imported/simpleini/tests/ts-noconvert.cpp
@@ -0,0 +1,69 @@
+#include "pch.h"
+
+#define SI_NO_CONVERSION
+#include "../SimpleIni.h"
+
+class TestNoConvert : public ::testing::Test {
+protected:
+	void SetUp() override;
+protected:
+	CSimpleIniA ini;
+};
+
+void TestNoConvert::SetUp() {
+	ini.SetUnicode();
+	SI_Error err = ini.LoadFile("tests.ini");
+	ASSERT_EQ(err, SI_OK);
+}
+
+TEST_F(TestNoConvert, TestSectionAKeyAValA) {
+	const char* result = ini.GetValue("section1", "key1");
+	ASSERT_STREQ(result, "value1");
+}
+
+TEST_F(TestNoConvert, TestSectionAKeyAValU) {
+	const char tesuto2[] = u8"テスト2"; 
+	const char* result = ini.GetValue("section2", "test2");
+	ASSERT_STREQ(result, tesuto2);
+}
+
+TEST_F(TestNoConvert, TestSectionAKeyUValA) {
+	const char tesuto[] = u8"テスト";
+	const char* result = ini.GetValue("section2", tesuto);
+	ASSERT_STREQ(result, "test");
+}
+
+TEST_F(TestNoConvert, TestSectionAKeyUValU) {
+	const char tesuto2[] = u8"テスト2";
+	const char tesutoni[] = u8"テスト二";
+	const char* result = ini.GetValue("section2", tesuto2);
+	ASSERT_STREQ(result, tesutoni);
+}
+
+TEST_F(TestNoConvert, TestSectionUKeyAValA) {
+	const char kensa[] = u8"検査";
+	const char* result = ini.GetValue(kensa, "key2");
+	ASSERT_STREQ(result, "value2");
+}
+
+TEST_F(TestNoConvert, TestSectionUKeyAValU) {
+	const char kensa[] = u8"検査";
+	const char tesuto2[] = u8"テスト2";
+	const char* result = ini.GetValue(kensa, "test2");
+	ASSERT_STREQ(result, tesuto2);
+}
+
+TEST_F(TestNoConvert, TestSectionUKeyUValA) {
+	const char kensa[] = u8"検査";
+	const char tesuto[] = u8"テスト";
+	const char* result = ini.GetValue(kensa, tesuto);
+	ASSERT_STREQ(result, "test");
+}
+
+TEST_F(TestNoConvert, TestSectionUKeyUValU) {
+	const char kensa[] = u8"検査";
+	const char tesuto2[] = u8"テスト2";
+	const char tesutoni[] = u8"テスト二";
+	const char* result = ini.GetValue(kensa, tesuto2);
+	ASSERT_STREQ(result, tesutoni);
+}
diff --git a/external_imported/simpleini/tests/ts-quotes.cpp b/external_imported/simpleini/tests/ts-quotes.cpp
new file mode 100644
index 000000000..5c5365a77
--- /dev/null
+++ b/external_imported/simpleini/tests/ts-quotes.cpp
@@ -0,0 +1,202 @@
+#include "pch.h"
+#include <algorithm>
+#include "../SimpleIni.h"
+
+class TestQuotes : public ::testing::Test {
+protected:
+	void SetUp() override;
+
+protected:
+	CSimpleIniA ini;
+	std::string input;
+	std::string expect;
+	std::string output;
+};
+
+void TestQuotes::SetUp() {
+	ini.SetUnicode();
+}
+
+TEST_F(TestQuotes, TestEmpty) {
+	ini.SetQuotes(true);
+
+	input =
+		"[section]\n"
+		"key1 = \"\"\n"
+		"key2 = \n"
+		;
+
+	// no need to preserve quotes for empty data
+	expect =
+		"[section]\n"
+		"key1 = \n"
+		"key2 = \n"
+		;
+
+	const char* result;
+	SI_Error rc = ini.LoadData(input);
+	ASSERT_EQ(rc, SI_OK);
+
+	result = ini.GetValue("section", "key1");
+	ASSERT_STREQ(result, "");
+
+	result = ini.GetValue("section", "key2");
+	ASSERT_STREQ(result, "");
+
+	rc = ini.Save(output);
+	ASSERT_EQ(rc, SI_OK);
+
+	output.erase(std::remove(output.begin(), output.end(), '\r'), output.end());
+	ASSERT_STREQ(expect.c_str(), output.c_str());
+}
+
+TEST_F(TestQuotes, TestEmptyDisabled) {
+	ini.SetQuotes(false);
+
+	input =
+		"[section]\n"
+		"key1 = \"\"\n"
+		"key2 = \n"
+		;
+
+	const char* result;
+	SI_Error rc = ini.LoadData(input);
+	ASSERT_EQ(rc, SI_OK);
+
+	result = ini.GetValue("section", "key1");
+	ASSERT_STREQ(result, "\"\"");
+
+	result = ini.GetValue("section", "key2");
+	ASSERT_STREQ(result, "");
+
+	rc = ini.Save(output);
+	ASSERT_EQ(rc, SI_OK);
+
+	output.erase(std::remove(output.begin(), output.end(), '\r'), output.end());
+	ASSERT_STREQ(input.c_str(), output.c_str());
+}
+
+TEST_F(TestQuotes, TestGeneral) {
+	ini.SetQuotes(true);
+
+	input =
+		"[section]\n"
+		"key1 = foo\n"
+		"key2 = \"foo\"\n"
+		"key3 =  foo \n"
+		"key4 = \" foo \"\n"
+		"key5 = \"foo\n"
+		"key6 = foo\"\n"
+		"key7 =  foo \" foo \n"
+		"key8 =  \" foo \" foo \" \n"
+		;
+
+	expect =
+		"[section]\n"
+		"key1 = foo\n"
+		"key2 = foo\n"
+		"key3 = foo\n"
+		"key4 = \" foo \"\n"
+		"key5 = \"foo\n"
+		"key6 = foo\"\n"
+		"key7 = foo \" foo\n"
+		"key8 = \" foo \" foo \"\n"
+		;
+
+	const char* result;
+	SI_Error rc = ini.LoadData(input);
+	ASSERT_EQ(rc, SI_OK);
+
+	result = ini.GetValue("section", "key1");
+	ASSERT_STREQ(result, "foo");
+
+	result = ini.GetValue("section", "key2");
+	ASSERT_STREQ(result, "foo");
+
+	result = ini.GetValue("section", "key3");
+	ASSERT_STREQ(result, "foo");
+
+	result = ini.GetValue("section", "key4");
+	ASSERT_STREQ(result, " foo ");
+
+	result = ini.GetValue("section", "key5");
+	ASSERT_STREQ(result, "\"foo");
+
+	result = ini.GetValue("section", "key6");
+	ASSERT_STREQ(result, "foo\"");
+
+	result = ini.GetValue("section", "key7");
+	ASSERT_STREQ(result, "foo \" foo");
+
+	result = ini.GetValue("section", "key8");
+	ASSERT_STREQ(result, " foo \" foo ");
+
+	rc = ini.Save(output);
+	ASSERT_EQ(rc, SI_OK);
+
+	output.erase(std::remove(output.begin(), output.end(), '\r'), output.end());
+	ASSERT_STREQ(expect.c_str(), output.c_str());
+}
+
+TEST_F(TestQuotes, TestGeneralDisabled) {
+	ini.SetQuotes(false);
+
+	input =
+		"[section]\n"
+		"key1 = foo\n"
+		"key2 = \"foo\"\n"
+		"key3 =  foo \n"
+		"key4 = \" foo \"\n"
+		"key5 = \"foo\n"
+		"key6 = foo\"\n"
+		"key7 =  foo \" foo \n"
+		"key8 =  \" foo \" foo \" \n"
+		;
+
+	expect =
+		"[section]\n"
+		"key1 = foo\n"
+		"key2 = \"foo\"\n"
+		"key3 = foo\n"
+		"key4 = \" foo \"\n"
+		"key5 = \"foo\n"
+		"key6 = foo\"\n"
+		"key7 = foo \" foo\n"
+		"key8 = \" foo \" foo \"\n"
+		;
+
+	const char* result;
+	SI_Error rc = ini.LoadData(input);
+	ASSERT_EQ(rc, SI_OK);
+
+	rc = ini.Save(output);
+	ASSERT_EQ(rc, SI_OK);
+
+	result = ini.GetValue("section", "key1");
+	ASSERT_STREQ(result, "foo");
+
+	result = ini.GetValue("section", "key2");
+	ASSERT_STREQ(result, "\"foo\"");
+
+	result = ini.GetValue("section", "key3");
+	ASSERT_STREQ(result, "foo");
+
+	result = ini.GetValue("section", "key4");
+	ASSERT_STREQ(result, "\" foo \"");
+
+	result = ini.GetValue("section", "key5");
+	ASSERT_STREQ(result, "\"foo");
+
+	result = ini.GetValue("section", "key6");
+	ASSERT_STREQ(result, "foo\"");
+
+	result = ini.GetValue("section", "key7");
+	ASSERT_STREQ(result, "foo \" foo");
+
+	result = ini.GetValue("section", "key8");
+	ASSERT_STREQ(result, "\" foo \" foo \"");
+
+	output.erase(std::remove(output.begin(), output.end(), '\r'), output.end());
+	ASSERT_STREQ(expect.c_str(), output.c_str());
+}
+
diff --git a/external_imported/simpleini/tests/ts-roundtrip.cpp b/external_imported/simpleini/tests/ts-roundtrip.cpp
index d4e663a90..4bbc4156d 100644
--- a/external_imported/simpleini/tests/ts-roundtrip.cpp
+++ b/external_imported/simpleini/tests/ts-roundtrip.cpp
@@ -29,7 +29,11 @@ TEST_F(TestRoundTrip, TestStandard) {
 		"\n"
 		"; Section 2 comment\n"
 		"[section2]\n"
+		"\n"
+		"; key1 comment\n"
 		"key1 = string\n"
+		"\n"
+		"; key 2 comment\n"
 		"key2 = true\n"
 		"key3 = 3.1415\n"
 		;
@@ -161,3 +165,82 @@ TEST_F(TestRoundTrip, TestWithoutBOM) {
 	std::string expected(input, 3);
 	ASSERT_STREQ(expected.c_str(), output.c_str());
 }
+
+TEST_F(TestRoundTrip, TestAllowKeyOnly1) {
+	ini.SetAllowKeyOnly(false);
+
+	input =
+		"[section1]\n"
+		"key1 = string\n"
+		"key2 = \n"
+		"key3= \n"
+		"key4=\n"
+		"key5\n"
+		"\n"
+		"Never going to give you up\n"
+		"Never going to let you down\n"
+		;
+
+	std::string expect =
+		"[section1]\n"
+		"key1 = string\n"
+		"key2 = \n"
+		"key3 = \n"
+		"key4 = \n"
+		;
+
+	SI_Error rc = ini.LoadData(input);
+	ASSERT_EQ(rc, SI_OK);
+
+	rc = ini.Save(output);
+	ASSERT_EQ(rc, SI_OK);
+
+	output.erase(std::remove(output.begin(), output.end(), '\r'), output.end());
+	ASSERT_STREQ(expect.c_str(), output.c_str());
+}
+
+TEST_F(TestRoundTrip, TestAllowKeyOnly2) {
+	ini.SetAllowKeyOnly(true);
+
+	input =
+		"[section1]\n"
+		"key1\n"
+		"key2\n"
+		"[section2]\n"
+		"key1 = string\n"
+		"key2 = \n"
+		"key3= \n"
+		"key4=\n"
+		"\n"
+		"key5\n"
+		"\n"
+		"Never going to give you up\n"
+		"\n"
+		"Never going to let you down\n"
+		;
+
+	std::string expect =
+		"[section1]\n"
+		"key1\n"
+		"key2\n"
+		"\n\n"
+		"[section2]\n"
+		"key1 = string\n"
+		"key2\n"
+		"key3\n"
+		"key4\n"
+		"key5\n"
+		"Never going to give you up\n"
+		"Never going to let you down\n"
+		;
+
+	SI_Error rc = ini.LoadData(input);
+	ASSERT_EQ(rc, SI_OK);
+
+	rc = ini.Save(output);
+	ASSERT_EQ(rc, SI_OK);
+
+	output.erase(std::remove(output.begin(), output.end(), '\r'), output.end());
+	ASSERT_STREQ(expect.c_str(), output.c_str());
+}
+
diff --git a/external_imported/simpleini/tests/ts-snippets.cpp b/external_imported/simpleini/tests/ts-snippets.cpp
index 8814e0bcd..773642c8c 100644
--- a/external_imported/simpleini/tests/ts-snippets.cpp
+++ b/external_imported/simpleini/tests/ts-snippets.cpp
@@ -156,6 +156,50 @@ TEST(TestSnippets, TestGettingValues) {
 	ASSERT_EQ(expectedValues[i], nullptr);
 }
 
+// ### VALUE EXISTS
+
+TEST(TestSnippets, TestExists)
+{
+	const std::string example =
+		"[section1]\n"
+		"key1 = value1\n"
+		"key2 = value2.1\n"
+		"key2 = value2.2\n"
+		"\n"
+		"[section2]\n"
+		"key1\n"
+		"key2\n"
+		"[section3]\n";
+
+	CSimpleIniA ini;
+	ini.SetUnicode();
+	ini.SetMultiKey();
+	ini.SetAllowKeyOnly();
+
+	SI_Error rc = ini.LoadData(example);
+	ASSERT_EQ(rc, SI_OK);
+
+
+	// check for section doesn't exist
+	EXPECT_FALSE(ini.SectionExists(""));
+	EXPECT_FALSE(ini.SectionExists("section4"));
+
+	// check for section does exist
+	EXPECT_TRUE(ini.SectionExists("section1"));
+	EXPECT_TRUE(ini.SectionExists("section2"));
+	EXPECT_TRUE(ini.SectionExists("section3"));
+
+	// check for key doesn't exist
+	EXPECT_FALSE(ini.KeyExists("", "key"));
+	EXPECT_FALSE(ini.KeyExists("section1", "key"));
+	EXPECT_FALSE(ini.KeyExists("section2", "key"));
+
+	// check for key does exist
+	EXPECT_TRUE(ini.KeyExists("section1", "key1"));
+	EXPECT_TRUE(ini.KeyExists("section1", "key2"));
+	EXPECT_TRUE(ini.KeyExists("section2", "key1"));
+	EXPECT_TRUE(ini.KeyExists("section2", "key2"));
+}
 
 // ### MODIFYING DATA
 
diff --git a/external_imported/simpleini/vcproj/SimpleIni.sln b/external_imported/simpleini/vcproj/SimpleIni.sln
index be0dd1aa2..40d7a4560 100644
--- a/external_imported/simpleini/vcproj/SimpleIni.sln
+++ b/external_imported/simpleini/vcproj/SimpleIni.sln
@@ -18,7 +18,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Information Files", "Inform
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Other Files", "Other Files", "{560B512C-6D1C-4E65-83C1-049110E5DEF6}"
 	ProjectSection(SolutionItems) = preProject
-		..\other\.travis.yml = ..\other\.travis.yml
 		..\other\Makefile = ..\other\Makefile
 		..\other\package.cmd = ..\other\package.cmd
 		..\other\simpleini.doxy = ..\other\simpleini.doxy
diff --git a/external_imported/vcpkg/.github/ISSUE_TEMPLATE/00-report-package-build-failure.yml b/external_imported/vcpkg/.github/ISSUE_TEMPLATE/00-report-package-build-failure.yml
new file mode 100644
index 000000000..592526724
--- /dev/null
+++ b/external_imported/vcpkg/.github/ISSUE_TEMPLATE/00-report-package-build-failure.yml
@@ -0,0 +1,47 @@
+name: Report package build failure
+description: Let us know about build failures in ports.
+title: "[<port name>] build failure"
+labels: ["category:port-bug"]
+body:
+  - type: markdown
+    attributes:
+      value: | 
+        âš  Please use the generated issue template instead to report a port build failure. âš  <br>
+        See [here](https://github.com/microsoft/vcpkg/issues/30604) how to properly report an issue with the latest vcpkg version:
+        <video width="800" controls="controls" muted="muted" src="https://user-images.githubusercontent.com/41973254/229313721-b82c2d3d-b0f9-4e31-98df-08d75831f695.mp4"></video>
+  - type: input
+    id: os
+    attributes:
+      label: Operating system
+      placeholder: "e.g. Windows/Linux etc..."
+    validations:
+      required: true
+  - type: input
+    id: compiler
+    attributes:
+      label: Compiler
+      placeholder: "GCC, Clang, MSVC, MinGW, ..."
+    validations:
+      required: false
+  - type: textarea
+    id: reproduce
+    attributes:
+      label: Steps to reproduce the behavior
+      placeholder: "`./vcpkg install xxxx`"
+      render: "Shell"
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Failure logs
+      description: The console output and all the logs mentioned in the output.
+    validations:
+      required: true
+  - type: textarea
+    id: context
+    attributes:
+      label: Additional context
+      description: Add any other context about the problem here, such as what you have already tried to resolve the issue.
+    validations:
+      required: false
diff --git a/external_imported/vcpkg/.github/ISSUE_TEMPLATE/01-request-a-new-port.yml b/external_imported/vcpkg/.github/ISSUE_TEMPLATE/01-request-a-new-port.yml
new file mode 100644
index 000000000..ff9d6f0d9
--- /dev/null
+++ b/external_imported/vcpkg/.github/ISSUE_TEMPLATE/01-request-a-new-port.yml
@@ -0,0 +1,36 @@
+name: Request a new port
+description: Request a new port/library that vcpkg should support.
+title: "[New Port Request] <library name here>"
+labels: ["category:new-port", "info:good-first-issue"]
+
+body:
+  - type: input
+    id: name
+    attributes:
+      label: Library name
+    validations:
+      required: true
+  - type: input
+    id: description
+    attributes:
+      label: Library description
+    validations:
+      required: false
+  - type: input
+    id: url
+    attributes:
+      label: Source repository URL
+    validations:
+      required: true
+  - type: input
+    id: homepage
+    attributes:
+      label: Project homepage (if different from the source repository)
+    validations:
+      required: false
+  - type: textarea
+    id: additional-info
+    attributes:
+      label: Anything else that is useful to know when adding (such as optional features the library may have that should be included)
+    validations:
+      required: false
diff --git a/external_imported/vcpkg/.github/ISSUE_TEMPLATE/02-request-an-update-to-an-existing-port.yml b/external_imported/vcpkg/.github/ISSUE_TEMPLATE/02-request-an-update-to-an-existing-port.yml
new file mode 100644
index 000000000..06ef6eee2
--- /dev/null
+++ b/external_imported/vcpkg/.github/ISSUE_TEMPLATE/02-request-an-update-to-an-existing-port.yml
@@ -0,0 +1,23 @@
+name: Request an update to an existing port
+description: Let us know about a new version of a library we should pick up.
+title: "[<port name>] update to <version>"
+labels: ['category:port-update']
+body:
+  - type: input
+    id: name
+    attributes:
+      label: Library name
+    validations:
+      required: true
+  - type: input
+    id: version
+    attributes:
+      label: New version number
+    validations:
+      required: true
+  - type: textarea
+    id: information
+    attributes:
+      label: Other information that may be useful (release notes, etc...)
+    validations:
+      required: false
diff --git a/external_imported/vcpkg/.github/ISSUE_TEMPLATE/03-request-a-feature-or-improvement-to-a-port.yml b/external_imported/vcpkg/.github/ISSUE_TEMPLATE/03-request-a-feature-or-improvement-to-a-port.yml
new file mode 100644
index 000000000..231c34ae3
--- /dev/null
+++ b/external_imported/vcpkg/.github/ISSUE_TEMPLATE/03-request-a-feature-or-improvement-to-a-port.yml
@@ -0,0 +1,29 @@
+name: Request a feature or improvement to a port
+description: Suggest an improvement to one the the ports/libraries in vcpkg.
+title: "[<portname>] <short description of feature>"
+labels: ["category:port-feature"]
+body:
+  - type: textarea
+    attributes:
+      label: Is your feature request related to a problem? Please describe.
+      placeholder: A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Proposed solution
+      placeholder: A clear and concise description of what you want to happen.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Describe alternatives you've considered
+      placeholder: A clear and concise description of any alternative solutions or features you've considered if applicable.
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Additional context
+      placeholder: Add any other context or screenshots about the feature request here.
+    validations:
+      required: false
diff --git a/external_imported/vcpkg/.github/ISSUE_TEMPLATE/04-request-a-feature-or-improvement.yml b/external_imported/vcpkg/.github/ISSUE_TEMPLATE/04-request-a-feature-or-improvement.yml
new file mode 100644
index 000000000..c27fbc52a
--- /dev/null
+++ b/external_imported/vcpkg/.github/ISSUE_TEMPLATE/04-request-a-feature-or-improvement.yml
@@ -0,0 +1,29 @@
+name: Request a feature or improvement
+description: Suggest an improvement to vcpkg.
+title: ''
+labels: ["category:vcpkg-feature"]
+body:
+  - type: textarea
+    attributes:
+      label: Is your feature request related to a problem? Please describe.
+      placeholder: A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Proposed solution
+      placeholder: A clear and concise description of what you want to happen.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Describe alternatives you've considered
+      placeholder: A clear and concise description of any alternative solutions or features you've considered.
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Additional context
+      placeholder: Add any other context or screenshots about the feature request here.
+    validations:
+      required: false
diff --git a/external_imported/vcpkg/.github/ISSUE_TEMPLATE/05-other-type-of-bug-report.md b/external_imported/vcpkg/.github/ISSUE_TEMPLATE/05-other-type-of-bug-report.md
new file mode 100644
index 000000000..1774b230d
--- /dev/null
+++ b/external_imported/vcpkg/.github/ISSUE_TEMPLATE/05-other-type-of-bug-report.md
@@ -0,0 +1,31 @@
+---
+name: Other type of bug report
+about: Let us know about an issues that does not fit into any of the other issues.
+  types
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**Environment**
+- OS: [e.g. Windows/Linux etc...]
+- Compiler: revision
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. ./vcpkg install xxxx
+2. See error
+Repro code when
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Failure logs**
+-(please attached failure logs)
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/external_imported/vcpkg/.github/ISSUE_TEMPLATE/config.yml b/external_imported/vcpkg/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..9ca38f803
--- /dev/null
+++ b/external_imported/vcpkg/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: true
+contact_links:
+  - name: I have a question
+    url: https://github.com/microsoft/vcpkg/discussions
+    about: Please ask and answer questions here.
diff --git a/external_imported/vcpkg/.github/ISSUE_TEMPLATE/i-have-a-question.md b/external_imported/vcpkg/.github/ISSUE_TEMPLATE/i-have-a-question.md
deleted file mode 100644
index 643d43dce..000000000
--- a/external_imported/vcpkg/.github/ISSUE_TEMPLATE/i-have-a-question.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-name: I have a question
-about: I have a question and don't see a clear answer in documentation
-title: How do I ...
-labels: Question
-assignees: ''
-
----
-
-Please create a discussion in https://github.com/microsoft/vcpkg/discussions/new instead.
diff --git a/external_imported/vcpkg/.github/ISSUE_TEMPLATE/other-type-of-bug-report.md b/external_imported/vcpkg/.github/ISSUE_TEMPLATE/other-type-of-bug-report.md
deleted file mode 100644
index 8a12e861d..000000000
--- a/external_imported/vcpkg/.github/ISSUE_TEMPLATE/other-type-of-bug-report.md
+++ /dev/null
@@ -1,31 +0,0 @@
----
-name: Other type of bug report
-about: Let us know about an issues that does not fit into any of the other issues
-  types
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**Environment**
-- OS: [e.g. Windows/Linux etc...]
-- Compiler: revision
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. ./vcpkg install xxxx
-2. See error
-Repro code when
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Failure logs**
--(please attached failure logs)
-
-**Additional context**
-Add any other context about the problem here.
diff --git a/external_imported/vcpkg/.github/ISSUE_TEMPLATE/report-package-build-failure.md b/external_imported/vcpkg/.github/ISSUE_TEMPLATE/report-package-build-failure.md
deleted file mode 100644
index 5f0199cab..000000000
--- a/external_imported/vcpkg/.github/ISSUE_TEMPLATE/report-package-build-failure.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-name: Report package build failure
-about: Let us know about build failures in ports.
-title: "[<port name>] build failure"
-labels: category:port-bug
-assignees: ''
-
----
-
-<!-- âš  Please use the generated issue template instead to report a port build failure. âš  -->
-<!-- � You can find its location at the end of the console output. � -->
-
-**Host Environment**
-
-- OS: [e.g. Windows/Linux etc...]
-- Compiler: revision
-
-**To Reproduce**
-
-Steps to reproduce the behavior:
-
-`./vcpkg install xxxx`
-
-**Failure logs**
-
-- Cut and paste the appropriate build messages from the console output.
-- Attach ***every failure log file*** mentioned in the console output.
-
-<!-- ‼ **The console output by itself is not enough to investigate a build failure.** ‼ -->
-
-**Additional context**
-
-Add any other context about the problem here, such as what you have already tried to resolve the issue.
diff --git a/external_imported/vcpkg/.github/ISSUE_TEMPLATE/request-a-feature-or-improvement-to-a-port.md b/external_imported/vcpkg/.github/ISSUE_TEMPLATE/request-a-feature-or-improvement-to-a-port.md
deleted file mode 100644
index a40036f95..000000000
--- a/external_imported/vcpkg/.github/ISSUE_TEMPLATE/request-a-feature-or-improvement-to-a-port.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-name: Request a feature or improvement to a port
-about: Suggest an improvement to one the the ports/libraries in vcpkg
-title: "[<portname>] <short description of feature>"
-labels: port feature
-assignees: ''
-
----
-
-****
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Proposed solution**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered if applicable.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
diff --git a/external_imported/vcpkg/.github/ISSUE_TEMPLATE/request-a-feature-or-improvement.md b/external_imported/vcpkg/.github/ISSUE_TEMPLATE/request-a-feature-or-improvement.md
deleted file mode 100644
index 55d06b16a..000000000
--- a/external_imported/vcpkg/.github/ISSUE_TEMPLATE/request-a-feature-or-improvement.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-name: Request a feature or improvement
-about: Suggest an improvement to vcpkg
-title: ''
-labels: vcpkg feature
-assignees: ''
-
----
-
-****
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Proposed solution**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
diff --git a/external_imported/vcpkg/.github/ISSUE_TEMPLATE/request-a-new-port.md b/external_imported/vcpkg/.github/ISSUE_TEMPLATE/request-a-new-port.md
deleted file mode 100644
index 65c9bf01c..000000000
--- a/external_imported/vcpkg/.github/ISSUE_TEMPLATE/request-a-new-port.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-name: Request a new port
-about: Request a new port/library that vcpkg should support
-title: "[New Port Request] <library name here>"
-labels: new port request - consider making a PR!
-assignees: ''
-
----
-
-Library name:
-
-Library description:
-
-Source repository URL:
-
-Project homepage (if different from the source repository):
-
-Anything else that is useful to know when adding (such as optional features the library may have that should be included):
diff --git a/external_imported/vcpkg/.github/ISSUE_TEMPLATE/request-an-update-to-an-existing-port.md b/external_imported/vcpkg/.github/ISSUE_TEMPLATE/request-an-update-to-an-existing-port.md
deleted file mode 100644
index f1689b097..000000000
--- a/external_imported/vcpkg/.github/ISSUE_TEMPLATE/request-an-update-to-an-existing-port.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-name: Request an update to an existing port
-about: Let us know about a new version of a library we should pick up.
-title: "[<port name>] update to <version>"
-labels: port feature
-assignees: ''
-
----
-
-Library name:
-
-New version number:
-
-Other information that may be useful (release notes, etc...)
diff --git a/external_imported/vcpkg/.github/pull_request_template.md b/external_imported/vcpkg/.github/pull_request_template.md
index 0d4f7b96d..618be2cbf 100644
--- a/external_imported/vcpkg/.github/pull_request_template.md
+++ b/external_imported/vcpkg/.github/pull_request_template.md
@@ -1,12 +1,12 @@
 <!-- If your PR fixes issues, please note that here by adding "Fixes #NNNNNN." for each fixed issue on separate lines. -->
 
-<!-- If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/ -->
+<!-- If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/. -->
 
 <!-- If this PR updates an existing port, please uncomment and fill out this checklist:
 
-- [ ] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md)
-- [ ] SHA512s are updated for each updated download
-- [ ] The "supports" clause reflects platforms that may be fixed by this new version
+- [ ] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
+- [ ] SHA512s are updated for each updated download.
+- [ ] The "supports" clause reflects platforms that may be fixed by this new version.
 - [ ] Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file.
 - [ ] Any patches that are no longer applied are deleted from the port's directory.
 - [ ] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result.
@@ -16,9 +16,9 @@ END OF PORT UPDATE CHECKLIST (delete this line) -->
 
 <!-- If this PR adds a new port, please uncomment and fill out this checklist:
 
-- [ ] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md)
+- [ ] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
 - [ ] The name of the port matches an existing name for this component on https://repology.org/ if possible, and/or is strongly associated with that component on search engines.
-- [ ] Optional dependencies are resolved in exactly one way. For example, if the component is built with CMake, all `find_package` calls are REQUIRED, are satisfied by `vcpkg.json`'s declared dependencies, or disabled with [CMAKE_DISABLE_FIND_PACKAGE_Xxx](https://cmake.org/cmake/help/latest/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.html)
+- [ ] Optional dependencies are resolved in exactly one way. For example, if the component is built with CMake, all `find_package` calls are REQUIRED, are satisfied by `vcpkg.json`'s declared dependencies, or disabled with [CMAKE_DISABLE_FIND_PACKAGE_Xxx](https://cmake.org/cmake/help/latest/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.html).
 - [ ] The versioning scheme in `vcpkg.json` matches what upstream says.
 - [ ] The license declaration in `vcpkg.json` matches what upstream says.
 - [ ] The installed as the "copyright" file matches what upstream says.
diff --git a/external_imported/vcpkg/.github/workflows/check_issues.yml b/external_imported/vcpkg/.github/workflows/check_issues.yml
new file mode 100644
index 000000000..d0ab9a764
--- /dev/null
+++ b/external_imported/vcpkg/.github/workflows/check_issues.yml
@@ -0,0 +1,65 @@
+name: Check For Common Issues
+
+on:
+  issues:
+    types:
+      - opened
+
+jobs:
+  check-for-common-issues:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+    steps:
+      - uses: actions/github-script@v7
+        with:
+          script: |
+            let issue_query = {
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo
+            };
+            let issue = await github.rest.issues.get(issue_query)
+
+            // missing-windows-sdk-issue
+            let reg = /RC Pass 1: command "rc .*" failed \(exit code 0\) with the following output:/;
+            if (reg.test(issue.data.body)){
+              await github.rest.issues.removeAllLabels(issue_query);
+              await github.rest.issues.setLabels({...issue_query, labels: ["category:question"]});
+              let body = "Thanks for posting this issue. Please make sure you have the following installed.\n" +
+                         "- Visual Studio Desktop development with C++.\n" +
+                         "- Windows 10 SDK or Windows 11 SDK.";
+              await github.rest.issues.createComment({...issue_query, body}); 
+              // Close the issue? 
+            }
+
+            // msys2 download fails => old vcpkg version
+            reg = /error: https:\/\/repo\.msys2\.org\/.*: failed: status code 404/;
+            if (reg.test(issue.data.body)){
+              await github.rest.issues.removeAllLabels(issue_query);
+              await github.rest.issues.setLabels({...issue_query, labels: ["category:question"]});
+              let body = "Try updating your vcpkg version via `git pull` to resolve this issue. MSYS2 downloads are removed from the upstream servers from time to time, so using an up-to-date vcpkg version is necessary."
+              await github.rest.issues.createComment({...issue_query, body}); 
+              // Close the issue? 
+            }
+
+            // Issue text is: Copy issue body from .../issue_body.md
+            reg = /^Copy issue body from .*issue_body.md$/;
+            if (reg.test(issue.data.body)){
+              await github.rest.issues.removeAllLabels(issue_query);
+              await github.rest.issues.setLabels({...issue_query, labels: ["requires:more-information"]});
+              let body = "Please see #30604 for how to report a build failure."
+              await github.rest.issues.createComment({...issue_query, body});
+              await github.rest.issues.update({...issue_query, state: "closed"});
+            }
+
+            // pkg-config/ not found issues like #36011
+            reg = /CMake Error at scripts\/cmake\/vcpkg_find_acquire_program.*\r\n(.*Please install it via your package manager:[\s\S]+)Call Stack/;
+            match = issue.data.body.match(reg)
+            if (match){
+              await github.rest.issues.removeAllLabels(issue_query);
+              await github.rest.issues.setLabels({...issue_query, labels: ["category:question"]});
+              let body = "From the log:\n```\n" + match[1] + "```\n"
+              await github.rest.issues.createComment({...issue_query, body});
+              await github.rest.issues.update({...issue_query, state: "closed"});
+            }
diff --git a/external_imported/vcpkg/.github/workflows/stale.yml b/external_imported/vcpkg/.github/workflows/stale.yml
new file mode 100644
index 000000000..d3fe73a07
--- /dev/null
+++ b/external_imported/vcpkg/.github/workflows/stale.yml
@@ -0,0 +1,32 @@
+name: 'Close stale issues and PRs'
+on:
+  schedule:
+    - cron: '30 1 * * *'
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v9
+        with:
+          stale-issue-message: 'This is an automated message. Per our repo policy, stale issues get closed if there has been no activity in the past 28 days. The issue will be automatically closed in 14 days. If you wish to keep this issue open, please add a new comment.'
+          any-of-labels: 'category:question,requires:repro,requires:more-information'
+          days-before-issue-stale: 28
+          days-before-pr-stale: -1
+          days-before-close: 14
+      - uses: actions/stale@v9
+        with:
+          stale-issue-message: "This is an automated message. Per our repo policy, stale issues get closed if there has been no activity in the past 60 days. The issue will be automatically closed in 14 days. If you wish to keep this issue open, please add a new comment."
+          any-of-labels: 'category:new-port'
+          close-issue-label: 'info:new-port-unresolved'
+          days-before-issue-stale: 60
+          days-before-pr-stale: -1
+          days-before-close: 14
+      - uses: actions/stale@v9
+        with:
+          stale-issue-message: "This is an automated message. Per our repo policy, stale issues get closed if there has been no activity in the past 180 days. The issue will be automatically closed in 14 days. If you wish to keep this issue open, please add a new comment."
+          exempt-issue-labels: 'no-stale,category:new-port,category:question,requires:repro,requires:more-information'
+          days-before-issue-stale: 180
+          days-before-pr-stale: -1
+          days-before-close: 14
+          operations-per-run: 50
diff --git a/external_imported/vcpkg/.github/workflows/untrustedPR.yml b/external_imported/vcpkg/.github/workflows/untrustedPR.yml
index 8add4c7f9..0fba0c320 100644
--- a/external_imported/vcpkg/.github/workflows/untrustedPR.yml
+++ b/external_imported/vcpkg/.github/workflows/untrustedPR.yml
@@ -9,7 +9,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           # fetch-depth 50 tries to ensure we capture the whole history of the branch
           fetch-depth: 50
@@ -27,7 +27,8 @@ jobs:
           unset VCPKG_ROOT
 
           git diff --name-status --merge-base HEAD^ HEAD --diff-filter=MAR -- '*portfile.cmake' | sed 's/[MAR]\t*//' > .github-pr.changed-portfiles
-          if [ -s .github-pr.changed-portfiles ]; then (grep -n -H -E '(vcpkg_apply_patches|vcpkg_build_msbuild|vcpkg_extract_source_archive_ex|vcpkg_install_cmake|vcpkg_build_cmake|vcpkg_configure_cmake|vcpkg_fixup_cmake_targets)' $(cat .github-pr.changed-portfiles) || true) > .github-pr.deprecated-cmake; else touch .github-pr.deprecated-cmake; fi
+          if [ -s .github-pr.changed-portfiles ]; then (grep -n -H -E '(vcpkg_apply_patches|vcpkg_build_msbuild|vcpkg_extract_source_archive_ex)' $(cat .github-pr.changed-portfiles) || true) > .github-pr.deprecated-function; else touch .github-pr.deprecated-function; fi
+          if [ -s .github-pr.changed-portfiles ]; then (grep -n -H -E '(vcpkg_install_cmake|vcpkg_build_cmake|vcpkg_configure_cmake|vcpkg_fixup_cmake_targets)' $(cat .github-pr.changed-portfiles) || true) > .github-pr.deprecated-cmake; else touch .github-pr.deprecated-cmake; fi
           git diff --name-status --merge-base HEAD^ HEAD --diff-filter=MAR -- '*vcpkg.json' | sed 's/[MAR]\t*//' > .github-pr.changed-manifest-files
           cat .github-pr.changed-manifest-files | while read filename; do grep -q -E '"license": ' "$filename" || echo "$filename" || true; done > .github-pr.missing-license
           cat .github-pr.changed-manifest-files | while read filename; do match=$(grep -oiP '"license": ".*\K(AGPL-1\.0|AGPL-3\.0|BSD-2-Clause-FreeBSD|BSD-2-Clause-NetBSD|bzip2-1\.0\.5|eCos-2\.0|GFDL-1\.1|GFDL-1\.2|GFDL-1\.3|GPL-1\.0|GPL-1\.0\+|GPL-2\.0|GPL-2\.0\+|GPL-2\.0-with-autoconf-exception|GPL-2\.0-with-bison-exception|GPL-2\.0-with-classpath-exception|GPL-2\.0-with-font-exception|GPL-2\.0-with-GCC-exception|GPL-3\.0|GPL-3\.0\+|GPL-3\.0-with-autoconf-exception|GPL-3\.0-with-GCC-exception|LGPL-2\.0|LGPL-2\.0\+|LGPL-2\.1|LGPL-2\.1\+|LGPL-3\.0|LGPL-3\.0\+|Nunit|StandardML-NJ|wxWindows)(?=[ "])' "$filename" || true); if [ ! -z "$match" ]; then echo "$filename (has deprecated license \"$match\")" ; fi ; done > .github-pr.deprecated-license
@@ -45,7 +46,7 @@ jobs:
           git reset HEAD~ --mixed
 
       - name: Generate Reply
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           script: |
             const { promises: fs } = require('fs')
@@ -53,7 +54,8 @@ jobs:
             const add_version_out = (await fs.readFile('.github-pr.x-add-version.out', 'utf8')).trim()
             const version_string_out = (await fs.readFile('.github-pr.version-string.out', 'utf8')).trim()
             const format = (await fs.readFile('.github-pr.format-manifest', 'utf8')).trim()
-            const cmake = (await fs.readFile('.github-pr.deprecated-cmake', 'utf8')).split('\n').filter(s => s.length > 0)
+            const deprecated_function = (await fs.readFile('.github-pr.deprecated-function', 'utf8')).split('\n').filter(s => s.length > 0)
+            const deprecated_cmake = (await fs.readFile('.github-pr.deprecated-cmake', 'utf8')).split('\n').filter(s => s.length > 0)
             const missing_license = (await fs.readFile('.github-pr.missing-license', 'utf8')).trim()
             const deprecated_license = (await fs.readFile('.github-pr.deprecated-license', 'utf8')).trim()
 
@@ -92,34 +94,55 @@ jobs:
               approve = false;
             }
             
-            if (cmake.length > 0) {
+            if (deprecated_function.length > 0) {
               var deprecated_output = '';
-              deprecated_output += "You have modified or added at least one portfile where deprecated functions are used.\n"
+              deprecated_output += "**You have modified or added at least one portfile where deprecated functions are used**\n"
               deprecated_output += "If you feel able to do so, please consider migrating them to the new functions.\n";
-              deprecated_output += "In the ports that use the new function vcpkg_cmake_install, vcpkg_cmake_build or vcpkg_cmake_config_fixup, you have to add the corresponding dependencies:\n";
+              core.warning(deprecated_output);
+
+              let deprecated_functions = {
+                  vcpkg_extract_source_archive_ex: 'vcpkg_extract_source_archive https://learn.microsoft.com/en-us/vcpkg/maintainers/functions/vcpkg_extract_source_archive',
+                  vcpkg_build_msbuild: 'vcpkg_install_msbuild https://learn.microsoft.com/en-us/vcpkg/maintainers/functions/vcpkg_install_msbuild',
+                  vcpkg_apply_patches: 'the PATCHES arguments to the \"extract\" helpers (for example, vcpkg_from_github() (https://learn.microsoft.com/en-us/vcpkg/maintainers/functions/vcpkg_from_github))',
+              };
+              for (let line of deprecated_function) {
+                // line has the format: <path>:<line_number>:<matched_string
+                // For example: ports/rtlsdr/portfile.cmake:42:    vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
+                [file, line_number, match] = line.split(':');
+                for (deprecated_func in deprecated_functions) {
+                  if (match.indexOf(deprecated_func) !== -1) {
+                    core.warning(`The function ${deprecated_func} is deprecated. Please use ${deprecated_functions[deprecated_func]}`, {file, startLine: line_number});
+                    break;
+                  }
+                }
+              }
+            }
+
+            if (deprecated_cmake.length > 0) {
+              var deprecated_output = '';
+              deprecated_output += "You have modified or added at least one portfile where deprecated functions are used.\n"
+              deprecated_output += "These functions have been forbidden in vcpkg, please migrating them to the new functions.\n";
+              deprecated_output += "In the ports that use the new function vcpkg_cmake_configure, vcpkg_cmake_install, vcpkg_cmake_build or vcpkg_cmake_config_fixup, you have to add the corresponding dependencies:\n";
               deprecated_output += "```json\n";
               deprecated_output += '{\n  "name": "vcpkg-cmake",\n  "host": true\n},\n'
               deprecated_output += '{\n  "name": "vcpkg-cmake-config",\n  "host": true\n}\n';
               deprecated_output += "```\n";
-              core.warning(deprecated_output);
+              core.error(deprecated_output);
 
-              const deprecated_functions = {
+              let deprecated_functions = {
                   vcpkg_install_cmake: 'vcpkg_cmake_install (from port vcpkg-cmake)',
                   vcpkg_install_cmake: 'vcpkg_cmake_install (from port vcpkg-cmake)',
                   vcpkg_build_cmake: 'vcpkg_cmake_build (from port vcpkg-cmake)',
                   vcpkg_configure_cmake: 'vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)',
                   vcpkg_fixup_cmake_targets: 'vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)',
-                  vcpkg_extract_source_archive_ex: 'vcpkg_extract_source_archive https://learn.microsoft.com/en-us/vcpkg/maintainers/functions/vcpkg_extract_source_archive',
-                  vcpkg_build_msbuild: 'vcpkg_install_msbuild https://learn.microsoft.com/en-us/vcpkg/maintainers/functions/vcpkg_install_msbuild',
-                  vcpkg_apply_patches: 'the PATCHES arguments to the \"extract\" helpers (for example, vcpkg_from_github() (https://learn.microsoft.com/en-us/vcpkg/maintainers/functions/vcpkg_from_github))',
               };
-              for (let line of cmake) {
+              for (let line of deprecated_cmake) {
                 // line has the format: <path>:<line_number>:<matched_string
                 // For example: ports/rtlsdr/portfile.cmake:42:    vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
                 [file, line_number, match] = line.split(':');
-                for (deprecated_function in deprecated_functions) {
-                  if (match.indexOf(deprecated_function) !== -1) {
-                    core.warning(`The function ${deprecated_function} is deprecated. Please use ${deprecated_functions[deprecated_function]}`, {file, startLine: line_number});
+                for (deprecated_cmake_function in deprecated_functions) {
+                  if (match.indexOf(deprecated_cmake_function) !== -1) {
+                    core.warning(`The function ${deprecated_cmake_function} is deprecated. Please use ${deprecated_functions[deprecated_cmake_function]}`, {file, startLine: line_number});
                     break;
                   }
                 }
diff --git a/external_imported/vcpkg/README.md b/external_imported/vcpkg/README.md
index 66518bc8b..004b9ad95 100644
--- a/external_imported/vcpkg/README.md
+++ b/external_imported/vcpkg/README.md
@@ -4,6 +4,7 @@
 [Español](README_es.md)
 [한국어](README_ko_KR.md)
 [Français](README_fr.md)
+[Tiếng Việt](README_vn.md)
 
 Vcpkg helps you manage C and C++ libraries on Windows, Linux and MacOS.
 This tool and ecosystem are constantly evolving, and we always appreciate contributions!
@@ -32,7 +33,7 @@ you can run `vcpkg help`, or `vcpkg help [command]` for command-specific help.
     - [Visual Studio Code with CMake Tools](#visual-studio-code-with-cmake-tools)
     - [Vcpkg with Visual Studio CMake Projects](#vcpkg-with-visual-studio-cmake-projects)
     - [Vcpkg with CLion](#vcpkg-with-clion)
-    - [Vcpkg as a Submodule](#vcpkg-as-a-submodule)
+    - [Vcpkg as a Submodule](#vcpkg-as-a-submodule-with-cmake)
 - [Tab-Completion/Auto-Completion](#tab-completionauto-completion)
 - [Examples](#examples)
 - [Contributing](#contributing)
@@ -62,11 +63,10 @@ Prerequisites:
 - [Git][getting-started:git]
 - [Visual Studio][getting-started:visual-studio] 2015 Update 3 or greater with the English language pack
 
-First, download and bootstrap vcpkg itself; it can be installed anywhere,
-but generally we recommend using vcpkg as a submodule for CMake projects,
-and installing it globally for Visual Studio projects.
-We recommend somewhere like `C:\src\vcpkg` or `C:\dev\vcpkg`,
-since otherwise you may run into path issues for some port build systems.
+First, download and bootstrap vcpkg itself; it can be installed anywhere, but generally we recommend using vcpkg as a
+submodule so the consuming repo can stay self-contained. Alternatively, vcpkg can be installed globally; we recommend
+somewhere like `C:\src\vcpkg` or `C:\dev\vcpkg`, since otherwise you may run into path issues for some port build
+systems.
 
 ```cmd
 > git clone https://github.com/microsoft/vcpkg
@@ -133,7 +133,7 @@ Prerequisites for macOS:
 - [Apple Developer Tools][getting-started:macos-dev-tools]
 
 First, download and bootstrap vcpkg itself; it can be installed anywhere,
-but generally we recommend using vcpkg as a submodule for CMake projects.
+but generally we recommend using vcpkg as a submodule.
 
 ```sh
 $ git clone https://github.com/microsoft/vcpkg
@@ -226,18 +226,10 @@ add the path to the vcpkg toolchain file:
 
 ### Vcpkg with CLion
 
-Open the Toolchains settings
-(File > Settings on Windows and Linux, CLion > Preferences on macOS),
-and go to the CMake settings (Build, Execution, Deployment > CMake).
-Finally, in `CMake options`, add the following line:
-
-```
--DCMAKE_TOOLCHAIN_FILE=[vcpkg root]/scripts/buildsystems/vcpkg.cmake
-```
-
-You must add this line to each profile.
+Vcpkg is integrated in the CLion IDE. 
+For details, see the [official documentation](https://www.jetbrains.com/help/clion/package-management.html).
 
-### Vcpkg as a Submodule
+### Vcpkg as a Submodule with CMake
 
 When using vcpkg as a submodule of your project,
 you can add the following to your CMakeLists.txt before the first `project()` call,
@@ -252,7 +244,7 @@ This will still allow people to not use vcpkg,
 by passing the `CMAKE_TOOLCHAIN_FILE` directly,
 but it will make the configure-build step slightly easier.
 
-[getting-started:using-a-package]: https://learn.microsoft.com/vcpkg/examples/installing-and-using-packages.md
+[getting-started:using-a-package]: https://learn.microsoft.com/vcpkg/examples/installing-and-using-packages
 [getting-started:git]: https://git-scm.com/downloads
 [getting-started:cmake-tools]: https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools
 [getting-started:linux-gcc]: #installing-linux-developer-tools
@@ -282,9 +274,9 @@ depending on the shell you use, then restart your console.
 # Examples
 
 See the [documentation](https://learn.microsoft.com/vcpkg) for specific walkthroughs,
-including [installing and using a package](https://learn.microsoft.com/vcpkg/examples/installing-and-using-packages.md),
-[adding a new package from a zipfile](https://learn.microsoft.com/vcpkg/examples/packaging-zipfiles.md),
-and [adding a new package from a GitHub repo](https://learn.microsoft.com/vcpkg/examples/packaging-github-repos.md).
+including [installing and using a package](https://learn.microsoft.com/vcpkg/examples/installing-and-using-packages),
+[adding a new package from a zipfile](https://learn.microsoft.com/vcpkg/examples/packaging-zipfiles),
+and [adding a new package from a GitHub repo](https://learn.microsoft.com/vcpkg/examples/packaging-github-repos).
 
 Our docs are now also available online at our website https://vcpkg.io/. We really appreciate any and all feedback! You can submit an issue in https://github.com/vcpkg/vcpkg.github.io/issues.
 
@@ -321,9 +313,9 @@ places the associated license(s) in the location `installed/<triplet>/share/<por
 Most ports in vcpkg build the libraries in question using the original build system preferred
 by the original developers of those libraries, and download source code and build tools from their
 official distribution locations. For use behind a firewall, the specific access needed will depend
-on which ports are being installed. If you must install in in an "air gapped" environment, consider
+on which ports are being installed. If you must install it in an "air gapped" environment, consider
 installing once in a non-"air gapped" environment, populating an
-[asset cache](https://learn.microsoft.com/vcpkg/users/assetcaching.md) shared with the otherwise "air gapped" environment.
+[asset cache](https://learn.microsoft.com/vcpkg/users/assetcaching) shared with the otherwise "air gapped" environment.
 
 # Telemetry
 
diff --git a/external_imported/vcpkg/README_es.md b/external_imported/vcpkg/README_es.md
index 28f253a3a..ccd7dda11 100644
--- a/external_imported/vcpkg/README_es.md
+++ b/external_imported/vcpkg/README_es.md
@@ -20,7 +20,7 @@ una vez instalado Vcpkg puede ejecutar `vcpkg help`, o
 * este programa en: [vcpkg-tool GitHub](https://github.com/microsoft/vcpkg-tool)
 * [Slack](https://cppalliance.org/slack/), en el canal #vcpkg
 * Discord: [\#include \<C++\>](https://www.includecpp.org), en el canal #�vcpkg
-* Docs: [Documentación](docs/README.md)
+* Docs: [Documentación](https://learn.microsoft.com/vcpkg)
 
 ## Tabla de contenido
 
@@ -55,7 +55,7 @@ puede [abrir una incidencia en el repositorio de GitHub][contributing:submit-iss
 donde el equipo de vcpkg y la comunidad pueden verlo, y potencialmente hacer un port a vcpkg.
 
 Después de tener Vcpkg instalado y funcionando,
-puede que desee añadir [completado con tab](#Completado-TabAuto-Completado) en su terminal.
+puede que desee añadir [completado con tab](#Completado-TabAutoCompletado) en su terminal.
 
 Finalmente, si está interesado en el futuro de Vcpkg,
 puede ver la guía de [archivos de manifiesto][getting-started:manifest-spec]!
@@ -70,11 +70,12 @@ Prerrequisitos:
 - [Git][getting-started:git]
 - [Visual Studio][getting-started:visual-studio] 2015 Update 3 o superior con el paquete Inglés de Visual Studio.
 
-Primero, descargue y compile vcpkg; puede ser instalado en cualquier lugar,
-pero generalmente recomendamos usar vcpkg como submódulo para proyectos de CMake,
-e instalándolo globalmente para Proyectos de Visual Studio.
-recomendamos un lugar como `C:\src\vcpkg` o `C:\dev\vcpkg`,
-ya que de otra forma puede encontrarse problemas de ruta para algunos sistemas de port.
+Primero, descargue y compile vcpkg; puede ser instalado en cualquier lugar, pero por lo general recomendamos usar vcpkg  
+como submódulo, asi el repositorio que lo consume puede permanecer autónomo.
+Alternativamente vcpkg puede ser instalado globalmente;
+recomendamos que sea en un lugar como `C:\src\vcpkg` o `C:\dev\vcpkg`, 
+
+ya que de otra forma puede encontrarse problemas de ruta para algunos sistemas de port. 
 
 ```cmd
 > git clone https://github.com/microsoft/vcpkg
@@ -119,9 +120,6 @@ Con CMake, todavía necesitara `find_package` y las configuraciones adicionales
 Revise la [Sección de Cmake](#usando-vcpkg-con-cmake) para más información,
 incluyendo el uso de CMake con un IDE.
 
-Para cualquier otra herramienta, incluyendo Visual Studio Code,
-reviste la [guía de integración][getting-started:integration].
-
 ### Inicio rápido: Unix
 
 Prerrequisitos para Linux:
@@ -133,8 +131,8 @@ Prerrequisitos para macOS:
 
 - [Herramientas de desarrollo de Apple][getting-started:macos-dev-tools]
 
-Primero, descargue y compile vcpkg, puede ser instalado donde sea,
-pero recomendamos usar vcpkg como submodulo para proyectos de CMake.
+Primero, descargue y compile vcpkg, puede ser instalado donde lo desee,
+pero recomendamos usar vcpkg como un submodulo.
 
 ```sh
 $ git clone https://github.com/microsoft/vcpkg
@@ -318,14 +316,13 @@ puede usar un simple `vcpkg install --feature-flags=manifests`
 
 Para más información, revise la especificación de [manifiesto][getting-started:manifest-spec]
 
-[getting-started:using-a-package]: docs/examples/installing-and-using-packages.md
-[getting-started:integration]: docs/users/buildsystems/integration.md
+[getting-started:using-a-package]: https://learn.microsoft.com/vcpkg/examples/installing-and-using-packages
 [getting-started:git]: https://git-scm.com/downloads
 [getting-started:cmake-tools]: https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools
 [getting-started:linux-gcc]: #Instalando-Herramientas-de-desarrollo-en-Linux
 [getting-started:macos-dev-tools]: #Instalando-Herramientas-de-desarrollo-en-macOS
 [getting-started:visual-studio]: https://visualstudio.microsoft.com/
-[getting-started:manifest-spec]: docs/specifications/manifests.md
+[getting-started:manifest-spec]: https://learn.microsoft.com/en-us/vcpkg/users/manifests
 
 ## Completado-Tab/Autocompletado
 
@@ -347,10 +344,10 @@ según la terminal que use, luego reinicie la consola.
 
 ## Ejemplos
 
-ver la [documentación](docs/README.md) para tutoriales específicos, incluyendo
-[instalando y usando un paquete](docs/examples/installing-and-using-packages.md),
-[agregando un nuevo paquete desde un archivo comprimido](docs/examples/packaging-zipfiles.md),
-[agregando un nuevo paquete desde un repositorio en GitHub](docs/examples/packaging-github-repos.md).
+ver la [documentación](https://learn.microsoft.com/vcpkg) para tutoriales específicos, incluyendo
+[instalando y usando un paquete](https://learn.microsoft.com/vcpkg/examples/installing-and-using-packages),
+[agregando un nuevo paquete desde un archivo comprimido](https://learn.microsoft.com/vcpkg/examples/packaging-zipfiles),
+[agregando un nuevo paquete desde un repositorio en GitHub](https://learn.microsoft.com/vcpkg/examples/packaging-github-repos).
 
 Nuestra documentación también esta disponible en nuestro sitio web [vcpkg.io](https://vcpkg.io/).
 Si necesita ayuda puede [crear un incidente](https://github.com/vcpkg/vcpkg.github.io/issues).
@@ -390,7 +387,7 @@ La mayoría de los `ports` en vcpkg construyen las bibliotecas usando su sistema
 por los autores originales de las bibliotecas, y descargan el código fuente asi como las herramientas de compilación
 de sus ubicaciones de distribucion oficiales. Para aquellos que usan un firewall, el acceso dependerá de cuales `ports`
 están siendo instalados. Si tiene que instalarlos en un entorno aislado, puede instalarlos previamente en un entorno
-no aislado, generando un [caché del paquete](docs/users/assetcaching.md) compartido con el entorno aislado.
+no aislado, generando un [caché del paquete](https://learn.microsoft.com/vcpkg/users/assetcaching) compartido con el entorno aislado.
 
 ## Telemetría
 
diff --git a/external_imported/vcpkg/README_fr.md b/external_imported/vcpkg/README_fr.md
index 20ebd15cc..5d096768b 100644
--- a/external_imported/vcpkg/README_fr.md
+++ b/external_imported/vcpkg/README_fr.md
@@ -14,7 +14,7 @@ Pour une description des commandes disponibles, quand vous avez installé vcpkg,
 * GitHub: [https://github.com/microsoft/vcpkg](https://github.com/microsoft/vcpkg)
 * Slack: [https://cppalliance.org/slack/](https://cppalliance.org/slack/), the #vcpkg channel
 * Discord: [\#include \<C++\>](https://www.includecpp.org), le canal #�vcpkg
-* Docs: [Documentation](docs/README.md)
+* Docs: [Documentation](https://learn.microsoft.com/vcpkg)
 
 [![Build Status](https://dev.azure.com/vcpkg/public/_apis/build/status/microsoft.vcpkg.ci?branchName=master)](https://dev.azure.com/vcpkg/public/_build/latest?definitionId=29&branchName=master)
 
@@ -244,8 +244,8 @@ set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems
 
 Cela permettra toujours aux gens de ne pas utiliser vcpkg, en passant directement le CMAKE_TOOLCHAIN_FILE, mais cela rendra l'étape de configuration-construction légèrement plus facile.
 
-[getting-started:utiliser-un-paquet]: docs/examples/installing-and-using-packages.md
-[getting-started:integration]: docs/users/buildsystems/integration.md
+[getting-started:utiliser-un-paquet]: https://learn.microsoft.com/vcpkg/examples/installing-and-using-packages
+[getting-started:integration]: https://learn.microsoft.com/en-us/vcpkg/users/buildsystems/msbuild-integration
 [getting-started:git]: https://git-scm.com/downloads
 [getting-started:cmake-tools]: https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools
 [getting-started:linux-gcc]: #installing-linux-developer-tools
@@ -253,7 +253,7 @@ Cela permettra toujours aux gens de ne pas utiliser vcpkg, en passant directemen
 [getting-started:macos-brew]: #installing-gcc-on-macos
 [getting-started:macos-gcc]: #installing-gcc-on-macos
 [getting-started:visual-studio]: https://visualstudio.microsoft.com/
-[getting-started:manifest-spec]: docs/specifications/manifests.md
+[getting-started:manifest-spec]: https://learn.microsoft.com/en-us/vcpkg/users/manifests
 
 # Tab-complétion/Auto-complétion
 
@@ -274,9 +274,9 @@ selon le shell que vous utilisez, puis redémarrez la console.
 
 # Exemples
 
-Lisez la [documentation](doc/README.md) pour des instructions plus spécifiques ainsi que [l'installation et l'utilisation des paquets](docs/examples/installing-and-using-packages.md),
-[ajouter un nouveau paquet depuis un fichier zip](docs/examples/packaging-zipfiles.md),
-et [ajouter un nouveau paquet depuis un dépôt GitHub](docs/examples/packaging-github-repos.md).
+Lisez la [documentation](https://learn.microsoft.com/vcpkg) pour des instructions plus spécifiques ainsi que [l'installation et l'utilisation des paquets](https://learn.microsoft.com/vcpkg/examples/installing-and-using-packages),
+[ajouter un nouveau paquet depuis un fichier zip](https://learn.microsoft.com/vcpkg/examples/packaging-zipfiles),
+et [ajouter un nouveau paquet depuis un dépôt GitHub](https://learn.microsoft.com/vcpkg/examples/packaging-github-repos).
 
 La documentation est aussi disponible en ligne sur ReadTheDocs : <https://vcpkg.readthedocs.io/> !
 
diff --git a/external_imported/vcpkg/README_ko_KR.md b/external_imported/vcpkg/README_ko_KR.md
index 9707cfa54..079f08c2b 100644
--- a/external_imported/vcpkg/README_ko_KR.md
+++ b/external_imported/vcpkg/README_ko_KR.md
@@ -17,7 +17,7 @@ Vcpkg를 설치하였다면, `vcpkg help` 명령어로 사용 가능한 명령
 * GitHub: port는 [https://github.com/microsoft/vcpkg](https://github.com/microsoft/vcpkg)�, 관련 프로그램� [https://github.com/microsoft/vcpkg-tool](https://github.com/microsoft/vcpkg-tool)� 있습니다.
 * Slack: [https://cppalliance.org/slack/](https://cppalliance.org/slack/), #vcpkg 채�
 * Discord: [\#include \<C++\>](https://www.includecpp.org), #�vcpkg 채�
-* �움�: [Documentation](docs/README.md)
+* �움�: [Documentation](https://learn.microsoft.com/vcpkg)
 
 # 목차
 
@@ -261,8 +261,8 @@ set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems
 �한, 여전히 `CMAKE_TOOLCHAIN_FILE`� �접 전달하면
 vcpkg를 사용하지 않� 수 있습니다.
 
-[getting-started:using-a-package]: docs/examples/installing-and-using-packages.md
-[getting-started:integration]: docs/users/buildsystems/integration.md
+[getting-started:using-a-package]: https://learn.microsoft.com/vcpkg/examples/installing-and-using-packages
+[getting-started:integration]: https://learn.microsoft.com/en-us/vcpkg/users/buildsystems/msbuild-integration
 [getting-started:git]: https://git-scm.com/downloads
 [getting-started:cmake-tools]: https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools
 [getting-started:linux-gcc]: #installing-linux-developer-tools
@@ -270,7 +270,7 @@ vcpkg를 사용하지 않� 수 있습니다.
 [getting-started:macos-brew]: #installing-gcc-on-macos
 [getting-started:macos-gcc]: #installing-gcc-on-macos
 [getting-started:visual-studio]: https://visualstudio.microsoft.com/
-[getting-started:manifest-spec]: docs/specifications/manifests.md
+[getting-started:manifest-spec]: https://learn.microsoft.com/en-us/vcpkg/users/manifests
 
 # 탭 완성/�� 완성
 
@@ -289,10 +289,10 @@ $ ./vcpkg integrate bash # or zsh
 
 # 예시
 
-[패키지 설치 � 사용](docs/examples/installing-and-using-packages.md),
-[zip 파��서 새 패키지 추가](docs/examples/packaging-zipfiles.md),
-[GitHub 저장소�서 새 패키지 추가](docs/examples/packaging-github-repos.md)�
-대한 구체�� 예시는 [문서](docs/README.md)를 참고하세요.
+[패키지 설치 � 사용](https://learn.microsoft.com/vcpkg/examples/installing-and-using-packages),
+[zip 파��서 새 패키지 추가](https://learn.microsoft.com/vcpkg/examples/packaging-zipfiles),
+[GitHub 저장소�서 새 패키지 추가](https://learn.microsoft.com/vcpkg/examples/packaging-github-repos)�
+대한 구체�� 예시는 [문서](https://learn.microsoft.com/vcpkg)를 참고하세요.
 
 문서는 �제 웹사�트 https://vcpkg.io/ �서� 온��으로 확� 가능합니다. 모든 피드백� 진심으로 �사드립니다!
 https://github.com/vcpkg/vcpkg.github.io/issues �서 �슈를 제출할 수 있습니다.
@@ -331,7 +331,7 @@ Vcpk가 제공하는 대부분� port는 ��� ��브러리를 빌드할
 소스 코드와 빌드 �구를 ��� 공� 배�처로부터 다운로드합니다.
 방화벽 뒤�서 사용하는 경우, 어떤 port를 설치하��� 따� 필요한 접근 권한� 달�질 수 있습니다.
 만약 "air gapped" 환경�서 설치해야만 한다면, "air gapped"가 아닌 환경�서 
-[asset �시](docs/users/assetcaching.md)를 다운로드하고, 
+[asset �시](https://learn.microsoft.com/vcpkg/users/assetcaching)를 다운로드하고, 
 �후� "air gapped" 환경�서 공유하는 것� 고려해 보십시오.
 
 # ��터 수집
diff --git a/external_imported/vcpkg/README_pt.md b/external_imported/vcpkg/README_pt.md
index 3d3fd0449..c98907bbd 100644
--- a/external_imported/vcpkg/README_pt.md
+++ b/external_imported/vcpkg/README_pt.md
@@ -18,7 +18,7 @@ você pode executar `vcpkg help`, ou `vcpkg help [command]` para obter ajuda esp
 * GitHub: pacote completo em [https://github.com/microsoft/vcpkg](https://github.com/microsoft/vcpkg), programa em [https://github.com/microsoft/vcpkg-tool](https://github.com/microsoft/vcpkg-tool)
 * Slack: [https://cppalliance.org/slack/](https://cppalliance.org/slack/), the #vcpkg channel
 * Discord: [\#include \<C++\>](https://www.includecpp.org), the #�vcpkg channel
-* Documentos: [Documentation](docs/README.md)
+* Documentos: [Documentation](https://learn.microsoft.com/vcpkg)
 
 # �ndice
 
@@ -255,8 +255,8 @@ set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems
 
 Isso ainda permitirá que as pessoas não usem o vcpkg, passando o `CMAKE_TOOLCHAIN_FILE` diretamente, mas tornará a etapa de configuração-construção um pouco mais fácil.
 
-[getting-started:using-a-package]: docs/examples/installing-and-using-packages.md
-[getting-started:integration]: docs/users/buildsystems/integration.md
+[getting-started:using-a-package]: https://learn.microsoft.com/vcpkg/examples/installing-and-using-packages
+[getting-started:integration]: https://learn.microsoft.com/en-us/vcpkg/users/buildsystems/msbuild-integration
 [getting-started:git]: https://git-scm.com/downloads
 [getting-started:cmake-tools]: https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools
 [getting-started:linux-gcc]: #installing-linux-developer-tools
@@ -264,7 +264,7 @@ Isso ainda permitirá que as pessoas não usem o vcpkg, passando o `CMAKE_TOOLCH
 [getting-started:macos-brew]: #installing-gcc-on-macos
 [getting-started:macos-gcc]: #installing-gcc-on-macos
 [getting-started:visual-studio]: https://visualstudio.microsoft.com/
-[getting-started:manifest-spec]: docs/specifications/manifests.md
+[getting-started:manifest-spec]: https://learn.microsoft.com/en-us/vcpkg/users/manifests
 
 # Tab-Completion/Auto-Completion
 
@@ -284,10 +284,10 @@ dependendo do shell que você usa, reinicie o console.
 
 # Exemplos
 
-Consulte a [documentação](docs/README.md) para orientações específicas,
-incluindo [instalando e usando um pacote](docs/examples/installing-and-using-packages.md),
-[adicionando um novo pacote de um arquivo zip](docs/examples/packaging-zipfiles.md),
-e [adicionando um novo pacote de um repositório GitHub](docs/examples/packaging-github-repos.md).
+Consulte a [documentação](https://learn.microsoft.com/vcpkg) para orientações específicas,
+incluindo [instalando e usando um pacote](https://learn.microsoft.com/vcpkg/examples/installing-and-using-packages),
+[adicionando um novo pacote de um arquivo zip](https://learn.microsoft.com/vcpkg/examples/packaging-zipfiles),
+e [adicionando um novo pacote de um repositório GitHub](https://learn.microsoft.com/vcpkg/examples/packaging-github-repos).
 
 Nossos documentos agora também estão disponíveis online em nosso site <https://vcpkg.io/>. Nós realmente apreciamos todo e qualquer feedback! Você pode enviar um problema em <https://github.com/vcpkg/vcpkg.github.io/issues>.
 
@@ -320,7 +320,7 @@ pelos desenvolvedores originais dessas bibliotecas e baixar o código-fonte e cr
 locais de distribuição oficiais. Para uso atrás de um firewall, o acesso específico necessário dependerá
 em quais portas estão sendo instaladas. Se você precisar instalar em um ambiente "air gap", considere
 instalando uma vez em um ambiente sem "air gap", preenchendo um
-[cache de ativos](docs/users/assetcaching.md) compartilhado com o ambiente "air gapped".
+[cache de ativos](https://learn.microsoft.com/vcpkg/users/assetcaching) compartilhado com o ambiente "air gapped".
 
 # Telemetria
 
@@ -331,4 +331,4 @@ Você pode cancelar a telemetria por
 - passando --disable-metrics para vcpkg na linha de comando
 - definir a variável de ambiente VCPKG_DISABLE_METRICS
 
-Leia mais sobre a telemetria vcpkg em [https://learn.microsoft.com/vcpkg/about/privacy](https://learn.microsoft.com/vcpkg/about/privacy).
\ No newline at end of file
+Leia mais sobre a telemetria vcpkg em [https://learn.microsoft.com/vcpkg/about/privacy](https://learn.microsoft.com/vcpkg/about/privacy).
diff --git a/external_imported/vcpkg/README_vn.md b/external_imported/vcpkg/README_vn.md
new file mode 100644
index 000000000..b57b107f2
--- /dev/null
+++ b/external_imported/vcpkg/README_vn.md
@@ -0,0 +1,330 @@
+# Vcpkg: Tổng quan
+
+[English](README.md)
+[中文总览](README_zh_CN.md)
+[Español](README_es.md)
+[한국어](README_ko_KR.md)
+[Français](README_fr.md)
+
+Vcpkg giúp bạn quản lý các thư viện C và C++ trên Windows, Linux và MacOS.
+Phần m�m này và hệ sinh thái của nó vẫn đang không ngừng phát triển, và chúng tôi luôn trân tr�ng những đóng góp của bạn!
+
+Nếu bạn chưa từng sử dụng vcpkg trước đây, hoặc nếu bạn đang tìm hiểu cách để sử dụng vcpkg, xin hãy xem phần [Bắt �ầu](#bắt-đầu) cho hướng dẫn cài đặt vcpkg.
+
+�ể xem mô tả ngắn v� những lệnh khả thi, khi bạn đã cài đặt vcpkg, bạn có thể chạy `vcpkg help`, hoặc `vcpkg help [command]` cho những lệnh nhất định.
+
+* GitHub: Các port ở [https://github.com/microsoft/vcpkg](https://github.com/microsoft/vcpkg), phần m�m ở [https://github.com/microsoft/vcpkg-tool](https://github.com/microsoft/vcpkg-tool)
+* Slack: [https://cppalliance.org/slack/](https://cppalliance.org/slack/), kênh #vcpkg
+* Discord: [\#include \<C++\>](https://www.includecpp.org), kênh #�vcpkg
+* Docs: [Tài liệu](https://learn.microsoft.com/vcpkg)
+
+# Mục Lục
+
+- [Vcpkg: Tổng quan](#vcpkg-tổng-quan)
+- [Mục Lục](#mục-lục)
+- [Bắt �ầu](#bắt-đầu)
+  - [Bắt �ầu Nhanh: Windows](#bắt-đầu-nhanh-windows)
+  - [Bắt �ầu Nhanh: Unix](#bắt-đầu-nhanh-unix)
+  - [Cài đặt Developer Tools cho Linux](#cài-đặt-developer-tools-cho-linux)
+  - [Cài đặt Developer Tools cho macOS](#cài-đặt-developer-tools-cho-macos)
+  - [Sử dụng vcpkg với CMake](#sử-dụng-vcpkg-với-cmake)
+    - [Visual Studio Code với Công cụ CMake](#visual-studio-code-với-công-cụ-cmake)
+    - [Vcpkg vá»›i Visual Studio CMake Projects](#vcpkg-vá»›i-visual-studio-cmake-projects)
+    - [Vcpkg vá»›i CLion](#vcpkg-vá»›i-clion)
+    - [Vcpkg dưới dạng Submodule](#vcpkg-dưới-dạng-submodule)
+- [Gợi ý/Tự động đi�n](#gợi-ýtự-động-đi�n)
+- [Các ví dụ](#các-ví-dụ)
+- [�óng Góp](#đóng-góp)
+- [Giấy Phép](#giấy-phép)
+- [Bảo Mật](#bảo-mật)
+- [Thu Thập Dữ Liệu](#thu-thập-dữ-liệu)
+
+# Bắt �ầu
+�ầu tiên, hãy làm theo hướng dẫn cài đặt cho [Windows](#bắt-đầu-nhanh-windows), hoặc [macOS và Linux](#bắt-đầu-nhanh-unix), tùy theo hệ đi�u hành mà bạn đang sử dụng.
+
+Ngoài ra, hãy xem [Cài đặt và Sử dụng Packages][getting-started:using-a-package].
+Nếu một thư viện bạn cần hiện đang chưa có trong vcpkg, bạn có thể [mở một issue trên GitHub repo][contributing:submit-issue] nơi mà đội ngũ vcpkg và cộng đồng có thể thấy và có khả năng thêm port đó vào vcpkg.
+
+Sau khi bạn đã cài đặt vcpkg, bạn có thể muốn thêm [tự động đi�n](#gợi-ýtự-động-đi�n) vào shell của bạn.
+
+## Bắt �ầu Nhanh: Windows
+
+Yêu cầu:
+- Windows 7 trở lên
+- [Git][getting-started:git]
+- [Visual Studio][getting-started:visual-studio] 2015 Update 3 trở lên với gói ngôn ngữ Tiếng Anh
+
+�ầu tiên, tải và khởi động vcpkg; nó có thể được cài đặt bất kỳ đâu, nhưng
+chúng tôi khuyến cáo sử dụng vcpkg như một submoudle cho các project CMake,
+và cài đặt nó toàn máy cho các project Visual Studio.
+Chúng tôi gợi ý cài ở những nơi như `C:\src\vcpkg` hoặc `C:\dev\vcpkg`,
+bởi vì nếu cài những nơi khác bạn có thể gặp các lỗi đư�ng dẫn đối với
+hệ thống build của một vài port.
+
+```cmd
+> git clone https://github.com/microsoft/vcpkg
+> .\vcpkg\bootstrap-vcpkg.bat
+```
+
+�ể cài đặt các thư viện cho project của bạn, hãy chạy:
+
+```cmd
+> .\vcpkg\vcpkg install [packages to install]
+```
+
+Lưu ý: Lệnh này sẽ mặc định cài đặt phiên bản x86 của thư viện, để cài x64 hãy chạy:
+
+```cmd
+> .\vcpkg\vcpkg install [package name]:x64-windows
+```
+
+Hoặc
+
+```cmd
+> .\vcpkg\vcpkg install [packages to install] --triplet=x64-windows
+```
+
+Bạn cũng có thể tìm kiếm các thư viện bạn cần với lệnh `search`:
+
+```cmd
+> .\vcpkg\vcpkg search [search term]
+```
+
+�ể sử dụng vcpkg với Visual Studio,
+hãy chạy lệnh sau (có thể yêu cầu quy�n administrator):
+
+```cmd
+> .\vcpkg\vcpkg integrate install
+```
+
+Sau khi xong, bạn có thể tạo một project mới (trừ CMake), hoặc mở một project có sẵn.
+Tất cả các thư viện sẽ ngay lập tức có sẵn để được `#include` và sử dụng
+trong project của bạn mà không cần cấu hình gì thêm.
+
+Nếu bạn đang sử dụng CMake với Visual Studio,
+hãy tiếp tục [ở đây](#vcpkg-với-visual-studio-cmake-projects).
+
+�ể sử dụng vcpkg với CMake bên ngoài một IDE,
+bạn có thể sử dụng file toolchain:
+
+```cmd
+> cmake -B [build directory] -S . "-DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake"
+> cmake --build [build directory]
+```
+
+Với CMake, bạn vẫn sẽ cần thêm `find_package` và những lệnh khác để sử dụng thư viện.
+Hãy xem [phần CMake](#sử-dụng-vcpkg-với-cmake) để biết thêm,
+bao gồm việc sử dụng CMake với một IDE.
+
+## Bắt �ầu Nhanh: Unix
+
+Yêu cầu cho Linux:
+- [Git][getting-started:git]
+- [g++][getting-started:linux-gcc] >= 6
+
+Yêu cầu cho macOS:
+- [Apple Developer Tools][getting-started:macos-dev-tools]
+
+�ầu tiên, tải và khởi động vcpkg; nó có thể được cài đặt bất kỳ đâu, nhưng
+chúng tôi khuyến cáo sử dụng vcpkg như một submoudle cho các project CMake.
+
+```sh
+$ git clone https://github.com/microsoft/vcpkg
+$ ./vcpkg/bootstrap-vcpkg.sh
+```
+
+�ể cài đặt các thư viện cho project của bạn, hãy chạy:
+
+```sh
+$ ./vcpkg/vcpkg install [packages to install]
+```
+
+Bạn cũng có thể tìm kiếm các thư viện bạn cần với lệnh `search`:
+
+```sh
+$ ./vcpkg/vcpkg search [search term]
+```
+
+�ể sử dụng vcpkg với CMake, bạn có thể sử dụng file toolchain:
+
+```sh
+$ cmake -B [build directory] -S . "-DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake"
+$ cmake --build [build directory]
+```
+
+Với CMake, bạn vẫn sẽ cần thêm `find_package` và những lệnh khác để sử dụng thư viện.
+Hãy xem [phần CMake](#sử-dụng-vcpkg-với-cmake) để biết thêm
+v� các tốt nhất để sử dụng vcpkg với CMake,
+và Công cụ CMake cho VSCode.
+
+## Cài đặt Developer Tools cho Linux
+
+Dưới nhi�u phiên bản Linux, có các package sau đây bạn sẽ cần phải cài đặt:
+
+- Debian, Ubuntu, popOS, và các phiên bản khác dựa trên Debian:
+
+```sh
+$ sudo apt-get update
+$ sudo apt-get install build-essential tar curl zip unzip
+```
+
+- CentOS
+
+```sh
+$ sudo yum install centos-release-scl
+$ sudo yum install devtoolset-7
+$ scl enable devtoolset-7 bash
+```
+
+Cho bất kỳ phiên bản nào khác, hãy chắc chắn rằng bạn cài đặt g++ 6 trở lên.
+Nếu bạn muốn thêm hướng dẫn cho phiên bản của bạn,
+[xin hãy mở một PR][contributing:submit-pr]!
+
+## Cài đặt Developer Tools cho macOS
+
+Trên macOS, thứ duy nhất bạn cần làm là chạy lệnh sau đây trong terminal:
+
+```sh
+$ xcode-select --install
+```
+
+Sau đó làm theo hướng dẫn trong cửa sổ được mở ra.
+
+Sau đó bạn sẽ có thể khởi động vcpkg theo hướng dẫn ở [bắt đầu nhanh](#bắt-đầu-nhanh-unix)
+
+## Sử dụng vcpkg với CMake
+
+### Visual Studio Code với Công cụ CMake
+
+Thêm phần sau đây vào file `settings.json` trong workspace của bạn
+sẽ làm cho Công cụ CMake tự động sử dụng vcpkg cho các thư viện
+của bạn:
+
+```json
+{
+  "cmake.configureSettings": {
+    "CMAKE_TOOLCHAIN_FILE": "[vcpkg root]/scripts/buildsystems/vcpkg.cmake"
+  }
+}
+```
+
+### Vcpkg vá»›i Visual Studio CMake Projects
+
+Mở CMake Settings Editor, dưới phần `CMake toolchain file`,
+thêm đư�ng dẫn tới file vcpkg toolchain:
+
+```
+[vcpkg root]/scripts/buildsystems/vcpkg.cmake
+```
+
+### Vcpkg vá»›i CLion
+
+Mở Toolchains settings
+(File > Settings on Windows and Linux, CLion > Preferences on macOS),
+và đi tới phần CMake settings (Build, Execution, Deployment > CMake).
+Sau đó, trong `CMake options`, thên dòng sau đây:
+
+```
+-DCMAKE_TOOLCHAIN_FILE=[vcpkg root]/scripts/buildsystems/vcpkg.cmake
+```
+
+Bạn phải thêm dòng này vào mỗi profile khác nhau.
+
+### Vcpkg dưới dạng Submodule
+
+Khi sử dụng vcpkg như một submodule cho project của bạn,
+bạn có thể thêm dòng sau đây vào file CMakeLists.txt trước dòng `project()` đầu tiên,
+thay vì phải sự dụng lệnh `CMAKE_TOOLCHAIN_FILE`.
+
+```cmake
+set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake"
+  CACHE STRING "Vcpkg toolchain file")
+```
+
+Cách này vẫn hỗ trợ những ngư�i không dùng vcpkg,
+bằng cách trực tiếp thêm `CMAKE_TOOLCHAIN_FILE`,
+nhưng nó sẽ khiến việc cấu hình-build trở nên dễ dàng hơn.
+
+[getting-started:using-a-package]: https://learn.microsoft.com/vcpkg/examples/installing-and-using-packages
+[getting-started:git]: https://git-scm.com/downloads
+[getting-started:cmake-tools]: https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools
+[getting-started:linux-gcc]: #cài-đặt-developer-tools-cho-linux
+[getting-started:macos-dev-tools]: #cài-đặt-developer-tools-cho-macos
+[getting-started:macos-brew]: #installing-gcc-on-macos
+[getting-started:macos-gcc]: #installing-gcc-on-macos
+[getting-started:visual-studio]: https://visualstudio.microsoft.com/
+
+# Gợi ý/Tự động đi�n
+
+`vcpkg` hỗ trợ tự động đi�n các lệnh, tên package, và các
+cài đặt trong lẫn powershell và bash.
+�ể bật tự động đi�n trong shell của bạn, hãy chạy:
+
+```pwsh
+> .\vcpkg integrate powershell
+```
+
+Hoặc
+
+```sh
+$ ./vcpkg integrate bash # or zsh
+```
+
+tùy theo shell mà bạn sử dụng, rồi khởi động lại console.
+
+# Các ví dụ
+
+Hãy xem [tài liệu](https://learn.microsoft.com/vcpkg) cho các hướng dẫn chi tiết,
+bao gồm [cài đặt và sử dụng một package](https://learn.microsoft.com/vcpkg/examples/installing-and-using-packages),
+[thêm package mới từ file zip](https://learn.microsoft.com/vcpkg/examples/packaging-zipfiles),
+và [thêm package mới từ GitHub repo](https://learn.microsoft.com/vcpkg/examples/packaging-github-repos).
+
+Tài liệu của chúng tôi hiện đang có sẵn tại website https://vcpkg.io/. Chúng tôi rất trân tr�ng
+bất kỳ phản hồi nào của các bạn! Bạn có thể tạo một issue trong https://github.com/vcpkg/vcpkg.github.io/issues.
+
+Xem [video demo](https://www.youtube.com/watch?v=y41WFKbQFTw) dài 4 phút.
+
+# �óng Góp
+
+Vcpkg là một dự án mã nguồn mở, và được xây dụng từ sự đóng góp của các bạn.
+Sau đây là các cách mà bạn có thể đóng góp:
+
+* [Tạo Issues][contributing:submit-issue] v� vcpkg hoặc các package.
+* [Sửa lỗi và Thêm các package mới][contributing:submit-pr]
+
+Xin hãy xem chi tiết trong [Hướng dẫn �óng góp](CONTRIBUTING.md).
+
+Dự án này áp dụng [Bộ Quy tắc Ứng xử Mã Nguồn Mở của Microsoft][contributing:coc].
+Các thông tin thêm, hãy xem [Quy tắc Ứng xử FAQ][contributing:coc-faq]
+hoặc gửi mail cho chúng tôi tại [opencode@microsoft.com](mailto:opencode@microsoft.com)
+với các câu h�i hoặc bình luận.
+
+[contributing:submit-issue]: https://github.com/microsoft/vcpkg/issues/new/choose
+[contributing:submit-pr]: https://github.com/microsoft/vcpkg/pulls
+[contributing:coc]: https://opensource.microsoft.com/codeofconduct/
+[contributing:coc-faq]: https://opensource.microsoft.com/codeofconduct/
+
+# Giấy Phép
+
+Mã nguồn trong repository này được cấp phép theo [Giấy phép MIT](LICENSE.txt). Các thư viện
+cung cấp bởi các port được cấp phép theo các đi�u khoản của tác giả gốc. Khi khả thi, vcpkg
+đặt (các) giấy phép liên quan tại `installed/<triplet>/share/<port>/copyright`.
+
+# Bảo Mật
+
+Hầu hết các port đ�u build các thư viện liên quan sử dụng các hệ thống build gốc được khuyến cáo
+bởi tác giả gốc của các thư viện đó, và tải mã nguồn và công cụ build từ nguồn chính thức của h�.
+�ể sử dụng dưới tư�ng lửa, các quy�n truy cập nhất định sẽ dựa vào port nào đang được cài đặt.
+Nếu bạn buộc phải cài đặt trong một môi trư�ng "cách ly không khí", xin hãy cân nhắc việc cài đặt
+một lần trong môi trư�ng không "cách ly không khí", để tạo [asset cache](https://learn.microsoft.com/vcpkg/users/assetcaching) được chia sẻ với môi trư�ng "cách ly không khí" kia.
+
+# Thu Thập Dữ Liệu
+
+vcpkg thu thập dữ liệu trong lúc sử dụng để giúp chúng tôi cải thiện trải nghiệm của bạn.
+Dữ liệu thu thập được bởi Microsoft là ẩn danh.
+Bạn có thể tùy ch�n không thu thập dữ liệu bằng cách
+- chạy bootstrap-vcpkg với lệnh -disableMetrics
+- chạy vcpkg với lệnh --disable-metrics
+- thêm VCPKG_DISABLE_METRICS vào biến môi trư�ng
+
+��c thêm v� việc thu thập dữ liệu của vcpkg tại [https://learn.microsoft.com/vcpkg/about/privacy](https://learn.microsoft.com/vcpkg/about/privacy).
diff --git a/external_imported/vcpkg/README_zh_CN.md b/external_imported/vcpkg/README_zh_CN.md
index b0f525299..642661a7c 100644
--- a/external_imported/vcpkg/README_zh_CN.md
+++ b/external_imported/vcpkg/README_zh_CN.md
@@ -9,10 +9,10 @@ Vcpkg �帮助您在 Windows� Linux 和 MacOS 上管� C 和 C++ 库。
 
 如需获�有关�用命令的简短�述，请在编译 vcpkg �执行 `vcpkg help` 或执行 `vcpkg help [command]` �获�具体的帮助信�。
 
-* GitHub: [https://github.com/microsoft/vcpkg](https://github.com/microsoft/vcpkg)
+* GitHub: 端��于 [https://github.com/microsoft/vcpkg](https://github.com/microsoft/vcpkg)，程��于 [https://github.com/microsoft/vcpkg-tool](https://github.com/microsoft/vcpkg-tool)
 * Slack: [https://cppalliance.org/slack/](https://cppalliance.org/slack/)， #vcpkg 频�
 * Discord: [\#include \<C++\>](https://www.includecpp.org)， #�vcpkg 频�
-* 文档: [Documentation](docs/README.md)
+* 文档: [Documentation](https://learn.microsoft.com/vcpkg)
 
 # 目录
 
@@ -28,7 +28,7 @@ Vcpkg �帮助您在 Windows� Linux 和 MacOS 上管� C 和 C++ 库。
     - [Visual Studio CMake 工程中使用 vcpkg](#visual-studio-cmake-工程中使用-vcpkg)
     - [CLion 中使用 vcpkg](#clion-中使用-vcpkg)
     - [将 vcpkg 作为一个�模�](#将-vcpkg-作为一个�模�)
-- [Tab补全/自动补全](#tab补全自动补全)
+- [Tab补全/自动补全](#tab-补全自动补全)
 - [示例](#示例)
 - [贡献](#贡献)
 - [开��议](#开��议)
@@ -48,11 +48,7 @@ vcpkg 团队和贡献者�以在这里看到它，
 并�能将这个库添加到 vcpkg。
 
 安装并�行 vcpkg �，
-您�能希望将 [TAB 补全](#tab补全自动补全) 添加到您的 Shell 中。
-
-最�，如果您对 vcpkg 的未�感兴趣，请查看 [清�][getting-started:manifest-spec]�
-这是一项实验性功能，�能会出现错误。
-因此，请�试一下并[打开所有问题][contributing:submit-issue]!
+您�能希望将 [TAB 补全](#tab-补全自动补全) 添加到您的 Shell 中。
 
 ## 快速开始: Windows
 
@@ -115,8 +111,6 @@ vcpkg 团队和贡献者�以在这里看到它，
 在 CMake 中，您�需通过 `find_package` �使用 vcpkg 中已安装的库。
 请查阅 [CMake 章节](#在-cmake-中使用-vcpkg) 获�更多信�，其中包�了在 IDE 中使用 CMake 的内容。
 
-对于其他工具 (包括 Visual Studio Code)，请查阅 [集�指�][getting-started:integration]。
-
 ## 快速开始: Unix
 
 Linux平��置�件:
@@ -241,8 +235,7 @@ set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems
 
 使用此�方��无需设置 `CMAKE_TOOLCHAIN_FILE` ��使用 vcpkg，且更容易完��置工作。
 
-[getting-started:using-a-package]: docs/examples/installing-and-using-packages.md
-[getting-started:integration]: docs/users/buildsystems/integration.md
+[getting-started:using-a-package]: https://learn.microsoft.com/vcpkg/examples/installing-and-using-packages
 [getting-started:git]: https://git-scm.com/downloads
 [getting-started:cmake-tools]: https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools
 [getting-started:linux-gcc]: #installing-linux-developer-tools
@@ -250,7 +243,6 @@ set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems
 [getting-started:macos-brew]: #installing-gcc-on-macos
 [getting-started:macos-gcc]: #installing-gcc-on-macos
 [getting-started:visual-studio]: https://visualstudio.microsoft.com/
-[getting-started:manifest-spec]: docs/specifications/manifests.md
 
 # Tab 补全/自动补全
 
@@ -269,19 +261,19 @@ $ ./vcpkg integrate bash # 或 zsh
 
 然��新�动控制�。
 
-## 示例
+# 示例
 
-请查看 [文档](docs/README.md) 获�具体示例，
-其包� [安装并使用包](docs/examples/installing-and-using-packages.md)，
-[使用压缩文件添加包](docs/examples/packaging-zipfiles.md)
-和 [从 GitHub �中添加一个包](docs/examples/packaging-github-repos.md)。
+请查看 [文档](https://learn.microsoft.com/vcpkg) 获�具体示例，
+其包� [安装并使用包](https://learn.microsoft.com/vcpkg/examples/installing-and-using-packages)，
+[使用压缩文件添加包](https://learn.microsoft.com/vcpkg/examples/packaging-zipfiles)
+和 [从 GitHub �中添加一个包](https://learn.microsoft.com/vcpkg/examples/packaging-github-repos)。
 
 我们的文档现在也�以从 [vcpkg.io](https://vcpkg.io/) 在线获�。
 我们真诚的希望您�我们�出关于此网站的任何建议! 请在[这里](https://github.com/vcpkg/vcpkg.github.io/issues) 创建 issue.
 
 观看 4 分钟 [demo 视频](https://www.youtube.com/watch?v=y41WFKbQFTw)。
 
-## 贡献
+# 贡献
 
 Vcpkg是一个开�项目，并通过您的贡献�断�展。
 下�是一些您�以贡献的方�:
@@ -308,7 +300,7 @@ vcpkg会将库的�议文件放置在 `installed/<triplet>/share/<port>/copyrig
 
 大多数vcpkg中的库采用其官方�布的构建工具�构建它们，并从其官方渠�下载���构建工具。
 若您的环境包�防�墙或�病毒程�，为了��构建失败，请考虑在�用防�墙与�病毒程�的环境中构建它们一次，
-�将它们生�的二进制缓存共享给原始环境中使用。
+�将它们生�的[二进制缓存](https://learn.microsoft.com/vcpkg/users/assetcaching)共享给原始环境中使用。
 
 # 数�收集
 
diff --git a/external_imported/vcpkg/bootstrap-vcpkg.bat b/external_imported/vcpkg/bootstrap-vcpkg.bat
index 1f9baa3d0..54e0b85a2 100644
--- a/external_imported/vcpkg/bootstrap-vcpkg.bat
+++ b/external_imported/vcpkg/bootstrap-vcpkg.bat
@@ -1,2 +1,2 @@
 @echo off
-powershell.exe -NoProfile -ExecutionPolicy Bypass "& {& '%~dp0scripts\bootstrap.ps1' %*}"
+powershell.exe -NoProfile -ExecutionPolicy Bypass "& {& \"%~dp0scripts\bootstrap.ps1\" %*}"
diff --git a/external_imported/vcpkg/ports/3fd/portfile.cmake b/external_imported/vcpkg/ports/3fd/portfile.cmake
index ae6850929..82ff6fc7b 100644
--- a/external_imported/vcpkg/ports/3fd/portfile.cmake
+++ b/external_imported/vcpkg/ports/3fd/portfile.cmake
@@ -1,14 +1,3 @@
-# Check architecture:
-if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
-    set(BUILD_ARCH "Win32")
-elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
-    set(BUILD_ARCH "x64")
-elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
-    set(BUILD_ARCH "ARM")
-else()
-    message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}")
-endif()
-
 # Check library linkage:
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT)
 
@@ -24,20 +13,16 @@ vcpkg_from_github(
 )
 
 # Build:
-if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") # UWP:
-    vcpkg_install_msbuild(
+if (VCPKG_TARGET_IS_UWP) # UWP:
+    vcpkg_msbuild_install(
         SOURCE_PATH "${SOURCE_PATH}"
         PROJECT_SUBPATH "3FD/3FD.WinRT.UWP.vcxproj"
-        PLATFORM ${BUILD_ARCH}
-        USE_VCPKG_INTEGRATION
     )
-elseif (NOT VCPKG_CMAKE_SYSTEM_NAME) # Win32:
-    vcpkg_install_msbuild(
+elseif (VCPKG_TARGET_IS_WINDOWS) # Win32:
+    vcpkg_msbuild_install(
         SOURCE_PATH "${SOURCE_PATH}"
         PROJECT_SUBPATH "3FD/3FD.vcxproj"
-        PLATFORM ${BUILD_ARCH}
         TARGET Build
-        USE_VCPKG_INTEGRATION
     )
 else()
     message(FATAL_ERROR "Unsupported system: 3FD is not currently ported to VCPKG in ${VCPKG_CMAKE_SYSTEM_NAME}!")
@@ -47,24 +32,24 @@ endif()
 file(GLOB HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/3FD/*.h")
 file(INSTALL
     ${HEADER_FILES}
-    DESTINATION ${CURRENT_PACKAGES_DIR}/include/3FD
+    DESTINATION "${CURRENT_PACKAGES_DIR}/include/3FD"
     PATTERN "*_impl*.h" EXCLUDE
     PATTERN "*example*.h" EXCLUDE
     PATTERN "stdafx.h" EXCLUDE
     PATTERN "targetver.h" EXCLUDE
 )
 
-file(INSTALL ${SOURCE_PATH}/btree  DESTINATION ${CURRENT_PACKAGES_DIR}/include/3FD)
-file(INSTALL ${SOURCE_PATH}/OpenCL/CL DESTINATION ${CURRENT_PACKAGES_DIR}/include/3FD)
+file(INSTALL "${SOURCE_PATH}/btree"  DESTINATION "${CURRENT_PACKAGES_DIR}/include/3FD")
+file(INSTALL "${SOURCE_PATH}/OpenCL/CL" DESTINATION "${CURRENT_PACKAGES_DIR}/include/3FD")
 
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/3FD)
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/3FD")
 file(INSTALL
-    ${SOURCE_PATH}/3FD/3fd-config-template.xml
-    DESTINATION ${CURRENT_PACKAGES_DIR}/share/3FD
+    "${SOURCE_PATH}/3FD/3fd-config-template.xml"
+    DESTINATION "${CURRENT_PACKAGES_DIR}/share/3FD"
 )
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/3fd RENAME copyright)
-file(INSTALL ${SOURCE_PATH}/Acknowledgements.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/3fd)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+file(INSTALL "${SOURCE_PATH}/Acknowledgements.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/3fd")
 
 vcpkg_copy_pdbs()
diff --git a/external_imported/vcpkg/ports/3fd/vcpkg.json b/external_imported/vcpkg/ports/3fd/vcpkg.json
index 5ee8f2d4e..0c2fb98d9 100644
--- a/external_imported/vcpkg/ports/3fd/vcpkg.json
+++ b/external_imported/vcpkg/ports/3fd/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "3fd",
   "version": "2.6.3",
-  "port-version": 2,
+  "port-version": 4,
   "description": "C++ Framework For Fast Development",
   "supports": "windows & !static & !arm64",
   "dependencies": [
@@ -18,6 +18,11 @@
       "platform": "windows"
     },
     "rapidxml",
-    "sqlite3"
+    "sqlite3",
+    {
+      "name": "vcpkg-msbuild",
+      "host": true,
+      "platform": "windows"
+    }
   ]
 }
diff --git a/external_imported/vcpkg/ports/7zip/CMakeLists.txt b/external_imported/vcpkg/ports/7zip/CMakeLists.txt
index 4f5559a35..b4bed2e8d 100644
--- a/external_imported/vcpkg/ports/7zip/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/7zip/CMakeLists.txt
@@ -10,6 +10,7 @@ endif()
 
 add_library(7zip)
 
+# Check makefile in srcdir/CPP/7zip/Archive/7z/makefile
 target_sources(7zip PRIVATE
     CPP/7zip/Compress/Bcj2Coder.cpp
     CPP/7zip/Compress/Bcj2Register.cpp
@@ -23,6 +24,7 @@ target_sources(7zip PRIVATE
     CPP/7zip/Compress/BZip2Decoder.cpp
     CPP/7zip/Compress/BZip2Encoder.cpp
     CPP/7zip/Compress/BZip2Register.cpp
+    CPP/7zip/Compress/CodecExports.cpp
     CPP/7zip/Compress/CopyCoder.cpp
     CPP/7zip/Compress/CopyRegister.cpp
     CPP/7zip/Compress/Deflate64Register.cpp
@@ -30,7 +32,10 @@ target_sources(7zip PRIVATE
     CPP/7zip/Compress/DeflateEncoder.cpp
     CPP/7zip/Compress/DeflateRegister.cpp
     CPP/7zip/Compress/DeltaFilter.cpp
+    #CPP/7zip/Compress/DllExports2Compress.cpp
+    #CPP/7zip/Compress/DllExportsCompress.cpp
     CPP/7zip/Compress/ImplodeDecoder.cpp
+    CPP/7zip/Compress/ImplodeHuffmanDecoder.cpp
     CPP/7zip/Compress/LzfseDecoder.cpp
     CPP/7zip/Compress/LzhDecoder.cpp
     CPP/7zip/Compress/Lzma2Decoder.cpp
@@ -57,10 +62,9 @@ target_sources(7zip PRIVATE
     CPP/7zip/Compress/XpressDecoder.cpp
     CPP/7zip/Compress/XzDecoder.cpp
     CPP/7zip/Compress/XzEncoder.cpp
+    CPP/7zip/Compress/ZDecoder.cpp
     CPP/7zip/Compress/ZlibDecoder.cpp
     CPP/7zip/Compress/ZlibEncoder.cpp
-    CPP/7zip/Compress/ZDecoder.cpp
-    CPP/7zip/Compress/CodecExports.cpp
 
     CPP/7zip/Crypto/7zAes.cpp
     CPP/7zip/Crypto/7zAesRegister.cpp
@@ -109,6 +113,7 @@ target_sources(7zip PRIVATE
     C/Sha1.c
     C/Sha256.c
     C/Sort.c
+    C/SwapBytes.c
     C/Threads.c
     C/Xz.c
     C/XzDec.c
@@ -396,6 +401,7 @@ target_compile_definitions(7zip
 target_include_directories(7zip
     INTERFACE
         $<INSTALL_INTERFACE:include>/7zip/CPP
+        $<INSTALL_INTERFACE:include>/7zip/C
 )
 
 install(
diff --git a/external_imported/vcpkg/ports/7zip/portfile.cmake b/external_imported/vcpkg/ports/7zip/portfile.cmake
index e1e42476c..cc09ec927 100644
--- a/external_imported/vcpkg/ports/7zip/portfile.cmake
+++ b/external_imported/vcpkg/ports/7zip/portfile.cmake
@@ -1,14 +1,9 @@
-set(7ZIP_VERSION "2201")
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://www.7-zip.org/a/7z${7ZIP_VERSION}-src.7z"
-    FILENAME "7z${7ZIP_VERSION}-src.7z"
-    SHA512 c37cede4b7253b8dc4372e9e011ef0fee0c1cd53cf9705bf106672a455e7ce1e5a0a288c763d73d3c28b2a41fb860c9bacb702b01d9192eed810787c7da1e0d8
-)
-
-vcpkg_extract_source_archive(
-    SOURCE_PATH
-    ARCHIVE "${ARCHIVE}"
-    NO_REMOVE_ONE_LEVEL
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO ip7z/7zip
+    REF "${VERSION}"
+    SHA512 7c2fb18261ce9185d29b690ccb7694d7926abe3af0619dbe42b7ab43b400ee71c1eb79c31f892aea2fbdb55036225f31ee393287cce91afd17f20cff8f6cb949
+    HEAD_REF main
 )
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
@@ -23,10 +18,6 @@ vcpkg_copy_pdbs()
 
 vcpkg_cmake_config_fixup()
 
-file(
-    INSTALL "${SOURCE_PATH}/DOC/License.txt"
-    DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
-    RENAME copyright
-)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/DOC/License.txt")
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/external_imported/vcpkg/ports/7zip/vcpkg.json b/external_imported/vcpkg/ports/7zip/vcpkg.json
index 642d18c45..e45dda4d1 100644
--- a/external_imported/vcpkg/ports/7zip/vcpkg.json
+++ b/external_imported/vcpkg/ports/7zip/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "7zip",
-  "version-string": "22.01",
+  "version-string": "23.01",
+  "port-version": 2,
   "description": "Library for archiving file with a high compression ratio.",
   "homepage": "https://www.7-zip.org",
   "license": "LGPL-2.1-or-later",
-  "supports": "!uwp",
+  "supports": "!uwp & !xbox",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/ableton-link/portfile.cmake b/external_imported/vcpkg/ports/ableton-link/portfile.cmake
index 521563e85..037080cdc 100644
--- a/external_imported/vcpkg/ports/ableton-link/portfile.cmake
+++ b/external_imported/vcpkg/ports/ableton-link/portfile.cmake
@@ -4,8 +4,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Ableton/link
-    REF Link-3.0.6
-    SHA512 7dd811d3b7792722a8754cd0875777b8cf4902a0babff2822a6fd997137eb5feac576263169c71fca24358189e56b5106a32ae1313b33fb6148eb845691a6438
+    REF "Link-${VERSION}"
+    SHA512 4c62357b74ed8bed21455d977504787ff4c11a862a0ee583c491742c93f6f4bc44b98df2a35f7811584277456b7580835098bc7b9afdd57caf7bd91f9462d202
     HEAD_REF master
     PATCHES
         replace_local_asiostandalone_by_vcpkg_asio.patch
@@ -76,8 +76,8 @@ vcpkg_apply_patches(
         correct_cmake_include_directory.patch
 )
 
-file(INSTALL "${SOURCE_PATH}/AbletonLinkConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/")
-file(INSTALL "${SOURCE_PATH}/cmake_include/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/cmake_include/")
+file(INSTALL "${SOURCE_PATH}/AbletonLinkConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/abletonlink")
+file(INSTALL "${SOURCE_PATH}/cmake_include/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/abletonlink/cmake_include/")
 file(INSTALL "${SOURCE_PATH}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include" PATTERN "CMakeLists.txt" EXCLUDE)
 
 # Handle copyright
diff --git a/external_imported/vcpkg/ports/ableton-link/vcpkg.json b/external_imported/vcpkg/ports/ableton-link/vcpkg.json
index 805564c57..4dc7efc5b 100644
--- a/external_imported/vcpkg/ports/ableton-link/vcpkg.json
+++ b/external_imported/vcpkg/ports/ableton-link/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "ableton-link",
-  "version": "3.0.6",
+  "version": "3.1.0",
   "description": "Ableton Link, a technology that synchronizes musical beat, tempo, and phase across multiple applications running on one or more devices.",
   "homepage": "https://www.ableton.com/en/link/",
   "documentation": "http://ableton.github.io/link/",
@@ -19,12 +19,14 @@
   "features": {
     "coretest": {
       "description": "Build LinkCoreTest suite",
+      "supports": "!uwp",
       "dependencies": [
         "catch2"
       ]
     },
     "discoverytest": {
       "description": "Build LinkDiscoveryTest suite",
+      "supports": "!uwp",
       "dependencies": [
         "catch2"
       ]
@@ -39,7 +41,8 @@
       ]
     },
     "hutsilent": {
-      "description": "Build LinkHutSilent command line tool"
+      "description": "Build LinkHutSilent command line tool",
+      "supports": "!uwp"
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/abseil/fix-32-bit-arm.patch b/external_imported/vcpkg/ports/abseil/fix-32-bit-arm.patch
deleted file mode 100644
index bc9ba4f14..000000000
--- a/external_imported/vcpkg/ports/abseil/fix-32-bit-arm.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/absl/time/internal/cctz/src/zone_info_source.cc b/absl/time/internal/cctz/src/zone_info_source.cc
-index 7209533..5ab5a59 100644
---- a/absl/time/internal/cctz/src/zone_info_source.cc
-+++ b/absl/time/internal/cctz/src/zone_info_source.cc
-@@ -65,7 +65,7 @@ ZoneInfoSourceFactory zone_info_source_factory __attribute__((weak)) =
- extern ZoneInfoSourceFactory zone_info_source_factory;
- extern ZoneInfoSourceFactory default_factory;
- ZoneInfoSourceFactory default_factory = DefaultFactory;
--#if defined(_M_IX86)
-+#if defined(_M_IX86) || defined(_M_ARM)
- #pragma comment(                                                                                                         \
-     linker,                                                                                                              \
-     "/alternatename:?zone_info_source_factory@cctz_extension@time_internal@" ABSL_INTERNAL_MANGLED_NS                    \
-@@ -83,8 +83,7 @@ ZoneInfoSourceFactory default_factory = DefaultFactory;
-     "@@U?$default_delete@VZoneInfoSource@cctz@time_internal@" ABSL_INTERNAL_MANGLED_NS                                   \
-     "@@@std@@@std@@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@@Z@" ABSL_INTERNAL_MANGLED_BACKREFERENCE \
-     "@@ZA")
--#elif defined(_M_IA_64) || defined(_M_AMD64) || defined(_M_ARM) || \
--    defined(_M_ARM64)
-+#elif defined(_M_IA_64) || defined(_M_AMD64) || defined(_M_ARM64)
- #pragma comment(                                                                                                          \
-     linker,                                                                                                               \
-     "/alternatename:?zone_info_source_factory@cctz_extension@time_internal@" ABSL_INTERNAL_MANGLED_NS                     \
diff --git a/external_imported/vcpkg/ports/abseil/fix-dll-support.patch b/external_imported/vcpkg/ports/abseil/fix-dll-support.patch
deleted file mode 100644
index c06b39588..000000000
--- a/external_imported/vcpkg/ports/abseil/fix-dll-support.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/CMake/AbseilDll.cmake b/CMake/AbseilDll.cmake
-index c4a41e6..da46613 100644
---- a/CMake/AbseilDll.cmake
-+++ b/CMake/AbseilDll.cmake
-@@ -787,7 +787,7 @@ Cflags: -I\${includedir}${PC_CFLAGS}\n")
-     # Abseil libraries require C++14 as the current minimum standard. When
-     # compiled with C++17 (either because it is the compiler's default or
-     # explicitly requested), then Abseil requires C++17.
--    _absl_target_compile_features_if_available(${_NAME} PUBLIC ${ABSL_INTERNAL_CXX_STD_FEATURE})
-+    _absl_target_compile_features_if_available(${_dll} PUBLIC ${ABSL_INTERNAL_CXX_STD_FEATURE})
-   else()
-     # Note: This is legacy (before CMake 3.8) behavior. Setting the
-     # target-level CXX_STANDARD property to ABSL_CXX_STANDARD (which is
-@@ -797,8 +797,8 @@ Cflags: -I\${includedir}${PC_CFLAGS}\n")
-     # CXX_STANDARD_REQUIRED does guard against the top-level CMake project
-     # not having enabled CMAKE_CXX_STANDARD_REQUIRED (which prevents
-     # "decaying" to an older standard if the requested one isn't available).
--    set_property(TARGET ${_NAME} PROPERTY CXX_STANDARD ${ABSL_CXX_STANDARD})
--    set_property(TARGET ${_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
-+    set_property(TARGET ${_dll} PROPERTY CXX_STANDARD ${ABSL_CXX_STANDARD})
-+    set_property(TARGET ${_dll} PROPERTY CXX_STANDARD_REQUIRED ON)
-   endif()
- 
-   install(TARGETS ${_dll} EXPORT ${PROJECT_NAME}Targets
diff --git a/external_imported/vcpkg/ports/abseil/portfile.cmake b/external_imported/vcpkg/ports/abseil/portfile.cmake
index 17c2e666c..7737254f8 100644
--- a/external_imported/vcpkg/ports/abseil/portfile.cmake
+++ b/external_imported/vcpkg/ports/abseil/portfile.cmake
@@ -5,11 +5,9 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO abseil/abseil-cpp
-    REF 20230125.0
-    SHA512 b3d334215c78b31a2eb10bd9d4a978cd48367866d6daa2065c6c727282bafe19ef7ff5bd7cd4ed5c319d3b04e0711222e08ddbe7621ef1e079fed93a7307112f
+    REF "${VERSION}"
+    SHA512 14390380655c41483a98487e3b012110dd8d1743fdd68d8cde7e0d7c2730312d564b15726d8c9d2fff237d2fce3983bbbb5213f59612c7c6feaeb402dff9609f
     HEAD_REF master
-    PATCHES
-        fix-dll-support.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -43,16 +41,16 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share"
                     "${CURRENT_PACKAGES_DIR}/include/absl/time/internal/cctz/testdata"
 )
 
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/absl/base/config.h"
-        "#elif defined(ABSL_CONSUME_DLL)" "#elif 1"
-    )
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/absl/base/internal/thread_identity.h"
-        "&& !defined(ABSL_CONSUME_DLL)" "&& 0"
-    )
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/absl/container/internal/hashtablez_sampler.h"
-        "!defined(ABSL_CONSUME_DLL)" "0"
-    )
+if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    file(GLOB_RECURSE headers "${CURRENT_PACKAGES_DIR}/include/absl/*.h")
+    foreach(header IN LISTS ${headers})
+        vcpkg_replace_string("${header}"
+            "!defined(ABSL_CONSUME_DLL)" "0"
+        )
+        vcpkg_replace_string("${header}"
+            "defined(ABSL_CONSUME_DLL)" "1"
+        )
+    endforeach()
 endif()
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/abseil/vcpkg.json b/external_imported/vcpkg/ports/abseil/vcpkg.json
index f783cd644..80a5876b1 100644
--- a/external_imported/vcpkg/ports/abseil/vcpkg.json
+++ b/external_imported/vcpkg/ports/abseil/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "abseil",
-  "version": "20230125.0",
-  "port-version": 1,
+  "version": "20230802.1",
   "description": [
     "an open-source collection designed to augment the C++ standard library.",
     "Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.",
diff --git a/external_imported/vcpkg/ports/absent/vcpkg.json b/external_imported/vcpkg/ports/absent/vcpkg.json
index 3623acc8c..3034fe368 100644
--- a/external_imported/vcpkg/ports/absent/vcpkg.json
+++ b/external_imported/vcpkg/ports/absent/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "absent",
-  "version-string": "0.3.1",
-  "port-version": 2,
+  "version": "0.3.1",
+  "port-version": 3,
   "description": "A small C++17 library meant to simplify the composition of nullable types in a generic, type-safe, and declarative way",
   "homepage": "https://github.com/rvarago/absent",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/ace/portfile.cmake b/external_imported/vcpkg/ports/ace/portfile.cmake
index 489ad61fb..cd660191b 100644
--- a/external_imported/vcpkg/ports/ace/portfile.cmake
+++ b/external_imported/vcpkg/ports/ace/portfile.cmake
@@ -1,5 +1,3 @@
-vcpkg_minimum_required(VERSION 2022-10-12)
-
 # Using zip archive under Linux would cause sh/perl to report "No such file or directory" or "bad interpreter"
 # when invoking `prj_install.pl`.
 # So far this issue haven't yet be triggered under WSL 1 distributions. Not sure the root cause of it.
@@ -10,14 +8,14 @@ if("tao" IN_LIST FEATURES)
     vcpkg_download_distfile(ARCHIVE
         URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${VERSION_DIRECTORY}/ACE%2BTAO-src-${VERSION}.tar.gz"
         FILENAME "ACE-TAO-${VERSION}.tar.gz"
-        SHA512 7210091f0512fa9c7ba2ea9e3f805a2ba0aab4d848a8e9e5651a824dcac65ddd50b95c98f4da86900487fa0a79aede126d021f4eb109f224224fc88a58133f79
+        SHA512 afa26e0579ebbac5db82df80a4ce6c2350d4665043bb549688dce4db08b3b1a7c6b072544d651b90bd521ae477de069f280ab8d52fe957143d1f8a7cbd23eb29
     )
 else()
     # Don't change to vcpkg_from_github! This points to a release and not an archive
     vcpkg_download_distfile(ARCHIVE
         URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${VERSION_DIRECTORY}/ACE-src-${VERSION}.tar.gz"
         FILENAME "ACE-src-${VERSION}.tar.gz"
-        SHA512 6e8b63ee8fa691656544a7a9e5887b499a8791f25766a8081df1d64e911f667a95fed26c1eb6355f6ce1233694f8ef11c1a986ca16a686e21fb1e375035a29ed
+        SHA512 b08c8cf98b622248cfbf167ca91c8314284c84c4dcb1c48fedb9180be2bc354c1d647372eb046e75d426ac4f2ad0318a8dd9e3f233d36bc30f744d5f9e37c5ec
     )
 endif()
 
@@ -65,12 +63,6 @@ vcpkg_find_acquire_program(PERL)
 get_filename_component(PERL_PATH ${PERL} DIRECTORY)
 vcpkg_add_to_path("${PERL_PATH}")
 
-if (TRIPLET_SYSTEM_ARCH MATCHES "x86")
-    set(MSBUILD_PLATFORM "Win32")
-else ()
-    set(MSBUILD_PLATFORM "${TRIPLET_SYSTEM_ARCH}")
-endif()
-
 # Add ace/config.h file
 # see https://htmlpreview.github.io/?https://github.com/DOCGroup/ACE_TAO/blob/master/ACE/ACE-INSTALL.html
 if(VCPKG_TARGET_IS_WINDOWS)
@@ -122,28 +114,10 @@ if("xml" IN_LIST FEATURES)
 endif()
 
 if(VCPKG_TARGET_IS_WINDOWS)
-  if("tao" IN_LIST FEATURES OR "xml" IN_LIST FEATURES)
-    file(WRITE "${SOURCE_PATH}/Directory.Build.props" "<?xml version=\"1.0\" encoding=\"utf-8\"?>
-                                                     <Project xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">
-                                                     <ItemDefinitionGroup>
-                                                     <ClCompile>
-                                                     <AdditionalOptions>/MP</AdditionalOptions>
-                                                     <AdditionalIncludeDirectories>${ACE_ROOT}</AdditionalIncludeDirectories>
-                                                     </ClCompile>
-                                                     <Link>
-                                                     <AdditionalLibraryDirectories>${CURRENT_PACKAGES_DIR}/lib;${CURRENT_PACKAGES_DIR}/debug/lib;${CURRENT_INSTALLED_DIR}/lib;${CURRENT_INSTALLED_DIR}/debug/lib</AdditionalLibraryDirectories>
-                                                     </Link>
-                                                     </ItemDefinitionGroup>
-                                                     </Project>")
-  endif()
-
   file(RELATIVE_PATH PROJECT_SUBPATH "${SOURCE_PATH}" "${WORKSPACE}.sln")
-  vcpkg_install_msbuild(
+  vcpkg_msbuild_install(
     SOURCE_PATH "${SOURCE_PATH}"
-    PROJECT_SUBPATH ${PROJECT_SUBPATH}
-    LICENSE_SUBPATH COPYING
-    PLATFORM ${MSBUILD_PLATFORM}
-    SKIP_CLEAN
+    PROJECT_SUBPATH "${PROJECT_SUBPATH}"
   )
 
   # ACE itself does not define an install target, so it is not clear which
@@ -165,8 +139,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
     endforeach()
   endfunction()
 
-  get_filename_component(SOURCE_PATH_SUFFIX "${SOURCE_PATH}" NAME)
-  set(SOURCE_COPY_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${SOURCE_PATH_SUFFIX}")
+  set(SOURCE_COPY_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")
 
   # Install headers in subdirectory
   set(ACE_INCLUDE_FOLDERS
@@ -281,12 +254,9 @@ if(VCPKG_TARGET_IS_WINDOWS)
 
   if("xml" IN_LIST FEATURES)
     file(RELATIVE_PATH PROJECT_SUBPATH_XML "${SOURCE_PATH}" "${ACE_ROOT}/ACEXML/ACEXML.sln")
-    vcpkg_install_msbuild(
+    vcpkg_msbuild_install(
       SOURCE_PATH "${SOURCE_PATH}"
-      PROJECT_SUBPATH ${PROJECT_SUBPATH_XML}
-      LICENSE_SUBPATH COPYING
-      PLATFORM ${MSBUILD_PLATFORM}
-      SKIP_CLEAN
+      PROJECT_SUBPATH "${PROJECT_SUBPATH_XML}"
     )
 
     set(ACEXML_INCLUDE_FOLDERS "ACEXML/common"
@@ -304,8 +274,6 @@ if(VCPKG_TARGET_IS_WINDOWS)
         "${CURRENT_PACKAGES_DIR}/debug/bin/ACEXML_XML_Svc_Conf_Parserd_dll.pdb")
     endif()
   endif()
-
-  vcpkg_clean_msbuild()
 elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
   FIND_PROGRAM(MAKE make)
   IF (NOT MAKE)
@@ -326,6 +294,7 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
   get_filename_component(WORKING_DIR "${WORKSPACE}" DIRECTORY)
   set(ENV{PWD} "${WORKING_DIR}")
 
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
   message(STATUS "Building ${TARGET_TRIPLET}-dbg")
   vcpkg_execute_build_process(
     COMMAND make ${_ace_makefile_macros} "debug=1" "optimize=0" "-j${VCPKG_CONCURRENCY}"
@@ -376,7 +345,9 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
       LOGNAME realclean-xml-${TARGET_TRIPLET}-dbg
     )
   endif()
-
+endif()
+  
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
   message(STATUS "Building ${TARGET_TRIPLET}-rel")
   vcpkg_execute_build_process(
     COMMAND make ${_ace_makefile_macros} "-j${VCPKG_CONCURRENCY}"
@@ -409,15 +380,16 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
     file(RENAME "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
   endif()
   message(STATUS "Packaging ${TARGET_TRIPLET}-rel done")
+endif()
+  
   # Restore `PWD` environment variable
   set($ENV{PWD} _prev_env)
 
-  # Handle copyright
-  file(INSTALL "${ACE_ROOT}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-
   file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/ace/bin/MakeProjectCreator")
   file(REMOVE "${CURRENT_PACKAGES_DIR}/share/ace/ace-devel.sh")
   file(REMOVE "${CURRENT_PACKAGES_DIR}/share/tao/tao-devel.sh")
 endif()
 
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
+
 vcpkg_fixup_pkgconfig()
diff --git a/external_imported/vcpkg/ports/ace/vcpkg.json b/external_imported/vcpkg/ports/ace/vcpkg.json
index 62f28842e..90a797bd9 100644
--- a/external_imported/vcpkg/ports/ace/vcpkg.json
+++ b/external_imported/vcpkg/ports/ace/vcpkg.json
@@ -1,11 +1,19 @@
 {
   "name": "ace",
-  "version": "7.0.11",
-  "port-version": 2,
+  "version": "7.1.2",
+  "port-version": 1,
   "maintainers": "Johnny Willemsen <jwillemsen@remedy.nl>",
   "description": "The ADAPTIVE Communication Environment",
   "homepage": "https://github.com/DOCGroup/ACE_TAO",
   "license": "DOC",
+  "supports": "!uwp",
+  "dependencies": [
+    {
+      "name": "vcpkg-msbuild",
+      "host": true,
+      "platform": "windows"
+    }
+  ],
   "features": {
     "ssl": {
       "description": "Enable SSL/TLS features in ACE",
@@ -14,7 +22,8 @@
       ]
     },
     "tao": {
-      "description": "The ACE ORB"
+      "description": "The ACE ORB",
+      "supports": "native | !(windows & arm)"
     },
     "wchar": {
       "description": "Enable extra wide char functions in ACE",
diff --git a/external_imported/vcpkg/ports/acl/portfile.cmake b/external_imported/vcpkg/ports/acl/portfile.cmake
index c51946b21..68e4d5245 100644
--- a/external_imported/vcpkg/ports/acl/portfile.cmake
+++ b/external_imported/vcpkg/ports/acl/portfile.cmake
@@ -1,7 +1,7 @@
-vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
-
 vcpkg_download_distfile(ARCHIVE
     URLS "http://download.savannah.nongnu.org/releases/acl/acl-${VERSION}.tar.xz"
+         "https://www.mirrorservice.org/sites/download.savannah.gnu.org/releases/acl/acl-${VERSION}.tar.xz"
+         
     FILENAME "acl-${VERSION}.tar.xz"
     SHA512 7d02f05d17305f8587ab485395b00c7fdb8e44c1906d0d04b70a43a3020803e8b2b8c707abb6147f794867dfa87bd51769c2d3e11a3db55ecbd2006a6e6231dc
 )
@@ -11,15 +11,25 @@ vcpkg_extract_source_archive(
     ARCHIVE ${ARCHIVE}
 )
 
+vcpkg_list(SET options)
+if("nls" IN_LIST FEATURES)
+    vcpkg_list(APPEND options "--enable-nls")
+    vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/gettext/bin")
+else()
+    set(ENV{AUTOPOINT} true) # true, the program
+    vcpkg_list(APPEND options "--disable-nls")
+endif()
+
 vcpkg_configure_make(
     SOURCE_PATH "${SOURCE_PATH}"
     AUTOCONFIG
+    OPTIONS
+        ${options}
 )
 
 vcpkg_install_make()
+vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-vcpkg_fixup_pkgconfig()
-
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/doc/COPYING.LGPL")
diff --git a/external_imported/vcpkg/ports/acl/vcpkg.json b/external_imported/vcpkg/ports/acl/vcpkg.json
index 712b7fbfb..f79ddb643 100644
--- a/external_imported/vcpkg/ports/acl/vcpkg.json
+++ b/external_imported/vcpkg/ports/acl/vcpkg.json
@@ -1,12 +1,27 @@
 {
   "name": "acl",
   "version-semver": "2.3.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Commands for Manipulating POSIX Access Control Lists",
   "homepage": "https://savannah.nongnu.org/projects/acl",
   "license": "LGPL-2.1-or-later",
   "supports": "linux",
   "dependencies": [
     "attr"
-  ]
+  ],
+  "features": {
+    "nls": {
+      "description": "Enable native language support",
+      "dependencies": [
+        {
+          "name": "gettext",
+          "host": true,
+          "features": [
+            "tools"
+          ]
+        },
+        "gettext-libintl"
+      ]
+    }
+  }
 }
diff --git a/external_imported/vcpkg/ports/activemq-cpp/activemq-cppConfig.cmake b/external_imported/vcpkg/ports/activemq-cpp/activemq-cppConfig.cmake
index 5719f9b6b..0a1178414 100644
--- a/external_imported/vcpkg/ports/activemq-cpp/activemq-cppConfig.cmake
+++ b/external_imported/vcpkg/ports/activemq-cpp/activemq-cppConfig.cmake
@@ -62,7 +62,7 @@ macro(_activemq_cpp_windows_dependencies)
         endif()
         list(JOIN _ACTIVEMQ_CPP_MISSINGS ", " _ACTIVEMQ_CPP_MISSINGS_STR)
         list(LENGTH _ACTIVEMQ_CPP_MISSINGS _ACTIVEMQ_CPP_MISSINGS_COUNT)
-        if(_ACTIVEMQ_CPP_MISSINGS_COUNT EQUALS 1)
+        if(_ACTIVEMQ_CPP_MISSINGS_COUNT EQUAL 1)
             set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "Activemq-cpp vcpkg install dependency failure: Did not find windows dependency: ${_ACTIVEMQ_CPP_MISSINGS_STR}")
         else()
             set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "Activemq-cpp vcpkg install dependency failure: Did not find windows dependencies: ${_ACTIVEMQ_CPP_MISSINGS_STR}")
@@ -133,9 +133,9 @@ if (ACTIVEMQ_CPP_DLL_RELEASE)
     #
     if (ACTIVEMQ_CPP_LIB_RELEASE AND ACTIVEMQ_CPP_DLL_DEBUG AND ACTIVEMQ_CPP_LIB_DEBUG)
         _set_exists(ACTIVEMQ_CPP_APR_LIB_RELEASE _ACTIVEMQ_CPP_APR_LIB_RELEASE_MISSING "${_IMPORT_PREFIX}/lib/libapr-1.lib")
-        _set_exists(ACTIVEMQ_CPP_APR_DLL_RELEASE _ACTIVEMQ_CPP_APR_DLL_RELEASE_MISSING "${_IMPORT_PREFIX}/lib/libapr-1.dll")
+        _set_exists(ACTIVEMQ_CPP_APR_DLL_RELEASE _ACTIVEMQ_CPP_APR_DLL_RELEASE_MISSING "${_IMPORT_PREFIX}/bin/libapr-1.dll")
         _set_exists(ACTIVEMQ_CPP_APR_LIB_DEBUG _ACTIVEMQ_CPP_APR_LIB_DEBUG_MISSING "${_IMPORT_PREFIX}/debug/lib/libapr-1.lib")
-        _set_exists(ACTIVEMQ_CPP_APR_DLL_DEBUG _ACTIVEMQ_CPP_APR_DLL_DEBUG_MISSING "${_IMPORT_PREFIX}/debug/lib/libapr-1.dll")
+        _set_exists(ACTIVEMQ_CPP_APR_DLL_DEBUG _ACTIVEMQ_CPP_APR_DLL_DEBUG_MISSING "${_IMPORT_PREFIX}/debug/bin/libapr-1.dll")
         if (ACTIVEMQ_CPP_APR_LIB_RELEASE AND ACTIVEMQ_CPP_APR_DLL_RELEASE AND ACTIVEMQ_CPP_APR_LIB_DEBUG AND ACTIVEMQ_CPP_APR_DLL_DEBUG)
             _activemq_cpp_windows_dependencies()
             if (${CMAKE_FIND_PACKAGE_NAME}_WINDOWS_DEPENDENCIES_FOUND)
diff --git a/external_imported/vcpkg/ports/activemq-cpp/portfile.cmake b/external_imported/vcpkg/ports/activemq-cpp/portfile.cmake
index 2461dde49..9280b86f5 100644
--- a/external_imported/vcpkg/ports/activemq-cpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/activemq-cpp/portfile.cmake
@@ -1,5 +1,3 @@
-set(VERSION 3.9.5)
-
 set(PATCHES )
 if (NOT VCPKG_TARGET_IS_LINUX)
     set(PATCHES FunctionLevelLinkingOn.diff)
@@ -15,9 +13,9 @@ vcpkg_download_distfile(ARCHIVE
     FILENAME "activemq-cpp-library-${VERSION}-src.tar.bz2"
     SHA512 83692d3dfd5ecf557fc88d204a03bf169ce6180bcff27be41b09409b8f7793368ffbeed42d98ef6374c6b6b477d9beb8a4a9ac584df9e56725ec59ceceaa6ae2
 )
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
+vcpkg_extract_source_archive(
+    SOURCE_PATH
+    ARCHIVE "${ARCHIVE}"
     PATCHES ${PATCHES}
 )
 
@@ -65,62 +63,55 @@ else()
         vcpkg_replace_string("${ACTIVEMQCPP_MSVC_PROJ}" ";libapr-1.lib" ";apr-1.lib")
     endif()
 
-    if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
+    if(VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
         set(BUILD_ARCH "Win32")
-    elseif (VCPKG_TARGET_ARCHITECTURE MATCHES "x64")
-        set(BUILD_ARCH "x64")
     else()
-        message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}")
+        set(BUILD_ARCH "${VCPKG_TARGET_ARCHITECTURE}")
     endif()
 
     string(REPLACE "/" "\\" WIN_SOURCE_PATH "${SOURCE_PATH}")
     vcpkg_replace_string("${ACTIVEMQCPP_MSVC_PROJ}" "ClCompile Include=\"..\\src" "ClCompile Include=\"${WIN_SOURCE_PATH}\\src")
     vcpkg_replace_string("${ACTIVEMQCPP_MSVC_PROJ}" "ClInclude Include=\"..\\src" "ClInclude Include=\"${WIN_SOURCE_PATH}\\src")
     vcpkg_replace_string("${ACTIVEMQCPP_MSVC_PROJ}" "../src/main" "${WIN_SOURCE_PATH}\\src\\main")
-    vcpkg_install_msbuild(
+    vcpkg_msbuild_install(
          SOURCE_PATH "${SOURCE_PATH}/vs2010-build"
          PROJECT_SUBPATH "activemq-cpp.vcxproj"
          RELEASE_CONFIGURATION ${RELEASE_CONF}
          DEBUG_CONFIGURATION   ${DEBUG_CONF}
          PLATFORM ${BUILD_ARCH}
-         USE_VCPKG_INTEGRATION
-         ALLOW_ROOT_INCLUDES
-         SKIP_CLEAN
     )
 
-    vcpkg_copy_pdbs()
-
     if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
         file(COPY
-            "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vs2010-build/${BUILD_ARCH}/${RELEASE_CONF}/${ACTIVEMQCPP_LIB_PREFFIX}activemq-cpp.lib"
+            "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${BUILD_ARCH}/${RELEASE_CONF}/${ACTIVEMQCPP_LIB_PREFFIX}activemq-cpp.lib"
             DESTINATION "${CURRENT_PACKAGES_DIR}/lib"
         )
 
         if (ACTIVEMQCPP_SHARED_LIB)
             file(COPY
-                "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vs2010-build/${BUILD_ARCH}/${RELEASE_CONF}/activemq-cpp.dll"
+                "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${BUILD_ARCH}/${RELEASE_CONF}/activemq-cpp.dll"
                 DESTINATION "${CURRENT_PACKAGES_DIR}/bin"
             )
             file(COPY
-                "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vs2010-build/${BUILD_ARCH}/${RELEASE_CONF}/activemq-cpp.pdb"
+                "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${BUILD_ARCH}/${RELEASE_CONF}/activemq-cpp.pdb"
                 DESTINATION "${CURRENT_PACKAGES_DIR}/bin"
             )
         endif()
     endif()
 
-    if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+    if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
         file(COPY
-            "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/vs2010-build/${BUILD_ARCH}/${DEBUG_CONF}/${ACTIVEMQCPP_LIB_PREFFIX}activemq-cpp${ACTIVEMQCPP_LIB_SUFFIX}.lib"
+            "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/${BUILD_ARCH}/${DEBUG_CONF}/${ACTIVEMQCPP_LIB_PREFFIX}activemq-cpp${ACTIVEMQCPP_LIB_SUFFIX}.lib"
             DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib"
         )
 
-        if (ACTIVEMQCPP_SHARED_LIB)
+        if(ACTIVEMQCPP_SHARED_LIB)
             file(COPY
-                "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/vs2010-build/${BUILD_ARCH}/${DEBUG_CONF}/activemq-cpp${ACTIVEMQCPP_LIB_SUFFIX}.dll"
+                "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/${BUILD_ARCH}/${DEBUG_CONF}/activemq-cpp${ACTIVEMQCPP_LIB_SUFFIX}.dll"
                 DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin"
             )
             file(COPY
-                "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/vs2010-build/${BUILD_ARCH}/${DEBUG_CONF}/activemq-cpp${ACTIVEMQCPP_LIB_SUFFIX}.pdb"
+                "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/${BUILD_ARCH}/${DEBUG_CONF}/activemq-cpp${ACTIVEMQCPP_LIB_SUFFIX}.pdb"
                 DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin"
             )
         endif()
@@ -129,10 +120,9 @@ else()
     file(COPY "${SOURCE_PATH}/src/main/activemq" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN *.h)
     file(COPY "${SOURCE_PATH}/src/main/cms"      DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN *.h)
     file(COPY "${SOURCE_PATH}/src/main/decaf"    DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN *.h)
-    vcpkg_clean_msbuild()
 endif()
 
 vcpkg_fixup_pkgconfig()
 
 file(INSTALL "${CURRENT_PORT_DIR}/activemq-cppConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/activemq-cpp")
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/external_imported/vcpkg/ports/activemq-cpp/vcpkg.json b/external_imported/vcpkg/ports/activemq-cpp/vcpkg.json
index d4306507e..e11ffd7ab 100644
--- a/external_imported/vcpkg/ports/activemq-cpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/activemq-cpp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "activemq-cpp",
   "version-semver": "3.9.5",
-  "port-version": 10,
+  "port-version": 15,
   "description": "Apache ActiveMQ is the most popular and powerful open source messaging and Integration Patterns server.",
   "license": "Apache-2.0",
   "supports": "!(uwp | osx)",
@@ -10,6 +10,11 @@
     {
       "name": "libuuid",
       "platform": "!windows & !osx"
+    },
+    {
+      "name": "vcpkg-msbuild",
+      "host": true,
+      "platform": "windows"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/ada-url/no-cpm.patch b/external_imported/vcpkg/ports/ada-url/no-cpm.patch
new file mode 100644
index 000000000..ee0ad3586
--- /dev/null
+++ b/external_imported/vcpkg/ports/ada-url/no-cpm.patch
@@ -0,0 +1,31 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b206edb6..1db4099d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -30,7 +30,6 @@ option(ADA_TESTING "Build tests" ${BUILD_TESTING})
+ # errors due to CPM, so this is here to support disabling all the testing
+ # and tooling for ada if one only wishes to use the ada library.
+ if(ADA_TESTING OR ADA_BENCHMARKS OR ADA_TOOLS)
+-  include(cmake/CPM.cmake)
+   # CPM requires git as an implicit dependency
+   find_package(Git QUIET)
+   # We use googletest in the tests
+diff --git a/tools/cli/CMakeLists.txt b/tools/cli/CMakeLists.txt
+index ff57220b..a6d90f29 100644
+--- a/tools/cli/CMakeLists.txt
++++ b/tools/cli/CMakeLists.txt
+@@ -8,12 +8,8 @@ if(MSVC AND BUILD_SHARED_LIBS)
+         "$<TARGET_FILE:ada>"      # <--this is in-file
+         "$<TARGET_FILE_DIR:adaparse>")                 # <--this is out-file path
+ endif()
+-CPMAddPackage("gh:fmtlib/fmt#7.1.3")
+-CPMAddPackage(
+-  GITHUB_REPOSITORY jarro2783/cxxopts
+-  VERSION 3.1.1
+-  OPTIONS "CXXOPTS_BUILD_EXAMPLES NO" "CXXOPTS_BUILD_TESTS NO" "CXXOPTS_ENABLE_INSTALL YES"
+-)
++find_package(fmt CONFIG REQUIRED)
++find_package(cxxopts CONFIG REQUIRED)
+ target_link_libraries(adaparse PRIVATE cxxopts::cxxopts fmt::fmt)
+ 
+ if(MSVC OR MINGW)
diff --git a/external_imported/vcpkg/ports/ada-url/portfile.cmake b/external_imported/vcpkg/ports/ada-url/portfile.cmake
new file mode 100644
index 000000000..b1bcf668f
--- /dev/null
+++ b/external_imported/vcpkg/ports/ada-url/portfile.cmake
@@ -0,0 +1,40 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO ada-url/ada
+    REF "v${VERSION}"
+    SHA512 941b522f8aec7959557a1238b23a48b7d3e4ff4035b0897d23fc7dba26cc227b2b3e48d8ecd03431c871041d52870015361ff6a595fa4872a640943b55c62617
+    HEAD_REF main
+    PATCHES
+        no-cpm.patch
+)
+
+vcpkg_check_features(
+    OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        tools ADA_TOOLS
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DADA_BENCHMARKS=OFF
+        -DBUILD_TESTING=OFF
+        -DCMAKE_DISABLE_FIND_PACKAGE_Python3=ON
+        ${FEATURE_OPTIONS}
+    OPTIONS_DEBUG
+        -DADA_TOOLS=OFF
+)
+
+vcpkg_cmake_install()
+
+vcpkg_copy_pdbs()
+
+vcpkg_cmake_config_fixup(PACKAGE_NAME ada CONFIG_PATH "lib/cmake/ada")
+
+if("tools" IN_LIST FEATURES)
+    vcpkg_copy_tools(TOOL_NAMES adaparse AUTO_CLEAN)
+endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE-APACHE" "${SOURCE_PATH}/LICENSE-MIT")
diff --git a/external_imported/vcpkg/ports/ada-url/vcpkg.json b/external_imported/vcpkg/ports/ada-url/vcpkg.json
new file mode 100644
index 000000000..6458884ac
--- /dev/null
+++ b/external_imported/vcpkg/ports/ada-url/vcpkg.json
@@ -0,0 +1,27 @@
+{
+  "name": "ada-url",
+  "version": "2.7.6",
+  "description": "WHATWG-compliant and fast URL parser written in modern C++",
+  "homepage": "https://ada-url.com/",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
+  "features": {
+    "tools": {
+      "description": "Build CLI tools (adaparse)",
+      "supports": "!uwp",
+      "dependencies": [
+        "cxxopts",
+        "fmt"
+      ]
+    }
+  }
+}
diff --git a/external_imported/vcpkg/ports/ade/portfile.cmake b/external_imported/vcpkg/ports/ade/portfile.cmake
index fd99ae728..ccfb82caf 100644
--- a/external_imported/vcpkg/ports/ade/portfile.cmake
+++ b/external_imported/vcpkg/ports/ade/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO opencv/ade
-    REF v0.1.1f
-    SHA512 fbdec8f3d5811a573abb81f1ceb6fb8d40274439013f749645db5430c6d9cdc52227c25203f1a68177b263d648bb65197ea7c2bea7871264a06585e59892631c
+    REF "v${VERSION}"
+    SHA512 46f2feee28d732a6940a5a95944f3283bde1b8c8e05466a8ca1c576623c54d1bed875ce2b24a941111d8976cb0c6ba5a4ac8408f042f5765debf1badf7d43348
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/ade/vcpkg.json b/external_imported/vcpkg/ports/ade/vcpkg.json
index 946cdc994..9e3a46646 100644
--- a/external_imported/vcpkg/ports/ade/vcpkg.json
+++ b/external_imported/vcpkg/ports/ade/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "ade",
-  "version-string": "0.1.1f",
-  "port-version": 3,
+  "version-string": "0.1.2d",
   "description": "ADE Framework is a graph construction, manipulation, and processing framework. ADE Framework is suitable for organizing data flow processing and execution.",
   "dependencies": [
     {
diff --git a/external_imported/vcpkg/ports/akali/portfile.cmake b/external_imported/vcpkg/ports/akali/portfile.cmake
deleted file mode 100644
index 3ed9ff364..000000000
--- a/external_imported/vcpkg/ports/akali/portfile.cmake
+++ /dev/null
@@ -1,38 +0,0 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO winsoft666/akali
-    REF 2e35164a9a2a48a50af06c8ae59fcad0f4d6584e
-    SHA512 103c4da3d318d7ae7da4821e58eced918c9d64dbc6d97e9e6c15fa69731331cf6160f593437366cb3a844fa292a8d875e3e63a679e7fbdeae22bb4d73e3d3144
-    HEAD_REF master
-)
-
-string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" AKALI_STATIC)
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    DISABLE_PARALLEL_CONFIGURE
-    OPTIONS
-        -DAKALI_STATIC:BOOL=${AKALI_STATIC}
-        -DBUILD_TESTS:BOOL=OFF
-)
-
-vcpkg_cmake_install()
-vcpkg_copy_pdbs()
-
-if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/akali")
-    vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/akali)
-elseif(EXISTS "${CURRENT_PACKAGES_DIR}/share/akali")
-    vcpkg_cmake_config_fixup(CONFIG_PATH share/akali)
-endif()
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-  vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/akali/akali_export.h" "#ifdef AKALI_STATIC" "#if 1")
-else()
-  vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/akali/akali_export.h" "#ifdef AKALI_STATIC" "#if 0")
-endif()
-
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-
-
diff --git a/external_imported/vcpkg/ports/akali/vcpkg.json b/external_imported/vcpkg/ports/akali/vcpkg.json
deleted file mode 100644
index c06a223e7..000000000
--- a/external_imported/vcpkg/ports/akali/vcpkg.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "name": "akali",
-  "version": "1.43",
-  "port-version": 1,
-  "description": "C++ Common Library.",
-  "homepage": "https://github.com/winsoft666/akali",
-  "license": "MIT",
-  "supports": "!(arm | arm64 | uwp)",
-  "dependencies": [
-    {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
-    }
-  ]
-}
diff --git a/external_imported/vcpkg/ports/aklomp-base64/portfile.cmake b/external_imported/vcpkg/ports/aklomp-base64/portfile.cmake
new file mode 100644
index 000000000..d55cc8732
--- /dev/null
+++ b/external_imported/vcpkg/ports/aklomp-base64/portfile.cmake
@@ -0,0 +1,22 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO aklomp/base64
+    REF "v${VERSION}"
+    SHA512 d63c6b36c99abcdfadf3730096c3a7cd36593526dd3dae815035ce196d3354ece7da1d92ecec800a81e1ab5e1d878b24f0b1de62b7aca516170d06a07c1b42a2
+    HEAD_REF master
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH ${SOURCE_PATH}
+)
+
+vcpkg_cmake_install()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_cmake_config_fixup(
+	PACKAGE_NAME base64
+	CONFIG_PATH "lib/cmake/base64"
+)
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/aklomp-base64/vcpkg.json b/external_imported/vcpkg/ports/aklomp-base64/vcpkg.json
new file mode 100644
index 000000000..e63dced64
--- /dev/null
+++ b/external_imported/vcpkg/ports/aklomp-base64/vcpkg.json
@@ -0,0 +1,17 @@
+{
+  "name": "aklomp-base64",
+  "version": "0.5.1",
+  "description": "Implementation of a base64 stream encoding/decoding library in C99 with SIMD (AVX2, AVX512, NEON, AArch64/NEON, SSSE3, SSE4.1, SSE4.2, AVX) and OpenMP acceleration",
+  "homepage": "https://github.com/aklomp/base64",
+  "license": "BSD-2-Clause",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/alac-decoder/vcpkg.json b/external_imported/vcpkg/ports/alac-decoder/vcpkg.json
index 4755cc81f..9792d5a6b 100644
--- a/external_imported/vcpkg/ports/alac-decoder/vcpkg.json
+++ b/external_imported/vcpkg/ports/alac-decoder/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "alac-decoder",
-  "version-string": "0.2",
-  "port-version": 6,
+  "version": "0.2",
+  "port-version": 7,
   "description": "ALAC C implementation of a decoder, written from reverse engineering the file format",
   "homepage": "https://distfiles.macports.org/alac_decoder",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/alac/vcpkg.json b/external_imported/vcpkg/ports/alac/vcpkg.json
index d9e252fff..f1e99550c 100644
--- a/external_imported/vcpkg/ports/alac/vcpkg.json
+++ b/external_imported/vcpkg/ports/alac/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "alac",
-  "version-string": "2017-11-03-c38887c5",
-  "port-version": 3,
+  "version": "2017-11-03-c38887c5",
+  "port-version": 4,
   "description": "The Apple Lossless Audio Codec (ALAC) is a lossless audio codec developed by Apple and deployed on all of its platforms and devices.",
   "homepage": "https://github.com/macosforge/alac",
   "supports": "!uwp",
diff --git a/external_imported/vcpkg/ports/alembic/disable-warnings-as-error.patch b/external_imported/vcpkg/ports/alembic/disable-warnings-as-error.patch
deleted file mode 100644
index 48ad94b30..000000000
--- a/external_imported/vcpkg/ports/alembic/disable-warnings-as-error.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Workaround for https://github.com/alembic/alembic/issues/309
-diff --git a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -125,14 +125,6 @@ IF (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
- ENDIF()
- 
--# Set some debug vs opt flags
--if ("${CMAKE_BUILD_TYPE}" MATCHES "Debug" AND NOT MSVC)
--    add_definitions(-Wall -Werror -Wextra -Wno-unused-parameter -Wno-deprecated)
--    if((CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 7.0) OR
--        CMAKE_CXX_COMPILER_ID MATCHES "CLANG")
--        add_definitions( -Wno-error=implicit-fallthrough)
--    endif()
--endif()
- 
- IF (NOT ${WINDOWS})
-     SET(EXTERNAL_MATH_LIBS "-lm")
diff --git a/external_imported/vcpkg/ports/alembic/fix-runtime-destination.patch b/external_imported/vcpkg/ports/alembic/fix-runtime-destination.patch
index 28a817be2..093218644 100644
--- a/external_imported/vcpkg/ports/alembic/fix-runtime-destination.patch
+++ b/external_imported/vcpkg/ports/alembic/fix-runtime-destination.patch
@@ -1,8 +1,9 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 860a8be..ee0f4f7 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -73,7 +73,7 @@ option(DOCS_PATH
- 
+@@ -74,7 +74,7 @@ option(DOCS_PATH
+
  # Set static/dynamic build options
  SET(LIB_TYPE STATIC)
 -SET(RUNTIME_INSTALL_DIR lib)
@@ -11,13 +12,11 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
  SET(ARCHIVE_INSTALL_DIR lib)
  IF (ALEMBIC_SHARED_LIBS)
 diff --git a/lib/Alembic/CMakeLists.txt b/lib/Alembic/CMakeLists.txt
+index 25e760c..9acac61 100644
 --- a/lib/Alembic/CMakeLists.txt
 +++ b/lib/Alembic/CMakeLists.txt
-@@ -78,12 +78,11 @@ option(DOCS_PATH
-     ${ZLIB_LIBRARY}
-   )
- 
--SET( ALEMBIC_LIB_INSTALL_DIR lib CACHE PATH "Where to install the Alembic libs")
+@@ -87,9 +87,9 @@ TARGET_LINK_LIBRARIES(Alembic
+ SET( ALEMBIC_LIB_INSTALL_DIR lib CACHE STRING "Where to install the Alembic libs")
  INSTALL(TARGETS Alembic
          EXPORT AlembicTargets
 -        LIBRARY DESTINATION ${ALEMBIC_LIB_INSTALL_DIR}
@@ -26,6 +25,6 @@ diff --git a/lib/Alembic/CMakeLists.txt b/lib/Alembic/CMakeLists.txt
 +        LIBRARY DESTINATION ${LIBRARY_INSTALL_DIR}
 +        ARCHIVE DESTINATION ${ARCHIVE_INSTALL_DIR}
 +        RUNTIME DESTINATION ${RUNTIME_INSTALL_DIR})
- 
+
  #-******************************************************************************
  # PACKAGE EXPORTS
diff --git a/external_imported/vcpkg/ports/alembic/portfile.cmake b/external_imported/vcpkg/ports/alembic/portfile.cmake
index 2415acdce..47f5a103a 100644
--- a/external_imported/vcpkg/ports/alembic/portfile.cmake
+++ b/external_imported/vcpkg/ports/alembic/portfile.cmake
@@ -3,12 +3,11 @@ vcpkg_buildpath_length_warning(37)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO alembic/alembic
-    REF 1.8.3
-    SHA512 0049c72d93e66e12d704d27e7ba36cd9c718667f2ce4f7baa1bee1613ed88ba53abea98f457e14f7f2144cb353810a4108d26c7dd1a1543ec2af576272f19036
+    REF "${VERSION}"
+    SHA512 6371b830242be90d4ea833248df5fd42d9e713e305d15eb1383d04410319acdae5743d48d65e8f75f1cedce777d2af7d969cde095f678b17322c19f1c69f477b
     HEAD_REF master
     PATCHES
         fix-runtime-destination.patch
-        disable-warnings-as-error.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ALEMBIC_SHARED_LIBS)
@@ -24,6 +23,7 @@ vcpkg_cmake_configure(
         -DALEMBIC_SHARED_LIBS=${ALEMBIC_SHARED_LIBS}
         -DUSE_TESTS=OFF
         ${FEATURE_OPTIONS}
+        -DALEMBIC_DEBUG_WARNINGS_AS_ERRORS=OFF
 )
 
 vcpkg_cmake_install()
@@ -46,4 +46,4 @@ vcpkg_copy_tools(
 )
 vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/external_imported/vcpkg/ports/alembic/vcpkg.json b/external_imported/vcpkg/ports/alembic/vcpkg.json
index cbc9fc27f..a472781f6 100644
--- a/external_imported/vcpkg/ports/alembic/vcpkg.json
+++ b/external_imported/vcpkg/ports/alembic/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "alembic",
-  "version": "1.8.3",
-  "port-version": 1,
+  "version": "1.8.6",
   "description": "Alembic is an open framework for storing and sharing scene data that includes a C++ library, a file format, and client plugins and applications.",
   "homepage": "https://alembic.io/",
   "supports": "!(windows & x86) & !uwp",
diff --git a/external_imported/vcpkg/ports/aliyun-oss-c-sdk/vcpkg.json b/external_imported/vcpkg/ports/aliyun-oss-c-sdk/vcpkg.json
index d8c37f5a3..d2267e5d5 100644
--- a/external_imported/vcpkg/ports/aliyun-oss-c-sdk/vcpkg.json
+++ b/external_imported/vcpkg/ports/aliyun-oss-c-sdk/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "aliyun-oss-c-sdk",
-  "version-string": "3.10.0",
-  "port-version": 2,
+  "version": "3.10.0",
+  "port-version": 3,
   "description": "Alibaba Cloud Object Storage Service (OSS) is a cloud storage service provided by Alibaba Cloud, featuring massive capacity, security, a low cost, and high reliability.",
   "supports": "!(uwp | linux | osx)",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/allegro5/cmake-project-include.cmake b/external_imported/vcpkg/ports/allegro5/cmake-project-include.cmake
index 4c1beb129..5b736dbb1 100644
--- a/external_imported/vcpkg/ports/allegro5/cmake-project-include.cmake
+++ b/external_imported/vcpkg/ports/allegro5/cmake-project-include.cmake
@@ -1,3 +1,8 @@
 if(MSVC AND CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64")
     add_compile_options(/Gy)
 endif()
+
+# https://gitlab.kitware.com/cmake/cmake/-/issues/25635
+if(CMAKE_VERSION VERSION_EQUAL "3.28.0" OR CMAKE_VERSION VERSION_EQUAL "3.28.1")
+    list(APPEND CMAKE_IGNORE_PATH "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/freetype")
+endif()
diff --git a/external_imported/vcpkg/ports/allegro5/export-targets.patch b/external_imported/vcpkg/ports/allegro5/export-targets.patch
deleted file mode 100644
index 53dc57b7d..000000000
--- a/external_imported/vcpkg/ports/allegro5/export-targets.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7c5720b..72880c4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1156,6 +1156,24 @@ if(INSTALL_PKG_CONFIG_FILES)
-     endforeach(versuffix)
- endif(INSTALL_PKG_CONFIG_FILES)
- 
-+file(WRITE "${CMAKE_INSTALL_PREFIX}/share/unofficial-allegro5/unofficial-allegro5-config.cmake"
-+[[
-+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegroTargets.cmake")
-+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_audioTargets.cmake")
-+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_videoTargets.cmake")
-+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_primitivesTargets.cmake")
-+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_fontTargets.cmake")
-+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_ttfTargets.cmake")
-+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_memfileTargets.cmake")
-+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_physfsTargets.cmake")
-+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_imageTargets.cmake")
-+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_mainTargets.cmake")
-+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_dialogTargets.cmake")
-+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_colorTargets.cmake")
-+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_acodecTargets.cmake")
-+
-+]])
-+
- #-----------------------------------------------------------------------------#
- #
- #   Documentation
-diff --git a/cmake/Common.cmake b/cmake/Common.cmake
-index 74edef8..0cf1edb 100644
---- a/cmake/Common.cmake
-+++ b/cmake/Common.cmake
-@@ -220,6 +220,7 @@ endfunction(set_our_framework_properties)
- 
- function(install_our_library target filename)
-     install(TARGETS ${target}
-+            EXPORT unofficial-${target}Targets
-             LIBRARY DESTINATION "lib${LIB_SUFFIX}"
-             ARCHIVE DESTINATION "lib${LIB_SUFFIX}"
-             FRAMEWORK DESTINATION "${FRAMEWORK_INSTALL_PREFIX}"
-@@ -227,6 +228,10 @@ function(install_our_library target filename)
-             # Doesn't work, see below.
-             # PUBLIC_HEADER DESTINATION "include"
-             )
-+    install(EXPORT unofficial-${target}Targets
-+        NAMESPACE unofficial-allegro5::
-+        DESTINATION share/unofficial-allegro5
-+    )
-     if(0)
-         install(FILES ${CMAKE_BINARY_DIR}/lib/\${CMAKE_INSTALL_CONFIG_NAME}/${filename}.pdb
-             DESTINATION lib
diff --git a/external_imported/vcpkg/ports/allegro5/portfile.cmake b/external_imported/vcpkg/ports/allegro5/portfile.cmake
index b9521f48d..bd8a85e8a 100644
--- a/external_imported/vcpkg/ports/allegro5/portfile.cmake
+++ b/external_imported/vcpkg/ports/allegro5/portfile.cmake
@@ -1,72 +1,62 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO liballeg/allegro5
-    REF 5.2.6.0
-    SHA512 d590c1a00d1b314c6946e0f6ad3e3a8b6e6309bada2ec38857186f817147ac99dae8a1c4412abe701af88da5dca3dd8f989a1da66630192643d3c08c0146b603
+    REF ${VERSION}
+    SHA512 5466e547a20bf22d606a385eeb9facc57b43c7f64689c724f82a572d4730dc62b2860829435b739a716ebca85fdc01c071f3e630048cdfd4799157e61fe815e9
     HEAD_REF master
     PATCHES
         do-not-copy-pdbs-to-lib.patch
-        export-targets.patch
         msvc-arm64-atomic.patch
 )
 
+if(VCPKG_TARGET_IS_ANDROID AND NOT ENV{ANDROID_HOME})
+    message(FATAL_ERROR "${PORT} requires environment variable ANDROID_HOME to be set." )
+endif()
+
+vcpkg_find_acquire_program(PKGCONFIG)
+set(ENV{PKG_CONFIG} "${PKGCONFIG}")
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" VCPKG_BUILD_SHARED_LIBS)
 
+vcpkg_check_features(OUT_FEATURE_OPTIONS options
+    FEATURES
+        direct3d    WANT_D3D
+        opengl      WANT_OPENGL
+)
+if(NOT WANT_OPENGL)
+    list(APPEND options -DWANT_X11=OFF)
+endif()
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         "-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake"
-        -DWANT_DOCS=OFF
+        -DINSTALL_PKG_CONFIG_FILES=true
+        -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=ON
+        -DSHARED=${VCPKG_BUILD_SHARED_LIBS}
+        ${options}
         -DALLEGRO_SDL=OFF
+        -DWANT_D3D9EX=OFF # Not available on vcpkg
         -DWANT_DEMO=OFF
-        -DSHARED=${VCPKG_BUILD_SHARED_LIBS}
-        -DINSTALL_PKG_CONFIG_FILES=true
+        -DWANT_DOCS=OFF
         -DWANT_EXAMPLES=OFF
-        -DWANT_TESTS=OFF
-        -DWANT_AUDIO=ON
-        -DWANT_COLOR=ON
-        -DWANT_D3D=ON
-        -DWANT_D3D9EX=OFF # Not available on vcpkg
-        -DWANT_DSOUND=ON
-        -DWANT_FLAC=ON
-        -DWANT_FONT=ON
         -DWANT_GLES3=ON
-        -DWANT_IMAGE=ON
-        -DWANT_IMAGE_JPG=ON
-        -DWANT_IMAGE_PNG=ON
-        -DWANT_MEMFILE=ON
+        -DWANT_IMAGE_FREEIMAGE=OFF
         -DWANT_MODAUDIO=OFF # Not available on vcpkg right now
-        -DWANT_NATIVE_DIALOG=ON
-        -DWANT_NATIVE_IMAGE_LOADER=ON
-        -DWANT_OGG_VIDEO=ON
-        -DWANT_OPENAL=ON
-        -DWANT_OPENGL=ON
+        -DWANT_MP3=OFF
         -DWANT_OPENSL=OFF # Not yet available on vcpkg
-        -DWANT_OPUS=ON
-        -DWANT_PHYSFS=ON
         -DWANT_POPUP_EXAMPLES=OFF
-        -DWANT_PRIMITIVES=ON
-        -DWANT_RELEASE_LOGGING=OFF
-        -DWANT_SHADERS_D3D=ON
-        -DWANT_SHADERS_GL=ON
+        -DWANT_TESTS=OFF
         -DWANT_TREMOR=OFF # Not yet available on vcpkg
-        -DWANT_TTF=ON
-        -DWANT_VIDEO=ON
-        -DWANT_VORBIS=ON
-    OPTIONS_RELEASE
-        -DWANT_ALLOW_SSE=ON
-    OPTIONS_DEBUG
-        -DWANT_ALLOW_SSE=OFF
 )
 
 vcpkg_cmake_install()
 
 vcpkg_copy_pdbs()
 
-vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-allegro5 CONFIG_PATH share/unofficial-allegro5)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/allegro)
 vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/external_imported/vcpkg/ports/allegro5/vcpkg.json b/external_imported/vcpkg/ports/allegro5/vcpkg.json
index 3c5f701c6..112e096f3 100644
--- a/external_imported/vcpkg/ports/allegro5/vcpkg.json
+++ b/external_imported/vcpkg/ports/allegro5/vcpkg.json
@@ -1,20 +1,30 @@
 {
   "name": "allegro5",
-  "version": "5.2.6.0",
-  "port-version": 3,
+  "version": "5.2.9.1",
   "description": "Allegro is a cross-platform library mainly aimed at video game and multimedia programming. It handles common, low-level tasks such as creating windows, accepting user input, loading data, drawing images, playing sounds, etc. and generally abstracting away the underlying platform. However, Allegro is not a game engine: you are free to design and structure your program as you like.",
-  "homepage": "https://github.com/liballeg/allegro5",
+  "homepage": "https://liballeg.org/",
   "license": "BSD-3-Clause AND Zlib",
   "dependencies": [
+    {
+      "name": "alsa",
+      "platform": "linux"
+    },
     "bzip2",
-    "freetype",
+    {
+      "name": "freetype",
+      "default-features": false
+    },
     "libflac",
+    "libjpeg-turbo",
     "libogg",
     "libpng",
     "libtheora",
     "libvorbis",
+    {
+      "name": "libwebp",
+      "default-features": false
+    },
     "openal-soft",
-    "opengl",
     "opus",
     "opusfile",
     "physfs",
@@ -27,5 +37,28 @@
       "host": true
     },
     "zlib"
-  ]
+  ],
+  "default-features": [
+    {
+      "name": "direct3d",
+      "platform": "windows"
+    },
+    {
+      "name": "opengl",
+      "platform": "!(arm & windows) & !uwp & !xbox"
+    }
+  ],
+  "features": {
+    "direct3d": {
+      "description": "Direct3D support",
+      "supports": "windows"
+    },
+    "opengl": {
+      "description": "OpenGL support",
+      "supports": "!(arm & windows) & !uwp & !xbox",
+      "dependencies": [
+        "opengl"
+      ]
+    }
+  }
 }
diff --git a/external_imported/vcpkg/ports/alpaca/portfile.cmake b/external_imported/vcpkg/ports/alpaca/portfile.cmake
index 78643e9bb..139d7d001 100644
--- a/external_imported/vcpkg/ports/alpaca/portfile.cmake
+++ b/external_imported/vcpkg/ports/alpaca/portfile.cmake
@@ -2,8 +2,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO p-ranav/alpaca
-    REF v0.2.0
-    SHA512 0ac2c1c4f8e0534319bf852bac3852ee3674db7b1a9eda30462821ec4c9ddeeb6ceff09ef5f16eed9131af6c357a09f2cb909a12ea2f135ca7d496d90ff1865d
+    REF v${VERSION}
+    SHA512 3c61bd177f4118d8e270df24285d59e294d9eeb25daddac2d39d867188699955422fee92c875961c0fd1a77b46fe8d866310e578fd201e566e57c00539f85cfd
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/alpaca/vcpkg.json b/external_imported/vcpkg/ports/alpaca/vcpkg.json
index 9cfb77d80..9dcb72b8d 100644
--- a/external_imported/vcpkg/ports/alpaca/vcpkg.json
+++ b/external_imported/vcpkg/ports/alpaca/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "alpaca",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Alpaca is a serialization library written in C++17 - Pack C++ structs into a compact byte-array without any macros or boilerplate code",
   "homepage": "https://github.com/p-ranav/alpaca",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/alpaka/portfile.cmake b/external_imported/vcpkg/ports/alpaka/portfile.cmake
index e513ba484..bdb1fe7b6 100644
--- a/external_imported/vcpkg/ports/alpaka/portfile.cmake
+++ b/external_imported/vcpkg/ports/alpaka/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO alpaka-group/alpaka
-    REF 0.9.0
-    SHA512 c079c0101a1e1c0d244c074e19fcefa6c15751fbb6be072c6f245e515dece8700a40fd101b2b0ba5f9760f4545bf23e1917ea9804accbe16a45039f8b0ed8a01
+    REF ${VERSION}
+    SHA512 ee5354c498c9be12f4885d08c1ab9c11e67e3c305ea90c82605e061bd1a3b4efcc1ae17fb92d0cc9c2b402e8ba44431149409d4df903a2c355c382ae07ec9bcd
     HEAD_REF develop
 )
 set(VCPKG_BUILD_TYPE release)
diff --git a/external_imported/vcpkg/ports/alpaka/vcpkg.json b/external_imported/vcpkg/ports/alpaka/vcpkg.json
index 0f6de580f..87b0b09f3 100644
--- a/external_imported/vcpkg/ports/alpaka/vcpkg.json
+++ b/external_imported/vcpkg/ports/alpaka/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "alpaka",
-  "version": "0.9.0",
-  "port-version": 1,
+  "version": "1.1.0",
   "description": "The alpaka library is a header-only abstraction library for accelerator development",
   "homepage": "https://github.com/alpaka-group/alpaka",
   "license": "MPL-2.0",
diff --git a/external_imported/vcpkg/ports/alsa/portfile.cmake b/external_imported/vcpkg/ports/alsa/portfile.cmake
index e8e2c7bba..1dfcaab8c 100644
--- a/external_imported/vcpkg/ports/alsa/portfile.cmake
+++ b/external_imported/vcpkg/ports/alsa/portfile.cmake
@@ -1,18 +1,21 @@
-if(NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    message(FATAL_ERROR "Package only supports Linux platform.")
-endif()
-
 message(
-"alsa currently requires the following libraries from the system package manager:
-    autoconf libtool
-These can be installed on Ubuntu systems via sudo apt install autoconf libtool"
+"alsa currently requires the following programs from the system package manager:
+    autoconf autoheader aclocal automake libtoolize
+On Debian and Ubuntu derivatives:
+    sudo apt install autoconf libtool
+On recent Red Hat and Fedora derivatives:
+    sudo dnf install autoconf libtool
+On Arch Linux and derivatives:
+    sudo pacman -S autoconf automake libtool
+On Alpine:
+    apk add autoconf automake libtool"
 )
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO alsa-project/alsa-lib
-    REF v1.2.6.1
-    SHA512 d1de9112ec0d600db6e5a20b558811a7a9f34d00a9b1dfb5332669b73732c1c1b8ddda57368edc199e255eba8bcb8a6767b4d9325c9860ade02d84dcaac6eb47
+    REF "v${VERSION}"
+    SHA512 da9277007dd3b197fcafb748ced4ace89fdb1ab5eafae7596e91935ee9fb410be54fa76aabe86cdd83227e48cd073a7df319e90bdf06fa2da7c97470c085645d
     HEAD_REF master
     PATCHES
         "fix-plugin-dir.patch"
@@ -54,10 +57,14 @@ vcpkg_configure_make(
 vcpkg_install_make()
 vcpkg_fixup_pkgconfig()
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools/alsa/debug")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+
+file(REMOVE_RECURSE 
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/debug/share"
+    "${CURRENT_PACKAGES_DIR}/debug/tools/alsa/debug"
+)
 
-configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
 
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/alsa/vcpkg-cmake-wrapper.cmake b/external_imported/vcpkg/ports/alsa/vcpkg-cmake-wrapper.cmake
new file mode 100644
index 000000000..ae3b078ab
--- /dev/null
+++ b/external_imported/vcpkg/ports/alsa/vcpkg-cmake-wrapper.cmake
@@ -0,0 +1,96 @@
+find_path(
+  ALSA_INCLUDE_DIR
+  NAMES alsa/asoundlib.h
+  PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include"
+  NO_DEFAULT_PATH
+)
+
+find_library(
+  ALSA_LIBRARY_DEBUG
+  NAMES asound
+  PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib"
+  NO_DEFAULT_PATH
+)
+
+find_library(
+  ALSA_LIBRARY_RELEASE
+  NAMES asound
+  PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib"
+  NO_DEFAULT_PATH
+)
+
+include(SelectLibraryConfigurations)
+select_library_configurations(ALSA)
+unset(ALSA_FOUND)
+
+if(NOT ALSA_INCLUDE_DIR OR NOT ALSA_LIBRARY)
+  message(FATAL_ERROR "Broken installation of the alsa vcpkg port")
+endif()
+
+_find_package(${ARGS})
+
+if(TARGET ALSA::ALSA)
+  if(ALSA_LIBRARY_DEBUG)
+    set_property(
+      TARGET ALSA::ALSA
+      APPEND
+      PROPERTY IMPORTED_CONFIGURATIONS DEBUG
+    )
+    set_target_properties(
+      ALSA::ALSA
+      PROPERTIES
+        IMPORTED_LOCATION_DEBUG "${ALSA_LIBRARY_DEBUG}"
+    )
+  endif()
+  if(ALSA_LIBRARY_RELEASE)
+    set_property(
+      TARGET ALSA::ALSA
+      APPEND
+      PROPERTY IMPORTED_CONFIGURATIONS RELEASE
+    )
+    set_target_properties(
+      ALSA::ALSA
+      PROPERTIES
+        IMPORTED_LOCATION_RELEASE "${ALSA_LIBRARY_RELEASE}"
+    )
+  endif()
+
+  find_library(Z_VCPKG_HAS_LIBM NAMES m)
+  if(Z_VCPKG_HAS_LIBM)
+    list(APPEND ALSA_LIBRARIES m)
+    set_property(
+      TARGET ALSA::ALSA
+      APPEND
+      PROPERTY INTERFACE_LINK_LIBRARIES m
+    )
+  endif()
+
+  if(CMAKE_DL_LIBS)
+    list(APPEND ALSA_LIBRARIES ${CMAKE_DL_LIBS})
+    set_property(
+      TARGET ALSA::ALSA
+      APPEND
+      PROPERTY INTERFACE_LINK_LIBRARIES ${CMAKE_DL_LIBS}
+    )
+  endif()
+
+  find_package(Threads)
+  if(TARGET Threads::Threads)
+    list(APPEND ALSA_LIBRARIES Threads::Threads)
+    set_property(
+      TARGET ALSA::ALSA
+      APPEND
+      PROPERTY INTERFACE_LINK_LIBRARIES Threads::Threads
+    )
+  endif()
+
+  find_library(Z_VCPKG_HAS_LIBRT NAMES rt)
+  if(Z_VCPKG_HAS_LIBRT)
+    list(APPEND ALSA_LIBRARIES rt)
+    set_property(
+      TARGET ALSA::ALSA
+      APPEND
+      PROPERTY INTERFACE_LINK_LIBRARIES rt
+    )
+  endif()
+endif()
diff --git a/external_imported/vcpkg/ports/alsa/vcpkg.json b/external_imported/vcpkg/ports/alsa/vcpkg.json
index 57db52c12..031df979f 100644
--- a/external_imported/vcpkg/ports/alsa/vcpkg.json
+++ b/external_imported/vcpkg/ports/alsa/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "alsa",
-  "version": "1.2.6.1",
-  "port-version": 2,
+  "version": "1.2.11",
   "description": "The Advanced Linux Sound Architecture (ALSA) - library",
   "homepage": "https://www.alsa-project.org/",
   "license": "LGPL-2.1-or-later",
diff --git a/external_imported/vcpkg/ports/amd-adl-sdk/portfile.cmake b/external_imported/vcpkg/ports/amd-adl-sdk/portfile.cmake
new file mode 100644
index 000000000..655cbfa25
--- /dev/null
+++ b/external_imported/vcpkg/ports/amd-adl-sdk/portfile.cmake
@@ -0,0 +1,16 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO GPUOpen-LibrariesAndSDKs/display-library
+    REF "${VERSION}"
+    SHA512 805bc1a7f221b33955d79943833d04838b459f316c2a9ad5fa1831588b07c0bbe5975aca07c90117c10c6ff22ee12a69d5a26a75e7191eb6c40c1dccccd192af
+    HEAD_REF master
+)
+
+# Install the ADL headers to the default vcpkg location
+file(INSTALL "${SOURCE_PATH}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" [[As of 2023-07-25, according to
+https://github.com/GPUOpen-LibrariesAndSDKs/display-library/blob/master/Public-Documents/README.md#end-user-license-agreement
+this software is bound by the "SOFTWARE DEVELOPMENT KIT LICENSE AGREEMENT" PDF located at
+https://github.com/GPUOpen-LibrariesAndSDKs/display-library/blob/master/Public-Documents/ADL%20SDK%20EULA.pdf
+]])
diff --git a/external_imported/vcpkg/ports/amd-adl-sdk/vcpkg.json b/external_imported/vcpkg/ports/amd-adl-sdk/vcpkg.json
new file mode 100644
index 000000000..a0e1666f3
--- /dev/null
+++ b/external_imported/vcpkg/ports/amd-adl-sdk/vcpkg.json
@@ -0,0 +1,8 @@
+{
+  "name": "amd-adl-sdk",
+  "version": "17.1",
+  "description": "AMD Display Library (ADL) SDK",
+  "homepage": "https://gpuopen.com/adl/",
+  "license": null,
+  "supports": "!osx"
+}
diff --git a/external_imported/vcpkg/ports/amd-amf/portfile.cmake b/external_imported/vcpkg/ports/amd-amf/portfile.cmake
index 2a7860df2..cb0238d73 100644
--- a/external_imported/vcpkg/ports/amd-amf/portfile.cmake
+++ b/external_imported/vcpkg/ports/amd-amf/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO GPUOpen-LibrariesAndSDKs/AMF
-        REF v1.4.26
-        SHA512 2c931ef7d38ade88a96041e0012605a5d25ec484bb2134f58310cf1a2c7212a869797cef99e2e751c8a6b3c473ba1f8762d4a5d41466d38cb5e31bf664a25f55
+        REF "v${VERSION}"
+        SHA512 43d7d3c05cb385cc5b0b76562dae3f8d5fb0123300291019ddce1032eec55a664290bd9b0552073d3a5cc7036886a015d9edb1f17e2f0f8ffd07acf57360ec18
         HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/amd-amf/vcpkg.json b/external_imported/vcpkg/ports/amd-amf/vcpkg.json
index 3cbb77e8a..9e6673a50 100644
--- a/external_imported/vcpkg/ports/amd-amf/vcpkg.json
+++ b/external_imported/vcpkg/ports/amd-amf/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "amd-amf",
-  "version": "1.4.26",
+  "version": "1.4.29",
   "description": "AMD Advanced Media Framework headers",
   "homepage": "https://github.com/GPUOpen-LibrariesAndSDKs/AMF",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/amqpcpp/fix-max_min_macros.patch b/external_imported/vcpkg/ports/amqpcpp/fix-max_min_macros.patch
new file mode 100644
index 000000000..4d1e2ae20
--- /dev/null
+++ b/external_imported/vcpkg/ports/amqpcpp/fix-max_min_macros.patch
@@ -0,0 +1,31 @@
+diff --git a/include/amqpcpp/message.h b/include/amqpcpp/message.h
+index 0a35838..96b43e1 100644
+--- a/include/amqpcpp/message.h
++++ b/include/amqpcpp/message.h
+@@ -80,7 +80,7 @@ protected:
+         // safety-check: on 32-bit platforms size_t is obviously also a 32-bit dword
+         // in which case casting the uint64_t to a size_t could result in truncation
+         // here we check whether the given size fits inside a size_t
+-        if (std::numeric_limits<size_t>::max() < size) throw std::runtime_error("message is too big for this system");
++        if ((std::numeric_limits<size_t>::max)() < size) throw std::runtime_error("message is too big for this system");
+ 
+         // store the new size
+         _bodySize = size;
+@@ -98,7 +98,7 @@ protected:
+         if (_mutableBody)
+         {
+             // prevent overflow
+-            size = std::min(size, _bodySize - _filled);
++            size = (std::min)(size, _bodySize - _filled);
+             
+             // append more data
+             memcpy(_mutableBody + _filled, buffer, (size_t)size);
+@@ -121,7 +121,7 @@ protected:
+             _body = _mutableBody;
+             
+             // store the initial data
+-            _filled = std::min((size_t)size, (size_t)_bodySize);
++            _filled = (std::min)((size_t)size, (size_t)_bodySize);
+             memcpy(_mutableBody, buffer, _filled);
+         }
+             
diff --git a/external_imported/vcpkg/ports/amqpcpp/portfile.cmake b/external_imported/vcpkg/ports/amqpcpp/portfile.cmake
index 4e01b1141..c02df71d3 100644
--- a/external_imported/vcpkg/ports/amqpcpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/amqpcpp/portfile.cmake
@@ -4,10 +4,11 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO CopernicaMarketingSoftware/AMQP-CPP
     REF "v${VERSION}"
-    SHA512 6220d6cdd3114cf02f08f1d8599d1f6de94df204384f9da7db1c18f74732a5c23063cd50066b7d32906af0a968d600daf0d59f1649d9674fa67446197c6e4988
+    SHA512 3af0c0a9aeb98e349cedc7144bfc4ef1b63270d3b20d240b98b990c048402d5d4ea3a2ba28a468aab24ad45544b111809a0692716dc33af493ea5160f132834b
     HEAD_REF master
     PATCHES
         find-openssl.patch
+        fix-max_min_macros.patch
 )
 
 if(VCPKG_TARGET_IS_LINUX)
diff --git a/external_imported/vcpkg/ports/amqpcpp/vcpkg.json b/external_imported/vcpkg/ports/amqpcpp/vcpkg.json
index ff7ce61a5..2a6c97a38 100644
--- a/external_imported/vcpkg/ports/amqpcpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/amqpcpp/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "amqpcpp",
-  "version": "4.3.19",
+  "version": "4.3.23",
   "description": "AMQP-CPP is a C++ library for communicating with a RabbitMQ message broker",
   "homepage": "https://github.com/CopernicaMarketingSoftware/AMQP-CPP",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/anari/portfile.cmake b/external_imported/vcpkg/ports/anari/portfile.cmake
new file mode 100644
index 000000000..334e64649
--- /dev/null
+++ b/external_imported/vcpkg/ports/anari/portfile.cmake
@@ -0,0 +1,44 @@
+vcpkg_from_github(
+  OUT_SOURCE_PATH SOURCE_PATH
+  REPO KhronosGroup/ANARI-SDK
+  REF "v${VERSION}"
+  SHA512 51937d160a9508c56cf123eda13002c705acff501366710f83da1c62d875f8427cec27f10ea2d05f4637be141fb9a87935f4b0b9f0fabb6bd6a7cca6a4f48ee1
+  HEAD_REF main
+)
+
+vcpkg_find_acquire_program(PYTHON3)
+get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
+vcpkg_add_to_path("${PYTHON3_DIR}")
+
+vcpkg_cmake_configure(
+  SOURCE_PATH "${SOURCE_PATH}"
+  OPTIONS
+    -DBUILD_CTS=OFF
+    -DBUILD_EXAMPLES=OFF
+    -DBUILD_HELIDE_DEVICE=OFF
+    -DBUILD_TESTING=OFF
+    -DBUILD_VIEWER=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(
+  CONFIG_PATH "lib/cmake/${PORT}-${VERSION}"
+)
+vcpkg_fixup_pkgconfig()
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE 
+  "${CURRENT_PACKAGES_DIR}/debug/include" 
+  "${CURRENT_PACKAGES_DIR}/debug/share"
+)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+  file(REMOVE_RECURSE 
+    "${CURRENT_PACKAGES_DIR}/bin" 
+    "${CURRENT_PACKAGES_DIR}/debug/bin"
+  )
+endif()
+
+vcpkg_install_copyright(
+  FILE_LIST "${SOURCE_PATH}/LICENSE"
+)
diff --git a/external_imported/vcpkg/ports/anari/vcpkg.json b/external_imported/vcpkg/ports/anari/vcpkg.json
new file mode 100644
index 000000000..86143ae9c
--- /dev/null
+++ b/external_imported/vcpkg/ports/anari/vcpkg.json
@@ -0,0 +1,20 @@
+{
+  "name": "anari",
+  "version": "0.7.0",
+  "port-version": 1,
+  "description": "Cross-Platform 3D Rendering Engine API.",
+  "homepage": "https://www.khronos.org/anari",
+  "license": "Apache-2.0",
+  "dependencies": [
+    "glm",
+    "python3",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/angelscript/fix-dependency.patch b/external_imported/vcpkg/ports/angelscript/fix-dependency.patch
new file mode 100644
index 000000000..be5213f84
--- /dev/null
+++ b/external_imported/vcpkg/ports/angelscript/fix-dependency.patch
@@ -0,0 +1,9 @@
+diff --git a/angelscript/projects/cmake/cmake/AngelscriptConfig.cmake b/angelscript/projects/cmake/cmake/AngelscriptConfig.cmake
+index 4d1ef0f..ec14fe9 100644
+--- a/angelscript/projects/cmake/cmake/AngelscriptConfig.cmake
++++ b/angelscript/projects/cmake/cmake/AngelscriptConfig.cmake
+@@ -1,2 +1,4 @@
+ include("${CMAKE_CURRENT_LIST_DIR}/AngelscriptTargets.cmake")
++include(CMakeFindDependencyMacro)
++find_dependency(Threads REQUIRED)
+ 
diff --git a/external_imported/vcpkg/ports/angelscript/portfile.cmake b/external_imported/vcpkg/ports/angelscript/portfile.cmake
index 3ac44aa0f..ac93fa2d0 100644
--- a/external_imported/vcpkg/ports/angelscript/portfile.cmake
+++ b/external_imported/vcpkg/ports/angelscript/portfile.cmake
@@ -1,14 +1,15 @@
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://angelcode.com/angelscript/sdk/files/angelscript_2.36.0.zip"
-    FILENAME "angelscript_2.36.0.zip"
-    SHA512 afd2b9096d0b62bc3d182d684fe34ddc8e9520af7734eea1f1a5c7d3439a28a1be7502faf692080cb0c4591799b7fea09fc8c4ccf25b8ec63a3d306e678682ff
+    URLS "https://angelcode.com/angelscript/sdk/files/angelscript_2.36.1.zip"
+    FILENAME "angelscript_2.36.1.zip"
+    SHA512 d6d213ce72135c89e47e67521f654611ff67673f3decd9db3da4b7bf317a04a3f91c5c6ae36658ec3f2b20498facd069af02a91255a24ec79c96d8c90d6b554e
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
     PATCHES
         mark-threads-private.patch
+        fix-dependency.patch
 )
 
 vcpkg_cmake_configure(
@@ -26,4 +27,4 @@ if("addons" IN_LIST FEATURES)
     file(INSTALL "${SOURCE_PATH}/add_on/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/angelscript" FILES_MATCHING PATTERN "*.h" PATTERN "*.cpp")
 endif()
 
-file(INSTALL "${SOURCE_PATH}/docs/manual/doc_license.html" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/docs/manual/doc_license.html")
diff --git a/external_imported/vcpkg/ports/angelscript/vcpkg.json b/external_imported/vcpkg/ports/angelscript/vcpkg.json
index 1f8a7aec9..472f7a811 100644
--- a/external_imported/vcpkg/ports/angelscript/vcpkg.json
+++ b/external_imported/vcpkg/ports/angelscript/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "angelscript",
-  "version": "2.36.0",
+  "version": "2.36.1",
+  "port-version": 1,
   "description": "The AngelCode Scripting Library, or AngelScript as it is also known, is an extremely flexible cross-platform scripting library designed to allow applications to extend their functionality through external scripts. It has been designed from the beginning to be an easy to use component, both for the application programmer and the script writer.",
   "homepage": "https://angelcode.com/angelscript",
   "license": "Zlib",
diff --git a/external_imported/vcpkg/ports/angle/002-fix-builder-error.patch b/external_imported/vcpkg/ports/angle/002-fix-builder-error.patch
index 8c632d1b0..a6d56ac62 100644
--- a/external_imported/vcpkg/ports/angle/002-fix-builder-error.patch
+++ b/external_imported/vcpkg/ports/angle/002-fix-builder-error.patch
@@ -26,3 +26,15 @@ index f4bb137f2..86495013b 100644
  namespace angle
  {
  
+diff --git a/include/GLSLANG/ShaderVars.h b/include/GLSLANG/ShaderVars.h
+index 94cb93e..5593f66 100644
+--- a/include/GLSLANG/ShaderVars.h
++++ b/include/GLSLANG/ShaderVars.h
+@@ -14,6 +14,7 @@
+ #include <array>
+ #include <string>
+ #include <vector>
++#include <stdint.h>
+ 
+ namespace sh
+ {
diff --git a/external_imported/vcpkg/ports/angle/cmake-buildsystem/CMakeLists.txt b/external_imported/vcpkg/ports/angle/cmake-buildsystem/CMakeLists.txt
index 79ed06b42..110c5a097 100644
--- a/external_imported/vcpkg/ports/angle/cmake-buildsystem/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/angle/cmake-buildsystem/CMakeLists.txt
@@ -58,6 +58,16 @@ if(ANGLE_USE_D3D11_COMPOSITOR_NATIVE_WINDOW)
     endif()
     set(angle_enable_d3d11_compositor_native_window TRUE)
 endif()
+if(NOT BUILD_SHARED_LIBS)
+    add_definitions(
+        -DANGLE_EXPORT=
+        -DANGLE_STATIC=1
+        -DANGLE_UTIL_EXPORT=
+        -DEGLAPI=
+        -DGL_APICALL=
+        -DGL_API=
+    )
+endif()
 
 find_package(ZLIB REQUIRED)
 
@@ -388,7 +398,7 @@ if (angle_use_x11)
     target_sources(ANGLE PRIVATE ${libangle_gpu_info_util_x11_sources})
     target_sources(ANGLE PRIVATE "src/gpu_info_util/SystemInfo_x11.cpp")
     target_compile_definitions(ANGLE PRIVATE ANGLE_USE_X11 GPU_INFO_USE_X11)
-    target_link_libraries(ANGLE PRIVATE $X11_LIBRARIES} X11::X11 X11::Xi X11::Xext)
+    target_link_libraries(ANGLE PRIVATE ${X11_LIBRARIES} X11::X11 X11::Xi X11::Xext)
 endif()
 
 # set export names of some targets to match prior vcpkg port buildsystem
@@ -416,20 +426,52 @@ install(TARGETS ${_installableTargets} EXPORT ANGLEExport
 install(EXPORT ANGLEExport FILE unofficial-angle-targets.cmake NAMESPACE unofficial::angle:: DESTINATION share/unofficial-angle)
 install(FILES unofficial-angle-config.cmake DESTINATION share/unofficial-angle)
 
-if(NOT DISABLE_INSTALL_HEADERS)
-    install(
-        DIRECTORY "${ANGLE_FRAMEWORK_HEADERS_DIR}"
-        DESTINATION include
-        FILES_MATCHING
-        PATTERN "*.h"
-        PATTERN "*.inc"
-        PATTERN "CL" EXCLUDE
-        PATTERN "GLSLANG" EXCLUDE
-        PATTERN "egl.h" EXCLUDE
-        PATTERN "eglext.h" EXCLUDE
-        PATTERN "eglplatform.h" EXCLUDE
-        PATTERN "KHR" EXCLUDE
-        PATTERN "WGL" EXCLUDE
-        PATTERN "export.h" EXCLUDE
-    )
+install(
+    DIRECTORY "${ANGLE_FRAMEWORK_HEADERS_DIR}/"
+    DESTINATION include
+    FILES_MATCHING
+    PATTERN "*.h"
+    PATTERN "*.inc"
+    PATTERN "CL" EXCLUDE
+    PATTERN "GLSLANG" EXCLUDE
+    PATTERN "EGL/egl.h" EXCLUDE
+    PATTERN "EGL/eglext.h" EXCLUDE
+    PATTERN "EGL/eglplatform.h" EXCLUDE
+    PATTERN "KHR" EXCLUDE
+    PATTERN "WGL" EXCLUDE
+    PATTERN "export.h" EXCLUDE
+    PATTERN "GLES/egl.h" EXCLUDE
+    PATTERN "GLES/gl.h" EXCLUDE
+    PATTERN "GLES/glext.h" EXCLUDE
+    PATTERN "GLES/glplatform.h" EXCLUDE
+    PATTERN "GLES2/gl2.h" EXCLUDE
+    PATTERN "GLES2/gl2ext.h" EXCLUDE
+    PATTERN "GLES2/gl2platform.h" EXCLUDE
+    PATTERN "GLES3/gl3.h" EXCLUDE
+    PATTERN "GLES3/gl31.h" EXCLUDE
+    PATTERN "GLES3/gl32.h" EXCLUDE
+    PATTERN "GLES3/gl3platform.h" EXCLUDE
+)
+install(
+    DIRECTORY "${ANGLE_FRAMEWORK_HEADERS_DIR}/"
+    DESTINATION include/angle
+    FILES_MATCHING
+    PATTERN "*.h"
+    PATTERN "*.inc"
+    PATTERN "CL" EXCLUDE
+    PATTERN "GLSLANG" EXCLUDE
+    PATTERN "EGL/egl.h" EXCLUDE
+    PATTERN "EGL/eglext.h" EXCLUDE
+    PATTERN "EGL/eglplatform.h" EXCLUDE
+    PATTERN "KHR" EXCLUDE
+    PATTERN "WGL" EXCLUDE
+    PATTERN "export.h" EXCLUDE
+)
+
+if(NOT BUILD_SHARED_LIBS)
+    foreach(angle_target EGL GLESv2 ANGLE)
+        if(TARGET ${angle_target})
+            target_compile_definitions(${angle_target} INTERFACE $<INSTALL_INTERFACE:KHRONOS_STATIC>)
+        endif()
+    endforeach()
 endif()
diff --git a/external_imported/vcpkg/ports/angle/cmake-buildsystem/PlatformMac.cmake b/external_imported/vcpkg/ports/angle/cmake-buildsystem/PlatformMac.cmake
index c9f0a2327..4fda2ba46 100644
--- a/external_imported/vcpkg/ports/angle/cmake-buildsystem/PlatformMac.cmake
+++ b/external_imported/vcpkg/ports/angle/cmake-buildsystem/PlatformMac.cmake
@@ -1,8 +1,3 @@
-find_library(COREGRAPHICS_LIBRARY CoreGraphics)
-find_library(FOUNDATION_LIBRARY Foundation)
-find_library(IOKIT_LIBRARY IOKit)
-find_library(IOSURFACE_LIBRARY IOSurface)
-find_library(QUARTZ_LIBRARY Quartz)
 find_package(ZLIB REQUIRED)
 
 list(APPEND ANGLE_SOURCES
@@ -12,16 +7,15 @@ list(APPEND ANGLE_SOURCES
 )
 
 list(APPEND ANGLEGLESv2_LIBRARIES
-    ${COREGRAPHICS_LIBRARY}
-    ${FOUNDATION_LIBRARY}
-    ${IOKIT_LIBRARY}
-    ${IOSURFACE_LIBRARY}
-    ${QUARTZ_LIBRARY}
+    "-framework CoreGraphics"
+    "-framework Foundation"
+    "-framework IOKit"
+    "-framework IOSurface"
+    "-framework Quartz"
 )
 
 # Metal backend
 if(USE_METAL)
-    find_library(METAL_LIBRARY Metal)
     list(APPEND ANGLE_SOURCES
         ${_metal_backend_sources}
 
@@ -35,14 +29,19 @@ if(USE_METAL)
     )
 
     list(APPEND ANGLEGLESv2_LIBRARIES
-        ${METAL_LIBRARY}
+        "-framework Metal"
     )
 endif()
 
 # OpenGL backend
 if(USE_OPENGL)
+    list(APPEND ANGLE_SOURCES
+        ${angle_translator_glsl_base_sources}
+        ${angle_translator_glsl_sources}
+        ${angle_translator_apple_sources}
+    )
     # Enable GLSL compiler output.
-    list(APPEND ANGLE_DEFINITIONS ANGLE_ENABLE_GLSL)
+    list(APPEND ANGLE_DEFINITIONS ANGLE_ENABLE_GLSL ANGLE_ENABLE_GL_DESKTOP_BACKEND ANGLE_ENABLE_APPLE_WORKAROUNDS)
 endif()
 
 if(USE_ANGLE_EGL OR ENABLE_WEBGL)
diff --git a/external_imported/vcpkg/ports/angle/cmake-buildsystem/PlatformWin.cmake b/external_imported/vcpkg/ports/angle/cmake-buildsystem/PlatformWin.cmake
index 7f318056a..97ac61915 100644
--- a/external_imported/vcpkg/ports/angle/cmake-buildsystem/PlatformWin.cmake
+++ b/external_imported/vcpkg/ports/angle/cmake-buildsystem/PlatformWin.cmake
@@ -61,6 +61,7 @@ if(USE_OPENGL)
 
         list(APPEND ANGLE_DEFINITIONS
             ANGLE_ENABLE_OPENGL
+            ANGLE_ENABLE_GL_DESKTOP_BACKEND
         )
     endif()
 endif()
diff --git a/external_imported/vcpkg/ports/angle/portfile.cmake b/external_imported/vcpkg/ports/angle/portfile.cmake
index 7abb4941e..fa767c2be 100644
--- a/external_imported/vcpkg/ports/angle/portfile.cmake
+++ b/external_imported/vcpkg/ports/angle/portfile.cmake
@@ -168,31 +168,19 @@ vcpkg_copy_pdbs()
 
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 
-# File conflict with opengl-registry! Make sure headers are similar on Update!
-# angle defines some additional entrypoints.
-# opengl-registry probably needs an upstream update to account for those
-# Due to that all angle headers get moved to include/angle.
-# If you want to use those instead of the onces provided by opengl-registry make sure
-# VCPKG_INSTALLED_DIR/include/angle is before VCPKG_INSTALLED_DIR/include
-file(GLOB_RECURSE angle_includes "${CURRENT_PACKAGES_DIR}/include")
-file(COPY ${angle_includes} DESTINATION "${CURRENT_PACKAGES_DIR}/include/angle")
-
-set(_double_files
-    "include/GLES/egl.h"
-    "include/GLES/gl.h"
-    "include/GLES/glext.h"
-    "include/GLES/glplatform.h"
-    "include/GLES2/gl2.h"
-    "include/GLES2/gl2ext.h"
-    "include/GLES2/gl2platform.h"
-    "include/GLES3/gl3.h"
-    "include/GLES3/gl31.h"
-    "include/GLES3/gl32.h"
-    "include/GLES3/gl3platform.h")
-foreach(_file ${_double_files})
-    if(EXISTS "${CURRENT_PACKAGES_DIR}/${_file}")
-        file(REMOVE "${CURRENT_PACKAGES_DIR}/${_file}")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+# Remove empty directories inside include directory
+file(GLOB directory_children RELATIVE "${CURRENT_PACKAGES_DIR}/include" "${CURRENT_PACKAGES_DIR}/include/*")
+foreach(directory_child ${directory_children})
+    if(IS_DIRECTORY "${CURRENT_PACKAGES_DIR}/include/${directory_child}")
+        file(GLOB_RECURSE subdirectory_children "${CURRENT_PACKAGES_DIR}/include/${directory_child}/*")
+        if("${subdirectory_children}" STREQUAL "")
+            file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/${directory_child}")
+        endif()
     endif()
 endforeach()
+unset(subdirectory_children)
+unset(directory_child)
+unset(directory_children)
 
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/angle/vcpkg.json b/external_imported/vcpkg/ports/angle/vcpkg.json
index 1058ec604..1f9cdf9a0 100644
--- a/external_imported/vcpkg/ports/angle/vcpkg.json
+++ b/external_imported/vcpkg/ports/angle/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "angle",
   "version-string": "chromium_5414",
-  "port-version": 1,
+  "port-version": 7,
   "description": [
     "A conformant OpenGL ES implementation for Windows, Mac and Linux.",
     "The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support."
diff --git a/external_imported/vcpkg/ports/ankurvdev-embedresource/portfile.cmake b/external_imported/vcpkg/ports/ankurvdev-embedresource/portfile.cmake
new file mode 100644
index 000000000..bbc240b32
--- /dev/null
+++ b/external_imported/vcpkg/ports/ankurvdev-embedresource/portfile.cmake
@@ -0,0 +1,29 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO ankurvdev/embedresource
+    REF "v${VERSION}"
+    SHA512 96d2208fd5d654dad5662968296fa363cea0a935fec8474b780717c9303d2dd763833370bcdf02d6d63e264368b0955fa1f13c6e55685280df5fdaf9e72b8c9f
+    HEAD_REF main)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH ${SOURCE_PATH}
+)
+
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+
+# Handle copyright
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+vcpkg_copy_tools(TOOL_NAMES embedresource AUTO_CLEAN)
+
+file(READ "${CURRENT_PACKAGES_DIR}/share/embedresource/EmbedResourceConfig.cmake" config_contents)
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/embedresource/EmbedResourceConfig.cmake"
+"find_program(
+    EMBEDRESOURCE_EXECUTABLE embedresource
+    PATHS
+        \"\${CMAKE_CURRENT_LIST_DIR}/../../../${HOST_TRIPLET}/tools/${PORT}\"
+    NO_DEFAULT_PATH
+    REQUIRED)
+${config_contents}"
+)
diff --git a/external_imported/vcpkg/ports/ankurvdev-embedresource/vcpkg.json b/external_imported/vcpkg/ports/ankurvdev-embedresource/vcpkg.json
new file mode 100644
index 000000000..46ee2fa03
--- /dev/null
+++ b/external_imported/vcpkg/ports/ankurvdev-embedresource/vcpkg.json
@@ -0,0 +1,17 @@
+{
+  "name": "ankurvdev-embedresource",
+  "version": "0.0.10",
+  "description": "Cross Platform Resource Embedding",
+  "homepage": "https://github.com/ankurvdev/embedresource",
+  "license": "BSD-3-Clause",
+  "dependencies": [
+    {
+      "name": "ankurvdev-embedresource",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/annoy/portfile.cmake b/external_imported/vcpkg/ports/annoy/portfile.cmake
index c33cb628f..c0e1af938 100644
--- a/external_imported/vcpkg/ports/annoy/portfile.cmake
+++ b/external_imported/vcpkg/ports/annoy/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO spotify/annoy
-    REF 0457742d12cf7a263f7c709ef1d470e5f08f791d # master on 2023-02-25
-    SHA512 df26b18a5a165081a9373076f974ee977b0b4b54e7a58da3723f608e4cc46aab1d0978f2663965c8bbb81d123c8efff1a77040ef2bfdc0287b08214514b40ecc
+    REF "v${VERSION}"
+    SHA512 bf6e3095871cef2da20310f0a6260d65079cd2116b00ee39c82a6cb96d6cc80780b4f677c3746b85e7fe45672707a06c37bd8e8ecf793507584eca4760731018
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/annoy/vcpkg.json b/external_imported/vcpkg/ports/annoy/vcpkg.json
index c594444b8..e44d3d112 100644
--- a/external_imported/vcpkg/ports/annoy/vcpkg.json
+++ b/external_imported/vcpkg/ports/annoy/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "annoy",
-  "version-date": "2023-02-25",
+  "version": "1.17.2",
   "description": "Approximate Nearest Neighbors optimized for memory usage and loading/saving to disk",
   "homepage": "https://github.com/spotify/annoy",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/antlr4/export_guid.patch b/external_imported/vcpkg/ports/antlr4/export_guid.patch
deleted file mode 100644
index 053a6e236..000000000
--- a/external_imported/vcpkg/ports/antlr4/export_guid.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -urN a/runtime/src/support/Guid.h b/runtime/src/support/Guid.h
---- a/runtime/src/support/Guid.h
-+++ b/runtime/src/support/Guid.h
-@@ -42,7 +42,7 @@ namespace antlrcpp {
- // 16 byte value that can be passed around by value. It also supports
- // conversion to string (via the stream operator <<) and conversion from a
- // string via constructor.
--class Guid final {
-+class ANTLR4CPP_PUBLIC Guid final {
- public:
-   using size_type = typename std::array<uint8_t, 16>::size_type;
-   using pointer = typename std::array<uint8_t, 16>::pointer;
-@@ -131,7 +131,7 @@ private:
- // function would no longer be cross-platform if we parameterized the android
- // version. Instead, construction of the GuidGenerator may be different on
- // each platform, but the use of newGuid is uniform.
--class GuidGenerator final {
-+class ANTLR4CPP_PUBLIC GuidGenerator final {
- public:
- #ifdef GUID_ANDROID
-   GuidGenerator(JNIEnv *env);
-
diff --git a/external_imported/vcpkg/ports/antlr4/fix_build_4.11.1.patch b/external_imported/vcpkg/ports/antlr4/fix_build_4.11.1.patch
deleted file mode 100644
index d3f4b352b..000000000
--- a/external_imported/vcpkg/ports/antlr4/fix_build_4.11.1.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff --git a/runtime/Cpp/runtime/CMakeLists.txt b/runtime/Cpp/runtime/CMakeLists.txt
-index a4e4d1c..19cc21c 100644
---- a/runtime/Cpp/runtime/CMakeLists.txt
-+++ b/runtime/Cpp/runtime/CMakeLists.txt
-@@ -25,15 +25,21 @@ file(GLOB libantlrcpp_SRC
-   "${PROJECT_SOURCE_DIR}/runtime/src/tree/xpath/*.cpp"
- )
- 
-+if(BUILD_SHARED_LIBS)
- add_library(antlr4_shared SHARED ${libantlrcpp_SRC})
-+else()
- add_library(antlr4_static STATIC ${libantlrcpp_SRC})
-+endif()
- 
- # Make sure to link against threads (pthreads) library in order to be able to
- # make use of std::call_once in the code without producing runtime errors
- # (see also https://github.com/antlr/antlr4/issues/3708 and/or https://stackoverflow.com/q/51584960).
- find_package(Threads REQUIRED)
-+if(BUILD_SHARED_LIBS)
- target_link_libraries(antlr4_shared Threads::Threads)
-+else()
- target_link_libraries(antlr4_static Threads::Threads)
-+endif()
- 
- if (ANTLR_BUILD_CPP_TESTS)
-   include(FetchContent)
-@@ -70,8 +76,11 @@ if (ANTLR_BUILD_CPP_TESTS)
- endif()
- 
- if(APPLE)
-+  if(BUILD_SHARED_LIBS)
-   target_link_libraries(antlr4_shared ${COREFOUNDATION_LIBRARY})
-+  else()
-   target_link_libraries(antlr4_static ${COREFOUNDATION_LIBRARY})
-+  endif()
- endif()
- 
- if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
-@@ -93,26 +102,32 @@ set(static_lib_suffix "")
- 
- if (WIN32)
-   set(static_lib_suffix "-static")
-+  if(BUILD_SHARED_LIBS)
-   target_compile_definitions(antlr4_shared PUBLIC ANTLR4CPP_EXPORTS)
-+  else()
-   target_compile_definitions(antlr4_static PUBLIC ANTLR4CPP_STATIC)
-+  endif()
-   if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
-     set(extra_share_compile_flags "-MP /wd4251")
-     set(extra_static_compile_flags "-MP")
-   endif()
- endif()
- 
-+if(BUILD_SHARED_LIBS)
- set_target_properties(antlr4_shared
-                       PROPERTIES VERSION   ${ANTLR_VERSION}
-                                  SOVERSION ${ANTLR_VERSION}
-                                  OUTPUT_NAME antlr4-runtime
-                                  COMPILE_FLAGS "${disabled_compile_warnings} ${extra_share_compile_flags}")
- 
-+else()
- set_target_properties(antlr4_static
-                       PROPERTIES VERSION   ${ANTLR_VERSION}
-                                  SOVERSION ${ANTLR_VERSION}
-                                  OUTPUT_NAME "antlr4-runtime${static_lib_suffix}"
-                                  COMPILE_PDB_NAME "antlr4-runtime${static_lib_suffix}"
-                                  COMPILE_FLAGS "${disabled_compile_warnings} ${extra_static_compile_flags}")
-+endif()
- 
- if (ANTLR_BUILD_CPP_TESTS)
-   # Copy the generated binaries to dist folder (required by test suite)
-@@ -130,18 +145,21 @@ if (ANTLR_BUILD_CPP_TESTS)
-     COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:antlr4_static> ${CMAKE_HOME_DIRECTORY}/dist)
- endif()
- 
-+if(BUILD_SHARED_LIBS)
- install(TARGETS antlr4_shared
-         EXPORT antlr4-targets
-         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
- 
-+else()
- install(TARGETS antlr4_static
-         EXPORT antlr4-targets
-         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
- 
-+endif()
- install(DIRECTORY "${PROJECT_SOURCE_DIR}/runtime/src/"
-         DESTINATION "include/antlr4-runtime"
-         COMPONENT dev
diff --git a/external_imported/vcpkg/ports/antlr4/portfile.cmake b/external_imported/vcpkg/ports/antlr4/portfile.cmake
index 81e416448..80d1e857b 100644
--- a/external_imported/vcpkg/ports/antlr4/portfile.cmake
+++ b/external_imported/vcpkg/ports/antlr4/portfile.cmake
@@ -1,13 +1,10 @@
-vcpkg_minimum_required(VERSION 2022-10-12)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO antlr/antlr4
-    HEAD_REF master
-    REF "v${VERSION}"
-    SHA512 a52356410c95ec6d7128b856dcf4c20a17cdd041270d2c4d700ef02ea715c87a00a87c2ad560277424b300435c6e9b196c8bc9c9f50ae5b6804d8214b4d397d0
+    HEAD_REF dev
+    REF "${VERSION}"
+    SHA512 79ac3cdfc8f2368c647d06aec85d87507629a75527205ff2cbf7d9802989b0c6e6a8fac76148ad101f539c9ef922e431e22ba489f899f847ccc3d3d889bb2b70
     PATCHES
-        fix_build_4.11.1.patch
         set-export-macro-define-as-private.patch
 )
 
@@ -15,15 +12,16 @@ set(RUNTIME_PATH "${SOURCE_PATH}/runtime/Cpp")
 
 message(INFO "Configure at '${RUNTIME_PATH}'")
 
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED)
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${RUNTIME_PATH}"
     OPTIONS
+        -DANTLR_BUILD_STATIC=${BUILD_STATIC}
+        -DANTLR_BUILD_SHARED=${BUILD_SHARED}
         -DANTLR4_INSTALL=ON
         -DANTLR_BUILD_CPP_TESTS=OFF
-    OPTIONS_DEBUG
-        "-DLIB_OUTPUT_DIR=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/dist"
-    OPTIONS_RELEASE
-        "-DLIB_OUTPUT_DIR=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/dist"
 )
 
 vcpkg_cmake_install()
@@ -34,4 +32,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_
 
 vcpkg_copy_pdbs()
 
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/external_imported/vcpkg/ports/antlr4/set-export-macro-define-as-private.patch b/external_imported/vcpkg/ports/antlr4/set-export-macro-define-as-private.patch
index 91102a35b..c8c774f51 100644
--- a/external_imported/vcpkg/ports/antlr4/set-export-macro-define-as-private.patch
+++ b/external_imported/vcpkg/ports/antlr4/set-export-macro-define-as-private.patch
@@ -1,13 +1,13 @@
-diff --git a/runtime/Cpp/runtime/CMakeLists.txt b/runtime/Cpp/runtime/CMakeLists.txt
-index 19cc21c..2a33fe9 100644
---- a/runtime/Cpp/runtime/CMakeLists.txt
-+++ b/runtime/Cpp/runtime/CMakeLists.txt
-@@ -103,7 +103,7 @@ set(static_lib_suffix "")
- if (WIN32)
-   set(static_lib_suffix "-static")
-   if(BUILD_SHARED_LIBS)
--  target_compile_definitions(antlr4_shared PUBLIC ANTLR4CPP_EXPORTS)
-+  target_compile_definitions(antlr4_shared PRIVATE ANTLR4CPP_EXPORTS)
-   else()
-   target_compile_definitions(antlr4_static PUBLIC ANTLR4CPP_STATIC)
-   endif()
+diff --git a/runtime/Cpp/runtime/CMakeLists.txt b/runtime/Cpp/runtime/CMakeLists.txt
+index 86fdab9..97486fb 100644
+--- a/runtime/Cpp/runtime/CMakeLists.txt
++++ b/runtime/Cpp/runtime/CMakeLists.txt
+@@ -120,7 +120,7 @@ set(static_lib_suffix "")
+ if (WIN32)
+   set(static_lib_suffix "-static")
+   if (TARGET antlr4_shared)
+-    target_compile_definitions(antlr4_shared PUBLIC ANTLR4CPP_EXPORTS)
++    target_compile_definitions(antlr4_shared PRIVATE ANTLR4CPP_EXPORTS)
+   endif()
+   if (TARGET antlr4_static)
+     target_compile_definitions(antlr4_static PUBLIC ANTLR4CPP_STATIC)
diff --git a/external_imported/vcpkg/ports/antlr4/vcpkg.json b/external_imported/vcpkg/ports/antlr4/vcpkg.json
index 185424b77..b41d99080 100644
--- a/external_imported/vcpkg/ports/antlr4/vcpkg.json
+++ b/external_imported/vcpkg/ports/antlr4/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "antlr4",
-  "version": "4.11.1",
-  "port-version": 1,
+  "version": "4.13.1",
   "description": "ANother Tool for Language Recognition",
   "homepage": "https://www.antlr.org",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/aom/aom-rename-static.diff b/external_imported/vcpkg/ports/aom/aom-rename-static.diff
index e38c73fb1..f53502e0b 100644
--- a/external_imported/vcpkg/ports/aom/aom-rename-static.diff
+++ b/external_imported/vcpkg/ports/aom/aom-rename-static.diff
@@ -1,12 +1,33 @@
-diff -pruN aom-3.0.0.o/CMakeLists.txt aom-3.0.0/CMakeLists.txt
---- aom-3.0.0.o/CMakeLists.txt	2021-04-15 20:05:52.695181200 +0300
-+++ aom-3.0.0/CMakeLists.txt	2021-04-15 22:34:16.147522600 +0300
-@@ -249,7 +249,7 @@ endif()
- add_library(aom ${AOM_SOURCES} $<TARGET_OBJECTS:aom_rtcd>)
- if(BUILD_SHARED_LIBS)
-   add_library(aom_static STATIC ${AOM_SOURCES} $<TARGET_OBJECTS:aom_rtcd>)
--  set_target_properties(aom_static PROPERTIES OUTPUT_NAME aom)
-+  set_target_properties(aom_static PROPERTIES OUTPUT_NAME aom_static)
- 
-   if(NOT MSVC)
-     # Extract version string and set VERSION/SOVERSION for the aom target.
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2e5b623..bed61da 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -314,6 +314,15 @@ if(BUILD_SHARED_LIBS)
+     set_target_properties(aom PROPERTIES SOVERSION ${SO_VERSION})
+     set_target_properties(aom PROPERTIES VERSION ${SO_FILE_VERSION})
+   endif()
++
++  # override conditional changes
++  set_target_properties(aom PROPERTIES
++      ARCHIVE_OUTPUT_NAME aom
++  )
++  set_target_properties(aom_static PROPERTIES
++      ARCHIVE_OUTPUT_NAME aom_static
++      EXCLUDE_FROM_ALL 1
++  )
+ endif()
+ 
+ if(NOT WIN32 AND NOT APPLE)
+diff --git a/build/cmake/aom_install.cmake b/build/cmake/aom_install.cmake
+index b02c7b9..c219841 100644
+--- a/build/cmake/aom_install.cmake
++++ b/build/cmake/aom_install.cmake
+@@ -79,7 +79,7 @@ macro(setup_aom_install_targets)
+     endif()
+ 
+     if(BUILD_SHARED_LIBS)
+-      set(AOM_INSTALL_LIBS aom aom_static)
++      set(AOM_INSTALL_LIBS aom)
+     else()
+       set(AOM_INSTALL_LIBS aom)
+     endif()
diff --git a/external_imported/vcpkg/ports/aom/aom-uninitialized-pointer.diff b/external_imported/vcpkg/ports/aom/aom-uninitialized-pointer.diff
index b80f2e08f..37a7166cc 100644
--- a/external_imported/vcpkg/ports/aom/aom-uninitialized-pointer.diff
+++ b/external_imported/vcpkg/ports/aom/aom-uninitialized-pointer.diff
@@ -1,13 +1,13 @@
-diff --git a/build/cmake/aom_configure.cmake b/build/cmake/aom_configure.cmake
-index 43d60ae..35c510b 100644
---- a/build/cmake/aom_configure.cmake
-+++ b/build/cmake/aom_configure.cmake
-@@ -265,6 +265,8 @@ if(MSVC)
- 
-   # Disable MSVC warnings that suggest making code non-portable.
-   add_compiler_flag_if_supported("/wd4996")
-+  # Disable MSVC warnings for potentially uninitialized local pointer variable.
-+  add_compiler_flag_if_supported("/wd4703")
-   if(ENABLE_WERROR)
-     add_compiler_flag_if_supported("/WX")
-   endif()
+diff --git a/build/cmake/aom_configure.cmake b/build/cmake/aom_configure.cmake
+index aaef2c310..5500ad4a3 100644
+--- a/build/cmake/aom_configure.cmake
++++ b/build/cmake/aom_configure.cmake
+@@ -309,6 +309,8 @@ if(MSVC)
+ 
+   # Disable MSVC warnings that suggest making code non-portable.
+   add_compiler_flag_if_supported("/wd4996")
++  # Disable MSVC warnings for potentially uninitialized local pointer variable.
++  add_compiler_flag_if_supported("/wd4703")
+   if(ENABLE_WERROR)
+     add_compiler_flag_if_supported("/WX")
+   endif()
diff --git a/external_imported/vcpkg/ports/aom/portfile.cmake b/external_imported/vcpkg/ports/aom/portfile.cmake
index 6c3c91f41..8936fbd4e 100644
--- a/external_imported/vcpkg/ports/aom/portfile.cmake
+++ b/external_imported/vcpkg/ports/aom/portfile.cmake
@@ -11,7 +11,7 @@ vcpkg_add_to_path(${PERL_PATH})
 vcpkg_from_git(
     OUT_SOURCE_PATH SOURCE_PATH
     URL "https://aomedia.googlesource.com/aom"
-    REF 9a83c6a5a55c176adbce740e47d3512edfc9ae71 # v3.5.0
+    REF bb6430482199eaefbeaaa396600935082bc43f66
     PATCHES
         aom-rename-static.diff
         aom-uninitialized-pointer.diff
@@ -26,6 +26,10 @@ if(VCPKG_TARGET_IS_UWP OR (VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE
     set(aom_target_cpu "-DAOM_TARGET_CPU=generic")
 endif()
 
+if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" AND VCPKG_TARGET_IS_LINUX)
+  set(aom_target_cpu "-DENABLE_NEON=OFF")
+endif()
+
 vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS
diff --git a/external_imported/vcpkg/ports/aom/vcpkg.json b/external_imported/vcpkg/ports/aom/vcpkg.json
index 539890306..26e62e34c 100644
--- a/external_imported/vcpkg/ports/aom/vcpkg.json
+++ b/external_imported/vcpkg/ports/aom/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "aom",
-  "version-semver": "3.5.0",
-  "port-version": 1,
+  "version-semver": "3.8.1",
   "description": "AV1 codec library",
   "homepage": "https://aomedia.googlesource.com/aom",
   "license": "BSD-2-Clause",
diff --git a/external_imported/vcpkg/ports/apache-datasketches/portfile.cmake b/external_imported/vcpkg/ports/apache-datasketches/portfile.cmake
new file mode 100644
index 000000000..7f00c38b6
--- /dev/null
+++ b/external_imported/vcpkg/ports/apache-datasketches/portfile.cmake
@@ -0,0 +1,23 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO apache/datasketches-cpp
+    REF "${VERSION}"
+    SHA512 81047ec2ac4559afc46d68b2332256b3950fc7092404606a872d9204c7e0ac13b7b0e0d6a34de01483bcb03c813ab75ce4866cc0c6783ebf4adddaa6535d322a
+    HEAD_REF master
+)
+
+set(VCPKG_BUILD_TYPE release) # header-only port
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_TESTS=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME DataSketches CONFIG_PATH lib/DataSketches/cmake)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/apache-datasketches/usage b/external_imported/vcpkg/ports/apache-datasketches/usage
new file mode 100644
index 000000000..3897b28bb
--- /dev/null
+++ b/external_imported/vcpkg/ports/apache-datasketches/usage
@@ -0,0 +1,4 @@
+apache-datasketches provides CMake targets:
+
+    find_package(DataSketches CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE datasketches)
diff --git a/external_imported/vcpkg/ports/apache-datasketches/vcpkg.json b/external_imported/vcpkg/ports/apache-datasketches/vcpkg.json
new file mode 100644
index 000000000..f8ec85d09
--- /dev/null
+++ b/external_imported/vcpkg/ports/apache-datasketches/vcpkg.json
@@ -0,0 +1,17 @@
+{
+  "name": "apache-datasketches",
+  "version": "4.1.0",
+  "description": "Apache DataSketches Core C++ Library Component.",
+  "homepage": "https://datasketches.apache.org/",
+  "license": "Apache-2.0",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/apr-util/portfile.cmake b/external_imported/vcpkg/ports/apr-util/portfile.cmake
index 31e2e596f..52b3c6cdb 100644
--- a/external_imported/vcpkg/ports/apr-util/portfile.cmake
+++ b/external_imported/vcpkg/ports/apr-util/portfile.cmake
@@ -1,7 +1,7 @@
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://archive.apache.org/dist/apr/apr-util-1.6.1.tar.bz2"
-    FILENAME "apr-util-1.6.1.tar.bz2"
-    SHA512 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d
+  URLS "https://archive.apache.org/dist/apr/apr-util-${VERSION}.tar.bz2"
+    FILENAME "apr-util-${VERSION}.tar.bz2"
+    SHA512 8050a481eeda7532ef3751dbd8a5aa6c48354d52904a856ef9709484f4b0cc2e022661c49ddf55ec58253db22708ee0607dfa7705d9270e8fee117ae4f06a0fe
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
diff --git a/external_imported/vcpkg/ports/apr-util/use-vcpkg-expat.patch b/external_imported/vcpkg/ports/apr-util/use-vcpkg-expat.patch
index 8a35f2bc5..6c9fa280a 100644
--- a/external_imported/vcpkg/ports/apr-util/use-vcpkg-expat.patch
+++ b/external_imported/vcpkg/ports/apr-util/use-vcpkg-expat.patch
@@ -1,124 +1,114 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9ae90b1..71a50b0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -21,16 +21,14 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
- 
- FIND_PACKAGE(OpenSSL)
- 
--FIND_PACKAGE(expat)
--
- OPTION(APU_HAVE_CRYPTO      "Crypto support"                            OFF)
- OPTION(APU_HAVE_ODBC        "Build ODBC DBD driver"                     ON)
- OPTION(APR_HAS_LDAP         "LDAP support"                              ON)
- OPTION(INSTALL_PDB          "Install .pdb files (if generated)"         ON)
- OPTION(APR_BUILD_TESTAPR    "Build the test suite"                      OFF)
- OPTION(TEST_STATIC_LIBS     "Test programs use APR static libraries instead of shared libraries?" OFF)
--SET(APR_INCLUDE_DIR         "${CMAKE_INSTALL_PREFIX}/include"           CACHE STRING "Directory with APR include files")
--SET(APR_LIBRARIES           "${CMAKE_INSTALL_PREFIX}/lib/libapr-1.lib"  CACHE STRING "APR library to link with")
-+find_path(APR_INCLUDE_DIR apr.h)
-+find_library(APR_LIBRARIES NAMES libapr-1 apr-1)
- 
- IF(NOT EXISTS "${APR_INCLUDE_DIR}/apr.h")
-   MESSAGE(FATAL_ERROR "APR include directory ${APR_INCLUDE_DIR} is not correct.")
-@@ -61,13 +59,13 @@ IF(APR_HAS_LDAP)
-   SET(apr_has_ldap_10 1)
- ENDIF()
- 
--IF(NOT EXPAT_FOUND)
-+find_package(expat)
-+set(XMLLIB_INCLUDE_DIR ${EXPAT_INCLUDE_DIRS})
-+set(XMLLIB_LIBRARIES ${EXPAT_LIBRARIES})
-+IF(NOT XMLLIB_LIBRARIES)
-   MESSAGE(FATAL_ERROR "Expat is required, and it wasn't found!")
- ENDIF()
- 
--SET(XMLLIB_INCLUDE_DIR   ${EXPAT_INCLUDE_DIRS})
--SET(XMLLIB_LIBRARIES     ${EXPAT_LIBRARIES})
--
- SET(LDAP_LIBRARIES)
- IF(APR_HAS_LDAP)
-   SET(LDAP_LIBRARIES wldap32)
-@@ -229,17 +227,21 @@ SET(dbd_drivers)
- # Note: The WINNT definition on some targets is used only by libaprutil.rc.
- 
- # libaprutil-1 is shared, aprutil-1 is static
-+if(BUILD_SHARED_LIBS)
- ADD_LIBRARY(libaprutil-1 SHARED ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED} libaprutil.rc)
- SET(install_targets ${install_targets} libaprutil-1)
- SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/libaprutil-1.pdb)
- TARGET_LINK_LIBRARIES(libaprutil-1 ${APR_LIBRARIES} ${XMLLIB_LIBRARIES})
--SET_TARGET_PROPERTIES(libaprutil-1 PROPERTIES COMPILE_DEFINITIONS "APU_DECLARE_EXPORT;APR_DECLARE_EXPORT;XML_STATIC;WINNT")
-+SET_TARGET_PROPERTIES(libaprutil-1 PROPERTIES COMPILE_DEFINITIONS "APU_DECLARE_EXPORT;APR_DECLARE_IMPORT;XML_STATIC;WINNT")
- 
-+else(BUILD_SHARED_LIBS)
- ADD_LIBRARY(aprutil-1 STATIC ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED})
- SET(install_targets ${install_targets} aprutil-1)
- TARGET_LINK_LIBRARIES(aprutil-1 ${APR_LIBRARIES} ${XMLLIB_LIBRARIES})
- SET_TARGET_PROPERTIES(aprutil-1 PROPERTIES COMPILE_DEFINITIONS "APU_DECLARE_STATIC;APR_DECLARE_STATIC;APU_DSO_MODULE_BUILD;XML_STATIC")
-+endif(BUILD_SHARED_LIBS)
- 
-+if(BUILD_SHARED_LIBS)
- IF(APU_HAVE_CRYPTO)
-   IF(NOT OPENSSL_FOUND)
-     MESSAGE(FATAL_ERROR "Only OpenSSL-based crypto is currently implemented in the cmake build")
-@@ -249,7 +251,7 @@ IF(APU_HAVE_CRYPTO)
-   SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/apr_crypto_openssl-1.pdb)
-   SET_TARGET_PROPERTIES(apr_crypto_openssl-1 PROPERTIES INCLUDE_DIRECTORIES "${APR_INCLUDE_DIRECTORIES};${OPENSSL_INCLUDE_DIR}")
-   SET_TARGET_PROPERTIES(apr_crypto_openssl-1 PROPERTIES COMPILE_DEFINITIONS "WINNT")
--  SET_TARGET_PROPERTIES(apr_crypto_openssl-1 PROPERTIES COMPILE_FLAGS "-DAPR_DECLARE_EXPORT=1 -DAPU_DECLARE_EXPORT=1 -DDLL_NAME=apr_crypto_openssl")
-+  SET_TARGET_PROPERTIES(apr_crypto_openssl-1 PROPERTIES COMPILE_FLAGS "-DAPR_DECLARE_IMPORT -DAPU_DECLARE_IMPORT -DDLL_NAME=apr_crypto_openssl")
-   TARGET_LINK_LIBRARIES(apr_crypto_openssl-1 libaprutil-1 ${APR_LIBRARIES} ${OPENSSL_LIBRARIES})
- ENDIF()
- 
-@@ -260,8 +262,8 @@ IF(APU_HAVE_ODBC)
-   SET(dbd_drivers ${dbd_drivers} odbc)
-   TARGET_LINK_LIBRARIES(apr_dbd_odbc-1 libaprutil-1 ${APR_LIBRARIES} odbc32 odbccp32)
-   SET_PROPERTY(TARGET apr_dbd_odbc-1 APPEND PROPERTY LINK_FLAGS /export:apr_dbd_odbc_driver)
--  SET_TARGET_PROPERTIES(apr_dbd_odbc-1 PROPERTIES COMPILE_DEFINITIONS "APU_HAVE_ODBC;HAVE_SQL_H;APU_DECLARE_EXPORT;APR_DECLARE_EXPORT;APU_DSO_MODULE_BUILD;WINNT")
--  SET_TARGET_PROPERTIES(apr_dbd_odbc-1 PROPERTIES COMPILE_FLAGS "-DAPR_DECLARE_EXPORT=1 -DAPU_DECLARE_EXPORT=1 -DDLL_NAME=apr_dbd_odbc")
-+  SET_TARGET_PROPERTIES(apr_dbd_odbc-1 PROPERTIES COMPILE_DEFINITIONS "APU_HAVE_ODBC;HAVE_SQL_H;APU_DECLARE_IMPORT;APR_DECLARE_IMPORT;APU_DSO_MODULE_BUILD;WINNT")
-+  SET_TARGET_PROPERTIES(apr_dbd_odbc-1 PROPERTIES COMPILE_FLAGS "-DAPR_DECLARE_IMPORT  -DAPU_DECLARE_IMPORT -DDLL_NAME=apr_dbd_odbc")
- ENDIF()
- 
- IF(APR_HAS_LDAP)
-@@ -271,11 +273,12 @@ IF(APR_HAS_LDAP)
-   SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/apr_ldap-1.pdb)
-   TARGET_LINK_LIBRARIES(apr_ldap-1 libaprutil-1 ${APR_LIBRARIES} ${LDAP_LIBRARIES})
-   SET_TARGET_PROPERTIES(apr_ldap-1 PROPERTIES COMPILE_DEFINITIONS "WINNT")
--  SET_TARGET_PROPERTIES(apr_ldap-1 PROPERTIES COMPILE_FLAGS "-DAPR_DECLARE_EXPORT=1 -DAPU_DECLARE_EXPORT=1 -DDLL_NAME=apr_ldap")
-+  SET_TARGET_PROPERTIES(apr_ldap-1 PROPERTIES COMPILE_FLAGS "-DAPR_DECLARE_IMPORT -DAPU_DECLARE_IMPORT -DDLL_NAME=apr_ldap")
-   SET(apr_ldap_libraries apr_ldap-1)
- ELSE()
-   SET(apr_ldap_libraries)
- ENDIF()
-+endif(BUILD_SHARED_LIBS)
- 
- IF(APR_BUILD_TESTAPR)
-   ENABLE_TESTING()
-@@ -289,7 +292,7 @@ IF(APR_BUILD_TESTAPR)
-                   ${PROJECT_SOURCE_DIR}/test/data/billion-laughs.xml
-                   ${PROJECT_BINARY_DIR}/data/billion-laughs.xml)
- 
--  IF(TEST_STATIC_LIBS)
-+  IF(NOT BUILD_SHARED_LIBS)
-     SET(whichapr    aprutil-1)
-     SET(apiflag     "-DAPR_DECLARE_STATIC -DAPU_DECLARE_STATIC")
-   ELSE()
-@@ -325,13 +328,9 @@ INSTALL(TARGETS ${install_targets}
-         ARCHIVE DESTINATION lib
-        )
- 
--IF(INSTALL_PDB)
--  INSTALL(FILES ${install_bin_pdb}
--          DESTINATION bin
--          CONFIGURATIONS RelWithDebInfo Debug)
--ENDIF()
--
--INSTALL(FILES ${APR_PUBLIC_HEADERS_STATIC} ${APR_PUBLIC_HEADERS_GENERATED} DESTINATION include)
-+if(NOT DISABLE_INSTALL_HEADERS)
-+  INSTALL(FILES ${APR_PUBLIC_HEADERS_STATIC} ${APR_PUBLIC_HEADERS_GENERATED} DESTINATION include)
-+endif()
- 
- STRING(TOUPPER "${CMAKE_BUILD_TYPE}" buildtype)
- MESSAGE(STATUS "")
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fcbfc58..7781131 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -21,16 +21,14 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+ 
+ FIND_PACKAGE(OpenSSL)
+ 
+-FIND_PACKAGE(EXPAT)
+-
+ OPTION(APU_HAVE_CRYPTO      "Crypto support"                            OFF)
+ OPTION(APU_HAVE_ODBC        "Build ODBC DBD driver"                     ON)
+ OPTION(APR_HAS_LDAP         "LDAP support"                              ON)
+ OPTION(INSTALL_PDB          "Install .pdb files (if generated)"         ON)
+ OPTION(APR_BUILD_TESTAPR    "Build the test suite"                      OFF)
+ OPTION(TEST_STATIC_LIBS     "Test programs use APR static libraries instead of shared libraries?" OFF)
+-SET(APR_INCLUDE_DIR         "${CMAKE_INSTALL_PREFIX}/include"           CACHE STRING "Directory with APR include files")
+-SET(APR_LIBRARIES           "${CMAKE_INSTALL_PREFIX}/lib/libapr-1.lib"  CACHE STRING "APR library to link with")
++find_path(APR_INCLUDE_DIR apr.h)
++find_library(APR_LIBRARIES NAMES libapr-1 apr-1)
+ 
+ IF(NOT EXISTS "${APR_INCLUDE_DIR}/apr.h")
+   MESSAGE(FATAL_ERROR "APR include directory ${APR_INCLUDE_DIR} is not correct.")
+@@ -61,13 +59,13 @@ IF(APR_HAS_LDAP)
+   SET(apr_has_ldap_10 1)
+ ENDIF()
+ 
+-IF(NOT EXPAT_FOUND)
++find_package(expat)
++set(XMLLIB_INCLUDE_DIR ${EXPAT_INCLUDE_DIRS})
++set(XMLLIB_LIBRARIES ${EXPAT_LIBRARIES})
++IF(NOT XMLLIB_LIBRARIES)
+   MESSAGE(FATAL_ERROR "Expat is required, and it wasn't found!")
+ ENDIF()
+ 
+-SET(XMLLIB_INCLUDE_DIR   ${EXPAT_INCLUDE_DIRS})
+-SET(XMLLIB_LIBRARIES     ${EXPAT_LIBRARIES})
+-
+ SET(LDAP_LIBRARIES)
+ IF(APR_HAS_LDAP)
+   SET(LDAP_LIBRARIES wldap32)
+@@ -229,17 +227,21 @@ SET(dbd_drivers)
+ # Note: The WINNT definition on some targets is used only by libaprutil.rc.
+ 
+ # libaprutil-1 is shared, aprutil-1 is static
++if(BUILD_SHARED_LIBS)
+ ADD_LIBRARY(libaprutil-1 SHARED ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED} libaprutil.rc)
+ SET(install_targets ${install_targets} libaprutil-1)
+ SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/libaprutil-1.pdb)
+ TARGET_LINK_LIBRARIES(libaprutil-1 ${APR_LIBRARIES} ${XMLLIB_LIBRARIES})
+ SET_TARGET_PROPERTIES(libaprutil-1 PROPERTIES COMPILE_DEFINITIONS "APU_DECLARE_EXPORT;APR_DECLARE_IMPORT;XML_STATIC;WINNT")
+ 
++else(BUILD_SHARED_LIBS)
+ ADD_LIBRARY(aprutil-1 STATIC ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED})
+ SET(install_targets ${install_targets} aprutil-1)
+ TARGET_LINK_LIBRARIES(aprutil-1 ${APR_LIBRARIES} ${XMLLIB_LIBRARIES})
+ SET_TARGET_PROPERTIES(aprutil-1 PROPERTIES COMPILE_DEFINITIONS "APU_DECLARE_STATIC;APR_DECLARE_STATIC;APU_DSO_MODULE_BUILD;XML_STATIC")
++endif()
+ 
++if(BUILD_SHARED_LIBS)
+ IF(APU_HAVE_CRYPTO)
+   IF(NOT OPENSSL_FOUND)
+     MESSAGE(FATAL_ERROR "Only OpenSSL-based crypto is currently implemented in the cmake build")
+@@ -265,7 +267,7 @@ IF(APU_HAVE_ODBC)
+ ENDIF()
+ 
+ IF(APR_HAS_LDAP)
+-  ADD_LIBRARY(apr_ldap-1 SHARED ldap/apr_ldap_init.c ldap/apr_ldap_option.c 
++  ADD_LIBRARY(apr_ldap-1 SHARED ldap/apr_ldap_init.c ldap/apr_ldap_option.c
+               ldap/apr_ldap_rebind.c libaprutil.rc)
+   SET(install_targets ${install_targets} apr_ldap-1)
+   SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/apr_ldap-1.pdb)
+@@ -276,6 +278,7 @@ IF(APR_HAS_LDAP)
+ ELSE()
+   SET(apr_ldap_libraries)
+ ENDIF()
++endif()
+ 
+ IF(APR_BUILD_TESTAPR)
+   ENABLE_TESTING()
+@@ -283,13 +286,13 @@ IF(APR_BUILD_TESTAPR)
+   ADD_CUSTOM_TARGET(check COMMAND ${CMAKE_CTEST_COMMAND} --verbose)
+ 
+   # copy data files to build directory so that we can run programs from there
+-  EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E make_directory 
++  EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E make_directory
+                   ${PROJECT_BINARY_DIR}/data)
+-  EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E copy_if_different 
++  EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E copy_if_different
+                   ${PROJECT_SOURCE_DIR}/test/data/billion-laughs.xml
+                   ${PROJECT_BINARY_DIR}/data/billion-laughs.xml)
+ 
+-  IF(TEST_STATIC_LIBS)
++  IF(NOT BUILD_SHARED_LIBS)
+     SET(whichapr    aprutil-1)
+     SET(apiflag     "-DAPR_DECLARE_STATIC -DAPU_DECLARE_STATIC")
+   ELSE()
+@@ -325,13 +328,9 @@ INSTALL(TARGETS ${install_targets}
+         ARCHIVE DESTINATION lib
+        )
+ 
+-IF(INSTALL_PDB)
+-  INSTALL(FILES ${install_bin_pdb}
+-          DESTINATION bin
+-          CONFIGURATIONS RelWithDebInfo Debug)
+-ENDIF()
+-
+-INSTALL(FILES ${APR_PUBLIC_HEADERS_STATIC} ${APR_PUBLIC_HEADERS_GENERATED} DESTINATION include)
++if(NOT DISABLE_INSTALL_HEADERS)
++  INSTALL(FILES ${APR_PUBLIC_HEADERS_STATIC} ${APR_PUBLIC_HEADERS_GENERATED} DESTINATION include)
++endif()
+ 
+ STRING(TOUPPER "${CMAKE_BUILD_TYPE}" buildtype)
+ MESSAGE(STATUS "")
diff --git a/external_imported/vcpkg/ports/apr-util/vcpkg.json b/external_imported/vcpkg/ports/apr-util/vcpkg.json
index 5ae07edeb..f1c815bf4 100644
--- a/external_imported/vcpkg/ports/apr-util/vcpkg.json
+++ b/external_imported/vcpkg/ports/apr-util/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "apr-util",
-  "version": "1.6.1",
-  "port-version": 10,
+  "version": "1.6.3",
   "description": "Apache Portable Runtime (APR) project  mission is to create and maintain software libraries that provide a predictable and consistent interface to underlying platform-specific implementation",
   "homepage": "https://apr.apache.org/",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/apr/portfile.cmake b/external_imported/vcpkg/ports/apr/portfile.cmake
index d0debf680..84b04326b 100644
--- a/external_imported/vcpkg/ports/apr/portfile.cmake
+++ b/external_imported/vcpkg/ports/apr/portfile.cmake
@@ -1,10 +1,10 @@
 
-set(VERSION 1.7.2)
+set(VERSION 1.7.4)
 
 vcpkg_download_distfile(ARCHIVE
     URLS "https://archive.apache.org/dist/apr/apr-${VERSION}.tar.bz2"
     FILENAME "apr-${VERSION}.tar.bz2"
-    SHA512 0a3a27ccc97bbe4865c1bc0b803012e3da6d5b1f17d4fb0da6f5f58eec01f6d2ae1f25e52896ea5f9c5ac04c5fddcfd1ac606b301c322cf40d5c4d4ce0a1b76e
+    SHA512 2342c997765ea2ca96eac158e5fd260232dba68fc41b90a79a7ba9b25c539fc217981867362090e0ebebe632289257c342275e3c5baedb698c474ef8f49a9dcd
 )
 
 vcpkg_extract_source_archive(SOURCE_PATH
@@ -78,7 +78,7 @@ else()
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/build-1/libtool" "${CURRENT_INSTALLED_DIR}/lib" "")
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/build-1/libtool" "${CURRENT_INSTALLED_DIR}/debug/lib" "")
 
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/build-1/apr_rules.mk" "${CURRENT_INSTALLED_DIR}" "$(LIBPATH)/..")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/build-1/apr_rules.mk" "${CURRENT_INSTALLED_DIR}" "$(INCLUDE)/..")
     if(NOT VCPKG_BUILD_TYPE)
         vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/apr-1-config" "\"${CURRENT_INSTALLED_DIR}/debug\"" "$(realpath \"`dirname $0`/../../../..\")")
         vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/apr-1-config" "APR_SOURCE_DIR=\"${SOURCE_PATH}\"" "")
@@ -87,7 +87,7 @@ else()
         vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/build-1/libtool" "${CURRENT_INSTALLED_DIR}/lib" "")
         vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/build-1/libtool" "${CURRENT_INSTALLED_DIR}/debug/lib" "")
 
-        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/build-1/apr_rules.mk" "${CURRENT_INSTALLED_DIR}/debug" "$(LIBPATH)/..")
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/build-1/apr_rules.mk" "${CURRENT_INSTALLED_DIR}/debug" "$(INCLUDE)/..")
     endif()
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 endif()
diff --git a/external_imported/vcpkg/ports/apr/vcpkg.json b/external_imported/vcpkg/ports/apr/vcpkg.json
index 499cb0eca..dafc8d0fa 100644
--- a/external_imported/vcpkg/ports/apr/vcpkg.json
+++ b/external_imported/vcpkg/ports/apr/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "apr",
-  "version": "1.7.2",
+  "version": "1.7.4",
   "description": "The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.",
   "homepage": "https://apr.apache.org/",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/apriltag/fix-config.patch b/external_imported/vcpkg/ports/apriltag/fix-config.patch
new file mode 100644
index 000000000..ead665e37
--- /dev/null
+++ b/external_imported/vcpkg/ports/apriltag/fix-config.patch
@@ -0,0 +1,50 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9924a74..08e3cbe 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.1)
++cmake_minimum_required(VERSION 3.5)
+ project(apriltag VERSION 3.3.0 LANGUAGES C CXX)
+ 
+ if(POLICY CMP0077)
+@@ -39,6 +39,9 @@ endif()
+ aux_source_directory(common COMMON_SRC)
+ set(APRILTAG_SRCS apriltag.c apriltag_pose.c apriltag_quad_thresh.c)
+ 
++if (MSVC)
++  add_definitions(-D_CRT_SECURE_NO_WARNINGS)
++endif()
+ # Library
+ file(GLOB TAG_FILES ${CMAKE_CURRENT_SOURCE_DIR}/tag*.c)
+ add_library(${PROJECT_NAME} ${APRILTAG_SRCS} ${COMMON_SRC} ${TAG_FILES})
+@@ -98,6 +101,7 @@ write_basic_package_version_file("${version_config}" COMPATIBILITY SameMajorVers
+ install(TARGETS ${PROJECT_NAME} EXPORT ${targets_export_name}
+         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+         )
+ 
+ install(EXPORT ${targets_export_name}
+@@ -120,7 +124,7 @@ install(FILES "${PROJECT_BINARY_DIR}/apriltag.pc" DESTINATION "${CMAKE_INSTALL_L
+ 
+ # Python wrapper
+ include(CMakeDependentOption)
+-cmake_dependent_option(BUILD_PYTHON_WRAPPER "Builds Python wrapper" ON BUILD_SHARED_LIBS OFF)
++option(BUILD_PYTHON_WRAPPER "Builds Python wrapper" OFF)
+ 
+ if(BUILD_PYTHON_WRAPPER)
+     SET(Python_ADDITIONAL_VERSIONS 3)
+@@ -158,6 +162,7 @@ string(STRIP ${PY_DEST} PY_DEST)
+ install(FILES ${PROJECT_BINARY_DIR}/apriltag${PY_EXT_SUFFIX} DESTINATION ${PY_DEST})
+ endif (NOT Python3_NOT_FOUND AND NOT Numpy_NOT_FOUND AND PYTHONLIBS_FOUND AND BUILD_PYTHON_WRAPPER)
+ 
++if(0)
+ # Examples
+ # apriltag_demo
+ add_executable(apriltag_demo example/apriltag_demo.c)
+@@ -177,3 +182,4 @@ endif(OpenCV_FOUND)
+ 
+ # install example programs
+ install(TARGETS apriltag_demo RUNTIME DESTINATION bin)
++endif()
diff --git a/external_imported/vcpkg/ports/apriltag/portfile.cmake b/external_imported/vcpkg/ports/apriltag/portfile.cmake
new file mode 100644
index 000000000..78eab252c
--- /dev/null
+++ b/external_imported/vcpkg/ports/apriltag/portfile.cmake
@@ -0,0 +1,38 @@
+if (VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO AprilRobotics/apriltag
+    REF v${VERSION}
+    SHA512 45965f2f888475ea5aecdada0d41a5495f6f0c545d5219c96d82aea009e310a17308df858d4ba40ff191cfe15801dfe16298f20efcc5c117695dd0fa8d3a3fd7
+    HEAD_REF master
+    PATCHES
+        fix-config.patch
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+)
+
+vcpkg_cmake_install()
+
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_cmake_config_fixup(CONFIG_PATH share/${PORT}/cmake)
+vcpkg_fixup_pkgconfig()
+
+if (VCPKG_TARGET_IS_WINDOWS)
+    file(READ "${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}Config.cmake" FIXED_CONFIG)
+    file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}Config.cmake" "
+    include(CMakeFindDependencyMacro)
+    find_dependency(PThreads4W)
+    ${FIXED_CONFIG}
+    ")
+endif()
+
+file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/apriltag/usage b/external_imported/vcpkg/ports/apriltag/usage
new file mode 100644
index 000000000..839749f0c
--- /dev/null
+++ b/external_imported/vcpkg/ports/apriltag/usage
@@ -0,0 +1,4 @@
+apriltag provides CMake targets: 
+
+    find_package(apriltag REQUIRED)
+    target_link_libraries(main PRIVATE apriltag::apriltag)
diff --git a/external_imported/vcpkg/ports/apriltag/vcpkg.json b/external_imported/vcpkg/ports/apriltag/vcpkg.json
new file mode 100644
index 000000000..990470659
--- /dev/null
+++ b/external_imported/vcpkg/ports/apriltag/vcpkg.json
@@ -0,0 +1,19 @@
+{
+  "name": "apriltag",
+  "version": "3.3.0",
+  "description": "AprilTag is a visual fiducial system popular for robotics research.",
+  "homepage": "https://april.eecs.umich.edu/software/apriltag",
+  "license": "BSD-2-Clause",
+  "supports": "!uwp",
+  "dependencies": [
+    "pthreads",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/apsi/fix-c2398.patch b/external_imported/vcpkg/ports/apsi/fix-c2398.patch
new file mode 100644
index 000000000..b044e1423
--- /dev/null
+++ b/external_imported/vcpkg/ports/apsi/fix-c2398.patch
@@ -0,0 +1,15 @@
+diff --git a/sender/apsi/util/cuckoo_filter.cpp b/sender/apsi/util/cuckoo_filter.cpp
+index be5aead..e242796 100644
+--- a/sender/apsi/util/cuckoo_filter.cpp
++++ b/sender/apsi/util/cuckoo_filter.cpp
+@@ -246,8 +246,8 @@ CuckooFilter CuckooFilter::Load(istream &in, size_t &bytes_read)
+ 
+     bytes_read = in_data.size();
+     return CuckooFilter{ move(cuckoo_filter_table),
+-                         cuckoo_filter_fbs->num_items(),
+-                         cuckoo_filter_fbs->overflow()->index(),
++                         static_cast<size_t>(cuckoo_filter_fbs->num_items()),
++                         static_cast<size_t>(cuckoo_filter_fbs->overflow()->index()),
+                          cuckoo_filter_fbs->overflow()->tag(),
+                          cuckoo_filter_fbs->overflow()->used() };
+ }
diff --git a/external_imported/vcpkg/ports/apsi/fix-find-seal.patch b/external_imported/vcpkg/ports/apsi/fix-find-seal.patch
new file mode 100644
index 000000000..21e015122
--- /dev/null
+++ b/external_imported/vcpkg/ports/apsi/fix-find-seal.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 78d54a6..4d3f338 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -122,7 +122,7 @@ set(APSI_INCLUDES_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR}/APSI-${APSI_VERSION_MA
+ # find_package might throw a FATAL_ERROR before"xxx: not found", e.g. with vcpkg.cmake.
+ 
+ # Microsoft SEAL
+-find_package(SEAL 4.1 QUIET REQUIRED)
++find_package(SEAL QUIET REQUIRED)
+ if(NOT SEAL_FOUND)
+     message(FATAL_ERROR "Microsoft SEAL: not found")
+ else()
diff --git a/external_imported/vcpkg/ports/apsi/fix-find_package.patch b/external_imported/vcpkg/ports/apsi/fix-find_package.patch
deleted file mode 100644
index 7a4d0d796..000000000
--- a/external_imported/vcpkg/ports/apsi/fix-find_package.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0951577..c5efa1e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -117,7 +117,7 @@ set(APSI_INCLUDES_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR}/APSI-${APSI_VERSION_MA
- # find_package might throw a FATAL_ERROR before"xxx: not found", e.g. with vcpkg.cmake.
- 
- # Microsoft SEAL
--find_package(SEAL 4 QUIET REQUIRED)
-+find_package(SEAL 4.1 QUIET REQUIRED)
- if(NOT SEAL_FOUND)
-     message(FATAL_ERROR "Microsoft SEAL: not found")
- else()
diff --git a/external_imported/vcpkg/ports/apsi/portfile.cmake b/external_imported/vcpkg/ports/apsi/portfile.cmake
index 4c6622e51..e3b37acea 100644
--- a/external_imported/vcpkg/ports/apsi/portfile.cmake
+++ b/external_imported/vcpkg/ports/apsi/portfile.cmake
@@ -3,11 +3,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO microsoft/APSI
-    REF 2dff8dcd39c361527ea3b320f87cb8e71dd4f777 #0.9.0
-    SHA512 16c52642719f1d67dfaa70d963ba8795ac618f250752a1f95d91d4b1db8b51b2598999dcc9a9a7a3dbe8537943a3c3bf2ec684cd2697fca88135b01009961213
+    REF "v${VERSION}"
+    SHA512 ad49e169970921175728705c6f5fe8062e74900a601ea25e9f836840a221175bfbb3169717787b1ca7e2e1a0b26630690dcef9bc91c0123877b856ea927e9e68
     HEAD_REF main
     PATCHES
-        fix-find_package.patch
+        fix-find-seal.patch
+        fix-c2398.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -17,28 +18,29 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
 )
 
 set(CROSSCOMP_OPTIONS "")
-if (NOT HOST_TRIPLET STREQUAL TARGET_TRIPLET)
+if (VCPKG_CROSSCOMPILING)
     if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
-        set(CROSSCOMP_OPTIONS -DAPSI_FOURQ_ARM64_EXITCODE=0 -DAPSI_FOURQ_ARM64_EXITCODE__TRYRUN_OUTPUT="")
+        set(CROSSCOMP_OPTIONS -DAPSI_FOURQ_ARM64_EXITCODE=0 -DAPSI_FOURQ_ARM64_EXITCODE__TRYRUN_OUTPUT='')
     endif()
+    if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
+        set(CROSSCOMP_OPTIONS -DAPSI_FOURQ_AMD64_EXITCODE=0 -DHAVE_AVX_EXTENSIONS_EXITCODE=0 -DHAVE_AVX2_EXTENSIONS_EXITCODE=1)
+    endif() 
 endif()
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    DISABLE_PARALLEL_CONFIGURE
     OPTIONS
-        "-DAPSI_BUILD_TESTS=OFF"
-        "-DAPSI_BUILD_CLI=OFF"
+        -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
+        -DAPSI_BUILD_TESTS=OFF
+        -DAPSI_BUILD_CLI=OFF
         ${FEATURE_OPTIONS}
         ${CROSSCOMP_OPTIONS}
 )
 
 vcpkg_cmake_install()
 
-vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/APSI-0.9")
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/APSI-0.11")
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright")
-
-vcpkg_copy_pdbs()
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/apsi/vcpkg.json b/external_imported/vcpkg/ports/apsi/vcpkg.json
index dd32f03aa..4616fb5a6 100644
--- a/external_imported/vcpkg/ports/apsi/vcpkg.json
+++ b/external_imported/vcpkg/ports/apsi/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "apsi",
-  "version-semver": "0.9.0",
-  "port-version": 1,
+  "version-semver": "0.11.0",
   "description": "APSI is a research library for asymmetric private set intersection.",
   "homepage": "https://github.com/microsoft/APSI",
   "license": "MIT",
@@ -11,8 +10,11 @@
     "kuku",
     {
       "name": "seal",
+      "default-features": false,
       "features": [
-        "no-throw-tran"
+        "ms-gsl",
+        "no-throw-tran",
+        "zstd"
       ]
     },
     {
@@ -35,8 +37,7 @@
         {
           "name": "seal",
           "features": [
-            "hexl",
-            "no-throw-tran"
+            "hexl"
           ],
           "platform": "x64"
         }
@@ -51,7 +52,8 @@
     "zeromq": {
       "description": "Use ZeroMQ for networking.",
       "dependencies": [
-        "cppzmq"
+        "cppzmq",
+        "zeromq"
       ]
     }
   }
diff --git a/external_imported/vcpkg/ports/arb/vcpkg.json b/external_imported/vcpkg/ports/arb/vcpkg.json
index 9cfb617f3..35e454c8a 100644
--- a/external_imported/vcpkg/ports/arb/vcpkg.json
+++ b/external_imported/vcpkg/ports/arb/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "arb",
   "version": "2.21.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": "a C library for arbitrary-precision interval arithmetic",
   "homepage": "https://github.com/fredrik-johansson/arb",
   "license": "LGPL-2.1",
+  "supports": "!xbox",
   "dependencies": [
     "flint",
     {
diff --git a/external_imported/vcpkg/ports/arg-router/portfile.cmake b/external_imported/vcpkg/ports/arg-router/portfile.cmake
index ba50296b8..b09f250bc 100644
--- a/external_imported/vcpkg/ports/arg-router/portfile.cmake
+++ b/external_imported/vcpkg/ports/arg-router/portfile.cmake
@@ -3,7 +3,7 @@ vcpkg_from_github(
     REPO cmannett85/arg_router
     REF v${VERSION}
     HEAD_REF main
-    SHA512 7f19f9b4df8c2b8968cfc05a92eb3dab44fdc261835a75ccf6e0ec64c68059f05fd7125466e81fa8b04638ab79792b2151216214bb121c06c77c4441a6917315
+    SHA512 0348a39c0e091b1b0d6887528f6d48372162ed2526fb81935761cf93ff006fc685bbf834d44cea60cdaf4d8b2e947b6cb1a81c901c02aaba68a0dfd16a12ca20
 )
 
 set(VCPKG_BUILD_TYPE release) # header-only port
diff --git a/external_imported/vcpkg/ports/arg-router/vcpkg.json b/external_imported/vcpkg/ports/arg-router/vcpkg.json
index eec231d7e..c86dd1b9c 100644
--- a/external_imported/vcpkg/ports/arg-router/vcpkg.json
+++ b/external_imported/vcpkg/ports/arg-router/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "arg-router",
-  "version": "1.2.2",
+  "version": "1.4.0",
   "description": "C++ command line argument parsing and routing.",
   "homepage": "https://github.com/cmannett85/arg_router",
   "documentation": "https://cmannett85.github.io/arg_router/",
diff --git a/external_imported/vcpkg/ports/argagg/portfile.cmake b/external_imported/vcpkg/ports/argagg/portfile.cmake
index 70e162b12..018f0353b 100644
--- a/external_imported/vcpkg/ports/argagg/portfile.cmake
+++ b/external_imported/vcpkg/ports/argagg/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO vietjtnguyen/argagg
-    REF 0.4.6
-    SHA512 7d8cf04a7c679518f01120830637c68719dd67a765457789eb4afedbead7be9efadc6bcdf640999329aaaf8659a5e5d1896f66587068cc668a7c49703aca3070
+    REF "${VERSION}"
+    SHA512 85634bff33236ffcb0aea03a6fa4b3529b6d1faa03f8e030f3c5401fc453bb5e1964f7d0644e4f3fc089ccd7751ea94c466e02b85f7c9701ce21adcc20c0b058
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/argagg/vcpkg.json b/external_imported/vcpkg/ports/argagg/vcpkg.json
index ad43aa2ea..616ef9e31 100644
--- a/external_imported/vcpkg/ports/argagg/vcpkg.json
+++ b/external_imported/vcpkg/ports/argagg/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "argagg",
-  "version-string": "0.4.6",
-  "port-version": 2,
+  "version": "0.4.7",
   "description": "A simple C++11 command line argument parser",
   "dependencies": [
     {
diff --git a/external_imported/vcpkg/ports/argon2/CMakeLists.txt b/external_imported/vcpkg/ports/argon2/CMakeLists.txt
index 88b7f7e75..c42eec532 100644
--- a/external_imported/vcpkg/ports/argon2/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/argon2/CMakeLists.txt
@@ -1,14 +1,14 @@
-cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.25)
 
-project(argon2)
+project(argon2 LANGUAGES C)
 
-set(ARGON2_VERSION 20190702)
+option(WITH_OPTIMIZATIONS "Enable SSE2/AVX2/AVX512 optimizations")
+option(BUILD_TOOL "Build the tool" OFF)
 
-option(BUILD_SHARED_LIBS "Build using shared libraries" ON)
-
-if ((CMAKE_CXX_COMPILER_ID MATCHES "Clang")
- OR (CMAKE_CXX_COMPILER_ID STREQUAL "GNU"))
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
+if(BUILD_SHARED_LIBS)
+    if(CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_C_COMPILER_ID STREQUAL "GNU")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
+    endif()
 endif()
 
 find_package(Threads REQUIRED)
@@ -18,66 +18,58 @@ set(ARGON2_HEADERS
 )
 
 set (ARGON2_SRC
-    "src/argon2.c"
-    "src/core.c"
-    "src/blake2/blake2b.c"
-    "src/thread.c"
-    "src/encoding.c"
+    src/argon2.c
+    src/core.c
+    src/blake2/blake2b.c
+    src/thread.c
+    src/encoding.c
 )
-
-set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
-
-message(STATUS "Checking support for hardware optimization:")
-try_compile(WITH_OPTIMIZATIONS
-    ${CMAKE_CURRENT_BINARY_DIR}/optimization
-    SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/opt.c
-    CMAKE_FLAGS -DINCLUDE_DIRECTORIES=${CMAKE_CURRENT_SOURCE_DIR}/include
-    OUTPUT_VARIABLE OUTPUT_TEST_SUPPORT_OPTIMIZATION)
-
-message(STATUS "Build with hardware optimization? ${WITH_OPTIMIZATIONS}")
-
 if (WITH_OPTIMIZATIONS)
-    list(APPEND ARGON2_SRC "src/opt.c")
+    list(APPEND ARGON2_SRC src/opt.c)
 else()
-    list(APPEND ARGON2_SRC "src/ref.c")
+    list(APPEND ARGON2_SRC src/ref.c)
 endif()
 
 add_library(libargon2 ${ARGON2_SRC})
-target_include_directories(libargon2 PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<INSTALL_INTERFACE:include> PRIVATE src)
-target_link_libraries(libargon2 Threads::Threads)
-target_compile_definitions(libargon2 PUBLIC "A2_VISCTL")
 set_target_properties(libargon2 PROPERTIES OUTPUT_NAME argon2)
-
-add_executable(argon2_tool ${ARGON2_SRC} src/run.c)
-target_include_directories(argon2_tool PRIVATE include src)
-target_compile_definitions(argon2_tool PUBLIC "A2_VISCTL")
-target_link_libraries(argon2_tool Threads::Threads)
-
-install(FILES ${ARGON2_HEADERS} DESTINATION include)
-
-set(PREFIX ${CMAKE_INSTALL_PREFIX})
-set(UPSTREAM_VER 20190702)
-if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-    set(EXTRA_LIBS "-lrt -ldl")
-endif ()
-
-configure_file ("${CMAKE_SOURCE_DIR}/libargon2.pc.in" "${PROJECT_BINARY_DIR}/libargon2.pc" @ONLY)
-install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libargon2.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig")
+target_include_directories(libargon2 PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<INSTALL_INTERFACE:include> PRIVATE src)
+target_link_libraries(libargon2 PRIVATE Threads::Threads)
+if(BUILD_SHARED_LIBS)
+    if(WIN32)
+        target_compile_definitions(libargon2 PRIVATE "BUILDING_ARGON2_DLL" INTERFACE "USING_ARGON2_DLL")
+    else()
+        target_compile_definitions(libargon2 PRIVATE "A2_VISCTL")
+    endif()
+endif()
 
 install(TARGETS libargon2
-    EXPORT unofficial-libargon2
+    EXPORT unofficial-argon2-targets
     RUNTIME DESTINATION bin
     LIBRARY DESTINATION lib
     ARCHIVE DESTINATION lib
 )
 
-install(EXPORT unofficial-libargon2
+if(BUILD_TOOL)
+    add_executable(argon2 src/run.c)
+    target_link_libraries(argon2 PRIVATE libargon2)
+    set_target_properties(argon2 PROPERTIES PDB_NAME "argon2${CMAKE_EXECUTABLE_SUFFIX}.pdb")
+
+    install(TARGETS argon2 RUNTIME DESTINATION bin)
+endif()
+
+install(FILES ${ARGON2_HEADERS} DESTINATION include)
+
+install(EXPORT unofficial-argon2-targets
   NAMESPACE unofficial::argon2::
-  DESTINATION "share/unofficial-libargon2"
+  DESTINATION "share/unofficial-argon2"
 )
 
-install(TARGETS argon2_tool
-    RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib
-)
+function(make_pc_file)
+    set(PREFIX "${CMAKE_INSTALL_PREFIX}")
+    set(INCLUDE "include")
+    set(HOST_MULTIARCH "lib")
+    set(EXTRA_LIBS "")
+    configure_file ("${CMAKE_SOURCE_DIR}/libargon2.pc.in" "${PROJECT_BINARY_DIR}/libargon2.pc" @ONLY)
+endfunction()
+make_pc_file()
+install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libargon2.pc" DESTINATION "lib/pkgconfig")
diff --git a/external_imported/vcpkg/ports/argon2/portfile.cmake b/external_imported/vcpkg/ports/argon2/portfile.cmake
index 54da71466..2cc0c11bf 100644
--- a/external_imported/vcpkg/ports/argon2/portfile.cmake
+++ b/external_imported/vcpkg/ports/argon2/portfile.cmake
@@ -6,26 +6,43 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
         visibility.patch
+        visibility-for-tool.patch
         thread-header.patch
 )
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION  "${SOURCE_PATH}")
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        hwopt   WITH_OPTIMIZATIONS
+        tool    BUILD_TOOL
+)
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         ${FEATURE_OPTIONS}
+        -DUPSTREAM_VER=${VERSION}
+    OPTIONS_DEBUG
+        -DBUILD_TOOL=OFF
 )
 
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 vcpkg_fixup_pkgconfig()
-vcpkg_cmake_config_fixup(CONFIG_PATH share/unofficial-libargon2 PACKAGE_NAME unofficial-libargon2)
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/unofficial-argon2-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-argon2")
+vcpkg_cmake_config_fixup(CONFIG_PATH share/unofficial-argon2 PACKAGE_NAME unofficial-argon2)
+# Migration path
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/unofficial-libargon2-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-libargon2")
+
+if(BUILD_TOOL)
+    vcpkg_copy_tools(TOOL_NAMES argon2 AUTO_CLEAN)
+endif()
 
-vcpkg_copy_tools(TOOL_NAMES argon2_tool AUTO_CLEAN)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/argon2.h" "defined(USING_ARGON2_DLL)" "1")
+endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-file(RENAME "${CURRENT_PACKAGES_DIR}/tools/${PORT}/argon2_tool${VCPKG_HOST_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/argon2${VCPKG_HOST_EXECUTABLE_SUFFIX}")
 
-configure_file("${CMAKE_CURRENT_LIST_DIR}/unofficial-libargon2-config.cmake" "${CURRENT_PACKAGES_DIR}/share/unofficial-libargon2/unofficial-libargon2-config.cmake" @ONLY)
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/argon2/unofficial-argon2-config.cmake b/external_imported/vcpkg/ports/argon2/unofficial-argon2-config.cmake
new file mode 100644
index 000000000..9034d40c7
--- /dev/null
+++ b/external_imported/vcpkg/ports/argon2/unofficial-argon2-config.cmake
@@ -0,0 +1,4 @@
+include(CMakeFindDependencyMacro)
+find_dependency(Threads)
+
+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-argon2-targets.cmake")
diff --git a/external_imported/vcpkg/ports/argon2/unofficial-libargon2-config.cmake b/external_imported/vcpkg/ports/argon2/unofficial-libargon2-config.cmake
index 2723beed5..dfe78b5af 100644
--- a/external_imported/vcpkg/ports/argon2/unofficial-libargon2-config.cmake
+++ b/external_imported/vcpkg/ports/argon2/unofficial-libargon2-config.cmake
@@ -1,6 +1,4 @@
-if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT WIN32)
-    include(CMakeFindDependencyMacro)
-    find_dependency(Threads)
-endif()
-
-include("${CMAKE_CURRENT_LIST_DIR}/unofficial-libargon2.cmake")
+file(READ "${CMAKE_CURRENT_LIST_DIR}/../argon2/usage" usage)
+message(WARNING "find_package(unofficial-libargon2) is deprecated.\n${usage}")
+include(CMakeFindDependencyMacro)
+find_dependency(unofficial-argon2 CONFIG)
diff --git a/external_imported/vcpkg/ports/argon2/usage b/external_imported/vcpkg/ports/argon2/usage
new file mode 100644
index 000000000..f874d576e
--- /dev/null
+++ b/external_imported/vcpkg/ports/argon2/usage
@@ -0,0 +1,4 @@
+argon2 provides CMake targets:
+
+    find_package(unofficial-argon2 CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE unofficial::argon2::libargon2)
diff --git a/external_imported/vcpkg/ports/argon2/vcpkg.json b/external_imported/vcpkg/ports/argon2/vcpkg.json
index 9a6b0e1d7..74bc563ec 100644
--- a/external_imported/vcpkg/ports/argon2/vcpkg.json
+++ b/external_imported/vcpkg/ports/argon2/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "argon2",
   "version": "20190702",
+  "port-version": 1,
   "description": "Password-hashing library.",
   "homepage": "https://github.com/P-H-C/phc-winner-argon2",
   "license": "Apache-2.0 OR CC0-1.0",
@@ -16,7 +17,11 @@
   ],
   "features": {
     "hwopt": {
-      "description": "Enable SSE2/AVX2/AVX512 optimizations if supported on architecture"
+      "description": "Enable SSE2/AVX2/AVX512 optimizations",
+      "supports": "x86 | x64"
+    },
+    "tool": {
+      "description": "Install the argon2 tool"
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/argon2/visibility-for-tool.patch b/external_imported/vcpkg/ports/argon2/visibility-for-tool.patch
new file mode 100644
index 000000000..863530549
--- /dev/null
+++ b/external_imported/vcpkg/ports/argon2/visibility-for-tool.patch
@@ -0,0 +1,13 @@
+diff --git a/src/core.h b/src/core.h
+index 78000ba..91c7bcf 100644
+--- a/src/core.h
++++ b/src/core.h
+@@ -135,7 +135,7 @@ void secure_wipe_memory(void *v, size_t n);
+  * @param mem Pointer to the memory
+  * @param s Memory size in bytes
+  */
+-void clear_internal_memory(void *v, size_t n);
++ARGON2_PUBLIC void clear_internal_memory(void *v, size_t n);
+ 
+ /*
+  * Computes absolute position of reference block in the lane following a skewed
diff --git a/external_imported/vcpkg/ports/argon2/visibility.patch b/external_imported/vcpkg/ports/argon2/visibility.patch
index 53bcce7e1..d6e99510f 100644
--- a/external_imported/vcpkg/ports/argon2/visibility.patch
+++ b/external_imported/vcpkg/ports/argon2/visibility.patch
@@ -1,46 +1,16 @@
-Fix symbol visibility across build triplets.
-Submitted upstream in https://github.com/P-H-C/phc-winner-argon2/pull/262
-
-
 diff --git a/include/argon2.h b/include/argon2.h
-index 3980bb3..2738960 100644
+index fc8682c..1401051 100644
 --- a/include/argon2.h
 +++ b/include/argon2.h
-@@ -27,15 +27,29 @@ extern "C" {
- #endif
- 
- /* Symbols visibility control */
--#ifdef A2_VISCTL
--#define ARGON2_PUBLIC __attribute__((visibility("default")))
--#define ARGON2_LOCAL __attribute__ ((visibility ("hidden")))
+@@ -30,7 +30,10 @@ extern "C" {
+ #ifdef A2_VISCTL
+ #define ARGON2_PUBLIC __attribute__((visibility("default")))
+ #define ARGON2_LOCAL __attribute__ ((visibility ("hidden")))
 -#elif _MSC_VER
--#define ARGON2_PUBLIC __declspec(dllexport)
--#define ARGON2_LOCAL
-+#if defined(_WIN32)
-+  #if defined(A2_VISCTL)
-+    #if defined(_MSC_VER) || defined(__MINGW32__)
-+      #define ARGON2_PUBLIC __declspec(dllexport)
-+    #else
-+      #define ARGON2_PUBLIC __attribute__ ((dllexport))
-+    #endif
-+  #else
-+    #if defined(_MSC_VER) || defined(__MINGW32__)
-+      #define ARGON2_PUBLIC __declspec(dllimport)
-+    #else
-+      #define ARGON2_PUBLIC /*__attribute__ ((dllimport))*/
-+    #endif
-+  #endif
-+  #define ARGON2_LOCAL
++#elif defined(_WIN32) && defined(USING_ARGON2_DLL)
++#define ARGON2_PUBLIC __declspec(dllimport)
++#define ARGON2_LOCAL
++#elif defined(_WIN32) && defined(BUILDING_ARGON2_DLL)
+ #define ARGON2_PUBLIC __declspec(dllexport)
+ #define ARGON2_LOCAL
  #else
--#define ARGON2_PUBLIC
--#define ARGON2_LOCAL
-+  #if defined(A2_VISCTL)
-+    #define ARGON2_PUBLIC __attribute__ ((visibility ("default")))
-+    #define ARGON2_LOCAL  __attribute__ ((visibility ("hidden")))
-+  #else
-+    #define ARGON2_PUBLIC
-+    #define ARGON2_LOCAL
-+  #endif
- #endif
- 
- /*
diff --git a/external_imported/vcpkg/ports/argparse/portfile.cmake b/external_imported/vcpkg/ports/argparse/portfile.cmake
index 51908fbb8..d9a554e9b 100644
--- a/external_imported/vcpkg/ports/argparse/portfile.cmake
+++ b/external_imported/vcpkg/ports/argparse/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO p-ranav/argparse
-    REF 997da9255618311d1fcb0135ce86022729d1f1cb # v2.9
-    SHA512 241e6a1ec76133b7ad4ab3984b1b4e08129f3dac80fc26a0010c9450ab83131ec9e2472844eba30265f2a6f1e94c7b7c07175f11a22553bd61a099b1bb148ef7
+    REF "v${VERSION}"
+    SHA512 a7ed879eb3f71868cd84e513c0db63c4fecff1c9f0b34d6cfbe85d2439e83b80e97f713b497259c9775c9c7c1f639a08b73080045c51756de15e3d8c18b97116
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/argparse/vcpkg.json b/external_imported/vcpkg/ports/argparse/vcpkg.json
index 458c0a98c..c9db0f71e 100644
--- a/external_imported/vcpkg/ports/argparse/vcpkg.json
+++ b/external_imported/vcpkg/ports/argparse/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "argparse",
-  "version": "2.9",
+  "version": "3.0",
   "description": "Argument parser for modern C++",
   "homepage": "https://github.com/p-ranav/argparse",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/args/portfile.cmake b/external_imported/vcpkg/ports/args/portfile.cmake
index bf4f674a7..7164a3244 100644
--- a/external_imported/vcpkg/ports/args/portfile.cmake
+++ b/external_imported/vcpkg/ports/args/portfile.cmake
@@ -1,24 +1,25 @@
-#header-only library
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Taywee/args
-    REF 6.3.0
-    SHA512 7d554719781d5a096883e37cd5c1706782d06c2c4d7a9598142aec7f2e38d63438e82960b60a705baeb2aa5d31143c83fa6c0d1331a36b16f564a5ea56ad451d
+    REF "${VERSION}"
+    SHA512 5b433845ce4a8590e72c045a40ab62602b798dad46eb192210815c11507700026073a6a8a528aaf567786931d587ef58f90b459a747a91856ce1cc4f2835b0e9
     HEAD_REF master
 )
 
+set(VCPKG_BUILD_TYPE release) # header-only port
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-    -DARGS_BUILD_UNITTESTS=OFF
-    -DARGS_BUILD_EXAMPLE=OFF
+        -DARGS_BUILD_UNITTESTS=OFF
+        -DARGS_BUILD_EXAMPLE=OFF
 )
 
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
 vcpkg_fixup_pkgconfig()
 
-# Put the licence file where vcpkg expects it
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/args/usage b/external_imported/vcpkg/ports/args/usage
new file mode 100644
index 000000000..0e720e7a8
--- /dev/null
+++ b/external_imported/vcpkg/ports/args/usage
@@ -0,0 +1,4 @@
+args provides CMake targets:
+
+    find_package(args CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE taywee::args)
diff --git a/external_imported/vcpkg/ports/args/vcpkg.json b/external_imported/vcpkg/ports/args/vcpkg.json
index 01789e2e5..d62aebbcd 100644
--- a/external_imported/vcpkg/ports/args/vcpkg.json
+++ b/external_imported/vcpkg/ports/args/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "args",
-  "version": "6.3.0",
+  "version": "6.4.6",
   "description": "A simple header-only C++ argument parser library.",
   "homepage": "https://github.com/Taywee/args",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/argtable3/portfile.cmake b/external_imported/vcpkg/ports/argtable3/portfile.cmake
index 03aa90e5f..71b188fda 100644
--- a/external_imported/vcpkg/ports/argtable3/portfile.cmake
+++ b/external_imported/vcpkg/ports/argtable3/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO argtable/argtable3
-    REF 7704006f3cbb556e11da80a5b97469075a32892e # 3.2.1 + minor patches including ARGTABLE3_ENABLE_EXAMPLES support
-    SHA512 c51aa0a33a247c3801e36ca5d9523acefa31f21a34c1e86965a39290c1b437785e4d7e0ae80a65d811803b8fcbbc3a96ba3d6aefaea9bda15abc0f38bd1f45cc
+    REF "v${VERSION}"
+    SHA512 623197142fd1749b2fd5bc3e51758ae49c58ec8699b6afa5ecb2d0199d98f9c05366f92c5169c8039b5c417f4774fb4a09c879a7b04ddbed9d5e43585692ed7f
     HEAD_REF master
     PATCHES Fix-dependence-getopt.patch
 )
diff --git a/external_imported/vcpkg/ports/argtable3/vcpkg.json b/external_imported/vcpkg/ports/argtable3/vcpkg.json
index 2822477b0..2ab9e76b1 100644
--- a/external_imported/vcpkg/ports/argtable3/vcpkg.json
+++ b/external_imported/vcpkg/ports/argtable3/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "argtable3",
-  "version": "3.2.1",
-  "port-version": 3,
+  "version-string": "3.2.2.f25c624",
   "description": "A single-file, ANSI C, command-line parsing library that parses GNU-style command-line options",
   "homepage": "https://www.argtable.org/",
   "license": "BSD-2-Clause-NetBSD AND TCL",
diff --git a/external_imported/vcpkg/ports/argumentum/portfile.cmake b/external_imported/vcpkg/ports/argumentum/portfile.cmake
index c96433e13..7e3728648 100755
--- a/external_imported/vcpkg/ports/argumentum/portfile.cmake
+++ b/external_imported/vcpkg/ports/argumentum/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mmahnic/argumentum
-    REF v0.3.1
-    SHA512 96f3a2077dacabf95d06120e24a50147b153090ddb0b6da17c960f8fe6724567bcd3337409f4729e1d8d15058550ed9f34a861da16fb6c999207554154e411c1
+    REF "v${VERSION}"
+    SHA512 3efd7950de1f05d89900a3139d2cff8c4e68250d67edd4940ad0e035e037c6fd7c5bc0dc4a5c89382f8d73313d5a8d055c04cf9a8440bc38e42e50cae323a765
     HEAD_REF master
 )
 
@@ -13,6 +13,8 @@ vcpkg_cmake_configure(
     OPTIONS
         -DARGUMENTUM_BUILD_EXAMPLES=OFF
         -DARGUMENTUM_BUILD_TESTS=OFF
+        -DARGUMENTUM_BUILD_STATIC_LIBS=ON
+        -DARGUMENTUM_INSTALL_HEADERONLY=OFF
 )
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/argumentum/vcpkg.json b/external_imported/vcpkg/ports/argumentum/vcpkg.json
index f077df3a6..04c764e4e 100644
--- a/external_imported/vcpkg/ports/argumentum/vcpkg.json
+++ b/external_imported/vcpkg/ports/argumentum/vcpkg.json
@@ -1,9 +1,9 @@
 {
   "name": "argumentum",
-  "version-string": "0.3.1",
-  "port-version": 2,
+  "version": "0.3.2",
   "description": "A C++17 command line argument parser inspired by Python argparse",
   "homepage": "https://github.com/mmahnic/argumentum",
+  "license": "MPL-2.0",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/armadillo/portfile.cmake b/external_imported/vcpkg/ports/armadillo/portfile.cmake
index 247120b99..54295f1c2 100644
--- a/external_imported/vcpkg/ports/armadillo/portfile.cmake
+++ b/external_imported/vcpkg/ports/armadillo/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_sourceforge(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO arma
     FILENAME "armadillo-${VERSION}.tar.xz"
-    SHA512 b1b9fbce6bdacc3340ab190605aba77e821629e0a51e0c6277840eaf803d037a778b9243c02c5b55d67976c203808a5fc34894f3928b707685f6d8695ef0bc0d
+    SHA512 bf6a3db60256aa9789b52d92b33971a43816e73cd079d08e35350fcb251c213fba59604263595f886c4228147e75dd9308a5208ab9b290bb094128a1aee5da3d
     PATCHES
         cmake-config.patch
         dependencies.patch
diff --git a/external_imported/vcpkg/ports/armadillo/vcpkg.json b/external_imported/vcpkg/ports/armadillo/vcpkg.json
index ad0f2d3b3..92050bc82 100644
--- a/external_imported/vcpkg/ports/armadillo/vcpkg.json
+++ b/external_imported/vcpkg/ports/armadillo/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "armadillo",
-  "version": "12.0.1",
+  "version": "12.6.6",
   "description": "Armadillo is a high quality linear algebra library (matrix maths) for the C++ language, aiming towards a good balance between speed and ease of use",
   "homepage": "https://arma.sourceforge.net/",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/arrayfire/build.patch b/external_imported/vcpkg/ports/arrayfire/build.patch
index b102dea9a..a87c02ffb 100644
--- a/external_imported/vcpkg/ports/arrayfire/build.patch
+++ b/external_imported/vcpkg/ports/arrayfire/build.patch
@@ -218,3 +218,50 @@ index d618ff2..9f51739 100644
        )
  
      set_target_properties(opencl_sort_by_key_${SBK_TYPE}
+diff --git a/src/backend/opencl/CMakeLists.txt b/src/backend/opencl/CMakeLists.txt
+index b543433..9b5923b 100644
+--- a/src/backend/opencl/CMakeLists.txt
++++ b/src/backend/opencl/CMakeLists.txt
+@@ -432,12 +432,9 @@ if(AF_OPENCL_BLAS_LIBRARY STREQUAL "clBLAS")
+     PRIVATE
+       clBLAS::clBLAS)
+ elseif(AF_OPENCL_BLAS_LIBRARY STREQUAL "CLBlast")
+-  include(build_CLBlast)
++  find_package(CLBlast CONFIG REQUIRED)
+   target_compile_definitions(afopencl PRIVATE USE_CLBLAST)
+-  target_link_libraries(afopencl
+-    PRIVATE
+-      CLBlast)
+-    add_dependencies(afopencl CLBlast-ext)
++  target_link_libraries(afopencl PRIVATE clblast)
+ endif()
+
+
+diff --git a/src/backend/opencl/homography.cpp b/src/backend/opencl/homography.cpp
+index 3b598b0..2815923 100644
+--- a/src/backend/opencl/homography.cpp
++++ b/src/backend/opencl/homography.cpp
+@@ -39,7 +39,7 @@ int homography(Array<T> &bestH, const Array<float> &x_src,
+             ::std::min(iter, static_cast<unsigned>(
+                                  log(1.f - LMEDSConfidence) /
+                                  log(1.f - pow(1.f - LMEDSOutlierRatio, 4.f))));
+-        err = createValueArray<float>(af::dim4(nsamples, iter), FLT_MAX);
++        err = createValueArray<float>(af::dim4(nsamples, iter), std::numeric_limits<float>::max());
+     } else {
+         // Avoid passing "null" cl_mem object to kernels
+         err = createEmptyArray<float>(af::dim4(1));
+diff --git a/src/backend/opencl/kernel/homography.hpp b/src/backend/opencl/kernel/homography.hpp
+index b84e599..90d0c80 100644
+--- a/src/backend/opencl/kernel/homography.hpp
++++ b/src/backend/opencl/kernel/homography.hpp
+@@ -39,7 +39,9 @@ std::array<Kernel, 5> getHomographyKernels(const af_homography_type htype) {
+     };
+     options.emplace_back(getTypeBuildDefinition<T>());
+     options.emplace_back(DefineKeyValue(
+-        EPS, (std::is_same<T, double>::value ? DBL_EPSILON : FLT_EPSILON)));
++        EPS, (std::is_same<T, double>::value
++                                 ? std::numeric_limits<double>::epsilon()
++                                 : std::numeric_limits<float>::epsilon())));
+     if (htype == AF_HOMOGRAPHY_RANSAC) {
+         options.emplace_back(DefineKey(RANSAC));
+     }
diff --git a/external_imported/vcpkg/ports/arrayfire/portfile.cmake b/external_imported/vcpkg/ports/arrayfire/portfile.cmake
index 958f2278b..b2522e6f6 100644
--- a/external_imported/vcpkg/ports/arrayfire/portfile.cmake
+++ b/external_imported/vcpkg/ports/arrayfire/portfile.cmake
@@ -96,11 +96,12 @@ vcpkg_copy_pdbs()
 
 vcpkg_cmake_config_fixup()
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/examples")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/LICENSES")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" 
+    "${CURRENT_PACKAGES_DIR}/debug/examples" 
+    "${CURRENT_PACKAGES_DIR}/examples" 
+    "${CURRENT_PACKAGES_DIR}/debug/share" 
+    "${CURRENT_PACKAGES_DIR}/debug/LICENSES")
 
 # Copyright and license
 file(INSTALL "${SOURCE_PATH}/COPYRIGHT.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/arrayfire/vcpkg.json b/external_imported/vcpkg/ports/arrayfire/vcpkg.json
index 1946ba541..b816ea886 100644
--- a/external_imported/vcpkg/ports/arrayfire/vcpkg.json
+++ b/external_imported/vcpkg/ports/arrayfire/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "arrayfire",
   "version-semver": "3.8.0",
-  "port-version": 3,
+  "port-version": 5,
   "description": "ArrayFire is a general-purpose library that simplifies the process of developing software that targets parallel and massively-parallel architectures including CPUs, GPUs, and other hardware acceleration devices.",
   "homepage": "https://github.com/arrayfire/arrayfire",
   "license": "BSD-3-Clause",
@@ -42,6 +42,7 @@
     "opencl": {
       "description": "ArrayFire OpenCL backend",
       "dependencies": [
+        "clblast",
         "clfft",
         "opencl"
       ]
diff --git a/external_imported/vcpkg/ports/arrow/brotli.patch b/external_imported/vcpkg/ports/arrow/brotli.patch
deleted file mode 100644
index 1cb633bb3..000000000
--- a/external_imported/vcpkg/ports/arrow/brotli.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/cpp/cmake_modules/FindBrotli.cmake b/cpp/cmake_modules/FindBrotli.cmake
-index 4053b79ca7..bdca85fab4 100644
---- a/cpp/cmake_modules/FindBrotli.cmake
-+++ b/cpp/cmake_modules/FindBrotli.cmake
-@@ -21,6 +21,23 @@ if(Brotli_FOUND)
-   return()
- endif()
- 
-+if(ARROW_PACAKGE_KIND STREQUAL "vcpkg")
-+  set(find_package_args "")
-+  if(Brotli_FIND_VERSION)
-+    list(APPEND find_package_args ${Brotli_FIND_VERSION})
-+  endif()
-+  if(Brotli_FIND_QUIETLY)
-+    list(APPEND find_package_args QUIET)
-+  endif()
-+  find_package(Brotli NAMES unofficial-brotli ${find_package_args})
-+  if(Brotli_FOUND)
-+    add_library(Brotli::brotlicommon ALIAS unofficial::brotli::brotlicommon)
-+    add_library(Brotli::brotlienc ALIAS unofficial::brotli::brotlienc)
-+    add_library(Brotli::brotlidec ALIAS unofficial::brotli::brotlidec)
-+    return()
-+  endif()
-+endif()
-+
- if(ARROW_BROTLI_USE_SHARED)
-   set(BROTLI_COMMON_LIB_NAMES
-       brotlicommon
diff --git a/external_imported/vcpkg/ports/arrow/fix-ci-error.patch b/external_imported/vcpkg/ports/arrow/fix-ci-error.patch
new file mode 100644
index 000000000..adbe0f866
--- /dev/null
+++ b/external_imported/vcpkg/ports/arrow/fix-ci-error.patch
@@ -0,0 +1,13 @@
+diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
+index eeda520..f55080e 100644
+--- a/cpp/CMakeLists.txt
++++ b/cpp/CMakeLists.txt
+@@ -921,7 +921,7 @@ if(WIN32)
+   list(APPEND ARROW_SYSTEM_LINK_LIBS "ws2_32.dll")
+ endif()
+ 
+-if(NOT WIN32 AND NOT APPLE)
++if(NOT WIN32 AND NOT APPLE AND NOT ANDROID)
+   # Pass -lrt on Linux only
+   list(APPEND ARROW_SYSTEM_LINK_LIBS rt)
+ endif()
diff --git a/external_imported/vcpkg/ports/arrow/fix-dataset.patch b/external_imported/vcpkg/ports/arrow/fix-dataset.patch
deleted file mode 100644
index 24e297215..000000000
--- a/external_imported/vcpkg/ports/arrow/fix-dataset.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/cpp/src/arrow/dataset/CMakeLists.txt b/cpp/src/arrow/dataset/CMakeLists.txt
-index b80370e63985..04f80ab6d1b3 100644
---- a/cpp/src/arrow/dataset/CMakeLists.txt
-+++ b/cpp/src/arrow/dataset/CMakeLists.txt
-@@ -31,6 +31,12 @@ set(ARROW_DATASET_SRCS
-     scanner.cc
-     scan_node.cc)
- 
-+if(ARROW_PARQUET)
-+  set(ARROW_DATASET_PKG_CONFIG_REQUIRES parquet)
-+else()
-+  set(ARROW_DATASET_PKG_CONFIG_REQUIRES arrow)
-+endif()
-+
- set(ARROW_DATASET_STATIC_LINK_LIBS)
- set(ARROW_DATASET_SHARED_LINK_LIBS)
- set(ARROW_DATASET_STATIC_INSTALL_INTERFACE_LIBS)
-diff --git a/cpp/src/arrow/dataset/arrow-dataset.pc.in b/cpp/src/arrow/dataset/arrow-dataset.pc.in
-index 3e474e3825c5..d587fd110c08 100644
---- a/cpp/src/arrow/dataset/arrow-dataset.pc.in
-+++ b/cpp/src/arrow/dataset/arrow-dataset.pc.in
-@@ -22,6 +22,6 @@ libdir=@ARROW_PKG_CONFIG_LIBDIR@
- Name: Apache Arrow Dataset
- Description: Apache Arrow Dataset provides an API to read and write semantic datasets stored in different locations and formats.
- Version: @ARROW_VERSION@
--Requires: arrow parquet
-+Requires: @ARROW_DATASET_PKG_CONFIG_REQUIRES@
- Libs: -L${libdir} -larrow_dataset
- Cflags.private: -DARROW_DS_STATIC
diff --git a/external_imported/vcpkg/ports/arrow/fix-pkgconfig-windows.patch b/external_imported/vcpkg/ports/arrow/fix-pkgconfig-windows.patch
deleted file mode 100644
index eaef423bc..000000000
--- a/external_imported/vcpkg/ports/arrow/fix-pkgconfig-windows.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 109a40a12019e28ecd60bbf9210f9c949c827d31 Mon Sep 17 00:00:00 2001
-From: Luke Elliott <luke.b.elliott@gmail.com>
-Date: Wed, 7 Dec 2022 11:57:57 +0000
-Subject: [PATCH] GH-14869: [C++] Add Cflags.private defining <lib>_STATIC to
- <lib>.pc.in.
-
-Required for Windows usage of static builds via vcpkg & pkgconfig.
----
- cpp/src/arrow/arrow-testing.pc.in               | 1 +
- cpp/src/arrow/arrow.pc.in                       | 1 +
- cpp/src/arrow/dataset/arrow-dataset.pc.in       | 1 +
- cpp/src/arrow/engine/arrow-substrait.pc.in      | 1 +
- cpp/src/arrow/flight/arrow-flight.pc.in         | 1 +
- cpp/src/arrow/flight/sql/arrow-flight-sql.pc.in | 1 +
- cpp/src/gandiva/gandiva.pc.in                   | 1 +
- cpp/src/parquet/parquet.pc.in                   | 1 +
- python/pyarrow/src/arrow-python.pc.in           | 1 +
- 9 files changed, 9 insertions(+)
-
-diff --git a/cpp/src/arrow/arrow-testing.pc.in b/cpp/src/arrow/arrow-testing.pc.in
-index 5a991e796d83..9a452a5d113f 100644
---- a/cpp/src/arrow/arrow-testing.pc.in
-+++ b/cpp/src/arrow/arrow-testing.pc.in
-@@ -27,3 +27,4 @@ Version: @ARROW_VERSION@
- Requires: arrow
- Libs: -L${libdir} -larrow_testing
- Cflags: -I${gtest_includedir}
-+Cflags.private: -DARROW_TESTING_STATIC
-diff --git a/cpp/src/arrow/arrow.pc.in b/cpp/src/arrow/arrow.pc.in
-index 3a5710ab6b88..90c98bf32b2b 100644
---- a/cpp/src/arrow/arrow.pc.in
-+++ b/cpp/src/arrow/arrow.pc.in
-@@ -30,3 +30,4 @@ Requires.private:@ARROW_PC_REQUIRES_PRIVATE@
- Libs: -L${libdir} -larrow
- Libs.private:@ARROW_PC_LIBS_PRIVATE@
- Cflags: -I${includedir}
-+Cflags.private: -DARROW_STATIC
-diff --git a/cpp/src/arrow/dataset/arrow-dataset.pc.in b/cpp/src/arrow/dataset/arrow-dataset.pc.in
-index 7c433321c135..3e474e3825c5 100644
---- a/cpp/src/arrow/dataset/arrow-dataset.pc.in
-+++ b/cpp/src/arrow/dataset/arrow-dataset.pc.in
-@@ -24,3 +24,4 @@ Description: Apache Arrow Dataset provides an API to read and write semantic dat
- Version: @ARROW_VERSION@
- Requires: arrow parquet
- Libs: -L${libdir} -larrow_dataset
-+Cflags.private: -DARROW_DS_STATIC
-diff --git a/cpp/src/arrow/engine/arrow-substrait.pc.in b/cpp/src/arrow/engine/arrow-substrait.pc.in
-index 77ac510933f5..173e1c91efd8 100644
---- a/cpp/src/arrow/engine/arrow-substrait.pc.in
-+++ b/cpp/src/arrow/engine/arrow-substrait.pc.in
-@@ -24,3 +24,4 @@ Description: Apache Arrow's Substrait Consumer.
- Version: @ARROW_VERSION@
- Requires: arrow
- Libs: -L${libdir} -larrow_substrait
-+Cflags.private: -DARROW_ENGINE_STATIC
-diff --git a/cpp/src/arrow/flight/arrow-flight.pc.in b/cpp/src/arrow/flight/arrow-flight.pc.in
-index 955fc19b0df4..5a57a8922377 100644
---- a/cpp/src/arrow/flight/arrow-flight.pc.in
-+++ b/cpp/src/arrow/flight/arrow-flight.pc.in
-@@ -24,3 +24,4 @@ Description: Apache Arrow's RPC system built on gRPC
- Version: @ARROW_VERSION@
- Requires: arrow
- Libs: -L${libdir} -larrow_flight
-+Cflags.private: -DARROW_FLIGHT_STATIC
-diff --git a/cpp/src/arrow/flight/sql/arrow-flight-sql.pc.in b/cpp/src/arrow/flight/sql/arrow-flight-sql.pc.in
-index 4f8398bdd259..b76964b97c89 100644
---- a/cpp/src/arrow/flight/sql/arrow-flight-sql.pc.in
-+++ b/cpp/src/arrow/flight/sql/arrow-flight-sql.pc.in
-@@ -24,3 +24,4 @@ Description: Apache Arrow Flight SQL extension
- Version: @ARROW_VERSION@
- Requires: arrow-flight
- Libs: -L${libdir} -larrow_flight_sql
-+Cflags.private: -DARROW_FLIGHT_SQL_STATIC
-diff --git a/cpp/src/gandiva/gandiva.pc.in b/cpp/src/gandiva/gandiva.pc.in
-index 60034c285790..49260092d297 100644
---- a/cpp/src/gandiva/gandiva.pc.in
-+++ b/cpp/src/gandiva/gandiva.pc.in
-@@ -25,3 +25,4 @@ Version: @GANDIVA_VERSION@
- Requires: arrow
- Libs: -L${libdir} -lgandiva
- Cflags: -I${includedir}
-+Cflags.private: -DGANDIVA_STATIC
-diff --git a/cpp/src/parquet/parquet.pc.in b/cpp/src/parquet/parquet.pc.in
-index e510bb1d6bfc..b992eba81998 100644
---- a/cpp/src/parquet/parquet.pc.in
-+++ b/cpp/src/parquet/parquet.pc.in
-@@ -29,3 +29,4 @@ Version: @ARROW_VERSION@
- Requires: arrow
- Libs: -L${libdir} -lparquet
- Cflags: -I${includedir}
-+Cflags.private: -DPARQUET_STATIC
-diff --git a/python/pyarrow/src/arrow-python.pc.in b/python/pyarrow/src/arrow-python.pc.in
-index c077c7dc84c3..0efd0ad98309 100644
---- a/python/pyarrow/src/arrow-python.pc.in
-+++ b/python/pyarrow/src/arrow-python.pc.in
-@@ -25,3 +25,4 @@ Version: @ARROW_VERSION@
- Requires: arrow
- Libs: -L${libdir} -larrow_python
- Cflags: -I${includedir} -I@PYTHON_INCLUDE_DIRS@
-+Cflags.private: -DARROW_PYTHON_STATIC
diff --git a/external_imported/vcpkg/ports/arrow/portfile.cmake b/external_imported/vcpkg/ports/arrow/portfile.cmake
index 0d40c2736..0c871bc70 100644
--- a/external_imported/vcpkg/ports/arrow/portfile.cmake
+++ b/external_imported/vcpkg/ports/arrow/portfile.cmake
@@ -2,27 +2,28 @@ vcpkg_download_distfile(
     ARCHIVE_PATH
     URLS "https://archive.apache.org/dist/arrow/arrow-${VERSION}/apache-arrow-${VERSION}.tar.gz"
     FILENAME apache-arrow-${VERSION}.tar.gz
-    SHA512 c6198e5c9b8fe5ccd89e445c9252da44d8d7c9e0c8eb5a802fa0cabf89482fddf775ed383bac1acc9331bc3195d21df7ea02c4a73aa6ee163c2959f34175d650
+    SHA512 d5dccaa0907b0e6f2a460e32ae75091942dcb70b51db4aefe2767ee8d99882694607b723a9c06898dda3938d8eb498258d7f9aad11054665b6ea9c2fbaeafa74
 )
 vcpkg_extract_source_archive(
     SOURCE_PATH
     ARCHIVE ${ARCHIVE_PATH}
     PATCHES
-        brotli.patch
         msvc-static-name.patch
-        thrift.patch
         utf8proc.patch
-        fix-pkgconfig-windows.patch # needed for fix-dataset.patch (https://github.com/apache/arrow/pull/14900)
-        fix-dataset.patch # https://github.com/apache/arrow/pull/33665
+        thrift.patch
+        fix-ci-error.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
+        acero       ARROW_ACERO
+        compute     ARROW_COMPUTE
         csv         ARROW_CSV
         cuda        ARROW_CUDA
         dataset     ARROW_DATASET
         filesystem  ARROW_FILESYSTEM
         flight      ARROW_FLIGHT
+        flightsql   ARROW_FLIGHT_SQL
         gcs         ARROW_GCS
         jemalloc    ARROW_JEMALLOC
         json        ARROW_JSON
@@ -30,7 +31,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
         orc         ARROW_ORC
         parquet     ARROW_PARQUET
         parquet     PARQUET_REQUIRE_ENCRYPTION
-        plasma      ARROW_PLASMA
         s3          ARROW_S3
 )
 
@@ -82,6 +82,30 @@ if("dataset" IN_LIST FEATURES)
     )
 endif()
 
+if("acero" IN_LIST FEATURES)
+    vcpkg_cmake_config_fixup(
+        PACKAGE_NAME arrowacero
+        CONFIG_PATH lib/cmake/ArrowAcero
+        DO_NOT_DELETE_PARENT_CONFIG_PATH
+    )
+endif()
+
+if("flight" IN_LIST FEATURES)
+    vcpkg_cmake_config_fixup(
+        PACKAGE_NAME ArrowFlight
+        CONFIG_PATH lib/cmake/ArrowFlight
+        DO_NOT_DELETE_PARENT_CONFIG_PATH
+    )
+endif()
+
+if("flightsql" IN_LIST FEATURES)
+    vcpkg_cmake_config_fixup(
+        PACKAGE_NAME ArrowFlightSql
+        CONFIG_PATH lib/cmake/ArrowFlightSql
+        DO_NOT_DELETE_PARENT_CONFIG_PATH
+    )
+endif()
+
 if("parquet" IN_LIST FEATURES)
     vcpkg_cmake_config_fixup(
         PACKAGE_NAME parquet
@@ -96,17 +120,31 @@ if("parquet" IN_LIST FEATURES)
     file(READ "${CMAKE_CURRENT_LIST_DIR}/usage-parquet" usage-parquet)
     file(APPEND "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" "${usage-parquet}")
 endif()
+if("dataset" IN_LIST FEATURES)
+    file(READ "${CMAKE_CURRENT_LIST_DIR}/usage-dataset" usage-dataset)
+    file(APPEND "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" "${usage-dataset}")
+endif()
+if("acero" IN_LIST FEATURES)
+    file(READ "${CMAKE_CURRENT_LIST_DIR}/usage-acero" usage-acero)
+    file(APPEND "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" "${usage-acero}")
+endif()
 
-if("example" IN_LIST FEATURES)
-    file(INSTALL "${SOURCE_PATH}/cpp/examples/minimal_build/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/example")
+if("flight" IN_LIST FEATURES)
+    file(READ "${CMAKE_CURRENT_LIST_DIR}/usage-flight" usage-flight)
+    file(APPEND "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" "${usage-flight}")
+endif()
+
+if("flightsql" IN_LIST FEATURES)
+    file(READ "${CMAKE_CURRENT_LIST_DIR}/usage-flightsql" usage-flightsql)
+    file(APPEND "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" "${usage-flightsql}")
 endif()
 
-if("plasma" IN_LIST FEATURES)
-    vcpkg_copy_tools(TOOL_NAMES plasma-store-server AUTO_CLEAN)
+if("example" IN_LIST FEATURES)
+    file(INSTALL "${SOURCE_PATH}/cpp/examples/minimal_build/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/example")
 endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc")
 
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt" "${SOURCE_PATH}/NOTICE.txt")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/external_imported/vcpkg/ports/arrow/thrift.patch b/external_imported/vcpkg/ports/arrow/thrift.patch
index 985da8bcb..7c81e23db 100644
--- a/external_imported/vcpkg/ports/arrow/thrift.patch
+++ b/external_imported/vcpkg/ports/arrow/thrift.patch
@@ -1,62 +1,22 @@
-diff --git a/cpp/cmake_modules/FindThrift.cmake b/cpp/cmake_modules/FindThriftAlt.cmake
-similarity index 91%
-rename from cpp/cmake_modules/FindThrift.cmake
-rename to cpp/cmake_modules/FindThriftAlt.cmake
-index 2f20a5cb59..e317e2c7c4 100644
---- a/cpp/cmake_modules/FindThrift.cmake
+diff --git a/cpp/cmake_modules/FindThriftAlt.cmake b/cpp/cmake_modules/FindThriftAlt.cmake
+index f3e4902..65ceac8 100644
+--- a/cpp/cmake_modules/FindThriftAlt.cmake
 +++ b/cpp/cmake_modules/FindThriftAlt.cmake
-@@ -28,7 +28,23 @@
- #  thrift::thrift, a library target to use Thrift
- #  thrift::compiler, a executable target to use Thrift compiler
- 
-+if(ThriftAlt_FOUND)
-+  return()
-+endif()
+@@ -45,7 +45,7 @@ endif()
+ #   * https://github.com/apache/thrift/pull/2725
+ #   * https://github.com/apache/thrift/pull/2726
+ #   * https://github.com/conda-forge/thrift-cpp-feedstock/issues/68
+-if(NOT WIN32)
++
+   set(find_package_args "")
+   if(ThriftAlt_FIND_VERSION)
+     list(APPEND find_package_args ${ThriftAlt_FIND_VERSION})
+@@ -61,7 +61,7 @@ if(NOT WIN32)
+                                                       "${THRIFT_COMPILER}")
+     return()
+   endif()
+-endif()
 +
-+set(find_package_args "")
-+if(ThriftAlt_FIND_VERSION)
-+  list(APPEND find_package_args ${ThriftAlt_FIND_VERSION})
-+endif()
-+if(ThriftAlt_FIND_QUIETLY)
-+  list(APPEND find_package_args QUIET)
-+endif()
-+find_package(Thrift ${find_package_args})
- if(Thrift_FOUND)
-+  set(ThriftAlt_FOUND TRUE)
-+  add_executable(thrift::compiler IMPORTED)
-+  set_target_properties(thrift::compiler PROPERTIES IMPORTED_LOCATION
-+                                                    "${THRIFT_COMPILER}")
-   return()
- endif()
- 
-@@ -133,12 +149,12 @@ else()
- endif()
- 
- find_package_handle_standard_args(
--  Thrift
-+  ThriftAlt
-   REQUIRED_VARS THRIFT_LIB THRIFT_INCLUDE_DIR
-   VERSION_VAR Thrift_VERSION
-   HANDLE_COMPONENTS)
- 
--if(Thrift_FOUND)
-+if(ThriftAlt_FOUND)
-   if(ARROW_THRIFT_USE_SHARED)
-     add_library(thrift::thrift SHARED IMPORTED)
-   else()
-diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
-index b7cd31f3d7..72b8cfe286 100644
---- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
-+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
-@@ -1510,8 +1510,10 @@ macro(build_thrift)
- endmacro()
  
- if(ARROW_WITH_THRIFT)
--  # Thrift c++ code generated by 0.13 requires 0.11 or greater
-+  # Thrift C++ code generated by 0.13 requires 0.11 or greater
-   resolve_dependency(Thrift
-+                     HAVE_ALT
-+                     TRUE
-                      REQUIRED_VERSION
-                      0.11.0
-                      PC_PACKAGE_NAMES
+ function(extract_thrift_version)
+   if(ThriftAlt_INCLUDE_DIR)
diff --git a/external_imported/vcpkg/ports/arrow/usage-acero b/external_imported/vcpkg/ports/arrow/usage-acero
new file mode 100644
index 000000000..bde5ef80d
--- /dev/null
+++ b/external_imported/vcpkg/ports/arrow/usage-acero
@@ -0,0 +1,3 @@
+
+    find_package(ArrowAcero CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE "$<IF:$<BOOL:${ARROW_BUILD_STATIC}>,ArrowAcero::arrow_acero_static,ArrowAcero::arrow_acero_shared>")
diff --git a/external_imported/vcpkg/ports/arrow/usage-dataset b/external_imported/vcpkg/ports/arrow/usage-dataset
new file mode 100644
index 000000000..dcb9bda46
--- /dev/null
+++ b/external_imported/vcpkg/ports/arrow/usage-dataset
@@ -0,0 +1,3 @@
+
+    find_package(ArrowDataset CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE "$<IF:$<BOOL:${ARROW_BUILD_STATIC}>,ArrowDataset::arrow_dataset_static,ArrowDataset::arrow_dataset_shared>")
diff --git a/external_imported/vcpkg/ports/arrow/usage-flight b/external_imported/vcpkg/ports/arrow/usage-flight
new file mode 100644
index 000000000..69abcf6c0
--- /dev/null
+++ b/external_imported/vcpkg/ports/arrow/usage-flight
@@ -0,0 +1,3 @@
+
+    find_package(ArrowFlight CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE "$<IF:$<BOOL:${ARROW_BUILD_STATIC}>,ArrowFlight::arrow_flight_static,ArrowFlight::arrow_flight_shared>")
diff --git a/external_imported/vcpkg/ports/arrow/usage-flightsql b/external_imported/vcpkg/ports/arrow/usage-flightsql
new file mode 100644
index 000000000..2f7e9cf1f
--- /dev/null
+++ b/external_imported/vcpkg/ports/arrow/usage-flightsql
@@ -0,0 +1,3 @@
+
+    find_package(ArrowFlightSql CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE "$<IF:$<BOOL:${ARROW_BUILD_STATIC}>,ArrowFlightSql::arrow_flight_sql_static,ArrowFlightSql::arrow_flight_sql_shared>")
diff --git a/external_imported/vcpkg/ports/arrow/utf8proc.patch b/external_imported/vcpkg/ports/arrow/utf8proc.patch
index e36a50405..eea9ca59e 100644
--- a/external_imported/vcpkg/ports/arrow/utf8proc.patch
+++ b/external_imported/vcpkg/ports/arrow/utf8proc.patch
@@ -1,26 +1,13 @@
 diff --git a/cpp/cmake_modules/Findutf8proc.cmake b/cpp/cmake_modules/Findutf8proc.cmake
-index 2f0f59a02c..f5382a8f21 100644
+index e347414..83f2aa1 100644
 --- a/cpp/cmake_modules/Findutf8proc.cmake
 +++ b/cpp/cmake_modules/Findutf8proc.cmake
-@@ -19,6 +19,21 @@ if(utf8proc_FOUND)
-   return()
- endif()
- 
-+if(ARROW_PACAKGE_KIND STREQUAL "vcpkg")
-+  set(find_package_args "")
-+  if(utf8proc_FIND_VERSION)
-+    list(APPEND find_package_args ${utf8proc_FIND_VERSION})
-+  endif()
-+  if(utf8proc_FIND_QUIETLY)
-+    list(APPEND find_package_args QUIET)
-+  endif()
-+  find_package(utf8proc NAMES unofficial-utf8proc ${find_package_args})
-+  if(utf8proc_FOUND)
-+    add_library(utf8proc::utf8proc ALIAS utf8proc)
-+    return()
-+  endif()
-+endif()
-+
- function(extract_utf8proc_version)
-   if(utf8proc_INCLUDE_DIR)
-     file(READ "${utf8proc_INCLUDE_DIR}/utf8proc.h" UTF8PROC_H_CONTENT)
+@@ -30,7 +30,7 @@ if(ARROW_PACKAGE_KIND STREQUAL "vcpkg")
+   if(utf8proc_FIND_REQUIRED)
+     list(APPEND find_package_args REQUIRED)
+   endif()
+-  find_package(utf8proc NAMES unofficial-utf8proc ${find_package_args})
++  find_package(utf8proc NAMES unofficial-utf8proc)
+   if(utf8proc_FOUND)
+     add_library(utf8proc::utf8proc ALIAS utf8proc)
+     return()
diff --git a/external_imported/vcpkg/ports/arrow/vcpkg.json b/external_imported/vcpkg/ports/arrow/vcpkg.json
index 74cb06d57..25dc699e6 100644
--- a/external_imported/vcpkg/ports/arrow/vcpkg.json
+++ b/external_imported/vcpkg/ports/arrow/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "arrow",
-  "version": "10.0.1",
-  "port-version": 4,
+  "version": "15.0.0",
   "description": "Cross-language development platform for in-memory analytics",
   "homepage": "https://arrow.apache.org",
   "license": "Apache-2.0",
@@ -38,6 +37,12 @@
     "parquet"
   ],
   "features": {
+    "acero": {
+      "description": "Acero support"
+    },
+    "compute": {
+      "description": "Build all computational kernel functions"
+    },
     "csv": {
       "description": "CSV support"
     },
@@ -65,6 +70,18 @@
         "protobuf"
       ]
     },
+    "flightsql": {
+      "description": "FlightSQL support",
+      "dependencies": [
+        {
+          "name": "arrow",
+          "default-features": false,
+          "features": [
+            "flight"
+          ]
+        }
+      ]
+    },
     "gcs": {
       "description": "GCS support",
       "dependencies": [
@@ -103,10 +120,6 @@
         "rapidjson"
       ]
     },
-    "plasma": {
-      "description": "Plasma support",
-      "supports": "!windows"
-    },
     "s3": {
       "description": "S3 support",
       "dependencies": [
diff --git a/external_imported/vcpkg/ports/ashes/portfile.cmake b/external_imported/vcpkg/ports/ashes/portfile.cmake
index ddfea4593..be6734486 100644
--- a/external_imported/vcpkg/ports/ashes/portfile.cmake
+++ b/external_imported/vcpkg/ports/ashes/portfile.cmake
@@ -1,24 +1,29 @@
-vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO DragonJoker/Ashes
-    REF 0f8ad8edec1b0929ebd10247d3dd0a9ee8f8c91a
+    REF c532e8ff5b6f64150d24348ef40a02df4e692017
     HEAD_REF master
-    SHA512 9f34c2f6760a74eb34fc02c5007af41a089ac8b01716f1ba3670014984ab277f02c4bbf14ce3f5996a164d24c1eb8edd525cb1c5da9fc0edbf2ccce3024cb11a
+    SHA512 1c5833ce898532b3ae87961743a921223e08bd80c25ef33155ee11c241f2eaca9047f2cfca8d2661bd3302d22acabc4cf13ccccd2f25a48c4ebc9976ad193c24
 )
 
 vcpkg_from_github(
     OUT_SOURCE_PATH CMAKE_SOURCE_PATH
     REPO DragonJoker/CMakeUtils
-    REF 77734eff73c8bb9861591a9e910f34f2bafa5563
+    REF 988f2aab2257175e8fb15a33a3a350ff92d25b89
     HEAD_REF master
-    SHA512 f6110eafc8476f41490f7f9087a83ddf90d21f3cbf455edafd02e4805d3dd7f22ed955b8cba8a26600f080de06b19ce6c712e36f03c825fd3c4015b74d030e72
+    SHA512 961370c110e77f67ed6f426d410335636ca3b5812ba1837662cc5fea403791cafa443c1a25144b92aed5edfc5928eb6e706883ea7f1e68de1123845cb89acb86
 )
 
 file(REMOVE_RECURSE "${SOURCE_PATH}/CMake")
 file(COPY "${CMAKE_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/CMake")
 
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        direct3d11 ASHES_BUILD_RENDERER_D3D11
+        opengl     ASHES_BUILD_RENDERER_OGL
+        vulkan     ASHES_BUILD_RENDERER_VKN
+)
+
 vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS
@@ -27,6 +32,7 @@ vcpkg_cmake_configure(
         -DASHES_BUILD_TESTS=OFF
         -DASHES_BUILD_INFO=OFF
         -DASHES_BUILD_SAMPLES=OFF
+        ${FEATURE_OPTIONS}
 )
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/ashes/vcpkg.json b/external_imported/vcpkg/ports/ashes/vcpkg.json
index 6924e9793..f7063b205 100644
--- a/external_imported/vcpkg/ports/ashes/vcpkg.json
+++ b/external_imported/vcpkg/ports/ashes/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "ashes",
-  "version-date": "2022-06-08",
+  "version-date": "2023-03-12",
   "description": "Drop-in replacement to Vulkan's shared library, allowing the use of OpenGL or Direct3D11 in addition to Vulkan.",
   "homepage": "https://github.com/DragonJoker/Ashes",
   "license": "MIT",
-  "supports": "!osx & !linux & !ios & !android & !uwp & !x86 & !arm & !static",
+  "supports": "!ios & !android & !uwp & !x86 & !arm32 & !static",
   "dependencies": [
     "opengl",
     "spirv-cross",
@@ -17,5 +17,20 @@
       "host": true
     },
     "vulkan-headers"
-  ]
+  ],
+  "default-features": [
+    "opengl",
+    "vulkan"
+  ],
+  "features": {
+    "direct3d11": {
+      "description": "Compiles Direct3D11 renderer."
+    },
+    "opengl": {
+      "description": "Compiles OpenGL renderer."
+    },
+    "vulkan": {
+      "description": "Compiles Vulkan renderer."
+    }
+  }
 }
diff --git a/external_imported/vcpkg/ports/asio-grpc/portfile.cmake b/external_imported/vcpkg/ports/asio-grpc/portfile.cmake
index bc659fe82..30cad8c8a 100644
--- a/external_imported/vcpkg/ports/asio-grpc/portfile.cmake
+++ b/external_imported/vcpkg/ports/asio-grpc/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Tradias/asio-grpc
     REF "v${VERSION}"
-    SHA512 88d98cfb41c6cb10bdf5c235417cae9a495901271bcc8d4073d4d89b10cc59bed2f076435c5a1e44e8639a6067b73b290fb2c4d71416c16e77b61191b065cbd0
+    SHA512 bb5358c6d64e1e7afaa644dda76a22a0a8b724ecfb9e2ac26a5fb2d4d506df10f09f8866d71713daf79ea0cd808eacecc027a3e925376ed1c1ca544f95656a8a
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/asio-grpc/usage b/external_imported/vcpkg/ports/asio-grpc/usage
index bb11c4a93..a34fbb416 100644
--- a/external_imported/vcpkg/ports/asio-grpc/usage
+++ b/external_imported/vcpkg/ports/asio-grpc/usage
@@ -13,3 +13,7 @@ The standalone Asio backend. Install "asio" and link with:
 The libunifex backend. Install "libunifex" and link with:
 
     target_link_libraries(main PRIVATE asio-grpc::asio-grpc-unifex)
+
+The stdexec backend. Install "stdexec" and link with:
+
+    target_link_libraries(main PRIVATE asio-grpc::asio-grpc-stdexec)
diff --git a/external_imported/vcpkg/ports/asio-grpc/vcpkg.json b/external_imported/vcpkg/ports/asio-grpc/vcpkg.json
index 678f96b74..26fbbbf2e 100644
--- a/external_imported/vcpkg/ports/asio-grpc/vcpkg.json
+++ b/external_imported/vcpkg/ports/asio-grpc/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "asio-grpc",
-  "version": "2.5.1",
+  "version": "2.9.2",
   "description": "Asynchronous gRPC with Asio/unified executors",
   "homepage": "https://github.com/Tradias/asio-grpc",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/asio/portfile.cmake b/external_imported/vcpkg/ports/asio/portfile.cmake
index ee176cca7..3a99e5455 100644
--- a/external_imported/vcpkg/ports/asio/portfile.cmake
+++ b/external_imported/vcpkg/ports/asio/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO chriskohlhoff/asio
-    REF asio-1-24-0
-    SHA512 a5d6e597e5611b7293375965f37c09cb73e27639ebdda6163557fab8bbff2ddbb301080ad86ff7f97e8ed8454da25176385cfc43103447a4a04e35a9c41aec3e
+    REF asio-1-29-0
+    SHA512 f8df39c5a5e89dcfe4bd37c7e757e44e3e94d9b79d7ab08d1804ad8980993a607070f7e12238ffe3286840cd08c0b3c8e3639d3a1177e5ff795994cbc42a8292
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/asio/vcpkg.json b/external_imported/vcpkg/ports/asio/vcpkg.json
index 38c777dda..e6741a20d 100644
--- a/external_imported/vcpkg/ports/asio/vcpkg.json
+++ b/external_imported/vcpkg/ports/asio/vcpkg.json
@@ -1,10 +1,9 @@
 {
   "name": "asio",
-  "version": "1.24.0",
-  "port-version": 1,
+  "version": "1.29.0",
   "description": "Asio is a cross-platform C++ library for network and low-level I/O programming that provides developers with a consistent asynchronous model using a modern C++ approach.",
   "homepage": "https://github.com/chriskohlhoff/asio",
-  "documentation": "https://think-async.com/Asio/asio-1.24.0/doc/",
+  "documentation": "https://think-async.com/Asio/asio-1.28.0/doc/",
   "license": "BSL-1.0",
   "dependencies": [
     {
diff --git a/external_imported/vcpkg/ports/asiochan/portfile.cmake b/external_imported/vcpkg/ports/asiochan/portfile.cmake
new file mode 100644
index 000000000..875688e08
--- /dev/null
+++ b/external_imported/vcpkg/ports/asiochan/portfile.cmake
@@ -0,0 +1,12 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO MiSo1289/asiochan
+    REF 837d7eb78ca9796af800ca3cd91ce0a8fe297785
+    SHA512 58e1e3291dc980ed59b0bc1fdcaa35db007e0044f4cbd352917caefa2d30b0c76a3db180091c1895867a3d026ce69f3a82b33dde3970cba5bef596620a2b20f8
+    HEAD_REF master
+)
+
+file(COPY "${SOURCE_PATH}/include" DESTINATION "${CURRENT_PACKAGES_DIR}")
+
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/asiochan/usage b/external_imported/vcpkg/ports/asiochan/usage
new file mode 100644
index 000000000..31954af04
--- /dev/null
+++ b/external_imported/vcpkg/ports/asiochan/usage
@@ -0,0 +1,12 @@
+asiochan is header-only and can be used from CMake via:
+
+    find_path(ASIOCHAN_INCLUDE_DIRS "asiochan/asiochan.hpp")
+    target_include_directories(main PRIVATE ${ASIOCHAN_INCLUDE_DIRS})
+
+By default asiochan depend on boost/asio. If you need use standalone asio instead, please define micro ASIOCHAN_USE_STANDALONE_ASIO. 
+For example:
+
+    find_path(ASIOCHAN_INCLUDE_DIRS "asiochan/asiochan.hpp")
+    target_compile_definitions(main PRIVATE ASIOCHAN_USE_STANDALONE_ASIO)
+    target_include_directories(main PRIVATE ${ASIOCHAN_INCLUDE_DIRS})
+
diff --git a/external_imported/vcpkg/ports/asiochan/vcpkg.json b/external_imported/vcpkg/ports/asiochan/vcpkg.json
new file mode 100644
index 000000000..6dd3109ba
--- /dev/null
+++ b/external_imported/vcpkg/ports/asiochan/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "asiochan",
+  "version-date": "2022-11-25",
+  "description": "C++20 coroutine channels for ASIO",
+  "homepage": "https://github.com/MiSo1289/asiochan",
+  "license": "MIT"
+}
diff --git a/external_imported/vcpkg/ports/asiosdk/portfile.cmake b/external_imported/vcpkg/ports/asiosdk/portfile.cmake
index a57601641..3d3c2415a 100644
--- a/external_imported/vcpkg/ports/asiosdk/portfile.cmake
+++ b/external_imported/vcpkg/ports/asiosdk/portfile.cmake
@@ -1,29 +1,32 @@
-set(VERSION 2.3.3)
-
 vcpkg_download_distfile(ARCHIVE
     URLS "https://download.steinberg.net/sdk_downloads/asiosdk_2.3.3_2019-06-14.zip"
-    FILENAME "asiosdk_2.3.3_2019-06-14-eac6c1a57829.zip"
-	SHA512 eac6c1a57829b7f722a681c54b2f6469d54695523f08f727d0dd6744dcd7fce4f3249c57689bb15ed7a8bcb912833b226439d800913e122e0ef9ab73672f6542
+    FILENAME "asiosdk_2.3.3_2019-06-14-d74c0bc09162.zip"
+    SHA512 d74c0bc09162640a377aaab2f2ce716f9ee7a6ef8d1aa1aa6bc223a4748c60fa900cc77b1cf6db66f8a4064a074b31a71d75cccc7de3634347865238d9c039af
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
-    REF ${VERSION}
+vcpkg_extract_source_archive(
+    SOURCE_PATH
+    ARCHIVE "${ARCHIVE}"
+    SOURCE_BASE "${VERSION}"
 )
 
-file(INSTALL ${SOURCE_PATH}/asio/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/asiosdk/asio)
-file(INSTALL ${SOURCE_PATH}/common/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/asiosdk/common)
-file(INSTALL ${SOURCE_PATH}/driver/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/asiosdk/driver)
-file(INSTALL ${SOURCE_PATH}/host/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/asiosdk/host)
-file(INSTALL ${SOURCE_PATH}/readme.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(INSTALL ${SOURCE_PATH}/readme.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-file(INSTALL ${SOURCE_PATH}/changes.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(INSTALL "${SOURCE_PATH}/Steinberg ASIO Logo Artwork.zip" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(INSTALL "${SOURCE_PATH}/Steinberg ASIO 2.3.3 Licensing Agreement 2.0.1 - 2019.pdf" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(INSTALL "${SOURCE_PATH}/ASIO SDK 2.3.pdf" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(INSTALL "${SOURCE_PATH}/asio/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/asio")
+file(INSTALL "${SOURCE_PATH}/common/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/common")
+file(INSTALL "${SOURCE_PATH}/driver/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/driver")
+file(INSTALL "${SOURCE_PATH}/host/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/host")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/readme.txt")
 
-file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/Findasiosdk.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(
+    INSTALL
+        "${SOURCE_PATH}/changes.txt"
+        "${SOURCE_PATH}/Steinberg ASIO Logo Artwork.zip"
+        "${SOURCE_PATH}/Steinberg ASIO 2.3.3 Licensing Agreement V2.0.3 - 2023.pdf"
+        "${SOURCE_PATH}/ASIO SDK 2.3.pdf"
+        "${CMAKE_CURRENT_LIST_DIR}/Findasiosdk.cmake"
+        "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake"
+    DESTINATION
+        "${CURRENT_PACKAGES_DIR}/share/${PORT}"
+)
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/asiosdk/usage b/external_imported/vcpkg/ports/asiosdk/usage
index 1afa2ae84..3827cfa3d 100644
--- a/external_imported/vcpkg/ports/asiosdk/usage
+++ b/external_imported/vcpkg/ports/asiosdk/usage
@@ -1,4 +1,4 @@
 The package asiosdk provides CMake integration:
 
     find_package(asiosdk REQUIRED)
-    target_include_directories(<my_target> PRIVATE ${ASIOSDK_INCLUDE_DIRS})
+    target_include_directories(main PRIVATE ${ASIOSDK_INCLUDE_DIR})
diff --git a/external_imported/vcpkg/ports/asiosdk/vcpkg.json b/external_imported/vcpkg/ports/asiosdk/vcpkg.json
index 55f3f5b4f..dc44bde07 100644
--- a/external_imported/vcpkg/ports/asiosdk/vcpkg.json
+++ b/external_imported/vcpkg/ports/asiosdk/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "asiosdk",
   "version": "2.3.3",
-  "port-version": 5,
+  "port-version": 7,
   "description": "ASIO is a low latency audio API from Steinberg.",
   "homepage": "https://www.steinberg.net/en/company/developers.html",
   "supports": "windows & !(arm | uwp)"
diff --git a/external_imported/vcpkg/ports/asmjit/portfile.cmake b/external_imported/vcpkg/ports/asmjit/portfile.cmake
index ffcdcd59a..007c0635d 100644
--- a/external_imported/vcpkg/ports/asmjit/portfile.cmake
+++ b/external_imported/vcpkg/ports/asmjit/portfile.cmake
@@ -1,9 +1,9 @@
 vcpkg_from_github(
-  OUT_SOURCE_PATH SOURCE_PATH
-  REPO asmjit/asmjit
-  REF d0d14ac774977d0060a351f66e35cb57ba0bf59c # accessed on 2021-10-26
-  SHA512 2822763fcb3c18f6699119c1773404667d81f8afb86f8f2e8dbe627526a2877b049d16505557e680e4e310f0e0667263dc4ac442f682e95f2568bf0bf8b61b4b
-  HEAD_REF master
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO asmjit/asmjit
+    REF 51b10b19b6631434d3f9ad536a6fb140944a36d2 # commited on 2023-03-25
+    SHA512 1fba5159d2adad64e9a2b07a1f90de6988d1da47b9802ca8b57c61a89d8a90924525f6d0d6607279994bdbadcf693b2cc96cd7e4bf7f018ad64127b640dc38fb
+    HEAD_REF master
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ASMJIT_STATIC)
@@ -28,4 +28,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     )
 endif()
 
-file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
diff --git a/external_imported/vcpkg/ports/asmjit/vcpkg.json b/external_imported/vcpkg/ports/asmjit/vcpkg.json
index bf0644109..fedfb2c7f 100644
--- a/external_imported/vcpkg/ports/asmjit/vcpkg.json
+++ b/external_imported/vcpkg/ports/asmjit/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "asmjit",
-  "version-date": "2021-10-26",
-  "port-version": 1,
+  "version-date": "2023-03-25",
   "description": "Complete x86/x64 JIT and Remote Assembler for C++",
   "homepage": "https://github.com/asmjit/asmjit",
   "supports": "!arm",
diff --git a/external_imported/vcpkg/ports/asmtk/fix-link-amsjit.patch b/external_imported/vcpkg/ports/asmtk/fix-link-amsjit.patch
new file mode 100644
index 000000000..720afbe94
--- /dev/null
+++ b/external_imported/vcpkg/ports/asmtk/fix-link-amsjit.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d348072..d5b6be9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -172,7 +172,7 @@ if (NOT ASMTK_EMBED)
+     $<$<NOT:$<CONFIG:Debug>>:${ASMTK_PRIVATE_CFLAGS_REL}>)
+ 
+   if(ASMJIT_EXTERNAL)
+-    target_link_libraries(asmtk PUBLIC ${ASMJIT_LIBRARY})
++    target_link_libraries(asmtk PUBLIC asmjit::asmjit)
+     find_path(ASMJIT_INCLUDE_DIR NAMES asmjit/asmjit.h)
+     target_include_directories(asmtk PRIVATE ${ASMJIT_INCLUDE_DIR})
+   else()
diff --git a/external_imported/vcpkg/ports/asmtk/portfile.cmake b/external_imported/vcpkg/ports/asmtk/portfile.cmake
new file mode 100644
index 000000000..4c0f6c959
--- /dev/null
+++ b/external_imported/vcpkg/ports/asmtk/portfile.cmake
@@ -0,0 +1,37 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO asmjit/asmtk
+    REF 425b108d3afe510f8b94ca5523cd31ae29381422 # accessed on 2022-11-06
+    SHA512 d825f488c66dca9ca4c3279992e4ea36a4d1b7ad65fa3e0c70b151ce0d2b1f9b5ad053ff1d447da38475bf843fe3b130706e3c9916a64f76560add9c8d796a5b
+    HEAD_REF master
+    PATCHES
+      fix-link-amsjit.patch
+)
+
+set(ASMJIT_EXTERNAL ON)
+set(ASMTK_EMBED OFF)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ASMTK_STATIC)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DASMTK_STATIC=${ASMTK_STATIC}
+        -DASMJIT_EXTERNAL=${ASMJIT_EXTERNAL}
+        -DASMTK_EMBED=${ASMTK_EMBED}
+)
+
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/asmtk)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+  vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/asmtk/globals.h" "!defined(ASMTK_STATIC)" "0")
+endif()
+
+set(cmakefile "${CURRENT_PACKAGES_DIR}/share/asmtk/asmtk-config.cmake")
+file(READ "${cmakefile}" contents)
+file(WRITE "${cmakefile}" "include(CMakeFindDependencyMacro)\nfind_dependency(asmjit)\n${contents}")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
diff --git a/external_imported/vcpkg/ports/asmtk/vcpkg.json b/external_imported/vcpkg/ports/asmtk/vcpkg.json
new file mode 100644
index 000000000..ab7714643
--- /dev/null
+++ b/external_imported/vcpkg/ports/asmtk/vcpkg.json
@@ -0,0 +1,19 @@
+{
+  "name": "asmtk",
+  "version-date": "2022-11-06",
+  "port-version": 1,
+  "description": "Assembler toolkit based on AsmJit ",
+  "homepage": "https://github.com/asmjit/asmtk",
+  "supports": "!arm",
+  "dependencies": [
+    "asmjit",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/assimp/build_fixes.patch b/external_imported/vcpkg/ports/assimp/build_fixes.patch
index 93d007cd8..f3bab0ed7 100644
--- a/external_imported/vcpkg/ports/assimp/build_fixes.patch
+++ b/external_imported/vcpkg/ports/assimp/build_fixes.patch
@@ -2,39 +2,19 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 458a328..b8c2fc6 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -56,7 +56,7 @@ IF(ASSIMP_HUNTER_ENABLED)
-   add_definitions(-DASSIMP_USE_HUNTER)
- ENDIF()
- 
--PROJECT(Assimp VERSION 5.2.4)
-+PROJECT(Assimp VERSION 5.2.5)
- 
- # All supported options ###############################################
- 
-@@ -273,18 +273,18 @@ IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT MINGW)
- ELSEIF(MSVC)
-   # enable multi-core compilation with MSVC
-   IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) # clang-cl
--    ADD_COMPILE_OPTIONS(/bigobj /W4 /WX )
-+    ADD_COMPILE_OPTIONS(/bigobj )
-   ELSE() # msvc
--    ADD_COMPILE_OPTIONS(/MP /bigobj /W4 /WX)
-+    ADD_COMPILE_OPTIONS(/MP /bigobj )
-   ENDIF()
-   # disable "elements of array '' will be default initialized" warning on MSVC2013
-   IF(MSVC12)
-     ADD_COMPILE_OPTIONS(/wd4351)	
+@@ -291,9 +291,9 @@ IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT MINGW)
    ENDIF()
-   ADD_COMPILE_OPTIONS(/wd4244) #supress warning for double to float conversion if Double precission is activated
+   # supress warning for double to float conversion if Double precission is activated
+   ADD_COMPILE_OPTIONS(/wd4244) 
 -  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /D_DEBUG /Zi /Od")
--  SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi")
+-  SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
 -  SET(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG:FULL /PDBALTPATH:%_PDB% /OPT:REF /OPT:ICF")
 +  # SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /D_DEBUG /Zi /Od")
-+  # SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi")
++  # SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
 +  # SET(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG:FULL /PDBALTPATH:%_PDB% /OPT:REF /OPT:ICF")
  ELSEIF (CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
    IF(NOT ASSIMP_HUNTER_ENABLED)
-     SET(CMAKE_CXX_STANDARD 17)
+     SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
 @@ -418,7 +418,7 @@ ENDIF()
  
  set(GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated")
@@ -100,10 +80,10 @@ index 6551dcb..0796448 100644
 +find_dependency(pugixml CONFIG)
 +if(NOT @BUILD_SHARED_LIBS@)
 +    find_dependency(kubazip CONFIG)
-+    find_dependency(minizip CONFIG)
++    find_dependency(unofficial-minizip CONFIG)
 +    #find_dependency(openddlparser CONFIG)
 +    find_dependency(poly2tri CONFIG)
-+    #find_dependency(polyclipping  CONFIG)
++    find_dependency(polyclipping CONFIG)
 +    find_dependency(RapidJSON CONFIG)
 +    find_dependency(Stb MODULE)
 +    find_dependency(utf8cpp CONFIG)
@@ -130,28 +110,30 @@ diff --git a/code/AssetLib/Blender/BlenderTessellator.h b/code/AssetLib/Blender/
 index 0d0ba32..c3703c4 100644
 --- a/code/AssetLib/Blender/BlenderTessellator.h
 +++ b/code/AssetLib/Blender/BlenderTessellator.h
-@@ -147,7 +147,7 @@ namespace Assimp
- #ifdef ASSIMP_USE_HUNTER
- #  include <poly2tri/poly2tri.h>
- #else
--#  include "../contrib/poly2tri/poly2tri/poly2tri.h"
-+#  include <poly2tri/poly2tri.h>
- #endif
+@@ -143,7 +143,7 @@ namespace Assimp
+ 
+ #if ASSIMP_BLEND_WITH_POLY_2_TRI
+ 
+-#include "contrib/poly2tri/poly2tri/poly2tri.h"
++#include <poly2tri/poly2tri.h>
  
  namespace Assimp
+ {
 diff --git a/code/AssetLib/IFC/IFCGeometry.cpp b/code/AssetLib/IFC/IFCGeometry.cpp
 index ef59542..17e00cd 100644
 --- a/code/AssetLib/IFC/IFCGeometry.cpp
 +++ b/code/AssetLib/IFC/IFCGeometry.cpp
-@@ -53,7 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #  include <poly2tri/poly2tri.h>
- #  include <polyclipping/clipper.hpp>
- #else
--#  include "../contrib/poly2tri/poly2tri/poly2tri.h"
-+#  include <poly2tri/poly2tri.h>
- #  include "../contrib/clipper/clipper.hpp"
- #endif
- 
+@@ -45,8 +45,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #include "IFCUtil.h"
+ #include "Common/PolyTools.h"
+ #include "PostProcessing/ProcessHelper.h"
+-#include "contrib/poly2tri/poly2tri/poly2tri.h"
+-#include "contrib/clipper/clipper.hpp"
++#include <poly2tri/poly2tri.h>
++#include <polyclipping/clipper.hpp>
+ 
+ #include <iterator>
+ #include <memory>
 diff --git a/code/AssetLib/IFC/IFCLoader.cpp b/code/AssetLib/IFC/IFCLoader.cpp
 index 0c20686..e6b20a3 100644
 --- a/code/AssetLib/IFC/IFCLoader.cpp
@@ -169,15 +151,17 @@ diff --git a/code/AssetLib/IFC/IFCOpenings.cpp b/code/AssetLib/IFC/IFCOpenings.c
 index 3c4a0b3..3fab616 100644
 --- a/code/AssetLib/IFC/IFCOpenings.cpp
 +++ b/code/AssetLib/IFC/IFCOpenings.cpp
-@@ -53,7 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #  include <poly2tri/poly2tri.h>
- #  include <polyclipping/clipper.hpp>
- #else
--#  include "../contrib/poly2tri/poly2tri/poly2tri.h"
-+#  include <poly2tri/poly2tri.h>
- #  include "../contrib/clipper/clipper.hpp"
- #endif
- 
+@@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #include "IFCUtil.h"
+ #include "Common/PolyTools.h"
+ #include "PostProcessing/ProcessHelper.h"
+-#include "contrib/poly2tri/poly2tri/poly2tri.h"
+-#include "contrib/clipper/clipper.hpp"
++#include <poly2tri/poly2tri.h>
++#include <polyclipping/clipper.hpp>
+ 
+ #include <deque>
+ #include <forward_list>
 diff --git a/code/AssetLib/MMD/MMDPmxParser.cpp b/code/AssetLib/MMD/MMDPmxParser.cpp
 index ca37ba1..2ce7bdd 100644
 --- a/code/AssetLib/MMD/MMDPmxParser.cpp
@@ -187,7 +171,7 @@ index ca37ba1..2ce7bdd 100644
  #  include <utf8.h>
  #else
 -#  include "../contrib/utf8cpp/source/utf8.h"
-+#  include <utf8.h>
++#  include <utf8cpp/utf8.h>
  #endif
  #include <assimp/Exceptional.h>
  
@@ -200,7 +184,7 @@ index 7b66afa..5adbe1d 100644
  #include <utf8.h>
  #else
 -#include "../contrib/utf8cpp/source/utf8.h"
-+#include <utf8.h>
++#include <utf8cpp/utf8.h>
  #endif
  #include <assimp/importerdesc.h>
  #include <assimp/scene.h>
@@ -213,7 +197,7 @@ index d4456e6..812f29b 100644
  #  include <utf8.h>
  #else
 -#  include <contrib/utf8cpp/source/utf8.h>
-+#  include <utf8.h>
++#  include <utf8cpp/utf8.h>
  #endif
  
  #include <memory>
@@ -232,7 +216,7 @@ index 5339454..45e07c0 100644
    find_package(pugixml CONFIG REQUIRED)
  ELSE()
    SET( Pugixml_SRCS
-@@ -910,15 +910,15 @@ ELSE()
+@@ -919,30 +919,30 @@ ELSE()
  ENDIF()
  
  # utf8
@@ -246,31 +230,46 @@ index 5339454..45e07c0 100644
  ENDIF()
  
  # polyclipping
--IF(ASSIMP_HUNTER_ENABLED)
-+IF(0)
-   hunter_add_package(polyclipping)
-   find_package(polyclipping CONFIG REQUIRED)
- ELSE()
-@@ -930,8 +930,8 @@ ELSE()
- ENDIF()
+-#IF(ASSIMP_HUNTER_ENABLED)
++IF(1)
+ #  hunter_add_package(polyclipping)
+-#  find_package(polyclipping CONFIG REQUIRED)
+-#ELSE()
++  find_package(polyclipping CONFIG REQUIRED)
++ELSE()
+   SET( Clipper_SRCS
+     ../contrib/clipper/clipper.hpp
+     ../contrib/clipper/clipper.cpp
+   )
+   SOURCE_GROUP( Contrib\\Clipper FILES ${Clipper_SRCS})
+-#ENDIF()
++ENDIF()
  
  # poly2tri
--IF(ASSIMP_HUNTER_ENABLED)
--  hunter_add_package(poly2tri)
+-#IF(ASSIMP_HUNTER_ENABLED)
 +IF(1)
-+  #hunter_add_package(poly2tri)
-   find_package(poly2tri CONFIG REQUIRED)
- ELSE()
+ #  hunter_add_package(poly2tri)
+-#  find_package(poly2tri CONFIG REQUIRED)
+-#ELSE()
++  find_package(poly2tri CONFIG REQUIRED)
++ELSE()
    SET( Poly2Tri_SRCS
-@@ -951,8 +951,8 @@ ELSE()
- ENDIF()
+     ../contrib/poly2tri/poly2tri/common/shapes.cc
+     ../contrib/poly2tri/poly2tri/common/shapes.h
+@@ -957,11 +957,11 @@ ELSE()
+     ../contrib/poly2tri/poly2tri/sweep/sweep_context.h
+   )
+   SOURCE_GROUP( Contrib\\Poly2Tri FILES ${Poly2Tri_SRCS})
+-#ENDIF()
++ENDIF()
  
  # minizip/unzip
 -IF(ASSIMP_HUNTER_ENABLED)
 -  hunter_add_package(minizip)
 +IF(1)
 +  #hunter_add_package(minizip)
-   find_package(minizip CONFIG REQUIRED)
+-  find_package(minizip CONFIG REQUIRED)
++  find_package(unofficial-minizip CONFIG REQUIRED)
  ELSE()
    SET( unzip_SRCS
 @@ -969,9 +969,9 @@ ENDIF()
@@ -377,19 +376,22 @@ index 5339454..45e07c0 100644
 +IF(1)
    TARGET_LINK_LIBRARIES(assimp
 -      PUBLIC
--      polyclipping::polyclipping
+-      #polyclipping::polyclipping
 -      openddlparser::openddl_parser
 +      PRIVATE
-+      #polyclipping::polyclipping
++      polyclipping::polyclipping
 +      #openddlparser::openddl_parser
 +      ${OPENDDL_PARSER_LIBRARIES}
-       poly2tri::poly2tri
-       minizip::minizip
+-      #poly2tri::poly2tri
++      poly2tri::poly2tri
+-      minizip::minizip
++      unofficial::minizip::minizip
 -      ZLIB::zlib
 -      RapidJSON::rapidjson
 +      ZLIB::ZLIB
 +      rapidjson
-       utf8cpp
+-      utf8cpp
++      utf8cpp::utf8cpp
 +      PUBLIC
        pugixml
 -      stb::stb
@@ -463,8 +465,8 @@ index 5339454..45e07c0 100644
  
  # Add RT-extension library for glTF importer with Open3DGC-compression.
  IF (RT_FOUND AND ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC)
--  TARGET_LINK_LIBRARIES(assimp ${RT_LIBRARY})
-+  TARGET_LINK_LIBRARIES(assimp PRIVATE ${RT_LIBRARY})
+-  TARGET_LINK_LIBRARIES(assimp rt)
++  TARGET_LINK_LIBRARIES(assimp PRIVATE rt)
  ENDIF ()
  
  
@@ -472,8 +474,17 @@ diff --git a/code/Common/StbCommon.h b/code/Common/StbCommon.h
 index 1265d25..18f4564 100644
 --- a/code/Common/StbCommon.h
 +++ b/code/Common/StbCommon.h
-@@ -48,7 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #pragma GCC diagnostic ignored "-Wunused-function"
+@@ -53,7 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #pragma clang diagnostic ignored "-Wunused-function"
+ #endif
+ 
+-#ifndef STB_USE_HUNTER
++#if 0
+ /*  Use prefixed names for the symbols from stb_image as it is a very commonly embedded library.
+     Including vanilla stb_image symbols causes duplicate symbol problems if assimp is linked
+     statically together with another library or executable that also embeds stb_image.
+@@ -111,7 +111,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #define stbi_zlib_decode_noheader_malloc assimp_stbi_zlib_decode_noheader_malloc
  #endif
  
 -#include "stb/stb_image.h"
@@ -490,7 +501,7 @@ index 383300e..03fdd9a 100644
  #include <utf8.h>
  #else
 -#include "../contrib/utf8cpp/source/utf8.h"
-+#include <utf8.h>
++#include <utf8cpp/utf8.h>
  #endif
  
  // ------------------------------------------------------------------------------------------------
diff --git a/external_imported/vcpkg/ports/assimp/portfile.cmake b/external_imported/vcpkg/ports/assimp/portfile.cmake
index babb0153e..6b0867ecd 100644
--- a/external_imported/vcpkg/ports/assimp/portfile.cmake
+++ b/external_imported/vcpkg/ports/assimp/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO assimp/assimp
-    REF v5.2.5
-    SHA512 ac0dc4243f9d1ff077966f0037187b4374075ac97e75e1a3cd6bdc1caf5f8e4d40953d9a8a316480969c09524d87daa9d3ed75e6ac6f037dd5b1c5f25fce3afb
+    REF v${VERSION}
+    SHA512 49963f84ed0a8145f3af249890a533f0b12f5553ae09581289cb1f20cb49cb1a3ed3f3c4c966ceb43aa897b90deca268aa6554066b2bd34f2ac9c15041420ddb
     HEAD_REF master
     PATCHES
         build_fixes.patch
@@ -10,7 +10,7 @@ vcpkg_from_github(
 
 file(REMOVE "${SOURCE_PATH}/cmake-modules/FindZLIB.cmake")
 
-#file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/clipper") # https://github.com/assimp/assimp/issues/788
+file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/clipper")
 file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/draco")
 file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/gtest")
 #file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/Open3DGC")      #TODO
@@ -56,19 +56,34 @@ if(VCPKG_TARGET_IS_WINDOWS)
     endforeach()
 endif()
 
-find_library(ASSIMP_REL NAMES assimp ${REL_NAMES} PATHS "${CURRENT_PACKAGES_DIR}/lib" NO_DEFAULT_PATH) 
+find_library(ASSIMP_REL NAMES assimp ${REL_NAMES} PATHS "${CURRENT_PACKAGES_DIR}/lib" NO_DEFAULT_PATH)
 find_library(ASSIMP_DBG NAMES assimp assimpd ${DBG_NAMES} PATHS "${CURRENT_PACKAGES_DIR}/debug/lib" NO_DEFAULT_PATH)
 if(ASSIMP_REL)
     get_filename_component(ASSIMP_NAME_REL "${ASSIMP_REL}" NAME_WLE)
+    string(REGEX REPLACE "^lib(.*)" "\\1" ASSIMP_NAME_REL "${ASSIMP_NAME_REL}")
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/assimp.pc" "-lassimp" "-l${ASSIMP_NAME_REL}")
 endif()
 if(ASSIMP_DBG)
     get_filename_component(ASSIMP_NAME_DBG "${ASSIMP_DBG}" NAME_WLE)
+    string(REGEX REPLACE "^lib(.*)" "\\1" ASSIMP_NAME_DBG "${ASSIMP_NAME_DBG}")
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/assimp.pc" "-lassimp" "-l${ASSIMP_NAME_DBG}")
 endif()
-vcpkg_fixup_pkgconfig() # Probably requires more fixing for static builds. See qt5-3d and the config changes below
+
+if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static")
+    set(assimp_PC_REQUIRES "draco polyclipping pugixml minizip")
+    set(assimp_LIBS_REQUIRES "-lpoly2tri")
+
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/assimp.pc" "Libs:" "Requires.private: ${assimp_PC_REQUIRES}\nLibs:")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/assimp.pc" "Libs.private:" "Libs.private: ${assimp_LIBS_REQUIRES}")
+    if(NOT VCPKG_BUILD_TYPE)
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/assimp.pc" "Libs:" "Requires.private: ${assimp_PC_REQUIRES}\nLibs:")
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/assimp.pc" "Libs.private:" "Libs.private: ${assimp_LIBS_REQUIRES}")
+    endif()
+endif()
+
+vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/assimp/vcpkg.json b/external_imported/vcpkg/ports/assimp/vcpkg.json
index 95a8179be..4c8e99cb2 100644
--- a/external_imported/vcpkg/ports/assimp/vcpkg.json
+++ b/external_imported/vcpkg/ports/assimp/vcpkg.json
@@ -1,14 +1,16 @@
 {
   "name": "assimp",
-  "version": "5.2.5",
+  "version": "5.3.1",
+  "port-version": 4,
   "description": "The Open Asset import library",
   "homepage": "https://github.com/assimp/assimp",
   "license": "BSD-3-Clause",
   "dependencies": [
     "draco",
+    "jhasse-poly2tri",
     "kubazip",
     "minizip",
-    "poly2tri",
+    "polyclipping",
     "pugixml",
     "rapidjson",
     "stb",
diff --git a/external_imported/vcpkg/ports/async-mqtt/portfile.cmake b/external_imported/vcpkg/ports/async-mqtt/portfile.cmake
new file mode 100644
index 000000000..7e10b2203
--- /dev/null
+++ b/external_imported/vcpkg/ports/async-mqtt/portfile.cmake
@@ -0,0 +1,33 @@
+set(VCPKG_BUILD_TYPE release) #header-only
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO redboltz/async_mqtt
+    REF "${VERSION}"
+    SHA512 5953c15f55951b367f1b981a96d75a9d267c26b47f4527c9fdba65da663123a14bba23810cfea9498e5c832a8129b22012c712d2990e6123d598e7a98b13bf11
+    HEAD_REF main
+)
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        tls ASYNC_MQTT_USE_TLS
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        ${FEATURE_OPTIONS}
+        -DASYNC_MQTT_BUILD_TOOLS=OFF
+        -DASYNC_MQTT_BUILD_EXAMPLES=OFF
+        -DASYNC_MQTT_BUILD_UNIT_TESTS=OFF
+        -DASYNC_MQTT_BUILD_SYSTEM_TESTS=OFF
+        -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(PACKAGE_NAME async_mqtt_iface CONFIG_PATH "lib/cmake/async_mqtt_iface")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/async-mqtt/vcpkg.json b/external_imported/vcpkg/ports/async-mqtt/vcpkg.json
new file mode 100644
index 000000000..129a312eb
--- /dev/null
+++ b/external_imported/vcpkg/ports/async-mqtt/vcpkg.json
@@ -0,0 +1,39 @@
+{
+  "name": "async-mqtt",
+  "version": "4.0.0",
+  "description": "Header-only Asynchronous MQTT communication library for C++17 based on Boost.Asio.",
+  "homepage": "https://github.com/redboltz/async_mqtt",
+  "license": "BSL-1.0",
+  "dependencies": [
+    "boost-any",
+    "boost-asio",
+    "boost-assert",
+    "boost-beast",
+    "boost-container",
+    "boost-container-hash",
+    "boost-endian",
+    "boost-log",
+    "boost-multi-index",
+    "boost-numeric-conversion",
+    "boost-system",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
+  "default-features": [
+    "tls"
+  ],
+  "features": {
+    "tls": {
+      "description": "Enable TLS support",
+      "dependencies": [
+        "openssl"
+      ]
+    }
+  }
+}
diff --git a/external_imported/vcpkg/ports/async-simple/portfile.cmake b/external_imported/vcpkg/ports/async-simple/portfile.cmake
new file mode 100644
index 000000000..22bd4a518
--- /dev/null
+++ b/external_imported/vcpkg/ports/async-simple/portfile.cmake
@@ -0,0 +1,31 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO alibaba/async_simple
+    REF "v${VERSION}"
+    SHA512 7686d8c98e5e87cf88c24488e4c0b528b29011ef48c25156c57695208dab75ee2f28b6f36e2612db2bf4644b50f4c1d4a7ebc54f16bc035cb106239d5b335c77
+    HEAD_REF main
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS 
+        -DASYNC_SIMPLE_ENABLE_TESTS=OFF 
+        -DASYNC_SIMPLE_BUILD_DEMO_EXAMPLE=OFF 
+        -DASYNC_SIMPLE_ENABLE_ASAN=OFF
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(PACKAGE_NAME "async_simple")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+file(GLOB LIBS "${CURRENT_PACKAGES_DIR}/debug/lib/*async_simple*")
+
+list(LENGTH LIBS LIB_CNT)
+if (LIB_CNT EQUAL 0)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+endif()
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY)
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/async-simple/usage b/external_imported/vcpkg/ports/async-simple/usage
new file mode 100644
index 000000000..e6087ae64
--- /dev/null
+++ b/external_imported/vcpkg/ports/async-simple/usage
@@ -0,0 +1,8 @@
+async-simple provides CMake targets:
+
+find_package(async_simple CONFIG REQUIRED)
+target_link_libraries(main PRIVATE async_simple::async_simple_static)
+# Or you can use header-only version(async_simple::uthread is not allowed to use in this version)
+target_link_libraries(main PRIVATE async_simple::async_simple_header_only)
+# Or you can also use dynamic linkage:
+target_link_libraries(main PRIVATE async_simple::async_simple)
diff --git a/external_imported/vcpkg/ports/async-simple/vcpkg.json b/external_imported/vcpkg/ports/async-simple/vcpkg.json
new file mode 100644
index 000000000..643650d5a
--- /dev/null
+++ b/external_imported/vcpkg/ports/async-simple/vcpkg.json
@@ -0,0 +1,17 @@
+{
+  "name": "async-simple",
+  "version": "1.3",
+  "description": "Simple, light-weight and easy-to-use asynchronous components.",
+  "homepage": "https://github.com/alibaba/async_simple",
+  "license": "Apache-2.0",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/asynch/vcpkg.json b/external_imported/vcpkg/ports/asynch/vcpkg.json
index 0ee8a5df2..9ee855beb 100644
--- a/external_imported/vcpkg/ports/asynch/vcpkg.json
+++ b/external_imported/vcpkg/ports/asynch/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "asynch",
-  "version-string": "2019-09-21",
-  "port-version": 2,
+  "version-date": "2019-09-21",
+  "port-version": 3,
   "description": "Async.h - asynchronous, stackless subroutines.",
   "homepage": "https://github.com/naasking/async.h"
 }
diff --git a/external_imported/vcpkg/ports/at-spi2-atk/portfile.cmake b/external_imported/vcpkg/ports/at-spi2-atk/portfile.cmake
index 9b7ba9134..a0972148c 100644
--- a/external_imported/vcpkg/ports/at-spi2-atk/portfile.cmake
+++ b/external_imported/vcpkg/ports/at-spi2-atk/portfile.cmake
@@ -1,7 +1,3 @@
-if(VCPKG_TARGET_IS_LINUX)
-    message(STATUS "${PORT} currently requires the following libraries from the system package manager:\n    libdbus-1\n\nThese can be installed on Ubuntu systems via apt-get install libdbus-1-dev")
-endif()
-
 vcpkg_from_gitlab(
     OUT_SOURCE_PATH SOURCE_PATH
     GITLAB_URL https://gitlab.gnome.org
@@ -22,7 +18,7 @@ vcpkg_copy_pdbs()
 
 vcpkg_fixup_pkgconfig()
 
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
diff --git a/external_imported/vcpkg/ports/at-spi2-atk/vcpkg.json b/external_imported/vcpkg/ports/at-spi2-atk/vcpkg.json
index 27c85cbdd..232abaf70 100644
--- a/external_imported/vcpkg/ports/at-spi2-atk/vcpkg.json
+++ b/external_imported/vcpkg/ports/at-spi2-atk/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "at-spi2-atk",
   "version": "2.38.0",
+  "port-version": 1,
   "description": "Implementation of the ATK interfaces in terms of the libatspi2 API.",
   "homepage": "https://www.gtk.org/",
   "license": null,
@@ -8,6 +9,10 @@
   "dependencies": [
     "at-spi2-core",
     "atk",
+    {
+      "name": "dbus",
+      "platform": "linux"
+    },
     "libxml2",
     {
       "name": "vcpkg-tool-meson",
diff --git a/external_imported/vcpkg/ports/at-spi2-core/portfile.cmake b/external_imported/vcpkg/ports/at-spi2-core/portfile.cmake
index a078ec6ac..3084f71f3 100644
--- a/external_imported/vcpkg/ports/at-spi2-core/portfile.cmake
+++ b/external_imported/vcpkg/ports/at-spi2-core/portfile.cmake
@@ -1,5 +1,5 @@
 if(VCPKG_TARGET_IS_LINUX)
-    message(STATUS "${PORT} currently requires the following libraries from the system package manager:\n    libdbus-1-dev\n    libxi-dev\n    libxtst-dev\n\nThese can be installed on Ubuntu systems via apt-get install libdbus-1-dev libxi-dev libxtst-dev")
+    message(STATUS "${PORT} currently requires the following libraries from the system package manager:\n    libxi-dev\n    libxtst-dev\n\nThese can be installed on Ubuntu systems via apt-get install libxi-dev libxtst-dev")
 endif()
 
 vcpkg_from_gitlab(
@@ -14,10 +14,7 @@ vcpkg_configure_meson(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -Dintrospection=no
-    ADDITIONAL_NATIVE_BINARIES
-        glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal'
-        glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums'
-    ADDITIONAL_CROSS_BINARIES
+    ADDITIONAL_BINARIES
         glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal'
         glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums'
 )
@@ -39,7 +36,7 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
     )
 endif()
 
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/share/defaults")
 
diff --git a/external_imported/vcpkg/ports/at-spi2-core/vcpkg.json b/external_imported/vcpkg/ports/at-spi2-core/vcpkg.json
index e972a826e..b82464a6c 100644
--- a/external_imported/vcpkg/ports/at-spi2-core/vcpkg.json
+++ b/external_imported/vcpkg/ports/at-spi2-core/vcpkg.json
@@ -1,12 +1,16 @@
 {
   "name": "at-spi2-core",
   "version": "2.44.1",
-  "port-version": 1,
+  "port-version": 3,
   "description": "Base DBus XML interfaces for accessibility, the accessibility registry daemon, and atspi library.",
   "homepage": "https://www.gtk.org/",
   "license": null,
   "supports": "linux",
   "dependencies": [
+    {
+      "name": "dbus",
+      "platform": "linux"
+    },
     "glib",
     {
       "name": "glib",
diff --git a/external_imported/vcpkg/ports/atk/portfile.cmake b/external_imported/vcpkg/ports/atk/portfile.cmake
index 5a2b47987..176c06246 100644
--- a/external_imported/vcpkg/ports/atk/portfile.cmake
+++ b/external_imported/vcpkg/ports/atk/portfile.cmake
@@ -10,9 +10,6 @@ vcpkg_from_gitlab(
 )
 
 if("introspection" IN_LIST FEATURES)
-    if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-        message(FATAL_ERROR "Feature introspection currently only supports dynamic build.")
-    endif()
     list(APPEND OPTIONS_DEBUG -Dintrospection=false)
     list(APPEND OPTIONS_RELEASE -Dintrospection=true)
 else()
@@ -50,4 +47,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
 endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/atk/vcpkg.json b/external_imported/vcpkg/ports/atk/vcpkg.json
index b0c3a9dbd..ec81afa24 100644
--- a/external_imported/vcpkg/ports/atk/vcpkg.json
+++ b/external_imported/vcpkg/ports/atk/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "atk",
   "version": "2.38.0",
-  "port-version": 5,
+  "port-version": 8,
   "description": "GNOME Accessibility Toolkit",
   "homepage": "https://developer.gnome.org/atk/",
-  "license": "GPL-2.0-only",
+  "license": "LGPL-2.0-or-later",
+  "supports": "!xbox",
   "dependencies": [
     "gettext",
     {
@@ -29,14 +30,7 @@
     "introspection": {
       "description": "build with introspection",
       "dependencies": [
-        {
-          "name": "gobject-introspection",
-          "host": true
-        },
-        {
-          "name": "gobject-introspection",
-          "platform": "windows & x86"
-        }
+        "gobject-introspection"
       ]
     }
   }
diff --git a/external_imported/vcpkg/ports/atkmm/portfile.cmake b/external_imported/vcpkg/ports/atkmm/portfile.cmake
index a4c337b6e..bb9c636df 100644
--- a/external_imported/vcpkg/ports/atkmm/portfile.cmake
+++ b/external_imported/vcpkg/ports/atkmm/portfile.cmake
@@ -11,8 +11,8 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 23c831afac6bb9a0f9f2e622f8f9ffea29445a33b1cd650e0c07ee77e60b28ae5ee978c029e8e0f9b94e9ff4679d69ebde833f15e0a5403d97914cc7ccf98a6a
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE ${ARCHIVE}
 )
 
diff --git a/external_imported/vcpkg/ports/atkmm/vcpkg.json b/external_imported/vcpkg/ports/atkmm/vcpkg.json
index 426760e8f..6df0032cd 100644
--- a/external_imported/vcpkg/ports/atkmm/vcpkg.json
+++ b/external_imported/vcpkg/ports/atkmm/vcpkg.json
@@ -1,9 +1,11 @@
 {
   "name": "atkmm",
   "version": "2.36.1",
+  "port-version": 2,
   "description": "atkmm is the official C++ interface for the ATK accessibility toolkit library. It may be used, for instance, by user interfaces implemented with gtkmm.",
   "homepage": "https://www.gtkmm.org",
-  "license": "LGPL-2.1",
+  "license": "LGPL-2.1-or-later",
+  "supports": "!xbox",
   "dependencies": [
     "atk",
     "gettext",
diff --git a/external_imported/vcpkg/ports/atl/portfile.cmake b/external_imported/vcpkg/ports/atl/portfile.cmake
new file mode 100644
index 000000000..61a207f7b
--- /dev/null
+++ b/external_imported/vcpkg/ports/atl/portfile.cmake
@@ -0,0 +1,10 @@
+find_path(ATLBASE_H
+  NAMES atlbase.h
+  PATHS $ENV{INCLUDE}
+)
+
+if(NOT ATLBASE_H)
+  message(FATAL_ERROR "Unable to locate 'atlbase.h'. Ensure you have installed the Active Template Library (ATL) component of Visual Studio.")
+endif()
+
+SET(VCPKG_POLICY_EMPTY_PACKAGE enabled)
diff --git a/external_imported/vcpkg/ports/atl/vcpkg.json b/external_imported/vcpkg/ports/atl/vcpkg.json
new file mode 100644
index 000000000..cd2350eb2
--- /dev/null
+++ b/external_imported/vcpkg/ports/atl/vcpkg.json
@@ -0,0 +1,6 @@
+{
+  "name": "atl",
+  "version": "0",
+  "description": "A stub package that ensures Visual Studio has Active Template Library (ATL) installed.",
+  "supports": "windows"
+}
diff --git a/external_imported/vcpkg/ports/atlmfc/vcpkg.json b/external_imported/vcpkg/ports/atlmfc/vcpkg.json
index 5a8ce22d6..40f137795 100644
--- a/external_imported/vcpkg/ports/atlmfc/vcpkg.json
+++ b/external_imported/vcpkg/ports/atlmfc/vcpkg.json
@@ -1,7 +1,10 @@
 {
   "name": "atlmfc",
-  "version-string": "0",
-  "port-version": 1,
-  "description": "a stub package that ensures VS has ATL/MFC installed.",
-  "supports": "windows"
+  "version": "0",
+  "port-version": 3,
+  "description": "A stub package that ensures Visual Studio has ATL/MFC installed.",
+  "supports": "windows",
+  "dependencies": [
+    "atl"
+  ]
 }
diff --git a/external_imported/vcpkg/ports/atomic-queue/portfile.cmake b/external_imported/vcpkg/ports/atomic-queue/portfile.cmake
index 49c5e0576..d1ae955ba 100644
--- a/external_imported/vcpkg/ports/atomic-queue/portfile.cmake
+++ b/external_imported/vcpkg/ports/atomic-queue/portfile.cmake
@@ -1,20 +1,20 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO max0x7ba/atomic_queue
-    REF 7619054490efdbfe377bd528bc09b21f5cd38a02
-    SHA512 0d145f461a5c978c4d6f6d8ec1f06f0c61f3d009e65eac12db806c2aa7941461f881b34b9c4dd9aeebd3206a4598e6081f89f983c389b2f5aecefefcbddd94b6
+    REF "v${VERSION}"
+    SHA512 d2b329698412127d23e9ee55472f65869c59b228439e714ebbe6cc66202b654a102f32583e7cc3b5999c22c1dba69a5aa4365870cc4b88b75b1ac0b4d94b979a
     HEAD_REF master
 )
 
 file(
-    COPY 
-        ${SOURCE_PATH}/include/atomic_queue/atomic_queue.h 
-        ${SOURCE_PATH}/include/atomic_queue/atomic_queue_mutex.h 
-        ${SOURCE_PATH}/include/atomic_queue/barrier.h 
-        ${SOURCE_PATH}/include/atomic_queue/defs.h 
-        ${SOURCE_PATH}/include/atomic_queue/spinlock.h 
-    DESTINATION 
-        ${CURRENT_PACKAGES_DIR}/include/atomic_queue
+    COPY
+        "${SOURCE_PATH}/include/atomic_queue/atomic_queue.h"
+        "${SOURCE_PATH}/include/atomic_queue/atomic_queue_mutex.h"
+        "${SOURCE_PATH}/include/atomic_queue/barrier.h"
+        "${SOURCE_PATH}/include/atomic_queue/defs.h"
+        "${SOURCE_PATH}/include/atomic_queue/spinlock.h"
+    DESTINATION
+        "${CURRENT_PACKAGES_DIR}/include/atomic_queue"
 )
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/atomic-queue/vcpkg.json b/external_imported/vcpkg/ports/atomic-queue/vcpkg.json
index 7e7cbe56f..255c3ee00 100644
--- a/external_imported/vcpkg/ports/atomic-queue/vcpkg.json
+++ b/external_imported/vcpkg/ports/atomic-queue/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "atomic-queue",
-  "version-date": "2021-05-03",
+  "version": "1.5",
   "description": "Minimalistic header-only thread-safe ultra-low-latency multiple-producer-multiple-consumer lockless queues based on circular buffer with std::atomic.",
-  "homepage": "https://github.com/max0x7ba/atomic_queue"
+  "homepage": "https://github.com/max0x7ba/atomic_queue",
+  "license": "MIT"
 }
diff --git a/external_imported/vcpkg/ports/attr/portfile.cmake b/external_imported/vcpkg/ports/attr/portfile.cmake
index ff0fc3650..393e64db3 100644
--- a/external_imported/vcpkg/ports/attr/portfile.cmake
+++ b/external_imported/vcpkg/ports/attr/portfile.cmake
@@ -1,19 +1,29 @@
-vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
-
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://download.savannah.nongnu.org/releases/attr/attr-${VERSION}.tar.xz"
+    URLS "https://download.savannah.nongnu.org/releases/attr/attr-${VERSION}.tar.xz"
+         "https://www.mirrorservice.org/sites/download.savannah.gnu.org/releases/attr/attr-${VERSION}.tar.xz"
     FILENAME "attr-${VERSION}.tar.xz"
-    SHA512 9e5555260189bb6ef2440c76700ebb813ff70582eb63d446823874977307d13dfa3a347dfae619f8866943dfa4b24ccf67dadd7e3ea2637239fdb219be5d2932
+    SHA512 f587ea544effb7cfed63b3027bf14baba2c2dbe3a9b6c0c45fc559f7e8cb477b3e9a4a826eae30f929409468c50d11f3e7dc6d2500f41e1af8662a7e96a30ef3
 )
 
 vcpkg_extract_source_archive(
     SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
+    ARCHIVE "${ARCHIVE}"
 )
 
+vcpkg_list(SET options)
+if("nls" IN_LIST FEATURES)
+    vcpkg_list(APPEND options "--enable-nls")
+    vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/gettext/bin")
+else()
+    set(ENV{AUTOPOINT} true) # true, the program
+    vcpkg_list(APPEND options "--disable-nls")
+endif()
+
 vcpkg_configure_make(
     SOURCE_PATH "${SOURCE_PATH}"
     AUTOCONFIG
+    OPTIONS
+        ${options}
 )
 
 vcpkg_install_make()
diff --git a/external_imported/vcpkg/ports/attr/vcpkg.json b/external_imported/vcpkg/ports/attr/vcpkg.json
index a47a3b722..e21ee4a4f 100644
--- a/external_imported/vcpkg/ports/attr/vcpkg.json
+++ b/external_imported/vcpkg/ports/attr/vcpkg.json
@@ -1,8 +1,23 @@
 {
   "name": "attr",
-  "version-semver": "2.5.1",
+  "version-semver": "2.5.2",
   "description": "Commands for Manipulating Filesystem Extended Attributes",
   "homepage": "http://savannah.nongnu.org/projects/attr",
   "license": "LGPL-2.1-or-later",
-  "supports": "linux"
+  "supports": "linux",
+  "features": {
+    "nls": {
+      "description": "Enable native language support",
+      "dependencies": [
+        {
+          "name": "gettext",
+          "host": true,
+          "features": [
+            "tools"
+          ]
+        },
+        "gettext-libintl"
+      ]
+    }
+  }
 }
diff --git a/external_imported/vcpkg/ports/aubio/vcpkg.json b/external_imported/vcpkg/ports/aubio/vcpkg.json
index b7007a8bd..b03cc7149 100644
--- a/external_imported/vcpkg/ports/aubio/vcpkg.json
+++ b/external_imported/vcpkg/ports/aubio/vcpkg.json
@@ -1,9 +1,11 @@
 {
   "name": "aubio",
   "version-date": "2022-01-26",
+  "port-version": 1,
   "description": "Aubio is a tool designed for the extraction of annotations from audio signals. Its features include segmenting a sound file before each of its attacks, performing pitch detection, tapping the beat and producing midi streams from live audio.",
   "homepage": "https://github.com/aubio/aubio",
   "license": "GPL-3.0-or-later",
+  "supports": "!xbox",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/audiofile/portfile.cmake b/external_imported/vcpkg/ports/audiofile/portfile.cmake
index 18188b654..33c371f39 100644
--- a/external_imported/vcpkg/ports/audiofile/portfile.cmake
+++ b/external_imported/vcpkg/ports/audiofile/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO adamstark/AudioFile
-    REF 004065d01e9b7338580390d4fdbfbaa46adede4e # 1.1.0
-    SHA512 99d31035fc82ca8da3c555c30b6b40ea99e15e1f82002c7f04c567ab7aee1de71deddf6930564c56f3a2e83eea1b5f5e9ca631673ed4a943579732b8d62e9603
+    REF "${VERSION}"
+    SHA512 b0612e6d6c440e52a168f27410d6ac14f7fcef2ba183e8a80e03f924e6fc778c01e4f46b40cab10dd73c48f8f10dc4112c58f602728fdeec0bc3e143852fc95e
     HEAD_REF master
     PATCHES
         fix-cmakeLists.patch
diff --git a/external_imported/vcpkg/ports/audiofile/vcpkg.json b/external_imported/vcpkg/ports/audiofile/vcpkg.json
index e9c294bbe..6b96e0318 100644
--- a/external_imported/vcpkg/ports/audiofile/vcpkg.json
+++ b/external_imported/vcpkg/ports/audiofile/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "audiofile",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "A simple header-only C++ library for reading and writing audio files.",
   "homepage": "https://github.com/adamstark/AudioFile",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/aurora/vcpkg.json b/external_imported/vcpkg/ports/aurora/vcpkg.json
index e0efe0331..7e89fcf29 100644
--- a/external_imported/vcpkg/ports/aurora/vcpkg.json
+++ b/external_imported/vcpkg/ports/aurora/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "aurora",
-  "version-string": "2017-06-21-c75699d2a8caa726260c29b6d7a0fd35f8f28933",
-  "port-version": 1,
+  "version": "2017-06-21-c75699d2a8caa726260c29b6d7a0fd35f8f28933",
+  "port-version": 2,
   "description": "Aurora is an open-source C++ library providing various rather uncommon C++ utilities",
   "homepage": "https://github.com/Bromeon/Aurora"
 }
diff --git a/external_imported/vcpkg/ports/autobahn/vcpkg.json b/external_imported/vcpkg/ports/autobahn/vcpkg.json
index cc755ff05..3bd52ecc0 100644
--- a/external_imported/vcpkg/ports/autobahn/vcpkg.json
+++ b/external_imported/vcpkg/ports/autobahn/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "autobahn",
-  "version-string": "20.8.1",
-  "port-version": 1,
+  "version": "20.8.1",
+  "port-version": 2,
   "description": "WAMP for C++ in Boost/Asio",
   "homepage": "https://crossbar.io/autobahn",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/autodock-vina/CMakeLists.txt b/external_imported/vcpkg/ports/autodock-vina/CMakeLists.txt
index 5099bc23e..f5ceca6b6 100644
--- a/external_imported/vcpkg/ports/autodock-vina/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/autodock-vina/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_policy(VERSION 3.11)
 
 project(autodock-vina)
 
-set(GIT_VERSION v1.2.3)
+set(GIT_VERSION v1.2.5)
 set(CMAKE_CXX_STANDARD 11)
 
 find_package(Boost REQUIRED COMPONENTS
diff --git a/external_imported/vcpkg/ports/autodock-vina/fix-compatibility-with-boost-1.83.patch b/external_imported/vcpkg/ports/autodock-vina/fix-compatibility-with-boost-1.83.patch
new file mode 100644
index 000000000..e6af7c477
--- /dev/null
+++ b/external_imported/vcpkg/ports/autodock-vina/fix-compatibility-with-boost-1.83.patch
@@ -0,0 +1,46 @@
+From 4a7935e1f8d1756cbeafb2564066551f9bd766f0 Mon Sep 17 00:00:00 2001
+From: jjll <jjll@gmv.com>
+Date: Wed, 6 Sep 2023 14:25:30 +0200
+Subject: [PATCH] compatibility boost >= 1.83
+
+---
+ src/lib/parallel_progress.h | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/parallel_progress.h b/src/lib/parallel_progress.h
+index 958b170..ee938d9 100755
+--- a/src/lib/parallel_progress.h
++++ b/src/lib/parallel_progress.h
+@@ -23,7 +23,14 @@
+ #ifndef VINA_PARALLEL_PROGRESS_H
+ #define VINA_PARALLEL_PROGRESS_H
+ 
++#include <boost/version.hpp>
++#if BOOST_VERSION < 107200
+ #include <boost/progress.hpp>
++typedef boost::progress_display boost_progress;
++#else
++#include <boost/timer/progress_display.hpp>
++typedef boost::timer::progress_display boost_progress;
++#endif
+ #include <boost/thread/mutex.hpp>
+ 
+ #include <functional>
+@@ -34,7 +41,7 @@ struct parallel_progress : public incrementable {
+ 	parallel_progress(std::function<void(double)>* c = NULL) : p(NULL), callback(c) {}
+ 	void init(unsigned long n) {
+         count = n;
+-        p = new boost::progress_display(count);
++        p = new boost_progress(count);
+     }
+ 	void operator++() {
+ 		if(p) {
+@@ -47,7 +54,7 @@ struct parallel_progress : public incrementable {
+ 	virtual ~parallel_progress() { delete p; }
+ private:
+ 	boost::mutex self;
+-	boost::progress_display* p;
++	boost_progress* p;
+     std::function<void(double)>* callback;
+     unsigned long count;
+ };
diff --git a/external_imported/vcpkg/ports/autodock-vina/portfile.cmake b/external_imported/vcpkg/ports/autodock-vina/portfile.cmake
index b910a40e6..31b694d16 100644
--- a/external_imported/vcpkg/ports/autodock-vina/portfile.cmake
+++ b/external_imported/vcpkg/ports/autodock-vina/portfile.cmake
@@ -3,9 +3,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ccsb-scripps/AutoDock-Vina
-    REF v1.2.3
-    SHA512 ea3d3008553665af5fbafa3b4dfe379df257d9c5b957d81a91ec8b92f06a8d0f4c2dfc30b515a64c0bc6dcc70acedfdd498c3bb9a21cac58e43d4da37d2ff606
+    REF v${VERSION}
+    SHA512 d36908e5833d22bcbc4dae353ef32b905d6eb46511302f7583a291398bfadff5e75fc99ce7b380860578b2257e5c32434cc75b1ca51fafb4b5f12d9477a878e9
     HEAD_REF develop
+    PATCHES fix-compatibility-with-boost-1.83.patch
 )
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
diff --git a/external_imported/vcpkg/ports/autodock-vina/vcpkg.json b/external_imported/vcpkg/ports/autodock-vina/vcpkg.json
index c8d9df0fa..34248c635 100644
--- a/external_imported/vcpkg/ports/autodock-vina/vcpkg.json
+++ b/external_imported/vcpkg/ports/autodock-vina/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "autodock-vina",
-  "version-semver": "1.2.3",
+  "version-semver": "1.2.5",
+  "port-version": 1,
   "description": "AutoDock Vina is one of the fastest and most widely used open-source docking engines.",
   "homepage": "http://vina.scripps.edu/",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/avcpp/portfile.cmake b/external_imported/vcpkg/ports/avcpp/portfile.cmake
index 4587c211c..6e57794b7 100644
--- a/external_imported/vcpkg/ports/avcpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/avcpp/portfile.cmake
@@ -1,13 +1,13 @@
-# avcpp doesn't export any symbols
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
-vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
+if(VCPKG_TARGET_IS_WINDOWS)
+    # avcpp doesn't export any symbols
+    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO h4tr3d/avcpp
     REF "v${VERSION}"
-    SHA512 1e66afcf9a1f1085001aab9eb270cbbc6930cc42e60567300676d220120c421c44d24c7aeccb0b5c3ebd9de574ca1efbc67a29c681e3e11a796c32cc370069e4
+    SHA512 f709b0ef30d4a516747156788716476fb71dda12fbedf6b757bbb82340a0a33bae5cc0e5be1e7fb00e70c8a9a693610e383caab137875d4a5043c1a9801ec9dd
     HEAD_REF master
     PATCHES
         0002-av_init_packet_deprecation.patch
@@ -17,20 +17,17 @@ vcpkg_from_github(
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" AVCPP_ENABLE_STATIC)
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" AVCPP_ENABLE_SHARED)
 
-if(NOT HOST_TRIPLET STREQUAL TARGET_TRIPLET)
-    vcpkg_add_to_path(${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf)
-endif()
+vcpkg_find_acquire_program(PKGCONFIG)
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         "-DAV_ENABLE_STATIC=${AVCPP_ENABLE_STATIC}"
         "-DAV_ENABLE_SHARED=${AVCPP_ENABLE_SHARED}"
+        "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}"
         -DAV_BUILD_EXAMPLES=OFF
-        -DBUILD_TESTING=OFF
 )
 vcpkg_cmake_install()
-
 vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
 
 vcpkg_fixup_pkgconfig()
@@ -38,6 +35,5 @@ vcpkg_fixup_pkgconfig()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-
-vcpkg_copy_pdbs()
+file(READ "${SOURCE_PATH}/LICENSE.md" LICENSE_MD)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE-bsd.txt" "${SOURCE_PATH}/LICENSE-lgpl2.txt" COMMENT "${LICENSE_MD}")
diff --git a/external_imported/vcpkg/ports/avcpp/vcpkg.json b/external_imported/vcpkg/ports/avcpp/vcpkg.json
index 318b5f717..4deca6c74 100644
--- a/external_imported/vcpkg/ports/avcpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/avcpp/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "avcpp",
-  "version": "2.1.0",
+  "version": "2.2.1",
   "description": "Wrapper for the FFmpeg that simplify usage it from C++ projects.",
   "homepage": "https://github.com/h4tr3d/avcpp",
   "license": "LGPL-2.1-only OR BSD-3-Clause",
@@ -18,10 +18,6 @@
         "swscale"
       ]
     },
-    {
-      "name": "pkgconf",
-      "host": true
-    },
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/external_imported/vcpkg/ports/avisynthplus/clang-cl.patch b/external_imported/vcpkg/ports/avisynthplus/clang-cl.patch
deleted file mode 100644
index c5cf087f8..000000000
--- a/external_imported/vcpkg/ports/avisynthplus/clang-cl.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d60332e63..0216970fc 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -188,7 +188,15 @@ endif()
-       endif()
-     ENDIF()
- 
-+    if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
-+        set(CLANG_IN_VS "1")
-+    elseif(CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM" AND CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
-+        set(IntelLLVM_IN_VS "1")
-+    elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
-+        set(IntelClassic_IN_VS "1")
-+    endif()
-+
-     IF(CLANG_IN_VS STREQUAL "1")
-         #these are unknown
-         #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fexceptions")
-         #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions")
diff --git a/external_imported/vcpkg/ports/avisynthplus/portfile.cmake b/external_imported/vcpkg/ports/avisynthplus/portfile.cmake
index 5e018b73c..a3d861251 100644
--- a/external_imported/vcpkg/ports/avisynthplus/portfile.cmake
+++ b/external_imported/vcpkg/ports/avisynthplus/portfile.cmake
@@ -1,11 +1,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO AviSynth/AviSynthPlus
-    REF v3.7.2
-    SHA512 82cf2afed4cc53c0e09d367ff3df1db0e9ac17ff2458e4660c646430d8e72f472b072a3910c9595b26eb5ac89c82fe74699acab3869014f87d8e2738b81568a1
+    REF "v${VERSION}"
+    SHA512 0e0daa83e3ab729fdc35a52c60c23c9142f1229187af893d0dbbd36f88eced36f63a3e8c767a3dc825edaa5395a49a5aad726f6b61de8f6b291557eec20de426
     HEAD_REF master
-    PATCHES
-        clang-cl.patch # the normal lookup is not working since it doesn't take Ninja as a Generator into account
 )
 
 vcpkg_download_distfile(GHC_ARCHIVE
diff --git a/external_imported/vcpkg/ports/avisynthplus/vcpkg.json b/external_imported/vcpkg/ports/avisynthplus/vcpkg.json
index 26af95e8e..209fea9a9 100644
--- a/external_imported/vcpkg/ports/avisynthplus/vcpkg.json
+++ b/external_imported/vcpkg/ports/avisynthplus/vcpkg.json
@@ -1,11 +1,10 @@
 {
   "name": "avisynthplus",
-  "version": "3.7.2",
-  "port-version": 1,
+  "version": "3.7.3",
   "description": "An improved version of the AviSynth frameserver, with improved features and developer friendliness",
   "homepage": "https://avs-plus.net/",
   "license": "GPL-2.0",
-  "supports": "!arm & !uwp",
+  "supports": "!arm & !uwp & !xbox",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/avro-c/portfile.cmake b/external_imported/vcpkg/ports/avro-c/portfile.cmake
index ac0742680..94c61be6c 100644
--- a/external_imported/vcpkg/ports/avro-c/portfile.cmake
+++ b/external_imported/vcpkg/ports/avro-c/portfile.cmake
@@ -6,8 +6,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO apache/avro
-    REF 4e1fefca493029ace961b7ef8889a3722458565a #release-1.11.0
-    SHA512 6e787983d68bc6ecffd14ca585917f695bc1ae554de9146a436d342f32321c3e7878cdfa32989742e682ac12a6eb914b3e3b515ca3164f386c0281c8b50b53ad
+    REF "release-${VERSION}"
+    SHA512 728609f562460e1115366663ede2c5d4acbdd6950c1ee3e434ffc65d28b72e3a43c3ebce93d0a8459f0c4f6c492ebb9444e2127a0385f38eb7cdf74b28f0c3ed
     HEAD_REF master
     PATCHES
         avro.patch          # Private vcpkg build fixes
diff --git a/external_imported/vcpkg/ports/avro-c/vcpkg.json b/external_imported/vcpkg/ports/avro-c/vcpkg.json
index 888afb3ba..5c5c70cc1 100644
--- a/external_imported/vcpkg/ports/avro-c/vcpkg.json
+++ b/external_imported/vcpkg/ports/avro-c/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "avro-c",
-  "version": "1.11.0",
-  "port-version": 3,
+  "version": "1.11.3",
   "description": "Apache Avro is a data serialization system",
   "homepage": "https://github.com/apache/avro",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/avro-cpp/fix-cmake.patch b/external_imported/vcpkg/ports/avro-cpp/fix-cmake.patch
new file mode 100644
index 000000000..1030b3777
--- /dev/null
+++ b/external_imported/vcpkg/ports/avro-cpp/fix-cmake.patch
@@ -0,0 +1,99 @@
+diff --git a/lang/c++/CMakeLists.txt b/lang/c++/CMakeLists.txt
+index 472684f4c..edde09e40 100644
+--- a/lang/c++/CMakeLists.txt
++++ b/lang/c++/CMakeLists.txt
+@@ -51,20 +51,16 @@ list(GET AVRO_VERSION 2 AVRO_VERSION_PATCH)
+ project (Avro-cpp)
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR})
+ 
++find_package(ZLIB REQUIRED)
++
+ if (WIN32 AND NOT CYGWIN AND NOT MSYS)
+     add_definitions (/EHa)
+-    add_definitions (
+-        -DNOMINMAX
+-        -DBOOST_REGEX_DYN_LINK
+-        -DBOOST_FILESYSTEM_DYN_LINK
+-        -DBOOST_SYSTEM_DYN_LINK
+-        -DBOOST_IOSTREAMS_DYN_LINK
+-        -DBOOST_PROGRAM_OPTIONS_DYN_LINK
+-        -DBOOST_ALL_NO_LIB)
++    add_definitions (-DNOMINMAX)
+ endif()
+ 
+ if (CMAKE_COMPILER_IS_GNUCXX)
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Werror")
++    # Remove " -Werror" because of warning from boost-math (will require C++ 14 soon)
++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic")
+ if (AVRO_ADD_PROTECTOR_FLAGS)
+     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fstack-protector-all -D_GLIBCXX_DEBUG")
+     # Unset _GLIBCXX_DEBUG for avrogencpp.cc because using Boost Program Options
+@@ -114,7 +110,7 @@ set (AVRO_SOURCE_FILES
+         impl/CustomAttributes.cc
+         )
+ 
+-add_library (avrocpp SHARED ${AVRO_SOURCE_FILES})
++add_library (avrocpp ${AVRO_SOURCE_FILES})
+ 
+ set_property (TARGET avrocpp
+     APPEND PROPERTY COMPILE_DEFINITIONS AVRO_DYN_LINK)
+@@ -131,12 +127,12 @@ set_target_properties (avrocpp PROPERTIES
+ set_target_properties (avrocpp_s PROPERTIES
+     VERSION ${AVRO_VERSION_MAJOR}.${AVRO_VERSION_MINOR}.${AVRO_VERSION_PATCH})
+ 
+-target_link_libraries (avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES})
++target_link_libraries (avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES} ZLIB::ZLIB)
+ target_include_directories(avrocpp PRIVATE ${SNAPPY_INCLUDE_DIR})
+ 
+ add_executable (precompile test/precompile.cc)
+ 
+-target_link_libraries (precompile avrocpp_s ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES})
++target_link_libraries (precompile avrocpp_s ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES} ZLIB::ZLIB)
+ 
+ macro (gen file ns)
+     add_custom_command (OUTPUT ${file}.hh
+@@ -166,13 +162,14 @@ gen (primitivetypes pt)
+ gen (cpp_reserved_words cppres)
+ 
+ add_executable (avrogencpp impl/avrogencpp.cc)
+-target_link_libraries (avrogencpp avrocpp_s ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES})
++target_link_libraries (avrogencpp avrocpp_s ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES} ZLIB::ZLIB)
+ 
++if(BUILD_TESTING)
+ enable_testing()
+ 
+ macro (unittest name)
+-    add_executable (${name} test/${name}.cc)
+-    target_link_libraries (${name} avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES})
++    add_executable (${name} test/${name}.cc impl/json/JsonIO.cc impl/json/JsonDom.cc)
++    target_link_libraries (${name} avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES} ZLIB::ZLIB)
+     add_test (NAME ${name} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+         COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${name})
+ endmacro (unittest)
+@@ -197,6 +194,7 @@ add_dependencies (AvrogencppTests bigrecord_hh bigrecord_r_hh bigrecord2_hh
+     union_array_union_hh union_map_union_hh union_conflict_hh
+     recursive_hh reuse_hh circulardep_hh tree1_hh tree2_hh crossref_hh
+     primitivetypes_hh empty_record_hh)
++endif()
+ 
+ include (InstallRequiredSystemLibraries)
+ 
+@@ -204,10 +202,14 @@ set (CPACK_PACKAGE_FILE_NAME "avrocpp-${AVRO_VERSION_MAJOR}")
+ 
+ include (CPack)
+ 
+-install (TARGETS avrocpp avrocpp_s
+-    LIBRARY DESTINATION lib
+-    ARCHIVE DESTINATION lib
+-    RUNTIME DESTINATION lib)
++install(TARGETS avrocpp EXPORT unofficial-avro-cpp)
++
++install(
++    EXPORT unofficial-avro-cpp
++    FILE unofficial-avro-cpp-config.cmake
++    DESTINATION share/unofficial-avro-cpp
++    NAMESPACE unofficial::avro-cpp::
++)
+ 
+ install (TARGETS avrogencpp RUNTIME DESTINATION bin)
+ 
diff --git a/external_imported/vcpkg/ports/avro-cpp/install.patch b/external_imported/vcpkg/ports/avro-cpp/install.patch
deleted file mode 100644
index 7f4c4eb5f..000000000
--- a/external_imported/vcpkg/ports/avro-cpp/install.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-diff --git "a/lang/c++/CMakeLists.txt" "b/lang/c++/CMakeLists.txt"
-index 52d6ac8a..39d59cd8 100644
---- "a/lang/c++/CMakeLists.txt"
-+++ "b/lang/c++/CMakeLists.txt"
-@@ -51,6 +51,8 @@ list(GET AVRO_VERSION 2 AVRO_VERSION_PATCH)
- project (Avro-cpp)
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR})
- 
-+find_package(ZLIB REQUIRED)
-+
- if (WIN32 AND NOT CYGWIN AND NOT MSYS)
-     add_definitions (/EHa)
-     add_definitions (
-@@ -64,7 +66,8 @@ if (WIN32 AND NOT CYGWIN AND NOT MSYS)
- endif()
- 
- if (CMAKE_COMPILER_IS_GNUCXX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Werror")
-+    # Remove " -Werror" because of warning from boost-math (will require C++ 14 soon)
-+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic")
- if (AVRO_ADD_PROTECTOR_FLAGS)
-     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fstack-protector-all -D_GLIBCXX_DEBUG")
-     # Unset _GLIBCXX_DEBUG for avrogencpp.cc because using Boost Program Options
-@@ -131,12 +134,12 @@ set_target_properties (avrocpp PROPERTIES
- set_target_properties (avrocpp_s PROPERTIES
-     VERSION ${AVRO_VERSION_MAJOR}.${AVRO_VERSION_MINOR}.${AVRO_VERSION_PATCH})
- 
--target_link_libraries (avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES})
-+target_link_libraries (avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES} ZLIB::ZLIB)
- target_include_directories(avrocpp PRIVATE ${SNAPPY_INCLUDE_DIR})
- 
- add_executable (precompile test/precompile.cc)
- 
--target_link_libraries (precompile avrocpp_s ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES})
-+target_link_libraries (precompile avrocpp_s ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES} ZLIB::ZLIB)
- 
- macro (gen file ns)
-     add_custom_command (OUTPUT ${file}.hh
-@@ -166,37 +169,41 @@ gen (primitivetypes pt)
- gen (cpp_reserved_words cppres)
- 
- add_executable (avrogencpp impl/avrogencpp.cc)
--target_link_libraries (avrogencpp avrocpp_s ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES})
-+target_link_libraries (avrogencpp avrocpp_s ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES} ZLIB::ZLIB)
- 
--enable_testing()
-+if(BUILD_TESTING)
-+  enable_testing()
-+endif()
- 
- macro (unittest name)
--    add_executable (${name} test/${name}.cc)
--    target_link_libraries (${name} avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES})
-+    add_executable (${name} test/${name}.cc impl/json/JsonIO.cc impl/json/JsonDom.cc)
-+    target_link_libraries (${name} avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES} ZLIB::ZLIB)
-     add_test (NAME ${name} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-         COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${name})
- endmacro (unittest)
- 
--unittest (buffertest)
--unittest (unittest)
--unittest (SchemaTests)
--unittest (LargeSchemaTests)
--unittest (CodecTests)
--unittest (StreamTests)
--unittest (SpecificTests)
--unittest (DataFileTests)
--unittest (JsonTests)
--unittest (AvrogencppTests)
--unittest (CompilerTests)
--unittest (AvrogencppTestReservedWords)
--
--add_dependencies (AvrogencppTestReservedWords cpp_reserved_words_hh)
--
--add_dependencies (AvrogencppTests bigrecord_hh bigrecord_r_hh bigrecord2_hh
--    tweet_hh
--    union_array_union_hh union_map_union_hh union_conflict_hh
--    recursive_hh reuse_hh circulardep_hh tree1_hh tree2_hh crossref_hh
--    primitivetypes_hh empty_record_hh)
-+if(BUILD_TESTING)
-+    unittest (buffertest)
-+    unittest (unittest)
-+    unittest (SchemaTests) 
-+    unittest (LargeSchemaTests)
-+    unittest (CodecTests)
-+    unittest (StreamTests)
-+    unittest (SpecificTests)
-+    unittest (DataFileTests)
-+    unittest (JsonTests)
-+    unittest (AvrogencppTests)
-+    unittest (CompilerTests)
-+    unittest (AvrogencppTestReservedWords)
-+
-+    add_dependencies (AvrogencppTestReservedWords cpp_reserved_words_hh)
-+
-+    add_dependencies (AvrogencppTests bigrecord_hh bigrecord_r_hh bigrecord2_hh
-+        tweet_hh
-+        union_array_union_hh union_map_union_hh union_conflict_hh
-+        recursive_hh reuse_hh circulardep_hh tree1_hh tree2_hh crossref_hh
-+        primitivetypes_hh empty_record_hh)
-+endif()
- 
- include (InstallRequiredSystemLibraries)
- 
-@@ -207,9 +214,9 @@ include (CPack)
- install (TARGETS avrocpp avrocpp_s
-     LIBRARY DESTINATION lib
-     ARCHIVE DESTINATION lib
--    RUNTIME DESTINATION lib)
-+    RUNTIME DESTINATION bin)
- 
--install (TARGETS avrogencpp RUNTIME DESTINATION bin)
-+install (TARGETS avrogencpp RUNTIME DESTINATION tools/bin)
- 
- install (DIRECTORY api/ DESTINATION include/avro
-     FILES_MATCHING PATTERN *.hh)
diff --git a/external_imported/vcpkg/ports/avro-cpp/portfile.cmake b/external_imported/vcpkg/ports/avro-cpp/portfile.cmake
index 6e2ee4923..89d92f64b 100644
--- a/external_imported/vcpkg/ports/avro-cpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/avro-cpp/portfile.cmake
@@ -1,18 +1,14 @@
-vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO apache/avro
-    REF e44b680621328c4e6524bd2983af1ce11afeebed
-    SHA512 932f642f272997b5c0be467d3a3ccc354c6edf425c36b33aa7e61984f67312c712bb1d74cb1a5fd8066169104851e73830f0ed3fdb450e005a5c5bef33c34f20
+    REF "release-${VERSION}"
+    SHA512 728609f562460e1115366663ede2c5d4acbdd6950c1ee3e434ffc65d28b72e3a43c3ebce93d0a8459f0c4f6c492ebb9444e2127a0385f38eb7cdf74b28f0c3ed
     HEAD_REF master
     PATCHES
-        install.patch
+        fix-cmake.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    FEATURES
-        test               BUILD_TESTING
     INVERTED_FEATURES
         snappy             CMAKE_DISABLE_FIND_PACKAGE_Snappy
 )
@@ -20,14 +16,34 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}/lang/c++"
     OPTIONS
+        -DBUILD_TESTING=OFF
         ${FEATURE_OPTIONS}
 )
 
-vcpkg_cmake_install(ADD_BIN_TO_PATH)
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT})
+
+file(READ "${CURRENT_PACKAGES_DIR}/share/unofficial-avro-cpp/unofficial-avro-cpp-config.cmake" cmake_config)
+if("snappy" IN_LIST FEATURES)
+    file(WRITE "${CURRENT_PACKAGES_DIR}/share/unofficial-avro-cpp/unofficial-avro-cpp-config.cmake"
+"include(CMakeFindDependencyMacro)
+find_dependency(ZLIB)
+find_dependency(Snappy)
+${cmake_config}
+")
+else()
+    file(WRITE "${CURRENT_PACKAGES_DIR}/share/unofficial-avro-cpp/unofficial-avro-cpp-config.cmake"
+"include(CMakeFindDependencyMacro)
+find_dependency(ZLIB)
+${cmake_config}
+")
+endif()
 
 vcpkg_copy_pdbs()
+vcpkg_copy_tools(TOOL_NAMES avrogencpp AUTO_CLEAN)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-file(INSTALL "${SOURCE_PATH}/lang/c++/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/lang/c++/LICENSE")
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/avro-cpp/usage b/external_imported/vcpkg/ports/avro-cpp/usage
index f59a204cb..243b52d86 100644
--- a/external_imported/vcpkg/ports/avro-cpp/usage
+++ b/external_imported/vcpkg/ports/avro-cpp/usage
@@ -1,9 +1,4 @@
-The package avro-cpp can be used from CMake via:
+avro-cpp provides CMake targets:
 
-    find_path(AVROCPP_INCLUDE_DIR avro/Encoder.hh)
-    find_library(AVROCPP_LIBRARY_DEBUG avrocpp PATH_SUFFIXES "debug/lib" REQUIRED)
-    get_filename_component(AVROCPP_ROOT_FIND_DIR ${AVROCPP_INCLUDE_DIR} DIRECTORY)
-    find_library(AVROCPP_LIBRARY_RELEASE avrocpp PATHS "${AVROCPP_ROOT_FIND_DIR}/lib/" REQUIRED NO_DEFAULT_PATH)
-
-    target_include_directories(main PRIVATE "${AVROCPP_INCLUDE_DIR}")
-    target_link_libraries(main PRIVATE optimized "${AVROCPP_LIBRARY_RELEASE}" debug "${AVROCPP_LIBRARY_DEBUG}")
+    find_package(unofficial-avro-cpp CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE unofficial::avro-cpp::avrocpp)
diff --git a/external_imported/vcpkg/ports/avro-cpp/vcpkg.json b/external_imported/vcpkg/ports/avro-cpp/vcpkg.json
index 735fdac64..dc4c4b20a 100644
--- a/external_imported/vcpkg/ports/avro-cpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/avro-cpp/vcpkg.json
@@ -1,10 +1,9 @@
 {
   "name": "avro-cpp",
-  "version-date": "2022-11-07",
+  "version": "1.11.3",
   "description": "Apache Avro is a data serialization system",
   "homepage": "https://github.com/apache/avro",
   "license": "Apache-2.0",
-  "supports": "!(windows & static)",
   "dependencies": [
     "boost-algorithm",
     "boost-any",
@@ -21,6 +20,10 @@
       "name": "vcpkg-cmake",
       "host": true
     },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
     "zlib"
   ],
   "features": {
@@ -29,16 +32,6 @@
       "dependencies": [
         "snappy"
       ]
-    },
-    "test": {
-      "description": "Build tests",
-      "dependencies": [
-        "boost-asio",
-        "boost-bind",
-        "boost-smart-ptr",
-        "boost-test",
-        "boost-thread"
-      ]
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/aws-c-auth/portfile.cmake b/external_imported/vcpkg/ports/aws-c-auth/portfile.cmake
index 8f695b9a4..917ed3bb2 100644
--- a/external_imported/vcpkg/ports/aws-c-auth/portfile.cmake
+++ b/external_imported/vcpkg/ports/aws-c-auth/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO awslabs/aws-c-auth
     REF "v${VERSION}"
-    SHA512 f3b06d24d1a27a0cf548545a57acf3ae1c66ac09ed6c242f206c0237da7720f913726879bd26cbf8ff389ca935dd321a6a2228d0fde9d054322453e876bf30d2
+    SHA512 d062c22b718e35f5da843b4ae0071405a3627982c0ad55d4214920650086cd6da35f0c3b21d6360c4324dde3f647faa47e5c3331fd5a58930c6de31d27093321
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/aws-c-auth/vcpkg.json b/external_imported/vcpkg/ports/aws-c-auth/vcpkg.json
index 9c9262017..33d2c12be 100644
--- a/external_imported/vcpkg/ports/aws-c-auth/vcpkg.json
+++ b/external_imported/vcpkg/ports/aws-c-auth/vcpkg.json
@@ -1,12 +1,12 @@
 {
   "name": "aws-c-auth",
-  "version": "0.6.22",
+  "version": "0.7.14",
   "description": "C99 library implementation of AWS client-side authentication: standard credentials providers and signing.",
   "homepage": "https://github.com/awslabs/aws-c-auth",
   "license": "Apache-2.0",
   "supports": "!(windows & arm) & !uwp",
   "dependencies": [
-    "aws-c-common",
+    "aws-c-cal",
     "aws-c-http",
     "aws-c-sdkutils",
     {
diff --git a/external_imported/vcpkg/ports/aws-c-cal/portfile.cmake b/external_imported/vcpkg/ports/aws-c-cal/portfile.cmake
index bc8151e37..3cef1fbb2 100644
--- a/external_imported/vcpkg/ports/aws-c-cal/portfile.cmake
+++ b/external_imported/vcpkg/ports/aws-c-cal/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO awslabs/aws-c-cal
     REF "v${VERSION}"
-    SHA512 7cb52b0f000e38f4e4af392f67efbece607b2643cb9de8ca267d4416192e2c61f8f0bbcddbdb0f8e511cfe3feb890b00d69427b154c0f5e3853684e895f3b935
+    SHA512 deee106b366522e6781974c92b1aa06542b7857b91a8d4cb59eb0e17247ce7fc3ffacb044c032ff7f2a0f9baca807d4c2d9a14934d4576966f48bfc0661e5edb
     HEAD_REF master
     PATCHES remove-libcrypto-messages.patch
 )
diff --git a/external_imported/vcpkg/ports/aws-c-cal/vcpkg.json b/external_imported/vcpkg/ports/aws-c-cal/vcpkg.json
index b7e233fdf..b1d22ed8e 100644
--- a/external_imported/vcpkg/ports/aws-c-cal/vcpkg.json
+++ b/external_imported/vcpkg/ports/aws-c-cal/vcpkg.json
@@ -1,12 +1,16 @@
 {
   "name": "aws-c-cal",
-  "version": "0.5.20",
+  "version": "0.6.9",
   "description": "C99 wrapper for cryptography primitives.",
   "homepage": "https://github.com/awslabs/aws-c-cal",
   "license": "Apache-2.0",
   "supports": "!(windows & arm) & !uwp",
   "dependencies": [
     "aws-c-common",
+    {
+      "name": "openssl",
+      "platform": "!windows & !osx"
+    },
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/external_imported/vcpkg/ports/aws-c-common/disable-internal-crt-option.patch b/external_imported/vcpkg/ports/aws-c-common/disable-internal-crt-option.patch
index 6fec4b214..28cb47876 100644
--- a/external_imported/vcpkg/ports/aws-c-common/disable-internal-crt-option.patch
+++ b/external_imported/vcpkg/ports/aws-c-common/disable-internal-crt-option.patch
@@ -1,20 +1,20 @@
 diff --git a/cmake/AwsCFlags.cmake b/cmake/AwsCFlags.cmake
-index 249b7d5..41a31e2 100644
+index 470f6db..537536b 100644
 --- a/cmake/AwsCFlags.cmake
 +++ b/cmake/AwsCFlags.cmake
-@@ -38,15 +38,6 @@ function(aws_set_common_properties target)
+@@ -82,15 +82,6 @@ function(aws_set_common_properties target)
              list(APPEND AWS_C_FLAGS /DAWS_SUPPORT_WIN7=1)
          endif()
- 
--        string(TOUPPER "${CMAKE_BUILD_TYPE}" _CMAKE_BUILD_TYPE)
--        if(STATIC_CRT)
--            string(REPLACE "/MD" "/MT" _FLAGS "${CMAKE_C_FLAGS_${_CMAKE_BUILD_TYPE}}")
+
+-        # Set MSVC runtime libary.
+-        # Note: there are other ways of doing this if we bump our CMake minimum to 3.14+
+-        # See: https://cmake.org/cmake/help/latest/policy/CMP0091.html
+-        if (AWS_STATIC_MSVC_RUNTIME_LIBRARY OR STATIC_CRT)
+-            list(APPEND AWS_C_FLAGS "/MT$<$<CONFIG:Debug>:d>")
 -        else()
--            string(REPLACE "/MT" "/MD" _FLAGS "${CMAKE_C_FLAGS_${_CMAKE_BUILD_TYPE}}")
+-            list(APPEND AWS_C_FLAGS "/MD$<$<CONFIG:Debug>:d>")
 -        endif()
--        string(REPLACE " " ";" _FLAGS "${_FLAGS}")
--        list(APPEND AWS_C_FLAGS "${_FLAGS}")
 -
      else()
          list(APPEND AWS_C_FLAGS -Wall -Wstrict-prototypes)
- 
+
diff --git a/external_imported/vcpkg/ports/aws-c-common/portfile.cmake b/external_imported/vcpkg/ports/aws-c-common/portfile.cmake
index 800b81580..bc6320315 100644
--- a/external_imported/vcpkg/ports/aws-c-common/portfile.cmake
+++ b/external_imported/vcpkg/ports/aws-c-common/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO awslabs/aws-c-common
     REF "v${VERSION}"
-    SHA512 713f705e28392d4009afddcd08acb6bdf7dc0e6129bcb90163c56976b3151774860b2d978944f057d010acdf14b7e66d70bf79066239d4fad571635f4353d4e5
+    SHA512 8bcada7b7b89f25b9469a3f21dad250f9e1ffde185f3202ba32cc47c27ade1994505f8b5bd19ccefb6ef905d2ffbd985f406c5c0337fbd8a936f71798710ff0e
     HEAD_REF master
     PATCHES
         disable-internal-crt-option.patch # Disable internal crt option because vcpkg contains crt processing flow
diff --git a/external_imported/vcpkg/ports/aws-c-common/vcpkg.json b/external_imported/vcpkg/ports/aws-c-common/vcpkg.json
index 68edb1a4f..438e962b6 100644
--- a/external_imported/vcpkg/ports/aws-c-common/vcpkg.json
+++ b/external_imported/vcpkg/ports/aws-c-common/vcpkg.json
@@ -1,12 +1,11 @@
 {
   "name": "aws-c-common",
-  "version": "0.8.9",
+  "version": "0.9.12",
   "description": "AWS common library for C",
   "homepage": "https://github.com/awslabs/aws-c-common",
   "license": "Apache-2.0",
   "supports": "!(windows & arm) & !uwp",
   "dependencies": [
-    "openssl",
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/external_imported/vcpkg/ports/aws-c-compression/portfile.cmake b/external_imported/vcpkg/ports/aws-c-compression/portfile.cmake
index b397da570..0cd5e84c6 100644
--- a/external_imported/vcpkg/ports/aws-c-compression/portfile.cmake
+++ b/external_imported/vcpkg/ports/aws-c-compression/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO awslabs/aws-c-compression
     REF "v${VERSION}"
-    SHA512 6ca0a29ed97f3f83cce9d106d56a1ae7a9034caa63bfb3cdb29bb1ac4906738a940ffb0b85dede821ef0878bba7b2e9f5e627ae0d3acd99b24979e6567e5e6ae
+    SHA512 7813ae3d19336a187dd218d22748a09b397aea68f344e44ce0472490babdd7c7a4bb94d586a38d7f0c7d3b6f29502ec9ccf080b020e15fd24891ec1b3cdb4663
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/aws-c-compression/vcpkg.json b/external_imported/vcpkg/ports/aws-c-compression/vcpkg.json
index 083b70d83..351ad87ce 100644
--- a/external_imported/vcpkg/ports/aws-c-compression/vcpkg.json
+++ b/external_imported/vcpkg/ports/aws-c-compression/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "aws-c-compression",
-  "version": "0.2.16",
+  "version": "0.2.17",
   "description": "C99 implementation of huffman encoding/decoding",
   "homepage": "https://github.com/awslabs/aws-c-compression",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/aws-c-event-stream/portfile.cmake b/external_imported/vcpkg/ports/aws-c-event-stream/portfile.cmake
index 714c6a5cf..b22fcd23a 100644
--- a/external_imported/vcpkg/ports/aws-c-event-stream/portfile.cmake
+++ b/external_imported/vcpkg/ports/aws-c-event-stream/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO awslabs/aws-c-event-stream
     REF "v${VERSION}"
-    SHA512 c92bb81e2dd1652a2aef2de391584055c44847736366f6c4afa4033529fdc64fc2ec5ea5604f33cc5fd755359e22dca9db7682f40cf75b187625d6670a68fdab
+    SHA512 839dbdd6878481aebdbb44a273e42009898256bed63cc10414f0a4fc9e207feeeb8191b60196f6d0c936d70d8035cd0e8e2fff35864b2c0f546714d41b401067
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/aws-c-event-stream/vcpkg.json b/external_imported/vcpkg/ports/aws-c-event-stream/vcpkg.json
index a1e3cc79c..82917bcf7 100644
--- a/external_imported/vcpkg/ports/aws-c-event-stream/vcpkg.json
+++ b/external_imported/vcpkg/ports/aws-c-event-stream/vcpkg.json
@@ -1,12 +1,11 @@
 {
   "name": "aws-c-event-stream",
-  "version": "0.2.18",
+  "version": "0.4.1",
   "description": "C99 implementation of the vnd.amazon.event-stream content-type.",
   "homepage": "https://github.com/awslabs/aws-c-event-stream",
   "license": "Apache-2.0",
   "supports": "!(windows & arm) & !uwp",
   "dependencies": [
-    "aws-c-cal",
     "aws-c-common",
     "aws-c-io",
     "aws-checksums",
diff --git a/external_imported/vcpkg/ports/aws-c-http/portfile.cmake b/external_imported/vcpkg/ports/aws-c-http/portfile.cmake
index b8bddf4bb..7ced2cb23 100644
--- a/external_imported/vcpkg/ports/aws-c-http/portfile.cmake
+++ b/external_imported/vcpkg/ports/aws-c-http/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO awslabs/aws-c-http
     REF "v${VERSION}"
-    SHA512 ed5d70d89721e5e850d6ee648b4105911236474538bef5b50ece15695625647b131b27557682eaa8ff01fc3da0f537befe31a1db39ad65bbb9ed4e9e6b8927a9
+    SHA512 c440ad1590c050c45634f0245fb26e9193b00e3020d26e132715ca1321fa4a36f1cc765753950c2f220a05ec7a6fe3ffa31c07ed0e83d40447714c65cbd36fb9
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/aws-c-http/vcpkg.json b/external_imported/vcpkg/ports/aws-c-http/vcpkg.json
index 582bacba5..431ea3e1f 100644
--- a/external_imported/vcpkg/ports/aws-c-http/vcpkg.json
+++ b/external_imported/vcpkg/ports/aws-c-http/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "aws-c-http",
-  "version": "0.7.3",
+  "version": "0.8.0",
   "description": "C99 implementation of the HTTP/1.1 and HTTP/2 specifications",
   "homepage": "https://github.com/awslabs/aws-c-http",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/aws-c-io/portfile.cmake b/external_imported/vcpkg/ports/aws-c-io/portfile.cmake
index 5bc9d3921..78e1c6e1e 100644
--- a/external_imported/vcpkg/ports/aws-c-io/portfile.cmake
+++ b/external_imported/vcpkg/ports/aws-c-io/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO awslabs/aws-c-io
     REF "v${VERSION}"
-    SHA512 d6efa6f6519ccdc31c3a9c33c0fb48548f9ed6b1845a4e3cafc945938faa138ae6478995bb8d2eac12a101cab05fa98662a34cc7ca62c2b2ffcfd6ef85394efa
+    SHA512 bb8666853abbd583aea2f30099fe947562809ccab36ae11708c118b5bd6a7876b8d94ef45bb988b44c4dd1dc76e6dff70adb7a20b8b5d89d2d7ea2138b3ecea8
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/aws-c-io/vcpkg.json b/external_imported/vcpkg/ports/aws-c-io/vcpkg.json
index 470eb52b2..82c44b016 100644
--- a/external_imported/vcpkg/ports/aws-c-io/vcpkg.json
+++ b/external_imported/vcpkg/ports/aws-c-io/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "aws-c-io",
-  "version": "0.13.14",
+  "version": "0.14.3",
   "description": "Handles all IO and TLS work for application protocols.",
   "homepage": "https://github.com/awslabs/aws-c-io",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/aws-c-mqtt/portfile.cmake b/external_imported/vcpkg/ports/aws-c-mqtt/portfile.cmake
index b6d879e02..ff0f9a4af 100644
--- a/external_imported/vcpkg/ports/aws-c-mqtt/portfile.cmake
+++ b/external_imported/vcpkg/ports/aws-c-mqtt/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO awslabs/aws-c-mqtt
     REF "v${VERSION}"
-    SHA512 7610494ef3cb56c89f7a70de7918a17a0674ed1686bfd7a0d72d45e53cbf93e68667f5b8ac4df104cafb394dc5d9f2f2fdea608ebd227ea63658859cc0cd5c8b
+    SHA512 05c435b1310ecc3ab1ef38ec65b3ec483c0923f12d83d9cc73e20bf78068421de7d254cef763deddcf128d34a8d0126b22a6e98009c851aea30d8dd65af9b72b
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/aws-c-mqtt/vcpkg.json b/external_imported/vcpkg/ports/aws-c-mqtt/vcpkg.json
index e05e5a805..d2c323386 100644
--- a/external_imported/vcpkg/ports/aws-c-mqtt/vcpkg.json
+++ b/external_imported/vcpkg/ports/aws-c-mqtt/vcpkg.json
@@ -1,12 +1,11 @@
 {
   "name": "aws-c-mqtt",
-  "version": "0.8.5",
+  "version": "0.10.1",
   "description": "C99 implementation of the MQTT 3.1.1 specification.",
   "homepage": "https://github.com/awslabs/aws-c-mqtt",
   "license": "Apache-2.0",
   "supports": "!(windows & arm) & !uwp",
   "dependencies": [
-    "aws-c-common",
     "aws-c-http",
     "aws-c-io",
     {
diff --git a/external_imported/vcpkg/ports/aws-c-s3/portfile.cmake b/external_imported/vcpkg/ports/aws-c-s3/portfile.cmake
index c21cfb58b..452e85564 100644
--- a/external_imported/vcpkg/ports/aws-c-s3/portfile.cmake
+++ b/external_imported/vcpkg/ports/aws-c-s3/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO awslabs/aws-c-s3
     REF "v${VERSION}"
-    SHA512 b0ebae3a2f2505c08d6c7bcba56f3a39ce5286619d6c2492d8aa3e3863e7067cf151a04f18e385eef9a2b7fbe375dd5f966c235ce3957e34ef2f2f22a9c4514f
+    SHA512 9c97327ce06e3977b7cce409a679c1f815fb6b315c61b2c2cb8912b76fc7a19e0bbe5d2733630fa7dccb76a9d8f61236d60191c57b896eb9bf6ae3961dda39d1
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/aws-c-s3/vcpkg.json b/external_imported/vcpkg/ports/aws-c-s3/vcpkg.json
index 7ef0efb44..0b8e74ccd 100644
--- a/external_imported/vcpkg/ports/aws-c-s3/vcpkg.json
+++ b/external_imported/vcpkg/ports/aws-c-s3/vcpkg.json
@@ -1,17 +1,15 @@
 {
   "name": "aws-c-s3",
-  "version": "0.2.3",
+  "version": "0.5.0",
   "description": "C99 library implementation for communicating with the S3 service, designed for maximizing throughput on high bandwidth EC2 instances.",
   "homepage": "https://github.com/awslabs/aws-c-s3",
   "license": "Apache-2.0",
   "supports": "!(windows & arm) & !uwp",
   "dependencies": [
     "aws-c-auth",
-    "aws-c-cal",
-    "aws-c-common",
-    "aws-c-compression",
     "aws-c-http",
-    "aws-c-io",
+    "aws-c-sdkutils",
+    "aws-checksums",
     {
       "name": "s2n",
       "platform": "!uwp & !windows"
diff --git a/external_imported/vcpkg/ports/aws-c-sdkutils/portfile.cmake b/external_imported/vcpkg/ports/aws-c-sdkutils/portfile.cmake
index 793538f61..e4ef1f31e 100644
--- a/external_imported/vcpkg/ports/aws-c-sdkutils/portfile.cmake
+++ b/external_imported/vcpkg/ports/aws-c-sdkutils/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO awslabs/aws-c-sdkutils
     REF "v${VERSION}"
-    SHA512 3c94a985a8952441eb5453ceea41ebb3aa3e075a6f2dcb3b013f2336a7c36dbcbc022696ac9e807bb25f563f969dd604a89b7ed7ef746170dda3cae0fc06262c
+    SHA512 e364613363c6dd50a97209bd4fa7b926fec2ca5eb4bac07fb0c44eecbf847d2d1a671ffa7edda613bbbab4eaf27973945be61d66b32b851ae31c8f3508e7137a
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/aws-c-sdkutils/vcpkg.json b/external_imported/vcpkg/ports/aws-c-sdkutils/vcpkg.json
index 999b13a92..4bfe24f3b 100644
--- a/external_imported/vcpkg/ports/aws-c-sdkutils/vcpkg.json
+++ b/external_imported/vcpkg/ports/aws-c-sdkutils/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "aws-c-sdkutils",
-  "version": "0.1.7",
+  "version": "0.1.14",
   "description": "C99 library implementing AWS SDK specific utilities. Includes utilities for ARN parsing, reading AWS profiles, etc...",
   "homepage": "https://github.com/awslabs/aws-c-sdkutils",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/aws-checksums/portfile.cmake b/external_imported/vcpkg/ports/aws-checksums/portfile.cmake
index 30842b8d9..07234e6ca 100644
--- a/external_imported/vcpkg/ports/aws-checksums/portfile.cmake
+++ b/external_imported/vcpkg/ports/aws-checksums/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO awslabs/aws-checksums
     REF "v${VERSION}"
-    SHA512 3aae2e9818a1cec3e002c480a7979780b613c9f2389e719c6b35df9d118cd789bad48d9fbe348e20988cffafaee85f766a828be673a34d1963e775a1b951737b
+    SHA512 b75f5442db9a61f8856756c4a784339fd446effca0cdb02c67e51ce9f14ea76f5ca94d29a69f2a452c63c868598489343ec1d097432a8a0159868731422cfbf4
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/aws-checksums/vcpkg.json b/external_imported/vcpkg/ports/aws-checksums/vcpkg.json
index 844a1505d..c915c2157 100644
--- a/external_imported/vcpkg/ports/aws-checksums/vcpkg.json
+++ b/external_imported/vcpkg/ports/aws-checksums/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "aws-checksums",
-  "version": "0.1.14",
+  "version": "0.1.17",
   "description": "Cross-Platform HW accelerated CRC32c and CRC32 with fallback to efficient SW implementations.",
   "homepage": "https://github.com/awslabs/aws-checksums",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/aws-crt-cpp/no-werror.patch b/external_imported/vcpkg/ports/aws-crt-cpp/no-werror.patch
index 2b2e84058..27b7c8f8a 100644
--- a/external_imported/vcpkg/ports/aws-crt-cpp/no-werror.patch
+++ b/external_imported/vcpkg/ports/aws-crt-cpp/no-werror.patch
@@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 --- a/CMakeLists.txt	(revision f2adef31d778cfe90b8a5bb377425f825ebf92f0)
 +++ b/CMakeLists.txt	(date 1675009099302)
 @@ -337,9 +337,9 @@
-  # set extra warning flags
+ # set extra warning flags
  if(AWS_WARNINGS_ARE_ERRORS)
      if(MSVC)
 -        target_compile_options(${PROJECT_NAME} PRIVATE /W4 /WX /wd4068)
diff --git a/external_imported/vcpkg/ports/aws-crt-cpp/portfile.cmake b/external_imported/vcpkg/ports/aws-crt-cpp/portfile.cmake
index 048583c1c..5234ae838 100644
--- a/external_imported/vcpkg/ports/aws-crt-cpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/aws-crt-cpp/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO awslabs/aws-crt-cpp
     REF "v${VERSION}"
-    SHA512 497bd9a127caaafe4b2a97c8f16fe3847085c59ac5ef43d1819bcb9cc6ad32fbd3d1ec507cb42810871a5e5ce08033a1a36aced0e250b2538bf905bf61459950
+    SHA512 f48c955fb1e9feef2a963572ed1bdc49e52f5ea6b3150d2f49f1c6d94e58ecd016ff020bf8ee272e5c192f0e214dbf8e47aad5f4fa722d4d207c170b029b3c80
     PATCHES
         no-werror.patch
 )
diff --git a/external_imported/vcpkg/ports/aws-crt-cpp/vcpkg.json b/external_imported/vcpkg/ports/aws-crt-cpp/vcpkg.json
index fb4ecddc5..f952d931b 100644
--- a/external_imported/vcpkg/ports/aws-crt-cpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/aws-crt-cpp/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "aws-crt-cpp",
-  "version": "0.19.5",
+  "version": "0.26.1",
   "description": "C++ wrapper around the aws-c-* libraries. Provides Cross-Platform Transport Protocols and SSL/TLS implementations for C++.",
   "homepage": "https://github.com/awslabs/aws-crt-cpp",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/aws-lambda-cpp/portfile.cmake b/external_imported/vcpkg/ports/aws-lambda-cpp/portfile.cmake
index 64d60be17..2ff9b9ee3 100644
--- a/external_imported/vcpkg/ports/aws-lambda-cpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/aws-lambda-cpp/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO awslabs/aws-lambda-cpp
     REF "v${VERSION}"
-    SHA512 842bada21427c9c85442b8a33228bae7b347214418fcd0681154f1bd384633217d724cab53cddf372a59dfa5de01cca59118a316b0fd58fe9f2403b3b62163f6
+    SHA512 a7be4a5c194139f4bd246b9212ea2b1718508a23b8650537fa5dc97873b4d58ce3d340740ba980958957c7f56d3f7aff535bd465ac48dae121b07d9a5be00d02
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/aws-lambda-cpp/vcpkg.json b/external_imported/vcpkg/ports/aws-lambda-cpp/vcpkg.json
index 62463d0eb..7e74d52ac 100644
--- a/external_imported/vcpkg/ports/aws-lambda-cpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/aws-lambda-cpp/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "aws-lambda-cpp",
-  "version": "0.2.8",
-  "port-version": 1,
+  "version": "0.2.10",
   "description": "C++ Runtime for AWS Lambda.",
   "license": "Apache-2.0",
   "supports": "linux",
diff --git a/external_imported/vcpkg/ports/aws-sdk-cpp/compute_build_only.cmake b/external_imported/vcpkg/ports/aws-sdk-cpp/compute_build_only.cmake
deleted file mode 100644
index 05a4649c8..000000000
--- a/external_imported/vcpkg/ports/aws-sdk-cpp/compute_build_only.cmake
+++ /dev/null
@@ -1,835 +0,0 @@
-# Automatically generated by generateFeatures.ps1
-if("access-management" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY access-management)
-endif()
-if("accessanalyzer" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY accessanalyzer)
-endif()
-if("acm" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY acm)
-endif()
-if("acm-pca" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY acm-pca)
-endif()
-if("alexaforbusiness" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY alexaforbusiness)
-endif()
-if("amp" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY amp)
-endif()
-if("amplify" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY amplify)
-endif()
-if("amplifybackend" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY amplifybackend)
-endif()
-if("apigateway" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY apigateway)
-endif()
-if("apigatewaymanagementapi" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY apigatewaymanagementapi)
-endif()
-if("apigatewayv2" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY apigatewayv2)
-endif()
-if("appconfig" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY appconfig)
-endif()
-if("appflow" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY appflow)
-endif()
-if("appintegrations" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY appintegrations)
-endif()
-if("application-autoscaling" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY application-autoscaling)
-endif()
-if("application-insights" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY application-insights)
-endif()
-if("applicationcostprofiler" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY applicationcostprofiler)
-endif()
-if("appmesh" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY appmesh)
-endif()
-if("apprunner" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY apprunner)
-endif()
-if("appstream" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY appstream)
-endif()
-if("appsync" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY appsync)
-endif()
-if("athena" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY athena)
-endif()
-if("auditmanager" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY auditmanager)
-endif()
-if("autoscaling" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY autoscaling)
-endif()
-if("autoscaling-plans" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY autoscaling-plans)
-endif()
-if("awsmigrationhub" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY AWSMigrationHub)
-endif()
-if("awstransfer" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY awstransfer)
-endif()
-if("backup" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY backup)
-endif()
-if("batch" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY batch)
-endif()
-if("braket" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY braket)
-endif()
-if("budgets" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY budgets)
-endif()
-if("ce" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY ce)
-endif()
-if("chime" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY chime)
-endif()
-if("cloud9" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY cloud9)
-endif()
-if("clouddirectory" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY clouddirectory)
-endif()
-if("cloudformation" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY cloudformation)
-endif()
-if("cloudfront" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY cloudfront)
-endif()
-if("cloudhsm" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY cloudhsm)
-endif()
-if("cloudhsmv2" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY cloudhsmv2)
-endif()
-if("cloudsearch" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY cloudsearch)
-endif()
-if("cloudsearchdomain" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY cloudsearchdomain)
-endif()
-if("cloudtrail" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY cloudtrail)
-endif()
-if("codeartifact" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY codeartifact)
-endif()
-if("codebuild" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY codebuild)
-endif()
-if("codecommit" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY codecommit)
-endif()
-if("codedeploy" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY codedeploy)
-endif()
-if("codeguru-reviewer" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY codeguru-reviewer)
-endif()
-if("codeguruprofiler" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY codeguruprofiler)
-endif()
-if("codepipeline" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY codepipeline)
-endif()
-if("codestar" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY codestar)
-endif()
-if("codestar-connections" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY codestar-connections)
-endif()
-if("codestar-notifications" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY codestar-notifications)
-endif()
-if("cognito-identity" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY cognito-identity)
-endif()
-if("cognito-idp" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY cognito-idp)
-endif()
-if("cognito-sync" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY cognito-sync)
-endif()
-if("comprehend" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY comprehend)
-endif()
-if("comprehendmedical" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY comprehendmedical)
-endif()
-if("compute-optimizer" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY compute-optimizer)
-endif()
-if("config" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY config)
-endif()
-if("connect" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY connect)
-endif()
-if("connect-contact-lens" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY connect-contact-lens)
-endif()
-if("connectparticipant" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY connectparticipant)
-endif()
-if("cur" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY cur)
-endif()
-if("customer-profiles" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY customer-profiles)
-endif()
-if("databrew" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY databrew)
-endif()
-if("dataexchange" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY dataexchange)
-endif()
-if("datapipeline" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY datapipeline)
-endif()
-if("datasync" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY datasync)
-endif()
-if("dax" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY dax)
-endif()
-if("detective" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY detective)
-endif()
-if("devicefarm" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY devicefarm)
-endif()
-if("devops-guru" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY devops-guru)
-endif()
-if("directconnect" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY directconnect)
-endif()
-if("discovery" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY discovery)
-endif()
-if("dlm" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY dlm)
-endif()
-if("dms" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY dms)
-endif()
-if("docdb" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY docdb)
-endif()
-if("ds" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY ds)
-endif()
-if("dynamodb" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY dynamodb)
-endif()
-if("dynamodbstreams" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY dynamodbstreams)
-endif()
-if("ebs" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY ebs)
-endif()
-if("ec2" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY ec2)
-endif()
-if("ec2-instance-connect" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY ec2-instance-connect)
-endif()
-if("ecr" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY ecr)
-endif()
-if("ecr-public" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY ecr-public)
-endif()
-if("ecs" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY ecs)
-endif()
-if("eks" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY eks)
-endif()
-if("elastic-inference" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY elastic-inference)
-endif()
-if("elasticache" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY elasticache)
-endif()
-if("elasticbeanstalk" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY elasticbeanstalk)
-endif()
-if("elasticfilesystem" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY elasticfilesystem)
-endif()
-if("elasticloadbalancing" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY elasticloadbalancing)
-endif()
-if("elasticloadbalancingv2" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY elasticloadbalancingv2)
-endif()
-if("elasticmapreduce" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY elasticmapreduce)
-endif()
-if("elastictranscoder" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY elastictranscoder)
-endif()
-if("email" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY email)
-endif()
-if("emr-containers" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY emr-containers)
-endif()
-if("es" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY es)
-endif()
-if("eventbridge" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY eventbridge)
-endif()
-if("events" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY events)
-endif()
-if("finspace" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY finspace)
-endif()
-if("finspace-data" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY finspace-data)
-endif()
-if("firehose" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY firehose)
-endif()
-if("fis" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY fis)
-endif()
-if("fms" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY fms)
-endif()
-if("forecast" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY forecast)
-endif()
-if("forecastquery" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY forecastquery)
-endif()
-if("frauddetector" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY frauddetector)
-endif()
-if("fsx" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY fsx)
-endif()
-if("gamelift" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY gamelift)
-endif()
-if("glacier" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY glacier)
-endif()
-if("globalaccelerator" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY globalaccelerator)
-endif()
-if("glue" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY glue)
-endif()
-if("greengrass" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY greengrass)
-endif()
-if("greengrassv2" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY greengrassv2)
-endif()
-if("groundstation" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY groundstation)
-endif()
-if("guardduty" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY guardduty)
-endif()
-if("health" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY health)
-endif()
-if("healthlake" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY healthlake)
-endif()
-if("honeycode" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY honeycode)
-endif()
-if("iam" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY iam)
-endif()
-if("identity-management" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY identity-management)
-endif()
-if("identitystore" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY identitystore)
-endif()
-if("imagebuilder" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY imagebuilder)
-endif()
-if("importexport" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY importexport)
-endif()
-if("inspector" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY inspector)
-endif()
-if("iot" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY iot)
-endif()
-if("iot-data" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY iot-data)
-endif()
-if("iot-jobs-data" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY iot-jobs-data)
-endif()
-if("iot1click-devices" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY iot1click-devices)
-endif()
-if("iot1click-projects" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY iot1click-projects)
-endif()
-if("iotanalytics" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY iotanalytics)
-endif()
-if("iotdeviceadvisor" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY iotdeviceadvisor)
-endif()
-if("iotevents" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY iotevents)
-endif()
-if("iotevents-data" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY iotevents-data)
-endif()
-if("iotfleethub" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY iotfleethub)
-endif()
-if("iotsecuretunneling" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY iotsecuretunneling)
-endif()
-if("iotsitewise" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY iotsitewise)
-endif()
-if("iotthingsgraph" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY iotthingsgraph)
-endif()
-if("iotwireless" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY iotwireless)
-endif()
-if("ivs" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY ivs)
-endif()
-if("kafka" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY kafka)
-endif()
-if("kendra" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY kendra)
-endif()
-if("kinesis" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY kinesis)
-endif()
-if("kinesis-video-archived-media" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY kinesis-video-archived-media)
-endif()
-if("kinesis-video-media" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY kinesis-video-media)
-endif()
-if("kinesis-video-signaling" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY kinesis-video-signaling)
-endif()
-if("kinesisanalytics" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY kinesisanalytics)
-endif()
-if("kinesisanalyticsv2" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY kinesisanalyticsv2)
-endif()
-if("kinesisvideo" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY kinesisvideo)
-endif()
-if("kms" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY kms)
-endif()
-if("lakeformation" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY lakeformation)
-endif()
-if("lambda" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY lambda)
-endif()
-if("lex" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY lex)
-endif()
-if("lex-models" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY lex-models)
-endif()
-if("lexv2-models" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY lexv2-models)
-endif()
-if("lexv2-runtime" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY lexv2-runtime)
-endif()
-if("license-manager" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY license-manager)
-endif()
-if("lightsail" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY lightsail)
-endif()
-if("location" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY location)
-endif()
-if("logs" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY logs)
-endif()
-if("lookoutequipment" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY lookoutequipment)
-endif()
-if("lookoutmetrics" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY lookoutmetrics)
-endif()
-if("lookoutvision" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY lookoutvision)
-endif()
-if("machinelearning" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY machinelearning)
-endif()
-if("macie" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY macie)
-endif()
-if("macie2" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY macie2)
-endif()
-if("managedblockchain" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY managedblockchain)
-endif()
-if("marketplace-catalog" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY marketplace-catalog)
-endif()
-if("marketplace-entitlement" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY marketplace-entitlement)
-endif()
-if("marketplacecommerceanalytics" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY marketplacecommerceanalytics)
-endif()
-if("mediaconnect" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY mediaconnect)
-endif()
-if("mediaconvert" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY mediaconvert)
-endif()
-if("medialive" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY medialive)
-endif()
-if("mediapackage" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY mediapackage)
-endif()
-if("mediapackage-vod" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY mediapackage-vod)
-endif()
-if("mediastore" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY mediastore)
-endif()
-if("mediastore-data" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY mediastore-data)
-endif()
-if("mediatailor" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY mediatailor)
-endif()
-if("meteringmarketplace" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY meteringmarketplace)
-endif()
-if("mgn" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY mgn)
-endif()
-if("migrationhub-config" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY migrationhub-config)
-endif()
-if("mobile" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY mobile)
-endif()
-if("mobileanalytics" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY mobileanalytics)
-endif()
-if("monitoring" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY monitoring)
-endif()
-if("mq" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY mq)
-endif()
-if("mturk-requester" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY mturk-requester)
-endif()
-if("mwaa" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY mwaa)
-endif()
-if("neptune" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY neptune)
-endif()
-if("network-firewall" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY network-firewall)
-endif()
-if("networkmanager" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY networkmanager)
-endif()
-if("nimble" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY nimble)
-endif()
-if("opsworks" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY opsworks)
-endif()
-if("opsworkscm" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY opsworkscm)
-endif()
-if("organizations" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY organizations)
-endif()
-if("outposts" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY outposts)
-endif()
-if("personalize" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY personalize)
-endif()
-if("personalize-events" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY personalize-events)
-endif()
-if("personalize-runtime" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY personalize-runtime)
-endif()
-if("pi" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY pi)
-endif()
-if("pinpoint" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY pinpoint)
-endif()
-if("pinpoint-email" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY pinpoint-email)
-endif()
-if("polly" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY polly)
-endif()
-if("pricing" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY pricing)
-endif()
-if("qldb" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY qldb)
-endif()
-if("qldb-session" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY qldb-session)
-endif()
-if("queues" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY queues)
-endif()
-if("quicksight" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY quicksight)
-endif()
-if("ram" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY ram)
-endif()
-if("rds" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY rds)
-endif()
-if("rds-data" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY rds-data)
-endif()
-if("redshift" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY redshift)
-endif()
-if("redshift-data" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY redshift-data)
-endif()
-if("rekognition" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY rekognition)
-endif()
-if("resource-groups" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY resource-groups)
-endif()
-if("resourcegroupstaggingapi" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY resourcegroupstaggingapi)
-endif()
-if("robomaker" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY robomaker)
-endif()
-if("route53" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY route53)
-endif()
-if("route53domains" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY route53domains)
-endif()
-if("route53resolver" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY route53resolver)
-endif()
-if("s3" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY s3)
-endif()
-if("s3-crt" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY s3-crt)
-endif()
-if("s3-encryption" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY s3-encryption)
-endif()
-if("s3control" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY s3control)
-endif()
-if("s3outposts" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY s3outposts)
-endif()
-if("sagemaker" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY sagemaker)
-endif()
-if("sagemaker-a2i-runtime" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY sagemaker-a2i-runtime)
-endif()
-if("sagemaker-edge" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY sagemaker-edge)
-endif()
-if("sagemaker-featurestore-runtime" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY sagemaker-featurestore-runtime)
-endif()
-if("sagemaker-runtime" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY sagemaker-runtime)
-endif()
-if("savingsplans" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY savingsplans)
-endif()
-if("schemas" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY schemas)
-endif()
-if("sdb" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY sdb)
-endif()
-if("secretsmanager" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY secretsmanager)
-endif()
-if("securityhub" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY securityhub)
-endif()
-if("serverlessrepo" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY serverlessrepo)
-endif()
-if("service-quotas" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY service-quotas)
-endif()
-if("servicecatalog" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY servicecatalog)
-endif()
-if("servicecatalog-appregistry" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY servicecatalog-appregistry)
-endif()
-if("servicediscovery" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY servicediscovery)
-endif()
-if("sesv2" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY sesv2)
-endif()
-if("shield" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY shield)
-endif()
-if("signer" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY signer)
-endif()
-if("sms" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY sms)
-endif()
-if("sms-voice" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY sms-voice)
-endif()
-if("snowball" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY snowball)
-endif()
-if("sns" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY sns)
-endif()
-if("sqs" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY sqs)
-endif()
-if("ssm" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY ssm)
-endif()
-if("ssm-contacts" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY ssm-contacts)
-endif()
-if("ssm-incidents" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY ssm-incidents)
-endif()
-if("sso" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY sso)
-endif()
-if("sso-admin" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY sso-admin)
-endif()
-if("sso-oidc" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY sso-oidc)
-endif()
-if("states" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY states)
-endif()
-if("storagegateway" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY storagegateway)
-endif()
-if("sts" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY sts)
-endif()
-if("support" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY support)
-endif()
-if("swf" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY swf)
-endif()
-if("synthetics" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY synthetics)
-endif()
-if("text-to-speech" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY text-to-speech)
-endif()
-if("textract" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY textract)
-endif()
-if("timestream-query" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY timestream-query)
-endif()
-if("timestream-write" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY timestream-write)
-endif()
-if("transcribe" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY transcribe)
-endif()
-if("transcribestreaming" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY transcribestreaming)
-endif()
-if("transfer" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY transfer)
-endif()
-if("translate" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY translate)
-endif()
-if("waf" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY waf)
-endif()
-if("waf-regional" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY waf-regional)
-endif()
-if("wafv2" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY wafv2)
-endif()
-if("wellarchitected" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY wellarchitected)
-endif()
-if("workdocs" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY workdocs)
-endif()
-if("worklink" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY worklink)
-endif()
-if("workmail" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY workmail)
-endif()
-if("workmailmessageflow" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY workmailmessageflow)
-endif()
-if("workspaces" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY workspaces)
-endif()
-if("xray" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY xray)
-endif()
diff --git a/external_imported/vcpkg/ports/aws-sdk-cpp/fix-openssl3.patch b/external_imported/vcpkg/ports/aws-sdk-cpp/fix-openssl3.patch
deleted file mode 100644
index bd7967892..000000000
--- a/external_imported/vcpkg/ports/aws-sdk-cpp/fix-openssl3.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cmake/compiler_settings.cmake b/cmake/compiler_settings.cmake
-index cae5b92248..1aa728b01c 100644
---- a/cmake/compiler_settings.cmake
-+++ b/cmake/compiler_settings.cmake
-@@ -53,7 +53,7 @@ macro(set_gcc_flags)
- endmacro()
- 
- macro(set_gcc_warnings)
--    list(APPEND AWS_COMPILER_WARNINGS "-Wall" "-Werror" "-pedantic" "-Wextra")
-+    list(APPEND AWS_COMPILER_WARNINGS "-Wno-deprecated-declarations" "-Wall" "-Werror" "-pedantic" "-Wextra")
-     if(COMPILER_CLANG)
-         if(PLATFORM_ANDROID)
-             # when using clang with libc and API lower than 21 we need to include Android support headers and ignore the gnu-include-next warning.
diff --git a/external_imported/vcpkg/ports/aws-sdk-cpp/generateFeatures.ps1 b/external_imported/vcpkg/ports/aws-sdk-cpp/generateFeatures.ps1
index 89265ddbd..d0f9a5aba 100644
--- a/external_imported/vcpkg/ports/aws-sdk-cpp/generateFeatures.ps1
+++ b/external_imported/vcpkg/ports/aws-sdk-cpp/generateFeatures.ps1
@@ -1,73 +1,73 @@
-[CmdletBinding()]
-param(
-    [Parameter(Mandatory=$true)][string]$SourcesRef,
-    [Parameter(Mandatory=$false)][string]$PortDirectory = $PSScriptRoot,
-    [Parameter(Mandatory=$false)][string]$vcpkg = "$PSScriptRoot/../../vcpkg"
-)
-
-$ErrorActionPreference = "Stop"
-
-$ManifestIn = "$PortDirectory/vcpkg.in.json"
-$ManifestOut = "$PortDirectory/vcpkg.json"
-$CMakeFragmentFile = "$PortDirectory/compute_build_only.cmake"
-
-$ExtractedSources = "${env:TEMP}/aws-sdk-cpp-generateFeatures-$SourcesRef"
-if (-not (Test-Path $ExtractedSources)) {
-    if (Test-Path "$ExtractedSources.tmp") {
-        Remove-Item -Force "$ExtractedSources.tmp"
-    }
-    git clone "https://github.com/aws/aws-sdk-cpp" "$ExtractedSources.tmp" | Out-Host
-    git -c "$ExtractedSources.tmp" checkout $SourcesRef
-    Move-Item "$ExtractedSources.tmp" "$ExtractedSources"
-}
-Write-Host "Using sources directory: $ExtractedSources"
-
-
-$subfolders = Get-Item $ExtractedSources\aws-cpp-sdk-*
-
-$manifest = Get-Content $ManifestIn | ConvertFrom-Json
-$manifest | Add-Member `
-    -NotePropertyName '$note' `
-    -NotePropertyValue 'Automatically generated by generateFeatures.ps1'
-$manifest | Add-Member -NotePropertyName 'features' -NotePropertyValue @{}
-
-$cmakefragmenttext = @("# Automatically generated by generateFeatures.ps1")
-
-function GetDescription($dir, $modulename)
-{
-    if (Test-Path "$dir\CMakeLists.txt")
-    {
-        $descs = @(Select-String -Path "$dir\CMakeLists.txt" -Pattern "`"C\+\+ SDK for the AWS [^`"]*`"")
-        if ($descs.count -eq 1) {
-            $desc = $descs[0].Matches.Value -replace "`"",""
-            "$desc"
-        }
-        else { "C++ SDK for the AWS $modulename service" }
-    }
-    else { "C++ SDK for the AWS $modulename service" }
-}
-
-foreach ($subfolder in $subfolders)
-{
-    $modulename = $subfolder.name -replace "^aws-cpp-sdk-",""
-    if ($modulename -match "-tests`$") { continue }
-    if ($modulename -match "-sample`$") { continue }
-    if ($modulename -eq "core") { continue }
-
-    $lowermodulename = $modulename.ToLower()
-
-    $manifest.features.Add("$lowermodulename", @{ description=(GetDescription $subfolder $modulename) })
-
-    $cmakefragmenttext += @(
-        "if(`"$lowermodulename`" IN_LIST FEATURES)",
-        "  list(APPEND BUILD_ONLY $modulename)",
-        "endif()"
-    )
-}
-
-[IO.File]::WriteAllText($ManifestOut, (ConvertTo-Json -Depth 5 -InputObject $manifest))
-
-Write-Verbose ($cmakefragmenttext -join "`n")
-[IO.File]::WriteAllText($CMakeFragmentFile, ($cmakefragmenttext -join "`n") +"`n")
-
-& $vcpkg format-manifest --feature-flags=-manifests $ManifestOut
+[CmdletBinding()]
+param(
+    [Parameter(Mandatory=$true)][string]$SourcesRef,
+    [Parameter(Mandatory=$false)][string]$PortDirectory = $PSScriptRoot,
+    [Parameter(Mandatory=$false)][string]$vcpkg = "$PSScriptRoot/../../vcpkg"
+)
+
+$ErrorActionPreference = "Stop"
+
+$ManifestIn = "$PortDirectory/vcpkg.in.json"
+$ManifestOut = "$PortDirectory/vcpkg.json"
+
+$ExtractedSources = "${env:TEMP}/aws-sdk-cpp-generateFeatures-$SourcesRef"
+if (-not (Test-Path $ExtractedSources)) {
+    if (Test-Path "$ExtractedSources.tmp") {
+        Remove-Item -Force "$ExtractedSources.tmp"
+    }
+    git clone "https://github.com/aws/aws-sdk-cpp" "$ExtractedSources.tmp" | Out-Host
+    git -c "$ExtractedSources.tmp" checkout $SourcesRef
+    Move-Item "$ExtractedSources.tmp" "$ExtractedSources"
+}
+Write-Host "Using sources directory: $ExtractedSources"
+
+
+$subfolders = Get-ChildItem -Path "$ExtractedSources\generated\src\aws-cpp-sdk-*", "$ExtractedSources\src\aws-cpp-sdk*" | Sort-Object -Property Name
+
+$manifest = Get-Content $ManifestIn | ConvertFrom-Json
+$manifest | Add-Member `
+    -NotePropertyName '$note' `
+    -NotePropertyValue 'Automatically generated by generateFeatures.ps1'
+$manifest | Add-Member -NotePropertyName 'features' -NotePropertyValue @{}
+
+function GetDescription($dir, $modulename)
+{
+    if (Test-Path "$dir\CMakeLists.txt")
+    {
+        $descs = @(Select-String -Path "$dir\CMakeLists.txt" -Pattern "`"C\+\+ SDK for the AWS [^`"]*`"")
+        if ($descs.count -eq 1) {
+            $desc = $descs[0].Matches.Value -replace "`"",""
+            "$desc"
+        }
+        else { "C++ SDK for the AWS $modulename service" }
+    }
+    else { "C++ SDK for the AWS $modulename service" }
+}
+
+$featureDependencies = @{}
+Select-String -Path "$ExtractedSources\cmake\sdksCommon.cmake" -Pattern "list\(APPEND SDK_DEPENDENCY_LIST `"([\w-]+):([\w-,]+)`"\)" -AllMatches `
+| ForEach-Object { $_.Matches } `
+| ForEach-Object { $featureDependencies[$_.Groups[1].Value] = @($_.Groups[2].Value -split "," `
+| Where-Object { $_ -ne "core" }) }
+
+foreach ($subfolder in $subfolders)
+{
+    $modulename = $subfolder.name -replace "^aws-cpp-sdk-",""
+    if ($modulename -match "-tests`$") { continue }
+    if ($modulename -match "-sample`$") { continue }
+    if ($modulename -eq "core") { continue }
+
+    $lowermodulename = $modulename.ToLower()
+
+    $featureObj = @{ description = (GetDescription $subfolder $modulename) }
+
+    if ($featureDependencies.ContainsKey($lowermodulename)) {
+        $featureObj.dependencies = ,@{ name = "aws-sdk-cpp"; "default-features" = $false; "features" = $featureDependencies[$lowermodulename] }
+    }
+
+    $manifest.features.Add("$lowermodulename", $featureObj)
+}
+
+[IO.File]::WriteAllText($ManifestOut, (ConvertTo-Json -Depth 10 -InputObject $manifest))
+
+& $vcpkg format-manifest --feature-flags=-manifests $ManifestOut
diff --git a/external_imported/vcpkg/ports/aws-sdk-cpp/patch-relocatable-rpath.patch b/external_imported/vcpkg/ports/aws-sdk-cpp/patch-relocatable-rpath.patch
index 828647cc4..1dc1cfd76 100644
--- a/external_imported/vcpkg/ports/aws-sdk-cpp/patch-relocatable-rpath.patch
+++ b/external_imported/vcpkg/ports/aws-sdk-cpp/patch-relocatable-rpath.patch
@@ -1,12 +1,12 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a653e38628..76d6067646 100644
+index 41d220d5fa..f6ee9a2a74 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -142,7 +142,6 @@ else()
- endif()
- 
- # Add Linker search paths to RPATH so as to fix the problem where some linkers can't find cross-compiled dependent libraries in customer paths when linking executables.
--set(CMAKE_INSTALL_RPATH_USE_LINK_PATH true)
- 
- # build the sdk targets
- project("aws-cpp-sdk-all" VERSION "${PROJECT_VERSION}" LANGUAGES CXX)
+@@ -147,7 +147,6 @@ if (LEGACY_BUILD)
+     endif ()
+
+     # Add Linker search paths to RPATH so as to fix the problem where some linkers can't find cross-compiled dependent libraries in customer paths when linking executables.
+-    set(CMAKE_INSTALL_RPATH_USE_LINK_PATH true)
+
+     # build the sdk targets
+     project("aws-cpp-sdk-all" VERSION "${PROJECT_VERSION}" LANGUAGES CXX)
diff --git a/external_imported/vcpkg/ports/aws-sdk-cpp/portfile.cmake b/external_imported/vcpkg/ports/aws-sdk-cpp/portfile.cmake
index 5e9c815ea..0c41c11f3 100644
--- a/external_imported/vcpkg/ports/aws-sdk-cpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/aws-sdk-cpp/portfile.cmake
@@ -1,101 +1,101 @@
-vcpkg_buildpath_length_warning(37)
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO aws/aws-sdk-cpp
-    REF "${VERSION}"
-    SHA512 d30a9cbe67aca41e98c799b55122ff97e9a935d2073ae4c1ca6545b68719236c0f2daf665cc3c0da4210e6e24e908a7a3cd0b826242e8fb5a97763f43e92b57a
-    PATCHES
-        patch-relocatable-rpath.patch
-        fix-aws-root.patch
-        fix-openssl3.patch
-        lock-curl-http-and-tls-settings.patch
-)
-
-string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" FORCE_SHARED_CRT)
-
-set(EXTRA_ARGS)
-if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS)
-    set(rpath "@loader_path")
-elseif (VCPKG_TARGET_IS_ANDROID)
-    set(EXTRA_ARGS "-DTARGET_ARCH=ANDROID"
-            "-DGIT_EXECUTABLE=--invalid-git-executable--"
-            "-DGIT_FOUND=TRUE"
-            "-DNDK_DIR=$ENV{ANDROID_NDK_HOME}"
-            "-DANDROID_BUILD_ZLIB=FALSE"
-            "-DANDROID_BUILD_CURL=FALSE"
-            "-DANDROID_BUILD_OPENSSL=FALSE"
-            )
-else()
-    set(rpath "\$ORIGIN")
-endif()
-
-set(BUILD_ONLY core)
-include(${CMAKE_CURRENT_LIST_DIR}/compute_build_only.cmake)
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    DISABLE_PARALLEL_CONFIGURE
-    OPTIONS
-        ${EXTRA_ARGS}
-        "-DENABLE_UNITY_BUILD=ON"
-        "-DENABLE_TESTING=OFF"
-        "-DFORCE_SHARED_CRT=${FORCE_SHARED_CRT}"
-        "-DBUILD_ONLY=${BUILD_ONLY}"
-        "-DBUILD_DEPS=OFF"
-        "-DBUILD_SHARED_LIBS=OFF"
-        "-DCMAKE_INSTALL_RPATH=${rpath}"
-        "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
-)
-vcpkg_cmake_install()
-
-foreach(TARGET IN LISTS BUILD_ONLY)
-    vcpkg_cmake_config_fixup(PACKAGE_NAME "aws-cpp-sdk-${TARGET}" CONFIG_PATH "lib/cmake/aws-cpp-sdk-${TARGET}" DO_NOT_DELETE_PARENT_CONFIG_PATH)
-endforeach()
-vcpkg_cmake_config_fixup(PACKAGE_NAME "AWSSDK" CONFIG_PATH "lib/cmake/AWSSDK")
-
-vcpkg_copy_pdbs()
-
-file(GLOB_RECURSE AWS_TARGETS "${CURRENT_PACKAGES_DIR}/share/*/*-targets-*.cmake")
-foreach(AWS_TARGET IN LISTS AWS_TARGETS)
-    file(READ ${AWS_TARGET} _contents)
-    string(REGEX REPLACE
-        "bin\\/([A-Za-z0-9_.-]+\\.lib)"
-        "lib/\\1"
-        _contents "${_contents}")
-    file(WRITE ${AWS_TARGET} "${_contents}")
-endforeach()
-
-file(GLOB AWS_CONFIGS "${CURRENT_PACKAGES_DIR}/share/*/aws-cpp-sdk-*-config.cmake")
-list(FILTER AWS_CONFIGS EXCLUDE REGEX "aws-cpp-sdk-core-config\\.cmake\$")
-foreach(AWS_CONFIG IN LISTS AWS_CONFIGS)
-    file(READ "${AWS_CONFIG}" _contents)
-    file(WRITE "${AWS_CONFIG}" "include(CMakeFindDependencyMacro)\nfind_dependency(aws-cpp-sdk-core)\n${_contents}")
-endforeach()
-
-file(REMOVE_RECURSE
-    "${CURRENT_PACKAGES_DIR}/debug/include"
-    "${CURRENT_PACKAGES_DIR}/debug/share"
-    "${CURRENT_PACKAGES_DIR}/lib/pkgconfig"
-    "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig"
-    "${CURRENT_PACKAGES_DIR}/nuget"
-    "${CURRENT_PACKAGES_DIR}/debug/nuget"
-)
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    file(GLOB LIB_FILES ${CURRENT_PACKAGES_DIR}/bin/*.lib)
-    if(LIB_FILES)
-        file(COPY ${LIB_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-        file(REMOVE ${LIB_FILES})
-    endif()
-    file(GLOB DEBUG_LIB_FILES ${CURRENT_PACKAGES_DIR}/debug/bin/*.lib)
-    if(DEBUG_LIB_FILES)
-        file(COPY ${DEBUG_LIB_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-        file(REMOVE ${DEBUG_LIB_FILES})
-    endif()
-
-    file(APPEND "${CURRENT_PACKAGES_DIR}/include/aws/core/SDKConfig.h" "#ifndef USE_IMPORT_EXPORT\n#define USE_IMPORT_EXPORT\n#endif")
-endif()
-
-configure_file("${CURRENT_PORT_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY)
-
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_buildpath_length_warning(37)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO aws/aws-sdk-cpp
+    REF "${VERSION}"
+    SHA512 1d34541c4e310634df7cde51cb18b3bc741579b7e513085f4d1a5c2248c55daa24f9b21f0383434c91b357c13ef4f24fed18b204680e5caad2965722f67563c6
+    PATCHES
+        patch-relocatable-rpath.patch
+        fix-aws-root.patch
+        lock-curl-http-and-tls-settings.patch
+)
+
+string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" FORCE_SHARED_CRT)
+
+set(EXTRA_ARGS "")
+if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS)
+    set(rpath "@loader_path")
+elseif (VCPKG_TARGET_IS_ANDROID)
+    set(EXTRA_ARGS "-DTARGET_ARCH=ANDROID"
+            "-DGIT_EXECUTABLE=--invalid-git-executable--"
+            "-DGIT_FOUND=TRUE"
+            "-DNDK_DIR=$ENV{ANDROID_NDK_HOME}"
+            "-DANDROID_BUILD_ZLIB=FALSE"
+            "-DANDROID_BUILD_CURL=FALSE"
+            "-DANDROID_BUILD_OPENSSL=FALSE"
+            )
+else()
+    set(rpath "\$ORIGIN")
+endif()
+
+string(REPLACE "awsmigrationhub" "AWSMigrationHub" targets "${FEATURES}")
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    DISABLE_PARALLEL_CONFIGURE
+    OPTIONS
+        ${EXTRA_ARGS}
+        "-DENABLE_UNITY_BUILD=ON"
+        "-DENABLE_TESTING=OFF"
+        "-DFORCE_SHARED_CRT=${FORCE_SHARED_CRT}"
+        "-DBUILD_ONLY=${targets}"
+        "-DBUILD_DEPS=OFF"
+        "-DBUILD_SHARED_LIBS=OFF"
+        "-DAWS_SDK_WARNINGS_ARE_ERRORS=OFF"
+        "-DCMAKE_INSTALL_RPATH=${rpath}"
+        "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
+)
+vcpkg_cmake_install()
+
+foreach(TARGET IN LISTS targets)
+    string(TOLOWER "aws-cpp-sdk-${TARGET}" package)
+    vcpkg_cmake_config_fixup(PACKAGE_NAME "${package}" CONFIG_PATH "lib/cmake/aws-cpp-sdk-${TARGET}" DO_NOT_DELETE_PARENT_CONFIG_PATH)
+endforeach()
+vcpkg_cmake_config_fixup(PACKAGE_NAME "awssdk" CONFIG_PATH "lib/cmake/AWSSDK")
+
+vcpkg_copy_pdbs()
+
+file(GLOB_RECURSE AWS_TARGETS "${CURRENT_PACKAGES_DIR}/share/*/*-targets-*.cmake")
+foreach(AWS_TARGET IN LISTS AWS_TARGETS)
+    file(READ ${AWS_TARGET} _contents)
+    string(REGEX REPLACE
+        "bin\\/([A-Za-z0-9_.-]+\\.lib)"
+        "lib/\\1"
+        _contents "${_contents}")
+    file(WRITE ${AWS_TARGET} "${_contents}")
+endforeach()
+
+file(GLOB AWS_CONFIGS "${CURRENT_PACKAGES_DIR}/share/*/aws-cpp-sdk-*-config.cmake")
+list(FILTER AWS_CONFIGS EXCLUDE REGEX "aws-cpp-sdk-core-config\\.cmake\$")
+foreach(AWS_CONFIG IN LISTS AWS_CONFIGS)
+    file(READ "${AWS_CONFIG}" _contents)
+    file(WRITE "${AWS_CONFIG}" "include(CMakeFindDependencyMacro)\nfind_dependency(aws-cpp-sdk-core)\n${_contents}")
+endforeach()
+
+file(REMOVE_RECURSE
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/debug/share"
+    "${CURRENT_PACKAGES_DIR}/lib/pkgconfig"
+    "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig"
+    "${CURRENT_PACKAGES_DIR}/nuget"
+    "${CURRENT_PACKAGES_DIR}/debug/nuget"
+)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    file(GLOB LIB_FILES ${CURRENT_PACKAGES_DIR}/bin/*.lib)
+    if(LIB_FILES)
+        file(COPY ${LIB_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
+        file(REMOVE ${LIB_FILES})
+    endif()
+    file(GLOB DEBUG_LIB_FILES ${CURRENT_PACKAGES_DIR}/debug/bin/*.lib)
+    if(DEBUG_LIB_FILES)
+        file(COPY ${DEBUG_LIB_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+        file(REMOVE ${DEBUG_LIB_FILES})
+    endif()
+
+    file(APPEND "${CURRENT_PACKAGES_DIR}/include/aws/core/SDKConfig.h" "#ifndef USE_IMPORT_EXPORT\n#define USE_IMPORT_EXPORT\n#endif")
+endif()
+
+configure_file("${CURRENT_PORT_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY)
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/aws-sdk-cpp/usage b/external_imported/vcpkg/ports/aws-sdk-cpp/usage
index c526d2c45..37e1f617b 100644
--- a/external_imported/vcpkg/ports/aws-sdk-cpp/usage
+++ b/external_imported/vcpkg/ports/aws-sdk-cpp/usage
@@ -1,12 +1,12 @@
-The package @PORT@:@TARGET_TRIPLET@ provides CMake targets:
-
-    When using AWSSDK, AWSSDK_ROOT_DIR must be defined by the user.
-    find_package(AWSSDK CONFIG COMPONENTS core dynamodb kinesis s3 REQUIRED)
-    target_include_directories(main PRIVATE ${AWSSDK_INCLUDE_DIRS})
-    target_link_libraries(main PRIVATE ${AWSSDK_LIBRARIES})
-    
-    OR
-    
-    find_package(aws-cpp-sdk-core REQUIRED)
-    target_include_directories(main PRIVATE aws-cpp-sdk-core)
-    target_link_libraries(main PRIVATE aws-cpp-sdk-core)
+The package @PORT@:@TARGET_TRIPLET@ provides CMake targets:
+
+    When using AWSSDK, AWSSDK_ROOT_DIR must be defined by the user.
+    find_package(AWSSDK CONFIG COMPONENTS core dynamodb kinesis s3 REQUIRED)
+    target_include_directories(main PRIVATE ${AWSSDK_INCLUDE_DIRS})
+    target_link_libraries(main PRIVATE ${AWSSDK_LIBRARIES})
+    
+    OR
+    
+    find_package(aws-cpp-sdk-core REQUIRED)
+    target_include_directories(main PRIVATE aws-cpp-sdk-core)
+    target_link_libraries(main PRIVATE aws-cpp-sdk-core)
diff --git a/external_imported/vcpkg/ports/aws-sdk-cpp/vcpkg.in.json b/external_imported/vcpkg/ports/aws-sdk-cpp/vcpkg.in.json
new file mode 100644
index 000000000..3eb486f73
--- /dev/null
+++ b/external_imported/vcpkg/ports/aws-sdk-cpp/vcpkg.in.json
@@ -0,0 +1,38 @@
+{
+  "name": "aws-sdk-cpp",
+  "version": "1.11.215",
+  "port-version": 1,
+  "description": "AWS SDK for C++",
+  "homepage": "https://github.com/aws/aws-sdk-cpp",
+  "license": "Apache-2.0",
+  "supports": "!(windows & arm) & !uwp",
+  "dependencies": [
+    "aws-crt-cpp",
+    {
+      "name": "curl",
+      "default-features": false,
+      "features": [
+        "ssl"
+      ],
+      "platform": "!uwp & !windows"
+    },
+    {
+      "name": "openssl",
+      "platform": "!uwp & !windows"
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    "zlib"
+  ],
+  "default-features": [
+    "dynamodb",
+    "kinesis",
+    "s3"
+  ]
+}
diff --git a/external_imported/vcpkg/ports/aws-sdk-cpp/vcpkg.json b/external_imported/vcpkg/ports/aws-sdk-cpp/vcpkg.json
index 3e8e96087..cbe626657 100644
--- a/external_imported/vcpkg/ports/aws-sdk-cpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/aws-sdk-cpp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "$note": "Automatically generated by generateFeatures.ps1",
   "name": "aws-sdk-cpp",
-  "version": "1.11.4",
+  "version": "1.11.255",
   "description": "AWS SDK for C++",
   "homepage": "https://github.com/aws/aws-sdk-cpp",
   "license": "Apache-2.0",
@@ -37,11 +37,24 @@
   ],
   "features": {
     "access-management": {
-      "description": "C++ SDK for the AWS access-management service"
+      "description": "C++ SDK for the AWS access-management service",
+      "dependencies": [
+        {
+          "name": "aws-sdk-cpp",
+          "default-features": false,
+          "features": [
+            "cognito-identity",
+            "iam"
+          ]
+        }
+      ]
     },
     "accessanalyzer": {
       "description": "C++ SDK for the AWS accessanalyzer service"
     },
+    "account": {
+      "description": "C++ SDK for the AWS account service"
+    },
     "acm": {
       "description": "C++ SDK for the AWS acm service"
     },
@@ -60,6 +73,9 @@
     "amplifybackend": {
       "description": "C++ SDK for the AWS amplifybackend service"
     },
+    "amplifyuibuilder": {
+      "description": "C++ SDK for the AWS amplifyuibuilder service"
+    },
     "apigateway": {
       "description": "C++ SDK for the AWS apigateway service"
     },
@@ -72,6 +88,12 @@
     "appconfig": {
       "description": "C++ SDK for the AWS appconfig service"
     },
+    "appconfigdata": {
+      "description": "C++ SDK for the AWS appconfigdata service"
+    },
+    "appfabric": {
+      "description": "C++ SDK for the AWS appfabric service"
+    },
     "appflow": {
       "description": "C++ SDK for the AWS appflow service"
     },
@@ -99,6 +121,9 @@
     "appsync": {
       "description": "C++ SDK for the AWS appsync service"
     },
+    "arc-zonal-shift": {
+      "description": "C++ SDK for the AWS arc-zonal-shift service"
+    },
     "athena": {
       "description": "C++ SDK for the AWS athena service"
     },
@@ -117,12 +142,39 @@
     "awstransfer": {
       "description": "C++ SDK for the AWS awstransfer service"
     },
+    "b2bi": {
+      "description": "C++ SDK for the AWS b2bi service"
+    },
     "backup": {
       "description": "C++ SDK for the AWS backup service"
     },
+    "backup-gateway": {
+      "description": "C++ SDK for the AWS backup-gateway service"
+    },
+    "backupstorage": {
+      "description": "C++ SDK for the AWS backupstorage service"
+    },
     "batch": {
       "description": "C++ SDK for the AWS batch service"
     },
+    "bcm-data-exports": {
+      "description": "C++ SDK for the AWS bcm-data-exports service"
+    },
+    "bedrock": {
+      "description": "C++ SDK for the AWS bedrock service"
+    },
+    "bedrock-agent": {
+      "description": "C++ SDK for the AWS bedrock-agent service"
+    },
+    "bedrock-agent-runtime": {
+      "description": "C++ SDK for the AWS bedrock-agent-runtime service"
+    },
+    "bedrock-runtime": {
+      "description": "C++ SDK for the AWS bedrock-runtime service"
+    },
+    "billingconductor": {
+      "description": "C++ SDK for the AWS billingconductor service"
+    },
     "braket": {
       "description": "C++ SDK for the AWS braket service"
     },
@@ -135,9 +187,33 @@
     "chime": {
       "description": "C++ SDK for the AWS chime service"
     },
+    "chime-sdk-identity": {
+      "description": "C++ SDK for the AWS chime-sdk-identity service"
+    },
+    "chime-sdk-media-pipelines": {
+      "description": "C++ SDK for the AWS chime-sdk-media-pipelines service"
+    },
+    "chime-sdk-meetings": {
+      "description": "C++ SDK for the AWS chime-sdk-meetings service"
+    },
+    "chime-sdk-messaging": {
+      "description": "C++ SDK for the AWS chime-sdk-messaging service"
+    },
+    "chime-sdk-voice": {
+      "description": "C++ SDK for the AWS chime-sdk-voice service"
+    },
+    "cleanrooms": {
+      "description": "C++ SDK for the AWS cleanrooms service"
+    },
+    "cleanroomsml": {
+      "description": "C++ SDK for the AWS cleanroomsml service"
+    },
     "cloud9": {
       "description": "C++ SDK for the AWS cloud9 service"
     },
+    "cloudcontrol": {
+      "description": "C++ SDK for the AWS cloudcontrol service"
+    },
     "clouddirectory": {
       "description": "C++ SDK for the AWS clouddirectory service"
     },
@@ -147,6 +223,9 @@
     "cloudfront": {
       "description": "C++ SDK for the AWS cloudfront service"
     },
+    "cloudfront-keyvaluestore": {
+      "description": "C++ SDK for the AWS cloudfront-keyvaluestore service"
+    },
     "cloudhsm": {
       "description": "C++ SDK for the AWS cloudhsm service"
     },
@@ -162,12 +241,18 @@
     "cloudtrail": {
       "description": "C++ SDK for the AWS cloudtrail service"
     },
+    "cloudtrail-data": {
+      "description": "C++ SDK for the AWS cloudtrail-data service"
+    },
     "codeartifact": {
       "description": "C++ SDK for the AWS codeartifact service"
     },
     "codebuild": {
       "description": "C++ SDK for the AWS codebuild service"
     },
+    "codecatalyst": {
+      "description": "C++ SDK for the AWS codecatalyst service"
+    },
     "codecommit": {
       "description": "C++ SDK for the AWS codecommit service"
     },
@@ -177,6 +262,9 @@
     "codeguru-reviewer": {
       "description": "C++ SDK for the AWS codeguru-reviewer service"
     },
+    "codeguru-security": {
+      "description": "C++ SDK for the AWS codeguru-security service"
+    },
     "codeguruprofiler": {
       "description": "C++ SDK for the AWS codeguruprofiler service"
     },
@@ -219,9 +307,21 @@
     "connect-contact-lens": {
       "description": "C++ SDK for the AWS connect-contact-lens service"
     },
+    "connectcampaigns": {
+      "description": "C++ SDK for the AWS connectcampaigns service"
+    },
+    "connectcases": {
+      "description": "C++ SDK for the AWS connectcases service"
+    },
     "connectparticipant": {
       "description": "C++ SDK for the AWS connectparticipant service"
     },
+    "controltower": {
+      "description": "C++ SDK for the AWS controltower service"
+    },
+    "cost-optimization-hub": {
+      "description": "C++ SDK for the AWS cost-optimization-hub service"
+    },
     "cur": {
       "description": "C++ SDK for the AWS cur service"
     },
@@ -240,6 +340,9 @@
     "datasync": {
       "description": "C++ SDK for the AWS datasync service"
     },
+    "datazone": {
+      "description": "C++ SDK for the AWS datazone service"
+    },
     "dax": {
       "description": "C++ SDK for the AWS dax service"
     },
@@ -267,6 +370,12 @@
     "docdb": {
       "description": "C++ SDK for the AWS docdb service"
     },
+    "docdb-elastic": {
+      "description": "C++ SDK for the AWS docdb-elastic service"
+    },
+    "drs": {
+      "description": "C++ SDK for the AWS drs service"
+    },
     "ds": {
       "description": "C++ SDK for the AWS ds service"
     },
@@ -297,6 +406,9 @@
     "eks": {
       "description": "C++ SDK for the AWS eks service"
     },
+    "eks-auth": {
+      "description": "C++ SDK for the AWS eks-auth service"
+    },
     "elastic-inference": {
       "description": "C++ SDK for the AWS elastic-inference service"
     },
@@ -327,6 +439,12 @@
     "emr-containers": {
       "description": "C++ SDK for the AWS emr-containers service"
     },
+    "emr-serverless": {
+      "description": "C++ SDK for the AWS emr-serverless service"
+    },
+    "entityresolution": {
+      "description": "C++ SDK for the AWS entityresolution service"
+    },
     "es": {
       "description": "C++ SDK for the AWS es service"
     },
@@ -336,6 +454,9 @@
     "events": {
       "description": "C++ SDK for the AWS events service"
     },
+    "evidently": {
+      "description": "C++ SDK for the AWS evidently service"
+    },
     "finspace": {
       "description": "C++ SDK for the AWS finspace service"
     },
@@ -360,6 +481,9 @@
     "frauddetector": {
       "description": "C++ SDK for the AWS frauddetector service"
     },
+    "freetier": {
+      "description": "C++ SDK for the AWS freetier service"
+    },
     "fsx": {
       "description": "C++ SDK for the AWS fsx service"
     },
@@ -375,6 +499,9 @@
     "glue": {
       "description": "C++ SDK for the AWS glue service"
     },
+    "grafana": {
+      "description": "C++ SDK for the AWS grafana service"
+    },
     "greengrass": {
       "description": "C++ SDK for the AWS greengrass service"
     },
@@ -400,7 +527,17 @@
       "description": "C++ SDK for the AWS iam service"
     },
     "identity-management": {
-      "description": "C++ SDK for the AWS identity-management service"
+      "description": "C++ SDK for the AWS identity-management service",
+      "dependencies": [
+        {
+          "name": "aws-sdk-cpp",
+          "default-features": false,
+          "features": [
+            "cognito-identity",
+            "sts"
+          ]
+        }
+      ]
     },
     "identitystore": {
       "description": "C++ SDK for the AWS identitystore service"
@@ -414,6 +551,15 @@
     "inspector": {
       "description": "C++ SDK for the AWS inspector service"
     },
+    "inspector-scan": {
+      "description": "C++ SDK for the AWS inspector-scan service"
+    },
+    "inspector2": {
+      "description": "C++ SDK for the AWS inspector2 service"
+    },
+    "internetmonitor": {
+      "description": "C++ SDK for the AWS internetmonitor service"
+    },
     "iot": {
       "description": "C++ SDK for the AWS iot service"
     },
@@ -423,6 +569,9 @@
     "iot-jobs-data": {
       "description": "C++ SDK for the AWS iot-jobs-data service"
     },
+    "iot-roborunner": {
+      "description": "C++ SDK for the AWS iot-roborunner service"
+    },
     "iot1click-devices": {
       "description": "C++ SDK for the AWS iot1click-devices service"
     },
@@ -444,6 +593,9 @@
     "iotfleethub": {
       "description": "C++ SDK for the AWS iotfleethub service"
     },
+    "iotfleetwise": {
+      "description": "C++ SDK for the AWS iotfleetwise service"
+    },
     "iotsecuretunneling": {
       "description": "C++ SDK for the AWS iotsecuretunneling service"
     },
@@ -453,18 +605,36 @@
     "iotthingsgraph": {
       "description": "C++ SDK for the AWS iotthingsgraph service"
     },
+    "iottwinmaker": {
+      "description": "C++ SDK for the AWS iottwinmaker service"
+    },
     "iotwireless": {
       "description": "C++ SDK for the AWS iotwireless service"
     },
     "ivs": {
       "description": "C++ SDK for the AWS ivs service"
     },
+    "ivs-realtime": {
+      "description": "C++ SDK for the AWS ivs-realtime service"
+    },
+    "ivschat": {
+      "description": "C++ SDK for the AWS ivschat service"
+    },
     "kafka": {
       "description": "C++ SDK for the AWS kafka service"
     },
+    "kafkaconnect": {
+      "description": "C++ SDK for the AWS kafkaconnect service"
+    },
     "kendra": {
       "description": "C++ SDK for the AWS kendra service"
     },
+    "kendra-ranking": {
+      "description": "C++ SDK for the AWS kendra-ranking service"
+    },
+    "keyspaces": {
+      "description": "C++ SDK for the AWS keyspaces service"
+    },
     "kinesis": {
       "description": "C++ SDK for the AWS kinesis service"
     },
@@ -477,6 +647,9 @@
     "kinesis-video-signaling": {
       "description": "C++ SDK for the AWS kinesis-video-signaling service"
     },
+    "kinesis-video-webrtc-storage": {
+      "description": "C++ SDK for the AWS kinesis-video-webrtc-storage service"
+    },
     "kinesisanalytics": {
       "description": "C++ SDK for the AWS kinesisanalytics service"
     },
@@ -495,6 +668,9 @@
     "lambda": {
       "description": "C++ SDK for the AWS lambda service"
     },
+    "launch-wizard": {
+      "description": "C++ SDK for the AWS launch-wizard service"
+    },
     "lex": {
       "description": "C++ SDK for the AWS lex service"
     },
@@ -510,6 +686,12 @@
     "license-manager": {
       "description": "C++ SDK for the AWS license-manager service"
     },
+    "license-manager-linux-subscriptions": {
+      "description": "C++ SDK for the AWS license-manager-linux-subscriptions service"
+    },
+    "license-manager-user-subscriptions": {
+      "description": "C++ SDK for the AWS license-manager-user-subscriptions service"
+    },
     "lightsail": {
       "description": "C++ SDK for the AWS lightsail service"
     },
@@ -528,21 +710,30 @@
     "lookoutvision": {
       "description": "C++ SDK for the AWS lookoutvision service"
     },
+    "m2": {
+      "description": "C++ SDK for the AWS m2 service"
+    },
     "machinelearning": {
       "description": "C++ SDK for the AWS machinelearning service"
     },
-    "macie": {
-      "description": "C++ SDK for the AWS macie service"
-    },
     "macie2": {
       "description": "C++ SDK for the AWS macie2 service"
     },
     "managedblockchain": {
       "description": "C++ SDK for the AWS managedblockchain service"
     },
+    "managedblockchain-query": {
+      "description": "C++ SDK for the AWS managedblockchain-query service"
+    },
+    "marketplace-agreement": {
+      "description": "C++ SDK for the AWS marketplace-agreement service"
+    },
     "marketplace-catalog": {
       "description": "C++ SDK for the AWS marketplace-catalog service"
     },
+    "marketplace-deployment": {
+      "description": "C++ SDK for the AWS marketplace-deployment service"
+    },
     "marketplace-entitlement": {
       "description": "C++ SDK for the AWS marketplace-entitlement service"
     },
@@ -564,6 +755,9 @@
     "mediapackage-vod": {
       "description": "C++ SDK for the AWS mediapackage-vod service"
     },
+    "mediapackagev2": {
+      "description": "C++ SDK for the AWS mediapackagev2 service"
+    },
     "mediastore": {
       "description": "C++ SDK for the AWS mediastore service"
     },
@@ -573,21 +767,33 @@
     "mediatailor": {
       "description": "C++ SDK for the AWS mediatailor service"
     },
+    "medical-imaging": {
+      "description": "C++ SDK for the AWS medical-imaging service"
+    },
+    "memorydb": {
+      "description": "C++ SDK for the AWS memorydb service"
+    },
     "meteringmarketplace": {
       "description": "C++ SDK for the AWS meteringmarketplace service"
     },
     "mgn": {
       "description": "C++ SDK for the AWS mgn service"
     },
+    "migration-hub-refactor-spaces": {
+      "description": "C++ SDK for the AWS migration-hub-refactor-spaces service"
+    },
     "migrationhub-config": {
       "description": "C++ SDK for the AWS migrationhub-config service"
     },
+    "migrationhuborchestrator": {
+      "description": "C++ SDK for the AWS migrationhuborchestrator service"
+    },
+    "migrationhubstrategy": {
+      "description": "C++ SDK for the AWS migrationhubstrategy service"
+    },
     "mobile": {
       "description": "C++ SDK for the AWS mobile service"
     },
-    "mobileanalytics": {
-      "description": "C++ SDK for the AWS mobileanalytics service"
-    },
     "monitoring": {
       "description": "C++ SDK for the AWS monitoring service"
     },
@@ -603,6 +809,9 @@
     "neptune": {
       "description": "C++ SDK for the AWS neptune service"
     },
+    "neptunedata": {
+      "description": "C++ SDK for the AWS neptunedata service"
+    },
     "network-firewall": {
       "description": "C++ SDK for the AWS network-firewall service"
     },
@@ -612,6 +821,18 @@
     "nimble": {
       "description": "C++ SDK for the AWS nimble service"
     },
+    "oam": {
+      "description": "C++ SDK for the AWS oam service"
+    },
+    "omics": {
+      "description": "C++ SDK for the AWS omics service"
+    },
+    "opensearch": {
+      "description": "C++ SDK for the AWS opensearch service"
+    },
+    "opensearchserverless": {
+      "description": "C++ SDK for the AWS opensearchserverless service"
+    },
     "opsworks": {
       "description": "C++ SDK for the AWS opsworks service"
     },
@@ -621,9 +842,24 @@
     "organizations": {
       "description": "C++ SDK for the AWS organizations service"
     },
+    "osis": {
+      "description": "C++ SDK for the AWS osis service"
+    },
     "outposts": {
       "description": "C++ SDK for the AWS outposts service"
     },
+    "panorama": {
+      "description": "C++ SDK for the AWS panorama service"
+    },
+    "payment-cryptography": {
+      "description": "C++ SDK for the AWS payment-cryptography service"
+    },
+    "payment-cryptography-data": {
+      "description": "C++ SDK for the AWS payment-cryptography-data service"
+    },
+    "pca-connector-ad": {
+      "description": "C++ SDK for the AWS pca-connector-ad service"
+    },
     "personalize": {
       "description": "C++ SDK for the AWS personalize service"
     },
@@ -642,12 +878,30 @@
     "pinpoint-email": {
       "description": "C++ SDK for the AWS pinpoint-email service"
     },
+    "pinpoint-sms-voice-v2": {
+      "description": "C++ SDK for the AWS pinpoint-sms-voice-v2 service"
+    },
+    "pipes": {
+      "description": "C++ SDK for the AWS pipes service"
+    },
     "polly": {
       "description": "C++ SDK for the AWS polly service"
     },
     "pricing": {
       "description": "C++ SDK for the AWS pricing service"
     },
+    "privatenetworks": {
+      "description": "C++ SDK for the AWS privatenetworks service"
+    },
+    "proton": {
+      "description": "C++ SDK for the AWS proton service"
+    },
+    "qbusiness": {
+      "description": "C++ SDK for the AWS qbusiness service"
+    },
+    "qconnect": {
+      "description": "C++ SDK for the AWS qconnect service"
+    },
     "qldb": {
       "description": "C++ SDK for the AWS qldb service"
     },
@@ -655,7 +909,16 @@
       "description": "C++ SDK for the AWS qldb-session service"
     },
     "queues": {
-      "description": "C++ SDK for the AWS queues service"
+      "description": "C++ SDK for the AWS queues service",
+      "dependencies": [
+        {
+          "name": "aws-sdk-cpp",
+          "default-features": false,
+          "features": [
+            "sqs"
+          ]
+        }
+      ]
     },
     "quicksight": {
       "description": "C++ SDK for the AWS quicksight service"
@@ -663,6 +926,9 @@
     "ram": {
       "description": "C++ SDK for the AWS ram service"
     },
+    "rbin": {
+      "description": "C++ SDK for the AWS rbin service"
+    },
     "rds": {
       "description": "C++ SDK for the AWS rds service"
     },
@@ -675,9 +941,21 @@
     "redshift-data": {
       "description": "C++ SDK for the AWS redshift-data service"
     },
+    "redshift-serverless": {
+      "description": "C++ SDK for the AWS redshift-serverless service"
+    },
     "rekognition": {
       "description": "C++ SDK for the AWS rekognition service"
     },
+    "repostspace": {
+      "description": "C++ SDK for the AWS repostspace service"
+    },
+    "resiliencehub": {
+      "description": "C++ SDK for the AWS resiliencehub service"
+    },
+    "resource-explorer-2": {
+      "description": "C++ SDK for the AWS resource-explorer-2 service"
+    },
     "resource-groups": {
       "description": "C++ SDK for the AWS resource-groups service"
     },
@@ -687,15 +965,30 @@
     "robomaker": {
       "description": "C++ SDK for the AWS robomaker service"
     },
+    "rolesanywhere": {
+      "description": "C++ SDK for the AWS rolesanywhere service"
+    },
     "route53": {
       "description": "C++ SDK for the AWS route53 service"
     },
+    "route53-recovery-cluster": {
+      "description": "C++ SDK for the AWS route53-recovery-cluster service"
+    },
+    "route53-recovery-control-config": {
+      "description": "C++ SDK for the AWS route53-recovery-control-config service"
+    },
+    "route53-recovery-readiness": {
+      "description": "C++ SDK for the AWS route53-recovery-readiness service"
+    },
     "route53domains": {
       "description": "C++ SDK for the AWS route53domains service"
     },
     "route53resolver": {
       "description": "C++ SDK for the AWS route53resolver service"
     },
+    "rum": {
+      "description": "C++ SDK for the AWS rum service"
+    },
     "s3": {
       "description": "C++ SDK for the AWS s3 service"
     },
@@ -703,7 +996,17 @@
       "description": "C++ SDK for the AWS s3-crt service"
     },
     "s3-encryption": {
-      "description": "C++ SDK for the AWS s3-encryption service"
+      "description": "C++ SDK for the AWS s3-encryption service",
+      "dependencies": [
+        {
+          "name": "aws-sdk-cpp",
+          "default-features": false,
+          "features": [
+            "kms",
+            "s3"
+          ]
+        }
+      ]
     },
     "s3control": {
       "description": "C++ SDK for the AWS s3control service"
@@ -723,12 +1026,21 @@
     "sagemaker-featurestore-runtime": {
       "description": "C++ SDK for the AWS sagemaker-featurestore-runtime service"
     },
+    "sagemaker-geospatial": {
+      "description": "C++ SDK for the AWS sagemaker-geospatial service"
+    },
+    "sagemaker-metrics": {
+      "description": "C++ SDK for the AWS sagemaker-metrics service"
+    },
     "sagemaker-runtime": {
       "description": "C++ SDK for the AWS sagemaker-runtime service"
     },
     "savingsplans": {
       "description": "C++ SDK for the AWS savingsplans service"
     },
+    "scheduler": {
+      "description": "C++ SDK for the AWS scheduler service"
+    },
     "schemas": {
       "description": "C++ SDK for the AWS schemas service"
     },
@@ -741,6 +1053,9 @@
     "securityhub": {
       "description": "C++ SDK for the AWS securityhub service"
     },
+    "securitylake": {
+      "description": "C++ SDK for the AWS securitylake service"
+    },
     "serverlessrepo": {
       "description": "C++ SDK for the AWS serverlessrepo service"
     },
@@ -765,12 +1080,18 @@
     "signer": {
       "description": "C++ SDK for the AWS signer service"
     },
+    "simspaceweaver": {
+      "description": "C++ SDK for the AWS simspaceweaver service"
+    },
     "sms": {
       "description": "C++ SDK for the AWS sms service"
     },
     "sms-voice": {
       "description": "C++ SDK for the AWS sms-voice service"
     },
+    "snow-device-management": {
+      "description": "C++ SDK for the AWS snow-device-management service"
+    },
     "snowball": {
       "description": "C++ SDK for the AWS snowball service"
     },
@@ -789,6 +1110,9 @@
     "ssm-incidents": {
       "description": "C++ SDK for the AWS ssm-incidents service"
     },
+    "ssm-sap": {
+      "description": "C++ SDK for the AWS ssm-sap service"
+    },
     "sso": {
       "description": "C++ SDK for the AWS sso service"
     },
@@ -810,6 +1134,9 @@
     "support": {
       "description": "C++ SDK for the AWS support service"
     },
+    "support-app": {
+      "description": "C++ SDK for the AWS support-app service"
+    },
     "swf": {
       "description": "C++ SDK for the AWS swf service"
     },
@@ -817,7 +1144,16 @@
       "description": "C++ SDK for the AWS synthetics service"
     },
     "text-to-speech": {
-      "description": "C++ SDK for the AWS text-to-speech service"
+      "description": "C++ SDK for the AWS text-to-speech service",
+      "dependencies": [
+        {
+          "name": "aws-sdk-cpp",
+          "default-features": false,
+          "features": [
+            "polly"
+          ]
+        }
+      ]
     },
     "textract": {
       "description": "C++ SDK for the AWS textract service"
@@ -828,6 +1164,9 @@
     "timestream-write": {
       "description": "C++ SDK for the AWS timestream-write service"
     },
+    "tnb": {
+      "description": "C++ SDK for the AWS tnb service"
+    },
     "transcribe": {
       "description": "C++ SDK for the AWS transcribe service"
     },
@@ -835,11 +1174,32 @@
       "description": "C++ SDK for the AWS transcribestreaming service"
     },
     "transfer": {
-      "description": "C++ SDK for the AWS transfer service"
+      "description": "C++ SDK for the AWS transfer service",
+      "dependencies": [
+        {
+          "name": "aws-sdk-cpp",
+          "default-features": false,
+          "features": [
+            "s3"
+          ]
+        }
+      ]
     },
     "translate": {
       "description": "C++ SDK for the AWS translate service"
     },
+    "trustedadvisor": {
+      "description": "C++ SDK for the AWS trustedadvisor service"
+    },
+    "verifiedpermissions": {
+      "description": "C++ SDK for the AWS verifiedpermissions service"
+    },
+    "voice-id": {
+      "description": "C++ SDK for the AWS voice-id service"
+    },
+    "vpc-lattice": {
+      "description": "C++ SDK for the AWS vpc-lattice service"
+    },
     "waf": {
       "description": "C++ SDK for the AWS waf service"
     },
@@ -852,6 +1212,9 @@
     "wellarchitected": {
       "description": "C++ SDK for the AWS wellarchitected service"
     },
+    "wisdom": {
+      "description": "C++ SDK for the AWS wisdom service"
+    },
     "workdocs": {
       "description": "C++ SDK for the AWS workdocs service"
     },
@@ -867,6 +1230,12 @@
     "workspaces": {
       "description": "C++ SDK for the AWS workspaces service"
     },
+    "workspaces-thin-client": {
+      "description": "C++ SDK for the AWS workspaces-thin-client service"
+    },
+    "workspaces-web": {
+      "description": "C++ SDK for the AWS workspaces-web service"
+    },
     "xray": {
       "description": "C++ SDK for the AWS xray service"
     }
diff --git a/external_imported/vcpkg/ports/azmq/portfile.cmake b/external_imported/vcpkg/ports/azmq/portfile.cmake
index 3e1c73683..a222657cf 100644
--- a/external_imported/vcpkg/ports/azmq/portfile.cmake
+++ b/external_imported/vcpkg/ports/azmq/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO zeromq/azmq
-    REF 7da2fd0a1b2bd4e6f50ccd17d54579e6084ef1f7 # v1.0.3
-    SHA512 3f6b07fab9345c7506a46d7418eb672e1ee28a72bb02914ee1f945b3c41090d94722079469359664232e9688beac4e354e49d99711fc5b0bd1d6f7936ed62a3c
+    REF 2c1adac46bced4eb74ed9be7c74563bb113eaacf
+    SHA512 4614b9e8f502da067231cf0ce2b645289fd1343b9bc46f1028fecb9dad4bb8a5190d723c3bf888a7c708b7b588b6c72f7e4da637f499389481b6cf80f4999671
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/azmq/vcpkg.json b/external_imported/vcpkg/ports/azmq/vcpkg.json
index 12dacac0e..45019327f 100644
--- a/external_imported/vcpkg/ports/azmq/vcpkg.json
+++ b/external_imported/vcpkg/ports/azmq/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "azmq",
-  "version": "1.0.3",
+  "version-date": "2023-03-23",
   "description": [
     "Boost Asio style bindings for ZeroMQ",
     "This library is built on top of ZeroMQ's standard C interface and is intended to work well with C++ applications which use the Boost libraries in general, and Asio in particular.",
diff --git a/external_imported/vcpkg/ports/azure-c-shared-utility/improve-dependencies.patch b/external_imported/vcpkg/ports/azure-c-shared-utility/improve-dependencies.patch
index 9afa24d13..2f2702bfc 100644
--- a/external_imported/vcpkg/ports/azure-c-shared-utility/improve-dependencies.patch
+++ b/external_imported/vcpkg/ports/azure-c-shared-utility/improve-dependencies.patch
@@ -1,45 +1,37 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 46334c1..aaeea20 100644
+index 6eb607f0..5b0f60f6 100755
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -115,7 +115,6 @@ if(${use_openssl})
-     if (NOT TARGET OpenSSL::SSL OR NOT TARGET OpenSSL::Crypto OR NOT ${OPENSSL_INCLUDE_DIR})
-         find_package(OpenSSL REQUIRED)
-     endif()
--    include_directories(${OPENSSL_INCLUDE_DIR})
- endif()
- 
- if(${use_applessl})
-@@ -521,8 +520,7 @@ if(${use_http})
+@@ -553,8 +553,7 @@ if(${use_http})
              set(CURL_FIND_REQUIRED 1)
              find_package_handle_standard_args(CURL DEFAULT_MSG CURL_LIBRARIES)
- 
+
 -            include_directories(${CURL_INCLUDE_DIRS})
 -            set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} ${CURL_LIBRARIES})
 +            set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} CURL::libcurl)
          endif(NOT use_builtin_httpapi)
      endif()
  endif(${use_http})
-@@ -561,7 +559,7 @@ if(${use_bearssl})
+@@ -593,7 +592,7 @@ if(${use_bearssl})
  endif()
- 
+
  if(${use_openssl})
 -    set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} ${OPENSSL_LIBRARIES})
 +    set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} OpenSSL::SSL)
      if (WIN32)
          set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} crypt32 ws2_32 secur32)
      endif()
-@@ -703,7 +701,7 @@ write_basic_package_version_file(
- 
+@@ -743,7 +742,7 @@ write_basic_package_version_file(
+
  configure_file("configs/${PROJECT_NAME}Config.cmake"
      "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake"
 -    COPYONLY
 +    @ONLY
  )
- 
+
  install(EXPORT aziotsharedutilTargets
-@@ -715,7 +713,7 @@ install(EXPORT aziotsharedutilTargets
- 
+@@ -755,7 +754,7 @@ install(EXPORT aziotsharedutilTargets
+
  install(
  FILES
 -    "configs/${PROJECT_NAME}Config.cmake"
@@ -48,20 +40,24 @@ index 46334c1..aaeea20 100644
      "configs/azure_iot_build_rules.cmake"
      "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake"
 diff --git a/configs/azure_c_shared_utilityConfig.cmake b/configs/azure_c_shared_utilityConfig.cmake
-index 416dd1c..0e1e4d4 100644
+index 2d7c733e..0e1e4d41 100644
 --- a/configs/azure_c_shared_utilityConfig.cmake
 +++ b/configs/azure_c_shared_utilityConfig.cmake
-@@ -1,8 +1,11 @@
+@@ -1,11 +1,12 @@
  #Copyright (c) Microsoft. All rights reserved.
  #Licensed under the MIT license. See LICENSE file in the project root for full license information.
- 
+
 -if(UNIX)
--    include(CMakeFindDependencyMacro)
+-    if(${use_http})
+-        include(CMakeFindDependencyMacro)
+-        find_dependency(CURL)
+-    endif()
 +include(CMakeFindDependencyMacro)
 +if("@use_openssl@")
 +    find_dependency(OpenSSL)
 +endif()
 +if(UNIX AND NOT "@use_builtin_httpapi@")
-     find_dependency(CURL)
++    find_dependency(CURL)
  endif()
- 
+
+ include("${CMAKE_CURRENT_LIST_DIR}/azure_c_shared_utilityTargets.cmake")
diff --git a/external_imported/vcpkg/ports/azure-c-shared-utility/portfile.cmake b/external_imported/vcpkg/ports/azure-c-shared-utility/portfile.cmake
index 9f6c54a8e..0ed1e02ef 100644
--- a/external_imported/vcpkg/ports/azure-c-shared-utility/portfile.cmake
+++ b/external_imported/vcpkg/ports/azure-c-shared-utility/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-c-shared-utility
-    REF 4f1b7cd6bf48833fe4b9e23e2ff07510753faee5
-    SHA512 5374585bd05ad2b55d2aa183d65b0b371d52b7f3145bcc9486e92d306d172109a8a6b13e14b56073426c3b02541044864d63fc728a9006a8dcd7ab552002be79
+    REF 8ee0e5d88d1771d33e36d38d392ec9d9ae13ea55
+    SHA512 d57730c294340093b80108c55280ab089fa851a68c6f9df53b55823920fce25f5f1daa7ff3eeb2f8ea76bc10603aa7096931caa608c49f86e515b96477fbc81d
     HEAD_REF master
     PATCHES
         fix-install-location.patch
diff --git a/external_imported/vcpkg/ports/azure-c-shared-utility/vcpkg.json b/external_imported/vcpkg/ports/azure-c-shared-utility/vcpkg.json
index 412f0a83c..bd4574ea1 100644
--- a/external_imported/vcpkg/ports/azure-c-shared-utility/vcpkg.json
+++ b/external_imported/vcpkg/ports/azure-c-shared-utility/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "azure-c-shared-utility",
-  "version-date": "2023-01-18",
+  "version-date": "2023-08-07",
   "description": "Azure C SDKs common code",
   "homepage": "https://github.com/Azure/azure-c-shared-utility",
   "license": "MIT",
@@ -9,11 +9,11 @@
     "azure-macro-utils-c",
     {
       "name": "curl",
-      "platform": "linux"
+      "platform": "!windows"
     },
     {
       "name": "openssl",
-      "platform": "linux"
+      "platform": "!windows & !osx"
     },
     "umock-c",
     {
diff --git a/external_imported/vcpkg/ports/azure-core-amqp-cpp/portfile.cmake b/external_imported/vcpkg/ports/azure-core-amqp-cpp/portfile.cmake
new file mode 100644
index 000000000..772db9cfb
--- /dev/null
+++ b/external_imported/vcpkg/ports/azure-core-amqp-cpp/portfile.cmake
@@ -0,0 +1,32 @@
+# NOTE: All changes made to this file will get overwritten by the next port release.
+# Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Azure/azure-sdk-for-cpp
+    REF azure-core-amqp_1.0.0-beta.7
+    SHA512 ece00ea8a005cffba9df5e00169d7c1f4d1db75bf4acfab8a5057221c7992886df89882bd5eec146e432a0463f526cd547fa90c7430a0228441762e2ad4513e1
+)
+
+if(EXISTS "${SOURCE_PATH}/sdk/core/azure-core-amqp")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/core/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/_")
+
+  file(RENAME "${SOURCE_PATH}/sdk/core/azure-core-amqp" "${SOURCE_PATH}/sdk/core/_")
+  file(RENAME "${SOURCE_PATH}/sdk/core" "${SOURCE_PATH}/sdk/_")
+  file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_")
+endif()
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}/_/_/_"
+    OPTIONS
+        -DWARNINGS_AS_ERRORS=OFF
+        -DBUILD_TESTING=OFF
+)
+
+vcpkg_cmake_install()
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+vcpkg_cmake_config_fixup()
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+vcpkg_copy_pdbs()
diff --git a/external_imported/vcpkg/ports/azure-core-amqp-cpp/vcpkg.json b/external_imported/vcpkg/ports/azure-core-amqp-cpp/vcpkg.json
new file mode 100644
index 000000000..eeac189bf
--- /dev/null
+++ b/external_imported/vcpkg/ports/azure-core-amqp-cpp/vcpkg.json
@@ -0,0 +1,33 @@
+{
+  "$comment": [
+    "NOTE: All changes made to this file will get overwritten by the next port release.",
+    "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp."
+  ],
+  "name": "azure-core-amqp-cpp",
+  "version-semver": "1.0.0-beta.7",
+  "description": [
+    "Microsoft Azure AMQP SDK for C++",
+    "This library provides AMQP functionality to Azure SDK services."
+  ],
+  "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/core/azure-core-amqp",
+  "license": "MIT",
+  "supports": "!uwp",
+  "dependencies": [
+    "azure-c-shared-utility",
+    {
+      "name": "azure-core-cpp",
+      "default-features": false,
+      "version>=": "1.10.0"
+    },
+    "azure-macro-utils-c",
+    "umock-c",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/azure-core-cpp/portfile.cmake b/external_imported/vcpkg/ports/azure-core-cpp/portfile.cmake
index 280c6597c..c9f23af66 100644
--- a/external_imported/vcpkg/ports/azure-core-cpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/azure-core-cpp/portfile.cmake
@@ -1,8 +1,11 @@
+# NOTE: All changes made to this file will get overwritten by the next port release.
+# Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
-    REF azure-core_1.8.0
-    SHA512 13d49b79dbc9e5c2fd8ce019e76b2ba92258174f7b12945eae67c7451548ada4afc059023b5092c3de7ce77bc4bb0954a5c483b8451aeefde4a3133401ace632
+    REF azure-core_1.11.1
+    SHA512 6a4e34e17b34864e246d17c22252e9e0056e2128be5872a23c8d4c6feb6cfd9e253ef48c9f3e1fbdfd8646e68711c143e1155f45a0172bf6d78021ade3308120
 )
 
 vcpkg_check_features(
@@ -12,11 +15,23 @@ vcpkg_check_features(
         winhttp BUILD_TRANSPORT_WINHTTP
 )
 
+if(EXISTS "${SOURCE_PATH}/sdk/core/azure-core")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/core/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/_")
+
+  file(RENAME "${SOURCE_PATH}/sdk/core/azure-core" "${SOURCE_PATH}/sdk/core/_")
+  file(RENAME "${SOURCE_PATH}/sdk/core" "${SOURCE_PATH}/sdk/_")
+  file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_")
+endif()
+
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}/sdk/core/azure-core/
+    SOURCE_PATH "${SOURCE_PATH}/_/_/_"
     OPTIONS
         ${FEATURE_OPTIONS}
         -DWARNINGS_AS_ERRORS=OFF
+        -DBUILD_TESTING=OFF
+        -DNO_AUTOMATIC_TRANSPORT_BUILD=ON
 )
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/azure-core-cpp/vcpkg.json b/external_imported/vcpkg/ports/azure-core-cpp/vcpkg.json
index 19f6d21d6..db2d046cf 100644
--- a/external_imported/vcpkg/ports/azure-core-cpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/azure-core-cpp/vcpkg.json
@@ -1,6 +1,10 @@
 {
+  "$comment": [
+    "NOTE: All changes made to this file will get overwritten by the next port release.",
+    "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp."
+  ],
   "name": "azure-core-cpp",
-  "version-semver": "1.8.0",
+  "version-semver": "1.11.1",
   "description": [
     "Microsoft Azure Core SDK for C++",
     "This library provides shared primitives, abstractions, and helpers for modern Azure SDK client libraries written in the C++."
@@ -64,7 +68,7 @@
     },
     "winhttp": {
       "description": "WinHTTP HTTP transport implementation",
-      "supports": "windows",
+      "supports": "windows & !uwp",
       "dependencies": [
         {
           "name": "azure-core-cpp",
diff --git a/external_imported/vcpkg/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake b/external_imported/vcpkg/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake
index de527c389..c17615597 100644
--- a/external_imported/vcpkg/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake
@@ -1,3 +1,6 @@
+# NOTE: All changes made to this file will get overwritten by the next port release.
+# Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
@@ -5,10 +8,21 @@ vcpkg_from_github(
     SHA512 645c616fe54024f30a6e4b9c2626bfeaf906086be7bbeccc4a1155178670fb70d9818938db2f9fa8e3b9593ca45e0b10042dcd67fde04d2542f6f72a74884697
 )
 
+if(EXISTS "${SOURCE_PATH}/sdk/core/azure-core-tracing-opentelemetry")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/core/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/_")
+
+  file(RENAME "${SOURCE_PATH}/sdk/core/azure-core-tracing-opentelemetry" "${SOURCE_PATH}/sdk/core/_")
+  file(RENAME "${SOURCE_PATH}/sdk/core" "${SOURCE_PATH}/sdk/_")
+  file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_")
+endif()
+
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}/sdk/core/azure-core-tracing-opentelemetry/
+    SOURCE_PATH "${SOURCE_PATH}/_/_/_"
     OPTIONS
         -DWARNINGS_AS_ERRORS=OFF
+        -DBUILD_TESTING=OFF
 )
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json b/external_imported/vcpkg/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json
index 43f19f766..9d9a6e96c 100644
--- a/external_imported/vcpkg/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json
@@ -1,6 +1,11 @@
 {
+  "$comment": [
+    "NOTE: All changes made to this file will get overwritten by the next port release.",
+    "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp."
+  ],
   "name": "azure-core-tracing-opentelemetry-cpp",
   "version-semver": "1.0.0-beta.4",
+  "port-version": 2,
   "description": [
     "Microsoft Azure Core Tracing OpenTelemetry SDK for C++",
     "This library provides support for modern Azure SDK client libraries written in C++ to leverage OpenTelemetry APIs."
diff --git a/external_imported/vcpkg/ports/azure-data-tables-cpp/portfile.cmake b/external_imported/vcpkg/ports/azure-data-tables-cpp/portfile.cmake
new file mode 100644
index 000000000..c9dfbb6bd
--- /dev/null
+++ b/external_imported/vcpkg/ports/azure-data-tables-cpp/portfile.cmake
@@ -0,0 +1,32 @@
+# NOTE: All changes made to this file will get overwritten by the next port release.
+# Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Azure/azure-sdk-for-cpp
+    REF azure-data-tables_1.0.0-beta.1
+    SHA512 64c887337e593ffc95ab5d5afb25b283255dafbf8ddce2b3207c928dee9277737d3713e02feb3991305ecf89243bf82753843c4a7c127b991a332efcaee875b3
+)
+
+if(EXISTS "${SOURCE_PATH}/sdk/tables/azure-data-tables")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/tables/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/_")
+
+  file(RENAME "${SOURCE_PATH}/sdk/tables/azure-data-tables" "${SOURCE_PATH}/sdk/tables/_")
+  file(RENAME "${SOURCE_PATH}/sdk/tables" "${SOURCE_PATH}/sdk/_")
+  file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_")
+endif()
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}/_/_/_"
+    OPTIONS
+        -DWARNINGS_AS_ERRORS=OFF
+        -DBUILD_TESTING=OFF
+)
+
+vcpkg_cmake_install()
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+vcpkg_cmake_config_fixup()
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+vcpkg_copy_pdbs()
diff --git a/external_imported/vcpkg/ports/azure-data-tables-cpp/vcpkg.json b/external_imported/vcpkg/ports/azure-data-tables-cpp/vcpkg.json
new file mode 100644
index 000000000..3ba80bb64
--- /dev/null
+++ b/external_imported/vcpkg/ports/azure-data-tables-cpp/vcpkg.json
@@ -0,0 +1,34 @@
+{
+  "$comment": [
+    "NOTE: All changes made to this file will get overwritten by the next port release.",
+    "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp."
+  ],
+  "name": "azure-data-tables-cpp",
+  "version-semver": "1.0.0-beta.1",
+  "description": [
+    "Microsoft Azure Data Tables SDK for C++",
+    "This library provides Azure Data Tables SDK."
+  ],
+  "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/tables/azure-data-tables",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "azure-core-cpp",
+      "default-features": false,
+      "version>=": "1.11.0"
+    },
+    {
+      "name": "libxml2",
+      "default-features": false,
+      "platform": "!windows"
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/azure-identity-cpp/portfile.cmake b/external_imported/vcpkg/ports/azure-identity-cpp/portfile.cmake
index ded88368a..f4389c55e 100644
--- a/external_imported/vcpkg/ports/azure-identity-cpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/azure-identity-cpp/portfile.cmake
@@ -1,14 +1,28 @@
+# NOTE: All changes made to this file will get overwritten by the next port release.
+# Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
-    REF azure-identity_1.4.0
-    SHA512 ddc6aee949e1a6dfb39ea36d118cec652889e31334e90c51e516e520599d0ce5bbcdaa6dfab7168f2b91c80647d5a0e29f13b465fdf092d112e955b6367f2de8
+    REF azure-identity_1.6.0
+    SHA512 a856bc8f3c536d0ac2a5d7817d4bb890bf0688940075ea191df45a58faff46790acda9cdd917cd4f14496c9a696c8cf31be7935b08dd2d549e8ea5d30dbe2c94
 )
 
+if(EXISTS "${SOURCE_PATH}/sdk/identity/azure-identity")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/identity/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/_")
+
+  file(RENAME "${SOURCE_PATH}/sdk/identity/azure-identity" "${SOURCE_PATH}/sdk/identity/_")
+  file(RENAME "${SOURCE_PATH}/sdk/identity" "${SOURCE_PATH}/sdk/_")
+  file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_")
+endif()
+
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}/sdk/identity/azure-identity/
+    SOURCE_PATH "${SOURCE_PATH}/_/_/_"
     OPTIONS
         -DWARNINGS_AS_ERRORS=OFF
+        -DBUILD_TESTING=OFF
 )
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/azure-identity-cpp/vcpkg.json b/external_imported/vcpkg/ports/azure-identity-cpp/vcpkg.json
index 083a640ff..429251a0c 100644
--- a/external_imported/vcpkg/ports/azure-identity-cpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/azure-identity-cpp/vcpkg.json
@@ -1,6 +1,7 @@
 {
+  "$comment": "NOTE: All changes made to this file will get overwritten by the next port release. Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.",
   "name": "azure-identity-cpp",
-  "version-semver": "1.4.0",
+  "version-semver": "1.6.0",
   "description": [
     "Microsoft Azure Identity SDK for C++",
     "This library provides common authentication-related abstractions for Azure SDK."
@@ -11,9 +12,12 @@
     {
       "name": "azure-core-cpp",
       "default-features": false,
-      "version>=": "1.8.0"
+      "version>=": "1.9.0"
+    },
+    {
+      "name": "openssl",
+      "platform": "!windows & !uwp"
     },
-    "openssl",
     {
       "name": "vcpkg-cmake",
       "host": true
@@ -21,6 +25,10 @@
     {
       "name": "vcpkg-cmake-config",
       "host": true
+    },
+    {
+      "name": "wil",
+      "platform": "windows & !uwp"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/azure-iot-sdk-c/improve-external-deps-preview.patch b/external_imported/vcpkg/ports/azure-iot-sdk-c/improve-external-deps-preview.patch
deleted file mode 100644
index 8526cd6eb..000000000
--- a/external_imported/vcpkg/ports/azure-iot-sdk-c/improve-external-deps-preview.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-diff --git a/configs/azure_iot_sdksConfig.cmake b/configs/azure_iot_sdksConfig.cmake
-index b9c62e8..edf5847 100644
---- a/configs/azure_iot_sdksConfig.cmake
-+++ b/configs/azure_iot_sdksConfig.cmake
-@@ -1,5 +1,11 @@
- #Copyright (c) Microsoft. All rights reserved.
- #Licensed under the MIT license. See LICENSE file in the project root for full license information.
-+include(CMakeFindDependencyMacro)
-+find_dependency(unofficial-parson)
-+find_dependency(uamqp)
-+find_dependency(uhttp)
-+find_dependency(umqtt)
-+find_dependency(azure_c_shared_utility)
- 
- include("${CMAKE_CURRENT_LIST_DIR}/azure_iot_sdksTargets.cmake")
- 
-diff --git a/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt b/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt
-index 33b5b8709..45ef7b87a 100644
---- a/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt
-+++ b/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt
-@@ -31,12 +31,10 @@ set(${theseTestsName}_c_files
- 
- set(${theseTestsName}_c_files
-     ../../../certs/certs.c
--    ../../../deps/parson/parson.c
- )
- 
- set(${theseTestsName}_h_files
-     ../../../certs/certs.h
--    ../../../deps/parson/parson.h
-     ../common_dt_e2e/iothubclient_common_dt_e2e.h
- )
- 
-diff --git a/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt b/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt
-index d05d654..5872c8d 100644
---- a/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt
-+++ b/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt
-@@ -31,12 +31,10 @@ set(${theseTestsName}_nuget_c_files
- 
- set(${theseTestsName}_c_files
-     ../../../certs/certs.c
--    ../../../deps/parson/parson.c
- )
- 
- set(${theseTestsName}_h_files
-     ../../../certs/certs.h
--    ../../../deps/parson/parson.h
-     ../common_dt_e2e/iothubclient_common_dt_e2e.h
- )
- 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ba2f8e016..19885c8b8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -179,17 +179,6 @@ endif()
- # Use solution folders.
- set_property(GLOBAL PROPERTY USE_FOLDERS ON)
- 
--# build the parson library for json parsing
--add_library(parson
--    ./deps/parson/parson.c
--    ./deps/parson/parson.h
--)
--if (MSVC)
--    set_source_files_properties(../deps/parson/parson.c PROPERTIES COMPILE_FLAGS "/wd4244 /wd4232")
--endif()
--set(parson_h_install_files ./deps/parson/parson.h)
--set(parson_install_libs parson)
--
- if (IN_OPENWRT)
-     ADD_DEFINITIONS("$ENV{TARGET_LDFLAGS}" "$ENV{TARGET_CPPFLAGS}" "$ENV{TARGET_CFLAGS}")
-     INCLUDE_DIRECTORIES("$ENV{TOOLCHAIN_DIR}/usr/include" "$ENV{TARGET_LDFLAGS}" "$ENV{TARGET_CPPFLAGS}" "$ENV{TARGET_CFLAGS}")
-@@ -407,7 +396,7 @@ endif()
- 
- if (${use_installed_dependencies})
-     # Install azure_iot_sdks
--    set(package_location "cmake")
-+    set(package_location "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
- 
-     include(CMakePackageConfigHelpers)
- 
-@@ -422,14 +411,10 @@ if (${use_installed_dependencies})
-         COPYONLY
-     )
- 
--    install(FILES ${parson_h_install_files}
--        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azureiot
--    )
--    install(TARGETS ${parson_install_libs} EXPORT azure_iot_sdksTargets
--        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
--        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
--        INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azureiot
--    )
-+    find_package(unofficial-parson REQUIRED CONFIG)
-+    if(NOT TARGET parson)
-+        add_library(parson ALIAS unofficial::parson::parson)
-+    endif()
- 
-     install(EXPORT azure_iot_sdksTargets
-         FILE
-@@ -446,11 +431,5 @@ if (${use_installed_dependencies})
-         DESTINATION
-             ${package_location}
-     )
--else()
--    install(FILES ${parson_h_install_files}
--        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azureiot)
--    install(TARGETS ${parson_install_libs}
--        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
--        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
- endif()
- 
diff --git a/external_imported/vcpkg/ports/azure-iot-sdk-c/improve-external-deps.patch b/external_imported/vcpkg/ports/azure-iot-sdk-c/improve-external-deps.patch
index 6e50e002f..0dbd27c50 100644
--- a/external_imported/vcpkg/ports/azure-iot-sdk-c/improve-external-deps.patch
+++ b/external_imported/vcpkg/ports/azure-iot-sdk-c/improve-external-deps.patch
@@ -1,3 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 427e82e..5a58e47 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -257,6 +257,9 @@ add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/deps)
+ if(${use_installed_dependencies})
+     find_package(parson REQUIRED CONFIG)
+ endif()
++if(NOT TARGET parson)
++    add_library(parson ALIAS parson::parson)
++endif()
+ 
+ include_directories(${MACRO_UTILS_INC_FOLDER})
+ include_directories(${UMOCK_C_INC_FOLDER})
 diff --git a/configs/azure_iot_sdksConfig.cmake b/configs/azure_iot_sdksConfig.cmake
 index b9c62e8..edf5847 100644
 --- a/configs/azure_iot_sdksConfig.cmake
diff --git a/external_imported/vcpkg/ports/azure-iot-sdk-c/portfile.cmake b/external_imported/vcpkg/ports/azure-iot-sdk-c/portfile.cmake
index 0058c8112..3e837562b 100644
--- a/external_imported/vcpkg/ports/azure-iot-sdk-c/portfile.cmake
+++ b/external_imported/vcpkg/ports/azure-iot-sdk-c/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-iot-sdk-c
-    REF 9fa25c9f996f06b57132c73b95a251a0598d786b
-    SHA512 4b7ea9831bae34319710f6423a4d93a85ebe91a881d7e04d68e10dfc9828ec0bfd9cd81b55ebefa21c35e6a7f59492a2719128e7e0cab03d7afab1d6af07f43e
+    REF 97fef570416467598100b782ef27ceadad9ca796
+    SHA512 faec54b97164c778ef3cd6accfbd5181381f6ab488c06900a096be5338563581552b8d8314d6ce91cb4db82c936490d3b435cdf9a3e50383e1d7bb643859a40c
     HEAD_REF master
     PATCHES
         fix-install-location.patch
diff --git a/external_imported/vcpkg/ports/azure-iot-sdk-c/vcpkg.json b/external_imported/vcpkg/ports/azure-iot-sdk-c/vcpkg.json
index dcaffc629..a50e9a635 100644
--- a/external_imported/vcpkg/ports/azure-iot-sdk-c/vcpkg.json
+++ b/external_imported/vcpkg/ports/azure-iot-sdk-c/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "azure-iot-sdk-c",
-  "version-date": "2023-01-18",
+  "version-date": "2023-08-07",
   "description": "A C99 SDK for connecting devices to Microsoft Azure IoT services",
   "homepage": "https://github.com/Azure/azure-iot-sdk-c",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/azure-kinect-sensor-sdk/fix-builds.patch b/external_imported/vcpkg/ports/azure-kinect-sensor-sdk/fix-builds.patch
index 750667eef..881d5abe2 100644
--- a/external_imported/vcpkg/ports/azure-kinect-sensor-sdk/fix-builds.patch
+++ b/external_imported/vcpkg/ports/azure-kinect-sensor-sdk/fix-builds.patch
@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4f002b5..d48f3f2 100644
+index 4f002b5..dd9b1df 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -27,8 +27,6 @@ option(K4A_BUILD_DOCS "Build K4A doxygen documentation" OFF)
@@ -11,7 +11,7 @@ index 4f002b5..d48f3f2 100644
  # Set the project version
  include(K4AProjectVersion)
  
-@@ -100,6 +98,43 @@ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL
+@@ -100,6 +98,42 @@ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL
      set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
  endif()
  
@@ -34,14 +34,13 @@ index 4f002b5..d48f3f2 100644
 +add_definitions(-DMATROSKA_VERSION=2)
 +find_package(libsoundio CONFIG REQUIRED)
 +if (NOT WIN32)
-+   find_package(libusb CONFIG REQUIRED)
 +   find_package(libuvc CONFIG REQUIRED)
 +   add_library(libuvc::libuvc ALIAS LibUVC::UVCStatic)
 +   find_package(OpenSSL REQUIRED)
 +   find_package(ZLIB REQUIRED)
-+else()
-+   find_library(LibUSB libusb-1.0 REQUIRED)
 +endif()
++FIND_PACKAGE(PkgConfig REQUIRED)
++pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0)
 +find_package(libyuv CONFIG REQUIRED)
 +find_package(spdlog CONFIG REQUIRED)
 +if (BUILD_TOOLS)
@@ -295,7 +294,7 @@ index e4a696e..6ee6696 100644
      k4ainternal::deloader)
  
 diff --git a/src/usbcommand/CMakeLists.txt b/src/usbcommand/CMakeLists.txt
-index f75bd55..5403216 100644
+index f75bd55..7130728 100644
 --- a/src/usbcommand/CMakeLists.txt
 +++ b/src/usbcommand/CMakeLists.txt
 @@ -12,8 +12,8 @@ target_include_directories(k4a_usb_cmd PUBLIC
@@ -305,7 +304,7 @@ index f75bd55..5403216 100644
 -    azure::aziotsharedutil
 -    LibUSB::LibUSB
 +    aziotsharedutil
-+    ${LibUSB}
++    PkgConfig::libusb
      k4ainternal::allocator
      k4ainternal::image
      k4ainternal::logging)
@@ -585,7 +584,7 @@ index c544e1e..9489bf8 100644
      k4ainternal::logging
      k4ainternal::utcommon)
 diff --git a/tools/k4aviewer/CMakeLists.txt b/tools/k4aviewer/CMakeLists.txt
-index 98578c0..6ab38d9 100644
+index 98578c0..244c867 100644
 --- a/tools/k4aviewer/CMakeLists.txt
 +++ b/tools/k4aviewer/CMakeLists.txt
 @@ -60,10 +60,11 @@ set(EXTERNAL_LIBRARIES
@@ -595,7 +594,7 @@ index 98578c0..6ab38d9 100644
 -    LibUSB::LibUSB
 -    libyuv::libyuv
 -    glfw::glfw
-+    ${LibUSB}
++    PkgConfig::libusb
 +    yuv
 +    glfw
      ${OPENGL_LIBRARIES}
diff --git a/external_imported/vcpkg/ports/azure-kinect-sensor-sdk/portfile.cmake b/external_imported/vcpkg/ports/azure-kinect-sensor-sdk/portfile.cmake
index 414b6775f..dbdcc27c4 100644
--- a/external_imported/vcpkg/ports/azure-kinect-sensor-sdk/portfile.cmake
+++ b/external_imported/vcpkg/ports/azure-kinect-sensor-sdk/portfile.cmake
@@ -2,7 +2,7 @@ set(VERSION 1.4.1)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO microsoft/Azure-Kinect-Sensor-SDK
-    REF v${VERSION}
+    REF "v${VERSION}"
     SHA512 ef94c072caae43b0a105b192013e09082d267d4064e6676fac981b52e7576a663f59fcb53f0afe66b425ef2cea0cb3aa224ff7be6485c0b5543ff9cdabd82d4d
     HEAD_REF master
     PATCHES
@@ -14,6 +14,7 @@ vcpkg_from_github(
 )
 
 vcpkg_find_acquire_program(PYTHON3)
+vcpkg_find_acquire_program(PKGCONFIG)
 get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
 vcpkg_add_to_path("${PYTHON3_DIR}")
 
@@ -27,7 +28,9 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE
-    OPTIONS ${FEATURE_OPTIONS}
+    OPTIONS 
+    "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}"
+    ${FEATURE_OPTIONS}
     -DK4A_SOURCE_LINK=OFF
     -DK4A_MTE_VERSION=ON
     -DBUILD_EXAMPLES=OFF
@@ -63,8 +66,8 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 17630a00f4e9ff3ef68945b62021f6d0390030b43c120c207afe934075a7a87c5848be1f46f4c35c7ecd5698012452ffcbb67f739e9048857410ec7077e5e8c6 
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH PACKAGE_PATH
+vcpkg_extract_source_archive(
+    PACKAGE_PATH
     ARCHIVE ${ARCHIVE}
     NO_REMOVE_ONE_LEVEL
 )
@@ -88,4 +91,4 @@ else()
 endif()
 
 # Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/azure-kinect-sensor-sdk/vcpkg.json b/external_imported/vcpkg/ports/azure-kinect-sensor-sdk/vcpkg.json
index 3addef920..5bff0fea5 100644
--- a/external_imported/vcpkg/ports/azure-kinect-sensor-sdk/vcpkg.json
+++ b/external_imported/vcpkg/ports/azure-kinect-sensor-sdk/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "azure-kinect-sensor-sdk",
   "version": "1.4.1",
-  "port-version": 4,
+  "port-version": 6,
   "description": "Azure Kinect SDK is a cross platform (Linux and Windows) user mode SDK to read data from your Azure Kinect device.",
   "homepage": "https://github.com/microsoft/Azure-Kinect-Sensor-SDK",
   "supports": "linux | windows",
diff --git a/external_imported/vcpkg/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/portfile.cmake b/external_imported/vcpkg/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/portfile.cmake
new file mode 100644
index 000000000..465381572
--- /dev/null
+++ b/external_imported/vcpkg/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/portfile.cmake
@@ -0,0 +1,32 @@
+# NOTE: All changes made to this file will get overwritten by the next port release.
+# Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Azure/azure-sdk-for-cpp
+    REF azure-messaging-eventhubs-checkpointstore-blob_1.0.0-beta.1
+    SHA512 7c55eda0c04bbc57729a7b479d8d5874b0e06927aff1916833520a3a944e63b6fceabd3565fd91549ec00157f2c4af5a87a6a2db55a5c24df611cd96572f9a08
+)
+
+if(EXISTS "${SOURCE_PATH}/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/eventhubs/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/_")
+
+  file(RENAME "${SOURCE_PATH}/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob" "${SOURCE_PATH}/sdk/eventhubs/_")
+  file(RENAME "${SOURCE_PATH}/sdk/eventhubs" "${SOURCE_PATH}/sdk/_")
+  file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_")
+endif()
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}/_/_/_"
+    OPTIONS
+        -DWARNINGS_AS_ERRORS=OFF
+        -DBUILD_TESTING=OFF
+)
+
+vcpkg_cmake_install()
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+vcpkg_cmake_config_fixup()
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+vcpkg_copy_pdbs()
diff --git a/external_imported/vcpkg/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/vcpkg.json b/external_imported/vcpkg/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/vcpkg.json
new file mode 100644
index 000000000..d2d0d949e
--- /dev/null
+++ b/external_imported/vcpkg/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/vcpkg.json
@@ -0,0 +1,40 @@
+{
+  "$comment": [
+    "NOTE: All changes made to this file will get overwritten by the next port release.",
+    "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp."
+  ],
+  "name": "azure-messaging-eventhubs-checkpointstore-blob-cpp",
+  "version-semver": "1.0.0-beta.1",
+  "port-version": 1,
+  "description": [
+    "Microsoft Azure Messaging Event Hubs Blob Checkpoint Store SDK for C++",
+    "This library provides an Azure-Storage-Blobs based implementation of an Azure Messaging Event Hubs SDK Checkpoint Store."
+  ],
+  "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "azure-core-amqp-cpp",
+      "default-features": false,
+      "version>=": "1.0.0-beta.2"
+    },
+    {
+      "name": "azure-messaging-eventhubs-cpp",
+      "default-features": false,
+      "version>=": "1.0.0-beta.2"
+    },
+    {
+      "name": "azure-storage-blobs-cpp",
+      "default-features": false,
+      "version>=": "12.8.0"
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/azure-messaging-eventhubs-cpp/portfile.cmake b/external_imported/vcpkg/ports/azure-messaging-eventhubs-cpp/portfile.cmake
new file mode 100644
index 000000000..87579a502
--- /dev/null
+++ b/external_imported/vcpkg/ports/azure-messaging-eventhubs-cpp/portfile.cmake
@@ -0,0 +1,32 @@
+# NOTE: All changes made to this file will get overwritten by the next port release.
+# Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Azure/azure-sdk-for-cpp
+    REF azure-messaging-eventhubs_1.0.0-beta.6
+    SHA512 bb3cd12637c487e779ebc64c12b3f68fb83a2d0b4aba7db35fc62c7f39b2f499b07f5f3fcdbd3992cc10f8b97c3c5f0710ccc156b9a97a07617ef1bf5d42088c
+)
+
+if(EXISTS "${SOURCE_PATH}/sdk/eventhubs/azure-messaging-eventhubs")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/eventhubs/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/_")
+
+  file(RENAME "${SOURCE_PATH}/sdk/eventhubs/azure-messaging-eventhubs" "${SOURCE_PATH}/sdk/eventhubs/_")
+  file(RENAME "${SOURCE_PATH}/sdk/eventhubs" "${SOURCE_PATH}/sdk/_")
+  file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_")
+endif()
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}/_/_/_"
+    OPTIONS
+        -DWARNINGS_AS_ERRORS=OFF
+        -DBUILD_TESTING=OFF
+)
+
+vcpkg_cmake_install()
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+vcpkg_cmake_config_fixup()
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+vcpkg_copy_pdbs()
diff --git a/external_imported/vcpkg/ports/azure-messaging-eventhubs-cpp/vcpkg.json b/external_imported/vcpkg/ports/azure-messaging-eventhubs-cpp/vcpkg.json
new file mode 100644
index 000000000..c47d69cd3
--- /dev/null
+++ b/external_imported/vcpkg/ports/azure-messaging-eventhubs-cpp/vcpkg.json
@@ -0,0 +1,29 @@
+{
+  "$comment": [
+    "NOTE: All changes made to this file will get overwritten by the next port release.",
+    "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp."
+  ],
+  "name": "azure-messaging-eventhubs-cpp",
+  "version-semver": "1.0.0-beta.6",
+  "description": [
+    "Microsoft Azure Messaging Event Hubs SDK for C++",
+    "This library provides Azure Messaging Event Hubs SDK."
+  ],
+  "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/eventhubs/azure-messaging-eventhubs",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "azure-core-amqp-cpp",
+      "default-features": false,
+      "version>=": "1.0.0-beta.7"
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/azure-security-attestation-cpp/portfile.cmake b/external_imported/vcpkg/ports/azure-security-attestation-cpp/portfile.cmake
index ddc575363..949d859d4 100644
--- a/external_imported/vcpkg/ports/azure-security-attestation-cpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/azure-security-attestation-cpp/portfile.cmake
@@ -1,3 +1,6 @@
+# NOTE: All changes made to this file will get overwritten by the next port release.
+# Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
@@ -5,10 +8,21 @@ vcpkg_from_github(
     SHA512 bf5c0ab830122838045e3e5ff03aae38f81082b50b9b0c61fa21a8c101a2fd98ad98b136d49702665d720f59baa6a89c8af3f161a44c09d24ad747fb1828cbca
 )
 
+if(EXISTS "${SOURCE_PATH}/sdk/attestation/azure-security-attestation")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/attestation/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/_")
+
+  file(RENAME "${SOURCE_PATH}/sdk/attestation/azure-security-attestation" "${SOURCE_PATH}/sdk/attestation/_")
+  file(RENAME "${SOURCE_PATH}/sdk/attestation" "${SOURCE_PATH}/sdk/_")
+  file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_")
+endif()
+
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}/sdk/attestation/azure-security-attestation/
+    SOURCE_PATH "${SOURCE_PATH}/_/_/_"
     OPTIONS
         -DWARNINGS_AS_ERRORS=OFF
+        -DBUILD_TESTING=OFF
 )
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/azure-security-attestation-cpp/vcpkg.json b/external_imported/vcpkg/ports/azure-security-attestation-cpp/vcpkg.json
index ccc84788b..073520ff1 100644
--- a/external_imported/vcpkg/ports/azure-security-attestation-cpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/azure-security-attestation-cpp/vcpkg.json
@@ -1,6 +1,11 @@
 {
+  "$comment": [
+    "NOTE: All changes made to this file will get overwritten by the next port release.",
+    "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp."
+  ],
   "name": "azure-security-attestation-cpp",
   "version-semver": "1.1.0",
+  "port-version": 2,
   "description": [
     "Microsoft Azure Attestation Service SDK for C++",
     "This library provides API access to the Microsoft Azure Attestation service."
diff --git a/external_imported/vcpkg/ports/azure-security-keyvault-administration-cpp/portfile.cmake b/external_imported/vcpkg/ports/azure-security-keyvault-administration-cpp/portfile.cmake
index 36ba5827a..31ddd965f 100644
--- a/external_imported/vcpkg/ports/azure-security-keyvault-administration-cpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/azure-security-keyvault-administration-cpp/portfile.cmake
@@ -1,14 +1,28 @@
+# NOTE: All changes made to this file will get overwritten by the next port release.
+# Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
-    REF azure-security-keyvault-administration_4.0.0-beta.2
-    SHA512 9f4f9f115bbc922cc62fd6aa75e4eb56aaed21058e0defd129993c38888dc90cdd29b3c4e746f8b1fb0c716cefe5d605e59994a68a7d6aaf7fdbcee0a81c535e
+    REF azure-security-keyvault-administration_4.0.0-beta.4
+    SHA512 2a9c04fd2d98484632e3a53b98c09bd1c30cf117f34baa15e859d50736c2cfc26c19c6e846be6ad71f1b6b3def317dfb28d0586a1b0b55949246218479445660
 )
 
+if(EXISTS "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-administration")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/keyvault/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/_")
+
+  file(RENAME "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-administration" "${SOURCE_PATH}/sdk/keyvault/_")
+  file(RENAME "${SOURCE_PATH}/sdk/keyvault" "${SOURCE_PATH}/sdk/_")
+  file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_")
+endif()
+
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-administration/
+    SOURCE_PATH "${SOURCE_PATH}/_/_/_"
     OPTIONS
         -DWARNINGS_AS_ERRORS=OFF
+        -DBUILD_TESTING=OFF
 )
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/azure-security-keyvault-administration-cpp/vcpkg.json b/external_imported/vcpkg/ports/azure-security-keyvault-administration-cpp/vcpkg.json
index e3c8f800a..af0beabe6 100644
--- a/external_imported/vcpkg/ports/azure-security-keyvault-administration-cpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/azure-security-keyvault-administration-cpp/vcpkg.json
@@ -1,6 +1,10 @@
 {
+  "$comment": [
+    "NOTE: All changes made to this file will get overwritten by the next port release.",
+    "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp."
+  ],
   "name": "azure-security-keyvault-administration-cpp",
-  "version-semver": "4.0.0-beta.2",
+  "version-semver": "4.0.0-beta.4",
   "description": [
     "Microsoft Azure Key Vault Administration SDK for C++",
     "This library provides Azure Key Vault Administration SDK."
@@ -11,7 +15,7 @@
     {
       "name": "azure-core-cpp",
       "default-features": false,
-      "version>=": "1.7.2"
+      "version>=": "1.9.0"
     },
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/azure-security-keyvault-certificates-cpp/portfile.cmake b/external_imported/vcpkg/ports/azure-security-keyvault-certificates-cpp/portfile.cmake
index cd0d8c438..1f19e6ab2 100644
--- a/external_imported/vcpkg/ports/azure-security-keyvault-certificates-cpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/azure-security-keyvault-certificates-cpp/portfile.cmake
@@ -1,14 +1,28 @@
+# NOTE: All changes made to this file will get overwritten by the next port release.
+# Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
-    REF azure-security-keyvault-certificates_4.1.0
-    SHA512 fc07f48d82d0475b28a62ce9de386433908d94b00678cd89c8310cdb6f8dd3e0e973936191f10be08af7b0293b7b434223c3682de4a06f0b4b067baf37e8e0b3
+    REF azure-security-keyvault-certificates_4.2.1
+    SHA512 f18d205ee0be9ab4289860fe4fdc0f4a6c3571eb0a8d0ca0ea66e7fef477e04ed0ba455e1a5af687e0980d7f12b919d1a5c85ee40d41dbcfd695f5d62843dcd5
 )
 
+if(EXISTS "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-certificates")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/keyvault/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/_")
+
+  file(RENAME "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-certificates" "${SOURCE_PATH}/sdk/keyvault/_")
+  file(RENAME "${SOURCE_PATH}/sdk/keyvault" "${SOURCE_PATH}/sdk/_")
+  file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_")
+endif()
+
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-certificates/
+    SOURCE_PATH "${SOURCE_PATH}/_/_/_"
     OPTIONS
         -DWARNINGS_AS_ERRORS=OFF
+        -DBUILD_TESTING=OFF
 )
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/azure-security-keyvault-certificates-cpp/vcpkg.json b/external_imported/vcpkg/ports/azure-security-keyvault-certificates-cpp/vcpkg.json
index dc1aec87a..080d01617 100644
--- a/external_imported/vcpkg/ports/azure-security-keyvault-certificates-cpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/azure-security-keyvault-certificates-cpp/vcpkg.json
@@ -1,6 +1,10 @@
 {
+  "$comment": [
+    "NOTE: All changes made to this file will get overwritten by the next port release.",
+    "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp."
+  ],
   "name": "azure-security-keyvault-certificates-cpp",
-  "version-semver": "4.1.0",
+  "version-semver": "4.2.1",
   "description": [
     "Microsoft Azure Key Vault Certificates SDK for C++",
     "This library provides Azure Key Vault Certificates SDK."
@@ -11,7 +15,7 @@
     {
       "name": "azure-core-cpp",
       "default-features": false,
-      "version>=": "1.5.0"
+      "version>=": "1.9.0"
     },
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/azure-security-keyvault-keys-cpp/portfile.cmake b/external_imported/vcpkg/ports/azure-security-keyvault-keys-cpp/portfile.cmake
index 9c8413d7f..cc9c0a6c2 100644
--- a/external_imported/vcpkg/ports/azure-security-keyvault-keys-cpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/azure-security-keyvault-keys-cpp/portfile.cmake
@@ -1,14 +1,28 @@
+# NOTE: All changes made to this file will get overwritten by the next port release.
+# Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
-    REF azure-security-keyvault-keys_4.3.0
-    SHA512 e2c6555d5c89c73c015356de1fbda3274186000710ba75d85b233a3b00bd50b7ee9ea0c527aa408503ba9781dffe7b849a5c3e6e239d41187e7752663e43b9ea
+    REF azure-security-keyvault-keys_4.4.1
+    SHA512 758ff05ce33672d81cf14d347edada2a7c008c7df61639b7bac9ce1a1114144a1f6fcc3d364d1d90f5f9cda8f8c1db14f80873403d4190d4aca1844fb25dd517
 )
 
+if(EXISTS "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-keys")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/keyvault/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/_")
+
+  file(RENAME "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-keys" "${SOURCE_PATH}/sdk/keyvault/_")
+  file(RENAME "${SOURCE_PATH}/sdk/keyvault" "${SOURCE_PATH}/sdk/_")
+  file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_")
+endif()
+
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-keys/
+    SOURCE_PATH "${SOURCE_PATH}/_/_/_"
     OPTIONS
         -DWARNINGS_AS_ERRORS=OFF
+        -DBUILD_TESTING=OFF
 )
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/azure-security-keyvault-keys-cpp/vcpkg.json b/external_imported/vcpkg/ports/azure-security-keyvault-keys-cpp/vcpkg.json
index 2d1ae6215..0010de718 100644
--- a/external_imported/vcpkg/ports/azure-security-keyvault-keys-cpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/azure-security-keyvault-keys-cpp/vcpkg.json
@@ -1,6 +1,10 @@
 {
+  "$comment": [
+    "NOTE: All changes made to this file will get overwritten by the next port release.",
+    "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp."
+  ],
   "name": "azure-security-keyvault-keys-cpp",
-  "version-semver": "4.3.0",
+  "version-semver": "4.4.1",
   "description": [
     "Microsoft Azure Key Vault Keys SDK for C++",
     "This library provides Azure Key Vault Keys SDK."
@@ -11,7 +15,7 @@
     {
       "name": "azure-core-cpp",
       "default-features": false,
-      "version>=": "1.5.0"
+      "version>=": "1.9.0"
     },
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/azure-security-keyvault-secrets-cpp/portfile.cmake b/external_imported/vcpkg/ports/azure-security-keyvault-secrets-cpp/portfile.cmake
index d5e16e343..e72cb0a79 100644
--- a/external_imported/vcpkg/ports/azure-security-keyvault-secrets-cpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/azure-security-keyvault-secrets-cpp/portfile.cmake
@@ -1,14 +1,28 @@
+# NOTE: All changes made to this file will get overwritten by the next port release.
+# Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
-    REF azure-security-keyvault-secrets_4.1.0
-    SHA512 82deeda461aaac3d38adcf1080ecd0b8883dfb6c5e9db6b86deaac2e6d683dac3e97998afeb9a1657da715f9e46f25f9b9a6c4938ade0a1979b1136291d66e7f
+    REF azure-security-keyvault-secrets_4.2.1
+    SHA512 8d944bbcc29b670b884234a789455bb6b33e33fa45c7b02a4200c2267189597cb849f3cbbaa5f7c4db013ec74a2ea0b073237254db7fcac96c290888c05dcba5
 )
 
+if(EXISTS "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-secrets")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/keyvault/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/_")
+
+  file(RENAME "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-secrets" "${SOURCE_PATH}/sdk/keyvault/_")
+  file(RENAME "${SOURCE_PATH}/sdk/keyvault" "${SOURCE_PATH}/sdk/_")
+  file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_")
+endif()
+
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-secrets/
+    SOURCE_PATH "${SOURCE_PATH}/_/_/_"
     OPTIONS
         -DWARNINGS_AS_ERRORS=OFF
+        -DBUILD_TESTING=OFF
 )
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/azure-security-keyvault-secrets-cpp/vcpkg.json b/external_imported/vcpkg/ports/azure-security-keyvault-secrets-cpp/vcpkg.json
index 95bfc889e..003420195 100644
--- a/external_imported/vcpkg/ports/azure-security-keyvault-secrets-cpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/azure-security-keyvault-secrets-cpp/vcpkg.json
@@ -1,6 +1,10 @@
 {
+  "$comment": [
+    "NOTE: All changes made to this file will get overwritten by the next port release.",
+    "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp."
+  ],
   "name": "azure-security-keyvault-secrets-cpp",
-  "version-semver": "4.1.0",
+  "version-semver": "4.2.1",
   "description": [
     "Microsoft Azure Key Vault Secrets SDK for C++",
     "This library provides Azure Key Vault Secrets SDK."
@@ -11,7 +15,7 @@
     {
       "name": "azure-core-cpp",
       "default-features": false,
-      "version>=": "1.5.0"
+      "version>=": "1.9.0"
     },
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/azure-storage-blobs-cpp/portfile.cmake b/external_imported/vcpkg/ports/azure-storage-blobs-cpp/portfile.cmake
index 30adab999..b416b955f 100644
--- a/external_imported/vcpkg/ports/azure-storage-blobs-cpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/azure-storage-blobs-cpp/portfile.cmake
@@ -1,14 +1,28 @@
+# NOTE: All changes made to this file will get overwritten by the next port release.
+# Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
-    REF azure-storage-blobs_12.7.0
-    SHA512 7750035f42c7cc120b294d0449885446d5d06c0393a24d957f1484525967fd609dda0319574e9d95888441d749bbca820fccaf7741ac1321bc071adcfb48f3a9
+    REF azure-storage-blobs_12.10.0
+    SHA512 652b4edf2e049b33ef37734ab3e421a7b2b8d2f497da2859fe73ae665e8fd76b360d02c9f64c42cd6dbc8baa7150a031263942fc7d6b311d2c051ccd044a0064
 )
 
+if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-blobs")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/storage/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/_")
+
+  file(RENAME "${SOURCE_PATH}/sdk/storage/azure-storage-blobs" "${SOURCE_PATH}/sdk/storage/_")
+  file(RENAME "${SOURCE_PATH}/sdk/storage" "${SOURCE_PATH}/sdk/_")
+  file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_")
+endif()
+
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}/sdk/storage/azure-storage-blobs/
+    SOURCE_PATH "${SOURCE_PATH}/_/_/_"
     OPTIONS
         -DWARNINGS_AS_ERRORS=OFF
+        -DBUILD_TESTING=OFF
 )
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/azure-storage-blobs-cpp/vcpkg.json b/external_imported/vcpkg/ports/azure-storage-blobs-cpp/vcpkg.json
index 14a527dfe..2a846d79c 100644
--- a/external_imported/vcpkg/ports/azure-storage-blobs-cpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/azure-storage-blobs-cpp/vcpkg.json
@@ -1,6 +1,7 @@
 {
+  "$comment": "NOTE: All changes made to this file will get overwritten by the next port release. Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.",
   "name": "azure-storage-blobs-cpp",
-  "version-semver": "12.7.0",
+  "version-semver": "12.10.0",
   "description": [
     "Microsoft Azure Storage Blobs SDK for C++",
     "This library provides Azure Storage Blobs SDK."
@@ -11,7 +12,7 @@
     {
       "name": "azure-storage-common-cpp",
       "default-features": false,
-      "version>=": "12.3.1"
+      "version>=": "12.5.0"
     },
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/azure-storage-common-cpp/portfile.cmake b/external_imported/vcpkg/ports/azure-storage-common-cpp/portfile.cmake
index 91c474eca..482ed9687 100644
--- a/external_imported/vcpkg/ports/azure-storage-common-cpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/azure-storage-common-cpp/portfile.cmake
@@ -1,14 +1,28 @@
+# NOTE: All changes made to this file will get overwritten by the next port release.
+# Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
-    REF azure-storage-common_12.3.1
-    SHA512 4c062c23637ed94b7688292649d02fb0c67d6402ec682b7a077f3a2aa7dc322cf01e979c5042407876b8c1407cba339252c0c1dde2b7e7aa6727ecfcbe9633ca
+    REF azure-storage-common_12.5.0
+    SHA512 46c9cc4ebec54f289ba7270356da4e89e5f8e890004c7a232200b87ca33357064c2f46670a1090fe41ca6962cdbc76d2e3520bb600438cbc0f21f15cf7816f04
 )
 
+if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-common")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/storage/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/_")
+
+  file(RENAME "${SOURCE_PATH}/sdk/storage/azure-storage-common" "${SOURCE_PATH}/sdk/storage/_")
+  file(RENAME "${SOURCE_PATH}/sdk/storage" "${SOURCE_PATH}/sdk/_")
+  file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_")
+endif()
+
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}/sdk/storage/azure-storage-common/
+    SOURCE_PATH "${SOURCE_PATH}/_/_/_"
     OPTIONS
         -DWARNINGS_AS_ERRORS=OFF
+        -DBUILD_TESTING=OFF
 )
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/azure-storage-common-cpp/vcpkg.json b/external_imported/vcpkg/ports/azure-storage-common-cpp/vcpkg.json
index 802869816..af09fe2c5 100644
--- a/external_imported/vcpkg/ports/azure-storage-common-cpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/azure-storage-common-cpp/vcpkg.json
@@ -1,6 +1,7 @@
 {
+  "$comment": "NOTE: All changes made to this file will get overwritten by the next port release. Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.",
   "name": "azure-storage-common-cpp",
-  "version-semver": "12.3.1",
+  "version-semver": "12.5.0",
   "description": [
     "Microsoft Azure Common Storage SDK for C++",
     "This library provides common Azure Storage-related abstractions for Azure SDK."
@@ -11,7 +12,7 @@
     {
       "name": "azure-core-cpp",
       "default-features": false,
-      "version>=": "1.8.0"
+      "version>=": "1.10.3"
     },
     {
       "name": "libxml2",
diff --git a/external_imported/vcpkg/ports/azure-storage-cpp/portfile.cmake b/external_imported/vcpkg/ports/azure-storage-cpp/portfile.cmake
index ba9154d86..ffde12397 100644
--- a/external_imported/vcpkg/ports/azure-storage-cpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/azure-storage-cpp/portfile.cmake
@@ -8,6 +8,8 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
+vcpkg_replace_string("${SOURCE_PATH}/Microsoft.WindowsAzure.Storage/CMakeLists.txt" [[file(GLOB OPENSSL_ROOT_DIR /usr/local/Cellar/openssl/*)]] "")
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}/Microsoft.WindowsAzure.Storage"
     OPTIONS
diff --git a/external_imported/vcpkg/ports/azure-storage-cpp/vcpkg.json b/external_imported/vcpkg/ports/azure-storage-cpp/vcpkg.json
index c8c6825b3..fad1ab727 100644
--- a/external_imported/vcpkg/ports/azure-storage-cpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/azure-storage-cpp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "azure-storage-cpp",
-  "version-string": "7.5.0",
-  "port-version": 4,
+  "version": "7.5.0",
+  "port-version": 6,
   "description": [
     "[legacy] Microsoft Azure Storage Client SDK for C++",
     "A client library for working with Microsoft Azure storage services including blobs, files, tables, and queues. This client library enables working with the Microsoft Azure storage services which include the blob service for storing binary and text data, the file service for storing binary and text data, the table service for storing structured non-relational data, and the queue service for storing messages that may be accessed by a client."
diff --git a/external_imported/vcpkg/ports/azure-storage-files-datalake-cpp/portfile.cmake b/external_imported/vcpkg/ports/azure-storage-files-datalake-cpp/portfile.cmake
index 6b4fd14d1..9665096bd 100644
--- a/external_imported/vcpkg/ports/azure-storage-files-datalake-cpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/azure-storage-files-datalake-cpp/portfile.cmake
@@ -1,14 +1,28 @@
+# NOTE: All changes made to this file will get overwritten by the next port release.
+# Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
-    REF azure-storage-files-datalake_12.5.0
-    SHA512 fe6b7ffe6efa24c273e3151fdeadb4b981e277bf9aa7b19b23759d5070bfc0c65c365296add83fb4f364b0653a651be31d9ccbd06bfc4c6ac62cf0c5330a66dc
+    REF azure-storage-files-datalake_12.9.0
+    SHA512 3314adc2c43b54f3bb776b099876062dc157cb35215c8efb49c1d23474479601ab0c067f901809c9ee4bce646feabf0065e8e8b96ae77f4d0f8585e8e269294b
 )
 
+if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-files-datalake")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/storage/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/_")
+
+  file(RENAME "${SOURCE_PATH}/sdk/storage/azure-storage-files-datalake" "${SOURCE_PATH}/sdk/storage/_")
+  file(RENAME "${SOURCE_PATH}/sdk/storage" "${SOURCE_PATH}/sdk/_")
+  file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_")
+endif()
+
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}/sdk/storage/azure-storage-files-datalake/
+    SOURCE_PATH "${SOURCE_PATH}/_/_/_"
     OPTIONS
         -DWARNINGS_AS_ERRORS=OFF
+        -DBUILD_TESTING=OFF
 )
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/azure-storage-files-datalake-cpp/vcpkg.json b/external_imported/vcpkg/ports/azure-storage-files-datalake-cpp/vcpkg.json
index a0bff6135..9aaf0ff0a 100644
--- a/external_imported/vcpkg/ports/azure-storage-files-datalake-cpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/azure-storage-files-datalake-cpp/vcpkg.json
@@ -1,6 +1,7 @@
 {
+  "$comment": "NOTE: All changes made to this file will get overwritten by the next port release. Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.",
   "name": "azure-storage-files-datalake-cpp",
-  "version-semver": "12.5.0",
+  "version-semver": "12.9.0",
   "description": [
     "Microsoft Azure Storage Files Data Lake SDK for C++",
     "This library provides Azure Storage Files Data Lake SDK."
@@ -11,7 +12,7 @@
     {
       "name": "azure-storage-blobs-cpp",
       "default-features": false,
-      "version>=": "12.6.2"
+      "version>=": "12.10.0"
     },
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/azure-storage-files-shares-cpp/portfile.cmake b/external_imported/vcpkg/ports/azure-storage-files-shares-cpp/portfile.cmake
index 5b82217a1..dd81fb34a 100644
--- a/external_imported/vcpkg/ports/azure-storage-files-shares-cpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/azure-storage-files-shares-cpp/portfile.cmake
@@ -1,12 +1,25 @@
+# NOTE: All changes made to this file will get overwritten by the next port release.
+# Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
-    REF azure-storage-files-shares_12.4.0
-    SHA512 e064d808b92de3ec32d4328ce274c9a67ea03f106f71afe311182ed9eff3adad1dfb00ade83da98b10a8e6a7d3b6082d965a1af4b495fd92879d21b669c55ba0
+    REF azure-storage-files-shares_12.8.0
+    SHA512 a22cce4f43fd77aabdb43fdbc9ea3e5a501f5abeaafe5f5fea7e8737b6b017dc2ca3b674ac0c5f8bcda9b836af7644b3c17db050b02db5e076728047aa5c2ec0
 )
 
+if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-files-shares")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/storage/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/_")
+
+  file(RENAME "${SOURCE_PATH}/sdk/storage/azure-storage-files-shares" "${SOURCE_PATH}/sdk/storage/_")
+  file(RENAME "${SOURCE_PATH}/sdk/storage" "${SOURCE_PATH}/sdk/_")
+  file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_")
+endif()
+
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}/sdk/storage/azure-storage-files-shares/
+    SOURCE_PATH "${SOURCE_PATH}/_/_/_"
     OPTIONS
         -DWARNINGS_AS_ERRORS=OFF
 )
diff --git a/external_imported/vcpkg/ports/azure-storage-files-shares-cpp/vcpkg.json b/external_imported/vcpkg/ports/azure-storage-files-shares-cpp/vcpkg.json
index e5c76e20c..d68fda4a6 100644
--- a/external_imported/vcpkg/ports/azure-storage-files-shares-cpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/azure-storage-files-shares-cpp/vcpkg.json
@@ -1,6 +1,7 @@
 {
+  "$comment": "NOTE: All changes made to this file will get overwritten by the next port release. Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.",
   "name": "azure-storage-files-shares-cpp",
-  "version-semver": "12.4.0",
+  "version-semver": "12.8.0",
   "description": [
     "Microsoft Azure Storage Files Shares SDK for C++",
     "This library provides Azure Storage Files Shares SDK."
@@ -11,7 +12,7 @@
     {
       "name": "azure-storage-common-cpp",
       "default-features": false,
-      "version>=": "12.3.1"
+      "version>=": "12.5.0"
     },
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/azure-storage-queues-cpp/portfile.cmake b/external_imported/vcpkg/ports/azure-storage-queues-cpp/portfile.cmake
index cabef6187..ef313d836 100644
--- a/external_imported/vcpkg/ports/azure-storage-queues-cpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/azure-storage-queues-cpp/portfile.cmake
@@ -1,14 +1,28 @@
+# NOTE: All changes made to this file will get overwritten by the next port release.
+# Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
-    REF azure-storage-queues_12.0.0
-    SHA512 f393d481a9bb098d1a361605d9d55e1385ec5417a20ea05c53d479dbe4dcb0e8be34c2b9fc31b64e7d78b81fd642461f27beb02b6ed047f87c968c0bb718b85b
+    REF azure-storage-queues_12.2.0
+    SHA512 ce0a89e3ae5e49f495904a614615906119ba09606ac2e781aae59cf2f4a00e6d4afe9bdd9675ec4cc59b50b47b5123a6333f125871df42db5d6554d341132676
 )
 
+if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-queues")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/storage/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_")
+  file(REMOVE_RECURSE "${SOURCE_PATH}/_")
+
+  file(RENAME "${SOURCE_PATH}/sdk/storage/azure-storage-queues" "${SOURCE_PATH}/sdk/storage/_")
+  file(RENAME "${SOURCE_PATH}/sdk/storage" "${SOURCE_PATH}/sdk/_")
+  file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_")
+endif()
+
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}/sdk/storage/azure-storage-queues/
+    SOURCE_PATH "${SOURCE_PATH}/_/_/_"
     OPTIONS
         -DWARNINGS_AS_ERRORS=OFF
+        -DBUILD_TESTING=OFF
 )
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/azure-storage-queues-cpp/vcpkg.json b/external_imported/vcpkg/ports/azure-storage-queues-cpp/vcpkg.json
index e81924b0d..61ba8caef 100644
--- a/external_imported/vcpkg/ports/azure-storage-queues-cpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/azure-storage-queues-cpp/vcpkg.json
@@ -1,6 +1,7 @@
 {
+  "$comment": "NOTE: All changes made to this file will get overwritten by the next port release. Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.",
   "name": "azure-storage-queues-cpp",
-  "version-semver": "12.0.0",
+  "version-semver": "12.2.0",
   "description": [
     "Microsoft Azure Storage Queues SDK for C++",
     "This library provides Azure Storage Queues SDK."
@@ -11,7 +12,7 @@
     {
       "name": "azure-storage-common-cpp",
       "default-features": false,
-      "version>=": "12.2.3"
+      "version>=": "12.5.0"
     },
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/azure-uamqp-c/portfile.cmake b/external_imported/vcpkg/ports/azure-uamqp-c/portfile.cmake
index 743d9d35e..a05e0abb6 100644
--- a/external_imported/vcpkg/ports/azure-uamqp-c/portfile.cmake
+++ b/external_imported/vcpkg/ports/azure-uamqp-c/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-uamqp-c
-    REF b7bdf307a0db8840156d9f6e40f704c1d5924306
-    SHA512 a23ddab35caa6f9303072f235591d64f5cfe3c2f4a16e9f317380a9d887f47f146b0bca5afcb2e3a199b146e8092192ede2ec68685edb8a7fb11cfe5641815b8
+    REF efd1b1b8b1e85d471ebd3aa1be062fb1cc6a10a1
+    SHA512 1303183cf1830be0cd52ccb67eebe2055343979d788f8c7eddde30343cc2c334035a1f4767bf404b1432277f7a4846317e14fb0da3a05114e8befb91562fa8f3
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/azure-uamqp-c/vcpkg.json b/external_imported/vcpkg/ports/azure-uamqp-c/vcpkg.json
index 4f0b850f6..f9b9e4ecc 100644
--- a/external_imported/vcpkg/ports/azure-uamqp-c/vcpkg.json
+++ b/external_imported/vcpkg/ports/azure-uamqp-c/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "azure-uamqp-c",
-  "version-date": "2023-01-18",
+  "version-date": "2023-08-07",
   "description": "AMQP library for C",
   "homepage": "https://github.com/Azure/azure-uamqp-c",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/azure-uhttp-c/portfile.cmake b/external_imported/vcpkg/ports/azure-uhttp-c/portfile.cmake
index fc1c586aa..d20732cc6 100644
--- a/external_imported/vcpkg/ports/azure-uhttp-c/portfile.cmake
+++ b/external_imported/vcpkg/ports/azure-uhttp-c/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-uhttp-c
-    REF 33485e2e43f9c8f186dfff8afda7efd905b636f1
-    SHA512 ad9c8f21cee431ac39a5ffc5f1007b76c5ba1768dca6cebf8fceda33747c3accbce48ace72173cfe746316a0a136a7e770005ba98b8f99e5bb3889b5bdc2e973
+    REF ff321c8158b53b18557b0224dfd32a4bf0ebb77a
+    SHA512 47c03d550561580155c56e4a35734c453d6df64feac7aa39ec777cfa420aa142e596e32c19c9847654f5f02c75335314ad20d1b64c4a60a8189641c305938b19
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/azure-uhttp-c/vcpkg.json b/external_imported/vcpkg/ports/azure-uhttp-c/vcpkg.json
index 0eebd83d6..faac6faa9 100644
--- a/external_imported/vcpkg/ports/azure-uhttp-c/vcpkg.json
+++ b/external_imported/vcpkg/ports/azure-uhttp-c/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "azure-uhttp-c",
-  "version-date": "2023-01-18",
+  "version-date": "2023-08-07",
   "description": "Azure HTTP Library written in C",
   "homepage": "https://github.com/Azure/azure-uhttp-c",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/azure-umqtt-c/portfile.cmake b/external_imported/vcpkg/ports/azure-umqtt-c/portfile.cmake
index b3d2a1bf5..4f55379ac 100644
--- a/external_imported/vcpkg/ports/azure-umqtt-c/portfile.cmake
+++ b/external_imported/vcpkg/ports/azure-umqtt-c/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-umqtt-c
-    REF 9201d60bbc12a02ac5456b6105bb50919d392105
-    SHA512 97d5383184c99186783738613d00e77041fe4ff3af4c14fe775e4be8b38a77a69d093ed8636a67ee85e8e09c8732b8839375aa178128f1ae58792d7c8698f829
+    REF 457e5af5e08ce72cee4c3c32d13ef274ab23c0d3
+    SHA512 f95c3f8a207d34cdb5fe686f86421e4c8a584f3d506c82055e320133f8a346e67ffcdaa872d70d3ac7be67ae9f24d14dac852a95e0c1f98b7d2012805083f587
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/azure-umqtt-c/vcpkg.json b/external_imported/vcpkg/ports/azure-umqtt-c/vcpkg.json
index 558537581..446d03f7a 100644
--- a/external_imported/vcpkg/ports/azure-umqtt-c/vcpkg.json
+++ b/external_imported/vcpkg/ports/azure-umqtt-c/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "azure-umqtt-c",
-  "version-date": "2023-01-18",
+  "version-date": "2023-08-03",
   "description": "General purpose library for communication over the mqtt protocol",
   "homepage": "https://github.com/Azure/azure-umqtt-c",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/backward-cpp/portfile.cmake b/external_imported/vcpkg/ports/backward-cpp/portfile.cmake
new file mode 100644
index 000000000..a81ef1fdc
--- /dev/null
+++ b/external_imported/vcpkg/ports/backward-cpp/portfile.cmake
@@ -0,0 +1,18 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO bombela/backward-cpp
+    REF 51f0700452cf71c57d43c2d028277b24cde32502 # 2023-11-24
+    SHA512 8831be0a1c0a2f2d2625c5e2065202445520e0f7591cdbf998c60f2c892880d1527f304f9361b057c831f84621be636e12fea018297c9a17d858ecc6c36c9ffb
+    HEAD_REF master
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+)
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/backward)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/backward-cpp/usage b/external_imported/vcpkg/ports/backward-cpp/usage
new file mode 100644
index 000000000..a4bc592a7
--- /dev/null
+++ b/external_imported/vcpkg/ports/backward-cpp/usage
@@ -0,0 +1,7 @@
+backward-cpp provides CMake targets:
+
+  find_package(Backward CONFIG REQUIRED)
+  # To use the header library
+  target_link_libraries(main PRIVATE Backward::Interface)
+  # To use the prebuilt library
+  target_link_libraries(main PRIVATE Backward::Backward)
diff --git a/external_imported/vcpkg/ports/backward-cpp/vcpkg.json b/external_imported/vcpkg/ports/backward-cpp/vcpkg.json
new file mode 100644
index 000000000..8499af6b1
--- /dev/null
+++ b/external_imported/vcpkg/ports/backward-cpp/vcpkg.json
@@ -0,0 +1,17 @@
+{
+  "name": "backward-cpp",
+  "version-date": "2023-11-24",
+  "description": "A beautiful stack trace pretty printer for C++",
+  "homepage": "https://github.com/bombela/backward-cpp",
+  "supports": "!uwp & !(windows & arm)",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/baresip-libre/fix-static-library-build.patch b/external_imported/vcpkg/ports/baresip-libre/fix-static-library-build.patch
new file mode 100644
index 000000000..112154ade
--- /dev/null
+++ b/external_imported/vcpkg/ports/baresip-libre/fix-static-library-build.patch
@@ -0,0 +1,86 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 84a507f..d400e3b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -99,7 +99,7 @@ if(CMAKE_C_COMPILER_ID MATCHES "Clang")
+ endif()
+ 
+ set(re_DIR ${CMAKE_CURRENT_LIST_DIR}/cmake)
+-find_package(re CONFIG REQUIRED)
++include("${CMAKE_CURRENT_LIST_DIR}/cmake/re-config.cmake")
+ 
+ list(APPEND RE_DEFINITIONS
+   -DRE_VERSION="${PROJECT_VERSION_FULL}"
+@@ -648,7 +648,7 @@ endif()
+ if(LIBRE_BUILD_STATIC)
+   list(APPEND RE_INSTALL_TARGETS re)
+   add_library(re STATIC $<TARGET_OBJECTS:re-objs>)
+-  target_link_libraries(re PUBLIC ${RE_LIBS})
++  target_link_libraries(re PRIVATE ${RE_LIBS})
+   target_include_directories(re PUBLIC
+     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+   )
+@@ -704,6 +704,9 @@ configure_file(packaging/libre.pc.in libre.pc @ONLY)
+ 
+ install(TARGETS ${RE_INSTALL_TARGETS}
+   EXPORT libre
++  RUNTIME
++    DESTINATION ${CMAKE_INSTALL_BINDIR}
++    COMPONENT Libraries
+   LIBRARY
+     DESTINATION ${CMAKE_INSTALL_LIBDIR}
+     COMPONENT Libraries
+@@ -722,7 +725,9 @@ install(FILES ${HEADERS}
+ 
+ install(EXPORT libre
+   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libre
++  FILE libre-targets.cmake
+   NAMESPACE libre::
++  COMPONENT Development
+ )
+ 
+ if(LIBRE_BUILD_SHARED)
+@@ -734,12 +739,8 @@ if(LIBRE_BUILD_SHARED)
+   )
+ endif()
+ 
+-install(FILES cmake/re-config.cmake
+-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/re
+-  COMPONENT Development
+-)
+-
+-install(FILES cmake/libre-config.cmake
++configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/libre-config.cmake" "${CMAKE_CURRENT_BINARY_DIR}/cmake/libre-config.cmake" @ONLY)
++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/cmake/libre-config.cmake"
+   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libre
+   COMPONENT Development
+ )
+diff --git a/cmake/libre-config.cmake b/cmake/libre-config.cmake
+index 0965b84..e8548a0 100644
+--- a/cmake/libre-config.cmake
++++ b/cmake/libre-config.cmake
+@@ -1 +1,23 @@
+-include("${CMAKE_CURRENT_LIST_DIR}/libre.cmake")
++if("@LIBRE_BUILD_STATIC@")
++    include(CMakeFindDependencyMacro)
++    find_dependency(Threads)
++    if("@USE_OPENSSL@")
++        find_dependency(OpenSSL)
++    endif()
++    if("@ZLIB_FOUND@")
++        find_dependency(ZLIB)
++    endif()
++endif()
++
++include("${CMAKE_CURRENT_LIST_DIR}/libre-targets.cmake")
++
++# convenience target libre::libre for uniform usage
++if(NOT TARGET libre::libre)
++    if(TARGET libre::re_shared AND (BUILD_SHARED_LIBS OR NOT TARGET libre::re))
++        add_library(libre::libre INTERFACE IMPORTED)
++        set_target_properties(libre::libre PROPERTIES INTERFACE_LINK_LIBRARIES libre::re_shared)
++    elseif(TARGET libre::re AND (NOT BUILD_SHARED_LIBS OR NOT TARGET libre::re_shared))
++        add_library(libre::libre INTERFACE IMPORTED)
++        set_target_properties(libre::libre PROPERTIES INTERFACE_LINK_LIBRARIES libre::re)
++    endif()
++endif()
diff --git a/external_imported/vcpkg/ports/baresip-libre/portfile.cmake b/external_imported/vcpkg/ports/baresip-libre/portfile.cmake
new file mode 100644
index 000000000..60d9c241f
--- /dev/null
+++ b/external_imported/vcpkg/ports/baresip-libre/portfile.cmake
@@ -0,0 +1,34 @@
+if(VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO baresip/re
+    REF "v${VERSION}"
+    SHA512 d19fc5c48399ad4942c27d86c47350f579f8ebeaf8dc04b13a930b930c13a20e5e7dd5f0fe05d11b6b365667d8306f2499f5cb925850f4484049ba853d36b0b1
+    HEAD_REF main
+    PATCHES
+        fix-static-library-build.patch
+)
+
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LIBRE_BUILD_SHARED)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" LIBRE_BUILD_STATIC)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DLIBRE_BUILD_SHARED=${LIBRE_BUILD_SHARED}
+        -DLIBRE_BUILD_STATIC=${LIBRE_BUILD_STATIC}
+        -DCMAKE_DISABLE_FIND_PACKAGE_Backtrace=ON
+        -DCMAKE_REQUIRE_FIND_PACKAGE_OpenSSL=ON
+        -DCMAKE_REQUIRE_FIND_PACKAGE_ZLIB=ON
+)
+vcpkg_cmake_install()
+vcpkg_fixup_pkgconfig()
+vcpkg_cmake_config_fixup(PACKAGE_NAME libre CONFIG_PATH lib/cmake/libre)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/baresip-libre/usage b/external_imported/vcpkg/ports/baresip-libre/usage
new file mode 100644
index 000000000..c207427cd
--- /dev/null
+++ b/external_imported/vcpkg/ports/baresip-libre/usage
@@ -0,0 +1,5 @@
+baresip-libre provides CMake targets:
+
+    find_package(libre CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE libre::libre)
+
diff --git a/external_imported/vcpkg/ports/baresip-libre/vcpkg.json b/external_imported/vcpkg/ports/baresip-libre/vcpkg.json
new file mode 100644
index 000000000..9ba2447ad
--- /dev/null
+++ b/external_imported/vcpkg/ports/baresip-libre/vcpkg.json
@@ -0,0 +1,20 @@
+{
+  "name": "baresip-libre",
+  "version": "3.9.0",
+  "description": "Generic library for real-time communications with async IO support",
+  "homepage": "https://github.com/baresip/re",
+  "license": "BSD-3-Clause",
+  "supports": "!uwp",
+  "dependencies": [
+    "openssl",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    "zlib"
+  ]
+}
diff --git a/external_imported/vcpkg/ports/basisu/fix-add-libgen-mingw.patch b/external_imported/vcpkg/ports/basisu/fix-add-libgen-mingw.patch
deleted file mode 100644
index 5bac12ed7..000000000
--- a/external_imported/vcpkg/ports/basisu/fix-add-libgen-mingw.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/encoder/basisu_enc.h b/src/encoder/basisu_enc.h
-index 468f43b..02ec3c4 100644
---- a/src/encoder/basisu_enc.h
-+++ b/src/encoder/basisu_enc.h
-@@ -24,7 +24,7 @@
- #include <unordered_map>
- #include <ostream>
- 
--#ifndef _WIN32
-+#if !defined(_WIN32) || defined(__MINGW32__)
- #include <libgen.h>
- #endif
- 
diff --git a/external_imported/vcpkg/ports/basisu/fix-addostream.patch b/external_imported/vcpkg/ports/basisu/fix-addostream.patch
deleted file mode 100644
index cd9308bf5..000000000
--- a/external_imported/vcpkg/ports/basisu/fix-addostream.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/encoder/basisu_enc.h b/src/encoder/basisu_enc.h
-index 05656da..468f43b 100644
---- a/src/encoder/basisu_enc.h
-+++ b/src/encoder/basisu_enc.h
-@@ -22,6 +22,7 @@
- #include <functional>
- #include <thread>
- #include <unordered_map>
-+#include <ostream>
- 
- #ifndef _WIN32
- #include <libgen.h>
diff --git a/external_imported/vcpkg/ports/basisu/portfile.cmake b/external_imported/vcpkg/ports/basisu/portfile.cmake
index fa152cb8e..b1ffe4326 100644
--- a/external_imported/vcpkg/ports/basisu/portfile.cmake
+++ b/external_imported/vcpkg/ports/basisu/portfile.cmake
@@ -1,12 +1,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO jherico/basis_universal
-    REF 497875f756ed0e3eb62e0ff08d55c62242f4be74
-    SHA512 2293b78620a7ed510dbecf48bcae5f4b8524fe9020f864c8e79cf94ea9d95d51dddf83a5b4ea29cc95db19f87137bfef1cb68b7fbc6387e08bb42898d81c9303
+    REPO BinomialLLC/basis_universal
+    REF "${VERSION}"
+    SHA512 7f7dd62741b4a3e13050233a2ed751e6108cde9eab7b05ea5882ded6ab49fe181cc30e795cf73f8fa625a71e77ae891fda5ea84e20b632b1397844d6539715b3
     HEAD_REF master
-    PATCHES
-        fix-addostream.patch
-        fix-add-libgen-mingw.patch
 )
 
 vcpkg_cmake_configure(
@@ -19,9 +16,9 @@ vcpkg_cmake_install()
 
 vcpkg_copy_pdbs()
 
-vcpkg_copy_tools(TOOL_NAMES "basisu_tool" AUTO_CLEAN)
-
+vcpkg_copy_tools(TOOL_NAMES "basisu" AUTO_CLEAN)
+set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
 # Remove unnecessary files
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/basisu/vcpkg.json b/external_imported/vcpkg/ports/basisu/vcpkg.json
index 6cc7efe2f..59a53779d 100644
--- a/external_imported/vcpkg/ports/basisu/vcpkg.json
+++ b/external_imported/vcpkg/ports/basisu/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "basisu",
-  "version": "1.11",
-  "port-version": 7,
+  "version": "1.16.4",
   "description": "Basis Universal is a supercompressed GPU texture and video compression format that outputs a highly compressed intermediate file format (.basis) that can be quickly transcoded to a wide variety of GPU texture compression formats.",
   "homepage": "https://github.com/BinomialLLC/basis_universal",
   "license": "Apache-2.0",
+  "supports": "!android & !arm",
   "dependencies": [
     "lodepng",
     {
diff --git a/external_imported/vcpkg/ports/bde/portfile.cmake b/external_imported/vcpkg/ports/bde/portfile.cmake
index 63d4a8422..f83f7b34c 100644
--- a/external_imported/vcpkg/ports/bde/portfile.cmake
+++ b/external_imported/vcpkg/ports/bde/portfile.cmake
@@ -1,138 +1,63 @@
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-set(CONFIGURE_COMMON_ARGS ${CONFIGURE_COMMON_ARGS} --library-type=static)
 
-set(BDE_VERSION 3.2.0.0)
-set(BDE_TOOLS_VERSION 1.x)
 
-# Paths used in build
-set(SOURCE_PATH_DEBUG ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bde-${BDE_VERSION})
-set(SOURCE_PATH_RELEASE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bde-${BDE_VERSION})
-
-# Acquire Python 2 and add it to PATH
-vcpkg_find_acquire_program(PYTHON2)
-get_filename_component(PYTHON2_EXE_PATH ${PYTHON2} DIRECTORY)
+# Acquire Python and add it to PATH
+vcpkg_find_acquire_program(PYTHON3)
+get_filename_component(PYTHON3_EXE_PATH ${PYTHON3} DIRECTORY)
 
 # Acquire BDE Tools and add them to PATH
 vcpkg_from_github(
     OUT_SOURCE_PATH TOOLS_PATH
     REPO "bloomberg/bde-tools"
-    REF d4b1a7670829228f4ec81ecdccc598ce03ae8e80
-    SHA512 80af734c080adb225d5369157301ae0af18e02b1912351e34d23f5f2ba4e19f9ae2b5a367923f036330c9f9afd11a90cdf12680eb3e59b4297a312a1b713f17f
-    HEAD_REF master
+    REF "${VERSION}"
+    SHA512 3aa64215c473ccecbd213234826b0c8cffd9491e7bf358e5947c80103e0723ef56da8ec7cc9cf51c6b7a887e5b0b52e80f3201d933accf7f6d5cc95fc1cb35dc
+    HEAD_REF main
 )
+
 message(STATUS "Configure bde-tools-v${BDE_TOOLS_VERSION}")
-if(VCPKG_CMAKE_SYSTEM_NAME)
-    set(ENV{PATH} "$ENV{PATH}:${PYTHON2_EXE_PATH}")
-    set(ENV{PATH} "$ENV{PATH}:${TOOLS_PATH}/bin")
-else()
-    set(ENV{PATH} "$ENV{PATH};${PYTHON2_EXE_PATH}")
-    set(ENV{PATH} "$ENV{PATH};${TOOLS_PATH}/bin")
-endif()
+vcpkg_add_to_path("${PYTHON3_EXE_PATH}")
+vcpkg_add_to_path("${TOOLS_PATH}/bin")
 
 # Acquire BDE sources
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO "bloomberg/bde"
-    REF 3720d132d0879f19b9084cca62ebc75f1f24e1a3
-    SHA512 234ebb71997f5b7d3951584235ead10f977689cef323ae1c198629a6b1995b1481d8a1515d827c46df10209bdc66e1f3cc7780dafee9ca0ff4172be47c460d78
-    HEAD_REF master
+    REF "${VERSION}"
+    SHA512 27e204e22883065e3ae9ab92d2c87d8e26a2871a36ede01367ee0e4d4a0e0de4f7b9452a0c219066dbb37a6f06ec3acabd6be029b8fdaab6c6ea4094300371d0
+    HEAD_REF main
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS 
+        -DBDE_BUILD_TARGET_CPP17=ON
+        -DCMAKE_CXX_STANDARD=17
+        -DCMAKE_CXX_STANDARD_REQUIRED=ON
+        -DCMAKE_CXX_EXTENSIONS=OFF
+        -DBBS_BUILD_SYSTEM=1
+        "-DBdeBuildSystem_DIR:PATH=${TOOLS_PATH}/BdeBuildSystem"
+    OPTIONS_RELEASE
+        -DBDE_BUILD_TARGET_OPT=1
+    OPTIONS_DEBUG
+        -DBDE_BUILD_TARGET_DBG=1
 )
 
-# Clean up previous builds
-file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
-                    ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
-
-# Identify waf executable and calculate configure args
-if(VCPKG_CMAKE_SYSTEM_NAME)
-    set(WAF_COMMAND waf)
-else()
-    set(WAF_COMMAND waf.bat)
-endif()
-set(CONFIGURE_COMMON_ARGS ${CONFIGURE_COMMON_ARGS} --use-flat-include-dir)
-if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
-    set(CONFIGURE_COMMON_ARGS ${CONFIGURE_COMMON_ARGS} --abi-bits=32)
-elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
-    set(CONFIGURE_COMMON_ARGS ${CONFIGURE_COMMON_ARGS} --abi-bits=64)
-else()
-    message(FATAL_ERROR "Unsupported target architecture: ${VCPKG_TARGET_ARCHITECTURE}")
-endif()
-if(VCPKG_TARGET_IS_WINDOWS)
-    set(CONFIGURE_COMMON_ARGS ${CONFIGURE_COMMON_ARGS} --msvc-runtime-type=static)
-else()
-    set(ENV{CFLAGS} "$ENV{CFLAGS} -Wno-error=implicit-function-declaration")
-endif()
-
-# Configure debug
-message(STATUS "Configuring ${TARGET_TRIPLET}-dbg")
-vcpkg_execute_required_process(
-    COMMAND ${WAF_COMMAND} configure ${CONFIGURE_COMMON_ARGS}
-            --prefix=${CURRENT_PACKAGES_DIR}/debug --out=${SOURCE_PATH_DEBUG}
-            --build-type=debug
-    WORKING_DIRECTORY ${SOURCE_PATH}
-    LOGNAME configure-${TARGET_TRIPLET}--dbg
-)
-message(STATUS "Configuring ${TARGET_TRIPLET}-dbg done")
-
-# Build debug
-message(STATUS "Building ${TARGET_TRIPLET}-dbg")
-vcpkg_execute_required_process(
-    COMMAND ${WAF_COMMAND} build
-    WORKING_DIRECTORY ${SOURCE_PATH}
-    LOGNAME build-${TARGET_TRIPLET}--dbg
-)
-message(STATUS "Building ${TARGET_TRIPLET}-dbg done")
-
-# Install debug
-message(STATUS "Installing ${TARGET_TRIPLET}-dbg")
-vcpkg_execute_required_process(
-    COMMAND ${WAF_COMMAND} install
-    WORKING_DIRECTORY ${SOURCE_PATH}
-    LOGNAME install-${TARGET_TRIPLET}--dbg
-)
-# Include files should not be duplicated
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-# pkg-config files should point to correct include directory
-file(GLOB PC_FILES "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*.pc")
-foreach(PC_FILE_NAME ${PC_FILES})
-    file(READ "${PC_FILE_NAME}" _contents)
-    string(REPLACE "includedir=\${prefix}/include" "includedir=\${prefix}/../include" _contents "${_contents}")
-    file(WRITE "${PC_FILE_NAME}" "${_contents}")
-endforeach()
-message(STATUS "Installing ${TARGET_TRIPLET}-dbg done")
-
-# Configure release
-message(STATUS "Configuring ${TARGET_TRIPLET}-rel")
-vcpkg_execute_required_process(
-    COMMAND ${WAF_COMMAND} configure ${CONFIGURE_COMMON_ARGS}
-            --prefix=${CURRENT_PACKAGES_DIR} --out=${SOURCE_PATH_RELEASE}
-            --build-type=release
-    WORKING_DIRECTORY ${SOURCE_PATH}
-    LOGNAME configure-${TARGET_TRIPLET}--rel
-)
-message(STATUS "Configuring ${TARGET_TRIPLET}-rel done")
-
 # Build release
-message(STATUS "Building ${TARGET_TRIPLET}-rel")
-vcpkg_execute_required_process(
-    COMMAND ${WAF_COMMAND} build
-    WORKING_DIRECTORY ${SOURCE_PATH}
-    LOGNAME build-${TARGET_TRIPLET}--rel
-)
-message(STATUS "Building ${TARGET_TRIPLET}-rel done")
+vcpkg_cmake_build()
 
 # Install release
-message(STATUS "Installing ${TARGET_TRIPLET}-rel")
-vcpkg_execute_required_process(
-    COMMAND ${WAF_COMMAND} install
-    WORKING_DIRECTORY ${SOURCE_PATH}
-    LOGNAME install-${TARGET_TRIPLET}--rel
-)
-message(STATUS "Installing ${TARGET_TRIPLET}-rel done")
+vcpkg_cmake_install()
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+list(APPEND SUBPACKAGES "ryu" "inteldfp" "pcre2" "s_baltst" "bsl" "bdl" "bal")
+include(GNUInstallDirs) # needed for CMAKE_INSTALL_LIBDIR
+foreach(subpackage IN LISTS SUBPACKAGES)
+    vcpkg_cmake_config_fixup(PACKAGE_NAME ${subpackage} CONFIG_PATH /${CMAKE_INSTALL_LIBDIR}/cmake/${subpackage} DO_NOT_DELETE_PARENT_CONFIG_PATH)
+endforeach()
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake" "${CURRENT_PACKAGES_DIR}/debug/${CMAKE_INSTALL_LIBDIR}/cmake")
 
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/LICENSE
      DESTINATION ${CURRENT_PACKAGES_DIR}/share/bde
      RENAME copyright
 )
-
 vcpkg_fixup_pkgconfig()
diff --git a/external_imported/vcpkg/ports/bde/vcpkg.json b/external_imported/vcpkg/ports/bde/vcpkg.json
index b4e77488f..fa23133fc 100644
--- a/external_imported/vcpkg/ports/bde/vcpkg.json
+++ b/external_imported/vcpkg/ports/bde/vcpkg.json
@@ -1,7 +1,16 @@
 {
   "name": "bde",
-  "version": "3.2.0.0",
-  "port-version": 5,
+  "version": "3.124.0.0",
   "description": "Basic Development Environment - a set of foundational C++ libraries used at Bloomberg.",
-  "supports": "!windows & !arm"
+  "supports": "!windows & !arm & !android & !osx",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/bdwgc/portfile.cmake b/external_imported/vcpkg/ports/bdwgc/portfile.cmake
index 5273f7dbc..ddb6ec73f 100644
--- a/external_imported/vcpkg/ports/bdwgc/portfile.cmake
+++ b/external_imported/vcpkg/ports/bdwgc/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ivmai/bdwgc
-    REF v8.2.2
-    SHA512 da6a2de30f096610ea1c0de1ff7a3ab434debaa39199bc1426daff620901fc76e5747e43171d742b17f4afa3c77ef447cba4fda69d76a711e108f3f03af917ca
+    REF "v${VERSION}"
+    SHA512 764ab0c0f29a30ba0d55c8f1f6e267ab3190e8bcb96b7a31f2488f3936c6e0d08020a329dd296cf7d491ba8d4158fa73df6a6d2b4242526535a732f20c3f1bd0
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/bdwgc/vcpkg.json b/external_imported/vcpkg/ports/bdwgc/vcpkg.json
index eb669775e..20c063629 100644
--- a/external_imported/vcpkg/ports/bdwgc/vcpkg.json
+++ b/external_imported/vcpkg/ports/bdwgc/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "bdwgc",
-  "version": "8.2.2",
+  "version": "8.2.6",
   "description": "The Boehm-Demers-Weiser conservative C/C++ Garbage Collector (libgc, bdwgc, boehm-gc)",
   "homepage": "https://www.hboehm.info/gc/",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/beast/vcpkg.json b/external_imported/vcpkg/ports/beast/vcpkg.json
index 7fd6806ce..9f1d6b4a2 100644
--- a/external_imported/vcpkg/ports/beast/vcpkg.json
+++ b/external_imported/vcpkg/ports/beast/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "beast",
-  "version-string": "0",
-  "port-version": 1,
+  "version": "0",
+  "port-version": 2,
   "description": "HTTP/1 and WebSocket, header-only using Boost.Asio and C++11",
   "homepage": "https://www.boost.org/doc/libs/release/libs/beast/",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/behaviortree-cpp/001_port_fixes.patch b/external_imported/vcpkg/ports/behaviortree-cpp/001_port_fixes.patch
deleted file mode 100644
index 9897caa18..000000000
--- a/external_imported/vcpkg/ports/behaviortree-cpp/001_port_fixes.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a390aed..658f994 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -233,7 +233,7 @@ if( ZMQ_FOUND )
- endif()
- 
- if(MSVC)
--    target_compile_options(${BEHAVIOR_TREE_LIBRARY} PRIVATE /W3 /WX)
-+    target_compile_options(${BEHAVIOR_TREE_LIBRARY} PRIVATE /W3 /wd4702)
- else()
-     target_compile_options(${BEHAVIOR_TREE_LIBRARY} PRIVATE
-         -Wall -Wextra -Werror=return-type)
diff --git a/external_imported/vcpkg/ports/behaviortree-cpp/002_fix_dependencies.patch b/external_imported/vcpkg/ports/behaviortree-cpp/002_fix_dependencies.patch
deleted file mode 100644
index d554e37ce..000000000
--- a/external_imported/vcpkg/ports/behaviortree-cpp/002_fix_dependencies.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 658f994..a04cf27 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -14,7 +14,7 @@ if(MSVC)
- endif()
- 
- #---- Include boost to add coroutines ----
--find_package(Boost COMPONENTS coroutine QUIET)
-+find_package(Boost REQUIRED) # coroutine2 is header-only
- 
- if(Boost_FOUND)
-     string(REPLACE "." "0" Boost_VERSION_NODOT ${Boost_VERSION})
-@@ -46,17 +46,18 @@ option(BUILD_SHARED_LIBS "Build shared libraries" ON)
- 
- #---- Find other packages ----
- find_package(Threads)
--find_package(ZMQ)
-+find_package(cppzmq)
- 
- list(APPEND BEHAVIOR_TREE_PUBLIC_LIBRARIES
-     ${CMAKE_THREAD_LIBS_INIT}
-     ${CMAKE_DL_LIBS}
- )
- 
--if( ZMQ_FOUND )
-+if( ZMQ_FOUND OR ON )
-     message(STATUS "ZeroMQ found.")
-     add_definitions( -DZMQ_FOUND )
-     list(APPEND BT_SOURCE src/loggers/bt_zmq_publisher.cpp)
-+    list(APPEND BEHAVIOR_TREE_EXTERNAL_LIBRARIES cppzmq)
- else()
-     message(WARNING "ZeroMQ NOT found. Skipping the build of [PublisherZMQ] and [bt_recorder].")
- endif()
diff --git a/external_imported/vcpkg/ports/behaviortree-cpp/fix-x86_build.patch b/external_imported/vcpkg/ports/behaviortree-cpp/fix-x86_build.patch
new file mode 100644
index 000000000..164e9dff0
--- /dev/null
+++ b/external_imported/vcpkg/ports/behaviortree-cpp/fix-x86_build.patch
@@ -0,0 +1,35 @@
+diff --git a/3rdparty/lexy/include/lexy/_detail/swar.hpp b/3rdparty/lexy/include/lexy/_detail/swar.hpp
+index a268abb..d31bdaa 100644
+--- a/3rdparty/lexy/include/lexy/_detail/swar.hpp
++++ b/3rdparty/lexy/include/lexy/_detail/swar.hpp
+@@ -141,8 +141,13 @@ constexpr std::size_t swar_find_difference(swar_int lhs, swar_int rhs)
+     auto bit_idx = __builtin_ctzll(mask);
+ #elif defined(_MSC_VER)
+     unsigned long bit_idx;
+-    if (!_BitScanForward64(&bit_idx, mask))
+-        bit_idx         = 64;
++    #if defined(_WIN64)
++        if (!_BitScanForward64(&bit_idx, mask))
++            bit_idx         = 64;
++    #elif defined(_WIN32)
++        if (!_BitScanForward(&bit_idx, mask))
++            bit_idx         = 32;
++    #endif
+ #else
+ #    error "unsupported compiler; please file an issue"
+ #endif
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 295b317..0f1cd5c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -154,6 +154,10 @@ else()
+     add_library(${BTCPP_LIBRARY} STATIC ${BT_SOURCE})
+ endif()
+ 
++if (MSVC)
++    target_compile_definitions(${BTCPP_LIBRARY} PRIVATE NOMINMAX)
++endif ()
++
+ message(STATUS "BTCPP_EXTRA_LIBRARIES: ${BTCPP_EXTRA_LIBRARIES}")
+ 
+ target_link_libraries(${BTCPP_LIBRARY}
diff --git a/external_imported/vcpkg/ports/behaviortree-cpp/portfile.cmake b/external_imported/vcpkg/ports/behaviortree-cpp/portfile.cmake
index 7b77e10c5..521e9b089 100644
--- a/external_imported/vcpkg/ports/behaviortree-cpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/behaviortree-cpp/portfile.cmake
@@ -1,17 +1,11 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/BehaviorTree/BehaviorTree.CPP/archive/3.5.6.tar.gz"
-    FILENAME "BehaviorTree.CPP.3.5.6.tar.gz"
-    SHA512 cd3b15eb7c5bab68239b697da166220b4df8dd7e6cf5e831f316d411e24be56c9ed74e54a3e3dd332164d740159eaf9ce62d005601fd65133809dab29430c9b7
-)
-
-vcpkg_extract_source_archive(
-    SOURCE_PATH
-    ARCHIVE "${ARCHIVE}"
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO BehaviorTree/BehaviorTree.CPP
+    REF ${VERSION}
+    SHA512 f2ee647c734e39e50f92405c5dc9fd2876602ff074a86416959fbf6548e37130d35f312cafb084ca4a40da7ee81386502a75ad839ce99a2859c30ff187820fdf
+    HEAD_REF master
     PATCHES
-        001_port_fixes.patch
-        002_fix_dependencies.patch
+        fix-x86_build.patch
 )
 
 vcpkg_cmake_configure(
@@ -19,19 +13,23 @@ vcpkg_cmake_configure(
     OPTIONS
         -DCMAKE_DISABLE_FIND_PACKAGE_ament_cmake=1
         -DCMAKE_DISABLE_FIND_PACKAGE_Curses=1
-        -DBUILD_EXAMPLES=OFF
-        -DBUILD_UNIT_TESTS=OFF
-        -DBUILD_TOOLS=OFF
+        -DBTCPP_EXAMPLES=OFF
+        -DBTCPP_UNIT_TESTS=OFF
+        -DBTCPP_BUILD_TOOLS=OFF
+        -DBTCPP_GROOT_INTERFACE=OFF
+        -DBTCPP_SQLITE_LOGGING=OFF
+    MAYBE_UNUSED_VARIABLES
+        CMAKE_DISABLE_FIND_PACKAGE_Curses
 )
 
 vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/BehaviorTreeV3/cmake PACKAGE_NAME behaviortreev3)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/behaviortree_cpp PACKAGE_NAME behaviortree_cpp)
 vcpkg_copy_pdbs()
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
 
-file(REMOVE_RECURSE
-    "${CURRENT_PACKAGES_DIR}/debug/include"
-    "${CURRENT_PACKAGES_DIR}/lib/BehaviorTreeV3"
-    "${CURRENT_PACKAGES_DIR}/debug/lib/BehaviorTreeV3"
-)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
diff --git a/external_imported/vcpkg/ports/behaviortree-cpp/vcpkg.json b/external_imported/vcpkg/ports/behaviortree-cpp/vcpkg.json
index d99f0e521..32f343b67 100644
--- a/external_imported/vcpkg/ports/behaviortree-cpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/behaviortree-cpp/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "behaviortree-cpp",
-  "version": "3.5.6",
-  "port-version": 3,
+  "version": "4.3.7",
   "description": "Behavior Trees Library in C++.",
   "homepage": "https://www.behaviortree.dev",
   "supports": "!uwp",
diff --git a/external_imported/vcpkg/ports/benchmark/fix_qnx.patch b/external_imported/vcpkg/ports/benchmark/fix_qnx.patch
new file mode 100644
index 000000000..79d6ae8df
--- /dev/null
+++ b/external_imported/vcpkg/ports/benchmark/fix_qnx.patch
@@ -0,0 +1,15 @@
+diff --git a/src/sysinfo.cc b/src/sysinfo.cc
+index 922e83a..ec9fd35 100644
+--- a/src/sysinfo.cc
++++ b/src/sysinfo.cc
+@@ -771,8 +771,8 @@ double GetCPUCyclesPerSecond(CPUInfo::Scaling scaling) {
+   kstat_close(kc);
+   return clock_hz;
+ #elif defined(BENCHMARK_OS_QNX)
+-  return static_cast<double>((int64_t)(SYSPAGE_ENTRY(cpuinfo)->speed) *
+-                             (int64_t)(1000 * 1000));
++  return static_cast<double>(static_cast<int64_t>(SYSPAGE_ENTRY(cpuinfo)->speed) *
++                             static_cast<int64_t>(1000 * 1000));
+ #elif defined(BENCHMARK_OS_QURT)
+   // QuRT doesn't provide any API to query Hexagon frequency.
+   return 1000000000;
diff --git a/external_imported/vcpkg/ports/benchmark/portfile.cmake b/external_imported/vcpkg/ports/benchmark/portfile.cmake
index 8e8cef314..97cd97c79 100644
--- a/external_imported/vcpkg/ports/benchmark/portfile.cmake
+++ b/external_imported/vcpkg/ports/benchmark/portfile.cmake
@@ -3,15 +3,18 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/benchmark
-    REF v1.7.1
-    SHA512 396af1c1d3eaa2b78c6d23b1472f6088db85a294056ae1c2366dc5c0becdc8f141ba8fc3a235033324ab0a41c2298f5d242ef09b9b6f69d9877de6bcb2062efd
-    HEAD_REF master
+    REF "v${VERSION}"
+    SHA512 4e12114251c79a426873cfba6e27270b69fc980cef9a68e9cb3170f8e2e203f77dee19ab1e65cad51cd67e60991d3bbfdd52553f22522ce5e6c611b5aa07602c
+    HEAD_REF main
+    PATCHES
+        fix_qnx.patch
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS
         -DBENCHMARK_ENABLE_TESTING=OFF
+        -Werror=old-style-cast
 )
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/benchmark/vcpkg.json b/external_imported/vcpkg/ports/benchmark/vcpkg.json
index 279c2663d..af9fbf853 100644
--- a/external_imported/vcpkg/ports/benchmark/vcpkg.json
+++ b/external_imported/vcpkg/ports/benchmark/vcpkg.json
@@ -1,7 +1,8 @@
 {
   "$comment": "https://github.com/google/benchmark/issues/661 describes the missing UWP support upstream",
   "name": "benchmark",
-  "version-semver": "1.7.1",
+  "version-semver": "1.8.3",
+  "port-version": 1,
   "description": "A library to support the benchmarking of functions, similar to unit-tests.",
   "homepage": "https://github.com/google/benchmark",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/bento4/fix-install.patch b/external_imported/vcpkg/ports/bento4/fix-install.patch
deleted file mode 100644
index 5de2edc72..000000000
--- a/external_imported/vcpkg/ports/bento4/fix-install.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6de3bfe..2b2239a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -81,3 +81,20 @@ foreach(app ${BENTO4_APPS})
-   endif()
- endforeach()
- endif(BUILD_APPS)
-+
-+file(GLOB AP4_INCLUDES
-+  ${SOURCE_CODECS}/*.h
-+  ${SOURCE_CORE}/*.h
-+  ${SOURCE_CRYPTO}/*.h
-+  ${SOURCE_METADATA}/*.h
-+)
-+
-+# Install targets
-+install(TARGETS ap4
-+  RUNTIME DESTINATION bin
-+  LIBRARY DESTINATION lib
-+  ARCHIVE DESTINATION lib
-+)
-+
-+# Install headers
-+install(FILES ${AP4_INCLUDES} DESTINATION include/bento4)
diff --git a/external_imported/vcpkg/ports/bento4/portfile.cmake b/external_imported/vcpkg/ports/bento4/portfile.cmake
index ae6e04103..c4b635595 100644
--- a/external_imported/vcpkg/ports/bento4/portfile.cmake
+++ b/external_imported/vcpkg/ports/bento4/portfile.cmake
@@ -3,11 +3,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO axiomatic-systems/Bento4
-    REF 83c48e6e2a3f8e4be7ad2eddaa0639303184146d # v1.6.0-639
-    SHA512 764c1102dc1e2a0f48395427b5b0a96f87d7124cceb61eb24008f245cf1f5f057753307c38f6f7e74d6838d6600c436d8540e94cbca12385cb4fffb02995069b
-    HEAD_REF master 
-    PATCHES
-        fix-install.patch
+    REF "v${VERSION}"
+    SHA512 ad92c561a16a830ac63b0fbff98bd14f732dd2e38416de937191b14c750e632c793e5256b92361d3ff8867f9fd1cf727756ba78cd0122af1b79d62532d2ca427
+    HEAD_REF master
 )
 
 vcpkg_cmake_configure(
@@ -17,9 +15,10 @@ vcpkg_cmake_configure(
 )
 
 vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/bento4)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 vcpkg_copy_pdbs()
 
-file(INSTALL "${SOURCE_PATH}/Documents/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/Documents/LICENSE.txt")
diff --git a/external_imported/vcpkg/ports/bento4/vcpkg.json b/external_imported/vcpkg/ports/bento4/vcpkg.json
index 9103b59eb..6d0b6f58c 100644
--- a/external_imported/vcpkg/ports/bento4/vcpkg.json
+++ b/external_imported/vcpkg/ports/bento4/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "bento4",
-  "version": "1.6.0-639",
-  "port-version": 1,
+  "version": "1.6.0-641",
   "description": "Bento4 is a C++ class library and tools designed to read and write ISO-MP4 files. This format is defined in international specifications ISO/IEC 14496-12, 14496-14 and 14496-15.",
   "homepage": "https://github.com/axiomatic-systems/Bento4",
   "license": null,
@@ -9,6 +8,10 @@
     {
       "name": "vcpkg-cmake",
       "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/better-enums/portfile.cmake b/external_imported/vcpkg/ports/better-enums/portfile.cmake
new file mode 100644
index 000000000..8b4a534a6
--- /dev/null
+++ b/external_imported/vcpkg/ports/better-enums/portfile.cmake
@@ -0,0 +1,11 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO aantron/better-enums
+    REF ${VERSION}
+    SHA512 5997c74932803fb96beabbe029d80f6fdeab7c46f781a4e11ef775242d294dfd82ca05cac99787dd68a622db62510fd5533e9c0e85a62c7792c0dbe6237af6d9
+    HEAD_REF master
+)
+
+file(COPY "${SOURCE_PATH}/enum.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/better-enums")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
diff --git a/external_imported/vcpkg/ports/better-enums/vcpkg.json b/external_imported/vcpkg/ports/better-enums/vcpkg.json
new file mode 100644
index 000000000..062b0d58d
--- /dev/null
+++ b/external_imported/vcpkg/ports/better-enums/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "better-enums",
+  "version": "0.11.3",
+  "description": "C++ compile-time enum to string, iteration, in a single header file.",
+  "homepage": "http://aantron.github.io/better-enums/",
+  "license": "BSD-2-Clause"
+}
diff --git a/external_imported/vcpkg/ports/bext-di/portfile.cmake b/external_imported/vcpkg/ports/bext-di/portfile.cmake
index 36ce8c0a9..f60b74a07 100644
--- a/external_imported/vcpkg/ports/bext-di/portfile.cmake
+++ b/external_imported/vcpkg/ports/bext-di/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boost-ext/di
-    REF 6078f073feb8560127fbf0308b3794a551146252 # v1.2.0
-    SHA512 d7876b10b0365a92095ee7edefdc9cb9a0e237baf2bad124a927f22ed6ec30e18802b20517bc032184f39b7b4d71f44e965bdcea074646871d0194bd4e851d43
+    REF "v${VERSION}"
+    SHA512 2371415df0b6569861d60c32908afb6fae8bfa221ad4153eeb7f60143f8449eca6c81b57067d5009b8cd85e31c04ede554fdee23008ddeffa4e7746856e250ae
     HEAD_REF cpp14
 )
 
@@ -14,4 +14,4 @@ vcpkg_download_distfile(LICENSE
     FILENAME "di-copyright"
     SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8
 )
-file(INSTALL ${LICENSE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${LICENSE}")
diff --git a/external_imported/vcpkg/ports/bext-di/vcpkg.json b/external_imported/vcpkg/ports/bext-di/vcpkg.json
index 2b47e5578..aaeeeceb8 100644
--- a/external_imported/vcpkg/ports/bext-di/vcpkg.json
+++ b/external_imported/vcpkg/ports/bext-di/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "bext-di",
-  "version": "1.2.0",
-  "port-version": 1,
+  "version": "1.3.0",
   "description": "C++14 Dependency Injection Library.",
   "homepage": "https://github.com/boost-ext/di"
 }
diff --git a/external_imported/vcpkg/ports/bext-mp/fix-build-flags.patch b/external_imported/vcpkg/ports/bext-mp/fix-build-flags.patch
new file mode 100644
index 000000000..960dfa209
--- /dev/null
+++ b/external_imported/vcpkg/ports/bext-mp/fix-build-flags.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index deaa67c..fb82294 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -34,10 +34,10 @@ target_sources(mp
+ if(PROJECT_IS_TOP_LEVEL)
+   if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+     target_compile_options(mp INTERFACE
+-      $<BUILD_INTERFACE:-stdlib=libc++ -Wall -Wextra -Wpedantic -Werror>)
++      $<BUILD_INTERFACE:-stdlib=libc++ -Wall -Wextra -Wpedantic>)
+     target_link_options(mp INTERFACE $<BUILD_INTERFACE:-stdlib=libc++>)
+   elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+-    target_compile_options(mp INTERFACE $<BUILD_INTERFACE:-Wall -Wextra -Wpedantic -Werror>)
++    target_compile_options(mp INTERFACE $<BUILD_INTERFACE:-Wall -Wextra -Wpedantic>)
+   endif()
+ endif()
+ 
diff --git a/external_imported/vcpkg/ports/bext-mp/portfile.cmake b/external_imported/vcpkg/ports/bext-mp/portfile.cmake
new file mode 100644
index 000000000..0adc5fa23
--- /dev/null
+++ b/external_imported/vcpkg/ports/bext-mp/portfile.cmake
@@ -0,0 +1,22 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO boost-ext/mp
+    REF d2dbdf89e543624be8351fd52308a9cf73374dbc
+    SHA512 15d56bf0dca2e4bfb9128b8552a6aa01ed6b1431ab9c152ed51473f6fa237c31fbf3d5baa22523e3786d14fd716acb5436ed26fe89d46812ba9375e2417bc67a
+    HEAD_REF main
+    PATCHES fix-build-flags.patch
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(PACKAGE_NAME mp CONFIG_PATH "share/cmake/mp-0.0.1")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
+
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/bext-mp/usage b/external_imported/vcpkg/ports/bext-mp/usage
new file mode 100644
index 000000000..247e07999
--- /dev/null
+++ b/external_imported/vcpkg/ports/bext-mp/usage
@@ -0,0 +1,5 @@
+The package bext-mp provides CMake targets:
+
+    find_package(mp CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE Boost::mp)
+    set_property(TARGET main PROPERTY CXX_EXTENSIONS OFF)
diff --git a/external_imported/vcpkg/ports/bext-mp/vcpkg.json b/external_imported/vcpkg/ports/bext-mp/vcpkg.json
new file mode 100644
index 000000000..413416c11
--- /dev/null
+++ b/external_imported/vcpkg/ports/bext-mp/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "bext-mp",
+  "version-date": "2023-03-02",
+  "description": "C++20 ~~Template~~ Meta-Programming",
+  "homepage": "https://boost-ext.github.io/mp/",
+  "license": "BSL-1.0",
+  "supports": "!windows | mingw",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/bext-sml/portfile.cmake b/external_imported/vcpkg/ports/bext-sml/portfile.cmake
index 3701e1616..d8d662745 100644
--- a/external_imported/vcpkg/ports/bext-sml/portfile.cmake
+++ b/external_imported/vcpkg/ports/bext-sml/portfile.cmake
@@ -2,8 +2,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boost-ext/sml
-    REF v1.1.5
-    SHA512 6babee6da2db93912afa2eb932591674a73f43609b7c2b0523e84ba682c09f6d4f67d1c7f6ea48f73f1f09de8df2eaf2ae30b3399c1602189ea08d42689758d7
+    REF v${VERSION}
+    SHA512 7612f301ed3e4edd4171214d85c6b746af19079622aef80c0965536782e4f50635332e7435966b072e1cb415c3a680260211740313d52d1927ab5af78ecdd30e
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/bext-sml/vcpkg.json b/external_imported/vcpkg/ports/bext-sml/vcpkg.json
index 5b04bc3fc..c41a932b5 100644
--- a/external_imported/vcpkg/ports/bext-sml/vcpkg.json
+++ b/external_imported/vcpkg/ports/bext-sml/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "bext-sml",
-  "version": "1.1.5",
+  "version": "1.1.9",
   "description": "Your scalable C++14 one header only State Machine Library with no dependencies",
   "homepage": "https://github.com/boost-ext/sml",
   "license": "BSL-1.0"
diff --git a/external_imported/vcpkg/ports/bext-sml2/portfile.cmake b/external_imported/vcpkg/ports/bext-sml2/portfile.cmake
new file mode 100644
index 000000000..9d851cbac
--- /dev/null
+++ b/external_imported/vcpkg/ports/bext-sml2/portfile.cmake
@@ -0,0 +1,15 @@
+# Header-only library
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO boost-ext/sml2
+    REF 6989e01776ab0d51a7b9463c307855d4a274888f
+    SHA512 215e404769b80da01735d4038ec8fd63804ef3dfb6b65fcbce38b9e90491d4758c28338a1d259776b2258e35f14a4fb27330fa730800cf7289d147cf5e580d4e
+    HEAD_REF master
+)
+
+file(INSTALL "${SOURCE_PATH}/sml2"
+  DESTINATION "${CURRENT_PACKAGES_DIR}/include/boost"
+)
+
+# Handle copyright
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
diff --git a/external_imported/vcpkg/ports/bext-sml2/vcpkg.json b/external_imported/vcpkg/ports/bext-sml2/vcpkg.json
new file mode 100644
index 000000000..2422e2ddb
--- /dev/null
+++ b/external_imported/vcpkg/ports/bext-sml2/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "bext-sml2",
+  "version-date": "2023-09-20",
+  "description": "Your scalable C++20 one header only State Machine Library with no dependencies",
+  "homepage": "https://github.com/boost-ext/sml2",
+  "license": "BSL-1.0"
+}
diff --git a/external_imported/vcpkg/ports/bext-ut/avoid-cpm.patch b/external_imported/vcpkg/ports/bext-ut/avoid-cpm.patch
deleted file mode 100644
index c1022543a..000000000
--- a/external_imported/vcpkg/ports/bext-ut/avoid-cpm.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -36,7 +36,7 @@
- # ---- Add dependencies via CPM ----
- # see https://github.com/cpm-cmake/CPM.cmake for more info
- 
--if(CMAKE_VERSION VERSION_LESS 3.20.0)
-+if(1)
-   # see https://github.com/TheLartians/PackageProject.cmake/pull/19
-   include(cmake/PackageProject.cmake)
- else()
diff --git a/external_imported/vcpkg/ports/bext-ut/portfile.cmake b/external_imported/vcpkg/ports/bext-ut/portfile.cmake
index 69aca2095..a84366768 100644
--- a/external_imported/vcpkg/ports/bext-ut/portfile.cmake
+++ b/external_imported/vcpkg/ports/bext-ut/portfile.cmake
@@ -1,17 +1,15 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boost-ext/ut
-    REF v1.1.9
-    SHA512 81a6b80948d3a203534244f62f5f3ac57593083cc0c32484498a7d01d29455f7dcb33e2ec0587609b8dff33a81a5551796d7681d48fd93e817d6d0c31697234e
+    REF bf8388f61103571dee3061a4ef23292a320d9dbf #committed on 2023-07-09
+    SHA512 e7f95c71fb094170e0f431af115845f66c53f05748829a547612ae480839339b7794d4a3d8c2ae44ad2536654228f00d9d6b058b3b55c4af3432936efc2f6c2d
     HEAD_REF master
-    PATCHES
-        avoid-cpm.patch
-        pr-521.patch # See https://github.com/boost-ext/ut/pull/521
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
+        -DBOOST_UT_ALLOW_CPM_USE=OFF
         -DBOOST_UT_BUILD_BENCHMARKS=OFF
         -DBOOST_UT_BUILD_EXAMPLES=OFF
         -DBOOST_UT_BUILD_TESTS=OFF
@@ -19,10 +17,10 @@ vcpkg_cmake_configure(
 )
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
-vcpkg_cmake_config_fixup(PACKAGE_NAME ut CONFIG_PATH lib/cmake/ut-1.1.8)
+vcpkg_cmake_config_fixup(PACKAGE_NAME ut CONFIG_PATH lib/cmake/ut-${VERSION})
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug"
                     "${CURRENT_PACKAGES_DIR}/lib"
 )
 
-file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
diff --git a/external_imported/vcpkg/ports/bext-ut/pr-521.patch b/external_imported/vcpkg/ports/bext-ut/pr-521.patch
deleted file mode 100644
index 422917ef6..000000000
--- a/external_imported/vcpkg/ports/bext-ut/pr-521.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ea96425..a8ce453 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -52,7 +52,9 @@ endif()
- 
- add_library(ut INTERFACE)
- 
--set(INCLUDE_INSTALL_DIR include/${PROJECT_NAME}-${PROJECT_VERSION}/include)
-+if(NOT DEFINED INCLUDE_INSTALL_DIR)
-+  set(INCLUDE_INSTALL_DIR include/${PROJECT_NAME}-${PROJECT_VERSION}/include)
-+endif()
- # XXX variant: set(INCLUDE_INSTALL_DIR include)
- target_include_directories(ut INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include> $<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>)
- if(APPLE)
diff --git a/external_imported/vcpkg/ports/bext-ut/vcpkg.json b/external_imported/vcpkg/ports/bext-ut/vcpkg.json
index 08e0cea84..c5bb24dca 100644
--- a/external_imported/vcpkg/ports/bext-ut/vcpkg.json
+++ b/external_imported/vcpkg/ports/bext-ut/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "bext-ut",
   "version": "1.1.9",
-  "port-version": 1,
+  "port-version": 2,
   "description": "UT: C++20 μ(micro)/Unit Testing Framework",
   "homepage": "https://boost-ext.github.io/ut/",
   "license": "BSL-1.0",
diff --git a/external_imported/vcpkg/ports/bext-wintls/portfile.cmake b/external_imported/vcpkg/ports/bext-wintls/portfile.cmake
index 14ac5c893..81b1aebb0 100644
--- a/external_imported/vcpkg/ports/bext-wintls/portfile.cmake
+++ b/external_imported/vcpkg/ports/bext-wintls/portfile.cmake
@@ -1,11 +1,11 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO laudrup/boost-wintls
-    REF v0.9.5
-    SHA512 5b6a88d64225c0f065d18f65319d44b90eb594431c53d9fbff72edfe2fc909613a966062b5636db7a3d0e36a389a0948dada0fbfa61b21b7b52b1af952d93071
+    REF "v${VERSION}"
+    SHA512 b2973148f53f036108783ea6c30fca5f5055efc3676a9df2d1bf527399f757ac2f319f8637646904820e5280a8be48cf8369a3d2b6a3879afc0aa4463c77ea06
     HEAD_REF master
 )
 
 file(COPY "${SOURCE_PATH}/include/boost/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/boost/")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/bext-wintls/vcpkg.json b/external_imported/vcpkg/ports/bext-wintls/vcpkg.json
index cb39e3137..80327ea1a 100644
--- a/external_imported/vcpkg/ports/bext-wintls/vcpkg.json
+++ b/external_imported/vcpkg/ports/bext-wintls/vcpkg.json
@@ -1,18 +1,10 @@
 {
   "name": "bext-wintls",
-  "version": "0.9.5",
+  "version": "0.9.7",
   "description": "Native Windows TLS stream wrapper for use with boost::asio",
   "homepage": "https://github.com/laudrup/boost-wintls",
-  "supports": "windows",
+  "supports": "windows | mingw",
   "dependencies": [
-    "boost-asio",
-    {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
-    }
+    "boost-asio"
   ]
 }
diff --git a/external_imported/vcpkg/ports/bfgroup-lyra/portfile.cmake b/external_imported/vcpkg/ports/bfgroup-lyra/portfile.cmake
index 1dcab723d..e25fdd975 100644
--- a/external_imported/vcpkg/ports/bfgroup-lyra/portfile.cmake
+++ b/external_imported/vcpkg/ports/bfgroup-lyra/portfile.cmake
@@ -1,21 +1,24 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO bfgroup/Lyra
-    REF 1.6
-    SHA512 e357fd0e925b67a51ad7232035ac66842676837baebf7a69eb416807b11400c283d098a22bf3ae27ce904700c5b849953ede1873d6535a8b34c4704ebcb09748
-    HEAD_REF master
+    REF "${VERSION}"
+    SHA512 643c25fbe996af2e888eacb99a715e3d420dbfc21d48756703cf301ab6ba0d1f8eea1cd0764bd5c173d2ddcef7c799448d8c3a77676024205163305e1363d461
+    HEAD_REF release
 )
 
+set(VCPKG_BUILD_TYPE release) # header-only port
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
 )
+
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(
     PACKAGE_NAME lyra
     CONFIG_PATH share/lyra/cmake
 )
 
-# Library is header-only, so no debug content.
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/bfgroup-lyra/usage b/external_imported/vcpkg/ports/bfgroup-lyra/usage
new file mode 100644
index 000000000..92538aa1d
--- /dev/null
+++ b/external_imported/vcpkg/ports/bfgroup-lyra/usage
@@ -0,0 +1,4 @@
+bfgroup-lyra provides CMake targets:
+
+    find_package(lyra CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE bfg::lyra)
diff --git a/external_imported/vcpkg/ports/bfgroup-lyra/vcpkg.json b/external_imported/vcpkg/ports/bfgroup-lyra/vcpkg.json
index c7189d7d8..25a353bd9 100644
--- a/external_imported/vcpkg/ports/bfgroup-lyra/vcpkg.json
+++ b/external_imported/vcpkg/ports/bfgroup-lyra/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "bfgroup-lyra",
-  "version": "1.6",
+  "version": "1.6.1",
   "description": "A simple to use, composable, command line parser for C++ 11 and beyond",
   "homepage": "https://bfgroup.github.io/Lyra/",
   "license": "BSL-1.0",
diff --git a/external_imported/vcpkg/ports/bgfx/portfile.cmake b/external_imported/vcpkg/ports/bgfx/portfile.cmake
index a95a8c103..0e0c17db0 100644
--- a/external_imported/vcpkg/ports/bgfx/portfile.cmake
+++ b/external_imported/vcpkg/ports/bgfx/portfile.cmake
@@ -1,33 +1,13 @@
-vcpkg_from_github(
-  OUT_SOURCE_PATH SOURCE_PATH
-  REPO "bkaradzic/bgfx.cmake"
-  HEAD_REF master
-  REF v${VERSION}
-  SHA512 b1f3c46d0f4985df3a09c74f627f1d0c426f204a8c680a91a65099c146cd41215e9af1c5cdf4a0a559d020f93455b71a6bc1412628cfd818467fd59996542377
+vcpkg_download_distfile(
+    ARCHIVE_FILE
+    URLS https://github.com/bkaradzic/bgfx.cmake/releases/download/v${VERSION}/bgfx.cmake.v${VERSION}.tar.gz
+    FILENAME bgfx.cmake.v${VERSION}.tar.gz
+    SHA512 369943ce0f8f2b5332d7334247d3a9ef0e28a6b1ff5ee250a01f83d1a0bd865687397da791e4c861d1c1b18ec4285f50153139f3c0e398611c7f3b672d1c751c
 )
 
-vcpkg_from_github(
-  OUT_SOURCE_PATH SOURCE_PATH_BX
-  REPO "bkaradzic/bx"
-  HEAD_REF master
-  REF fa1411e4aa111c8b004c97660ab31ba1a5287835
-  SHA512 0c6bd7e41c6dd3263c01d761aefdd55d2ed527ca694b52f563c6ded3ba5569df1492c8d04e5f76de3b1bdf7c5ca2978b8ec394d48ea29593535979f204d3ad0c
-)
-
-vcpkg_from_github(
-  OUT_SOURCE_PATH SOURCE_PATH_BIMG
-  REPO "bkaradzic/bimg"
-  HEAD_REF master
-  REF 7afa2419254fd466c013a51bdeb0bee3022619c4
-  SHA512 514deed00f8bc4106f67b777dca72d0ed0accb1ae057ad37d22a21c83ad3a85ad23d220ac0cf40b6a8006d43c308b1acfad464b51e64075aa01598731a1557df
-)
-
-vcpkg_from_github(
-  OUT_SOURCE_PATH SOURCE_PATH_BGFX
-  REPO "bkaradzic/bgfx"
-  HEAD_REF master
-  REF 6f36b4fb3a0d76090eb2727ecf11abac46eef8aa
-  SHA512 cb88fcba51184611ecf969e5ec391eabd43227d3e17071c70c75eed79e86da7fe9b3c07c01e88d2230a8245ec0c3d192b1694c289019bb4f9c1c4973b0b11314
+vcpkg_extract_source_archive(
+    SOURCE_PATH
+    ARCHIVE ${ARCHIVE_FILE}
 )
 
 vcpkg_check_features(
@@ -35,8 +15,8 @@ vcpkg_check_features(
   FEATURES tools BGFX_BUILD_TOOLS multithreaded BGFX_CONFIG_MULTITHREADED
 )
 
-if (BGFX_BUILD_TOOLS AND TARGET_TRIPLET MATCHES "(windows|uwp)")
-  # bgfx doesn't apply __declspec(dllexport) which prevents dynamic linking for tools
+if (TARGET_TRIPLET MATCHES "(windows|uwp)")
+  # bgfx doesn't apply __declspec(dllexport) which prevents dynamic linking
   set(BGFX_LIBRARY_TYPE "STATIC")
 elseif (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
   set(BGFX_LIBRARY_TYPE "SHARED")
@@ -48,10 +28,7 @@ file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-inject-packages.cmake" DESTINATION "$
 
 vcpkg_cmake_configure(
   SOURCE_PATH "${SOURCE_PATH}"
-  OPTIONS -DBX_DIR=${SOURCE_PATH_BX}
-          -DBIMG_DIR=${SOURCE_PATH_BIMG}
-          -DBGFX_DIR=${SOURCE_PATH_BGFX}
-          -DBGFX_LIBRARY_TYPE=${BGFX_LIBRARY_TYPE}
+  OPTIONS -DBGFX_LIBRARY_TYPE=${BGFX_LIBRARY_TYPE}
           -DBX_AMALGAMATED=ON
           -DBGFX_AMALGAMATED=ON
           -DBGFX_BUILD_EXAMPLES=OFF
diff --git a/external_imported/vcpkg/ports/bgfx/vcpkg.json b/external_imported/vcpkg/ports/bgfx/vcpkg.json
index b64a526c2..0699bade6 100644
--- a/external_imported/vcpkg/ports/bgfx/vcpkg.json
+++ b/external_imported/vcpkg/ports/bgfx/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "bgfx",
-  "version": "1.118.8417-415",
+  "version": "1.122.8595-458",
   "maintainers": "Sandy Carter <bwrsandman@users.noreply.github.com>",
   "description": "Cross-platform, graphics API agnostic, Bring Your Own Engine/Framework style rendering library.",
   "homepage": "https://bkaradzic.github.io/bgfx/overview.html",
@@ -20,15 +20,30 @@
     }
   ],
   "default-features": [
-    "multithreaded"
+    "platform-default-features"
   ],
   "features": {
     "multithreaded": {
-      "description": "Encode and render on different threads"
+      "description": "Encode and render on different threads",
+      "supports": "!emscripten"
+    },
+    "platform-default-features": {
+      "description": "Enables default features per platform",
+      "dependencies": [
+        {
+          "$comment": "bgfx does not support multithreading on emscripten",
+          "name": "bgfx",
+          "features": [
+            "multithreaded"
+          ],
+          "platform": "!emscripten"
+        }
+      ]
     },
     "tools": {
-      "$comment": "Use '\"host\": true' in dependencies of vcpkg.json to prevent cross compiling the tools.",
-      "description": "Shader, Texture and Geometry compilers for bgfx."
+      "$comment": "Use '\"host\": true' in dependencies of vcpkg.json in manifest mode.",
+      "description": "Shader, Texture and Geometry compilers for bgfx.",
+      "supports": "native"
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/binlog/portfile.cmake b/external_imported/vcpkg/ports/binlog/portfile.cmake
index 1d0a44795..8322e1b22 100644
--- a/external_imported/vcpkg/ports/binlog/portfile.cmake
+++ b/external_imported/vcpkg/ports/binlog/portfile.cmake
@@ -16,6 +16,7 @@ vcpkg_cmake_configure(
         -DBINLOG_BUILD_EXAMPLES=OFF
         -DBINLOG_BUILD_UNIT_TESTS=OFF
         -DBINLOG_BUILD_INTEGRATION_TESTS=OFF
+        -DCMAKE_DISABLE_FIND_PACKAGE_benchmark=ON
 )
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/binlog/vcpkg.json b/external_imported/vcpkg/ports/binlog/vcpkg.json
index 98de2e834..a11da3a0a 100644
--- a/external_imported/vcpkg/ports/binlog/vcpkg.json
+++ b/external_imported/vcpkg/ports/binlog/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "binlog",
   "version-date": "2021-04-16",
+  "port-version": 1,
   "description": "Binlog is a high performance C++ log library to produce structured binary logs.",
   "homepage": "http://opensource.morganstanley.com/binlog/",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/binn/vcpkg.json b/external_imported/vcpkg/ports/binn/vcpkg.json
index edf21b9ba..55ee55290 100644
--- a/external_imported/vcpkg/ports/binn/vcpkg.json
+++ b/external_imported/vcpkg/ports/binn/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "binn",
-  "version-string": "3.0",
-  "port-version": 2,
+  "version": "3.0",
+  "port-version": 3,
   "description": "Binn is a binary data serialization format designed to be compact, fast and easy to use.",
   "dependencies": [
     {
diff --git a/external_imported/vcpkg/ports/bitmagic/portfile.cmake b/external_imported/vcpkg/ports/bitmagic/portfile.cmake
index 240a52cf6..6ee8a0cf4 100644
--- a/external_imported/vcpkg/ports/bitmagic/portfile.cmake
+++ b/external_imported/vcpkg/ports/bitmagic/portfile.cmake
@@ -2,8 +2,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO tlk00/BitMagic
-    REF v7.12.3
-    SHA512 03b9261d102b3c610a4b284f74092feb451b7a5fe80d60002dd2a42e2eeae4b763d212d2647eeb1fc9a61c93500f006ab2bcc46598207903682b70b1e4336b6a
+    REF "v${VERSION}"
+    SHA512 d034f66b8631d09cb0be11b96f5f12dea416ef2cfca42ed7f0865aeb65102a4951821805ec65bee793541ce1a665e5d11ba4bedb0d79956c0eee6c856afb29b2
     HEAD_REF master
 
 )
diff --git a/external_imported/vcpkg/ports/bitmagic/vcpkg.json b/external_imported/vcpkg/ports/bitmagic/vcpkg.json
index 93a900be1..fdb3c5bc8 100644
--- a/external_imported/vcpkg/ports/bitmagic/vcpkg.json
+++ b/external_imported/vcpkg/ports/bitmagic/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "bitmagic",
-  "version": "7.12.3",
+  "version": "7.13.4",
   "description": "Algorithms and tools for Algebra of Sets for information retrieval, indexing of databases, scientific algorithms, ranking, clustering, unsupervised machine learning and signal processing.",
   "homepage": "http://bitmagic.io"
 }
diff --git a/external_imported/vcpkg/ports/bitserializer/portfile.cmake b/external_imported/vcpkg/ports/bitserializer/portfile.cmake
index 818e3324c..392678758 100644
--- a/external_imported/vcpkg/ports/bitserializer/portfile.cmake
+++ b/external_imported/vcpkg/ports/bitserializer/portfile.cmake
@@ -1,11 +1,11 @@
 # All components of BitSerializer is "header only" except CSV archive
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
-vcpkg_from_bitbucket(
+vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO Pavel_Kisliak/BitSerializer
-    REF 0.50
-    SHA512 d223e4487251e375b2f5d8b1dca9a3db3f5661c3eb308b12f019864e49d58fb0b7d45a45c3e7e232ba1d023adb1f9a3a287255099b205f57c6cade04167119d6
+    REPO PavelKisliak/BitSerializer
+    REF v0.65
+    SHA512 fa49c6409b691c8e67fd2bf6ba740367334283bbfe3d984256420da3f9b439b56a04e718844466875b4cc01380d4d3a4ff3f3a6b347d3fd391895551eb8c8f91
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/bitserializer/vcpkg.json b/external_imported/vcpkg/ports/bitserializer/vcpkg.json
index 66fd0993d..e67460c44 100644
--- a/external_imported/vcpkg/ports/bitserializer/vcpkg.json
+++ b/external_imported/vcpkg/ports/bitserializer/vcpkg.json
@@ -1,8 +1,8 @@
 {
   "name": "bitserializer",
-  "version": "0.50",
+  "version": "0.65",
   "description": "C++ 17 library for serialization to JSON, XML, YAML, CSV",
-  "homepage": "https://bitbucket.org/Pavel_Kisliak/bitserializer",
+  "homepage": "https://github.com/PavelKisliak/BitSerializer",
   "license": "MIT",
   "dependencies": [
     {
diff --git a/external_imported/vcpkg/ports/bitsery/portfile.cmake b/external_imported/vcpkg/ports/bitsery/portfile.cmake
index 16fec4c35..8451aa782 100644
--- a/external_imported/vcpkg/ports/bitsery/portfile.cmake
+++ b/external_imported/vcpkg/ports/bitsery/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO fraillt/bitsery
-    REF c0fc083c9de805e5825d7553507569febf6a6f93 # v5.2.2
-    SHA512 a4c8660f6e8dcb5162f6f75e0f1e4716032b8403e9461f42e0628955eb07dc7c17aec9f774f45c2c15cce28a231699a71815d3d6d7d0f34a1367ee1e2d944305
+    REF "v${VERSION}"
+    SHA512 6edaf4d5f22d640df67813f7525c2e076a76911079e25eeb93f4302a835b26d986379d1aad6bdb98f1781af3a5d638ee02ea9c32765741ce91366b518fc4d447
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/bitsery/vcpkg.json b/external_imported/vcpkg/ports/bitsery/vcpkg.json
index 4fad88260..0774267a7 100644
--- a/external_imported/vcpkg/ports/bitsery/vcpkg.json
+++ b/external_imported/vcpkg/ports/bitsery/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "bitsery",
-  "version": "5.2.2",
+  "version": "5.2.3",
   "description": "Header only C++ binary serialization library",
   "homepage": "https://github.com/fraillt/bitsery",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/blake3/CMakeLists.txt b/external_imported/vcpkg/ports/blake3/CMakeLists.txt
deleted file mode 100644
index 1ef6c3893..000000000
--- a/external_imported/vcpkg/ports/blake3/CMakeLists.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-cmake_minimum_required(VERSION 3.19)
-
-project(blake3 LANGUAGES C)
-
-add_library(blake3)
-
-target_sources(blake3 PRIVATE
-    c/blake3.c
-    c/blake3_dispatch.c
-    c/blake3_portable.c
-)
-
-if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
-    target_compile_definitions(blake3 PRIVATE BLAKE3_NO_AVX512=1)
-    target_sources(blake3 PRIVATE
-        c/blake3_avx2.c
-        c/blake3_sse2.c
-        c/blake3_sse41.c
-    )
-    if(NOT MSVC)
-        set_source_files_properties(c/blake3_avx2.c COMPILE_FLAGS -mavx2)
-        set_source_files_properties(c/blake3_sse2.c COMPILE_FLAGS -msse2)
-        set_source_files_properties(c/blake3_sse41.c COMPILE_FLAGS -msse4.1)
-    endif()
-elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
-    if(WIN32 AND MSVC)
-        enable_language(ASM_MASM)
-        target_sources(blake3 PRIVATE
-            c/blake3_avx2_x86-64_windows_msvc.asm
-            c/blake3_sse2_x86-64_windows_msvc.asm
-            c/blake3_sse41_x86-64_windows_msvc.asm
-            c/blake3_avx512_x86-64_windows_msvc.asm
-        )
-    elseif(WIN32 AND NOT MSVC)
-        enable_language(ASM)
-        target_sources(blake3 PRIVATE
-            c/blake3_avx2_x86-64_windows_gnu.S
-            c/blake3_sse2_x86-64_windows_gnu.S
-            c/blake3_sse41_x86-64_windows_gnu.S
-            c/blake3_avx512_x86-64_windows_gnu.S
-        )
-    else()
-        enable_language(ASM)
-        target_sources(blake3 PRIVATE
-            c/blake3_avx2_x86-64_unix.S
-            c/blake3_sse2_x86-64_unix.S
-            c/blake3_sse41_x86-64_unix.S
-            c/blake3_avx512_x86-64_unix.S
-        )        
-    endif()
-else()
-    target_compile_definitions(blake3 PRIVATE BLAKE3_NO_SSE2=1 BLAKE3_NO_SSE41=1 BLAKE3_NO_AVX2=1 BLAKE3_NO_AVX512=1)
-endif()
-
-if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
-    target_compile_definitions(blake3 PRIVATE BLAKE3_USE_NEON=1)
-    target_sources(blake3 PRIVATE
-        c/blake3_neon.c
-    )
-else()
-    target_compile_definitions(blake3 PRIVATE BLAKE3_NO_NEON=1)
-endif()
-
-install(TARGETS blake3)
-install(FILES c/blake3.h DESTINATION include)
diff --git a/external_imported/vcpkg/ports/blake3/fix-windows-arm-build-error.patch b/external_imported/vcpkg/ports/blake3/fix-windows-arm-build-error.patch
new file mode 100644
index 000000000..a1df6c18d
--- /dev/null
+++ b/external_imported/vcpkg/ports/blake3/fix-windows-arm-build-error.patch
@@ -0,0 +1,13 @@
+diff --git a/c/blake3_dispatch.c b/c/blake3_dispatch.c
+index af6c3da..dce85b4 100644
+--- a/c/blake3_dispatch.c
++++ b/c/blake3_dispatch.c
+@@ -31,7 +31,7 @@
+ #define ATOMIC_INT _Atomic int
+ #define ATOMIC_LOAD(x) x
+ #define ATOMIC_STORE(x, y) x = y
+-#elif defined(_MSC_VER)
++#elif defined(IS_X86) and defined(_MSC_VER)
+ #define ATOMIC_INT LONG
+ #define ATOMIC_LOAD(x) InterlockedOr(&x, 0)
+ #define ATOMIC_STORE(x, y) InterlockedExchange(&x, y)
diff --git a/external_imported/vcpkg/ports/blake3/portfile.cmake b/external_imported/vcpkg/ports/blake3/portfile.cmake
index 85d73c206..76cade75e 100644
--- a/external_imported/vcpkg/ports/blake3/portfile.cmake
+++ b/external_imported/vcpkg/ports/blake3/portfile.cmake
@@ -1,20 +1,21 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO BLAKE3-team/BLAKE3
-    REF 1.3.3
-    SHA512 3ea57a86af7357582479ed5d762d368ee52421636c72723b08f528f9bf53637bad0058c5aded0b9a1b9479f374f5d3b110677e00c2b1124a47bfcdac800c2836
+    REF "${VERSION}"
+    SHA512 eb782d48240cf2fa8cc3cddd699dce3a362eb480b3ca58a97d54cd3595a0c969e51fe14374b91136036e8e29c8f745efbd5a4d1aaed2c17f23cb89fb756645d0
     HEAD_REF main
+    PATCHES
+        fix-windows-arm-build-error.patch
 )
 
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
-
 vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
+    SOURCE_PATH "${SOURCE_PATH}/c"
 )
 
 vcpkg_cmake_install()
 
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
+vcpkg_fixup_pkgconfig()
+
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/blake3/vcpkg.json b/external_imported/vcpkg/ports/blake3/vcpkg.json
index 1672cb66c..e46a5b990 100644
--- a/external_imported/vcpkg/ports/blake3/vcpkg.json
+++ b/external_imported/vcpkg/ports/blake3/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "blake3",
-  "version": "1.3.3",
+  "version": "1.5.0",
   "description": "BLAKE3 cryptographic hash function.",
   "homepage": "https://github.com/BLAKE3-team/BLAKE3",
   "license": "CC0-1.0 OR Apache-2.0",
@@ -8,6 +8,10 @@
     {
       "name": "vcpkg-cmake",
       "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/blas/portfile.cmake b/external_imported/vcpkg/ports/blas/portfile.cmake
index 314df6ed0..d92af5c32 100644
--- a/external_imported/vcpkg/ports/blas/portfile.cmake
+++ b/external_imported/vcpkg/ports/blas/portfile.cmake
@@ -1,5 +1,15 @@
 SET(VCPKG_POLICY_EMPTY_PACKAGE enabled)
 
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/blas")
+
 # Make sure BLAS can be found
-vcpkg_cmake_configure(SOURCE_PATH "${CURRENT_PORT_DIR}"
-                      OPTIONS -DCMAKE_PREFIX_PATH="${CURRENT_PACKAGES_DIR}")
+vcpkg_list(SET CMAKE_IGNORE_PATH)
+if(NOT DEFINED ENV{MKLROOT})
+    list(APPEND CMAKE_IGNORE_PATH "${CURRENT_INSTALLED_DIR}/lib/intel64")
+endif()
+vcpkg_cmake_configure(
+    SOURCE_PATH "${CURRENT_PORT_DIR}"
+    OPTIONS
+        "-DCMAKE_PREFIX_PATH=${CURRENT_PACKAGES_DIR}"
+        "-DCMAKE_IGNORE_PATH=${CMAKE_IGNORE_PATH}"
+)
diff --git a/external_imported/vcpkg/ports/blas/vcpkg-cmake-wrapper.cmake b/external_imported/vcpkg/ports/blas/vcpkg-cmake-wrapper.cmake
new file mode 100644
index 000000000..e152e8c87
--- /dev/null
+++ b/external_imported/vcpkg/ports/blas/vcpkg-cmake-wrapper.cmake
@@ -0,0 +1,9 @@
+if(NOT DEFINED ENV{MKLROOT})
+    set(z_vcpkg_blas_ignore_path "${CMAKE_IGNORE_PATH}")
+    list(APPEND CMAKE_IGNORE_PATH "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/intel64")
+endif()
+_find_package(${ARGS})
+if(NOT DEFINED ENV{MKLROOT})
+    set(CMAKE_IGNORE_PATH "${z_vcpkg_blas_ignore_path}")
+    unset(z_vcpkg_blas_ignore_path)
+endif()
diff --git a/external_imported/vcpkg/ports/blas/vcpkg.json b/external_imported/vcpkg/ports/blas/vcpkg.json
index 611cbdc7a..979381198 100644
--- a/external_imported/vcpkg/ports/blas/vcpkg.json
+++ b/external_imported/vcpkg/ports/blas/vcpkg.json
@@ -1,17 +1,13 @@
 {
   "name": "blas",
-  "version-string": "1",
-  "port-version": 2,
+  "version-date": "2023-03-25",
   "description": "Metapackage for packages which provide BLAS",
+  "license": null,
   "dependencies": [
     "openblas",
     {
       "name": "vcpkg-cmake",
       "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/blaze/portfile.cmake b/external_imported/vcpkg/ports/blaze/portfile.cmake
index 8a7954562..c78f91d84 100644
--- a/external_imported/vcpkg/ports/blaze/portfile.cmake
+++ b/external_imported/vcpkg/ports/blaze/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_bitbucket(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO blaze-lib/blaze
-    REF v3.8.1
-    SHA512 6dfd3cb46d796b94cc44a30c4cd5ebfb366d2eb312d75a28787cacb4636df52e4e4e3dce3d9501bf2c07e7fd3621e8ce7f9ffa61a950a4146375b12d75d4872b
+    REF "v${VERSION}"
+    SHA512 9786628159991f547902ceb44a159f0ba84d08be16ccc45bfb9aad3cfbf16eaede4ea43d2d4981d420a8a387a07721b113754f6038a6db2d9c7ed2ea967b5361
     HEAD_REF master
 )
 
@@ -19,4 +19,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH share/blaze/cmake)
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
 
 # Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/blaze/vcpkg.json b/external_imported/vcpkg/ports/blaze/vcpkg.json
index 116078565..5df573d5d 100644
--- a/external_imported/vcpkg/ports/blaze/vcpkg.json
+++ b/external_imported/vcpkg/ports/blaze/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "blaze",
-  "version": "3.8.1",
+  "version": "3.8.2",
   "description": "Blaze is an open-source, high-performance C++ math library for dense and sparse arithmetic.",
   "homepage": "https://bitbucket.org/blaze-lib/blaze",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/blend2d/portfile.cmake b/external_imported/vcpkg/ports/blend2d/portfile.cmake
index 541ef72ff..c859fee8e 100644
--- a/external_imported/vcpkg/ports/blend2d/portfile.cmake
+++ b/external_imported/vcpkg/ports/blend2d/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO blend2d/blend2d
-  REF 7b420376ed32f3979f860d8c3be04128ab5c6690
-  SHA512 88818bfe18b0638b02f84277a4584ddf2cee2158540c1794c3a96c12891274472dc896bef94408baf9ec398e30549c0b3feda58e4b7bf3014a0cf436f394a3ed
+  REF 7f292c15bafd8a7d92791f421cecb2ce84a75da8 # commited on 2023-06-16
+  SHA512 dfd97a27b88bd94753b1404cbe63989186185bb6700b5c65a22b48e14fec7392038e328f30ea71a893c7bbee376f6017b4cdc2bf596259146be601d934c4fbdf
   HEAD_REF master
 )
 
@@ -10,7 +10,6 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BLEND2D_STATIC)
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
   INVERTED_FEATURES
-    futex      BLEND2D_NO_FUTEX
     jit        BLEND2D_NO_JIT
     logging    BLEND2D_NO_JIT_LOGGING
     tls        BLEND2D_NO_TLS
@@ -20,8 +19,8 @@ if(NOT BLEND2D_NO_JIT)
   vcpkg_from_github(
     OUT_SOURCE_PATH ASMJIT_SOURCE_PATH
     REPO asmjit/asmjit
-    REF a9ac13536e08041296010645551b2cdcd615d512
-    SHA512 64e7649208889f0c96890d3904c2f8e716a72b1edf2dfd07af0114565e03681e503c062af8b4fea4ed70122bd7eab2f966038f7b29058f60f6f3f609508422b6
+    REF 3577608cab0bc509f856ebf6e41b2f9d9f71acc4 # commited on 2023-04-28
+    SHA512 36557af5c82ccc8e5ef2d4effe22b75e22c2bf1f4504daae3ff813e907449be6e7b25678af071cb9dede7c6e02dc5c8ad2fc2a3da011aa660eb7f5c75ab23042
     HEAD_REF master
   )
 
@@ -36,6 +35,7 @@ vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         "-DBLEND2D_STATIC=${BLEND2D_STATIC}"
+        "-DBLEND2D_NO_FUTEX=OFF"
         ${FEATURE_OPTIONS}
 )
 
@@ -49,7 +49,7 @@ if(BLEND2D_STATIC)
   file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
 
-file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
 
 if(BLEND2D_STATIC)
   file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage_static.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME usage)
diff --git a/external_imported/vcpkg/ports/blend2d/vcpkg.json b/external_imported/vcpkg/ports/blend2d/vcpkg.json
index 602067bb5..07899cbcb 100644
--- a/external_imported/vcpkg/ports/blend2d/vcpkg.json
+++ b/external_imported/vcpkg/ports/blend2d/vcpkg.json
@@ -1,12 +1,12 @@
 {
   "name": "blend2d",
-  "version-date": "2022-12-31",
-  "port-version": 2,
+  "version-date": "2023-06-16",
+  "port-version": 1,
   "description": "Beta 2D Vector Graphics Powered by a JIT Compiler",
   "homepage": "https://github.com/blend2d/blend2d",
   "documentation": "https://blend2d.com/doc/index.html",
   "license": "Zlib",
-  "supports": "!(arm & windows) & !uwp & !wasm32",
+  "supports": "!uwp & !wasm32",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
@@ -18,23 +18,42 @@
     }
   ],
   "default-features": [
-    "futex",
     "jit",
     "logging",
     "tls"
   ],
   "features": {
-    "futex": {
-      "description": "Default feature. Enables use of futex."
-    },
     "jit": {
-      "description": "Default feature. Enables jit pipeline compilation."
+      "description": "Default feature. Enables jit pipeline compilation.",
+      "dependencies": [
+        {
+          "name": "blend2d",
+          "default-features": false,
+          "platform": "windows"
+        }
+      ]
     },
     "logging": {
-      "description": "Default feature. Enables logging."
+      "description": "Default feature. Enables logging.",
+      "dependencies": [
+        {
+          "name": "blend2d",
+          "default-features": false,
+          "features": [
+            "jit"
+          ]
+        }
+      ]
     },
     "tls": {
-      "description": "Default feature. Enables use of thread_local feature. Disable for platforms where thread local storage is expensive or not supported."
+      "description": "Default feature. Enables use of thread_local feature. Disable for platforms where thread local storage is expensive or not supported.",
+      "dependencies": [
+        {
+          "name": "blend2d",
+          "default-features": false,
+          "platform": "windows"
+        }
+      ]
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/blingfire/ninja.patch b/external_imported/vcpkg/ports/blingfire/ninja.patch
new file mode 100644
index 000000000..ae7e654f3
--- /dev/null
+++ b/external_imported/vcpkg/ports/blingfire/ninja.patch
@@ -0,0 +1,9 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 818a3da..e8b3bed 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -19,3 +19,3 @@ IF (WIN32 AND MSVC)
+   set (CMAKE_CXX_FLAGS " -DNDEBUG")
+-  add_compile_options("/O2" "/W4" "/GS" "/Gy" "/guard:cf" "/Gm-" "/Zc:inline" "/fp:precise" "/GF" "/EHsc" "/ZH:SHA_256")
++  add_compile_options("/W4" "/GS" "/Gy" "/guard:cf" "/Gm-" "/Zc:inline" "/fp:precise" "/GF" "/EHsc" "/ZH:SHA_256")
+   add_compile_options("$<$<CONFIG:Debug>:/Od>")
diff --git a/external_imported/vcpkg/ports/blingfire/portfile.cmake b/external_imported/vcpkg/ports/blingfire/portfile.cmake
new file mode 100644
index 000000000..ed09b83e4
--- /dev/null
+++ b/external_imported/vcpkg/ports/blingfire/portfile.cmake
@@ -0,0 +1,31 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO microsoft/BlingFire
+    REF c0381c68b6aa6d1b4e569888bae1642e40494a99
+    SHA512 0fa15791fc815a992023bae6f30c84dda1d477bcdedcf1343d4dbe4b09b51e17fd87bf130d58e50f378ca94982a6306d7f980e3ff4522091be036428684bdcbb
+    HEAD_REF master
+    PATCHES
+        ninja.patch
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        ${ADDITIONAL_OPTIONS}
+    )
+
+vcpkg_cmake_install()
+
+file(GLOB BINS "${SOURCE_PATH}/nuget/lib/*.bin")
+
+foreach(BIN ${BINS})
+    file(INSTALL "${BIN}" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+endforeach()
+
+vcpkg_copy_pdbs()
+
+# Handle copyright
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/blingfire/vcpkg.json b/external_imported/vcpkg/ports/blingfire/vcpkg.json
new file mode 100644
index 000000000..57e11ede9
--- /dev/null
+++ b/external_imported/vcpkg/ports/blingfire/vcpkg.json
@@ -0,0 +1,14 @@
+{
+  "name": "blingfire",
+  "version": "0.1.8.1",
+  "port-version": 1,
+  "description": "BlingFire is a lightning fast Finite State machine and REgular expression manipulation library.",
+  "license": "MIT",
+  "supports": "windows & !static",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/bloomberg-quantum/portfile.cmake b/external_imported/vcpkg/ports/bloomberg-quantum/portfile.cmake
new file mode 100644
index 000000000..ea943726e
--- /dev/null
+++ b/external_imported/vcpkg/ports/bloomberg-quantum/portfile.cmake
@@ -0,0 +1,22 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO bloomberg/quantum
+    REF f4b872f99480bc7f2ab60620d99823e8f2d3b0d6
+    SHA512 c41930c8bb0a1b70fdd4123ef349a0e8e892e0ecd52b412a171b1ce05386323a9ed2376a792ac12cd69f7d5a97a257bc08c2b85ce8a5f16b6f4e75740823b53b
+    HEAD_REF master
+    PATCHES rename-config-file-and-namespace.patch
+)
+
+set(VCPKG_BUILD_TYPE release) # header-only
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS 
+        -DQUANTUM_EXPORT_PKGCONFIG=OFF
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT} CONFIG_PATH "share/cmake/unofficial-${PORT}")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/bloomberg-quantum/rename-config-file-and-namespace.patch b/external_imported/vcpkg/ports/bloomberg-quantum/rename-config-file-and-namespace.patch
new file mode 100644
index 000000000..b7a5f24d4
--- /dev/null
+++ b/external_imported/vcpkg/ports/bloomberg-quantum/rename-config-file-and-namespace.patch
@@ -0,0 +1,46 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5d22f0f..55d6f65 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -33,8 +33,9 @@ endif()
+ if (NOT QUANTUM_PKGCONFIG_DIR)
+     set(QUANTUM_PKGCONFIG_DIR share/pkgconfig)
+ endif()
++set(PROJECT_NAMESPACE_NAME unofficial-bloomberg-${PROJECT_NAME})
+ if (NOT QUANTUM_CMAKE_CONFIG_DIR)
+-    set(QUANTUM_CMAKE_CONFIG_DIR share/cmake/${PROJECT_NAME})
++    set(QUANTUM_CMAKE_CONFIG_DIR share/cmake/${PROJECT_NAMESPACE_NAME})
+ endif()
+ 
+ #Global options
+diff --git a/cmake/QuantumConfig.cmake.in b/cmake/unofficial-bloomberg-QuantumConfig.cmake.in
+similarity index 100%
+rename from cmake/QuantumConfig.cmake.in
+rename to cmake/unofficial-bloomberg-QuantumConfig.cmake.in
+diff --git a/quantum/CMakeLists.txt b/quantum/CMakeLists.txt
+index 1a721f9..1e93bc4 100644
+--- a/quantum/CMakeLists.txt
++++ b/quantum/CMakeLists.txt
+@@ -21,10 +21,10 @@ make_quantum_header()
+ 
+ set(PKG_DIR             "${CMAKE_BINARY_DIR}/package")
+ set(PKGCONFIG_FILE      "${PKG_DIR}/${PROJECT_TARGET_NAME}.pc")
+-set(TARGET_CONFIG_FILE  "${PKG_DIR}/${PROJECT_NAME}Config.cmake")
+-set(TARGET_VERSION_FILE "${PKG_DIR}/${PROJECT_NAME}ConfigVersion.cmake")
++set(TARGET_CONFIG_FILE  "${PKG_DIR}/${PROJECT_NAMESPACE_NAME}Config.cmake")
++set(TARGET_VERSION_FILE "${PKG_DIR}/${PROJECT_NAMESPACE_NAME}ConfigVersion.cmake")
+ set(TARGET_EXPORT_NAME   ${PROJECT_NAME}Targets)
+-set(NAMESPACE           "${PROJECT_NAME}::")
++set(NAMESPACE           "${PROJECT_NAMESPACE_NAME}::")
+ 
+ add_library(${PROJECT_TARGET_NAME} INTERFACE)
+ set(QUANTUM_DEPENDENCIES Boost::context pthread)
+@@ -70,7 +70,7 @@ if (QUANTUM_EXPORT_CMAKE_CONFIG)
+ 
+     # Generate CMAKE configuration file and exported targets
+     configure_package_config_file(
+-        "${PROJECT_SOURCE_DIR}/cmake/${PROJECT_NAME}Config.cmake.in"
++        "${PROJECT_SOURCE_DIR}/cmake/${PROJECT_NAMESPACE_NAME}Config.cmake.in"
+         "${TARGET_CONFIG_FILE}"
+         INSTALL_DESTINATION "${QUANTUM_CMAKE_CONFIG_DIR}"
+         PATH_VARS CMAKE_INSTALL_PREFIX CMAKE_INSTALL_INCLUDEDIR
diff --git a/external_imported/vcpkg/ports/bloomberg-quantum/vcpkg.json b/external_imported/vcpkg/ports/bloomberg-quantum/vcpkg.json
new file mode 100644
index 000000000..71182a149
--- /dev/null
+++ b/external_imported/vcpkg/ports/bloomberg-quantum/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "bloomberg-quantum",
+  "version-date": "2023-02-03",
+  "description": "Powerful multi-threaded coroutine dispatcher and parallel execution engine",
+  "homepage": "https://github.com/bloomberg/quantum/",
+  "license": "Apache-2.0",
+  "dependencies": [
+    "boost-context",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/blosc/portfile.cmake b/external_imported/vcpkg/ports/blosc/portfile.cmake
index 1ef04dc90..926dc4a63 100644
--- a/external_imported/vcpkg/ports/blosc/portfile.cmake
+++ b/external_imported/vcpkg/ports/blosc/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Blosc/c-blosc
     REF "v${VERSION}"
-    SHA512 e9542aa2d1ebae9f6dcc12916d7ac3b920d771281ab96e2b2d59c2951e5f51d02d2684859b8823643d43d320613fb9dd8a3ea411ade34e66e323fcefa8165a91
+    SHA512 01e6d80e1114d76c4bd1b413778c293d0455879ec38e1e1ec46e8e7eaf2997b47cc2de35bc52cdc4c2c70341b6f87d70626a9a9c24ffc8b7b170d760efa60c07
     HEAD_REF master
     PATCHES
       0001-fix-CMake-config.patch
@@ -45,6 +45,6 @@ find_dependency(Threads)]]
 # cleanup
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 # Handle copyright
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSES/BLOSC.txt")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
 
 vcpkg_fixup_pkgconfig()
diff --git a/external_imported/vcpkg/ports/blosc/vcpkg.json b/external_imported/vcpkg/ports/blosc/vcpkg.json
index 0d500dabc..a6f7af997 100644
--- a/external_imported/vcpkg/ports/blosc/vcpkg.json
+++ b/external_imported/vcpkg/ports/blosc/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "blosc",
-  "version": "1.21.3",
+  "version": "1.21.5",
   "description": "A blocking, shuffling and loss-less compression library that can be faster than `memcpy()`",
   "homepage": "https://github.com/Blosc/c-blosc",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/blpapi/portfile.cmake b/external_imported/vcpkg/ports/blpapi/portfile.cmake
new file mode 100644
index 000000000..ba7122788
--- /dev/null
+++ b/external_imported/vcpkg/ports/blpapi/portfile.cmake
@@ -0,0 +1,60 @@
+# According to Bloomberg Helpdesk on 2023-07-18, the last digit of the version string is just a build identifier,
+# not an actual version identifier, and can be different between the latest Linux and Windows distfiles.
+
+if (VCPKG_TARGET_IS_LINUX)
+    vcpkg_download_distfile(ARCHIVE
+        URLS "https://bcms.bloomberg.com/BLPAPI-Generic/blpapi_cpp_3.20.2.1-linux.tar.gz"
+        FILENAME "blpapi_cpp_3.20.2.1-linux.tar.gz"
+        SHA512 4d4cf999d6cc2bf924dfb79fdabd2a30c2d1251e4e56fe856684c4f8e0be03dcd33f69d75f8706d381bb35ad4b1ad954a5cc88156a80e053f2601d8257815863
+    )
+elseif (VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_download_distfile(ARCHIVE
+        URLS "https://bcms.bloomberg.com/BLPAPI-Generic/blpapi_cpp_3.20.2.2-windows.zip"
+        FILENAME "blpapi_cpp_3.20.2.2-windows.zip"
+        SHA512 f6e66d75a8f16c014737ae813c65304e38423e5ab955eb98fb7f487eecda06bcc9d84733b55957ac577f689da2af753fdeb132feb0eb02a9ec38e8f3868ad795
+    )
+endif()
+
+vcpkg_extract_source_archive(
+    SOURCE_PATH
+    ARCHIVE "${ARCHIVE}"
+    PATCHES update-blpapi-lib-include-dir.patch
+)
+
+if ("${VCPKG_TARGET_ARCHITECTURE}" MATCHES "x86")
+    set(BITS_SUFFIX 32)
+elseif ("${VCPKG_TARGET_ARCHITECTURE}" MATCHES "x64")
+    set(BITS_SUFFIX 64)
+else()
+    message(FATAL_ERROR "Unrecognized architecture.")
+endif()
+
+if (VCPKG_TARGET_IS_LINUX)
+    file(GLOB SO_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/Linux/*${BITS_SUFFIX}.so")
+else()
+    file(GLOB DLL_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/lib/*${BITS_SUFFIX}.dll")
+    file(GLOB LIB_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/lib/*${BITS_SUFFIX}.lib")
+endif()
+
+if (VCPKG_TARGET_IS_LINUX)
+    file(COPY ${SO_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
+    if (NOT VCPKG_BUILD_TYPE)
+        file(COPY ${SO_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
+    endif()
+else()
+    file(COPY ${DLL_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
+    file(COPY ${LIB_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
+    if (NOT VCPKG_BUILD_TYPE)
+        file(COPY ${DLL_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
+        file(COPY ${LIB_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
+    endif()
+endif()
+
+file(COPY "${SOURCE_PATH}/include" DESTINATION "${CURRENT_PACKAGES_DIR}")
+
+file(GLOB CMAKE_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/cmake/*.cmake")
+file(COPY ${CMAKE_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+
+configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY)
+
+file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/external_imported/vcpkg/ports/blpapi/update-blpapi-lib-include-dir.patch b/external_imported/vcpkg/ports/blpapi/update-blpapi-lib-include-dir.patch
new file mode 100644
index 000000000..401d77a13
--- /dev/null
+++ b/external_imported/vcpkg/ports/blpapi/update-blpapi-lib-include-dir.patch
@@ -0,0 +1,46 @@
+diff --git a/cmake/blpapiTargets-release.cmake b/cmake/blpapiTargets-release.cmake
+index 12bcaa6..af5c135 100644
+--- a/cmake/blpapiTargets-release.cmake
++++ b/cmake/blpapiTargets-release.cmake
+@@ -5,21 +5,18 @@
+ # Import targets for configuration "Release".
+ 
+ # Path to blpapi shared object in relation to blpapiConfig.cmake:
+-# 1. On Windows
+-#    a. For release ../lib/
+-# 2. On other platforms
+-#    a. For release ../<SystemName>/. For example for linux it is ../Linux/
++# 1. For release ../../lib/
+ 
+ # Windows
+ if(WIN32)
+   set(_BLPAPI_SHARED_OBJ_NAME "${_BLPAPI_PREFIX}_${_ARCH}.dll")
+   set(_BLPAPI_SHARED_IMP_OBJ_NAME "${_BLPAPI_PREFIX}_${_ARCH}.lib")
+-  set(_BLPAPI_SHARED_OBJ "${_BLPAPI_CONFIG_CMAKE_DIR}/../lib/${_BLPAPI_SHARED_OBJ_NAME}")
+-  set(_BLPAPI_IMP_OBJ "${_BLPAPI_CONFIG_CMAKE_DIR}/../lib/${_BLPAPI_SHARED_IMP_OBJ_NAME}")
++  set(_BLPAPI_SHARED_OBJ "${_BLPAPI_CONFIG_CMAKE_DIR}/../../bin/${_BLPAPI_SHARED_OBJ_NAME}")
++  set(_BLPAPI_IMP_OBJ "${_BLPAPI_CONFIG_CMAKE_DIR}/../../lib/${_BLPAPI_SHARED_IMP_OBJ_NAME}")
+ else() # Other platforms
+   set(_BLPAPI_SHARED_OBJ_NAME "lib${_BLPAPI_PREFIX}_${_ARCH}.so")
+   set(_BLPAPI_SHARED_OBJ
+-      "${_BLPAPI_CONFIG_CMAKE_DIR}/../${CMAKE_SYSTEM_NAME}/${_BLPAPI_SHARED_OBJ_NAME}")
++      "${_BLPAPI_CONFIG_CMAKE_DIR}/../../lib/${_BLPAPI_SHARED_OBJ_NAME}")
+ endif()
+ 
+ set_property(TARGET blpapi APPEND PROPERTY IMPORTED_LOCATION "${_BLPAPI_SHARED_OBJ}")
+diff --git a/cmake/blpapiTargets.cmake b/cmake/blpapiTargets.cmake
+index b4c4a73..ef4421c 100644
+--- a/cmake/blpapiTargets.cmake
++++ b/cmake/blpapiTargets.cmake
+@@ -47,9 +47,9 @@ unset(_expectedTargets)
+ # Create imported shared object target blpapi.
+ add_library(blpapi SHARED IMPORTED)
+ 
+-# Include headers can be found at ../include/ from location
++# Include headers can be found at ../../include/ from location
+ # of blpapiConfig.cmake file.
+-set(_BLPAPI_LIB_INCLUDE_DIR "${_BLPAPI_CONFIG_CMAKE_DIR}/../include")
++set(_BLPAPI_LIB_INCLUDE_DIR "${_BLPAPI_CONFIG_CMAKE_DIR}/../../include")
+ 
+ # Add path to the include directories.
+ set_property(TARGET blpapi APPEND PROPERTY
diff --git a/external_imported/vcpkg/ports/blpapi/usage b/external_imported/vcpkg/ports/blpapi/usage
new file mode 100644
index 000000000..3802d9009
--- /dev/null
+++ b/external_imported/vcpkg/ports/blpapi/usage
@@ -0,0 +1,4 @@
+The package blpapi provides CMake targets:
+
+    find_package(blpapi CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE blpapi)
diff --git a/external_imported/vcpkg/ports/blpapi/vcpkg.json b/external_imported/vcpkg/ports/blpapi/vcpkg.json
new file mode 100644
index 000000000..89fc990e4
--- /dev/null
+++ b/external_imported/vcpkg/ports/blpapi/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "blpapi",
+  "version": "3.20.2",
+  "description": "Bloomberg API Library (BLPAPI)",
+  "homepage": "https://www.bloomberg.com/professional/support/api-library/",
+  "supports": "(linux | (windows & !uwp)) & !static & (x86 | x64)"
+}
diff --git a/external_imported/vcpkg/ports/boinc/CMakeLists.txt b/external_imported/vcpkg/ports/boinc/CMakeLists.txt
index f00a67cdf..c4a111a6c 100644
--- a/external_imported/vcpkg/ports/boinc/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/boinc/CMakeLists.txt
@@ -32,6 +32,7 @@ set(LIBBOINC_HEADERS_APPLE
 set(LIBBOINC_HEADERS_GENERIC
     lib/app_ipc.h
     lib/base64.h
+    lib/boinc_stdio.h
     lib/cal_boinc.h
     lib/cc_config.h
     lib/cert_sig.h
@@ -167,6 +168,12 @@ if(WIN32 OR APPLE)
     set_target_properties(boincapi PROPERTIES IMPORT_PREFIX "lib")
 endif()
 
+# currently this is for MinGW only
+set(build_options "")
+if(HAVE_STRCASECMP)
+    list(APPEND build_options "-DHAVE_STRCASECMP")
+endif()
+
 if(APPLE)
     target_include_directories(boinc PUBLIC
                                 $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/lib/mac>
@@ -182,12 +189,14 @@ elseif(WIN32)
                                 -D_CRT_SECURE_NO_WARNINGS
                                 -DWIN32
                                 -D_CONSOLE
+                                ${build_options}
     )
 
     target_compile_definitions(boincapi PUBLIC
                                 -D_CRT_SECURE_NO_WARNINGS
                                 -DWIN32
                                 -D_CONSOLE
+                                ${build_options}
     )
 
     target_include_directories(boinc PUBLIC
diff --git a/external_imported/vcpkg/ports/boinc/portfile.cmake b/external_imported/vcpkg/ports/boinc/portfile.cmake
index 310146e83..4c41721c2 100644
--- a/external_imported/vcpkg/ports/boinc/portfile.cmake
+++ b/external_imported/vcpkg/ports/boinc/portfile.cmake
@@ -1,10 +1,10 @@
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
+string(REGEX REPLACE "^([0-9]*[.][0-9]*)[.].*" "\\1" MAJOR_MINOR "${VERSION}")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO BOINC/boinc
-    REF client_release/7.22/7.22.0
-    SHA512 f8c87338750605f59f5265fd0bfe2956acfca0c42ef58402df860f0eb9953467ee34286308a916e1d4ee12cbf85c05422558ccdf241ab8f26b86c966f66aec4a
+    REF "client_release/${MAJOR_MINOR}/${VERSION}"
+    SHA512 d66664df49b83fb71e8f06e6f9ca0aee720ec04b1fb95b08426ee9af365403605624ba6dc1f78f3fba3f966d365b610ed24ceffdc54b071509f4f0bf959e027c
     HEAD_REF master
 )
 
@@ -30,13 +30,26 @@ if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_ANDROID)
     endif()
 endif()
 
+set(build_options "")
+if(VCPKG_TARGET_IS_MINGW)
+    list(APPEND build_options "-DHAVE_STRCASECMP=ON")
+endif()
+
 vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
+    OPTIONS
+        ${build_options}
 )
 
 vcpkg_cmake_install()
 
 vcpkg_cmake_config_fixup()
+file(READ "${CURRENT_PACKAGES_DIR}/share/boinc/boinc-config.cmake" BOINC_CONFIG)
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/boinc/boinc-config.cmake" "
+include(CMakeFindDependencyMacro)
+find_dependency(OpenSSL)
+${BOINC_CONFIG}
+")
 
 vcpkg_copy_pdbs()
 
diff --git a/external_imported/vcpkg/ports/boinc/vcpkg.json b/external_imported/vcpkg/ports/boinc/vcpkg.json
index 362a5b6ad..9c51a9040 100644
--- a/external_imported/vcpkg/ports/boinc/vcpkg.json
+++ b/external_imported/vcpkg/ports/boinc/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "boinc",
-  "version": "7.22.0",
+  "version": "7.24.3",
   "description": "Open-source software for volunteer computing and grid computing.",
   "homepage": "https://boinc.berkeley.edu/",
   "license": "LGPL-3.0-or-later",
-  "supports": "!(windows & arm) & !uwp",
+  "supports": "!(windows & arm) & !uwp & !xbox",
   "dependencies": [
     "openssl",
     {
diff --git a/external_imported/vcpkg/ports/bond/portfile.cmake b/external_imported/vcpkg/ports/bond/portfile.cmake
index 5c72c8af4..cadcb3e03 100644
--- a/external_imported/vcpkg/ports/bond/portfile.cmake
+++ b/external_imported/vcpkg/ports/bond/portfile.cmake
@@ -1,21 +1,21 @@
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
-set(BOND_VER 9.0.3)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO microsoft/bond
-    REF  ${BOND_VER}
-    SHA512 3a7884eb00e6d0ab40c688f4a40cb2d3f356c48b38d48a9a08c756047a94b82619ef345483f42c3240732f5da06816b65a61acb83bfebb3c2c6b44099ce71bf9
+    REF  "${VERSION}"
+    SHA512 a5475d3f988928fc3d03b69fc34b33ada35bd790138a0f4a733642558c72945e79c5dcde88b656cbc1cafbc3cb2dd4ba28031e09e507d730056876148ef65014
     HEAD_REF master
-    PATCHES fix-install-path.patch skip-grpc-compilation.patch
+    PATCHES
+        fix-install-path.patch
+        skip-grpc-compilation.patch
 )
 
 if (VCPKG_TARGET_IS_WINDOWS)
     vcpkg_download_distfile(GBC_ARCHIVE
-        URLS "https://github.com/microsoft/bond/releases/download/${BOND_VER}/gbc-${BOND_VER}-amd64.zip"
-        FILENAME "gbc-${BOND_VER}-amd64.zip"
-        SHA512 41a4e01a9a0f6246a3c07f516f2c0cfc8a837eff2166c2bb787877e409d6f55eeb6084e63aabc3502492775a3fa7e381bf37fde0bdfced50a9d0b39dfaca7dfd
+        URLS "https://github.com/microsoft/bond/releases/download/${VERSION}/gbc-${VERSION}-amd64.zip"
+        FILENAME "gbc-${VERSION}-amd64.zip"
+        SHA512 590b051aa47ad161f8a8a5f782e22d2201ad536e0772c9e528f98df1d1fd2b154723d21587d35c8b948805ab229dfb3b515273ae37d05028554fd49b39dc5418
     )
 
     # Clear the generator to prevent it from updating
@@ -24,7 +24,7 @@ if (VCPKG_TARGET_IS_WINDOWS)
     vcpkg_extract_source_archive(extracted_tool_dir ARCHIVE "${GBC_ARCHIVE}" NO_REMOVE_ONE_LEVEL)
     file(RENAME "${extracted_tool_dir}" "${CURRENT_BUILDTREES_DIR}/tools")
 
-    set(FETCHED_GBC_PATH "${CURRENT_BUILDTREES_DIR}/tools/gbc-${BOND_VER}-amd64.exe")
+    set(FETCHED_GBC_PATH "${CURRENT_BUILDTREES_DIR}/tools/gbc-${VERSION}-amd64.exe")
     if(NOT EXISTS "${FETCHED_GBC_PATH}")
         message(FATAL_ERROR "Fetching GBC failed. Expected '${FETCHED_GBC_PATH}' to exist, but it doesn't.")
     endif()
@@ -33,7 +33,6 @@ else()
     # The build needs a version of the Haskel Tool stack that is newer than some distros ship with.
     # For this reason the message is not guarded by checking to see if the tool is installed.
     message("\nA recent version of Haskell Tool Stack is required to build.\n  For information on how to install see https://docs.haskellstack.org/en/stable/README/\n")
-
 endif()
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -41,6 +40,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
         bond-over-grpc BOND_ENABLE_GRPC
 )
 
+set(ENV{STACK_ROOT} "${CURRENT_BUILDTREES_DIR}/stack")
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE
@@ -48,8 +49,8 @@ vcpkg_cmake_configure(
         -DBOND_LIBRARIES_ONLY=TRUE
         -DBOND_GBC_PATH=${FETCHED_GBC_PATH}
         -DBOND_SKIP_GBC_TESTS=TRUE
-        -DBOND_ENABLE_COMM=FALSE
         -DBOND_FIND_RAPIDJSON=TRUE
+        -DBOND_SKIP_CORE_TESTS=TRUE
         -DBOND_STACK_OPTIONS=--allow-different-user
         ${FEATURE_OPTIONS}
 )
@@ -71,4 +72,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 # Put the license file where vcpkg expects it
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/bond/skip-grpc-compilation.patch b/external_imported/vcpkg/ports/bond/skip-grpc-compilation.patch
index 10906b131..eb45faba4 100644
--- a/external_imported/vcpkg/ports/bond/skip-grpc-compilation.patch
+++ b/external_imported/vcpkg/ports/bond/skip-grpc-compilation.patch
@@ -1,11 +1,15 @@
 diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
-index f8c7bf3..e69de29 100644
+index 8c1f368..8b13789 100644
 --- a/thirdparty/CMakeLists.txt
 +++ b/thirdparty/CMakeLists.txt
-@@ -1,6 +0,0 @@
+@@ -1,10 +1 @@
 -include (Compiler)
--
+ 
 -if (BOND_ENABLE_GRPC)
--    cxx_add_compile_options (Clang -Wno-unused-value)
--    add_subdirectory(grpc)
--endif()
+-    if (BOND_FIND_GRPC)
+-        find_package(grpc CONFIG REQUIRED)
+-    else ()
+-        cxx_add_compile_options(Clang -Wno-unused-value)
+-        add_subdirectory(grpc)
+-    endif ()
+-endif ()
diff --git a/external_imported/vcpkg/ports/bond/vcpkg.json b/external_imported/vcpkg/ports/bond/vcpkg.json
index 8abedfb47..93b2647d2 100644
--- a/external_imported/vcpkg/ports/bond/vcpkg.json
+++ b/external_imported/vcpkg/ports/bond/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "bond",
-  "version": "9.0.3",
-  "port-version": 3,
+  "version": "10.0.0",
+  "port-version": 2,
   "description": "Bond is a cross-platform framework for working with schematized data. It supports cross-language de/serialization and powerful generic mechanisms for efficiently manipulating data. Bond is broadly used at Microsoft in high scale services.",
   "homepage": "https://github.com/Microsoft/bond",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/boost-accumulators/portfile.cmake b/external_imported/vcpkg/ports/boost-accumulators/portfile.cmake
index 4b55468ae..7b6490714 100644
--- a/external_imported/vcpkg/ports/boost-accumulators/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-accumulators/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/accumulators
-    REF boost-1.81.0
-    SHA512 960095a14ea202e938132bfdc0e6cf95fa4849b6f81066174ef957d3ca35637e6e52eeb830a164c5b181c33e6b308ae74eece2b2d5ec49fe7f2309f0ddef144a
+    REF boost-${VERSION}
+    SHA512 169d7454bb961ac801db88e0437879ec5aabc8875d5526cb306e56cfb5f4b6dd2e95e5f8815b4c30aeb44ffd2db9c70e12e19b79ccad0f2379775220e941f5b7
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-accumulators/vcpkg.json b/external_imported/vcpkg/ports/boost-accumulators/vcpkg.json
index 059343d2b..dca711571 100644
--- a/external_imported/vcpkg/ports/boost-accumulators/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-accumulators/vcpkg.json
@@ -1,95 +1,94 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-accumulators",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost accumulators module",
   "homepage": "https://github.com/boostorg/accumulators",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-array",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-circular-buffer",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-concept-check",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-fusion",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-iterator",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-numeric-conversion",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-parameter",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-range",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-serialization",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-tuple",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-typeof",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-ublas",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-algorithm/portfile.cmake b/external_imported/vcpkg/ports/boost-algorithm/portfile.cmake
index f907c79fe..00a423141 100644
--- a/external_imported/vcpkg/ports/boost-algorithm/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-algorithm/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/algorithm
-    REF boost-1.81.0
-    SHA512 f46a57798924682e053fcb21f136811963c36798db6dc2a9e6f594e95c77d4645406f5b20b0cadb0dcf28987fad7b62587ec5a82994cd5637d4daec49f2352d3
+    REF boost-${VERSION}
+    SHA512 d7614816293080982df97725e4994aadf62c0215336b74297d9143cae27d253e666256e0a0759bb2b563396d6cc205fbb6bcc54db383add612efdff2168b4b53
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-algorithm/vcpkg.json b/external_imported/vcpkg/ports/boost-algorithm/vcpkg.json
index c2fdf77a0..983aaa0fd 100644
--- a/external_imported/vcpkg/ports/boost-algorithm/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-algorithm/vcpkg.json
@@ -1,83 +1,82 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-algorithm",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost algorithm module",
   "homepage": "https://github.com/boostorg/algorithm",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-array",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-bind",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-concept-check",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-function",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-iterator",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-range",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-regex",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-tuple",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-unordered",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-align/portfile.cmake b/external_imported/vcpkg/ports/boost-align/portfile.cmake
index f0e4758a5..f328c03bd 100644
--- a/external_imported/vcpkg/ports/boost-align/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-align/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/align
-    REF boost-1.81.0
-    SHA512 5d13df60dc85e6a0e8c03e1939044e63169d7a963ccfe74e20d6bbfbd3f52a41b43544ea8a9e730c0412061087a5ad7b7742707c0c0f98990cab78abceaff7d0
+    REF boost-${VERSION}
+    SHA512 53774a2411f856112845469ce89a4b34bee6e7d13796764d1e6d397526747e4a7c798abd755f2eed5a48fe3c792e7bc8e0cc2418e8c6ee7f992fa98d73fc86c6
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-align/vcpkg.json b/external_imported/vcpkg/ports/boost-align/vcpkg.json
index 87508e608..c0594abc9 100644
--- a/external_imported/vcpkg/ports/boost-align/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-align/vcpkg.json
@@ -1,31 +1,30 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-align",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost align module",
   "homepage": "https://github.com/boostorg/align",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-any/portfile.cmake b/external_imported/vcpkg/ports/boost-any/portfile.cmake
index 79af202aa..60ddbd274 100644
--- a/external_imported/vcpkg/ports/boost-any/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-any/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/any
-    REF boost-1.81.0
-    SHA512 9ab99e2cf74f895a41b1efe637ba68f1afac2190a45aab67a9de10d919875e95b90851c2ddb3458b5fdab73da1adee3a58d5fd630080c3ec2c7639daabede42e
+    REF boost-${VERSION}
+    SHA512 0adfb10eeeffe9c479d2dfa2663828530b00191bec64c8b8d3adeff20220b0789078981bf4a3bf7e0808a44f61bafc9f3f1f488a316954008835a9205042f356
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-any/vcpkg.json b/external_imported/vcpkg/ports/boost-any/vcpkg.json
index ee19b4d2f..bc52cf0bd 100644
--- a/external_imported/vcpkg/ports/boost-any/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-any/vcpkg.json
@@ -1,43 +1,30 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-any",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost any module",
   "homepage": "https://github.com/boostorg/any",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-core",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-index",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-array/portfile.cmake b/external_imported/vcpkg/ports/boost-array/portfile.cmake
index 87e1f4a5d..99e327099 100644
--- a/external_imported/vcpkg/ports/boost-array/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-array/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/array
-    REF boost-1.81.0
-    SHA512 1ed3ede8b8d7bb4921c11c26ac20588054e9bc21d59900eb713057227753343bc07c7fd8f6b62b6695b10a421528eccc68539a74d78a2402ec4656a25937e39d
+    REF boost-${VERSION}
+    SHA512 ddc4f259b1ce6e2b856978fc7474811cbf5c1b7a808ff16c411bb5f873dac80e27b67119e2e8f1cbe05da314a04f8a57d46113b6b86598a7ff378955feb7b79b
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-array/vcpkg.json b/external_imported/vcpkg/ports/boost-array/vcpkg.json
index 2072dccc0..bc52c1fab 100644
--- a/external_imported/vcpkg/ports/boost-array/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-array/vcpkg.json
@@ -1,35 +1,34 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-array",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost array module",
   "homepage": "https://github.com/boostorg/array",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-asio/portfile.cmake b/external_imported/vcpkg/ports/boost-asio/portfile.cmake
index 0e59f1067..c6bc0aa5b 100644
--- a/external_imported/vcpkg/ports/boost-asio/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-asio/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/asio
-    REF boost-1.81.0
-    SHA512 98fb62fb97a00cc133417cfc2e1e69f7c62042265770c956345c58294ba148df1900709a0fa3768ad4849d472ab7be6133ef473a8b08db866cd7f96623e4bc1d
+    REF boost-${VERSION}
+    SHA512 88d1d8d1bbea29149d9747ab9ccb99a7bfbd928f8ed1aff90adb6382fcefd32dc9687e6832f8ac21ddf918f0608623aa123d7943aa5f697a6b946fe2311e05f6
     HEAD_REF master
     PATCHES windows_alloca_header.patch
 )
diff --git a/external_imported/vcpkg/ports/boost-asio/vcpkg.json b/external_imported/vcpkg/ports/boost-asio/vcpkg.json
index 46d674f6f..aec544c4e 100644
--- a/external_imported/vcpkg/ports/boost-asio/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-asio/vcpkg.json
@@ -1,89 +1,48 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-asio",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost asio module",
   "homepage": "https://github.com/boostorg/asio",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-align",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-array",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-bind",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-chrono",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-context",
       "platform": "!uwp & !emscripten",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-coroutine",
       "platform": "!(arm & windows) & !uwp & !emscripten",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-date-time",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-exception",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-function",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-regex",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-smart-ptr",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-system",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-utility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ],
   "features": {
diff --git a/external_imported/vcpkg/ports/boost-assert/portfile.cmake b/external_imported/vcpkg/ports/boost-assert/portfile.cmake
index 7b32b4179..61178b2da 100644
--- a/external_imported/vcpkg/ports/boost-assert/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-assert/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/assert
-    REF boost-1.81.0
-    SHA512 c443b61a9ad29d4c9707aaaa997300a959fdef2d360aec9ee221abc12cd8446b3bc969e6c282ba778bee7d6fb54cc02655f15e01eacf1ad87262534dc4cc32bf
+    REF boost-${VERSION}
+    SHA512 c59712acce3079efa95899f6c384b3a72868626106c0f1cf780fc527ab6e4156e4c3bef0112aa0d4e91d98428d5f1abe86a56de59689f01c9146beb3cc18f136
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-assert/vcpkg.json b/external_imported/vcpkg/ports/boost-assert/vcpkg.json
index 1e96cf003..15f9b3bc1 100644
--- a/external_imported/vcpkg/ports/boost-assert/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-assert/vcpkg.json
@@ -1,19 +1,18 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-assert",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost assert module",
   "homepage": "https://github.com/boostorg/assert",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-assign/portfile.cmake b/external_imported/vcpkg/ports/boost-assign/portfile.cmake
index b04b6bbf7..55d0ce710 100644
--- a/external_imported/vcpkg/ports/boost-assign/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-assign/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/assign
-    REF boost-1.81.0
-    SHA512 13f3c7d6a14f0698f156c024f58ccaf00e1fceb5c2497c5883bc2ee7396d6d7c2e67b6436bf3d6fba9fad254106ade61a6a1a867c6220f0baa0c5c917151c14c
+    REF boost-${VERSION}
+    SHA512 e6887a3000b356b3c343d4a14c63757870493c264eff22a2c00f3c8c3dec30891dec336dce6121497e97146e5ece404f7dc2088715bf9fc7704b3d4aae44c598
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-assign/vcpkg.json b/external_imported/vcpkg/ports/boost-assign/vcpkg.json
index f422e8fae..506a54c98 100644
--- a/external_imported/vcpkg/ports/boost-assign/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-assign/vcpkg.json
@@ -1,59 +1,58 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-assign",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost assign module",
   "homepage": "https://github.com/boostorg/assign",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-array",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-move",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-ptr-container",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-range",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-tuple",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-atomic/portfile.cmake b/external_imported/vcpkg/ports/boost-atomic/portfile.cmake
index 05c32d334..4ada01700 100644
--- a/external_imported/vcpkg/ports/boost-atomic/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-atomic/portfile.cmake
@@ -3,17 +3,19 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/atomic
-    REF boost-1.81.0
-    SHA512 2a581e1cea33016f84d47d51a51d8bff91a7e2ba57f5acde4ffa5b95fcc6b73da4e276ca0616c43282ee11a21c9bdb715c10b09204a59f885d00965de6092efe
+    REF boost-${VERSION}
+    SHA512 1d1a484a070d25724f084287e321a56a191373bf5387158a0e055d870056d0ad04d37596008c19a52469d823a7c4721fb682fc1870e583effa5061cea6571097
     HEAD_REF master
 )
 
-vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2"
-    "project.load [ path.join [ path.make $(here:D) ] ../../config/checks/architecture ]"
-    "project.load [ path.join [ path.make $(here:D) ] ../config/checks/architecture ]"
-)
+file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents)
+string(REPLACE "import config : requires" "import ../config/checks/config : requires" _contents "${_contents}")
+string(REPLACE "project.load [ path.join [ path.make $(here:D) ] ../../config/checks/architecture ]" "project.load [ path.join [ path.make $(here:D) ] ../config/checks/architecture ]" _contents "${_contents}")
+file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}")
 file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config")
 include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
 boost_modular_build(SOURCE_PATH ${SOURCE_PATH})
 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
+# has_synchronization_lib.cpp is used in boost-modular-build-helper/Jamroot.jam.in
+file(COPY "${SOURCE_PATH}/config/has_synchronization_lib.cpp" DESTINATION "${CURRENT_PACKAGES_DIR}/share/boost-atomic")
diff --git a/external_imported/vcpkg/ports/boost-atomic/vcpkg.json b/external_imported/vcpkg/ports/boost-atomic/vcpkg.json
index d68dbcfd5..4d0dbc011 100644
--- a/external_imported/vcpkg/ports/boost-atomic/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-atomic/vcpkg.json
@@ -1,57 +1,52 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-atomic",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost atomic module",
   "homepage": "https://github.com/boostorg/atomic",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-align",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-build",
       "host": true,
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-modular-build-helper",
       "host": true,
-      "version>=": "1.81.0#4"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-predef",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-winapi",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/boost-beast/portfile.cmake b/external_imported/vcpkg/ports/boost-beast/portfile.cmake
index f10c1ec2a..6f6de86da 100644
--- a/external_imported/vcpkg/ports/boost-beast/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-beast/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/beast
-    REF boost-1.81.0
-    SHA512 bf5d34274c3252daf2b319d0419588dfe9adff88acaf7afdbfcfdf0ecc59fd15c985c3f048dbaec65004b460a58adc9ab747f90b9620bb6c0ddc46157909aec0
+    REF boost-${VERSION}
+    SHA512 9f42d458106b82738b3b9acde718b9c3cda41f4270d364b2e2b0d2a71945ce81c41816a125168edef4e897dd688c3962511ce83f437b8cb2dacff5c4aaaa85e7
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-beast/vcpkg.json b/external_imported/vcpkg/ports/boost-beast/vcpkg.json
index f825abeea..f02185e2c 100644
--- a/external_imported/vcpkg/ports/boost-beast/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-beast/vcpkg.json
@@ -1,8 +1,7 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-beast",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost beast module",
   "homepage": "https://github.com/boostorg/beast",
   "license": "BSL-1.0",
@@ -10,91 +9,91 @@
   "dependencies": [
     {
       "name": "boost-asio",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-bind",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-container",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-container-hash",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-endian",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-intrusive",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-logic",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mp11",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-optional",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-smart-ptr",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-string",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-system",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-index",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-winapi",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-bimap/portfile.cmake b/external_imported/vcpkg/ports/boost-bimap/portfile.cmake
index 6561b3df6..4ef814d29 100644
--- a/external_imported/vcpkg/ports/boost-bimap/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-bimap/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/bimap
-    REF boost-1.81.0
-    SHA512 8b0d7a5630db6ad79c0f4e9399ac4e18eac8ba45f4a829cedae6227795a407885689bdcf3c09336069e8d4c7468546c6ddc74bba4c58bb76b62815093abba13f
+    REF boost-${VERSION}
+    SHA512 967e150589746762ce0816c208166b62956a0c44a896194610cb3d8a947310b6b814d6ef8ef190540fb36c9ab9664748e166fade5e11df32f7862c378677b402
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-bimap/vcpkg.json b/external_imported/vcpkg/ports/boost-bimap/vcpkg.json
index 4d1d32e83..be1e5fbef 100644
--- a/external_imported/vcpkg/ports/boost-bimap/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-bimap/vcpkg.json
@@ -1,71 +1,66 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-bimap",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost bimap module",
   "homepage": "https://github.com/boostorg/bimap",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-concept-check",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-container-hash",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-iterator",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-lambda",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-multi-index",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-serialization",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-utility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-bind/portfile.cmake b/external_imported/vcpkg/ports/boost-bind/portfile.cmake
index 1895005fd..9e7e8927f 100644
--- a/external_imported/vcpkg/ports/boost-bind/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-bind/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/bind
-    REF boost-1.81.0
-    SHA512 360c6723b51ff22cad80042d54a687d661cd0c0312efce3fe3a65194ea75bbb6576e3cfe6b93f6046d4102fd48c5cffc9bb1514cc7f9b044baf171a1be68b5dd
+    REF boost-${VERSION}
+    SHA512 3cec732e7de8c6a7a3f752d3c25a2d3411d522995880e4014a188b8bc2767f87e12801862362ce6c6618ebb65d17b6611afdf2b25f2b87c09aab4191d0f71ba6
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-bind/vcpkg.json b/external_imported/vcpkg/ports/boost-bind/vcpkg.json
index 2fc883d23..460c0858c 100644
--- a/external_imported/vcpkg/ports/boost-bind/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-bind/vcpkg.json
@@ -1,23 +1,22 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-bind",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost bind module",
   "homepage": "https://github.com/boostorg/bind",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-build/0004-workaround-MSVC-codegen-bug-in-17.5-on-ARM64.patch b/external_imported/vcpkg/ports/boost-build/0004-workaround-MSVC-codegen-bug-in-17.5-on-ARM64.patch
new file mode 100644
index 000000000..3e1aa6dfe
--- /dev/null
+++ b/external_imported/vcpkg/ports/boost-build/0004-workaround-MSVC-codegen-bug-in-17.5-on-ARM64.patch
@@ -0,0 +1,26 @@
+From 1004fb82914b8295fe4ec43afb510994babf2161 Mon Sep 17 00:00:00 2001
+From: Matt Gardner <magardn@microsoft.com>
+Date: Fri, 17 Mar 2023 15:09:17 -0700
+Subject: [PATCH] workaround MSVC codegen bug in 17.5 on ARM64
+
+---
+ src/engine/glob.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/engine/glob.cpp b/src/engine/glob.cpp
+index bec00ee56..1ce66c7e6 100644
+--- a/src/engine/glob.cpp
++++ b/src/engine/glob.cpp
+@@ -111,6 +111,9 @@ int glob( const char * c, const char * s )
+  * globchars() - build a bitlist to check for character group match.
+  */
+ 
++#if defined(_MSC_VER) && _MSC_VER == 1935 && defined(_M_ARM64)
++__declspec(noinline)
++#endif
+ static void globchars( const char * s,  const char * e, char * b )
+ {
+     int neg = 0;
+-- 
+2.33.0.vfs.0.0
+
diff --git a/external_imported/vcpkg/ports/boost-build/portfile.cmake b/external_imported/vcpkg/ports/boost-build/portfile.cmake
index 2abfad2c7..9aac91187 100644
--- a/external_imported/vcpkg/ports/boost-build/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-build/portfile.cmake
@@ -4,17 +4,18 @@ if(CMAKE_HOST_WIN32 AND VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME
     return()
 endif()
 
-set(BOOST_VERSION 1.81.0)
+set(BOOST_VERSION ${VERSION})
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/build
-    REF boost-${BOOST_VERSION}
-    SHA512 ecd7f3d48200939cfea57ca85a41b5d700d4c934131298aa86840104bc4c35d0366673608dc70c9c62c275b573a9a5a1e4568399f41f3564f8816a295c27d4fc
+    REF boost-${VERSION}
+    SHA512 61540a3b2b7b6167ed8286daed4b4fde515ae9e0de81d17ef688d7972a0a6325b15afbe4e9a73ec883a81d5b86998d612cadbdc79abaf1b087a74e4e6b7cc2b5
     HEAD_REF master
     PATCHES
         0002-fix-get-version.patch
         0003-fix-emscripten.patch
+        0004-workaround-MSVC-codegen-bug-in-17.5-on-ARM64.patch
 )
 
 vcpkg_download_distfile(ARCHIVE
@@ -26,7 +27,7 @@ vcpkg_download_distfile(ARCHIVE
 vcpkg_download_distfile(BOOSTCPP_ARCHIVE
     URLS "https://raw.githubusercontent.com/boostorg/boost/boost-${BOOST_VERSION}/boostcpp.jam"
     FILENAME "boost-${BOOST_VERSION}-boostcpp.jam"
-    SHA512 0daa0dd315f7e426e7b9ada9cc4dad03da2eb257456e551de3fb3b2a8244f0117ed41d9d1ff77b5a3eee7a3c5fb466d345b9bb2af46004fc630209043d4862e3
+    SHA512 32feae4e13418f68702b18964b17e706255429dd881a098355a0b644da11a97c42aa7eeffa5cc4e30aa8a370dde2097aecc62175fb37cd5cf9766e7fc6303da7
 )
 
 # https://github.com/boostorg/boost/pull/206
diff --git a/external_imported/vcpkg/ports/boost-build/vcpkg.json b/external_imported/vcpkg/ports/boost-build/vcpkg.json
index 8fbd0dfc6..e4baa4681 100644
--- a/external_imported/vcpkg/ports/boost-build/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-build/vcpkg.json
@@ -1,15 +1,14 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-build",
-  "version": "1.81.0",
-  "port-version": 3,
+  "version": "1.84.0",
   "description": "Boost.Build",
   "homepage": "https://github.com/boostorg/build",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-uninstall",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-callable-traits/portfile.cmake b/external_imported/vcpkg/ports/boost-callable-traits/portfile.cmake
index 161788184..e3b4bc1d0 100644
--- a/external_imported/vcpkg/ports/boost-callable-traits/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-callable-traits/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/callable_traits
-    REF boost-1.81.0
-    SHA512 51fd9e84ed411d9a567ca117339f50de3dea13f8cf8e4d39a0ee26ad6fcf10ba922b9d233ba0f3eb0a80a1943fa8316303ae363cea57688d232cc67a07dc17a5
+    REF boost-${VERSION}
+    SHA512 02f292919eaa6fbb3dbdc3a169cf4945777d96624d40084a3ef145a379de37058d9f125f6e60ac99e1154babac9bf596a68119d9e88d47311d5eba68e2a13cb8
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-callable-traits/vcpkg.json b/external_imported/vcpkg/ports/boost-callable-traits/vcpkg.json
index 3d29b3c1c..02863e6b6 100644
--- a/external_imported/vcpkg/ports/boost-callable-traits/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-callable-traits/vcpkg.json
@@ -1,15 +1,18 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-callable-traits",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost callable_traits module",
   "homepage": "https://github.com/boostorg/callable_traits",
   "license": "BSL-1.0",
   "dependencies": [
+    {
+      "name": "boost-config",
+      "version>=": "1.84.0"
+    },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-chrono/portfile.cmake b/external_imported/vcpkg/ports/boost-chrono/portfile.cmake
index c39c376ee..16b13d114 100644
--- a/external_imported/vcpkg/ports/boost-chrono/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-chrono/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/chrono
-    REF boost-1.81.0
-    SHA512 0f8b217c49eed596e5757146e677783073b80d01d293ab8ab8ef929ee9c91a51c16a97dc51e3e064f1e21b217ffc73b12554a9de2cb77fb8ddb8fa4689d6466b
+    REF boost-${VERSION}
+    SHA512 4fbd3b85fa63ee904e1134d35b676941f22e77d2d2d8b2a55527c27ce6187e45fefebe2327129850f374ccd37ec0a66e8323187e1bd616f6c73623e98076c027
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-chrono/vcpkg.json b/external_imported/vcpkg/ports/boost-chrono/vcpkg.json
index bb9f68c63..68aafcabe 100644
--- a/external_imported/vcpkg/ports/boost-chrono/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-chrono/vcpkg.json
@@ -1,85 +1,84 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-chrono",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost chrono module",
   "homepage": "https://github.com/boostorg/chrono",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-build",
       "host": true,
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-integer",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-modular-build-helper",
       "host": true,
-      "version>=": "1.81.0#4"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-move",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-predef",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-ratio",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-system",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-typeof",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-utility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-winapi",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/boost-circular-buffer/portfile.cmake b/external_imported/vcpkg/ports/boost-circular-buffer/portfile.cmake
index f9c683808..4291f3570 100644
--- a/external_imported/vcpkg/ports/boost-circular-buffer/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-circular-buffer/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/circular_buffer
-    REF boost-1.81.0
-    SHA512 371393bccb266bde50452096adcf15052aedec6d9223ee7ab7be9ceb196a0633ddadd4abbf99d4be85862ca94df1ebd94cd6bcd9fdabc3e05f7aecc015ece5cf
+    REF boost-${VERSION}
+    SHA512 e945cb9d701b23043fdd6ceaede292e2605f3ae7b9038e79e95eddf69fe781f4efcea67877f041db1eb8fe95f4bcf4ca34f845e90e5307c72ce811f68d649b6b
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-circular-buffer/vcpkg.json b/external_imported/vcpkg/ports/boost-circular-buffer/vcpkg.json
index 6e123fd77..bf6251b74 100644
--- a/external_imported/vcpkg/ports/boost-circular-buffer/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-circular-buffer/vcpkg.json
@@ -1,47 +1,46 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-circular-buffer",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost circular_buffer module",
   "homepage": "https://github.com/boostorg/circular_buffer",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-concept-check",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-move",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-cobalt/b2-options.cmake b/external_imported/vcpkg/ports/boost-cobalt/b2-options.cmake
new file mode 100644
index 000000000..aa8ba1c33
--- /dev/null
+++ b/external_imported/vcpkg/ports/boost-cobalt/b2-options.cmake
@@ -0,0 +1,24 @@
+list(APPEND B2_OPTIONS cxxstd=20)
+
+set(unsupported_compiler FALSE)
+
+if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
+  if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_VERSION VERSION_LESS "14")
+    set(unsupported_compiler TRUE)
+  endif()
+  if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_VERSION VERSION_LESS "16")
+    list(APPEND B2_OPTIONS "boost.cobalt.pmr=boost-container")
+  endif()
+elseif(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+  if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_VERSION VERSION_LESS "10")
+    set(unsupported_compiler TRUE)
+  endif()
+elseif(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+  if (VCPKG_DETECTED_MSVC_VERSION LESS "1930")
+    set(unsupported_compiler TRUE)
+  endif()
+endif()
+
+if(unsupported_compiler)
+  message(FATAL_ERROR "Boost.Cobalt is supported since Clang 14, GCC 10 and MSVC 19.30 (Visual Studio 2022). Detected compiler is ${VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID} ${VCPKG_DETECTED_MSVC_VERSION}.")
+endif()
diff --git a/external_imported/vcpkg/ports/boost-cobalt/portfile.cmake b/external_imported/vcpkg/ports/boost-cobalt/portfile.cmake
new file mode 100644
index 000000000..08b66764c
--- /dev/null
+++ b/external_imported/vcpkg/ports/boost-cobalt/portfile.cmake
@@ -0,0 +1,22 @@
+# Automatically generated by scripts/boost/generate-ports.ps1
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO boostorg/cobalt
+    REF boost-${VERSION}
+    SHA512 167e1d48eefe2517b9cd3796602798cb3d8d14655e30cb175b468f667fb8ae132aba508fc96987c4518d0a364aa9b70461d368c56b62d18fcd0f923cd6525e7f
+    HEAD_REF master
+)
+
+vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile"
+    "import ../../config/checks/config"
+    "import ../config/checks/config"
+)
+file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config")
+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
+boost_modular_build(
+    SOURCE_PATH ${SOURCE_PATH}
+    BOOST_CMAKE_FRAGMENT "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake"
+)
+include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
+boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
diff --git a/external_imported/vcpkg/ports/boost-cobalt/vcpkg.json b/external_imported/vcpkg/ports/boost-cobalt/vcpkg.json
new file mode 100644
index 000000000..760e90fa5
--- /dev/null
+++ b/external_imported/vcpkg/ports/boost-cobalt/vcpkg.json
@@ -0,0 +1,81 @@
+{
+  "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
+  "name": "boost-cobalt",
+  "version": "1.84.0",
+  "description": "Boost cobalt module",
+  "homepage": "https://github.com/boostorg/cobalt",
+  "license": "BSL-1.0",
+  "supports": "!osx & !ios & !android",
+  "dependencies": [
+    {
+      "name": "boost-asio",
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-build",
+      "host": true,
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-circular-buffer",
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-config",
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-container",
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-core",
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-intrusive",
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-leaf",
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-modular-build-helper",
+      "host": true,
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-mp11",
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-preprocessor",
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-smart-ptr",
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-system",
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-throw-exception",
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-variant2",
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-vcpkg-helpers",
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/boost-compat/portfile.cmake b/external_imported/vcpkg/ports/boost-compat/portfile.cmake
new file mode 100644
index 000000000..f094c06aa
--- /dev/null
+++ b/external_imported/vcpkg/ports/boost-compat/portfile.cmake
@@ -0,0 +1,12 @@
+# Automatically generated by scripts/boost/generate-ports.ps1
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO boostorg/compat
+    REF boost-${VERSION}
+    SHA512 91d7a270f757af20c45197a2ee016e864ad2d3e7834ac4fa876b84028bf5b9ca4474b2a74ca73d8abc3f12561918f9af3c340bcdbe10cb1ff7b05706ca62b46f
+    HEAD_REF master
+)
+
+include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
+boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
diff --git a/external_imported/vcpkg/ports/boost-compat/vcpkg.json b/external_imported/vcpkg/ports/boost-compat/vcpkg.json
new file mode 100644
index 000000000..6213189c2
--- /dev/null
+++ b/external_imported/vcpkg/ports/boost-compat/vcpkg.json
@@ -0,0 +1,26 @@
+{
+  "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
+  "name": "boost-compat",
+  "version": "1.84.0",
+  "description": "Boost compat module",
+  "homepage": "https://github.com/boostorg/compat",
+  "license": "BSL-1.0",
+  "dependencies": [
+    {
+      "name": "boost-assert",
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-config",
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-throw-exception",
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-vcpkg-helpers",
+      "version>=": "1.84.0"
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/boost-compatibility/portfile.cmake b/external_imported/vcpkg/ports/boost-compatibility/portfile.cmake
index d238a2ab2..e8688abc3 100644
--- a/external_imported/vcpkg/ports/boost-compatibility/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-compatibility/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/compatibility
-    REF boost-1.81.0
-    SHA512 8931256236336c07c029d39a1599ef524444b0870140fcabdcee3c3106c7ecf92cf32a2bfb442244bbc8078c783ca552a74fe5243c1644fb3e210e9f5f2836f1
+    REF boost-${VERSION}
+    SHA512 a8921d7c708c064091caaadcb6607af08cabdad2f348703c5ce82ea17471bfef639822f8607667e84cc8dd46940e5ce08b0217773899f869ca9070df05d16e18
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-compatibility/vcpkg.json b/external_imported/vcpkg/ports/boost-compatibility/vcpkg.json
index fe50275b8..c1999f908 100644
--- a/external_imported/vcpkg/ports/boost-compatibility/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-compatibility/vcpkg.json
@@ -1,15 +1,18 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-compatibility",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost compatibility module",
   "homepage": "https://github.com/boostorg/compatibility",
   "license": "BSL-1.0",
   "dependencies": [
+    {
+      "name": "boost-config",
+      "version>=": "1.84.0"
+    },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-compute/portfile.cmake b/external_imported/vcpkg/ports/boost-compute/portfile.cmake
index 7c43059ee..b98abf2ab 100644
--- a/external_imported/vcpkg/ports/boost-compute/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-compute/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/compute
-    REF boost-1.81.0
-    SHA512 e4271120d0f7dad73bdafd391b4fbc69118486a9ead46bb232c20302323bd62513abc0c5d5696b45791472e78a95b1ec6d8f013fd69f9f65391df5a82f2aff54
+    REF boost-${VERSION}
+    SHA512 6fe8801b1fb8e37b5182f784e1c2938a9039f63770d58310df9a76eb7dcb0d9f1a93e31b4a69346f59273e59c2cff3ae0cf32f9a3c2e95364c70d77615bce731
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-compute/vcpkg.json b/external_imported/vcpkg/ports/boost-compute/vcpkg.json
index 2f75a8009..9dcb366f9 100644
--- a/external_imported/vcpkg/ports/boost-compute/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-compute/vcpkg.json
@@ -1,124 +1,123 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-compute",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost compute module",
   "homepage": "https://github.com/boostorg/compute",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-algorithm",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-array",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-chrono",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-filesystem",
       "platform": "!uwp",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-function",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-function-types",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-fusion",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-iterator",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-lexical-cast",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-optional",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-property-tree",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-proto",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-range",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-smart-ptr",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-thread",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-tuple",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-typeof",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-utility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-uuid",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-concept-check/portfile.cmake b/external_imported/vcpkg/ports/boost-concept-check/portfile.cmake
index eae1d9f16..feca3bcbb 100644
--- a/external_imported/vcpkg/ports/boost-concept-check/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-concept-check/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/concept_check
-    REF boost-1.81.0
-    SHA512 8bfc5a4eebc0c35230d8fdfcbfb90f5d98b3f588f9977c1472951d05e334d46cfd3a3b8d79241e59060adca6cac0b2b7b838b7438405b4e7d20fb4fc49df836a
+    REF boost-${VERSION}
+    SHA512 1674f998aaf593fa3031a27c8cf49391811a662ecfaea1d111f812f6002fd5a60352c67d87aca2e271b09a4bbf17beab8951dd6bfeeee805c75592359a29f0b8
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-concept-check/vcpkg.json b/external_imported/vcpkg/ports/boost-concept-check/vcpkg.json
index d2297d363..7855af3a1 100644
--- a/external_imported/vcpkg/ports/boost-concept-check/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-concept-check/vcpkg.json
@@ -1,31 +1,30 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-concept-check",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost concept_check module",
   "homepage": "https://github.com/boostorg/concept_check",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-config/portfile.cmake b/external_imported/vcpkg/ports/boost-config/portfile.cmake
index ea8368a24..bf5151b3c 100644
--- a/external_imported/vcpkg/ports/boost-config/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-config/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/config
-    REF boost-1.81.0
-    SHA512 0c09fd30aae566c72df30ec57d7b7acefcfd03b5154451596e0f8f5f633664db0f1dfb5239f8ce4503045463af6f79466b2cbbed1a5a1cf3bca96884ceff02ee
+    REF boost-${VERSION}
+    SHA512 93997394385d468832cc867fd74f74ead25c11a387c04fd56e88da906394e4131cb290f69e7754dba74eebdd053ca172051b6917060b010c928507f7a7382219
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-config/vcpkg.json b/external_imported/vcpkg/ports/boost-config/vcpkg.json
index 27c83b256..b2e9fbe97 100644
--- a/external_imported/vcpkg/ports/boost-config/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-config/vcpkg.json
@@ -1,15 +1,14 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-config",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost config module",
   "homepage": "https://github.com/boostorg/config",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-container-hash/portfile.cmake b/external_imported/vcpkg/ports/boost-container-hash/portfile.cmake
index f11cf8384..430d06e45 100644
--- a/external_imported/vcpkg/ports/boost-container-hash/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-container-hash/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/container_hash
-    REF boost-1.81.0
-    SHA512 f7aebe0ce6bea43bbf50eea0f3ee876a91f4afe83f9adf2fb010cd31928dbe38a0f762138c3d50aeadeaf0b6095b3bc0c3a8910392b8c354d33fac1468806d10
+    REF boost-${VERSION}
+    SHA512 a901d998c550e9099c079ab84fffb0abe3be05bb5c6196a31bbf6f0e72fb48394f276fdca50e2ebf854632359365ad9dc0665c5842a2c89ed5b8f7800ea7edeb
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-container-hash/vcpkg.json b/external_imported/vcpkg/ports/boost-container-hash/vcpkg.json
index d3dc3b93c..f2d4ec4a3 100644
--- a/external_imported/vcpkg/ports/boost-container-hash/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-container-hash/vcpkg.json
@@ -1,31 +1,26 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-container-hash",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost container_hash module",
   "homepage": "https://github.com/boostorg/container_hash",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-describe",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mp11",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-container/portfile.cmake b/external_imported/vcpkg/ports/boost-container/portfile.cmake
index 290c39478..88e34eb14 100644
--- a/external_imported/vcpkg/ports/boost-container/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-container/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/container
-    REF boost-1.81.0
-    SHA512 0fe7331ceffd50444daeaffad6e278be49c5f1adb6a08d80dc724fdfb6c1f3fb4381300e080ca1ae00a57a1aeb406b22662c5480a8a0a0318057f5264e12ccf2
+    REF boost-${VERSION}
+    SHA512 566469c28670f080388e9d763115ce9e344e524aadf2754d71af4d604d0edacb37306f714ac86d00220faa74bda4fc8a7d953391eba9894b303c14d010ed0c6c
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-container/vcpkg.json b/external_imported/vcpkg/ports/boost-container/vcpkg.json
index 967716689..df10230d8 100644
--- a/external_imported/vcpkg/ports/boost-container/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-container/vcpkg.json
@@ -1,57 +1,44 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-container",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost container module",
   "homepage": "https://github.com/boostorg/container",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-build",
       "host": true,
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-intrusive",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-modular-build-helper",
       "host": true,
-      "version>=": "1.81.0#4"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-move",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
-    },
-    {
-      "name": "boost-winapi",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/boost-context/b2-options.cmake.in b/external_imported/vcpkg/ports/boost-context/b2-options.cmake.in
index c54e6b9f0..80166c099 100644
--- a/external_imported/vcpkg/ports/boost-context/b2-options.cmake.in
+++ b/external_imported/vcpkg/ports/boost-context/b2-options.cmake.in
@@ -1,4 +1,3 @@
-
 if(@VCPKG_TARGET_IS_WINDOWS@)
     list(APPEND B2_OPTIONS
         abi=ms
diff --git a/external_imported/vcpkg/ports/boost-context/portfile.cmake b/external_imported/vcpkg/ports/boost-context/portfile.cmake
index 94a867aeb..d5d469f35 100644
--- a/external_imported/vcpkg/ports/boost-context/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-context/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/context
-    REF boost-1.81.0
-    SHA512 15bb8a6eb35330653458e9e29b139b709f04885728f6d759966b09a46ec940a29911131db3e99f33c73c571c03c6126484377ef14700eeb180469d6b260719cb
+    REF boost-${VERSION}
+    SHA512 dfee5b07fbf7cf1c41a55c5bd95d1f52edefb821c3f3d37bc8ffe6ee0c9605660d524f340dcd2568b3d7ac932d252a26a45e76a82efa02daa0ce27bd3c03ea46
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-context/vcpkg.json b/external_imported/vcpkg/ports/boost-context/vcpkg.json
index ee90319fb..4550588d3 100644
--- a/external_imported/vcpkg/ports/boost-context/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-context/vcpkg.json
@@ -1,8 +1,7 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-context",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost context module",
   "homepage": "https://github.com/boostorg/context",
   "license": "BSL-1.0",
@@ -10,45 +9,45 @@
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-build",
       "host": true,
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-modular-build-helper",
       "host": true,
-      "version>=": "1.81.0#4"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mp11",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-pool",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-predef",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-smart-ptr",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/boost-contract/portfile.cmake b/external_imported/vcpkg/ports/boost-contract/portfile.cmake
index 8f4e5c6b5..7e2829817 100644
--- a/external_imported/vcpkg/ports/boost-contract/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-contract/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/contract
-    REF boost-1.81.0
-    SHA512 09c73de3f3418480dbe1ff51cef5606a3a9e584ff51186e10a30cba4e9bf3f84ab0d27b490dcc40012117343c8d2a95e662bd89fa19c2536cc9588afb979296c
+    REF boost-${VERSION}
+    SHA512 1ed19aecae94740357f8734ddd77fb14d1ea328df1d0f05eedbbbd8a7b31a6781a0b697e4d68269fcf2c458e77320d0894888956f48c700c023e4d46f70a8d0c
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-contract/vcpkg.json b/external_imported/vcpkg/ports/boost-contract/vcpkg.json
index 886023971..2bbc92487 100644
--- a/external_imported/vcpkg/ports/boost-contract/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-contract/vcpkg.json
@@ -1,89 +1,88 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-contract",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost contract module",
   "homepage": "https://github.com/boostorg/contract",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-any",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-build",
       "host": true,
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-function",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-function-types",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-modular-build-helper",
       "host": true,
-      "version>=": "1.81.0#4"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-optional",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-smart-ptr",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-thread",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-typeof",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-utility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/boost-conversion/portfile.cmake b/external_imported/vcpkg/ports/boost-conversion/portfile.cmake
index aa0654462..4c72f045e 100644
--- a/external_imported/vcpkg/ports/boost-conversion/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-conversion/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/conversion
-    REF boost-1.81.0
-    SHA512 97d385dd4693890b60a2971851f4c27ae01a4d451c1e6b8d42500b7dcab8e668067931c2d4cf3ddb123b7a3f5bdf211daa77615b264b28c480119692156d839b
+    REF boost-${VERSION}
+    SHA512 f296e8dc604a9c99b72e786633da7d14e10363b4da64e276fc332176ff86dbfb9e212935139c674d373640b769177f99dd173ca3d1a9156428525c4a22fd0909
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-conversion/vcpkg.json b/external_imported/vcpkg/ports/boost-conversion/vcpkg.json
index fc0380725..952c04919 100644
--- a/external_imported/vcpkg/ports/boost-conversion/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-conversion/vcpkg.json
@@ -1,43 +1,30 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-conversion",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost conversion module",
   "homepage": "https://github.com/boostorg/conversion",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-smart-ptr",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-typeof",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-convert/portfile.cmake b/external_imported/vcpkg/ports/boost-convert/portfile.cmake
index 9d6a7d826..5b15266a9 100644
--- a/external_imported/vcpkg/ports/boost-convert/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-convert/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/convert
-    REF boost-1.81.0
-    SHA512 4c49c53e0084aa126ef9be3734d38f51448621275728cb00878f08a755eb753899b812c09ad754d5ae4d60940cda442dbc77223ef06a497be9627c2c05836d76
+    REF boost-${VERSION}
+    SHA512 74beb9790bc80ca1a0cf657c6cc7d38168f4de1d0efe9dfbfd32512c30b9501693c911b3c3b483f8bec089dc00f735ed9bc3f27330e1aaaa325c94e8e9054545
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-convert/vcpkg.json b/external_imported/vcpkg/ports/boost-convert/vcpkg.json
index cf022dd1c..6d7183cae 100644
--- a/external_imported/vcpkg/ports/boost-convert/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-convert/vcpkg.json
@@ -1,59 +1,58 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-convert",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost convert module",
   "homepage": "https://github.com/boostorg/convert",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-function-types",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-lexical-cast",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-math",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-optional",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-parameter",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-range",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-spirit",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-core/portfile.cmake b/external_imported/vcpkg/ports/boost-core/portfile.cmake
index eb1716cb3..7571b7743 100644
--- a/external_imported/vcpkg/ports/boost-core/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-core/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/core
-    REF boost-1.81.0
-    SHA512 3d2a86f194fbdff35c6ce974818f39969157e6f9aca19ee1aa4704485cc31b418c95c03201cf5192bd8d56ed81e90f9a7749f2d10dab7cfad7ece483ffbb96b6
+    REF boost-${VERSION}
+    SHA512 d2205ae3bf46e87b619cd4ebcb9986b8180ec546fac7732972c34d9f2cdae5db73d54a048fcbd10ea8f415e5f8a4a9d8356a227ff27e214ec94ac98df4512d3c
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-core/vcpkg.json b/external_imported/vcpkg/ports/boost-core/vcpkg.json
index 4460e5e99..f424b0e3f 100644
--- a/external_imported/vcpkg/ports/boost-core/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-core/vcpkg.json
@@ -1,31 +1,30 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-core",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost core module",
   "homepage": "https://github.com/boostorg/core",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-coroutine/portfile.cmake b/external_imported/vcpkg/ports/boost-coroutine/portfile.cmake
index f5b0c30ea..7a12090ea 100644
--- a/external_imported/vcpkg/ports/boost-coroutine/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-coroutine/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/coroutine
-    REF boost-1.81.0
-    SHA512 2959e87e856c642fed20b6bfef2d5c8ce8c0f5adae0679277bf0ae55806e9569a9ca803772efa3d87826e611e7e8685be0c4dc00fabe1e1df0a0313353e5d327
+    REF boost-${VERSION}
+    SHA512 39c5ce76aa2270959b61816e31b3ad0c2d900443655cf6ce1b59a59fcdb7100570da92d8400d357c98d13f4eb98c464f7af021988bfd65d8997e6c7b957a910f
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-coroutine/vcpkg.json b/external_imported/vcpkg/ports/boost-coroutine/vcpkg.json
index 8f82255eb..4a2b61c12 100644
--- a/external_imported/vcpkg/ports/boost-coroutine/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-coroutine/vcpkg.json
@@ -1,8 +1,7 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-coroutine",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost coroutine module",
   "homepage": "https://github.com/boostorg/coroutine",
   "license": "BSL-1.0",
@@ -10,58 +9,58 @@
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-build",
       "host": true,
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-context",
       "platform": "!uwp & !emscripten",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-modular-build-helper",
       "host": true,
-      "version>=": "1.81.0#4"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-move",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-system",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-utility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/boost-coroutine2/portfile.cmake b/external_imported/vcpkg/ports/boost-coroutine2/portfile.cmake
index cfbee8e17..e7e7560d9 100644
--- a/external_imported/vcpkg/ports/boost-coroutine2/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-coroutine2/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/coroutine2
-    REF boost-1.81.0
-    SHA512 a02232d01e1b15c28c1596101f95be31204a737852501d2fadf04d5489eb5bac6f8da6166bbd1ab43538822b0266b6e493eb4ef41c52bd26024c452f341615e8
+    REF boost-${VERSION}
+    SHA512 f2077b1eeabe6cd7315301ccc74b74dc2583ea7b0d791d6dbe47f3aa5e4761249f0b2d5461a100ede73478d38cbe7238181d73e45ea32eb2ef98357104441526
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-coroutine2/vcpkg.json b/external_imported/vcpkg/ports/boost-coroutine2/vcpkg.json
index b33a2cb0b..bfc9bf68e 100644
--- a/external_imported/vcpkg/ports/boost-coroutine2/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-coroutine2/vcpkg.json
@@ -1,8 +1,7 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-coroutine2",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost coroutine2 module",
   "homepage": "https://github.com/boostorg/coroutine2",
   "license": "BSL-1.0",
@@ -10,20 +9,20 @@
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-context",
       "platform": "!uwp & !emscripten",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-crc/portfile.cmake b/external_imported/vcpkg/ports/boost-crc/portfile.cmake
index 56c79a5de..b7f522cc1 100644
--- a/external_imported/vcpkg/ports/boost-crc/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-crc/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/crc
-    REF boost-1.81.0
-    SHA512 6e3d4dbf6343d936a2884a2445482c7245dd03eae46395ba168e50fb551aedd538feb00102b83a13b6fdfbc58f87d09c8252dfd8e584d835f4a9886ecf26619b
+    REF boost-${VERSION}
+    SHA512 d5f5bde8734bfb80b684bbe0c045488dfb9702e3056690a6916777473fb29955a0ed43eb91a9d43d3d67c535c9e5810e63114309546028ad8e75d81cc4e41bd2
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-crc/vcpkg.json b/external_imported/vcpkg/ports/boost-crc/vcpkg.json
index fa97babc6..c47b27a7b 100644
--- a/external_imported/vcpkg/ports/boost-crc/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-crc/vcpkg.json
@@ -1,31 +1,30 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-crc",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost crc module",
   "homepage": "https://github.com/boostorg/crc",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-array",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-integer",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-date-time/portfile.cmake b/external_imported/vcpkg/ports/boost-date-time/portfile.cmake
index 4bbd5a567..ff00f81a9 100644
--- a/external_imported/vcpkg/ports/boost-date-time/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-date-time/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/date_time
-    REF boost-1.81.0
-    SHA512 07eeeb09bab0e64a662a1ea92a24c93e8c119d804e3b63f71ccbb533348c6dbeaf8f759847409fe23c902cadcfd025fee804d67f9a4182eb336094f0c1f37d9a
+    REF boost-${VERSION}
+    SHA512 bd1b2dee1c8153c00d71d7c9edb3965575615c0dd886b01a3d2755f513b3d27cf099f76a6c81d35ef1d961d29863563faece943aef3bba5410fab4d7e0be43fb
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-date-time/vcpkg.json b/external_imported/vcpkg/ports/boost-date-time/vcpkg.json
index 75ab34ef9..3b25fa21c 100644
--- a/external_imported/vcpkg/ports/boost-date-time/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-date-time/vcpkg.json
@@ -1,85 +1,84 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-date-time",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost date_time module",
   "homepage": "https://github.com/boostorg/date_time",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-algorithm",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-build",
       "host": true,
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-io",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-lexical-cast",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-modular-build-helper",
       "host": true,
-      "version>=": "1.81.0#4"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-numeric-conversion",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-range",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-smart-ptr",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-tokenizer",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-utility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-winapi",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/boost-describe/portfile.cmake b/external_imported/vcpkg/ports/boost-describe/portfile.cmake
index 5fac22c72..67452721c 100644
--- a/external_imported/vcpkg/ports/boost-describe/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-describe/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/describe
-    REF boost-1.81.0
-    SHA512 1fdf70ac8a20d22ddc09e6e3a23f1df530858f85a70fb6542380024fd6c90592f696ecbd180595cb15edd294232ce90bcf240f250992496962f52ba1ab963789
+    REF boost-${VERSION}
+    SHA512 9fcd8acdcd47172dad2d8e503fa4dd71687cb41185f7362c737e7cb8625fe81d63aa6bad14907876621b8682a70be672965ff624aed26c35bdc8abf2c7e7f8ee
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-describe/vcpkg.json b/external_imported/vcpkg/ports/boost-describe/vcpkg.json
index 65a8d17d1..c1845143d 100644
--- a/external_imported/vcpkg/ports/boost-describe/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-describe/vcpkg.json
@@ -1,19 +1,22 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-describe",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost describe module",
   "homepage": "https://github.com/boostorg/describe",
   "license": "BSL-1.0",
   "dependencies": [
+    {
+      "name": "boost-config",
+      "version>=": "1.84.0"
+    },
     {
       "name": "boost-mp11",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-detail/portfile.cmake b/external_imported/vcpkg/ports/boost-detail/portfile.cmake
index 52b832830..f6f6f5e39 100644
--- a/external_imported/vcpkg/ports/boost-detail/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-detail/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/detail
-    REF boost-1.81.0
-    SHA512 4150ce1a407d4915c40775976ee82542c260ed576c4d614fcc6372042fdae6a245e376cf8a7a835e91c49893147f19db3413921e8d37f89c9c0b47373bb55c82
+    REF boost-${VERSION}
+    SHA512 de888e59559074d73111d95391c7ffb6fc83ff5b7168852888904c25bc96358f5bff6bf40ff6b7d92224d706108750729f348a7da263fc48514fbaffe3b4f040
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-detail/vcpkg.json b/external_imported/vcpkg/ports/boost-detail/vcpkg.json
index 4c3ee9a8b..1021eda04 100644
--- a/external_imported/vcpkg/ports/boost-detail/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-detail/vcpkg.json
@@ -1,35 +1,34 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-detail",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost detail module",
   "homepage": "https://github.com/boostorg/detail",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-dll/portfile.cmake b/external_imported/vcpkg/ports/boost-dll/portfile.cmake
index 5c174afed..176d2eb14 100644
--- a/external_imported/vcpkg/ports/boost-dll/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-dll/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/dll
-    REF boost-1.81.0
-    SHA512 151d7575bf6670058410446fb434bbb026f1bdf42a1de642e9b4c25397d80b51385f4482be1d8b7d2b8aac91a8d7ff39eea1a5d5bee4a72dc21eb8843c60744b
+    REF boost-${VERSION}
+    SHA512 503e5dbca17a24acc5033c52efec0c985f9a7a77f948d547b80fb6d2323d447120f3c5245fc0e817840923f69848ba69c02d0c054799135b98ac4e8ae5c72421
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-dll/vcpkg.json b/external_imported/vcpkg/ports/boost-dll/vcpkg.json
index 316f0d306..0c82a3657 100644
--- a/external_imported/vcpkg/ports/boost-dll/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-dll/vcpkg.json
@@ -1,76 +1,71 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-dll",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost dll module",
   "homepage": "https://github.com/boostorg/dll",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-filesystem",
       "platform": "!uwp",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-function",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-move",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-predef",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-smart-ptr",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-spirit",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-system",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-index",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-winapi",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-dynamic-bitset/portfile.cmake b/external_imported/vcpkg/ports/boost-dynamic-bitset/portfile.cmake
index 74aa05a8a..d9625a947 100644
--- a/external_imported/vcpkg/ports/boost-dynamic-bitset/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-dynamic-bitset/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/dynamic_bitset
-    REF boost-1.81.0
-    SHA512 e8a7a7a0735b85d1c3272e23782d3c14fea78982fb158b9dc8ec7e8db3297408f84e40056e4099caa2e44432ab1869c17edc1fa9198499673d1737b9ee5b28a4
+    REF boost-${VERSION}
+    SHA512 76229a33e6e659fd0ae0d32f34df0c793da203830f58c3e0a89ec4eeaf5aba4bacbc516ade9860005f74907e42ddb1995a82459e528bd7d3f42fd08c49abb63a
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-dynamic-bitset/vcpkg.json b/external_imported/vcpkg/ports/boost-dynamic-bitset/vcpkg.json
index b0c974e8f..2de8c5122 100644
--- a/external_imported/vcpkg/ports/boost-dynamic-bitset/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-dynamic-bitset/vcpkg.json
@@ -1,47 +1,46 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-dynamic-bitset",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost dynamic_bitset module",
   "homepage": "https://github.com/boostorg/dynamic_bitset",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-container-hash",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-integer",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-move",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-endian/portfile.cmake b/external_imported/vcpkg/ports/boost-endian/portfile.cmake
index c3f49fd4c..c0cb0d523 100644
--- a/external_imported/vcpkg/ports/boost-endian/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-endian/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/endian
-    REF boost-1.81.0
-    SHA512 85fd0ce8b8a85e73dae0db0610d1fe6a61cffa4a2d9f26e9a73a58df92594af8f24eb9a86441161001b372f30a37b86d25a173e839c0440713ae2d02a96f5d74
+    REF boost-${VERSION}
+    SHA512 76d231074c4ba8e8b6480ce0d7f17160406f7bc2254bce5716f2f7535e915ea6e6dd4c6349c0458fbb39a039dcca1b0999fe9a86bbcc6dfdf9068de875edeb70
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-endian/vcpkg.json b/external_imported/vcpkg/ports/boost-endian/vcpkg.json
index a0861f121..21829a328 100644
--- a/external_imported/vcpkg/ports/boost-endian/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-endian/vcpkg.json
@@ -1,31 +1,18 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-endian",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost endian module",
   "homepage": "https://github.com/boostorg/endian",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-core",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-exception/portfile.cmake b/external_imported/vcpkg/ports/boost-exception/portfile.cmake
index 7396ebea6..7156e3d89 100644
--- a/external_imported/vcpkg/ports/boost-exception/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-exception/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/exception
-    REF boost-1.81.0
-    SHA512 54bb812a259bca5568dcbabdfb0d5bb0fdb3332a24837023822ba1eb30cd466d29251791b7401d56adeda5bd7b4f1507080b82e4f23f5f1f52ee1d46c9ce8d6f
+    REF boost-${VERSION}
+    SHA512 bd28f5c58b6e76e83ab5d0a4a86147d653a6d036a4e264ef38065e69480a438f5e2df265540c6a6e4b14b055ae5d947b6fcfb3cf9662e10ba77041ac3571f507
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-exception/vcpkg.json b/external_imported/vcpkg/ports/boost-exception/vcpkg.json
index d6fb82883..542fb276a 100644
--- a/external_imported/vcpkg/ports/boost-exception/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-exception/vcpkg.json
@@ -1,53 +1,52 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-exception",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost exception module",
   "homepage": "https://github.com/boostorg/exception",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-build",
       "host": true,
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-modular-build-helper",
       "host": true,
-      "version>=": "1.81.0#4"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-smart-ptr",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-tuple",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/boost-fiber/portfile.cmake b/external_imported/vcpkg/ports/boost-fiber/portfile.cmake
index 5b740584a..2b4ada00e 100644
--- a/external_imported/vcpkg/ports/boost-fiber/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-fiber/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/fiber
-    REF boost-1.81.0
-    SHA512 331d758c07d155851459d17d10b6a905e4bb159b2ad4c698a4c113df1894c975db99097ec68216ea921c3f77774fac6f4ef568aee16b531356e7f5b29860349a
+    REF boost-${VERSION}
+    SHA512 cfd2cbce4210dab378e19357cc8aeafbb54fc481aa7a02db56b2eb104df5f79679ce3f509048ffbb827a6498304923cb826bc0eaedf9c47550f64727a61e7a5f
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-fiber/vcpkg.json b/external_imported/vcpkg/ports/boost-fiber/vcpkg.json
index d27955c27..d84907ec9 100644
--- a/external_imported/vcpkg/ports/boost-fiber/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-fiber/vcpkg.json
@@ -1,68 +1,67 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-fiber",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost fiber module",
   "homepage": "https://github.com/boostorg/fiber",
   "license": "BSL-1.0",
-  "supports": "!uwp & !arm & !emscripten",
+  "supports": "!uwp & !(arm & windows) & !emscripten",
   "dependencies": [
     {
       "name": "boost-algorithm",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-build",
       "host": true,
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-context",
       "platform": "!uwp & !emscripten",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-filesystem",
       "platform": "!uwp",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-format",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-intrusive",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-modular-build-helper",
       "host": true,
-      "version>=": "1.81.0#4"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-predef",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-smart-ptr",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/boost-filesystem/portfile.cmake b/external_imported/vcpkg/ports/boost-filesystem/portfile.cmake
index 93df84bf1..eca6896d2 100644
--- a/external_imported/vcpkg/ports/boost-filesystem/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-filesystem/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/filesystem
-    REF boost-1.81.0
-    SHA512 c27dbeb65aa0623d01876999de35618de9388ced01bb79951ca1de4909e5deaf512e0b6b189136aa2e087f046b28f757b3ca417be52ca9a2513383b87e807a6c
+    REF boost-${VERSION}
+    SHA512 6e3924e6ebae5a8ad71e2cfa6ea7f6e1d54ccd8fb353fdd038dfbb13f2997b8bfaf868278d0a84baf5e6ce7d5a95c913455b14ac13666eea5a4e1829626195da
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-filesystem/vcpkg.json b/external_imported/vcpkg/ports/boost-filesystem/vcpkg.json
index ed1efe5a1..d24b81a30 100644
--- a/external_imported/vcpkg/ports/boost-filesystem/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-filesystem/vcpkg.json
@@ -1,8 +1,7 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-filesystem",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost filesystem module",
   "homepage": "https://github.com/boostorg/filesystem",
   "license": "BSL-1.0",
@@ -10,73 +9,73 @@
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-atomic",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-build",
       "host": true,
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-container-hash",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-detail",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-io",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-iterator",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-modular-build-helper",
       "host": true,
-      "version>=": "1.81.0#4"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-predef",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-smart-ptr",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-system",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-winapi",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/boost-flyweight/portfile.cmake b/external_imported/vcpkg/ports/boost-flyweight/portfile.cmake
index 0739f1d9e..65f26532b 100644
--- a/external_imported/vcpkg/ports/boost-flyweight/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-flyweight/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/flyweight
-    REF boost-1.81.0
-    SHA512 a918d7ec365b22c62297dd62069cb33e8337750ddfc0ff48757ccef8954ac2a055bbf65ea93eddf366c44a6b7c9da4e32268b420244eeff35158da9f8ec34d15
+    REF boost-${VERSION}
+    SHA512 7dcbb4d29c01524f1d1a097614c5f31ca40b720c974f2587cdcc6cf3c5538c36fbf691fa07475f1de3847baf8e9a0ee8883f83d75af171a760450626d621c9e3
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-flyweight/vcpkg.json b/external_imported/vcpkg/ports/boost-flyweight/vcpkg.json
index 9e5eaf41d..69dbcbe49 100644
--- a/external_imported/vcpkg/ports/boost-flyweight/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-flyweight/vcpkg.json
@@ -1,71 +1,66 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-flyweight",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost flyweight module",
   "homepage": "https://github.com/boostorg/flyweight",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-container-hash",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-detail",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-interprocess",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-multi-index",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-parameter",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-serialization",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-smart-ptr",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-foreach/portfile.cmake b/external_imported/vcpkg/ports/boost-foreach/portfile.cmake
index 444128303..3af52ee55 100644
--- a/external_imported/vcpkg/ports/boost-foreach/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-foreach/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/foreach
-    REF boost-1.81.0
-    SHA512 83ab45d2dab0cadb15bcfc3a8ba558b4f4ed38aa72f4d2481fbac3437787937989f3df39c0b658f2219486cac37e31a11d824c1c55d88e1eab8b6d7299924392
+    REF boost-${VERSION}
+    SHA512 f14cc78d31dd71ecbbf357c2f280f480acc3171efafc25bd75ed43ad5398a7274eab15bd5b566aac4a2aece66a6a0d4d9557ea26850d9f8c796b8a2e9b57fce6
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-foreach/vcpkg.json b/external_imported/vcpkg/ports/boost-foreach/vcpkg.json
index 6d9787da8..e494da761 100644
--- a/external_imported/vcpkg/ports/boost-foreach/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-foreach/vcpkg.json
@@ -1,39 +1,38 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-foreach",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost foreach module",
   "homepage": "https://github.com/boostorg/foreach",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-iterator",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-range",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-format/portfile.cmake b/external_imported/vcpkg/ports/boost-format/portfile.cmake
index 403b36162..9d6f5d068 100644
--- a/external_imported/vcpkg/ports/boost-format/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-format/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/format
-    REF boost-1.81.0
-    SHA512 a526b1ef7379a44d67641b9124ea6b145e1153aa631a753e92ad7e3983481b7b9064b28219da408ae71e6837a0b9c53407d9c55418dc0101d5a16ee04068ac39
+    REF boost-${VERSION}
+    SHA512 7172079c234ab3382aa23acbea8d49e8c95d4eb4d2510e0a01895089d4ba32a5ca2fd1d95329cff221b1744949521372fdb279fba116e924701ae81b40246118
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-format/vcpkg.json b/external_imported/vcpkg/ports/boost-format/vcpkg.json
index c98e97fc1..f5b2c3a55 100644
--- a/external_imported/vcpkg/ports/boost-format/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-format/vcpkg.json
@@ -1,43 +1,42 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-format",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost format module",
   "homepage": "https://github.com/boostorg/format",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-optional",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-smart-ptr",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-utility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-function-types/portfile.cmake b/external_imported/vcpkg/ports/boost-function-types/portfile.cmake
index 62cf761f3..d795c3b96 100644
--- a/external_imported/vcpkg/ports/boost-function-types/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-function-types/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/function_types
-    REF boost-1.81.0
-    SHA512 c53fccf5ec081dc654ccbdc11df977d13ecd19abcf2a2e70727a4549b7524d27a388a4be2835e695310df73ccf6180fd88af69d50871f2109d04a6c5881ba294
+    REF boost-${VERSION}
+    SHA512 3c5e95b539cf688489762989ebc978ab770d645c5245a09ca3803fc11362563e3f614a0bf7d5bbd9c6b55ac0feb0b41d83ad8bf31667879ff0e4cc8bd9c7543e
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-function-types/vcpkg.json b/external_imported/vcpkg/ports/boost-function-types/vcpkg.json
index e3f568950..12e925817 100644
--- a/external_imported/vcpkg/ports/boost-function-types/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-function-types/vcpkg.json
@@ -1,39 +1,38 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-function-types",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost function_types module",
   "homepage": "https://github.com/boostorg/function_types",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-detail",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-function/portfile.cmake b/external_imported/vcpkg/ports/boost-function/portfile.cmake
index 9f865f5e1..36b52202d 100644
--- a/external_imported/vcpkg/ports/boost-function/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-function/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/function
-    REF boost-1.81.0
-    SHA512 924a1b338c95acf519e1a930d5f3c96607d9b9fbc5fffd5b8aac63f7804a6c19546e22166a3e88af8a4a8b9d0343abc10cbb58dceec402b7c45ac523f4eb6a67
+    REF boost-${VERSION}
+    SHA512 78e14f41fc0799ffe1641353716899a2543d7a476360a11adfcdefc63d5710cf1d08d532bbba3eadf10735c147047ef9832fada2ace385b4d7e7a787b083fde2
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-function/vcpkg.json b/external_imported/vcpkg/ports/boost-function/vcpkg.json
index ffa18cc11..841206d59 100644
--- a/external_imported/vcpkg/ports/boost-function/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-function/vcpkg.json
@@ -1,55 +1,42 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-function",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost function module",
   "homepage": "https://github.com/boostorg/function",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-bind",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-integer",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-type-index",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-typeof",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-functional/portfile.cmake b/external_imported/vcpkg/ports/boost-functional/portfile.cmake
index c0b8f3e6d..5690b2486 100644
--- a/external_imported/vcpkg/ports/boost-functional/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-functional/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/functional
-    REF boost-1.81.0
-    SHA512 fd6b0c3c273530338ac566c6e3a01c3f21d07390c3fc49efe8017dda580eea4903dc6cd36b9d7a25bdd9b91681d19dc215a63c84732cfdb7081a1e7e0a124a04
+    REF boost-${VERSION}
+    SHA512 bd00304aa41eaa9894ba36909af164bbf15ea8286770b23f5ed5b1d2b6f5b0cf94704cc8ed6af1ac05e831581b50b7852e928e98df3e603256a67abbe963823a
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-functional/vcpkg.json b/external_imported/vcpkg/ports/boost-functional/vcpkg.json
index 6e6967c29..6cf479120 100644
--- a/external_imported/vcpkg/ports/boost-functional/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-functional/vcpkg.json
@@ -1,51 +1,50 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-functional",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost functional module",
   "homepage": "https://github.com/boostorg/functional",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-function",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-function-types",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-typeof",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-utility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-fusion/portfile.cmake b/external_imported/vcpkg/ports/boost-fusion/portfile.cmake
index 5a59ab817..7ba4551a3 100644
--- a/external_imported/vcpkg/ports/boost-fusion/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-fusion/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/fusion
-    REF boost-1.81.0
-    SHA512 56a9eafff6b0cf20042a408bd5ef6532467fe29146fa3282a05c868dc4ac141fbf5e22edc8d4332cb4808f5e3b1093585d463c8d4404bd9e5c998ae331c0f593
+    REF boost-${VERSION}
+    SHA512 15238eb4f2743910958a19efde23098677c0aa8a5988151d5aec2aef558ac398db444770e6f1e22952d7cd72213c6237e55cc3363dadf9f988bac907914cb263
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-fusion/vcpkg.json b/external_imported/vcpkg/ports/boost-fusion/vcpkg.json
index 2734444bf..d67d4401c 100644
--- a/external_imported/vcpkg/ports/boost-fusion/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-fusion/vcpkg.json
@@ -1,63 +1,62 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-fusion",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost fusion module",
   "homepage": "https://github.com/boostorg/fusion",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-container-hash",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-function-types",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-functional",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-tuple",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-typeof",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-utility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-geometry/portfile.cmake b/external_imported/vcpkg/ports/boost-geometry/portfile.cmake
index 5b5a15390..62d947cbd 100644
--- a/external_imported/vcpkg/ports/boost-geometry/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-geometry/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/geometry
-    REF boost-1.81.0
-    SHA512 1dbefe63f9776b234c2532cbb2e47bfce49a8194c30ec82cd1cbe16e8f7304a2196a9338dc00a62cf1bf74c7684d55f33f104126e72e4ae0214978f6212f475a
+    REF boost-${VERSION}
+    SHA512 ba2985853d1412163e477ffda7106668a5368f41df81f7c1c2b9f121a554d4c0b6b587b2080470cd16c192a31ccd74c36c10810a127a53b4977c9f320b6ba8c6
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-geometry/vcpkg.json b/external_imported/vcpkg/ports/boost-geometry/vcpkg.json
index f2d087e0a..23e969b9a 100644
--- a/external_imported/vcpkg/ports/boost-geometry/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-geometry/vcpkg.json
@@ -1,147 +1,134 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-geometry",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost geometry module",
   "homepage": "https://github.com/boostorg/geometry",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-algorithm",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-any",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-array",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-concept-check",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-container",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-function-types",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-fusion",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-integer",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-iterator",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-lexical-cast",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-math",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-move",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-multiprecision",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-numeric-conversion",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-polygon",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-qvm",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-range",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-rational",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-serialization",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-smart-ptr",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-thread",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-tokenizer",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-tuple",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-utility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-variant",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-variant2",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-gil/portfile.cmake b/external_imported/vcpkg/ports/boost-gil/portfile.cmake
index 0a8ca397b..c94bf3f84 100644
--- a/external_imported/vcpkg/ports/boost-gil/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-gil/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/gil
-    REF boost-1.81.0
-    SHA512 935684461749bc18238f03f02ae0100fc77eb5665f7cb3f7afd7ba124a8d572cdb9ca78a2e7277d0091fee8f70b12ad1701eb67c65ba69baba8b5ca5e8c82130
+    REF boost-${VERSION}
+    SHA512 0fa13a3c02b29dfaa6cf16df5e9efedc50bba8f762694c337d6ab9ee00564d2ba7a4326d32c150a187f435c8ddd41895b46311a49b7c9c4e117d47665dcbbd8b
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-gil/vcpkg.json b/external_imported/vcpkg/ports/boost-gil/vcpkg.json
index d36edd6d1..0663400a3 100644
--- a/external_imported/vcpkg/ports/boost-gil/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-gil/vcpkg.json
@@ -1,59 +1,58 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-gil",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost gil module",
   "homepage": "https://github.com/boostorg/gil",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-concept-check",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-container-hash",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-integer",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-iterator",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mp11",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-variant2",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-graph-parallel/portfile.cmake b/external_imported/vcpkg/ports/boost-graph-parallel/portfile.cmake
index 5bee69307..4dd212b9e 100644
--- a/external_imported/vcpkg/ports/boost-graph-parallel/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-graph-parallel/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/graph_parallel
-    REF boost-1.81.0
-    SHA512 31de00adb53686cc6518a0392a9987f74d55deb8fa1649a994fd12871be12f6d1729021052453f1a9b6a92daa54149572c79acfc06394df0be9f1b752412da24
+    REF boost-${VERSION}
+    SHA512 397df5d5f715d6818443888161462cf6b1671636364ba4a6551d93fd4b4d2a78956c8491511f11d5e2d4eb4d64facb1acc6a49b5084f3b92b7527a0f6240d609
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-graph-parallel/vcpkg.json b/external_imported/vcpkg/ports/boost-graph-parallel/vcpkg.json
index 867713b2c..f7f679e03 100644
--- a/external_imported/vcpkg/ports/boost-graph-parallel/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-graph-parallel/vcpkg.json
@@ -1,8 +1,7 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-graph-parallel",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost graph_parallel module",
   "homepage": "https://github.com/boostorg/graph_parallel",
   "license": "BSL-1.0",
@@ -10,124 +9,124 @@
   "dependencies": [
     {
       "name": "boost-algorithm",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-build",
       "host": true,
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-concept-check",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-container-hash",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-detail",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-dynamic-bitset",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-filesystem",
       "platform": "!uwp",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-foreach",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-function",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-graph",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-iterator",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-lexical-cast",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-modular-build-helper",
       "host": true,
-      "version>=": "1.81.0#4"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpi",
       "platform": "!uwp",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-optional",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-property-map",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-property-map-parallel",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-random",
       "platform": "!uwp",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-serialization",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-smart-ptr",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-tuple",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-variant",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     "mpi",
     {
diff --git a/external_imported/vcpkg/ports/boost-graph/portfile.cmake b/external_imported/vcpkg/ports/boost-graph/portfile.cmake
index 4bcac3d3b..bf6226af6 100644
--- a/external_imported/vcpkg/ports/boost-graph/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-graph/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/graph
-    REF boost-1.81.0
-    SHA512 beffd30f5b613142c53b66c99a41120ea08f2279cfcad1326d347b93f7d1a846da99bab098a6659f92ffea5aa0f1ac04a0a34fb00d7b0a890e20213fb9ed0473
+    REF boost-${VERSION}
+    SHA512 4ce65598660aa1ba8f0e6f40d11b8faaa5f60ff0388b5e5d21554ae4878037c71fd30c9de4b16153d43962a37a7bee51f409ebc3065d41cdba4aed52eb4ad90f
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-graph/vcpkg.json b/external_imported/vcpkg/ports/boost-graph/vcpkg.json
index 394ef50a9..f2ed6f880 100644
--- a/external_imported/vcpkg/ports/boost-graph/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-graph/vcpkg.json
@@ -1,190 +1,189 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-graph",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost graph module",
   "homepage": "https://github.com/boostorg/graph",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-algorithm",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-any",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-array",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-bimap",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-bind",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-build",
       "host": true,
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-concept-check",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-container-hash",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-conversion",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-detail",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-foreach",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-function",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-integer",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-iterator",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-lexical-cast",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-math",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-modular-build-helper",
       "host": true,
-      "version>=": "1.81.0#4"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-move",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-multi-index",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-optional",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-parameter",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-property-map",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-property-tree",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-random",
       "platform": "!uwp",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-range",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-regex",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-serialization",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-smart-ptr",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-spirit",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-tti",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-tuple",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-typeof",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-unordered",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-utility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-xpressive",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/boost-hana/portfile.cmake b/external_imported/vcpkg/ports/boost-hana/portfile.cmake
index 31f905ff3..4db056982 100644
--- a/external_imported/vcpkg/ports/boost-hana/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-hana/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/hana
-    REF boost-1.81.0
-    SHA512 0e593a59fc85bc04aa355aa8fd24f94a14b29ec9ebfd1861253428999fbe76e05ba777e9b066bc95500522d0c08d43dd0558e6e35a2b67405ac6af80f5edcdb8
+    REF boost-${VERSION}
+    SHA512 4bebdab6122fd98a5c1b6a5a4b52965f045c5525cd6683c48498fdbad2d0dbc3aa4d4673163930d96ac24c014bcbd755318780a6798f8ab2edd83463877b57c4
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-hana/vcpkg.json b/external_imported/vcpkg/ports/boost-hana/vcpkg.json
index 1ab901e7d..accef8939 100644
--- a/external_imported/vcpkg/ports/boost-hana/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-hana/vcpkg.json
@@ -1,35 +1,34 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-hana",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost hana module",
   "homepage": "https://github.com/boostorg/hana",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-fusion",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-tuple",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-heap/portfile.cmake b/external_imported/vcpkg/ports/boost-heap/portfile.cmake
index 67a276dcd..a1c97fd8c 100644
--- a/external_imported/vcpkg/ports/boost-heap/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-heap/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/heap
-    REF boost-1.81.0
-    SHA512 b78fa8f5ac869af94e6b2917d7d2e60cb717131a6fe825bdc335edd11cc37b0b38af8d7b87fd48662d5748263f1efe6a7185fd136cb7b149a17973ddf030d55c
+    REF boost-${VERSION}
+    SHA512 e2c1252ece9643ccced82ba65e34b6414140c24738f6a01015eb80ef2a1c1ad3e02c8b6fe5a06d7cf4dcb06b9593ef54510cf8f90828f14df668c239f5be4c62
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-heap/vcpkg.json b/external_imported/vcpkg/ports/boost-heap/vcpkg.json
index a6b44b4c0..6af4d61f5 100644
--- a/external_imported/vcpkg/ports/boost-heap/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-heap/vcpkg.json
@@ -1,63 +1,62 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-heap",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost heap module",
   "homepage": "https://github.com/boostorg/heap",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-array",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-bind",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-concept-check",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-intrusive",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-iterator",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-parameter",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-histogram/portfile.cmake b/external_imported/vcpkg/ports/boost-histogram/portfile.cmake
index 2a991a907..0d3079291 100644
--- a/external_imported/vcpkg/ports/boost-histogram/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-histogram/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/histogram
-    REF boost-1.81.0
-    SHA512 0918c37563bc082b3da18b0c1c2b81aa42b964ab362cb397f2f74f7a58ee9c4dd94163333224bda8ff078921cfeb93488b766dcfec65b551592675cc90dfc5e0
+    REF boost-${VERSION}
+    SHA512 79360340c0aeeecba87b59c2130faf110d9ec94bc2fa2f276c4af7815a196ced400c72ca68efb4eaa5b82163dca53c26cd77f6c4ef91461749f78bb08fc56064
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-histogram/vcpkg.json b/external_imported/vcpkg/ports/boost-histogram/vcpkg.json
index 409b6540c..f85d1e875 100644
--- a/external_imported/vcpkg/ports/boost-histogram/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-histogram/vcpkg.json
@@ -1,43 +1,42 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-histogram",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost histogram module",
   "homepage": "https://github.com/boostorg/histogram",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-math",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mp11",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-serialization",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-variant2",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-hof/portfile.cmake b/external_imported/vcpkg/ports/boost-hof/portfile.cmake
index 4bde2482c..fb4b55fc5 100644
--- a/external_imported/vcpkg/ports/boost-hof/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-hof/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/hof
-    REF boost-1.81.0
-    SHA512 85d2af6731cf84750635eb0324067bd1b02b425df0849f668c4e8f4e17b6c970a85240d170667f3e912ec4a6758c0bb0c1852e87c0ab834865cde94d88af6d66
+    REF boost-${VERSION}
+    SHA512 cf0039d7c39521297b664f98f7d45a096df31fe889266d22a2a1305f620e786451e973324436bca52bced3e84a3106d4ce2d11792ff7896e2bba236bf2e7b1fd
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-hof/vcpkg.json b/external_imported/vcpkg/ports/boost-hof/vcpkg.json
index 6d6d477be..4b6cba4b2 100644
--- a/external_imported/vcpkg/ports/boost-hof/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-hof/vcpkg.json
@@ -1,15 +1,18 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-hof",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost hof module",
   "homepage": "https://github.com/boostorg/hof",
   "license": "BSL-1.0",
   "dependencies": [
+    {
+      "name": "boost-config",
+      "version>=": "1.84.0"
+    },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-icl/portfile.cmake b/external_imported/vcpkg/ports/boost-icl/portfile.cmake
index aba2a84b2..352273216 100644
--- a/external_imported/vcpkg/ports/boost-icl/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-icl/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/icl
-    REF boost-1.81.0
-    SHA512 a8576c9731733b792543a5b6d05ed96d34c908c8a2fcdce2f4d2bb7492b252622d528bc8259d918e5df0150f8f2b58394e907ce6e0669a19bd674c7a8bed26ff
+    REF boost-${VERSION}
+    SHA512 7ea1fabb500faddc6ffe32fedf3e26f5654a2f1376658b758246330a58382bc2cd7f95159fe4d9472a63e8bbd275e537da595d88052221b9ac4d712a9e291139
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-icl/vcpkg.json b/external_imported/vcpkg/ports/boost-icl/vcpkg.json
index 825c00931..2fbffc3cc 100644
--- a/external_imported/vcpkg/ports/boost-icl/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-icl/vcpkg.json
@@ -1,75 +1,74 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-icl",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost icl module",
   "homepage": "https://github.com/boostorg/icl",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-concept-check",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-container",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-date-time",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-detail",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-iterator",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-move",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-range",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-rational",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-utility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-integer/portfile.cmake b/external_imported/vcpkg/ports/boost-integer/portfile.cmake
index 3a9932ac5..f838a7c87 100644
--- a/external_imported/vcpkg/ports/boost-integer/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-integer/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/integer
-    REF boost-1.81.0
-    SHA512 e0307da368ea8d3cab9ba8cfaa833466e3392dc687638636aec22f16d2f56719d56711ec2fe8c0f3b2ee3f91dd47d76ac9907746e5eb3f3799691fcec36e78e2
+    REF boost-${VERSION}
+    SHA512 c9fcfb3023253e6ef376e3cae56339222659e229e3be633a16c77b8e672f26654ffcaa959a35e6edd7333bdcc7d5625b9e9a18120eaa1eba2e60216333da771e
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-integer/vcpkg.json b/external_imported/vcpkg/ports/boost-integer/vcpkg.json
index 8d39d15cf..1b72bb460 100644
--- a/external_imported/vcpkg/ports/boost-integer/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-integer/vcpkg.json
@@ -1,39 +1,38 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-integer",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost integer module",
   "homepage": "https://github.com/boostorg/integer",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-interprocess/portfile.cmake b/external_imported/vcpkg/ports/boost-interprocess/portfile.cmake
index f65ffec3c..c22279e24 100644
--- a/external_imported/vcpkg/ports/boost-interprocess/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-interprocess/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/interprocess
-    REF boost-1.81.0
-    SHA512 fba6692fde5f22734e401ed1b5320e7c6cba8e2b45baf3da4161c3d7fc55fe098024034b6bf995d45d3464a7ed78431d2391c1df0e852f0c382bfe68ef79c2f7
+    REF boost-${VERSION}
+    SHA512 8392e5f4ea6c19a03478e44a22ea3a4bfbc2f69806564ba7cb2882094bc39ad5dcf009a52bd1277d0ca9cfe12ad73066c9752569a9f2555c7b0bce4e8665c551
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-interprocess/vcpkg.json b/external_imported/vcpkg/ports/boost-interprocess/vcpkg.json
index 312b4112d..3c0eac3cf 100644
--- a/external_imported/vcpkg/ports/boost-interprocess/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-interprocess/vcpkg.json
@@ -1,59 +1,54 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-interprocess",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost interprocess module",
   "homepage": "https://github.com/boostorg/interprocess",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-container",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-integer",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-intrusive",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-move",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-unordered",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-winapi",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-interval/portfile.cmake b/external_imported/vcpkg/ports/boost-interval/portfile.cmake
index 1acc9926a..59293879a 100644
--- a/external_imported/vcpkg/ports/boost-interval/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-interval/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/interval
-    REF boost-1.81.0
-    SHA512 63f150f486374b68c1969c0c60a5f55ed8e0534b7ef8833975a0345ab1f9659d525ee9a1b858f85631a65494ca346bfe01c62191166b020062052bf45ca4f51c
+    REF boost-${VERSION}
+    SHA512 5940cccab41e298e3eb442940f6dfccf00a89bdc5f9c9540eb530a8bfe5f19f06b3bcb2efaa81530e6712515946adc8a2854e28e0d395cd201e99b1068cd2511
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-interval/vcpkg.json b/external_imported/vcpkg/ports/boost-interval/vcpkg.json
index 70aa0505a..44cbd0293 100644
--- a/external_imported/vcpkg/ports/boost-interval/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-interval/vcpkg.json
@@ -1,27 +1,26 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-interval",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost interval module",
   "homepage": "https://github.com/boostorg/interval",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-detail",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-logic",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-intrusive/portfile.cmake b/external_imported/vcpkg/ports/boost-intrusive/portfile.cmake
index d6674de84..22a43ca2f 100644
--- a/external_imported/vcpkg/ports/boost-intrusive/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-intrusive/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/intrusive
-    REF boost-1.81.0
-    SHA512 1140d3862f53eb46fab4adefa1535f7ec0270bf555e6720b6c8ad35de583d4635bd564e30a2432faf67cc809d410205649c502ea6355207b48af163349fb748e
+    REF boost-${VERSION}
+    SHA512 f188d86409fe85ca1428c1ee799d26bcd0d411551938dfac4b0be6eb51dfb94aedd771148330ba690d12c5525645d28539619d6512fb7b862e021980dc25356a
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-intrusive/vcpkg.json b/external_imported/vcpkg/ports/boost-intrusive/vcpkg.json
index a37ea9349..7d11acd0e 100644
--- a/external_imported/vcpkg/ports/boost-intrusive/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-intrusive/vcpkg.json
@@ -1,39 +1,34 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-intrusive",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost intrusive module",
   "homepage": "https://github.com/boostorg/intrusive",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-container-hash",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-move",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-io/portfile.cmake b/external_imported/vcpkg/ports/boost-io/portfile.cmake
index 9ba3f8315..6063b1f39 100644
--- a/external_imported/vcpkg/ports/boost-io/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-io/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/io
-    REF boost-1.81.0
-    SHA512 0228da375019989241b5febd99ff45855aa90c12ff5ee181249e7309f2a9ec21d9c77c89060d4fea41bd66a89ae06c9d3cf190301124a0362a9b4b57cc7f5871
+    REF boost-${VERSION}
+    SHA512 1297ead38cde0c8859a43270dbb6d4e47050350fc22a3152b7f0b2f488ac3ed841f9ebb0f6c8ba40c56a93a700d5bb4656f9498dd9153040385509493e5dd9b9
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-io/vcpkg.json b/external_imported/vcpkg/ports/boost-io/vcpkg.json
index 672a9b8cb..f750d4465 100644
--- a/external_imported/vcpkg/ports/boost-io/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-io/vcpkg.json
@@ -1,19 +1,18 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-io",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost io module",
   "homepage": "https://github.com/boostorg/io",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-iostreams/b2-options.cmake b/external_imported/vcpkg/ports/boost-iostreams/b2-options.cmake
index b95c08db0..5b24d9d6d 100644
--- a/external_imported/vcpkg/ports/boost-iostreams/b2-options.cmake
+++ b/external_imported/vcpkg/ports/boost-iostreams/b2-options.cmake
@@ -40,12 +40,12 @@ if("zlib" IN_LIST FEATURES)
     list(APPEND B2_OPTIONS
         -sZLIB_INCLUDE="${CURRENT_INSTALLED_DIR}/include"
     )
-    # Overwride debug library name
-    if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-        if(WIN32)
+    # Overwride windows library names
+    if(WIN32)
+        if(CMAKE_BUILD_TYPE STREQUAL "Debug")
             set(ZLIB_NAME zlibd)
         else()
-            set(ZLIB_NAME z)
+            set(ZLIB_NAME zlib) # for mingw
         endif()
         list(APPEND B2_OPTIONS
             -sZLIB_NAME=${ZLIB_NAME}
diff --git a/external_imported/vcpkg/ports/boost-iostreams/portfile.cmake b/external_imported/vcpkg/ports/boost-iostreams/portfile.cmake
index 32b0545c0..438df7f72 100644
--- a/external_imported/vcpkg/ports/boost-iostreams/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-iostreams/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/iostreams
-    REF boost-1.81.0
-    SHA512 102adfd8c31e0b00d74914fc0c2a812ec0d5af53184f9caf4260b40028ccd4bd084b0916ad937a11c3af14580c004bc143479d09e55362f27b37033eaeb2ee1c
+    REF boost-${VERSION}
+    SHA512 2cd4aaf6c02f7ede5a2066072ec968a08035a44d45cb603665b898d2ad88f015e9c12022f56474a3277e9440d3dfce302587f8ac87d7fb72f574eed570089aab
     HEAD_REF master
     PATCHES Removeseekpos.patch
 )
diff --git a/external_imported/vcpkg/ports/boost-iostreams/vcpkg.json b/external_imported/vcpkg/ports/boost-iostreams/vcpkg.json
index dfa4fd0d5..c52c6b0ac 100644
--- a/external_imported/vcpkg/ports/boost-iostreams/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-iostreams/vcpkg.json
@@ -1,8 +1,7 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-iostreams",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost iostreams module",
   "homepage": "https://github.com/boostorg/iostreams",
   "license": "BSL-1.0",
@@ -10,90 +9,90 @@
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-build",
       "host": true,
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-detail",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-function",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-integer",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-iterator",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-modular-build-helper",
       "host": true,
-      "version>=": "1.81.0#4"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-numeric-conversion",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-random",
       "platform": "!uwp",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-range",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-regex",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-smart-ptr",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-utility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/boost-iterator/portfile.cmake b/external_imported/vcpkg/ports/boost-iterator/portfile.cmake
index e8a835d36..658c1fdb6 100644
--- a/external_imported/vcpkg/ports/boost-iterator/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-iterator/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/iterator
-    REF boost-1.81.0
-    SHA512 f96ad21b425922efa5d2c793f72a6b6515a3251816b0bf4554c9f95c59925fdb97f1505c8f7f9bf8b5d2bf05b13ebf27e89d674c7379eac084b37c5e6ff79bf2
+    REF boost-${VERSION}
+    SHA512 55ded3d37465edd5696a3d8cba14d4697c6895544c8e98c5d5443d1cf5a669be8f4217619033be6ea9dc72521a78373143dfbff62caa113ea31de6594afae24b
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-iterator/vcpkg.json b/external_imported/vcpkg/ports/boost-iterator/vcpkg.json
index 181a13a31..7df42523e 100644
--- a/external_imported/vcpkg/ports/boost-iterator/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-iterator/vcpkg.json
@@ -1,71 +1,66 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-iterator",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost iterator module",
   "homepage": "https://github.com/boostorg/iterator",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-concept-check",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-conversion",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-detail",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-function-types",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-fusion",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-optional",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-smart-ptr",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-utility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-json/b2-options.cmake b/external_imported/vcpkg/ports/boost-json/b2-options.cmake
deleted file mode 100644
index b05e7494f..000000000
--- a/external_imported/vcpkg/ports/boost-json/b2-options.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-if(APPLE)
-    list(APPEND B2_OPTIONS cxxstd=11)
-endif()
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/boost-json/portfile.cmake b/external_imported/vcpkg/ports/boost-json/portfile.cmake
index 67869b0a6..48cc32bf1 100644
--- a/external_imported/vcpkg/ports/boost-json/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-json/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/json
-    REF boost-1.81.0
-    SHA512 8ff7a7c68444faeb19c5ceaf82bbb35720645dd7fae5f14b0da83deb1d21ee3fc3dc353fb3144625b0062cf058411d8f58011e4da6e75850208831829342bbfb
+    REF boost-${VERSION}
+    SHA512 a463a99822c595d041ef16e5d831907d11cef02595826e9e7a6c6ab314573faf69f54ae65924fb10b414222ca26efc45066b097617f7a4b8b8b8e82cc97bb086
     HEAD_REF master
 )
 
@@ -14,9 +14,6 @@ vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile"
 )
 file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config")
 include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
-boost_modular_build(
-    SOURCE_PATH ${SOURCE_PATH}
-    BOOST_CMAKE_FRAGMENT "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake"
-)
+boost_modular_build(SOURCE_PATH ${SOURCE_PATH})
 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
diff --git a/external_imported/vcpkg/ports/boost-json/vcpkg.json b/external_imported/vcpkg/ports/boost-json/vcpkg.json
index 2b36a5759..6f01170bb 100644
--- a/external_imported/vcpkg/ports/boost-json/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-json/vcpkg.json
@@ -1,61 +1,64 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-json",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost json module",
   "homepage": "https://github.com/boostorg/json",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-align",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-build",
       "host": true,
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-container",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-container-hash",
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-describe",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-modular-build-helper",
       "host": true,
-      "version>=": "1.81.0#4"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mp11",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-system",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/boost-lambda/portfile.cmake b/external_imported/vcpkg/ports/boost-lambda/portfile.cmake
index 9a48d5354..623b2efe3 100644
--- a/external_imported/vcpkg/ports/boost-lambda/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-lambda/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/lambda
-    REF boost-1.81.0
-    SHA512 6267e7bf435906eecdc5cb94e824d92b98dd57563c13207d1d8edf2d0c5ca929254d98d0e15993b5823bf5f27832b69453532168e334528d95c0380243617616
+    REF boost-${VERSION}
+    SHA512 0cfd5465b8f18a67155936273bc5488c19543b12e54f6e7975bb7d769a9909f2359b9cdf24d5aa459ef9ff64f367ca26799f175ce16dbf7544c5871cdea1b1f9
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-lambda/vcpkg.json b/external_imported/vcpkg/ports/boost-lambda/vcpkg.json
index bcb8dd0ea..d18725fd0 100644
--- a/external_imported/vcpkg/ports/boost-lambda/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-lambda/vcpkg.json
@@ -1,55 +1,54 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-lambda",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost lambda module",
   "homepage": "https://github.com/boostorg/lambda",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-bind",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-detail",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-iterator",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-tuple",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-utility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-lambda2/portfile.cmake b/external_imported/vcpkg/ports/boost-lambda2/portfile.cmake
index de325d819..c7ef47860 100644
--- a/external_imported/vcpkg/ports/boost-lambda2/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-lambda2/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/lambda2
-    REF boost-1.81.0
-    SHA512 e9e07866168c8596926eb2c68a6dc9ee89a0ca3400edd751f02e1e6cda4799b4d6e932e49dca2d36ae932963b65b70fc1141145802488b872be8acb59338b32e
+    REF boost-${VERSION}
+    SHA512 6f64f262f75c394d69370f09f72de53e13cca9e5836f3feea4ba51b85ec6d6d50017c5c0d3822f2859db239f3e3eb199446902359155d999b6d159bc75793578
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-lambda2/vcpkg.json b/external_imported/vcpkg/ports/boost-lambda2/vcpkg.json
index c0a843897..c23397b0a 100644
--- a/external_imported/vcpkg/ports/boost-lambda2/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-lambda2/vcpkg.json
@@ -1,15 +1,18 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-lambda2",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost lambda2 module",
   "homepage": "https://github.com/boostorg/lambda2",
   "license": "BSL-1.0",
   "dependencies": [
+    {
+      "name": "boost-config",
+      "version>=": "1.84.0"
+    },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-leaf/portfile.cmake b/external_imported/vcpkg/ports/boost-leaf/portfile.cmake
index cbb645f1f..554c93539 100644
--- a/external_imported/vcpkg/ports/boost-leaf/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-leaf/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/leaf
-    REF boost-1.81.0
-    SHA512 a1c084eb82579417c0496f41820666d74a265d6dc82035e3835bc08aa4408a30535ee4dee83b769f8375c85737d36b89b7fc46b94f484ef4c2bbec339d0ccd5a
+    REF boost-${VERSION}
+    SHA512 9b76b2401aea6a78caf75e466150de68459b98d8d69930920c5618d78e0192f1c80a9c0a9f12f31eafd7c19565f76819c62f6b233abb370af57d18de6176fe00
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-leaf/vcpkg.json b/external_imported/vcpkg/ports/boost-leaf/vcpkg.json
index cc9cd74bd..64f6d717a 100644
--- a/external_imported/vcpkg/ports/boost-leaf/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-leaf/vcpkg.json
@@ -1,15 +1,18 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-leaf",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost leaf module",
   "homepage": "https://github.com/boostorg/leaf",
   "license": "BSL-1.0",
   "dependencies": [
+    {
+      "name": "boost-config",
+      "version>=": "1.84.0"
+    },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-lexical-cast/portfile.cmake b/external_imported/vcpkg/ports/boost-lexical-cast/portfile.cmake
index 3bf0ac1b2..24d950d20 100644
--- a/external_imported/vcpkg/ports/boost-lexical-cast/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-lexical-cast/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/lexical_cast
-    REF boost-1.81.0
-    SHA512 377420d3f3351cbf5d2e08d354f9507da16075c299c09a30e3d01fabe5d5e2c4e580d86a99f51861f0540e1255f3e3a7ddf7d5c4d306770e5c23182540621828
+    REF boost-${VERSION}
+    SHA512 c7afe64258bc2b7bcc23bf3ca4618f1eaa416700ea253e566f8fa663d660f1eedada661d7543d4722262f17135946e8ce0bcd2b21f6ae7997585367181c31ee1
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-lexical-cast/vcpkg.json b/external_imported/vcpkg/ports/boost-lexical-cast/vcpkg.json
index 017d6c696..a13d5e0f2 100644
--- a/external_imported/vcpkg/ports/boost-lexical-cast/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-lexical-cast/vcpkg.json
@@ -1,59 +1,42 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-lexical-cast",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost lexical_cast module",
   "homepage": "https://github.com/boostorg/lexical_cast",
   "license": "BSL-1.0",
   "dependencies": [
-    {
-      "name": "boost-array",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-assert",
-      "version>=": "1.81.0#2"
-    },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-container",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-integer",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-numeric-conversion",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-range",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-local-function/portfile.cmake b/external_imported/vcpkg/ports/boost-local-function/portfile.cmake
index 80749da88..c26530e28 100644
--- a/external_imported/vcpkg/ports/boost-local-function/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-local-function/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/local_function
-    REF boost-1.81.0
-    SHA512 b3d8f4d3ebc6bcf5684b848f9a8c2c2170026b54d529b5945f0c96fb49190cf424075b6c34d392dde0bed7ae801039721eee24a3d2f1eedfb4156472f9736876
+    REF boost-${VERSION}
+    SHA512 4f2a9659a59f83e866f1575c3b701f5e0c7471ef6ee2fbd11100acd06ecbbf27e8e2c8184d7f9bcea5fc9f0ba5d30b8c12d2a884b7558a96dab135aea888eeeb
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-local-function/vcpkg.json b/external_imported/vcpkg/ports/boost-local-function/vcpkg.json
index d189e5871..a700c7263 100644
--- a/external_imported/vcpkg/ports/boost-local-function/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-local-function/vcpkg.json
@@ -1,43 +1,42 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-local-function",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost local_function module",
   "homepage": "https://github.com/boostorg/local_function",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-scope-exit",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-typeof",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-utility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-locale/fix-dependencies.patch b/external_imported/vcpkg/ports/boost-locale/fix-dependencies.patch
index de6d4bf70..f0a45c328 100644
--- a/external_imported/vcpkg/ports/boost-locale/fix-dependencies.patch
+++ b/external_imported/vcpkg/ports/boost-locale/fix-dependencies.patch
@@ -1,8 +1,11 @@
+ build/Jamfile.v2 | 44 +++++++++++++-------------------------------
+ 1 file changed, 13 insertions(+), 31 deletions(-)
+
 diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
-index f1321db..b0e9283 100644
+index f1e2d05..f946a9b 100644
 --- a/build/Jamfile.v2
 +++ b/build/Jamfile.v2
-@@ -22,6 +21,7 @@ project /boost/locale
+@@ -22,6 +22,7 @@ project /boost/locale
  # Features
  
  feature.feature boost.locale.iconv : on off : optional propagated ;
@@ -10,7 +13,7 @@ index f1321db..b0e9283 100644
  feature.feature boost.locale.icu : on off :  optional propagated ;
  feature.feature boost.locale.posix : on off : optional propagated ;
  feature.feature boost.locale.std : on off : optional propagated ;
-@@ -133,13 +133,7 @@ if $(ICU_ICUUC_NAME)
+@@ -132,13 +133,7 @@ if $(ICU_ICUUC_NAME)
  }
  else
  {
@@ -21,11 +24,11 @@ index f1321db..b0e9283 100644
 -    lib icuuc : : <toolset>msvc                     <variant>debug <name>sicuucd <runtime-link>static <conditional>@path_options ;
 -    lib icuuc : : <toolset>intel <target-os>windows <variant>debug <name>sicuucd <runtime-link>static <conditional>@path_options ;
 -    lib icuuc : : <name>this_is_an_invalid_library_name ;
-+	alias icuuc : /user-config//icuuc ;
++    alias icuuc : /user-config//icuuc ;
  }
  
  if $(ICU_ICUDT_NAME)
-@@ -149,13 +143,7 @@ if $(ICU_ICUDT_NAME)
+@@ -148,13 +143,7 @@ if $(ICU_ICUDT_NAME)
  }
  else
  {
@@ -36,11 +39,11 @@ index f1321db..b0e9283 100644
 -    lib icudt : : <name>sicudt   <toolset>msvc                     <runtime-link>static <conditional>@path_options ;
 -    lib icudt : : <name>sicudt   <toolset>intel <target-os>windows <runtime-link>static <conditional>@path_options ;
 -    lib icudt : : <name>this_is_an_invalid_library_name ;
-+	alias icudt : /user-config//icudt ;
++    alias icudt : /user-config//icudt ;
  }
  
  if $(ICU_ICUIN_NAME)
-@@ -165,27 +153,15 @@ if $(ICU_ICUIN_NAME)
+@@ -164,27 +153,16 @@ if $(ICU_ICUIN_NAME)
  }
  else
  {
@@ -55,10 +58,11 @@ index f1321db..b0e9283 100644
 -    lib icuin : : <toolset>intel <target-os>windows <variant>debug   <name>sicuind  <runtime-link>static <conditional>@path_options ;
 -    lib icuin : : <toolset>intel <target-os>windows                  <name>sicuin   <runtime-link>static <conditional>@path_options ;
 -    lib icuin : : <name>this_is_an_invalid_library_name ;
-+	alias icuin : /user-config//icuin ;
++    alias icuin : /user-config//icuin ;
  }
-+explicit icuuc icuin icudt ;
  
++explicit icuuc icuin icudt ;
++
  ICU_OPTS =
    <include>$(.icu-path)/include
 -  <runtime-link>shared:<library>icuuc/<link>shared
@@ -73,15 +77,14 @@ index f1321db..b0e9283 100644
    <target-os>windows,<toolset>clang:<linkflags>"advapi32.lib"
    <runtime-link>static:<define>U_STATIC_IMPLEMENTATION=1
    ;
-@@ -204,6 +204,11 @@ rule configure-full ( properties * : flags-only )
+@@ -213,6 +191,10 @@ rule configure-full ( properties * : flags-only )
+     }
  
      local found-iconv ;
++    if <boost.locale.force-found-iconv>on in $(properties)
++    {
++        found-iconv = true ;
++    }
  
-+	if <boost.locale.force-found-iconv>on in $(properties)
-+	{
-+		found-iconv = true ;
-+	}
-+
-     # The system Iconv on Solaris may have bugs, while the GNU Iconv is fine.
-     # So enable by default only if not on Solaris.
-     if <boost.locale.iconv>on in $(properties)
+     if ! <boost.locale.iconv>off in $(properties)
+     {
diff --git a/external_imported/vcpkg/ports/boost-locale/portfile.cmake b/external_imported/vcpkg/ports/boost-locale/portfile.cmake
index bef8372e5..7d654b03a 100644
--- a/external_imported/vcpkg/ports/boost-locale/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-locale/portfile.cmake
@@ -3,15 +3,15 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/locale
-    REF boost-1.81.0
-    SHA512 553fe135656dfd4e1dd797396964508a3a9807c9a04233a86e340402eaf1913f8d89eff6e1c3fe9415258d541af877839d2d7b5616f40df892cbbdb2dfcbdb97
+    REF boost-${VERSION}
+    SHA512 515450eef186277ec60c29230e31ba600aafde6157bd815ebfe262037c61e31263a44f007bb71a8372a824161a817afff9b89ba538b4f7a2b69a030623cf5217
     HEAD_REF master
     PATCHES fix-dependencies.patch
 )
 
 vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2"
-    "import config : requires ;"
-    "import ../config/checks/config : requires ;"
+    "import config : requires"
+    "import ../config/checks/config : requires"
 )
 file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config")
 include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
diff --git a/external_imported/vcpkg/ports/boost-locale/vcpkg.json b/external_imported/vcpkg/ports/boost-locale/vcpkg.json
index befdcbb74..2ce1be3dd 100644
--- a/external_imported/vcpkg/ports/boost-locale/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-locale/vcpkg.json
@@ -1,8 +1,7 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-locale",
-  "version": "1.81.0",
-  "port-version": 3,
+  "version": "1.84.0",
   "description": "Boost locale module",
   "homepage": "https://github.com/boostorg/locale",
   "license": "BSL-1.0",
@@ -10,41 +9,45 @@
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-build",
       "host": true,
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-iterator",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-modular-build-helper",
       "host": true,
-      "version>=": "1.81.0#4"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-predef",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-thread",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-utility",
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "libiconv",
diff --git a/external_imported/vcpkg/ports/boost-lockfree/portfile.cmake b/external_imported/vcpkg/ports/boost-lockfree/portfile.cmake
index 92e69897b..c7a7cba58 100644
--- a/external_imported/vcpkg/ports/boost-lockfree/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-lockfree/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/lockfree
-    REF boost-1.81.0
-    SHA512 e912b96971df23f317807d49ed316f417ec4cbcbc37d35fed2c9404ab861dce62fb76074f2ed3e8cfa775b6785878bb85462331ac658924a1e63e158e56ba693
+    REF boost-${VERSION}
+    SHA512 880fe93bbcbceb6ded3ca6471847db28a63b77704de1a977e396d68b7fabff6d66de97b5238037c317ced26b4607deaec4ceb7bc50c6ebb4165836a458421e21
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-lockfree/vcpkg.json b/external_imported/vcpkg/ports/boost-lockfree/vcpkg.json
index 90488fce7..72c0dc0f4 100644
--- a/external_imported/vcpkg/ports/boost-lockfree/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-lockfree/vcpkg.json
@@ -1,75 +1,74 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-lockfree",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost lockfree module",
   "homepage": "https://github.com/boostorg/lockfree",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-align",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-array",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-atomic",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-integer",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-iterator",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-parameter",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-predef",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-tuple",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-utility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-log/portfile.cmake b/external_imported/vcpkg/ports/boost-log/portfile.cmake
index 5613efea5..cc2e18085 100644
--- a/external_imported/vcpkg/ports/boost-log/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-log/portfile.cmake
@@ -3,13 +3,13 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/log
-    REF boost-1.81.0
-    SHA512 916d4e820a1d12ff171960da9f37b273c16bd3b59d3c118b335af17b49795aec250761ae38fa3c0360468b16190161b5782020c6517805631af82861c83a6993
+    REF boost-${VERSION}
+    SHA512 cacd6cc1eb70da63638cf2769a7f4a8164293acecbfa2b782c9d1dbe83e20fe2c641f9e275358defd9b14598fe20224d6a7eb0d76fdaeb6b572aaa6465804655
     HEAD_REF master
 )
 
 file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents)
-string(REPLACE "import ../../config/checks/config" "import ../config/checks/config" _contents "${_contents}")
+string(REPLACE "import config : requires" "import ../config/checks/config : requires" _contents "${_contents}")
 string(REPLACE " <conditional>@select-arch-specific-sources" "#<conditional>@select-arch-specific-sources" _contents "${_contents}")
 file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}")
 vcpkg_replace_string("${SOURCE_PATH}/build/log-arch-config.jam"
diff --git a/external_imported/vcpkg/ports/boost-log/vcpkg.json b/external_imported/vcpkg/ports/boost-log/vcpkg.json
index 6f98673e9..1412c7c3a 100644
--- a/external_imported/vcpkg/ports/boost-log/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-log/vcpkg.json
@@ -1,8 +1,7 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-log",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost log module",
   "homepage": "https://github.com/boostorg/log",
   "license": "BSL-1.0",
@@ -10,187 +9,167 @@
   "dependencies": [
     {
       "name": "boost-align",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-array",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-asio",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-atomic",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-bind",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-build",
       "host": true,
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-container",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-date-time",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-filesystem",
       "platform": "!uwp",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-function-types",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-fusion",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-interprocess",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-intrusive",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-io",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-iterator",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-lexical-cast",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-modular-build-helper",
       "host": true,
-      "version>=": "1.81.0#4"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-move",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-optional",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-parameter",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-phoenix",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-predef",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-property-tree",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-proto",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-random",
       "platform": "!uwp",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-range",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-regex",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-smart-ptr",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-spirit",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-system",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-thread",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-index",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-utility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-winapi",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-xpressive",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/boost-logic/portfile.cmake b/external_imported/vcpkg/ports/boost-logic/portfile.cmake
index f58d936f8..e073ca42b 100644
--- a/external_imported/vcpkg/ports/boost-logic/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-logic/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/logic
-    REF boost-1.81.0
-    SHA512 c21e4be1a61e711810300269fb5d6594efc5d773f92d7796bcc1c1c4e121d41d5f6cc3bdd7ff90afa286bff54890b5f8992c1d27ea589f60a2f7caae43a044bc
+    REF boost-${VERSION}
+    SHA512 b5e02c6b7173869ab4d9f3c933e897d390bdc2353793a480306a857e3528bc0116590b3e87cbb9802f6adcb14b771591ce52feb587dff5393000ebf5b881b281
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-logic/vcpkg.json b/external_imported/vcpkg/ports/boost-logic/vcpkg.json
index f4ea5a552..edfd3a2a7 100644
--- a/external_imported/vcpkg/ports/boost-logic/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-logic/vcpkg.json
@@ -1,23 +1,22 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-logic",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost logic module",
   "homepage": "https://github.com/boostorg/logic",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-math/001-remove-checks.patch b/external_imported/vcpkg/ports/boost-math/001-remove-checks.patch
deleted file mode 100644
index d25166fa3..000000000
--- a/external_imported/vcpkg/ports/boost-math/001-remove-checks.patch
+++ /dev/null
@@ -1,23 +0,0 @@
- build/Jamfile.v2 | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
-index fd84028..3537e9f 100644
---- a/build/Jamfile.v2
-+++ b/build/Jamfile.v2
-@@ -5,7 +5,6 @@
- 
- import testing ;
- import pch ;
--import ../../config/checks/config : requires ;
- 
- project  
-     : requirements 
-@@ -19,7 +18,6 @@ project
-       <toolset>intel-linux:<cxxflags>-fvisibility=hidden
-       #<toolset>sun:<cxxflags>-xldscope=hidden
-       [ check-target-builds ../config//has_gcc_visibility "gcc visibility" : <toolset>gcc:<cxxflags>-fvisibility=hidden : ]
--      [ requires cxx11_noexcept cxx11_rvalue_references sfinae_expr cxx11_auto_declarations cxx11_lambdas cxx11_unified_initialization_syntax cxx11_hdr_tuple cxx11_hdr_initializer_list cxx11_hdr_chrono cxx11_thread_local cxx11_constexpr cxx11_nullptr cxx11_numeric_limits cxx11_decltype cxx11_hdr_array cxx11_hdr_atomic cxx11_hdr_type_traits cxx11_allocator cxx11_explicit_conversion_operators ]
-     ;
- 
- cpp-pch pch : ../src/tr1/pch.hpp : <include>../src/tr1 <link>shared:<define>BOOST_MATH_TR1_DYN_LINK=1 ; 
diff --git a/external_imported/vcpkg/ports/boost-math/b2-options.cmake b/external_imported/vcpkg/ports/boost-math/b2-options.cmake
deleted file mode 100644
index 573883468..000000000
--- a/external_imported/vcpkg/ports/boost-math/b2-options.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-if(APPLE)
-    list(APPEND B2_OPTIONS cxxstd=11)
-endif()
diff --git a/external_imported/vcpkg/ports/boost-math/portfile.cmake b/external_imported/vcpkg/ports/boost-math/portfile.cmake
index 2970d3477..fc9e7ce00 100644
--- a/external_imported/vcpkg/ports/boost-math/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-math/portfile.cmake
@@ -3,16 +3,17 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/math
-    REF boost-1.81.0
-    SHA512 70fc1c2f90e95c143d7e643aa6dfd2e65d9547a6b014cc9b0253ff83540cda2f89f712c21c96243c47af6ec74c2cd78a3876eba9620cc8a9b06ab7fb1713ab81
+    REF boost-${VERSION}
+    SHA512 5f5aec5c7c2de137fc8b69e33a3f0aa6c18b63292a66508cb68c86d3c1c27455f73432218e90cbd47e919e0be84a6d25af39aa1c4b9a223c013a948c029b7251
     HEAD_REF master
-    PATCHES 001-remove-checks.patch
 )
 
-include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
-boost_modular_build(
-    SOURCE_PATH ${SOURCE_PATH}
-    BOOST_CMAKE_FRAGMENT "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake"
+vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2"
+    "import ../../config/checks/config"
+    "import ../config/checks/config"
 )
+file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config")
+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
+boost_modular_build(SOURCE_PATH ${SOURCE_PATH})
 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
diff --git a/external_imported/vcpkg/ports/boost-math/vcpkg.json b/external_imported/vcpkg/ports/boost-math/vcpkg.json
index 7c30c1e80..0bc4e4905 100644
--- a/external_imported/vcpkg/ports/boost-math/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-math/vcpkg.json
@@ -1,66 +1,65 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-math",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost math module",
   "homepage": "https://github.com/boostorg/math",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-build",
       "host": true,
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-concept-check",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-integer",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-lexical-cast",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-modular-build-helper",
       "host": true,
-      "version>=": "1.81.0#4"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-predef",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-random",
       "platform": "!uwp",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/boost-metaparse/portfile.cmake b/external_imported/vcpkg/ports/boost-metaparse/portfile.cmake
index 0249900dd..a51e8f55c 100644
--- a/external_imported/vcpkg/ports/boost-metaparse/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-metaparse/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/metaparse
-    REF boost-1.81.0
-    SHA512 0e83052cc88ca58228d4bcc6bd0b303eaead883eec9734f103c60bac655035bffc1ee6cc6f68dab93a902241a3db503500a30ff884e4cbd757e5b5ca1d6c5ce7
+    REF boost-${VERSION}
+    SHA512 da82b2f0ea9afd553382d15d1668685cacab2190f491c5f7a26f15591f05c1be88168713ca47618907b9bd8f9eea66c589af5ab67a0146e8def43d6b66e4de2e
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-metaparse/vcpkg.json b/external_imported/vcpkg/ports/boost-metaparse/vcpkg.json
index c86cbfab4..53da7ad7f 100644
--- a/external_imported/vcpkg/ports/boost-metaparse/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-metaparse/vcpkg.json
@@ -1,39 +1,38 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-metaparse",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost metaparse module",
   "homepage": "https://github.com/boostorg/metaparse",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-predef",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-modular-build-helper/CMakeLists.txt b/external_imported/vcpkg/ports/boost-modular-build-helper/CMakeLists.txt
index 21902016e..272051b82 100644
--- a/external_imported/vcpkg/ports/boost-modular-build-helper/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/boost-modular-build-helper/CMakeLists.txt
@@ -61,16 +61,26 @@ if(VCPKG_DETECTED_MSVC)
         set(USER_CONFIG_TOOLSET clang-win)
     else()
         set(USER_CONFIG_TOOLSET msvc)
-    endif()
-    if(VCPKG_DETECTED_MSVC_VERSION LESS "1900")
-        math(EXPR USER_CONFIG_TOOLSET_VERSION "${VCPKG_DETECTED_MSVC_VERSION} / 10 - 60")
-    else()
-        math(EXPR USER_CONFIG_TOOLSET_VERSION "${VCPKG_DETECTED_MSVC_VERSION} / 10 - 50")
+        if(VCPKG_DETECTED_MSVC_VERSION LESS "1900")
+            math(EXPR USER_CONFIG_TOOLSET_VERSION "${VCPKG_DETECTED_MSVC_VERSION} / 10 - 60")
+        elseif(VCPKG_DETECTED_MSVC_VERSION LESS "1910")
+            set(USER_CONFIG_TOOLSET_VERSION "140")
+        elseif(VCPKG_DETECTED_MSVC_VERSION LESS "1920")
+            set(USER_CONFIG_TOOLSET_VERSION "141")
+        elseif(VCPKG_DETECTED_MSVC_VERSION LESS "1930")
+            set(USER_CONFIG_TOOLSET_VERSION "142")
+        elseif(VCPKG_DETECTED_MSVC_VERSION LESS "1950")
+            set(USER_CONFIG_TOOLSET_VERSION "143")
+        else()
+            message(FATAL_ERROR "Unsupported MSVC version: ${VCPKG_DETECTED_MSVC_VERSION}")
+        endif()
     endif()
 elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "wasm32")
     set(USER_CONFIG_TOOLSET emscripten)
 elseif(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     set(USER_CONFIG_TOOLSET clang)
+elseif(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID MATCHES "NVHPC")
+    set(USER_CONFIG_TOOLSET pgi)
 else()
     set(USER_CONFIG_TOOLSET gcc)
 endif()
@@ -144,7 +154,7 @@ if(CFLAGS MATCHES "-Zi" OR CXXFLAGS MATCHES "-Zi")
         )
 endif()
 
-if(USER_CONFIG_TOOLSET STREQUAL "msvc")
+if(USER_CONFIG_TOOLSET MATCHES "^(msvc|clang-win)$")
     file(TO_CMAKE_PATH "${CMAKE_CURRENT_LIST_DIR}/nothing.bat" NOTHING_BAT)
     string(APPEND USER_CONFIG_TOOLSET_OPTIONS
         "    <setup>\"${NOTHING_BAT}\"\n"
@@ -171,7 +181,7 @@ if(NOT LDFLAGS STREQUAL "")
     string(APPEND USER_CONFIG_TOOLSET_OPTIONS "    <linkflags>\"${LDFLAGS}\"\n")
 endif()
 
-if(WIN32 AND NOT USER_CONFIG_TOOLSET STREQUAL "msvc")
+if(WIN32 AND NOT USER_CONFIG_TOOLSET MATCHES "^(msvc|clang-win)$")
     # MINGW here causes b2 to not run cygpath
     string(APPEND USER_CONFIG_TOOLSET_OPTIONS
         "    <flavor>mingw\n"
@@ -291,10 +301,10 @@ add_custom_target(boost ALL
         threading=multi
 
         stage
-    WORKING_DIRECTORY ${SOURCE_PATH}/build
+    WORKING_DIRECTORY "${SOURCE_PATH}/build"
 )
 
-set(SUBDIR ${CMAKE_CURRENT_BINARY_DIR}/stage/lib)
+set(SUBDIR "${CMAKE_CURRENT_BINARY_DIR}/stage/lib")
 install(
     CODE "
 file(GLOB LIBS \"${SUBDIR}/*.so.*\" \"${SUBDIR}/*.so\" \"${SUBDIR}/*.a\" \"${SUBDIR}/*.dylib\" \"${SUBDIR}/*.dylib.*\" \"${SUBDIR}/*.lib\")
diff --git a/external_imported/vcpkg/ports/boost-modular-build-helper/Jamroot.jam.in b/external_imported/vcpkg/ports/boost-modular-build-helper/Jamroot.jam.in
index 9a490b3ad..83d7c9a33 100644
--- a/external_imported/vcpkg/ports/boost-modular-build-helper/Jamroot.jam.in
+++ b/external_imported/vcpkg/ports/boost-modular-build-helper/Jamroot.jam.in
@@ -4,6 +4,7 @@ constant BOOST_JAMROOT_MODULE : $(__name__) ;
 
 import boostcpp ;
 import feature ;
+import configure ;
 
 boostcpp.set-version $(BOOST_VERSION) ;
 
@@ -100,10 +101,36 @@ if "@PORT@" != "boost-filesystem"
 
 if "@PORT@" != "boost-atomic"
 {
+    lib synchronization ;
+    explicit synchronization ;
+
+    exe has_synchronization_lib : "@CURRENT_INSTALLED_DIR@/share/boost-atomic/has_synchronization_lib.cpp" : <library>synchronization ;
+    explicit has_synchronization_lib ;
+
+    rule check-synchronization-lib ( properties * )
+    {
+        local result ;
+
+        if <target-os>windows in $(properties)
+        {
+            if [ configure.builds has_synchronization_lib : $(properties) : "has synchronization.lib" ]
+            {
+                result += <library>synchronization ;
+            }
+            else
+            {
+                result += <define>BOOST_ATOMIC_NO_SYNCHRONIZATION_LIB ;
+            }
+        }
+
+        return $(result) ;
+    }
     use-project /boost/atomic : . ;
 
-    lib boost_atomic : : <file>"@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_atomic@BOOST_LIB_RELEASE_SUFFIX@" <variant>release ;
-    lib boost_atomic : : <file>"@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_atomic@BOOST_LIB_DEBUG_SUFFIX@" <variant>debug ;
+    lib boost_atomic : : <file>"@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_atomic@BOOST_LIB_RELEASE_SUFFIX@" <variant>release : : usage-requirements
+      <conditional>@check-synchronization-lib ;
+    lib boost_atomic : : <file>"@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_atomic@BOOST_LIB_DEBUG_SUFFIX@" <variant>debug : : usage-requirements
+      <conditional>@check-synchronization-lib ;
     explicit boost_atomic ;
 }
 
diff --git a/external_imported/vcpkg/ports/boost-modular-build-helper/boost-modular-build.cmake b/external_imported/vcpkg/ports/boost-modular-build-helper/boost-modular-build.cmake
index 6b61bd6ef..0bbd31be8 100644
--- a/external_imported/vcpkg/ports/boost-modular-build-helper/boost-modular-build.cmake
+++ b/external_imported/vcpkg/ports/boost-modular-build-helper/boost-modular-build.cmake
@@ -5,7 +5,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-cmake-get-vars/vcpkg-port-config.cma
 get_filename_component(BOOST_BUILD_INSTALLED_DIR "${CMAKE_CURRENT_LIST_DIR}" DIRECTORY)
 get_filename_component(BOOST_BUILD_INSTALLED_DIR "${BOOST_BUILD_INSTALLED_DIR}" DIRECTORY)
 
-set(BOOST_VERSION 1.81.0)
+set(BOOST_VERSION "${VERSION}")
 string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" BOOST_VERSION_MATCH "${BOOST_VERSION}")
 if("${CMAKE_MATCH_3}" GREATER 0)
     set(BOOST_VERSION_ABI_TAG "${CMAKE_MATCH_1}_${CMAKE_MATCH_2}_${CMAKE_MATCH_3}")
@@ -38,7 +38,6 @@ function(boost_modular_build)
     else()
         message(FATAL_ERROR "Could not find b2 in ${BOOST_BUILD_PATH}")
     endif()
-
     if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
         set(BOOST_LIB_PREFIX)
         if(VCPKG_PLATFORM_TOOLSET MATCHES "v14.")
@@ -80,12 +79,12 @@ function(boost_modular_build)
     if(_jamfile)
         file(READ "${_jamfile}" _contents)
         string(REGEX REPLACE
-            "\.\./\.\./([^/ ]+)/build//(boost_[^/ ]+)"
+            "\.\./\.\./([^/ ]+)/build//(boost_[^/ \n\r]+)"
             "/boost/\\1//\\2"
             _contents
             "${_contents}"
         )
-        string(REGEX REPLACE "/boost//([^/ ]+)" "/boost/\\1//boost_\\1" _contents "${_contents}")
+        string(REGEX REPLACE "/boost//([^/ \n\r]+)" "/boost/\\1//boost_\\1" _contents "${_contents}")
         file(WRITE "${_jamfile}" "${_contents}")
     endif()
 
@@ -102,7 +101,7 @@ function(boost_modular_build)
         string(REPLACE "." "" PYTHON_VERSION_TAG "${python3_version}")
     endif()
 
-    configure_file(${BOOST_BUILD_INSTALLED_DIR}/share/boost-build/Jamroot.jam.in ${_bm_SOURCE_PATH}/Jamroot.jam @ONLY)
+    configure_file("${BOOST_BUILD_INSTALLED_DIR}/share/boost-build/Jamroot.jam.in" "${_bm_SOURCE_PATH}/Jamroot.jam" @ONLY)
 
     set(configure_options)
     if(_bm_BOOST_CMAKE_FRAGMENT)
@@ -153,9 +152,7 @@ function(boost_modular_build)
         get_filename_component(DIRECTORY_OF_LIB_FILE ${LIB} DIRECTORY)
         string(REPLACE "libboost_" "boost_" NEW_FILENAME ${OLD_FILENAME})
         string(REPLACE "-s-" "-" NEW_FILENAME ${NEW_FILENAME}) # For Release libs
-        string(REPLACE "-vc141-" "-vc140-" NEW_FILENAME ${NEW_FILENAME}) # To merge VS2017 and VS2015 binaries
-        string(REPLACE "-vc142-" "-vc140-" NEW_FILENAME ${NEW_FILENAME}) # To merge VS2019 and VS2015 binaries
-        string(REPLACE "-vc143-" "-vc140-" NEW_FILENAME ${NEW_FILENAME}) # To merge VS2022 and VS2015 binaries
+        string(REGEX REPLACE "-vc14[1-9]-" "-vc140-" NEW_FILENAME ${NEW_FILENAME}) # To merge VS2022 VS2019 VS2017 and VS2015 binaries
         string(REPLACE "-sgd-" "-gd-" NEW_FILENAME ${NEW_FILENAME}) # For Debug libs
         string(REPLACE "-sgyd-" "-gyd-" NEW_FILENAME ${NEW_FILENAME}) # For Debug libs
         string(REPLACE "-gyd-" "-gd-" NEW_FILENAME ${NEW_FILENAME}) # For Debug libs with python debugging
@@ -199,5 +196,5 @@ function(boost_modular_build)
         message(FATAL_ERROR "No libraries were produced. This indicates a failure while building the boost library.")
     endif()
 
-    configure_file(${BOOST_BUILD_INSTALLED_DIR}/share/boost-build/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage COPYONLY)
+    configure_file("${BOOST_BUILD_INSTALLED_DIR}/share/boost-build/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY)
 endfunction()
diff --git a/external_imported/vcpkg/ports/boost-modular-build-helper/vcpkg.json b/external_imported/vcpkg/ports/boost-modular-build-helper/vcpkg.json
index 9f06862eb..216989d94 100644
--- a/external_imported/vcpkg/ports/boost-modular-build-helper/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-modular-build-helper/vcpkg.json
@@ -1,14 +1,14 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-modular-build-helper",
-  "version": "1.81.0",
-  "port-version": 5,
+  "version": "1.84.0",
+  "port-version": 2,
   "description": "Internal vcpkg port used to build Boost libraries",
   "license": "MIT",
   "dependencies": [
     {
       "name": "boost-uninstall",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/boost-move/portfile.cmake b/external_imported/vcpkg/ports/boost-move/portfile.cmake
index 3a80c52ae..c942bb337 100644
--- a/external_imported/vcpkg/ports/boost-move/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-move/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/move
-    REF boost-1.81.0
-    SHA512 fe2bdd2785f8f834c5b8e9c3866b4875872bc7db122d288591639c816bc767d111f84cc16ffcab6377cc22793c0fe973b5edb3073895767c87ed42bfeebd64a9
+    REF boost-${VERSION}
+    SHA512 48e14be7d74e666185ad335363efa12dcc45cf9d892d92837d56ede5a387c6f145c388f95b746089cde92944f20456228e63738ef33f95c86869c35e47dc1191
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-move/vcpkg.json b/external_imported/vcpkg/ports/boost-move/vcpkg.json
index d1332a5b6..d74826860 100644
--- a/external_imported/vcpkg/ports/boost-move/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-move/vcpkg.json
@@ -1,35 +1,18 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-move",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost move module",
   "homepage": "https://github.com/boostorg/move",
   "license": "BSL-1.0",
   "dependencies": [
-    {
-      "name": "boost-assert",
-      "version>=": "1.81.0#2"
-    },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-core",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
-    },
-    {
-      "name": "boost-winapi",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-mp11/portfile.cmake b/external_imported/vcpkg/ports/boost-mp11/portfile.cmake
index cd86a29e4..9b624629d 100644
--- a/external_imported/vcpkg/ports/boost-mp11/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-mp11/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/mp11
-    REF boost-1.81.0
-    SHA512 656e8c13b49962fc24b1087346d3d604c93a3f4d06c4eb5bac137ba84e0b823857cce9c1c2ab059c3e2ed51620a030c306643331e41cc9abc095b0700c93cdba
+    REF boost-${VERSION}
+    SHA512 acf09145539c89b9edf558de292367abb124fdf4ce65bbefd4ae01aa62c3cf3c4078014f0ce69f19857bf16fac3bb820fc2cbcbfc16ddcbbf08cac77053e480d
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-mp11/vcpkg.json b/external_imported/vcpkg/ports/boost-mp11/vcpkg.json
index b12e04af7..2cc0ea933 100644
--- a/external_imported/vcpkg/ports/boost-mp11/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-mp11/vcpkg.json
@@ -1,15 +1,18 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-mp11",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost mp11 module",
   "homepage": "https://github.com/boostorg/mp11",
   "license": "BSL-1.0",
   "dependencies": [
+    {
+      "name": "boost-config",
+      "version>=": "1.84.0"
+    },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-mpi/fix-build-boost_mpi_python-on-windows.patch b/external_imported/vcpkg/ports/boost-mpi/fix-build-boost_mpi_python-on-windows.patch
deleted file mode 100644
index 884e65d35..000000000
--- a/external_imported/vcpkg/ports/boost-mpi/fix-build-boost_mpi_python-on-windows.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- build/Jamfile.v2 | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
-index 8a2f1ac..abfba37 100644
---- a/build/Jamfile.v2
-+++ b/build/Jamfile.v2
-@@ -77,6 +77,7 @@ lib boost_mpi
-               : # Requirements
-                 <library>boost_mpi
-                 <library>/mpi//mpi [ mpi.extra-requirements ]
-+                <library>/python//python_for_extensions
-                 <library>/boost/python//boost_python
-                 <link>shared:<define>BOOST_MPI_DYN_LINK=1
-                 <link>shared:<define>BOOST_MPI_PYTHON_DYN_LINK=1
diff --git a/external_imported/vcpkg/ports/boost-mpi/portfile.cmake b/external_imported/vcpkg/ports/boost-mpi/portfile.cmake
index dbe312a4a..4fd6e37ef 100644
--- a/external_imported/vcpkg/ports/boost-mpi/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-mpi/portfile.cmake
@@ -3,10 +3,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/mpi
-    REF boost-1.81.0
-    SHA512 48b93c0fee3b83924764ffb35586d96337b3031a7135ad2e5c0f31240efc475fe691a17aa6c6799dbbe44bde81bd850965164d5980f1302833d389db9e6e4df1
+    REF boost-${VERSION}
+    SHA512 b2308a8ad35ad803b53d53025286e41dd24f309c422e284f37e7d40b0706697335c05fcd9b3630cb242f1333ba2280aff3134ce1983e652b7b5a8960c5b59d46
     HEAD_REF master
-    PATCHES fix-build-boost_mpi_python-on-windows.patch
 )
 
 include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
diff --git a/external_imported/vcpkg/ports/boost-mpi/vcpkg.json b/external_imported/vcpkg/ports/boost-mpi/vcpkg.json
index 7839c4aac..e09c0fa6a 100644
--- a/external_imported/vcpkg/ports/boost-mpi/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-mpi/vcpkg.json
@@ -1,8 +1,7 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-mpi",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost mpi module",
   "homepage": "https://github.com/boostorg/mpi",
   "license": "BSL-1.0",
@@ -10,85 +9,85 @@
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-build",
       "host": true,
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-foreach",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-function",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-graph",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-integer",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-iterator",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-lexical-cast",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-modular-build-helper",
       "host": true,
-      "version>=": "1.81.0#4"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-optional",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-serialization",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-smart-ptr",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-utility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     "mpi",
     {
@@ -107,7 +106,7 @@
             "python3"
           ],
           "platform": "!uwp & !emscripten & !ios & !android",
-          "version>=": "1.81.0#2"
+          "version>=": "1.84.0"
         },
         "python3"
       ]
diff --git a/external_imported/vcpkg/ports/boost-mpl/portfile.cmake b/external_imported/vcpkg/ports/boost-mpl/portfile.cmake
index e3ac91eef..ae4ba4c3f 100644
--- a/external_imported/vcpkg/ports/boost-mpl/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-mpl/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/mpl
-    REF boost-1.81.0
-    SHA512 76abcc8a7385741aa21cb6a6cb20ffe644928d039c293c720f846f62f0b68630d02e4232b1e004c258c4f7cec92744553a4d4a7875280dbc2a4667460441b3aa
+    REF boost-${VERSION}
+    SHA512 ca688f951443adbf1816d3b942b9f0e0fe0de973af62298e1923bb5cd0f90effe60895ceba82ccf94a8ce15a8b494bd4c4a233853e8e3cca9b441c728da78d32
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-mpl/vcpkg.json b/external_imported/vcpkg/ports/boost-mpl/vcpkg.json
index 73721251d..a28a56769 100644
--- a/external_imported/vcpkg/ports/boost-mpl/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-mpl/vcpkg.json
@@ -1,43 +1,42 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-mpl",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost mpl module",
   "homepage": "https://github.com/boostorg/mpl",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-predef",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-utility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-msm/portfile.cmake b/external_imported/vcpkg/ports/boost-msm/portfile.cmake
index 18b36a4a4..d673c18de 100644
--- a/external_imported/vcpkg/ports/boost-msm/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-msm/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/msm
-    REF boost-1.81.0
-    SHA512 4e52cdd009af2df9e012051cdee78d69610b6dc3edf9b3e08d90de742242e7508e14ccf1c9f68f9001c453bb1fc3644b0c5a6f8818a25158048649e4ae17287f
+    REF boost-${VERSION}
+    SHA512 8fe795f353abe53ecc4fd54e56e64d8a7872dae816b1085ffd2f34a3deae9dcc2c1d9024507d2e3029946fb5190a11982606768c822ec0bd8a7ac71264e384a2
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-msm/vcpkg.json b/external_imported/vcpkg/ports/boost-msm/vcpkg.json
index 128405fe6..bbdb08fc1 100644
--- a/external_imported/vcpkg/ports/boost-msm/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-msm/vcpkg.json
@@ -1,83 +1,82 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-msm",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost msm module",
   "homepage": "https://github.com/boostorg/msm",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-any",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-bind",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-circular-buffer",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-function",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-fusion",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-parameter",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-phoenix",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-proto",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-serialization",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-tuple",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-typeof",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-multi-array/portfile.cmake b/external_imported/vcpkg/ports/boost-multi-array/portfile.cmake
index 770e77ebd..156e9e337 100644
--- a/external_imported/vcpkg/ports/boost-multi-array/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-multi-array/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/multi_array
-    REF boost-1.81.0
-    SHA512 36b65b5989b9ae80af8cbf683ff45c3a2611efc96488e6f10bcfe7eab41cc9c6f4826e4059da7f3f764ccdd9666f6551a871177909436b55a9a6ded91953bb49
+    REF boost-${VERSION}
+    SHA512 410542c8e6e4defecdc57298ff5d7a16dab935c2ee41a364cb4379b5b8415272f2e00cf6ea22ec4688c0c96949bcb11d4c6579b1748f5ce358a3727b27fea17b
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-multi-array/vcpkg.json b/external_imported/vcpkg/ports/boost-multi-array/vcpkg.json
index cac1e8c53..358d4ebb8 100644
--- a/external_imported/vcpkg/ports/boost-multi-array/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-multi-array/vcpkg.json
@@ -1,55 +1,54 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-multi-array",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost multi_array module",
   "homepage": "https://github.com/boostorg/multi_array",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-array",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-concept-check",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-functional",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-iterator",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-multi-index/portfile.cmake b/external_imported/vcpkg/ports/boost-multi-index/portfile.cmake
index b1084208d..d10a10156 100644
--- a/external_imported/vcpkg/ports/boost-multi-index/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-multi-index/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/multi_index
-    REF boost-1.81.0
-    SHA512 7f08ece99ae953f8ef7855ded2c61366c5e5f751a0058ada537b21958ee8aa7a765ff01d400e61af2facb480f24cd2968a43e84aa826e5db82aac719efbe1f0e
+    REF boost-${VERSION}
+    SHA512 692af6313a7da320896a4f4fb8e26f11c095d3c730f94d9cccfcf7a4fccd9c9e9dd0113c61ccd82b1a8f4aa047202c8b2d7275933d4acba2f4a1926c7717a9db
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-multi-index/vcpkg.json b/external_imported/vcpkg/ports/boost-multi-index/vcpkg.json
index 4bbf4f1ec..f2bb3f4a2 100644
--- a/external_imported/vcpkg/ports/boost-multi-index/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-multi-index/vcpkg.json
@@ -1,87 +1,78 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-multi-index",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost multi_index module",
   "homepage": "https://github.com/boostorg/multi_index",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-bind",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-container-hash",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-foreach",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-integer",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-iterator",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-move",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-serialization",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-smart-ptr",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-tuple",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-utility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-multiprecision/portfile.cmake b/external_imported/vcpkg/ports/boost-multiprecision/portfile.cmake
index 48758c925..333ce9ef3 100644
--- a/external_imported/vcpkg/ports/boost-multiprecision/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-multiprecision/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/multiprecision
-    REF boost-1.81.0
-    SHA512 1ba40da0185a9af2cfa37641641ac6d1a281891d6d38f3ee3be0c713f02ff20be23ddefa68a50cf9ae88c5dff3f3c7f7b43d984150215fa1bb419cbb33a840e1
+    REF boost-${VERSION}
+    SHA512 7173006ac8b305eee2cfea3a88ea56ce85e48cc72eeeed360c115b3d4390e7f112b518a12b0bf6a9e6080bf7b0616b6f2d41c6a624f65a377584123add12908c
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-multiprecision/vcpkg.json b/external_imported/vcpkg/ports/boost-multiprecision/vcpkg.json
index f7fea02f1..c208f6c5b 100644
--- a/external_imported/vcpkg/ports/boost-multiprecision/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-multiprecision/vcpkg.json
@@ -1,52 +1,51 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-multiprecision",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost multiprecision module",
   "homepage": "https://github.com/boostorg/multiprecision",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-integer",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-lexical-cast",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-math",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-predef",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-random",
       "platform": "!uwp",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-mysql/portfile.cmake b/external_imported/vcpkg/ports/boost-mysql/portfile.cmake
new file mode 100644
index 000000000..f3cdfb2cd
--- /dev/null
+++ b/external_imported/vcpkg/ports/boost-mysql/portfile.cmake
@@ -0,0 +1,12 @@
+# Automatically generated by scripts/boost/generate-ports.ps1
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO boostorg/mysql
+    REF boost-${VERSION}
+    SHA512 4ca37165c6f7e93432a98044ceee23c7b31ac1c040b738cbc5dc5c84520963cc2678ca21b103e2a1542fb2df9344bb5a3077883f6a3d75509e6ac9a8854096ac
+    HEAD_REF master
+)
+
+include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
+boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
diff --git a/external_imported/vcpkg/ports/boost-mysql/vcpkg.json b/external_imported/vcpkg/ports/boost-mysql/vcpkg.json
new file mode 100644
index 000000000..3dd2892f5
--- /dev/null
+++ b/external_imported/vcpkg/ports/boost-mysql/vcpkg.json
@@ -0,0 +1,58 @@
+{
+  "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
+  "name": "boost-mysql",
+  "version": "1.84.0",
+  "description": "Boost mysql module",
+  "homepage": "https://github.com/boostorg/mysql",
+  "license": "BSL-1.0",
+  "dependencies": [
+    {
+      "name": "boost-asio",
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-assert",
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-config",
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-core",
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-describe",
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-endian",
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-lexical-cast",
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-mp11",
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-system",
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-throw-exception",
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-variant2",
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-vcpkg-helpers",
+      "version>=": "1.84.0"
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/boost-nowide/b2-options.cmake b/external_imported/vcpkg/ports/boost-nowide/b2-options.cmake
deleted file mode 100644
index 573883468..000000000
--- a/external_imported/vcpkg/ports/boost-nowide/b2-options.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-if(APPLE)
-    list(APPEND B2_OPTIONS cxxstd=11)
-endif()
diff --git a/external_imported/vcpkg/ports/boost-nowide/portfile.cmake b/external_imported/vcpkg/ports/boost-nowide/portfile.cmake
index f1524e476..85be3b759 100644
--- a/external_imported/vcpkg/ports/boost-nowide/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-nowide/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/nowide
-    REF boost-1.81.0
-    SHA512 2271e1c030bed4e487dcd0e2d6fc58808db740a0f00412431df3ba81d062e12aba9dbff94fb955b6343ee7d3447c02abe4e8705471355b11a240fd9765cd9a14
+    REF boost-${VERSION}
+    SHA512 c36ff430d155af583741d3040f0b3b647856e7dca5ead892651398a840b5fef54e96e0bd315d8c350e4fa841802593a857921456d7751ea356e772f3919b3227
     HEAD_REF master
 )
 
@@ -14,9 +14,6 @@ vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2"
 )
 file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config")
 include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
-boost_modular_build(
-    SOURCE_PATH ${SOURCE_PATH}
-    BOOST_CMAKE_FRAGMENT "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake"
-)
+boost_modular_build(SOURCE_PATH ${SOURCE_PATH})
 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
diff --git a/external_imported/vcpkg/ports/boost-nowide/vcpkg.json b/external_imported/vcpkg/ports/boost-nowide/vcpkg.json
index 16ff5c47a..acad2d091 100644
--- a/external_imported/vcpkg/ports/boost-nowide/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-nowide/vcpkg.json
@@ -1,8 +1,7 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-nowide",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost nowide module",
   "homepage": "https://github.com/boostorg/nowide",
   "license": "BSL-1.0",
@@ -10,25 +9,25 @@
     {
       "name": "boost-build",
       "host": true,
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-filesystem",
       "platform": "!uwp",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-modular-build-helper",
       "host": true,
-      "version>=": "1.81.0#4"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/boost-numeric-conversion/portfile.cmake b/external_imported/vcpkg/ports/boost-numeric-conversion/portfile.cmake
index 124eaa31f..96a1c3380 100644
--- a/external_imported/vcpkg/ports/boost-numeric-conversion/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-numeric-conversion/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/numeric_conversion
-    REF boost-1.81.0
-    SHA512 1d8882e1eba195ab7055c0aa93dd21296271b2e31fd89a07ec458c1d0bff2943cc9d86ae4651f0b70b32066d3acc53d77ed40f7a9cfefb9162594a036bae0626
+    REF boost-${VERSION}
+    SHA512 112c6495c1108fa63df34a1f8e2528833d0c271c8cc64e28a73430cf98ff99ef38cb249402a7fb1a1129d81543f4ab579833cad296f9f4e8523056b3956f66d6
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-numeric-conversion/vcpkg.json b/external_imported/vcpkg/ports/boost-numeric-conversion/vcpkg.json
index 803e54db6..afc3c9610 100644
--- a/external_imported/vcpkg/ports/boost-numeric-conversion/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-numeric-conversion/vcpkg.json
@@ -1,43 +1,42 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-numeric-conversion",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost numeric_conversion module",
   "homepage": "https://github.com/boostorg/numeric_conversion",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-conversion",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-odeint/portfile.cmake b/external_imported/vcpkg/ports/boost-odeint/portfile.cmake
index f86e16704..4475631a3 100644
--- a/external_imported/vcpkg/ports/boost-odeint/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-odeint/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/odeint
-    REF boost-1.81.0
-    SHA512 649274e1047db48810b495487772768d59187a243ee5e127721dbb57f2f71b6ae38de32b3dcd1020dac588081389e068c15cd76dd6965b9229bf08c62e023e64
+    REF boost-${VERSION}
+    SHA512 ea48b08fe00b9075af80f6f2614a639fd84b146ecfed229ae2ce23745a6a6d85b4d607ee2b199134848c87562ef8145aba0ff063a862653b3f01512de5717234
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-odeint/vcpkg.json b/external_imported/vcpkg/ports/boost-odeint/vcpkg.json
index 9d0cbfb5f..b2458eaf6 100644
--- a/external_imported/vcpkg/ports/boost-odeint/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-odeint/vcpkg.json
@@ -1,95 +1,94 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-odeint",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost odeint module",
   "homepage": "https://github.com/boostorg/odeint",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-array",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-bind",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-compute",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-function",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-fusion",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-iterator",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-math",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-multi-array",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-range",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-ublas",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-units",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-utility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ],
   "features": {
@@ -98,7 +97,7 @@
       "dependencies": [
         {
           "name": "boost-mpi",
-          "version>=": "1.81.0#2"
+          "version>=": "1.84.0"
         }
       ]
     }
diff --git a/external_imported/vcpkg/ports/boost-optional/portfile.cmake b/external_imported/vcpkg/ports/boost-optional/portfile.cmake
index 5c7890e0e..46fc9dc57 100644
--- a/external_imported/vcpkg/ports/boost-optional/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-optional/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/optional
-    REF boost-1.81.0
-    SHA512 68328b99373e4b8697be9cb4d7e5f69e6acf02606f37896f0f2e47304223ad6c9a801b6fa94bdddaa010482b190b854cda1760b0fcf55458e56d147123b88925
+    REF boost-${VERSION}
+    SHA512 5b676892661b4606c59217fe123591ce88f85cbfa5535aabd880d5c7173217dc5d1905f8aabd9beee1c38b80b43899b12c501fe121b59641f81a51b91508101b
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-optional/vcpkg.json b/external_imported/vcpkg/ports/boost-optional/vcpkg.json
index acd9ff05d..89ad178d6 100644
--- a/external_imported/vcpkg/ports/boost-optional/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-optional/vcpkg.json
@@ -1,55 +1,54 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-optional",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost optional module",
   "homepage": "https://github.com/boostorg/optional",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-detail",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-move",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-predef",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-utility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-outcome/portfile.cmake b/external_imported/vcpkg/ports/boost-outcome/portfile.cmake
index f88f9541a..b5269e5f6 100644
--- a/external_imported/vcpkg/ports/boost-outcome/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-outcome/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/outcome
-    REF boost-1.81.0
-    SHA512 0e79e5ca56a600d90d8d56ccc3631a7615119c4d9e6d6280d513ef0c96105c79e28d6dbd1f2b1deee4e702eb4393c404d9fba3144869c345650724185625da39
+    REF boost-${VERSION}
+    SHA512 c3dad6fcf0c45058e6a525ce601867a69d340d042e94e62964dd3a3be108e2e0712d242b1cba7452f40c5d5424fca6aaa09769090522f4856ea0155a0b994291
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-outcome/vcpkg.json b/external_imported/vcpkg/ports/boost-outcome/vcpkg.json
index a7947f6ca..5e54396c7 100644
--- a/external_imported/vcpkg/ports/boost-outcome/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-outcome/vcpkg.json
@@ -1,31 +1,30 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-outcome",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost outcome module",
   "homepage": "https://github.com/boostorg/outcome",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-system",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-parameter-python/portfile.cmake b/external_imported/vcpkg/ports/boost-parameter-python/portfile.cmake
index f1ffd9608..e56e03bcd 100644
--- a/external_imported/vcpkg/ports/boost-parameter-python/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-parameter-python/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/parameter_python
-    REF boost-1.81.0
-    SHA512 c2594479e1bea32004baec77182a29f5b708a3d539469f279c7445a22715d638f427ea44894ae33c128c498dd067e0f018ba623591e46605fb11b671e4796f85
+    REF boost-${VERSION}
+    SHA512 a6f6d9bd886063e3a65b52d02832069746a88dd20d6f37b50d439618696d53d57c71552910f92001f27000d331bad1993f78f1f268ecb87f679f0ffc89978607
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-parameter-python/vcpkg.json b/external_imported/vcpkg/ports/boost-parameter-python/vcpkg.json
index 5e59fc6e2..54a8968ef 100644
--- a/external_imported/vcpkg/ports/boost-parameter-python/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-parameter-python/vcpkg.json
@@ -1,33 +1,36 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-parameter-python",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost parameter_python module",
   "homepage": "https://github.com/boostorg/parameter_python",
   "license": "BSL-1.0",
   "supports": "!emscripten",
   "dependencies": [
+    {
+      "name": "boost-config",
+      "version>=": "1.84.0"
+    },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-parameter",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-python",
       "platform": "!uwp & !emscripten & !ios & !android",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-parameter/portfile.cmake b/external_imported/vcpkg/ports/boost-parameter/portfile.cmake
index 2cf16dca4..770d9a63d 100644
--- a/external_imported/vcpkg/ports/boost-parameter/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-parameter/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/parameter
-    REF boost-1.81.0
-    SHA512 bfd697eb4a88f586c056f10ba0f97777bfeb6a3407b60c02f6b61097601a78867abd3a950a683acd4a711cf8de45ceff06d451cd64e269ab466f4c9037d42e77
+    REF boost-${VERSION}
+    SHA512 c95c875e1f91ecab9687146b06715d526be216b16bd699eb296f3871ebcaedd40150b0bb401bb00299779184ef8748dd44c210d8f2fdef333fe9d349c8cc62be
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-parameter/vcpkg.json b/external_imported/vcpkg/ports/boost-parameter/vcpkg.json
index 0401febc4..4d560f5c6 100644
--- a/external_imported/vcpkg/ports/boost-parameter/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-parameter/vcpkg.json
@@ -1,55 +1,54 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-parameter",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost parameter module",
   "homepage": "https://github.com/boostorg/parameter",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-function",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-fusion",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mp11",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-optional",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-utility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-pfr/portfile.cmake b/external_imported/vcpkg/ports/boost-pfr/portfile.cmake
index 58c5dae1c..ecb17d4e2 100644
--- a/external_imported/vcpkg/ports/boost-pfr/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-pfr/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/pfr
-    REF boost-1.81.0
-    SHA512 07f06666c66e8408775410d8fc2598a139a50caed45346c14234e3f0e060c1d59c803d393f737956d9772055b6f1b0dc84ff9e98583dcfdb0fe265737b726265
+    REF boost-${VERSION}
+    SHA512 e6fa00165cc3871bf33c92ac218c1b313725450651afa2372f34f23ebc4c71114b75735923852aabf3855bc415d332a21feb557c3198dba2d25d816fa1e25dfe
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-pfr/vcpkg.json b/external_imported/vcpkg/ports/boost-pfr/vcpkg.json
index 37c7a8196..85d8140f7 100644
--- a/external_imported/vcpkg/ports/boost-pfr/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-pfr/vcpkg.json
@@ -1,15 +1,18 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-pfr",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost pfr module",
   "homepage": "https://github.com/boostorg/pfr",
   "license": "BSL-1.0",
   "dependencies": [
+    {
+      "name": "boost-config",
+      "version>=": "1.84.0"
+    },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-phoenix/fix-duplicate-symbols.patch b/external_imported/vcpkg/ports/boost-phoenix/fix-duplicate-symbols.patch
deleted file mode 100644
index fcfdba43f..000000000
--- a/external_imported/vcpkg/ports/boost-phoenix/fix-duplicate-symbols.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/include/boost/phoenix/stl/tuple.hpp b/include/boost/phoenix/stl/tuple.hpp
-index a83014a..9d49487 100644
---- a/include/boost/phoenix/stl/tuple.hpp
-+++ b/include/boost/phoenix/stl/tuple.hpp
-@@ -110,7 +110,7 @@ namespace boost { namespace phoenix {
-     namespace placeholders {
-         #define BOOST_PP_LOCAL_LIMITS (1, BOOST_PHOENIX_ARG_LIMIT)
-         #define BOOST_PP_LOCAL_MACRO(N)                                                \
--            auto uarg##N =                                                             \
-+            const auto uarg##N =                                                             \
-             boost::phoenix::get_<(N)-1>(boost::phoenix::placeholders::arg1);
-         #include BOOST_PP_LOCAL_ITERATE()
-     }
diff --git a/external_imported/vcpkg/ports/boost-phoenix/portfile.cmake b/external_imported/vcpkg/ports/boost-phoenix/portfile.cmake
index 9d9c7fe5a..9da56ba77 100644
--- a/external_imported/vcpkg/ports/boost-phoenix/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-phoenix/portfile.cmake
@@ -3,10 +3,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/phoenix
-    REF boost-1.81.0
-    SHA512 11bd2fc20c5cc89649ab37cd3502413827a84f80de5df606de783a001a25fd8d8647ca1f5c458f32609eb48c8c93723475ea1552ceccd5658a96a6890a936310
+    REF boost-${VERSION}
+    SHA512 216f11bd2db817a2cd94fd301db7011ec2215c48c9150e2acc182246880f4d289ba19a761c96601d0e5c453a7f79f96506a4883e2002a56b0825421e9e8b1905
     HEAD_REF master
-    PATCHES fix-duplicate-symbols.patch
 )
 
 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
diff --git a/external_imported/vcpkg/ports/boost-phoenix/vcpkg.json b/external_imported/vcpkg/ports/boost-phoenix/vcpkg.json
index ec397926c..39ceb2bfb 100644
--- a/external_imported/vcpkg/ports/boost-phoenix/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-phoenix/vcpkg.json
@@ -1,71 +1,70 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-phoenix",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost phoenix module",
   "homepage": "https://github.com/boostorg/phoenix",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-bind",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-function",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-fusion",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-predef",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-proto",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-range",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-smart-ptr",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-utility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-poly-collection/portfile.cmake b/external_imported/vcpkg/ports/boost-poly-collection/portfile.cmake
index 784b670b6..a0edaea9c 100644
--- a/external_imported/vcpkg/ports/boost-poly-collection/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-poly-collection/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/poly_collection
-    REF boost-1.81.0
-    SHA512 0c1b8ffeb564b0152a937170af0044f099e4f5d66f8503f710ee3111eb0ed267333ecd532cfe87816398cb31c1726a8c3b221dbe26c384142d73a63534f2cb3c
+    REF boost-${VERSION}
+    SHA512 a19b18633f3602cc3b3e00f59b4bcd26be0062f21be01c865c220944ad79707a8f5d149af88c879b8c889090612caaee37a49d2460471e39dbc619d65e783899
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-poly-collection/vcpkg.json b/external_imported/vcpkg/ports/boost-poly-collection/vcpkg.json
index 1e5bb02a4..3c96c2222 100644
--- a/external_imported/vcpkg/ports/boost-poly-collection/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-poly-collection/vcpkg.json
@@ -1,47 +1,46 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-poly-collection",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost poly_collection module",
   "homepage": "https://github.com/boostorg/poly_collection",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-iterator",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mp11",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-erasure",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-polygon/portfile.cmake b/external_imported/vcpkg/ports/boost-polygon/portfile.cmake
index 558a9128e..9b256a680 100644
--- a/external_imported/vcpkg/ports/boost-polygon/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-polygon/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/polygon
-    REF boost-1.81.0
-    SHA512 81b0a9b26e1c53eeac1122e5e17d4f30be39286051b3467076730ab987a20f3a0825b6a27375e27c9ccbb231dd410ed3f86695b6f9801299c891b4eeaefd8537
+    REF boost-${VERSION}
+    SHA512 6cb6bdb88f551a52d255ef9fcc500e1cfca26817f215747bafd5ec0d2531c1b2516f7cd8475994113632a015300d914bf0c9d6c731bb52a1874ce526b516fb5c
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-polygon/vcpkg.json b/external_imported/vcpkg/ports/boost-polygon/vcpkg.json
index 8d53c6bed..e31e5f4a8 100644
--- a/external_imported/vcpkg/ports/boost-polygon/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-polygon/vcpkg.json
@@ -1,19 +1,18 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-polygon",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost polygon module",
   "homepage": "https://github.com/boostorg/polygon",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-pool/portfile.cmake b/external_imported/vcpkg/ports/boost-pool/portfile.cmake
index 350f66382..2ed47dccb 100644
--- a/external_imported/vcpkg/ports/boost-pool/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-pool/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/pool
-    REF boost-1.81.0
-    SHA512 fb84d52bd44be8f6242a523e7b36407c65b8d9c5fc99670ecfbf18571cfdc296c9bb5a005e0d374cd3d2aa65dec828a8150e6e60dbcece3242e44a3d462a05d1
+    REF boost-${VERSION}
+    SHA512 2bb41cba37b9e9f4546ad5337f90a252629135ee6ca824f338d0bb2aa8a2572650096dcc9ce2601a30d2b4d8b1379916b82319602fbad51506368c3c8662f3e9
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-pool/vcpkg.json b/external_imported/vcpkg/ports/boost-pool/vcpkg.json
index bb4541f25..46fa0be23 100644
--- a/external_imported/vcpkg/ports/boost-pool/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-pool/vcpkg.json
@@ -1,39 +1,38 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-pool",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost pool module",
   "homepage": "https://github.com/boostorg/pool",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-integer",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-winapi",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-predef/portfile.cmake b/external_imported/vcpkg/ports/boost-predef/portfile.cmake
index 7136edd97..1e5a8300c 100644
--- a/external_imported/vcpkg/ports/boost-predef/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-predef/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/predef
-    REF boost-1.81.0
-    SHA512 aef179eb05efa197ba5f608041f6211ee58f36dea1e8e8b9ac64fc9187cd5542dd727e5d94b3f373030fb0f07ac4195be3ec0334c7ed0d44f8efa42b8117d55f
+    REF boost-${VERSION}
+    SHA512 cd99a92dad44cd5b62abda00073a05c4e595ac29ad436a3ca72fc51d430d9527cf4236f05140274fe64267a190ad888e5f1962351854b037a7f8217536e4db39
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-predef/vcpkg.json b/external_imported/vcpkg/ports/boost-predef/vcpkg.json
index b276d1e95..410d9903e 100644
--- a/external_imported/vcpkg/ports/boost-predef/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-predef/vcpkg.json
@@ -1,15 +1,18 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-predef",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost predef module",
   "homepage": "https://github.com/boostorg/predef",
   "license": "BSL-1.0",
   "dependencies": [
+    {
+      "name": "boost-config",
+      "version>=": "1.84.0"
+    },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-preprocessor/portfile.cmake b/external_imported/vcpkg/ports/boost-preprocessor/portfile.cmake
index 0ddbd7bc8..b78df15a9 100644
--- a/external_imported/vcpkg/ports/boost-preprocessor/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-preprocessor/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/preprocessor
-    REF boost-1.81.0
-    SHA512 f6905f711c957dceb83170a79b13487a1dfc237699a4ce1d1efaa1fa47ad93b66f0032b5585d53c3f771409e30da8f866eb4fc317ea7c21b1f42a46d9943339e
+    REF boost-${VERSION}
+    SHA512 71593852e9f2d13f6bce1301553b3988aac4dd6664407d13391aae5224666941eabba0579c647cec421c2e6e990ccf0ea9d01539d0e1b8016a47cc3206a512fe
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-preprocessor/vcpkg.json b/external_imported/vcpkg/ports/boost-preprocessor/vcpkg.json
index 001ca083c..9e90381b5 100644
--- a/external_imported/vcpkg/ports/boost-preprocessor/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-preprocessor/vcpkg.json
@@ -1,15 +1,18 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-preprocessor",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost preprocessor module",
   "homepage": "https://github.com/boostorg/preprocessor",
   "license": "BSL-1.0",
   "dependencies": [
+    {
+      "name": "boost-config",
+      "version>=": "1.84.0"
+    },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-process/portfile.cmake b/external_imported/vcpkg/ports/boost-process/portfile.cmake
index 66fb66d90..e7d4176d6 100644
--- a/external_imported/vcpkg/ports/boost-process/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-process/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/process
-    REF boost-1.81.0
-    SHA512 49d8dffcc34161c87ed8bef783e3bea5bdcd4c2b4b65a6a1d60b9422a149437a11db44d5f0ae6edcf7cb69c2a854eb284a3168a7ae0388805d90bfee8d518f2c
+    REF boost-${VERSION}
+    SHA512 cef528d676c3a909aff4175419dee7b2c13076d1d146e42d0840724dde31a8bce5ff3b8c22d4330dbc94ec70e8d3927c782997aa49b9d7262b309e7677c03436
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-process/vcpkg.json b/external_imported/vcpkg/ports/boost-process/vcpkg.json
index 2e2a4822a..d8694e43b 100644
--- a/external_imported/vcpkg/ports/boost-process/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-process/vcpkg.json
@@ -1,8 +1,7 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-process",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost process module",
   "homepage": "https://github.com/boostorg/process",
   "license": "BSL-1.0",
@@ -10,72 +9,80 @@
   "dependencies": [
     {
       "name": "boost-algorithm",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-asio",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-assert",
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-filesystem",
       "platform": "!uwp",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-fusion",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-io",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-iterator",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-move",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-optional",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-system",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-tokenizer",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-index",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-type-traits",
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-utility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-winapi",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-program-options/portfile.cmake b/external_imported/vcpkg/ports/boost-program-options/portfile.cmake
index 8462a3422..bdd8fd53c 100644
--- a/external_imported/vcpkg/ports/boost-program-options/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-program-options/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/program_options
-    REF boost-1.81.0
-    SHA512 15a1ece8cac0c50ac47a61cae0f3e1699a4dc5db8ec521390495d14a69928896f38cdbd5ea0b659065670a51c8adcfa5fa5050bc3e7a100886e7069d1fdb39f1
+    REF boost-${VERSION}
+    SHA512 ffd8cc5a8f18d173ef217082637dddfef650fdb061de0ee349352d90b138ff53b3893a44c093c005ae105430b3fd5ffcd31842c08c59779b141ab8307ade49a2
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-program-options/vcpkg.json b/external_imported/vcpkg/ports/boost-program-options/vcpkg.json
index c9f73c179..3e023dfc0 100644
--- a/external_imported/vcpkg/ports/boost-program-options/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-program-options/vcpkg.json
@@ -1,77 +1,76 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-program-options",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost program_options module",
   "homepage": "https://github.com/boostorg/program_options",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-any",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-bind",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-build",
       "host": true,
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-detail",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-function",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-iterator",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-lexical-cast",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-modular-build-helper",
       "host": true,
-      "version>=": "1.81.0#4"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-smart-ptr",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-tokenizer",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/boost-property-map-parallel/portfile.cmake b/external_imported/vcpkg/ports/boost-property-map-parallel/portfile.cmake
index 136562ba9..7fe5846ad 100644
--- a/external_imported/vcpkg/ports/boost-property-map-parallel/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-property-map-parallel/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/property_map_parallel
-    REF boost-1.81.0
-    SHA512 0baee8c8aa1b014ae921c95edef76a7b4e9bdf1f5d492164240190b60807750e54fa223c4a0a0493bdd1a111e4684ccc48be61393d7f4c10144b22540303a74f
+    REF boost-${VERSION}
+    SHA512 2a151616e81042627fb85a7dafd866059ab938baefa64d0f1ff9c05f55d72db93319dafdf100d71a521137969ee7729b96d09d1a8843c875ab21fa5811c53caf
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-property-map-parallel/vcpkg.json b/external_imported/vcpkg/ports/boost-property-map-parallel/vcpkg.json
index e5f818942..6a9d7f5b2 100644
--- a/external_imported/vcpkg/ports/boost-property-map-parallel/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-property-map-parallel/vcpkg.json
@@ -1,68 +1,67 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-property-map-parallel",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost property_map_parallel module",
   "homepage": "https://github.com/boostorg/property_map_parallel",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-concept-check",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-function",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpi",
       "platform": "!uwp",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-multi-index",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-optional",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-property-map",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-serialization",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-smart-ptr",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-property-map/portfile.cmake b/external_imported/vcpkg/ports/boost-property-map/portfile.cmake
index 958c8fd0e..1622715aa 100644
--- a/external_imported/vcpkg/ports/boost-property-map/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-property-map/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/property_map
-    REF boost-1.81.0
-    SHA512 13170f7bf807fdcaac37271ced6ad7357cf703c048ef9e9c2db554623ebe276bfbc0f1884b2d1f4b59b0316857ad3f6578401815127439e57064dde7aacc6c43
+    REF boost-${VERSION}
+    SHA512 2054656d0b514f407c6d207bf773166ce3756eef6d5b7de96b64127526f15e4e8a2a6e5266455074ebc33a26ff617167f1b166ae8b59b95348311ee65d266e37
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-property-map/vcpkg.json b/external_imported/vcpkg/ports/boost-property-map/vcpkg.json
index 24b3f5488..465a4951c 100644
--- a/external_imported/vcpkg/ports/boost-property-map/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-property-map/vcpkg.json
@@ -1,75 +1,74 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-property-map",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost property_map module",
   "homepage": "https://github.com/boostorg/property_map",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-any",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-concept-check",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-function",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-iterator",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-lexical-cast",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-smart-ptr",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-index",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-utility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-property-tree/portfile.cmake b/external_imported/vcpkg/ports/boost-property-tree/portfile.cmake
index 386cdda46..bf7cec53d 100644
--- a/external_imported/vcpkg/ports/boost-property-tree/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-property-tree/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/property_tree
-    REF boost-1.81.0
-    SHA512 a5501277c281641a9be66b12ac28deeb5f6b33441933352c8e1ea27621b20959a0f43588ec32e066515ac614eab84b8fb44303c038cb4dc8414a8a08129f8df8
+    REF boost-${VERSION}
+    SHA512 a0379ca2b4b68cd8e4a5a94c33f4ba6105ac8829b223aaac746b6e45e96d70c8f36b560dd63d2e4ef0da16021a85cbf9fdf640a8b566d50c7c968910497c8a4e
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-property-tree/vcpkg.json b/external_imported/vcpkg/ports/boost-property-tree/vcpkg.json
index 9e88d6385..2ef6677e4 100644
--- a/external_imported/vcpkg/ports/boost-property-tree/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-property-tree/vcpkg.json
@@ -1,75 +1,70 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-property-tree",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost property_tree module",
   "homepage": "https://github.com/boostorg/property_tree",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-any",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-bind",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-format",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-iterator",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-multi-index",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-optional",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-range",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-serialization",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-proto/portfile.cmake b/external_imported/vcpkg/ports/boost-proto/portfile.cmake
index 135774e13..d248fdddc 100644
--- a/external_imported/vcpkg/ports/boost-proto/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-proto/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/proto
-    REF boost-1.81.0
-    SHA512 726377322e940f272eb2a4f32c76143bab9c9330a5e491b32e64d21e523cf7aba2c5412a25b22a1bdf0e0fefe72ea2cb075d17829fb09ee65f1ad32667e66a26
+    REF boost-${VERSION}
+    SHA512 718ba06e05184756cac8768e6e4ad807e4a825688cb217ec502ff5c142f2dca873d53a5ec3e292f29dbfa21814f892f248a29786ec66bbd8065d380ac5a330df
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-proto/vcpkg.json b/external_imported/vcpkg/ports/boost-proto/vcpkg.json
index 982308e07..5dcd9d18c 100644
--- a/external_imported/vcpkg/ports/boost-proto/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-proto/vcpkg.json
@@ -1,55 +1,54 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-proto",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost proto module",
   "homepage": "https://github.com/boostorg/proto",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-fusion",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-range",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-typeof",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-utility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-ptr-container/portfile.cmake b/external_imported/vcpkg/ports/boost-ptr-container/portfile.cmake
index 7870988e1..d7002daaf 100644
--- a/external_imported/vcpkg/ports/boost-ptr-container/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-ptr-container/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/ptr_container
-    REF boost-1.81.0
-    SHA512 c7907e4ab0d6ae37c81e22650e77b16d8fa8ab085332db78b3508b35a9ad31a93bdeddfbcc374c7da05f89d36b08263d53ae09a6d1b1c4a90ac514f0584f5562
+    REF boost-${VERSION}
+    SHA512 443e3400b934baaf5d2389e2be3dc7cff343481a69ec7f9d4aa85017c69d6bee7a474a5358cfe38472f64cbab65216cf58c9802c74ee90d37bfdd7574b6004fd
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-ptr-container/vcpkg.json b/external_imported/vcpkg/ports/boost-ptr-container/vcpkg.json
index 45fc3c560..524759b58 100644
--- a/external_imported/vcpkg/ports/boost-ptr-container/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-ptr-container/vcpkg.json
@@ -1,71 +1,66 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-ptr-container",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost ptr_container module",
   "homepage": "https://github.com/boostorg/ptr_container",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-array",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-circular-buffer",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-iterator",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-range",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-serialization",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-smart-ptr",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-unordered",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-utility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-python/portfile.cmake b/external_imported/vcpkg/ports/boost-python/portfile.cmake
index 84ede1458..f278cc661 100644
--- a/external_imported/vcpkg/ports/boost-python/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-python/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/python
-    REF boost-1.81.0
-    SHA512 4b420629fa40199d8c1aab51cf1d06b10cbba2dadd3a648b9e8ec66a6fe48b8d70c9f09ccaef38b0b0d3ba9c17a5588062694fa73371dd4a64da4992bfbbf9d8
+    REF boost-${VERSION}
+    SHA512 c91f53a9d5a3aee649bb2882bdf1603e345a19f2ee45e9809aabe37cd3e760b30f26f397ede2c36bc7f33c3d10e347eed7e5d08e714ac93a6afcabccf993d507
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-python/vcpkg.json b/external_imported/vcpkg/ports/boost-python/vcpkg.json
index 3b7fe3e39..b017970b3 100644
--- a/external_imported/vcpkg/ports/boost-python/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-python/vcpkg.json
@@ -1,8 +1,7 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-python",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost python module",
   "homepage": "https://github.com/boostorg/python",
   "license": "BSL-1.0",
@@ -10,101 +9,101 @@
   "dependencies": [
     {
       "name": "boost-align",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-bind",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-build",
       "host": true,
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-conversion",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-detail",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-foreach",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-function",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-graph",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-integer",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-iterator",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-lexical-cast",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-modular-build-helper",
       "host": true,
-      "version>=": "1.81.0#4"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-numeric-conversion",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-property-map",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-smart-ptr",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-tuple",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-utility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/boost-qvm/portfile.cmake b/external_imported/vcpkg/ports/boost-qvm/portfile.cmake
index 3086d2eca..88e31b48b 100644
--- a/external_imported/vcpkg/ports/boost-qvm/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-qvm/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/qvm
-    REF boost-1.81.0
-    SHA512 6836aee23678bc4d634bb6cfd3cce800a7f794eaef18e43040019f33980769652e531b29a844e2ffe669cdd14eec526810624a2f2ebd9466aef66b905d1de5a7
+    REF boost-${VERSION}
+    SHA512 689300d0859504777ccc128f8a9e80e8cf0788625fcbefa3f8f0efe3c3691f2d83716de0174aafd73a2d37930e11322eec2b40ff07fca3401070eb6126e17c98
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-qvm/vcpkg.json b/external_imported/vcpkg/ports/boost-qvm/vcpkg.json
index 26eeb34e4..b53236c35 100644
--- a/external_imported/vcpkg/ports/boost-qvm/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-qvm/vcpkg.json
@@ -1,15 +1,18 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-qvm",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost qvm module",
   "homepage": "https://github.com/boostorg/qvm",
   "license": "BSL-1.0",
   "dependencies": [
+    {
+      "name": "boost-config",
+      "version>=": "1.84.0"
+    },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-random/portfile.cmake b/external_imported/vcpkg/ports/boost-random/portfile.cmake
index 0e345dd98..c7dffdcd3 100644
--- a/external_imported/vcpkg/ports/boost-random/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-random/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/random
-    REF boost-1.81.0
-    SHA512 838d6bb5334558116d73dc9ab463439dc31d170520b20c3c8e613181b01672a7e548ef2d59a57862fc8f1790eb22797a0f6d6bcc26c6490b6f6bb23e93307717
+    REF boost-${VERSION}
+    SHA512 43a331bf6edb7805766ea9a009ff4dd2e03645acf4da6cc2fa3756501e555d3d414a7af3659919300afa58ec2b4c553a11ac4ea298caaa4b36f848b1d91fcd49
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-random/vcpkg.json b/external_imported/vcpkg/ports/boost-random/vcpkg.json
index b15149a2e..263285b65 100644
--- a/external_imported/vcpkg/ports/boost-random/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-random/vcpkg.json
@@ -1,8 +1,7 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-random",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost random module",
   "homepage": "https://github.com/boostorg/random",
   "license": "BSL-1.0",
@@ -10,69 +9,69 @@
   "dependencies": [
     {
       "name": "boost-array",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-build",
       "host": true,
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-dynamic-bitset",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-integer",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-io",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-modular-build-helper",
       "host": true,
-      "version>=": "1.81.0#4"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-range",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-system",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-utility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/boost-range/portfile.cmake b/external_imported/vcpkg/ports/boost-range/portfile.cmake
index d7c68035b..8fcd9e495 100644
--- a/external_imported/vcpkg/ports/boost-range/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-range/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/range
-    REF boost-1.81.0
-    SHA512 7cdba4d90b181e1d9d787c04903bb970569a6797eef77e6ad400709d7734568a8a7e547aea4be9fcf0ae698dac202d1cbf868287c19c7db6c2c27490ee698152
+    REF boost-${VERSION}
+    SHA512 9b9694b8f42755e95ac06981a47282d83cc0bb30cd95943939b3d9799f7675a4d3d6949280f8856305c9f11b7a5684950971e133db55f3bdfad7482d6fb247d7
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-range/vcpkg.json b/external_imported/vcpkg/ports/boost-range/vcpkg.json
index 04eea4082..f6fb5d610 100644
--- a/external_imported/vcpkg/ports/boost-range/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-range/vcpkg.json
@@ -1,83 +1,82 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-range",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost range module",
   "homepage": "https://github.com/boostorg/range",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-array",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-concept-check",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-container-hash",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-conversion",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-detail",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-iterator",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-optional",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-regex",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-tuple",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-utility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-ratio/portfile.cmake b/external_imported/vcpkg/ports/boost-ratio/portfile.cmake
index 94904b6cb..52faf9b5f 100644
--- a/external_imported/vcpkg/ports/boost-ratio/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-ratio/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/ratio
-    REF boost-1.81.0
-    SHA512 4ccb58b874b3b05946c258762c1283a83e77d0930957df22226017ebf6e03ec948d5a5646b419d58e534a25f1615c73139d0b041804b30e4a12ca724353e4a4d
+    REF boost-${VERSION}
+    SHA512 a6c4e399ef26bc9abfec1bdea88c05e2d0a05f91df0e8601a68b070b0e26b39c9856987dece64904c380c44e565d458e87f1a6d1573557bd8b897e260fca3804
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-ratio/vcpkg.json b/external_imported/vcpkg/ports/boost-ratio/vcpkg.json
index 736c85f30..1d2965d09 100644
--- a/external_imported/vcpkg/ports/boost-ratio/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-ratio/vcpkg.json
@@ -1,43 +1,18 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-ratio",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost ratio module",
   "homepage": "https://github.com/boostorg/ratio",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-core",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-integer",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-mpl",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-rational",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-rational/portfile.cmake b/external_imported/vcpkg/ports/boost-rational/portfile.cmake
index eb60f42ef..1177ad65c 100644
--- a/external_imported/vcpkg/ports/boost-rational/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-rational/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/rational
-    REF boost-1.81.0
-    SHA512 6d3c8bd8b45448f23bfb5da85a2a54a303384b47569c4deb34230e810c3f8eecea96b1a8c33f22603b148318d25b1b741e5dd5513bea674a89990c7cf7fdfd94
+    REF boost-${VERSION}
+    SHA512 910e2e819e0d5a10ce70cd1a2197a4c9b1a0d3fabfcf305a44c066030e8ef2ab41eb972207ece3378f7dc0bdf3c4375820bd0e7e5de7959548cf2db321be5b79
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-rational/vcpkg.json b/external_imported/vcpkg/ports/boost-rational/vcpkg.json
index 286b73c9b..8e0b633a5 100644
--- a/external_imported/vcpkg/ports/boost-rational/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-rational/vcpkg.json
@@ -1,47 +1,46 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-rational",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost rational module",
   "homepage": "https://github.com/boostorg/rational",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-integer",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-utility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-redis/portfile.cmake b/external_imported/vcpkg/ports/boost-redis/portfile.cmake
new file mode 100644
index 000000000..2f6c54a38
--- /dev/null
+++ b/external_imported/vcpkg/ports/boost-redis/portfile.cmake
@@ -0,0 +1,12 @@
+# Automatically generated by scripts/boost/generate-ports.ps1
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO boostorg/redis
+    REF boost-${VERSION}
+    SHA512 f402f177ff0611655d44288c8cad08654db8d233e0f43baaf514c3d60438e5bb4a44a2dbf2ada0914123d09d591e703d6d9f00e409ae4dd01eeaf3d92cd5df17
+    HEAD_REF master
+)
+
+include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
+boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
diff --git a/external_imported/vcpkg/ports/boost-redis/vcpkg.json b/external_imported/vcpkg/ports/boost-redis/vcpkg.json
new file mode 100644
index 000000000..4aa2104d5
--- /dev/null
+++ b/external_imported/vcpkg/ports/boost-redis/vcpkg.json
@@ -0,0 +1,42 @@
+{
+  "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
+  "name": "boost-redis",
+  "version": "1.84.0",
+  "description": "Boost redis module",
+  "homepage": "https://github.com/boostorg/redis",
+  "license": "BSL-1.0",
+  "dependencies": [
+    {
+      "name": "boost-asio",
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-assert",
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-config",
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-core",
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-mp11",
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-system",
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-throw-exception",
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-vcpkg-helpers",
+      "version>=": "1.84.0"
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/boost-regex/b2-options.cmake b/external_imported/vcpkg/ports/boost-regex/b2-options.cmake
index 70597a0da..fbaea0045 100644
--- a/external_imported/vcpkg/ports/boost-regex/b2-options.cmake
+++ b/external_imported/vcpkg/ports/boost-regex/b2-options.cmake
@@ -1,8 +1,5 @@
 if("icu" IN_LIST FEATURES)
     set(B2_REQUIREMENTS "<library>/user-config//icuuc <library>/user-config//icudt <library>/user-config//icuin <define>BOOST_HAS_ICU=1")
-    if(APPLE)
-        list(APPEND B2_OPTIONS cxxstd=11)
-    endif()
 else()
     list(APPEND B2_OPTIONS --disable-icu)
 endif()
diff --git a/external_imported/vcpkg/ports/boost-regex/portfile.cmake b/external_imported/vcpkg/ports/boost-regex/portfile.cmake
index 2d5f1bc3f..3c8c552dd 100644
--- a/external_imported/vcpkg/ports/boost-regex/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-regex/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/regex
-    REF boost-1.81.0
-    SHA512 562e81ec1c2fe78606c47be5e35ac7e220fc3ce5acd0ddf10cf836fadf947287ecb2d9a630a32239b8d4a50c488abc186a707a14e884fcd640a606f8a9f59034
+    REF boost-${VERSION}
+    SHA512 16103c3175cc9c2f15c3fa4a80324eaa130d44a66c85d7efc74f910670f9cfaadeef57d87b5ff1868d11cdb721ac739bd1a842401c2c88c54701f375e275a5af
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-regex/vcpkg.json b/external_imported/vcpkg/ports/boost-regex/vcpkg.json
index c0d60de1f..92dd4ea8f 100644
--- a/external_imported/vcpkg/ports/boost-regex/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-regex/vcpkg.json
@@ -1,73 +1,72 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-regex",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost regex module",
   "homepage": "https://github.com/boostorg/regex",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-build",
       "host": true,
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-concept-check",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-container-hash",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-integer",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-modular-build-helper",
       "host": true,
-      "version>=": "1.81.0#4"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-predef",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-smart-ptr",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/boost-safe-numerics/portfile.cmake b/external_imported/vcpkg/ports/boost-safe-numerics/portfile.cmake
index 814a1ac12..2c078c470 100644
--- a/external_imported/vcpkg/ports/boost-safe-numerics/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-safe-numerics/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/safe_numerics
-    REF boost-1.81.0
-    SHA512 f94ae14c178efd17134bb85a59a4ea41363dc9ad2163d27ad03a269d121cdace0482e4c934e7c57f40969aaaeacf72bdcb244b1b5645eba09985950288f10cda
+    REF boost-${VERSION}
+    SHA512 224ad03e5c23c9d31d031049f70d79964f9cd9b1b69feb67dbcd78c8f67e959fe0d1fda356ceed9fe5b2a49a52cdb2416c6d1560ddf772c27a165bcc75984535
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-safe-numerics/vcpkg.json b/external_imported/vcpkg/ports/boost-safe-numerics/vcpkg.json
index 856665b29..f8ee09889 100644
--- a/external_imported/vcpkg/ports/boost-safe-numerics/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-safe-numerics/vcpkg.json
@@ -1,39 +1,38 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-safe-numerics",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost safe_numerics module",
   "homepage": "https://github.com/boostorg/safe_numerics",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-concept-check",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-integer",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-logic",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mp11",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-scope-exit/portfile.cmake b/external_imported/vcpkg/ports/boost-scope-exit/portfile.cmake
index 31fbdc86c..c48b56ac2 100644
--- a/external_imported/vcpkg/ports/boost-scope-exit/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-scope-exit/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/scope_exit
-    REF boost-1.81.0
-    SHA512 fa319cb0acf71b38140986bec520f0b7561ab378c7edda7545c526273987c5947abbbe2d412a4dff5ec8bf05df2f53e6b809ae834504f6c9d7da161ce5e1e2c5
+    REF boost-${VERSION}
+    SHA512 2e6a88d32f737089f5ded04ec1aa19a5199468b1fe825e10802d14b7b39c893578153aed152b35dbd44eee8a2a76be306108e8b7f5849ac169407342a7c3a3c1
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-scope-exit/vcpkg.json b/external_imported/vcpkg/ports/boost-scope-exit/vcpkg.json
index 0ed20e42a..4f815d9d1 100644
--- a/external_imported/vcpkg/ports/boost-scope-exit/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-scope-exit/vcpkg.json
@@ -1,35 +1,34 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-scope-exit",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost scope_exit module",
   "homepage": "https://github.com/boostorg/scope_exit",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-function",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-typeof",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-serialization/portfile.cmake b/external_imported/vcpkg/ports/boost-serialization/portfile.cmake
index 53cfdb5bc..d0017dab6 100644
--- a/external_imported/vcpkg/ports/boost-serialization/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-serialization/portfile.cmake
@@ -3,11 +3,16 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/serialization
-    REF boost-1.81.0
-    SHA512 38b4c3dd6f96d3ea4162298c378320d9dd253341ad4d19a6f3be0ec555e60d8d5977ab10905bf8eccd7c0555f097e95bf8254e81f0b5c7f6660d5720b712b8e8
+    REF boost-${VERSION}
+    SHA512 d3b0aecbb6f30317a9e072ae4304dde3ceb101a75e1e501450dd5b423502d4e0d8a36d0f9525f56448bd5b4bd8d8ad3ef4518aa386acb25ca378cb2d08b8a633
     HEAD_REF master
 )
 
+file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents)
+string(REPLACE "import ../../config/checks/config" "import ../config/checks/config" _contents "${_contents}")
+string(REPLACE "check-target-builds ../../config/checks//std_wstreambuf" "check-target-builds ../config/checks//std_wstreambuf" _contents "${_contents}")
+file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}")
+file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config")
 include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
 boost_modular_build(SOURCE_PATH ${SOURCE_PATH})
 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
diff --git a/external_imported/vcpkg/ports/boost-serialization/vcpkg.json b/external_imported/vcpkg/ports/boost-serialization/vcpkg.json
index 34d0ff715..16053e15e 100644
--- a/external_imported/vcpkg/ports/boost-serialization/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-serialization/vcpkg.json
@@ -1,109 +1,116 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-serialization",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost serialization module",
   "homepage": "https://github.com/boostorg/serialization",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-array",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-build",
       "host": true,
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-detail",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-function",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-integer",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-io",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-iterator",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-modular-build-helper",
       "host": true,
-      "version>=": "1.81.0#4"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-move",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-mp11",
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-optional",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-predef",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-smart-ptr",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-spirit",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
-      "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "name": "boost-throw-exception",
+      "version>=": "1.84.0"
     },
     {
-      "name": "boost-unordered",
-      "version>=": "1.81.0#2"
+      "name": "boost-type-traits",
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-utility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-variant",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-variant2",
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/boost-signals2/portfile.cmake b/external_imported/vcpkg/ports/boost-signals2/portfile.cmake
index 6433d0f66..1dee5ae3a 100644
--- a/external_imported/vcpkg/ports/boost-signals2/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-signals2/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/signals2
-    REF boost-1.81.0
-    SHA512 e5ae1b434e32d8eee2a351269e80fa618d8a46a2799630539a4d1ccd7dded9c98e56e9e4b7c363c0e53bf1a39f944c33d6bc30bf4eb14cf187dc14af09efa468
+    REF boost-${VERSION}
+    SHA512 1490e0f58cf3c5c0c1305e9e3c80709ed1e52a99749e36f07c217f7b11a5bd4b963cf5c67c692f1004296c5ebff31468679fd5fb3d34e0019f25d9cd7bd2fcd9
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-signals2/vcpkg.json b/external_imported/vcpkg/ports/boost-signals2/vcpkg.json
index a77404b07..08117e50f 100644
--- a/external_imported/vcpkg/ports/boost-signals2/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-signals2/vcpkg.json
@@ -1,79 +1,74 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-signals2",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost signals2 module",
   "homepage": "https://github.com/boostorg/signals2",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-bind",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-function",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-iterator",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-optional",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-parameter",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-predef",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-smart-ptr",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-tuple",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-variant",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-smart-ptr/portfile.cmake b/external_imported/vcpkg/ports/boost-smart-ptr/portfile.cmake
index 595f814aa..defd8365a 100644
--- a/external_imported/vcpkg/ports/boost-smart-ptr/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-smart-ptr/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/smart_ptr
-    REF boost-1.81.0
-    SHA512 dd4c9a9992063bdc7f68a27de7840ce4e0cbfd6c878705d7e1babc2f79e0e6b6841be72c3202b927ad14b5764c83253e1e8ff6e9d8007d3febf2dfafdbfa9c56
+    REF boost-${VERSION}
+    SHA512 e76e0d026d3561b68a7e66bdef4f55d311315fa43d467bb227666664c3f2c4fb0e88cf4a2a351f3dbb1912d93fdedfe93cc351df2ffe2ea612f244189cc0d902
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-smart-ptr/vcpkg.json b/external_imported/vcpkg/ports/boost-smart-ptr/vcpkg.json
index b8e435be8..77b2db760 100644
--- a/external_imported/vcpkg/ports/boost-smart-ptr/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-smart-ptr/vcpkg.json
@@ -1,43 +1,42 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-smart-ptr",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost smart_ptr module",
   "homepage": "https://github.com/boostorg/smart_ptr",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-move",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-sort/portfile.cmake b/external_imported/vcpkg/ports/boost-sort/portfile.cmake
index bdcda3918..df2e73a22 100644
--- a/external_imported/vcpkg/ports/boost-sort/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-sort/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/sort
-    REF boost-1.81.0
-    SHA512 f51b77cea6dc031042706c1269dfc663c5926e2d81adc9004df8d391005a85679ad182ab95dcddbf892d47eed539262db93cbe9b379200c8cef36ed165e092cf
+    REF boost-${VERSION}
+    SHA512 783b70bf511b53f374dc8883b5b5a494bb35a88e38d5d2c10d4e702f80ef5d0649f0c4aa4762875741519c4319c35cf3f1064fa221ee19dbdcf277c85f588dac
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-sort/vcpkg.json b/external_imported/vcpkg/ports/boost-sort/vcpkg.json
index f0ab20a50..7f9381030 100644
--- a/external_imported/vcpkg/ports/boost-sort/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-sort/vcpkg.json
@@ -1,35 +1,34 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-sort",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost sort module",
   "homepage": "https://github.com/boostorg/sort",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-range",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-spirit/portfile.cmake b/external_imported/vcpkg/ports/boost-spirit/portfile.cmake
index d01c657da..5aa0e7e4b 100644
--- a/external_imported/vcpkg/ports/boost-spirit/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-spirit/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/spirit
-    REF boost-1.81.0
-    SHA512 3249f109b7aa151a434f9de8a32418cd7f9d7e670980dc15033a359a61b9ebf5010f817557a0952fc7ecc248e0cbbc2155bd86178dd42a47b48d8b0263e087ee
+    REF boost-${VERSION}
+    SHA512 71154b32f04de98077381280d528bc20fe796d08515c699a1e04d43dc43ceee324dba81bc0db352da78a72f3ac205e7b46930147cfc85efadd34791542b35565
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-spirit/vcpkg.json b/external_imported/vcpkg/ports/boost-spirit/vcpkg.json
index c4a50d5c9..6dfdec856 100644
--- a/external_imported/vcpkg/ports/boost-spirit/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-spirit/vcpkg.json
@@ -1,131 +1,130 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-spirit",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost spirit module",
   "homepage": "https://github.com/boostorg/spirit",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-array",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-endian",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-function",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-function-types",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-fusion",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-integer",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-io",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-iterator",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-move",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-optional",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-phoenix",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-pool",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-proto",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-range",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-regex",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-smart-ptr",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-thread",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-typeof",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-unordered",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-utility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-variant",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-stacktrace/portfile.cmake b/external_imported/vcpkg/ports/boost-stacktrace/portfile.cmake
index c19fab55e..4654b4158 100644
--- a/external_imported/vcpkg/ports/boost-stacktrace/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-stacktrace/portfile.cmake
@@ -3,11 +3,16 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/stacktrace
-    REF boost-1.81.0
-    SHA512 6fc332886dfa57f2bbe9dc0b1e6d95ef84fbeee4a90fd2068c5c3598cec45aa9fe18015ca110b3714f93d492ec815de39b0f63b00afdc03beae9f810a4e1a9cb
+    REF boost-${VERSION}
+    SHA512 aa5c7ffd3ecc7d737399159aaa1dd675fe0da5621d4229a268c0413196e4f9172c151c8cc211df238d801dc6f7ac47efc8a453462c62c81c5c739b5c4b6c111f
     HEAD_REF master
 )
 
+vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2"
+    "import ../../config/checks/config"
+    "import ../config/checks/config"
+)
+file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config")
 include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
 boost_modular_build(SOURCE_PATH ${SOURCE_PATH})
 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
diff --git a/external_imported/vcpkg/ports/boost-stacktrace/vcpkg.json b/external_imported/vcpkg/ports/boost-stacktrace/vcpkg.json
index 405aa1df6..2e293e2ce 100644
--- a/external_imported/vcpkg/ports/boost-stacktrace/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-stacktrace/vcpkg.json
@@ -1,58 +1,45 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-stacktrace",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost stacktrace module",
   "homepage": "https://github.com/boostorg/stacktrace",
   "license": "BSL-1.0",
   "supports": "!uwp",
   "dependencies": [
-    {
-      "name": "boost-array",
-      "version>=": "1.81.0#2"
-    },
     {
       "name": "boost-build",
       "host": true,
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-container-hash",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-modular-build-helper",
       "host": true,
-      "version>=": "1.81.0#4"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-predef",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-winapi",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/boost-statechart/portfile.cmake b/external_imported/vcpkg/ports/boost-statechart/portfile.cmake
index c0a31217b..c4200528d 100644
--- a/external_imported/vcpkg/ports/boost-statechart/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-statechart/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/statechart
-    REF boost-1.81.0
-    SHA512 4ab660f7da082e8c211fe3c03b222d1c3e7f556836dec70d10c008b14b5678a5c7aa288e8a0f0f97e23daeb5b1eda7b70738b0cac1b86e12223fcd34a50e305c
+    REF boost-${VERSION}
+    SHA512 70bd4e974da812581279b972129192e5214b58750f55f8d26612bb9db73d1b437d1253e812cb9c06a5e1e5d66b3aff222b2b5bc16fefb005166f0f267b87cf23
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-statechart/vcpkg.json b/external_imported/vcpkg/ports/boost-statechart/vcpkg.json
index db820e60e..e060836f0 100644
--- a/external_imported/vcpkg/ports/boost-statechart/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-statechart/vcpkg.json
@@ -1,63 +1,62 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-statechart",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost statechart module",
   "homepage": "https://github.com/boostorg/statechart",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-bind",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-conversion",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-detail",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-function",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-smart-ptr",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-thread",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-static-assert/portfile.cmake b/external_imported/vcpkg/ports/boost-static-assert/portfile.cmake
index 9a4bfe144..b67011a64 100644
--- a/external_imported/vcpkg/ports/boost-static-assert/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-static-assert/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/static_assert
-    REF boost-1.81.0
-    SHA512 42eebf9324dd6bdd601eaf388f6eb6f484ab730234991393422febe27cd53b6fa25afdff4914fce810b466049429dcf0045d111df5fe8b6c4f9f9a1f2fe782af
+    REF boost-${VERSION}
+    SHA512 8e6fb68929e81c0a89af14a5df7bcb886acd2c69a54bac9e3bb3c7d00c8353cd723fd25e9157ee99d5fb91a4d92a078cac71dbb9e9585a12b15dda807edfc79f
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-static-assert/vcpkg.json b/external_imported/vcpkg/ports/boost-static-assert/vcpkg.json
index e03688034..ba4041324 100644
--- a/external_imported/vcpkg/ports/boost-static-assert/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-static-assert/vcpkg.json
@@ -1,19 +1,18 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-static-assert",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost static_assert module",
   "homepage": "https://github.com/boostorg/static_assert",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-static-string/portfile.cmake b/external_imported/vcpkg/ports/boost-static-string/portfile.cmake
index 53a8f7a25..b4666abac 100644
--- a/external_imported/vcpkg/ports/boost-static-string/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-static-string/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/static_string
-    REF boost-1.81.0
-    SHA512 8ccd07f38512f8ce4031149c087928baea95ea9c54685e10b8b0e2b0dd6e7777243d5b94f436de6647e42f56cc1b1fb74f9a0843db7f5c21ce40100c7bbd6176
+    REF boost-${VERSION}
+    SHA512 9c6c6ef93c2c1407dfa0e624d898802047067e17433c1fb3fb05522c08dd1910127dce01e23b7392d607fa2bb9ef1f491b34f61814681501ce204239b9d609b0
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-static-string/vcpkg.json b/external_imported/vcpkg/ports/boost-static-string/vcpkg.json
index b42cb24e8..0f1129418 100644
--- a/external_imported/vcpkg/ports/boost-static-string/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-static-string/vcpkg.json
@@ -1,35 +1,42 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-static-string",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost static_string module",
   "homepage": "https://github.com/boostorg/static_string",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-config",
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-container-hash",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-core",
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-utility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-stl-interfaces/portfile.cmake b/external_imported/vcpkg/ports/boost-stl-interfaces/portfile.cmake
index 5175b627c..44d66ad64 100644
--- a/external_imported/vcpkg/ports/boost-stl-interfaces/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-stl-interfaces/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/stl_interfaces
-    REF boost-1.81.0
-    SHA512 2b1dd15bbc65c40303a5ca635623b959a32fcbd8f3b1e36621a7d5d49082b2ea947ca401e102c23d4bdc95a684b0ade450903899d2d14d5dd530facf51072d60
+    REF boost-${VERSION}
+    SHA512 09f40799838841f7602f9746a33b4f93fe430619fc1c3972ebb0aa4887eded0406457f0a2b794f58924f47ff44ca6c1386e6f97fbe97911eb749b42a1b16aa09
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-stl-interfaces/vcpkg.json b/external_imported/vcpkg/ports/boost-stl-interfaces/vcpkg.json
index 052de341c..4c7316c86 100644
--- a/external_imported/vcpkg/ports/boost-stl-interfaces/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-stl-interfaces/vcpkg.json
@@ -1,27 +1,26 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-stl-interfaces",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost stl_interfaces module",
   "homepage": "https://github.com/boostorg/stl_interfaces",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-system/portfile.cmake b/external_imported/vcpkg/ports/boost-system/portfile.cmake
index 46fa46914..07d8234f6 100644
--- a/external_imported/vcpkg/ports/boost-system/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-system/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_buildpath_length_warning(37)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/system
-    REF boost-1.81.0
-    SHA512 0b6b86a6ca9743814c4bebe7d1013205f0216e42c691c1bb8be01faf1e7767487d13f87f86269ddc11ea0015516b997dc3680d79ef35f6353cff4639932dd642
+    REF boost-${VERSION}
+    SHA512 aa096fbef1f95bc97c82af87f0cb825b21b67d53ccec3fdeaef3e5a478b3f0865b0026ab7aadc3d7825a8bd345f980cb0bf4f9c698ac7403644cfce2a3fd1151
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-system/vcpkg.json b/external_imported/vcpkg/ports/boost-system/vcpkg.json
index 0571a2566..b050a3094 100644
--- a/external_imported/vcpkg/ports/boost-system/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-system/vcpkg.json
@@ -1,45 +1,44 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-system",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost system module",
   "homepage": "https://github.com/boostorg/system",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-build",
       "host": true,
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-modular-build-helper",
       "host": true,
-      "version>=": "1.81.0#4"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-variant2",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-winapi",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/boost-test/portfile.cmake b/external_imported/vcpkg/ports/boost-test/portfile.cmake
index 905536fb9..688a906cd 100644
--- a/external_imported/vcpkg/ports/boost-test/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-test/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/test
-    REF boost-1.81.0
-    SHA512 453e6500de87eb34d5071392d13d3643692871e37d3416e08e1f621aab03d4408fc1f1e94d5be9a2ce2eaf53272b438cc7615c7ffadfa0324e00c3d425f9143b
+    REF boost-${VERSION}
+    SHA512 a1aad9916bce40020770451541ba933da7998deada172504560727587a19f9859ef6e02439e1d2774b4e6e1590da2b358b066d02d00115719d80644700caf170
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-test/vcpkg.json b/external_imported/vcpkg/ports/boost-test/vcpkg.json
index d0eb60f68..1f28379b3 100644
--- a/external_imported/vcpkg/ports/boost-test/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-test/vcpkg.json
@@ -1,8 +1,7 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-test",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost test module",
   "homepage": "https://github.com/boostorg/test",
   "license": "BSL-1.0",
@@ -10,89 +9,89 @@
   "dependencies": [
     {
       "name": "boost-algorithm",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-bind",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-build",
       "host": true,
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-detail",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-function",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-io",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-iterator",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-modular-build-helper",
       "host": true,
-      "version>=": "1.81.0#4"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-numeric-conversion",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-optional",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-smart-ptr",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-utility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/boost-thread/portfile.cmake b/external_imported/vcpkg/ports/boost-thread/portfile.cmake
index e536567b1..bf79e9e78 100644
--- a/external_imported/vcpkg/ports/boost-thread/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-thread/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/thread
-    REF boost-1.81.0
-    SHA512 d4550a68438d97996c07967cef47eb9ddb39049d85adb939c4c38161152460f9768f62a588bafd0c7da2e9f5696a371c2609915f182a77c2d065f602f934487d
+    REF boost-${VERSION}
+    SHA512 9cf5afffb4ecfd9fd9c264c6ad8f06d3ea71dd459cd68555dfcb2b904b6e5cc491cd5cc5e9774b0c6697ceaf13567ce78e1f7e77ac1fc9121ea04a34ac3df26a
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-thread/vcpkg.json b/external_imported/vcpkg/ports/boost-thread/vcpkg.json
index 5a454a932..417a8b4b7 100644
--- a/external_imported/vcpkg/ports/boost-thread/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-thread/vcpkg.json
@@ -1,141 +1,124 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-thread",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost thread module",
   "homepage": "https://github.com/boostorg/thread",
   "license": "BSL-1.0",
   "dependencies": [
-    {
-      "name": "boost-algorithm",
-      "version>=": "1.81.0#2"
-    },
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-atomic",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-bind",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-build",
       "host": true,
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-chrono",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-concept-check",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-container",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-container-hash",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-date-time",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-function",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-intrusive",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-io",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-iterator",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-lexical-cast",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-modular-build-helper",
       "host": true,
-      "version>=": "1.81.0#4"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-move",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-optional",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-predef",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-smart-ptr",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-system",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-tuple",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-utility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-winapi",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/boost-throw-exception/portfile.cmake b/external_imported/vcpkg/ports/boost-throw-exception/portfile.cmake
index 9f500c845..1158e3e88 100644
--- a/external_imported/vcpkg/ports/boost-throw-exception/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-throw-exception/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/throw_exception
-    REF boost-1.81.0
-    SHA512 e70829495f07b0f2ae969db42b131d6a35831cdb5fd1e53ee5b821803f55b3e6190e781f4adbbe55fb06e588057e0b21aed9f02feb1337596c64d107b05dcc26
+    REF boost-${VERSION}
+    SHA512 e654e745a7c3efd0f871e25bb7dde940f1fc0c7df5d68f4e61aa947ec5c903606ab52c5a853c226c1f16f5becf0ea2505556900c72143e98fc802df27b102e9e
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-throw-exception/vcpkg.json b/external_imported/vcpkg/ports/boost-throw-exception/vcpkg.json
index 5bfb14ee5..ceb73e6b5 100644
--- a/external_imported/vcpkg/ports/boost-throw-exception/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-throw-exception/vcpkg.json
@@ -1,23 +1,22 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-throw-exception",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost throw_exception module",
   "homepage": "https://github.com/boostorg/throw_exception",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-timer/portfile.cmake b/external_imported/vcpkg/ports/boost-timer/portfile.cmake
index 2e913e2d4..998715322 100644
--- a/external_imported/vcpkg/ports/boost-timer/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-timer/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/timer
-    REF boost-1.81.0
-    SHA512 75c1aa0b3faac45d01eee58456b0cf620bbf9dc1e0481f109554fc590c7a5f35832f1ee5e6665c85c48672b3282b59ce3fc3b75a432078e9f6061345b43af0f2
+    REF boost-${VERSION}
+    SHA512 fd4c563794d67597f6cf71f4306e76b4205c5994183f95c451abbb7a41d2821898b7f98317d7d213490165d700b8264abc0d016f7e67118cfdc0ae06b61f93fe
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-timer/vcpkg.json b/external_imported/vcpkg/ports/boost-timer/vcpkg.json
index c11e05645..88b9ce689 100644
--- a/external_imported/vcpkg/ports/boost-timer/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-timer/vcpkg.json
@@ -1,8 +1,7 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-timer",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost timer module",
   "homepage": "https://github.com/boostorg/timer",
   "license": "BSL-1.0",
@@ -10,44 +9,28 @@
     {
       "name": "boost-build",
       "host": true,
-      "version>=": "1.81.0#3"
-    },
-    {
-      "name": "boost-chrono",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-io",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-modular-build-helper",
       "host": true,
-      "version>=": "1.81.0#4"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-predef",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-system",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/boost-tokenizer/portfile.cmake b/external_imported/vcpkg/ports/boost-tokenizer/portfile.cmake
index 91d767e7a..0e19e2e72 100644
--- a/external_imported/vcpkg/ports/boost-tokenizer/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-tokenizer/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/tokenizer
-    REF boost-1.81.0
-    SHA512 e88ba7f22f028a0d96ee7dbc9ebd4385dfb188ef400a5fb267b60d6f847a25554d69403213b8a72c6c39d373ba27f27cb46c8a851562a1ea3685f7f1ed1acc5a
+    REF boost-${VERSION}
+    SHA512 dc6fa4cc24eb6c2ecd92032a1b004a826408e2800b285a164e78663c9f78570b50fbde919ab1d3e0b818690f0352b63194df2511f78e7c14996293be416df154
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-tokenizer/vcpkg.json b/external_imported/vcpkg/ports/boost-tokenizer/vcpkg.json
index 58961cc99..6b5ea48b4 100644
--- a/external_imported/vcpkg/ports/boost-tokenizer/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-tokenizer/vcpkg.json
@@ -1,39 +1,38 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-tokenizer",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost tokenizer module",
   "homepage": "https://github.com/boostorg/tokenizer",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-iterator",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-tti/portfile.cmake b/external_imported/vcpkg/ports/boost-tti/portfile.cmake
index 9a4cb72de..2bbb36dc1 100644
--- a/external_imported/vcpkg/ports/boost-tti/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-tti/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/tti
-    REF boost-1.81.0
-    SHA512 d77c77f1eb4efff05382ffacde17cefd9c6bfab6d1ba29286486821493d46683c0eb1a89649fe1cc747518eb45b82129e78ea27b9212078e84ac9b69e809211c
+    REF boost-${VERSION}
+    SHA512 4908501e9e4abb1c935fd6faece37790a7487c88c8bff92848b964cb367bd3e4b499514436856a22d9d1f4cc704dc1c7e69ac1aea51c690cdd1047003573ffe3
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-tti/vcpkg.json b/external_imported/vcpkg/ports/boost-tti/vcpkg.json
index 0f4667c45..5d8935b6f 100644
--- a/external_imported/vcpkg/ports/boost-tti/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-tti/vcpkg.json
@@ -1,35 +1,34 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-tti",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost tti module",
   "homepage": "https://github.com/boostorg/tti",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-function-types",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-tuple/portfile.cmake b/external_imported/vcpkg/ports/boost-tuple/portfile.cmake
index a0dbd42d0..a5231c279 100644
--- a/external_imported/vcpkg/ports/boost-tuple/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-tuple/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/tuple
-    REF boost-1.81.0
-    SHA512 06383d63b6c5a564ed6150835cc4fafc023cea28a72640fc9306980f22af768ebe233b274157c3ddeb7c2467c197cb3ad98284030f1627c906e7000582223cde
+    REF boost-${VERSION}
+    SHA512 3c6bd4bf726fef59256a59f6b62e64fb3f5da4749a5a4ada28c2515f3f9307cc9473ce76fe17ceab7b5f60a11da441e9d21136b5277c655aefdc852b688277ff
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-tuple/vcpkg.json b/external_imported/vcpkg/ports/boost-tuple/vcpkg.json
index 145ef6cc8..706d37507 100644
--- a/external_imported/vcpkg/ports/boost-tuple/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-tuple/vcpkg.json
@@ -1,31 +1,30 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-tuple",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost tuple module",
   "homepage": "https://github.com/boostorg/tuple",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-type-erasure/portfile.cmake b/external_imported/vcpkg/ports/boost-type-erasure/portfile.cmake
index f1003a4ae..331604b26 100644
--- a/external_imported/vcpkg/ports/boost-type-erasure/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-type-erasure/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/type_erasure
-    REF boost-1.81.0
-    SHA512 64508fe58bfd05cf3ec9e6e7791dee6d4f7150da2e6ca4ba1b714f9afebae7ba2ac5562684a7c59c453f2a3e9fd65b7ed0fd0f15626235f543f3d0db8d035926
+    REF boost-${VERSION}
+    SHA512 6d463065304ea40796a761abc5577eb49f0d6a34b92ccd71760ffd4f1623e0430af4d5679a1e4c19f20711555cfd5e03ee24b90c123528eac6955b62b59f8718
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-type-erasure/vcpkg.json b/external_imported/vcpkg/ports/boost-type-erasure/vcpkg.json
index 7f1ec7c06..38295b733 100644
--- a/external_imported/vcpkg/ports/boost-type-erasure/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-type-erasure/vcpkg.json
@@ -1,81 +1,80 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-type-erasure",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost type_erasure module",
   "homepage": "https://github.com/boostorg/type_erasure",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-build",
       "host": true,
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-fusion",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-iterator",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-modular-build-helper",
       "host": true,
-      "version>=": "1.81.0#4"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mp11",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-smart-ptr",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-thread",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-typeof",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vmd",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/boost-type-index/portfile.cmake b/external_imported/vcpkg/ports/boost-type-index/portfile.cmake
index 75712a799..dfbc75193 100644
--- a/external_imported/vcpkg/ports/boost-type-index/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-type-index/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/type_index
-    REF boost-1.81.0
-    SHA512 c8affd17154ba2363546a9f40211af1fa5fa59445e7de44cb7ec655a22428825ef308aae62cdbe615e37ce165651300a9efdaecbf55beb20acc06ca899773b72
+    REF boost-${VERSION}
+    SHA512 37c7bcfddbc79a0b3b6c866fd11153b049fc1758812da3d32bba23f24abd4db735bce038f755e983824951302208ec9ed10d0b3e5cd21b2d18cb683842d646bd
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-type-index/vcpkg.json b/external_imported/vcpkg/ports/boost-type-index/vcpkg.json
index 171f5b87d..ec53e0778 100644
--- a/external_imported/vcpkg/ports/boost-type-index/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-type-index/vcpkg.json
@@ -1,43 +1,30 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-type-index",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost type_index module",
   "homepage": "https://github.com/boostorg/type_index",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-container-hash",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-type-traits/portfile.cmake b/external_imported/vcpkg/ports/boost-type-traits/portfile.cmake
index 412ab6aab..140e4e286 100644
--- a/external_imported/vcpkg/ports/boost-type-traits/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-type-traits/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/type_traits
-    REF boost-1.81.0
-    SHA512 e02cd4fded5ec4a9cc81d5ab710e6041154191ac6458ac9964276afc8f8e19e231794107fbf8d7cf0db18fa5ce8966a0d113e36874f955ec721b2601fbcef04e
+    REF boost-${VERSION}
+    SHA512 637af2a4fb81a52ba1ca3f511bff020f1041f147fb5c2c74e9f734f6b3754a77f02fedd1896ee7887e255b6bc4c3217ff14d0b6731828fb9b3220b902b49386b
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-type-traits/vcpkg.json b/external_imported/vcpkg/ports/boost-type-traits/vcpkg.json
index f87977d0d..58d0ef4af 100644
--- a/external_imported/vcpkg/ports/boost-type-traits/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-type-traits/vcpkg.json
@@ -1,23 +1,22 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-type-traits",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost type_traits module",
   "homepage": "https://github.com/boostorg/type_traits",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-typeof/portfile.cmake b/external_imported/vcpkg/ports/boost-typeof/portfile.cmake
index cf19ed926..bba02d233 100644
--- a/external_imported/vcpkg/ports/boost-typeof/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-typeof/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/typeof
-    REF boost-1.81.0
-    SHA512 764ec23b19bd1954ecbaa8a9669a93b5c79586430a3f14ef29e1189d00d571ffe86b7a65d86e36b2d2eb486e173e3664f637c304e89005eef01931a62fa07e39
+    REF boost-${VERSION}
+    SHA512 ea74f2ca896289c46178d3b0e04c708039284ac2ece0860603e2478c8def8e16c8183d2d4ec96a045c3ae7a003e7aa5c97ed515c3c5abf338830ca86087c8b5c
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-typeof/vcpkg.json b/external_imported/vcpkg/ports/boost-typeof/vcpkg.json
index 895ef030d..00842ca16 100644
--- a/external_imported/vcpkg/ports/boost-typeof/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-typeof/vcpkg.json
@@ -1,27 +1,18 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-typeof",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost typeof module",
   "homepage": "https://github.com/boostorg/typeof",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-ublas/portfile.cmake b/external_imported/vcpkg/ports/boost-ublas/portfile.cmake
index 8ef630f5e..5cabef510 100644
--- a/external_imported/vcpkg/ports/boost-ublas/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-ublas/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/ublas
-    REF boost-1.81.0
-    SHA512 9b599b2def2cf75c8d996453036c8b9249f7f1a9256e0755022bc006430c6beec4dd605e862c2323413ad3816abddc53751e24e4691a556ee55b5dc0adde09c3
+    REF boost-${VERSION}
+    SHA512 6c43726760060e0eb06558fc4fa09c4104f1051016e2a6bfc53d60c124030d3d3732c839b5482c2172be47414e550e6ebd6ad0849cab56d6ca9d2d75763811a0
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-ublas/vcpkg.json b/external_imported/vcpkg/ports/boost-ublas/vcpkg.json
index a1af01c2d..21c3e4f67 100644
--- a/external_imported/vcpkg/ports/boost-ublas/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-ublas/vcpkg.json
@@ -1,67 +1,62 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-ublas",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost ublas module",
   "homepage": "https://github.com/boostorg/ublas",
   "license": "BSL-1.0",
   "dependencies": [
-    {
-      "name": "boost-compute",
-      "version>=": "1.81.0#2"
-    },
     {
       "name": "boost-concept-check",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-interval",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-iterator",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-range",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-serialization",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-smart-ptr",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-typeof",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-uninstall/vcpkg.json b/external_imported/vcpkg/ports/boost-uninstall/vcpkg.json
index 081fd10d6..78de757bb 100644
--- a/external_imported/vcpkg/ports/boost-uninstall/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-uninstall/vcpkg.json
@@ -1,8 +1,7 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-uninstall",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Internal vcpkg port used to uninstall Boost",
   "license": "MIT"
 }
diff --git a/external_imported/vcpkg/ports/boost-units/portfile.cmake b/external_imported/vcpkg/ports/boost-units/portfile.cmake
index 9ea9075b9..8c7a40c13 100644
--- a/external_imported/vcpkg/ports/boost-units/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-units/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/units
-    REF boost-1.81.0
-    SHA512 bf34d467a74423dacd1fdd2ebea58b3aa780a7254236126d45ba689479f5e07abe70e90aaf0ff7758705a3ab6fcafc25774d4e68f46fb7ba7f0ff9769f10deb1
+    REF boost-${VERSION}
+    SHA512 69ce20c98933aba41385c400deeb6a5ef64db835270be5ef2b1003efa6a30ca3760c3a933821c9cbc5034e4cc3a54724711b7d56a1396ac638ff95dbf29a4c98
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-units/vcpkg.json b/external_imported/vcpkg/ports/boost-units/vcpkg.json
index 0a2b2a5de..17e9eea7c 100644
--- a/external_imported/vcpkg/ports/boost-units/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-units/vcpkg.json
@@ -1,63 +1,62 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-units",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost units module",
   "homepage": "https://github.com/boostorg/units",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-integer",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-io",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-lambda",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-math",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-typeof",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-unordered/portfile.cmake b/external_imported/vcpkg/ports/boost-unordered/portfile.cmake
index ce71f4d70..fda6c0cf2 100644
--- a/external_imported/vcpkg/ports/boost-unordered/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-unordered/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/unordered
-    REF boost-1.81.0
-    SHA512 beb1227428cac6d4714fd51aa660830d07816f5cbf102e43145ce8920f3470195a0138e5a8b1ddf8f7d304f6ea59bb8b7110afed9b9e80485c8a9bfb2cd5e6c2
+    REF boost-${VERSION}
+    SHA512 d3a4a081fe43b8c06215d841b90a33e548d31063f9a6324f6fe787fa4d6f3b0b28eaed6e119c9f382b3443d9ecbb416cb12c1a9cd38a6342ad1268e8b194a403
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-unordered/vcpkg.json b/external_imported/vcpkg/ports/boost-unordered/vcpkg.json
index 1fdbd55b4..22e3f0619 100644
--- a/external_imported/vcpkg/ports/boost-unordered/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-unordered/vcpkg.json
@@ -1,59 +1,42 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-unordered",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost unordered module",
   "homepage": "https://github.com/boostorg/unordered",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-container-hash",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-move",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mp11",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-predef",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-tuple",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-url/portfile.cmake b/external_imported/vcpkg/ports/boost-url/portfile.cmake
index 2f6a0dcd4..91ff3675c 100644
--- a/external_imported/vcpkg/ports/boost-url/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-url/portfile.cmake
@@ -3,14 +3,14 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/url
-    REF boost-1.81.0
-    SHA512 857fe1e789b90fa63168fe1477213e241184851b2ea13de216030a629677449653fc353ea788fa67ece75ddda3dd5dd320e9cbeb6f0ba1499053d2781929b098
+    REF boost-${VERSION}
+    SHA512 dc3e19e8a94d2dc2ea652bc61dd41eec868024c6d0685888adf36aad10d46a778e19ab56c82ac1c75dfe71c3671dfa11e4442c676651090ef08637e9636e70b9
     HEAD_REF master
 )
 
 vcpkg_replace_string("${SOURCE_PATH}/Jamfile"
-    "import ../../config/checks/config : requires ;"
-    "import config/checks/config : requires ;"
+    "import ../../config/checks/config"
+    "import config/checks/config"
 )
 file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config")
 include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
diff --git a/external_imported/vcpkg/ports/boost-url/vcpkg.json b/external_imported/vcpkg/ports/boost-url/vcpkg.json
index 54c3572f4..d7df747db 100644
--- a/external_imported/vcpkg/ports/boost-url/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-url/vcpkg.json
@@ -1,69 +1,68 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-url",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost url module",
   "homepage": "https://github.com/boostorg/url",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-align",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-build",
       "host": true,
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-modular-build-helper",
       "host": true,
-      "version>=": "1.81.0#4"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mp11",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-optional",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-system",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-variant2",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/boost-utility/portfile.cmake b/external_imported/vcpkg/ports/boost-utility/portfile.cmake
index d4281b84b..5de2c1ba5 100644
--- a/external_imported/vcpkg/ports/boost-utility/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-utility/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/utility
-    REF boost-1.81.0
-    SHA512 a2dd16d5f8ab78808880b1a84543ef752b0be81114e7051443460a4e226e932236fe5aac46b93bd9add0a3417cd44e1d3b92ba0366183defa5767eb3c35ab226
+    REF boost-${VERSION}
+    SHA512 aa3feff78e71ec696101b922acdea3d0fd5dc6acf0a9aff93c9169404a9b1e34d00c7427d52138b96efe0dc23206f32761cf6e354dd81d950eed467553d9ecc7
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-utility/vcpkg.json b/external_imported/vcpkg/ports/boost-utility/vcpkg.json
index 5764fdfab..4f6574594 100644
--- a/external_imported/vcpkg/ports/boost-utility/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-utility/vcpkg.json
@@ -1,43 +1,42 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-utility",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost utility module",
   "homepage": "https://github.com/boostorg/utility",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-io",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-uuid/portfile.cmake b/external_imported/vcpkg/ports/boost-uuid/portfile.cmake
index 241246749..58edf5c8a 100644
--- a/external_imported/vcpkg/ports/boost-uuid/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-uuid/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/uuid
-    REF boost-1.81.0
-    SHA512 326376f237bf09e590e3f7d9b2f298b399f1026ebab8e07785fb53a0a8b6283bea72f0510ceb44ae97097d8733a9c202ac9c1890fc8501727ce6a2b90d0ad425
+    REF boost-${VERSION}
+    SHA512 f51ebc4b8e7cac35335d6f0910f8b840f85e6ad58f7b7b16bdb0094da9fe60fe56f2984fa94f576c1f6d7a75816f60f22fe842939c846a9080fd20cfd76af798
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-uuid/vcpkg.json b/external_imported/vcpkg/ports/boost-uuid/vcpkg.json
index 8703a264f..3e4ae229d 100644
--- a/external_imported/vcpkg/ports/boost-uuid/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-uuid/vcpkg.json
@@ -1,76 +1,71 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-uuid",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost uuid module",
   "homepage": "https://github.com/boostorg/uuid",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-container-hash",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-io",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-move",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-numeric-conversion",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-predef",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-random",
       "platform": "!uwp",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-serialization",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-tti",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-winapi",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-variant/portfile.cmake b/external_imported/vcpkg/ports/boost-variant/portfile.cmake
index 86be1e220..417da7b41 100644
--- a/external_imported/vcpkg/ports/boost-variant/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-variant/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/variant
-    REF boost-1.81.0
-    SHA512 7dfbd4d2fce03b82b6bb07a1435ca3776b941e6bb7dac4dd6385ee93649af3922dc73b95a5353c1e4b0a906c0b037392fd57cf94306a0f062f3b8999082a225f
+    REF boost-${VERSION}
+    SHA512 5b998ef2a9668ff9d6f8f698060493ff208f741953d0252ac94d0733d2ba36571d02ecb8e19a9263009252475451ad5a5baf4b114c6074a442304c91512a4378
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-variant/vcpkg.json b/external_imported/vcpkg/ports/boost-variant/vcpkg.json
index 25235f4ba..52dca1916 100644
--- a/external_imported/vcpkg/ports/boost-variant/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-variant/vcpkg.json
@@ -1,75 +1,66 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-variant",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost variant module",
   "homepage": "https://github.com/boostorg/variant",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-bind",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-container-hash",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-detail",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-integer",
-      "version>=": "1.81.0#2"
-    },
-    {
-      "name": "boost-move",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-index",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-utility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-variant2/portfile.cmake b/external_imported/vcpkg/ports/boost-variant2/portfile.cmake
index c867cef4c..197445435 100644
--- a/external_imported/vcpkg/ports/boost-variant2/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-variant2/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/variant2
-    REF boost-1.81.0
-    SHA512 6ff9254e67cdacfb129a5746b47d3ab23ef2e61fd2cbf9424c32669f6abcb5858e9d5aef01f0dfd8ac214337e32a22195998ec962d54bc21244dc0b79579deae
+    REF boost-${VERSION}
+    SHA512 07440809c424b1a81a24b25729677c56f68eeb37a10e39f16eb49f11ee3c74e0caecade4e921a60e592be492f8efc86cd93bdcf830e610e350baa83ded7f2a09
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-variant2/vcpkg.json b/external_imported/vcpkg/ports/boost-variant2/vcpkg.json
index 3cdbfedde..49be662f1 100644
--- a/external_imported/vcpkg/ports/boost-variant2/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-variant2/vcpkg.json
@@ -1,27 +1,26 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-variant2",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost variant2 module",
   "homepage": "https://github.com/boostorg/variant2",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mp11",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-vcpkg-helpers/portfile.cmake b/external_imported/vcpkg/ports/boost-vcpkg-helpers/portfile.cmake
index 2279b6aa9..b964f5bd8 100644
--- a/external_imported/vcpkg/ports/boost-vcpkg-helpers/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-vcpkg-helpers/portfile.cmake
@@ -1,5 +1,4 @@
 set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
-vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
 
 vcpkg_download_distfile(LICENSE
     URLS "https://raw.githubusercontent.com/boostorg/boost/boost-${VERSION}/LICENSE_1_0.txt"
diff --git a/external_imported/vcpkg/ports/boost-vcpkg-helpers/vcpkg.json b/external_imported/vcpkg/ports/boost-vcpkg-helpers/vcpkg.json
index 77269a853..88ea0ace4 100644
--- a/external_imported/vcpkg/ports/boost-vcpkg-helpers/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-vcpkg-helpers/vcpkg.json
@@ -1,14 +1,13 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-vcpkg-helpers",
-  "version": "1.81.0",
-  "port-version": 3,
+  "version": "1.84.0",
   "description": "Internal vcpkg port used to modularize Boost",
   "license": "MIT",
   "dependencies": [
     {
       "name": "boost-uninstall",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-vmd/portfile.cmake b/external_imported/vcpkg/ports/boost-vmd/portfile.cmake
index 6cda7703e..d5b42bac5 100644
--- a/external_imported/vcpkg/ports/boost-vmd/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-vmd/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/vmd
-    REF boost-1.81.0
-    SHA512 8d4ff82b0b3cb575a2f6c7a01f93bcc8c9dbc15593842180c74f9f4cced671c91439a31f5d6cda45ff17b3e80f8ba5881b5e02f704ffb3592b42e458187fdd52
+    REF boost-${VERSION}
+    SHA512 14b3a7ea2f2cc36d9a0bf4d7c4436e13449608d08b98bccaa4dafbd65487824e28f67d2e918d2f42362ec2c242dc6003c888a3adb48cc3f9e774060e3fc2094a
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-vmd/vcpkg.json b/external_imported/vcpkg/ports/boost-vmd/vcpkg.json
index 1dd346a76..abb225ead 100644
--- a/external_imported/vcpkg/ports/boost-vmd/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-vmd/vcpkg.json
@@ -1,19 +1,22 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-vmd",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost vmd module",
   "homepage": "https://github.com/boostorg/vmd",
   "license": "BSL-1.0",
   "dependencies": [
+    {
+      "name": "boost-config",
+      "version>=": "1.84.0"
+    },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-wave/portfile.cmake b/external_imported/vcpkg/ports/boost-wave/portfile.cmake
index 288107a24..5a95215fb 100644
--- a/external_imported/vcpkg/ports/boost-wave/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-wave/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/wave
-    REF boost-1.81.0
-    SHA512 70d2d946bff83f081a1b87c95ac2fe9686000cee68b1233e122aa7302f59dce6ed718ebbaa9cdfa413e385b4d3762f5a71a4c6d402eee57ae4e7876da4644266
+    REF boost-${VERSION}
+    SHA512 eb39127042795c21ccfb6e92edde0feaeea1e5cc79305a5993104fadba02dc61f841d9ea7b1dbc6e0ea702377e6f563ee623c0ddd99eb5dd729105866b03e766
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-wave/vcpkg.json b/external_imported/vcpkg/ports/boost-wave/vcpkg.json
index 88d9c95fd..b5d4cf612 100644
--- a/external_imported/vcpkg/ports/boost-wave/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-wave/vcpkg.json
@@ -1,8 +1,7 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-wave",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost wave module",
   "homepage": "https://github.com/boostorg/wave",
   "license": "BSL-1.0",
@@ -10,94 +9,94 @@
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-build",
       "host": true,
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-concept-check",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-filesystem",
       "platform": "!uwp",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-format",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-iterator",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-lexical-cast",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-modular-build-helper",
       "host": true,
-      "version>=": "1.81.0#4"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-multi-index",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-optional",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-pool",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-serialization",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-smart-ptr",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-spirit",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/boost-winapi/portfile.cmake b/external_imported/vcpkg/ports/boost-winapi/portfile.cmake
index 0e8ffcb37..28920f529 100644
--- a/external_imported/vcpkg/ports/boost-winapi/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-winapi/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/winapi
-    REF boost-1.81.0
-    SHA512 86024de36c1bd1e44dfcd875e712f819c8a30b53b9180d69d3a9c1a18b62f33b2d7d49324a29ffc03a1781bbf9235101a0c03935bae41cec7882a1ea993ceb50
+    REF boost-${VERSION}
+    SHA512 f0d04dcdcb930f88ec47f6580bce94258bac492e885422eb67ed2d9980d066cc46f969bd6aac29687fcc3f98a252b872df5dadfb1db19fe61cb1ddbacb70f925
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-winapi/vcpkg.json b/external_imported/vcpkg/ports/boost-winapi/vcpkg.json
index fe94ef2a6..96132bde7 100644
--- a/external_imported/vcpkg/ports/boost-winapi/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-winapi/vcpkg.json
@@ -1,23 +1,22 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-winapi",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost winapi module",
   "homepage": "https://github.com/boostorg/winapi",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-predef",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-xpressive/portfile.cmake b/external_imported/vcpkg/ports/boost-xpressive/portfile.cmake
index 846714420..af6825c61 100644
--- a/external_imported/vcpkg/ports/boost-xpressive/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-xpressive/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/xpressive
-    REF boost-1.81.0
-    SHA512 d26f774c51e5fee21e8f799c8b7a076d4ee104c0d9f5e74c11c09a9d2b1799cbe38f31107b8042309c8b5a893d36b7382aa07604aa053a686ce4c9b4fb812919
+    REF boost-${VERSION}
+    SHA512 6eeb0d9bad40b115f74b1dd527288b26ef21b172f24aabd9abdfca2dca1d21bfd302ea3df0b2c9b28bab117faa6b4268df64b1aa7efec5a9181b1a5219dea063
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-xpressive/vcpkg.json b/external_imported/vcpkg/ports/boost-xpressive/vcpkg.json
index 93207f214..f70a8ce8c 100644
--- a/external_imported/vcpkg/ports/boost-xpressive/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-xpressive/vcpkg.json
@@ -1,103 +1,102 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-xpressive",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost xpressive module",
   "homepage": "https://github.com/boostorg/xpressive",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-conversion",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-fusion",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-integer",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-iterator",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-lexical-cast",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-numeric-conversion",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-optional",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-proto",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-range",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-smart-ptr",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-spirit",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-typeof",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-utility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost-yap/portfile.cmake b/external_imported/vcpkg/ports/boost-yap/portfile.cmake
index 976320c70..d847e350a 100644
--- a/external_imported/vcpkg/ports/boost-yap/portfile.cmake
+++ b/external_imported/vcpkg/ports/boost-yap/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/yap
-    REF boost-1.81.0
-    SHA512 def98e5c2b1de0587eb5d954cf025ae5242b0dbc3d5eecd9e718c617d6b269bb1842bd6cc0f705c3b29c6a63061a38974aadbab24b31e3acfecd97eb69c48616
+    REF boost-${VERSION}
+    SHA512 5ed8930d8764eab2edcefd9627315dc812ff80eda8e2982f0c2fcb89ff828e13f4998fa852e57578116863da09b0cf8ca83afea9aa18b6ee2c4852277b14afce
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/boost-yap/vcpkg.json b/external_imported/vcpkg/ports/boost-yap/vcpkg.json
index cf6429046..963bc313f 100644
--- a/external_imported/vcpkg/ports/boost-yap/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost-yap/vcpkg.json
@@ -1,27 +1,30 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-yap",
-  "version": "1.81.0",
-  "port-version": 2,
+  "version": "1.84.0",
   "description": "Boost yap module",
   "homepage": "https://github.com/boostorg/yap",
   "license": "BSL-1.0",
   "dependencies": [
+    {
+      "name": "boost-config",
+      "version>=": "1.84.0"
+    },
     {
       "name": "boost-hana",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-index",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vcpkg-helpers",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/boost/vcpkg.json b/external_imported/vcpkg/ports/boost/vcpkg.json
index ea6317484..a02e5d8b8 100644
--- a/external_imported/vcpkg/ports/boost/vcpkg.json
+++ b/external_imported/vcpkg/ports/boost/vcpkg.json
@@ -1,599 +1,615 @@
 {
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost",
-  "version": "1.81.0",
-  "port-version": 3,
+  "version": "1.84.0",
   "description": "Peer-reviewed portable C++ source libraries",
   "homepage": "https://boost.org",
   "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "boost-accumulators",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-algorithm",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-align",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-any",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-array",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-asio",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-assign",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-atomic",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-beast",
       "platform": "!emscripten",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-bimap",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-bind",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-callable-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-chrono",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-circular-buffer",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-cobalt",
+      "platform": "!osx & !ios & !android",
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-compat",
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-compatibility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-compute",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-concept-check",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-config",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-container",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-container-hash",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-context",
       "platform": "!uwp & !emscripten",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-contract",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-conversion",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-convert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-coroutine",
       "platform": "!(arm & windows) & !uwp & !emscripten",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-coroutine2",
       "platform": "!emscripten",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-crc",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-date-time",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-describe",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-detail",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-dll",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-dynamic-bitset",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-endian",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-fiber",
-      "platform": "!uwp & !arm & !emscripten",
-      "version>=": "1.81.0#2"
+      "platform": "!uwp & !(arm & windows) & !emscripten",
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-filesystem",
       "platform": "!uwp",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-flyweight",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-foreach",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-format",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-function",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-function-types",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-functional",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-fusion",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-geometry",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-gil",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-graph",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-hana",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-heap",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-histogram",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-hof",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-icl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-integer",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-interprocess",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-interval",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-intrusive",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-io",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-iostreams",
       "platform": "!uwp",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-iterator",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-json",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-lambda",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-lambda2",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-leaf",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-lexical-cast",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-local-function",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-locale",
       "platform": "!uwp",
-      "version>=": "1.81.0#3"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-lockfree",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-log",
       "platform": "!uwp & !emscripten",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-logic",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-math",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-metaparse",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-move",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mp11",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-mpl",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-msm",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-multi-array",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-multi-index",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-multiprecision",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-mysql",
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-nowide",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-numeric-conversion",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-odeint",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-optional",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-outcome",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-parameter",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-parameter-python",
       "platform": "!emscripten",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-pfr",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-phoenix",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-poly-collection",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-polygon",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-pool",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-predef",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-preprocessor",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-process",
       "platform": "!emscripten",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-program-options",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-property-map",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-property-tree",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-proto",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-ptr-container",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-python",
       "platform": "!uwp & !emscripten & !ios & !android",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-qvm",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-random",
       "platform": "!uwp",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-range",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-ratio",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-rational",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
+    },
+    {
+      "name": "boost-redis",
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-regex",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-safe-numerics",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-scope-exit",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-serialization",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-signals2",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-smart-ptr",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-sort",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-spirit",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-stacktrace",
       "platform": "!uwp",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-statechart",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-assert",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-static-string",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-stl-interfaces",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-system",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-test",
       "platform": "!uwp",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-thread",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-throw-exception",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-timer",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-tokenizer",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-tti",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-tuple",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-erasure",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-index",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-type-traits",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-typeof",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-ublas",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-units",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-unordered",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-url",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-utility",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-uuid",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-variant",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-variant2",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-vmd",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-wave",
       "platform": "!uwp",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-winapi",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-xpressive",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     },
     {
       "name": "boost-yap",
-      "version>=": "1.81.0#2"
+      "version>=": "1.84.0"
     }
   ],
   "features": {
@@ -602,15 +618,15 @@
       "dependencies": [
         {
           "name": "boost-graph-parallel",
-          "version>=": "1.81.0#2"
+          "version>=": "1.84.0"
         },
         {
           "name": "boost-mpi",
-          "version>=": "1.81.0#2"
+          "version>=": "1.84.0"
         },
         {
           "name": "boost-property-map-parallel",
-          "version>=": "1.81.0#2"
+          "version>=": "1.84.0"
         }
       ]
     }
diff --git a/external_imported/vcpkg/ports/boringssl/0001-static-gtest.patch b/external_imported/vcpkg/ports/boringssl/0001-static-gtest.patch
new file mode 100644
index 000000000..1c76b4986
--- /dev/null
+++ b/external_imported/vcpkg/ports/boringssl/0001-static-gtest.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -479,7 +479,7 @@ endif()
+ # Add minimal googletest targets. The provided one has many side-effects, and
+ # googletest has a very straightforward build.
+ add_library(
+-  boringssl_gtest
++  boringssl_gtest STATIC
+   third_party/googletest/googlemock/src/gmock-all.cc
+   third_party/googletest/googletest/src/gtest-all.cc
+ )
diff --git a/external_imported/vcpkg/ports/boringssl/0001-vcpkg.patch b/external_imported/vcpkg/ports/boringssl/0001-vcpkg.patch
deleted file mode 100644
index f871dd92b..000000000
--- a/external_imported/vcpkg/ports/boringssl/0001-vcpkg.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 893bca7..83ff477 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -562,7 +562,7 @@ endif()
- 
- # Add minimal googletest targets. The provided one has many side-effects, and
- # googletest has a very straightforward build.
--add_library(boringssl_gtest third_party/googletest/src/gtest-all.cc)
-+add_library(boringssl_gtest STATIC third_party/googletest/src/gtest-all.cc)
- target_include_directories(boringssl_gtest PRIVATE third_party/googletest)
- 
- include_directories(third_party/googletest/include)
-@@ -649,3 +649,18 @@ add_custom_target(
-     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-     DEPENDS all_tests bssl_shim handshaker fips_specific_tests_if_any
-     USES_TERMINAL)
-+
-+install(TARGETS crypto ssl
-+  RUNTIME DESTINATION bin
-+  LIBRARY DESTINATION lib
-+  ARCHIVE DESTINATION lib)
-+
-+option(INSTALL_HEADERS "Install headers" ON)
-+if(INSTALL_HEADERS)
-+  install(DIRECTORY include/ DESTINATION include)
-+endif()
-+
-+option(INSTALL_TOOLS "Install bssl executable" OFF)
-+if(INSTALL_TOOLS)
-+  install(TARGETS bssl DESTINATION tools/boringssl)
-+endif()
diff --git a/external_imported/vcpkg/ports/boringssl/0002-remove-WX-Werror.patch b/external_imported/vcpkg/ports/boringssl/0002-remove-WX-Werror.patch
index c037b273a..36e0a4221 100644
--- a/external_imported/vcpkg/ports/boringssl/0002-remove-WX-Werror.patch
+++ b/external_imported/vcpkg/ports/boringssl/0002-remove-WX-Werror.patch
@@ -1,24 +1,23 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 83ff477..3008c2a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -117,7 +117,7 @@ endif()
- if(CMAKE_COMPILER_IS_GNUCXX OR CLANG)
-   # Note clang-cl is odd and sets both CLANG and MSVC. We base our configuration
-   # primarily on our normal Clang one.
--  set(C_CXX_FLAGS "-Werror -Wformat=2 -Wsign-compare -Wmissing-field-initializers -Wwrite-strings -Wvla")
-+  set(C_CXX_FLAGS "-Wformat=2 -Wsign-compare -Wmissing-field-initializers -Wwrite-strings -Wvla")
-   if(MSVC)
-     # clang-cl sets different default warnings than clang. It also treats -Wall
-     # as -Weverything, to match MSVC. Instead -W3 is the alias for -Wall.
-@@ -238,8 +238,8 @@ elseif(MSVC)
-                             ${MSVC_DISABLED_WARNINGS_LIST})
-   string(REPLACE "C" " -w4" MSVC_LEVEL4_WARNINGS_STR
-                             ${MSVC_LEVEL4_WARNINGS_LIST})
--  set(CMAKE_C_FLAGS   "-utf-8 -Wall -WX ${MSVC_DISABLED_WARNINGS_STR} ${MSVC_LEVEL4_WARNINGS_STR}")
--  set(CMAKE_CXX_FLAGS "-utf-8 -Wall -WX ${MSVC_DISABLED_WARNINGS_STR} ${MSVC_LEVEL4_WARNINGS_STR}")
-+  set(CMAKE_C_FLAGS   "-utf-8 -Wall ${MSVC_DISABLED_WARNINGS_STR} ${MSVC_LEVEL4_WARNINGS_STR}")
-+  set(CMAKE_CXX_FLAGS "-utf-8 -Wall ${MSVC_DISABLED_WARNINGS_STR} ${MSVC_LEVEL4_WARNINGS_STR}")
- endif()
- 
- if(WIN32)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -140,7 +140,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CLANG)
+   # Note clang-cl is odd and sets both CLANG and MSVC. We base our configuration
+   # primarily on our normal Clang one.
+   # TODO(bbe) took out -Wmissing-field-initializers for pki - fix and put back or disable only for pki
+-  set(C_CXX_FLAGS "-Werror -Wformat=2 -Wsign-compare -Wwrite-strings -Wvla -Wshadow -Wtype-limits")
++  set(C_CXX_FLAGS "-Wformat=2 -Wsign-compare -Wwrite-strings -Wvla -Wshadow -Wtype-limits")
+   if(MSVC)
+     # clang-cl sets different default warnings than clang. It also treats -Wall
+     # as -Weverything, to match MSVC. Instead -W3 is the alias for -Wall.
+@@ -211,8 +211,8 @@ elseif(MSVC)
+       )
+   string(REPLACE "C" " -wd" MSVC_DISABLED_WARNINGS_STR
+                             ${MSVC_DISABLED_WARNINGS_LIST})
+-  set(CMAKE_C_FLAGS   "-utf-8 -W4 -WX ${MSVC_DISABLED_WARNINGS_STR}")
+-  set(CMAKE_CXX_FLAGS "-utf-8 -W4 -WX ${MSVC_DISABLED_WARNINGS_STR}")
++  set(CMAKE_C_FLAGS   "-utf-8 -W4 ${MSVC_DISABLED_WARNINGS_STR}")
++  set(CMAKE_CXX_FLAGS "-utf-8 -W4 ${MSVC_DISABLED_WARNINGS_STR}")
+ endif()
+ 
+ if(WIN32)
diff --git a/external_imported/vcpkg/ports/boringssl/0003-fix-shared-symbol-visibility.patch b/external_imported/vcpkg/ports/boringssl/0003-fix-shared-symbol-visibility.patch
new file mode 100644
index 000000000..1b73d0b48
--- /dev/null
+++ b/external_imported/vcpkg/ports/boringssl/0003-fix-shared-symbol-visibility.patch
@@ -0,0 +1,43 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -252,8 +252,6 @@ if(FUZZ)
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address,fuzzer-no-link -fsanitize-coverage=edge,indirect-calls")
+ endif()
+ 
+-add_definitions(-DBORINGSSL_IMPLEMENTATION)
+-
+ if(BUILD_SHARED_LIBS)
+   add_definitions(-DBORINGSSL_SHARED_LIBRARY)
+   # Enable position-independent code globally. This is needed because
+@@ -563,7 +561,7 @@ if(APPLE)
+ endif()
+ 
+ add_library(pki ${PKI_SOURCES})
+-target_compile_definitions(pki PRIVATE _BORINGSSL_LIBPKI_)
++target_compile_definitions(pki PRIVATE _BORINGSSL_LIBPKI_ BORINGSSL_IMPLEMENTATION)
+ target_link_libraries(pki crypto)
+ 
+ add_executable(pki_test ${PKI_TEST_SOURCES})
+diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
+--- a/crypto/CMakeLists.txt
++++ b/crypto/CMakeLists.txt
+@@ -294,6 +294,7 @@ add_library(
+   $<TARGET_OBJECTS:fipsmodule>
+   ${CRYPTO_FIPS_OBJECTS}
+ )
++target_compile_definitions(crypto PRIVATE BORINGSSL_IMPLEMENTATION)
+ if(OPENSSL_ASM)
+   target_sources(crypto PRIVATE ${CRYPTO_SOURCES_ASM})
+ endif()
+diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
+--- a/ssl/CMakeLists.txt
++++ b/ssl/CMakeLists.txt
+@@ -39,6 +39,7 @@ add_library(
+   tls13_enc.cc
+   tls13_server.cc
+ )
++target_compile_definitions(ssl PRIVATE BORINGSSL_IMPLEMENTATION)
+ # Although libssl also provides headers that require an include directory, the
+ # flag is already specified by libcrypto, so we omit target_include_directories
+ # here.
diff --git a/external_imported/vcpkg/ports/boringssl/install-pc-files.cmake b/external_imported/vcpkg/ports/boringssl/install-pc-files.cmake
index f86652f27..47eab26cd 100644
--- a/external_imported/vcpkg/ports/boringssl/install-pc-files.cmake
+++ b/external_imported/vcpkg/ports/boringssl/install-pc-files.cmake
@@ -1,15 +1,27 @@
 function(install_pc_file name pc_data)
     # fix platform-specific details
-    if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW)
-        string(REPLACE "-llibssl" "-lssl" pc_data "${pc_data}")
-        string(REPLACE "-llibcrypt" "-lcrypto" pc_data "${pc_data}")
+    if (NOT VCPKG_TARGET_IS_WINDOWS)
         string(REPLACE "-lcrypt32" "" pc_data "${pc_data}")
         string(REPLACE "-lws2_32" "" pc_data "${pc_data}")
+        string(REPLACE "-llibssl" "-lssl" pc_data "${pc_data}")
+        string(REPLACE "-llibcrypto" "-lcrypto" pc_data "${pc_data}")
+    elseif (NOT VCPKG_TARGET_IS_MINGW)
+        string(REPLACE "-llibssl" "-lssl" pc_data "${pc_data}")
+        string(REPLACE "-llibcrypto" "-lcrypto" pc_data "${pc_data}")
     endif()
     if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
         configure_file("${CMAKE_CURRENT_LIST_DIR}/openssl.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${name}.pc" @ONLY)
     endif()
     if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        if(VCPKG_TARGET_IS_WINDOWS)
+            if (NOT VCPKG_TARGET_IS_MINGW)
+                string(REPLACE "-lssl" "-lssld" pc_data "${pc_data}")
+                string(REPLACE "-lcrypto" "-lcryptod" pc_data "${pc_data}")
+            else()
+                string(REPLACE "-llibssl" "-llibssld" pc_data "${pc_data}")
+                string(REPLACE "-llibcrypto" "-llibcryptod" pc_data "${pc_data}")
+            endif()
+        endif()
         configure_file("${CMAKE_CURRENT_LIST_DIR}/openssl.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${name}.pc" @ONLY)
     endif()
 endfunction()
diff --git a/external_imported/vcpkg/ports/boringssl/portfile.cmake b/external_imported/vcpkg/ports/boringssl/portfile.cmake
index 94c110886..6fb4c9c80 100644
--- a/external_imported/vcpkg/ports/boringssl/portfile.cmake
+++ b/external_imported/vcpkg/ports/boringssl/portfile.cmake
@@ -3,48 +3,51 @@ if(EXISTS "${CURRENT_INSTALLED_DIR}/include/openssl/ssl.h")
 endif()
 
 vcpkg_find_acquire_program(PERL)
-get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY)
-vcpkg_add_to_path(${PERL_EXE_PATH})
+get_filename_component(PERL_EXE_PATH "${PERL}" DIRECTORY)
+vcpkg_add_to_path("${PERL_EXE_PATH}")
 
 vcpkg_find_acquire_program(NASM)
-get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY)
-vcpkg_add_to_path(${NASM_EXE_PATH})
+get_filename_component(NASM_EXE_PATH "${NASM}" DIRECTORY)
+vcpkg_add_to_path("${NASM_EXE_PATH}")
 
 vcpkg_find_acquire_program(GO)
-get_filename_component(GO_EXE_PATH ${GO} DIRECTORY)
-vcpkg_add_to_path(${GO_EXE_PATH})
-
-vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    FEATURES
-        tools INSTALL_TOOLS
-)
+get_filename_component(GO_EXE_PATH "${GO}" DIRECTORY)
+vcpkg_add_to_path("${GO_EXE_PATH}")
 
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO google/boringssl
-  REF 479adf98d54a21c1d154aac59b2ce120e1d1a6d6
-  SHA512 74b5d001c0f5c1846b8818e9e668fa35de5171fc21a8f713d241f57b3e8abe42426fdc66b085cca1853b904def6f4bea573dfed40b8b1422894cca85b0b1a44a
+  REF cfcb954901e264edb9915e501de64a81732c5edd
+  SHA512 6fc7fff24c85ed580fb362f788b216ef04ca16976656c68c75d3fd72c84e28ed39a3ab8fcb064b7c7061f93a4d37d5426e36d259e1714fa62d90b99659a3ddc2
   HEAD_REF master
   PATCHES
-    0001-vcpkg.patch
+    0001-static-gtest.patch
     0002-remove-WX-Werror.patch
+    0003-fix-shared-symbol-visibility.patch
 )
 
+if(VCPKG_TARGET_IS_WINDOWS)
+  # the FindOpenSSL.cmake script differentiates debug and release binaries using this suffix.
+  set(CMAKE_CONFIGURE_OPTIONS_DEBUG "-DCMAKE_DEBUG_POSTFIX=d")
+endif()
+
 vcpkg_cmake_configure(
   SOURCE_PATH "${SOURCE_PATH}"
-  OPTIONS
-    ${FEATURE_OPTIONS}
   OPTIONS_DEBUG
-    -DINSTALL_HEADERS=OFF
-    -DINSTALL_TOOLS=OFF
+    ${CMAKE_CONFIGURE_OPTIONS_DEBUG}
 )
 
 vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+vcpkg_cmake_config_fixup(PACKAGE_NAME OpenSSL CONFIG_PATH lib/cmake/OpenSSL)
 
-include("${CMAKE_CURRENT_LIST_DIR}/install-pc-files.cmake")
-
-if(IS_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/boringssl)
-  vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/boringssl")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+vcpkg_copy_tools(TOOL_NAMES bssl AUTO_CLEAN)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+  file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+include("${CMAKE_CURRENT_LIST_DIR}/install-pc-files.cmake")
+
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/boringssl/usage b/external_imported/vcpkg/ports/boringssl/usage
new file mode 100644
index 000000000..13ef24757
--- /dev/null
+++ b/external_imported/vcpkg/ports/boringssl/usage
@@ -0,0 +1,4 @@
+boringssl can be found via the built-in CMake find-module:
+
+    find_package(OpenSSL REQUIRED)
+    target_link_libraries(main PRIVATE OpenSSL::SSL OpenSSL::Crypto)
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/boringssl/vcpkg.json b/external_imported/vcpkg/ports/boringssl/vcpkg.json
index 403313838..6dc9f6b02 100644
--- a/external_imported/vcpkg/ports/boringssl/vcpkg.json
+++ b/external_imported/vcpkg/ports/boringssl/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "boringssl",
-  "version-date": "2021-06-23",
-  "port-version": 3,
+  "version-date": "2023-10-13",
   "description": "BoringSSL is a fork of OpenSSL developed by Google",
   "homepage": "https://boringssl.googlesource.com/boringssl",
   "supports": "!uwp",
@@ -9,11 +8,10 @@
     {
       "name": "vcpkg-cmake",
       "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
     }
-  ],
-  "features": {
-    "tools": {
-      "description": "Build bssl executable"
-    }
-  }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/botan/arm64-windows.patch b/external_imported/vcpkg/ports/botan/arm64-windows.patch
deleted file mode 100644
index 54f98b7a9..000000000
--- a/external_imported/vcpkg/ports/botan/arm64-windows.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/src/lib/utils/mul128.h b/src/lib/utils/mul128.h
-index 8cdaae2..54bb670 100644
---- a/src/lib/utils/mul128.h
-+++ b/src/lib/utils/mul128.h
-@@ -39,10 +39,15 @@ namespace Botan {
- #elif defined(BOTAN_BUILD_COMPILER_IS_MSVC) && defined(BOTAN_TARGET_CPU_HAS_NATIVE_64BIT)
- 
- #include <intrin.h>
--#pragma intrinsic(_umul128)
--
--#define BOTAN_FAST_64X64_MUL(a,b,lo,hi) \
-+#if defined(_M_ARM64)
-+   #pragma intrinsic(__umulh)
-+   #define BOTAN_FAST_64X64_MUL(a,b,lo,hi) \
-+   do { *lo = a * b; *hi = __umulh(a, b); } while(0)
-+#else
-+   #pragma intrinsic(_umul128)
-+   #define BOTAN_FAST_64X64_MUL(a,b,lo,hi) \
-    do { *lo = _umul128(a, b, hi); } while(0)
-+#endif
- 
- #elif defined(BOTAN_USE_GCC_INLINE_ASM)
- 
diff --git a/external_imported/vcpkg/ports/botan/configure b/external_imported/vcpkg/ports/botan/configure
index 7e1893190..e12529973 100755
--- a/external_imported/vcpkg/ports/botan/configure
+++ b/external_imported/vcpkg/ports/botan/configure
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
diff --git a/external_imported/vcpkg/ports/botan/embed-debug-info.patch b/external_imported/vcpkg/ports/botan/embed-debug-info.patch
index 09a17202e..840f6e732 100644
--- a/external_imported/vcpkg/ports/botan/embed-debug-info.patch
+++ b/external_imported/vcpkg/ports/botan/embed-debug-info.patch
@@ -1,11 +1,11 @@
 diff --git a/src/build-data/cc/msvc.txt b/src/build-data/cc/msvc.txt
-index 2306a4485..977e2e958 100644
+index 64b6eae..66258ca 100644
 --- a/src/build-data/cc/msvc.txt
 +++ b/src/build-data/cc/msvc.txt
-@@ -17,10 +17,10 @@ optimization_flags "/O2 /Oi"
+@@ -20,10 +20,10 @@ optimization_flags "/O2 /Oi"
  size_optimization_flags "/O1 /Os"
  
- # for debug info in the object file:
+ # for debug info in the object file (required if using sccache):
 -#debug_info_flags "/Z7"
 +debug_info_flags "/Z7"
  
diff --git a/external_imported/vcpkg/ports/botan/fix-generate-build-path.patch b/external_imported/vcpkg/ports/botan/fix-generate-build-path.patch
deleted file mode 100644
index 455c1f139..000000000
--- a/external_imported/vcpkg/ports/botan/fix-generate-build-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.py b/configure.py
-index 89f87d4..ba7914f 100644
---- a/configure.py
-+++ b/configure.py
-@@ -2076,7 +2076,7 @@ def create_template_vars(source_paths, build_paths, options, modules, cc, arch,
-         'maintainer_mode': options.maintainer_mode,
- 
-         'out_dir': build_dir,
--        'build_dir': build_paths.build_dir,
-+        'build_dir': os.path.abspath(build_paths.build_dir),
- 
-         'doc_stamp_file': os.path.join(build_paths.build_dir, 'doc.stamp'),
-         'makefile_path': os.path.join(build_paths.build_dir, '..', 'Makefile'),
diff --git a/external_imported/vcpkg/ports/botan/fix-objectfile-list.patch b/external_imported/vcpkg/ports/botan/fix-objectfile-list.patch
deleted file mode 100644
index b76c5fd79..000000000
--- a/external_imported/vcpkg/ports/botan/fix-objectfile-list.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/configure.py b/configure.py
-index 2474860a5..7d320d470 100755
---- a/configure.py
-+++ b/configure.py
-@@ -1821,13 +1821,12 @@ def yield_objectfile_list(sources, obj_dir, obj_suffix, options):
- 
-     for src in sources:
-         (directory, filename) = os.path.split(os.path.normpath(src))
--        parts = directory.split(os.sep)
-+        parts_in_src = directory.split(os.sep + 'src' + os.sep)
-+        parts = []
- 
--        if 'src' in parts:
--            parts = parts[parts.index('src')+2:]
--        elif options.amalgamation and filename.find(options.name_amalgamation) != -1:
--            parts = []
--        else:
-+        if len(parts_in_src) > 1:
-+            parts = [ 'src' ] + parts_in_src[-1].split(os.sep)
-+        elif not options.amalgamation or filename.find(options.name_amalgamation) == -1:
-             raise InternalError("Unexpected file '%s/%s'" % (directory, filename))
- 
-         if parts != []:
diff --git a/external_imported/vcpkg/ports/botan/fix_android.patch b/external_imported/vcpkg/ports/botan/fix_android.patch
new file mode 100644
index 000000000..a8b562861
--- /dev/null
+++ b/external_imported/vcpkg/ports/botan/fix_android.patch
@@ -0,0 +1,13 @@
+diff --git a/src/lib/utils/prefetch.cpp b/src/lib/utils/prefetch.cpp
+index 40786b3..e0d5239 100644
+--- a/src/lib/utils/prefetch.cpp
++++ b/src/lib/utils/prefetch.cpp
+@@ -12,7 +12,7 @@
+ namespace Botan {
+ 
+ uint64_t prefetch_array_raw(size_t bytes, const void* arrayv) noexcept {
+-#if defined(__cpp_lib_hardware_interference_size)
++#if defined(__cpp_lib_hardware_interference_size) && (!defined(BOTAN_TARGET_OS_IS_ANDROID) || defined(NDK_IS_NEWER_THAN_25))
+    const size_t cache_line_size = std::hardware_destructive_interference_size;
+ #else
+    // We arbitrarily use a 64 byte cache line, which is by far the most
diff --git a/external_imported/vcpkg/ports/botan/pkgconfig.patch b/external_imported/vcpkg/ports/botan/pkgconfig.patch
index 95f74c280..1f4b921e6 100644
--- a/external_imported/vcpkg/ports/botan/pkgconfig.patch
+++ b/external_imported/vcpkg/ports/botan/pkgconfig.patch
@@ -1,5 +1,5 @@
 diff --git a/src/build-data/botan.pc.in b/src/build-data/botan.pc.in
-index 7139436..81214fe 100644
+index c18b522..a5722c9 100644
 --- a/src/build-data/botan.pc.in
 +++ b/src/build-data/botan.pc.in
 @@ -1,7 +1,7 @@
@@ -11,4 +11,4 @@ index 7139436..81214fe 100644
 +includedir=${prefix}/include
  
  Name: Botan
- Description: Crypto and TLS for C++11
+ Description: Crypto and TLS for Modern C++
diff --git a/external_imported/vcpkg/ports/botan/portfile.cmake b/external_imported/vcpkg/ports/botan/portfile.cmake
index 85ffa7dbe..f788e8b42 100644
--- a/external_imported/vcpkg/ports/botan/portfile.cmake
+++ b/external_imported/vcpkg/ports/botan/portfile.cmake
@@ -1,18 +1,15 @@
-vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO randombit/botan
     REF "${VERSION}"
-    SHA512 0f99ef4026e5180dd65dc0e935ba2cabaf750862c651699294b3521053463b7e65a90847fef6f0d640eb9f9eb5efce64b13e999aa9c215310998817d13bd5332
+    SHA512 13f40635fc92b00b9392aa8ed96b5825f0cc8147d51337e2c225e0f29d0428732293190aa5fb2a7d2c5e7d57db748ae0fbed4536dee8af00e8d6fd405e784e1d
     HEAD_REF master
     PATCHES
-        fix-generate-build-path.patch
         embed-debug-info.patch
-        arm64-windows.patch
         pkgconfig.patch
         verbose-install.patch
         configure-zlib.patch
-        fix-objectfile-list.patch # https://github.com/randombit/botan/pull/3069
+        fix_android.patch
 )
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/configure" DESTINATION "${SOURCE_PATH}")
 
@@ -32,6 +29,7 @@ endif()
 
 vcpkg_list(SET configure_arguments
     "--distribution-info=vcpkg ${TARGET_TRIPLET}"
+    --disable-cc-tests
     --with-pkg-config
     --link-method=copy
     --with-debug-info
@@ -55,7 +53,9 @@ if("zlib" IN_LIST FEATURES)
     x_vcpkg_pkgconfig_get_modules(LIBS PREFIX "ZLIB" MODULES "zlib" ${pkgconfig_syntax})
 endif()
 
-if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
+if(VCPKG_TARGET_IS_EMSCRIPTEN)
+    vcpkg_list(APPEND configure_arguments --cpu=wasm)
+elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
     vcpkg_list(APPEND configure_arguments --cpu=x86)
 elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
     vcpkg_list(APPEND configure_arguments --cpu=x86_64)
@@ -111,11 +111,17 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
     vcpkg_copy_tools(TOOL_NAMES botan-cli AUTO_CLEAN)
     vcpkg_copy_pdbs()
 else()
-    if(VCPKG_TARGET_IS_MINGW)
+    if(VCPKG_TARGET_IS_ANDROID)
+        vcpkg_list(APPEND configure_arguments --os=android)
+    elseif(VCPKG_TARGET_IS_EMSCRIPTEN)
+        vcpkg_list(APPEND configure_arguments --os=emscripten)
+    elseif(VCPKG_TARGET_IS_MINGW)
         vcpkg_list(APPEND configure_arguments --os=mingw)
     endif()
 
-    if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    if(VCPKG_TARGET_IS_EMSCRIPTEN)
+        vcpkg_list(APPEND configure_arguments --cc=emcc)
+    elseif(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
         vcpkg_list(APPEND configure_arguments --cc=gcc)
     elseif(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID MATCHES "Clang")
         vcpkg_list(APPEND configure_arguments --cc=clang)
@@ -143,16 +149,18 @@ else()
             "ZLIB_LIBS_RELEASE=${ZLIB_LIBS_RELEASE}"
             "ZLIB_LIBS_DEBUG=${ZLIB_LIBS_DEBUG}"
     )
-    vcpkg_copy_tools(TOOL_NAMES botan AUTO_CLEAN)
+    if(NOT VCPKG_TARGET_IS_EMSCRIPTEN)
+        vcpkg_copy_tools(TOOL_NAMES botan AUTO_CLEAN)
+    endif()
 endif()
 
-file(RENAME "${CURRENT_PACKAGES_DIR}/include/botan-2/botan" "${CURRENT_PACKAGES_DIR}/include/botan")
+file(RENAME "${CURRENT_PACKAGES_DIR}/include/botan-3/botan" "${CURRENT_PACKAGES_DIR}/include/botan")
 
 if(pkgconfig_requires)
     list(JOIN pkgconfig_requires ", " pkgconfig_requires)
-    file(APPEND "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/botan-2.pc" "Requires.private: ${pkgconfig_requires}")
+    file(APPEND "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/botan-3.pc" "Requires.private: ${pkgconfig_requires}")
     if(NOT VCPKG_BUILD_TYPE)
-        file(APPEND "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/botan-2.pc" "Requires.private: ${pkgconfig_requires}")
+        file(APPEND "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/botan-3.pc" "Requires.private: ${pkgconfig_requires}")
     endif()
 endif()
 vcpkg_fixup_pkgconfig()
@@ -160,7 +168,7 @@ vcpkg_fixup_pkgconfig()
 file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/debug/include"
     "${CURRENT_PACKAGES_DIR}/debug/share"
-    "${CURRENT_PACKAGES_DIR}/include/botan-2"
+    "${CURRENT_PACKAGES_DIR}/include/botan-3"
 )
 
 vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/botan/build.h" "#define BOTAN_INSTALL_PREFIX R\"(${CURRENT_PACKAGES_DIR})\"" "")
@@ -168,4 +176,4 @@ vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/botan/build.h" "#define BO
 vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/botan/build.h" "#define BOTAN_INSTALL_LIB_DIR R\"(${CURRENT_PACKAGES_DIR}/lib)\"" "")
 vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/botan/build.h" "--prefix=${CURRENT_PACKAGES_DIR}" "")
 
-file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/license.txt")
diff --git a/external_imported/vcpkg/ports/botan/vcpkg.json b/external_imported/vcpkg/ports/botan/vcpkg.json
index a042b64d0..25020a9c4 100644
--- a/external_imported/vcpkg/ports/botan/vcpkg.json
+++ b/external_imported/vcpkg/ports/botan/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "botan",
-  "version": "2.19.3",
+  "version": "3.2.0",
   "description": "A cryptography library written in C++11",
   "homepage": "https://botan.randombit.net",
   "license": "BSD-2-Clause",
diff --git a/external_imported/vcpkg/ports/botan/verbose-install.patch b/external_imported/vcpkg/ports/botan/verbose-install.patch
index 6b1e46729..4f6101e10 100644
--- a/external_imported/vcpkg/ports/botan/verbose-install.patch
+++ b/external_imported/vcpkg/ports/botan/verbose-install.patch
@@ -1,13 +1,13 @@
 diff --git a/src/build-data/makefile.in b/src/build-data/makefile.in
-index 4839112..5102933 100644
+index 1d50a31..64789a5 100644
 --- a/src/build-data/makefile.in
 +++ b/src/build-data/makefile.in
-@@ -58,7 +58,7 @@ distclean:
+@@ -61,7 +61,7 @@ distclean:
  	"$(PYTHON_EXE)" "$(SCRIPTS_DIR)/cleanup.py" --build-dir="%{build_dir}" --distclean
  
  install: %{install_targets}
--	"$(PYTHON_EXE)" "$(SCRIPTS_DIR)/install.py" --prefix="%{prefix}" --build-dir="%{build_dir}" --bindir="%{bindir}" --libdir="%{libdir}" --docdir="%{docdir}" --includedir="%{includedir}"
-+	"$(PYTHON_EXE)" "$(SCRIPTS_DIR)/install.py" --prefix="%{prefix}" --build-dir="%{build_dir}" --bindir="%{bindir}" --libdir="%{libdir}" --docdir="%{docdir}" --includedir="%{includedir}" --verbose
+-	"$(PYTHON_EXE)" "$(SCRIPTS_DIR)/install.py" --build-dir="%{build_dir}"
++	"$(PYTHON_EXE)" "$(SCRIPTS_DIR)/install.py" --build-dir="%{build_dir}" --verbose
  
  check: tests
  	"$(PYTHON_EXE)" "$(SCRIPTS_DIR)/check.py" --build-dir="%{build_dir}"
diff --git a/external_imported/vcpkg/ports/braft/portfile.cmake b/external_imported/vcpkg/ports/braft/portfile.cmake
index c35fae993..6e5875b1d 100644
--- a/external_imported/vcpkg/ports/braft/portfile.cmake
+++ b/external_imported/vcpkg/ports/braft/portfile.cmake
@@ -1,3 +1,10 @@
+vcpkg_download_distfile(
+    GCC_11_PATCH
+    URLS https://github.com/baidu/braft/commit/361ef01185b88baf90b7926f992c8e71fc4aefc2.patch?full_index=1
+    SHA512 245470404885cc8a903893fbcde201b892d0b160d7c1f09758f20c83a0d8f476f4512ee8091aa7a1d3798c8315eb0dae8e9a8da7af8425df62ab6f837b025392
+    FILENAME 361ef01185b88baf90b7926f992c8e71fc4aefc2.patch
+)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO baidu/braft
@@ -8,6 +15,7 @@ vcpkg_from_github(
         fix-build.patch
         fix-dependency.patch
         export-target.patch
+        "${GCC_11_PATCH}"
 )
 
 vcpkg_cmake_configure(
@@ -16,6 +24,7 @@ vcpkg_cmake_configure(
         -DBRPC_WITH_GLOG=ON
         -DBUILD_TOOLS=OFF
 )
+
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
diff --git a/external_imported/vcpkg/ports/braft/vcpkg.json b/external_imported/vcpkg/ports/braft/vcpkg.json
index fc1294cab..19bfa4481 100644
--- a/external_imported/vcpkg/ports/braft/vcpkg.json
+++ b/external_imported/vcpkg/ports/braft/vcpkg.json
@@ -1,7 +1,8 @@
 {
   "name": "braft",
   "version-date": "2021-26-04",
-  "description": "Consesus algorithm library",
+  "port-version": 1,
+  "description": "Consensus algorithm library",
   "homepage": "https://github.com/baidu/braft",
   "license": "Apache-2.0",
   "supports": "!windows",
diff --git a/external_imported/vcpkg/ports/breakpad/CMakeLists.txt b/external_imported/vcpkg/ports/breakpad/CMakeLists.txt
index 8593f4b7b..167257ba1 100644
--- a/external_imported/vcpkg/ports/breakpad/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/breakpad/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.8)
 project(breakpad CXX)
 
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 add_definitions(
@@ -93,6 +93,14 @@ else()
     endif()
 endif()
 
+set(USED_ZLIB OFF)
+if(LINUX AND NOT CMAKE_SYSTEM_NAME STREQUAL Android)
+    # src/common/linux/dump_symbols.cc wants zlib.h
+    find_package(ZLIB REQUIRED)
+    target_link_libraries(libbreakpad_client PRIVATE ZLIB::ZLIB)
+    set(USED_ZLIB ON)
+endif()
+
 target_include_directories(libbreakpad_client
     PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
@@ -141,14 +149,6 @@ if(INSTALL_TOOLS)
             src/common/dwarf/dwarf2diehandler.cc
             src/common/dwarf/dwarf2reader.cc
             src/common/dwarf/elf_reader.cc
-            src/common/linux/crc32.cc
-            src/common/linux/dump_symbols.cc
-            src/common/linux/elf_symbols_to_module.cc
-            src/common/linux/elfutils.cc
-            src/common/linux/file_id.cc
-            src/common/linux/linux_libc_support.cc
-            src/common/linux/memory_mapped_file.cc
-            src/common/linux/safe_readlink.cc
             src/tools/linux/dump_syms/dump_syms.cc)
         target_link_libraries(dump_syms PRIVATE libbreakpad_client)
         install(TARGETS dump_syms DESTINATION bin)
@@ -192,7 +192,7 @@ if(INSTALL_HEADERS)
     if(WIN32)
         set(HEADER_EXCLUDE_REGEX "/apple|/ios|/linux|/mac|/solaris|/android|/dwarf|/tests|/testdata|/unittests")
     elseif(APPLE)
-        set(HEADER_EXCLUDE_REGEX "/apple|/ios|/linux|/windows|/solaris|/android|/dwarf|/tests|/testdata|/unittests|/sender|/testapp|/*proj|/gcov")
+        set(HEADER_EXCLUDE_REGEX "/apple|/ios|/linux|/windows|/solaris|/android|/dwarf|/tests|/testdata|/unittests|/sender|/testapp|\.xcodeproj|/gcov")
     else()
         set(HEADER_EXCLUDE_REGEX "/apple|/ios|/windows|/mac|/solaris|/android|/dwarf|/tests|/testdata|/unittests")
         install(
@@ -213,7 +213,9 @@ endif()
 
 install(
     EXPORT unofficial-breakpad-targets
-    FILE unofficial-breakpad-config.cmake
+    FILE unofficial-breakpadTargets.cmake
     NAMESPACE unofficial::breakpad::
     DESTINATION share/unofficial-breakpad
 )
+
+configure_file("${CMAKE_CURRENT_LIST_DIR}/unofficial-breakpadConfig.cmake" "${CMAKE_INSTALL_PREFIX}/share/unofficial-breakpad/unofficial-breakpadConfig.cmake" @ONLY)
diff --git a/external_imported/vcpkg/ports/breakpad/fix-const-char.patch b/external_imported/vcpkg/ports/breakpad/fix-const-char.patch
new file mode 100644
index 000000000..57a9a823a
--- /dev/null
+++ b/external_imported/vcpkg/ports/breakpad/fix-const-char.patch
@@ -0,0 +1,14 @@
+diff --git a/src/processor/disassembler_objdump.cc b/src/processor/disassembler_objdump.cc
+index dfe10d58..26be029c 100644
+--- a/src/processor/disassembler_objdump.cc
++++ b/src/processor/disassembler_objdump.cc
+@@ -85,7 +85,7 @@ ScopedTmpFile::~ScopedTmpFile() {
+ }
+ 
+ bool ScopedTmpFile::Create() {
+-  fd_ = mkstemp(path_.data());
++  fd_ = mkstemp(const_cast<char*>(path_.data()));
+   if (fd_ < 0) {
+     unlink(path_.c_str());
+     fd_ = 0;
+
diff --git a/external_imported/vcpkg/ports/breakpad/portfile.cmake b/external_imported/vcpkg/ports/breakpad/portfile.cmake
index b5d472da6..e7d99b9da 100644
--- a/external_imported/vcpkg/ports/breakpad/portfile.cmake
+++ b/external_imported/vcpkg/ports/breakpad/portfile.cmake
@@ -1,49 +1,69 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO google/breakpad
-    REF v2022.07.12
-    SHA512 872fa74520709d6510b798c7adfb7fed34a84b1831e774087515c23a005b0ea76ef7758bb565f0ff9f2153206cf53958621463fba0e055c9d31dc68f687e2b8f
-    HEAD_REF master
-    PATCHES
-        fix-unique_ptr.patch
-)
-
-if(VCPKG_HOST_IS_LINUX OR VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_ANDROID)
-    vcpkg_from_git(
-        OUT_SOURCE_PATH LSS_SOURCE_PATH
-        URL https://chromium.googlesource.com/linux-syscall-support
-        REF 7bde79cc274d06451bf65ae82c012a5d3e476b5a
-    )
-
-    file(RENAME "${LSS_SOURCE_PATH}" "${SOURCE_PATH}/src/third_party/lss")
-endif()
-
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" "${CMAKE_CURRENT_LIST_DIR}/check_getcontext.cc" DESTINATION "${SOURCE_PATH}")
-
-vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    FEATURES
-        "tools" INSTALL_TOOLS
-)
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS
-        ${FEATURE_OPTIONS}
-    OPTIONS_RELEASE
-        -DINSTALL_HEADERS=ON
-)
-
-vcpkg_cmake_install()
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/client/linux/data" "${CURRENT_PACKAGES_DIR}/include/client/linux/sender")
-
-if("tools" IN_LIST FEATURES)
-    vcpkg_copy_tools(TOOL_NAMES microdump_stackwalk minidump_dump minidump_stackwalk core2md pid2md dump_syms minidump-2-core minidump_upload sym_upload core_handler AUTO_CLEAN)
-endif()
-
-vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-breakpad)
-
-vcpkg_copy_pdbs()
-
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO google/breakpad
+    REF v2023.01.27
+    SHA512 c6802c55653289780232b20e2abc0458c49f3cdff108c3ddfd6e40a2f378da34adbc158548e9c88cbfdbba9526477da9b68c2c45e205231e2802fe533b6bd6a4
+    HEAD_REF master
+    PATCHES
+        fix-const-char.patch
+        fix-unique_ptr.patch
+)
+
+if(VCPKG_HOST_IS_LINUX OR VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_ANDROID)
+    vcpkg_from_git(
+        OUT_SOURCE_PATH LSS_SOURCE_PATH
+        URL https://chromium.googlesource.com/linux-syscall-support
+        REF 7bde79cc274d06451bf65ae82c012a5d3e476b5a
+    )
+
+    file(RENAME "${LSS_SOURCE_PATH}" "${SOURCE_PATH}/src/third_party/lss")
+endif()
+
+file(COPY
+        "${CMAKE_CURRENT_LIST_DIR}/check_getcontext.cc"
+        "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+        "${CMAKE_CURRENT_LIST_DIR}/unofficial-breakpadConfig.cmake"
+    DESTINATION
+    "${SOURCE_PATH}")
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        "tools" INSTALL_TOOLS
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        ${FEATURE_OPTIONS}
+    OPTIONS_RELEASE
+        -DINSTALL_HEADERS=ON
+)
+
+vcpkg_cmake_install()
+file(REMOVE_RECURSE
+    "${CURRENT_PACKAGES_DIR}/include/client/linux/data"
+    "${CURRENT_PACKAGES_DIR}/include/client/linux/sender")
+
+if("tools" IN_LIST FEATURES)
+    vcpkg_copy_tools(
+        TOOL_NAMES
+            microdump_stackwalk
+            minidump_dump
+            minidump_stackwalk
+            core2md
+            pid2md
+            dump_syms
+            minidump-2-core
+            minidump_upload
+            sym_upload
+            core_handler
+        AUTO_CLEAN)
+endif()
+
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-breakpad)
+
+vcpkg_copy_pdbs()
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/breakpad/unofficial-breakpadConfig.cmake b/external_imported/vcpkg/ports/breakpad/unofficial-breakpadConfig.cmake
new file mode 100644
index 000000000..67d55984f
--- /dev/null
+++ b/external_imported/vcpkg/ports/breakpad/unofficial-breakpadConfig.cmake
@@ -0,0 +1,6 @@
+if(@USED_ZLIB@)
+  include(CMakeFindDependencyMacro)
+  find_dependency(ZLIB)
+endif()
+
+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-breakpadTargets.cmake")
diff --git a/external_imported/vcpkg/ports/breakpad/vcpkg.json b/external_imported/vcpkg/ports/breakpad/vcpkg.json
index ea5404d18..6c69b3978 100644
--- a/external_imported/vcpkg/ports/breakpad/vcpkg.json
+++ b/external_imported/vcpkg/ports/breakpad/vcpkg.json
@@ -1,14 +1,14 @@
 {
   "name": "breakpad",
-  "version-date": "2022-07-12",
-  "port-version": 4,
+  "version-date": "2023-01-27",
+  "port-version": 1,
   "description": "a set of client and server components which implement a crash-reporting system.",
   "homepage": "https://github.com/google/breakpad",
   "license": "BSD-3-Clause",
   "supports": "!uwp & (!windows | !arm) & (!windows | !arm64)",
   "dependencies": [
     {
-      "name": "atlmfc",
+      "name": "atl",
       "platform": "windows"
     },
     "libdisasm",
@@ -19,6 +19,10 @@
     {
       "name": "vcpkg-cmake-config",
       "host": true
+    },
+    {
+      "name": "zlib",
+      "platform": "linux"
     }
   ],
   "features": {
diff --git a/external_imported/vcpkg/ports/brigand/vcpkg.json b/external_imported/vcpkg/ports/brigand/vcpkg.json
index 99a5e0219..a8f65f7ed 100644
--- a/external_imported/vcpkg/ports/brigand/vcpkg.json
+++ b/external_imported/vcpkg/ports/brigand/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "brigand",
-  "version-string": "1.3.0",
-  "port-version": 2,
+  "version": "1.3.0",
+  "port-version": 3,
   "description": "Brigand is a light-weight, fully functional, instant-compile time C++ 11 meta-programming library.",
   "homepage": "https://github.com/edouarda/brigand",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/brotli/emscripten.patch b/external_imported/vcpkg/ports/brotli/emscripten.patch
new file mode 100644
index 000000000..24696d73e
--- /dev/null
+++ b/external_imported/vcpkg/ports/brotli/emscripten.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0589fc1..9b32b60 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -153,10 +153,8 @@ foreach(lib ${BROTLI_LIBRARIES_CORE})
+   set_property(TARGET ${lib} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${BROTLI_INCLUDE_DIRS}>" $<INSTALL_INTERFACE:include>)
+ endforeach()
+ 
+-if(NOT BROTLI_EMSCRIPTEN)
+ target_link_libraries(brotlidec brotlicommon)
+ target_link_libraries(brotlienc brotlicommon)
+-endif()
+ 
+ # For projects stuck on older versions of CMake, this will set the
+ # BROTLI_INCLUDE_DIRS and BROTLI_LIBRARIES variables so they still
diff --git a/external_imported/vcpkg/ports/brotli/fix-arm-uwp.patch b/external_imported/vcpkg/ports/brotli/fix-arm-uwp.patch
index 7ed3fcd3d..849c7dd08 100644
--- a/external_imported/vcpkg/ports/brotli/fix-arm-uwp.patch
+++ b/external_imported/vcpkg/ports/brotli/fix-arm-uwp.patch
@@ -1,13 +1,13 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e6c6054..2c4b757 100644
+index d868883..e4c5ecc 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -124,6 +124,8 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-   add_definitions(-DOS_FREEBSD)
- elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+@@ -114,6 +114,8 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
    add_definitions(-DOS_MACOSX)
+   set(CMAKE_MACOS_RPATH TRUE)
+   set(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
 +elseif(MSVC)
 +  add_definitions(-D_CRT_SECURE_NO_WARNINGS)
  endif()
  
- function(transform_sources_list INPUT_FILE OUTPUT_FILE)
+ if(BROTLI_EMSCRIPTEN)
diff --git a/external_imported/vcpkg/ports/brotli/install.patch b/external_imported/vcpkg/ports/brotli/install.patch
index 3964c0c19..c523f1c78 100644
--- a/external_imported/vcpkg/ports/brotli/install.patch
+++ b/external_imported/vcpkg/ports/brotli/install.patch
@@ -1,10 +1,10 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4ff3401..46492d0 100644
+index 61378cd..d868883 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -185,14 +185,13 @@ endforeach()
+@@ -142,14 +142,13 @@ endif()
  
- foreach(lib IN LISTS BROTLI_SHARED_LIBS BROTLI_STATIC_LIBS)
+ foreach(lib ${BROTLI_LIBRARIES_CORE})
    target_link_libraries(${lib} ${LIBM_LIBRARY})
 -  set_property(TARGET ${lib} APPEND PROPERTY INCLUDE_DIRECTORIES ${BROTLI_INCLUDE_DIRS})
    set_target_properties(${lib} PROPERTIES
@@ -13,12 +13,12 @@ index 4ff3401..46492d0 100644
    if(NOT BROTLI_EMSCRIPTEN)
      set_target_properties(${lib} PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
    endif()
--  set_property(TARGET ${lib} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${BROTLI_INCLUDE_DIRS}")
+-  set_property(TARGET ${lib} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${BROTLI_INCLUDE_DIRS}>")
 +  set_property(TARGET ${lib} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${BROTLI_INCLUDE_DIRS}>" $<INSTALL_INTERFACE:include>)
  endforeach()
  
  if(NOT BROTLI_EMSCRIPTEN)
-@@ -223,27 +222,36 @@ if(NOT BROTLI_EMSCRIPTEN)
+@@ -176,11 +175,14 @@ target_link_libraries(brotli ${BROTLI_LIBRARIES})
  if(NOT BROTLI_BUNDLED_MODE)
    install(
      TARGETS brotli
@@ -28,32 +28,20 @@ index 4ff3401..46492d0 100644
 +    CONFIGURATIONS Release
    )
  
-+  if(BUILD_SHARED_LIBS)
    install(
      TARGETS ${BROTLI_LIBRARIES_CORE}
 +    EXPORT brotli
      ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
      LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
      RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-   )
--
-+  else()
-   install(
-     TARGETS ${BROTLI_LIBRARIES_CORE_STATIC}
-+    EXPORT brotli
-     ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-     LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-     RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-   )
-+  endif()
- 
+@@ -189,7 +191,10 @@ if(NOT BROTLI_BUNDLED_MODE)
    install(
      DIRECTORY ${BROTLI_INCLUDE_DIRS}/brotli
      DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
 +    CONFIGURATIONS Release
    )
 +  
-+  install(EXPORT brotli FILE unofficial-brotli-targets.cmake NAMESPACE unofficial::brotli:: DESTINATION share/unofficial-brotli)
++  install(EXPORT brotli FILE unofficial-brotli-config.cmake NAMESPACE unofficial::brotli:: DESTINATION share/unofficial-brotli)
  endif()  # BROTLI_BUNDLED_MODE
- endif()  # BROTLI_EMSCRIPTEN
  
+ # Tests
diff --git a/external_imported/vcpkg/ports/brotli/pkgconfig.patch b/external_imported/vcpkg/ports/brotli/pkgconfig.patch
index 30adf3d24..e3c3fa38f 100644
--- a/external_imported/vcpkg/ports/brotli/pkgconfig.patch
+++ b/external_imported/vcpkg/ports/brotli/pkgconfig.patch
@@ -1,18 +1,17 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0cdb73b..33a80a7 100644
+index e4c5ecc..0589fc1 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -406,6 +406,13 @@ function(transform_pc_file INPUT_FILE OUTPUT_FILE VERSION)
+@@ -348,6 +348,12 @@ function(transform_pc_file INPUT_FILE OUTPUT_FILE VERSION)
  
    string(REGEX REPLACE "@PACKAGE_VERSION@" "${VERSION}" TEXT ${TEXT})
  
-+  string(REPLACE [[ -R${libdir}]] "" TEXT ${TEXT})
 +  if(NOT BUILD_SHARED_LIBS)
-+    string(REGEX REPLACE [[( -lbrotli[a-z]*)]] [[\1-static]] TEXT ${TEXT})
 +    if(LIBM_LIBRARY)
-+      string(REPLACE " -lbrotlicommon-static" " -lbrotlicommon-static -l${LIBM_LIBRARY}" TEXT ${TEXT})
++      string(REPLACE " -lbrotlicommon" " -lbrotlicommon -l${LIBM_LIBRARY}" TEXT ${TEXT})
 +    endif()
 +  endif()
++
    file(WRITE ${OUTPUT_FILE} ${TEXT})
  endfunction()
  
diff --git a/external_imported/vcpkg/ports/brotli/portfile.cmake b/external_imported/vcpkg/ports/brotli/portfile.cmake
index 9c74dc6c8..461b4f60b 100644
--- a/external_imported/vcpkg/ports/brotli/portfile.cmake
+++ b/external_imported/vcpkg/ports/brotli/portfile.cmake
@@ -1,31 +1,35 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/brotli
-    REF e61745a6b7add50d380cfd7d3883dd6c62fc2c71 # v1.0.9
-    SHA512 303444695600b70ce59708e06bf21647d9b8dd33d772c53bbe49320f2f8f95ca8a7d6df2d29b7f36ff99001967e2d28380e0e305d778031940a3a5c6585f9a4f
+    REF v${VERSION} # v1.1.0 
+    SHA512 6eb280d10d8e1b43d22d00fa535435923c22ce8448709419d676ff47d4a644102ea04f488fc65a179c6c09fee12380992e9335bad8dfebd5d1f20908d10849d9
     HEAD_REF master
     PATCHES
         install.patch
         fix-arm-uwp.patch
         pkgconfig.patch
+        emscripten.patch
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DBROTLI_DISABLE_TESTS=ON
-        # Required for wasm32-emscripten triplet to avoid "install" being turned off
-        -DBROTLI_EMSCRIPTEN=OFF
 )
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 vcpkg_fixup_pkgconfig()
-
-file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/unofficial-brotli-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-brotli")
 vcpkg_cmake_config_fixup(CONFIG_PATH share/unofficial-brotli PACKAGE_NAME unofficial-brotli)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools")
-vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/brotli")
+
+# Under emscripten the brotli executable tool is produced with .js extension but vcpkg_copy_tools
+# has no special behaviour in this case and searches for the tool name with no extension
+if(VCPKG_TARGET_IS_EMSCRIPTEN)
+	set(TOOL_SUFFIX ".js" )
+endif()
+
+vcpkg_copy_tools(TOOL_NAMES "brotli${TOOL_SUFFIX}" SEARCH_DIR "${CURRENT_PACKAGES_DIR}/tools/brotli")
 
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/brotli/unofficial-brotli-config.cmake b/external_imported/vcpkg/ports/brotli/unofficial-brotli-config.cmake
deleted file mode 100644
index 694db564e..000000000
--- a/external_imported/vcpkg/ports/brotli/unofficial-brotli-config.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-include("${CMAKE_CURRENT_LIST_DIR}/unofficial-brotli-targets.cmake")
-foreach(target IN ITEMS brotlicommon brotlidec brotlienc)
-    if(TARGET unofficial::brotli::${target} AND NOT TARGET unofficial::brotli::${target}-static)
-        _add_library(unofficial::brotli::${target}-static INTERFACE IMPORTED)
-        set_target_properties(unofficial::brotli::${target}-static PROPERTIES INTERFACE_LINK_LIBRARIES "unofficial::brotli::${target}")
-    endif()
-    if(NOT TARGET unofficial::brotli::${target} AND TARGET unofficial::brotli::${target}-static)
-        _add_library(unofficial::brotli::${target} INTERFACE IMPORTED)
-        set_target_properties(unofficial::brotli::${target} PROPERTIES INTERFACE_LINK_LIBRARIES "unofficial::brotli::${target}-static")
-    endif()
-endforeach()
diff --git a/external_imported/vcpkg/ports/brotli/vcpkg.json b/external_imported/vcpkg/ports/brotli/vcpkg.json
index e352eea24..1be0e5574 100644
--- a/external_imported/vcpkg/ports/brotli/vcpkg.json
+++ b/external_imported/vcpkg/ports/brotli/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "brotli",
-  "version": "1.0.9",
-  "port-version": 5,
+  "version": "1.1.0",
+  "port-version": 1,
   "description": "a generic-purpose lossless compression algorithm that compresses data using a combination of a modern variant of the LZ77 algorithm, Huffman coding and 2nd order context modeling.",
   "homepage": "https://github.com/google/brotli",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/brpc/fix-build.patch b/external_imported/vcpkg/ports/brpc/fix-build.patch
index 775874c4b..3e193c467 100644
--- a/external_imported/vcpkg/ports/brpc/fix-build.patch
+++ b/external_imported/vcpkg/ports/brpc/fix-build.patch
@@ -1,16 +1,7 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 35365b27..53c5fffd 100644
+index 4ac815d6..dbb9b7ee 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -26,7 +26,7 @@ option(WITH_THRIFT "With thrift framed protocol supported" OFF)
- option(WITH_SNAPPY "With snappy" OFF)
- option(WITH_RDMA "With RDMA" OFF)
- option(BUILD_UNIT_TESTS "Whether to build unit tests" OFF)
--option(BUILD_BRPC_TOOLS "Whether to build brpc tools" ON)
-+option(BUILD_BRPC_TOOLS "Whether to build brpc tools" OFF)
- option(DOWNLOAD_GTEST "Download and build a fresh copy of googletest. Requires Internet access." ON)
- 
- # Enable MACOSX_RPATH. Run "cmake --help-policy CMP0042" for policy details.
 @@ -66,7 +66,8 @@ endif()
  
  if(WITH_THRIFT)
@@ -21,7 +12,7 @@ index 35365b27..53c5fffd 100644
  endif()
  
  set(WITH_RDMA_VAL "0")
-@@ -150,14 +151,14 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+@@ -150,11 +151,15 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
      endif()
  endif()
  
@@ -30,19 +21,16 @@ index 35365b27..53c5fffd 100644
 +get_target_property(PROTOBUF_INCLUDE_DIR protobuf::libprotobuf INTERFACE_INCLUDE_DIRECTORIES)
 +set(PROTOBUF_LIBRARIES protobuf::libprotobuf)
  find_package(Threads REQUIRED)
++find_package(ZLIB REQUIRED)
  
--find_path(LEVELDB_INCLUDE_PATH NAMES leveldb/db.h)
--find_library(LEVELDB_LIB NAMES leveldb)
--if ((NOT LEVELDB_INCLUDE_PATH) OR (NOT LEVELDB_LIB))
--    message(FATAL_ERROR "Fail to find leveldb")
--endif()
 +find_package(leveldb CONFIG REQUIRED)
-+set(LEVELDB_INCLUDE_PATH ${PROTOBUF_INCLUDE_DIR})
+ find_path(LEVELDB_INCLUDE_PATH NAMES leveldb/db.h)
+-find_library(LEVELDB_LIB NAMES leveldb)
 +set(LEVELDB_LIB leveldb::leveldb)
- 
- if(WITH_SNAPPY)
-     find_path(SNAPPY_INCLUDE_PATH NAMES snappy.h)
-@@ -169,8 +170,9 @@ if(WITH_SNAPPY)
+ if ((NOT LEVELDB_INCLUDE_PATH) OR (NOT LEVELDB_LIB))
+     message(FATAL_ERROR "Fail to find leveldb")
+ endif()
+@@ -169,8 +174,9 @@ if(WITH_SNAPPY)
  endif()
  
  if(WITH_GLOG)
@@ -54,7 +42,7 @@ index 35365b27..53c5fffd 100644
      if((NOT GLOG_INCLUDE_PATH) OR (NOT GLOG_LIB))
          message(FATAL_ERROR "Fail to find glog")
      endif()
-@@ -197,7 +199,7 @@ if(WITH_RDMA)
+@@ -197,7 +203,7 @@ if(WITH_RDMA)
      endif()
  endif()
  
@@ -63,7 +51,7 @@ index 35365b27..53c5fffd 100644
  if(NOT PROTOC_LIB)
      message(FATAL_ERROR "Fail to find protoc lib")
  endif()
-@@ -208,7 +210,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+@@ -208,7 +214,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
          )
  endif()
  
@@ -72,7 +60,7 @@ index 35365b27..53c5fffd 100644
  
  include_directories(
          ${GFLAGS_INCLUDE_PATH}
-@@ -223,9 +225,9 @@ set(DYNAMIC_LIB
+@@ -223,11 +229,11 @@ set(DYNAMIC_LIB
      ${LEVELDB_LIB}
      ${PROTOC_LIB}
      ${CMAKE_THREAD_LIBS_INIT}
@@ -82,8 +70,11 @@ index 35365b27..53c5fffd 100644
 +    ${OPENSSL_SSL_LIBRARY}
 +    ${THRIFT_LIB}
      dl
-     z)
+-    z)
++    ZLIB::ZLIB)
  
+ if(WITH_MESALINK)
+     list(APPEND DYNAMIC_LIB ${MESALINK_LIB})
 diff --git a/cmake/FindGFLAGS.cmake b/cmake/FindGFLAGS.cmake
 index dfad5fd8..8423d55a 100644
 --- a/cmake/FindGFLAGS.cmake
@@ -100,7 +91,7 @@ index dfad5fd8..8423d55a 100644
    set(GFLAGS_FOUND TRUE)
  endif(GFLAGS_INCLUDE_PATH AND GFLAGS_LIBRARY)
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index fbcc7cc5..c2d0d7bb 100644
+index fbcc7cc5..95037a0d 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
 @@ -31,16 +31,24 @@ add_dependencies(SOURCES_LIB PROTO_LIB)
@@ -113,8 +104,9 @@ index fbcc7cc5..c2d0d7bb 100644
                                 $<TARGET_OBJECTS:PROTO_LIB>)
  
 -if(BRPC_WITH_THRIFT)
+-   target_link_libraries(brpc-static thrift)
 +if(WITH_THRIFT)
-    target_link_libraries(brpc-static thrift)
++   target_link_libraries(brpc-static ${THRIFT_LIB})
  endif()
  
 +target_link_libraries(brpc-static PUBLIC ${DYNAMIC_LIB})
@@ -129,7 +121,7 @@ index fbcc7cc5..c2d0d7bb 100644
  # for protoc-gen-mcpack
  set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/output/bin)
      
-@@ -49,35 +57,57 @@ set(protoc_gen_mcpack_SOURCES
+@@ -49,35 +57,62 @@ set(protoc_gen_mcpack_SOURCES
   )
      
  add_executable(protoc-gen-mcpack ${protoc_gen_mcpack_SOURCES})
@@ -145,22 +137,27 @@ index fbcc7cc5..c2d0d7bb 100644
          target_link_libraries(brpc-shared ${GLOG_LIB})
      endif()
 -    if(BRPC_WITH_THRIFT)
+-        target_link_libraries(brpc-shared thrift)
 +    if(WITH_THRIFT)
-         target_link_libraries(brpc-shared thrift)
++        target_link_libraries(brpc-shared ${THRIFT_LIB})
      endif()
      SET_TARGET_PROPERTIES(brpc-shared PROPERTIES OUTPUT_NAME brpc CLEAN_DIRECT_OUTPUT 1)
- 
+-
++    if(0)
      target_link_libraries(protoc-gen-mcpack brpc-shared ${DYNAMIC_LIB} pthread)
- 
+-
 -    install(TARGETS brpc-shared
++    endif()
 +    install(TARGETS brpc-shared EXPORT unofficial-brpcTargets
              RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
              LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
              ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
              )
  else()
--    target_link_libraries(protoc-gen-mcpack brpc-static ${DYNAMIC_LIB} pthread)
++if(0)
+     target_link_libraries(protoc-gen-mcpack brpc-static ${DYNAMIC_LIB} pthread)
  endif()
++endif()
  
  
  
@@ -172,10 +169,12 @@ index fbcc7cc5..c2d0d7bb 100644
          ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
          )
 +endif()
++
 +file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-brpc-config.cmake"
 +[[include(CMakeFindDependencyMacro)
 +find_dependency(OpenSSL)
 +find_dependency(Threads)
++find_dependency(ZLIB)
 +find_dependency(gflags CONFIG)
 +find_dependency(protobuf CONFIG)
 +find_dependency(leveldb CONFIG)
diff --git a/external_imported/vcpkg/ports/brpc/portfile.cmake b/external_imported/vcpkg/ports/brpc/portfile.cmake
index 154105ff5..536bd7241 100644
--- a/external_imported/vcpkg/ports/brpc/portfile.cmake
+++ b/external_imported/vcpkg/ports/brpc/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO apache/incubator-brpc
     REF "${VERSION}"
-    SHA512 7e75a4f03eddbd6ce841566bad415e34706a6d5db1abaffec3b512461a45ddbaee2b365589f505b64a11f9466e2a38e9eb83570fe1532caeae20dc1d059d29be
+    SHA512 da0004b7b50cc48da018627c9361ae62b006bb7cd2af53a5cfa1601aab7ad31174d37778a42809bdf2e0f2021a860dcbb02e2c3c938eae6c02808267c3b85025
     HEAD_REF master
     PATCHES
         fix-build.patch
@@ -13,8 +13,8 @@ vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE
     OPTIONS
+        -DBUILD_BRPC_TOOLS=OFF
         -DWITH_THRIFT=ON
-        -DWITH_MESALINK=OFF
         -DWITH_GLOG=ON
         -DDOWNLOAD_GTEST=OFF
 )
diff --git a/external_imported/vcpkg/ports/brpc/vcpkg.json b/external_imported/vcpkg/ports/brpc/vcpkg.json
index 619bfcfe1..e89007ba8 100644
--- a/external_imported/vcpkg/ports/brpc/vcpkg.json
+++ b/external_imported/vcpkg/ports/brpc/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "brpc",
-  "version": "1.4.0",
+  "version": "1.6.1",
   "description": "Industrial-grade RPC framework used throughout Baidu, with 1,000,000+ instances and thousands kinds of services, called \"baidu-rpc\" inside Baidu.",
   "homepage": "https://github.com/apache/incubator-brpc",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/bshoshany-thread-pool/portfile.cmake b/external_imported/vcpkg/ports/bshoshany-thread-pool/portfile.cmake
index b0ebdd28f..02b2a5051 100644
--- a/external_imported/vcpkg/ports/bshoshany-thread-pool/portfile.cmake
+++ b/external_imported/vcpkg/ports/bshoshany-thread-pool/portfile.cmake
@@ -1,13 +1,13 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO bshoshany/thread-pool
-    REF v3.3.0
-    SHA512 980c8dfe90e04cbc622ee4ae2ce67444069311619f0dc5d7ac3b3a3ea59ead42d4c867e669e8ce9c71cdc2a4bae431402a8f5032ab29fdfc1ca507b0e7102d8f
-    HEAD_REF master
-)
-
-file(GLOB HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/*.hpp")
-
-file(INSTALL ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include")
-
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO bshoshany/thread-pool
+    REF "v${VERSION}"
+    SHA512 37ebde68a9dc74204fc3df90a8f69cf17be241224eb2176d0841be0d412f8882ecf9abcc7eb61a19874b542988c22a88b4f7087efa86d0f435f996fa438eef5a
+    HEAD_REF master
+)
+
+file(GLOB HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/include/*.hpp")
+
+file(INSTALL ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+
+file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/external_imported/vcpkg/ports/bshoshany-thread-pool/vcpkg.json b/external_imported/vcpkg/ports/bshoshany-thread-pool/vcpkg.json
index f13c66749..9001e2597 100644
--- a/external_imported/vcpkg/ports/bshoshany-thread-pool/vcpkg.json
+++ b/external_imported/vcpkg/ports/bshoshany-thread-pool/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "bshoshany-thread-pool",
-  "version": "3.3.0",
+  "version": "4.0.1",
   "maintainers": "Barak Shoshany <baraksh@gmail.com>",
   "description": "BS::thread_pool: a fast, lightweight, and easy-to-use C++17 thread pool library",
   "homepage": "https://github.com/bshoshany/thread-pool",
diff --git a/external_imported/vcpkg/ports/bullet3/portfile.cmake b/external_imported/vcpkg/ports/bullet3/portfile.cmake
index ea729e43b..b7d7f4155 100644
--- a/external_imported/vcpkg/ports/bullet3/portfile.cmake
+++ b/external_imported/vcpkg/ports/bullet3/portfile.cmake
@@ -1,5 +1,4 @@
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -15,6 +14,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
         multithreading       BULLET2_MULTITHREADING
         double-precision     USE_DOUBLE_PRECISION
+        extras               BUILD_EXTRAS
     INVERTED_FEATURES
         rtti                 USE_MSVC_DISABLE_RTTI
 )
@@ -27,7 +27,6 @@ vcpkg_cmake_configure(
         -DBUILD_BULLET2_DEMOS=OFF
         -DBUILD_OPENGL3_DEMOS=OFF
         -DBUILD_BULLET3=OFF
-        -DBUILD_EXTRAS=ON
         -DBUILD_BULLET_ROBOTICS_GUI_EXTRA=OFF
         -DBUILD_BULLET_ROBOTICS_EXTRA=OFF
         -DBUILD_GIMPACTUTILS_EXTRA=OFF        
diff --git a/external_imported/vcpkg/ports/bullet3/vcpkg.json b/external_imported/vcpkg/ports/bullet3/vcpkg.json
index 05cf7c34d..8d290c2ed 100644
--- a/external_imported/vcpkg/ports/bullet3/vcpkg.json
+++ b/external_imported/vcpkg/ports/bullet3/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "bullet3",
   "version": "3.25",
+  "port-version": 1,
   "description": "Bullet Physics is a professional collision detection, rigid body, and soft body dynamics library",
   "homepage": "https://github.com/bulletphysics/bullet3",
   "license": "Zlib",
@@ -18,6 +19,9 @@
     "double-precision": {
       "description": "Use float64 doubles for bullet3"
     },
+    "extras": {
+      "description": "Build the extras"
+    },
     "multithreading": {
       "description": "Multithreading functionality for bullet3"
     },
diff --git a/external_imported/vcpkg/ports/butteraugli/vcpkg.json b/external_imported/vcpkg/ports/butteraugli/vcpkg.json
index d4df1d2de..24aa8b5e1 100644
--- a/external_imported/vcpkg/ports/butteraugli/vcpkg.json
+++ b/external_imported/vcpkg/ports/butteraugli/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "butteraugli",
-  "version-string": "2019-05-08",
-  "port-version": 3,
+  "version-date": "2019-05-08",
+  "port-version": 4,
   "description": "butteraugli estimates the psychovisual difference between two images",
   "homepage": "https://github.com/google/butteraugli",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/bxzstr/portfile.cmake b/external_imported/vcpkg/ports/bxzstr/portfile.cmake
new file mode 100644
index 000000000..fd198f39a
--- /dev/null
+++ b/external_imported/vcpkg/ports/bxzstr/portfile.cmake
@@ -0,0 +1,23 @@
+vcpkg_from_github(
+  OUT_SOURCE_PATH SOURCE_PATH
+  REPO tmaklin/bxzstr
+  REF "v${VERSION}"
+  SHA512 e357eb99b007031a1b15b20077883ebb20b294fda97d4aa354ded04c8d0b398fdeae9e1e97747caf55699a8feadf8c10eb807a9c6a66837a0816002df34fb7a1
+  HEAD_REF master
+)
+
+file(INSTALL
+     "${SOURCE_PATH}/include/bxzstr.hpp"
+     "${SOURCE_PATH}/include/bz_stream_wrapper.hpp"
+     "${SOURCE_PATH}/include/compression_types.hpp"
+     "${SOURCE_PATH}/include/config.hpp"
+     "${SOURCE_PATH}/include/lzma_stream_wrapper.hpp"
+     "${SOURCE_PATH}/include/stream_wrapper.hpp"
+     "${SOURCE_PATH}/include/strict_fstream.hpp"
+     "${SOURCE_PATH}/include/z_stream_wrapper.hpp"
+     "${SOURCE_PATH}/include/zstd_stream_wrapper.hpp"
+     DESTINATION "${CURRENT_PACKAGES_DIR}/include/bxzstr")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/bxzstr/usage b/external_imported/vcpkg/ports/bxzstr/usage
new file mode 100644
index 000000000..35adcfe18
--- /dev/null
+++ b/external_imported/vcpkg/ports/bxzstr/usage
@@ -0,0 +1,4 @@
+The package bxzstr is header only and can be used from CMake via:
+
+    find_path(BXZSTR_INCLUDE_DIRS "bxzstr.hpp" PATH_SUFFIXES "include/bxzstr")
+    target_include_directories(main PRIVATE ${BXZSTR_INCLUDE_DIRS})
diff --git a/external_imported/vcpkg/ports/bxzstr/vcpkg.json b/external_imported/vcpkg/ports/bxzstr/vcpkg.json
new file mode 100644
index 000000000..effb4665f
--- /dev/null
+++ b/external_imported/vcpkg/ports/bxzstr/vcpkg.json
@@ -0,0 +1,15 @@
+{
+  "name": "bxzstr",
+  "version": "1.2.0",
+  "port-version": 1,
+  "description": "A C++ header-only ZLib/libBZ2/libLZMA/Zstandard wrapper.",
+  "homepage": "https://github.com/tmaklin/bxzstr",
+  "license": "MPL-2.0",
+  "supports": "!xbox",
+  "dependencies": [
+    "bzip2",
+    "liblzma",
+    "zlib",
+    "zstd"
+  ]
+}
diff --git a/external_imported/vcpkg/ports/bzip2/CMakeLists.txt b/external_imported/vcpkg/ports/bzip2/CMakeLists.txt
index e2da221d7..d0f200a0a 100644
--- a/external_imported/vcpkg/ports/bzip2/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/bzip2/CMakeLists.txt
@@ -17,7 +17,7 @@ set(BZ2_SOURCES
 add_library(bz2 ${BZ2_SOURCES})
 set_target_properties(bz2 PROPERTIES
     DEBUG_POSTFIX d
-    VERSION 1.0.6
+    VERSION "${BZ2_VERSION}"
     SOVERSION 1.0)
 if(BUILD_SHARED_LIBS)
     target_compile_definitions(bz2 PRIVATE -DBZ_BUILD_DLL)
diff --git a/external_imported/vcpkg/ports/bzip2/bzip2.pc.in b/external_imported/vcpkg/ports/bzip2/bzip2.pc.in
index 91153c13b..e8caf081e 100644
--- a/external_imported/vcpkg/ports/bzip2/bzip2.pc.in
+++ b/external_imported/vcpkg/ports/bzip2/bzip2.pc.in
@@ -5,7 +5,7 @@ includedir=${prefix}/include
 
 Name: bzip2
 Description: bzip2
-Version: 1.0.6
+Version: @VERSION@
 Requires: 
 Libs: -L${libdir} -l@bzname@
-Cflags: -I${includedir}
\ No newline at end of file
+Cflags: -I${includedir}
diff --git a/external_imported/vcpkg/ports/bzip2/portfile.cmake b/external_imported/vcpkg/ports/bzip2/portfile.cmake
index c03f48c48..4c9968031 100644
--- a/external_imported/vcpkg/ports/bzip2/portfile.cmake
+++ b/external_imported/vcpkg/ports/bzip2/portfile.cmake
@@ -1,27 +1,27 @@
-set(BZIP2_VERSION 1.0.8)
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://sourceware.org/pub/bzip2/bzip2-${BZIP2_VERSION}.tar.gz"
-    FILENAME "bzip2-${BZIP2_VERSION}.tar.gz"
+    URLS "https://sourceware.org/pub/bzip2/bzip2-${VERSION}.tar.gz"
+    FILENAME "bzip2-${VERSION}.tar.gz"
     SHA512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
+vcpkg_extract_source_archive(
+    SOURCE_PATH
+    ARCHIVE "${ARCHIVE}"
     PATCHES fix-import-export-macros.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     INVERTED_FEATURES
-        tool    BZIP2_SKIP_TOOLS
+        tool BZIP2_SKIP_TOOLS
 )
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         ${FEATURE_OPTIONS}
+        "-DBZ2_VERSION=${VERSION}"
     OPTIONS_DEBUG
         -DBZIP2_SKIP_HEADERS=ON
         -DBZIP2_SKIP_TOOLS=ON
@@ -39,18 +39,18 @@ endif()
 file(WRITE "${CURRENT_PACKAGES_DIR}/include/bzlib.h" "${BZLIB_H}")
 
 if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-  set(BZIP2_PREFIX "${CURRENT_INSTALLED_DIR}")
-  set(bzname bz2)
-  configure_file("${CMAKE_CURRENT_LIST_DIR}/bzip2.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/bzip2.pc" @ONLY)
+    set(BZIP2_PREFIX "${CURRENT_INSTALLED_DIR}")
+    set(bzname bz2)
+    configure_file("${CMAKE_CURRENT_LIST_DIR}/bzip2.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/bzip2.pc" @ONLY)
 endif()
 
 if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-  set(BZIP2_PREFIX "${CURRENT_INSTALLED_DIR}/debug")
-  set(bzname bz2d)
-  configure_file("${CMAKE_CURRENT_LIST_DIR}/bzip2.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/bzip2.pc" @ONLY)
+    set(BZIP2_PREFIX "${CURRENT_INSTALLED_DIR}/debug")
+    set(bzname bz2d)
+    configure_file("${CMAKE_CURRENT_LIST_DIR}/bzip2.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/bzip2.pc" @ONLY)
 endif()
 
 vcpkg_fixup_pkgconfig()
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/bzip2/vcpkg.json b/external_imported/vcpkg/ports/bzip2/vcpkg.json
index 55cdb4ac5..4a609b29a 100644
--- a/external_imported/vcpkg/ports/bzip2/vcpkg.json
+++ b/external_imported/vcpkg/ports/bzip2/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "bzip2",
   "version-semver": "1.0.8",
-  "port-version": 3,
+  "port-version": 5,
   "description": "bzip2 is a freely available, patent free, high-quality data compressor. It typically compresses files to within 10% to 15% of the best available techniques (the PPM family of statistical compressors), whilst being around twice as fast at compression and six times faster at decompression.",
   "homepage": "https://sourceware.org/bzip2/",
   "documentation": "https://sourceware.org/bzip2/docs.html",
@@ -10,10 +10,6 @@
     {
       "name": "vcpkg-cmake",
       "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
     }
   ],
   "default-features": [
diff --git a/external_imported/vcpkg/ports/c-ares/fix-uwp.patch b/external_imported/vcpkg/ports/c-ares/fix-uwp.patch
deleted file mode 100644
index 9c457639a..000000000
--- a/external_imported/vcpkg/ports/c-ares/fix-uwp.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7a29fef..08ed974 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -225,6 +225,9 @@ ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
- 	# Don't define _XOPEN_SOURCE on FreeBSD, it actually reduces visibility instead of increasing it
- ELSEIF (WIN32)
- 	LIST (APPEND SYSFLAGS -DWIN32_LEAN_AND_MEAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_WIN32_WINNT=0x0600)
-+	IF (CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-+		LIST (APPEND SYSFLAGS -DWINRT)
-+	ENDIF ()
- ENDIF ()
- ADD_DEFINITIONS(${SYSFLAGS})
- 
-diff --git a/src/lib/ares__addrinfo_localhost.c b/src/lib/ares__addrinfo_localhost.c
-index 7940ecd..aacfa52 100644
---- a/src/lib/ares__addrinfo_localhost.c
-+++ b/src/lib/ares__addrinfo_localhost.c
-@@ -131,7 +131,7 @@ static int ares__system_loopback_addrs(int aftype,
-                                        unsigned short port,
-                                        struct ares_addrinfo_node **nodes)
- {
--#if defined(_WIN32) && defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0600
-+#if defined(_WIN32) && defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0600 && !defined(WINRT)
-   PMIB_UNICASTIPADDRESS_TABLE table;
-   unsigned int i;
-   int status;
-diff --git a/src/lib/ares_getaddrinfo.c b/src/lib/ares_getaddrinfo.c
-index bc9f19b..1bb0e15 100644
---- a/src/lib/ares_getaddrinfo.c
-+++ b/src/lib/ares_getaddrinfo.c
-@@ -467,8 +467,10 @@ static int file_lookup(struct host_query *hquery)
-               RegCloseKey(hkeyHosts);
-             }
-         }
-+#ifndef WINRT
-       else if (platform == WIN_9X)
-         GetWindowsDirectoryA(PATH_HOSTS, MAX_PATH);
-+#endif
-       else
-         return ARES_ENOTFOUND;
- 
-diff --git a/src/lib/ares_gethostbyaddr.c b/src/lib/ares_gethostbyaddr.c
-index c62d230..6d47328 100644
---- a/src/lib/ares_gethostbyaddr.c
-+++ b/src/lib/ares_gethostbyaddr.c
-@@ -194,8 +194,10 @@ static int file_lookup(struct ares_addr *addr, struct hostent **host)
-       RegCloseKey(hkeyHosts);
-     }
-   }
-+#ifndef WINRT
-   else if (platform == WIN_9X)
-     GetWindowsDirectoryA(PATH_HOSTS, MAX_PATH);
-+#endif
-   else
-     return ARES_ENOTFOUND;
- 
-diff --git a/src/lib/ares_gethostbyname.c b/src/lib/ares_gethostbyname.c
-index 8c71cc6..3954244 100644
---- a/src/lib/ares_gethostbyname.c
-+++ b/src/lib/ares_gethostbyname.c
-@@ -278,8 +278,10 @@ static int file_lookup(const char *name, int family, struct hostent **host)
-       RegCloseKey(hkeyHosts);
-     }
-   }
-+#ifndef WINRT
-   else if (platform == WIN_9X)
-     GetWindowsDirectoryA(PATH_HOSTS, MAX_PATH);
-+#endif
-   else
-     return ARES_ENOTFOUND;
- 
-diff --git a/src/lib/ares_init.c b/src/lib/ares_init.c
-index 3f9cec6..63143e0 100644
---- a/src/lib/ares_init.c
-+++ b/src/lib/ares_init.c
-@@ -745,6 +745,9 @@ static ULONG getBestRouteMetric(IF_LUID * const luid, /* Can't be const :( */
-                                 const SOCKADDR_INET * const dest,
-                                 const ULONG interfaceMetric)
- {
-+#ifdef WINRT
-+  return (ULONG)-1;
-+#else
-   /* On this interface, get the best route to that destination. */
-   MIB_IPFORWARD_ROW2 row;
-   SOCKADDR_INET ignored;
-@@ -778,6 +781,7 @@ static ULONG getBestRouteMetric(IF_LUID * const luid, /* Can't be const :( */
-    * which describes the combination as a "sum".
-    */
-   return row.Metric + interfaceMetric;
-+#endif
- }
- 
- /*
diff --git a/external_imported/vcpkg/ports/c-ares/portfile.cmake b/external_imported/vcpkg/ports/c-ares/portfile.cmake
index de452e883..959ce7360 100644
--- a/external_imported/vcpkg/ports/c-ares/portfile.cmake
+++ b/external_imported/vcpkg/ports/c-ares/portfile.cmake
@@ -1,12 +1,16 @@
+string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" _c_ares_version "${VERSION}")
+set(_c_ares_version_major "${CMAKE_MATCH_1}")
+set(_c_ares_version_minor "${CMAKE_MATCH_2}")
+set(_c_ares_version_patch "${CMAKE_MATCH_3}")
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO c-ares/c-ares
-    REF cares-1_19_0
-    SHA512 d6bd7183b9ddf418222357ca61e3ffe0a3e49cbd5d83046bb76146e23bb578b5c7e4a5d89e1c427e7163880323de8ee0962ba75c571102efdf8c0b5742e28f82
+    REF "cares-${_c_ares_version_major}_${_c_ares_version_minor}_${_c_ares_version_patch}"
+    SHA512 1ff8d35cc0e022a0478149ca80a0a1f80b2c8d04e108b6cb9912ecc8c391017b6443129b9b52c2cf82b21ef338de0c80d89c92c6d7f95fe1f9c42575ed1a3919
     HEAD_REF main
     PATCHES
         avoid-docs.patch
-        fix-uwp.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
@@ -32,7 +36,7 @@ vcpkg_fixup_pkgconfig()
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     vcpkg_replace_string(
         "${CURRENT_PACKAGES_DIR}/include/ares.h"
-        "#ifdef CARES_STATICLIB" "#if 1"
+        "#  ifdef CARES_STATICLIB" "#if 1"
     )
 endif()
 
diff --git a/external_imported/vcpkg/ports/c-ares/vcpkg.json b/external_imported/vcpkg/ports/c-ares/vcpkg.json
index 2b9fde05d..fb0aecf93 100644
--- a/external_imported/vcpkg/ports/c-ares/vcpkg.json
+++ b/external_imported/vcpkg/ports/c-ares/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "c-ares",
-  "version-semver": "1.19.0",
+  "version-semver": "1.26.0",
   "description": "A C library for asynchronous DNS requests",
   "homepage": "https://github.com/c-ares/c-ares",
   "license": "MIT-CMU",
diff --git a/external_imported/vcpkg/ports/c89stringutils/no_flags.patch b/external_imported/vcpkg/ports/c89stringutils/no_flags.patch
index b2842c86f..b95f040d1 100644
--- a/external_imported/vcpkg/ports/c89stringutils/no_flags.patch
+++ b/external_imported/vcpkg/ports/c89stringutils/no_flags.patch
@@ -1,20 +1,17 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0ce714554..f9f28b890 100644
+index 9e3c005..75dee3f 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -18,15 +18,7 @@ target_compile_features("${PROJECT_NAME}_compiler_flags" INTERFACE "c_std_${CMAK
- set(gcc_like "$<COMPILE_LANG_AND_ID:C,CXX,ARMClang,AppleClang,Clang,GNU,LCC>")
- set(msvc "$<COMPILE_LANG_AND_ID:C,CXX,MSVC>")
- # -g -fsanitize=address -fno-omit-frame-pointer
--target_compile_options(
--        "${PROJECT_NAME}_compiler_flags"
--        INTERFACE
--        "$<${gcc_like}:$<BUILD_INTERFACE:-Wall;-Wextra;-Wshadow;-Wformat=2;-Wunused;-pedantic>>"
--        "$<${msvc}:$<BUILD_INTERFACE:-W3;-WX;-Zi;-permissive->>"
--)
- if (CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
--    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
--    set(CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
- endif (CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
- 
- # configure a header file to pass the version number only
+@@ -24,12 +24,6 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15")
+     # the BUILD_INTERFACE genex
+     set(gcc_like "$<COMPILE_LANG_AND_ID:C,CXX,ARMClang,AppleClang,Clang,GNU,LCC>")
+     set(msvc "$<COMPILE_LANG_AND_ID:C,CXX,MSVC>")
+-    target_compile_options(
+-            "${PROJECT_NAME}_compiler_flags"
+-            INTERFACE
+-            "$<${gcc_like}:$<BUILD_INTERFACE:-Wshadow;-Wformat=2;-Wall;-pedantic>>"
+-            "$<${msvc}:$<BUILD_INTERFACE:-W3;-WX;-Zi;-permissive->>"
+-    )
+ endif (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15")
+ # Set the build directories
+ if (CMAKE_SYSTEM_NAME STREQUAL "Windows"
diff --git a/external_imported/vcpkg/ports/c89stringutils/portfile.cmake b/external_imported/vcpkg/ports/c89stringutils/portfile.cmake
index 06740ebcb..d97fa0f48 100644
--- a/external_imported/vcpkg/ports/c89stringutils/portfile.cmake
+++ b/external_imported/vcpkg/ports/c89stringutils/portfile.cmake
@@ -1,9 +1,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO            offscale/c89stringutils
-    REF             375c87aaf50a945b17a76727f3314eb217897caf
-    SHA512          395d942a133209daf510094814830e35daf2047c35b0ff15b17051d7095e4598fd830e0e7f763cac6929b867ff3b0c03c5350c4c3cfc68ed98b69c9c68c04be0
-    HEAD_REF        master
+    REPO offscale/c89stringutils
+    REF "${VERSION}"
+    SHA512 82edb341d5566c42eaffcd5c87d4fbd82a4e47b9c31a8533b08d28b9e1311ced281b59b3b6103e274355a82117095fcff1cb5f9c29eecc9563dc3cd962a37773
+    HEAD_REF master
     PATCHES
         no_flags.patch
 )
@@ -11,10 +11,13 @@ vcpkg_from_github(
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-        "-DBUILD_TESTS=OFF"
+        -DBUILD_TESTING=OFF
 )
 vcpkg_cmake_install()
-file(INSTALL "${SOURCE_PATH}/cmake/LICENSE.txt"
-     DESTINATION "${CURRENT_PACKAGES_DIR}/share/c89stringutils"
-     RENAME copyright)
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+vcpkg_cmake_config_fixup()
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE-APACHE" "${SOURCE_PATH}/LICENSE-MIT")
diff --git a/external_imported/vcpkg/ports/c89stringutils/usage b/external_imported/vcpkg/ports/c89stringutils/usage
new file mode 100644
index 000000000..ed8b42920
--- /dev/null
+++ b/external_imported/vcpkg/ports/c89stringutils/usage
@@ -0,0 +1,4 @@
+c89stringutils provides CMake targets:
+
+    find_package(c89stringutils CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE c89stringutils)
diff --git a/external_imported/vcpkg/ports/c89stringutils/vcpkg.json b/external_imported/vcpkg/ports/c89stringutils/vcpkg.json
index 4c2d06670..ebed5c7bf 100644
--- a/external_imported/vcpkg/ports/c89stringutils/vcpkg.json
+++ b/external_imported/vcpkg/ports/c89stringutils/vcpkg.json
@@ -1,10 +1,9 @@
 {
   "name": "c89stringutils",
-  "version": "0.0.1",
-  "port-version": 1,
+  "version": "0.0.2",
   "description": "string functions from newer standards / common non-standards for C89",
+  "homepage": "https://github.com/offscale/c89stringutils",
   "license": "Apache-2.0 OR MIT",
-  "supports": "!uwp",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/c9y/portfile.cmake b/external_imported/vcpkg/ports/c9y/portfile.cmake
index 9aa01e400..82328323f 100644
--- a/external_imported/vcpkg/ports/c9y/portfile.cmake
+++ b/external_imported/vcpkg/ports/c9y/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO rioki/c9y
-    REF v0.7.0
-    SHA512 1c68351a42cea3a5cc52e00d3828acb16d6a96dfc4b9bf53fa4f8090b691a6f5734e2bb219af5cc54bc997517434417a4567d133c5a589f247abe9de73ba1cac
+    REF v0.8.0
+    SHA512 f3161bde45fd534029ef4609b1b49d4edbeb636c9305e01e7e9cfa6a62cde0978632d46597510bea0ff96cae09b819905c0d8c5d2fd85cf641d7b47ea2a732b1
     )
 
 vcpkg_cmake_configure(
diff --git a/external_imported/vcpkg/ports/c9y/vcpkg.json b/external_imported/vcpkg/ports/c9y/vcpkg.json
index 0f0424be5..0c7235287 100644
--- a/external_imported/vcpkg/ports/c9y/vcpkg.json
+++ b/external_imported/vcpkg/ports/c9y/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "c9y",
-  "version-semver": "0.7.0",
+  "version-semver": "0.8.0",
   "description": "Concurency",
   "homepage": "https://github.com/rioki/c9y",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/cachelib/fmt-10.patch b/external_imported/vcpkg/ports/cachelib/fmt-10.patch
new file mode 100644
index 000000000..083c00568
--- /dev/null
+++ b/external_imported/vcpkg/ports/cachelib/fmt-10.patch
@@ -0,0 +1,44 @@
+diff --git a/cachelib/cachebench/cache/ItemRecords.h b/cachelib/cachebench/cache/ItemRecords.h
+index 80fe7489..e581d78e 100644
+--- a/cachelib/cachebench/cache/ItemRecords.h
++++ b/cachelib/cachebench/cache/ItemRecords.h
+@@ -102,11 +102,11 @@ class ItemRecords {
+     }
+     if (record.destructCount != 0) {
+       XLOGF(ERR, "unexpected destructCount {} for item {}, context {}|{}",
+-            record.destructCount, item.getKey(), data.context, record.context);
++            record.destructCount, item.getKey().data(), data.context, record.context);
+     }
+     if (record.version != ptr->getVersion()) {
+       XLOGF(ERR, "unexpected version {}|{} for item {}", record.version,
+-            ptr->getVersion(), item.getKey());
++            ptr->getVersion(), item.getKey().data());
+     }
+     ++record.destructCount;
+ 
+diff --git a/cachelib/cachebench/runner/FastShutdown.cpp b/cachelib/cachebench/runner/FastShutdown.cpp
+index 82c878eb..5ceb342d 100644
+--- a/cachelib/cachebench/runner/FastShutdown.cpp
++++ b/cachelib/cachebench/runner/FastShutdown.cpp
+@@ -27,7 +27,7 @@ namespace cachebench {
+ FastShutdownStressor::FastShutdownStressor(const CacheConfig& cacheConfig,
+                                            uint64_t numOps)
+     : numOps_(numOps),
+-      cacheDir_{folly::sformat("/tmp/cache_bench_fss_{}", getpid())},
++      cacheDir_{folly::sformat("/tmp/cache_bench_fss_{}", std::to_string(getpid()))},
+       cache_(std::make_unique<Cache<LruAllocator>>(
+           cacheConfig, nullptr, cacheDir_)) {}
+ 
+diff --git a/cachelib/navy/admission_policy/DynamicRandomAP.cpp b/cachelib/navy/admission_policy/DynamicRandomAP.cpp
+index 3a8a1aa0..2ab0fa45 100644
+--- a/cachelib/navy/admission_policy/DynamicRandomAP.cpp
++++ b/cachelib/navy/admission_policy/DynamicRandomAP.cpp
+@@ -189,7 +189,7 @@ void DynamicRandomAP::updateThrottleParamsLocked(std::chrono::seconds curTime) {
+     XLOGF(INFO,
+           "max write rate {} will be used because target current write rate {} "
+           "exceeds it.",
+-          maxRate_, curTargetRate);
++          maxRate_.load(std::memory_order_relaxed), curTargetRate);
+     curTargetRate = maxRate_;
+   }
+   writeStats_.curTargetRate = curTargetRate;
diff --git a/external_imported/vcpkg/ports/cachelib/portfile.cmake b/external_imported/vcpkg/ports/cachelib/portfile.cmake
index 01244df65..774cd469d 100644
--- a/external_imported/vcpkg/ports/cachelib/portfile.cmake
+++ b/external_imported/vcpkg/ports/cachelib/portfile.cmake
@@ -2,10 +2,11 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/CacheLib
     REF "v${VERSION}"
-    SHA512 53f2eb4de0d1c5d4184d7e1d8ceb958625d9426eebaf434227179c9b2a6ed3a3bf063758f86c2e517ca910556230a764bfd54890dc718c2f45aec1d5a806788c
+    SHA512 fac41a2cb477f252034b932b1499b32b100d164eec4638d387af0487eeb1f84d430cd5908652914e615b188264d2806d6374343938165ebd47dd2494d1e7450d
     HEAD_REF master
     PATCHES
         fix-build.patch
+        fmt-10.patch
 )
 
 FIND_PATH(NUMA_INCLUDE_DIR NAME numa.h
diff --git a/external_imported/vcpkg/ports/cachelib/vcpkg.json b/external_imported/vcpkg/ports/cachelib/vcpkg.json
index d941626af..95535128a 100644
--- a/external_imported/vcpkg/ports/cachelib/vcpkg.json
+++ b/external_imported/vcpkg/ports/cachelib/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "cachelib",
-  "version-string": "2023.02.27.00",
+  "version-string": "2023.05.08.00",
   "description": "facebook cachelib",
   "homepage": "https://github.com/facebook/CacheLib",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/caf/fix_cxx17.patch b/external_imported/vcpkg/ports/caf/fix_cxx17.patch
index 18094c07b..ba7d2e3ab 100644
--- a/external_imported/vcpkg/ports/caf/fix_cxx17.patch
+++ b/external_imported/vcpkg/ports/caf/fix_cxx17.patch
@@ -1,8 +1,47 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ed753b9..5dc80c2 100644
 --- a/CMakeLists.txt
-+++ a/CMakeLists.txt
-@@ -115,3 +115,4 @@
-+target_compile_features(caf_internal INTERFACE cxx_std_17)
- # TODO: simply set CXX_STANDARD when switching to CMake ≥ 3.9.6
--if(NOT CMAKE_CROSSCOMPILING)
-+if(0)
-   try_compile(caf_has_cxx_17
++++ b/CMakeLists.txt
+@@ -131,7 +131,7 @@ endif()
+ 
+ if(NOT DEFINED CAF_USE_STD_FORMAT)
+   set(CAF_USE_STD_FORMAT OFF CACHE BOOL "Enable std::format support" FORCE)
+-  if(NOT CMAKE_CROSSCOMPILING)
++  if(0)
+     set(snippet "#include <format>
+                  #include <iostream>
+                  int main() { std::cout << std::format(\"{}\", \"ok\"); }")
+@@ -177,7 +177,6 @@ endif()
+ 
+ # -- create the libcaf_test target ahead of time for caf_core ------------------
+ 
+-add_library(libcaf_test)
+ 
+ # -- add uninstall target if it does not exist yet -----------------------------
+ 
+@@ -289,8 +288,6 @@ function(caf_add_component name)
+       string(REPLACE "/" "-" test_name "${test_path}/${test_name}-test")
+       add_executable("${test_name}" ${source_file}
+                      $<TARGET_OBJECTS:${obj_lib_target}>)
+-      target_link_libraries(${test_name} PRIVATE libcaf_test
+-                            ${CAF_ADD_COMPONENT_DEPENDENCIES})
+       target_include_directories(${test_name} PRIVATE
+                                  "${CMAKE_CURRENT_SOURCE_DIR}"
+                                  "${CMAKE_CURRENT_BINARY_DIR}")
+@@ -314,8 +311,6 @@ function(caf_add_component name)
+     add_executable(${tst_bin_target}
+                    ${CAF_ADD_COMPONENT_LEGACY_TEST_SOURCES}
+                    $<TARGET_OBJECTS:${obj_lib_target}>)
+-    target_link_libraries(${tst_bin_target} PRIVATE libcaf_test
+-                          ${CAF_ADD_COMPONENT_DEPENDENCIES})
+     target_include_directories(${tst_bin_target} PRIVATE
+                                "${CMAKE_CURRENT_SOURCE_DIR}/tests/legacy")
+     if(CAF_ADD_COMPONENT_LEGACY_TEST_SUITES)
+@@ -373,7 +368,6 @@ endfunction()
+ 
+ add_subdirectory(libcaf_core)
+ 
+-add_subdirectory(libcaf_test)
+ 
+ if(CAF_ENABLE_NET_MODULE)
+   add_subdirectory(libcaf_net)
diff --git a/external_imported/vcpkg/ports/caf/portfile.cmake b/external_imported/vcpkg/ports/caf/portfile.cmake
index c186a2272..4732ed668 100644
--- a/external_imported/vcpkg/ports/caf/portfile.cmake
+++ b/external_imported/vcpkg/ports/caf/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO actor-framework/actor-framework
-    REF bfa0f83dd5c9151c263c304300c79161ae8cb595 # 0.18.6
-    SHA512 58ebd40623edc0245dd38b3a2bbbda7af7d9b030155746949dfe7c4c30bdc07ee2ee84d195dc2e914d69f58c6c46bc9ad496bbc34e7cafe0530200458a4c5a76
+    REF "${VERSION}"
+    SHA512 97766b5b0a4db96b03be77c1ffd2198cc5536c09e2a06bb6fcff023ee78692f2c23ad213dc9698d6abfe950c61c4a2565bbfdfe871652cef816829e83d16ceab
     HEAD_REF master
     PATCHES
         fix_dependency.patch
diff --git a/external_imported/vcpkg/ports/caf/vcpkg.json b/external_imported/vcpkg/ports/caf/vcpkg.json
index 5d89216c3..ee9c04d1e 100644
--- a/external_imported/vcpkg/ports/caf/vcpkg.json
+++ b/external_imported/vcpkg/ports/caf/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "caf",
-  "version": "0.18.6",
-  "port-version": 1,
+  "version": "0.19.3",
   "description": "an open source implementation of the actor model for C++ featuring lightweight & fast actor implementations, pattern matching for messages, network transparent messaging, and more.",
   "homepage": "https://github.com/actor-framework/actor-framework",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/cairo/portfile.cmake b/external_imported/vcpkg/ports/cairo/portfile.cmake
index a78d97f95..36b876318 100644
--- a/external_imported/vcpkg/ports/cairo/portfile.cmake
+++ b/external_imported/vcpkg/ports/cairo/portfile.cmake
@@ -1,4 +1,3 @@
-
 if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
     set(PATCHES fix_clang-cl_build.patch)
 endif()
@@ -7,7 +6,7 @@ vcpkg_from_gitlab(
     OUT_SOURCE_PATH SOURCE_PATH
     GITLAB_URL https://gitlab.freedesktop.org
     REPO cairo/cairo
-    REF ${VERSION}
+    REF "${VERSION}"
     SHA512 e12f4b05326c1ac7d930e18d95398dc9c65f3af9745d7fd301ef1663dd378feeb43acc47de17fd082d0acf96e9fc60310557c24e3fe8af06d17931590c7759c6
     PATCHES
         cairo_static_fix.patch
@@ -50,7 +49,8 @@ endif()
 
 vcpkg_configure_meson(
     SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS ${OPTIONS}
+    OPTIONS
+        ${OPTIONS}
         -Dtests=disabled
         -Dzlib=enabled
         -Dpng=enabled
@@ -85,5 +85,6 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
 
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 # Handle copyright
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING" "${SOURCE_PATH}/COPYING-LGPL-2.1" "${SOURCE_PATH}/COPYING-MPL-1.1")
diff --git a/external_imported/vcpkg/ports/cairo/usage b/external_imported/vcpkg/ports/cairo/usage
new file mode 100644
index 000000000..0ebb90033
--- /dev/null
+++ b/external_imported/vcpkg/ports/cairo/usage
@@ -0,0 +1,11 @@
+The package cairo can be imported via CMake FindPkgConfig module:
+
+    # cairo
+    find_package(PkgConfig REQUIRED)
+    pkg_check_modules(cairo REQUIRED IMPORTED_TARGET cairo)
+    target_link_libraries(main PkgConfig::cairo)
+    
+    # cairo-script-interpreter
+    find_package(PkgConfig REQUIRED)
+    pkg_check_modules(cairo-script-interpreter REQUIRED IMPORTED_TARGET cairo-script-interpreter)
+    target_link_libraries(main PkgConfig::cairo-script-interpreter)
diff --git a/external_imported/vcpkg/ports/cairo/vcpkg.json b/external_imported/vcpkg/ports/cairo/vcpkg.json
index 53ce7bc05..18f96e10a 100644
--- a/external_imported/vcpkg/ports/cairo/vcpkg.json
+++ b/external_imported/vcpkg/ports/cairo/vcpkg.json
@@ -1,9 +1,11 @@
 {
   "name": "cairo",
   "version": "1.17.8",
+  "port-version": 4,
   "description": "Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.",
   "homepage": "https://cairographics.org",
-  "license": "MPL-1.1",
+  "license": "LGPL-2.1-only OR MPL-1.1",
+  "supports": "!xbox & !uwp",
   "dependencies": [
     "dirent",
     "expat",
diff --git a/external_imported/vcpkg/ports/cairomm/fix_include_path.patch b/external_imported/vcpkg/ports/cairomm/fix_include_path.patch
index 7e471f82f..770df9e9f 100644
--- a/external_imported/vcpkg/ports/cairomm/fix_include_path.patch
+++ b/external_imported/vcpkg/ports/cairomm/fix_include_path.patch
@@ -1,17 +1,17 @@
 diff --git a/meson.build b/meson.build
-index 4522a94..c387148 100644
+index b8c2191..8f280b4 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -271,7 +271,7 @@ mm_conf_data.set('CAIROMM_MINOR_VERSION', cairomm_minor_version)
- mm_conf_data.set('CAIROMM_MICRO_VERSION', cairomm_micro_version)
+@@ -288,7 +288,7 @@ mm_conf_data.set('CAIROMM_MICRO_VERSION', cairomm_micro_version)
  mm_conf_data.set('VERSION', meson.project_version()) # for MSVC_NMake/cairomm/cairomm.rc
  
+ cairommconfig_h_meson = files('cairommconfig.h.meson')
 -install_includeconfigdir = install_libdir / cairomm_pcname / 'include'
 +install_includeconfigdir = install_includedir
- cairommconfig_h = configure_file(
-   input: 'cairommconfig.h.meson',
+ configure_file(
+   input: cairommconfig_h_meson,
    output: 'cairommconfig.h',
-@@ -361,7 +361,7 @@ summary = [
+@@ -380,7 +380,7 @@ summary = [
    'Directories:',
    '                  prefix: @0@'.format(install_prefix),
    '              includedir: @0@'.format(install_prefix / install_includedir),
diff --git a/external_imported/vcpkg/ports/cairomm/portfile.cmake b/external_imported/vcpkg/ports/cairomm/portfile.cmake
index d5ef9a900..9c4123deb 100644
--- a/external_imported/vcpkg/ports/cairomm/portfile.cmake
+++ b/external_imported/vcpkg/ports/cairomm/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
 vcpkg_download_distfile(ARCHIVE
     URLS "https://www.cairographics.org/releases/cairomm-${VERSION}.tar.xz"
     FILENAME "cairomm-${VERSION}.tar.xz"
-    SHA512 61dc639eabe8502e1262c53c92fe57c5647e5ab9931f86ed51e657df1b7d0e3e58c2571910a05236cc0dca8d52f1f693aed99a553430f14d0fb87be1832a6b62
+    SHA512 5484ccefc255b2e8886722c483cde011043c98b8e7ae17ce642f1b67effa236a8499c332771104fa7e547a9066c168fcfbbff6249caa73df3860823b355567d9
 )
 
 vcpkg_extract_source_archive(
@@ -17,6 +17,7 @@ vcpkg_configure_meson(
     OPTIONS
         -Dbuild-examples=false
         -Dmsvc14x-parallel-installable=false    # Use separate DLL and LIB filenames for Visual Studio 2017 and 2019
+        -Dbuild-tests=false
 )
 
 vcpkg_install_meson()
@@ -25,8 +26,9 @@ vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/cairommconfig.h" "# define CAIROMM_DLL 1" "# undef CAIROMM_DLL\n# define CAIROMM_STATIC_LIB 1")
 endif()
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/cairomm/usage b/external_imported/vcpkg/ports/cairomm/usage
new file mode 100644
index 000000000..7b0d0a685
--- /dev/null
+++ b/external_imported/vcpkg/ports/cairomm/usage
@@ -0,0 +1,5 @@
+cairomm provides usage:
+
+    find_package(PkgConfig REQUIRED)
+    pkg_check_modules(CAIROMM REQUIRED IMPORTED_TARGET cairomm-1.16)
+    target_link_libraries(main PRIVATE PkgConfig::CAIROMM)
diff --git a/external_imported/vcpkg/ports/cairomm/vcpkg.json b/external_imported/vcpkg/ports/cairomm/vcpkg.json
index 16cd7bfb5..c12a5b0f7 100644
--- a/external_imported/vcpkg/ports/cairomm/vcpkg.json
+++ b/external_imported/vcpkg/ports/cairomm/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "cairomm",
-  "version": "1.16.2",
-  "port-version": 2,
+  "version": "1.17.1",
+  "port-version": 1,
   "description": "A C++ wrapper for the cairo graphics library",
   "homepage": "https://www.cairographics.org",
   "license": "LGPL-2.0-only",
+  "supports": "!xbox",
   "dependencies": [
     "cairo",
     "libsigcpp",
diff --git a/external_imported/vcpkg/ports/calceph/portfile.cmake b/external_imported/vcpkg/ports/calceph/portfile.cmake
index ecd7636e4..340d82458 100755
--- a/external_imported/vcpkg/ports/calceph/portfile.cmake
+++ b/external_imported/vcpkg/ports/calceph/portfile.cmake
@@ -1,14 +1,13 @@
-set(CALCEPH_VERSION "3.5.1")
-set(CALCEPH_HASH 5e83bb46b92a0b53f2cae717363cb4497d5c9cb57b3903e70d9e2c50176ca7d234212d0209fd3fcb5feebfd0980313be17e2ad4e69482504bfe8686f93216b67)
+set(CALCEPH_HASH bbb60179b36f3ea9f05daa43e7950494d058137cf5a92e6c7b9742048dc0767490b7b42d2d2db7329f5ca96ffc4f2f32443abacb1073e29af78e58935b8b3edc)
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://www.imcce.fr/content/medias/recherche/equipes/asd/calceph/calceph-${CALCEPH_VERSION}.tar.gz"
-    FILENAME "calceph-${CALCEPH_VERSION}.tar.gz"
+    URLS "https://www.imcce.fr/content/medias/recherche/equipes/asd/calceph/calceph-${VERSION}.tar.gz"
+    FILENAME "calceph-${VERSION}.tar.gz"
     SHA512 ${CALCEPH_HASH}
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE ${ARCHIVE}
 )
 
diff --git a/external_imported/vcpkg/ports/calceph/vcpkg.json b/external_imported/vcpkg/ports/calceph/vcpkg.json
index 1c5b7b196..f944ffc28 100755
--- a/external_imported/vcpkg/ports/calceph/vcpkg.json
+++ b/external_imported/vcpkg/ports/calceph/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "calceph",
-  "version": "3.5.1",
+  "version": "3.5.5",
   "description": "C library to access the binary planetary ephemeris files.",
   "homepage": "https://www.imcce.fr/inpop/calceph/",
   "documentation": "https://www.imcce.fr/content/medias/recherche/equipes/asd/calceph/html/c/index.html",
diff --git a/external_imported/vcpkg/ports/canvas-ity/portfile.cmake b/external_imported/vcpkg/ports/canvas-ity/portfile.cmake
new file mode 100644
index 000000000..a76c0df3c
--- /dev/null
+++ b/external_imported/vcpkg/ports/canvas-ity/portfile.cmake
@@ -0,0 +1,13 @@
+#header-only library
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO a-e-k/canvas_ity
+    REF fc5c115d8ca8be0cf81c2247270cc955f78b6138
+    SHA512 19560fa09e8a8eeb09c05b26cf562dc506e6c88e1e66767a2214d2310188cb52ffe03294bd6448531703bd972e2a1995446a3cc20684c9d617ebe65ac93dd37a
+    HEAD_REF master
+)
+
+file(INSTALL "${SOURCE_PATH}/src/canvas_ity.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/external_imported/vcpkg/ports/canvas-ity/vcpkg.json b/external_imported/vcpkg/ports/canvas-ity/vcpkg.json
new file mode 100644
index 000000000..75afea2ef
--- /dev/null
+++ b/external_imported/vcpkg/ports/canvas-ity/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "canvas-ity",
+  "version": "1.0",
+  "description": "A tiny, single-header <canvas>-like 2D rasterizer for C++",
+  "homepage": "https://github.com/a-e-k/canvas_ity",
+  "license": "ISC"
+}
diff --git a/external_imported/vcpkg/ports/capnproto/disable-C-20-co-routines.patch b/external_imported/vcpkg/ports/capnproto/disable-C-20-co-routines.patch
new file mode 100644
index 000000000..ab292af07
--- /dev/null
+++ b/external_imported/vcpkg/ports/capnproto/disable-C-20-co-routines.patch
@@ -0,0 +1,25 @@
+From da5b439b558e354a8fc59d09dff6a9eb657f54fd Mon Sep 17 00:00:00 2001
+From: Stig Hornang <shornang@gmail.com>
+Date: Mon, 28 Aug 2023 22:28:43 +0200
+Subject: [PATCH] Disable C++20 co-routines
+
+---
+ c++/src/kj/async-prelude.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/c++/src/kj/async-prelude.h b/c++/src/kj/async-prelude.h
+index 6289bf3f..c9845cdc 100644
+--- a/c++/src/kj/async-prelude.h
++++ b/c++/src/kj/async-prelude.h
+@@ -36,7 +36,7 @@
+ #if (__cpp_impl_coroutine >= 201902L) && __has_include(<coroutine>)
+ // C++20 Coroutines detected.
+ #include <coroutine>
+-#define KJ_HAS_COROUTINE 1
++// #define KJ_HAS_COROUTINE 1
+ #define KJ_COROUTINE_STD_NAMESPACE std
+ #elif (__cpp_coroutines >= 201703L) && __has_include(<experimental/coroutine>)
+ // Coroutines TS detected.
+-- 
+2.41.0.windows.3
+
diff --git a/external_imported/vcpkg/ports/capnproto/portfile.cmake b/external_imported/vcpkg/ports/capnproto/portfile.cmake
index bb0f9a47d..64ffee8d8 100644
--- a/external_imported/vcpkg/ports/capnproto/portfile.cmake
+++ b/external_imported/vcpkg/ports/capnproto/portfile.cmake
@@ -3,9 +3,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO capnproto/capnproto
-    REF v0.10.3
-    SHA512 d8f699220f0738a456238f0e3e638940a340c005f378d6845c805d0e4935d19dc21ba1701710963edb59d8982fefe00aae5e834f912cb734e68cdee10154be01
+    REF "v${VERSION}"
+    SHA512 56551ecad52cf06e5dd52401e6d848eae41126c6ba2bb31a9ec1c82e1b47e0e6171d69db923c118c614aec0d396ddf35724081cccef3a605c39d0b5379a2c03e
     HEAD_REF master
+    PATCHES
+        disable-C-20-co-routines.patch
+        undef-KJ_USE_EPOLL-for-ANDROID_PLATFORM-23.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
diff --git a/external_imported/vcpkg/ports/capnproto/undef-KJ_USE_EPOLL-for-ANDROID_PLATFORM-23.patch b/external_imported/vcpkg/ports/capnproto/undef-KJ_USE_EPOLL-for-ANDROID_PLATFORM-23.patch
new file mode 100644
index 000000000..6fdc15a17
--- /dev/null
+++ b/external_imported/vcpkg/ports/capnproto/undef-KJ_USE_EPOLL-for-ANDROID_PLATFORM-23.patch
@@ -0,0 +1,28 @@
+From 306220e57881064da99f89ad4192b3e19c7953a9 Mon Sep 17 00:00:00 2001
+From: Stig Hornang <shornang@gmail.com>
+Date: Thu, 31 Aug 2023 21:20:09 +0200
+Subject: [PATCH] Undef KJ_USE_EPOLL for ANDROID_PLATFORM < 23
+
+---
+ c++/src/kj/async-unix.h | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/c++/src/kj/async-unix.h b/c++/src/kj/async-unix.h
+index 665305ea..c5f195cf 100644
+--- a/c++/src/kj/async-unix.h
++++ b/c++/src/kj/async-unix.h
+@@ -34,7 +34,10 @@
+ KJ_BEGIN_HEADER
+ 
+ #if !defined(KJ_USE_EPOLL) && !defined(KJ_USE_KQUEUE)
+-#if __linux__
++
++// Android NDK less than API version 23 doesn't have sigtimedwait
++// sigtimedwait is used in async-unix.c++ if KJ_USE_EPOLL is defined
++#if __linux__ && !(__ANDROID__ && __ANDROID_API__ < 23)
+ // Default to epoll on Linux.
+ #define KJ_USE_EPOLL 1
+ #elif __APPLE__ || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __DragonFly__
+-- 
+2.41.0.windows.3
+
diff --git a/external_imported/vcpkg/ports/capnproto/vcpkg.json b/external_imported/vcpkg/ports/capnproto/vcpkg.json
index 9bf0b418b..79f4d0575 100644
--- a/external_imported/vcpkg/ports/capnproto/vcpkg.json
+++ b/external_imported/vcpkg/ports/capnproto/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "capnproto",
-  "version": "0.10.3",
+  "version": "1.0.2",
   "description": "Data interchange format and capability-based RPC system",
   "homepage": "https://capnproto.org/",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/capstone/portfile.cmake b/external_imported/vcpkg/ports/capstone/portfile.cmake
index 86681b824..f5da71674 100644
--- a/external_imported/vcpkg/ports/capstone/portfile.cmake
+++ b/external_imported/vcpkg/ports/capstone/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO "capstone-engine/capstone"
-    REF 000561b4f74dc15bda9af9544fe714efda7a6e13 # 5.0.0-rc2
-    SHA512 66b09a7d2fda297836bbedaeece71dcfe39bdbd633d9b6ecb68ee2e5aa094b697226136ab172cdc4550e8b2ef1448d001c8ee4e0d456c6d277afe0b3d1aab5a1
+    REF "${VERSION}"
+    SHA512 350aba77ce2d96b5c25764913591ba80e4497177ae0a8b2c820c6755ee8310848fbfc54e7ccac27fafc2dbc6778118ad92c53d1b5cb601d4fa146dec7d7e11e5
     HEAD_REF next
     PATCHES
         001-silence-windows-crt-secure-warnings.patch
@@ -18,24 +18,24 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
         "m680x"       CAPSTONE_M680X_SUPPORT
         "m68k"        CAPSTONE_M68K_SUPPORT
         "mips"        CAPSTONE_MIPS_SUPPORT
-        "osxkernel"   CAPSTONE_OSXKERNEL_SUPPORT
         "ppc"         CAPSTONE_PPC_SUPPORT
         "sparc"       CAPSTONE_SPARC_SUPPORT
         "sysz"        CAPSTONE_SYSZ_SUPPORT
         "tms320c64x"  CAPSTONE_TMS320C64X_SUPPORT
         "x86"         CAPSTONE_X86_SUPPORT
-        "x86-reduce"  CAPSTONE_X86_REDUCE
         "xcore"       CAPSTONE_XCORE_SUPPORT
+        "mos65xx"     CAPSTONE_MOS65XX_SUPPORT
+        "tricore"     CAPSTONE_TRICORE_SUPPORT
+        "wasm"        CAPSTONE_WASM_SUPPORT
+        "bpf"         CAPSTONE_BPF_SUPPORT
+        "riscv"       CAPSTONE_RISCV_SUPPORT
         "diet"        CAPSTONE_BUILD_DIET
 )
 
-if ("osxkernel" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_OSX)
-    message(FATAL_ERROR "Feature 'osxkernel' only supported in OSX")
-endif()
-
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
+        -DCAPSTONE_ARCHITECTURE_DEFAULT=OFF
         -DCAPSTONE_BUILD_TESTS=OFF
         -DCAPSTONE_BUILD_CSTOOL=OFF
         -DCAPSTONE_BUILD_STATIC_RUNTIME=${STATIC_CRT}
diff --git a/external_imported/vcpkg/ports/capstone/vcpkg.json b/external_imported/vcpkg/ports/capstone/vcpkg.json
index 06ffbd968..094e22b55 100644
--- a/external_imported/vcpkg/ports/capstone/vcpkg.json
+++ b/external_imported/vcpkg/ports/capstone/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "capstone",
-  "version": "5.0.0-rc2",
+  "version": "5.0.1",
   "port-version": 1,
   "description": "Multi-architecture disassembly framework",
   "homepage": "https://github.com/capstone-engine/capstone",
@@ -21,6 +21,9 @@
     "arm64": {
       "description": "Capstone disassembly support for ARM64"
     },
+    "bpf": {
+      "description": "Capstone disassembly support for BPF"
+    },
     "diet": {
       "description": "Build Capstone in diet mode (reduced features for smaller size)"
     },
@@ -36,12 +39,15 @@
     "mips": {
       "description": "Capstone disassembly support for MIPS"
     },
-    "osxkernel": {
-      "description": "Support for embedding Capstone into OSX Kernel extensions"
+    "mos65xx": {
+      "description": "Capstone disassembly support for MOS65XX"
     },
     "ppc": {
       "description": "Capstone disassembly support for PowerPC"
     },
+    "riscv": {
+      "description": "Capstone disassembly support for RISC-V"
+    },
     "sparc": {
       "description": "Capstone disassembly support for SPARC"
     },
@@ -51,20 +57,15 @@
     "tms320c64x": {
       "description": "Capstone disassembly support for TMS320C64X"
     },
+    "tricore": {
+      "description": "Capstone disassembly support for TriCore"
+    },
+    "wasm": {
+      "description": "Capstone disassembly support for WebAssembly"
+    },
     "x86": {
       "description": "Capstone disassembly support for x86"
     },
-    "x86-reduce": {
-      "description": "Capstone disassembly support for x86 without support for less used instructions",
-      "dependencies": [
-        {
-          "name": "capstone",
-          "features": [
-            "x86"
-          ]
-        }
-      ]
-    },
     "xcore": {
       "description": "Capstone disassembly support for XCore"
     }
diff --git a/external_imported/vcpkg/ports/cargs/portfile.cmake b/external_imported/vcpkg/ports/cargs/portfile.cmake
index 6f42c0871..ac9b76fa9 100644
--- a/external_imported/vcpkg/ports/cargs/portfile.cmake
+++ b/external_imported/vcpkg/ports/cargs/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO likle/cargs
-    REF v1.0.3
-    SHA512 4f82f6857af6ae7bd1263f4c812a770fa3c3f94c84d5a0ba6256289a3d3084cd35b3aca6769241451d2acd57577ccc6638327b5bb70328800e9c3c4f5054f7de
+    REF "v${VERSION}"
+    SHA512 936fa94da31b07de27c0278688199705f9fdc55cf248c7a88405c373e5c77eed2a703d9398d3ea80a3a534db3d542898babb49db268d26c5945c4907540ccc1b
     HEAD_REF master
 )
 
@@ -16,6 +16,7 @@ vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cargs)
+vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/external_imported/vcpkg/ports/cargs/vcpkg.json b/external_imported/vcpkg/ports/cargs/vcpkg.json
index 6a2d24f67..303609360 100644
--- a/external_imported/vcpkg/ports/cargs/vcpkg.json
+++ b/external_imported/vcpkg/ports/cargs/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "cargs",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "description": "A lightweight cross-platform getopt alternative that works on Linux, Windows and macOS. Command line argument parser library for C/C++. Can be used to parse argv and argc parameters.",
   "homepage": "https://likle.github.io/cargs/",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/catch-classic/vcpkg.json b/external_imported/vcpkg/ports/catch-classic/vcpkg.json
index bfe9b7ef4..75d76b103 100644
--- a/external_imported/vcpkg/ports/catch-classic/vcpkg.json
+++ b/external_imported/vcpkg/ports/catch-classic/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "catch-classic",
-  "version-string": "1.12.2",
-  "port-version": 1,
+  "version": "1.12.2",
+  "port-version": 2,
   "description": [
     "A modern, header-only test framework for unit tests",
     "This is specifically the legacy 1.x branch provided for compatibility",
diff --git a/external_imported/vcpkg/ports/catch2/portfile.cmake b/external_imported/vcpkg/ports/catch2/portfile.cmake
index 30915bf2d..0c8fd1444 100644
--- a/external_imported/vcpkg/ports/catch2/portfile.cmake
+++ b/external_imported/vcpkg/ports/catch2/portfile.cmake
@@ -1,13 +1,12 @@
 if(VCPKG_TARGET_IS_WINDOWS)
     vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 endif()
-vcpkg_minimum_required(VERSION 2022-11-10)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO catchorg/Catch2
     REF v${VERSION}
-    SHA512 3d0c5666509a19be54ea0c48a3c8e1c4a951a2d991a7c9f7fe6d326661464538f1ab9dc573b1b2647f49fb6bef45bbd866142a4ce0fba38545ad182b8d55f61f
+    SHA512 1b9d5f35144f6c7acef0e76558a4adf3ff41c2c2292fbdcb3e2c2917fa2deb7fba593738105dd3c111f02ee8aca64010cf68f69bb8fb1815dbf771b509ab0576
     HEAD_REF devel
     PATCHES
         fix-install-path.patch
@@ -24,6 +23,10 @@ vcpkg_cmake_install()
 
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Catch2)
 vcpkg_fixup_pkgconfig()
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/catch2-with-main.pc" [["-L${libdir}"]] [["-L${libdir}/manual-link"]])
+if(NOT VCPKG_BUILD_TYPE)
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/catch2-with-main.pc" [["-L${libdir}"]] [["-L${libdir}/manual-link"]])
+endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
diff --git a/external_imported/vcpkg/ports/catch2/vcpkg.json b/external_imported/vcpkg/ports/catch2/vcpkg.json
index baaba3304..5b40af271 100644
--- a/external_imported/vcpkg/ports/catch2/vcpkg.json
+++ b/external_imported/vcpkg/ports/catch2/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "catch2",
-  "version-semver": "3.3.2",
-  "description": "A modern, header-only test framework for unit testing.",
+  "version-semver": "3.5.2",
+  "description": "A modern, C++-native, test framework for unit-tests, TDD and BDD.",
   "homepage": "https://github.com/catchorg/Catch2",
   "license": "BSL-1.0",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/ccfits/portfile.cmake b/external_imported/vcpkg/ports/ccfits/portfile.cmake
index 7c1f7e88a..3a2c71ce5 100644
--- a/external_imported/vcpkg/ports/ccfits/portfile.cmake
+++ b/external_imported/vcpkg/ports/ccfits/portfile.cmake
@@ -4,9 +4,9 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 63ab4d153063960510cf60651d5c832824cf85f937f84adc5390c7c2fb46eb8e9f5d8cda2554d79d24c7a4f1b6cf0b7a6e20958fb69920b65d7c362c0a5f26b5
 )
 
-vcpkg_extract_source_archive_ex(
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
-    OUT_SOURCE_PATH SOURCE_PATH
     PATCHES
         dll_exports.patch
         fix-dependency.patch
@@ -20,9 +20,11 @@ vcpkg_cmake_install()
 
 if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
     file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin")
-    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin")
     file(RENAME "${CURRENT_PACKAGES_DIR}/lib/CCfits.dll" "${CURRENT_PACKAGES_DIR}/bin/CCfits.dll")
-    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/CCfits.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/CCfits.dll")
+    if(NOT VCPKG_BUILD_TYPE)
+        file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin")
+        file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/CCfits.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/CCfits.dll")
+    endif()
 endif()
 
 # Remove duplicate include files
@@ -38,4 +40,4 @@ vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/CCfits/CCfits.h
     "#include \"longnam.h\"" "#include \"cfitsio/longnam.h\""
 )
 
-file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/License.txt")
diff --git a/external_imported/vcpkg/ports/ccfits/vcpkg.json b/external_imported/vcpkg/ports/ccfits/vcpkg.json
index f66a2ef5a..1bc37f2ee 100644
--- a/external_imported/vcpkg/ports/ccfits/vcpkg.json
+++ b/external_imported/vcpkg/ports/ccfits/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ccfits",
   "version": "2.5",
-  "port-version": 9,
+  "port-version": 11,
   "description": "CCfits is an object oriented interface to the cfitsio library. It is designed to make the capabilities of cfitsio available to programmers working in C++.",
   "homepage": "https://heasarc.gsfc.nasa.gov/fitsio/CCfits/",
   "license": "NASA-1.3",
diff --git a/external_imported/vcpkg/ports/cctag/vcpkg.json b/external_imported/vcpkg/ports/cctag/vcpkg.json
index 131029d8c..6d20c0938 100644
--- a/external_imported/vcpkg/ports/cctag/vcpkg.json
+++ b/external_imported/vcpkg/ports/cctag/vcpkg.json
@@ -1,13 +1,13 @@
 {
   "name": "cctag",
   "version-semver": "1.0.2",
-  "port-version": 3,
+  "port-version": 5,
   "maintainers": "alicevision-team@googlegroups.com",
   "description": "Computer vision library for detecting CCTag markers made up of concentric circles",
   "homepage": "https://github.com/alicevision/CCTag",
   "documentation": "https://cctag.readthedocs.io/",
   "license": "MPL-2.0",
-  "supports": "!(uwp | arm | arm64 | android | x86)",
+  "supports": "!(uwp | arm | arm64 | android | x86 | xbox)",
   "dependencies": [
     "boost-accumulators",
     "boost-algorithm",
@@ -15,6 +15,7 @@
     "boost-date-time",
     "boost-exception",
     "boost-filesystem",
+    "boost-foreach",
     "boost-iterator",
     "boost-lexical-cast",
     "boost-math",
diff --git a/external_imported/vcpkg/ports/cctz/CMakeLists.txt b/external_imported/vcpkg/ports/cctz/CMakeLists.txt
deleted file mode 100644
index e21b1ca68..000000000
--- a/external_imported/vcpkg/ports/cctz/CMakeLists.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-cmake_minimum_required(VERSION 3.8)
-project(cctz CXX)
-
-set(CMAKE_CXX_STANDARD 14)
-
-set(CMAKE_DEBUG_POSTFIX d)
-
-if(CMAKE_BUILD_TYPE STREQUAL "Release")
-    option(INSTALL_HEADERS "Install header files" ON)
-else()
-    option(INSTALL_HEADERS "Install header files" OFF)
-endif()
-
-find_package(benchmark CONFIG REQUIRED)
-
-file(GLOB SOURCES src/*.cc)
-list(FILTER SOURCES EXCLUDE REGEX "_test.cc$|benchmarks|_tool.cc$")
-
-file(GLOB HEADERS include/cctz/*.h)
-
-add_library(cctz ${SOURCES})
-target_include_directories(cctz PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<INSTALL_INTERFACE:include>)
-target_link_libraries(cctz PRIVATE benchmark::benchmark benchmark::benchmark_main)
-
-if(INSTALL_HEADERS)
-    install(FILES ${HEADERS} DESTINATION "include/cctz")
-endif()
-
-install(TARGETS cctz EXPORT unofficial-cctz-targets
-    RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib
-)
-
-install(
-    EXPORT unofficial-cctz-targets
-    FILE unofficial-cctz-config.cmake
-    NAMESPACE unofficial::
-    DESTINATION share/unofficial-cctz
-)
diff --git a/external_imported/vcpkg/ports/cctz/fix_vs177.patch b/external_imported/vcpkg/ports/cctz/fix_vs177.patch
new file mode 100644
index 000000000..02f3839d5
--- /dev/null
+++ b/external_imported/vcpkg/ports/cctz/fix_vs177.patch
@@ -0,0 +1,18 @@
+diff --git a/include/cctz/civil_time_detail.h b/include/cctz/civil_time_detail.h
+index decc5f2..26c5aef 100644
+--- a/include/cctz/civil_time_detail.h
++++ b/include/cctz/civil_time_detail.h
+@@ -353,11 +353,11 @@ class civil_time {
+       : civil_time(ct.f_) {}
+ 
+   // Factories for the maximum/minimum representable civil_time.
+-  static CONSTEXPR_F civil_time (max)() {
++  static CONSTEXPR_F auto (max)() -> civil_time {
+     const auto max_year = (std::numeric_limits<std::int_least64_t>::max)();
+     return civil_time(max_year, 12, 31, 23, 59, 59);
+   }
+-  static CONSTEXPR_F civil_time (min)() {
++  static CONSTEXPR_F auto (min)() -> civil_time {
+     const auto min_year = (std::numeric_limits<std::int_least64_t>::min)();
+     return civil_time(min_year, 1, 1, 0, 0, 0);
+   }
diff --git a/external_imported/vcpkg/ports/cctz/portfile.cmake b/external_imported/vcpkg/ports/cctz/portfile.cmake
index 3c229e7c8..e9ba61e34 100644
--- a/external_imported/vcpkg/ports/cctz/portfile.cmake
+++ b/external_imported/vcpkg/ports/cctz/portfile.cmake
@@ -1,7 +1,3 @@
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-    message(FATAL_ERROR "${PORT} does not currently support UWP")
-endif()
-
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
@@ -10,18 +6,21 @@ vcpkg_from_github(
     REF v2.3
     SHA512 e688ddac1bff108e8315bf94cb61483b72b0d16f601e4e1eeb0fd5c064aefe5a573eee66e8903401aa4c2be71ea9f10dd6c9a9cdf8379f5bb6073248a21a83ff
     HEAD_REF master
+    PATCHES
+        fix_vs177.patch #https://github.com/google/cctz/pull/273
 )
 
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
-
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_TOOLS=OFF
+        -DBUILD_EXAMPLES=OFF
+        -DBUILD_TESTING=OFF
 )
 
 vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
 
-vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-cctz)
-
-vcpkg_copy_pdbs()
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/external_imported/vcpkg/ports/cctz/vcpkg.json b/external_imported/vcpkg/ports/cctz/vcpkg.json
index 67e2ffb2c..2c5ebb92b 100644
--- a/external_imported/vcpkg/ports/cctz/vcpkg.json
+++ b/external_imported/vcpkg/ports/cctz/vcpkg.json
@@ -1,11 +1,10 @@
 {
   "name": "cctz",
-  "version-string": "2.3",
-  "port-version": 4,
+  "version": "2.3",
+  "port-version": 7,
   "description": "two libraries that cooperate with <chrono> to give C++ programmers all the necessary tools for computing with dates, times, and time zones in a simple and correct manner.",
   "homepage": "https://github.com/google/cctz",
   "dependencies": [
-    "benchmark",
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/external_imported/vcpkg/ports/cdt/portfile.cmake b/external_imported/vcpkg/ports/cdt/portfile.cmake
new file mode 100644
index 000000000..1ca9165a6
--- /dev/null
+++ b/external_imported/vcpkg/ports/cdt/portfile.cmake
@@ -0,0 +1,32 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO artem-ogre/CDT
+    REF "${VERSION}"
+    SHA512 0ecadd96ecaf6e7799065e89beda706e4018f9ad6a2076604a7b84c57225ac7231f9438932cb63e967ae0dfe72361aee2f286794cfb6303ec894f4948e4e611d
+    HEAD_REF master
+)
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        "64-bit-index-type"     CDT_USE_64_BIT_INDEX_TYPE
+        "as-compiled-library"   CDT_USE_AS_COMPILED_LIBRARY
+)
+
+if (NOT CDT_USE_AS_COMPILED_LIBRARY)
+    set(VCPKG_BUILD_TYPE "release") # header-only
+endif()
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}/CDT"
+    OPTIONS
+        ${FEATURE_OPTIONS}
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH cmake)
+
+if (CDT_USE_AS_COMPILED_LIBRARY)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+endif()
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/cdt/vcpkg.json b/external_imported/vcpkg/ports/cdt/vcpkg.json
new file mode 100644
index 000000000..c022ecdc9
--- /dev/null
+++ b/external_imported/vcpkg/ports/cdt/vcpkg.json
@@ -0,0 +1,25 @@
+{
+  "name": "cdt",
+  "version": "1.4.0",
+  "description": "Constrained Delaunay Triangulation",
+  "homepage": "https://github.com/artem-ogre/CDT.git",
+  "license": "MPL-2.0",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
+  "features": {
+    "64-bit-index-type": {
+      "description": "64bits are used to store vertex/triangle index types"
+    },
+    "as-compiled-library": {
+      "description": "Templates for float and double will be instantiated and compiled into a library"
+    }
+  }
+}
diff --git a/external_imported/vcpkg/ports/celero/portfile.cmake b/external_imported/vcpkg/ports/celero/portfile.cmake
index 38c62ac17..a14db385b 100644
--- a/external_imported/vcpkg/ports/celero/portfile.cmake
+++ b/external_imported/vcpkg/ports/celero/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO DigitalInBlue/Celero
     REF "v${VERSION}"
-    SHA512 7f2c22cd030ce59641636aa162b422694f79860c8a76d2227c706af9959d2c5269ae861c123e656ed3ae91835eb7e2b22501bca20fcd6ad0223ae95f312e73aa
+    SHA512 17bb1525b2e02a78739f2c530aa8453e07ca4c803568264aeb7d99f219244f361bcfd4f7e2bf13b3b06e5da0581a5abe93b94e8efda4dac6b092afa9e65cd1df
     HEAD_REF master
     PATCHES
         fix-bin-install-path.patch
@@ -18,7 +18,7 @@ vcpkg_cmake_configure(
         -DCELERO_ENABLE_EXPERIMENTS=OFF
         -DCELERO_ENABLE_TESTS=OFF
         -DCELERO_COMPILE_DYNAMIC_LIBRARIES=${CELERO_COMPILE_DYNAMIC_LIBRARIES}
-        -DCELERO_TREAT_WARNINGS_AS_ERRORS=OFF
+        -DCELERO_ENABLE_WARNINGS_AS_ERRORS=OFF
 )
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/celero/vcpkg.json b/external_imported/vcpkg/ports/celero/vcpkg.json
index 6096bfff6..01c919f64 100644
--- a/external_imported/vcpkg/ports/celero/vcpkg.json
+++ b/external_imported/vcpkg/ports/celero/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "celero",
-  "version": "2.8.5",
+  "version": "2.9.0",
   "description": "Celero is a modern cross-platform (Windows, Linux, MacOS) Microbenchmarking library for C++ 11 and later.",
   "homepage": "https://github.com/DigitalInBlue/Celero",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/cfitsio/0005-fix-link2019-error.patch b/external_imported/vcpkg/ports/cfitsio/0005-fix-link2019-error.patch
new file mode 100644
index 000000000..0ab588698
--- /dev/null
+++ b/external_imported/vcpkg/ports/cfitsio/0005-fix-link2019-error.patch
@@ -0,0 +1,25 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fead70c..f05ae92 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -68,6 +68,7 @@ IF (USE_PTHREADS)
+     FIND_PACKAGE(pthreads REQUIRED)
+     INCLUDE_DIRECTORIES(${PTHREADS_INCLUDE_DIR})
+     ADD_DEFINITIONS(-D_REENTRANT)
++    set(PTHREADS_LIBRARY PThreads4W::PThreads4W)
+ ENDIF()
+ 
+ # Math library (not available in MSVC or MINGW)
+diff --git a/fitsio2.h b/fitsio2.h
+index 1adb17b..19f8511 100644
+--- a/fitsio2.h
++++ b/fitsio2.h
+@@ -26,7 +26,7 @@ extern int Fitsio_Pthread_Status;
+ #define FFUNLOCK1(lockname) (Fitsio_Pthread_Status = pthread_mutex_unlock(&lockname))
+ #define FFLOCK   FFLOCK1(Fitsio_Lock)
+ #define FFUNLOCK FFUNLOCK1(Fitsio_Lock)
+-#define ffstrtok(str, tok, save) strtok_r(str, tok, save)
++#define ffstrtok(str, tok, save) strtok_s(str, tok, save)
+ 
+ #else
+ #define FFLOCK
diff --git a/external_imported/vcpkg/ports/cfitsio/0006-fix-uwp.patch b/external_imported/vcpkg/ports/cfitsio/0006-fix-uwp.patch
new file mode 100644
index 000000000..cb2fa7f5a
--- /dev/null
+++ b/external_imported/vcpkg/ports/cfitsio/0006-fix-uwp.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7afb480..4fcdf40 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -195,7 +195,7 @@ IF (BUILD_SHARED_LIBS)
+ 
+     # To expand the command line arguments in Windows, see:
+     # http://msdn.microsoft.com/en-us/library/8bch7bkk.aspx
+-    if(MSVC)
++    if(MSVC AND NOT CMAKE_SYSTEM_NAME MATCHES "WindowsStore")
+       set_target_properties(FPack Funpack PROPERTIES LINK_FLAGS "setargv.obj")
+     endif(MSVC)
+ 
diff --git a/external_imported/vcpkg/ports/cfitsio/portfile.cmake b/external_imported/vcpkg/ports/cfitsio/portfile.cmake
index 13c3a1834..57388a344 100644
--- a/external_imported/vcpkg/ports/cfitsio/portfile.cmake
+++ b/external_imported/vcpkg/ports/cfitsio/portfile.cmake
@@ -12,6 +12,8 @@ vcpkg_extract_source_archive(
         0002-export-cmake-targets.patch
         0003-add-Wno-error-implicit-funciton-declaration-to-cmake.patch
         0004-pkg-config.patch
+        0005-fix-link2019-error.patch
+        0006-fix-uwp.patch
 )
 
 vcpkg_check_features(
@@ -69,4 +71,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_
 
 file(INSTALL "${SOURCE_PATH}/FindPthreads.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-cfitsio")
 
-file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/License.txt")
diff --git a/external_imported/vcpkg/ports/cfitsio/vcpkg.json b/external_imported/vcpkg/ports/cfitsio/vcpkg.json
index 7c47f6b37..282e34ad4 100644
--- a/external_imported/vcpkg/ports/cfitsio/vcpkg.json
+++ b/external_imported/vcpkg/ports/cfitsio/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "cfitsio",
   "version": "3.49",
-  "port-version": 3,
+  "port-version": 5,
   "description": "Library of C and Fortran subroutines for reading and writing data files in FITS (Flexible Image Transport System) data format",
   "homepage": "https://heasarc.gsfc.nasa.gov/fitsio/",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/cgal/portfile.cmake b/external_imported/vcpkg/ports/cgal/portfile.cmake
index 657342378..5ceb1570c 100644
--- a/external_imported/vcpkg/ports/cgal/portfile.cmake
+++ b/external_imported/vcpkg/ports/cgal/portfile.cmake
@@ -4,9 +4,12 @@ vcpkg_buildpath_length_warning(37)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO CGAL/cgal
-    REF v5.5.1
-    SHA512 5d247608ca19b46cddf9971a45829848904d1645dec9edf5059b15ae3be34c5b063e4e8be2e7018f7d754e7d1b16116d51ca8bc5c609a0a813df07a16118b5ce
+    REF v5.6
+    SHA512 87817169f49c30d8dc4fa5e61ce9b28be5b1f0a9fcd3ebe0cb08b044631a2455de76c53d3cffaa1984f033f5fe21c9b55f54628fc431b7d3a34b3b3e18ad206d
     HEAD_REF master
+    PATCHES
+        x86_windows.patch
+        # Upstream patch: https://github.com/CGAL/cgal/pull/7635
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
diff --git a/external_imported/vcpkg/ports/cgal/vcpkg.json b/external_imported/vcpkg/ports/cgal/vcpkg.json
index ac675c8c2..89915389e 100644
--- a/external_imported/vcpkg/ports/cgal/vcpkg.json
+++ b/external_imported/vcpkg/ports/cgal/vcpkg.json
@@ -1,9 +1,11 @@
 {
   "name": "cgal",
-  "version": "5.5.1",
+  "version": "5.6",
+  "port-version": 1,
   "description": "The Computational Geometry Algorithms Library (CGAL) is a C++ library that aims to provide easy access to efficient and reliable algorithms in computational geometry.",
   "homepage": "https://github.com/CGAL/cgal",
   "license": "GPL-3.0-or-later AND LGPL-3.0-or-later AND BSL-1.0",
+  "supports": "!xbox",
   "dependencies": [
     "boost-accumulators",
     "boost-algorithm",
@@ -63,6 +65,7 @@
     "qt": {
       "description": "Qt GUI support for CGAL",
       "dependencies": [
+        "boost-format",
         "eigen3",
         "qt5-3d",
         {
diff --git a/external_imported/vcpkg/ports/cgal/x86_windows.patch b/external_imported/vcpkg/ports/cgal/x86_windows.patch
new file mode 100644
index 000000000..fcb26a683
--- /dev/null
+++ b/external_imported/vcpkg/ports/cgal/x86_windows.patch
@@ -0,0 +1,24 @@
+diff --git a/Number_types/include/CGAL/boost_mp.h b/Number_types/include/CGAL/boost_mp.h
+index 3dcaadcad21..b98980acbc5 100644
+--- a/Number_types/include/CGAL/boost_mp.h
++++ b/Number_types/include/CGAL/boost_mp.h
+@@ -20,8 +20,18 @@
+ // easy solution.
+ // MSVC had trouble with versions <= 1.69:
+ // https://github.com/boostorg/multiprecision/issues/98
++//
++// Disable also on Windows 32 bits
++// because CGAL/cpp_float.h assumes _BitScanForward64 is available
++// See https://learn.microsoft.com/en-us/cpp/intrinsics/bitscanforward-bitscanforward64
++//
++// Disable also with PowerPC processors, with Boost<1.80 because of that bug:
++// https://github.com/boostorg/multiprecision/pull/421
++//
+ #if !defined CGAL_DO_NOT_USE_BOOST_MP && \
+-    (!defined _MSC_VER || BOOST_VERSION >= 107000)
++    (!defined _MSC_VER || BOOST_VERSION >= 107000) && \
++    (!defined _WIN32 || defined _WIN64) && \
++    (BOOST_VERSION >= 108000 || (!defined _ARCH_PPC && !defined _ARCH_PPC64))
+ #define CGAL_USE_BOOST_MP 1
+ 
+ #include <CGAL/Quotient.h>
diff --git a/external_imported/vcpkg/ports/cgicc/portfile.cmake b/external_imported/vcpkg/ports/cgicc/portfile.cmake
index f7d200fb3..0ba6d6214 100644
--- a/external_imported/vcpkg/ports/cgicc/portfile.cmake
+++ b/external_imported/vcpkg/ports/cgicc/portfile.cmake
@@ -1,11 +1,10 @@
-set(CGICC_VERSION 3.2.19)
 
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://ftp.gnu.org/gnu/cgicc/cgicc-${CGICC_VERSION}.tar.gz" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/cgicc/cgicc-${CGICC_VERSION}.tar.gz"
-    FILENAME "cgicc-${CGICC_VERSION}.tar.gz"
-    SHA512 c361923cf3ac876bc3fc94dffd040d2be7cd44751d8534f4cfa3545e9f58a8ec35ebcd902a8ce6a19da0efe52db67506d8b02e5cc868188d187ce3092519abdf
+    URLS "https://ftp.gnu.org/gnu/cgicc/cgicc-${VERSION}.tar.gz" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/cgicc/cgicc-${VERSION}.tar.gz"
+    FILENAME "cgicc-${VERSION}.tar.gz"
+    SHA512 e57b8f30b26b29008bcf1ffc3b2d272bdbd77848fb02e24912b6182ae90923d5933b9d204c556ac922a389f73ced465065b6e2202fc0c3d008e0e6038e7c8052
 )
 
 vcpkg_extract_source_archive(
diff --git a/external_imported/vcpkg/ports/cgicc/vcpkg.json b/external_imported/vcpkg/ports/cgicc/vcpkg.json
index 57ff62c60..d99d2e6a7 100644
--- a/external_imported/vcpkg/ports/cgicc/vcpkg.json
+++ b/external_imported/vcpkg/ports/cgicc/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "cgicc",
-  "version-string": "3.2.19",
-  "port-version": 6,
+  "version": "3.2.20",
   "description": "GNU Cgicc is an ANSI C++ compliant class library that greatly simplifies the creation of CGI applications for the World Wide Web",
   "homepage": "https://www.gnu.org/software/cgicc/",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/cglm/portfile.cmake b/external_imported/vcpkg/ports/cglm/portfile.cmake
index 6bf99df59..be03d10f2 100644
--- a/external_imported/vcpkg/ports/cglm/portfile.cmake
+++ b/external_imported/vcpkg/ports/cglm/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO recp/cglm
     REF "v${VERSION}"
-    SHA512 a89f76378aee6ee8a7a38b9ce975bff1873590b4cb83daaf658b2875578758d05e15e92ef7141df3109ee37e6b097eda0bb2e60b13fdeca536a72053145c5ece
+    SHA512 d5de879b2510f534dbc82c88b6f4f324088468af7218a635aff08cc3327787f95b0dc896816b9610e5a319cd071bf2443923d3c1d426fd58509f39867d684e5f
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" CGLM_BUILD_SHARED)
diff --git a/external_imported/vcpkg/ports/cglm/vcpkg.json b/external_imported/vcpkg/ports/cglm/vcpkg.json
index bc7129717..ac6b4d463 100644
--- a/external_imported/vcpkg/ports/cglm/vcpkg.json
+++ b/external_imported/vcpkg/ports/cglm/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "cglm",
-  "version-semver": "0.8.8",
+  "version-semver": "0.9.2",
   "description": "Highly Optimized Graphics Math (glm) for C",
   "homepage": "https://github.com/recp/cglm",
   "license": "MIT",
-  "supports": "!(arm | uwp)",
+  "supports": "!uwp",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/cgns/portfile.cmake b/external_imported/vcpkg/ports/cgns/portfile.cmake
index 11bb824cc..e3c80e0fa 100644
--- a/external_imported/vcpkg/ports/cgns/portfile.cmake
+++ b/external_imported/vcpkg/ports/cgns/portfile.cmake
@@ -2,8 +2,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO CGNS/CGNS
-    REF ec538ac11dbaff510464a831ef094b0d6bf7216c # v4.3.0
-    SHA512 3c04829ff99c0f4f1cd705f0807fda0a65f970c7eecd23ec624cf09fb6fa2a566c63fc94d46c1d0754910bbff8f98c3723e4f32ef66c3e7e41930313454fa10b
+    REF "v${VERSION}"
+    SHA512 86c16d40b524519362645c553c91bade9bb7e4bffde7bf4de96a7f471ae3779a15781efa91efa059b2af0b127f08a560d2e903df6b45e1c79eaec6061db226e9
     HEAD_REF develop
     PATCHES
         hdf5.patch
@@ -57,10 +57,12 @@ vcpkg_copy_tools(
     AUTO_CLEAN
 )
 
+set(TOOLS "cgnsupdate")
+if("hdf5" IN_LIST FEATURES)
+    list(APPEND TOOLS "adf2hdf" "hdf2adf")
+endif()
 if(VCPKG_TARGET_IS_WINDOWS)
-    set(TOOLS "adf2hdf.bat" "hdf2adf.bat" "cgnsupdate.bat")
-elseif(VCPKG_TARGET_IS_LINUX)
-    set(TOOLS "adf2hdf" "hdf2adf" "cgnsupdate")
+    list(TRANSFORM TOOLS APPEND ".bat")
 endif()
 
 foreach(TOOL ${TOOLS})
diff --git a/external_imported/vcpkg/ports/cgns/vcpkg.json b/external_imported/vcpkg/ports/cgns/vcpkg.json
index ff701a98c..52d746edb 100644
--- a/external_imported/vcpkg/ports/cgns/vcpkg.json
+++ b/external_imported/vcpkg/ports/cgns/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "cgns",
-  "version-semver": "4.3.0",
-  "port-version": 3,
+  "version-semver": "4.4.0",
   "description": "The CFD General Notation System (CGNS) provides a standard for recording and recovering computer data associated with the numerical solution of fluid dynamics equations.",
   "homepage": "http://cgns.org/",
   "license": "Zlib",
diff --git a/external_imported/vcpkg/ports/chaiscript/vcpkg.json b/external_imported/vcpkg/ports/chaiscript/vcpkg.json
index e4362e804..bb52fb60f 100644
--- a/external_imported/vcpkg/ports/chaiscript/vcpkg.json
+++ b/external_imported/vcpkg/ports/chaiscript/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "chaiscript",
-  "version-string": "6.1.0",
-  "port-version": 2,
+  "version": "6.1.0",
+  "port-version": 3,
   "description": "Embedded Scripting Language Designed for C++",
   "homepage": "https://github.com/ChaiScript/ChaiScript"
 }
diff --git a/external_imported/vcpkg/ports/chakracore/portfile.cmake b/external_imported/vcpkg/ports/chakracore/portfile.cmake
index 21df859e3..78a5f9aaf 100644
--- a/external_imported/vcpkg/ports/chakracore/portfile.cmake
+++ b/external_imported/vcpkg/ports/chakracore/portfile.cmake
@@ -10,31 +10,22 @@ vcpkg_from_github(
         add-missing-reference.patch # https://github.com/chakra-core/ChakraCore/pull/6862
 )
 
-if(WIN32)
-    find_path(COR_H_PATH cor.h)
-    if(COR_H_PATH MATCHES "NOTFOUND")
-        message(FATAL_ERROR "Could not find <cor.h>. Ensure the NETFXSDK is installed.")
+set(BUILDTREE_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}")
+if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+    if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
+        set(additional_options NO_TOOLCHAIN_PROPS) # don't know how to fix the linker error about __guard_check_icall_thunk 
     endif()
-    get_filename_component(NETFXSDK_PATH "${COR_H_PATH}/../.." ABSOLUTE)
-endif()
-
-set(BUILDTREE_PATH ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET})
-file(REMOVE_RECURSE ${BUILDTREE_PATH})
-file(COPY ${SOURCE_PATH}/ DESTINATION ${BUILDTREE_PATH})
-
-if(WIN32)
-    set(CHAKRA_RUNTIME_LIB "static_library") # ChakraCore only supports static CRT linkage
     if(VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
         set(PLATFORM_ARG PLATFORM x86) # it's x86, not Win32 in sln file
     endif()
-    vcpkg_install_msbuild(
-        SOURCE_PATH "${BUILDTREE_PATH}"
-        PROJECT_SUBPATH "Build/Chakra.Core.sln"
+
+    vcpkg_msbuild_install(
+        SOURCE_PATH "${SOURCE_PATH}"
+        PROJECT_SUBPATH Build/Chakra.Core.sln
         OPTIONS
-            "/p:DotNetSdkRoot=${NETFXSDK_PATH}/"
             "/p:CustomBeforeMicrosoftCommonTargets=${CMAKE_CURRENT_LIST_DIR}/no-warning-as-error.props"
-            "/p:RuntimeLib=${CHAKRA_RUNTIME_LIB}"
         ${PLATFORM_ARG}
+        ${additional_options}
     )
     file(GLOB_RECURSE LIB_FILES "${CURRENT_PACKAGES_DIR}/lib/*.lib")
     file(GLOB_RECURSE DEBUG_LIB_FILES "${CURRENT_PACKAGES_DIR}/debug/lib/*.lib")
@@ -54,11 +45,11 @@ else()
         message(WARNING "${PORT} requires Clang from the system package manager, this can be installed on Ubuntu systems via sudo apt install clang")
     endif()
 
-    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+    if(NOT DEFINED VCPKG_BUILD_TYPE)
         list(APPEND configs "debug")
         execute_process(
             COMMAND bash "build.sh" "--arch=${CHAKRACORE_TARGET_ARCH}" "--debug" "-j=${VCPKG_CONCURRENCY}"
-            WORKING_DIRECTORY "${BUILDTREE_PATH}"
+            WORKING_DIRECTORY "${BUILDTREE_PATH}-dbg"
 
             OUTPUT_VARIABLE CHAKRA_BUILD_SH_OUT
             ERROR_VARIABLE CHAKRA_BUILD_SH_ERR
@@ -67,33 +58,32 @@ else()
             ECHO_ERROR_VARIABLE
         )
     endif()
-    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-        list(APPEND configs "release")
-        execute_process(
-            COMMAND bash "build.sh" "--arch=${CHAKRACORE_TARGET_ARCH}" "-j=${VCPKG_CONCURRENCY}"
-            WORKING_DIRECTORY "${BUILDTREE_PATH}"
-            OUTPUT_VARIABLE CHAKRA_BUILD_SH_OUT
-            ERROR_VARIABLE CHAKRA_BUILD_SH_ERR
-            RESULT_VARIABLE CHAKRA_BUILD_SH_RES
-            ECHO_OUTPUT_VARIABLE
-            ECHO_ERROR_VARIABLE
-        )
-    endif()
+
+    list(APPEND configs "release")
+    execute_process(
+        COMMAND bash "build.sh" "--arch=${CHAKRACORE_TARGET_ARCH}" "-j=${VCPKG_CONCURRENCY}"
+        WORKING_DIRECTORY "${BUILDTREE_PATH}-rel"
+        OUTPUT_VARIABLE CHAKRA_BUILD_SH_OUT
+        ERROR_VARIABLE CHAKRA_BUILD_SH_ERR
+        RESULT_VARIABLE CHAKRA_BUILD_SH_RES
+        ECHO_OUTPUT_VARIABLE
+        ECHO_ERROR_VARIABLE
+    )
+
 endif()
 
 file(INSTALL
-    "${BUILDTREE_PATH}/lib/Jsrt/ChakraCore.h"
-    "${BUILDTREE_PATH}/lib/Jsrt/ChakraCommon.h"
-    "${BUILDTREE_PATH}/lib/Jsrt/ChakraDebug.h"
+    "${BUILDTREE_PATH}-rel/lib/Jsrt/ChakraCore.h"
+    "${BUILDTREE_PATH}-rel/lib/Jsrt/ChakraCommon.h"
+    "${BUILDTREE_PATH}-rel/lib/Jsrt/ChakraDebug.h"
     DESTINATION "${CURRENT_PACKAGES_DIR}/include"
 )
-if(WIN32)
+if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
     file(INSTALL
-        "${BUILDTREE_PATH}/lib/Jsrt/ChakraCommonWindows.h"
-        "${BUILDTREE_PATH}/lib/Jsrt/ChakraCoreWindows.h"
+        "${BUILDTREE_PATH}-rel/lib/Jsrt/ChakraCommonWindows.h"
+        "${BUILDTREE_PATH}-rel/lib/Jsrt/ChakraCoreWindows.h"
         DESTINATION "${CURRENT_PACKAGES_DIR}/include"
     )
-    # Do not install dll/exe/lib files here because they are handled by vcpkg_install_msbuild
 else()
     if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
         set(out_file libChakraCore.so)
@@ -101,10 +91,10 @@ else()
         set(out_file lib/libChakraCoreStatic.a)
     endif()
 
-    set(destination_dir_debug "${CURRENT_PACKAGES_DIR}/debug/lib")
-    set(destination_dir_release "${CURRENT_PACKAGES_DIR}/lib")
-    set(out_dir_debug "${BUILDTREE_PATH}/out/Debug")
-    set(out_dir_release "${BUILDTREE_PATH}/out/Release")
+    set(destination_dir_debug "${CURRENT_PACKAGES_DIR}/debug/bin")
+    set(destination_dir_release "${CURRENT_PACKAGES_DIR}/bin")
+    set(out_dir_debug "${BUILDTREE_PATH}-dbg/out/Debug")
+    set(out_dir_release "${BUILDTREE_PATH}-rel/out/Release")
     foreach(config ${configs})
         file(INSTALL
             ${out_dir_${config}}/${out_file}
@@ -121,17 +111,15 @@ else()
             SEARCH_DIR "${out_dir_release}"
         )
     endif()
-endif()
 
-vcpkg_copy_pdbs()
+
+endif()
 
 file(INSTALL
     "${CMAKE_CURRENT_LIST_DIR}/unofficial-chakracore-config.cmake"
     DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}"
 )
 
-file(INSTALL
+vcpkg_install_copyright(FILE_LIST
     "${SOURCE_PATH}/LICENSE.txt"
-    DESTINATION "${CURRENT_PACKAGES_DIR}/share/chakracore"
-    RENAME copyright
 )
diff --git a/external_imported/vcpkg/ports/chakracore/vcpkg.json b/external_imported/vcpkg/ports/chakracore/vcpkg.json
index cf1a325c1..a296ca9ff 100644
--- a/external_imported/vcpkg/ports/chakracore/vcpkg.json
+++ b/external_imported/vcpkg/ports/chakracore/vcpkg.json
@@ -1,11 +1,11 @@
 {
   "name": "chakracore",
   "version-date": "2022-11-09",
-  "port-version": 2,
+  "port-version": 5,
   "description": "Core part of the Chakra Javascript engine",
   "homepage": "https://github.com/Microsoft/ChakraCore",
   "license": "MIT",
-  "supports": "!osx & !uwp & (linux | (!static & !staticcrt))",
+  "supports": "!osx & !uwp & (linux | !static)",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
@@ -14,6 +14,14 @@
     {
       "name": "vcpkg-cmake-config",
       "host": true
+    },
+    {
+      "name": "vcpkg-msbuild",
+      "host": true,
+      "features": [
+        "pkg-config"
+      ],
+      "platform": "windows"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/charls/portfile.cmake b/external_imported/vcpkg/ports/charls/portfile.cmake
index a06a6812d..1b62f621d 100644
--- a/external_imported/vcpkg/ports/charls/portfile.cmake
+++ b/external_imported/vcpkg/ports/charls/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO team-charls/charls
-    REF dd9e90d2d2be86194cc3bd164b5cce35abcf2024 #v2.4.1
-    SHA512 33690d1647e57dedb22ad5cb75e4b41de41d0c603e0ec8e4b27dc2fa2ce71a97ab07deaa1aa42154369efb609b3954f7db51317f1dafd83d6cf882f2bade59a9
+    REF "${VERSION}"
+    SHA512 4f1b587f008956ab6fb9d2473c37a7b1a842633113245be7f8bb29b8c64304a6d580a29fcfca97ba1ac75adedbaf89e29adc4ac9e4117e1af1aa5949dbd34df9
     HEAD_REF master
 )
 
@@ -18,7 +18,7 @@ vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/charls)
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
 
 vcpkg_copy_pdbs()
 
diff --git a/external_imported/vcpkg/ports/charls/vcpkg.json b/external_imported/vcpkg/ports/charls/vcpkg.json
index 0c13af7d2..3cbf30ea6 100644
--- a/external_imported/vcpkg/ports/charls/vcpkg.json
+++ b/external_imported/vcpkg/ports/charls/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "charls",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "description": "CharLS, a C++ JPEG-LS library implementation.",
   "homepage": "https://github.com/team-charls/charls",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/chartdir/portfile.cmake b/external_imported/vcpkg/ports/chartdir/portfile.cmake
index d22b18e2d..05f39bb00 100644
--- a/external_imported/vcpkg/ports/chartdir/portfile.cmake
+++ b/external_imported/vcpkg/ports/chartdir/portfile.cmake
@@ -12,10 +12,10 @@ if(VCPKG_TARGET_IS_WINDOWS)
         SHA512 e5b5d387cff693a7f5ee98c2d2df75f421129b006e4324ae30ace0cbaac58867f048868ddfacdb3224c7165c8f27219c4273f3c778be3330d39ef95260d4186b
     )
 
-    vcpkg_extract_source_archive_ex(
-        OUT_SOURCE_PATH SOURCE_PATH
+    vcpkg_extract_source_archive(
+        SOURCE_PATH
         ARCHIVE "${ARCHIVE_FILE}"
-        REF 7.0.0
+        SOURCE_BASE 7.0.0
     )
 
     if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
@@ -39,10 +39,10 @@ elseif(VCPKG_TARGET_IS_OSX)
         SHA512 fd46ac45e8906854ededb9e30ee3ba8bdd05588e6ca7c9fdf140254ee637d32565417d799da33b23228f1ade8111fcae037eed4cf978a11d35e70ab8861214a2
     )
 
-    vcpkg_extract_source_archive_ex(
-        OUT_SOURCE_PATH SOURCE_PATH
+    vcpkg_extract_source_archive(
+        SOURCE_PATH
         ARCHIVE "${ARCHIVE_FILE}"
-        REF 7.0.0
+        SOURCE_BASE 7.0.0
     )
 
     file(COPY "${SOURCE_PATH}/lib/libchartdir.7.dylib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
@@ -70,10 +70,10 @@ elseif(VCPKG_TARGET_IS_LINUX)
 
     endif()
 
-    vcpkg_extract_source_archive_ex(
-        OUT_SOURCE_PATH SOURCE_PATH
+    vcpkg_extract_source_archive(
+        SOURCE_PATH
         ARCHIVE "${ARCHIVE_FILE}"
-        REF 7.0.0
+        SOURCE_BASE 7.0.0
     )
 
     file(COPY "${SOURCE_PATH}/lib/libchartdir.so.7.0.0" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
diff --git a/external_imported/vcpkg/ports/chartdir/vcpkg.json b/external_imported/vcpkg/ports/chartdir/vcpkg.json
index 056ed8b96..46ebed2f4 100644
--- a/external_imported/vcpkg/ports/chartdir/vcpkg.json
+++ b/external_imported/vcpkg/ports/chartdir/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "chartdir",
   "version": "7.0.0",
-  "port-version": 6,
+  "port-version": 7,
   "description": "ChartDirector is a powerful chart component for creating professional looking charts for web and windows applications.",
   "homepage": "https://www.advsofteng.com/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/check/linkage.patch b/external_imported/vcpkg/ports/check/linkage.patch
new file mode 100644
index 000000000..3c18c522f
--- /dev/null
+++ b/external_imported/vcpkg/ports/check/linkage.patch
@@ -0,0 +1,20 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 4a02dbe..3e147e4 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -188,7 +188,14 @@ target_include_directories(checkShared
+ )
+ 
+ if(NOT THIS_IS_SUBPROJECT)
+-  install(TARGETS check checkShared
++  if(BUILD_SHARED_LIBS)
++    set(lib checkShared)
++    set_target_properties(check PROPERTIES EXCLUDE_FROM_ALL 1)
++  else()
++    set(lib check)
++    set_target_properties(checkShared PROPERTIES EXCLUDE_FROM_ALL 1)
++  endif()
++  install(TARGETS ${lib}
+     EXPORT check-targets
+     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/manual-link
diff --git a/external_imported/vcpkg/ports/check/portfile.cmake b/external_imported/vcpkg/ports/check/portfile.cmake
index 1d0920ddb..3033360ad 100644
--- a/external_imported/vcpkg/ports/check/portfile.cmake
+++ b/external_imported/vcpkg/ports/check/portfile.cmake
@@ -4,33 +4,33 @@ vcpkg_from_github(
     REF 11970a7e112dfe243a2e68773f014687df2900e8 # 0.15.2
     SHA512 210c9617fa1c1ce16bef983b0e6cb587b1774c3f7ce27a53ca7799642dc7a14be8de567d69dc0e57845684c6f7991d772c73654f63c8755afda3b37a35c7156e
     HEAD_REF master
-    PATCHES fix-lib-path.patch
+    PATCHES
+        fix-lib-path.patch
+        linkage.patch
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-        -DCHECK_ENABLE_TESTS=OFF
         -DBUILD_TESTING=OFF
         -DCHECK_ENABLE_GCOV=OFF
-        -DENABLE_MEMORY_LEAKING_TESTS=OFF
+        -DCHECK_ENABLE_TESTS=OFF
         -DCHECK_ENABLE_TIMEOUT_TESTS=OFF
+        -DENABLE_MEMORY_LEAKING_TESTS=OFF
+        -DINSTALL_CHECKMK=OFF
 )
 
 vcpkg_cmake_install()
-
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/check)
-
 vcpkg_copy_pdbs()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/check)
+vcpkg_fixup_pkgconfig()
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/check.h" "#define CK_DLL_EXP" "#define CK_DLL_EXP __declspec(dllimport)")
 endif()
 
-# cleanup
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/man")
 
-vcpkg_fixup_pkgconfig()
-
-file(INSTALL "${SOURCE_PATH}/COPYING.LESSER" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(COPY "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING.LESSER")
diff --git a/external_imported/vcpkg/ports/check/usage b/external_imported/vcpkg/ports/check/usage
new file mode 100644
index 000000000..a511e134c
--- /dev/null
+++ b/external_imported/vcpkg/ports/check/usage
@@ -0,0 +1,4 @@
+check provides CMake targets:
+
+  find_package(check CONFIG REQUIRED)
+  target_link_libraries(main PRIVATE $<IF:$<TARGET_EXISTS:Check::check>,Check::check,Check::checkShared>)
diff --git a/external_imported/vcpkg/ports/check/vcpkg.json b/external_imported/vcpkg/ports/check/vcpkg.json
index 94886beda..dbc06c330 100644
--- a/external_imported/vcpkg/ports/check/vcpkg.json
+++ b/external_imported/vcpkg/ports/check/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "check",
   "version": "0.15.2",
-  "port-version": 4,
+  "port-version": 5,
   "description": "A unit testing framework for C",
   "homepage": "https://github.com/libcheck/check",
   "license": "LGPL-2.1-only",
diff --git a/external_imported/vcpkg/ports/chipmunk/portfile.cmake b/external_imported/vcpkg/ports/chipmunk/portfile.cmake
index 3cd705c30..cac2a8631 100644
--- a/external_imported/vcpkg/ports/chipmunk/portfile.cmake
+++ b/external_imported/vcpkg/ports/chipmunk/portfile.cmake
@@ -1,9 +1,18 @@
+vcpkg_download_distfile(
+    SYSCTL_REMOVED_PATCH
+    URLS https://github.com/slembcke/Chipmunk2D/commit/9a051e6fb970c7afe09ce2d564c163b81df050a8.patch?full_index=1
+    SHA512 54ec8766529d301ea35e8e0e7f7e9803101454d0f3655f7be87b6c81414a71e6fd269c14cf1d89902eebea78bb20526b0e4da4c53cf660d169ebabe46dadd059
+    FILENAME 9a051e6fb970c7afe09ce2d564c163b81df050a8.patch
+)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO slembcke/Chipmunk2D
     REF 87340c216bf97554dc552371bbdecf283f7c540e
     SHA512 9094017755e9c140aa5bf8a1b5502077ae4fb2b0a3e12f1114e86d8591a6188f89822ecc578a2b5e95f61c555018f1b3273fe50e833fe2daf30e94b180a3d07c
     HEAD_REF master
+    PATCHES
+        "${SYSCTL_REMOVED_PATCH}"
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" KEYSTONE_BUILD_STATIC)
diff --git a/external_imported/vcpkg/ports/chipmunk/vcpkg.json b/external_imported/vcpkg/ports/chipmunk/vcpkg.json
index 24e922777..01bccc9eb 100644
--- a/external_imported/vcpkg/ports/chipmunk/vcpkg.json
+++ b/external_imported/vcpkg/ports/chipmunk/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "chipmunk",
-  "version-string": "7.0.3",
-  "port-version": 3,
+  "version": "7.0.3",
+  "port-version": 6,
   "description": "A fast and lightweight 2D game physics library.",
   "homepage": "https://github.com/slembcke/Chipmunk2D",
+  "supports": "!(arm & !arm64 & android)",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/chmlib/portfile.cmake b/external_imported/vcpkg/ports/chmlib/portfile.cmake
index 7559b7c07..88e996ae4 100644
--- a/external_imported/vcpkg/ports/chmlib/portfile.cmake
+++ b/external_imported/vcpkg/ports/chmlib/portfile.cmake
@@ -11,8 +11,8 @@ vcpkg_download_distfile(
     SHA512 ad3b0d49fcf99e724c0c38b9c842bae9508d0e4ad47122b0f489c113160f5344223d311abb79f25cbb0b662bb00e2925d338d60dd20a0c309bda2822cda4cd24
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
     PATCHES
         all-platforms.patch
diff --git a/external_imported/vcpkg/ports/chmlib/vcpkg.json b/external_imported/vcpkg/ports/chmlib/vcpkg.json
index 1abad01f8..0eb4108c1 100644
--- a/external_imported/vcpkg/ports/chmlib/vcpkg.json
+++ b/external_imported/vcpkg/ports/chmlib/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "chmlib",
   "version": "0.40",
-  "port-version": 6,
+  "port-version": 7,
   "description": "CHMLIB is a library for dealing with Microsoft ITSS/CHM format files. Right now, it is a very simple library, but sufficient for dealing with all of the .chm files I've come across. Due to the fairly well-designed indexing built into this particular file format, even a small library is able to gain reasonably good performance indexing into ITSS archives.",
   "homepage": "http://www.jedrea.com/chmlib/",
   "license": "LGPL-2.1-or-later",
diff --git a/external_imported/vcpkg/ports/chromaprint/fix_lrintf_detection.patch b/external_imported/vcpkg/ports/chromaprint/fix_lrintf_detection.patch
deleted file mode 100644
index 27248f0c8..000000000
--- a/external_imported/vcpkg/ports/chromaprint/fix_lrintf_detection.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3a0eecb..4fa5e8d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -17,6 +17,7 @@ set_property(CACHE FFT_LIB PROPERTY STRINGS avfft fftw3 fftw3f kissfft vdsp)
- 
- include(CMakePushCheckState)
- include(CheckFunctionExists)
-+include(CheckSymbolExists)
- include(CheckCXXCompilerFlag)
- 
- find_package(Threads)
-@@ -37,8 +38,8 @@ endif()
- 
- cmake_push_check_state(RESET)
- set(CMAKE_REQUIRED_LIBRARIES -lm)
--check_function_exists(lrintf HAVE_LRINTF)
--check_function_exists(round HAVE_ROUND)
-+check_symbol_exists(lrintf math.h HAVE_LRINTF)
-+check_symbol_exists(round math.h HAVE_ROUND)
- cmake_pop_check_state()
- 
- add_definitions(
diff --git a/external_imported/vcpkg/ports/chromaprint/portfile.cmake b/external_imported/vcpkg/ports/chromaprint/portfile.cmake
index afdcba588..681693fc8 100644
--- a/external_imported/vcpkg/ports/chromaprint/portfile.cmake
+++ b/external_imported/vcpkg/ports/chromaprint/portfile.cmake
@@ -1,17 +1,18 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO acoustid/chromaprint
-    REF v1.5.0
-    SHA512 333114949928abdf5d4b11aba1db6ec487eebe526324c68d903b3fa80a3af87a28d942af765a2f873e63a1bf222b658b6438cd10cde4446f61b26ea91f537469
-    PATCHES
-        fix_lrintf_detection.patch # submitted upstream as https://github.com/acoustid/chromaprint/pull/85
+    REF "v${VERSION}"
+    SHA512 ea16e4d2b879c15b1d9b9ec93878da8b893f1834c70942663e1d2d106c2e0a661094fe2dd3bae7a6c2a1f9d5d8fab5e0b0ba493561090cf57b2228606fad1e66
+    HEAD_REF master
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_TESTS=OFF
 )
 vcpkg_cmake_install()
 vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
diff --git a/external_imported/vcpkg/ports/chromaprint/vcpkg.json b/external_imported/vcpkg/ports/chromaprint/vcpkg.json
index 5aee10bf1..56d01d0ee 100644
--- a/external_imported/vcpkg/ports/chromaprint/vcpkg.json
+++ b/external_imported/vcpkg/ports/chromaprint/vcpkg.json
@@ -1,19 +1,15 @@
 {
   "name": "chromaprint",
-  "version": "1.5.0",
-  "port-version": 2,
+  "version": "1.5.1",
   "description": "C library for generating audio fingerprints used by AcoustID",
   "homepage": "https://github.com/acoustid/chromaprint",
   "license": "LGPL-2.1-or-later",
+  "supports": "!xbox",
   "dependencies": [
     "ffmpeg",
     {
       "name": "vcpkg-cmake",
       "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/cialloo-rcon/portfile.cmake b/external_imported/vcpkg/ports/cialloo-rcon/portfile.cmake
new file mode 100644
index 000000000..466fba808
--- /dev/null
+++ b/external_imported/vcpkg/ports/cialloo-rcon/portfile.cmake
@@ -0,0 +1,16 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO luckyweNda/rcon
+    REF 6ea49bbd54bbf7604e4e3f6fc2dbd4e507d7bd90
+    SHA512 84fefc80e6c47decd9fedb2df1ce1c2671cf8159eb8d60d9b90e3208dd2bd5786eb1bbd526d1d252cd1fc4c6bbb0377712b224c8a4b7ea66b52c6184c241f85e
+    HEAD_REF main
+)
+
+# Install include directory
+file(INSTALL "${SOURCE_PATH}/include" DESTINATION "${CURRENT_PACKAGES_DIR}")
+
+# Handle copyright
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+# Copy usage file
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/cialloo-rcon/usage b/external_imported/vcpkg/ports/cialloo-rcon/usage
new file mode 100644
index 000000000..9c33607bb
--- /dev/null
+++ b/external_imported/vcpkg/ports/cialloo-rcon/usage
@@ -0,0 +1,4 @@
+The package rcon is header only and can be used from CMake via:
+
+    find_path(RCON_INCLUDE_DIRS "rcon.hpp")
+    target_include_directories(main PRIVATE ${RCON_INCLUDE_DIRS})
diff --git a/external_imported/vcpkg/ports/cialloo-rcon/vcpkg.json b/external_imported/vcpkg/ports/cialloo-rcon/vcpkg.json
new file mode 100644
index 000000000..ea7d34298
--- /dev/null
+++ b/external_imported/vcpkg/ports/cialloo-rcon/vcpkg.json
@@ -0,0 +1,10 @@
+{
+  "name": "cialloo-rcon",
+  "version": "1.0.0",
+  "description": "implementation in valve source rcon protocal",
+  "homepage": "https://github.com/luckyweNda/rcon",
+  "license": "MIT",
+  "dependencies": [
+    "asio"
+  ]
+}
diff --git a/external_imported/vcpkg/ports/cimg/CMakeLists.txt b/external_imported/vcpkg/ports/cimg/CMakeLists.txt
index 75ae59cd5..0d63a9fba 100644
--- a/external_imported/vcpkg/ports/cimg/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/cimg/CMakeLists.txt
@@ -19,3 +19,6 @@ install(
     FILES ${CMAKE_CURRENT_SOURCE_DIR}/CImg.h
     DESTINATION include
 )
+
+install(
+    DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/plugins DESTINATION include)
diff --git a/external_imported/vcpkg/ports/cimg/portfile.cmake b/external_imported/vcpkg/ports/cimg/portfile.cmake
index 8e128a33e..04be6464f 100644
--- a/external_imported/vcpkg/ports/cimg/portfile.cmake
+++ b/external_imported/vcpkg/ports/cimg/portfile.cmake
@@ -1,7 +1,9 @@
+set(VCPKG_BUILD_TYPE release) # header-only
+
 vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH
     REPO dtschump/CImg
-    REF b33dcc8f9f1acf1f276ded92c04f8231f6c23fcd # v2.9.9
-    SHA512 327c72320e7cac386ba72d417c45b9e8b40df34650370c34e687c362731919af1b447b2ee498f21278d4af155f0d9dbfabd222856d5f18c2e05569fa638a5909
+    REF "v.${VERSION}"
+    SHA512 c38910e8b93bcb65fbfd7fe11a036bae9f22e229d903cd044c26223473b02ec48ec46b3ad398e2cc02f25184e16a2e27a687f18479d3ae7edaee2bab69028ae9
     HEAD_REF master
 )
 
@@ -13,9 +15,8 @@ vcpkg_cmake_configure(
 
 vcpkg_cmake_install()
 
-# Move cmake files, ensuring they will be 3 directories up the import prefix
-file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
-
-file(INSTALL "${SOURCE_PATH}/Licence_CeCILL-C_V1-en.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-file(INSTALL "${SOURCE_PATH}/Licence_CeCILL_V2-en.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright2)
+vcpkg_install_copyright(
+    FILE_LIST 
+        "${SOURCE_PATH}/Licence_CeCILL-C_V1-en.txt"
+        "${SOURCE_PATH}/Licence_CeCILL_V2-en.txt"
+)
diff --git a/external_imported/vcpkg/ports/cimg/vcpkg.json b/external_imported/vcpkg/ports/cimg/vcpkg.json
index cc1c448bd..02794016c 100644
--- a/external_imported/vcpkg/ports/cimg/vcpkg.json
+++ b/external_imported/vcpkg/ports/cimg/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "cimg",
-  "version": "2.9.9",
+  "version": "3.3.2",
   "description": "The CImg Library is a small, open-source, and modern C++ toolkit for image processing",
   "homepage": "https://github.com/dtschump/CImg",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/cista/portfile.cmake b/external_imported/vcpkg/ports/cista/portfile.cmake
index eab6e8348..55ee47b85 100644
--- a/external_imported/vcpkg/ports/cista/portfile.cmake
+++ b/external_imported/vcpkg/ports/cista/portfile.cmake
@@ -1,13 +1,13 @@
-vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO felixguendling/cista
     REF "v${VERSION}"
-    SHA512 303d622416e72f771b6fa2b1c7b7ca4cfed3091d89409c96262571162754c9d6d99b62a930c137e01fd8c74a8f46b76ac3a1d86387c918414e26c8a2a8ffd930
+    SHA512 bf5c5f527eb2b63775fd9f2e99f60a0ed19bd9805f38bf3e55f4995e01ecaf31c95dcd555520e12b3a1b9d039f702b9c9a4fdec74b9547136e336b5adf78689d
     HEAD_REF master
 )
 
+set(VCPKG_BUILD_TYPE release) # header-only port
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
@@ -18,9 +18,7 @@ vcpkg_cmake_install()
 
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cista)
 
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
 
-file(REMOVE_RECURSE
-    "${CURRENT_PACKAGES_DIR}/debug"
-    "${CURRENT_PACKAGES_DIR}/lib"
-)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/cista/usage b/external_imported/vcpkg/ports/cista/usage
new file mode 100644
index 000000000..7954c2b5a
--- /dev/null
+++ b/external_imported/vcpkg/ports/cista/usage
@@ -0,0 +1,4 @@
+cista provides CMake targets:
+
+    find_package(cista CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE cista::cista)
diff --git a/external_imported/vcpkg/ports/cista/vcpkg.json b/external_imported/vcpkg/ports/cista/vcpkg.json
index 58cb45502..a0899eb3a 100644
--- a/external_imported/vcpkg/ports/cista/vcpkg.json
+++ b/external_imported/vcpkg/ports/cista/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "cista",
-  "version": "0.11",
+  "version": "0.14",
   "description": "Cista is a simple, high-performance, zero-copy C++ serialization & reflection library.",
   "homepage": "https://github.com/felixguendling/cista",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/cityhash/portfile.cmake b/external_imported/vcpkg/ports/cityhash/portfile.cmake
index f904d8f4e..77cf701ea 100644
--- a/external_imported/vcpkg/ports/cityhash/portfile.cmake
+++ b/external_imported/vcpkg/ports/cityhash/portfile.cmake
@@ -22,10 +22,6 @@ else()
 	file(COPY "${SOURCE_PATH}/out/config.h" DESTINATION "${SOURCE_PATH}/src")
 endif()
 
-if (VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND "sse" IN_LIST FEATURES)
-    message(FATAL_ERROR "Feature 'sse' does not support Windows x86 triplet.")
-endif()
-
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
         "sse"   ENABLE_SSE
diff --git a/external_imported/vcpkg/ports/cityhash/vcpkg.json b/external_imported/vcpkg/ports/cityhash/vcpkg.json
index 431de018b..afa9b46ca 100644
--- a/external_imported/vcpkg/ports/cityhash/vcpkg.json
+++ b/external_imported/vcpkg/ports/cityhash/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "cityhash",
   "version-date": "2013-01-08",
-  "port-version": 2,
+  "port-version": 3,
   "description": "CityHash, a family of hash functions for strings.",
   "homepage": "https://github.com/google/cityhash",
   "dependencies": [
@@ -16,7 +16,8 @@
   ],
   "features": {
     "sse": {
-      "description": "Build CityHash variants that depend on the _mm_crc32_u64 intrinsic."
+      "description": "Build CityHash variants that depend on the _mm_crc32_u64 intrinsic.",
+      "supports": "x64 | (x86 & !windows)"
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/civetweb/fix-fseeko.patch b/external_imported/vcpkg/ports/civetweb/fix-fseeko.patch
new file mode 100644
index 000000000..3e2f58500
--- /dev/null
+++ b/external_imported/vcpkg/ports/civetweb/fix-fseeko.patch
@@ -0,0 +1,17 @@
+diff --git a/src/civetweb.c b/src/civetweb.c
+index 9e321ed..0f11407 100644
+--- a/src/civetweb.c
++++ b/src/civetweb.c
+@@ -892,6 +892,12 @@ typedef unsigned short int in_port_t;
+ #if defined(USE_X_DOM_SOCKET)
+ #include <sys/un.h>
+ #endif
++
++#if defined(__ANDROID_API__) && __ANDROID_API__ < 24
++    // Cf. https://android.googlesource.com/platform/bionic/+/master/docs/32-bit-abi.md#32_bit-and
++    #define fseeko fseek
++#endif
++
+ #endif
+ 
+ #define vsnprintf_impl vsnprintf
diff --git a/external_imported/vcpkg/ports/civetweb/pkgconfig.patch b/external_imported/vcpkg/ports/civetweb/pkgconfig.patch
new file mode 100644
index 000000000..4c23cbff5
--- /dev/null
+++ b/external_imported/vcpkg/ports/civetweb/pkgconfig.patch
@@ -0,0 +1,49 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c5368c0..c297861 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -614,6 +614,10 @@ configure_package_config_file(
+   PATH_VARS CMAKE_INSTALL_INCLUDEDIR CMAKE_INSTALL_LIBDIR CIVETWEB_ENABLE_CXX
+ )
+ 
++set(PROJECT_VERSION "${VERSION}")
++if(CIVETWEB_ENABLE_SSL)
++  set(REQUIRES_OPENSSL openssl)
++endif()
+ configure_file(
+   cmake/${PROJECT_NAME}.pc.in
+   ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.pc
+@@ -629,13 +633,13 @@ configure_file(
+ install(
+   FILES 
+     "${PROJECT_BINARY_DIR}/${PROJECT_NAME}.pc"
+-    DESTINATION "${CMAKE_INSTALL_DATADIR}/pkgconfig"
++    DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
+ )
+ 
+ install(
+   FILES 
+     "${PROJECT_BINARY_DIR}/${PROJECT_NAME}-cpp.pc"
+-    DESTINATION "${CMAKE_INSTALL_DATADIR}/pkgconfig"
++    DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
+ )
+ 
+ write_basic_package_version_file(${PROJECT_NAME}-config-version.cmake
+diff --git a/cmake/civetweb-cpp.pc.in b/cmake/civetweb-cpp.pc.in
+index ca1232c..495da46 100644
+--- a/cmake/civetweb-cpp.pc.in
++++ b/cmake/civetweb-cpp.pc.in
+@@ -10,3 +10,4 @@ Requires:
+ Libs: -L${libdir} -l@PROJECT_NAME@-cpp
+ Cflags: -I${includedir}
+ 
++Requires.private: civetweb
+diff --git a/cmake/civetweb.pc.in b/cmake/civetweb.pc.in
+index 27cea8f..0826f61 100644
+--- a/cmake/civetweb.pc.in
++++ b/cmake/civetweb.pc.in
+@@ -11,3 +11,4 @@ Libs: -L${libdir} -l@PROJECT_NAME@
+ Cflags: -I${includedir}
+ 
+ 
++Requires.private: @REQUIRES_OPENSSL@
diff --git a/external_imported/vcpkg/ports/civetweb/portfile.cmake b/external_imported/vcpkg/ports/civetweb/portfile.cmake
index e568049d0..caa0b3113 100644
--- a/external_imported/vcpkg/ports/civetweb/portfile.cmake
+++ b/external_imported/vcpkg/ports/civetweb/portfile.cmake
@@ -1,20 +1,24 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO civetweb/civetweb
-    REF eefb26f82b233268fc98577d265352720d477ba4 # v1.15
-    SHA512 5ce962e31b3c07b7110cbc645458dba9c0e26e693fbe3b4a7ffe8a28563827049a22fc5596a911fbcea4d88a9adbef3f82000ff61027ff4387f40e4a4045c26d
+    REF "v${VERSION}"
+    SHA512 a0b943dfc76d7fd47f5a7d2c834fd38ddd4cf01a11730cf2f7cfaf32fea9698f59672f3a0f86ac80e0abc315d94d2367a500d37013f305c87d45e84cf39ca816
     HEAD_REF master
     PATCHES
         disable_warnings.patch # cl will simply ignore the other invalid options. 
+        fix-fseeko.patch
+        pkgconfig.patch
 )
+file(REMOVE_RECURSE "${SOURCE_PATH}/src/third_party")
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
         ssl CIVETWEB_ENABLE_SSL
 )
 
+# Fixes arm64-windows build. CIVETWEB_ARCHITECTURE is used only for CPack, which is not used by vcpkg
+vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" "determine_target_architecture(CIVETWEB_ARCHITECTURE)" "")
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
@@ -27,17 +31,24 @@ vcpkg_cmake_configure(
         -DCIVETWEB_ENABLE_SSL_DYNAMIC_LOADING=OFF
         -DCIVETWEB_ENABLE_WEBSOCKETS=ON
         -DCIVETWEB_ALLOW_WARNINGS=ON
+        -DCIVETWEB_ENABLE_ZLIB=ON
+        "-DVERSION=${VERSION}"
         ${FEATURE_OPTIONS}
 )
 
 vcpkg_cmake_install()
-
+vcpkg_copy_pdbs()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/civetweb)
+vcpkg_fixup_pkgconfig()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/civetweb.h" "defined(CIVETWEB_DLL_IMPORTS)" 1)
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/CivetServer.h" "defined(CIVETWEB_CXX_DLL_IMPORTS)" 1)
+endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/pkgconfig")
 
-# Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-
-vcpkg_copy_pdbs()
+file(COPY "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
diff --git a/external_imported/vcpkg/ports/civetweb/usage b/external_imported/vcpkg/ports/civetweb/usage
new file mode 100644
index 000000000..287a2ff66
--- /dev/null
+++ b/external_imported/vcpkg/ports/civetweb/usage
@@ -0,0 +1,4 @@
+civetweb provides CMake targets:
+
+  find_package(civetweb CONFIG REQUIRED)
+  target_link_libraries(main PRIVATE civetweb::civetweb)
diff --git a/external_imported/vcpkg/ports/civetweb/vcpkg.json b/external_imported/vcpkg/ports/civetweb/vcpkg.json
index 98ce11d22..bb2dd92aa 100644
--- a/external_imported/vcpkg/ports/civetweb/vcpkg.json
+++ b/external_imported/vcpkg/ports/civetweb/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "civetweb",
-  "version": "1.15",
+  "version": "1.16",
   "port-version": 2,
   "description": "Easy to use, powerful, C/C++ embeddable web server.",
   "homepage": "https://github.com/civetweb/civetweb",
@@ -13,7 +13,8 @@
     {
       "name": "vcpkg-cmake-config",
       "host": true
-    }
+    },
+    "zlib"
   ],
   "features": {
     "ssl": {
diff --git a/external_imported/vcpkg/ports/cjson/portfile.cmake b/external_imported/vcpkg/ports/cjson/portfile.cmake
index db5482154..fdfbb94cc 100644
--- a/external_imported/vcpkg/ports/cjson/portfile.cmake
+++ b/external_imported/vcpkg/ports/cjson/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO DaveGamble/cJSON
-    REF v1.7.15
-    SHA512 0b32a758c597fcc90c8ed0af493c9bccd611b9d4f9a03e87de3f7337bb9a28990b810befd44bc321a0cb42cbcd0b026d45761f9bab7bd798f920b7b6975fb124
+    REF "v${VERSION}"
+    SHA512 4feebafa5225297fa3e6a7bf23f8d31b5c3e172f437078c5a07528522ad58ca2e9c72dd9e8611241d2b8321e9aa0a1a9af7743689d1c2001d1d9cb624aae6fa8
     HEAD_REF master
 )
 
@@ -57,5 +57,5 @@ file(WRITE "${CURRENT_PACKAGES_DIR}/include/cjson/cJSON.h" "${_contents}")
 
 # Handle copyright
 configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
-
-vcpkg_fixup_pkgconfig()
+
+vcpkg_fixup_pkgconfig()
diff --git a/external_imported/vcpkg/ports/cjson/vcpkg.json b/external_imported/vcpkg/ports/cjson/vcpkg.json
index 0a8e10b1d..5031eb62a 100644
--- a/external_imported/vcpkg/ports/cjson/vcpkg.json
+++ b/external_imported/vcpkg/ports/cjson/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "cjson",
-  "version": "1.7.15",
-  "port-version": 2,
+  "version": "1.7.17",
   "description": "Ultralightweight JSON parser in ANSI C",
   "homepage": "https://github.com/DaveGamble/cJSON",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/clamav/isnt.patch b/external_imported/vcpkg/ports/clamav/isnt.patch
new file mode 100644
index 000000000..faceaa16b
--- /dev/null
+++ b/external_imported/vcpkg/ports/clamav/isnt.patch
@@ -0,0 +1,12 @@
+diff --git a/libclamunrar/CMakeLists.txt b/libclamunrar/CMakeLists.txt
+index f7ce3848e..5bae50aca 100644
+--- a/libclamunrar/CMakeLists.txt
++++ b/libclamunrar/CMakeLists.txt
+@@ -85,6 +85,7 @@ target_sources( clamunrar
+         "dll.hpp" )
+ if(WIN32)
+     set_target_properties(clamunrar PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
++    target_sources( clamunrar PRIVATE "isnt.cpp")
+ endif()
+ 
+ # Public (forwarded) dependencies.
diff --git a/external_imported/vcpkg/ports/clamav/portfile.cmake b/external_imported/vcpkg/ports/clamav/portfile.cmake
index 1b388479b..7f5a66b66 100644
--- a/external_imported/vcpkg/ports/clamav/portfile.cmake
+++ b/external_imported/vcpkg/ports/clamav/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO Cisco-Talos/clamav-devel
-  REF clamav-0.103.0
-  SHA512 e7ff4d98e0615a9fec0752bbfa2b882ae95034a8e01d0f7cc635ee520ff917c3be2a2d3273caa2fc1598e7d5ec4fd60d59b517cb439c5454d32447f8c8d7ba5a
+  REF clamav-0.103.11
+  SHA512 2d614b5006fe526d7bb43dfc691329f2de2fa2dc6cfc63fb93ba556ee26a9f87369bf072f59db0fed178c44413d68838b45ea572885c8d0a0bee81a410d5e055
   FILE_DISAMBIGUATOR 1
   HEAD_REF master
   PATCHES
@@ -12,6 +12,7 @@ vcpkg_from_github(
       "cmakefiles.patch"
       "curl.patch"
       "mspack.patch"
+      "isnt.patch"
 )
 
 vcpkg_cmake_configure(
diff --git a/external_imported/vcpkg/ports/clamav/vcpkg.json b/external_imported/vcpkg/ports/clamav/vcpkg.json
index 885db85d0..0a8b3070e 100644
--- a/external_imported/vcpkg/ports/clamav/vcpkg.json
+++ b/external_imported/vcpkg/ports/clamav/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "clamav",
-  "version-semver": "0.103.0",
-  "port-version": 4,
+  "version-semver": "0.103.11",
   "description": "ClamAV is an open-source anti-virus toolkit.",
   "homepage": "https://www.clamav.net",
   "supports": "!uwp & !static",
diff --git a/external_imported/vcpkg/ports/clap-cleveraudio/portfile.cmake b/external_imported/vcpkg/ports/clap-cleveraudio/portfile.cmake
new file mode 100644
index 000000000..21f1557a9
--- /dev/null
+++ b/external_imported/vcpkg/ports/clap-cleveraudio/portfile.cmake
@@ -0,0 +1,20 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO free-audio/clap
+    REF "${VERSION}"
+    SHA512 9113673a911d023ea29d9cb246fbd7e82b4baccf4df5eb63ffe2605cc65543f82cb3a66982803e26f9ecfc8c159508470608b1d3b47009965094fbcdede49cf5
+    HEAD_REF main
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(
+    CONFIG_PATH "lib/cmake/clap"
+)
+vcpkg_fixup_pkgconfig()
+
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/external_imported/vcpkg/ports/clap-cleveraudio/vcpkg.json b/external_imported/vcpkg/ports/clap-cleveraudio/vcpkg.json
new file mode 100644
index 000000000..63a8ef2a6
--- /dev/null
+++ b/external_imported/vcpkg/ports/clap-cleveraudio/vcpkg.json
@@ -0,0 +1,17 @@
+{
+  "name": "clap-cleveraudio",
+  "version-semver": "1.2.0",
+  "description": "CLAP is an audio plugin ABI which defines a standard for Digital Audio Workstations and audio plugins to work together",
+  "homepage": "https://cleveraudio.org/",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/clapack/FindLAPACK.cmake b/external_imported/vcpkg/ports/clapack/FindLAPACK.cmake
index aa546e672..56913183d 100644
--- a/external_imported/vcpkg/ports/clapack/FindLAPACK.cmake
+++ b/external_imported/vcpkg/ports/clapack/FindLAPACK.cmake
@@ -166,6 +166,14 @@ set(F2C_LIBRARY_DEBUG "${F2C_LIBRARY_DEBUG}" CACHE STRING "" FORCE)
 
 find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARY LAPACK_INCLUDE_DIR)
 mark_as_advanced(LAPACK_INCLUDE_DIR LAPACK_LIBRARY)
+set(CLAPACK_FOUND "${LAPACK_FOUND}" CACHE STRING "" FORCE)
+
+set(oF2C_LIBRARY_RELEASE "${oF2C_LIBRARY_RELEASE}" CACHE STRING "" FORCE)
+set(oF2C_LIBRARY_DEBUG "${oF2C_LIBRARY_DEBUG}" CACHE STRING "" FORCE)
+set(oLAPACK_LIBRARY_RELEASE "${oLAPACK_LIBRARY_RELEASE}" CACHE STRING "" FORCE)
+set(oLAPACK_LIBRARY_DEBUG "${oLAPACK_LIBRARY_DEBUG}" CACHE STRING "" FORCE)
+set(LAPACK_BLAS_LIBRARY_RELEASE "${LAPACK_BLAS_LIBRARY_RELEASE}" CACHE STRING "" FORCE)
+set(LAPACK_BLAS_LIBRARY_DEBUG "${LAPACK_BLAS_LIBRARY_DEBUG}" CACHE STRING "" FORCE)
 
 #TARGETS
 if(CLAPACK_FOUND AND NOT TARGET clapack::clapack)
diff --git a/external_imported/vcpkg/ports/clapack/vcpkg.json b/external_imported/vcpkg/ports/clapack/vcpkg.json
index b3d28c296..ec85ad4f1 100644
--- a/external_imported/vcpkg/ports/clapack/vcpkg.json
+++ b/external_imported/vcpkg/ports/clapack/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "clapack",
   "version": "3.2.1",
-  "port-version": 21,
+  "port-version": 22,
   "description": "CLAPACK (f2c'ed version of LAPACK)",
   "homepage": "https://www.netlib.org/clapack",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/clara/vcpkg.json b/external_imported/vcpkg/ports/clara/vcpkg.json
index 7752fb520..83def794d 100644
--- a/external_imported/vcpkg/ports/clara/vcpkg.json
+++ b/external_imported/vcpkg/ports/clara/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "clara",
-  "version-string": "1.1.5",
-  "port-version": 1,
+  "version": "1.1.5",
+  "port-version": 2,
   "description": "A simple to use command line parser for C++",
   "homepage": "https://github.com/philsquared/Clara"
 }
diff --git a/external_imported/vcpkg/ports/clblast/fix_install_path.patch b/external_imported/vcpkg/ports/clblast/fix_install_path.patch
new file mode 100644
index 000000000..12744c548
--- /dev/null
+++ b/external_imported/vcpkg/ports/clblast/fix_install_path.patch
@@ -0,0 +1,16 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2d28050..e2a060d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -347,7 +347,10 @@ endif()
+ # Installs the library
+ include(GNUInstallDirs)
+ 
+-install(TARGETS clblast EXPORT CLBlast DESTINATION ${CMAKE_INSTALL_LIBDIR})
++install(TARGETS clblast EXPORT CLBlast 
++        ARCHIVE DESTINATION lib
++        LIBRARY DESTINATION lib
++        RUNTIME DESTINATION bin)
+ install(FILES include/clblast_half.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ if(OPENCL)
+   install(FILES include/clblast.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
diff --git a/external_imported/vcpkg/ports/clblast/portfile.cmake b/external_imported/vcpkg/ports/clblast/portfile.cmake
index 74e7e3d4b..3b9afd907 100644
--- a/external_imported/vcpkg/ports/clblast/portfile.cmake
+++ b/external_imported/vcpkg/ports/clblast/portfile.cmake
@@ -1,9 +1,11 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO CNugteren/CLBlast
-    REF 1.5.2
-    SHA512 6693704321bb7623a632ebfc71dcf07bbe4ba6c6f03a2ecf52bc10b401ae546bf82cdd3f6cc28aa9ea10f40dc7b2e86a6530f32cfbd522e24d4cf6a75c8c1100
+    REF "${VERSION}"
+    SHA512 3114b2499f13a8b12dc5dfaf3633d4a25c953da63bea3c2f09a99699ee49239c28a1db0033619ef74234af56068f94413aae8c721d1af6114b862670a32cdb8d
     HEAD_REF master
+    PATCHES
+        fix_install_path.patch
 )
 
 vcpkg_cmake_configure(
@@ -14,17 +16,7 @@ vcpkg_cmake_configure(
 
 vcpkg_cmake_install()
 
-if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin")
-    file(RENAME "${CURRENT_PACKAGES_DIR}/lib/clblast.dll" "${CURRENT_PACKAGES_DIR}/bin/clblast.dll")
-    
-    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-        file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin")
-        file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/clblast.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/clblast.dll")
-    endif()
-endif()
-
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/CLBLast)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/CLBlast)
 vcpkg_copy_pdbs()
 vcpkg_fixup_pkgconfig()
 
diff --git a/external_imported/vcpkg/ports/clblast/vcpkg.json b/external_imported/vcpkg/ports/clblast/vcpkg.json
index bc77f3498..d58fb5f7f 100644
--- a/external_imported/vcpkg/ports/clblast/vcpkg.json
+++ b/external_imported/vcpkg/ports/clblast/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "clblast",
-  "version": "1.5.2",
-  "port-version": 2,
+  "version": "1.6.1",
   "description": "A modern, lightweight, performant and tunable OpenCL BLAS library written in C++11.",
   "homepage": "https://github.com/CNugteren/CLBlast",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/cld3/portfile.cmake b/external_imported/vcpkg/ports/cld3/portfile.cmake
new file mode 100644
index 000000000..a6057fc22
--- /dev/null
+++ b/external_imported/vcpkg/ports/cld3/portfile.cmake
@@ -0,0 +1,34 @@
+if (VCPKG_TARGET_IS_WINDOWS)
+  vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
+
+vcpkg_from_github(
+  OUT_SOURCE_PATH SOURCE_PATH
+  REPO google/cld3
+  REF b48dc46512566f5a2d41118c8c1116c4f96dc661
+  SHA512 c3650ffbf5855aaf04d03930f01c6efd76e1f2b2d47365348721f16531a14653ae5b3aff8fefa8e5fa1c769fdf1a9b441a88bc687f97f8c579b84f17c6984c9e
+  HEAD_REF master
+  PATCHES
+      unofficial-export.patch
+)
+
+vcpkg_cmake_configure(
+  SOURCE_PATH "${SOURCE_PATH}"
+  OPTIONS ${FEATURE_OPTIONS}
+)
+
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/unofficial-cld3Config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-cld3")
+vcpkg_cmake_config_fixup(CONFIG_PATH share/unofficial-cld3 PACKAGE_NAME unofficial-cld3)
+
+file(GLOB PUBLIC_HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/src/*.h")
+file(INSTALL ${PUBLIC_HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/cld3")
+
+file(GLOB HEADERS_SCRIPT_SPAN_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/src/script_span/*.h")
+file(INSTALL ${HEADERS_SCRIPT_SPAN_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/cld3/script_span")
+
+file(GLOB HEADERS_PROTO_FILES LIST_DIRECTORIES false "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/cld_3/protos/*.h")
+file(INSTALL ${HEADERS_PROTO_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/cld_3/protos")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/cld3/unofficial-cld3Config.cmake b/external_imported/vcpkg/ports/cld3/unofficial-cld3Config.cmake
new file mode 100644
index 000000000..4a87abeef
--- /dev/null
+++ b/external_imported/vcpkg/ports/cld3/unofficial-cld3Config.cmake
@@ -0,0 +1,4 @@
+include(CMakeFindDependencyMacro)
+find_dependency(Protobuf)
+ 
+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-cld3-targets.cmake")
diff --git a/external_imported/vcpkg/ports/cld3/unofficial-export.patch b/external_imported/vcpkg/ports/cld3/unofficial-export.patch
new file mode 100644
index 000000000..1f4474627
--- /dev/null
+++ b/external_imported/vcpkg/ports/cld3/unofficial-export.patch
@@ -0,0 +1,45 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2fa3908..d776dd1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -21,7 +21,6 @@ my_protobuf_generate_cpp(cld_3/protos PROTO_SRCS PROTO_HDRS src/feature_extracto
+ message(STATUS "PROTO_HDRS= ${PROTO_HDRS}")
+ 
+ add_definitions(-fPIC) # Position Independant Code
+-add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0)
+ add_definitions(-std=c++11) # Needed for std::to_string(), ...
+ 
+ include_directories(${CMAKE_CURRENT_BINARY_DIR} ${Protobuf_INCLUDE_DIRS}) # needed to include generated pb headers
+@@ -58,6 +57,7 @@ add_library(${PROJECT_NAME}
+ 	src/script_span/fixunicodevalue.cc
+ 	)
+ 
++if (0) # Disable unit tests
+ # unit tests exec:
+ add_executable(language_identifier_main src/language_identifier_main.cc)
+ target_link_libraries(language_identifier_main cld3 ${Protobuf_LITE_LIBRARIES})
+@@ -67,3 +67,24 @@ target_link_libraries(getonescriptspan_test cld3 ${Protobuf_LITE_LIBRARIES})
+ 
+ add_executable(language_identifier_features_test src/language_identifier_features_test.cc)
+ target_link_libraries(language_identifier_features_test cld3 ${Protobuf_LITE_LIBRARIES})
++endif()
++
++if (MSVC)
++	add_compile_definitions(COMPILER_MSVC)
++endif()
++
++target_link_libraries(${PROJECT_NAME} PUBLIC protobuf::libprotobuf-lite)
++
++target_include_directories(${PROJECT_NAME} PUBLIC $<INSTALL_INTERFACE:include>)
++
++install(TARGETS ${PROJECT_NAME}
++    EXPORT unofficial-cld3-targets
++    RUNTIME DESTINATION bin
++    LIBRARY DESTINATION lib
++    ARCHIVE DESTINATION lib
++)
++
++install(EXPORT unofficial-cld3-targets
++	NAMESPACE unofficial::cld3::
++    DESTINATION share/unofficial-cld3
++)
diff --git a/external_imported/vcpkg/ports/cld3/vcpkg.json b/external_imported/vcpkg/ports/cld3/vcpkg.json
new file mode 100644
index 000000000..c8b367387
--- /dev/null
+++ b/external_imported/vcpkg/ports/cld3/vcpkg.json
@@ -0,0 +1,19 @@
+{
+  "name": "cld3",
+  "version": "3.0.14",
+  "port-version": 1,
+  "description": "Compact Language Detector v3",
+  "homepage": "https://github.com/google/cld3",
+  "license": "Apache-2.0",
+  "dependencies": [
+    "protobuf",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/cli/portfile.cmake b/external_imported/vcpkg/ports/cli/portfile.cmake
index f80c55f82..5a5b31218 100644
--- a/external_imported/vcpkg/ports/cli/portfile.cmake
+++ b/external_imported/vcpkg/ports/cli/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO daniele77/cli
-    REF v2.0.2
-    SHA512 5a9b96ec59c6b51733c906b1e1815e4fb2cc645599b81a15a3cb0220fd9360bbc3f8e5fdab063c0050188c587e1448cac0629d96437181ddf86555165b79f812
+    REF v2.1.0
+    SHA512 dbc08c4f215a215ef77c9f61b01331e13709272b290c0e9859f72c4ed16e7dc108e368014c4cb82c0bbb1d2c6e07f416e93595ee6ff08af00225aa0a3630110b
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/cli/vcpkg.json b/external_imported/vcpkg/ports/cli/vcpkg.json
index 357e663da..daa01c258 100644
--- a/external_imported/vcpkg/ports/cli/vcpkg.json
+++ b/external_imported/vcpkg/ports/cli/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "cli",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "description": "A library for interactive command line interfaces in modern C++",
   "homepage": "https://github.com/daniele77/cli",
   "license": "BSL-1.0",
diff --git a/external_imported/vcpkg/ports/cli11/portfile.cmake b/external_imported/vcpkg/ports/cli11/portfile.cmake
index 9287115f2..8b246bee6 100644
--- a/external_imported/vcpkg/ports/cli11/portfile.cmake
+++ b/external_imported/vcpkg/ports/cli11/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO CLIUtils/CLI11
-    REF v2.3.1
-    SHA512 7805a3bff5ce443e93a005341680db1e618d5b0789a697daaac881f9ccac76f855ea3d43c9c5b13c33c2bf590138241df9e55d70e133562272f0859d8341af09
+    REF v2.4.0
+    SHA512 21c6e7861c5b5481079f78fd1585c77c7c73dd8f06a58a673922ee12fa0ffd2ba6c485de427a4e4ee3e5d710b8dc9483e70da0dc2a67c46d3fd77ebdfe300f79
     HEAD_REF main
 )
 
@@ -12,13 +12,14 @@ vcpkg_cmake_configure(
         -DCLI11_BUILD_EXAMPLES=OFF
         -DCLI11_BUILD_DOCS=OFF
         -DCLI11_BUILD_TESTS=OFF
+        -DCLI11_PRECOMPILED=ON
 )
 
 vcpkg_cmake_install()
 
 vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/CLI11)
 vcpkg_fixup_pkgconfig()
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
 
 # Handle copyright
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/external_imported/vcpkg/ports/cli11/vcpkg.json b/external_imported/vcpkg/ports/cli11/vcpkg.json
index 242eb42b9..7b48eb55d 100644
--- a/external_imported/vcpkg/ports/cli11/vcpkg.json
+++ b/external_imported/vcpkg/ports/cli11/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "cli11",
-  "version": "2.3.1",
+  "version": "2.4.0",
   "description": "CLI11 is a command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface.",
   "homepage": "https://github.com/CLIUtils/CLI11",
   "license": "BSD-3-Clause",
+  "supports": "!uwp",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/clickhouse-cpp/fix-deps-and-build-type.patch b/external_imported/vcpkg/ports/clickhouse-cpp/fix-deps-and-build-type.patch
index 25717855a..06d29de1b 100644
--- a/external_imported/vcpkg/ports/clickhouse-cpp/fix-deps-and-build-type.patch
+++ b/external_imported/vcpkg/ports/clickhouse-cpp/fix-deps-and-build-type.patch
@@ -1,88 +1,42 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 31cd8a5..d8ee404 100644
+index aed0d85..b5f36e2 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -29,11 +29,12 @@ PROJECT (CLICKHOUSE-CLIENT)
-     INCLUDE_DIRECTORIES (.)
-     INCLUDE_DIRECTORIES (contrib)
+@@ -63,21 +63,21 @@ PROJECT (CLICKHOUSE-CLIENT)
+     ENDIF ()
+ 
+     IF (WITH_SYSTEM_ABSEIL)
+-        FIND_PACKAGE(absl REQUIRED)
++        FIND_PACKAGE(absl CONFIG REQUIRED)
+     ELSE ()
+         INCLUDE_DIRECTORIES (contrib/absl)
+         SUBDIRS (contrib/absl/absl)
+     ENDIF ()
  
-+    find_package(absl CONFIG REQUIRED)
-+    find_package(cityhash CONFIG REQUIRED)
-+    find_package(lz4 CONFIG REQUIRED)
-+
-     SUBDIRS (
-         clickhouse
--        contrib/absl
--        contrib/cityhash
--        contrib/lz4
-     )
+     IF (WITH_SYSTEM_LZ4)
+-        FIND_PACKAGE(lz4 REQUIRED)
++        FIND_PACKAGE(lz4 CONFIG REQUIRED)
+     ELSE ()
+         INCLUDE_DIRECTORIES (contrib/lz4/lz4)
+         SUBDIRS (contrib/lz4/lz4)
+     ENDIF ()
  
-     IF (BUILD_BENCHMARK)
+     IF (WITH_SYSTEM_CITYHASH)
+-        FIND_PACKAGE(cityhash REQUIRED)
++        FIND_PACKAGE(cityhash CONFIG REQUIRED)
+     ELSE ()
+         INCLUDE_DIRECTORIES (contrib/cityhash/cityhash)
+         SUBDIRS (contrib/cityhash/cityhash)
 diff --git a/clickhouse/CMakeLists.txt b/clickhouse/CMakeLists.txt
-index d96ff88..ad1cb0d 100644
+index 67663ec..e67ba81 100644
 --- a/clickhouse/CMakeLists.txt
 +++ b/clickhouse/CMakeLists.txt
-@@ -36,19 +36,21 @@ IF (WITH_OPENSSL)
-     LIST(APPEND clickhouse-cpp-lib-src base/sslsocket.cpp)
- ENDIF ()
- 
--ADD_LIBRARY (clickhouse-cpp-lib SHARED ${clickhouse-cpp-lib-src})
--SET_TARGET_PROPERTIES(clickhouse-cpp-lib PROPERTIES LINKER_LANGUAGE CXX)
--TARGET_LINK_LIBRARIES (clickhouse-cpp-lib
--    absl-lib
--    cityhash-lib
--    lz4-lib
--)
--
--ADD_LIBRARY (clickhouse-cpp-lib-static STATIC ${clickhouse-cpp-lib-src})
--TARGET_LINK_LIBRARIES (clickhouse-cpp-lib-static
--    absl-lib
--    cityhash-lib
--    lz4-lib
-+set(LIB_NAME "")
-+
-+if(BUILD_SHARED_LIBS)
-+    ADD_LIBRARY (clickhouse-cpp-lib SHARED ${clickhouse-cpp-lib-src})
-+    SET_TARGET_PROPERTIES(clickhouse-cpp-lib PROPERTIES LINKER_LANGUAGE CXX)
-+    set(LIB_NAME "clickhouse-cpp-lib")
-+else()
-+    ADD_LIBRARY (clickhouse-cpp-lib-static STATIC ${clickhouse-cpp-lib-src})
-+    set(LIB_NAME "clickhouse-cpp-lib-static")
-+endif()
-+
-+TARGET_LINK_LIBRARIES ("${LIB_NAME}"
-+    absl::base absl::numeric
+@@ -42,7 +42,7 @@ ADD_LIBRARY (clickhouse-cpp-lib ${clickhouse-cpp-lib-src})
+ SET_TARGET_PROPERTIES (clickhouse-cpp-lib PROPERTIES LINKER_LANGUAGE CXX)
+ TARGET_LINK_LIBRARIES (clickhouse-cpp-lib
+     absl::int128
+-    cityhash::cityhash
 +    cityhash
-+    lz4::lz4
+     lz4::lz4
  )
- 
- IF (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-@@ -68,12 +70,11 @@ IF (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-         # /usr/bin/ld: CMakeFiles/simple-test.dir/main.cpp.o: undefined reference to symbol '_Unwind_Resume@@GCC_3.0'
-         # /usr/bin/ld: /lib/x86_64-linux-gnu/libgcc_s.so.1: error adding symbols: DSO missing from command line
-         # FIXME: that workaround breaks clang build on mingw
--        TARGET_LINK_LIBRARIES (clickhouse-cpp-lib gcc_s)
--        TARGET_LINK_LIBRARIES (clickhouse-cpp-lib-static gcc_s)
-+        TARGET_LINK_LIBRARIES (${LIB_NAME} gcc_s)
-     ENDIF ()
- ENDIF ()
- 
--INSTALL (TARGETS clickhouse-cpp-lib clickhouse-cpp-lib-static
-+INSTALL (TARGETS ${LIB_NAME}
-     ARCHIVE DESTINATION lib
-     LIBRARY DESTINATION lib
- )
-@@ -123,11 +124,9 @@ INSTALL(FILES types/type_parser.h DESTINATION include/clickhouse/types/)
- INSTALL(FILES types/types.h DESTINATION include/clickhouse/types/)
- 
- IF (WITH_OPENSSL)
--    TARGET_LINK_LIBRARIES (clickhouse-cpp-lib OpenSSL::SSL)
--    TARGET_LINK_LIBRARIES (clickhouse-cpp-lib-static OpenSSL::SSL)
-+    TARGET_LINK_LIBRARIES (${LIB_NAME} OpenSSL::SSL)
- ENDIF ()
- 
- IF (WIN32 OR MINGW)
--    TARGET_LINK_LIBRARIES (clickhouse-cpp-lib wsock32 ws2_32)
--    TARGET_LINK_LIBRARIES (clickhouse-cpp-lib-static wsock32 ws2_32)
-+    TARGET_LINK_LIBRARIES (${LIB_NAME} wsock32 ws2_32)
- ENDIF ()
+ TARGET_INCLUDE_DIRECTORIES (clickhouse-cpp-lib
diff --git a/external_imported/vcpkg/ports/clickhouse-cpp/fix-timeval.patch b/external_imported/vcpkg/ports/clickhouse-cpp/fix-timeval.patch
new file mode 100644
index 000000000..0e4e9a97f
--- /dev/null
+++ b/external_imported/vcpkg/ports/clickhouse-cpp/fix-timeval.patch
@@ -0,0 +1,17 @@
+diff --git a/clickhouse/base/socket.cpp b/clickhouse/base/socket.cpp
+index 48e90c7..73503fb 100644
+--- a/clickhouse/base/socket.cpp
++++ b/clickhouse/base/socket.cpp
+@@ -129,10 +129,10 @@ void SetNonBlock(SOCKET fd, bool value) {
+ 
+ void SetTimeout(SOCKET fd, const SocketTimeoutParams& timeout_params) {
+ #if defined(_unix_)
+-    timeval recv_timeout{ timeout_params.recv_timeout.count() / 1000, static_cast<int>(timeout_params.recv_timeout.count() % 1000 * 1000) };
++    timeval recv_timeout{ static_cast<time_t>(timeout_params.recv_timeout.count() / 1000), static_cast<suseconds_t>(timeout_params.recv_timeout.count() % 1000 * 1000) };
+     auto recv_ret = setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &recv_timeout, sizeof(recv_timeout));
+ 
+-    timeval send_timeout{ timeout_params.send_timeout.count() / 1000, static_cast<int>(timeout_params.send_timeout.count() % 1000 * 1000) };
++    timeval send_timeout{ static_cast<time_t>(timeout_params.send_timeout.count() / 1000), static_cast<suseconds_t>(timeout_params.send_timeout.count() % 1000 * 1000) };
+     auto send_ret = setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &send_timeout, sizeof(send_timeout));
+ 
+     if (recv_ret == -1 || send_ret == -1) {
diff --git a/external_imported/vcpkg/ports/clickhouse-cpp/fix-uwp.patch b/external_imported/vcpkg/ports/clickhouse-cpp/fix-uwp.patch
deleted file mode 100644
index 9de582c50..000000000
--- a/external_imported/vcpkg/ports/clickhouse-cpp/fix-uwp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/clickhouse/base/socket.cpp b/clickhouse/base/socket.cpp
-index c6dc920..43bbd02 100644
---- a/clickhouse/base/socket.cpp
-+++ b/clickhouse/base/socket.cpp
-@@ -27,7 +27,7 @@ char const* windowsErrorCategory::name() const noexcept {
- 
- std::string windowsErrorCategory::message(int c) const {
-     char error[UINT8_MAX];
--    auto len = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, nullptr, static_cast<DWORD>(c), 0, error, sizeof(error), nullptr);
-+    auto len = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, nullptr, static_cast<DWORD>(c), 0, error, sizeof(error), nullptr);
-     if (len == 0) {
-         return "unknown";
-     }
diff --git a/external_imported/vcpkg/ports/clickhouse-cpp/portfile.cmake b/external_imported/vcpkg/ports/clickhouse-cpp/portfile.cmake
index 4bee29618..175d04c50 100644
--- a/external_imported/vcpkg/ports/clickhouse-cpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/clickhouse-cpp/portfile.cmake
@@ -5,12 +5,12 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ClickHouse/clickhouse-cpp
-    REF v2.2.1
-    SHA512 cf9f14e6bdbf2b739a25004c8f30ef8057cf4afa618c91fc2672059869cbbbdafb72f3027863b3f731f7f2cc239d5690e5e87301bf7930b79fe71d7a4ae3f833
+    REF "v${VERSION}"
+    SHA512 6e6632084906699d3702bbe4c59d8db0c81934b60d2bb6bb427b25004fa36f4e2955a0d4a6cd45a48721f992a3d162d6569fb4c0a3d6787a98356e5d5319d9d4
     HEAD_REF master
     PATCHES
         fix-deps-and-build-type.patch
-        fix-uwp.patch
+        fix-timeval.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -20,7 +20,12 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS ${FEATURE_OPTIONS}
+    OPTIONS
+        ${FEATURE_OPTIONS}
+        -DWITH_SYSTEM_ABSEIL=ON
+        -DWITH_SYSTEM_LZ4=ON
+        -DWITH_SYSTEM_CITYHASH=ON
+        -DDEBUG_DEPENDENCIES=OFF
 )
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/clickhouse-cpp/vcpkg.json b/external_imported/vcpkg/ports/clickhouse-cpp/vcpkg.json
index 0664536ae..e83ea1a77 100644
--- a/external_imported/vcpkg/ports/clickhouse-cpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/clickhouse-cpp/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "clickhouse-cpp",
-  "version": "2.2.1",
+  "version": "2.5.1",
   "description": "C++ client for Yandex ClickHouse",
   "homepage": "https://github.com/ClickHouse/clickhouse-cpp",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/clipper2/portfile.cmake b/external_imported/vcpkg/ports/clipper2/portfile.cmake
index 21d96c21f..a61f4f268 100644
--- a/external_imported/vcpkg/ports/clipper2/portfile.cmake
+++ b/external_imported/vcpkg/ports/clipper2/portfile.cmake
@@ -6,16 +6,17 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO AngusJohnson/Clipper2
     REF "Clipper2_${VERSION}"
-    SHA512 e996ef8a2ec412189f0ba95a6f200c0818f9755930b05cd20b630d33760dec619c6a735ac056f5dfbaccf793bf6ebeb7b6c102fd9ff83b0d297a4d660389d8d9
+    SHA512 64028ab0610dc2b44e48a299d8498de59807f36d8471c4758e3bbf87de682b0d0a29d027a495f36dd5432737cedc44f09a8336f0d620846d58616244c72e226c
     HEAD_REF main
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}/CPP"
+    DISABLE_PARALLEL_CONFIGURE
     OPTIONS
         -DCLIPPER2_EXAMPLES=OFF
         -DCLIPPER2_TESTS=OFF
-        -DCLIPPER2_UTILS=OFF
+        -DCLIPPER2_UTILS=ON
 )
 vcpkg_cmake_install()
 vcpkg_fixup_pkgconfig()
diff --git a/external_imported/vcpkg/ports/clipper2/vcpkg.json b/external_imported/vcpkg/ports/clipper2/vcpkg.json
index 9ea89e780..2eafd25b4 100644
--- a/external_imported/vcpkg/ports/clipper2/vcpkg.json
+++ b/external_imported/vcpkg/ports/clipper2/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "clipper2",
-  "version": "1.1.1",
+  "version": "1.3.0",
   "port-version": 1,
   "description": "Polygon Clipping and Offsetting",
   "homepage": "http://www.angusj.com/clipper2",
diff --git a/external_imported/vcpkg/ports/cmakerc/portfile.cmake b/external_imported/vcpkg/ports/cmakerc/portfile.cmake
index 002728598..c24934439 100644
--- a/external_imported/vcpkg/ports/cmakerc/portfile.cmake
+++ b/external_imported/vcpkg/ports/cmakerc/portfile.cmake
@@ -3,11 +3,11 @@ set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO vector-of-bool/cmrc
-  REF 9a3396444e0478bd6f261075e74d1ecf70964029
-  SHA512 623ed673e70923fbbd242de35ef5c2ecedb50ce4dae5b94f028dcb3f4c3f69c585eb0e4dcebb7f96a7a0075ea2430cc3878975cba09142f5798db06678fe9295
+  REF 952ffddba731fc110bd50409e8d2b8a06abbd237
+  SHA512 e00ff1a4166f62f66effe324551f3c3225a7bf0416a693ca39b1d04fdf696c162466da18718b2c44f84227c17e82fa6ca50882d28bfd6e0147fa6741008e58e5
   HEAD_REF master
 )
 
 file(INSTALL "${SOURCE_PATH}/CMakeRC.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME cmakerc-config.cmake)
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/cmakerc/vcpkg.json b/external_imported/vcpkg/ports/cmakerc/vcpkg.json
index c87a9db87..06e4e29a0 100644
--- a/external_imported/vcpkg/ports/cmakerc/vcpkg.json
+++ b/external_imported/vcpkg/ports/cmakerc/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "cmakerc",
-  "version-date": "2022-09-08",
+  "version-date": "2023-07-24",
   "description": "A Resource Compiler in a Single CMake Script",
   "homepage": "https://github.com/vector-of-bool/cmrc",
   "license": "MIT"
diff --git a/external_imported/vcpkg/ports/cmark/portfile.cmake b/external_imported/vcpkg/ports/cmark/portfile.cmake
index b263deaca..352a6b50a 100644
--- a/external_imported/vcpkg/ports/cmark/portfile.cmake
+++ b/external_imported/vcpkg/ports/cmark/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO commonmark/cmark
-    REF 977b128291c0cf6c5053cdcf2ac72e627f09c105    #0.30.1
-    SHA512 ff8139fbb45549d6bea70e11c35ae1d8cf6108d0141688cc2b878afa6247147e0c15ac885e6ed8fa2263534dc79e88e398b30d3d3ae800f13dcdd878114adac8
+    REF "${VERSION}"
+    SHA512 27383bfef95ae1390c26aff0dd2cbca33704e7d20116bf29da4695d2c9a4146b86daba0da1e91bdb9eab95671702f885e832b3d31d51601731f1dc630df5237b
     HEAD_REF master
     PATCHES
         add-feature-tools.patch
@@ -11,10 +11,6 @@ vcpkg_from_github(
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CMARK_STATIC)
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" CMARK_SHARED)
 
-if ("tools" IN_LIST FEATURES AND VCPKG_TARGET_IS_UWP)
-    message(FATAL_ERROR "${PORT} does no support to build tools on UWP")
-endif()
-
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
         tools BUILD_TOOLS
diff --git a/external_imported/vcpkg/ports/cmark/vcpkg.json b/external_imported/vcpkg/ports/cmark/vcpkg.json
index bfb1999a6..4d14e47a5 100644
--- a/external_imported/vcpkg/ports/cmark/vcpkg.json
+++ b/external_imported/vcpkg/ports/cmark/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "cmark",
-  "version-semver": "0.30.1",
+  "version-semver": "0.30.3",
   "description": "CommonMark parsing and rendering library",
   "homepage": "https://github.com/commonmark/cmark",
   "dependencies": [
@@ -15,7 +15,8 @@
   ],
   "features": {
     "tools": {
-      "description": "Build tools"
+      "description": "Build tools",
+      "supports": "!uwp"
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/cmcstl2/portfile.cmake b/external_imported/vcpkg/ports/cmcstl2/portfile.cmake
deleted file mode 100644
index cba78839c..000000000
--- a/external_imported/vcpkg/ports/cmcstl2/portfile.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
-# header-only library
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO CaseyCarter/cmcstl2
-    REF cca84b9fd362ea37334ccbe09a66be4121768ac9
-    SHA512 a528dda26964a8c29f2bf7ddb24a861f337246e9ab2bda19f62d4ca107951aa77e37070623db3b5574973404ccf2f201bc2020654b3d53de36d8a22de521e5b9
-    HEAD_REF master
-)
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS
-        -DSTL2_BUILD_EXAMPLES=OFF
-        -DSTL2_BUILD_TESTING=OFF
-)
-
-vcpkg_cmake_install()
-
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib")
-
-# Handle copyright
-configure_file("${SOURCE_PATH}/LICENSE.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
diff --git a/external_imported/vcpkg/ports/cmcstl2/vcpkg.json b/external_imported/vcpkg/ports/cmcstl2/vcpkg.json
deleted file mode 100644
index d3834a132..000000000
--- a/external_imported/vcpkg/ports/cmcstl2/vcpkg.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "name": "cmcstl2",
-  "version-string": "2019-07-20",
-  "port-version": 2,
-  "description": "An implementation of C++ Extensions for Ranges",
-  "homepage": "https://github.com/CaseyCarter/cmcstl2",
-  "dependencies": [
-    {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
-    }
-  ]
-}
diff --git a/external_imported/vcpkg/ports/cminpack/portfile.cmake b/external_imported/vcpkg/ports/cminpack/portfile.cmake
index 0637dc65e..b34977db1 100644
--- a/external_imported/vcpkg/ports/cminpack/portfile.cmake
+++ b/external_imported/vcpkg/ports/cminpack/portfile.cmake
@@ -1,15 +1,26 @@
+# Must be removed on next release
+vcpkg_download_distfile(DLLEXPORT_PATCH
+    URLS https://github.com/devernay/cminpack/commit/0d40c5359674448aa6f78accaddca1d79befff1f.patch?full_index=1
+    FILENAME devernay-cminpack-pr-50-dllexport.patch
+    SHA512 558c21c4d43ff64a38945643810eafaee46c5f61c0e2a98931f9ba2283cf46e234a74f12ce6db4e64289de58f8da190af936f847f42636fd812fdf82ff733763
+)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO devernay/cminpack
     REF v1.3.8
     SHA512 0cab275074a31af69dbaf3ef6d41b20184c7cf9f33c78014a69ae7a022246fa79e7b4851341c6934ca1e749955b7e1096a40b4300a109ad64ebb1b2ea5d1d8ae
+    PATCHES
+        ${DLLEXPORT_PATCH}
 )
+vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" [[ STRING "CMinpack]] [[) # ("CMinpack]])
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DBUILD_EXAMPLES=OFF
         -DCMINPACK_LIB_INSTALL_DIR=lib
+        -DUSE_BLAS=OFF
 )
 
 vcpkg_cmake_install()
@@ -18,5 +29,16 @@ vcpkg_fixup_pkgconfig()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/cminpack-1/cminpack.h" [[!defined(CMINPACK_NO_DLL)]] 0)
+endif()
+if(NOT VCPKG_BUILD_TYPE)
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/cminpack.pc" "-lcminpack" "-lcminpack_d")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/cminpacks.pc" "-lcminpacks" "-lcminpacks_d")
+    if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/cminpackld.pc")
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/cminpackld.pc" "-lcminpackld" "-lcminpackld_d")
+    endif()
+endif()
+
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/CopyrightMINPACK.txt")
diff --git a/external_imported/vcpkg/ports/cminpack/vcpkg.json b/external_imported/vcpkg/ports/cminpack/vcpkg.json
index fc029f52d..d286b2062 100644
--- a/external_imported/vcpkg/ports/cminpack/vcpkg.json
+++ b/external_imported/vcpkg/ports/cminpack/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "cminpack",
   "version": "1.3.8",
-  "port-version": 2,
+  "port-version": 4,
   "description": "A C/C++ rewrite of the MINPACK software (originally in FORTRAN) for solving nonlinear equations and nonlinear least squares problems",
   "homepage": "http://devernay.free.fr/hacks/cminpack/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/cmocka/vcpkg.json b/external_imported/vcpkg/ports/cmocka/vcpkg.json
index 89e83af3c..dbc6fd5d7 100644
--- a/external_imported/vcpkg/ports/cmocka/vcpkg.json
+++ b/external_imported/vcpkg/ports/cmocka/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "cmocka",
-  "version-string": "2020-08-01",
-  "port-version": 2,
+  "version-date": "2020-08-01",
+  "port-version": 3,
   "description": "An elegant unit testing framework for C with support for mock objects",
   "homepage": "https://cmocka.org/",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/cnats/fix_install_path.patch b/external_imported/vcpkg/ports/cnats/fix_install_path.patch
new file mode 100644
index 000000000..15c8ab24b
--- /dev/null
+++ b/external_imported/vcpkg/ports/cnats/fix_install_path.patch
@@ -0,0 +1,28 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index b3f376c..8e6d06a 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -60,7 +60,10 @@ if(NATS_BUILD_LIB_SHARED)
+   target_include_directories(nats PUBLIC
+         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+         $<INSTALL_INTERFACE:include>)
+-  install(TARGETS nats EXPORT cnats-targets DESTINATION ${NATS_LIBDIR})
++  install(TARGETS nats EXPORT cnats-targets
++        ARCHIVE DESTINATION lib
++		LIBRARY DESTINATION lib
++		RUNTIME DESTINATION bin)
+   install(EXPORT cnats-targets
+         NAMESPACE cnats::
+         FILE cnats-targets.cmake
+@@ -72,7 +75,10 @@ if(NATS_BUILD_LIB_STATIC)
+   target_include_directories(nats_static PUBLIC
+         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+         $<INSTALL_INTERFACE:include>)
+-  install(TARGETS nats_static EXPORT cnats-targets ARCHIVE DESTINATION ${NATS_LIBDIR})
++  install(TARGETS nats_static EXPORT cnats-targets
++        ARCHIVE DESTINATION lib
++		LIBRARY DESTINATION lib
++		RUNTIME DESTINATION bin)
+   install(EXPORT cnats-targets
+         NAMESPACE cnats::
+         FILE cnats-targets.cmake
diff --git a/external_imported/vcpkg/ports/cnats/portfile.cmake b/external_imported/vcpkg/ports/cnats/portfile.cmake
index 0d10255a8..66cabd10d 100644
--- a/external_imported/vcpkg/ports/cnats/portfile.cmake
+++ b/external_imported/vcpkg/ports/cnats/portfile.cmake
@@ -1,11 +1,12 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO nats-io/nats.c
-    REF d832491e7c5b4a3793cfa83e1b342cb905c07c22 #v3.6.0
-    SHA512 7f58cdcf7945368f10410a73620685679dcd5cef14ccc85bbb8ff721ce934b380796e3a53e629e38ec19b7216922a0b96fd0a9c971cd65b5cfcd5241b656a441
-    HEAD_REF master
+    REF "v${VERSION}"
+    SHA512 0670a2b7fb70a49e2b1f5cbccf2406a3ecaf04b48b4147dc2ead9cb106f1673efa79b5e40d3bb557986ade35da2158b58b324603f98a58258a497dc57cb5d700
+    HEAD_REF main
     PATCHES
         fix-sodium-dep.patch
+        fix_install_path.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -74,5 +75,5 @@ vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
 
diff --git a/external_imported/vcpkg/ports/cnats/vcpkg.json b/external_imported/vcpkg/ports/cnats/vcpkg.json
index de28a2aef..1cbf12825 100644
--- a/external_imported/vcpkg/ports/cnats/vcpkg.json
+++ b/external_imported/vcpkg/ports/cnats/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "cnats",
-  "version": "3.6.0",
+  "version": "3.7.0",
+  "port-version": 1,
   "description": "A C client for the NATS messaging system",
   "homepage": "https://github.com/nats-io/nats.c",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/cnl/vcpkg.json b/external_imported/vcpkg/ports/cnl/vcpkg.json
index cf5d794ac..2078a2ec9 100644
--- a/external_imported/vcpkg/ports/cnl/vcpkg.json
+++ b/external_imported/vcpkg/ports/cnl/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "cnl",
-  "version-string": "1.1.7",
-  "port-version": 2,
+  "version": "1.1.7",
+  "port-version": 3,
   "description": "A Compositional Numeric Library for C++",
   "homepage": "https://github.com/johnmcfarlane/cnl",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/coin-or-cbc/disable_glpk.patch b/external_imported/vcpkg/ports/coin-or-cbc/disable_glpk.patch
new file mode 100644
index 000000000..187858079
--- /dev/null
+++ b/external_imported/vcpkg/ports/coin-or-cbc/disable_glpk.patch
@@ -0,0 +1,14 @@
+diff --git a/src/CbcSolver.cpp b/src/CbcSolver.cpp
+index 93da884..1c9d463 100644
+--- a/src/CbcSolver.cpp
++++ b/src/CbcSolver.cpp
+@@ -32,6 +32,9 @@
+ void CbcCrashHandler(int sig);
+ #endif
+ 
++// glpk currently not supported
++#undef COINUTILS_HAS_GLPK
++
+ #ifdef COINUTILS_HAS_GLPK
+ #include "glpk.h"
+ #endif
diff --git a/external_imported/vcpkg/ports/coin-or-cbc/pkgconf_win.patch b/external_imported/vcpkg/ports/coin-or-cbc/pkgconf_win.patch
new file mode 100644
index 000000000..a498394d1
--- /dev/null
+++ b/external_imported/vcpkg/ports/coin-or-cbc/pkgconf_win.patch
@@ -0,0 +1,13 @@
+diff --git a/configure b/configure
+index 3a63499..2d12129 100755
+--- a/configure
++++ b/configure
+@@ -17932,8 +17932,6 @@ fi
+ 
+   COIN_PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
+ 
+-
+-  COIN_PKG_CONFIG_PATH="${expanded_libdir}/pkgconfig:${COIN_PKG_CONFIG_PATH}"
+   if test -n "$PKG_CONFIG"; then
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $PKG_CONFIG path is \"$COIN_PKG_CONFIG_PATH\"" >&5
+ printf "%s\n" "$as_me: $PKG_CONFIG path is \"$COIN_PKG_CONFIG_PATH\"" >&6;}
diff --git a/external_imported/vcpkg/ports/coin-or-cbc/portfile.cmake b/external_imported/vcpkg/ports/coin-or-cbc/portfile.cmake
new file mode 100644
index 000000000..721828b0b
--- /dev/null
+++ b/external_imported/vcpkg/ports/coin-or-cbc/portfile.cmake
@@ -0,0 +1,39 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO coin-or/Cbc
+    REF 6f83969e50b6f67c60654704c1f71f970c621a3b
+    SHA512 f56b5806b2acffe7259410254640009f9b7a27713972d771b1083a05ca197a65715b007f42f0b8bf6e87b2a889e2889a7466222e0b06f01a4c5297cbaf455c4d
+    PATCHES
+        pkgconf_win.patch
+        disable_glpk.patch
+)
+
+file(COPY "${CURRENT_INSTALLED_DIR}/share/coin-or-buildtools/" DESTINATION "${SOURCE_PATH}")
+
+set(ENV{ACLOCAL} "aclocal -I \"${SOURCE_PATH}/BuildTools\"")
+
+vcpkg_configure_make(
+    SOURCE_PATH "${SOURCE_PATH}"
+    DETERMINE_BUILD_TRIPLET
+    USE_WRAPPERS
+    OPTIONS
+        --with-coinutils
+        --with-clp
+        --with-cgl
+        --with-osi
+        --without-ositests
+        --without-sample
+        --without-netlib
+        --without-miplib3
+        --enable-relocatable
+        --disable-readline
+)
+
+vcpkg_install_make()
+vcpkg_copy_pdbs()
+vcpkg_fixup_pkgconfig()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/coin-or-cbc/vcpkg.json b/external_imported/vcpkg/ports/coin-or-cbc/vcpkg.json
new file mode 100644
index 000000000..912514935
--- /dev/null
+++ b/external_imported/vcpkg/ports/coin-or-cbc/vcpkg.json
@@ -0,0 +1,13 @@
+{
+  "name": "coin-or-cbc",
+  "version-date": "2023-02-01",
+  "description": "Cbc (Coin-or branch and cut) is an open-source mixed integer linear programming solver written in C++.",
+  "homepage": "https://github.com/coin-or/Cbc",
+  "license": "EPL-2.0",
+  "dependencies": [
+    "coin-or-cgl",
+    "coin-or-clp",
+    "coin-or-osi",
+    "coinutils"
+  ]
+}
diff --git a/external_imported/vcpkg/ports/coin/disable-cpackd.patch b/external_imported/vcpkg/ports/coin/disable-cpackd.patch
deleted file mode 100644
index 81afeb668..000000000
--- a/external_imported/vcpkg/ports/coin/disable-cpackd.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f32f6ffe3..639fc4109 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -815,4 +815,4 @@ endif()
- 
- # ############################################################################
- # New CPACK section, please see the README file inside cpack.d directory.
--add_subdirectory(cpack.d)
-+#add_subdirectory(cpack.d)
diff --git a/external_imported/vcpkg/ports/coin/portfile.cmake b/external_imported/vcpkg/ports/coin/portfile.cmake
index c14bf027b..020b449ec 100644
--- a/external_imported/vcpkg/ports/coin/portfile.cmake
+++ b/external_imported/vcpkg/ports/coin/portfile.cmake
@@ -1,11 +1,26 @@
+if(NOT VCPKG_HOST_IS_WINDOWS)
+    message(WARNING "${PORT} currently requires the following programs from the system package manager:
+    libgl libglu
+On Debian and Ubuntu derivatives:
+    sudo apt-get install libgl-dev libglu1-mesa-dev
+On CentOS and recent Red Hat derivatives:
+    yum install mesa-libGL-devel mesa-libGLU-devel
+On Fedora derivatives:
+    sudo dnf install mesa-libGL-devel mesa-libGLU-devel
+On Arch Linux and derivatives:
+    sudo pacman -S gl glu
+On Alpine:
+    apk add gl glu\n")
+endif()
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Coin3D/coin
-    REF Coin-4.0.0
-    SHA512 8a0289cab3e02a7417022fe659ec30a2dd705b9bacb254e0269ada9155c76c6aea0285c475cd6e663f5d7f2b49e60244b16baac7188d57e3d7f8ab08d228f21f
+    REF "v${VERSION}"
+    SHA512 f913f1b1ec5819d72e054dc94702effe9ee2a28547fc9bebc2f6b2e55d8a67c6cfa05e43239461e806cbead0a7548f82b31d5b86181eed4ffc5c801d3b94aa67
     HEAD_REF master
     PATCHES
-        disable-cpackd.patch
+        remove-default-config.patch
 )
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
@@ -23,6 +38,7 @@ endif()
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
+        -DCMAKE_CXX_STANDARD=11 # Boost v1.84.0 libraries require C++11
         -DCOIN_BUILD_DOCUMENTATION=OFF
         -DCOIN_BUILD_MSVC_STATIC_RUNTIME=${COIN_BUILD_MSVC_STATIC_RUNTIME}
         -DCOIN_BUILD_SHARED_LIBS=${COIN_BUILD_SHARED_LIBS}
@@ -31,9 +47,9 @@ vcpkg_cmake_configure(
 
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Coin-4.0.0)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Coin-${VERSION})
 
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
diff --git a/external_imported/vcpkg/ports/coin/remove-default-config.patch b/external_imported/vcpkg/ports/coin/remove-default-config.patch
new file mode 100644
index 000000000..b10f1ec6e
--- /dev/null
+++ b/external_imported/vcpkg/ports/coin/remove-default-config.patch
@@ -0,0 +1,13 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -395,8 +395,8 @@
+     configure_file("${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.pc.cmake.in" "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc" @ONLY)
+     install(FILES "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+     install(PROGRAMS "${CMAKE_SOURCE_DIR}/bin/coin-config" DESTINATION ${CMAKE_INSTALL_BINDIR})
+-    configure_file("${CMAKE_SOURCE_DIR}/coin.cfg.cmake.in" "${CMAKE_BINARY_DIR}/${PROJECT_NAME_LOWER}-default.cfg" @ONLY)
+-    install(FILES "${CMAKE_BINARY_DIR}/${PROJECT_NAME_LOWER}-default.cfg" DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Coin/conf)
++    #configure_file("${CMAKE_SOURCE_DIR}/coin.cfg.cmake.in" "${CMAKE_BINARY_DIR}/${PROJECT_NAME_LOWER}-default.cfg" @ONLY)
++    #install(FILES "${CMAKE_BINARY_DIR}/${PROJECT_NAME_LOWER}-default.cfg" DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Coin/conf)
+   endif()
+ endif()
+ 
diff --git a/external_imported/vcpkg/ports/coin/vcpkg.json b/external_imported/vcpkg/ports/coin/vcpkg.json
index 793206c54..a41b70c96 100644
--- a/external_imported/vcpkg/ports/coin/vcpkg.json
+++ b/external_imported/vcpkg/ports/coin/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "coin",
-  "version-string": "4.0.0",
-  "port-version": 6,
+  "version": "4.0.2",
+  "port-version": 2,
   "description": "A high-level 3D visualization library with Open Inventor 2.1 API",
   "homepage": "https://github.com/coin3d/coin",
+  "license": "BSD-3-Clause",
   "supports": "!(arm | arm64 | uwp)",
   "dependencies": [
     "boost-assert",
diff --git a/external_imported/vcpkg/ports/coinutils/portfile.cmake b/external_imported/vcpkg/ports/coinutils/portfile.cmake
index bdb8320d2..fa7bbef6a 100644
--- a/external_imported/vcpkg/ports/coinutils/portfile.cmake
+++ b/external_imported/vcpkg/ports/coinutils/portfile.cmake
@@ -11,12 +11,18 @@ file(COPY "${CURRENT_INSTALLED_DIR}/share/coin-or-buildtools/" DESTINATION "${SO
 set(ENV{ACLOCAL} "aclocal -I \"${SOURCE_PATH}/BuildTools\"")
 
 #--enable-msvc
+set(options "")
+if("glpk" IN_LIST FEATURES)
+    list(APPEND options "--with-glpk")
+else()
+    list(APPEND options "--without-glpk")
+endif()
 
 vcpkg_configure_make(
     SOURCE_PATH "${SOURCE_PATH}"
     AUTOCONFIG
     OPTIONS
-        --with-glpk
+        ${options}
         --with-lapack
         --without-netlib
         --without-sample
diff --git a/external_imported/vcpkg/ports/coinutils/vcpkg.json b/external_imported/vcpkg/ports/coinutils/vcpkg.json
index 7def66898..f55e69544 100644
--- a/external_imported/vcpkg/ports/coinutils/vcpkg.json
+++ b/external_imported/vcpkg/ports/coinutils/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "coinutils",
   "version-date": "2023-02-02",
+  "port-version": 1,
   "description": "CoinUtils (Coin-or Utilities) is an open-source collection of classes and functions that are generally useful to more than one COIN-OR project",
   "homepage": "https://www.coin-or.org/",
   "license": "EPL-2.0",
@@ -8,8 +9,18 @@
   "dependencies": [
     "bzip2",
     "coin-or-buildtools",
-    "glpk",
     "lapack",
     "zlib"
-  ]
+  ],
+  "features": {
+    "glpk": {
+      "description": "Build with Glpk",
+      "dependencies": [
+        {
+          "name": "glpk",
+          "default-features": false
+        }
+      ]
+    }
+  }
 }
diff --git a/external_imported/vcpkg/ports/collada-dom/use-vcpkg-minizip.patch b/external_imported/vcpkg/ports/collada-dom/use-vcpkg-minizip.patch
index daaaf0f48..61a595c16 100644
--- a/external_imported/vcpkg/ports/collada-dom/use-vcpkg-minizip.patch
+++ b/external_imported/vcpkg/ports/collada-dom/use-vcpkg-minizip.patch
@@ -1,13 +1,43 @@
-diff --git a/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp b/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp
-index 4536275..77651f9 100644
---- a/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp
-+++ b/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp
-@@ -32,7 +32,7 @@
- #include <iomanip>
- using namespace std;
- 
--#include <zip.h> // for saving compressed files
-+#include <minizip/zip.h> // for saving compressed files
- #ifdef _WIN32
- #include <iowin32.h>
- #else
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f6c2bb6..3351ab0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -222,7 +222,8 @@ else()
+   endif()
+ endif()
+ 
+-pkg_check_modules(minizip minizip)
++find_package(minizip NAMES unofficial-minizip REQUIRED)
++add_library(minizip ALIAS unofficial::minizip::minizip)
+ if(minizip_FOUND)
+   set(MINIZIP_INCLUDE_DIR ${minizip_INCLUDE_DIRS})
+ else()
+diff --git a/dom/include/dae/daeZAEUncompressHandler.h b/dom/include/dae/daeZAEUncompressHandler.h
+index e9b0e9e..3d120da 100644
+--- a/dom/include/dae/daeZAEUncompressHandler.h
++++ b/dom/include/dae/daeZAEUncompressHandler.h
+@@ -9,7 +9,7 @@
+ #ifndef __DAE_ZAE_UNCOMPRESS_HANDLER_H__
+ #define __DAE_ZAE_UNCOMPRESS_HANDLER_H__
+
+-#include <unzip.h>
++#include <../minizip/unzip.h>
+ #include <libxml/xmlreader.h>
+ #include <dae/daeURI.h>
+
+diff --git a/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp b/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp
+index 4536275..2666959 100644
+--- a/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp
++++ b/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp
+@@ -32,9 +32,9 @@
+ #include <iomanip>
+ using namespace std;
+
+-#include <zip.h> // for saving compressed files
++#include <../minizip/zip.h> // for saving compressed files
+ #ifdef _WIN32
+-#include <iowin32.h>
++#include <../minizip/iowin32.h>
+ #else
+ #include <unistd.h>
+ #endif
diff --git a/external_imported/vcpkg/ports/collada-dom/vcpkg.json b/external_imported/vcpkg/ports/collada-dom/vcpkg.json
index 619cdfd44..181d60192 100644
--- a/external_imported/vcpkg/ports/collada-dom/vcpkg.json
+++ b/external_imported/vcpkg/ports/collada-dom/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "collada-dom",
   "version": "2.5.0",
-  "port-version": 8,
+  "port-version": 10,
   "description": "The COLLADA Document Object Model (DOM) is an application programming interface (API) that provides a C++ object representation of a COLLADA XML instance document.",
   "homepage": "https://github.com/rdiankov/collada-dom",
   "license": null,
diff --git a/external_imported/vcpkg/ports/colmap/fix-dependencies.patch b/external_imported/vcpkg/ports/colmap/fix-dependencies.patch
deleted file mode 100644
index 89004eb4a..000000000
--- a/external_imported/vcpkg/ports/colmap/fix-dependencies.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2a9724e..95d4d7e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -99,12 +99,14 @@ find_package(Boost REQUIRED COMPONENTS
- 
- find_package(Eigen3 REQUIRED)
- 
--find_package(FreeImage REQUIRED)
-+find_package(FreeImage CONFIG REQUIRED)
-+set(FREEIMAGE_LIBRARIES freeimage::FreeImage)
- 
- find_package(FLANN REQUIRED)
- find_package(LZ4 REQUIRED)
- 
--find_package(Metis REQUIRED)
-+find_package(metis CONFIG REQUIRED)
-+set(METIS_LIBRARIES metis)
- 
- find_package(Glog REQUIRED)
- 
diff --git a/external_imported/vcpkg/ports/colmap/portfile.cmake b/external_imported/vcpkg/ports/colmap/portfile.cmake
index 399f54daa..e54cbdafc 100644
--- a/external_imported/vcpkg/ports/colmap/portfile.cmake
+++ b/external_imported/vcpkg/ports/colmap/portfile.cmake
@@ -1,13 +1,11 @@
-set(COLMAP_REF "30da037ce19bdceb6d239c45342fadb221bdabb2") # 3.8 with bugfixes
+set(COLMAP_REF "9c704e89ff0a80e797725e112011f9f69e5aa28f") # Oct 1, 2023
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO colmap/colmap
     REF "${COLMAP_REF}"
-    SHA512 2aad3c39efee025bebdbec41215f32968c3a63e160f9e7de0a6a2bf2d2c96bb1c20af0e10173d1d81ed4712e58fd97e7c8aabef8f9c47cc542d89b14c6ae420d
-    HEAD_REF dev
-    PATCHES
-        fix-dependencies.patch
+    SHA512 6ece735c403304c14887cd9b2b13a7e36bf07155fa959748c09d74854e0da6338766c11e6a371c26f983ccdb29f93b2600d685c907a5a137fe20d798b26805d8
+    HEAD_REF main
 )
 
 if (NOT TRIPLET_SYSTEM_ARCH STREQUAL "x64" AND ("cuda" IN_LIST FEATURES OR "cuda-redist" IN_LIST FEATURES))
@@ -74,7 +72,6 @@ file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/debug/include"
     "${CURRENT_PACKAGES_DIR}/debug/share"
     "${CURRENT_PACKAGES_DIR}/include/colmap/exe"
-    "${CURRENT_PACKAGES_DIR}/include/colmap/lib/Graclus/multilevelLib"
     "${CURRENT_PACKAGES_DIR}/include/colmap/tools"
     "${CURRENT_PACKAGES_DIR}/include/colmap/ui/media"
     "${CURRENT_PACKAGES_DIR}/include/colmap/ui/shaders"
diff --git a/external_imported/vcpkg/ports/colmap/usage b/external_imported/vcpkg/ports/colmap/usage
index b71316b3c..75f933163 100644
--- a/external_imported/vcpkg/ports/colmap/usage
+++ b/external_imported/vcpkg/ports/colmap/usage
@@ -7,4 +7,4 @@ For example, under Windows, execute COLMAP as:
 The package colmap provides CMake integration:
 
     find_package(COLMAP REQUIRED)
-    target_link_libraries(main ${COLMAP_LIBRARIES})
+    target_link_libraries(main colmap::colmap)
diff --git a/external_imported/vcpkg/ports/colmap/vcpkg.json b/external_imported/vcpkg/ports/colmap/vcpkg.json
index 31e25785d..8ce753f8b 100644
--- a/external_imported/vcpkg/ports/colmap/vcpkg.json
+++ b/external_imported/vcpkg/ports/colmap/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "colmap",
-  "version-date": "2023-03-12",
+  "version-date": "2023-10-01",
   "description": "COLMAP is a general-purpose Structure-from-Motion (SfM) and Multi-View Stereo (MVS) pipeline with a graphical and command-line interface. It offers a wide range of features for reconstruction of ordered and unordered image collections. The software is licensed under the new BSD license.",
   "homepage": "https://colmap.github.io/",
   "license": "BSD-3-Clause",
+  "supports": "(linux | (windows & !static) | osx) & (x86 | x64)",
   "dependencies": [
     "boost-filesystem",
     "boost-graph",
@@ -17,12 +18,7 @@
         "suitesparse"
       ]
     },
-    {
-      "name": "cgal",
-      "features": [
-        "qt"
-      ]
-    },
+    "cgal",
     "eigen3",
     "flann",
     "freeimage",
@@ -31,7 +27,6 @@
     "glog",
     "qt5-base",
     "sqlite3",
-    "suitesparse",
     {
       "name": "vcpkg-cmake",
       "host": true
@@ -55,7 +50,10 @@
       ]
     },
     "tests": {
-      "description": "Build all tests."
+      "description": "Build all tests.",
+      "dependencies": [
+        "gtest"
+      ]
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/concurrencpp/fix-include-path.patch b/external_imported/vcpkg/ports/concurrencpp/fix-include-path.patch
index 7b2da1920..798425597 100644
--- a/external_imported/vcpkg/ports/concurrencpp/fix-include-path.patch
+++ b/external_imported/vcpkg/ports/concurrencpp/fix-include-path.patch
@@ -1,13 +1,12 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 351aa65..ab06584 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -94,7 +94,7 @@ include(CMakePackageConfigHelpers)
+@@ -117,7 +117,7 @@ include(CMakePackageConfigHelpers)
  include(GNUInstallDirs)
  
  set(concurrencpp_directory "concurrencpp-${PROJECT_VERSION}")
 -set(concurrencpp_include_directory "${CMAKE_INSTALL_INCLUDEDIR}/${concurrencpp_directory}")
 +set(concurrencpp_include_directory "${CMAKE_INSTALL_INCLUDEDIR}")
  
- install(TARGETS concurrencpp
-         EXPORT concurrencppTargets
+ install(
+   TARGETS concurrencpp
diff --git a/external_imported/vcpkg/ports/concurrencpp/portfile.cmake b/external_imported/vcpkg/ports/concurrencpp/portfile.cmake
index ef456748f..fee98b37a 100644
--- a/external_imported/vcpkg/ports/concurrencpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/concurrencpp/portfile.cmake
@@ -1,10 +1,8 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO David-Haim/concurrencpp
-  REF v.0.1.5
-  SHA512 94f2c4896e3455284874ea1dc7b4a836a5dd634b15b8582e90eaa7b4200e992f7744f025fac2cdb15471da104b40da97072b05bbe6eebecd0146622b747120ca
+  REF "v.${VERSION}"
+  SHA512 b87a6bd0593d6a7d35f911a0a9835e1afe416aa25d06e4d448789617c94ec2faeb5df07d68d5ccc7e986009f09016f90ef57016b1aabe567996d3ad9816add4c
   HEAD_REF master
   PATCHES
     fix-include-path.patch
@@ -18,6 +16,6 @@ vcpkg_cmake_install()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/concurrencpp-0.1.5)
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/concurrencpp-${VERSION}")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/external_imported/vcpkg/ports/concurrencpp/vcpkg.json b/external_imported/vcpkg/ports/concurrencpp/vcpkg.json
index 3d27706ab..2a4d97958 100644
--- a/external_imported/vcpkg/ports/concurrencpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/concurrencpp/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "concurrencpp",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "concurrencpp is a tasking library for C++ allowing developers to write highly concurrent applications easily and safely by using tasks, executors and coroutines.",
   "homepage": "https://github.com/David-Haim/concurrencpp/",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/concurrentqueue/portfile.cmake b/external_imported/vcpkg/ports/concurrentqueue/portfile.cmake
index f57059413..17f419072 100644
--- a/external_imported/vcpkg/ports/concurrentqueue/portfile.cmake
+++ b/external_imported/vcpkg/ports/concurrentqueue/portfile.cmake
@@ -1,9 +1,10 @@
 # header-only library
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO cameron314/concurrentqueue
-    REF 3747268264d0fa113e981658a99ceeae4dad05b7#  v1.0.3
-    SHA512 798d61e8e5b87cd1870df20410db18e2fcbc5e4e1d849308663cc0403a0d50d29b72428fc0a39231ae8bcb460c946559bde0f2d22584c335fe849cbcbe607ec2
+    REF v${VERSION}
+    SHA512 a27306d1a7ad725daf5155a8e33a93efd29839708b2147ba703d036c4a92e04cbd8a505d804d2596ccb4dd797e88aca030b1cb34a4eaf09c45abb0ab55e604ea
     HEAD_REF master
 )
 
@@ -26,4 +27,5 @@ configure_file(
 
 file(GLOB HEADER_FILES "${SOURCE_PATH}/*.h")
 file(INSTALL ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}")
-file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
\ No newline at end of file
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
diff --git a/external_imported/vcpkg/ports/concurrentqueue/vcpkg.json b/external_imported/vcpkg/ports/concurrentqueue/vcpkg.json
index 25b733d69..3572aede2 100644
--- a/external_imported/vcpkg/ports/concurrentqueue/vcpkg.json
+++ b/external_imported/vcpkg/ports/concurrentqueue/vcpkg.json
@@ -1,9 +1,9 @@
 {
   "name": "concurrentqueue",
-  "version": "1.0.3",
-  "port-version": 1,
+  "version": "1.0.4",
   "description": "A fast multi-producer, multi-consumer lock-free concurrent queue for C++11",
   "homepage": "https://github.com/cameron314/concurrentqueue",
+  "license": "BSD-2-Clause OR BSL-1.0",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/configcat/portfile.cmake b/external_imported/vcpkg/ports/configcat/portfile.cmake
index 5b1b085cc..f0390f220 100644
--- a/external_imported/vcpkg/ports/configcat/portfile.cmake
+++ b/external_imported/vcpkg/ports/configcat/portfile.cmake
@@ -6,14 +6,20 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO configcat/cpp-sdk
     REF "v${VERSION}"
-    SHA512 1c36121467df1567d3f83efe176a45adf1415fb0e62b3f6fda79d8249422010b80b8b3e1cb345166718b94171bf614693856caf1af8b9a49d4e9b89618fb008d
+    SHA512 a71706978b0a4e7b4bce7f194910b75221bc6483d38f7cda9d004abdf41dcdd97aa2754977e641c888065f3aeacd6e7e0893e5de1c9417a3d466a977a1dbb287
     HEAD_REF master
 )
 
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    INVERTED_FEATURES
+        network CONFIGCAT_USE_EXTERNAL_NETWORK_ADAPTER
+)
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DCONFIGCAT_BUILD_TESTS=OFF
+        ${FEATURE_OPTIONS}
 )
 vcpkg_cmake_install()
 
diff --git a/external_imported/vcpkg/ports/configcat/vcpkg.json b/external_imported/vcpkg/ports/configcat/vcpkg.json
index 597a2a8c7..da1ccd611 100644
--- a/external_imported/vcpkg/ports/configcat/vcpkg.json
+++ b/external_imported/vcpkg/ports/configcat/vcpkg.json
@@ -1,11 +1,10 @@
 {
   "name": "configcat",
-  "version": "2.0.1",
+  "version": "3.2.0",
   "description": "ConfigCat SDK for C++ provides easy integration for your application to ConfigCat. ConfigCat is a feature flag and configuration management service that lets you separate feature releases from deployments. Alternative to LaunchDarkly.",
   "homepage": "https://configcat.com/",
   "license": "MIT",
   "dependencies": [
-    "cpr",
     "hash-library",
     "nlohmann-json",
     {
@@ -17,5 +16,26 @@
       "host": true
     },
     "z4kn4fein-semver"
-  ]
+  ],
+  "default-features": [
+    "network"
+  ],
+  "features": {
+    "network": {
+      "description": "Use built-in curl network adapter",
+      "dependencies": [
+        {
+          "name": "curl",
+          "default-features": false,
+          "features": [
+            "ssl"
+          ]
+        },
+        {
+          "name": "openssl",
+          "platform": "linux"
+        }
+      ]
+    }
+  }
 }
diff --git a/external_imported/vcpkg/ports/constexpr-contracts/vcpkg.json b/external_imported/vcpkg/ports/constexpr-contracts/vcpkg.json
index 4533217c0..5a4e0d75e 100644
--- a/external_imported/vcpkg/ports/constexpr-contracts/vcpkg.json
+++ b/external_imported/vcpkg/ports/constexpr-contracts/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "constexpr-contracts",
-  "version-string": "2020-08-09",
-  "port-version": 2,
+  "version-date": "2020-08-09",
+  "port-version": 3,
   "description": "A constexpr-friendly, optimisation-friendly contracts library.",
   "homepage": "https://github.com/cjdb/constexpr-contracts",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/continuable/portfile.cmake b/external_imported/vcpkg/ports/continuable/portfile.cmake
index de542dcfd..23498ccb1 100644
--- a/external_imported/vcpkg/ports/continuable/portfile.cmake
+++ b/external_imported/vcpkg/ports/continuable/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Naios/continuable
-    REF 4.2.0
-    SHA512 c6b6aef0299d8dd548c3a283fdc436065da13446f965b45210dd998bbe1494776f2c005e7cb7eadc5e23a1f339e6c9124eda18e550bed646df5a0fd2aa92a24d
+    REF "${VERSION}"
+    SHA512 069b1fe37d5dd3495639942af40b9d5fe90408ee0f92f61e85c8aab3e1132300eb75df216a84595cb05c35e0fcb1b789fda4dae3fd2b263ac70910f5374536cc
     HEAD_REF master
     PATCHES
         fix-cmakelists.patch
diff --git a/external_imported/vcpkg/ports/continuable/vcpkg.json b/external_imported/vcpkg/ports/continuable/vcpkg.json
index 1fc587b95..8ed3a9eea 100644
--- a/external_imported/vcpkg/ports/continuable/vcpkg.json
+++ b/external_imported/vcpkg/ports/continuable/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "continuable",
-  "version": "4.2.0",
+  "version": "4.2.2",
   "description": "C++14 asynchronous allocation aware futures (supporting then, exception handling, coroutines and connections)",
   "homepage": "https://naios.github.io/continuable/",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/coolprop/cmake-project-include.cmake b/external_imported/vcpkg/ports/coolprop/cmake-project-include.cmake
new file mode 100644
index 000000000..4002296db
--- /dev/null
+++ b/external_imported/vcpkg/ports/coolprop/cmake-project-include.cmake
@@ -0,0 +1,3 @@
+if(MSVC)
+    add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+endif()
diff --git a/external_imported/vcpkg/ports/coolprop/fix-builderror.patch b/external_imported/vcpkg/ports/coolprop/fix-builderror.patch
index 432f4e18c..de07acb30 100644
--- a/external_imported/vcpkg/ports/coolprop/fix-builderror.patch
+++ b/external_imported/vcpkg/ports/coolprop/fix-builderror.patch
@@ -1,3 +1,15 @@
+diff --git a/include/CPmsgpack.h b/include/CPmsgpack.h
+index e11f6be..948cc65 100644
+--- a/include/CPmsgpack.h
++++ b/include/CPmsgpack.h
+@@ -6,7 +6,6 @@
+ 
+ // Workaround MSVC endiannes issues
+ #if defined(_MSC_VER) && ( defined(_M_ARM) || defined(_M_ARM64) )
+-#    define MSGPACK_ENDIAN_LITTLE_BYTE
+ #endif
+ 
+ #include "msgpack.hpp"
 diff --git a/src/ODEIntegrators.cpp b/src/ODEIntegrators.cpp
 index 23bd4c4..beab710 100644
 --- a/src/ODEIntegrators.cpp
diff --git a/external_imported/vcpkg/ports/coolprop/fix-dependency.patch b/external_imported/vcpkg/ports/coolprop/fix-dependency.patch
index 7eed56f45..e89ccba46 100644
--- a/external_imported/vcpkg/ports/coolprop/fix-dependency.patch
+++ b/external_imported/vcpkg/ports/coolprop/fix-dependency.patch
@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 414f380..619dfeb 100644
+index 7bbf8d6..617ac93 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -247,13 +247,10 @@ list(REMOVE_ITEM APP_SOURCES
@@ -14,9 +14,9 @@ index 414f380..619dfeb 100644
 -list(APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/externals/fmtlib"
 -)# should be deprecated
 +find_package(Eigen3 CONFIG REQUIRED)
-+find_package(msgpack CONFIG REQUIRED)
++find_package(msgpack-cxx CONFIG REQUIRED)
 +find_package(fmt CONFIG REQUIRED)
-+link_libraries(Eigen3::Eigen fmt::fmt msgpackc-cxx)
++link_libraries(Eigen3::Eigen msgpack-cxx fmt::fmt)
  list(APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/include")
  list(APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/src")
  
diff --git a/external_imported/vcpkg/ports/coolprop/fmt-fix.patch b/external_imported/vcpkg/ports/coolprop/fmt-fix.patch
index 1d5cc4778..805437741 100644
--- a/external_imported/vcpkg/ports/coolprop/fmt-fix.patch
+++ b/external_imported/vcpkg/ports/coolprop/fmt-fix.patch
@@ -1,5 +1,5 @@
 diff --git a/include/CPstrings.h b/include/CPstrings.h
-index 711981c..9d379d2 100644
+index 711981cd..fda2f055 100644
 --- a/include/CPstrings.h
 +++ b/include/CPstrings.h
 @@ -6,6 +6,8 @@
@@ -11,30 +11,146 @@ index 711981c..9d379d2 100644
  
  #if !defined(NO_FMTLIB)
  #    ifndef FMT_HEADER_ONLY
-@@ -14,9 +16,6 @@
- #    include "fmt/format.h"  // For addition of the string formatting functions and macros from fmtlib
- #    include "fmt/printf.h"  // For sprintf
- #    undef FMT_HEADER_ONLY
--#else
--#    include <vector>
--#    include <string>
- #endif
- 
- #include "Exceptions.h"
-@@ -75,11 +74,12 @@ inline bool endswith(const std::string& s1, const std::string& s2) {
+@@ -74,17 +76,16 @@ inline bool endswith(const std::string& s1, const std::string& s2) {
+ #if defined(NO_FMTLIB)
  // Missing string formatting function, this old guy is needed for ancient gcc compilers on PowerPC for VxWorks
  inline std::string format(const char* fmt, ...);
++#elif FMT_VERSION >= 50000
++template <typename... Args>
++inline std::string format(const char* format_str, const Args&... args) {
++    return fmt::sprintf(format_str, args...);
++}
  #else
 -// Missing std::string formatting function - provided by the fmtlib library
--inline std::string format(const char* format, fmt::ArgList args) {
--    return fmt::sprintf(format, args);
-+template<class...Args>
-+std::string format(const Args & ... args)
-+{
-+    return fmt::sprintf(args...);
+ inline std::string format(const char* format, fmt::ArgList args) {
+     return fmt::sprintf(format, args);
  }
--FMT_VARIADIC(std::string, format, const char*)
+ FMT_VARIADIC(std::string, format, const char*)
+-// For latest FMTLIB
+-/*template <typename... Args>
+-    inline std::string format(const char *format_str, const Args & ... args) {
+-        return fmt::sprintf(format_str, args);
+-    }*/
+ #endif
+ 
+ // Missing string split - like in Python
+diff --git a/include/CoolPropFluid.h b/include/CoolPropFluid.h
+index 80fb9ff3..093bd294 100644
+--- a/include/CoolPropFluid.h
++++ b/include/CoolPropFluid.h
+@@ -562,5 +562,19 @@ class CoolPropFluid
+     };
+ };
+ 
++#if !defined(NO_FMTLIB) && FMT_VERSION >= 90000
++static int format_as(ViscosityDiluteVariables::ViscosityDiluteType type) {
++    return fmt::underlying(type);
++}
++
++static int format_as(TransportPropertyData::ViscosityHardcodedEnum viscosity) {
++    return fmt::underlying(viscosity);
++}
++
++static int format_as(TransportPropertyData::ConductivityHardcodedEnum conductivity) {
++    return fmt::underlying(conductivity);
++}
++#endif
++
+ } /* namespace CoolProp */
+ #endif /* COOLPROPFLUID_H_ */
+diff --git a/include/DataStructures.h b/include/DataStructures.h
+index 0aebc0b4..5265ac82 100644
+--- a/include/DataStructures.h
++++ b/include/DataStructures.h
+@@ -473,5 +473,40 @@ void extract_backend_families(std::string backend_string, backend_families& f1,
+ void extract_backend_families_string(std::string backend_string, backend_families& f1, std::string& f2);
+ std::string get_backend_string(backends backend);
+ 
++#if !defined(NO_FMTLIB) && FMT_VERSION >= 90000
++/// Allows enums to be formatted
++static int format_as(parameters parameter) {
++    return fmt::underlying(parameter);
++}
++
++static int format_as(phases phase) {
++    return fmt::underlying(phase);
++}
++
++static int format_as(schemes scheme) {
++    return fmt::underlying(scheme);
++}
++
++static int format_as(composition_types type) {
++    return fmt::underlying(type);
++}
++
++static int format_as(fluid_types type) {
++    return fmt::underlying(type);
++}
++
++static int format_as(input_pairs pair) {
++    return fmt::underlying(pair);
++}
++
++static int format_as(backend_families family) {
++    return fmt::underlying(family);
++}
++
++static int format_as(backends backend) {
++    return fmt::underlying(backend);
++}
++#endif
++
+ } /* namespace CoolProp */
+ #endif /* DATASTRUCTURES_H_ */
+diff --git a/include/IncompressibleFluid.h b/include/IncompressibleFluid.h
+index 1ea41775..b641d2e0 100644
+--- a/include/IncompressibleFluid.h
++++ b/include/IncompressibleFluid.h
+@@ -44,6 +44,12 @@ struct IncompressibleData
+     };
+ };
+ 
++#if !defined(NO_FMTLIB) && FMT_VERSION >= 90000
++static int format_as(IncompressibleData::IncompressibleTypeEnum type) {
++    return fmt::underlying(type);
++}
++#endif
++
+ /// A property provider for incompressible solutions and pure fluids
+ /**
+ This fluid instance is populated using an entry from a JSON file
+diff --git a/src/Backends/Helmholtz/VLERoutines.h b/src/Backends/Helmholtz/VLERoutines.h
+index e13c0295..c63d0cbc 100644
+--- a/src/Backends/Helmholtz/VLERoutines.h
++++ b/src/Backends/Helmholtz/VLERoutines.h
+@@ -97,6 +97,12 @@ struct saturation_PHSU_pure_options
+     }
+ };
+ 
++#if !defined(NO_FMTLIB) && FMT_VERSION >= 90000
++static int format_as(saturation_PHSU_pure_options::specified_variable_options option) {
++    return fmt::underlying(option);
++}
++#endif
++
+ void saturation_PHSU_pure(HelmholtzEOSMixtureBackend& HEOS, CoolPropDbl specified_value, saturation_PHSU_pure_options& options);
+ 
+ /* \brief This is a backup saturation_p solver for the case where the Newton solver cannot approach closely enough the solution
+diff --git a/src/HumidAirProp.cpp b/src/HumidAirProp.cpp
+index 640bd843..eb586a63 100644
+--- a/src/HumidAirProp.cpp
++++ b/src/HumidAirProp.cpp
+@@ -76,6 +76,12 @@ enum givens
+     GIVEN_ISENTROPIC_EXPONENT
+ };
+ 
++#if !defined(NO_FMTLIB) && FMT_VERSION >= 90000
++int format_as(givens given) {
++    return fmt::underlying(given);
++}
++#endif
 +
- // For latest FMTLIB
- /*template <typename... Args>
-     inline std::string format(const char *format_str, const Args & ... args) {
+ void _HAPropsSI_inputs(double p, const std::vector<givens>& input_keys, const std::vector<double>& input_vals, double& T, double& psi_w);
+ double _HAPropsSI_outputs(givens OuputType, double p, double T, double psi_w);
+ double MoleFractionWater(double, double, int, double);
diff --git a/external_imported/vcpkg/ports/coolprop/portfile.cmake b/external_imported/vcpkg/ports/coolprop/portfile.cmake
index 245cd6730..146e1dbfd 100644
--- a/external_imported/vcpkg/ports/coolprop/portfile.cmake
+++ b/external_imported/vcpkg/ports/coolprop/portfile.cmake
@@ -11,59 +11,14 @@ vcpkg_from_github(
         fix-dependency.patch
         fix-install.patch
 )
+vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" "CACHE LIST" "CACHE STRING")
 
-vcpkg_find_acquire_program(PYTHON3)
-get_filename_component(PYTHON3_DIR ${PYTHON3} DIRECTORY)
-vcpkg_add_to_path(${PYTHON3_DIR})
-
-file(REMOVE_RECURSE ${SOURCE_PATH}/externals)
-
-# Patch up the file locations
-file(COPY
-    ${CURRENT_INSTALLED_DIR}/include/catch.hpp
-    DESTINATION ${SOURCE_PATH}/externals/Catch/single_include
-)
-
-file(COPY
-    ${CURRENT_INSTALLED_DIR}/include/eigen3/Eigen
-    DESTINATION ${SOURCE_PATH}/externals/Eigen
-)
-file(COPY
-    ${CURRENT_INSTALLED_DIR}/include/eigen3/unsupported/Eigen
-    DESTINATION ${SOURCE_PATH}/externals/Eigen/unsupported
-)
-
-file(COPY
-    ${CURRENT_INSTALLED_DIR}/include/rapidjson
-    DESTINATION ${SOURCE_PATH}/externals/rapidjson/include
-)
-
-file(COPY
-    ${CURRENT_INSTALLED_DIR}/include/IF97.h
-    DESTINATION ${SOURCE_PATH}/externals/IF97
-)
-
-file(COPY
-    ${CURRENT_INSTALLED_DIR}/include/msgpack.hpp
-    ${CURRENT_INSTALLED_DIR}/include/msgpack
-    DESTINATION ${SOURCE_PATH}/externals/msgpack-c/include
-)
-
-file(COPY
-    ${CURRENT_INSTALLED_DIR}/include/fmt
-    DESTINATION ${SOURCE_PATH}/externals/cppformat
-)
-
-file(COPY
-    ${CURRENT_INSTALLED_DIR}/include/REFPROP_lib.h
-    DESTINATION ${SOURCE_PATH}/externals/REFPROP-headers/
-)
-
-# Use a nasty hack to include the correct header
-file(APPEND
-    ${SOURCE_PATH}/externals/msgpack-c/include/fmt/format.h
-    "#include \"fmt/printf.h\""
-)
+file(REMOVE_RECURSE "${SOURCE_PATH}/externals")
+file(COPY "${CURRENT_INSTALLED_DIR}/include/IF97.h" DESTINATION "${SOURCE_PATH}/externals/IF97")
+file(COPY "${CURRENT_INSTALLED_DIR}/include/REFPROP_lib.h" DESTINATION "${SOURCE_PATH}/externals/REFPROP-headers/")
+file(COPY "${CURRENT_INSTALLED_DIR}/include/rapidjson" DESTINATION "${SOURCE_PATH}/externals/rapidjson/include")
+# Fix GCC warning when thread_local is substitude as __thread
+vcpkg_replace_string("${SOURCE_PATH}/externals/rapidjson/include/rapidjson/document.h" "thread_local static " "static thread_local ")
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" COOLPROP_SHARED_LIBRARY)
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" COOLPROP_STATIC_LIBRARY)
@@ -71,17 +26,22 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" COOLPROP_STATIC_LIBRARY
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" COOLPROP_MSVC_DYNAMIC)
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" COOLPROP_MSVC_STATIC)
 
+vcpkg_find_acquire_program(PYTHON3)
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    DISABLE_PARALLEL_CONFIGURE
     OPTIONS
+        "-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake"
         -DCOOLPROP_SHARED_LIBRARY=${COOLPROP_SHARED_LIBRARY}
         -DCOOLPROP_STATIC_LIBRARY=${COOLPROP_STATIC_LIBRARY}
         -DCOOLPROP_MSVC_DYNAMIC=${COOLPROP_MSVC_DYNAMIC}
         -DCOOLPROP_MSVC_STATIC=${COOLPROP_MSVC_STATIC}
+        "-DPYTHON_EXECUTABLE=${PYTHON3}"
     OPTIONS_RELEASE
-        -DCOOLPROP_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}
+        "-DCOOLPROP_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}"
     OPTIONS_DEBUG
-        -DCOOLPROP_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug
+        "-DCOOLPROP_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug"
 )
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/coolprop/vcpkg.json b/external_imported/vcpkg/ports/coolprop/vcpkg.json
index 9690938cc..bf69e28b5 100644
--- a/external_imported/vcpkg/ports/coolprop/vcpkg.json
+++ b/external_imported/vcpkg/ports/coolprop/vcpkg.json
@@ -1,16 +1,15 @@
 {
   "name": "coolprop",
   "version-semver": "6.4.3",
+  "port-version": 3,
   "description": "Thermophysical properties for the masses",
   "homepage": "https://github.com/CoolProp/CoolProp",
   "license": "MIT",
   "dependencies": [
-    "catch",
     "eigen3",
     "fmt",
     "if97",
     "msgpack",
-    "pybind11",
     "rapidjson",
     "refprop-headers",
     {
diff --git a/external_imported/vcpkg/ports/copypp/portfile.cmake b/external_imported/vcpkg/ports/copypp/portfile.cmake
new file mode 100644
index 000000000..4e8d06bc9
--- /dev/null
+++ b/external_imported/vcpkg/ports/copypp/portfile.cmake
@@ -0,0 +1,25 @@
+set(VCPKG_BUILD_TYPE release) # header-only
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO i-curve/copypp
+    REF "v${VERSION}"
+    SHA512 1c34cfcc30234d6a0eb3f150dff40299f74be8cc7653dc494a5a6857ad4d42342815a8ef2cb3b06d05555cd9d6d4c9b9941a7a845ab40cc782ce4660fb1e2560
+    HEAD_REF main
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS "-DCOPYPP_TEST=OFF"
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/copypp)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage"
+     DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/copypp/usage b/external_imported/vcpkg/ports/copypp/usage
new file mode 100644
index 000000000..17bb740b9
--- /dev/null
+++ b/external_imported/vcpkg/ports/copypp/usage
@@ -0,0 +1,4 @@
+copypp provides CMake targets:
+
+    find_package(copypp CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE icurve::copypp)
diff --git a/external_imported/vcpkg/ports/copypp/vcpkg.json b/external_imported/vcpkg/ports/copypp/vcpkg.json
new file mode 100644
index 000000000..06d6566a0
--- /dev/null
+++ b/external_imported/vcpkg/ports/copypp/vcpkg.json
@@ -0,0 +1,17 @@
+{
+  "name": "copypp",
+  "version": "0.3.0",
+  "description": "support field copy in different c++ data type.",
+  "homepage": "https://github.com/i-curve/copypp",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/corrade/clang-16.patch b/external_imported/vcpkg/ports/corrade/clang-16.patch
new file mode 100644
index 000000000..a6e6fe1df
--- /dev/null
+++ b/external_imported/vcpkg/ports/corrade/clang-16.patch
@@ -0,0 +1,32 @@
+diff --git a/src/Corrade/Utility/StlForwardArray.h b/src/Corrade/Utility/StlForwardArray.h
+index 0e78d61..363fafb 100644
+--- a/src/Corrade/Utility/StlForwardArray.h
++++ b/src/Corrade/Utility/StlForwardArray.h
+@@ -55,7 +55,11 @@ possible or is unknown is equivalent to @cpp #include <array> @ce.
+ 
+ #ifdef CORRADE_TARGET_LIBCXX
+ /* https://github.com/llvm-mirror/libcxx/blob/73d2eccc78ac83d5947243c4d26a53f668b4f432/include/__tuple#L223 */
++#if _LIBCPP_VERSION < 160000
+ #include <__tuple>
++#else
++#include <__fwd/array.h>
++#endif
+ #elif defined(CORRADE_TARGET_DINKUMWARE)
+ /* MSVC has it defined next to std::pair */
+ #include <utility>
+diff --git a/src/Corrade/Utility/StlForwardTuple.h b/src/Corrade/Utility/StlForwardTuple.h
+index 5701bc0..3292ec8 100644
+--- a/src/Corrade/Utility/StlForwardTuple.h
++++ b/src/Corrade/Utility/StlForwardTuple.h
+@@ -55,7 +55,11 @@ is equivalent to @cpp #include <tuple> @ce.
+ 
+ #ifdef CORRADE_TARGET_LIBCXX
+ /* https://github.com/llvm-mirror/libcxx/blob/73d2eccc78ac83d5947243c4d26a53f668b4f432/include/__tuple#L163 */
++#if _LIBCPP_VERSION < 160000
+ #include <__tuple>
++#else
++#include <__fwd/tuple.h>
++#endif
+ #elif defined(CORRADE_TARGET_LIBSTDCXX)
+ /* https://github.com/gcc-mirror/gcc/blob/c014d57d57a03e6061a57fa8534e90979567392b/libstdc%2B%2B-v3/include/std/type_traits#L2465-L2466 */
+ #include <type_traits>
diff --git a/external_imported/vcpkg/ports/corrade/portfile.cmake b/external_imported/vcpkg/ports/corrade/portfile.cmake
index 54502932d..0680233a2 100644
--- a/external_imported/vcpkg/ports/corrade/portfile.cmake
+++ b/external_imported/vcpkg/ports/corrade/portfile.cmake
@@ -7,6 +7,7 @@ vcpkg_from_github(
     PATCHES
         fix-vs2019.patch
         build-corrade-rc-always.patch
+        clang-16.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
@@ -19,7 +20,7 @@ foreach(_feature IN LISTS ALL_FEATURES)
     string(REPLACE "-" "_" _FEATURE "${_FEATURE}")
 
     # Final feature is empty, ignore it
-    if(_feature)
+    if(_feature AND NOT "${_feature}" STREQUAL "dynamic-pluginmanager")
         list(APPEND _COMPONENTS ${_feature} WITH_${_FEATURE})
     endif()
 endforeach()
@@ -42,6 +43,7 @@ vcpkg_cmake_configure(
         -DBUILD_STATIC=${BUILD_STATIC}
     MAYBE_UNUSED_VARIABLES
         CORRADE_RC_EXECUTABLE
+        UTILITY_USE_ANSI_COLORS
 )
 
 vcpkg_cmake_install()
@@ -51,13 +53,11 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 # corrade-rc is not built when CMAKE_CROSSCOMPILING
-if("utility" IN_LIST FEATURES)
-    vcpkg_copy_tools(TOOL_NAMES "corrade-rc" AUTO_CLEAN)
-endif()
+vcpkg_copy_tools(TOOL_NAMES "corrade-rc" AUTO_CLEAN)
 
 # Ensure no empty folders are left behind
-if(NOT FEATURES)
-    # No features, no binaries (only Corrade.h).
+if(FEATURES STREQUAL "core")
+    # No features, no libs (only Corrade.h).
     file(REMOVE_RECURSE
         "${CURRENT_PACKAGES_DIR}/bin"
         "${CURRENT_PACKAGES_DIR}/lib"
diff --git a/external_imported/vcpkg/ports/corrade/vcpkg.json b/external_imported/vcpkg/ports/corrade/vcpkg.json
index baacdf279..6bb6ed736 100644
--- a/external_imported/vcpkg/ports/corrade/vcpkg.json
+++ b/external_imported/vcpkg/ports/corrade/vcpkg.json
@@ -1,17 +1,14 @@
 {
   "name": "corrade",
   "version-string": "2020.06",
-  "port-version": 5,
+  "port-version": 8,
   "description": "C++11/C++14 multiplatform utility library.",
   "homepage": "https://magnum.graphics/corrade/",
   "dependencies": [
     {
       "name": "corrade",
       "host": true,
-      "default-features": false,
-      "features": [
-        "utility"
-      ]
+      "default-features": false
     },
     {
       "name": "vcpkg-cmake",
@@ -29,11 +26,25 @@
     "utility"
   ],
   "features": {
+    "dynamic-pluginmanager": {
+      "description": "PluginManager library with dynamic plugin support",
+      "supports": "!ios & !uwp & !android",
+      "dependencies": [
+        {
+          "name": "corrade",
+          "default-features": false,
+          "features": [
+            "pluginmanager"
+          ]
+        }
+      ]
+    },
     "interconnect": {
       "description": "Interconnect library",
       "dependencies": [
         {
           "name": "corrade",
+          "default-features": false,
           "features": [
             "utility"
           ]
@@ -45,7 +56,12 @@
       "dependencies": [
         {
           "name": "corrade",
+          "default-features": false,
           "features": [
+            {
+              "name": "dynamic-pluginmanager",
+              "platform": "!ios & !uwp & !android"
+            },
             "utility"
           ]
         }
@@ -56,6 +72,7 @@
       "dependencies": [
         {
           "name": "corrade",
+          "default-features": false,
           "features": [
             "utility"
           ]
diff --git a/external_imported/vcpkg/ports/cpp-async/portfile.cmake b/external_imported/vcpkg/ports/cpp-async/portfile.cmake
new file mode 100644
index 000000000..a67b9aa14
--- /dev/null
+++ b/external_imported/vcpkg/ports/cpp-async/portfile.cmake
@@ -0,0 +1,13 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO microsoft/cpp-async
+    REF "v${VERSION}"
+    SHA512 6351329db0b485ae26bda74fe78bfbd0890a46e6f89325a953b058f88da4826a139d0ae90d75411680e1ee3c13c3c02f30907653e3643bd0b9556a4be7ea6707
+    HEAD_REF main
+)
+
+file(COPY "${SOURCE_PATH}/include/async" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/cpp-async/usage b/external_imported/vcpkg/ports/cpp-async/usage
new file mode 100644
index 000000000..13d560823
--- /dev/null
+++ b/external_imported/vcpkg/ports/cpp-async/usage
@@ -0,0 +1,4 @@
+cpp-async is header-only and can be used from CMake via:
+
+    find_path(CPP_ASYNC_INCLUDE_DIRS "async/task.h")
+    target_include_directories(main PRIVATE ${CPP_ASYNC_INCLUDE_DIRS})
diff --git a/external_imported/vcpkg/ports/cpp-async/vcpkg.json b/external_imported/vcpkg/ports/cpp-async/vcpkg.json
new file mode 100644
index 000000000..9c442ddd1
--- /dev/null
+++ b/external_imported/vcpkg/ports/cpp-async/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "cpp-async",
+  "version": "1.1.0",
+  "description": "Support types and functions for C++20 coroutines",
+  "homepage": "https://github.com/microsoft/cpp-async",
+  "license": "MIT"
+}
diff --git a/external_imported/vcpkg/ports/cpp-httplib/fix-find-brotli.patch b/external_imported/vcpkg/ports/cpp-httplib/fix-find-brotli.patch
index e64712689..aecc7b3e5 100644
--- a/external_imported/vcpkg/ports/cpp-httplib/fix-find-brotli.patch
+++ b/external_imported/vcpkg/ports/cpp-httplib/fix-find-brotli.patch
@@ -1,22 +1,23 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 709390a..3fd83aa 100644
+index 73de511..940b6ab 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -127,9 +127,9 @@ endif()
- # Adds our cmake folder to the search path for find_package
+@@ -141,10 +141,10 @@ endif()
+ # This is so we can use our custom FindBrotli.cmake
  list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
  if(HTTPLIB_REQUIRE_BROTLI)
 -	find_package(Brotli COMPONENTS encoder decoder common REQUIRED)
 +	find_package(unofficial-brotli CONFIG REQUIRED)
+ 	set(HTTPLIB_IS_USING_BROTLI TRUE)
  elseif(HTTPLIB_USE_BROTLI_IF_AVAILABLE)
 -	find_package(Brotli COMPONENTS encoder decoder common QUIET)
 +	find_package(unofficial-brotli CONFIG QUIET)
+ 	set(HTTPLIB_IS_USING_BROTLI ${Brotli_FOUND})
  endif()
- # Just setting this variable here for people building in-tree
- if(Brotli_FOUND)
-@@ -206,9 +206,9 @@ target_link_libraries(${PROJECT_NAME} ${_INTERFACE_OR_PUBLIC}
- 		$<$<PLATFORM_ID:Windows>:crypt32>
- 		$<$<PLATFORM_ID:Windows>:cryptui>
+ 
+@@ -217,9 +217,9 @@ target_link_libraries(${PROJECT_NAME} ${_INTERFACE_OR_PUBLIC}
+ 		# Needed for API from MacOS Security framework
+ 		"$<$<AND:$<PLATFORM_ID:Darwin>,$<BOOL:${HTTPLIB_IS_USING_OPENSSL}>,$<BOOL:${HTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN}>>:-framework CoreFoundation -framework Security>"
  		# Can't put multiple targets in a single generator expression or it bugs out.
 -		$<$<BOOL:${HTTPLIB_IS_USING_BROTLI}>:Brotli::common>
 -		$<$<BOOL:${HTTPLIB_IS_USING_BROTLI}>:Brotli::encoder>
@@ -27,13 +28,26 @@ index 709390a..3fd83aa 100644
  		$<$<BOOL:${HTTPLIB_IS_USING_ZLIB}>:ZLIB::ZLIB>
  		$<$<BOOL:${HTTPLIB_IS_USING_OPENSSL}>:OpenSSL::SSL>
  		$<$<BOOL:${HTTPLIB_IS_USING_OPENSSL}>:OpenSSL::Crypto>
-@@ -265,9 +265,6 @@ install(FILES "${_httplib_build_includedir}/httplib.h" TYPE INCLUDE)
- install(FILES
+@@ -275,9 +275,6 @@ if(HTTPLIB_INSTALL)
+ 	install(FILES
  		"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
  		"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
 -		# Install it so it can be used later by the httplibConfig.cmake file.
 -		# Put it in the same dir as our config file instead of a global path so we don't potentially stomp on other packages.
 -		"${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindBrotli.cmake"
- 	DESTINATION ${_TARGET_INSTALL_CMAKEDIR}
- )
+ 		DESTINATION ${_TARGET_INSTALL_CMAKEDIR}
+ 	)
+ 
+diff --git a/httplibConfig.cmake.in b/httplibConfig.cmake.in
+index 93dff32..8c6bc11 100644
+--- a/httplibConfig.cmake.in
++++ b/httplibConfig.cmake.in
+@@ -32,7 +32,7 @@ if(@HTTPLIB_IS_USING_BROTLI@)
+ 	# Note that the FindBrotli.cmake file is installed in the same dir as this file.
+ 	list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
+ 	set(BROTLI_USE_STATIC_LIBS @BROTLI_USE_STATIC_LIBS@)
+-	find_dependency(Brotli COMPONENTS common encoder decoder)
++	find_dependency(unofficial-brotli COMPONENTS common encoder decoder)
+ endif()
  
+ # Mildly useful for end-users
diff --git a/external_imported/vcpkg/ports/cpp-httplib/portfile.cmake b/external_imported/vcpkg/ports/cpp-httplib/portfile.cmake
index a1fe9c3ed..f63a79ad7 100644
--- a/external_imported/vcpkg/ports/cpp-httplib/portfile.cmake
+++ b/external_imported/vcpkg/ports/cpp-httplib/portfile.cmake
@@ -1,23 +1,35 @@
-# Header-only library
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO yhirose/cpp-httplib
-    REF v0.11.3
-    SHA512 b0c46bf11c8bc84ab52143559ff1c4682b02504921855e5cd7e82bc65a04b192281ef7a124c7c7dfe928ae3842d5065097b6a4608be1c74dc51b563b15b93d0f
-    HEAD_REF master
-    PATCHES
-        fix-find-brotli.patch
-)
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-)
-vcpkg_cmake_install()
-
-vcpkg_cmake_config_fixup(PACKAGE_NAME httplib CONFIG_PATH lib/cmake/httplib)
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib" "${CURRENT_PACKAGES_DIR}/lib")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
-
-# Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO yhirose/cpp-httplib
+    REF "v${VERSION}"
+    SHA512 f7fc9c9eb71f091b82958e023a7b417b30d2590fd5d1a920d1c98361f34bcaca796dbeda7f9fdb8b2c722a8968977b77463c6cbb252cba9823a79c22471fa439
+    HEAD_REF master
+    PATCHES
+        fix-find-brotli.patch
+)
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        brotli  HTTPLIB_REQUIRE_BROTLI
+        openssl HTTPLIB_REQUIRE_OPENSSL
+        zlib    HTTPLIB_REQUIRE_ZLIB
+)
+
+set(VCPKG_BUILD_TYPE release) # header-only port
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+    ${FEATURE_OPTIONS}
+    -DHTTPLIB_USE_OPENSSL_IF_AVAILABLE=OFF
+    -DHTTPLIB_USE_ZLIB_IF_AVAILABLE=OFF
+    -DHTTPLIB_USE_BROTLI_IF_AVAILABLE=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME httplib CONFIG_PATH lib/cmake/httplib)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/cpp-httplib/usage b/external_imported/vcpkg/ports/cpp-httplib/usage
new file mode 100644
index 000000000..8ee7571a3
--- /dev/null
+++ b/external_imported/vcpkg/ports/cpp-httplib/usage
@@ -0,0 +1,4 @@
+cpp-httplib provides CMake targets:
+
+    find_package(httplib CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE httplib::httplib)
diff --git a/external_imported/vcpkg/ports/cpp-httplib/vcpkg.json b/external_imported/vcpkg/ports/cpp-httplib/vcpkg.json
index dbd31d85f..49a028fd2 100644
--- a/external_imported/vcpkg/ports/cpp-httplib/vcpkg.json
+++ b/external_imported/vcpkg/ports/cpp-httplib/vcpkg.json
@@ -1,12 +1,10 @@
 {
   "name": "cpp-httplib",
-  "version": "0.11.3",
-  "port-version": 1,
+  "version": "0.15.3",
   "description": "A single file C++11 header-only HTTP/HTTPS server and client library",
   "homepage": "https://github.com/yhirose/cpp-httplib",
   "license": "MIT",
   "dependencies": [
-    "brotli",
     {
       "name": "vcpkg-cmake",
       "host": true
@@ -15,5 +13,28 @@
       "name": "vcpkg-cmake-config",
       "host": true
     }
-  ]
+  ],
+  "default-features": [
+    "brotli"
+  ],
+  "features": {
+    "brotli": {
+      "description": "Enables brotli compression support using brotli",
+      "dependencies": [
+        "brotli"
+      ]
+    },
+    "openssl": {
+      "description": "Enables HTTPS support using OpenSSL",
+      "dependencies": [
+        "openssl"
+      ]
+    },
+    "zlib": {
+      "description": "Enables gzip compression support using zlib",
+      "dependencies": [
+        "zlib"
+      ]
+    }
+  }
 }
diff --git a/external_imported/vcpkg/ports/cpp-ipc/portfile.cmake b/external_imported/vcpkg/ports/cpp-ipc/portfile.cmake
index 6dfacba15..4ce891fcc 100644
--- a/external_imported/vcpkg/ports/cpp-ipc/portfile.cmake
+++ b/external_imported/vcpkg/ports/cpp-ipc/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mutouyun/cpp-ipc
-    REF f2f1af8f8e7877a28deb2eacdc379a22a99e4c82 #v1.2.0
-    SHA512 e01fe5e2612141af64a9c44773a49c566b89ecf0a77164c6eb0a6d68bd7ff5830843ce42df5d53a863882b582a8d6a2e9f69026f244d8d1d96e83f0f4c9e8972
+    REF 035d76d5aaaa420a61d5e08be841cc20e585adde #v1.3.0
+    SHA512 fea7054befc143ca1b4c55f3ffb72eb81353ce08f761e7c1ca79dd016449f76fbfc19bdb046a68e4d84df0f24da0312a0f560d9a25257811689041267bb42f1a
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/cpp-ipc/vcpkg.json b/external_imported/vcpkg/ports/cpp-ipc/vcpkg.json
index 62e2bb49f..0f18fc7a4 100644
--- a/external_imported/vcpkg/ports/cpp-ipc/vcpkg.json
+++ b/external_imported/vcpkg/ports/cpp-ipc/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "cpp-ipc",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "C++ IPC Library: A high-performance inter-process communication using shared memory on Linux/Windows.",
   "homepage": "https://github.com/mutouyun/cpp-ipc",
   "supports": "!osx",
diff --git a/external_imported/vcpkg/ports/cpp-netlib/fix-compatibility-with-boost-1.83.patch b/external_imported/vcpkg/ports/cpp-netlib/fix-compatibility-with-boost-1.83.patch
new file mode 100644
index 000000000..530b342ba
--- /dev/null
+++ b/external_imported/vcpkg/ports/cpp-netlib/fix-compatibility-with-boost-1.83.patch
@@ -0,0 +1,24 @@
+ boost/network/protocol/http/server/impl/parsers.ipp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/boost/network/protocol/http/server/impl/parsers.ipp b/boost/network/protocol/http/server/impl/parsers.ipp
+index c31e60ea..3272c2fa 100644
+--- a/boost/network/protocol/http/server/impl/parsers.ipp
++++ b/boost/network/protocol/http/server/impl/parsers.ipp
+@@ -13,6 +13,7 @@
+ #include <tuple>
+ #include <boost/fusion/include/std_tuple.hpp>
+ #include <boost/network/protocol/http/message/header.hpp>
++#include <boost/regex/pending/unicode_iterator.hpp>
+ 
+ #ifdef BOOST_NETWORK_NO_LIB
+ #ifndef BOOST_NETWORK_INLINE
+@@ -32,7 +33,7 @@ typedef std::basic_string<uint32_t> u32_string;
+ template <>  // <typename Attrib, typename T, typename Enable>
+ struct assign_to_container_from_value<std::string, u32_string, void> {
+   static void call(u32_string const& val, std::string& attr) {
+-    u32_to_u8_iterator<u32_string::const_iterator> begin = val.begin(),
++    boost::u32_to_u8_iterator<u32_string::const_iterator> begin = val.begin(),
+                                                    end = val.end();
+     for (; begin != end; ++begin) attr += *begin;
+   }
diff --git a/external_imported/vcpkg/ports/cpp-netlib/portfile.cmake b/external_imported/vcpkg/ports/cpp-netlib/portfile.cmake
index 2e7fc78c5..5e36bfdb5 100644
--- a/external_imported/vcpkg/ports/cpp-netlib/portfile.cmake
+++ b/external_imported/vcpkg/ports/cpp-netlib/portfile.cmake
@@ -9,7 +9,9 @@ vcpkg_from_github(
     # Updator's note: cpp-netlib has many templates that are not fully instantiated when not building examples.
     # This patch specifically fixes one of those issues
     # To test updates, enable building examples below (may also require patching out uses of cxxopts)
-    PATCHES stream-handler-executor.patch
+    PATCHES
+        fix-compatibility-with-boost-1.83.patch
+        stream-handler-executor.patch
 )
 
 vcpkg_cmake_configure(
@@ -29,4 +31,4 @@ else()
     vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cppnetlib PACKAGE_NAME cppnetlib)
 endif()
 
-file(INSTALL "${SOURCE_PATH}/LICENSE_1_0.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE_1_0.txt")
diff --git a/external_imported/vcpkg/ports/cpp-netlib/vcpkg.json b/external_imported/vcpkg/ports/cpp-netlib/vcpkg.json
index c6b65a738..61044d46d 100644
--- a/external_imported/vcpkg/ports/cpp-netlib/vcpkg.json
+++ b/external_imported/vcpkg/ports/cpp-netlib/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "cpp-netlib",
-  "version-string": "0.13.0",
-  "port-version": 7,
+  "version": "0.13.0",
+  "port-version": 9,
   "description": "A collection of network-related routines/implementations geared towards providing a robust cross-platform networking library",
   "homepage": "https://cpp-netlib.org/",
   "supports": "!uwp",
diff --git a/external_imported/vcpkg/ports/cpp-peglib/portfile.cmake b/external_imported/vcpkg/ports/cpp-peglib/portfile.cmake
index c365ad781..c8a657dd2 100644
--- a/external_imported/vcpkg/ports/cpp-peglib/portfile.cmake
+++ b/external_imported/vcpkg/ports/cpp-peglib/portfile.cmake
@@ -2,8 +2,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO yhirose/cpp-peglib
-    REF adfd2d6014f6cce9510ac2374b277ac8fb931c49
-    SHA512 8a930286a20098efc053988bd5b7e0d3117ce3851a79acf3c9991b75ff85a6340d106522f66ee322f8e7809143f9f74fa1fb051da277db02532dface5cb6f5c3
+    REF "v${VERSION}"
+    SHA512 c579da831822459c643c43be64eded925b2364bc1ae6b99ab8eaeeb48f441ecc2c019b08313027fd12113a1356826c7570d0c8b1b0ea7eef6984d810903b92c4
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/cpp-peglib/vcpkg.json b/external_imported/vcpkg/ports/cpp-peglib/vcpkg.json
index 01021728c..325826d33 100644
--- a/external_imported/vcpkg/ports/cpp-peglib/vcpkg.json
+++ b/external_imported/vcpkg/ports/cpp-peglib/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "cpp-peglib",
-  "version": "1.3.10",
+  "version": "1.8.6",
   "description": "C++11 header-only PEG (Parsing Expression Grammars) library.",
   "license": "MIT"
 }
diff --git a/external_imported/vcpkg/ports/cpp-sort/portfile.cmake b/external_imported/vcpkg/ports/cpp-sort/portfile.cmake
new file mode 100644
index 000000000..5799c213a
--- /dev/null
+++ b/external_imported/vcpkg/ports/cpp-sort/portfile.cmake
@@ -0,0 +1,22 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Morwenn/cpp-sort
+    REF "${VERSION}"
+    SHA512 85d9f68ff64ff23769c66d28153273e2072b2c12f2f94bb058afebc1fb68d852734d3907a51704212d795bff71f327de3497232ba3619179bbaa141ab55b2452
+    HEAD_REF 1.x.y-develop
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DCPPSORT_BUILD_TESTING=OFF
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/cpp-sort")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/external_imported/vcpkg/ports/cpp-sort/vcpkg.json b/external_imported/vcpkg/ports/cpp-sort/vcpkg.json
new file mode 100644
index 000000000..5c119d0dd
--- /dev/null
+++ b/external_imported/vcpkg/ports/cpp-sort/vcpkg.json
@@ -0,0 +1,17 @@
+{
+  "name": "cpp-sort",
+  "version": "1.15.0",
+  "description": "Sorting algorithms & related tools for C++14",
+  "homepage": "https://github.com/Morwenn/cpp-sort/",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/cpp-taskflow/vcpkg.json b/external_imported/vcpkg/ports/cpp-taskflow/vcpkg.json
index ca690bb21..2a1da640b 100644
--- a/external_imported/vcpkg/ports/cpp-taskflow/vcpkg.json
+++ b/external_imported/vcpkg/ports/cpp-taskflow/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "cpp-taskflow",
-  "version-string": "2.6.0",
-  "port-version": 1,
+  "version": "2.6.0",
+  "port-version": 2,
   "description": "Fast Parallel Tasking Programming Library using Modern C++.",
   "homepage": "https://github.com/taskflow/taskflow",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/cppad/portfile.cmake b/external_imported/vcpkg/ports/cppad/portfile.cmake
index 787192bd0..6c48a0a86 100644
--- a/external_imported/vcpkg/ports/cppad/portfile.cmake
+++ b/external_imported/vcpkg/ports/cppad/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO coin-or/CppAD
-    REF 5e1c0090e23d897f268c6802eaffed87078b78c0 #20230000.0
-    SHA512 9583323277023a7c7ae6c1b077262b1f228989c9dd432a7162dd8c7cd9b97881abcd3d368fdd916fb7250f3fadbbf41557462cfc0fcb6076c6b8fdc76a38d3ed
+    REF "${VERSION}"
+    SHA512 0c4f57582347f1c11fabda56ef9324b5399194d13c2bcd98038f64dde1c820326cd278a94b1b97cb7aa90760bafe0c3d13c1fddf989841313ae1d4db122789c2
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/cppad/vcpkg.json b/external_imported/vcpkg/ports/cppad/vcpkg.json
index 6f321f3ff..e083118a7 100644
--- a/external_imported/vcpkg/ports/cppad/vcpkg.json
+++ b/external_imported/vcpkg/ports/cppad/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "$comment": "See related issue for compilation failure on UWP and ARM: https://github.com/microsoft/vcpkg/pull/12560#issuecomment-668412073",
   "name": "cppad",
-  "version": "20230000.0",
+  "version": "20240000.2",
   "description": "CppAD: A Package for Differentiation of C++ Algorithms",
   "homepage": "https://github.com/coin-or/CppAD",
   "license": "EPL-2.0",
diff --git a/external_imported/vcpkg/ports/cppcms/dependencies.diff b/external_imported/vcpkg/ports/cppcms/dependencies.diff
new file mode 100644
index 000000000..5f7c0eb38
--- /dev/null
+++ b/external_imported/vcpkg/ports/cppcms/dependencies.diff
@@ -0,0 +1,41 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5ce0d53..d2b91f5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -268,8 +268,8 @@ check_cxx_source_compiles(
+ 	CPPCMS_HAVE_FSEEKI64
+ )
+ if(NOT DISABLE_GZIP)
+-	find_library(ZLIB NAMES z zdll zlib${ZLIB_SUFFIX} zlib)
+-	find_path(ZLIB_INCLUDE_DIR zlib.h)
++	find_package(ZLIB REQUIRED)
++	set(ZLIB "${ZLIB_LIBRARIES}")
+ 	if(NOT ZLIB OR NOT ZLIB_INCLUDE_DIR)
+ 		message(FATAL_ERROR "Can't fild zlib")
+ 	endif()
+@@ -423,8 +423,8 @@ if(NOT DISABLE_GCRYPT)
+ endif()
+ 
+ if(NOT DISABLE_OPENSSL)
+-	find_path(OPENSSL_INCLUDE_DIR openssl/aes.h)
+-	find_library(LIB_OPENSSL NAMES crypto libcrypto libeay32)
++	find_package(OpenSSL REQUIRED)
++	set(LIB_OPENSSL "${OPENSSL_CRYPTO_LIBRARIES}")
+ endif()
+ 
+ if (OPENSSL_INCLUDE_DIR AND LIB_OPENSSL)
+diff --git a/booster/CMakeLists.txt b/booster/CMakeLists.txt
+index 4f81833..822c470 100644
+--- a/booster/CMakeLists.txt
++++ b/booster/CMakeLists.txt
+@@ -123,6 +123,10 @@ endif()
+ 
+ if(NOT DISABLE_ICU_LOCALE)
+ 	message("-- Looking for ICU libraries")
++	find_package(ICU REQUIRED COMPONENTS i18n uc data)
++	include_directories(${ICU_INCLUDE_DIRS})
++	set(ICU_I18N "${ICU_LIBRARIES}")
++elseif(0)
+ 
+ 	if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
+ 		if(MSVC)
diff --git a/external_imported/vcpkg/ports/cppcms/dllexport.diff b/external_imported/vcpkg/ports/cppcms/dllexport.diff
new file mode 100644
index 000000000..aeb3d7673
--- /dev/null
+++ b/external_imported/vcpkg/ports/cppcms/dllexport.diff
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c91ec97..11d475b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -692,7 +692,7 @@ target_link_libraries(hello_world ${CPPCMS_LIB})
+ if(NOT DISABLE_TCPCACHE)
+ 	add_executable(cppcms_scale src/cache_server_main.cpp)
+ 	target_link_libraries(cppcms_scale ${CPPCMS_LIB})
+-	if(WIN32 OR CYGWIN)
++	if(NOT DISABLE_SHARED)
+ 		set_target_properties(cppcms_scale PROPERTIES COMPILE_DEFINITIONS DLL_EXPORT)
+ 	endif()
+ endif()
diff --git a/external_imported/vcpkg/ports/cppcms/no-tests-and-examples.patch b/external_imported/vcpkg/ports/cppcms/no-tests-and-examples.patch
index 7d8e67bdf..091484271 100644
--- a/external_imported/vcpkg/ports/cppcms/no-tests-and-examples.patch
+++ b/external_imported/vcpkg/ports/cppcms/no-tests-and-examples.patch
@@ -1,58 +1,33 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5ce0d53..5b432c8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -685,9 +685,10 @@ if(NOT DISABLE_SHARED)
- endif(NOT DISABLE_SHARED)
- 
- 
--
-+if(FALSE)
- add_executable(hello_world src/hello_world.cpp skin1.cpp skin2.cpp)
- target_link_libraries(hello_world ${CPPCMS_LIB})
-+endif()
- 
- if(NOT DISABLE_TCPCACHE)
- 	add_executable(cppcms_scale src/cache_server_main.cpp)
-@@ -710,7 +711,7 @@ endif(DISABLE_SHARED)
- #########################################
- # Tests
- #########################################
--
-+if(FALSE)
- set(ALL_TESTS 
- 	form_test
- 	proto_test
-@@ -775,14 +776,14 @@ set(ALL_TESTS ${ALL_TESTS} external_session_test)
- if(NOT DISABLE_GZIP)
- 	target_link_libraries(response_test ${ZLIB})
- endif()
--
-+endif()
- #####################################
- # End of tests
- #####################################
- 
- # These are use export
- if(IS_WINDOWS AND NOT DISABLE_SHARED)
--	set_target_properties(${ALL_TESTS} hello_world cppcms PROPERTIES
-+	set_target_properties(${ALL_TESTS} cppcms PROPERTIES
- 				COMPILE_DEFINITIONS DLL_EXPORT)
- endif()
- 
-@@ -830,7 +831,7 @@ install(DIRECTORY cppcms DESTINATION include
- #############
- 		
- 
--
-+if(FALSE)
- set(CNF "${CMAKE_CURRENT_SOURCE_DIR}/tests")
- 
- add_test(base64_test base64_test)
-@@ -1103,5 +1104,5 @@ if(NOT IS_WINDOWS)
- 		PROPERTIES TIMEOUT 120)
- 
- endif()
--
-+endif()
- 
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d2b91f5..c91ec97 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -647,7 +647,7 @@ add_custom_command(
+ 
+ 
+ 
+-if(NOT DISABLE_SHARED)
++if(installing-plugins)
+ 	add_custom_command(
+ 		OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/skin3.cpp
+ 		COMMAND ${PYTHON} ${CMAKE_CURRENT_SOURCE_DIR}/bin/cppcms_tmpl_cc 
+@@ -779,6 +779,7 @@ endif()
+ #####################################
+ # End of tests
+ #####################################
++set_target_properties(${ALL_TESTS} hello_world PROPERTIES EXCLUDE_FROM_ALL 1)
+ 
+ # These are use export
+ if(IS_WINDOWS AND NOT DISABLE_SHARED)
+diff --git a/booster/CMakeLists.txt b/booster/CMakeLists.txt
+index 822c470..0a95248 100644
+--- a/booster/CMakeLists.txt
++++ b/booster/CMakeLists.txt
+@@ -674,6 +674,7 @@ macro(add_booster_param_test MODULE TEST PARAMETER)
+ 	add_executable(${TEST_NAME} ${TEST_SRC})
+ 	target_link_libraries(${TEST_NAME} ${BOOSTER_LIB})
+ 	set_target_properties(${TEST_NAME} PROPERTIES COMPILE_DEFINITIONS "${EXE_COM_DEFS}")
++	set_target_properties(${TEST_NAME} PROPERTIES EXCLUDE_FROM_ALL 1)
+ 	add_test(${TEST_NAME} ${TEST_NAME} ${PARAMETER})
+ 	set_tests_properties(${TEST_NAME} PROPERTIES TIMEOUT 20)
+ endmacro()
diff --git a/external_imported/vcpkg/ports/cppcms/portfile.cmake b/external_imported/vcpkg/ports/cppcms/portfile.cmake
index b876f77d9..f47954fc8 100644
--- a/external_imported/vcpkg/ports/cppcms/portfile.cmake
+++ b/external_imported/vcpkg/ports/cppcms/portfile.cmake
@@ -1,32 +1,40 @@
-vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO artyom-beilis/cppcms
     REF b72b19915794d1af63c9a9e9bea58e20a4ad93d4
     SHA512 e99d34d14fbde22be725ac2c0bec069fb584e45c66767af75efaf454ca61a7a5e57434bf86109f910884c72202b8cf98fe16505e7d3d30d9218abd4d8b27d5df
     PATCHES
+        dependencies.diff
+        dllexport.diff
         no-tests-and-examples.patch
         fix_narrowing_error.patch
 )
 
-vcpkg_find_acquire_program(PYTHON2)
-
-string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" DISABLE_DYNAMIC)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" DISABLE_SHARED)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" DISABLE_STATIC)
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-        -DPYTHON=${PYTHON2} # Switch to python3 on the next update
+        -DCMAKE_CXX_STANDARD=11
+        -DPYTHON=:
         -DUSE_WINDOWS6_API=ON
-        -DDISABLE_SHARED=${DISABLE_DYNAMIC}
+        -DDISABLE_SHARED=${DISABLE_SHARED}
+        -DDISABLE_STATIC=${DISABLE_STATIC}
+        -DDISABLE_GCRYPT=ON
+        -DDISABLE_ICONV=ON
 )
 
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
+foreach(script IN ITEMS cppcms_tmpl_cc cppcms_run)
+    file(RENAME "${CURRENT_PACKAGES_DIR}/bin/${script}" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/${script}")
+    file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/${script}")
+endforeach()
 vcpkg_copy_tools(TOOL_NAMES cppcms_scale cppcms_make_key cppcms_config_find_param AUTO_CLEAN)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/MIT.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/MIT.TXT" "${SOURCE_PATH}/THIRD_PARTY_SOFTWARE.TXT")
diff --git a/external_imported/vcpkg/ports/cppcms/vcpkg.json b/external_imported/vcpkg/ports/cppcms/vcpkg.json
index 54dbb33fe..f1f83019d 100644
--- a/external_imported/vcpkg/ports/cppcms/vcpkg.json
+++ b/external_imported/vcpkg/ports/cppcms/vcpkg.json
@@ -1,11 +1,11 @@
 {
   "name": "cppcms",
   "version": "1.2.1",
-  "port-version": 6,
+  "port-version": 7,
   "description": "CppCMS is a Free High Performance Web Development Framework (not a CMS) aimed at Rapid Web Application Development",
   "homepage": "https://github.com/artyom-beilis/cppcms",
-  "license": "MIT",
-  "supports": "!(linux | osx | (windows & static))",
+  "license": null,
+  "supports": "!uwp",
   "dependencies": [
     "icu",
     "openssl",
diff --git a/external_imported/vcpkg/ports/cppdap/portfile.cmake b/external_imported/vcpkg/ports/cppdap/portfile.cmake
new file mode 100644
index 000000000..f4f088755
--- /dev/null
+++ b/external_imported/vcpkg/ports/cppdap/portfile.cmake
@@ -0,0 +1,21 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO  google/cppdap
+    REF "dap-${VERSION}"
+    SHA512 36f31cf7b90190820f5a5b7df679a3ca1a4f51b58a7a4c46f85c7b55b0ad9dbeba3436992b5eb8a3fd4499fc38bbf2b16f834f5f1989717f151abf13c262c747
+    HEAD_REF main
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DCPPDAP_USE_EXTERNAL_NLOHMANN_JSON_PACKAGE=ON
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/cppdap")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/cppdap/vcpkg.json b/external_imported/vcpkg/ports/cppdap/vcpkg.json
new file mode 100644
index 000000000..6e9563e80
--- /dev/null
+++ b/external_imported/vcpkg/ports/cppdap/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "cppdap",
+  "version-semver": "1.58.0-a",
+  "description": "A C++11 library (\"SDK\") implementation of the Debug Adapter Protocol, providing an API for implementing a DAP client or server.",
+  "homepage": "https://github.com/google/cppdap",
+  "license": "Apache-2.0",
+  "dependencies": [
+    "nlohmann-json",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/cppfs/LibCrypto-fix.patch b/external_imported/vcpkg/ports/cppfs/LibCrypto-fix.patch
deleted file mode 100644
index 144d2aabe..000000000
--- a/external_imported/vcpkg/ports/cppfs/LibCrypto-fix.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ea9fd15..af63d1e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -7,7 +7,7 @@
- cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
- 
- # Include cmake modules
--list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-+# list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
- 
- include(GenerateExportHeader)
- 
-diff --git a/source/cppfs/CMakeLists.txt b/source/cppfs/CMakeLists.txt
-index aa37eda..d29176a 100644
---- a/source/cppfs/CMakeLists.txt
-+++ b/source/cppfs/CMakeLists.txt
-@@ -4,18 +4,18 @@
- #
- 
- find_package(LibSSH2)
--find_package(LibCrypto)
-+# find_package(LibCrypto)
- find_package(ZLIB)
- find_package(OpenSSL)
- 
--if (LibSSH2_FOUND AND LibCrypto_FOUND AND ZLIB_FOUND AND OpenSSL_FOUND)
-+if (LibSSH2_FOUND AND ZLIB_FOUND AND OpenSSL_FOUND)
-     set(SSH_DEPS_MET TRUE)
- else()
-     set(SSH_DEPS_MET FALSE)
- endif()
- 
- if (OPTION_BUILD_SSH_BACKEND AND NOT SSH_DEPS_MET)
--    message(FATAL_ERROR "Requested to build ssh module but not all dependencies are found! LibSSH2: ${LibSSH2_FOUND}, LibCrypto: ${LibCrypto_FOUND}, ZLIB: ${ZLIB_FOUND}, OpenSSL: ${OpenSSL_FOUND}")
-+    message(FATAL_ERROR "Requested to build ssh module but not all dependencies are found! LibSSH2: ${LibSSH2_FOUND}, ZLIB: ${ZLIB_FOUND}, OpenSSL: ${OpenSSL_FOUND}")
- endif()
- 
- 
-@@ -207,10 +207,9 @@ target_link_libraries(${target}
- if (OPTION_BUILD_SSH_BACKEND)
-     target_link_libraries(${target}
-         PRIVATE
--        ${OPENSSL_LIBRARIES}
--        ${LIBSSH2_LIBRARY}
--        ${LIBCRYPTO_LIBRARY}
--        ${ZLIB_LIBRARY}
-+        Libssh2::libssh2
-+        OpenSSL::SSL OpenSSL::Crypto
-+        ZLIB::ZLIB
-     )
- 
-     if("${CMAKE_SYSTEM_NAME}" MATCHES "Windows")
diff --git a/external_imported/vcpkg/ports/cppfs/cmake-export-fix.patch b/external_imported/vcpkg/ports/cppfs/cmake-export-fix.patch
deleted file mode 100644
index 344700002..000000000
--- a/external_imported/vcpkg/ports/cppfs/cmake-export-fix.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ea9fd15..c62c6fd 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -124,7 +124,7 @@ endif()
- if((UNIX AND SYSTEM_DIR_INSTALL) OR OPTION_FORCE_SYSTEM_DIR_INSTALL)
-     # Install into the system (/usr/bin or /usr/local/bin)
-     set(INSTALL_ROOT      "share/${project}")       # /usr/[local]/share/<project>
--    set(INSTALL_CMAKE     "share/${project}/cmake") # /usr/[local]/share/<project>/cmake
-+    set(INSTALL_CMAKE     "share/${project}")       # /usr/[local]/share/<project>
-     set(INSTALL_EXAMPLES  "share/${project}")       # /usr/[local]/share/<project>
-     set(INSTALL_DATA      "share/${project}")       # /usr/[local]/share/<project>
-     set(INSTALL_BIN       "bin")                    # /usr/[local]/bin
-@@ -183,7 +183,7 @@ add_subdirectory(deploy)
- install(FILES "${PROJECT_BINARY_DIR}/VERSION" DESTINATION ${INSTALL_ROOT} COMPONENT runtime)
- 
- # Install cmake find script for the project
--install(FILES ${META_PROJECT_NAME}-config.cmake DESTINATION ${INSTALL_ROOT} COMPONENT dev)
-+# install(FILES ${META_PROJECT_NAME}-config.cmake DESTINATION ${INSTALL_ROOT} COMPONENT dev)
- 
- # Install the project meta files
- install(FILES AUTHORS   DESTINATION ${INSTALL_ROOT} COMPONENT runtime)
-diff --git a/source/cppfs/CMakeLists.txt b/source/cppfs/CMakeLists.txt
-index aa37eda..e8a59e0 100644
---- a/source/cppfs/CMakeLists.txt
-+++ b/source/cppfs/CMakeLists.txt
-@@ -283,7 +283,7 @@ perform_health_checks(
- 
- # Library
- install(TARGETS ${target}
--    EXPORT  "${target}-export"            COMPONENT dev
-+    EXPORT  "${target}-config"            COMPONENT dev
-     RUNTIME DESTINATION ${INSTALL_BIN}    COMPONENT runtime
-     LIBRARY DESTINATION ${INSTALL_SHARED} COMPONENT runtime
-     ARCHIVE DESTINATION ${INSTALL_LIB}    COMPONENT dev
-@@ -302,8 +302,8 @@ install(DIRECTORY
- )
- 
- # CMake config
--install(EXPORT ${target}-export
-+install(EXPORT ${target}-config
-     NAMESPACE   ${META_PROJECT_NAME}::
--    DESTINATION ${INSTALL_CMAKE}/${target}
-+    DESTINATION ${INSTALL_CMAKE}
-     COMPONENT   dev
- )
diff --git a/external_imported/vcpkg/ports/cppfs/portfile.cmake b/external_imported/vcpkg/ports/cppfs/portfile.cmake
index 64eeb2127..183069f25 100644
--- a/external_imported/vcpkg/ports/cppfs/portfile.cmake
+++ b/external_imported/vcpkg/ports/cppfs/portfile.cmake
@@ -5,27 +5,41 @@ vcpkg_from_github(
     SHA512 da1e09f79d9e65e7676784f47196645aabe1e1284f0ea5e48e845a244f5d49f5ea4b032f9e2e38c8e6a29657ebe636c9b1c9a4601c4bbc7637e7f592c52a8961
     HEAD_REF master
     PATCHES
-        LibCrypto-fix.patch
-        cmake-export-fix.patch
+        ssh-dependencies.diff
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
         ssh       OPTION_BUILD_SSH_BACKEND
+        ssh       CMAKE_REQUIRE_FIND_PACKAGE_LibSSH2
+        ssh       CMAKE_REQUIRE_FIND_PACKAGE_OpenSSL
+        ssh       CMAKE_REQUIRE_FIND_PACKAGE_ZLIB
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-        -DOPTION_BUILD_TESTS=Off
-        -DOPTION_FORCE_SYSTEM_DIR_INSTALL=On
+        -DCMAKE_DISABLE_FIND_PACKAGE_cppcheck=ON
+        -DCMAKE_DISABLE_FIND_PACKAGE_clang_tidy=ON
+        -DOPTION_BUILD_TESTS=OFF
+        -DOPTION_FORCE_SYSTEM_DIR_INSTALL=ON
         ${FEATURE_OPTIONS}
 )
 
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
-vcpkg_cmake_config_fixup()
+vcpkg_cmake_config_fixup(CONFIG_PATH "share/cppfs/cmake/cppfs")
+# Overwriting original config
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/cppfs/cppfs-config.cmake" "
+if(NOT \"${BUILD_SHARED_LIBS}\" AND \"${OPTION_BUILD_SSH_BACKEND}\")
+    include(CMakeFindDependencyMacro)
+    find_dependency(Libssh2 CONFIG)
+    find_dependency(OpenSSL)
+    find_dependency(ZLIB)
+endif()
+include(\"\${CMAKE_CURRENT_LIST_DIR}/cppfs-export.cmake\")
+")
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
diff --git a/external_imported/vcpkg/ports/cppfs/ssh-dependencies.diff b/external_imported/vcpkg/ports/cppfs/ssh-dependencies.diff
new file mode 100644
index 000000000..28d9e92e3
--- /dev/null
+++ b/external_imported/vcpkg/ports/cppfs/ssh-dependencies.diff
@@ -0,0 +1,44 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ea9fd15..af63d1e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -7,7 +7,7 @@
+ cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
+ 
+ # Include cmake modules
+-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
++# list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+ 
+ include(GenerateExportHeader)
+ 
+diff --git a/source/cppfs/CMakeLists.txt b/source/cppfs/CMakeLists.txt
+index aa37eda..d29176a 100644
+--- a/source/cppfs/CMakeLists.txt
++++ b/source/cppfs/CMakeLists.txt
+@@ -4,9 +4,9 @@
+ #
+ 
+-find_package(LibSSH2)
+-find_package(LibCrypto)
++find_package(LibSSH2 NAMES Libssh2)
+ find_package(ZLIB)
+ find_package(OpenSSL)
++set(LibCrypto_FOUND "${OpenSSL_FOUND}")
+ 
+ if (LibSSH2_FOUND AND LibCrypto_FOUND AND ZLIB_FOUND AND OpenSSL_FOUND)
+     set(SSH_DEPS_MET TRUE)
+@@ -207,10 +207,10 @@ target_link_libraries(${target}
+ if (OPTION_BUILD_SSH_BACKEND)
+     target_link_libraries(${target}
+         PRIVATE
+-        ${OPENSSL_LIBRARIES}
+-        ${LIBSSH2_LIBRARY}
+-        ${LIBCRYPTO_LIBRARY}
+-        ${ZLIB_LIBRARY}
++        OpenSSL::SSL
++        $<IF:$<TARGET_EXISTS:Libssh2::libssh2_shared>,Libssh2::libssh2_shared,Libssh2::libssh2_static>
++        OpenSSL::Crypto
++        ZLIB::ZLIB
+     )
+ 
+     if("${CMAKE_SYSTEM_NAME}" MATCHES "Windows")
diff --git a/external_imported/vcpkg/ports/cppfs/vcpkg.json b/external_imported/vcpkg/ports/cppfs/vcpkg.json
index 02f8f7e4a..a86f0d82c 100644
--- a/external_imported/vcpkg/ports/cppfs/vcpkg.json
+++ b/external_imported/vcpkg/ports/cppfs/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "cppfs",
   "version": "1.3.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Cross-platform C++ file system library supporting multiple backends",
   "license": "MIT",
   "supports": "!uwp",
diff --git a/external_imported/vcpkg/ports/cppgraphqlgen/portfile.cmake b/external_imported/vcpkg/ports/cppgraphqlgen/portfile.cmake
index 4642f320b..d690247cc 100644
--- a/external_imported/vcpkg/ports/cppgraphqlgen/portfile.cmake
+++ b/external_imported/vcpkg/ports/cppgraphqlgen/portfile.cmake
@@ -1,11 +1,17 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO microsoft/cppgraphqlgen
-    REF v4.5.1
-    SHA512 a4539d09eabecc7dc0c6715796db4915c8ac602fc1650b8a212b2a09168be15eb0992646fd5b577b7c7c06d8f77e808dae2481027ceb053c96e5b5eabd560103
+    REF "v${VERSION}"
+    SHA512 8079b2690ef4fba491e96ef2ed3da61d0c0b7bee3f61fa6d1fb95c771f1a8220a7b15b489b21bf9b1627e8616f95c65b43b8f63ee93cb0193edac4cb54307b3a
     HEAD_REF main
 )
 
+vcpkg_check_features(
+    OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        rapidjson   GRAPHQL_USE_RAPIDJSON
+)
+
 vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS 
@@ -13,6 +19,7 @@ vcpkg_cmake_configure(
         -DGRAPHQL_UPDATE_VERSION=OFF 
         -DGRAPHQL_UPDATE_SAMPLES=OFF 
         -DGRAPHQL_INSTALL_CONFIGURATIONS=Release
+        ${FEATURE_OPTIONS}
     OPTIONS_RELEASE 
         -DGRAPHQL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share 
         -DGRAPHQL_INSTALL_TOOLS_DIR=${CURRENT_PACKAGES_DIR}/tools
diff --git a/external_imported/vcpkg/ports/cppgraphqlgen/vcpkg.json b/external_imported/vcpkg/ports/cppgraphqlgen/vcpkg.json
index 87a2f7454..3d3521f67 100644
--- a/external_imported/vcpkg/ports/cppgraphqlgen/vcpkg.json
+++ b/external_imported/vcpkg/ports/cppgraphqlgen/vcpkg.json
@@ -1,13 +1,12 @@
 {
   "name": "cppgraphqlgen",
-  "version": "4.5.1",
+  "version": "4.5.5",
   "description": "C++ GraphQL schema service generator",
   "homepage": "https://github.com/microsoft/cppgraphqlgen",
   "license": "MIT",
   "dependencies": [
     "boost-program-options",
     "pegtl",
-    "rapidjson",
     {
       "name": "vcpkg-cmake",
       "host": true
@@ -16,5 +15,16 @@
       "name": "vcpkg-cmake-config",
       "host": true
     }
-  ]
+  ],
+  "default-features": [
+    "rapidjson"
+  ],
+  "features": {
+    "rapidjson": {
+      "description": "Build the graphqljson library with RapidJSON.",
+      "dependencies": [
+        "rapidjson"
+      ]
+    }
+  }
 }
diff --git a/external_imported/vcpkg/ports/cppkafka/0001-Fix-static-lib.patch b/external_imported/vcpkg/ports/cppkafka/0001-Fix-static-lib.patch
new file mode 100644
index 000000000..be5d7c30a
--- /dev/null
+++ b/external_imported/vcpkg/ports/cppkafka/0001-Fix-static-lib.patch
@@ -0,0 +1,38 @@
+From fb7cbb0648948b51f71aefaa6b2354846f72439f Mon Sep 17 00:00:00 2001
+From: Nikita Vakula <programmistov.programmist@gmail.com>
+Date: Mon, 1 May 2023 23:12:09 +0200
+Subject: [PATCH 1/2] Use correct rdkafka .pc
+
+Signed-off-by: Nikita Vakula <programmistov.programmist@gmail.com>
+---
+ CMakeLists.txt       | 1 +
+ cmake/cppkafka.pc.in | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c4e44e6..e34c071 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -92,6 +92,7 @@ endif()
+ 
+ if (CPPKAFKA_RDKAFKA_STATIC_LIB)
+     add_definitions("-DLIBRDKAFKA_STATICLIB")
++    set(RDKAFKA_STATIC "-static")
+ endif()
+ 
+ if (NOT CPPKAFKA_CONFIG_DIR)
+diff --git a/cmake/cppkafka.pc.in b/cmake/cppkafka.pc.in
+index b5d432c..4e50860 100644
+--- a/cmake/cppkafka.pc.in
++++ b/cmake/cppkafka.pc.in
+@@ -9,6 +9,6 @@ Url: https://github.com/mfontanini/cppkafka
+ Description: C++ wrapper library on top of RdKafka
+ Version: @CPPKAFKA_VERSION@
+ Requires:
+-Requires.private: rdkafka >= 0.9.4
++Requires.private: rdkafka@RDKAFKA_STATIC@ >= 0.9.4
+ Libs: -L${libdir} -L${sharedlibdir} -lcppkafka
+ Cflags: -I${includedir} -I${includedir}/cppkafka -I@Boost_INCLUDE_DIRS@
+-- 
+2.37.1 (Apple Git-137.1)
+
diff --git a/external_imported/vcpkg/ports/cppkafka/0002-Remove-min-max-macros.patch b/external_imported/vcpkg/ports/cppkafka/0002-Remove-min-max-macros.patch
new file mode 100644
index 000000000..c06277c88
--- /dev/null
+++ b/external_imported/vcpkg/ports/cppkafka/0002-Remove-min-max-macros.patch
@@ -0,0 +1,27 @@
+From e2c9c0a1cee07c6cacedd682d3506b447c2c561b Mon Sep 17 00:00:00 2001
+From: Nikita Vakula <programmistov.programmist@gmail.com>
+Date: Mon, 1 May 2023 23:11:19 +0200
+Subject: [PATCH 2/2] Remove min/max macros
+
+Signed-off-by: Nikita Vakula <programmistov.programmist@gmail.com>
+---
+ src/CMakeLists.txt | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 5b8649b..5c818ee 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -36,6 +36,9 @@ set(NAMESPACE           "${PROJECT_NAME}::")
+ set(TARGET_EXPORT_NAME  ${PROJECT_NAME}Targets)
+ 
+ add_library(${TARGET_NAME} ${CPPKAFKA_LIBRARY_TYPE} ${SOURCES})
++if (MSVC)
++    target_compile_definitions(${TARGET_NAME} PRIVATE NOMINMAX)
++endif ()
+ target_include_directories(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include/cppkafka>)
+ set_target_properties(${TARGET_NAME} PROPERTIES
+         ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_INSTALL_LIBDIR}"
+-- 
+2.37.1 (Apple Git-137.1)
+
diff --git a/external_imported/vcpkg/ports/cppkafka/fix-dynamic.patch b/external_imported/vcpkg/ports/cppkafka/fix-dynamic.patch
deleted file mode 100644
index f18a0fbf7..000000000
--- a/external_imported/vcpkg/ports/cppkafka/fix-dynamic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 5d31078..b1d3634 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -43,6 +43,7 @@ target_include_directories(cppkafka PUBLIC ${PROJECT_SOURCE_DIR}/include)
- 
- install( 
-     TARGETS cppkafka
-+    RUNTIME DESTINATION bin
-     LIBRARY DESTINATION lib
-     ARCHIVE DESTINATION lib
-     COMPONENT dev
diff --git a/external_imported/vcpkg/ports/cppkafka/portfile.cmake b/external_imported/vcpkg/ports/cppkafka/portfile.cmake
index 49f712266..5fb7f55d1 100644
--- a/external_imported/vcpkg/ports/cppkafka/portfile.cmake
+++ b/external_imported/vcpkg/ports/cppkafka/portfile.cmake
@@ -1,32 +1,47 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mfontanini/cppkafka
-    REF "v${VERSION}"
-    SHA512 60d01ce1dd9bd9119676be939ed5ab03539abb1f945c1b31e432edfe0f06542778f7fef37696f5ff19c53024f44d5cbd8aeddbbb231c38b098e05285d3ff0cab
+    REF "${VERSION}"
+    SHA512 86ac1500bdf6746a5e44e9ca4a4063eabcacec68b26c6846f7e7d47fe947309fc98a47986ab060d793096665d1cdc24044334267eb579cdb191f539bf96a3294
     HEAD_REF master
-    PATCHES fix-dynamic.patch
+    PATCHES
+        0001-Fix-static-lib.patch
+        0002-Remove-min-max-macros.patch
 )
 
 if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     set(CPPKAFKA_BUILD_SHARED OFF)
+    set(CPPKAFKA_RDKAFKA_STATIC_LIB ON)
 else()
     set(CPPKAFKA_BUILD_SHARED ON)
+    set(CPPKAFKA_RDKAFKA_STATIC_LIB OFF)
 endif()
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE
     OPTIONS 
+       -DCMAKE_CXX_STANDARD=11
        -DCPPKAFKA_BUILD_SHARED=${CPPKAFKA_BUILD_SHARED}
        -DCPPKAFKA_DISABLE_TESTS=ON
        -DCPPKAFKA_DISABLE_EXAMPLES=ON
+       -DCPPKAFKA_PKGCONFIG_DIR=lib/pkgconfig
+       -DCPPKAFKA_RDKAFKA_STATIC_LIB=${CPPKAFKA_RDKAFKA_STATIC_LIB}
 )
 
 vcpkg_cmake_install()
 
 vcpkg_copy_pdbs()
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+vcpkg_cmake_config_fixup(
+    CONFIG_PATH lib/cmake/CppKafka
+)
+
+file(REMOVE_RECURSE
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/debug/share"
+)
 
 # Handle copyright
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+vcpkg_fixup_pkgconfig()
diff --git a/external_imported/vcpkg/ports/cppkafka/vcpkg.json b/external_imported/vcpkg/ports/cppkafka/vcpkg.json
index 58525c463..f9be36ab9 100644
--- a/external_imported/vcpkg/ports/cppkafka/vcpkg.json
+++ b/external_imported/vcpkg/ports/cppkafka/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "cppkafka",
-  "version": "0.3.1",
-  "port-version": 5,
+  "version": "0.4.0",
   "description": "cppkafka allows C++ applications to consume and produce messages using the Apache Kafka protocol. The library is built on top of librdkafka, and provides a high level API that uses modern C++ features to make it easier to write code while keeping the wrapper's performance overhead to a minimum.",
   "homepage": "https://github.com/mfontanini/cppkafka",
   "license": "BSD-2-Clause",
@@ -11,6 +10,10 @@
     {
       "name": "vcpkg-cmake",
       "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/cppmicroservices/fix-dependency-gtest.patch b/external_imported/vcpkg/ports/cppmicroservices/fix-dependency-gtest.patch
deleted file mode 100644
index 9eb9459f1..000000000
--- a/external_imported/vcpkg/ports/cppmicroservices/fix-dependency-gtest.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 136edff..9d29522 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -288,6 +288,10 @@ if(US_COMPILER_APPLE_CLANG OR US_COMPILER_CLANG)
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
- endif()
- 
-+# Dependency
-+find_package(GTest CONFIG REQUIRED)
-+link_libraries(GTest::gtest GTest::gmock)
-+
- #-----------------------------------------------------------------------------
- # Testing configuration
- #-----------------------------------------------------------------------------
-@@ -338,7 +342,7 @@ if(US_BUILD_TESTING)
-   endif()
- 
-   if(US_USE_SYSTEM_GTEST)
--    find_package(GTest REQUIRED)
-+    find_package(GTest CONFIG REQUIRED)
-   else()
-     # This keeps GTest CMake variables hidden from users unless they explicitly want to view/modify them.
-     us_cache_var(BUILD_GMOCK ON BOOL "Build GMock" ADVANCED FORCE)
diff --git a/external_imported/vcpkg/ports/cppmicroservices/fix-warning-c4834.patch b/external_imported/vcpkg/ports/cppmicroservices/fix-warning-c4834.patch
deleted file mode 100644
index 893b28d30..000000000
--- a/external_imported/vcpkg/ports/cppmicroservices/fix-warning-c4834.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/httpservice/src/ServletContainer.cpp b/httpservice/src/ServletContainer.cpp
-index b4af8c9..8713066 100644
---- a/httpservice/src/ServletContainer.cpp
-+++ b/httpservice/src/ServletContainer.cpp
-@@ -279,7 +279,9 @@ void ServletContainer::SetContextPath(const std::string& path)
- 
- std::string ServletContainer::GetContextPath() const
- {
--  return Lock(d->m_Mutex), d->m_ContextPath;
-+  Lock l(d->m_Mutex);
-+  US_UNUSED(l);
-+  return d->m_ContextPath;
- }
- 
- void ServletContainer::Start()
-@@ -306,6 +308,8 @@ std::shared_ptr<ServletContext> ServletContainer::GetContext(
- std::string ServletContainer::GetContextPath(
-   const ServletContext* /*context*/) const
- {
--  return Lock(d->m_Mutex), d->m_ContextPath;
-+  Lock l(d->m_Mutex);
-+  US_UNUSED(l);
-+  return d->m_ContextPath;
- }
- }
diff --git a/external_imported/vcpkg/ports/cppmicroservices/fix_strnicmp.patch b/external_imported/vcpkg/ports/cppmicroservices/fix_strnicmp.patch
new file mode 100644
index 000000000..1a9245f6a
--- /dev/null
+++ b/external_imported/vcpkg/ports/cppmicroservices/fix_strnicmp.patch
@@ -0,0 +1,13 @@
+diff --git a/framework/src/util/PropsCheck.h b/framework/src/util/PropsCheck.h
+index 26acd33..930a328 100644
+--- a/framework/src/util/PropsCheck.h
++++ b/framework/src/util/PropsCheck.h
+@@ -47,7 +47,7 @@
+ 
+ #ifdef US_PLATFORM_WINDOWS
+ #    include <string.h>
+-#    define ci_compare strnicmp
++#    define ci_compare _strnicmp
+ #else
+ #    include <strings.h>
+ #    define ci_compare strncasecmp
diff --git a/external_imported/vcpkg/ports/cppmicroservices/portfile.cmake b/external_imported/vcpkg/ports/cppmicroservices/portfile.cmake
index 60a99f6a3..ad7b3cc77 100644
--- a/external_imported/vcpkg/ports/cppmicroservices/portfile.cmake
+++ b/external_imported/vcpkg/ports/cppmicroservices/portfile.cmake
@@ -1,15 +1,27 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO CppMicroServices/CppMicroservices
-    REF v3.6.0
-    SHA512 C1407E1D3C2FD31675C32D8C00F7D005C09B03A835D5B09411B0043DDEAF5E3A1A0C7A5FA34FA04D5A643169D222D0E8D3A3C31CDA69FB64CDF1A8CCA276BE18
+    REF "v${VERSION}"
+    SHA512 4743846a8ba45e6bd320c93bb3bd443b5dac16ea0bbf55bda6212e9200a40ee29031fd74c6141de4c6b5ef9ad3e70789d13fda25b40638547782d386a12dd7e2
     HEAD_REF development
     PATCHES
         werror.patch
-        fix-dependency-gtest.patch
-        fix-warning-c4834.patch
+        fix_strnicmp.patch
+        remove-wx.patch
 )
 
+#nowide download
+vcpkg_from_github(
+    OUT_SOURCE_PATH NOWIDE_SOURCE_PATH
+    REPO boostorg/nowide
+    REF 02f40f0b5f5686627fcddae93ff88ca399db4766
+    SHA512 e68e0704896726c7a94b8ace0e03c5206b4c7acd23a6b05f6fb2660abe30611ac6913cf5fab7b57eaff1990a7c28aeee8c9f526b60f7094c0c201f90b715d6c6
+    HEAD_REF develop
+)
+
+file(REMOVE_RECURSE "${SOURCE_PATH}/third_party/boost/nowide")
+file(RENAME "${NOWIDE_SOURCE_PATH}" "${SOURCE_PATH}/third_party/boost/nowide")
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
@@ -25,7 +37,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 vcpkg_cmake_config_fixup()
 
 # Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
 
 # CppMicroServices uses a custom resource compiler to compile resources
 # the zipped resources are then appended to the target which cause the linker to crash
diff --git a/external_imported/vcpkg/ports/cppmicroservices/remove-wx.patch b/external_imported/vcpkg/ports/cppmicroservices/remove-wx.patch
new file mode 100644
index 000000000..dadae53f5
--- /dev/null
+++ b/external_imported/vcpkg/ports/cppmicroservices/remove-wx.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2bec34f..801d049 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -511,7 +511,7 @@ if(MSVC)
+     set(US_ENABLE_ASAN OFF)
+   endif()
+ 
+-  set(US_CXX_FLAGS "/MP /WX /D${msvc_version_define} ${US_CXX_FLAGS}")
++  set(US_CXX_FLAGS "/MP /D${msvc_version_define} ${US_CXX_FLAGS}")
+ else()
+ 
+   # If not cross-compiling, turn on Stack Smashing Protection.
diff --git a/external_imported/vcpkg/ports/cppmicroservices/vcpkg.json b/external_imported/vcpkg/ports/cppmicroservices/vcpkg.json
index c1c72f5e9..4a7a4be78 100644
--- a/external_imported/vcpkg/ports/cppmicroservices/vcpkg.json
+++ b/external_imported/vcpkg/ports/cppmicroservices/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "cppmicroservices",
-  "version": "3.6.0",
+  "version": "3.7.6",
   "port-version": 1,
   "description": "An OSGi-like C++ dynamic module system and service registry",
   "homepage": "https://github.com/CppMicroServices/CppMicroServices",
+  "license": "Apache-2.0",
   "dependencies": [
     "gtest",
     {
diff --git a/external_imported/vcpkg/ports/cppp-reiconv/portfile.cmake b/external_imported/vcpkg/ports/cppp-reiconv/portfile.cmake
new file mode 100644
index 000000000..eae729b97
--- /dev/null
+++ b/external_imported/vcpkg/ports/cppp-reiconv/portfile.cmake
@@ -0,0 +1,28 @@
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://github.com/cppp-project/cppp-reiconv/releases/download/v${VERSION}/cppp-reiconv-v${VERSION}.zip"
+    FILENAME "cppp-reiconv-v${VERSION}.zip"
+    SHA512 56294d63a71818842ec3f4a513bdc022ea3f472b582e16d377ec61282005965e7a08d619b9620cc036feb391e5b2eab3bfb4a1a21dcc860df89234e847048678
+)
+
+vcpkg_extract_source_archive(
+    SOURCE_PATH
+    ARCHIVE "${ARCHIVE}"
+)
+
+vcpkg_find_acquire_program(PYTHON3)
+get_filename_component(PYTHON3_DIR ${PYTHON3} DIRECTORY)
+vcpkg_add_to_path("${PYTHON3_DIR}")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+     OPTIONS -DENABLE_TEST=OFF -DENABLE_EXTRA=ON
+)
+
+vcpkg_cmake_install()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/cppp-reiconv/vcpkg.json b/external_imported/vcpkg/ports/cppp-reiconv/vcpkg.json
new file mode 100644
index 000000000..ae359b26d
--- /dev/null
+++ b/external_imported/vcpkg/ports/cppp-reiconv/vcpkg.json
@@ -0,0 +1,13 @@
+{
+  "name": "cppp-reiconv",
+  "version": "2.1.0",
+  "description": "cppp-reiconv: A character set conversion library based on GNU LIBICONV for The C++ Plus Project.",
+  "homepage": "https://github.com/cppp-project/cppp-reiconv",
+  "license": "LGPL-3.0",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/cpprestsdk/fix-uwp.patch b/external_imported/vcpkg/ports/cpprestsdk/fix-uwp.patch
new file mode 100644
index 000000000..c7e77ebf6
--- /dev/null
+++ b/external_imported/vcpkg/ports/cpprestsdk/fix-uwp.patch
@@ -0,0 +1,28 @@
+diff --git a/Release/CMakeLists.txt b/Release/CMakeLists.txt
+index b8f3809..3857cfc 100644
+--- a/Release/CMakeLists.txt
++++ b/Release/CMakeLists.txt
+@@ -187,7 +187,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+   set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /profile /OPT:REF /OPT:ICF")
+ 
+   if (WINDOWS_STORE OR WINDOWS_PHONE)
+-    add_compile_options(/ZW)
++    # add_compile_options(/ZW)
+   else()
+     if (NOT (MSVC_VERSION LESS 1920))
+       add_compile_options(/permissive-)
+diff --git a/Release/src/CMakeLists.txt b/Release/src/CMakeLists.txt
+index 128f6d6..098d33f 100644
+--- a/Release/src/CMakeLists.txt
++++ b/Release/src/CMakeLists.txt
+@@ -47,6 +47,10 @@ target_include_directories(cpprest
+     pch
+ )
+ 
++if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC" AND (WINDOWS_STORE OR WINDOWS_PHONE))
++    target_compile_options(cpprest PUBLIC /ZW)
++endif()
++
+ ## Sub-components
+ # Websockets component
+ if(CPPREST_WEBSOCKETS_IMPL STREQUAL "none")
diff --git a/external_imported/vcpkg/ports/cpprestsdk/portfile.cmake b/external_imported/vcpkg/ports/cpprestsdk/portfile.cmake
index 237df1a40..371d92a5c 100644
--- a/external_imported/vcpkg/ports/cpprestsdk/portfile.cmake
+++ b/external_imported/vcpkg/ports/cpprestsdk/portfile.cmake
@@ -1,12 +1,13 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/cpprestsdk
-    REF 122d09549201da5383321d870bed45ecb9e168c5
-    SHA512 c9ded33d3c67880e2471e479a38b40a14a9ff45d241e928b6339eca697b06ad621846260eca47b6b1b8a2bc9ab7bf4fea8d3e8e795cd430d8839beb530e16dd7
+    REF 411a109150b270f23c8c97fa4ec9a0a4a98cdecf
+    SHA512 4f604763f05d53e50dec5deaba283fa4f82d5e7a94c7c8142bf422f4c0bc24bcef00666ddbdd820f64c14e552997d6657b6aca79a29e69db43799961b44b2a1a
     HEAD_REF master
     PATCHES 
         fix-find-openssl.patch
         fix_narrowing.patch
+        fix-uwp.patch
 )
 
 set(OPTIONS)
diff --git a/external_imported/vcpkg/ports/cpprestsdk/test.patch b/external_imported/vcpkg/ports/cpprestsdk/test.patch
new file mode 100644
index 000000000..c5507e88a
--- /dev/null
+++ b/external_imported/vcpkg/ports/cpprestsdk/test.patch
@@ -0,0 +1,23 @@
+diff --git a/Release/src/CMakeLists.txt b/Release/src/CMakeLists.txt
+index 098d33f..7f1f650 100644
+--- a/Release/src/CMakeLists.txt
++++ b/Release/src/CMakeLists.txt
+@@ -218,15 +218,15 @@ if (WIN32 AND NOT WINDOWS_STORE AND NOT WINDOWS_PHONE)
+     crypt32.lib
+   )
+ elseif(WINDOWS_STORE)
+-  if(NOT CMAKE_GENERATOR MATCHES "Visual Studio .*")
+-    target_compile_definitions(cpprest PRIVATE -DWINAPI_FAMILY=WINAPI_FAMILY_PC_APP)
++  
++    target_compile_definitions(cpprest PUBLIC -DWINAPI_FAMILY=WINAPI_FAMILY_PC_APP)
+     get_target_property(LINK_FLAGS cpprest LINK_FLAGS)
+     if(NOT LINK_FLAGS)
+         set(LINK_FLAGS "")
+     endif()
+     set(LINK_FLAGS "${LINK_FLAGS} /APPCONTAINER")
+     set_target_properties(cpprest PROPERTIES LINK_FLAGS "${LINK_FLAGS}")
+-  endif()
++  
+ endif()
+ 
+ set_target_properties(cpprest PROPERTIES OUTPUT_NAME "cpprest${CPPREST_ABI_TAG}")
diff --git a/external_imported/vcpkg/ports/cpprestsdk/vcpkg.json b/external_imported/vcpkg/ports/cpprestsdk/vcpkg.json
index eca5412f7..e8a0e467a 100644
--- a/external_imported/vcpkg/ports/cpprestsdk/vcpkg.json
+++ b/external_imported/vcpkg/ports/cpprestsdk/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "cpprestsdk",
-  "version": "2.10.18",
-  "port-version": 2,
+  "version": "2.10.19",
   "description": [
     "C++11 JSON, REST, and OAuth library",
     "The C++ REST SDK is a Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design. This project aims to help C++ developers connect to and interact with services."
@@ -55,7 +54,11 @@
     }
   ],
   "default-features": [
-    "default-features"
+    {
+      "name": "brotli",
+      "platform": "windows"
+    },
+    "compression"
   ],
   "features": {
     "brotli": {
@@ -77,25 +80,6 @@
         "zlib"
       ]
     },
-    "default-features": {
-      "description": "Features installed by default",
-      "dependencies": [
-        {
-          "name": "cpprestsdk",
-          "default-features": false,
-          "features": [
-            "compression"
-          ]
-        },
-        {
-          "name": "cpprestsdk",
-          "features": [
-            "brotli"
-          ],
-          "platform": "windows"
-        }
-      ]
-    },
     "websockets": {
       "description": "Websockets support",
       "dependencies": [
diff --git a/external_imported/vcpkg/ports/cppslippi/portfile.cmake b/external_imported/vcpkg/ports/cppslippi/portfile.cmake
new file mode 100644
index 000000000..08aab9ccb
--- /dev/null
+++ b/external_imported/vcpkg/ports/cppslippi/portfile.cmake
@@ -0,0 +1,21 @@
+vcpkg_from_sourceforge(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO            cppslippi
+    FILENAME        "CppSlippi-${VERSION}.zip"
+    SHA512          88b58e15a18c4d3dfd3d79098db45f7ef4ab8fc1b27329920f4e2c55971a3c67ef81ec013112875b1c944a3a939af7ab8684c2ad253af1e175ea5e2c1e69fd69
+    NO_REMOVE_ONE_LEVEL
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH ${SOURCE_PATH}
+    OPTIONS
+        -DBUILD_TESTING=False
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/CppSlippi)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
+
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+file(COPY "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/external_imported/vcpkg/ports/cppslippi/usage b/external_imported/vcpkg/ports/cppslippi/usage
new file mode 100644
index 000000000..b81dea185
--- /dev/null
+++ b/external_imported/vcpkg/ports/cppslippi/usage
@@ -0,0 +1,4 @@
+The package cppslippi provides CMake targets:
+
+    find_package(CppSlippi CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE CppSlippi::CppSlippi)
diff --git a/external_imported/vcpkg/ports/cppslippi/vcpkg.json b/external_imported/vcpkg/ports/cppslippi/vcpkg.json
new file mode 100644
index 000000000..6068a50fa
--- /dev/null
+++ b/external_imported/vcpkg/ports/cppslippi/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "cppslippi",
+  "version": "1.3.3.14",
+  "description": "C++ Slippi replay file parser.",
+  "homepage": "https://sourceforge.net/projects/cppslippi/",
+  "license": "MIT",
+  "dependencies": [
+    "nlohmann-json",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/cpptoml/portfile.cmake b/external_imported/vcpkg/ports/cpptoml/portfile.cmake
index d4242ff07..0a3472ed3 100644
--- a/external_imported/vcpkg/ports/cpptoml/portfile.cmake
+++ b/external_imported/vcpkg/ports/cpptoml/portfile.cmake
@@ -1,17 +1,21 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO skystrife/cpptoml
-
-	REF fededad7169e538ca47e11a9ee9251bc361a9a65
-	SHA512 2ec50f4585bca33bb343170470048a7d7e7902f1ffa5709cf84ddf9f53a899ff1cc9ffa49e059f6dad93d13823c4d2661bc8109e4356078cdbdfef1a2be6a622
-
+    REF "v${VERSION}"
+    SHA512 14edce576514d53a7e13562d7f8d2b66ea2b95f44038396c0e26232ec81783042ebecec31ee272a99afef96d5c8582a8e81ea5167a787844b98de6ee6f545cc5
     HEAD_REF master
 )
 
+if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW)
+    list(APPEND OPTIONS -DENABLE_LIBCXX=OFF)
+endif()
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
+        ${OPTIONS}
         -DCPPTOML_BUILD_EXAMPLES=OFF
+        -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
 )
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/cpptoml/vcpkg.json b/external_imported/vcpkg/ports/cpptoml/vcpkg.json
index fa2d04b57..af9a00518 100644
--- a/external_imported/vcpkg/ports/cpptoml/vcpkg.json
+++ b/external_imported/vcpkg/ports/cpptoml/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "cpptoml",
-  "version-string": "v0.1.1",
-  "port-version": 2,
+  "version": "0.1.1",
+  "port-version": 4,
   "description": "A header-only library for parsing TOML configuration files.",
   "homepage": "https://github.com/skystrife/cpptoml",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/cpptrace/libdwarf-0.9.0.diff b/external_imported/vcpkg/ports/cpptrace/libdwarf-0.9.0.diff
new file mode 100644
index 000000000..815bbe822
--- /dev/null
+++ b/external_imported/vcpkg/ports/cpptrace/libdwarf-0.9.0.diff
@@ -0,0 +1,39 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 418afae..4e94083 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -350,7 +350,7 @@ if(CPPTRACE_GET_SYMBOLS_WITH_LIBDWARF)
+   if(CPPTRACE_CONAN)
+     target_link_libraries(${target_name} PRIVATE libdwarf::libdwarf)
+   elseif(CPPTRACE_VCPKG)
+-    target_link_libraries(${target_name} PRIVATE $<IF:$<TARGET_EXISTS:libdwarf::dwarf-static>,libdwarf::dwarf-static,libdwarf::dwarf-shared>)
++    target_link_libraries(${target_name} PRIVATE libdwarf::dwarf)
+   else()
+     target_link_libraries(${target_name} PRIVATE libdwarf::dwarf-static)
+   endif()
+diff --git a/src/symbols/symbols_with_libdwarf.cpp b/src/symbols/symbols_with_libdwarf.cpp
+index a13c1bd..1e33f9d 100644
+--- a/src/symbols/symbols_with_libdwarf.cpp
++++ b/src/symbols/symbols_with_libdwarf.cpp
+@@ -20,7 +20,7 @@
+ #include <unordered_map>
+ #include <vector>
+
+-#ifdef CPPTRACE_USE_EXTERNAL_LIBDWARF
++#if 0
+ #include <libdwarf/libdwarf.h>
+ #include <libdwarf/dwarf.h>
+ #else
+diff --git a/src/utils/dwarf.hpp b/src/utils/dwarf.hpp
+index 61a8ea5..2210de3 100644
+--- a/src/utils/dwarf.hpp
++++ b/src/utils/dwarf.hpp
+@@ -9,7 +9,7 @@
+ #include <stdexcept>
+ #include <type_traits>
+
+-#ifdef CPPTRACE_USE_EXTERNAL_LIBDWARF
++#if 0
+ #include <libdwarf/libdwarf.h>
+ #include <libdwarf/dwarf.h>
+ #else
diff --git a/external_imported/vcpkg/ports/cpptrace/portfile.cmake b/external_imported/vcpkg/ports/cpptrace/portfile.cmake
new file mode 100644
index 000000000..027ba69ab
--- /dev/null
+++ b/external_imported/vcpkg/ports/cpptrace/portfile.cmake
@@ -0,0 +1,25 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO jeremy-rifkin/cpptrace
+    REF "v${VERSION}"
+    SHA512 732f8f70d9c8f01d10802bbb1da150d75b93c15fa0299bb84ba5be87d0da52ebe3b637e382a044c8d1e4ea283fae84c008113fc1f17ec4224692d5d911ab45d7
+    HEAD_REF main
+    PATCHES
+      libdwarf-0.9.0.diff
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS -DCPPTRACE_USE_EXTERNAL_LIBDWARF=ON -DCPPTRACE_VCPKG=ON
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(
+    PACKAGE_NAME "cpptrace"
+    CONFIG_PATH "lib/cmake/cpptrace"
+)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/cpptrace/usage b/external_imported/vcpkg/ports/cpptrace/usage
new file mode 100644
index 000000000..eeebe202f
--- /dev/null
+++ b/external_imported/vcpkg/ports/cpptrace/usage
@@ -0,0 +1,4 @@
+cpptrace provides CMake targets:
+
+  find_package(cpptrace CONFIG REQUIRED)
+  target_link_libraries(main PRIVATE cpptrace::cpptrace)
diff --git a/external_imported/vcpkg/ports/cpptrace/vcpkg.json b/external_imported/vcpkg/ports/cpptrace/vcpkg.json
new file mode 100644
index 000000000..a1f240c1c
--- /dev/null
+++ b/external_imported/vcpkg/ports/cpptrace/vcpkg.json
@@ -0,0 +1,23 @@
+{
+  "name": "cpptrace",
+  "version": "0.3.1",
+  "port-version": 1,
+  "description": "Simple, portable, and self-contained stacktrace library for C++11 and newer",
+  "homepage": "https://github.com/jeremy-rifkin/cpptrace",
+  "license": "MIT",
+  "supports": "!uwp",
+  "dependencies": [
+    {
+      "name": "libdwarf",
+      "platform": "!windows | mingw"
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/cppunit/portfile.cmake b/external_imported/vcpkg/ports/cppunit/portfile.cmake
index 5daefd732..8eefa5a06 100644
--- a/external_imported/vcpkg/ports/cppunit/portfile.cmake
+++ b/external_imported/vcpkg/ports/cppunit/portfile.cmake
@@ -4,8 +4,8 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 0feb47faec451357bb4c4e287efa17bb60fd3ad966d5350e9f25b414aaab79e94921024b0c0497672f8d3eeb22a599213d2d71d9e1d28b243b3e37f3a9a43691
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
 )
 
diff --git a/external_imported/vcpkg/ports/cppunit/vcpkg.json b/external_imported/vcpkg/ports/cppunit/vcpkg.json
index 15fef69b6..354fd4065 100644
--- a/external_imported/vcpkg/ports/cppunit/vcpkg.json
+++ b/external_imported/vcpkg/ports/cppunit/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "cppunit",
   "version": "1.15.1",
-  "port-version": 3,
+  "port-version": 4,
   "description": "Unit testing framework module for the C++ programming language",
   "homepage": "https://www.freedesktop.org/wiki/Software/cppunit",
   "supports": "!uwp",
diff --git a/external_imported/vcpkg/ports/cppzmq/portfile.cmake b/external_imported/vcpkg/ports/cppzmq/portfile.cmake
index f9180c849..f67251099 100644
--- a/external_imported/vcpkg/ports/cppzmq/portfile.cmake
+++ b/external_imported/vcpkg/ports/cppzmq/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO zeromq/cppzmq
-    REF v4.9.0
-    SHA512 a9d1c25084b5b84dfa20a005299213c3bb610e46ac7433236fd8d3c60c7e71153c738da4645343080c0d1cad9008aca1a3091d4247c7a2f08c506ed3054d55a7
+    REF "v${VERSION}"
+    SHA512 4a4f3c2a270b9b21591b08a81f2ab6a72693af213c115f2c0aa5b737fd0363d09dba92437f48268ff982e6c27d6830f79244599bd9198e3402c6cca566cea27a
     HEAD_REF master
 )
 
@@ -25,4 +25,4 @@ vcpkg_fixup_pkgconfig()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/share/${PORT}/libzmq-pkg-config")
 
 # Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/cppzmq/vcpkg.json b/external_imported/vcpkg/ports/cppzmq/vcpkg.json
index be1541be7..0accde959 100644
--- a/external_imported/vcpkg/ports/cppzmq/vcpkg.json
+++ b/external_imported/vcpkg/ports/cppzmq/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "cppzmq",
-  "version": "4.9.0",
+  "version": "4.10.0",
   "description": "Header-only C++ binding for ZeroMQ",
   "homepage": "https://github.com/zeromq/cppzmq",
   "license": "MIT",
@@ -17,7 +17,16 @@
   ],
   "features": {
     "draft": {
-      "description": "Build and install draft"
+      "description": "Build and install draft",
+      "dependencies": [
+        {
+          "name": "zeromq",
+          "default-features": false,
+          "features": [
+            "draft"
+          ]
+        }
+      ]
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/cpr/001-cpr-config.patch b/external_imported/vcpkg/ports/cpr/001-cpr-config.patch
index 9d666553d..116321b0b 100644
--- a/external_imported/vcpkg/ports/cpr/001-cpr-config.patch
+++ b/external_imported/vcpkg/ports/cpr/001-cpr-config.patch
@@ -1,15 +1,15 @@
 diff --git a/cpr/CMakeLists.txt b/cpr/CMakeLists.txt
-index 66fc9eb..cc00c72 100644
+index 52787f5..aa3687d 100644
 --- a/cpr/CMakeLists.txt
 +++ b/cpr/CMakeLists.txt
-@@ -30,6 +30,10 @@ set_target_properties(cpr
-      VERSION ${${PROJECT_NAME}_VERSION}
-      SOVERSION ${${PROJECT_NAME}_VERSION_MAJOR})
- 
+@@ -46,6 +46,10 @@ set_target_properties(cpr
+         VERSION ${${PROJECT_NAME}_VERSION}
+         SOVERSION ${${PROJECT_NAME}_VERSION_MAJOR})
+
 +if (NOT DISABLE_INSTALL_HEADERS)
 +    install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/../include/cpr DESTINATION include)
 +endif()
 +
  # Import GNU common install directory variables
  include(GNUInstallDirs)
- 
+
diff --git a/external_imported/vcpkg/ports/cpr/disable_werror.patch b/external_imported/vcpkg/ports/cpr/disable_werror.patch
index 48803b8e3..1fc1be1a0 100644
--- a/external_imported/vcpkg/ports/cpr/disable_werror.patch
+++ b/external_imported/vcpkg/ports/cpr/disable_werror.patch
@@ -1,11 +1,11 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cb7c5f042..a5bc0b942 100644
+index 68b5343..fce2518 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -71,7 +71,7 @@ if(CPR_ENABLE_CPPCHECK)
+@@ -103,7 +103,7 @@ if(CPR_ENABLE_CPPCHECK)
      include(cmake/cppcheck.cmake)
  endif()
- 
+
 -if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
 +if (1)
  else()
diff --git a/external_imported/vcpkg/ports/cpr/portfile.cmake b/external_imported/vcpkg/ports/cpr/portfile.cmake
index 6b7a19142..1ccdc3f5c 100644
--- a/external_imported/vcpkg/ports/cpr/portfile.cmake
+++ b/external_imported/vcpkg/ports/cpr/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libcpr/cpr
-    REF a2d35a1cb9f3f7e2f1469d6a189751331dc99f96 #v1.9.3
-    SHA512 5df799fa53d51ba020a860ff928123921ed0ba59152de2b7e9d88b54ace820f5881fc72d056fca5679a7710357aa25854fa6dd6f9d230338b5378aebfe2bd957
+    REF ${VERSION}
+    SHA512 5e2fe69d5b4dfaa67f636098c8da904b43a22b21cc78bc52446e572ea47f492ce1de0f47fdc2cf34207729ccf007449278f218d8cdeef21f0b98356bca2e5e49
     HEAD_REF master
     PATCHES
         001-cpr-config.patch
@@ -18,7 +18,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS 
+    OPTIONS
         -DCPR_BUILD_TESTS=OFF
         -DCPR_FORCE_USE_SYSTEM_CURL=ON
         ${FEATURE_OPTIONS}
@@ -31,4 +31,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cpr)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/cpr/vcpkg.json b/external_imported/vcpkg/ports/cpr/vcpkg.json
index 5e5f3ec97..3cdf6d02f 100644
--- a/external_imported/vcpkg/ports/cpr/vcpkg.json
+++ b/external_imported/vcpkg/ports/cpr/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "cpr",
-  "version-semver": "1.9.3",
+  "version-semver": "1.10.5",
+  "port-version": 1,
   "description": "C++ Requests is a simple wrapper around libcurl inspired by the excellent Python Requests project.",
   "homepage": "https://github.com/libcpr/cpr",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/cpu-features/make_list_cpu_features_optional.patch b/external_imported/vcpkg/ports/cpu-features/make_list_cpu_features_optional.patch
deleted file mode 100644
index 73ccb5d99..000000000
--- a/external_imported/vcpkg/ports/cpu-features/make_list_cpu_features_optional.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 68ece3bba0d79ab721a0c50ee1e6014a37f759dc Mon Sep 17 00:00:00 2001
-From: Wei Dai <wei.dai@microsoft.com>
-Date: Mon, 24 May 2021 10:02:07 -0700
-Subject: [PATCH] Added an option to disable the executable target
- list_cpu_feature.
-
----
- CMakeLists.txt | 23 ++++++++++++++++++-----
- 1 file changed, 18 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f9daeac..48eea0e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -17,6 +17,8 @@ if(NOT CMAKE_BUILD_TYPE)
-       FORCE)
- endif(NOT CMAKE_BUILD_TYPE)
- 
-+# An option to disable the executable target list_cpu_features.
-+option(BUILD_EXECUTABLE "Build list_cpu_features executable." ON)
- # BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to make
- # it prominent in the GUI.
- # cpu_features uses bit-fields which are - to some extends - implementation-defined (see https://en.cppreference.com/w/c/language/bit_field).
-@@ -157,9 +159,11 @@ add_library(CpuFeature::cpu_features ALIAS cpu_features)
- # program : list_cpu_features
- #
- 
--add_executable(list_cpu_features ${PROJECT_SOURCE_DIR}/src/utils/list_cpu_features.c)
--target_link_libraries(list_cpu_features PRIVATE cpu_features)
--add_executable(CpuFeature::list_cpu_features ALIAS list_cpu_features)
-+if(BUILD_EXECUTABLE)
-+  add_executable(list_cpu_features ${PROJECT_SOURCE_DIR}/src/utils/list_cpu_features.c)
-+  target_link_libraries(list_cpu_features PRIVATE cpu_features)
-+  add_executable(CpuFeature::list_cpu_features ALIAS list_cpu_features)
-+endif()
- 
- #
- # ndk_compat
-@@ -223,18 +227,28 @@ if(BUILD_TESTING)
- endif()
- 
- #
--# Install cpu_features and list_cpu_features
-+# Install cpu_features and optionally list_cpu_features
- #
- 
- include(GNUInstallDirs)
--install(TARGETS cpu_features list_cpu_features
-+install(TARGETS cpu_features
-   EXPORT CpuFeaturesTargets
-   PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cpu_features
-   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-   BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR}
- )
-+if(BUILD_EXECUTABLE)
-+  install(TARGETS list_cpu_features
-+    EXPORT CpuFeaturesTargets
-+    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cpu_features
-+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-+    BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR}
-+  )
-+endif()
- install(EXPORT CpuFeaturesTargets
-   NAMESPACE CpuFeatures::
-   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/CpuFeatures
--- 
-2.25.1
-
diff --git a/external_imported/vcpkg/ports/cpu-features/portfile.cmake b/external_imported/vcpkg/ports/cpu-features/portfile.cmake
index 1803ea82a..af2bea7ce 100644
--- a/external_imported/vcpkg/ports/cpu-features/portfile.cmake
+++ b/external_imported/vcpkg/ports/cpu-features/portfile.cmake
@@ -3,16 +3,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/cpu_features
-    REF v0.7.0
-    SHA512 e602c88c4a104d69dff0297a4c4f8e26d02d548fc35ce2616429ff8280f2a37e9eaa99451a38b7c302907352cf15bdf8c09c2e0e52b09bf4cd3b7e2b21f8ddb0
+    REF "v${VERSION}"
+    SHA512 4e732f46b3b9efe48f0b6d06cfa87b3b25ed00e51c42de84c74cbbd4d66bd0974ff1a757b91574c6a3064cba6e5c2460117dd23b79b4136e5d1cd7e78dda47b1
     HEAD_REF master
-    PATCHES
-        make_list_cpu_features_optional.patch
-        windows-x86-fix.patch
 )
 
-# If feature "tools" is not specified, disable building/exporting executable targets.
-# This is necessary so that downstream find_package(CpuFeatures) does not fail.
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
         tools BUILD_EXECUTABLE
@@ -27,7 +22,12 @@ vcpkg_cmake_configure(
 
 vcpkg_cmake_install()
 
-vcpkg_cmake_config_fixup(PACKAGE_NAME "CpuFeatures" CONFIG_PATH "lib/cmake/CpuFeatures")
+if(VCPKG_TARGET_IS_ANDROID)
+    vcpkg_cmake_config_fixup(PACKAGE_NAME "CpuFeatures" CONFIG_PATH "lib/cmake/CpuFeatures" DO_NOT_DELETE_PARENT_CONFIG_PATH)
+    vcpkg_cmake_config_fixup(PACKAGE_NAME "CpuFeaturesNdkCompat" CONFIG_PATH "lib/cmake/CpuFeaturesNdkCompat")
+else()
+    vcpkg_cmake_config_fixup(PACKAGE_NAME "CpuFeatures" CONFIG_PATH "lib/cmake/CpuFeatures")
+endif()
 
 if("tools" IN_LIST FEATURES)
     vcpkg_copy_tools(TOOL_NAMES "list_cpu_features" AUTO_CLEAN)
@@ -35,4 +35,9 @@ endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+if(VCPKG_TARGET_IS_ANDROID)
+    file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage_android" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "usage")
+else()
+    file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+endif()
diff --git a/external_imported/vcpkg/ports/cpu-features/usage b/external_imported/vcpkg/ports/cpu-features/usage
new file mode 100644
index 000000000..c9c863a0c
--- /dev/null
+++ b/external_imported/vcpkg/ports/cpu-features/usage
@@ -0,0 +1,4 @@
+cpu-features provides CMake targets:
+
+    find_package(CpuFeatures CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE CpuFeatures::cpu_features)
diff --git a/external_imported/vcpkg/ports/cpu-features/usage_android b/external_imported/vcpkg/ports/cpu-features/usage_android
new file mode 100644
index 000000000..8fa0d5194
--- /dev/null
+++ b/external_imported/vcpkg/ports/cpu-features/usage_android
@@ -0,0 +1,7 @@
+cpu-features provides CMake targets:
+
+    find_package(CpuFeatures CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE CpuFeatures::cpu_features)
+
+    find_package(CpuFeaturesNdkCompat CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE CpuFeatures::ndk_compat)
diff --git a/external_imported/vcpkg/ports/cpu-features/vcpkg.json b/external_imported/vcpkg/ports/cpu-features/vcpkg.json
index 5fab9a9df..5260b649b 100644
--- a/external_imported/vcpkg/ports/cpu-features/vcpkg.json
+++ b/external_imported/vcpkg/ports/cpu-features/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "cpu-features",
-  "version": "0.7.0",
+  "version": "0.9.0",
   "description": "A cross-platform C library to retrieve CPU features (such as available instructions) at runtime",
   "homepage": "https://github.com/google/cpu_features",
   "license": "Apache-2.0",
-  "supports": "!(arm | uwp)",
+  "supports": "!uwp",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/cpu-features/windows-x86-fix.patch b/external_imported/vcpkg/ports/cpu-features/windows-x86-fix.patch
deleted file mode 100644
index e22c8d5b2..000000000
--- a/external_imported/vcpkg/ports/cpu-features/windows-x86-fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,13 +60,13 @@
- if(CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
-   set(PROCESSOR_IS_MIPS TRUE)
- elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm64)")
-   set(PROCESSOR_IS_AARCH64 TRUE)
- elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
-   set(PROCESSOR_IS_ARM TRUE)
--elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(AMD64|amd64)|(^i.86$)")
-+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(AMD64|amd64)|(^i.86$)")
-   set(PROCESSOR_IS_X86 TRUE)
- elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
-   set(PROCESSOR_IS_POWER TRUE)
- endif()
- 
- macro(add_cpu_features_headers_and_sources HDRS_LIST_NAME SRCS_LIST_NAME)
diff --git a/external_imported/vcpkg/ports/cpuinfo/vcpkg.json b/external_imported/vcpkg/ports/cpuinfo/vcpkg.json
index b02ab9bd2..f546ba011 100644
--- a/external_imported/vcpkg/ports/cpuinfo/vcpkg.json
+++ b/external_imported/vcpkg/ports/cpuinfo/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "cpuinfo",
   "version-date": "2022-07-19",
-  "port-version": 2,
+  "port-version": 3,
   "description": "CPU INFOrmation library (x86/x86-64/ARM/ARM64, Linux/Windows/Android/macOS/iOS)",
   "homepage": "https://github.com/pytorch/cpuinfo",
   "license": "BSD-2-Clause",
@@ -18,7 +18,8 @@
   ],
   "features": {
     "tools": {
-      "description": "Build cpuinfo command-line tools"
+      "description": "Build cpuinfo command-line tools",
+      "supports": "!uwp"
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/cr/vcpkg.json b/external_imported/vcpkg/ports/cr/vcpkg.json
index a80ef7059..5385b51a8 100644
--- a/external_imported/vcpkg/ports/cr/vcpkg.json
+++ b/external_imported/vcpkg/ports/cr/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "cr",
-  "version-string": "2020-04-26",
-  "port-version": 1,
+  "version-date": "2020-04-26",
+  "port-version": 2,
   "description": "cr.h: A Simple C Hot Reload Header-only Library",
   "homepage": "https://fungos.github.io/cr-simple-c-hot-reload/"
 }
diff --git a/external_imported/vcpkg/ports/crashpad/portfile.cmake b/external_imported/vcpkg/ports/crashpad/portfile.cmake
index 5962f284f..b370f22a4 100644
--- a/external_imported/vcpkg/ports/crashpad/portfile.cmake
+++ b/external_imported/vcpkg/ports/crashpad/portfile.cmake
@@ -30,6 +30,15 @@ checkout_in_path(
     "5654edb4225bcad13901155c819febb5748e502b"
 )
 
+if(VCPKG_TARGET_IS_LINUX)
+    # fetch lss
+    checkout_in_path(
+        "${SOURCE_PATH}/third_party/lss/lss"
+        https://chromium.googlesource.com/linux-syscall-support
+        9719c1e1e676814c456b55f5f070eabad6709d31
+    )
+endif()
+
 function(replace_gn_dependency INPUT_FILE OUTPUT_FILE LIBRARY_NAMES)
     unset(_LIBRARY_DEB CACHE)
     find_library(_LIBRARY_DEB NAMES ${LIBRARY_NAMES}
diff --git a/external_imported/vcpkg/ports/crashpad/vcpkg.json b/external_imported/vcpkg/ports/crashpad/vcpkg.json
index 8330d3e46..1045e7929 100644
--- a/external_imported/vcpkg/ports/crashpad/vcpkg.json
+++ b/external_imported/vcpkg/ports/crashpad/vcpkg.json
@@ -1,14 +1,14 @@
 {
   "name": "crashpad",
   "version-date": "2022-09-05",
-  "port-version": 3,
+  "port-version": 4,
   "description": [
     "Crashpad is a crash-reporting system.",
     "Crashpad is a library for capturing, storing and transmitting postmortem crash reports from a client to an upstream collection server. Crashpad aims to make it possible for clients to capture process state at the time of crash with the best possible fidelity and coverage, with the minimum of fuss."
   ],
   "homepage": "https://chromium.googlesource.com/crashpad/crashpad/+/master/README.md",
   "license": "Apache-2.0",
-  "supports": "osx | (windows & !uwp)",
+  "supports": "linux | osx | (windows & !uwp)",
   "dependencies": [
     {
       "name": "vcpkg-cmake-get-vars",
diff --git a/external_imported/vcpkg/ports/crc32c/vcpkg.json b/external_imported/vcpkg/ports/crc32c/vcpkg.json
index 3acb74812..3f8718aaa 100644
--- a/external_imported/vcpkg/ports/crc32c/vcpkg.json
+++ b/external_imported/vcpkg/ports/crc32c/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "crc32c",
   "version": "1.1.2",
-  "port-version": 1,
+  "port-version": 2,
   "description": "CRC32C implementation with support for CPU-specific acceleration instructions.",
   "homepage": "https://github.com/google/crc32c",
+  "license": "BSD-3-Clause",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/croncpp/0001-fix-cmake.patch b/external_imported/vcpkg/ports/croncpp/0001-fix-cmake.patch
deleted file mode 100644
index 735c9df34..000000000
--- a/external_imported/vcpkg/ports/croncpp/0001-fix-cmake.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 30db118abd484c59efada27d9d6956b5f68bcee6 Mon Sep 17 00:00:00 2001
-From: Robert Kesterson <robert.d.kesterson@leidos.com>
-Date: Fri, 4 Sep 2020 16:31:55 +0000
-Subject: [PATCH] vcpkg
-
----
- CMakeLists.txt      | 47 +++++++++++++++++++++++++++++++++++++++++++--
- croncppConfig.cmake |  1 +
- 2 files changed, 46 insertions(+), 2 deletions(-)
- create mode 100644 croncppConfig.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9114b39..8d46e6b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,5 +1,5 @@
- cmake_minimum_required(VERSION 3.7.0)
--project(croncpp)
-+project(croncpp VERSION 1.0.0)
- 
- if(WIN32)
-    message(status "Setting MSVC flags")
-@@ -24,4 +24,47 @@ if(BUILD_TESTS)
- endif()
- 
- add_subdirectory(benchmark)
--add_subdirectory(test)
-\ No newline at end of file
-+add_subdirectory(test)
-+
-+add_library( croncpp INTERFACE )
-+add_library( croncpp::croncpp ALIAS croncpp )
-+
-+include(GNUInstallDirs)
-+target_include_directories( croncpp INTERFACE
-+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-+    $<INSTALL_INTERFACE:include> )
-+
-+if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.15)
-+    # public headers will get installed:
-+    set_target_properties( croncpp PROPERTIES PUBLIC_HEADER include/croncpp.h )
-+endif ()
-+
-+
-+set( version_config "${CMAKE_CURRENT_BINARY_DIR}/croncppConfigVersion.cmake" )
-+
-+include( CMakePackageConfigHelpers )
-+write_basic_package_version_file( "${version_config}"
-+    VERSION ${PROJECT_VERSION}
-+    COMPATIBILITY SameMajorVersion )
-+
-+message(STATUS "CMAKE_INSTALL_INCLUDEDIR = ${CMAKE_INSTALL_INCLUDEDIR}")
-+
-+install( TARGETS croncpp
-+    EXPORT croncppConfig
-+    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/croncpp )
-+export( TARGETS croncpp NAMESPACE croncpp:: FILE croncppTargets.cmake )
-+if (CMAKE_VERSION VERSION_LESS 3.15)
-+    install(
-+        FILES include/croncpp.h
-+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/croncpp )
-+endif ()
-+
-+set( CONFIG_LOC "share/croncpp" )
-+
-+install( EXPORT croncppConfig
-+  FILE croncppTargets.cmake
-+  NAMESPACE croncpp::
-+  DESTINATION ${CONFIG_LOC} )
-+install (
-+  FILES croncppConfig.cmake "${version_config}"
-+  DESTINATION ${CONFIG_LOC})
-diff --git a/croncppConfig.cmake b/croncppConfig.cmake
-new file mode 100644
-index 0000000..3c4702c
---- /dev/null
-+++ b/croncppConfig.cmake
-@@ -0,0 +1 @@
-+include( "${CMAKE_CURRENT_LIST_DIR}/croncppTargets.cmake" )
--- 
-2.20.1
-
diff --git a/external_imported/vcpkg/ports/croncpp/no-test.patch b/external_imported/vcpkg/ports/croncpp/no-test.patch
deleted file mode 100644
index 0860e3f10..000000000
--- a/external_imported/vcpkg/ports/croncpp/no-test.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index a82e605..405f306 100644
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -1,3 +1,4 @@
-+if(BUILD_TESTS)
- cmake_minimum_required(VERSION 3.7.0)
- project(test_croncpp)
- 
-@@ -9,7 +10,6 @@ file(GLOB SOURCES "*.cpp" "include/*.cpp")
- 
- add_executable(test_croncpp ${SOURCES} ${headers})
- 
--if(BUILD_TESTS)
-     enable_testing()
- 
-     add_test(NAME "test_croncpp" COMMAND "test_croncpp" "-r compact")
diff --git a/external_imported/vcpkg/ports/croncpp/portfile.cmake b/external_imported/vcpkg/ports/croncpp/portfile.cmake
index bfdd2f84f..5c6763381 100644
--- a/external_imported/vcpkg/ports/croncpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/croncpp/portfile.cmake
@@ -1,26 +1,24 @@
+set(VCPKG_BUILD_TYPE release) # header-only port
 
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO mariusbancila/croncpp
-  REF 11cce4666a06c40346c7ba380ddd90c53806809d #master on 9/4/2020
-  SHA512 8f4d892ce90d8eca3711b21728bb599bf64857b20c0b143c5277687d0b6e5d5b8bf3e6dc7f9e8d028ba4e5ee711a5a9e750bcc2f771177d2f659c0c19e12207a
+  REF e817348a2dcd77b968c0b87a43274932b9800f4b # 2023-03-30
+  SHA512 aee687f4e8d7ce85aa9ba3a9e551443353abc20af9face62b618ce55ffa7a4632a4cd0c02c46e43c52b7f1797d62006183776a2d7fad48473bb964af79c2d531
   HEAD_REF master
-  PATCHES
-    0001-fix-cmake.patch
-    no-test.patch
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-      -DBUILD_TESTS=OFF
+      -DCRONCPP_BUILD_TESTS=OFF
 )
 
 vcpkg_cmake_install()
 
-vcpkg_cmake_config_fixup()
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
 
 # Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/croncpp/vcpkg.json b/external_imported/vcpkg/ports/croncpp/vcpkg.json
index e41db7b77..ec003cab8 100644
--- a/external_imported/vcpkg/ports/croncpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/croncpp/vcpkg.json
@@ -1,8 +1,7 @@
 {
   "name": "croncpp",
-  "version-date": "2020-09-04",
-  "port-version": 3,
-  "description": "croncpp is a C++17 header-only cross-platform library for handling CRON expressions.",
+  "version-date": "2023-03-30",
+  "description": "croncpp is a C++11/14/17 header-only cross-platform library for handling CRON expressions.",
   "homepage": "https://github.com/mariusbancila/croncpp",
   "license": "MIT",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/crossguid/missing-include-cstdint.patch b/external_imported/vcpkg/ports/crossguid/missing-include-cstdint.patch
new file mode 100644
index 000000000..a93011591
--- /dev/null
+++ b/external_imported/vcpkg/ports/crossguid/missing-include-cstdint.patch
@@ -0,0 +1,12 @@
+diff --git a/include/crossguid/guid.hpp b/include/crossguid/guid.hpp
+index 61e0f17..70966f2 100644
+--- a/include/crossguid/guid.hpp
++++ b/include/crossguid/guid.hpp
+@@ -29,6 +29,7 @@ THE SOFTWARE.
+ #include <jni.h>
+ #endif
+ 
++#include <cstdint>
+ #include <functional>
+ #include <iostream>
+ #include <array>
diff --git a/external_imported/vcpkg/ports/crossguid/portfile.cmake b/external_imported/vcpkg/ports/crossguid/portfile.cmake
index 5be5064d1..00b670ea4 100644
--- a/external_imported/vcpkg/ports/crossguid/portfile.cmake
+++ b/external_imported/vcpkg/ports/crossguid/portfile.cmake
@@ -8,6 +8,7 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
         warnings.patch
+        missing-include-cstdint.patch
 )
 
 vcpkg_cmake_configure(
diff --git a/external_imported/vcpkg/ports/crossguid/vcpkg.json b/external_imported/vcpkg/ports/crossguid/vcpkg.json
index aa9aecd85..ebdac5380 100644
--- a/external_imported/vcpkg/ports/crossguid/vcpkg.json
+++ b/external_imported/vcpkg/ports/crossguid/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "crossguid",
   "version-date": "2021-10-22",
-  "port-version": 2,
+  "port-version": 3,
   "description": "CrossGuid is a minimal, cross platform, C++ GUID library.",
   "dependencies": [
     {
diff --git a/external_imported/vcpkg/ports/cryptopp/patch.patch b/external_imported/vcpkg/ports/cryptopp/patch.patch
index de8d7cd1b..5e168d2fe 100644
--- a/external_imported/vcpkg/ports/cryptopp/patch.patch
+++ b/external_imported/vcpkg/ports/cryptopp/patch.patch
@@ -1,8 +1,8 @@
 diff --git a/config_cxx.h b/config_cxx.h
-index 03153ba..6d9187d 100644
+index ffd57ad..353d7ce 100644
 --- a/config_cxx.h
 +++ b/config_cxx.h
-@@ -214,7 +214,7 @@
+@@ -217,7 +217,7 @@
  // Also see https://github.com/weidai11/cryptopp/issues/980. I'm not sure what
  // to do when the compiler defines __cpp_lib_uncaught_exceptions but the platform
  // does not support std::uncaught_exceptions. What was Apple thinking???
@@ -12,18 +12,18 @@ index 03153ba..6d9187d 100644
  #  if __cpp_lib_uncaught_exceptions >= 201411L
  #   define CRYPTOPP_CXX17_UNCAUGHT_EXCEPTIONS 1
 diff --git a/config_os.h b/config_os.h
-index da27de22..9703f77d 100644
+index 0994563..4546585 100644
 --- a/config_os.h
 +++ b/config_os.h
 @@ -29,7 +29,7 @@
  // https://www.cryptopp.com/wiki/Release_Process#Self_Tests
  // The problems with Clang pretending to be other compilers is
  // discussed at http://github.com/weidai11/cryptopp/issues/147.
--#if (defined(_MSC_VER) && defined(__clang__) && \
-+#if (defined(_MSC_VER) && _MSC_VER < 1930 && defined(__clang__) && \
-    !(defined( __clang_analyzer__)) && !defined(__INTEL_LLVM_COMPILER))
+-#if (defined(_MSC_VER) && defined(__clang__))
++#if (defined(_MSC_VER) && _MSC_VER < 1930 && defined(__clang__))
  # error: "Unsupported configuration"
  #endif
+ 
 @@ -126,6 +126,7 @@
  #endif
  
diff --git a/external_imported/vcpkg/ports/cryptopp/portfile.cmake b/external_imported/vcpkg/ports/cryptopp/portfile.cmake
index 4accd731d..f68cd038d 100644
--- a/external_imported/vcpkg/ports/cryptopp/portfile.cmake
+++ b/external_imported/vcpkg/ports/cryptopp/portfile.cmake
@@ -1,18 +1,19 @@
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+string(REPLACE "." "_" CRYPTOPP_VERSION "${VERSION}")
 
 vcpkg_from_github(
   OUT_SOURCE_PATH CMAKE_SOURCE_PATH
   REPO abdes/cryptopp-cmake
-  REF 206aab4cb1e6e78b8460b8c0fe08449c280e321e #CRYPTOPP_8_7_0_1
-  SHA512 594cf9c277d703462375bdd466acd0145e849f55a7519ab266c3f2a6bd810341e86b088b9b4419a2ba2e63146c26de5ac295be071ec008dffdee8dc1edf32157
+  REF "CRYPTOPP_${CRYPTOPP_VERSION}"
+  SHA512 3ec33b107ab627a514e1ebbc4b6522ee8552525f36730d9b5feb85e61ba7fc24fd36eb6050e328c6789ff60d47796beaa8eebf7dead787a34395294fae9bb733
   HEAD_REF master
 )
 
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO weidai11/cryptopp
-  REF 511806c0eba8ba5b5cedd4b4a814e96df92864a6 #CRYPTOPP_8_7_0
-  SHA512 9d26299c6a55b32a790190c1e1dcbd9a93abc0c2a997714cb7c3a53daf9e142ba54afbd1fbaf86029dfc80d4687fd296dde589440ead07278499478d262a1483
+  REF "CRYPTOPP_${CRYPTOPP_VERSION}"
+  SHA512 28a67141155c9c15e3e6a2173b3a8487cc38a2a2ade73bf4a09814ca541be6b06e9a501be26f7e2f42a2f80df21b076aa5d8ad4224dc0a1f8d7f3b24deae465e
   HEAD_REF master
   PATCHES patch.patch
 )
diff --git a/external_imported/vcpkg/ports/cryptopp/vcpkg.json b/external_imported/vcpkg/ports/cryptopp/vcpkg.json
index 8fd926b8f..e3706c6c2 100644
--- a/external_imported/vcpkg/ports/cryptopp/vcpkg.json
+++ b/external_imported/vcpkg/ports/cryptopp/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "cryptopp",
-  "version": "8.7.0",
-  "port-version": 3,
+  "version": "8.9.0",
   "description": "Crypto++ is a free C++ class library of cryptographic schemes.",
   "homepage": "https://github.com/weidai11/cryptopp",
   "license": "BSL-1.0",
diff --git a/external_imported/vcpkg/ports/cserialport/vcpkg.json b/external_imported/vcpkg/ports/cserialport/vcpkg.json
index b2aaf684a..e8cacfaac 100644
--- a/external_imported/vcpkg/ports/cserialport/vcpkg.json
+++ b/external_imported/vcpkg/ports/cserialport/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "cserialport",
   "version": "4.3.0",
+  "port-version": 1,
   "description": "C++ lightweight cross-platform serial port library, also support C#, Java, Python, Node.js etc.",
   "homepage": "https://github.com/itas109/CSerialPort",
   "license": "LGPL-3.0-only",
-  "supports": "!uwp",
+  "supports": "!uwp & !xbox",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/cspice/portfile.cmake b/external_imported/vcpkg/ports/cspice/portfile.cmake
index 33d481d7b..a0bd3bb7e 100644
--- a/external_imported/vcpkg/ports/cspice/portfile.cmake
+++ b/external_imported/vcpkg/ports/cspice/portfile.cmake
@@ -35,8 +35,8 @@ if (NOT VCPKG_TARGET_IS_WINDOWS)
     set(PATCHES ${PATCHES} mktemp.patch)
 endif()
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE ${ARCHIVE}
     NO_REMOVE_ONE_LEVEL
     PATCHES ${PATCHES}
diff --git a/external_imported/vcpkg/ports/cspice/vcpkg.json b/external_imported/vcpkg/ports/cspice/vcpkg.json
index d84c24ae0..726655884 100644
--- a/external_imported/vcpkg/ports/cspice/vcpkg.json
+++ b/external_imported/vcpkg/ports/cspice/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "cspice",
   "version": "67",
-  "port-version": 2,
+  "port-version": 3,
   "description": "NASA C SPICE toolkit",
   "homepage": "https://naif.jpl.nasa.gov/naif/toolkit_C.html",
   "license": null,
diff --git a/external_imported/vcpkg/ports/ctbench/portfile.cmake b/external_imported/vcpkg/ports/ctbench/portfile.cmake
new file mode 100644
index 000000000..d9ce9f30d
--- /dev/null
+++ b/external_imported/vcpkg/ports/ctbench/portfile.cmake
@@ -0,0 +1,24 @@
+message(WARNING "Building ${PORT} requires a C++20 compliant compiler. GCC 12 and Clang 15 are known to work.")
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO jpenuchot/ctbench
+    REF "v${VERSION}"
+    SHA512 6dd3d28f57fd80b4ce06fad71cdb60bf0aec28e475183314b1c37af093e9e696a7aa58516c4d4580e26bc88a9ada02216e8e2043e2afc8ec60bd25d5dde14de8
+    HEAD_REF main
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH ${SOURCE_PATH}
+    OPTIONS
+        -DCTBENCH_ENABLE_TESTS=OFF
+        -DCTBENCH_ENABLE_DOCS=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ctbench
+    TOOLS_PATH bin/)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
diff --git a/external_imported/vcpkg/ports/ctbench/vcpkg.json b/external_imported/vcpkg/ports/ctbench/vcpkg.json
new file mode 100644
index 000000000..bcd7d52ad
--- /dev/null
+++ b/external_imported/vcpkg/ports/ctbench/vcpkg.json
@@ -0,0 +1,28 @@
+{
+  "name": "ctbench",
+  "version": "1.3.3",
+  "description": "Compiler-assisted variable size benchmarking for the study of C++ metaprogram compile times.",
+  "homepage": "https://github.com/JPenuchot/ctbench",
+  "documentation": "https://jpenuchot.github.io/ctbench-docs/",
+  "license": "MIT",
+  "supports": "!windows",
+  "dependencies": [
+    "boost-container",
+    "boost-process",
+    "fmt",
+    {
+      "name": "llvm",
+      "default-features": false
+    },
+    "nlohmann-json",
+    "sciplot",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/ctbignum/vcpkg.json b/external_imported/vcpkg/ports/ctbignum/vcpkg.json
index 4c517ec65..eeb145c86 100644
--- a/external_imported/vcpkg/ports/ctbignum/vcpkg.json
+++ b/external_imported/vcpkg/ports/ctbignum/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ctbignum",
-  "version-string": "2019-08-02",
-  "port-version": 2,
+  "version-date": "2019-08-02",
+  "port-version": 3,
   "description": "This is a header-only template library for fixed-width \"small big-integer\" computations, for use during run-time as well as compile-time.",
   "homepage": "https://github.com/niekbouman/ctbignum",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/ctp/portfile.cmake b/external_imported/vcpkg/ports/ctp/portfile.cmake
index 2c291b8ab..077deedbc 100644
--- a/external_imported/vcpkg/ports/ctp/portfile.cmake
+++ b/external_imported/vcpkg/ports/ctp/portfile.cmake
@@ -17,15 +17,15 @@ if("datacollect" IN_LIST FEATURES)
     )
 endif()
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH TRADEAPI_UNPACK_PATH
+vcpkg_extract_source_archive(
+    TRADEAPI_UNPACK_PATH
     ARCHIVE ${TRADEAPI_ARCHIVE}
     NO_REMOVE_ONE_LEVEL
 )
 
 if("datacollect" IN_LIST FEATURES)
-    vcpkg_extract_source_archive_ex(
-        OUT_SOURCE_PATH DATACOLLECT_UNPACK_PATH
+    vcpkg_extract_source_archive(
+        DATACOLLECT_UNPACK_PATH
         ARCHIVE ${DATACOLLECT_ARCHIVE}
         NO_REMOVE_ONE_LEVEL
     )
@@ -37,8 +37,8 @@ if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
 elseif(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
     set(TRADEAPI_SOURCE_PATH "${TRADEAPI_UNPACK_PATH}/v6.6.1_P1_20210406_winApi/tradeapi/20210406_tradeapi64_se_windows")
 elseif(VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
-    vcpkg_extract_source_archive_ex(
-        OUT_SOURCE_PATH TRADEAPI_LINUX_TAR_PATH
+    vcpkg_extract_source_archive(
+        TRADEAPI_LINUX_TAR_PATH
         ARCHIVE "${TRADEAPI_UNPACK_PATH}/v6.6.1_P1_20210406_api_tradeapi_linux64.tar"
     )
     set(TRADEAPI_SOURCE_PATH "${TRADEAPI_LINUX_TAR_PATH}/v6.6.1_P1_20210406_api_tradeapi_se_linux64")
@@ -52,8 +52,8 @@ if("datacollect" IN_LIST FEATURES)
     elseif(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
         set(DATACOLLECT_SOURCE_PATH "${DATACOLLECT_UNPACK_PATH}/v6.3.19_P1_20200106_winApi/20200106_clientdll64_windows")
     elseif(VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
-        vcpkg_extract_source_archive_ex(
-            OUT_SOURCE_PATH DATACOLLECT_LINUX_TAR_PATH
+        vcpkg_extract_source_archive(
+            DATACOLLECT_LINUX_TAR_PATH
             ARCHIVE "${DATACOLLECT_UNPACK_PATH}/v6.3.19_P1_20200106_api.tar"
         )
         set(DATACOLLECT_SOURCE_PATH "${DATACOLLECT_LINUX_TAR_PATH}/v6.3.19_P1_20200106_api_clientdatacollectdll_linux64")
diff --git a/external_imported/vcpkg/ports/ctp/vcpkg.json b/external_imported/vcpkg/ports/ctp/vcpkg.json
index 4893cae5f..5549d0137 100644
--- a/external_imported/vcpkg/ports/ctp/vcpkg.json
+++ b/external_imported/vcpkg/ports/ctp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ctp",
   "version-string": "6.6.1_P1_20210406_se",
-  "port-version": 3,
+  "port-version": 4,
   "description": "The Comprehensive Transaction Platform (CTP) is a future brokerage management system developed specially for futures companies. CTP API client library allows users to connect to CTP gateway for algorithmic trading.",
   "homepage": "http://www.sfit.com.cn/index.htm",
   "supports": "!osx & !uwp & !arm & !(static & staticcrt)",
diff --git a/external_imported/vcpkg/ports/ctre/portfile.cmake b/external_imported/vcpkg/ports/ctre/portfile.cmake
index e3e04c3ce..33caf938e 100644
--- a/external_imported/vcpkg/ports/ctre/portfile.cmake
+++ b/external_imported/vcpkg/ports/ctre/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO hanickadot/compile-time-regular-expressions
     REF "v${VERSION}"
-    SHA512 1ffb56ca88db5c8b0e5a5e1bf25f4eb9d59b43a31f9a38970bb2beaa22390e86a5beaf350b20e336759d7af99509c4c120b4638969719b931e316e01976c24dc
+    SHA512 bc476728dbf7b099ad8fa547f586510f2994fb05d7c1d1334efd8bd49c041909d172097a447fde7ebb5b7588b462339c4aefc7a50d2b75945bc328773f964720
     HEAD_REF main
 )
 
diff --git a/external_imported/vcpkg/ports/ctre/vcpkg.json b/external_imported/vcpkg/ports/ctre/vcpkg.json
index c9df4fad0..d111ebdd8 100644
--- a/external_imported/vcpkg/ports/ctre/vcpkg.json
+++ b/external_imported/vcpkg/ports/ctre/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "ctre",
-  "version-semver": "3.7.2",
+  "version": "3.8.1",
   "description": "A Compile time PCRE (almost) compatible regular expression matcher",
   "homepage": "https://github.com/hanickadot/compile-time-regular-expressions",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/ctstraffic/portfile.cmake b/external_imported/vcpkg/ports/ctstraffic/portfile.cmake
new file mode 100644
index 000000000..ee63d075e
--- /dev/null
+++ b/external_imported/vcpkg/ports/ctstraffic/portfile.cmake
@@ -0,0 +1,29 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO microsoft/ctsTraffic
+    REF 88a415197951912fc70e440b31cad8d4ff4ea68a
+    SHA512 152ee25d1ba70c68c5bae61ee08d1d2905efd28a10c48672de852c8ee9d0964a9202814cdcc40bca712ef69f952630509810827226861dad16516f5e0827d879
+    HEAD_REF master
+)
+
+set(VCPKG_BUILD_TYPE release) # Windows port only includes tools.
+
+include("${CURRENT_PORT_DIR}/prepare_for_build.cmake")
+prepare_for_build("${SOURCE_PATH}")
+
+vcpkg_list(SET MSBUILD_OPTIONS
+    "/p:UseVcpkg=yes"
+)
+
+vcpkg_msbuild_install(
+  SOURCE_PATH "${SOURCE_PATH}"
+  PROJECT_SUBPATH ctsTraffic/ctsTraffic.vcxproj
+  OPTIONS 
+    ${MSBUILD_OPTIONS}
+)
+
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+
+set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/ctstraffic/prepare_for_build.cmake b/external_imported/vcpkg/ports/ctstraffic/prepare_for_build.cmake
new file mode 100644
index 000000000..90333e939
--- /dev/null
+++ b/external_imported/vcpkg/ports/ctstraffic/prepare_for_build.cmake
@@ -0,0 +1,19 @@
+function(prepare_for_build CTSTRAFFIC_SOURCE_DIR)
+
+    message("-- Modifying hardcoded 'NuGet' directives in .vcxproj files")
+    file(GLOB_RECURSE PROJ_FILES "${CTSTRAFFIC_SOURCE_DIR}/*.vcxproj")
+	
+    foreach(PROJ_FILE ${PROJ_FILES})
+        file(READ ${PROJ_FILE} PROJ_FILE_CONTENT)
+        STRING(REGEX
+            REPLACE
+                "<Target Name=\"EnsureNuGetPackageBuildImports\" BeforeTargets=\"PrepareForBuild\">"
+                "<Target Name=\"EnsureNuGetPackageBuildImports\" BeforeTargets=\"PrepareForBuild\" Condition=\"'$(UseVcpkg)' != 'yes'\">"
+            PROJ_FILE_CONTENT
+            "${PROJ_FILE_CONTENT}"
+        )
+
+        file(WRITE ${PROJ_FILE} "${PROJ_FILE_CONTENT}")
+    endforeach()
+
+endfunction()
diff --git a/external_imported/vcpkg/ports/ctstraffic/usage b/external_imported/vcpkg/ports/ctstraffic/usage
new file mode 100644
index 000000000..3c3b74305
--- /dev/null
+++ b/external_imported/vcpkg/ports/ctstraffic/usage
@@ -0,0 +1,3 @@
+See https://github.com/microsoft/ctsTraffic for usage instructions or
+
+    .\ctsTraffic.exe -help
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/ctstraffic/vcpkg.json b/external_imported/vcpkg/ports/ctstraffic/vcpkg.json
new file mode 100644
index 000000000..ef5b3a08a
--- /dev/null
+++ b/external_imported/vcpkg/ports/ctstraffic/vcpkg.json
@@ -0,0 +1,15 @@
+{
+  "name": "ctstraffic",
+  "version": "2.0.3.2",
+  "description": "ctsTraffic is a highly scalable client/server networking tool giving detailed performance and reliability analytics.",
+  "homepage": "https://github.com/microsoft/ctsTraffic/",
+  "license": "Apache-2.0",
+  "supports": "windows & !uwp",
+  "dependencies": [
+    {
+      "name": "vcpkg-msbuild",
+      "host": true
+    },
+    "wil"
+  ]
+}
diff --git a/external_imported/vcpkg/ports/cub/fix-usage.patch b/external_imported/vcpkg/ports/cub/fix-usage.patch
index 56801fdb9..353818cb7 100644
--- a/external_imported/vcpkg/ports/cub/fix-usage.patch
+++ b/external_imported/vcpkg/ports/cub/fix-usage.patch
@@ -1,24 +1,12 @@
 diff --git a/cub/cmake/cub-config.cmake b/cub/cmake/cub-config.cmake
-index 3d7f64b..213a95e 100644
+index ebe40ef..884ce65 100644
 --- a/cub/cmake/cub-config.cmake
 +++ b/cub/cmake/cub-config.cmake
-@@ -8,6 +8,7 @@ if (TARGET CUB::CUB)
-   return()
- endif()
+@@ -11,6 +11,7 @@ endif()
+ # Minimum supported libcudacxx version:
+ set(cub_libcudacxx_version 1.8.0)
  
 +include("${CMAKE_CURRENT_LIST_DIR}/cub-header-search.cmake")
  function(_cub_declare_interface_alias alias_name ugly_name)
    # 1) Only IMPORTED and ALIAS targets can be placed in a namespace.
    # 2) When an IMPORTED library is linked to another target, its include
-diff --git a/cub/cmake/cub-header-search.cmake.in b/cub/cmake/cub-header-search.cmake.in
-index 2a46606..d2c38ef 100644
---- a/cub/cmake/cub-header-search.cmake.in
-+++ b/cub/cmake/cub-header-search.cmake.in
-@@ -3,6 +3,6 @@ unset(_CUB_VERSION_INCLUDE_DIR CACHE) # Clear old result to force search
- find_path(_CUB_VERSION_INCLUDE_DIR cub/version.cuh
-   NO_DEFAULT_PATH # Only search explicit paths below:
-   PATHS
--    "${CMAKE_CURRENT_LIST_DIR}/../../../@CMAKE_INSTALL_INCLUDEDIR@" # Install tree
-+    "${CMAKE_CURRENT_LIST_DIR}/../../@CMAKE_INSTALL_INCLUDEDIR@" # Install tree
- )
- set_property(CACHE _CUB_VERSION_INCLUDE_DIR PROPERTY TYPE INTERNAL)
diff --git a/external_imported/vcpkg/ports/cub/portfile.cmake b/external_imported/vcpkg/ports/cub/portfile.cmake
index 69f73ad63..9049648f0 100644
--- a/external_imported/vcpkg/ports/cub/portfile.cmake
+++ b/external_imported/vcpkg/ports/cub/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO NVlabs/cub
-    REF ed040d585c3237d706973d7ad290bfee40958270 #v1.16.0
-    SHA512 81e0bacb0aa4ee7a1c86f3c12e3135a133579678d3530e0e0b8310f716d0355e5096925ac6de5865140a7aac08d974ea5169d47e34951b932a23965f74fe4ee6
+    REF "${VERSION}"
+    SHA512 f88fdf80c81b8b5d3d09797bf5e9a9e82e1365950b358e0ffc2141b465646c2054ce7e6a30ae07735fbaa69d07c9a8e9bab57c8ddb8a0db8426b27eadd045197
     HEAD_REF master
     PATCHES fix-usage.patch
 )
diff --git a/external_imported/vcpkg/ports/cub/vcpkg.json b/external_imported/vcpkg/ports/cub/vcpkg.json
index f6988759f..2162ca5a6 100644
--- a/external_imported/vcpkg/ports/cub/vcpkg.json
+++ b/external_imported/vcpkg/ports/cub/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "cub",
-  "version": "1.16.0",
+  "version": "2.1.0",
   "description": "CUB is a flexible library of cooperative threadblock primitives and other utilities for CUDA kernel programming",
   "homepage": "https://github.com/NVIDIA/cub",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/cubeb/portfile.cmake b/external_imported/vcpkg/ports/cubeb/portfile.cmake
index 28133823a..f67581627 100644
--- a/external_imported/vcpkg/ports/cubeb/portfile.cmake
+++ b/external_imported/vcpkg/ports/cubeb/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mozilla/cubeb
-    REF dc511c6b3597b6384d28949285b9289e009830ea
-    SHA512 a4ccd3f0a156db4e2e75a8d231e95a08d555390571551cb3e92c71cdee46dc74dc66b5272fda4b5f1f083b92672b360152cefd38be242f238fe802acc1ea17e9
+    REF f1bfefbbd412eaa0fe89f5afb3c11b427dc2446a
+    SHA512 541bdcdc17c02f51e6faae1c90e0ddf30f40b137bb47498f7845919107190a4acb97d88e26ccf4877dbce7aeddee0f6538fd34c71396bc6a81644438a1a3242e
     HEAD_REF master
 )
 
@@ -12,6 +12,7 @@ vcpkg_cmake_configure(
         -DUSE_SANITIZERS=OFF
         -DBUILD_TESTS=OFF
         -DBUILD_TOOLS=OFF
+        -DDOXYGEN_EXECUTABLE= # Prevents the generation of documentation
 )
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cubeb)
diff --git a/external_imported/vcpkg/ports/cubeb/vcpkg.json b/external_imported/vcpkg/ports/cubeb/vcpkg.json
index dc6e135f0..74a0756b2 100644
--- a/external_imported/vcpkg/ports/cubeb/vcpkg.json
+++ b/external_imported/vcpkg/ports/cubeb/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "cubeb",
-  "version-date": "2022-07-22",
+  "version-date": "2023-09-26",
+  "port-version": 1,
   "description": "Cross platform audio library",
   "homepage": "https://github.com/mozilla/cubeb",
   "license": "ISC",
diff --git a/external_imported/vcpkg/ports/cuda-api-wrappers/portfile.cmake b/external_imported/vcpkg/ports/cuda-api-wrappers/portfile.cmake
new file mode 100644
index 000000000..3bfa260ac
--- /dev/null
+++ b/external_imported/vcpkg/ports/cuda-api-wrappers/portfile.cmake
@@ -0,0 +1,25 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO eyalroz/cuda-api-wrappers
+    REF "v${VERSION}"
+    SHA512 71170b59a116a886c319f6409204d610636a16148754a9811a8c608912b14c09f5f9037b9366c2d0a012c3fd88b5c90d289ce3da692663f1a86f3c3f2bbd7b02
+    HEAD_REF master
+)
+
+# head only library
+set(VCPKG_BUILD_TYPE release)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DCAW_BUILD_EXAMPLES=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/cuda-api-wrappers/usage b/external_imported/vcpkg/ports/cuda-api-wrappers/usage
new file mode 100644
index 000000000..aeb5856df
--- /dev/null
+++ b/external_imported/vcpkg/ports/cuda-api-wrappers/usage
@@ -0,0 +1,4 @@
+cuda-api-wrappers provides CMake targets:
+
+  find_package(cuda-api-wrappers CONFIG REQUIRED)
+  target_link_libraries(main PRIVATE cuda-api-wrappers::rtc cuda-api-wrappers::nvtx cuda-api-wrappers::runtime-and-driver)
diff --git a/external_imported/vcpkg/ports/cuda-api-wrappers/vcpkg.json b/external_imported/vcpkg/ports/cuda-api-wrappers/vcpkg.json
new file mode 100644
index 000000000..4d826d5dc
--- /dev/null
+++ b/external_imported/vcpkg/ports/cuda-api-wrappers/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "cuda-api-wrappers",
+  "version": "0.6.7",
+  "description": "header-only library of integrated wrappers around the core parts of NVIDIA's CUDA execution ecosystem",
+  "homepage": "https://github.com/eyalroz/cuda-api-wrappers",
+  "license": "BSD-3-Clause",
+  "dependencies": [
+    "cuda",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/cudnn/portfile.cmake b/external_imported/vcpkg/ports/cudnn/portfile.cmake
index b22507e3d..5b2993efe 100644
--- a/external_imported/vcpkg/ports/cudnn/portfile.cmake
+++ b/external_imported/vcpkg/ports/cudnn/portfile.cmake
@@ -4,11 +4,11 @@ vcpkg_find_cuda(OUT_CUDA_TOOLKIT_ROOT CUDA_TOOLKIT_ROOT OUT_CUDA_VERSION CUDA_VE
 
 # Try to find CUDNN if it exists; only download if it doesn't exist
 find_path(CUDNN_INCLUDE_DIR NAMES cudnn.h cudnn_v8.h cudnn_v7.h
-  HINTS ${CUDA_TOOLKIT_ROOT} $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/include /usr/include/x86_64-linux-gnu/
+  HINTS ${CUDA_TOOLKIT_ROOT} $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/include /usr/include/x86_64-linux-gnu/ /usr/include/aarch64-linux-gnu/
   PATH_SUFFIXES cuda/include include)
 message(STATUS "CUDNN_INCLUDE_DIR: ${CUDNN_INCLUDE_DIR}")
 find_library(CUDNN_LIBRARY NAMES cudnn cudnn8 cudnn7
-  HINTS ${CUDA_TOOLKIT_ROOT} $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/lib/x86_64-linux-gnu/ /usr/
+  HINTS ${CUDA_TOOLKIT_ROOT} $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/lib/x86_64-linux-gnu/ /usr/include/aarch64-linux-gnu/ /usr/
   PATH_SUFFIXES lib lib64 cuda/lib cuda/lib64 lib/x64 cuda/lib/x64)
 message(STATUS "CUDNN_LIBRARY: ${CUDNN_LIBRARY}")
 if(EXISTS "${CUDNN_INCLUDE_DIR}/cudnn.h")
diff --git a/external_imported/vcpkg/ports/cudnn/vcpkg.json b/external_imported/vcpkg/ports/cudnn/vcpkg.json
index b498acd7a..32d575688 100644
--- a/external_imported/vcpkg/ports/cudnn/vcpkg.json
+++ b/external_imported/vcpkg/ports/cudnn/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "cudnn",
   "version": "7.6.5",
-  "port-version": 9,
+  "port-version": 10,
   "description": "NVIDIA's cuDNN deep neural network acceleration library.",
   "homepage": "https://developer.nvidia.com/cudnn",
   "license": null,
diff --git a/external_imported/vcpkg/ports/curl/0002_fix_uwp.patch b/external_imported/vcpkg/ports/curl/0002_fix_uwp.patch
index 71f1d83c9..7e2cf7cd9 100644
--- a/external_imported/vcpkg/ports/curl/0002_fix_uwp.patch
+++ b/external_imported/vcpkg/ports/curl/0002_fix_uwp.patch
@@ -1,15 +1,24 @@
-diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index 8cea346c3..967312905 100644
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -118,6 +118,10 @@ if(CURL_HAS_LTO)
-     INTERPROCEDURAL_OPTIMIZATION_RELWITHDEBINFO TRUE)
- endif()
- 
-+if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-+  set_property(TARGET ${LIB_NAME} APPEND PROPERTY COMPILE_DEFINITIONS "_WINSOCK_DEPRECATED_NO_WARNINGS")
-+endif()
-+
- if(WIN32)
-   if(BUILD_SHARED_LIBS)
-     if(MSVC)
+diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
+index 6f84919..b838245 100644
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -162,6 +162,9 @@ if(BUILD_STATIC_LIBS)
+       INTERPROCEDURAL_OPTIMIZATION_RELEASE TRUE
+       INTERPROCEDURAL_OPTIMIZATION_RELWITHDEBINFO TRUE)
+   endif()
++  if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
++    set_property(TARGET ${LIB_STATIC} APPEND PROPERTY COMPILE_DEFINITIONS "_WINSOCK_DEPRECATED_NO_WARNINGS")
++  endif()
+   if(CMAKEVERSION AND CMAKESONAME)
+     set_target_properties(${LIB_STATIC} PROPERTIES
+       VERSION ${CMAKEVERSION} SOVERSION ${CMAKESONAME})
+@@ -197,6 +200,9 @@ if(BUILD_SHARED_LIBS)
+       INTERPROCEDURAL_OPTIMIZATION_RELEASE TRUE
+       INTERPROCEDURAL_OPTIMIZATION_RELWITHDEBINFO TRUE)
+   endif()
++  if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
++    set_property(TARGET ${LIB_SHARED} APPEND PROPERTY COMPILE_DEFINITIONS "_WINSOCK_DEPRECATED_NO_WARNINGS")
++  endif()
+   if(CMAKEVERSION AND CMAKESONAME)
+     set_target_properties(${LIB_SHARED} PROPERTIES
+       VERSION ${CMAKEVERSION} SOVERSION ${CMAKESONAME})
diff --git a/external_imported/vcpkg/ports/curl/0005_remove_imp_suffix.patch b/external_imported/vcpkg/ports/curl/0005_remove_imp_suffix.patch
index e52da2585..5fe94196a 100644
--- a/external_imported/vcpkg/ports/curl/0005_remove_imp_suffix.patch
+++ b/external_imported/vcpkg/ports/curl/0005_remove_imp_suffix.patch
@@ -1,12 +1,12 @@
-diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index 1d71e14..62b7b33 100644
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -125,7 +125,6 @@ if(WIN32)
-     if(MSVC)
-       # Add "_imp" as a suffix before the extension to avoid conflicting with
-       # the statically linked "libcurl.lib"
--      set_target_properties(${LIB_NAME} PROPERTIES IMPORT_SUFFIX "_imp.lib")
-     endif()
-   endif()
+diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
+index b838245..3199160 100644
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -92,7 +92,6 @@ endif()
+ if(WIN32 AND
+    NOT IMPORT_LIB_SUFFIX AND
+    CMAKE_STATIC_LIBRARY_SUFFIX STREQUAL CMAKE_IMPORT_LIBRARY_SUFFIX)
+-  set(IMPORT_LIB_SUFFIX "_imp")
  endif()
+ 
+ # Whether to do a single compilation pass for libcurl sources and reuse these
diff --git a/external_imported/vcpkg/ports/curl/0012-fix-dependency-idn2.patch b/external_imported/vcpkg/ports/curl/0012-fix-dependency-idn2.patch
index 9db27979e..551e7fcba 100644
--- a/external_imported/vcpkg/ports/curl/0012-fix-dependency-idn2.patch
+++ b/external_imported/vcpkg/ports/curl/0012-fix-dependency-idn2.patch
@@ -1,12 +1,16 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9f6de81..6702845 100644
+index a54c2ff..3b83a7f 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -632,6 +632,7 @@ endif()
+@@ -852,11 +852,8 @@ endif()
  # Check for idn2
  option(USE_LIBIDN2 "Use libidn2 for IDN support" ON)
  if(USE_LIBIDN2)
--  check_library_exists_concat("idn2" idn2_lookup_ul HAVE_LIBIDN2)
+-  check_library_exists("idn2" "idn2_lookup_ul" "" HAVE_LIBIDN2)
+-  if(HAVE_LIBIDN2)
+-    set(CURL_LIBS "idn2;${CURL_LIBS}")
+-    check_include_file_concat("idn2.h" HAVE_IDN2_H)
+-  endif()
 +  set(HAVE_LIBIDN2 TRUE)
 +  list(INSERT CURL_LIBS 0 ${LIBIDN2_LINK_LIBRARIES})
  else()
diff --git a/external_imported/vcpkg/ports/curl/0020-fix-pc-file.patch b/external_imported/vcpkg/ports/curl/0020-fix-pc-file.patch
index 21eab0933..8031121c6 100644
--- a/external_imported/vcpkg/ports/curl/0020-fix-pc-file.patch
+++ b/external_imported/vcpkg/ports/curl/0020-fix-pc-file.patch
@@ -1,15 +1,15 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8b2e428..ea430f4 100644
+index 3b83a7f..0ceaf5b 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1505,7 +1505,9 @@ set(includedir              "\${prefix}/include")
- set(LDFLAGS                 "${CMAKE_SHARED_LINKER_FLAGS}")
- set(LIBCURL_LIBS            "")
- set(libdir                  "${CMAKE_INSTALL_PREFIX}/lib")
--foreach(_lib ${CMAKE_C_IMPLICIT_LINK_LIBRARIES} ${CURL_LIBS})
-+set(CURL_LIBS_FLAT "")
-+vcpkg_curl_flatten(CURL_LIBS CURL_LIBS_FLAT)
-+foreach(_lib ${CURL_LIBS_FLAT})
-   if(TARGET "${_lib}")
-     set(_libname "${_lib}")
-     get_target_property(_imported "${_libname}" IMPORTED)
+@@ -1652,7 +1652,9 @@ if(NOT CURL_DISABLE_INSTALL)
+   set(LDFLAGS                 "${CMAKE_SHARED_LINKER_FLAGS}")
+   set(LIBCURL_LIBS            "")
+   set(libdir                  "${CMAKE_INSTALL_PREFIX}/lib")
+-  foreach(_lib ${CMAKE_C_IMPLICIT_LINK_LIBRARIES} ${CURL_LIBS})
++  set(CURL_LIBS_FLAT "")
++  vcpkg_curl_flatten(CURL_LIBS CURL_LIBS_FLAT)
++  foreach(_lib ${CURL_LIBS_FLAT})
+     if(TARGET "${_lib}")
+       set(_libname "${_lib}")
+       get_target_property(_imported "${_libname}" IMPORTED)
diff --git a/external_imported/vcpkg/ports/curl/0022-deduplicate-libs.patch b/external_imported/vcpkg/ports/curl/0022-deduplicate-libs.patch
index 16cc0498a..dac3b6788 100644
--- a/external_imported/vcpkg/ports/curl/0022-deduplicate-libs.patch
+++ b/external_imported/vcpkg/ports/curl/0022-deduplicate-libs.patch
@@ -1,12 +1,12 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 09d82f1..f0d99e6 100644
+index 0ceaf5b..ec714a5 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1507,6 +1507,7 @@ else()
-   set(ENABLE_SHARED         "no")
-   set(ENABLE_STATIC         "yes")
-   set(LIBCURL_NO_SHARED     "${LIBCURL_LIBS}")
-+  set(LIBCURL_LIBS          "")
- endif()
- # "a" (Linux) or "lib" (Windows)
- string(REPLACE "." "" libext "${CMAKE_STATIC_LIBRARY_SUFFIX}")
+@@ -1682,6 +1682,7 @@ if(NOT CURL_DISABLE_INSTALL)
+   else()
+     set(ENABLE_SHARED         "no")
+     set(LIBCURL_NO_SHARED     "${LIBCURL_LIBS}")
++    set(LIBCURL_LIBS          "")
+     set(CPPFLAG_CURL_STATICLIB "-DCURL_STATICLIB")
+   endif()
+   if(BUILD_STATIC_LIBS)
diff --git a/external_imported/vcpkg/ports/curl/0023-fix-find-cares.patch b/external_imported/vcpkg/ports/curl/0023-fix-find-cares.patch
deleted file mode 100644
index 4aa11acfa..000000000
--- a/external_imported/vcpkg/ports/curl/0023-fix-find-cares.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/CMake/curl-config.cmake.in b/CMake/curl-config.cmake.in
-index 496a92d0e..564415ef6 100644
---- a/CMake/curl-config.cmake.in
-+++ b/CMake/curl-config.cmake.in
-@@ -30,6 +30,9 @@ endif()
- if(@USE_ZLIB@)
-   find_dependency(ZLIB @ZLIB_VERSION_MAJOR@)
- endif()
-+if(@USE_ARES@)
-+  find_dependency(c-ares)
-+endif()
- 
- include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake")
- check_required_components("@PROJECT_NAME@")
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b43520751..dbf62751f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -169,8 +169,8 @@ set(CURL_LIBS "")
- 
- if(ENABLE_ARES)
-   set(USE_ARES 1)
--  find_package(CARES REQUIRED)
--  list(APPEND CURL_LIBS ${CARES_LIBRARY})
-+  find_package(c-ares CONFIG REQUIRED)
-+  list(APPEND CURL_LIBS c-ares::cares)
- endif()
- 
- include(CurlSymbolHiding)
diff --git a/external_imported/vcpkg/ports/curl/cmake-config-ios.patch b/external_imported/vcpkg/ports/curl/cmake-config-ios.patch
new file mode 100644
index 000000000..c3ed5d98c
--- /dev/null
+++ b/external_imported/vcpkg/ports/curl/cmake-config-ios.patch
@@ -0,0 +1,24 @@
+diff --git a/CMake/OtherTests.cmake b/CMake/OtherTests.cmake
+index d67a905..dcd1eee 100644
+--- a/CMake/OtherTests.cmake
++++ b/CMake/OtherTests.cmake
+@@ -87,7 +87,7 @@ endif()
+ unset(CMAKE_TRY_COMPILE_TARGET_TYPE)
+ 
+ if(NOT CMAKE_CROSSCOMPILING)
+-  if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "iOS")
++  if(NOT APPLE)
+     # only try this on non-apple platforms
+ 
+     # if not cross-compilation...
+@@ -140,8 +140,8 @@ if(WIN32)
+   set(HAVE_GETADDRINFO_THREADSAFE ${HAVE_GETADDRINFO})
+ elseif(NOT HAVE_GETADDRINFO)
+   set(HAVE_GETADDRINFO_THREADSAFE FALSE)
+-elseif(CMAKE_SYSTEM_NAME STREQUAL "AIX" OR
+-       CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR
++elseif(APPLE OR
++       CMAKE_SYSTEM_NAME STREQUAL "AIX" OR
+        CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR
+        CMAKE_SYSTEM_NAME STREQUAL "HP-UX" OR
+        CMAKE_SYSTEM_NAME STREQUAL "MidnightBSD" OR
diff --git a/external_imported/vcpkg/ports/curl/cmake-config.patch b/external_imported/vcpkg/ports/curl/cmake-config.patch
new file mode 100644
index 000000000..1e980cdf3
--- /dev/null
+++ b/external_imported/vcpkg/ports/curl/cmake-config.patch
@@ -0,0 +1,12 @@
+diff --git a/CMake/curl-config.cmake.in b/CMake/curl-config.cmake.in
+index a013adf..2f39949 100644
+--- a/CMake/curl-config.cmake.in
++++ b/CMake/curl-config.cmake.in
+@@ -46,5 +46,6 @@ check_required_components("@PROJECT_NAME@")
+ 
+ # Alias for either shared or static library
+ if(NOT TARGET @PROJECT_NAME@::libcurl)
+-  add_library(@PROJECT_NAME@::libcurl ALIAS @PROJECT_NAME@::@LIB_SELECTED@)
++  add_library(@PROJECT_NAME@::libcurl INTERFACE IMPORTED)
++  set_target_properties(@PROJECT_NAME@::libcurl PROPERTIES INTERFACE_LINK_LIBRARIES @PROJECT_NAME@::@LIB_SELECTED@)
+ endif()
diff --git a/external_imported/vcpkg/ports/curl/cmake-project-include.cmake b/external_imported/vcpkg/ports/curl/cmake-project-include.cmake
index 27254864c..093a09df2 100644
--- a/external_imported/vcpkg/ports/curl/cmake-project-include.cmake
+++ b/external_imported/vcpkg/ports/curl/cmake-project-include.cmake
@@ -1,3 +1,8 @@
+if(ANDROID AND ANDROID_NATIVE_API_LEVEL LESS 24)
+    # https://android.googlesource.com/platform/bionic/+/master/docs/32-bit-abi.md
+    set(HAVE_FILE_OFFSET_BITS FALSE CACHE INTERNAL "")
+endif()
+
 # Process the libs and targets in the variable named by `input`
 # into a flat list of libs in the variable named by `output`.
 # Simplify -framework elements.
@@ -13,6 +18,7 @@ function(vcpkg_curl_flatten input output)
     list(REMOVE_AT input_libs 0)
     while(input_libs)
         list(POP_BACK input_libs lib)
+        string(REGEX REPLACE "^.<LINK_ONLY:(.*)>\$" "\\1" lib "${lib}")
         if(TARGET "${lib}")
             set(import_lib "")
             set(import_location "")
@@ -69,13 +75,6 @@ function(vcpkg_curl_flatten input output)
     set("${output}" "${output_libs}" PARENT_SCOPE)
 endfunction()
 
-if(CURL_USE_LIBSSH2)
-    find_package(Libssh2 CONFIG REQUIRED)
-    set(LIBSSH2_FOUND TRUE)
-    get_target_property(LIBSSH2_INCLUDE_DIR Libssh2::libssh2 INTERFACE_INCLUDE_DIRECTORIES)
-    set(LIBSSH2_LIBRARY Libssh2::libssh2)
-endif()
-
 if(USE_LIBIDN2)
     find_package(PkgConfig REQUIRED)
     pkg_check_modules(LIBIDN2 REQUIRED libidn2)
diff --git a/external_imported/vcpkg/ports/curl/dependencies.patch b/external_imported/vcpkg/ports/curl/dependencies.patch
new file mode 100644
index 000000000..affbc5ec3
--- /dev/null
+++ b/external_imported/vcpkg/ports/curl/dependencies.patch
@@ -0,0 +1,61 @@
+diff --git a/CMake/curl-config.cmake.in b/CMake/curl-config.cmake.in
+index 056907c..c89c686 100644
+--- a/CMake/curl-config.cmake.in
++++ b/CMake/curl-config.cmake.in
+@@ -31,6 +31,16 @@ if(@USE_ZLIB@)
+   find_dependency(ZLIB @ZLIB_VERSION_MAJOR@)
+ endif()
+ 
++if("@USE_ARES@")
++  find_dependency(c-ares CONFIG)
++endif()
++if("@USE_LIBSSH2@")
++  find_dependency(Libssh2 CONFIG)
++endif()
++if("@HAVE_BROTLI@")
++    find_dependency(unofficial-brotli CONFIG)
++endif()
++
+ include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake")
+ check_required_components("@PROJECT_NAME@")
+ 
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 049ac34..cc0fe19 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -178,7 +178,8 @@ set(CURL_LIBS "")
+ 
+ if(ENABLE_ARES)
+   set(USE_ARES 1)
+-  find_package(CARES REQUIRED)
++  find_package(CARES NAMES c-ares CONFIG REQUIRED)
++  set(CARES_LIBRARY c-ares::cares)
+   list(APPEND CURL_LIBS ${CARES_LIBRARY})
+ endif()
+ 
+@@ -590,7 +591,9 @@ endif()
+ option(CURL_BROTLI "Set to ON to enable building curl with brotli support." OFF)
+ set(HAVE_BROTLI OFF)
+ if(CURL_BROTLI)
+-  find_package(Brotli REQUIRED)
++  find_package(BROTLI NAMES unofficial-brotli REQUIRED)
++  set(BROTLI_INCLUDE_DIRS "")
++  set(BROTLI_LIBRARIES "unofficial::brotli::brotlidec")
+   if(BROTLI_FOUND)
+     set(HAVE_BROTLI ON)
+     set(CURL_LIBS "${BROTLI_LIBRARIES};${CURL_LIBS}")  # For 'ld' linker. Emulate `list(PREPEND ...)` to stay compatible with <v3.15 CMake.
+@@ -873,7 +876,13 @@ mark_as_advanced(CURL_USE_LIBSSH2)
+ set(USE_LIBSSH2 OFF)
+ 
+ if(CURL_USE_LIBSSH2)
+-  find_package(LibSSH2)
++  find_package(LIBSSH2 NAMES Libssh2 REQUIRED)
++  if(TARGET Libssh2::libssh2_shared)
++    set(LIBSSH2_LIBRARY Libssh2::libssh2_shared)
++  else()
++    set(LIBSSH2_LIBRARY Libssh2::libssh2_static)
++  endif()
++  get_target_property(LIBSSH2_INCLUDE_DIR "${LIBSSH2_LIBRARY}" INTERFACE_INCLUDE_DIRECTORIES)
+   if(LIBSSH2_FOUND)
+     list(APPEND CURL_LIBS ${LIBSSH2_LIBRARY})
+     list(APPEND CMAKE_REQUIRED_INCLUDES "${LIBSSH2_INCLUDE_DIR}")
diff --git a/external_imported/vcpkg/ports/curl/export-components.patch b/external_imported/vcpkg/ports/curl/export-components.patch
index 1a727e5de..03039aadd 100644
--- a/external_imported/vcpkg/ports/curl/export-components.patch
+++ b/external_imported/vcpkg/ports/curl/export-components.patch
@@ -1,23 +1,24 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 874a237..3974956 100644
+index ec714a5..478527e 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1617,8 +1617,17 @@ if(CURL_ENABLE_EXPORT_TARGET)
-   )
- endif()
+@@ -1754,9 +1754,18 @@ if(NOT CURL_DISABLE_INSTALL)
+             DESTINATION ${CURL_INSTALL_CMAKE_DIR}
+     )
+   endif()
++  
++  set(components_file "${CMAKE_CURRENT_BINARY_DIR}/CURLConfigComponents.cmake")
++  file(CONFIGURE OUTPUT "${components_file}" CONTENT [[
++  foreach(z_vcpkg_curl_component IN ITEMS @SUPPORT_FEATURES@ @SUPPORT_PROTOCOLS@)
++    if(z_vcpkg_curl_component MATCHES "^[-_a-zA-Z0-9]*$")
++      set(CURL_${z_vcpkg_curl_component}_FOUND TRUE)
++    endif()
++  endforeach()
++  ]] @ONLY)
  
-+set(components_file "${CMAKE_CURRENT_BINARY_DIR}/CURLConfigComponents.cmake")
-+file(CONFIGURE OUTPUT "${components_file}" CONTENT [[
-+foreach(z_vcpkg_curl_component IN ITEMS @SUPPORT_FEATURES@ @SUPPORT_PROTOCOLS@)
-+  if(z_vcpkg_curl_component MATCHES "^[-_a-zA-Z0-9]*$")
-+    set(CURL_${z_vcpkg_curl_component}_FOUND TRUE)
-+  endif()
-+endforeach()
-+]] @ONLY)
-+
- install(
--        FILES ${version_config} ${project_config}
-+        FILES ${version_config} ${project_config} ${components_file}
-         DESTINATION ${CURL_INSTALL_CMAKE_DIR}
- )
+   install(
+-          FILES ${version_config} ${project_config}
++          FILES ${version_config} ${project_config} ${components_file}
+           DESTINATION ${CURL_INSTALL_CMAKE_DIR}
+   )
  
diff --git a/external_imported/vcpkg/ports/curl/mbedtls-ws2_32.patch b/external_imported/vcpkg/ports/curl/mbedtls-ws2_32.patch
index 37e4f18c9..2ead17268 100644
--- a/external_imported/vcpkg/ports/curl/mbedtls-ws2_32.patch
+++ b/external_imported/vcpkg/ports/curl/mbedtls-ws2_32.patch
@@ -1,8 +1,8 @@
 diff --git a/CMake/FindMbedTLS.cmake b/CMake/FindMbedTLS.cmake
-index 7bdb197..c8c5a73 100644
+index 814bd97..8b17eac 100644
 --- a/CMake/FindMbedTLS.cmake
 +++ b/CMake/FindMbedTLS.cmake
-@@ -26,6 +26,9 @@ find_library(MBEDX509_LIBRARY mbedx509)
+@@ -28,6 +28,9 @@ find_library(MBEDX509_LIBRARY mbedx509)
  find_library(MBEDCRYPTO_LIBRARY mbedcrypto)
  
  set(MBEDTLS_LIBRARIES "${MBEDTLS_LIBRARY}" "${MBEDX509_LIBRARY}" "${MBEDCRYPTO_LIBRARY}")
diff --git a/external_imported/vcpkg/ports/curl/portfile.cmake b/external_imported/vcpkg/ports/curl/portfile.cmake
index 7fdb8846a..f6b9bd57a 100644
--- a/external_imported/vcpkg/ports/curl/portfile.cmake
+++ b/external_imported/vcpkg/ports/curl/portfile.cmake
@@ -1,8 +1,9 @@
+string(REPLACE "." "_" curl_version "curl-${VERSION}")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO curl/curl
-    REF curl-7_88_1
-    SHA512 c5caa1f95580ddbf2041c9c4b885f84d4f5c5fcb905a5ea59f9dbb58a98fc292260f95cb935e963bf83d7dcecf98561deef5ce3ff91cdcb29a080559cff0ed64
+    REF "${curl_version}"
+    SHA512 0d431b894aeaff9e63cb9208830a074a3499dee2e9479ec64387f264e06b9544a09a63b262bb3fb85c39420610c2b43b4b4b87ecba5c7b4a08e89cefd2a9b17d
     HEAD_REF master
     PATCHES
         0002_fix_uwp.patch
@@ -12,7 +13,9 @@ vcpkg_from_github(
         0022-deduplicate-libs.patch
         mbedtls-ws2_32.patch
         export-components.patch
-        0023-fix-find-cares.patch
+        dependencies.patch
+        cmake-config.patch
+        cmake-config-ios.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -33,6 +36,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
         winidn      USE_WIN32_IDN
         winldap     USE_WIN32_LDAP
         websockets  ENABLE_WEBSOCKETS
+        zstd        CURL_ZSTD
     INVERTED_FEATURES
         non-http    HTTP_ONLY
         winldap     CURL_DISABLE_LDAP # Only WinLDAP support ATM
@@ -71,6 +75,7 @@ vcpkg_cmake_configure(
         -DENABLE_MANUAL=OFF
         -DCURL_CA_FALLBACK=ON
         -DCURL_USE_LIBPSL=OFF
+        -DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON
     OPTIONS_DEBUG
         -DENABLE_DEBUG=ON
 )
@@ -124,4 +129,21 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
 endif()
 
 file(INSTALL "${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
+file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+
+file(READ "${SOURCE_PATH}/lib/krb5.c" krb5_c)
+string(REGEX REPLACE "#i.*" "" krb5_c "${krb5_c}")
+set(krb5_copyright "${CURRENT_BUILDTREES_DIR}/krb5.c Notice")
+file(WRITE "${krb5_copyright}" "${krb5_c}")
+
+file(READ "${SOURCE_PATH}/lib/inet_ntop.c" inet_ntop_c)
+string(REGEX REPLACE "#i.*" "" inet_ntop_c "${inet_ntop_c}")
+set(inet_ntop_copyright "${CURRENT_BUILDTREES_DIR}/inet_ntop.c and inet_pton.c Notice")
+file(WRITE "${inet_ntop_copyright}" "${inet_ntop_c}")
+
+vcpkg_install_copyright(
+    FILE_LIST
+        "${SOURCE_PATH}/COPYING"
+        "${krb5_copyright}"
+        "${inet_ntop_copyright}"
+)
diff --git a/external_imported/vcpkg/ports/curl/usage b/external_imported/vcpkg/ports/curl/usage
new file mode 100644
index 000000000..eea11400e
--- /dev/null
+++ b/external_imported/vcpkg/ports/curl/usage
@@ -0,0 +1,4 @@
+curl is compatible with built-in CMake targets:
+
+    find_package(CURL REQUIRED)
+    target_link_libraries(main PRIVATE CURL::libcurl)
diff --git a/external_imported/vcpkg/ports/curl/vcpkg-cmake-wrapper.cmake b/external_imported/vcpkg/ports/curl/vcpkg-cmake-wrapper.cmake
index c74dc2fb0..5e64ef762 100644
--- a/external_imported/vcpkg/ports/curl/vcpkg-cmake-wrapper.cmake
+++ b/external_imported/vcpkg/ports/curl/vcpkg-cmake-wrapper.cmake
@@ -13,8 +13,12 @@ _find_package(${ARGS} CONFIG)
 if(CURL_FOUND)
     include("${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake")
 
-    get_target_property(_curl_include_dirs CURL::libcurl INTERFACE_INCLUDE_DIRECTORIES)
-    get_target_property(_curl_link_libraries CURL::libcurl INTERFACE_LINK_LIBRARIES)
+    set(_curl_target CURL::libcurl_shared)
+    if(TARGET CURL::libcurl_static)
+        set(_curl_target CURL::libcurl_static)
+    endif()
+    get_target_property(_curl_include_dirs ${_curl_target} INTERFACE_INCLUDE_DIRECTORIES)
+    get_target_property(_curl_link_libraries ${_curl_target} INTERFACE_LINK_LIBRARIES)
     if(NOT _curl_link_libraries)
         set(_curl_link_libraries "")
     endif()
@@ -24,33 +28,35 @@ if(CURL_FOUND)
     if(_curl_link_libraries MATCHES "OpenSSL::")
         string(REGEX REPLACE "([\$]<[^;]*)?OpenSSL::(SSL|Crypto)([^;]*>)?" "${OPENSSL_LIBRARIES}" _curl_link_libraries "${_curl_link_libraries}")
     endif()
-    if(_curl_link_libraries MATCHES "Libssh2::libssh2")
+    if(_curl_link_libraries MATCHES "Libssh2::libssh2_(shared|static)")
         # TODO: move find_dependency(Libssh2 CONFIG) into CURL config
+        set(_libssh2_target "${CMAKE_MATCH_0}")
         find_package(Libssh2 CONFIG QUIET)
-        get_target_property(_libssh2_LIBRARY_DEBUG Libssh2::libssh2 IMPORTED_IMPLIB_DEBUG)
-        get_target_property(_libssh2_LIBRARY_RELEASE Libssh2::libssh2 IMPORTED_IMPLIB_RELEASE)
+        get_target_property(_libssh2_LIBRARY_DEBUG "${_libssh2_target}" IMPORTED_IMPLIB_DEBUG)
+        get_target_property(_libssh2_LIBRARY_RELEASE "${_libssh2_target}" IMPORTED_IMPLIB_RELEASE)
         if(NOT IMPORTED_IMPLIB_DEBUG AND NOT IMPORTED_IMPLIB_RELEASE)
-            get_target_property(_libssh2_LIBRARY_DEBUG Libssh2::libssh2 IMPORTED_LOCATION_DEBUG)
-            get_target_property(_libssh2_LIBRARY_RELEASE Libssh2::libssh2 IMPORTED_LOCATION_RELEASE)
+            get_target_property(_libssh2_LIBRARY_DEBUG "${_libssh2_target}" IMPORTED_LOCATION_DEBUG)
+            get_target_property(_libssh2_LIBRARY_RELEASE "${_libssh2_target}" IMPORTED_LOCATION_RELEASE)
         endif()
         select_library_configurations(_libssh2)
-        string(REGEX REPLACE "([\$]<[^;]*)?Libssh2::libssh2([^;]*>)?" "${_libssh2_LIBRARIES}" _curl_link_libraries "${_curl_link_libraries}")
+        string(REGEX REPLACE "([\$]<[^;]*)?${_libssh2_target}([^;]*>)?" "${_libssh2_LIBRARIES}" _curl_link_libraries "${_curl_link_libraries}")
         unset(_libssh2_LIBRARIES)
         unset(_libssh2_LIBRARY_DEBUG)
         unset(_libssh2_LIBRARY_RELEASE)
+        unset(_libssh2_target)
     endif()
     if(_curl_link_libraries MATCHES "::")
         message(WARNING "CURL_LIBRARIES list at least one target. This will not work for use cases where targets are not resolved.")
     endif()
 
     if (CMAKE_SYSTEM_NAME STREQUAL "Windows" OR CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-        get_target_property(_curl_location_debug CURL::libcurl IMPORTED_IMPLIB_DEBUG)
-        get_target_property(_curl_location_release CURL::libcurl IMPORTED_IMPLIB_RELEASE)
+        get_target_property(_curl_location_debug ${_curl_target} IMPORTED_IMPLIB_DEBUG)
+        get_target_property(_curl_location_release ${_curl_target} IMPORTED_IMPLIB_RELEASE)
     endif()
 
     if(NOT _curl_location_debug AND NOT _curl_location_release)
-        get_target_property(_curl_location_debug CURL::libcurl IMPORTED_LOCATION_DEBUG)
-        get_target_property(_curl_location_release CURL::libcurl IMPORTED_LOCATION_RELEASE)
+        get_target_property(_curl_location_debug ${_curl_target} IMPORTED_LOCATION_DEBUG)
+        get_target_property(_curl_location_release ${_curl_target} IMPORTED_LOCATION_RELEASE)
     endif()
 
     set(CURL_INCLUDE_DIRS "${_curl_include_dirs}")
@@ -64,5 +70,6 @@ if(CURL_FOUND)
     unset(_curl_link_libraries)
     unset(_curl_location_debug)
     unset(_curl_location_release)
+    unset(_curl_target)
 endif()
 cmake_policy(POP)
diff --git a/external_imported/vcpkg/ports/curl/vcpkg.json b/external_imported/vcpkg/ports/curl/vcpkg.json
index 2c0d5aa9f..11407a476 100644
--- a/external_imported/vcpkg/ports/curl/vcpkg.json
+++ b/external_imported/vcpkg/ports/curl/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "curl",
-  "version": "7.88.1",
+  "version": "8.5.0",
   "port-version": 1,
   "description": "A library for transferring data with URLs",
   "homepage": "https://curl.se/",
-  "license": null,
+  "license": "curl AND ISC AND BSD-3-Clause",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
@@ -200,6 +200,12 @@
       "dependencies": [
         "wolfssl"
       ]
+    },
+    "zstd": {
+      "description": "ZStandard support (zstd)",
+      "dependencies": [
+        "zstd"
+      ]
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/curlpp/portfile.cmake b/external_imported/vcpkg/ports/curlpp/portfile.cmake
index 8a2652fc4..8106a99e4 100644
--- a/external_imported/vcpkg/ports/curlpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/curlpp/portfile.cmake
@@ -33,8 +33,13 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT (VCPKG_LIBRARY_LINKAGE STREQUAL static))
     endif()
 endif()
 
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/unofficial-curlpp/unofficial-curlpp-config.cmake"
+"# Generated by CMake"
+[[# Generated by CMake
+include(CMakeFindDependencyMacro)
+find_dependency(CURL)]])
+
 vcpkg_copy_pdbs()
 vcpkg_fixup_pkgconfig()
 
-file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}")
-file(INSTALL "${SOURCE_PATH}/doc/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/doc/LICENSE")
diff --git a/external_imported/vcpkg/ports/curlpp/vcpkg-cmake-wrapper.cmake b/external_imported/vcpkg/ports/curlpp/vcpkg-cmake-wrapper.cmake
deleted file mode 100644
index a7f88cd72..000000000
--- a/external_imported/vcpkg/ports/curlpp/vcpkg-cmake-wrapper.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-set(FIND_CURLPP_ARGS ${ARGS})
-include(CMakeFindDependencyMacro)
-find_dependency(CURL)
-
-_find_package(${FIND_CURLPP_ARGS})
diff --git a/external_imported/vcpkg/ports/curlpp/vcpkg.json b/external_imported/vcpkg/ports/curlpp/vcpkg.json
index 00b45a3f3..90c0f5d2e 100644
--- a/external_imported/vcpkg/ports/curlpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/curlpp/vcpkg.json
@@ -1,10 +1,15 @@
 {
   "name": "curlpp",
   "version-date": "2018-06-15",
-  "port-version": 7,
+  "port-version": 9,
   "description": "C++ wrapper around libcURL",
+  "homepage": "https://github.com/jpbarrette/curlpp",
+  "license": "MIT",
   "dependencies": [
-    "curl",
+    {
+      "name": "curl",
+      "default-features": false
+    },
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/external_imported/vcpkg/ports/cute-headers/vcpkg.json b/external_imported/vcpkg/ports/cute-headers/vcpkg.json
index bd12b94b4..145333c85 100644
--- a/external_imported/vcpkg/ports/cute-headers/vcpkg.json
+++ b/external_imported/vcpkg/ports/cute-headers/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "cute-headers",
-  "version-string": "2019-09-20",
-  "port-version": 1,
+  "version-date": "2019-09-20",
+  "port-version": 2,
   "description": "Collection of cross-platform one-file C/C++ libraries with no dependencies",
   "homepage": "https://github.com/RandyGaul/cute_headers"
 }
diff --git a/external_imported/vcpkg/ports/cwalk/portfile.cmake b/external_imported/vcpkg/ports/cwalk/portfile.cmake
index a795d1a40..df713f1bc 100644
--- a/external_imported/vcpkg/ports/cwalk/portfile.cmake
+++ b/external_imported/vcpkg/ports/cwalk/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO likle/cwalk
-    REF v1.2.6
-    SHA512 d43f339178367facd2f80944f5491631edab24fa4a92e30fd8f4d9c533ec3a2edbc04105066148be8458b64d0fac9e7d86408ca9601db291b93df222dc875fd4
+    REF "v${VERSION}"
+    SHA512 d29c83bb350a5477e450cdb86b1edf7232296aed67680345a84fee967ff414d5c997ac313e38620b51cda21398cc5d19c8130fe999ecd6b0161e81b3566f5516
     HEAD_REF master
 )
 
@@ -16,6 +16,7 @@ vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cwalk)
+vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/external_imported/vcpkg/ports/cwalk/vcpkg.json b/external_imported/vcpkg/ports/cwalk/vcpkg.json
index d3e1cf9c1..8e34f60e4 100644
--- a/external_imported/vcpkg/ports/cwalk/vcpkg.json
+++ b/external_imported/vcpkg/ports/cwalk/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "cwalk",
-  "version": "1.2.6",
+  "version": "1.2.9",
   "description": "Path library for C/C++. Cross-Platform for Windows, MacOS and Linux. Supports UNIX and Windows path styles on those platforms.",
   "homepage": "https://likle.github.io/cwalk/",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/cxxgraph/portfile.cmake b/external_imported/vcpkg/ports/cxxgraph/portfile.cmake
new file mode 100644
index 000000000..a02a08cf5
--- /dev/null
+++ b/external_imported/vcpkg/ports/cxxgraph/portfile.cmake
@@ -0,0 +1,16 @@
+set(VCPKG_BUILD_TYPE release) # Header-only library
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO ZigRazor/CXXGraph
+    REF "v${VERSION}"
+    SHA512 a4409c81132e6c7e34022c54d9a57b965970aa8e1fcd97b9f916334c1d480674a526e7d5ad727ab652e4842083249dea89de519b104c1f9f205423eabd3c2338
+    HEAD_REF master
+)
+
+vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}")
+# cxxgraph provides no targets and is a header only lib designed to be copied to include dir
+file(INSTALL "${SOURCE_PATH}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/cxxgraph")
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/cxxgraph" RENAME copyright)
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+
diff --git a/external_imported/vcpkg/ports/cxxgraph/usage b/external_imported/vcpkg/ports/cxxgraph/usage
new file mode 100644
index 000000000..bf7355e37
--- /dev/null
+++ b/external_imported/vcpkg/ports/cxxgraph/usage
@@ -0,0 +1,4 @@
+To use CXXGraph header files:
+	
+	find_path(CXXGRAPH_INCLUDE_DIR cxxgraph/CXXGraph.hpp)
+	target_include_directories(main PRIVATE ${CXXGRAPH_INCLUDE_DIR})
diff --git a/external_imported/vcpkg/ports/cxxgraph/vcpkg.json b/external_imported/vcpkg/ports/cxxgraph/vcpkg.json
new file mode 100644
index 000000000..244d296a1
--- /dev/null
+++ b/external_imported/vcpkg/ports/cxxgraph/vcpkg.json
@@ -0,0 +1,16 @@
+{
+  "name": "cxxgraph",
+  "version": "2.0.0",
+  "description": "CXXGraph is a header only comprehensive C++ graph library.",
+  "homepage": "https://github.com/ZigRazor/CXXGraph",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/cyclonedds-cxx/portfile.cmake b/external_imported/vcpkg/ports/cyclonedds-cxx/portfile.cmake
index 1b07db31b..b6376120a 100644
--- a/external_imported/vcpkg/ports/cyclonedds-cxx/portfile.cmake
+++ b/external_imported/vcpkg/ports/cyclonedds-cxx/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO eclipse-cyclonedds/cyclonedds-cxx
     REF "${VERSION}"
-    SHA512 7131b0980edf4dbd16ffd29edde24b4f31c8a4813eda7dfe93fe11f9eb102ef682651a037a12bf671b4617a673e35d97106172828328e47de51d0baddae22ab6
+    SHA512 ef16325086bf14ed27b1445a257459b431e9f40c245efcea5201cc4fb169b79a3f62be0bd1811e5da90d0a3375e220a657841a662350069c14f379ac28911d73
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/cyclonedds-cxx/vcpkg.json b/external_imported/vcpkg/ports/cyclonedds-cxx/vcpkg.json
index de0e2c133..3ff788ea7 100644
--- a/external_imported/vcpkg/ports/cyclonedds-cxx/vcpkg.json
+++ b/external_imported/vcpkg/ports/cyclonedds-cxx/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "cyclonedds-cxx",
-  "version": "0.10.2",
-  "port-version": 1,
+  "version": "0.10.4",
   "description": "C++ binding for Eclipse Cyclone DDS",
   "homepage": "https://cyclonedds.io",
   "license": "EPL-2.0",
diff --git a/external_imported/vcpkg/ports/cyclonedds/portfile.cmake b/external_imported/vcpkg/ports/cyclonedds/portfile.cmake
index 6e03886d1..092b2b72c 100644
--- a/external_imported/vcpkg/ports/cyclonedds/portfile.cmake
+++ b/external_imported/vcpkg/ports/cyclonedds/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO eclipse-cyclonedds/cyclonedds
     REF "${VERSION}"
-    SHA512 2cc8668a5d42b4391edfee7310c868bc6a5cd0e96f478c270cc19cf9aeb86f057f43753c2c27f79912a5eca478404526bb9c7041e60669f7cf5a7fa931bf1d89
+    SHA512 7ef0227c7595f2cfaab82a1e41a202df926891b0744b5301bde6522acee9e817a46977b505e0c4940d517349494717a52f95e8a925ce57136876c119056bea50
     HEAD_REF master
     PATCHES
         enable-security.patch
diff --git a/external_imported/vcpkg/ports/cyclonedds/vcpkg.json b/external_imported/vcpkg/ports/cyclonedds/vcpkg.json
index 9e867364b..e79ac6adc 100644
--- a/external_imported/vcpkg/ports/cyclonedds/vcpkg.json
+++ b/external_imported/vcpkg/ports/cyclonedds/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "cyclonedds",
-  "version-semver": "0.10.2",
-  "port-version": 2,
+  "version-semver": "0.10.4",
   "description": "Eclipse Cyclone DDS is a very performant and robust open-source implementation of the OMG DDS specification",
   "homepage": "https://cyclonedds.io",
   "license": "EPL-2.0 OR BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/czmq/portfile.cmake b/external_imported/vcpkg/ports/czmq/portfile.cmake
index 5ed28189d..491831897 100644
--- a/external_imported/vcpkg/ports/czmq/portfile.cmake
+++ b/external_imported/vcpkg/ports/czmq/portfile.cmake
@@ -1,7 +1,7 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO zeromq/czmq
-    REF v4.2.1
+    REF "v${VERSION}"
     SHA512 65a21f7bd5935b119e1b24ce3b2ce8462031ab7c9a4ba587bb99fe618c9f8cb672cfa202993ddd79e0fb0f154ada06560b79a1b4f762fcce8f88f2f450ecee01
     HEAD_REF master
     PATCHES
@@ -40,6 +40,7 @@ vcpkg_cmake_configure(
     OPTIONS
         -DCZMQ_BUILD_SHARED=${BUILD_SHARED}
         -DCZMQ_BUILD_STATIC=${BUILD_STATIC}
+        -DCZMQ_WITH_SYSTEMD=OFF
         -DBUILD_TESTING=OFF
         ${FEATURE_OPTIONS}
 )
@@ -62,11 +63,7 @@ file(COPY
     DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
 )
 
-if ("tool" IN_LIST FEATURES)
-    vcpkg_copy_tools(TOOL_NAMES zmakecert)
-endif()
-
-vcpkg_clean_executables_in_bin(FILE_NAMES zmakecert)
+vcpkg_copy_tools(TOOL_NAMES zmakecert AUTO_CLEAN)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
 
@@ -84,4 +81,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
 endif()
 
 # Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/czmq/vcpkg.json b/external_imported/vcpkg/ports/czmq/vcpkg.json
index 09b2d59d7..6cbe67481 100644
--- a/external_imported/vcpkg/ports/czmq/vcpkg.json
+++ b/external_imported/vcpkg/ports/czmq/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "czmq",
   "version-semver": "4.2.1",
-  "port-version": 1,
+  "port-version": 4,
   "description": "High-level C binding for ZeroMQ",
   "homepage": "https://github.com/zeromq/czmq",
   "license": "MPL-2.0",
+  "supports": "!xbox",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/d3d12-memory-allocator/CMakeLists.txt b/external_imported/vcpkg/ports/d3d12-memory-allocator/CMakeLists.txt
index 884610b06..b0202053d 100644
--- a/external_imported/vcpkg/ports/d3d12-memory-allocator/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/d3d12-memory-allocator/CMakeLists.txt
@@ -7,7 +7,7 @@ add_library(${PROJECT_NAME} STATIC
 )
 
 set_target_properties(${PROJECT_NAME} PROPERTIES PUBLIC_HEADER "src/D3D12MemAlloc.h")
-#target_include_directories(${PROJECT_NAME} PRIVATE "src/")
+target_include_directories(${PROJECT_NAME} INTERFACE PUBLIC $<INSTALL_INTERFACE:include>)
 
 install(
     TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}-config
diff --git a/external_imported/vcpkg/ports/d3d12-memory-allocator/portfile.cmake b/external_imported/vcpkg/ports/d3d12-memory-allocator/portfile.cmake
index 89a4093bb..0ee730ce3 100644
--- a/external_imported/vcpkg/ports/d3d12-memory-allocator/portfile.cmake
+++ b/external_imported/vcpkg/ports/d3d12-memory-allocator/portfile.cmake
@@ -8,10 +8,10 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}
+    SOURCE_PATH "${SOURCE_PATH}"
 )
 
 vcpkg_cmake_install()
@@ -19,4 +19,4 @@ vcpkg_copy_pdbs()
 vcpkg_cmake_config_fixup(CONFIG_PATH cmake/)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/external_imported/vcpkg/ports/d3d12-memory-allocator/vcpkg.json b/external_imported/vcpkg/ports/d3d12-memory-allocator/vcpkg.json
index b31b48509..eadeb2167 100644
--- a/external_imported/vcpkg/ports/d3d12-memory-allocator/vcpkg.json
+++ b/external_imported/vcpkg/ports/d3d12-memory-allocator/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "d3d12-memory-allocator",
   "version-date": "2021-05-05",
+  "port-version": 1,
   "description": "Easy to integrate D3d12 memory allocation library from GPUOpen",
   "homepage": "https://gpuopen.com/gaming-product/d3d12-memory-allocator/",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/darknet/portfile.cmake b/external_imported/vcpkg/ports/darknet/portfile.cmake
index 91f8d347b..4626d33f2 100644
--- a/external_imported/vcpkg/ports/darknet/portfile.cmake
+++ b/external_imported/vcpkg/ports/darknet/portfile.cmake
@@ -4,7 +4,8 @@ vcpkg_from_github(
   REF 8a0bf84c19e38214219dbd3345f04ce778426c57
   SHA512 6253d5b498f4f6eba7fc539d5a4b4e163139f4841623f11d84760bcf1ffabe6519f85e98e3d4aeac6846313fea3b98451407134b6b6f5b91137c62d1647109d9
   HEAD_REF master
-  PATCHES fix-dependence-getopt.patch
+  PATCHES 
+    fix-dependence-getopt.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -33,7 +34,8 @@ file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/Modules")
 vcpkg_cmake_configure(
   SOURCE_PATH "${SOURCE_PATH}"
   DISABLE_PARALLEL_CONFIGURE
-  OPTIONS ${FEATURE_OPTIONS}
+  OPTIONS 
+    ${FEATURE_OPTIONS}
     -DINSTALL_BIN_DIR:STRING=bin
     -DINSTALL_LIB_DIR:STRING=lib
     -DENABLE_OPENCV:BOOL=${ENABLE_OPENCV}
@@ -59,4 +61,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 file(INSTALL "${SOURCE_PATH}/scripts/download_weights.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/scripts")
 message(STATUS "To download weight files, please go to ${CURRENT_INSTALLED_DIR}/tools/${PORT}/scripts and run ./download_weights.ps1")
+
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/darknet/vcpkg.json b/external_imported/vcpkg/ports/darknet/vcpkg.json
index 5a99f7547..db3e543df 100644
--- a/external_imported/vcpkg/ports/darknet/vcpkg.json
+++ b/external_imported/vcpkg/ports/darknet/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "darknet",
   "version-date": "2022-03-06",
-  "port-version": 2,
+  "port-version": 4,
   "description": "Darknet is an open source neural network framework written in C and CUDA. You only look once (YOLO) is a state-of-the-art, real-time object detection system, best example of darknet functionalities.",
   "homepage": "https://github.com/alexeyab/darknet",
   "license": null,
@@ -64,6 +64,12 @@
     "opencv-cuda": {
       "description": "Build darknet with support for latest version of CUDA-enabled OpenCV",
       "dependencies": [
+        {
+          "name": "darknet",
+          "features": [
+            "cuda"
+          ]
+        },
         {
           "name": "opencv",
           "features": [
@@ -114,6 +120,12 @@
     "opencv3-cuda": {
       "description": "Build darknet with support for CUDA-enabled OpenCV3",
       "dependencies": [
+        {
+          "name": "darknet",
+          "features": [
+            "cuda"
+          ]
+        },
         {
           "name": "opencv3",
           "features": [
diff --git a/external_imported/vcpkg/ports/dartsim/fix-pc-dependencies.patch b/external_imported/vcpkg/ports/dartsim/fix-pc-dependencies.patch
new file mode 100644
index 000000000..f2b4d82c8
--- /dev/null
+++ b/external_imported/vcpkg/ports/dartsim/fix-pc-dependencies.patch
@@ -0,0 +1,8 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -70,3 +70,3 @@
+ set(DART_PKG_DESC "Dynamic Animation and Robotics Toolkit.")
+-set(DART_PKG_EXTERNAL_DEPS "eigen, ccd, fcl, assimp, boost")
++set(DART_PKG_EXTERNAL_DEPS "assimp, ccd, eigen3, fcl, octomap")
+ 
diff --git a/external_imported/vcpkg/ports/dartsim/portfile.cmake b/external_imported/vcpkg/ports/dartsim/portfile.cmake
index 7059ac1d9..7086f3f86 100644
--- a/external_imported/vcpkg/ports/dartsim/portfile.cmake
+++ b/external_imported/vcpkg/ports/dartsim/portfile.cmake
@@ -4,11 +4,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO dartsim/dart
-    REF v6.12.2
+    REF v${VERSION}
     SHA512 6d04da37d0eb40a35a3aaec583af024e2edf71d68bb38b6832760de21a349221387644ed9be0cc1e451c669bbf48eb53d8d0cd3be1b1b265a30be2aa17c7e48b
     HEAD_REF main
     PATCHES
         disable_unit_tests_examples_and_tutorials.patch
+        fix-pc-dependencies.patch
 )
 
 vcpkg_cmake_configure(
diff --git a/external_imported/vcpkg/ports/dartsim/vcpkg.json b/external_imported/vcpkg/ports/dartsim/vcpkg.json
index d410210ae..a0f8610cb 100644
--- a/external_imported/vcpkg/ports/dartsim/vcpkg.json
+++ b/external_imported/vcpkg/ports/dartsim/vcpkg.json
@@ -1,11 +1,10 @@
 {
   "name": "dartsim",
   "version": "6.12.2",
-  "port-version": 1,
+  "port-version": 3,
   "description": "Dynamic Animation and Robotics Toolkit",
   "homepage": "https://dartsim.github.io/",
   "license": "BSD-2-Clause",
-  "supports": "!x86",
   "dependencies": [
     "assimp",
     "boost-algorithm",
diff --git a/external_imported/vcpkg/ports/dataframe/portfile.cmake b/external_imported/vcpkg/ports/dataframe/portfile.cmake
index 6b6c02607..3c2e7b267 100644
--- a/external_imported/vcpkg/ports/dataframe/portfile.cmake
+++ b/external_imported/vcpkg/ports/dataframe/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO hosseinmoein/DataFrame
     REF "${VERSION}"
-    SHA512 e37df83396746620d4d1de3a9ef20cf4beea5c47970da2c9c368aa56a2a783396658a218d922a6e840fd1ad2a0aa54d4ad8dfbfe3b33b555efae6fe2deea00b5
+    SHA512 42630c4d77115c8155afaf908ea103b3ae030963339f353b9aa885c27ce6b020c05c008b22948b305868671e378c56a2d491bf974cc230c3406fbb40f79f45dd
     HEAD_REF master
 )
 vcpkg_cmake_configure(
diff --git a/external_imported/vcpkg/ports/dataframe/vcpkg.json b/external_imported/vcpkg/ports/dataframe/vcpkg.json
index ca327b4b4..d04d59b14 100644
--- a/external_imported/vcpkg/ports/dataframe/vcpkg.json
+++ b/external_imported/vcpkg/ports/dataframe/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "dataframe",
-  "version": "1.22.0",
+  "version": "3.0.0",
   "description": "This is a C++ statistical library that provides an interface similar to Pandas package in Python",
   "homepage": "https://github.com/hosseinmoein/DataFrame",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/date/0002-fix-cmake-3.14.patch b/external_imported/vcpkg/ports/date/0002-fix-cmake-3.14.patch
deleted file mode 100644
index 4fece8fa8..000000000
--- a/external_imported/vcpkg/ports/date/0002-fix-cmake-3.14.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ad74900..42d55af 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -73,7 +73,7 @@ target_sources( date INTERFACE
-     $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include/date/iso_week.h>
-     $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include/date/julian.h>
- )
--if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.15)
-+if (0)
-     # public headers will get installed:
-     set_target_properties( date PROPERTIES PUBLIC_HEADER include/date/date.h )
- endif ()
-@@ -144,7 +144,6 @@ if( BUILD_TZ_LIB )
-     endif( )
-     set_target_properties( date-tz PROPERTIES
-         POSITION_INDEPENDENT_CODE ON
--        PUBLIC_HEADER "${TZ_HEADERS}"
-         VERSION "${PROJECT_VERSION}"
-         SOVERSION "${ABI_VERSION}" )
-     if( NOT MSVC )
-@@ -169,8 +169,8 @@ write_basic_package_version_file( "${version_config}"
-     COMPATIBILITY SameMajorVersion )
- 
- install( TARGETS date
--    EXPORT dateConfig
--    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/date )
-+    EXPORT dateConfig )
-+install( FILES include/date/date.h ${TZ_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/date )
- export( TARGETS date NAMESPACE date:: FILE dateTargets.cmake )
- if (CMAKE_VERSION VERSION_LESS 3.15)
-     install(
diff --git a/external_imported/vcpkg/ports/date/0002-fix-cmake-install.patch b/external_imported/vcpkg/ports/date/0002-fix-cmake-install.patch
new file mode 100644
index 000000000..aa404f1ce
--- /dev/null
+++ b/external_imported/vcpkg/ports/date/0002-fix-cmake-install.patch
@@ -0,0 +1,63 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 012512a..2cbcc21 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -73,10 +73,6 @@ target_sources( date INTERFACE
+     $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include/date/iso_week.h>
+     $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include/date/julian.h>
+ )
+-if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.15)
+-    # public headers will get installed:
+-    set_target_properties( date PROPERTIES PUBLIC_HEADER include/date/date.h )
+-endif ()
+ 
+ # These used to be set with generator expressions,
+ #
+@@ -144,7 +140,6 @@ if( BUILD_TZ_LIB )
+     endif( )
+     set_target_properties( date-tz PROPERTIES
+         POSITION_INDEPENDENT_CODE ON
+-        PUBLIC_HEADER "${TZ_HEADERS}"
+         VERSION "${PROJECT_VERSION}"
+         SOVERSION "${ABI_VERSION}" )
+     if( NOT MSVC )
+@@ -169,30 +164,26 @@ write_basic_package_version_file( "${version_config}"
+     COMPATIBILITY SameMajorVersion )
+ 
+ install( TARGETS date
+-    EXPORT dateConfig
+-    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/date )
++    EXPORT dateConfig )
+ export( TARGETS date NAMESPACE date:: FILE dateTargets.cmake )
+-if (CMAKE_VERSION VERSION_LESS 3.15)
+-    install(
+-        FILES include/date/date.h
+-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/date )
+-endif ()
++install(
++    DIRECTORY "${CMAKE_SOURCE_DIR}/include/date"
++    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
++    PATTERN "chrono_io.h" EXCLUDE
++)
+ 
+ if( BUILD_TZ_LIB )
+     install( TARGETS date-tz
+         EXPORT dateConfig
+-        PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/date
+         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} )  # This is for Windows
+     export( TARGETS date-tz NAMESPACE date:: APPEND FILE dateTargets.cmake )
+ endif( )
+ 
+-if( WIN32 AND NOT CYGWIN)
+-    set( CONFIG_LOC CMake )
+-else( )
+-    set( CONFIG_LOC "${CMAKE_INSTALL_LIBDIR}/cmake/date" )
+-endif( )
++
++set( CONFIG_LOC "${CMAKE_INSTALL_LIBDIR}/cmake/date" )
++
+ install( EXPORT dateConfig
+   FILE dateTargets.cmake
+   NAMESPACE date::
diff --git a/external_imported/vcpkg/ports/date/portfile.cmake b/external_imported/vcpkg/ports/date/portfile.cmake
index 876e0529f..cff1bae78 100644
--- a/external_imported/vcpkg/ports/date/portfile.cmake
+++ b/external_imported/vcpkg/ports/date/portfile.cmake
@@ -8,12 +8,12 @@ endif()
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO HowardHinnant/date
-  REF v3.0.1
+  REF "v${VERSION}"
   SHA512 6bdc7cba821d66e17a559250cc0ce0095808e9db81cec9e16eaa4c31abdfa705299c67b72016d9b06b302bc306d063e83a374eb00728071b83a5ad650d59034f
   HEAD_REF master
   PATCHES
     0001-fix-uwp.patch
-    0002-fix-cmake-3.14.patch
+    0002-fix-cmake-install.patch
     fix-uninitialized-values.patch  #Update the new version please remove this patch
 )
 
@@ -30,15 +30,11 @@ vcpkg_cmake_configure(
 )
 
 vcpkg_cmake_install()
-
-if(VCPKG_TARGET_IS_WINDOWS)
-  vcpkg_cmake_config_fixup(CONFIG_PATH CMake)
-else()
-  vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/date)
-endif()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/date)
 
 vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/date/usage b/external_imported/vcpkg/ports/date/usage
new file mode 100644
index 000000000..41d8671b7
--- /dev/null
+++ b/external_imported/vcpkg/ports/date/usage
@@ -0,0 +1,4 @@
+date provides CMake targets:
+
+    find_package(date CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE date::date date::date-tz)
diff --git a/external_imported/vcpkg/ports/date/vcpkg.json b/external_imported/vcpkg/ports/date/vcpkg.json
index 35e75e421..14b21cd22 100644
--- a/external_imported/vcpkg/ports/date/vcpkg.json
+++ b/external_imported/vcpkg/ports/date/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "date",
   "version": "3.0.1",
-  "port-version": 2,
+  "port-version": 5,
   "description": "A date and time library based on the C++17 <chrono> header",
   "homepage": "https://github.com/HowardHinnant/date",
+  "license": "MIT",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
@@ -17,6 +18,7 @@
   "features": {
     "remote-api": {
       "description": "support automatic download of tz data",
+      "supports": "!uwp",
       "dependencies": [
         "curl"
       ]
diff --git a/external_imported/vcpkg/ports/datraw/portfile.cmake b/external_imported/vcpkg/ports/datraw/portfile.cmake
new file mode 100644
index 000000000..0226cc19e
--- /dev/null
+++ b/external_imported/vcpkg/ports/datraw/portfile.cmake
@@ -0,0 +1,14 @@
+set(VCPKG_BUILD_TYPE release) # header-only library
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO UniStuttgart-VISUS/datraw
+    REF "v${VERSION}"
+    SHA512 f38401e0e878f8df8e1b7b9750f4e7fec6920495bfb914a694aab166a0ffbda6dec189693a0d5b9aadb760789706e255f49a382d4e902002aef7120033dce016
+    HEAD_REF master
+)
+
+file(COPY "${SOURCE_PATH}/datraw/datraw.h" "${SOURCE_PATH}/datraw/datraw"
+    DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENCE.md")
diff --git a/external_imported/vcpkg/ports/datraw/vcpkg.json b/external_imported/vcpkg/ports/datraw/vcpkg.json
new file mode 100644
index 000000000..428deb8e2
--- /dev/null
+++ b/external_imported/vcpkg/ports/datraw/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "datraw",
+  "version": "1.0.9",
+  "description": "C++ reimplementation of VIS's datraw library.",
+  "homepage": "https://github.com/UniStuttgart-VISUS/datraw",
+  "license": "MIT"
+}
diff --git a/external_imported/vcpkg/ports/dav1d/portfile.cmake b/external_imported/vcpkg/ports/dav1d/portfile.cmake
index 7aa56f990..4a9cf5f79 100644
--- a/external_imported/vcpkg/ports/dav1d/portfile.cmake
+++ b/external_imported/vcpkg/ports/dav1d/portfile.cmake
@@ -3,7 +3,7 @@ vcpkg_from_gitlab(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO videolan/dav1d
     REF "${VERSION}"
-    SHA512 53b3fc0363504d4b9dd29bc88d3c8510ae65ac69b04e97d650e78c9fb5e2b95816d5c29dbc454aa5c2e539401c4be88ae88d7a7a8224007a05183fd249677f31
+    SHA512 fce702048b876794d176dffe53d21aaf6a2e9521a306a078debc26a230b5042e7888edd63eb17bd17f06f30ce51901ebf37ea504da25eb911c1b926631cde278
 )
 
 vcpkg_find_acquire_program(NASM)
diff --git a/external_imported/vcpkg/ports/dav1d/vcpkg.json b/external_imported/vcpkg/ports/dav1d/vcpkg.json
index 00914417c..727efd556 100644
--- a/external_imported/vcpkg/ports/dav1d/vcpkg.json
+++ b/external_imported/vcpkg/ports/dav1d/vcpkg.json
@@ -1,11 +1,11 @@
 {
   "name": "dav1d",
-  "version": "1.1.0",
+  "version": "1.3.0",
   "port-version": 1,
   "description": "dav1d is a new open-source AV1 decoder developed by the VideoLAN and FFmpeg communities and sponsored by the Alliance for Open Media.",
   "homepage": "https://code.videolan.org/videolan/dav1d",
   "license": "BSD-2-Clause",
-  "supports": "!(uwp | (windows & x86 & !static))",
+  "supports": "!(windows & x86 & !static)",
   "dependencies": [
     {
       "name": "vcpkg-tool-meson",
diff --git a/external_imported/vcpkg/ports/daw-header-libraries/portfile.cmake b/external_imported/vcpkg/ports/daw-header-libraries/portfile.cmake
index 07904fe71..8fac40eb2 100644
--- a/external_imported/vcpkg/ports/daw-header-libraries/portfile.cmake
+++ b/external_imported/vcpkg/ports/daw-header-libraries/portfile.cmake
@@ -3,7 +3,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO beached/header_libraries
     REF "v${VERSION}"
-    SHA512 caa975cbaa48367148b1f0f13fc12896ff5dd921a7a851853e9e4f4110004fe913f5f18fad6636a281c5c177da77c04877a92c82e40dfa47cc71434087e7fb45
+    SHA512 6d59950b71c47aaba23ea762c2bd37665c00d65d5d7f9ac4c15d78b758f8c2061d04b26ad9ec8f7bf9540644601d47e801a363f85fcbb8d0b1da8c3de136d32e
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/daw-header-libraries/vcpkg.json b/external_imported/vcpkg/ports/daw-header-libraries/vcpkg.json
index 6ee230972..9ceba800b 100644
--- a/external_imported/vcpkg/ports/daw-header-libraries/vcpkg.json
+++ b/external_imported/vcpkg/ports/daw-header-libraries/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "daw-header-libraries",
-  "version": "2.88.0",
+  "version": "2.98.5",
   "description": "Set of header-only algorithms used in daw-utf8-range and daw-json-link.",
   "homepage": "https://github.com/beached/header_libraries",
   "license": "BSL-1.0",
diff --git a/external_imported/vcpkg/ports/daw-json-link/portfile.cmake b/external_imported/vcpkg/ports/daw-json-link/portfile.cmake
index 7668b8309..29b1cf918 100644
--- a/external_imported/vcpkg/ports/daw-json-link/portfile.cmake
+++ b/external_imported/vcpkg/ports/daw-json-link/portfile.cmake
@@ -3,7 +3,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO beached/daw_json_link
     REF "v${VERSION}"
-    SHA512 dc412cf07c1ef8cdb2b6267d6b630b6396541a49c44ee2d2b2b21f49c61cde387aff81548635c7c043a88aa90f3632aefe6bf0ec79453c5b58c80669e6a84cd2
+    SHA512 121604338153f71dbcf8a8c498997ce46dbce7d3981e4eaad6dd6d6c258fbdccc2d5fda86f0d87f0c824037072775292ec53ecf4cbb483525cf85682bd6e4ba0
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/daw-json-link/vcpkg.json b/external_imported/vcpkg/ports/daw-json-link/vcpkg.json
index c423238e9..b2e2ca573 100644
--- a/external_imported/vcpkg/ports/daw-json-link/vcpkg.json
+++ b/external_imported/vcpkg/ports/daw-json-link/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "daw-json-link",
-  "version": "3.15.0",
+  "version": "3.23.0",
   "description": "Perhaps the fastest JSON deserializer/serializer posssible or at least close to it.",
   "homepage": "https://github.com/beached/daw_json_link",
   "license": "BSL-1.0",
diff --git a/external_imported/vcpkg/ports/daxa/portfile.cmake b/external_imported/vcpkg/ports/daxa/portfile.cmake
index 4b3acb351..258a88b18 100644
--- a/external_imported/vcpkg/ports/daxa/portfile.cmake
+++ b/external_imported/vcpkg/ports/daxa/portfile.cmake
@@ -1,7 +1,7 @@
 vcpkg_from_git(
     OUT_SOURCE_PATH SOURCE_PATH
     URL https://github.com/Ipotrick/Daxa
-    REF 14d5378a6157b3530c3ff826182706126be135bd
+    REF 61b699ac12de475cf4a79bc99106b865acddaf18
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -9,7 +9,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     utils-imgui WITH_UTILS_IMGUI
     utils-mem WITH_UTILS_MEM
     utils-pipeline-manager-glslang WITH_UTILS_PIPELINE_MANAGER_GLSLANG
-    utils-task-list WITH_UTILS_TASK_LIST
+    utils-pipeline-manager-spirv-validation WITH_UTILS_PIPELINE_MANAGER_SPIRV_VALIDATION
+    utils-task-graph WITH_UTILS_TASK_GRAPH
 )
 set(DAXA_DEFINES)
 
@@ -22,8 +23,11 @@ endif()
 if(WITH_UTILS_PIPELINE_MANAGER_GLSLANG)
     list(APPEND DAXA_DEFINES "-DDAXA_ENABLE_UTILS_PIPELINE_MANAGER_GLSLANG=true")
 endif()
-if(WITH_UTILS_TASK_LIST)
-    list(APPEND DAXA_DEFINES "-DDAXA_ENABLE_UTILS_TASK_LIST=true")
+if(WITH_UTILS_PIPELINE_MANAGER_SPIRV_VALIDATION)
+    list(APPEND DAXA_DEFINES "-DDAXA_ENABLE_UTILS_PIPELINE_MANAGER_SPIRV_VALIDATION=true")
+endif()
+if(WITH_UTILS_TASK_GRAPH)
+    list(APPEND DAXA_DEFINES "-DDAXA_ENABLE_UTILS_TASK_GRAPH=true")
 endif()
 
 vcpkg_cmake_configure(
@@ -32,6 +36,9 @@ vcpkg_cmake_configure(
         ${DAXA_DEFINES}
         -DCMAKE_REQUIRE_FIND_PACKAGE_X11=ON
         -DCMAKE_REQUIRE_FIND_PACKAGE_WAYLAND=ON
+    MAYBE_UNUSED_VARIABLES
+        CMAKE_REQUIRE_FIND_PACKAGE_X11
+        CMAKE_REQUIRE_FIND_PACKAGE_WAYLAND
 )
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/daxa/vcpkg.json b/external_imported/vcpkg/ports/daxa/vcpkg.json
index 2b155b8d6..dc4bf1c3e 100644
--- a/external_imported/vcpkg/ports/daxa/vcpkg.json
+++ b/external_imported/vcpkg/ports/daxa/vcpkg.json
@@ -1,11 +1,12 @@
 {
   "name": "daxa",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "description": "Daxa C++ Vulkan Abstraction",
   "homepage": "https://github.com/Ipotrick/Daxa",
   "license": "MIT",
   "supports": "(windows | linux) & !x86",
   "dependencies": [
+    "fmt",
     {
       "name": "vcpkg-cmake",
       "host": true
@@ -15,6 +16,7 @@
       "host": true
     },
     "vulkan",
+    "vulkan-headers",
     "vulkan-memory-allocator",
     {
       "name": "wayland",
@@ -22,12 +24,6 @@
       "platform": "linux"
     }
   ],
-  "default-features": [
-    "utils-imgui",
-    "utils-mem",
-    "utils-pipeline-manager-glslang",
-    "utils-task-list"
-  ],
   "features": {
     "utils-imgui": {
       "description": "The ImGUI Daxa utility",
@@ -44,8 +40,14 @@
         "glslang"
       ]
     },
-    "utils-task-list": {
-      "description": "The Task-List Daxa utility"
+    "utils-pipeline-manager-spirv-validation": {
+      "description": "Build with SPIR-V validation",
+      "dependencies": [
+        "spirv-tools"
+      ]
+    },
+    "utils-task-graph": {
+      "description": "The Task-Graph Daxa utility"
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/dbg-macro/portfile.cmake b/external_imported/vcpkg/ports/dbg-macro/portfile.cmake
index 15fd2aabd..92b0a8f71 100644
--- a/external_imported/vcpkg/ports/dbg-macro/portfile.cmake
+++ b/external_imported/vcpkg/ports/dbg-macro/portfile.cmake
@@ -3,12 +3,12 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO sharkdp/dbg-macro
-    REF 4db61805d90cb66d91bcc56c2703591a0127ed11
-    SHA512 68afaedce857f6007edbb65527745aa07ab3dd736e65602b4c6da04646730ef4c09d9a239a9bcae1806c5a0bc0f70b5766edf245b2fd5f84d64cc03a5cadc5c8
+    REF "v${VERSION}"
+    SHA512 9aa41745168409f7c8c9e36e9bae58e2b3b356edd6d5f2414acd7dee9a79d2faa7b63d789821702e33781449b42213855c2ff71dcc39956f5f69c083827118c1
     HEAD_REF master
 )
 
-file(COPY ${SOURCE_PATH}/dbg.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+file(COPY "${SOURCE_PATH}/dbg.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
 
 # Handle copyright
-configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/dbg-macro/vcpkg.json b/external_imported/vcpkg/ports/dbg-macro/vcpkg.json
index 77d5be57e..3ca633d3d 100644
--- a/external_imported/vcpkg/ports/dbg-macro/vcpkg.json
+++ b/external_imported/vcpkg/ports/dbg-macro/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "dbg-macro",
-  "version-date": "2021-11-02",
+  "version": "0.5.1",
   "description": "A dbg(...) macro for C++",
-  "homepage": "https://github.com/sharkdp/dbg-macro"
+  "homepage": "https://github.com/sharkdp/dbg-macro",
+  "license": "MIT"
 }
diff --git a/external_imported/vcpkg/ports/dbow2/vcpkg.json b/external_imported/vcpkg/ports/dbow2/vcpkg.json
index 954bd3785..d71ae20bc 100644
--- a/external_imported/vcpkg/ports/dbow2/vcpkg.json
+++ b/external_imported/vcpkg/ports/dbow2/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "dbow2",
-  "version-string": "2019-08-05",
-  "port-version": 2,
+  "version-date": "2019-08-05",
+  "port-version": 3,
   "description": "DBoW2 is an improved version of the DBow library, an open source C++ library for indexing and converting images into a bag-of-word representation.",
   "homepage": "https://github.com/dorian3d/DBoW2",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/dbow3/portfile.cmake b/external_imported/vcpkg/ports/dbow3/portfile.cmake
index d58ccf9ce..1feaca835 100644
--- a/external_imported/vcpkg/ports/dbow3/portfile.cmake
+++ b/external_imported/vcpkg/ports/dbow3/portfile.cmake
@@ -1,16 +1,24 @@
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
+# https://github.com/rmsalinas/DBow3/pull/50 , already accepted but not merged as of 2023-06-13
+vcpkg_download_distfile(REMOVE_DYNAMIC_EXCEPTION_SPECS
+    URLS https://patch-diff.githubusercontent.com/raw/rmsalinas/DBow3/pull/50.patch?full_index=1
+    SHA512 e39b9615aa8cfd4cf26b4ec977df823533b187d18ade5447c96fdcea53c9a58b1648e0a9fe78e3833360ba91c27ad56b6d65f944bd6c46f76969a652ba64cb5a
+    FILENAME 9f9d19930c3ec597bd1ebc2a9c2a84b9fd49674e.patch
+)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO rmsalinas/DBow3
-    REF master
-    SHA512 16e6789b77e8b42428d156ae5efa667861fa8ef2e85b54e3dd1d28e6f8dc7d119e973234c77cac82e775080fb9c859640d04159659a7d63941325e13e40b2814
+    REF c5ae539abddcef43ef64fa130555e2d521098369
+    SHA512 a1b35d2a524a23c367180574f7ddbcad73161c7fda6c3e7973273ab86092d9c6d89df28925a8e53691cd894f2d6588832604a0dbdba478557695806907bf36eb
     PATCHES
+      "${REMOVE_DYNAMIC_EXCEPTION_SPECS}"
       fix_cmake.patch
 )
 
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DUSE_OPENCV_CONTRIB=ON
         -DBUILD_EXAMPLES=OFF
diff --git a/external_imported/vcpkg/ports/dbow3/vcpkg.json b/external_imported/vcpkg/ports/dbow3/vcpkg.json
index ddd8ea3cd..5e1bde463 100644
--- a/external_imported/vcpkg/ports/dbow3/vcpkg.json
+++ b/external_imported/vcpkg/ports/dbow3/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "dbow3",
   "version": "1.0.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "DBoW3 is an improved version of the DBow2 library, an open source C++ library for indexing and converting images into a bag-of-word representation.",
   "homepage": "https://github.com/rmsalinas/DBow3",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/dbus/getpeereid.patch b/external_imported/vcpkg/ports/dbus/getpeereid.patch
index 9be817a52..5cd2309e3 100644
--- a/external_imported/vcpkg/ports/dbus/getpeereid.patch
+++ b/external_imported/vcpkg/ports/dbus/getpeereid.patch
@@ -1,19 +1,20 @@
 diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
-index 7bc789f0e..ec476d9ed 100644
---- a/cmake/ConfigureChecks.cmake	
+index b7f3702..e2336ba 100644
+--- a/cmake/ConfigureChecks.cmake
 +++ b/cmake/ConfigureChecks.cmake
-@@ -44,5 +44,6 @@ check_include_file(sys/inotify.h DBUS_BUS_ENABLE_INOTIFY)
- 
+@@ -51,6 +51,7 @@ check_symbol_exists(closefrom    "unistd.h"         HAVE_CLOSEFROM)          #
+ check_symbol_exists(environ      "unistd.h"                  HAVE_DECL_ENVIRON)
+ check_symbol_exists(fstatfs      "sys/vfs.h"                 HAVE_FSTATFS)
  check_symbol_exists(getgrouplist "grp.h"            HAVE_GETGROUPLIST)       #  dbus-sysdeps.c
 +check_symbol_exists(getpeereid   "sys/types.h;unistd.h" HAVE_GETPEEREID)     #  dbus-sysdeps.c,
  check_symbol_exists(getpeerucred "ucred.h"          HAVE_GETPEERUCRED)       #  dbus-sysdeps.c, dbus-sysdeps-win.c
- check_symbol_exists(nanosleep    "time.h"           HAVE_NANOSLEEP)          #  dbus-sysdeps.c
  check_symbol_exists(getpwnam_r   "errno.h;pwd.h"    HAVE_GETPWNAM_R)         #  dbus-sysdeps-util-unix.c
+ check_symbol_exists(getrandom    "sys/random.h"             HAVE_GETRANDOM)
 diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake
-index cbffcfa91..1f055ddb9 100644
---- a/cmake/config.h.cmake	
+index 77fc19c..2f25643 100644
+--- a/cmake/config.h.cmake
 +++ b/cmake/config.h.cmake
-@@ -169,6 +169,9 @@
+@@ -140,6 +140,9 @@
  /* Define to 1 if you have getgrouplist */
  #cmakedefine   HAVE_GETGROUPLIST 1
  
diff --git a/external_imported/vcpkg/ports/dbus/libsystemd.patch b/external_imported/vcpkg/ports/dbus/libsystemd.patch
new file mode 100644
index 000000000..74193dc40
--- /dev/null
+++ b/external_imported/vcpkg/ports/dbus/libsystemd.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d3ec71b..932066a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -141,6 +141,10 @@ if(DBUS_LINUX)
+     if(ENABLE_SYSTEMD AND SYSTEMD_FOUND)
+         set(DBUS_BUS_ENABLE_SYSTEMD ON)
+         set(HAVE_SYSTEMD ${SYSTEMD_FOUND})
++        pkg_check_modules(SYSTEMD libsystemd IMPORTED_TARGET)
++        set(SYSTEMD_LIBRARIES PkgConfig::SYSTEMD CACHE INTERNAL "")
++    else()
++        set(SYSTEMD_LIBRARIES "" CACHE INTERNAL "")
+     endif()
+     option(ENABLE_USER_SESSION "enable user-session semantics for session bus under systemd" OFF)
+     set(DBUS_ENABLE_USER_SESSION ${ENABLE_USER_SESSION})
diff --git a/external_imported/vcpkg/ports/dbus/portfile.cmake b/external_imported/vcpkg/ports/dbus/portfile.cmake
index b66c68f18..1aae5fcdd 100644
--- a/external_imported/vcpkg/ports/dbus/portfile.cmake
+++ b/external_imported/vcpkg/ports/dbus/portfile.cmake
@@ -4,17 +4,19 @@ vcpkg_from_gitlab(
     GITLAB_URL https://gitlab.freedesktop.org/
     OUT_SOURCE_PATH SOURCE_PATH
     REPO dbus/dbus
-    REF ed866a94889e13c83dc873d8b5f86a907f908456 #1.15.2
-    SHA512  eca9bfabfa6e8a3bf82ecc3c36dbd038c2450aded539a6d405a2709e876ccbf5002391802f6d538a5bbc16723f0d51f059f03cb6d226b400bc032b3bbe59cf10
+    REF "dbus-${VERSION}"
+    SHA512 8e476b408514e6540c36beb84e8025827c22cda8958b6eb74d22b99c64765eb3cd5a6502aea546e3e5f0534039857b37edee89c659acef40e7cab0939947d4af
     HEAD_REF master
     PATCHES 
         cmake.dep.patch
         pkgconfig.patch
         getpeereid.patch # missing check from configure.ac
+        libsystemd.patch
 ) 
 
-vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+vcpkg_check_features(OUT_FEATURE_OPTIONS options
     FEATURES
+        systemd ENABLE_SYSTEMD
         x11     DBUS_BUILD_X11
         x11     CMAKE_REQUIRE_FIND_PACKAGE_X11
 )
@@ -30,12 +32,12 @@ vcpkg_cmake_configure(
         -DDBUS_INSTALL_SYSTEM_LIBS=OFF
         #-DDBUS_SERVICE=ON
         -DDBUS_WITH_GLIB=OFF
-        -DENABLE_SYSTEMD=ON
         -DTHREADS_PREFER_PTHREAD_FLAG=ON
         -DXSLTPROC_EXECUTABLE=FALSE
         "-DCMAKE_INSTALL_SYSCONFDIR=${CURRENT_PACKAGES_DIR}/etc/${PORT}"
         "-DWITH_SYSTEMD_SYSTEMUNITDIR=lib/systemd/system"
         "-DWITH_SYSTEMD_USERUNITDIR=lib/systemd/user"
+        ${options}
     OPTIONS_RELEASE
         -DDBUS_DISABLE_ASSERT=OFF
         -DDBUS_ENABLE_STATS=OFF
diff --git a/external_imported/vcpkg/ports/dbus/vcpkg.json b/external_imported/vcpkg/ports/dbus/vcpkg.json
index 27ddba56f..ce20181b8 100644
--- a/external_imported/vcpkg/ports/dbus/vcpkg.json
+++ b/external_imported/vcpkg/ports/dbus/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "dbus",
-  "version": "1.15.2",
+  "version": "1.15.8",
+  "port-version": 2,
   "description": "D-Bus specification and reference implementation, including libdbus and dbus-daemon",
   "homepage": "https://gitlab.freedesktop.org/dbus/dbus",
   "license": "AFL-2.1 OR GPL-2.0-or-later",
@@ -16,7 +17,23 @@
       "host": true
     }
   ],
+  "default-features": [
+    {
+      "name": "systemd",
+      "platform": "linux"
+    }
+  ],
   "features": {
+    "systemd": {
+      "description": "Build with systemd at_console support",
+      "supports": "linux",
+      "dependencies": [
+        {
+          "name": "libsystemd",
+          "platform": "linux"
+        }
+      ]
+    },
     "x11": {
       "description": "Build with X11 autolaunch support",
       "dependencies": [
diff --git a/external_imported/vcpkg/ports/dcmtk/dictionary_paths.patch b/external_imported/vcpkg/ports/dcmtk/dictionary_paths.patch
new file mode 100644
index 000000000..9e38f2a17
--- /dev/null
+++ b/external_imported/vcpkg/ports/dcmtk/dictionary_paths.patch
@@ -0,0 +1,26 @@
+diff --git a/CMake/GenerateDCMTKConfigure.cmake b/CMake/GenerateDCMTKConfigure.cmake
+index 8a59d44fa..8d3b4fc60 100644
+--- a/CMake/GenerateDCMTKConfigure.cmake
++++ b/CMake/GenerateDCMTKConfigure.cmake
+@@ -173,19 +173,11 @@ if(WIN32 AND NOT CYGWIN)
+ 
+   # Set dictionary path to the data dir inside install main dir (prefix)
+   if(DCMTK_DEFAULT_DICT STREQUAL "external")
+-    if(DCMTK_USE_WIN32_PROGRAMDATA)
+-      set(DCM_DICT_DEFAULT_PATH "${CMAKE_INSTALL_FULL_DATADIR}\\\\dicom.dic")
+-    else()
+-      set(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIR}\\\\dcmtk\\\\dicom.dic")
+-    endif()
++    set(DCM_DICT_DEFAULT_PATH "${CMAKE_INSTALL_FULL_DATADIR}\\\\dicom.dic")
+ 
+     # If private dictionary should be utilized, add it to default dictionary path.
+     if(ENABLE_PRIVATE_TAGS)
+-      if(DCMTK_USE_WIN32_PROGRAMDATA)
+-        set(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH};${CMAKE_INSTALL_FULL_DATADIR}\\\\private.dic")
+-      else()
+-        set(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH};${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIR}\\\\dcmtk\\\\private.dic")
+-      endif()
++      set(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH};${CMAKE_INSTALL_FULL_DATADIR}\\\\private.dic")
+     endif()
+ 
+      # Again, for Windows strip all / from path and replace it with \\.
diff --git a/external_imported/vcpkg/ports/dcmtk/fix_link_tiff.patch b/external_imported/vcpkg/ports/dcmtk/fix_link_tiff.patch
new file mode 100644
index 000000000..8270746a8
--- /dev/null
+++ b/external_imported/vcpkg/ports/dcmtk/fix_link_tiff.patch
@@ -0,0 +1,13 @@
+diff --git a/CMake/3rdparty.cmake b/CMake/3rdparty.cmake
+index 955ea71..9968352 100644
+--- a/CMake/3rdparty.cmake
++++ b/CMake/3rdparty.cmake
+@@ -42,7 +42,7 @@ if(DCMTK_USE_FIND_PACKAGE)
+         message(STATUS "Info: DCMTK TIFF support will be enabled")
+         include_directories(${TIFF_INCLUDE_DIR} ${JPEG_INCLUDE_DIR})
+       endif()
+-      set(LIBTIFF_LIBS ${TIFF_LIBRARY} ${TIFF_EXTRA_LIBS_STATIC} ${JPEG_LIBRARY})
++      set(LIBTIFF_LIBS ${TIFF_LIBRARIES})
+     endif()
+   endif()
+ 
diff --git a/external_imported/vcpkg/ports/dcmtk/fix_link_xml2.patch b/external_imported/vcpkg/ports/dcmtk/fix_link_xml2.patch
new file mode 100644
index 000000000..feaa4038f
--- /dev/null
+++ b/external_imported/vcpkg/ports/dcmtk/fix_link_xml2.patch
@@ -0,0 +1,13 @@
+diff --git a/CMake/3rdparty.cmake b/CMake/3rdparty.cmake
+index 2c974e8..90707bd 100644
+--- a/CMake/3rdparty.cmake
++++ b/CMake/3rdparty.cmake
+@@ -94,7 +94,7 @@ if(DCMTK_USE_FIND_PACKAGE)
+     else()
+       message(STATUS "Info: DCMTK XML support will be enabled")
+       set(WITH_LIBXML 1)
+-      include_directories(${LIBXML2_INCLUDE_DIR})
++      include_directories(${LIBXML2_INCLUDE_DIRS})
+       set(LIBXML_LIBS ${LIBXML2_LIBRARIES} ${LIBXML2_EXTRA_LIBS_STATIC})
+     endif()
+   endif()
diff --git a/external_imported/vcpkg/ports/dcmtk/portfile.cmake b/external_imported/vcpkg/ports/dcmtk/portfile.cmake
index 4dcbeb824..d80bd233b 100644
--- a/external_imported/vcpkg/ports/dcmtk/portfile.cmake
+++ b/external_imported/vcpkg/ports/dcmtk/portfile.cmake
@@ -1,12 +1,14 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO DCMTK/dcmtk
-    REF a137f1aff4e1df3fbefe53ee8b160973c74c96dd # DCMTK-3.6.7
-    SHA512 dd41b38ef5d02ac2bf4071e1c27814e03357bc6a51eef59daf47a86d024d7fcbaaa1a71df8600fb8180f8b6537d45d6bf48a00730c1fa9d147778f36ff3e425a
+    REF 59f75a8b50e50ae1bb1ff12098040c6327500740 # DCMTK-3.6.8
+    SHA512 2719e2163d57339a81f079c8c28d4e9e3ee6b1b85bc3db5b94a2279e3dd9881ab619d432d64984e6371569866d7aa4f01bf8b41841b773bcd60bbb8ad2118cac
     HEAD_REF master
     PATCHES
         dcmtk.patch
-        windows-patch.patch
+        fix_link_xml2.patch
+        dictionary_paths.patch
+        fix_link_tiff.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -21,10 +23,17 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
         "tools"   BUILD_APPS
 )
 
+if("external-dict" IN_LIST FEATURES)
+    set(DCMTK_DEFAULT_DICT "external")
+else()
+    set(DCMTK_DEFAULT_DICT "builtin")
+endif()
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         ${FEATURE_OPTIONS}
+        "-DDCMTK_DEFAULT_DICT=${DCMTK_DEFAULT_DICT}" 
         -DDCMTK_WITH_DOXYGEN=OFF
         -DDCMTK_FORCE_FPIC_ON_UNIX=ON
         -DDCMTK_OVERWRITE_WIN32_COMPILER_FLAGS=OFF
@@ -38,6 +47,8 @@ vcpkg_cmake_configure(
         -DINSTALL_HEADERS=OFF
         -DINSTALL_OTHER=OFF
         -DBUILD_APPS=OFF
+    MAYBE_UNUSED_VARIABLES
+        -DDCMTK_USE_FIND_PACKAGE_WIN_DEFAULT=ON
 )
 
 vcpkg_cmake_install()
@@ -105,9 +116,12 @@ if ("tools" IN_LIST FEATURES)
         findscu
         getscu
         img2dcm
+        mkcsmapper
+        mkesdb
         mkreport
         movescu
         msgserv
+        oficonv_tests
         ofstd_tests
         pdf2dcm
         stl2dcm
@@ -128,12 +142,12 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dcmtk/config/osconfig.h" "#define DCMTK_PREFIX \"${CURRENT_PACKAGES_DIR}\"" "")
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dcmtk/config/osconfig.h" "#define DCM_DICT_DEFAULT_PATH \"${CURRENT_PACKAGES_DIR}/share/dcmtk/dicom.dic:${CURRENT_PACKAGES_DIR}/share/dcmtk/private.dic\"" "")
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dcmtk/config/osconfig.h" "#define DEFAULT_CONFIGURATION_DIR \"${CURRENT_PACKAGES_DIR}/etc/dcmtk/\"" "")
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dcmtk/config/osconfig.h" "#define DEFAULT_SUPPORT_DATA_DIR \"${CURRENT_PACKAGES_DIR}/share/dcmtk/\"" "")
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dcmtk/config/osconfig.h" "#define DCM_DICT_DEFAULT_PATH \"${CURRENT_PACKAGES_DIR}/share/dcmtk-${VERSION}/dicom.dic:${CURRENT_PACKAGES_DIR}/share/dcmtk-${VERSION}/private.dic\"" "")
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dcmtk/config/osconfig.h" "#define DEFAULT_CONFIGURATION_DIR \"${CURRENT_PACKAGES_DIR}/etc/dcmtk-${VERSION}/\"" "")
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dcmtk/config/osconfig.h" "#define DEFAULT_SUPPORT_DATA_DIR \"${CURRENT_PACKAGES_DIR}/share/dcmtk-${VERSION}/\"" "")
 
 vcpkg_fixup_pkgconfig()
 
-file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYRIGHT")
 
-file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY)
diff --git a/external_imported/vcpkg/ports/dcmtk/usage b/external_imported/vcpkg/ports/dcmtk/usage
index 9335b7839..770f88114 100644
--- a/external_imported/vcpkg/ports/dcmtk/usage
+++ b/external_imported/vcpkg/ports/dcmtk/usage
@@ -18,8 +18,8 @@ Add the following cmake code to your CMakeLists.txt to create definitions for DC
         target_compile_definitions(main
             PUBLIC
                 "DCMTK_PREFIX=${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}"
-                "DCM_DICT_DEFAULT_PATH=${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/dcmtk/dicom.dic:${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/dcmtk/private.dic"
-                "DEFAULT_CONFIGURATION_DIR=${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/etc/dcmtk/"
-                "DEFAULT_SUPPORT_DATA_DIR=${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/dcmtk/"
+                "DCM_DICT_DEFAULT_PATH=${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/dcmtk-@VERSION@/dicom.dic:${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/dcmtk-@VERSION@/private.dic"
+                "DEFAULT_CONFIGURATION_DIR=${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/etc/dcmtk-@VERSION@/"
+                "DEFAULT_SUPPORT_DATA_DIR=${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/dcmtk-@VERSION@/"
         )
     endif()
diff --git a/external_imported/vcpkg/ports/dcmtk/vcpkg.json b/external_imported/vcpkg/ports/dcmtk/vcpkg.json
index 7b4067dda..b881edb5b 100644
--- a/external_imported/vcpkg/ports/dcmtk/vcpkg.json
+++ b/external_imported/vcpkg/ports/dcmtk/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "dcmtk",
-  "version": "3.6.7",
-  "port-version": 4,
+  "version": "3.6.8",
+  "port-version": 2,
   "description": "This DICOM ToolKit (DCMTK) package consists of source code, documentation and installation instructions for a set of software libraries and applications implementing part of the DICOM/MEDICOM Standard.",
   "homepage": "https://github.com/DCMTK/dcmtk",
   "license": "BSD-3-Clause OR BSD-2-Clause OR libtiff OR MIT OR Zlib OR Libpng",
@@ -17,6 +17,9 @@
     }
   ],
   "features": {
+    "external-dict": {
+      "description": "Enable external dictionary"
+    },
     "iconv": {
       "description": "Enable Iconv support",
       "dependencies": [
diff --git a/external_imported/vcpkg/ports/dcmtk/windows-patch.patch b/external_imported/vcpkg/ports/dcmtk/windows-patch.patch
deleted file mode 100644
index 83322ea92..000000000
--- a/external_imported/vcpkg/ports/dcmtk/windows-patch.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/CMake/3rdparty.cmake b/CMake/3rdparty.cmake
-index 47e3476..2c974e8 100644
---- a/CMake/3rdparty.cmake
-+++ b/CMake/3rdparty.cmake
-@@ -3,11 +3,7 @@ if(WIN32)
-   # For Windows, we don't used FIND_PACKAGE because DCMTK usually is used with its
-   # own set of 3rd-party support libraries that can be downloaded from DCMTK's
-   # website (pre-built).
--  if(MINGW)
--    set(DCMTK_USE_FIND_PACKAGE TRUE CACHE BOOL "${USE_FIND_PACKAGE_DOCS}")
--  else()
--    set(DCMTK_USE_FIND_PACKAGE FALSE CACHE BOOL "${USE_FIND_PACKAGE_DOCS}")
--  endif()
-+  set(DCMTK_USE_FIND_PACKAGE TRUE CACHE BOOL "${USE_FIND_PACKAGE_DOCS}")
- else()
-   # Only find_package is supported
-   set(DCMTK_USE_FIND_PACKAGE TRUE CACHE BOOL "${USE_FIND_PACKAGE_DOCS}")
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9f8d268..28ddc3e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -4,6 +4,10 @@ cmake_minimum_required(VERSION 3.0.0...3.13.2 FATAL_ERROR)
- # Declare project
- project(DCMTK)
- 
-+if(MSVC)
-+  string(APPEND CMAKE_CXX_FLAGS " /Zc:__cplusplus")
-+endif()
-+
- #-----------------------------------------------------------------------------
- # General project settings to configure DCMTK build process
- #-----------------------------------------------------------------------------
diff --git a/external_imported/vcpkg/ports/debug-assert/vcpkg.json b/external_imported/vcpkg/ports/debug-assert/vcpkg.json
index 2ed950c2c..e3bded5ba 100644
--- a/external_imported/vcpkg/ports/debug-assert/vcpkg.json
+++ b/external_imported/vcpkg/ports/debug-assert/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "debug-assert",
-  "version-string": "1.3.3",
-  "port-version": 1,
+  "version": "1.3.3",
+  "port-version": 2,
   "description": "Provides flexible DEBUG_ASSERT() macro.",
   "homepage": "https://github.com/foonathan/debug_assert",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/decimal-for-cpp/vcpkg.json b/external_imported/vcpkg/ports/decimal-for-cpp/vcpkg.json
index 0aec858a5..d54b21398 100644
--- a/external_imported/vcpkg/ports/decimal-for-cpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/decimal-for-cpp/vcpkg.json
@@ -1,5 +1,6 @@
 {
   "name": "decimal-for-cpp",
-  "version-string": "1.18",
+  "version": "1.18",
+  "port-version": 1,
   "description": "Decimal data type support, for COBOL-like fixed-point operations on currency values."
 }
diff --git a/external_imported/vcpkg/ports/devil/vcpkg.json b/external_imported/vcpkg/ports/devil/vcpkg.json
index b58e68390..b37faa5e2 100644
--- a/external_imported/vcpkg/ports/devil/vcpkg.json
+++ b/external_imported/vcpkg/ports/devil/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "devil",
   "version": "1.8.0",
-  "port-version": 10,
+  "port-version": 11,
   "description": "A full featured cross-platform image library",
   "homepage": "https://github.com/DentonW/DevIL",
+  "supports": "!uwp",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/directx-dxc/directx-dxc-config.cmake.in b/external_imported/vcpkg/ports/directx-dxc/directx-dxc-config.cmake.in
index 2a35c8dfa..814ca9605 100644
--- a/external_imported/vcpkg/ports/directx-dxc/directx-dxc-config.cmake.in
+++ b/external_imported/vcpkg/ports/directx-dxc/directx-dxc-config.cmake.in
@@ -8,8 +8,8 @@ if (EXISTS "${_dxc_exe}")
 
    add_library(Microsoft::DirectXShaderCompiler SHARED IMPORTED)
    set_target_properties(Microsoft::DirectXShaderCompiler PROPERTIES
-      IMPORTED_LOCATION_RELEASE            "${_dxc_root}/@dll_dir@/@dll_name@"
-      IMPORTED_LOCATION_DEBUG              "${_dxc_root}/@dll_dir@/@dll_name@"
+      IMPORTED_LOCATION_RELEASE            "${_dxc_root}/@dll_dir@/@dll_name_dxc@; ${_dxc_root}/@dll_dir@/@dll_name_dxil@"
+      IMPORTED_LOCATION_DEBUG              "${_dxc_root}/@dll_dir@/@dll_name_dxc@; ${_dxc_root}/@dll_dir@/@dll_name_dxil@"
       IMPORTED_IMPLIB_RELEASE              "${_dxc_root}/lib/@lib_name@"
       IMPORTED_IMPLIB_DEBUG                "${_dxc_root}/lib/@lib_name@"
       IMPORTED_SONAME_RELEASE              "@lib_name@"
diff --git a/external_imported/vcpkg/ports/directx-dxc/portfile.cmake b/external_imported/vcpkg/ports/directx-dxc/portfile.cmake
index ba9572c8c..4c10c739b 100644
--- a/external_imported/vcpkg/ports/directx-dxc/portfile.cmake
+++ b/external_imported/vcpkg/ports/directx-dxc/portfile.cmake
@@ -1,7 +1,7 @@
 set(VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY enabled)
 
-set(DIRECTX_DXC_TAG v1.7.2212.1)
-set(DIRECTX_DXC_VERSION 2023_03_01)
+set(DIRECTX_DXC_TAG v1.7.2308)
+set(DIRECTX_DXC_VERSION 2023_08_14)
 
 if (NOT VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
    message(STATUS "Note: ${PORT} always requires dynamic library linkage at runtime.")
@@ -11,13 +11,13 @@ if (VCPKG_TARGET_IS_LINUX)
     vcpkg_download_distfile(ARCHIVE
         URLS "https://github.com/microsoft/DirectXShaderCompiler/releases/download/${DIRECTX_DXC_TAG}/linux_dxc_${DIRECTX_DXC_VERSION}.x86_64.tar.gz"
         FILENAME "linux_dxc_${DIRECTX_DXC_VERSION}.tar.gz"
-        SHA512 66b421377a92b8ebb700f5df30b538393b826e3f12bb3478430dbbb1f899e435f6ed8c442a38ef9218d6f55d6e5c0441bd8a766bc1960df278567e575f8b969c
+        SHA512 7f1fb252b27fb00b9ffeadafb47921757c5e4d7df806283fe7629b866d2873896d7a7d599032aa2389f047d9791a447aabb22e3e8e7e1f3f76142675d831b738
     )
 else()
     vcpkg_download_distfile(ARCHIVE
         URLS "https://github.com/microsoft/DirectXShaderCompiler/releases/download/${DIRECTX_DXC_TAG}/dxc_${DIRECTX_DXC_VERSION}.zip"
         FILENAME "dxc_${DIRECTX_DXC_VERSION}.zip"
-        SHA512 9c348d24f406c5072a57961184d5f6c6d6483666bbb2f18dd31a9c666249e1b83e6c035dcdbdd126d084e4a5cbe0973cd823df97ac9b1efc715c15ce5691b27a
+        SHA512 3bc49f77b55f58de88002a75b38e5acdb8600b0b73729320a25a27af08f1f21d0b4aec92ee9d736eb30bae42f4e0f2f32d25d6635fa71aedcaf82440e6d2433e
     )
 endif()
 
@@ -55,7 +55,8 @@ if (VCPKG_TARGET_IS_LINUX)
     "${PACKAGE_PATH}/bin/dxc"
     DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
 
-  set(dll_name "libdxcompiler.so")
+  set(dll_name_dxc "libdxcompiler.so")
+  set(dll_name_dxil "libdxil.so")
   set(dll_dir  "lib")
   set(lib_name "libdxcompiler.so")
   set(tool_path "bin/dxc")
@@ -96,7 +97,8 @@ else()
     "${PACKAGE_PATH}/bin/${DXC_ARCH}/dxil.dll"
     DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/")
 
-  set(dll_name "dxcompiler.dll")
+  set(dll_name_dxc "dxcompiler.dll")
+  set(dll_name_dxil "dxil.dll")
   set(dll_dir  "bin")
   set(lib_name "dxcompiler.lib")
   set(tool_path "tools/directx-dxc/dxc.exe")
diff --git a/external_imported/vcpkg/ports/directx-dxc/vcpkg.json b/external_imported/vcpkg/ports/directx-dxc/vcpkg.json
index db7b6c97e..828146c7c 100644
--- a/external_imported/vcpkg/ports/directx-dxc/vcpkg.json
+++ b/external_imported/vcpkg/ports/directx-dxc/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "directx-dxc",
-  "version-date": "2023-03-01",
-  "port-version": 1,
+  "version-date": "2023-08-14",
   "description": "DirectX Shader Compiler (LLVM/Clang)",
   "homepage": "https://github.com/microsoft/DirectXShaderCompiler",
   "documentation": "https://github.com/microsoft/DirectXShaderCompiler/wiki",
diff --git a/external_imported/vcpkg/ports/directx-headers/portfile.cmake b/external_imported/vcpkg/ports/directx-headers/portfile.cmake
index 0c781650e..93dce1e2d 100644
--- a/external_imported/vcpkg/ports/directx-headers/portfile.cmake
+++ b/external_imported/vcpkg/ports/directx-headers/portfile.cmake
@@ -1,21 +1,21 @@
-vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/DirectX-Headers
-    REF v1.608.2b
-    SHA512 d4e82615751d9ee46c456c676bfd6831c47d159ee58634531fc1acd09927f00c4e8d379cb233a1f89e3489a6a30d8edc0552b76945071badaed6a9c8591cbb0c
+    REF v${VERSION}
+    SHA512 717ed37f6404d67a032f50358a17bcab6c6258eff321287e4a26cef203738d4e5c930a53afc43d8175637634d71dfbb7c25f13eedaa35a4626cb402fa5e56abc
     HEAD_REF main
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
-    OPTIONS -DDXHEADERS_BUILD_TEST=OFF -DDXHEADERS_BUILD_GOOGLE_TEST=OFF
+    OPTIONS -DDXHEADERS_INSTALL=ON -DDXHEADERS_BUILD_TEST=OFF -DDXHEADERS_BUILD_GOOGLE_TEST=OFF
 )
 
 vcpkg_cmake_install()
+vcpkg_fixup_pkgconfig()
 vcpkg_cmake_config_fixup(CONFIG_PATH share/directx-headers/cmake)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/directx-headers/usage b/external_imported/vcpkg/ports/directx-headers/usage
new file mode 100644
index 000000000..bc8737563
--- /dev/null
+++ b/external_imported/vcpkg/ports/directx-headers/usage
@@ -0,0 +1,4 @@
+The DirectX Headers package provides CMake targets:
+
+    find_package(directx-headers CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE Microsoft::DirectX-Headers)
diff --git a/external_imported/vcpkg/ports/directx-headers/vcpkg.json b/external_imported/vcpkg/ports/directx-headers/vcpkg.json
index b749b8123..8c070ed4c 100644
--- a/external_imported/vcpkg/ports/directx-headers/vcpkg.json
+++ b/external_imported/vcpkg/ports/directx-headers/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "directx-headers",
-  "version": "1.608.2",
-  "port-version": 1,
+  "version": "1.611.0",
   "description": "Official DirectX 12 Headers",
   "homepage": "https://devblogs.microsoft.com/directx/",
   "documentation": "https://devblogs.microsoft.com/directx/gettingstarted-dx12agility/",
diff --git a/external_imported/vcpkg/ports/directxmath/portfile.cmake b/external_imported/vcpkg/ports/directxmath/portfile.cmake
index 0bd63bdc3..088d3bcce 100644
--- a/external_imported/vcpkg/ports/directxmath/portfile.cmake
+++ b/external_imported/vcpkg/ports/directxmath/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/DirectXMath
-    REF dec2022
-    SHA512 61da5464e4a6b0e405307496b0b925fc52e3f7acd3841527c5f8e86d5188865767dd44d4277f034c46b0088d1ee52da72f747c5965cd37411600418b605d4702
+    REF dec2023
+    SHA512 ddb5fdb4ef2d524990b0eba254e8395e0c3278a49c37889eef97c977b9d72c4983305c7e2a5b732e05ee54819e0d4aea134a1419f713dda4da386d1bad2d3580
     HEAD_REF main
 )
 
@@ -11,6 +11,10 @@ vcpkg_cmake_configure(
 )
 
 vcpkg_cmake_install()
+
+file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/DirectXMath.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/share/pkgconfig")
+
+vcpkg_fixup_pkgconfig()
 vcpkg_cmake_config_fixup(CONFIG_PATH share/directxmath)
 
 if(NOT VCPKG_TARGET_IS_WINDOWS)
@@ -28,4 +32,5 @@ endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/directxmath/usage b/external_imported/vcpkg/ports/directxmath/usage
new file mode 100644
index 000000000..6e179fe37
--- /dev/null
+++ b/external_imported/vcpkg/ports/directxmath/usage
@@ -0,0 +1,4 @@
+The DirectXMath package provides CMake targets:
+
+    find_package(directxmath CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE Microsoft::DirectXMath)
diff --git a/external_imported/vcpkg/ports/directxmath/vcpkg.json b/external_imported/vcpkg/ports/directxmath/vcpkg.json
index 2c894e15e..3292bb6de 100644
--- a/external_imported/vcpkg/ports/directxmath/vcpkg.json
+++ b/external_imported/vcpkg/ports/directxmath/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "directxmath",
-  "version-date": "2022-12-12",
+  "version-date": "2023-12-31",
   "description": "DirectXMath SIMD C++ math library",
   "homepage": "https://github.com/Microsoft/DirectXMath",
   "documentation": "https://docs.microsoft.com/windows/win32/dxmath/directxmath-portal",
diff --git a/external_imported/vcpkg/ports/directxmesh/portfile.cmake b/external_imported/vcpkg/ports/directxmesh/portfile.cmake
index de30cc246..d3c2efe4d 100644
--- a/external_imported/vcpkg/ports/directxmesh/portfile.cmake
+++ b/external_imported/vcpkg/ports/directxmesh/portfile.cmake
@@ -1,12 +1,12 @@
-set(DIRECTXMESH_TAG dec2022)
+set(DIRECTXMESH_TAG dec2023)
 
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/DirectXMesh
-    REF dec2022b
-    SHA512 8e7b757b311223b6ea10fcd6ca9729a4fed51526966239da7d9c3c22f09bc50bbae80b2f8f899badbcc0bfcabc62dcd8d7a662c5881118cce97d3198c014c51e
+    REF ${DIRECTXMESH_TAG}
+    SHA512 25442ec60040f2f232079b4a62a4460c8de11a881e36f5bdaeadbe98678d360141e8eca8162169941c03884cc2a05c3e20cf7fd2aef6518f6a647b7382d6d271
     HEAD_REF main
 )
 
@@ -15,53 +15,69 @@ vcpkg_check_features(
     FEATURES
         dx12 BUILD_DX12
         spectre ENABLE_SPECTRE_MITIGATION
+        tools BUILD_TOOLS
 )
 
-if (VCPKG_HOST_IS_LINUX)
-    message(WARNING "Build ${PORT} requires GCC version 9 or later")
-endif()
-
 set(EXTRA_OPTIONS -DBUILD_TESTING=OFF)
 
-if(VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_XBOX)
-  list(APPEND EXTRA_OPTIONS -DBUILD_TOOLS=OFF)
-else()
-  list(APPEND EXTRA_OPTIONS -DBUILD_TOOLS=ON)
+if (VCPKG_HOST_IS_LINUX)
+    message(WARNING "Build ${PORT} requires GCC version 9 or later")
 endif()
 
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS ${FEATURE_OPTIONS} ${EXTRA_OPTIONS}
 )
 
 vcpkg_cmake_install()
+vcpkg_fixup_pkgconfig()
 vcpkg_cmake_config_fixup(CONFIG_PATH share/directxmesh)
 
-if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64))
-  vcpkg_download_distfile(
-    MESHCONVERT_EXE
-    URLS "https://github.com/Microsoft/DirectXMesh/releases/download/${DIRECTXMESH_TAG}/meshconvert.exe"
-    FILENAME "meshconvert-${DIRECTXMESH_TAG}.exe"
-    SHA512 46b5fc3dcf58a7c03075927511de5ae4c62c09ceb22076125d3be29044d7da1cc32225a43500ed53ddf0c30d969091b705345a5eb3bb49cc07233dba988357c8
-  )
+if("tools" IN_LIST FEATURES)
 
   file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxmesh/")
 
-  file(INSTALL
-    ${MESHCONVERT_EXE}
-    DESTINATION ${CURRENT_PACKAGES_DIR}/tools/directxmesh/)
+  if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64)
 
-  file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert-${DIRECTXMESH_TAG}.exe ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert.exe)
+    vcpkg_download_distfile(
+      MESHCONVERT_EXE
+      URLS "https://github.com/Microsoft/DirectXMesh/releases/download/${DIRECTXMESH_TAG}/meshconvert.exe"
+      FILENAME "meshconvert-${DIRECTXMESH_TAG}.exe"
+      SHA512 db2d32ec44993547881e2f14ee3403aa6133758d250ffc54b7cec9c1f15be46e5a5d847eb1cff60081bdfeaaa1e6be129475f40502c0a8c5ba2d58e5baa71691
+    )
 
-elseif(VCPKG_TARGET_IS_WINDOWS AND (NOT VCPKG_TARGET_IS_UWP) AND (NOT VCPKG_TARGET_IS_XBOX))
+    file(INSTALL
+      "${MESHCONVERT_EXE}"
+      DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxmesh/")
 
-  vcpkg_copy_tools(
-        TOOL_NAMES meshconvert
-        SEARCH_DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/CMake
+    file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert-${DIRECTXMESH_TAG}.exe" "${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert.exe")
+
+  elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64)
+
+    vcpkg_download_distfile(
+      MESHCONVERT_EXE
+      URLS "https://github.com/Microsoft/DirectXMesh/releases/download/${DIRECTXMESH_TAG}/meshconvert_arm64.exe"
+      FILENAME "meshconvert-${DIRECTXMESH_TAG}-arm64.exe"
+      SHA512 deaa61a1f24bf1ffff817a7b72b125d2402b97ca15713411eb3a5b0af0b5f2b25407be87d2fd60fb4670744656230d221183510167a1696685d2def9fa9c1532
     )
 
+    file(INSTALL
+      "${MESHCONVERT_EXE}"
+      DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxmesh/")
+
+    file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert-${DIRECTXMESH_TAG}-arm64.exe" "${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert.exe")
+
+  else()
+
+    vcpkg_copy_tools(
+          TOOL_NAMES meshconvert
+          SEARCH_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/CMake"
+      )
+
+  endif()
 endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/directxmesh/usage b/external_imported/vcpkg/ports/directxmesh/usage
new file mode 100644
index 000000000..73b783e15
--- /dev/null
+++ b/external_imported/vcpkg/ports/directxmesh/usage
@@ -0,0 +1,8 @@
+The DirectXMesh package provides CMake targets:
+
+    find_package(directxmesh CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE Microsoft::DirectXMesh)
+
+The utilities headers FlexibleVertexFormat.h and WaveFrontReader.h have their own target:
+
+    target_link_libraries(main PRIVATE Microsoft::DirectXMesh::Utilities)
diff --git a/external_imported/vcpkg/ports/directxmesh/vcpkg.json b/external_imported/vcpkg/ports/directxmesh/vcpkg.json
index abbe39660..c06d8e195 100644
--- a/external_imported/vcpkg/ports/directxmesh/vcpkg.json
+++ b/external_imported/vcpkg/ports/directxmesh/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "directxmesh",
-  "version-date": "2022-12-15",
-  "port-version": 1,
+  "version-date": "2023-12-31",
   "description": "DirectXMesh geometry processing library",
   "homepage": "https://github.com/Microsoft/DirectXMesh",
   "documentation": "https://github.com/microsoft/DirectXMesh/wiki",
@@ -10,7 +9,7 @@
   "dependencies": [
     {
       "name": "directx-headers",
-      "platform": "(windows & !xbox) | linux"
+      "platform": "mingw | linux"
     },
     "directxmath",
     {
@@ -28,10 +27,20 @@
   ],
   "features": {
     "dx12": {
-      "description": "Build with DirectX12 support for Windows 10"
+      "description": "Build with DirectX12 support for Windows 10/Windows 11",
+      "dependencies": [
+        {
+          "name": "directx-headers",
+          "platform": "windows & !xbox"
+        }
+      ]
     },
     "spectre": {
       "description": "Build Spectre-mitigated library"
+    },
+    "tools": {
+      "description": "meshconvert command-line tool",
+      "supports": "windows & !uwp & !xbox"
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/directxsdk/portfile.cmake b/external_imported/vcpkg/ports/directxsdk/portfile.cmake
index 3e38e42e1..ac2c22b67 100644
--- a/external_imported/vcpkg/ports/directxsdk/portfile.cmake
+++ b/external_imported/vcpkg/ports/directxsdk/portfile.cmake
@@ -10,8 +10,8 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 24e1e9bda319b780124b865f4640822cfc44e4d18fbdcc8456d48fe54081652ce4ddb63d3bd8596351057cbae50fc824b8297e99f0f7c97547153162562ba73f
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE ${ARCHIVE}
 )
 
@@ -33,6 +33,8 @@ set(HEADERS
     ${INC_DIR}/D3DX11async.h
     ${INC_DIR}/D3DX11core.h
     ${INC_DIR}/D3DX11tex.h
+    ${INC_DIR}/d3d9.h
+    ${INC_DIR}/d3d9types.h
     ${INC_DIR}/d3dx9.h
     ${INC_DIR}/d3dx9anim.h
     ${INC_DIR}/d3dx9core.h
@@ -70,6 +72,7 @@ set(RELEASE_LIBS
     ${LIB_DIR}/d3dx9.lib
 )
 set(OTHER_LIBS
+    ${LIB_DIR}/d3d9.lib
     ${LIB_DIR}/d3dxof.lib
     ${LIB_DIR}/DxErr.lib
 )
diff --git a/external_imported/vcpkg/ports/directxsdk/vcpkg.json b/external_imported/vcpkg/ports/directxsdk/vcpkg.json
index b4ff91fc3..4591dc653 100644
--- a/external_imported/vcpkg/ports/directxsdk/vcpkg.json
+++ b/external_imported/vcpkg/ports/directxsdk/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "directxsdk",
   "version-string": "jun10",
-  "port-version": 6,
+  "port-version": 8,
   "description": "Legacy DirectX SDK",
   "homepage": "https://docs.microsoft.com/en-us/windows/win32/directx-sdk--august-2009-",
   "license": null,
diff --git a/external_imported/vcpkg/ports/directxtex/portfile.cmake b/external_imported/vcpkg/ports/directxtex/portfile.cmake
index d338390b1..1302a9e19 100644
--- a/external_imported/vcpkg/ports/directxtex/portfile.cmake
+++ b/external_imported/vcpkg/ports/directxtex/portfile.cmake
@@ -1,12 +1,12 @@
-set(DIRECTXTEX_TAG jan2023)
+set(DIRECTXTEX_TAG dec2023)
 
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/DirectXTex
-    REF jan2023c
-    SHA512 df550651b0fc4927aa9f837e0347b98722b8112ca7d7eddecded03a4a8a3dd7afed42c882c04f0b64e403a26c84d4e1c88ee9c104395be446ce220b28c6af9da
+    REF ${DIRECTXTEX_TAG}
+    SHA512 c4d9c5f0ce275bb612ee5055c7fcbe4dbfdfd8a1a6eda78e25761f1e70b9883bf620812de2f27b5ac950ca5416f5dcdd08c364d0d2afe13150746bba4c36e3dd
     HEAD_REF main
     )
 
@@ -17,8 +17,15 @@ vcpkg_check_features(
         dx12 BUILD_DX12
         openexr ENABLE_OPENEXR_SUPPORT
         spectre ENABLE_SPECTRE_MITIGATION
+        tools BUILD_TOOLS
 )
 
+set(EXTRA_OPTIONS -DBUILD_SAMPLE=OFF -DBUILD_TESTING=OFF)
+
+if(VCPKG_TARGET_IS_WINDOWS AND NOT (VCPKG_TARGET_IS_XBOX OR VCPKG_TARGET_IS_MINGW) AND NOT "dx12" IN_LIST FEATURES)
+  list(APPEND EXTRA_OPTIONS "-DCMAKE_DISABLE_FIND_PACKAGE_directx-headers=TRUE")
+endif()
+
 if(VCPKG_TARGET_IS_MINGW AND ("dx11" IN_LIST FEATURES))
     message(NOTICE "Building ${PORT} for MinGW requires the HLSL Compiler fxc.exe also be in the PATH. See https://aka.ms/windowssdk.")
 endif()
@@ -27,65 +34,96 @@ if (VCPKG_HOST_IS_LINUX)
     message(WARNING "Build ${PORT} requires GCC version 9 or later")
 endif()
 
-set(EXTRA_OPTIONS -DBUILD_SAMPLE=OFF -DBUILD_TESTING=OFF -DBC_USE_OPENMP=ON)
-
-if(VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_XBOX)
-  list(APPEND EXTRA_OPTIONS -DBUILD_TOOLS=OFF)
-else()
-  list(APPEND EXTRA_OPTIONS -DBUILD_TOOLS=ON)
-endif()
-
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS ${FEATURE_OPTIONS} ${EXTRA_OPTIONS}
 )
 
 vcpkg_cmake_install()
+vcpkg_fixup_pkgconfig()
 vcpkg_cmake_config_fixup(CONFIG_PATH share/directxtex)
 
-if(VCPKG_HOST_IS_WINDOWS AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ("openexr" IN_LIST FEATURES)))
-  vcpkg_download_distfile(
-    TEXASSEMBLE_EXE
-    URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texassemble.exe"
-    FILENAME "texassemble-${DIRECTXTEX_TAG}.exe"
-    SHA512 a339b725107d8b45e73e2cf24a989844a98a28cda2a01ff760cc46dea49f09b27b5d8d4c1c6940b323b0d0cc83492d21895a958e11ba82a0bbfdd877bfad7ded
-  )
-
-  vcpkg_download_distfile(
-    TEXCONV_EXE
-    URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texconv.exe"
-    FILENAME "texconv-${DIRECTXTEX_TAG}.exe"
-    SHA512 6dc472cec94c771bb289a927ee0cce0507332394353306806a7d244999591f9f7c46dd86a55cf24c727fb0592f777b2a4df4f4edaecc72c40ee72a00830372f2
-  )
-
-  vcpkg_download_distfile(
-    TEXDIAG_EXE
-    URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texdiag.exe"
-    FILENAME "texdiag-${DIRECTXTEX_TAG}.exe"
-    SHA512 512346a880459179fb585dfb2ca97ef6a668e803be201de180e6ca3e431c61b73204f80cabe9b3aced97a33abdfd831cce56eb9228726db5ae9fe993c59845a6
-  )
+if("tools" IN_LIST FEATURES)
 
   file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtex/")
 
-  file(INSTALL
-    ${TEXASSEMBLE_EXE}
-    ${TEXCONV_EXE}
-    ${TEXDIAG_EXE}
-    DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtex/")
+  if((VCPKG_TARGET_ARCHITECTURE STREQUAL x64) AND (NOT ("openexr" IN_LIST FEATURES)))
 
-  file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble-${DIRECTXTEX_TAG}.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble.exe")
-  file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv-${DIRECTXTEX_TAG}.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv.exe")
-  file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texdiag-${DIRECTXTEX_TAG}.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texadiag.exe")
+    vcpkg_download_distfile(
+      TEXASSEMBLE_EXE
+      URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texassemble.exe"
+      FILENAME "texassemble-${DIRECTXTEX_TAG}.exe"
+      SHA512 ce1e136eb68a3c5f8da6c99e95a066a567c9127346bdafa7218886a766d747ea1407c62d1c8630c76b315e1b17ffd6cd5e3b3a04badb390d468abb56d595360d
+    )
 
-elseif(VCPKG_TARGET_IS_WINDOWS AND (NOT VCPKG_TARGET_IS_UWP) AND (NOT VCPKG_TARGET_IS_XBOX) AND ("dx11" IN_LIST FEATURES))
+    vcpkg_download_distfile(
+      TEXCONV_EXE
+      URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texconv.exe"
+      FILENAME "texconv-${DIRECTXTEX_TAG}.exe"
+      SHA512 0da10ad66c6ac71127c1f8b14b9c3410dc3c87b27c0788a0cebf54618211978740a27d9664d9314998f8c4d7ecfc8aa621860fd8eef05844bd7257c9fabbdc5e
+    )
 
-  vcpkg_copy_tools(
-        TOOL_NAMES texassemble texconv texdiag
-        SEARCH_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/CMake"
+    vcpkg_download_distfile(
+      TEXDIAG_EXE
+      URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texdiag.exe"
+      FILENAME "texdiag-${DIRECTXTEX_TAG}.exe"
+      SHA512 0b66e919847c299aa7e6078dea1616e1a69ea94660bd37c1476c4d37b2247589f33fa830cb7dddb3ef2daf7eea13e4c12d1975c442eef5e72e7b1436359d7dfe
     )
 
+    file(INSTALL
+      "${TEXASSEMBLE_EXE}"
+      "${TEXCONV_EXE}"
+      "${TEXDIAG_EXE}"
+      DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtex/")
+
+    file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble-${DIRECTXTEX_TAG}.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble.exe")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv-${DIRECTXTEX_TAG}.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv.exe")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texdiag-${DIRECTXTEX_TAG}.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texadiag.exe")
+
+  elseif((VCPKG_TARGET_ARCHITECTURE STREQUAL arm64) AND (NOT ("openexr" IN_LIST FEATURES)))
+
+    vcpkg_download_distfile(
+      TEXASSEMBLE_EXE
+      URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texassemble_arm64.exe"
+      FILENAME "texassemble-${DIRECTXTEX_TAG}-arm64.exe"
+      SHA512 b85b6632027e329c90504e1e5923587301fc8fca2e5600d9b01eceaeb62579004dda410a625c6c9d9d39a6877ffb3df892ca60a8fe54d17825f51fe6baa032cb
+    )
+
+    vcpkg_download_distfile(
+      TEXCONV_EXE
+      URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texconv_arm64.exe"
+      FILENAME "texconv-${DIRECTXTEX_TAG}-arm64.exe"
+      SHA512 82d22d6aca167d2e8a6ef8a92c6b43e38584d773c9ccac3c8746ec4b59cbc795aa41ffeac4b865bda5a8c5350547f25e3aef32529ec5ff06f78dabf398a16b21
+    )
+
+    vcpkg_download_distfile(
+      TEXDIAG_EXE
+      URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texdiag_arm64.exe"
+      FILENAME "texdiag-${DIRECTXTEX_TAG}-arm64.exe"
+      SHA512 5b015b85ff60bd393c7844223575c0dd16b527c9bd65e1c57d2b07892293dae049df175d1f4ef28d32cf536e51aed9925fd79e520f72c892a6979e198fd9fa1f
+    )
+
+    file(INSTALL
+      "${TEXASSEMBLE_EXE}"
+      "${TEXCONV_EXE}"
+      "${TEXDIAG_EXE}"
+      DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtex/")
+
+    file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble-${DIRECTXTEX_TAG}-arm64.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble.exe")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv-${DIRECTXTEX_TAG}-arm64.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv.exe")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texdiag-${DIRECTXTEX_TAG}-arm64.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texadiag.exe")
+
+  elseif("dx11" IN_LIST FEATURES)
+
+    vcpkg_copy_tools(
+          TOOL_NAMES texassemble texconv texdiag
+          SEARCH_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/CMake"
+      )
+
+  endif()
 endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/directxtex/usage b/external_imported/vcpkg/ports/directxtex/usage
new file mode 100644
index 000000000..525d1f0c3
--- /dev/null
+++ b/external_imported/vcpkg/ports/directxtex/usage
@@ -0,0 +1,4 @@
+The DirectXTex package provides CMake targets:
+
+    find_package(directxtex CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE Microsoft::DirectXTex)
diff --git a/external_imported/vcpkg/ports/directxtex/vcpkg.json b/external_imported/vcpkg/ports/directxtex/vcpkg.json
index fb429f4ea..8970becba 100644
--- a/external_imported/vcpkg/ports/directxtex/vcpkg.json
+++ b/external_imported/vcpkg/ports/directxtex/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "directxtex",
-  "version-date": "2023-01-31",
-  "port-version": 2,
+  "version-date": "2023-12-31",
   "description": "DirectXTex texture processing library",
   "homepage": "https://github.com/Microsoft/DirectXTex",
   "documentation": "https://github.com/microsoft/DirectXTex/wiki",
@@ -10,7 +9,7 @@
   "dependencies": [
     {
       "name": "directx-headers",
-      "platform": "(windows & !xbox) | linux"
+      "platform": "mingw | linux"
     },
     "directxmath",
     {
@@ -34,7 +33,13 @@
       "description": "Build with DirectX11 support"
     },
     "dx12": {
-      "description": "Build with DirectX12 support for Windows 10/Windows 11"
+      "description": "Build with DirectX12 support for Windows 10/Windows 11",
+      "dependencies": [
+        {
+          "name": "directx-headers",
+          "platform": "windows & !xbox"
+        }
+      ]
     },
     "openexr": {
       "description": "Enable OpenEXR support",
@@ -44,6 +49,10 @@
     },
     "spectre": {
       "description": "Build Spectre-mitigated library"
+    },
+    "tools": {
+      "description": "texture command-line tools",
+      "supports": "windows & !uwp & !xbox"
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/directxtk/portfile.cmake b/external_imported/vcpkg/ports/directxtk/portfile.cmake
index 68c82da4c..23db25e8c 100644
--- a/external_imported/vcpkg/ports/directxtk/portfile.cmake
+++ b/external_imported/vcpkg/ports/directxtk/portfile.cmake
@@ -1,4 +1,4 @@
-set(DIRECTXTK_TAG feb2023)
+set(DIRECTXTK_TAG dec2023)
 
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
@@ -9,8 +9,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/DirectXTK
-    REF feb2023b
-    SHA512 ada04322589e635a7fc21a3b35e9af676bba060a800b56b2735e7e109801b08daa9f9ef8b6b25762e470a88a9cb0fdab3cb46dcc7b13e0344ded4d507254ea37
+    REF ${DIRECTXTK_TAG}
+    SHA512 952f1455fd91c858b0debb10e0dea17f229a26eee0c3316341de4d2b7101c9023eb20d7b9c5a09eb5a21f3f8ca1d97ecae9e29b7ce5f0eb2a0797db6ff9ae8b9
     HEAD_REF main
 )
 
@@ -18,6 +18,7 @@ vcpkg_check_features(
     OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
         spectre ENABLE_SPECTRE_MITIGATION
+        tools BUILD_TOOLS
         xaudio2-9 BUILD_XAUDIO_WIN10
         xaudio2-8 BUILD_XAUDIO_WIN8
         xaudio2redist BUILD_XAUDIO_WIN7
@@ -25,54 +26,67 @@ vcpkg_check_features(
 
 set(EXTRA_OPTIONS -DBUILD_TESTING=OFF)
 
-if(VCPKG_TARGET_IS_UWP)
-  list(APPEND EXTRA_OPTIONS -DBUILD_TOOLS=OFF)
-else()
-  list(APPEND EXTRA_OPTIONS -DBUILD_TOOLS=ON)
-endif()
-
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS ${FEATURE_OPTIONS} ${EXTRA_OPTIONS}
 )
 
 vcpkg_cmake_install()
+vcpkg_fixup_pkgconfig()
 vcpkg_cmake_config_fixup(CONFIG_PATH share/directxtk)
 
-if(VCPKG_HOST_IS_WINDOWS AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64))
+if("tools" IN_LIST FEATURES)
+
   vcpkg_download_distfile(
     MAKESPRITEFONT_EXE
     URLS "https://github.com/Microsoft/DirectXTK/releases/download/${DIRECTXTK_TAG}/MakeSpriteFont.exe"
     FILENAME "makespritefont-${DIRECTXTK_TAG}.exe"
-    SHA512 2cf274cd1c9a4692b84bd3ac9c3266eb3a20b1598b29f8f77893cb5911c3e70c4b0151df54a3fdef93215db22c76854a61b6d3688ac9cd1875611fe34d196da3
-  )
-
-  vcpkg_download_distfile(
-    XWBTOOL_EXE
-    URLS "https://github.com/Microsoft/DirectXTK/releases/download/${DIRECTXTK_TAG}/XWBTool.exe"
-    FILENAME "xwbtool-${DIRECTXTK_TAG}.exe"
-    SHA512 ab328e336228ec5e1abe0aa44707203325d743432728a1d8d01990529350fe6dc0f1bc5d58ce961456f6273922169abc1a4a9ca3804dd7f40198a182462c332d
+    SHA512 f5872c479e537ae02d32039dce9ed4820c834de37795365b02cb5ae0d9241fb2ece58c1555335c57394a7cfbca95202a91ddda4e77d6bdd484c6cf6e7b9d6e0e
   )
 
   file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk/")
 
-  file(INSTALL
-    ${MAKESPRITEFONT_EXE}
-    ${XWBTOOL_EXE}
-    DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk/")
+  file(INSTALL "${MAKESPRITEFONT_EXE}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk/")
 
   file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont-${DIRECTXTK_TAG}.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont.exe")
-  file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool-${DIRECTXTK_TAG}.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool.exe")
 
-elseif(NOT VCPKG_TARGET_IS_UWP)
+  if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64)
 
-  vcpkg_copy_tools(
-        TOOL_NAMES XWBTool
-        SEARCH_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/CMake"
+    vcpkg_download_distfile(
+      XWBTOOL_EXE
+      URLS "https://github.com/Microsoft/DirectXTK/releases/download/${DIRECTXTK_TAG}/XWBTool.exe"
+      FILENAME "xwbtool-${DIRECTXTK_TAG}.exe"
+      SHA512 e30f786e72e0a9ec84b359e768d3ea024c7e5611ea274b01189ee30faa2ce976579b42307edd4979fa39bdae7f0bc6041463723db3e97399e98575985b15d5da
     )
 
+    file(INSTALL "${XWBTOOL_EXE}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk/")
+
+    file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool-${DIRECTXTK_TAG}.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool.exe")
+
+  elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64)
+
+    vcpkg_download_distfile(
+      XWBTOOL_EXE
+      URLS "https://github.com/Microsoft/DirectXTK/releases/download/${DIRECTXTK_TAG}/XWBTool_arm64.exe"
+      FILENAME "xwbtool-${DIRECTXTK_TAG}-arm64.exe"
+      SHA512 8b01d120954e29e532ded2a38bd3ba883310e48655eab6af884ddcb9c4516640b59ed0d970d01eec189c7b4d04593b51a79739895761f2514c1e8f0df8504d99
+    )
+
+    file(INSTALL "${XWBTOOL_EXE}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk/")
+
+    file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool-${DIRECTXTK_TAG}-arm64.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool.exe")
+
+  else()
+
+    vcpkg_copy_tools(
+          TOOL_NAMES XWBTool
+          SEARCH_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/CMake"
+      )
+
+  endif()
 endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/directxtk/usage b/external_imported/vcpkg/ports/directxtk/usage
new file mode 100644
index 000000000..e1f79f6e7
--- /dev/null
+++ b/external_imported/vcpkg/ports/directxtk/usage
@@ -0,0 +1,4 @@
+The DirectX Tool Kit for DX11 package provides CMake targets:
+
+    find_package(directxtk CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE Microsoft::DirectXTK)
diff --git a/external_imported/vcpkg/ports/directxtk/vcpkg.json b/external_imported/vcpkg/ports/directxtk/vcpkg.json
index 22db680c5..4167a440c 100644
--- a/external_imported/vcpkg/ports/directxtk/vcpkg.json
+++ b/external_imported/vcpkg/ports/directxtk/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "directxtk",
-  "version-date": "2023-02-06",
-  "port-version": 1,
+  "version-date": "2023-12-31",
   "description": "A collection of helper classes for writing DirectX 11.x code in C++.",
   "homepage": "https://github.com/Microsoft/DirectXTK",
   "documentation": "https://github.com/microsoft/DirectXTK/wiki",
@@ -22,6 +21,10 @@
     "spectre": {
       "description": "Build Spectre-mitigated library"
     },
+    "tools": {
+      "description": "MakeSpriteFont and xwbtool command-line tools",
+      "supports": "windows & !uwp & !xbox"
+    },
     "xaudio2-8": {
       "description": "Build with XAudio 2.8 support for Windows 8.x or later"
     },
@@ -31,10 +34,7 @@
     "xaudio2redist": {
       "description": "Build with XAudio2Redist support for Windows 7 SP1 or later",
       "dependencies": [
-        {
-          "name": "xaudio2redist",
-          "platform": "!uwp & !arm"
-        }
+        "xaudio2redist"
       ]
     }
   }
diff --git a/external_imported/vcpkg/ports/directxtk12/portfile.cmake b/external_imported/vcpkg/ports/directxtk12/portfile.cmake
index ad483e676..70cc14e83 100644
--- a/external_imported/vcpkg/ports/directxtk12/portfile.cmake
+++ b/external_imported/vcpkg/ports/directxtk12/portfile.cmake
@@ -1,12 +1,12 @@
-set(DIRECTXTK_TAG feb2023)
+set(DIRECTXTK_TAG dec2023)
 
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/DirectXTK12
-    REF feb2023b
-    SHA512 e17b726e8f73bd499ab0c7e9c1d8fb7f1af3bad3220a8b3accbf5993b735bcd7caa349b767d09af74a800e0cf1852749280fc0e7a0cf8fe186dbf13dd07ba11d
+    REF ${DIRECTXTK_TAG}
+    SHA512 7946ccd4ea9199ac981079462d1ff4621a3b10e70359948a9209a1d192ec936f0ea336bd8b6c2adaa63ace04a94950f933b1013242cadb9f7a22cd191c73699e
     HEAD_REF main
 )
 
@@ -31,34 +31,55 @@ vcpkg_cmake_configure(
 )
 
 vcpkg_cmake_install()
+vcpkg_fixup_pkgconfig()
 vcpkg_cmake_config_fixup(CONFIG_PATH share/directxtk12)
 
-if(VCPKG_HOST_IS_WINDOWS AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64))
+if("tools" IN_LIST FEATURES)
+
   vcpkg_download_distfile(
     MAKESPRITEFONT_EXE
     URLS "https://github.com/Microsoft/DirectXTK12/releases/download/${DIRECTXTK_TAG}/MakeSpriteFont.exe"
     FILENAME "makespritefont-${DIRECTXTK_TAG}.exe"
-    SHA512 2cf274cd1c9a4692b84bd3ac9c3266eb3a20b1598b29f8f77893cb5911c3e70c4b0151df54a3fdef93215db22c76854a61b6d3688ac9cd1875611fe34d196da3
-  )
-
-  vcpkg_download_distfile(
-    XWBTOOL_EXE
-    URLS "https://github.com/Microsoft/DirectXTK12/releases/download/${DIRECTXTK_TAG}/XWBTool.exe"
-    FILENAME "xwbtool-${DIRECTXTK_TAG}.exe"
-    SHA512 ab328e336228ec5e1abe0aa44707203325d743432728a1d8d01990529350fe6dc0f1bc5d58ce961456f6273922169abc1a4a9ca3804dd7f40198a182462c332d
+    SHA512 f5872c479e537ae02d32039dce9ed4820c834de37795365b02cb5ae0d9241fb2ece58c1555335c57394a7cfbca95202a91ddda4e77d6bdd484c6cf6e7b9d6e0e
   )
 
   file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk12/")
 
-  file(INSTALL
-    ${MAKESPRITEFONT_EXE}
-    ${XWBTOOL_EXE}
-    DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk12/")
+  file(INSTALL "${MAKESPRITEFONT_EXE}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk12/")
 
   file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont-${DIRECTXTK_TAG}.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont.exe")
-  file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool-${DIRECTXTK_TAG}.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool.exe")
+
+  if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64)
+
+    vcpkg_download_distfile(
+      XWBTOOL_EXE
+      URLS "https://github.com/Microsoft/DirectXTK12/releases/download/${DIRECTXTK_TAG}/XWBTool.exe"
+      FILENAME "xwbtool-${DIRECTXTK_TAG}.exe"
+      SHA512 e30f786e72e0a9ec84b359e768d3ea024c7e5611ea274b01189ee30faa2ce976579b42307edd4979fa39bdae7f0bc6041463723db3e97399e98575985b15d5da
+    )
+
+    file(INSTALL "${XWBTOOL_EXE}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk12/")
+
+    file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool-${DIRECTXTK_TAG}.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool.exe")
+
+  elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64)
+
+    vcpkg_download_distfile(
+      XWBTOOL_EXE
+      URLS "https://github.com/Microsoft/DirectXTK12/releases/download/${DIRECTXTK_TAG}/XWBTool_arm64.exe"
+      FILENAME "xwbtool-${DIRECTXTK_TAG}-arm64.exe"
+      SHA512 8b01d120954e29e532ded2a38bd3ba883310e48655eab6af884ddcb9c4516640b59ed0d970d01eec189c7b4d04593b51a79739895761f2514c1e8f0df8504d99
+    )
+
+    file(INSTALL "${XWBTOOL_EXE}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk12/")
+
+    file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool-${DIRECTXTK_TAG}-arm64.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool.exe")
+
+  endif()
+
 endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/directxtk12/usage b/external_imported/vcpkg/ports/directxtk12/usage
new file mode 100644
index 000000000..5a2893111
--- /dev/null
+++ b/external_imported/vcpkg/ports/directxtk12/usage
@@ -0,0 +1,4 @@
+The DirectX Tool Kit for DX12 package provides CMake targets
+
+    find_package(directxtk12 CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE Microsoft::DirectXTK12)
diff --git a/external_imported/vcpkg/ports/directxtk12/vcpkg.json b/external_imported/vcpkg/ports/directxtk12/vcpkg.json
index 4ef22b867..844b9aff7 100644
--- a/external_imported/vcpkg/ports/directxtk12/vcpkg.json
+++ b/external_imported/vcpkg/ports/directxtk12/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "directxtk12",
-  "version-date": "2023-02-06",
-  "port-version": 1,
+  "version-date": "2023-12-31",
   "description": "A collection of helper classes for writing DirectX 12 code in C++.",
   "homepage": "https://github.com/Microsoft/DirectXTK12",
   "documentation": "https://github.com/microsoft/DirectXTK12/wiki",
@@ -38,16 +37,17 @@
     "spectre": {
       "description": "Build Spectre-mitigated library"
     },
+    "tools": {
+      "description": "MakeSpriteFont and xwbtool command-line tools",
+      "supports": "windows & !uwp & !xbox & (x64 | arm64)"
+    },
     "xaudio2-9": {
       "description": "Build with XAudio 2.9 support for Windows 10/11"
     },
     "xaudio2redist": {
       "description": "Build with XAudio2Redist",
       "dependencies": [
-        {
-          "name": "xaudio2redist",
-          "platform": "!uwp & !arm"
-        }
+        "xaudio2redist"
       ]
     }
   }
diff --git a/external_imported/vcpkg/ports/dirent/portfile.cmake b/external_imported/vcpkg/ports/dirent/portfile.cmake
index 945f6017a..ad02af326 100644
--- a/external_imported/vcpkg/ports/dirent/portfile.cmake
+++ b/external_imported/vcpkg/ports/dirent/portfile.cmake
@@ -6,12 +6,12 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO tronkko/dirent
-    REF 1.23.2
-    SHA512 e7a991445ee9ca8f1118753df559d28beb283b3c0d25edcfb23dd5322f2bdfeadffe802d0c908bb6d4dfc17bf5ec38bdecfa717319fb4e26682bee0ba0d14c5c
+    REF "${VERSION}"
+    SHA512 bdfc5cd41034719a7bcb3b04ad1c821b73e8ab37768b831362bdd36dceb2bab832ecb56ed6e99db145d38b15e295c0971496320b0482cb339dc973a9870bb72d
     HEAD_REF master
 )
 file(INSTALL ${SOURCE_PATH}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/dirent RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
 vcpkg_copy_pdbs()
 
 set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled)
diff --git a/external_imported/vcpkg/ports/dirent/vcpkg.json b/external_imported/vcpkg/ports/dirent/vcpkg.json
index 82a21b2ce..c07b74319 100644
--- a/external_imported/vcpkg/ports/dirent/vcpkg.json
+++ b/external_imported/vcpkg/ports/dirent/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "dirent",
-  "version-string": "1.23.2",
-  "port-version": 1,
+  "version": "1.24",
   "description": "Dirent is a C/C++ programming interface that allows programmers to retrieve information about files and directories under Linux/UNIX. This project provides Linux compatible Dirent interface for Microsoft Windows.",
-  "homepage": "https://github.com/tronkko/dirent"
+  "homepage": "https://github.com/tronkko/dirent",
+  "license": "MIT"
 }
diff --git a/external_imported/vcpkg/ports/discord-game-sdk/include-cstdint.patch b/external_imported/vcpkg/ports/discord-game-sdk/include-cstdint.patch
index 6e61c4c25..05df0232e 100644
--- a/external_imported/vcpkg/ports/discord-game-sdk/include-cstdint.patch
+++ b/external_imported/vcpkg/ports/discord-game-sdk/include-cstdint.patch
@@ -1,6 +1,6 @@
 From 91fab7c4b8f7da3182f07f5392ebe9388f979157 Mon Sep 17 00:00:00 2001
-From: Maki <mxmcube@gmail.com>
-Date: Wed, 3 Jun 2020 01:40:58 +0100
+From: l3nn0x <dragon83.super@gmail.com>
+Date: Wed, 17 Mai 2023 11:40:58 +0100
 Subject: [PATCH] Include cstdint
 
 ---
@@ -11,15 +11,12 @@ diff --git a/cpp/types.h b/cpp/types.h
 index 8c7cc2b..122dc71 100644
 --- a/cpp/types.h
 +++ b/cpp/types.h
-@@ -3,6 +3,8 @@
- #include "ffi.h"
- #include "event.h"
- 
-+#include <cstdint>
+@@ -6,6 +6,8 @@
+ #include <Windows.h>
+ #include <dxgi.h>
+ #endif
 +
- namespace discord {
++#include <cstdint>
  
- enum class Result {
--- 
-2.26.2
+ namespace discord {
 
diff --git a/external_imported/vcpkg/ports/discord-game-sdk/portfile.cmake b/external_imported/vcpkg/ports/discord-game-sdk/portfile.cmake
index c65e660c7..b39e77099 100644
--- a/external_imported/vcpkg/ports/discord-game-sdk/portfile.cmake
+++ b/external_imported/vcpkg/ports/discord-game-sdk/portfile.cmake
@@ -1,9 +1,9 @@
 vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 
 vcpkg_download_distfile(ARCHIVE
-    URLS https://dl-game-sdk.discordapp.net/2.5.6/discord_game_sdk.zip
+    URLS https://dl-game-sdk.discordapp.net/3.2.1/discord_game_sdk.zip
     FILENAME discord_game_sdk.zip
-    SHA512 4c8f72c7bdf92bc969fb86b96ea0d835e01b9bab1a2cc27ae00bdac1b9733a1303ceadfe138c24a7609b76d61d49999a335dd596cf3f335d894702e2aa23406f
+    SHA512 4851cb70f428eb391959018aa7206e11232348189f7e47f9b8e15535f02a8b114ef825198b0d772979b77ca47061ee7fa764ca90a1dc39370eb9802e8bf04541
 )
 
 vcpkg_extract_source_archive(
@@ -20,6 +20,8 @@ if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
     set(ARCH_FOLDER "x86")
 elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
     set(ARCH_FOLDER "x86_64")
+elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
+    set(ARCH_FOLDER "aarch64")
 endif()
 
 if(VCPKG_TARGET_IS_WINDOWS)
diff --git a/external_imported/vcpkg/ports/discord-game-sdk/vcpkg.json b/external_imported/vcpkg/ports/discord-game-sdk/vcpkg.json
index 249c1bab8..2fba2a0d2 100644
--- a/external_imported/vcpkg/ports/discord-game-sdk/vcpkg.json
+++ b/external_imported/vcpkg/ports/discord-game-sdk/vcpkg.json
@@ -1,10 +1,9 @@
 {
   "name": "discord-game-sdk",
-  "version": "2.5.6",
-  "port-version": 5,
+  "version": "3.2.1",
   "description": "The Discord GameSDK is an easy drop-in SDK to help you manage all the hard things that come with making a game.",
   "homepage": "https://discord.com/developers/docs/game-sdk/sdk-starter-guide",
-  "supports": "((x64 & (windows | osx | linux)) | (x86 & windows)) & !uwp & !static",
+  "supports": "((x64 & (windows | osx | linux)) | (x86 & windows) | (arm64 & osx)) & !uwp & !static",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/discord-rpc/vcpkg.json b/external_imported/vcpkg/ports/discord-rpc/vcpkg.json
index 129d0d9fb..44924ea70 100644
--- a/external_imported/vcpkg/ports/discord-rpc/vcpkg.json
+++ b/external_imported/vcpkg/ports/discord-rpc/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "discord-rpc",
-  "version-string": "3.4.0",
-  "port-version": 2,
+  "version": "3.4.0",
+  "port-version": 3,
   "description": "Rich Presence allows you to leverage the totally overhauled \"Now Playing\" section in a Discord user's profile to help people play your game together.",
   "homepage": "https://github.com/discordapp/discord-rpc",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/discordcoreapi/0001-Add-extern-C-to-avcodec.patch b/external_imported/vcpkg/ports/discordcoreapi/0001-Add-extern-C-to-avcodec.patch
deleted file mode 100644
index 53814980b..000000000
--- a/external_imported/vcpkg/ports/discordcoreapi/0001-Add-extern-C-to-avcodec.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/Source/AudioDecoder.cpp b/Source/AudioDecoder.cpp
-index 42bd4543..ff210878 100644
---- a/Source/AudioDecoder.cpp
-+++ b/Source/AudioDecoder.cpp
-@@ -25,7 +25,9 @@
- 
- #include <discordcoreapi/Utilities.hpp>
- #include <discordcoreapi/AudioDecoder.hpp>
-+extern "C" {
- #include <libavcodec/avcodec.h>
-+}
- 
- namespace DiscordCoreInternal {
- 
-diff --git a/Include/discordcoreapi/AudioDecoder.hpp b/Include/discordcoreapi/AudioDecoder.hpp
---- a/Include/discordcoreapi/AudioDecoder.hpp	(revision 1ecbbc1b3a7f6bd3ff5e6ca0be8606ec50f17ec1)
-+++ b/Include/discordcoreapi/AudioDecoder.hpp	(revision 3c80cf0c54719008610fc96bb457345bf0170701)
-@@ -29,6 +29,7 @@
- #include <opus/opus.h>
-
- extern "C" {
-+#include <libavcodec/avcodec.h>
- #include <libavformat/avformat.h>
- #include <libswresample/swresample.h>
- }
- 
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/discordcoreapi/portfile.cmake b/external_imported/vcpkg/ports/discordcoreapi/portfile.cmake
index 68ccf788e..103672aee 100644
--- a/external_imported/vcpkg/ports/discordcoreapi/portfile.cmake
+++ b/external_imported/vcpkg/ports/discordcoreapi/portfile.cmake
@@ -3,13 +3,11 @@ if(VCPKG_TARGET_IS_LINUX)
 endif()
 
 vcpkg_from_github(
-	OUT_SOURCE_PATH SOURCE_PATH
-	REPO RealTimeChris/DiscordCoreAPI
-	REF c8d4698d2c0ee818def85d63562585a218b2da70
-	SHA512 82a2bada44d1e2c2cc4638b885011a95189febd77bc4d3c26ce8c25005b8202d6c7cbb1f580dbcc1556dd0919f33cfb25127774f37cea17a544fbe31970618b5
-	HEAD_REF main
-    PATCHES
-        0001-Add-extern-C-to-avcodec.patch
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO RealTimeChris/DiscordCoreAPI
+    REF "v${VERSION}"
+    SHA512 02fbb9e62048d2a98eab9f937d689f25a34eceba01e978cd592d11ed558492ebd4d4fdb74581182cb67e1247d0275e12f794cea296fabe00a3cbde9e66ff12dd
+    HEAD_REF main
 )
 
 vcpkg_cmake_configure(
@@ -26,8 +24,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
 
-file(
-	INSTALL "${SOURCE_PATH}/License.md"
-	DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
-	RENAME copyright
-)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/License.md")
diff --git a/external_imported/vcpkg/ports/discordcoreapi/vcpkg.json b/external_imported/vcpkg/ports/discordcoreapi/vcpkg.json
index e62f11928..e09009c2d 100644
--- a/external_imported/vcpkg/ports/discordcoreapi/vcpkg.json
+++ b/external_imported/vcpkg/ports/discordcoreapi/vcpkg.json
@@ -1,16 +1,15 @@
 {
   "name": "discordcoreapi",
-  "version-date": "2023-01-02",
+  "version": "2.0.5",
   "description": "A Discord bot library written in C++ using custom asynchronous coroutines.",
   "homepage": "https://discordcoreapi.com",
-  "license": "LGPL-2.1-or-later",
-  "supports": "(windows & x64 & !static) | (linux & x64)",
+  "license": "MIT",
+  "supports": "(windows & x64 & !xbox) | (linux & x64) | (osx & x64)",
   "dependencies": [
-    "ffmpeg",
+    "jsonifier",
     "libsodium",
     "openssl",
     "opus",
-    "simdjson",
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/external_imported/vcpkg/ports/discount/disable-deprecated-warnings.patch b/external_imported/vcpkg/ports/discount/disable-deprecated-warnings.patch
index e8f4f0fb7..1684c7400 100644
--- a/external_imported/vcpkg/ports/discount/disable-deprecated-warnings.patch
+++ b/external_imported/vcpkg/ports/discount/disable-deprecated-warnings.patch
@@ -1,11 +1,11 @@
 diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
-index 11fa675..34cc9ed 100644
+index ae859a3..77a936a 100644
 --- a/cmake/CMakeLists.txt
 +++ b/cmake/CMakeLists.txt
-@@ -20,6 +20,11 @@ set(${PROJECT_NAME}_INSTALL_SAMPLES OFF CACHE BOOL
- set(${PROJECT_NAME}_ONLY_LIBRARY OFF CACHE BOOL
-     "Set to ON to only build markdown library (default is OFF)")
-
+@@ -23,6 +23,11 @@ set(${PROJECT_NAME}_ONLY_LIBRARY OFF CACHE BOOL
+ set(${PROJECT_NAME}_CXX_BINDING OFF CACHE BOOL
+     "Set to ON to install header files with c++ wrappers (default is OFF)")
+ 
 +# MSVC deprecated warnings (C4996,strdup, ...)
 +if(MSVC)
 +    add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS)
diff --git a/external_imported/vcpkg/ports/discount/portfile.cmake b/external_imported/vcpkg/ports/discount/portfile.cmake
index a615b28e7..3eb6423a4 100644
--- a/external_imported/vcpkg/ports/discount/portfile.cmake
+++ b/external_imported/vcpkg/ports/discount/portfile.cmake
@@ -4,11 +4,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Orc/discount
-    REF v2.2.6
-    SHA512 4c5956dea78aacd3a105ddac13f1671d811a5b2b04990cdf8485c36190c8872c4b1b9432a7236f669c34b07564ecd0096632dced54d67de9eaf4f23641417ecc
+    REF "v${VERSION}"
+    SHA512 d86bfc6d3e11131622046418a1f54bd9dfa5f1233e510189cd2c89dc857da31e88ffbe6670cc506ca8b9763e8fb74ed215f1018f83e25767c77acb8a7c296b8a
     HEAD_REF master
     PATCHES
-      cmake.patch
       generate-blocktags-command.patch
       disable-deprecated-warnings.patch
 )
@@ -33,6 +32,7 @@ vcpkg_cmake_configure(
 
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/discount)
+vcpkg_fixup_pkgconfig()
 vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/external_imported/vcpkg/ports/discount/vcpkg.json b/external_imported/vcpkg/ports/discount/vcpkg.json
index ca994332f..08441ab83 100644
--- a/external_imported/vcpkg/ports/discount/vcpkg.json
+++ b/external_imported/vcpkg/ports/discount/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "discount",
-  "version-string": "2.2.6",
-  "port-version": 2,
+  "version-string": "3.0.0a",
   "description": "DISCOUNT is a implementation of John Gruber & Aaron Swartz's Markdown markup language.",
   "homepage": "https://github.com/Orc/discount",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/discreture/vcpkg.json b/external_imported/vcpkg/ports/discreture/vcpkg.json
index 629b3e654..84e04896a 100644
--- a/external_imported/vcpkg/ports/discreture/vcpkg.json
+++ b/external_imported/vcpkg/ports/discreture/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "discreture",
-  "version-string": "2020-01-29",
-  "port-version": 2,
+  "version-date": "2020-01-29",
+  "port-version": 3,
   "description": "A modern C++ library for efficiently and easily iterating through common combinatorial objects, such as combinations, permutations, partitions and more.",
   "homepage": "https://github.com/mraggi/discreture",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/dlfcn-win32/portfile.cmake b/external_imported/vcpkg/ports/dlfcn-win32/portfile.cmake
index c9bfea7f7..4dd509818 100644
--- a/external_imported/vcpkg/ports/dlfcn-win32/portfile.cmake
+++ b/external_imported/vcpkg/ports/dlfcn-win32/portfile.cmake
@@ -1,10 +1,9 @@
-set(SOURCE_VERSION 1.3.1)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO dlfcn-win32/dlfcn-win32
-    REF v${SOURCE_VERSION}
-    SHA512 0aa01c49ee8628c42cdc8b9782b4741a36502764d4442227ea4e9a8062356ff17e8eaa3cdd4113009ad7ad2044b6cfd24128319d71825e13062259dd1906e27e
+    REF "v${VERSION}"
+    SHA512 2ddcaad7fff09be654589642af14689ebbc15212caea5b5fb0238b34188c87cd9cb53d7aee45c7ae4dd6ddf6e637ee945567d7b858b97ceefff8f1ec46b786ae
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/dlfcn-win32/vcpkg.json b/external_imported/vcpkg/ports/dlfcn-win32/vcpkg.json
index 47a1ee4d4..aa27ecba5 100644
--- a/external_imported/vcpkg/ports/dlfcn-win32/vcpkg.json
+++ b/external_imported/vcpkg/ports/dlfcn-win32/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "dlfcn-win32",
-  "version": "1.3.1",
-  "port-version": 1,
+  "version": "1.4.1",
   "description": "dlfcn-win32 is an implementation of dlfcn for Windows.",
   "homepage": "https://github.com/dlfcn-win32/dlfcn-win32",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/dlib/vcpkg.json b/external_imported/vcpkg/ports/dlib/vcpkg.json
index 752f77a6b..2c1008337 100644
--- a/external_imported/vcpkg/ports/dlib/vcpkg.json
+++ b/external_imported/vcpkg/ports/dlib/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "dlib",
   "version": "19.24",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++",
   "homepage": "https://github.com/davisking/dlib",
   "license": "BSL-1.0",
+  "supports": "!uwp",
   "dependencies": [
     "blas",
     "lapack",
diff --git a/external_imported/vcpkg/ports/docopt/vcpkg.json b/external_imported/vcpkg/ports/docopt/vcpkg.json
index df30626d7..c04ddd518 100644
--- a/external_imported/vcpkg/ports/docopt/vcpkg.json
+++ b/external_imported/vcpkg/ports/docopt/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "docopt",
-  "version-string": "2018-11-01",
-  "port-version": 2,
+  "version-date": "2018-11-01",
+  "port-version": 3,
   "description": "Command line arguments parser that will make you smile (C++11 port).",
   "dependencies": [
     {
diff --git a/external_imported/vcpkg/ports/doctest/portfile.cmake b/external_imported/vcpkg/ports/doctest/portfile.cmake
index d9510a0ff..c5db02dc8 100644
--- a/external_imported/vcpkg/ports/doctest/portfile.cmake
+++ b/external_imported/vcpkg/ports/doctest/portfile.cmake
@@ -1,8 +1,9 @@
+# header-only library
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO doctest/doctest
-    REF v2.4.9
-    SHA512 c7337e2de371c18973a0f4cb76458d6ae387e78874c9bc8aa367ffd2d592514b774e7c5ebf44f83b7046f6b33c6905fd079c36f4c33eadf52b3d651d978182cb
+    REF "v${VERSION}"
+    SHA512 04425686057079d3f1a6f767c487f1953050f553dbff9fc42b42dde1358fe26e46bf6219881bbfce625f15cb9c229474d82688120eb2cb2b1d8138db0cc91b3c
     HEAD_REF master
 )
 
@@ -19,4 +20,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
\ No newline at end of file
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/external_imported/vcpkg/ports/doctest/vcpkg.json b/external_imported/vcpkg/ports/doctest/vcpkg.json
index 1983708f5..334c6a367 100644
--- a/external_imported/vcpkg/ports/doctest/vcpkg.json
+++ b/external_imported/vcpkg/ports/doctest/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "doctest",
-  "version": "2.4.9",
+  "version": "2.4.11",
   "description": "The fastest feature-rich C++11/14/17/20 single-header testing framework",
   "homepage": "https://github.com/doctest/doctest",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/double-conversion/portfile.cmake b/external_imported/vcpkg/ports/double-conversion/portfile.cmake
index 94ff5e24c..9f1fa7aa4 100644
--- a/external_imported/vcpkg/ports/double-conversion/portfile.cmake
+++ b/external_imported/vcpkg/ports/double-conversion/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/double-conversion
-    REF af09fd65fcf24eee95dc62813ba9123414635428 #v3.2.1
-    SHA512 721d736a2d065b8ff6058345afe6990ab568174e202361abc7ce36c16931c05128df4fd5034f98f114a7b01972eda3b98bfc209ef45394d0b5d4bbce8140b28a
+    REF "v${VERSION}"
+    SHA512 51e84eb7a5c407f7bc8f8b8ca19932ece5c9d8ac18aedff7b7620fc67369d9b2aa8c5a6b133e7f8633d7cc5e3788bad6e60b0e48ac08d0a4bc5e4abe7cee1334
     HEAD_REF master
 )
 
@@ -12,7 +12,7 @@ vcpkg_cmake_configure(
 
 vcpkg_cmake_install()
 
-# Rename exported target files into something vcpkg_fixup_cmake_targets expects
+# Rename exported target files into something vcpkg_cmake_config_fixup expects
 if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/${PORT}")
     vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
 endif()
diff --git a/external_imported/vcpkg/ports/double-conversion/vcpkg.json b/external_imported/vcpkg/ports/double-conversion/vcpkg.json
index 08df1f412..f7c1da861 100644
--- a/external_imported/vcpkg/ports/double-conversion/vcpkg.json
+++ b/external_imported/vcpkg/ports/double-conversion/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "double-conversion",
-  "version": "3.2.1",
+  "version": "3.3.0",
   "description": "Efficient binary-decimal and decimal-binary conversion routines for IEEE doubles.",
   "homepage": "https://github.com/google/double-conversion",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/dp-thread-pool/portfile.cmake b/external_imported/vcpkg/ports/dp-thread-pool/portfile.cmake
new file mode 100644
index 000000000..6cfbd8e19
--- /dev/null
+++ b/external_imported/vcpkg/ports/dp-thread-pool/portfile.cmake
@@ -0,0 +1,28 @@
+set(VCPKG_BUILD_TYPE release)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO DeveloperPaul123/thread-pool
+    REF ${VERSION}
+    SHA512 fccd39616f7961fbd4ff6c2f845b4d1494e50a85e44d1799c30308bdee0b2e13f55011c5a535a555857a91157a7dddf4ec38e1020f693ae33bf0977d8fb97451
+    HEAD_REF master
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DTP_BUILD_TESTS=OFF
+        -DTP_BUILD_EXAMPLES=OFF
+        -DTP_BUILD_BENCHMARKS=OFF
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(
+    PACKAGE_NAME thread-pool
+    CONFIG_PATH lib/cmake/thread-pool-${VERSION}
+)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/dp-thread-pool/vcpkg.json b/external_imported/vcpkg/ports/dp-thread-pool/vcpkg.json
new file mode 100644
index 000000000..1c35477d0
--- /dev/null
+++ b/external_imported/vcpkg/ports/dp-thread-pool/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "dp-thread-pool",
+  "version": "0.6.2",
+  "maintainers": "Paul Tsouchlos <developer.paul.123@gmail.com>",
+  "description": "dp::thread_pool - fast, lightweight C++20 thread pool.",
+  "homepage": "https://github.com/DeveloperPaul123/thread-pool",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/dpp/portfile.cmake b/external_imported/vcpkg/ports/dpp/portfile.cmake
index baa1c840c..daddf98ad 100644
--- a/external_imported/vcpkg/ports/dpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/dpp/portfile.cmake
@@ -2,10 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO brainboxdotcc/DPP
     REF "v${VERSION}"
-    SHA512 18bbb7d2c1385d179cac9ded31d1b11e8d24f172e7ffe2ba79071203e1e2f277657e21d660b18ee4b849bc093d350f4bc5401702400084b56c3ebd6f03ce28df
-    HEAD_REF master
-    PATCHES
-        remove-wrong-header.patch
+    SHA512 fcb9b8181827fc63fb2f9aff44e697d18a0bfd94714888492a63a04e0112f42f9506bfab8181e822aa5ce85e6b6a8aa44e0774baeac3e52c3f41348cbf55a76a
 )
 
 vcpkg_cmake_configure(
@@ -27,4 +24,3 @@ endif()
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-
diff --git a/external_imported/vcpkg/ports/dpp/remove-wrong-header.patch b/external_imported/vcpkg/ports/dpp/remove-wrong-header.patch
deleted file mode 100644
index a1ae8fb50..000000000
--- a/external_imported/vcpkg/ports/dpp/remove-wrong-header.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/dpp/user.cpp b/src/dpp/user.cpp
-index 0f5bce1..cdd7903 100644
---- a/src/dpp/user.cpp
-+++ b/src/dpp/user.cpp
-@@ -22,7 +22,7 @@
- #include <dpp/discordevents.h>
- #include <dpp/json.h>
- #include <dpp/stringops.h>
--#include "user.h"
-+// #include "user.h"
- 
- using json = nlohmann::json;
- 
diff --git a/external_imported/vcpkg/ports/dpp/vcpkg.json b/external_imported/vcpkg/ports/dpp/vcpkg.json
index 74348aaaf..1f7df2cf6 100644
--- a/external_imported/vcpkg/ports/dpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/dpp/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "dpp",
-  "version": "10.0.23",
-  "port-version": 1,
+  "version": "10.0.29",
   "description": "D++ Extremely Lightweight C++ Discord Library.",
   "homepage": "https://dpp.dev/",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/draco/disable-symlinks.patch b/external_imported/vcpkg/ports/draco/disable-symlinks.patch
index feca85f15..df39449e2 100644
--- a/external_imported/vcpkg/ports/draco/disable-symlinks.patch
+++ b/external_imported/vcpkg/ports/draco/disable-symlinks.patch
@@ -1,10 +1,10 @@
 diff --git a/cmake/draco_targets.cmake b/cmake/draco_targets.cmake
-index f96dbb1..179b9f9 100644
+index c8c79f5..1cec5b8 100644
 --- a/cmake/draco_targets.cmake
 +++ b/cmake/draco_targets.cmake
-@@ -103,9 +103,6 @@ macro(draco_add_executable)
-   add_executable(${exe_NAME} ${exe_SOURCES})
-   target_compile_features(${exe_NAME} PRIVATE cxx_std_11)
+@@ -111,9 +111,6 @@ macro(draco_add_executable)
+ 
+     target_compile_features(${exe_NAME} PUBLIC cxx_std_11)
  
 -  if(NOT EMSCRIPTEN)
 -    set_target_properties(${exe_NAME} PROPERTIES VERSION ${DRACO_VERSION})
@@ -12,16 +12,16 @@ index f96dbb1..179b9f9 100644
  
    if(exe_OUTPUT_NAME)
      set_target_properties(${exe_NAME} PROPERTIES OUTPUT_NAME ${exe_OUTPUT_NAME})
-@@ -340,14 +337,6 @@ macro(draco_add_library)
+@@ -364,14 +361,6 @@ macro(draco_add_library)
      set_target_properties(${lib_NAME} PROPERTIES PREFIX "")
    endif()
  
 -  if(NOT EMSCRIPTEN)
 -    # VERSION and SOVERSION as necessary
 -    if((lib_TYPE STREQUAL BUNDLE OR lib_TYPE STREQUAL SHARED) AND NOT MSVC)
--      set_target_properties(${lib_NAME}
--                            PROPERTIES VERSION ${DRACO_SOVERSION} SOVERSION
--                                       ${DRACO_SOVERSION_MAJOR})
+-      set_target_properties(
+-        ${lib_NAME} PROPERTIES VERSION ${DRACO_SOVERSION}
+-                               SOVERSION ${DRACO_SOVERSION_MAJOR})
 -    endif()
 -  endif()
  
diff --git a/external_imported/vcpkg/ports/draco/fix-compile-error-uwp.patch b/external_imported/vcpkg/ports/draco/fix-compile-error-uwp.patch
index 0b62512bc..ca68cb598 100644
--- a/external_imported/vcpkg/ports/draco/fix-compile-error-uwp.patch
+++ b/external_imported/vcpkg/ports/draco/fix-compile-error-uwp.patch
@@ -1,18 +1,17 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0362420..2b09073 100644
+index a93267d..3a3ccf7 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -86,6 +86,10 @@ draco_set_cxx_flags()
+@@ -85,6 +85,9 @@ draco_set_cxx_flags()
  draco_set_exe_linker_flags()
  draco_generate_features_h()
  
 +if (MSVC)
 +  add_compile_options(/wd4996)
 +endif()
-+
  # Draco source file listing variables.
- list(APPEND draco_attributes_sources
-             "${draco_src_root}/attributes/attribute_octahedron_transform.cc"
+ list(
+   APPEND draco_attributes_sources
 diff --git a/src/draco/io/parser_utils.cc b/src/draco/io/parser_utils.cc
 index 378de73..be7e032 100644
 --- a/src/draco/io/parser_utils.cc
diff --git a/external_imported/vcpkg/ports/draco/fix-pkgconfig.patch b/external_imported/vcpkg/ports/draco/fix-pkgconfig.patch
new file mode 100644
index 000000000..b4e3f2100
--- /dev/null
+++ b/external_imported/vcpkg/ports/draco/fix-pkgconfig.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/draco.pc.template b/cmake/draco.pc.template
+index 050219c..2886bfc 100644
+--- a/cmake/draco.pc.template
++++ b/cmake/draco.pc.template
+@@ -1,6 +1,6 @@
+ Name: @PROJECT_NAME@
+ Description: Draco geometry de(com)pression library.
+ Version: @DRACO_VERSION@
+-Cflags: -I@includes_path@
+-Libs: -L@libs_path@ -ldraco
++Cflags: -I@CMAKE_INSTALL_FULL_INCLUDEDIR@
++Libs: -L@CMAKE_INSTALL_FULL_LIBDIR@ -ldraco
+ Libs.private: @CMAKE_THREAD_LIBS_INIT@
diff --git a/external_imported/vcpkg/ports/draco/install-linkage.diff b/external_imported/vcpkg/ports/draco/install-linkage.diff
new file mode 100644
index 000000000..c34a60f11
--- /dev/null
+++ b/external_imported/vcpkg/ports/draco/install-linkage.diff
@@ -0,0 +1,19 @@
+diff --git a/cmake/draco_install.cmake b/cmake/draco_install.cmake
+index 3be1ba1..b91938c 100644
+--- a/cmake/draco_install.cmake
++++ b/cmake/draco_install.cmake
+@@ -65,10 +65,14 @@ macro(draco_setup_install_target)
+       ARCHIVE DESTINATION "${libs_path}"
+       LIBRARY DESTINATION "${libs_path}")
+   else()
++    if(BUILD_SHARED_LIBS)
++      set_target_properties(draco_static PROPERTIES EXCLUDE_FROM_ALL 1)
++    else()
+     install(
+       TARGETS draco_static
+       EXPORT dracoExport
+       DESTINATION "${libs_path}")
++    endif()
+ 
+     if(BUILD_SHARED_LIBS)
+       install(
diff --git a/external_imported/vcpkg/ports/draco/portfile.cmake b/external_imported/vcpkg/ports/draco/portfile.cmake
index d34619dde..82c5eb59e 100644
--- a/external_imported/vcpkg/ports/draco/portfile.cmake
+++ b/external_imported/vcpkg/ports/draco/portfile.cmake
@@ -1,33 +1,36 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/draco
-    REF 1.5.3
-    SHA512 8575ea78e0d8025facddbd42453b0251387f4e31eb0854135e050fc26aaf0d28ed30ccc3f93578fdc6cdb50369c2ef735291f1f5fb60238b289e0ee019446e1d
+    REF "${VERSION}"
+    SHA512 8b444744cdf12fb9d276916eb2ff0735cd1a6497b65b88813ec457fe2169db987db62e3db253a7d0f3ae7d45ae6502e8a9f8c0b81abde73e07b3bec69f9dc170
     HEAD_REF master
     PATCHES
         fix-compile-error-uwp.patch
         fix-uwperror.patch
+        fix-pkgconfig.patch
         disable-symlinks.patch
+        install-linkage.diff
 )
 
+if(VCPKG_TARGET_IS_EMSCRIPTEN)
+    set(ENV{EMSCRIPTEN} "${EMSCRIPTEN_ROOT}")
+endif()
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DPYTHON_EXECUTABLE=: # unused with DRACO_JS_GLUE off
+        -DDRACO_JS_GLUE=OFF
 )
 
 vcpkg_cmake_install()
-
-vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/${PORT})
+vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/draco)
 vcpkg_fixup_pkgconfig()
 
 # Install tools and plugins
-vcpkg_copy_tools(
-    TOOL_NAMES
-        draco_encoder
-        draco_decoder
-    AUTO_CLEAN
-)
+if(NOT VCPKG_TARGET_IS_EMSCRIPTEN)
+    vcpkg_copy_tools(TOOL_NAMES draco_encoder draco_decoder AUTO_CLEAN)
+endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
 
diff --git a/external_imported/vcpkg/ports/draco/vcpkg.json b/external_imported/vcpkg/ports/draco/vcpkg.json
index 3fedb46f2..d248165a9 100644
--- a/external_imported/vcpkg/ports/draco/vcpkg.json
+++ b/external_imported/vcpkg/ports/draco/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "draco",
-  "version": "1.5.3",
+  "version": "1.5.7",
   "description": " A library for compressing and decompressing 3D geometric meshes and point clouds. It is intended to improve the storage and transmission of 3D graphics.",
   "homepage": "https://github.com/google/draco",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/drlibs/portfile.cmake b/external_imported/vcpkg/ports/drlibs/portfile.cmake
index e3ee273a9..5fd271a22 100644
--- a/external_imported/vcpkg/ports/drlibs/portfile.cmake
+++ b/external_imported/vcpkg/ports/drlibs/portfile.cmake
@@ -2,8 +2,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mackron/dr_libs
-    REF dd762b861ecadf5ddd5fb03e9ca1db6707b54fbb
-    SHA512 4ec10ea1d9622879b5bdb61a11768e36b56a558d32aac6f8c8a52168ab401f9d53db0eeba074fe56de39f3809fb0bd73e2e6c5ef4ea8fd158abeb45e18285f08
+    REF d35a3bc5efd02455d98cbe12b94647136f09b42d
+    SHA512 34126c8eb65f0735b77f058db9f1618b3c4e820698804b47f7a629c47df571e9cbbeefd4cce193409ebd715d37ed5faf1c3c27a7240e0f5418089cffe853f1ea
     HEAD_REF master
 )
 
@@ -11,5 +11,4 @@ vcpkg_from_github(
 file(GLOB HEADER_FILES "${SOURCE_PATH}/*.h")
 file(COPY ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include")
 
-# Put the licence file where vcpkg expects it
-configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/drlibs/vcpkg.json b/external_imported/vcpkg/ports/drlibs/vcpkg.json
index 27214d902..4ee6e5f3c 100644
--- a/external_imported/vcpkg/ports/drlibs/vcpkg.json
+++ b/external_imported/vcpkg/ports/drlibs/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "drlibs",
-  "version-date": "2022-09-26",
+  "version-date": "2023-08-16",
   "description": "Single-file audio decoding libraries for C/C++",
   "homepage": "https://github.com/mackron/dr_libs",
   "license": "Unlicense OR MIT-0"
diff --git a/external_imported/vcpkg/ports/drogon/0001-vcpkg.patch b/external_imported/vcpkg/ports/drogon/0001-vcpkg.patch
new file mode 100644
index 000000000..a4f463112
--- /dev/null
+++ b/external_imported/vcpkg/ports/drogon/0001-vcpkg.patch
@@ -0,0 +1,29 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fbe2288..d7218a6 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -367,11 +367,10 @@ endif (NOT WIN32)
+ 
+ if (BUILD_POSTGRESQL)
+     # find postgres
+-    find_package(pg)
+-    if (pg_FOUND)
+-        message(STATUS "libpq inc path:" ${PG_INCLUDE_DIRS})
+-        message(STATUS "libpq lib:" ${PG_LIBRARIES})
+-        target_link_libraries(${PROJECT_NAME} PRIVATE pg_lib)
++    find_package(PostgreSQL REQUIRED)
++    if(PostgreSQL_FOUND)
++        set(pg_FOUND true)
++        target_link_libraries(${PROJECT_NAME} PRIVATE PostgreSQL::PostgreSQL)
+         set(DROGON_SOURCES
+             ${DROGON_SOURCES}
+             orm_lib/src/postgresql_impl/PostgreSQLResultImpl.cc
+@@ -401,7 +400,7 @@ if (BUILD_POSTGRESQL)
+                 ${private_headers}
+                 orm_lib/src/postgresql_impl/PgConnection.h)
+         endif (libpq_supports_batch)
+-    endif (pg_FOUND)
++    endif (PostgreSQL_FOUND)
+ endif (BUILD_POSTGRESQL)
+ 
+ if (BUILD_MYSQL)
diff --git a/external_imported/vcpkg/ports/drogon/drogon_config.patch b/external_imported/vcpkg/ports/drogon/0002-drogon-config.patch
similarity index 100%
rename from external_imported/vcpkg/ports/drogon/drogon_config.patch
rename to external_imported/vcpkg/ports/drogon/0002-drogon-config.patch
diff --git a/external_imported/vcpkg/ports/drogon/0003-deps-redis.patch b/external_imported/vcpkg/ports/drogon/0003-deps-redis.patch
new file mode 100644
index 000000000..be59e49d1
--- /dev/null
+++ b/external_imported/vcpkg/ports/drogon/0003-deps-redis.patch
@@ -0,0 +1,30 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d7218a6..ccd08cb 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -467,10 +467,10 @@ if (BUILD_SQLITE)
+ endif (BUILD_SQLITE)
+ 
+ if (BUILD_REDIS)
+-    find_package(Hiredis)
++    find_package(Hiredis NAMES hiredis CONFIG REQUIRED)
+     if (Hiredis_FOUND)
+         add_definitions(-DUSE_REDIS)
+-        target_link_libraries(${PROJECT_NAME} PRIVATE Hiredis_lib)
++        target_link_libraries(${PROJECT_NAME} PRIVATE hiredis::hiredis)
+         set(DROGON_SOURCES
+             ${DROGON_SOURCES}
+             nosql_lib/redis/src/RedisClientImpl.cc
+diff --git a/cmake/templates/DrogonConfig.cmake.in b/cmake/templates/DrogonConfig.cmake.in
+index 48eb393..9a9742e 100644
+--- a/cmake/templates/DrogonConfig.cmake.in
++++ b/cmake/templates/DrogonConfig.cmake.in
+@@ -38,7 +38,7 @@ if(@COZ-PROFILER_FOUND@)
+ find_dependency(coz-profiler)
+ endif()
+ if(@Hiredis_FOUND@)
+-find_dependency(Hiredis)
++find_dependency(hiredis CONFIG)
+ endif()
+ if(@yaml-cpp_FOUND@)
+ find_dependency(yaml-cpp)
diff --git a/external_imported/vcpkg/ports/drogon/0004-drogon-ctl.patch b/external_imported/vcpkg/ports/drogon/0004-drogon-ctl.patch
new file mode 100644
index 000000000..5672f25b6
--- /dev/null
+++ b/external_imported/vcpkg/ports/drogon/0004-drogon-ctl.patch
@@ -0,0 +1,30 @@
+diff --git a/cmake/DrogonUtilities.cmake b/cmake/DrogonUtilities.cmake
+index 7cb9799..5462572 100644
+--- a/cmake/DrogonUtilities.cmake
++++ b/cmake/DrogonUtilities.cmake
+@@ -3,6 +3,7 @@
+ # [TRUE to use_path_as_namespace] [prefixed namespace])
+ # ##############################################################################
+ function(drogon_create_views arg)
++  find_program(DROGON_CTL_COMMAND drogon_ctl REQUIRED)
+   if(ARGC LESS 3)
+     message(STATUS "arguments error when calling drogon_create_views")
+     return()
+@@ -39,7 +40,7 @@ function(drogon_create_views arg)
+         set(ns "")
+       endif()
+       add_custom_command(OUTPUT ${ARGV2}/${outputFile}.h ${ARGV2}/${outputFile}.cc
+-                         COMMAND drogon_ctl
++                         COMMAND ${DROGON_CTL_COMMAND}
+                                  ARGS
+                                  create
+                                  view
+@@ -55,7 +56,7 @@ function(drogon_create_views arg)
+     else()
+       get_filename_component(classname ${cspFile} NAME_WE)
+       add_custom_command(OUTPUT ${ARGV2}/${classname}.h ${ARGV2}/${classname}.cc
+-                         COMMAND drogon_ctl
++                         COMMAND ${DROGON_CTL_COMMAND}
+                                  ARGS
+                                  create
+                                  view
diff --git a/external_imported/vcpkg/ports/drogon/0005-drogon-cross-compile.patch b/external_imported/vcpkg/ports/drogon/0005-drogon-cross-compile.patch
new file mode 100644
index 000000000..61f0edc4f
--- /dev/null
+++ b/external_imported/vcpkg/ports/drogon/0005-drogon-cross-compile.patch
@@ -0,0 +1,25 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 88026025..d6f180fb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -13,6 +13,7 @@ option(BUILD_DOC "Build Doxygen documentation" OFF)
+ option(BUILD_BROTLI "Build Brotli" ON)
+ option(BUILD_YAML_CONFIG "Build yaml config" ON)
+ option(USE_SUBMODULE "Use trantor as a submodule" ON)
++set(DROGON_CTL_TOOL "" CACHE STRING "drogon_ctl tool executable when doing cross builds")
+ 
+ include(CMakeDependentOption)
+ CMAKE_DEPENDENT_OPTION(BUILD_POSTGRESQL "Build with postgresql support" ON "BUILD_ORM" OFF)
+diff --git a/drogon_ctl/CMakeLists.txt b/drogon_ctl/CMakeLists.txt
+index 249c453d..16b346ea 100755
+--- a/drogon_ctl/CMakeLists.txt
++++ b/drogon_ctl/CMakeLists.txt
+@@ -43,7 +43,7 @@ foreach(cspFile ${SCP_LIST})
+   get_filename_component(classname ${cspFile} NAME_WE)
+   message(STATUS "view classname:" ${classname})
+   add_custom_command(OUTPUT ${classname}.h ${classname}.cc
+-                     COMMAND $<TARGET_FILE:_drogon_ctl>
++                     COMMAND $<IF:$<BOOL:${DROGON_CTL_TOOL}>,${DROGON_CTL_TOOL},$<TARGET_FILE:_drogon_ctl>>
+                              ARGS
+                              create
+                              view
diff --git a/external_imported/vcpkg/ports/drogon/portfile.cmake b/external_imported/vcpkg/ports/drogon/portfile.cmake
index 89955348c..d00dacdb2 100644
--- a/external_imported/vcpkg/ports/drogon/portfile.cmake
+++ b/external_imported/vcpkg/ports/drogon/portfile.cmake
@@ -1,14 +1,22 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO an-tao/drogon
-    REF v1.8.2
-    SHA512 f50252a59951570c87cc1254b1954ef275ee7b2a5cac229aba98b49f34f9f73314d2db9df0abc92efdfeab565f6c1ee14080e049d370384e3398b8c27f5519b7
+    REF "v${VERSION}"
+    SHA512 54565dac787795cd297206f6222e260abc012790c4b662834864ec31f5b00735b89b7134f317f2b01f0377abd4222ee445631ee1f3cd1f50c918e6d3645582df
     HEAD_REF master
     PATCHES
-        vcpkg.patch
-        drogon_config.patch
+         0001-vcpkg.patch
+         0002-drogon-config.patch
+         0003-deps-redis.patch
+         0004-drogon-ctl.patch
+         0005-drogon-cross-compile.patch
 )
 
+set(DROGON_CTL_TOOL "")
+if(VCPKG_CROSSCOMPILING)
+    set(DROGON_CTL_TOOL "${CURRENT_HOST_INSTALLED_DIR}/tools/drogon/drogon_ctl${VCPKG_HOST_EXECUTABLE_SUFFIX}")
+endif()
+
 vcpkg_check_features(
     OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
@@ -19,6 +27,7 @@ vcpkg_check_features(
         postgres LIBPQ_BATCH_MODE
         redis    BUILD_REDIS
         sqlite3  BUILD_SQLITE
+        yaml     BUILD_YAML_CONFIG
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_DROGON_SHARED)
@@ -30,6 +39,8 @@ vcpkg_cmake_configure(
         -DBUILD_SHARED_LIBS=${BUILD_DROGON_SHARED}
         -DBUILD_EXAMPLES=OFF
         -DCMAKE_DISABLE_FIND_PACKAGE_Boost=ON
+        -DUSE_SUBMODULE=OFF
+        "-DDROGON_CTL_TOOL=${DROGON_CTL_TOOL}"
         ${FEATURE_OPTIONS}
     MAYBE_UNUSED_VARIABLES
         CMAKE_DISABLE_FIND_PACKAGE_Boost
diff --git a/external_imported/vcpkg/ports/drogon/vcpkg.json b/external_imported/vcpkg/ports/drogon/vcpkg.json
index 1958ecfcc..612ce8a54 100644
--- a/external_imported/vcpkg/ports/drogon/vcpkg.json
+++ b/external_imported/vcpkg/ports/drogon/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "drogon",
-  "version": "1.8.2",
-  "port-version": 1,
+  "version-semver": "1.9.2",
   "description": "A C++14/17 based HTTP web application framework running on Linux/macOS/Unix/Windows",
   "homepage": "https://github.com/an-tao/drogon",
   "documentation": "https://drogon.docsforge.com/master/overview/",
@@ -27,7 +26,17 @@
   ],
   "features": {
     "ctl": {
-      "description": "Build drogon_ctl tool."
+      "description": "Build drogon_ctl tool.",
+      "dependencies": [
+        {
+          "name": "drogon",
+          "host": true,
+          "default-features": false,
+          "features": [
+            "ctl"
+          ]
+        }
+      ]
     },
     "mysql": {
       "description": "Support reading and writing from/to MySQL databases.",
@@ -89,6 +98,12 @@
         },
         "sqlite3"
       ]
+    },
+    "yaml": {
+      "description": "Support YAML Drogon configuration files",
+      "dependencies": [
+        "yaml-cpp"
+      ]
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/drogon/vcpkg.patch b/external_imported/vcpkg/ports/drogon/vcpkg.patch
deleted file mode 100644
index 326fcaa99..000000000
--- a/external_imported/vcpkg/ports/drogon/vcpkg.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -120,9 +120,9 @@ if (WIN32)
-         PRIVATE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/third_party/mman-win32>)
- endif (WIN32)
- 
--add_subdirectory(trantor)
-+find_package(Trantor CONFIG REQUIRED)
- 
--target_link_libraries(${PROJECT_NAME} PUBLIC trantor)
-+target_link_libraries(${PROJECT_NAME} PUBLIC Trantor::Trantor)
- 
- if(${CMAKE_SYSTEM_NAME} STREQUAL "Haiku")
-     target_link_libraries(${PROJECT_NAME} PRIVATE network)
-@@ -316,11 +316,10 @@ endif (NOT WIN32)
- 
- if (BUILD_POSTGRESQL)
-     # find postgres
--    find_package(pg)
--    if (pg_FOUND)
--        message(STATUS "libpq inc path:" ${PG_INCLUDE_DIRS})
--        message(STATUS "libpq lib:" ${PG_LIBRARIES})
--        target_link_libraries(${PROJECT_NAME} PRIVATE pg_lib)
-+    find_package(PostgreSQL REQUIRED)
-+    if(PostgreSQL_FOUND)
-+      set(pg_FOUND true)
-+      target_link_libraries(${PROJECT_NAME} PRIVATE PostgreSQL::PostgreSQL)
-         set(DROGON_SOURCES
-             ${DROGON_SOURCES}
-             orm_lib/src/postgresql_impl/PostgreSQLResultImpl.cc)
-@@ -348,7 +348,7 @@ if (BUILD_POSTGRESQL)
-                 ${private_headers}
-                 orm_lib/src/postgresql_impl/PgConnection.h)
-         endif (libpq_supports_batch)
--    endif (pg_FOUND)
-+    endif (PostgreSQL_FOUND)
- endif (BUILD_POSTGRESQL)
- 
- if (BUILD_MYSQL)
-diff --git a/drogon_ctl/CMakeLists.txt b/drogon_ctl/CMakeLists.txt
-index 9f2f1e7..09871f8 100755
---- a/drogon_ctl/CMakeLists.txt
-+++ b/drogon_ctl/CMakeLists.txt
-@@ -19,7 +19,7 @@ add_executable(_drogon_ctl
- target_link_libraries(_drogon_ctl ${PROJECT_NAME})
- if (WIN32 AND BUILD_SHARED_LIBS)
-   set(DROGON_FILE $<TARGET_FILE:drogon>)
--  set(TRANTOR_FILE $<TARGET_FILE:trantor>)
-+  set(TRANTOR_FILE $<TARGET_FILE:Trantor::Trantor>)
-   add_custom_command(TARGET _drogon_ctl POST_BUILD
-           COMMAND ${CMAKE_COMMAND}
-           -DCTL_FILE=${DROGON_FILE}
diff --git a/external_imported/vcpkg/ports/dstorage/portfile.cmake b/external_imported/vcpkg/ports/dstorage/portfile.cmake
index 7d5bcccc2..2676c59f3 100644
--- a/external_imported/vcpkg/ports/dstorage/portfile.cmake
+++ b/external_imported/vcpkg/ports/dstorage/portfile.cmake
@@ -1,10 +1,11 @@
-vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
-vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
+# Set VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY instead of using `vcpkg_check_linkage` because
+# these DLLs don't link with a CRT.
+set(VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY enabled)
 
 vcpkg_download_distfile(ARCHIVE
     URLS "https://www.nuget.org/api/v2/package/Microsoft.Direct3D.DirectStorage/${VERSION}"
     FILENAME "directstorage.${VERSION}.zip"
-    SHA512 2c2cf6486220f99e7447c1a4406cea6fcaea69edccf790df6887acfde9a684e102547016adadd1ca23f17f8f02bfbd39095892ed63fba3e806bfa44ca9fe0fe6
+    SHA512 f24f681edf0c5e047573c68ca85ab62e0ffefaf87867d45231d779e9bc8e9525891b56314cc30e58eaef20132335f011f32aba22654d2e7caf23338aeb29c6ce
 )
 
 vcpkg_extract_source_archive(
@@ -24,6 +25,7 @@ file(COPY "${PACKAGE_PATH}/native/bin/${VCPKG_TARGET_ARCHITECTURE}/dstoragecore.
 file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug")
 file(COPY "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug")
 
-file(INSTALL "${PACKAGE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${PACKAGE_PATH}/LICENSE.txt")
 
 configure_file("${CMAKE_CURRENT_LIST_DIR}/dstorage-config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" COPYONLY)
diff --git a/external_imported/vcpkg/ports/dstorage/usage b/external_imported/vcpkg/ports/dstorage/usage
new file mode 100644
index 000000000..259ccf4da
--- /dev/null
+++ b/external_imported/vcpkg/ports/dstorage/usage
@@ -0,0 +1,4 @@
+The DirectStorage package provides CMake targets:
+
+    find_package(dstorage CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE Microsoft::DirectStorage)
diff --git a/external_imported/vcpkg/ports/dstorage/vcpkg.json b/external_imported/vcpkg/ports/dstorage/vcpkg.json
index 70c3d8b79..3bd19390b 100644
--- a/external_imported/vcpkg/ports/dstorage/vcpkg.json
+++ b/external_imported/vcpkg/ports/dstorage/vcpkg.json
@@ -1,10 +1,9 @@
 {
   "name": "dstorage",
-  "version": "1.1.0",
-  "port-version": 2,
+  "version": "1.2.2",
   "description": "DirectStorage for Windows",
   "homepage": "https://aka.ms/directstorage/",
   "documentation": "https://github.com/microsoft/DirectStorage",
   "license": null,
-  "supports": "windows & !uwp & !xbox & !staticcrt"
+  "supports": "windows & !arm32 & !uwp & !xbox"
 }
diff --git a/external_imported/vcpkg/ports/dukglue/portfile.cmake b/external_imported/vcpkg/ports/dukglue/portfile.cmake
new file mode 100644
index 000000000..412e2fa06
--- /dev/null
+++ b/external_imported/vcpkg/ports/dukglue/portfile.cmake
@@ -0,0 +1,11 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Aloshi/dukglue
+    REF c3ec2a463a03a4fa34715aa75273537d39900edb #2022-11-08
+    HEAD_REF master
+    SHA512 60bf0274113fa7d547ed2890268782176c507ab0b7ea601362640bb2d4d637ce013a4dabeffbd8a82ed672b2de7778355b6e79642d70cfc2c1f1cf2c2fd9f6c1
+)
+
+file(COPY "${SOURCE_PATH}/include/dukglue" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
diff --git a/external_imported/vcpkg/ports/dukglue/vcpkg.json b/external_imported/vcpkg/ports/dukglue/vcpkg.json
new file mode 100644
index 000000000..c18249e98
--- /dev/null
+++ b/external_imported/vcpkg/ports/dukglue/vcpkg.json
@@ -0,0 +1,10 @@
+{
+  "name": "dukglue",
+  "version-date": "2022-11-08",
+  "description": "A C++ binding/wrapper library for the Duktape JavaScript interpreter.",
+  "homepage": "https://github.com/Aloshi/dukglue",
+  "license": "MIT",
+  "dependencies": [
+    "duktape"
+  ]
+}
diff --git a/external_imported/vcpkg/ports/duktape/CMakeLists.txt b/external_imported/vcpkg/ports/duktape/CMakeLists.txt
index 746aaa910..4480565b7 100644
--- a/external_imported/vcpkg/ports/duktape/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/duktape/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13)
 
 
 set(duktape_MAJOR_VERSION 2)
-set(duktape_MINOR_VERSION 4)
+set(duktape_MINOR_VERSION 7)
 set(duktape_PATCH_VERSION 0)
 set(duktape_VERSION ${duktape_MAJOR_VERSION}.${duktape_MINOR_VERSION}.${duktape_PATCH_VERSION})
 
diff --git a/external_imported/vcpkg/ports/duktape/portfile.cmake b/external_imported/vcpkg/ports/duktape/portfile.cmake
index b00ec3466..5bfe76e34 100644
--- a/external_imported/vcpkg/ports/duktape/portfile.cmake
+++ b/external_imported/vcpkg/ports/duktape/portfile.cmake
@@ -1,53 +1,19 @@
-if(VCPKG_TARGET_IS_LINUX)
-    message("${PORT} currently requires the following tools from the system package manager:\n    python-yaml\n\nThis can be installed on Ubuntu systems via apt-get install python-yaml PYTHON2-yaml (depending on your current python default interpreter)")
-endif()
+vcpkg_download_distfile(
+    ARCHIVE
+    URLS https://github.com/svaarala/duktape/releases/download/v2.7.0/duktape-2.7.0.tar.xz
+    FILENAME duktape-2.7.0.tar.xz
+    SHA512 8ff5465c9c335ea08ebb0d4a06569c991b9dc4661b63e10da6b123b882e7375e82291d6b883c2644902d68071a29ccc880dae8229447cebe710c910b54496c1d
+)
 
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO svaarala/duktape
-    REF 6001888049cb42656f8649db020e804bcdeca6a7 # v2.5.0
-    SHA512 ffbc7f1b16b7469ddfc0af0054a7891ffda128cc099e693773c6b4597ee6a96f8a08d354f7a7cf3a1f16369bef7b7a94c2670a617ec0355cc3614f56e1668dc4
-    HEAD_REF master
+vcpkg_extract_source_archive(
+    SOURCE_PATH
+    ARCHIVE "${ARCHIVE}"
 )
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/duktapeConfig.cmake.in" DESTINATION "${SOURCE_PATH}")
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 
-if (VCPKG_TARGET_IS_WINDOWS)
-    set(EXECUTABLE_SUFFIX ".exe")
-    set(PYTHON_OPTION "")
-else()
-    set(EXECUTABLE_SUFFIX "")
-    set(PYTHON_OPTION "--user")
-endif()
-
-vcpkg_find_acquire_program(PYTHON2)
-get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY)
-vcpkg_add_to_path("${PYTHON2_DIR}")
-
-if(NOT EXISTS "${PYTHON2_DIR}/easy_install${EXECUTABLE_SUFFIX}")
-    if(NOT EXISTS "${PYTHON2_DIR}/Scripts/pip${EXECUTABLE_SUFFIX}")
-        vcpkg_from_github(
-            OUT_SOURCE_PATH PYFILE_PATH
-            REPO pypa/get-pip
-            REF 309a56c5fd94bd1134053a541cb4657a4e47e09d #2019-08-25
-            SHA512 bb4b0745998a3205cd0f0963c04fb45f4614ba3b6fcbe97efe8f8614192f244b7ae62705483a5305943d6c8fedeca53b2e9905aed918d2c6106f8a9680184c7a
-            HEAD_REF master
-        )
-        execute_process(COMMAND ${PYTHON2_DIR}/python${EXECUTABLE_SUFFIX} ${PYFILE_PATH}/get-pip.py ${PYTHON_OPTION})
-    endif()
-    execute_process(COMMAND ${PYTHON2_DIR}/Scripts/pip${EXECUTABLE_SUFFIX} install pyyaml ${PYTHON_OPTION})
-else()
-    execute_process(COMMAND ${PYTHON2_DIR}/easy_install${EXECUTABLE_SUFFIX} pyyaml)
-endif()
-
-vcpkg_execute_required_process(
-    COMMAND ${PYTHON2} tools/configure.py --source-directory src-input --output-directory src --config-metadata config -DDUK_USE_FASTINT
-    WORKING_DIRECTORY ${SOURCE_PATH}
-    LOGNAME pre-configure
-)
-
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
   set(DUK_CONFIG_H_PATH "${SOURCE_PATH}/src/duk_config.h")
   file(READ "${DUK_CONFIG_H_PATH}" CONTENT)
diff --git a/external_imported/vcpkg/ports/duktape/vcpkg.json b/external_imported/vcpkg/ports/duktape/vcpkg.json
index cada97aea..6be293984 100644
--- a/external_imported/vcpkg/ports/duktape/vcpkg.json
+++ b/external_imported/vcpkg/ports/duktape/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "duktape",
-  "version-string": "2.5.0",
-  "port-version": 3,
+  "version": "2.7.0",
   "description": "Embeddable Javascript engine with a focus on portability and compact footprint.",
   "homepage": "https://github.com/svaarala/duktape",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/dumb/check-for-math-lib.patch b/external_imported/vcpkg/ports/dumb/check-for-math-lib.patch
new file mode 100644
index 000000000..7365dad3e
--- /dev/null
+++ b/external_imported/vcpkg/ports/dumb/check-for-math-lib.patch
@@ -0,0 +1,16 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a793bba..6fd094c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -223,7 +223,10 @@ IF(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+     set_target_properties(dumb PROPERTIES INSTALL_NAME_DIR ${CMAKE_INSTALL_FULL_LIBDIR})
+ ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+ 
++find_library(HAS_MATH_LIB NAMES "m")
++if(HAS_MATH_LIB)
+ target_link_libraries(dumb m)
++endif()
+ 
+ install(FILES ${PKG_CONFIG_FILE} DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ install(FILES ${INSTALL_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+
diff --git a/external_imported/vcpkg/ports/dumb/do-not-overwrite-cflags.patch b/external_imported/vcpkg/ports/dumb/do-not-overwrite-cflags.patch
new file mode 100644
index 000000000..acc685595
--- /dev/null
+++ b/external_imported/vcpkg/ports/dumb/do-not-overwrite-cflags.patch
@@ -0,0 +1,26 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a793bba..585ef78 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -29,17 +29,17 @@ check_and_add_c_compiler_flag("-Wall" CMAKE_C_FLAGS)
+ add_definitions("-D_FILE_OFFSET_BITS=64")
+ add_definitions("-DDUMB_DECLARE_DEPRECATED")
+ 
+-set(CMAKE_C_FLAGS_DEBUG "-DDEBUGMODE=1 -D_DEBUG")
++set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DDEBUGMODE=1 -D_DEBUG")
+ check_and_add_c_compiler_flag("-ggdb" CMAKE_C_FLAGS_DEBUG)
+ check_and_add_c_compiler_flag("-Zi" CMAKE_C_FLAGS_DEBUG)
+ 
+-set(CMAKE_C_FLAGS_RELEASE "-ffast-math -O2 -DNDEBUG")
++set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -ffast-math -O2 -DNDEBUG")
+ 
+-set(CMAKE_C_FLAGS_RELWITHDEBINFO "-ffast-math -O2 -DNDEBUG")
++set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -ffast-math -O2 -DNDEBUG")
+ check_and_add_c_compiler_flag("-g" CMAKE_C_FLAGS_RELWITHDEBINFO)
+ check_and_add_c_compiler_flag("-Zi" CMAKE_C_FLAGS_RELWITHDEBINFO)
+ 
+-set(CMAKE_C_FLAGS_MINSIZEREL "-ffast-math -Os -DNDEBUG")
++set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -ffast-math -Os -DNDEBUG")
+ 
+ if(USE_SSE)
+     check_c_compiler_flag("-msse" "CC_HAS_MSSE")
diff --git a/external_imported/vcpkg/ports/dumb/portfile.cmake b/external_imported/vcpkg/ports/dumb/portfile.cmake
new file mode 100644
index 000000000..6b723d071
--- /dev/null
+++ b/external_imported/vcpkg/ports/dumb/portfile.cmake
@@ -0,0 +1,44 @@
+if(VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO kode54/dumb
+    REF "${VERSION}"
+    SHA512 18b10a507d69a754cdf97fbeae41c17f211a6ba1f166a822276bdb6769d3edc326919067a3f4d1247d6715d7a5a8276669d83b9427e7336c6d111593fb7e36cf
+    HEAD_REF master
+    PATCHES
+        "check-for-math-lib.patch"
+        "do-not-overwrite-cflags.patch"
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_EXAMPLES=OFF
+        -DBUILD_ALLEGRO4=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_fixup_pkgconfig()
+vcpkg_copy_pdbs()
+
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/dumb.pc" "-llibdumb" "-ldumb")
+if(NOT VCPKG_BUILD_TYPE)
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/dumb.pc" "-llibdumb" "-ldumbd")
+endif()
+
+if(VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/dumb.pc" " -lm" "")
+    if(NOT VCPKG_BUILD_TYPE)
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/dumb.pc" " -lm" "")
+    endif()
+endif()
+
+file(REMOVE_RECURSE 
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/debug/share"
+)
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/dumb/vcpkg.json b/external_imported/vcpkg/ports/dumb/vcpkg.json
new file mode 100644
index 000000000..3a96b5aef
--- /dev/null
+++ b/external_imported/vcpkg/ports/dumb/vcpkg.json
@@ -0,0 +1,13 @@
+{
+  "name": "dumb",
+  "version": "2.0.3",
+  "description": "Module/tracker based music format parser and player library",
+  "homepage": "https://github.com/kode54/dumb",
+  "license": null,
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/dv-processing/portfile.cmake b/external_imported/vcpkg/ports/dv-processing/portfile.cmake
index 127907b49..92bb3d134 100644
--- a/external_imported/vcpkg/ports/dv-processing/portfile.cmake
+++ b/external_imported/vcpkg/ports/dv-processing/portfile.cmake
@@ -2,8 +2,8 @@ vcpkg_from_gitlab(
     GITLAB_URL https://gitlab.com/inivation
     OUT_SOURCE_PATH SOURCE_PATH
     REPO dv/dv-processing
-    REF b55a2e7a01ef49a861ee151bd542d4b32edfde30
-    SHA512 7abf828e27af0b708c7fc3c6c78f00f9089d202a7e4a1d6c9a1f9416d2e9e394d470dc1b40ae2f491350b87f11cd17869b12ef10cd7c647e06627833f6d205f9
+    REF 9cd21eede0c38e079e462cdce8434fcbe2a4d037
+    SHA512 fc5d0083166ff4708e6d540d437429784f9f62b7c3b7fb4631abc27ee0e6f46e60314f5fcf571c6141352571fef52a32c85a8160c951b5243910a02a281b0855
     HEAD_REF rel_1.7
 )
 
@@ -11,9 +11,9 @@ vcpkg_from_gitlab(
     GITLAB_URL https://gitlab.com/inivation
     OUT_SOURCE_PATH CMAKEMOD_SOURCE_PATH
     REPO dv/cmakemod
-    REF ec53dae89f6b037e9e640af5340d7bf67d84d278
-    SHA512 e7907b1be9d85b02e1a1703cf001765119a7d07b1873148a0fbfe6945c519d85b1f9bc66b24f90d88759c2b32965304e1639f2ff136448be64fc88f81a0d4c2d
-    HEAD_REF ec53dae89f6b037e9e640af5340d7bf67d84d278
+    REF d107c76b73a49a16c3ac733749152037406a515e
+    SHA512 fe87530ce5fecfe5d1ccdc6a06addc652167c67c4707d9039bf2f022ced2966dc8295b8ed69c3d4154b965f0dd22f43a8830eb4f03e99ff3edfe38de759bd0d5
+    HEAD_REF d107c76b73a49a16c3ac733749152037406a515e
 )
 file(GLOB CMAKEMOD_FILES "${CMAKEMOD_SOURCE_PATH}/*")
 file(COPY ${CMAKEMOD_FILES} DESTINATION "${SOURCE_PATH}/cmake/modules")
@@ -24,11 +24,14 @@ vcpkg_check_features(
         tools   ENABLE_UTILITIES
 )
 
+vcpkg_find_acquire_program(PKGCONFIG)
+
 set(VCPKG_BUILD_TYPE release) # no lib binaries
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE # writes to include/dv-processing/version.hpp
     OPTIONS
+        "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}"
         ${FEATURE_OPTIONS}
         "-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake"
         -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
diff --git a/external_imported/vcpkg/ports/dv-processing/vcpkg.json b/external_imported/vcpkg/ports/dv-processing/vcpkg.json
index c1e607e99..9e85867e8 100644
--- a/external_imported/vcpkg/ports/dv-processing/vcpkg.json
+++ b/external_imported/vcpkg/ports/dv-processing/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "dv-processing",
-  "version": "1.7.8",
+  "version": "1.7.9",
   "port-version": 1,
   "description": "Generic algorithms for event cameras. (C++20 required.)",
   "homepage": "https://gitlab.com/inivation/dv/dv-processing",
diff --git a/external_imported/vcpkg/ports/dx/vcpkg.json b/external_imported/vcpkg/ports/dx/vcpkg.json
index ddee48410..8d1eefd90 100644
--- a/external_imported/vcpkg/ports/dx/vcpkg.json
+++ b/external_imported/vcpkg/ports/dx/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "dx",
-  "version-string": "1.0.1",
-  "port-version": 2,
+  "version": "1.0.1",
+  "port-version": 3,
   "description": "A modern C++ library for DirectX programming",
   "homepage": "https://github.com/sdcb/dx"
 }
diff --git a/external_imported/vcpkg/ports/dxsdk-d3dx/portfile.cmake b/external_imported/vcpkg/ports/dxsdk-d3dx/portfile.cmake
index 30bd0351f..b406a6735 100644
--- a/external_imported/vcpkg/ports/dxsdk-d3dx/portfile.cmake
+++ b/external_imported/vcpkg/ports/dxsdk-d3dx/portfile.cmake
@@ -14,8 +14,8 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 9f6a95ed858555c1c438a85219ede32c82729068b21dd7ecf11de01cf3cdd525b2f04a58643bfcc14c48a29403dc1c80246f0a12a1ef4377b91b855f6d6d7986
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH PACKAGE_PATH
+vcpkg_extract_source_archive(
+    PACKAGE_PATH
     ARCHIVE ${ARCHIVE}
     NO_REMOVE_ONE_LEVEL
 )
diff --git a/external_imported/vcpkg/ports/dxsdk-d3dx/vcpkg.json b/external_imported/vcpkg/ports/dxsdk-d3dx/vcpkg.json
index 758df63a6..666418614 100644
--- a/external_imported/vcpkg/ports/dxsdk-d3dx/vcpkg.json
+++ b/external_imported/vcpkg/ports/dxsdk-d3dx/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "dxsdk-d3dx",
   "version": "9.29.952.8",
-  "port-version": 5,
+  "port-version": 6,
   "description": "Redistributable package for the legacy DirectX SDK's D3DX9, D3DX10, and/or D3DX11 utility libraries.",
   "homepage": "https://walbourn.github.io/legacy-d3dx-on-nuget/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/dxut/portfile.cmake b/external_imported/vcpkg/ports/dxut/portfile.cmake
index 270ef6b3a..155426f0f 100644
--- a/external_imported/vcpkg/ports/dxut/portfile.cmake
+++ b/external_imported/vcpkg/ports/dxut/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO microsoft/DXUT
-    REF feb2023
-    SHA512 c436fa29a0bf61818df100d66e907f7bd42b93a6a5571238db65c4dfab7d31be130fe61db9040ab06b4d6ec33d209c387d5ae9f8501daa0c53a579ec9cd24697
+    REF jun2023
+    SHA512 72a322fcf062d0f52d0e854660e48943d0e10e7856019ad5bc0b37bcb2bde909d6fbc315e04e2b90a13a50a05129b8787159791ec525f5003f0c090dce9a7d42
     HEAD_REF main
 )
 
@@ -25,4 +25,5 @@ vcpkg_cmake_config_fixup(CONFIG_PATH share/dxut)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/dxut/usage b/external_imported/vcpkg/ports/dxut/usage
new file mode 100644
index 000000000..f290ab496
--- /dev/null
+++ b/external_imported/vcpkg/ports/dxut/usage
@@ -0,0 +1,4 @@
+The DXUT for Direct3D 11 package is compatible with built-in CMake targets:
+
+    find_package(dxut CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE Microsoft::DXUTOpt Microsoft::DXUT)
diff --git a/external_imported/vcpkg/ports/dxut/vcpkg.json b/external_imported/vcpkg/ports/dxut/vcpkg.json
index 876a20bfc..8693eda54 100644
--- a/external_imported/vcpkg/ports/dxut/vcpkg.json
+++ b/external_imported/vcpkg/ports/dxut/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "dxut",
   "version": "11.31",
-  "port-version": 2,
+  "port-version": 3,
   "description": "A \"GLUT\"-like framework for Direct3D 11.x Win32 desktop applications",
   "homepage": "https://github.com/Microsoft/DXUT",
   "documentation": "https://github.com/microsoft/DXUT/wiki",
diff --git a/external_imported/vcpkg/ports/dylib/portfile.cmake b/external_imported/vcpkg/ports/dylib/portfile.cmake
new file mode 100644
index 000000000..48985968d
--- /dev/null
+++ b/external_imported/vcpkg/ports/dylib/portfile.cmake
@@ -0,0 +1,21 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO martin-olivier/dylib
+    REF "v${VERSION}"
+    SHA512 8e691c1bc73f381ce8ec50d85165c122ba55167b050e696c8b26ccf1ba14999ca8129fb6c5b6c3320166f606acb2c21867d0786347c341d1267815580beb5c0a
+    HEAD_REF main
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/dylib)
+
+vcpkg_fixup_pkgconfig()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/dylib/vcpkg.json b/external_imported/vcpkg/ports/dylib/vcpkg.json
new file mode 100644
index 000000000..0ae7f7b97
--- /dev/null
+++ b/external_imported/vcpkg/ports/dylib/vcpkg.json
@@ -0,0 +1,17 @@
+{
+  "name": "dylib",
+  "version-semver": "2.2.1",
+  "description": "C++ cross-platform wrapper around dynamic loading of shared libraries",
+  "homepage": "https://github.com/martin-olivier/dylib",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/dyno/fix-deps.patch b/external_imported/vcpkg/ports/dyno/fix-deps.patch
new file mode 100644
index 000000000..50368545f
--- /dev/null
+++ b/external_imported/vcpkg/ports/dyno/fix-deps.patch
@@ -0,0 +1,30 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6c7c421..1b8b2bc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -14,9 +14,8 @@ add_library(dyno INTERFACE)
+ add_library(Dyno::dyno ALIAS dyno)
+ target_compile_features(dyno INTERFACE cxx_std_17)
+ target_include_directories(dyno INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>")
+-find_package(Hana REQUIRED)
+-find_package(CallableTraits REQUIRED)
+-target_link_libraries(dyno INTERFACE hana callable_traits)
++find_package(Boost REQUIRED)
++target_link_libraries(dyno INTERFACE Boost::boost)
+ 
+ include(CheckCXXCompilerFlag)
+ check_cxx_compiler_flag("-Wno-gnu-string-literal-operator-template" DYNO_HAS_WNO_GNU_STRING_UDL)
+diff --git a/cmake/dyno-config.cmake b/cmake/dyno-config.cmake
+index 8a1845b..57aa7a1 100644
+--- a/cmake/dyno-config.cmake
++++ b/cmake/dyno-config.cmake
+@@ -3,8 +3,7 @@
+ # (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
+ 
+ include(CMakeFindDependencyMacro)
+-find_dependency(Hana REQUIRED)
+-find_dependency(CallableTraits REQUIRED)
++find_dependency(Boost)
+ 
+ if(NOT TARGET Dyno::dyno)
+   include("${CMAKE_CURRENT_LIST_DIR}/dyno-targets.cmake")
diff --git a/external_imported/vcpkg/ports/dyno/portfile.cmake b/external_imported/vcpkg/ports/dyno/portfile.cmake
new file mode 100644
index 000000000..f4ddf6c84
--- /dev/null
+++ b/external_imported/vcpkg/ports/dyno/portfile.cmake
@@ -0,0 +1,24 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO ldionne/dyno
+    REF 56ced251f5751ef4e3fe66d4f28ccbc75b902d70
+    SHA512 c3f34679d1e2f3cec3757f69662d4f5db602b9028a927ad9070e70813caf18bb2a512f148e69f14aaac35a3e13abb57e1aa8e4f369993e7a01d048d70050daa6
+    HEAD_REF master
+    PATCHES fix-deps.patch
+)
+
+set(VCPKG_BUILD_TYPE release) #header-only library
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(PACKAGE_NAME dyno CONFIG_PATH "lib/cmake/dyno")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
+
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/dyno/usage b/external_imported/vcpkg/ports/dyno/usage
new file mode 100644
index 000000000..9057f2a2e
--- /dev/null
+++ b/external_imported/vcpkg/ports/dyno/usage
@@ -0,0 +1,5 @@
+The package dyno provides CMake targets:
+
+    find_package(dyno CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE Dyno::dyno)
+
diff --git a/external_imported/vcpkg/ports/dyno/vcpkg.json b/external_imported/vcpkg/ports/dyno/vcpkg.json
new file mode 100644
index 000000000..e545451e8
--- /dev/null
+++ b/external_imported/vcpkg/ports/dyno/vcpkg.json
@@ -0,0 +1,19 @@
+{
+  "name": "dyno",
+  "version-date": "2019-11-13",
+  "description": "Runtime polymorphism done right",
+  "homepage": "https://github.com/ldionne/dyno/",
+  "license": "BSL-1.0",
+  "dependencies": [
+    "boost-callable-traits",
+    "boost-hana",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/eastl/0001-fix-cmake-install.patch b/external_imported/vcpkg/ports/eastl/0001-fix-cmake-install.patch
new file mode 100644
index 000000000..ceace103e
--- /dev/null
+++ b/external_imported/vcpkg/ports/eastl/0001-fix-cmake-install.patch
@@ -0,0 +1,78 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e3eb444..74b4938 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -4,6 +4,9 @@
+ cmake_minimum_required(VERSION 3.1)
+ project(EASTL CXX)
+ 
++include(GNUInstallDirs)
++include(CMakePackageConfigHelpers)
++
+ #-------------------------------------------------------------------------------------------
+ # Options
+ #-------------------------------------------------------------------------------------------
+@@ -11,6 +14,8 @@ option(EASTL_BUILD_BENCHMARK "Enable generation of build files for benchmark" OF
+ option(EASTL_BUILD_TESTS "Enable generation of build files for tests" OFF)
+ option(EASTL_STD_ITERATOR_CATEGORY_ENABLED "Enable compatibility with std:: iterator categories" OFF)
+ 
++find_package(EABase CONFIG REQUIRED)
++
+ #-------------------------------------------------------------------------------------------
+ # Compiler Flags
+ #-------------------------------------------------------------------------------------------
+@@ -54,7 +59,10 @@ endif()
+ #-------------------------------------------------------------------------------------------
+ # Include dirs
+ #-------------------------------------------------------------------------------------------
+-target_include_directories(EASTL PUBLIC include)
++target_include_directories(EASTL PUBLIC
++        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
++        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
++    )
+ 
+ #-------------------------------------------------------------------------------------------
+ # Dependencies
+@@ -63,7 +71,41 @@ if (NOT TARGET EABase)
+     add_subdirectory(test/packages/EABase)
+ endif()
+ 
+-target_link_libraries(EASTL EABase)
++target_link_libraries(EASTL PUBLIC EABase)
++
++# create and install an export set for eabase target as EABase::EABase
++set(EASTL_CMAKE_CONFIG_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/EASTL")
++
++configure_package_config_file(
++    EASTLConfig.cmake.in
++    ${CMAKE_CURRENT_BINARY_DIR}/EASTLConfig.cmake
++    INSTALL_DESTINATION ${EASTL_CMAKE_CONFIG_DESTINATION}
++)
++
++# create and install an export set for Terra target as Terra
++install(
++    TARGETS EASTL EXPORT EASTLTargets
++    DESTINATION ${CMAKE_INSTALL_LIBDIR}
++)
++
++
++install(EXPORT EASTLTargets DESTINATION ${EASTL_CMAKE_CONFIG_DESTINATION})
++
++write_basic_package_version_file(
++  "${CMAKE_CURRENT_BINARY_DIR}/EASTLConfigVersion.cmake"
++  VERSION 3.16.05
++  COMPATIBILITY SameMajorVersion
++)
++
++install(TARGETS EASTL LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
++install(DIRECTORY "include/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
++
++install(
++    FILES
++        "${CMAKE_CURRENT_BINARY_DIR}/EASTLConfig.cmake"
++        "${CMAKE_CURRENT_BINARY_DIR}/EASTLConfigVersion.cmake"
++    DESTINATION ${EASTL_CMAKE_CONFIG_DESTINATION}
++)
+ 
+ #-------------------------------------------------------------------------------------------
+ # Installation
diff --git a/external_imported/vcpkg/ports/eastl/0002-fix-error-C2338.patch b/external_imported/vcpkg/ports/eastl/0002-fix-error-C2338.patch
new file mode 100644
index 000000000..61d75dddc
--- /dev/null
+++ b/external_imported/vcpkg/ports/eastl/0002-fix-error-C2338.patch
@@ -0,0 +1,14 @@
+diff --git a/scripts/CMake/CommonCppFlags.cmake b/scripts/CMake/CommonCppFlags.cmake
+index 08b6af5..281665e 100644
+--- a/scripts/CMake/CommonCppFlags.cmake
++++ b/scripts/CMake/CommonCppFlags.cmake
+@@ -74,6 +74,9 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+     endif()
+ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++latest /W4 /permissive-")
++    if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "19.31.30911.95")
++        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:static_assert-")
++    endif()
+ endif()
+ 
+ 
diff --git a/external_imported/vcpkg/ports/eastl/fix-error-C2039.diff b/external_imported/vcpkg/ports/eastl/fix-error-C2039.diff
deleted file mode 100644
index 8b464b6dd..000000000
--- a/external_imported/vcpkg/ports/eastl/fix-error-C2039.diff
+++ /dev/null
@@ -1,88 +0,0 @@
-diff --git a/include/EASTL/numeric_limits.h b/include/EASTL/numeric_limits.h
-index e991e7e9..e933c845 100644
---- a/include/EASTL/numeric_limits.h
-+++ b/include/EASTL/numeric_limits.h
-@@ -1435,6 +1435,19 @@ namespace eastl
- 			static value_type round_error() 
- 				{ return 0.5f; }
- 
-+			#if defined(_MSVC_STL_UPDATE) && _MSVC_STL_UPDATE >= 202206L // If using a recent version of MSVC's STL...
-+			static value_type infinity()
-+				{ return __builtin_huge_valf(); }
-+
-+			static value_type quiet_NaN()
-+				{ return __builtin_nanf("0"); }
-+
-+			static value_type signaling_NaN()
-+				{ return __builtin_nansf("1"); }
-+
-+			static value_type denorm_min()
-+				{ return FLT_TRUE_MIN; }
-+			#else
- 			static value_type infinity() 
- 				{ return _CSTD _FInf._Float; }
- 
-@@ -1446,6 +1459,7 @@ namespace eastl
- 
- 			static value_type denorm_min() 
- 				{ return _CSTD _FDenorm._Float; }
-+			#endif
- 
- 		#endif
- 	};
-@@ -1553,6 +1567,19 @@ namespace eastl
- 			static value_type round_error() 
- 				{ return 0.5f; }
- 
-+			#if defined(_MSVC_STL_UPDATE) && _MSVC_STL_UPDATE >= 202206L // If using a recent version of MSVC's STL...
-+			static value_type infinity()
-+				{ return __builtin_huge_val(); }
-+
-+			static value_type quiet_NaN()
-+				{ return __builtin_nan("0"); }
-+
-+			static value_type signaling_NaN()
-+				{ return __builtin_nans("1"); }
-+
-+			static value_type denorm_min()
-+				{ return DBL_TRUE_MIN; }
-+			#else
- 			static value_type infinity() 
- 				{ return _CSTD _Inf._Double; }
- 
-@@ -1564,6 +1591,7 @@ namespace eastl
- 
- 			static value_type denorm_min() 
- 				{ return _CSTD _Denorm._Double; }
-+			#endif
- 
- 		#endif
- 	};
-@@ -1671,6 +1699,19 @@ namespace eastl
- 			static value_type round_error() 
- 				{ return 0.5f; }
- 
-+			#if defined(_MSVC_STL_UPDATE) && _MSVC_STL_UPDATE >= 202206L // If using a recent version of MSVC's STL...
-+			static value_type infinity()
-+				{ return __builtin_huge_val(); }
-+
-+			static value_type quiet_NaN()
-+				{ return __builtin_nan("0"); }
-+
-+			static value_type signaling_NaN()
-+				{ return __builtin_nans("1"); }
-+
-+			static value_type denorm_min()
-+				{ return LDBL_TRUE_MIN; }
-+			#else
- 			static value_type infinity() 
- 				{ return _CSTD _LInf._Long_double; }
- 
-@@ -1682,6 +1723,7 @@ namespace eastl
- 
- 			static value_type denorm_min() 
- 				{ return _CSTD _LDenorm._Long_double; }
-+			#endif
- 
- 		#endif
- 	};
diff --git a/external_imported/vcpkg/ports/eastl/fix_cmake_install.patch b/external_imported/vcpkg/ports/eastl/fix_cmake_install.patch
deleted file mode 100644
index a2dbfd821..000000000
--- a/external_imported/vcpkg/ports/eastl/fix_cmake_install.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e8700dc..6d3e2f1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -4,12 +4,17 @@
- cmake_minimum_required(VERSION 3.1)
- project(EASTL CXX)
- 
-+include(GNUInstallDirs)
-+include(CMakePackageConfigHelpers)
-+
- #-------------------------------------------------------------------------------------------
- # Options
- #-------------------------------------------------------------------------------------------
- option(EASTL_BUILD_BENCHMARK "Enable generation of build files for benchmark" OFF)
- option(EASTL_BUILD_TESTS "Enable generation of build files for tests" OFF)
- 
-+find_package(EABase CONFIG REQUIRED)
-+
- #-------------------------------------------------------------------------------------------
- # Compiler Flags
- #-------------------------------------------------------------------------------------------
-@@ -41,7 +46,10 @@ add_definitions(-DEASTL_OPENSOURCE=1)
- #-------------------------------------------------------------------------------------------
- # Include dirs
- #-------------------------------------------------------------------------------------------
--target_include_directories(EASTL PUBLIC include)
-+target_include_directories(EASTL PUBLIC
-+        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
-+        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
-+    )
- 
- #-------------------------------------------------------------------------------------------
- # Dependencies
-@@ -50,5 +58,39 @@ if (NOT TARGET EABase)
-     add_subdirectory(test/packages/EABase)
- endif()
- 
--target_link_libraries(EASTL EABase)
-+target_link_libraries(EASTL PUBLIC EABase)
-+
-+# create and install an export set for eabase target as EABase::EABase
-+set(EASTL_CMAKE_CONFIG_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/EASTL")
-+
-+configure_package_config_file(
-+    EASTLConfig.cmake.in
-+    ${CMAKE_CURRENT_BINARY_DIR}/EASTLConfig.cmake
-+    INSTALL_DESTINATION ${EASTL_CMAKE_CONFIG_DESTINATION}
-+)
-+
-+# create and install an export set for Terra target as Terra
-+install(
-+    TARGETS EASTL EXPORT EASTLTargets
-+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+)
-+
-+
-+install(EXPORT EASTLTargets DESTINATION ${EASTL_CMAKE_CONFIG_DESTINATION})
-+
-+write_basic_package_version_file(
-+  "${CMAKE_CURRENT_BINARY_DIR}/EASTLConfigVersion.cmake"
-+  VERSION 3.16.05
-+  COMPATIBILITY SameMajorVersion
-+)
-+
-+install(TARGETS EASTL LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
-+install(DIRECTORY "include/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
-+ 
-+install(
-+    FILES
-+        "${CMAKE_CURRENT_BINARY_DIR}/EASTLConfig.cmake"
-+        "${CMAKE_CURRENT_BINARY_DIR}/EASTLConfigVersion.cmake"
-+    DESTINATION ${EASTL_CMAKE_CONFIG_DESTINATION}
-+)
- 
diff --git a/external_imported/vcpkg/ports/eastl/portfile.cmake b/external_imported/vcpkg/ports/eastl/portfile.cmake
index 1c8185fa8..b5479e2da 100644
--- a/external_imported/vcpkg/ports/eastl/portfile.cmake
+++ b/external_imported/vcpkg/ports/eastl/portfile.cmake
@@ -3,13 +3,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO electronicarts/EASTL
-    REF e8bdd5531ed79c30ccef2fd71e070f5ab9f1222a #v3.18.00
-    SHA512 3e5d97a77b8610a2efdb9156b47c91e8a8dd5629ff95ea6d2c65016b067ab645df5beddc8c7f93d89c3d1a6f404ff71282efc6db9885a6e6240fa444fe2be79c
+    REF "${VERSION}"
+    SHA512 412f894a1d1d0fdcc8f5ae130e977872a8ff243691cf9dfc76a520389f514739511afca63e1aeaaf127132f5dfc3dd482af3e5f80844b5d6d33eae1c68628267
     HEAD_REF master
     PATCHES 
-        fix_cmake_install.patch
-        Fix-error-C2338.patch
-        fix-error-C2039.diff
+        0001-fix-cmake-install.patch
+        0002-fix-error-C2338.patch
 )
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/EASTLConfig.cmake.in" DESTINATION "${SOURCE_PATH}")
diff --git a/external_imported/vcpkg/ports/eastl/vcpkg.json b/external_imported/vcpkg/ports/eastl/vcpkg.json
index 7db58cc90..66f32b59a 100644
--- a/external_imported/vcpkg/ports/eastl/vcpkg.json
+++ b/external_imported/vcpkg/ports/eastl/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "eastl",
-  "version-string": "3.18.00",
-  "port-version": 3,
+  "version": "3.21.12",
   "description": "Electronic Arts Standard Template Library. It is a C++ template library of containers, algorithms, and iterators useful for runtime and tool development across multiple platforms. It is a fairly extensive and robust implementation of such a library and has an emphasis on high performance above all other considerations.",
   "homepage": "https://github.com/electronicarts/EASTL",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/easycl/vcpkg.json b/external_imported/vcpkg/ports/easycl/vcpkg.json
index 2df4f3609..c97eaf665 100644
--- a/external_imported/vcpkg/ports/easycl/vcpkg.json
+++ b/external_imported/vcpkg/ports/easycl/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "easycl",
-  "version-string": "0.3",
-  "port-version": 1,
+  "version": "0.3",
+  "port-version": 2,
   "description": "OpenCL based lightweight c++ computing library",
   "homepage": "https://github.com/architector1324/EasyCL",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/easyhook/portfile.cmake b/external_imported/vcpkg/ports/easyhook/portfile.cmake
index d67dc1d8f..ea3cc70de 100644
--- a/external_imported/vcpkg/ports/easyhook/portfile.cmake
+++ b/external_imported/vcpkg/ports/easyhook/portfile.cmake
@@ -9,14 +9,6 @@ vcpkg_from_github(
     PATCHES fix-build.patch
 )
 
-if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
-    set(BUILD_ARCH "Win32")
-elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
-    set(BUILD_ARCH "x64")
-else()
-    message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}")
-endif()
-
 # Use /Z7 rather than /Zi to avoid "fatal error C1090: PDB API call failed, error code '23': (0x00000006)"
 foreach(VCXPROJ IN ITEMS
     "${SOURCE_PATH}/EasyHookDll/EasyHookDll.vcxproj"
@@ -72,13 +64,12 @@ foreach(CSPROJ IN ITEMS
     )
 endforeach()
 
-vcpkg_install_msbuild(
-    SOURCE_PATH ${SOURCE_PATH}
+vcpkg_msbuild_install(
+    SOURCE_PATH "${SOURCE_PATH}"
     PROJECT_SUBPATH EasyHook.sln
     TARGET EasyHookDll
     RELEASE_CONFIGURATION "netfx4-Release"
     DEBUG_CONFIGURATION "netfx4-Debug"
-    PLATFORM ${BUILD_ARCH}
 )
 
 # Remove the mismatch rebuild library
@@ -110,4 +101,4 @@ endif()
 file(INSTALL "${SOURCE_PATH}/Public/easyhook.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/easyhook")
 
 # Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/easyhook/vcpkg.json b/external_imported/vcpkg/ports/easyhook/vcpkg.json
index 0a894137a..31c189a85 100644
--- a/external_imported/vcpkg/ports/easyhook/vcpkg.json
+++ b/external_imported/vcpkg/ports/easyhook/vcpkg.json
@@ -1,8 +1,15 @@
 {
   "name": "easyhook",
   "version": "2.7.7097.0",
-  "port-version": 5,
+  "port-version": 7,
   "description": "This project supports extending (hooking) unmanaged code (APIs) with pure managed ones, from within a fully managed environment on 32- or 64-bit Windows Vista x64, Windows Server 2008 x64, Windows 7, Windows 8.1, and Windows 10.",
   "homepage": "https://github.com/EasyHook/EasyHook",
-  "supports": "windows & !static & !uwp & (x86 | x64)"
+  "supports": "windows & !static & !uwp & (x86 | x64)",
+  "dependencies": [
+    {
+      "name": "vcpkg-msbuild",
+      "host": true,
+      "platform": "windows"
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/easyloggingpp/0001_add_cmake_options.patch b/external_imported/vcpkg/ports/easyloggingpp/0001_add_cmake_options.patch
new file mode 100644
index 000000000..3e2f3f928
--- /dev/null
+++ b/external_imported/vcpkg/ports/easyloggingpp/0001_add_cmake_options.patch
@@ -0,0 +1,34 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8604a54..e08df91 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,6 +25,10 @@ option(test "Build all tests" OFF)
+ option(build_static_lib "Build easyloggingpp as a static library" OFF)
+ option(lib_utc_datetime "Build library with UTC date/time logging" OFF)
+ 
++option(no_default_logfile "Do not write to default log file \"myeasylog.log\" (define ELPP_NO_DEFAULT_LOG_FILE)" OFF)
++option(thread_safe "Build easyloggingpp thread safe (define ELPP_THREAD_SAFE)" OFF)
++option(use_std_threads "Use standard library thread synchronization (define ELPP_FORCE_USE_STD_THREAD)" OFF)
++
+ set(ELPP_MAJOR_VERSION "9")
+ set(ELPP_MINOR_VERSION "96")
+ set(ELPP_PATCH_VERSION "7")
+@@ -57,6 +61,18 @@ if (build_static_lib)
+                 add_definitions(-DELPP_UTC_DATETIME)
+         endif()
+ 
++        if (no_default_logfile)
++                add_definitions(-DELPP_NO_DEFAULT_LOG_FILE)
++        endif()
++
++        if (thread_safe)
++                add_definitions(-DELPP_THREAD_SAFE)
++        endif()
++
++        if (use_std_threads)
++                add_definitions(-DELPP_FORCE_USE_STD_THREAD)
++        endif()
++
+         require_cpp14()
+         add_library(easyloggingpp STATIC src/easylogging++.cc)
+         set_property(TARGET easyloggingpp PROPERTY POSITION_INDEPENDENT_CODE ON)
diff --git a/external_imported/vcpkg/ports/easyloggingpp/0002_fix_build_uwp.patch b/external_imported/vcpkg/ports/easyloggingpp/0002_fix_build_uwp.patch
new file mode 100644
index 000000000..7120ac191
--- /dev/null
+++ b/external_imported/vcpkg/ports/easyloggingpp/0002_fix_build_uwp.patch
@@ -0,0 +1,22 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e08df91..7c02adf 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -28,6 +28,7 @@ option(lib_utc_datetime "Build library with UTC date/time logging" OFF)
+ option(no_default_logfile "Do not write to default log file \"myeasylog.log\" (define ELPP_NO_DEFAULT_LOG_FILE)" OFF)
+ option(thread_safe "Build easyloggingpp thread safe (define ELPP_THREAD_SAFE)" OFF)
+ option(use_std_threads "Use standard library thread synchronization (define ELPP_FORCE_USE_STD_THREAD)" OFF)
++option(is_uwp "The compilation platform is uwp." OFF)
+ 
+ set(ELPP_MAJOR_VERSION "9")
+ set(ELPP_MINOR_VERSION "96")
+@@ -76,6 +77,9 @@ if (build_static_lib)
+         require_cpp14()
+         add_library(easyloggingpp STATIC src/easylogging++.cc)
+         set_property(TARGET easyloggingpp PROPERTY POSITION_INDEPENDENT_CODE ON)
++        if(is_uwp)
++            target_compile_definitions(easyloggingpp PUBLIC WIN32_LEAN_AND_MEAN ELPP_WINSOCK2)
++        endif()
+ 
+         install(TARGETS
+             easyloggingpp
diff --git a/external_imported/vcpkg/ports/easyloggingpp/portfile.cmake b/external_imported/vcpkg/ports/easyloggingpp/portfile.cmake
index 22f8b5ab9..4b095a273 100644
--- a/external_imported/vcpkg/ports/easyloggingpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/easyloggingpp/portfile.cmake
@@ -2,22 +2,36 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO muflihun/easyloggingpp
-    REF v9.97.0
-    SHA512 e45789edaf7a43ad6a73861840d24ccce9b9d6bba1aaacf93c6ac26ff7449957251d2ca322c9da85130b893332dd305b13a2499eaffc65ecfaaafa3e11f8d63d
+    REPO abumq/easyloggingpp
+    REF "v${VERSION}"
+    SHA512 3df813f7f9796c81c974ba794624db2602253e14b938370deb4c851fe8725f5c7ebf71d7ae0277fcb770b043ccf8f04bbf8e770d14565f4cb704328973473387
     HEAD_REF master
+    PATCHES
+        0001_add_cmake_options.patch
+        0002_fix_build_uwp.patch
 )
 
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+		std-locking     use_std_threads
+		thread-safe     thread_safe
+		no-defaultfile  no_default_logfile
+)
+if(VCPKG_TARGET_IS_UWP)
+    set(TARGET_IS_UWP ON)
+endif()
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
+        ${FEATURE_OPTIONS}
         -Dbuild_static_lib=ON
+        -Dis_uwp=${TARGET_IS_UWP}
 )
 vcpkg_cmake_install()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
 
 vcpkg_fixup_pkgconfig()
diff --git a/external_imported/vcpkg/ports/easyloggingpp/vcpkg.json b/external_imported/vcpkg/ports/easyloggingpp/vcpkg.json
index 8a5e5bbe1..a557ad50f 100644
--- a/external_imported/vcpkg/ports/easyloggingpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/easyloggingpp/vcpkg.json
@@ -1,9 +1,9 @@
 {
   "name": "easyloggingpp",
-  "version": "9.97.0",
-  "port-version": 2,
+  "version": "9.97.1",
   "description": "Easylogging++ is a single header efficient logging library for C++ applications.",
-  "homepage": "https://github.com/amrayn/easyloggingpp",
+  "homepage": "https://github.com/abumq/easyloggingpp",
+  "license": "MIT",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
@@ -13,5 +13,16 @@
       "name": "vcpkg-cmake-config",
       "host": true
     }
-  ]
+  ],
+  "features": {
+    "no-defaultfile": {
+      "description": "Do not write to default log file \"myeasylog.log\" (compile with ELPP_NO_DEFAULT_LOG_FILE)"
+    },
+    "std-locking": {
+      "description": "Use std::mutex for thread synchronization (compile with ELPP_FORCE_USE_STD_THREAD)"
+    },
+    "thread-safe": {
+      "description": "Make easyloggingpp thread safe (compile with ELPP_THREAD_SAFE)"
+    }
+  }
 }
diff --git a/external_imported/vcpkg/ports/eathread/portfile.cmake b/external_imported/vcpkg/ports/eathread/portfile.cmake
index 421f7c591..04f7e998d 100644
--- a/external_imported/vcpkg/ports/eathread/portfile.cmake
+++ b/external_imported/vcpkg/ports/eathread/portfile.cmake
@@ -10,23 +10,22 @@ vcpkg_from_github(
     fix_cmake_install.patch
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/EAThreadConfig.cmake.in DESTINATION ${SOURCE_PATH})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/EAThreadConfig.cmake.in" DESTINATION "${SOURCE_PATH}")
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
     -DEATHREAD_BUILD_TESTS=OFF
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/EAThread)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/EAThread)
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 vcpkg_copy_pdbs()
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-file(INSTALL ${SOURCE_PATH}/3RDPARTYLICENSES.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/eathread)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/3RDPARTYLICENSES.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/eathread")
diff --git a/external_imported/vcpkg/ports/eathread/vcpkg.json b/external_imported/vcpkg/ports/eathread/vcpkg.json
index 4f18b4c7a..dd634f919 100644
--- a/external_imported/vcpkg/ports/eathread/vcpkg.json
+++ b/external_imported/vcpkg/ports/eathread/vcpkg.json
@@ -1,12 +1,20 @@
 {
   "name": "eathread",
   "version-string": "1.32.09",
-  "port-version": 3,
+  "port-version": 5,
   "description": "Electronic Arts Thread Library. EAThread implements a unified cross-platform interface for multithreaded programming on various platforms.",
   "homepage": "https://github.com/electronicarts/EAThread",
   "supports": "!uwp & x64",
   "dependencies": [
     "eabase",
-    "eastl"
+    "eastl",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ]
 }
diff --git a/external_imported/vcpkg/ports/ebml/include-limits.patch b/external_imported/vcpkg/ports/ebml/include-limits.patch
deleted file mode 100644
index 3d548edd3..000000000
--- a/external_imported/vcpkg/ports/ebml/include-limits.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/src/EbmlString.cpp b/src/EbmlString.cpp
-index 27e55fd..4c05fcf 100644
---- a/src/EbmlString.cpp
-+++ b/src/EbmlString.cpp
-@@ -34,6 +34,7 @@
-   \author Steve Lhomme     <robux4 @ users.sf.net>
- */
- #include <cassert>
-+#include <limits>
- 
- #include "ebml/EbmlString.h"
- 
-diff --git a/src/EbmlUnicodeString.cpp b/src/EbmlUnicodeString.cpp
-index 496a16a..99fc073 100644
---- a/src/EbmlUnicodeString.cpp
-+++ b/src/EbmlUnicodeString.cpp
-@@ -36,6 +36,7 @@
- */
- 
- #include <cassert>
-+#include <limits>
- 
- #include "ebml/EbmlUnicodeString.h"
- 
diff --git a/external_imported/vcpkg/ports/ebml/portfile.cmake b/external_imported/vcpkg/ports/ebml/portfile.cmake
index e92897923..41588f5a8 100644
--- a/external_imported/vcpkg/ports/ebml/portfile.cmake
+++ b/external_imported/vcpkg/ports/ebml/portfile.cmake
@@ -1,15 +1,9 @@
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-    message(FATAL_ERROR "${PORT} does not currently support UWP")
-endif()
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Matroska-Org/libebml
-    REF release-1.4.2
-    SHA512 2A03CA1D82A41EE05CFE4DD2726CC79295FA06A4D8ECEB93FE8F41BDFF09F04897B434B49DD1F496E1C014289B14C3F3416EAB4C8B1E745652FF1AB4A620BF83
+    REF release-1.4.4
+    SHA512 4a7926f56de211b8431105e37045a13d5e0576151326c87bc3168821c10342acee2aa6447438296f1d56893b3ebbc60851cb0c310f5561127612f0cd2477743f
     HEAD_REF master
-    PATCHES 
-      include-limits.patch
 )
 
 vcpkg_cmake_configure(
@@ -25,3 +19,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 # Handle copyright
 file(INSTALL "${SOURCE_PATH}/LICENSE.LGPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+vcpkg_copy_pdbs()
diff --git a/external_imported/vcpkg/ports/ebml/vcpkg.json b/external_imported/vcpkg/ports/ebml/vcpkg.json
index 18e817f26..71cde02a4 100644
--- a/external_imported/vcpkg/ports/ebml/vcpkg.json
+++ b/external_imported/vcpkg/ports/ebml/vcpkg.json
@@ -1,10 +1,9 @@
 {
   "name": "ebml",
-  "version": "1.4.2",
+  "version": "1.4.4",
   "port-version": 1,
   "description": "A C++ library to parse EBML files",
   "homepage": "https://github.com/Matroska-Org/libebml",
-  "supports": "!uwp",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/ecal/0001-disable-app-plugins.patch b/external_imported/vcpkg/ports/ecal/0001-disable-app-plugins.patch
new file mode 100644
index 000000000..e103244c2
--- /dev/null
+++ b/external_imported/vcpkg/ports/ecal/0001-disable-app-plugins.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4ea1fb066..351fe6c3f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -351,8 +351,10 @@ endif(HAS_QT5)
+ # --------------------------------------------------------
+ # ecal rec addon sdk
+ # --------------------------------------------------------
++if (BUILD_APPS)
+ add_subdirectory(app/rec/rec_addon_core)
+ add_subdirectory(app/rec/rec_addon_dummy)
++endif()
+ 
+ # --------------------------------------------------------
+ # ecal time
diff --git a/external_imported/vcpkg/ports/ecal/0002-fix-build.patch b/external_imported/vcpkg/ports/ecal/0002-fix-build.patch
new file mode 100644
index 000000000..9cc2d9f64
--- /dev/null
+++ b/external_imported/vcpkg/ports/ecal/0002-fix-build.patch
@@ -0,0 +1,166 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 351fe6c3f..64d5bb384 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -27,7 +27,8 @@ endif (POLICY CMP0077)
+ 
+ list(APPEND CMAKE_MODULE_PATH
+   ${CMAKE_CURRENT_SOURCE_DIR}/cmake
+-  ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules)
++  # Removed project specific Module overrides
++)
+ 
+ project(eCAL)
+ set(ECAL_PROJECT_ROOT "${CMAKE_CURRENT_LIST_DIR}")
+@@ -212,11 +213,13 @@ foreach (dep IN LISTS possible_subprojects)
+   endif ()
+ endforeach()
+ 
++if(NOT DISABLE_FIND_PACKAGE_OVERLOAD)
+ macro(find_package)
+   if(NOT "${ARGV0}" IN_LIST as_subproject)
+     _find_package(${ARGV})
+   endif()
+ endmacro()
++endif()
+ 
+ # if a package does need to be build, include the cmake file with build instructions
+ foreach (dep IN LISTS possible_subprojects)
+@@ -232,7 +235,6 @@ if(MSVC)
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_OLD}")
+ endif()
+ 
+-find_package(CMakeFunctions REQUIRED)
+ 
+ git_revision_information(DEFAULT ${ECAL_BUILD_VERSION})
+ set(eCAL_VERSION_MAJOR  ${GIT_REVISION_MAJOR})
+@@ -330,7 +332,9 @@ add_subdirectory(ecal/core)
+ # custom libs
+ # --------------------------------------------------------
+ add_subdirectory(lib/ThreadingUtils)
+-add_subdirectory(lib/CustomTclap)
++# Removed due to only being used by the apps, which are disabled, and for
++# publicly linking tclap::tclap which doesn't exist outside of eCAL
++# add_subdirectory(lib/CustomTclap)
+ add_subdirectory(lib/ecal_utils)
+ 
+ if(HAS_QT5)
+@@ -549,7 +553,9 @@ endif()
+ # --------------------------------------------------------
+ # create package
+ # --------------------------------------------------------
++if(CPACK_PACK_WITH_INNOSETUP)
+ include(cpack/cpack_variables.cmake)
++endif()
+ 
+ message(STATUS "Build Options:")
+ message(STATUS "--------------------------------------------------------------------------------")
+diff --git a/contrib/ecalhdf5/CMakeLists.txt b/contrib/ecalhdf5/CMakeLists.txt
+index 080c40e28..c167bacd4 100644
+--- a/contrib/ecalhdf5/CMakeLists.txt
++++ b/contrib/ecalhdf5/CMakeLists.txt
+@@ -58,7 +58,12 @@ set(ecalhdf5_header_base
+     include/ecalhdf5/eh5_types.h   
+ )
+ 
++if (WIN32)
++# This library, ecal::hdf5 does not export any symbols on Windows. Must be static
++ecal_add_static_library(${PROJECT_NAME} ${ecalhdf5_src} ${ecalhdf5_header_base})
++else()
+ ecal_add_library(${PROJECT_NAME} ${ecalhdf5_src} ${ecalhdf5_header_base})
++endif()
+ add_library(eCAL::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
+ 
+ target_include_directories(${PROJECT_NAME}
+diff --git a/contrib/ecalproto/CMakeLists.txt b/contrib/ecalproto/CMakeLists.txt
+index 04f1a1b9a..58df32705 100644
+--- a/contrib/ecalproto/CMakeLists.txt
++++ b/contrib/ecalproto/CMakeLists.txt
+@@ -37,7 +37,12 @@ set(ecal_protobuf_header
+     include/ecal/protobuf/ecal_proto_visitor.h
+ )
+ 
++if (WIN32)
++# This library, ecal::proto does not export any symbols on Windows. Must be static
++ecal_add_static_library(${PROJECT_NAME} ${ecal_protobuf_src} ${ecal_protobuf_header})
++else()
+ ecal_add_library(${PROJECT_NAME} ${ecal_protobuf_src} ${ecal_protobuf_header})
++endif()
+ add_library(eCAL::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
+ target_include_directories(${PROJECT_NAME} PUBLIC 
+   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+diff --git a/ecal/core/CMakeLists.txt b/ecal/core/CMakeLists.txt
+index 5c2b6e33d..3c7d57189 100644
+--- a/ecal/core/CMakeLists.txt
++++ b/ecal/core/CMakeLists.txt
+@@ -20,8 +20,6 @@ project(core VERSION ${eCAL_VERSION_STRING})
+ 
+ find_package(Threads      REQUIRED)
+ find_package(asio         REQUIRED)
+-find_package(tclap        REQUIRED)
+-find_package(simpleini    REQUIRED)
+ find_package(tcp_pubsub   REQUIRED)
+ if (ECAL_NPCAP_SUPPORT)
+   find_package(udpcap REQUIRED)
+@@ -492,14 +490,20 @@ target_link_libraries(${PROJECT_NAME}
+     $<$<BOOL:${WIN32}>:wsock32>
+     $<$<BOOL:${QNXNTO}>:socket>
+     asio::asio
+-    tclap::tclap
+-    simpleini::simpleini
+     eCAL::core_pb
+     Threads::Threads
+     eCAL::ecal-utils
+     tcp_pubsub::tcp_pubsub
+ )
+ 
++# tclap is header only and only used for implementation
++find_path(TCLAP_INCLUDE_DIRS "tclap/Arg.h")
++target_include_directories(${PROJECT_NAME}  PRIVATE ${TCLAP_INCLUDE_DIRS})
++
++# simpleini is header only and only used for implementation
++find_path(SIMPLEINI_INCLUDE_DIRS "ConvertUTF.c")
++target_include_directories(${PROJECT_NAME} PRIVATE ${SIMPLEINI_INCLUDE_DIRS})
++
+ set_property(TARGET ${PROJECT_NAME}   PROPERTY FOLDER ecal/core)
+ set_property(TARGET ${PROJECT_NAME}_c PROPERTY FOLDER ecal/core)
+ 
+diff --git a/thirdparty/cmake_functions/CMakeLists.txt b/thirdparty/cmake_functions/CMakeLists.txt
+index b3e93261a..3ba185a97 100644
+--- a/thirdparty/cmake_functions/CMakeLists.txt
++++ b/thirdparty/cmake_functions/CMakeLists.txt
+@@ -40,4 +40,6 @@ foreach (f ${file_list})
+   install( FILES ${f} DESTINATION "${cmake_functions_install_cmake_dir}/${dir}" )
+ endforeach()
+ 
++if(CPACK_PACK_WITH_INNOSETUP)
+ include(cmake/cpack_variables.cmake)
++endif()
+diff --git a/thirdparty/cmake_functions/cmake_functions.cmake b/thirdparty/cmake_functions/cmake_functions.cmake
+index 0c3659e5c..127eb14e6 100644
+--- a/thirdparty/cmake_functions/cmake_functions.cmake
++++ b/thirdparty/cmake_functions/cmake_functions.cmake
+@@ -5,23 +5,12 @@ set (file_list_include
+   target_definitions/targets_protobuf.cmake
+ )
+ 
+-if(WIN32)
+-  list(APPEND file_list_include
+-    qt/qt_msvc_path.cmake
+-    qt/qt_windeployqt.cmake
+-  )
+-endif()
+ 
+ set(file_list_no_include
+   protoc_functions/protoc_generate_cpp.cmake
+   protoc_functions/protoc_generate_python.cmake
+ )
+ 
+-if(WIN32)
+-  list(APPEND file_list_no_include
+-    qt/qt_windeployqt_threadsafe_cmake.bat.in
+-  )
+-endif()
+ 
+ # Set list of all files to be installed by CMake Script.
+ set(file_list
diff --git a/external_imported/vcpkg/ports/ecal/0003-fix-dependencies.patch b/external_imported/vcpkg/ports/ecal/0003-fix-dependencies.patch
new file mode 100644
index 000000000..275977f88
--- /dev/null
+++ b/external_imported/vcpkg/ports/ecal/0003-fix-dependencies.patch
@@ -0,0 +1,20 @@
+diff --git a/contrib/ecalhdf5/CMakeLists.txt b/contrib/ecalhdf5/CMakeLists.txt
+index c167bacd4..45e754340 100644
+--- a/contrib/ecalhdf5/CMakeLists.txt
++++ b/contrib/ecalhdf5/CMakeLists.txt
+@@ -18,9 +18,14 @@
+ 
+ project(hdf5 LANGUAGES C CXX)
+ 
+-if(NOT CMAKE_CROSSCOMPILING)
++if(1)
+   find_package(HDF5 COMPONENTS C REQUIRED)
+   find_package(Threads REQUIRED)
++  if (TARGET hdf5::hdf5-shared)
++    set(ECAL_LINK_HDF5_SHARED 1)
++  else()
++    set(ECAL_LINK_HDF5_SHARED 0)
++  endif()
+ else()
+   find_library(hdf5_path NAMES hdf5 REQUIRED PATH_SUFFIXES hdf5/serial)
+   find_path(hdf5_include NAMES hdf5.h PATH_SUFFIXES hdf5/serial REQUIRED)  
diff --git a/external_imported/vcpkg/ports/ecal/0004-install-cmake-files-to-share.patch b/external_imported/vcpkg/ports/ecal/0004-install-cmake-files-to-share.patch
new file mode 100644
index 000000000..030b55b38
--- /dev/null
+++ b/external_imported/vcpkg/ports/ecal/0004-install-cmake-files-to-share.patch
@@ -0,0 +1,32 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 64d5bb384..1f08d4bab 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -274,7 +274,7 @@ set(eCAL_install_app_dir           ${CMAKE_INSTALL_BINDIR})
+ set(eCAL_install_archive_dir       ${CMAKE_INSTALL_LIBDIR})
+ set(eCAL_install_archive_dyn_dir   ${CMAKE_INSTALL_LIBDIR})
+ set(eCAL_install_bin_dir           ${CMAKE_INSTALL_BINDIR})
+-set(eCAL_install_cmake_dir         ${CMAKE_INSTALL_LIBDIR}/cmake/eCAL)
++set(eCAL_install_cmake_dir         share/eCAL)
+ set(eCAL_install_config_dir        ${CMAKE_INSTALL_SYSCONFDIR}/ecal)
+ set(eCAL_install_doc_dir           ${CMAKE_INSTALL_DOCDIR})
+ set(eCAL_install_include_dir       ${CMAKE_INSTALL_INCLUDEDIR})
+diff --git a/thirdparty/cmake_functions/CMakeLists.txt b/thirdparty/cmake_functions/CMakeLists.txt
+index 3ba185a97..aa9e8a736 100644
+--- a/thirdparty/cmake_functions/CMakeLists.txt
++++ b/thirdparty/cmake_functions/CMakeLists.txt
+@@ -4,12 +4,8 @@ include(cmake_functions.cmake)
+ 
+ project(CMakeFunctions VERSION 0.4.1)
+ 
+-if (MSVC)
+-# Variable definitions
+-set(cmake_functions_install_cmake_dir   cmake)
+-else (MSVC)
+-set(cmake_functions_install_cmake_dir   lib/cmake/${PROJECT_NAME}-${PROJECT_VERSION})
+-endif (MSVC)
++set(cmake_functions_install_cmake_dir "share/${PROJECT_NAME}")
++
+ set(cmake_functions_config              ${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}Config.cmake)
+ set(cmake_functions_config_version      ${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}ConfigVersion.cmake)
+ 
diff --git a/external_imported/vcpkg/ports/ecal/0005-remove-install-prefix-macro-value.patch b/external_imported/vcpkg/ports/ecal/0005-remove-install-prefix-macro-value.patch
new file mode 100644
index 000000000..5fde0a9ee
--- /dev/null
+++ b/external_imported/vcpkg/ports/ecal/0005-remove-install-prefix-macro-value.patch
@@ -0,0 +1,12 @@
+diff --git a/ecal/core/src/ecal_defs.h.in b/ecal/core/src/ecal_defs.h.in
+index c792a26d1..e5119582b 100644
+--- a/ecal/core/src/ecal_defs.h.in
++++ b/ecal/core/src/ecal_defs.h.in
+@@ -39,6 +39,6 @@
+ #define ECAL_INSTALL_LIB_DIR     "@eCAL_install_lib_dir@"
+ #define ECAL_INSTALL_CONFIG_DIR  "@eCAL_install_config_dir@"
+ #define ECAL_INSTALL_INCLUDE_DIR "@eCAL_install_include_dir@"
+-#define ECAL_INSTALL_PREFIX      "@CMAKE_INSTALL_PREFIX@"
++#define ECAL_INSTALL_PREFIX      ""
+ 
+ #endif // ecal_defs_h_included
diff --git a/external_imported/vcpkg/ports/ecal/0006-use-find_dependency-in-cmake-config.patch b/external_imported/vcpkg/ports/ecal/0006-use-find_dependency-in-cmake-config.patch
new file mode 100644
index 000000000..e38039b86
--- /dev/null
+++ b/external_imported/vcpkg/ports/ecal/0006-use-find_dependency-in-cmake-config.patch
@@ -0,0 +1,36 @@
+diff --git a/cmake/eCALConfig.cmake.in b/cmake/eCALConfig.cmake.in
+index 704da4de8..e8cfb765c 100644
+--- a/cmake/eCALConfig.cmake.in
++++ b/cmake/eCALConfig.cmake.in
+@@ -25,12 +25,21 @@ set(eCAL_VERSION_MAJOR  @eCAL_VERSION_MAJOR@)
+ set(eCAL_VERSION_MINOR  @eCAL_VERSION_MINOR@)
+ set(eCAL_VERSION_PATCH  @eCAL_VERSION_PATCH@)
+ set(eCAL_VERSION_STRING @eCAL_VERSION_STRING@)
++set(eCAL_IS_SHARED @BUILD_SHARED_LIBS@)
+ 
+ # eCAL is provided only with Release and Debug Version, thus map the other configs to Release build.
+ set(CMAKE_MAP_IMPORTED_CONFIG_MINSIZEREL Release "")
+ set(CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO Release "")
+ 
+-find_package(Protobuf REQUIRED)
++include(CMakeFindDependencyMacro)
++find_dependency(Protobuf CONFIG)
++
++# Ensure transitive dependencies are present for static builds
++if(NOT eCAL_IS_SHARED)
++  find_dependency(asio)
++  find_dependency(tcp_pubsub)
++  find_dependency(HDF5)
++endif()
+ 
+ include("@PACKAGE_eCAL_install_cmake_dir@/helper_functions/ecal_add_functions.cmake")
+ include("@PACKAGE_eCAL_install_cmake_dir@/helper_functions/ecal_helper_functions.cmake")
+@@ -44,6 +53,6 @@ include("@PACKAGE_eCAL_install_cmake_dir@/eCALTargets.cmake")
+ #  list(APPEND CMAKE_PREFIX_PATH "${PACKAGE_PREFIX_DIR}/../../../../cmake")
+ #endif()
+ 
+-find_package(CMakeFunctions REQUIRED)
++find_dependency(CMakeFunctions CONFIG)
+ 
+-find_package(Threads REQUIRED)
++find_dependency(Threads)
diff --git a/external_imported/vcpkg/ports/ecal/0007-allow-static-build-of-core.patch b/external_imported/vcpkg/ports/ecal/0007-allow-static-build-of-core.patch
new file mode 100644
index 000000000..18cb2d31b
--- /dev/null
+++ b/external_imported/vcpkg/ports/ecal/0007-allow-static-build-of-core.patch
@@ -0,0 +1,74 @@
+diff --git a/ecal/core/CMakeLists.txt b/ecal/core/CMakeLists.txt
+index 3c7d57189..775f8a7c8 100644
+--- a/ecal/core/CMakeLists.txt
++++ b/ecal/core/CMakeLists.txt
+@@ -397,7 +397,7 @@ set(ecal_header_base
+     ${ecal_header_msg}
+ )
+ 
+-ecal_add_ecal_shared_library(${PROJECT_NAME} 
++ecal_add_library(${PROJECT_NAME} 
+     ${ecal_custom_tclap_cpp_src}
+     ${ecal_io_cpp_src} 
+     ${ecal_io_mem_cpp_src} 
+@@ -433,7 +433,7 @@ if(UNIX)
+   set_source_files_properties(src/convert_utf.cpp PROPERTIES COMPILE_FLAGS -Wno-implicit-fallthrough)
+ endif()
+ 
+-ecal_add_ecal_shared_library(${PROJECT_NAME}_c ${ecal_c_src} ${ecal_c_win_src})
++ecal_add_library(${PROJECT_NAME}_c ${ecal_c_src} ${ecal_c_win_src})
+ 
+ add_library(eCAL::${PROJECT_NAME}   ALIAS ${PROJECT_NAME})
+ add_library(eCAL::${PROJECT_NAME}_c ALIAS ${PROJECT_NAME}_c)
+@@ -457,6 +457,11 @@ target_compile_definitions(${PROJECT_NAME}
+     $<$<BOOL:${ECAL_HAS_ROBUST_MUTEX}>:ECAL_HAS_ROBUST_MUTEX>
+     $<$<BOOL:${ECAL_USE_CLOCKLOCK_MUTEX}>:ECAL_USE_CLOCKLOCK_MUTEX>)
+ 
++if(BUILD_SHARED_LIBS)
++  target_compile_definitions(${PROJECT_NAME}_c PUBLIC eCAL_SHARED_LIB)
++  target_compile_definitions(${PROJECT_NAME}   PUBLIC eCAL_SHARED_LIB)
++endif()
++
+ if(ECAL_NPCAP_SUPPORT)
+   target_compile_definitions(${PROJECT_NAME}
+     PRIVATE ECAL_NPCAP_SUPPORT)
+@@ -507,8 +512,8 @@ target_include_directories(${PROJECT_NAME} PRIVATE ${SIMPLEINI_INCLUDE_DIRS})
+ set_property(TARGET ${PROJECT_NAME}   PROPERTY FOLDER ecal/core)
+ set_property(TARGET ${PROJECT_NAME}_c PROPERTY FOLDER ecal/core)
+ 
+-ecal_install_ecal_shared_library(${PROJECT_NAME}_c)
+-ecal_install_ecal_shared_library(${PROJECT_NAME})
++ecal_install_ecal_library(${PROJECT_NAME}_c)
++ecal_install_ecal_library(${PROJECT_NAME})
+ 
+ install(DIRECTORY
+    "include/" DESTINATION "${INSTALL_INCLUDE_DIR}" COMPONENT sdk
+diff --git a/ecal/core/include/ecal/ecal_os.h b/ecal/core/include/ecal/ecal_os.h
+index a962036f2..5d466cc86 100644
+--- a/ecal/core/include/ecal/ecal_os.h
++++ b/ecal/core/include/ecal/ecal_os.h
+@@ -47,7 +47,7 @@
+ #define ECAL_OS_FREEBSD
+ #endif
+ 
+-#ifdef _MSC_VER
++#if defined(_MSC_VER) && defined(eCAL_SHARED_LIB)
+   #ifdef eCAL_EXPORTS
+     #define ECALC_API __declspec(dllexport)
+   #else /* eCAL_EXPORTS */
+@@ -64,11 +64,15 @@
+ #endif
+ 
+ #ifdef _MSC_VER
++  #ifdef eCAL_SHARED_LIB
+   #ifdef eCAL_EXPORTS
+     #define ECALC_API_DEPRECATED __declspec(dllexport deprecated)
+   #else /* eCAL_EXPORTS */
+     #define ECALC_API_DEPRECATED __declspec(dllimport deprecated)
+   #endif /* eCAL_EXPORTS */
++  #else
++    #define ECALC_API_DEPRECATED  
++  #endif
+ #elif defined(__GNUC__) || defined(__clang__)
+   #define ECALC_API_DEPRECATED __attribute__((deprecated))
+ #else
diff --git a/external_imported/vcpkg/ports/ecal/portfile.cmake b/external_imported/vcpkg/ports/ecal/portfile.cmake
new file mode 100644
index 000000000..c8600cdac
--- /dev/null
+++ b/external_imported/vcpkg/ports/ecal/portfile.cmake
@@ -0,0 +1,78 @@
+if (VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO eclipse-ecal/ecal
+    REF v${VERSION}
+    SHA512 e9bc6c579a5331bdecc0384fb1cbac6bf63cb3910e26a4004d48c3a25528fed66413a2c80f4d866d3958d3800579c57a7298e61fca20adf9b24f5daa2e07ed3d
+    HEAD_REF master
+    PATCHES
+        0001-disable-app-plugins.patch
+        0002-fix-build.patch
+        0003-fix-dependencies.patch
+        0004-install-cmake-files-to-share.patch
+        0005-remove-install-prefix-macro-value.patch
+        0006-use-find_dependency-in-cmake-config.patch
+        0007-allow-static-build-of-core.patch
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DHAS_HDF5=ON
+        -DHAS_QT5=OFF
+        -DHAS_CURL=OFF
+        -DHAS_CAPNPROTO=OFF
+        -DHAS_FTXUI=OFF
+        -DBUILD_DOCS=OFF
+        -DBUILD_APPS=OFF
+        -DBUILD_SAMPLES=OFF
+        -DBUILD_TIME=OFF
+        -DBUILD_PY_BINDING=OFF
+        -DBUILD_CSHARP_BINDING=OFF
+        -DBUILD_ECAL_TESTS=OFF
+        -DECAL_INCLUDE_PY_SAMPLES=OFF
+        -DECAL_INSTALL_SAMPLE_SOURCES=OFF
+        -DECAL_JOIN_MULTICAST_TWICE=OFF
+        -DECAL_NPCAP_SUPPORT=OFF
+        -DECAL_THIRDPARTY_BUILD_CMAKE_FUNCTIONS=ON
+        -DECAL_THIRDPARTY_BUILD_SPDLOG=OFF
+        -DECAL_THIRDPARTY_BUILD_TINYXML2=OFF
+        -DECAL_THIRDPARTY_BUILD_FINEFTP=OFF
+        -DECAL_THIRDPARTY_BUILD_TERMCOLOR=OFF
+        -DECAL_THIRDPARTY_BUILD_TCP_PUBSUB=OFF
+        -DECAL_THIRDPARTY_BUILD_RECYCLE=OFF
+        -DECAL_THIRDPARTY_BUILD_FTXUI=OFF
+        -DECAL_THIRDPARTY_BUILD_GTEST=OFF
+        -DECAL_THIRDPARTY_BUILD_UDPCAP=OFF
+        -DECAL_THIRDPARTY_BUILD_PROTOBUF=OFF
+        -DECAL_THIRDPARTY_BUILD_YAML-CPP=OFF
+        -DECAL_THIRDPARTY_BUILD_CURL=OFF
+        -DECAL_THIRDPARTY_BUILD_HDF5=OFF
+        -DCPACK_PACK_WITH_INNOSETUP=OFF
+        -DDISABLE_FIND_PACKAGE_OVERLOAD=ON # From patch, disable find_package macro
+        -DECAL_BUILD_VERSION="${VERSION}"
+)
+
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+
+vcpkg_cmake_config_fixup(PACKAGE_NAME eCAL           CONFIG_PATH share/eCAL)
+vcpkg_cmake_config_fixup(PACKAGE_NAME CMakeFunctions CONFIG_PATH share/CMakeFunctions)
+
+# Remove extra debug files
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+# global ini files not strictly required
+if (VCPKG_TARGET_IS_WINDOWS)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/cfg" "${CURRENT_PACKAGES_DIR}/debug/cfg")
+else()
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/etc" "${CURRENT_PACKAGES_DIR}/debug/etc")
+endif()
+
+# Install copyright and usage
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/ecal/usage b/external_imported/vcpkg/ports/ecal/usage
new file mode 100644
index 000000000..4d8af57a4
--- /dev/null
+++ b/external_imported/vcpkg/ports/ecal/usage
@@ -0,0 +1,4 @@
+The package eCAL provides CMake targets:
+
+    find_package(eCAL CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE eCAL::core eCAL::core_c eCAL::core_pb eCAL::hdf5)
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/ecal/vcpkg.json b/external_imported/vcpkg/ports/ecal/vcpkg.json
new file mode 100644
index 000000000..35c836188
--- /dev/null
+++ b/external_imported/vcpkg/ports/ecal/vcpkg.json
@@ -0,0 +1,30 @@
+{
+  "name": "ecal",
+  "version-semver": "5.12.0",
+  "description": "eCAL - enhanced Communication Abstraction Layer",
+  "homepage": "https://eclipse-ecal.github.io/ecal/",
+  "license": "Apache-2.0",
+  "supports": "!emscripten",
+  "dependencies": [
+    "asio",
+    {
+      "name": "hdf5",
+      "default-features": false
+    },
+    {
+      "name": "protobuf",
+      "default-features": false
+    },
+    "simpleini",
+    "tclap",
+    "tcp-pubsub",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/ecos/portfile.cmake b/external_imported/vcpkg/ports/ecos/portfile.cmake
index 213d3266f..226af8872 100644
--- a/external_imported/vcpkg/ports/ecos/portfile.cmake
+++ b/external_imported/vcpkg/ports/ecos/portfile.cmake
@@ -3,21 +3,20 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO embotech/ecos
-    REF v2.0.8
-    SHA512 c1adb188d6b2c400f817de15272472adfd013e2a174f49ec0bb2f7f889f26ba2b7ea165d9bedac3031bd2da7a770f2a285ad825d5b22ccc6cf43c756a20f844f
+    REF "v${VERSION}"
+    SHA512 b79434c194b5681f323b275eff0126f56beba792d270bd1773307cdf33297bee550b13bd2f96f5923dc4b8e200216d897ea01978f65da69dd81f1a669f8fd6e2
     HEAD_REF develop
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/ecos RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-vcpkg_fixup_cmake_targets(CONFIG_PATH "share/ecos")
\ No newline at end of file
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+vcpkg_cmake_config_fixup(CONFIG_PATH "share/ecos")
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/ecos/vcpkg.json b/external_imported/vcpkg/ports/ecos/vcpkg.json
index a6e6dfbe0..4396dabbf 100644
--- a/external_imported/vcpkg/ports/ecos/vcpkg.json
+++ b/external_imported/vcpkg/ports/ecos/vcpkg.json
@@ -1,6 +1,15 @@
 {
   "name": "ecos",
-  "version-string": "2.0.8",
-  "port-version": 1,
-  "description": "A lightweight conic solver for second-order cone programming."
+  "version": "2.0.10",
+  "description": "A lightweight conic solver for second-order cone programming.",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/ecsutil/portfile.cmake b/external_imported/vcpkg/ports/ecsutil/portfile.cmake
index 98f5c2e13..026992cb3 100644
--- a/external_imported/vcpkg/ports/ecsutil/portfile.cmake
+++ b/external_imported/vcpkg/ports/ecsutil/portfile.cmake
@@ -1,7 +1,3 @@
-if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
-    set(PLATFORM x86)
-endif()
-
 if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     set(ECSUtil_CONFIGURATION_RELEASE Release)
     set(ECSUtil_CONFIGURATION_DEBUG Debug)
@@ -23,23 +19,23 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-vcpkg_install_msbuild(
-    SOURCE_PATH ${SOURCE_PATH}
+vcpkg_msbuild_install(
+    SOURCE_PATH "${SOURCE_PATH}"
     PROJECT_SUBPATH ECSUtil.sln
-    PLATFORM ${PLATFORM}
-    LICENSE_SUBPATH license.txt
+    PLATFORM "${TRIPLET_SYSTEM_ARCH}" # This means x86 as platform config instead of Win32
     TARGET ECSUtil
-    RELEASE_CONFIGURATION ${ECSUtil_CONFIGURATION_RELEASE}
-    DEBUG_CONFIGURATION ${ECSUtil_CONFIGURATION_DEBUG}
+    RELEASE_CONFIGURATION "${ECSUtil_CONFIGURATION_RELEASE}"
+    DEBUG_CONFIGURATION "${ECSUtil_CONFIGURATION_DEBUG}"
 )
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/license.txt")
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
 
-file(COPY ${SOURCE_PATH}/ECSUtil DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.h)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/ECSUtil/res ${CURRENT_PACKAGES_DIR}/tools)
-file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/NatvisAddIn.dll ${CURRENT_PACKAGES_DIR}/debug/bin/NatvisAddIn.dll)
+file(COPY "${SOURCE_PATH}/ECSUtil" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN *.h)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/ECSUtil/res" "${CURRENT_PACKAGES_DIR}/tools")
+file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/NatvisAddIn.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/NatvisAddIn.dll")
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
diff --git a/external_imported/vcpkg/ports/ecsutil/vcpkg.json b/external_imported/vcpkg/ports/ecsutil/vcpkg.json
index 9439868dd..7fbc8bb3b 100644
--- a/external_imported/vcpkg/ports/ecsutil/vcpkg.json
+++ b/external_imported/vcpkg/ports/ecsutil/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ecsutil",
   "version": "1.0.7.15",
-  "port-version": 3,
+  "port-version": 5,
   "description": "Native Windows SDK for accessing ECS via the S3 HTTP protocol.",
   "homepage": "https://github.com/EMCECS/ecs-object-client-windows-cpp",
   "supports": "windows & (x64 | x86) & !uwp",
@@ -9,6 +9,11 @@
     {
       "name": "atlmfc",
       "platform": "windows"
+    },
+    {
+      "name": "vcpkg-msbuild",
+      "host": true,
+      "platform": "windows"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/ed25519/CMakeLists.txt b/external_imported/vcpkg/ports/ed25519/CMakeLists.txt
new file mode 100644
index 000000000..c5b631346
--- /dev/null
+++ b/external_imported/vcpkg/ports/ed25519/CMakeLists.txt
@@ -0,0 +1,64 @@
+cmake_minimum_required(VERSION 3.19)
+project(ed25519 LANGUAGES C)
+set(PROJECT_VERSION "${VERSION}")
+
+if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/ed25519.h" "#elif defined(ED25519_DLL)" "#elif 1")
+endif()
+set(Header_Files "src/ed25519.h"
+        "src/fe.h"
+        "src/fixedint.h"
+        "src/ge.h"
+        "src/precomp_data.h"
+        "src/sc.h"
+        "src/sha512.h")
+set(Source_Files "src/add_scalar.c"
+        "src/fe.c"
+        "src/ge.c"
+        "src/key_exchange.c"
+        "src/keypair.c"
+        "src/sc.c"
+        "src/seed.c"
+        "src/sha512.c"
+        "src/sign.c"
+        "src/verify.c")
+
+add_library("${PROJECT_NAME}" "${Header_Files}" "${Source_Files}")
+
+include(GNUInstallDirs)
+target_include_directories(
+  "${PROJECT_NAME}"
+  PUBLIC
+  "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>"
+  "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
+)
+target_compile_features("${PROJECT_NAME}" PRIVATE c_std_90)
+set_target_properties("${PROJECT_NAME}" PROPERTIES C_VISIBILITY_PRESET hidden
+                      PUBLIC_HEADER "src/ed25519.h")
+
+install(
+  TARGETS                   "${PROJECT_NAME}"
+  EXPORT                    "unofficial-${PROJECT_NAME}Config"
+  RUNTIME       DESTINATION "${CMAKE_INSTALL_BINDIR}"
+  ARCHIVE       DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+  LIBRARY       DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+  PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+)
+
+include(CMakePackageConfigHelpers)
+set(VERSION_FILE_PATH "${CMAKE_CURRENT_BINARY_DIR}/unofficial-${PROJECT_NAME}ConfigVersion.cmake")
+write_basic_package_version_file(
+        "${VERSION_FILE_PATH}"
+        VERSION       "${PROJECT_VERSION}"
+        COMPATIBILITY SameMajorVersion
+)
+install(FILES "${VERSION_FILE_PATH}" DESTINATION "share/unofficial-${PROJECT_NAME}")
+install(FILES "src/ed25519.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+
+install(
+  EXPORT      "unofficial-${PROJECT_NAME}Config"
+  FILE        "unofficial-${PROJECT_NAME}Config.cmake"
+  NAMESPACE   "unofficial::${PROJECT_NAME}::"
+  DESTINATION "share/unofficial-${PROJECT_NAME}")
+
+export(PACKAGE "${PROJECT_NAME}")
diff --git a/external_imported/vcpkg/ports/ed25519/portfile.cmake b/external_imported/vcpkg/ports/ed25519/portfile.cmake
new file mode 100644
index 000000000..1156f9305
--- /dev/null
+++ b/external_imported/vcpkg/ports/ed25519/portfile.cmake
@@ -0,0 +1,30 @@
+if(WIN32)
+    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO            orlp/${PORT}
+    REF             b1f19fab4aebe607805620d25a5e42566ce46a0e
+    SHA512          fcbeba58591543304dd93ae7c1b62a720d89c80c4c07c323eabb6e1f41b93562660181973bda345976e5361e925f243ba9abaec19fc8a05235011957367c6e7e
+    HEAD_REF        master
+)
+
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+     DESTINATION "${SOURCE_PATH}")
+
+vcpkg_cmake_configure(
+        SOURCE_PATH "${SOURCE_PATH}"
+        OPTIONS
+        "-DVERSION=${VERSION}"
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT})
+
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "Zlib")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage"
+     DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share"
+                    "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/external_imported/vcpkg/ports/ed25519/usage b/external_imported/vcpkg/ports/ed25519/usage
new file mode 100644
index 000000000..5d26eedb2
--- /dev/null
+++ b/external_imported/vcpkg/ports/ed25519/usage
@@ -0,0 +1,3 @@
+ed25519 provides CMake targets:
+    find_package(unofficial-ed25519 CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE unofficial::ed25519::ed25519)
diff --git a/external_imported/vcpkg/ports/ed25519/vcpkg.json b/external_imported/vcpkg/ports/ed25519/vcpkg.json
new file mode 100644
index 000000000..d547802a0
--- /dev/null
+++ b/external_imported/vcpkg/ports/ed25519/vcpkg.json
@@ -0,0 +1,17 @@
+{
+  "name": "ed25519",
+  "version-date": "2017-02-10",
+  "description": "Portable C implementation of Ed25519, a high-speed high-security public-key signature system.",
+  "homepage": "https://github.com/orlp/ed25519",
+  "license": "Zlib",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/edflib/CMakeLists.txt b/external_imported/vcpkg/ports/edflib/CMakeLists.txt
index 6a60fa510..8358e27a9 100644
--- a/external_imported/vcpkg/ports/edflib/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/edflib/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.5)
 
-project(EDFlib VERSION 1.21 LANGUAGES C)
+project(EDFlib LANGUAGES C)
 
 option(BUILD_TOOLS "Build EDFlib tools." OFF)
 
@@ -10,6 +10,15 @@ set(sources edflib.h edflib.c)
 
 add_library(EDFlib ${sources})
 
+if(BUILD_SHARED_LIBS)
+    target_compile_definitions(EDFlib
+        PUBLIC
+            EDFLIB_SO_DLL
+        PRIVATE
+            $<BUILD_INTERFACE:EDFLIB_BUILD>
+    )
+endif()
+
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
     target_compile_definitions(EDFlib PRIVATE _LARGEFILE64_SOURCE _LARGEFILE_SOURCE)
     target_compile_options(EDFlib PRIVATE -Wall -Wextra -Wshadow -Wformat-nonliteral -Wformat-security)
@@ -21,6 +30,8 @@ install(TARGETS EDFlib
     EXPORT EDFlibTargets
     PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
     ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+    LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
     INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
 )
 
diff --git a/external_imported/vcpkg/ports/edflib/portfile.cmake b/external_imported/vcpkg/ports/edflib/portfile.cmake
index 2987b5919..38e8db289 100644
--- a/external_imported/vcpkg/ports/edflib/portfile.cmake
+++ b/external_imported/vcpkg/ports/edflib/portfile.cmake
@@ -1,11 +1,9 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
 vcpkg_from_gitlab(
     GITLAB_URL https://gitlab.com
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Teuniz/EDFlib
-    REF v1.21
-    SHA512 6153cec44e26c0b9cd2f7e00d014f38ee7bdc444015eaf6169fecaf4aa16b04a552d3755ac83d48728de8dac7fe22cb2d0c9566f0fdc967e15bc3f000f456106
+    REF "v${VERSION}"
+    SHA512 7784f3076ce83631cf702d90bf4d690aab2aa3a2977cf98abec5bd00d22a33a6be1167ceae24d55ebf206581e7164a8a48ccd0bf2343bf38367ff3c4bc258aee
     HEAD_REF master
 )
 
@@ -25,8 +23,18 @@ vcpkg_cmake_configure(
 
 vcpkg_cmake_install()
 
+vcpkg_copy_pdbs()
+
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    vcpkg_replace_string(
+        "${CURRENT_PACKAGES_DIR}/include/edflib.h"
+        "#if defined(EDFLIB_SO_DLL)"
+        "#if 1 // defined(EDFLIB_SO_DLL)"
+    )
+endif()
+
 vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-EDFlib)
 
 if ("tools" IN_LIST FEATURES)
diff --git a/external_imported/vcpkg/ports/edflib/vcpkg.json b/external_imported/vcpkg/ports/edflib/vcpkg.json
index e13eccddb..d99ca4e9f 100644
--- a/external_imported/vcpkg/ports/edflib/vcpkg.json
+++ b/external_imported/vcpkg/ports/edflib/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "edflib",
-  "version": "1.21",
+  "version": "1.25",
   "description": "A C library to read/write EDF/EDF+/BDF/BDF+ files",
   "homepage": "https://www.teuniz.net/edflib/",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/effects11/portfile.cmake b/external_imported/vcpkg/ports/effects11/portfile.cmake
index a05a35d35..e6464ccdb 100644
--- a/external_imported/vcpkg/ports/effects11/portfile.cmake
+++ b/external_imported/vcpkg/ports/effects11/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO microsoft/FX11
-    REF dec2022b
-    SHA512 5dc209c830d940aba9378d1442b0fb236d5e1f63bb4e073ce8db5a832da22cb2e575c171aff0b641201b34b4362b9274b106f93518b09d57d231386d0b4bdf58
+    REF jun2023
+    SHA512 93a90b42efbc8e1e9cb76de80c959bc24406536af9d943d21e324a82be677d695c201deb995490e331ecfcda301d8b42285b90577fbed9acd5bb61c753efd66c
     HEAD_REF main
 )
 
@@ -23,4 +23,5 @@ vcpkg_cmake_config_fixup(CONFIG_PATH share/effects11)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/effects11/usage b/external_imported/vcpkg/ports/effects11/usage
new file mode 100644
index 000000000..f3dc35f64
--- /dev/null
+++ b/external_imported/vcpkg/ports/effects11/usage
@@ -0,0 +1,4 @@
+The Effects (FX) system for Direct3D 11 package is compatible with built-in CMake targets:
+
+    find_package(effects11 CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE Microsoft::Effects11)
diff --git a/external_imported/vcpkg/ports/effects11/vcpkg.json b/external_imported/vcpkg/ports/effects11/vcpkg.json
index d67a0ab10..d7376d131 100644
--- a/external_imported/vcpkg/ports/effects11/vcpkg.json
+++ b/external_imported/vcpkg/ports/effects11/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "effects11",
   "version": "11.29",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Effects for Direct3D 11 (FX11) is a management runtime for authoring HLSL shaders, render state, and runtime variables together.",
   "homepage": "https://github.com/Microsoft/FX11",
   "documentation": "https://github.com/microsoft/FX11/wiki",
diff --git a/external_imported/vcpkg/ports/effolkronium-random/portfile.cmake b/external_imported/vcpkg/ports/effolkronium-random/portfile.cmake
index 3acd390fb..6ed197b9b 100644
--- a/external_imported/vcpkg/ports/effolkronium-random/portfile.cmake
+++ b/external_imported/vcpkg/ports/effolkronium-random/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO effolkronium/random
-    REF v1.4.1
-    SHA512 215fd34ea3a99c955a1fcd70d6c317e3829b3c562c737d22be1371213b3e14346b2f61fc76afbbcc55e26b4fdf630fa428b8bc34104170cbfc4afebcf24d160b
+    REF "v${VERSION}"
+    SHA512 778667d3b3a4bd51b67ef7d1842652dcf6d7df210345f667d0474cdfe48bb75fa2c891f8843f3fc4946fb2ef71da652c296eaaa03718ed889dee4926d743b7dd
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/effolkronium-random/vcpkg.json b/external_imported/vcpkg/ports/effolkronium-random/vcpkg.json
index 9c4be3d55..e3c29efa9 100644
--- a/external_imported/vcpkg/ports/effolkronium-random/vcpkg.json
+++ b/external_imported/vcpkg/ports/effolkronium-random/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "effolkronium-random",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "description": "Random with a modern C++ API",
   "homepage": "https://github.com/effolkronium/random",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/eigen3/portfile.cmake b/external_imported/vcpkg/ports/eigen3/portfile.cmake
index d6725d44a..76379deb2 100644
--- a/external_imported/vcpkg/ports/eigen3/portfile.cmake
+++ b/external_imported/vcpkg/ports/eigen3/portfile.cmake
@@ -1,10 +1,13 @@
 vcpkg_buildpath_length_warning(37)
 
+block(SCOPE_FOR VARIABLES PROPAGATE SOURCE_PATH)
+set(VCPKG_BUILD_TYPE release) # header-only
+
 vcpkg_from_gitlab(
     GITLAB_URL https://gitlab.com
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libeigen/eigen
-    REF 3.4.0
+    REF "${VERSION}"
     SHA512 ba75ecb760e32acf4ceaf27115468e65d4f77c44f8d519b5a13e7940af2c03a304ad433368cb6d55431f307c5c39e2666ab41d34442db3cf441638e51f5c3b6a
     HEAD_REF master
     PATCHES
@@ -16,22 +19,23 @@ vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DBUILD_TESTING=OFF
+        -DEIGEN_BUILD_DOC=OFF
         -DEIGEN_BUILD_PKGCONFIG=ON
-    OPTIONS_RELEASE
-        -DCMAKEPACKAGE_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/share/eigen3
-        -DPKGCONFIG_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/lib/pkgconfig
-    OPTIONS_DEBUG
-        -DCMAKEPACKAGE_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/debug/share/eigen3
-        -DPKGCONFIG_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig
+        "-DCMAKEPACKAGE_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/share/eigen3"
+        "-DPKGCONFIG_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/lib/pkgconfig"
 )
 
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup()
+endblock()
+
+if(NOT VCPKG_BUILD_TYPE)
+    file(INSTALL "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/eigen3.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
+endif()
 vcpkg_fixup_pkgconfig()
 
 file(GLOB INCLUDES "${CURRENT_PACKAGES_DIR}/include/eigen3/*")
 # Copy the eigen header files to conventional location for user-wide MSBuild integration
 file(COPY ${INCLUDES} DESTINATION "${CURRENT_PACKAGES_DIR}/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
 
-file(INSTALL "${SOURCE_PATH}/COPYING.README" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
\ No newline at end of file
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING.README")
diff --git a/external_imported/vcpkg/ports/eigen3/remove_configure_checks.patch b/external_imported/vcpkg/ports/eigen3/remove_configure_checks.patch
index 3e434a405..c5e30c7e7 100644
--- a/external_imported/vcpkg/ports/eigen3/remove_configure_checks.patch
+++ b/external_imported/vcpkg/ports/eigen3/remove_configure_checks.patch
@@ -1,37 +1,48 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f3e69b845..12fb2188d 100644
+index f3e69b8..f32ffee 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -66,12 +66,14 @@ option(EIGEN_TEST_CXX11 "Enable testing with C++11 and C++11 features (e.g. Tens
+@@ -59,6 +59,7 @@ include(CheckCXXCompilerFlag)
+ include(GNUInstallDirs)
+ include(CMakeDependentOption)
  
++if(0)
+ set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
  
- macro(ei_add_cxx_compiler_flag FLAG)
-+  if(FALSE) # Since eigen3 is header only and vcpkg does not build tests this can be disabled by default. 
-   string(REGEX REPLACE "-" "" SFLAG1 ${FLAG})
-   string(REGEX REPLACE "\\+" "p" SFLAG ${SFLAG1})
-   check_cxx_compiler_flag(${FLAG} COMPILER_SUPPORT_${SFLAG})
-   if(COMPILER_SUPPORT_${SFLAG})
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAG}")
-   endif()
-+  endif()
- endmacro()
  
- check_cxx_compiler_flag("-std=c++11" EIGEN_COMPILER_SUPPORT_CPP11)
-@@ -142,7 +144,7 @@ endif()
+@@ -419,6 +420,7 @@ endif()
+ set(EIGEN_CUDA_COMPUTE_ARCH 30 CACHE STRING "The CUDA compute architecture level to target when compiling CUDA code")
  
- set(EIGEN_TEST_MAX_SIZE "320" CACHE STRING "Maximal matrix/vector size, default is 320")
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
++endif()
  
--if(NOT MSVC)
-+if(NOT MSVC AND FALSE)
-   # We assume that other compilers are partly compatible with GNUCC
+ # Backward compatibility support for EIGEN_INCLUDE_INSTALL_DIR
+ if(EIGEN_INCLUDE_INSTALL_DIR)
+@@ -495,6 +497,7 @@ if(BUILD_TESTING)
+   add_subdirectory(failtest)
+ endif()
  
-   # clang outputs some warnings for unknown flags that are not caught by check_cxx_compiler_flag
-@@ -330,7 +332,7 @@ if(NOT MSVC)
-     endif()
++if(0)
+ if(EIGEN_LEAVE_TEST_IN_ALL_TARGET)
+   add_subdirectory(blas)
+   add_subdirectory(lapack)
+@@ -532,9 +535,11 @@ if(EIGEN_TEST_SYCL)
+     add_definitions(-DEIGEN_DONT_VECTORIZE_SYCL=1)
    endif()
+ endif()
++endif()
+ 
+ add_subdirectory(unsupported)
+ 
++if(0)
+ add_subdirectory(demos EXCLUDE_FROM_ALL)
  
--else()
-+elseif(FALSE)
+ # must be after test and unsupported, for configuring buildtests.in
+@@ -554,6 +559,7 @@ configure_file(scripts/cdashtesting.cmake.in cdashtesting.cmake @ONLY)
+ if(BUILD_TESTING)
+   ei_testing_print_summary()
+ endif()
++endif()
  
-   # C4127 - conditional expression is constant
-   # C4714 - marked as __forceinline not inlined (I failed to deactivate it selectively)
+ message(STATUS "")
+ message(STATUS "Configured Eigen ${EIGEN_VERSION_NUMBER}")
diff --git a/external_imported/vcpkg/ports/eigen3/vcpkg.json b/external_imported/vcpkg/ports/eigen3/vcpkg.json
index 30bf5aa3e..bb2c9cc60 100644
--- a/external_imported/vcpkg/ports/eigen3/vcpkg.json
+++ b/external_imported/vcpkg/ports/eigen3/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "eigen3",
   "version": "3.4.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms.",
   "homepage": "http://eigen.tuxfamily.org",
   "license": "MPL-2.0",
diff --git a/external_imported/vcpkg/ports/elfio/portfile.cmake b/external_imported/vcpkg/ports/elfio/portfile.cmake
index de7f61392..4268db0d4 100644
--- a/external_imported/vcpkg/ports/elfio/portfile.cmake
+++ b/external_imported/vcpkg/ports/elfio/portfile.cmake
@@ -1,8 +1,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO serge1/ELFIO
-    REF Release_3.11
-    SHA512 3a254aad62e707f2809e2997998aab6a9794d70791dc535a6de90bad3e9de3cbcc4f8e7787067ca7cd47ce2dc71cf52809747267bc36cfb08369b49a6b92cf5e)
+    REF "Release_${VERSION}"
+    SHA512 f5c8bc6cc98da845f6c011fc85b98476935c5d20d72b36bff5ad2472434494115ee7c06cfa37152c528e5931c39fe3cc084bfc8e6952b2c3e8f24b8601ae212f
+)
 
 vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
diff --git a/external_imported/vcpkg/ports/elfio/vcpkg.json b/external_imported/vcpkg/ports/elfio/vcpkg.json
index d32f103ba..f28702a23 100644
--- a/external_imported/vcpkg/ports/elfio/vcpkg.json
+++ b/external_imported/vcpkg/ports/elfio/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "elfio",
-  "version": "3.11",
+  "version": "3.12",
   "description": "A header-only C++ library intended for reading and generating files in the ELF binary format.",
   "homepage": "https://github.com/serge1/ELFIO",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/embree3/vcpkg.json b/external_imported/vcpkg/ports/embree3/vcpkg.json
index 5ee637988..22b0e52b1 100644
--- a/external_imported/vcpkg/ports/embree3/vcpkg.json
+++ b/external_imported/vcpkg/ports/embree3/vcpkg.json
@@ -1,11 +1,11 @@
 {
   "name": "embree3",
   "version": "3.13.5",
-  "port-version": 1,
+  "port-version": 2,
   "description": "High Performance Ray Tracing Kernels.",
   "homepage": "https://github.com/embree/embree",
   "license": "Apache-2.0",
-  "supports": "!arm",
+  "supports": "!arm | osx",
   "dependencies": [
     "tbb",
     {
@@ -18,10 +18,7 @@
     }
   ],
   "default-features": [
-    "avx",
-    "avx2",
-    "sse2",
-    "sse42"
+    "default-features"
   ],
   "features": {
     "avx": {
@@ -33,6 +30,22 @@
     "avx512": {
       "description": "Enables AVX512 ISA."
     },
+    "default-features": {
+      "description": "Enables all default features.",
+      "dependencies": [
+        {
+          "name": "embree3",
+          "default-features": false,
+          "features": [
+            "avx",
+            "avx2",
+            "sse2",
+            "sse42"
+          ],
+          "platform": "x64 | x86"
+        }
+      ]
+    },
     "sse2": {
       "description": "Enables SSE2 ISA."
     },
diff --git a/external_imported/vcpkg/ports/enet/CMakeLists.txt b/external_imported/vcpkg/ports/enet/CMakeLists.txt
index a82e7aa4a..d17150b3d 100644
--- a/external_imported/vcpkg/ports/enet/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/enet/CMakeLists.txt
@@ -88,6 +88,9 @@ endif()
 
 set(ENET_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/enet)
 
+configure_file ("${CMAKE_SOURCE_DIR}/libenet.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libenet.pc" @ONLY)
+install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libenet.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig")
+
 install(TARGETS enet EXPORT unofficial-enet-config
                      ARCHIVE DESTINATION lib
                      LIBRARY DESTINATION lib
diff --git a/external_imported/vcpkg/ports/enet/vcpkg.json b/external_imported/vcpkg/ports/enet/vcpkg.json
index 7d2a4289a..00dedec90 100644
--- a/external_imported/vcpkg/ports/enet/vcpkg.json
+++ b/external_imported/vcpkg/ports/enet/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "enet",
   "version": "1.3.17",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Reliable UDP networking library",
   "homepage": "https://github.com/lsalzman/enet",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/enkits/portfile.cmake b/external_imported/vcpkg/ports/enkits/portfile.cmake
new file mode 100644
index 000000000..7f0367dac
--- /dev/null
+++ b/external_imported/vcpkg/ports/enkits/portfile.cmake
@@ -0,0 +1,31 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO dougbinks/enkiTS
+    REF "v${VERSION}"
+    SHA512 72a05058caef8d6a33cd70500aeaf05cc61521721697969d4845279b5a79b63e7a6a3f3971c5eff2776e5575720b58252e9d251ef565c2123275a3e8540948db
+    HEAD_REF master
+    PATCHES
+        update_install.patch
+)
+
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DENKITS_BUILD_C_INTERFACE=ON
+        -DENKITS_BUILD_EXAMPLES=OFF
+        -DENKITS_BUILD_SHARED=${BUILD_SHARED}
+        -DENKITS_INSTALL=ON
+)
+
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+vcpkg_fixup_pkgconfig()
+# Must specify args due to case sensitivity on some filesystems
+vcpkg_cmake_config_fixup(PACKAGE_NAME enkiTS CONFIG_PATH share/enkiTS)
+file(RENAME "${CURRENT_PACKAGES_DIR}/share/enkiTS/enkiTS-config.cmake" "${CURRENT_PACKAGES_DIR}/share/enkiTS/enkiTSConfig.cmake")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/License.txt")
diff --git a/external_imported/vcpkg/ports/enkits/update_install.patch b/external_imported/vcpkg/ports/enkits/update_install.patch
new file mode 100644
index 000000000..3596a0b2f
--- /dev/null
+++ b/external_imported/vcpkg/ports/enkits/update_install.patch
@@ -0,0 +1,33 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7f8572e..f42ec18 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.0)
+ 
+ project( enkiTS )
+ 
++include(GNUInstallDirs)
++
+ option( ENKITS_BUILD_C_INTERFACE    "Build C interface" ON )
+ option( ENKITS_BUILD_EXAMPLES       "Build example applications" ON )
+ option( ENKITS_BUILD_SHARED         "Build shared library" OFF )
+@@ -59,9 +61,17 @@ if( UNIX )
+     target_link_libraries( enkiTS ${CMAKE_THREAD_LIBS_INIT} )
+ endif()
+ 
++target_include_directories(enkiTS PUBLIC "$<INSTALL_INTERFACE:include>")
+ if( ENKITS_INSTALL )
+-    install(TARGETS enkiTS DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/enkiTS")
+-    install(FILES ${ENKITS_HEADERS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/enkiTS")
++    install(
++        TARGETS enkiTS
++        EXPORT enkiTS-config
++        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
++    install(FILES ${ENKITS_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
++    install(
++        EXPORT enkiTS-config
++        NAMESPACE enkiTS::
++        DESTINATION ${CMAKE_INSTALL_DATADIR}/enkiTS)
+ endif()
+ 
+ if( UNIX )
diff --git a/external_imported/vcpkg/ports/enkits/usage b/external_imported/vcpkg/ports/enkits/usage
new file mode 100644
index 000000000..ffb68ab7f
--- /dev/null
+++ b/external_imported/vcpkg/ports/enkits/usage
@@ -0,0 +1,4 @@
+ enkits provides CMake targets:
+
+    find_package(enkiTS CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE enkiTS::enkiTS)
diff --git a/external_imported/vcpkg/ports/enkits/vcpkg.json b/external_imported/vcpkg/ports/enkits/vcpkg.json
new file mode 100644
index 000000000..7a1e1c649
--- /dev/null
+++ b/external_imported/vcpkg/ports/enkits/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "enkits",
+  "version": "1.11",
+  "port-version": 1,
+  "description": "A permissively licensed C and C++ Task Scheduler for creating parallel programs.",
+  "homepage": "https://github.com/dougbinks/enkiTS",
+  "license": "Zlib",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/ensmallen/portfile.cmake b/external_imported/vcpkg/ports/ensmallen/portfile.cmake
index d94cedd62..66fcfbf15 100644
--- a/external_imported/vcpkg/ports/ensmallen/portfile.cmake
+++ b/external_imported/vcpkg/ports/ensmallen/portfile.cmake
@@ -3,7 +3,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mlpack/ensmallen
     REF "${VERSION}"
-    SHA512 3c101385d75aa13d21406fd98d4220b5ebd88655ff42039d6d4b22e3a2f21f7dc59dc935c67b8178cbfd104c4c50e611bc787f254973c3410a349648b5ed0342
+    SHA512 9cc058dcb777b7a59c361afcd02d2ce787b08c86a26aefc1d67c42658d67d7b62e8d7b5138c02912c182bc9b0e1e039c4036478985e12e2e35746853a169e067
     HEAD_REF master
     PATCHES
         dependencies.patch
diff --git a/external_imported/vcpkg/ports/ensmallen/vcpkg.json b/external_imported/vcpkg/ports/ensmallen/vcpkg.json
index eea08deca..ae9b21bd0 100644
--- a/external_imported/vcpkg/ports/ensmallen/vcpkg.json
+++ b/external_imported/vcpkg/ports/ensmallen/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "ensmallen",
-  "version-semver": "2.19.0",
+  "version-semver": "2.19.1",
   "description": "A header-only C++ library for mathematical optimization",
   "homepage": "http://ensmallen.org/",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/entityx/portfile.cmake b/external_imported/vcpkg/ports/entityx/portfile.cmake
index d0f83eef4..2d77a8b2f 100644
--- a/external_imported/vcpkg/ports/entityx/portfile.cmake
+++ b/external_imported/vcpkg/ports/entityx/portfile.cmake
@@ -8,19 +8,17 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE
-    PREFER_NINJA
     OPTIONS
         -DENTITYX_BUILD_TESTING=false
         -DENTITYX_BUILD_SHARED=0
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 # Handle copyright
-file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/entityx)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/entityx/COPYING ${CURRENT_PACKAGES_DIR}/share/entityx/copyright)
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/entityx" RENAME copyright)
diff --git a/external_imported/vcpkg/ports/entityx/vcpkg.json b/external_imported/vcpkg/ports/entityx/vcpkg.json
index 101eb1fa0..3b918ff57 100644
--- a/external_imported/vcpkg/ports/entityx/vcpkg.json
+++ b/external_imported/vcpkg/ports/entityx/vcpkg.json
@@ -1,7 +1,13 @@
 {
   "name": "entityx",
-  "version-string": "1.3.0",
-  "port-version": 3,
+  "version": "1.3.0",
+  "port-version": 5,
   "description": "EntityX - A fast, type-safe C++ Entity-Component system.",
-  "homepage": "https://github.com/alecthomas/entityx"
+  "homepage": "https://github.com/alecthomas/entityx",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/entt/portfile.cmake b/external_imported/vcpkg/ports/entt/portfile.cmake
index 0333f521a..330ead6da 100644
--- a/external_imported/vcpkg/ports/entt/portfile.cmake
+++ b/external_imported/vcpkg/ports/entt/portfile.cmake
@@ -1,38 +1,26 @@
-if ("experimental" IN_LIST FEATURES)
-    vcpkg_from_github(
-        OUT_SOURCE_PATH SOURCE_PATH
-        REPO skypjack/entt
-        HEAD_REF experimental
-    )
-else()
-    vcpkg_from_github(
-        OUT_SOURCE_PATH SOURCE_PATH
-        REPO skypjack/entt
-        REF "v${VERSION}"
-        SHA512 dfbf95e70685e04f1917589fe2484e928cf8883615840b7b5b2906e21bec0830cefcb97133f8822f682bffae8f98d99d525407a00e8dc885f6aa5655af3bcc94
-        HEAD_REF master
-    )
-endif()
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO skypjack/entt
+    REF "v${VERSION}"
+    SHA512 440aa2a4aaef77271874e85a1804c867dfbe0aa31373dc754635fa6365682b3246e40765749e02cd56b7743eeae262eb2952185081a70eb92ce631f4626faf93
+    HEAD_REF master
+)
+
+set(VCPKG_BUILD_TYPE release) # header-only port
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    DISABLE_PARALLEL_CONFIGURE
     OPTIONS
         -DENTT_BUILD_TESTING=OFF
 )
 
 vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/EnTT/cmake)
 
-if(EXISTS "${CURRENT_PACKAGES_DIR}/cmake")
-    vcpkg_cmake_config_fixup(CONFIG_PATH cmake)
-else()
-    vcpkg_cmake_config_fixup(CONFIG_PATH lib/EnTT/cmake)
-endif()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
 
 # Install natvis files
 file(INSTALL "${SOURCE_PATH}/natvis/entt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/natvis")
 
-# Handle copyright
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/entt/usage b/external_imported/vcpkg/ports/entt/usage
new file mode 100644
index 000000000..5de642338
--- /dev/null
+++ b/external_imported/vcpkg/ports/entt/usage
@@ -0,0 +1,4 @@
+entt provides CMake targets:
+
+    find_package(EnTT CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE EnTT::EnTT)
diff --git a/external_imported/vcpkg/ports/entt/vcpkg.json b/external_imported/vcpkg/ports/entt/vcpkg.json
index 2c8a7a335..419610fb4 100644
--- a/external_imported/vcpkg/ports/entt/vcpkg.json
+++ b/external_imported/vcpkg/ports/entt/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "entt",
-  "version": "3.11.1",
+  "version": "3.13.1",
   "description": "Gaming meets modern C++ - a fast and reliable entity-component system and much more",
   "homepage": "https://github.com/skypjack/entt",
   "license": "MIT",
@@ -13,10 +13,5 @@
       "name": "vcpkg-cmake-config",
       "host": true
     }
-  ],
-  "features": {
-    "experimental": {
-      "description": "Use experimental features right away"
-    }
-  }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/epsilon/vcpkg.json b/external_imported/vcpkg/ports/epsilon/vcpkg.json
index 7973271ea..9377d9dda 100644
--- a/external_imported/vcpkg/ports/epsilon/vcpkg.json
+++ b/external_imported/vcpkg/ports/epsilon/vcpkg.json
@@ -1,11 +1,11 @@
 {
   "name": "epsilon",
   "version": "0.9.2",
-  "port-version": 7,
+  "port-version": 8,
   "description": "EPSILON is an Open Source wavelet image compressor, that is aimed on parallel and robust image processing.",
   "homepage": "https://sourceforge.net/projects/epsilon-project/",
   "license": "GPL-2.0-only OR LGPL-2.0-only",
-  "supports": "windows",
+  "supports": "windows & !xbox",
   "dependencies": [
     "libpopt"
   ]
diff --git a/external_imported/vcpkg/ports/ereignis/portfile.cmake b/external_imported/vcpkg/ports/ereignis/portfile.cmake
index 42aea9b4e..8840c2d6b 100644
--- a/external_imported/vcpkg/ports/ereignis/portfile.cmake
+++ b/external_imported/vcpkg/ports/ereignis/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Soundux/ereignis
-    REF v1.1
-    SHA512 506a54e8d109028cd9e85597fbd6bf77694d55e78727d2889aa15846eb4ef00390153b719c6eb3d7f8d424eb7607b66f18adc24a2d907887e32c30ca0dca7034
+    REF "v${VERSION}"
+    SHA512 b8c8bbb40bf3501e4612cddfbdbf8117f0e89c7781dfa551f1a62e825566dfd9755889d2c953827679d94198ebfbd8f01e85478d7ac0529b0d564d45788ca707
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/ereignis/vcpkg.json b/external_imported/vcpkg/ports/ereignis/vcpkg.json
index 4508f4214..eb3aa937b 100644
--- a/external_imported/vcpkg/ports/ereignis/vcpkg.json
+++ b/external_imported/vcpkg/ports/ereignis/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "ereignis",
-  "version": "1.1",
+  "version": "2.3",
   "description": "A thread-safe C++17 Event Library",
   "homepage": "https://github.com/Soundux/ereignis",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/etcd-cpp-apiv3/portfile.cmake b/external_imported/vcpkg/ports/etcd-cpp-apiv3/portfile.cmake
index 7f619e012..56ebd0084 100644
--- a/external_imported/vcpkg/ports/etcd-cpp-apiv3/portfile.cmake
+++ b/external_imported/vcpkg/ports/etcd-cpp-apiv3/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO etcd-cpp-apiv3/etcd-cpp-apiv3
     REF "v${VERSION}"
-    SHA512 6c0659e25be84ba85d557d16594a52517b735b593039556bfb3e8b354e13f2f2cce07d82cef4cf793ee24ba39b27d763664de78734feb62059e86db021ca1729
+    SHA512 4f059c33b6deec2192adbf4bdeaa230f1a96fddfc68eac1ef17578c7c208e3476ab65cf4e6940d83307df4655942c88fc6988fb2e226c2f30aa75005219133a1
     HEAD_REF master
 )
 
@@ -23,7 +23,6 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 vcpkg_copy_pdbs()
 
 # Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/etcd-cpp-apiv3" RENAME copyright)
-
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
 # Adding usage text
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/etcd-cpp-apiv3/vcpkg.json b/external_imported/vcpkg/ports/etcd-cpp-apiv3/vcpkg.json
index bfdf7cc51..2d1d1d822 100644
--- a/external_imported/vcpkg/ports/etcd-cpp-apiv3/vcpkg.json
+++ b/external_imported/vcpkg/ports/etcd-cpp-apiv3/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "etcd-cpp-apiv3",
-  "version": "0.14.2",
+  "version": "0.15.3",
   "description": "The etcd-cpp-apiv3 is a C++ API for etcd's v3 client API, i.e., ETCDCTL_API=3.",
   "homepage": "https://github.com/etcd-cpp-apiv3/etcd-cpp-apiv3",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/etl/portfile.cmake b/external_imported/vcpkg/ports/etl/portfile.cmake
index fb6a9b0ad..adc6b6d11 100644
--- a/external_imported/vcpkg/ports/etl/portfile.cmake
+++ b/external_imported/vcpkg/ports/etl/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ETLCPP/etl
-    REF 20.35.4
-    SHA512 04c68b50cbd7d1052f7253170806b0b67e2b9f78d57da2405284bf84695eb20c81be104b93a07f4d4a97fe14f5a1d3882aa7d96f418d6fbaec67db44375b7b75
+    REF "${VERSION}"
+    SHA512 fcfa30f4e702444b7cc9a41c97ba8c370e18468782a11fcde40d198f7f0475b3f6e45531c8fe2898e5ab0086c24f0cf9dc72ebf8c16480ac3c09dd301c476f0a
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/etl/vcpkg.json b/external_imported/vcpkg/ports/etl/vcpkg.json
index 935b1dee4..3f8c6b6fb 100644
--- a/external_imported/vcpkg/ports/etl/vcpkg.json
+++ b/external_imported/vcpkg/ports/etl/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "etl",
-  "version": "20.35.4",
+  "version": "20.38.10",
   "description": "A C++ template library for embedded applications",
   "homepage": "https://www.etlcpp.com",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/eve/portfile.cmake b/external_imported/vcpkg/ports/eve/portfile.cmake
index 7efebaca7..bccc8c46f 100644
--- a/external_imported/vcpkg/ports/eve/portfile.cmake
+++ b/external_imported/vcpkg/ports/eve/portfile.cmake
@@ -5,7 +5,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO jfalcou/eve
     REF "${git_ref}"
-    SHA512 5623587de77c3e321555ca99326829928f69c5ac499d2abedfb18860e8c2a4c7dd5b408afef3ae2f8681cb363ffbfbc869dbf28c90e62e2b0abca62e03d08d12
+    SHA512 20b55996465fa5016d43cee95541510b6470b2358635b0e269965d3fb43731e83b92bc2df0502fcdfadd31de47f877f22b1c6ae84638f1f3db92c70315cc1b29
     HEAD_REF main
 )
 
diff --git a/external_imported/vcpkg/ports/eve/vcpkg.json b/external_imported/vcpkg/ports/eve/vcpkg.json
index 2611dcc33..434ac600e 100644
--- a/external_imported/vcpkg/ports/eve/vcpkg.json
+++ b/external_imported/vcpkg/ports/eve/vcpkg.json
@@ -1,10 +1,7 @@
 {
   "name": "eve",
-  "version": "2022.9.1",
-  "description": [
-    "EVE - the Expressive Vector Engine",
-    "A header-only C++20 and onward implementation of a type based wrapper around SIMD extensions sets for most current architectures."
-  ],
+  "version": "2023.2.15",
+  "description": "EVE - the Expressive Vector Engine : C++20 SIMD Programming Library",
   "homepage": "https://github.com/jfalcou/eve",
   "documentation": "https://jfalcou.github.io/eve/",
   "license": "BSL-1.0",
diff --git a/external_imported/vcpkg/ports/eventpp/portfile.cmake b/external_imported/vcpkg/ports/eventpp/portfile.cmake
index bd689e51c..ff315bfac 100644
--- a/external_imported/vcpkg/ports/eventpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/eventpp/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO wqking/eventpp
-    REF v0.1.2
-    SHA512 01fd536024dfef8c4025fc184f6b6326a901849dbf73d81430d7cfadeff25c9c140ab6a28b0143a4090703668c1d9e743a54e874c0321c3453cf40aeb4583db3
+    REF "v${VERSION}"
+    SHA512 b39994e9bd581d6bb61b634c434c46075e41ec2217e1174578fefd206a927bd725744ae0724d319cde8f2b2a43d2e030a04c271197500d94c6b1afd849f779fd
     HEAD_REF master
 )
 
@@ -19,4 +19,4 @@ vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib")
 
-file(INSTALL "${SOURCE_PATH}/license" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/license")
diff --git a/external_imported/vcpkg/ports/eventpp/vcpkg.json b/external_imported/vcpkg/ports/eventpp/vcpkg.json
index a2740ba56..373108df5 100644
--- a/external_imported/vcpkg/ports/eventpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/eventpp/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "eventpp",
-  "version-semver": "0.1.2",
+  "version-semver": "0.1.3",
   "description": "C++ library for event dispatcher and callback list",
   "homepage": "https://github.com/wqking/eventpp",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/exiv2/dont-find-python.patch b/external_imported/vcpkg/ports/exiv2/dont-find-python.patch
new file mode 100644
index 000000000..a94babd5e
--- /dev/null
+++ b/external_imported/vcpkg/ports/exiv2/dont-find-python.patch
@@ -0,0 +1,17 @@
+diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake
+index 67a6cfd..d5006ff 100644
+--- a/cmake/findDependencies.cmake
++++ b/cmake/findDependencies.cmake
+@@ -30,10 +30,12 @@ endif()
+ 
+ list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/")
+ 
++if(EXIV2_BUILD_UNIT_TESTS)
+ find_package (Python3 COMPONENTS Interpreter)
+ if (NOT Python3_Interpreter_FOUND)
+     message(WARNING "Python3 was not found. Python tests under the 'tests' folder will not be executed")
+ endif()
++endif()
+ 
+ find_package(Filesystem COMPONENTS Experimental Final REQUIRED)
+ 
diff --git a/external_imported/vcpkg/ports/exiv2/fix-brotli.patch b/external_imported/vcpkg/ports/exiv2/fix-brotli.patch
new file mode 100644
index 000000000..13a513b54
--- /dev/null
+++ b/external_imported/vcpkg/ports/exiv2/fix-brotli.patch
@@ -0,0 +1,27 @@
+diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake
+index bec2128a5..664522c2a 100644
+--- a/cmake/findDependencies.cmake
++++ b/cmake/findDependencies.cmake
+@@ -47,7 +47,7 @@ if( EXIV2_ENABLE_PNG )
+ endif( )
+ 
+ if( EXIV2_ENABLE_BMFF AND EXIV2_ENABLE_BROTLI )
+-    find_package( Brotli REQUIRED )
++    find_package( BROTLI NAMES unofficial-brotli CONFIG REQUIRED )
+ endif( )
+ 
+ if( EXIV2_ENABLE_WEBREADY )
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 15bab8c8a..3db5bdd08 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -240,8 +240,7 @@ if( EXIV2_ENABLE_PNG )
+ endif()
+ 
+ if( EXIV2_ENABLE_BMFF AND BROTLI_FOUND )
+-    target_link_libraries( exiv2lib PRIVATE ${Brotli_LIBRARIES})
+-    target_include_directories(exiv2lib PRIVATE ${Brotli_INCLUDE_DIRS})
++    target_link_libraries( exiv2lib PRIVATE unofficial::brotli::brotlidec)
+     list(APPEND requires_private_list "libbrotlidec")
+ endif()
+ 
diff --git a/external_imported/vcpkg/ports/exiv2/fix-expat.patch b/external_imported/vcpkg/ports/exiv2/fix-expat.patch
new file mode 100644
index 000000000..fa4118909
--- /dev/null
+++ b/external_imported/vcpkg/ports/exiv2/fix-expat.patch
@@ -0,0 +1,25 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 85dd6cd..4967d8a 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -178,7 +178,7 @@ target_include_directories(exiv2lib SYSTEM PRIVATE
+ 
+ if (EXIV2_ENABLE_XMP OR EXIV2_ENABLE_EXTERNAL_XMP)
+     target_include_directories(exiv2lib PRIVATE ${EXPAT_INCLUDE_DIR})
+-    target_link_libraries(exiv2lib PRIVATE EXPAT::EXPAT)
++    target_link_libraries(exiv2lib PRIVATE expat::expat)
+     list(APPEND requires_private_list "expat")
+ endif()
+ 
+diff --git a/xmpsdk/CMakeLists.txt b/xmpsdk/CMakeLists.txt
+index 87c59c0..d2f23e6 100644
+--- a/xmpsdk/CMakeLists.txt
++++ b/xmpsdk/CMakeLists.txt
+@@ -31,6 +31,7 @@ target_include_directories(exiv2-xmp SYSTEM
+         ${PROJECT_SOURCE_DIR}/xmpsdk/include
+         ${EXPAT_INCLUDE_DIRS}
+ )
++target_link_libraries(exiv2-xmp PRIVATE expat::expat)
+ 
+ # Prevent a denial-service-attack related to XML entity expansion
+ # ("billion laughs attack").
diff --git a/external_imported/vcpkg/ports/exiv2/fix-inih.patch b/external_imported/vcpkg/ports/exiv2/fix-inih.patch
new file mode 100644
index 000000000..853531f9b
--- /dev/null
+++ b/external_imported/vcpkg/ports/exiv2/fix-inih.patch
@@ -0,0 +1,32 @@
+diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake
+index 1075c3031..bec2128a5 100644
+--- a/cmake/findDependencies.cmake
++++ b/cmake/findDependencies.cmake
+@@ -77,7 +77,7 @@ if( ICONV_FOUND )
+ endif()
+ 
+ if( EXIV2_ENABLE_INIH )
+-  find_package(inih)
++  find_package(unofficial-inih CONFIG REQUIRED)
+   message ( "-- inih_INCLUDE_DIRS : " ${inih_INCLUDE_DIRS} )
+   message ( "-- inih_LIBRARIES : " ${inih_LIBRARIES} )
+   message ( "-- inih_inireader_INCLUDE_DIRS : " ${inih_inireader_INCLUDE_DIRS} )
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index dba7af99c..15bab8c8a 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -263,10 +263,10 @@ if( Iconv_FOUND AND Iconv_LIBRARIES )
+ endif()
+ 
+ if( EXIV2_ENABLE_INIH )
+-  target_link_libraries( exiv2lib_int PRIVATE inih::libinih )
+-  target_link_libraries( exiv2lib_int PRIVATE inih::inireader )
+-  target_link_libraries( exiv2lib PRIVATE inih::libinih )
+-  target_link_libraries( exiv2lib PRIVATE inih::inireader )
++  target_link_libraries( exiv2lib_int PRIVATE unofficial::inih::libinih )
++  target_link_libraries( exiv2lib_int PRIVATE unofficial::inih::inireader )
++  target_link_libraries( exiv2lib PRIVATE unofficial::inih::libinih )
++  target_link_libraries( exiv2lib PRIVATE unofficial::inih::inireader )
+   list(APPEND requires_private_list "INIReader")
+ endif()
+ 
diff --git a/external_imported/vcpkg/ports/exiv2/ios.patch b/external_imported/vcpkg/ports/exiv2/ios.patch
new file mode 100644
index 000000000..3775f0148
--- /dev/null
+++ b/external_imported/vcpkg/ports/exiv2/ios.patch
@@ -0,0 +1,31 @@
+diff --git a/src/futils.cpp b/src/futils.cpp
+index 3e30c9996..c746838d5 100644
+--- a/src/futils.cpp
++++ b/src/futils.cpp
+@@ -38,6 +38,10 @@ namespace fs = std::experimental::filesystem;
+ #include <unistd.h>  // for stat()
+ #endif
+ 
++#if __has_include(<mach-o/dyld.h>)
++#include <mach-o/dyld.h>  // for _NSGetExecutablePath()
++#endif
++
+ #if defined(__FreeBSD__)
+ // clang-format off
+ #include <sys/mount.h>
+@@ -360,9 +364,12 @@ std::string getProcessPath() {
+     TCHAR pathbuf[MAX_PATH];
+     GetModuleFileName(nullptr, pathbuf, MAX_PATH);
+     auto path = fs::path(pathbuf);
+-#elif __has_include(<libproc.h>)
+-    char pathbuf[PROC_PIDPATHINFO_MAXSIZE];
+-    proc_pidpath(getpid(), pathbuf, sizeof(pathbuf));
++#elif defined(__APPLE__)
++    char pathbuf[2048];
++    uint32_t size = sizeof(pathbuf);
++    const int get_exec_path_failure = _NSGetExecutablePath(pathbuf, &size);
++    if (get_exec_path_failure)
++      return "unknown";  // pathbuf not big enough
+     auto path = fs::path(pathbuf);
+ #elif defined(__sun__)
+     auto path = fs::read_symlink(Internal::stringFormat("/proc/%d/path/a.out", getpid()));
diff --git a/external_imported/vcpkg/ports/exiv2/portfile.cmake b/external_imported/vcpkg/ports/exiv2/portfile.cmake
index af39219ed..90e57f67c 100644
--- a/external_imported/vcpkg/ports/exiv2/portfile.cmake
+++ b/external_imported/vcpkg/ports/exiv2/portfile.cmake
@@ -2,19 +2,22 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Exiv2/exiv2
     REF "v${VERSION}"
-    SHA512 7d7121770a9394efd31acb74709583e587351fc48c485a2f684cacce4ed19a2d07a6cb1cea986c16bf64851fd53b22a7277c1e1ae1a6cd69a5761afae3c5c731
+    SHA512 7b872a3c0cbe343014b1ca4618cecaf6ee8d78dec7ef83accfce95cb8eadc6b52116977a41e1f1be5c6149a47bdd9457fadc08d73708aa2a6ab69795fd3de23b
     HEAD_REF master
     PATCHES
         fix-find_expat.patch
+        fix-inih.patch
+        fix-brotli.patch
+        fix-expat.patch
+        dont-find-python.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
-        unicode EXIV2_ENABLE_WIN_UNICODE
         xmp     EXIV2_ENABLE_XMP
-        video   EXIV2_ENABLE_VIDEO
         png     EXIV2_ENABLE_PNG
         nls     EXIV2_ENABLE_NLS
+        bmff    EXIV2_ENABLE_BMFF
 )
 
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" EXIV2_CRT_DYNAMIC)
@@ -30,13 +33,11 @@ vcpkg_cmake_configure(
         -DEXIV2_BUILD_SAMPLES=OFF
         -DEXIV2_BUILD_DOC=OFF
         -DEXIV2_ENABLE_EXTERNAL_XMP=OFF
-        -DEXIV2_ENABLE_PRINTUCS2=OFF
         -DEXIV2_ENABLE_LENSDATA=ON
         -DEXIV2_ENABLE_DYNAMIC_RUNTIME=${EXIV2_CRT_DYNAMIC}
         -DEXIV2_ENABLE_WEBREADY=OFF
         -DEXIV2_ENABLE_CURL=OFF
-        -DEXIV2_ENABLE_SSH=OFF
-        -DEXIV2_ENABLE_BMFF=OFF
+        -DEXIV2_ENABLE_VIDEO=OFF
         -DEXIV2_TEAM_EXTRA_WARNINGS=OFF
         -DEXIV2_TEAM_WARNINGS_AS_ERRORS=OFF
         -DEXIV2_TEAM_PACKAGING=OFF
@@ -44,7 +45,7 @@ vcpkg_cmake_configure(
 )
 
 vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/exiv2)
+vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/exiv2)
 vcpkg_fixup_pkgconfig()
 
 configure_file(
@@ -64,3 +65,5 @@ file(REMOVE_RECURSE
 )
 
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
+
+configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY)
diff --git a/external_imported/vcpkg/ports/exiv2/usage b/external_imported/vcpkg/ports/exiv2/usage
new file mode 100644
index 000000000..1baff4d10
--- /dev/null
+++ b/external_imported/vcpkg/ports/exiv2/usage
@@ -0,0 +1,4 @@
+exiv2 provides CMake targets:
+
+    find_package(exiv2 CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE Exiv2::exiv2lib)
diff --git a/external_imported/vcpkg/ports/exiv2/vcpkg-cmake-wrapper.cmake b/external_imported/vcpkg/ports/exiv2/vcpkg-cmake-wrapper.cmake
index a6fa81dbf..3eaaf3c79 100644
--- a/external_imported/vcpkg/ports/exiv2/vcpkg-cmake-wrapper.cmake
+++ b/external_imported/vcpkg/ports/exiv2/vcpkg-cmake-wrapper.cmake
@@ -7,12 +7,25 @@ if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
     if("@EXIV2_ENABLE_NLS@")
         find_package(Intl REQUIRED)
     endif()
+    if("@EXIV2_ENABLE_BMFF@")
+        find_package(unofficial-brotli CONFIG REQUIRED)
+    endif()
+    if("@EXIV2_ENABLE_XMP@") 
+        find_package(expat CONFIG REQUIRED)
+    endif()
+    if("@EXIV2_ENABLE_PNG@")
+        find_package( ZLIB REQUIRED )
+    endif()
+    find_package(unofficial-inih CONFIG REQUIRED)
     if(TARGET exiv2lib)
         if(NOT "@VCPKG_TARGET_IS_WINDOWS@")
             set_property(TARGET exiv2lib APPEND PROPERTY INTERFACE_LINK_LIBRARIES Iconv::Iconv)
         endif()
         if("@EXIV2_ENABLE_NLS@")
-            set_property(TARGET exiv2lib APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${Intl_LIBRARIES})
+            set_property(TARGET exiv2lib APPEND PROPERTY INTERFACE_LINK_LIBRARIES
+                "\$<\$<NOT:\$<CONFIG:DEBUG>>:${Intl_LIBRARY_RELEASE}>"
+                "\$<\$<CONFIG:DEBUG>:${Intl_LIBRARY_DEBUG}>"
+            )
         endif()
     endif()
 endif()
diff --git a/external_imported/vcpkg/ports/exiv2/vcpkg.json b/external_imported/vcpkg/ports/exiv2/vcpkg.json
index 0c41d423c..6af148c59 100644
--- a/external_imported/vcpkg/ports/exiv2/vcpkg.json
+++ b/external_imported/vcpkg/ports/exiv2/vcpkg.json
@@ -1,11 +1,13 @@
 {
   "name": "exiv2",
-  "version": "0.27.6",
+  "version": "0.28.1",
+  "port-version": 1,
   "description": "Image metadata library and tools",
   "homepage": "https://exiv2.org",
   "license": "GPL-2.0-or-later",
-  "supports": "!uwp",
+  "supports": "!uwp & !xbox",
   "dependencies": [
+    "inih",
     {
       "name": "libiconv",
       "platform": "!windows"
@@ -20,6 +22,12 @@
     }
   ],
   "features": {
+    "bmff": {
+      "description": "Support for BMFF files (e.g., CR3, HEIF, HEIC, AVIF, and JPEG XL)",
+      "dependencies": [
+        "brotli"
+      ]
+    },
     "nls": {
       "description": "Build native language support",
       "dependencies": [
@@ -40,12 +48,8 @@
         "zlib"
       ]
     },
-    "unicode": {
-      "description": "Compile with Unicode support on Windows",
-      "supports": "windows"
-    },
     "video": {
-      "description": "Build video support into library"
+      "description": "Deprecated. it will be removed in the future."
     },
     "xmp": {
       "description": "Build with XMP metadata support",
diff --git a/external_imported/vcpkg/ports/expected-lite/portfile.cmake b/external_imported/vcpkg/ports/expected-lite/portfile.cmake
index 2e4b119c4..20b5871cf 100644
--- a/external_imported/vcpkg/ports/expected-lite/portfile.cmake
+++ b/external_imported/vcpkg/ports/expected-lite/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO martinmoene/expected-lite
-    REF 95b9cb015fa17baa749c2b396b335906e1596a9e # v0.6.2
-    SHA512 f4d46daf45d857137d9b026fdeac3101c7707868aa133b696ee3c5cfc208ea402c71db73882eeece0c2eb6271ee06495c7afde4eefb20de0a98ad9bc5727dc35
+    REF "v${VERSION}"
+    SHA512 d6a4f30f90494dda002ad27d227f17ce0201752178418d7dfada26441e853590d46816c88922e7d458dda68ad4414ddfe6b7fa4ed2a5854e4e3b22675b13f92a
     HEAD_REF master
 )
 
@@ -24,6 +24,4 @@ file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/lib"
 )
 
-file(INSTALL
-    "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright
-)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/external_imported/vcpkg/ports/expected-lite/vcpkg.json b/external_imported/vcpkg/ports/expected-lite/vcpkg.json
index faa68b9b0..f237631be 100644
--- a/external_imported/vcpkg/ports/expected-lite/vcpkg.json
+++ b/external_imported/vcpkg/ports/expected-lite/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "expected-lite",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "description": "Expected objects in C++11 and later in a single-file header-only library",
   "homepage": "https://github.com/martinmoene/expected-lite",
   "license": "BSL-1.0",
diff --git a/external_imported/vcpkg/ports/ezc3d/portfile.cmake b/external_imported/vcpkg/ports/ezc3d/portfile.cmake
index 8a334db2a..a6ebfbd38 100644
--- a/external_imported/vcpkg/ports/ezc3d/portfile.cmake
+++ b/external_imported/vcpkg/ports/ezc3d/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO pyomeca/ezc3d
-    REF Release_1.4.7
-    SHA512 ba234be76b5d95b9527952c7e1bf67d9725fc280bf991f45e7cbd68f1aeeab7e963c8c4d928e720d02ebc02ec2b0e41f1c28036cd728ccb4c5a77c6fa81a74ad
+    REF "Release_${VERSION}"
+    SHA512 8e3a03c2d588ac1f8ed3d0988b90f7560f2c0b36c05f5bf9b6f029a5f4c6e4ab49d7153ef7a9bbbdb018c719a92d1da08a6af259ba95972bf8fd60766d4a480e
     HEAD_REF dev
 )
 
@@ -16,11 +16,7 @@ vcpkg_cmake_configure(
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
-if(VCPKG_TARGET_IS_WINDOWS)
-    vcpkg_cmake_config_fixup(CONFIG_PATH "CMake")
-else()
-    vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/ezc3d")
-endif()
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/ezc3d")
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
diff --git a/external_imported/vcpkg/ports/ezc3d/vcpkg.json b/external_imported/vcpkg/ports/ezc3d/vcpkg.json
index aa503641f..b7dd9e0d5 100644
--- a/external_imported/vcpkg/ports/ezc3d/vcpkg.json
+++ b/external_imported/vcpkg/ports/ezc3d/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "ezc3d",
-  "version": "1.4.7",
+  "version": "1.5.7",
   "description": "C3D reader/writer",
   "homepage": "https://github.com/pyomeca/ezc3d",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/fadbad/portfile.cmake b/external_imported/vcpkg/ports/fadbad/portfile.cmake
index 35c0ff8f5..8892c48f1 100644
--- a/external_imported/vcpkg/ports/fadbad/portfile.cmake
+++ b/external_imported/vcpkg/ports/fadbad/portfile.cmake
@@ -4,8 +4,8 @@ vcpkg_download_distfile(ARCHIVE
   SHA512 7a82c51c03acb0806d673853f391379ea974e304c831ee15ef05a90c30661736ff572481b5b8254b2646c63968043ee90a06cba88261b87fc34d01f92403360a
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE ${ARCHIVE}
 )
 
diff --git a/external_imported/vcpkg/ports/fadbad/vcpkg.json b/external_imported/vcpkg/ports/fadbad/vcpkg.json
index 162be3706..a559df4ab 100644
--- a/external_imported/vcpkg/ports/fadbad/vcpkg.json
+++ b/external_imported/vcpkg/ports/fadbad/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "fadbad",
-  "version-string": "2.1.0",
-  "port-version": 1,
+  "version": "2.1.0",
+  "port-version": 2,
   "description": "FADBAD++ Templates for Automatic Differentiation",
   "homepage": "https://www.fadbad.com/"
 }
diff --git a/external_imported/vcpkg/ports/faiss/portfile.cmake b/external_imported/vcpkg/ports/faiss/portfile.cmake
index f4ed1b36e..1d4f7ee2d 100644
--- a/external_imported/vcpkg/ports/faiss/portfile.cmake
+++ b/external_imported/vcpkg/ports/faiss/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebookresearch/faiss
-    REF v1.7.3
-    SHA512 97649772049365363329a70d3baee1b1bd9787ad6b8cbc6ae33108cb7a470a3a0115cdfd2642acd6540808aa1c34a1e8f1216e882a4c1fd67a6d1bc38d4b6a5c
+    REF v1.7.4
+    SHA512 9622fb989cb2e1879450c2ad257cb55d0c0c639f54f0815e4781f4e4b2ae2f01779f5c8c0738ae9a29fde7e418587e6a92e91240d36c1ca051a6228bfb777638
     HEAD_REF master
     PATCHES
         fix-dependencies.patch
diff --git a/external_imported/vcpkg/ports/faiss/vcpkg.json b/external_imported/vcpkg/ports/faiss/vcpkg.json
index 56d8997a9..95345e887 100644
--- a/external_imported/vcpkg/ports/faiss/vcpkg.json
+++ b/external_imported/vcpkg/ports/faiss/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "faiss",
-  "version": "1.7.3",
+  "version": "1.7.4",
   "description": "Faiss is a library for efficient similarity search and clustering of dense vectors.",
   "homepage": "https://github.com/facebookresearch/faiss",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/fakeit/fix-include_dir.patch b/external_imported/vcpkg/ports/fakeit/fix-include_dir.patch
new file mode 100644
index 000000000..691cd6643
--- /dev/null
+++ b/external_imported/vcpkg/ports/fakeit/fix-include_dir.patch
@@ -0,0 +1,22 @@
+diff --git a/single_header/CMakeLists.txt b/single_header/CMakeLists.txt
+index 1d2e280..460e6c7 100644
+--- a/single_header/CMakeLists.txt
++++ b/single_header/CMakeLists.txt
+@@ -10,7 +10,7 @@ function(add_configuration config_name)
+     # If we use FakeIt from install-tree then we use INSTALL_INTERFACE wrapper.
+     target_include_directories(FakeIt-${config_name} SYSTEM INTERFACE
+         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${config_name}>
+-        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${config_name}>
++        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/fakeit/single_header/${config_name}>
+     )
+ 
+     # Add alias for the library with namespace.
+@@ -20,7 +20,7 @@ function(add_configuration config_name)
+     # "${config_name}" instead of "${config_name}/" string means that the header will be
+     # installed at ${CMAKE_INSTALL_PREFIX}/include/${config_name}/fakeit.hpp
+     # instead of ${CMAKE_INSTALL_PREFIX}/include/fakeit.hpp.
+-    install(DIRECTORY ${config_name} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
++    install(DIRECTORY ${config_name} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fakeit/single_header)
+ 
+     # Add the new config target to the FakeItConfig.cmake file which will be used to find FakeIt from outside.
+     install(TARGETS FakeIt-${config_name} EXPORT FakeItConfig)
diff --git a/external_imported/vcpkg/ports/fakeit/portfile.cmake b/external_imported/vcpkg/ports/fakeit/portfile.cmake
index cf6b57655..600065786 100644
--- a/external_imported/vcpkg/ports/fakeit/portfile.cmake
+++ b/external_imported/vcpkg/ports/fakeit/portfile.cmake
@@ -1,11 +1,26 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO eranpeer/FakeIt
-    REF 78ca536e6b32f11e2883d474719a447915e40005 #v2.3.0
-    SHA512 b3a76d278217d177e2222d6e4c782c8ee08a7b6244e5f89fd25b22faffc8f0cf402c1d04763fb6f6ef37272738adf5dd7ff7a0437c1bc9a5043765058fa2a648
+    REF "${VERSION}"
+    SHA512 3575dc2247a97ea6d3c584e9b933e32cc0d1936fec480b19caf8305e8ba39bb11b4437930a5343b343df66347354ef5aaa8d2811e0ff3119bfc619629a0c2b8b
     HEAD_REF master
+    PATCHES fix-include_dir.patch
 )
 
-file(COPY "${SOURCE_PATH}/single_header/" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+set(VCPKG_BUILD_TYPE release) # header-only port
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DENABLE_TESTING=OFF
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/fakeit/usage b/external_imported/vcpkg/ports/fakeit/usage
new file mode 100644
index 000000000..0d9dbf6ca
--- /dev/null
+++ b/external_imported/vcpkg/ports/fakeit/usage
@@ -0,0 +1,9 @@
+The package FakeIt provides CMake targets:
+
+    # Usage for specific framework tests (e.g. boost, catch, gtest, etc.)
+    find_package(FakeIt CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE FakeIt::FakeIt-<framework>)
+
+    # Only specific test framework configuration files are provided upstream.
+    # It does not install its own source header files.
+    # So only the usage of the test framework is provided here.
diff --git a/external_imported/vcpkg/ports/fakeit/vcpkg.json b/external_imported/vcpkg/ports/fakeit/vcpkg.json
index 6650ba760..81ae0da02 100644
--- a/external_imported/vcpkg/ports/fakeit/vcpkg.json
+++ b/external_imported/vcpkg/ports/fakeit/vcpkg.json
@@ -1,7 +1,18 @@
 {
   "name": "fakeit",
-  "version": "2.3.0",
+  "version": "2.4.0",
+  "port-version": 2,
   "description": "FakeIt is a simple mocking framework for C++. It supports GCC, Clang and MS Visual C++.",
   "homepage": "https://github.com/eranpeer/FakeIt",
-  "license": "MIT"
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/fameta-counter/portfile.cmake b/external_imported/vcpkg/ports/fameta-counter/portfile.cmake
new file mode 100644
index 000000000..60e2dca5f
--- /dev/null
+++ b/external_imported/vcpkg/ports/fameta-counter/portfile.cmake
@@ -0,0 +1,11 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO falemagn/fameta-counter
+    REF 35f4421524b61eaa658c23e9c3667dc914df72fa
+    SHA512 624baa2646a4141a1b326910f567d8a4799b72ee4cf569497940a877be2f035a19cf9a709f3bb64be7055175bd72c698d3f82df5bd47996eacbe6bbc2f4a42cd
+    HEAD_REF master
+)
+
+file(COPY "${SOURCE_PATH}/include/fameta/counter.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include/fameta-counter")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/fameta-counter/vcpkg.json b/external_imported/vcpkg/ports/fameta-counter/vcpkg.json
new file mode 100644
index 000000000..6bb487499
--- /dev/null
+++ b/external_imported/vcpkg/ports/fameta-counter/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "fameta-counter",
+  "version-date": "2021-02-13",
+  "description": "Compile time counter that works with all major modern compilers, compatible with C++11 and above.",
+  "homepage": "https://github.com/falemagn/fameta-counter",
+  "license": "Unlicense"
+}
diff --git a/external_imported/vcpkg/ports/fann/fix-build_type.patch b/external_imported/vcpkg/ports/fann/fix-build_type.patch
new file mode 100644
index 000000000..14af5c8fd
--- /dev/null
+++ b/external_imported/vcpkg/ports/fann/fix-build_type.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2c35ea2..fafd904 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -68,7 +68,6 @@ set (FANN_VERSION_MINOR 2)
+ set (FANN_VERSION_PATCH 0)
+ set (FANN_VERSION_STRING ${FANN_VERSION_MAJOR}.${FANN_VERSION_MINOR}.${FANN_VERSION_PATCH})
+ 
+-option(BUILD_SHARED_LIBS "build shared/static libs" ON)
+ 
+ INCLUDE(DefineInstallationPaths)
+ 
diff --git a/external_imported/vcpkg/ports/fann/fix-installation.patch b/external_imported/vcpkg/ports/fann/fix-installation.patch
index 270f0877a..3a7dae2bd 100644
--- a/external_imported/vcpkg/ports/fann/fix-installation.patch
+++ b/external_imported/vcpkg/ports/fann/fix-installation.patch
@@ -1,70 +1,35 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 12ea06c..6c33c25 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -156,10 +156,5 @@ install (FILES
+ 
+ ################# compile tests ################
+ 
+-ADD_SUBDIRECTORY( lib/googletest )
+-
+-if(COMPILER_SUPPORTS_CXX11)
+-  ADD_SUBDIRECTORY( tests )
+-endif()
+ 
+ ENDIF()
 diff --git a/cmake/Modules/DefineInstallationPaths.cmake b/cmake/Modules/DefineInstallationPaths.cmake
-index 644cf1b..81e7c74 100644
+index 2969533..e70c4b7 100644
 --- a/cmake/Modules/DefineInstallationPaths.cmake
 +++ b/cmake/Modules/DefineInstallationPaths.cmake
-@@ -3,7 +3,7 @@ if (UNIX)
-         MESSAGE(STATUS "${PROJECT_NAME} is used as APPLICATION_NAME")
-         SET(APPLICATION_NAME ${PROJECT_NAME})
-     ENDIF (NOT APPLICATION_NAME)
--
-+if (0)
-     # Suffix for Linux
-     SET(LIB_SUFFIX
-         CACHE STRING "Define suffix of directory name (32/64)"
-@@ -122,9 +122,10 @@ if (UNIX)
-         CACHE PATH "The ${APPLICATION_NAME} info install dir (default prefix/info)"
-         FORCE
-     )
-+endif()
- endif (UNIX)
+@@ -127,7 +127,7 @@ if (UNIX OR MINGW OR WIN32)
+   set (PKGCONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig" CACHE PATH "pkgconfig dir" FORCE)
+ endif ()
  
--if (WIN32)
+-if (MSCV)
 +if (0)
  	# Same same
  	SET(BIN_INSTALL_DIR .)
  	SET(SBIN_INSTALL_DIR .)
-@@ -134,5 +135,5 @@ if (WIN32)
+@@ -137,5 +137,5 @@ if (MSCV)
  	SET(ICON_INSTALL_DIR .)
  	SET(SOUND_INSTALL_DIR .)
  	SET(LOCALE_INSTALL_DIR lang)
--endif (WIN32)
-+endif (0)
- 
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index fade00c..a4e6c3f 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -14,7 +14,7 @@ floatfann.c
- ADD_LIBRARY(floatfann SHARED ${floatfann_LIB_SRCS})
- 
- SET_TARGET_PROPERTIES(floatfann PROPERTIES VERSION ${VERSION} SOVERSION 2 )
--INSTALL(TARGETS floatfann DESTINATION ${LIB_INSTALL_DIR} )
-+INSTALL(TARGETS floatfann RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib )
- 
- 
- ########### next target ###############
-@@ -26,7 +26,7 @@ doublefann.c
- ADD_LIBRARY(doublefann SHARED ${doublefann_LIB_SRCS})
- 
- SET_TARGET_PROPERTIES(doublefann PROPERTIES VERSION ${VERSION} SOVERSION 2 )
--INSTALL(TARGETS doublefann DESTINATION ${LIB_INSTALL_DIR} )
-+INSTALL(TARGETS doublefann RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib )
- 
- 
- ########### next target ###############
-@@ -38,7 +38,7 @@ fixedfann.c
- ADD_LIBRARY(fixedfann SHARED ${fixedfann_LIB_SRCS})
- 
- SET_TARGET_PROPERTIES(fixedfann PROPERTIES VERSION ${VERSION} SOVERSION 2 )
--INSTALL(TARGETS fixedfann DESTINATION ${LIB_INSTALL_DIR} )
-+INSTALL(TARGETS fixedfann RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib )
- 
- 
- ########### next target ###############
-@@ -50,5 +50,5 @@ floatfann.c
- ADD_LIBRARY(fann SHARED ${fann_LIB_SRCS})
- 
- SET_TARGET_PROPERTIES(fann PROPERTIES VERSION ${VERSION} SOVERSION 2 )
--INSTALL(TARGETS fann DESTINATION ${LIB_INSTALL_DIR} )
-+INSTALL(TARGETS fann RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib )
+-endif (MSCV)
++endif ()
  
diff --git a/external_imported/vcpkg/ports/fann/fix-uwp-build.patch b/external_imported/vcpkg/ports/fann/fix-uwp-build.patch
index dd42358bd..bcd12e1f0 100644
--- a/external_imported/vcpkg/ports/fann/fix-uwp-build.patch
+++ b/external_imported/vcpkg/ports/fann/fix-uwp-build.patch
@@ -1,10 +1,10 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b91f6fb..22c39d7 100644
+index 6c33c25..2c35ea2 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -22,6 +22,10 @@ SET(PKGCONFIG_INSTALL_DIR /lib/pkgconfig)
+@@ -82,6 +82,10 @@ configure_file (cmake/fann.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/fann.pc @ONLY)
  
- INSTALL_FILES( ${PKGCONFIG_INSTALL_DIR} FILES  fann.pc )
+ install (FILES ${CMAKE_CURRENT_BINARY_DIR}/fann.pc DESTINATION ${PKGCONFIG_INSTALL_DIR})
  
 +if (MSVC)
 +    add_compile_options(/wd4996)
diff --git a/external_imported/vcpkg/ports/fann/portfile.cmake b/external_imported/vcpkg/ports/fann/portfile.cmake
index b74433baf..b1829693e 100644
--- a/external_imported/vcpkg/ports/fann/portfile.cmake
+++ b/external_imported/vcpkg/ports/fann/portfile.cmake
@@ -1,12 +1,14 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libfann/fann
-    REF 2.2.0
-    SHA512 b307539a39d93078a489710ac77aa8c6e324f3cf5ef80299ce257d10c043913764abef83aceac5278a5bd243b1ee245b4e8331a9e13c774aa63c9cb604f86bdd
+    REF 8409b42d308bf9428b9d3e60927595e53a797bbc
+    SHA512 4ad66808d7c88911d4c6d63368240ece2d0cbc73d89a95d32261b95dc551c47c46b3a34cc81b8cb0e03fe3f9ea61cb304e028780357bcf332d660824b066fd1e
     HEAD_REF master
     PATCHES
         fix-installation.patch
         fix-uwp-build.patch
+        fix-build_type.patch
+        remove-nouse-target.patch
 )
 
 set(INSTALL_BASE_DIR_DBG "${CURRENT_PACKAGES_DIR}/debug")
@@ -17,10 +19,11 @@ vcpkg_cmake_configure(
     OPTIONS_DEBUG
         -DBIN_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/bin
         -DSBIN_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/sbin
-        -DLIB_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/bin
+        -DLIB_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/lib
         -DEXEC_INSTALL_PREFIX=${INSTALL_BASE_DIR_DBG}/tools/${PORT}
         -DXDG_APPS_DIR=${INSTALL_BASE_DIR_DBG}/tools/${PORT}
         -DPLUGIN_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/tools/${PORT}
+        -DINCLUDE_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/include
         -DSHARE_INSTALL_PREFIX=${INSTALL_BASE_DIR_DBG}/share/${PORT}
         -DDATA_INSTALL_PREFIX=${INSTALL_BASE_DIR_DBG}/share/${PORT}
         -DHTML_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/share/${PORT}/doc
@@ -32,10 +35,11 @@ vcpkg_cmake_configure(
     OPTIONS_RELEASE
         -DBIN_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/bin
         -DSBIN_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/sbin
-        -DLIB_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/bin
+        -DLIB_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/lib
         -DEXEC_INSTALL_PREFIX=${INSTALL_BASE_DIR_REL}/tools/${PORT}
         -DXDG_APPS_DIR=${INSTALL_BASE_DIR_REL}/tools/${PORT}
         -DPLUGIN_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/tools/${PORT}
+        -DINCLUDE_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/include
         -DSHARE_INSTALL_PREFIX=${INSTALL_BASE_DIR_REL}/share/${PORT}
         -DDATA_INSTALL_PREFIX=${INSTALL_BASE_DIR_REL}/share/${PORT}
         -DHTML_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/share/${PORT}/doc
@@ -52,10 +56,9 @@ vcpkg_copy_pdbs()
 
 vcpkg_fixup_pkgconfig()
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
-endif()
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-file(INSTALL "${SOURCE_PATH}/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
diff --git a/external_imported/vcpkg/ports/fann/remove-nouse-target.patch b/external_imported/vcpkg/ports/fann/remove-nouse-target.patch
new file mode 100644
index 000000000..82a266679
--- /dev/null
+++ b/external_imported/vcpkg/ports/fann/remove-nouse-target.patch
@@ -0,0 +1,85 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index ac3ff73..2fb9a59 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -23,15 +23,12 @@ SET(floatfann_LIB_SRCS
+         floatfann.c
+         )
+ 
+-ADD_LIBRARY(floatfann SHARED ${floatfann_LIB_SRCS})
+-ADD_LIBRARY(floatfann_static STATIC ${floatfann_LIB_SRCS})
++ADD_LIBRARY(floatfann ${floatfann_LIB_SRCS})
+ 
+ SET_TARGET_PROPERTIES(floatfann PROPERTIES VERSION ${FANN_VERSION_STRING} SOVERSION ${FANN_VERSION_MAJOR})
+-SET_TARGET_PROPERTIES(floatfann_static PROPERTIES VERSION ${FANN_VERSION_STRING} SOVERSION ${FANN_VERSION_MAJOR})
+ if (UNIX)
+-  SET_TARGET_PROPERTIES(floatfann_static PROPERTIES OUTPUT_NAME floatfann)
+ endif(UNIX)
+-INSTALL(TARGETS floatfann floatfann_static LIBRARY DESTINATION ${LIB_INSTALL_DIR}
++INSTALL(TARGETS floatfann LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+         ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+         RUNTIME DESTINATION ${BIN_INSTALL_DIR} )
+ 
+@@ -42,15 +39,12 @@ SET(doublefann_LIB_SRCS
+         doublefann.c
+         )
+ 
+-ADD_LIBRARY(doublefann SHARED ${doublefann_LIB_SRCS})
+-ADD_LIBRARY(doublefann_static STATIC ${doublefann_LIB_SRCS})
++ADD_LIBRARY(doublefann ${doublefann_LIB_SRCS})
+ 
+ SET_TARGET_PROPERTIES(doublefann PROPERTIES VERSION ${FANN_VERSION_STRING} SOVERSION ${FANN_VERSION_MAJOR})
+-SET_TARGET_PROPERTIES(doublefann_static PROPERTIES VERSION ${FANN_VERSION_STRING} SOVERSION ${FANN_VERSION_MAJOR})
+ if (UNIX)
+-  SET_TARGET_PROPERTIES(doublefann_static PROPERTIES OUTPUT_NAME doublefann)
+ endif(UNIX)
+-INSTALL(TARGETS doublefann doublefann_static LIBRARY DESTINATION ${LIB_INSTALL_DIR}
++INSTALL(TARGETS doublefann LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+         ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+         RUNTIME DESTINATION ${BIN_INSTALL_DIR} )
+ 
+@@ -61,20 +55,16 @@ SET(fixedfann_LIB_SRCS
+         fixedfann.c
+         )
+ 
+-ADD_LIBRARY(fixedfann SHARED ${fixedfann_LIB_SRCS})
+-ADD_LIBRARY(fixedfann_static STATIC ${fixedfann_LIB_SRCS})
++ADD_LIBRARY(fixedfann ${fixedfann_LIB_SRCS})
+ 
+ if(NOT MSVC)
+ TARGET_LINK_LIBRARIES(fixedfann m)
+-TARGET_LINK_LIBRARIES(fixedfann_static m)
+ endif(NOT MSVC)
+ 
+ SET_TARGET_PROPERTIES(fixedfann PROPERTIES VERSION ${FANN_VERSION_STRING} SOVERSION ${FANN_VERSION_MAJOR})
+-SET_TARGET_PROPERTIES(fixedfann_static PROPERTIES VERSION ${FANN_VERSION_STRING} SOVERSION ${FANN_VERSION_MAJOR})
+ if (UNIX)
+-  SET_TARGET_PROPERTIES(fixedfann_static PROPERTIES OUTPUT_NAME fixedfann)
+ endif(UNIX)
+-INSTALL(TARGETS fixedfann fixedfann_static LIBRARY DESTINATION ${LIB_INSTALL_DIR}
++INSTALL(TARGETS fixedfann LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+         ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+         RUNTIME DESTINATION ${BIN_INSTALL_DIR} )
+ 
+@@ -85,19 +75,15 @@ SET(fann_LIB_SRCS
+         floatfann.c
+         )
+ 
+-ADD_LIBRARY(fann SHARED ${fann_LIB_SRCS})
+-ADD_LIBRARY(fann_static STATIC ${fann_LIB_SRCS})
++ADD_LIBRARY(fann ${fann_LIB_SRCS})
+ 
+ if(NOT MSVC)
+ TARGET_LINK_LIBRARIES(fann m)
+-TARGET_LINK_LIBRARIES(fann_static m)
+ endif(NOT MSVC)
+ 
+ SET_TARGET_PROPERTIES(fann PROPERTIES VERSION ${FANN_VERSION_STRING} SOVERSION ${FANN_VERSION_MAJOR})
+-SET_TARGET_PROPERTIES(fann_static PROPERTIES VERSION ${FANN_VERSION_STRING} SOVERSION ${FANN_VERSION_MAJOR})
+ if (UNIX)
+-  SET_TARGET_PROPERTIES(fann_static PROPERTIES OUTPUT_NAME fann)
+ endif(UNIX)
+-INSTALL(TARGETS fann fann_static LIBRARY DESTINATION ${LIB_INSTALL_DIR}
++INSTALL(TARGETS fann LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+         ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+         RUNTIME DESTINATION ${BIN_INSTALL_DIR} )
diff --git a/external_imported/vcpkg/ports/fann/vcpkg.json b/external_imported/vcpkg/ports/fann/vcpkg.json
index 03f16620c..0441b07ee 100644
--- a/external_imported/vcpkg/ports/fann/vcpkg.json
+++ b/external_imported/vcpkg/ports/fann/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "fann",
-  "version": "2.2.0",
-  "port-version": 3,
+  "version-date": "2023-01-26",
   "description": "Fast Artificial Neural Network (FANN) Library is a free open source neural network library, which implements multilayer artificial neural networks in C with support for both fully connected and sparsely connected networks.",
   "homepage": "https://github.com/libfann/fann",
   "license": "LGPL-2.1-only",
@@ -9,6 +8,10 @@
     {
       "name": "vcpkg-cmake",
       "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/farmhash/portfile.cmake b/external_imported/vcpkg/ports/farmhash/portfile.cmake
index 5f19a87ae..dcc594fe7 100644
--- a/external_imported/vcpkg/ports/farmhash/portfile.cmake
+++ b/external_imported/vcpkg/ports/farmhash/portfile.cmake
@@ -2,9 +2,9 @@
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY) 
 
 vcpkg_download_distfile(WIN_PR_PATCH
-    URLS "https://github.com/google/farmhash/pull/40.diff"
+    URLS "https://github.com/google/farmhash/pull/40.diff?full_index=1"
     FILENAME farmhash-pr-40.patch
-    SHA512 265f5c15c17da2b88c82e6016a181abe73d2d94492cdb0cba892acf67a9d40815d54fa81e07351254fe2a39aea143b125924db0e7df14aac84a7469a78612cbd
+    SHA512 a479450e3e2c4810ef67bb0704c30c2779e12a8768524f179235fae8687d064e62ee225b4b167a30fda59c39de40587629813804f452841badf308e1e76607a7
 )
 
 vcpkg_from_github(
diff --git a/external_imported/vcpkg/ports/farmhash/vcpkg.json b/external_imported/vcpkg/ports/farmhash/vcpkg.json
index 99fded3e1..af9bc2616 100644
--- a/external_imported/vcpkg/ports/farmhash/vcpkg.json
+++ b/external_imported/vcpkg/ports/farmhash/vcpkg.json
@@ -1,8 +1,9 @@
 {
   "name": "farmhash",
   "version": "1.1",
-  "port-version": 5,
+  "port-version": 6,
   "description": "FarmHash, a family of hash functions.",
   "homepage": "https://github.com/google/farmhash",
+  "license": "MIT",
   "supports": "!arm"
 }
diff --git a/external_imported/vcpkg/ports/fast-float/portfile.cmake b/external_imported/vcpkg/ports/fast-float/portfile.cmake
index 347854034..5590e82e3 100644
--- a/external_imported/vcpkg/ports/fast-float/portfile.cmake
+++ b/external_imported/vcpkg/ports/fast-float/portfile.cmake
@@ -1,18 +1,23 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO fastfloat/fast_float
-    REF v3.5.1
-    SHA512 82f9a020167b3ba4e4583709164b4b28c2fabc7eb99a337f9cef7061eaa7479a51367420aeeb6578341038afe77f5656e8351518f062a04b02a08c2eacda7b46
+    REF "v${VERSION}"
+    SHA512 37280efebea7aa33cc25c8d8375b6c9456a8025d29d618abb5aac580c025097a6110ec3a913d1504fd9af1df43e434bc5411e07e38dd66c12491f3edc7374fff
     HEAD_REF master
 )
 
+set(VCPKG_BUILD_TYPE release) # header-only port
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DFASTFLOAT_INSTALL=ON
 )
 
 vcpkg_cmake_install()
-
 vcpkg_cmake_config_fixup(PACKAGE_NAME FastFloat CONFIG_PATH share/cmake/FastFloat)
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
-file(INSTALL "${SOURCE_PATH}/LICENSE-MIT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
\ No newline at end of file
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE-APACHE" "${SOURCE_PATH}/LICENSE-BOOST" "${SOURCE_PATH}/LICENSE-MIT")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/fast-float/usage b/external_imported/vcpkg/ports/fast-float/usage
new file mode 100644
index 000000000..3282afc6a
--- /dev/null
+++ b/external_imported/vcpkg/ports/fast-float/usage
@@ -0,0 +1,4 @@
+fast-float provides CMake targets:
+
+    find_package(FastFloat CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE FastFloat::fast_float)
diff --git a/external_imported/vcpkg/ports/fast-float/vcpkg.json b/external_imported/vcpkg/ports/fast-float/vcpkg.json
index 5c7cd19b7..fb8750424 100644
--- a/external_imported/vcpkg/ports/fast-float/vcpkg.json
+++ b/external_imported/vcpkg/ports/fast-float/vcpkg.json
@@ -1,9 +1,9 @@
 {
   "name": "fast-float",
-  "version": "3.5.1",
+  "version": "6.0.0",
   "description": "Fast and exact implementation of the C++ from_chars functions for float and double types: 4x faster than strtod",
   "homepage": "https://github.com/fastfloat/fast_float",
-  "license": "Apache-2.0 OR MIT",
+  "license": "Apache-2.0 OR BSL-1.0 OR MIT",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/fastcdr/portfile.cmake b/external_imported/vcpkg/ports/fastcdr/portfile.cmake
index 0f448c8fb..26ce8589f 100644
--- a/external_imported/vcpkg/ports/fastcdr/portfile.cmake
+++ b/external_imported/vcpkg/ports/fastcdr/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO eProsima/Fast-CDR
     REF v${VERSION}
-    SHA512 6b31e9ba2f7fe719eb4ac7af59a34cdff1c0d13ed40340d8bea8bfa477c0ffe080f4d6c73096add62f3b20af5fbf8ee8bde288dd9074bfb094b5b355016184f2
+    SHA512 66040acb563d7c06efb67a1536eb178183776e71a6b54c7e02efbe50ff0926aa24d87fb7869273e985c5c0f2b5d1496d3b1a20f10358373c73171b51c71e7e6a
     HEAD_REF master
     PATCHES
         pdb-file.patch
diff --git a/external_imported/vcpkg/ports/fastcdr/vcpkg.json b/external_imported/vcpkg/ports/fastcdr/vcpkg.json
index 374d94dc0..6e21acc09 100644
--- a/external_imported/vcpkg/ports/fastcdr/vcpkg.json
+++ b/external_imported/vcpkg/ports/fastcdr/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "fastcdr",
-  "version-semver": "1.0.26",
+  "version-semver": "1.1.0",
   "description": "eProsima FastCDR is a C++ library that provides two serialization mechanisms. One is the standard CDR serialization mechanism, while the other is a faster implementation that modifies the standard.",
   "homepage": "https://github.com/eProsima/Fast-CDR",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/fastfeat/portfile.cmake b/external_imported/vcpkg/ports/fastfeat/portfile.cmake
index 18ec525ca..d76f392e4 100644
--- a/external_imported/vcpkg/ports/fastfeat/portfile.cmake
+++ b/external_imported/vcpkg/ports/fastfeat/portfile.cmake
@@ -8,20 +8,19 @@ vcpkg_from_github(
 
 
 file(COPY
-${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt
- ${CMAKE_CURRENT_LIST_DIR}/fastfeat.def
-DESTINATION ${SOURCE_PATH}
+"${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+"${CMAKE_CURRENT_LIST_DIR}/fastfeat.def"
+DESTINATION "${SOURCE_PATH}"
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS_DEBUG
         -DDISABLE_INSTALL_HEADERS=ON
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/fastfeat RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/fastfeat" RENAME copyright)
diff --git a/external_imported/vcpkg/ports/fastfeat/vcpkg.json b/external_imported/vcpkg/ports/fastfeat/vcpkg.json
index 550c8b708..597ce506f 100644
--- a/external_imported/vcpkg/ports/fastfeat/vcpkg.json
+++ b/external_imported/vcpkg/ports/fastfeat/vcpkg.json
@@ -1,6 +1,12 @@
 {
   "name": "fastfeat",
   "version-string": "391d5e9",
-  "port-version": 2,
-  "description": "FAST feature detectors in C"
+  "port-version": 4,
+  "description": "FAST feature detectors in C",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/fastgltf/find_package.patch b/external_imported/vcpkg/ports/fastgltf/find_package.patch
new file mode 100644
index 000000000..fb2a53396
--- /dev/null
+++ b/external_imported/vcpkg/ports/fastgltf/find_package.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a311b65..bfbfbb3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -74,6 +74,8 @@ if (FASTGLTF_DOWNLOAD_SIMDJSON)
+         NAMESPACE fastgltf::
+         DESTINATION lib/cmake/fastgltf
+     )
++else()
++    find_package(simdjson CONFIG REQUIRED)
+ endif()
+ 
+ # Create the library target
diff --git a/external_imported/vcpkg/ports/fastgltf/portfile.cmake b/external_imported/vcpkg/ports/fastgltf/portfile.cmake
index 4349c291c..2e4ebee6d 100644
--- a/external_imported/vcpkg/ports/fastgltf/portfile.cmake
+++ b/external_imported/vcpkg/ports/fastgltf/portfile.cmake
@@ -1,9 +1,10 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO spnda/fastgltf
-    REF d21c46e86c28fca1e998cb8a741e62e0a8026b89
-    SHA512 935bdbd0bf04fc72f5ad5f06f5641493533b6bbfdaf64117eb40093b6c4298da22274b4b6b768489c47f8051bda42f8bf3466ee508cdb3dbe1e61379a461075b
+    REF "v${VERSION}"
+    SHA512 6cda7e50d7fe01428e0a03d3f590fe7b680bfa4b6fcdbd1c6a118ac01c925099e63b34380b053adc323e2aaaaead42bda450d1eaf66b60af6ad2aafb68828d01
     HEAD_REF main
+    PATCHES find_package.patch
 )
 
 vcpkg_cmake_configure(
@@ -15,4 +16,10 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
 vcpkg_copy_pdbs()
 
+file(READ "${CURRENT_PACKAGES_DIR}/share/fastgltf/fastgltfConfig.cmake" contents)
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/fastgltf/fastgltfConfig.cmake" "
+include(CMakeFindDependencyMacro)
+find_dependency(simdjson)
+${contents}")
+
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/external_imported/vcpkg/ports/fastgltf/vcpkg.json b/external_imported/vcpkg/ports/fastgltf/vcpkg.json
index 621a2ab68..0f1bc1fce 100644
--- a/external_imported/vcpkg/ports/fastgltf/vcpkg.json
+++ b/external_imported/vcpkg/ports/fastgltf/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "fastgltf",
-  "version": "0.2.0",
+  "version": "0.6.1",
+  "port-version": 1,
   "description": "Blazing fast C++17 glTF 2.0 loader powered by SIMD",
   "homepage": "https://github.com/spnda/fastgltf",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/fastio/portfile.cmake b/external_imported/vcpkg/ports/fastio/portfile.cmake
index 832decbbf..cb460f787 100644
--- a/external_imported/vcpkg/ports/fastio/portfile.cmake
+++ b/external_imported/vcpkg/ports/fastio/portfile.cmake
@@ -2,17 +2,19 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO cppfastio/fast_io
-    REF 88c3c87290f07bd97b31c71fbd815b7d20ab66d9
-    SHA512 da356498797d2bc50671e5a12099e9a9c50f1f1c570cd7ed68ef32082e1778d86efeeddea57c84a116fb817572d9fbbd33d8e44fef6a38b760fcb8ab8edbe6ab
+    REF 804d943e30df0da782538d508da6ea6e427fc2cf
+    SHA512 543f91bb55e3dec305a5d0103b2eba9304b3d0a5f8874a38d4ebb584c027fcc2f9cedfb5716bac2951f1474b2467fe287f70b8287452f8ba277663f8342a112c
     HEAD_REF master
 )
 
+set(VCPKG_BUILD_TYPE release) # header-only port
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
 )
 
 vcpkg_cmake_install()
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
 
-file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
\ No newline at end of file
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/license.txt")
diff --git a/external_imported/vcpkg/ports/fastio/vcpkg.json b/external_imported/vcpkg/ports/fastio/vcpkg.json
index e5b7eaafc..39633c535 100644
--- a/external_imported/vcpkg/ports/fastio/vcpkg.json
+++ b/external_imported/vcpkg/ports/fastio/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "fastio",
-  "version-date": "2022-11-14",
+  "version-date": "2023-11-06",
   "description": "fast_io is an extremely fast C++20 input/output library aiming to replace <iostream> and <cstdio>. It supports networking, NT apis, pipe, filesystem, winrt hstring, Qt, OpenSSL, cryptography. It is freestanding and it works on any platform, including dos, win95, wasm, linux kernel, windows kernel or your own operating system kernel. It has no dependencies.",
   "homepage": "https://github.com/cppfastio/fast_io",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/fastlz/portfile.cmake b/external_imported/vcpkg/ports/fastlz/portfile.cmake
index b9923d374..2826af500 100644
--- a/external_imported/vcpkg/ports/fastlz/portfile.cmake
+++ b/external_imported/vcpkg/ports/fastlz/portfile.cmake
@@ -8,16 +8,15 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE.MIT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE.MIT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/external_imported/vcpkg/ports/fastlz/vcpkg.json b/external_imported/vcpkg/ports/fastlz/vcpkg.json
index c27e1a601..04e23e869 100644
--- a/external_imported/vcpkg/ports/fastlz/vcpkg.json
+++ b/external_imported/vcpkg/ports/fastlz/vcpkg.json
@@ -1,6 +1,13 @@
 {
   "name": "fastlz",
   "version-date": "2021-05-10",
+  "port-version": 2,
   "description": "A lightning-fast lossless compression library",
-  "homepage": "https://github.com/ariya/FastLZ"
+  "homepage": "https://github.com/ariya/FastLZ",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/fastrtps/fix-xtime.patch b/external_imported/vcpkg/ports/fastrtps/fix-xtime.patch
new file mode 100644
index 000000000..586233d02
--- /dev/null
+++ b/external_imported/vcpkg/ports/fastrtps/fix-xtime.patch
@@ -0,0 +1,23 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7ca47ae..632c38b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -42,6 +42,18 @@ message(STATUS "Version: ${PROJECT_VERSION}")
+ ###############################################################################
+ option(EPROSIMA_BUILD "Activate internal building" OFF)
+ 
++###############################################################################
++# Replace xtime with _timespec64. As a workround of the unreleased version of 
++# MSVC, it will be deleted after release.
++###############################################################################
++if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
++    if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "19.37.32705.0")
++        file(READ "${PROJECT_SOURCE_DIR}/include/fastrtps/utils/TimedMutex.hpp" _contents)
++        string(REPLACE "xtime*" "_timespec64*" _contents "${_contents}")
++        file(WRITE "${PROJECT_SOURCE_DIR}/include/fastrtps/utils/TimedMutex.hpp" "${_contents}")
++    endif()
++endif()
++
+ ###############################################################################
+ # Warning level
+ ###############################################################################
diff --git a/external_imported/vcpkg/ports/fastrtps/fix_thread.patch b/external_imported/vcpkg/ports/fastrtps/fix_thread.patch
new file mode 100644
index 000000000..075a940cf
--- /dev/null
+++ b/external_imported/vcpkg/ports/fastrtps/fix_thread.patch
@@ -0,0 +1,40 @@
+diff --git a/include/fastrtps/utils/TimedMutex.hpp b/include/fastrtps/utils/TimedMutex.hpp
+index 8d5d968..7ba3e00 100644
+--- a/include/fastrtps/utils/TimedMutex.hpp
++++ b/include/fastrtps/utils/TimedMutex.hpp
+@@ -23,10 +23,14 @@
+ #include <iostream>
+
+ #if defined(_WIN32)
++#if defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 193632528
++#include <mutex>
++#else
+ #include <thread>
+ extern int clock_gettime(
+         int,
+         struct timespec* tv);
++#endif // if defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 193632528
+ #elif _GTHREAD_USE_MUTEX_TIMEDLOCK
+ #include <mutex>
+ #else
+@@ -37,6 +41,11 @@ namespace eprosima {
+ namespace fastrtps {
+
+ #if defined(_WIN32)
++
++#if defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 193632528
++using TimedMutex = std::timed_mutex;
++using RecursiveTimedMutex = std::recursive_timed_mutex;
++#else
+ class TimedMutex
+ {
+ public:
+@@ -182,6 +191,8 @@ private:
+
+     _Mtx_t mutex_;
+ };
++#endif // if defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 193632528
++
+ #elif _GTHREAD_USE_MUTEX_TIMEDLOCK || !defined(__unix__)
+ using TimedMutex = std::timed_mutex;
+ using RecursiveTimedMutex = std::recursive_timed_mutex;
diff --git a/external_imported/vcpkg/ports/fastrtps/portfile.cmake b/external_imported/vcpkg/ports/fastrtps/portfile.cmake
index 4bcf76b0e..5a600f9eb 100644
--- a/external_imported/vcpkg/ports/fastrtps/portfile.cmake
+++ b/external_imported/vcpkg/ports/fastrtps/portfile.cmake
@@ -1,3 +1,13 @@
+# https://github.com/eProsima/Fast-DDS/pull/3983
+# Could remove after 2.6.6/2.10.2/2.11.2, other minor versions not applied
+# Could remove after 2.13 released, or any newer mijor versions
+vcpkg_download_distfile(
+    PR_3983_PATCH
+    URLS https://github.com/eProsima/Fast-DDS/commit/2601e95429f5676c47c25200e995fb93157e7815.patch?full_index=1
+    SHA512 440ee6a918d7085b6520613fad1482a9b833ee259e64c8919bdeb43277f3685362e6314380bafc6c51dad46fd16a9b415343e9db28f157d13f76b9af0cb21e8d
+    FILENAME fastrtps-2601e95429f5676c47c25200e995fb93157e7815.patch
+)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO eProsima/Fast-DDS
@@ -7,10 +17,14 @@ vcpkg_from_github(
     PATCHES
         fix-find-package-asio.patch
         disable-symlink.patch
+        fix-xtime.patch
+        fix_thread.patch #https://github.com/eProsima/Fast-DDS/pull/3904
+        "${PR_3983_PATCH}"
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    DISABLE_PARALLEL_CONFIGURE # due to fix-xtime.patch
 )
 
 vcpkg_cmake_install()
@@ -69,4 +83,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/fastrtps/vcpkg.json b/external_imported/vcpkg/ports/fastrtps/vcpkg.json
index 117a007c8..32c8bf714 100644
--- a/external_imported/vcpkg/ports/fastrtps/vcpkg.json
+++ b/external_imported/vcpkg/ports/fastrtps/vcpkg.json
@@ -1,9 +1,11 @@
 {
   "name": "fastrtps",
   "version": "2.7.0",
+  "port-version": 5,
   "description": "Eprosima Fast RTPS is a C++ implementation of the RTPS (Real Time Publish Subscribe) protocol, which provides publisher-subscriber communications over unreliable transports such as UDP, as defined and maintained by the Object Management Group (OMG) consortium.",
   "homepage": "https://www.eprosima.com/",
   "license": "Apache-2.0",
+  "supports": "!uwp",
   "dependencies": [
     "asio",
     "fastcdr",
diff --git a/external_imported/vcpkg/ports/fbgemm/fix-cmakelists.patch b/external_imported/vcpkg/ports/fbgemm/fix-cmakelists.patch
index 3f0b9015c..d209c795e 100644
--- a/external_imported/vcpkg/ports/fbgemm/fix-cmakelists.patch
+++ b/external_imported/vcpkg/ports/fbgemm/fix-cmakelists.patch
@@ -1,146 +1,146 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6f19a16..3c758d2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -6,7 +6,6 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
- include(GNUInstallDirs)
- 
- # function to extract filelists from defs.bzl file
--find_package(PythonInterp)
- function(get_filelist name outputvar)
-   execute_process(
-     COMMAND "${PYTHON_EXECUTABLE}" -c
-@@ -19,9 +18,6 @@ endfunction()
- 
- project(fbgemm VERSION 0.1 LANGUAGES CXX C)
- 
--set(FBGEMM_LIBRARY_TYPE "default" CACHE STRING
--  "Type of library (shared, static, or default) to build")
--set_property(CACHE FBGEMM_LIBRARY_TYPE PROPERTY STRINGS default static shared)
- option(FBGEMM_BUILD_TESTS "Build fbgemm unit tests" ON)
- option(FBGEMM_BUILD_BENCHMARKS "Build fbgemm benchmarks" ON)
- option(FBGEMM_BUILD_DOCS "Build fbgemm documentation" OFF)
-@@ -101,18 +97,11 @@ set_target_properties(fbgemm_generic fbgemm_avx2 fbgemm_avx512 PROPERTIES
- #2) MSVC uses /MD in default cxx compiling flags,
- #need to change it to /MT in static case
- if(MSVC)
--  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4267 /wd4305 /wd4309")
--  if(FBGEMM_LIBRARY_TYPE STREQUAL "static")
-+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4267 /wd4305 /wd4309 /wd4703")
-+  if(NOT BUILD_SHARED_LIBS)
-     target_compile_definitions(fbgemm_generic PRIVATE ASMJIT_STATIC)
-     target_compile_definitions(fbgemm_avx2 PRIVATE ASMJIT_STATIC)
-     target_compile_definitions(fbgemm_avx512 PRIVATE ASMJIT_STATIC)
--    foreach(flag_var
--      CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
--      CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
--      if(${flag_var} MATCHES "/MD")
--        string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
--      endif(${flag_var} MATCHES "/MD")
--    endforeach(flag_var)
-   endif()
-   target_compile_options(fbgemm_avx2 PRIVATE "/arch:AVX2")
-   target_compile_options(fbgemm_avx512 PRIVATE "/arch:AVX512")
-@@ -145,7 +134,8 @@ message(WARNING "CMAKE_CXX_FLAGS_DEBUG is ${CMAKE_CXX_FLAGS_DEBUG}")
- message(WARNING "CMAKE_CXX_FLAGS_RELEASE is ${CMAKE_CXX_FLAGS_RELEASE}")
- message(WARNING "==========")
- 
--if(NOT TARGET asmjit)
-+find_package(asmjit CONFIG REQUIRED) # target 'asmjit::asmjit'
-+if(FALSE)
-   #Download asmjit from github if ASMJIT_SRC_DIR is not specified.
-   if(NOT DEFINED ASMJIT_SRC_DIR)
-     set(ASMJIT_SRC_DIR "${FBGEMM_SOURCE_DIR}/third_party/asmjit"
-@@ -164,7 +154,8 @@ if(NOT TARGET asmjit)
-   set_property(TARGET asmjit PROPERTY POSITION_INDEPENDENT_CODE ON)
- endif()
- 
--if(NOT TARGET cpuinfo)
-+find_package(cpuinfo CONFIG REQUIRED) # target 'cpuinfo::cpuinfo'
-+if(FALSE)
-   #Download cpuinfo from github if CPUINFO_SOURCE_DIR is not specified.
-   if(NOT DEFINED CPUINFO_SOURCE_DIR)
-     set(CPUINFO_SOURCE_DIR "${FBGEMM_SOURCE_DIR}/third_party/cpuinfo"
-@@ -185,49 +176,38 @@ endif()
- target_include_directories(fbgemm_generic BEFORE
-       PUBLIC $<BUILD_INTERFACE:${FBGEMM_SOURCE_DIR}>
-       PUBLIC $<BUILD_INTERFACE:${FBGEMM_SOURCE_DIR}/include>
--      PRIVATE "${ASMJIT_SRC_DIR}/src"
--      PRIVATE "${CPUINFO_SOURCE_DIR}/include")
-+)
-+target_link_libraries(fbgemm_generic PUBLIC asmjit::asmjit cpuinfo::cpuinfo)
- 
- target_include_directories(fbgemm_avx2 BEFORE
-       PUBLIC $<BUILD_INTERFACE:${FBGEMM_SOURCE_DIR}>
-       PUBLIC $<BUILD_INTERFACE:${FBGEMM_SOURCE_DIR}/include>
--      PRIVATE "${ASMJIT_SRC_DIR}/src"
--      PRIVATE "${CPUINFO_SOURCE_DIR}/include")
-+)
-+target_link_libraries(fbgemm_avx2 PUBLIC asmjit::asmjit cpuinfo::cpuinfo)
- 
- target_include_directories(fbgemm_avx512 BEFORE
-       PUBLIC $<BUILD_INTERFACE:${FBGEMM_SOURCE_DIR}>
-       PUBLIC $<BUILD_INTERFACE:${FBGEMM_SOURCE_DIR}/include>
--      PRIVATE "${ASMJIT_SRC_DIR}/src"
--      PRIVATE "${CPUINFO_SOURCE_DIR}/include")
--
--if(FBGEMM_LIBRARY_TYPE STREQUAL "default")
--  add_library(fbgemm
--    $<TARGET_OBJECTS:fbgemm_generic>
--    $<TARGET_OBJECTS:fbgemm_avx2>
--    $<TARGET_OBJECTS:fbgemm_avx512>)
--elseif(FBGEMM_LIBRARY_TYPE STREQUAL "shared")
--  add_library(fbgemm SHARED
--    $<TARGET_OBJECTS:fbgemm_generic>
--    $<TARGET_OBJECTS:fbgemm_avx2>
--    $<TARGET_OBJECTS:fbgemm_avx512>)
-+)
-+target_link_libraries(fbgemm_avx512 PUBLIC asmjit::asmjit cpuinfo::cpuinfo)
-+
-+add_library(fbgemm
-+  $<TARGET_OBJECTS:fbgemm_generic>
-+  $<TARGET_OBJECTS:fbgemm_avx2>
-+  $<TARGET_OBJECTS:fbgemm_avx512>)
-+if(BUILD_SHARED_LIBS)
-   set_property(TARGET fbgemm_generic PROPERTY POSITION_INDEPENDENT_CODE ON)
-   set_property(TARGET fbgemm_avx2 PROPERTY POSITION_INDEPENDENT_CODE ON)
-   set_property(TARGET fbgemm_avx512 PROPERTY POSITION_INDEPENDENT_CODE ON)
-   set_target_properties(fbgemm PROPERTIES
-     CXX_VISIBILITY_PRESET hidden)
--elseif(FBGEMM_LIBRARY_TYPE STREQUAL "static")
--  add_library(fbgemm STATIC
--    $<TARGET_OBJECTS:fbgemm_generic>
--    $<TARGET_OBJECTS:fbgemm_avx2>
--    $<TARGET_OBJECTS:fbgemm_avx512>)
-+else()
-   #MSVC need to define FBGEMM_STATIC for fbgemm_generic also to
-   #avoid generating _dllimport functions.
-   target_compile_definitions(fbgemm_generic PRIVATE FBGEMM_STATIC)
-   target_compile_definitions(fbgemm_avx2 PRIVATE FBGEMM_STATIC)
-   target_compile_definitions(fbgemm_avx512 PRIVATE FBGEMM_STATIC)
-   target_compile_definitions(fbgemm PRIVATE FBGEMM_STATIC)
--else()
--  message(FATAL_ERROR "Unsupported library type ${FBGEMM_LIBRARY_TYPE}")
- endif()
- 
- if(USE_SANITIZER)
-@@ -239,9 +219,7 @@ target_include_directories(fbgemm BEFORE
-     PUBLIC $<BUILD_INTERFACE:${FBGEMM_SOURCE_DIR}>
-     PUBLIC $<BUILD_INTERFACE:${FBGEMM_SOURCE_DIR}/include>)
- 
--target_link_libraries(fbgemm $<BUILD_INTERFACE:asmjit>
--  $<BUILD_INTERFACE:cpuinfo>)
--add_dependencies(fbgemm asmjit cpuinfo)
-+target_link_libraries(fbgemm PUBLIC asmjit::asmjit cpuinfo::cpuinfo)
- 
- install(TARGETS fbgemm EXPORT fbgemmLibraryConfig
-   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-@@ -254,7 +232,7 @@ install(FILES ${FBGEMM_PUBLIC_HEADERS}
- install(EXPORT fbgemmLibraryConfig DESTINATION share/cmake/fbgemm
-   FILE fbgemmLibraryConfig.cmake)
- 
--if(MSVC)
-+if(FALSE)
-   if(FBGEMM_LIBRARY_TYPE STREQUAL "shared")
-     install(
-       FILES $<TARGET_PDB_FILE:fbgemm> $<TARGET_PDB_FILE:asmjit>
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 58dcb9a..513a152 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -6,7 +6,6 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
+ include(GNUInstallDirs)
+ 
+ # function to extract filelists from defs.bzl file
+-find_package(PythonInterp)
+ function(get_filelist name outputvar)
+   execute_process(
+     COMMAND "${PYTHON_EXECUTABLE}" -c
+@@ -43,9 +42,6 @@ endfunction()
+ 
+ project(fbgemm VERSION 0.1 LANGUAGES CXX C)
+ 
+-set(FBGEMM_LIBRARY_TYPE "default" CACHE STRING
+-  "Type of library (shared, static, or default) to build")
+-set_property(CACHE FBGEMM_LIBRARY_TYPE PROPERTY STRINGS default static shared)
+ option(FBGEMM_BUILD_TESTS "Build fbgemm unit tests" ON)
+ option(FBGEMM_BUILD_BENCHMARKS "Build fbgemm benchmarks" ON)
+ option(FBGEMM_BUILD_DOCS "Build fbgemm documentation" OFF)
+@@ -126,18 +122,11 @@ set_target_properties(fbgemm_generic fbgemm_avx2 fbgemm_avx512 PROPERTIES
+ #2) MSVC uses /MD in default cxx compiling flags,
+ #need to change it to /MT in static case
+ if(MSVC)
+-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4267 /wd4305 /wd4309")
+-  if(FBGEMM_LIBRARY_TYPE STREQUAL "static")
++  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4267 /wd4305 /wd4309 /wd4703 /bigobj")
++  if(NOT BUILD_SHARED_LIBS)
+     target_compile_definitions(fbgemm_generic PRIVATE ASMJIT_STATIC)
+     target_compile_definitions(fbgemm_avx2 PRIVATE ASMJIT_STATIC)
+     target_compile_definitions(fbgemm_avx512 PRIVATE ASMJIT_STATIC)
+-    foreach(flag_var
+-      CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
+-      CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
+-      if(${flag_var} MATCHES "/MD")
+-        string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
+-      endif(${flag_var} MATCHES "/MD")
+-    endforeach(flag_var)
+   endif()
+   target_compile_options(fbgemm_avx2 PRIVATE "/arch:AVX2")
+   target_compile_options(fbgemm_avx512 PRIVATE "/arch:AVX512")
+@@ -189,7 +178,8 @@ message(WARNING "CMAKE_CXX_FLAGS_DEBUG is ${CMAKE_CXX_FLAGS_DEBUG}")
+ message(WARNING "CMAKE_CXX_FLAGS_RELEASE is ${CMAKE_CXX_FLAGS_RELEASE}")
+ message(WARNING "==========")
+ 
+-if(NOT TARGET asmjit)
++find_package(asmjit CONFIG REQUIRED) # target 'asmjit::asmjit'
++if(FALSE)
+   #Download asmjit from github if ASMJIT_SRC_DIR is not specified.
+   if(NOT DEFINED ASMJIT_SRC_DIR)
+     set(ASMJIT_SRC_DIR "${FBGEMM_SOURCE_DIR}/third_party/asmjit"
+@@ -218,7 +208,8 @@ if(NOT TARGET asmjit)
+   endif()
+ endif()
+ 
+-if(NOT TARGET cpuinfo)
++find_package(cpuinfo CONFIG REQUIRED) # target 'cpuinfo::cpuinfo'
++if(FALSE)
+   #Download cpuinfo from github if CPUINFO_SOURCE_DIR is not specified.
+   if(NOT DEFINED CPUINFO_SOURCE_DIR)
+     set(CPUINFO_SOURCE_DIR "${FBGEMM_SOURCE_DIR}/third_party/cpuinfo"
+@@ -239,49 +230,38 @@ endif()
+ target_include_directories(fbgemm_generic BEFORE
+       PUBLIC $<BUILD_INTERFACE:${FBGEMM_SOURCE_DIR}>
+       PUBLIC $<BUILD_INTERFACE:${FBGEMM_SOURCE_DIR}/include>
+-      PRIVATE "${ASMJIT_SRC_DIR}/src"
+-      PRIVATE "${CPUINFO_SOURCE_DIR}/include")
++)
++target_link_libraries(fbgemm_generic PUBLIC asmjit::asmjit cpuinfo::cpuinfo)
+ 
+ target_include_directories(fbgemm_avx2 BEFORE
+       PUBLIC $<BUILD_INTERFACE:${FBGEMM_SOURCE_DIR}>
+       PUBLIC $<BUILD_INTERFACE:${FBGEMM_SOURCE_DIR}/include>
+-      PRIVATE "${ASMJIT_SRC_DIR}/src"
+-      PRIVATE "${CPUINFO_SOURCE_DIR}/include")
++)
++target_link_libraries(fbgemm_avx2 PUBLIC asmjit::asmjit cpuinfo::cpuinfo)
+ 
+ target_include_directories(fbgemm_avx512 BEFORE
+       PUBLIC $<BUILD_INTERFACE:${FBGEMM_SOURCE_DIR}>
+       PUBLIC $<BUILD_INTERFACE:${FBGEMM_SOURCE_DIR}/include>
+-      PRIVATE "${ASMJIT_SRC_DIR}/src"
+-      PRIVATE "${CPUINFO_SOURCE_DIR}/include")
+-
+-if(FBGEMM_LIBRARY_TYPE STREQUAL "default")
+-  add_library(fbgemm
+-    $<TARGET_OBJECTS:fbgemm_generic>
+-    $<TARGET_OBJECTS:fbgemm_avx2>
+-    $<TARGET_OBJECTS:fbgemm_avx512>)
+-elseif(FBGEMM_LIBRARY_TYPE STREQUAL "shared")
+-  add_library(fbgemm SHARED
+-    $<TARGET_OBJECTS:fbgemm_generic>
+-    $<TARGET_OBJECTS:fbgemm_avx2>
+-    $<TARGET_OBJECTS:fbgemm_avx512>)
++)
++target_link_libraries(fbgemm_avx512 PUBLIC asmjit::asmjit cpuinfo::cpuinfo)
++
++add_library(fbgemm
++  $<TARGET_OBJECTS:fbgemm_generic>
++  $<TARGET_OBJECTS:fbgemm_avx2>
++  $<TARGET_OBJECTS:fbgemm_avx512>)
++if(BUILD_SHARED_LIBS)
+   set_property(TARGET fbgemm_generic PROPERTY POSITION_INDEPENDENT_CODE ON)
+   set_property(TARGET fbgemm_avx2 PROPERTY POSITION_INDEPENDENT_CODE ON)
+   set_property(TARGET fbgemm_avx512 PROPERTY POSITION_INDEPENDENT_CODE ON)
+   set_target_properties(fbgemm PROPERTIES
+     CXX_VISIBILITY_PRESET hidden)
+-elseif(FBGEMM_LIBRARY_TYPE STREQUAL "static")
+-  add_library(fbgemm STATIC
+-    $<TARGET_OBJECTS:fbgemm_generic>
+-    $<TARGET_OBJECTS:fbgemm_avx2>
+-    $<TARGET_OBJECTS:fbgemm_avx512>)
++else()
+   #MSVC need to define FBGEMM_STATIC for fbgemm_generic also to
+   #avoid generating _dllimport functions.
+   target_compile_definitions(fbgemm_generic PRIVATE FBGEMM_STATIC)
+   target_compile_definitions(fbgemm_avx2 PRIVATE FBGEMM_STATIC)
+   target_compile_definitions(fbgemm_avx512 PRIVATE FBGEMM_STATIC)
+   target_compile_definitions(fbgemm PRIVATE FBGEMM_STATIC)
+-else()
+-  message(FATAL_ERROR "Unsupported library type ${FBGEMM_LIBRARY_TYPE}")
+ endif()
+ 
+ if(USE_SANITIZER)
+@@ -293,9 +273,7 @@ target_include_directories(fbgemm BEFORE
+     PUBLIC $<BUILD_INTERFACE:${FBGEMM_SOURCE_DIR}>
+     PUBLIC $<BUILD_INTERFACE:${FBGEMM_SOURCE_DIR}/include>)
+ 
+-target_link_libraries(fbgemm $<BUILD_INTERFACE:asmjit>
+-  $<BUILD_INTERFACE:cpuinfo>)
+-add_dependencies(fbgemm asmjit cpuinfo)
++target_link_libraries(fbgemm PUBLIC asmjit::asmjit cpuinfo::cpuinfo)
+ 
+ install(TARGETS fbgemm EXPORT fbgemmLibraryConfig
+   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+@@ -308,7 +286,7 @@ install(FILES ${FBGEMM_PUBLIC_HEADERS}
+ install(EXPORT fbgemmLibraryConfig DESTINATION share/cmake/fbgemm
+   FILE fbgemmLibraryConfig.cmake)
+ 
+-if(MSVC)
++if(FALSE)
+   if(FBGEMM_LIBRARY_TYPE STREQUAL "shared")
+     install(
+       FILES $<TARGET_PDB_FILE:fbgemm> $<TARGET_PDB_FILE:asmjit>
diff --git a/external_imported/vcpkg/ports/fbgemm/portfile.cmake b/external_imported/vcpkg/ports/fbgemm/portfile.cmake
index d7c443c0a..b03555175 100644
--- a/external_imported/vcpkg/ports/fbgemm/portfile.cmake
+++ b/external_imported/vcpkg/ports/fbgemm/portfile.cmake
@@ -4,8 +4,8 @@ vcpkg_find_acquire_program(PYTHON3)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO pytorch/fbgemm
-    REF 51bc2ecc7086980fd9e6190163b04486cd37ac2a
-    SHA512 43e59ff25ec9365061be6a8db7ec592f096e74897e338dd3e17401f2188986cf3b7e26f82f7c1e2adf34496fb32cb4b50d40731bee3bf9fa5b1f2ac92a09e671
+    REF 64833b5185893cbc71ea80c9b01443f762b5cba4
+    SHA512 f256177f22d3a4abd9c861bafd96e12df33e7604416c26ac06c9e480fd5f1e0b4149132b3216790704ebf73d47a7277235f058d58f0ecafa8de23360022f202d
     PATCHES
         fix-cmakelists.patch
 )
diff --git a/external_imported/vcpkg/ports/fbgemm/vcpkg.json b/external_imported/vcpkg/ports/fbgemm/vcpkg.json
index 40cef6526..b399dbf34 100644
--- a/external_imported/vcpkg/ports/fbgemm/vcpkg.json
+++ b/external_imported/vcpkg/ports/fbgemm/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "fbgemm",
-  "version-date": "2021-03-18",
-  "port-version": 4,
+  "version": "0.4.1",
   "description": "FB (Facebook) + GEMM (General Matrix-Matrix Multiplication)",
   "homepage": "https://code.fb.com/ml-applications/fbgemm/",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/fbthrift/0001-fix-compatibility-with-boost-1.79.0.patch b/external_imported/vcpkg/ports/fbthrift/0001-fix-compatibility-with-boost-1.79.0.patch
deleted file mode 100644
index f189e8777..000000000
--- a/external_imported/vcpkg/ports/fbthrift/0001-fix-compatibility-with-boost-1.79.0.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 5bd55f11e1b6cc2cb08a0001f9c77f56fb8ac649 Mon Sep 17 00:00:00 2001
-From: Kevin Lin <developer@kevinlin.info>
-Date: Mon, 18 Apr 2022 12:17:40 -0700
-Subject: [PATCH] thrift/compiler/compiler.cc: Include fstream to fix
- compatibility with Boost 1.79.0 (#494)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Summary:
-This patch fixes fbthrift build compatibility with Boost 1.79.0. The symptom is the following compiler error:
-
-```
-/opt/mcrouter-build/fbthrift/thrift/compiler/compiler.cc: In function ‘bool apache::thrift::compiler::{anonymous}::generate(const apache::thrift::compiler::{anonymous}::gen_params&, apache::thrift::compiler::t_program*, std::set<std::__cxx11::basic_string<char> >&)’:
-/opt/mcrouter-build/fbthrift/thrift/compiler/compiler.cc:331:19: error: aggregate ‘std::ofstream genfile’ has incomplete type and cannot be defined
-  331 |     std::ofstream genfile;
-      |                   ^~~~~~~
-make[2]: *** [thrift/compiler/CMakeFiles/thrift1.dir/build.make:76: thrift/compiler/CMakeFiles/thrift1.dir/compiler.cc.o] Error 1
-make[1]: *** [CMakeFiles/Makefile2:253: thrift/compiler/CMakeFiles/thrift1.dir/all] Error 2
-make: *** [Makefile:152: all] Error 2
-```
-
-To reproduce, install the standard fbthrift dependencies, but with Boost 1.79.0 compiled from source, followed by:
-
-```
-$ mkdir build && cd build
-$ cmake -DCMAKE_BUILD_TYPE=RELEASE CXXFLAGS="-fPIC" ..
-$ make -j
-```
-
-Adding an include on `fstream` allows for the build to complete successfully.
-
-Pull Request resolved: https://github.com/facebook/fbthrift/pull/494
-
-Reviewed By: iahs
-
-Differential Revision: D35709922
-
-Pulled By: vitaut
-
-fbshipit-source-id: 96f0764c7b33047acb7b5ad26b21076757aaa5e7
----
- thrift/compiler/compiler.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/thrift/compiler/compiler.cc b/thrift/compiler/compiler.cc
-index 721ff7dbf3..da944c2950 100644
---- a/thrift/compiler/compiler.cc
-+++ b/thrift/compiler/compiler.cc
-@@ -32,6 +32,7 @@
- #include <unistd.h>
- #endif
- #include <ctime>
-+#include <fstream>
- 
- #include <boost/algorithm/string/join.hpp>
- #include <boost/algorithm/string/split.hpp>
--- 
-2.34.1.windows.1
-
diff --git a/external_imported/vcpkg/ports/fbthrift/0002-fix-dependency.patch b/external_imported/vcpkg/ports/fbthrift/0002-fix-dependency.patch
new file mode 100644
index 000000000..6740a2a41
--- /dev/null
+++ b/external_imported/vcpkg/ports/fbthrift/0002-fix-dependency.patch
@@ -0,0 +1,58 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5eea37c..145e5b6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -96,23 +96,25 @@ endif ()
+ 
+ # Find required dependencies for thrift/lib
+ if (THRIFT_LIB_ONLY OR build_all)
+-  find_package(Gflags REQUIRED)
++  find_package(gflags CONFIG REQUIRED)
++  set(LIBGFLAGS_LIBRARY gflags::gflags)
+   find_package(glog CONFIG REQUIRED)
+   set (GLOG_LIBRARIES glog::glog)
+   find_package(folly CONFIG REQUIRED)
+   find_package(fizz CONFIG REQUIRED)
+   find_package(wangle CONFIG REQUIRED)
+   find_package(ZLIB REQUIRED)
+-  find_package(Zstd REQUIRED)
++  find_package(zstd CONFIG REQUIRED)
++  if(TARGET zstd::libzstd_shared)
++    set(ZSTD_LIBRARIES zstd::libzstd_shared)
++  elseif(TARGET zstd::libzstd_static)
++    set(ZSTD_LIBRARIES zstd::libzstd_static)
++  endif()
+   find_package(mvfst CONFIG REQUIRED)
+   # https://cmake.org/cmake/help/v3.9/module/FindThreads.html
+   set(THREADS_PREFER_PTHREAD_FLAG ON)
+   find_package(Threads)
+   include_directories(
+-    ${LIBGFLAGS_INCLUDE_DIR}
+-    ${GLOG_INCLUDE_DIRS}
+-    ${OPENSSL_INCLUDE_DIR}
+-    ${ZSTD_INCLUDE_DIRS}
+   )
+   add_definitions("-DTHRIFT_HAVE_LIBSNAPPY=0")
+   if (THRIFT_LIB_ONLY)
+diff --git a/thrift/cmake/FBThriftConfig.cmake.in b/thrift/cmake/FBThriftConfig.cmake.in
+index 1d38221..ab96215 100644
+--- a/thrift/cmake/FBThriftConfig.cmake.in
++++ b/thrift/cmake/FBThriftConfig.cmake.in
+@@ -28,8 +28,15 @@ else()
+   set_and_check(FBTHRIFT_COMPILER "@PACKAGE_BIN_INSTALL_DIR@/thrift1")
+ endif()
+ 
+-find_dependency(ZLIB REQUIRED)
+-find_package(mvfst CONFIG REQUIRED)
++find_dependency(ZLIB)
++find_dependency(mvfst CONFIG)
++find_dependency(fizz CONFIG )
++find_dependency(fmt CONFIG )
++find_dependency(folly CONFIG )
++find_dependency(gflags CONFIG)
++find_dependency(glog CONFIG )
++find_dependency(wangle CONFIG )
++find_dependency(zstd CONFIG)
+ 
+ if (NOT TARGET FBThrift::thriftcpp2)
+   include("${FBTHRIFT_CMAKE_DIR}/FBThriftTargets.cmake")
diff --git a/external_imported/vcpkg/ports/fbthrift/fix-glog.patch b/external_imported/vcpkg/ports/fbthrift/fix-glog.patch
index 6429171b4..362e1d1ee 100644
--- a/external_imported/vcpkg/ports/fbthrift/fix-glog.patch
+++ b/external_imported/vcpkg/ports/fbthrift/fix-glog.patch
@@ -1,14 +1,14 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7b248a0..beae7d7 100644
+index 7d9a1e7..d2b69ad 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -101,7 +101,8 @@ endif ()
+@@ -97,7 +97,8 @@ endif ()
  # Find required dependencies for thrift/lib
- if(lib_only OR build_all)
+ if (THRIFT_LIB_ONLY OR build_all)
    find_package(Gflags REQUIRED)
 -  find_package(Glog REQUIRED)
 +  find_package(glog CONFIG REQUIRED)
 +  set (GLOG_LIBRARIES glog::glog)
    find_package(folly CONFIG REQUIRED)
    find_package(fizz CONFIG REQUIRED)
-   find_package(fmt CONFIG REQUIRED)
+   find_package(wangle CONFIG REQUIRED)
diff --git a/external_imported/vcpkg/ports/fbthrift/portfile.cmake b/external_imported/vcpkg/ports/fbthrift/portfile.cmake
index 2781261bb..88f1285e0 100644
--- a/external_imported/vcpkg/ports/fbthrift/portfile.cmake
+++ b/external_imported/vcpkg/ports/fbthrift/portfile.cmake
@@ -4,14 +4,23 @@ vcpkg_find_acquire_program(BISON)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/fbthrift
-    REF v2022.03.21.00
-    SHA512 8d2d9430dc3a4ecc23042cd9bcf4eee888824449d05d98baec408aef806b934d643e578d3876169f69966c846aeddbe0aa84416c4e020cba028a49d2fccfe7ab
+    REF "v${VERSION}"
+    SHA512 9138917c622eb1254043520708d49391196412ef5a4c309e82c25eacfcc680a41b3a0b81cde9c777a1893015da5751bac1a627633ef917f9e94b39771a981a07
     HEAD_REF master
     PATCHES 
-        0001-fix-compatibility-with-boost-1.79.0.patch
         fix-glog.patch
+        0002-fix-dependency.patch
 )
 
+file(REMOVE "${SOURCE_PATH}/thrift/cmake/FindGMock.cmake")
+file(REMOVE "${SOURCE_PATH}/thrift/cmake/FindOpenSSL.cmake")
+file(REMOVE "${SOURCE_PATH}/thrift/cmake/FindZstd.cmake")
+file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindGflags.cmake")
+file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindGlog.cmake")
+file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindGMock.cmake")
+file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindLibEvent.cmake")
+file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindSodium.cmake")
+file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindZstd.cmake")
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
@@ -29,11 +38,16 @@ file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/transport/test"
     "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/test"
     "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/util/test"
+    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/detail/test"
+    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/debug_thrift_data_difference/test"
     "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/http2/server/test"
     "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/http2/common/test"
     "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/http2/test"
     "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/core/test"
     "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/inmemory/test"
+    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/rocket/client/test"
+    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/rocket/framing/parser/test"
+    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/rocket/server/test"
     "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/protocol/test"
     "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/security/extensions/test"
     "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/security/test"
@@ -41,6 +55,7 @@ file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/frozen/test"
     "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/reflection/docs"
     "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/util/test"
+    "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/util/gtest/test"
     "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/visitation/test"
     "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/server/test"
     "${CURRENT_PACKAGES_DIR}/include/thrift/lib/py3/test"
@@ -64,4 +79,4 @@ endif()
 vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/fbthrift/FBThriftTargets.cmake" "LOCATION_HH=\\\"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/thrift/compiler/location.hh\\\"" "")
 
 # Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/fbthrift/vcpkg.json b/external_imported/vcpkg/ports/fbthrift/vcpkg.json
index c491882e6..9fe106754 100644
--- a/external_imported/vcpkg/ports/fbthrift/vcpkg.json
+++ b/external_imported/vcpkg/ports/fbthrift/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "fbthrift",
-  "version-string": "2022.03.21.00",
-  "port-version": 2,
+  "version-string": "2024.01.01.00",
   "description": "Facebook's branch of Apache Thrift, including a new C++ server.",
   "homepage": "https://github.com/facebook/fbthrift",
   "license": "Apache-2.0",
@@ -18,6 +17,7 @@
     "folly",
     "gflags",
     "glog",
+    "mvfst",
     "openssl",
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/fdk-aac/portfile.cmake b/external_imported/vcpkg/ports/fdk-aac/portfile.cmake
index 4b44fb062..81b4f0e8f 100644
--- a/external_imported/vcpkg/ports/fdk-aac/portfile.cmake
+++ b/external_imported/vcpkg/ports/fdk-aac/portfile.cmake
@@ -32,5 +32,5 @@ vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
 vcpkg_fixup_pkgconfig()
 vcpkg_copy_pdbs()
 vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}")
-file(INSTALL "${SOURCE_PATH}/NOTICE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/NOTICE")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/external_imported/vcpkg/ports/fdk-aac/vcpkg.json b/external_imported/vcpkg/ports/fdk-aac/vcpkg.json
index 046d06500..5b9cb2a02 100644
--- a/external_imported/vcpkg/ports/fdk-aac/vcpkg.json
+++ b/external_imported/vcpkg/ports/fdk-aac/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "fdk-aac",
   "version-semver": "2.0.2",
-  "port-version": 1,
+  "port-version": 2,
   "description": "A standalone Third-Party Modified Version of the Fraunhofer FDK AAC Codec Library for Android. Uses a fork without HE-AAC, HE-AACv2, or xHE-AAC support to avoid patent licensing and GPL compatibility issues when built without the he-aac option.",
   "homepage": "https://gitlab.freedesktop.org/wtaymans/fdk-aac-stripped",
+  "license": "FDK-AAC",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/fdlibm/portfile.cmake b/external_imported/vcpkg/ports/fdlibm/portfile.cmake
index f822cef95..0f673e9f2 100644
--- a/external_imported/vcpkg/ports/fdlibm/portfile.cmake
+++ b/external_imported/vcpkg/ports/fdlibm/portfile.cmake
@@ -4,19 +4,18 @@ vcpkg_from_git(
     REF 59f7335e4dd8275a7dc2f8aeb4fd00758fde37ac
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/libm5.def DESTINATION ${SOURCE_PATH})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/libm5.def" DESTINATION "${SOURCE_PATH}")
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS_DEBUG 
         -DDISABLE_INSTALL_HEADERS=ON
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
 # Handle copyright
-configure_file(${SOURCE_PATH}/NOTICE ${CURRENT_PACKAGES_DIR}/share/fdlibm/copyright COPYONLY)
+configure_file("${SOURCE_PATH}/NOTICE" "${CURRENT_PACKAGES_DIR}/share/fdlibm/copyright" COPYONLY)
  
diff --git a/external_imported/vcpkg/ports/fdlibm/vcpkg.json b/external_imported/vcpkg/ports/fdlibm/vcpkg.json
index f90a637c9..cbe67e7bb 100644
--- a/external_imported/vcpkg/ports/fdlibm/vcpkg.json
+++ b/external_imported/vcpkg/ports/fdlibm/vcpkg.json
@@ -1,6 +1,12 @@
 {
   "name": "fdlibm",
-  "version-string": "5.3",
-  "port-version": 5,
-  "description": "FDLIBM (Freely Distributable LIBM) is a C math library for machines that support IEEE 754 floating-point arithmetic"
+  "version": "5.3",
+  "port-version": 7,
+  "description": "FDLIBM (Freely Distributable LIBM) is a C math library for machines that support IEEE 754 floating-point arithmetic",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/ffmpeg/0001-create-lib-libraries.patch b/external_imported/vcpkg/ports/ffmpeg/0001-create-lib-libraries.patch
index 493e24c1b..ced7ba86b 100644
--- a/external_imported/vcpkg/ports/ffmpeg/0001-create-lib-libraries.patch
+++ b/external_imported/vcpkg/ports/ffmpeg/0001-create-lib-libraries.patch
@@ -1,8 +1,8 @@
 diff --git a/configure b/configure
-index 34c2adb..1c8008a 100755
+index 1f0b9497cb..3243e23021 100644
 --- a/configure
 +++ b/configure
-@@ -5352,15 +5352,17 @@ case $target_os in
+@@ -5697,17 +5697,19 @@ case $target_os in
          ;;
      win32|win64)
          disable symver
@@ -16,7 +16,9 @@ index 34c2adb..1c8008a 100755
 -        fi
 +#            disable static
 +#        fi
+         ! enabled small && test_cmd $windres --version && enable gnu_windres
          enabled x86_32 && check_ldflags -LARGEADDRESSAWARE
+         add_cppflags -DWIN32_LEAN_AND_MEAN
          shlibdir_default="$bindir_default"
 +        LIBPREF=""
 +        LIBSUF=".lib"
diff --git a/external_imported/vcpkg/ports/ffmpeg/0004-fix-debug-build.patch b/external_imported/vcpkg/ports/ffmpeg/0004-fix-debug-build.patch
index b85d7bbe7..1c7056c4c 100644
--- a/external_imported/vcpkg/ports/ffmpeg/0004-fix-debug-build.patch
+++ b/external_imported/vcpkg/ports/ffmpeg/0004-fix-debug-build.patch
@@ -1,8 +1,8 @@
 diff --git a/configure b/configure
-index bd2de34..fba948a 100755
+index 3243e23021..6d3f31fc95 100644
 --- a/configure
 +++ b/configure
-@@ -3993,6 +3993,9 @@ for opt do
+@@ -4284,6 +4284,9 @@ for opt do
          --libfuzzer=*)
              libfuzzer_path="$optval"
          ;;
@@ -12,7 +12,7 @@ index bd2de34..fba948a 100755
          *)
              optname="${opt%%=*}"
              optname="${optname#--}"
-@@ -6464,8 +6464,12 @@
+@@ -6630,7 +6633,11 @@ fi
  
  enabled  zlib && { check_pkg_config zlib zlib "zlib.h" zlibVersion ||
                     check_lib zlib   zlib.h      zlibVersion    -lz; }
@@ -25,8 +25,7 @@ index bd2de34..fba948a 100755
  enabled  lzma && check_lib lzma   lzma.h lzma_version_number -llzma
  
  enabled zlib && test_exec $zlib_extralibs <<EOF && enable zlib_gzip
- #include <zlib.h>
-@@ -6350,7 +6350,11 @@ enabled librubberband     && require_pkg_config librubberband "rubberband >= 1.8
+@@ -6793,7 +6800,11 @@ enabled libshaderc        && require_pkg_config spirv_compiler "shaderc >= 2019.
  enabled libshine          && require_pkg_config libshine shine shine/layer3.h shine_encode_buffer
  enabled libsmbclient      && { check_pkg_config libsmbclient smbclient libsmbclient.h smbc_init ||
                                 require libsmbclient libsmbclient.h smbc_init -lsmbclient; }
@@ -37,5 +36,5 @@ index bd2de34..fba948a 100755
 +    enabled libsnappy     && require libsnappy snappy-c.h snappy_compress -lsnappy -lstdc++
 +fi
  enabled libsoxr           && require libsoxr soxr.h soxr_create -lsoxr
- enabled libssh            && require_pkg_config libssh libssh libssh/sftp.h sftp_init
+ enabled libssh            && require_pkg_config libssh "libssh >= 0.6.0" libssh/sftp.h sftp_init
  enabled libspeex          && require_pkg_config libspeex speex speex/speex.h speex_decoder_init
diff --git a/external_imported/vcpkg/ports/ffmpeg/0005-fix-nasm.patch b/external_imported/vcpkg/ports/ffmpeg/0005-fix-nasm.patch
index 2bbe36b6d..9308e714a 100644
--- a/external_imported/vcpkg/ports/ffmpeg/0005-fix-nasm.patch
+++ b/external_imported/vcpkg/ports/ffmpeg/0005-fix-nasm.patch
@@ -1,21 +1,7 @@
 diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile
 --- a/libavcodec/x86/Makefile
 +++ b/libavcodec/x86/Makefile
-@@ -138,8 +138,11 @@ X86ASM-OBJS-$(CONFIG_QPELDSP)          += x86/qpeldsp.o                 \
- X86ASM-OBJS-$(CONFIG_RV34DSP)          += x86/rv34dsp.o
- X86ASM-OBJS-$(CONFIG_VC1DSP)           += x86/vc1dsp_loopfilter.o       \
-                                           x86/vc1dsp_mc.o
--X86ASM-OBJS-$(CONFIG_IDCTDSP)          += x86/simple_idct10.o           \
--                                          x86/simple_idct.o
-+ifdef ARCH_X86_64
-+X86ASM-OBJS-$(CONFIG_IDCTDSP)          += x86/simple_idct10.o
-+else
-+X86ASM-OBJS-$(CONFIG_IDCTDSP)          += x86/simple_idct.o
-+endif
- X86ASM-OBJS-$(CONFIG_VIDEODSP)         += x86/videodsp.o
- X86ASM-OBJS-$(CONFIG_VP3DSP)           += x86/vp3dsp.o
- X86ASM-OBJS-$(CONFIG_VP8DSP)           += x86/vp8dsp.o                  \
-@@ -157,6 +160,8 @@ X86ASM-OBJS-$(CONFIG_ALAC_DECODER)     += x86/alacdsp.o
+@@ -158,6 +158,8 @@ X86ASM-OBJS-$(CONFIG_ALAC_DECODER)     += x86/alacdsp.o
  X86ASM-OBJS-$(CONFIG_APNG_DECODER)     += x86/pngdsp.o
  X86ASM-OBJS-$(CONFIG_CAVS_DECODER)     += x86/cavsidct.o
 +ifdef ARCH_X86_64
@@ -24,7 +10,7 @@ diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile
  X86ASM-OBJS-$(CONFIG_CFHD_DECODER)     += x86/cfhddsp.o
  X86ASM-OBJS-$(CONFIG_DCA_DECODER)      += x86/dcadsp.o x86/synth_filter.o
  X86ASM-OBJS-$(CONFIG_DIRAC_DECODER)    += x86/diracdsp.o                \
-@@ -175,15 +180,21 @@                                           x86/hevc_sao_10bit.o
+@@ -175,15 +177,21 @@                                           x86/hevc_sao_10bit.o
  X86ASM-OBJS-$(CONFIG_JPEG2000_DECODER) += x86/jpeg2000dsp.o
  X86ASM-OBJS-$(CONFIG_LSCR_DECODER)     += x86/pngdsp.o
 +ifdef ARCH_X86_64
diff --git a/external_imported/vcpkg/ports/ffmpeg/0006-fix-StaticFeatures.patch b/external_imported/vcpkg/ports/ffmpeg/0006-fix-StaticFeatures.patch
index dc7f81843..76a649654 100644
--- a/external_imported/vcpkg/ports/ffmpeg/0006-fix-StaticFeatures.patch
+++ b/external_imported/vcpkg/ports/ffmpeg/0006-fix-StaticFeatures.patch
@@ -1,8 +1,8 @@
 diff --git a/configure b/configure
-index 3bdcfc6..00b2f13 100644
+index 6d3f31fc95..f5f4a769cc 100644
 --- a/configure
 +++ b/configure
-@@ -6351,7 +6351,8 @@ if enabled libmfx; then
+@@ -6761,7 +6761,8 @@ if enabled libmfx; then
  fi
  
  enabled libmodplug        && require_pkg_config libmodplug libmodplug libmodplug/modplug.h ModPlug_Load
@@ -12,16 +12,16 @@ index 3bdcfc6..00b2f13 100644
  enabled libmysofa         && { check_pkg_config libmysofa libmysofa mysofa.h mysofa_neighborhood_init_withstepdefine ||
                                 require libmysofa mysofa.h mysofa_neighborhood_init_withstepdefine -lmysofa $zlib_extralibs; }
  enabled libnpp            && { check_lib libnpp npp.h nppGetLibVersion -lnppig -lnppicc -lnppc -lnppidei -lnppif ||
-@@ -6392,7 +6393,7 @@ if enabled debug_configure; then
+@@ -6805,7 +6806,7 @@ if enabled debug_configure; then
  else
      enabled libsnappy     && require libsnappy snappy-c.h snappy_compress -lsnappy -lstdc++
  fi
 -enabled libsoxr           && require libsoxr soxr.h soxr_create -lsoxr
 +enabled libsoxr           && require libsoxr soxr.h soxr_create -lsoxr -lm
- enabled libssh            && require_pkg_config libssh libssh libssh/sftp.h sftp_init
+ enabled libssh            && require_pkg_config libssh "libssh >= 0.6.0" libssh/sftp.h sftp_init
  enabled libspeex          && require_pkg_config libspeex speex speex/speex.h speex_decoder_init
  enabled libsrt            && require_pkg_config libsrt "srt >= 1.3.0" srt/srt.h srt_socket
-@@ -6460,6 +6461,8 @@ enabled openal            && { { for al_extralibs in "${OPENAL_LIBS}" "-lopenal"
+@@ -6888,6 +6889,8 @@ enabled openal            && { check_pkg_config openal "openal >= 1.1" "AL/al.h"
  enabled opencl            && { check_pkg_config opencl OpenCL CL/cl.h clEnqueueNDRangeKernel ||
                                 check_lib opencl OpenCL/cl.h clEnqueueNDRangeKernel -Wl,-framework,OpenCL ||
                                 check_lib opencl CL/cl.h clEnqueueNDRangeKernel -lOpenCL ||
@@ -30,7 +30,7 @@ index 3bdcfc6..00b2f13 100644
                                 die "ERROR: opencl not found"; } &&
                               { test_cpp_condition "OpenCL/cl.h" "defined(CL_VERSION_1_2)" ||
                                 test_cpp_condition "CL/cl.h" "defined(CL_VERSION_1_2)" ||
-@@ -6479,6 +6482,7 @@ enabled openssl           && { check_pkg_config openssl openssl openssl/ssl.h OP
+@@ -6914,6 +6917,7 @@ enabled openssl           && { { check_pkg_config openssl "openssl >= 3.0.0" ope
                                 check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto ||
                                 check_lib openssl openssl/ssl.h SSL_library_init -lssl32 -leay32 ||
                                 check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||
@@ -38,7 +38,7 @@ index 3bdcfc6..00b2f13 100644
                                 die "ERROR: openssl not found"; }
  enabled pocketsphinx      && require_pkg_config pocketsphinx pocketsphinx pocketsphinx/pocketsphinx.h ps_init
  enabled rkmpp             && { require_pkg_config rkmpp rockchip_mpp  rockchip/rk_mpi.h mpp_create &&
-@@ -6707,7 +6711,7 @@ enabled amf &&
+@@ -7215,7 +7219,7 @@ enabled amf &&
  if enabled libc_iconv; then
      check_func_headers iconv.h iconv
  elif enabled iconv; then
diff --git a/external_imported/vcpkg/ports/ffmpeg/0011-Fix-x265-detection.patch b/external_imported/vcpkg/ports/ffmpeg/0011-Fix-x265-detection.patch
index 13711bc2d..8c3e10d95 100644
--- a/external_imported/vcpkg/ports/ffmpeg/0011-Fix-x265-detection.patch
+++ b/external_imported/vcpkg/ports/ffmpeg/0011-Fix-x265-detection.patch
@@ -1,7 +1,7 @@
 diff --git a/configure b/configure
 --- a/configure
 +++ b/configure
-@@ -6671,7 +6671,10 @@
+@@ -6730,7 +6730,10 @@
                               [ "$toolchain" != "msvc" ] ||
                               require_cpp_condition libx264 x264.h "X264_BUILD >= 158"; } &&
                               check_cpp_condition libx262 x264.h "X264_MPEG2"
@@ -10,6 +10,6 @@ diff --git a/configure b/configure
 +                                { { check_lib libx265 x265.h x265_api_get "-lx265 $pthreads_extralibs $libm_extralibs -ldl -lstdc++ -lgcc_s -lgcc -lrt -lnuma" ||
 +                                require libx265 x265.h x265_api_get "-lx265 $pthreads_extralibs $libm_extralibs -ldl -lstdc++"; } &&
 +                                    warn "using libx265 without pkg-config"; } } &&
-                              require_cpp_condition libx265 x265.h "X265_BUILD >= 70"
+                              require_cpp_condition libx265 x265.h "X265_BUILD >= 89"
  enabled libxavs           && require libxavs "stdint.h xavs.h" xavs_encoder_encode "-lxavs $pthreads_extralibs $libm_extralibs"
  enabled libxavs2          && require_pkg_config libxavs2 "xavs2 >= 1.3.0" "stdint.h xavs2.h" xavs2_api_get
diff --git a/external_imported/vcpkg/ports/ffmpeg/0020-fix-aarch64-libswscale.patch b/external_imported/vcpkg/ports/ffmpeg/0020-fix-aarch64-libswscale.patch
index 6019b0664..f47e82ed8 100644
--- a/external_imported/vcpkg/ports/ffmpeg/0020-fix-aarch64-libswscale.patch
+++ b/external_imported/vcpkg/ports/ffmpeg/0020-fix-aarch64-libswscale.patch
@@ -1,28 +1,28 @@
 diff --git a/libswscale/aarch64/yuv2rgb_neon.S b/libswscale/aarch64/yuv2rgb_neon.S
-index af677afe6..f4b220fb6 100644
---- a/libswscale/aarch64/yuv2rgb_neon.S	
+index 89d69e7f6c..4bc1607a7a 100644
+--- a/libswscale/aarch64/yuv2rgb_neon.S
 +++ b/libswscale/aarch64/yuv2rgb_neon.S
 @@ -169,19 +169,19 @@ function ff_\ifmt\()_to_\ofmt\()_neon, export=1
-     sqdmulh             v26.8H, v26.8H, v0.8H                           // ((Y1*(1<<3) - y_offset) * y_coeff) >> 15
-     sqdmulh             v27.8H, v27.8H, v0.8H                           // ((Y2*(1<<3) - y_offset) * y_coeff) >> 15
+         sqdmulh         v26.8h, v26.8h, v0.8h                           // ((Y1*(1<<3) - y_offset) * y_coeff) >> 15
+         sqdmulh         v27.8h, v27.8h, v0.8h                           // ((Y2*(1<<3) - y_offset) * y_coeff) >> 15
  
 -.ifc \ofmt,argb // 1 2 3 0
 +.ifc \ofmt,argb
-     compute_rgba        v5.8B,v6.8B,v7.8B,v4.8B, v17.8B,v18.8B,v19.8B,v16.8B
+         compute_rgba    v5.8b,v6.8b,v7.8b,v4.8b, v17.8b,v18.8b,v19.8b,v16.8b
  .endif
  
 -.ifc \ofmt,rgba // 0 1 2 3
 +.ifc \ofmt,rgba
-     compute_rgba        v4.8B,v5.8B,v6.8B,v7.8B, v16.8B,v17.8B,v18.8B,v19.8B
+         compute_rgba    v4.8b,v5.8b,v6.8b,v7.8b, v16.8b,v17.8b,v18.8b,v19.8b
  .endif
  
 -.ifc \ofmt,abgr // 3 2 1 0
 +.ifc \ofmt,abgr
-     compute_rgba        v7.8B,v6.8B,v5.8B,v4.8B, v19.8B,v18.8B,v17.8B,v16.8B
+         compute_rgba    v7.8b,v6.8b,v5.8b,v4.8b, v19.8b,v18.8b,v17.8b,v16.8b
  .endif
  
 -.ifc \ofmt,bgra // 2 1 0 3
 +.ifc \ofmt,bgra
-     compute_rgba        v6.8B,v5.8B,v4.8B,v7.8B, v18.8B,v17.8B,v16.8B,v19.8B
+         compute_rgba    v6.8b,v5.8b,v4.8b,v7.8b, v18.8b,v17.8b,v16.8b,v19.8b
  .endif
  
diff --git a/external_imported/vcpkg/ports/ffmpeg/build.sh.in b/external_imported/vcpkg/ports/ffmpeg/build.sh.in
index 5f64794ae..462737587 100644
--- a/external_imported/vcpkg/ports/ffmpeg/build.sh.in
+++ b/external_imported/vcpkg/ports/ffmpeg/build.sh.in
@@ -130,13 +130,13 @@ build_ffmpeg() {
 
 cd "$PATH_TO_BUILD_DIR"
 
-if [ $OSX_ARCH_COUNT -gt 1 ]; then
+if [ $OSX_ARCH_COUNT -gt 0 ]; then
     for ARCH in $OSX_ARCHS; do
         echo "=== CLEANING FOR $ARCH ==="
 
         make clean && make distclean
 
-        build_ffmpeg $ARCH --enable-cross-compile --extra-cflags=-arch --extra-cflags=$ARCH --extra-ldflags=-arch --extra-ldflags=$ARCH
+        build_ffmpeg $ARCH --extra-cflags=-arch --extra-cflags=$ARCH --extra-ldflags=-arch --extra-ldflags=$ARCH
 
         echo "=== COLLECTING BINARIES FOR $ARCH ==="
 
diff --git a/external_imported/vcpkg/ports/ffmpeg/portfile.cmake b/external_imported/vcpkg/ports/ffmpeg/portfile.cmake
index b7178acdc..82eca0f1e 100644
--- a/external_imported/vcpkg/ports/ffmpeg/portfile.cmake
+++ b/external_imported/vcpkg/ports/ffmpeg/portfile.cmake
@@ -1,10 +1,8 @@
-vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ffmpeg/ffmpeg
-    REF n${VERSION}
-    SHA512 1b90c38b13149f2de7618ad419adc277afd5e65bbf52b849a7245aec0f92f73189c8547599dba8408b8828a767c1120f132727b57cd6231cd8b81de2471a4b8b
+    REF "n${VERSION}"
+    SHA512 a84209fe36a2a0262ebc34b727e7600b12d4739991a95599d7b4df533791b12e2e43586ccc6ff26aab2f935a3049866204e322ec0c5e49e378fc175ded34e183
     HEAD_REF master
     PATCHES
         0001-create-lib-libraries.patch
@@ -33,18 +31,9 @@ if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "wasm32")
     vcpkg_add_to_path("${NASM_EXE_PATH}")
 endif()
 
-if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
-    #We're assuming that if we're building for Windows we're using MSVC
-    set(INCLUDE_VAR "INCLUDE")
-    set(LIB_PATH_VAR "LIB")
-else()
-    set(INCLUDE_VAR "CPATH")
-    set(LIB_PATH_VAR "LIBRARY_PATH")
-endif()
-
 set(OPTIONS "--enable-pic --disable-doc --enable-debug --enable-runtime-cpudetect --disable-autodetect")
 
-if(VCPKG_TARGET_IS_WINDOWS)
+if(VCPKG_HOST_IS_WINDOWS)
     vcpkg_acquire_msys(MSYS_ROOT PACKAGES automake1.16)
     set(SHELL "${MSYS_ROOT}/usr/bin/bash.exe")
     vcpkg_add_to_path("${MSYS_ROOT}/usr/share/automake-1.16")
@@ -68,8 +57,9 @@ elseif(VCPKG_TARGET_IS_WINDOWS)
 elseif(VCPKG_TARGET_IS_OSX)
     string(APPEND OPTIONS " --target-os=darwin --enable-appkit --enable-avfoundation --enable-coreimage --enable-audiotoolbox --enable-videotoolbox")
 elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Android")
-    string(APPEND OPTIONS " --target-os=android")
-else()
+    string(APPEND OPTIONS " --target-os=android --enable-jni --enable-mediacodec")
+elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "QNX")
+    string(APPEND OPTIONS " --target-os=qnx")
 endif()
 
 if(VCPKG_TARGET_IS_OSX)
@@ -94,8 +84,6 @@ string(APPEND VCPKG_COMBINED_C_FLAGS_RELEASE " -I \"${CURRENT_INSTALLED_DIR}/inc
 
 ## Setup vcpkg toolchain
 
-set(ENV_LIB_PATH "$ENV{${LIB_PATH_VAR}}")
-
 set(prog_env "")
 
 if(VCPKG_DETECTED_CMAKE_C_COMPILER)
@@ -154,10 +142,18 @@ if(VCPKG_DETECTED_CMAKE_AR)
     list(APPEND prog_env "${AR_path}")
 endif()
 
+if(VCPKG_DETECTED_CMAKE_RANLIB)
+    get_filename_component(RANLIB_path "${VCPKG_DETECTED_CMAKE_RANLIB}" DIRECTORY)
+    get_filename_component(RANLIB_filename "${VCPKG_DETECTED_CMAKE_RANLIB}" NAME)
+    set(ENV{RANLIB} "${RANLIB_filename}")
+    string(APPEND OPTIONS " --ranlib=${RANLIB_filename}")
+    list(APPEND prog_env "${RANLIB_path}")
+endif()
+
 list(REMOVE_DUPLICATES prog_env)
 vcpkg_add_to_path(PREPEND ${prog_env})
 
-# More? RANLIB OBJCC STRIP BIN2C
+# More? OBJCC STRIP BIN2C
 
 file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")
 
@@ -513,7 +509,7 @@ else()
     set(OPTIONS "${OPTIONS} --disable-libmfx")
 endif()
 
-set(OPTIONS_CROSS " --enable-cross-compile")
+set(OPTIONS_CROSS "--enable-cross-compile")
 
 # ffmpeg needs --cross-prefix option to use appropriate tools for cross-compiling.
 if(VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "([^\/]*-)gcc$")
@@ -566,8 +562,12 @@ message(STATUS "Building Options: ${OPTIONS}")
 
 # Release build
 if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+    if (VCPKG_DETECTED_MSVC)
+        set(OPTIONS_RELEASE "${OPTIONS_RELEASE} --extra-ldflags=-libpath:\"${CURRENT_INSTALLED_DIR}/lib\"")
+    else()
+        set(OPTIONS_RELEASE "${OPTIONS_RELEASE} --extra-ldflags=-L\"${CURRENT_INSTALLED_DIR}/lib\"")
+    endif()
     message(STATUS "Building Release Options: ${OPTIONS_RELEASE}")
-    set(ENV{${LIB_PATH_VAR}} "${CURRENT_INSTALLED_DIR}/lib${VCPKG_HOST_PATH_SEPARATOR}${ENV_LIB_PATH}")
     set(ENV{PKG_CONFIG_PATH} "${CURRENT_INSTALLED_DIR}/lib/pkgconfig")
     message(STATUS "Building ${PORT} for Release")
     file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")
@@ -603,8 +603,12 @@ endif()
 
 # Debug build
 if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+    if (VCPKG_DETECTED_MSVC)
+        set(OPTIONS_DEBUG "${OPTIONS_DEBUG} --extra-ldflags=-libpath:\"${CURRENT_INSTALLED_DIR}/debug/lib\"")
+    else()
+        set(OPTIONS_DEBUG "${OPTIONS_DEBUG} --extra-ldflags=-L\"${CURRENT_INSTALLED_DIR}/debug/lib\"")
+    endif()
     message(STATUS "Building Debug Options: ${OPTIONS_DEBUG}")
-    set(ENV{${LIB_PATH_VAR}} "${CURRENT_INSTALLED_DIR}/debug/lib${VCPKG_HOST_PATH_SEPARATOR}${ENV_LIB_PATH}")
     set(ENV{LDFLAGS} "${VCPKG_COMBINED_SHARED_LINKER_FLAGS_DEBUG}")
     set(ENV{PKG_CONFIG_PATH} "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig")
     message(STATUS "Building ${PORT} for Debug")
diff --git a/external_imported/vcpkg/ports/ffmpeg/vcpkg.json b/external_imported/vcpkg/ports/ffmpeg/vcpkg.json
index 631323a17..7499e6135 100644
--- a/external_imported/vcpkg/ports/ffmpeg/vcpkg.json
+++ b/external_imported/vcpkg/ports/ffmpeg/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "ffmpeg",
-  "version": "5.1.2",
-  "port-version": 5,
+  "version": "6.1.1",
   "description": [
     "a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.",
     "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations."
@@ -339,7 +338,6 @@
     },
     "dav1d": {
       "description": "AV1 decoding via libdav1d",
-      "supports": "!osx",
       "dependencies": [
         "dav1d"
       ]
@@ -634,6 +632,13 @@
     "vpx": {
       "description": "VP8 and VP9 de/encoding via libvpx",
       "dependencies": [
+        {
+          "name": "ffmpeg",
+          "default-features": false,
+          "features": [
+            "avcodec"
+          ]
+        },
         "libvpx"
       ]
     },
diff --git a/external_imported/vcpkg/ports/ffnvcodec/portfile.cmake b/external_imported/vcpkg/ports/ffnvcodec/portfile.cmake
index 1b67cba6f..2386bfa92 100644
--- a/external_imported/vcpkg/ports/ffnvcodec/portfile.cmake
+++ b/external_imported/vcpkg/ports/ffnvcodec/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO FFmpeg/nv-codec-headers
-    REF b641a195edbe3ac9788e681e22c2e2fad8aacddb # 11.1.5.0
-    SHA512 e8b4c21ddc9c39dadd9b69ebdfcf38cf1e61f19ffb88d0a4d9086ddbf69285d2c8c946bb02bde3ee943accae559a72468f096718ad69ac03a43746c1eb0ed483
+    REF "n${VERSION}"
+    SHA512 386e4e1e0606a5ebd95c0ca60a2cdbadd1e24ac64df65f707dd00ee1fc822f56535637eaf4a375dd25f2f91fb00ffabb95953a1bab9fc101d1c522e2954f37c0
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/ffnvcodec/vcpkg.json b/external_imported/vcpkg/ports/ffnvcodec/vcpkg.json
index 47418dc0c..3b63cb87f 100644
--- a/external_imported/vcpkg/ports/ffnvcodec/vcpkg.json
+++ b/external_imported/vcpkg/ports/ffnvcodec/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "ffnvcodec",
-  "version": "11.1.5.0",
-  "port-version": 1,
+  "version": "11.1.5.3",
   "description": "FFmpeg version of Nvidia Codec SDK headers.",
   "homepage": "https://github.com/FFmpeg/nv-codec-headers",
   "supports": "linux | (!osx & !uwp & !(arm64 & windows))"
diff --git a/external_imported/vcpkg/ports/fftw3/fix-openmp.patch b/external_imported/vcpkg/ports/fftw3/fix-openmp.patch
new file mode 100644
index 000000000..27b874803
--- /dev/null
+++ b/external_imported/vcpkg/ports/fftw3/fix-openmp.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ce438a3..43c74be 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -356,7 +356,7 @@ if (OPENMP_FOUND)
+   target_link_libraries (${fftw3_lib}_omp ${fftw3_lib})
+   target_link_libraries (${fftw3_lib}_omp ${CMAKE_THREAD_LIBS_INIT})
+   list (APPEND subtargets ${fftw3_lib}_omp)
+-  target_compile_options (${fftw3_lib}_omp PRIVATE ${OpenMP_C_FLAGS})
++  target_link_libraries (${fftw3_lib}_omp OpenMP::OpenMP_C)
+ endif ()
+ 
+ foreach(subtarget ${subtargets})
diff --git a/external_imported/vcpkg/ports/fftw3/install-subtargets.patch b/external_imported/vcpkg/ports/fftw3/install-subtargets.patch
new file mode 100644
index 000000000..c313d3fef
--- /dev/null
+++ b/external_imported/vcpkg/ports/fftw3/install-subtargets.patch
@@ -0,0 +1,18 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d1e4dff..ea5d579 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -361,12 +361,8 @@ endif ()
+ 
+ foreach(subtarget ${subtargets})
+   set_target_properties (${subtarget} PROPERTIES SOVERSION 3.6.9 VERSION 3)
+-  install (TARGETS ${subtarget}
+-	  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+-	  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-          ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ endforeach ()
+-install(TARGETS ${fftw3_lib}
++install(TARGETS ${subtargets}
+           EXPORT FFTW3LibraryDepends
+           RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+           LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
diff --git a/external_imported/vcpkg/ports/fftw3/omp_test.patch b/external_imported/vcpkg/ports/fftw3/omp_test.patch
deleted file mode 100644
index 6123798a2..000000000
--- a/external_imported/vcpkg/ports/fftw3/omp_test.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f3cfc20..9826bff 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -385,6 +385,12 @@ if (BUILD_TESTS)
-     target_link_libraries (bench ${fftw3_lib})
-   endif ()
- 
-+  if (ENABLE_OPENMP)
-+    target_link_libraries (bench ${fftw3_lib}_omp)
-+  else ()
-+    target_link_libraries (bench ${fftw3_lib})
-+  endif ()
-+
- 
-   enable_testing ()
- 
diff --git a/external_imported/vcpkg/ports/fftw3/patch_targets.patch b/external_imported/vcpkg/ports/fftw3/patch_targets.patch
deleted file mode 100644
index a0df5cf90..000000000
--- a/external_imported/vcpkg/ports/fftw3/patch_targets.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 335808a..90772b4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -358,7 +358,7 @@ foreach(subtarget ${subtargets})
-           ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
- endforeach ()
- install(TARGETS ${fftw3_lib}
--          EXPORT FFTW3LibraryDepends
-+          EXPORT FFTW3${PREC_SUFFIX}LibraryDepends
-           RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-           LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-           ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-@@ -419,11 +419,11 @@ configure_file (FFTW3ConfigVersion.cmake.in FFTW3${PREC_SUFFIX}ConfigVersion.cma
- install (FILES
-           ${CMAKE_CURRENT_BINARY_DIR}/FFTW3${PREC_SUFFIX}Config.cmake
-           ${CMAKE_CURRENT_BINARY_DIR}/FFTW3${PREC_SUFFIX}ConfigVersion.cmake
--	  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/fftw3${PREC_SUFFIX}
-+	  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake
-          COMPONENT Development)
- 
--export (TARGETS ${fftw3_lib} NAMESPACE FFTW3:: FILE ${PROJECT_BINARY_DIR}/FFTW3LibraryDepends.cmake)
--install(EXPORT FFTW3LibraryDepends
-+export (TARGETS ${fftw3_lib} NAMESPACE FFTW3:: FILE ${PROJECT_BINARY_DIR}/FFTW3${PREC_SUFFIX}LibraryDepends.cmake)
-+install(EXPORT FFTW3${PREC_SUFFIX}LibraryDepends
-         NAMESPACE FFTW3::
--        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/fftw3${PREC_SUFFIX}
-+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake
-         COMPONENT Development)
---- a/FFTW3Config.cmake.in
-+++ b/FFTW3Config.cmake.in
-@@ -10,7 +10,7 @@ set (FFTW3@PREC_SUFFIX@_LIBRARIES fftw3@PREC_SUFFIX@)
- set (FFTW3@PREC_SUFFIX@_LIBRARY_DIRS @CMAKE_INSTALL_FULL_LIBDIR@)
- set (FFTW3@PREC_SUFFIX@_INCLUDE_DIRS @CMAKE_INSTALL_FULL_INCLUDEDIR@)
- 
--include ("${CMAKE_CURRENT_LIST_DIR}/FFTW3LibraryDepends.cmake")
-+include ("${CMAKE_CURRENT_LIST_DIR}/FFTW3@PREC_SUFFIX@LibraryDepends.cmake")
- 
- if (CMAKE_VERSION VERSION_LESS 2.8.3)
-   set (CMAKE_CURRENT_LIST_DIR)
- 
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/fftw3/portfile.cmake b/external_imported/vcpkg/ports/fftw3/portfile.cmake
index e6a50f1d3..fca5eb8b9 100644
--- a/external_imported/vcpkg/ports/fftw3/portfile.cmake
+++ b/external_imported/vcpkg/ports/fftw3/portfile.cmake
@@ -4,60 +4,56 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 2d34b5ccac7b08740dbdacc6ebe451d8a34cf9d9bfec85a5e776e87adf94abfd803c222412d8e10fbaa4ed46f504aa87180396af1b108666cde4314a55610b40
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
+vcpkg_extract_source_archive(
+    SOURCE_PATH
+    ARCHIVE "${ARCHIVE}"
     PATCHES
-        omp_test.patch
-        patch_targets.patch
         fftw3_arch_fix.patch
         aligned_malloc.patch
         bigobj.patch
+        fix-openmp.patch
+        install-subtargets.patch
 )
 
 vcpkg_check_features(
     OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
-        openmp ENABLE_OPENMP
+        openmp  ENABLE_OPENMP
+        openmp  CMAKE_REQUIRE_FIND_PACKAGE_OpenMP
         threads ENABLE_THREADS
         threads WITH_COMBINED_THREADS
-        avx2 ENABLE_AVX2
-        avx ENABLE_AVX
-        sse2 ENABLE_SSE2
-        sse ENABLE_SSE
+        avx2    ENABLE_AVX2
+        avx     ENABLE_AVX
+        sse2    ENABLE_SSE2
+        sse     ENABLE_SSE
 )
 
-set(ENABLE_FLOAT_CMAKE fftw3f)
-set(ENABLE_LONG_DOUBLE_CMAKE fftw3l)
-set(ENABLE_DEFAULT_PRECISION_CMAKE fftw3)
+set(package_names  fftw3 fftw3f fftw3l)
+set(fftw3_options  "")
+set(fftw3f_options -DENABLE_FLOAT=ON)
+set(fftw3l_options -DENABLE_LONG_DOUBLE=ON -DENABLE_AVX2=OFF -DENABLE_AVX=OFF -DENABLE_SSE2=OFF)
 
-foreach(PRECISION ENABLE_FLOAT ENABLE_LONG_DOUBLE ENABLE_DEFAULT_PRECISION)
-    if(PRECISION STREQUAL "ENABLE_LONG_DOUBLE")
-        vcpkg_cmake_configure(
+foreach(package_name IN LISTS package_names)
+    message(STATUS "${package_name}...")
+    vcpkg_cmake_configure(
         SOURCE_PATH "${SOURCE_PATH}"
+        LOGFILE_BASE "config-${package_name}-${TARGET_TRIPLET}"
         OPTIONS 
-            -D${PRECISION}=ON
-            -DENABLE_OPENMP=${ENABLE_OPENMP}
-            -DENABLE_THREADS=${HAVE_THREADS}
-            -DWITH_COMBINED_THREADS=${HAVE_THREADS}
-            -DBUILD_TESTS=OFF
-        )
-    else()
-        vcpkg_cmake_configure(
-        SOURCE_PATH "${SOURCE_PATH}"
-        OPTIONS 
-            -D${PRECISION}=ON
             ${FEATURE_OPTIONS}
+            ${${package_name}_options} # may override FEATURE_OPTIONS
             -DBUILD_TESTS=OFF
-        )
-    endif()
-
-    vcpkg_cmake_install()
-
+        MAYBE_UNUSED_VARIABLES
+            CMAKE_REQUIRE_FIND_PACKAGE_OpenMP
+    )
+    vcpkg_cmake_build(
+        LOGFILE_BASE "install-${package_name}"
+        TARGET install
+    )
     vcpkg_copy_pdbs()
 
-    vcpkg_cmake_config_fixup(PACKAGE_NAME ${${PRECISION}_CMAKE} CONFIG_PATH lib/cmake)
+    vcpkg_cmake_config_fixup(PACKAGE_NAME "${package_name}" CONFIG_PATH "lib/cmake/${package_name}")
 endforeach()
+vcpkg_fixup_pkgconfig()
 
 file(READ "${SOURCE_PATH}/api/fftw3.h" _contents)
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
@@ -70,6 +66,4 @@ file(WRITE "${SOURCE_PATH}/include/fftw3.h" "${_contents}")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-
-vcpkg_fixup_pkgconfig()
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/fftw3/vcpkg.json b/external_imported/vcpkg/ports/fftw3/vcpkg.json
index db34dea94..587f1e85f 100644
--- a/external_imported/vcpkg/ports/fftw3/vcpkg.json
+++ b/external_imported/vcpkg/ports/fftw3/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "fftw3",
   "version": "3.3.10",
-  "port-version": 5,
+  "port-version": 8,
   "description": "FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of arbitrary input size, and of both real and complex data (as well as of even/odd data, i.e. the discrete cosine/sine transforms or DCT/DST).",
   "homepage": "https://www.fftw.org/",
   "license": "GPL-2.0-or-later",
diff --git a/external_imported/vcpkg/ports/fineftp/asio.patch b/external_imported/vcpkg/ports/fineftp/asio.patch
new file mode 100644
index 000000000..a5d008f4b
--- /dev/null
+++ b/external_imported/vcpkg/ports/fineftp/asio.patch
@@ -0,0 +1,13 @@
+diff --git a/fineftp-server/CMakeLists.txt b/fineftp-server/CMakeLists.txt
+index e4e3152..9e609d9 100644
+--- a/fineftp-server/CMakeLists.txt
++++ b/fineftp-server/CMakeLists.txt
+@@ -10,7 +10,7 @@ set(CMAKE_CXX_VISIBILITY_PRESET hidden)
+ set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
+ 
+ find_package(Threads REQUIRED)
+-find_package(asio REQUIRED)
++find_package(asio CONFIG REQUIRED)
+ 
+ # Include GenerateExportHeader that will create export macros for us
+ include(GenerateExportHeader)
diff --git a/external_imported/vcpkg/ports/fineftp/portfile.cmake b/external_imported/vcpkg/ports/fineftp/portfile.cmake
new file mode 100644
index 000000000..c8738520f
--- /dev/null
+++ b/external_imported/vcpkg/ports/fineftp/portfile.cmake
@@ -0,0 +1,26 @@
+#Get release from GitHub
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO eclipse-ecal/fineftp-server
+    REF "v${VERSION}"
+    SHA512 dcced2cf743434a55314ad661ca729efc1c4883ae0c0883335f43a12ed47568ebcb50d233dab8a1410bb526587b24f1cf19938241bf649cfe54b11ffe264124b
+    HEAD_REF master
+    PATCHES
+        asio.patch
+)
+
+# Configure
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(
+    PACKAGE_NAME fineftp
+    CONFIG_PATH lib/cmake/fineftp
+)
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/external_imported/vcpkg/ports/fineftp/vcpkg.json b/external_imported/vcpkg/ports/fineftp/vcpkg.json
new file mode 100644
index 000000000..60b9832f2
--- /dev/null
+++ b/external_imported/vcpkg/ports/fineftp/vcpkg.json
@@ -0,0 +1,20 @@
+{
+  "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
+  "name": "fineftp",
+  "version": "1.3.4",
+  "description": "FineFTP is a minimal FTP server library for Windows and Unix flavors.",
+  "homepage": "https://github.com/eclipse-ecal/fineftp-server",
+  "license": "MIT",
+  "supports": "!uwp & !android",
+  "dependencies": [
+    "asio",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/fins/portfile.cmake b/external_imported/vcpkg/ports/fins/portfile.cmake
new file mode 100644
index 000000000..dea5315e2
--- /dev/null
+++ b/external_imported/vcpkg/ports/fins/portfile.cmake
@@ -0,0 +1,25 @@
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO lammertb/libfins
+    REF 5525ef513137507ec3ecab68c698a21b30497bc3
+    SHA512  6d5c039cefa55183460b14c226a77e24a93200a288486fca6fd5a3639d78e028a89a7eb25775c802cd78fdb371b0cae05236926612395896f56b23f61f5e5e87
+    HEAD_REF master
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+)
+
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+vcpkg_cmake_config_fixup()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+
+
+
diff --git a/external_imported/vcpkg/ports/fins/vcpkg.json b/external_imported/vcpkg/ports/fins/vcpkg.json
new file mode 100644
index 000000000..40e9f4092
--- /dev/null
+++ b/external_imported/vcpkg/ports/fins/vcpkg.json
@@ -0,0 +1,20 @@
+{
+  "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
+  "name": "fins",
+  "version-date": "2023-07-31",
+  "maintainers": "Lammert Bies",
+  "description": "LibFINS is an MIT licensed library written in C implementing the FINS/TCP protocol used for communication between Omron PLCs. The library contains all the documented client FINS functions. This open source library is a spin-off of a larger project which also implements FINS/UDP client communication and a FINS server engine.",
+  "homepage": "https://www.libfins.org",
+  "documentation": "https://www.libfins.org/api-reference/",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/fizz/0003-fix-deps.patch b/external_imported/vcpkg/ports/fizz/0003-fix-deps.patch
new file mode 100644
index 000000000..0ef760535
--- /dev/null
+++ b/external_imported/vcpkg/ports/fizz/0003-fix-deps.patch
@@ -0,0 +1,175 @@
+diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt
+index 64eec10..6c5a934 100644
+--- a/fizz/CMakeLists.txt
++++ b/fizz/CMakeLists.txt
+@@ -50,10 +50,9 @@ find_package(folly CONFIG REQUIRED)
+ find_package(fmt CONFIG REQUIRED)
+ 
+ find_package(OpenSSL REQUIRED)
+-find_package(Glog REQUIRED)
+-find_package(DoubleConversion REQUIRED)
++find_package(glog CONFIG REQUIRED)
++find_package(double-conversion CONFIG REQUIRED)
+ find_package(Threads REQUIRED)
+-find_package(Zstd REQUIRED)
+ if (UNIX AND NOT APPLE)
+   find_package(Librt)
+ endif()
+@@ -66,37 +65,17 @@ SET(FIZZ_SHINY_DEPENDENCIES "")
+ SET(FIZZ_LINK_LIBRARIES "")
+ SET(FIZZ_INCLUDE_DIRECTORIES "")
+ 
+-find_package(gflags CONFIG QUIET)
+-if (gflags_FOUND)
+-  message(STATUS "Found gflags from package config")
+-  if (TARGET gflags-shared)
+-    list(APPEND FIZZ_SHINY_DEPENDENCIES gflags-shared)
+-  elseif (TARGET gflags)
+-    list(APPEND FIZZ_SHINY_DEPENDENCIES gflags)
+-  else()
+-    message(FATAL_ERROR "Unable to determine the target name for the GFlags package.")
+-  endif()
+-  list(APPEND CMAKE_REQUIRED_LIBRARIES ${GFLAGS_LIBRARIES})
+-  list(APPEND CMAKE_REQUIRED_INCLUDES ${GFLAGS_INCLUDE_DIR})
+-else()
+-  find_package(Gflags REQUIRED MODULE)
+-  list(APPEND FIZZ_LINK_LIBRARIES ${LIBGFLAGS_LIBRARY})
+-  list(APPEND FIZZ_INCLUDE_DIRECTORIES ${LIBGFLAGS_INCLUDE_DIR})
+-  list(APPEND CMAKE_REQUIRED_LIBRARIES ${LIBGFLAGS_LIBRARY})
+-  list(APPEND CMAKE_REQUIRED_INCLUDES ${LIBGFLAGS_INCLUDE_DIR})
++find_package(zstd CONFIG REQUIRED)
++if(TARGET zstd::libzstd_shared)
++  list(APPEND FIZZ_LINK_LIBRARIES zstd::libzstd_shared)
++elseif(TARGET zstd::libzstd_static)
++  list(APPEND FIZZ_LINK_LIBRARIES zstd::libzstd_static)
+ endif()
+ 
++find_package(gflags CONFIG REQUIRED)
+ find_package(ZLIB REQUIRED)
+ 
+ find_package(Libevent CONFIG REQUIRED)
+-if(TARGET libevent::core)
+-  message(STATUS "Found libevent from package config")
+-  list(APPEND FIZZ_SHINY_DEPENDENCIES libevent::core)
+-else()
+-  find_package(Libevent MODULE REQUIRED)
+-  list(APPEND FIZZ_LINK_LIBRARIES ${LIBEVENT_LIB})
+-  list(APPEND FIZZ_INCLUDE_DIRECTORIES ${LIBEVENT_INCLUDE_DIR})
+-endif()
+ 
+ configure_file(fizz-config.h.in ${CMAKE_CURRENT_BINARY_DIR}/generated/fizz/fizz-config.h)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/fizz/fizz-config.h DESTINATION ${INCLUDE_INSTALL_DIR}/fizz/)
+@@ -243,30 +222,25 @@ target_include_directories(
+     $<BUILD_INTERFACE:${FIZZ_BASE_DIR}>
+     $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/generated>
+     $<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>
+-    ${FOLLY_INCLUDE_DIR}
+-    ${OPENSSL_INCLUDE_DIR}
+-    ${sodium_INCLUDE_DIR}
+-    ${ZSTD_INCLUDE_DIR}
+   PRIVATE
+-    ${GLOG_INCLUDE_DIRS}
+     ${FIZZ_INCLUDE_DIRECTORIES}
+-    ${DOUBLE_CONVERSION_INCLUDE_DIR}
+ )
+ 
+ 
+ target_link_libraries(fizz
+   PUBLIC
+-    ${FOLLY_LIBRARIES}
+-    ${OPENSSL_LIBRARIES}
++    Folly::folly
++    OpenSSL::SSL
++    OpenSSL::Crypto
+     unofficial-sodium::sodium
+     Threads::Threads
+     ZLIB::ZLIB
+-    ${ZSTD_LIBRARY}
+   PRIVATE
+-    ${GLOG_LIBRARIES}
+-    ${GFLAGS_LIBRARIES}
++    glog::glog
++    gflags::gflags
+     ${FIZZ_LINK_LIBRARIES}
+-    ${DOUBLE_CONVERSION_LIBRARY}
++    libevent::core
++    double-conversion::double-conversion
+     ${CMAKE_DL_LIBS}
+     ${LIBRT_LIBRARIES})
+ 
+@@ -323,8 +297,7 @@ ENDIF(CMAKE_CROSSCOMPILING)
+ SET(FIZZ_TEST_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
+ 
+ if(BUILD_TESTS)
+-  find_package(GMock 1.8.0 MODULE REQUIRED)
+-  find_package(GTest 1.8.0 MODULE REQUIRED)
++   find_package(GTest CONFIG REQUIRED)
+ endif()
+ 
+ add_library(fizz_test_support
+@@ -337,21 +310,9 @@ add_library(fizz_test_support
+ target_link_libraries(fizz_test_support
+   PUBLIC
+     fizz
+-    ${LIBGMOCK_LIBRARIES}
+-    ${GLOG_LIBRARY}
++    glog::glog
+ )
+ 
+-target_compile_definitions(fizz_test_support
+-  PUBLIC
+-    ${LIBGMOCK_DEFINES}
+-)
+-
+-target_include_directories(fizz_test_support
+-  SYSTEM
+-  PUBLIC
+-    ${LIBGMOCK_INCLUDE_DIR}
+-    ${LIBGTEST_INCLUDE_DIRS}
+-)
+ 
+ # export fizz headers and targets for unit tests utils
+ # since other projects such as mvfst and proxygen use them
+@@ -375,14 +336,13 @@ macro(add_gtest test_source test_name)
+   add_executable(${test_name} ${test_source} test/CMakeTestMain.cpp)
+ 
+   set_property(TARGET ${test_name} PROPERTY ENABLE_EXPORTS true)
+-  target_include_directories(
+-    ${test_name} PUBLIC ${LIBGMOCK_INCLUDE_DIR} ${LIBGTEST_INCLUDE_DIR})
+-  target_compile_definitions(${test_name} PUBLIC ${LIBGMOCK_DEFINES})
+   target_link_libraries(
+     ${test_name}
+     fizz
+     fizz_test_support
+-    ${LIBGMOCK_LIBRARIES})
++    GTest::gtest
++    GTest::gmock
++    )
+ 
+   if(NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC)
+     # GMOCK_MOCK_METHOD() will complain otherwise
+diff --git a/fizz/cmake/fizz-config.cmake.in b/fizz/cmake/fizz-config.cmake.in
+index 3fb48b2..baa43a6 100644
+--- a/fizz/cmake/fizz-config.cmake.in
++++ b/fizz/cmake/fizz-config.cmake.in
+@@ -26,10 +26,19 @@ endif()
+ set(FIZZ_LIBRARIES fizz::fizz)
+ 
+ include(CMakeFindDependencyMacro)
+-find_dependency(unofficial-sodium CONFIG REQUIRED)
++find_dependency(unofficial-sodium CONFIG)
+ find_dependency(folly CONFIG)
+ find_dependency(ZLIB)
+ find_dependency(Libevent CONFIG)
++find_dependency(fmt CONFIG)
++find_dependency(OpenSSL)
++find_dependency(glog CONFIG)
++find_dependency(double-conversion CONFIG)
++find_dependency(Threads)
++find_dependency(gflags CONFIG)
++find_dependency(zstd CONFIG)
++find_dependency(GTest CONFIG)
++
+ 
+ if (NOT fizz_FIND_QUIETLY)
+   message(STATUS "Found fizz: ${PACKAGE_PREFIX_DIR}")
diff --git a/external_imported/vcpkg/ports/fizz/portfile.cmake b/external_imported/vcpkg/ports/fizz/portfile.cmake
index 31aea2d7c..a6140ed27 100644
--- a/external_imported/vcpkg/ports/fizz/portfile.cmake
+++ b/external_imported/vcpkg/ports/fizz/portfile.cmake
@@ -3,12 +3,13 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebookincubator/fizz
-    REF 47948342be43ddb951e12a53770278be52d479e7  #v2022.10.31.00
-    SHA512 b91fbbe008bbd6ee5e865a585cd51f1a1b69360eba32231f0b585b836e5591ee4cc9ffe1d747a82267f21736056fc97932b35212016e614928c13de7c5a64f55
+    REF "v${VERSION}"
+    SHA512 e940aacb6dd08163f292a6e3e07e5782ccaa7658c638791a75604ba4a05da6a827a383d1727e56c85823da99a678a60ae67207f64b64c274786ad85793fd04bb
     HEAD_REF master
     PATCHES
         0001-fix-libsodium.patch
         0002-fix-libevent.patch
+        0003-fix-deps.patch
 )
 
 # Prefer installed config files
@@ -37,4 +38,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/fizz/tool/test" "${CURRENT_PACKAGES_DIR}/include/fizz/util/test")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/fizz/vcpkg.json b/external_imported/vcpkg/ports/fizz/vcpkg.json
index a87e01bd6..07a95d87d 100644
--- a/external_imported/vcpkg/ports/fizz/vcpkg.json
+++ b/external_imported/vcpkg/ports/fizz/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "fizz",
-  "version-string": "2022.10.31.00",
+  "version-string": "2024.01.01.00",
   "description": "a TLS 1.3 implementation by Facebook",
   "homepage": "https://github.com/facebookincubator/fizz",
   "license": "BSD-3-Clause",
@@ -8,6 +8,9 @@
     "double-conversion",
     "fmt",
     "folly",
+    "gflags",
+    "glog",
+    "gtest",
     "libevent",
     "libsodium",
     "openssl",
diff --git a/external_imported/vcpkg/ports/flagpp/portfile.cmake b/external_imported/vcpkg/ports/flagpp/portfile.cmake
new file mode 100644
index 000000000..84c492ce9
--- /dev/null
+++ b/external_imported/vcpkg/ports/flagpp/portfile.cmake
@@ -0,0 +1,15 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Curve/flagpp
+    REF "v${VERSION}"
+    SHA512 c0a9c63846075677b89af38aecd0536df430d7a2600115067644af58aefb6941f56a0e5bd13a4006b032cd96804cc0acde9be2725ddd79691c878f7e5ed04b92
+    HEAD_REF master
+)
+
+vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH})
+
+vcpkg_cmake_install()
+
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/flagpp/vcpkg.json b/external_imported/vcpkg/ports/flagpp/vcpkg.json
new file mode 100644
index 000000000..be0bb690f
--- /dev/null
+++ b/external_imported/vcpkg/ports/flagpp/vcpkg.json
@@ -0,0 +1,12 @@
+{
+  "name": "flagpp",
+  "version": "2.1",
+  "description": "A C++20 library that provides (opt-in) bit-wise operations for arbitrary `enum class`es",
+  "homepage": "https://github.com/Curve/flagpp",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/flann/fix_undefined_pot_t.patch b/external_imported/vcpkg/ports/flann/fix_undefined_pot_t.patch
new file mode 100644
index 000000000..459727e0b
--- /dev/null
+++ b/external_imported/vcpkg/ports/flann/fix_undefined_pot_t.patch
@@ -0,0 +1,13 @@
+diff --git a/src/cpp/flann/algorithms/dist.h b/src/cpp/flann/algorithms/dist.h
+index 4e6eb73..bbcdda1 100644
+--- a/src/cpp/flann/algorithms/dist.h
++++ b/src/cpp/flann/algorithms/dist.h
+@@ -519,7 +519,7 @@ struct HammingPopcnt
+ #else
+         HammingLUT lut;
+         result = lut(reinterpret_cast<const unsigned char*> (a),
+-                     reinterpret_cast<const unsigned char*> (b), size * sizeof(pop_t));
++                     reinterpret_cast<const unsigned char*> (b), size);
+ #endif
+         return result;
+     }
diff --git a/external_imported/vcpkg/ports/flann/portfile.cmake b/external_imported/vcpkg/ports/flann/portfile.cmake
index 78d4d2769..8eb96a4b5 100644
--- a/external_imported/vcpkg/ports/flann/portfile.cmake
+++ b/external_imported/vcpkg/ports/flann/portfile.cmake
@@ -9,6 +9,7 @@ vcpkg_from_github(
     PATCHES
         fix-build-error.patch
         fix-dependency-hdf5.patch
+        fix_undefined_pot_t.patch # https://github.com/opencv/opencv/pull/13270/
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -37,6 +38,6 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/flann RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
 
 vcpkg_fixup_pkgconfig()
diff --git a/external_imported/vcpkg/ports/flann/vcpkg.json b/external_imported/vcpkg/ports/flann/vcpkg.json
index ed0622359..c93f374d0 100644
--- a/external_imported/vcpkg/ports/flann/vcpkg.json
+++ b/external_imported/vcpkg/ports/flann/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "flann",
   "version-date": "2019-04-07",
-  "port-version": 6,
+  "port-version": 7,
   "description": "Fast Library for Approximate Nearest Neighbors",
   "homepage": "https://github.com/mariusmuja/flann",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/flashlight-cpu/portfile.cmake b/external_imported/vcpkg/ports/flashlight-cpu/portfile.cmake
index cf4f1cdcc..11459b6d0 100644
--- a/external_imported/vcpkg/ports/flashlight-cpu/portfile.cmake
+++ b/external_imported/vcpkg/ports/flashlight-cpu/portfile.cmake
@@ -35,20 +35,19 @@ vcpkg_check_features(
 )
 
 # Build and install
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS 
         ${FL_DEFAULT_VCPKG_CMAKE_FLAGS} 
         ${FEATURE_OPTIONS}
     OPTIONS_DEBUG
-        -DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/debug/share/flashlight
+        "-DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/debug/share/flashlight"
     OPTIONS_RELEASE
-        -DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share/flashlight
+        "-DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share/flashlight"
 )
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/flashlight TARGET_PATH share/flashlight)
+vcpkg_cmake_config_fixup(PACKAGE_NAME flashlight)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
@@ -85,4 +84,4 @@ if (NUM_TOOLS GREATER 0)
 endif()
 
 # Copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/external_imported/vcpkg/ports/flashlight-cpu/vcpkg.json b/external_imported/vcpkg/ports/flashlight-cpu/vcpkg.json
index 03ef5e957..2794691a6 100644
--- a/external_imported/vcpkg/ports/flashlight-cpu/vcpkg.json
+++ b/external_imported/vcpkg/ports/flashlight-cpu/vcpkg.json
@@ -1,11 +1,21 @@
 {
   "name": "flashlight-cpu",
   "version": "0.3",
-  "port-version": 3,
+  "port-version": 5,
   "description": "A C++ standalone library for machine learning. CPU backend.",
   "homepage": "https://github.com/facebookresearch/flashlight",
   "license": "MIT",
   "supports": "!(windows | osx)",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
   "default-features": [
     "fl"
   ],
diff --git a/external_imported/vcpkg/ports/flashlight-cuda/portfile.cmake b/external_imported/vcpkg/ports/flashlight-cuda/portfile.cmake
index 9935ea94e..49582ffb6 100644
--- a/external_imported/vcpkg/ports/flashlight-cuda/portfile.cmake
+++ b/external_imported/vcpkg/ports/flashlight-cuda/portfile.cmake
@@ -34,20 +34,19 @@ vcpkg_check_features(
 )
 
 # Build and install
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS 
         ${FL_DEFAULT_VCPKG_CMAKE_FLAGS} 
         ${FEATURE_OPTIONS}
     OPTIONS_DEBUG
-        -DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/debug/share/flashlight    
+        "-DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/debug/share/flashlight"
     OPTIONS_RELEASE        
-        -DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share/flashlight
+        "-DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share/flashlight"
 )
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/flashlight TARGET_PATH share/flashlight)
+vcpkg_cmake_config_fixup(PACKAGE_NAME flashlight)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
@@ -84,4 +83,4 @@ if (NUM_TOOLS GREATER 0)
 endif()
 
 # Copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/flashlight-cuda/vcpkg.json b/external_imported/vcpkg/ports/flashlight-cuda/vcpkg.json
index 0f0afd075..e950197c8 100644
--- a/external_imported/vcpkg/ports/flashlight-cuda/vcpkg.json
+++ b/external_imported/vcpkg/ports/flashlight-cuda/vcpkg.json
@@ -1,11 +1,21 @@
 {
   "name": "flashlight-cuda",
   "version": "0.3",
-  "port-version": 4,
+  "port-version": 6,
   "description": "A C++ standalone library for machine learning. CUDA backend.",
   "homepage": "https://github.com/facebookresearch/flashlight",
   "license": "MIT",
   "supports": "!(windows | osx)",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
   "default-features": [
     "fl"
   ],
diff --git a/external_imported/vcpkg/ports/flashlight-sequence/portfile.cmake b/external_imported/vcpkg/ports/flashlight-sequence/portfile.cmake
new file mode 100644
index 000000000..3e591dd36
--- /dev/null
+++ b/external_imported/vcpkg/ports/flashlight-sequence/portfile.cmake
@@ -0,0 +1,33 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO flashlight/sequence
+    REF v${VERSION}
+    SHA512 215bb4988fbdd31573965c3c5d88d40b247cbca49f092dcdb89b5f2ca422d5774e941de843433fd3effd8f09569a7e0c2cc61364b5f0a210f156933e4c00f16b
+    HEAD_REF main
+)
+
+vcpkg_check_features(
+    OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        openmp FL_SEQUENCE_USE_OPENMP
+        cuda   FL_SEQUENCE_USE_CUDA
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DFL_SEQUENCE_BUILD_TESTS=OFF
+        -DFL_SEQUENCE_BUILD_STANDALONE=OFF
+        ${FEATURE_OPTIONS}
+    OPTIONS_DEBUG
+        "-DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/debug/share/${PORT}"
+    OPTIONS_RELEASE
+        "-DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share/${PORT}"
+)
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/flashlight-sequence/vcpkg.json b/external_imported/vcpkg/ports/flashlight-sequence/vcpkg.json
new file mode 100644
index 000000000..96db8ea65
--- /dev/null
+++ b/external_imported/vcpkg/ports/flashlight-sequence/vcpkg.json
@@ -0,0 +1,28 @@
+{
+  "name": "flashlight-sequence",
+  "version": "0.0.1",
+  "description": "Flashlight Sequence is a library containing fast implementations of sequence loss algorithms.",
+  "homepage": "https://github.com/flashlight/sequence",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
+  "features": {
+    "cuda": {
+      "description": "Build CUDA components",
+      "dependencies": [
+        "cuda"
+      ]
+    },
+    "openmp": {
+      "description": "Build with OpenMP"
+    }
+  }
+}
diff --git a/external_imported/vcpkg/ports/flashlight-text/portfile.cmake b/external_imported/vcpkg/ports/flashlight-text/portfile.cmake
new file mode 100644
index 000000000..2b6a5efea
--- /dev/null
+++ b/external_imported/vcpkg/ports/flashlight-text/portfile.cmake
@@ -0,0 +1,33 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO flashlight/text
+    REF v${VERSION}
+    SHA512 d9ed9b687c441e356b19a035ecef1abc76d90e3e0d8a9c32899bd7a81e379a9ae51bc6d68e7bae10cf83b87ec76289afbd81909d70799ca8d24f996e8667ad85
+    HEAD_REF main
+)
+
+vcpkg_check_features(
+    OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        kenlm FL_TEXT_USE_KENLM
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DFL_TEXT_BUILD_TESTS=OFF
+        -DFL_TEXT_BUILD_STANDALONE=OFF
+        ${FEATURE_OPTIONS}
+    OPTIONS_DEBUG
+        "-DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/debug/share/${PORT}"
+    OPTIONS_RELEASE
+        "-DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share/${PORT}"
+
+)
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/flashlight-text/vcpkg.json b/external_imported/vcpkg/ports/flashlight-text/vcpkg.json
new file mode 100644
index 000000000..39fdad28b
--- /dev/null
+++ b/external_imported/vcpkg/ports/flashlight-text/vcpkg.json
@@ -0,0 +1,25 @@
+{
+  "name": "flashlight-text",
+  "version": "0.0.4",
+  "description": "Flashlight Text is a library for tokenization, beam search, and text processing.",
+  "homepage": "https://github.com/flashlight/text",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
+  "features": {
+    "kenlm": {
+      "description": "Build with KenLM",
+      "dependencies": [
+        "kenlm"
+      ]
+    }
+  }
+}
diff --git a/external_imported/vcpkg/ports/flatbuffers/portfile.cmake b/external_imported/vcpkg/ports/flatbuffers/portfile.cmake
index acdeb70ff..3be02cc50 100644
--- a/external_imported/vcpkg/ports/flatbuffers/portfile.cmake
+++ b/external_imported/vcpkg/ports/flatbuffers/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/flatbuffers
     REF "v${VERSION}"
-    SHA512 4066c94f2473c7ea16917d29a613e16f840a329089c88e0bdbdb999aef3442ba00abfd2aa92266fa9c067e399dc88e6f0ccac40dc151378857e665638e78bbf0
+    SHA512 cd0a5efad8016e1217d01a181d6b02e546f5693c6412361bfeaee820d5dfe5e2a424cee1963270e851c1a4f936ae8a0032a51c5bb16ee19313e0ecc77dc4ba31
     HEAD_REF master
     PATCHES
         fix-uwp-build.patch
@@ -25,6 +25,8 @@ vcpkg_cmake_configure(
         -DFLATBUFFERS_BUILD_TESTS=OFF
         -DFLATBUFFERS_BUILD_GRPCTEST=OFF
         ${options}
+    OPTIONS_DEBUG
+        -DFLATBUFFERS_BUILD_FLATC=OFF
 )
 
 vcpkg_cmake_install()
@@ -36,12 +38,12 @@ if(flatc_path)
     vcpkg_copy_tools(TOOL_NAMES flatc AUTO_CLEAN)
 else()
     file(APPEND "${CURRENT_PACKAGES_DIR}/share/flatbuffers/flatbuffers-config.cmake"
-"include(\"\${CMAKE_CURRENT_LIST_DIR}/../../../${HOST_TRIPLET}/share/flatbuffers/FlatcTargets.cmake\")\n")
+"\ninclude(\"\${CMAKE_CURRENT_LIST_DIR}/../../../${HOST_TRIPLET}/share/flatbuffers/FlatcTargets.cmake\")\n")
 endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/flatbuffers/pch")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 
-# Handle copyright
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/flatbuffers/vcpkg.json b/external_imported/vcpkg/ports/flatbuffers/vcpkg.json
index b603a4588..d4f55f411 100644
--- a/external_imported/vcpkg/ports/flatbuffers/vcpkg.json
+++ b/external_imported/vcpkg/ports/flatbuffers/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "flatbuffers",
-  "version": "23.3.3",
+  "version": "23.5.26",
+  "port-version": 1,
   "description": [
     "Memory Efficient Serialization Library",
     "FlatBuffers is an efficient cross platform serialization library for games and other memory constrained apps. It allows you to directly access serialized data without unpacking/parsing it first, while still having great forwards/backwards compatibility."
diff --git a/external_imported/vcpkg/ports/flatbush/portfile.cmake b/external_imported/vcpkg/ports/flatbush/portfile.cmake
new file mode 100644
index 000000000..43deaaf88
--- /dev/null
+++ b/external_imported/vcpkg/ports/flatbush/portfile.cmake
@@ -0,0 +1,19 @@
+# Header-only library
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO chusitoo/flatbush
+    REF "v${VERSION}"
+    SHA512 c2671a8885bc1299efdfa38f1947b98697aeb9ee156622cd71fbdf8a7741e5fa0306f5d85867e6dd683fb80c9d74fa9cd9809b47797183a0bbcab7ee57df165e
+    HEAD_REF master
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH share/flatbush)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+
+# Handle copyright
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/flatbush/vcpkg.json b/external_imported/vcpkg/ports/flatbush/vcpkg.json
new file mode 100644
index 000000000..150b4c910
--- /dev/null
+++ b/external_imported/vcpkg/ports/flatbush/vcpkg.json
@@ -0,0 +1,17 @@
+{
+  "name": "flatbush",
+  "version": "1.2.0",
+  "description": "A C++11 header-only single file port of Flatbush",
+  "homepage": "https://github.com/chusitoo/flatbush",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/flecs/portfile.cmake b/external_imported/vcpkg/ports/flecs/portfile.cmake
index 3078af78b..c7a630969 100644
--- a/external_imported/vcpkg/ports/flecs/portfile.cmake
+++ b/external_imported/vcpkg/ports/flecs/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO SanderMertens/flecs
     REF "v${VERSION}"
-    SHA512 683a65f0187f65806b96557fa8230a082aec4d4c04922af906c60e780c6b59ac377944fa16c134f07555b6172aa47421738ff9482d7c7489d8c651f13c93abbc
+    SHA512 9e4a0dc17ba0cb092f3be055c589146e44b2e258d534420f4914e4ce4926371dab07660cb7d186a62cbbae32c121dc9838af78a8a46138cfc0efe3cb14383713
     HEAD_REF master
 )
 
@@ -31,6 +31,7 @@ endif()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
 
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
diff --git a/external_imported/vcpkg/ports/flecs/usage b/external_imported/vcpkg/ports/flecs/usage
new file mode 100644
index 000000000..c513e5019
--- /dev/null
+++ b/external_imported/vcpkg/ports/flecs/usage
@@ -0,0 +1,4 @@
+The package flecs provides CMake targets:
+
+    find_package(flecs CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE $<IF:$<TARGET_EXISTS:flecs::flecs>,flecs::flecs,flecs::flecs_static>)
diff --git a/external_imported/vcpkg/ports/flecs/vcpkg.json b/external_imported/vcpkg/ports/flecs/vcpkg.json
index 4451d8be7..b8d7c8d64 100644
--- a/external_imported/vcpkg/ports/flecs/vcpkg.json
+++ b/external_imported/vcpkg/ports/flecs/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "flecs",
-  "version": "3.1.5",
+  "version": "3.2.11",
   "description": "A fast entity component system (ECS) for C & C++",
   "homepage": "https://github.com/SanderMertens/flecs",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/flint/portfile.cmake b/external_imported/vcpkg/ports/flint/portfile.cmake
index cd8c8ed03..90bc02335 100644
--- a/external_imported/vcpkg/ports/flint/portfile.cmake
+++ b/external_imported/vcpkg/ports/flint/portfile.cmake
@@ -1,16 +1,14 @@
-set(FLINT_VERSION 2.8.0)
-set(FLINT_HASH "916285d13a55d12a041236195a9d7bbc5c1c3c30c3aa2f169efee6063b800d34f96ad3235f1c77285b04305ce685e5890169c984108d50d0c9ee7a77c3f6e73d")
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://www.flintlib.org/flint-${FLINT_VERSION}.zip"
-    FILENAME "flint-${FLINT_VERSION}.zip"
-    SHA512 ${FLINT_HASH}
+    URLS "http://www.flintlib.org/flint-${VERSION}.zip"
+    FILENAME "flint-${VERSION}.zip"
+    SHA512 3dd9a4e79e08ab6bc434a786c8d4398eba6cb04e57bcb8d01677f4912cddf20ed3a971160a3e2d533d9a07b728678b0733cc8315bcb39a3f13475b6efa240062
 )
 
 vcpkg_find_acquire_program(PYTHON3)
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE ${ARCHIVE}
     PATCHES
         fix-cmakelists.patch
diff --git a/external_imported/vcpkg/ports/flint/vcpkg.json b/external_imported/vcpkg/ports/flint/vcpkg.json
index 9c85c6007..bdf8ed6fa 100644
--- a/external_imported/vcpkg/ports/flint/vcpkg.json
+++ b/external_imported/vcpkg/ports/flint/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "flint",
-  "version-semver": "2.8.0",
-  "port-version": 1,
+  "version-semver": "2.9.0",
   "description": "Fast Library for Number Theory",
   "homepage": "https://www.flintlib.org/",
   "supports": "!uwp",
diff --git a/external_imported/vcpkg/ports/fltk/dependencies.patch b/external_imported/vcpkg/ports/fltk/dependencies.patch
index bd4507c34..848399824 100644
--- a/external_imported/vcpkg/ports/fltk/dependencies.patch
+++ b/external_imported/vcpkg/ports/fltk/dependencies.patch
@@ -1,26 +1,53 @@
 diff --git a/CMake/options.cmake b/CMake/options.cmake
-index ddd650f..69bcc2e 100644
+index d1e299f..d20e9c8 100644
 --- a/CMake/options.cmake
 +++ b/CMake/options.cmake
-@@ -63,7 +63,7 @@ endif (APPLE)
+@@ -101,11 +101,14 @@ endif ()
+ #######################################################################
+ 
+ if (OPTION_USE_SYSTEM_ZLIB)
+-  find_package (ZLIB)
++  find_package(ZLIB REQUIRED)
++  set(LIB_zlib "${ZLIB_LIBRARIES}" CACHE INTERNAL "")
+ endif ()
+ 
+ if (OPTION_USE_SYSTEM_LIBPNG)
+-  find_package (PNG)
++  find_package(PNG REQUIRED)
++  set(HAVE_PNG_H "${PNG_FOUND}")
++  set(LIB_png "${PNG_LIBRARIES}" CACHE INTERNAL "")
+ endif ()
+ 
+ # If we use the system zlib, we must also use the system png zlib and vice versa
+@@ -148,7 +151,8 @@ set (HAVE_LIBZ 1)
+ #######################################################################
+ 
+ if (OPTION_USE_SYSTEM_LIBJPEG)
+-  find_package (JPEG)
++  find_package(JPEG REQUIRED)
++  set(LIB_jpeg "${JPEG_LIBRARIES}" CACHE INTERNAL "")
+ endif ()
+ 
+ if (OPTION_USE_SYSTEM_LIBJPEG AND JPEG_FOUND)
+@@ -228,7 +232,7 @@ endif (APPLE)
  # find X11 libraries and headers
  set (PATH_TO_XLIBS)
- if ((NOT APPLE OR OPTION_APPLE_X11) AND NOT WIN32)
+ if (NOT APPLE AND NOT WIN32)
 -  include (FindX11)
 +  find_package(X11)
    if (X11_FOUND)
      set (USE_X11 1)
      list (APPEND FLTK_LDLIBS -lX11)
-@@ -214,7 +214,7 @@ if (OPTION_USE_GL)
-     unset(HAVE_GL_GLU_H CACHE)
-     find_file (HAVE_GL_GLU_H GL/glu.h PATHS ${X11_INCLUDE_DIR})
-   else()
--    include (FindOpenGL)
-+    find_package(OpenGL REQUIRED)
-     if (APPLE)
-       set (HAVE_GL_GLU_H ${HAVE_OPENGL_GLU_H})
-     endif (APPLE)
-@@ -285,7 +285,7 @@ set (FLTK_PTHREADS_FOUND FALSE)
+@@ -351,7 +355,7 @@ if (HAVE_GL)
+ endif (HAVE_GL)
+ 
+ if (OPTION_USE_GL)
+-  include (FindOpenGL)
++  find_package(OpenGL REQUIRED)
+   if (APPLE)
+     set (HAVE_GL_GLU_H ${HAVE_OPENGL_GLU_H})
+   endif (APPLE)
+@@ -421,7 +425,7 @@ set (FLTK_PTHREADS_FOUND FALSE)
  
  if (OPTION_USE_THREADS)
  
@@ -29,39 +56,8 @@ index ddd650f..69bcc2e 100644
  
    if (CMAKE_HAVE_THREADS_LIBRARY)
      add_definitions ("-D_THREAD_SAFE -D_REENTRANT")
-@@ -330,7 +330,8 @@ unset (debug_threads)
- option (OPTION_USE_SYSTEM_ZLIB "use system zlib" ON)
- 
- if (OPTION_USE_SYSTEM_ZLIB)
--  include (FindZLIB)
-+  find_package(ZLIB REQUIRED)
-+  set(LIB_zlib "${ZLIB_LIBRARIES}" CACHE INTERNAL "")
- endif (OPTION_USE_SYSTEM_ZLIB)
- 
- if (ZLIB_FOUND)
-@@ -359,7 +360,8 @@ else ()
- endif (APPLE)
- 
- if (OPTION_USE_SYSTEM_LIBJPEG)
--  include (FindJPEG)
-+  find_package(JPEG REQUIRED)
-+  set(LIB_jpeg "${JPEG_LIBRARIES}" CACHE INTERNAL "")
- endif (OPTION_USE_SYSTEM_LIBJPEG)
- 
- if (JPEG_FOUND)
-@@ -387,7 +389,9 @@ else ()
- endif (APPLE)
- 
- if (OPTION_USE_SYSTEM_LIBPNG)
--  include (FindPNG)
-+  find_package(PNG REQUIRED)
-+  set(HAVE_PNG_H "${PNG_FOUND}")
-+  set(LIB_png "${PNG_LIBRARIES}" CACHE INTERNAL "")
- endif (OPTION_USE_SYSTEM_LIBPNG)
- 
- if (PNG_FOUND)
 diff --git a/CMake/resources.cmake b/CMake/resources.cmake
-index 57173f2..734a528 100644
+index a763fb6..5fdb3d5 100644
 --- a/CMake/resources.cmake
 +++ b/CMake/resources.cmake
 @@ -39,7 +39,7 @@ endmacro (fl_find_header)
@@ -73,7 +69,7 @@ index 57173f2..734a528 100644
  
  # fl_debug_var (PKG_CONFIG_FOUND)
  # fl_debug_var (PKG_CONFIG_EXECUTABLE)
-@@ -151,8 +151,7 @@ mark_as_advanced (HAVE_X11_XREGION_H)
+@@ -131,8 +131,7 @@ mark_as_advanced (HAVE_X11_XREGION_H)
  
  # where to find freetype headers
  
@@ -83,19 +79,19 @@ index 57173f2..734a528 100644
  
  if (FREETYPE_PATH)
    include_directories (${FREETYPE_PATH})
-@@ -162,11 +161,12 @@ mark_as_advanced (FREETYPE_PATH)
+@@ -142,11 +141,12 @@ mark_as_advanced (FREETYPE_PATH)
  
  #######################################################################
  # libraries
 -find_library (LIB_dl dl)
 +set(LIB_dl "${CMAKE_DL_LIBS}" CACHE STRING "")
- if ((NOT APPLE) OR OPTION_APPLE_X11)
+ if (NOT APPLE)
 -  find_library (LIB_fontconfig fontconfig)
 +  find_package(Fontconfig REQUIRED)
 +  set(LIB_fontconfig "${Fontconfig_LIBRARIES}" CACHE INTERNAL "")
- endif ((NOT APPLE) OR OPTION_APPLE_X11)
+ endif (NOT APPLE)
 -find_library (LIB_freetype freetype)
 +set(LIB_freetype "" CACHE INTERNAL "Obsolete")
  find_library (LIB_GL GL)
  find_library (LIB_MesaGL MesaGL)
- find_library (LIB_GLEW GLEW)
+ find_library (LIB_GLEW NAMES GLEW glew32)
diff --git a/external_imported/vcpkg/ports/fltk/fix-narrow.patch b/external_imported/vcpkg/ports/fltk/fix-narrow.patch
deleted file mode 100644
index 1af2eb89d..000000000
--- a/external_imported/vcpkg/ports/fltk/fix-narrow.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/fluid/ExternalCodeEditor_WIN32.cxx b/fluid/ExternalCodeEditor_WIN32.cxx
-index 4646fe5..3b7f693 100644
---- a/fluid/ExternalCodeEditor_WIN32.cxx
-+++ b/fluid/ExternalCodeEditor_WIN32.cxx
-@@ -474,7 +474,7 @@ void ExternalCodeEditor::reap_cleanup() {
- int ExternalCodeEditor::reap_editor(DWORD *pid_reaped) {
-   if ( pid_reaped ) *pid_reaped = 0;
-   if ( !is_editing() ) return -2;
--  int err;
-+  DWORD err;
-   DWORD msecs_wait = 50;   // .05 sec
-   switch ( err = WaitForSingleObject(pinfo_.hProcess, msecs_wait) ) {
-     case WAIT_TIMEOUT: {   // process didn't reap, still running
diff --git a/external_imported/vcpkg/ports/fltk/fix-system-link.patch b/external_imported/vcpkg/ports/fltk/fix-system-link.patch
index 45a4c3521..e4c324093 100644
--- a/external_imported/vcpkg/ports/fltk/fix-system-link.patch
+++ b/external_imported/vcpkg/ports/fltk/fix-system-link.patch
@@ -1,16 +1,16 @@
 diff --git a/CMake/fl_add_library.cmake b/CMake/fl_add_library.cmake
-index 6fa2fc5..e5ba493 100644
+index 7e3490b..682a000 100644
 --- a/CMake/fl_add_library.cmake
 +++ b/CMake/fl_add_library.cmake
-@@ -38,6 +38,11 @@ macro (FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES)
-   add_library(${TARGET_NAME} ${LIBTYPE} ${LIBFILES})
-   
+@@ -39,6 +39,11 @@ macro (FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES)
+ 
    target_include_directories(${TARGET_NAME} PUBLIC $<INSTALL_INTERFACE:include>)
-+  
+ 
 +    if (APPLE)
 +        find_library(Cocoa Cocoa)
 +        target_link_libraries(${TARGET_NAME} $<$<PLATFORM_ID:Darwin>:${Cocoa}>)
 +    endif()
- 
++
    # target properties for all libraries
  
+   set_target_properties(${TARGET_NAME}
diff --git a/external_imported/vcpkg/ports/fltk/include.patch b/external_imported/vcpkg/ports/fltk/include.patch
index d460134dc..993c717d6 100644
--- a/external_imported/vcpkg/ports/fltk/include.patch
+++ b/external_imported/vcpkg/ports/fltk/include.patch
@@ -1,13 +1,13 @@
 diff --git a/CMake/fl_add_library.cmake b/CMake/fl_add_library.cmake
-index 29baa95..6fa2fc5 100644
+index 29baa95..7e3490b 100644
 --- a/CMake/fl_add_library.cmake
 +++ b/CMake/fl_add_library.cmake
-@@ -36,6 +36,8 @@ macro (FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES)
-   endif (MSVC)
+@@ -37,6 +37,8 @@ macro (FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES)
  
    add_library(${TARGET_NAME} ${LIBTYPE} ${LIBFILES})
-+  
-+  target_include_directories(${TARGET_NAME} PUBLIC $<INSTALL_INTERFACE:include>)
  
++  target_include_directories(${TARGET_NAME} PUBLIC $<INSTALL_INTERFACE:include>)
++
    # target properties for all libraries
  
+   set_target_properties(${TARGET_NAME}
diff --git a/external_imported/vcpkg/ports/fltk/portfile.cmake b/external_imported/vcpkg/ports/fltk/portfile.cmake
index ccfdb91d1..036d3abc2 100644
--- a/external_imported/vcpkg/ports/fltk/portfile.cmake
+++ b/external_imported/vcpkg/ports/fltk/portfile.cmake
@@ -4,15 +4,14 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO fltk/fltk
-    REF release-1.3.8
-    SHA512 197848d3b80a65cca936daf4f0b74609f0fe8332a4cd11af53385fb2aa45ad698b1e239a48732b118cd3cb189bc531711b72fb2eeeb85be887dc6c5a558fa4b3
+    REF "release-${VERSION}"
+    SHA512 2dfeeed9fdc6db62a6620e7c846dbe0bf97dacce3077832e314a35bf16ba6a45803373188a7b3954eada5829385b9914241270b71f12aaf3e9e3df45eb2b1b95
     PATCHES
         dependencies.patch
         config-path.patch
         include.patch
         fix-system-link.patch
         math-h-polyfill.patch
-        fix-narrow.patch
 )
 file(REMOVE_RECURSE
     "${SOURCE_PATH}/jpeg"
@@ -31,6 +30,11 @@ if(VCPKG_CROSSCOMPILING)
     set(fluid_path_param "-DFLUID_PATH=${CURRENT_HOST_INSTALLED_DIR}/tools/fltk/fluid${VCPKG_HOST_EXECUTABLE_SUFFIX}")
 endif()
 
+set(runtime_dll "ON")
+if(VCPKG_CRT_LINKAGE STREQUAL "static")
+    set(runtime_dll "OFF")
+endif()
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
@@ -45,6 +49,7 @@ vcpkg_cmake_configure(
         -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=1
         "-DCocoa:STRING=-framework Cocoa" # avoid absolute path
         ${fluid_path_param}
+        -DFLTK_MSVC_RUNTIME_DLL=${runtime_dll}
     MAYBE_UNUSED_VARIABLES
         Cocoa
 )
diff --git a/external_imported/vcpkg/ports/fltk/vcpkg.json b/external_imported/vcpkg/ports/fltk/vcpkg.json
index 7fd2392dd..8d5443bef 100644
--- a/external_imported/vcpkg/ports/fltk/vcpkg.json
+++ b/external_imported/vcpkg/ports/fltk/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "fltk",
-  "version": "1.3.8",
-  "port-version": 5,
+  "version": "1.3.9",
   "description": "FLTK (pronounced fulltick) is a cross-platform C++ GUI toolkit for UNIX/Linux (X11), Microsoft Windows, and MacOS X. FLTK provides modern GUI functionality without the bloat and supports 3D graphics via OpenGL and its built-in GLUT emulation.",
   "homepage": "https://www.fltk.org/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/fluidlite/fix-dependencies.patch b/external_imported/vcpkg/ports/fluidlite/fix-dependencies.patch
new file mode 100644
index 000000000..4d3bd6917
--- /dev/null
+++ b/external_imported/vcpkg/ports/fluidlite/fix-dependencies.patch
@@ -0,0 +1,26 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4aead6c369f129f50d79d77e6ac8f58afba91fa5..83f3f5026861dd904060293be8754c9e265047ab 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -113,7 +113,7 @@ endif()
+ 
+ set(FLUIDLITE_VENDORED FALSE)
+ if (ENABLE_SF3 AND NOT STB_VORBIS)
+-    find_package(Vorbis QUIET)
++    find_package(Vorbis CONFIG REQUIRED)
+     if (NOT TARGET Vorbis::vorbisfile)
+         message(WARNING "Using vendored libogg/libvorbis")
+ 
+diff --git a/fluidlite-config.cmake.in b/fluidlite-config.cmake.in
+index 8c40ff0eb077fc0fd530f052500214d75e96899d..46940e4cd218d245014f40f1097f7193cc8952b3 100644
+--- a/fluidlite-config.cmake.in
++++ b/fluidlite-config.cmake.in
+@@ -15,7 +15,7 @@ endif()
+ if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@-static-targets.cmake")
+    include(CMakeFindDependencyMacro)
+    if("${FLUIDLITE_SF3_SUPPORT}" STREQUAL "SF3_XIPH_VORBIS" AND NOT FLUIDLITE_VENDORED AND NOT TARGET Vorbis::vorbisfile)
+-      find_dependency(Vorbis)
++      find_dependency(Vorbis CONFIG)
+    endif()
+ 
+    include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@-static-targets.cmake")
diff --git a/external_imported/vcpkg/ports/fluidlite/portfile.cmake b/external_imported/vcpkg/ports/fluidlite/portfile.cmake
index ab9fab94e..b6d2e8ee7 100644
--- a/external_imported/vcpkg/ports/fluidlite/portfile.cmake
+++ b/external_imported/vcpkg/ports/fluidlite/portfile.cmake
@@ -1,32 +1,38 @@
-if(EXISTS "${CURRENT_PACKAGES_DIR}/share/fluidsynth/copyright")
-    message(FATAL_ERROR "Can't build fluidlite if fluidsynth is installed. Please remove fluidsynth, and try to install fluidlite again if you need it.")
-endif()
-
-if(VCPKG_TARGET_IS_WINDOWS)
-    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-endif()
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO divideconcept/FluidLite
-    REF fdd05bad03cdb24d1f78b5fe3453842890c1b0e8
-    SHA512 8118bec2cb5ee48b8064ed2111610f1917ee8e6f1dc213121b2311d056da21d7f618ef50735e7653d2cccf1e96652f3ccf026101fccb9863448008918add53e0
-    HEAD_REF master
+    REF d59d2328818f913b7d1a6a59aed695c47a8ce388
+    SHA512 d08ddd0b61dc16c26e5ebc8e54e2efef163f8d0b4da6ce4a040b49756feb105220d48ec6238568b00c68dfa244fac0ab53e3c59c066d4b92dc248df3715c388c
+    PATCHES
+        fix-dependencies.patch
 )
 
-string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" FLUIDLITE_BUILD_STATIC)
-string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" FLUIDLITE_BUILD_SHARED)
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        sf3     ENABLE_SF3
+)
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-        -DFLUIDLITE_BUILD_STATIC=${FLUIDLITE_BUILD_STATIC}
-        -DFLUIDLITE_BUILD_SHARED=${FLUIDLITE_BUILD_SHARED}
+        ${FEATURE_OPTIONS}
 )
 
 vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(
+    PACKAGE_NAME fluidlite
+    CONFIG_PATH lib/cmake/fluidlite
+)
+
 vcpkg_fixup_pkgconfig()
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE 
+    "${CURRENT_PACKAGES_DIR}/debug/share"
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+)
+
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/fluidlite/usage b/external_imported/vcpkg/ports/fluidlite/usage
new file mode 100644
index 000000000..d408e9cd5
--- /dev/null
+++ b/external_imported/vcpkg/ports/fluidlite/usage
@@ -0,0 +1,4 @@
+fluidlite provides CMake targets:
+
+    find_package(fluidlite CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE $<IF:$<TARGET_EXISTS:fluidlite::fluidlite>,fluidlite::fluidlite,fluidlite::fluidlite-static>)
diff --git a/external_imported/vcpkg/ports/fluidlite/vcpkg.json b/external_imported/vcpkg/ports/fluidlite/vcpkg.json
index 51c3a0bc7..a0d05e9ac 100644
--- a/external_imported/vcpkg/ports/fluidlite/vcpkg.json
+++ b/external_imported/vcpkg/ports/fluidlite/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "fluidlite",
-  "version-date": "2020-08-27",
-  "port-version": 3,
+  "version-date": "2023-04-18",
   "description": "FluidLite is a very light version of FluidSynth designed to be hardware, platform and external dependency independant.",
   "homepage": "https://github.com/divideconcept/FluidLite",
   "license": "LGPL-2.1-or-later",
@@ -9,6 +8,21 @@
     {
       "name": "vcpkg-cmake",
       "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
+  "default-features": [
+    "sf3"
+  ],
+  "features": {
+    "sf3": {
+      "description": "Enable SF3 files (ogg/vorbis compressed samples)",
+      "dependencies": [
+        "libvorbis"
+      ]
     }
-  ]
+  }
 }
diff --git a/external_imported/vcpkg/ports/fluidsynth/add-usage-requirements.patch b/external_imported/vcpkg/ports/fluidsynth/add-usage-requirements.patch
deleted file mode 100644
index e5b63eebc..000000000
--- a/external_imported/vcpkg/ports/fluidsynth/add-usage-requirements.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/FluidSynthConfig.cmake.in b/FluidSynthConfig.cmake.in
-index 1ffdf598..0be65e0e 100644
---- a/FluidSynthConfig.cmake.in
-+++ b/FluidSynthConfig.cmake.in
-@@ -6,5 +6,16 @@
- # define variables for configuration options:
- # set(network-enabled @enable-network@)
- 
-+include(CMakeFindDependencyMacro)
-+find_dependency(PkgConfig)
-+pkg_check_modules(GLIB IMPORTED_TARGET glib-2.0>=2.6.5 gthread-2.0>=2.6.5)
-+set(ALSA_SUPPORT @ALSA_SUPPORT@)
-+if(ALSA_SUPPORT)
-+  pkg_check_modules(ALSA IMPORTED_TARGET alsa>=0.9.1)
-+endif()
-+set(LIBSNDFILE_SUPPORT @LIBSNDFILE_SUPPORT@)
-+if(LIBSNDFILE_SUPPORT)
-+  pkg_check_modules(LIBSNDFILE IMPORTED_TARGET sndfile>=1.0.0)
-+endif()
- # finally, include the targets file
- include("${CMAKE_CURRENT_LIST_DIR}/FluidSynthTargets.cmake")
diff --git a/external_imported/vcpkg/ports/fluidsynth/portfile.cmake b/external_imported/vcpkg/ports/fluidsynth/portfile.cmake
index 4b6823719..87c62c848 100644
--- a/external_imported/vcpkg/ports/fluidsynth/portfile.cmake
+++ b/external_imported/vcpkg/ports/fluidsynth/portfile.cmake
@@ -1,12 +1,19 @@
+if("pulseaudio" IN_LIST FEATURES)
+    message(
+    "${PORT} with pulseaudio feature currently requires the following from the system package manager:
+        libpulse-dev pulseaudio
+    These can be installed on Ubuntu systems via sudo apt install libpulse-dev pulseaudio"
+    )
+endif()
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO FluidSynth/fluidsynth
     REF "v${VERSION}"
-    SHA512 1633294bf6c714361c381151b62d9dd2c8f388490153e7964bfa14fd647a681db9ebfe1de0a06279972d6c5b30377f67361feb4db186b1faa235600f0ae02b22
+    SHA512 79891116d78b9be1c38bce9e5759b9bb732c3d8ee31c6e57d1a3e2b5548879b91d19582e73ee7fb0fd243beba3bf1bbc341a26aab0b6440eef36fc55dce3e8b0
     HEAD_REF master
     PATCHES
         gentables.patch
-        add-usage-requirements.patch
 )
 
 vcpkg_check_features(
@@ -14,29 +21,40 @@ vcpkg_check_features(
     FEATURES
         buildtools  VCPKG_BUILD_MAKE_TABLES
         sndfile     enable-libsndfile
+        pulseaudio  enable-pulseaudio
 )
 
-set(feature_list dbus jack libinstpatch midishare opensles oboe openmp oss sdl2 pulseaudio readline lash systemd dart)
-foreach(_feature IN LISTS feature_list)
-    list(APPEND FEATURE_OPTIONS -Denable-${_feature}:BOOL=OFF)
-endforeach()
+# enable platform-specific features, force the build to fail if the required libraries are not found,
+# and disable all other features to avoid system libraries to be picked up
+set(WINDOWS_OPTIONS enable-dsound enable-wasapi enable-waveout enable-winmidi HAVE_MMSYSTEM_H HAVE_DSOUND_H HAVE_OBJBASE_H)
+set(MACOS_OPTIONS enable-coreaudio enable-coremidi COREAUDIO_FOUND COREMIDI_FOUND)
+set(LINUX_OPTIONS enable-alsa ALSA_FOUND)
+set(ANDROID_OPTIONS enable-opensles OpenSLES_FOUND)
+set(IGNORED_OPTIONS enable-coverage enable-dbus enable-floats enable-fpe-check enable-framework enable-jack enable-lash
+    enable-libinstpatch enable-midishare enable-oboe enable-openmp enable-oss enable-pipewire enable-portaudio
+    enable-profiling enable-readline enable-sdl2 enable-systemd enable-trap-on-fpe enable-ubsan)
 
-# enable platform-specific features, and force the build to fail if the
-# required libraries are not found
-list(APPEND FEATURE_OPTIONS -Denable-dsound=${VCPKG_TARGET_IS_WINDOWS})
-list(APPEND FEATURE_OPTIONS -Denable-wasapi=${VCPKG_TARGET_IS_WINDOWS})
-list(APPEND FEATURE_OPTIONS -Denable-waveout=${VCPKG_TARGET_IS_WINDOWS})
-list(APPEND FEATURE_OPTIONS -Denable-winmidi=${VCPKG_TARGET_IS_WINDOWS})
-list(APPEND FEATURE_OPTIONS -DHAVE_MMSYSTEM_H=${VCPKG_TARGET_IS_WINDOWS})
-list(APPEND FEATURE_OPTIONS -DHAVE_DSOUND_H=${VCPKG_TARGET_IS_WINDOWS})
-list(APPEND FEATURE_OPTIONS -DHAVE_WASAPI_HEADERS=${VCPKG_TARGET_IS_WINDOWS})
-list(APPEND FEATURE_OPTIONS -DHAVE_OBJBASE_H=${VCPKG_TARGET_IS_WINDOWS})
-list(APPEND FEATURE_OPTIONS -Denable-coreaudio=${VCPKG_TARGET_IS_OSX})
-list(APPEND FEATURE_OPTIONS -Denable-coremidi=${VCPKG_TARGET_IS_OSX})
-list(APPEND FEATURE_OPTIONS -DCOREAUDIO_FOUND=${VCPKG_TARGET_IS_OSX})
-list(APPEND FEATURE_OPTIONS -DCOREMIDI_FOUND=${VCPKG_TARGET_IS_OSX})
-list(APPEND FEATURE_OPTIONS -Denable-alsa=${VCPKG_TARGET_IS_LINUX})
-list(APPEND FEATURE_OPTIONS -DALSA_FOUND=${VCPKG_TARGET_IS_LINUX})
+if(VCPKG_TARGET_IS_WINDOWS)
+    set(OPTIONS_TO_ENABLE ${WINDOWS_OPTIONS})
+    set(OPTIONS_TO_DISABLE ${MACOS_OPTIONS} ${LINUX_OPTIONS} ${ANDROID_OPTIONS})
+elseif(VCPKG_TARGET_IS_OSX)
+    set(OPTIONS_TO_ENABLE ${MACOS_OPTIONS})
+    set(OPTIONS_TO_DISABLE ${WINDOWS_OPTIONS} ${LINUX_OPTIONS} ${ANDROID_OPTIONS})
+elseif(VCPKG_TARGET_IS_LINUX)
+    set(OPTIONS_TO_ENABLE ${LINUX_OPTIONS})
+    set(OPTIONS_TO_DISABLE ${WINDOWS_OPTIONS} ${MACOS_OPTIONS} ${ANDROID_OPTIONS})
+elseif(VCPKG_TARGET_IS_ANDROID)
+    set(OPTIONS_TO_ENABLE ${ANDROID_OPTIONS})
+    set(OPTIONS_TO_DISABLE ${WINDOWS_OPTIONS} ${MACOS_OPTIONS} ${LINUX_OPTIONS})
+endif()
+
+foreach(_option IN LISTS OPTIONS_TO_ENABLE)
+    list(APPEND ENABLED_OPTIONS "-D{_option}:BOOL=ON")
+endforeach()
+    
+foreach(_option IN LISTS OPTIONS_TO_DISABLE IGNORED_OPTIONS)
+    list(APPEND DISABLED_OPTIONS "-D${_option}:BOOL=OFF")
+endforeach()
 
 vcpkg_find_acquire_program(PKGCONFIG)
 vcpkg_cmake_configure(
@@ -44,17 +62,15 @@ vcpkg_cmake_configure(
     OPTIONS
         "-DVCPKG_HOST_TRIPLET=${HOST_TRIPLET}"
         ${FEATURE_OPTIONS}
-        -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}
-        -Denable-framework=OFF # Needs system permission to install framework
+        ${ENABLED_OPTIONS}
+        ${DISABLED_OPTIONS}
+        "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}"
     MAYBE_UNUSED_VARIABLES
-        enable-coreaudio
-        enable-coremidi
-        enable-dart
-        ALSA_FOUND
-        COREAUDIO_FOUND
-        COREMIDI_FOUND
+        ${OPTIONS_TO_DISABLE}
         VCPKG_BUILD_MAKE_TABLES
+        enable-coverage
         enable-framework
+        enable-ubsan
 )
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/fluidsynth/vcpkg.json b/external_imported/vcpkg/ports/fluidsynth/vcpkg.json
index df3631c68..89412b18f 100644
--- a/external_imported/vcpkg/ports/fluidsynth/vcpkg.json
+++ b/external_imported/vcpkg/ports/fluidsynth/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "fluidsynth",
-  "version": "2.3.1",
-  "port-version": 2,
+  "version": "2.3.4",
   "description": "FluidSynth reads and handles MIDI events from the MIDI input device. It is the software analogue of a MIDI synthesizer. FluidSynth can also play midifiles using a Soundfont.",
   "homepage": "https://github.com/FluidSynth/fluidsynth",
   "license": "LGPL-2.1-or-later",
+  "supports": "!xbox",
   "dependencies": [
     {
       "name": "alsa",
@@ -32,6 +32,10 @@
     "buildtools": {
       "description": "Build tools gentables"
     },
+    "pulseaudio": {
+      "description": "Build with PulseAudio support",
+      "supports": "linux"
+    },
     "sndfile": {
       "description": "Enable rendering to file and SF3 support",
       "dependencies": [
diff --git a/external_imported/vcpkg/ports/flux/portfile.cmake b/external_imported/vcpkg/ports/flux/portfile.cmake
new file mode 100644
index 000000000..4b5d6c117
--- /dev/null
+++ b/external_imported/vcpkg/ports/flux/portfile.cmake
@@ -0,0 +1,25 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO tcbrindle/flux
+    REF 1c128b50af95fc39b6683d437f9210239e219836
+    SHA512 c07d3053227d6a62f5a7b0aba8535c0ed42195249d131a77989b3ee79a697f8d540b68639dcd9e89b5cdd76ee5d7f07db9b3be23bc325761c85af625f507e393
+    HEAD_REF master
+    PATCHES
+        targets-fixup.patch
+)
+
+set(VCPKG_BUILD_TYPE release) # header-only port
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DFLUX_BUILD_EXAMPLES=OFF
+        -DFLUX_BUILD_TESTS=OFF
+)
+
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/flux)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE_1_0.txt")
diff --git a/external_imported/vcpkg/ports/flux/targets-fixup.patch b/external_imported/vcpkg/ports/flux/targets-fixup.patch
new file mode 100644
index 000000000..3eba08b8c
--- /dev/null
+++ b/external_imported/vcpkg/ports/flux/targets-fixup.patch
@@ -0,0 +1,33 @@
+diff --git i/CMakeLists.txt w/CMakeLists.txt
+index e87b3c7..c6239f0 100644
+--- i/CMakeLists.txt
++++ w/CMakeLists.txt
+@@ -118,4 +118,27 @@ install(
+     DIRECTORY "${PROJECT_SOURCE_DIR}/include"
+     DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/.."
+     PATTERN "build2file" EXCLUDE
+-)
++)
++
++#
++# Removes the INTERFACE_SOURCES flux::flux property in the flux-targets.cmake
++# file that is there only because of the poor interaction of the 
++# $<BUILD_INTERFACE:...> with the install(TARGETS...) command. The generator
++# creates an empty string instead of no string and the install(TARGETS...) 
++# takes that empty string as a indication that the code should put the source
++# path in as a source file list (why?).
++#
++# The code here gets inserted into near the end of the cmake_install.cmake
++# file. It reads the flux-targets.cmake file into memory, clears the file,
++# then recreates the file skipping the line that contains the malformed
++# INTERFACE_SOURCES property value.
++#
++set(FLUX_TARGETS_FILE "${CMAKE_INSTALL_PREFIX}/lib/cmake/flux/flux-targets.cmake")
++install(CODE
++   "file (STRINGS \"${FLUX_TARGETS_FILE}\" FLUX_TARGETS_FILE_LINES)
++  file(WRITE \"${FLUX_TARGETS_FILE}\" \"\")
++  foreach(FLUX_TARGETS_FILE_LINE IN LISTS FLUX_TARGETS_FILE_LINES)
++    if (NOT FLUX_TARGETS_FILE_LINE MATCHES \"^[ \t]*INTERFACE_SOURCES[ \t].*$\")
++      file(APPEND \"${FLUX_TARGETS_FILE}\" \"\${FLUX_TARGETS_FILE_LINE}\\n\")
++    endif()
++  endforeach()")
diff --git a/external_imported/vcpkg/ports/flux/vcpkg.json b/external_imported/vcpkg/ports/flux/vcpkg.json
new file mode 100644
index 000000000..33f736af1
--- /dev/null
+++ b/external_imported/vcpkg/ports/flux/vcpkg.json
@@ -0,0 +1,16 @@
+{
+  "name": "flux",
+  "version-date": "2023-08-25",
+  "description": "Experimental C++20 library that provides a broadly equivalent feature set to C++20 Ranges, but uses a slightly different model based around cursors rather than iterators. Safer, easier, more efficient, compatible.",
+  "homepage": "https://github.com/tcbrindle/flux",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/fmem/portfile.cmake b/external_imported/vcpkg/ports/fmem/portfile.cmake
index 36e4e45f3..de0c0bb6d 100644
--- a/external_imported/vcpkg/ports/fmem/portfile.cmake
+++ b/external_imported/vcpkg/ports/fmem/portfile.cmake
@@ -6,18 +6,17 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS 
         -DBUILD_TESTING=OFF
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 vcpkg_copy_pdbs()
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/fmem RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/fmem" RENAME copyright)
diff --git a/external_imported/vcpkg/ports/fmem/vcpkg.json b/external_imported/vcpkg/ports/fmem/vcpkg.json
index 17d54850a..52d0dc2a0 100644
--- a/external_imported/vcpkg/ports/fmem/vcpkg.json
+++ b/external_imported/vcpkg/ports/fmem/vcpkg.json
@@ -1,6 +1,12 @@
 {
   "name": "fmem",
   "version-string": "c-libs-2ccee3d2fb",
-  "port-version": 1,
-  "description": "A cross-platform library for opening memory-backed libc streams."
+  "port-version": 3,
+  "description": "A cross-platform library for opening memory-backed libc streams.",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/fmilib/devendor-sublibs.diff b/external_imported/vcpkg/ports/fmilib/devendor-sublibs.diff
index 02c39dbda..8845c35de 100644
--- a/external_imported/vcpkg/ports/fmilib/devendor-sublibs.diff
+++ b/external_imported/vcpkg/ports/fmilib/devendor-sublibs.diff
@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b01aba5..583e15b 100644
+index 690ee5f..2816987 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -230,7 +230,7 @@ configure_file (
@@ -7,7 +7,7 @@ index b01aba5..583e15b 100644
    ) 
  
 -set(FMILIB_SHARED_SUBLIBS ${FMIXML_LIBRARIES} ${FMIZIP_LIBRARIES} ${FMICAPI_LIBRARIES} expat minizip zlib c99snprintf)
-+set(FMILIB_SHARED_SUBLIBS ${FMIXML_LIBRARIES} ${FMIZIP_LIBRARIES} ${FMICAPI_LIBRARIES} c99snprintf)
++set(FMILIB_SHARED_SUBLIBS ${FMIXML_LIBRARIES} ${FMIZIP_LIBRARIES} ${FMICAPI_LIBRARIES} minizip c99snprintf)
  set(FMILIB_SUBLIBS ${FMIIMPORT_LIBRARIES} ${JMUTIL_LIBRARIES} ${FMILIB_SHARED_SUBLIBS})
  set(FMILIB_SHARED_SRC ${FMIIMPORTSOURCE} ${JMUTILSOURCE} ${FMIIMPORTHEADERS})
  
@@ -35,16 +35,20 @@ index ddd3c1f..3bafac3 100644
  include_directories("${EXPAT_INCLUDE_DIRS}" "${FMILIB_THIRDPARTYLIBS}/FMI/" "${FMIXMLGENDIR}/FMI1" "${FMIXMLGENDIR}/FMI2")
  
 diff --git a/Config.cmake/fmizip.cmake b/Config.cmake/fmizip.cmake
-index 091fc4d..c53555f 100644
+index c046d47..50e82b3 100644
 --- a/Config.cmake/fmizip.cmake
 +++ b/Config.cmake/fmizip.cmake
-@@ -20,7 +20,8 @@ if(NOT FMIZIPDIR)
+@@ -20,7 +20,12 @@ if(NOT FMIZIPDIR)
  
      set(FMIZIP_LIBRARIES fmizip)
  	
 -    add_subdirectory(Config.cmake/Minizip)
-+    find_package(minizip CONFIG REQUIRED)
-+    add_library(minizip ALIAS minizip::minizip)
++    add_library(minizip OBJECT
++      "${FMILIB_THIRDPARTYLIBS}/Minizip/minizip/miniunz.c"
++      "${FMILIB_THIRDPARTYLIBS}/Minizip/minizip/minizip.c"
++    )
++    find_package(unofficial-minizip CONFIG REQUIRED)
++    target_link_libraries(minizip PRIVATE unofficial::minizip::minizip)
  	
  	include_directories("${FMIZIPDIR}/include" "${FMILIB_THIRDPARTYLIBS}/Minizip/minizip" "${FMILIB_THIRDPARTYLIBS}/FMI" "${FMILIB_THIRDPARTYLIBS}/Zlib/zlib-1.2.6" "${FMILibrary_BINARY_DIR}/zlib")
  
diff --git a/external_imported/vcpkg/ports/fmilib/minizip.patch b/external_imported/vcpkg/ports/fmilib/minizip.patch
new file mode 100644
index 000000000..abd3ec131
--- /dev/null
+++ b/external_imported/vcpkg/ports/fmilib/minizip.patch
@@ -0,0 +1,52 @@
+diff --git a/ThirdParty/Minizip/minizip/miniunz.c b/ThirdParty/Minizip/minizip/miniunz.c
+index 1931161..d7a8be1 100644
+--- a/ThirdParty/Minizip/minizip/miniunz.c
++++ b/ThirdParty/Minizip/minizip/miniunz.c
+@@ -45,6 +45,7 @@
+ #include <time.h>
+ #include <errno.h>
+ #include <fcntl.h>
++#include <sys/stat.h>
+ #include <stdarg.h>
+ 
+ #ifdef _WIN32
+@@ -107,7 +108,7 @@ void change_file_date(filename,dosdate,tmu_date)
+   SetFileTime(hFile,&ftm,&ftLastAcc,&ftm);
+   CloseHandle(hFile);
+ #else
+-#ifdef unix || __APPLE__
++#if defined(unix) || defined(__APPLE__)
+   struct utimbuf ut;
+   struct tm newdate;
+   newdate.tm_sec = tmu_date.tm_sec;
+@@ -137,7 +138,7 @@ int mymkdir(dirname)
+     int ret=0;
+ #ifdef _WIN32
+     ret = _mkdir(dirname);
+-#elif unix
++#elif 1
+     ret = mkdir (dirname,0775);
+ #elif __APPLE__
+     ret = mkdir (dirname,0775);
+diff --git a/ThirdParty/Minizip/minizip/minizip.c b/ThirdParty/Minizip/minizip/minizip.c
+index e22f80d..548b6ca 100644
+--- a/ThirdParty/Minizip/minizip/minizip.c
++++ b/ThirdParty/Minizip/minizip/minizip.c
+@@ -101,7 +101,7 @@ uLong filetime(f, tmzip, dt)
+   return ret;
+ }
+ #else
+-#ifdef unix || __APPLE__
++#if defined(unix) || defined(__APPLE__)
+ uLong filetime(f, tmzip, dt)
+     char *f;               /* name of file to get info on */
+     tm_zip *tmzip;         /* return value: access, modific. and creation times */
+@@ -453,7 +453,7 @@ int minizip(argc,argv)
+                      }
+                      if( lastslash != NULL )
+                      {
+-                         savefilenameinzip = lastslash+1; // base filename follows last slash.
++                         savefilenameinzip = lastslash+1;
+                      }
+                  }
+ 
diff --git a/external_imported/vcpkg/ports/fmilib/portfile.cmake b/external_imported/vcpkg/ports/fmilib/portfile.cmake
index 374c43f3d..755611049 100644
--- a/external_imported/vcpkg/ports/fmilib/portfile.cmake
+++ b/external_imported/vcpkg/ports/fmilib/portfile.cmake
@@ -8,13 +8,16 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
         devendor-sublibs.diff
+        minizip.patch
         fix-mergestaticlibs.diff
         unofficial-export.diff
 )
 
-file(REMOVE RECURSE
+file(GLOB vendored_minizip "${SOURCE_PATH}/ThirdParty/Minizip/minizip/*")
+list(FILTER vendored_minizip EXCLUDE REGEX "/minizip.[ch]\$|/miniunz.[ch]\$")
+file(REMOVE_RECURSE
+    ${vendored_minizip}
     "${SOURCE_PATH}/ThirdParty/Expat"
-    "${SOURCE_PATH}/ThirdParty/Minizip"
     "${SOURCE_PATH}/ThirdParty/Zlib"
 )
 
diff --git a/external_imported/vcpkg/ports/fmilib/unofficial-fmilib-config.cmake b/external_imported/vcpkg/ports/fmilib/unofficial-fmilib-config.cmake
index 154b57aec..3ad246ef9 100644
--- a/external_imported/vcpkg/ports/fmilib/unofficial-fmilib-config.cmake
+++ b/external_imported/vcpkg/ports/fmilib/unofficial-fmilib-config.cmake
@@ -1,4 +1,4 @@
 include(CMakeFindDependencyMacro)
 find_dependency(expat CONFIG)
-find_dependency(minizip CONFIG)
+find_dependency(unofficial-minizip CONFIG)
 include("${CMAKE_CURRENT_LIST_DIR}/unofficial-fmilib-targets.cmake")
diff --git a/external_imported/vcpkg/ports/fmilib/vcpkg.json b/external_imported/vcpkg/ports/fmilib/vcpkg.json
index d2dac1880..55a974490 100644
--- a/external_imported/vcpkg/ports/fmilib/vcpkg.json
+++ b/external_imported/vcpkg/ports/fmilib/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "fmilib",
   "version": "2.4.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": "FMI library is intended as a foundation for applications interfacing FMUs (Functional Mockup Units) that follow FMI Standard. This version of the library supports FMI 1.0 and FMI2.0.",
   "homepage": "https://www.fmi-standard.org/",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/fmt/fix-format-conflict.patch b/external_imported/vcpkg/ports/fmt/fix-format-conflict.patch
deleted file mode 100644
index 0a2ac6a57..000000000
--- a/external_imported/vcpkg/ports/fmt/fix-format-conflict.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/include/fmt/format-inl.h b/include/fmt/format-inl.h
-index f44df01c..59cc4559 100644
---- a/include/fmt/format-inl.h
-+++ b/include/fmt/format-inl.h
-@@ -62,8 +62,8 @@ FMT_FUNC void format_error_code(detail::buffer<char>& out, int error_code,
-   error_code_size += detail::to_unsigned(detail::count_digits(abs_value));
-   auto it = buffer_appender<char>(out);
-   if (message.size() <= inline_buffer_size - error_code_size)
--    format_to(it, FMT_STRING("{}{}"), message, SEP);
--  format_to(it, FMT_STRING("{}{}"), ERROR_STR, error_code);
-+    fmt::format_to(it, FMT_STRING("{}{}"), message, SEP);
-+  fmt::format_to(it, FMT_STRING("{}{}"), ERROR_STR, error_code);
-   FMT_ASSERT(out.size() <= inline_buffer_size, "");
- }
- 
diff --git a/external_imported/vcpkg/ports/fmt/portfile.cmake b/external_imported/vcpkg/ports/fmt/portfile.cmake
index f5f819a01..511912bf2 100644
--- a/external_imported/vcpkg/ports/fmt/portfile.cmake
+++ b/external_imported/vcpkg/ports/fmt/portfile.cmake
@@ -1,12 +1,11 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO fmtlib/fmt
-    REF 9.1.0
-    SHA512 a18442042722dd48e20714ec034a12fcc0576c9af7be5188586970e2edf47529825bdc99af366b1d5891630c8dbf6f63bfa9f012e77ab3d3ed80d1a118e3b2be
+    REF "${VERSION}"
+    SHA512 27df90c681ec37e55625062a79e3b83589b6d7e94eff37a3b412bb8c1473f757a8adb727603acc9185c3490628269216843b7d7bd5a3cb37f0029da5d1495ffa
     HEAD_REF master
     PATCHES
         fix-write-batch.patch
-        fix-format-conflict.patch
 )
 
 vcpkg_cmake_configure(
@@ -18,49 +17,21 @@ vcpkg_cmake_configure(
 )
 
 vcpkg_cmake_install()
-file(INSTALL "${SOURCE_PATH}/LICENSE.rst" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    if(VCPKG_TARGET_IS_WINDOWS)
-        if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-            if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/fmtd.dll")
-                file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin")
-                file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/fmtd.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/fmtd.dll")
-            endif()
-        endif()
-        if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-            if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/fmt.dll")
-                file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin")
-                file(RENAME "${CURRENT_PACKAGES_DIR}/lib/fmt.dll" "${CURRENT_PACKAGES_DIR}/bin/fmt.dll")
-            endif()
-        endif()
-    endif()
+vcpkg_cmake_config_fixup()
+vcpkg_fixup_pkgconfig()
+vcpkg_copy_pdbs()
 
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/fmt/core.h
         "defined(FMT_SHARED)"
         "1"
     )
 endif()
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-vcpkg_cmake_config_fixup()
-vcpkg_fixup_pkgconfig()
-
-if(VCPKG_TARGET_IS_WINDOWS)
-    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-        vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-debug.cmake
-            "lib/fmtd.dll"
-            "bin/fmtd.dll"
-        )
-    endif()
-    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-        vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-release.cmake
-            "lib/fmt.dll"
-            "bin/fmt.dll"
-        )
-    endif()
-endif()
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(REMOVE_RECURSE 
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/debug/share"
+)
 
-# Handle post-build CMake instructions
-vcpkg_copy_pdbs()
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/fmt/vcpkg.json b/external_imported/vcpkg/ports/fmt/vcpkg.json
index a768a4e96..a6b09f45d 100644
--- a/external_imported/vcpkg/ports/fmt/vcpkg.json
+++ b/external_imported/vcpkg/ports/fmt/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "fmt",
-  "version": "9.1.0",
-  "port-version": 1,
+  "version": "10.2.1",
   "description": "Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams.",
   "homepage": "https://github.com/fmtlib/fmt",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/folly/disable-uninitialized-resize-on-new-stl.patch b/external_imported/vcpkg/ports/folly/disable-uninitialized-resize-on-new-stl.patch
new file mode 100644
index 000000000..29931bc1d
--- /dev/null
+++ b/external_imported/vcpkg/ports/folly/disable-uninitialized-resize-on-new-stl.patch
@@ -0,0 +1,40 @@
+diff --git a/folly/memory/UninitializedMemoryHacks.h b/folly/memory/UninitializedMemoryHacks.h
+index bd31c88..9f640a8 100644
+--- a/folly/memory/UninitializedMemoryHacks.h
++++ b/folly/memory/UninitializedMemoryHacks.h
+@@ -101,6 +101,9 @@ template <
+         typename std::enable_if<std::is_trivially_destructible<T>::value>::type>
+ inline void resizeWithoutInitialization(
+     std::basic_string<T>& s, std::size_t n) {
++#if defined(_MSVC_STL_UPDATE) && _MSVC_STL_UPDATE >= 202206L
++    s.resize(n);
++#else
+   if (n <= s.size()) {
+     s.resize(n);
+   } else {
+@@ -111,6 +114,7 @@ inline void resizeWithoutInitialization(
+     }
+     detail::unsafeStringSetLargerSize(s, n);
+   }
++#endif // STL workaround
+ }
+ 
+ /**
+@@ -244,6 +248,8 @@ struct MakeUnsafeStringSetLargerSize {
+ #elif defined(_MSC_VER)
+ // MSVC
+ 
++#if defined(_MSVC_STL_UPDATE) && _MSVC_STL_UPDATE >= 202206L
++#else
+ template <typename Tag, typename T, typename A, A Ptr_Eos>
+ struct MakeUnsafeStringSetLargerSize {
+   friend void unsafeStringSetLargerSizeImpl(
+@@ -262,7 +268,7 @@ struct MakeUnsafeStringSetLargerSize {
+       void (std::basic_string<TYPE>::*)(std::size_t),           \
+       &std::basic_string<TYPE>::_Eos>;                          \
+   FOLLY_DECLARE_STRING_RESIZE_WITHOUT_INIT_IMPL(TYPE)
+-
++#endif // workaround
+ #else
+ #warning \
+     "No implementation for resizeWithoutInitialization of std::basic_string"
diff --git a/external_imported/vcpkg/ports/folly/fix-deps.patch b/external_imported/vcpkg/ports/folly/fix-deps.patch
index 20cd752d5..64973de83 100644
--- a/external_imported/vcpkg/ports/folly/fix-deps.patch
+++ b/external_imported/vcpkg/ports/folly/fix-deps.patch
@@ -57,7 +57,7 @@ index 4b78e9f..ac83c99 100644
      thread
    REQUIRED
  )
-+set (Boost_LIBRARIES Boost::context Boost::filesystem Boost::program_options Boost::regex  Boost::system Boost::thread
++set (Boost_LIBRARIES Boost::boost Boost::context Boost::filesystem Boost::program_options Boost::regex  Boost::system Boost::thread
 +  )
  list(APPEND FOLLY_LINK_LIBRARIES ${Boost_LIBRARIES})
 -list(APPEND FOLLY_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIRS})
diff --git a/external_imported/vcpkg/ports/folly/openssl.patch b/external_imported/vcpkg/ports/folly/openssl.patch
new file mode 100644
index 000000000..83faaf3ac
--- /dev/null
+++ b/external_imported/vcpkg/ports/folly/openssl.patch
@@ -0,0 +1,14 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b5e8758..bb488d6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,9 +24,6 @@ ELSEIF (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+   MESSAGE(STATUS "current platform: FreeBSD")
+ ELSEIF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
+   MESSAGE(STATUS "current platform: MacOS")
+-  set(OPENSSL_ROOT_DIR "/usr/local/opt/openssl" )
+-  set(OPENSSL_LIBRARIES "/usr/local/opt/openssl/lib" )
+-  set(OPENSSL_INCLUDE_DIR "/usr/local/opt/openssl/include" )
+ ELSE ()
+   MESSAGE(STATUS "other platform: ${CMAKE_SYSTEM_NAME}")
+ ENDIF (CMAKE_SYSTEM_NAME MATCHES "Linux")
diff --git a/external_imported/vcpkg/ports/folly/portfile.cmake b/external_imported/vcpkg/ports/folly/portfile.cmake
index 9b421a620..71f60438c 100644
--- a/external_imported/vcpkg/ports/folly/portfile.cmake
+++ b/external_imported/vcpkg/ports/folly/portfile.cmake
@@ -8,8 +8,8 @@ vcpkg_add_to_path("${PYTHON3_DIR}")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/folly
-    REF d8ed9cd2869c74b00fa6f1a7603301183f5c2249 #v2022.10.31.00
-    SHA512 55040dadb8a847f0d04c37a2dce920bb456a59decebc90920831998df9671feb33daf1f4235115adcce5eb9c469b97b9d96fa7a67a5914c434ebc1efc04f4770
+    REF "v${VERSION}"
+    SHA512 c563aa64efa3098235db5f6354cdbc96d829f8bfc24e24464e0cae65279d00f1bba722c7060c2e76c89723ef66ef94225a02d6fb65e24fa6125adb619fc1d74b
     HEAD_REF main
     PATCHES
         reorder-glog-gflags.patch
@@ -17,6 +17,8 @@ vcpkg_from_github(
         boost-1.70.patch
         fix-windows-minmax.patch
         fix-deps.patch
+        openssl.patch # from https://github.com/facebook/folly/pull/2016
+        disable-uninitialized-resize-on-new-stl.patch
 )
 
 file(REMOVE "${SOURCE_PATH}/CMake/FindFmt.cmake")
diff --git a/external_imported/vcpkg/ports/folly/vcpkg.json b/external_imported/vcpkg/ports/folly/vcpkg.json
index b37ee2a26..834ceb734 100644
--- a/external_imported/vcpkg/ports/folly/vcpkg.json
+++ b/external_imported/vcpkg/ports/folly/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "folly",
-  "version-string": "2022.10.31.00",
-  "port-version": 4,
+  "version-string": "2024.01.01.00",
   "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows",
   "homepage": "https://github.com/facebook/folly",
   "license": "Apache-2.0",
@@ -19,6 +18,7 @@
     "boost-smart-ptr",
     "boost-system",
     "boost-thread",
+    "boost-variant",
     "double-conversion",
     "fmt",
     "gflags",
diff --git a/external_imported/vcpkg/ports/font-util/portfile.cmake b/external_imported/vcpkg/ports/font-util/portfile.cmake
index 21c1d2c03..c4a84b976 100644
--- a/external_imported/vcpkg/ports/font-util/portfile.cmake
+++ b/external_imported/vcpkg/ports/font-util/portfile.cmake
@@ -9,8 +9,8 @@ vcpkg_from_gitlab(
     GITLAB_URL https://gitlab.freedesktop.org/xorg
     OUT_SOURCE_PATH SOURCE_PATH
     REPO font/util
-    REF  d45011b8324fecebb4fc79e57491d341dd96e325 #1.3.2
-    SHA512 d783cbb5b8b0975891a247f98b78c2afadfd33e1d26ee8bcf7ab7ccc11615b0150d07345c719182b0929afc3c54dc3288a01a789b5374e18aff883ac23d15b04
+    REF "font-util-${VERSION}"
+    SHA512 93285c2e8c5c01f069a7621dba0bbb1175c0ebbea27d521395b40f036443c162fc1948c4d3cb34fe6c509d1818d95ed7e6d38919e3f7857dfa53e388aadb9128
     HEAD_REF master
     PATCHES build.patch
 ) 
diff --git a/external_imported/vcpkg/ports/font-util/vcpkg.json b/external_imported/vcpkg/ports/font-util/vcpkg.json
index 2e9f1996f..0adc619d3 100644
--- a/external_imported/vcpkg/ports/font-util/vcpkg.json
+++ b/external_imported/vcpkg/ports/font-util/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "font-util",
-  "version": "1.3.2",
-  "port-version": 1,
+  "version": "1.4.1",
   "description": "X.Org font package creation/installation utilities",
   "homepage": "https://gitlab.freedesktop.org/xorg/font/util",
   "license": null,
diff --git a/external_imported/vcpkg/ports/fontconfig/fix-mingw-gperf-fallback.patch b/external_imported/vcpkg/ports/fontconfig/fix-mingw-gperf-fallback.patch
deleted file mode 100644
index d62e4e6f5..000000000
--- a/external_imported/vcpkg/ports/fontconfig/fix-mingw-gperf-fallback.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/meson.build b/meson.build
-index e5096bf..51c289f 100644
---- a/meson.build
-+++ b/meson.build
-@@ -268,7 +268,7 @@ sh = find_program('sh', required : false)
- 
- if not sh.found() # host_machine.system() == 'windows' or not sh.found()
-   # TODO: This is not always correct
--  if cc.get_id() == 'msvc'
-+  if host_machine.system() == 'windows'
-     gperf_len_type = 'size_t'
-   else
-     gperf_len_type = 'unsigned'
diff --git a/external_imported/vcpkg/ports/fontconfig/portfile.cmake b/external_imported/vcpkg/ports/fontconfig/portfile.cmake
index bcd40e931..489b04767 100644
--- a/external_imported/vcpkg/ports/fontconfig/portfile.cmake
+++ b/external_imported/vcpkg/ports/fontconfig/portfile.cmake
@@ -1,16 +1,13 @@
-set(FONTCONFIG_VERSION 2.14.1)
-
 vcpkg_from_gitlab(
     GITLAB_URL https://gitlab.freedesktop.org
     OUT_SOURCE_PATH SOURCE_PATH
     REPO fontconfig/fontconfig
-    REF ${FONTCONFIG_VERSION}
-    SHA512 39d25e2fde5085cf66230e18621c1b7ab33935c78771dcc9d6b9e514ddd39af53fcdb0d89a8c7f582d476f431ccf61adde427509256c49cd9d09d249d2d736f7
+    REF ${VERSION}
+    SHA512 b6cbb4ad7db224dabfb8a96c1d0743bab5bbe8f403e49d9b9a44effd161fd97062a2f7205a700308a1f805655038538ba2fb1b65169faa2d69ea88e477230849
     HEAD_REF master
     PATCHES
         no-etc-symlinks.patch
         libgetopt.patch
-        fix-mingw-gperf-fallback.patch
         fix-preprocessor-clang-cl.patch
 )
 
@@ -23,6 +20,23 @@ vcpkg_configure_meson(
         -Dcache-build=disabled
         -Dtests=disabled
 )
+
+# https://www.freedesktop.org/software/fontconfig/fontconfig-user.html
+# Adding OPTIONS for e.g. baseconfig-dir etc. won't work since meson will try to install into those dirs!
+# Since adding OPTIONS does not work use a replacement in the generated config.h instead
+set(replacement "")
+if(VCPKG_TARGET_IS_WINDOWS)
+    set(replacement "**invalid-fontconfig-dir-do-not-use**")
+endif()
+set(configfile "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/config.h")
+vcpkg_replace_string("${configfile}" "${CURRENT_PACKAGES_DIR}" "${replacement}")
+vcpkg_replace_string("${configfile}" "#define FC_TEMPLATEDIR \"/share/fontconfig/conf.avail\"" "#define FC_TEMPLATEDIR \"/usr/share/fontconfig/conf.avail\"")
+if(NOT VCPKG_BUILD_TYPE)
+    set(configfile "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/config.h")
+    vcpkg_replace_string("${configfile}" "${CURRENT_PACKAGES_DIR}/debug" "${replacement}")
+    vcpkg_replace_string("${configfile}" "#define FC_TEMPLATEDIR \"/share/fontconfig/conf.avail\"" "#define FC_TEMPLATEDIR \"/usr/share/fontconfig/conf.avail\"")
+endif()
+
 vcpkg_install_meson(ADD_BIN_TO_PATH)
 
 vcpkg_copy_pdbs()
diff --git a/external_imported/vcpkg/ports/fontconfig/vcpkg.json b/external_imported/vcpkg/ports/fontconfig/vcpkg.json
index 7c3b8ed64..1a4c499ea 100644
--- a/external_imported/vcpkg/ports/fontconfig/vcpkg.json
+++ b/external_imported/vcpkg/ports/fontconfig/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "fontconfig",
-  "version": "2.14.1",
+  "version": "2.14.2",
   "port-version": 1,
   "description": "Library for configuring and customizing font access.",
   "homepage": "https://www.freedesktop.org/wiki/Software/fontconfig",
diff --git a/external_imported/vcpkg/ports/foonathan-memory/fix-foonathan-memory-include-install-dir.patch b/external_imported/vcpkg/ports/foonathan-memory/fix-foonathan-memory-include-install-dir.patch
new file mode 100644
index 000000000..29e76ed2e
--- /dev/null
+++ b/external_imported/vcpkg/ports/foonathan-memory/fix-foonathan-memory-include-install-dir.patch
@@ -0,0 +1,22 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ddbc459..06c4165 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -20,7 +20,7 @@ set(CMAKE_DEBUG_POSTFIX "-dbg")
+ if(UNIX OR VXWORKS)
+     include(GNUInstallDirs)
+ 
+-    set(FOONATHAN_MEMORY_INC_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/foonathan_memory")
++    set(FOONATHAN_MEMORY_INC_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}")
+     set(FOONATHAN_MEMORY_RUNTIME_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}")
+     set(FOONATHAN_MEMORY_LIBRARY_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}")
+     set(FOONATHAN_MEMORY_ARCHIVE_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}")
+@@ -29,7 +29,7 @@ if(UNIX OR VXWORKS)
+     set(FOONATHAN_MEMORY_CMAKE_CONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/foonathan_memory/cmake")
+     set(FOONATHAN_MEMORY_ADDITIONAL_FILES_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/foonathan_memory")
+ elseif(WIN32)
+-    set(FOONATHAN_MEMORY_INC_INSTALL_DIR "include/foonathan_memory")
++    set(FOONATHAN_MEMORY_INC_INSTALL_DIR "include/")
+     set(FOONATHAN_MEMORY_RUNTIME_INSTALL_DIR   "bin")
+     set(FOONATHAN_MEMORY_LIBRARY_INSTALL_DIR   "bin")
+     set(FOONATHAN_MEMORY_ARCHIVE_INSTALL_DIR   "lib")
diff --git a/external_imported/vcpkg/ports/foonathan-memory/portfile.cmake b/external_imported/vcpkg/ports/foonathan-memory/portfile.cmake
index 170eb4369..492964ab3 100644
--- a/external_imported/vcpkg/ports/foonathan-memory/portfile.cmake
+++ b/external_imported/vcpkg/ports/foonathan-memory/portfile.cmake
@@ -2,12 +2,22 @@
 # unresolved external symbol "public: static unsigned int const foonathan::memory::detail::memory_block_stack::implementation_offset
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
+vcpkg_download_distfile(
+    REMOVE_TOOL_STATIC_LINKING_CROSS_COMPILATION_PATCH
+    URLS https://github.com/foonathan/memory/commit/abb0bff7a232572b1fce304dd2e2a2d5c0a6806c.patch?full_index=1
+    FILENAME foonathan-memory-abb0bff7a232572b1fce304dd2e2a2d5c0a6806c.patch
+    SHA512 9f16c9465a6475771241470925f34ead2281c5e2f7d9c4ddaceab77fa3775b8a63ccb6dde00061d74924f838a6d204ab70427f9ae5369245b5e9e971472e862f
+)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO foonathan/memory
-    REF 885a9d97bebe9a2f131d21d3c0928c42ab377c8b
-    SHA512 7ce78a6e67d590a41b7f8a3d4ae0f6c1fa157c561b718a63973dffc000df74a9f0a0d7955a099e84fbeb3cf4085092eb866a6b8cec8bafd50bdcee94d069f65d
+    REF "v0.7-3"
+    SHA512 302a046e204d1cd396a4a36b559d3360d17801d99f0f22b58314ff66706ae86ce4f364731004c1c293e01567a9510229cda7fc4978e0e47740176026d47e8403
     HEAD_REF master
+    PATCHES
+        fix-foonathan-memory-include-install-dir.patch
+        "${REMOVE_TOOL_STATIC_LINKING_CROSS_COMPILATION_PATCH}"
 )
 
 vcpkg_from_github(
@@ -18,56 +28,39 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-file(COPY ${COMP_SOURCE_PATH}/comp_base.cmake DESTINATION ${SOURCE_PATH}/cmake/comp)
+file(COPY "${COMP_SOURCE_PATH}/comp_base.cmake" DESTINATION "${SOURCE_PATH}/cmake/comp")
 
-vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES
     tool FOONATHAN_MEMORY_BUILD_TOOLS
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         ${FEATURE_OPTIONS}
         -DFOONATHAN_MEMORY_BUILD_EXAMPLES=OFF
         -DFOONATHAN_MEMORY_BUILD_TESTS=OFF
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-if(EXISTS ${CURRENT_PACKAGES_DIR}/cmake)
-    vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/foonathan_memory)
-elseif(EXISTS ${CURRENT_PACKAGES_DIR}/share/foonathan_memory/cmake)
-    vcpkg_fixup_cmake_targets(CONFIG_PATH share/foonathan_memory/cmake TARGET_PATH share/foonathan_memory)
+if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/foonathan_memory/cmake")
+    vcpkg_cmake_config_fixup(CONFIG_PATH lib/foonathan_memory/cmake PACKAGE_NAME foonathan_memory)
+elseif(EXISTS "${CURRENT_PACKAGES_DIR}/share/foonathan_memory/cmake")
+    vcpkg_cmake_config_fixup(CONFIG_PATH share/foonathan_memory/cmake PACKAGE_NAME foonathan_memory)
 endif()
 
 vcpkg_copy_pdbs()
 
 # Place header files into the right folders
 # The original layout is not a problem for CMake-based project.
-file(COPY
-    ${CURRENT_PACKAGES_DIR}/include/foonathan_memory/foonathan
-    DESTINATION ${CURRENT_PACKAGES_DIR}/include
-)
-file(GLOB
-    COMP_INCLUDE_FILES
-    ${CURRENT_PACKAGES_DIR}/include/foonathan_memory/comp/foonathan/*.hpp
-)
 file(COPY
     ${COMP_INCLUDE_FILES}
-    DESTINATION ${CURRENT_PACKAGES_DIR}/include/foonathan
+    DESTINATION "${CURRENT_PACKAGES_DIR}/include/foonathan"
 )
-file(COPY
-    ${CURRENT_PACKAGES_DIR}/include/foonathan_memory/config_impl.hpp
-    DESTINATION ${CURRENT_PACKAGES_DIR}/include/foonathan/memory
-)
-file(REMOVE_RECURSE
-    ${CURRENT_PACKAGES_DIR}/include/foonathan_memory
-)
-vcpkg_replace_string(
-    ${CURRENT_PACKAGES_DIR}/share/foonathan_memory/foonathan_memory-config.cmake
-    "\${_IMPORT_PREFIX}/include/foonathan_memory/comp;\${_IMPORT_PREFIX}/include/foonathan_memory"
-    "\${_IMPORT_PREFIX}/include"
+file(REMOVE_RECURSE 
+  "${CURRENT_PACKAGES_DIR}/lib/foonathan_memory" 
+  "${CURRENT_PACKAGES_DIR}/debug/lib/foonathan_memory"
 )
 # Place header files into the right folders - Done!
 
@@ -77,21 +70,21 @@ vcpkg_replace_string(
 # #define FOONATHAN_MEMORY_DEBUG_FILL 0
 # We only have the Release version header files installed, however.
 vcpkg_replace_string(
-    ${CURRENT_PACKAGES_DIR}/include/foonathan/memory/detail/debug_helpers.hpp
+    "${CURRENT_PACKAGES_DIR}/include/foonathan/memory/detail/debug_helpers.hpp"
     "#if FOONATHAN_MEMORY_DEBUG_FILL"
     "#ifndef NDEBUG //#if FOONATHAN_MEMORY_DEBUG_FILL"
 )
 
 file(REMOVE_RECURSE
-    ${CURRENT_PACKAGES_DIR}/debug/include
-    ${CURRENT_PACKAGES_DIR}/debug/share
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/debug/share"
 )
 
 file(REMOVE
-    ${CURRENT_PACKAGES_DIR}/debug/LICENSE
-    ${CURRENT_PACKAGES_DIR}/debug/README.md
-    ${CURRENT_PACKAGES_DIR}/LICENSE
-    ${CURRENT_PACKAGES_DIR}/README.md
+    "${CURRENT_PACKAGES_DIR}/debug/LICENSE"
+    "${CURRENT_PACKAGES_DIR}/debug/README.md"
+    "${CURRENT_PACKAGES_DIR}/LICENSE"
+    "${CURRENT_PACKAGES_DIR}/README.md"
 )
 
 if(NOT VCPKG_CMAKE_SYSTEM_NAME OR 
@@ -101,25 +94,25 @@ else()
     set(EXECUTABLE_SUFFIX "")
 endif()
 
-if(EXISTS ${CURRENT_PACKAGES_DIR}/bin/nodesize_dbg${EXECUTABLE_SUFFIX})
+if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/nodesize_dbg${EXECUTABLE_SUFFIX}")
     file(COPY
-        ${CURRENT_PACKAGES_DIR}/bin/nodesize_dbg${EXECUTABLE_SUFFIX}
-        DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}
+        "${CURRENT_PACKAGES_DIR}/bin/nodesize_dbg${EXECUTABLE_SUFFIX}"
+        DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}"
     )
-    vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
+    vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}")
 
     if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
         file(REMOVE_RECURSE
-            ${CURRENT_PACKAGES_DIR}/bin
-            ${CURRENT_PACKAGES_DIR}/debug/bin
+            "${CURRENT_PACKAGES_DIR}/bin"
+            "${CURRENT_PACKAGES_DIR}/debug/bin"
         )
     else()
         file(REMOVE
-            ${CURRENT_PACKAGES_DIR}/bin/nodesize_dbg${EXECUTABLE_SUFFIX}
-            ${CURRENT_PACKAGES_DIR}/debug/bin/nodesize_dbg${EXECUTABLE_SUFFIX}
+            "${CURRENT_PACKAGES_DIR}/bin/nodesize_dbg${EXECUTABLE_SUFFIX}"
+            "${CURRENT_PACKAGES_DIR}/debug/bin/nodesize_dbg${EXECUTABLE_SUFFIX}"
         )
     endif()
 endif()
 
 # Handle copyright
-configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
diff --git a/external_imported/vcpkg/ports/foonathan-memory/vcpkg.json b/external_imported/vcpkg/ports/foonathan-memory/vcpkg.json
index e668bd94f..825c7b228 100644
--- a/external_imported/vcpkg/ports/foonathan-memory/vcpkg.json
+++ b/external_imported/vcpkg/ports/foonathan-memory/vcpkg.json
@@ -1,9 +1,20 @@
 {
   "name": "foonathan-memory",
-  "version-string": "2019-07-21",
-  "port-version": 2,
+  "version": "0.7.3",
+  "port-version": 1,
   "description": "STL compatible C++ memory allocator library",
   "homepage": "https://foonathan.net/doc/memory/",
+  "license": "Zlib",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
   "default-features": [
     "tool"
   ],
diff --git a/external_imported/vcpkg/ports/forge/portfile.cmake b/external_imported/vcpkg/ports/forge/portfile.cmake
index 8b0e81129..0cde669e4 100644
--- a/external_imported/vcpkg/ports/forge/portfile.cmake
+++ b/external_imported/vcpkg/ports/forge/portfile.cmake
@@ -26,9 +26,9 @@ list(FILTER DLLS EXCLUDE REGEX "forge\\.dll\$")
 file(REMOVE_RECURSE
     ${CURRENT_PACKAGES_DIR}/debug/include
     ${CURRENT_PACKAGES_DIR}/debug/share
-    ${CURRENT_PACKAGES_DIR}/debug/forge/examples
-    ${CURRENT_PACKAGES_DIR}/forge/examples
+    ${CURRENT_PACKAGES_DIR}/debug/examples
+    ${CURRENT_PACKAGES_DIR}/examples
     ${DLLS}
 )
 
-file(INSTALL "${SOURCE_PATH}/.github/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/.github/LICENSE")
diff --git a/external_imported/vcpkg/ports/forge/vcpkg.json b/external_imported/vcpkg/ports/forge/vcpkg.json
index eee50ad2b..7346d40c5 100644
--- a/external_imported/vcpkg/ports/forge/vcpkg.json
+++ b/external_imported/vcpkg/ports/forge/vcpkg.json
@@ -1,13 +1,13 @@
 {
   "name": "forge",
   "version-semver": "1.0.8",
-  "port-version": 1,
+  "port-version": 3,
   "description": "An OpenGL interop library that can be used with ArrayFire or any other application using CUDA or OpenCL compute backend.",
   "homepage": "https://github.com/arrayfire/forge",
   "license": "BSD-3-Clause",
   "supports": "!(windows & (arm | uwp))",
   "dependencies": [
-    "boost-functional",
+    "boost-container-hash",
     {
       "name": "fontconfig",
       "platform": "!windows"
diff --git a/external_imported/vcpkg/ports/fp16/portfile.cmake b/external_imported/vcpkg/ports/fp16/portfile.cmake
index 101255b8b..d292128e7 100644
--- a/external_imported/vcpkg/ports/fp16/portfile.cmake
+++ b/external_imported/vcpkg/ports/fp16/portfile.cmake
@@ -6,14 +6,13 @@ vcpkg_from_github(
     PATCHES
         find-psimd.patch
 )
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DFP16_BUILD_TESTS=OFF
         -DFP16_BUILD_BENCHMARKS=OFF
 )
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
diff --git a/external_imported/vcpkg/ports/fp16/vcpkg.json b/external_imported/vcpkg/ports/fp16/vcpkg.json
index 76eac902f..4e5bc35af 100644
--- a/external_imported/vcpkg/ports/fp16/vcpkg.json
+++ b/external_imported/vcpkg/ports/fp16/vcpkg.json
@@ -1,9 +1,14 @@
 {
   "name": "fp16",
   "version-date": "2021-02-21",
+  "port-version": 2,
   "description": "Header-only library for conversion to/from half-precision floating point formats",
   "homepage": "https://github.com/Maratyszcza/FP16",
   "dependencies": [
-    "psimd"
+    "psimd",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
   ]
 }
diff --git a/external_imported/vcpkg/ports/fplus/portfile.cmake b/external_imported/vcpkg/ports/fplus/portfile.cmake
index efe04fcdb..7712f4edf 100644
--- a/external_imported/vcpkg/ports/fplus/portfile.cmake
+++ b/external_imported/vcpkg/ports/fplus/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Dobiasd/FunctionalPlus
-    REF v0.2.18-p0
-    SHA512 119aaef75020ef06818bf5d33db8bce272e89d69699df9be636bc6fdf06b584e1842440896a431ea2a75b88ce01472f3a9886b8dd781f5e5533315e9ad6860ac
+    REF "v${VERSION}"
+    SHA512 399ff3012efd49e8617a0ae275e72bf13e87380e830f6ceb56f85fcda948d4ef252c5aa48f48f0a4a015874015d6e8ff442ac9395d523b4c946a01c17f2bd1b9
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/fplus/vcpkg.json b/external_imported/vcpkg/ports/fplus/vcpkg.json
index bdf521b10..7ac122258 100644
--- a/external_imported/vcpkg/ports/fplus/vcpkg.json
+++ b/external_imported/vcpkg/ports/fplus/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "fplus",
-  "version": "0.2.18-p0",
+  "version": "0.2.22",
   "description": "Functional Programming Library for C++. Write concise and readable C++ code",
   "homepage": "https://github.com/Dobiasd/FunctionalPlus",
   "license": "BSL-1.0",
diff --git a/external_imported/vcpkg/ports/freealut/vcpkg.json b/external_imported/vcpkg/ports/freealut/vcpkg.json
index 90a8aad4b..f3a16be68 100644
--- a/external_imported/vcpkg/ports/freealut/vcpkg.json
+++ b/external_imported/vcpkg/ports/freealut/vcpkg.json
@@ -1,14 +1,14 @@
 {
   "name": "freealut",
   "version": "1.1.0",
-  "port-version": 3,
+  "port-version": 4,
   "description": [
     "FreeALUT is a free implementation of OpenAL's ALUT standard.",
     "ALUT is a set of portable functions which remove the annoying details of getting an audio application started. It is the OpenAL counterpart of what GLUT is for OpenGL. "
   ],
   "homepage": "https://github.com/vancegroup/freealut",
   "license": "LGPL-2.0-only",
-  "supports": "!uwp",
+  "supports": "!uwp & !xbox",
   "dependencies": [
     "openal-soft",
     {
diff --git a/external_imported/vcpkg/ports/freeglut/portfile.cmake b/external_imported/vcpkg/ports/freeglut/portfile.cmake
index 2cccbbb31..3afc8e28b 100755
--- a/external_imported/vcpkg/ports/freeglut/portfile.cmake
+++ b/external_imported/vcpkg/ports/freeglut/portfile.cmake
@@ -1,5 +1,3 @@
-vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO FreeGLUTProject/freeglut
@@ -13,8 +11,10 @@ vcpkg_from_github(
         windows-output-name.patch
 )
 
-if(NOT VCPKG_TARGET_IS_WINDOWS)
-    message("Freeglut currently requires the following libraries from the system package manager:\n    opengl\n    glu\n    libx11\n    xrandr\n    xi\n    xxf86vm\n\nThese can be installed on Ubuntu systems via apt-get install libxi-dev libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxrandr-dev libxxf86vm-dev\nOn macOS Xquartz is required.")
+if(VCPKG_TARGET_IS_OSX)
+    message("Freeglut currently requires Xquartz for macOS.")
+elseif(NOT VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_ANDROID)
+    message("Freeglut currently requires the following libraries from the system package manager:\n    opengl\n    glu\n    libx11\n    xrandr\n    xi\n    xxf86vm\n\nThese can be installed on Ubuntu systems via apt-get install libxi-dev libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxrandr-dev libxxf86vm-dev")
 endif()
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" FREEGLUT_STATIC)
@@ -33,12 +33,20 @@ vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FreeGLUT)
 vcpkg_fixup_pkgconfig()
-file(COPY_FILE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/glut.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/freeglut.pc")
-if(NOT VCPKG_BUILD_TYPE)
-    if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
-        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/glut.pc" " -lfreeglut" " -lfreeglutd")
+
+file(GLOB pc_files "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/*.pc"  "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*.pc")
+foreach(file IN LISTS pc_files)
+    vcpkg_replace_string("${file}" ";-D" " -D")
+endforeach()
+
+if(NOT VCPKG_TARGET_IS_ANDROID)
+    file(COPY_FILE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/glut.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/freeglut.pc")
+    if(NOT VCPKG_BUILD_TYPE)
+        if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+            vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/glut.pc" " -lfreeglut" " -lfreeglutd")
+        endif()
+        file(COPY_FILE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/glut.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/freeglut.pc")
     endif()
-    file(COPY_FILE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/glut.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/freeglut.pc")
 endif()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
diff --git a/external_imported/vcpkg/ports/freeglut/vcpkg.json b/external_imported/vcpkg/ports/freeglut/vcpkg.json
index e9d942447..e3ece9260 100644
--- a/external_imported/vcpkg/ports/freeglut/vcpkg.json
+++ b/external_imported/vcpkg/ports/freeglut/vcpkg.json
@@ -1,9 +1,11 @@
 {
   "name": "freeglut",
   "version": "3.4.0",
+  "port-version": 1,
   "description": "A free OpenGL utility toolkit, the open-sourced alternative to the GLUT library.",
   "homepage": "https://sourceforge.net/projects/freeglut/",
   "license": null,
+  "supports": "!ios",
   "dependencies": [
     "opengl",
     {
diff --git a/external_imported/vcpkg/ports/freeopcua/portfile.cmake b/external_imported/vcpkg/ports/freeopcua/portfile.cmake
index 566c7a527..47450efcf 100644
--- a/external_imported/vcpkg/ports/freeopcua/portfile.cmake
+++ b/external_imported/vcpkg/ports/freeopcua/portfile.cmake
@@ -15,9 +15,8 @@ vcpkg_from_github(
         fix-std-headers.patch
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
       -DBUILD_PYTHON=OFF
       -DBUILD_TESTING=OFF
@@ -25,12 +24,12 @@ vcpkg_configure_cmake(
       -DCMAKE_DEBUG_POSTFIX=d
 )
 
-vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets()
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup()
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 #Handle copyright
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/freeopcua RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/freeopcua" RENAME copyright)
 
 vcpkg_fixup_pkgconfig()
diff --git a/external_imported/vcpkg/ports/freeopcua/vcpkg.json b/external_imported/vcpkg/ports/freeopcua/vcpkg.json
index 02da47e65..91498a401 100644
--- a/external_imported/vcpkg/ports/freeopcua/vcpkg.json
+++ b/external_imported/vcpkg/ports/freeopcua/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "freeopcua",
-  "version-string": "20190125",
-  "port-version": 5,
+  "version": "20190125",
+  "port-version": 7,
   "description": "OPC-UA server and client library written in C++ and with a lot of code auto-generated from xml specification using python.",
   "dependencies": [
     "boost-asio",
@@ -12,6 +12,14 @@
     "boost-program-options",
     "boost-property-tree",
     "boost-system",
-    "boost-thread"
+    "boost-thread",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ]
 }
diff --git a/external_imported/vcpkg/ports/freerdp/cmake-project-include.cmake b/external_imported/vcpkg/ports/freerdp/cmake-project-include.cmake
new file mode 100644
index 000000000..a8be06032
--- /dev/null
+++ b/external_imported/vcpkg/ports/freerdp/cmake-project-include.cmake
@@ -0,0 +1,21 @@
+find_package(PkgConfig REQUIRED)
+if(CHANNEL_URBDRC)
+    pkg_check_modules(vcpkg_libusb REQUIRED libusb-1.0)
+    set(LIBUSB_1_INCLUDE_DIR "${vcpkg_libusb_INCLUDE_DIRS}")
+    set(LIBUSB_1_LIBRARY "${vcpkg_libusb_LINK_LIBRARIES}")
+    string(REPLACE "-Wl,-framework," "-framework " libusb_frameworks "${vcpkg_libusb_LDFLAGS}")
+    list(FILTER libusb_frameworks INCLUDE REGEX "^-framework ")
+    list(APPEND LIBUSB_1_LIBRARY ${libusb_frameworks})
+endif()
+if(WITH_FFMPEG)
+    # Exact pkg_check_modules signature as in project
+    pkg_check_modules(AVCODEC libavcodec)
+    set(AVCODEC_LIBRARY "${AVCODEC_LINK_LIBRARIES}")
+    pkg_check_modules(AVUTIL libavutil)
+    set(AVUTIL_LIBRARY "${AVUTIL_LINK_LIBRARIES}")
+    string(REPLACE "-Wl,-framework," "-framework " avutil_frameworks "${AVUTIL_LDFLAGS}")
+    list(FILTER avutil_frameworks INCLUDE REGEX "^-framework ")
+    list(APPEND AVUTIL_LIBRARY ${avutil_frameworks})
+    pkg_check_modules(SWRESAMPLE libswresample)
+    set(SWRESAMPLE_LIBRARY "${SWRESAMPLE_LINK_LIBRARIES}")
+endif()
diff --git a/external_imported/vcpkg/ports/freerdp/dependencies.patch b/external_imported/vcpkg/ports/freerdp/dependencies.patch
new file mode 100644
index 000000000..bbacce809
--- /dev/null
+++ b/external_imported/vcpkg/ports/freerdp/dependencies.patch
@@ -0,0 +1,59 @@
+diff --git a/client/FreeRDP-ClientConfig.cmake.in b/client/FreeRDP-ClientConfig.cmake.in
+index 35b74c1..a4e48c9 100644
+--- a/client/FreeRDP-ClientConfig.cmake.in
++++ b/client/FreeRDP-ClientConfig.cmake.in
+@@ -1,6 +1,7 @@
+ include(CMakeFindDependencyMacro)
+ find_dependency(WinPR @FREERDP_VERSION@)
+ find_dependency(FreeRDP @FREERDP_VERSION@)
++find_dependency(ZLIB)
+ 
+ @PACKAGE_INIT@
+ 
+diff --git a/cmake/FindFeature.cmake b/cmake/FindFeature.cmake
+index bd25fd4..dd180a3 100644
+--- a/cmake/FindFeature.cmake
++++ b/cmake/FindFeature.cmake
+@@ -15,7 +15,7 @@ macro(find_feature _feature _type _purpose _description)
+ 			set(_feature_default "ON")
+ 			message(STATUS "Finding ${_type_lower} feature ${_feature} for ${_purpose} (${_description})")
+ 			find_package(${_feature} REQUIRED)
+-		elseif(${_type} STREQUAL "RECOMMENDED")
++		elseif(0)
+ 			if(NOT ${WITH_${_feature_upper}})
+ 				set(_feature_default "OFF")
+ 				message(STATUS "Skipping ${_type_lower} feature ${_feature} for ${_purpose} (${_description})")
+@@ -29,7 +29,7 @@ macro(find_feature _feature _type _purpose _description)
+ 					message(STATUS "Not detected ${_type_lower} feature ${_feature} for ${_purpose} (${_description}), feature disabled")
+ 				endif()
+ 			endif()
+-		elseif(${_type} STREQUAL "OPTIONAL")
++		elseif(1)
+ 			if(${WITH_${_feature_upper}})
+ 				set(_feature_default "ON")
+ 				message(STATUS "Finding ${_type_lower} feature ${_feature} for ${_purpose} (${_description})")
+diff --git a/libfreerdp/FreeRDPConfig.cmake.in b/libfreerdp/FreeRDPConfig.cmake.in
+index 21ecd59..2613a59 100644
+--- a/libfreerdp/FreeRDPConfig.cmake.in
++++ b/libfreerdp/FreeRDPConfig.cmake.in
+@@ -1,5 +1,7 @@
+ include(CMakeFindDependencyMacro)
+ find_dependency(WinPR @FREERDP_VERSION@)
++find_dependency(cJSON)
++find_dependency(ZLIB)
+ 
+ @PACKAGE_INIT@
+ 
+diff --git a/libfreerdp/freerdp.pc.in b/libfreerdp/freerdp.pc.in
+index 21ea0c7..71b8e18 100644
+--- a/libfreerdp/freerdp.pc.in
++++ b/libfreerdp/freerdp.pc.in
+@@ -14,7 +14,7 @@ Description: FreeRDP: A Remote Desktop Protocol Implementation
+ URL: http://www.freerdp.com/
+ Version: @FREERDP_VERSION@
+ Requires: 
+-Requires.private: winpr@FREERDP_API_VERSION@
++Requires.private: winpr@FREERDP_API_VERSION@ libcjson zlib
+ Libs: -L${libdir} ${libs}
+ Libs.private: -ldl -lpthread
+ Cflags: -I${includedir}
diff --git a/external_imported/vcpkg/ports/freerdp/fix-FreeRDP.patch b/external_imported/vcpkg/ports/freerdp/fix-FreeRDP.patch
deleted file mode 100644
index 221c81b38..000000000
--- a/external_imported/vcpkg/ports/freerdp/fix-FreeRDP.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/server/Windows/cli/CMakeLists.txt b/server/Windows/cli/CMakeLists.txt
-index e60de909d..f67078696 100644
---- a/server/Windows/cli/CMakeLists.txt
-+++ b/server/Windows/cli/CMakeLists.txt
-@@ -40,7 +40,7 @@ set (${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/
- 
- add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
- 
--set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "wfreerdp-server")
-+#set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "wfreerdp-server")
- 
- set(${MODULE_PREFIX}_LIBS wfreerdp-server)
- 
diff --git a/external_imported/vcpkg/ports/freerdp/fix-include-path.patch b/external_imported/vcpkg/ports/freerdp/fix-include-path.patch
deleted file mode 100644
index f426813a0..000000000
--- a/external_imported/vcpkg/ports/freerdp/fix-include-path.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 54df8cf..5232d46 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -129,7 +129,7 @@ endif()
- 
- message(STATUS "Git Revision ${GIT_REVISION}")
- 
--set(FREERDP_INCLUDE_DIR "include/freerdp${FREERDP_VERSION_MAJOR}/")
-+set(FREERDP_INCLUDE_DIR "include/")
- 
- # Compatibility options
- if(DEFINED STATIC_CHANNELS)
-diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
-index a020dc5..0bc1157 100644
---- a/include/CMakeLists.txt
-+++ b/include/CMakeLists.txt
-@@ -19,7 +19,7 @@
- 
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/freerdp/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/freerdp/version.h)
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/freerdp/build-config.h.in ${CMAKE_CURRENT_BINARY_DIR}/freerdp/build-config.h)
--set(FREERDP_INSTALL_INCLUDE_DIR include/freerdp${FREERDP_VERSION_MAJOR}/freerdp)
-+set(FREERDP_INSTALL_INCLUDE_DIR include/freerdp)
- 
- file(GLOB FREERDP_HEADERS "freerdp/*.h")
- install(FILES ${FREERDP_HEADERS} DESTINATION ${FREERDP_INSTALL_INCLUDE_DIR} COMPONENT headers)
-diff --git a/winpr/CMakeLists.txt b/winpr/CMakeLists.txt
-index d8a40da..73ffba4 100644
---- a/winpr/CMakeLists.txt
-+++ b/winpr/CMakeLists.txt
-@@ -221,7 +221,7 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8.10")
- 
- 	SetFreeRDPCMakeInstallDir(WINPR_CMAKE_INSTALL_DIR "WinPR${WINPR_VERSION_MAJOR}")
- 
--	set(WINPR_INCLUDE_DIR "include/winpr${WINPR_VERSION_MAJOR}")
-+	set(WINPR_INCLUDE_DIR "include")
- 
- 	configure_package_config_file(WinPRConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/WinPRConfig.cmake
- 		INSTALL_DESTINATION ${WINPR_CMAKE_INSTALL_DIR}
-diff --git a/winpr/include/CMakeLists.txt b/winpr/include/CMakeLists.txt
-index 452383d..3faab0c 100644
---- a/winpr/include/CMakeLists.txt
-+++ b/winpr/include/CMakeLists.txt
-@@ -17,7 +17,7 @@
- 
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/winpr/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/winpr/version.h)
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/winpr/wtypes.h.in ${CMAKE_CURRENT_BINARY_DIR}/winpr/wtypes.h)
--set(WINPR_INSTALL_INCLUDE_DIR include/winpr${WINPR_VERSION_MAJOR}/winpr)
-+set(WINPR_INSTALL_INCLUDE_DIR include/winpr)
- 
- file(GLOB WINPR_HEADERS "winpr/*.h")
- install(FILES ${WINPR_HEADERS} DESTINATION ${WINPR_INSTALL_INCLUDE_DIR} COMPONENT headers)
diff --git a/external_imported/vcpkg/ports/freerdp/fix-libusb.patch b/external_imported/vcpkg/ports/freerdp/fix-libusb.patch
deleted file mode 100644
index d02e746ba..000000000
--- a/external_imported/vcpkg/ports/freerdp/fix-libusb.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/channels/urbdrc/client/libusb/libusb_udevman.c b/channels/urbdrc/client/libusb/libusb_udevman.c
-index 5f1e9e0d2..022be4e21 100644
---- a/channels/urbdrc/client/libusb/libusb_udevman.c
-+++ b/channels/urbdrc/client/libusb/libusb_udevman.c
-@@ -581,7 +581,7 @@ static BOOL device_is_filtered(struct libusb_device* dev,
- 	return filtered;
- }
- 
--static int hotplug_callback(struct libusb_context* ctx, struct libusb_device* dev,
-+static int LIBUSB_CALL hotplug_callback(struct libusb_context* ctx, struct libusb_device* dev,
-                             libusb_hotplug_event event, void* user_data)
- {
- 	VID_PID_PAIR pair;
diff --git a/external_imported/vcpkg/ports/freerdp/fix-linux-build.patch b/external_imported/vcpkg/ports/freerdp/fix-linux-build.patch
deleted file mode 100644
index 92f2cd4c1..000000000
--- a/external_imported/vcpkg/ports/freerdp/fix-linux-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/winpr/tools/makecert-cli/CMakeLists.txt b/winpr/tools/makecert-cli/CMakeLists.txt
-index 48fda5b..4e15a22 100644
---- a/winpr/tools/makecert-cli/CMakeLists.txt
-+++ b/winpr/tools/makecert-cli/CMakeLists.txt
-@@ -42,7 +42,7 @@ add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
- 
- set(${MODULE_PREFIX}_LIBS winpr-tools)
- 
--target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} winpr)
-+target_link_libraries(${MODULE_NAME} ${OPENSSL_LIBRARIES} ${${MODULE_PREFIX}_LIBS} winpr)
- 
- set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/Tools")
- 
diff --git a/external_imported/vcpkg/ports/freerdp/install-dirs.patch b/external_imported/vcpkg/ports/freerdp/install-dirs.patch
deleted file mode 100644
index 5b5e178be..000000000
--- a/external_imported/vcpkg/ports/freerdp/install-dirs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5e67ef9..4ef3e8e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -18,7 +18,7 @@
- # See the License for the specific language governing permissions and
- # limitations under the License.
- 
--cmake_minimum_required(VERSION 2.8)
-+cmake_minimum_required(VERSION 3.11)
- 
- project(FreeRDP C CXX)
- 
diff --git a/external_imported/vcpkg/ports/freerdp/install-layout.patch b/external_imported/vcpkg/ports/freerdp/install-layout.patch
new file mode 100644
index 000000000..803e28eef
--- /dev/null
+++ b/external_imported/vcpkg/ports/freerdp/install-layout.patch
@@ -0,0 +1,88 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1633656..db346d3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -158,7 +158,7 @@ endif()
+ message(STATUS "Git Revision ${GIT_REVISION}")
+ 
+ set(FREERDP_MAJOR_DIR "freerdp${FREERDP_VERSION_MAJOR}")
+-set(FREERDP_INCLUDE_DIR "include/${FREERDP_MAJOR_DIR}/")
++set(FREERDP_INCLUDE_DIR "include/")
+ 
+ option(WITH_SMARTCARD_EMULATE "Emulate smartcards instead of redirecting readers" ON)
+ if (WITH_SMARTCARD_EMULATE)
+@@ -711,6 +711,9 @@ else()
+ 	set(FREERDP_LIBRARY_PATH "${CMAKE_INSTALL_LIBDIR}")
+ 	set(FREERDP_PLUGIN_PATH "${CMAKE_INSTALL_LIBDIR}/${FREERDP_MAJOR_DIR}")
+ endif()
++set(FREERDP_DATA_PATH "share/freerdp")
++set(FREERDP_LIBRARY_PATH "${CMAKE_INSTALL_LIBDIR}")
++set(FREERDP_PLUGIN_PATH "${CMAKE_INSTALL_LIBDIR}/freerdp${FREERDP_VERSION_MAJOR}")
+ set(FREERDP_ADDIN_PATH "${FREERDP_PLUGIN_PATH}")
+ 
+ # Path to put extensions
+diff --git a/client/Windows/CMakeLists.txt b/client/Windows/CMakeLists.txt
+index cc94b99..0423242 100644
+--- a/client/Windows/CMakeLists.txt
++++ b/client/Windows/CMakeLists.txt
+@@ -107,7 +107,7 @@ endif()
+ target_link_libraries(${MODULE_NAME} PRIVATE ${LIBS})
+ 
+ if(WITH_CLIENT_INTERFACE)
+-	install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries)
++	install(TARGETS ${MODULE_NAME} COMPONENT libraries)
+ 	if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
+ 		install(FILES ${CMAKE_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols)
+ 	endif()
+diff --git a/libfreerdp/freerdp.pc.in b/libfreerdp/freerdp.pc.in
+index 7555957..21ea0c7 100644
+--- a/libfreerdp/freerdp.pc.in
++++ b/libfreerdp/freerdp.pc.in
+@@ -4,7 +4,7 @@ libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+ includedir=${prefix}/@FREERDP_INCLUDE_DIR@
+ libs=-lfreerdp@FREERDP_API_VERSION@
+ datarootdir=${prefix}/share
+-datadir=${datarootdir}/@FREERDP_MAJOR_DIR@
++datadir=${datarootdir}/freerdp
+ plugindir=${libdir}/@FREERDP_MAJOR_DIR@
+ proxy_plugindir=${plugindir}/proxy
+ extensiondir=${plugindir}/extensions
+diff --git a/winpr/CMakeLists.txt b/winpr/CMakeLists.txt
+index 4769741..eb3fe11 100644
+--- a/winpr/CMakeLists.txt
++++ b/winpr/CMakeLists.txt
+@@ -320,7 +320,7 @@ endif()
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
+ include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
+ 
+-set(WINPR_INCLUDE_DIR "include/winpr${WINPR_VERSION_MAJOR}")
++set(WINPR_INCLUDE_DIR "include")
+ 
+ 
+ add_subdirectory(libwinpr)
+diff --git a/winpr/libwinpr/CMakeLists.txt b/winpr/libwinpr/CMakeLists.txt
+index 4be2015..00c64e0 100644
+--- a/winpr/libwinpr/CMakeLists.txt
++++ b/winpr/libwinpr/CMakeLists.txt
+@@ -195,7 +195,7 @@ else()
+ endif()
+ target_link_options(${MODULE_NAME} ${LINK_OPTS_MODE} ${WINPR_LINK_OPTIONS})
+ target_include_directories(${MODULE_NAME} PRIVATE ${WINPR_INCLUDES})
+-target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include/winpr${WINPR_VERSION_MAJOR}>)
++target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:${WINPR_INCLUDE_DIR}>)
+ target_link_directories(${MODULE_NAME} PRIVATE ${WINPR_LINK_DIRS})
+ target_compile_options(${MODULE_NAME} PRIVATE ${WINPR_COMPILE_OPTIONS})
+ target_compile_definitions(${MODULE_NAME} PRIVATE ${WINPR_DEFINITIONS})
+diff --git a/winpr/tools/CMakeLists.txt b/winpr/tools/CMakeLists.txt
+index e995172..f612718 100644
+--- a/winpr/tools/CMakeLists.txt
++++ b/winpr/tools/CMakeLists.txt
+@@ -110,7 +110,7 @@ if (WITH_LIBRARY_VERSIONING)
+ endif()
+ 
+ add_definitions(${WINPR_DEFINITIONS})
+-target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include/winpr${WINPR_VERSION_MAJOR}>)
++target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:${WINPR_INCLUDE_DIR}>)
+ target_link_libraries(${MODULE_NAME} PRIVATE ${WINPR_TOOLS_LIBS})
+ 
+ install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT WinPR-toolsTargets
diff --git a/external_imported/vcpkg/ports/freerdp/keep-dup-libs.patch b/external_imported/vcpkg/ports/freerdp/keep-dup-libs.patch
new file mode 100644
index 000000000..7336ad59b
--- /dev/null
+++ b/external_imported/vcpkg/ports/freerdp/keep-dup-libs.patch
@@ -0,0 +1,37 @@
+diff --git a/libfreerdp/CMakeLists.txt b/libfreerdp/CMakeLists.txt
+index 2ce9c42..bbd202a 100644
+--- a/libfreerdp/CMakeLists.txt
++++ b/libfreerdp/CMakeLists.txt
+@@ -415,7 +415,6 @@ endif()
+ list(APPEND LIBFREERDP_PUB_LIBS winpr)
+ 
+ list(REMOVE_DUPLICATES LIBFREERDP_DEFINITIONS)
+-list(REMOVE_DUPLICATES LIBFREERDP_LIBS)
+ list(REMOVE_DUPLICATES LIBFREERDP_PUB_LIBS)
+ list(REMOVE_DUPLICATES LIBFREERDP_INCLUDES)
+ include_directories(${LIBFREERDP_INCLUDES})
+diff --git a/winpr/libwinpr/CMakeLists.txt b/winpr/libwinpr/CMakeLists.txt
+index 4be2015..f1266f3 100644
+--- a/winpr/libwinpr/CMakeLists.txt
++++ b/winpr/libwinpr/CMakeLists.txt
+@@ -157,8 +157,6 @@ list(REMOVE_DUPLICATES WINPR_DEFINITIONS)
+ list(REMOVE_DUPLICATES WINPR_COMPILE_OPTIONS)
+ list(REMOVE_DUPLICATES WINPR_LINK_OPTIONS)
+ list(REMOVE_DUPLICATES WINPR_LINK_DIRS)
+-list(REMOVE_DUPLICATES WINPR_LIBS_PRIVATE)
+-list(REMOVE_DUPLICATES WINPR_LIBS_PUBLIC)
+ list(REMOVE_DUPLICATES WINPR_INCLUDES)
+ 
+ # On windows create dll version information.
+diff --git a/winpr/tools/CMakeLists.txt b/winpr/tools/CMakeLists.txt
+index e995172..90c4e58 100644
+--- a/winpr/tools/CMakeLists.txt
++++ b/winpr/tools/CMakeLists.txt
+@@ -82,7 +82,6 @@ add_subdirectory(makecert)
+ 
+ set(MODULE_NAME winpr-tools)
+ list(REMOVE_DUPLICATES WINPR_TOOLS_DEFINITIONS)
+-list(REMOVE_DUPLICATES WINPR_TOOLS_LIBS)
+ list(REMOVE_DUPLICATES WINPR_TOOLS_INCLUDES)
+ include_directories(${WINPR_TOOLS_INCLUDES})
+ 
diff --git a/external_imported/vcpkg/ports/freerdp/openssl_threads.patch b/external_imported/vcpkg/ports/freerdp/openssl_threads.patch
deleted file mode 100644
index ca312df40..000000000
--- a/external_imported/vcpkg/ports/freerdp/openssl_threads.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 97ba2f9..fc36185 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -907,6 +907,7 @@ if(OPENSSL_FOUND)
- 	add_definitions("-DWITH_OPENSSL")
- 	message(STATUS "Using OpenSSL Version: ${OPENSSL_VERSION}")
- 	include_directories(${OPENSSL_INCLUDE_DIR})
-+    list(APPEND OPENSSL_LIBRARIES Threads::Threads)
- endif()
- 
- if(MBEDTLS_FOUND)
diff --git a/external_imported/vcpkg/ports/freerdp/portfile.cmake b/external_imported/vcpkg/ports/freerdp/portfile.cmake
index 2b65ada9b..4e963305a 100644
--- a/external_imported/vcpkg/ports/freerdp/portfile.cmake
+++ b/external_imported/vcpkg/ports/freerdp/portfile.cmake
@@ -1,154 +1,133 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO FreeRDP/FreeRDP
-    REF 2.9.0
-    SHA512 8b43ff28c5afaf6dc12f73fe9cab3969049f40725dedc873af5af1caabefec4bdd1bedad7df121c1440493e5441296db076ba7726242bfb32f76dad0b21564ed
+    REF "${VERSION}"
+    SHA512 6c9061674716ca8c83a3913222db4002d893d751b0072a8af10013e09462a9cc847689dc874e30c499ae0d5be73c464f610057744c771fcd678bc43185d0f923
     HEAD_REF master
     PATCHES
+        dependencies.patch
         DontInstallSystemRuntimeLibs.patch
-        fix-linux-build.patch
-        openssl_threads.patch
-        fix-include-path.patch
-        fix-libusb.patch
-        install-dirs.patch
-        fix-FreeRDP.patch 
+        install-layout.patch
+        keep-dup-libs.patch
+        windows-linkage.patch
+        wfreerdp-server-cli.patch
 )
+file(WRITE "${SOURCE_PATH}/.source_version" "${VERSION}-vcpkg")
 
-if (NOT VCPKG_TARGET_IS_WINDOWS)
-    message(WARNING "${PORT} currently requires the following libraries from the system package manager:\n    libxfixes-dev\n")
+if("x11" IN_LIST FEATURES)
+    message(STATUS "${PORT} currently requires the following libraries from the system package manager:\n    libxfixes-dev\n")
 endif()
-set(FREERDP_WITH_CLIENT)
-if (VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_LINUX)
-    set(FREERDP_WITH_CLIENT -DWITH_CLIENT=OFF)
-endif()
-
-set(FREERDP_CRT_LINKAGE)
-if(VCPKG_CRT_LINKAGE STREQUAL "static")
-    set(FREERDP_CRT_LINKAGE -DMSVC_RUNTIME=static)
-endif()
-
-get_filename_component(SOURCE_VERSION "${SOURCE_PATH}" NAME)
-file(WRITE "${SOURCE_PATH}/.source_version" "${SOURCE_VERSION}-vcpkg")
-
-file(REMOVE "${SOURCE_PATH}/cmake/FindOpenSSL.cmake") # Remove outdated Module
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
-        server WITH_SERVER
-	urbdrc CHANNEL_URBDRC
+        ffmpeg      WITH_FFMPEG
+        ffmpeg      WITH_SWSCALE
+        server      WITH_SERVER
+        urbdrc      CHANNEL_URBDRC
+        wayland     WITH_WAYLAND
+        winpr-tools WITH_WINPR_TOOLS
+        x11         WITH_X11
 )
 
+vcpkg_list(SET GENERATOR_OPTION)
+if(VCPKG_TARGET_IS_OSX)
+    list(APPEND GENERATOR_OPTION GENERATOR "Unix Makefiles")
+endif()
+
+vcpkg_find_acquire_program(PKGCONFIG)
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    ${GENERATOR_OPTION}
     OPTIONS
-        ${FREERDP_CRT_LINKAGE}
-        ${FREERDP_WITH_CLIENT}
         ${FEATURE_OPTIONS}
+        "-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake"
+        -DCMAKE_REQUIRE_FIND_PACKAGE_cJSON=ON
+        -DUSE_VERSION_FROM_GIT_TAG=OFF
+        -DWITH_AAD=ON
+        -DWITH_CCACHE=OFF
+        -DWITH_CLANG_FORMAT=OFF
+        -DWITH_MANPAGES=OFF
+        -DWITH_OPENSSL=ON
+        -DWITH_SAMPLE=OFF
+        -DWITH_UNICODE_BUILTIN=ON
+        -DWITH_CLIENT=OFF
+        "-DMSVC_RUNTIME=${VCPKG_CRT_LINKAGE}"
+        "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}"
+        -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=ON
+        # Uncontrolled dependencies w.r.t. vcpkg ports, system libs, or tools
+        # Can be overriden in custom triplet file
+        -DUSE_UNWIND=OFF
+        -DWITH_ALSA=OFF
+        -DWITH_CAIRO=OFF
+        -DWITH_CLIENT_SDL=OFF
+        -DWITH_CUPS=OFF
+        -DWITH_FUSE=OFF
+        -DWITH_KRB5=OFF
+        -DWITH_LIBSYSTEMD=OFF
+        -DWITH_OPUS=OFF
+        -DWITH_OSS=OFF
+        -DWITH_PCSC=OFF
+        -DWITH_PKCS11=OFF
+        -DWITH_PROXY_MODULES=OFF
+        -DWITH_PULSE=OFF
+        -DWITH_URIPARSER=OFF
+        -DVCPKG_TRACE_FIND_PACKAGE=ON
+    MAYBE_UNUSED_VARIABLES
+        MSVC_RUNTIME
 )
 
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
+vcpkg_fixup_pkgconfig()
 
-file(GLOB_RECURSE TOOLS_RELEASE "${CURRENT_PACKAGES_DIR}/bin/*.exe")
-
-if(TOOLS_RELEASE)
-    file(COPY ${TOOLS_RELEASE} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
-    file(GLOB_RECURSE TOOLS_DEBUG "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe")
-    file(REMOVE ${TOOLS_RELEASE} ${TOOLS_DEBUG})
-endif()
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    file(GLOB_RECURSE FREERDP_DLLS "${CURRENT_PACKAGES_DIR}/lib/*.dll")
-    foreach(FREERDP_DLL ${FREERDP_DLLS})
-        file(COPY "${FREERDP_DLL}" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
-        file(REMOVE "${FREERDP_DLL}")
-    endforeach()
-
-    if(NOT VCPKG_BUILD_TYPE)
-        file(GLOB_RECURSE FREERDP_DLLS "${CURRENT_PACKAGES_DIR}/debug/lib/*.dll")
-        foreach(FREERDP_DLL ${FREERDP_DLLS})
-            file(COPY "${FREERDP_DLL}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
-            file(REMOVE "${FREERDP_DLL}")
-        endforeach()
+vcpkg_list(SET tools)
+if(VCPKG_TARGET_IS_WINDOWS)
+    if("server" IN_LIST FEATURES)
+        list(APPEND tools wfreerdp-server)
     endif()
-else()
-    file(GLOB_RECURSE FREERDP_TOOLS "${CURRENT_PACKAGES_DIR}/bin/*")
-    foreach(FREERDP_TOOL ${FREERDP_TOOLS})
-        file(COPY "${FREERDP_TOOL}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
-        file(REMOVE "${FREERDP_TOOL}")
-    endforeach()
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
-endif()
-
-foreach(PACKAGE FreeRDP-Client2 FreeRDP2 WinPR2)
-    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/cmake/${PACKAGE}_temp")
-    file(RENAME "${CURRENT_PACKAGES_DIR}/lib/cmake/${PACKAGE}" "${CURRENT_PACKAGES_DIR}/lib/cmake/${PACKAGE}_temp/${PACKAGE}")
-    if(NOT VCPKG_BUILD_TYPE)
-        file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/cmake/${PACKAGE}_temp")
-        file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/cmake/${PACKAGE}" "${CURRENT_PACKAGES_DIR}/debug/lib/cmake/${PACKAGE}_temp/${PACKAGE}")
+elseif(VCPKG_TARGET_IS_OSX)
+    if("server" IN_LIST FEATURES)
+        list(APPEND tools mfreerdp-server)
     endif()
-endforeach()
-
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FreeRDP-Client2_temp/FreeRDP-Client2 PACKAGE_NAME FreeRDP-Client)
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FreeRDP2_temp/FreeRDP2 PACKAGE_NAME FreeRDP)
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/WinPR2_temp/WinPR2 PACKAGE_NAME WinPR)
-
-vcpkg_fixup_pkgconfig(SKIP_CHECK)
-
-if(NOT VCPKG_BUILD_TYPE)
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/WinPR/WinPRTargets-debug.cmake"
-        "debug/lib/winpr2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
-        "debug/bin/winpr2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
-    )
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/WinPR/WinPRTargets-debug.cmake"
-        "debug/lib/winpr-tools2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
-        "debug/bin/winpr-tools2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
-    )
 endif()
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/WinPR/WinPRTargets-release.cmake"
-    "lib/winpr2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
-    "bin/winpr2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
-)
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/WinPR/WinPRTargets-release.cmake"
-    "lib/winpr-tools2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
-    "bin/winpr-tools2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
-)
-if(NOT VCPKG_BUILD_TYPE)
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/FreeRDP/FreeRDPTargets-debug.cmake"
-        "debug/lib/freerdp2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
-        "debug/bin/freerdp2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
-    )
+if("winpr-tools" IN_LIST FEATURES)
+    list(APPEND tools winpr-hash winpr-makecert)
 endif()
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/FreeRDP/FreeRDPTargets-release.cmake"
-    "lib/freerdp2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
-    "bin/freerdp2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
-)
-if(NOT VCPKG_BUILD_TYPE)
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/FreeRDP-Client/FreeRDP-ClientTargets-debug.cmake"
-        "debug/lib/freerdp-client2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
-        "debug/bin/freerdp-client2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
-    )
+if("server" IN_LIST FEATURES)
+    list(APPEND tools freerdp-proxy freerdp-shadow-cli)
+    vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FreeRDP-Server3 PACKAGE_NAME freerdp-server3 DO_NOT_DELETE_PARENT_CONFIG_PATH)
+    vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FreeRDP-Shadow3 PACKAGE_NAME freerdp-shadow3 DO_NOT_DELETE_PARENT_CONFIG_PATH)
 endif()
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/FreeRDP-Client/FreeRDP-ClientTargets-release.cmake"
-    "lib/freerdp-client2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
-    "bin/freerdp-client2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
-)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FreeRDP-Client3 PACKAGE_NAME freerdp-client3 DO_NOT_DELETE_PARENT_CONFIG_PATH)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/WinPR3 PACKAGE_NAME winpr3 DO_NOT_DELETE_PARENT_CONFIG_PATH)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FreeRDP3 PACKAGE_NAME freerdp)
 
-if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(GLOB OBJS "${CURRENT_PACKAGES_DIR}/debug/*.lib")
-    file(REMOVE ${OBJS})
-    file(GLOB OBJS "${CURRENT_PACKAGES_DIR}/*.lib")
-    file(REMOVE ${OBJS})
+if(tools)
+    vcpkg_copy_tools(TOOL_NAMES ${tools} AUTO_CLEAN)
 endif()
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include"
-                    "${CURRENT_PACKAGES_DIR}/debug/share"
-                    "${CURRENT_PACKAGES_DIR}/debug/lib/cmake"
-                    "${CURRENT_PACKAGES_DIR}/lib/cmake")
-
-
 vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/freerdp/build-config.h" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" ".")
 vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/freerdp/build-config.h" "${CURRENT_PACKAGES_DIR}/" "")
 vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/freerdp/build-config.h" "${CURRENT_PACKAGES_DIR}" "")
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    # They build static with dllexport, so it must be used with dllexport. Proper fix needs invasive patching.
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/freerdp/api.h" "#ifdef FREERDP_EXPORTS" "#if 1")
+    if(WITH_SERVER)
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/rdtk0/rdtk/api.h" "#ifdef RDTK_EXPORTS" "#if 1")
+    endif()
+endif()
+
+file(REMOVE_RECURSE
+    "${CURRENT_PACKAGES_DIR}/include/config"
+    "${CURRENT_PACKAGES_DIR}/include/CMakeFiles"
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/debug/share"
+)
+
+file(GLOB cmakefiles  "${CURRENT_PACKAGES_DIR}/include/*/CMakeFiles")
+if(cmakefiles)
+    file(REMOVE_RECURSE ${cmakefiles})
+endif()
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/freerdp/vcpkg.json b/external_imported/vcpkg/ports/freerdp/vcpkg.json
index 4286c0b83..88e35f18f 100644
--- a/external_imported/vcpkg/ports/freerdp/vcpkg.json
+++ b/external_imported/vcpkg/ports/freerdp/vcpkg.json
@@ -1,11 +1,13 @@
 {
   "name": "freerdp",
-  "version": "2.9.0",
+  "version": "3.0.0",
+  "port-version": 1,
   "description": "A free implementation of the Remote Desktop Protocol (RDP)",
   "homepage": "https://github.com/FreeRDP/FreeRDP",
   "license": "Apache-2.0",
-  "supports": "!(arm | uwp)",
+  "supports": "!uwp & !(arm & windows)",
   "dependencies": [
+    "cjson",
     {
       "name": "glib",
       "platform": "!windows"
@@ -18,17 +20,61 @@
     {
       "name": "vcpkg-cmake-config",
       "host": true
-    }
+    },
+    "zlib"
   ],
   "features": {
+    "ffmpeg": {
+      "description": "Enable image scaling, video and audio with ffmpeg",
+      "supports": "!windows",
+      "dependencies": [
+        {
+          "name": "ffmpeg",
+          "default-features": false,
+          "features": [
+            "avcodec",
+            "swresample",
+            "swscale"
+          ]
+        }
+      ]
+    },
     "server": {
-      "description": "With server"
+      "description": "Build server components",
+      "supports": "!android & !ios & !uwp",
+      "dependencies": [
+        {
+          "name": "freerdp",
+          "default-features": false,
+          "features": [
+            "winpr-tools"
+          ]
+        }
+      ]
     },
     "urbdrc": {
       "description": "USB redirection channel support",
       "dependencies": [
         "libusb"
       ]
+    },
+    "wayland": {
+      "description": "Enable wayland support",
+      "supports": "!android & !ios & !openbsd & !osx & !windows",
+      "dependencies": [
+        "wayland"
+      ]
+    },
+    "winpr-tools": {
+      "description": "Build winpr tools",
+      "supports": "!android & !ios & !uwp"
+    },
+    "x11": {
+      "description": "Enable X11 support",
+      "supports": "!android & !ios & !windows & !osx",
+      "dependencies": [
+        "xcb"
+      ]
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/freerdp/wfreerdp-server-cli.patch b/external_imported/vcpkg/ports/freerdp/wfreerdp-server-cli.patch
new file mode 100644
index 000000000..122cfbce4
--- /dev/null
+++ b/external_imported/vcpkg/ports/freerdp/wfreerdp-server-cli.patch
@@ -0,0 +1,13 @@
+diff --git a/server/Windows/cli/CMakeLists.txt b/server/Windows/cli/CMakeLists.txt
+index 58d5df0..fdba313 100644
+--- a/server/Windows/cli/CMakeLists.txt
++++ b/server/Windows/cli/CMakeLists.txt
+@@ -41,7 +41,7 @@ set (${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/
+ 
+ add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
+ 
+-set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME ${OUTPUT_NAME})
++set_target_properties(${MODULE_NAME} PROPERTIES RUNTIME_OUTPUT_NAME wfreerdp-server PDB_NAME wfreerdp-server.exe)
+ 
+ set(${MODULE_PREFIX}_LIBS wfreerdp-server)
+ 
diff --git a/external_imported/vcpkg/ports/freerdp/windows-linkage.patch b/external_imported/vcpkg/ports/freerdp/windows-linkage.patch
new file mode 100644
index 000000000..0d59c66ea
--- /dev/null
+++ b/external_imported/vcpkg/ports/freerdp/windows-linkage.patch
@@ -0,0 +1,14 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index db346d3..6ad72d3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -439,6 +439,9 @@ if(WIN32)
+ endif()
+ 
+ add_definitions(-DFREERDP_EXPORTS)
++if(NOT BUILD_SHARED_LIBS)
++	add_definitions(-DRDTK_EXPORTS)
++endif()
+ 
+ # Mac OS X
+ if(APPLE)
diff --git a/external_imported/vcpkg/ports/freetds/vcpkg.json b/external_imported/vcpkg/ports/freetds/vcpkg.json
index 5483fdf99..be1146fd7 100644
--- a/external_imported/vcpkg/ports/freetds/vcpkg.json
+++ b/external_imported/vcpkg/ports/freetds/vcpkg.json
@@ -1,11 +1,11 @@
 {
   "name": "freetds",
   "version": "1.3.10",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Implementation of the Tabular Data Stream protocol",
   "homepage": "https://www.freetds.org",
   "license": "GPL-2.0-only",
-  "supports": "windows & !uwp",
+  "supports": "windows & !uwp & !xbox",
   "dependencies": [
     {
       "name": "gperf",
diff --git a/external_imported/vcpkg/ports/freetype-gl/portfile.cmake b/external_imported/vcpkg/ports/freetype-gl/portfile.cmake
index 36c0282bc..45e30cbe7 100644
--- a/external_imported/vcpkg/ports/freetype-gl/portfile.cmake
+++ b/external_imported/vcpkg/ports/freetype-gl/portfile.cmake
@@ -14,6 +14,13 @@ vcpkg_from_github(
         0005-add-version.patch
 )
 
+vcpkg_check_features(
+    OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        "glew" freetype-gl_WITH_GLEW
+        "glad" freetype-gl_WITH_GLAD
+)
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
@@ -21,6 +28,7 @@ vcpkg_cmake_configure(
         -Dfreetype-gl_BUILD_DEMOS=OFF
         -Dfreetype-gl_BUILD_TESTS=OFF
         -Dfreetype-gl_BUILD_MAKEFONT=OFF
+        ${FEATURE_OPTIONS}
 )
 
 vcpkg_cmake_install()
@@ -32,6 +40,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 vcpkg_fixup_pkgconfig()
-# Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/freetype-gl" RENAME copyright)
 
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/freetype-gl/vcpkg.json b/external_imported/vcpkg/ports/freetype-gl/vcpkg.json
index 3acfe4cbb..f3f70985a 100644
--- a/external_imported/vcpkg/ports/freetype-gl/vcpkg.json
+++ b/external_imported/vcpkg/ports/freetype-gl/vcpkg.json
@@ -1,12 +1,11 @@
 {
   "name": "freetype-gl",
   "version-date": "2022-01-17",
-  "port-version": 1,
+  "port-version": 3,
   "description": "OpenGL text using one vertex buffer, one texture and FreeType",
   "homepage": "https://github.com/rougier/freetype-gl",
   "dependencies": [
     "freetype",
-    "glew",
     {
       "name": "vcpkg-cmake",
       "host": true
@@ -15,5 +14,22 @@
       "name": "vcpkg-cmake-config",
       "host": true
     }
-  ]
+  ],
+  "default-features": [
+    "glew"
+  ],
+  "features": {
+    "glad": {
+      "description": "Use the GLAD gl loader",
+      "dependencies": [
+        "glad"
+      ]
+    },
+    "glew": {
+      "description": "Use the GLEW gl loader",
+      "dependencies": [
+        "glew"
+      ]
+    }
+  }
 }
diff --git a/external_imported/vcpkg/ports/freetype/brotli-static.patch b/external_imported/vcpkg/ports/freetype/brotli-static.patch
index 14a03f085..d872e8dfe 100644
--- a/external_imported/vcpkg/ports/freetype/brotli-static.patch
+++ b/external_imported/vcpkg/ports/freetype/brotli-static.patch
@@ -2,7 +2,7 @@ diff --git a/builds/cmake/FindBrotliDec.cmake b/builds/cmake/FindBrotliDec.cmake
 index 46356b1fd..ed4cc2409 100644
 --- a/builds/cmake/FindBrotliDec.cmake
 +++ b/builds/cmake/FindBrotliDec.cmake
-@@ -35,10 +35,19 @@ find_path(BROTLIDEC_INCLUDE_DIRS
+@@ -35,10 +35,15 @@ find_path(BROTLIDEC_INCLUDE_DIRS
    PATH_SUFFIXES brotli)
  
  find_library(BROTLIDEC_LIBRARIES
@@ -11,15 +11,11 @@ index 46356b1fd..ed4cc2409 100644
    HINTS ${PC_BROTLIDEC_LIBDIR}
          ${PC_BROTLIDEC_LIBRARY_DIRS})
  
-+get_filename_component(z_vcpkg_freetype_brotlidec_name "${BROTLIDEC_LIBRARIES}" NAME)
-+if(z_vcpkg_freetype_brotlidec_name MATCHES "-static")
 +  find_library(BROTLICOMMON_LIBRARIES
-+    NAMES brotlicommon-static
++    NAMES brotlicommon-static brotlicommon NAMES_PER_DIR
 +    HINTS ${PC_BROTLIDEC_LIBDIR}
 +          ${PC_BROTLIDEC_LIBRARY_DIRS})
 +  set(BROTLIDEC_LIBRARIES "${BROTLIDEC_LIBRARIES};${BROTLICOMMON_LIBRARIES}")
-+endif()
-+unset(z_vcpkg_freetype_brotlidec_name)
  
  include(FindPackageHandleStandardArgs)
  find_package_handle_standard_args(
diff --git a/external_imported/vcpkg/ports/freetype/error-strings.patch b/external_imported/vcpkg/ports/freetype/error-strings.patch
deleted file mode 100644
index 422e7e696..000000000
--- a/external_imported/vcpkg/ports/freetype/error-strings.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 5672a353682a68cb76a03179739bdec0a2f5cf0e Mon Sep 17 00:00:00 2001
-From: Sean Farrell <sean.farrell@rioki.org>
-Date: Fri, 19 Aug 2022 15:32:19 +0200
-Subject: [PATCH] Adds config support for error strings.
-
----
- CMakeLists.txt | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index feb4be39a..4eea860e8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -215,6 +215,8 @@ cmake_dependent_option(FT_REQUIRE_BROTLI
-   "Require support of compressed WOFF2 fonts." OFF
-   "NOT FT_DISABLE_BROTLI" OFF)
- 
-+option(FT_ENABLE_ERROR_STRINGS
-+  "Enable support for meaningful error descriptions" OFF)
- 
- # Disallow in-source builds
- if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
-@@ -353,6 +355,11 @@ if (BROTLIDEC_FOUND)
-     "/\\* +(#define +FT_CONFIG_OPTION_USE_BROTLI) +\\*/" "\\1"
-     FTOPTION_H "${FTOPTION_H}")
- endif ()
-+if (FT_ENABLE_ERROR_STRINGS)
-+  string(REGEX REPLACE
-+    "/\\* +(#define +FT_CONFIG_OPTION_ERROR_STRINGS) +\\*/" "\\1"
-+    FTOPTION_H "${FTOPTION_H}")
-+endif ()
- 
- set(FTOPTION_H_NAME "${PROJECT_BINARY_DIR}/include/freetype/config/ftoption.h")
- if (EXISTS "${FTOPTION_H_NAME}")
--- 
-2.33.0.windows.2
-
diff --git a/external_imported/vcpkg/ports/freetype/fix-exports.patch b/external_imported/vcpkg/ports/freetype/fix-exports.patch
index 39b1e1581..7b12dc487 100644
--- a/external_imported/vcpkg/ports/freetype/fix-exports.patch
+++ b/external_imported/vcpkg/ports/freetype/fix-exports.patch
@@ -22,7 +22,7 @@ index cb1b9a0f2..edca5d579 100644
      DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/freetype
      COMPONENT headers)
 +
-+  if(ZLIB_FOUND)
++  if(ZLIB_FOUND AND BUILD_SHARED_LIBS)
 +    file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/freetype-config.cmake"
 +[[include(CMakeFindDependencyMacro)
 +find_dependency(ZLIB)
diff --git a/external_imported/vcpkg/ports/freetype/portfile.cmake b/external_imported/vcpkg/ports/freetype/portfile.cmake
index 0639955c0..eb98a43e5 100644
--- a/external_imported/vcpkg/ports/freetype/portfile.cmake
+++ b/external_imported/vcpkg/ports/freetype/portfile.cmake
@@ -1,17 +1,14 @@
-set(FT_VERSION 2.12.1)
-
 vcpkg_from_sourceforge(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO freetype/freetype2
-    REF ${FT_VERSION}
-    FILENAME freetype-${FT_VERSION}.tar.xz
-    SHA512 6482de1748dc2cc01e033d21a3b492dadb1f039d13d9179685fdcf985e24d7f587cbca4c27ed8a7fdb7d9ad59612642ac5f4db062443154753295363f45c052f
+    REF "${VERSION}"
+    FILENAME freetype-${VERSION}.tar.xz
+    SHA512 a5917edaa45cb9f75786f8a4f9d12fdf07529247e09dfdb6c0cf7feb08f7588bb24f7b5b11425fb47f8fd62fcb426e731c944658f6d5a59ce4458ad5b0a50194
     PATCHES
         0003-Fix-UWP.patch
         brotli-static.patch
         bzip2.patch
         fix-exports.patch
-        error-strings.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -74,6 +71,14 @@ vcpkg_fixup_pkgconfig()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
+if(VCPKG_TARGET_IS_WINDOWS)
+  set(dll_linkage 1)
+  if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    set(dll_linkage 0)
+  endif()
+  vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/freetype/config/public-macros.h" "#elif defined( DLL_IMPORT )" "#elif ${dll_linkage}")
+endif()
+
 configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake"
     "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY)
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/freetype/vcpkg-cmake-wrapper.cmake b/external_imported/vcpkg/ports/freetype/vcpkg-cmake-wrapper.cmake
index ee332c3c6..0a713d061 100644
--- a/external_imported/vcpkg/ports/freetype/vcpkg-cmake-wrapper.cmake
+++ b/external_imported/vcpkg/ports/freetype/vcpkg-cmake-wrapper.cmake
@@ -2,7 +2,38 @@ cmake_policy(PUSH)
 cmake_policy(SET CMP0012 NEW)
 cmake_policy(SET CMP0054 NEW)
 
-_find_package(${ARGS})
+list(REMOVE_ITEM ARGS "NO_MODULE" "CONFIG" "MODULE")
+_find_package(${ARGS} CONFIG)
+
+if(Freetype_FOUND)
+    include("${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake")
+
+    get_target_property(_freetype_include_dirs freetype INTERFACE_INCLUDE_DIRECTORIES)
+
+    if (CMAKE_SYSTEM_NAME STREQUAL "Windows" OR CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+        get_target_property(_freetype_location_debug freetype IMPORTED_IMPLIB_DEBUG)
+        get_target_property(_freetype_location_release freetype IMPORTED_IMPLIB_RELEASE)
+    endif()
+    if(NOT _freetype_location_debug AND NOT _freetype_location_release)
+        get_target_property(_freetype_location_debug freetype IMPORTED_LOCATION_DEBUG)
+        get_target_property(_freetype_location_release freetype IMPORTED_LOCATION_RELEASE)
+    endif()
+
+    set(FREETYPE_FOUND TRUE)
+
+    set(FREETYPE_INCLUDE_DIRS "${_freetype_include_dirs}")
+    set(FREETYPE_INCLUDE_DIR_ft2build "${_freetype_include_dirs}")
+    set(FREETYPE_INCLUDE_DIR_freetype2 "${_freetype_include_dirs}")
+    set(FREETYPE_LIBRARY_DEBUG "${_freetype_location_debug}" CACHE INTERNAL "vcpkg")
+    set(FREETYPE_LIBRARY_RELEASE "${_freetype_location_release}" CACHE INTERNAL "vcpkg")
+    select_library_configurations(FREETYPE)
+    set(FREETYPE_LIBRARIES ${FREETYPE_LIBRARY})
+    set(FREETYPE_VERSION_STRING "${Freetype_VERSION}")
+
+    unset(_freetype_include_dirs)
+    unset(_freetype_location_debug)
+    unset(_freetype_location_release)
+endif()
 
 if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
     if("@FT_REQUIRE_ZLIB@")
diff --git a/external_imported/vcpkg/ports/freetype/vcpkg.json b/external_imported/vcpkg/ports/freetype/vcpkg.json
index 42639756f..cfb9c3c44 100644
--- a/external_imported/vcpkg/ports/freetype/vcpkg.json
+++ b/external_imported/vcpkg/ports/freetype/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "freetype",
-  "version": "2.12.1",
-  "port-version": 3,
+  "version": "2.13.2",
   "description": "A library to render fonts.",
   "homepage": "https://www.freetype.org/",
   "license": "FTL OR GPL-2.0-or-later",
diff --git a/external_imported/vcpkg/ports/freexl/dependencies.patch b/external_imported/vcpkg/ports/freexl/dependencies.patch
new file mode 100644
index 000000000..e6c414753
--- /dev/null
+++ b/external_imported/vcpkg/ports/freexl/dependencies.patch
@@ -0,0 +1,47 @@
+diff --git a/configure.ac b/configure.ac
+index d79099f..a820b17 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -66,10 +66,12 @@ AC_CONFIG_FILES([Makefile \
+ AC_CHECK_HEADERS(iconv.h,, [AC_MSG_ERROR([cannot find iconv.h, bailing out])])
+ # on some systems "iconv()" lives in libc. On others it lives in libiconv
+ #  on older systems "libiconv()" lives in libiconv
++SAVED_LIBS="${LIBS}"
+ AC_SEARCH_LIBS(iconv,iconv,,
+ 	AC_SEARCH_LIBS(libiconv,iconv,,AC_MSG_ERROR(['libiconv' is required but it doesn't seem to be installed on this system.]),))
+ AC_SEARCH_LIBS(locale_charset,charset,,
+ 	AC_SEARCH_LIBS(nl_langinfo,c,,AC_MSG_ERROR(['libcharset' is required but it doesn't seem to be installed on this system.]),))
++AC_SUBST(ICONV_LIBS, "${LIBS%${SAVED_LIBS}}")
+ 
+ #-----------------------------------------------------------------------
+ #   --enable-xmldocs
+@@ -77,14 +79,14 @@ AC_SEARCH_LIBS(locale_charset,charset,,
+ AC_ARG_ENABLE(xmldocs, [AS_HELP_STRING(
+   [--enable-xmldocs], [enables XML documents support [default=yes]])],
+   [], [enable_xmldocs=yes])
++PKG_PROG_PKG_CONFIG
+ if test x"$enable_xmldocs" != "xyes"; then
+   AC_DEFINE(OMIT_XMLDOC)
+ else
+-AC_CHECK_HEADERS(minizip/unzip.h,, [AC_MSG_ERROR([cannot find minizip/unzip.h, bailing out])])
+-AC_SEARCH_LIBS(unzLocateFile, minizip,,AC_MSG_ERROR(['libminizip' is required but it doesn't seem to be installed on this system.]))
+-
+-AC_CHECK_HEADERS(expat.h,, [AC_MSG_ERROR([cannot find expat.h, bailing out])])
+-AC_CHECK_LIB(expat,XML_ParserCreate,,AC_MSG_ERROR(['expat' is required but it doesn't seem to be installed on this system.]))
++  PKG_CHECK_MODULES(MINIZIP, [minizip], [], [AC_MSG_ERROR([[minizip is required]])])
++  PKG_CHECK_MODULES(EXPAT, [expat], [], [AC_MSG_ERROR([[expat is required]])])
++  CFLAGS="${EXPAT_CFLAGS} ${MINIZIP_CFLAGS} ${CFLAGS}"
++  LIBS="${EXPAT_LIBS} ${MINIZIP_LIBS} ${LIBS}"
+ fi
+ #-----------------------------------------------------------------------
+ 
+diff --git a/freexl.pc.in b/freexl.pc.in
+index 5813e68..4393590 100644
+--- a/freexl.pc.in
++++ b/freexl.pc.in
+@@ -10,3 +10,5 @@ Description: a simple library extracting data from .xls (Excel BIFF) files
+ Version: @VERSION@
+ Libs: -L${libdir} -lfreexl -lm
+ Cflags: -I${includedir} 
++Libs.private: @ICONV_LIBS@
++Requires.private: expat minizip
diff --git a/external_imported/vcpkg/ports/freexl/fix-makefiles.patch b/external_imported/vcpkg/ports/freexl/fix-makefiles.patch
deleted file mode 100644
index f6e8251c7..000000000
--- a/external_imported/vcpkg/ports/freexl/fix-makefiles.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/makefile.vc b/makefile.vc
-index cb8bd36..85c0352 100644
---- a/makefile.vc
-+++ b/makefile.vc
-@@ -23,9 +23,9 @@ freexl.lib:	$(LIBOBJ)
- $(FREEXL_DLL):	freexl_i.lib
- 
- freexl_i.lib:	$(LIBOBJ)
--	link /debug /dll /out:$(FREEXL_DLL) \
-+	link $(LINK_FLAGS) /dll /out:$(FREEXL_DLL) \
- 		/implib:freexl_i.lib $(LIBOBJ) \
--		C:\OSGeo4w\lib\iconv.lib
-+		$(LIBS_ALL)
- 	if exist $(FREEXL_DLL).manifest mt -manifest \
- 		$(FREEXL_DLL).manifest -outputresource:$(FREEXL_DLL);2 
- 
diff --git a/external_imported/vcpkg/ports/freexl/fix-pc-file.patch b/external_imported/vcpkg/ports/freexl/fix-pc-file.patch
deleted file mode 100644
index 5a429026d..000000000
--- a/external_imported/vcpkg/ports/freexl/fix-pc-file.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index a44dbf4..55bd768 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -64,9 +64,11 @@ AC_CONFIG_FILES([Makefile \
- AC_CHECK_HEADERS(iconv.h,, [AC_MSG_ERROR([cannot find iconv.h, bailing out])])
- # on some systems "iconv()" lives in libc. On others it lives in libiconv
- #  on older systems "libiconv()" lives in libiconv
-+SAVED_LIBS="${LIBS}"
- AC_SEARCH_LIBS(iconv,iconv,,
- 	AC_SEARCH_LIBS(libiconv,iconv,,AC_MSG_ERROR(['libiconv' is required but it doesn't seem to be installed on this system.]),))
- AC_SEARCH_LIBS(locale_charset,charset,,
- 	AC_SEARCH_LIBS(nl_langinfo,c,,AC_MSG_ERROR(['libcharset' is required but it doesn't seem to be installed on this system.]),))
-+AC_SUBST(ICONV_LIBS, "${LIBS%${SAVED_LIBS}}")
- 
- AC_OUTPUT
-
-diff --git a/freexl.pc.in b/freexl.pc.in
-index 5813e68..8fc671d 100644
---- a/freexl.pc.in
-+++ b/freexl.pc.in
-@@ -10,3 +10,4 @@ Description: a simple library extracting data from .xls (Excel BIFF) files
- Version: @VERSION@
- Libs: -L${libdir} -lfreexl -lm
- Cflags: -I${includedir} 
-+Libs.private: @ICONV_LIBS@
diff --git a/external_imported/vcpkg/ports/freexl/fix-sources.patch b/external_imported/vcpkg/ports/freexl/fix-sources.patch
deleted file mode 100644
index ffac02751..000000000
--- a/external_imported/vcpkg/ports/freexl/fix-sources.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/config-msvc.h b/config-msvc.h
-index a39d4e7..37f1c0b 100644
---- a/config-msvc.h
-+++ b/config-msvc.h
-@@ -66,7 +66,7 @@
- #define HAVE_SYS_TYPES_H 1
- 
- /* Define to 1 if you have the <unistd.h> header file. */
--#define HAVE_UNISTD_H 1
-+#undef HAVE_UNISTD_H
- 
- /* Define to 1 if `lstat' dereferences a symlink specified with a trailing
-    slash. */
diff --git a/external_imported/vcpkg/ports/freexl/portfile.cmake b/external_imported/vcpkg/ports/freexl/portfile.cmake
index 0e2e405d1..285dd03c4 100644
--- a/external_imported/vcpkg/ports/freexl/portfile.cmake
+++ b/external_imported/vcpkg/ports/freexl/portfile.cmake
@@ -1,18 +1,15 @@
-set(FREEXL_VERSION_STR "1.0.6")
-
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://www.gaia-gis.it/gaia-sins/freexl-sources/freexl-${FREEXL_VERSION_STR}.tar.gz"
-    FILENAME "freexl-${FREEXL_VERSION_STR}.tar.gz"
-    SHA512 efbbe261e57d5c05167ad8e1d5a5b348a7e702c0a4030b18dd2a8c60a38332caccbb073ff604bdf5bafac827310b41c7b79f9fa519ea512d6de2eafd9c1f71f6
+    URLS "https://www.gaia-gis.it/gaia-sins/freexl-sources/freexl-${VERSION}.tar.gz"
+    FILENAME "freexl-${VERSION}.tar.gz"
+    SHA512 663ccc321c2f0dcab8ad9255b2a77066c2046d531a0aa723fb114301fa27b53bf980787dd2548c46541036eceef988c5eedf2bec053adf628929470e67ddc17a
 )
 
-vcpkg_extract_source_archive_ex(
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
-    OUT_SOURCE_PATH SOURCE_PATH
     PATCHES
-        fix-makefiles.patch
-        fix-sources.patch
-        fix-pc-file.patch
+        dependencies.patch
+        subdirs.patch
 )
 
 vcpkg_configure_make(
@@ -22,19 +19,13 @@ vcpkg_configure_make(
 vcpkg_install_make()
 
 if(VCPKG_TARGET_IS_WINDOWS)
-    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-        set(includedir [[${prefix}/include]])
-        set(outfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/freexl.pc")
-        vcpkg_replace_string("${outfile}" " -lm" " -liconv -lcharset")
-    endif()
-    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-        set(includedir [[${prefix}/../include]])
-        set(outfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/freexl.pc")
-        vcpkg_replace_string("${outfile}" " -lm" " -liconv -lcharset")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/freexl.pc" " -lm" " -liconv -lcharset")
+    if(NOT DEFINED VCPKG_BUILD_TYPE)
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/freexl.pc" " -lm" " -liconv -lcharset")
     endif()
 endif()
-
 vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/freexl/subdirs.patch b/external_imported/vcpkg/ports/freexl/subdirs.patch
new file mode 100644
index 000000000..3beb11526
--- /dev/null
+++ b/external_imported/vcpkg/ports/freexl/subdirs.patch
@@ -0,0 +1,12 @@
+diff --git a/Makefile.am b/Makefile.am
+index 50dc7f6..cbc99ca 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,6 +1,6 @@
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-SUBDIRS = headers src tests examples
++SUBDIRS = headers src
+ 
+ EXTRA_DIST = makefile.vc nmake.opt makefile64.vc nmake64.opt \
+ 	images/piazza.jpg images/piazza.eps mainpage.doxy config-msvc.h
diff --git a/external_imported/vcpkg/ports/freexl/vcpkg.json b/external_imported/vcpkg/ports/freexl/vcpkg.json
index ccb91f1f1..04cf20761 100644
--- a/external_imported/vcpkg/ports/freexl/vcpkg.json
+++ b/external_imported/vcpkg/ports/freexl/vcpkg.json
@@ -1,10 +1,12 @@
 {
   "name": "freexl",
-  "version": "1.0.6",
-  "port-version": 1,
+  "version": "2.0.0",
   "description": "FreeXL is an open source library to extract valid data from within an Excel (.xls) spreadsheet",
   "homepage": "https://www.gaia-gis.it/gaia-sins/freexl-sources",
+  "license": "MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later",
   "dependencies": [
-    "libiconv"
+    "expat",
+    "libiconv",
+    "minizip"
   ]
 }
diff --git a/external_imported/vcpkg/ports/fribidi/portfile.cmake b/external_imported/vcpkg/ports/fribidi/portfile.cmake
index b112c046c..ce8ef5869 100644
--- a/external_imported/vcpkg/ports/fribidi/portfile.cmake
+++ b/external_imported/vcpkg/ports/fribidi/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO fribidi/fribidi
-    REF v1.0.12
-    SHA512 a3a63e1dde1cffb097376df0b34522700cff600da61bdafd6f4f50db6937383b9f73a82081cb1a7f2e1946ba07fea13e2880a4250b1508850bffa500046a7fa5
+    REF v${VERSION}
+    SHA512 246c904f8e6cc7eee61c03162b42dd0e0ed2163ef02d9d15b8168f0084ccdd9b625b83092915fa42f301106247e3159ad6aee0af42c37643253f7c47d0a520ef
     HEAD_REF master
     PATCHES meson-crosscompile.patch
 )
@@ -30,13 +30,11 @@ vcpkg_fixup_pkgconfig()
 vcpkg_copy_pdbs()
 
 # Define static macro
-file(READ "${CURRENT_PACKAGES_DIR}/include/fribidi/fribidi-common.h" FRIBIDI_COMMON_H)
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    string(REPLACE "#ifndef FRIBIDI_LIB_STATIC" "#if 0" FRIBIDI_COMMON_H "${FRIBIDI_COMMON_H}")
+	vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/fribidi/fribidi-common.h" "# elif defined(_WIN32) && ! defined(FRIBIDI_LIB_STATIC)" "# elif defined(_WIN32) && 0")
 else()
-    string(REPLACE "#ifndef FRIBIDI_LIB_STATIC" "#if 1" FRIBIDI_COMMON_H "${FRIBIDI_COMMON_H}")
+	vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/fribidi/fribidi-common.h" "# elif defined(_WIN32) && ! defined(FRIBIDI_LIB_STATIC)" "# elif defined(_WIN32) && 1")
 endif()
-file(WRITE "${CURRENT_PACKAGES_DIR}/include/fribidi/fribidi-common.h" "${FRIBIDI_COMMON_H}")
 
 if(VCPKG_CROSSCOMPILING)
     file(
@@ -53,4 +51,4 @@ endif()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 # Handle copyright
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/fribidi/vcpkg.json b/external_imported/vcpkg/ports/fribidi/vcpkg.json
index 0b28f86bc..9428b3659 100644
--- a/external_imported/vcpkg/ports/fribidi/vcpkg.json
+++ b/external_imported/vcpkg/ports/fribidi/vcpkg.json
@@ -1,7 +1,8 @@
 {
   "name": "fribidi",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "description": "GNU FriBidi is an implementation of the Unicode Bidirectional Algorithm (bidi)",
+  "license": "LGPL-2.1-or-later",
   "supports": "!uwp",
   "dependencies": [
     {
diff --git a/external_imported/vcpkg/ports/frugally-deep/portfile.cmake b/external_imported/vcpkg/ports/frugally-deep/portfile.cmake
index 883883f4e..93405d0bc 100644
--- a/external_imported/vcpkg/ports/frugally-deep/portfile.cmake
+++ b/external_imported/vcpkg/ports/frugally-deep/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Dobiasd/frugally-deep
-    REF v0.15.19-p0
-    SHA512 3721ab90fcae975497346c459ad5c75b7a39fc43caddd0251119888834e6ebcfa75048a4f95104c874f5397e0320e97c345f1ae8d6a730c4dc8e5429f8f46a49
+    REF "v${VERSION}"
+    SHA512 ec31a174a1a13d572d7cfce4a1773964cc185c1acaf91250bc8038cd9eba77f864fe9fd592a39648de8c620f02375142344f70c9663613ab1b406df1c68e6cb1
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/frugally-deep/vcpkg.json b/external_imported/vcpkg/ports/frugally-deep/vcpkg.json
index e41b9ad6a..358c6dd0d 100644
--- a/external_imported/vcpkg/ports/frugally-deep/vcpkg.json
+++ b/external_imported/vcpkg/ports/frugally-deep/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "frugally-deep",
-  "version-semver": "0.15.19-p0",
+  "version-semver": "0.15.30",
   "description": "Header-only library for using Keras models in C++.",
   "homepage": "https://github.com/Dobiasd/frugally-deep",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/fruit/portfile.cmake b/external_imported/vcpkg/ports/fruit/portfile.cmake
index c4bf8ed31..8bab51d71 100644
--- a/external_imported/vcpkg/ports/fruit/portfile.cmake
+++ b/external_imported/vcpkg/ports/fruit/portfile.cmake
@@ -2,8 +2,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/fruit
-    REF v3.7.0
-    SHA512 6a18f2740fc52672de49f082b5a21d0a236520da83e77806935baca5d5a0b41f75f1d1b6729cad13fc77b0f033d7d8d2158fd58b1e565a7662bd80dc7eb63ba1
+    REF "v${VERSION}"
+    SHA512 82e86b939ce7d1c0f092255211cd0825e7cf96e56b4af44dcbb67c863c41cb398afbbf9098a934b7eea848acc0b48d3dee3a67cf907f9b9ef2a0d59d92507f30
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/fruit/vcpkg.json b/external_imported/vcpkg/ports/fruit/vcpkg.json
index d72d26513..547568996 100644
--- a/external_imported/vcpkg/ports/fruit/vcpkg.json
+++ b/external_imported/vcpkg/ports/fruit/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "fruit",
-  "version": "3.7.0",
+  "version": "3.7.1",
   "description": "Fruit, a dependency injection framework for C++ by Google",
   "homepage": "https://github.com/google/fruit",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/ftxui/portfile.cmake b/external_imported/vcpkg/ports/ftxui/portfile.cmake
index 33bb04364..e5dac5758 100644
--- a/external_imported/vcpkg/ports/ftxui/portfile.cmake
+++ b/external_imported/vcpkg/ports/ftxui/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ArthurSonzogni/FTXUI
     REF "v${VERSION}"
-    SHA512 989afc109e31fa083f5d953d199dc7f4515daaee7014ec1616b48bc66ff49643bc32e5cdd273016a1d44f6921f6031d1e7e41fc2375cfee44fc719223baaaa7b
+    SHA512 be5ed7f2b3c90a7de874115a131c75c69ad9dd6db4c3bc0cfd7036cfe449b8d16af3df8f1aa1bcb057347bd726837e3f1c42e30a06cf3ad34b50e7bd26ba4883
     HEAD_REF master
 )
 
@@ -21,6 +21,8 @@ vcpkg_cmake_install()
 
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
 
+vcpkg_fixup_pkgconfig()
+
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
 
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/ftxui/vcpkg.json b/external_imported/vcpkg/ports/ftxui/vcpkg.json
index e4ea817f4..ebcc09be9 100644
--- a/external_imported/vcpkg/ports/ftxui/vcpkg.json
+++ b/external_imported/vcpkg/ports/ftxui/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "ftxui",
-  "version-semver": "4.0.0",
+  "version-semver": "5.0.0",
   "description": "C++ Functional Terminal User Interface",
   "homepage": "https://github.com/ArthurSonzogni/FTXUI",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/function2/portfile.cmake b/external_imported/vcpkg/ports/function2/portfile.cmake
index 4f59aa935..b0dbb4061 100644
--- a/external_imported/vcpkg/ports/function2/portfile.cmake
+++ b/external_imported/vcpkg/ports/function2/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Naios/function2
-    REF 2d3a878ef19dd5d2fb188898513610fac0a48621 # 4.2.2
-    SHA512 e59c6fe7f4b68d4d70d1b0ccb3677ee5529e08431ee642933a4de1b217390d3a91f6501f06d0da080af85a5cb55da5b48c6de92818779ac25c6f56166a5b59fd
+    REF "${VERSION}"
+    SHA512 a70cc4d5cdcd9a108c930ef6f18662f649405b2c6d0c0e25526af555392503f467bfa7755d0f00651ad61c339102315cc2a1c9354326433bfaa3f8110517a79c
     HEAD_REF master
     PATCHES
         disable-testing.patch
diff --git a/external_imported/vcpkg/ports/function2/vcpkg.json b/external_imported/vcpkg/ports/function2/vcpkg.json
index 859fa9b35..e41ff0c0c 100644
--- a/external_imported/vcpkg/ports/function2/vcpkg.json
+++ b/external_imported/vcpkg/ports/function2/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "function2",
-  "version-semver": "4.2.2",
+  "version-semver": "4.2.4",
   "description": "Improved drop-in replacement to std::function",
   "homepage": "https://github.com/Naios/function2",
   "license": "BSL-1.0",
diff --git a/external_imported/vcpkg/ports/functions-framework-cpp/fix-integral-include.patch b/external_imported/vcpkg/ports/functions-framework-cpp/fix-integral-include.patch
new file mode 100644
index 000000000..063585356
--- /dev/null
+++ b/external_imported/vcpkg/ports/functions-framework-cpp/fix-integral-include.patch
@@ -0,0 +1,12 @@
+diff --git a/google/cloud/functions/internal/parse_options.cc b/google/cloud/functions/internal/parse_options.cc
+index ba3a2b5..54daf29 100644
+--- a/google/cloud/functions/internal/parse_options.cc
++++ b/google/cloud/functions/internal/parse_options.cc
+@@ -17,6 +17,7 @@
+ #include <iostream>
+ #include <limits>
+ #include <stdexcept>
++#include <cstdint>
+ 
+ namespace google::cloud::functions_internal {
+ FUNCTIONS_FRAMEWORK_CPP_INLINE_NAMESPACE_BEGIN
diff --git a/external_imported/vcpkg/ports/functions-framework-cpp/portfile.cmake b/external_imported/vcpkg/ports/functions-framework-cpp/portfile.cmake
index 89123d06a..4567e13fb 100644
--- a/external_imported/vcpkg/ports/functions-framework-cpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/functions-framework-cpp/portfile.cmake
@@ -4,28 +4,28 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO GoogleCloudPlatform/functions-framework-cpp
-    REF v1.1.0
-    SHA512 2dcedbded84fdd604724b4f2482ee531aaa640ebdbb69f77978e1af8943d9d7746152953953ebd89d8304ed3efbc334c620890142b0ba2e1239862e43a158364
+    REF "v${VERSION}"
+    SHA512 3832e205a2505152ed6955d7cf5630b2045133221ddd96e2bef62e66cad58cea326f32428e2f494bbe1a10f5d66453d09ae46e6b972a7ed13f211efbb79527a8
     HEAD_REF main
+    PATCHES fix-integral-include.patch
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE
     OPTIONS
         -DBUILD_TESTING=OFF
 )
 
-vcpkg_install_cmake(ADD_BIN_TO_PATH)
+vcpkg_cmake_install(ADD_BIN_TO_PATH)
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+vcpkg_cmake_config_fixup(PACKAGE_NAME functions_framework_cpp CONFIG_PATH lib/cmake/functions_framework_cpp)
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(
-    INSTALL ${SOURCE_PATH}/LICENSE
-    DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
+    INSTALL "${SOURCE_PATH}/LICENSE"
+    DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
     RENAME copyright)
 
 vcpkg_copy_pdbs()
diff --git a/external_imported/vcpkg/ports/functions-framework-cpp/vcpkg.json b/external_imported/vcpkg/ports/functions-framework-cpp/vcpkg.json
index 162cb6b8a..007fbf2dd 100644
--- a/external_imported/vcpkg/ports/functions-framework-cpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/functions-framework-cpp/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "functions-framework-cpp",
-  "version": "1.1.0",
-  "port-version": 1,
+  "version": "1.2.0",
   "description": "Functions Framework for C++.",
   "homepage": "https://github.com/GoogleCloudPlatform/functions-framework-cpp/",
   "license": "Apache-2.0",
@@ -11,6 +10,14 @@
     "boost-beast",
     "boost-program-options",
     "boost-serialization",
-    "nlohmann-json"
+    "nlohmann-json",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ]
 }
diff --git a/external_imported/vcpkg/ports/fxdiv/portfile.cmake b/external_imported/vcpkg/ports/fxdiv/portfile.cmake
index a62cefcd8..06eaa4b7e 100644
--- a/external_imported/vcpkg/ports/fxdiv/portfile.cmake
+++ b/external_imported/vcpkg/ports/fxdiv/portfile.cmake
@@ -5,14 +5,14 @@ vcpkg_from_github(
     REF 63058eff77e11aa15bf531df5dd34395ec3017c8
     SHA512 da33eab4d006645f383a1f24fc3e747db3aeb0613219297ec0ae69aa2617f07ba050ebd6a64a8cbde6d25481f176d0ec3b9753a95d1fbcead2136595f3e50e97
 )
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DFXDIV_BUILD_TESTS=OFF
         -DFXDIV_BUILD_BENCHMARKS=OFF
 )
-vcpkg_install_cmake()
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
diff --git a/external_imported/vcpkg/ports/fxdiv/vcpkg.json b/external_imported/vcpkg/ports/fxdiv/vcpkg.json
index e120815ee..444f5243e 100644
--- a/external_imported/vcpkg/ports/fxdiv/vcpkg.json
+++ b/external_imported/vcpkg/ports/fxdiv/vcpkg.json
@@ -1,6 +1,13 @@
 {
   "name": "fxdiv",
-  "version-string": "2021-02-21",
+  "version-date": "2021-02-21",
+  "port-version": 2,
   "description": "C99/C++ header-only library for division via fixed-point multiplication by inverse",
-  "homepage": "https://github.com/Maratyszcza/FXdiv"
+  "homepage": "https://github.com/Maratyszcza/FXdiv",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/g2o/portfile.cmake b/external_imported/vcpkg/ports/g2o/portfile.cmake
index 010a10ccf..d5efce4c3 100644
--- a/external_imported/vcpkg/ports/g2o/portfile.cmake
+++ b/external_imported/vcpkg/ports/g2o/portfile.cmake
@@ -8,20 +8,19 @@ vcpkg_from_github(
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_LGPL_SHARED_LIBS)
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DBUILD_LGPL_SHARED_LIBS=${BUILD_LGPL_SHARED_LIBS}
         -DG2O_BUILD_EXAMPLES=OFF
         -DG2O_BUILD_APPS=OFF
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
 vcpkg_copy_pdbs()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/g2o)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/g2o)
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     file(GLOB_RECURSE HEADERS "${CURRENT_PACKAGES_DIR}/include/*")
@@ -32,12 +31,12 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     endforeach()
 endif()
 
-file(GLOB EXE ${CURRENT_PACKAGES_DIR}/bin/*.exe)
-file(GLOB DEBUG_EXE ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe)
+file(GLOB EXE "${CURRENT_PACKAGES_DIR}/bin/*.exe")
+file(GLOB DEBUG_EXE "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe")
 if(EXE OR DEBUG_EXE)
     file(REMOVE ${EXE} ${DEBUG_EXE})
 endif()
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-file(INSTALL ${SOURCE_PATH}/doc/license-bsd.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/doc/license-bsd.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/external_imported/vcpkg/ports/g2o/vcpkg.json b/external_imported/vcpkg/ports/g2o/vcpkg.json
index b81b5d65c..9afc73a9d 100644
--- a/external_imported/vcpkg/ports/g2o/vcpkg.json
+++ b/external_imported/vcpkg/ports/g2o/vcpkg.json
@@ -1,13 +1,21 @@
 {
   "name": "g2o",
-  "version-string": "2020-02-07",
-  "port-version": 2,
+  "version-date": "2020-02-07",
+  "port-version": 4,
   "description": "g2o: A General Framework for Graph Optimization",
   "homepage": "https://openslam.org/g2o.html",
   "dependencies": [
     "ceres",
     "eigen3",
     "lapack",
-    "suitesparse"
+    "suitesparse",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ]
 }
diff --git a/external_imported/vcpkg/ports/g3log/portfile.cmake b/external_imported/vcpkg/ports/g3log/portfile.cmake
index 123925ef6..0456fd485 100644
--- a/external_imported/vcpkg/ports/g3log/portfile.cmake
+++ b/external_imported/vcpkg/ports/g3log/portfile.cmake
@@ -2,8 +2,8 @@ vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KjellKod/g3log
-    REF 6f6da0ed2a8b42b8a5d1a416fe1646fe45e45c99
-    SHA512 65d966e0cb35ae6903619349520f12abf473c98ce6c9ffcb9b196b0be5d2b75ee5b716eeec8285ddc909f65049d8feab9389347c28be376b46cdb0d9246ffbbd
+    REF "${VERSION}"
+    SHA512 cf88bd604a82dd4cd2d2677bbda6f495f4357157d693125cd0df45f84b1976fc6b9dba9eddb5e9ae105e4fc15665ae37c86e9c02aba93d4bb7ba668c88bfddb9
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/g3log/vcpkg.json b/external_imported/vcpkg/ports/g3log/vcpkg.json
index 4e714a43e..20b7610f6 100644
--- a/external_imported/vcpkg/ports/g3log/vcpkg.json
+++ b/external_imported/vcpkg/ports/g3log/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "g3log",
-  "version": "2.1",
+  "version": "2.3",
+  "port-version": 1,
   "description": "Asynchronous logger with Dynamic Sinks",
   "homepage": "https://github.com/KjellKod/g3log",
   "license": "Unlicense",
diff --git a/external_imported/vcpkg/ports/gamedev-framework/portfile.cmake b/external_imported/vcpkg/ports/gamedev-framework/portfile.cmake
index 989a1cf80..31f5e798f 100644
--- a/external_imported/vcpkg/ports/gamedev-framework/portfile.cmake
+++ b/external_imported/vcpkg/ports/gamedev-framework/portfile.cmake
@@ -6,8 +6,8 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO GamedevFramework/gf
     HEAD_REF master
-    REF v1.0.0
-    SHA512 daa6808500e4259152b8173d6f289964d2e0807f434ec25a378575a0160de7c739ce8f483b157b734a1d5726720db6a22212ec2ef803ff567a51ed8a6822cfd7
+    REF v1.2.0
+    SHA512 2043d0b015af7127887df44a9e2e035000c93c20a713d7297736fb05e46923684e330c7a541a115c110ea8737f0ddbfb0c0ef13498102732cfb2a4b243fd22cd
 )
 
 vcpkg_cmake_configure(
@@ -17,8 +17,8 @@ vcpkg_cmake_configure(
         -DGF_BUILD_GAMES=OFF
         -DGF_BUILD_EXAMPLES=OFF
         -DGF_BUILD_DOCUMENTATION=OFF
-        -DGF_SINGLE_COMPILTATION_UNIT=ON
         -DBUILD_TESTING=OFF
+        -DCMAKE_UNITY_BUILD=ON
         -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
     OPTIONS_RELEASE -DGF_DEBUG=OFF
     OPTIONS_DEBUG -DGF_DEBUG=ON
diff --git a/external_imported/vcpkg/ports/gamedev-framework/vcpkg.json b/external_imported/vcpkg/ports/gamedev-framework/vcpkg.json
index 0f2d9c019..17bcae7c3 100644
--- a/external_imported/vcpkg/ports/gamedev-framework/vcpkg.json
+++ b/external_imported/vcpkg/ports/gamedev-framework/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "gamedev-framework",
-  "version-semver": "1.0.0",
+  "version-semver": "1.2.0",
   "maintainers": [
     "Julien Bernard <julien.bernard@univ-fcomte.fr>",
     "Arthur Hugeat <hugeat.arthur@gmail.com>"
@@ -8,7 +8,7 @@
   "description": "gamedev-framework is a framework to build 2D games in C++17",
   "homepage": "https://gamedevframework.github.io/",
   "license": "Zlib",
-  "supports": "!arm",
+  "supports": "!arm & !android",
   "dependencies": [
     "boost-algorithm",
     "boost-container",
diff --git a/external_imported/vcpkg/ports/games101-cgl/portfile.cmake b/external_imported/vcpkg/ports/games101-cgl/portfile.cmake
new file mode 100644
index 000000000..708d56b62
--- /dev/null
+++ b/external_imported/vcpkg/ports/games101-cgl/portfile.cmake
@@ -0,0 +1,21 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO endingly/games101-cgl
+    REF v${VERSION}
+    SHA512  609bc549a5bb20254fa8ae8a765b688352d017bf4f1fa278385b534da3c75eb81fc893dd1736db7efd0ab13c62de3597ccb678a3c2a6f31c0ee6549f6d5c9f3d
+    HEAD_REF main
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+)
+
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+vcpkg_cmake_config_fixup()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/license")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/games101-cgl/usage b/external_imported/vcpkg/ports/games101-cgl/usage
new file mode 100644
index 000000000..77f4156d8
--- /dev/null
+++ b/external_imported/vcpkg/ports/games101-cgl/usage
@@ -0,0 +1,7 @@
+The package games101-cgl provides CMake targets:
+
+    find_package(games101-cgl CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE games101-cgl)
+    
+    And include header file like:
+        #include <CGL/CGL.h>
diff --git a/external_imported/vcpkg/ports/games101-cgl/vcpkg.json b/external_imported/vcpkg/ports/games101-cgl/vcpkg.json
new file mode 100644
index 000000000..d17b44b8f
--- /dev/null
+++ b/external_imported/vcpkg/ports/games101-cgl/vcpkg.json
@@ -0,0 +1,21 @@
+{
+  "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
+  "name": "games101-cgl",
+  "version": "0.1.0",
+  "description": "The package is for Games101's homework8 subproject.",
+  "homepage": "https://github.com/endingly/games101-cgl",
+  "license": "MIT",
+  "dependencies": [
+    "freetype",
+    "glew",
+    "glfw3",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/gamma/portfile.cmake b/external_imported/vcpkg/ports/gamma/portfile.cmake
index 0437842d8..f004b443a 100644
--- a/external_imported/vcpkg/ports/gamma/portfile.cmake
+++ b/external_imported/vcpkg/ports/gamma/portfile.cmake
@@ -10,16 +10,15 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=1
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/external_imported/vcpkg/ports/gamma/vcpkg.json b/external_imported/vcpkg/ports/gamma/vcpkg.json
index 3fcba5d20..1b4606b4f 100644
--- a/external_imported/vcpkg/ports/gamma/vcpkg.json
+++ b/external_imported/vcpkg/ports/gamma/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "gamma",
   "version-string": "gamma-2018-01-27",
-  "port-version": 4,
+  "port-version": 6,
   "description": "Gamma is a cross-platform, C++ library for doing generic synthesis and filtering of signals. It is oriented towards real-time sound and graphics applications, but is equally useful for non-real-time tasks. Gamma is designed to be \"light-footed\" in terms of memory and processing making it highly suitable for plug-in development or embedding in other C++ projects.",
   "homepage": "https://github.com/LancePutnam/Gamma",
   "license": "MIT",
@@ -13,6 +13,10 @@
         "external-libs"
       ]
     },
-    "portaudio"
+    "portaudio",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
   ]
 }
diff --git a/external_imported/vcpkg/ports/gapp/portfile.cmake b/external_imported/vcpkg/ports/gapp/portfile.cmake
new file mode 100644
index 000000000..eae57505e
--- /dev/null
+++ b/external_imported/vcpkg/ports/gapp/portfile.cmake
@@ -0,0 +1,29 @@
+if(VCPKG_TARGET_IS_WINDOWS)
+  vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
+
+vcpkg_from_github(
+  OUT_SOURCE_PATH SOURCE_PATH
+  REPO KRM7/gapp
+  REF "v${VERSION}"
+  SHA512 463d36c3c41d14a9615dc48b43aebfccdf28177db766941607c2bdb2fed9ae5e876ae7b0bca541809503b35e9ce250a5d3b7246342c035f4a079d50539589ac2
+  HEAD_REF master
+)
+
+vcpkg_cmake_configure(
+  SOURCE_PATH "${SOURCE_PATH}"
+  OPTIONS
+    -DGAPP_BUILD_TESTS=OFF
+    -DGAPP_USE_LTO=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/gapp)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc/gapp/api")
+
+configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY)
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/gapp/usage b/external_imported/vcpkg/ports/gapp/usage
new file mode 100644
index 000000000..bcfbbdff6
--- /dev/null
+++ b/external_imported/vcpkg/ports/gapp/usage
@@ -0,0 +1,4 @@
+gapp provides CMake targets:
+
+    find_package(gapp CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE gapp::gapp)
diff --git a/external_imported/vcpkg/ports/gapp/vcpkg.json b/external_imported/vcpkg/ports/gapp/vcpkg.json
new file mode 100644
index 000000000..178b75c8a
--- /dev/null
+++ b/external_imported/vcpkg/ports/gapp/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "gapp",
+  "version": "0.2.0",
+  "description": "A genetic algorithms library in C++ for single- and multi-objective optimization.",
+  "homepage": "https://github.com/KRM7/gapp",
+  "license": "MIT",
+  "supports": "(windows | linux) & !arm",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/gasol/portfile.cmake b/external_imported/vcpkg/ports/gasol/portfile.cmake
index b53522965..25a61d45e 100644
--- a/external_imported/vcpkg/ports/gasol/portfile.cmake
+++ b/external_imported/vcpkg/ports/gasol/portfile.cmake
@@ -11,13 +11,13 @@ vcpkg_from_github(
        fix-install.patch
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/external_imported/vcpkg/ports/gasol/vcpkg.json b/external_imported/vcpkg/ports/gasol/vcpkg.json
index aa06ae3c2..ad2c96493 100644
--- a/external_imported/vcpkg/ports/gasol/vcpkg.json
+++ b/external_imported/vcpkg/ports/gasol/vcpkg.json
@@ -1,8 +1,14 @@
 {
   "name": "gasol",
   "version-date": "2018-01-04",
-  "port-version": 2,
+  "port-version": 4,
   "description": "A general Genetic Algorithm Solver in C++",
   "homepage": "https://github.com/PytLab/GASol",
-  "supports": "!uwp & !arm"
+  "supports": "!uwp & !arm",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/gaussianlib/portfile.cmake b/external_imported/vcpkg/ports/gaussianlib/portfile.cmake
index 45f6b7ff4..f8fdad1ff 100644
--- a/external_imported/vcpkg/ports/gaussianlib/portfile.cmake
+++ b/external_imported/vcpkg/ports/gaussianlib/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO LukasBanana/GaussianLib
-    REF 8630d4ac14a37f01c71bdf0c1c653e3746aa08da
-    SHA512 70de394496f20fe7037782d16cfa4bcd85beefdb25094247b8b572e6bb55866be6e2c82722d705141919b91f24428dde7b32f3d8a39670e7ef324c81b1ebe7e2
+    REF 9b4a163a9a97c900b0febd93e22dc1be3faf6e20
+    SHA512 f16c3cd699e30d3fbd3ef6e80f64716d72383a1f2dc073325f785b63c2ba6edc62e2a7d360eba6a92a42bf4a2ad32accd4ce3e249ee510ff5133745b897a4f55
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/gaussianlib/vcpkg.json b/external_imported/vcpkg/ports/gaussianlib/vcpkg.json
index 81ed9e446..a11709742 100644
--- a/external_imported/vcpkg/ports/gaussianlib/vcpkg.json
+++ b/external_imported/vcpkg/ports/gaussianlib/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "gaussianlib",
-  "version-string": "2019-08-04",
-  "port-version": 1,
+  "version-date": "2023-02-17",
   "description": "Basic linear algebra C++ library for 2D and 3D applications",
   "homepage": "https://github.com/LukasBanana/GaussianLib"
 }
diff --git a/external_imported/vcpkg/ports/gazebo/portfile.cmake b/external_imported/vcpkg/ports/gazebo/portfile.cmake
index bc8559112..c6322c64b 100644
--- a/external_imported/vcpkg/ports/gazebo/portfile.cmake
+++ b/external_imported/vcpkg/ports/gazebo/portfile.cmake
@@ -1,5 +1,5 @@
 vcpkg_download_distfile(gazebo3211
-    URLS "https://patch-diff.githubusercontent.com/raw/osrf/gazebo/pull/3211.diff"
+    URLS "https://patch-diff.githubusercontent.com/raw/osrf/gazebo/pull/3211.diff?full_index=1"
     FILENAME "gazebo3211.diff"
     SHA512 761e254866d4705acc0b81479285f979c436b3b611739a207a575031d8a8daba48de4fc0c8de5edb9a9f89725586c5caeef9e6e1e3d63a2d961ca09df974f7de
 )
diff --git a/external_imported/vcpkg/ports/gazebo/vcpkg.json b/external_imported/vcpkg/ports/gazebo/vcpkg.json
index 6daf4a7a0..44cb54348 100644
--- a/external_imported/vcpkg/ports/gazebo/vcpkg.json
+++ b/external_imported/vcpkg/ports/gazebo/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "gazebo",
   "version-date": "2022-01-20",
-  "port-version": 4,
+  "port-version": 5,
   "description": "Open source robotics simulator.",
   "homepage": "http://gazebosim.org",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/gcem/portfile.cmake b/external_imported/vcpkg/ports/gcem/portfile.cmake
index 79a4894bd..944d36e04 100644
--- a/external_imported/vcpkg/ports/gcem/portfile.cmake
+++ b/external_imported/vcpkg/ports/gcem/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO kthohr/gcem
-    REF v1.16.0
-    SHA512 72b2c2022eabe30607533aee4cc7786646fad4d78733f34383dacf7da9298de40e77b3e3f62b5785fd3821387756858bddc94b16dc918fe5d4778e283ae635be
+    REF "v${VERSION}"
+    SHA512 ffd92b9a413ac248c02ae1c12ce5607cf5ad06920749668dc05d3f3f0beefc5c5827c9585674acd51738da2dd3c2042b8cc41ba6e29ce129edf6d895c5225d0b
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/gcem/vcpkg.json b/external_imported/vcpkg/ports/gcem/vcpkg.json
index f00e0c76d..e7217d6a9 100644
--- a/external_imported/vcpkg/ports/gcem/vcpkg.json
+++ b/external_imported/vcpkg/ports/gcem/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "gcem",
-  "version": "1.16.0",
+  "version": "1.17.0",
   "description": "A C++ compile-time math library using generalized constant expressions",
   "homepage": "https://www.kthohr.com/gcem.html",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/gdal/cmake-project-include.cmake b/external_imported/vcpkg/ports/gdal/cmake-project-include.cmake
index 33ce62b98..409b7b1a6 100644
--- a/external_imported/vcpkg/ports/gdal/cmake-project-include.cmake
+++ b/external_imported/vcpkg/ports/gdal/cmake-project-include.cmake
@@ -1,3 +1,10 @@
+if(GDAL_USE_KEA)
+    find_package(Kealib CONFIG REQUIRED)
+    add_library(KEA::KEA ALIAS Kealib::Kealib)
+    set(GDAL_CHECK_PACKAGE_KEA_NAMES Kealib CACHE INTERNAL "vcpkg")
+    set(GDAL_CHECK_PACKAGE_KEA_TARGETS Kealib::Kealib CACHE INTERNAL "vcpkg")
+endif()
+
 if(GDAL_USE_WEBP)
     find_package(WebP CONFIG REQUIRED)
     add_library(WEBP::WebP ALIAS WebP::webp)
diff --git a/external_imported/vcpkg/ports/gdal/find-link-libraries.patch b/external_imported/vcpkg/ports/gdal/find-link-libraries.patch
index 50bec1eca..8e9c163ef 100644
--- a/external_imported/vcpkg/ports/gdal/find-link-libraries.patch
+++ b/external_imported/vcpkg/ports/gdal/find-link-libraries.patch
@@ -58,7 +58,7 @@ index 3807ec0..8059eb4 100644
    endif()
  endif()
 +if(PC_Poppler_FOUND)
-+    find_path(Poppler_INCLUDE_DIR NAMES Object.h PATHS ${PC_Poppler_INCLUDE_DIRS} NO_DEFAULT_PATH REQUIRED)
++    find_path(Poppler_INCLUDE_DIR NAMES Object.h PATHS ${PC_Poppler_INCLUDE_DIRS} NO_DEFAULT_PATH)
 +    set(Poppler_LIBRARY "${PC_Poppler_LIBRARIES}" CACHE STRING "")
 +    if(NOT TARGET Poppler::Poppler)
 +        add_library(Poppler::Poppler INTERFACE IMPORTED)
diff --git a/external_imported/vcpkg/ports/gdal/portfile.cmake b/external_imported/vcpkg/ports/gdal/portfile.cmake
index d2f8c7aec..740d0eaa1 100644
--- a/external_imported/vcpkg/ports/gdal/portfile.cmake
+++ b/external_imported/vcpkg/ports/gdal/portfile.cmake
@@ -2,16 +2,20 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO OSGeo/gdal
     REF "v${VERSION}"
-    SHA512 1bbaf3a6731a105241cc666afe9c9a0b82e9d46245435d597a7372f928e6966c0e746e94fdd86a8f24c3277912a8c19e76906ee88e5d946ac1c25dd7dd38fdf2
+    SHA512 d834bb1cc891db4e04bdd684a0ac94ef1669c6040ed2e7e248714e00f6ff75dcd6d16c6e99b1084a2279c3b384e9ecfde1e7ed557a0564288fb4a8377f221964
     HEAD_REF master
     PATCHES
         find-link-libraries.patch
         fix-gdal-target-interfaces.patch
         libkml.patch
+        target-is-valid.patch
 )
 # `vcpkg clean` stumbles over one subdir
 file(REMOVE_RECURSE "${SOURCE_PATH}/autotest")
 
+# Avoid abseil, no matter if vcpkg or system
+vcpkg_replace_string("${SOURCE_PATH}/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/base.h" [[__has_include("absl/strings/string_view.h")]] "(0)")
+
 # Cf. cmake/helpers/CheckDependentLibraries.cmake
 # The default for all `GDAL_USE_<PKG>` dependencies is `OFF`.
 # Here, we explicitly control dependencies provided via vpcpkg.
@@ -29,6 +33,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
         iconv            GDAL_USE_ICONV
         jpeg             GDAL_USE_JPEG
         core             GDAL_USE_JSONC
+        kea              GDAL_USE_KEA
         lerc             GDAL_USE_LERC
         libkml           GDAL_USE_LIBKML
         lzma             GDAL_USE_LIBLZMA
@@ -52,6 +57,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
         core             GDAL_USE_ZLIB
         zstd             GDAL_USE_ZSTD
         tools            BUILD_APPS
+    INVERTED_FEATURES
+        libspatialite    CMAKE_DISABLE_FIND_PACKAGE_SPATIALITE
 )
 if(GDAL_USE_ICONV AND VCPKG_TARGET_IS_WINDOWS)
     list(APPEND FEATURE_OPTIONS -D_ICONV_SECOND_ARGUMENT_IS_NOT_CONST=ON)
@@ -76,10 +83,12 @@ vcpkg_cmake_configure(
         -DCMAKE_DISABLE_FIND_PACKAGE_Java=ON
         -DCMAKE_DISABLE_FIND_PACKAGE_JNI=ON
         -DCMAKE_DISABLE_FIND_PACKAGE_SWIG=ON
+        -DCMAKE_DISABLE_FIND_PACKAGE_Arrow=ON
         -DGDAL_USE_INTERNAL_LIBS=OFF
         -DGDAL_USE_EXTERNAL_LIBS=OFF
         -DGDAL_BUILD_OPTIONAL_DRIVERS=ON
         -DOGR_BUILD_OPTIONAL_DRIVERS=ON
+        -DFIND_PACKAGE2_KEA_ENABLED=OFF
         -DGDAL_CHECK_PACKAGE_MySQL_NAMES=unofficial-libmariadb
         -DGDAL_CHECK_PACKAGE_MySQL_TARGETS=unofficial::libmariadb
         -DMYSQL_LIBRARIES=unofficial::libmariadb
@@ -88,7 +97,7 @@ vcpkg_cmake_configure(
         -DGDAL_CHECK_PACKAGE_QHULL_NAMES=Qhull
         "-DGDAL_CHECK_PACKAGE_QHULL_TARGETS=${qhull_target}"
         "-DQHULL_LIBRARY=${qhull_target}"
-        -DCMAKE_PROJECT_INCLUDE="${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake"
+        "-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake"
     OPTIONS_DEBUG
         -DBUILD_APPS=OFF
     MAYBE_UNUSED_VARIABLES
@@ -109,34 +118,34 @@ list(APPEND CMAKE_PROGRAM_PATH \"\${vcpkg_host_prefix}/tools/pkgconf\")"
 if (BUILD_APPS)
     vcpkg_copy_tools(
         TOOL_NAMES
-            gdalinfo
-            gdalbuildvrt
-            gdaladdo
+            gdal_contour
+            gdal_create
+            gdal_footprint
             gdal_grid
-            gdal_translate
             gdal_rasterize
-            gdalsrsinfo
-            gdalenhance
-            gdalmanage
-            gdaltransform
-            gdaltindex
-            gdaldem
-            gdal_create
+            gdal_translate
             gdal_viewshed
-            nearblack
-            ogrlineref
-            ogrtindex
-            gdalwarp
-            gdal_contour
+            gdaladdo
+            gdalbuildvrt
+            gdaldem
+            gdalenhance
+            gdalinfo
             gdallocationinfo
-            ogrinfo
-            ogr2ogr
-            ogrlineref
-            nearblack
+            gdalmanage
             gdalmdiminfo
             gdalmdimtranslate
+            gdalsrsinfo
+            gdaltindex
+            gdaltransform
+            gdalwarp
             gnmanalyse
             gnmmanage
+            nearblack
+            ogr2ogr
+            ogrinfo
+            ogrlineref
+            ogrtindex
+            sozip
         AUTO_CLEAN
     )
 endif()
@@ -160,4 +169,4 @@ vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/cpl_config.h" "#define GDA
 
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-file(INSTALL "${SOURCE_PATH}/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.TXT")
diff --git a/external_imported/vcpkg/ports/gdal/target-is-valid.patch b/external_imported/vcpkg/ports/gdal/target-is-valid.patch
new file mode 100644
index 000000000..c7acf7390
--- /dev/null
+++ b/external_imported/vcpkg/ports/gdal/target-is-valid.patch
@@ -0,0 +1,21 @@
+diff --git a/cmake/helpers/CheckDependentLibraries.cmake b/cmake/helpers/CheckDependentLibraries.cmake
+index f5c920a..53494c9 100644
+--- a/cmake/helpers/CheckDependentLibraries.cmake
++++ b/cmake/helpers/CheckDependentLibraries.cmake
+@@ -41,6 +41,7 @@ endif()
+ # https://github.com/OSGeo/gdal/issues/5324
+ function (gdal_check_target_is_valid target res_var)
+   get_target_property(_interface_include_directories ${target} "INTERFACE_INCLUDE_DIRECTORIES")
++  get_target_property(_type ${target} "TYPE")
+   if(_interface_include_directories)
+     foreach(_dir IN LISTS _interface_include_directories)
+       if(NOT EXISTS "${_dir}")
+@@ -54,7 +55,7 @@ function (gdal_check_target_is_valid target res_var)
+     # property, but a GeoTIFF_INCLUDE_DIRS variable.
+     set_target_properties(${target} PROPERTIES
+                           INTERFACE_INCLUDE_DIRECTORIES "${GeoTIFF_INCLUDE_DIRS}")
+-  else()
++  elseif(NOT _type STREQUAL "INTERFACE" AND _type STREQUAL "ALIAS")
+      message(WARNING "Target ${target} has no INTERFACE_INCLUDE_DIRECTORIES property. Ignoring that target.")
+      set(${res_var} FALSE PARENT_SCOPE)
+      return()
diff --git a/external_imported/vcpkg/ports/gdal/vcpkg.json b/external_imported/vcpkg/ports/gdal/vcpkg.json
index 352ec65d6..709b633e2 100644
--- a/external_imported/vcpkg/ports/gdal/vcpkg.json
+++ b/external_imported/vcpkg/ports/gdal/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "gdal",
-  "version-semver": "3.6.3",
+  "version-semver": "3.8.3",
   "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data",
   "homepage": "https://gdal.org",
   "license": null,
@@ -12,8 +12,17 @@
       "name": "pkgconf",
       "host": true
     },
-    "proj",
-    "tiff",
+    {
+      "name": "proj",
+      "default-features": false,
+      "features": [
+        "tiff"
+      ]
+    },
+    {
+      "name": "tiff",
+      "default-features": false
+    },
     {
       "name": "vcpkg-cmake",
       "host": true
@@ -141,6 +150,19 @@
         "libjpeg-turbo"
       ]
     },
+    "kea": {
+      "description": "Enable KEA driver",
+      "dependencies": [
+        {
+          "name": "gdal",
+          "default-features": false,
+          "features": [
+            "hdf5"
+          ]
+        },
+        "kealib"
+      ]
+    },
     "lerc": {
       "description": "Enable LERC support",
       "dependencies": [
diff --git a/external_imported/vcpkg/ports/gdcm/fix-dependence-getopt.patch b/external_imported/vcpkg/ports/gdcm/fix-dependence-getopt.patch
index 556df7350..935be24ae 100644
--- a/external_imported/vcpkg/ports/gdcm/fix-dependence-getopt.patch
+++ b/external_imported/vcpkg/ports/gdcm/fix-dependence-getopt.patch
@@ -19,11 +19,11 @@ index 4cdc999..c6ede41 100644
  # you could be running mingw32 on linux in which case you do NOT want the gdcmuuid lib
  APPEND_COPYRIGHT(${CMAKE_CURRENT_SOURCE_DIR}/gdcmuuid/COPYING)
 diff --git a/Utilities/VTK/Applications/CMakeLists.txt b/Utilities/VTK/Applications/CMakeLists.txt
-index c7f1ad9..20883a2 100644
+index a7f7e7e..ab89a73 100644
 --- a/Utilities/VTK/Applications/CMakeLists.txt
 +++ b/Utilities/VTK/Applications/CMakeLists.txt
-@@ -45,7 +45,13 @@ foreach(app ${GDCM_VTK_APPS})
-     target_link_libraries(${app} ${VTK_LIBRARIES} vtkIOXML)
+@@ -60,7 +60,12 @@ foreach(app ${GDCM_VTK_APPS})
+     endif()
    endif()
    if(WIN32 AND NOT CYGWIN)
 -    target_link_libraries(${app} gdcmgetopt)
@@ -33,7 +33,6 @@ index c7f1ad9..20883a2 100644
 +    else()
 +        target_link_libraries(${app} gdcmgetopt)
 +    endif()
-+else()
    endif()
    if(NOT GDCM_INSTALL_NO_RUNTIME)
      install(TARGETS ${app}
diff --git a/external_imported/vcpkg/ports/gdcm/portfile.cmake b/external_imported/vcpkg/ports/gdcm/portfile.cmake
index 0f6b87866..cfba4b23c 100644
--- a/external_imported/vcpkg/ports/gdcm/portfile.cmake
+++ b/external_imported/vcpkg/ports/gdcm/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO malaterre/GDCM
-    REF 1f94bafc929db3648612848836f7899f101d6641 # v3.0.12
-    SHA512 cec050c61d9880880b8b72234f8b0824a1f1fa8f9b2419fec85a0f27fe3bca4f9f80aa735b35775ac098f5827fde454aba700ebea17f5f8657894d26f5140f4a
+    REF "v${VERSION}"
+    SHA512 f4fd81db731b60eebd7d67b8a7f2aa67f44d788f4c0a3f2cef9490fd4f0f1ae9caea1a9a8727619edab6aeda815ae6ace5266b1428b9bea81b7c984deb78bbac
     HEAD_REF master
     PATCHES
         use-openjpeg-config.patch
@@ -37,6 +37,8 @@ vcpkg_cmake_configure(
         -DGDCM_USE_SYSTEM_OPENJPEG=ON
         -DGDCM_BUILD_TESTING=OFF
         -DUSE_VCPKG_GETOPT=${USE_VCPKG_GETOPT}
+    MAYBE_UNUSED_VARIABLES
+        USE_VCPKG_GETOPT
 )
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/gdcm/vcpkg.json b/external_imported/vcpkg/ports/gdcm/vcpkg.json
index f14294e4b..cc17ffc43 100644
--- a/external_imported/vcpkg/ports/gdcm/vcpkg.json
+++ b/external_imported/vcpkg/ports/gdcm/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "gdcm",
-  "version": "3.0.12",
-  "port-version": 1,
+  "version": "3.0.22",
   "description": "Grassroots DICOM library",
   "homepage": "https://github.com/malaterre/GDCM",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/gdk-pixbuf/portfile.cmake b/external_imported/vcpkg/ports/gdk-pixbuf/portfile.cmake
index cfbff59b5..91544e90f 100644
--- a/external_imported/vcpkg/ports/gdk-pixbuf/portfile.cmake
+++ b/external_imported/vcpkg/ports/gdk-pixbuf/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_gitlab(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO GNOME/gdk-pixbuf
     REF "${VERSION}"
-    SHA512 3406f47b413fe3860df410a0cc0076ce47d10605b39347105690c85616739e67e5dfd0804efcad758614b0c8d1369e410b9efaa704a234bfd19686b82595b9e1
+    SHA512 5b7ddb6e816a88ffd2b7f85583c841ea92719bef7da1acbd6f5714afebf8538660c5d391809f959eb1887613f9579cf51c85d6796c84335cedbf7af975d790c9
     HEAD_REF master
     PATCHES
         fix_build_error_windows.patch
@@ -13,9 +13,6 @@ vcpkg_from_gitlab(
 )
 
 if("introspection" IN_LIST FEATURES)
-    if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-        message(FATAL_ERROR "Feature introspection currently only supports dynamic build.")
-    endif()
     list(APPEND OPTIONS_DEBUG -Dintrospection=disabled)
     list(APPEND OPTIONS_RELEASE -Dintrospection=enabled)
 else()
diff --git a/external_imported/vcpkg/ports/gdk-pixbuf/vcpkg.json b/external_imported/vcpkg/ports/gdk-pixbuf/vcpkg.json
index e4a2548a2..9caa47cee 100644
--- a/external_imported/vcpkg/ports/gdk-pixbuf/vcpkg.json
+++ b/external_imported/vcpkg/ports/gdk-pixbuf/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "gdk-pixbuf",
-  "version": "2.42.9",
-  "port-version": 5,
+  "version": "2.42.10",
+  "port-version": 2,
   "description": "Image loading library.",
   "homepage": "https://gitlab.gnome.org/GNOME/gdk-pixbuf",
   "license": "LGPL-2.1-or-later",
+  "supports": "!xbox",
   "dependencies": [
     "gettext",
     "glib",
@@ -27,14 +28,7 @@
     "introspection": {
       "description": "build with introspection",
       "dependencies": [
-        {
-          "name": "gobject-introspection",
-          "host": true
-        },
-        {
-          "name": "gobject-introspection",
-          "platform": "windows & x86"
-        }
+        "gobject-introspection"
       ]
     }
   }
diff --git a/external_imported/vcpkg/ports/genann/portfile.cmake b/external_imported/vcpkg/ports/genann/portfile.cmake
index 56bcd4aee..8f83bc0c8 100644
--- a/external_imported/vcpkg/ports/genann/portfile.cmake
+++ b/external_imported/vcpkg/ports/genann/portfile.cmake
@@ -8,18 +8,16 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS_RELEASE -DINSTALL_HEADERS=ON
     OPTIONS_DEBUG -DINSTALL_HEADERS=OFF
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
 # Handle copyright
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/genann)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/genann/LICENSE ${CURRENT_PACKAGES_DIR}/share/genann/copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 
diff --git a/external_imported/vcpkg/ports/genann/vcpkg.json b/external_imported/vcpkg/ports/genann/vcpkg.json
index 7e9de8815..9a75adcee 100644
--- a/external_imported/vcpkg/ports/genann/vcpkg.json
+++ b/external_imported/vcpkg/ports/genann/vcpkg.json
@@ -1,7 +1,13 @@
 {
   "name": "genann",
-  "version-string": "2019-07-10",
-  "port-version": 1,
+  "version-date": "2019-07-10",
+  "port-version": 3,
   "description": "Genann is a minimal, well-tested library for training and using feedforward artificial neural networks (ANN) in C.",
-  "homepage": "https://github.com/codeplea/genann"
+  "homepage": "https://github.com/codeplea/genann",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/geogram/fix-vcpkg-install.patch b/external_imported/vcpkg/ports/geogram/fix-vcpkg-install.patch
index e859b7890..b05a53f62 100644
--- a/external_imported/vcpkg/ports/geogram/fix-vcpkg-install.patch
+++ b/external_imported/vcpkg/ports/geogram/fix-vcpkg-install.patch
@@ -1,17 +1,17 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8713b2f..0e034fa 100644
+index 1fd796c..05bd735 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -51,7 +51,7 @@ set(VORPALINE_VERSION_MINOR 7)
- set(VORPALINE_VERSION_PATCH 6)
- set(VORPALINE_VERSION ${VORPALINE_VERSION_MAJOR}.${VORPALINE_VERSION_MINOR}.${VORPALINE_VERSION_PATCH})
+@@ -53,7 +53,7 @@ endif()
+ include(cmake/geogram.cmake)
+ 
  
 -set(VORPALINE_INCLUDE_SUBPATH geogram${VORPALINE_VERSION_MAJOR})
 +set(VORPALINE_INCLUDE_SUBPATH ./)
  
  # Determine the current Build-OS (Build-platform without the compiler info)
  string(REGEX REPLACE "-[^-]+$" "" VORPALINE_OS ${VORPALINE_PLATFORM})
-@@ -116,6 +116,7 @@ endif()
+@@ -115,6 +115,7 @@ endif()
  add_subdirectory(src/lib/third_party)
  
  if(GEOGRAM_WITH_GRAPHICS)
@@ -19,7 +19,7 @@ index 8713b2f..0e034fa 100644
    add_subdirectory(src/lib/geogram_gfx)
  endif()
  
-@@ -146,7 +147,44 @@ file(REMOVE ${CMAKE_BINARY_DIR}/doc/LICENSE.txt)
+@@ -145,7 +146,44 @@ file(REMOVE ${CMAKE_BINARY_DIR}/doc/LICENSE.txt)
  
  # FindGeogram.cmake
  
@@ -66,10 +66,19 @@ index 8713b2f..0e034fa 100644
  # Configure CPack
  
 diff --git a/src/lib/geogram/CMakeLists.txt b/src/lib/geogram/CMakeLists.txt
-index 49cb2ba..8985137 100644
+index ed2dca0..30f87b7 100644
 --- a/src/lib/geogram/CMakeLists.txt
 +++ b/src/lib/geogram/CMakeLists.txt
-@@ -61,8 +61,19 @@ if(WIN32)
+@@ -45,7 +45,7 @@ target_include_directories(geogram PRIVATE
+ # path for targets that depend on geogram.
+ # See: https://cmake.org/cmake/help/v3.3/command/target_include_directories.html
+ # https://stackoverflow.com/questions/26243169/cmake-target-include-directories-meaning-of-scope
+-target_include_directories(geogram PUBLIC ${PROJECT_SOURCE_DIR}/src/lib)
++target_include_directories(geogram PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/lib>)
+ 
+ if(ANDROID)
+   target_include_directories(geogram PRIVATE
+@@ -72,8 +72,19 @@ if(WIN32)
      target_link_libraries(geogram psapi)
  endif()
  
@@ -91,10 +100,10 @@ index 49cb2ba..8985137 100644
  # Install include files for the standard devkit
  install(
 diff --git a/src/lib/geogram_gfx/CMakeLists.txt b/src/lib/geogram_gfx/CMakeLists.txt
-index b155975..ad66440 100644
+index a6f8372..195b1e2 100644
 --- a/src/lib/geogram_gfx/CMakeLists.txt
 +++ b/src/lib/geogram_gfx/CMakeLists.txt
-@@ -47,14 +47,21 @@ if(VORPALINE_BUILD_DYNAMIC)
+@@ -52,14 +52,21 @@ if(VORPALINE_BUILD_DYNAMIC)
  endif()
  
  # Install the library
@@ -118,7 +127,7 @@ index b155975..ad66440 100644
  )
  
  # Install include files for the full devkit
-@@ -62,7 +69,7 @@ install(
+@@ -67,7 +74,7 @@ install(
      DIRECTORY .
      DESTINATION include/${VORPALINE_INCLUDE_SUBPATH}/geogram_gfx
      COMPONENT devkit-full
@@ -128,38 +137,36 @@ index b155975..ad66440 100644
  
  install(
 diff --git a/src/lib/third_party/numerics/CMakeLists.txt b/src/lib/third_party/numerics/CMakeLists.txt
-index 8fd39b0..46d5cc6 100644
+index 5faf2fa..33c9bdd 100644
 --- a/src/lib/third_party/numerics/CMakeLists.txt
 +++ b/src/lib/third_party/numerics/CMakeLists.txt
-@@ -10,17 +10,19 @@ endif()
+@@ -14,10 +14,11 @@ endif()
  
  include_directories(${GEOGRAM_SOURCE_DIR}/src/lib/third_party/numerics/INCLUDE)
  
--aux_source_directories(SOURCES "Source Files" .)
 +set(LAPACK_lapack_WORKS TRUE)
 +find_package(BLAS REQUIRED)
 +find_package(LAPACK REQUIRED)
-+ aux_source_directories(SOURCES "Source Files" .)
+ aux_source_directories(SOURCES "Source Files" .)
  aux_source_directories(SOURCES "Source Files\\LIBF2C" LIBF2C)
 -aux_source_directories(SOURCES "Source Files\\CBLAS" CBLAS)
 -aux_source_directories(SOURCES "Source Files\\CLAPACK" CLAPACK)
  aux_source_directories(SOURCES "Source Files\\SUPERLU" SUPERLU)
  aux_source_directories(SOURCES "Source Files\\ARPACK" ARPACK)
  aux_source_directories(SOURCES "Source Files\\ARPACK_UTIL" ARPACK_UTIL)
+@@ -28,6 +29,7 @@ list(REMOVE_ITEM SOURCES "LIBF2C/system_.c")
  
  add_library(geogram_num_3rdparty ${SOURCES})
  
--if(UNIX)
 +target_link_libraries(geogram_num_3rdparty ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES})
-+ if(UNIX)
+ if(UNIX)
      target_link_libraries(geogram_num_3rdparty m)
  endif()
- 
-diff --git a/src/lib/third_party/numerics/LIBF2C/getarg_.c b/src/lib/third_party/numerics/LIBF2C/getarg_.c
-index 2b69a1e..a504538 100644
---- a/src/lib/third_party/numerics/LIBF2C/getarg_.c
-+++ b/src/lib/third_party/numerics/LIBF2C/getarg_.c
-@@ -17,20 +17,20 @@ VOID getarg_(n, s, ls) ftnint *n; char *s; ftnlen ls;
+diff --git a/src/lib/third_party/numerics/LIBF2C/libf2c_getarg_.c b/src/lib/third_party/numerics/LIBF2C/libf2c_getarg_.c
+index 2b69a1e..a4b4c55 100644
+--- a/src/lib/third_party/numerics/LIBF2C/libf2c_getarg_.c
++++ b/src/lib/third_party/numerics/LIBF2C/libf2c_getarg_.c
+@@ -17,20 +17,21 @@ VOID getarg_(n, s, ls) ftnint *n; char *s; ftnlen ls;
  void getarg_(ftnint *n, char *s, ftnlen ls)
  #endif
  {
@@ -182,21 +189,22 @@ index 2b69a1e..a504538 100644
 -		*s++ = ' ';
 -	}
 +	// if(*n>=0 && *n<xargc)
-+	// 	t = xargv[*n];
++		// t = xargv[*n];
 +	// else
-+	// 	t = "";
++		// t = "";
 +	// for(i = 0; i<ls && *t!='\0' ; ++i)
-+	// 	*s++ = *t++;
++		// *s++ = *t++;
 +	// for( ; i<ls ; ++i)
-+	// 	*s++ = ' ';
++		// *s++ = ' ';
++	// }
 +}
  #ifdef __cplusplus
  }
  #endif
-diff --git a/src/lib/third_party/numerics/LIBF2C/iargc_.c b/src/lib/third_party/numerics/LIBF2C/iargc_.c
+diff --git a/src/lib/third_party/numerics/LIBF2C/libf2c_iargc_.c b/src/lib/third_party/numerics/LIBF2C/libf2c_iargc_.c
 index 2f29da0..48dfd9f 100644
---- a/src/lib/third_party/numerics/LIBF2C/iargc_.c
-+++ b/src/lib/third_party/numerics/LIBF2C/iargc_.c
+--- a/src/lib/third_party/numerics/LIBF2C/libf2c_iargc_.c
++++ b/src/lib/third_party/numerics/LIBF2C/libf2c_iargc_.c
 @@ -9,8 +9,9 @@ ftnint iargc_()
  ftnint iargc_(void)
  #endif
diff --git a/external_imported/vcpkg/ports/geogram/portfile.cmake b/external_imported/vcpkg/ports/geogram/portfile.cmake
index 456a2e3a2..eb16d4e8c 100644
--- a/external_imported/vcpkg/ports/geogram/portfile.cmake
+++ b/external_imported/vcpkg/ports/geogram/portfile.cmake
@@ -1,13 +1,43 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO alicevision/geogram
-    REF 8b2ae6148c7ab1564fa2700673b4275296ce80d3 #1.7.6
-    SHA512 0ec0deded92c8d5d100b6e77f8cfbbbaf7b744c230e10abd0b86861960cda9713ff65209575fdc09034afcb0e9137428a20c00d399c09fd58ce541fed2105a2d
+    REPO BrunoLevy/geogram
+    REF "v${VERSION}"
+    SHA512 ae3d95be1c5061ace92921b3fcfb0027d23c595b131b0d31f1788adbe0d8f92367bef71736d6c936504bd37eba5fcdae658369f03734e233bf3eab14bca6f9e5
     PATCHES
         fix-vcpkg-install.patch
-        use-arm64-intrinsics.patch
 )
 
+#third_party: amgcl
+vcpkg_from_github(
+    OUT_SOURCE_PATH AMGCL_SOURCE_PATH
+    REPO ddemidov/amgcl
+    REF 8083b23fbe69c43cee0d4bc17e4334572e292c93
+    SHA512 1b29871ace68c53b46711012921261929f8bd612f93b47d2c59523cd3d68366956fe1c9ec81a94b3aaab63357001799c9e34af79376b940fa6b7a53cdf136897
+)
+
+#third_party: libMeshb
+vcpkg_from_github(
+    OUT_SOURCE_PATH LIBMESHB_SOURCE_PATH
+    REPO LoicMarechal/libMeshb
+    REF b4a91513317119ff71a1186906a052da0e535913
+    SHA512 bff30a233c2746a454d552be66f5654bf4af995d6f1eb00a4d21ed10c86234a5be4d6f31282645858e0a829b10fd98cad7188c69be65cdabbd18478fc26bad1f
+)
+
+#third_party: rply
+vcpkg_from_github(
+    OUT_SOURCE_PATH RPLY_SOURCE_PATH
+    REPO diegonehab/rply
+    REF 4296cc91b5c8c26d4e7d7aac0cee2b194ffc5800
+    SHA512 b236279d3f0e6e1062703555415236183da31a9e40c49d478954586725f8dc6c0582aef0db7b605cb7967c3bd4a96d2fe8e6601cc56b8a1d53129a25efa7d1f2
+)
+
+file(REMOVE_RECURSE "${SOURCE_PATH}/src/lib/geogram/third_party/amgcl"
+    "${SOURCE_PATH}/src/lib/geogram/third_party/libMeshb"
+	"${SOURCE_PATH}/src/lib/geogram/third_party/rply")
+file(RENAME "${AMGCL_SOURCE_PATH}" "${SOURCE_PATH}/src/lib/geogram/third_party/amgcl")
+file(RENAME "${LIBMESHB_SOURCE_PATH}" "${SOURCE_PATH}/src/lib/geogram/third_party/libMeshb")
+file(RENAME "${RPLY_SOURCE_PATH}" "${SOURCE_PATH}/src/lib/geogram/third_party/rply")
+
 file(COPY "${CURRENT_PORT_DIR}/Config.cmake.in" DESTINATION "${SOURCE_PATH}/cmake")
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -70,6 +100,24 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/doc")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/doc")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
+# Remove all empty directories. 
+function(auto_clean dir) 
+     file(GLOB entries "${dir}/*") 
+     file(GLOB files LIST_DIRECTORIES false "${dir}/*") 
+     foreach(entry IN LISTS entries) 
+         if(entry IN_LIST files) 
+             continue() 
+         endif() 
+         file(GLOB_RECURSE children "${entry}/*") 
+         if(children) 
+             auto_clean("${entry}") 
+         else() 
+             file(REMOVE_RECURSE "${entry}") 
+         endif() 
+     endforeach() 
+endfunction()
+auto_clean("${CURRENT_PACKAGES_DIR}/include")
+
 vcpkg_replace_string(
     "${CURRENT_PACKAGES_DIR}/share/geogram/GeogramTargets.cmake"
     [[INTERFACE_INCLUDE_DIRECTORIES "/src/lib;${_IMPORT_PREFIX}/include"]]
@@ -77,6 +125,6 @@ vcpkg_replace_string(
     )
 
 # Handle copyright
-file(INSTALL "${SOURCE_PATH}/doc/devkit/license.dox" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/doc/devkit/license.dox")
 
 vcpkg_fixup_pkgconfig()
diff --git a/external_imported/vcpkg/ports/geogram/use-arm64-intrinsics.patch b/external_imported/vcpkg/ports/geogram/use-arm64-intrinsics.patch
deleted file mode 100644
index 04c2d0c1b..000000000
--- a/external_imported/vcpkg/ports/geogram/use-arm64-intrinsics.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/lib/geogram/delaunay/periodic_delaunay_3d.cpp b/src/lib/geogram/delaunay/periodic_delaunay_3d.cpp
-index 352ea76..34e73e2 100644
---- a/src/lib/geogram/delaunay/periodic_delaunay_3d.cpp
-+++ b/src/lib/geogram/delaunay/periodic_delaunay_3d.cpp
-@@ -122,7 +122,11 @@ namespace {
- #if defined(GEO_COMPILER_GCC_FAMILY)
- 	return GEO::index_t(Numeric::uint32(__builtin_popcount(x)));
- #elif defined(GEO_COMPILER_MSVC)
-+    #if defined(_M_ARM64)
-+	return GEO::index_t(_CountOneBits(x));
-+    #else
- 	return GEO::index_t(__popcnt(x));
-+    #endif
- #else
- 	int result = 0;
- 	for(int b=0; b<32; ++b) {
diff --git a/external_imported/vcpkg/ports/geogram/vcpkg.json b/external_imported/vcpkg/ports/geogram/vcpkg.json
index 3e72ae0e2..51233ba89 100644
--- a/external_imported/vcpkg/ports/geogram/vcpkg.json
+++ b/external_imported/vcpkg/ports/geogram/vcpkg.json
@@ -1,11 +1,11 @@
 {
   "name": "geogram",
-  "version": "1.7.6",
-  "port-version": 4,
+  "version": "1.8.3",
+  "port-version": 1,
   "description": "Geogram is a programming library of geometric algorithms.",
-  "homepage": "https://gforge.inria.fr/projects/geogram/",
+  "homepage": "https://github.com/BrunoLevy/geogram",
   "license": "BSD-3-Clause",
-  "supports": "!uwp & !(osx & arm64)",
+  "supports": "!uwp",
   "dependencies": [
     "blas",
     "lapack",
diff --git a/external_imported/vcpkg/ports/geographiclib/portfile.cmake b/external_imported/vcpkg/ports/geographiclib/portfile.cmake
index 75427f5f8..3071d92c2 100644
--- a/external_imported/vcpkg/ports/geographiclib/portfile.cmake
+++ b/external_imported/vcpkg/ports/geographiclib/portfile.cmake
@@ -2,8 +2,9 @@ vcpkg_from_sourceforge(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO geographiclib
     REF distrib-C++
-    FILENAME "GeographicLib-2.2.tar.gz"
-    SHA512 7b6d6c56bc2b310190b7918eb21ebebd99b28143666ba4ee33c6a3cb6de927e64c48a2d6d59eb13a86c9beebb022a57048f6523e96fe236b9e247b90d357b8b4
+    FILENAME "GeographicLib-2.3.tar.gz"
+    SHA512 1a1bd0fc2dc3e1372cf22618af3a4340bbc6497f94c64226c97654dfff92a4bf3acf47d91592741fe0c643d401d9721f680bdb4974b8ee258fb09d525fbaec67
+    PATCHES remove-broken-and-unnecessary-cross-compile-check.patch
     )
 
 vcpkg_check_features(
diff --git a/external_imported/vcpkg/ports/geographiclib/remove-broken-and-unnecessary-cross-compile-check.patch b/external_imported/vcpkg/ports/geographiclib/remove-broken-and-unnecessary-cross-compile-check.patch
new file mode 100644
index 000000000..fb634782a
--- /dev/null
+++ b/external_imported/vcpkg/ports/geographiclib/remove-broken-and-unnecessary-cross-compile-check.patch
@@ -0,0 +1,14 @@
+diff -Naur a/cmake/project-config-version.cmake.in b/cmake/project-config-version.cmake.in
+--- a/cmake/project-config-version.cmake.in	2023-07-25 07:37:40.000000000 -0500
++++ b/cmake/project-config-version.cmake.in	2023-11-10 16:58:52.835325073 -0600
+@@ -48,10 +48,6 @@
+   # Reject if the user asks for an incompatible precsision.
+   set (REASON "GEOGRAPHICLIB_PRECISION = @GEOGRAPHICLIB_PRECISION@")
+   set (PACKAGE_VERSION_UNSUITABLE TRUE)
+-elseif (NOT CMAKE_CROSSCOMPILING_STR STREQUAL "@CMAKE_CROSSCOMPILING_STR@")
+-  # Reject if there's a mismatch in ${CMAKE_CROSSCOMPILING}.
+-  set (REASON "cross-compiling = @CMAKE_CROSSCOMPILING@")
+-  set (PACKAGE_VERSION_UNSUITABLE TRUE)
+ elseif (CMAKE_CROSSCOMPILING AND
+     NOT (CMAKE_SYSTEM_NAME STREQUAL "@CMAKE_SYSTEM_NAME@" AND
+       CMAKE_SYSTEM_PROCESSOR STREQUAL "@CMAKE_SYSTEM_PROCESSOR@"))
diff --git a/external_imported/vcpkg/ports/geographiclib/vcpkg.json b/external_imported/vcpkg/ports/geographiclib/vcpkg.json
index add56cf60..d2d5bd541 100644
--- a/external_imported/vcpkg/ports/geographiclib/vcpkg.json
+++ b/external_imported/vcpkg/ports/geographiclib/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "geographiclib",
-  "version": "2.2",
+  "version": "2.3",
+  "port-version": 1,
   "description": "GeographicLib, a C++ library for performing geographic conversions",
   "homepage": "https://geographiclib.sourceforge.io",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/geos/disable-warning-4996.patch b/external_imported/vcpkg/ports/geos/disable-warning-4996.patch
deleted file mode 100644
index d10e8df8a..000000000
--- a/external_imported/vcpkg/ports/geos/disable-warning-4996.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e758b5dc8..074986f38 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -187,7 +187,7 @@ target_compile_features(geos_cxx_flags INTERFACE cxx_std_11)
- target_compile_options(geos_cxx_flags INTERFACE
- 	"$<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>>:-ffp-contract=off>"
- 	"$<$<CXX_COMPILER_ID:GNU>:-ffp-contract=off>"
--	"$<$<CXX_COMPILER_ID:MSVC>:/fp:precise>"
-+	$<$<CXX_COMPILER_ID:MSVC>:/fp:precise /wd4996>
- 	)
- 
- # Use -ffloat-store for 32-bit builds (needed to make some tests pass)
diff --git a/external_imported/vcpkg/ports/geos/fix-dll-builds.patch b/external_imported/vcpkg/ports/geos/fix-dll-builds.patch
deleted file mode 100644
index 9e1aa9f95..000000000
--- a/external_imported/vcpkg/ports/geos/fix-dll-builds.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 074986f..bb5ab3a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -187,7 +187,7 @@ target_compile_features(geos_cxx_flags INTERFACE cxx_std_11)
- target_compile_options(geos_cxx_flags INTERFACE
- 	"$<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>>:-ffp-contract=off>"
- 	"$<$<CXX_COMPILER_ID:GNU>:-ffp-contract=off>"
--	$<$<CXX_COMPILER_ID:MSVC>:/fp:precise /wd4996>
-+  "$<$<BOOL:${MSVC}>:/fp:precise /wd4996>"
- 	)
- 
- # Use -ffloat-store for 32-bit builds (needed to make some tests pass)
-@@ -227,10 +227,10 @@ target_compile_definitions(geos_cxx_flags
- 
- target_compile_definitions(geos_developer_cxx_flags
-   INTERFACE
--    $<$<CXX_COMPILER_ID:MSVC>:_CRT_NONSTDC_NO_DEPRECATE>
--    $<$<CXX_COMPILER_ID:MSVC>:_SCL_SECURE_NO_DEPRECATE>
--    $<$<CXX_COMPILER_ID:MSVC>:_CRT_SECURE_NO_WARNINGS>
--    $<$<CXX_COMPILER_ID:MSVC>:NOMINMAX>)
-+    "$<$<BOOL:${MSVC}>:_CRT_NONSTDC_NO_DEPRECATE>"
-+    "$<$<BOOL:${MSVC}>:_SCL_SECURE_NO_DEPRECATE>"
-+    "$<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>"
-+    "$<$<BOOL:${WIN32}>:NOMINMAX>")
- 
- target_compile_options(geos_developer_cxx_flags
-   INTERFACE
-@@ -269,7 +269,7 @@ option(VERSION_MINGW_SHARED_LIBS "Add version suffix to MinGW shared libraries"
- 
- if(BUILD_SHARED_LIBS)
-   target_compile_definitions(geos
--    PRIVATE $<IF:$<CXX_COMPILER_ID:MSVC>,GEOS_DLL_EXPORT,DLL_EXPORT>)
-+    PRIVATE $<$<BOOL:${WIN32}>:GEOS_DLL_EXPORT>)
- 
-   set_target_properties(geos PROPERTIES VERSION ${GEOS_VERSION_NOPATCH})
-   set_target_properties(geos PROPERTIES SOVERSION ${GEOS_VERSION_NOPATCH})
-@@ -287,7 +287,7 @@ target_link_libraries(geos_c PRIVATE geos)
- 
- if(BUILD_SHARED_LIBS)
-   target_compile_definitions(geos_c
--    PRIVATE $<IF:$<CXX_COMPILER_ID:MSVC>,GEOS_DLL_EXPORT,DLL_EXPORT>)
-+    PRIVATE $<$<BOOL:${WIN32}>:GEOS_DLL_EXPORT>)
- 
-   set_target_properties(geos_c PROPERTIES VERSION ${CAPI_VERSION})
-   if(NOT WIN32 OR MINGW)
-diff --git a/include/geos/algorithm/locate/IndexedPointInAreaLocator.h b/include/geos/algorithm/locate/IndexedPointInAreaLocator.h
-index 7a647e4..52a29c9 100644
---- a/include/geos/algorithm/locate/IndexedPointInAreaLocator.h
-+++ b/include/geos/algorithm/locate/IndexedPointInAreaLocator.h
-@@ -51,7 +51,7 @@ namespace locate { // geos::algorithm::locate
-  * The index is lazy-loaded, which allows creating instances even if they are not used.
-  *
-  */
--class IndexedPointInAreaLocator : public PointOnGeometryLocator {
-+class GEOS_DLL IndexedPointInAreaLocator : public PointOnGeometryLocator {
- private:
-     struct SegmentView {
-         SegmentView(const geom::Coordinate* p_p0, const geom::Coordinate* p_p1) : m_p0(p_p0) {
-diff --git a/include/geos/export.h b/include/geos/export.h
-index 1a26f8c..997fb4c 100644
---- a/include/geos/export.h
-+++ b/include/geos/export.h
-@@ -19,7 +19,7 @@
- #  if defined(GEOS_DLL_EXPORT)
- #    define GEOS_DLL   __declspec(dllexport)
- #  elif defined(GEOS_DLL_IMPORT)
--#    define GEOS_DLL   __declspec(dllimport)
-+#    define GEOS_DLL   extern __declspec(dllimport)
- #  else
- #    define GEOS_DLL
- #  endif
diff --git a/external_imported/vcpkg/ports/geos/fix-exported-config.patch b/external_imported/vcpkg/ports/geos/fix-exported-config.patch
index 1069bc281..7f26a2942 100644
--- a/external_imported/vcpkg/ports/geos/fix-exported-config.patch
+++ b/external_imported/vcpkg/ports/geos/fix-exported-config.patch
@@ -65,11 +65,11 @@ index 6eff1eb14..8827f6ac6 100644
 +      echo -L${libdir} -lgeos $(if test "@BUILD_SHARED_LIBS@" != "ON"; then echo "@EXTRA_LIBS@"; fi)
        ;;
      --static-clibs)
--      echo -L${libdir} -lgeos_c -lgeos -lm
+-      echo -L${libdir} -lgeos_c -lgeos -lstdc++ -lm
 +      echo -L${libdir} -lgeos_c -lgeos @EXTRA_LIBS@
        ;;
      --static-cclibs)
--      echo -L${libdir} -lgeos -lm
+-      echo -L${libdir} -lgeos -lstdc++ -lm
 +      echo -L${libdir} -lgeos @EXTRA_LIBS@
        ;;
      --cflags)
diff --git a/external_imported/vcpkg/ports/geos/portfile.cmake b/external_imported/vcpkg/ports/geos/portfile.cmake
index 179dd94e1..20ec99b5b 100644
--- a/external_imported/vcpkg/ports/geos/portfile.cmake
+++ b/external_imported/vcpkg/ports/geos/portfile.cmake
@@ -1,16 +1,14 @@
-vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
 vcpkg_download_distfile(ARCHIVE
     URLS "https://download.osgeo.org/geos/geos-${VERSION}.tar.bz2"
     FILENAME "geos-${VERSION}.tar.bz2"
-    SHA512 708500aba9b04208ee46a531d55ddf63a213dfaa2922dae937b524300b2b46c95143ed6cd3ff1414e9099f2be95e5df5a2e0b49df43acf93a9478215259f20d3
+    SHA512 bbca43c1eb9c4001d2e3c29d054b597bfb2c1d4860784246dd20fec21882b54bc2a8a8f0f09b8816aec7a85b621d3d1645adca15318838d2b4f4b5c4c4a58a94
 )
 vcpkg_extract_source_archive(SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
     SOURCE_BASE "v${VERSION}"
     PATCHES
-        disable-warning-4996.patch
+        win32.patch
         fix-exported-config.patch
-        fix-dll-builds.patch
 )
 
 vcpkg_cmake_configure(
diff --git a/external_imported/vcpkg/ports/geos/vcpkg.json b/external_imported/vcpkg/ports/geos/vcpkg.json
index e4929d3c9..e4c4c6f59 100644
--- a/external_imported/vcpkg/ports/geos/vcpkg.json
+++ b/external_imported/vcpkg/ports/geos/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "geos",
-  "version": "3.11.1",
+  "version": "3.11.3",
+  "port-version": 1,
   "description": "Geometry Engine Open Source",
   "homepage": "https://libgeos.org/",
   "license": "LGPL-2.1-only",
diff --git a/external_imported/vcpkg/ports/geos/win32.patch b/external_imported/vcpkg/ports/geos/win32.patch
new file mode 100644
index 000000000..f06c9a972
--- /dev/null
+++ b/external_imported/vcpkg/ports/geos/win32.patch
@@ -0,0 +1,73 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e758b5d..beda887 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -187,7 +187,8 @@ target_compile_features(geos_cxx_flags INTERFACE cxx_std_11)
+ target_compile_options(geos_cxx_flags INTERFACE
+ 	"$<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>>:-ffp-contract=off>"
+ 	"$<$<CXX_COMPILER_ID:GNU>:-ffp-contract=off>"
+-	"$<$<CXX_COMPILER_ID:MSVC>:/fp:precise>"
++	"$<$<BOOL:${MSVC}>:/fp:precise>"
++	"$<$<BOOL:${MSVC}>:/wd4996>"
+ 	)
+ 
+ # Use -ffloat-store for 32-bit builds (needed to make some tests pass)
+@@ -227,10 +228,10 @@ target_compile_definitions(geos_cxx_flags
+ 
+ target_compile_definitions(geos_developer_cxx_flags
+   INTERFACE
+-    $<$<CXX_COMPILER_ID:MSVC>:_CRT_NONSTDC_NO_DEPRECATE>
+-    $<$<CXX_COMPILER_ID:MSVC>:_SCL_SECURE_NO_DEPRECATE>
+-    $<$<CXX_COMPILER_ID:MSVC>:_CRT_SECURE_NO_WARNINGS>
+-    $<$<CXX_COMPILER_ID:MSVC>:NOMINMAX>)
++    "$<$<BOOL:${MSVC}>:_CRT_NONSTDC_NO_DEPRECATE>"
++    "$<$<BOOL:${MSVC}>:_SCL_SECURE_NO_DEPRECATE>"
++    "$<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>"
++    "$<$<BOOL:${WIN32}>:NOMINMAX>")
+ 
+ target_compile_options(geos_developer_cxx_flags
+   INTERFACE
+@@ -269,7 +270,7 @@ option(VERSION_MINGW_SHARED_LIBS "Add version suffix to MinGW shared libraries"
+ 
+ if(BUILD_SHARED_LIBS)
+   target_compile_definitions(geos
+-    PRIVATE $<IF:$<CXX_COMPILER_ID:MSVC>,GEOS_DLL_EXPORT,DLL_EXPORT>)
++    PRIVATE $<$<BOOL:${WIN32}>:GEOS_DLL_EXPORT>)
+ 
+   set_target_properties(geos PROPERTIES VERSION ${GEOS_VERSION_NOPATCH})
+   set_target_properties(geos PROPERTIES SOVERSION ${GEOS_VERSION_NOPATCH})
+@@ -287,7 +288,7 @@ target_link_libraries(geos_c PRIVATE geos)
+ 
+ if(BUILD_SHARED_LIBS)
+   target_compile_definitions(geos_c
+-    PRIVATE $<IF:$<CXX_COMPILER_ID:MSVC>,GEOS_DLL_EXPORT,DLL_EXPORT>)
++    PRIVATE $<$<BOOL:${WIN32}>:GEOS_DLL_EXPORT>)
+ 
+   set_target_properties(geos_c PROPERTIES VERSION ${CAPI_VERSION})
+   if(NOT WIN32 OR MINGW)
+diff --git a/include/geos/algorithm/locate/IndexedPointInAreaLocator.h b/include/geos/algorithm/locate/IndexedPointInAreaLocator.h
+index 7a647e4..52a29c9 100644
+--- a/include/geos/algorithm/locate/IndexedPointInAreaLocator.h
++++ b/include/geos/algorithm/locate/IndexedPointInAreaLocator.h
+@@ -51,7 +51,7 @@ namespace locate { // geos::algorithm::locate
+  * The index is lazy-loaded, which allows creating instances even if they are not used.
+  *
+  */
+-class IndexedPointInAreaLocator : public PointOnGeometryLocator {
++class GEOS_DLL IndexedPointInAreaLocator : public PointOnGeometryLocator {
+ private:
+     struct SegmentView {
+         SegmentView(const geom::Coordinate* p_p0, const geom::Coordinate* p_p1) : m_p0(p_p0) {
+diff --git a/include/geos/export.h b/include/geos/export.h
+index 1a26f8c..997fb4c 100644
+--- a/include/geos/export.h
++++ b/include/geos/export.h
+@@ -19,7 +19,7 @@
+ #  if defined(GEOS_DLL_EXPORT)
+ #    define GEOS_DLL   __declspec(dllexport)
+ #  elif defined(GEOS_DLL_IMPORT)
+-#    define GEOS_DLL   __declspec(dllimport)
++#    define GEOS_DLL   extern __declspec(dllimport)
+ #  else
+ #    define GEOS_DLL
+ #  endif
diff --git a/external_imported/vcpkg/ports/geotrans/portfile.cmake b/external_imported/vcpkg/ports/geotrans/portfile.cmake
index 8f77ee909..1c38a8dab 100644
--- a/external_imported/vcpkg/ports/geotrans/portfile.cmake
+++ b/external_imported/vcpkg/ports/geotrans/portfile.cmake
@@ -4,8 +4,8 @@ set(VCPKG_LIBRARY_LINKAGE "dynamic")
 # which we re-build anyway.  There is no source only package provided or it would be preferred (and smaller).
 vcpkg_download_distfile(ARCHIVE
     URLS "https://earth-info.nga.mil/php/download.php?file=wgs-mastertgz"
-    FILENAME "geotrans-3.9-master.tgz"
-    SHA512 b0bd5ca6eb584eebf0adc89eb86ec949f372bb4ea92c559f74f2055b0f121369b3d8de0bcff7b7db9abc57ac5a129d5c283d67f098e4af12d91b41747a76e541
+    FILENAME "geotrans-3.9-master-adf1935.tgz"
+    SHA512 adf19357edc62681a2515e7210a752b0e09214b6ce69024e60150e0780059c08a9ab5a162a0562dbc37127438783a24bcde1adb88b559bc95ff9a5bea0eb8b39
 )
 
 vcpkg_extract_source_archive(
diff --git a/external_imported/vcpkg/ports/geotrans/vcpkg.json b/external_imported/vcpkg/ports/geotrans/vcpkg.json
index db4fe1c57..61212b5f0 100644
--- a/external_imported/vcpkg/ports/geotrans/vcpkg.json
+++ b/external_imported/vcpkg/ports/geotrans/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "geotrans",
   "version": "3.9",
+  "port-version": 1,
   "description": "GEOTRANS is an application that allows you to convert geographic coordinates among a wide variety of coordinate systems, map projections, grids, and datums. GEOTRANS runs in Microsoft Windows and LINUX environments.",
   "homepage": "https://earth-info.nga.mil/GandG/update/index.php?action=home",
   "license": null,
diff --git a/external_imported/vcpkg/ports/getdns/disable-docs.patch b/external_imported/vcpkg/ports/getdns/disable-docs.patch
index ffa7afa56..3d0670e27 100644
--- a/external_imported/vcpkg/ports/getdns/disable-docs.patch
+++ b/external_imported/vcpkg/ports/getdns/disable-docs.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 413709da..d3dd03f0 100644
+index 9170be7..def3758 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1039,9 +1039,9 @@ configure_file(src/version.c.in version.c)
+@@ -1036,9 +1036,9 @@ configure_file(src/version.c.in version.c)
  
  set(version ${PACKAGE_VERSION})
  set(date ${API_VERSION})
@@ -15,7 +15,7 @@ index 413709da..d3dd03f0 100644
    get_filename_component(out ${man} NAME_WE)
    configure_file(${man} man3/${out}.3 @ONLY)
  
-@@ -1061,7 +1061,7 @@ foreach (man ${mans})
+@@ -1058,7 +1058,7 @@ foreach (man ${mans})
        configure_file(${man} man3/${alt}.3 @ONLY)
      endif ()
    endforeach()
@@ -23,20 +23,18 @@ index 413709da..d3dd03f0 100644
 +endif()
  
  set(prefix ${CMAKE_INSTALL_PREFIX})
- configure_file(getdns.pc.in getdns.pc @ONLY)
-@@ -1099,11 +1099,11 @@ if (BUILD_GETDNS_SERVER_MON)
+ cmake_path(APPEND libdir_for_pc_file "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
+@@ -1098,10 +1098,10 @@ if (BUILD_GETDNS_SERVER_MON)
  endif ()
  
  install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/getdns DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
--install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man3 DESTINATION share/man)
-+#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man3 DESTINATION share/man)
+-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man3 DESTINATION ${CMAKE_INSTALL_MANDIR})
++#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man3 DESTINATION ${CMAKE_INSTALL_MANDIR})
  
--set(docdir share/doc/getdns)
--install(FILES AUTHORS ChangeLog COPYING LICENSE NEWS README.md DESTINATION ${docdir})
--install(FILES spec/index.html DESTINATION ${docdir}/spec)
-+#set(docdir share/doc/getdns)
-+#install(FILES AUTHORS ChangeLog COPYING LICENSE NEWS README.md DESTINATION ${docdir})
-+#install(FILES spec/index.html DESTINATION ${docdir}/spec)
+-install(FILES AUTHORS ChangeLog COPYING LICENSE NEWS README.md DESTINATION ${CMAKE_INSTALL_DOCDIR})
+-install(FILES spec/index.html DESTINATION ${CMAKE_INSTALL_DOCDIR}/spec)
++#install(FILES AUTHORS ChangeLog COPYING LICENSE NEWS README.md DESTINATION ${CMAKE_INSTALL_DOCDIR})
++#install(FILES spec/index.html DESTINATION ${CMAKE_INSTALL_DOCDIR}/spec)
  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/getdns.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
  
  install(CODE "message(\"\
diff --git a/external_imported/vcpkg/ports/getdns/fix-include.patch b/external_imported/vcpkg/ports/getdns/fix-include.patch
new file mode 100644
index 000000000..27ea5fa21
--- /dev/null
+++ b/external_imported/vcpkg/ports/getdns/fix-include.patch
@@ -0,0 +1,30 @@
+diff --git a/src/gldns/parse.c b/src/gldns/parse.c
+index 367fa80..79fa527 100644
+--- a/src/gldns/parse.c
++++ b/src/gldns/parse.c
+@@ -13,7 +13,7 @@
+ #include "gldns/gbuffer.h"
+ 
+ #include <limits.h>
+-#include <strings.h>
++#include <stdlib.h>
+ 
+ gldns_lookup_table gldns_directive_types[] = {
+         { GLDNS_DIR_TTL, "$TTL" },
+diff --git a/src/gldns/parseutil.c b/src/gldns/parseutil.c
+index 293496a..bcd8e6f 100644
+--- a/src/gldns/parseutil.c
++++ b/src/gldns/parseutil.c
+@@ -14,8 +14,12 @@
+ 
+ #include "config.h"
+ #include "gldns/parseutil.h"
++#ifdef HAVE_SYS_TIME_H
+ #include <sys/time.h>
++#endif
++#ifdef HAVE_TIME_H
+ #include <time.h>
++#endif
+ #include <ctype.h>
+ 
+ gldns_lookup_table *
diff --git a/external_imported/vcpkg/ports/getdns/fix-libuv-deps.patch b/external_imported/vcpkg/ports/getdns/fix-libuv-deps.patch
new file mode 100644
index 000000000..71720ce3e
--- /dev/null
+++ b/external_imported/vcpkg/ports/getdns/fix-libuv-deps.patch
@@ -0,0 +1,33 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c5b711e..6bd9ee2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -872,7 +872,7 @@ endif ()
+ 
+ # libuv extension.
+ if (USE_LIBUV)
+-  find_package(Libuv)
++  find_package(libuv CONFIG REQUIRED)
+   if (Libuv_FOUND)
+     # Check for new-style callbacks.
+     try_compile(HAVE_NEW_UV_TIMER_CB
+@@ -894,8 +894,7 @@ if (USE_LIBUV)
+     set_property(TARGET uv_objects PROPERTY C_STANDARD 11)
+     if (ENABLE_STATIC)
+       add_library(getdns_ext_uv STATIC $<TARGET_OBJECTS:uv_objects>)
+-      target_include_directories(getdns_ext_uv PRIVATE Libuv::Libuv)
+-      target_link_libraries(getdns_ext_uv PUBLIC getdns Libuv::Libuv)
++      target_link_libraries(getdns_ext_uv PUBLIC getdns $<IF:$<TARGET_EXISTS:libuv::uv_a>,libuv::uv_a,libuv::uv>)
+       if (Libunbound_FOUND)
+         target_link_libraries(getdns_ext_uv PUBLIC Libunbound::Libunbound)
+       endif ()
+@@ -903,8 +902,7 @@ if (USE_LIBUV)
+     endif ()
+     if (ENABLE_SHARED)
+       add_library(getdns_ext_uv_shared SHARED $<TARGET_OBJECTS:uv_objects>)
+-      target_include_directories(getdns_ext_uv_shared PRIVATE Libuv::Libuv)
+-      target_link_libraries(getdns_ext_uv_shared PUBLIC getdns_shared Libuv::Libuv)
++      target_link_libraries(getdns_ext_uv_shared PUBLIC getdns $<IF:$<TARGET_EXISTS:libuv::uv_a>,libuv::uv_a,libuv::uv>)
+       if (Libunbound_FOUND)
+         target_link_libraries(getdns_ext_uv_shared PUBLIC Libunbound::Libunbound)
+       endif ()
diff --git a/external_imported/vcpkg/ports/getdns/portfile.cmake b/external_imported/vcpkg/ports/getdns/portfile.cmake
index 07a11fe80..64eccdfdd 100644
--- a/external_imported/vcpkg/ports/getdns/portfile.cmake
+++ b/external_imported/vcpkg/ports/getdns/portfile.cmake
@@ -1,19 +1,19 @@
-set(GETDNS_VERSION 1.7.0)
-set(GETDNS_HASH d09b8bdd0b4a3df2d25b9689166226da83a5a7eb2c7436487dc637539ac6077624a4d66cf684c4e6c4911561872c6bd191af3afd90d275b1662e4c6c47773ef6)
-
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" GETDNS_ENABLE_STATIC)
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" GETDNS_ENABLE_SHARED)
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://getdnsapi.net/dist/getdns-${GETDNS_VERSION}.tar.gz"
-    FILENAME "getdns-${GETDNS_VERSION}.tar.gz"
-    SHA512 ${GETDNS_HASH}
+    URLS "https://getdnsapi.net/dist/getdns-${VERSION}.tar.gz"
+    FILENAME "getdns-${VERSION}.tar.gz"
+    SHA512 d5725a24378b6fe0018daefdaba5565d2d4d51109ef66609fc34270a0a69accb95f5f895d0cdfc5caca51d2ec586db126f367439f05aed12507395af26739e2f
 )
 
 vcpkg_extract_source_archive(
     SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
-    PATCHES disable-docs.patch
+    PATCHES 
+        disable-docs.patch
+        fix-include.patch
+	fix-libuv-deps.patch
 )
 
 if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
diff --git a/external_imported/vcpkg/ports/getdns/vcpkg.json b/external_imported/vcpkg/ports/getdns/vcpkg.json
index 98b9d3304..92ee276fb 100644
--- a/external_imported/vcpkg/ports/getdns/vcpkg.json
+++ b/external_imported/vcpkg/ports/getdns/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "getdns",
-  "version": "1.7.0",
-  "port-version": 3,
+  "version": "1.7.3",
   "description": "GetDNS is a modern asynchronous DNS API",
   "homepage": "https://getdnsapi.net/",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/getopt-win32/getopt.h.patch b/external_imported/vcpkg/ports/getopt-win32/getopt.h.patch
deleted file mode 100644
index 58435f481..000000000
--- a/external_imported/vcpkg/ports/getopt-win32/getopt.h.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-commit 81c35ed14e07138e44b5b30f52fbc2bb26ae1fed
-Author: Max Khon <fjoe@samodelkin.net>
-Date:   Mon Jan 24 23:05:24 2022 +0700
-
-    Rename "extern C" macros as MS VC C++ headers use _END_EXTERN_C macro
-
-diff --git a/getopt.h b/getopt.h
-index 5ed4a46..5e33682 100644
---- a/getopt.h
-+++ b/getopt.h
-@@ -57,12 +57,12 @@ EXPRESSLY ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- 
- 	// Change behavior for C\C++
- 	#ifdef __cplusplus
--		#define _BEGIN_EXTERN_C extern "C" {
--		#define _END_EXTERN_C }
-+		#define _GETOPT_BEGIN_EXTERN_C extern "C" {
-+		#define _GETOPT_END_EXTERN_C }
- 		#define _GETOPT_THROW throw()
- 	#else
--		#define _BEGIN_EXTERN_C
--		#define _END_EXTERN_C
-+		#define _GETOPT_BEGIN_EXTERN_C
-+		#define _GETOPT_END_EXTERN_C
- 		#define _GETOPT_THROW
- 	#endif
- 
-@@ -81,7 +81,7 @@ EXPRESSLY ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- 	#include <string.h>
- 	#include <wchar.h>
- 
--_BEGIN_EXTERN_C
-+_GETOPT_BEGIN_EXTERN_C
- 
- 	extern _GETOPT_API int optind;
- 	extern _GETOPT_API int opterr;
-@@ -113,10 +113,10 @@ _BEGIN_EXTERN_C
- 	extern _GETOPT_API int getopt_long_w(int argc, wchar_t *const *argv, const wchar_t *options, const struct option_w *long_options, int *opt_index) _GETOPT_THROW;
- 	extern _GETOPT_API int getopt_long_only_w(int argc, wchar_t *const *argv, const wchar_t *options, const struct option_w *long_options, int *opt_index) _GETOPT_THROW;	
- 	
--_END_EXTERN_C
-+_GETOPT_END_EXTERN_C
- 
--	#undef _BEGIN_EXTERN_C
--	#undef _END_EXTERN_C
-+	#undef _GETOPT_BEGIN_EXTERN_C
-+	#undef _GETOPT_END_EXTERN_C
- 	#undef _GETOPT_THROW
- 	#undef _GETOPT_API
- 
diff --git a/external_imported/vcpkg/ports/getopt-win32/portfile.cmake b/external_imported/vcpkg/ports/getopt-win32/portfile.cmake
index e5cddc83d..5b1eb8f6d 100644
--- a/external_imported/vcpkg/ports/getopt-win32/portfile.cmake
+++ b/external_imported/vcpkg/ports/getopt-win32/portfile.cmake
@@ -1,10 +1,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO libimobiledevice-win32/getopt
-    REF 0.1
-    SHA512 40e2a901241a5d751cec741e5de423c8f19b105572c7cae18adb6e69be0b408efc6c9a2ecaeb62f117745eac0d093f30d6b91d88c1a27e1f7be91f0e84fdf199
+    REPO xiaozhuai/getopt-win32
+    REF b69a586f0b1aa37b77c3cf0a9dedba1900007678
+    SHA512 6e52b6f198073e85b3a29a2fe21435c591fce02c68cb8cf9b546791dd1197e9b91dd9104af449071b4a1d1485817a483f1989a2e585c2d0470cfd079290fe155
     HEAD_REF master
-    PATCHES getopt.h.patch
 )
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
@@ -18,8 +17,8 @@ file(COPY "${SOURCE_PATH}/getopt.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include
 if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     vcpkg_replace_string(
         "${CURRENT_PACKAGES_DIR}/include/getopt.h"
-        "	#define __GETOPT_H_"
-        "	#define __GETOPT_H_\n	#define STATIC_GETOPT"
+        "defined(STATIC_GETOPT)"
+        "1"
     )
 endif()
 
@@ -29,6 +28,7 @@ vcpkg_cmake_config_fixup(
 )
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
 set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS "enabled")
diff --git a/external_imported/vcpkg/ports/getopt-win32/vcpkg.json b/external_imported/vcpkg/ports/getopt-win32/vcpkg.json
index bda4d6696..742939692 100644
--- a/external_imported/vcpkg/ports/getopt-win32/vcpkg.json
+++ b/external_imported/vcpkg/ports/getopt-win32/vcpkg.json
@@ -1,9 +1,8 @@
 {
   "name": "getopt-win32",
-  "version": "0.1",
-  "port-version": 7,
+  "version": "1.1.0.20220925",
   "description": "An implementation of getopt.",
-  "homepage": "https://github.com/libimobiledevice-win32/getopt",
+  "homepage": "https://www.codeproject.com/Articles/157001/Full-getopt-Port-for-Unicode-and-Multibyte-Microso/",
   "license": "LGPL-3.0-only",
   "supports": "windows & !mingw",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/getopt/vcpkg.json b/external_imported/vcpkg/ports/getopt/vcpkg.json
index 4626df727..3c36900f2 100644
--- a/external_imported/vcpkg/ports/getopt/vcpkg.json
+++ b/external_imported/vcpkg/ports/getopt/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "getopt",
-  "version-string": "0",
-  "port-version": 2,
+  "version": "0",
+  "port-version": 3,
   "description": "The getopt and getopt_long functions automate some of the chore involved in parsing typical unix command line options.",
   "supports": "!uwp",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/gettext-libintl/0003-Fix-win-unicode-paths.patch b/external_imported/vcpkg/ports/gettext-libintl/0003-Fix-win-unicode-paths.patch
new file mode 100644
index 000000000..e15e08755
--- /dev/null
+++ b/external_imported/vcpkg/ports/gettext-libintl/0003-Fix-win-unicode-paths.patch
@@ -0,0 +1,62 @@
+diff --git a/gettext-runtime/intl/loadmsgcat.c b/gettext-runtime/intl/loadmsgcat.c
+index d5a5fe1..5c47f48 100644
+--- a/gettext-runtime/intl/loadmsgcat.c
++++ b/gettext-runtime/intl/loadmsgcat.c
+@@ -390,9 +390,56 @@ char *alloca ();
+ # define munmap(addr, len)	__munmap (addr, len)
+ #elif defined _WIN32 && !defined __CYGWIN__
+ /* On native Windows, don't require linking with '-loldnames'.  */
+-# define open _open
++# define open(name, flags)	_open_utf8_windows_wrapper(name, flags)
+ # define read _read
+ # define close _close
++
++/* Provide wrapper of "open" for Windows that supports UTF-8 filenames. */
++# ifndef WIN32_LEAN_AND_MEAN
++#  define WIN32_LEAN_AND_MEAN
++# endif
++# ifndef WIN32_EXTRA_LEAN
++#  define WIN32_EXTRA_LEAN
++# endif
++# ifndef NOMINMAX
++#  define NOMINMAX
++# endif
++# include <windows.h>	// For: MultiByteToWideChar
++# include <io.h>
++# include <wchar.h>
++
++int _open_utf8_windows_wrapper(
++   const char *filename,
++   int flags
++)
++{
++	int wstr_len = -1;
++	wchar_t* pUtf16FileName = NULL;
++	int fh = -1;
++
++	// on Windows, convert the filename from UTF-8 to UTF-16
++	wstr_len = MultiByteToWideChar(CP_UTF8, 0, filename, -1, NULL, 0);
++	if (wstr_len <= 0)
++	{
++		// MultiByteToWideChar failed
++		errno = ENOENT;
++		return -1;
++	}
++	pUtf16FileName = malloc(wstr_len * sizeof(wchar_t));
++	if (MultiByteToWideChar(CP_UTF8, 0, filename, -1, pUtf16FileName, wstr_len) == 0)
++	{
++		// MultiByteToWideChar failed
++		free(pUtf16FileName);
++		errno = ENOENT;
++		return -1;
++	}
++
++	// and call _wopen
++	fh = _wopen(pUtf16FileName, flags);
++
++	free(pUtf16FileName);
++	return fh;
++}
+ #endif
+ 
+ /* For those losing systems which don't have `alloca' we have to add
diff --git a/external_imported/vcpkg/ports/gettext-libintl/bashify.cmake b/external_imported/vcpkg/ports/gettext-libintl/bashify.cmake
new file mode 100644
index 000000000..8b3d87e7b
--- /dev/null
+++ b/external_imported/vcpkg/ports/gettext-libintl/bashify.cmake
@@ -0,0 +1,16 @@
+# By using bash builtin expansion, we can avoid
+# expensively spawing three sub-processes (bash, echo, sed).
+foreach(dir IN LISTS SOURCE_DIRS)
+    file(READ "${dir}/configure" script)
+    string(REGEX REPLACE
+        "(\n[a-zA-Z0-9_]*)='`[\$]ECHO \"[\$]([^\"]*)\" \\| [\$]SED \"[\$]delay_single_quote_subst\"`'"
+        [[\1='${\2//\\'/\\'\\\\\\'\\'}']]
+        script "${script}"
+    )
+    string(REPLACE
+        [[    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in]]
+        [[    case "\${!var}" in]]
+        script "${script}"
+    )
+    file(WRITE "${dir}/configure" "${script}")
+endforeach()
diff --git a/external_imported/vcpkg/ports/gettext-libintl/portfile.cmake b/external_imported/vcpkg/ports/gettext-libintl/portfile.cmake
new file mode 100644
index 000000000..b72e7f7b8
--- /dev/null
+++ b/external_imported/vcpkg/ports/gettext-libintl/portfile.cmake
@@ -0,0 +1,115 @@
+if(VCPKG_TARGET_IS_LINUX)
+    set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+    if(NOT EXISTS "/usr/include/libintl.h")
+        message(FATAL_ERROR
+            "When targeting Linux, `libintl.h` is expected to come from the C Runtime Library (glibc). "
+            "Please use \"sudo apt-get install libc-dev\" or the equivalent to install development files."
+        )
+    endif()
+    file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+    return()
+endif()
+
+set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled)
+
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://ftp.gnu.org/pub/gnu/gettext/gettext-${VERSION}.tar.gz"
+         "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gettext/gettext-${VERSION}.tar.gz"
+    FILENAME "gettext-${VERSION}.tar.gz"
+    SHA512 ad2fa2f69be996a637e9b51e8941a39e10050060245dcec1fe75c15b68d0ff973043c87b77e4e2830e407e3bdd040b578f8e24fd05bba43adb94eaee34001aa5
+)
+
+vcpkg_extract_source_archive(SOURCE_PATH
+    ARCHIVE "${ARCHIVE}"
+    PATCHES
+        uwp.patch
+        0003-Fix-win-unicode-paths.patch
+)
+
+if(VCPKG_HOST_IS_WINDOWS)
+    message(STATUS "Modifying 'configure' to use fast bash variable expansion")
+    set(ENV{CONFIG_SHELL} "/usr/bin/bash")
+    vcpkg_execute_required_process(
+        COMMAND "${CMAKE_COMMAND}"
+            "-DSOURCE_DIRS=gettext-runtime"
+            -P "${CMAKE_CURRENT_LIST_DIR}/bashify.cmake"
+        WORKING_DIRECTORY "${SOURCE_PATH}"
+        LOGNAME "bashify-${TARGET_TRIPLET}"
+    )
+endif()
+
+set(OPTIONS
+    --no-recursion
+    --enable-relocatable #symbol duplication with glib-init.c?
+    --with-included-gettext
+    --without-libintl-prefix
+    --disable-dependency-tracking
+    ac_cv_path_GMSGFMT=false
+    ac_cv_path_MSGFMT=false
+    ac_cv_path_MSGMERGE=false
+    ac_cv_path_XGETTEXT=false
+    ac_cv_prog_INTLBISON=false
+)
+if(VCPKG_TARGET_IS_WINDOWS)
+    list(APPEND OPTIONS
+        # Avoid unnecessary tests.
+        am_cv_func_iconv_works=yes
+        # This is required. For some reason these do not get correctly identified for release builds.
+        ac_cv_func_wcslen=yes
+        ac_cv_func_memmove=yes
+        # May trigger debugger window in debug builds, even in unattended builds.
+        # Cf. https://github.com/microsoft/vcpkg/issues/35974
+        gl_cv_func_printf_directive_n=no
+    )
+    if(NOT VCPKG_TARGET_IS_MINGW)
+        list(APPEND OPTIONS
+            # Don't take from port getopt-win32
+            ac_cv_header_getopt_h=no
+            # Don't take from port pthreads
+            ac_cv_header_pthread_h=no
+            # Detected 'no' everywhere except x64-windows-static
+            ac_cv_func_snprintf=no
+            # Detected x64 values for gnulib, overriding guesses for cross builds
+            gl_cv_func_mbrtowc_empty_input=no
+            # Detected x64 values for gettext, overriding guesses for x86 & x64-uwp
+            gt_cv_int_divbyzero_sigfpe=no
+        )
+    endif()
+endif()
+
+file(REMOVE "${CURRENT_BUILDTREES_DIR}/config.cache-${TARGET_TRIPLET}-rel.log")
+file(REMOVE "${CURRENT_BUILDTREES_DIR}/config.cache-${TARGET_TRIPLET}-dbg.log")
+vcpkg_configure_make(SOURCE_PATH "${SOURCE_PATH}/gettext-runtime/intl"
+    DETERMINE_BUILD_TRIPLET
+    USE_WRAPPERS
+    OPTIONS
+        ${OPTIONS}
+    OPTIONS_RELEASE
+        "--cache-file=${CURRENT_BUILDTREES_DIR}/config.cache-${TARGET_TRIPLET}-rel.log"
+    OPTIONS_DEBUG
+        "--cache-file=${CURRENT_BUILDTREES_DIR}/config.cache-${TARGET_TRIPLET}-dbg.log"
+    )
+
+# This helps with Windows build times, but should work everywhere in vcpkg.
+# - Avoid an extra command to move a temporary file, we are building out of source.
+# - Avoid a subshell just to add comments, the build dir is temporary.
+# - Avoid cygpath -w when other tools handle this for us.
+file(GLOB_RECURSE makefiles "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}*/Makefile")
+foreach(file IN LISTS makefiles)
+    file(READ "${file}" rules)
+    string(REGEX REPLACE "(\n\ttest -d [^ ]* [|][|] [\$][(]MKDIR_P[)][^\n;]*)(\n\t)" "\\1 || exit 1 ; \\\\\\2" rules "${rules}")
+    string(REGEX REPLACE "(\n\t){ echo '/[*] [^*]* [*]/'; \\\\\n\t  cat ([^;\n]*); \\\\\n\t[}] > [\$]@-t\n\tmv -f [\$]@-t ([\$]@\n)" "\\1cp \\2 \\3" rules "${rules}")
+    string(REGEX REPLACE " > [\$]@-t\n\t[\$][(]AM_V_at[)]mv [\$]@-t ([\$]@\n)" "> \\1" rules "${rules}")
+    string(REGEX REPLACE "([\$}[(]COMPILE[)] -c -o [\$]@) `[\$][(]CYGPATH_W[)] '[\$]<'`" "\\1 \$<" rules "${rules}")
+    string(REPLACE "  ../config.h" "  config.h" rules "${rules}")
+    file(WRITE "${file}" "${rules}")
+endforeach()
+
+vcpkg_install_make()
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/intl")
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/gettext-runtime/intl/COPYING.LIB")
diff --git a/external_imported/vcpkg/ports/gettext-libintl/usage b/external_imported/vcpkg/ports/gettext-libintl/usage
new file mode 100644
index 000000000..35472de10
--- /dev/null
+++ b/external_imported/vcpkg/ports/gettext-libintl/usage
@@ -0,0 +1,4 @@
+gettext-libintl is compatible with built-in CMake targets:
+
+    find_package(Intl REQUIRED)
+    target_link_libraries(main PRIVATE Intl::Intl) # since CMake 3.20
diff --git a/external_imported/vcpkg/ports/gettext-libintl/uwp.patch b/external_imported/vcpkg/ports/gettext-libintl/uwp.patch
new file mode 100644
index 000000000..c16a0f5f4
--- /dev/null
+++ b/external_imported/vcpkg/ports/gettext-libintl/uwp.patch
@@ -0,0 +1,39 @@
+diff --git a/gettext-runtime/intl/langprefs.c b/gettext-runtime/intl/langprefs.c
+index f774ba2..f488b7f 100644
+--- a/gettext-runtime/intl/langprefs.c
++++ b/gettext-runtime/intl/langprefs.c
+@@ -38,6 +38,11 @@ extern void _nl_locale_name_canonicalize (char *name);
+ 
+ #if defined _WIN32
+ # define WIN32_NATIVE
++# if defined(WINAPI_FAMILY_PARTITION)
++#  if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
++#   undef WIN32_NATIVE
++#  endif
++# endif
+ #endif
+ 
+ #ifdef WIN32_NATIVE
+diff --git a/gettext-runtime/intl/gnulib-lib/localcharset.c b/gettext-runtime/intl/gnulib-lib/localcharset.c
+index ec75427..9e063e4 100644
+--- a/gettext-runtime/intl/gnulib-lib/localcharset.c
++++ b/gettext-runtime/intl/gnulib-lib/localcharset.c
+@@ -34,6 +34,9 @@
+ #if defined _WIN32 && !defined __CYGWIN__
+ # define WINDOWS_NATIVE
+ # include <locale.h>
++# if !defined(WINAPI_FAMILY_PARTITION)
++#  define WINAPI_FAMILY_PARTITION(x) (0)
++# endif
+ #endif
+ 
+ #if defined __EMX__
+@@ -912,6 +915,8 @@ locale_charset (void)
+     /* The canonical name cannot be determined.  */
+     codeset = "";
+ 
++# elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
++    codeset = "";
+ # elif defined WINDOWS_NATIVE
+ 
+   char buf[2 + 10 + 1];
diff --git a/external_imported/vcpkg/ports/gettext/vcpkg-cmake-wrapper.cmake b/external_imported/vcpkg/ports/gettext-libintl/vcpkg-cmake-wrapper.cmake
similarity index 100%
rename from external_imported/vcpkg/ports/gettext/vcpkg-cmake-wrapper.cmake
rename to external_imported/vcpkg/ports/gettext-libintl/vcpkg-cmake-wrapper.cmake
diff --git a/external_imported/vcpkg/ports/gettext-libintl/vcpkg.json b/external_imported/vcpkg/ports/gettext-libintl/vcpkg.json
new file mode 100644
index 000000000..a86c4b7b6
--- /dev/null
+++ b/external_imported/vcpkg/ports/gettext-libintl/vcpkg.json
@@ -0,0 +1,15 @@
+{
+  "name": "gettext-libintl",
+  "version": "0.22.4",
+  "port-version": 1,
+  "description": "The libintl C library from GNU gettext-runtime.",
+  "homepage": "https://www.gnu.org/software/gettext/",
+  "license": "LGPL-2.1-or-later",
+  "supports": "!xbox",
+  "dependencies": [
+    {
+      "name": "libiconv",
+      "platform": "!linux"
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/gettext/Makefile b/external_imported/vcpkg/ports/gettext/Makefile
deleted file mode 100644
index b2b36d2ab..000000000
--- a/external_imported/vcpkg/ports/gettext/Makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-all: build-gettext-runtime-intl build-gettext-runtime-po build-gettext-runtime-src
-all: build-gettext-tools build-gettext-tools-gnulib build-gettext-tools-its build-gettext-tools-m4 build-gettext-tools-misc build-gettext-tools-po build-gettext-tools-projects build-gettext-tools-styles
-all: build-libtextstyle
-
-install: install-gettext-runtime-intl install-gettext-runtime-po install-gettext-runtime-src
-install: install-gettext-tools install-gettext-tools-gnulib install-gettext-tools-its install-gettext-tools-m4 install-gettext-tools-misc install-gettext-tools-po install-gettext-tools-projects install-gettext-tools-styles
-install: install-libtextstyle
-
-build-intl:
-	$(MAKE) -C intl all
-install-intl:
-	$(MAKE) -C intl install
-
-build-gettext-runtime-gnulib: build-gettext-runtime-intl
-	$(MAKE) -C gettext-runtime/gnulib-lib all
-build-gettext-runtime-intl:
-	$(MAKE) -C gettext-runtime/intl all
-build-gettext-runtime-po:
-	$(MAKE) -C gettext-runtime/po all
-build-gettext-runtime-src: build-gettext-runtime-intl build-gettext-runtime-gnulib
-	$(MAKE) -C gettext-runtime/src all
-build-gettext-tools: build-gettext-runtime-intl build-libtextstyle build-gettext-tools-gnulib build-gettext-tools-intl build-gettext-tools-libgrep build-gnulib-local
-	$(MAKE) -C gettext-tools/src all
-build-gettext-tools-gnulib: build-gettext-tools-intl
-	$(MAKE) -C gettext-tools/gnulib-lib all
-build-gettext-tools-libgrep: build-gettext-tools-gnulib
-	$(MAKE) -C gettext-tools/libgrep all
-build-gettext-tools-intl:
-	$(MAKE) -C gettext-tools/intl all
-build-gettext-tools-its:
-	$(MAKE) -C gettext-tools/its all
-build-gettext-tools-m4:
-	$(MAKE) -C gettext-tools/m4 all
-build-gettext-tools-misc:
-	$(MAKE) -C gettext-tools/misc all
-build-gettext-tools-po:
-	$(MAKE) -C gettext-tools/po all
-build-gettext-tools-projects:
-	$(MAKE) -C gettext-tools/projects all
-build-gettext-tools-styles:
-	$(MAKE) -C gettext-tools/styles all
-build-gnulib-local:
-	$(MAKE) -C gnulib-local all
-build-libtextstyle:
-	$(MAKE) -C libtextstyle/lib all
-
-install-gettext-runtime-intl:
-	$(MAKE) -C gettext-runtime/intl install
-install-gettext-runtime-po:
-	$(MAKE) -C gettext-runtime/po install
-install-gettext-runtime-src:
-	$(MAKE) -C gettext-runtime/src install
-install-gettext-tools:
-	$(MAKE) -C gettext-tools/src install
-install-gettext-tools-gnulib:
-	$(MAKE) -C gettext-tools/gnulib-lib install
-install-gettext-tools-its:
-	$(MAKE) -C gettext-tools/its install
-install-gettext-tools-m4:
-	$(MAKE) -C gettext-tools/m4 install
-install-gettext-tools-misc:
-	$(MAKE) -C gettext-tools/misc install
-install-gettext-tools-po:
-	$(MAKE) -C gettext-tools/po install
-install-gettext-tools-projects:
-	$(MAKE) -C gettext-tools/projects install
-install-gettext-tools-styles:
-	$(MAKE) -C gettext-tools/styles install
-install-libtextstyle:
-	$(MAKE) -C libtextstyle/lib install
diff --git a/external_imported/vcpkg/ports/gettext/android.patch b/external_imported/vcpkg/ports/gettext/android.patch
deleted file mode 100644
index 6f2a7d43f..000000000
--- a/external_imported/vcpkg/ports/gettext/android.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --color -ruN a/gettext-runtime/intl/dcigettext.c src/gettext-runtime/intl/dcigettext.c
---- a/gettext-runtime/intl/dcigettext.c	2021-05-26 16:27:55.420544597 +0200
-+++ src/gettext-runtime/intl/dcigettext.c	2021-05-26 16:29:14.546516701 +0200
-@@ -143,7 +143,7 @@
- # else
- #  if VMS
- #   define getcwd(buf, max) (getcwd) (buf, max, 0)
--#  else
-+#  elif !(defined(__clang__) && defined(__BIONIC_FORTIFY))
- char *getcwd ();
- #  endif
- # endif
diff --git a/external_imported/vcpkg/ports/gettext/assume-modern-darwin.patch b/external_imported/vcpkg/ports/gettext/assume-modern-darwin.patch
new file mode 100644
index 000000000..b59f434a6
--- /dev/null
+++ b/external_imported/vcpkg/ports/gettext/assume-modern-darwin.patch
@@ -0,0 +1,26 @@
+diff --git a/gettext-runtime/configure b/gettext-runtime/configure
+index a984774..f436a19 100755
+--- a/gettext-runtime/configure
++++ b/gettext-runtime/configure
+@@ -35448,7 +35448,7 @@ fi
+       haiku*) use_elf_origin_trick=yes ;;
+       # On Mac OS X 10.4 or newer, use Mac OS X tools. See
+       # <https://wincent.com/wiki/@executable_path,_@load_path_and_@rpath>.
+-      darwin | darwin[1-7].*) ;;
++      darwin[1-7].*) ;;
+       darwin*) use_macos_tools=yes ;;
+     esac
+     if test $is_noop = yes; then
+diff --git a/gettext-tools/configure b/gettext-tools/configure
+index ee64b69..2dde1f5 100755
+--- a/gettext-tools/configure
++++ b/gettext-tools/configure
+@@ -48606,7 +48606,7 @@ fi
+       haiku*) use_elf_origin_trick=yes ;;
+       # On Mac OS X 10.4 or newer, use Mac OS X tools. See
+       # <https://wincent.com/wiki/@executable_path,_@load_path_and_@rpath>.
+-      darwin | darwin[1-7].*) ;;
++      darwin[1-7].*) ;;
+       darwin*) use_macos_tools=yes ;;
+     esac
+     if test $is_noop = yes; then
diff --git a/external_imported/vcpkg/ports/gettext/bashify.cmake b/external_imported/vcpkg/ports/gettext/bashify.cmake
new file mode 100644
index 000000000..8b3d87e7b
--- /dev/null
+++ b/external_imported/vcpkg/ports/gettext/bashify.cmake
@@ -0,0 +1,16 @@
+# By using bash builtin expansion, we can avoid
+# expensively spawing three sub-processes (bash, echo, sed).
+foreach(dir IN LISTS SOURCE_DIRS)
+    file(READ "${dir}/configure" script)
+    string(REGEX REPLACE
+        "(\n[a-zA-Z0-9_]*)='`[\$]ECHO \"[\$]([^\"]*)\" \\| [\$]SED \"[\$]delay_single_quote_subst\"`'"
+        [[\1='${\2//\\'/\\'\\\\\\'\\'}']]
+        script "${script}"
+    )
+    string(REPLACE
+        [[    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in]]
+        [[    case "\${!var}" in]]
+        script "${script}"
+    )
+    file(WRITE "${dir}/configure" "${script}")
+endforeach()
diff --git a/external_imported/vcpkg/ports/gettext/config-step-order.patch b/external_imported/vcpkg/ports/gettext/config-step-order.patch
new file mode 100644
index 000000000..da247c65f
--- /dev/null
+++ b/external_imported/vcpkg/ports/gettext/config-step-order.patch
@@ -0,0 +1,76 @@
+diff --git a/gettext-runtime/configure b/gettext-runtime/configure
+index 2a376c6..a984774 100755
+--- a/gettext-runtime/configure
++++ b/gettext-runtime/configure
+@@ -22346,6 +22346,12 @@ printf "%s\n" "$acl_cv_libdirstems" >&6; }
+ 
+ 
+ 
++### Configuration step reordering
++### Similar to AM_GNU_GETTEXT(external,...), cf. gettext-runtime/m4/gettext.m4
++### Pull (include_next and) iconv lookup before actual GNU gettext lookup.
++for configuration_step in gettext-independent gettext-main ; do
++case "$configuration_step" in
++gettext-main)
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
+ printf %s "checking for CFPreferencesCopyAppValue... " >&6; }
+ if test ${gt_cv_func_CFPreferencesCopyAppValue+y}
+@@ -23288,6 +23294,9 @@ printf "%s\n" "#define HAVE_DCGETTEXT 1" >>confdefs.h
+ 
+ 
+ 
++### Configuration step reordering
++;;
++gettext-independent)
+                         # Check whether --enable-cross-guesses was given.
+ if test ${enable_cross_guesses+y}
+ then :
+@@ -30464,6 +30473,10 @@ printf "%s\n" "$gl_cv_next_iconv_h" >&6; }
+        gl_next_as_first_directive=$gl_cv_next_iconv_h
+      fi
+      NEXT_AS_FIRST_DIRECTIVE_ICONV_H=$gl_next_as_first_directive
++### Configuration step reordering
++;;
++esac
++done
+ 
+ 
+ 
+diff --git a/gettext-tools/configure b/gettext-tools/configure
+index 5ce6cf1..ee64b69 100755
+--- a/gettext-tools/configure
++++ b/gettext-tools/configure
+@@ -25735,6 +25735,12 @@ printf "%s\n" "$acl_cv_libdirstems" >&6; }
+ 
+ 
+ 
++### Configuration step reordering
++### Similar to AM_GNU_GETTEXT(external,...), cf. gettext-runtime/m4/gettext.m4
++### Pull (include_next and) iconv lookup before actual GNU gettext lookup.
++for configuration_step in gettext-independent gettext-main; do
++case "$configuration_step" in
++gettext-main)
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
+ printf %s "checking for CFPreferencesCopyAppValue... " >&6; }
+ if test ${gt_cv_func_CFPreferencesCopyAppValue+y}
+@@ -27588,6 +27594,9 @@ fi
+ 
+ 
+ 
++### Configuration step reordering
++;;
++gettext-independent)
+                         # Check whether --enable-cross-guesses was given.
+ if test ${enable_cross_guesses+y}
+ then :
+@@ -38458,6 +38467,10 @@ printf "%s\n" "$gl_cv_next_iconv_h" >&6; }
+        gl_next_as_first_directive=$gl_cv_next_iconv_h
+      fi
+      NEXT_AS_FIRST_DIRECTIVE_ICONV_H=$gl_next_as_first_directive
++### Configuration step reordering
++;;
++esac
++done
+ 
+ 
+ 
diff --git a/external_imported/vcpkg/ports/gettext/parallel-gettext-tools.patch b/external_imported/vcpkg/ports/gettext/parallel-gettext-tools.patch
new file mode 100644
index 000000000..65199bc12
--- /dev/null
+++ b/external_imported/vcpkg/ports/gettext/parallel-gettext-tools.patch
@@ -0,0 +1,25 @@
+diff --git a/gettext-tools/src/Makefile.in b/gettext-tools/src/Makefile.in
+index 5d60b99..d86232d 100644
+--- a/gettext-tools/src/Makefile.in
++++ b/gettext-tools/src/Makefile.in
+@@ -3625,7 +3625,10 @@ USEJAVA_no = 0
+ 
+ # Version information according to Woe32 conventions.
+ @WOE32_TRUE@WOE32_LDADD = gettext.res
+-all: $(BUILT_SOURCES)
++@USE_INSTALLED_LIBTEXTSTYLE_FALSE@all: textstyle.h
++all:
++	$(MAKE) $(AM_MAKEFLAGS) all-parallel
++all-parallel: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am
+ 
+ .SUFFIXES:
+@@ -5045,7 +5048,7 @@ uninstall-tcl:
+ # namely those which build textstyle.h, po-gram-gen.c, cldr-plural.c.
+ # See <https://lists.gnu.org/archive/html/bug-make/2019-05/msg00011.html>.
+ # So, turn off parallel execution in this Makefile.
+-.NOTPARALLEL:
++# .NOTPARALLEL:
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/external_imported/vcpkg/ports/gettext/portfile.cmake b/external_imported/vcpkg/ports/gettext/portfile.cmake
index 3016d982a..fe4796a87 100644
--- a/external_imported/vcpkg/ports/gettext/portfile.cmake
+++ b/external_imported/vcpkg/ports/gettext/portfile.cmake
@@ -1,152 +1,210 @@
-if(VCPKG_TARGET_IS_LINUX AND NOT EXISTS "/usr/include/libintl.h")
-    message(FATAL_ERROR "When targeting Linux, `libintl.h` is expected to come from the C Runtime Library (glibc). "
-                        "Please use \"sudo apt-get install libc-dev\" or the equivalent to install development files."
-    )
-endif()
-
-set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled)
+# This port is just to provide gettext tools and build data, not libs.
+# The "core" feature depends on port gettext-libintl which provides libintl.
+# The "core" feature also installs enough for running autoreconf.
+# The actual tools are only enabled by opt-in features.
+# These features are typically used as a host dependency.
+# For fast builds in particular on Windows, the following choices are made:
+# - only release build type
+# - namespacing disabled (windows only)
+# - configuration cache
+# - using preinstalled gettext-libintl
+# - skipping some subdirs
+set(VCPKG_BUILD_TYPE release)
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
 
 vcpkg_download_distfile(ARCHIVE
     URLS "https://ftp.gnu.org/pub/gnu/gettext/gettext-${VERSION}.tar.gz"
          "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gettext/gettext-${VERSION}.tar.gz"
     FILENAME "gettext-${VERSION}.tar.gz"
-    SHA512 ccd43a43fab3c90ed99b3e27628c9aeb7186398153b137a4997f8c7ddfd9729b0ba9d15348567e5206af50ac027673d2b8a3415bb3fc65f87ad778f85dc03a05
+    SHA512 ad2fa2f69be996a637e9b51e8941a39e10050060245dcec1fe75c15b68d0ff973043c87b77e4e2830e407e3bdd040b578f8e24fd05bba43adb94eaee34001aa5
 )
 
 vcpkg_extract_source_archive(SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
     PATCHES
-        android.patch
+        assume-modern-darwin.patch
         uwp.patch
-        win-gethostname.patch
-        0003-Fix-win-unicode-paths.patch
         rel_path.patch
+        subdirs.patch
+        parallel-gettext-tools.patch
+        config-step-order.patch
 )
 
-vcpkg_find_acquire_program(BISON)
-get_filename_component(BISON_PATH "${BISON}" DIRECTORY)
-vcpkg_add_to_path("${BISON_PATH}")
+set(subdirs "")
+if("runtime-tools" IN_LIST FEATURES)
+    string(APPEND subdirs " gettext-runtime")
+endif()
+if("tools" IN_LIST FEATURES)
+    string(APPEND subdirs " libtextstyle gettext-tools")
+endif()
+if(subdirs)
+    set(ENV{VCPKG_GETTEXT_SUBDIRS} "${subdirs}")
+
+    vcpkg_find_acquire_program(BISON)
+    cmake_path(GET BISON FILENAME BISON_NAME)
+    cmake_path(GET BISON PARENT_PATH BISON_PATH)
+    vcpkg_add_to_path("${BISON_PATH}")
 
-set(OPTIONS
-    --enable-relocatable #symbol duplication with glib-init.c?
-    --enable-c++
-    --disable-acl
-    --disable-csharp
-    --disable-curses
-    --disable-java
-    --disable-openmp
-)
-if(VCPKG_TARGET_IS_WINDOWS)
-    list(APPEND OPTIONS
-        # Avoid unnecessary test.
+    if(VCPKG_HOST_IS_WINDOWS)
+        message(STATUS "Modifying build system for less forks")
+        set(ENV{CONFIG_SHELL} "/usr/bin/bash")
+        vcpkg_execute_required_process(
+            COMMAND "${CMAKE_COMMAND}"
+                "-DSOURCE_DIRS=.;gettext-runtime;libtextstyle;gettext-tools"
+                -P "${CMAKE_CURRENT_LIST_DIR}/bashify.cmake"
+            WORKING_DIRECTORY "${SOURCE_PATH}"
+            LOGNAME "bashify-${TARGET_TRIPLET}"
+        )
+    endif()
+
+    set(OPTIONS
+        --enable-relocatable #symbol duplication with glib-init.c?
+        --enable-c++
+        --disable-acl
+        --disable-csharp
+        --disable-curses
+        --disable-java
+        --disable-openmp
+        --disable-dependency-tracking
+        # Avoiding system dependencies and unnecessary tests
         --with-included-glib
-        # This is required. For some reason these do not get correctly identified for release builds.
-        ac_cv_func_wcslen=yes
-        ac_cv_func_memmove=yes
-        # The following are required for a full gettext built (libintl and tools).
-        gl_cv_func_printf_directive_n=no  # segfaults otherwise with popup window
-        ac_cv_func_memset=yes             # not detected in release builds
-        ac_cv_header_pthread_h=no
-        ac_cv_header_dirent_h=no
-        ac_cv_header_getopt_h=no
+        --with-included-libxml # libtextstyle won't use external libxml
+        --with-included-libunistring
+        --with-installed-libtextstyle=no
+        --without-cvs
+        --without-emacs
+        --without-git
+        --without-libcurses-prefix
+        --without-libncurses-prefix
+        --without-libtermcap-prefix
+        --without-libxcurses-prefix
+        "INTLBISON=${BISON_NAME}"
+        "TOOLS_BISON=${BISON_NAME}"
     )
-endif()
 
-# These functions scope any changes to VCPKG_BUILD_TYPE
-function(build_libintl_and_tools)
-    cmake_parse_arguments(arg "" "BUILD_TYPE" "" ${ARGN})
-    if(DEFINED arg_BUILD_TYPE)
-        set(VCPKG_BUILD_TYPE "${arg_BUILD_TYPE}")
+    if("nls" IN_LIST FEATURES)
+        vcpkg_list(APPEND options "--enable-nls")
+    else()
+        vcpkg_list(APPEND options "--disable-nls")
+    endif()
+
+    if(VCPKG_TARGET_IS_LINUX)
+        # Cannot use gettext-libintl, empty port on linux
+        set(ENV{VCPKG_INTL} intl)
+    else()
+        # Relying on gettext-libintl
+        list(APPEND OPTIONS --with-included-gettext=no)
+    endif()
+    if(VCPKG_TARGET_IS_WINDOWS)
+        list(APPEND OPTIONS
+            # Faster, but not for export
+            --disable-namespacing
+            # Avoid unnecessary tests.
+            am_cv_func_iconv_works=yes
+            "--with-libiconv-prefix=${CURRENT_INSTALLED_DIR}"
+            "--with-libintl-prefix=${CURRENT_INSTALLED_DIR}"
+            # This is required. For some reason these do not get correctly identified for release builds.
+            ac_cv_func_wcslen=yes
+            ac_cv_func_memmove=yes
+            # The following are required for a full gettext built (libintl and tools).
+            gl_cv_func_printf_directive_n=no  # segfaults otherwise with popup window
+            ac_cv_func_memset=yes             # not detected in release builds
+        )
+        if(NOT VCPKG_TARGET_IS_MINGW)
+            list(APPEND OPTIONS
+                # Don't take from port dirent
+                ac_cv_header_dirent_h=no
+                # Don't take from port getopt-win32
+                ac_cv_header_getopt_h=no
+                # Don't take from port pthreads
+                ac_cv_header_pthread_h=no
+                ac_cv_header_sched_h=no
+                ac_cv_header_semaphore_h=no
+                # Detected 'no' everywhere except x64-windows-static
+                ac_cv_func_snprintf=no
+                # Detected x64 values for gnulib, overriding guesses for cross builds
+                gl_cv_func_fopen_mode_x=yes
+                gl_cv_func_frexpl_works=yes
+                gl_cv_func_getcwd_null=yes
+                gl_cv_func_mbrtowc_empty_input=no
+                gl_cv_func_mbsrtowcs_works=yes
+                gl_cv_func_printf_flag_zero=yes
+                gl_cv_func_printf_infinite_long_double=yes
+                gl_cv_func_printf_precision=yes
+                gl_cv_func_snprintf_truncation_c99=yes
+                # Detected x64 values for gettext, overriding guesses for x86 & x64-uwp
+                gt_cv_int_divbyzero_sigfpe=no
+            )
+        endif()
     endif()
+
+    file(REMOVE "${CURRENT_BUILDTREES_DIR}/config.cache-${TARGET_TRIPLET}-rel.log")
     vcpkg_configure_make(SOURCE_PATH "${SOURCE_PATH}"
         DETERMINE_BUILD_TRIPLET
         USE_WRAPPERS
-        ADD_BIN_TO_PATH # So configure can check for working iconv
         ADDITIONAL_MSYS_PACKAGES gzip
         OPTIONS
             ${OPTIONS}
+        OPTIONS_RELEASE
+            "--cache-file=${CURRENT_BUILDTREES_DIR}/config.cache-${TARGET_TRIPLET}-rel.log"
     )
-    vcpkg_install_make(MAKEFILE "${CMAKE_CURRENT_LIST_DIR}/Makefile")
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/gettext/user-email" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../..")
-endfunction()
 
-function(build_libintl_only)
-    cmake_parse_arguments(arg "" "BUILD_TYPE" "" ${ARGN})
-    if(DEFINED arg_BUILD_TYPE)
-        set(VCPKG_BUILD_TYPE "${arg_BUILD_TYPE}")
-    endif()
-    vcpkg_configure_make(SOURCE_PATH "${SOURCE_PATH}/gettext-runtime"
-        DETERMINE_BUILD_TRIPLET
-        USE_WRAPPERS
-        ADD_BIN_TO_PATH # So configure can check for working iconv
-        OPTIONS
-            ${OPTIONS}
-    )
-    vcpkg_install_make(
-        MAKEFILE "${CMAKE_CURRENT_LIST_DIR}/Makefile"
-        BUILD_TARGET   build-intl
-        INSTALL_TARGET install-intl
-    )
-endfunction()
+    # This helps with Windows build times, but should work everywhere in vcpkg.
+    # - Avoid an extra command to move a temporary file, we are building out of source.
+    # - Avoid a subshell just to add comments, the build dir is temporary.
+    # - Avoid cygpath -w when other tools handle this for us.
+    file(GLOB_RECURSE makefiles "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}*/*Makefile")
+    foreach(file IN LISTS makefiles)
+        file(READ "${file}" rules)
+        string(REGEX REPLACE "(\n\ttest -d [^ ]* [|][|] [\$][(]MKDIR_P[)][^\n;]*)(\n\t)" "\\1 || exit 1 ; \\\\\\2" rules "${rules}")
+        string(REGEX REPLACE "(\n\t){ echo '/[*] [^*]* [*]/'; \\\\\n\t  cat ([^;\n]*); \\\\\n\t[}] > [\$]@-t\n\tmv -f [\$]@-t ([\$]@\n)" "\\1cp \\2 \\3" rules "${rules}")
+        string(REGEX REPLACE " > [\$]@-t\n\t[\$][(]AM_V_at[)]mv [\$]@-t ([\$]@\n)" "> \\1" rules "${rules}")
+        string(REGEX REPLACE "([\$}[(]COMPILE[)] -c -o [\$]@) `[\$][(]CYGPATH_W[)] '[\$]<'`" "\\1 \$<" rules "${rules}")
+        file(WRITE "${file}" "${rules}")
+    endforeach()
 
-if("tools" IN_LIST FEATURES)
-    # Minimization of gettext tools build time by:
-    # - building tools only for release configuration
-    # - custom top-level Makefile
-    # - configuration cache
-    list(APPEND OPTIONS "--cache-file=../config.cache-${TARGET_TRIPLET}")
-    file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/config.cache-${TARGET_TRIPLET}")
-    build_libintl_and_tools(BUILD_TYPE "release")
+    vcpkg_install_make()
+    vcpkg_copy_pdbs()
     vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin")
-    file(GLOB tool_libs
-        LIST_DIRECTORIES false
-        "${CURRENT_PACKAGES_DIR}/bin/*"
-        "${CURRENT_PACKAGES_DIR}/lib/*"
-    )
-    list(FILTER tool_libs EXCLUDE REGEX "intl[^/\\\\]*$")
-    file(REMOVE ${tool_libs})
-    file(GLOB tool_includes
-        LIST_DIRECTORIES true
-        "${CURRENT_PACKAGES_DIR}/include/*"
+    file(GLOB unix_runtime LIST_DIRECTORIES false
+        "${CURRENT_PACKAGES_DIR}/lib/libgettext*${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}*"
+        "${CURRENT_PACKAGES_DIR}/lib/libtextstyle*${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}*"
     )
-    list(FILTER tool_includes EXCLUDE REGEX "intl[^/\\\\]*$")
-    file(REMOVE_RECURSE ${tool_includes})
-    if(VCPKG_TARGET_IS_LINUX)
-        set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
-        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include")
-        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
-    elseif(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}.release")
-        file(RENAME "${CURRENT_PACKAGES_DIR}" "${CURRENT_PACKAGES_DIR}.release")
-        file(READ "${CURRENT_BUILDTREES_DIR}/config.cache-${TARGET_TRIPLET}" config_cache)
-        string(REGEX REPLACE "\nac_cv_env[^\n]*" "" config_cache "${config_cache}") # Eliminate build type flags
-        file(WRITE "${CURRENT_BUILDTREES_DIR}/config.cache-${TARGET_TRIPLET}" "${config_cache}")
-        build_libintl_only(BUILD_TYPE "debug")
-        file(RENAME "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}.release/debug")
-        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}")
-        file(RENAME "${CURRENT_PACKAGES_DIR}.release" "${CURRENT_PACKAGES_DIR}")
+    if(unix_runtime)
+        file(INSTALL ${unix_runtime} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin")
     endif()
+    file(GLOB link_libs LIST_DIRECTORIES false "${CURRENT_PACKAGES_DIR}/lib/*" "${CURRENT_PACKAGES_DIR}/bin/*.dll")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include" ${link_libs})
+endif()
+
+if("tools" IN_LIST FEATURES)
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/gettext/user-email" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../..")
 else()
-    if(VCPKG_TARGET_IS_LINUX)
-        set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
-    else()
-        list(APPEND OPTIONS "--config-cache")
-        build_libintl_only()
-    endif()
-    # A fast installation of the autopoint tool and data, needed for autotools
+    # A fast installation of the autopoint tool and data, needed for autoconfig
     include("${CMAKE_CURRENT_LIST_DIR}/install-autopoint.cmake")
     install_autopoint()
 endif()
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-
-vcpkg_copy_pdbs()
+# These files can be needed to run `autoreconf`.
+# We want to install these files also for fast "core" builds without "tools".
+# Cf. PACKAGING for the file list.
+file(INSTALL
+    "${SOURCE_PATH}/gettext-runtime/m4/build-to-host.m4"
+    "${SOURCE_PATH}/gettext-runtime/m4/gettext.m4"
+    "${SOURCE_PATH}/gettext-runtime/m4/iconv.m4"
+    "${SOURCE_PATH}/gettext-runtime/m4/intlmacosx.m4"
+    "${SOURCE_PATH}/gettext-runtime/m4/nls.m4"
+    "${SOURCE_PATH}/gettext-runtime/m4/po.m4"
+    "${SOURCE_PATH}/gettext-runtime/m4/progtest.m4"
+    "${SOURCE_PATH}/gettext-runtime/gnulib-m4/host-cpu-c-abi.m4"
+    "${SOURCE_PATH}/gettext-runtime/gnulib-m4/lib-ld.m4"
+    "${SOURCE_PATH}/gettext-runtime/gnulib-m4/lib-link.m4"
+    "${SOURCE_PATH}/gettext-runtime/gnulib-m4/lib-prefix.m4"
+    DESTINATION "${CURRENT_PACKAGES_DIR}/share/gettext/aclocal"
+)
 
-if(NOT VCPKG_TARGET_IS_LINUX)
-    file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/intl")
-endif()
-if("tools" IN_LIST FEATURES AND NOT VCPKG_CROSSCOMPILING)
-    file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+if(NOT VCPKG_CROSSCOMPILING)
+    file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/gettext")
 endif()
 
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/gettext-runtime/COPYING" "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/gettext/subdirs.patch b/external_imported/vcpkg/ports/gettext/subdirs.patch
new file mode 100644
index 000000000..9931fed01
--- /dev/null
+++ b/external_imported/vcpkg/ports/gettext/subdirs.patch
@@ -0,0 +1,127 @@
+diff --git a/configure b/configure
+index 904bdf5..e751ffc 100755
+--- a/configure
++++ b/configure
+@@ -2797,7 +2797,7 @@ am__tar='${AMTAR} chf - --format=ustar --owner=root --group=root "$$tardir"'
+ 
+ 
+ 
+-subdirs="$subdirs gettext-runtime libtextstyle gettext-tools"
++subdirs="$subdirs gettext-runtime $(echo ${VCPKG_GETTEXT_SUBDIRS} | sed 's/gettext-runtime//')"
+ 
+ 
+ 
+diff --git a/Makefile.in b/Makefile.in
+index a287d38..075ddc5 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -311,7 +311,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
+ ACLOCAL_AMFLAGS = -I m4
+-SUBDIRS = gnulib-local gettext-runtime libtextstyle gettext-tools
++SUBDIRS = $(VCPKG_GETTEXT_SUBDIRS)
+ changelog_etc = \
+   gettext-runtime/ChangeLog.0 \
+   gettext-runtime/doc/ChangeLog.0 \
+diff --git a/gettext-runtime/Makefile.in b/gettext-runtime/Makefile.in
+index 8b8b5bc..bb75447 100644
+--- a/gettext-runtime/Makefile.in
++++ b/gettext-runtime/Makefile.in
+@@ -1487,7 +1487,7 @@ ACLOCAL_AMFLAGS = -I m4 -I ../m4 -I gnulib-m4
+ # The list of subdirectories depends on whether --disable-libasprintf was
+ # specified.
+ @ENABLE_LIBASPRINTF_TRUE@SUBDIR_libasprintf = libasprintf
+-SUBDIRS = doc intl intl-java intl-csharp gnulib-lib $(SUBDIR_libasprintf) src po man m4 tests
++SUBDIRS =     $(VCPKG_INTL)              gnulib-lib                       src po
+ 
+ # Allow users to use "gnulib-tool --update".
+ 
+diff --git a/gettext-runtime/configure b/gettext-runtime/configure
+index a7594ed..296f3b7 100644
+--- a/gettext-runtime/configure
++++ b/gettext-runtime/configure
+@@ -26906,7 +26906,7 @@ printf "%s\n" "$ac_res" >&6; }
+ 
+                                         if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
+            || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
+-                && test "$PACKAGE" != gettext-runtime \
++                && test "$PACKAGE" != pristine-gettext-runtime \
+                 && test "$PACKAGE" != gettext-tools \
+                 && test "$PACKAGE" != libintl; }; then
+           gt_use_preinstalled_gnugettext=yes
+diff --git a/gettext-runtime/libasprintf/configure b/gettext-runtime/libasprintf/configure
+--- a/gettext-runtime/libasprintf/configure
++++ b/gettext-runtime/libasprintf/configure
+index ff1c212..0c0dbcd 100644
+@@ -11,6 +11,7 @@
+ #
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
++exit 0;
+ ## -------------------- ##
+ ## M4sh Initialization. ##
+ ## -------------------- ##
+diff --git a/gettext-tools/Makefile.in b/gettext-tools/Makefile.in
+index 59e81a8..107856d 100644
+--- a/gettext-tools/Makefile.in
++++ b/gettext-tools/Makefile.in
+@@ -2872,7 +2872,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
+ ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
+-SUBDIRS = gnulib-lib libgrep src libgettextpo po its projects styles emacs misc man m4 tests system-tests gnulib-tests examples doc
++SUBDIRS = gnulib-lib libgrep src              po its projects styles       misc
+ 
+ # Allow users to use "gnulib-tool --update".
+ 
+diff --git a/gettext-tools/configure b/gettext-tools/configure
+index 056a830..9abca7e 100644
+--- a/gettext-tools/configure
++++ b/gettext-tools/configure
+@@ -29661,7 +29661,7 @@ printf "%s\n" "$ac_res" >&6; }
+                                         if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
+            || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
+                 && test "$PACKAGE" != gettext-runtime \
+-                && test "$PACKAGE" != gettext-tools \
++                && test "$PACKAGE" != pristine-gettext-tools \
+                 && test "$PACKAGE" != libintl; }; then
+           gt_use_preinstalled_gnugettext=yes
+         else
+diff --git a/gettext-tools/examples/configure b/gettext-tools/examples/configure
+--- a/gettext-tools/examples/configure
++++ b/gettext-tools/examples/configure
+index ff1c212..0c0dbcd 100644
+@@ -11,6 +11,7 @@
+ #
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
++exit 0;
+ ## -------------------- ##
+ ## M4sh Initialization. ##
+ ## -------------------- ##
+diff --git a/gettext-tools/src/Makefile.in b/gettext-tools/src/Makefile.in
+--- a/gettext-tools/src/Makefile.in
++++ b/gettext-tools/src/Makefile.in
+index ff1c212..0c0dbcd 100644
+@@ -4381,6 +4381,7 @@
+ 	$(AM_V_GEN)$(msgfilter_LINK) $(msgfilter_OBJECTS) $(msgfilter_LDADD) $(LIBS)
+ ../../gettext-runtime/intl/$(am__dirstamp):
+ 	@$(MKDIR_P) ../../gettext-runtime/intl
++	@$(MAKE) -C ../../gettext-runtime/intl libgnuintl.h
+ 	@: > ../../gettext-runtime/intl/$(am__dirstamp)
+ ../../gettext-runtime/intl/msgfmt-hash-string.$(OBJEXT):  \
+ 	../../gettext-runtime/intl/$(am__dirstamp)
+diff --git a/libtextstyle/Makefile.in b/libtextstyle/Makefile.in
+index ff1c212..0c0dbcd 100644
+--- a/libtextstyle/Makefile.in
++++ b/libtextstyle/Makefile.in
+@@ -1667,7 +1667,7 @@ AUTOMAKE_OPTIONS = 1.13 gnu no-dependencies
+ ACLOCAL_AMFLAGS = -I m4 -I gnulib-m4
+ 
+ # The list of subdirectories containing Makefiles.
+-SUBDIRS = lib tests adhoc-tests doc
++SUBDIRS = lib
+ 
+ # Allow users to use "gnulib-tool --update".
+ 
diff --git a/external_imported/vcpkg/ports/gettext/uwp.patch b/external_imported/vcpkg/ports/gettext/uwp.patch
index 416e2ea3c..69dc5872d 100644
--- a/external_imported/vcpkg/ports/gettext/uwp.patch
+++ b/external_imported/vcpkg/ports/gettext/uwp.patch
@@ -15,26 +15,10 @@ index f9753c4..3a3caee 100644
  /* Get _get_osfhandle.  */
  # if GNULIB_MSVC_NOTHROW
  #  include "msvc-nothrow.h"
-diff --git a/gettext-runtime/intl/langprefs.c b/gettext-runtime/intl/langprefs.c
-index f774ba2..f488b7f 100644
---- a/gettext-runtime/intl/langprefs.c
-+++ b/gettext-runtime/intl/langprefs.c
-@@ -38,6 +38,11 @@ extern void _nl_locale_name_canonicalize (char *name);
- 
- #if defined _WIN32
- # define WIN32_NATIVE
-+# if defined(WINAPI_FAMILY_PARTITION)
-+#  if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
-+#   undef WIN32_NATIVE
-+#  endif
-+# endif
- #endif
- 
- #ifdef WIN32_NATIVE
-diff --git a/gettext-runtime/intl/localcharset.c b/gettext-runtime/intl/localcharset.c
+diff --git a/gettext-runtime/gnulib-lib/localcharset.c b/gettext-runtime/gnulib-lib/localcharset.c
 index ec75427..9e063e4 100644
---- a/gettext-runtime/intl/localcharset.c
-+++ b/gettext-runtime/intl/localcharset.c
+--- a/gettext-runtime/gnulib-lib/localcharset.c
++++ b/gettext-runtime/gnulib-lib/localcharset.c
 @@ -34,6 +34,9 @@
  #if defined _WIN32 && !defined __CYGWIN__
  # define WINDOWS_NATIVE
@@ -54,10 +38,10 @@ index ec75427..9e063e4 100644
  # elif defined WINDOWS_NATIVE
  
    char buf[2 + 10 + 1];
-diff --git a/gettext-runtime/intl/localename.c b/gettext-runtime/intl/localename.c
+diff --git a/gettext-runtime/gnulib-lib/localename.c b/gettext-runtime/gnulib-lib/localename.c
 index d77bb81..3c6e055 100644
---- a/gettext-runtime/intl/localename.c
-+++ b/gettext-runtime/intl/localename.c
+--- a/gettext-runtime/gnulib-lib/localename.c
++++ b/gettext-runtime/gnulib-lib/localename.c
 @@ -69,6 +69,11 @@ extern char * getlocalename_l(int, locale_t);
  
  #if defined _WIN32 && !defined __CYGWIN__
@@ -67,6 +51,6 @@ index d77bb81..3c6e055 100644
 +#   undef WIN32_NATIVE
 +#  endif
 +# endif
- # if !defined IN_LIBINTL
- #  include "glthread/lock.h"
- # endif
+ # include "glthread/lock.h"
+ #endif
+
diff --git a/external_imported/vcpkg/ports/gettext/vcpkg.json b/external_imported/vcpkg/ports/gettext/vcpkg.json
index f4d58963b..2eb67e19d 100644
--- a/external_imported/vcpkg/ports/gettext/vcpkg.json
+++ b/external_imported/vcpkg/ports/gettext/vcpkg.json
@@ -1,16 +1,31 @@
 {
   "name": "gettext",
-  "version": "0.21.1",
-  "description": "GNU gettext provides libintl and a set of tools to help produce multi-lingual messages.",
+  "version": "0.22.4",
+  "port-version": 2,
+  "description": "A GNU framework to help produce multi-lingual messages.",
   "homepage": "https://www.gnu.org/software/gettext/",
-  "license": null,
+  "license": "GPL-3.0-only",
+  "supports": "!xbox",
   "dependencies": [
-    "libiconv"
+    "gettext-libintl"
   ],
   "features": {
+    "nls": {
+      "description": "Enable native language support"
+    },
+    "runtime-tools": {
+      "description": "Build runtime tools for internationalization of scripts",
+      "supports": "!uwp",
+      "dependencies": [
+        "libiconv"
+      ]
+    },
     "tools": {
       "description": "Build gettext tools",
-      "supports": "!uwp"
+      "supports": "!uwp",
+      "dependencies": [
+        "libiconv"
+      ]
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/gettext/win-gethostname.patch b/external_imported/vcpkg/ports/gettext/win-gethostname.patch
deleted file mode 100644
index 3e3f399df..000000000
--- a/external_imported/vcpkg/ports/gettext/win-gethostname.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/gettext-tools/src/hostname.c b/gettext-tools/src/hostname.c
-index e909637..c2e8065 100644
---- a/gettext-tools/src/hostname.c
-+++ b/gettext-tools/src/hostname.c
-@@ -29,7 +29,9 @@
- #include <locale.h>
- 
- #if defined _WIN32
-+# if !HAVE_GETHOSTNAME
- # define WIN32_NATIVE
-+# endif
- #endif
- 
- /* Get gethostname().  */
-@@ -56,6 +58,9 @@
- 
- /* Support for using gethostbyname().  */
- #if HAVE_GETHOSTBYNAME
-+# if HAVE_WINSOCK2_H
-+#  include <winsock2.h>
-+# else
- # include <sys/types.h>
- # include <sys/socket.h> /* defines AF_INET, AF_INET6 */
- # include <netinet/in.h> /* declares ntohs(), defines struct sockaddr_in */
-@@ -76,6 +81,7 @@
- #  endif
- # endif
- # include <netdb.h> /* defines struct hostent, declares gethostbyname() */
-+# endif
- #endif
- 
- /* Include this after <sys/socket.h>, to avoid a syntax error on BeOS.  */
-diff --git a/libtextstyle/lib/unistd.in.h b/libtextstyle/lib/unistd.in.h
-index fd69a48..4ebdcaa 100644
---- a/libtextstyle/lib/unistd.in.h
-+++ b/libtextstyle/lib/unistd.in.h
-@@ -1240,7 +1240,7 @@ _GL_WARN_ON_USE (getgroups, "getgroups is unportable - "
-    Null terminate it if the name is shorter than LEN.
-    If the host name is longer than LEN, set errno = EINVAL and return -1.
-    Return 0 if successful, otherwise set errno and return -1.  */
--# if @UNISTD_H_HAVE_WINSOCK2_H@
-+# if @UNISTD_H_HAVE_WINSOCK2_H@ && !@HAVE_GETHOSTNAME@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   undef gethostname
- #   define gethostname rpl_gethostname
diff --git a/external_imported/vcpkg/ports/gettimeofday/portfile.cmake b/external_imported/vcpkg/ports/gettimeofday/portfile.cmake
index 0d08bacc8..0b4d4b815 100644
--- a/external_imported/vcpkg/ports/gettimeofday/portfile.cmake
+++ b/external_imported/vcpkg/ports/gettimeofday/portfile.cmake
@@ -1,9 +1,8 @@
-vcpkg_configure_cmake(
-    SOURCE_PATH ${CMAKE_CURRENT_LIST_DIR}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${CMAKE_CURRENT_LIST_DIR}"
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
-file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/external_imported/vcpkg/ports/gettimeofday/vcpkg.json b/external_imported/vcpkg/ports/gettimeofday/vcpkg.json
index 9528e9a2c..c4b387f8e 100644
--- a/external_imported/vcpkg/ports/gettimeofday/vcpkg.json
+++ b/external_imported/vcpkg/ports/gettimeofday/vcpkg.json
@@ -1,6 +1,12 @@
 {
   "name": "gettimeofday",
-  "version-string": "2017-10-14",
-  "port-version": 4,
-  "description": "An implementation of gettimeofday for WIN32"
+  "version-date": "2017-10-14",
+  "port-version": 6,
+  "description": "An implementation of gettimeofday for WIN32",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/gflags/portfile.cmake b/external_imported/vcpkg/ports/gflags/portfile.cmake
index f1c22ff1a..7fa6a8607 100644
--- a/external_imported/vcpkg/ports/gflags/portfile.cmake
+++ b/external_imported/vcpkg/ports/gflags/portfile.cmake
@@ -13,31 +13,29 @@ vcpkg_from_github(
         fix_cmake_config.patch
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DGFLAGS_REGISTER_BUILD_DIR:BOOL=OFF
         -DGFLAGS_REGISTER_INSTALL_PREFIX:BOOL=OFF
         -DBUILD_gflags_nothreads_LIB:BOOL=OFF
-        -DGFLAGS_USE_TARGET_NAMESPACE:BOOL=ON
-        -DCMAKE_DEBUG_POSTFIX=d
 )
 
-vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/gflags)
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin)
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/gflags)
+if(NOT VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_fixup_pkgconfig()
+    if(NOT VCPKG_BUILD_TYPE)
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gflags.pc" "-lgflags" "-lgflags_debug")
+    endif()
 endif()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-file(INSTALL "${SOURCE_PATH}/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING.txt")
 
-vcpkg_copy_pdbs()
 
-vcpkg_fixup_pkgconfig()
diff --git a/external_imported/vcpkg/ports/gflags/usage b/external_imported/vcpkg/ports/gflags/usage
index 67fb74789..5d86c434a 100644
--- a/external_imported/vcpkg/ports/gflags/usage
+++ b/external_imported/vcpkg/ports/gflags/usage
@@ -1,4 +1,5 @@
-The package gflags provides CMake targets:
+gflags provides CMake targets:
 
+    set(GFLAGS_USE_TARGET_NAMESPACE ON)
     find_package(gflags CONFIG REQUIRED)
     target_link_libraries(main PRIVATE gflags::gflags)
diff --git a/external_imported/vcpkg/ports/gflags/vcpkg-cmake-wrapper.cmake b/external_imported/vcpkg/ports/gflags/vcpkg-cmake-wrapper.cmake
index 55b3fc8dc..8fbb208b4 100644
--- a/external_imported/vcpkg/ports/gflags/vcpkg-cmake-wrapper.cmake
+++ b/external_imported/vcpkg/ports/gflags/vcpkg-cmake-wrapper.cmake
@@ -1,10 +1,7 @@
-set(GFLAGS_USE_TARGET_NAMESPACE ON)
-
+if(NOT DEFINED GFLAGS_USE_TARGET_NAMESPACE)
+    # vcpkg legacy
+    set(GFLAGS_USE_TARGET_NAMESPACE ON)
+    _find_package(${ARGS})
+    unset(GFLAGS_USE_TARGET_NAMESPACE)
+endif()
 _find_package(${ARGS})
-
-foreach(tgt gflags gflags_shared gflags_static)
-    if (NOT TARGET ${tgt} AND TARGET "gflags::${tgt}")
-        add_library(${tgt} INTERFACE IMPORTED)
-        target_link_libraries(${tgt} INTERFACE "gflags::${tgt}")
-    endif() 
-endforeach(tgt)
diff --git a/external_imported/vcpkg/ports/gflags/vcpkg.json b/external_imported/vcpkg/ports/gflags/vcpkg.json
index 3b8d22a06..32d0edbab 100644
--- a/external_imported/vcpkg/ports/gflags/vcpkg.json
+++ b/external_imported/vcpkg/ports/gflags/vcpkg.json
@@ -1,8 +1,19 @@
 {
   "name": "gflags",
-  "version-string": "2.2.2",
-  "port-version": 5,
+  "version": "2.2.2",
+  "port-version": 9,
   "description": "A C++ library that implements commandline flags processing",
   "homepage": "https://github.com/gflags/gflags",
-  "supports": "!uwp"
+  "license": "BSD-3-Clause",
+  "supports": "!uwp",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/ghc-filesystem/portfile.cmake b/external_imported/vcpkg/ports/ghc-filesystem/portfile.cmake
index 0e469fd5e..a1d5e9b38 100644
--- a/external_imported/vcpkg/ports/ghc-filesystem/portfile.cmake
+++ b/external_imported/vcpkg/ports/ghc-filesystem/portfile.cmake
@@ -1,9 +1,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO gulrak/filesystem
-    REF v1.5.12
+    REF "v${VERSION}"
     HEAD_REF master
-    SHA512 2cba74921104fa84547288ff983260ce1e81967df6a7d2a334074826c355c72945ad64e6979cd302a23c5e3a398990706b01fc573c046512e9f508edca9da12c
+    SHA512 6eae921485ecdaf4b8329a568b1f4f612ee491fc5fdeafce9c8000b9bf1a73b6fa4e07d0d4ddf05be49efe79e9bddfbcc0aba85529cb016668797a8d89eb9b82
 )
 
 set(VCPKG_BUILD_TYPE release) # header-only port
diff --git a/external_imported/vcpkg/ports/ghc-filesystem/vcpkg.json b/external_imported/vcpkg/ports/ghc-filesystem/vcpkg.json
index 6f292c2d7..11e4a5c42 100644
--- a/external_imported/vcpkg/ports/ghc-filesystem/vcpkg.json
+++ b/external_imported/vcpkg/ports/ghc-filesystem/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "ghc-filesystem",
-  "version": "1.5.12",
+  "version": "1.5.14",
   "description": "An implementation of C++17 std::filesystem for C++11/C++14/C++17/C++20 on Windows, macOS, Linux and FreeBSD",
   "homepage": "https://github.com/gulrak/filesystem",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/ginkgo/portfile.cmake b/external_imported/vcpkg/ports/ginkgo/portfile.cmake
index 2faede6d5..88efb1cd3 100644
--- a/external_imported/vcpkg/ports/ginkgo/portfile.cmake
+++ b/external_imported/vcpkg/ports/ginkgo/portfile.cmake
@@ -1,23 +1,20 @@
-vcpkg_download_distfile(WINDOWS_SYMBOLS_PATCH
-    URLS https://github.com/ginkgo-project/ginkgo/commit/7481b2fffb51d73492ef9017045450b29b820f81.diff
-    FILENAME 7481b2fffb51d73492ef9017045450b29b820f81.diff
-    SHA512 f81c57aacc30680383ccfb21ca08987d8ea19a23c0c7bbc5ae590c3c7eca4eed72cea84410357e080e5bb35f08f6b57834b3cdace6d91cc3fde0a1930aa4270a
-)
+if(VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ginkgo-project/ginkgo
-    REF v1.4.0
-    SHA512 9bfcb2c415c7a1a70cf8e49f20adf62d02cab83bb23b6fcecfeaeeb322b2d4e1ad8d8fa6582735073753f9a05eac8688b9bd1ff1d4203957c1a80702d117e807
+    REF "v${VERSION}"
+    SHA512 a7e71eaae8dc62e0b670f0db82f82e23b82860b3f6a5428e28f4652ed2a496f53d04238039b95f43cdf465cf86d2724ed88113a65e5e761ab839244e1b58ea46
     HEAD_REF master
-    PATCHES
-        ${WINDOWS_SYMBOLS_PATCH}
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
     openmp    GINKGO_BUILD_OMP
     cuda      GINKGO_BUILD_CUDA
+    mpi       GINKGO_BUILD_MPI
 )
 
 vcpkg_cmake_configure(
@@ -33,7 +30,6 @@ vcpkg_cmake_configure(
         -DGINKGO_DEVEL_TOOLS=OFF
         -DGINKGO_SKIP_DEPENDENCY_UPDATE=ON
         -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
-        -DGinkgo_NAME=ginkgo
         ${FEATURE_OPTIONS}
 )
 
@@ -41,12 +37,6 @@ vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Ginkgo)
 vcpkg_fixup_pkgconfig()
 
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/ginkgo/GinkgoConfig.cmake" [[string(REPLACE "lib/cmake/Ginkgo" "" GINKGO_INSTALL_PREFIX "${GINKGO_CONFIG_FILE_PATH}")]] "")
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/ginkgo/GinkgoConfig.cmake" "GINKGO_INSTALL_PREFIX" "_IMPORT_PREFIX")
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/ginkgo/GinkgoConfig.cmake" "/lib/cmake/Ginkgo\"" "/share/ginkgo\"")
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/ginkgo/GinkgoConfig.cmake" "/lib/cmake/Ginkgo/Modules\"" "/share/ginkgo/Modules/Modules\"")
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/ginkgo/GinkgoConfig.cmake" "\"${SOURCE_PATH}/cmake/Modules/\"" "")
-
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/ginkgo" RENAME copyright)
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/ginkgo")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/external_imported/vcpkg/ports/ginkgo/vcpkg.json b/external_imported/vcpkg/ports/ginkgo/vcpkg.json
index 426e388af..fc4c1b818 100644
--- a/external_imported/vcpkg/ports/ginkgo/vcpkg.json
+++ b/external_imported/vcpkg/ports/ginkgo/vcpkg.json
@@ -1,8 +1,10 @@
 {
   "name": "ginkgo",
-  "version-semver": "1.4.0",
-  "port-version": 1,
-  "description": "Ginkgo is a high-performance linear algebra library for manycore systems, with a focus on sparse solution of linear systems. Note that the OpenMP feature is not available on Windows.",
+  "version-semver": "1.7.0",
+  "description": "Ginkgo is a high-performance linear algebra library for manycore systems, with a focus on sparse solution of linear systems.",
+  "homepage": "https://github.com/ginkgo-project/ginkgo",
+  "license": "BSD-3-Clause",
+  "supports": "!(x86 | android)",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
@@ -20,8 +22,15 @@
         "cuda"
       ]
     },
+    "mpi": {
+      "description": "Build the distributed MPI backend of Ginkgo",
+      "dependencies": [
+        "mpi"
+      ]
+    },
     "openmp": {
-      "description": "Build the OpenMP backend of Ginkgo"
+      "description": "Build the OpenMP backend of Ginkgo",
+      "supports": "mingw | !windows"
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/gl2ps/portfile.cmake b/external_imported/vcpkg/ports/gl2ps/portfile.cmake
index d18d2fcb4..d48897f28 100644
--- a/external_imported/vcpkg/ports/gl2ps/portfile.cmake
+++ b/external_imported/vcpkg/ports/gl2ps/portfile.cmake
@@ -1,21 +1,27 @@
 vcpkg_from_gitlab(
-    GITLAB_URL http://gitlab.onelab.info
+    GITLAB_URL https://gitlab.onelab.info
     OUT_SOURCE_PATH SOURCE_PATH
     REPO gl2ps/gl2ps
     REF gl2ps_1_4_2
     SHA512 cb4abd79f6790e229a0b05a6d12e4bd4d24885c89c4cb8644e49b0459361565c5c5379b53d85f59eeaba16144d3288dbd06c90f55a739f0928a788224ccb8085
     HEAD_REF master
-    PATCHES separate-static-dynamic-build.patch
+    PATCHES
+        separate-static-dynamic-build.patch
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-    OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DCMAKE_DISABLE_FIND_PACKAGE_GLUT=ON
+    OPTIONS_DEBUG
+        -DDISABLE_INSTALL_HEADERS=ON
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/COPYING.GL2PS DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-file(INSTALL ${SOURCE_PATH}/COPYING.LGPL DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright.LGPL)
+vcpkg_install_copyright(
+    FILE_LIST
+        "${SOURCE_PATH}/README.txt"
+        "${SOURCE_PATH}/COPYING.LGPL"
+        "${SOURCE_PATH}/COPYING.GL2PS"
+)
diff --git a/external_imported/vcpkg/ports/gl2ps/vcpkg.json b/external_imported/vcpkg/ports/gl2ps/vcpkg.json
index 4230bc45c..c4b26d3bd 100644
--- a/external_imported/vcpkg/ports/gl2ps/vcpkg.json
+++ b/external_imported/vcpkg/ports/gl2ps/vcpkg.json
@@ -1,12 +1,17 @@
 {
   "name": "gl2ps",
-  "version-string": "1.4.2",
-  "port-version": 1,
+  "version": "1.4.2",
+  "port-version": 4,
   "description": "OpenGL to PostScript Printing Library",
   "homepage": "https://gitlab.onelab.info/gl2ps/gl2ps",
+  "supports": "!android",
   "dependencies": [
-    "freeglut",
     "libpng",
+    "opengl",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
     "zlib"
   ]
 }
diff --git a/external_imported/vcpkg/ports/glaze/portfile.cmake b/external_imported/vcpkg/ports/glaze/portfile.cmake
new file mode 100644
index 000000000..9a4a5d5f6
--- /dev/null
+++ b/external_imported/vcpkg/ports/glaze/portfile.cmake
@@ -0,0 +1,23 @@
+if(VCPKG_TARGET_IS_LINUX)
+    message("Warning: `glaze` requires Clang or GCC 11+ on Linux")
+endif()
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO stephenberry/glaze
+    REF "v${VERSION}"
+    SHA512 0f15e8aa33f62075bb68cd541ef5a0c02da373b0cdfd1ec7bfe3a52428dda99b100eb5a1e0b9c486e655914d2d5fc5d16e9e1f3c2016b277badc54333c06be83
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -Dglaze_DEVELOPER_MODE=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/glaze/vcpkg.json b/external_imported/vcpkg/ports/glaze/vcpkg.json
new file mode 100644
index 000000000..c637ab691
--- /dev/null
+++ b/external_imported/vcpkg/ports/glaze/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "glaze",
+  "version": "2.0.6",
+  "description": "One of the fastest JSON libraries in the world. Glaze reads and writes from C++ memory, simplifying interfaces and offering incredible performance.",
+  "homepage": "https://github.com/stephenberry/glaze",
+  "license": "MIT",
+  "supports": "!uwp",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/glew/base_address.patch b/external_imported/vcpkg/ports/glew/base_address.patch
new file mode 100644
index 000000000..466381efe
--- /dev/null
+++ b/external_imported/vcpkg/ports/glew/base_address.patch
@@ -0,0 +1,13 @@
+--- a/build/cmake/CMakeLists.txt	Mon Apr 24 15:54:00 2023
++++ b/build/cmake/CMakeLists.txt	Mon Apr 24 16:06:57 2023
+@@ -143,7 +143,9 @@
+   # add options from visual studio project
+   target_compile_definitions (glew PRIVATE "GLEW_BUILD;VC_EXTRALEAN")
+   target_compile_definitions (glew_s PRIVATE "GLEW_STATIC;VC_EXTRALEAN")
+-  target_link_libraries (glew LINK_PRIVATE -BASE:0x62AA0000)
++  if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(i?86|x86|x86_32)$")
++	target_link_libraries (glew LINK_PRIVATE -BASE:0x62AA0000)
++  endif()
+   # kill security checks which are dependent on stdlib
+   target_compile_options (glew PRIVATE -GS-)
+   target_compile_options (glew_s PRIVATE -GS-)
diff --git a/external_imported/vcpkg/ports/glew/portfile.cmake b/external_imported/vcpkg/ports/glew/portfile.cmake
index dc64a2aca..0757e2cd9 100644
--- a/external_imported/vcpkg/ports/glew/portfile.cmake
+++ b/external_imported/vcpkg/ports/glew/portfile.cmake
@@ -10,12 +10,13 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 57453646635609d54f62fb32a080b82b601fd471fcfd26e109f479b3fef6dfbc24b83f4ba62916d07d62cd06d1409ad7aa19bc1cd7cf3639c103c815b8be31d1
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE ${ARCHIVE}
-    REF glew
+    SOURCE_BASE glew
     PATCHES
         fix-LNK2019.patch
+        base_address.patch # Accepted upstream as https://github.com/nigels-com/glew/commit/ef7d12ecb7f1f336f6d3a80cebd6163b2c094108
 )
 
 vcpkg_cmake_configure(
diff --git a/external_imported/vcpkg/ports/glew/vcpkg.json b/external_imported/vcpkg/ports/glew/vcpkg.json
index 7468ecadf..0f7e83a87 100644
--- a/external_imported/vcpkg/ports/glew/vcpkg.json
+++ b/external_imported/vcpkg/ports/glew/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "glew",
-  "version-string": "2.2.0",
+  "version": "2.2.0",
+  "port-version": 3,
   "description": "The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library.",
   "homepage": "https://github.com/nigels-com/glew",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/glfw3/portfile.cmake b/external_imported/vcpkg/ports/glfw3/portfile.cmake
index cb9472a7c..c41b5a2a3 100644
--- a/external_imported/vcpkg/ports/glfw3/portfile.cmake
+++ b/external_imported/vcpkg/ports/glfw3/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO glfw/glfw
-    REF 7482de6071d21db77a7236155da44c172a7f6c9e     #v3.3.8
-    SHA512 ec45b620338cf36a8dbdf7aaf54d7c3a49a1be4ae1a1ef95f1531094fec670870713969bbc23476769d374c7a71d93f6540ab64c46fb5f66f4402bb2d15c7d87
+    REF ${VERSION}
+    SHA512 9fcccd650990fa88fcb6383afa90bc6c2eca7f4a4a3d4fc58fa5bd6b7995c32989bb29d2753f438984043b294244b82ba9f094426e12f3d4da4547e73bb62e3f
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/glfw3/vcpkg.json b/external_imported/vcpkg/ports/glfw3/vcpkg.json
index b6405ac32..06322a643 100644
--- a/external_imported/vcpkg/ports/glfw3/vcpkg.json
+++ b/external_imported/vcpkg/ports/glfw3/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "glfw3",
-  "version-semver": "3.3.8",
-  "port-version": 2,
+  "version-semver": "3.3.9",
   "description": "GLFW is a free, Open Source, multi-platform library for OpenGL, OpenGL ES and Vulkan application development. It provides a simple, platform-independent API for creating windows, contexts and surfaces, reading input, handling events, etc.",
   "homepage": "https://github.com/glfw/glfw",
   "license": "Zlib",
diff --git a/external_imported/vcpkg/ports/gli/portfile.cmake b/external_imported/vcpkg/ports/gli/portfile.cmake
index 5168aca1e..e4a4edb42 100644
--- a/external_imported/vcpkg/ports/gli/portfile.cmake
+++ b/external_imported/vcpkg/ports/gli/portfile.cmake
@@ -10,19 +10,18 @@ vcpkg_from_github(
         disable-test.patch
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/gli)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/gli)
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib)
-file(REMOVE ${CURRENT_PACKAGES_DIR}/include/gli/CMakeLists.txt)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+file(REMOVE "${CURRENT_PACKAGES_DIR}/include/gli/CMakeLists.txt")
 
 # Put the license file where vcpkg expects it
 # manual.md contains the "licenses" section for the project
-file(INSTALL ${SOURCE_PATH}/manual.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file
+file(INSTALL "${SOURCE_PATH}/manual.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/gli/vcpkg.json b/external_imported/vcpkg/ports/gli/vcpkg.json
index e1d746619..732f3c25a 100644
--- a/external_imported/vcpkg/ports/gli/vcpkg.json
+++ b/external_imported/vcpkg/ports/gli/vcpkg.json
@@ -1,9 +1,18 @@
 {
   "name": "gli",
   "version-date": "2021-07-06",
+  "port-version": 2,
   "description": "OpenGL Image (GLI)",
   "homepage": "https://gli.g-truc.net",
   "dependencies": [
-    "glm"
+    "glm",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ]
 }
diff --git a/external_imported/vcpkg/ports/glib/libintl.patch b/external_imported/vcpkg/ports/glib/libintl.patch
index 6e966aab2..e62c56672 100644
--- a/external_imported/vcpkg/ports/glib/libintl.patch
+++ b/external_imported/vcpkg/ports/glib/libintl.patch
@@ -1,14 +1,14 @@
 diff --git a/meson.build b/meson.build
-index f44fa2d4e..d465253af 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -2088,9 +2088,9 @@
+@@ -2134,10 +2135,10 @@ libz_dep = dependency('zlib')
  # proxy-libintl subproject.
  # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible
  # implementations. This could be extended if issues are found in some platforms.
 -libintl_deps = []
--libintl = dependency('intl', required: false, allow_fallback: false)
--if libintl.found()
+ libintl_prefix = '#include <libintl.h>'
+-libintl = dependency('intl', required: false)
+-if libintl.found() and libintl.type_name() != 'internal'
 +libintl = dependency('Intl', method:'cmake', required: true)
 +libintl_deps = [libintl]
 +if false
diff --git a/external_imported/vcpkg/ports/glib/portfile.cmake b/external_imported/vcpkg/ports/glib/portfile.cmake
index 77816ddc3..529484ced 100644
--- a/external_imported/vcpkg/ports/glib/portfile.cmake
+++ b/external_imported/vcpkg/ports/glib/portfile.cmake
@@ -2,7 +2,7 @@ string(REGEX MATCH "^([0-9]*[.][0-9]*)" GLIB_MAJOR_MINOR "${VERSION}")
 vcpkg_download_distfile(GLIB_ARCHIVE
     URLS "https://download.gnome.org/sources/glib/${GLIB_MAJOR_MINOR}/glib-${VERSION}.tar.xz"
     FILENAME "glib-${VERSION}.tar.xz"
-    SHA512 44aa53d0dae69e50c8d5d9adb7c90034c4c2ab5db3c74106c91bfdbdca41bc5523b32b16c33bc65b3c6bf0037bdecb344b80e9708930bde54ac7c618c34ea5a8
+    SHA512 6f3a06e10e7373a2dbf0688512de4126472fb73cbec488b7983b5ffecff09c64d7e1ca462f892e8f215d3d277d103ca802bad7ef0bd0f91edf26fc6ce67187b6
 )
 
 vcpkg_extract_source_archive(SOURCE_PATH
@@ -12,6 +12,10 @@ vcpkg_extract_source_archive(SOURCE_PATH
         libintl.patch
 )
 
+if(APPLE)
+    list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS "-DVCPKG_ENABLE_OBJC=1")
+endif()
+
 vcpkg_list(SET OPTIONS)
 if (selinux IN_LIST FEATURES)
     if(NOT EXISTS "/usr/include/selinux")
@@ -28,8 +32,18 @@ else()
     list(APPEND OPTIONS -Dlibmount=disabled)
 endif()
 
+vcpkg_list(SET ADDITIONAL_BINARIES)
+if(VCPKG_HOST_IS_WINDOWS)
+    # Presence of bash and sh enables installation of auxiliary components.
+    vcpkg_list(APPEND ADDITIONAL_BINARIES "bash = ['${CMAKE_COMMAND}', '-E', 'false']")
+    vcpkg_list(APPEND ADDITIONAL_BINARIES "sh = ['${CMAKE_COMMAND}', '-E', 'false']")
+endif()
+
 vcpkg_configure_meson(
     SOURCE_PATH "${SOURCE_PATH}"
+    LANGUAGES C CXX OBJC OBJCXX
+    ADDITIONAL_BINARIES
+        ${ADDITIONAL_BINARIES}
     OPTIONS
         ${OPTIONS}
         -Dgtk_doc=false
@@ -50,9 +64,6 @@ set(GLIB_SCRIPTS
     glib-mkenums
     gtester-report
 )
-if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
-    list(REMOVE_ITEM GLIB_SCRIPTS glib-gettextize)
-endif()
 foreach(script IN LISTS GLIB_SCRIPTS)
     file(RENAME "${CURRENT_PACKAGES_DIR}/bin/${script}" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/${script}")
     file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/${script}")
diff --git a/external_imported/vcpkg/ports/glib/vcpkg.json b/external_imported/vcpkg/ports/glib/vcpkg.json
index b430f868b..1acbccfaa 100644
--- a/external_imported/vcpkg/ports/glib/vcpkg.json
+++ b/external_imported/vcpkg/ports/glib/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "glib",
-  "version": "2.75.3",
+  "version": "2.78.4",
   "description": "Portable, general-purpose utility library.",
   "homepage": "https://developer.gnome.org/glib/",
   "license": "LGPL-2.1-or-later",
-  "supports": "!uwp",
+  "supports": "!uwp & !xbox",
   "dependencies": [
     "dirent",
     "gettext",
diff --git a/external_imported/vcpkg/ports/glibmm/portfile.cmake b/external_imported/vcpkg/ports/glibmm/portfile.cmake
index 2a271f6fa..050ba47f3 100644
--- a/external_imported/vcpkg/ports/glibmm/portfile.cmake
+++ b/external_imported/vcpkg/ports/glibmm/portfile.cmake
@@ -1,9 +1,9 @@
 # Glib uses winapi functions not available in WindowsStore
-
+string(REGEX MATCH "^([0-9]*[.][0-9]*)" GLIBMM_MAJOR_MINOR "${VERSION}")
 vcpkg_download_distfile(GLIBMM_ARCHIVE
-    URLS "https://ftp.gnome.org/pub/GNOME/sources/glibmm/2.74/glibmm-2.74.0.tar.xz"
-    FILENAME "glibmm-2.74.0.tar.xz"
-    SHA512 29c16a6c921fb135721c39b5328e0b45e09c500c65175199c1ec5ee75bdd5fb907072389c6980da3bf8fac0846235af5580f692706eb00d26947804daa1c99c9
+    URLS "https://ftp.gnome.org/pub/GNOME/sources/glibmm/${GLIBMM_MAJOR_MINOR}/glibmm-${VERSION}.tar.xz"
+    FILENAME "glibmm-${VERSION}.tar.xz"
+    SHA512 be49599f5eb8eb5a1cef015cdb37af2564fcd1ea845aa4344804ca5f0f61468949711e25cefebb93219e1be37128ebfdd2a816324e752ac4395b4b87c072fc78
 )
 
 vcpkg_extract_source_archive(
diff --git a/external_imported/vcpkg/ports/glibmm/vcpkg.json b/external_imported/vcpkg/ports/glibmm/vcpkg.json
index 8aa574021..954205553 100644
--- a/external_imported/vcpkg/ports/glibmm/vcpkg.json
+++ b/external_imported/vcpkg/ports/glibmm/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "glibmm",
-  "version": "2.74.0",
+  "version": "2.76.0",
+  "port-version": 1,
   "description": "This is glibmm, a C++ API for parts of glib that are useful for C++.",
   "homepage": "https://www.gtkmm.org.",
   "license": "LGPL-2.1-or-later",
-  "supports": "!uwp",
+  "supports": "!uwp & !xbox",
   "dependencies": [
     "gettext",
     "glib",
diff --git a/external_imported/vcpkg/ports/glm/CMakeLists.txt b/external_imported/vcpkg/ports/glm/CMakeLists.txt
deleted file mode 100644
index e323256fb..000000000
--- a/external_imported/vcpkg/ports/glm/CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-cmake_minimum_required(VERSION 3.12 FATAL_ERROR)
-
-project(glm LANGUAGES CXX)
-
-include(GNUInstallDirs)
-
-add_library(glm INTERFACE)
-target_include_directories(glm INTERFACE $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
-
-install(TARGETS glm EXPORT glm)
-
-install(
-    EXPORT glm
-    FILE glm-config.cmake
-    DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/glm"
-    NAMESPACE glm::
-)
-
-install(
-    DIRECTORY "${CMAKE_SOURCE_DIR}/glm"
-    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
-    PATTERN "CMakeLists.txt" EXCLUDE
-)
diff --git a/external_imported/vcpkg/ports/glm/portfile.cmake b/external_imported/vcpkg/ports/glm/portfile.cmake
index 133c81ec6..b77262c48 100644
--- a/external_imported/vcpkg/ports/glm/portfile.cmake
+++ b/external_imported/vcpkg/ports/glm/portfile.cmake
@@ -1,23 +1,26 @@
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO g-truc/glm
-    REF bf71a834948186f4097caa076cd2663c69a10e1e #v0.9.9.8
-    SHA512 226266c02af616a96fb19ee32cf3f98347daa43a4fde5d618d36b38709dce1280de126c542524d40725ecf70359edcc5b60660554c65ce246514501fb4c9c87c
+    REF "${VERSION}"
+    SHA512 62e22002a6369a54e1f0ee2885a65f2780af7d2a446573e5387b81518f5dc7e8076053837cb99ae850a0166ce8b0f077bed009e8986d9884d01c456ce467553f
     HEAD_REF master
 )
 
-set(VCPKG_BUILD_TYPE release) # header-only port
-
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
-
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DGLM_ENABLE_CXX_17=ON
+        -DGLM_BUILD_LIBRARY=ON
+        -DGLM_BUILD_TESTS=OFF
+        -DGLM_BUILD_INSTALL=ON
 )
 
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup()
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-# Put the license file where vcpkg expects it
-file(INSTALL "${SOURCE_PATH}/copying.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/copying.txt")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/glm/usage b/external_imported/vcpkg/ports/glm/usage
new file mode 100644
index 000000000..0f63af2a7
--- /dev/null
+++ b/external_imported/vcpkg/ports/glm/usage
@@ -0,0 +1,8 @@
+The package glm provides CMake targets:
+
+    find_package(glm CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE glm::glm)
+
+    # Or use the header-only version
+    find_package(glm CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE glm::glm-header-only)
diff --git a/external_imported/vcpkg/ports/glm/vcpkg.json b/external_imported/vcpkg/ports/glm/vcpkg.json
index a81138c05..dba6e7662 100644
--- a/external_imported/vcpkg/ports/glm/vcpkg.json
+++ b/external_imported/vcpkg/ports/glm/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "glm",
-  "version": "0.9.9.8",
-  "port-version": 2,
+  "version": "1.0.0",
   "description": "OpenGL Mathematics (GLM)",
   "homepage": "https://glm.g-truc.net",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/globjects/portfile.cmake b/external_imported/vcpkg/ports/globjects/portfile.cmake
index 4103fd3ab..1ecdbb100 100644
--- a/external_imported/vcpkg/ports/globjects/portfile.cmake
+++ b/external_imported/vcpkg/ports/globjects/portfile.cmake
@@ -9,22 +9,21 @@ vcpkg_from_github(
         fix-dependency-glm.patch
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DOPTION_BUILD_TESTS=OFF
         -DOPTION_BUILD_GPU_TESTS=OFF
         -DGIT_REV=0
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/globjects/cmake/globjects)
+vcpkg_cmake_config_fixup(CONFIG_PATH share/globjects/cmake/globjects)
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
 
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/globjects/globjects-config.cmake "include(CMakeFindDependencyMacro)
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/globjects/globjects-config.cmake" "include(CMakeFindDependencyMacro)
 find_dependency(glm)
 find_dependency(glbinding)
 
@@ -32,6 +31,6 @@ include(\${CMAKE_CURRENT_LIST_DIR}/globjects-export.cmake)
 ")
 
 # Handle copyright
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/globjects/LICENSE ${CURRENT_PACKAGES_DIR}/share/globjects/copyright)
+file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
 
 vcpkg_copy_pdbs()
diff --git a/external_imported/vcpkg/ports/globjects/vcpkg.json b/external_imported/vcpkg/ports/globjects/vcpkg.json
index 8878d2865..6dd9aa137 100644
--- a/external_imported/vcpkg/ports/globjects/vcpkg.json
+++ b/external_imported/vcpkg/ports/globjects/vcpkg.json
@@ -1,11 +1,19 @@
 {
   "name": "globjects",
-  "version-string": "1.1.0",
-  "port-version": 4,
+  "version": "1.1.0",
+  "port-version": 6,
   "description": "C++ library strictly wrapping OpenGL objects",
   "homepage": "https://github.com/cginternals/globjects",
   "dependencies": [
     "glbinding",
-    "glm"
+    "glm",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ]
 }
diff --git a/external_imported/vcpkg/ports/glog/portfile.cmake b/external_imported/vcpkg/ports/glog/portfile.cmake
index 50997e760..2363d5c03 100644
--- a/external_imported/vcpkg/ports/glog/portfile.cmake
+++ b/external_imported/vcpkg/ports/glog/portfile.cmake
@@ -35,4 +35,10 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 vcpkg_copy_pdbs()
 vcpkg_fixup_pkgconfig()
 
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/${PORT}/export.h" "#ifdef GLOG_STATIC_DEFINE" "#if 1")
+else()
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/${PORT}/export.h" "#ifdef GLOG_STATIC_DEFINE" "#if 0")
+endif()
+    
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/glog/vcpkg.json b/external_imported/vcpkg/ports/glog/vcpkg.json
index 97dd284bd..d080e7324 100644
--- a/external_imported/vcpkg/ports/glog/vcpkg.json
+++ b/external_imported/vcpkg/ports/glog/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "glog",
   "version": "0.6.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "C++ implementation of the Google logging module",
   "homepage": "https://github.com/google/glog",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/gloo/portfile.cmake b/external_imported/vcpkg/ports/gloo/portfile.cmake
index cc168af4a..e9ed2af43 100644
--- a/external_imported/vcpkg/ports/gloo/portfile.cmake
+++ b/external_imported/vcpkg/ports/gloo/portfile.cmake
@@ -18,15 +18,15 @@ if ("cuda" IN_LIST FEATURES)
   list(APPEND GLOO_FEATURE_OPTIONS "-DUSE_CUDA=1" "-DUSE_NCCL=1")
 endif()
 
-vcpkg_configure_cmake(
-  SOURCE_PATH ${SOURCE_PATH}
-  PREFER_NINJA
+vcpkg_cmake_configure(
+  SOURCE_PATH "${SOURCE_PATH}"
   OPTIONS ${GLOO_FEATURE_OPTIONS}
   )
-vcpkg_install_cmake()
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/Gloo)
+vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/Gloo)
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/external_imported/vcpkg/ports/gloo/vcpkg.json b/external_imported/vcpkg/ports/gloo/vcpkg.json
index 15c4593c1..7ded7731d 100644
--- a/external_imported/vcpkg/ports/gloo/vcpkg.json
+++ b/external_imported/vcpkg/ports/gloo/vcpkg.json
@@ -1,9 +1,20 @@
 {
   "name": "gloo",
-  "version-string": "20201203",
+  "version": "20201203",
+  "port-version": 2,
   "description": "Collective communications library with various primitives for multi-machine training.",
   "homepage": "https://github.com/facebookincubator/gloo",
   "supports": "x64 & linux",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
   "features": {
     "cuda": {
       "description": "for CUDA aware algorithms",
diff --git a/external_imported/vcpkg/ports/glpk/glpk.pc.in b/external_imported/vcpkg/ports/glpk/glpk.pc.in
index 6a564155e..b1ac85180 100644
--- a/external_imported/vcpkg/ports/glpk/glpk.pc.in
+++ b/external_imported/vcpkg/ports/glpk/glpk.pc.in
@@ -7,5 +7,6 @@ Name: glpk
 Description: The GNU Linear Programming Kit (GLPK) solves large-scale linear programming (LP), mixed integer programming (MIP), and related problems.
 Version: @VERSION@
 Libs: -L${libdir} -l@libname@
+Libs.private: @libs@
 Cflags: -I${includedir}
-Requires: @requires@
\ No newline at end of file
+Requires.private: @requires@
diff --git a/external_imported/vcpkg/ports/glpk/portfile.cmake b/external_imported/vcpkg/ports/glpk/portfile.cmake
index daa48faaf..9fd4a8823 100644
--- a/external_imported/vcpkg/ports/glpk/portfile.cmake
+++ b/external_imported/vcpkg/ports/glpk/portfile.cmake
@@ -1,4 +1,3 @@
-vcpkg_minimum_required(VERSION 2022-10-12)
 set(DISTFILE_SHA512_HASH 4e92195fa058c707146f2690f3a38b46c33add948c852f67659ca005a6aa980bbf97be96528b0f8391690facb880ac2126cd60198c6c175e7f3f06cca7e29f9d)
 
 vcpkg_download_distfile(
@@ -34,14 +33,13 @@ if("mysql" IN_LIST FEATURES)
         --enable-mysql
         "CPPFLAGS=-I${CURRENT_INSTALLED_DIR}/include/mysql \$CPPFLAGS"
     )
-    string(APPEND requires " mysql")
+    string(APPEND libs " -lmysql")
 else()
     vcpkg_list(APPEND CONFIGURE_OPTIONS --disable-mysql)
 endif()
 
 if("odbc" IN_LIST FEATURES)
     vcpkg_list(APPEND CONFIGURE_OPTIONS --enable-odbc)
-    string(APPEND requires " odbc")
 else()
     vcpkg_list(APPEND CONFIGURE_OPTIONS --disable-odbc)
 endif()
@@ -66,4 +64,4 @@ vcpkg_fixup_pkgconfig()
 vcpkg_copy_pdbs()
 vcpkg_copy_tools(TOOL_NAMES glpsol AUTO_CLEAN)
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/glpk/vcpkg.json b/external_imported/vcpkg/ports/glpk/vcpkg.json
index 077488879..58e820d43 100644
--- a/external_imported/vcpkg/ports/glpk/vcpkg.json
+++ b/external_imported/vcpkg/ports/glpk/vcpkg.json
@@ -2,7 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
   "name": "glpk",
   "version": "5.0",
-  "port-version": 1,
+  "port-version": 3,
   "maintainers": "Fabio A. Correa Duran",
   "description": [
     "The GNU Linear Programming Kit (GLPK) solves large-scale linear programming (LP), mixed integer programming (MIP), and related problems.",
@@ -17,6 +17,7 @@
   "homepage": "https://www.gnu.org/software/glpk/",
   "documentation": "https://www.gnu.org/software/glpk/#documentation",
   "license": "GPL-3.0-or-later",
+  "supports": "!xbox",
   "features": {
     "dl": {
       "description": "Enable shared library support",
diff --git a/external_imported/vcpkg/ports/glslang/cmake.patch b/external_imported/vcpkg/ports/glslang/cmake.patch
new file mode 100644
index 000000000..db649e352
--- /dev/null
+++ b/external_imported/vcpkg/ports/glslang/cmake.patch
@@ -0,0 +1,56 @@
+diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt
+index a80e74ed..8a1d8867 100644
+--- a/SPIRV/CMakeLists.txt
++++ b/SPIRV/CMakeLists.txt
+@@ -99,14 +99,9 @@ if(WIN32 AND BUILD_SHARED_LIBS)
+ endif()
+ 
+ if(ENABLE_OPT)
+-    target_include_directories(SPIRV
+-        PRIVATE ${spirv-tools_SOURCE_DIR}/include
+-        PRIVATE ${spirv-tools_SOURCE_DIR}/source
+-    )
+-    target_link_libraries(SPIRV PRIVATE MachineIndependent SPIRV-Tools-opt)
++    target_link_libraries(SPIRV PRIVATE MachineIndependent PUBLIC SPIRV-Tools-opt)
+     target_include_directories(SPIRV PUBLIC
+-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>
+-        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>)
++        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>)
+ else()
+     target_link_libraries(SPIRV PRIVATE MachineIndependent)
+ endif()
+diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt
+index ad88442c..5ca185ae 100644
+--- a/StandAlone/CMakeLists.txt
++++ b/StandAlone/CMakeLists.txt
+@@ -68,14 +68,7 @@ endif()
+ 
+ target_link_libraries(glslang-standalone ${LIBRARIES})
+ target_include_directories(glslang-standalone PUBLIC
+-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>
+-    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>)
+-
+-if(ENABLE_OPT)
+-    target_include_directories(glslang-standalone
+-        PRIVATE ${spirv-tools_SOURCE_DIR}/include
+-    )
+-endif()
++    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>)
+ 
+ if(ENABLE_SPVREMAPPER)
+     set(REMAPPER_SOURCES spirv-remap.cpp)
+diff --git a/gtests/CMakeLists.txt b/gtests/CMakeLists.txt
+index 408a92db..b73e7f15 100644
+--- a/gtests/CMakeLists.txt
++++ b/gtests/CMakeLists.txt
+@@ -97,8 +97,8 @@ if(BUILD_TESTING)
+                                    ${gtest_SOURCE_DIR}/include)
+ 
+         if(ENABLE_OPT)
+-            target_include_directories(glslangtests
+-                PRIVATE ${spirv-tools_SOURCE_DIR}/include
++            target_link_libraries(glslangtests
++                PRIVATE SPIRV-Tools-opt
+             )
+         endif()
+ 
diff --git a/external_imported/vcpkg/ports/glslang/ignore-crt.patch b/external_imported/vcpkg/ports/glslang/ignore-crt.patch
deleted file mode 100644
index 0835b49a9..000000000
--- a/external_imported/vcpkg/ports/glslang/ignore-crt.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/ChooseMSVCCRT.cmake b/ChooseMSVCCRT.cmake
-index b1561263..b6c8c3a6 100644
---- a/ChooseMSVCCRT.cmake
-+++ b/ChooseMSVCCRT.cmake
-@@ -135,4 +135,3 @@ set(MSVC_CRT
-   MT
-   MTd)
- 
--choose_msvc_crt(MSVC_CRT)
diff --git a/external_imported/vcpkg/ports/glslang/install-to-datadir.patch b/external_imported/vcpkg/ports/glslang/install-to-datadir.patch
deleted file mode 100644
index f78032bcf..000000000
--- a/external_imported/vcpkg/ports/glslang/install-to-datadir.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b581c84..a011686 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -375,13 +375,13 @@ if(ENABLE_GLSLANG_INSTALL)
-         include("@PACKAGE_PATH_EXPORT_TARGETS@")
-     ]=])
-     
--    set(PATH_EXPORT_TARGETS "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake")
-+    set(PATH_EXPORT_TARGETS "${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/glslang-targets.cmake")
-     configure_package_config_file(
-         "${CMAKE_CURRENT_BINARY_DIR}/glslang-config.cmake.in"
-         "${CMAKE_CURRENT_BINARY_DIR}/glslang-config.cmake"
-         PATH_VARS
-             PATH_EXPORT_TARGETS
--        INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-+        INSTALL_DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}
-     )
-     
-     write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/glslang-config-version.cmake"
-@@ -392,7 +392,7 @@ if(ENABLE_GLSLANG_INSTALL)
-     install(
-         EXPORT      glslang-targets
-         NAMESPACE   "glslang::"
--        DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
-+        DESTINATION "${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}"
-     )
-     
-     install(
-@@ -400,6 +400,6 @@ if(ENABLE_GLSLANG_INSTALL)
-             "${CMAKE_CURRENT_BINARY_DIR}/glslang-config.cmake"
-             "${CMAKE_CURRENT_BINARY_DIR}/glslang-config-version.cmake"
-         DESTINATION
--            "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
-+            "${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}"
-     )
- endif()
-\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/glslang/portfile.cmake b/external_imported/vcpkg/ports/glslang/portfile.cmake
index 59650a60b..f2c75fffc 100644
--- a/external_imported/vcpkg/ports/glslang/portfile.cmake
+++ b/external_imported/vcpkg/ports/glslang/portfile.cmake
@@ -1,49 +1,63 @@
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
-  OUT_SOURCE_PATH SOURCE_PATH
-  REPO KhronosGroup/glslang
-  REF 11.13.0
-  SHA512 20c2a6543b002648f459f26bd36b5c445afd6d8eae175e400dbe45632f11ca8de1f9e6f6e98fd6f910aa75d90063e174c095e7df26d9d4982192b84d08b0dc8b
-  HEAD_REF master
-  PATCHES
-    ignore-crt.patch
-    install-to-datadir.patch
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO KhronosGroup/glslang
+    REF "${VERSION}"
+    SHA512 e16b01925a657750733a2973dc803fc3910a3a169ae276af205de6cb1bf0536fd2dbb63c5fd4fc10f800ba95f71bce673417121ad640cb9c964f291596c80025
+    HEAD_REF master
+    PATCHES
+        cmake.patch # Remove on next version (Upstream PR #3406 and #3420).
 )
 
-vcpkg_find_acquire_program(PYTHON3)
-get_filename_component(PYTHON_PATH ${PYTHON3} DIRECTORY)
-vcpkg_add_to_path("${PYTHON_PATH}")
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        opt ENABLE_OPT
+        opt ALLOW_EXTERNAL_SPIRV_TOOLS
+        tools ENABLE_GLSLANG_BINARIES
+        rtti ENABLE_RTTI
+)
 
-if("tools" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_IOS)
-  set(BUILD_BINARIES ON)
-else()
-  # this case will report error since all executable will require BUNDLE DESTINATION
-  set(BUILD_BINARIES OFF)
-endif()
+if (ENABLE_GLSLANG_BINARIES)
+    vcpkg_find_acquire_program(PYTHON3)
+    get_filename_component(PYTHON_PATH ${PYTHON3} DIRECTORY)
+    vcpkg_add_to_path("${PYTHON_PATH}")
+endif ()
+
+if (VCPKG_TARGET_IS_WINDOWS)
+    set(PLATFORM_OPTIONS "-DOVERRIDE_MSVCCRT=OFF")
+endif ()
 
 vcpkg_cmake_configure(
-  SOURCE_PATH "${SOURCE_PATH}"
-  OPTIONS
-    -DSKIP_GLSLANG_INSTALL=OFF
-    -DBUILD_EXTERNAL=OFF
-    -DENABLE_GLSLANG_BINARIES=${BUILD_BINARIES}
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_EXTERNAL=OFF
+        -DENABLE_CTEST=OFF
+        -DSKIP_GLSLANG_INSTALL=OFF
+        ${FEATURE_OPTIONS}
+        ${PLATFORM_OPTIONS}
 )
 
 vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/glslang DO_NOT_DELETE_PARENT_CONFIG_PATH)
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/glslang-config.cmake"
+    [[${PACKAGE_PREFIX_DIR}/lib/cmake/glslang/glslang-targets.cmake]]
+    [[${CMAKE_CURRENT_LIST_DIR}/glslang-targets.cmake]]
+)
+file(REMOVE_RECURSE CONFIG_PATH "${CURRENT_PACKAGES_DIR}/lib/cmake" "${CURRENT_PACKAGES_DIR}/debug/lib/cmake")
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/glslang/Public/ShaderLang.h" "ifdef GLSLANG_IS_SHARED_LIBRARY" "if 1")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/glslang/Include/glslang_c_interface.h" "ifdef GLSLANG_IS_SHARED_LIBRARY" "if 1")
+endif()
 
 vcpkg_copy_pdbs()
 
-if(NOT BUILD_BINARIES)
-  file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin")
-else()
-  vcpkg_copy_tools(TOOL_NAMES glslangValidator spirv-remap AUTO_CLEAN)
-endif()
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include"
-                    "${CURRENT_PACKAGES_DIR}/debug/bin")
+if (ENABLE_GLSLANG_BINARIES)
+    vcpkg_copy_tools(TOOL_NAMES glslang glslangValidator spirv-remap AUTO_CLEAN)
+endif ()
 
-# Install custom usage
-configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/external_imported/vcpkg/ports/glslang/usage b/external_imported/vcpkg/ports/glslang/usage
index 795414824..d4e707627 100644
--- a/external_imported/vcpkg/ports/glslang/usage
+++ b/external_imported/vcpkg/ports/glslang/usage
@@ -1,4 +1,4 @@
-The package glslang provides CMake targets:
+glslang provides CMake targets:
 
     find_package(glslang CONFIG REQUIRED)
-    target_link_libraries(main PRIVATE glslang::OSDependent glslang::glslang glslang::MachineIndependent glslang::GenericCodeGen glslang::OGLCompiler glslang::glslangValidator glslang::spirv-remap glslang::glslang-default-resource-limits glslang::SPVRemapper glslang::SPIRV glslang::HLSL)
\ No newline at end of file
+    target_link_libraries(main PRIVATE glslang::OSDependent glslang::glslang glslang::MachineIndependent glslang::GenericCodeGen glslang::glslang-default-resource-limits glslang::OGLCompiler glslang::SPVRemapper glslang::SPIRV glslang::HLSL)
diff --git a/external_imported/vcpkg/ports/glslang/vcpkg.json b/external_imported/vcpkg/ports/glslang/vcpkg.json
index 4f65475dd..7f659a1da 100644
--- a/external_imported/vcpkg/ports/glslang/vcpkg.json
+++ b/external_imported/vcpkg/ports/glslang/vcpkg.json
@@ -1,7 +1,8 @@
 {
   "name": "glslang",
-  "version": "11.13.0",
-  "description": "Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator",
+  "version": "13.1.1",
+  "port-version": 1,
+  "description": "Khronos-reference front end for GLSL/ESSL, partial front end for HLSL, and a SPIR-V generator.",
   "homepage": "https://github.com/KhronosGroup/glslang",
   "license": "Apache-2.0 AND BSD-3-Clause AND MIT AND GPL-3.0-or-later",
   "dependencies": [
@@ -14,12 +15,19 @@
       "host": true
     }
   ],
-  "default-features": [
-    "tools"
-  ],
   "features": {
+    "opt": {
+      "description": "Build with spirv-opt capability",
+      "dependencies": [
+        "spirv-tools"
+      ]
+    },
+    "rtti": {
+      "description": "Build with dynamic typeinfo"
+    },
     "tools": {
-      "description": "Build the glslangValidator and spirv-remap binaries"
+      "description": "Build the glslangValidator and spirv-remap binaries",
+      "supports": "!ios"
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/glui/portfile.cmake b/external_imported/vcpkg/ports/glui/portfile.cmake
index a3b37a597..00a1ae192 100644
--- a/external_imported/vcpkg/ports/glui/portfile.cmake
+++ b/external_imported/vcpkg/ports/glui/portfile.cmake
@@ -8,30 +8,29 @@ vcpkg_from_github(
         install-one-flavor.patch
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
 vcpkg_copy_pdbs()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
 
 file(COPY
-    ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake
-    DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
+    "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake"
+    DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
 )
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     vcpkg_replace_string(
-        ${CURRENT_PACKAGES_DIR}/include/GL/glui.h
+        "${CURRENT_PACKAGES_DIR}/include/GL/glui.h"
         "ifdef GLUIDLL"
         "if 1 //ifdef GLUIDLL"
     )
 endif()
 
-file(INSTALL ${SOURCE_PATH}/license.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/license.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/external_imported/vcpkg/ports/glui/vcpkg.json b/external_imported/vcpkg/ports/glui/vcpkg.json
index c585a4f2b..e9ce83d89 100644
--- a/external_imported/vcpkg/ports/glui/vcpkg.json
+++ b/external_imported/vcpkg/ports/glui/vcpkg.json
@@ -1,10 +1,20 @@
 {
   "name": "glui",
-  "version-string": "2019-11-30",
-  "port-version": 1,
+  "version-date": "2019-11-30",
+  "port-version": 4,
   "description": "GLUI is a GLUT-based C++ user interface library",
   "homepage": "https://github.com/libglui/glui",
+  "supports": "!android",
   "dependencies": [
-    "freeglut"
+    "freeglut",
+    "opengl",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ]
 }
diff --git a/external_imported/vcpkg/ports/gmime/portfile.cmake b/external_imported/vcpkg/ports/gmime/portfile.cmake
index d1e145a83..dbdc226e4 100644
--- a/external_imported/vcpkg/ports/gmime/portfile.cmake
+++ b/external_imported/vcpkg/ports/gmime/portfile.cmake
@@ -9,31 +9,30 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 a60d3f9f1aa8490865c22cd9539544e9c9f3ceb4037b9749cf9e5c279f97aa88fc4cd077bf2aff314ba0db2a1b7bbe76f9b1ca5a17fffcbd6315ecebc5414a3d
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
-    REF ${LIB_VERSION}
+vcpkg_extract_source_archive(
+    SOURCE_PATH
+    ARCHIVE "${ARCHIVE}"
+    SOURCE_BASE "${LIB_VERSION}"
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
 # We can use file supplied with original sources
-configure_file(${SOURCE_PATH}/build/vs2017/unistd.h ${SOURCE_PATH} COPYONLY)
-configure_file(${SOURCE_PATH}/build/vs2017/config.h ${SOURCE_PATH} COPYONLY)
-configure_file(${SOURCE_PATH}/build/vs2017/gmime.def ${SOURCE_PATH} COPYONLY)
+configure_file("${SOURCE_PATH}/build/vs2017/unistd.h" "${SOURCE_PATH}" COPYONLY)
+configure_file("${SOURCE_PATH}/build/vs2017/config.h" "${SOURCE_PATH}" COPYONLY)
+configure_file("${SOURCE_PATH}/build/vs2017/gmime.def" "${SOURCE_PATH}" COPYONLY)
 vcpkg_find_acquire_program(PKGCONFIG)
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-        -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}
+        "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}"
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 # License and man
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${LIB_NAME} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${LIB_NAME}" RENAME copyright)
 
 vcpkg_copy_pdbs()
diff --git a/external_imported/vcpkg/ports/gmime/vcpkg.json b/external_imported/vcpkg/ports/gmime/vcpkg.json
index 527bf5659..349a31b70 100644
--- a/external_imported/vcpkg/ports/gmime/vcpkg.json
+++ b/external_imported/vcpkg/ports/gmime/vcpkg.json
@@ -1,15 +1,19 @@
 {
   "name": "gmime",
   "version": "3.2.6",
-  "port-version": 3,
+  "port-version": 6,
   "description": "GMime is a C/C++ library which may be used for the creation and parsing of messages using the Multipurpose Internet Mail Extension (MIME).",
   "homepage": "https://developer.gnome.org/gmime/",
   "license": "LGPL-2.1-or-later",
-  "supports": "windows",
+  "supports": "windows & !xbox",
   "dependencies": [
     "glib",
     "libiconv",
     "libidn2",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
     "zlib"
   ]
 }
diff --git a/external_imported/vcpkg/ports/gmmlib/portfile.cmake b/external_imported/vcpkg/ports/gmmlib/portfile.cmake
index 4fb8c4520..99dbdbd96 100644
--- a/external_imported/vcpkg/ports/gmmlib/portfile.cmake
+++ b/external_imported/vcpkg/ports/gmmlib/portfile.cmake
@@ -7,8 +7,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO intel/gmmlib
-    REF intel-gmmlib-21.3.2
-    SHA512 155f7077f3135ff812b9fe759e56fecd595f1c5dde9a377df31a9acedcfeea9d93751badba68077c00929a21cb87e1bd69b8fe3961ac61765fabbc5d6d89e6be
+    REF "intel-gmmlib-${VERSION}"
+    SHA512 073cb2e9ec025ae32e2f33f51547083cd8425b0c7297e361b037c71b55a8d2322cd36ac7cabbf8c7a325f80f1cc97947c0aa8aa833dc5fbae5abe28e9c04451a
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/gmmlib/vcpkg.json b/external_imported/vcpkg/ports/gmmlib/vcpkg.json
index cd2ee1825..cc98982a7 100644
--- a/external_imported/vcpkg/ports/gmmlib/vcpkg.json
+++ b/external_imported/vcpkg/ports/gmmlib/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "gmmlib",
-  "version": "21.3.2",
-  "port-version": 1,
+  "version": "22.3.17",
   "description": "Intel(R) Graphics Memory Management Library",
   "homepage": "https://github.com/intel/gmmlib",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/gmp/gmp-arm64-asm-fix-5f32dbc41afc.patch b/external_imported/vcpkg/ports/gmp/gmp-arm64-asm-fix-5f32dbc41afc.patch
new file mode 100644
index 000000000..b4008a3fe
--- /dev/null
+++ b/external_imported/vcpkg/ports/gmp/gmp-arm64-asm-fix-5f32dbc41afc.patch
@@ -0,0 +1,521 @@
+
+# HG changeset patch
+# User Torbjorn Granlund <tg@gmplib.org>
+# Date 1606685500 -3600
+# Node ID 5f32dbc41afc1f8cd77af1614f0caeb24deb7d7b
+# Parent  94c84d919f83ba963ed1809f8e80c7bef32db55c
+Avoid the x18 register since it is reserved on Darwin.
+
+diff -r 94c84d919f83 -r 5f32dbc41afc mpn/arm64/aors_n.asm
+--- a/mpn/arm64/aors_n.asm	Sat Nov 28 23:38:32 2020 +0100
++++ b/mpn/arm64/aors_n.asm	Sun Nov 29 22:31:40 2020 +0100
+@@ -68,7 +68,7 @@
+ EPILOGUE()
+ PROLOGUE(func_n)
+ 	CLRCY
+-L(ent):	lsr	x18, n, #2
++L(ent):	lsr	x17, n, #2
+ 	tbz	n, #0, L(bx0)
+ 
+ L(bx1):	ldr	x7, [up]
+@@ -77,7 +77,7 @@
+ 	str	x13, [rp],#8
+ 	tbnz	n, #1, L(b11)
+ 
+-L(b01):	cbz	x18, L(ret)
++L(b01):	cbz	x17, L(ret)
+ 	ldp	x4, x5, [up,#8]
+ 	ldp	x8, x9, [vp,#8]
+ 	sub	up, up, #8
+@@ -88,7 +88,7 @@
+ 	ldp	x10, x11, [vp,#8]
+ 	add	up, up, #8
+ 	add	vp, vp, #8
+-	cbz	x18, L(end)
++	cbz	x17, L(end)
+ 	b	L(top)
+ 
+ L(bx0):	tbnz	n, #1, L(b10)
+@@ -101,7 +101,7 @@
+ 
+ L(b10):	ldp	x6, x7, [up]
+ 	ldp	x10, x11, [vp]
+-	cbz	x18, L(end)
++	cbz	x17, L(end)
+ 
+ 	ALIGN(16)
+ L(top):	ldp	x4, x5, [up,#16]
+@@ -114,8 +114,8 @@
+ 	ADDSUBC	x12, x4, x8
+ 	ADDSUBC	x13, x5, x9
+ 	stp	x12, x13, [rp],#16
+-	sub	x18, x18, #1
+-	cbnz	x18, L(top)
++	sub	x17, x17, #1
++	cbnz	x17, L(top)
+ 
+ L(end):	ADDSUBC	x12, x6, x10
+ 	ADDSUBC	x13, x7, x11
+diff -r 94c84d919f83 -r 5f32dbc41afc mpn/arm64/aorsmul_1.asm
+--- a/mpn/arm64/aorsmul_1.asm	Sat Nov 28 23:38:32 2020 +0100
++++ b/mpn/arm64/aorsmul_1.asm	Sun Nov 29 22:31:40 2020 +0100
+@@ -32,10 +32,15 @@
+ 
+ include(`../config.m4')
+ 
+-C	     cycles/limb
+-C Cortex-A53	9.3-9.8
+-C Cortex-A57	 7.0
+-C X-Gene	 5.0
++C	       addmul_1        submul_1
++C	     cycles/limb     cycles/limb
++C Cortex-A53	9.3-9.8		9.3-9.8
++C Cortex-A55    9.0-9.5		9.3-9.8
++C Cortex-A57	 7		 7
++C Cortex-A72
++C Cortex-A73	 6		 6
++C X-Gene	 5		 5
++C Apple M1	 1.75		 1.75
+ 
+ C NOTES
+ C  * It is possible to keep the carry chain alive between the addition blocks
+diff -r 94c84d919f83 -r 5f32dbc41afc mpn/arm64/aorsorrlshC_n.asm
+--- a/mpn/arm64/aorsorrlshC_n.asm	Sat Nov 28 23:38:32 2020 +0100
++++ b/mpn/arm64/aorsorrlshC_n.asm	Sun Nov 29 22:31:40 2020 +0100
+@@ -65,14 +65,14 @@
+ 
+ ASM_START()
+ PROLOGUE(func_n)
+-	lsr	x18, n, #2
++	lsr	x6, n, #2
+ 	tbz	n, #0, L(bx0)
+ 
+ L(bx1):	ldr	x5, [up]
+ 	tbnz	n, #1, L(b11)
+ 
+ L(b01):	ldr	x11, [vp]
+-	cbz	x18, L(1)
++	cbz	x6, L(1)
+ 	ldp	x8, x9, [vp,#8]
+ 	lsl	x13, x11, #LSH
+ 	ADDSUB(	x15, x13, x5)
+@@ -94,7 +94,7 @@
+ 	ADDSUB(	x17, x13, x5)
+ 	str	x17, [rp],#8
+ 	sub	up, up, #8
+-	cbz	x18, L(end)
++	cbz	x6, L(end)
+ 	b	L(top)
+ 
+ L(bx0):	tbnz	n, #1, L(b10)
+@@ -107,7 +107,7 @@
+ L(b10):	CLRRCY(	x9)
+ 	ldp	x10, x11, [vp]
+ 	sub	up, up, #16
+-	cbz	x18, L(end)
++	cbz	x6, L(end)
+ 
+ 	ALIGN(16)
+ L(top):	ldp	x4, x5, [up,#16]
+@@ -124,8 +124,8 @@
+ 	ADDSUBC(x16, x12, x4)
+ 	ADDSUBC(x17, x13, x5)
+ 	stp	x16, x17, [rp],#16
+-	sub	x18, x18, #1
+-	cbnz	x18, L(top)
++	sub	x6, x6, #1
++	cbnz	x6, L(top)
+ 
+ L(end):	ldp	x4, x5, [up,#16]
+ 	extr	x12, x10, x9, #RSH
+diff -r 94c84d919f83 -r 5f32dbc41afc mpn/arm64/cnd_aors_n.asm
+--- a/mpn/arm64/cnd_aors_n.asm	Sat Nov 28 23:38:32 2020 +0100
++++ b/mpn/arm64/cnd_aors_n.asm	Sun Nov 29 22:31:40 2020 +0100
+@@ -65,7 +65,7 @@
+ 
+ 	CLRCY
+ 
+-	lsr	x18, n, #2
++	lsr	x17, n, #2
+ 	tbz	n, #0, L(bx0)
+ 
+ L(bx1):	ldr	x13, [vp]
+@@ -75,7 +75,7 @@
+ 	str	x9, [rp]
+ 	tbnz	n, #1, L(b11)
+ 
+-L(b01):	cbz	x18, L(rt)
++L(b01):	cbz	x17, L(rt)
+ 	ldp	x12, x13, [vp,#8]
+ 	ldp	x10, x11, [up,#8]
+ 	sub	up, up, #8
+@@ -86,7 +86,7 @@
+ L(b11):	ldp	x12, x13, [vp,#8]!
+ 	ldp	x10, x11, [up,#8]!
+ 	sub	rp, rp, #8
+-	cbz	x18, L(end)
++	cbz	x17, L(end)
+ 	b	L(top)
+ 
+ L(bx0):	ldp	x12, x13, [vp]
+@@ -99,7 +99,7 @@
+ 	b	L(mid)
+ 
+ L(b10):	sub	rp, rp, #16
+-	cbz	x18, L(end)
++	cbz	x17, L(end)
+ 
+ 	ALIGN(16)
+ L(top):	bic	x6, x12, cnd
+@@ -116,8 +116,8 @@
+ 	ADDSUBC	x9, x11, x7
+ 	ldp	x10, x11, [up,#32]!
+ 	stp	x8, x9, [rp,#32]!
+-	sub	x18, x18, #1
+-	cbnz	x18, L(top)
++	sub	x17, x17, #1
++	cbnz	x17, L(top)
+ 
+ L(end):	bic	x6, x12, cnd
+ 	bic	x7, x13, cnd
+diff -r 94c84d919f83 -r 5f32dbc41afc mpn/arm64/logops_n.asm
+--- a/mpn/arm64/logops_n.asm	Sat Nov 28 23:38:32 2020 +0100
++++ b/mpn/arm64/logops_n.asm	Sun Nov 29 22:31:40 2020 +0100
+@@ -78,7 +78,7 @@
+ 
+ ASM_START()
+ PROLOGUE(func)
+-	lsr	x18, n, #2
++	lsr	x17, n, #2
+ 	tbz	n, #0, L(bx0)
+ 
+ L(bx1):	ldr	x7, [up]
+@@ -88,7 +88,7 @@
+ 	str	x15, [rp],#8
+ 	tbnz	n, #1, L(b11)
+ 
+-L(b01):	cbz	x18, L(ret)
++L(b01):	cbz	x17, L(ret)
+ 	ldp	x4, x5, [up,#8]
+ 	ldp	x8, x9, [vp,#8]
+ 	sub	up, up, #8
+@@ -99,7 +99,7 @@
+ 	ldp	x10, x11, [vp,#8]
+ 	add	up, up, #8
+ 	add	vp, vp, #8
+-	cbz	x18, L(end)
++	cbz	x17, L(end)
+ 	b	L(top)
+ 
+ L(bx0):	tbnz	n, #1, L(b10)
+@@ -110,7 +110,7 @@
+ 
+ L(b10):	ldp	x6, x7, [up]
+ 	ldp	x10, x11, [vp]
+-	cbz	x18, L(end)
++	cbz	x17, L(end)
+ 
+ 	ALIGN(16)
+ L(top):	ldp	x4, x5, [up,#16]
+@@ -127,8 +127,8 @@
+ 	POSTOP(	x12)
+ 	POSTOP(	x13)
+ 	stp	x12, x13, [rp],#16
+-	sub	x18, x18, #1
+-	cbnz	x18, L(top)
++	sub	x17, x17, #1
++	cbnz	x17, L(top)
+ 
+ L(end):	LOGOP(	x12, x6, x10)
+ 	LOGOP(	x13, x7, x11)
+diff -r 94c84d919f83 -r 5f32dbc41afc mpn/arm64/lshift.asm
+--- a/mpn/arm64/lshift.asm	Sat Nov 28 23:38:32 2020 +0100
++++ b/mpn/arm64/lshift.asm	Sun Nov 29 22:31:40 2020 +0100
+@@ -61,7 +61,7 @@
+ 	add	rp, rp_arg, n, lsl #3
+ 	add	up, up, n, lsl #3
+ 	sub	tnc, xzr, cnt
+-	lsr	x18, n, #2
++	lsr	x17, n, #2
+ 	tbz	n, #0, L(bx0)
+ 
+ L(bx1):	ldr	x4, [up,#-8]
+@@ -69,7 +69,7 @@
+ 
+ L(b01):	NSHIFT	x0, x4, tnc
+ 	PSHIFT	x2, x4, cnt
+-	cbnz	x18, L(gt1)
++	cbnz	x17, L(gt1)
+ 	str	x2, [rp,#-8]
+ 	ret
+ L(gt1):	ldp	x4, x5, [up,#-24]
+@@ -89,7 +89,7 @@
+ 	PSHIFT	x13, x5, cnt
+ 	NSHIFT	x10, x4, tnc
+ 	PSHIFT	x2, x4, cnt
+-	cbnz	x18, L(gt2)
++	cbnz	x17, L(gt2)
+ 	orr	x10, x10, x13
+ 	stp	x2, x10, [rp,#-16]
+ 	ret
+@@ -123,11 +123,11 @@
+ 	orr	x11, x12, x2
+ 	stp	x10, x11, [rp,#-32]!
+ 	PSHIFT	x2, x4, cnt
+-L(lo0):	sub	x18, x18, #1
++L(lo0):	sub	x17, x17, #1
+ L(lo3):	NSHIFT	x10, x6, tnc
+ 	PSHIFT	x13, x7, cnt
+ 	NSHIFT	x12, x7, tnc
+-	cbnz	x18, L(top)
++	cbnz	x17, L(top)
+ 
+ L(end):	orr	x10, x10, x13
+ 	orr	x11, x12, x2
+diff -r 94c84d919f83 -r 5f32dbc41afc mpn/arm64/lshiftc.asm
+--- a/mpn/arm64/lshiftc.asm	Sat Nov 28 23:38:32 2020 +0100
++++ b/mpn/arm64/lshiftc.asm	Sun Nov 29 22:31:40 2020 +0100
+@@ -61,7 +61,7 @@
+ 	add	rp, rp_arg, n, lsl #3
+ 	add	up, up, n, lsl #3
+ 	sub	tnc, xzr, cnt
+-	lsr	x18, n, #2
++	lsr	x17, n, #2
+ 	tbz	n, #0, L(bx0)
+ 
+ L(bx1):	ldr	x4, [up,#-8]
+@@ -69,7 +69,7 @@
+ 
+ L(b01):	NSHIFT	x0, x4, tnc
+ 	PSHIFT	x2, x4, cnt
+-	cbnz	x18, L(gt1)
++	cbnz	x17, L(gt1)
+ 	mvn	x2, x2
+ 	str	x2, [rp,#-8]
+ 	ret
+@@ -90,7 +90,7 @@
+ 	PSHIFT	x13, x5, cnt
+ 	NSHIFT	x10, x4, tnc
+ 	PSHIFT	x2, x4, cnt
+-	cbnz	x18, L(gt2)
++	cbnz	x17, L(gt2)
+ 	eon	x10, x10, x13
+ 	mvn	x2, x2
+ 	stp	x2, x10, [rp,#-16]
+@@ -125,11 +125,11 @@
+ 	eon	x11, x12, x2
+ 	stp	x10, x11, [rp,#-32]!
+ 	PSHIFT	x2, x4, cnt
+-L(lo0):	sub	x18, x18, #1
++L(lo0):	sub	x17, x17, #1
+ L(lo3):	NSHIFT	x10, x6, tnc
+ 	PSHIFT	x13, x7, cnt
+ 	NSHIFT	x12, x7, tnc
+-	cbnz	x18, L(top)
++	cbnz	x17, L(top)
+ 
+ L(end):	eon	x10, x10, x13
+ 	eon	x11, x12, x2
+diff -r 94c84d919f83 -r 5f32dbc41afc mpn/arm64/mul_1.asm
+--- a/mpn/arm64/mul_1.asm	Sat Nov 28 23:38:32 2020 +0100
++++ b/mpn/arm64/mul_1.asm	Sun Nov 29 22:31:40 2020 +0100
+@@ -56,7 +56,7 @@
+ 
+ PROLOGUE(mpn_mul_1)
+ 	adds	x4, xzr, xzr		C clear register and cy flag
+-L(com):	lsr	x18, n, #2
++L(com):	lsr	x17, n, #2
+ 	tbnz	n, #0, L(bx1)
+ 
+ L(bx0):	mov	x11, x4
+@@ -65,7 +65,7 @@
+ L(b10):	ldp	x4, x5, [up]
+ 	mul	x8, x4, v0
+ 	umulh	x10, x4, v0
+-	cbz	x18, L(2)
++	cbz	x17, L(2)
+ 	ldp	x6, x7, [up,#16]!
+ 	mul	x9, x5, v0
+ 	b	L(mid)-8
+@@ -80,7 +80,7 @@
+ 	str	x9, [rp],#8
+ 	tbnz	n, #1, L(b10)
+ 
+-L(b01):	cbz	x18, L(1)
++L(b01):	cbz	x17, L(1)
+ 
+ L(b00):	ldp	x6, x7, [up]
+ 	mul	x8, x6, v0
+@@ -90,8 +90,8 @@
+ 	adcs	x12, x8, x11
+ 	umulh	x11, x7, v0
+ 	add	rp, rp, #16
+-	sub	x18, x18, #1
+-	cbz	x18, L(end)
++	sub	x17, x17, #1
++	cbz	x17, L(end)
+ 
+ 	ALIGN(16)
+ L(top):	mul	x8, x4, v0
+@@ -110,8 +110,8 @@
+ 	stp	x12, x13, [rp],#32
+ 	adcs	x12, x8, x11
+ 	umulh	x11, x7, v0
+-	sub	x18, x18, #1
+-	cbnz	x18, L(top)
++	sub	x17, x17, #1
++	cbnz	x17, L(top)
+ 
+ L(end):	mul	x8, x4, v0
+ 	adcs	x13, x9, x10
+diff -r 94c84d919f83 -r 5f32dbc41afc mpn/arm64/rsh1aors_n.asm
+--- a/mpn/arm64/rsh1aors_n.asm	Sat Nov 28 23:38:32 2020 +0100
++++ b/mpn/arm64/rsh1aors_n.asm	Sun Nov 29 22:31:40 2020 +0100
+@@ -59,7 +59,7 @@
+ 
+ ASM_START()
+ PROLOGUE(func_n)
+-	lsr	x18, n, #2
++	lsr	x6, n, #2
+ 
+ 	tbz	n, #0, L(bx0)
+ 
+@@ -69,7 +69,7 @@
+ 
+ L(b01):	ADDSUB	x13, x5, x9
+ 	and	x10, x13, #1
+-	cbz	x18, L(1)
++	cbz	x6, L(1)
+ 	ldp	x4, x5, [up],#48
+ 	ldp	x8, x9, [vp],#48
+ 	ADDSUBC	x14, x4, x8
+@@ -80,8 +80,8 @@
+ 	ADDSUBC	x12, x4, x8
+ 	ADDSUBC	x13, x5, x9
+ 	str	x17, [rp], #24
+-	sub	x18, x18, #1
+-	cbz	x18, L(end)
++	sub	x6, x6, #1
++	cbz	x6, L(end)
+ 	b	L(top)
+ 
+ L(1):	cset	x14, COND
+@@ -97,7 +97,7 @@
+ 	ldp	x8, x9, [vp],#32
+ 	ADDSUBC	x12, x4, x8
+ 	ADDSUBC	x13, x5, x9
+-	cbz	x18, L(3)
++	cbz	x6, L(3)
+ 	ldp	x4, x5, [up,#-16]
+ 	ldp	x8, x9, [vp,#-16]
+ 	extr	x17, x12, x15, #1
+@@ -117,7 +117,7 @@
+ 	ADDSUB	x12, x4, x8
+ 	ADDSUBC	x13, x5, x9
+ 	and	x10, x12, #1
+-	cbz	x18, L(2)
++	cbz	x6, L(2)
+ 	ldp	x4, x5, [up,#-16]
+ 	ldp	x8, x9, [vp,#-16]
+ 	ADDSUBC	x14, x4, x8
+@@ -134,8 +134,8 @@
+ 	ADDSUBC	x12, x4, x8
+ 	ADDSUBC	x13, x5, x9
+ 	add	rp, rp, #16
+-	sub	x18, x18, #1
+-	cbz	x18, L(end)
++	sub	x6, x6, #1
++	cbz	x6, L(end)
+ 
+ 	ALIGN(16)
+ L(top):	ldp	x4, x5, [up,#-16]
+@@ -152,8 +152,8 @@
+ 	ADDSUBC	x12, x4, x8
+ 	ADDSUBC	x13, x5, x9
+ 	stp	x16, x17, [rp],#32
+-	sub	x18, x18, #1
+-	cbnz	x18, L(top)
++	sub	x6, x6, #1
++	cbnz	x6, L(top)
+ 
+ L(end):	extr	x16, x15, x14, #1
+ 	extr	x17, x12, x15, #1
+diff -r 94c84d919f83 -r 5f32dbc41afc mpn/arm64/rshift.asm
+--- a/mpn/arm64/rshift.asm	Sat Nov 28 23:38:32 2020 +0100
++++ b/mpn/arm64/rshift.asm	Sun Nov 29 22:31:40 2020 +0100
+@@ -60,7 +60,7 @@
+ PROLOGUE(mpn_rshift)
+ 	mov	rp, rp_arg
+ 	sub	tnc, xzr, cnt
+-	lsr	x18, n, #2
++	lsr	x17, n, #2
+ 	tbz	n, #0, L(bx0)
+ 
+ L(bx1):	ldr	x5, [up]
+@@ -68,7 +68,7 @@
+ 
+ L(b01):	NSHIFT	x0, x5, tnc
+ 	PSHIFT	x2, x5, cnt
+-	cbnz	x18, L(gt1)
++	cbnz	x17, L(gt1)
+ 	str	x2, [rp]
+ 	ret
+ L(gt1):	ldp	x4, x5, [up,#8]
+@@ -89,7 +89,7 @@
+ 	PSHIFT	x13, x4, cnt
+ 	NSHIFT	x10, x5, tnc
+ 	PSHIFT	x2, x5, cnt
+-	cbnz	x18, L(gt2)
++	cbnz	x17, L(gt2)
+ 	orr	x10, x10, x13
+ 	stp	x10, x2, [rp]
+ 	ret
+@@ -121,11 +121,11 @@
+ 	orr	x11, x12, x2
+ 	stp	x11, x10, [rp,#32]!
+ 	PSHIFT	x2, x5, cnt
+-L(lo0):	sub	x18, x18, #1
++L(lo0):	sub	x17, x17, #1
+ L(lo3):	NSHIFT	x10, x7, tnc
+ 	NSHIFT	x12, x6, tnc
+ 	PSHIFT	x13, x6, cnt
+-	cbnz	x18, L(top)
++	cbnz	x17, L(top)
+ 
+ L(end):	orr	x10, x10, x13
+ 	orr	x11, x12, x2
+diff -r 94c84d919f83 -r 5f32dbc41afc mpn/arm64/sqr_diag_addlsh1.asm
+--- a/mpn/arm64/sqr_diag_addlsh1.asm	Sat Nov 28 23:38:32 2020 +0100
++++ b/mpn/arm64/sqr_diag_addlsh1.asm	Sun Nov 29 22:31:40 2020 +0100
+@@ -47,7 +47,7 @@
+ ASM_START()
+ PROLOGUE(mpn_sqr_diag_addlsh1)
+ 	ldr	x15, [up],#8
+-	lsr	x18, n, #1
++	lsr	x14, n, #1
+ 	tbz	n, #0, L(bx0)
+ 
+ L(bx1):	adds	x7, xzr, xzr
+@@ -62,8 +62,8 @@
+ 	ldr	x17, [up],#16
+ 	ldp	x6, x7, [tp],#32
+ 	umulh	x11, x15, x15
+-	sub	x18, x18, #1
+-	cbz	x18, L(end)
++	sub	x14, x14, #1
++	cbz	x14, L(end)
+ 
+ 	ALIGN(16)
+ L(top):	extr	x9, x6, x5, #63
+@@ -84,8 +84,8 @@
+ 	extr	x8, x5, x4, #63
+ 	stp	x12, x13, [rp],#16
+ 	adcs	x12, x8, x10
+-	sub	x18, x18, #1
+-	cbnz	x18, L(top)
++	sub	x14, x14, #1
++	cbnz	x14, L(top)
+ 
+ L(end):	extr	x9, x6, x5, #63
+ 	mul	x10, x17, x17
+
diff --git a/external_imported/vcpkg/ports/gmp/portfile.cmake b/external_imported/vcpkg/ports/gmp/portfile.cmake
index 127bbda07..1fa65b47e 100644
--- a/external_imported/vcpkg/ports/gmp/portfile.cmake
+++ b/external_imported/vcpkg/ports/gmp/portfile.cmake
@@ -6,19 +6,14 @@ vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
 
 vcpkg_download_distfile(
     ARCHIVE
-    URLS "https://gmplib.org/download/gmp/gmp-${VERSION}.tar.xz"
+    URLS
+        "https://ftpmirror.gnu.org/gmp/gmp-${VERSION}.tar.xz"
+        "https://ftp.gnu.org/gnu/gmp/gmp-${VERSION}.tar.xz"
+        "https://gmplib.org/download/gmp/gmp-${VERSION}.tar.xz"
     FILENAME "gmp-${VERSION}.tar.xz"
     SHA512 c99be0950a1d05a0297d65641dd35b75b74466f7bf03c9e8a99895a3b2f9a0856cd17887738fa51cf7499781b65c049769271cbcb77d057d2e9f1ec52e07dd84
 )
 
-# Avoid the x18 register since it is reserved on arm64 osx and windows.
-vcpkg_download_distfile(
-    ARM64PATCH
-    URLS https://gmplib.org/repo/gmp/raw-rev/5f32dbc41afc
-    FILENAME gmp-arm64-asm-fix-5f32dbc41afc.patch
-    SHA512 4a7c50dc0a78e6c297c0ac53129ed367dbf669100a613653987d0eddf175376296254ed26ecce15d02b0544b99e44719af49635e54982b22e745f22e2f8d1eda
-)
-
 vcpkg_extract_source_archive(SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
     SOURCE_BASE "v${VERSION}"
@@ -28,7 +23,7 @@ vcpkg_extract_source_archive(SOURCE_PATH
         subdirs.patch
         msvc_symbol.patch
         arm64-coff.patch
-        "${ARM64PATCH}"
+        gmp-arm64-asm-fix-5f32dbc41afc.patch # Avoid the x18 register since it is reserved on arm64 osx and windows. Source: https://gmplib.org/repo/gmp/raw-rev/5f32dbc41afc
 )
 
 vcpkg_list(SET OPTIONS)
@@ -40,6 +35,7 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
     vcpkg_list(APPEND OPTIONS
         "ac_cv_func_memset=yes"
         "gmp_cv_asm_w32=.word"
+        "gmp_cv_check_libm_for_build=no"
     )
 endif()
 
@@ -65,6 +61,10 @@ if(VCPKG_DETECTED_CMAKE_C_COMPILER_ID STREQUAL "MSVC")
 elseif(VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
     # not exporting asm functions
     set(disable_assembly ON)
+elseif(VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
+    set(ccas "${VCPKG_DETECTED_CMAKE_C_COMPILER}")
+    vcpkg_list(APPEND OPTIONS "ABI=32")
+    string(APPEND asmflags " -m32")
 else()
     set(ccas "${VCPKG_DETECTED_CMAKE_C_COMPILER}")
 endif()
diff --git a/external_imported/vcpkg/ports/gmp/vcpkg.json b/external_imported/vcpkg/ports/gmp/vcpkg.json
index 463ba1de2..45d242617 100644
--- a/external_imported/vcpkg/ports/gmp/vcpkg.json
+++ b/external_imported/vcpkg/ports/gmp/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "gmp",
   "version": "6.2.1",
-  "port-version": 17,
+  "port-version": 21,
   "description": "The GNU Multiple Precision Arithmetic Library",
   "homepage": "https://gmplib.org",
   "license": "LGPL-3.0-only OR GPL-2.0-only",
+  "supports": "!xbox",
   "dependencies": [
     {
       "name": "gmp",
diff --git a/external_imported/vcpkg/ports/gmsh/portfile.cmake b/external_imported/vcpkg/ports/gmsh/portfile.cmake
index 78f9194a1..f42b94309 100644
--- a/external_imported/vcpkg/ports/gmsh/portfile.cmake
+++ b/external_imported/vcpkg/ports/gmsh/portfile.cmake
@@ -2,8 +2,8 @@ vcpkg_from_gitlab(
     GITLAB_URL https://gitlab.onelab.info
     OUT_SOURCE_PATH SOURCE_PATH
     REPO gmsh/gmsh
-    REF gmsh_4_9_0
-    SHA512 e70a09741a86a9131094e77742078aec1cc94517e1d7c855c257bc93c21c057e25c7ac5168d31ec4d905d78f31d5704faf63bfd3a81b4b9e2ebbcfacf2fdaa8b
+    REF gmsh_4_11_1
+    SHA512 4c10a41659ee4f70ba5091f9ae1c4c3ee285ccf217c3de1157a0d6d694e6f1df9a6b1329b2b24029dd52f945dd7605e477302bdb358106a8d97e903eaba425dc
     HEAD_REF master
     PATCHES fix-install.patch
 )
@@ -108,4 +108,4 @@ vcpkg_copy_tools(TOOL_NAMES gmsh AUTO_CLEAN)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/external_imported/vcpkg/ports/gmsh/vcpkg.json b/external_imported/vcpkg/ports/gmsh/vcpkg.json
index 70b1d266e..1caf380c5 100644
--- a/external_imported/vcpkg/ports/gmsh/vcpkg.json
+++ b/external_imported/vcpkg/ports/gmsh/vcpkg.json
@@ -1,8 +1,9 @@
 {
   "name": "gmsh",
-  "version": "4.9.0",
+  "version": "4.11.1",
   "description": "Gmsh is an open source 3D finite element mesh generator with a built-in CAD engine and post-processor.",
   "homepage": "https://gmsh.info",
+  "license": "LGPL-2.0-or-later",
   "supports": "!uwp",
   "dependencies": [
     "blas",
diff --git a/external_imported/vcpkg/ports/gobject-introspection/fix-pkgconfig.patch b/external_imported/vcpkg/ports/gobject-introspection/fix-pkgconfig.patch
new file mode 100644
index 000000000..8c8dfd257
--- /dev/null
+++ b/external_imported/vcpkg/ports/gobject-introspection/fix-pkgconfig.patch
@@ -0,0 +1,17 @@
+diff --git a/meson.build b/meson.build
+index b253927..312fbdc 100644
+--- a/meson.build
++++ b/meson.build
+@@ -254,9 +254,9 @@ endif
+ pkgconfig_variables = [
+   'datadir=' + '${prefix}' / get_option('datadir'),
+   'bindir=' + '${prefix}' / get_option('bindir'),
+-  'g_ir_scanner=${bindir}/g-ir-scanner',
+-  'g_ir_compiler=${bindir}/g-ir-compiler@0@'.format(exe_ext),
+-  'g_ir_generate=${bindir}/g-ir-generate@0@'.format(exe_ext),
++  'g_ir_scanner=${prefix}/tools/gobject-introspection/g-ir-scanner',
++  'g_ir_compiler=${prefix}/tools/gobject-introspection/g-ir-compiler@0@'.format(exe_ext),
++  'g_ir_generate=${prefix}/tools/gobject-introspection/g-ir-generate@0@'.format(exe_ext),
+   'gidatadir=${datadir}/gobject-introspection-1.0',
+   'girdir=' + gir_dir_pc_prefix / 'gir-1.0',
+   'typelibdir=${libdir}/girepository-1.0',
diff --git a/external_imported/vcpkg/ports/gobject-introspection/portfile.cmake b/external_imported/vcpkg/ports/gobject-introspection/portfile.cmake
index 24458ac62..b11c2efd2 100644
--- a/external_imported/vcpkg/ports/gobject-introspection/portfile.cmake
+++ b/external_imported/vcpkg/ports/gobject-introspection/portfile.cmake
@@ -8,14 +8,15 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 b8fba2bd12e93776c55228acf3487bef36ee40b1abdc7f681b827780ac94a8bfa1f59b0c30d60fa5a1fea2f610de78b9e52029f411128067808f17eb6374cdc5
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
+vcpkg_extract_source_archive(
+    SOURCE_PATH
+    ARCHIVE "${ARCHIVE}"
     PATCHES
         0001-g-ir-tool-template.in.patch
         0002-cross-build.patch
         0003-fix-paths.patch
         python.patch
+        fix-pkgconfig.patch
 )
 
 vcpkg_find_acquire_program(FLEX)
@@ -29,15 +30,12 @@ if(VCPKG_CROSSCOMPILING AND
 endif()
 
 vcpkg_configure_meson(
-    SOURCE_PATH ${SOURCE_PATH}
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS_DEBUG
         ${OPTIONS_DEBUG}
     OPTIONS_RELEASE
         ${OPTIONS_RELEASE}
-    ADDITIONAL_NATIVE_BINARIES
-        flex='${FLEX}'
-        bison='${BISON}'
-    ADDITIONAL_CROSS_BINARIES
+    ADDITIONAL_BINARIES
         flex='${FLEX}'
         bison='${BISON}'
         g-ir-annotation-tool='${CURRENT_HOST_INSTALLED_DIR}/tools/gobject-introspection/g-ir-annotation-tool'
@@ -53,8 +51,6 @@ vcpkg_copy_pdbs()
 
 vcpkg_fixup_pkgconfig()
 
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-
 set(GI_TOOLS
         g-ir-compiler
         g-ir-generate
@@ -77,8 +73,13 @@ foreach(script IN LISTS GI_SCRIPTS)
     file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/${script}")
 endforeach()
 
+if(VCPKG_TARGET_IS_WINDOWS)
+    file(GLOB _pyd_lib_files "${CURRENT_PACKAGES_DIR}/lib/gobject-introspection/giscanner/_giscanner.*.lib")
+    file(REMOVE ${_pyd_lib_files})
+endif()
+
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/man")
 
-set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled) # _giscanner.lib
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/gobject-introspection/python.patch b/external_imported/vcpkg/ports/gobject-introspection/python.patch
index 5a196ae65..95e7f8163 100644
--- a/external_imported/vcpkg/ports/gobject-introspection/python.patch
+++ b/external_imported/vcpkg/ports/gobject-introspection/python.patch
@@ -24,6 +24,6 @@ index 2a9d68556..cffe9014c 100644
  
  # python headers
 -cc.check_header('Python.h', dependencies: [python.dependency()], required: true)
-+libpython_dep = dependency('python-3.10', method : 'pkg-config')
++libpython_dep = dependency('python-@0@'.format(python_version), method : 'pkg-config')
 +cc.check_header('Python.h', dependencies: [libpython_dep], required: true)
  
diff --git a/external_imported/vcpkg/ports/gobject-introspection/vcpkg.json b/external_imported/vcpkg/ports/gobject-introspection/vcpkg.json
index ed8a0fa75..eb5c570a7 100644
--- a/external_imported/vcpkg/ports/gobject-introspection/vcpkg.json
+++ b/external_imported/vcpkg/ports/gobject-introspection/vcpkg.json
@@ -1,11 +1,11 @@
 {
   "name": "gobject-introspection",
   "version": "1.72.0",
-  "port-version": 1,
+  "port-version": 7,
   "description": "A middleware layer between C libraries (using GObject) and language bindings.",
   "homepage": "https://gi.readthedocs.io/en/latest/",
   "license": null,
-  "supports": "!static & (native | (windows & x86))",
+  "supports": "!static & native",
   "dependencies": [
     {
       "name": "cairo",
@@ -23,6 +23,7 @@
       "name": "gobject-introspection",
       "host": true
     },
+    "libffi",
     "python3",
     {
       "name": "vcpkg-tool-meson",
diff --git a/external_imported/vcpkg/ports/google-cloud-cpp/portfile.cmake b/external_imported/vcpkg/ports/google-cloud-cpp/portfile.cmake
index c0cc22404..a9b68e5c3 100644
--- a/external_imported/vcpkg/ports/google-cloud-cpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/google-cloud-cpp/portfile.cmake
@@ -3,19 +3,23 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO googleapis/google-cloud-cpp
-    REF v2.8.0
-    SHA512 d764793c66e06afc9a91622ec32808088b2a0cfedac7876682caded967a06f9f8b0dbebe9dadd36cf75350027dcd1aeed631072d4b8610f1793caf49c2f50f1c
+    REF "v${VERSION}"
+    SHA512 f02e26964a4049791bf4ce9580e738f245fb8380f9a1ccf3bd193296a4877aece72e8507efbbcabf7ef7072a810f6632c399748d804e33f3cc769ef49e334a88
     HEAD_REF main
     PATCHES
         support_absl_cxx17.patch
 )
 
-vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/grpc")
+if ("grpc-common" IN_LIST FEATURES)
+    vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/grpc")
+endif ()
 
 set(GOOGLE_CLOUD_CPP_ENABLE "${FEATURES}")
 list(REMOVE_ITEM GOOGLE_CLOUD_CPP_ENABLE "core")
-# This feature does not exist, but allows us to simplify the vcpkg.json file.
+# This feature does not exist, but allows us to simplify the vcpkg.json
+# file.
 list(REMOVE_ITEM GOOGLE_CLOUD_CPP_ENABLE "grpc-common")
+list(REMOVE_ITEM GOOGLE_CLOUD_CPP_ENABLE "rest-common")
 list(REMOVE_ITEM GOOGLE_CLOUD_CPP_ENABLE "googleapis")
 # google-cloud-cpp uses dialogflow_cx and dialogflow_es. Underscores
 # are invalid in `vcpkg` features, we use dashes (`-`) as a separator
@@ -40,33 +44,36 @@ vcpkg_cmake_configure(
         -DGOOGLE_CLOUD_CPP_ENABLE_CCACHE=OFF
         -DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES=OFF
         -DBUILD_TESTING=OFF
+        # This is needed by the `experimental-storage-grpc` feature until vcpkg
+        # gets Protobuf >= 4.23.0.  It has no effect for other features, so
+        # it is simpler to just always turn it on.
+        -DGOOGLE_CLOUD_CPP_ENABLE_CTYPE_CORD_WORKAROUND=ON
 )
 
 vcpkg_cmake_install()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-foreach(feature IN LISTS FEATURES)
-    set(config_path "lib/cmake/google_cloud_cpp_${feature}")
-    # Most features get their own package in `google-cloud-cpp`.
-    # The exceptions are captured by this `if()` command, basically
-    # things like `core` and `experimental-storage-grpc` are skipped.
+
+function (google_cloud_cpp_cmake_config_fixup library)
+    set(config_path "lib/cmake/google_cloud_cpp_${library}")
+    # If the library exists and is installed, tell vcpkg about it.
     if(NOT IS_DIRECTORY "${CURRENT_PACKAGES_DIR}/${config_path}")
-        continue()
+        return()
     endif()
-    vcpkg_cmake_config_fixup(PACKAGE_NAME "google_cloud_cpp_${feature}"
+    vcpkg_cmake_config_fixup(PACKAGE_NAME "google_cloud_cpp_${library}"
                              CONFIG_PATH "${config_path}"
                              DO_NOT_DELETE_PARENT_CONFIG_PATH)
+endfunction ()
+
+foreach(feature IN LISTS GOOGLE_CLOUD_CPP_ENABLE)
+    google_cloud_cpp_cmake_config_fixup(${feature})
+    google_cloud_cpp_cmake_config_fixup(${feature}_mocks)
 endforeach()
+
 # These packages are automatically installed depending on what features are
 # enabled.
-foreach(suffix common googleapis grpc_utils rest_internal dialogflow_cx dialogflow_es)
-    set(config_path "lib/cmake/google_cloud_cpp_${suffix}")
-    if(NOT IS_DIRECTORY "${CURRENT_PACKAGES_DIR}/${config_path}")
-        continue()
-    endif()
-    vcpkg_cmake_config_fixup(PACKAGE_NAME "google_cloud_cpp_${suffix}"
-                             CONFIG_PATH "${config_path}"
-                             DO_NOT_DELETE_PARENT_CONFIG_PATH)
+foreach(feature common compute_protos googleapis grpc_utils iam_v2 logging_type rest_internal rest_protobuf_internal)
+    google_cloud_cpp_cmake_config_fixup(${feature})
 endforeach()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake"
diff --git a/external_imported/vcpkg/ports/google-cloud-cpp/vcpkg.json b/external_imported/vcpkg/ports/google-cloud-cpp/vcpkg.json
index 1ed332a9f..e572ef9cd 100644
--- a/external_imported/vcpkg/ports/google-cloud-cpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/google-cloud-cpp/vcpkg.json
@@ -1,13 +1,13 @@
 {
   "name": "google-cloud-cpp",
-  "version": "2.8.0",
+  "version": "2.21.0",
   "description": "C++ Client Libraries for Google Cloud Platform APIs.",
   "homepage": "https://github.com/googleapis/google-cloud-cpp",
   "license": "Apache-2.0",
   "supports": "!uwp",
   "dependencies": [
     "abseil",
-    "grpc",
+    "openssl",
     {
       "name": "vcpkg-cmake",
       "host": true
@@ -295,6 +295,30 @@
         }
       ]
     },
+    "cloudquotas": {
+      "description": "Cloud Quotas API C++ Client Library",
+      "dependencies": [
+        {
+          "name": "google-cloud-cpp",
+          "default-features": false,
+          "features": [
+            "grpc-common"
+          ]
+        }
+      ]
+    },
+    "commerce": {
+      "description": "Cloud Commerce C++ Client Library",
+      "dependencies": [
+        {
+          "name": "google-cloud-cpp",
+          "default-features": false,
+          "features": [
+            "grpc-common"
+          ]
+        }
+      ]
+    },
     "composer": {
       "description": "Cloud Composer C++ Client Library",
       "dependencies": [
@@ -307,6 +331,44 @@
         }
       ]
     },
+    "compute": {
+      "description": "Compute Engine C++ Client Library",
+      "supports": "!windows",
+      "dependencies": [
+        {
+          "name": "google-cloud-cpp",
+          "default-features": false,
+          "features": [
+            "grpc-common",
+            "rest-common"
+          ]
+        }
+      ]
+    },
+    "confidentialcomputing": {
+      "description": "Confidential Computing API C++ Client Library",
+      "dependencies": [
+        {
+          "name": "google-cloud-cpp",
+          "default-features": false,
+          "features": [
+            "grpc-common"
+          ]
+        }
+      ]
+    },
+    "config": {
+      "description": "Infrastructure Manager API C++ Client Library",
+      "dependencies": [
+        {
+          "name": "google-cloud-cpp",
+          "default-features": false,
+          "features": [
+            "grpc-common"
+          ]
+        }
+      ]
+    },
     "connectors": {
       "description": "Connectors API C++ Client Library",
       "dependencies": [
@@ -368,6 +430,18 @@
         }
       ]
     },
+    "datafusion": {
+      "description": "Cloud Data Fusion API C++ Client Library",
+      "dependencies": [
+        {
+          "name": "google-cloud-cpp",
+          "default-features": false,
+          "features": [
+            "grpc-common"
+          ]
+        }
+      ]
+    },
     "datamigration": {
       "description": "Database Migration API C++ Client Library",
       "dependencies": [
@@ -404,8 +478,8 @@
         }
       ]
     },
-    "datastream": {
-      "description": "Datastream API C++ Client Library",
+    "datastore": {
+      "description": "Cloud Datastore API C++ Client Library",
       "dependencies": [
         {
           "name": "google-cloud-cpp",
@@ -416,8 +490,8 @@
         }
       ]
     },
-    "debugger": {
-      "description": "Stackdriver Debugger API C++ Client Library",
+    "datastream": {
+      "description": "Datastream API C++ Client Library",
       "dependencies": [
         {
           "name": "google-cloud-cpp",
@@ -464,6 +538,18 @@
         }
       ]
     },
+    "discoveryengine": {
+      "description": "Discovery Engine API C++ Client Library",
+      "dependencies": [
+        {
+          "name": "google-cloud-cpp",
+          "default-features": false,
+          "features": [
+            "grpc-common"
+          ]
+        }
+      ]
+    },
     "dlp": {
       "description": "Cloud Data Loss Prevention (DLP) API C++ Client Library",
       "dependencies": [
@@ -500,6 +586,18 @@
         }
       ]
     },
+    "edgenetwork": {
+      "description": "Distributed Cloud Edge Network API C++ Client Library",
+      "dependencies": [
+        {
+          "name": "google-cloud-cpp",
+          "default-features": false,
+          "features": [
+            "grpc-common"
+          ]
+        }
+      ]
+    },
     "eventarc": {
       "description": "Eventarc API C++ Client Library",
       "dependencies": [
@@ -549,18 +647,6 @@
         }
       ]
     },
-    "gameservices": {
-      "description": "Game Services API C++ Client Library",
-      "dependencies": [
-        {
-          "name": "google-cloud-cpp",
-          "default-features": false,
-          "features": [
-            "grpc-common"
-          ]
-        }
-      ]
-    },
     "gkehub": {
       "description": "GKE Hub C++ Client Library",
       "dependencies": [
@@ -648,18 +734,6 @@
         }
       ]
     },
-    "iot": {
-      "description": "Cloud IoT API C++ Client Library",
-      "dependencies": [
-        {
-          "name": "google-cloud-cpp",
-          "default-features": false,
-          "features": [
-            "grpc-common"
-          ]
-        }
-      ]
-    },
     "kms": {
       "description": "Cloud Key Management Service (KMS) API C++ Client Library",
       "dependencies": [
@@ -720,6 +794,30 @@
         }
       ]
     },
+    "metastore": {
+      "description": "Dataproc Metastore API C++ Client Library",
+      "dependencies": [
+        {
+          "name": "google-cloud-cpp",
+          "default-features": false,
+          "features": [
+            "grpc-common"
+          ]
+        }
+      ]
+    },
+    "migrationcenter": {
+      "description": "Migration Center API C++ Client Library",
+      "dependencies": [
+        {
+          "name": "google-cloud-cpp",
+          "default-features": false,
+          "features": [
+            "grpc-common"
+          ]
+        }
+      ]
+    },
     "monitoring": {
       "description": "Cloud Monitoring API C++ Client Library",
       "dependencies": [
@@ -732,6 +830,18 @@
         }
       ]
     },
+    "netapp": {
+      "description": "NetApp API C++ Client Library",
+      "dependencies": [
+        {
+          "name": "google-cloud-cpp",
+          "default-features": false,
+          "features": [
+            "grpc-common"
+          ]
+        }
+      ]
+    },
     "networkconnectivity": {
       "description": "Network Connectivity API C++ Client Library",
       "dependencies": [
@@ -756,6 +866,18 @@
         }
       ]
     },
+    "networksecurity": {
+      "description": "Secure Web Proxy API C++ Client Library",
+      "dependencies": [
+        {
+          "name": "google-cloud-cpp",
+          "default-features": false,
+          "features": [
+            "grpc-common"
+          ]
+        }
+      ]
+    },
     "notebooks": {
       "description": "Notebooks API C++ Client Library",
       "dependencies": [
@@ -768,6 +890,32 @@
         }
       ]
     },
+    "oauth2": {
+      "description": "OAuth2 Access Token Generation Library",
+      "dependencies": [
+        {
+          "name": "google-cloud-cpp",
+          "default-features": false,
+          "features": [
+            "rest-common"
+          ]
+        }
+      ]
+    },
+    "opentelemetry": {
+      "description": "OpenTelemetry C++ GCP Exporter Library",
+      "dependencies": [
+        {
+          "name": "google-cloud-cpp",
+          "default-features": false,
+          "features": [
+            "rest-common",
+            "trace"
+          ]
+        },
+        "opentelemetry-cpp"
+      ]
+    },
     "optimization": {
       "description": "Cloud Optimization API C++ Client Library",
       "dependencies": [
@@ -816,6 +964,18 @@
         }
       ]
     },
+    "policysimulator": {
+      "description": "Policy Simulator API C++ Client Library",
+      "dependencies": [
+        {
+          "name": "google-cloud-cpp",
+          "default-features": false,
+          "features": [
+            "grpc-common"
+          ]
+        }
+      ]
+    },
     "policytroubleshooter": {
       "description": "Policy Troubleshooter API C++ Client Library",
       "dependencies": [
@@ -864,6 +1024,18 @@
         }
       ]
     },
+    "rapidmigrationassessment": {
+      "description": "Rapid Migration Assessment C++ Client Library",
+      "dependencies": [
+        {
+          "name": "google-cloud-cpp",
+          "default-features": false,
+          "features": [
+            "grpc-common"
+          ]
+        }
+      ]
+    },
     "recommender": {
       "description": "Recommender C++ Client Library",
       "dependencies": [
@@ -912,6 +1084,18 @@
         }
       ]
     },
+    "rest-common": {
+      "description": "Dependencies used by all REST-based libraries",
+      "dependencies": [
+        {
+          "name": "curl",
+          "features": [
+            "ssl"
+          ]
+        },
+        "nlohmann-json"
+      ]
+    },
     "retail": {
       "description": "Retail API C++ Client Library",
       "dependencies": [
@@ -924,6 +1108,18 @@
         }
       ]
     },
+    "rpc": {
+      "description": "RPC API C++ Client Library",
+      "dependencies": [
+        {
+          "name": "google-cloud-cpp",
+          "default-features": false,
+          "features": [
+            "grpc-common"
+          ]
+        }
+      ]
+    },
     "run": {
       "description": "Cloud Run Admin API C++ Client Library",
       "dependencies": [
@@ -960,6 +1156,18 @@
         }
       ]
     },
+    "securesourcemanager": {
+      "description": "Secure Source Manager API C++ Client Library",
+      "dependencies": [
+        {
+          "name": "google-cloud-cpp",
+          "default-features": false,
+          "features": [
+            "grpc-common"
+          ]
+        }
+      ]
+    },
     "securitycenter": {
       "description": "Security Command Center API C++ Client Library",
       "dependencies": [
@@ -996,6 +1204,18 @@
         }
       ]
     },
+    "servicehealth": {
+      "description": "Personalized Service Health API C++ Client Library",
+      "dependencies": [
+        {
+          "name": "google-cloud-cpp",
+          "default-features": false,
+          "features": [
+            "grpc-common"
+          ]
+        }
+      ]
+    },
     "servicemanagement": {
       "description": "Service Management API C++ Client Library",
       "dependencies": [
@@ -1056,17 +1276,42 @@
         }
       ]
     },
+    "sql": {
+      "description": "The Google Cloud SQL Admin C++ client library",
+      "dependencies": [
+        {
+          "name": "google-cloud-cpp",
+          "default-features": false,
+          "features": [
+            "grpc-common",
+            "rest-common"
+          ]
+        }
+      ]
+    },
     "storage": {
       "description": "The Google Cloud Storage C++ client library",
       "dependencies": [
         "crc32c",
         {
-          "name": "curl",
+          "name": "google-cloud-cpp",
+          "default-features": false,
           "features": [
-            "ssl"
+            "rest-common"
           ]
-        },
-        "nlohmann-json"
+        }
+      ]
+    },
+    "storageinsights": {
+      "description": "Storage Insights API C++ Client Library",
+      "dependencies": [
+        {
+          "name": "google-cloud-cpp",
+          "default-features": false,
+          "features": [
+            "grpc-common"
+          ]
+        }
       ]
     },
     "storagetransfer": {
@@ -1081,6 +1326,18 @@
         }
       ]
     },
+    "support": {
+      "description": "Cloud Support API C++ Client Library",
+      "dependencies": [
+        {
+          "name": "google-cloud-cpp",
+          "default-features": false,
+          "features": [
+            "grpc-common"
+          ]
+        }
+      ]
+    },
     "talent": {
       "description": "Cloud Talent Solution API C++ Client Library",
       "dependencies": [
@@ -1105,6 +1362,18 @@
         }
       ]
     },
+    "telcoautomation": {
+      "description": "Cloud Telco Automation API C++ Client Library",
+      "dependencies": [
+        {
+          "name": "google-cloud-cpp",
+          "default-features": false,
+          "features": [
+            "grpc-common"
+          ]
+        }
+      ]
+    },
     "texttospeech": {
       "description": "Cloud Text-to-Speech API C++ Client Library",
       "dependencies": [
@@ -1260,6 +1529,18 @@
           ]
         }
       ]
+    },
+    "workstations": {
+      "description": "Workstations API C++ Client Library",
+      "dependencies": [
+        {
+          "name": "google-cloud-cpp",
+          "default-features": false,
+          "features": [
+            "grpc-common"
+          ]
+        }
+      ]
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/gperf/portfile.cmake b/external_imported/vcpkg/ports/gperf/portfile.cmake
index 34644af1b..487dcaba7 100644
--- a/external_imported/vcpkg/ports/gperf/portfile.cmake
+++ b/external_imported/vcpkg/ports/gperf/portfile.cmake
@@ -6,9 +6,11 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 855ebce5ff36753238a44f14c95be7afdc3990b085960345ca2caf1a2db884f7db74d406ce9eec2f4a52abb8a063d4ed000a36b317c9a353ef4e25e2cca9a3f4
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE ${ARCHIVE}
+    PATCHES 
+    	remove_register_keyword_cpp17.patch
 )
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
diff --git a/external_imported/vcpkg/ports/gperf/remove_register_keyword_cpp17.patch b/external_imported/vcpkg/ports/gperf/remove_register_keyword_cpp17.patch
new file mode 100644
index 000000000..bb8c414a1
--- /dev/null
+++ b/external_imported/vcpkg/ports/gperf/remove_register_keyword_cpp17.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/getline.cc b/lib/getline.cc
+index c57c633..0984a7c 100644
+--- a/lib/getline.cc
++++ b/lib/getline.cc
+@@ -55,7 +55,7 @@ getstr (char **lineptr, size_t *n, FILE *stream, char terminator, size_t offset)
+ 
+   for (;;)
+     {
+-      register int c = getc (stream);
++      int c = getc (stream);
+ 
+       /* We always want at least one char left in the buffer, since we
+          always (unless we get an error while reading the first char)
diff --git a/external_imported/vcpkg/ports/gperf/vcpkg.json b/external_imported/vcpkg/ports/gperf/vcpkg.json
index 02f6116f1..3f3dfc04d 100644
--- a/external_imported/vcpkg/ports/gperf/vcpkg.json
+++ b/external_imported/vcpkg/ports/gperf/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "gperf",
   "version": "3.1",
-  "port-version": 4,
+  "port-version": 6,
   "description": "GNU perfect hash function generator",
   "homepage": "https://www.gnu.org/software/gperf/",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/gperftools/portfile.cmake b/external_imported/vcpkg/ports/gperftools/portfile.cmake
index 4d03e0e07..162c66835 100644
--- a/external_imported/vcpkg/ports/gperftools/portfile.cmake
+++ b/external_imported/vcpkg/ports/gperftools/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO gperftools/gperftools
-    REF fe62a0baab87ba3abca12f4a621532bf67c9a7d2
-    SHA512 fc0fb2c56d38046ac7bc2d36863dabf073b7aede7ce18916228d7b9f64cf33ae754708bff028353ada52bf4b79a7cd3e3334c1558a9ba64b06326b1537faf690
+    REF gperftools-2.10
+    SHA512 4400711723be9401f519d85b3b69c026e4715473cbed48ab0573df17abdf895fb971ee969875fe5127a2e8b9aba90d858285e50c8e012384c2c36d5a76b1f0c4
     HEAD_REF master
 )
 
@@ -18,8 +18,9 @@ if(VCPKG_TARGET_IS_WINDOWS)
 
     vcpkg_check_features(
         OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-        override GPERFTOOLS_WIN32_OVERRIDE
-        tools GPERFTOOLS_BUILD_TOOLS
+        FEATURES
+            override GPERFTOOLS_WIN32_OVERRIDE
+            tools GPERFTOOLS_BUILD_TOOLS
     )
 
     vcpkg_cmake_configure(
diff --git a/external_imported/vcpkg/ports/gperftools/vcpkg.json b/external_imported/vcpkg/ports/gperftools/vcpkg.json
index 556db9a29..6cc9b530c 100644
--- a/external_imported/vcpkg/ports/gperftools/vcpkg.json
+++ b/external_imported/vcpkg/ports/gperftools/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "gperftools",
-  "version-date": "2019-09-02",
-  "port-version": 3,
+  "version": "2.10",
+  "port-version": 1,
   "description": "A set of tools for performance profiling and memory checking",
   "homepage": "https://github.com/gperftools/gperftools",
-  "supports": "!(arm | arm64 | uwp)",
+  "supports": "!(arm & windows) & !uwp & !android",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
@@ -14,10 +14,12 @@
   ],
   "features": {
     "override": {
-      "description": "Override allocators"
+      "description": "Override allocators",
+      "supports": "windows & staticcrt"
     },
     "tools": {
-      "description": "Build gperftools CLI tools"
+      "description": "Build gperftools CLI tools",
+      "supports": "windows"
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/gpgme/disable-tests.patch b/external_imported/vcpkg/ports/gpgme/disable-tests.patch
deleted file mode 100644
index c7158508f..000000000
--- a/external_imported/vcpkg/ports/gpgme/disable-tests.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From b05747aea79083106b27ac7d829db3e65e192682 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
-Date: Thu, 29 Oct 2020 13:23:56 -0400
-Subject: [PATCH] cpp,python: Respect --disable-gpg-test for tests
-
-* lang/cpp/Makefile.am: Respect --disable-gpg-test
-* lang/python/Makefile.am: Respect --disable-gpg-test
-
-This is similar to the qt that had it already enabled
----
- lang/cpp/Makefile.am    | 8 +++++++-
- lang/python/Makefile.am | 8 +++++++-
- 2 files changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/lang/cpp/Makefile.am b/lang/cpp/Makefile.am
-index 724da6ca..70ca7462 100644
---- a/lang/cpp/Makefile.am
-+++ b/lang/cpp/Makefile.am
-@@ -18,6 +18,12 @@
- # License along with this program; if not, see <https://gnu.org/licenses/>.
- # SPDX-License-Identifier: LGPL-2.1-or-later
- 
--SUBDIRS = src tests
-+if RUN_GPG_TESTS
-+tests = tests
-+else
-+tests =
-+endif
-+
-+SUBDIRS = src ${tests}
- 
- EXTRA_DIST = README
-diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
-index 845b7b17..68b98e8e 100644
---- a/lang/python/Makefile.am
-+++ b/lang/python/Makefile.am
-@@ -23,7 +23,13 @@ EXTRA_DIST = \
- 	gpgme.i \
- 	helpers.c helpers.h private.h
- 
--SUBDIRS = . tests examples doc src
-+if RUN_GPG_TESTS
-+tests = tests
-+else
-+tests =
-+endif
-+
-+SUBDIRS = . ${tests} examples doc src
- 
- .PHONY: prepare
- prepare: copystamp
diff --git a/external_imported/vcpkg/ports/gpgme/fix-c++11.patch b/external_imported/vcpkg/ports/gpgme/fix-c++11.patch
deleted file mode 100644
index d8b68e775..000000000
--- a/external_imported/vcpkg/ports/gpgme/fix-c++11.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff --git a/lang/cpp/src/importresult.cpp b/lang/cpp/src/importresult.cpp
-index 06258729..0a7ad03d 100644
---- a/lang/cpp/src/importresult.cpp
-+++ b/lang/cpp/src/importresult.cpp
-@@ -152,17 +152,17 @@ void GpgME::ImportResult::mergeWith(const ImportResult &other)
-         }
-         // was this key also considered during the first import
-         const auto consideredInFirstImports =
--            std::any_of(std::begin(d->imports), std::end(d->imports), [fpr](const auto i) {
-+            std::any_of(std::begin(d->imports), std::end(d->imports), [fpr](const gpgme_import_status_t i) {
-                 return i->fpr && !strcmp(i->fpr, fpr);
-             });
-         // did we see this key already in the list of keys of the other import
-         const auto consideredInPreviousOtherImports =
--            std::any_of(std::begin(other.d->imports), it, [fpr](const auto i) {
-+            std::any_of(std::begin(other.d->imports), it, [fpr](const gpgme_import_status_t i) {
-                 return i->fpr && !strcmp(i->fpr, fpr);
-             });
-         // was anything added to this key during the other import
-         const auto changedInOtherImports =
--            std::any_of(std::begin(other.d->imports), std::end(other.d->imports), [fpr](const auto i) {
-+            std::any_of(std::begin(other.d->imports), std::end(other.d->imports), [fpr](const gpgme_import_status_t i) {
-                 return i->fpr && !strcmp(i->fpr, fpr) && (i->status != 0);
-             });
-         if (consideredInFirstImports && !consideredInPreviousOtherImports) {
-@@ -177,15 +177,15 @@ void GpgME::ImportResult::mergeWith(const ImportResult &other)
- 
-         // now do the same for the secret key counts
-         const auto secretKeyConsideredInFirstImports =
--            std::any_of(std::begin(d->imports), std::end(d->imports), [fpr](const auto i) {
-+            std::any_of(std::begin(d->imports), std::end(d->imports), [fpr](const gpgme_import_status_t i) {
-                 return i->fpr && !strcmp(i->fpr, fpr) && (i->status & GPGME_IMPORT_SECRET);
-             });
-         const auto secretKeyConsideredInPreviousOtherImports =
--            std::any_of(std::begin(other.d->imports), it, [fpr](const auto i) {
-+            std::any_of(std::begin(other.d->imports), it, [fpr](const gpgme_import_status_t i) {
-                 return i->fpr && !strcmp(i->fpr, fpr) && (i->status & GPGME_IMPORT_SECRET);
-             });
-         const auto secretKeyChangedInOtherImports =
--            std::any_of(std::begin(other.d->imports), std::end(other.d->imports), [fpr](const auto i) {
-+            std::any_of(std::begin(other.d->imports), std::end(other.d->imports), [fpr](const gpgme_import_status_t i) {
-                 return i->fpr && !strcmp(i->fpr, fpr) && (i->status & GPGME_IMPORT_SECRET) && (i->status != GPGME_IMPORT_SECRET);
-             });
-         if (secretKeyConsideredInFirstImports && !secretKeyConsideredInPreviousOtherImports) {
-@@ -204,7 +204,7 @@ void GpgME::ImportResult::mergeWith(const ImportResult &other)
-     d->imports.reserve(d->imports.size() + other.d->imports.size());
-     std::transform(std::begin(other.d->imports), std::end(other.d->imports),
-                    std::back_inserter(d->imports),
--                   [](const auto import) {
-+                   [](const gpgme_import_status_t import) {
-                        gpgme_import_status_t copy = new _gpgme_import_status{*import};
-                        if (import->fpr) {
-                            copy->fpr = strdup(import->fpr);
--- 
-2.11.0
-
diff --git a/external_imported/vcpkg/ports/gpgme/portfile.cmake b/external_imported/vcpkg/ports/gpgme/portfile.cmake
index 444283228..e50242bce 100644
--- a/external_imported/vcpkg/ports/gpgme/portfile.cmake
+++ b/external_imported/vcpkg/ports/gpgme/portfile.cmake
@@ -1,20 +1,16 @@
-vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
-
 vcpkg_download_distfile(tarball
     URLS
         "https://gnupg.org/ftp/gcrypt/gpgme/gpgme-${VERSION}.tar.bz2"
         "https://mirrors.dotsrc.org/gcrypt/gpgme/gpgme-${VERSION}.tar.bz2"
         "https://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/gpgme/gpgme-${VERSION}.tar.bz2"
     FILENAME "gpgme-${VERSION}.tar.bz2"
-    SHA512 c0cb0b337d017793a15dd477a7f5eaef24587fcda3d67676bf746bb342398d04792c51abe3c26ae496e799c769ce667d4196d91d86e8a690d02c6718c8f6b4ac
+    SHA512 17053053fa885f01416433e43072ac716b5d5db0c3edf45b2d6e90e6384d127626e6ae3ce421abba8f449f5ca7e8963f3d62f3565d295847170bc998d1ec1a70
 )
 vcpkg_extract_source_archive(
     SOURCE_PATH
     ARCHIVE "${tarball}"
     PATCHES
-        disable-tests.patch
         disable-docs.patch
-        fix-c++11.patch # https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commit;h=f02c20cc9c5756690b07abfd02a43533547ba2ef
  )
 
 vcpkg_list(SET LANGUAGES)
@@ -31,22 +27,30 @@ vcpkg_configure_make(
         --disable-gpgsm-test
         --disable-g13-test
         --enable-languages=${LANGUAGES}
-        --with-libgpg-error-prefix=${CURRENT_INSTALLED_DIR}/tools/libgpg-error
-        --with-libassuan-prefix=${CURRENT_INSTALLED_DIR}/tools/libassuan
+        GPG_ERROR_CONFIG=/ # fake absolute path; gpgrt-config is used instead
+    OPTIONS_RELEASE
+        "GPGRT_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/bin/gpgrt-config"
+    OPTIONS_DEBUG
+        "GPGRT_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/debug/bin/gpgrt-config"
 )
 
 vcpkg_install_make()
-# CMake config needs work for linkage and build type
-# vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Gpgmepp PACKAGE_NAME Gpgmepp)
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake" "${CURRENT_PACKAGES_DIR}/debug/lib/cmake")
 vcpkg_copy_pdbs() 
-# We have no dependency on glib, so remove this extra .pc file
+
+# This port doesn't support the windows-only glib integration.
 file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gpgme-glib.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gpgme-glib.pc")
 vcpkg_fixup_pkgconfig()
 
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/gpgme/bin/gpgme-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..")
-if (NOT VCPKG_BUILD_TYPE)
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/gpgme/debug/bin/gpgme-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..")
+# CMake config needs work for linkage and build type.
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake" "${CURRENT_PACKAGES_DIR}/debug/lib/cmake")
+
+set(install_prefix "${CURRENT_INSTALLED_DIR}")
+if(VCPKG_HOST_IS_WINDOWS)
+    string(REGEX REPLACE "^([a-zA-Z]):/" "/\\1/" install_prefix "${install_prefix}")
+endif()
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/gpgme-config" "${install_prefix}" "`dirname $0`/../../..")
+if(NOT VCPKG_BUILD_TYPE)
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/gpgme-config" "${install_prefix}" "`dirname $0`/../../../..")
 endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
diff --git a/external_imported/vcpkg/ports/gpgme/vcpkg.json b/external_imported/vcpkg/ports/gpgme/vcpkg.json
index e8d84c4b9..243f60fd1 100644
--- a/external_imported/vcpkg/ports/gpgme/vcpkg.json
+++ b/external_imported/vcpkg/ports/gpgme/vcpkg.json
@@ -1,17 +1,13 @@
 {
   "name": "gpgme",
-  "version": "1.18.0",
+  "version": "1.22.0",
   "description": "A library designed to make access to GnuPG easier for applications",
-  "homepage": "https://gnupg.org/software/gpgme/index.html",
+  "homepage": "https://gnupg.org/software/gpgme/",
   "license": null,
   "supports": "!windows | mingw",
   "dependencies": [
     "libassuan",
-    "libgpg-error",
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
-    }
+    "libgpg-error"
   ],
   "default-features": [
     "cpp"
diff --git a/external_imported/vcpkg/ports/gppanel/fix-missing-headers.patch b/external_imported/vcpkg/ports/gppanel/fix-missing-headers.patch
new file mode 100644
index 000000000..62474987d
--- /dev/null
+++ b/external_imported/vcpkg/ports/gppanel/fix-missing-headers.patch
@@ -0,0 +1,14 @@
+diff --git a/include/baseXYData.h b/include/baseXYData.h
+index 2877e4f..f018b35 100644
+--- a/include/baseXYData.h
++++ b/include/baseXYData.h
+@@ -5,6 +5,9 @@
+ #include "CMinMax.h"
+ #include "xyMultimapLabel.h"
+ #include <deque>
++#include <time.h>
++#include <vector>
++#include <limits>
+ 
+ //This possible to handle a lot of data quicker
+ //plot just second 1000 point to display..
diff --git a/external_imported/vcpkg/ports/gppanel/portfile.cmake b/external_imported/vcpkg/ports/gppanel/portfile.cmake
index f4c719f33..47befccaf 100644
--- a/external_imported/vcpkg/ports/gppanel/portfile.cmake
+++ b/external_imported/vcpkg/ports/gppanel/portfile.cmake
@@ -9,6 +9,7 @@ vcpkg_from_github(
     PATCHES 
         00001-fix-build.patch
         use-complex-header.patch
+        fix-missing-headers.patch # https://github.com/woollybah/gppanel/pull/5
 )
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
diff --git a/external_imported/vcpkg/ports/gppanel/vcpkg.json b/external_imported/vcpkg/ports/gppanel/vcpkg.json
index 0ffcd4063..6b6d2dbf2 100644
--- a/external_imported/vcpkg/ports/gppanel/vcpkg.json
+++ b/external_imported/vcpkg/ports/gppanel/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "gppanel",
   "version-date": "2020-05-20",
-  "port-version": 2,
+  "port-version": 4,
   "description": "gpPanel is chart library for wxWidget. It inheritance from wxPanel and use modified wxMathPlot library at chart engine.",
   "homepage": "https://github.com/woollybah/gppanel",
   "license": "GPL-2.0-or-later WITH WxWindows-exception-3.1",
+  "supports": "!xbox",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/grantlee/portfile.cmake b/external_imported/vcpkg/ports/grantlee/portfile.cmake
index f1e2061da..f5478e4ac 100644
--- a/external_imported/vcpkg/ports/grantlee/portfile.cmake
+++ b/external_imported/vcpkg/ports/grantlee/portfile.cmake
@@ -10,7 +10,9 @@ vcpkg_from_github(
 
 vcpkg_cmake_configure (
     SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS -DBUILD_TESTS=off
+    OPTIONS
+        -DGRANTLEE_BUILD_WITH_QT6=ON
+        -DBUILD_TESTS=OFF
 )
 
 vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" [[set( PLUGIN_INSTALL_DIR ${LIB_INSTALL_DIR}/grantlee/${Grantlee5_MAJOR_MINOR_VERSION_STRING} )]] [[set( PLUGIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/bin)]])
diff --git a/external_imported/vcpkg/ports/grantlee/vcpkg.json b/external_imported/vcpkg/ports/grantlee/vcpkg.json
index b52f5c554..bea4842ec 100644
--- a/external_imported/vcpkg/ports/grantlee/vcpkg.json
+++ b/external_imported/vcpkg/ports/grantlee/vcpkg.json
@@ -1,12 +1,13 @@
 {
   "name": "grantlee",
   "version": "5.3.1",
+  "port-version": 2,
   "description": "Libraries for text templating with Qt",
   "homepage": "https://github.com/steveire/grantlee",
   "license": "LGPL-2.1-or-later",
-  "supports": "!staticcrt",
+  "supports": "!staticcrt & !xbox",
   "dependencies": [
-    "qt5-declarative",
+    "qtdeclarative",
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/external_imported/vcpkg/ports/graphene/portfile.cmake b/external_imported/vcpkg/ports/graphene/portfile.cmake
index 94afb9f96..9b420b66d 100644
--- a/external_imported/vcpkg/ports/graphene/portfile.cmake
+++ b/external_imported/vcpkg/ports/graphene/portfile.cmake
@@ -39,12 +39,7 @@ vcpkg_configure_meson(
         ${OPTIONS_DEBUG}
     OPTIONS_RELEASE
         ${OPTIONS_RELEASE}
-    ADDITIONAL_NATIVE_BINARIES
-        glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal'
-        glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums'
-        g-ir-compiler='${CURRENT_HOST_INSTALLED_DIR}/tools/gobject-introspection/g-ir-compiler${VCPKG_HOST_EXECUTABLE_SUFFIX}'
-        g-ir-scanner='${GIR_TOOL_DIR}/tools/gobject-introspection/g-ir-scanner'
-    ADDITIONAL_CROSS_BINARIES
+    ADDITIONAL_BINARIES
         glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal'
         glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums'
         g-ir-compiler='${CURRENT_HOST_INSTALLED_DIR}/tools/gobject-introspection/g-ir-compiler${VCPKG_HOST_EXECUTABLE_SUFFIX}'
diff --git a/external_imported/vcpkg/ports/graphene/vcpkg.json b/external_imported/vcpkg/ports/graphene/vcpkg.json
index 936babe8a..b024349d8 100644
--- a/external_imported/vcpkg/ports/graphene/vcpkg.json
+++ b/external_imported/vcpkg/ports/graphene/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "graphene",
   "version": "1.10.8",
-  "port-version": 1,
+  "port-version": 2,
   "description": "A thin layer of types for graphic libraries.",
   "homepage": "https://www.gtk.org/",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/graphicsmagick/portfile.cmake b/external_imported/vcpkg/ports/graphicsmagick/portfile.cmake
index 142364ea9..f63b32f9f 100644
--- a/external_imported/vcpkg/ports/graphicsmagick/portfile.cmake
+++ b/external_imported/vcpkg/ports/graphicsmagick/portfile.cmake
@@ -1,11 +1,11 @@
-set(GM_VERSION 1.3.37)
+set(GM_VERSION 1.3.41)
 
 vcpkg_from_sourceforge(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO graphicsmagick/graphicsmagick
     REF ${GM_VERSION}
     FILENAME "GraphicsMagick-${GM_VERSION}-windows.7z"
-    SHA512 2e465a290946d730c0da1b45602ebdebc256d9a0705d6d79784efcefb0760a923dd78c73f7a563ce6ec41e4199da66d3b31cc8c6b8f821ff993092d348aeaa2f
+    SHA512 4790081136af67bf406b94e3de88feff295cc98fd3b125776e014436b12dbb31331af4ee4f8497ccc39d4afda08145b5e4bfeb45b3210a50e17b14e4dc2a220d
     PATCHES
         # GM always requires a dynamic BZIP2. This patch makes this dependent if _DLL is defined
         dynamic_bzip2.patch
@@ -17,31 +17,30 @@ vcpkg_from_sourceforge(
         disable_graphicsmagick_modules.patch
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/magick_types.h DESTINATION ${SOURCE_PATH}/magick)
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/magick_types.h" DESTINATION "${SOURCE_PATH}/magick")
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS_DEBUG
         -DINSTALL_HEADERS=OFF
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-graphicsmagick TARGET_PATH share/unofficial-graphicsmagick)
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-graphicsmagick)
 
 # copy license
-file(INSTALL ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/Copyright.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 
 # copy config
-file(COPY ${SOURCE_PATH}/config/colors.mgk DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/config)
-file(COPY ${SOURCE_PATH}/config/log.mgk DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/config)
-file(COPY ${SOURCE_PATH}/config/modules.mgk DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/config)
+file(COPY "${SOURCE_PATH}/config/colors.mgk" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/config")
+file(COPY "${SOURCE_PATH}/config/log.mgk" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/config")
+file(COPY "${SOURCE_PATH}/config/modules.mgk" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/config")
 
-file(READ ${SOURCE_PATH}/config/type-windows.mgk.in TYPE_MGK)
+file(READ "${SOURCE_PATH}/config/type-windows.mgk.in" TYPE_MGK)
 string(REPLACE "@windows_font_dir@" "$ENV{SYSTEMROOT}/Fonts/" TYPE_MGK "${TYPE_MGK}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/graphicsmagick/config/type.mgk "${TYPE_MGK}")
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/graphicsmagick/config/type.mgk" "${TYPE_MGK}")
 
-configure_file(${SOURCE_PATH}/config/delegates.mgk.in ${CURRENT_PACKAGES_DIR}/share/${PORT}/config/delegates.mgk @ONLY)
+configure_file("${SOURCE_PATH}/config/delegates.mgk.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/config/delegates.mgk" @ONLY)
 vcpkg_copy_pdbs()
diff --git a/external_imported/vcpkg/ports/graphicsmagick/vcpkg.json b/external_imported/vcpkg/ports/graphicsmagick/vcpkg.json
index e343f1eb4..6f3b87942 100644
--- a/external_imported/vcpkg/ports/graphicsmagick/vcpkg.json
+++ b/external_imported/vcpkg/ports/graphicsmagick/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "graphicsmagick",
-  "version": "1.3.37",
-  "port-version": 1,
+  "version": "1.3.41",
   "description": "Image processing library",
   "homepage": "https://sourceforge.net/projects/graphicsmagick/",
   "dependencies": [
@@ -11,6 +10,14 @@
     "libpng",
     "libwebp",
     "tiff",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
     "zlib"
   ]
 }
diff --git a/external_imported/vcpkg/ports/graphite2/portfile.cmake b/external_imported/vcpkg/ports/graphite2/portfile.cmake
index 62a71bb17..790304362 100644
--- a/external_imported/vcpkg/ports/graphite2/portfile.cmake
+++ b/external_imported/vcpkg/ports/graphite2/portfile.cmake
@@ -16,12 +16,15 @@ vcpkg_cmake_configure(
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 vcpkg_cmake_config_fixup()
+vcpkg_fixup_pkgconfig()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/graphite2/Types.h" "defined GRAPHITE2_STATIC" "1")
+endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libgraphite2.la" "${CURRENT_PACKAGES_DIR}/debug/lib/libgraphite2.la")
 
-file(COPY "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING" "${SOURCE_PATH}/LICENSE")
 
-vcpkg_fixup_pkgconfig()
diff --git a/external_imported/vcpkg/ports/graphite2/vcpkg.json b/external_imported/vcpkg/ports/graphite2/vcpkg.json
index 1dc5a3fc2..66f9d6e61 100644
--- a/external_imported/vcpkg/ports/graphite2/vcpkg.json
+++ b/external_imported/vcpkg/ports/graphite2/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "graphite2",
   "version": "1.3.14",
-  "port-version": 3,
+  "port-version": 4,
   "description": [
     "Graphite is a \"smart font\" system developed specifically to handle the complexities of lesser-known languages of the world.",
     "Graphite2 is a rework of the original Graphite engine that is faster, smaller, and uses an API that is better suited to the layout architecture of most text-processing applications."
diff --git a/external_imported/vcpkg/ports/graphviz/cmake-project-include.cmake b/external_imported/vcpkg/ports/graphviz/cmake-project-include.cmake
index b4f23054e..81a50f91b 100644
--- a/external_imported/vcpkg/ports/graphviz/cmake-project-include.cmake
+++ b/external_imported/vcpkg/ports/graphviz/cmake-project-include.cmake
@@ -3,3 +3,8 @@ if(MSVC)
     set(GETOPT_LIBRARY "unofficial::getopt-win32::getopt" CACHE INTERNAL "vcpkg")
     set(GETOPT_RUNTIME_LIBRARY "unused" CACHE INTERNAL "vcpkg")
 endif()
+
+if(MINGW AND BUILD_SHARED_LIBS AND NOT CMAKE_CROSSCOMPILING)
+    # Prevent running `configure_plugins.cmake`.
+    set(CMAKE_CROSSCOMPILING 1)
+endif()
diff --git a/external_imported/vcpkg/ports/graphviz/disable-pragma-lib.patch b/external_imported/vcpkg/ports/graphviz/disable-pragma-lib.patch
new file mode 100644
index 000000000..c30c532ca
--- /dev/null
+++ b/external_imported/vcpkg/ports/graphviz/disable-pragma-lib.patch
@@ -0,0 +1,36 @@
+diff --git a/cmd/gvedit/main.cpp b/cmd/gvedit/main.cpp
+index 98a2a4a..e810c36 100644
+--- a/cmd/gvedit/main.cpp
++++ b/cmd/gvedit/main.cpp
+@@ -30,6 +30,7 @@
+ 
+ 
+ #ifdef _MSC_VER
++#elif 0
+ #pragma comment( lib, "cgraph.lib" )
+ #pragma comment( lib, "gvc.lib" )
+ #pragma comment( lib, "ingraphs.lib" )
+diff --git a/plugin/gdk/gvloadimage_gdk.c b/plugin/gdk/gvloadimage_gdk.c
+index 84c6a6a..0d3ec64 100644
+--- a/plugin/gdk/gvloadimage_gdk.c
++++ b/plugin/gdk/gvloadimage_gdk.c
+@@ -22,6 +22,7 @@
+ #include <gdk/gdkcairo.h>
+ 
+ #ifdef _MSC_VER //*dependencies
++#elif 0
+     #pragma comment( lib, "gvc.lib" )
+     #pragma comment( lib, "glib-2.0.lib" )
+     #pragma comment( lib, "cairo.lib" )
+diff --git a/plugin/webp/gvloadimage_webp.c b/plugin/webp/gvloadimage_webp.c
+index c983556..446d43f 100644
+--- a/plugin/webp/gvloadimage_webp.c
++++ b/plugin/webp/gvloadimage_webp.c
+@@ -24,6 +24,7 @@
+ #include <webp/decode.h>
+ 
+ #ifdef _MSC_VER //*dependencies
++#elif 0
+     #pragma comment( lib, "gvc.lib" )
+     #pragma comment( lib, "glib-2.0.lib" )
+     #pragma comment( lib, "pango-1.0.lib" )
diff --git a/external_imported/vcpkg/ports/graphviz/fix-dependencies.patch b/external_imported/vcpkg/ports/graphviz/fix-dependencies.patch
index 0e3832815..a08f78577 100644
--- a/external_imported/vcpkg/ports/graphviz/fix-dependencies.patch
+++ b/external_imported/vcpkg/ports/graphviz/fix-dependencies.patch
@@ -1,5 +1,26 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 12fd424..11371df 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -126,9 +126,13 @@ endif()
+ find_package(PANGOCAIRO)
+ find_package(PkgConfig)
+ if(PkgConfig_FOUND)
+-  pkg_check_modules(POPPLER poppler-glib)
+-  pkg_check_modules(RSVG librsvg-2.0)
+-  pkg_check_modules(WEBP libwebp)
++  #pkg_check_modules(POPPLER poppler-glib IMPORTED_TARGET REQUIRED)
++  set(POPPLER_LIBRARIES PkgConfig::POPPLER)
++  set(POPPLER_FOUND 0)
++  pkg_check_modules(RSVG librsvg-2.0 IMPORTED_TARGET REQUIRED)
++  set(RSVG_LIBRARIES PkgConfig::RSVG)
++  pkg_check_modules(WEBP libwebp IMPORTED_TARGET REQUIRED)
++  set(WEBP_LIBRARIES PkgConfig::WEBP)
+ else()
+   set(POPPLER_FOUND 0)
+   set(RSVG_FOUND 0)
 diff --git a/cmake/FindCAIRO.cmake b/cmake/FindCAIRO.cmake
-index a92916e..799fa68 100644
+index 65bb42f..47949f6 100644
 --- a/cmake/FindCAIRO.cmake
 +++ b/cmake/FindCAIRO.cmake
 @@ -1,6 +1,6 @@
@@ -7,11 +28,22 @@ index a92916e..799fa68 100644
  
 -if(WIN32)
 +if(0)
-   find_path(CAIRO_INCLUDE_DIR cairo/cairo.h)
+   find_path(
+     CAIRO_INCLUDE_DIR cairo.h
+     PATH_SUFFIXES cairo
+@@ -39,7 +39,9 @@ if(WIN32)
+   )
+ else()
+   find_package(PkgConfig)
+-  pkg_check_modules(CAIRO cairo)
++  pkg_check_modules(CAIRO cairo IMPORTED_TARGET)
++  set(CAIRO_LIBRARIES PkgConfig::CAIRO)
++  set(CAIRO_LINK_LIBRARIES PkgConfig::CAIRO)
  
-   find_library(CAIRO_LIBRARY NAMES cairo)
+   find_package_handle_standard_args(CAIRO DEFAULT_MSG
+     CAIRO_INCLUDE_DIRS
 diff --git a/cmake/FindGD.cmake b/cmake/FindGD.cmake
-index d7e0cc9..2322fcd 100644
+index 0deb5e6..ef42889 100644
 --- a/cmake/FindGD.cmake
 +++ b/cmake/FindGD.cmake
 @@ -1,3 +1,11 @@
@@ -26,19 +58,41 @@ index d7e0cc9..2322fcd 100644
  find_path(GD_INCLUDE_DIR gd.h)
  find_library(GD_LIBRARY NAMES gd libgd)
  find_program(GD_RUNTIME_LIBRARY libgd.dll)
+diff --git a/cmake/FindGTS.cmake b/cmake/FindGTS.cmake
+index 8e544e9..88dd849 100644
+--- a/cmake/FindGTS.cmake
++++ b/cmake/FindGTS.cmake
+@@ -1,5 +1,5 @@
+ include(FindPackageHandleStandardArgs)
+-if(WIN32)
++if(0)
+   find_path(GTS_INCLUDE_DIR gts.h)
+   find_path(GLIB_INCLUDE_DIR glib.h PATH_SUFFIXES glib-2.0)
+   find_path(GLIBCONFIG_INCLUDE_DIR glibconfig.h
+@@ -40,7 +40,8 @@ if(WIN32)
+   )
+ else()
+   find_package(PkgConfig)
+-  pkg_check_modules(GTS gts)
++  pkg_check_modules(GTS gts IMPORTED_TARGET)
++  set(GTS_LINK_LIBRARIES PkgConfig::GTS)
+ 
+   find_package_handle_standard_args(GTS DEFAULT_MSG
+     GTS_INCLUDE_DIRS
 diff --git a/cmake/FindLTDL.cmake b/cmake/FindLTDL.cmake
-index a1ee8c2..08b7f50 100644
+index e955b74..046e9e8 100644
 --- a/cmake/FindLTDL.cmake
 +++ b/cmake/FindLTDL.cmake
-@@ -16,3 +16,6 @@ mark_as_advanced(LTDL_INCLUDE_DIR LTDL_LIBRARY)
- 
+@@ -17,4 +17,7 @@ mark_as_advanced(LTDL_INCLUDE_DIR LTDL_LIBRARY)
  set(LTDL_INCLUDE_DIRS ${LTDL_INCLUDE_DIR})
- set(LTDL_LIBRARIES ${LTDL_LIBRARY})
-+if(CMAKE_DL_LIBS AND NOT BUILD_SHARED_LIBS)
-+  set(LTDL_LIBRARIES "${LTDL_LIBRARIES};${CMAKE_DL_LIBS}")
-+endif()
+ if(NOT WIN32 OR MINGW)
+   set(LTDL_LIBRARIES ${LTDL_LIBRARY})
++  if(CMAKE_DL_LIBS AND NOT BUILD_SHARED_LIBS)
++    set(LTDL_LIBRARIES "${LTDL_LIBRARIES};${CMAKE_DL_LIBS}")
++  endif()
+ endif()
 diff --git a/cmake/FindPANGOCAIRO.cmake b/cmake/FindPANGOCAIRO.cmake
-index b92e5be..225589e 100644
+index b92e5be..01c4cc7 100644
 --- a/cmake/FindPANGOCAIRO.cmake
 +++ b/cmake/FindPANGOCAIRO.cmake
 @@ -1,6 +1,6 @@
@@ -49,13 +103,52 @@ index b92e5be..225589e 100644
    find_path(PANGOCAIRO_INCLUDE_DIR pango/pangocairo.h PATH_SUFFIXES pango-1.0)
    find_path(GLIB_INCLUDE_DIR glib.h PATH_SUFFIXES glib-2.0)
    find_path(GLIBCONFIG_INCLUDE_DIR glibconfig.h
-@@ -78,7 +78,8 @@ if(WIN32)
+@@ -78,7 +78,9 @@ if(WIN32)
    )
  else()
    find_package(PkgConfig)
 -  pkg_check_modules(PANGOCAIRO pangocairo)
 +  pkg_check_modules(PANGOCAIRO pangocairo IMPORTED_TARGET)
++  set(PANGOCAIRO_LIBRARIES PkgConfig::PANGOCAIRO)
 +  set(PANGOCAIRO_LINK_LIBRARIES PkgConfig::PANGOCAIRO) # https://gitlab.kitware.com/cmake/cmake/-/issues/16154
  
    find_package_handle_standard_args(PANGOCAIRO DEFAULT_MSG
      PANGOCAIRO_INCLUDE_DIRS
+diff --git a/cmd/dot/CMakeLists.txt b/cmd/dot/CMakeLists.txt
+index d2ea435..3b068b0 100644
+--- a/cmd/dot/CMakeLists.txt
++++ b/cmd/dot/CMakeLists.txt
+@@ -73,22 +73,20 @@ endif()
+ 
+ find_package(PkgConfig)
+ if(PkgConfig_FOUND)
+-  pkg_check_modules(GTS gts)
+   if(GTS_FOUND)
+     target_include_directories(dot_builtins SYSTEM PRIVATE ${GTS_INCLUDE_DIRS})
+     target_link_libraries(dot_builtins PRIVATE ${GTS_LINK_LIBRARIES})
+   endif()
+ 
+   pkg_check_modules(LASI lasi)
+-  if(LASI_FOUND)
++  if(TARGET gvplugin_lasi)
+     target_link_libraries(dot_builtins PRIVATE gvplugin_lasi)
+   endif()
+ endif()
+ 
+ if(PANGOCAIRO_FOUND)
+   target_link_libraries(dot_builtins PRIVATE gvplugin_pango)
+-  if(PkgConfig_FOUND)
+-    pkg_check_modules(WEBP libwebp)
++  if(TARGET gvplugin_webp)
+     if(WEBP_FOUND)
+       target_link_libraries(dot_builtins PRIVATE gvplugin_webp)
+     endif()
+@@ -96,7 +94,7 @@ if(PANGOCAIRO_FOUND)
+ endif()
+ 
+ find_library(SOCKET socket)
+-if(SOCKET)
++if(0)
+   target_link_libraries(dot_builtins PRIVATE ${SOCKET})
+ endif()
+ 
diff --git a/external_imported/vcpkg/ports/graphviz/portfile.cmake b/external_imported/vcpkg/ports/graphviz/portfile.cmake
index 9998e80ed..d9962c243 100644
--- a/external_imported/vcpkg/ports/graphviz/portfile.cmake
+++ b/external_imported/vcpkg/ports/graphviz/portfile.cmake
@@ -1,15 +1,15 @@
 set(VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY enabled) # for plugins
-
-vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
+set(VCPKG_POLICY_DLLS_WITHOUT_EXPORTS enabled) # kitty and vt plugin not ready yet?
 
 vcpkg_from_gitlab(
     GITLAB_URL https://gitlab.com
     OUT_SOURCE_PATH SOURCE_PATH
     REPO graphviz/graphviz
     REF "${VERSION}"
-    SHA512 5872db8aefb9bebf6fea91dbe96759c42fa82dbe811238c7d6de8db5a0c6af77749083af60fc21f8e42c4fc159a2cbfefcc304967edda3d2832ef396c457530a
+    SHA512 1edcf6aa232d38d1861a344c1a4a88aac51fd4656d667783ca1608ac694025199595a72a293c4eee2f7c7326ce54f22b787a5b7f4c44946f2de6096bd8f0e79d
     HEAD_REF main
     PATCHES
+        disable-pragma-lib.patch
         fix-dependencies.patch
         no-absolute-paths.patch
         select-plugins.patch
@@ -19,14 +19,14 @@ vcpkg_from_gitlab(
 if(VCPKG_TARGET_IS_OSX)
     message("${PORT} currently requires the following libraries from the system package manager:\n    libtool\n\nThey can be installed with brew install libtool")
 elseif(VCPKG_TARGET_IS_LINUX)
-    message("${PORT} currently requires the following libraries from the system package manager:\n    libtool\n\nThey can be installed with apt-get install libtool")
+    message("${PORT} currently requires the following libraries from the system package manager:\n    libtool\n\nThey can be install with `apt-get install libtool` on Ubuntu systems or `dnf install libtool-ltdl-devel` on Fedora systems")
 endif()
 
 vcpkg_list(SET OPTIONS)
 if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
     vcpkg_download_distfile(
         LTDL_H_PATH
-        URLS "https://gitlab.com/graphviz/graphviz-windows-dependencies/-/raw/141d3a21be904fa8dc2ae3ed01d36684db07a35d/${VCPKG_TARGET_ARCHITECTURE}/include/ltdl.h"
+        URLS "https://gitlab.com/graphviz/graphviz-windows-dependencies/-/raw/141d3a21be904fa8dc2ae3ed01d36684db07a35d/x64/include/ltdl.h"
         FILENAME graphviz-ltdl-141d3a21.h
         SHA512 f2d20e849e35060536265f47014c40eb70e57dacd600a9db112fc465fbfa6a66217b44a8c3dc33039c260a27f09d9034b329b03cc28c32a22ec503fcd17b78cd
     )
@@ -47,7 +47,6 @@ vcpkg_find_acquire_program(PYTHON3)
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    DISABLE_PARALLEL_CONFIGURE
     OPTIONS
         "-DVERSION=${VERSION}"
         "-DBISON_EXECUTABLE=${BISON}"
@@ -58,6 +57,7 @@ vcpkg_cmake_configure(
         "-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake"
         -Dinstall_win_dependency_dlls=OFF
         -Duse_win_pre_inst_libs=OFF
+        -Dwith_gvedit=OFF
         -Dwith_smyrna=OFF
         -DCMAKE_DISABLE_FIND_PACKAGE_ANN=ON
         -DCMAKE_REQUIRE_FIND_PACKAGE_CAIRO=ON
@@ -86,7 +86,41 @@ foreach(script_or_link IN ITEMS "dot2gxl${VCPKG_TARGET_EXECUTABLE_SUFFIX}" gvmap
     endif()
 endforeach()
 vcpkg_copy_tools(
-    TOOL_NAMES acyclic bcomps ccomps circo diffimg dijkstra dot edgepaint fdp gc gml2gv graphml2gv gv2gml gvcolor gvgen gvmap gvpack gvpr gxl2gv mm2gv neato nop osage patchwork sccmap sfdp tred twopi unflatten
+    TOOL_NAMES
+        acyclic
+        bcomps
+        ccomps
+        circo
+        cluster
+        diffimg
+        dijkstra
+        dot
+        dot_builtins
+        edgepaint
+        fdp
+        gc
+        gml2gv
+        graphml2gv
+        gv2gml
+        gv2gxl
+        gvcolor
+        gvgen
+        gvmap
+        gvpack
+        gvpr
+        gxl2dot
+        gxl2gv
+        mm2gv
+        neato
+        nop
+        osage
+        patchwork
+        prune
+        sccmap
+        sfdp
+        tred
+        twopi
+        unflatten
     AUTO_CLEAN
 )
 
@@ -105,4 +139,4 @@ else()
     file(COPY "${CURRENT_PACKAGES_DIR}/lib/graphviz" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
 endif()
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/graphviz/select-plugins.patch b/external_imported/vcpkg/ports/graphviz/select-plugins.patch
index 21539264c..4a78ef894 100644
--- a/external_imported/vcpkg/ports/graphviz/select-plugins.patch
+++ b/external_imported/vcpkg/ports/graphviz/select-plugins.patch
@@ -1,16 +1,21 @@
 diff --git a/plugin/CMakeLists.txt b/plugin/CMakeLists.txt
-index 6f40f27..420ad0f 100644
+index 3956102..d14bf9c 100644
 --- a/plugin/CMakeLists.txt
 +++ b/plugin/CMakeLists.txt
-@@ -1,4 +1,11 @@
+@@ -1,16 +1,10 @@
  add_subdirectory(core)
-+add_subdirectory(dot_layout)
-+add_subdirectory(gdiplus)
-+add_subdirectory(neato_layout)
-+add_subdirectory(pango)
-+add_subdirectory(quartz)
-+add_subdirectory(gd)
-+return()
- add_subdirectory(devil)
+-add_subdirectory(devil)
  add_subdirectory(dot_layout)
  add_subdirectory(gd)
+ add_subdirectory(gdiplus)
+-add_subdirectory(gdk)
+-add_subdirectory(gs)
+-add_subdirectory(gtk)
+ add_subdirectory(kitty)
+-add_subdirectory(lasi)
+ add_subdirectory(neato_layout)
+ add_subdirectory(pango)
+-add_subdirectory(poppler)
+ add_subdirectory(quartz)
+ add_subdirectory(rsvg)
+ add_subdirectory(vt)
diff --git a/external_imported/vcpkg/ports/graphviz/static-linkage.patch b/external_imported/vcpkg/ports/graphviz/static-linkage.patch
index 49b03da54..c815eff33 100644
--- a/external_imported/vcpkg/ports/graphviz/static-linkage.patch
+++ b/external_imported/vcpkg/ports/graphviz/static-linkage.patch
@@ -1,8 +1,52 @@
+diff --git a/cmd/dot/CMakeLists.txt b/cmd/dot/CMakeLists.txt
+index 3b068b0..4e3758f 100644
+--- a/cmd/dot/CMakeLists.txt
++++ b/cmd/dot/CMakeLists.txt
+@@ -58,6 +58,7 @@ target_link_libraries(dot_builtins PRIVATE
+   gvplugin_core
+   gvplugin_dot_layout
+   gvplugin_neato_layout
++  ${GTS_LINK_LIBRARIES}
+   pathplan
+   xdot
+ )
+diff --git a/cmd/gvmap/CMakeLists.txt b/cmd/gvmap/CMakeLists.txt
+index d5b0d42..9263b19 100644
+--- a/cmd/gvmap/CMakeLists.txt
++++ b/cmd/gvmap/CMakeLists.txt
+@@ -26,6 +26,7 @@ if(with_sfdp)
+     gvc
+     ingraphs
+     neatogen
++    ${GTS_LINK_LIBRARIES}
+     rbtree
+     sfdpgen
+     sparse
+@@ -92,6 +93,7 @@ if(with_sfdp)
+     gvc
+     ingraphs
+     neatogen
++    ${GTS_LINK_LIBRARIES}
+     rbtree
+     sfdpgen
+     sparse
+diff --git a/cmd/tools/CMakeLists.txt b/cmd/tools/CMakeLists.txt
+index 6928bf6..5a4c308 100644
+--- a/cmd/tools/CMakeLists.txt
++++ b/cmd/tools/CMakeLists.txt
+@@ -320,6 +320,7 @@ target_link_libraries(gvpack
+   cgraph
+   gvc
+   gvplugin_neato_layout
++  ${GTS_LINK_LIBRARIES}
+   ingraphs
+ )
+ 
 diff --git a/plugin/gd/gvrender_gd.c b/plugin/gd/gvrender_gd.c
-index 960271c..2494e95 100644
+index 0085107..8879003 100644
 --- a/plugin/gd/gvrender_gd.c
 +++ b/plugin/gd/gvrender_gd.c
-@@ -259,7 +259,7 @@ static void gdgen_missingfont(char *fontreq) {
+@@ -240,7 +240,7 @@ static void gdgen_end_page(GVJ_t * job)
  #else
  #define GD_IMPORT
  #endif
@@ -12,7 +56,7 @@ index 960271c..2494e95 100644
  void gdgen_text(gdImagePtr im, pointf spf, pointf epf, int fontcolor, double fontsize, int fontdpi, double fontangle, char *fontname, char *str)
  {
 diff --git a/plugin/pango/CMakeLists.txt b/plugin/pango/CMakeLists.txt
-index 26749af..65d77e4 100644
+index aca7eec..901f118 100644
 --- a/plugin/pango/CMakeLists.txt
 +++ b/plugin/pango/CMakeLists.txt
 @@ -58,6 +58,7 @@ if(CAIRO_FOUND AND PANGOCAIRO_FOUND)
diff --git a/external_imported/vcpkg/ports/graphviz/vcpkg.json b/external_imported/vcpkg/ports/graphviz/vcpkg.json
index 20be7b5de..292d248e7 100644
--- a/external_imported/vcpkg/ports/graphviz/vcpkg.json
+++ b/external_imported/vcpkg/ports/graphviz/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "graphviz",
-  "version-semver": "7.0.0",
-  "port-version": 1,
+  "version-semver": "9.0.0",
+  "port-version": 2,
   "description": "Graph Visualization Tools",
   "homepage": "https://graphviz.org/",
   "license": "EPL-1.0",
@@ -12,6 +12,7 @@
       "default-features": false
     },
     "getopt",
+    "gts",
     {
       "name": "libgd",
       "default-features": false,
@@ -23,6 +24,8 @@
         "tiff"
       ]
     },
+    "librsvg",
+    "libwebp",
     "pango",
     {
       "name": "pkgconf",
diff --git a/external_imported/vcpkg/ports/grpc/vcpkg.json b/external_imported/vcpkg/ports/grpc/vcpkg.json
index 8fff07a24..35dd58509 100644
--- a/external_imported/vcpkg/ports/grpc/vcpkg.json
+++ b/external_imported/vcpkg/ports/grpc/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "grpc",
   "version-semver": "1.51.1",
+  "port-version": 1,
   "description": "An RPC library and framework",
   "homepage": "https://github.com/grpc/grpc",
   "license": "Apache-2.0",
@@ -40,7 +41,8 @@
       "description": "Deprecated."
     },
     "codegen": {
-      "description": "Build code generator machinery"
+      "description": "Build code generator machinery",
+      "supports": "!uwp"
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/gsl-lite/portfile.cmake b/external_imported/vcpkg/ports/gsl-lite/portfile.cmake
index 1cc23b2c7..eb0355b61 100644
--- a/external_imported/vcpkg/ports/gsl-lite/portfile.cmake
+++ b/external_imported/vcpkg/ports/gsl-lite/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO gsl-lite/gsl-lite
-    REF 4b5e9ab7474841fc2d7efc2e0064ef81785535d1
-    SHA512 d5678743f2aebf9b8311e1484d8d22d995f4920632c55ff2f45e463f435a087d25bbf79749c179cfa2f96e799a55e5ee2e59eb2cc6962b8f5922ea56789e16b1
+    REF 755ba124b54914e672737acace6a9314f59e8d6f
+    SHA512 d0b8397afc7704c5c9510fb62ce01f35faf9cc1cfd05ac3853bdc4b9fc4874aaa85aa70e93ff37867dc263b97926b15af2316e49a5787b246984fa086bf85563
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/gsl-lite/vcpkg.json b/external_imported/vcpkg/ports/gsl-lite/vcpkg.json
index 0fdc05f41..b62ab3f81 100644
--- a/external_imported/vcpkg/ports/gsl-lite/vcpkg.json
+++ b/external_imported/vcpkg/ports/gsl-lite/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "gsl-lite",
-  "version": "0.40.0",
+  "version": "0.41.0",
   "description": "A single-file header-only implementation of ISO C++ Guidelines Support Library (GSL) for C++98, C++11 and later.",
   "homepage": "https://github.com/gsl-lite/gsl-lite/",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/gsl/CMakeLists.txt b/external_imported/vcpkg/ports/gsl/CMakeLists.txt
index 7e522cc5c..5bc98746e 100644
--- a/external_imported/vcpkg/ports/gsl/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/gsl/CMakeLists.txt
@@ -40,7 +40,7 @@ foreach(DIR IN LISTS FOLDERS)
 endforeach()
 
 file(READ gsl_types.h GSLTYPES_H)
-string(REPLACE "#ifdef WIN32" "#if 1 /*WIN32*/" GSLTYPES_H "${GSLTYPES_H}")
+string(REPLACE "#ifdef WIN32" "#ifdef _WIN32" GSLTYPES_H "${GSLTYPES_H}")
 if(BUILD_SHARED_LIBS)
     string(REPLACE "#  ifdef GSL_DLL" "#  if 1 /*GSL_DLL*/" GSLTYPES_H "${GSLTYPES_H}")
 endif()
diff --git a/external_imported/vcpkg/ports/gsl/portfile.cmake b/external_imported/vcpkg/ports/gsl/portfile.cmake
index a107ce7b7..fe441823b 100644
--- a/external_imported/vcpkg/ports/gsl/portfile.cmake
+++ b/external_imported/vcpkg/ports/gsl/portfile.cmake
@@ -6,8 +6,8 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 3300a748b63b583374701d5ae2a9db7349d0de51061a9f98e7c145b2f7de9710b3ad58b3318d0be2a9a287ace4cc5735bb9348cdf48075b98c1f6cc1029df131
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE ${ARCHIVE}
     PATCHES
         0001-configure.patch
diff --git a/external_imported/vcpkg/ports/gsl/vcpkg.json b/external_imported/vcpkg/ports/gsl/vcpkg.json
index 44c14d97f..1284ab30a 100644
--- a/external_imported/vcpkg/ports/gsl/vcpkg.json
+++ b/external_imported/vcpkg/ports/gsl/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "gsl",
   "version": "2.7.1",
-  "port-version": 1,
+  "port-version": 3,
   "description": "The GNU Scientific Library is a numerical library for C and C++ programmers",
   "homepage": "https://www.gnu.org/software/gsl/",
-  "license": "GPL-3.0",
+  "license": "GPL-3.0-or-later",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/gsoap/portfile.cmake b/external_imported/vcpkg/ports/gsoap/portfile.cmake
index d60732746..04a482f56 100644
--- a/external_imported/vcpkg/ports/gsoap/portfile.cmake
+++ b/external_imported/vcpkg/ports/gsoap/portfile.cmake
@@ -11,50 +11,41 @@ vcpkg_from_sourceforge(
 
 set(BUILD_ARCH "Win32")
 
-# Handle binary files and includes
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/gsoap ${CURRENT_PACKAGES_DIR}/debug/tools)
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/gsoap" "${CURRENT_PACKAGES_DIR}/debug/tools")
 
 if (VCPKG_TARGET_IS_WINDOWS)
-    vcpkg_build_msbuild(
-        USE_VCPKG_INTEGRATION
-        PROJECT_PATH ${SOURCE_PATH}/gsoap/VisualStudio2005/soapcpp2/soapcpp2.sln
+     vcpkg_msbuild_install(
+        PROJECT_PATH "${SOURCE_PATH}/gsoap/VisualStudio2005/soapcpp2/soapcpp2.sln"
         PLATFORM ${BUILD_ARCH}
         TARGET Build
     )
-    vcpkg_build_msbuild(
-        USE_VCPKG_INTEGRATION
-        PROJECT_PATH ${SOURCE_PATH}/gsoap/VisualStudio2005/wsdl2h/wsdl2h.sln
+     vcpkg_msbuild_install(
+        PROJECT_PATH "${SOURCE_PATH}/gsoap/VisualStudio2005/wsdl2h/wsdl2h.sln"
         PLATFORM ${BUILD_ARCH}
         TARGET Build
     )
-
-    file(COPY ${SOURCE_PATH}/gsoap/VisualStudio2005/soapcpp2/release/soapcpp2.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/gsoap/)
-    file(COPY ${SOURCE_PATH}/gsoap/VisualStudio2005/wsdl2h/release/wsdl2h.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/gsoap/)
-    file(COPY ${SOURCE_PATH}/gsoap/VisualStudio2005/soapcpp2/debug/soapcpp2.exe DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/gsoap/)
-    file(COPY ${SOURCE_PATH}/gsoap/VisualStudio2005/wsdl2h/debug/wsdl2h.exe DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/gsoap/)
 else()
     message(FATAL_ERROR "Sorry but gsoap only can be build in Windows temporary")
 endif()
 
 
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include)
-file(COPY ${SOURCE_PATH}/gsoap/stdsoap2.h ${SOURCE_PATH}/gsoap/stdsoap2.c ${SOURCE_PATH}/gsoap/stdsoap2.cpp ${SOURCE_PATH}/gsoap/dom.c ${SOURCE_PATH}/gsoap/dom.cpp DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-
-# Handle import files
-file(COPY ${SOURCE_PATH}/gsoap/import DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include")
 
-# Handle custom files
-file(COPY ${SOURCE_PATH}/gsoap/custom DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(COPY
+    "${SOURCE_PATH}/gsoap/stdsoap2.h"
+    "${SOURCE_PATH}/gsoap/stdsoap2.c"
+    "${SOURCE_PATH}/gsoap/stdsoap2.cpp"
+    "${SOURCE_PATH}/gsoap/dom.c"
+    "${SOURCE_PATH}/gsoap/dom.cpp"
+    DESTINATION "${CURRENT_PACKAGES_DIR}/include"
+)
 
-# Handle plugin files
-file(COPY ${SOURCE_PATH}/gsoap/plugin DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(COPY "${SOURCE_PATH}/gsoap/import" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+file(COPY "${SOURCE_PATH}/gsoap/custom" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+file(COPY "${SOURCE_PATH}/gsoap/plugin" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 
-# Cleanup surplus empty directory
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/gsoap/plugin/.deps")
 
-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-file(INSTALL ${SOURCE_PATH}/INSTALL.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME install)
-file(INSTALL ${SOURCE_PATH}/README.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME readme)
-
-vcpkg_copy_pdbs()
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
+file(INSTALL "${SOURCE_PATH}/INSTALL.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME install)
+file(INSTALL "${SOURCE_PATH}/README.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME readme)
diff --git a/external_imported/vcpkg/ports/gsoap/vcpkg.json b/external_imported/vcpkg/ports/gsoap/vcpkg.json
index 4fce1bad3..c7fa38a03 100644
--- a/external_imported/vcpkg/ports/gsoap/vcpkg.json
+++ b/external_imported/vcpkg/ports/gsoap/vcpkg.json
@@ -1,8 +1,15 @@
 {
   "name": "gsoap",
   "version": "2.8.112",
-  "port-version": 1,
+  "port-version": 2,
   "description": "The gSOAP toolkit is a C and C++ software development toolkit for SOAP and REST XML Web services and generic C/C++ XML data bindings.",
   "homepage": "https://sourceforge.net/projects/gsoap2/",
-  "supports": "!(linux | osx | arm | uwp)"
+  "supports": "!(linux | osx | arm | uwp)",
+  "dependencies": [
+    {
+      "name": "vcpkg-msbuild",
+      "host": true,
+      "platform": "windows"
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/gst-rtsp-server/portfile.cmake b/external_imported/vcpkg/ports/gst-rtsp-server/portfile.cmake
index 89eb6e483..b945e7163 100644
--- a/external_imported/vcpkg/ports/gst-rtsp-server/portfile.cmake
+++ b/external_imported/vcpkg/ports/gst-rtsp-server/portfile.cmake
@@ -24,16 +24,21 @@ vcpkg_configure_meson(
 
 vcpkg_install_meson()
 
-if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    file(GLOB DBG_BINS ${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/*.dll
-                       ${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/*.pdb
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    if(NOT VCPKG_BUILD_TYPE)
+        file(GLOB DBG_BINS "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/${CMAKE_SHARED_LIBRARY_PREFIX}*${CMAKE_SHARED_LIBRARY_SUFFIX}"
+                           "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/*.pdb"
+        )
+        file(COPY ${DBG_BINS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/plugins/gstreamer")
+    endif()
+    file(GLOB REL_BINS "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/${CMAKE_SHARED_LIBRARY_PREFIX}*${CMAKE_SHARED_LIBRARY_SUFFIX}"
+                       "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/*.pdb"
     )
-    file(COPY ${DBG_BINS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
-    file(GLOB REL_BINS ${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/*.dll
-                       ${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/*.pdb
-    )
-    file(COPY ${REL_BINS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
+    file(COPY ${REL_BINS} DESTINATION "${CURRENT_PACKAGES_DIR}/plugins/gstreamer")
     file(REMOVE ${DBG_BINS} ${REL_BINS})
+    if(NOT VCPKG_TARGET_IS_WINDOWS)
+        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0" "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0")
+    endif()
 endif()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
diff --git a/external_imported/vcpkg/ports/gst-rtsp-server/vcpkg.json b/external_imported/vcpkg/ports/gst-rtsp-server/vcpkg.json
index a94dd0822..b3af8a48b 100644
--- a/external_imported/vcpkg/ports/gst-rtsp-server/vcpkg.json
+++ b/external_imported/vcpkg/ports/gst-rtsp-server/vcpkg.json
@@ -1,9 +1,11 @@
 {
   "name": "gst-rtsp-server",
   "version": "1.20.5",
+  "port-version": 2,
   "description": "gst-rtsp-server is a library on top of GStreamer for building an RTSP server",
   "homepage": "https://gstreamer.freedesktop.org/",
   "license": "LGPL-2.1-only",
+  "supports": "!xbox",
   "dependencies": [
     "glib",
     {
diff --git a/external_imported/vcpkg/ports/gstreamer/base-must-be-enabled.patch b/external_imported/vcpkg/ports/gstreamer/base-must-be-enabled.patch
new file mode 100644
index 000000000..5a4d3abeb
--- /dev/null
+++ b/external_imported/vcpkg/ports/gstreamer/base-must-be-enabled.patch
@@ -0,0 +1,13 @@
+diff --git a/meson.build b/meson.build
+index 6d07929..df015cb 100644
+--- a/meson.build
++++ b/meson.build
+@@ -159,7 +159,7 @@ foreach sp : subprojects
+     subproj = subproject(project_name, required: is_required, default_options: default_options)
+   endif
+ 
+-  if project_name == 'gst-plugins-base'
++  if project_name == 'gst-plugins-base' and subproj.found()
+     gst_base_orc_req = subproj.get_variable('orc_req', '')
+     if gst_base_orc_req != orc_req
+       error('orc_req is "@0@" but it should be "@1@" from subprojects/gst-plugins-base/meson.build'
diff --git a/external_imported/vcpkg/ports/gstreamer/fix-bz2-windows-debug-dependency.patch b/external_imported/vcpkg/ports/gstreamer/fix-bz2-windows-debug-dependency.patch
new file mode 100644
index 000000000..2be3d28ae
--- /dev/null
+++ b/external_imported/vcpkg/ports/gstreamer/fix-bz2-windows-debug-dependency.patch
@@ -0,0 +1,26 @@
+diff --git a/subprojects/gst-plugins-bad/ext/bz2/meson.build b/subprojects/gst-plugins-bad/ext/bz2/meson.build
+index 08d1596..be5fa02 100644
+--- a/subprojects/gst-plugins-bad/ext/bz2/meson.build
++++ b/subprojects/gst-plugins-bad/ext/bz2/meson.build
+@@ -4,7 +4,7 @@ bz2_sources = [
+   'gstbz2enc.c',
+ ]
+ 
+-bz2_dep = cc.find_library('bz2', required : get_option('bz2'))
++bz2_dep = dependency('bzip2', required : get_option('bz2'))
+ 
+ if bz2_dep.found() and cc.has_header_symbol('bzlib.h', 'BZ2_bzlibVersion')
+   gstbz2 = library('gstbz2',
+diff --git a/subprojects/gst-plugins-good/gst/matroska/meson.build b/subprojects/gst-plugins-good/gst/matroska/meson.build
+index d8a6a96..dd03de2 100644
+--- a/subprojects/gst-plugins-good/gst/matroska/meson.build
++++ b/subprojects/gst-plugins-good/gst/matroska/meson.build
+@@ -12,7 +12,7 @@ matroska_sources = [
+   'lzo.c',
+ ]
+ 
+-bz2_dep = cc.find_library('bz2', required : get_option('bz2'))
++bz2_dep = dependency('bzip2', required : get_option('bz2'))
+ cdata.set('HAVE_BZ2', bz2_dep.found() and cc.has_header('bzlib.h'))
+ 
+ gstmatroska = library('gstmatroska',
diff --git a/external_imported/vcpkg/ports/gstreamer/fix-clang-cl-bad.patch b/external_imported/vcpkg/ports/gstreamer/fix-clang-cl-bad.patch
index 1cfab239f..c3eeaf1e0 100644
--- a/external_imported/vcpkg/ports/gstreamer/fix-clang-cl-bad.patch
+++ b/external_imported/vcpkg/ports/gstreamer/fix-clang-cl-bad.patch
@@ -1,8 +1,8 @@
 diff --git a/subprojects/gst-plugins-bad/ext/dts/meson.build b/subprojects/gst-plugins-bad/ext/dts/meson.build
-index 8ab3fc917..c19aa2264 100644
+index c4868a4..6b34cb7 100644
 --- a/subprojects/gst-plugins-bad/ext/dts/meson.build
 +++ b/subprojects/gst-plugins-bad/ext/dts/meson.build
-@@ -15,7 +15,7 @@ if not dca_dep.found()
+@@ -20,7 +20,7 @@ if not dca_dep.found()
  endif
  
  no_warn_c_args = []
@@ -12,10 +12,10 @@ index 8ab3fc917..c19aa2264 100644
    # can point to a non-existing location (/usr/include/dca)
    no_warn_c_args = ['-Wno-missing-include-dirs']
 diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/d3d11/meson.build b/subprojects/gst-plugins-bad/gst-libs/gst/d3d11/meson.build
-index 4a844ef75..cd97e8f7a 100644
+index 160080a..6acf110 100644
 --- a/subprojects/gst-plugins-bad/gst-libs/gst/d3d11/meson.build
 +++ b/subprojects/gst-plugins-bad/gst-libs/gst/d3d11/meson.build
-@@ -174,7 +174,7 @@ endif
+@@ -158,7 +158,7 @@ endif
  
  # MinGW 32bits compiler seems to be complaining about redundant-decls
  # when ComPtr is in use. Let's just disable the warning
@@ -25,12 +25,13 @@ index 4a844ef75..cd97e8f7a 100644
      '-Wno-redundant-decls',
    ])
 diff --git a/subprojects/gst-plugins-bad/meson.build b/subprojects/gst-plugins-bad/meson.build
-index 7cab556e0..35531110b 100644
+index 84eeb17..1743f41 100644
 --- a/subprojects/gst-plugins-bad/meson.build
 +++ b/subprojects/gst-plugins-bad/meson.build
-@@ -45,7 +45,7 @@ endif
- 
+@@ -54,7 +54,7 @@ endif
+
  cdata = configuration_data()
+ cdata.set('ENABLE_NLS', 1)
  
 -if cc.get_id() == 'msvc'
 +if cc.get_argument_syntax() == 'msvc'
@@ -38,7 +39,7 @@ index 7cab556e0..35531110b 100644
        # Ignore several spurious warnings for things gstreamer does very commonly
        # If a warning is completely useless and spammy, use '/wdXXXX' to suppress it
 diff --git a/subprojects/gst-plugins-bad/sys/asio/meson.build b/subprojects/gst-plugins-bad/sys/asio/meson.build
-index 3006d26ce..1afbd0022 100644
+index c61ad4e..b30793c 100644
 --- a/subprojects/gst-plugins-bad/sys/asio/meson.build
 +++ b/subprojects/gst-plugins-bad/sys/asio/meson.build
 @@ -15,7 +15,7 @@ endif
@@ -51,10 +52,10 @@ index 3006d26ce..1afbd0022 100644
      error('asio plugin can only be built with MSVC')
    else
 diff --git a/subprojects/gst-plugins-bad/sys/d3d11/meson.build b/subprojects/gst-plugins-bad/sys/d3d11/meson.build
-index 43f213d9c..9c9e9b535 100644
+index 1368b79..8dd3b30 100644
 --- a/subprojects/gst-plugins-bad/sys/d3d11/meson.build
 +++ b/subprojects/gst-plugins-bad/sys/d3d11/meson.build
-@@ -102,7 +102,7 @@ endif
+@@ -96,7 +96,7 @@ endif
  
  # MinGW 32bits compiler seems to be complaining about redundant-decls
  # when ComPtr is in use. Let's just disable the warning
@@ -77,10 +78,10 @@ index d869e79a4..c7b37a7c6 100644
      comutil_dep = cxx.find_library('comsuppw', required : get_option('decklink'))
      if comutil_dep.found()
 diff --git a/subprojects/gst-plugins-bad/sys/mediafoundation/meson.build b/subprojects/gst-plugins-bad/sys/mediafoundation/meson.build
-index 828954909..af570f9ff 100644
+index 6b9a059..40713ce 100644
 --- a/subprojects/gst-plugins-bad/sys/mediafoundation/meson.build
 +++ b/subprojects/gst-plugins-bad/sys/mediafoundation/meson.build
-@@ -48,7 +48,7 @@ if host_system != 'windows' or mf_option.disabled()
+@@ -54,7 +54,7 @@ if host_system != 'windows' or mf_option.disabled()
    subdir_done()
  endif
  
@@ -90,10 +91,10 @@ index 828954909..af570f9ff 100644
      error('mediafoundation plugin can only be built with MSVC')
    endif
 diff --git a/subprojects/gst-plugins-bad/sys/msdk/meson.build b/subprojects/gst-plugins-bad/sys/msdk/meson.build
-index a77160049..7c834d8ed 100644
+index 659b96c..92e6bc4 100644
 --- a/subprojects/gst-plugins-bad/sys/msdk/meson.build
 +++ b/subprojects/gst-plugins-bad/sys/msdk/meson.build
-@@ -139,13 +139,13 @@ if have_mfx_ver134
+@@ -176,12 +176,12 @@ if use_onevpl and have_mfx_ver205
  endif
  
  if host_machine.system() == 'windows'
@@ -102,10 +103,9 @@ index a77160049..7c834d8ed 100644
      error('msdk plugin can only be built with MSVC')
    endif
    legacy_stdio_dep = cc.find_library('legacy_stdio_definitions', required: get_option('msdk'))
-   d3d11_dep = cc.find_library('d3d11', required: get_option('msdk'))
-   msdk_deps = declare_dependency(dependencies: [d3d11_dep, legacy_stdio_dep])
--  msdk_deps_found = d3d11_dep.found() and legacy_stdio_dep.found() and cc.get_id() == 'msvc'
+   msdk_deps = declare_dependency(dependencies: [gstd3d11_dep, legacy_stdio_dep])
+-  msdk_deps_found = gstd3d11_dep.found() and legacy_stdio_dep.found() and cc.get_id() == 'msvc'
 +  msdk_deps_found = d3d11_dep.found() and legacy_stdio_dep.found() and cc.get_argument_syntax() == 'msvc'
  else
-   libva_dep = dependency('libva', required: get_option('msdk'))
-   libva_drm_dep = dependency('libva-drm', required: get_option('msdk'))
+   libdl_dep = cc.find_library('dl', required: get_option('msdk'))
+   libgudev_dep = dependency('gudev-1.0', required: get_option('msdk'))
diff --git a/external_imported/vcpkg/ports/gstreamer/fix-clang-cl-base.patch b/external_imported/vcpkg/ports/gstreamer/fix-clang-cl-base.patch
index 99a4f7db8..227a7e05b 100644
--- a/external_imported/vcpkg/ports/gstreamer/fix-clang-cl-base.patch
+++ b/external_imported/vcpkg/ports/gstreamer/fix-clang-cl-base.patch
@@ -1,8 +1,8 @@
 diff --git a/subprojects/gst-plugins-base/meson.build b/subprojects/gst-plugins-base/meson.build
-index 495671ebb..fff3ea518 100644
+index c040bc9..ce9071c 100644
 --- a/subprojects/gst-plugins-base/meson.build
 +++ b/subprojects/gst-plugins-base/meson.build
-@@ -43,7 +43,7 @@ plugins = []
+@@ -51,7 +51,7 @@ gst_libraries = []
  
  cc = meson.get_compiler('c')
  
@@ -11,12 +11,3 @@ index 495671ebb..fff3ea518 100644
    msvc_args = [
        # Ignore several spurious warnings for things gstreamer does very commonly
        # If a warning is completely useless and spammy, use '/wdXXXX' to suppress it
-@@ -75,7 +75,7 @@ endif
- core_conf = configuration_data()
- 
- # Symbol visibility
--if cc.get_id() == 'msvc'
-+if cc.get_argument_syntax() == 'msvc'
-   export_define = '__declspec(dllexport) extern'
- elif cc.has_argument('-fvisibility=hidden')
-   add_project_arguments('-fvisibility=hidden', language: 'c')
diff --git a/external_imported/vcpkg/ports/gstreamer/fix-clang-cl-gstreamer.patch b/external_imported/vcpkg/ports/gstreamer/fix-clang-cl-gstreamer.patch
index 19be6c1e5..a89167b30 100644
--- a/external_imported/vcpkg/ports/gstreamer/fix-clang-cl-gstreamer.patch
+++ b/external_imported/vcpkg/ports/gstreamer/fix-clang-cl-gstreamer.patch
@@ -1,5 +1,5 @@
 diff --git a/subprojects/gstreamer/gst/parse/meson.build b/subprojects/gstreamer/gst/parse/meson.build
-index 35ed6f2f4..5e38e49ea 100644
+index b79a07c..891f907 100644
 --- a/subprojects/gstreamer/gst/parse/meson.build
 +++ b/subprojects/gstreamer/gst/parse/meson.build
 @@ -16,7 +16,7 @@ else
@@ -12,10 +12,10 @@ index 35ed6f2f4..5e38e49ea 100644
  else
    flex_cdata.set('FLEX_ARGS', '')
 diff --git a/subprojects/gstreamer/meson.build b/subprojects/gstreamer/meson.build
-index 772809e15..70b1eafc5 100644
+index 941bedc..cd37a40 100644
 --- a/subprojects/gstreamer/meson.build
 +++ b/subprojects/gstreamer/meson.build
-@@ -36,7 +36,7 @@ cc = meson.get_compiler('c')
+@@ -47,7 +47,7 @@ endif
  
  cdata = configuration_data()
  
@@ -24,16 +24,7 @@ index 772809e15..70b1eafc5 100644
    msvc_args = [
        # Ignore several spurious warnings for things gstreamer does very commonly
        # If a warning is completely useless and spammy, use '/wdXXXX' to suppress it
-@@ -61,7 +61,7 @@ endif
- 
- # Symbol visibility
- have_visibility_hidden = false
--if cc.get_id() == 'msvc'
-+if cc.get_argument_syntax() == 'msvc'
-   export_define = '__declspec(dllexport) extern'
- elif cc.has_argument('-fvisibility=hidden')
-   add_project_arguments('-fvisibility=hidden', language: 'c')
-@@ -313,8 +313,10 @@ static __uint128_t v2 = 10;
+@@ -347,8 +347,10 @@ static __uint128_t v2 = 10;
  static __uint128_t u;
  u = v1 / v2;
  }'''
@@ -46,12 +37,3 @@ index 772809e15..70b1eafc5 100644
  endif
  
  # All supported platforms have long long now
-@@ -322,7 +324,7 @@ cdata.set('HAVE_LONG_LONG', 1)
- 
- # We only want to use the __declspec(dllexport/import) dance in GST_EXPORT when
- # building with MSVC
--if cc.get_id() == 'msvc'
-+if cc.get_argument_syntax() == 'msvc'
-   cdata.set('GSTCONFIG_BUILT_WITH_MSVC', 1)
- else
-   cdata.set('GSTCONFIG_BUILT_WITH_MSVC', 0)
diff --git a/external_imported/vcpkg/ports/gstreamer/no-downloads.patch b/external_imported/vcpkg/ports/gstreamer/no-downloads.patch
new file mode 100644
index 000000000..caf128021
--- /dev/null
+++ b/external_imported/vcpkg/ports/gstreamer/no-downloads.patch
@@ -0,0 +1,17 @@
+diff --git a/meson.build b/meson.build
+index df015cb..93cf7e9 100644
+--- a/meson.build
++++ b/meson.build
+@@ -105,12 +105,6 @@ subprojects = [
+   ['gst-plugins-rs', { 'option': get_option('rs'), 'build-hotdoc': true, 'match_gst_version': false}],
+ ]
+ 
+-if build_system == 'windows'
+-  subproject('win-flex-bison-binaries')
+-  subproject('win-nasm')
+-elif build_system == 'darwin'
+-  subproject('macos-bison-binary')
+-endif
+ 
+ orc_option = get_option('orc')
+ # There is a check below to keep this in sync with subprojects/gst-plugins-base/meson.build
diff --git a/external_imported/vcpkg/ports/gstreamer/portfile.cmake b/external_imported/vcpkg/ports/gstreamer/portfile.cmake
index ced5f7d21..b60de171b 100644
--- a/external_imported/vcpkg/ports/gstreamer/portfile.cmake
+++ b/external_imported/vcpkg/ports/gstreamer/portfile.cmake
@@ -5,12 +5,12 @@ if(VCPKG_TARGET_IS_WINDOWS)
 endif()
 
 vcpkg_from_gitlab(
-    GITLAB_URL https://gitlab.freedesktop.org/
+    GITLAB_URL https://gitlab.freedesktop.org
     OUT_SOURCE_PATH SOURCE_PATH
     REPO gstreamer/gstreamer
-    REF 1.20.5
-    SHA512 2a996d8ac0f70c34dbbc02c875026df6e89346f0844fbaa25475075bcb6e57c81ceb7d71e729c3259eace851e3d7222cb3fe395e375d93eb45b1262a6ede1fdb
-    HEAD_REF master
+    REF "${VERSION}"
+    SHA512 0d69896d0a83452320df0d0f56c710df1365a259cd3f48dc7cd4df18d45b27caea7174aafa15ae5eb8637ccdef192c1047185b369b7232db4eaacbc57ffaaa22
+    HEAD_REF main
     PATCHES
         fix-clang-cl.patch
         fix-clang-cl-gstreamer.patch
@@ -20,6 +20,9 @@ vcpkg_from_gitlab(
         fix-clang-cl-ugly.patch
         gstreamer-disable-no-unused.patch
         srtp_fix.patch
+        fix-bz2-windows-debug-dependency.patch
+        base-must-be-enabled.patch
+        no-downloads.patch
         ${PATCHES}
 )
 
@@ -44,50 +47,76 @@ if(VCPKG_TARGET_IS_OSX)
 endif()
 
 # General features
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        gpl             gpl
+        libav           libav
+        nls             nls
+        ges             ges
+
+        plugins-base    base
+        gl-graphene     gst-plugins-base:gl-graphene
+        alsa            gst-plugins-base:alsa
+        ogg             gst-plugins-base:ogg
+        opus-base       gst-plugins-base:opus
+        pango           gst-plugins-base:pango
+        vorbis          gst-plugins-base:vorbis
+        x11-base        gst-plugins-base:x11
+        x11-base        gst-plugins-base:xshm
+
+        plugins-good    good
+        bzip2-good      gst-plugins-good:bz2
+        cairo           gst-plugins-good:cairo
+        flac            gst-plugins-good:flac
+        gdk-pixbuf      gst-plugins-good:gdk-pixbuf
+        jpeg            gst-plugins-good:jpeg
+        mpg123          gst-plugins-good:mpg123
+        png             gst-plugins-good:png
+        speex           gst-plugins-good:speex
+        taglib          gst-plugins-good:taglib
+        vpx             gst-plugins-good:vpx
+
+        plugins-ugly    ugly
+        x264            gst-plugins-ugly:x264
+
+        plugins-bad     bad
+        aes             gst-plugins-bad:aes
+        aom             gst-plugins-bad:aom
+        assrender       gst-plugins-bad:assrender
+        bzip2-bad       gst-plugins-bad:bz2
+        chromaprint     gst-plugins-bad:chromaprint
+        closedcaption   gst-plugins-bad:closedcaption
+        colormanagement gst-plugins-bad:colormanagement
+        dash            gst-plugins-bad:dash
+        dc1394          gst-plugins-bad:dc1394
+        dtls            gst-plugins-bad:dtls
+        faad            gst-plugins-bad:faad
+        fdkaac          gst-plugins-bad:fdkaac
+        fluidsynth      gst-plugins-bad:fluidsynth
+        libde265        gst-plugins-bad:libde265
+        microdns        gst-plugins-bad:microdns
+        modplug         gst-plugins-bad:modplug
+        nvcodec         gst-plugins-bad:nvcodec
+        openal          gst-plugins-bad:openal
+        openh264        gst-plugins-bad:openh264
+        openjpeg        gst-plugins-bad:openjpeg
+        openmpt         gst-plugins-bad:openmpt
+        opus-bad        gst-plugins-bad:opus
+        smoothstreaming gst-plugins-bad:smoothstreaming
+        sndfile         gst-plugins-bad:sndfile
+        soundtouch      gst-plugins-bad:soundtouch
+        srt             gst-plugins-bad:srt
+        srtp            gst-plugins-bad:srtp
+        webp            gst-plugins-bad:webp
+        webrtc          gst-plugins-bad:webrtc
+        wildmidi        gst-plugins-bad:wildmidi
+        x11-bad         gst-plugins-bad:x11
+        x265            gst-plugins-bad:x265
+        asio            gst-plugins-bad:asio
+)
 
-if("gpl" IN_LIST FEATURES)
-    set(LICENSE_GPL enabled)
-else()
-    set(LICENSE_GPL disabled)
-endif()
-
-if("nls" IN_LIST FEATURES)
-    set(NLS enabled)
-else()
-    set(NLS disabled)
-endif()
-
-if("plugins-base" IN_LIST FEATURES)
-    set(PLUGIN_BASE_SUPPORT enabled)
-else()
-    set(PLUGIN_BASE_SUPPORT disabled)
-endif()
-
-if("plugins-good" IN_LIST FEATURES)
-    set(PLUGIN_GOOD_SUPPORT enabled)
-else()
-    set(PLUGIN_GOOD_SUPPORT disabled)
-endif()
-
-if("plugins-ugly" IN_LIST FEATURES)
-    set(PLUGIN_UGLY_SUPPORT enabled)
-else()
-    set(PLUGIN_UGLY_SUPPORT disabled)
-endif()
-
-if("plugins-bad" IN_LIST FEATURES)
-    set(PLUGIN_BAD_SUPPORT enabled)
-else()
-    set(PLUGIN_BAD_SUPPORT disabled)
-endif()
-
-if("gl-graphene" IN_LIST FEATURES)
-    set(GL_GRAPHENE enabled)
-else()
-    set(GL_GRAPHENE disabled)
-endif()
-
-# Base optional plugins
+string(REPLACE "OFF" "disabled" FEATURE_OPTIONS "${FEATURE_OPTIONS}")
+string(REPLACE "ON" "enabled" FEATURE_OPTIONS "${FEATURE_OPTIONS}")
 
 if(VCPKG_TARGET_IS_WINDOWS)
     set(PLUGIN_BASE_WINDOW_SYSTEM win32)
@@ -97,291 +126,12 @@ else()
     set(PLUGIN_BASE_GL_PLATFORM auto)
 endif()
 
-if("alsa" IN_LIST FEATURES AND VCPKG_TARGET_IS_LINUX)
-    set(PLUGIN_BASE_ALSA enabled)
-else()
-    set(PLUGIN_BASE_ALSA disabled)
-endif()
-
-if("ogg" IN_LIST FEATURES)
-    set(PLUGIN_BASE_OGG enabled)
-else()
-    set(PLUGIN_BASE_OGG disabled)
-endif()
-
-if("opus-base" IN_LIST FEATURES)
-    set(PLUGIN_BASE_OPUS enabled)
-else()
-    set(PLUGIN_BASE_OPUS disabled)
-endif()
-
-if("pango" IN_LIST FEATURES)
-    set(PLUGIN_BASE_PANGO enabled)
-else()
-    set(PLUGIN_BASE_PANGO disabled)
-endif()
-
-if("vorbis" IN_LIST FEATURES)
-    set(PLUGIN_BASE_VORBIS enabled)
-else()
-    set(PLUGIN_BASE_VORBIS disabled)
-endif()
-
-if("x11-base" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_WINDOWS)
-    set(PLUGIN_BASE_X11 enabled)
-else()
-    set(PLUGIN_BASE_X11 disabled)
-endif()
-
-# Good optional plugins
-
-if("cairo" IN_LIST FEATURES)
-    set(PLUGIN_GOOD_CAIRO enabled)
-else()
-    set(PLUGIN_GOOD_CAIRO disabled)
-endif()
-
-if("flac" IN_LIST FEATURES)
-    set(PLUGIN_GOOD_FLAC enabled)
-else()
-    set(PLUGIN_GOOD_FLAC disabled)
-endif()
-
-if("gdk-pixbuf" IN_LIST FEATURES)
-    set(PLUGIN_GOOD_GDK_PIXBUF enabled)
-else()
-    set(PLUGIN_GOOD_GDK_PIXBUF disabled)
-endif()
-
-if("jpeg" IN_LIST FEATURES)
-    set(PLUGIN_GOOD_JPEG enabled)
-else()
-    set(PLUGIN_GOOD_JPEG disabled)
-endif()
-
-if("mpg123" IN_LIST FEATURES)
-    set(PLUGIN_GOOD_MPG123 enabled)
-else()
-    set(PLUGIN_GOOD_MPG123 disabled)
-endif()
-
-if("png" IN_LIST FEATURES)
-    set(PLUGIN_GOOD_PNG enabled)
-else()
-    set(PLUGIN_GOOD_PNG disabled)
-endif()
-
-if("speex" IN_LIST FEATURES)
-    set(PLUGIN_GOOD_SPEEX enabled)
-else()
-    set(PLUGIN_GOOD_SPEEX disabled)
-endif()
-
-if("taglib" IN_LIST FEATURES)
-    set(PLUGIN_GOOD_TAGLIB enabled)
-else()
-    set(PLUGIN_GOOD_TAGLIB disabled)
-endif()
-
-if("vpx" IN_LIST FEATURES)
-    set(PLUGIN_GOOD_VPX enabled)
-else()
-    set(PLUGIN_GOOD_VPX disabled)
-endif()
-
-# Ugly optional plugins
-
-if("gpl" IN_LIST FEATURES AND "x264" IN_LIST FEATURES)
-    set(PLUGIN_UGLY_X264 enabled)
-else()
-    set(PLUGIN_UGLY_X264 disabled)
-endif()
-
-# Bad optional plugins
-
-if("aes" IN_LIST FEATURES)
-    set(PLUGIN_BAD_AES enabled)
-else()
-    set(PLUGIN_BAD_AES disabled)
-endif()
-
 if("asio" IN_LIST FEATURES)
-    set(PLUGIN_BAD_ASIO enabled)
     set(PLUGIN_BAD_ASIO_SDK_PATH ${CURRENT_INSTALLED_DIR}/include/asiosdk)
 else()
-    set(PLUGIN_BAD_ASIO disabled)
     set(PLUGIN_BAD_ASIO_SDK_PATH "")
 endif()
 
-if("assrender" IN_LIST FEATURES)
-    set(PLUGIN_BAD_ASSRENDER enabled)
-else()
-    set(PLUGIN_BAD_ASSRENDER disabled)
-endif()
-
-if("chromaprint" IN_LIST FEATURES)
-    set(PLUGIN_BAD_CHROMAPRINT enabled)
-else()
-    set(PLUGIN_BAD_CHROMAPRINT disabled)
-endif()
-
-if("closedcaption" IN_LIST FEATURES)
-    set(PLUGIN_BAD_CLOSEDCAPTION enabled)
-else()
-    set(PLUGIN_BAD_CLOSEDCAPTION disabled)
-endif()
-
-if("colormanagement" IN_LIST FEATURES)
-    set(PLUGIN_BAD_COLORMANAGEMENT enabled)
-else()
-    set(PLUGIN_BAD_COLORMANAGEMENT disabled)
-endif()
-
-if("dash" IN_LIST FEATURES)
-    set(PLUGIN_BAD_DASH enabled)
-else()
-    set(PLUGIN_BAD_DASH disabled)
-endif()
-
-if("dc1394" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_WINDOWS)
-    set(PLUGIN_BAD_DC1394 enabled)
-else()
-    set(PLUGIN_BAD_DC1394 disabled)
-endif()
-
-if("dtls" IN_LIST FEATURES)
-    set(PLUGIN_BAD_DTLS enabled)
-else()
-    set(PLUGIN_BAD_DTLS disabled)
-endif()
-
-if("gpl" IN_LIST FEATURES AND "faad" IN_LIST FEATURES)
-    set(PLUGIN_BAD_FAAD enabled)
-else()
-    set(PLUGIN_BAD_FAAD disabled)
-endif()
-
-if("fdkaac" IN_LIST FEATURES)
-    set(PLUGIN_BAD_FDKAAC enabled)
-else()
-    set(PLUGIN_BAD_FDKAAC disabled)
-endif()
-
-# Plugin requires unistd.h header, which doesn't exist on Windows
-if("fluidsynth" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_WINDOWS)
-    set(PLUGIN_BAD_FLUIDSYNTH enabled)
-else()
-    set(PLUGIN_BAD_FLUIDSYNTH disabled)
-endif()
-
-if("libde265" IN_LIST FEATURES)
-    set(PLUGIN_BAD_LIBDE265 enabled)
-else()
-    set(PLUGIN_BAD_LIBDE265 disabled)
-endif()
-
-if("microdns" IN_LIST FEATURES)
-    set(PLUGIN_BAD_MICRODNS enabled)
-else()
-    set(PLUGIN_BAD_MICRODNS disabled)
-endif()
-
-if("modplug" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_UWP)
-    set(PLUGIN_BAD_MODPLUG enabled)
-else()
-    set(PLUGIN_BAD_MODPLUG disabled)
-endif()
-
-if("openal" IN_LIST FEATURES)
-    set(PLUGIN_BAD_OPENAL enabled)
-else()
-    set(PLUGIN_BAD_OPENAL disabled)
-endif()
-
-if("openh264" IN_LIST FEATURES)
-    set(PLUGIN_BAD_OPENH264 enabled)
-else()
-    set(PLUGIN_BAD_OPENH264 disabled)
-endif()
-
-if("openjpeg" IN_LIST FEATURES)
-    set(PLUGIN_BAD_OPENJPEG enabled)
-else()
-    set(PLUGIN_BAD_OPENJPEG disabled)
-endif()
-
-if("openmpt" IN_LIST FEATURES)
-    set(PLUGIN_BAD_OPENMPT enabled)
-else()
-    set(PLUGIN_BAD_OPENMPT disabled)
-endif()
-
-if("opus-bad" IN_LIST FEATURES)
-    set(PLUGIN_BAD_OPUS enabled)
-else()
-    set(PLUGIN_BAD_OPUS disabled)
-endif()
-
-if("smoothstreaming" IN_LIST FEATURES)
-    set(PLUGIN_BAD_SMOOTHSTREAMING enabled)
-else()
-    set(PLUGIN_BAD_SMOOTHSTREAMING disabled)
-endif()
-
-if("sndfile" IN_LIST FEATURES)
-    set(PLUGIN_BAD_SNDFILE enabled)
-else()
-    set(PLUGIN_BAD_SNDFILE disabled)
-endif()
-
-if("soundtouch" IN_LIST FEATURES)
-    set(PLUGIN_BAD_SOUNDTOUCH enabled)
-else()
-    set(PLUGIN_BAD_SOUNDTOUCH disabled)
-endif()
-
-if("srt" IN_LIST FEATURES)
-    set(PLUGIN_BAD_SRT enabled)
-else()
-    set(PLUGIN_BAD_SRT disabled)
-endif()
-
-if("srtp" IN_LIST FEATURES)
-    set(PLUGIN_BAD_SRTP enabled)
-else()
-    set(PLUGIN_BAD_SRTP disabled)
-endif()
-
-if("webp" IN_LIST FEATURES)
-    set(PLUGIN_BAD_WEBP enabled)
-else()
-    set(PLUGIN_BAD_WEBP disabled)
-endif()
-
-if("webrtc" IN_LIST FEATURES)
-    set(PLUGIN_BAD_WEBRTC enabled)
-else()
-    set(PLUGIN_BAD_WEBRTC disabled)
-endif()
-
-if("wildmidi" IN_LIST FEATURES)
-    set(PLUGIN_BAD_WILDMIDI enabled)
-else()
-    set(PLUGIN_BAD_WILDMIDI disabled)
-endif()
-
-if("x11-bad" IN_LIST FEATURES)
-    set(PLUGIN_BAD_X11 enabled)
-else()
-    set(PLUGIN_BAD_X11 disabled)
-endif()
-
-if("gpl" IN_LIST FEATURES AND "x265" IN_LIST FEATURES)
-    set(PLUGIN_BAD_X265 enabled)
-else()
-    set(PLUGIN_BAD_X265 disabled)
-endif()
-
 #
 # References
 #   https://gitlab.freedesktop.org/gstreamer/gstreamer/-/blob/1.20.4/subprojects/gstreamer/meson_options.txt
@@ -400,12 +150,11 @@ endif()
 vcpkg_configure_meson(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
+        ${FEATURE_OPTIONS}
         # General options
         -Dpython=disabled
-        -Dlibav=disabled
         -Dlibnice=disabled
         -Ddevtools=disabled
-        -Dges=disabled
         -Drtsp_server=disabled
         -Domx=disabled
         -Dvaapi=disabled
@@ -414,12 +163,10 @@ vcpkg_configure_meson(
         -Dgst-examples=disabled
         -Dtls=disabled
         -Dqt5=disabled
-        -Dgpl=${LICENSE_GPL}
         # Common options
         -Dtests=disabled
         -Dexamples=disabled
         -Dintrospection=disabled
-        -Dnls=${NLS}
         -Dorc=disabled # gstreamer requires a specific version of orc which is not available in vcpkg
         -Ddoc=disabled
         -Dgtk_doc=disabled
@@ -433,54 +180,34 @@ vcpkg_configure_meson(
         -Dgstreamer:benchmarks=disabled
         -Dgstreamer:gst_debug=true
         # gst-plugins-base
-        -Dbase=${PLUGIN_BASE_SUPPORT}
         -Dgst-plugins-base:gl_winsys=${PLUGIN_BASE_WINDOW_SYSTEM}
         -Dgst-plugins-base:gl_platform=${PLUGIN_BASE_GL_PLATFORM}
-        -Dgst-plugins-base:gl-graphene=${GL_GRAPHENE}
-        -Dgst-plugins-base:alsa=${PLUGIN_BASE_ALSA}
         -Dgst-plugins-base:cdparanoia=disabled
         -Dgst-plugins-base:libvisual=disabled
-        -Dgst-plugins-base:ogg=${PLUGIN_BASE_OGG}
-        -Dgst-plugins-base:opus=${PLUGIN_BASE_OPUS}
-        -Dgst-plugins-base:pango=${PLUGIN_BASE_PANGO}
         -Dgst-plugins-base:theora=disabled
         -Dgst-plugins-base:tremor=disabled
-        -Dgst-plugins-base:vorbis=${PLUGIN_BASE_VORBIS}
-        -Dgst-plugins-base:x11=${PLUGIN_BASE_X11}
-        -Dgst-plugins-base:xshm=${PLUGIN_BASE_X11}
         -Dgst-plugins-base:xvideo=disabled
         # gst-plugins-good
-        -Dgood=${PLUGIN_GOOD_SUPPORT}
         -Dgst-plugins-good:aalib=disabled
-        -Dgst-plugins-good:bz2=disabled
         -Dgst-plugins-good:directsound=auto
         -Dgst-plugins-good:dv=disabled
         -Dgst-plugins-good:dv1394=disabled
-        -Dgst-plugins-good:flac=${PLUGIN_GOOD_FLAC}
-        -Dgst-plugins-good:gdk-pixbuf=${PLUGIN_GOOD_GDK_PIXBUF}
         -Dgst-plugins-good:gtk3=disabled # GTK version 3 only
         -Dgst-plugins-good:jack=disabled
-        -Dgst-plugins-good:jpeg=${PLUGIN_GOOD_JPEG}
         -Dgst-plugins-good:lame=disabled
         -Dgst-plugins-good:libcaca=disabled
-        -Dgst-plugins-good:mpg123=${PLUGIN_GOOD_MPG123}
         -Dgst-plugins-good:oss=disabled
         -Dgst-plugins-good:oss4=disabled
         -Dgst-plugins-good:osxaudio=auto
         -Dgst-plugins-good:osxvideo=auto
-        -Dgst-plugins-good:png=${PLUGIN_GOOD_PNG}
         -Dgst-plugins-good:pulse=auto
         -Dgst-plugins-good:qt5=disabled
         -Dgst-plugins-good:shout2=disabled
         -Dgst-plugins-good:soup=disabled
-        -Dgst-plugins-good:speex=${PLUGIN_GOOD_SPEEX}
-        -Dgst-plugins-good:taglib=${PLUGIN_GOOD_TAGLIB}
         -Dgst-plugins-good:twolame=disabled
-        -Dgst-plugins-good:vpx=${PLUGIN_GOOD_VPX}
         -Dgst-plugins-good:waveform=auto
         -Dgst-plugins-good:wavpack=disabled # Error during plugin build
         # gst-plugins-ugly
-        -Dugly=${PLUGIN_UGLY_SUPPORT}
         -Dgst-plugins-ugly:a52dec=disabled
         -Dgst-plugins-ugly:amrnb=disabled
         -Dgst-plugins-ugly:amrwbdec=disabled
@@ -488,41 +215,25 @@ vcpkg_configure_meson(
         -Dgst-plugins-ugly:dvdread=disabled
         -Dgst-plugins-ugly:mpeg2dec=disabled # libmpeg2 not found
         -Dgst-plugins-ugly:sidplay=disabled
-        -Dgst-plugins-ugly:x264=${PLUGIN_UGLY_X264}
         # gst-plugins-bad
-        -Dbad=${PLUGIN_BAD_SUPPORT}
-        -Dgst-plugins-bad:aes=${PLUGIN_BAD_AES}
-        -Dgst-plugins-bad:aom=disabled # Error during plugin build
         -Dgst-plugins-bad:avtp=disabled
         -Dgst-plugins-bad:androidmedia=auto
         -Dgst-plugins-bad:applemedia=auto
-        -Dgst-plugins-bad:asio=${PLUGIN_BAD_ASIO}
         -Dgst-plugins-bad:asio-sdk-path=${PLUGIN_BAD_ASIO_SDK_PATH}
-        -Dgst-plugins-bad:assrender=${PLUGIN_BAD_ASSRENDER}
         -Dgst-plugins-bad:bluez=disabled
         -Dgst-plugins-bad:bs2b=disabled
-        -Dgst-plugins-bad:bz2=disabled # Error during plugin configuration
-        -Dgst-plugins-bad:chromaprint=${PLUGIN_BAD_CHROMAPRINT}
-        -Dgst-plugins-bad:closedcaption=${PLUGIN_BAD_CLOSEDCAPTION}
-        -Dgst-plugins-bad:colormanagement=${PLUGIN_BAD_COLORMANAGEMENT}
         -Dgst-plugins-bad:curl=disabled # Error during plugin build
         -Dgst-plugins-bad:curl-ssh2=disabled
         -Dgst-plugins-bad:d3dvideosink=auto
         -Dgst-plugins-bad:d3d11=auto
-        -Dgst-plugins-bad:dash=${PLUGIN_BAD_DASH}
-        -Dgst-plugins-bad:dc1394=${PLUGIN_BAD_DC1394}
         -Dgst-plugins-bad:decklink=disabled
         -Dgst-plugins-bad:directfb=disabled
         -Dgst-plugins-bad:directsound=auto
-        -Dgst-plugins-bad:dtls=${PLUGIN_BAD_DTLS}
         -Dgst-plugins-bad:dts=disabled
         -Dgst-plugins-bad:dvb=auto
         -Dgst-plugins-bad:faac=disabled
-        -Dgst-plugins-bad:faad=${PLUGIN_BAD_FAAD}
         -Dgst-plugins-bad:fbdev=auto
-        -Dgst-plugins-bad:fdkaac=${PLUGIN_BAD_FDKAAC}
         -Dgst-plugins-bad:flite=disabled
-        -Dgst-plugins-bad:fluidsynth=${PLUGIN_BAD_FLUIDSYNTH}
         -Dgst-plugins-bad:gl=auto
         -Dgst-plugins-bad:gme=disabled
         -Dgst-plugins-bad:gs=disabled # Error during plugin configuration (abseil pkg-config file missing)
@@ -533,28 +244,19 @@ vcpkg_configure_meson(
         -Dgst-plugins-bad:kms=disabled
         -Dgst-plugins-bad:ladspa=disabled
         -Dgst-plugins-bad:ldac=disabled
-        -Dgst-plugins-bad:libde265=${PLUGIN_BAD_LIBDE265}
         -Dgst-plugins-bad:lv2=disabled # Error during plugin configuration (lilv pkg-config file missing)
         -Dgst-plugins-bad:mediafoundation=auto
-        -Dgst-plugins-bad:microdns=${PLUGIN_BAD_MICRODNS}
-        -Dgst-plugins-bad:modplug=${PLUGIN_BAD_MODPLUG}
         -Dgst-plugins-bad:mpeg2enc=disabled
         -Dgst-plugins-bad:mplex=disabled
         -Dgst-plugins-bad:msdk=disabled
         -Dgst-plugins-bad:musepack=disabled
         -Dgst-plugins-bad:neon=disabled
-        -Dgst-plugins-bad:nvcodec=disabled
         -Dgst-plugins-bad:onnx=disabled # libonnxruntime not found
-        -Dgst-plugins-bad:openal=${PLUGIN_BAD_OPENAL}
         -Dgst-plugins-bad:openaptx=disabled
         -Dgst-plugins-bad:opencv=disabled # opencv not found
         -Dgst-plugins-bad:openexr=disabled # OpenEXR::IlmImf target not found
-        -Dgst-plugins-bad:openh264=${PLUGIN_BAD_OPENH264}
-        -Dgst-plugins-bad:openjpeg=${PLUGIN_BAD_OPENJPEG}
-        -Dgst-plugins-bad:openmpt=${PLUGIN_BAD_OPENMPT}
         -Dgst-plugins-bad:openni2=disabled # libopenni2 not found
         -Dgst-plugins-bad:opensles=disabled
-        -Dgst-plugins-bad:opus=${PLUGIN_BAD_OPUS}
         -Dgst-plugins-bad:qroverlay=disabled
         -Dgst-plugins-bad:resindvd=disabled
         -Dgst-plugins-bad:rsvg=disabled # librsvg-2.0 not found
@@ -562,12 +264,7 @@ vcpkg_configure_meson(
         -Dgst-plugins-bad:sbc=disabled
         -Dgst-plugins-bad:sctp=auto
         -Dgst-plugins-bad:shm=disabled
-        -Dgst-plugins-bad:smoothstreaming=${PLUGIN_BAD_SMOOTHSTREAMING}
-        -Dgst-plugins-bad:sndfile=${PLUGIN_BAD_SNDFILE}
-        -Dgst-plugins-bad:soundtouch=${PLUGIN_BAD_SOUNDTOUCH}
         -Dgst-plugins-bad:spandsp=disabled
-        -Dgst-plugins-bad:srt=${PLUGIN_BAD_SRT}
-        -Dgst-plugins-bad:srtp=${PLUGIN_BAD_SRTP}
         -Dgst-plugins-bad:svthevcenc=disabled
         -Dgst-plugins-bad:teletext=disabled
         -Dgst-plugins-bad:tinyalsa=disabled
@@ -581,13 +278,8 @@ vcpkg_configure_meson(
         -Dgst-plugins-bad:wasapi=auto
         -Dgst-plugins-bad:wasapi2=auto
         -Dgst-plugins-bad:wayland=auto
-        -Dgst-plugins-bad:webp=${PLUGIN_BAD_WEBP}
-        -Dgst-plugins-bad:webrtc=${PLUGIN_BAD_WEBRTC}
-        -Dgst-plugins-bad:wildmidi=${PLUGIN_BAD_WILDMIDI}
         -Dgst-plugins-bad:winks=disabled
         -Dgst-plugins-bad:winscreencap=auto
-        -Dgst-plugins-bad:x11=${PLUGIN_BAD_X11}
-        -Dgst-plugins-bad:x265=${PLUGIN_BAD_X265}
         -Dgst-plugins-bad:zbar=disabled # Error during plugin build
         -Dgst-plugins-bad:zxing=disabled # Error during plugin build
         -Dgst-plugins-bad:wpe=disabled
@@ -630,6 +322,10 @@ list(APPEND GST_LIBEXEC_TOOLS
     gst-plugin-scanner
 )
 
+if("ges" IN_LIST FEATURES)
+    list(APPEND GST_BIN_TOOLS ges-launch-1.0)
+endif()
+
 if("plugins-base" IN_LIST FEATURES)
     list(APPEND GST_BIN_TOOLS
         gst-device-monitor-1.0
@@ -683,18 +379,40 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/gstreamer-1.0/gst/gstconfig.h" "!defined(GST_STATIC_COMPILATION)" "0")
 endif()
 
-if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    # move plugins to ${prefix}/plugins/${PORT} instead of ${prefix}/lib/gstreamer-1.0
     if(NOT VCPKG_BUILD_TYPE)
-        file(GLOB DBG_BINS "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/*.dll"
+        file(GLOB DBG_BINS "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/${CMAKE_SHARED_LIBRARY_PREFIX}*${CMAKE_SHARED_LIBRARY_SUFFIX}"
                            "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/*.pdb"
         )
-        file(COPY ${DBG_BINS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
+        file(COPY ${DBG_BINS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/plugins/${PORT}")
     endif()
-    file(GLOB REL_BINS "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/*.dll"
+    file(GLOB REL_BINS "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/${CMAKE_SHARED_LIBRARY_PREFIX}*${CMAKE_SHARED_LIBRARY_SUFFIX}"
                        "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/*.pdb"
     )
-    file(COPY ${REL_BINS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
+    file(COPY ${REL_BINS} DESTINATION "${CURRENT_PACKAGES_DIR}/plugins/${PORT}")
     file(REMOVE ${DBG_BINS} ${REL_BINS})
+    if(NOT VCPKG_TARGET_IS_WINDOWS)
+        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0" "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0")
+    endif()
+
+    set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gstreamer-1.0.pc")
+    if(EXISTS "${_file}")
+        file(READ "${_file}" _contents)
+        string(REPLACE [[toolsdir=${exec_prefix}/bin]] "toolsdir=\${prefix}/../tools/${PORT}" _contents "${_contents}")
+        string(REPLACE [[pluginscannerdir=${libexecdir}/gstreamer-1.0]] "pluginscannerdir=\${prefix}/../tools/${PORT}" _contents "${_contents}")
+        string(REPLACE [[pluginsdir=${libdir}/gstreamer-1.0]] "pluginsdir=\${prefix}/plugins/${PORT}" _contents "${_contents}")
+        file(WRITE "${_file}" "${_contents}")
+    endif()
+
+    set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gstreamer-1.0.pc")
+    if(EXISTS "${_file}")
+        file(READ "${_file}" _contents)
+        string(REPLACE [[toolsdir=${exec_prefix}/bin]] "toolsdir=\${prefix}/tools/${PORT}" _contents "${_contents}")
+        string(REPLACE [[pluginscannerdir=${libexecdir}/gstreamer-1.0]] "pluginscannerdir=\${prefix}/tools/${PORT}" _contents "${_contents}")
+        string(REPLACE [[pluginsdir=${libdir}/gstreamer-1.0]] "pluginsdir=\${prefix}/plugins/${PORT}" _contents "${_contents}")
+        file(WRITE "${_file}" "${_contents}")
+    endif()
 endif()
 
 vcpkg_fixup_pkgconfig()
diff --git a/external_imported/vcpkg/ports/gstreamer/srtp_fix.patch b/external_imported/vcpkg/ports/gstreamer/srtp_fix.patch
index cc73cd11b..ed4601d45 100644
--- a/external_imported/vcpkg/ports/gstreamer/srtp_fix.patch
+++ b/external_imported/vcpkg/ports/gstreamer/srtp_fix.patch
@@ -1,8 +1,8 @@
 diff --git a/subprojects/gst-plugins-bad/ext/srtp/meson.build b/subprojects/gst-plugins-bad/ext/srtp/meson.build
-index 7f947191ae..b4a8e9c2a8 100644
+index 49eed5b..db5aed0 100644
 --- a/subprojects/gst-plugins-bad/ext/srtp/meson.build
 +++ b/subprojects/gst-plugins-bad/ext/srtp/meson.build
-@@ -6,12 +6,14 @@ srtp_sources = [
+@@ -6,13 +6,15 @@ srtp_sources = [
    'gstsrtpenc.c',
  ]
  
@@ -10,6 +10,7 @@ index 7f947191ae..b4a8e9c2a8 100644
 +
  srtp_cargs = []
  if get_option('srtp').disabled()
+   srtp_dep = dependency('', required : false)
    subdir_done()
  endif
  
@@ -18,12 +19,12 @@ index 7f947191ae..b4a8e9c2a8 100644
  if srtp_dep.found()
    srtp_cargs += ['-DHAVE_SRTP2']
  else
-@@ -37,7 +39,7 @@ if srtp_dep.found()
+@@ -38,7 +40,7 @@ if srtp_dep.found()
      include_directories : [configinc],
      dependencies : [gstrtp_dep, gstvideo_dep, srtp_dep],
      install : true,
 -    install_dir : plugins_install_dir,
 +    install_dir : gst_plugins_install_dir,
    )
-   pkgconfig.generate(gstsrtp, install_dir : plugins_pkgconfig_install_dir)
    plugins += [gstsrtp]
+ endif
diff --git a/external_imported/vcpkg/ports/gstreamer/vcpkg.json b/external_imported/vcpkg/ports/gstreamer/vcpkg.json
index 4dc4be6cb..a9f0d5184 100644
--- a/external_imported/vcpkg/ports/gstreamer/vcpkg.json
+++ b/external_imported/vcpkg/ports/gstreamer/vcpkg.json
@@ -1,11 +1,11 @@
 {
   "name": "gstreamer",
-  "version": "1.20.5",
-  "port-version": 2,
+  "version": "1.22.5",
+  "port-version": 7,
   "description": "GStreamer open-source multimedia framework core library",
   "homepage": "https://gstreamer.freedesktop.org/",
   "license": "LGPL-2.0-only",
-  "supports": "!uwp",
+  "supports": "!uwp & !xbox",
   "dependencies": [
     "glib",
     {
@@ -40,6 +40,7 @@
     },
     "alsa": {
       "description": "Enable support for ALSA (Advanced Linux Sound Architecture)",
+      "supports": "linux",
       "dependencies": [
         {
           "name": "alsa",
@@ -54,6 +55,20 @@
         }
       ]
     },
+    "aom": {
+      "description": "Enable support for the Alliance for Open Media (AOM) AV1 encoder and decoder",
+      "supports": "!windows",
+      "dependencies": [
+        "aom",
+        {
+          "name": "gstreamer",
+          "default-features": false,
+          "features": [
+            "plugins-bad"
+          ]
+        }
+      ]
+    },
     "asio": {
       "description": "Enable support for the Steinberg Audio Streaming Input Output (ASIO) library (Windows only)",
       "dependencies": [
@@ -83,6 +98,32 @@
         "libass"
       ]
     },
+    "bzip2-bad": {
+      "description": "Enable bzip2 stream compression in bad plugins",
+      "dependencies": [
+        "bzip2",
+        {
+          "name": "gstreamer",
+          "default-features": false,
+          "features": [
+            "plugins-bad"
+          ]
+        }
+      ]
+    },
+    "bzip2-good": {
+      "description": "Enable bzip2 stream compression in good plugins",
+      "dependencies": [
+        "bzip2",
+        {
+          "name": "gstreamer",
+          "default-features": false,
+          "features": [
+            "plugins-good"
+          ]
+        }
+      ]
+    },
     "cairo": {
       "description": "Enable support for the cairo graphics library",
       "dependencies": [
@@ -223,6 +264,7 @@
     },
     "fluidsynth": {
       "description": "Enable support for the Fluidsynth MIDI decoder",
+      "supports": "!windows",
       "dependencies": [
         {
           "name": "fluidsynth",
@@ -250,6 +292,18 @@
         }
       ]
     },
+    "ges": {
+      "description": "Enable support for GStreamer Editing Services",
+      "dependencies": [
+        {
+          "name": "gstreamer",
+          "default-features": false,
+          "features": [
+            "plugins-base"
+          ]
+        }
+      ]
+    },
     "gl-graphene": {
       "description": "Use Graphene in OpenGL plugin",
       "dependencies": [
@@ -264,7 +318,16 @@
       ]
     },
     "gpl": {
-      "description": "Allow build of plugins that have (A)GPL-licensed dependencies"
+      "description": "Allow build of plugins that have (A)GPL-licensed dependencies",
+      "dependencies": [
+        {
+          "name": "gstreamer",
+          "default-features": false,
+          "features": [
+            "plugins-base"
+          ]
+        }
+      ]
     },
     "jpeg": {
       "description": "Enable support for the JPEG file format",
@@ -280,6 +343,22 @@
         "libjpeg-turbo"
       ]
     },
+    "libav": {
+      "description": "libav plugins",
+      "dependencies": [
+        {
+          "name": "ffmpeg",
+          "default-features": false
+        },
+        {
+          "name": "gstreamer",
+          "default-features": false,
+          "features": [
+            "plugins-base"
+          ]
+        }
+      ]
+    },
     "libde265": {
       "description": "Enable support for the HEVC/H.265 video decoder",
       "dependencies": [
@@ -308,6 +387,7 @@
     },
     "modplug": {
       "description": "Enable support for the ModPlug audio decoder",
+      "supports": "!uwp",
       "dependencies": [
         {
           "name": "gstreamer",
@@ -346,6 +426,26 @@
           "features": [
             "tools"
           ]
+        },
+        {
+          "name": "gstreamer",
+          "default-features": false,
+          "features": [
+            "plugins-base"
+          ]
+        }
+      ]
+    },
+    "nvcodec": {
+      "description": "Enable support for the NVCODEC encoders and decoders",
+      "supports": "!osx & !ios & !android & !emscripten",
+      "dependencies": [
+        {
+          "name": "gstreamer",
+          "default-features": false,
+          "features": [
+            "plugins-bad"
+          ]
         }
       ]
     },
diff --git a/external_imported/vcpkg/ports/gtest/001-fix-UWP-death-test.patch b/external_imported/vcpkg/ports/gtest/001-fix-UWP-death-test.patch
index 572b7c7a4..03484908f 100644
--- a/external_imported/vcpkg/ports/gtest/001-fix-UWP-death-test.patch
+++ b/external_imported/vcpkg/ports/gtest/001-fix-UWP-death-test.patch
@@ -2,12 +2,12 @@ diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc
 index a64e887c..45ff24c3 100644
 --- a/googletest/src/gtest.cc
 +++ b/googletest/src/gtest.cc
-@@ -5409,7 +5409,7 @@ int UnitTest::Run() {
+@@ -5434,7 +5434,7 @@ int UnitTest::Run() {
    // used for the duration of the program.
    impl()->set_catch_exceptions(GTEST_FLAG_GET(catch_exceptions));
  
--#if GTEST_OS_WINDOWS
-+#if GTEST_OS_WINDOWS && GTEST_HAS_DEATH_TEST
+-#ifdef GTEST_OS_WINDOWS
++#if defined(GTEST_OS_WINDOWS) && defined(GTEST_HAS_DEATH_TEST)
    // Either the user wants Google Test to catch exceptions thrown by the
    // tests or this is executing in the context of death test child
    // process. In either case the user does not want to see pop-up dialogs
diff --git a/external_imported/vcpkg/ports/gtest/fix-main-lib-path.patch b/external_imported/vcpkg/ports/gtest/fix-main-lib-path.patch
index c2998f3e4..2a7be9dce 100644
--- a/external_imported/vcpkg/ports/gtest/fix-main-lib-path.patch
+++ b/external_imported/vcpkg/ports/gtest/fix-main-lib-path.patch
@@ -2,7 +2,7 @@ diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt
 index e7df8ec..1ecd596 100644
 --- a/googlemock/CMakeLists.txt
 +++ b/googlemock/CMakeLists.txt
-@@ -120,7 +120,8 @@ endif()
+@@ -112,7 +112,8 @@ endif()
  ########################################################################
  #
  # Install rules
@@ -16,7 +16,7 @@ diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt
 index abdd98b..7d1c01d 100644
 --- a/googletest/CMakeLists.txt
 +++ b/googletest/CMakeLists.txt
-@@ -148,7 +148,8 @@ target_link_libraries(gtest_main PUBLIC gtest)
+@@ -155,7 +155,8 @@ target_link_libraries(gtest_main PUBLIC gtest)
  ########################################################################
  #
  # Install rules
@@ -30,16 +30,17 @@ diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_u
 index 8d8d60a..b08ce28 100644
 --- a/googletest/cmake/internal_utils.cmake
 +++ b/googletest/cmake/internal_utils.cmake
-@@ -315,11 +315,15 @@ function(install_project)
-     install(DIRECTORY "${PROJECT_SOURCE_DIR}/include/"
+@@ -300,12 +300,16 @@ function(install_project)
+       COMPONENT "${PROJECT_NAME}"
        DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
      # Install the project targets.
 +    set (LIB_INSTALL_DST ${CMAKE_INSTALL_LIBDIR})
 +    if (${ARGN} MATCHES "_main")
 +      set (LIB_INSTALL_DST ${CMAKE_INSTALL_LIBDIR}/manual-link)
-+    endif()    
++    endif()
      install(TARGETS ${ARGN}
        EXPORT ${targets_export_name}
+       COMPONENT "${PROJECT_NAME}"
        RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
 -      ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
 -      LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
@@ -48,10 +49,10 @@ index 8d8d60a..b08ce28 100644
      if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
        # Install PDBs
        foreach(t ${ARGN})
-@@ -328,7 +332,7 @@ function(install_project)
-         get_target_property(t_pdb_output_directory ${t} PDB_OUTPUT_DIRECTORY)
+@@ -315,7 +319,7 @@ function(install_project)
          install(FILES
            "${t_pdb_output_directory}/\${CMAKE_INSTALL_CONFIG_NAME}/$<$<CONFIG:Debug>:${t_pdb_name_debug}>$<$<NOT:$<CONFIG:Debug>>:${t_pdb_name}>.pdb"
+           COMPONENT "${PROJECT_NAME}"
 -          DESTINATION ${CMAKE_INSTALL_LIBDIR}
 +          DESTINATION ${LIB_INSTALL_DST}
            OPTIONAL)
diff --git a/external_imported/vcpkg/ports/gtest/portfile.cmake b/external_imported/vcpkg/ports/gtest/portfile.cmake
index ff4a2b858..6b20051e6 100644
--- a/external_imported/vcpkg/ports/gtest/portfile.cmake
+++ b/external_imported/vcpkg/ports/gtest/portfile.cmake
@@ -5,8 +5,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/googletest
-    REF v1.13.0
-    SHA512 70c0cfb1b4147bdecb467ecb22ae5b5529eec0abc085763213a796b7cdbd81d1761d12b342060539b936fa54f345d33f060601544874d6213fdde79111fa813e
+    REF "v${VERSION}"
+    SHA512 765c326ccc1b87a01027385e69238266e356361cd4ee3e18e3c9d137a5d11fa5d657c164d02dd1be8fe693c8e10f2b580588dbfa57d27f070e2750f50d3e662c
     HEAD_REF main
     PATCHES
         001-fix-UWP-death-test.patch
diff --git a/external_imported/vcpkg/ports/gtest/vcpkg.json b/external_imported/vcpkg/ports/gtest/vcpkg.json
index 8f9d4ce01..406a2dff5 100644
--- a/external_imported/vcpkg/ports/gtest/vcpkg.json
+++ b/external_imported/vcpkg/ports/gtest/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "gtest",
-  "version-semver": "1.13.0",
+  "version-semver": "1.14.0",
   "description": "GoogleTest and GoogleMock testing frameworks",
   "homepage": "https://github.com/google/googletest",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/gtk/0001-build.patch b/external_imported/vcpkg/ports/gtk/0001-build.patch
index f0e2d2e87..40e3529f0 100644
--- a/external_imported/vcpkg/ports/gtk/0001-build.patch
+++ b/external_imported/vcpkg/ports/gtk/0001-build.patch
@@ -1,47 +1,13 @@
 diff --git a/meson.build b/meson.build
-index 41cf592..cb4d638 100644
+index 5efd8a9..d51af19 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -897,24 +897,24 @@ subdir('po-properties')
- subdir('docs/tools')
+@@ -857,7 +857,7 @@ subdir('po')
+ 
  subdir('docs/reference')
  
 -if not meson.is_cross_build()
--  if meson.version().version_compare('>=0.57.0')
--    gnome.post_install(
--      glib_compile_schemas: true,
--      gio_querymodules: gio_module_dirs,
--      gtk_update_icon_cache: get_option('demos'),
--    )
--  else
--    meson.add_install_script('build-aux/meson/post-install.py',
--                             gtk_api_version,
--                             gtk_binary_version,
--                             gtk_libdir,
--                             gtk_datadir,
--                             gtk_bindir)
--  endif
--else
--  message('Not executing post-install steps automatically when cross compiling')
--endif
-+#if not meson.is_cross_build()
-+#  if meson.version().version_compare('>=0.57.0')
-+#    gnome.post_install(
-+#      glib_compile_schemas: true,
-+#      gio_querymodules: gio_module_dirs,
-+#      gtk_update_icon_cache: get_option('demos'),
-+#    )
-+#  else
-+#    meson.add_install_script('build-aux/meson/post-install.py',
-+#                             gtk_api_version,
-+#                             gtk_binary_version,
-+#                             gtk_libdir,
-+#                             gtk_datadir,
-+#                             gtk_bindir)
-+#  endif
-+#else
-+#  message('Not executing post-install steps automatically when cross compiling')
-+#endif
- 
- if not meson.is_subproject()
-     meson.add_dist_script('build-aux/meson/dist-data.py')
++if false
+   gnome.post_install(
+     glib_compile_schemas: true,
+     gio_querymodules: gio_module_dirs,
diff --git a/external_imported/vcpkg/ports/gtk/0002-windows-build.patch b/external_imported/vcpkg/ports/gtk/0002-windows-build.patch
deleted file mode 100644
index 27f6680ce..000000000
--- a/external_imported/vcpkg/ports/gtk/0002-windows-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru /gdk/win32/gdkinput-winpointer.c b/gdk/win32/gdkinput-winpointer.c
---- a/gdk/win32/gdkinput-winpointer.c
-+++ b/gdk/win32/gdkinput-winpointer.c
-@@ -18,6 +18,7 @@
- #include "config.h"
-
- #include <gdk/gdk.h>
-+#include "gdk-private.h"
- #include "gdkwin32.h"
- #include "gdkprivate-win32.h"
- #include "gdkdevicemanager-win32.h"
diff --git a/external_imported/vcpkg/ports/gtk/0004-macos-build.patch b/external_imported/vcpkg/ports/gtk/0004-macos-build.patch
deleted file mode 100644
index e49086ced..000000000
--- a/external_imported/vcpkg/ports/gtk/0004-macos-build.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u a/gdk/macos/gdkmacoseventsource-private.h b/gdk/macos/gdkmacoseventsource-private.h
---- a/gdk/macos/gdkmacoseventsource-private.h
-+++ b/gdk/macos/gdkmacoseventsource-private.h
-@@ -24,6 +24,8 @@
-
- #include "gdkmacosdisplay.h"
-
-+#include "gdk-private.h"
-+
- G_BEGIN_DECLS
-
- typedef enum
diff --git a/external_imported/vcpkg/ports/gtk/portfile.cmake b/external_imported/vcpkg/ports/gtk/portfile.cmake
index 80bd9f79c..9b1f9c966 100644
--- a/external_imported/vcpkg/ports/gtk/portfile.cmake
+++ b/external_imported/vcpkg/ports/gtk/portfile.cmake
@@ -2,13 +2,11 @@ vcpkg_from_gitlab(
     GITLAB_URL https://gitlab.gnome.org/
     OUT_SOURCE_PATH SOURCE_PATH
     REPO GNOME/gtk
-    REF  73bea05c3386075528542c2714790199f2bb5861 #v4.6.8
-    SHA512 5e7b994d1e26a4d97bd5788b61ca3a43a04c96c10161d29e185d5854b925e07b1bba5f1e35509d4df078f918bb6cc7149bcb720aaec8c04e5d8254280c0076ed
+    REF ${VERSION}
+    SHA512 f219ddc6f46061f516f99a3845f344269d51d7fc2554773f7d4cee7833c5be26ce809262466d18c2804559834eb595f0d802b6fc80d77b7e8bf046e4c1293d64
     HEAD_REF master # branch name
     PATCHES
         0001-build.patch
-        0002-windows-build.patch
-        0004-macos-build.patch
 )
 
 vcpkg_find_acquire_program(PKGCONFIG)
@@ -35,9 +33,6 @@ list(APPEND OPTIONS -Dwin32-backend=${win32}) #Enable the Windows gdk backend (o
 list(APPEND OPTIONS -Dmacos-backend=${osx}) #Enable the macOS gdk backend (only when building on macOS)
 
 if("introspection" IN_LIST FEATURES)
-    if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-        message(FATAL_ERROR "Feature introspection currently only supports dynamic build.")
-    endif()
     list(APPEND OPTIONS_DEBUG -Dintrospection=disabled)
     list(APPEND OPTIONS_RELEASE -Dintrospection=enabled)
 else()
@@ -55,9 +50,9 @@ vcpkg_configure_meson(
     OPTIONS
         ${OPTIONS}
         -Ddemos=false
+        -Dbuild-testsuite=false
         -Dbuild-examples=false
         -Dbuild-tests=false
-        -Dinstall-tests=false
         -Dgtk_doc=false
         -Dman-pages=false
         -Dmedia-ffmpeg=disabled     # Build the ffmpeg media backend
@@ -68,20 +63,12 @@ vcpkg_configure_meson(
         -Dsysprof=disabled          # include tracing support for sysprof
         -Dtracker=disabled          # Enable Tracker3 filechooser search
         -Dcolord=disabled           # Build colord support for the CUPS printing backend
+        -Df16c=disabled             # Enable F16C fast paths (requires F16C)
     OPTIONS_DEBUG
         ${OPTIONS_DEBUG}
     OPTIONS_RELEASE
         ${OPTIONS_RELEASE}
-    ADDITIONAL_NATIVE_BINARIES
-        glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal'
-        glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums'
-        glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}'
-        gdbus-codegen='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/gdbus-codegen'
-        glib-compile-schemas='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-schemas${VCPKG_HOST_EXECUTABLE_SUFFIX}'
-        sassc='${CURRENT_HOST_INSTALLED_DIR}/tools/sassc/bin/sassc${VCPKG_HOST_EXECUTABLE_SUFFIX}'
-        g-ir-compiler='${CURRENT_HOST_INSTALLED_DIR}/tools/gobject-introspection/g-ir-compiler${VCPKG_HOST_EXECUTABLE_SUFFIX}'
-        g-ir-scanner='${GIR_TOOL_DIR}/tools/gobject-introspection/g-ir-scanner'
-    ADDITIONAL_CROSS_BINARIES
+    ADDITIONAL_BINARIES
         glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal'
         glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums'
         glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}'
@@ -94,45 +81,11 @@ vcpkg_configure_meson(
 
 vcpkg_install_meson(ADD_BIN_TO_PATH)
 
-# If somebody finds out how to access and forward env variables to
-# the meson install script be my guest. Nevertheless the script still
-# needs manual execution in the crosscompiling case.
-vcpkg_find_acquire_program(PYTHON3)
-foreach(_config release debug)
-    if(_config STREQUAL "release")
-        set(_short rel)
-        set(_path_suffix)
-    else()
-        set(_short dbg)
-        set(_path_suffix /debug)
-    endif()
-    if(NOT EXISTS "${CURRENT_PACKAGES_DIR}${_path_suffix}/lib")
-        continue()
-    endif()
-    message(STATUS "Running post install script: ${TARGET_TRIPLET}-${_short}")
-
-    set(PKGCONFIG_INSTALLED_DIR "${CURRENT_INSTALLED_DIR}${_path_suffix}/lib/pkgconfig/")
-    set(ENV{PKG_CONFIG_PATH} "${PKGCONFIG_INSTALLED_DIR}")
-    #file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}${_path_suffix}/lib/gtk-4.0/4.0.0/media")
-    #file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}${_path_suffix}/lib/gtk-4.0/4.0.0/immodules")
-    #file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}${_path_suffix}/lib/gtk-4.0/4.0.0/printbackends")
-    vcpkg_execute_required_process(
-        COMMAND "${PYTHON3}" "${SOURCE_PATH}/build-aux/meson/post-install.py" 4.0 4.0.0 "${CURRENT_PACKAGES_DIR}${_path_suffix}/lib" "${CURRENT_PACKAGES_DIR}${_path_suffix}/share" "${CURRENT_PACKAGES_DIR}${_path_suffix}/bin"
-        WORKING_DIRECTORY ${SOURCE_PATH}
-        LOGNAME post-install-${TARGET_TRIPLET}-${_short}
-    )
-    unset(ENV{PKG_CONFIG_PATH})
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}${_path_suffix}/lib/gtk-4.0")
-    #file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}${_path_suffix}/bin/gtk-4.0")
-    #file(RENAME "${CURRENT_PACKAGES_DIR}${_path_suffix}/lib/gtk-4.0/" "${CURRENT_PACKAGES_DIR}${_path_suffix}/bin/gtk-4.0")
-    message(STATUS "Post install ${TARGET_TRIPLET}-${_short} done")
-endforeach()
-
 vcpkg_copy_pdbs()
 
 vcpkg_fixup_pkgconfig()
 
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
 
 set(TOOL_NAMES gtk4-builder-tool
                gtk4-encode-symbolic-svg
diff --git a/external_imported/vcpkg/ports/gtk/vcpkg.json b/external_imported/vcpkg/ports/gtk/vcpkg.json
index 5388bfd59..b12107437 100644
--- a/external_imported/vcpkg/ports/gtk/vcpkg.json
+++ b/external_imported/vcpkg/ports/gtk/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "gtk",
-  "version": "4.6.8",
+  "version": "4.10.5",
   "port-version": 1,
   "description": "Portable library for creating graphical user interfaces.",
   "homepage": "https://www.gtk.org/",
   "license": "LGPL-2.0-only",
+  "supports": "!xbox",
   "dependencies": [
     "atk",
     {
@@ -38,6 +39,12 @@
       "host": true
     },
     "graphene",
+    {
+      "name": "harfbuzz",
+      "features": [
+        "glib"
+      ]
+    },
     "libepoxy",
     "pango",
     {
@@ -67,14 +74,6 @@
             "introspection"
           ]
         },
-        {
-          "name": "gobject-introspection",
-          "host": true
-        },
-        {
-          "name": "gobject-introspection",
-          "platform": "windows & x86"
-        },
         {
           "name": "graphene",
           "default-features": false,
diff --git a/external_imported/vcpkg/ports/gtk3/0001-build.patch b/external_imported/vcpkg/ports/gtk3/0001-build.patch
index 0f3d7b4ff..a68811826 100644
--- a/external_imported/vcpkg/ports/gtk3/0001-build.patch
+++ b/external_imported/vcpkg/ports/gtk3/0001-build.patch
@@ -8,6 +8,6 @@ index c599843..0cafd79 100644
  
 -if not meson.is_cross_build()
 +if false
-   if meson.version().version_compare('>=0.57.0')
-     gnome.post_install(
-       glib_compile_schemas: true,
+   gnome.post_install(
+     glib_compile_schemas: true,
+     gio_querymodules: gio_module_dirs,
diff --git a/external_imported/vcpkg/ports/gtk3/cairo-cpp-linkage.patch b/external_imported/vcpkg/ports/gtk3/cairo-cpp-linkage.patch
index 84260f9e8..c36a7aaeb 100644
--- a/external_imported/vcpkg/ports/gtk3/cairo-cpp-linkage.patch
+++ b/external_imported/vcpkg/ports/gtk3/cairo-cpp-linkage.patch
@@ -55,8 +55,8 @@ index 287f0cb..d35106f 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -1,4 +1,4 @@
--project('gtk+-3.0', 'c',
-+project('gtk+-3.0', 'c', 'cpp',
-         version: '3.24.34',
-         default_options: [
-           'buildtype=debugoptimized',
+-project('gtk+', 'c',
++project('gtk+', 'c', 'cpp',
+   version: '3.24.38',
+   default_options: [
+     'buildtype=debugoptimized',
diff --git a/external_imported/vcpkg/ports/gtk3/portfile.cmake b/external_imported/vcpkg/ports/gtk3/portfile.cmake
index cad4bcba9..400aefd6f 100644
--- a/external_imported/vcpkg/ports/gtk3/portfile.cmake
+++ b/external_imported/vcpkg/ports/gtk3/portfile.cmake
@@ -6,13 +6,12 @@ if(buildtrees_path_length GREATER warning_length AND CMAKE_HOST_WIN32)
     )
 endif()
 
-vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
 vcpkg_from_gitlab(
     OUT_SOURCE_PATH SOURCE_PATH
     GITLAB_URL https://gitlab.gnome.org
     REPO GNOME/gtk
     REF "${VERSION}"
-    SHA512 20a91e30a89070461af06b33829bc723b348806b4a785d0743af8bd4789b55dade24686e08bf1b2f0335240463aacc040134babb0605b809186b15de9cf261e4
+    SHA512 ffb52ee34074be6e88fda40a025044b653d05b69c35819eed159a020a6f1c881a83735aa7bec943470c465328bb3bb20b34afeb3b98cdcfca9d2eaaed3ab61ef
     PATCHES
         0001-build.patch
         cairo-cpp-linkage.patch
@@ -25,22 +24,24 @@ vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/glib/")
 vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/gdk-pixbuf")
 vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/gettext/bin")
 
+
+vcpkg_list(SET ADDITIONAL_BINARIES)
 if("introspection" IN_LIST FEATURES)
-    if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-        message(FATAL_ERROR "Feature introspection currently only supports dynamic build.")
-    endif()
     list(APPEND OPTIONS_DEBUG -Dintrospection=false)
     list(APPEND OPTIONS_RELEASE -Dintrospection=true)
+    if(CMAKE_HOST_WIN32 AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
+        set(GIR_TOOL_DIR "${CURRENT_INSTALLED_DIR}")
+    else()
+        set(GIR_TOOL_DIR "${CURRENT_HOST_INSTALLED_DIR}")
+    endif()
+    vcpkg_list(APPEND ADDITIONAL_BINARIES
+        "g-ir-compiler='${CURRENT_HOST_INSTALLED_DIR}/tools/gobject-introspection/g-ir-compiler${VCPKG_HOST_EXECUTABLE_SUFFIX}'"
+        "g-ir-scanner='${GIR_TOOL_DIR}/tools/gobject-introspection/g-ir-scanner'"
+    )
 else()
     list(APPEND OPTIONS -Dintrospection=false)
 endif()
 
-if(CMAKE_HOST_WIN32 AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
-    set(GIR_TOOL_DIR ${CURRENT_INSTALLED_DIR})
-else()
-    set(GIR_TOOL_DIR ${CURRENT_HOST_INSTALLED_DIR})
-endif()
-
 vcpkg_configure_meson(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
@@ -66,8 +67,7 @@ vcpkg_configure_meson(
         "glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}'"
         "gdbus-codegen='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/gdbus-codegen'"
         "glib-compile-schemas='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-schemas${VCPKG_HOST_EXECUTABLE_SUFFIX}'"
-        "g-ir-compiler='${CURRENT_HOST_INSTALLED_DIR}/tools/gobject-introspection/g-ir-compiler${VCPKG_HOST_EXECUTABLE_SUFFIX}'"
-        "g-ir-scanner='${GIR_TOOL_DIR}/tools/gobject-introspection/g-ir-scanner'"
+        ${ADDITIONAL_BINARIES}
 )
 
 # Reduce command line lengths, in particular for static windows builds.
diff --git a/external_imported/vcpkg/ports/gtk3/vcpkg.json b/external_imported/vcpkg/ports/gtk3/vcpkg.json
index 636da909c..a7e415148 100644
--- a/external_imported/vcpkg/ports/gtk3/vcpkg.json
+++ b/external_imported/vcpkg/ports/gtk3/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "gtk3",
-  "version": "3.24.34",
-  "port-version": 2,
+  "version": "3.24.38",
+  "port-version": 1,
   "description": "Portable library for creating graphical user interfaces.",
   "homepage": "https://www.gtk.org/",
   "license": null,
@@ -55,6 +55,7 @@
   "features": {
     "introspection": {
       "description": "build with introspection",
+      "supports": "!windows | !static",
       "dependencies": [
         {
           "name": "atk",
@@ -78,14 +79,6 @@
             "introspection"
           ]
         },
-        {
-          "name": "gobject-introspection",
-          "host": true
-        },
-        {
-          "name": "gobject-introspection",
-          "platform": "windows & x86"
-        },
         {
           "name": "pango",
           "default-features": false,
diff --git a/external_imported/vcpkg/ports/gtkmm/portfile.cmake b/external_imported/vcpkg/ports/gtkmm/portfile.cmake
index 634367eae..78652a8c9 100644
--- a/external_imported/vcpkg/ports/gtkmm/portfile.cmake
+++ b/external_imported/vcpkg/ports/gtkmm/portfile.cmake
@@ -1,11 +1,12 @@
+string(REGEX MATCH "^([0-9]*[.][0-9]*)" GTKMM_MAJOR_MINOR "${VERSION}")
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://ftp.gnome.org/pub/GNOME/sources/gtkmm/4.6/gtkmm-4.6.0.tar.xz"
-    FILENAME "gtkmm-4.6.0.tar.xz"
-    SHA512 d1040be44d133cfa016efc581b79c5303806d0d441b57dcc22bd84a05c3e7934f9b7b894e71d7f4a0be332daba3dd58ef558f58070b83bf8a9de7d1027d92199
+    URLS "https://ftp.gnome.org/pub/GNOME/sources/gtkmm/${GTKMM_MAJOR_MINOR}/gtkmm-${VERSION}.tar.xz"
+    FILENAME "gtkmm-${VERSION}.tar.xz"
+    SHA512 ee40cce37c34814884ffc06e614013d23fa31cac51ea9d98ea5689a08acc2ff58bb2ca80ba822d6fe3c0f3bdcb9ce2596ede3c05c69a702b524c4e38afc3d9ab
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE ${ARCHIVE}
 )
 
@@ -15,8 +16,8 @@ vcpkg_configure_meson(
         -Dmsvc14x-parallel-installable=false # Use separate DLL and LIB filenames for Visual Studio 2017 and 2019
         -Dbuild-tests=false
         -Dbuild-demos=false
-    ADDITIONAL_NATIVE_BINARIES glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}'
-    ADDITIONAL_CROSS_BINARIES  glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}'
+    ADDITIONAL_BINARIES
+        glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}'
 )
 
 vcpkg_install_meson()
diff --git a/external_imported/vcpkg/ports/gtkmm/vcpkg.json b/external_imported/vcpkg/ports/gtkmm/vcpkg.json
index 47cbec9f5..526afb0d8 100644
--- a/external_imported/vcpkg/ports/gtkmm/vcpkg.json
+++ b/external_imported/vcpkg/ports/gtkmm/vcpkg.json
@@ -1,26 +1,17 @@
 {
   "name": "gtkmm",
-  "version": "4.6.0",
+  "version": "4.10.0",
+  "port-version": 1,
   "description": "gtkmm is the official C++ interface for the popular GUI library GTK+.",
   "homepage": "https://www.gtkmm.org/",
   "license": "LGPL-3.0-or-later",
-  "supports": "!uwp",
+  "supports": "!uwp & !xbox",
   "dependencies": [
-    "atk",
-    "atkmm",
-    "cairo",
     "cairomm",
     "gdk-pixbuf",
-    "gettext",
-    "glib",
-    {
-      "name": "glib",
-      "host": true
-    },
     "glibmm",
     "gtk",
     "libepoxy",
-    "pango",
     "pangomm",
     {
       "name": "vcpkg-tool-meson",
diff --git a/external_imported/vcpkg/ports/gtl/portfile.cmake b/external_imported/vcpkg/ports/gtl/portfile.cmake
index 50956ea24..7574a81c3 100644
--- a/external_imported/vcpkg/ports/gtl/portfile.cmake
+++ b/external_imported/vcpkg/ports/gtl/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO greg7mdp/gtl
-    REF v1.1.5
-    SHA512 87666a975d3e355d24463f31bd7fe9796eb9e90b557b678807432fc3797a2b501e76acefae490cbaa503f993efe7f44c04a7cc8bd48662c38293c90741c8f7df
+    REF "v${VERSION}"
+    SHA512 c6ab1ae6bfdee7f4fa49ab6ea27138cfe7159b5b0fb918a65f27cc7fff74e632f2567508453d1767bc406ac6286ff3a12edeffd185b5b2acf0ef304d4175b86e
     HEAD_REF main
 )
 
diff --git a/external_imported/vcpkg/ports/gtl/vcpkg.json b/external_imported/vcpkg/ports/gtl/vcpkg.json
index f67c086d2..ddf392373 100644
--- a/external_imported/vcpkg/ports/gtl/vcpkg.json
+++ b/external_imported/vcpkg/ports/gtl/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "gtl",
-  "version": "1.1.5",
+  "version": "1.1.8",
   "description": "Greg's Template Library of useful classes.",
   "homepage": "https://github.com/greg7mdp/gtl",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/gts/CMakeLists.txt b/external_imported/vcpkg/ports/gts/CMakeLists.txt
index 295c0c6f7..b25af8fda 100644
--- a/external_imported/vcpkg/ports/gts/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/gts/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.14)
 
-project(gts C)
+project(gts VERSION "${VERSION}" LANGUAGES C)
 
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(GLIB2 glib-2.0 IMPORTED_TARGET)
@@ -8,17 +8,21 @@ pkg_check_modules(GLIB2 glib-2.0 IMPORTED_TARGET)
 if(WIN32)
     add_definitions(-DNATIVE_WIN32 -D_USE_MATH_DEFINES)
 else()
-    add_definitions(-DHAVE_FPU_CONTROL_H)
+    include(CheckIncludeFile)
+    check_include_file("fpu_control.h" HAVE_FPU_CONTROL_H)
+    if(HAVE_FPU_CONTROL_H)
+        add_definitions(-DHAVE_FPU_CONTROL_H)
+    endif()
 endif()
 
 add_definitions(
     -DGTS_COMPILATION
-    -DGTS_MAJOR_VERSION=0
-    -DGTS_MINOR_VERSION=7
-    -DGTS_MICRO_VERSION=6
+    -DGTS_MAJOR_VERSION=${PROJECT_VERSION_MAJOR}
+    -DGTS_MINOR_VERSION=${PROJECT_VERSION_MINOR}
+    -DGTS_MICRO_VERSION=${PROJECT_VERSION_PATCH}
     -DGTS_INTERFACE_AGE=1
     -DGTS_BINARY_AGE=1
-    -DGTS_VERSION=${GTS_MAJOR_VERSION}.${GTS_MINOR_VERSION}.${GTS_MICRO_VERSION}
+    -DGTS_VERSION=${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}
 )
 
 file(GLOB src src/*.c src/gts.def)
diff --git a/external_imported/vcpkg/ports/gts/fix-dllexport_2.patch b/external_imported/vcpkg/ports/gts/fix-dllexport_2.patch
deleted file mode 100644
index 52ad11cce..000000000
--- a/external_imported/vcpkg/ports/gts/fix-dllexport_2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/gts.h b/src/gts.h
-index 1b76915..ae1d888 100644
---- a/src/gts.h
-+++ b/src/gts.h
-@@ -38,7 +38,7 @@ extern "C" {
-  * we prefix variable declarations so they can
-  * properly get exported in windows dlls.
-  */
--#ifdef NATIVE_WIN32
-+#if 1
- #  ifdef GTS_COMPILATION
- #    define GTS_C_VAR __declspec(dllexport)
- #  else /* not GTS_COMPILATION */
diff --git a/external_imported/vcpkg/ports/gts/fix_missing_extern.patch b/external_imported/vcpkg/ports/gts/fix_missing_extern.patch
deleted file mode 100644
index 0e798c48e..000000000
--- a/external_imported/vcpkg/ports/gts/fix_missing_extern.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/gts.h b/src/gts.h
-index 1b7691531..1e87167bc 100644
---- a/src/gts.h
-+++ b/src/gts.h
-@@ -40,7 +40,7 @@ extern "C" {
-  */
- #if 1
- #  ifdef GTS_COMPILATION
--#    define GTS_C_VAR __declspec(dllexport)
-+#    define GTS_C_VAR extern __declspec(dllexport)
- #  else /* not GTS_COMPILATION */
- #    define GTS_C_VAR extern __declspec(dllimport)
- #  endif /* not GTS_COMPILATION */
diff --git a/external_imported/vcpkg/ports/gts/portfile.cmake b/external_imported/vcpkg/ports/gts/portfile.cmake
index 2f31dcd49..4695d9e8f 100644
--- a/external_imported/vcpkg/ports/gts/portfile.cmake
+++ b/external_imported/vcpkg/ports/gts/portfile.cmake
@@ -1,16 +1,11 @@
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    set(patches fix-dllexport.patch)
-elseif(VCPKG_TARGET_IS_WINDOWS)
-    set(patches fix-dllexport_2.patch fix_missing_extern.patch)
-endif()
-
 vcpkg_from_sourceforge(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO gts/gts
     REF 0.7.6
     FILENAME gts-0.7.6.tar.gz
     SHA512 645123b72dba3d04dad3c5d936d7e55947826be0fb25e84595368919b720deccddceb7c3b30865a5a40f2458254c2af793b7c014e6719cf07e7f8e6ff30890f8
-    PATCHES ${patches}
+    PATCHES
+        fix-dllexport.patch
 )
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
@@ -21,14 +16,14 @@ vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}"
+        "-DVERSION=${VERSION}"
 )
 
 vcpkg_cmake_install()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-
 vcpkg_fixup_pkgconfig()
 vcpkg_copy_pdbs()
 
-configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/gts/usage b/external_imported/vcpkg/ports/gts/usage
index ccd803ef8..f3acd8605 100644
--- a/external_imported/vcpkg/ports/gts/usage
+++ b/external_imported/vcpkg/ports/gts/usage
@@ -1,6 +1,5 @@
-The port gts supports consumption from CMake:
+gts can be imported via CMake FindPkgConfig module:
 
     find_package(PkgConfig REQUIRED)
-    pkg_check_modules(GTS gts REQUIRED)
-    target_compile_options(main PRIVATE ${GTS_CFLAGS})
-    target_link_libraries(main PRIVATE ${GTS_LDFLAGS})
+    pkg_check_modules(GTS gts REQUIRED IMPORTED_TARGET)
+    target_link_libraries(main PRIVATE PkgConfig::GTS)
diff --git a/external_imported/vcpkg/ports/gts/vcpkg.json b/external_imported/vcpkg/ports/gts/vcpkg.json
index 3b5549f3a..8686fb09e 100644
--- a/external_imported/vcpkg/ports/gts/vcpkg.json
+++ b/external_imported/vcpkg/ports/gts/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "gts",
   "version": "0.7.6",
-  "port-version": 7,
+  "port-version": 8,
   "description": "3D surfaces meshed with interconnected triangles",
-  "homepage": "http://gts.sourceforge.net/",
-  "supports": "!osx",
+  "homepage": "https://gts.sourceforge.net/",
+  "license": "LGPL-2.0-or-later",
   "dependencies": [
     "glib",
     {
diff --git a/external_imported/vcpkg/ports/gtsam/build-fixes.patch b/external_imported/vcpkg/ports/gtsam/build-fixes.patch
new file mode 100644
index 000000000..70d9a323b
--- /dev/null
+++ b/external_imported/vcpkg/ports/gtsam/build-fixes.patch
@@ -0,0 +1,73 @@
+diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in
+index cc2a7df8f..e11de1815 100644
+--- a/cmake/Config.cmake.in
++++ b/cmake/Config.cmake.in
+@@ -25,6 +25,14 @@ if(@GTSAM_USE_SYSTEM_EIGEN@)
+ find_dependency(Eigen3 REQUIRED)
+ endif()
+ 
++if(@GTSAM_USE_SYSTEM_METIS@)
++find_dependency(metis REQUIRED)
++endif()
++
++if(@GTSAM_USE_TBB@)
++find_dependency(TBB REQUIRED)
++endif()
++
+ # Load exports
+ include(${OUR_CMAKE_DIR}/@PACKAGE_NAME@-exports.cmake)
+ 
+diff --git a/cmake/FindTBB.cmake b/cmake/FindTBB.cmake
+index 0ecd4ca0e..725589a2d 100644
+--- a/cmake/FindTBB.cmake
++++ b/cmake/FindTBB.cmake
+@@ -1,3 +1,4 @@
++if(0)
+ # The MIT License (MIT)
+ #
+ # Copyright (c) 2015 Justus Calvin
+@@ -321,3 +322,4 @@ if(NOT TBB_FOUND)
+   unset(TBB_DEFAULT_SEARCH_DIR)
+ 
+ endif()
++endif()
+\ No newline at end of file
+diff --git a/cmake/HandleMetis.cmake b/cmake/HandleMetis.cmake
+index 5cbec4ff5..10dbb53de 100644
+--- a/cmake/HandleMetis.cmake
++++ b/cmake/HandleMetis.cmake
+@@ -13,10 +13,9 @@ option(GTSAM_USE_SYSTEM_METIS "Find and use system-installed libmetis. If 'off',
+ if(GTSAM_USE_SYSTEM_METIS)
+   # Debian package: libmetis-dev
+ 
+-  find_path(METIS_INCLUDE_DIR metis.h REQUIRED)
+-  find_library(METIS_LIBRARY metis REQUIRED)
++  find_package(metis CONFIG REQUIRED)
+ 
+-  if(METIS_INCLUDE_DIR AND METIS_LIBRARY)
++  if(metis_FOUND)
+     mark_as_advanced(METIS_INCLUDE_DIR)
+     mark_as_advanced(METIS_LIBRARY)
+ 
+@@ -27,7 +26,7 @@ if(GTSAM_USE_SYSTEM_METIS)
+       $<BUILD_INTERFACE:${GTSAM_SOURCE_DIR}/gtsam/3rdparty/metis/libmetis>
+       $<BUILD_INTERFACE:${GTSAM_SOURCE_DIR}/gtsam/3rdparty/metis/GKlib>
+     )
+-    target_link_libraries(metis-gtsam-if INTERFACE ${METIS_LIBRARY})
++    target_link_libraries(metis-gtsam-if INTERFACE ${METIS_LIBRARY} metis)
+   endif()
+ else()
+   # Bundled version:
+diff --git a/cmake/HandleTBB.cmake b/cmake/HandleTBB.cmake
+index fb944ba5b..393aeb345 100644
+--- a/cmake/HandleTBB.cmake
++++ b/cmake/HandleTBB.cmake
+@@ -14,7 +14,7 @@ if (GTSAM_WITH_TBB)
+         endif()
+         # all definitions and link requisites will go via imported targets:
+         # tbb & tbbmalloc
+-        list(APPEND GTSAM_ADDITIONAL_LIBRARIES tbb tbbmalloc)
++        list(APPEND GTSAM_ADDITIONAL_LIBRARIES TBB::tbb TBB::tbbmalloc)
+     else()
+         set(GTSAM_USE_TBB 0)  # This will go into config.h
+     endif()
diff --git a/external_imported/vcpkg/ports/gtsam/path-fixes.patch b/external_imported/vcpkg/ports/gtsam/path-fixes.patch
new file mode 100644
index 000000000..5fc9784e4
--- /dev/null
+++ b/external_imported/vcpkg/ports/gtsam/path-fixes.patch
@@ -0,0 +1,33 @@
+diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in
+index e11de1815..a25a9883d 100644
+--- a/cmake/Config.cmake.in
++++ b/cmake/Config.cmake.in
+@@ -4,13 +4,8 @@
+ 
+ # Compute paths
+ get_filename_component(OUR_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+-if(EXISTS "${OUR_CMAKE_DIR}/CMakeCache.txt")
+-  # In build tree
+-  set(@PACKAGE_NAME@_INCLUDE_DIR @GTSAM_SOURCE_DIR@ CACHE PATH "@PACKAGE_NAME@ include directory")
+-else()
+-  # Find installed library
+-  set(@PACKAGE_NAME@_INCLUDE_DIR "${OUR_CMAKE_DIR}/@CONF_REL_INCLUDE_DIR@" CACHE PATH "@PACKAGE_NAME@ include directory")
+-endif()
++# Find installed library
++set(@PACKAGE_NAME@_INCLUDE_DIR "${OUR_CMAKE_DIR}/@CONF_REL_INCLUDE_DIR@" CACHE PATH "@PACKAGE_NAME@ include directory")
+ 
+ # Find dependencies, required by cmake exported targets:
+ include(CMakeFindDependencyMacro)
+diff --git a/gtsam/config.h.in b/gtsam/config.h.in
+index d47329a62..60ca62931 100644
+--- a/gtsam/config.h.in
++++ b/gtsam/config.h.in
+@@ -25,7 +25,7 @@
+ #define GTSAM_VERSION_STRING "@GTSAM_VERSION_STRING@"
+ 
+ // Paths to example datasets distributed with GTSAM
+-#define GTSAM_SOURCE_TREE_DATASET_DIR "@GTSAM_SOURCE_DIR@/examples/Data"
++#define GTSAM_SOURCE_TREE_DATASET_DIR ""
+ #define GTSAM_INSTALLED_DATASET_DIR "@GTSAM_TOOLBOX_INSTALL_PATH@/gtsam_examples/Data"
+ 
+ // Whether GTSAM is compiled to use quaternions for Rot3 (otherwise uses rotation matrices)
diff --git a/external_imported/vcpkg/ports/gtsam/portfile.cmake b/external_imported/vcpkg/ports/gtsam/portfile.cmake
new file mode 100644
index 000000000..8b0be1ef2
--- /dev/null
+++ b/external_imported/vcpkg/ports/gtsam/portfile.cmake
@@ -0,0 +1,39 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO borglab/gtsam
+    REF ${VERSION}
+    SHA512 0aae0b785a3f7ae25008d0938848e93519786521cca9cd0cd1a8937ec5ac46f3b1ca1bfaaff1ca5812c92f8ef55b729a06c57632da5dd8fc38afc22d3047f8e0
+    HEAD_REF master    
+    PATCHES
+        build-fixes.patch
+        path-fixes.patch
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DGTSAM_BUILD_TESTS=OFF
+        -DGTSAM_BUILD_EXAMPLES_ALWAYS=OFF
+        -DGTSAM_BUILD_TIMING_ALWAYS=OFF
+        -DGTSAM_BUILD_UNSTABLE=OFF
+        -DGTSAM_UNSTABLE_BUILD_PYTHON=OFF
+        -DGTSAM_USE_SYSTEM_EIGEN=On
+        -DGTSAM_USE_SYSTEM_METIS=On
+        -DGTSAM_INSTALL_CPPUNITLITE=OFF
+        -DGTSAM_BUILD_TYPE_POSTFIXES=OFF
+        -DCMAKE_CXX_STANDARD=11 # Boost v1.84.0 libraries require C++11
+)
+
+vcpkg_cmake_install()
+if (WIN32)
+    vcpkg_cmake_config_fixup(PACKAGE_NAME GTSAM CONFIG_PATH CMAKE)
+else()
+    vcpkg_cmake_config_fixup(PACKAGE_NAME GTSAM CONFIG_PATH lib/cmake/GTSAM)
+endif()
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE" "${SOURCE_PATH}/LICENSE.BSD")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/gtsam/usage b/external_imported/vcpkg/ports/gtsam/usage
new file mode 100644
index 000000000..d184d35c0
--- /dev/null
+++ b/external_imported/vcpkg/ports/gtsam/usage
@@ -0,0 +1,4 @@
+The package gtsam is compatible with built-in CMake targets:
+
+    find_package(GTSAM CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE gtsam)
diff --git a/external_imported/vcpkg/ports/gtsam/vcpkg.json b/external_imported/vcpkg/ports/gtsam/vcpkg.json
new file mode 100644
index 000000000..f5cdf2f98
--- /dev/null
+++ b/external_imported/vcpkg/ports/gtsam/vcpkg.json
@@ -0,0 +1,34 @@
+{
+  "name": "gtsam",
+  "version-string": "4.2a9",
+  "port-version": 1,
+  "description": "GTSAM is a library of C++ classes that implement smoothing and mapping (SAM) in robotics and vision, using factor graphs and Bayes networks as the underlying computing paradigm rather than sparse matrices.",
+  "homepage": "https://github.com/borglab/gtsam",
+  "license": "BSD-3-Clause",
+  "dependencies": [
+    "boost-assign",
+    "boost-bimap",
+    "boost-date-time",
+    "boost-filesystem",
+    "boost-format",
+    "boost-graph",
+    "boost-math",
+    "boost-program-options",
+    "boost-regex",
+    "boost-serialization",
+    "boost-system",
+    "boost-thread",
+    "boost-timer",
+    "eigen3",
+    "metis",
+    "tbb",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/gul14/portfile.cmake b/external_imported/vcpkg/ports/gul14/portfile.cmake
index 5c43f7133..75a474ecc 100644
--- a/external_imported/vcpkg/ports/gul14/portfile.cmake
+++ b/external_imported/vcpkg/ports/gul14/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO gul-cpp/gul14
-    REF v2.7.1
-    SHA512 d926a0475911c16900479de156e7993eb3d007738bf78b6534e84b7f95b607b374d3340e568803eff5b0dd6c119bfc38cc63d5e7c0c0c5c58f1c78c79eb7ea9e
+    REF v2.10.0
+    SHA512 497e95a8bbd3a8060f3775de561afe755aac0054bd4279da6aea79b1bd35d111c41f92622a0a7e8ba99f6c5aa2dd3a2b2a10c2534482c36cf8c80d0b8ce3fe8a
     HEAD_REF main
 )
 
diff --git a/external_imported/vcpkg/ports/gul14/vcpkg.json b/external_imported/vcpkg/ports/gul14/vcpkg.json
index 7b97aad3a..cbef43fed 100644
--- a/external_imported/vcpkg/ports/gul14/vcpkg.json
+++ b/external_imported/vcpkg/ports/gul14/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "gul14",
-  "version": "2.7.1",
+  "version": "2.10.0",
   "description": [
     "General Utility Library for C++14.",
     "GUL14 contains often-used utility functions and types that form the foundation for other libraries and programs.",
@@ -9,7 +9,7 @@
   "homepage": "https://github.desy.de/gul-cpp/gul14.git",
   "documentation": "https://gul14.info",
   "license": "LGPL-2.1-or-later",
-  "supports": "!uwp",
+  "supports": "!uwp & !xbox",
   "dependencies": [
     {
       "name": "vcpkg-tool-meson",
diff --git a/external_imported/vcpkg/ports/gz-cmake3/dependencies.patch b/external_imported/vcpkg/ports/gz-cmake3/dependencies.patch
new file mode 100644
index 000000000..48d7c0e0a
--- /dev/null
+++ b/external_imported/vcpkg/ports/gz-cmake3/dependencies.patch
@@ -0,0 +1,213 @@
+diff --git a/cmake/FindFreeImage.cmake b/cmake/FindFreeImage.cmake
+index 8a5836e..7f926cc 100644
+--- a/cmake/FindFreeImage.cmake
++++ b/cmake/FindFreeImage.cmake
+@@ -23,7 +23,17 @@ set(minor_version ${FreeImage_FIND_VERSION_MINOR})
+ # Set the full version number
+ set(full_version ${major_version}.${minor_version})
+ 
+-if (NOT WIN32)
++if(FreeImage_FOUND)
++  # done  
++elseif(1)
++  find_package(freeimage CONFIG)
++  if(freeimage_FOUND)
++    set(FreeImage_FOUND 1)
++    set(FreeImage_LIBRARIES freeimage::FreeImage)
++    include(GzImportTarget)
++    gz_import_target(FreeImage INTERFACE)
++  endif()
++elseif(0)
+   include(GzPkgConfig)
+   gz_pkg_config_library_entry(FreeImage freeimage)
+ 
+diff --git a/cmake/FindGTS.cmake b/cmake/FindGTS.cmake
+index b400483..77f1247 100644
+--- a/cmake/FindGTS.cmake
++++ b/cmake/FindGTS.cmake
+@@ -16,7 +16,7 @@
+ ########################################
+ # Find GNU Triangulation Surface Library
+ 
+-if (NOT WIN32)
++if (1)
+   # Configuration using pkg-config modules
+   include(GzPkgConfig)
+   gz_pkg_check_modules(GTS gts)
+diff --git a/cmake/FindGzBullet.cmake b/cmake/FindGzBullet.cmake
+index 798d239..e7ee87c 100644
+--- a/cmake/FindGzBullet.cmake
++++ b/cmake/FindGzBullet.cmake
+@@ -31,7 +31,7 @@ endif()
+ # Bullet. Force MODULE mode to use the FindBullet.cmake file distributed with
+ # CMake. Otherwise, we may end up using the BulletConfig.cmake file distributed
+ # with Bullet, which uses relative paths and may break transitive dependencies.
+-find_package(Bullet MODULE ${gz_quiet_arg})
++find_package(Bullet CONFIG REQUIRED)
+ 
+ set(GzBullet_FOUND false)
+ # create Bullet target
+@@ -39,6 +39,7 @@ if(BULLET_FOUND)
+   set(GzBullet_FOUND true)
+ 
+   gz_import_target(GzBullet
++    INTERFACE
+     TARGET_NAME GzBullet::GzBullet
+     LIB_VAR BULLET_LIBRARIES
+     INCLUDE_VAR BULLET_INCLUDE_DIRS
+diff --git a/cmake/FindTINYXML2.cmake b/cmake/FindTINYXML2.cmake
+index 5a5a147..68ba2a3 100644
+--- a/cmake/FindTINYXML2.cmake
++++ b/cmake/FindTINYXML2.cmake
+@@ -18,11 +18,16 @@
+ 
+ include(GzPkgConfig)
+ 
+-# Use pkg_check_modules to start
+-gz_pkg_check_modules_quiet(TINYXML2 tinyxml2)
+ 
+ # If that failed, then fall back to manual detection (necessary for MacOS)
+ if(NOT TINYXML2_FOUND)
++  find_package(TINYXML2 NAMES tinyxml2)
++  if(TINYXML2_FOUND)
++    set(TINYXML2_LIBRARIES tinyxml2::tinyxml2)
++    include(GzImportTarget)
++    gz_import_target(TINYXML2 INTERFACE)
++  endif()
++elseif(0)
+ 
+   if(NOT TINYXML2_FIND_QUIETLY)
+     message(STATUS "Attempting manual search for tinyxml2")
+diff --git a/cmake/GzFindPackage.cmake b/cmake/GzFindPackage.cmake
+index 4eb7a0d..11dae8a 100644
+--- a/cmake/GzFindPackage.cmake
++++ b/cmake/GzFindPackage.cmake
+@@ -178,6 +178,7 @@ macro(gz_find_package PACKAGE_NAME_)
+     _gz_cmake_parse_arguments(gz_find_package "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+   endif()
+ 
++  include("${CMAKE_CURRENT_LIST_DIR}/vcpkg/${PACKAGE_NAME}.cmake" OPTIONAL)
+   #------------------------------------
+   # Construct the arguments to pass to find_package
+   set(${PACKAGE_NAME}_find_package_args ${PACKAGE_NAME})
+@@ -192,6 +193,8 @@ macro(gz_find_package PACKAGE_NAME_)
+ 
+   if(gz_find_package_EXACT)
+     list(APPEND ${PACKAGE_NAME}_find_package_args EXACT)
++  elseif(gz_find_package_VERSION AND NOT gz_find_package_PKGCONFIG_VER_COMPARISON)
++    set(gz_find_package_PKGCONFIG_VER_COMPARISON >=)
+   endif()
+ 
+   if(gz_find_package_CONFIG)
+@@ -388,7 +391,7 @@ macro(gz_find_package PACKAGE_NAME_)
+       # ${component}_CMAKE_DEPENDENCIES variables that are specific to those
+       # componenets
+       foreach(component ${gz_find_package_REQUIRED_BY})
+-        if(NOT ${component}_${PACKAGE_NAME}_PRIVATE)
++        if(NOT ${component}_${PACKAGE_NAME}_PRIVATE OR NOT BUILD_SHARED_LIBS)
+           gz_string_append(${component}_CMAKE_DEPENDENCIES "${${PACKAGE_NAME}_find_dependency}" DELIM "\n")
+         endif()
+       endforeach()
+diff --git a/cmake/FindGzOGRE2.cmake b/cmake/FindGzOGRE2.cmake
+--- a/cmake/FindGzOGRE2.cmake
++++ b/cmake/FindGzOGRE2.cmake
+@@ -143,11 +143,11 @@
+   endif ()
+ endmacro()
+ 
+ find_package(PkgConfig QUIET)
+-if (PkgConfig_FOUND)
++if (UNIX AND NOT APPLE)
+   set(PKG_CONFIG_PATH_ORIGINAL $ENV{PKG_CONFIG_PATH})
+-  foreach (GZ_OGRE2_PROJECT_NAME "OGRE2" "OGRE-Next")
++  foreach (GZ_OGRE2_PROJECT_NAME "OGRE-Next")
+     message(STATUS "Looking for OGRE using the name: ${GZ_OGRE2_PROJECT_NAME}")
+     if (GZ_OGRE2_PROJECT_NAME STREQUAL "OGRE2")
+       set(OGRE2_INSTALL_PATH "OGRE-2.${GzOGRE2_FIND_VERSION_MINOR}")
+       # For OGRE 2.3 debs built via OpenRobotics buildfarms, we use OgreNext
+@@ -172,8 +172,9 @@
+     if (${GZ_OGRE2_PROJECT_NAME}_FOUND)
+       set(GZ_PKG_NAME ${OGRE2_INSTALL_PATH})
+       set(OGRE2_FOUND ${${GZ_OGRE2_PROJECT_NAME}_FOUND})  # sync possible OGRE-Next to OGRE2
+       fix_pkgconfig_prefix_jammy_bug("${${GZ_OGRE2_PROJECT_NAME}_LIBRARY_DIRS}" OGRE2_LIBRARY_DIRS)
++      set(OGRE2_LIBRARY_DIRS ${${GZ_OGRE2_PROJECT_NAME}_LIBRARY_DIRS})
+       set(OGRE2_LIBRARIES ${${GZ_OGRE2_PROJECT_NAME}_LIBRARIES})  # sync possible Ogre-Next ot OGRE2
+     else()
+       # look for OGRE2 installed from source
+       set(PKG_CONFIG_PATH_TMP ${PKG_CONFIG_PATH_ORIGINAL})
+@@ -308,8 +309,10 @@
+           "${OGRE2LIBNAME}${component}_d.${OGRE2_VERSION}"
+           "${OGRE2LIBNAME}${component}_d"
+           "${OGRE2LIBNAME}${component}.${OGRE2_VERSION}"
+           "${OGRE2LIBNAME}${component}"
++          "${OGRE2LIBNAME}${component}Static"
++          "${OGRE2LIBNAME}${component}Static_d"          
+         HINTS ${OGRE2_LIBRARY_DIRS})
+       if (NOT "${OGRE2-${component}}" STREQUAL "OGRE2-${component}-NOTFOUND")
+         message(STATUS "  + component ${component}: found")
+         # create a new target for each component
+@@ -403,15 +406,23 @@
+   set(OGRE2_SEARCH_VER "OGRE-${GzOGRE2_FIND_VERSION_MAJOR}.${GzOGRE2_FIND_VERSION_MINOR}")
+   set(OGRE2_PATHS "")
+   set(OGRE2_INC_PATHS "")
+   foreach(_rootPath ${VCPKG_CMAKE_FIND_ROOT_PATH})
+-      list(APPEND OGRE2_PATHS "${_rootPath}/lib/${OGRE2_SEARCH_VER}/")
+-      list(APPEND OGRE2_PATHS "${_rootPath}/lib/${OGRE2_SEARCH_VER}/manual-link/")
+-      list(APPEND OGRE2_INC_PATHS "${_rootPath}/include/${OGRE2_SEARCH_VER}")
++      get_filename_component(debug_dir "${_rootPath}" NAME)
++      if(debug_dir MATCHES "debug" AND CMAKE_BUILD_TYPE MATCHES Debug OR NOT debug_dir MATCHES "debug" AND CMAKE_BUILD_TYPE MATCHES Release)
++        list(APPEND OGRE2_PATHS "${_rootPath}/lib/")
++        list(APPEND OGRE2_PATHS "${_rootPath}/lib/manual-link/")
++      endif()
++      list(APPEND OGRE2_INC_PATHS "${_rootPath}/include/OGRE-Next")
+   endforeach()
+ 
+   find_library(OGRE2_LIBRARY
+-    NAMES "OgreMain"
++    NAMES 
++     "OgreNextMain"
++     "OgreNextMainStatic"
++     "OgreNextMain_d"
++     "OgreNextMainStatic_d"
++    NAMES_PER_DIR
+     HINTS ${OGRE2_PATHS}
+     NO_DEFAULT_PATH)
+ 
+   find_path(OGRE2_INCLUDE
+@@ -449,10 +460,13 @@
+               ${PATH_HINTS} ${COMPONENT} ${OGRE2_SEARCH_VER}/${COMPONENT})
+ 
+       find_library(${PREFIX}_LIBRARY
+           NAMES
+-              "Ogre${COMPONENT}"
+-              "Ogre${COMPONENT}_d"
++              "OgreNext${COMPONENT}"
++              "OgreNext${COMPONENT}_d"
++              "OgreNext${COMPONENT}Static"
++              "OgreNext${COMPONENT}Static_d"
++              NAMES_PER_DIR
+           HINTS
+               ${OGRE2_LIBRARY_DIRS}
+           NO_DEFAULT_PATH)
+ 
+@@ -509,8 +522,9 @@
+ 
+   ogre_find_plugin(Plugin_ParticleFX OgreParticleFXPrerequisites.h PlugIns/ParticleFX/include)
+   ogre_find_plugin(RenderSystem_GL3Plus OgreGL3PlusRenderSystem.h RenderSystems/GL3Plus/include)
+   ogre_find_plugin(RenderSystem_Direct3D11 OgreD3D11RenderSystem.h RenderSystems/Direct3D11/include)
++  ogre_find_component(PlanarReflections OgrePlanarReflections.h PlanarReflections)
+ 
+   foreach(component ${GzOGRE2_FIND_COMPONENTS})
+     set(PREFIX OGRE2_${component})
+     if(${PREFIX}_FOUND)
+@@ -520,9 +534,9 @@
+       string(FIND ${component} "Hlms" HLMS_POS)
+       if(${HLMS_POS} GREATER -1)
+         foreach (dir ${OGRE2_INCLUDE_DIRS})
+           get_filename_component(dir_name "${dir}" NAME)
+-          if ("${dir_name}" STREQUAL "OGRE-${OGRE2_VERSION_MAJOR}.${OGRE2_VERSION_MINOR}")
++          if ("${dir_name}" STREQUAL "OGRE-Next")
+             set(dir_include "${dir}/Hlms/Common")
+             if (EXISTS ${dir_include})
+               list(APPEND component_INCLUDE_DIRS ${dir_include})
+             endif()
diff --git a/external_imported/vcpkg/ports/gz-cmake3/portfile.cmake b/external_imported/vcpkg/ports/gz-cmake3/portfile.cmake
new file mode 100644
index 000000000..c1665d6dd
--- /dev/null
+++ b/external_imported/vcpkg/ports/gz-cmake3/portfile.cmake
@@ -0,0 +1,13 @@
+set(PACKAGE_NAME cmake)
+
+ignition_modular_library(
+    NAME ${PACKAGE_NAME}
+    REF ${PORT}_${VERSION}
+    VERSION ${VERSION}
+    SHA512 30cf5aa69674bdc1a99762fc45d134b99da5e2faf846749392697ae41463a5304a43022bb0c2ca1b373af4171135d686fdd736573fe6e1cc26dc2cecc8333e69
+    PATCHES
+        dependencies.patch
+)
+
+file(COPY "${CURRENT_PORT_DIR}/vcpkg" DESTINATION "${CURRENT_PACKAGES_DIR}/share/cmake/gz-cmake3/cmake3")
+configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY)
diff --git a/external_imported/vcpkg/ports/gz-cmake3/usage b/external_imported/vcpkg/ports/gz-cmake3/usage
new file mode 100644
index 000000000..58c1899f0
--- /dev/null
+++ b/external_imported/vcpkg/ports/gz-cmake3/usage
@@ -0,0 +1,3 @@
+The package gz-cmake3 provides CMake integration:
+
+    find_package(gz-cmake3 CONFIG REQUIRED)
diff --git a/external_imported/vcpkg/ports/gz-cmake3/vcpkg.json b/external_imported/vcpkg/ports/gz-cmake3/vcpkg.json
new file mode 100644
index 000000000..7877778e3
--- /dev/null
+++ b/external_imported/vcpkg/ports/gz-cmake3/vcpkg.json
@@ -0,0 +1,14 @@
+{
+  "name": "gz-cmake3",
+  "version": "3.4.1",
+  "port-version": 5,
+  "description": "CMake helper functions for building robotic applications",
+  "homepage": "https://ignitionrobotics.org/libs/cmake",
+  "license": null,
+  "dependencies": [
+    {
+      "name": "ignition-modularscripts",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/gz-cmake3/vcpkg/GTS.cmake b/external_imported/vcpkg/ports/gz-cmake3/vcpkg/GTS.cmake
new file mode 100644
index 000000000..d4c2f02b4
--- /dev/null
+++ b/external_imported/vcpkg/ports/gz-cmake3/vcpkg/GTS.cmake
@@ -0,0 +1,3 @@
+if(NOT gz_find_package_PKGCONFIG)
+    set(gz_find_package_PKGCONFIG gts)
+endif()
diff --git a/external_imported/vcpkg/ports/gz-cmake3/vcpkg/TINYXML2.cmake b/external_imported/vcpkg/ports/gz-cmake3/vcpkg/TINYXML2.cmake
new file mode 100644
index 000000000..33b651e48
--- /dev/null
+++ b/external_imported/vcpkg/ports/gz-cmake3/vcpkg/TINYXML2.cmake
@@ -0,0 +1,3 @@
+if(NOT gz_find_package_PKGCONFIG)
+    set(gz_find_package_PKGCONFIG tinyxml2)
+endif()
diff --git a/external_imported/vcpkg/ports/gz-common5/gz_remotery_vis.patch b/external_imported/vcpkg/ports/gz-common5/gz_remotery_vis.patch
new file mode 100644
index 000000000..995338762
--- /dev/null
+++ b/external_imported/vcpkg/ports/gz-common5/gz_remotery_vis.patch
@@ -0,0 +1,12 @@
+diff --git a/profiler/src/CMakeLists.txt b/profiler/src/CMakeLists.txt
+--- a/profiler/src/CMakeLists.txt
++++ b/profiler/src/CMakeLists.txt
+@@ -116,7 +116,7 @@
+   install(PROGRAMS
+     ${CMAKE_CURRENT_BINARY_DIR}/gz_remotery_vis
+-    DESTINATION ${GZ_PROFILER_SCRIPT_PATH})
++    DESTINATION ${CMAKE_INSTALL_PREFIX}/tools/gz-common${PROJECT_VERSION_MAJOR})
+ 
+   install(DIRECTORY Remotery/vis/
+           DESTINATION ${GZ_PROFILER_VIS_PATH})
+ endif()
diff --git a/external_imported/vcpkg/ports/gz-common5/portfile.cmake b/external_imported/vcpkg/ports/gz-common5/portfile.cmake
new file mode 100644
index 000000000..186e67c69
--- /dev/null
+++ b/external_imported/vcpkg/ports/gz-common5/portfile.cmake
@@ -0,0 +1,25 @@
+set(PACKAGE_NAME common)
+
+ignition_modular_library(
+   NAME ${PACKAGE_NAME}
+   REF ${PORT}_${VERSION}
+   VERSION ${VERSION}
+   SHA512 40db4747db743005d7c43ca25cfe93cf68ee19201abcb165e72de37708b92fd88553b11520c420db33b37f4cab7e01e4d79c91c5dc0485146b7156284b8baaee
+   OPTIONS 
+      -DBUILD_TESTING=OFF
+      -DUSE_EXTERNAL_TINYXML2=ON
+      "-DPKG_CONFIG_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf${VCPKG_HOST_EXECUTABLE_SUFFIX}"
+   PATCHES
+      gz_remotery_vis.patch
+)
+
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/gz-common5-graphics/gz-common5-graphics-config.cmake" "find_package(GTS "
+"# Ensure that consumers get a pkg-config tool which is needed for GTS
+set(PKG_CONFIG_EXECUTABLE \"\${CMAKE_CURRENT_LIST_DIR}/../../../${HOST_TRIPLET}/tools/pkgconf/pkgconf${VCPKG_HOST_EXECUTABLE_SUFFIX}\" CACHE STRING vcpkg)
+find_package(GTS ")
+
+foreach(component IN ITEMS av events geospatial graphics io profiler testing)
+   if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/share/${PORT}-${component}/${PORT}-${component}-config.cmake")
+      message(FATAL_ERROR "Failed to install component ${component}. Check configuration logs for missing dependencies.")
+   endif()
+endforeach()
diff --git a/external_imported/vcpkg/ports/gz-common5/vcpkg.json b/external_imported/vcpkg/ports/gz-common5/vcpkg.json
new file mode 100644
index 000000000..bddcc5b99
--- /dev/null
+++ b/external_imported/vcpkg/ports/gz-common5/vcpkg.json
@@ -0,0 +1,35 @@
+{
+  "name": "gz-common5",
+  "version": "5.4.1",
+  "port-version": 1,
+  "description": "Common libraries for robotics applications",
+  "homepage": "https://ignitionrobotics.org/libs/common",
+  "license": "Apache-2.0",
+  "dependencies": [
+    "assimp",
+    {
+      "name": "dlfcn-win32",
+      "platform": "windows | uwp"
+    },
+    "ffmpeg",
+    "freeimage",
+    "gdal",
+    "gts",
+    "gz-cmake3",
+    "gz-math7",
+    {
+      "name": "ignition-modularscripts",
+      "host": true
+    },
+    {
+      "name": "libuuid",
+      "platform": "!windows & !osx"
+    },
+    {
+      "name": "pkgconf",
+      "host": true,
+      "default-features": false
+    },
+    "tinyxml2"
+  ]
+}
diff --git a/external_imported/vcpkg/ports/gz-fuel-tools8/portfile.cmake b/external_imported/vcpkg/ports/gz-fuel-tools8/portfile.cmake
new file mode 100644
index 000000000..cce4c1029
--- /dev/null
+++ b/external_imported/vcpkg/ports/gz-fuel-tools8/portfile.cmake
@@ -0,0 +1,11 @@
+set(PACKAGE_NAME fuel-tools)
+
+ignition_modular_library(
+   NAME ${PACKAGE_NAME}
+   REF ${PORT}_${VERSION}
+   VERSION ${VERSION}
+   SHA512 6a31719441c7ea835007d82b6aea99b10fa124ebad71683b8c1c58c41b435d4801e016464dc30d760cc9464e642dab4ff910375f5244ebf7c565845174e65cbf
+   OPTIONS 
+   PATCHES
+      remove_docs.patch
+)
diff --git a/external_imported/vcpkg/ports/gz-fuel-tools8/remove_docs.patch b/external_imported/vcpkg/ports/gz-fuel-tools8/remove_docs.patch
new file mode 100644
index 000000000..b8c3293e1
--- /dev/null
+++ b/external_imported/vcpkg/ports/gz-fuel-tools8/remove_docs.patch
@@ -0,0 +1,22 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -79,6 +79,8 @@
+ 
++if(0)
+ #============================================================================
+ # gz command line support
+ #============================================================================
+ add_subdirectory(conf)
++endif(0)
+ 
+@@ -95,7 +95,9 @@
+ 
++if(0)
+ gz_create_docs(
+   API_MAINPAGE_MD "${CMAKE_BINARY_DIR}/api.md"
+   TUTORIALS_MAINPAGE_MD "${CMAKE_BINARY_DIR}/tutorials.md"
+   TAGFILES
+    "${GZ-COMMON_DOXYGEN_TAGFILE} = ${GZ-COMMON_API_URL}"
+   )
++endif(0)
diff --git a/external_imported/vcpkg/ports/gz-fuel-tools8/vcpkg.json b/external_imported/vcpkg/ports/gz-fuel-tools8/vcpkg.json
new file mode 100644
index 000000000..f36144596
--- /dev/null
+++ b/external_imported/vcpkg/ports/gz-fuel-tools8/vcpkg.json
@@ -0,0 +1,21 @@
+{
+  "name": "gz-fuel-tools8",
+  "version": "8.1.0",
+  "description": "Tools for using fuel API to download robot models",
+  "homepage": "https://gazebosim.org/libs/fuel_tools",
+  "license": null,
+  "dependencies": [
+    "curl",
+    "gz-cmake3",
+    "gz-common5",
+    "gz-msgs9",
+    {
+      "name": "ignition-modularscripts",
+      "host": true
+    },
+    "jsoncpp",
+    "libyaml",
+    "libzip",
+    "tinyxml2"
+  ]
+}
diff --git a/external_imported/vcpkg/ports/gz-gui7/dependencies.patch b/external_imported/vcpkg/ports/gz-gui7/dependencies.patch
new file mode 100644
index 000000000..3d5d2f293
--- /dev/null
+++ b/external_imported/vcpkg/ports/gz-gui7/dependencies.patch
@@ -0,0 +1,22 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -80,13 +80,17 @@
+ set(GZ_TOOLS_VER 2)
+ 
+ #--------------------------------------
+ # Find QT
++set(qt_pkgconfig "Qt5Core Qt5Quick Qt5QuickControls2 Qt5Widgets")
++if (WIN32)
++set(qt_pkgconfig "")
++endif()
+ gz_find_package (Qt5
+   COMPONENTS
+     Core
+     Quick
+     QuickControls2
+     Widgets
+   REQUIRED
+-  PKGCONFIG "Qt5Core Qt5Quick Qt5QuickControls2 Qt5Widgets"
++  PKGCONFIG ${qt_pkgconfig}
+ )
diff --git a/external_imported/vcpkg/ports/gz-gui7/portfile.cmake b/external_imported/vcpkg/ports/gz-gui7/portfile.cmake
new file mode 100644
index 000000000..c9a429822
--- /dev/null
+++ b/external_imported/vcpkg/ports/gz-gui7/portfile.cmake
@@ -0,0 +1,28 @@
+set(PACKAGE_NAME gui)
+
+ignition_modular_library(
+   NAME ${PACKAGE_NAME}
+   REF ${PORT}_${VERSION}
+   VERSION ${VERSION}
+   SHA512 29f37a31bbf90dd35f37e80053c1aff9fb404b7a09c8c10e640da505cc6261387e6ce77e3bf379a911e6131c684f866cf1ef8d83777112b3c7f148b1f95cc72f
+   OPTIONS 
+   PATCHES
+      dependencies.patch
+)
+
+if(VCPKG_TARGET_IS_WINDOWS)   
+   file(GLOB plugins "${CURRENT_PACKAGES_DIR}/lib/gz-gui-7/plugins/*.dll")
+   if (NOT plugins STREQUAL "")
+      file(COPY ${plugins} DESTINATION "${CURRENT_PACKAGES_DIR}/engine-plugins/")
+      file(REMOVE ${plugins})
+   endif()
+
+   file(GLOB plugins_debug "${CURRENT_PACKAGES_DIR}/debug/lib/gz-gui-7/plugins/*.dll")
+   if (NOT plugins_debug STREQUAL "")
+      file(COPY ${plugins_debug} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/engine-plugins/")
+      file(REMOVE ${plugins_debug})
+   endif()
+
+    # Lacking pc files for Qt
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
+endif()
diff --git a/external_imported/vcpkg/ports/gz-gui7/vcpkg.json b/external_imported/vcpkg/ports/gz-gui7/vcpkg.json
new file mode 100644
index 000000000..a70f34491
--- /dev/null
+++ b/external_imported/vcpkg/ports/gz-gui7/vcpkg.json
@@ -0,0 +1,32 @@
+{
+  "name": "gz-gui7",
+  "version": "7.2.1",
+  "description": "Gazebo GUI builds on top of Qt to provide widgets which are useful when developing robotics applications, such as a 3D view, plots, dashboard, etc, and can be used together in a convenient unified interface.",
+  "homepage": "https://gazebosim.org/libs/gui",
+  "license": "Apache-2.0",
+  "dependencies": [
+    "gz-cmake3",
+    "gz-common5",
+    "gz-math7",
+    "gz-msgs9",
+    "gz-plugin2",
+    "gz-rendering7",
+    "gz-transport12",
+    "gz-utils2",
+    {
+      "name": "ignition-modularscripts",
+      "host": true
+    },
+    "protobuf",
+    {
+      "name": "qt5-base",
+      "default-features": false
+    },
+    {
+      "name": "qt5-quickcontrols2",
+      "default-features": false
+    },
+    "sdformat13",
+    "tinyxml2"
+  ]
+}
diff --git a/external_imported/vcpkg/ports/gz-math7/portfile.cmake b/external_imported/vcpkg/ports/gz-math7/portfile.cmake
new file mode 100644
index 000000000..3891614c7
--- /dev/null
+++ b/external_imported/vcpkg/ports/gz-math7/portfile.cmake
@@ -0,0 +1,12 @@
+set(PACKAGE_NAME math)
+
+ignition_modular_library(
+    NAME "${PACKAGE_NAME}"
+    REF "${PORT}_${VERSION}"
+    VERSION "${VERSION}"
+    SHA512 6d6e7c298f927110060882457f4ea379292f013b577f83a3a6f1fd68fc9cd7ea0bbef82cc0b9279373ab7af6e66f6ea2d8995669fa7d6d1fff13f8b8c857a6ed
+    OPTIONS
+        -DSKIP_SWIG=ON
+        -DSKIP_PYBIND11=ON
+        -DBUILD_DOCS=OFF
+)
diff --git a/external_imported/vcpkg/ports/gz-math7/vcpkg.json b/external_imported/vcpkg/ports/gz-math7/vcpkg.json
new file mode 100644
index 000000000..762e221fb
--- /dev/null
+++ b/external_imported/vcpkg/ports/gz-math7/vcpkg.json
@@ -0,0 +1,16 @@
+{
+  "name": "gz-math7",
+  "version": "7.3.0",
+  "description": "Math API for robotic applications",
+  "homepage": "https://ignitionrobotics.org/libs/math",
+  "license": null,
+  "dependencies": [
+    "eigen3",
+    "gz-cmake3",
+    "gz-utils2",
+    {
+      "name": "ignition-modularscripts",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/gz-msgs9/portfile.cmake b/external_imported/vcpkg/ports/gz-msgs9/portfile.cmake
new file mode 100644
index 000000000..c01438d24
--- /dev/null
+++ b/external_imported/vcpkg/ports/gz-msgs9/portfile.cmake
@@ -0,0 +1,15 @@
+set(PACKAGE_NAME msgs)
+
+vcpkg_find_acquire_program(PYTHON3)
+get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
+vcpkg_add_to_path("${PYTHON3_DIR}")
+
+ignition_modular_library(
+   NAME ${PACKAGE_NAME}
+   REF ${PORT}_${VERSION}
+   VERSION ${VERSION}
+   SHA512 669e60fc35868e4d86695104a58aecaef9ad08861cba97ff91c7306caf66ec237da46c0a13f5f59907371fc7a4dd56d5506fabe4ba97c393889fc5a9c2a101ee
+   OPTIONS 
+   PATCHES
+      remove_ruby.patch
+)
diff --git a/external_imported/vcpkg/ports/gz-msgs9/remove_ruby.patch b/external_imported/vcpkg/ports/gz-msgs9/remove_ruby.patch
new file mode 100644
index 000000000..d6b763412
--- /dev/null
+++ b/external_imported/vcpkg/ports/gz-msgs9/remove_ruby.patch
@@ -0,0 +1,17 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -102,5 +102,5 @@
+-  if(gz_msgs_protoc_GENERATE_RUBY)
++  if(0)
+     file(MAKE_DIRECTORY ${gz_msgs_protoc_OUTPUT_RUBY_DIR})
+     set(output_ruby "${gz_msgs_protoc_OUTPUT_RUBY_DIR}${proto_package_dir}/${FIL_WE}_pb.rb")
+     list(APPEND ${gz_msgs_protoc_OUTPUT_RUBY_VAR} ${output_ruby})
+     list(APPEND output_files ${output_ruby})
+@@ -126,5 +126,5 @@
+-  if(${gz_msgs_protoc_GENERATE_RUBY})
++  if(0)
+     list(APPEND GENERATE_ARGS
+       --generate-ruby
+       --output-ruby-path "${gz_msgs_protoc_OUTPUT_RUBY_DIR}")
+   endif()
diff --git a/external_imported/vcpkg/ports/gz-msgs9/vcpkg.json b/external_imported/vcpkg/ports/gz-msgs9/vcpkg.json
new file mode 100644
index 000000000..d854172cd
--- /dev/null
+++ b/external_imported/vcpkg/ports/gz-msgs9/vcpkg.json
@@ -0,0 +1,17 @@
+{
+  "name": "gz-msgs9",
+  "version": "9.5.0",
+  "description": "Middleware protobuf messages for robotics",
+  "license": "Apache-2.0",
+  "supports": "!(android | arm | uwp)",
+  "dependencies": [
+    "gz-cmake3",
+    "gz-math7",
+    {
+      "name": "ignition-modularscripts",
+      "host": true
+    },
+    "protobuf",
+    "tinyxml2"
+  ]
+}
diff --git a/external_imported/vcpkg/ports/gz-physics6/dependencies.patch b/external_imported/vcpkg/ports/gz-physics6/dependencies.patch
new file mode 100644
index 000000000..16cc09e3d
--- /dev/null
+++ b/external_imported/vcpkg/ports/gz-physics6/dependencies.patch
@@ -0,0 +1,21 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -73,9 +73,8 @@
+     collision-bullet
+     collision-ode
+     utils
+     utils-urdf
+   CONFIG
+   VERSION 6.9
+   REQUIRED_BY dartsim
+-  PKGCONFIG dart
+   PKGCONFIG_VER_COMPARISON >=)
+@@ -82,7 +82,6 @@
+ #--------------------------------------
+ # Find bullet for the bullet plugin wrapper
+ gz_find_package(GzBullet
+   VERSION 2.87
+   REQUIRED_BY bullet bullet-featherstone
+-  PKGCONFIG bullet
+   PKGCONFIG_VER_COMPARISON >=)
diff --git a/external_imported/vcpkg/ports/gz-physics6/portfile.cmake b/external_imported/vcpkg/ports/gz-physics6/portfile.cmake
new file mode 100644
index 000000000..d6b1087a8
--- /dev/null
+++ b/external_imported/vcpkg/ports/gz-physics6/portfile.cmake
@@ -0,0 +1,25 @@
+set(PACKAGE_NAME physics)
+
+ignition_modular_library(
+   NAME ${PACKAGE_NAME}
+   REF ${PORT}_${VERSION}
+   VERSION ${VERSION}
+   SHA512 c29594663509234e25c7d0a33848c0fe222c2b9471513978c18ea6873a17c66c43b4037c74e8849995fa6449c2dddc0f2ee669605893daf65119c277a17f39e1
+   OPTIONS 
+   PATCHES
+      dependencies.patch
+)
+
+if(VCPKG_TARGET_IS_WINDOWS)   
+   file(GLOB plugins "${CURRENT_PACKAGES_DIR}/lib/gz-physics-6/engine-plugins/*.dll")
+   if (NOT plugins STREQUAL "")
+      file(COPY ${plugins} DESTINATION "${CURRENT_PACKAGES_DIR}/engine-plugins/")
+      file(REMOVE ${plugins})
+   endif()
+
+   file(GLOB plugins_debug "${CURRENT_PACKAGES_DIR}/debug/lib/gz-physics-6/engine-plugins/*.dll")
+   if (NOT plugins_debug STREQUAL "")
+      file(COPY ${plugins_debug} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/engine-plugins/")
+      file(REMOVE ${plugins_debug})
+   endif()
+endif()
diff --git a/external_imported/vcpkg/ports/gz-physics6/vcpkg.json b/external_imported/vcpkg/ports/gz-physics6/vcpkg.json
new file mode 100644
index 000000000..e72fe3c34
--- /dev/null
+++ b/external_imported/vcpkg/ports/gz-physics6/vcpkg.json
@@ -0,0 +1,23 @@
+{
+  "name": "gz-physics6",
+  "version": "6.5.1",
+  "port-version": 1,
+  "description": "component of Gazebo, provides an abstract physics interface designed to support simulation and rapid development of robot applications.",
+  "homepage": "https://gazebosim.org/libs/physics",
+  "license": "Apache-2.0",
+  "dependencies": [
+    "bullet3",
+    "dartsim",
+    "eigen3",
+    "gz-cmake3",
+    "gz-common5",
+    "gz-math7",
+    "gz-plugin2",
+    "gz-utils2",
+    {
+      "name": "ignition-modularscripts",
+      "host": true
+    },
+    "sdformat13"
+  ]
+}
diff --git a/external_imported/vcpkg/ports/gz-plugin2/portfile.cmake b/external_imported/vcpkg/ports/gz-plugin2/portfile.cmake
new file mode 100644
index 000000000..58d3f6950
--- /dev/null
+++ b/external_imported/vcpkg/ports/gz-plugin2/portfile.cmake
@@ -0,0 +1,10 @@
+set(PACKAGE_NAME plugin)
+
+ignition_modular_library(
+   NAME ${PACKAGE_NAME}
+   REF ${PORT}_${VERSION}
+   VERSION ${VERSION}
+   SHA512 4c497291f8e33aae3a5752607a7fd7b48912e209f0f424ea7b1e6d35f27d1e920d1dd97ee64b7b3846d7d433618742be5d19352cbce8f6f63eccc83a086520ea
+   OPTIONS 
+   PATCHES
+)
diff --git a/external_imported/vcpkg/ports/gz-plugin2/vcpkg.json b/external_imported/vcpkg/ports/gz-plugin2/vcpkg.json
new file mode 100644
index 000000000..cf363c0f1
--- /dev/null
+++ b/external_imported/vcpkg/ports/gz-plugin2/vcpkg.json
@@ -0,0 +1,20 @@
+{
+  "name": "gz-plugin2",
+  "version": "2.0.1",
+  "description": "Library for registering plugin libraries and dynamically loading them at runtime",
+  "homepage": "https://ignitionrobotics.org/libs/plugin",
+  "license": null,
+  "supports": "!arm & !android",
+  "dependencies": [
+    {
+      "name": "dlfcn-win32",
+      "platform": "windows | uwp"
+    },
+    "gz-cmake3",
+    "gz-utils2",
+    {
+      "name": "ignition-modularscripts",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/gz-rendering7/fix-dependencies.patch b/external_imported/vcpkg/ports/gz-rendering7/fix-dependencies.patch
new file mode 100644
index 000000000..e55f35e67
--- /dev/null
+++ b/external_imported/vcpkg/ports/gz-rendering7/fix-dependencies.patch
@@ -0,0 +1,47 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -65,12 +65,12 @@
+ 
+ if (APPLE)
+   gz_find_package(OpenGL
+     REQUIRED_BY ogre ogre2
+-    PKGCONFIG gl)
++    )
+ else()
+   gz_find_package(OpenGL REQUIRED
+     COMPONENTS OpenGL
+     OPTIONAL_COMPONENTS EGL
+     REQUIRED_BY ogre ogre2
+-    PKGCONFIG gl)
++    PKGCONFIG opengl)
+ endif()
+@@ -81,5 +81,6 @@
+ 
+ #--------------------------------------
+ # Find OGRE
++if(0)
+ list(APPEND gz_ogre_components "RTShaderSystem" "Terrain" "Overlay" "Paging")
+ 
+@@ -97,5 +98,6 @@
+                       "The software might compile and even work but support from upstream"
+                       "could be reduced to accepting patches for newer versions")
+   endif()
+ endif()
++endif()
+ 
+diff --git a/ogre2/src/terrain/Terra/CMakeLists.txt b/ogre2/src/terrain/Terra/CMakeLists.txt
+--- a/ogre2/src/terrain/Terra/CMakeLists.txt
++++ b/ogre2/src/terrain/Terra/CMakeLists.txt
+@@ -34,8 +34,10 @@
+     # we must add this one manually for this to build correctly
+     ${OGRE2_INCLUDE}/Hlms/Pbs
+     ${OGRE2_INCLUDE}/Hlms/Common
+   PUBLIC
+-    ${CMAKE_CURRENT_LIST_DIR}/include
++    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>  
++    $<INSTALL_INTERFACE:include>
+ )
+ 
+ target_link_libraries(${PROJECT_NAME} PRIVATE GzOGRE2::GzOGRE2)
++install(TARGETS ${PROJECT_NAME} EXPORT gz-rendering7-ogre2)
diff --git a/external_imported/vcpkg/ports/gz-rendering7/portfile.cmake b/external_imported/vcpkg/ports/gz-rendering7/portfile.cmake
new file mode 100644
index 000000000..0797333d6
--- /dev/null
+++ b/external_imported/vcpkg/ports/gz-rendering7/portfile.cmake
@@ -0,0 +1,25 @@
+set(PACKAGE_NAME rendering)
+
+ignition_modular_library(
+   NAME ${PACKAGE_NAME}
+   REF ${PORT}_${VERSION}
+   VERSION ${VERSION}
+   SHA512 7c14b268694600b8529fef21130b34f516b26baac771c019b4248a67f84420c40d655e0abedf0b36c53b7cdf19941b3f4f3494696c831a83070632d004b30678
+   OPTIONS 
+   PATCHES
+      fix-dependencies.patch
+)
+
+if(VCPKG_TARGET_IS_WINDOWS)   
+   file(GLOB plugins "${CURRENT_PACKAGES_DIR}/lib/gz-rendering-7/engine-plugins/*.dll")
+   if (NOT plugins STREQUAL "")
+      file(COPY ${plugins} DESTINATION "${CURRENT_PACKAGES_DIR}/bin/engine-plugins/")
+      file(REMOVE ${plugins})
+   endif()
+
+   file(GLOB plugins_debug "${CURRENT_PACKAGES_DIR}/debug/lib/gz-rendering-7/engine-plugins/*.dll")
+   if (NOT plugins_debug STREQUAL "")
+      file(COPY ${plugins_debug} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/engine-plugins/")
+      file(REMOVE ${plugins_debug})
+   endif()
+endif()
diff --git a/external_imported/vcpkg/ports/gz-rendering7/vcpkg.json b/external_imported/vcpkg/ports/gz-rendering7/vcpkg.json
new file mode 100644
index 000000000..e96824ce5
--- /dev/null
+++ b/external_imported/vcpkg/ports/gz-rendering7/vcpkg.json
@@ -0,0 +1,27 @@
+{
+  "name": "gz-rendering7",
+  "version": "7.4.1",
+  "port-version": 1,
+  "description": "Gazebo Rendering is a C++ library designed to provide an abstraction for different rendering engines. It offers unified APIs for creating 3D graphics applications.",
+  "homepage": "https://gazebosim.org/libs/rendering",
+  "license": "Apache-2.0",
+  "dependencies": [
+    "freeimage",
+    "gz-cmake3",
+    "gz-common5",
+    "gz-math7",
+    "gz-plugin2",
+    "gz-utils2",
+    {
+      "name": "ignition-modularscripts",
+      "host": true
+    },
+    {
+      "name": "ogre-next",
+      "features": [
+        "planar-reflections"
+      ]
+    },
+    "opengl"
+  ]
+}
diff --git a/external_imported/vcpkg/ports/gz-sensors7/portfile.cmake b/external_imported/vcpkg/ports/gz-sensors7/portfile.cmake
new file mode 100644
index 000000000..babdef77c
--- /dev/null
+++ b/external_imported/vcpkg/ports/gz-sensors7/portfile.cmake
@@ -0,0 +1,10 @@
+set(PACKAGE_NAME sensors)
+
+ignition_modular_library(
+   NAME ${PACKAGE_NAME}
+   REF ${PORT}_${VERSION}
+   VERSION ${VERSION}
+   SHA512 968aab8d623c1716c4d0e164e70442e02ebe34f9277bcc48739c620124c80ba4896a846f9d052ac6d9b32b4d8805aee30b4f9c1248f75790de85718f659b6ff6
+   OPTIONS 
+   PATCHES
+)
diff --git a/external_imported/vcpkg/ports/gz-sensors7/vcpkg.json b/external_imported/vcpkg/ports/gz-sensors7/vcpkg.json
new file mode 100644
index 000000000..ccf330ba3
--- /dev/null
+++ b/external_imported/vcpkg/ports/gz-sensors7/vcpkg.json
@@ -0,0 +1,21 @@
+{
+  "name": "gz-sensors7",
+  "version": "7.3.0",
+  "description": "Component of Gazebo, provides numerous sensor models designed to generate realistic data from simulation environments.",
+  "homepage": "https://gazebosim.org/libs/sensors",
+  "license": "Apache-2.0",
+  "dependencies": [
+    "gz-cmake3",
+    "gz-common5",
+    "gz-math7",
+    "gz-msgs9",
+    "gz-rendering7",
+    "gz-transport12",
+    {
+      "name": "ignition-modularscripts",
+      "host": true
+    },
+    "protobuf",
+    "sdformat13"
+  ]
+}
diff --git a/external_imported/vcpkg/ports/gz-tools2/portfile.cmake b/external_imported/vcpkg/ports/gz-tools2/portfile.cmake
new file mode 100644
index 000000000..3b47a0ad5
--- /dev/null
+++ b/external_imported/vcpkg/ports/gz-tools2/portfile.cmake
@@ -0,0 +1,13 @@
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+set(PACKAGE_NAME tools)
+
+ignition_modular_library(NAME ${PACKAGE_NAME}
+                         REF ${PORT}_${VERSION}
+                         VERSION ${VERSION}
+                         SHA512 1b89048d09821db5a902758e133e6e73052941fdb9838daed5540267ef9203512170a031cf94a29564cac15133489609e83e965f31f930f7d7be477a8d9c2667
+                         PATCHES
+                        )
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
diff --git a/external_imported/vcpkg/ports/gz-tools2/vcpkg.json b/external_imported/vcpkg/ports/gz-tools2/vcpkg.json
new file mode 100644
index 000000000..aaed20b35
--- /dev/null
+++ b/external_imported/vcpkg/ports/gz-tools2/vcpkg.json
@@ -0,0 +1,16 @@
+{
+  "name": "gz-tools2",
+  "version": "2.0.0",
+  "port-version": 1,
+  "description": "Gazebo tools provide the ign command line tool that accepts multiple subcommands.",
+  "homepage": "https://gazebosim.org",
+  "license": "Apache-2.0",
+  "supports": "!(arm & windows) & !uwp",
+  "dependencies": [
+    "gz-cmake3",
+    {
+      "name": "ignition-modularscripts",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/gz-transport12/portfile.cmake b/external_imported/vcpkg/ports/gz-transport12/portfile.cmake
new file mode 100644
index 000000000..0cc1e635b
--- /dev/null
+++ b/external_imported/vcpkg/ports/gz-transport12/portfile.cmake
@@ -0,0 +1,11 @@
+set(PACKAGE_NAME transport)
+
+ignition_modular_library(
+   NAME ${PACKAGE_NAME}
+   REF ${PORT}_${VERSION}
+   VERSION ${VERSION}
+   SHA512 8f0c02b76579679d40b16bd19796e8ac84eaace6c70889fc703d4c234970be130ca1dd18f047c0b40acd46e8f9291f199b8558329a75a33fc61c235dfcb79f4d
+   OPTIONS 
+   PATCHES
+      uuid-osx.patch
+)
diff --git a/external_imported/vcpkg/ports/gz-transport12/uuid-osx.patch b/external_imported/vcpkg/ports/gz-transport12/uuid-osx.patch
new file mode 100644
index 000000000..97af93096
--- /dev/null
+++ b/external_imported/vcpkg/ports/gz-transport12/uuid-osx.patch
@@ -0,0 +1,28 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -72,8 +72,10 @@
+ #--------------------------------------
+ # Find uuid
+ if (MSVC)
+   message (STATUS "UUID: Using Windows RPC UuidCreate function\n")
++elseif (APPLE)
++  message (STATUS "Use system uuid header")
+ else()
+   gz_find_package(UUID REQUIRED)
+ endif()
+ 
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -20,9 +20,9 @@
+     $<TARGET_PROPERTY:protobuf::libprotobuf,INTERFACE_INCLUDE_DIRECTORIES>
+     $<TARGET_PROPERTY:CPPZMQ::CPPZMQ,INTERFACE_INCLUDE_DIRECTORIES>)
+ 
+ # Windows system library provides UUID
+-if (NOT MSVC)
++if (NOT MSVC AND NOT APPLE)
+   target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
+     PUBLIC
+       UUID::UUID
+   )
diff --git a/external_imported/vcpkg/ports/gz-transport12/vcpkg.json b/external_imported/vcpkg/ports/gz-transport12/vcpkg.json
new file mode 100644
index 000000000..43e3a8e70
--- /dev/null
+++ b/external_imported/vcpkg/ports/gz-transport12/vcpkg.json
@@ -0,0 +1,22 @@
+{
+  "name": "gz-transport12",
+  "version": "12.2.0",
+  "description": "Transport middleware for robotics",
+  "license": null,
+  "dependencies": [
+    "cppzmq",
+    "gz-cmake3",
+    "gz-msgs9",
+    {
+      "name": "ignition-modularscripts",
+      "host": true
+    },
+    {
+      "name": "libuuid",
+      "platform": "!windows & !uwp & !osx"
+    },
+    "protobuf",
+    "sqlite3",
+    "zeromq"
+  ]
+}
diff --git a/external_imported/vcpkg/ports/gz-utils2/portfile.cmake b/external_imported/vcpkg/ports/gz-utils2/portfile.cmake
new file mode 100644
index 000000000..8f3eef2e9
--- /dev/null
+++ b/external_imported/vcpkg/ports/gz-utils2/portfile.cmake
@@ -0,0 +1,8 @@
+set(PACKAGE_NAME utils)
+
+ignition_modular_library(NAME ${PACKAGE_NAME}
+                         REF ${PORT}_${VERSION}
+                         VERSION ${VERSION}
+                         SHA512 2e896e7106591a427fd5a732ba7dbfb329a3c0ec70601f5bf9b2390907e37b41837fd06696f4a93fb4ccc16a94a0221e4734e59f9fb1c7e5a016a076800d8214
+                         PATCHES
+                        )
diff --git a/external_imported/vcpkg/ports/gz-utils2/vcpkg.json b/external_imported/vcpkg/ports/gz-utils2/vcpkg.json
new file mode 100644
index 000000000..d546673ff
--- /dev/null
+++ b/external_imported/vcpkg/ports/gz-utils2/vcpkg.json
@@ -0,0 +1,14 @@
+{
+  "name": "gz-utils2",
+  "version": "2.0.0",
+  "description": "Ignition Utils, a component of Ignition Robotics, provides general purpose classes and functions designed for robotic applications.",
+  "homepage": "https://gazebosim.org",
+  "license": "Apache-2.0",
+  "dependencies": [
+    "gz-cmake3",
+    {
+      "name": "ignition-modularscripts",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/gzip-hpp/vcpkg.json b/external_imported/vcpkg/ports/gzip-hpp/vcpkg.json
index 96cb8d6f0..792eb14b7 100644
--- a/external_imported/vcpkg/ports/gzip-hpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/gzip-hpp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "gzip-hpp",
-  "version-string": "0.1.0",
-  "port-version": 1,
+  "version": "0.1.0",
+  "port-version": 2,
   "description": "Gzip header-only C++ library",
   "homepage": "https://github.com/mapbox/gzip-hpp/",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/h5py-lzf/portfile.cmake b/external_imported/vcpkg/ports/h5py-lzf/portfile.cmake
index 71b4709b8..2ab6ee701 100644
--- a/external_imported/vcpkg/ports/h5py-lzf/portfile.cmake
+++ b/external_imported/vcpkg/ports/h5py-lzf/portfile.cmake
@@ -16,19 +16,18 @@ vcpkg_from_github(
 		0001-disable-H5PLget_plugin-api.patch
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}/lzf)
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}/lzf")
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}/lzf
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}/lzf"
     OPTIONS
         -Dlink_hdf5_SHARED=${link_hdf5_SHARED}
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 vcpkg_copy_pdbs()
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/${PORT})
+vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/${PORT})
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
 
-configure_file(${SOURCE_PATH}/lzf/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+configure_file("${SOURCE_PATH}/lzf/LICENSE.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
diff --git a/external_imported/vcpkg/ports/h5py-lzf/vcpkg.json b/external_imported/vcpkg/ports/h5py-lzf/vcpkg.json
index eb203ee5f..0f61c61fb 100644
--- a/external_imported/vcpkg/ports/h5py-lzf/vcpkg.json
+++ b/external_imported/vcpkg/ports/h5py-lzf/vcpkg.json
@@ -1,10 +1,18 @@
 {
   "name": "h5py-lzf",
-  "version-string": "2019-12-04",
-  "port-version": 1,
+  "version-date": "2019-12-04",
+  "port-version": 3,
   "description": "The LZF filter is an alternative DEFLATE-style compressor for HDF5 datasets, using the free LZF library by Marc Alexander Lehmann.",
   "homepage": "https://github.com/h5py/h5py/tree/master/lzf",
   "dependencies": [
-    "hdf5"
+    "hdf5",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ]
 }
diff --git a/external_imported/vcpkg/ports/halide/portfile.cmake b/external_imported/vcpkg/ports/halide/portfile.cmake
index a9f4088d5..54ff0b5a6 100644
--- a/external_imported/vcpkg/ports/halide/portfile.cmake
+++ b/external_imported/vcpkg/ports/halide/portfile.cmake
@@ -1,13 +1,11 @@
 vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 
-set(HALIDE_VERSION_TAG v14.0.0)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO halide/Halide
-    REF ${HALIDE_VERSION_TAG}
-    SHA512 c7b1186cca545f30d038f1e9bb28ca7231023869d191c50722213da4c7e9adfd4a53129fe395cd7938cb7cb3fb1bf80f9cd3b4b8473a0246f15b9ad8d3e40fe2
-    HEAD_REF release/14.x
+    REF 6569a831f2ee7f1a2e3d809c36fb92514d710c44
+    SHA512 48c5a000719835d5119fd2c50b026c9125aeab4021641d2891b89ac8da3ec7c02c5f86837779dcae6e6bc8d929f6a182045bebe7e0990e33844b4d52f21df519
+    HEAD_REF main
 )
 
 vcpkg_check_features(
@@ -17,13 +15,14 @@ vcpkg_check_features(
         target-amdgpu TARGET_AMDGPU
         target-arm TARGET_ARM
         target-d3d12compute TARGET_D3D12COMPUTE
+        target-opengl-compute TARGET_OPENGLCOMPUTE
         target-hexagon TARGET_HEXAGON
         target-metal TARGET_METAL
-        target-mips TARGET_MIPS
         target-nvptx TARGET_NVPTX
         target-opencl TARGET_OPENCL
         target-powerpc TARGET_POWERPC
         target-riscv TARGET_RISCV
+        target-webassembly TARGET_WEBASSEMBLY
         target-x86 TARGET_X86
 )
 
@@ -37,26 +36,20 @@ vcpkg_cmake_configure(
         -DWITH_TESTS=OFF
         -DWITH_TUTORIALS=OFF
         -DWITH_UTILS=OFF
+        -DWITH_SERIALIZATION=OFF # Disable experimental serializer
         -DCMAKE_INSTALL_LIBDIR=bin
         "-DCMAKE_INSTALL_DATADIR=share/${PORT}"
         "-DHalide_INSTALL_CMAKEDIR=share/${PORT}"
         -DHalide_INSTALL_HELPERSDIR=share/HalideHelpers
         -DHalide_INSTALL_PLUGINDIR=bin
+        -DCMAKE_DISABLE_FIND_PACKAGE_PNG=TRUE
+        -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=JPEG
 )
 
 # ADD_BIN_TO_PATH needed to compile autoschedulers, 
 # which use Halide.dll (and deps) during the build.
 vcpkg_cmake_install(ADD_BIN_TO_PATH)
 
-vcpkg_copy_tools(
-    TOOL_NAMES
-        featurization_to_sample
-        get_host_target
-        retrain_cost_model
-        weightsdir_to_weightsfile
-    AUTO_CLEAN
-)
-
 # Release mode MODULE targets in CMake don't get PDBs.
 # Exclude those to avoid warning with default globs.
 vcpkg_copy_pdbs(
@@ -71,5 +64,5 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME HalideHelpers)
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
 configure_file("${CMAKE_CURRENT_LIST_DIR}/usage.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY)
diff --git a/external_imported/vcpkg/ports/halide/vcpkg.json b/external_imported/vcpkg/ports/halide/vcpkg.json
index cb79e2677..7b541db58 100644
--- a/external_imported/vcpkg/ports/halide/vcpkg.json
+++ b/external_imported/vcpkg/ports/halide/vcpkg.json
@@ -1,12 +1,43 @@
 {
   "name": "halide",
-  "version": "14.0.0",
+  "version": "16.0.0",
   "port-version": 1,
   "description": "Halide is a programming language designed to make it easier to write high-performance image and array processing code on modern machines.",
   "homepage": "https://github.com/halide/Halide",
   "license": "MIT",
   "supports": "!uwp",
   "dependencies": [
+    {
+      "name": "halide",
+      "default-features": false,
+      "features": [
+        "target-arm"
+      ],
+      "platform": "arm32"
+    },
+    {
+      "name": "halide",
+      "default-features": false,
+      "features": [
+        "target-aarch64"
+      ],
+      "platform": "arm64"
+    },
+    {
+      "name": "halide",
+      "default-features": false,
+      "features": [
+        "target-x86"
+      ],
+      "platform": "x86 | x64"
+    },
+    {
+      "name": "halide",
+      "features": [
+        "target-all"
+      ],
+      "platform": "!x86 & !x64 & !arm"
+    },
     {
       "name": "llvm",
       "default-features": false,
@@ -25,46 +56,7 @@
       "host": true
     }
   ],
-  "default-features": [
-    "jit"
-  ],
   "features": {
-    "jit": {
-      "description": "Include targets required for jit compilation",
-      "dependencies": [
-        {
-          "name": "halide",
-          "default-features": false,
-          "features": [
-            "target-aarch64"
-          ],
-          "platform": "arm64"
-        },
-        {
-          "name": "halide",
-          "default-features": false,
-          "features": [
-            "target-x86"
-          ],
-          "platform": "x86 | x64"
-        },
-        {
-          "name": "halide",
-          "default-features": false,
-          "features": [
-            "target-arm"
-          ],
-          "platform": "arm & !arm64"
-        },
-        {
-          "name": "halide",
-          "features": [
-            "target-all"
-          ],
-          "platform": "!x86 & !x64 & !arm & !arm64"
-        }
-      ]
-    },
     "target-aarch64": {
       "description": "Include AArch64 target",
       "dependencies": [
@@ -90,11 +82,12 @@
             "target-d3d12compute",
             "target-hexagon",
             "target-metal",
-            "target-mips",
             "target-nvptx",
             "target-opencl",
+            "target-opengl-compute",
             "target-powerpc",
             "target-riscv",
+            "target-webassembly",
             "target-x86"
           ]
         }
@@ -142,18 +135,6 @@
     "target-metal": {
       "description": "Include Metal target"
     },
-    "target-mips": {
-      "description": "Include Mips target",
-      "dependencies": [
-        {
-          "name": "llvm",
-          "default-features": false,
-          "features": [
-            "target-mips"
-          ]
-        }
-      ]
-    },
     "target-nvptx": {
       "description": "Include NVPTX target",
       "dependencies": [
@@ -169,6 +150,9 @@
     "target-opencl": {
       "description": "Include OpenCL-C target"
     },
+    "target-opengl-compute": {
+      "description": "Include OpenGL Compute target"
+    },
     "target-powerpc": {
       "description": "Include PowerPC target",
       "dependencies": [
@@ -193,6 +177,18 @@
         }
       ]
     },
+    "target-webassembly": {
+      "description": "Include WebAssembly target",
+      "dependencies": [
+        {
+          "name": "llvm",
+          "default-features": false,
+          "features": [
+            "target-webassembly"
+          ]
+        }
+      ]
+    },
     "target-x86": {
       "description": "Include X86 target",
       "dependencies": [
diff --git a/external_imported/vcpkg/ports/hareflow/fix-missing-headers.patch b/external_imported/vcpkg/ports/hareflow/fix-missing-headers.patch
new file mode 100644
index 000000000..0a1b268af
--- /dev/null
+++ b/external_imported/vcpkg/ports/hareflow/fix-missing-headers.patch
@@ -0,0 +1,25 @@
+diff --git a/include/hareflow/logging.h b/include/hareflow/logging.h
+index e67bd8f..cd5a402 100644
+--- a/include/hareflow/logging.h
++++ b/include/hareflow/logging.h
+@@ -3,6 +3,9 @@
+ #include <functional>
+ #include <shared_mutex>
+ #include <string>
++#include <string_view>
++#include <mutex>
++#include <utility>
+ 
+ #include <fmt/core.h>
+ 
+diff --git a/src/client_impl.cpp b/src/client_impl.cpp
+index f77042e..05af90d 100644
+--- a/src/client_impl.cpp
++++ b/src/client_impl.cpp
+@@ -1,5 +1,6 @@
+ #include "hareflow/detail/client_impl.h"
+ 
++#include <thread>
+ #include <fmt/core.h>
+ 
+ #include "hareflow/codec.h"
diff --git a/external_imported/vcpkg/ports/hareflow/portfile.cmake b/external_imported/vcpkg/ports/hareflow/portfile.cmake
index aca8ed9c0..545d1b073 100644
--- a/external_imported/vcpkg/ports/hareflow/portfile.cmake
+++ b/external_imported/vcpkg/ports/hareflow/portfile.cmake
@@ -4,6 +4,8 @@ vcpkg_from_github(
     REF a59406398c60d4908a9f894c187ef90370119594 # 0.1.0
     SHA512 ed9e3b54f879fed65cf7765b37951a0da04e99b09950316d9108ea35917d05b4733c5cb8f3c161e42f1baab5978affd4522e5b5028861b3f7d6cc0bfe0a40363
     HEAD_REF main
+    PATCHES
+        fix-missing-headers.patch # https://github.com/coveooss/hareflow/pull/9
 )
 
 if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS)
diff --git a/external_imported/vcpkg/ports/hareflow/vcpkg.json b/external_imported/vcpkg/ports/hareflow/vcpkg.json
index 7452a5ffe..cce00f3d4 100644
--- a/external_imported/vcpkg/ports/hareflow/vcpkg.json
+++ b/external_imported/vcpkg/ports/hareflow/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "hareflow",
   "version-semver": "0.1.0",
+  "port-version": 1,
   "description": "Hareflow: A RabbitMQ C++ stream client.",
   "homepage": "https://github.com/coveooss/hareflow",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/harfbuzz/fix-linux-error.patch b/external_imported/vcpkg/ports/harfbuzz/fix-linux-error.patch
deleted file mode 100644
index cd9b2263c..000000000
--- a/external_imported/vcpkg/ports/harfbuzz/fix-linux-error.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/util/hb-info.cc b/util/hb-info.cc
-index b3a8b35..e386124 100644
---- a/util/hb-info.cc
-+++ b/util/hb-info.cc
-@@ -847,6 +847,7 @@ struct info_t :
-       {
- 	hb_codepoint_t gid = 0;
- 	bool b = hb_font_get_variation_glyph (font, u, vs, &gid);
-+	(void)b;
- 	assert (b);
- 
- 	char glyphname[64];
diff --git a/external_imported/vcpkg/ports/harfbuzz/fix-win32-build.patch b/external_imported/vcpkg/ports/harfbuzz/fix-win32-build.patch
new file mode 100644
index 000000000..f8551e3af
--- /dev/null
+++ b/external_imported/vcpkg/ports/harfbuzz/fix-win32-build.patch
@@ -0,0 +1,26 @@
+diff --git a/src/meson.build b/src/meson.build
+index 87e8962..bdfa797 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -387,6 +387,11 @@ hb_subset_sources = files(
+   'hb-subset.hh',
+ )
+ 
++extra_hb_cpp_args = []
++if cpp.get_argument_syntax() == 'msvc'
++  extra_hb_cpp_args += ['/bigobj']
++endif
++
+ hb_subset_headers = files(
+   'hb-subset.h',
+   'hb-subset-repacker.h'
+@@ -559,8 +564,7 @@ defs_list = [harfbuzz_def]
+ 
+ version = '0.@0@.0'.format(hb_version_int)
+ 
+-extra_hb_cpp_args = []
+-if cpp.get_define('_MSC_FULL_VER') != ''
++if cpp.get_argument_syntax() == 'msvc'
+   if get_option('default_library') != 'static'
+     extra_hb_cpp_args += '-DHB_DLL_EXPORT'
+   endif
diff --git a/external_imported/vcpkg/ports/harfbuzz/harfbuzzConfig.cmake.in b/external_imported/vcpkg/ports/harfbuzz/harfbuzzConfig.cmake.in
index 8c69106d5..d072e5171 100644
--- a/external_imported/vcpkg/ports/harfbuzz/harfbuzzConfig.cmake.in
+++ b/external_imported/vcpkg/ports/harfbuzz/harfbuzzConfig.cmake.in
@@ -3,6 +3,8 @@ cmake_policy(SET CMP0012 NEW)
 cmake_policy(SET CMP0054 NEW)
 cmake_policy(SET CMP0057 NEW)
 
+include(CMakeFindDependencyMacro)
+
 # Traditional find module variables (vcpkg polyfill)
 set(HARFBUZZ_INCLUDE_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/harfbuzz" CACHE INTERNAL "")
 set(HARFBUZZ_INCLUDE_DIRS "${HARFBUZZ_INCLUDE_DIR}")
@@ -14,18 +16,25 @@ if(TARGET harfbuzz)
     return()
 endif()
 
-include(CMakeFindDependencyMacro)
-
-add_library(harfbuzz INTERFACE IMPORTED GLOBAL)
+add_library(harfbuzz UNKNOWN IMPORTED)
 add_library(harfbuzz::harfbuzz ALIAS harfbuzz)
 
 find_library(HARFBUZZ_LIBRARY_DEBUG NAMES harfbuzz PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH)
-if(HARFBUZZ_LIBRARY_DEBUG)
-    target_link_libraries(harfbuzz INTERFACE $<$<CONFIG:DEBUG>:${HARFBUZZ_LIBRARY_DEBUG}>)
-endif()
-
 find_library(HARFBUZZ_LIBRARY_RELEASE NAMES harfbuzz PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" PATH_SUFFIXES lib NO_DEFAULT_PATH)
-target_link_libraries(harfbuzz INTERFACE $<$<NOT:$<CONFIG:DEBUG>>:${HARFBUZZ_LIBRARY_RELEASE}>)
+if(NOT HARFBUZZ_LIBRARY_DEBUG)
+    set_target_properties(harfbuzz PROPERTIES
+        INTERFACE_INCLUDE_DIRECTORIES "${HARFBUZZ_INCLUDE_DIR}"
+        IMPORTED_CONFIGURATIONS "RELEASE"
+        IMPORTED_LOCATION_RELEASE "${HARFBUZZ_LIBRARY_RELEASE}"
+    )
+else()
+    set_target_properties(harfbuzz PROPERTIES
+        INTERFACE_INCLUDE_DIRECTORIES "${HARFBUZZ_INCLUDE_DIR}"
+        IMPORTED_CONFIGURATIONS "DEBUG;RELEASE"
+        IMPORTED_LOCATION_RELEASE "${HARFBUZZ_LIBRARY_RELEASE}"
+        IMPORTED_LOCATION_DEBUG "${HARFBUZZ_LIBRARY_DEBUG}"
+    )
+endif()
 
 set(HARFBUZZ_FEATURES @FEATURES@)
 
@@ -41,25 +50,21 @@ target_link_libraries(harfbuzz INTERFACE freetype)
 
 if ("graphite2" IN_LIST HARFBUZZ_FEATURES)
     find_library(GRAPHITE2_LIBRARY_DEBUG NAMES graphite2 PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH)
-    if(GRAPHITE2_LIBRARY_DEBUG)
-        target_link_libraries(harfbuzz INTERFACE $<$<CONFIG:DEBUG>:${GRAPHITE2_LIBRARY_DEBUG}>)
-    endif()
-
     find_library(GRAPHITE2_LIBRARY_RELEASE NAMES graphite2 PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" PATH_SUFFIXES lib NO_DEFAULT_PATH)
-    if(GRAPHITE2_LIBRARY_RELEASE)
-        target_link_libraries(harfbuzz INTERFACE $<$<NOT:$<CONFIG:DEBUG>>:${GRAPHITE2_LIBRARY_RELEASE}>)
+    if(NOT GRAPHITE2_LIBRARY_DEBUG)
+        target_link_libraries(harfbuzz INTERFACE "${GRAPHITE2_LIBRARY_RELEASE}")
+    else()
+        target_link_libraries(harfbuzz INTERFACE "$<$<NOT:$<CONFIG:DEBUG>>:${GRAPHITE2_LIBRARY_RELEASE}>$<$<CONFIG:DEBUG>:${GRAPHITE2_LIBRARY_DEBUG}>")
     endif()
 endif()
 
 if ("glib" IN_LIST HARFBUZZ_FEATURES)
     find_library(GLIB_LIBRARY_DEBUG NAMES glib glib-2.0 PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH)
-    if(GLIB_LIBRARY_DEBUG)
-        target_link_libraries(harfbuzz INTERFACE $<$<CONFIG:DEBUG>:${GLIB_LIBRARY_DEBUG}>)
-    endif()
-
     find_library(GLIB_LIBRARY_RELEASE NAMES glib glib-2.0 PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" PATH_SUFFIXES lib NO_DEFAULT_PATH)
-    if(GLIB_LIBRARY_RELEASE)
-        target_link_libraries(harfbuzz INTERFACE $<$<NOT:$<CONFIG:DEBUG>>:${GLIB_LIBRARY_RELEASE}>)
+    if(NOT GLIB_LIBRARY_DEBUG)
+        target_link_libraries(harfbuzz INTERFACE "${GLIB_LIBRARY_RELEASE}")
+    else()
+        target_link_libraries(harfbuzz INTERFACE "$<$<NOT:$<CONFIG:DEBUG>>:${GLIB_LIBRARY_RELEASE}>$<$<CONFIG:DEBUG>:${GLIB_LIBRARY_DEBUG}>")
     endif()
 endif()
 
@@ -67,5 +72,3 @@ if ("icu" IN_LIST HARFBUZZ_FEATURES)
     find_dependency(ICU 61 COMPONENTS uc)
     target_link_libraries(harfbuzz INTERFACE ICU::uc)
 endif()
-
-target_include_directories(harfbuzz INTERFACE "${HARFBUZZ_INCLUDE_DIR}")
diff --git a/external_imported/vcpkg/ports/harfbuzz/portfile.cmake b/external_imported/vcpkg/ports/harfbuzz/portfile.cmake
index dfbcef4ac..1fecbf681 100644
--- a/external_imported/vcpkg/ports/harfbuzz/portfile.cmake
+++ b/external_imported/vcpkg/ports/harfbuzz/portfile.cmake
@@ -2,10 +2,10 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO harfbuzz/harfbuzz
     REF ${VERSION}
-    SHA512 d7382cda95ac215fafe52d6fc0361affe3d9569a0faa178a553547a5baa168a42550a5918a0bbe30630559200c155839078ae26e7fca8bf32fa45c90ed79248f
+    SHA512 3fe54adbdd457c7dd8186c897436982a43e195a62bc0e830fe2dd06ca2c52511b9a717c659a7e30d235ac964df071e8ba1d9f36ee20496a1a80945d7c63fce86
     HEAD_REF master
     PATCHES
-        fix-linux-error.patch
+        fix-win32-build.patch
 )
 
 if("icu" IN_LIST FEATURES)
@@ -23,6 +23,11 @@ if("coretext" IN_LIST FEATURES)
 else()
     list(APPEND FEATURE_OPTIONS -Dcoretext=disabled)
 endif()
+if("directwrite" IN_LIST FEATURES)
+    list(APPEND FEATURE_OPTIONS -Ddirectwrite=enabled) # Enable DirectWrite support on Windows
+else()
+    list(APPEND FEATURE_OPTIONS -Ddirectwrite=disabled)
+endif()
 if("glib" IN_LIST FEATURES)
     list(APPEND FEATURE_OPTIONS -Dglib=enabled) # Enable GLib unicode functions
     list(APPEND FEATURE_OPTIONS -Dgobject=enabled) #Enable GObject bindings
@@ -30,16 +35,22 @@ else()
     list(APPEND FEATURE_OPTIONS -Dglib=disabled)
     list(APPEND FEATURE_OPTIONS -Dgobject=disabled)
 endif()
-list(APPEND FEATURE_OPTIONS -Dfreetype=enabled) #Enable freetype interop helpers
+if("cairo" IN_LIST FEATURES)
+    list(APPEND FEATURE_OPTIONS -Dcairo=enabled) # Enable Cairo graphics library support
+else()
+    list(APPEND FEATURE_OPTIONS -Dcairo=disabled)
+endif()
+if("freetype" IN_LIST FEATURES)
+    list(APPEND FEATURE_OPTIONS -Dfreetype=enabled) #Enable freetype interop helpers
+else()
+    list(APPEND FEATURE_OPTIONS -Dfreetype=disabled)
+endif()
 #if(VCPKG_TARGET_IS_WINDOWS)
     #link errors in qt5-base. probably requires changes to the pc files generated by meson
     #list(APPEND FEATURE_OPTIONS -Dgdi=enabled) # enable gdi helpers and uniscribe shaper backend (windows only)
 #endif()
 
 if("introspection" IN_LIST FEATURES)
-    if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-        message(FATAL_ERROR "Feature introspection currently only supports dynamic build.")
-    endif()
     list(APPEND OPTIONS_DEBUG -Dgobject=enabled -Dintrospection=disabled)
     list(APPEND OPTIONS_RELEASE -Dgobject=enabled -Dintrospection=enabled)
 else()
@@ -56,7 +67,6 @@ vcpkg_configure_meson(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         ${FEATURE_OPTIONS}
-        -Dcairo=disabled # Use Cairo graphics library
         -Ddocs=disabled          # Generate documentation with gtk-doc
         -Dtests=disabled
         -Dbenchmark=disabled
@@ -99,6 +109,9 @@ configure_file("${CMAKE_CURRENT_LIST_DIR}/harfbuzzConfig.cmake.in"
 vcpkg_list(SET TOOL_NAMES)
 if("glib" IN_LIST FEATURES)
     vcpkg_list(APPEND TOOL_NAMES hb-subset hb-shape hb-ot-shape-closure hb-info)
+    if("cairo" IN_LIST FEATURES)
+        vcpkg_list(APPEND TOOL_NAMES hb-view)
+    endif()
 endif()
 if(TOOL_NAMES)
     vcpkg_copy_tools(TOOL_NAMES ${TOOL_NAMES} AUTO_CLEAN)
diff --git a/external_imported/vcpkg/ports/harfbuzz/vcpkg.json b/external_imported/vcpkg/ports/harfbuzz/vcpkg.json
index 5296a5971..575e7e89d 100644
--- a/external_imported/vcpkg/ports/harfbuzz/vcpkg.json
+++ b/external_imported/vcpkg/ports/harfbuzz/vcpkg.json
@@ -1,15 +1,12 @@
 {
   "name": "harfbuzz",
-  "version": "7.0.0",
+  "version": "8.3.0",
+  "port-version": 3,
   "description": "HarfBuzz OpenType text shaping engine",
   "homepage": "https://github.com/harfbuzz/harfbuzz",
   "license": "MIT-Modern-Variant",
   "supports": "!uwp",
   "dependencies": [
-    {
-      "name": "freetype",
-      "default-features": false
-    },
     {
       "name": "gettext",
       "platform": "osx"
@@ -19,11 +16,39 @@
       "host": true
     }
   ],
+  "default-features": [
+    "freetype"
+  ],
   "features": {
+    "cairo": {
+      "description": "Enable Cairo graphics library support",
+      "dependencies": [
+        {
+          "name": "cairo",
+          "default-features": false,
+          "features": [
+            "freetype"
+          ]
+        }
+      ]
+    },
     "coretext": {
       "description": "Enable CoreText shaper backend on macOS",
       "supports": "osx"
     },
+    "directwrite": {
+      "description": "Enable DirectWrite support on Windows",
+      "supports": "windows"
+    },
+    "freetype": {
+      "description": "Enable FreeType support",
+      "dependencies": [
+        {
+          "name": "freetype",
+          "default-features": false
+        }
+      ]
+    },
     "glib": {
       "description": "Glib Unicode callbacks support",
       "dependencies": [
@@ -50,14 +75,7 @@
       "description": "build with introspection",
       "dependencies": [
         "glib",
-        {
-          "name": "gobject-introspection",
-          "host": true
-        },
-        {
-          "name": "gobject-introspection",
-          "platform": "windows & x86"
-        }
+        "gobject-introspection"
       ]
     }
   }
diff --git a/external_imported/vcpkg/ports/hayai/portfile.cmake b/external_imported/vcpkg/ports/hayai/portfile.cmake
index 4fa698d18..19d0c4ace 100644
--- a/external_imported/vcpkg/ports/hayai/portfile.cmake
+++ b/external_imported/vcpkg/ports/hayai/portfile.cmake
@@ -13,53 +13,52 @@ if(VCPKG_TARGET_IS_UWP)
     set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS")
 endif()
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DINSTALL_HAYAI=ON
         -DBUILD_HAYAI_TESTS=OFF
         -DBUILD_HAYAI_SAMPLES=OFF
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-if(EXISTS ${CURRENT_PACKAGES_DIR}/CMake)
-    vcpkg_fixup_cmake_targets(CONFIG_PATH CMake)
-elseif(EXISTS ${CURRENT_PACKAGES_DIR}/lib/CMake/${PORT})
-    vcpkg_fixup_cmake_targets(CONFIG_PATH lib/CMake/${PORT})
+if(EXISTS "${CURRENT_PACKAGES_DIR}/CMake")
+    vcpkg_cmake_config_fixup(CONFIG_PATH CMake)
+elseif(EXISTS "${CURRENT_PACKAGES_DIR}/lib/CMake/${PORT}")
+    vcpkg_cmake_config_fixup(CONFIG_PATH lib/CMake/${PORT})
 endif()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 # Handle manual-link libraries
-if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/hayai_main.lib)
-    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
+if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/hayai_main.lib")
+    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link")
     file(RENAME
-        ${CURRENT_PACKAGES_DIR}/debug/lib/hayai_main.lib
-        ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/hayai_main.lib
+        "${CURRENT_PACKAGES_DIR}/debug/lib/hayai_main.lib"
+        "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/hayai_main.lib"
     )
 
     vcpkg_replace_string(
-        ${CURRENT_PACKAGES_DIR}/share/${PORT}/hayai-targets-debug.cmake
+        "${CURRENT_PACKAGES_DIR}/share/${PORT}/hayai-targets-debug.cmake"
         "\${CMAKE_CURRENT_LIST_DIR}/../../debug/lib/hayai_main.lib"
         "\${CMAKE_CURRENT_LIST_DIR}/../../debug/lib/manual-link/hayai_main.lib"
     )
 endif()
 
-if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/hayai_main.lib)
-    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link)
+if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/hayai_main.lib")
+    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/manual-link")
     file(RENAME
-        ${CURRENT_PACKAGES_DIR}/lib/hayai_main.lib
-        ${CURRENT_PACKAGES_DIR}/lib/manual-link/hayai_main.lib
+        "${CURRENT_PACKAGES_DIR}/lib/hayai_main.lib"
+        "${CURRENT_PACKAGES_DIR}/lib/manual-link/hayai_main.lib"
     )
 
     vcpkg_replace_string(
-        ${CURRENT_PACKAGES_DIR}/share/${PORT}/hayai-targets-release.cmake
+        "${CURRENT_PACKAGES_DIR}/share/${PORT}/hayai-targets-release.cmake"
         "\${CMAKE_CURRENT_LIST_DIR}/../../lib/hayai_main.lib"
         "\${CMAKE_CURRENT_LIST_DIR}/../../lib/manual-link/hayai_main.lib"
     )
 endif()
 
 # Handle copyright
-configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+configure_file("${SOURCE_PATH}/LICENSE.md" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
diff --git a/external_imported/vcpkg/ports/hayai/vcpkg.json b/external_imported/vcpkg/ports/hayai/vcpkg.json
index 847c0d2fc..c69698cff 100644
--- a/external_imported/vcpkg/ports/hayai/vcpkg.json
+++ b/external_imported/vcpkg/ports/hayai/vcpkg.json
@@ -1,7 +1,17 @@
 {
   "name": "hayai",
-  "version-string": "2019-08-10",
-  "port-version": 1,
+  "version-date": "2019-08-10",
+  "port-version": 3,
   "description": "C++ benchmarking framework",
-  "homepage": "https://github.com/nickbruun/hayai"
+  "homepage": "https://github.com/nickbruun/hayai",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/hazelcast-cpp-client/portfile.cmake b/external_imported/vcpkg/ports/hazelcast-cpp-client/portfile.cmake
index 0e875292c..4e4e3da5b 100644
--- a/external_imported/vcpkg/ports/hazelcast-cpp-client/portfile.cmake
+++ b/external_imported/vcpkg/ports/hazelcast-cpp-client/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO hazelcast/hazelcast-cpp-client
     REF "v${VERSION}"
-    SHA512 1e4203b546f3737e7fd2ea7a7ed04fa5b0663e7c319ed796140407d4e56d70e40eb5a9497d9f9eb7be182b038efe36f6ba1a42f10d24d3732cf54886c40db8eb 
+    SHA512 9f6668fe88b1e10e1c91fea26acb12efab464f652d9008e43b06d92413a7bc4b66cd0ef00c0643ddf12c8d29b099cd767209a096e609fa214233dcc3288d194e
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/hazelcast-cpp-client/vcpkg.json b/external_imported/vcpkg/ports/hazelcast-cpp-client/vcpkg.json
index 76e68ef59..4f49b1c36 100644
--- a/external_imported/vcpkg/ports/hazelcast-cpp-client/vcpkg.json
+++ b/external_imported/vcpkg/ports/hazelcast-cpp-client/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "hazelcast-cpp-client",
-  "version": "5.2.0",
+  "version": "5.3.0",
   "description": "C++ client library for Hazelcast in-memory database.",
   "homepage": "https://github.com/hazelcast/hazelcast-cpp-client",
   "documentation": "http://hazelcast.github.io/hazelcast-cpp-client/index.html",
@@ -31,7 +31,7 @@
       "description": "Build examples for Hazelcast C++ client"
     },
     "openssl": {
-      "description": "Build hazelcast C++ client with SSL support",
+      "description": "Build Hazelcast C++ client with SSL support",
       "dependencies": [
         "openssl"
       ]
diff --git a/external_imported/vcpkg/ports/hdf5/hdf5_config.patch b/external_imported/vcpkg/ports/hdf5/hdf5_config.patch
index 65209dd48..9055a080b 100644
--- a/external_imported/vcpkg/ports/hdf5/hdf5_config.patch
+++ b/external_imported/vcpkg/ports/hdf5/hdf5_config.patch
@@ -2,29 +2,20 @@ diff --git a/config/cmake/hdf5-config.cmake.in b/config/cmake/hdf5-config.cmake.
 index 1a3fb7bbf2..79081ce040 100644
 --- a/config/cmake/hdf5-config.cmake.in
 +++ b/config/cmake/hdf5-config.cmake.in
-@@ -56,7 +56,10 @@ set (${HDF5_PACKAGE_NAME}_PARALLEL_FILTERED_WRITES "@PARALLEL_FILTERED_WRITES@")
- #-----------------------------------------------------------------------------
- # Dependencies
- #-----------------------------------------------------------------------------
-+include(CMakeFindDependencyMacro)
-+
- if (${HDF5_PACKAGE_NAME}_ENABLE_PARALLEL)
-+  find_dependency(MPI)
-   set (${HDF5_PACKAGE_NAME}_MPI_C_INCLUDE_PATH "@MPI_C_INCLUDE_DIRS@")
-   set (${HDF5_PACKAGE_NAME}_MPI_C_LIBRARIES    "@MPI_C_LIBRARIES@")
-   if (${HDF5_PACKAGE_NAME}_BUILD_FORTRAN)
-@@ -114,11 +117,11 @@ set (${HDF5_PACKAGE_NAME}_VERSION_MINOR  @HDF5_VERSION_MINOR@)
+@@ -120,12 +114,17 @@ set (${HDF5_PACKAGE_NAME}_VERSION_MINOR  @HDF5_VERSION_MINOR@)
+ # Don't include targets if this file is being picked up by another
  # project which has already built hdf5 as a subproject
  #-----------------------------------------------------------------------------
++include(CMakeFindDependencyMacro)
  if (NOT TARGET "@HDF5_PACKAGE@")
--  if (${HDF5_PACKAGE_NAME}_ENABLE_Z_LIB_SUPPORT AND ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS)
--    include (@PACKAGE_SHARE_INSTALL_DIR@/@ZLIB_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake)
-+  if (${HDF5_PACKAGE_NAME}_ENABLE_Z_LIB_SUPPORT)
+   if (${HDF5_PACKAGE_NAME}_ENABLE_Z_LIB_SUPPORT AND ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS)
+     include (@PACKAGE_SHARE_INSTALL_DIR@/@ZLIB_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake)
++  elseif (${HDF5_PACKAGE_NAME}_ENABLE_Z_LIB_SUPPORT)
 +    find_dependency(ZLIB)
    endif ()
--  if (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT AND ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS)
--    include (@PACKAGE_SHARE_INSTALL_DIR@/@SZIP_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake)
-+  if (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT)
+   if (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT AND ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS)
+     include (@PACKAGE_SHARE_INSTALL_DIR@/@LIBAEC_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake)
++  elseif (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT)
 +    find_dependency(szip)
    endif ()
    include (@PACKAGE_SHARE_INSTALL_DIR@/@HDF5_PACKAGE@@HDF_PACKAGE_EXT@-targets.cmake)
diff --git a/external_imported/vcpkg/ports/hdf5/pkgconfig-link-order.patch b/external_imported/vcpkg/ports/hdf5/pkgconfig-link-order.patch
deleted file mode 100644
index a3bcbb080..000000000
--- a/external_imported/vcpkg/ports/hdf5/pkgconfig-link-order.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/config/libhdf5.pc.in b/config/libhdf5.pc.in
-index 4a2ebaa..3cb42d2 100644
---- a/config/libhdf5.pc.in
-+++ b/config/libhdf5.pc.in
-@@ -10,5 +10,5 @@ Version: @_PKG_CONFIG_VERSION@
- Cflags: -I${includedir}
- Libs: -L${libdir} @_PKG_CONFIG_SH_LIBS@
- Requires: @_PKG_CONFIG_REQUIRES@
--Libs.private: @_PKG_CONFIG_LIBS_PRIVATE@ @_PKG_CONFIG_LIBS@
-+Libs.private: @_PKG_CONFIG_LIBS@ @_PKG_CONFIG_LIBS_PRIVATE@
- Requires.private: @_PKG_CONFIG_REQUIRES_PRIVATE@
diff --git a/external_imported/vcpkg/ports/hdf5/pkgconfig-requires.patch b/external_imported/vcpkg/ports/hdf5/pkgconfig-requires.patch
index 4dd70d121..a1e8470e0 100644
--- a/external_imported/vcpkg/ports/hdf5/pkgconfig-requires.patch
+++ b/external_imported/vcpkg/ports/hdf5/pkgconfig-requires.patch
@@ -2,22 +2,22 @@ diff --git a/CMakeFilters.cmake b/CMakeFilters.cmake
 index 141ab44..66b7efa 100644
 --- a/CMakeFilters.cmake
 +++ b/CMakeFilters.cmake
-@@ -74,6 +74,7 @@ if (HDF5_ENABLE_Z_LIB_SUPPORT)
-       set (H5_ZLIB_HEADER "zlib.h")
-       set (ZLIB_INCLUDE_DIR_GEN ${ZLIB_INCLUDE_DIR})
-       set (ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR})
-+      set (zlib_PC_LIBS_PRIVATE "${ZLIB_LIBRARIES}")
+@@ -95,6 +95,7 @@ if (HDF5_ENABLE_Z_LIB_SUPPORT)
+         set (ZLIB_INCLUDE_DIR_GEN ${ZLIB_INCLUDE_DIR})
+         set (ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR})
+         set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${ZLIB_LIBRARIES})
++        set (zlib_PC_LIBS_PRIVATE "${ZLIB_LIBRARIES}")
+       endif ()
      else ()
-       if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
-         EXTERNAL_ZLIB_LIBRARY (${HDF5_ALLOW_EXTERNAL_SUPPORT})
-@@ -134,6 +135,7 @@ if (HDF5_ENABLE_SZIP_SUPPORT)
-     else()
-       set(SZIP_STATIC_LIBRARY szip-static)
-     endif()
-+    set(szip_PC_LIBS_PRIVATE "${SZIP_STATIC_LIBRARY}")
-   else ()
-     if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
-       EXTERNAL_SZIP_LIBRARY (${HDF5_ALLOW_EXTERNAL_SUPPORT} ${HDF5_ENABLE_SZIP_ENCODING})
+       if (BUILD_ZLIB_WITH_FETCHCONTENT)
+@@ -148,6 +148,7 @@ if (HDF5_ENABLE_SZIP_SUPPORT)
+       if (TARGET szip-shared)
+         set(SZIP_LIBRARIES szip-shared)
+       endif()
++      set(szip_PC_LIBS_PRIVATE "${SZIP_LIBRARIES}")
+       if (NOT SZIP_FOUND)
+         find_package (SZIP) # Legacy find
+       endif ()
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 index b75fdd2..a2e88fd 100644
 --- a/CMakeLists.txt
@@ -44,128 +44,16 @@ index 1af513b47..05d56ccce 100644
      if (WIN32)
        set (CMAKE_DEBUG_POSTFIX "_D")
      else ()
-diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt
-index 835d422..9a7176f 100644
---- a/c++/src/CMakeLists.txt
-+++ b/c++/src/CMakeLists.txt
-@@ -188,10 +188,10 @@ set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}")
- if (NOT ONLY_SHARED_LIBS)
--  set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_CPP_LIB_CORENAME}")
-+  set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_CPP_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}")
- endif ()
- if (BUILD_SHARED_LIBS)
--  set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_CPP_LIB_CORENAME}")
-+  set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_CPP_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}")
- endif ()
- 
--set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}")
--set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}")
-+set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME}")
-+set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME}")
- 
-diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt
-index e59a829..8da64dd 100644
---- a/fortran/src/CMakeLists.txt
-+++ b/fortran/src/CMakeLists.txt
-@@ -549,13 +549,13 @@
- set (_PKG_CONFIG_LIBS_PRIVATE)
- 
- if (NOT ONLY_SHARED_LIBS)
--  set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_F90_LIB_CORENAME}")
-+  set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_F90_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}")
- endif ()
- if (BUILD_SHARED_LIBS)
--  set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_F90_LIB_CORENAME}")
-+  set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_F90_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}")
- endif ()
- 
--set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}")
--set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}")
-+set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME}")
-+set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME}")
- 
- configure_file (
-diff --git a/hl/c++/src/CMakeLists.txt b/hl/c++/src/CMakeLists.txt
-index c516df1..89bd31f 100644
---- a/hl/c++/src/CMakeLists.txt
-+++ b/hl/c++/src/CMakeLists.txt
-@@ -99,13 +99,13 @@ set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}")
- set (_PKG_CONFIG_LIBS_PRIVATE)
- 
- if (NOT ONLY_SHARED_LIBS)
--  set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_HL_CPP_LIB_CORENAME}")
-+  set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_HL_CPP_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}")
- endif ()
- if (BUILD_SHARED_LIBS)
--  set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_HL_CPP_LIB_CORENAME}")
-+  set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_HL_CPP_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}")
- endif ()
- 
--set (_PKG_CONFIG_REQUIRES "${HDF5_HL_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}")
--set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_HL_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}")
-+set (_PKG_CONFIG_REQUIRES "${HDF5_HL_LIB_CORENAME}")
-+set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_HL_LIB_CORENAME}")
- 
- configure_file (
-diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt
-index 973299f..8eadfe5 100644
---- a/hl/fortran/src/CMakeLists.txt
-+++ b/hl/fortran/src/CMakeLists.txt
-@@ -334,11 +334,11 @@
- if (NOT ONLY_SHARED_LIBS)
--  set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_HL_F90_LIB_CORENAME}")
-+  set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_HL_F90_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}")
- endif ()
- if (BUILD_SHARED_LIBS)
--  set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_HL_F90_LIB_CORENAME}")
-+  set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_HL_F90_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}")
- endif ()
- 
--set (_PKG_CONFIG_REQUIRES "${HDF5_F90_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}")
--set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_F90_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}")
-+set (_PKG_CONFIG_REQUIRES "${HDF5_F90_LIB_CORENAME}")
-+set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_F90_LIB_CORENAME}")
- 
- configure_file (
-diff --git a/hl/src/CMakeLists.txt b/hl/src/CMakeLists.txt
-index 7678de8..2d398cc 100644
---- a/hl/src/CMakeLists.txt
-+++ b/hl/src/CMakeLists.txt
-@@ -132,11 +132,11 @@
- if (NOT ONLY_SHARED_LIBS)
--  set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_HL_LIB_CORENAME}")
-+  set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_HL_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}")
- endif ()
- if (BUILD_SHARED_LIBS)
--  set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_HL_LIB_CORENAME}")
-+  set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_HL_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}")
- endif ()
- 
--set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}")
--set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}")
-+set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME}")
-+set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME}")
- 
- configure_file (
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
 index b3c2226..ea80d60 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -1321,14 +1321,23 @@ foreach (libs ${LINK_LIBS} ${LINK_COMP_LIBS})
- endforeach ()
- 
- if (NOT ONLY_SHARED_LIBS)
--  set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_LIB_CORENAME}")
-+  set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}")
- endif ()
- if (BUILD_SHARED_LIBS)
--  set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_LIB_CORENAME}")
-+  set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}")
+@@ -1321,6 +1321,16 @@ foreach (libs ${LINK_LIBS} ${LINK_COMP_LIBS})
  endif ()
  
  set (_PKG_CONFIG_REQUIRES)
- set (_PKG_CONFIG_REQUIRES_PRIVATE)
-+set(_PKG_CONFIG_LIBS_PRIVATE " ${_PKG_CONFIG_LIBS_PRIVATE} ")
++set (_PKG_CONFIG_REQUIRES_PRIVATE)
++set (_PKG_CONFIG_LIBS_PRIVATE " ${_PKG_CONFIG_LIBS_PRIVATE} ")
 +foreach(_module IN ITEMS ompi-c szip zlib)
 +    if(${_module}_PC_LIBS_PRIVATE)
 +        foreach(_lib IN LISTS ${_module}_PC_LIBS_PRIVATE)
diff --git a/external_imported/vcpkg/ports/hdf5/portfile.cmake b/external_imported/vcpkg/ports/hdf5/portfile.cmake
index 2e9701e38..77d4c6aa1 100644
--- a/external_imported/vcpkg/ports/hdf5/portfile.cmake
+++ b/external_imported/vcpkg/ports/hdf5/portfile.cmake
@@ -1,21 +1,21 @@
 # highfive should be updated together with hdf5
 
+string(REPLACE "." "_" hdf5_ref "hdf5-${VERSION}")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO  HDFGroup/hdf5
-    REF hdf5-1_14_0
-    SHA512 b4f694739a12220291d0704beb1cd29c05428af40b8dd89cef0ebf52ee4aecad7350b798a0deca2d30a4f32e7aaa49a9169464760a11339fa40da6a3dd0af49e
+    REF "${hdf5_ref}"
+    SHA512 9b44993bcdc1493a22da61c77a1bd962c0088ff8e7fb75c00568617386cfc296a73bbdae79c05847109bf1984e95660bbe459f8a96950f6cf71002800eed23f8
     HEAD_REF develop
     PATCHES
         hdf5_config.patch
         szip.patch
         pkgconfig-requires.patch
-        pkgconfig-link-order.patch
 )
 
 set(ALLOW_UNSUPPORTED OFF)
 if ("parallel" IN_LIST FEATURES AND "cpp" IN_LIST FEATURES)
-    message(WARNING "Feature 'Parallel' and 'cpp' are mutually exclusive, enable feature ALLOW_UNSUPPORTED automatically to enable them both.")
+    message(WARNING "Feature 'Parallel' and 'cpp' are mutually exclusive, enabling option ALLOW_UNSUPPORTED automatically to enable them both.")
     set(ALLOW_UNSUPPORTED ON)
 endif()
 
@@ -47,8 +47,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
         map          HDF5_ENABLE_MAP_API
 )
 
-file(REMOVE "${SOURCE_PATH}/config/cmake_ext_mod/FindSZIP.cmake")#Outdated; does not find debug szip
-
 if("tools" IN_LIST FEATURES AND VCPKG_CRT_LINKAGE STREQUAL "static")
     list(APPEND FEATURE_OPTIONS -DBUILD_STATIC_EXECS=ON)
 endif()
@@ -70,8 +68,8 @@ vcpkg_cmake_configure(
         -DHDF5_INSTALL_CMAKE_DIR=share/hdf5
         -DHDF_PACKAGE_NAMESPACE:STRING=hdf5::
         -DHDF5_MSVC_NAMING_CONVENTION=OFF
-        -DSZIP_USE_EXTERNAL=ON
         -DALLOW_UNSUPPORTED=${ALLOW_UNSUPPORTED}
+        -DCMAKE_DISABLE_FIND_PACKAGE_libaec=ON
     OPTIONS_RELEASE
         -DCMAKE_DEBUG_POSTFIX= # For lib name in pkgconfig files
 )
@@ -161,9 +159,12 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY)
-
-file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/data/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
+if("parallel" IN_LIST FEATURES)
+    file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+endif()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/H5public.h" "#define H5public_H" "#define H5public_H\n#ifndef H5_BUILT_AS_DYNAMIC_LIB\n#define H5_BUILT_AS_DYNAMIC_LIB\n#endif\n")
 endif()
+
+file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/data/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
diff --git a/external_imported/vcpkg/ports/hdf5/szip.patch b/external_imported/vcpkg/ports/hdf5/szip.patch
index 98702bbdc..2646ede7e 100644
--- a/external_imported/vcpkg/ports/hdf5/szip.patch
+++ b/external_imported/vcpkg/ports/hdf5/szip.patch
@@ -2,20 +2,17 @@ diff --git a/CMakeFilters.cmake b/CMakeFilters.cmake
 index d5f801e..141ab44 100644
 --- a/CMakeFilters.cmake
 +++ b/CMakeFilters.cmake
-@@ -124,6 +124,16 @@ if (HDF5_ENABLE_SZIP_SUPPORT)
-     set (H5_HAVE_LIBSZ 1)
-     set (SZIP_INCLUDE_DIR_GEN ${SZIP_INCLUDE_DIR})
-     set (SZIP_INCLUDE_DIRS ${SZIP_INCLUDE_DIRS} ${SZIP_INCLUDE_DIR})
-+  elseif(1)
-+    find_package(szip CONFIG REQUIRED)
-+    set(SZIP_INCLUDE_DIRS "")
-+    # SZIP_STATIC_LIBRARY will be used in linking, in cmake and in pkgconfig,
-+    # but the actual linkage doesn't matter.
-+    if (TARGET szip-shared)
-+      set(SZIP_STATIC_LIBRARY szip-shared)
-+    else()
-+      set(SZIP_STATIC_LIBRARY szip-static)
-+    endif()
-   else ()
-     if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
-       EXTERNAL_SZIP_LIBRARY (${HDF5_ALLOW_EXTERNAL_SUPPORT} ${HDF5_ENABLE_SZIP_ENCODING})
+@@ -142,7 +142,12 @@ if (HDF5_ENABLE_SZIP_SUPPORT)
+       set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${SZIP_LIBRARIES})
+     endif ()
+     if (NOT SZIP_FOUND)
+-      find_package (SZIP NAMES ${LIBAEC_PACKAGE_NAME}${HDF_PACKAGE_EXT} COMPONENTS static shared)
++      find_package(SZIP NAMES szip REQUIRED)
++      set(SZIP_INCLUDE_DIR "")
++      set(SZIP_LIBRARIES szip-static)
++      if (TARGET szip-shared)
++        set(SZIP_LIBRARIES szip-shared)
++      endif()
+       if (NOT SZIP_FOUND)
+         find_package (SZIP) # Legacy find
+       endif ()
diff --git a/external_imported/vcpkg/ports/hdf5/vcpkg-port-config.cmake b/external_imported/vcpkg/ports/hdf5/vcpkg-port-config.cmake
new file mode 100644
index 000000000..89fa5ac31
--- /dev/null
+++ b/external_imported/vcpkg/ports/hdf5/vcpkg-port-config.cmake
@@ -0,0 +1,4 @@
+# This variable can be used for testing and for messages.
+set(HDF5_WITH_PARALLEL [[
+HDF5 was built with parallel support.
+]])
diff --git a/external_imported/vcpkg/ports/hdf5/vcpkg.json b/external_imported/vcpkg/ports/hdf5/vcpkg.json
index 44a51753c..25e584f1b 100644
--- a/external_imported/vcpkg/ports/hdf5/vcpkg.json
+++ b/external_imported/vcpkg/ports/hdf5/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "hdf5",
-  "version": "1.14.0",
+  "version": "1.14.2",
   "description": "HDF5 is a data model, library, and file format for storing and managing data",
   "homepage": "https://www.hdfgroup.org/downloads/hdf5/",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/healpix/vcpkg.json b/external_imported/vcpkg/ports/healpix/vcpkg.json
index 15b383f08..998ddfe92 100644
--- a/external_imported/vcpkg/ports/healpix/vcpkg.json
+++ b/external_imported/vcpkg/ports/healpix/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "healpix",
-  "version-string": "1.12.10",
-  "port-version": 8,
+  "version": "1.12.10",
+  "port-version": 9,
   "description": "HEALPix is an acronym for Hierarchical Equal Area isoLatitude Pixelation of a sphere.",
   "homepage": "http://healpix.sourceforge.net/",
   "supports": "linux",
diff --git a/external_imported/vcpkg/ports/hello-imgui/portfile.cmake b/external_imported/vcpkg/ports/hello-imgui/portfile.cmake
new file mode 100644
index 000000000..212e28988
--- /dev/null
+++ b/external_imported/vcpkg/ports/hello-imgui/portfile.cmake
@@ -0,0 +1,126 @@
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY) # this mirrors ImGui's portfile behavior
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO pthom/hello_imgui
+    REF b9bdca77cb58bd879228f34a9bcf1f1c2e6b96bd
+    SHA512 2044fb34bdd64377335e46802f8546ccc30077e84f122c895b820bef0d692f62e1c5bc175cf8003c518db2bc0f1e07ed94bf1ccdc4a4720b7c0e0812c192bf7f
+    HEAD_REF master
+)
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+    "opengl3-binding" HELLOIMGUI_HAS_OPENGL3
+    "metal-binding" HELLOIMGUI_HAS_METAL
+    "experimental-vulkan-binding" HELLOIMGUI_HAS_VULKAN
+    "experimental-dx11-binding" HELLOIMGUI_HAS_DIRECTX11
+    "experimental-dx12-binding" HELLOIMGUI_HAS_DIRECTX12
+    "glfw-binding" HELLOIMGUI_USE_GLFW3
+    "sdl2-binding" HELLOIMGUI_USE_SDL2
+    "freetype-lunasvg" HELLOIMGUI_USE_FREETYPE # When hello_imgui is built with freetype, it will also build with lunasvg
+)
+
+if (NOT HELLOIMGUI_HAS_OPENGL3
+    AND NOT HELLOIMGUI_HAS_METAL
+    AND NOT HELLOIMGUI_HAS_VULKAN
+    AND NOT HELLOIMGUI_HAS_DIRECTX11
+    AND NOT HELLOIMGUI_HAS_DIRECTX12)
+    set(no_rendering_backend ON)
+endif()
+
+if (NOT HELLOIMGUI_USE_GLFW3 AND NOT HELLOIMGUI_USE_SDL2)
+    set(no_platform_backend ON)
+endif()
+
+
+set(platform_options "")
+if(WIN32)
+    # Standard win32 options (these are the defaults for HelloImGui)
+    # we could add a vcpkg feature for this, but it would have to be platform specific
+    list(APPEND platform_options
+        -DHELLOIMGUI_WIN32_NO_CONSOLE=ON
+        -DHELLOIMGUI_WIN32_AUTO_WINMAIN=ON
+    )
+endif()
+
+if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+    # Standard macOS options (these are the defaults for HelloImGui)
+    # we could add a vcpkg feature for this, but it would have to be platform specific
+    list(APPEND platform_options
+        -DHELLOIMGUI_MACOS_NO_BUNDLE=OFF
+    )
+endif()
+
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DHELLOIMGUI_BUILD_DEMOS=OFF
+        -DHELLOIMGUI_BUILD_DOCS=OFF
+        -DHELLOIMGUI_BUILD_TESTS=OFF
+
+        # vcpkg does not support ImGui Test Engine, so we cannot enable it
+        -DHELLOIMGUI_WITH_TEST_ENGINE=OFF
+
+        -DHELLOIMGUI_USE_IMGUI_CMAKE_PACKAGE=ON
+        -DHELLO_IMGUI_IMGUI_SHARED=OFF
+        -DHELLOIMGUI_BUILD_IMGUI=OFF
+
+        ${platform_options}
+
+        # Rendering backends
+        -DHELLOIMGUI_HAS_OPENGL3=${HELLOIMGUI_HAS_OPENGL3}
+        -DHELLOIMGUI_HAS_METAL=${HELLOIMGUI_HAS_METAL}
+        -DHELLOIMGUI_HAS_VULKAN=${HELLOIMGUI_HAS_VULKAN}
+        -DHELLOIMGUI_HAS_DIRECTX11=${HELLOIMGUI_HAS_DIRECTX11}
+        -DHELLOIMGUI_HAS_DIRECTX12=${HELLOIMGUI_HAS_DIRECTX12}
+
+        # Platform backends
+        -DHELLOIMGUI_USE_GLFW3=${HELLOIMGUI_USE_GLFW3}
+        -DHELLOIMGUI_USE_SDL2=${HELLOIMGUI_USE_SDL2}
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/hello_imgui PACKAGE_NAME "hello-imgui")  # should be active once himgui produces a config
+
+file(REMOVE_RECURSE
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/debug/share"
+    "${CURRENT_PACKAGES_DIR}/share/hello-imgui/hello_imgui_cmake/ios-cmake"
+)
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+
+if (no_rendering_backend OR no_platform_backend)
+    message(STATUS "
+    ########################################################################
+       !!!!                    WARNING                              !!!!!
+       !!!!   Installed hello-imgui without a viable backend        !!!!!
+    ########################################################################
+
+    When installing hello-imgui, you should specify:
+
+     - At least one (or more) rendering backend (OpenGL3, Metal, Vulkan, DirectX11, DirectX12)
+       Make your choice according to your needs and your target platforms, between:
+          opengl3-binding              # This is the recommended choice, especially for beginners
+          metal-binding                # Apple only, advanced users only
+          experimental-vulkan-binding  # Advanced users only
+          experimental-dx11-binding    # Windows only, still experimental
+          experimental-dx12-binding    # Windows only, advanced users only, still experimental
+
+     - At least one (or more) platform backend (SDL2, Glfw3):
+      Make your choice according to your needs and your target platforms, between:
+          glfw-binding
+          sdl-binding
+
+    For example, you could use:
+        vcpkg install \"hello-imgui[opengl3-binding,glfw-binding]\"
+
+    ########################################################################
+       !!!!                    WARNING                              !!!!!
+       !!!!   Installed hello-imgui without a viable backend        !!!!!
+    ########################################################################
+    ")
+endif()
diff --git a/external_imported/vcpkg/ports/hello-imgui/usage b/external_imported/vcpkg/ports/hello-imgui/usage
new file mode 100644
index 000000000..a4b8a1727
--- /dev/null
+++ b/external_imported/vcpkg/ports/hello-imgui/usage
@@ -0,0 +1,17 @@
+hello_imgui provides CMake targets and hello_imgui_add_app:
+
+Usage with `hello_imgui_add_app` (recommended)
+    set(CMAKE_CXX_STANDARD 17)
+    find_package(hello-imgui CONFIG REQUIRED)
+    hello_imgui_add_app(test test.cpp)      # see example below
+
+Usage with `target_link_libraries`
+    set(CMAKE_CXX_STANDARD 17)
+    find_package(hello-imgui CONFIG REQUIRED)
+    # Note the subtle difference between the package name and the target name: hello-imgui vs hello_imgui!
+    target_link_libraries(main PRIVATE hello-imgui::hello_imgui)
+    # this mode will ignore all of hello_imgui cmake tooling, and will not deploy the assets
+
+Example test.cpp:
+    #include "hello_imgui/hello_imgui.h"
+    int main() { HelloImGui::Run([](){ ImGui::Text("Hello, world!"); ImGui::ShowDemoWindow(); }); }
diff --git a/external_imported/vcpkg/ports/hello-imgui/vcpkg.json b/external_imported/vcpkg/ports/hello-imgui/vcpkg.json
new file mode 100644
index 000000000..9335896ae
--- /dev/null
+++ b/external_imported/vcpkg/ports/hello-imgui/vcpkg.json
@@ -0,0 +1,121 @@
+{
+  "name": "hello-imgui",
+  "version": "1.4.2",
+  "description": "Hello ImGui: unleash your creativity in app development and prototyping",
+  "homepage": "https://pthom.github.io/hello_imgui/",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "imgui",
+      "features": [
+        "docking-experimental"
+      ]
+    },
+    "stb",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
+  "features": {
+    "experimental-dx11-binding": {
+      "description": "Use DirectX11 renderer backend (Windows only, experimental)",
+      "dependencies": [
+        {
+          "name": "imgui",
+          "features": [
+            "dx11-binding"
+          ]
+        }
+      ]
+    },
+    "experimental-dx12-binding": {
+      "description": "Use DirectX12 renderer backend (Windows only, experimental)",
+      "dependencies": [
+        {
+          "name": "imgui",
+          "features": [
+            "dx12-binding"
+          ]
+        }
+      ]
+    },
+    "experimental-vulkan-binding": {
+      "description": "Use Vulkan renderer backend (Windows/Linux/macOS, experimental)",
+      "dependencies": [
+        {
+          "name": "imgui",
+          "features": [
+            "vulkan-binding"
+          ]
+        }
+      ]
+    },
+    "freetype-lunasvg": {
+      "description": "Improve font rendering and use colored fonts with freetype and lunasvg",
+      "dependencies": [
+        {
+          "name": "imgui",
+          "features": [
+            "freetype",
+            "freetype-lunasvg"
+          ]
+        }
+      ]
+    },
+    "glfw-binding": {
+      "description": "Use GLFW platform backend (default)",
+      "dependencies": [
+        {
+          "name": "imgui",
+          "features": [
+            "glfw-binding"
+          ]
+        }
+      ]
+    },
+    "metal-binding": {
+      "description": "Use Metal renderer backend (macOS/iOS only)",
+      "dependencies": [
+        {
+          "name": "imgui",
+          "features": [
+            "metal-binding"
+          ]
+        }
+      ]
+    },
+    "opengl3-binding": {
+      "description": "Use OpenGL3/ES2 renderer backend (default)",
+      "dependencies": [
+        {
+          "name": "glad",
+          "features": [
+            "gl-api-43"
+          ]
+        },
+        {
+          "name": "imgui",
+          "features": [
+            "opengl3-binding"
+          ]
+        }
+      ]
+    },
+    "sdl2-binding": {
+      "description": "Use SDL2 platform backend",
+      "dependencies": [
+        {
+          "name": "imgui",
+          "features": [
+            "sdl2-binding"
+          ]
+        }
+      ]
+    }
+  }
+}
diff --git a/external_imported/vcpkg/ports/hffix/portfile.cmake b/external_imported/vcpkg/ports/hffix/portfile.cmake
index 05a4a9a24..a5d6353cb 100644
--- a/external_imported/vcpkg/ports/hffix/portfile.cmake
+++ b/external_imported/vcpkg/ports/hffix/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO jamesdbrock/hffix
-    REF v1.2.1
-    SHA512 81947d5b2fbc2818b6ae7274febece8a813a67afc4a605bd92a1d7cb5df4e19e5df73a1a597c27898134fab1a0cc7c672d2dcba7688bab24184469b0760be06f
+    REF "v${VERSION}"
+    SHA512 a04a22360074f383997756d36ddf520a565e5d200e32e8439ef92f33bcb30ab29e962fc4d85142c1da323ddf9fef2d8b6a023dcbeedf1a5c269889adfcd70fb8
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/hffix/vcpkg.json b/external_imported/vcpkg/ports/hffix/vcpkg.json
index bc08b8e06..356059704 100644
--- a/external_imported/vcpkg/ports/hffix/vcpkg.json
+++ b/external_imported/vcpkg/ports/hffix/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "hffix",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "Financial Information Exchange Protocol C++ Library",
   "homepage": "https://jamesdbrock.github.io/hffix",
   "license": "BSD-2-Clause",
diff --git a/external_imported/vcpkg/ports/hidapi/portfile.cmake b/external_imported/vcpkg/ports/hidapi/portfile.cmake
index 212d58593..12d98903a 100644
--- a/external_imported/vcpkg/ports/hidapi/portfile.cmake
+++ b/external_imported/vcpkg/ports/hidapi/portfile.cmake
@@ -1,14 +1,20 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libusb/hidapi
-    REF hidapi-0.13.1
-    SHA512 07b224b9b5146caf693e6d67514fed236436ed68f38a3ada98ebf8352dfaa4e175f576902affb4b79da1bb8c9b47a1ee0831a93c7d3d210e93faee24632f7d53
+    REF hidapi-${VERSION}
+    SHA512 66a045144f90b41438898b82f0398e80223323ebfe6e4f197d2713696bb3ae60f36aea5a37a9999b34b12294783fd7e4c28c6e785462559cbe21276009da1eac
     HEAD_REF master
 )
 
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+FEATURES
+    "pp-data-dump"           HIDAPI_BUILD_PP_DATA_DUMP
+)
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS -DHIDAPI_BUILD_HIDTEST=OFF
+    ${FEATURE_OPTIONS}
 )
 vcpkg_cmake_install()
 
@@ -16,6 +22,10 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
 vcpkg_fixup_pkgconfig()
 vcpkg_copy_pdbs()
 
+if ("pp-data-dump" IN_LIST FEATURES)
+    vcpkg_copy_tools(TOOL_NAMES pp_data_dump AUTO_CLEAN)
+endif()
+
 vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/hidapi/libhidapi.cmake" "\"/hidapi\"" "\"\${_IMPORT_PREFIX}/include\"")
 
 file(INSTALL "${SOURCE_PATH}/LICENSE-bsd.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/external_imported/vcpkg/ports/hidapi/vcpkg.json b/external_imported/vcpkg/ports/hidapi/vcpkg.json
index 3bb2b328a..5473ce745 100644
--- a/external_imported/vcpkg/ports/hidapi/vcpkg.json
+++ b/external_imported/vcpkg/ports/hidapi/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "hidapi",
-  "version-semver": "0.13.1",
+  "version-semver": "0.14.0",
   "description": "A Simple library for communicating with USB and Bluetooth HID devices on Linux, Mac and Windows.",
   "homepage": "https://github.com/libusb/hidapi",
   "license": "BSD-3-Clause-Clear",
@@ -18,5 +18,11 @@
       "name": "vcpkg-cmake-config",
       "host": true
     }
-  ]
+  ],
+  "features": {
+    "pp-data-dump": {
+      "description": "Build pp_data_dump.exe tool, to store WIN32 HidD Preparsed Data as file",
+      "supports": "windows"
+    }
+  }
 }
diff --git a/external_imported/vcpkg/ports/highfive/portfile.cmake b/external_imported/vcpkg/ports/highfive/portfile.cmake
index 85b012a12..9206b79c7 100644
--- a/external_imported/vcpkg/ports/highfive/portfile.cmake
+++ b/external_imported/vcpkg/ports/highfive/portfile.cmake
@@ -1,19 +1,11 @@
-# Must be removed on next release
-vcpkg_download_distfile(CATCH2_PATCH
-    URLS https://github.com/BlueBrain/HighFive/commit/be9285ee4661ff4154830989899a2a050d6fbc64.patch?full_index=1
-    FILENAME ${PORT}-669-be9285ee.diff
-    SHA512 d4b085557fdcfaed195efaa25e02358714e6ccb00cc532594592183e934d99e3b80883991fcac1d073fbedb5773d76a5e9a58da4328b71215dd30b259df1eba3
-)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO BlueBrain/HighFive
-    REF v2.6.2
-    SHA512 80deb3d7f0b2e8e8c660ee37b189d1a4993e23b5ada30c72f3ef4fef80020f8564c8a5a507a34f891cec6c5db0d75d7c7de89040defaf91a3b1cec2018d1bf9e
+    REF "v${VERSION}"
+    SHA512 568fb58956ce8d218fd33a6fe5b519436ce296cdcf87b5620eb2af224b9e39f8f99008f3baff9a7024bbdb4052e5c47bb514091d2afd652abd28949e9096b6f1
     HEAD_REF master
     PATCHES
         fix-error-C1128.patch
-        ${CATCH2_PATCH}
 )
 
 vcpkg_check_features(
@@ -25,20 +17,24 @@ vcpkg_check_features(
         eigen3  HIGHFIVE_USE_EIGEN
 )
 
+if(HDF5_WITH_PARALLEL)
+    message(STATUS "${HDF5_WITH_PARALLEL} Enabling HIGHFIVE_PARALLEL_HDF5.")
+    list(APPEND FEATURE_OPTIONS "-DHIGHFIVE_PARALLEL_HDF5=ON")
+endif()
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    DISABLE_PARALLEL_CONFIGURE
     OPTIONS
         ${FEATURE_OPTIONS}
         -DHIGHFIVE_EXAMPLES=OFF
         -DHIGHFIVE_BUILD_DOCS=OFF
+        -DCMAKE_CATCH_DISCOVER_TESTS_DISCOVERY_MODE=PRE_TEST
+    MAYBE_UNUSED_VARIABLES
+        CMAKE_CATCH_DISCOVER_TESTS_DISCOVERY_MODE
 )
 
-set(add_bin "")
-if("tests" IN_LIST FEATURES)
-    set(add_bin ADD_BIN_TO_PATH) # Seems to run tests as part of the build?
-endif()
-
-vcpkg_cmake_install(${add_bin})
+vcpkg_cmake_install()
 
 if("tests" IN_LIST FEATURES)
     vcpkg_copy_tools(
@@ -50,10 +46,13 @@ if("tests" IN_LIST FEATURES)
     )
 endif()
 
-# Use PACKAGE_NAME to avoid folder HighFive and highfive are exist at same time
-vcpkg_cmake_config_fixup(PACKAGE_NAME HighFive CONFIG_PATH share/HighFive/CMake)
+vcpkg_cmake_config_fixup(CONFIG_PATH share/HighFive/CMake)
+if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/share/HighFive/HighFiveConfig.cmake")
+    # left over with mixed case
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/HighFive")
+endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
 
-# Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/highfive/usage b/external_imported/vcpkg/ports/highfive/usage
new file mode 100644
index 000000000..336af87bc
--- /dev/null
+++ b/external_imported/vcpkg/ports/highfive/usage
@@ -0,0 +1,4 @@
+highfive provides CMake targets:
+
+  find_package(HighFive CONFIG REQUIRED)
+  target_link_libraries(main PRIVATE HighFive)
diff --git a/external_imported/vcpkg/ports/highfive/vcpkg.json b/external_imported/vcpkg/ports/highfive/vcpkg.json
index f2c1b3c97..37622b6e7 100644
--- a/external_imported/vcpkg/ports/highfive/vcpkg.json
+++ b/external_imported/vcpkg/ports/highfive/vcpkg.json
@@ -1,12 +1,14 @@
 {
   "name": "highfive",
-  "version": "2.6.2",
-  "port-version": 2,
+  "version": "2.9.0",
   "description": "HighFive is a modern header-only C++/C++11 friendly interface for libhdf5",
   "homepage": "https://github.com/BlueBrain/HighFive",
   "license": "BSL-1.0",
   "dependencies": [
-    "hdf5",
+    {
+      "name": "hdf5",
+      "default-features": false
+    },
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/external_imported/vcpkg/ports/highs/fix-cmake-output.patch b/external_imported/vcpkg/ports/highs/fix-cmake-output.patch
new file mode 100644
index 000000000..614bbe67a
--- /dev/null
+++ b/external_imported/vcpkg/ports/highs/fix-cmake-output.patch
@@ -0,0 +1,20 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 605a1e2..148c006 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -196,6 +196,7 @@ if(MSVC)
+             unsigned long y;
+             _BitScanReverse(&y, x);
+             _BitScanReverse64(&x, y);
++            __popcnt64(x);
+             return 0;
+         }"
+     HIGHS_HAVE_BITSCAN_REVERSE)
+@@ -570,7 +572,6 @@ else(FAST_BUILD)
+   # Add tests in examples/tests
+   add_subdirectory(examples)
+ 
+-  add_subdirectory(app)
+ 
+   if(EXP)
+     add_executable(doctest)
diff --git a/external_imported/vcpkg/ports/highs/fix-compiler.patch b/external_imported/vcpkg/ports/highs/fix-compiler.patch
new file mode 100644
index 000000000..e186e405a
--- /dev/null
+++ b/external_imported/vcpkg/ports/highs/fix-compiler.patch
@@ -0,0 +1,20 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 605a1e275..47233aa10 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -5,6 +5,7 @@
+ cmake_minimum_required(VERSION 3.15)
+ 
+ # set preference for clang compiler and intel compiler over gcc and other compilers
++if(0)
+ include(Platform/${CMAKE_SYSTEM_NAME}-Determine-C OPTIONAL)
+ include(Platform/${CMAKE_SYSTEM_NAME}-C OPTIONAL)
+ set(CMAKE_C_COMPILER_NAMES clang icc cc ${CMAKE_C_COMPILER_NAMES})
+@@ -12,6 +13,7 @@ set(CMAKE_C_COMPILER_NAMES clang icc cc ${CMAKE_C_COMPILER_NAMES})
+ include(Platform/${CMAKE_SYSTEM_NAME}-Determine-CXX OPTIONAL)
+ include(Platform/${CMAKE_SYSTEM_NAME}-CXX OPTIONAL)
+ set(CMAKE_CXX_COMPILER_NAMES clang++ icpc c++ ${CMAKE_CXX_COMPILER_NAMES})
++endif()
+ 
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+ 
diff --git a/external_imported/vcpkg/ports/highs/fix-hconfig-path.patch b/external_imported/vcpkg/ports/highs/fix-hconfig-path.patch
new file mode 100644
index 000000000..6559b800f
--- /dev/null
+++ b/external_imported/vcpkg/ports/highs/fix-hconfig-path.patch
@@ -0,0 +1,21 @@
+diff --git a/src/HConfig.h.in b/src/HConfig.h.in
+index 652f6651f..62b81f83c 100644
+--- a/src/HConfig.h.in
++++ b/src/HConfig.h.in
+@@ -4,7 +4,7 @@
+ #cmakedefine FAST_BUILD
+ #cmakedefine ZLIB_FOUND
+ #cmakedefine CMAKE_BUILD_TYPE "@CMAKE_BUILD_TYPE@"
+-#cmakedefine CMAKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"
++#cmakedefine CMAKE_INSTALL_PREFIX ""
+ #cmakedefine HIGHSINT64
+ #cmakedefine HIGHS_HAVE_MM_PAUSE
+ #cmakedefine HIGHS_HAVE_BUILTIN_CLZ
+@@ -15,6 +15,6 @@
+ #define HIGHS_VERSION_MAJOR @HIGHS_VERSION_MAJOR@
+ #define HIGHS_VERSION_MINOR @HIGHS_VERSION_MINOR@
+ #define HIGHS_VERSION_PATCH @HIGHS_VERSION_PATCH@
+-#define HIGHS_DIR "@CMAKE_SOURCE_DIR@"
++#define HIGHS_DIR ""
+ 
+ #endif /* HCONFIG_H_ */
diff --git a/external_imported/vcpkg/ports/highs/fix-threads.patch b/external_imported/vcpkg/ports/highs/fix-threads.patch
new file mode 100644
index 000000000..611629d2b
--- /dev/null
+++ b/external_imported/vcpkg/ports/highs/fix-threads.patch
@@ -0,0 +1,13 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index fc24e57..fe0edfe 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -573,7 +573,7 @@ else()
+       $<BUILD_INTERFACE:${HIGHS_SOURCE_DIR}/extern/zstr>
+     )
+     target_link_libraries(highs ZLIB::ZLIB)
+-    set(CONF_DEPENDENCIES "include(CMakeFindDependencyMacro)\nfind_dependency(ZLIB)")
++    set(CONF_DEPENDENCIES "include(CMakeFindDependencyMacro)\nfind_dependency(ZLIB)\nfind_dependency(Threads)")
+   endif()
+ 
+   # # on UNIX system the 'lib' prefix is automatically added
diff --git a/external_imported/vcpkg/ports/highs/portfile.cmake b/external_imported/vcpkg/ports/highs/portfile.cmake
new file mode 100644
index 000000000..3e20aa939
--- /dev/null
+++ b/external_imported/vcpkg/ports/highs/portfile.cmake
@@ -0,0 +1,28 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO ERGO-Code/HiGHS
+    REF "v${VERSION}"
+    SHA512 9229d2e960354b8b8fd45588cd4eec7e54826ee6f3939ac691d7b2b6eb0580a66a3a2649c940a3869f58dbbcf08fdd9641919fc92666948c62e70c4bce8ac130
+    HEAD_REF master
+    PATCHES
+        fix-hconfig-path.patch
+        fix-cmake-output.patch
+        fix-threads.patch
+        fix-compiler.patch
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS 
+        -DFAST_BUILD=ON
+        -DBUILD_TESTING=OFF
+        -DBUILD_EXAMPLES=OFF
+        -DCMAKE_REQUIRE_FIND_PACKAGE_ZLIB=ON
+)
+
+vcpkg_cmake_install()
+vcpkg_fixup_pkgconfig()
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/highs")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/external_imported/vcpkg/ports/highs/vcpkg.json b/external_imported/vcpkg/ports/highs/vcpkg.json
new file mode 100644
index 000000000..dc140d715
--- /dev/null
+++ b/external_imported/vcpkg/ports/highs/vcpkg.json
@@ -0,0 +1,19 @@
+{
+  "name": "highs",
+  "version": "1.6.0",
+  "port-version": 1,
+  "description": "High performance library to solve linear, mixed-integer, and convex quadratic optimization problems.",
+  "homepage": "https://highs.dev",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    "zlib"
+  ]
+}
diff --git a/external_imported/vcpkg/ports/highway/portfile.cmake b/external_imported/vcpkg/ports/highway/portfile.cmake
index e6ef22ae3..7f285c81f 100644
--- a/external_imported/vcpkg/ports/highway/portfile.cmake
+++ b/external_imported/vcpkg/ports/highway/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/highway
     REF "${VERSION}"
-    SHA512 fc419c862e1686b6278081e8e10da41dc2bdfbd386a29b59e21a57375a47d3eeb5c7297e3078c78007b212121d936640b192a26a16c941e73cf599f24e081021
+    SHA512 6ee5007ec13ac20b5d816b38a1b31c31a06678ca6d2ea090dd75e364f04cb2cf7ad8a82d1bdfff51079efa54b9a95fb554d62e6cc1bbf7d7e794cb272032d8f5
     HEAD_REF master
 )
 
@@ -15,22 +15,20 @@ vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         ${FEATURE_OPTIONS}
+        -DHWY_ENABLE_INSTALL=ON
         -DHWY_ENABLE_EXAMPLES=OFF
         -DHWY_ENABLE_TESTS=OFF
 )
 
 vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME hwy CONFIG_PATH lib/cmake/hwy)
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/hwy/highway_export.h" "defined(HWY_SHARED_DEFINE)" "1")
 endif()
 
-file(REMOVE_RECURSE
-    "${CURRENT_PACKAGES_DIR}/debug/include"
-    # remove test-related pkg-config files that break vcpkg_fixup_pkgconfig
-    "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libhwy-test.pc"
-    "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libhwy-test.pc"
-)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 vcpkg_fixup_pkgconfig()
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/highway/usage b/external_imported/vcpkg/ports/highway/usage
new file mode 100644
index 000000000..722fc3544
--- /dev/null
+++ b/external_imported/vcpkg/ports/highway/usage
@@ -0,0 +1,4 @@
+highway provides CMake targets:
+
+    find_package(hwy CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE hwy::hwy)
diff --git a/external_imported/vcpkg/ports/highway/vcpkg.json b/external_imported/vcpkg/ports/highway/vcpkg.json
index bc7b5cdd3..011668dc4 100644
--- a/external_imported/vcpkg/ports/highway/vcpkg.json
+++ b/external_imported/vcpkg/ports/highway/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "highway",
-  "version-semver": "1.0.3",
+  "version": "1.0.7",
   "description": "Performance-portable, length-agnostic SIMD with runtime dispatch",
   "homepage": "https://github.com/google/highway",
   "license": "Apache-2.0",
@@ -8,6 +8,10 @@
     {
       "name": "vcpkg-cmake",
       "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
     }
   ],
   "features": {
diff --git a/external_imported/vcpkg/ports/hikogui/portfile.cmake b/external_imported/vcpkg/ports/hikogui/portfile.cmake
index 7a37309f4..8a9da44e8 100644
--- a/external_imported/vcpkg/ports/hikogui/portfile.cmake
+++ b/external_imported/vcpkg/ports/hikogui/portfile.cmake
@@ -1,25 +1,24 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO hikogui/hikogui
-    REF v0.7.0
-    SHA512 64555c67e5a44f336a3528d3a894d43e2751a1f4e4e4d9f6618c085ef0be4a502610a36625d95f79298080cb483f7361a758f7c43b4784999b0b5d839baacb28
+    REF v0.8.1
+    SHA512 1a711aeb83d4d84e89ba4895aea321b1e5120fc20e8124237ee575b14955edcfa991965cb80628e7c485a44ba13245ba76781582339f62939a8180a629de996a
     HEAD_REF main
 )
 
+set(ENV{VULKAN_SDK} "${CURRENT_INSTALLED_DIR}")
+
 vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS
-        -DHI_BUILD_TESTS=OFF
-        -DHI_BUILD_EXAMPLES=OFF
+        -DBUILD_TESTING=OFF
+        -DBUILD_EXAMPLES=OFF
         -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
 )
 
 vcpkg_cmake_install()
-vcpkg_cmake_config_fixup()
-vcpkg_copy_pdbs()
+vcpkg_cmake_config_fixup(NO_PREFIX_CORRECTION)
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE_1_0.txt")
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
diff --git a/external_imported/vcpkg/ports/hikogui/vcpkg.json b/external_imported/vcpkg/ports/hikogui/vcpkg.json
index ab0dddefc..cff97ce12 100644
--- a/external_imported/vcpkg/ports/hikogui/vcpkg.json
+++ b/external_imported/vcpkg/ports/hikogui/vcpkg.json
@@ -1,12 +1,20 @@
 {
   "name": "hikogui",
-  "version": "0.7.0",
+  "version": "0.8.1",
+  "port-version": 2,
   "maintainers": "@takev",
   "description": "A portable, low latency, retained-mode GUI framework written in C++.",
   "homepage": "https://github.com/hikogui/hikogui",
   "license": "BSL-1.0",
   "supports": "windows & x64",
   "dependencies": [
+    {
+      "name": "glslang",
+      "features": [
+        "tools"
+      ]
+    },
+    "shaderc",
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/external_imported/vcpkg/ports/hiredis/fix-cmake-conf-install-dir.patch b/external_imported/vcpkg/ports/hiredis/fix-cmake-conf-install-dir.patch
new file mode 100644
index 000000000..d07482187
--- /dev/null
+++ b/external_imported/vcpkg/ports/hiredis/fix-cmake-conf-install-dir.patch
@@ -0,0 +1,22 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fca0ee8..b67888e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -125,7 +127,7 @@ export(EXPORT hiredis-targets
+ if(WIN32)
+     SET(CMAKE_CONF_INSTALL_DIR share/hiredis)
+ else()
+-    SET(CMAKE_CONF_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/hiredis)
++    SET(CMAKE_CONF_INSTALL_DIR share/hiredis)
+ endif()
+ SET(INCLUDE_INSTALL_DIR include)
+ include(CMakePackageConfigHelpers)
+@@ -200,7 +204,7 @@ IF(ENABLE_SSL)
+     if(WIN32)
+         SET(CMAKE_CONF_INSTALL_DIR share/hiredis_ssl)
+     else()
+-        SET(CMAKE_CONF_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/hiredis_ssl)
++        SET(CMAKE_CONF_INSTALL_DIR share/hiredis_ssl)
+     endif()
+     configure_package_config_file(hiredis_ssl-config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/hiredis_ssl-config.cmake
+                                   INSTALL_DESTINATION ${CMAKE_CONF_INSTALL_DIR}
diff --git a/external_imported/vcpkg/ports/hiredis/fix-feature-example.patch b/external_imported/vcpkg/ports/hiredis/fix-feature-example.patch
deleted file mode 100644
index eecca4086..000000000
--- a/external_imported/vcpkg/ports/hiredis/fix-feature-example.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
-index dd3a313..8c69d3a 100644
---- a/examples/CMakeLists.txt
-+++ b/examples/CMakeLists.txt
-@@ -19,16 +19,25 @@ if (LIBEV)
-     TARGET_LINK_LIBRARIES(example-libev hiredis ev)
- ENDIF()
- 
--FIND_PATH(LIBEVENT event.h)
--if (LIBEVENT)
-+FIND_PACKAGE(Libevent CONFIG REQUIRED)
-+FIND_PATH(LIBEVENT_INCLUDES evutil.h)
-+if (UNIX)
-     ADD_EXECUTABLE(example-libevent example-libevent)
--    TARGET_LINK_LIBRARIES(example-libevent hiredis event)
-+    TARGET_LINK_LIBRARIES(example-libevent hiredis ${LIBEVENT_LIBRARIES})
-+    TARGET_INCLUDE_DIRECTORIES(example-libevent PRIVATE ${LIBEVENT_INCLUDES})
- ENDIF()
- 
-+FIND_LIBRARY(UV_LIBRARY libuv)
- FIND_PATH(LIBUV uv.h)
- IF (LIBUV)
-     ADD_EXECUTABLE(example-libuv example-libuv.c)
--    TARGET_LINK_LIBRARIES(example-libuv hiredis uv)
-+    if(WIN32)
-+        set(LIB_LISTS Iphlpapi.lib Psapi.lib Userenv.lib)
-+    else()
-+        set(LIB_LISTS)
-+    endif()
-+    TARGET_LINK_LIBRARIES(example-libuv hiredis ${UV_LIBRARY} ${LIB_LISTS})
-+    TARGET_INCLUDE_DIRECTORIES(example-libuv PRIVATE ${LIBUV})
- ENDIF()
- 
- IF (APPLE)
-@@ -38,12 +52,24 @@ IF (APPLE)
- ENDIF()
- 
- IF (ENABLE_SSL)
-+    FIND_PACKAGE(OpenSSL REQUIRED)
-+    IF (WIN32)
-+        FIND_PACKAGE(pthreads REQUIRED)
-+        SET(THREADS_LIBS PThreads4W::PThreads4W)
-+    ELSE()
-+        FIND_PACKAGE(Threads)
-+        SET(THREADS_LIBS ${CMAKE_THREAD_LIBS_INIT})
-+    ENDIF()
-     ADD_EXECUTABLE(example-ssl example-ssl.c)
--    TARGET_LINK_LIBRARIES(example-ssl hiredis hiredis_ssl)
-+    if(WIN32)
-+        TARGET_LINK_LIBRARIES(example-ssl hiredis hiredis_ssl OpenSSL::SSL OpenSSL::Crypto ${THREADS_LIBS} crypt32.lib)
-+    else()
-+        TARGET_LINK_LIBRARIES(example-ssl hiredis hiredis_ssl OpenSSL::SSL OpenSSL::Crypto ${THREADS_LIBS})
-+    endif()
- ENDIF()
- 
- ADD_EXECUTABLE(example example.c)
--TARGET_LINK_LIBRARIES(example hiredis)
-+TARGET_LINK_LIBRARIES(example hiredis ${LIBEVENT_LIBRARIES})
- 
- ADD_EXECUTABLE(example-push example-push.c)
- TARGET_LINK_LIBRARIES(example-push hiredis)
diff --git a/external_imported/vcpkg/ports/hiredis/fix-include-path.patch b/external_imported/vcpkg/ports/hiredis/fix-include-path.patch
deleted file mode 100644
index 8bfeae09d..000000000
--- a/external_imported/vcpkg/ports/hiredis/fix-include-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7eafeb8..623c586 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -49,7 +49,7 @@ IF(WIN32 OR MINGW)
-     TARGET_LINK_LIBRARIES(hiredis PRIVATE ws2_32)
- ENDIF()
- 
--TARGET_INCLUDE_DIRECTORIES(hiredis PUBLIC $<INSTALL_INTERFACE:.> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
-+TARGET_INCLUDE_DIRECTORIES(hiredis PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
- 
- CONFIGURE_FILE(hiredis.pc.in hiredis.pc @ONLY)
- 
diff --git a/external_imported/vcpkg/ports/hiredis/portfile.cmake b/external_imported/vcpkg/ports/hiredis/portfile.cmake
index 0eb8f9b56..907195f6e 100644
--- a/external_imported/vcpkg/ports/hiredis/portfile.cmake
+++ b/external_imported/vcpkg/ports/hiredis/portfile.cmake
@@ -1,30 +1,26 @@
-if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    set(HIREDIS_PATCHES support-static.patch)
-endif()
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO redis/hiredis
-    REF v1.0.2
-    SHA512 86497a1c21869bbe535378885eee6dbd594ef96325966511a3513f81e501af0f5ac7fed864f3230372f3ac7a23c05bad477fa5aa90b9747c9fb1408028174f9b
+    REF "v${VERSION}"
+    SHA512 f8984abb29c09e7e6b56e656616c5155f36c53da4161a2d4c85688486411cadcdf20aa1adb9bda208c500b401c750871be1c8d58ba9df5328634d00e9d1b6589
     HEAD_REF master
     PATCHES
-        fix-feature-example.patch
         fix-timeval.patch
-        fix-include-path.patch
         fix-ssize_t.patch
-        ${HIREDIS_PATCHES}
+        support-static.patch
+        fix-cmake-conf-install-dir.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
         ssl     ENABLE_SSL
-        example ENABLE_EXAMPLES
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS ${FEATURE_OPTIONS}
+      -DDISABLE_TESTS=ON
+      -DBUILD_SHARED_LIBS=OFF
 )
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/hiredis/support-static.patch b/external_imported/vcpkg/ports/hiredis/support-static.patch
index 47ea4bef6..e9f0bb2d8 100644
--- a/external_imported/vcpkg/ports/hiredis/support-static.patch
+++ b/external_imported/vcpkg/ports/hiredis/support-static.patch
@@ -1,17 +1,22 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9e78894..87aba5b 100644
+index b7d6ee8..8cf6c4d 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -22,4 +22,4 @@ PROJECT(hiredis VERSION "${VERSION}")
- ENDIF()
+@@ -45,6 +45,8 @@ ENDIF()
  
--ADD_LIBRARY(hiredis SHARED ${hiredis_sources})
-+ADD_LIBRARY(hiredis ${hiredis_sources})
+ ADD_LIBRARY(hiredis ${hiredis_sources})
+ ADD_LIBRARY(hiredis::hiredis ALIAS hiredis)
++ADD_LIBRARY(hiredis_static STATIC ${hiredis_sources})
++SET_TARGET_PROPERTIES(hiredis_static PROPERTIES EXCLUDE_FROM_ALL TRUE)
+ set(hiredis_export_name hiredis CACHE STRING "Name of the exported target")
+ set_target_properties(hiredis PROPERTIES EXPORT_NAME ${hiredis_export_name})
  
-@@ -60,5 +60,5 @@ IF(ENABLE_SSL)
-     SET(hiredis_ssl_sources 
+@@ -156,6 +158,8 @@ IF(ENABLE_SSL)
          ssl.c)
--    ADD_LIBRARY(hiredis_ssl SHARED
-+    ADD_LIBRARY(hiredis_ssl
-             ${hiredis_ssl_sources})
+     ADD_LIBRARY(hiredis_ssl ${hiredis_ssl_sources})
+     ADD_LIBRARY(hiredis::hiredis_ssl ALIAS hiredis_ssl)
++    ADD_LIBRARY(hiredis_ssl_static STATIC ${hiredis_ssl_sources})
++    SET_TARGET_PROPERTIES(hiredis_ssl_static PROPERTIES EXCLUDE_FROM_ALL TRUE)
  
+     IF (APPLE AND BUILD_SHARED_LIBS)
+         SET_PROPERTY(TARGET hiredis_ssl PROPERTY LINK_FLAGS "-Wl,-undefined -Wl,dynamic_lookup")
diff --git a/external_imported/vcpkg/ports/hiredis/vcpkg.json b/external_imported/vcpkg/ports/hiredis/vcpkg.json
index b8cbfc8e4..d4f1e7151 100644
--- a/external_imported/vcpkg/ports/hiredis/vcpkg.json
+++ b/external_imported/vcpkg/ports/hiredis/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "hiredis",
-  "version": "1.0.2",
-  "port-version": 4,
+  "version": "1.2.0",
   "description": "Hiredis is a minimalistic C client library for the Redis database.",
   "homepage": "https://github.com/redis/hiredis",
   "license": "BSD-3-Clause",
@@ -16,14 +15,6 @@
     }
   ],
   "features": {
-    "example": {
-      "description": "Build example",
-      "dependencies": [
-        "libevent",
-        "libuv",
-        "pthread"
-      ]
-    },
     "ssl": {
       "description": "Build hiredis_ssl for SSL support",
       "dependencies": [
diff --git a/external_imported/vcpkg/ports/hnswlib/portfile.cmake b/external_imported/vcpkg/ports/hnswlib/portfile.cmake
index cf150d766..d02ecd207 100644
--- a/external_imported/vcpkg/ports/hnswlib/portfile.cmake
+++ b/external_imported/vcpkg/ports/hnswlib/portfile.cmake
@@ -1,12 +1,22 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO nmslib/hnswlib
-    REF 359b2ba87358224963986f709e593d799064ace6 # v0.7.0
-    SHA512 59a0c02bbe8f7389a2ecad9188a76eb3847b719a213d306093753c04e4eeb11d95e8e310aa03888364be475a2f2e6e7976bd81117517eef81eff2983379ac743
+    REF "v${VERSION}"
+    SHA512 2bac86547374ef762083f33b5209c7c02c89b3270442dda2bc80fbc7b6a33766cb81248841deddc2ca1f7c49e3e19889955f45c91d0b601d1c883a5e1c930794
     HEAD_REF master
 )
 
-file(COPY "${SOURCE_PATH}/hnswlib" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+set(VCPKG_BUILD_TYPE "release") # header-only port
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DHNSWLIB_EXAMPLES=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/hnswlib)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
 
-file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/hnswlib/usage b/external_imported/vcpkg/ports/hnswlib/usage
deleted file mode 100644
index 3ef3d72f9..000000000
--- a/external_imported/vcpkg/ports/hnswlib/usage
+++ /dev/null
@@ -1,4 +0,0 @@
-hnswlib is header-only and can be used from CMake via:
-
-    find_path(HNSWLIB_INCLUDE_DIRS "hnswlib/hnswlib.h")
-    target_include_directories(main PRIVATE ${HNSWLIB_INCLUDE_DIRS})
diff --git a/external_imported/vcpkg/ports/hnswlib/vcpkg.json b/external_imported/vcpkg/ports/hnswlib/vcpkg.json
index 94e358192..9eb1503f6 100644
--- a/external_imported/vcpkg/ports/hnswlib/vcpkg.json
+++ b/external_imported/vcpkg/ports/hnswlib/vcpkg.json
@@ -1,7 +1,17 @@
 {
   "name": "hnswlib",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "Header-only library for fast approximate nearest neighbors",
   "homepage": "https://github.com/nmslib/hnswlib",
-  "license": "Apache-2.0"
+  "license": "Apache-2.0",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/hpx/fix-export.patch b/external_imported/vcpkg/ports/hpx/fix-export.patch
deleted file mode 100644
index c9c2bbf4c..000000000
--- a/external_imported/vcpkg/ports/hpx/fix-export.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/cmake/HPX_GeneratePackageUtils.cmake b/cmake/HPX_GeneratePackageUtils.cmake
-index 3ec8002..b098465 100644
---- a/cmake/HPX_AddModule.cmake	
-+++ b/cmake/HPX_AddModule.cmake
-@@ -437,7 +437,7 @@ function(add_hpx_module libname modulename)
-     elseif(MSVC)
-       set(_module_target hpx_${modulename})
-       target_link_libraries(
--        hpx_${libname} PRIVATE -WHOLEARCHIVE:$<TARGET_FILE:hpx_${modulename}>
-+        hpx_${libname} PRIVATE -WHOLEARCHIVE:$<TARGET_FILE:$<TARGET_NAME:hpx_${modulename}>>
-       )
-     endif()
-     target_link_libraries(hpx_${libname} PRIVATE ${_module_target})
---- a/cmake/HPX_GeneratePackageUtils.cmake	
-+++ b/cmake/HPX_GeneratePackageUtils.cmake
-@@ -101,7 +101,7 @@ function(
-           )
-             set(_libraries
-                 ${_libraries}
--                $<INSTALL_INTERFACE:${CMAKE_INSTALL_LIBDIR}/$<TARGET_FILE_NAME:${target}>>$<BUILD_INTERFACE:$<TARGET_FILE:${target}>>
-+                $<INSTALL_INTERFACE:${CMAKE_INSTALL_LIBDIR}/$<TARGET_FILE_NAME:$<TARGET_NAME:${target}>>>$<BUILD_INTERFACE:$<TARGET_FILE:${target}>>
-             )
-           endif()
-         elseif("${dep_target}" MATCHES "^-l")
diff --git a/external_imported/vcpkg/ports/hpx/fix_output_name_clash.patch b/external_imported/vcpkg/ports/hpx/fix_output_name_clash.patch
index a031b1fa6..542aa5a29 100644
--- a/external_imported/vcpkg/ports/hpx/fix_output_name_clash.patch
+++ b/external_imported/vcpkg/ports/hpx/fix_output_name_clash.patch
@@ -2,7 +2,7 @@ diff --git a/cmake/HPX_AddComponent.cmake b/cmake/HPX_AddComponent.cmake
 index 129a87ced..b45feb3f5 100644
 --- a/cmake/HPX_AddComponent.cmake
 +++ b/cmake/HPX_AddComponent.cmake	
-@@ -303,7 +303,7 @@ function(add_hpx_component name)
+@@ -306,7 +306,7 @@ function(add_hpx_component name)
    hpx_setup_target(
      ${name}_component
      TYPE COMPONENT
diff --git a/external_imported/vcpkg/ports/hpx/format.patch b/external_imported/vcpkg/ports/hpx/format.patch
deleted file mode 100644
index f3a5003ce..000000000
--- a/external_imported/vcpkg/ports/hpx/format.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/components/iostreams/include/hpx/components/iostreams/ostream.hpp b/components/iostreams/include/hpx/components/iostreams/ostream.hpp
-index 423f4728d00..dda4b059796 100644
---- a/components/iostreams/include/hpx/components/iostreams/ostream.hpp
-+++ b/components/iostreams/include/hpx/components/iostreams/ostream.hpp
-@@ -398,6 +398,6 @@ namespace hpx { namespace util {
-         hpx::iostreams::ostream<Char, Sink>& os, std::string const& format_str,
-         Args const&... args)
-     {
--        return os << format(format_str, args...);
-+        return os << hpx::util::format(format_str, args...);
-     }
- }}    // namespace hpx::util
diff --git a/external_imported/vcpkg/ports/hpx/portfile.cmake b/external_imported/vcpkg/ports/hpx/portfile.cmake
index 6401ea5a9..d2723a789 100644
--- a/external_imported/vcpkg/ports/hpx/portfile.cmake
+++ b/external_imported/vcpkg/ports/hpx/portfile.cmake
@@ -6,13 +6,11 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" HPX_WITH_STATIC_LINKING
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO STEllAR-GROUP/hpx
-    REF f48c81865800ae72618b40b4e79d4168cfb0bd56
-    SHA512 06d1384615b327194d871145c1899317bd350c43a072be2cbfdc773f7869b71aafce3e9cabf835a8fe902a13d7050d5e0400a76f74023985575347a645196b1d
+    REF "v${VERSION}"
+    SHA512 a7972beada950cf6ef3b61f20496a08b220e4f48c28c11d57c20683906ca5124a9f36ac2552318883a5ab1db6efdbf63d1141b6e0c484c560a8c1311ae2d7090
     HEAD_REF stable
     PATCHES
         fix-dependency-hwloc.patch
-        format.patch
-        fix-export.patch
         fix-debug.patch
         fix_output_name_clash.patch
 )
@@ -92,9 +90,11 @@ vcpkg_fixup_pkgconfig()
 
 file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/hpxcxx" "${CURRENT_PACKAGES_DIR}/debug/bin/hpxcxx")
 
-file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
-file(RENAME "${CURRENT_PACKAGES_DIR}/bin/hpxrun.py" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/hpxrun.py")
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/hpxrun.py" "'${CURRENT_INSTALLED_DIR}/tools/openmpi/bin/mpiexec'" "'mpiexec'")
+if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/hpxrun.py")
+    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/bin/hpxrun.py" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/hpxrun.py")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/hpxrun.py" "'${CURRENT_INSTALLED_DIR}/tools/openmpi/bin/mpiexec'" "'mpiexec'")
+endif()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
diff --git a/external_imported/vcpkg/ports/hpx/vcpkg.json b/external_imported/vcpkg/ports/hpx/vcpkg.json
index 1f7a876e9..17eba54ff 100644
--- a/external_imported/vcpkg/ports/hpx/vcpkg.json
+++ b/external_imported/vcpkg/ports/hpx/vcpkg.json
@@ -1,13 +1,13 @@
 {
   "name": "hpx",
-  "version": "1.8.0",
-  "port-version": 2,
+  "version": "1.9.1",
   "description": [
     "The C++ Standards Library for Concurrency and Parallelism",
     "HPX is a C++ Standards Library for Concurrency and Parallelism. It implements all of the corresponding facilities as defined by the C++ Standard. Additionally, in HPX we implement functionalities proposed as part of the ongoing C++ standardization process. We also extend the C++ Standard APIs to the distributed case."
   ],
   "homepage": "https://github.com/STEllAR-GROUP/hpx",
   "license": "BSL-1.0",
+  "supports": "!(windows & x86)",
   "dependencies": [
     "asio",
     "boost-accumulators",
diff --git a/external_imported/vcpkg/ports/http-parser/portfile.cmake b/external_imported/vcpkg/ports/http-parser/portfile.cmake
index 9aa591773..fd016b910 100644
--- a/external_imported/vcpkg/ports/http-parser/portfile.cmake
+++ b/external_imported/vcpkg/ports/http-parser/portfile.cmake
@@ -8,19 +8,17 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-http-parser TARGET_PATH share/unofficial-http-parser)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-http-parser)
 
 # Handle copyright
-file(COPY ${SOURCE_PATH}/LICENSE-MIT DESTINATION ${CURRENT_PACKAGES_DIR}/share/http-parser)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/http-parser/LICENSE-MIT ${CURRENT_PACKAGES_DIR}/share/http-parser/copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE-MIT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/external_imported/vcpkg/ports/http-parser/vcpkg.json b/external_imported/vcpkg/ports/http-parser/vcpkg.json
index bd316b2a2..943970428 100644
--- a/external_imported/vcpkg/ports/http-parser/vcpkg.json
+++ b/external_imported/vcpkg/ports/http-parser/vcpkg.json
@@ -1,7 +1,17 @@
 {
   "name": "http-parser",
-  "version-string": "2.9.4",
-  "port-version": 1,
+  "version": "2.9.4",
+  "port-version": 3,
   "description": "HTTP Parser.",
-  "homepage": "https://github.com/nodejs/http-parser"
+  "homepage": "https://github.com/nodejs/http-parser",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/hungarian/portfile.cmake b/external_imported/vcpkg/ports/hungarian/portfile.cmake
index dc02cdb2e..c988428c5 100644
--- a/external_imported/vcpkg/ports/hungarian/portfile.cmake
+++ b/external_imported/vcpkg/ports/hungarian/portfile.cmake
@@ -1,29 +1,28 @@
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://www2.informatik.uni-freiburg.de/~stachnis/misc/libhungarian-v0.1.3.tgz"
-    FILENAME "libhungarian-v0.1.3.tgz"
+    URLS "http://www2.informatik.uni-freiburg.de/~stachnis/misc/libhungarian-v${VERSION}.tgz"
+    FILENAME "libhungarian-v${VERSION}.tgz"
     SHA512 1fa105e351c307c07bb96892c9d4c44b167d92cbed80962a8653ac35b8afe00fcf5dcc2d920b95671d6c3cd86745362a64dd8dc173623a8179006e2c7b2cbc69
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
+vcpkg_extract_source_archive(
+    SOURCE_PATH
+    ARCHIVE "${ARCHIVE}"
     NO_REMOVE_ONE_LEVEL
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-vcpkg_fixup_cmake_targets()
+vcpkg_cmake_config_fixup()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 # Handle copyright
-file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/hungarian RENAME copyright)
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/external_imported/vcpkg/ports/hungarian/vcpkg.json b/external_imported/vcpkg/ports/hungarian/vcpkg.json
index 3d74f6cde..9021ac264 100644
--- a/external_imported/vcpkg/ports/hungarian/vcpkg.json
+++ b/external_imported/vcpkg/ports/hungarian/vcpkg.json
@@ -1,6 +1,16 @@
 {
   "name": "hungarian",
-  "version-string": "v0.1.3",
-  "port-version": 1,
-  "description": "C-implementation of the Hungarian Method: finding the optimal assignment (assigning a set of jobs to a set of machines) in O(n^3), where n=max{#jobs, #machines}. The implementation is a sligntly enhanced version of the implementation provided by the Stanford GraphBase"
+  "version": "0.1.3",
+  "port-version": 3,
+  "description": "C-implementation of the Hungarian Method: finding the optimal assignment (assigning a set of jobs to a set of machines) in O(n^3), where n=max{#jobs, #machines}. The implementation is a sligntly enhanced version of the implementation provided by the Stanford GraphBase",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/hunspell/0001_fix_unistd.patch b/external_imported/vcpkg/ports/hunspell/0001_fix_unistd.patch
deleted file mode 100644
index 79a48d824..000000000
--- a/external_imported/vcpkg/ports/hunspell/0001_fix_unistd.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 9f33c841afe51be517eaea318d46985c596c94ff Mon Sep 17 00:00:00 2001
-From: Mikhail Paulyshka <me@mixaill.tk>
-Date: Tue, 25 Jul 2017 01:58:39 +0300
-Subject: [PATCH] tools/hzip: fix build with MSVC
-
----
- src/tools/hzip.cxx | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/tools/hzip.cxx b/src/tools/hzip.cxx
-index ef1864f..d284c64 100644
---- a/src/tools/hzip.cxx
-+++ b/src/tools/hzip.cxx
-@@ -41,7 +41,9 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#ifdef HAVE_UNISTD_H
- #include <unistd.h>
-+#endif /* HAVE_UNISTD_H */
- #include <string>
- #include <sys/stat.h>
- 
--- 
-2.12.2.windows.2
-
-From 840f920bcd370668b9e788b3c8272eca1f20ce3a Mon Sep 17 00:00:00 2001
-From: Mikhail Paulyshka <me@mixaill.tk>
-Date: Tue, 25 Jul 2017 01:55:13 +0300
-Subject: [PATCH]  tools/unmunch: fix build with MSVC
-
----
- src/tools/unmunch.cxx | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/tools/unmunch.cxx b/src/tools/unmunch.cxx
-index 44b4cb1..2144370 100644
---- a/src/tools/unmunch.cxx
-+++ b/src/tools/unmunch.cxx
-@@ -42,7 +42,9 @@
- #include <ctype.h>
- #include <string.h>
- #include <string>
-+#ifdef HAVE_UNISTD_H
- #include <unistd.h>
-+#endif /* HAVE_UNISTD_H */
- #include <stdlib.h>
- #include <stdint.h>
- #include <stdio.h>
--- 
-2.12.2.windows.2
-
-From 1c231aa84624082a0fa52d59be8c449bfe1fadd1 Mon Sep 17 00:00:00 2001
-From: Mikhail Paulyshka <me@mixaill.tk>
-Date: Tue, 25 Jul 2017 01:50:21 +0300
-Subject: [PATCH] tools/munch: fix build with MSVC
-
-Include <unistd.h> only if exists
----
- src/tools/munch.cxx | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/tools/munch.cxx b/src/tools/munch.cxx
-index 17fc6fd..8503abe 100644
---- a/src/tools/munch.cxx
-+++ b/src/tools/munch.cxx
-@@ -40,7 +40,9 @@
- #include <ctype.h>
- #include <string.h>
- #include <string>
-+#ifdef HAVE_UNISTD_H
- #include <unistd.h>
-+#endif /* HAVE_UNISTD_H */
- #include <stdlib.h>
- #include <stdint.h>
- #include <stdio.h>
--- 
-2.12.2.windows.2
diff --git a/external_imported/vcpkg/ports/hunspell/portfile.cmake b/external_imported/vcpkg/ports/hunspell/portfile.cmake
index ab969ed50..0311f4be3 100644
--- a/external_imported/vcpkg/ports/hunspell/portfile.cmake
+++ b/external_imported/vcpkg/ports/hunspell/portfile.cmake
@@ -1,11 +1,10 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO hunspell/hunspell
-    REF v1.7.1
-    SHA512 472249309aecbbc58a025445781268867173e0651a6147f29644975ad65af043a1e2fbe91f2094934526889c7f9944739dc0a5f0d25328a77d22db1fd8f055ec
+    REF "v${VERSION}"
+    SHA512 d007edc8cb7ff95048361418b088bb062962973247c940aa826c9859a5ef90a9734100bffe7c7ac9a774f2e233605e814efb9e7fd3fc8c4ef4b978e9ec990cba
     HEAD_REF master
     PATCHES
-        0001_fix_unistd.patch
         0005-autotools-subdirs.patch
 )
 
diff --git a/external_imported/vcpkg/ports/hunspell/vcpkg.json b/external_imported/vcpkg/ports/hunspell/vcpkg.json
index cf217132c..a8399f431 100644
--- a/external_imported/vcpkg/ports/hunspell/vcpkg.json
+++ b/external_imported/vcpkg/ports/hunspell/vcpkg.json
@@ -1,11 +1,10 @@
 {
   "name": "hunspell",
-  "version": "1.7.1",
-  "port-version": 2,
+  "version": "1.7.2",
   "description": "The most popular spellchecking library.",
   "homepage": "https://github.com/hunspell/hunspell",
   "license": "MPL-1.1 OR LGPL-2.1-or-later OR GPL-2.0-or-later",
-  "supports": "!uwp",
+  "supports": "!uwp & !xbox",
   "dependencies": [
     "libiconv"
   ],
diff --git a/external_imported/vcpkg/ports/hwloc/portfile.cmake b/external_imported/vcpkg/ports/hwloc/portfile.cmake
index b56addb68..fc5f14025 100644
--- a/external_imported/vcpkg/ports/hwloc/portfile.cmake
+++ b/external_imported/vcpkg/ports/hwloc/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO open-mpi/hwloc
-    REF 42bebfa5e4b96c99c2482645c8eb86d4755ef23b
-    SHA512 87aff1e0eb7389a8d433f2936b6e23e8c37381d46fb7e60a205a97bc0f86f3c8926e3a6da6e54d4aeb89ef19abbe73a9d392f8c7871108b2a9fbf0b011de9f2c
+    REF "hwloc-${VERSION}"
+    SHA512 e49ccb8ccaf7ce29cf46a99b1fc725dfcb2ac7e5f35ffd8d9bc7f085dae3de73840427efa9fdd38555e389dd948e7cd613481309fbb6e9dac6dc52db5c5da24c
     PATCHES
         fix_shared_win_build.patch
         stdout_fileno.patch
diff --git a/external_imported/vcpkg/ports/hwloc/vcpkg.json b/external_imported/vcpkg/ports/hwloc/vcpkg.json
index 5b1d85248..db2b95a07 100644
--- a/external_imported/vcpkg/ports/hwloc/vcpkg.json
+++ b/external_imported/vcpkg/ports/hwloc/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "hwloc",
-  "version": "2.9.0",
+  "version": "2.10.0",
   "maintainers": "bgoglin<Brice.Goglin@inria.fr>",
   "description": [
     "Portable Hardware Locality (hwloc)",
diff --git a/external_imported/vcpkg/ports/hyperscan/portfile.cmake b/external_imported/vcpkg/ports/hyperscan/portfile.cmake
index 665a2873f..819eabf95 100644
--- a/external_imported/vcpkg/ports/hyperscan/portfile.cmake
+++ b/external_imported/vcpkg/ports/hyperscan/portfile.cmake
@@ -1,12 +1,10 @@
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
-set(HYPERSCAN_VERSION 5.4.0)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO intel/hyperscan
-    REF v${HYPERSCAN_VERSION}
-    SHA512 cfec3f43b9e8b3fbb2e761927f3a173c1230f2688da710ec7708f2941ce6f550a1d3cb48b0b0e2ccf709807390117a7e40047cb99190bcc341f37eb3da13ae62
+    REF "v${VERSION}"
+    SHA512 328f21133161d16b36ebdc7f8b80a7afe7ca9e7e7433348e9bfa9acb5f3641522e8314beea1b219891f4e95f1392ff8036ebb87780fe808b8b4bd15a535e9509
     HEAD_REF master
     PATCHES
         0001-remove-Werror.patch
@@ -24,6 +22,6 @@ vcpkg_cmake_install()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
 
 vcpkg_fixup_pkgconfig()
diff --git a/external_imported/vcpkg/ports/hyperscan/vcpkg.json b/external_imported/vcpkg/ports/hyperscan/vcpkg.json
index 767c6b810..3a4035d6c 100644
--- a/external_imported/vcpkg/ports/hyperscan/vcpkg.json
+++ b/external_imported/vcpkg/ports/hyperscan/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "hyperscan",
-  "version": "5.4.0",
+  "version": "5.4.2",
   "description": "A regular expression library with O(length of input) match times that takes advantage of Intel hardware to provide blazing speed.",
   "homepage": "https://www.hyperscan.io",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/hypre/fix-dll-install-destination.patch b/external_imported/vcpkg/ports/hypre/fix-dll-install-destination.patch
deleted file mode 100644
index 68d335ccf..000000000
--- a/external_imported/vcpkg/ports/hypre/fix-dll-install-destination.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -459,7 +459,7 @@ install(TARGETS ${PROJECT_NAME}
-   EXPORT HYPRETargets
-   LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-   ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
--  RUNTIME DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-+  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-   INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
- install(FILES ${HYPRE_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
- 
diff --git a/external_imported/vcpkg/ports/hypre/portfile.cmake b/external_imported/vcpkg/ports/hypre/portfile.cmake
index 8645eaef1..145f8ecc6 100644
--- a/external_imported/vcpkg/ports/hypre/portfile.cmake
+++ b/external_imported/vcpkg/ports/hypre/portfile.cmake
@@ -5,17 +5,16 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO hypre-space/hypre
-    REF v2.23.0
-    SHA512 bed8426d093e2290ab443f49deffad96a64e1b3844a4236bc59af19523b16ea8bf2318db21e42ab2b8a4dd529246ba1d9a4eb0cb3bd943633569d03e6311f67f
+    REF "v${VERSION}"
+    SHA512 fe92d09b56107845e3a4b7f0e7bbba5f319a7ebdaaecab3e6b89fae1fe2a79a9dd712806823ea518f5960f0eaa1088f6b82ebac63d3940478d36690f3adec4f2
     HEAD_REF master
-    PATCHES
-        fix-dll-install-destination.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" HYPRE_SHARED)
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}/src"
+    DISABLE_PARALLEL_CONFIGURE # See 'Autogenerate csr_spgemm_device_numer$ files'
     OPTIONS
         -DHYPRE_SHARED=${HYPRE_SHARED}
         -DHYPRE_ENABLE_HYPRE_BLAS=OFF
diff --git a/external_imported/vcpkg/ports/hypre/vcpkg.json b/external_imported/vcpkg/ports/hypre/vcpkg.json
index bcdb97323..396c5c364 100644
--- a/external_imported/vcpkg/ports/hypre/vcpkg.json
+++ b/external_imported/vcpkg/ports/hypre/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "hypre",
-  "version": "2.23.0",
+  "version": "2.29.0",
+  "port-version": 1,
   "description": "Parallel solvers for sparse linear systems featuring multigrid methods",
   "homepage": "https://computation.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/icu/darwin-rpath.patch b/external_imported/vcpkg/ports/icu/darwin-rpath.patch
new file mode 100644
index 000000000..3de84594f
--- /dev/null
+++ b/external_imported/vcpkg/ports/icu/darwin-rpath.patch
@@ -0,0 +1,14 @@
+diff --git a/source/config/mh-darwin b/source/config/mh-darwin
+index 7b15709..e2cdbdb 100644
+--- a/source/config/mh-darwin
++++ b/source/config/mh-darwin
+@@ -31,7 +31,8 @@ SHLIB.cc=	$(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) $(LD_SOOPTIONS)
+ 
+ ## Compiler switches to embed a library name and version information
+ ifeq ($(ENABLE_RPATH),YES)
+-LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET))
++ID_PREFIX = @rpath
++LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(ID_PREFIX)/$(notdir $(MIDDLE_SO_TARGET))
+ else
+ LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET)) $(PKGDATA_TRAILING_SPACE)
+ endif
diff --git a/external_imported/vcpkg/ports/icu/portfile.cmake b/external_imported/vcpkg/ports/icu/portfile.cmake
index a3f8f97da..352a81c74 100644
--- a/external_imported/vcpkg/ports/icu/portfile.cmake
+++ b/external_imported/vcpkg/ports/icu/portfile.cmake
@@ -1,4 +1,3 @@
-vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
 string(REGEX MATCH "^[0-9]*" ICU_VERSION_MAJOR "${VERSION}")
 string(REPLACE "." "_" VERSION2 "${VERSION}")
 string(REPLACE "." "-" VERSION3 "${VERSION}")
@@ -7,7 +6,7 @@ vcpkg_download_distfile(
     ARCHIVE
     URLS "https://github.com/unicode-org/icu/releases/download/release-${VERSION3}/icu4c-${VERSION2}-src.tgz"
     FILENAME "icu4c-${VERSION2}-src.tgz"
-    SHA512 848c341b37c0ff077e34a95d92c6200d5aaddd0ee5e06134101a74e04deb08256a5e817c8aefab020986abe810b7827dd7b2169a60dacd250c298870518dcae8
+    SHA512 32c28270aa5d94c58d2b1ef46d4ab73149b5eaa2e0621d4a4c11597b71d146812f5e66db95f044e8aaa11b94e99edd4a48ab1aa8efbe3d72a73870cd56b564c2
 )
 
 vcpkg_extract_source_archive(SOURCE_PATH
@@ -20,23 +19,35 @@ vcpkg_extract_source_archive(SOURCE_PATH
         mingw-dll-install.patch
         disable-static-prefix.patch # https://gitlab.kitware.com/cmake/cmake/-/issues/16617; also mingw.
         fix-win-build.patch
+        vcpkg-cross-data.patch
+        darwin-rpath.patch
 )
 
 vcpkg_find_acquire_program(PYTHON3)
 set(ENV{PYTHON} "${PYTHON3}")
 
+vcpkg_list(SET CONFIGURE_OPTIONS)
+vcpkg_list(SET BUILD_OPTIONS)
+
+if(VCPKG_TARGET_IS_EMSCRIPTEN)
+    vcpkg_list(APPEND CONFIGURE_OPTIONS --disable-extras)
+    vcpkg_list(APPEND BUILD_OPTIONS "PKGDATA_OPTS=--without-assembly -O ../data/icupkg.inc")
+elseif(VCPKG_TARGET_IS_UWP)
+    vcpkg_list(APPEND CONFIGURE_OPTIONS --disable-extras ac_cv_func_tzset=no ac_cv_func__tzset=no)
+    string(APPEND VCPKG_C_FLAGS " -DU_PLATFORM_HAS_WINUWP_API=1")
+    string(APPEND VCPKG_CXX_FLAGS " -DU_PLATFORM_HAS_WINUWP_API=1")
+    vcpkg_list(APPEND BUILD_OPTIONS "PKGDATA_OPTS=--windows-uwp-build -O ../data/icupkg.inc")
+elseif(VCPKG_TARGET_IS_OSX AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    vcpkg_list(APPEND CONFIGURE_OPTIONS --enable-rpath)
+    if(DEFINED CMAKE_INSTALL_NAME_DIR)
+        vcpkg_list(APPEND BUILD_OPTIONS "ID_PREFIX=${CMAKE_INSTALL_NAME_DIR}")
+    endif()
+endif()
+
 if(VCPKG_TARGET_IS_WINDOWS)
     list(APPEND CONFIGURE_OPTIONS --enable-icu-build-win)
 endif()
 
-list(APPEND CONFIGURE_OPTIONS --disable-samples --disable-tests --disable-layoutex)
-
-list(APPEND CONFIGURE_OPTIONS_RELEASE --disable-debug --enable-release)
-list(APPEND CONFIGURE_OPTIONS_DEBUG  --enable-debug --disable-release)
-
-set(RELEASE_TRIPLET ${TARGET_TRIPLET}-rel)
-set(DEBUG_TRIPLET ${TARGET_TRIPLET}-dbg)
-
 if("tools" IN_LIST FEATURES)
   list(APPEND CONFIGURE_OPTIONS --enable-tools)
 else()
@@ -54,87 +65,23 @@ endif()
 
 vcpkg_configure_make(
     SOURCE_PATH "${SOURCE_PATH}"
-    AUTOCONFIG
     PROJECT_SUBPATH source
-    ADDITIONAL_MSYS_PACKAGES autoconf-archive
-    OPTIONS ${CONFIGURE_OPTIONS}
-    OPTIONS_RELEASE ${CONFIGURE_OPTIONS_RELEASE}
-    OPTIONS_DEBUG ${CONFIGURE_OPTIONS_DEBUG}
+    AUTOCONFIG
     DETERMINE_BUILD_TRIPLET
+    ADDITIONAL_MSYS_PACKAGES autoconf-archive
+    OPTIONS
+        ${CONFIGURE_OPTIONS}
+        --disable-samples
+        --disable-tests
+        --disable-layoutex
+    OPTIONS_RELEASE
+        --disable-debug
+        --enable-release
+    OPTIONS_DEBUG
+        --enable-debug
+        --disable-release
 )
-
-if(VCPKG_TARGET_IS_OSX AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-
-    vcpkg_build_make()
-    # remove this block if https://unicode-org.atlassian.net/browse/ICU-21458
-    # is resolved and use the configure script instead
-    if(DEFINED CMAKE_INSTALL_NAME_DIR)
-        set(ID_PREFIX "${CMAKE_INSTALL_NAME_DIR}")
-    else()
-        set(ID_PREFIX "@rpath")
-    endif()
-
-    # install_name_tool may be missing if cross-compiling
-    find_program(
-        INSTALL_NAME_TOOL
-        install_name_tool
-        HINTS /usr/bin /Library/Developer/CommandLineTools/usr/bin/
-        DOC "Absolute path of install_name_tool"
-        REQUIRED
-    )
-
-    message(STATUS "setting rpath prefix for macOS dynamic libraries")
-
-    # add ID_PREFIX to libicudata libicui18n libicuio libicutu libicuuc
-    foreach(LIB_NAME IN ITEMS libicudata libicui18n libicuio libicutu libicuuc)
-        vcpkg_execute_build_process(
-            COMMAND "${INSTALL_NAME_TOOL}" -id "${ID_PREFIX}/${LIB_NAME}.${ICU_VERSION_MAJOR}.dylib"
-            "${LIB_NAME}.${VERSION}.dylib"
-            WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/lib"
-            LOGNAME "make-build-fix-rpath-${RELEASE_TRIPLET}"
-        )
-    endforeach()
-
-    # add ID_PREFIX to libicui18n libicuio libicutu dependencies
-    foreach(LIB_NAME IN ITEMS libicui18n libicuio)
-        vcpkg_execute_build_process(
-            COMMAND "${INSTALL_NAME_TOOL}" -change "libicuuc.${ICU_VERSION_MAJOR}.dylib"
-                                                "${ID_PREFIX}/libicuuc.${ICU_VERSION_MAJOR}.dylib"
-                                                "${LIB_NAME}.${VERSION}.dylib"
-            WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/lib"
-            LOGNAME "make-build-fix-rpath-${RELEASE_TRIPLET}"
-        )
-        vcpkg_execute_build_process(
-            COMMAND "${INSTALL_NAME_TOOL}" -change "libicudata.${ICU_VERSION_MAJOR}.dylib"
-                                                "${ID_PREFIX}/libicudata.${ICU_VERSION_MAJOR}.dylib"
-                                                "${LIB_NAME}.${VERSION}.dylib"
-            WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/lib"
-            LOGNAME "make-build-fix-rpath-${RELEASE_TRIPLET}"
-        )
-    endforeach()
-
-    # add ID_PREFIX to remaining libicuio libicutu dependencies
-    foreach(LIB_NAME libicuio libicutu)
-        vcpkg_execute_build_process(
-            COMMAND "${INSTALL_NAME_TOOL}" -change "libicui18n.${ICU_VERSION_MAJOR}.dylib"
-                                                "${ID_PREFIX}/libicui18n.${ICU_VERSION_MAJOR}.dylib"
-                                                "${LIB_NAME}.${VERSION}.dylib"
-            WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/lib"
-            LOGNAME "make-build-fix-rpath-${RELEASE_TRIPLET}"
-        )
-    endforeach()
-
-    # add ID_PREFIX to libicuuc dependencies
-    vcpkg_execute_build_process(
-        COMMAND "${INSTALL_NAME_TOOL}" -change "libicudata.${ICU_VERSION_MAJOR}.dylib"
-                                            "${ID_PREFIX}/libicudata.${ICU_VERSION_MAJOR}.dylib"
-                                            "libicuuc.${VERSION}.dylib"
-        WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/lib"
-        LOGNAME "make-build-fix-rpath-${RELEASE_TRIPLET}"
-    )
-endif()
-
-vcpkg_install_make()
+vcpkg_install_make(OPTIONS ${BUILD_OPTIONS})
 
 file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/share"
@@ -171,7 +118,7 @@ file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/tools/icu/debug")
 
 # To cross compile, we need some files at specific positions. So lets copy them
-file(GLOB CROSS_COMPILE_DEFS "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/config/icucross.*")
+file(GLOB CROSS_COMPILE_DEFS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/config/icucross.*")
 file(INSTALL ${CROSS_COMPILE_DEFS} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/config")
 
 file(GLOB RELEASE_DLLS "${CURRENT_PACKAGES_DIR}/lib/*icu*${ICU_VERSION_MAJOR}.dll")
@@ -197,4 +144,4 @@ vcpkg_fixup_pkgconfig()
 vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/icu/bin/icu-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../")
 
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/icu/vcpkg-cross-data.patch b/external_imported/vcpkg/ports/icu/vcpkg-cross-data.patch
new file mode 100644
index 000000000..7ca87fb93
--- /dev/null
+++ b/external_imported/vcpkg/ports/icu/vcpkg-cross-data.patch
@@ -0,0 +1,13 @@
+diff --git a/source/configure.ac b/source/configure.ac
+index 1bd5871..c508f48 100644
+--- a/source/configure.ac
++++ b/source/configure.ac
+@@ -1151,7 +1151,7 @@ AC_ARG_ENABLE(fuzzer,
+ 	fuzzer=false)
+ ICU_CONDITIONAL(FUZZER, test "$fuzzer" = true)
+ 
+-ICU_CONDITIONAL(DATA, test "$tools" = true || test "$cross_compiling" = "yes")
++ICU_CONDITIONAL(DATA, test "$tools" = true || test "$cross_compiling" = "yes" || test -n "$cross_buildroot")
+ 
+ AC_ARG_WITH(data-packaging,
+ 	[  --with-data-packaging     specify how to package ICU data. Possible values:
diff --git a/external_imported/vcpkg/ports/icu/vcpkg.json b/external_imported/vcpkg/ports/icu/vcpkg.json
index b8f4af015..8fe00137a 100644
--- a/external_imported/vcpkg/ports/icu/vcpkg.json
+++ b/external_imported/vcpkg/ports/icu/vcpkg.json
@@ -1,11 +1,10 @@
 {
   "name": "icu",
-  "version": "72.1",
-  "port-version": 3,
+  "version": "74.1",
+  "port-version": 1,
   "description": "Mature and widely used Unicode and localization library.",
   "homepage": "https://icu.unicode.org/home",
   "license": "ICU",
-  "supports": "!uwp",
   "dependencies": [
     {
       "name": "icu",
@@ -17,7 +16,8 @@
   ],
   "features": {
     "tools": {
-      "description": "Build tools"
+      "description": "Build tools",
+      "supports": "!uwp"
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/ideviceinstaller/001_fix_windows.patch b/external_imported/vcpkg/ports/ideviceinstaller/001_fix_windows.patch
new file mode 100644
index 000000000..16f1149ff
--- /dev/null
+++ b/external_imported/vcpkg/ports/ideviceinstaller/001_fix_windows.patch
@@ -0,0 +1,47 @@
+diff --git a/src/ideviceinstaller.c b/src/ideviceinstaller.c
+index c50bacf..e4a8c3d 100644
+--- a/src/ideviceinstaller.c
++++ b/src/ideviceinstaller.c
+@@ -32,7 +32,9 @@
+ #include <getopt.h>
+ #include <errno.h>
+ #include <time.h>
++#ifndef _MSC_VER
+ #include <libgen.h>
++#endif
+ #include <inttypes.h>
+ #include <limits.h>
+ #include <sys/stat.h>
+@@ -87,6 +89,32 @@ static int asprintf(char **PTR, const char *TEMPLATE, ...)
+ }
+ #endif
+ 
++#ifdef _MSC_VER
++#ifndef ISSLASH
++#define ISSLASH(C) ((C) == '/' || (C) == '\\')
++#endif
++char *basename(char const *name) {
++    char const *base = name;
++    char const *p;
++    for (p = base; *p; p++) {
++        if (ISSLASH(*p)) {
++            do p++;
++            while (ISSLASH(*p));
++
++            if (!*p) {
++                if (ISSLASH(*base))
++                    base = p - 1;
++                break;
++            }
++
++            base = p;
++        }
++    }
++
++    return (char *) base;
++}
++#endif
++
+ #define ITUNES_METADATA_PLIST_FILENAME "iTunesMetadata.plist"
+ 
+ const char PKG_PATH[] = "PublicStaging";
diff --git a/external_imported/vcpkg/ports/ideviceinstaller/Add-missing-lib.patch b/external_imported/vcpkg/ports/ideviceinstaller/Add-missing-lib.patch
deleted file mode 100644
index 5e6629516..000000000
--- a/external_imported/vcpkg/ports/ideviceinstaller/Add-missing-lib.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/ideviceinstaller.vcxproj b/ideviceinstaller.vcxproj
-index dd8d483..4b15d7e 100644
---- a/ideviceinstaller.vcxproj
-+++ b/ideviceinstaller.vcxproj
-@@ -112,7 +112,7 @@
-     <Link>
-       <SubSystem>Console</SubSystem>
-       <GenerateDebugInformation>true</GenerateDebugInformation>
--      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-     </Link>
-   </ItemDefinitionGroup>
-   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-@@ -126,7 +126,7 @@
-     <Link>
-       <SubSystem>Console</SubSystem>
-       <GenerateDebugInformation>true</GenerateDebugInformation>
--      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-     </Link>
-   </ItemDefinitionGroup>
-   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-@@ -144,7 +144,7 @@
-       <EnableCOMDATFolding>true</EnableCOMDATFolding>
-       <OptimizeReferences>true</OptimizeReferences>
-       <GenerateDebugInformation>true</GenerateDebugInformation>
--      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-     </Link>
-   </ItemDefinitionGroup>
-   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-@@ -162,7 +162,7 @@
-       <EnableCOMDATFolding>true</EnableCOMDATFolding>
-       <OptimizeReferences>true</OptimizeReferences>
-       <GenerateDebugInformation>true</GenerateDebugInformation>
--      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-     </Link>
-   </ItemDefinitionGroup>
-   <ItemDefinitionGroup>
diff --git a/external_imported/vcpkg/ports/ideviceinstaller/CMakeLists.txt b/external_imported/vcpkg/ports/ideviceinstaller/CMakeLists.txt
new file mode 100644
index 000000000..e1923497f
--- /dev/null
+++ b/external_imported/vcpkg/ports/ideviceinstaller/CMakeLists.txt
@@ -0,0 +1,46 @@
+cmake_minimum_required(VERSION 3.15)
+project(ideviceinstaller C)
+
+include(GNUInstallDirs)
+
+file(GLOB_RECURSE IDEVICEINSTALLER_SOURCE src/*.c src/*.h)
+
+set(DEFINITIONS)
+
+list(APPEND DEFINITIONS -DPACKAGE_NAME="ideviceinstaller")
+list(APPEND DEFINITIONS -DPACKAGE_VERSION="1.1.1")
+list(APPEND DEFINITIONS -DPACKAGE_URL="https://github.com/libimobiledevice/ideviceinstaller")
+list(APPEND DEFINITIONS -DPACKAGE_BUGREPORT="https://github.com/libimobiledevice/ideviceinstaller/issues")
+
+if(UNIX)
+    list(APPEND DEFINITIONS -DHAVE_VASPRINTF)
+    list(APPEND DEFINITIONS -DHAVE_ASPRINTF)
+    list(APPEND DEFINITIONS -DHAVE_UNISTD_H)
+endif()
+
+if(WIN32)
+    list(APPEND DEFINITIONS -D_CRT_SECURE_NO_WARNINGS)
+    list(APPEND DEFINITIONS -DWIN32)
+endif()
+
+find_package(unofficial-libimobiledevice CONFIG REQUIRED)
+find_package(libzip CONFIG REQUIRED)
+find_path(DIRENT_INCLUDE_DIR dirent.h REQUIRED)
+
+add_executable(ideviceinstaller ${IDEVICEINSTALLER_SOURCE})
+target_include_directories(ideviceinstaller PRIVATE
+    ${DIRENT_INCLUDE_DIR}
+)
+target_compile_definitions(ideviceinstaller PRIVATE ${DEFINITIONS})
+target_link_libraries(ideviceinstaller PRIVATE
+    unofficial::libimobiledevice::libimobiledevice
+    libzip::zip
+)
+
+if(WIN32)
+    find_package(unofficial-getopt-win32 REQUIRED)
+    target_link_libraries(ideviceinstaller PRIVATE unofficial::getopt-win32::getopt)
+endif()
+
+install(TARGETS ideviceinstaller
+    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
diff --git a/external_imported/vcpkg/ports/ideviceinstaller/portfile.cmake b/external_imported/vcpkg/ports/ideviceinstaller/portfile.cmake
index 2d8caad8f..6f96b2edf 100644
--- a/external_imported/vcpkg/ports/ideviceinstaller/portfile.cmake
+++ b/external_imported/vcpkg/ports/ideviceinstaller/portfile.cmake
@@ -1,19 +1,24 @@
-vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO libimobiledevice-win32/ideviceinstaller
-    REF ${VERSION}
-    SHA512 d0801b3a38eb02206a6f06e05cc19b794c69a87c06895165f64522c61e07030046499c5f0e436981682f9e17f91eae87913cca091e2e039a74ee35a5136100d4
-    HEAD_REF msvc-master
-    PATCHES Add-missing-lib.patch
+    REPO libimobiledevice/ideviceinstaller
+    REF b9cfe0b264f66eab9ad88e11eb6b0523cb1de911 # commits on 2023-07-21
+    SHA512 a78418001109593f2d704d91aff8df009e15c504c2139ca606c9719b70868466ef73778d52670468a4b7bf758ec65435c1b981c27809a2e22737f7587ad51c7d
+    HEAD_REF master
+    PATCHES
+        001_fix_windows.patch
 )
 
-vcpkg_install_msbuild(
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
+
+vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    PROJECT_SUBPATH ideviceinstaller.vcxproj
-    LICENSE_SUBPATH COPYING
-    USE_VCPKG_INTEGRATION
 )
 
+vcpkg_cmake_install()
+vcpkg_copy_tools(TOOL_NAMES ideviceinstaller AUTO_CLEAN)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
+
 set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
diff --git a/external_imported/vcpkg/ports/ideviceinstaller/vcpkg.json b/external_imported/vcpkg/ports/ideviceinstaller/vcpkg.json
index ff9ea7072..0f4071af1 100644
--- a/external_imported/vcpkg/ports/ideviceinstaller/vcpkg.json
+++ b/external_imported/vcpkg/ports/ideviceinstaller/vcpkg.json
@@ -1,13 +1,18 @@
 {
   "name": "ideviceinstaller",
-  "version": "1.1.2.23",
-  "port-version": 5,
+  "version-date": "2023-07-21",
   "description": "Manage apps of iOS devices",
   "homepage": "https://libimobiledevice.org/",
-  "license": "LGPL-2.1-only",
-  "supports": "windows & !arm64",
+  "license": "LGPL-2.0-or-later",
+  "supports": "!uwp & !android & !ios & !xbox",
   "dependencies": [
+    "dirent",
+    "getopt",
     "libimobiledevice",
-    "libzip"
+    "libzip",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
   ]
 }
diff --git a/external_imported/vcpkg/ports/idevicerestore/CMakeLists.txt b/external_imported/vcpkg/ports/idevicerestore/CMakeLists.txt
new file mode 100644
index 000000000..cff54d956
--- /dev/null
+++ b/external_imported/vcpkg/ports/idevicerestore/CMakeLists.txt
@@ -0,0 +1,59 @@
+cmake_minimum_required(VERSION 3.15)
+project(idevicerestore C)
+
+include(GNUInstallDirs)
+
+file(GLOB_RECURSE IDEVICERESTORE_SOURCE src/*.c src/*.h)
+list(FILTER IDEVICERESTORE_SOURCE EXCLUDE REGEX "sha(1|512)\\.(c|h)$")
+
+set(DEFINITIONS)
+
+list(APPEND DEFINITIONS -DPACKAGE_NAME="idevicerestore")
+list(APPEND DEFINITIONS -DPACKAGE_VERSION="1.0.0")
+list(APPEND DEFINITIONS -DPACKAGE_URL="https://github.com/libimobiledevice/idevicerestore")
+list(APPEND DEFINITIONS -DPACKAGE_BUGREPORT="https://github.com/libimobiledevice/idevicerestore/issues")
+
+list(APPEND DEFINITIONS -DHAVE_REVERSE_PROXY)
+
+list(APPEND DEFINITIONS -DHAVE_OPENSSL)
+
+if(UNIX)
+    list(APPEND DEFINITIONS -DHAVE_REALPATH)
+endif()
+
+if(WIN32)
+    list(APPEND DEFINITIONS -D_CRT_SECURE_NO_WARNINGS)
+    list(APPEND DEFINITIONS -DWIN32)
+endif()
+
+find_package(CURL CONFIG REQUIRED)
+find_package(unofficial-libimobiledevice CONFIG REQUIRED)
+find_package(unofficial-libimobiledevice-glue CONFIG REQUIRED)
+find_package(unofficial-libirecovery CONFIG REQUIRED)
+find_package(libzip CONFIG REQUIRED)
+find_package(OpenSSL REQUIRED)
+find_package(ZLIB REQUIRED)
+find_path(DIRENT_INCLUDE_DIR dirent.h REQUIRED)
+
+add_executable(idevicerestore ${IDEVICERESTORE_SOURCE})
+target_include_directories(idevicerestore PRIVATE
+    ${DIRENT_INCLUDE_DIR}
+)
+target_compile_definitions(idevicerestore PRIVATE ${DEFINITIONS})
+target_link_libraries(idevicerestore PRIVATE
+    CURL::libcurl
+    unofficial::libimobiledevice::libimobiledevice
+    unofficial::libimobiledevice-glue::libimobiledevice-glue
+    unofficial::libirecovery::libirecovery
+    libzip::zip
+    OpenSSL::SSL
+    OpenSSL::Crypto
+    ZLIB::ZLIB
+)
+if(WIN32)
+    find_package(unofficial-getopt-win32 REQUIRED)
+    target_link_libraries(idevicerestore PRIVATE unofficial::getopt-win32::getopt)
+endif()
+
+install(TARGETS idevicerestore
+    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
diff --git a/external_imported/vcpkg/ports/idevicerestore/fix-libgen.h-cannot-be-found.patch b/external_imported/vcpkg/ports/idevicerestore/fix-libgen.h-cannot-be-found.patch
deleted file mode 100644
index db7450eb2..000000000
--- a/external_imported/vcpkg/ports/idevicerestore/fix-libgen.h-cannot-be-found.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/src/common.c b/src/common.c
-index afe1bc0..9219a8f 100644
---- a/src/common.c
-+++ b/src/common.c
-@@ -29,7 +29,9 @@
- #include <stdlib.h>
- #include <string.h>
- #include <errno.h>
-+#ifndef _MSC_VER
- #include <libgen.h>
-+#endif
- #include <time.h>
- 
- #include "common.h"
-diff --git a/src/idevicerestore.c b/src/idevicerestore.c
-index efa13c3..c17a2ba 100644
---- a/src/idevicerestore.c
-+++ b/src/idevicerestore.c
-@@ -38,12 +38,12 @@
- #include <string.h>
- #ifndef _MSC_VER
- #include <unistd.h>
-+#include <libgen.h>
- #endif
- #include <ctype.h>
- #include <getopt.h>
- #include <plist/plist.h>
- #include <zlib.h>
--#include <libgen.h>
- 
- #include <curl/curl.h>
- 
diff --git a/external_imported/vcpkg/ports/idevicerestore/fix-vcxproj.patch b/external_imported/vcpkg/ports/idevicerestore/fix-vcxproj.patch
deleted file mode 100644
index 79ff322b3..000000000
--- a/external_imported/vcpkg/ports/idevicerestore/fix-vcxproj.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/idevicerestore.vcxproj b/idevicerestore.vcxproj
-index fa209fa..6afa088 100644
---- a/idevicerestore.vcxproj
-+++ b/idevicerestore.vcxproj
-@@ -92,9 +92,10 @@
-       <Optimization>Disabled</Optimization>
-       <SDLCheck>true</SDLCheck>
-       <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_WINSOCK_DEPRECATED_NO_WARNINGS</PreprocessorDefinitions>
-+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
-     </ClCompile>
-     <Link>
--      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl-d.lib;%(AdditionalDependencies)</AdditionalDependencies>
-     </Link>
-   </ItemDefinitionGroup>
-   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-@@ -103,9 +104,10 @@
-       <Optimization>Disabled</Optimization>
-       <SDLCheck>true</SDLCheck>
-       <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_WINSOCK_DEPRECATED_NO_WARNINGS</PreprocessorDefinitions>
-+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
-     </ClCompile>
-     <Link>
--      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl-d.lib;%(AdditionalDependencies)</AdditionalDependencies>
-     </Link>
-   </ItemDefinitionGroup>
-   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-@@ -116,6 +118,7 @@
-       <IntrinsicFunctions>true</IntrinsicFunctions>
-       <SDLCheck>true</SDLCheck>
-       <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_WINSOCK_DEPRECATED_NO_WARNINGS</PreprocessorDefinitions>
-+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
-     </ClCompile>
-     <Link>
-       <EnableCOMDATFolding>true</EnableCOMDATFolding>
-@@ -131,6 +134,7 @@
-       <IntrinsicFunctions>true</IntrinsicFunctions>
-       <SDLCheck>true</SDLCheck>
-       <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_WINSOCK_DEPRECATED_NO_WARNINGS</PreprocessorDefinitions>
-+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
-     </ClCompile>
-     <Link>
-       <EnableCOMDATFolding>true</EnableCOMDATFolding>
diff --git a/external_imported/vcpkg/ports/idevicerestore/portfile.cmake b/external_imported/vcpkg/ports/idevicerestore/portfile.cmake
index 0bc503cea..de3dfd2bd 100644
--- a/external_imported/vcpkg/ports/idevicerestore/portfile.cmake
+++ b/external_imported/vcpkg/ports/idevicerestore/portfile.cmake
@@ -1,19 +1,22 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO libimobiledevice-win32/idevicerestore
-    REF 1.0.12
-    SHA512 ba623be56c2f37853516d7d4c32e16f1ec72f33d512f18aa812ce6830af4b9e389f7af5321888dd0ddd168e282b652e379b60f90970680e213eabf489f406915
-    HEAD_REF msvc-master
-    PATCHES
-        fix-vcxproj.patch
-        fix-libgen.h-cannot-be-found.patch
+    REPO libimobiledevice/idevicerestore
+    REF 609f7f058487596597e8e742088119fdd46729df # commits on 2023-05-23
+    SHA512 9427c438d1967f1717424dd1d1b789d3d139b3fcacee15911e531d6377039927c147150dafacd251b92d57134e72c49de6e1a053fcd63f14c780e60dc5b13fc5
+    HEAD_REF master
 )
 
-vcpkg_install_msbuild(
-    SOURCE_PATH ${SOURCE_PATH}
-    PROJECT_SUBPATH idevicerestore.vcxproj
-    LICENSE_SUBPATH COPYING
-    USE_VCPKG_INTEGRATION
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
 )
 
+vcpkg_cmake_install()
+vcpkg_copy_tools(TOOL_NAMES idevicerestore AUTO_CLEAN)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
+
 set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
diff --git a/external_imported/vcpkg/ports/idevicerestore/vcpkg.json b/external_imported/vcpkg/ports/idevicerestore/vcpkg.json
index 056ccaf12..674562d21 100644
--- a/external_imported/vcpkg/ports/idevicerestore/vcpkg.json
+++ b/external_imported/vcpkg/ports/idevicerestore/vcpkg.json
@@ -1,13 +1,23 @@
 {
   "name": "idevicerestore",
-  "version": "1.0.12",
-  "port-version": 7,
+  "version-date": "2023-05-23",
   "description": "Restore/upgrade firmware of iOS devices",
-  "supports": "windows",
+  "homepage": "https://libimobiledevice.org/",
+  "license": "LGPL-3.0-or-later",
+  "supports": "(!windows & !android & !ios) | mingw",
   "dependencies": [
     "curl",
+    "dirent",
+    "getopt",
     "libimobiledevice",
+    "libimobiledevice-glue",
     "libirecovery",
-    "libzip"
+    "libzip",
+    "openssl",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    "zlib"
   ]
 }
diff --git a/external_imported/vcpkg/ports/idyntree/portfile.cmake b/external_imported/vcpkg/ports/idyntree/portfile.cmake
new file mode 100644
index 000000000..412b44a5a
--- /dev/null
+++ b/external_imported/vcpkg/ports/idyntree/portfile.cmake
@@ -0,0 +1,55 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO robotology/idyntree
+    REF "v${VERSION}"
+    SHA512 1861ed193789559354bcfa81183b2bcc985dde2d71c114d369e01c37268e64624f50a1c416f48392dc5b9230e0bfc576bd5714f4d4368994df4dffc4623d989a
+    HEAD_REF master
+)
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        "assimp" IDYNTREE_USES_ASSIMP
+        "irrlicht" IDYNTREE_USES_IRRLICHT
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        ${FEATURE_OPTIONS}
+        -DIDYNTREE_USES_IPOPT:BOOL=OFF
+        -DIDYNTREE_USES_OSQPEIGEN:BOOL=OFF
+        -DIDYNTREE_USES_MATLAB:BOOL=OFF
+        -DIDYNTREE_USES_PYTHON:BOOL=OFF
+        -DIDYNTREE_USES_OCTAVE:BOOL=OFF
+        -DIDYNTREE_USES_LUA:BOOL=OFF
+        -DIDYNTREE_USES_YARP:BOOL=OFF
+        -DIDYNTREE_USES_ICUB_MAIN:BOOL=OFF
+        -DIDYNTREE_USES_ALGLIB:BOOL=OFF
+        -DIDYNTREE_USES_WORHP:BOOL=OFF
+        -DIDYNTREE_COMPILE_TESTS=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(
+    PACKAGE_NAME iDynTree
+    CONFIG_PATH lib/cmake/iDynTree)
+vcpkg_copy_pdbs()
+
+set(TOOL_NAMES_LIST idyntree-model-info)
+if ("assimp" IN_LIST FEATURES)
+    list(APPEND TOOL_NAMES_LIST idyntree-model-simplify-shapes)
+endif()
+if ("irrlicht" IN_LIST FEATURES)
+    list(APPEND TOOL_NAMES_LIST idyntree-model-view)
+endif()
+vcpkg_copy_tools(
+    TOOL_NAMES ${TOOL_NAMES_LIST}
+    AUTO_CLEAN
+)
+
+file(REMOVE_RECURSE
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+)
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/idyntree/usage b/external_imported/vcpkg/ports/idyntree/usage
new file mode 100644
index 000000000..402e64fba
--- /dev/null
+++ b/external_imported/vcpkg/ports/idyntree/usage
@@ -0,0 +1,4 @@
+The package idyntree provides CMake targets:
+
+    find_package(iDynTree CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE iDynTree::idyntree-core iDynTree::idyntree-model iDynTree::idyntree-modelio iDynTree::idyntree-modelio iDynTree::idyntree-high-level iDynTree::idyntree-estimation)
diff --git a/external_imported/vcpkg/ports/idyntree/vcpkg.json b/external_imported/vcpkg/ports/idyntree/vcpkg.json
new file mode 100644
index 000000000..14f0d389a
--- /dev/null
+++ b/external_imported/vcpkg/ports/idyntree/vcpkg.json
@@ -0,0 +1,39 @@
+{
+  "name": "idyntree",
+  "version": "10.0.0",
+  "description": "Multibody Dynamics Library designed for Free Floating Robots.",
+  "homepage": "https://github.com/robotology/idyntree",
+  "license": "BSD-3-Clause",
+  "supports": "!xbox",
+  "dependencies": [
+    "eigen3",
+    "libxml2",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
+  "default-features": [
+    "assimp"
+  ],
+  "features": {
+    "assimp": {
+      "description": "Add support for loading meshes",
+      "dependencies": [
+        "assimp"
+      ]
+    },
+    "irrlicht": {
+      "description": "Add support for irrlicht-based visualizer",
+      "supports": "!windows",
+      "dependencies": [
+        "glfw3",
+        "irrlicht"
+      ]
+    }
+  }
+}
diff --git a/external_imported/vcpkg/ports/if97/portfile.cmake b/external_imported/vcpkg/ports/if97/portfile.cmake
index 84948c811..da7f1139a 100644
--- a/external_imported/vcpkg/ports/if97/portfile.cmake
+++ b/external_imported/vcpkg/ports/if97/portfile.cmake
@@ -4,9 +4,10 @@ vcpkg_from_github(
     REF v2.1.3
     SHA512 b29a74f134d69b72ba4bb825b25f0631f2fb335500da5d9016c4e6e417d8c93a5b309e95770eb6a7b723948dd82a7b46d873a1fe4e3f3047a881603442d73eff
     HEAD_REF master
+    PATCHES
+        relax-encoding.diff
 )
 
 file(INSTALL "${SOURCE_PATH}/IF97.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
 
-# Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/if97/relax-encoding.diff b/external_imported/vcpkg/ports/if97/relax-encoding.diff
new file mode 100644
index 000000000..e48ae2bb5
--- /dev/null
+++ b/external_imported/vcpkg/ports/if97/relax-encoding.diff
@@ -0,0 +1,48 @@
+diff --git a/IF97.h b/IF97.h
+index 864f3a0..4e6cab5 100644
+--- a/IF97.h
++++ b/IF97.h
+@@ -52,7 +52,7 @@ namespace IF97
+     // IF97 Constants
+     const double Tcrit   = 647.096;             // K
+     const double Pcrit   = 22.064*p_fact;       // MPa*
+-    const double Rhocrit = 322.0;               // kg/m³
++    const double Rhocrit = 322.0;               // kg/m^3
+     const double Scrit   = 4.41202148223476*R_fact; // kJ*/kg-K (needed for backward eqn. in Region 3(a)(b)
+     const double Ttrip   = 273.16;              // K
+     const double Ptrip   = 0.000611656*p_fact;  // MPa*
+@@ -2394,7 +2394,7 @@ namespace IF97
+         //    The equation is rearranged to solve for rho and turned
+         //    into functions f(T,P,rho0) and f'(T,P,rho0) for the
+         //    Newton-Raphson technique.  Functions for
+-        //    dphi/ddelta and d²phi/ddelta² were also required.  These
++        //    dphi/ddelta and d^2phi/ddelta^2 were also required.  These
+         //    additional Taylor functions are defined above.
+         //
+         double f(double T, double p, double rho0) const{
+@@ -4172,7 +4172,7 @@ namespace IF97
+             return RegionOutput( IF97_HMASS,RegionOutputBackward(Pmax,s,IF97_SMASS),Pmax, NONE);
+         else { 
+         // Determining H(s) along Tmax is difficult because there is no direct p(T,s) formulation.
+-        // This linear combination fit h(s)=a*ln(s)+b/s+c/s²+d is not perfect, but it's close
++        // This linear combination fit h(s)=a*ln(s)+b/s+c/s^2+d is not perfect, but it's close
+         // and can serve as a limit along that Tmax boundary. Coefficients in HTmaxdata above.
+         // There is a better way to do this using Newton-Raphson on Tmax = T(p,s), but it is iterative and slow.
+             double ETA = Hmax_n[0]*log(sigma) + Hmax_n[1]/sigma + Hmax_n[2]/pow(sigma,2) +Hmax_n[3];
+@@ -4323,14 +4323,14 @@ namespace IF97
+     inline double cvmass_Tp(double T, double p){ return RegionOutput( IF97_CVMASS, T, p, NONE); };
+     /// Get the speed of sound [m/s] as a function of T [K] and p [Pa]
+     inline double speed_sound_Tp(double T, double p){ return RegionOutput( IF97_W, T, p, NONE); };
+-    /// Get the [d(rho)/d(p)]T [kg/m³/Pa] as a function of T [K] and p [Pa]
++    /// Get the [d(rho)/d(p)]T [kg/m^3/Pa] as a function of T [K] and p [Pa]
+     inline double drhodp_Tp(double T, double p){ return RegionOutput( IF97_DRHODP, T, p, NONE); };
+ 
+     // ******************************************************************************** //
+     //                            Transport Properties                                  //
+     // ******************************************************************************** //
+ 
+-    /// Get the viscosity [Pa-s] as a function of T [K] and Rho [kg/m³]
++    /// Get the viscosity [Pa-s] as a function of T [K] and Rho [kg/m^3]
+     inline double visc_TRho(double T, double rho) {	
+         // Since we have density, we don't need to determine the region for viscosity.
+         static Region1 R1;  // All regions use base region equations for visc(T,rho).
diff --git a/external_imported/vcpkg/ports/if97/vcpkg.json b/external_imported/vcpkg/ports/if97/vcpkg.json
index d1acd0cc9..deeb734b0 100644
--- a/external_imported/vcpkg/ports/if97/vcpkg.json
+++ b/external_imported/vcpkg/ports/if97/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "if97",
   "version": "2.1.3",
+  "port-version": 1,
   "description": "This repository implements the IF97 formulation for the properties of pure water substance.",
   "homepage": "https://github.com/CoolProp/IF97",
   "license": "MIT"
diff --git a/external_imported/vcpkg/ports/igloo/vcpkg.json b/external_imported/vcpkg/ports/igloo/vcpkg.json
index 58c0a3c1e..56c82ed0a 100644
--- a/external_imported/vcpkg/ports/igloo/vcpkg.json
+++ b/external_imported/vcpkg/ports/igloo/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "igloo",
-  "version-string": "1.1.1",
-  "port-version": 1,
+  "version": "1.1.1",
+  "port-version": 2,
   "description": "A framework for unit testing in C++"
 }
diff --git a/external_imported/vcpkg/ports/ignition-cmake2/fix-findogre-pkgconfig.patch b/external_imported/vcpkg/ports/ignition-cmake2/fix-findogre-pkgconfig.patch
new file mode 100644
index 000000000..ced7b4196
--- /dev/null
+++ b/external_imported/vcpkg/ports/ignition-cmake2/fix-findogre-pkgconfig.patch
@@ -0,0 +1,52 @@
+diff --git a/cmake/FindIgnOGRE.cmake b/cmake/FindIgnOGRE.cmake
+index e00f619..6825eb2 100644
+--- a/cmake/FindIgnOGRE.cmake
++++ b/cmake/FindIgnOGRE.cmake
+@@ -99,15 +99,12 @@ if (NOT WIN32)
+         set (OGRE_FOUND false)
+       else ()
+         # set library dirs if the value is empty
+-        if (NOT ${OGRE_LIBRARY_DIRS} OR ${OGRE_LIBRARY_DIRS} STREQUAL "")
+-          execute_process(COMMAND pkg-config --variable=libdir OGRE
+-                          OUTPUT_VARIABLE _pkgconfig_invoke_result
+-                          RESULT_VARIABLE _pkgconfig_failed)
+-          if(_pkgconfig_failed)
++        if (NOT OGRE_LIBRARY_DIRS)
++          pkg_get_variable(OGRE_LIBRARY_DIRS OGRE libdir)
++          if(NOT OGRE_LIBRARY_DIRS)
+             IGN_BUILD_WARNING ("Failed to find OGRE's library directory.  The build will succeed, but there will likely be run-time errors.")
+           else()
+-            # set ogre library dir and strip line break
+-            set(OGRE_LIBRARY_DIRS ${_pkgconfig_invoke_result})
++            # strip line break
+             string(REGEX REPLACE "\n$" "" OGRE_LIBRARY_DIRS "${OGRE_LIBRARY_DIRS}")
+ 
+             string(FIND "${OGRE_LIBRARIES}" "${OGRE_LIBRARY_DIRS}" substr_found)
+@@ -147,22 +144,18 @@ if (NOT WIN32)
+       endif()
+     endforeach()
+ 
+-    execute_process(COMMAND pkg-config --variable=plugindir OGRE
+-                    OUTPUT_VARIABLE _pkgconfig_invoke_result
+-                    RESULT_VARIABLE _pkgconfig_failed)
+-    if(_pkgconfig_failed)
++    pkg_get_variable(OGRE_PLUGINDIR OGRE plugindir)
++    if(NOT OGRE_PLUGINDIR)
+       IGN_BUILD_WARNING ("Failed to find OGRE's plugin directory.  The build will succeed, but there will likely be run-time errors.")
+     else()
+-      # This variable will be substituted into cmake/setup.sh.in
+-      set(OGRE_PLUGINDIR ${_pkgconfig_invoke_result})
++      # Seems that OGRE_PLUGINDIR can end in a newline, which will cause problems
++      # when we pass it to the compiler later.
++      string(REPLACE "\n" "" OGRE_PLUGINDIR ${OGRE_PLUGINDIR})
+     endif()
+ 
+     ign_pkg_config_library_entry(IgnOGRE OgreMain)
+ 
+     set(OGRE_RESOURCE_PATH ${OGRE_PLUGINDIR})
+-    # Seems that OGRE_PLUGINDIR can end in a newline, which will cause problems
+-    # when we pass it to the compiler later.
+-    string(REPLACE "\n" "" OGRE_RESOURCE_PATH ${OGRE_RESOURCE_PATH})
+   endif()
+ 
+   #reset pkg config path
diff --git a/external_imported/vcpkg/ports/ignition-cmake2/portfile.cmake b/external_imported/vcpkg/ports/ignition-cmake2/portfile.cmake
index 00fca8f5d..0ad755ed7 100644
--- a/external_imported/vcpkg/ports/ignition-cmake2/portfile.cmake
+++ b/external_imported/vcpkg/ports/ignition-cmake2/portfile.cmake
@@ -4,7 +4,8 @@ ignition_modular_library(NAME cmake
                          VERSION ${PACKAGE_VERSION}
                          SHA512 6ee64ff6c82c657678188be459c50a4255fd3881d758906d93361425702d04854a13a46124b20e058069f314077ba7e6c15a058153b615b3245084f066d1cbae
                          PATCHES
-                            add-pkgconfig-and-remove-privatefor-limit.patch)
+                            add-pkgconfig-and-remove-privatefor-limit.patch
+                            fix-findogre-pkgconfig.patch)
 
 # Install custom usage
 configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY)
diff --git a/external_imported/vcpkg/ports/ignition-cmake2/vcpkg.json b/external_imported/vcpkg/ports/ignition-cmake2/vcpkg.json
index 597efb06b..4468f0bb7 100644
--- a/external_imported/vcpkg/ports/ignition-cmake2/vcpkg.json
+++ b/external_imported/vcpkg/ports/ignition-cmake2/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ignition-cmake2",
   "version": "2.16.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "CMake helper functions for building robotic applications",
   "homepage": "https://ignitionrobotics.org/libs/cmake",
   "license": null,
diff --git a/external_imported/vcpkg/ports/ignition-common1/vcpkg.json b/external_imported/vcpkg/ports/ignition-common1/vcpkg.json
index bb85740f1..29ee14615 100644
--- a/external_imported/vcpkg/ports/ignition-common1/vcpkg.json
+++ b/external_imported/vcpkg/ports/ignition-common1/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "ignition-common1",
   "version": "1.1.1",
-  "port-version": 3,
-  "description": "Common libraries for robotics applications",
+  "port-version": 4,
+  "description": "Deprecated: Use ignition-common3. Common libraries for robotics applications",
   "license": null,
+  "supports": "windows",
   "dependencies": [
     {
       "name": "dlfcn-win32",
diff --git a/external_imported/vcpkg/ports/ignition-common3/portfile.cmake b/external_imported/vcpkg/ports/ignition-common3/portfile.cmake
index f8269c11f..7a659315f 100644
--- a/external_imported/vcpkg/ports/ignition-common3/portfile.cmake
+++ b/external_imported/vcpkg/ports/ignition-common3/portfile.cmake
@@ -1,8 +1,16 @@
-ignition_modular_library(NAME common
-                         VERSION "3.14.1"
-                         SHA512 5f83685b67cb0b8e295136f74a681e2ca5f00a730b0a221f0c00cab5f9049c84692185fb5924ab29cd07cbdf85450e81dfcdc984fc8af4ed4cc549b2fe2f9a6e
-                         OPTIONS -DUSE_EXTERNAL_TINYXML2=ON
-                         PATCHES fix-dependencies.patch)
+set(PACKAGE_NAME common)
+
+ignition_modular_library(
+   NAME ${PACKAGE_NAME}
+   REF ${PORT}_${VERSION}
+   VERSION ${VERSION}
+   SHA512 022f5f68cdc134fa84dc22b49dc43e5c62d6e987e7fd63630586716e43fb2aad57ab4fb470ea1c3884c79b910d403a94a4d47ac24ffbb6f3b89b36c5b0e708f8
+   OPTIONS 
+      -DUSE_EXTERNAL_TINYXML2=ON
+   PATCHES
+      fix-dependencies.patch
+)
+
 
 # Remove non-relocatable helper scripts (see https://github.com/ignitionrobotics/ign-common/issues/82)
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/ign_remotery_vis" "${CURRENT_PACKAGES_DIR}/debug/bin/ign_remotery_vis")
diff --git a/external_imported/vcpkg/ports/ignition-common3/vcpkg.json b/external_imported/vcpkg/ports/ignition-common3/vcpkg.json
index 29046dc3e..16b6c9ce1 100644
--- a/external_imported/vcpkg/ports/ignition-common3/vcpkg.json
+++ b/external_imported/vcpkg/ports/ignition-common3/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "ignition-common3",
-  "version": "3.14.1",
+  "version": "3.16.0",
   "description": "Common libraries for robotics applications",
   "homepage": "https://ignitionrobotics.org/libs/common",
   "license": null,
diff --git a/external_imported/vcpkg/ports/ignition-math6/portfile.cmake b/external_imported/vcpkg/ports/ignition-math6/portfile.cmake
index 52e9ae82b..16fc40459 100644
--- a/external_imported/vcpkg/ports/ignition-math6/portfile.cmake
+++ b/external_imported/vcpkg/ports/ignition-math6/portfile.cmake
@@ -1,4 +1,4 @@
 ignition_modular_library(NAME math
-                         VERSION "6.9.2"
-                         SHA512 87fe43f745a2337e1b4c92abdb98180d55cf6034f9b85e93e42ab1c6e0af645912b9a246589115f919ca1fe7ecb38090fe76cdd0d6726315ffb0f090626c0634
+                         VERSION "6.14.0"
+                         SHA512 ad95160cc1cd137779b9da589c47994d04f829af10865071e9ead4d55c4399d04d5398287d3b294e3f67230205656e1fe243129673e1f8e73f62f3933c314802
                          )
diff --git a/external_imported/vcpkg/ports/ignition-math6/vcpkg.json b/external_imported/vcpkg/ports/ignition-math6/vcpkg.json
index 4e58cce91..7cd94d0e9 100644
--- a/external_imported/vcpkg/ports/ignition-math6/vcpkg.json
+++ b/external_imported/vcpkg/ports/ignition-math6/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "ignition-math6",
-  "version": "6.9.2",
-  "port-version": 1,
+  "version": "6.14.0",
   "description": "Math API for robotic applications",
   "homepage": "https://ignitionrobotics.org/libs/math",
   "license": null,
diff --git a/external_imported/vcpkg/ports/ignition-modularscripts/vcpkg-port-config.cmake b/external_imported/vcpkg/ports/ignition-modularscripts/vcpkg-port-config.cmake
index 7737281d4..2fb83d6b5 100644
--- a/external_imported/vcpkg/ports/ignition-modularscripts/vcpkg-port-config.cmake
+++ b/external_imported/vcpkg/ports/ignition-modularscripts/vcpkg-port-config.cmake
@@ -1,34 +1,40 @@
+include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-cmake/vcpkg-port-config.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-cmake-config/vcpkg-port-config.cmake")
 
 function(ignition_modular_build_library)
     set(options DISABLE_PKGCONFIG_INSTALL)
     set(oneValueArgs NAME MAJOR_VERSION SOURCE_PATH CMAKE_PACKAGE_NAME DEFAULT_CMAKE_PACKAGE_NAME)
     set(multiValueArgs OPTIONS)
-    cmake_parse_arguments(IML "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+    cmake_parse_arguments(PARSE_ARGV 0 IML "${options}" "${oneValueArgs}" "${multiValueArgs}")
     vcpkg_find_acquire_program(PKGCONFIG)
-    vcpkg_configure_cmake(
-        SOURCE_PATH ${IML_SOURCE_PATH}
-        PREFER_NINJA
+    vcpkg_cmake_configure(
+        SOURCE_PATH "${IML_SOURCE_PATH}"
         DISABLE_PARALLEL_CONFIGURE
         OPTIONS
-            -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}
+            "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}"
+            -DBUILD_DOCS=OFF
             -DBUILD_TESTING=OFF
             ${IML_OPTIONS}
+        MAYBE_UNUSED_VARIABLES
+            BUILD_DOCS
+            BUILD_TESTING
+            PKG_CONFIG_EXECUTABLE
     )
 
-    vcpkg_install_cmake(ADD_BIN_TO_PATH)
+    vcpkg_cmake_install(ADD_BIN_TO_PATH)
 
     # If necessary, move the CMake config files
     if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake")
         # Some ignition libraries install library subcomponents, that are effectively additional cmake packages
-        # with name ${IML_CMAKE_PACKAGE_NAME}-${COMPONENT_NAME}, so it is needed to call vcpkg_fixup_cmake_targets for them as well
+        # with name ${IML_CMAKE_PACKAGE_NAME}-${COMPONENT_NAME}, so it is needed to call vcpkg_cmake_config_fixup for them as well
         file(GLOB COMPONENTS_CMAKE_PACKAGE_NAMES
              LIST_DIRECTORIES TRUE
              RELATIVE "${CURRENT_PACKAGES_DIR}/lib/cmake/"
              "${CURRENT_PACKAGES_DIR}/lib/cmake/*")
 
         foreach(COMPONENT_CMAKE_PACKAGE_NAME IN LISTS COMPONENTS_CMAKE_PACKAGE_NAMES)
-            vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/${COMPONENT_CMAKE_PACKAGE_NAME}"
-                                      TARGET_PATH "share/${COMPONENT_CMAKE_PACKAGE_NAME}"
+            vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${COMPONENT_CMAKE_PACKAGE_NAME}"
+                                      PACKAGE_NAME "${COMPONENT_CMAKE_PACKAGE_NAME}"
                                       DO_NOT_DELETE_PARENT_CONFIG_PATH)
         endforeach()
 
@@ -40,20 +46,17 @@ function(ignition_modular_build_library)
     endif()
 
     # Remove unused files files
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake
-                        ${CURRENT_PACKAGES_DIR}/debug/include
-                        ${CURRENT_PACKAGES_DIR}/debug/lib/cmake
-                        ${CURRENT_PACKAGES_DIR}/debug/share)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake"
+                        "${CURRENT_PACKAGES_DIR}/debug/include"
+                        "${CURRENT_PACKAGES_DIR}/debug/lib/cmake"
+                        "${CURRENT_PACKAGES_DIR}/debug/share")
 
     # Make pkg-config files relocatable
     if(NOT IML_DISABLE_PKGCONFIG_INSTALL)
-        if(VCPKG_TARGET_IS_LINUX)
-            set(SYSTEM_LIBRARIES SYSTEM_LIBRARIES pthread)
-        endif()
-        vcpkg_fixup_pkgconfig(${SYSTEM_LIBRARIES})
+        vcpkg_fixup_pkgconfig()
     else()
-        file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig
-                            ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig)
+        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig"
+                            "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
     endif()
 
     # Find the relevant license file and install it
@@ -62,7 +65,7 @@ function(ignition_modular_build_library)
     elseif(EXISTS "${SOURCE_PATH}/README.md")
         set(LICENSE_PATH "${SOURCE_PATH}/README.md")
     endif()
-    file(INSTALL ${LICENSE_PATH} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+    file(INSTALL "${LICENSE_PATH}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 endfunction()
 
 ## # ignition_modular_library
@@ -120,9 +123,9 @@ function(ignition_modular_library)
     set(options DISABLE_PKGCONFIG_INSTALL)
     set(oneValueArgs NAME VERSION SHA512 REF HEAD_REF CMAKE_PACKAGE_NAME)
     set(multiValueArgs PATCHES OPTIONS)
-    cmake_parse_arguments(IML "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+    cmake_parse_arguments(PARSE_ARGV 0 IML "${options}" "${oneValueArgs}" "${multiValueArgs}")
 
-    string(REPLACE "." ";" IML_VERSION_LIST ${IML_VERSION})
+    string(REPLACE "." ";" IML_VERSION_LIST "${IML_VERSION}")
     list(GET IML_VERSION_LIST 0 IML_MAJOR_VERSION)
 
     # If the REF option is omitted, use the canonical one
@@ -138,32 +141,33 @@ function(ignition_modular_library)
     # If the CMAKE_PACKAGE_NAME option is omitted, use the canonical one
     set(DEFAULT_CMAKE_PACKAGE_NAME "ignition-${IML_NAME}${IML_MAJOR_VERSION}")
     if(NOT DEFINED IML_CMAKE_PACKAGE_NAME)
-        set(IML_CMAKE_PACKAGE_NAME ${DEFAULT_CMAKE_PACKAGE_NAME})
+        set(IML_CMAKE_PACKAGE_NAME "${DEFAULT_CMAKE_PACKAGE_NAME}")
     endif()
 
     # Download library from github, to support also the --head option
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
-        REPO ignitionrobotics/ign-${IML_NAME}
-        REF ${IML_REF}
-        SHA512 ${IML_SHA512}
-        HEAD_REF ${IML_HEAD_REF}
+        REPO "ignitionrobotics/ign-${IML_NAME}"
+        REF "${IML_REF}"
+        SHA512 "${IML_SHA512}"
+        HEAD_REF "${IML_HEAD_REF}"
         PATCHES ${IML_PATCHES}
         FILE_DISAMBIGUATOR 1
     )
 
+    set(extra_arguments "")
     if (IML_DISABLE_PKGCONFIG_INSTALL)
-        set(EXTRA_OPTIONS DISABLE_PKGCONFIG_INSTALL)
+        list(APPEND extra_arguments DISABLE_PKGCONFIG_INSTALL)
     endif()
 
     # Build library
     ignition_modular_build_library(
-        NAME ${IML_NAME}
-        MAJOR_VERSION ${IML_MAJOR_VERSION}
-        SOURCE_PATH ${SOURCE_PATH}
-        CMAKE_PACKAGE_NAME ${IML_CMAKE_PACKAGE_NAME}
-        DEFAULT_CMAKE_PACKAGE_NAME ${DEFAULT_CMAKE_PACKAGE_NAME}
-        ${EXTRA_OPTIONS}
+        NAME "${IML_NAME}"
+        MAJOR_VERSION "${IML_MAJOR_VERSION}"
+        SOURCE_PATH "${SOURCE_PATH}"
+        CMAKE_PACKAGE_NAME "${IML_CMAKE_PACKAGE_NAME}"
+        DEFAULT_CMAKE_PACKAGE_NAME "${DEFAULT_CMAKE_PACKAGE_NAME}"
+        ${extra_arguments}
         OPTIONS ${IML_OPTIONS}
     )
 endfunction()
diff --git a/external_imported/vcpkg/ports/ignition-modularscripts/vcpkg.json b/external_imported/vcpkg/ports/ignition-modularscripts/vcpkg.json
index d7beaa13f..27af10243 100644
--- a/external_imported/vcpkg/ports/ignition-modularscripts/vcpkg.json
+++ b/external_imported/vcpkg/ports/ignition-modularscripts/vcpkg.json
@@ -1,7 +1,17 @@
 {
   "name": "ignition-modularscripts",
-  "version-date": "2022-05-11",
-  "port-version": 1,
+  "version-date": "2023-05-05",
   "description": "Vcpkg helpers to package ignition libraries",
-  "license": null
+  "license": null,
+  "supports": "native",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/ignition-plugin1/portfile.cmake b/external_imported/vcpkg/ports/ignition-plugin1/portfile.cmake
index 106c8e797..5f5f5f1af 100644
--- a/external_imported/vcpkg/ports/ignition-plugin1/portfile.cmake
+++ b/external_imported/vcpkg/ports/ignition-plugin1/portfile.cmake
@@ -1,5 +1,5 @@
-set(PACKAGE_VERSION "1.1.0")
+set(PACKAGE_VERSION "1.4.0")
 ignition_modular_library(NAME plugin
                          VERSION ${PACKAGE_VERSION}
                          REF "ignition-plugin_${PACKAGE_VERSION}"
-                         SHA512 e932dd7e7b042e9fb4c0569cb8b4028e54c394228aadf6523fa60ab1b9f7f9a17d14c79886a76365e2c47423c221aaef9ca77df638d87e2b6edb82eea10c0a3d)
+                         SHA512 bc8d8012ae2a5f4cee26560323f65e40873fb9d1d014a9946317bf941953a7e5018bc08763f87fc624792cb02aebe289286265796697559eeaf41e28e9b05abb)
diff --git a/external_imported/vcpkg/ports/ignition-plugin1/vcpkg.json b/external_imported/vcpkg/ports/ignition-plugin1/vcpkg.json
index 8a59e3a2d..b4c218852 100644
--- a/external_imported/vcpkg/ports/ignition-plugin1/vcpkg.json
+++ b/external_imported/vcpkg/ports/ignition-plugin1/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "ignition-plugin1",
-  "version": "1.1.0",
-  "port-version": 2,
+  "version": "1.4.0",
   "description": "Library for registering plugin libraries and dynamically loading them at runtime",
   "homepage": "https://ignitionrobotics.org/libs/plugin",
   "license": null,
diff --git a/external_imported/vcpkg/ports/ignition-tools/portfile.cmake b/external_imported/vcpkg/ports/ignition-tools/portfile.cmake
index 58e821cb3..db69f40b4 100644
--- a/external_imported/vcpkg/ports/ignition-tools/portfile.cmake
+++ b/external_imported/vcpkg/ports/ignition-tools/portfile.cmake
@@ -12,6 +12,8 @@ vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS 
         -DBUILD_TESTING=OFF
+        -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
+        -DUSE_SYSTEM_BACKWARDCPP=ON
 )
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/ignition-tools/vcpkg.json b/external_imported/vcpkg/ports/ignition-tools/vcpkg.json
index 3d0704e3e..b1c3d742f 100644
--- a/external_imported/vcpkg/ports/ignition-tools/vcpkg.json
+++ b/external_imported/vcpkg/ports/ignition-tools/vcpkg.json
@@ -1,11 +1,13 @@
 {
   "name": "ignition-tools",
   "version": "1.5.0",
+  "port-version": 1,
   "description": "Gazebo tools provide the ign command line tool that accepts multiple subcommands.",
   "homepage": "https://gazebosim.org",
   "license": "Apache-2.0",
   "supports": "!(arm & windows) & !uwp",
   "dependencies": [
+    "backward-cpp",
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/external_imported/vcpkg/ports/ignition-utils1/portfile.cmake b/external_imported/vcpkg/ports/ignition-utils1/portfile.cmake
index dd54204f3..7d8a55ff6 100644
--- a/external_imported/vcpkg/ports/ignition-utils1/portfile.cmake
+++ b/external_imported/vcpkg/ports/ignition-utils1/portfile.cmake
@@ -1,29 +1,6 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO gazebosim/gz-utils
-    REF ignition-utils1_1.4.0
-    SHA512 f7c841391b0f523ed631c00d8053c52c3a52f409fb76faf68565ae2db96424c79e91a4bdcab650acfc35c17fe7f1df6881de4b59d5210539ebe8e9cfef991461
-    HEAD_REF ign-utils1
-)
+set(PACKAGE_VERSION "1.5.1")
+ignition_modular_library(NAME utils
+                         VERSION ${PACKAGE_VERSION}
+                         REF "ignition-utils1_${PACKAGE_VERSION}"
+                         SHA512 ede208d98b0b4bc4bfe38e248e8eb89da8feaced547e968a2a733992d86c632a9fae724c7c97e4a962ba36e23663a5872017eeae0b818492fcd1eca9d9643653)
 
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS 
-        -DBUILD_TESTING=OFF
-)
-
-vcpkg_cmake_install()
-
-# Fix cmake targets and pkg-config file location
-vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/ignition-utils1")
-vcpkg_fixup_pkgconfig()
-
-# Remove debug files
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include"
-                    "${CURRENT_PACKAGES_DIR}/debug/lib/cmake"
-                    "${CURRENT_PACKAGES_DIR}/debug/share"
-                    "${CURRENT_PACKAGES_DIR}/include/ignition/utils1/ignition/utils/cli"
-)
-
-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/external_imported/vcpkg/ports/ignition-utils1/vcpkg.json b/external_imported/vcpkg/ports/ignition-utils1/vcpkg.json
index 1401310a1..8d55782f6 100644
--- a/external_imported/vcpkg/ports/ignition-utils1/vcpkg.json
+++ b/external_imported/vcpkg/ports/ignition-utils1/vcpkg.json
@@ -1,17 +1,13 @@
 {
   "name": "ignition-utils1",
-  "version": "1.4.0",
+  "version": "1.5.1",
   "description": "Ignition Utils, a component of Ignition Robotics, provides general purpose classes and functions designed for robotic applications.",
   "homepage": "https://gazebosim.org",
   "license": "Apache-2.0",
   "dependencies": [
     "ignition-cmake2",
     {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
+      "name": "ignition-modularscripts",
       "host": true
     }
   ]
diff --git a/external_imported/vcpkg/ports/igraph/portfile.cmake b/external_imported/vcpkg/ports/igraph/portfile.cmake
index 84271b4df..31d436d3f 100644
--- a/external_imported/vcpkg/ports/igraph/portfile.cmake
+++ b/external_imported/vcpkg/ports/igraph/portfile.cmake
@@ -4,9 +4,9 @@
 #  - The release tarball contains pre-generated parser sources, which eliminates the dependency on bison/flex.
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/igraph/igraph/releases/download/0.10.4/igraph-0.10.4.tar.gz"
-    FILENAME "igraph-0.10.4.tar.gz"
-    SHA512 71bcec5f0ba100aae7614753f9232a4221580b822b4dc120e3a80eab59d70c42aedddb00728eb13faf7e522332c514c2e030314c416ded8a70e5de990ea8039b
+    URLS "https://github.com/igraph/igraph/releases/download/0.10.9/igraph-0.10.9.tar.gz"
+    FILENAME "igraph-0.10.9.tar.gz"
+    SHA512 4043cd250ae4e6c4acc88e995b77f8d85b6663bd69388f8b0271a08b6fabd7766243fcae4ada8188b099b3d4886bc0ede1ae471121dbc411caed662d761c24bf
 )
 
 vcpkg_extract_source_archive(
diff --git a/external_imported/vcpkg/ports/igraph/vcpkg.json b/external_imported/vcpkg/ports/igraph/vcpkg.json
index b3580cf0b..e8acc599a 100644
--- a/external_imported/vcpkg/ports/igraph/vcpkg.json
+++ b/external_imported/vcpkg/ports/igraph/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "igraph",
-  "version": "0.10.4",
+  "version": "0.10.9",
   "description": "igraph is a C library for network analysis and graph theory, with an emphasis on efficiency portability and ease of use.",
   "homepage": "https://igraph.org/",
   "license": "GPL-2.0-or-later",
+  "supports": "!xbox",
   "dependencies": [
     "blas",
     "lapack",
diff --git a/external_imported/vcpkg/ports/iir1/fix-shared-lib.patch b/external_imported/vcpkg/ports/iir1/fix-shared-lib.patch
new file mode 100644
index 000000000..1299dcd64
--- /dev/null
+++ b/external_imported/vcpkg/ports/iir1/fix-shared-lib.patch
@@ -0,0 +1,20 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4dd67df..3840ff8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -84,6 +84,7 @@ set_target_properties(iir PROPERTIES
+   PUBLIC_HEADER Iir.h
+   PRIVATE_HEADER "${LIBINCLUDE}")
+ 
++if(BUILD_SHARED_LIBS)
+ install(TARGETS iir EXPORT iir-targets
+   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+@@ -91,6 +92,7 @@ install(TARGETS iir EXPORT iir-targets
+   INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+   PRIVATE_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/iir)
++endif()
+ 
+ include(JoinPaths)
+ 
diff --git a/external_imported/vcpkg/ports/iir1/fix-shared-static.patch b/external_imported/vcpkg/ports/iir1/fix-shared-static.patch
deleted file mode 100644
index cfa29a122..000000000
--- a/external_imported/vcpkg/ports/iir1/fix-shared-static.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -12,9 +12,11 @@ cmake_policy(SET CMP0048 NEW) # set VERSION in project()
- cmake_policy(SET CMP0042 NEW) # enable MACOSX_RPATH by default
- 
- include(GNUInstallDirs)
-+if(BUILD_TESTING)
- add_subdirectory(test)
- add_subdirectory(demo)
- enable_testing ()
-+endif()
- 
- if (MSVC)
-   add_compile_options(/W4)
-@@ -47,6 +49,8 @@ set(LIBINCLUDE
-   iir/State.h
-   iir/Types.h)
- 
-+if(BUILD_SHARED_LIBS)
-+
- add_library(iir SHARED ${LIBSRC})
- add_library(iir::iir ALIAS iir)
- 
-@@ -73,6 +77,8 @@ install(TARGETS iir EXPORT iir-targets
- 
- configure_file(iir.pc.in iir.pc @ONLY)
- 
-+else(BUILD_SHARED_LIBS)
-+
- add_library(iir_static STATIC ${LIBSRC})
- add_library(iir::iir_static ALIAS iir_static)
- 
-@@ -97,6 +103,8 @@ install(TARGETS iir_static EXPORT iir-targets
-   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-   PRIVATE_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/iir)
- 
-+endif(BUILD_SHARED_LIBS)
-+
- install(EXPORT iir-targets
-   DESTINATION lib/cmake/iir
-   NAMESPACE iir::
diff --git a/external_imported/vcpkg/ports/iir1/portfile.cmake b/external_imported/vcpkg/ports/iir1/portfile.cmake
index 0a4d87c2b..90e17ddcc 100644
--- a/external_imported/vcpkg/ports/iir1/portfile.cmake
+++ b/external_imported/vcpkg/ports/iir1/portfile.cmake
@@ -1,23 +1,29 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO berndporr/iir1
-    REF 1.9.1
-    SHA512 115692fb82637d21c2cbff974d931ef12a5c7fd8502560e2b807ceed69b1a6a4e05898aff37b089ccda7c4aa32e97e71f7e6007998ec52f6122da33eb222112e
+    REF "${VERSION}"
+    SHA512 e69b79ba48aa5d5ec2ddb0a31461ac4c15b0489df80fddc1f1f8adc143726fa189dc0dd94a0ed2bb7aa73712f953e27b345a762120ab2d10f54f57a868f0ea42
     HEAD_REF master
     PATCHES
-        fix-shared-static.patch
+        fix-shared-lib.patch
 )
 
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" IIR1_INSTALL_STATIC)
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-        -DBUILD_TESTING=OFF
+        -DIIR1_INSTALL_STATIC=${IIR1_INSTALL_STATIC}
+        -DIIR1_BUILD_TESTING=OFF
+        -DIIR1_BUILD_DEMO=OFF
 )
 
 vcpkg_cmake_install()
 
 vcpkg_cmake_config_fixup(PACKAGE_NAME iir CONFIG_PATH lib/cmake/iir)
 
+vcpkg_fixup_pkgconfig()
+
 vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/external_imported/vcpkg/ports/iir1/vcpkg.json b/external_imported/vcpkg/ports/iir1/vcpkg.json
index 781d68b2d..dc4fef275 100644
--- a/external_imported/vcpkg/ports/iir1/vcpkg.json
+++ b/external_imported/vcpkg/ports/iir1/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "iir1",
-  "version": "1.9.1",
+  "version": "1.9.4",
   "description": "Realtime C++ filter library",
   "homepage": "https://github.com/berndporr/iir1",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/ijg-libjpeg/portfile.cmake b/external_imported/vcpkg/ports/ijg-libjpeg/portfile.cmake
index f9771764e..033e12fe9 100644
--- a/external_imported/vcpkg/ports/ijg-libjpeg/portfile.cmake
+++ b/external_imported/vcpkg/ports/ijg-libjpeg/portfile.cmake
@@ -14,8 +14,8 @@ vcpkg_download_distfile(ARCHIVE
     FILENAME    "jpegsr9e.zip"
     SHA512      db7a2fb44e5cc20d61956c46334948af034c07cdcc0d6e41d9bd4f6611c0fbed8943d0a05029ba1bfb9d993f4acd0df5e95d0bc1cfb5a889b86a55b6b75fdf64
 )
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE ${ARCHIVE}
 )
 
diff --git a/external_imported/vcpkg/ports/ijg-libjpeg/vcpkg.json b/external_imported/vcpkg/ports/ijg-libjpeg/vcpkg.json
index 7c4d96429..8e40a987f 100644
--- a/external_imported/vcpkg/ports/ijg-libjpeg/vcpkg.json
+++ b/external_imported/vcpkg/ports/ijg-libjpeg/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "ijg-libjpeg",
   "version-string": "9e",
+  "port-version": 1,
   "description": "Independent JPEG Group's JPEG software",
   "homepage": "http://www.ijg.org/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/imageinfo/portfile.cmake b/external_imported/vcpkg/ports/imageinfo/portfile.cmake
index e7d0bdc39..58f9a7132 100644
--- a/external_imported/vcpkg/ports/imageinfo/portfile.cmake
+++ b/external_imported/vcpkg/ports/imageinfo/portfile.cmake
@@ -1,24 +1,33 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO xiaozhuai/imageinfo
-    REF 724301f7ef5e29410e78cd900ae25f9fa2e3080a # committed on 2023-01-31
-    SHA512 b9ba5d2ec5698b9eee4eb07e0dbb50d0f361e730b6d468ac6e4c90b29375f6468f45214573673de5f9388d532794f922a556153d34cba5d6ccec854c20d34506
+    REF 3c24fd6442808471d7d4acf4e2ff50f3f235a481 # committed on 2024-01-19
+    SHA512 269c3872aeeecf30289cc90bb529747c498db36e20266762d2b39065410e12b9e76d3b4fff13b2bbc8f3c56e39dd2318b18357a2529f9074ae7919ef0b622bd6
     HEAD_REF master
 )
 
 set(VCPKG_BUILD_TYPE release) # header-only port
 
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        tools IMAGEINFO_BUILD_TOOLS
+)
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-        -DIMAGEINFO_BUILD_TOOL=OFF
+        -DIMAGEINFO_BUILD_INSTALL=ON
         -DIMAGEINFO_BUILD_TESTS=OFF
+        ${FEATURE_OPTIONS}
 )
 
 vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/imageinfo)
+vcpkg_cmake_config_fixup()
+if("tools" IN_LIST FEATURES)
+    vcpkg_copy_tools(TOOL_NAMES imageinfo AUTO_CLEAN)
+endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/imageinfo/vcpkg.json b/external_imported/vcpkg/ports/imageinfo/vcpkg.json
index ff5b516cc..8fc6b29b4 100644
--- a/external_imported/vcpkg/ports/imageinfo/vcpkg.json
+++ b/external_imported/vcpkg/ports/imageinfo/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "imageinfo",
-  "version-date": "2023-01-31",
+  "version-date": "2024-01-19",
   "description": "Cross platform super fast single header c++ library to get image size and format without loading/decoding. Support avif, bmp, cur, dds, gif, hdr (pic), heic (heif), icns, ico, jp2, jpeg (jpg), jpx, ktx, png, psd, qoi, tga, tiff (tif), webp ...",
   "homepage": "https://github.com/xiaozhuai/imageinfo",
   "license": "MIT",
@@ -13,5 +13,11 @@
       "name": "vcpkg-cmake-config",
       "host": true
     }
-  ]
+  ],
+  "features": {
+    "tools": {
+      "description": "build command line tool",
+      "supports": "!android & !ios & !xbox"
+    }
+  }
 }
diff --git a/external_imported/vcpkg/ports/imath/portfile.cmake b/external_imported/vcpkg/ports/imath/portfile.cmake
index e8e38f8be..3f4f34ad5 100644
--- a/external_imported/vcpkg/ports/imath/portfile.cmake
+++ b/external_imported/vcpkg/ports/imath/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO AcademySoftwareFoundation/Imath
-    REF v3.1.5
-    SHA512 8344e42c75d8e4bb21facb837535f0c9e4a9489d9edebcc25d5d3c6063535f2bf54e4517d8fca3fedada248457aa07c9bd77d6e843a9d115278fc154de2cdc9d
+    REF v3.1.9
+    SHA512 ad96b2ac306fc13c01e8ea3256f885499c3f545be327feaba0f5e093b70b544bcca6f8b353fa7e35107aae515c19caced44331a95d0414f367ead4691ec73564
     HEAD_REF master
 )
 
@@ -11,6 +11,7 @@ vcpkg_cmake_configure(
     OPTIONS
         -DIMATH_INSTALL_SYM_LINK=OFF
         -DBUILD_TESTING=OFF
+        -DIMATH_INSTALL_PKG_CONFIG=ON
 )
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/imath/vcpkg.json b/external_imported/vcpkg/ports/imath/vcpkg.json
index 01ef7a9d6..85b1cb691 100644
--- a/external_imported/vcpkg/ports/imath/vcpkg.json
+++ b/external_imported/vcpkg/ports/imath/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "imath",
-  "version": "3.1.5",
+  "version": "3.1.9",
+  "port-version": 1,
   "description": "Imath is a C++ and Python library of 2D and 3D vector, matrix, and math operations for computer graphics.",
   "homepage": "https://github.com/AcademySoftwareFoundation/Imath",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/imgui-node-editor/CMakeLists.txt b/external_imported/vcpkg/ports/imgui-node-editor/CMakeLists.txt
new file mode 100644
index 000000000..852290e29
--- /dev/null
+++ b/external_imported/vcpkg/ports/imgui-node-editor/CMakeLists.txt
@@ -0,0 +1,60 @@
+cmake_minimum_required(VERSION 3.8)
+project(imgui-node-editor)
+
+set(CMAKE_CXX_STANDARD 14)
+
+find_package(imgui CONFIG REQUIRED)
+get_target_property(IMGUI_INCLUDE_DIRS imgui::imgui
+    INTERFACE_INCLUDE_DIRECTORIES
+)
+
+add_library(${PROJECT_NAME} "")
+
+target_include_directories(
+	${PROJECT_NAME}
+	PUBLIC
+	   	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+		$<INSTALL_INTERFACE:include>
+	PRIVATE
+		${IMGUI_INCLUDE_DIRS}
+)
+
+target_sources(
+    ${PROJECT_NAME}
+    PRIVATE
+        crude_json.cpp
+        imgui_canvas.cpp
+        imgui_node_editor.cpp
+        imgui_node_editor_api.cpp
+)
+
+install(
+    TARGETS ${PROJECT_NAME}
+    EXPORT unofficial-${PROJECT_NAME}-target
+    ARCHIVE DESTINATION lib
+    ARCHIVE DESTINATION lib
+    RUNTIME DESTINATION bin
+)
+
+if (NOT IMGUI_NODE_EDITOR_SKIP_HEADERS)
+    install(
+        FILES
+            crude_json.h
+            imgui_bezier_math.h
+            imgui_bezier_math.inl
+            imgui_canvas.h
+            imgui_extra_math.h
+            imgui_extra_math.inl
+            imgui_node_editor.h
+            imgui_node_editor_internal.h
+            imgui_node_editor_internal.inl
+        DESTINATION include/${PROJECT_NAME}
+    )
+endif()
+
+install(
+    EXPORT unofficial-${PROJECT_NAME}-target
+    NAMESPACE unofficial::${PROJECT_NAME}::
+    FILE unofficial-${PROJECT_NAME}-config.cmake
+    DESTINATION share/unofficial-${PROJECT_NAME}
+)
diff --git a/external_imported/vcpkg/ports/imgui-node-editor/portfile.cmake b/external_imported/vcpkg/ports/imgui-node-editor/portfile.cmake
new file mode 100644
index 000000000..22666dbb9
--- /dev/null
+++ b/external_imported/vcpkg/ports/imgui-node-editor/portfile.cmake
@@ -0,0 +1,24 @@
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO thedmd/imgui-node-editor
+    REF v${VERSION}
+    SHA512 83573b6ed776095837373bc95be1c1f5b85e9c5fae2145647f9cb6fdc17d3889edce716ac9e27c1bbde56f00803a66db98ca856910e6e0ce8714d3c5ce3f7c3f
+    HEAD_REF master
+)
+
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS_DEBUG
+        -DIMGUI_NODE_EDITOR_SKIP_HEADERS=ON
+)
+
+vcpkg_cmake_install()
+
+vcpkg_copy_pdbs()
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT} CONFIG_PATH share/unofficial-${PORT})
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/imgui-node-editor/vcpkg.json b/external_imported/vcpkg/ports/imgui-node-editor/vcpkg.json
new file mode 100644
index 000000000..9cbd3a391
--- /dev/null
+++ b/external_imported/vcpkg/ports/imgui-node-editor/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "imgui-node-editor",
+  "version": "0.9.3",
+  "description": "Node Editor built using Dear ImGui",
+  "homepage": "https://github.com/thedmd/imgui-node-editor",
+  "license": "MIT",
+  "dependencies": [
+    "imgui",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/imgui-sfml/0001-fix_find_package.patch b/external_imported/vcpkg/ports/imgui-sfml/0001-fix_find_package.patch
index 0ece62b40..ace8e9ee4 100644
--- a/external_imported/vcpkg/ports/imgui-sfml/0001-fix_find_package.patch
+++ b/external_imported/vcpkg/ports/imgui-sfml/0001-fix_find_package.patch
@@ -1,49 +1,36 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3a974c4..8a1c6cd 100644
+index 075d793..9bc635a 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -41,34 +41,14 @@ if (IMGUI_SFML_FIND_SFML)
- 	if (NOT BUILD_SHARED_LIBS)
- 		set(SFML_STATIC_LIBRARIES ON)
- 	endif()
--	find_package(SFML 2.5 COMPONENTS graphics system window)
-+	find_package(SFML COMPONENTS graphics system window)
+@@ -41,13 +41,14 @@ if (IMGUI_SFML_FIND_SFML)
+   if (NOT BUILD_SHARED_LIBS)
+     set(SFML_STATIC_LIBRARIES ON)
+   endif()
+-  find_package(SFML 2.5 COMPONENTS graphics system window)
++  find_package(SFML COMPONENTS graphics system window)
  
- 	if(NOT SFML_FOUND)
-     message(FATAL_ERROR "SFML 2 directory not found. Set SFML_DIR to directory where SFML was built (or one which ccontains SFMLConfig.cmake)")
- 	endif()
+   if(NOT SFML_FOUND)
+     message(FATAL_ERROR "SFML 2 directory not found. Set SFML_DIR to directory where SFML was built (or one which contains SFMLConfig.cmake)")
+   endif()
  endif()
  
--# ImGui does not provide native support for CMakeLists, workaround for now to have
--# users specify IMGUI_DIR. Waiting for this PR to get merged...
--#    https://github.com/ocornut/imgui/pull/1713
--if(NOT IMGUI_DIR)
--  set(IMGUI_DIR "" CACHE PATH "imgui top-level directory")
--  message(FATAL_ERROR "ImGui directory not found. Set IMGUI_DIR to imgui's top-level path (containing 'imgui.h' and other files).\n")
--endif()
--
--# This uses FindImGui.cmake provided in ImGui-SFML repo for now
--find_package(ImGui 1.80 REQUIRED)
--
--# these headers will be installed alongside ImGui-SFML
--set(IMGUI_PUBLIC_HEADERS
--  ${IMGUI_INCLUDE_DIR}/imconfig.h
--  ${IMGUI_INCLUDE_DIR}/imgui.h
--  ${IMGUI_INCLUDE_DIR}/imgui_internal.h # not actually public, but users might need it
--  ${IMGUI_INCLUDE_DIR}/imstb_rectpack.h
--  ${IMGUI_INCLUDE_DIR}/imstb_textedit.h
--  ${IMGUI_INCLUDE_DIR}/imstb_truetype.h
--  ${IMGUI_INCLUDE_DIR}/misc/cpp/imgui_stdlib.h
--)
++if(0)
+ # ImGui does not provide native support for CMakeLists, workaround for now to have
+ # users specify IMGUI_DIR. Waiting for this PR to get merged...
+ #    https://github.com/ocornut/imgui/pull/1713
+@@ -69,6 +70,8 @@ set(IMGUI_PUBLIC_HEADERS
+   ${IMGUI_INCLUDE_DIR}/imstb_truetype.h
+   ${IMGUI_INCLUDE_DIR}/misc/cpp/imgui_stdlib.h
+ )
++endif()
 +find_package(imgui CONFIG REQUIRED)
  
  if (IMGUI_SFML_IMGUI_DEMO)
-     list(APPEND IMGUI_SOURCES ${IMGUI_DEMO_SOURCES})
-@@ -92,7 +72,7 @@ add_library(ImGui-SFML
- add_library(ImGui-SFML::ImGui-SFML ALIAS ImGui-SFML)
+   list(APPEND IMGUI_SOURCES ${IMGUI_DEMO_SOURCES})
+@@ -93,6 +96,7 @@ add_library(ImGui-SFML::ImGui-SFML ALIAS ImGui-SFML)
  
  target_link_libraries(ImGui-SFML
--  PUBLIC
+   PUBLIC
 +    imgui::imgui
      sfml-graphics
      sfml-system
diff --git a/external_imported/vcpkg/ports/imgui-sfml/0002-fix-imgui-dependency.patch b/external_imported/vcpkg/ports/imgui-sfml/0002-fix-imgui-dependency.patch
deleted file mode 100644
index bb018cd42..000000000
--- a/external_imported/vcpkg/ports/imgui-sfml/0002-fix-imgui-dependency.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/imgui-SFML.cpp b/imgui-SFML.cpp
-index 6ca64ae..94af0c8 100644
---- a/imgui-SFML.cpp
-+++ b/imgui-SFML.cpp
-@@ -128,7 +128,7 @@ void initDefaultJoystickMapping();
- // Returns first id of connected joystick
- unsigned int getConnectedJoystickId();
- 
--void updateJoystickActionState(ImGuiIO& io, ImGuiNavInput_ action);
-+void updateJoystickActionState(ImGuiIO& io, ImGuiNavInput action);
- void updateJoystickDPadState(ImGuiIO& io);
- void updateJoystickLStickState(ImGuiIO& io);
- 
-@@ -1030,7 +1030,7 @@ void initDefaultJoystickMapping() {
-     ImGui::SFML::SetJoystickLStickThreshold(5.f);
- }
- 
--void updateJoystickActionState(ImGuiIO& io, ImGuiNavInput_ action) {
-+void updateJoystickActionState(ImGuiIO& io, ImGuiNavInput action) {
-     bool isPressed = sf::Joystick::isButtonPressed(s_currWindowCtx->joystickId,
-                                                    s_currWindowCtx->joystickMapping[action]);
-     io.NavInputs[action] = isPressed ? 1.0f : 0.0f;
diff --git a/external_imported/vcpkg/ports/imgui-sfml/004-fix-find-sfml.patch b/external_imported/vcpkg/ports/imgui-sfml/004-fix-find-sfml.patch
deleted file mode 100644
index 372f7b1d9..000000000
--- a/external_imported/vcpkg/ports/imgui-sfml/004-fix-find-sfml.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8a1c6cd..7156f51 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -38,9 +38,6 @@ set(IMGUI_SFML_CONFIG_INSTALL_DIR "" CACHE PATH "Path where user's config header
- list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
- 
- if (IMGUI_SFML_FIND_SFML)
--	if (NOT BUILD_SHARED_LIBS)
--		set(SFML_STATIC_LIBRARIES ON)
--	endif()
- 	find_package(SFML COMPONENTS graphics system window)
- 
- 	if(NOT SFML_FOUND)
diff --git a/external_imported/vcpkg/ports/imgui-sfml/portfile.cmake b/external_imported/vcpkg/ports/imgui-sfml/portfile.cmake
index bf96cbeb9..c8c9704ca 100644
--- a/external_imported/vcpkg/ports/imgui-sfml/portfile.cmake
+++ b/external_imported/vcpkg/ports/imgui-sfml/portfile.cmake
@@ -3,13 +3,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO eliasdaler/imgui-sfml
-    REF 004efd85a590343e8c9d166dc9d2524c199c9450 #v2.5
-    SHA512 feb11f0a52f89eedc5af4c686b71290a48d69e7bc371f29536eb51752d00b6879d642625f494035d2ccc0500878757709afa2a3810ac17496506db754a3a4ed6
+    REF "v${VERSION}"
+    SHA512 c8f2ed21ad5dfac417474f0caed1c59105b7dd8bf2dcb1db3b1f46a4fb07cec3c199d6fda0ff05ec5040a18000a0168f1a8caa978dee356c2b6874b5b2e10ec4
     HEAD_REF master
     PATCHES
         0001-fix_find_package.patch
-        0002-fix-imgui-dependency.patch
-        004-fix-find-sfml.patch
 )
 
 vcpkg_cmake_configure(
@@ -20,10 +18,17 @@ vcpkg_cmake_configure(
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
-vcpkg_cmake_config_fixup(PACKAGE_NAME ImGui-SFML CONFIG_PATH lib/cmake/ImGui-SFML)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ImGui-SFML)
+file(READ "${CURRENT_PACKAGES_DIR}/share/imgui-sfml/ImGui-SFMLConfig.cmake" cmake_config)
+string(PREPEND cmake_config [[
+include(CMakeFindDependencyMacro)
+find_dependency(imgui CONFIG)
+find_dependency(SFML COMPONENTS graphics system window)
+]])
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/imgui-sfml/ImGui-SFMLConfig.cmake" "${cmake_config}")
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
 
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/imgui-sfml/usage b/external_imported/vcpkg/ports/imgui-sfml/usage
index ea9a5f63b..6604d95fd 100644
--- a/external_imported/vcpkg/ports/imgui-sfml/usage
+++ b/external_imported/vcpkg/ports/imgui-sfml/usage
@@ -1,10 +1,4 @@
-The package imgui-sfml provides CMake targets:
+imgui-sfml provides CMake targets:
 
-    find_package(imgui CONFIG REQUIRED)
-    find_package(SFML CONFIG REQUIRED COMPONENTS graphics system window)
     find_package(ImGui-SFML CONFIG REQUIRED)
-    target_link_libraries(main PRIVATE
-        imgui::imgui
-        sfml-graphics sfml-system sfml-window
-        ImGui-SFML::ImGui-SFML
-    )
+    target_link_libraries(main PRIVATE ImGui-SFML::ImGui-SFML)
diff --git a/external_imported/vcpkg/ports/imgui-sfml/vcpkg.json b/external_imported/vcpkg/ports/imgui-sfml/vcpkg.json
index 6eb9a949c..c24916590 100644
--- a/external_imported/vcpkg/ports/imgui-sfml/vcpkg.json
+++ b/external_imported/vcpkg/ports/imgui-sfml/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "imgui-sfml",
-  "version": "2.5",
-  "port-version": 3,
+  "version": "2.6",
   "description": "ImGui binding for use with SFML",
   "homepage": "https://github.com/eliasdaler/imgui-sfml",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/imgui/CMakeLists.txt b/external_imported/vcpkg/ports/imgui/CMakeLists.txt
index 1994af115..406ca241d 100644
--- a/external_imported/vcpkg/ports/imgui/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/imgui/CMakeLists.txt
@@ -31,11 +31,15 @@ target_sources(
 target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_11)
 
 if(IMGUI_BUILD_ALLEGRO5_BINDING)
-    find_path(ALLEGRO5_INCLUDE_DIRS allegro5/allegro.h)
-    target_include_directories(${PROJECT_NAME} PRIVATE ${ALLEGRO5_INCLUDE_DIRS})
+    find_package(Allegro CONFIG REQUIRED)
+    target_link_libraries(${PROJECT_NAME} PRIVATE Allegro::allegro Allegro::allegro_ttf Allegro::allegro_font Allegro::allegro_main)
     target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_allegro5.cpp)
 endif()
 
+if(IMGUI_BUILD_ANDROID_BINDING)
+    target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_android.cpp)
+endif()
+
 if(IMGUI_BUILD_DX9_BINDING)
     target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_dx9.cpp)
 endif()
@@ -53,8 +57,10 @@ if(IMGUI_BUILD_DX12_BINDING)
 endif()
 
 if(IMGUI_BUILD_GLFW_BINDING)
-    find_package(glfw3 CONFIG REQUIRED)
-    target_link_libraries(${PROJECT_NAME} PUBLIC glfw)
+    if(NOT EMSCRIPTEN)
+        find_package(glfw3 CONFIG REQUIRED)
+        target_link_libraries(${PROJECT_NAME} PUBLIC glfw)
+    endif()
     target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_glfw.cpp)
 endif()
 
@@ -90,7 +96,7 @@ endif()
 if(IMGUI_BUILD_SDL2_RENDERER_BINDING)
     find_package(SDL2 CONFIG REQUIRED)
     target_link_libraries(${PROJECT_NAME} PUBLIC SDL2::SDL2)
-    target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_sdlrenderer.cpp)
+    target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_sdlrenderer2.cpp)
 endif()
 
 if(IMGUI_BUILD_VULKAN_BINDING)
@@ -110,6 +116,12 @@ if(IMGUI_FREETYPE)
     target_compile_definitions(${PROJECT_NAME} PUBLIC IMGUI_ENABLE_FREETYPE)
 endif()
 
+if(IMGUI_FREETYPE_LUNASVG)
+    find_package(unofficial-lunasvg CONFIG REQUIRED)
+    target_link_libraries(${PROJECT_NAME} PUBLIC unofficial::lunasvg::lunasvg)
+    target_compile_definitions(${PROJECT_NAME} PUBLIC IMGUI_ENABLE_FREETYPE_LUNASVG)
+endif()
+
 if(IMGUI_USE_WCHAR32)
     target_compile_definitions(${PROJECT_NAME} PUBLIC IMGUI_USE_WCHAR32)
 endif()
@@ -150,6 +162,10 @@ if(NOT IMGUI_SKIP_HEADERS)
         install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_allegro5.h DESTINATION include)
     endif()
 
+    if (IMGUI_BUILD_ANDROID_BINDING)
+        install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_android.h DESTINATION include)
+    endif()
+
     if(IMGUI_BUILD_DX9_BINDING)
         install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_dx9.h DESTINATION include)
     endif()
@@ -201,7 +217,7 @@ if(NOT IMGUI_SKIP_HEADERS)
     endif()
 
     if(IMGUI_BUILD_SDL2_RENDERER_BINDING)
-        install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_sdlrenderer.h DESTINATION include)
+        install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_sdlrenderer2.h DESTINATION include)
     endif()
 
     if(IMGUI_BUILD_VULKAN_BINDING)
diff --git a/external_imported/vcpkg/ports/imgui/imgui-config.cmake.in b/external_imported/vcpkg/ports/imgui/imgui-config.cmake.in
index 1ea694a10..5916bad89 100644
--- a/external_imported/vcpkg/ports/imgui/imgui-config.cmake.in
+++ b/external_imported/vcpkg/ports/imgui/imgui-config.cmake.in
@@ -5,7 +5,9 @@ cmake_policy(SET CMP0012 NEW)
 include(CMakeFindDependencyMacro)
 
 if (@IMGUI_BUILD_GLFW_BINDING@)
-    find_dependency(glfw3 CONFIG)
+    if (NOT "@EMSCRIPTEN@")
+        find_dependency(glfw3 CONFIG)
+    endif()
 endif()
 
 if (@IMGUI_BUILD_GLUT_BINDING@)
@@ -24,4 +26,12 @@ if (@IMGUI_FREETYPE@)
     find_dependency(freetype CONFIG)
 endif()
 
+if (@IMGUI_FREETYPE_LUNASVG@)
+    find_dependency(unofficial-lunasvg CONFIG)
+endif()
+
+if (@IMGUI_BUILD_ALLEGRO5_BINDING@)
+    find_dependency(Allegro CONFIG)
+endif()
+
 include("${CMAKE_CURRENT_LIST_DIR}/imgui-targets.cmake")
diff --git a/external_imported/vcpkg/ports/imgui/portfile.cmake b/external_imported/vcpkg/ports/imgui/portfile.cmake
index cd61c07d7..25e362b06 100644
--- a/external_imported/vcpkg/ports/imgui/portfile.cmake
+++ b/external_imported/vcpkg/ports/imgui/portfile.cmake
@@ -4,16 +4,16 @@ if ("docking-experimental" IN_LIST FEATURES)
     vcpkg_from_github(
        OUT_SOURCE_PATH SOURCE_PATH
        REPO ocornut/imgui
-       REF 9e30fb0ec1b44dc1b041db6bdd53b130b2a18509
-       SHA512 f863bc1cb7482695061bf7012ae71ede87a74d08f7f3abc6360775ed70f14506142c5c751ae398086dcb3d3005a456af9b0267c62953a041502017468151ec35
+       REF "v${VERSION}-docking"
+       SHA512 50953097ff809bca0e1cee55268eaa8dad001cf8fae85ae7623f484752d16bdf8e63c04227786361f27e73f7aeda5a8d1f9b0cee83c2aca108ce2712a21b74d9
        HEAD_REF docking
        )
 else()
     vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ocornut/imgui
-    REF v${VERSION}
-    SHA512 2284baf8628924b8c71f4d6beb78144ec919fd037bf37740244e417804858282d80be0acdc3e3c6273c9a5c1825f3754e2bedc208ff4ef486daf5f326fe3498e
+    REF "v${VERSION}"
+    SHA512 f6b33027c7050acc617c728b04b04572a13bf11589d4d2cab566901e94d349a3d91f133f7980049857ee44768d4bad426c9b2e53baf953f2efbf1a7951c3ba8a
     HEAD_REF master
     )
 endif()
@@ -24,6 +24,7 @@ file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES 
     allegro5-binding            IMGUI_BUILD_ALLEGRO5_BINDING
+    android-binding             IMGUI_BUILD_ANDROID_BINDING
     dx9-binding                 IMGUI_BUILD_DX9_BINDING
     dx10-binding                IMGUI_BUILD_DX10_BINDING
     dx11-binding                IMGUI_BUILD_DX11_BINDING
@@ -39,6 +40,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     vulkan-binding              IMGUI_BUILD_VULKAN_BINDING
     win32-binding               IMGUI_BUILD_WIN32_BINDING
     freetype                    IMGUI_FREETYPE
+    freetype-lunasvg            IMGUI_FREETYPE_LUNASVG
     wchar32                     IMGUI_USE_WCHAR32
 )
 
@@ -68,6 +70,9 @@ vcpkg_cmake_install()
 if ("freetype" IN_LIST FEATURES)
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/imconfig.h" "//#define IMGUI_ENABLE_FREETYPE" "#define IMGUI_ENABLE_FREETYPE")
 endif()
+if ("freetype-lunasvg" IN_LIST FEATURES)
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/imconfig.h" "//#define IMGUI_ENABLE_FREETYPE_LUNASVG" "#define IMGUI_ENABLE_FREETYPE_LUNASVG")
+endif()
 if ("wchar32" IN_LIST FEATURES)
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/imconfig.h" "//#define IMGUI_USE_WCHAR32" "#define IMGUI_USE_WCHAR32")
 endif()
diff --git a/external_imported/vcpkg/ports/imgui/vcpkg.json b/external_imported/vcpkg/ports/imgui/vcpkg.json
index 44b9bda6e..f71742aa8 100644
--- a/external_imported/vcpkg/ports/imgui/vcpkg.json
+++ b/external_imported/vcpkg/ports/imgui/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "imgui",
-  "version": "1.89.4",
+  "version": "1.90",
+  "port-version": 4,
   "description": "Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies.",
   "homepage": "https://github.com/ocornut/imgui",
   "license": "MIT",
@@ -21,6 +22,10 @@
         "allegro5"
       ]
     },
+    "android-binding": {
+      "description": "Make available Android native app support",
+      "supports": "android"
+    },
     "docking-experimental": {
       "description": "Build with docking support"
     },
@@ -46,10 +51,25 @@
         "freetype"
       ]
     },
+    "freetype-lunasvg": {
+      "description": "Add support to render OpenType SVG fonts using LunaSVG",
+      "dependencies": [
+        {
+          "name": "imgui",
+          "features": [
+            "freetype"
+          ]
+        },
+        "lunasvg"
+      ]
+    },
     "glfw-binding": {
       "description": "Make available GLFW binding",
       "dependencies": [
-        "glfw3"
+        {
+          "name": "glfw3",
+          "platform": "!emscripten"
+        }
       ]
     },
     "glut-binding": {
@@ -66,7 +86,8 @@
       "supports": "osx"
     },
     "opengl2-binding": {
-      "description": "Make available OpenGL (legacy) binding"
+      "description": "Make available OpenGL (legacy) binding",
+      "supports": "!uwp"
     },
     "opengl3-binding": {
       "description": "Make available OpenGL3/ES/ES2 (modern) binding"
@@ -98,7 +119,7 @@
     },
     "win32-binding": {
       "description": "Make available Win32 binding",
-      "supports": "windows"
+      "supports": "windows & !uwp"
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/immer/fix-ExportConfigVersion.patch b/external_imported/vcpkg/ports/immer/fix-ExportConfigVersion.patch
deleted file mode 100644
index 39869fa95..000000000
--- a/external_imported/vcpkg/ports/immer/fix-ExportConfigVersion.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a8cfbd3..84c89a0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -96,6 +96,14 @@ target_include_directories(immer INTERFACE
-   $<BUILD_INTERFACE:${immer_SOURCE_DIR}/>
-   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
- install(TARGETS immer EXPORT ImmerConfig)
-+
-+include(CMakePackageConfigHelpers)
-+write_basic_package_version_file(
-+  "${CMAKE_CURRENT_BINARY_DIR}/ImmerConfigVersion.cmake"
-+  VERSION ${PROJECT_VERSION}
-+  COMPATIBILITY SameMajorVersion )
-+
-+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ImmerConfigVersion.cmake" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Immer" )
- install(EXPORT ImmerConfig DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Immer")
- install(DIRECTORY immer DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
- 
diff --git a/external_imported/vcpkg/ports/immer/portfile.cmake b/external_imported/vcpkg/ports/immer/portfile.cmake
index 50abde630..93da11ed2 100644
--- a/external_imported/vcpkg/ports/immer/portfile.cmake
+++ b/external_imported/vcpkg/ports/immer/portfile.cmake
@@ -4,10 +4,8 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO arximboldi/immer
     REF "v${VERSION}"
-    SHA512 fc34242d36efdb9faa1f22ccc7591c1ace34c2b383e1266a290346baedc154e3d4a682d6dd5094460b75e123347194710072e996d19165cc5fd23c922fdfc4e8
+    SHA512 3a9aafeb5daad1881d00fb999b78f86b1c8f0e8ef2d6befe9025d8eea10392557ce7186f14878b36cbce0f2f5d38c8ffb39c9115a9496803acfc0ef2289f5cbf
     HEAD_REF master
-    PATCHES
-        fix-ExportConfigVersion.patch # Upstream PR https://github.com/arximboldi/immer/pull/250 has been merged, this patch need to be removed in next update.
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
diff --git a/external_imported/vcpkg/ports/immer/vcpkg.json b/external_imported/vcpkg/ports/immer/vcpkg.json
index 742a5e188..54edb533c 100644
--- a/external_imported/vcpkg/ports/immer/vcpkg.json
+++ b/external_imported/vcpkg/ports/immer/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "immer",
-  "version": "0.8.0",
-  "port-version": 1,
+  "version": "0.8.1",
   "description": "Postmodern immutable and persistent data structures for C++",
   "homepage": "https://sinusoid.es/immer/",
   "license": "BSL-1.0",
diff --git a/external_imported/vcpkg/ports/implot/fix-build.patch b/external_imported/vcpkg/ports/implot/fix-build.patch
deleted file mode 100644
index f0e89b7bc..000000000
--- a/external_imported/vcpkg/ports/implot/fix-build.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/implot.h b/implot.h
-index 997d96f..fb1ff02 100644
---- a/implot.h
-+++ b/implot.h
-@@ -45,6 +45,9 @@
- // [SECTION] Obsolete API
- 
- #pragma once
-+#ifndef IMGUI_DEFINE_MATH_OPERATORS
-+#define IMGUI_DEFINE_MATH_OPERATORS
-+#endif
- #include "imgui.h"
- 
- //-----------------------------------------------------------------------------
diff --git a/external_imported/vcpkg/ports/implot/portfile.cmake b/external_imported/vcpkg/ports/implot/portfile.cmake
index 95b0dfa6c..7bda01747 100644
--- a/external_imported/vcpkg/ports/implot/portfile.cmake
+++ b/external_imported/vcpkg/ports/implot/portfile.cmake
@@ -4,10 +4,8 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO epezent/implot
     REF v${VERSION}
-    SHA512 d33c83762ada55d4e188e975faf0c12d42cb3eb6b63904e6bce5b18d4184a2cdfc14e0b92286717ab86a1361dad7161e24402724f4eda2c0bce5658787d2dbe3
+    SHA512 117cb08122d900e7db857897bfec4c9ac3300a1d429c8f0303415bc693840baa9bbbb91ca3f13853d8efd3a6ebf538b7114401d4fbfe0d067256e58cbdbd4919
     HEAD_REF master
-    PATCHES
-        fix-build.patch
 )
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
diff --git a/external_imported/vcpkg/ports/implot/vcpkg.json b/external_imported/vcpkg/ports/implot/vcpkg.json
index 4146030c9..70c71fb07 100644
--- a/external_imported/vcpkg/ports/implot/vcpkg.json
+++ b/external_imported/vcpkg/ports/implot/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "implot",
-  "version": "0.14",
-  "port-version": 1,
+  "version": "0.16",
   "description": "Advanced 2D Plotting for Dear ImGui",
   "homepage": "https://github.com/epezent/implot",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/indicators/portfile.cmake b/external_imported/vcpkg/ports/indicators/portfile.cmake
index 4a71032b7..e0e1d461a 100644
--- a/external_imported/vcpkg/ports/indicators/portfile.cmake
+++ b/external_imported/vcpkg/ports/indicators/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO p-ranav/indicators
-    REF v2.2
-    SHA512 7CED2D3C320D51C7E0569104744730C8E2F952350BCAE214A9781EB43EF4002C8314937DB78461351741FC4C3AEE7A1364582B1274991E95EB30006A5F2A7EF9
+    REF v2.3
+    SHA512 59FB17E93C886CEC2418E93E221FEBD2BF3160691B3473363417F8F8FA3D50D42D1DE0E55D62598EBA800B13C1D5AB1422D0A2C867246006B61340BA32D99232
     HEAD_REF master
 )
 
@@ -24,5 +24,3 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib
 
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 file(INSTALL "${SOURCE_PATH}/LICENSE.termcolor" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-
-
diff --git a/external_imported/vcpkg/ports/indicators/vcpkg.json b/external_imported/vcpkg/ports/indicators/vcpkg.json
index 80bf1bb01..c7b54b87c 100644
--- a/external_imported/vcpkg/ports/indicators/vcpkg.json
+++ b/external_imported/vcpkg/ports/indicators/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "indicators",
-  "version": "2.2",
+  "version": "2.3",
   "description": "Activity indicators for modern C++",
   "homepage": "https://github.com/p-ranav/indicators",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/indirect-value/fix-install.patch b/external_imported/vcpkg/ports/indirect-value/fix-install.patch
new file mode 100644
index 000000000..9400f3060
--- /dev/null
+++ b/external_imported/vcpkg/ports/indirect-value/fix-install.patch
@@ -0,0 +1,25 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index da1d4d8..f314754 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -162,12 +162,6 @@ if (${CPP_INDIRECT_IS_NOT_SUBPROJECT})
+             ${CMAKE_INSTALL_INCLUDEDIR}
+     )
+ 
+-    install(
+-        FILES
+-            "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt"
+-        DESTINATION
+-            "${CMAKE_INSTALL_DATAROOTDIR}/licenses/indirect_value"
+-    )
+ 
+     install(
+         TARGETS indirect_value
+@@ -179,6 +173,7 @@ if (${CPP_INDIRECT_IS_NOT_SUBPROJECT})
+ 
+     install(
+         EXPORT indirect_value-export-set
++        FILE indirect_value-target.cmake
+         NAMESPACE indirect_value::
+         DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/indirect_value"
+     )
diff --git a/external_imported/vcpkg/ports/indirect-value/portfile.cmake b/external_imported/vcpkg/ports/indirect-value/portfile.cmake
new file mode 100644
index 000000000..b7aad2f8d
--- /dev/null
+++ b/external_imported/vcpkg/ports/indirect-value/portfile.cmake
@@ -0,0 +1,29 @@
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO jbcoe/indirect_value
+    REF 4152dcc5d2e35d03f3e71089508b47a8f630b8e7
+    SHA512 fea37378041f9c770b76e6c68777d0fd5c27e28e7f83b0a7a021eb06aa279c959ab6d5f4d748e1f0fedd90c04965073850a855395b72574143fa1053704211ea
+    HEAD_REF main
+    PATCHES
+        fix-install.patch
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS 
+        -DENABLE_CODE_COVERAGE=OFF
+        -DENABLE_INCLUDE_NATVIS=OFF
+        -DBUILD_TESTING=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME indirect_value CONFIG_PATH lib/cmake/indirect_value)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" )
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
+
+file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/indirect-value/")
diff --git a/external_imported/vcpkg/ports/indirect-value/usage b/external_imported/vcpkg/ports/indirect-value/usage
new file mode 100644
index 000000000..7b10b90cf
--- /dev/null
+++ b/external_imported/vcpkg/ports/indirect-value/usage
@@ -0,0 +1,4 @@
+The package indirect-value provides CMake targets:
+
+    find_package(indirect_value CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE indirect_value::indirect_value)
diff --git a/external_imported/vcpkg/ports/indirect-value/vcpkg.json b/external_imported/vcpkg/ports/indirect-value/vcpkg.json
new file mode 100644
index 000000000..79e197b12
--- /dev/null
+++ b/external_imported/vcpkg/ports/indirect-value/vcpkg.json
@@ -0,0 +1,16 @@
+{
+  "name": "indirect-value",
+  "version-date": "2023-06-01",
+  "description": "An indirect value-type for C++",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/influxdb-cxx/fix-dllexports.patch b/external_imported/vcpkg/ports/influxdb-cxx/fix-dllexports.patch
new file mode 100644
index 000000000..59ec8ec80
--- /dev/null
+++ b/external_imported/vcpkg/ports/influxdb-cxx/fix-dllexports.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index df7e7a3..4879802 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -26,6 +26,10 @@ project(influxdb-cxx
+   LANGUAGES CXX
+ )
+ 
++if (BUILD_SHARED_LIBS)
++  add_definitions(-DInfluxDB_EXPORTS)
++endif()
++
+ message(STATUS "~~~ ${PROJECT_NAME} v${PROJECT_VERSION} ~~~")
+ 
+ 
diff --git a/external_imported/vcpkg/ports/influxdb-cxx/portfile.cmake b/external_imported/vcpkg/ports/influxdb-cxx/portfile.cmake
index 41c61daf9..c004ed94a 100644
--- a/external_imported/vcpkg/ports/influxdb-cxx/portfile.cmake
+++ b/external_imported/vcpkg/ports/influxdb-cxx/portfile.cmake
@@ -1,9 +1,10 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO offa/influxdb-cxx
-    REF 141ef6c3f9ee933262a35abe3ac5900da821078a #Commit on 2022-08-20
-    SHA512 d19a7dfd410375a47e5fcb425045732878b09ec6b5eb01740696d57064c739cebcf4a4141c8f592d0c985f10cd8b05c538cef32193cb7226d74bc3462754b8fa
+    REF "v${VERSION}"
+    SHA512 3be45353635df28803bd57927db292fc93db28fbec56007bbf694badcbfa277672b168c3b41cd228c9570a8b8f56212369ce7eabedca581307f4c8488a69ef27
     HEAD_REF master
+    PATCHES fix-dllexports.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -25,4 +26,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 vcpkg_cmake_config_fixup(PACKAGE_NAME InfluxDB CONFIG_PATH lib/cmake/InfluxDB)
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/influxdb-cxx/vcpkg.json b/external_imported/vcpkg/ports/influxdb-cxx/vcpkg.json
index cb5377dbe..6d421a391 100644
--- a/external_imported/vcpkg/ports/influxdb-cxx/vcpkg.json
+++ b/external_imported/vcpkg/ports/influxdb-cxx/vcpkg.json
@@ -1,11 +1,12 @@
 {
   "name": "influxdb-cxx",
-  "version-date": "2022-09-02",
+  "version": "0.7.1",
+  "port-version": 1,
   "description": "InfluxDB C++ client library",
   "homepage": "https://github.com/offa/influxdb-cxx",
   "license": "MIT",
   "dependencies": [
-    "curl",
+    "cpr",
     {
       "name": "vcpkg-cmake",
       "host": true
@@ -18,6 +19,7 @@
   "features": {
     "boost": {
       "description": "Enables UDP and Unix sockets as Transport Layer",
+      "supports": "!uwp",
       "dependencies": [
         "boost-asio",
         "boost-conversion",
diff --git a/external_imported/vcpkg/ports/infoware/cross-build.diff b/external_imported/vcpkg/ports/infoware/cross-build.diff
new file mode 100644
index 000000000..bfff45b6c
--- /dev/null
+++ b/external_imported/vcpkg/ports/infoware/cross-build.diff
@@ -0,0 +1,31 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 580df83..ac89904 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -93,6 +93,8 @@ if(INFOWARE_PCI_IDS_PATH)
+ 		message(WARNING "The specified pci.ids file INFOWARE_PCI_IDS_PATH=${INFOWARE_PCI_IDS_PATH} doesn't seem to exist.")
+ 	endif()
+ 	set(infoware_pci_ids_file "${INFOWARE_PCI_IDS_PATH}")
++elseif(HOST_PCI_DATA)
++	# git unused
+ elseif(NOT Git_FOUND)
+ 	message(SEND_ERROR "Couldn't find a usable git executable in the environment, and the CMake variable INFOWARE_PCI_IDS_PATH is empty.\n${infoware_pci_ids_error}")
+ else()
+@@ -122,11 +124,17 @@ set_target_properties(infoware_pci_generator PROPERTIES CXX_STANDARD 14
+ set(INFOWARE_PCI_DATA_HPP pci_data.hpp)
+ set(INFOWARE_PCI_DATA_GEN "infoware_generated/${INFOWARE_PCI_DATA_HPP}")
+ 
++if(HOST_PCI_DATA)
++	set_target_properties(infoware_pci_generator PROPERTIES EXCLUDE_FROM_ALL 1)
++	configure_file("${HOST_PCI_DATA}" "${CMAKE_CURRENT_BINARY_DIR}/${INFOWARE_PCI_DATA_GEN}" COPYONLY)
++else()
++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${INFOWARE_PCI_DATA_GEN}" DESTINATION "share/infoware")
+ add_custom_command(OUTPUT ${INFOWARE_PCI_DATA_GEN}
+                    COMMAND ${CMAKE_COMMAND} -E make_directory infoware_generated/
+                    COMMAND $<TARGET_FILE:infoware_pci_generator> "${infoware_pci_ids_file}" > "infoware_generated/pci_data.hpp"
+                    DEPENDS "${infoware_pci_ids_file}"
+                    COMMENT "Generating ${INFOWARE_PCI_DATA_HPP}")
++endif()
+ 
+ add_custom_target(infoware_generate_pcis DEPENDS "${INFOWARE_PCI_DATA_GEN}")
+ add_dependencies(infoware infoware_generate_pcis)
diff --git a/external_imported/vcpkg/ports/infoware/portfile.cmake b/external_imported/vcpkg/ports/infoware/portfile.cmake
index 2e0d4bdab..7b36bd107 100644
--- a/external_imported/vcpkg/ports/infoware/portfile.cmake
+++ b/external_imported/vcpkg/ports/infoware/portfile.cmake
@@ -1,36 +1,43 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ThePhD/infoware
-    REF 50cb0982aceb32c8eb57aa6bc5011aced2c379df
-    SHA512 fe8182998a9e9dbed3dc3985a1161da11b340562628a71da8840aa4d4c56382ddc3ddef3d094e5d9c7c06481a2076dcff7fdb561bd169dd9d1849da4b4c6a064
+    REF d64a0c948593c0555115f60c79225c0b9ae09510
+    SHA512 3794cb78a1422bfc065037abbae81259e6061ba7b12ebd7b88581118e8eeebaf92d80cf7793b0f9f1da6754baf52835a6891663593dd0b0a38009a9cb141082b
     HEAD_REF master
+    PATCHES
+        cross-build.diff
 )
 
 vcpkg_check_features(
     OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
-        x11 INFOWARE_USE_X11
-        d3d INFOWARE_USE_D3D
-        opencl INFOWARE_USE_OPENCL
-        opengl INFOWARE_USE_OPENGL
+        d3d     INFOWARE_USE_D3D
+        opencl  INFOWARE_USE_OPENCL
+        opengl  INFOWARE_USE_OPENGL
+        x11     INFOWARE_USE_X11
 )
 
-# git must be injected, because vcpkg isolates the build
-# from the environment entirely to have reproducible builds
-vcpkg_find_acquire_program(GIT)
+if(VCPKG_CROSSCOMPILING)
+    list(APPEND FEATURE_OPTIONS "-DHOST_PCI_DATA=${CURRENT_HOST_INSTALLED_DIR}/share/${PORT}/pci_data.hpp")
+else()
+    acquire_pciids(pciids_path)
+    list(APPEND FEATURE_OPTIONS "-DINFOWARE_PCI_IDS_PATH=${pciids_path}")
+endif()
 
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         ${FEATURE_OPTIONS}
         -DINFOWARE_EXAMPLES=OFF
         -DINFOWARE_TESTS=OFF
-        -DGIT_EXECUTABLE=${GIT}
-        -DGIT_FOUND=true
+        -DCMAKE_DISABLE_FIND_PACKAGE_Git=1
 )
 
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup()
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/debug/share"
+)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/infoware/vcpkg.json b/external_imported/vcpkg/ports/infoware/vcpkg.json
index 1836379c9..db5414359 100644
--- a/external_imported/vcpkg/ports/infoware/vcpkg.json
+++ b/external_imported/vcpkg/ports/infoware/vcpkg.json
@@ -1,12 +1,19 @@
 {
-  "$reason": "Note that independent usage and testing may work, but it seems to fail in CI environments for potential cross-compilation, and is thusly noted here to note break how vcpkg builds things!",
   "name": "infoware",
-  "version-date": "2021-06-16",
-  "port-version": 1,
+  "version-date": "2023-04-12",
   "description": "C++ Library for pulling system and hardware information, without hitting the command line.",
   "homepage": "https://github.com/ThePhD/infoware",
-  "supports": "!(arm | uwp)",
+  "license": "CC0-1.0",
+  "supports": "!android & !uwp & !(windows & arm)",
   "dependencies": [
+    {
+      "name": "infoware",
+      "host": true
+    },
+    {
+      "name": "pciids",
+      "platform": "native"
+    },
     {
       "name": "vcpkg-cmake",
       "host": true
@@ -18,16 +25,31 @@
   ],
   "features": {
     "d3d": {
-      "description": "Prefer usage of Direct3D to find graphical capabilities (typically only works on Windows systems)."
+      "description": [
+        "Use Direct3D for GPU detection.",
+        "This choice has priority over opencl and opengl."
+      ],
+      "supports": "windows"
     },
     "opencl": {
-      "description": "Prefer usage of OpenCL to find graphical capabilities of the system."
+      "description": [
+        "Use OpenCL for GPU detection.",
+        "This choice has priority over opengl."
+      ],
+      "dependencies": [
+        "opencl"
+      ]
     },
     "opengl": {
-      "description": "Prefer usage of OpenGL to find graphical capabilities (may require additional libraries to be available for linking depending on the system)."
+      "description": "Use OpenGL for GPU detection.",
+      "supports": "!osx & !ios",
+      "dependencies": [
+        "opengl"
+      ]
     },
     "x11": {
-      "description": "Prefer usage of X11 to find graphical capabilities."
+      "description": "Use X11 for display detection.",
+      "supports": "!windows"
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/inih/CMakeLists.txt b/external_imported/vcpkg/ports/inih/CMakeLists.txt
deleted file mode 100644
index 184c0c4f8..000000000
--- a/external_imported/vcpkg/ports/inih/CMakeLists.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-cmake_minimum_required(VERSION 3.19)
-project(
-  inih
-  VERSION 56
-  LANGUAGES C CXX)
-
-set(Header_Files "ini.h")
-set(Source_Files "ini.c")
-
-# TODO: Put this as vcpkg-feature before `project(` so can do `LANGUAGES C` if false
-option(with_INIReader "build the C++ library" OFF)
-if (with_INIReader)
-  list(APPEND Header_Files "cpp/INIReader.h")
-  list(APPEND Source_Files "cpp/INIReader.cpp")
-endif (with_INIReader)
-
-add_library("${PROJECT_NAME}" "${Header_Files}" "${Source_Files}")
-
-include(GNUInstallDirs)
-target_include_directories(
-  "${PROJECT_NAME}"
-  PUBLIC
-  "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>"
-  "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
-)
-target_compile_features("${PROJECT_NAME}" PRIVATE c_std_90)
-set_target_properties("${PROJECT_NAME}" PROPERTIES C_VISIBILITY_PRESET hidden
-                      PUBLIC_HEADER "${Header_Files}")
-
-install(
-  TARGETS                   "${PROJECT_NAME}"
-  EXPORT                    "unofficial-${PROJECT_NAME}Config"
-  RUNTIME       DESTINATION "${CMAKE_INSTALL_BINDIR}"
-  ARCHIVE       DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-  LIBRARY       DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-  PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
-)
-
-include(CMakePackageConfigHelpers)
-set(VERSION_FILE_PATH "${CMAKE_CURRENT_BINARY_DIR}/unofficial-${PROJECT_NAME}ConfigVersion.cmake")
-write_basic_package_version_file(
-  "${VERSION_FILE_PATH}"
-  VERSION       "${PROJECT_VERSION}"
-  COMPATIBILITY SameMajorVersion
-)
-install(FILES "${VERSION_FILE_PATH}" DESTINATION "share/unofficial-${PROJECT_NAME}")
-
-install(FILES ${Header_Files} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
-
-install(
-  EXPORT      "unofficial-${PROJECT_NAME}Config"
-  FILE        "unofficial-${PROJECT_NAME}Config.cmake"
-  NAMESPACE   "unofficial::${PROJECT_NAME}::"
-  DESTINATION "share/unofficial-${PROJECT_NAME}")
-
-export(PACKAGE "${PROJECT_NAME}")
diff --git a/external_imported/vcpkg/ports/inih/portfile.cmake b/external_imported/vcpkg/ports/inih/portfile.cmake
index de15f7629..06e53736f 100644
--- a/external_imported/vcpkg/ports/inih/portfile.cmake
+++ b/external_imported/vcpkg/ports/inih/portfile.cmake
@@ -3,34 +3,42 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO benhoyt/inih
-    REF 5e1d9e2625842dddb3f9c086a50f22e4f45dfc2b # r56
-    SHA512 477a66643f6636a5826a1206c6588a12827e24a4a2609e11f0695888998e2bfcba8bdb2240c561404ee675bf4c72e85d7d008a1fbddb142c0d263b413de8d358
+    REF r57
+    SHA512 9f758df876df54ed7e228fd82044f184eefbe47e806cd1e6d62e1b0ea28e2c08e67fa743042d73b4baef0b882480e6afe2e72878b175822eb2bdbb6d89c0e411
     HEAD_REF master
 )
 
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
-
 vcpkg_check_features(
     OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
         cpp with_INIReader
 )
 
-vcpkg_cmake_configure(
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+    set(INIH_CONFIG_DEBUG ON)
+else()
+    set(INIH_CONFIG_DEBUG OFF)
+endif()
+
+# Install unofficial CMake package
+configure_file("${CMAKE_CURRENT_LIST_DIR}/unofficial-inihConfig.cmake.in" "${CURRENT_PACKAGES_DIR}/share/unofficial-inih/unofficial-inihConfig.cmake" @ONLY)
+
+# meson build
+string(REPLACE "OFF" "false" FEATURE_OPTIONS "${FEATURE_OPTIONS}")
+string(REPLACE "ON" "true" FEATURE_OPTIONS "${FEATURE_OPTIONS}")
+
+vcpkg_configure_meson(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-        ${FEATURE_OPTIONS}
+        "${FEATURE_OPTIONS}"
+        "-Dcpp_std=c++11"
 )
 
-vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-inih)
+vcpkg_install_meson()
+vcpkg_fixup_pkgconfig()
+
+vcpkg_copy_pdbs()
 
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" [=[
-inih provides CMake targets:
-    find_package(unofficial-inih CONFIG REQUIRED)
-    target_link_libraries(main PRIVATE unofficial::inih::inih)
-]=])
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share"
-                    "${CURRENT_PACKAGES_DIR}/debug/include")
+configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY)
diff --git a/external_imported/vcpkg/ports/inih/unofficial-inihConfig.cmake.in b/external_imported/vcpkg/ports/inih/unofficial-inihConfig.cmake.in
new file mode 100644
index 000000000..d6b61fc40
--- /dev/null
+++ b/external_imported/vcpkg/ports/inih/unofficial-inihConfig.cmake.in
@@ -0,0 +1,60 @@
+if(TARGET unofficial::inih::libinih)
+  return()
+endif()
+
+set(INIH_WITH_INI_READER @with_INIReader@)
+set(INIH_WITH_DEBUG @INIH_CONFIG_DEBUG@)
+
+# Compute the installation prefix relative to this file.
+get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+
+###################
+####  libinih  ####
+
+add_library(unofficial::inih::libinih UNKNOWN IMPORTED)
+
+find_library(INIH_INIHLIB_RELEASE NAMES inih PATHS "${_IMPORT_PREFIX}/lib/" REQUIRED NO_DEFAULT_PATH)
+set_target_properties(unofficial::inih::libinih PROPERTIES
+  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
+  IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+  IMPORTED_LOCATION_RELEASE "${INIH_INIHLIB_RELEASE}"
+  IMPORTED_CONFIGURATIONS "RELEASE"
+)
+
+if(INIH_WITH_DEBUG)
+  set_property(TARGET unofficial::inih::libinih APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
+  find_library(INIH_INIHLIB_DEBUG NAMES inih PATHS "${_IMPORT_PREFIX}/debug/lib/" REQUIRED NO_DEFAULT_PATH)
+  set_target_properties(unofficial::inih::libinih PROPERTIES 
+    IMPORTED_LOCATION_DEBUG "${INIH_INIHLIB_DEBUG}"
+  )
+endif()
+
+####  libinih  ####
+###################
+#### INIReader ####
+
+if(INIH_WITH_INI_READER)
+  add_library(unofficial::inih::inireader UNKNOWN IMPORTED)
+
+  find_library(INIH_INIREADER_RELEASE NAMES INIReader PATHS "${_IMPORT_PREFIX}/lib/" REQUIRED NO_DEFAULT_PATH)
+  set_target_properties(unofficial::inih::inireader PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
+    IMPORTED_LINK_INTERFACE_LANGUAGES "C;CXX"
+    IMPORTED_LOCATION_RELEASE "${INIH_INIREADER_RELEASE}"
+    INTERFACE_LINK_LIBRARIES "unofficial::inih::libinih"
+    IMPORTED_CONFIGURATIONS "RELEASE"
+  )
+
+  if(INIH_WITH_DEBUG)
+    set_property(TARGET unofficial::inih::inireader APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
+    find_library(INIH_INIREADER_DEBUG NAMES INIReader PATHS "${_IMPORT_PREFIX}/debug/lib/" NO_DEFAULT_PATH)
+    set_target_properties(unofficial::inih::inireader PROPERTIES 
+      IMPORTED_LOCATION_DEBUG "${INIH_INIREADER_DEBUG}"
+    )
+  endif()
+endif()
+
+#### INIReader ####
+###################
diff --git a/external_imported/vcpkg/ports/inih/usage b/external_imported/vcpkg/ports/inih/usage
new file mode 100644
index 000000000..227be04c6
--- /dev/null
+++ b/external_imported/vcpkg/ports/inih/usage
@@ -0,0 +1,7 @@
+The package inih provides unofficial CMake targets:
+    find_package(unofficial-inih CONFIG REQUIRED)
+    # C API
+    target_link_libraries(main PRIVATE unofficial::inih::libinih)
+    # C++ API (Requires "cpp" feature)
+    target_link_libraries(main PRIVATE unofficial::inih::inireader)
+Alternatively, if you are using pckgconfig use the name "inih" for the C API and "inireader" for the C++ API
diff --git a/external_imported/vcpkg/ports/inih/vcpkg.json b/external_imported/vcpkg/ports/inih/vcpkg.json
index 5b76e98e6..c1b2b8a43 100644
--- a/external_imported/vcpkg/ports/inih/vcpkg.json
+++ b/external_imported/vcpkg/ports/inih/vcpkg.json
@@ -1,19 +1,18 @@
 {
   "name": "inih",
-  "version": "56",
+  "version": "57",
   "description": "Simple .INI file parser",
   "homepage": "https://github.com/benhoyt/inih",
   "license": "BSD-3-Clause",
   "dependencies": [
     {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
+      "name": "vcpkg-tool-meson",
       "host": true
     }
   ],
+  "default-features": [
+    "cpp"
+  ],
   "features": {
     "cpp": {
       "description": "Build the C++ library"
diff --git a/external_imported/vcpkg/ports/iniparser/portfile.cmake b/external_imported/vcpkg/ports/iniparser/portfile.cmake
index 30487f815..4688037bc 100644
--- a/external_imported/vcpkg/ports/iniparser/portfile.cmake
+++ b/external_imported/vcpkg/ports/iniparser/portfile.cmake
@@ -10,19 +10,18 @@ vcpkg_from_github(
         win32_ssize_t.patch
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-${PORT} TARGET_PATH share/unofficial-${PORT})
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT})
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-
-vcpkg_fixup_pkgconfig()
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/external_imported/vcpkg/ports/iniparser/vcpkg.json b/external_imported/vcpkg/ports/iniparser/vcpkg.json
index e4b515cbf..8ed760ec1 100644
--- a/external_imported/vcpkg/ports/iniparser/vcpkg.json
+++ b/external_imported/vcpkg/ports/iniparser/vcpkg.json
@@ -1,8 +1,18 @@
 {
   "name": "iniparser",
   "version-date": "2020-04-06",
-  "port-version": 3,
+  "port-version": 5,
   "description": "C library for parsing INI-style files",
   "homepage": "https://github.com/ndevilla/iniparser",
-  "license": "MIT"
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/intel-mkl/copy-from-dmg.cmake b/external_imported/vcpkg/ports/intel-mkl/copy-from-dmg.cmake
new file mode 100644
index 000000000..a5aa67cde
--- /dev/null
+++ b/external_imported/vcpkg/ports/intel-mkl/copy-from-dmg.cmake
@@ -0,0 +1,53 @@
+find_program(HDIUTIL NAMES hdiutil REQUIRED)
+set(dmg_path "NOTFOUND" CACHE FILEPATH "Where to find the DMG")
+set(output_dir "output_dir" CACHE FILEPATH "Where to put the packages")
+
+if(NOT EXISTS "${dmg_path}")
+    message(FATAL_ERROR "'dmg_path' (${dmg_path}) does not exist.")
+endif()
+if(NOT IS_DIRECTORY "${output_dir}")
+    message(FATAL_ERROR "'output_dir' (${output_dir}) is not a directory.")
+endif()
+
+execute_process(
+    COMMAND mktemp -d
+    RESULT_VARIABLE mktemp_result
+    OUTPUT_VARIABLE mount_point
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+if(NOT mktemp_result STREQUAL "0")
+    message(FATAL_ERROR "mktemp -d failed: ${mktemp_result}")
+elseif(NOT IS_DIRECTORY "${mount_point}")
+    message(FATAL_ERROR "'mount_point' (${mount_point}) is not a directory.")
+endif()
+
+execute_process(
+    COMMAND "${HDIUTIL}" attach "${dmg_path}" -mountpoint "${mount_point}" -readonly
+    RESULT_VARIABLE mount_result
+)
+if(mount_result STREQUAL "0")
+    set(dmg_packages_dir "${mount_point}/bootstrapper.app/Contents/Resources/packages")
+    file(GLOB packages
+        "${dmg_packages_dir}/intel.oneapi.mac.mkl.devel,*"
+        "${dmg_packages_dir}/intel.oneapi.mac.mkl.runtime,*"
+        "${dmg_packages_dir}/intel.oneapi.mac.mkl.product,*"
+        "${dmg_packages_dir}/intel.oneapi.mac.openmp,*"
+    )
+    # Using execute_process to avoid direct errors
+    execute_process(
+        COMMAND cp -R ${packages} "${output_dir}/"
+        RESULT_VARIABLE copy_result
+    )
+endif()
+execute_process(
+    COMMAND "${HDIUTIL}" detach "${mount_point}"
+    RESULT_VARIABLE unmount_result
+)
+
+if(NOT mount_result STREQUAL "0")
+    message(FATAL_ERROR "Mounting ${dmg_path} failed: ${mount_result}")
+elseif(NOT copy_result STREQUAL "0")
+    message(FATAL_ERROR "Coyping packages failed: ${copy_result}")
+elseif(NOT unmount_result STREQUAL "0")
+    message(FATAL_ERROR "Unounting ${dmg_path} failed: ${unmount_result}")
+endif()
diff --git a/external_imported/vcpkg/ports/intel-mkl/portfile.cmake b/external_imported/vcpkg/ports/intel-mkl/portfile.cmake
index 949431e79..e02c27957 100644
--- a/external_imported/vcpkg/ports/intel-mkl/portfile.cmake
+++ b/external_imported/vcpkg/ports/intel-mkl/portfile.cmake
@@ -1,88 +1,83 @@
-# This package installs Intel MKL on Linux and Windows for x64 and on other platforms tries to search for it.
-# The installation for the platforms are:
-#   - Windows: ilp64, intel_thread (!static_crt), sequential(static_crt)
-#   - Linux: ilp64, intel_thread
+# This package installs Intel MKL on Linux, macOS and Windows for x64.
+# Configuration:
+#   - ilp64
+#   - dynamic CRT: intel_thread, static CRT: sequential
 
 set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
 
-set(MKL_REQUIRED_VERSION "20200000")
-
 # https://registrationcenter-download.intel.com/akdlm/IRC_NAS/19150/w_onemkl_p_2023.0.0.25930_offline.exe # windows
 # https://registrationcenter-download.intel.com/akdlm/IRC_NAS/19116/m_onemkl_p_2023.0.0.25376_offline.dmg # macos
 # https://registrationcenter-download.intel.com/akdlm/irc_nas/19138/l_onemkl_p_2023.0.0.25398_offline.sh # linux
 set(sha "")
-if(VCPKG_TARGET_IS_WINDOWS)
+if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
+  # nop
+elseif(VCPKG_TARGET_IS_WINDOWS)
   set(filename w_onemkl_p_2023.0.0.25930_offline.exe)
   set(magic_number 19150)
   set(sha a3eb6b75241a2eccb73ed73035ff111172c55d3fa51f545c7542277a155df84ff72fc826621711153e683f84058e64cb549c030968f9f964531db76ca8a3ed46)
-elseif(VCPKG_TARGET_IS_OSX AND 0)
+  set(package_infix "win")
+elseif(VCPKG_TARGET_IS_OSX)
   set(filename m_onemkl_p_2023.0.0.25376_offline.dmg)
   set(magic_number 19116)
   set(sha 7b9b8c004054603e6830fb9b9c049d5a4cfc0990c224cb182ac5262ab9f1863775a67491413040e3349c590e2cca58edcfc704db9f3b9f9faa8b5b09022cd2af)
-  # This is a disk image: If somebody knows how to extract it please do so. 
+  set(package_infix "mac")
+  set(package_libdir "lib")
+  set(compiler_libdir "mac/compiler/lib")
 elseif(VCPKG_TARGET_IS_LINUX)
   set(filename l_onemkl_p_2023.0.0.25398_offline.sh)
   set(magic_number 19138)
   set(sha b5f2f464675f0fd969dde2faf2e622b834eb1cc406c4a867148116f6c24ba5c709d98b678840f4a89a1778e12cde0ff70ce2ef59faeef3d3f3aa1d0329c71af1)
-else()
-  set(ProgramFilesx86 "ProgramFiles(x86)")
-  set(INTEL_ROOT $ENV{${ProgramFilesx86}}/IntelSWTools/compilers_and_libraries/windows)
-  set(ONEMKL_ROOT $ENV{${ProgramFilesx86}}/Intel/oneAPI/mkl/latest)
-
-  find_path(MKL_ROOT include/mkl.h
-      PATHS
-      $ENV{MKLROOT}
-      ${INTEL_ROOT}/mkl
-      $ENV{ONEAPI_ROOT}/mkl/latest
-      ${ONEMKL_ROOT}
-      DOC
-      "Folder contains MKL")
-
-  if (MKL_ROOT STREQUAL "MKL_ROOT-NOTFOUND")
-      message(FATAL_ERROR "Could not find MKL. Before continuing, please download and install MKL  (${MKL_REQUIRED_VERSION} or higher) from:"
-                          "\n    https://registrationcenter.intel.com/en/products/download/3178/\n"
-                          "\nAlso ensure vcpkg has been rebuilt with the latest version (v0.0.104 or later)")
-  endif()
+  set(package_infix "lin")
+  set(package_libdir "lib/intel64")
+  set(compiler_libdir "linux/compiler/lib/intel64_lin")
+endif()
 
-  file(STRINGS "${MKL_ROOT}/include/mkl_version.h" MKL_VERSION_DEFINITION REGEX "INTEL_MKL_VERSION")
-  string(REGEX MATCH "([0-9]+)" MKL_VERSION ${MKL_VERSION_DEFINITION})
+if(NOT sha)
+  message(WARNING "${PORT} is empty for ${TARGET_TRIPLET}.")
+  return()
+endif()
 
-  if (MKL_VERSION LESS MKL_REQUIRED_VERSION)
-      message(FATAL_ERROR "MKL ${MKL_VERSION} is found but ${MKL_REQUIRED_VERSION} is required. Please download and install a more recent version of MKL from:"
-                          "\n    https://registrationcenter.intel.com/en/products/download/3178/\n")
-  endif()
+vcpkg_download_distfile(installer_path
+    URLS "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/${magic_number}/${filename}"
+    FILENAME "${filename}"
+    SHA512 "${sha}"
+)
+
+# Note: intel_thread and lp64 are the defaults.
+set(interface "ilp64") # or ilp64; ilp == 64 bit int api
+#https://www.intel.com/content/www/us/en/develop/documentation/onemkl-linux-developer-guide/top/linking-your-application-with-onemkl/linking-in-detail/linking-with-interface-libraries/using-the-ilp64-interface-vs-lp64-interface.html
+if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
+    set(threading "intel_thread") #sequential or intel_thread or tbb_thread or pgi_thread
+else()
+    set(threading "sequential")
+endif()
+if(threading STREQUAL "intel_thread")
+    set(short_thread "iomp")
+else()
+    string(SUBSTRING "${threading}" "0" "3" short_thread)
 endif()
+set(main_pc_file "mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc")
 
-if(sha)
-  vcpkg_download_distfile(archive_path
-      URLS "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/${magic_number}/${filename}"
-      FILENAME "${filename}"
-      SHA512 ${sha}
-  )
+# First extraction level: packages (from offline installer)
+set(extract_0_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-extract")
+file(REMOVE_RECURSE "${extract_0_dir}")
+file(MAKE_DIRECTORY "${extract_0_dir}")
 
-  file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}")
+# Second extraction level: actual files (from packages)
+set(extract_1_dir "${CURRENT_PACKAGES_DIR}/intel-extract")
+file(REMOVE_RECURSE "${extract_1_dir}")
+file(MAKE_DIRECTORY "${extract_1_dir}")
 
-  # Note: intel_thread and lp64 are the defaults.
-  set(interface "ilp64") # or ilp64; ilp == 64 bit int api
-  #https://www.intel.com/content/www/us/en/develop/documentation/onemkl-linux-developer-guide/top/linking-your-application-with-onemkl/linking-in-detail/linking-with-interface-libraries/using-the-ilp64-interface-vs-lp64-interface.html
-  if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
-      set(threading "intel_thread") #sequential or intel_thread or tbb_thread or pgi_thread
-  else()
-      set(threading "sequential")
-  endif()
-  if(threading STREQUAL "intel_thread")
-      set(short_thread "iomp")
-  else()
-      string(SUBSTRING "${threading}" "0" "3" short_thread)
-  endif()
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig")
 
-  if(VCPKG_TARGET_IS_WINDOWS)
+if(VCPKG_TARGET_IS_WINDOWS)
     vcpkg_find_acquire_program(7Z)
-    vcpkg_execute_in_download_mode(
-                            COMMAND "${7Z}" x "${archive_path}" "-o${CURRENT_PACKAGES_DIR}/intel-extract" "-y" "-bso0" "-bsp0"
-                            WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}"
-                        )
-                        
+    message(STATUS "Extracting offline installer")
+    vcpkg_execute_required_process(
+        COMMAND "${7Z}" x "${installer_path}" "-o${extract_0_dir}" "-y" "-bso0" "-bsp0"
+        WORKING_DIRECTORY "${extract_0_dir}"
+        LOGNAME "extract-${TARGET_TRIPLET}-0"
+    )
 
     set(packages 
         "intel.oneapi.win.mkl.devel,v=2023.0.0-25930/oneapi-mkl-devel-for-installer_p_2023.0.0.25930.msi" # has the required libs. 
@@ -92,186 +87,168 @@ if(sha)
         #"intel.oneapi.win.tbb.runtime,v=2021.8.0-25874" #TBB
         )
 
-    set(output_path "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}") # vcpkg.cmake adds everything in /tools to CMAKE_PROGRAM_PATH. That is not desired 
-    file(MAKE_DIRECTORY "${output_path}")
     foreach(pack IN LISTS packages)
-        set(archive_path "${CURRENT_PACKAGES_DIR}/intel-extract/packages/${pack}")
+        set(package_path "${extract_0_dir}/packages/${pack}")
         cmake_path(GET pack STEM LAST_ONLY packstem)
-        cmake_path(NATIVE_PATH archive_path archive_path_native)
-            vcpkg_execute_in_download_mode(
-                            COMMAND "${LESSMSI}" x "${archive_path_native}" # Using output_path here does not work in bash
-                            WORKING_DIRECTORY "${output_path}" 
-                            OUTPUT_FILE "${CURRENT_BUILDTREES_DIR}/lessmsi-${TARGET_TRIPLET}-out.log"
-                            ERROR_FILE "${CURRENT_BUILDTREES_DIR}/lessmsi-${TARGET_TRIPLET}-err.log"
-                            RESULT_VARIABLE error_code
-                        )
-        file(COPY "${output_path}/${packstem}/SourceDir/" DESTINATION "${output_path}")
-        file(REMOVE_RECURSE "${output_path}/${packstem}")
+        cmake_path(NATIVE_PATH package_path package_path_native)
+        vcpkg_execute_required_process(
+            COMMAND "${LESSMSI}" x "${package_path_native}"
+            WORKING_DIRECTORY "${extract_1_dir}" 
+            LOGNAME "extract-${TARGET_TRIPLET}-${packstem}"
+        )
+        file(COPY "${extract_1_dir}/${packstem}/SourceDir/" DESTINATION "${extract_1_dir}")
+        file(REMOVE_RECURSE "${extract_1_dir}/${packstem}")
     endforeach()
 
-    set(basepath "${output_path}/Intel/Compiler/12.0/mkl/2023.0.0/")
-    set(basepath2 "${output_path}/Intel/Compiler/12.0/compiler/2023.0.0/")
-    file(REMOVE_RECURSE "${output_path}/Intel/shared files"
-                        "${output_path}/Intel/Compiler/12.0/conda_channel"
-                        "${basepath}tools"
-                        "${basepath}interfaces"
-                        "${basepath}examples"
-                        "${basepath}bin"
-                        "${basepath}benchmarks"
-                        )
-
-    file(COPY "${basepath}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+    set(mkl_dir "${extract_1_dir}/Intel/Compiler/12.0/mkl/2023.0.0")
+    file(COPY "${mkl_dir}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
     # see https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl-link-line-advisor.html for linking
     if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
       set(files "mkl_core_dll.lib" "mkl_${threading}_dll.lib" "mkl_intel_${interface}_dll.lib" "mkl_blas95_${interface}.lib" "mkl_lapack95_${interface}.lib") # "mkl_rt.lib" single dynamic lib with dynamic dispatch
-      file(COPY "${basepath}redist/intel64/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") # Could probably be reduced instead of copying all
+      file(COPY "${mkl_dir}/redist/intel64/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") # Could probably be reduced instead of copying all
       if(NOT VCPKG_BUILD_TYPE)
-        file(COPY "${basepath}redist/intel64/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
+        file(COPY "${mkl_dir}/redist/intel64/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
       endif()
     else()
       set(files "mkl_core.lib" "mkl_${threading}.lib" "mkl_intel_${interface}.lib" "mkl_blas95_${interface}.lib" "mkl_lapack95_${interface}.lib")
     endif()
-    foreach(file ${files})
-      file(COPY "${basepath}lib/intel64/${file}" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/intel64") # instead of manual-link keep normal structure
+    foreach(file IN LISTS files)
+      file(COPY "${mkl_dir}/lib/intel64/${file}" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/intel64") # instead of manual-link keep normal structure
       if(NOT VCPKG_BUILD_TYPE)
-        file(COPY "${basepath}lib/intel64/${file}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/intel64")
+        file(COPY "${mkl_dir}/lib/intel64/${file}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/intel64")
       endif()
     endforeach()
+    file(COPY_FILE "${mkl_dir}/lib/pkgconfig/${main_pc_file}" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${main_pc_file}")
 
-    configure_file("${basepath}lib/pkgconfig/mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/mkl.pc" @ONLY)
-    if(NOT VCPKG_BUILD_TYPE)
-      configure_file("${basepath}lib/pkgconfig/mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" @ONLY)
-      vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" "/include" "/../include")
-    endif()
-
+    set(compiler_dir "${extract_1_dir}/Intel/Compiler/12.0/compiler/2023.0.0")
     if(threading STREQUAL "intel_thread")
-      file(COPY "${basepath2}windows/redist/intel64_win/compiler/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
-      file(COPY "${basepath2}windows/compiler/lib/intel64_win/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/intel64")
-      configure_file("${basepath2}lib/pkgconfig/openmp.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc" @ONLY)
+      file(COPY "${compiler_dir}/windows/redist/intel64_win/compiler/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
+      file(COPY "${compiler_dir}/windows/compiler/lib/intel64_win/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/intel64")
+      file(COPY_FILE "${compiler_dir}/lib/pkgconfig/openmp.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc")
       vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc" "/windows/compiler/lib/intel64_win/" "/lib/intel64/")
-      vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc" "Cflags: -I \${includedir}" "")
+      vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc" "-I \${includedir}" "-I\"\${includedir}\"")
+      vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${main_pc_file}" "openmp" "libiomp5")
       if(NOT VCPKG_BUILD_TYPE)
-          file(COPY "${basepath2}windows/redist/intel64_win/compiler/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
-          file(COPY "${basepath2}windows/compiler/lib/intel64_win/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/intel64")
-          configure_file("${basepath2}lib/pkgconfig/openmp.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libiomp5.pc" @ONLY)
-          vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libiomp5.pc" "/windows/compiler/lib/intel64_win/" "/lib/intel64/")
-          vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libiomp5.pc" "Cflags: -I \${includedir}" "")
-      endif()
-      configure_file("${basepath}lib/pkgconfig/mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/mkl.pc" @ONLY)
-      vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/mkl.pc" "openmp" "libiomp5")
-      if(NOT VCPKG_BUILD_TYPE)
-        configure_file("${basepath}lib/pkgconfig/mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" @ONLY)
-        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" "openmp" "libiomp5")
-        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" "/include" "/../include")
+        file(COPY "${compiler_dir}/windows/redist/intel64_win/compiler/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
+        file(COPY "${compiler_dir}/windows/compiler/lib/intel64_win/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/intel64")
       endif()
     endif()
-
-
-    file(COPY "${basepath}lib/cmake/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/")
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "MKL_CMAKE_PATH}/../../../" "MKL_CMAKE_PATH}/../../")
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "redist/\${MKL_ARCH}/" "bin")
-    #TODO: Hardcode settings from portfile in config.cmake
-    #TODO. Give lapack/blas information about the correct BLA_VENDOR depending on settings. 
-
-    file(INSTALL "${CURRENT_PACKAGES_DIR}/intel-extract/packages/intel.oneapi.win.mkl.product,v=2023.0.0-25930/licenses/license.htm" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-    file(INSTALL "${basepath}licensing" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-  elseif(VCPKG_TARGET_IS_LINUX)
-    message(WARNING "This port is still a work on progress on linux. E.g. it is not correctly filtering the libraries in accordance with VCPKG_LIBRARY_LINKAGE. Furthermore it is using the default threading which is Intel OpenMP which is known to segfault if GNU OpenMP is also used elsewhere!")
-    #./l_onemkl_p_2023.0.0.25398_offline.sh --extract-only -a -s
-    # cmake -E tar -xf <payload>
-    
-    set(output_path "${CURRENT_PACKAGES_DIR}/intel-extract")
-    message(STATUS "${archive_path}")
-    file(MAKE_DIRECTORY "${output_path}")
-    vcpkg_execute_in_download_mode(
-                            COMMAND "bash" "--verbose" "--noprofile" "${archive_path}" "--extract-only" "--extract-folder" "${output_path}"
-                            WORKING_DIRECTORY "${output_path}"
-                            OUTPUT_FILE "${CURRENT_BUILDTREES_DIR}/extract-${TARGET_TRIPLET}-out.log"
-                            ERROR_FILE "${CURRENT_BUILDTREES_DIR}/extract-${TARGET_TRIPLET}-err.log"
-                        )
-    set(packages 
-      "intel.oneapi.lin.mkl.devel,v=2023.0.0-25398" # has the required staic libs. 
-      "intel.oneapi.lin.mkl.runtime,v=2023.0.0-25398" # has the required dynamic so.
-      "intel.oneapi.lin.openmp,v=2023.0.0-25370" #OpenMP
+else()
+    message(STATUS "Warning: This port is still a work on progress. 
+   E.g. it is not correctly filtering the libraries in accordance with
+   VCPKG_LIBRARY_LINKAGE. It is using the default threading (Intel OpenMP)
+   which is known to segfault when used together with GNU OpenMP.
+")
+
+    message(STATUS "Extracting offline installer")
+    if(VCPKG_TARGET_IS_LINUX)
+      vcpkg_execute_required_process(
+          COMMAND "bash" "--verbose" "--noprofile" "${installer_path}" "--extract-only" "--extract-folder" "${extract_0_dir}"
+          WORKING_DIRECTORY "${extract_0_dir}"
+          LOGNAME "extract-${TARGET_TRIPLET}-0"
       )
+      file(RENAME "${extract_0_dir}/l_onemkl_p_2023.0.0.25398_offline/packages" "${extract_0_dir}/packages")
+    elseif(VCPKG_TARGET_IS_OSX)
+      find_program(HDIUTIL NAMES hdiutil REQUIRED)
+      file(MAKE_DIRECTORY "${extract_0_dir}/packages")
+      message(STATUS "... Don't interrupt.")
+      vcpkg_execute_required_process(
+          COMMAND "${CMAKE_COMMAND}" "-Ddmg_path=${installer_path}"
+                                     "-Doutput_dir=${extract_0_dir}/packages"
+                                     "-DHDIUTIL=${HDIUTIL}"
+                                     -P "${CMAKE_CURRENT_LIST_DIR}/copy-from-dmg.cmake"
+          WORKING_DIRECTORY "${extract_0_dir}"
+          LOGNAME "extract-${TARGET_TRIPLET}-0"
+      )
+      message(STATUS "... Done.")
+    endif()
 
-    foreach(pack IN LISTS packages)
-        set(archive_path "${output_path}/l_onemkl_p_2023.0.0.25398_offline/packages/${pack}")
-            vcpkg_execute_in_download_mode(
-                            COMMAND "${CMAKE_COMMAND}" "-E" "tar" "-xf" "${archive_path}/cupPayload.cup"
-                            WORKING_DIRECTORY "${output_path}"
-                            OUTPUT_FILE "${CURRENT_BUILDTREES_DIR}/mkl-extract-${TARGET_TRIPLET}-out.log"
-                            ERROR_FILE "${CURRENT_BUILDTREES_DIR}/mkl-extract-${TARGET_TRIPLET}-err.log"
-            )
-    endforeach()
-
-    set(basepath "${output_path}/_installdir/mkl/2023.0.0/")
-    set(basepath2 "${output_path}/_installdir/compiler/2023.0.0/")
-    file(REMOVE_RECURSE "${basepath}../../conda_channel/"
-                        "${basepath}tools"
-                        "${basepath}interfaces"
-                        "${basepath}examples"
-                        "${basepath}bin"
-                        "${basepath}benchmarks"
-                        "${basepath}env"
-                        "${basepath}modulefiles"
-                        )
-
-    file(COPY "${basepath}include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
-    file(COPY "${basepath}lib/intel64/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/intel64")
-
+    file(GLOB package_path "${extract_0_dir}/packages/intel.oneapi.${package_infix}.mkl.runtime,v=2023.0.0-*")
+    cmake_path(GET package_path STEM LAST_ONLY packstem)
+    message(STATUS "Extracting ${packstem}")
+    vcpkg_execute_required_process(
+        COMMAND "${CMAKE_COMMAND}" "-E" "tar" "-xf" "${package_path}/cupPayload.cup"
+            "_installdir/mkl/2023.0.0/lib"
+            "_installdir/mkl/2023.0.0/licensing"
+        WORKING_DIRECTORY "${extract_1_dir}"
+        LOGNAME "extract-${TARGET_TRIPLET}-${packstem}"
+    )
+    file(GLOB package_path "${extract_0_dir}/packages/intel.oneapi.${package_infix}.mkl.devel,v=2023.0.0-*")
+    cmake_path(GET package_path STEM LAST_ONLY packstem)
+    message(STATUS "Extracting ${packstem}")
+    vcpkg_execute_required_process(
+        COMMAND "${CMAKE_COMMAND}" "-E" "tar" "-xf" "${package_path}/cupPayload.cup"
+            "_installdir/mkl/2023.0.0/bin"
+            "_installdir/mkl/2023.0.0/include"
+            "_installdir/mkl/2023.0.0/lib"
+        WORKING_DIRECTORY "${extract_1_dir}"
+        LOGNAME "extract-${TARGET_TRIPLET}-${packstem}"
+    )
+    file(GLOB package_path "${extract_0_dir}/packages/intel.oneapi.${package_infix}.openmp,v=2023.0.0-*")
+    cmake_path(GET package_path STEM LAST_ONLY packstem)
+    message(STATUS "Extracting ${packstem}")
+    vcpkg_execute_required_process(
+        COMMAND "${CMAKE_COMMAND}" "-E" "tar" "-xf" "${package_path}/cupPayload.cup"
+            "_installdir/compiler/2023.0.0"
+        WORKING_DIRECTORY "${extract_1_dir}"
+        LOGNAME "extract-${TARGET_TRIPLET}-${packstem}"
+    )
+
+    set(mkl_dir "${extract_1_dir}/_installdir/mkl/2023.0.0")
+    file(COPY "${mkl_dir}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+    file(COPY "${mkl_dir}/${package_libdir}/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/intel64")
     if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
       set(to_remove_suffix .a)
+    elseif(VCPKG_TARGET_IS_OSX)
+      set(to_remove_suffix .dylib)
     else()
       set(to_remove_suffix .so)
     endif()
-    file(GLOB_RECURSE files_to_remove "${CURRENT_PACKAGES_DIR}/lib/intel64/*${to_remove_suffix}" "${CURRENT_PACKAGES_DIR}/lib/intel64/*${to_remove_suffix}.?")
+    file(GLOB_RECURSE files_to_remove
+        "${CURRENT_PACKAGES_DIR}/lib/intel64/*${to_remove_suffix}"
+        "${CURRENT_PACKAGES_DIR}/lib/intel64/*${to_remove_suffix}.?"
+    )
     file(REMOVE ${files_to_remove})
-    
-    configure_file("${basepath}lib/pkgconfig/mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/mkl.pc" @ONLY)
-    if(NOT VCPKG_BUILD_TYPE)
-      configure_file("${basepath}lib/pkgconfig/mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" @ONLY)
-      vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" "/lib/intel64" "/../lib/intel64")
-      vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" "/include" "/../include")
+    file(COPY_FILE "${mkl_dir}/lib/pkgconfig/${main_pc_file}" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${main_pc_file}")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${main_pc_file}" "\${exec_prefix}/${package_libdir}" "\${exec_prefix}/lib/intel64")
+  
+    set(compiler_dir "${extract_1_dir}/_installdir/compiler/2023.0.0")
+    if(threading STREQUAL "intel_thread")
+      file(COPY "${compiler_dir}/${compiler_libdir}/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/intel64")
+      file(COPY_FILE "${compiler_dir}/lib/pkgconfig/openmp.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc")
+      vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc" "/${compiler_libdir}/" "/lib/intel64/")
+      vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${main_pc_file}" "openmp" "libiomp5")
     endif()
+endif()
 
-    if(threading STREQUAL "intel_thread")
-      file(COPY "${basepath2}linux/compiler/lib/intel64_lin/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/intel64")
-      configure_file("${basepath2}lib/pkgconfig/openmp.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc" @ONLY)
-      vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc" "/linux/compiler/lib/intel64/" "/lib/intel64/")
-      vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc" "Cflags: -I \${includedir}" "")
-      if(NOT VCPKG_BUILD_TYPE)
-          configure_file("${basepath2}lib/pkgconfig/openmp.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libiomp5.pc" @ONLY)
-          vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libiomp5.pc" "/linux/compiler/lib/intel64/" "/../lib/intel64/")
-          vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libiomp5.pc" "Cflags: -I \${includedir}" "")
+file(COPY_FILE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${main_pc_file}" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/mkl.pc")
+if(NOT VCPKG_BUILD_TYPE)
+    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
+    file(GLOB pc_files RELATIVE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/*.pc")
+    foreach(file IN LISTS pc_files)
+      file(COPY_FILE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${file}" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${file}")
+      vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${file}" "/include" "/../include")
+      if(NOT VCPKG_TARGET_IS_WINDOWS)
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${file}" "/lib/intel64" "/../lib/intel64")
       endif()
-      configure_file("${basepath}lib/pkgconfig/mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/mkl.pc" @ONLY)
-      vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/mkl.pc" "openmp" "libiomp5")
-      if(NOT VCPKG_BUILD_TYPE)
-        configure_file("${basepath}lib/pkgconfig/mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" @ONLY)
-        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" "openmp" "libiomp5")
-        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" "/include" "/../include")
-      endif()
-    endif()
+    endforeach()
+endif()
 
-    file(COPY "${basepath}lib/cmake/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/")
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "MKL_CMAKE_PATH}/../../../" "MKL_CMAKE_PATH}/../../")
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "redist/\${MKL_ARCH}/" "bin")
-    #TODO: Hardcode settings from portfile in config.cmake
+file(COPY "${mkl_dir}/lib/cmake/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/")
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "MKL_CMAKE_PATH}/../../../" "MKL_CMAKE_PATH}/../../")
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "redist/\${MKL_ARCH}" "bin")
+#TODO: Hardcode settings from portfile in config.cmake
+#TODO: Give lapack/blas information about the correct BLA_VENDOR depending on settings. 
 
-    file(INSTALL "${basepath}licensing/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-    file(INSTALL "${basepath}licensing" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-  endif()
+file(INSTALL "${mkl_dir}/licensing" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+file(GLOB package_path "${extract_0_dir}/packages/intel.oneapi.${package_infix}.mkl.product,v=2023.0.0-*")
+vcpkg_install_copyright(FILE_LIST "${package_path}/licenses/license.htm")
 
-  file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/intel-extract"
-                      "${CURRENT_PACKAGES_DIR}/manual-tools"
-                      )
-endif()
+file(REMOVE_RECURSE
+    "${extract_0_dir}"
+    "${extract_1_dir}"
+    "${CURRENT_PACKAGES_DIR}/lib/intel64/cmake"
+    "${CURRENT_PACKAGES_DIR}/lib/intel64/pkgconfig"
+)
 
-if(NOT sha)
-    configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-port-config.cmake" @ONLY)
-    configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/mkl/vcpkg-cmake-wrapper.cmake" @ONLY)
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "bin\${MKL_DLL_GLOB" "bin/\${MKL_DLL_GLOB")
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" [["../bincompiler" "../compiler/lib"]] [["bin" "../bincompiler" "../compiler/lib"]])
-    file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-endif()
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/intel-mkl/vcpkg-cmake-wrapper.cmake b/external_imported/vcpkg/ports/intel-mkl/vcpkg-cmake-wrapper.cmake
deleted file mode 100644
index 76592b33d..000000000
--- a/external_imported/vcpkg/ports/intel-mkl/vcpkg-cmake-wrapper.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-set(MKL_THREADING "@threading@")
-if("@VCPKG_TARGET_ARCHITECTURE@" STREQUAL "x64")
-    set(MKL_INTERFACE "@interface@")
-endif()
-
-_find_package(${ARGS})
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/intel-mkl/vcpkg-port-config.cmake b/external_imported/vcpkg/ports/intel-mkl/vcpkg-port-config.cmake
deleted file mode 100644
index 09954ce07..000000000
--- a/external_imported/vcpkg/ports/intel-mkl/vcpkg-port-config.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(ENV{MKLROOT} "${CURRENT_INSTALLED_DIR}")
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/intel-mkl/vcpkg.json b/external_imported/vcpkg/ports/intel-mkl/vcpkg.json
index 59f36f418..e68c38651 100644
--- a/external_imported/vcpkg/ports/intel-mkl/vcpkg.json
+++ b/external_imported/vcpkg/ports/intel-mkl/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "intel-mkl",
   "version": "2023.0.0",
+  "port-version": 3,
   "description": "Intel® Math Kernel Library (Intel® MKL) accelerates math processing routines, increases application performance, and reduces development time on Intel® processors.",
   "homepage": "https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html",
   "license": null,
-  "supports": "(windows | linux) & x64",
+  "supports": "(windows | linux | osx) & x64",
   "dependencies": [
     {
       "name": "vcpkg-tool-lessmsi",
diff --git a/external_imported/vcpkg/ports/intelrdfpmathlib/missing-includes.patch b/external_imported/vcpkg/ports/intelrdfpmathlib/missing-includes.patch
new file mode 100644
index 000000000..540be9b94
--- /dev/null
+++ b/external_imported/vcpkg/ports/intelrdfpmathlib/missing-includes.patch
@@ -0,0 +1,24 @@
+diff --git a/LIBRARY/src/bid_internal.h b/LIBRARY/src/bid_internal.h
+index cd08ea7..ea5d0a0 100755
+--- a/LIBRARY/src/bid_internal.h
++++ b/LIBRARY/src/bid_internal.h
+@@ -37,6 +37,7 @@
+ 
+ #include "bid_conf.h"
+ #include "bid_functions.h"
++#include <stdlib.h>
+ 
+ #define __BID_INLINE__ static __inline
+ 
+diff --git a/LIBRARY/float128/dpml_exception.c b/LIBRARY/float128/dpml_exception.c
+index d061a4c..c647732 100755
+--- a/LIBRARY/float128/dpml_exception.c
++++ b/LIBRARY/float128/dpml_exception.c
+@@ -132,6 +132,7 @@
+     !defined(wnt)
+ 
+ #   include <sys/signal.h>
++#include <signal.h>
+ #   define DPML_SIGNAL(p)	 raise(SIGFPE)
+ 
+ #else
diff --git a/external_imported/vcpkg/ports/intelrdfpmathlib/portfile.cmake b/external_imported/vcpkg/ports/intelrdfpmathlib/portfile.cmake
index 5b05fd56b..8f05012d5 100644
--- a/external_imported/vcpkg/ports/intelrdfpmathlib/portfile.cmake
+++ b/external_imported/vcpkg/ports/intelrdfpmathlib/portfile.cmake
@@ -6,9 +6,10 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 4d445855f41b066b784f0c6b4e52f854df4129fa9d43569b1e1518f002b860f69796459c78de46a8ea24fb6e7aefe7f8bc1f253e78971a5ef202dab2a7b1b75a
 )
 
-vcpkg_extract_source_archive_ex(
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE ${ARCHIVE}
-    OUT_SOURCE_PATH SOURCE_PATH
+    PATCHES missing-includes.patch
 )
 
 set(LIB_SOURCE_PATH "${SOURCE_PATH}/LIBRARY")
diff --git a/external_imported/vcpkg/ports/intelrdfpmathlib/vcpkg.json b/external_imported/vcpkg/ports/intelrdfpmathlib/vcpkg.json
index 87415c924..f16c7e5a2 100644
--- a/external_imported/vcpkg/ports/intelrdfpmathlib/vcpkg.json
+++ b/external_imported/vcpkg/ports/intelrdfpmathlib/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "intelrdfpmathlib",
   "version-string": "20U2",
-  "port-version": 4,
+  "port-version": 6,
   "description": "Intel(R) Decimal Floating-Point Math Library",
   "supports": "!(arm & windows)",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/io2d/portfile.cmake b/external_imported/vcpkg/ports/io2d/portfile.cmake
index d47fc97c8..16edd25ed 100644
--- a/external_imported/vcpkg/ports/io2d/portfile.cmake
+++ b/external_imported/vcpkg/ports/io2d/portfile.cmake
@@ -14,9 +14,8 @@ if (VCPKG_TARGET_IS_OSX)
     set(IO2D_DEFAULT_OPTION "-DIO2D_DEFAULT=COREGRAPHICS_MAC")
 endif()
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DIO2D_WITHOUT_SAMPLES=1
         -DIO2D_WITHOUT_TESTS=1
@@ -24,15 +23,15 @@ vcpkg_configure_cmake(
         ${IO2D_DEFAULT_OPTION}
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/io2d)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/io2d)
 
 if (NOT VCPKG_TARGET_IS_OSX)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/share/io2d/io2dConfig.cmake ${CURRENT_PACKAGES_DIR}/share/io2d/io2dTargets.cmake)
-    file(WRITE ${CURRENT_PACKAGES_DIR}/share/io2d/io2dConfig.cmake "
+    file(RENAME "${CURRENT_PACKAGES_DIR}/share/io2d/io2dConfig.cmake" "${CURRENT_PACKAGES_DIR}/share/io2d/io2dTargets.cmake")
+    file(WRITE "${CURRENT_PACKAGES_DIR}/share/io2d/io2dConfig.cmake" "
     include(CMakeFindDependencyMacro)
     find_dependency(unofficial-cairo CONFIG)
     find_dependency(unofficial-graphicsmagick CONFIG)
@@ -41,4 +40,4 @@ if (NOT VCPKG_TARGET_IS_OSX)
     ")
 endif()
 
-file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file
+file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/io2d/vcpkg.json b/external_imported/vcpkg/ports/io2d/vcpkg.json
index 79570f44b..dc6541537 100644
--- a/external_imported/vcpkg/ports/io2d/vcpkg.json
+++ b/external_imported/vcpkg/ports/io2d/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "io2d",
   "version-date": "2020-09-14",
-  "port-version": 3,
+  "port-version": 5,
   "description": "a lightweight, cross platform drawing library",
   "dependencies": [
     {
@@ -18,6 +18,14 @@
     {
       "name": "graphicsmagick",
       "platform": "!osx"
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/irrlicht/fix-osx-compilation.patch b/external_imported/vcpkg/ports/irrlicht/fix-osx-compilation.patch
index 6f623db26..a1daf0b5c 100644
--- a/external_imported/vcpkg/ports/irrlicht/fix-osx-compilation.patch
+++ b/external_imported/vcpkg/ports/irrlicht/fix-osx-compilation.patch
@@ -1,28 +1,13 @@
 diff --git a/source/Irrlicht/CImageLoaderJPG.cpp b/source/Irrlicht/CImageLoaderJPG.cpp
-index 66144326c..4ea224c24 100644
+index 404bd53..71684d8 100644
 --- a/source/Irrlicht/CImageLoaderJPG.cpp
 +++ b/source/Irrlicht/CImageLoaderJPG.cpp
 @@ -68,7 +68,7 @@ void CImageLoaderJPG::init_source (j_decompress_ptr cinfo)
  boolean CImageLoaderJPG::fill_input_buffer (j_decompress_ptr cinfo)
  {
-        // DO NOTHING
--       return 1;
-+       return TRUE;
+ 	// DO NOTHING
+-	return 1;
++	return TRUE;
  }
-
-
-diff --git a/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm b/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm
-index 53029eb45..e75b707e1 100644
---- a/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm
-+++ b/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm
-@@ -495,8 +495,8 @@ long GetDictionaryLong(CFDictionaryRef theDict, const void* key)
-                if(!CreationParams.WindowId) //load menus if standalone application
-                {
-                        [[NSAutoreleasePool alloc] init];
--                       [NSApplication sharedApplication];
--                       [NSApp setDelegate:(id<NSFileManagerDelegate>)[[[AppDelegate alloc] initWithDevice:this] autorelease]];
-+                       [[NSApplication sharedApplication] activateIgnoringOtherApps];
-+                       [NSApp setDelegate:(id<NSApplicationDelegate>)[[[AppDelegate alloc] initWithDevice:this] autorelease]];
-                        [NSBundle loadNibNamed:@"MainMenu" owner:[NSApp delegate]];
-                        [NSApp finishLaunching];
-                }
+ 
+ 
diff --git a/external_imported/vcpkg/ports/irrlicht/fix-sysctl.patch b/external_imported/vcpkg/ports/irrlicht/fix-sysctl.patch
deleted file mode 100644
index 98c70273e..000000000
--- a/external_imported/vcpkg/ports/irrlicht/fix-sysctl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/source/Irrlicht/COSOperator.cpp
-+++ b/source/Irrlicht/COSOperator.cpp
-@@ -11,8 +11,8 @@
- #else
- #include <string.h>
- #include <unistd.h>
--#ifndef _IRR_SOLARIS_PLATFORM_
- #include <sys/types.h>
-+#ifdef _IRR_OSX_PLATFORM_
- #include <sys/sysctl.h>
- #endif
- #endif
diff --git a/external_imported/vcpkg/ports/irrlicht/portfile.cmake b/external_imported/vcpkg/ports/irrlicht/portfile.cmake
index 37f4ee26e..4bea3839d 100644
--- a/external_imported/vcpkg/ports/irrlicht/portfile.cmake
+++ b/external_imported/vcpkg/ports/irrlicht/portfile.cmake
@@ -1,12 +1,11 @@
 vcpkg_from_sourceforge(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO irrlicht/Irrlicht%20SDK
-    REF 1.8/1.8.4
-    FILENAME "irrlicht-1.8.4.zip"
-    SHA512 de69ddd2c6bc80a1b27b9a620e3697b1baa552f24c7d624076d471f3aecd9b15f71dce3b640811e6ece20f49b57688d428e3503936a7926b3e3b0cc696af98d1
+    REF 1.8/${VERSION}
+    FILENAME "irrlicht-${VERSION}.zip"
+    SHA512 d11c7a056bfb8c9737ed583c5bc5794223bc59fb4620411b63bc4d1eedc41db2ed1cab5cb7a37fee42a7f38c0e0645f5fc53fd329fff0f2aa78e0df6804c47c9
     PATCHES
         fix-encoding.patch
-        fix-sysctl.patch
         fix-osx-compilation.patch
 )
 
@@ -54,4 +53,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/irrlicht")
 endif()
 
-file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${CMAKE_CURRENT_LIST_DIR}/LICENSE.txt")
diff --git a/external_imported/vcpkg/ports/irrlicht/vcpkg.json b/external_imported/vcpkg/ports/irrlicht/vcpkg.json
index 1815c8040..93bab6e65 100644
--- a/external_imported/vcpkg/ports/irrlicht/vcpkg.json
+++ b/external_imported/vcpkg/ports/irrlicht/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "irrlicht",
-  "version-string": "1.8.4",
-  "port-version": 13,
+  "version": "1.8.5",
   "description": "The Irrlicht Engine is an open source realtime 3D engine written in C++. It is cross-platform, using D3D, OpenGL and its own software renderers.",
   "homepage": "http://irrlicht.sourceforge.net",
   "supports": "!(arm | uwp)",
diff --git a/external_imported/vcpkg/ports/irrxml/vcpkg.json b/external_imported/vcpkg/ports/irrxml/vcpkg.json
index c84eba7b4..1f04d21b3 100644
--- a/external_imported/vcpkg/ports/irrxml/vcpkg.json
+++ b/external_imported/vcpkg/ports/irrxml/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "irrxml",
-  "version-string": "0",
+  "version": "0",
+  "port-version": 1,
   "description": "Alias port for irrlicht",
   "dependencies": [
     "irrlicht"
diff --git a/external_imported/vcpkg/ports/ismrmrd/portfile.cmake b/external_imported/vcpkg/ports/ismrmrd/portfile.cmake
index ae77841c9..458f19ac9 100644
--- a/external_imported/vcpkg/ports/ismrmrd/portfile.cmake
+++ b/external_imported/vcpkg/ports/ismrmrd/portfile.cmake
@@ -5,8 +5,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ismrmrd/ismrmrd
-    REF v1.13.2
-    SHA512 8bfdceedefa7dae6cc047e9498f30d3e763f5ab8aa3726f0dc0b2ac086c00a0fddee9c6feadcf4b41c55c692230e8db596cdfc8d79af29c704b79bbad270187b
+    REF "v${VERSION}"
+    SHA512 cbd34cfbcc16e898f44c00888bc605d01e6a915b6c02454630a61c92b6179d727affb1ffeebc7d14da5aac189f929f5d36a6fd7ab68a73cb963ee4a233fba056
     HEAD_REF master
     PATCHES
         ${WIN32_INCLUDE_STDDEF_PATCH}
diff --git a/external_imported/vcpkg/ports/ismrmrd/vcpkg.json b/external_imported/vcpkg/ports/ismrmrd/vcpkg.json
index 90612fef1..3b9062913 100644
--- a/external_imported/vcpkg/ports/ismrmrd/vcpkg.json
+++ b/external_imported/vcpkg/ports/ismrmrd/vcpkg.json
@@ -1,13 +1,11 @@
 {
   "name": "ismrmrd",
-  "version": "1.13.2",
+  "version": "1.13.7",
   "description": "ISMRM Raw Data Format",
   "homepage": "https://github.com/ismrmrd/ismrmrd",
   "license": "BSD-3-Clause",
   "supports": "!(x86 | arm | wasm32)",
   "dependencies": [
-    "boost",
-    "fftw3",
     "hdf5",
     "pugixml",
     {
diff --git a/external_imported/vcpkg/ports/itay-grudev-singleapplication/Config.cmake.in b/external_imported/vcpkg/ports/itay-grudev-singleapplication/Config.cmake.in
new file mode 100644
index 000000000..05d1dd9d7
--- /dev/null
+++ b/external_imported/vcpkg/ports/itay-grudev-singleapplication/Config.cmake.in
@@ -0,0 +1,23 @@
+if(NOT TARGET itay-grudev-singleapplication)
+    add_library(itay-grudev-singleapplication UNKNOWN IMPORTED)
+
+    set_target_properties(itay-grudev-singleapplication PROPERTIES
+        INTERFACE_INCLUDE_DIRECTORIES "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include"
+    )
+
+    find_library(SingleApplication_LIBRARY_RELEASE NAMES SingleApplication PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH)
+    if(EXISTS "${SingleApplication_LIBRARY_RELEASE}")
+        set_property(TARGET itay-grudev-singleapplication APPEND PROPERTY IMPORTED_CONFIGURATIONS "Release")
+        set_target_properties(itay-grudev-singleapplication PROPERTIES IMPORTED_LOCATION_RELEASE "${SingleApplication_LIBRARY_RELEASE}")
+    endif()
+
+    find_library(SingleApplication_LIBRARY_DEBUG NAMES SingleApplication PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH)
+    if(EXISTS "${SingleApplication_LIBRARY_DEBUG}")
+        set_property(TARGET itay-grudev-singleapplication APPEND PROPERTY IMPORTED_CONFIGURATIONS "Debug")
+        set_target_properties(itay-grudev-singleapplication PROPERTIES IMPORTED_LOCATION_DEBUG "${SingleApplication_LIBRARY_DEBUG}")
+    endif()
+
+    set_target_properties(itay-grudev-singleapplication PROPERTIES
+        INTERFACE_COMPILE_DEFINITIONS QAPPLICATION_CLASS=@QAPPLICATION_CLASS@
+    )
+endif()
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/itay-grudev-singleapplication/portfile.cmake b/external_imported/vcpkg/ports/itay-grudev-singleapplication/portfile.cmake
new file mode 100644
index 000000000..67d688fcb
--- /dev/null
+++ b/external_imported/vcpkg/ports/itay-grudev-singleapplication/portfile.cmake
@@ -0,0 +1,31 @@
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO itay-grudev/SingleApplication
+    REF "v${VERSION}"
+    SHA512 9a63dcbfd4c80626093b23df0ee97d704b494d928b76b81e0373a0a847e73a0c4fd6557e338221c473412394c4ab3456d90e1e5c7894112b08ce7f11c9e66e58
+    HEAD_REF master
+)
+
+set(QAPPLICATION_CLASS QGuiApplication)
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DQT_DEFAULT_MAJOR_VERSION=6
+        -DQAPPLICATION_CLASS=${QAPPLICATION_CLASS}
+)
+
+vcpkg_cmake_build(TARGET SingleApplication)
+
+if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+  file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${VCPKG_TARGET_STATIC_LIBRARY_PREFIX}SingleApplication${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
+endif()
+if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+  file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/${VCPKG_TARGET_STATIC_LIBRARY_PREFIX}SingleApplication${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
+endif()
+file(INSTALL "${SOURCE_PATH}/singleapplication.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+
+configure_file("${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" @ONLY)
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/itay-grudev-singleapplication/vcpkg.json b/external_imported/vcpkg/ports/itay-grudev-singleapplication/vcpkg.json
new file mode 100644
index 000000000..a864cddb2
--- /dev/null
+++ b/external_imported/vcpkg/ports/itay-grudev-singleapplication/vcpkg.json
@@ -0,0 +1,26 @@
+{
+  "name": "itay-grudev-singleapplication",
+  "version": "3.5.1",
+  "description": "Replacement of QtSingleApplication for Qt 5 and Qt 6 with support for inter-instance communication",
+  "homepage": "https://github.com/itay-grudev/SingleApplication",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "qtbase",
+      "default-features": false,
+      "features": [
+        "gui",
+        "network",
+        "widgets"
+      ]
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/itk/cxx17.patch b/external_imported/vcpkg/ports/itk/cxx17.patch
new file mode 100644
index 000000000..65df5d6f8
--- /dev/null
+++ b/external_imported/vcpkg/ports/itk/cxx17.patch
@@ -0,0 +1,12 @@
+diff --git a/CMake/ITKInitializeCXXStandard.cmake b/CMake/ITKInitializeCXXStandard.cmake
+index 5345230b..a9ca48c3 100644
+--- a/CMake/ITKInitializeCXXStandard.cmake
++++ b/CMake/ITKInitializeCXXStandard.cmake
+@@ -1,6 +1,6 @@
+ ##  Set the default target properties for ITK
+ if(NOT CMAKE_CXX_STANDARD)
+-  set(CMAKE_CXX_STANDARD 14) # Supported values are 14, 17, 20, and 23.
++  set(CMAKE_CXX_STANDARD 17) # Supported values are 14, 17, 20, and 23.
+ endif()
+ if(NOT CMAKE_CXX_STANDARD_REQUIRED)
+   set(CMAKE_CXX_STANDARD_REQUIRED ON)
diff --git a/external_imported/vcpkg/ports/itk/portfile.cmake b/external_imported/vcpkg/ports/itk/portfile.cmake
index 72d231331..3604a1db8 100644
--- a/external_imported/vcpkg/ports/itk/portfile.cmake
+++ b/external_imported/vcpkg/ports/itk/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_buildpath_length_warning(37)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO InsightSoftwareConsortium/ITK
-    REF 95800fd4d4b08678a6c0ebb63eb242893025b660 #5.2.1
-    SHA512 fe703bc6ed681cb9983d7d6e21c8ffa7650337e470c09a7241de58a463c23e315516b1a81a18c14f682706056a0ec66932b63d2e24945bdcea03169bc1122bb2
+    REF "v${VERSION}"
+    SHA512 48e38864d7cd20b4ff23cfca1a29b4cbf453ce842e037ca473ce5c7e9a5b1c0bf6b12e4c544c812bff2b4bb9feca409587175b6570929c9ac172cb4402d679da
     HEAD_REF master
     PATCHES
         double-conversion.patch
@@ -15,6 +15,7 @@ vcpkg_from_github(
         opencl.patch
         use-the-lrintf-intrinsic.patch
         dont-build-gtest.patch
+        cxx17.patch # See https://github.com/InsightSoftwareConsortium/ITK/issues/4213#issuecomment-1722547712
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
diff --git a/external_imported/vcpkg/ports/itk/vcpkg.json b/external_imported/vcpkg/ports/itk/vcpkg.json
index e81f2229e..24ace7568 100644
--- a/external_imported/vcpkg/ports/itk/vcpkg.json
+++ b/external_imported/vcpkg/ports/itk/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "itk",
-  "version": "5.2.1",
-  "port-version": 5,
+  "version-string": "5.3rc02",
   "description": "Insight Segmentation and Registration Toolkit (ITK) is used for image processing and analysis.",
   "homepage": "https://github.com/InsightSoftwareConsortium/ITK",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/itpp/portfile.cmake b/external_imported/vcpkg/ports/itpp/portfile.cmake
index 696f33382..db2ee8954 100644
--- a/external_imported/vcpkg/ports/itpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/itpp/portfile.cmake
@@ -14,25 +14,24 @@ vcpkg_from_sourceforge(
 )
 file(RENAME "${SOURCE_PATH}/VERSION" "${SOURCE_PATH}/VERSION.txt")
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DCMAKE_DISABLE_FIND_PACKAGE_LAPACK=ON
         -DCMAKE_DISABLE_FIND_PACKAGE_FFT=ON
         -DCMAKE_DISABLE_FIND_PACKAGE_BLAS=ON
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-       file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 vcpkg_copy_pdbs()
 
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-
-vcpkg_fixup_pkgconfig()
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
diff --git a/external_imported/vcpkg/ports/itpp/vcpkg.json b/external_imported/vcpkg/ports/itpp/vcpkg.json
index 972f0cd19..5d3d7ce37 100644
--- a/external_imported/vcpkg/ports/itpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/itpp/vcpkg.json
@@ -1,7 +1,13 @@
 {
   "name": "itpp",
   "version-semver": "4.3.1",
-  "port-version": 8,
+  "port-version": 10,
   "description": "IT++ is a C++ library of mathematical, signal processing and communication classes and functions. Its main use is in simulation of communication systems and for performing research in the area of communications.",
-  "homepage": "http://itpp.sourceforge.net"
+  "homepage": "http://itpp.sourceforge.net",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/itsy-bitsy/fix-cmake-install.patch b/external_imported/vcpkg/ports/itsy-bitsy/fix-cmake-install.patch
new file mode 100644
index 000000000..64a537670
--- /dev/null
+++ b/external_imported/vcpkg/ports/itsy-bitsy/fix-cmake-install.patch
@@ -0,0 +1,55 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c7b2e2a..9219be1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -31,6 +31,8 @@ project(itsy.bitsy
+ 	DESCRIPTION "Standard bit utilities to supplement the C and C++ standard libraries."
+ 	LANGUAGES C CXX)
+ 
++include(CMakePackageConfigHelpers)
++include(GNUInstallDirs)
+ # # Pre-dependencies
+ # this is for all the deps we may or may not need before-hand to make things right
+ if(ITSY_BITSY_READTHEDOCS)
+@@ -100,10 +102,7 @@ option(ITSY_BITSY_EXAMPLES "Enable build of examples" OFF)
+ 
+ # # Dependencies
+ # ztd.idk
+-FetchContent_Declare(ztd.idk
+-	GIT_REPOSITORY https://github.com/soasis/idk.git
+-	GIT_TAG main)
+-FetchContent_MakeAvailable(ztd.idk)
++find_package(ztd.idk CONFIG REQUIRED)
+ 
+ # # itsy.bitsy Target
+ # Build Target
+@@ -136,6 +135,10 @@ export(TARGETS itsy.bitsy FILE "${CMAKE_CURRENT_BINARY_DIR}/cmake/itsy.bitsy-tar
+ 
+ install(TARGETS itsy.bitsy
+ 	EXPORT itsy.bitsy)
++install(EXPORT itsy.bitsy
++  FILE itsy.bitsy-targets.cmake
++  DESTINATION lib/cmake/itsy.bitsy
++)
+ 
+ install(DIRECTORY include/itsy
+ 	DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+diff --git a/cmake/itsy.bitsy-config.cmake.in b/cmake/itsy.bitsy-config.cmake.in
+index 9f87935..6e18425 100644
+--- a/cmake/itsy.bitsy-config.cmake.in
++++ b/cmake/itsy.bitsy-config.cmake.in
+@@ -9,10 +9,13 @@
+ #  See https://github.com/ThePhD/itsy_bitsy#using-the-library for documentation.
+ 
+ @PACKAGE_INIT@
++include(CMakeFindDependencyMacro)
++find_dependency(ztd.idk CONFIG)
++include("${CMAKE_CURRENT_LIST_DIR}/itsy.bitsy-targets.cmake")
+ 
+-include("${CMAKE_CURRENT_LIST_DIR}/sol2-targets.cmake")
+ 
+ MESSAGE(STATUS ${CMAKE_CURRENT_LIST_DIR})
++add_library(itsy::bitsy ALIAS itsy.bitsy)
+ 
+ if (TARGET sol2)
+     get_target_property(SOL2_INCLUDE_DIRS
diff --git a/external_imported/vcpkg/ports/itsy-bitsy/portfile.cmake b/external_imported/vcpkg/ports/itsy-bitsy/portfile.cmake
new file mode 100644
index 000000000..1e8839ec6
--- /dev/null
+++ b/external_imported/vcpkg/ports/itsy-bitsy/portfile.cmake
@@ -0,0 +1,27 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO ThePhD/itsy_bitsy
+    REF d5b6bf9509bb2dff6235452d427f0b1c349d5f8b
+    SHA512 06489e46ad55a7fa55ddf88290509b157cf53518a8d9532d5a56e9907e5efaa298cb8946807e497461d322f62b4bad9b16864ef0def527edc8503f7a7884b8e1
+    HEAD_REF main
+    PATCHES fix-cmake-install.patch
+)
+
+set(VCPKG_BUILD_TYPE release) # header-only
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+    -DFETCHCONTENT_FULLY_DISCONNECTED=ON
+    -DITSY_BITSY_SINGLE=OFF
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(PACKAGE_NAME itsy.bitsy CONFIG_PATH "lib/cmake/itsy.bitsy")
+
+vcpkg_fixup_pkgconfig()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/itsy-bitsy/vcpkg.json b/external_imported/vcpkg/ports/itsy-bitsy/vcpkg.json
new file mode 100644
index 000000000..b73069245
--- /dev/null
+++ b/external_imported/vcpkg/ports/itsy-bitsy/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "itsy-bitsy",
+  "version-date": "2022-08-02",
+  "description": "Bit containers, sequences, and views for everyone. ",
+  "homepage": "https://github.com/ThePhD/itsy_bitsy",
+  "license": "BSL-1.0",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    "ztd-idk"
+  ]
+}
diff --git a/external_imported/vcpkg/ports/ixwebsocket/fix-C2065-of-errorMsg.patch b/external_imported/vcpkg/ports/ixwebsocket/fix-C2065-of-errorMsg.patch
new file mode 100644
index 000000000..2435866c9
--- /dev/null
+++ b/external_imported/vcpkg/ports/ixwebsocket/fix-C2065-of-errorMsg.patch
@@ -0,0 +1,13 @@
+diff --git a/ixwebsocket/IXSocketMbedTLS.cpp b/ixwebsocket/IXSocketMbedTLS.cpp
+index f5c0cf6..0192dc7 100644
+--- a/ixwebsocket/IXSocketMbedTLS.cpp
++++ b/ixwebsocket/IXSocketMbedTLS.cpp
+@@ -49,7 +49,7 @@ namespace ix
+         mbedtls_pk_init(&_pkey);
+     }
+ 
+-    bool SocketMbedTLS::loadSystemCertificates(std::string& /* errorMsg */)
++    bool SocketMbedTLS::loadSystemCertificates(std::string& errorMsg)
+     {
+ #ifdef _WIN32
+         DWORD flags = CERT_STORE_READONLY_FLAG | CERT_STORE_OPEN_EXISTING_FLAG |
diff --git a/external_imported/vcpkg/ports/ixwebsocket/portfile.cmake b/external_imported/vcpkg/ports/ixwebsocket/portfile.cmake
index 57a2b2c57..d0d88fff6 100644
--- a/external_imported/vcpkg/ports/ixwebsocket/portfile.cmake
+++ b/external_imported/vcpkg/ports/ixwebsocket/portfile.cmake
@@ -3,8 +3,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO machinezone/IXWebSocket
-    REF v11.4.3
-    SHA512 6db4f05b3a73aa5f6efdb6d4692d9f9665b14c3a6e4837ff6b2719d9261aa660166fd4ddf99ca8e6804202d6f71c399fe1c223932493ea8db0a73752cb5b8e97
+    REF "v${VERSION}"
+    SHA512 698ad96f25f53bf48906201826008bad46c657f8043d3653988716ddd9fb5dfeb52cebc002b3af76b91d0561155607a5f38bbc2c808aa67f438432207da82a35
+    PATCHES
+        fix-C2065-of-errorMsg.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -14,17 +16,23 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
         sectransp USE_SECURE_TRANSPORT
 )
 
-if("sectransp" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_OSX)
-    message(FATAL_ERROR "sectransp is not supported on non-Apple platforms")
+string(COMPARE NOTEQUAL "${FEATURES}" "core" USE_TLS)
+
+list(REMOVE_ITEM FEATURES "ssl")
+list(LENGTH FEATURES num_features)
+if(num_features GREATER "2")
+    message(FATAL_ERROR "Can not select multiple ssl backends at the same time. Disable default features to disable the default ssl backend.")
 endif()
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         ${FEATURE_OPTIONS}
-        -DUSE_TLS=1
+        -DUSE_TLS=${USE_TLS}
     MAYBE_UNUSED_VARIABLES
         USE_SECURE_TRANSPORT
+        USE_MBED_TLS
+        USE_OPEN_SSL
 )
 
 vcpkg_cmake_install()
@@ -33,4 +41,4 @@ vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/external_imported/vcpkg/ports/ixwebsocket/vcpkg.json b/external_imported/vcpkg/ports/ixwebsocket/vcpkg.json
index 4d7808ac6..678eb3fc7 100644
--- a/external_imported/vcpkg/ports/ixwebsocket/vcpkg.json
+++ b/external_imported/vcpkg/ports/ixwebsocket/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "ixwebsocket",
-  "version-semver": "11.4.3",
+  "version-semver": "11.4.4",
+  "port-version": 2,
   "description": "Lightweight WebSocket Client and Server + HTTP Client and Server",
   "homepage": "https://github.com/machinezone/IXWebSocket",
   "license": "BSD-3-Clause",
@@ -27,12 +28,14 @@
     },
     "openssl": {
       "description": "SSL support (OpenSSL)",
+      "supports": "!uwp",
       "dependencies": [
         "openssl"
       ]
     },
     "sectransp": {
-      "description": "SSL support (sectransp)"
+      "description": "SSL support (sectransp)",
+      "supports": "osx | ios"
     },
     "ssl": {
       "description": "Default SSL backend",
@@ -40,16 +43,16 @@
         {
           "name": "ixwebsocket",
           "features": [
-            "sectransp"
+            "mbedtls"
           ],
-          "platform": "osx"
+          "platform": "windows"
         },
         {
           "name": "ixwebsocket",
           "features": [
-            "mbedtls"
+            "sectransp"
           ],
-          "platform": "windows"
+          "platform": "osx | ios"
         },
         {
           "name": "ixwebsocket",
@@ -63,7 +66,7 @@
           "features": [
             "openssl"
           ],
-          "platform": "!uwp & !windows & !osx"
+          "platform": "!uwp & !windows & !osx & !ios"
         }
       ]
     }
diff --git a/external_imported/vcpkg/ports/jack2/jack.def b/external_imported/vcpkg/ports/jack2/jack.def
index c542e5337..5c2d48e56 100644
--- a/external_imported/vcpkg/ports/jack2/jack.def
+++ b/external_imported/vcpkg/ports/jack2/jack.def
@@ -94,3 +94,11 @@ jack_get_time
 jack_set_error_function
 jack_set_info_function
 jack_free
+jack_midi_get_event_count
+jack_midi_event_get
+jack_midi_clear_buffer
+jack_midi_max_event_size
+jack_midi_event_reserve
+jack_midi_event_write
+jack_midi_get_lost_event_count
+
diff --git a/external_imported/vcpkg/ports/jack2/portfile.cmake b/external_imported/vcpkg/ports/jack2/portfile.cmake
index 3ab7e180e..cc2541654 100644
--- a/external_imported/vcpkg/ports/jack2/portfile.cmake
+++ b/external_imported/vcpkg/ports/jack2/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO jackaudio/jack2
-    REF v1.9.21
-    SHA512 0e9ce581fca3c5d9ffb1de22b45cae6d94085c6f92ff3554892e25727baf66a2269f10d338d95d991e8380c4be5e0cc1e1453b9f878c7dc2e8a990f3bd458557
+    REF "v${VERSION}"
+    SHA512 d93cb2bcc57b72b6815eed143de1092d14fe22542ae9a1f8480d9ed5f44b59c50f81279d18bdd84ff6276ddd71ca1aa64a1e46d61199a5eda0d873a356194ab4
     HEAD_REF master
 )
 
@@ -22,4 +22,4 @@ vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/jack2/vcpkg.json b/external_imported/vcpkg/ports/jack2/vcpkg.json
index 356579f3a..443204d5b 100644
--- a/external_imported/vcpkg/ports/jack2/vcpkg.json
+++ b/external_imported/vcpkg/ports/jack2/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "jack2",
-  "version-semver": "1.9.21",
+  "version-semver": "1.9.22",
   "description": "Cross-platform API that enables device sharing and inter-application audio routing",
   "homepage": "https://jackaudio.org/",
   "license": "GPL-2.0",
diff --git a/external_imported/vcpkg/ports/jasper/check-for-atomics-support.patch b/external_imported/vcpkg/ports/jasper/check-for-atomics-support.patch
new file mode 100644
index 000000000..132d07f89
--- /dev/null
+++ b/external_imported/vcpkg/ports/jasper/check-for-atomics-support.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8d2e9f9..110c245 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -591,6 +591,7 @@ set(JAS_HAVE_WIN32_THREADS FALSE)
+ if(JAS_ENABLE_MULTITHREADING_SUPPORT)
+ 	check_c_source_compiles("
+ 	#include <threads.h>
++	#include <stdatomic.h>
+ 	int main() {
+ 		thrd_t thread;
+ 		mtx_t mutex;
diff --git a/external_imported/vcpkg/ports/jasper/fix-library-name.patch b/external_imported/vcpkg/ports/jasper/fix-library-name.patch
new file mode 100644
index 000000000..8b4f7173a
--- /dev/null
+++ b/external_imported/vcpkg/ports/jasper/fix-library-name.patch
@@ -0,0 +1,13 @@
+diff --git a/build/jasper.pc.in b/build/jasper.pc.in
+index a4ce38f..a9a7bc4 100644
+--- a/build/jasper.pc.in
++++ b/build/jasper.pc.in
+@@ -6,7 +6,7 @@ Name: JasPer
+ Description: Image Processing/Coding Tool Kit with JPEG-2000 Support
+ Version: @JAS_VERSION@
+ 
+-Libs: -L${libdir} -ljasper
++Libs: -L${libdir} -ljasper@CMAKE_DEBUG_POSTFIX@
+ Requires.private: @JAS_PKGCONFIG_REQUIRES@
+ Cflags: -I${includedir}/jasper -I${includedir}
+ Cflags.private: -DLIBJASPER_STATIC_DEFINE
diff --git a/external_imported/vcpkg/ports/jasper/no_stdc_check.patch b/external_imported/vcpkg/ports/jasper/no_stdc_check.patch
index 7552a57da..0c579a540 100644
--- a/external_imported/vcpkg/ports/jasper/no_stdc_check.patch
+++ b/external_imported/vcpkg/ports/jasper/no_stdc_check.patch
@@ -1,24 +1,24 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 840908739..c485b830c 100644
+index ba6f117..8d2e9f9 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -414,7 +414,7 @@ if((DEFINED JAS_CROSSCOMPILING AND JAS_CROSSCOMPILING) OR
- 	# will need to be set manually from the command line
+@@ -424,7 +424,7 @@ if((DEFINED JAS_CROSSCOMPILING AND JAS_CROSSCOMPILING) OR
  	# (e.g., using -DJAS_STDC_VERSION=YYYYMML) or by changing the line below.
+ if(NOT JAS_WASM)
  	set(JAS_STDC_VERSION "0L" CACHE INTERNAL "The value of __STDC_VERSION__.")
 -	if (JAS_STDC_VERSION STREQUAL "0L")
 +	if (0)
  		message(FATAL_ERROR
  		  "The value of __STDC_VERSION__ cannot be automatically determined "
  		  "when cross-compiling.  Please set JAS_STDC_VERSION to the value "
-@@ -423,8 +423,9 @@ if((DEFINED JAS_CROSSCOMPILING AND JAS_CROSSCOMPILING) OR
- 		  "appropriately.")
+@@ -434,8 +434,9 @@ if(NOT JAS_WASM)
  	endif()
+ endif()
  else()
 -	jas_get_stdc_version(status JAS_STDC_VERSION)
 -	if(NOT status)
 +	#jas_get_stdc_version(status JAS_STDC_VERSION)
-+    set(JAS_STDC_VERSION 0L)
++	set(JAS_STDC_VERSION 0L)
 +	if(0)
  		message(FATAL_ERROR "Cannot determine the value of __STDC_VERSION__.")
  	endif()
diff --git a/external_imported/vcpkg/ports/jasper/portfile.cmake b/external_imported/vcpkg/ports/jasper/portfile.cmake
index dadf39d94..e89a17620 100644
--- a/external_imported/vcpkg/ports/jasper/portfile.cmake
+++ b/external_imported/vcpkg/ports/jasper/portfile.cmake
@@ -1,11 +1,13 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO jasper-software/jasper
-    REF 402d096b39f4f618ad9e6ff2b4fc1b5eb260a2e4 # version-4.0.0
-    SHA512 b2c2a2514479ec4a3d634d42d0a614951c06f6177e43a80b9a31797b7d4ad248fcdff632596806fcf811c87779990ba7c19aa2f9b91afafbc172dd85f96bb239
+    REF "version-${VERSION}"
+    SHA512 940841f4094987526ee23aed84f2b028b0f4d58cd2be91dcf737102018d8da111870959ad64710b14ae1ca4ca8361fc900ff6ecee31f0f23ef435bf7f0935462
     HEAD_REF master
     PATCHES
         no_stdc_check.patch
+        fix-library-name.patch
+        check-for-atomics-support.patch # https://github.com/jasper-software/jasper/pull/370
 )
 
 if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
@@ -42,4 +44,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST ${SOURCE_PATH}/LICENSE.txt)
diff --git a/external_imported/vcpkg/ports/jasper/vcpkg.json b/external_imported/vcpkg/ports/jasper/vcpkg.json
index cbad0a602..fbc9e9cf0 100644
--- a/external_imported/vcpkg/ports/jasper/vcpkg.json
+++ b/external_imported/vcpkg/ports/jasper/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "jasper",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "port-version": 1,
   "description": "Open source implementation of the JPEG-2000 Part-1 standard",
   "homepage": "https://github.com/jasper-software/jasper",
diff --git a/external_imported/vcpkg/ports/jbig2dec/portfile.cmake b/external_imported/vcpkg/ports/jbig2dec/portfile.cmake
index 099252b20..8ef7ff37f 100644
--- a/external_imported/vcpkg/ports/jbig2dec/portfile.cmake
+++ b/external_imported/vcpkg/ports/jbig2dec/portfile.cmake
@@ -3,21 +3,20 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ArtifexSoftware/jbig2dec
-    REF 1c336b8ab44524dc56ea837e2211ff4207704cdd # 0.19
-    SHA512 e189a80cc8da18813cf6c8edc6f1a799793adcba7ea6f302a8cced349bffac68869af338d9723ee1efdc07115ae554cd5757bfda7d7ac41324fde1f9c3a8343c
+    REF "${VERSION}"
+    SHA512 8b8a28b93b23e4284ca229e6c8935fd161ce5c597f7470a46ec06a3241d0ac23cf921aecdd4e0c1bd3c904591409054236f2ce25b6d8ae40db742559c7f4dbe9
     HEAD_REF master
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS_DEBUG
         -DDISABLE_INSTALL_HEADERS=1
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/jbig2dec RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/external_imported/vcpkg/ports/jbig2dec/vcpkg.json b/external_imported/vcpkg/ports/jbig2dec/vcpkg.json
index a4f145f69..d9137fb34 100644
--- a/external_imported/vcpkg/ports/jbig2dec/vcpkg.json
+++ b/external_imported/vcpkg/ports/jbig2dec/vcpkg.json
@@ -1,7 +1,12 @@
 {
   "name": "jbig2dec",
-  "version-string": "0.19",
-  "port-version": 1,
+  "version": "0.20",
   "description": "a decoder library and example utility implementing the JBIG2 bi-level image compression spec. Also known as ITU T.88 and ISO IEC 14492, and included by reference in Adobe's PDF version 1.4 and later.",
-  "homepage": "https://github.com/ArtifexSoftware/jbig2dec"
+  "homepage": "https://github.com/ArtifexSoftware/jbig2dec",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/jbigkit/portfile.cmake b/external_imported/vcpkg/ports/jbigkit/portfile.cmake
index ba2d6555a..e9ed46455 100644
--- a/external_imported/vcpkg/ports/jbigkit/portfile.cmake
+++ b/external_imported/vcpkg/ports/jbigkit/portfile.cmake
@@ -9,21 +9,20 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 ${JBIGKIT_HASH}
 )
 
-vcpkg_extract_source_archive_ex(
-    ARCHIVE ${ARCHIVE}
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
+    ARCHIVE "${ARCHIVE}"
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA)
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+)
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/jbigkit)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/jbigkit/COPYING ${CURRENT_PACKAGES_DIR}/share/jbigkit/copyright)
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/external_imported/vcpkg/ports/jbigkit/vcpkg.json b/external_imported/vcpkg/ports/jbigkit/vcpkg.json
index 1498be4fa..0257b9128 100644
--- a/external_imported/vcpkg/ports/jbigkit/vcpkg.json
+++ b/external_imported/vcpkg/ports/jbigkit/vcpkg.json
@@ -1,7 +1,13 @@
 {
   "name": "jbigkit",
-  "version-string": "2.1",
-  "port-version": 5,
+  "version": "2.1",
+  "port-version": 7,
   "description": "A software implementation of the JBIG1 data compression standard (ITU-T T.82)",
-  "homepage": "https://www.cl.cam.ac.uk/~mgk25/jbigkit"
+  "homepage": "https://www.cl.cam.ac.uk/~mgk25/jbigkit",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/jhasse-poly2tri/cmake.patch b/external_imported/vcpkg/ports/jhasse-poly2tri/cmake.patch
new file mode 100644
index 000000000..22e06054c
--- /dev/null
+++ b/external_imported/vcpkg/ports/jhasse-poly2tri/cmake.patch
@@ -0,0 +1,56 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1a237b9..374e7e9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,15 +1,32 @@
+ cmake_minimum_required(VERSION 3.12)
+ 
++if(POLICY CMP0063)
++  cmake_policy(SET CMP0063 NEW)
++endif()
++
++set(CMAKE_CXX_VISIBILITY_PRESET hidden)
++set(CMAKE_VISIBILITY_INLINES_HIDDEN TRUE)
++
+ project(poly2tri LANGUAGES CXX)
+ set(CMAKE_CXX_STANDARD 14)
+ 
++set(INSTALL_BIN_DIR      "bin"                     CACHE PATH "Path where exe and dll will be installed")
++set(INSTALL_LIB_DIR      "lib"                     CACHE PATH "Path where lib will be installed")
++set(INSTALL_INCLUDE_DIR  "include/${PROJECT_NAME}" CACHE PATH "Path where headers will be installed")
++set(INSTALL_CMAKE_DIR    "share/${PROJECT_NAME}"   CACHE PATH "Path where cmake configs will be installed")
++
+ option(P2T_BUILD_TESTS "Build tests" OFF)
+ option(P2T_BUILD_TESTBED "Build the testbed application" OFF)
+ 
+ file(GLOB SOURCES poly2tri/common/*.cc poly2tri/sweep/*.cc)
+ file(GLOB HEADERS poly2tri/*.h poly2tri/common/*.h poly2tri/sweep/*.h)
++
+ add_library(poly2tri ${SOURCES} ${HEADERS})
+-target_include_directories(poly2tri INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
++target_include_directories(${PROJECT_NAME} PUBLIC
++    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/poly2tri>
++    $<INSTALL_INTERFACE:include>
++    $<INSTALL_INTERFACE:include/${PROJECT_NAME}>
++)
+ 
+ get_target_property(poly2tri_target_type poly2tri TYPE)
+ if(poly2tri_target_type STREQUAL SHARED_LIBRARY)
+@@ -26,3 +43,17 @@ endif()
+ if(P2T_BUILD_TESTBED)
+     add_subdirectory(testbed)
+ endif()
++
++install(DIRECTORY poly2tri DESTINATION include FILES_MATCHING PATTERN "*.h")
++
++install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets
++  RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
++  LIBRARY DESTINATION "${INSTALL_LIB_DIR}"
++  ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
++)
++
++install (EXPORT ${PROJECT_NAME}Targets
++    FILE ${PROJECT_NAME}Config.cmake
++    NAMESPACE ${PROJECT_NAME}::
++    DESTINATION "${INSTALL_CMAKE_DIR}"
++)
diff --git a/external_imported/vcpkg/ports/jhasse-poly2tri/portfile.cmake b/external_imported/vcpkg/ports/jhasse-poly2tri/portfile.cmake
new file mode 100644
index 000000000..d0ff14fe0
--- /dev/null
+++ b/external_imported/vcpkg/ports/jhasse-poly2tri/portfile.cmake
@@ -0,0 +1,22 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO jhasse/poly2tri
+    REF 0171f030bd3d5c6747c29d93403546eed668a1b6
+    SHA512 b55d543ae7f9b447d3e0e39b66cf1ce55a48ed7949819db01d8adc0972182519c4b6b533e704a282da45a4d64f510fd33cd81ccb52307dc0e63622e83bcf0192
+    HEAD_REF master
+    PATCHES
+        cmake.patch
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME poly2tri)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/external_imported/vcpkg/ports/jhasse-poly2tri/usage b/external_imported/vcpkg/ports/jhasse-poly2tri/usage
new file mode 100644
index 000000000..80497d276
--- /dev/null
+++ b/external_imported/vcpkg/ports/jhasse-poly2tri/usage
@@ -0,0 +1,4 @@
+jhasse-poly2tri provides CMake targets:
+
+  find_package(poly2tri CONFIG REQUIRED)
+  target_link_libraries(main PRIVATE poly2tri::poly2tri)
diff --git a/external_imported/vcpkg/ports/jhasse-poly2tri/vcpkg.json b/external_imported/vcpkg/ports/jhasse-poly2tri/vcpkg.json
new file mode 100644
index 000000000..b0017d33c
--- /dev/null
+++ b/external_imported/vcpkg/ports/jhasse-poly2tri/vcpkg.json
@@ -0,0 +1,17 @@
+{
+  "name": "jhasse-poly2tri",
+  "version-date": "2023-12-27",
+  "description": "Sweep-line algorithm for constrained Delaunay triangulation",
+  "homepage": "https://github.com/jhasse/poly2tri",
+  "supports": "!uwp",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/jinja2cpplight/portfile.cmake b/external_imported/vcpkg/ports/jinja2cpplight/portfile.cmake
index 329020de2..7f6554ab0 100644
--- a/external_imported/vcpkg/ports/jinja2cpplight/portfile.cmake
+++ b/external_imported/vcpkg/ports/jinja2cpplight/portfile.cmake
@@ -17,21 +17,20 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-	PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
 vcpkg_copy_pdbs()
 
 
-file(GLOB_RECURSE JINJA2CPPLIGHT_EXES ${CURRENT_PACKAGES_DIR}/bin/jinja2cpplight_unittests*)
-file(COPY ${JINJA2CPPLIGHT_EXES} DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
+file(GLOB_RECURSE JINJA2CPPLIGHT_EXES "${CURRENT_PACKAGES_DIR}/bin/jinja2cpplight_unittests*")
+file(COPY ${JINJA2CPPLIGHT_EXES} DESTINATION "${CURRENT_PACKAGES_DIR}/tools")
 file(REMOVE_RECURSE ${JINJA2CPPLIGHT_EXES})
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/jinja2cpplight/vcpkg.json b/external_imported/vcpkg/ports/jinja2cpplight/vcpkg.json
index 004282a82..cd3c5caf5 100644
--- a/external_imported/vcpkg/ports/jinja2cpplight/vcpkg.json
+++ b/external_imported/vcpkg/ports/jinja2cpplight/vcpkg.json
@@ -1,8 +1,14 @@
 {
   "name": "jinja2cpplight",
-  "version-string": "2018-05-08",
-  "port-version": 1,
+  "version-date": "2018-05-08",
+  "port-version": 3,
   "description": "(very) lightweight version of Jinja2 for C++, Lightweight templating engine for C++, based on Jinja2.",
   "homepage": "https://github.com/hughperkins/Jinja2CppLight",
-  "supports": "!uwp"
+  "supports": "!uwp",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/jkqtplotter/fix-cmake.patch b/external_imported/vcpkg/ports/jkqtplotter/fix-cmake.patch
new file mode 100644
index 000000000..2141695f5
--- /dev/null
+++ b/external_imported/vcpkg/ports/jkqtplotter/fix-cmake.patch
@@ -0,0 +1,52 @@
+diff --git a/cmake/FindCImg.cmake b/cmake/FindCImg.cmake
+index 38a929e7a..3e8424a9f 100644
+--- a/cmake/FindCImg.cmake
++++ b/cmake/FindCImg.cmake
+@@ -83,10 +83,10 @@ if (CIMG_FOUND)
+             endif (X11_Xrandr_FOUND)
+             
+     ### PThread is required when using X11 display engine ###
+-            find_package (PTHREAD QUIET)
+-            if (PTHREAD_FOUND)
+-                set (CIMG_INCLUDE_DIRS ${CIMG_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIRS})
+-                set (CIMG_LIBRARIES ${CIMG_LIBRARIES} ${PTHREAD_LIBRARIES})
++            find_package (Threads QUIET)
++            if (Threads_FOUND)
++                set (CIMG_INCLUDE_DIRS ${CIMG_INCLUDE_DIRS})
++                set (CIMG_LIBRARIES ${CIMG_LIBRARIES} Threads::Threads)
+                 message(STATUS "FindCImg.cmake: pthread found")
+             else (PTHREAD_FOUND)
+                 message(STATUS "!!! FindCIMG.cmake !!! pthread NOT found. pthread required by cimg for running X11.")
+@@ -100,15 +100,15 @@ if (CIMG_FOUND)
+         endif (X11_FOUND)
+     else (UNIX OR APPLE)
+         if (WIN32)
+-            find_package(GDI QUIET)
+-            if (GDI_FOUND)
+-                set (CIMG_LIBRARIES ${CIMG_LIBRARIES} ${GDI_LIBRARIES})
++          find_library(GDI_LIBRARY gdi32)
++            if (GDI_LIBRARY)
++                set (CIMG_LIBRARIES ${CIMG_LIBRARIES} ${GDI_LIBRARY})
+                 message(STATUS "FindCImg.cmake: GDI found")
+-            else (GDI_FOUND)
++            else (GDI_LIBRARY)
+                 message(STATUS "!!! FindCIMG.cmake !!! GDI NOT found.")
+                 message(WARNING "FindCImg.cmake: display disabled")
+                 set (CIMG_DEFINITIONS ${CIMG_DEFINITIONS} -Dcimg_display=0)
+-            endif (GDI_FOUND)
++            endif (GDI_LIBRARY)
+         endif (WIN32)
+     endif (UNIX OR APPLE)
+ 
+diff --git a/cmake/jkqtplotter_deployqt.cmake b/cmake/jkqtplotter_deployqt.cmake
+index 5a8574591..5dbc8a51d 100644
+--- a/cmake/jkqtplotter_deployqt.cmake
++++ b/cmake/jkqtplotter_deployqt.cmake
+@@ -1,6 +1,6 @@
+ function(jkqtplotter_deployqt TARGET_NAME)
+     #use windeploy
+-    if (WIN32)
++    if (WIN32 AND 0)
+         # install system runtime lib
+         include( InstallRequiredSystemLibraries )
+         if( CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS )
diff --git a/external_imported/vcpkg/ports/jkqtplotter/fix-cmake2.patch b/external_imported/vcpkg/ports/jkqtplotter/fix-cmake2.patch
new file mode 100644
index 000000000..5aa7ec300
--- /dev/null
+++ b/external_imported/vcpkg/ports/jkqtplotter/fix-cmake2.patch
@@ -0,0 +1,14 @@
+
+diff --git a/lib/jkqtmath/CMakeLists.txt b/lib/jkqtmath/CMakeLists.txt
+index 716254ac8..835b4e8cb 100644
+--- a/lib/jkqtmath/CMakeLists.txt
++++ b/lib/jkqtmath/CMakeLists.txt
+@@ -110,7 +110,7 @@ endif()
+ if(JKQtPlotter_BUILD_STATIC_LIBS)
+     add_library(${lib_name} STATIC ${SOURCES} ${HEADERS})
+     JKQtCommon_setDefaultLibOptions(${lib_name})
+-    target_link_libraries(${libsh_name} PUBLIC JKQTCommonLib)
++    target_link_libraries(${lib_name} PUBLIC JKQTCommonLib)
+     set_property(TARGET ${lib_name} PROPERTY OUTPUT_NAME  "${lib_name_decorated}")
+     write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/${lib_name}Version.cmake
+                                      VERSION ${PROJECT_VERSION} 
diff --git a/external_imported/vcpkg/ports/jkqtplotter/portfile.cmake b/external_imported/vcpkg/ports/jkqtplotter/portfile.cmake
new file mode 100644
index 000000000..f595e8407
--- /dev/null
+++ b/external_imported/vcpkg/ports/jkqtplotter/portfile.cmake
@@ -0,0 +1,131 @@
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" JKQtPlotter_BUILD_SHARED_LIBS)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static"  JKQtPlotter_BUILD_STATIC_LIBS)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO jkriege2/JKQtPlotter
+    REF a9bfcab4b96cd7bdeac30902f5d7a31b765c522b 
+    SHA512 04b20eb66c833eac5dcd6a50c966217380b0f3a6e70092e36b80197b94d1ea2858b2b9f09aec5e02df2effab5b9b17059436589d727060bba3601ec1342278a9
+    HEAD_REF master
+    PATCHES
+        fix-cmake.patch
+        fix-cmake2.patch
+)
+
+vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" "add_subdirectory(doc)" "")
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        "examples"       JKQtPlotter_BUILD_EXAMPLES
+        "tools"          JKQtPlotter_BUILD_TOOLS
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DJKQtPlotter_BUILD_SHARED_LIBS=${JKQtPlotter_BUILD_SHARED_LIBS}
+        -DJKQtPlotter_BUILD_STATIC_LIBS=${JKQtPlotter_BUILD_STATIC_LIBS}
+        ${FEATURE_OPTIONS}
+        -DCMAKE_IGNORE_PATH=${CURRENT_INSTALLED_DIR}/share/cmake/Qt5
+        -DCIMG_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include
+        -DCMAKE_DISABLE_FIND_PACKAGE_OpenCV:BOOL=ON # only used for some examples
+        -DOpenCV_FOUND:BOOL=FALSE # wrong find_package call with QUITE instead of QUIET
+    MAYBE_UNUSED_VARIABLES
+        OpenCV_FOUND
+)
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake)
+
+vcpkg_copy_pdbs()
+set(tools "")
+if("tools" IN_LIST FEATURES)
+  list(APPEND tools
+      jkqtmathtext_render
+      jkqtplotter_doc_imagegenerator
+  )
+endif()
+if("examples" IN_LIST FEATURES)
+  list(APPEND tools
+      jkqtplot_test
+      jkqtptest_advplotstyling
+      jkqtptest_barchart
+      jkqtptest_boxplot
+      jkqtptest_contourplot
+      jkqtptest_datastore
+      jkqtptest_datastore_groupedstat
+      jkqtptest_datastore_iterators
+      jkqtptest_datastore_regression
+      jkqtptest_datastore_statistics
+      jkqtptest_datastore_statistics_2d
+      jkqtptest_dateaxes
+      jkqtptest_distributionplot
+      jkqtptest_errorbarstyles
+      jkqtptest_evalcurve
+      jkqtptest_filledgraphs
+      jkqtptest_functionplot
+      jkqtptest_geometric
+      jkqtptest_geo_arrows
+      jkqtptest_geo_simple
+      jkqtptest_imageplot
+      jkqtptest_imageplot_cimg
+      jkqtptest_imageplot_modifier
+      jkqtptest_imageplot_nodatastore
+      jkqtptest_imageplot_userpal
+      jkqtptest_impulsesplot
+      jkqtptest_jkqtfastplotter_test
+      jkqtptest_jkqtmathtext_simpletest
+      jkqtptest_jkqtmathtext_test
+      jkqtptest_logaxes
+      jkqtptest_mandelbrot
+      jkqtptest_parametriccurve
+      jkqtptest_paramscatterplot
+      jkqtptest_paramscatterplot_image
+      jkqtptest_parsedfunctionplot
+      jkqtptest_rgbimageplot
+      jkqtptest_rgbimageplot_cimg
+      jkqtptest_rgbimageplot_qt
+      jkqtptest_simpletest
+      jkqtptest_speed
+      jkqtptest_stackedbars
+      jkqtptest_stepplots
+      jkqtptest_styledboxplot
+      jkqtptest_styling
+      jkqtptest_symbols_and_errors
+      jkqtptest_symbols_and_styles
+      jkqtptest_ui
+      jkqtptest_user_interaction
+      jkqtptest_violinplot
+      jkqtptest_wiggleplots
+      jkqtptest_barchart_customdrawfunctor
+      jkqtptest_barchart_errorbars
+      jkqtptest_barchart_functorfill
+      jkqtptest_barchart_twocolor
+      jkqtptest_filledgraphs_errors
+      jkqtptest_geo_coordinateaxis0
+      jkqtptest_multiplot
+      jkqtptest_paramscatterplot_customsymbol
+      jkqtptest_scatter
+      jkqtptest_scatter_customsymbol
+      jkqtptest_second_axis
+  )
+endif()
+
+
+
+if(tools)
+  vcpkg_copy_tools(TOOL_NAMES ${tools} AUTO_CLEAN)
+endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/doc" "${CURRENT_PACKAGES_DIR}/debug/doc")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+vcpkg_install_copyright(FILE_LIST
+  "${SOURCE_PATH}/LICENSE" 
+  "${SOURCE_PATH}/lib/jkqtmathtext/resources/firaMath/LICENSE"
+  "${SOURCE_PATH}/lib/jkqtmathtext/resources/xits/OFL.txt"
+)
diff --git a/external_imported/vcpkg/ports/jkqtplotter/vcpkg.json b/external_imported/vcpkg/ports/jkqtplotter/vcpkg.json
new file mode 100644
index 000000000..b393e50e0
--- /dev/null
+++ b/external_imported/vcpkg/ports/jkqtplotter/vcpkg.json
@@ -0,0 +1,40 @@
+{
+  "name": "jkqtplotter",
+  "version-date": "2023-10-24",
+  "port-version": 1,
+  "description": "A Qt Plotting Library",
+  "license": null,
+  "dependencies": [
+    "cimg",
+    {
+      "name": "qtbase",
+      "default-features": false,
+      "features": [
+        "gui",
+        "jpeg",
+        "opengl",
+        "png",
+        "widgets"
+      ]
+    },
+    "qtsvg",
+    {
+      "name": "vcpkg-cmake",
+      "host": true,
+      "default-features": false
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true,
+      "default-features": false
+    }
+  ],
+  "features": {
+    "examples": {
+      "description": "Build examples"
+    },
+    "tools": {
+      "description": "Build tools"
+    }
+  }
+}
diff --git a/external_imported/vcpkg/ports/joltphysics/disable-warningC5266.patch b/external_imported/vcpkg/ports/joltphysics/disable-warningC5266.patch
deleted file mode 100644
index fb9ce8458..000000000
--- a/external_imported/vcpkg/ports/joltphysics/disable-warningC5266.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Build/CMakeLists.txt b/Build/CMakeLists.txt
-index 27c4c64..78f3947 100644
---- a/Build/CMakeLists.txt
-+++ b/Build/CMakeLists.txt
-@@ -53,7 +53,7 @@ if (("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows" OR "${CMAKE_SYSTEM_NAME}" STREQUA
- 	endif()
- 
- 	# Set general compiler flags
--	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++17 /Zc:__cplusplus /Gm- /Wall /WX /MP /nologo /diagnostics:classic /FC /fp:except- /Zc:inline /Zi")
-+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++17 /Zc:__cplusplus /Gm- /Wall /WX- /MP /nologo /diagnostics:classic /FC /fp:except- /Zc:inline /Zi")
- 
- 	# Remove any existing compiler flag that enables RTTI
- 	string(REPLACE "/GR" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
diff --git a/external_imported/vcpkg/ports/joltphysics/fix-export.diff b/external_imported/vcpkg/ports/joltphysics/fix-export.diff
new file mode 100644
index 000000000..a49dba54c
--- /dev/null
+++ b/external_imported/vcpkg/ports/joltphysics/fix-export.diff
@@ -0,0 +1,77 @@
+diff --git a/Build/CMakeLists.txt b/Build/CMakeLists.txt
+index cc4cf1d..330b987 100644
+--- a/Build/CMakeLists.txt
++++ b/Build/CMakeLists.txt
+@@ -100,8 +100,8 @@ if (("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows" OR "${CMAKE_SYSTEM_NAME}" STREQUA
+ 	endif()
+ 
+ 	# Set compiler flags for various configurations
+-	set(CMAKE_CXX_FLAGS_DEBUG "/GS /Od /Ob0 /RTC1")
+-	set(CMAKE_CXX_FLAGS_RELEASE "/GS- /Gy /O2 /Oi /Ot")
++	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /GS /Od /Ob0 /RTC1")
++	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GS- /Gy /O2 /Oi /Ot")
+ 	set(CMAKE_CXX_FLAGS_DISTRIBUTION "/GS- /Gy /O2 /Oi /Ot")
+ 	set(CMAKE_CXX_FLAGS_RELEASEASAN "-fsanitize=address /Od")
+ 	set(CMAKE_CXX_FLAGS_RELEASEUBSAN "-fsanitize=undefined,implicit-conversion,float-divide-by-zero,local-bounds -fno-sanitize-recover=all")
+@@ -160,8 +160,8 @@ elseif ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" OR "${CMAKE_SYSTEM_NAME}" STREQU
+ 	endif()
+ 
+ 	# Set compiler flags for various configurations
+-	set(CMAKE_CXX_FLAGS_DEBUG "")
+-	set(CMAKE_CXX_FLAGS_RELEASE "-O3")
++	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
++	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3")
+ 	set(CMAKE_CXX_FLAGS_DISTRIBUTION "-O3")
+ 	set(CMAKE_CXX_FLAGS_RELEASEASAN "-fsanitize=address")
+ 	set(CMAKE_CXX_FLAGS_RELEASEUBSAN "-fsanitize=undefined,implicit-conversion,float-divide-by-zero,local-bounds -fno-sanitize-recover=all")
+@@ -205,7 +205,11 @@ if (XCODE)
+ endif()
+ 
+ # Install Jolt library and includes
+-install(TARGETS Jolt DESTINATION lib)
++install(TARGETS Jolt
++        EXPORT unofficial-joltphysics-targets
++        ARCHIVE DESTINATION lib
++        LIBRARY DESTINATION lib
++        RUNTIME DESTINATION bin)
+ foreach(SRC_FILE ${JOLT_PHYSICS_SRC_FILES})
+ 	string(REPLACE ${PHYSICS_REPO_ROOT} "" RELATIVE_SRC_FILE ${SRC_FILE})
+ 	get_filename_component(DESTINATION_PATH ${RELATIVE_SRC_FILE} DIRECTORY)
+@@ -214,6 +218,17 @@ foreach(SRC_FILE ${JOLT_PHYSICS_SRC_FILES})
+ 	endif()
+ endforeach()
+ 
++install(EXPORT unofficial-joltphysics-targets
++    NAMESPACE unofficial::joltphysics::
++    FILE unofficial-joltphysics-targets.cmake
++    DESTINATION share/unofficial-joltphysics
++)
++
++install(FILES 
++  unofficial-joltphysics-config.cmake 
++  DESTINATION share/unofficial-joltphysics
++)
++
+ # Check if we're the root CMakeLists.txt, if not we are included by another CMake file and we should disable everything except for the main library
+ if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
+ 	# Ability to turn ON/OFF individual applications
+diff --git a/Jolt/Jolt.cmake b/Jolt/Jolt.cmake
+index c0f7099..d447a3f 100644
+--- a/Jolt/Jolt.cmake
++++ b/Jolt/Jolt.cmake
+@@ -474,10 +474,13 @@ if (BUILD_SHARED_LIBS)
+ 	target_compile_definitions(Jolt PRIVATE JPH_BUILD_SHARED_LIBRARY)
+ endif()
+ 
+-target_include_directories(Jolt PUBLIC ${PHYSICS_REPO_ROOT})
++target_include_directories(Jolt PUBLIC
++  $<BUILD_INTERFACE:${PHYSICS_REPO_ROOT}>
++  $<INSTALL_INTERFACE:include>
++)
+ target_precompile_headers(Jolt PRIVATE ${JOLT_PHYSICS_ROOT}/Jolt.h)
+ target_compile_definitions(Jolt PUBLIC "$<$<CONFIG:Debug>:_DEBUG;JPH_PROFILE_ENABLED;JPH_DEBUG_RENDERER>")
+-target_compile_definitions(Jolt PUBLIC "$<$<CONFIG:Release>:NDEBUG;JPH_PROFILE_ENABLED;JPH_DEBUG_RENDERER>")
++target_compile_definitions(Jolt PUBLIC "$<$<CONFIG:Release>:NDEBUG>")
+ target_compile_definitions(Jolt PUBLIC "$<$<CONFIG:Distribution>:NDEBUG>")
+ target_compile_definitions(Jolt PUBLIC "$<$<CONFIG:ReleaseASAN>:NDEBUG;JPH_PROFILE_ENABLED;JPH_DISABLE_TEMP_ALLOCATOR;JPH_DISABLE_CUSTOM_ALLOCATOR;JPH_DEBUG_RENDERER>")
+ target_compile_definitions(Jolt PUBLIC "$<$<CONFIG:ReleaseUBSAN>:NDEBUG;JPH_PROFILE_ENABLED;JPH_DEBUG_RENDERER>")
diff --git a/external_imported/vcpkg/ports/joltphysics/portfile.cmake b/external_imported/vcpkg/ports/joltphysics/portfile.cmake
index 7f5ebeac0..3e2cf0000 100644
--- a/external_imported/vcpkg/ports/joltphysics/portfile.cmake
+++ b/external_imported/vcpkg/ports/joltphysics/portfile.cmake
@@ -4,12 +4,16 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO jrouwe/JoltPhysics
     REF "v${VERSION}"
-    SHA512 c5848fe7a28de1b34259d3d21e4cd35bec4002eee926445e05d902934c43ab4cafcfa24ceb037c59cc66c3dcea5f3a737546f88c20be594dafe6ce6d1f637abb
+    SHA512 9b7530c37fc865682c4a130afc87daef1b038d1f457d2330a5253f35e3a4b6399ad738e97961f0ca8a9ae41ed999179e1c864dc699c5c93341ce4b6e6b2a1a61
     HEAD_REF master
     PATCHES
-        disable-warningC5266.patch
+      fix-export.diff
 )
 
+# Need to provide this library a config
+# The fix-export.diff should install this
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/unofficial-joltphysics-config.cmake" DESTINATION "${SOURCE_PATH}/Build")
+
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" USE_STATIC_CRT)
 
 vcpkg_cmake_configure(
@@ -21,28 +25,20 @@ vcpkg_cmake_configure(
         -DTARGET_SAMPLES=OFF
         -DTARGET_VIEWER=OFF
         -DCROSS_PLATFORM_DETERMINISTIC=OFF
+        -DINTERPROCEDURAL_OPTIMIZATION=OFF
         -DUSE_STATIC_MSVC_RUNTIME_LIBRARY=${USE_STATIC_CRT}
+        -DENABLE_ALL_WARNINGS=OFF
     OPTIONS_RELEASE
-        -DCMAKE_BUILD_TYPE=Distribution
+        -DGENERATE_DEBUG_SYMBOLS=OFF
 )
 
-vcpkg_cmake_build()
-
-file(
-    INSTALL "${SOURCE_PATH}/Jolt"
-    DESTINATION "${CURRENT_PACKAGES_DIR}/include"
-    FILES_MATCHING
-        PATTERN "*.h"
-        PATTERN "*.inl"
-)
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+vcpkg_fixup_pkgconfig()
 
-if(VCPKG_TARGET_IS_WINDOWS)
-    file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Jolt.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
-    file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Jolt.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
-else()
-    file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libJolt.a" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
-    file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libJolt.a" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
-endif()
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+vcpkg_cmake_config_fixup(CONFIG_PATH share/unofficial-${PORT} PACKAGE_NAME unofficial-${PORT})
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/joltphysics/unofficial-joltphysics-config.cmake b/external_imported/vcpkg/ports/joltphysics/unofficial-joltphysics-config.cmake
new file mode 100644
index 000000000..00f961728
--- /dev/null
+++ b/external_imported/vcpkg/ports/joltphysics/unofficial-joltphysics-config.cmake
@@ -0,0 +1,3 @@
+include(CMakeFindDependencyMacro)
+# find_dependency(xx 2.0)
+include(${CMAKE_CURRENT_LIST_DIR}/unofficial-joltphysics-targets.cmake)
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/joltphysics/usage b/external_imported/vcpkg/ports/joltphysics/usage
index c6835e754..342bb11a4 100644
--- a/external_imported/vcpkg/ports/joltphysics/usage
+++ b/external_imported/vcpkg/ports/joltphysics/usage
@@ -1,4 +1,4 @@
-The package joltphysics can be used from CMake via:
+ joltphysics provides CMake targets:
 
-    find_path(JOLTPHYSICS_INCLUDE_DIRS "Jolt/Jolt.h")
-    target_include_directories(main PRIVATE ${JOLTPHYSICS_INCLUDE_DIRS})
+    find_package(unofficial-joltphysics CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE unofficial::joltphysics::Jolt)
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/joltphysics/vcpkg.json b/external_imported/vcpkg/ports/joltphysics/vcpkg.json
index d7fc3986c..85c829fad 100644
--- a/external_imported/vcpkg/ports/joltphysics/vcpkg.json
+++ b/external_imported/vcpkg/ports/joltphysics/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "joltphysics",
-  "version": "2.0.1",
-  "port-version": 2,
+  "version": "4.0.0",
   "description": "A multi core friendly rigid body physics and collision detection library suitable for games and VR applications",
   "homepage": "https://github.com/jrouwe/JoltPhysics",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/josuttis-jthread/vcpkg.json b/external_imported/vcpkg/ports/josuttis-jthread/vcpkg.json
index 565f8b4e3..f1b9569a3 100644
--- a/external_imported/vcpkg/ports/josuttis-jthread/vcpkg.json
+++ b/external_imported/vcpkg/ports/josuttis-jthread/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "josuttis-jthread",
-  "version-string": "2020-07-21",
-  "port-version": 2,
+  "version-date": "2020-07-21",
+  "port-version": 3,
   "description": "C++ class for a joining and cooperative interruptible thread (std::jthread) with stop_token helper",
   "homepage": "https://github.com/josuttis/jthread"
 }
diff --git a/external_imported/vcpkg/ports/jsmn/vcpkg.json b/external_imported/vcpkg/ports/jsmn/vcpkg.json
index 96956d18d..823643e38 100644
--- a/external_imported/vcpkg/ports/jsmn/vcpkg.json
+++ b/external_imported/vcpkg/ports/jsmn/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "jsmn",
-  "version-string": "2019-04-27",
-  "port-version": 1,
+  "version-date": "2019-04-27",
+  "port-version": 2,
   "description": "A minimalistic JSON parser in C."
 }
diff --git a/external_imported/vcpkg/ports/json-c/fix-clang-cl.patch b/external_imported/vcpkg/ports/json-c/fix-clang-cl.patch
index 85641a7d5..a2609d5d2 100644
--- a/external_imported/vcpkg/ports/json-c/fix-clang-cl.patch
+++ b/external_imported/vcpkg/ports/json-c/fix-clang-cl.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9741b45f9..11b397024 100644
+index 0aa1b64..54e7b3d 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -281,7 +281,7 @@ message(STATUS "Wrote ${PROJECT_BINARY_DIR}/config.h")
+@@ -295,7 +295,7 @@ message(STATUS "Wrote ${PROJECT_BINARY_DIR}/config.h")
  configure_file(${PROJECT_SOURCE_DIR}/cmake/json_config.h.in   ${PROJECT_BINARY_DIR}/json_config.h)
  message(STATUS "Wrote ${PROJECT_BINARY_DIR}/json_config.h")
  
@@ -11,10 +11,10 @@ index 9741b45f9..11b397024 100644
      set(CMAKE_C_FLAGS           "${CMAKE_C_FLAGS} -ffunction-sections -fdata-sections")
  	if ("${DISABLE_WERROR}" STREQUAL "OFF")
  	    set(CMAKE_C_FLAGS           "${CMAKE_C_FLAGS} -Werror")
-@@ -297,7 +297,7 @@ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL
+@@ -316,7 +316,7 @@ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL
+         # Remove this for 1.0 when we can bump the ABI and actually fix these warnings.
+         set(CMAKE_C_FLAGS           "${CMAKE_C_FLAGS} -Wno-shorten-64-to-32")
      endif()
- 
-     add_definitions(-D_GNU_SOURCE)
 -elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC")
 +elseif (MSVC)
      set(CMAKE_C_FLAGS           "${CMAKE_C_FLAGS} /DEBUG")
diff --git a/external_imported/vcpkg/ports/json-c/portfile.cmake b/external_imported/vcpkg/ports/json-c/portfile.cmake
index 582a1783c..dccd504f7 100644
--- a/external_imported/vcpkg/ports/json-c/portfile.cmake
+++ b/external_imported/vcpkg/ports/json-c/portfile.cmake
@@ -1,17 +1,22 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO json-c/json-c
-    REF d28ac67dde77566f53a97f22b4ea7cb36afe6582
-    SHA512 30063c8e32eb82e170647363055119f2f7eab19e1c3152673b966f41ed07e0349c3d6141b215b9912f9e84c2e06677b3d7ac949f720c7ebc2c95d692dc3881fe
+    REF b4c371fa0cbc4dcbaccc359ce9e957a22988fb34
+    SHA512 1338271a6f9ffb3b8a8d4f2ec36a374ed84b3c91f789b607693c08cbeb38c4fdd813593f530ff94e841a095ff367a3ae8c5f5e7dbcb64e8f9044f6affdf24505
     HEAD_REF master
     PATCHES pkgconfig.patch
             fix-clang-cl.patch
 )
 
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" JSON_BUILD_STATIC)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" JSON_BUILD_SHARED)
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DBUILD_TESTING=OFF
+        -DBUILD_STATIC_LIBS=${JSON_BUILD_STATIC}
+        -DBUILD_SHARED_LIBS=${JSON_BUILD_SHARED}
 )
 
 vcpkg_cmake_install()
@@ -23,4 +28,4 @@ vcpkg_copy_pdbs()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 # Handle copyright
-configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/json-c/vcpkg.json b/external_imported/vcpkg/ports/json-c/vcpkg.json
index 8d6086e87..16efcbaa1 100644
--- a/external_imported/vcpkg/ports/json-c/vcpkg.json
+++ b/external_imported/vcpkg/ports/json-c/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "json-c",
-  "version-date": "2022-06-26",
-  "port-version": 2,
+  "version-date": "2023-08-12",
   "description": "A JSON implementation in C",
   "homepage": "https://github.com/json-c/json-c",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/json-dto/portfile.cmake b/external_imported/vcpkg/ports/json-dto/portfile.cmake
index 133fcd706..c914684a6 100644
--- a/external_imported/vcpkg/ports/json-dto/portfile.cmake
+++ b/external_imported/vcpkg/ports/json-dto/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO stiffstream/json_dto
-    REF 9a08aaab6caee28300043c96e1ad3e6700f0f8fc # v.0.3.1
-    SHA512 09ca1072a3de2cc5c5ab6eeaa1b82014dcc6139992da84558e77fe4bfa42210ff9f7fa6ee7d7e6b2d4ac15fd7ae6286a6a56d8a72cce75fc73b91755bb831864
+    REF "v.${VERSION}"
+    SHA512 18e135c5a45c4421e6ae17955e042056890270717963008c4e0cba94f6dfe240fa7ea84991319ff88359abf0688ca32ed7c9783e575eca4a20b5694558a49c3d
 )
 
 vcpkg_cmake_configure(
diff --git a/external_imported/vcpkg/ports/json-dto/vcpkg.json b/external_imported/vcpkg/ports/json-dto/vcpkg.json
index 6c91808bc..89bbfb92f 100644
--- a/external_imported/vcpkg/ports/json-dto/vcpkg.json
+++ b/external_imported/vcpkg/ports/json-dto/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "json-dto",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "A small header-only library for converting data between json representation and c++ structs.",
   "homepage": "https://github.com/Stiffstream/json_dto",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/json-rpc-cxx/fix-config.patch b/external_imported/vcpkg/ports/json-rpc-cxx/fix-config.patch
new file mode 100644
index 000000000..197527eb1
--- /dev/null
+++ b/external_imported/vcpkg/ports/json-rpc-cxx/fix-config.patch
@@ -0,0 +1,22 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a362ea4..9c23acf 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -10,8 +10,16 @@ option(CODE_COVERAGE "Enable coverage reporting" OFF)
+ include(GNUInstallDirs)
+
+ add_library(json-rpc-cxx INTERFACE)
+-target_include_directories(json-rpc-cxx INTERFACE include)
++target_include_directories(json-rpc-cxx INTERFACE
++        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>
++        $<INSTALL_INTERFACE:include>
++        )
+ install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
++install (TARGETS json-rpc-cxx EXPORT unofficial-json-rpc-cxx-config)
++install (EXPORT unofficial-json-rpc-cxx-config
++        NAMESPACE unofficial::json-rpc-cxx::
++        DESTINATION share/unofficial-json-rpc-cxx
++        )
+
+ add_library(coverage_config INTERFACE)
+
diff --git a/external_imported/vcpkg/ports/json-rpc-cxx/portfile.cmake b/external_imported/vcpkg/ports/json-rpc-cxx/portfile.cmake
new file mode 100644
index 000000000..cd1b8f21f
--- /dev/null
+++ b/external_imported/vcpkg/ports/json-rpc-cxx/portfile.cmake
@@ -0,0 +1,32 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO jsonrpcx/json-rpc-cxx
+    REF "v${VERSION}"
+    SHA512 0b8f2b1c8ff95bee14585f6b363f6aa4bf046e3905f7a65cf2e562e5c9181a3ba882baded36fab4d3ff9ac5b2f3245eeb54260f2163491af7fba264ff547f6d8
+    HEAD_REF master
+    PATCHES
+       fix-config.patch
+)
+
+set(VCPKG_BUILD_TYPE release) # header-only port
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DCOMPILE_TESTS=OFF
+        -DCOMPILE_EXAMPLES=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT})
+file(READ "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake" JSON_RPC_CXX_CONFIG)
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake" "
+include(CMakeFindDependencyMacro)
+find_dependency(nlohmann_json)
+${JSON_RPC_CXX_CONFIG}
+")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/json-rpc-cxx/usage b/external_imported/vcpkg/ports/json-rpc-cxx/usage
new file mode 100644
index 000000000..0e1009eb6
--- /dev/null
+++ b/external_imported/vcpkg/ports/json-rpc-cxx/usage
@@ -0,0 +1,4 @@
+json-rpc-cxx provides CMake targets:
+
+    find_package(unofficial-json-rpc-cxx CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE unofficial::json-rpc-cxx::json-rpc-cxx)
diff --git a/external_imported/vcpkg/ports/json-rpc-cxx/vcpkg.json b/external_imported/vcpkg/ports/json-rpc-cxx/vcpkg.json
new file mode 100644
index 000000000..2030a0e2f
--- /dev/null
+++ b/external_imported/vcpkg/ports/json-rpc-cxx/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "json-rpc-cxx",
+  "version": "0.3.1",
+  "description": "A JSON-RPC 2.0 framework implemented in C++17 using the nlohmann's json for modern C++.",
+  "homepage": "https://github.com/jsonrpcx/json-rpc-cxx",
+  "license": "MIT",
+  "dependencies": [
+    "nlohmann-json",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/json-schema-validator/portfile.cmake b/external_imported/vcpkg/ports/json-schema-validator/portfile.cmake
index 00ba47018..1c81405af 100644
--- a/external_imported/vcpkg/ports/json-schema-validator/portfile.cmake
+++ b/external_imported/vcpkg/ports/json-schema-validator/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO pboettch/json-schema-validator
     REF "${VERSION}"
-    SHA512 8d7fe6775774040099aa8d8b10fa18c4ccebe4437ecf9670710a0f64443d3588ca3e1bf1bc32a800518b748aa3acd89ecc61d1568b6dd8bf54273b33c5ab5d5a
+    SHA512 6d207031acdb94c44f96ff6346dccaf98f2c9d3619d71e419ddabff548ea34d50e8eb103622c99ae28ecb7fddedd687b297e5ad934aa0106c58ac59fc4d65ea9
     HEAD_REF master
 )
 
@@ -21,6 +21,6 @@ vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 
diff --git a/external_imported/vcpkg/ports/json-schema-validator/usage b/external_imported/vcpkg/ports/json-schema-validator/usage
index 3493d3808..395e424cb 100644
--- a/external_imported/vcpkg/ports/json-schema-validator/usage
+++ b/external_imported/vcpkg/ports/json-schema-validator/usage
@@ -1,4 +1,4 @@
-The package json-schema-validator provides CMake integration:
+json-schema-validator provides CMake integration:
 
     find_package(nlohmann_json_schema_validator REQUIRED)
-    target_link_libraries(main PRIVATE nlohmann_json_schema_validator)
+    target_link_libraries(main PRIVATE nlohmann_json_schema_validator::validator)
diff --git a/external_imported/vcpkg/ports/json-schema-validator/vcpkg.json b/external_imported/vcpkg/ports/json-schema-validator/vcpkg.json
index 804066ba6..e6e984875 100644
--- a/external_imported/vcpkg/ports/json-schema-validator/vcpkg.json
+++ b/external_imported/vcpkg/ports/json-schema-validator/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "json-schema-validator",
-  "version": "2.2.0",
+  "version": "2.3.0",
+  "port-version": 1,
   "description": "C++ library for validating JSON documents based on a JSON Schema. This validator is based on the nlohmann-json library.",
   "homepage": "https://github.com/pboettch/json-schema-validator",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/json-spirit/portfile.cmake b/external_imported/vcpkg/ports/json-spirit/portfile.cmake
index 658cb92a4..937e2b9f4 100644
--- a/external_imported/vcpkg/ports/json-spirit/portfile.cmake
+++ b/external_imported/vcpkg/ports/json-spirit/portfile.cmake
@@ -9,17 +9,20 @@ vcpkg_from_github(
         Fix-link-error-C1128.patch
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-    OPTIONS -DBUILD_STATIC_LIBS=off -DJSON_SPIRIT_DEMOS=off -DJSON_SPIRIT_TESTS=off)
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_STATIC_LIBS=OFF
+        -DJSON_SPIRIT_DEMOS=OFF
+        -DJSON_SPIRIT_TESTS=OFF
+)
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/json-spirit RENAME copyright)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
 vcpkg_copy_pdbs()
diff --git a/external_imported/vcpkg/ports/json-spirit/vcpkg.json b/external_imported/vcpkg/ports/json-spirit/vcpkg.json
index 35517305e..37f237079 100644
--- a/external_imported/vcpkg/ports/json-spirit/vcpkg.json
+++ b/external_imported/vcpkg/ports/json-spirit/vcpkg.json
@@ -1,13 +1,17 @@
 {
   "name": "json-spirit",
-  "version-string": "4.1.0",
-  "port-version": 2,
+  "version": "4.1.0",
+  "port-version": 4,
   "description": "json parser using boost library",
   "dependencies": [
     "boost-config",
     "boost-integer",
     "boost-smart-ptr",
     "boost-spirit",
-    "boost-variant"
+    "boost-variant",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
   ]
 }
diff --git a/external_imported/vcpkg/ports/json11/portfile.cmake b/external_imported/vcpkg/ports/json11/portfile.cmake
index 3ff8b0f29..fa87e5b20 100644
--- a/external_imported/vcpkg/ports/json11/portfile.cmake
+++ b/external_imported/vcpkg/ports/json11/portfile.cmake
@@ -9,22 +9,20 @@ vcpkg_from_github(
     PATCHES destination.patch
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DJSON11_BUILD_TESTS:BOOL=OFF
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
-file(INSTALL ${CURRENT_PORT_DIR}/json11-config.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/json11)
+file(INSTALL "${CURRENT_PORT_DIR}/json11-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 # Handle copyright
-file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/json11)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/json11/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/json11/copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 
 vcpkg_fixup_pkgconfig()
diff --git a/external_imported/vcpkg/ports/json11/vcpkg.json b/external_imported/vcpkg/ports/json11/vcpkg.json
index 70fb4f209..5dd606543 100644
--- a/external_imported/vcpkg/ports/json11/vcpkg.json
+++ b/external_imported/vcpkg/ports/json11/vcpkg.json
@@ -1,6 +1,12 @@
 {
   "name": "json11",
-  "version-string": "2017-06-20",
-  "port-version": 4,
-  "description": "json11 is a tiny JSON library for C++11, providing JSON parsing and serialization."
+  "version-date": "2017-06-20",
+  "port-version": 6,
+  "description": "json11 is a tiny JSON library for C++11, providing JSON parsing and serialization.",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/json5-parser/portfile.cmake b/external_imported/vcpkg/ports/json5-parser/portfile.cmake
index 79e4d1afc..ce123fd04 100644
--- a/external_imported/vcpkg/ports/json5-parser/portfile.cmake
+++ b/external_imported/vcpkg/ports/json5-parser/portfile.cmake
@@ -9,16 +9,17 @@ vcpkg_from_github(
 	PATCHES 00001-fix-build.patch
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}/json5_parser
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}/json5_parser"
+    OPTIONS
+        -DCMAKE_CXX_STANDARD=11 # Boost v1.84.0 libraries require C++11
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 vcpkg_copy_pdbs()
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/json5-parser)
+vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/json5-parser)
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+configure_file("${SOURCE_PATH}/LICENSE.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
diff --git a/external_imported/vcpkg/ports/json5-parser/vcpkg.json b/external_imported/vcpkg/ports/json5-parser/vcpkg.json
index 13c1e6bb3..2bd120ed6 100644
--- a/external_imported/vcpkg/ports/json5-parser/vcpkg.json
+++ b/external_imported/vcpkg/ports/json5-parser/vcpkg.json
@@ -1,10 +1,18 @@
 {
   "name": "json5-parser",
-  "version-string": "1.0.0",
-  "port-version": 3,
+  "version": "1.0.0",
+  "port-version": 6,
   "description": "An enhancement of the JSON Spirit C++ library to understand json5.",
   "homepage": "https://github.com/Caltech-IPAC/json5_parser",
   "dependencies": [
-    "boost-spirit"
+    "boost-spirit",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ]
 }
diff --git a/external_imported/vcpkg/ports/jsoncons/portfile.cmake b/external_imported/vcpkg/ports/jsoncons/portfile.cmake
index 4d7535efc..023ed3ba0 100644
--- a/external_imported/vcpkg/ports/jsoncons/portfile.cmake
+++ b/external_imported/vcpkg/ports/jsoncons/portfile.cmake
@@ -5,7 +5,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO danielaparker/jsoncons
     REF v${VERSION}
-    SHA512 0cf84a40d5af574352f7e157647f3b6e676b9c4080108a64e5f05edc6ddf6a0d2409772481d4f502c096f2821b03578643fbea0a5f3b5031189e7ce9f9b3e99b
+    SHA512 e876d2596ea2d8aff5c1131c27936ddacc03828880cc680ba1b301629557c690332f0a48889af931c2629a984f17e3318e3e025a15a8b823ac9c4b9523dcaf8e
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/jsoncons/vcpkg.json b/external_imported/vcpkg/ports/jsoncons/vcpkg.json
index 1e37fb1bf..cfd6abac5 100644
--- a/external_imported/vcpkg/ports/jsoncons/vcpkg.json
+++ b/external_imported/vcpkg/ports/jsoncons/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "jsoncons",
-  "version": "0.170.0",
+  "version": "0.173.4",
   "description": "A C++, header-only library for constructing JSON and JSON-like text and binary data formats, with JSON Pointer, JSON Patch, JSON Schema, JSONPath, JMESPath, CSV, MessagePack, CBOR, BSON, UBJSON",
   "homepage": "https://github.com/danielaparker/jsoncons",
   "license": "BSL-1.0",
diff --git a/external_imported/vcpkg/ports/jsoncpp/portfile.cmake b/external_imported/vcpkg/ports/jsoncpp/portfile.cmake
index 84c1a5461..e257f7637 100644
--- a/external_imported/vcpkg/ports/jsoncpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/jsoncpp/portfile.cmake
@@ -1,7 +1,7 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO open-source-parsers/jsoncpp
-    REF 1.9.5
+    REF "${VERSION}"
     SHA512 1d06e044759b1e1a4cc4960189dd7e001a0a4389d7239a6d59295af995a553518e4e0337b4b4b817e70da5d9731a4c98655af90791b6287870b5ff8d73ad8873
     HEAD_REF master
 )
@@ -15,10 +15,11 @@ vcpkg_cmake_configure(
         -DJSONCPP_WITH_CMAKE_PACKAGE=ON
         -DBUILD_STATIC_LIBS=${JSONCPP_STATIC}
         -DJSONCPP_STATIC_WINDOWS_RUNTIME=${STATIC_CRT}
-        -DJSONCPP_WITH_PKGCONFIG_SUPPORT=OFF
+        -DJSONCPP_WITH_PKGCONFIG_SUPPORT=ON
         -DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF
         -DJSONCPP_WITH_TESTS=OFF
         -DJSONCPP_WITH_EXAMPLE=OFF
+        -DBUILD_OBJECT_LIBS=OFF
 )
 
 vcpkg_cmake_install()
@@ -28,5 +29,6 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/jsoncpp)
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 vcpkg_copy_pdbs()
+vcpkg_fixup_pkgconfig()
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/jsoncpp/vcpkg.json b/external_imported/vcpkg/ports/jsoncpp/vcpkg.json
index f9daea0f0..fc31291ae 100644
--- a/external_imported/vcpkg/ports/jsoncpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/jsoncpp/vcpkg.json
@@ -1,8 +1,10 @@
 {
   "name": "jsoncpp",
   "version": "1.9.5",
+  "port-version": 2,
   "description": "jsoncpp is an implementation of a JSON reader and writer in C++. JSON (JavaScript Object Notation) is a lightweight data-interchange format that it is easy to parse and redeable for human.",
   "homepage": "https://github.com/open-source-parsers/jsoncpp",
+  "license": "MIT",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/jsonifier/portfile.cmake b/external_imported/vcpkg/ports/jsonifier/portfile.cmake
new file mode 100644
index 000000000..cdf844058
--- /dev/null
+++ b/external_imported/vcpkg/ports/jsonifier/portfile.cmake
@@ -0,0 +1,19 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO realtimechris/jsonifier
+    REF "v${VERSION}"    
+    SHA512 a6907f01e76af23dde6a22758ff48eea647b24a1b0f39205fdc8d2808c66e691f8e2e682f0296dbab2d3a4b8d7a4ae18a011b4fa411d210108a3b88495e336be
+    HEAD_REF main
+    PATCHES
+        uninstall-head.patch
+)
+
+set(VCPKG_BUILD_TYPE release) # header-only
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+)
+
+vcpkg_cmake_install()
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/License.md")
diff --git a/external_imported/vcpkg/ports/jsonifier/uninstall-head.patch b/external_imported/vcpkg/ports/jsonifier/uninstall-head.patch
new file mode 100644
index 000000000..f00fc12b7
--- /dev/null
+++ b/external_imported/vcpkg/ports/jsonifier/uninstall-head.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fc4ed65..23a9738 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -63,7 +63,7 @@ set_target_properties(
+ 	OUTPUT_NAME "jsonifier"
+ 	CXX_STANDARD_REQUIRED ON
+ 	CXX_EXTENSIONS OFF
+-	PUBLIC_HEADER "${HEADERS}"
++	#PUBLIC_HEADER "${HEADERS}"
+ )
+ 
+ target_include_directories(
diff --git a/external_imported/vcpkg/ports/jsonifier/vcpkg.json b/external_imported/vcpkg/ports/jsonifier/vcpkg.json
new file mode 100644
index 000000000..9a6171736
--- /dev/null
+++ b/external_imported/vcpkg/ports/jsonifier/vcpkg.json
@@ -0,0 +1,14 @@
+{
+  "name": "jsonifier",
+  "version": "0.9.94",
+  "description": "A few classes for parsing and serializing json - very rapidly.",
+  "homepage": "https://github.com/realtimechris/jsonifier",
+  "license": "MIT",
+  "supports": "(windows & x64 & !xbox) | (linux & x64) | (osx & x64)",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/jsonnet/0006-use-cxx17.patch b/external_imported/vcpkg/ports/jsonnet/0006-use-cxx17.patch
new file mode 100644
index 000000000..31174021a
--- /dev/null
+++ b/external_imported/vcpkg/ports/jsonnet/0006-use-cxx17.patch
@@ -0,0 +1,20 @@
+diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
+index e8a0efa..5dfd2e4 100644
+--- a/core/CMakeLists.txt
++++ b/core/CMakeLists.txt
+@@ -34,6 +34,7 @@ if (BUILD_SHARED_BINARIES)
+ add_library(libjsonnet ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE})
+ add_dependencies(libjsonnet stdlib)
+ target_link_libraries(libjsonnet nlohmann_json::nlohmann_json ryml)
++target_compile_features(libjsonnet PRIVATE cxx_std_17)
+ 
+ file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/../include/libjsonnet.h JSONNET_VERSION_DEF
+      REGEX "[#]define[ \t]+LIB_JSONNET_VERSION[ \t]+")
+@@ -60,6 +61,7 @@ if (BUILD_STATIC_LIBS)
+     add_library(libjsonnet_static STATIC ${LIBJSONNET_SOURCE})
+     add_dependencies(libjsonnet_static stdlib)
+     target_link_libraries(libjsonnet_static nlohmann_json::nlohmann_json ryml)
++    target_compile_features(libjsonnet_static PRIVATE cxx_std_17)
+     set_target_properties(libjsonnet_static PROPERTIES OUTPUT_NAME jsonnet)
+     install(TARGETS libjsonnet_static DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+     target_include_directories(libjsonnet_static INTERFACE
diff --git a/external_imported/vcpkg/ports/jsonnet/portfile.cmake b/external_imported/vcpkg/ports/jsonnet/portfile.cmake
index d6b69831d..bab4155d9 100644
--- a/external_imported/vcpkg/ports/jsonnet/portfile.cmake
+++ b/external_imported/vcpkg/ports/jsonnet/portfile.cmake
@@ -5,8 +5,8 @@ endif()
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO google/jsonnet
-  REF v0.18.0
-  SHA512 08a64a4b132df1519292378cef93deb3c60d21636b2a71bce6c13e29cfd93cab465cad77e11f000fb984c5c75a4ca1c92504654fd2e5201343df767ea0e610d1
+  REF "v${VERSION}"
+  SHA512 d46d2521d4389d05f91a16ecd9f181be1853f674a9264e9fac23e413f1084dee947e80682af59603e15e443061a0beb50a30c14c858853e10ed1ae7187d09730
   HEAD_REF master
   PATCHES
     001-enable-msvc.patch
@@ -14,6 +14,7 @@ vcpkg_from_github(
     0003-use-upstream-nlohmann-json.patch
     0004-incorporate-md5.patch
     0005-use-upstream-rapidyaml.patch
+    0006-use-cxx17.patch
 )
 
 # see https://github.com/google/jsonnet/blob/v0.18.0/Makefile#L220
diff --git a/external_imported/vcpkg/ports/jsonnet/vcpkg.json b/external_imported/vcpkg/ports/jsonnet/vcpkg.json
index d22359496..9ef7a123b 100644
--- a/external_imported/vcpkg/ports/jsonnet/vcpkg.json
+++ b/external_imported/vcpkg/ports/jsonnet/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "jsonnet",
-  "version": "0.18.0",
-  "port-version": 1,
+  "version": "0.20.0",
   "description": "Jsonnet - The data templating language",
   "homepage": "https://github.com/google/jsonnet",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/juce/0001-build-allow-setting-JUCE_PLUGINHOST_LADSPA.patch b/external_imported/vcpkg/ports/juce/0001-build-allow-setting-JUCE_PLUGINHOST_LADSPA.patch
new file mode 100644
index 000000000..3c714e65c
--- /dev/null
+++ b/external_imported/vcpkg/ports/juce/0001-build-allow-setting-JUCE_PLUGINHOST_LADSPA.patch
@@ -0,0 +1,15 @@
+diff --git a/extras/AudioPluginHost/CMakeLists.txt b/extras/AudioPluginHost/CMakeLists.txt
+index 852796383..37a5306c9 100644
+--- a/extras/AudioPluginHost/CMakeLists.txt
++++ b/extras/AudioPluginHost/CMakeLists.txt
+@@ -51,7 +51,7 @@ target_compile_definitions(AudioPluginHost PRIVATE
+     JUCE_CONTENT_SHARING=1
+     JUCE_DIRECTSOUND=1
+     JUCE_DISABLE_CAUTIOUS_PARAMETER_ID_CHECKING=1
+-    JUCE_PLUGINHOST_LADSPA=1
++    JUCE_PLUGINHOST_LADSPA=${JUCE_PLUGINHOST_LADSPA}
+     JUCE_PLUGINHOST_LV2=1
+     JUCE_PLUGINHOST_VST3=1
+     JUCE_PLUGINHOST_VST=0
+--
+2.34.1
diff --git a/external_imported/vcpkg/ports/juce/0002-build-linux-find_packages.patch b/external_imported/vcpkg/ports/juce/0002-build-linux-find_packages.patch
new file mode 100644
index 000000000..da51607cc
--- /dev/null
+++ b/external_imported/vcpkg/ports/juce/0002-build-linux-find_packages.patch
@@ -0,0 +1,36 @@
+diff --git a/extras/Build/CMake/JUCEModuleSupport.cmake b/extras/Build/CMake/JUCEModuleSupport.cmake
+index e18dd5e08..45cc9245f 100644
+--- a/extras/Build/CMake/JUCEModuleSupport.cmake
++++ b/extras/Build/CMake/JUCEModuleSupport.cmake
+@@ -353,6 +353,29 @@ function(_juce_create_pkgconfig_target name)
+         return()
+     endif()
+
++    # The package that can be found via find_package instead of pkg-config
++    if("${name}" STREQUAL "freetype2")
++        find_package(Freetype REQUIRED)
++        add_library(juce::pkgconfig_${name} INTERFACE)
++        target_link_libraries(juce::pkgconfig_${name} INTERFACE Freetype::Freetype)
++        return()
++    elseif("${name}" STREQUAL "libcurl")
++        find_package(CURL REQUIRED)
++        add_library(juce::pkgconfig_${name} INTERFACE)
++        target_link_libraries(juce::pkgconfig_${name} INTERFACE CURL::libcurl)
++        return()
++    elseif("${name}" STREQUAL "alsa")
++        find_package(ALSA REQUIRED)
++        add_library(juce::pkgconfig_${name} INTERFACE)
++        target_link_libraries(juce::pkgconfig_${name} INTERFACE ALSA::ALSA)
++        return()
++    elseif("${name}" STREQUAL "gl")
++        find_package(OpenGL REQUIRED)
++        add_library(juce::pkgconfig_${name} INTERFACE)
++        target_link_libraries(juce::pkgconfig_${name} INTERFACE OpenGL::GL)
++        return()
++    endif()
++
+     find_package(PkgConfig REQUIRED)
+     pkg_check_modules(${name} ${ARGN})
+
+--
+2.34.1
diff --git a/external_imported/vcpkg/ports/juce/0003-build-forward-vcpkg-toolchain.patch b/external_imported/vcpkg/ports/juce/0003-build-forward-vcpkg-toolchain.patch
new file mode 100644
index 000000000..02342ebb1
--- /dev/null
+++ b/external_imported/vcpkg/ports/juce/0003-build-forward-vcpkg-toolchain.patch
@@ -0,0 +1,32 @@
+diff --git a/extras/Build/juceaide/CMakeLists.txt b/extras/Build/juceaide/CMakeLists.txt
+index 163f203cc..f4cdba7f7 100644
+--- a/extras/Build/juceaide/CMakeLists.txt
++++ b/extras/Build/juceaide/CMakeLists.txt
+@@ -111,6 +111,25 @@ else()
+             "-DCMAKE_BUILD_TYPE=Debug"
+             "-DJUCE_BUILD_HELPER_TOOLS=ON"
+             "-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}"
++            # forward vcpkg flags
++            "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}"
++            "-DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}"
++            "-DCMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION=${CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION}"
++            "-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=${CMAKE_EXPORT_NO_PACKAGE_REGISTRY}"
++            "-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=${CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY}"
++            "-DCMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY=${CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY}"
++            "-DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP}"
++            "-DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE}"
++            "-DVCPKG_APPLOCAL_DEPS=${VCPKG_APPLOCAL_DEPS}"
++            "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}"
++            "-DVCPKG_CRT_LINKAGE=${VCPKG_CRT_LINKAGE}"
++            "-DVCPKG_MANIFEST_INSTALL=${VCPKG_MANIFEST_INSTALL}"
++            "-DVCPKG_PLATFORM_TOOLSET=${VCPKG_PLATFORM_TOOLSET}"
++            "-DVCPKG_SET_CHARSET_FLAG=${VCPKG_SET_CHARSET_FLAG}"
++            "-DVCPKG_TARGET_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE}"
++            "-DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET}"
++            "-D_VCPKG_INSTALLED_DIR=${_VCPKG_INSTALLED_DIR}"
++            "-D_VCPKG_ROOT_DIR=${_VCPKG_ROOT_DIR}"
+             ${extra_compiler_flag_arguments}
+         WORKING_DIRECTORY "${JUCE_SOURCE_DIR}"
+         OUTPUT_VARIABLE command_output
+--
+2.34.1
diff --git a/external_imported/vcpkg/ports/juce/0004-install-paths.patch b/external_imported/vcpkg/ports/juce/0004-install-paths.patch
new file mode 100644
index 000000000..ccbd4d0e7
--- /dev/null
+++ b/external_imported/vcpkg/ports/juce/0004-install-paths.patch
@@ -0,0 +1,49 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4262a9852..a46b51f1a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -167,14 +167,14 @@ if(("${CMAKE_SOURCE_DIR}" STREQUAL "${JUCE_SOURCE_DIR}") AND (NOT JUCE_BUILD_HEL
+     _juce_add_lv2_manifest_helper_target()
+
+     if(TARGET juce_lv2_helper)
+-        install(TARGETS juce_lv2_helper EXPORT LV2_HELPER DESTINATION "bin/JUCE-${JUCE_VERSION}")
++        install(TARGETS juce_lv2_helper EXPORT LV2_HELPER DESTINATION "${JUCE_TOOL_INSTALL_DIR}")
+         install(EXPORT LV2_HELPER NAMESPACE juce:: DESTINATION "${JUCE_INSTALL_DESTINATION}")
+     endif()
+
+     _juce_add_vst3_manifest_helper_target()
+
+     if(TARGET juce_vst3_helper)
+-        install(TARGETS juce_vst3_helper EXPORT VST3_HELPER DESTINATION "bin/JUCE-${JUCE_VERSION}")
++        install(TARGETS juce_vst3_helper EXPORT VST3_HELPER DESTINATION "${JUCE_TOOL_INSTALL_DIR}")
+         install(EXPORT VST3_HELPER NAMESPACE juce:: DESTINATION "${JUCE_INSTALL_DESTINATION}")
+     endif()
+ endif()
+diff --git a/extras/Build/juceaide/CMakeLists.txt b/extras/Build/juceaide/CMakeLists.txt
+index f4cdba7f7..fab57fdb4 100644
+--- a/extras/Build/juceaide/CMakeLists.txt
++++ b/extras/Build/juceaide/CMakeLists.txt
+@@ -164,7 +164,7 @@ else()
+
+     add_executable(juce::juceaide ALIAS juceaide)
+
+-    set(JUCE_TOOL_INSTALL_DIR "bin/JUCE-${JUCE_VERSION}" CACHE STRING
++    set(JUCE_TOOL_INSTALL_DIR "tools/juce" CACHE STRING
+         "The location, relative to the install prefix, where juceaide will be installed")
+
+     install(PROGRAMS "${imported_location}" DESTINATION "${JUCE_TOOL_INSTALL_DIR}")
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a46b51f1a..38f863a3e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -123,7 +123,7 @@ write_basic_package_version_file("${JUCE_BINARY_DIR}/JUCEConfigVersion.cmake"
+     COMPATIBILITY ExactVersion
+     ${extra_version_arg})
+
+-set(JUCE_INSTALL_DESTINATION "lib/cmake/JUCE-${JUCE_VERSION}" CACHE STRING
++set(JUCE_INSTALL_DESTINATION "share/juce" CACHE STRING
+     "The location, relative to the install prefix, where the JUCE config file will be installed")
+
+ set(JUCE_MODULE_PATH "include/JUCE-${JUCE_VERSION}/modules")
+--
+2.34.1
diff --git a/external_imported/vcpkg/ports/juce/portfile.cmake b/external_imported/vcpkg/ports/juce/portfile.cmake
new file mode 100644
index 000000000..d81f211ee
--- /dev/null
+++ b/external_imported/vcpkg/ports/juce/portfile.cmake
@@ -0,0 +1,155 @@
+vcpkg_from_github(
+  OUT_SOURCE_PATH SOURCE_PATH
+  REPO juce-framework/JUCE
+  REF "${VERSION}"
+  SHA512 e8519ca4ee55f126e14d7c927e2f36e7c30117a34da84f2b4e730afcea4a864b07455ad3f89d751fa47c8c155548b0c3150a667f1a9d199e582eadd146b6c697
+  HEAD_REF master
+  PATCHES
+  "0001-build-allow-setting-JUCE_PLUGINHOST_LADSPA.patch"
+  "0002-build-linux-find_packages.patch"
+  "0003-build-forward-vcpkg-toolchain.patch"
+  "0004-install-paths.patch"
+)
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+FEATURES
+  "extras"      JUCE_BUILD_EXTRAS
+  "ladspa"      JUCE_PLUGINHOST_LADSPA
+  "jack"        JUCE_JACK
+  "curl"        JUCE_USE_CURL
+  "freetype"    JUCE_USE_FREETYPE
+  "xcursor"     JUCE_USE_XCURSOR
+  "xinerama"    JUCE_USE_XINERAMA
+  "xrandr"      JUCE_USE_XRANDR
+  "xrender"     JUCE_USE_XRENDER
+  "web-browser" JUCE_WEB_BROWSER
+  "opengl"      JUCE_OPENGL
+)
+# Based on https://github.com/juce-framework/JUCE/blob/master/docs/Linux%20Dependencies.md
+if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
+  message("juce currently requires the following programs from the system package manager:
+  libx11-dev libxcomposite-dev libxext-dev
+On Ubuntu derivatives:
+    sudo apt install libx11-dev libxcomposite-dev libxext-dev
+")
+  if(JUCE_OPENGL)
+    message("juce with opengl feature requires the following packages via the system package manager:
+  libglu1-mesa-dev mesa-common-dev
+On Ubuntu derivatives:
+  sudo apt install libglu1-mesa-dev mesa-common-dev
+")
+  endif()
+
+  if(${JUCE_PLUGINHOST_LADSPA})
+    message("juce with ladspa feature requires the following packages via the system package manager:
+  ladspa-sdk
+On Ubuntu derivatives:
+  sudo apt install ladspa-sdk
+")
+  endif()
+
+  if(JUCE_USE_XCURSOR)
+    message("juce with xcursor feature requires the following packages via the system package manager:
+  libxcursor-dev
+On Ubuntu derivatives:
+  sudo apt install libxcursor-dev
+")
+  endif()
+
+  if(JUCE_USE_XINERAMA)
+    message("juce with xinerama feature requires the following packages via the system package manager:
+  libxinerama-dev
+On Ubuntu derivatives:
+  sudo apt install libxinerama-dev
+")
+  endif()
+
+  if(JUCE_USE_XRANDR)
+    message("juce with xrandr feature requires the following packages via the system package manager:
+  libxrandr-dev
+On Ubuntu derivatives:
+  sudo apt install libxrandr-dev
+")
+  endif()
+
+  if(JUCE_USE_XRENDER)
+    message("juce with xrender feature requires the following packages via the system package manager:
+  libxrender-dev
+On Ubuntu derivatives:
+  sudo apt install libxrender-dev
+")
+  endif()
+
+  if(JUCE_WEB_BROWSER)
+    message("juce with web-browser feature requires the following packages via the system package manager:
+  libwebkit2gtk-4.0-dev
+On Ubuntu derivatives:
+  sudo apt install libwebkit2gtk-4.0-dev
+")
+  endif()
+endif()
+
+vcpkg_cmake_configure(
+  SOURCE_PATH "${SOURCE_PATH}"
+  OPTIONS
+  -DJUCE_ENABLE_MODULE_SOURCE_GROUPS=ON
+  ${FEATURE_OPTIONS}
+  MAYBE_UNUSED_VARIABLES
+    JUCE_PLUGINHOST_LADSPA
+    JUCE_JACK
+    JUCE_OPENGL
+    JUCE_USE_CURL
+    JUCE_USE_FREETYPE
+    JUCE_USE_XCURSOR
+    JUCE_USE_XINERAMA
+    JUCE_USE_XRANDR
+    JUCE_USE_XRENDER
+    JUCE_WEB_BROWSER
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup()
+vcpkg_fixup_pkgconfig()
+vcpkg_copy_pdbs()
+
+# Copy tools
+file(GLOB JUCE_TOOLS "${CURRENT_PACKAGES_DIR}/bin/JUCE-${VERSION}/*")
+foreach(JUCE_TOOL_PATH IN LISTS JUCE_TOOLS)
+  get_filename_component(JUCE_TOOL "${JUCE_TOOL_PATH}" NAME_WLE)
+  get_filename_component(JUCE_TOOL_DIR "${JUCE_TOOL_PATH}" DIRECTORY)
+  vcpkg_copy_tools(TOOL_NAMES ${JUCE_TOOL} SEARCH_DIR "${JUCE_TOOL_DIR}")
+endforeach()
+
+# Copy extras tools
+if(JUCE_BUILD_EXTRAS)
+  file(GLOB JUCE_EXTRA_TOOLS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/extras/*/*_artefacts/Release/*")
+  foreach(JUCE_EXTRA_TOOL_PATH IN LISTS JUCE_EXTRA_TOOLS)
+    get_filename_component(JUCE_EXTRA_TOOL "${JUCE_EXTRA_TOOL_PATH}" NAME_WLE)
+    get_filename_component(JUCE_EXTRA_TOOL_DIR "${JUCE_EXTRA_TOOL_PATH}" DIRECTORY)
+    vcpkg_copy_tools(TOOL_NAMES ${JUCE_EXTRA_TOOL} SEARCH_DIR "${JUCE_EXTRA_TOOL_DIR}")
+  endforeach()
+endif()
+
+# Copy JUCE modules including the cpp/cmake files
+file(GLOB JUCE_MODULES_FOLDERS "${CURRENT_PACKAGES_DIR}/include/JUCE-${VERSION}/modules/*")
+foreach(JUCE_MODULE_FOLDER IN LISTS JUCE_MODULES_FOLDERS)
+  file(COPY "${JUCE_MODULE_FOLDER}" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+endforeach()
+
+# Remove duplicate tools directories
+file(REMOVE_RECURSE
+"${CURRENT_PACKAGES_DIR}/bin"
+"${CURRENT_PACKAGES_DIR}/debug/bin"
+)
+
+# Remove duplicate debug files
+file(REMOVE_RECURSE
+"${CURRENT_PACKAGES_DIR}/debug/"
+)
+
+# Copy license
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
+
+# Copy usage examples
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage"
+     DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/juce/usage b/external_imported/vcpkg/ports/juce/usage
new file mode 100644
index 000000000..a9567433b
--- /dev/null
+++ b/external_imported/vcpkg/ports/juce/usage
@@ -0,0 +1,30 @@
+juce provides the following common CMake targets:
+
+    find_package(JUCE CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE
+        juce::juce_core
+        juce::juce_audio_basics
+        juce::juce_events
+        juce::juce_audio_devices
+        juce::juce_recommended_config_flags
+        juce::juce_recommended_lto_flags
+        juce::juce_recommended_warning_flags)
+
+See the Juce CMake API documentation and the License for details on how to create targets. Here are other available targets:
+
+        juce::juce_graphics
+        juce::juce_gui_basics
+        juce::juce_gui_extra
+        juce::juce_opengl
+        juce::juce_analytics
+        juce::juce_audio_formats
+        juce::juce_audio_plugin_client
+        juce::juce_audio_processors
+        juce::juce_audio_utils
+        juce::juce_box2d
+        juce::juce_cryptography
+        juce::juce_data_structures
+        juce::juce_dsp
+        juce::juce_osc
+        juce::juce_product_unlocking
+        juce::juce_video
diff --git a/external_imported/vcpkg/ports/juce/vcpkg.json b/external_imported/vcpkg/ports/juce/vcpkg.json
new file mode 100644
index 000000000..10a37cd14
--- /dev/null
+++ b/external_imported/vcpkg/ports/juce/vcpkg.json
@@ -0,0 +1,105 @@
+{
+  "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
+  "name": "juce",
+  "version": "7.0.9",
+  "description": "Open-source cross-platform C++ application framework for desktop and mobile applications, including VST, VST3, AU, AUv3, AAX and LV2 audio plug-ins and plug-in hosts",
+  "homepage": "https://juce.com",
+  "license": null,
+  "supports": "!android & !uwp",
+  "dependencies": [
+    {
+      "name": "alsa",
+      "platform": "linux"
+    },
+    {
+      "name": "juce",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
+  "default-features": [
+    "curl",
+    "freetype",
+    "jack",
+    "opengl",
+    "xcursor",
+    "xinerama",
+    "xrandr",
+    "xrender"
+  ],
+  "features": {
+    "curl": {
+      "description": "Enable CURL support",
+      "dependencies": [
+        "curl"
+      ]
+    },
+    "extras": {
+      "description": "Enable JUCE Extras such as Projucer, AudioPluginHost, BinaryBuilder."
+    },
+    "freetype": {
+      "description": "Enable FreeType support",
+      "dependencies": [
+        "freetype"
+      ]
+    },
+    "jack": {
+      "description": "Enable JACK audio support",
+      "dependencies": [
+        {
+          "name": "jack2",
+          "platform": "linux"
+        }
+      ]
+    },
+    "ladspa": {
+      "description": "Enable LADSPA plugin host support."
+    },
+    "opengl": {
+      "description": "Enable OpenGL support",
+      "dependencies": [
+        "opengl"
+      ]
+    },
+    "web-browser": {
+      "description": "Enable WebBrowser support"
+    },
+    "xcursor": {
+      "description": "Enable XCursor support"
+    },
+    "xinerama": {
+      "description": "Enable Xinerama support",
+      "dependencies": [
+        {
+          "name": "libxinerama",
+          "platform": "linux"
+        }
+      ]
+    },
+    "xrandr": {
+      "description": "Enable XRandR support",
+      "dependencies": [
+        {
+          "name": "libxrandr",
+          "platform": "linux"
+        }
+      ]
+    },
+    "xrender": {
+      "description": "Enable XRender support",
+      "dependencies": [
+        {
+          "name": "libxrender",
+          "platform": "linux"
+        }
+      ]
+    }
+  }
+}
diff --git a/external_imported/vcpkg/ports/kaitai-struct-cpp-stl-runtime/portfile.cmake b/external_imported/vcpkg/ports/kaitai-struct-cpp-stl-runtime/portfile.cmake
index 48c3b8079..4c54b3176 100644
--- a/external_imported/vcpkg/ports/kaitai-struct-cpp-stl-runtime/portfile.cmake
+++ b/external_imported/vcpkg/ports/kaitai-struct-cpp-stl-runtime/portfile.cmake
@@ -1,10 +1,8 @@
-vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO kaitai-io/kaitai_struct_cpp_stl_runtime
-    REF 0.10
-    SHA512 27a0975edffe40a68784a3f5c639937fe70f634d97b7f3aae7d47db31ab4a81442c0707db562ac0775cf28012dc4172af52cc97bd02f2edecf713c57038f5b6d
+    REF ${VERSION}
+    SHA512 53b26627e281a12b6c1d217e8b439aba7dabf6fc55d3edc27e70f7757851f060f4039db3a16c48c5c60a715671b855b51e527f154df7d94547943f865c9d4b9a
     HEAD_REF master
 )
 
@@ -17,6 +15,7 @@ vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS    
         -DSTRING_ENCODING_TYPE=${STRING_ENCODING_TYPE}
+        -DBUILD_TESTS=OFF
 )
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/kaitai-struct-cpp-stl-runtime/vcpkg.json b/external_imported/vcpkg/ports/kaitai-struct-cpp-stl-runtime/vcpkg.json
index 896cb6f3e..07264154c 100644
--- a/external_imported/vcpkg/ports/kaitai-struct-cpp-stl-runtime/vcpkg.json
+++ b/external_imported/vcpkg/ports/kaitai-struct-cpp-stl-runtime/vcpkg.json
@@ -1,11 +1,11 @@
 {
   "name": "kaitai-struct-cpp-stl-runtime",
-  "version": "0.10",
+  "version": "0.10.1",
+  "port-version": 1,
   "description": "Kaitai Struct is a declarative language used for describe various binary data structures, laid out in files or in memory. This library implements Kaitai Struct API for C++ using STL",
   "homepage": "http://kaitai.io/",
   "documentation": "https://doc.kaitai.io/lang_cpp_stl.html",
   "license": "MIT",
-  "supports": "!staticcrt",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/kd-soap/portfile.cmake b/external_imported/vcpkg/ports/kd-soap/portfile.cmake
deleted file mode 100644
index 03f99fab8..000000000
--- a/external_imported/vcpkg/ports/kd-soap/portfile.cmake
+++ /dev/null
@@ -1,32 +0,0 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO KDAB/KDSoap
-    REF fb0e905e242c2044fd25683a406eb6d369db052f # kdsoap-1.9.0
-    SHA512 30f78602702f2bb77f72bf0637b413d70976cf10789b18d1eb9c097f6b3821b86e75d0ae921454b2d39b7d023f479dc089cde1915533a37054f9b26893f611d3
-    HEAD_REF master
-)
-
-string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" KDSoap_STATIC)
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-    OPTIONS
-        -DKDSoap_STATIC=${KDSoap_STATIC}
-        -DKDSoap_EXAMPLES=OFF
-)
-
-vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KDSoap TARGET_PATH share/KDSoap)
-
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools)
-file(RENAME ${CURRENT_PACKAGES_DIR}/bin/kdwsdl2cpp${VCPKG_TARGET_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/kdwsdl2cpp${VCPKG_TARGET_EXECUTABLE_SUFFIX})
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/kdwsdl2cpp${VCPKG_TARGET_EXECUTABLE_SUFFIX})
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
-endif()
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-
-file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/external_imported/vcpkg/ports/kd-soap/vcpkg.json b/external_imported/vcpkg/ports/kd-soap/vcpkg.json
deleted file mode 100644
index 3cd11e0e4..000000000
--- a/external_imported/vcpkg/ports/kd-soap/vcpkg.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "name": "kd-soap",
-  "version-string": "1.9.0",
-  "port-version": 1,
-  "description": "A Qt-based client-side and server-side SOAP component",
-  "homepage": "https://www.kdab.com/products/kd-soap",
-  "dependencies": [
-    {
-      "name": "qt5-base",
-      "default-features": false
-    }
-  ]
-}
diff --git a/external_imported/vcpkg/ports/kdalgorithms/portfile.cmake b/external_imported/vcpkg/ports/kdalgorithms/portfile.cmake
index 97aff2baf..f3a9b1c55 100644
--- a/external_imported/vcpkg/ports/kdalgorithms/portfile.cmake
+++ b/external_imported/vcpkg/ports/kdalgorithms/portfile.cmake
@@ -2,12 +2,11 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDAB/KDAlgorithms
-    REF 93023b7b6640a227cfa6b2e7f1b8e72d10a0b981
-    SHA512 151488c5ba30fceee204278e620bbc509464cb993d4207891ba627cb4384dc585927336f263ea80bfeb46f5100fdb31edcef13482d4b7f70b79480d1b153f087
-    HEAD_REF master
+    REF ${VERSION}
+    SHA512 2229712954c377e9167b78fc931988f33c82349baeae9a64e3506f66fd96508e8482ce777c4ef8928c2ab38cbeffc413e96c75a9f41902080230f8c434782232
 )
 
-file(INSTALL "${SOURCE_PATH}/src/kdalgorithms.h" "${SOURCE_PATH}/src/bits"
+file(INSTALL "${SOURCE_PATH}/src/kdalgorithms.h" "${SOURCE_PATH}/src/kdalgorithms_bits"
     DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}")
 
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/external_imported/vcpkg/ports/kdalgorithms/vcpkg.json b/external_imported/vcpkg/ports/kdalgorithms/vcpkg.json
index a62296186..abcbff625 100644
--- a/external_imported/vcpkg/ports/kdalgorithms/vcpkg.json
+++ b/external_imported/vcpkg/ports/kdalgorithms/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kdalgorithms",
-  "version-date": "2023-02-11",
+  "version": "1.2",
   "description": "KDAB's algorithm helpers for C++14 and up",
   "homepage": "https://github.com/KDAB/KDAlgorithms",
   "license": "MIT"
diff --git a/external_imported/vcpkg/ports/kdbindings/portfile.cmake b/external_imported/vcpkg/ports/kdbindings/portfile.cmake
index 736e8efbe..4591e66d5 100644
--- a/external_imported/vcpkg/ports/kdbindings/portfile.cmake
+++ b/external_imported/vcpkg/ports/kdbindings/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO KDAB/KDBindings
-  REF bbf790fc94f3018781f32be53c6086aedc0f74ec
-  SHA512 4303f8e73b376e851d40cab99b848788ae2aff00e0e4ec0006655d8ef9373eebe5e04f734e78037e257d7a5101739b912da9dab15bf1985f204b31224d9c53c5
+  REF "v${VERSION}"
+  SHA512 b66403ad4eecc5e8216600d67f29260eb9981f0b93517fa1a85106a52be4b3ffcd482d1dda6cdc5993f46ffa6cd0e10513cd7ce1fec3dee72ec9d50fc5887a46
   HEAD_REF main
 )
 
diff --git a/external_imported/vcpkg/ports/kdbindings/vcpkg.json b/external_imported/vcpkg/ports/kdbindings/vcpkg.json
index 0797c2cb1..c9ebdf9f0 100644
--- a/external_imported/vcpkg/ports/kdbindings/vcpkg.json
+++ b/external_imported/vcpkg/ports/kdbindings/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kdbindings",
-  "version": "1.0.0",
+  "version": "1.0.3",
   "description": "Reactive programming & data binding in C++",
   "homepage": "https://github.com/KDAB/KDBindings",
   "license": "MIT OR BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/kddockwidgets/fix_find_package.patch b/external_imported/vcpkg/ports/kddockwidgets/fix_find_package.patch
deleted file mode 100644
index 01363a341..000000000
--- a/external_imported/vcpkg/ports/kddockwidgets/fix_find_package.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6c174b89a..b83bace53 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -127,8 +127,8 @@ endif()
- if(${PROJECT_NAME}_QT6)
-   set(Qt_VERSION_MAJOR 6)
-   set(QT_MIN_VERSION "6.0.0")
--  find_package(Qt6Widgets ${QT_MIN_VERSION} REQUIRED)
--  find_package(Qt6Test ${QT_MIN_VERSION} REQUIRED)
-+  find_package(Qt6 ${QT_MIN_VERSION} COMPONENTS Widgets REQUIRED)
-+  find_package(Qt6 ${QT_MIN_VERSION} OPTIONAL_COMPONENTS Test)
-   set(${PROJECT_NAME}_LIBRARY_QTID "-qt6")
- else()
-   set(Qt_VERSION_MAJOR 5)
diff --git a/external_imported/vcpkg/ports/kddockwidgets/portfile.cmake b/external_imported/vcpkg/ports/kddockwidgets/portfile.cmake
index 594f5fbce..878d02814 100644
--- a/external_imported/vcpkg/ports/kddockwidgets/portfile.cmake
+++ b/external_imported/vcpkg/ports/kddockwidgets/portfile.cmake
@@ -1,11 +1,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDAB/KDDockWidgets
-    REF 9990300006854afa4b4fa796912da067e770046a 
-    SHA512 2207b3c021957d9be8652cad24c0b5e37b07fa02ffeeeb7dab57feaeade7973b580b853d6b69db15015b62cc1397459e27d032131292baaeb17a0633e287fa3c 
+    REF "v${VERSION}" 
+    SHA512 4dccf24e901ab58d645478bc62ff9e72224dc11c3f39c53f5be5b188ece1bf8c682d50a42ece7a38400adfeb6147336795fcb86e903fd0957949c83f852c9b53 
     HEAD_REF master
-    PATCHES
-        fix_find_package.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" KD_STATIC)
@@ -24,7 +22,6 @@ vcpkg_cmake_configure(
         ${_qarg_OPTIONS}
         -DKDDockWidgets_QT6=ON
         -DKDDockWidgets_STATIC=${KD_STATIC}
-        -DKDDockWidgets_QTQUICK=OFF
         -DKDDockWidgets_PYTHON_BINDINGS=OFF
         -DKDDockWidgets_EXAMPLES=OFF
 )
@@ -39,4 +36,4 @@ endif()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/external_imported/vcpkg/ports/kddockwidgets/vcpkg.json b/external_imported/vcpkg/ports/kddockwidgets/vcpkg.json
index 86b0771b6..3b688eb34 100644
--- a/external_imported/vcpkg/ports/kddockwidgets/vcpkg.json
+++ b/external_imported/vcpkg/ports/kddockwidgets/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kddockwidgets",
-  "version": "1.5.0",
+  "version": "2.0.0",
   "description": "KDAB's Dock Widget Framework for Qt",
   "homepage": "https://www.kdab.com/development-resources/qt-tools/kddockwidgets/",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/kdsoap/portfile.cmake b/external_imported/vcpkg/ports/kdsoap/portfile.cmake
new file mode 100644
index 000000000..3b56a95c0
--- /dev/null
+++ b/external_imported/vcpkg/ports/kdsoap/portfile.cmake
@@ -0,0 +1,35 @@
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://github.com/KDAB/KDSoap/releases/download/kdsoap-${VERSION}/kdsoap-${VERSION}.tar.gz"
+    FILENAME "kdsoap-${VERSION}.tar.gz"
+    SHA512 6ed5cd6a0d02a9faf6881facbd28391c553b3671512153ecd058ab53bfbe9d3f0afa3704d580e66010ddf6a3de7e578a632339f8c1ae7529c28f9d5fd7d1eb5f
+)
+
+vcpkg_extract_source_archive(
+    SOURCE_PATH
+    ARCHIVE "${ARCHIVE}"
+)
+
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" KDSoap_STATIC)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DKDSoap_QT6=ON
+        -DKDSoap_STATIC=${KDSoap_STATIC}
+        -DKDSoap_EXAMPLES=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME KDSoap-qt6 CONFIG_PATH lib/cmake/KDSoap-qt6)
+
+vcpkg_copy_tools(TOOL_NAMES kdwsdl2cpp-qt6 AUTO_CLEAN)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/external_imported/vcpkg/ports/kdsoap/vcpkg.json b/external_imported/vcpkg/ports/kdsoap/vcpkg.json
new file mode 100644
index 000000000..ecadec916
--- /dev/null
+++ b/external_imported/vcpkg/ports/kdsoap/vcpkg.json
@@ -0,0 +1,21 @@
+{
+  "name": "kdsoap",
+  "version": "2.2.0",
+  "description": "A Qt-based client-side and server-side SOAP component",
+  "homepage": "https://www.kdab.com/products/kd-soap",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "qtbase",
+      "default-features": false
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/kealib/hdf5_include.patch b/external_imported/vcpkg/ports/kealib/hdf5_include.patch
deleted file mode 100644
index 19598c56b..000000000
--- a/external_imported/vcpkg/ports/kealib/hdf5_include.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/include/libkea/KEAAttributeTable.h b/include/libkea/KEAAttributeTable.h
-index 95a5d7f..fbfebc1 100644
---- a/include/libkea/KEAAttributeTable.h
-+++ b/include/libkea/KEAAttributeTable.h
-@@ -37,7 +37,7 @@
- #include <map>
- #include <math.h>
- 
--#include "H5Cpp.h"
-+#include <H5Cpp.h>
- 
- #include "libkea/KEACommon.h"
- #include "libkea/KEAException.h"
-diff --git a/include/libkea/KEAAttributeTableFile.h b/include/libkea/KEAAttributeTableFile.h
-index 9987a7c..39dbb21 100644
---- a/include/libkea/KEAAttributeTableFile.h
-+++ b/include/libkea/KEAAttributeTableFile.h
-@@ -35,7 +35,7 @@
- #include <string>
- #include <vector>
- 
--#include "H5Cpp.h"
-+#include <H5Cpp.h>
- 
- #include "libkea/KEACommon.h"
- #include "libkea/KEAException.h"
-diff --git a/include/libkea/KEAAttributeTableInMem.h b/include/libkea/KEAAttributeTableInMem.h
-index b4f7fad..6a8a8b7 100644
---- a/include/libkea/KEAAttributeTableInMem.h
-+++ b/include/libkea/KEAAttributeTableInMem.h
-@@ -35,7 +35,7 @@
- #include <string>
- #include <vector>
- 
--#include "H5Cpp.h"
-+#include <H5Cpp.h>
- 
- #include "libkea/KEACommon.h"
- #include "libkea/KEAException.h"
-diff --git a/include/libkea/KEACommon.h b/include/libkea/KEACommon.h
-index 3175c93..67b02a2 100644
---- a/include/libkea/KEACommon.h
-+++ b/include/libkea/KEACommon.h
-@@ -38,7 +38,7 @@
- #include <string>
- #include <vector>
- 
--#include "H5Cpp.h"
-+#include <H5Cpp.h>
- 
- // MSVC 2008 uses different names....
- #ifdef _MSC_VER
-diff --git a/include/libkea/KEAImageIO.h b/include/libkea/KEAImageIO.h
-index d510cae..4c2aa97 100644
---- a/include/libkea/KEAImageIO.h
-+++ b/include/libkea/KEAImageIO.h
-@@ -35,7 +35,7 @@
- #include <string>
- #include <vector>
- 
--#include "H5Cpp.h"
-+#include <H5Cpp.h>
- 
- #include "libkea/KEACommon.h"
- #include "libkea/KEAException.h"
diff --git a/external_imported/vcpkg/ports/kealib/no-kea-config-script.diff b/external_imported/vcpkg/ports/kealib/no-kea-config-script.diff
new file mode 100644
index 000000000..2b79093ed
--- /dev/null
+++ b/external_imported/vcpkg/ports/kealib/no-kea-config-script.diff
@@ -0,0 +1,14 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 90f64d6..17f2929 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -222,9 +222,7 @@ add_test(NAME test1 COMMAND src/test1)
+ ###############################################################################
+ # Installation
+ if(MSVC)
+-    install (FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_BINARY_DIR}/kea-config.bat" DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ else()
+-    install (FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_BINARY_DIR}/kea-config" DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ endif(MSVC)    
+ install (FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_HEADER_DIR}/libkea/kea-config.h" DESTINATION include/libkea)
+ ###############################################################################
diff --git a/external_imported/vcpkg/ports/kealib/portfile.cmake b/external_imported/vcpkg/ports/kealib/portfile.cmake
index eabf0c46d..3367edf92 100644
--- a/external_imported/vcpkg/ports/kealib/portfile.cmake
+++ b/external_imported/vcpkg/ports/kealib/portfile.cmake
@@ -1,25 +1,26 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ubarsc/kealib
-    REF  4984102cf5867105a28ae754689566217309d120 #1.4.14
-    SHA512 06628996757bc9cffc5af0f03468ec32246980b6f72f7f1c88a489a8a2aed70924115df0726fcbb9851e44030c6a44ee0f3137660de43af421dec1eab81cc147
+    REF "kealib-${VERSION}"
+    SHA512 ccaaf9d5031eac32bf1a0e6b9e9efb4f5245fc730d33bd9931efb1a6f529990c6da8ddd400ec0d58ee527675057b74c81393d263c9b182ac5f9a8796273b001f
     HEAD_REF master
-    PATCHES hdf5_include.patch
+    PATCHES
+        no-kea-config-script.diff
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DLIBKEA_WITH_GDAL=OFF
+        -DCMAKE_DISABLE_FIND_PACKAGE_GDAL=ON
 )
 
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/bin")
-endif()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libkea PACKAGE_NAME libkea DO_NOT_DELETE_PARENT_CONFIG_PATH)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Kealib)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/external_imported/vcpkg/ports/kealib/usage b/external_imported/vcpkg/ports/kealib/usage
new file mode 100644
index 000000000..b8a1ab443
--- /dev/null
+++ b/external_imported/vcpkg/ports/kealib/usage
@@ -0,0 +1,4 @@
+kealib provides CMake targets:
+
+  find_package(Kealib CONFIG REQUIRED)
+  target_link_libraries(main PRIVATE Kealib::Kealib)
diff --git a/external_imported/vcpkg/ports/kealib/vcpkg.json b/external_imported/vcpkg/ports/kealib/vcpkg.json
index d956725b9..7e324a5a2 100644
--- a/external_imported/vcpkg/ports/kealib/vcpkg.json
+++ b/external_imported/vcpkg/ports/kealib/vcpkg.json
@@ -1,8 +1,9 @@
 {
   "name": "kealib",
-  "version": "1.4.14",
+  "version": "1.5.3",
   "description": "KEALib provides an implementation of the GDAL data model using HDF5.",
   "homepage": "https://github.com/ubarsc/kealib",
+  "license": "MIT",
   "dependencies": [
     {
       "name": "hdf5",
@@ -13,6 +14,10 @@
     {
       "name": "vcpkg-cmake",
       "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/keccak-tiny/CMakeLists.txt b/external_imported/vcpkg/ports/keccak-tiny/CMakeLists.txt
new file mode 100644
index 000000000..b6f937763
--- /dev/null
+++ b/external_imported/vcpkg/ports/keccak-tiny/CMakeLists.txt
@@ -0,0 +1,46 @@
+cmake_minimum_required(VERSION 3.19)
+project(keccak-tiny VERSION 2014.09.08 LANGUAGES C)
+
+set(Header_Files "${PROJECT_NAME}.h")
+set(Source_Files "${PROJECT_NAME}-unrolled.c")
+
+add_library("${PROJECT_NAME}" "${Header_Files}" "${Source_Files}")
+
+include(GNUInstallDirs)
+target_include_directories(
+  "${PROJECT_NAME}"
+  PUBLIC
+  "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>"
+  "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
+)
+target_compile_features("${PROJECT_NAME}" PRIVATE c_std_90)
+set_target_properties("${PROJECT_NAME}" PROPERTIES C_VISIBILITY_PRESET hidden
+                      PUBLIC_HEADER "${Header_Files}")
+
+install(
+  TARGETS                   "${PROJECT_NAME}"
+  EXPORT                    "unofficial-${PROJECT_NAME}Config"
+  RUNTIME       DESTINATION "${CMAKE_INSTALL_BINDIR}"
+  ARCHIVE       DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+  LIBRARY       DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+  PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+)
+
+include(CMakePackageConfigHelpers)
+set(VERSION_FILE_PATH "${CMAKE_CURRENT_BINARY_DIR}/unofficial-${PROJECT_NAME}ConfigVersion.cmake")
+write_basic_package_version_file(
+  "${VERSION_FILE_PATH}"
+  VERSION       "${PROJECT_VERSION}"
+  COMPATIBILITY SameMajorVersion
+)
+install(FILES "${VERSION_FILE_PATH}" DESTINATION "share/unofficial-${PROJECT_NAME}")
+
+install(FILES ${Header_Files} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+
+install(
+  EXPORT      "unofficial-${PROJECT_NAME}Config"
+  FILE        "unofficial-${PROJECT_NAME}Config.cmake"
+  NAMESPACE   "unofficial::${PROJECT_NAME}::"
+  DESTINATION "share/unofficial-${PROJECT_NAME}")
+
+export(PACKAGE "${PROJECT_NAME}")
diff --git a/external_imported/vcpkg/ports/keccak-tiny/portfile.cmake b/external_imported/vcpkg/ports/keccak-tiny/portfile.cmake
new file mode 100644
index 000000000..395b4b269
--- /dev/null
+++ b/external_imported/vcpkg/ports/keccak-tiny/portfile.cmake
@@ -0,0 +1,28 @@
+if(WIN32)
+    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO            coruus/${PORT}
+    REF             64b6647514212b76ae7bca0dea9b7b197d1d8186
+    SHA512          5cf14061efc1b3c934dfb28a08e2a478036109c449aed41d4deb975a9f0748db06f83c1de9e5d991009d04f0220a397f5f66232a4db04bbc0dea0c624522752c
+    HEAD_REF        master
+)
+
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+     DESTINATION "${SOURCE_PATH}")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT})
+
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "CC0-1.0")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage"
+     DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share"
+                    "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/external_imported/vcpkg/ports/keccak-tiny/usage b/external_imported/vcpkg/ports/keccak-tiny/usage
new file mode 100644
index 000000000..f6c1fe0d5
--- /dev/null
+++ b/external_imported/vcpkg/ports/keccak-tiny/usage
@@ -0,0 +1,3 @@
+keccak-tiny provides CMake targets:
+    find_package(unofficial-keccak-tiny CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE unofficial::keccak-tiny::keccak-tiny)
diff --git a/external_imported/vcpkg/ports/keccak-tiny/vcpkg.json b/external_imported/vcpkg/ports/keccak-tiny/vcpkg.json
new file mode 100644
index 000000000..8223f5034
--- /dev/null
+++ b/external_imported/vcpkg/ports/keccak-tiny/vcpkg.json
@@ -0,0 +1,17 @@
+{
+  "name": "keccak-tiny",
+  "version-date": "2014-09-08",
+  "description": "A tiny implementation of SHA-3, SHAKE, Keccak, and sha3sum",
+  "homepage": "https://github.com/coruus/keccak-tiny",
+  "license": "CC0-1.0",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/kenlm/cmake-config.patch b/external_imported/vcpkg/ports/kenlm/cmake-config.patch
new file mode 100644
index 000000000..5e87e6889
--- /dev/null
+++ b/external_imported/vcpkg/ports/kenlm/cmake-config.patch
@@ -0,0 +1,29 @@
+diff --git a/cmake/kenlmConfig.cmake.in b/cmake/kenlmConfig.cmake.in
+index 592407d..86abd36 100644
+--- a/cmake/kenlmConfig.cmake.in
++++ b/cmake/kenlmConfig.cmake.in
+@@ -5,6 +5,12 @@ include(CMakeFindDependencyMacro)
+ find_dependency(Boost)
+ find_dependency(Threads)
+ find_dependency(double-conversion CONFIG)
++if("@ENABLE_INTERPOLATE@")
++  find_dependency(Eigen3)
++  if("@OPENMP_CXX_FOUND@")
++    find_dependency(OpenMP)
++  endif()
++endif()
+ 
+ # Compression libs
+ if (@ZLIB_FOUND@)
+diff --git a/lm/interpolate/CMakeLists.txt b/lm/interpolate/CMakeLists.txt
+index d23e959..26b6092 100644
+--- a/lm/interpolate/CMakeLists.txt
++++ b/lm/interpolate/CMakeLists.txt
+@@ -24,6 +24,7 @@ if(ENABLE_INTERPOLATE)
+ 
+ 
+   find_package(OpenMP)
++  set(OPENMP_CXX_FOUND "${OPENMP_CXX_FOUND}" CACHE INTERNAL "For exported config")
+   if (OPENMP_CXX_FOUND)
+     target_link_libraries(kenlm_interpolate PUBLIC OpenMP::OpenMP_CXX)
+   endif()
diff --git a/external_imported/vcpkg/ports/kenlm/devendor.patch b/external_imported/vcpkg/ports/kenlm/devendor.patch
new file mode 100644
index 000000000..891620b76
--- /dev/null
+++ b/external_imported/vcpkg/ports/kenlm/devendor.patch
@@ -0,0 +1,42 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fd08a48..7439ebf 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -128,7 +128,7 @@ install(EXPORT kenlmTargets
+   DESTINATION share/kenlm/cmake
+ )
+ 
+-foreach(SUBDIR IN ITEMS util util/double-conversion util/stream lm lm/builder lm/common lm/filter lm/interpolate)
++foreach(SUBDIR IN ITEMS util                        util/stream lm lm/builder lm/common lm/filter lm/interpolate)
+   file(GLOB HEADERS ${CMAKE_CURRENT_LIST_DIR}/${SUBDIR}/*.h ${CMAKE_CURRENT_LIST_DIR}/${SUBDIR}/*.hh)
+   install(FILES ${HEADERS} DESTINATION include/kenlm/${SUBDIR} COMPONENT headers)
+ endforeach(SUBDIR)
+diff --git a/cmake/kenlmConfig.cmake.in b/cmake/kenlmConfig.cmake.in
+index 0fbf0c6..592407d 100644
+--- a/cmake/kenlmConfig.cmake.in
++++ b/cmake/kenlmConfig.cmake.in
+@@ -4,6 +4,7 @@ include(CMakeFindDependencyMacro)
+ 
+ find_dependency(Boost)
+ find_dependency(Threads)
++find_dependency(double-conversion CONFIG)
+ 
+ # Compression libs
+ if (@ZLIB_FOUND@)
+diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt
+index 7a96ef5..3318d73 100644
+--- a/util/CMakeLists.txt
++++ b/util/CMakeLists.txt
+@@ -32,10 +32,11 @@ if (WIN32)
+ endif()
+ 
+ # This directory has children that need to be processed
+-add_subdirectory(double-conversion)
++find_package(double-conversion CONFIG REQUIRED)
+ add_subdirectory(stream)
+ 
+ add_library(kenlm_util ${KENLM_UTIL_DOUBLECONVERSION_SOURCE} ${KENLM_UTIL_STREAM_SOURCE} ${KENLM_UTIL_SOURCE})
++target_link_libraries(kenlm_util PRIVATE double-conversion::double-conversion)
+ # Since headers are relative to `include/kenlm` at install time, not just `include`
+ target_include_directories(kenlm_util PUBLIC $<INSTALL_INTERFACE:include/kenlm>)
+ 
diff --git a/external_imported/vcpkg/ports/kenlm/fix-boost.patch b/external_imported/vcpkg/ports/kenlm/fix-boost.patch
index 3eded1c69..77d23d817 100644
--- a/external_imported/vcpkg/ports/kenlm/fix-boost.patch
+++ b/external_imported/vcpkg/ports/kenlm/fix-boost.patch
@@ -1,12 +1,25 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bec81d4..44fd48a 100644
+index 3c6c863..fd08a48 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -1,6 +1,6 @@
  cmake_minimum_required(VERSION 3.1)
  
 -if (WIN32)
-+if (WIN32 AND BUILD_SHARED_LIBS)
++if (0)
      set(Boost_USE_STATIC_LIBS OFF)
      # The auto-linking feature has problems with USE_STATIC_LIBS off, so we use
      # BOOST_ALL_NO_LIB to turn it off.
+@@ -100,6 +100,12 @@ find_package(Boost 1.41.0 REQUIRED COMPONENTS
+   thread
+   unit_test_framework
+ )
++set(Boost_LIBRARIES
++  Boost::program_options
++  Boost::system
++  Boost::thread
++  Boost::unit_test_framework
++)
+ 
+ # Define where include files live
+ include_directories(${Boost_INCLUDE_DIRS})
diff --git a/external_imported/vcpkg/ports/kenlm/fix-const-overloaded.patch b/external_imported/vcpkg/ports/kenlm/fix-const-overloaded.patch
deleted file mode 100644
index 2a77b335f..000000000
--- a/external_imported/vcpkg/ports/kenlm/fix-const-overloaded.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/util/proxy_iterator.hh b/util/proxy_iterator.hh
-index 8aa697b..9de2663 100644
---- a/util/proxy_iterator.hh
-+++ b/util/proxy_iterator.hh
-@@ -77,8 +77,7 @@ template <class Proxy> class ProxyIterator {
- 
-     std::ptrdiff_t operator-(const S &other) const { return I() - other.I(); }
- 
--    Proxy operator*() { return p_; }
--    const Proxy operator*() const { return p_; }
-+    Proxy operator*() const { return p_; }
-     Proxy *operator->() { return &p_; }
-     const Proxy *operator->() const { return &p_; }
-     Proxy operator[](std::ptrdiff_t amount) const { return *(*this + amount); }
diff --git a/external_imported/vcpkg/ports/kenlm/portfile.cmake b/external_imported/vcpkg/ports/kenlm/portfile.cmake
index ad0c5c6c9..bc57af00e 100644
--- a/external_imported/vcpkg/ports/kenlm/portfile.cmake
+++ b/external_imported/vcpkg/ports/kenlm/portfile.cmake
@@ -1,50 +1,52 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+if(VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO kpu/kenlm
-    REF 1f054617eca14eae921e987b4b4eeb2b1d91de6b
-    SHA512 c18f9c22fbbb1f54ebe9c3b771fb2d7c09d502141d1b3645cff9db44cc51b3c976311ff0db79b60f410622579d043f185c56a4c7386e1b0ba8708e433238968b
+    REF 5bf7b46558e1c5595bf3b8c9b0b1f9d8d257040a
+    SHA512 04b645d09e60b65cb1e5065a1623ad01737f0dd9415cf620288ace0db10b1c424d72f304b34c52fa08684f3fecdaad9db91088134f34ed374cb1eb9d58c635b5
     HEAD_REF master
     PATCHES 
+        devendor.patch
+        cmake-config.patch
         fix-boost.patch
-        fix-const-overloaded.patch
 )
-
-file(REMOVE ${SOURCE_PATH}/cmake/modules/FindEigen3.cmake)
+file(REMOVE_RECURSE
+    "${SOURCE_PATH}/cmake/modules/FindEigen3.cmake"
+    "${SOURCE_PATH}/util/double-conversion"
+)
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    interpolate ENABLE_INTERPOLATE
+    FEATURES
+        interpolate ENABLE_INTERPOLATE
 )
 
-if ("interpolate" IN_LIST FEATURES AND VCPKG_TARGET_IS_WINDOWS)
-    message(FATAL_ERROR "The interpolate feature does not support Windows.")
-endif()
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         ${FEATURE_OPTIONS}
-        -DFORCE_STATIC=OFF #already handled by vcpkg
+        -DCMAKE_CXX_STANDARD=11 # 17 removes std::binary_function
+        -DFORCE_STATIC=OFF  # handled by vcpkg
         -DENABLE_PYTHON=OFF # kenlm.lib(bhiksha.cc.obj) : fatal error LNK1000: Internal error during IMAGE::Pass2
         -DCOMPILE_TESTS=OFF
 )
-vcpkg_install_cmake()
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH share/kenlm/cmake)
 
 set(KENLM_TOOLS count_ngrams filter fragment kenlm_benchmark lmplz phrase_table_vocab query build_binary)
 if (NOT VCPKG_TARGET_IS_WINDOWS)
     list(APPEND KENLM_TOOLS probing_hash_table_benchmark)
-    if ("interpolate" IN_LIST FEATURES)
-        list(APPEND KENLM_TOOLS interpolate)
-    endif()
+endif()
+if ("interpolate" IN_LIST FEATURES)
+    list(APPEND KENLM_TOOLS interpolate)
 endif()
 vcpkg_copy_tools(TOOL_NAMES ${KENLM_TOOLS} AUTO_CLEAN)
 
 vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-# Copyright and License
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME license)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE" "${SOURCE_PATH}/COPYING" "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/kenlm/vcpkg.json b/external_imported/vcpkg/ports/kenlm/vcpkg.json
index 66c218ad9..09dd86201 100644
--- a/external_imported/vcpkg/ports/kenlm/vcpkg.json
+++ b/external_imported/vcpkg/ports/kenlm/vcpkg.json
@@ -1,8 +1,9 @@
 {
   "name": "kenlm",
-  "version-string": "20200924",
+  "version": "20230531",
   "port-version": 1,
   "description": "KenLM: Faster and Smaller Language Model Queries",
+  "license": null,
   "supports": "!(arm64 & windows)",
   "dependencies": [
     "boost-interprocess",
@@ -12,21 +13,24 @@
     "boost-test",
     "boost-thread",
     "bzip2",
+    "double-conversion",
+    "liblzma",
     {
-      "name": "eigen3",
-      "platform": "!windows"
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
     },
-    "liblzma",
     "zlib"
   ],
   "features": {
     "interpolate": {
       "description": "Build interpolation program",
+      "supports": "!windows",
       "dependencies": [
-        {
-          "name": "eigen3",
-          "platform": "!windows"
-        }
+        "eigen3"
       ]
     }
   }
diff --git a/external_imported/vcpkg/ports/kerbal/portfile.cmake b/external_imported/vcpkg/ports/kerbal/portfile.cmake
new file mode 100644
index 000000000..5ecb47487
--- /dev/null
+++ b/external_imported/vcpkg/ports/kerbal/portfile.cmake
@@ -0,0 +1,19 @@
+vcpkg_from_github(
+        OUT_SOURCE_PATH SOURCE_PATH
+        REPO WentsingNee/Kerbal
+        REF "v${VERSION}"
+        SHA512 d974fbf29ae7226a26a73db58b4c7c6c9f2e826b6524c1b861a824e85bd2c4fbdd52d1ff0c930a026fca0f795d871bac074481ac45023a25e894c23b685f784c
+        HEAD_REF main
+)
+
+vcpkg_cmake_configure(
+        SOURCE_PATH "${SOURCE_PATH}"
+)
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(
+        CONFIG_PATH "share/cmake/Kerbal"
+)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/kerbal/vcpkg.json b/external_imported/vcpkg/ports/kerbal/vcpkg.json
new file mode 100644
index 000000000..c67fdc408
--- /dev/null
+++ b/external_imported/vcpkg/ports/kerbal/vcpkg.json
@@ -0,0 +1,17 @@
+{
+  "name": "kerbal",
+  "version": "2023.12.1",
+  "description": "Kerbal C++ Template Library",
+  "homepage": "https://github.com/WentsingNee/Kerbal",
+  "license": "LGPL-3.0",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/keystone/portfile.cmake b/external_imported/vcpkg/ports/keystone/portfile.cmake
index a05cf1317..3b652722d 100644
--- a/external_imported/vcpkg/ports/keystone/portfile.cmake
+++ b/external_imported/vcpkg/ports/keystone/portfile.cmake
@@ -6,7 +6,7 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-vcpkg_find_acquire_program(PYTHON2)
+vcpkg_find_acquire_program(PYTHON3)
 
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" KEYSTONE_BUILD_STATIC_RUNTIME)
 
@@ -14,7 +14,7 @@ vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DKEYSTONE_BUILD_STATIC_RUNTIME=${KEYSTONE_BUILD_STATIC_RUNTIME}
-        -DPYTHON_EXECUTABLE=${PYTHON2}
+        -DPYTHON_EXECUTABLE=${PYTHON3}
 
         # Add support for only a subset of architectures
         #-DLLVM_TARGETS_TO_BUILD="AArch64;X86"
diff --git a/external_imported/vcpkg/ports/keystone/vcpkg.json b/external_imported/vcpkg/ports/keystone/vcpkg.json
index f8fcdb382..1c0f82da5 100644
--- a/external_imported/vcpkg/ports/keystone/vcpkg.json
+++ b/external_imported/vcpkg/ports/keystone/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "keystone",
   "version-semver": "0.9.2",
-  "port-version": 2,
+  "port-version": 3,
   "description": "A Lightweight multi-platform, multi-architecture assembler framework.",
   "homepage": "https://github.com/keystone-engine/keystone",
   "supports": "!uwp",
diff --git a/external_imported/vcpkg/ports/kf5archive/vcpkg.json b/external_imported/vcpkg/ports/kf5archive/vcpkg.json
index 400001f04..7432e5afa 100644
--- a/external_imported/vcpkg/ports/kf5archive/vcpkg.json
+++ b/external_imported/vcpkg/ports/kf5archive/vcpkg.json
@@ -1,9 +1,11 @@
 {
   "name": "kf5archive",
   "version": "5.98.0",
+  "port-version": 1,
   "description": "File compression",
   "homepage": "https://api.kde.org/frameworks/karchive/html/index.html",
   "license": "LGPL-2.0-or-later",
+  "supports": "!xbox",
   "dependencies": [
     "ecm",
     "qt5-base",
diff --git a/external_imported/vcpkg/ports/kf5i18n/portfile.cmake b/external_imported/vcpkg/ports/kf5i18n/portfile.cmake
index df311afab..f4de6dfbf 100644
--- a/external_imported/vcpkg/ports/kf5i18n/portfile.cmake
+++ b/external_imported/vcpkg/ports/kf5i18n/portfile.cmake
@@ -38,3 +38,14 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*")
 vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES})
 
+# The following pattern has an absolute path, but is still ultimately relocatable, so skip absolute paths check:
+# share\KF5I18n\KF5I18nMacros.cmake
+# # The Python executable used for building ki18n will be used as a fallback
+# # solution if it cannot be found in $PATH when building applications.
+# set(_KI18N_PYTHON_EXECUTABLE "C:/Dev/vcpkg-downloads/tools/python/python-3.10.7-x64/python.exe")
+# 
+# find_program(KI18N_PYTHON_EXECUTABLE NAMES python3 python2 python)
+# if(NOT KI18N_PYTHON_EXECUTABLE)
+#     set(KI18N_PYTHON_EXECUTABLE "${_KI18N_PYTHON_EXECUTABLE}")
+# endif()
+set(VCPKG_POLICY_SKIP_ABSOLUTE_PATHS_CHECK enabled)
diff --git a/external_imported/vcpkg/ports/kf5i18n/vcpkg.json b/external_imported/vcpkg/ports/kf5i18n/vcpkg.json
index 0ac9cf737..3f447ef49 100644
--- a/external_imported/vcpkg/ports/kf5i18n/vcpkg.json
+++ b/external_imported/vcpkg/ports/kf5i18n/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "kf5i18n",
   "version": "5.98.0",
+  "port-version": 1,
   "description": "Advanced internationalization framework",
   "homepage": "https://api.kde.org/frameworks/ki18n/html/index.html",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/kf5parts/portfile.cmake b/external_imported/vcpkg/ports/kf5parts/portfile.cmake
new file mode 100644
index 000000000..57122d2a0
--- /dev/null
+++ b/external_imported/vcpkg/ports/kf5parts/portfile.cmake
@@ -0,0 +1,41 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO KDE/kparts
+    REF "v${VERSION}"
+    SHA512 07ba359faf15f6bc398b64e0534842532e1a3ade94caa6b8dc7886417aa49526b7e0f54bd29805e64b8661f4c402e022bd211a932ee13b0ac4b97e516ae6dbef
+    HEAD_REF master
+)
+
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")
+
+# See ECM/kde-modules/KDEInstallDirs5.cmake
+# Relocate .desktop files for next ports
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    list(APPEND KDE_OPTIONS
+        -DKDE_INSTALL_KSERVICES5DIR="share/kservices5"
+        -DKDE_INSTALL_KSERVICETYPES5DIR="share/kservicetypes5"
+    )
+endif()
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_TESTING=OFF
+        ${FEATURE_OPTIONS}
+        ${KDE_OPTIONS}
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Parts CONFIG_PATH lib/cmake/KF5Parts)
+vcpkg_copy_pdbs()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*")
+vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES})
diff --git a/external_imported/vcpkg/ports/kf5parts/vcpkg.json b/external_imported/vcpkg/ports/kf5parts/vcpkg.json
new file mode 100644
index 000000000..101c88816
--- /dev/null
+++ b/external_imported/vcpkg/ports/kf5parts/vcpkg.json
@@ -0,0 +1,37 @@
+{
+  "name": "kf5parts",
+  "version": "5.98.0",
+  "port-version": 1,
+  "description": "Plugin framework for user interface component",
+  "homepage": "https://api.kde.org/frameworks/kparts/html/index.html",
+  "license": "LGPL-2.0-or-later",
+  "dependencies": [
+    "ecm",
+    {
+      "name": "gettext",
+      "host": true,
+      "features": [
+        "tools"
+      ]
+    },
+    "kf5config",
+    "kf5coreaddons",
+    "kf5i18n",
+    "kf5iconthemes",
+    "kf5jobwidgets",
+    "kf5kio",
+    "kf5service",
+    "kf5textwidgets",
+    "kf5widgetsaddons",
+    "kf5xmlgui",
+    "qt5-base",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/kf5service/portfile.cmake b/external_imported/vcpkg/ports/kf5service/portfile.cmake
index 316d08c84..14e576dca 100644
--- a/external_imported/vcpkg/ports/kf5service/portfile.cmake
+++ b/external_imported/vcpkg/ports/kf5service/portfile.cmake
@@ -34,11 +34,21 @@ vcpkg_add_to_path(PREPEND "${BISON_DIR}")
 # Prevent KDEClangFormat from writing to source effectively blocking parallel configure
 file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")
 
+# See ECM/kde-modules/KDEInstallDirs5.cmake
+# Relocate .desktop files for next ports
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    list(APPEND KDE_OPTIONS
+        -DKDE_INSTALL_KSERVICES5DIR="share/kservices5"
+        -DKDE_INSTALL_KSERVICETYPES5DIR="share/kservicetypes5"
+    )
+endif()
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DBUILD_TESTING=OFF
         -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=ON
+        ${KDE_OPTIONS}
 )
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/kf5service/vcpkg.json b/external_imported/vcpkg/ports/kf5service/vcpkg.json
index d2855ffc1..b1e9f5308 100644
--- a/external_imported/vcpkg/ports/kf5service/vcpkg.json
+++ b/external_imported/vcpkg/ports/kf5service/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "kf5service",
   "version": "5.98.0",
+  "port-version": 1,
   "description": "Plugin framework for desktop services",
   "homepage": "https://api.kde.org/frameworks/kservice/html/index.html",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/kf5solid/fix-libmount.patch b/external_imported/vcpkg/ports/kf5solid/001_fix_libmount.patch
similarity index 100%
rename from external_imported/vcpkg/ports/kf5solid/fix-libmount.patch
rename to external_imported/vcpkg/ports/kf5solid/001_fix_libmount.patch
diff --git a/external_imported/vcpkg/ports/kf5solid/002_fix_imobile.patch b/external_imported/vcpkg/ports/kf5solid/002_fix_imobile.patch
new file mode 100644
index 000000000..4089fd3ba
--- /dev/null
+++ b/external_imported/vcpkg/ports/kf5solid/002_fix_imobile.patch
@@ -0,0 +1,61 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 60172b0d..1dfe6e8a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -55,13 +55,25 @@ set_package_properties(BISON PROPERTIES
+     PURPOSE "Required for the Predicate parser"
+ )
+ 
+-find_package(IMobileDevice)
++find_package(IMobileDevice NAMES unofficial-libimobiledevice)
+ set_package_properties(IMobileDevice PROPERTIES
+                        TYPE OPTIONAL
+                        PURPOSE "Needed to build the iOS device support backend"
+                       )
++if(TARGET unofficial::libimobiledevice::libimobiledevice)
++    set(IMobileDevice_VERSION "1.3.0")
++    set(_imobile_version "0x00000")
++    if (IMobileDevice_VERSION VERSION_GREATER_EQUAL 1.3.0)
++        set(_imobile_version "0x10300")
++    elseif(IMobileDevice_VERSION VERSION_GREATER_EQUAL 1.2.0)
++        set(_imobile_version "0x10200")
++    endif()
++    set_target_properties(unofficial::libimobiledevice::libimobiledevice PROPERTIES
++        INTERFACE_COMPILE_DEFINITIONS "IMOBILEDEVICE_API=${_imobile_version}"
++    )
++endif()
+ 
+-find_package(PList)
++find_package(PList NAMES unofficial-libplist CONFIG)
+ set_package_properties(PList PROPERTIES
+                        TYPE OPTIONAL
+                        PURPOSE "Needed to build the iOS device support backend"
+diff --git a/KF5SolidConfig.cmake.in b/KF5SolidConfig.cmake.in
+index 6fc15eeb..a6250ce6 100644
+--- a/KF5SolidConfig.cmake.in
++++ b/KF5SolidConfig.cmake.in
+@@ -27,6 +27,11 @@ if (NOT @BUILD_SHARED_LIBS@)
+         find_dependency(LibMount)
+     endif()
+ 
++    if ("@IMobileDevice_FOUND@" AND "@PList_FOUND@")
++        find_dependency(unofficial-libimobiledevice)
++        find_dependency(unofficial-libplist)
++    endif()
++
+     if ("@Qt5DBus_FOUND@" OR "@Qt6DBus_FOUND@")
+         find_dependency(Qt@QT_MAJOR_VERSION@DBus @REQUIRED_QT_VERSION@)
+     endif()
+diff --git a/src/solid/devices/backends/imobile/CMakeLists.txt b/src/solid/devices/backends/imobile/CMakeLists.txt
+index e1666447..3f8b982e 100644
+--- a/src/solid/devices/backends/imobile/CMakeLists.txt
++++ b/src/solid/devices/backends/imobile/CMakeLists.txt
+@@ -5,7 +5,7 @@ set(backend_sources
+     imobiledeviceinterface.cpp
+     imobileportablemediaplayer.cpp
+ )
+-set(backend_libs IMobileDevice::IMobileDevice PList::PList)
++set(backend_libs unofficial::libimobiledevice::libimobiledevice unofficial::libplist::libplist)
+ 
+ ecm_qt_declare_logging_category(backend_sources
+     HEADER imobile_debug.h
diff --git a/external_imported/vcpkg/ports/kf5solid/portfile.cmake b/external_imported/vcpkg/ports/kf5solid/portfile.cmake
index 334ef08fd..d58a920d6 100644
--- a/external_imported/vcpkg/ports/kf5solid/portfile.cmake
+++ b/external_imported/vcpkg/ports/kf5solid/portfile.cmake
@@ -5,14 +5,17 @@ vcpkg_from_github(
     SHA512 9f0aed7f8ea29a6132ca9c99c4c744ca5580bb3f7be1712e27d1fc3ae47b2edac26a5ce20abddef4d9998612f2386e1cc6915504c02897f2b3ebcec01cd26208
     HEAD_REF master
     PATCHES
-        fix-libmount.patch
+        001_fix_libmount.patch
+        002_fix_imobile.patch
 )
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")
 
 if(VCPKG_TARGET_IS_OSX)
     # On Darwin platform, the bundled version of 'bison' may be too old (< 3.0).
     vcpkg_find_acquire_program(BISON)
     execute_process(
-        COMMAND ${BISON} --version
+        COMMAND "${BISON}" --version
         OUTPUT_VARIABLE BISON_OUTPUT
     )
     string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" BISON_VERSION "${BISON_OUTPUT}")
@@ -27,30 +30,33 @@ endif()
 vcpkg_find_acquire_program(BISON)
 vcpkg_find_acquire_program(FLEX)
 
-get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY )
-get_filename_component(BISON_DIR "${BISON}" DIRECTORY )
+get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY)
+get_filename_component(BISON_DIR "${BISON}" DIRECTORY)
 
 vcpkg_add_to_path(PREPEND "${FLEX_DIR}")
 vcpkg_add_to_path(PREPEND "${BISON_DIR}")
 
-# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
-file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")
-
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-  INVERTED_FEATURES
-    "libmount" CMAKE_DISABLE_FIND_PACKAGE_LibMount
+    FEATURES
+        libmount    CMAKE_REQUIRE_FIND_PACKAGE_LibMount
+        imobile     CMAKE_REQUIRE_FIND_PACKAGE_IMobileDevice
+        imobile     CMAKE_REQUIRE_FIND_PACKAGE_PList
+    INVERTED_FEATURES
+        libmount    CMAKE_DISABLE_FIND_PACKAGE_LibMount
+        imobile     CMAKE_DISABLE_FIND_PACKAGE_IMobileDevice
+        imobile     CMAKE_DISABLE_FIND_PACKAGE_PList
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-        -DBUILD_DEVICE_BACKEND_imobile=OFF
+        ${FEATURE_OPTIONS}
         -DBUILD_TESTING=OFF
         -DKDE_INSTALL_QMLDIR=qml
 )
 
 vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Solid CONFIG_PATH lib/cmake/KF5Solid)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/KF5Solid)
 vcpkg_copy_pdbs()
 
 vcpkg_copy_tools(
@@ -58,13 +64,12 @@ vcpkg_copy_tools(
     AUTO_CLEAN
 )
 
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    # Until https://github.com/microsoft/vcpkg/pull/34091
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-
 file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*")
 vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES})
-
diff --git a/external_imported/vcpkg/ports/kf5solid/vcpkg.json b/external_imported/vcpkg/ports/kf5solid/vcpkg.json
index 6d72112f0..51a5e4530 100644
--- a/external_imported/vcpkg/ports/kf5solid/vcpkg.json
+++ b/external_imported/vcpkg/ports/kf5solid/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "kf5solid",
   "version": "5.98.0",
-  "port-version": 1,
+  "port-version": 3,
   "description": "Desktop hardware abstraction",
   "homepage": "https://api.kde.org/frameworks/solid/html/index.html",
   "dependencies": [
@@ -18,27 +18,25 @@
     }
   ],
   "default-features": [
-    "platform-default-features"
+    {
+      "name": "libmount",
+      "platform": "linux"
+    }
   ],
   "features": {
+    "imobile": {
+      "description": "Used by the imobile backend",
+      "dependencies": [
+        "libimobiledevice",
+        "libplist"
+      ]
+    },
     "libmount": {
       "description": "Used by the UDisks backend on Linux",
       "supports": "linux",
       "dependencies": [
         "libmount"
       ]
-    },
-    "platform-default-features": {
-      "description": "Enable platform-dependent default features",
-      "dependencies": [
-        {
-          "name": "kf5solid",
-          "features": [
-            "libmount"
-          ],
-          "platform": "linux"
-        }
-      ]
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/kf5texteditor/portfile.cmake b/external_imported/vcpkg/ports/kf5texteditor/portfile.cmake
new file mode 100644
index 000000000..5d2b1e227
--- /dev/null
+++ b/external_imported/vcpkg/ports/kf5texteditor/portfile.cmake
@@ -0,0 +1,54 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO KDE/ktexteditor
+    REF v5.98.0
+    SHA512 06aad3993cd2133b99ef9e8b510c8b89a844ce778a71351797122c6b05e31e6277d238a8563653a42aafe773457ec89842bbd6184277d471069969c177304696
+    HEAD_REF master
+)
+
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")
+
+# A trick for `kcoreaddons_desktop_to_json` (see KF5CoreAddonsMacros.cmake) to generate katepart.desktop
+# The copied *.desktop files should be removed after vcpkg_cmake_install
+if(VCPKG_TARGET_IS_WINDOWS)
+    if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+        set(DATAROOT "bin/data") # maybe ADD_BIN_TO_PATH can work in this case...
+    elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+        set(DATAROOT "share")
+    endif()
+    file(COPY "${CURRENT_INSTALLED_DIR}/${DATAROOT}/kservicetypes5" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/data")
+    file(GLOB TEMP_DESKTOP_FILES_DBG "${CURRENT_PACKAGES_DIR}/debug/${DATAROOT}/kservicetypes5/*")
+    file(COPY "${CURRENT_INSTALLED_DIR}/${DATAROOT}/kservicetypes5" DESTINATION "${CURRENT_PACKAGES_DIR}/bin/data")
+    file(GLOB TEMP_DESKTOP_FILES_REL "${CURRENT_PACKAGES_DIR}/${DATAROOT}/kservicetypes5/*")
+else()
+    file(COPY "${CURRENT_INSTALLED_DIR}/share/kservicetypes5" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/share")
+    file(GLOB TEMP_DESKTOP_FILES_DBG "${CURRENT_PACKAGES_DIR}/debug/share/kservicetypes5/*")
+    file(COPY "${CURRENT_INSTALLED_DIR}/share/kservicetypes5" DESTINATION "${CURRENT_PACKAGES_DIR}/share")
+    file(GLOB TEMP_DESKTOP_FILES_REL "${CURRENT_PACKAGES_DIR}/share/kservicetypes5/*")
+endif()
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_TESTING=OFF
+        -DENABLE_KAUTH_DEFAULT=OFF
+        -DKDE_INSTALL_PLUGINDIR=plugins
+        -DVCPKG_HOST_TRIPLET=${VCPKG_HOST_TRIPLET}
+)
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME KF5TextEditor CONFIG_PATH lib/cmake/KF5TextEditor)
+vcpkg_copy_pdbs()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+
+file(REMOVE_RECURSE
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/debug/share"
+    ${TEMP_DESKTOP_FILES_DBG} ${TEMP_DESKTOP_FILES_REL}
+)
+
+file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*")
+vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES})
diff --git a/external_imported/vcpkg/ports/kf5texteditor/vcpkg.json b/external_imported/vcpkg/ports/kf5texteditor/vcpkg.json
new file mode 100644
index 000000000..b8200b1cc
--- /dev/null
+++ b/external_imported/vcpkg/ports/kf5texteditor/vcpkg.json
@@ -0,0 +1,33 @@
+{
+  "name": "kf5texteditor",
+  "version": "5.98.0",
+  "description": "Full text editor component",
+  "homepage": "https://api.kde.org/frameworks/ktexteditor/html/",
+  "dependencies": [
+    "ecm",
+    {
+      "name": "gettext",
+      "host": true,
+      "features": [
+        "tools"
+      ]
+    },
+    "gettext-libintl",
+    "kf5archive",
+    "kf5config",
+    "kf5guiaddons",
+    "kf5i18n",
+    "kf5kio",
+    "kf5parts",
+    "kf5sonnet",
+    "kf5syntaxhighlighting",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/kfr/vcpkg.json b/external_imported/vcpkg/ports/kfr/vcpkg.json
index a09e44e4a..0d6edb00a 100644
--- a/external_imported/vcpkg/ports/kfr/vcpkg.json
+++ b/external_imported/vcpkg/ports/kfr/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "kfr",
   "version-semver": "5.0.1",
+  "port-version": 1,
   "description": "Fast, modern C++ DSP framework.",
   "homepage": "https://www.kfr.dev/",
   "license": "GPL-2.0",
-  "supports": "!(arm | linux)",
+  "supports": "!(arm | linux | xbox)",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/kinectsdk1/vcpkg.json b/external_imported/vcpkg/ports/kinectsdk1/vcpkg.json
index e13a4e8f0..c2bba6727 100644
--- a/external_imported/vcpkg/ports/kinectsdk1/vcpkg.json
+++ b/external_imported/vcpkg/ports/kinectsdk1/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "kinectsdk1",
   "version": "1.8",
-  "port-version": 7,
+  "port-version": 8,
   "description": "Kinect for Windows SDK for Kinect v1 sensor.",
   "license": null,
   "supports": "!arm & windows & !uwp & !xbox",
@@ -9,7 +9,7 @@
     {
       "name": "vcpkg-tool-lessmsi",
       "host": true,
-      "version>=": "1.10#1"
+      "version>=": "1.10.0#1"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/kinectsdk2/vcpkg.json b/external_imported/vcpkg/ports/kinectsdk2/vcpkg.json
index 6bfde2f6a..4fa73a4d9 100644
--- a/external_imported/vcpkg/ports/kinectsdk2/vcpkg.json
+++ b/external_imported/vcpkg/ports/kinectsdk2/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "kinectsdk2",
   "version": "2.0",
-  "port-version": 6,
+  "port-version": 7,
   "description": "Kinect for Windows SDK for Kinect v2 sensor.",
   "license": null,
   "supports": "!arm & windows & !uwp & !xbox",
@@ -9,7 +9,7 @@
     {
       "name": "vcpkg-tool-lessmsi",
       "host": true,
-      "version>=": "1.10#1"
+      "version>=": "1.10.0#1"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/kissfft/CMakeLists.txt b/external_imported/vcpkg/ports/kissfft/CMakeLists.txt
deleted file mode 100644
index d209dfbb0..000000000
--- a/external_imported/vcpkg/ports/kissfft/CMakeLists.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-cmake_minimum_required(VERSION 3.14)
-
-project(kissfft LANGUAGES C)
-
-include(GNUInstallDirs)
-
-option(KF_USE_SIMD "Use SIMD" OFF)
-option(KF_INSTALL_HEADERS "Install header files" ON)
-
-if (KF_USE_SIMD)
-    set(KF_SCALAR_TYPE "__m128" CACHE STRING "Definition of kiss_fft_scalar")
-else ()
-    set(KF_SCALAR_TYPE "float" CACHE STRING "Definition of kiss_fft_scalar")
-endif ()
-
-# TODO: FIXED_POINT
-# TODO: -msse
-
-set(kissfft_sources kiss_fft.c kiss_fftr.c kiss_fftnd.c kiss_fftndr.c)
-
-if (WIN32 AND BUILD_SHARED_LIBS)
-    list(APPEND kissfft_sources exports.def)
-endif ()
-
-add_library(kissfft ${kissfft_sources})
-
-if (BUILD_SHARED_LIBS)
-    set_property(
-        TARGET kissfft
-        PROPERTY POSITION_INDEPENDENT_CODE ON
-    )
-endif ()
-
-target_include_directories(
-    kissfft
-    PUBLIC
-        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
-)
-
-target_compile_definitions(
-    kissfft
-    PUBLIC
-        $<$<BOOL:${KF_USE_SIMD}>:USE_SIMD>
-        kiss_fft_scalar=${KF_SCALAR_TYPE}
-)
-
-if (KF_INSTALL_HEADERS)
-    install(
-        FILES
-            _kiss_fft_guts.h
-            kiss_fft.h
-            kiss_fftr.h
-            kiss_fftnd.h
-            kiss_fftndr.h
-            kissfft.hh
-            kissfft_i32.hh
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-    )
-endif ()
-
-install(TARGETS kissfft EXPORT unofficial-kissfft-config)
-
-install(
-    EXPORT unofficial-kissfft-config
-    NAMESPACE unofficial::kissfft::
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/unofficial-kissfft
-    PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
-)
diff --git a/external_imported/vcpkg/ports/kissfft/exports.def b/external_imported/vcpkg/ports/kissfft/exports.def
deleted file mode 100644
index 53984a6fe..000000000
--- a/external_imported/vcpkg/ports/kissfft/exports.def
+++ /dev/null
@@ -1,15 +0,0 @@
-EXPORTS
-	kiss_fft_alloc
-	kiss_fft
-  kiss_fftr_alloc
-	kiss_fftr
-	kiss_fftri
-  kiss_fft
-  kiss_fftnd_alloc
-  kiss_fftnd
-  kiss_fftndr_alloc
-  kiss_fftndr
-  kiss_fftndri
-	kiss_fft_stride
-	kiss_fft_cleanup
-	kiss_fft_next_fast_size
diff --git a/external_imported/vcpkg/ports/kissfft/fix-install-dirs.patch b/external_imported/vcpkg/ports/kissfft/fix-install-dirs.patch
new file mode 100644
index 000000000..f9c1bfd49
--- /dev/null
+++ b/external_imported/vcpkg/ports/kissfft/fix-install-dirs.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0213798..c4d7d3e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -105,9 +105,7 @@ endif()
+ # Add GNUInstallDirs for GNU infrastructure before target)include_directories
+ #
+ 
+-if(CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU)$" AND NOT CMAKE_CROSSCOMPILING)
+-    include(GNUInstallDirs)
+-endif()
++include(GNUInstallDirs)
+ 
+ #
+ # Declare PKGINCLUDEDIR for kissfft include path
diff --git a/external_imported/vcpkg/ports/kissfft/fix-linkage.patch b/external_imported/vcpkg/ports/kissfft/fix-linkage.patch
new file mode 100644
index 000000000..9e91f5fb3
--- /dev/null
+++ b/external_imported/vcpkg/ports/kissfft/fix-linkage.patch
@@ -0,0 +1,13 @@
+diff --git a/kissfft-config.cmake.in b/kissfft-config.cmake.in
+index cd7139a..c387fe6 100644
+--- a/kissfft-config.cmake.in
++++ b/kissfft-config.cmake.in
+@@ -28,7 +28,7 @@ cmake_minimum_required(VERSION 3.3)
+ 
+ # Set include glob of config files using SHARED/static component, BUILD_SHARED_LIBS by default
+ set(_kissfft_shared_detected OFF)
+-set(_kissfft_shared ${BUILD_SHARED_LIBS})
++set(_kissfft_shared @BUILD_SHARED_LIBS@)
+ if("SHARED" IN_LIST kissfft_FIND_COMPONENTS)
+     set(_kissfft_shared_detected ON)
+     set(_kissfft_shared ON)
diff --git a/external_imported/vcpkg/ports/kissfft/portfile.cmake b/external_imported/vcpkg/ports/kissfft/portfile.cmake
index ccb77514b..9372b9e8b 100644
--- a/external_imported/vcpkg/ports/kissfft/portfile.cmake
+++ b/external_imported/vcpkg/ports/kissfft/portfile.cmake
@@ -1,28 +1,90 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mborgerding/kissfft
-    REF 8f47a67f595a6641c566087bf5277034be64f24d
-    SHA512 ae39438b6d029296a440e1421f30731f371364107744fe9bad68e835e939f9a06d63016a99f5395a490ee0b1b1c33d46faafc651d91f13b8733d366e04dc861a
+    REF "${VERSION}"
+    SHA512 bd715868ce0e93a291a0592fb1f8b960e832fc64efe863755e52b67d5addff9bcb444a1bf2570d1914c52b41dad1023d0d86400f5ea30c9fb84cd6b4f7210708
     HEAD_REF master
+    PATCHES
+        fix-install-dirs.patch
+        fix-linkage.patch
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/exports.def DESTINATION ${SOURCE_PATH})
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" KISSFFT_STATIC)
 
-vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}
-    OPTIONS_DEBUG
-        -DKF_INSTALL_HEADERS=OFF
-    OPTIONS_RELEASE
-        -DKF_INSTALL_HEADERS=ON
+vcpkg_check_features(
+    OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        openmp KISSFFT_OPENMP
+        tools  KISSFFT_TOOLS
 )
 
-vcpkg_cmake_install()
-vcpkg_copy_pdbs()
+if("tools" IN_LIST FEATURES)
+    vcpkg_find_acquire_program(PKGCONFIG)
+endif()
 
-vcpkg_cmake_config_fixup(
-    PACKAGE_NAME unofficial-${PORT}
-    CONFIG_PATH lib/cmake/unofficial-${PORT}
-)
+set(datatypes float double int16_t int32_t)
+
+foreach(datatype IN LISTS datatypes)
+    vcpkg_cmake_configure(
+        SOURCE_PATH ${SOURCE_PATH}
+        OPTIONS
+            -DKISSFFT_DATATYPE=${datatype}
+            -DKISSFFT_PKGCONFIG=ON
+            -DKISSFFT_TEST=OFF
+            -DKISSFFT_STATIC=${KISSFFT_STATIC}
+            ${FEATURE_OPTIONS}
+        LOGFILE_BASE "config-${TARGET_TRIPLET}-${datatype}"
+    )
+
+    vcpkg_cmake_build(
+        LOGFILE_BASE "install-${TARGET_TRIPLET}-${datatype}"
+        TARGET install
+    )
+
+    vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/kissfft")
+
+    vcpkg_copy_pdbs()
+endforeach()
+
+vcpkg_fixup_pkgconfig()
+
+if("tools" IN_LIST FEATURES)
+    set(tool_names)
+
+    foreach(datatype IN LISTS datatypes)
+        if("openmp" IN_LIST FEATURES)
+            list(APPEND tool_names
+                "fastconv-${datatype}-openmp"
+                "fastconvr-${datatype}-openmp"
+                "fft-${datatype}-openmp"
+                "psdpng-${datatype}-openmp"
+            )
+        else()
+            list(APPEND tool_names
+                "fastconv-${datatype}"
+                "fastconvr-${datatype}"
+                "fft-${datatype}"
+                "psdpng-${datatype}"
+            )
+        endif()
+    endforeach()
+
+    vcpkg_copy_tools(
+        TOOL_NAMES ${tool_names}
+        AUTO_CLEAN
+    )
+endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    vcpkg_replace_string(
+        "${CURRENT_PACKAGES_DIR}/include/kissfft/kiss_fft.h"
+        "#ifdef KISS_FFT_SHARED"
+        "#if 1 //#ifdef KISS_FFT_SHARED"
+    )
+endif()
+
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/kissfft")
 
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/kissfft/usage b/external_imported/vcpkg/ports/kissfft/usage
new file mode 100644
index 000000000..d803db852
--- /dev/null
+++ b/external_imported/vcpkg/ports/kissfft/usage
@@ -0,0 +1,11 @@
+kissfft provides CMake targets:
+
+    # Using distinct targets
+    find_package(kissfft CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE kissfft::kissfft-float)
+    # Alternative targets: kissfft::kissfft-double, kissfft::int16_t, kissfft::int32_t
+
+    # Using a distinct package component
+    find_package(kissfft CONFIG REQUIRED COMPONENTS float)
+    target_link_libraries(main PRIVATE kissfft::kissfft)
+    # Alternative components: double, int16_t, int32_t
diff --git a/external_imported/vcpkg/ports/kissfft/vcpkg.json b/external_imported/vcpkg/ports/kissfft/vcpkg.json
index 48e6b5c19..932d5e984 100644
--- a/external_imported/vcpkg/ports/kissfft/vcpkg.json
+++ b/external_imported/vcpkg/ports/kissfft/vcpkg.json
@@ -1,8 +1,9 @@
 {
   "name": "kissfft",
-  "version-date": "2021-11-14",
+  "version": "131.1.0",
   "description": "A Fast Fourier Transform (FFT) library that tries to Keep it Simple, Stupid",
   "homepage": "https://github.com/mborgerding/kissfft",
+  "license": "BSD-3-Clause",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
@@ -12,5 +13,18 @@
       "name": "vcpkg-cmake-config",
       "host": true
     }
-  ]
+  ],
+  "features": {
+    "openmp": {
+      "description": "Build kissfft with OpenMP support",
+      "supports": "!windows"
+    },
+    "tools": {
+      "description": "Build kissfft tools",
+      "supports": "linux | osx",
+      "dependencies": [
+        "libpng"
+      ]
+    }
+  }
 }
diff --git a/external_imported/vcpkg/ports/kissnet/portfile.cmake b/external_imported/vcpkg/ports/kissnet/portfile.cmake
index 6f514f52a..0b1548dce 100644
--- a/external_imported/vcpkg/ports/kissnet/portfile.cmake
+++ b/external_imported/vcpkg/ports/kissnet/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Ybalrid/kissnet
-    REF 6c2bbbc1a114d83f11cea86d4370766ac12fbbd0 # 2022-10-18
-    SHA512 40182631e1c32628380369b7f8ca4dbae2049b0c0480396efb6a8197cca5006c8b68bc64553182c129ef8366a52a2434fd4f134bf5ffa1c0303af80b2e2a8cee
+    REF adbfe52d5147b206dd68c83da15b6e5805fe28dd # 2023-02-04
+    SHA512 404eec875f64884ef6256775a63c989cf691c9a3fc5fef77a68713a63a7a1554a78d26ba063c613c9de328e92d6c685a53fff77e89b6bc42056962e282134e84
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/kissnet/vcpkg.json b/external_imported/vcpkg/ports/kissnet/vcpkg.json
index 6bcf0fde9..835719eeb 100644
--- a/external_imported/vcpkg/ports/kissnet/vcpkg.json
+++ b/external_imported/vcpkg/ports/kissnet/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kissnet",
-  "version-date": "2022-10-18",
+  "version-date": "2023-02-04",
   "description": "Keep It Simple Stupid NETwork - C++17 wrapping of your OS's native socket API",
   "homepage": "https://github.com/Ybalrid/kissnet",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/krabsetw/portfile.cmake b/external_imported/vcpkg/ports/krabsetw/portfile.cmake
index ee321fc61..f99dc5b73 100644
--- a/external_imported/vcpkg/ports/krabsetw/portfile.cmake
+++ b/external_imported/vcpkg/ports/krabsetw/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO microsoft/krabsetw
-    REF 31679cf84bc85360158672699f2f68a821e8a6d0
-    SHA512 4fcc4ee1c41c6d40770a5b57111e6fd29eedf1f4a29038ab1dfb8bffb3ad0464c4ec06b90b65fabadcd419564d55172d4d9fdc3750c1898545f7c6e00fbe99c8
+    REF 550f5edfdb6464567d7a618702316183d31746e5
+    SHA512 0e02e04b79d4f856962c135023b87057898cb9a05f8056e0dc2bca7c4bb6227a660097f5251134086d1334f2a8e1541b4e963667ccd4f5c5ed6d60aa32c2c968
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/krabsetw/vcpkg.json b/external_imported/vcpkg/ports/krabsetw/vcpkg.json
index 9027ddacb..b5808373a 100644
--- a/external_imported/vcpkg/ports/krabsetw/vcpkg.json
+++ b/external_imported/vcpkg/ports/krabsetw/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "krabsetw",
-  "version": "4.1.18",
-  "port-version": 1,
+  "version": "4.3.2",
   "description": "krabsetw is a header-only C++ library that simplifies interacting with ETW.",
   "homepage": "https://github.com/microsoft/krabsetw",
   "supports": "windows & !uwp"
diff --git a/external_imported/vcpkg/ports/ktx/0001-Use-vcpkg-zstd.patch b/external_imported/vcpkg/ports/ktx/0001-Use-vcpkg-zstd.patch
index a44c02b70..71a587bd6 100644
--- a/external_imported/vcpkg/ports/ktx/0001-Use-vcpkg-zstd.patch
+++ b/external_imported/vcpkg/ports/ktx/0001-Use-vcpkg-zstd.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bc679fd1..c726fa71 100644
+index 9a56491..d7ca937 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -185,7 +185,6 @@ set(KTX_MAIN_SRC
+@@ -345,7 +345,6 @@ set(KTX_MAIN_SRC
      lib/basisu/transcoder/basisu_transcoder.cpp
      lib/basisu/transcoder/basisu_transcoder.h
      lib/basisu/transcoder/basisu.h
@@ -10,27 +10,28 @@ index bc679fd1..c726fa71 100644
      lib/checkheader.c
      lib/dfdutils/createdfd.c
      lib/dfdutils/colourspaces.c
-@@ -304,7 +303,6 @@ macro(commom_lib_settings lib write)
+@@ -532,7 +531,6 @@ macro(common_libktx_settings target enable_write library_type)
          $<INSTALL_INTERFACE:lib/basisu/transcoder>
  
          $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/lib/basisu/zstd>
 -        $<INSTALL_INTERFACE:lib/basisu/zstd>
  
-         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/other_include>
-         $<INSTALL_INTERFACE:other_include>
-@@ -390,6 +388,10 @@ macro(commom_lib_settings lib write)
-         target_compile_definitions(${lib} PUBLIC KTX_FEATURE_KTX2)
+         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/utils>
+         $<INSTALL_INTERFACE:utils>
+@@ -627,6 +625,11 @@ macro(common_libktx_settings target enable_write library_type)
+         target_compile_definitions(${target} PUBLIC KTX_FEATURE_KTX2)
      endif()
  
 +    # Use vcpkg zstd
 +    find_package(zstd CONFIG REQUIRED)
-+    target_link_libraries(${lib} PRIVATE $<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>)
++    set(ZSTD_LIBRARIES "$<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>")
++    target_link_libraries(${target} PRIVATE ${ZSTD_LIBRARIES})
 +
      if(WIN32)
-         # By wrapping in generator expression we force multi configuration
-         # generators (like Visual Studio) to take the exact path and not
+         if(MINGW)
+             # Check if the Threads package is provided; if using Mingw it MIGHT be
 diff --git a/cmake/KtxConfig.cmake b/cmake/KtxConfig.cmake
-index 6386ba2f..537bf4f2 100644
+index 6386ba2..537bf4f 100644
 --- a/cmake/KtxConfig.cmake
 +++ b/cmake/KtxConfig.cmake
 @@ -1,7 +1,8 @@
@@ -45,19 +46,20 @@ index 6386ba2f..537bf4f2 100644
  
  include("${CMAKE_CURRENT_LIST_DIR}/KtxTargets.cmake")
 diff --git a/lib/basisu/CMakeLists.txt b/lib/basisu/CMakeLists.txt
-index 492233ae..8786d16c 100644
+index 492233a..152ceb5 100644
 --- a/lib/basisu/CMakeLists.txt
 +++ b/lib/basisu/CMakeLists.txt
-@@ -146,7 +146,7 @@ set(BASISU_SRC_LIST ${COMMON_SRC_LIST}
+@@ -145,9 +145,6 @@ set(BASISU_SRC_LIST ${COMMON_SRC_LIST}
+ 	transcoder/basisu_transcoder.cpp
  	)
  
- if (ZSTD)
+-if (ZSTD)
 -	set(BASISU_SRC_LIST ${BASISU_SRC_LIST} zstd/zstd.c)
-+	set(ZSTD_LIBRARIES "$<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>")
- endif()
+-endif()
  
  if (APPLE)
-@@ -165,6 +165,10 @@ else()
+    set(BIN_DIRECTORY "bin_osx")
+@@ -165,6 +162,10 @@ else()
  	target_compile_definitions(basisu PRIVATE BASISD_SUPPORT_KTX2_ZSTD=0)
  endif()
  
@@ -69,54 +71,52 @@ index 492233ae..8786d16c 100644
  	# For Non-Windows builds, let cmake try and find the system OpenCL headers/libs for us.
  	if (OPENCL_FOUND)
 diff --git a/lib/basisu/webgl/encoder/CMakeLists.txt b/lib/basisu/webgl/encoder/CMakeLists.txt
-index 588d91b4..0b380129 100644
+index 588d91b..a337b13 100644
 --- a/lib/basisu/webgl/encoder/CMakeLists.txt
 +++ b/lib/basisu/webgl/encoder/CMakeLists.txt
-@@ -34,9 +34,7 @@ if (EMSCRIPTEN)
+@@ -34,9 +34,6 @@ if (EMSCRIPTEN)
    )
  
    if (KTX2_ZSTANDARD)
 -  	set(SRC_LIST ${SRC_LIST}
 -		../../zstd/zstd.c
 -	)
-+    set(ZSTD_LIBRARIES "$<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>")
  	set(ZSTD_DEFINITION BASISD_SUPPORT_KTX2_ZSTD=1)
    else()
    	set(ZSTD_DEFINITION BASISD_SUPPORT_KTX2_ZSTD=0)
-@@ -56,6 +54,10 @@ if (EMSCRIPTEN)
+@@ -55,6 +52,10 @@ if (EMSCRIPTEN)
+   target_compile_options(basis_encoder.js PRIVATE -fno-strict-aliasing -O3)
    
    target_include_directories(basis_encoder.js PRIVATE ../../transcoder)
- 
++  
 +  if(ZSTD_LIBRARIES)
 +      target_link_libraries(basis_encoder.js ${ZSTD_LIBRARIES})
 +  endif()
-+
+ 
    set_target_properties(basis_encoder.js PROPERTIES
        OUTPUT_NAME "basis_encoder"
-       SUFFIX ".js"
 diff --git a/lib/basisu/webgl/transcoder/CMakeLists.txt b/lib/basisu/webgl/transcoder/CMakeLists.txt
-index 372653de..f75e3a35 100644
+index 372653d..5ebc3cf 100644
 --- a/lib/basisu/webgl/transcoder/CMakeLists.txt
 +++ b/lib/basisu/webgl/transcoder/CMakeLists.txt
-@@ -28,9 +28,7 @@ if (EMSCRIPTEN)
+@@ -28,9 +28,6 @@ if (EMSCRIPTEN)
    endif()
    
    if (KTX2_ZSTANDARD)
 - 	set(SRC_LIST ${SRC_LIST}
 -		../../zstd/zstddeclib.c
 -	)
-+    set(ZSTD_LIBRARIES "$<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>")
  	set(ZSTD_DEFINITION BASISD_SUPPORT_KTX2_ZSTD=1)
    else()
    	set(ZSTD_DEFINITION BASISD_SUPPORT_KTX2_ZSTD=0)
-@@ -45,6 +43,10 @@ if (EMSCRIPTEN)
+@@ -44,6 +41,10 @@ if (EMSCRIPTEN)
+   target_compile_definitions(basis_transcoder.js PRIVATE NDEBUG BASISD_SUPPORT_UASTC=1 BASISD_SUPPORT_BC7=1 BASISD_SUPPORT_ATC=0 BASISD_SUPPORT_ASTC_HIGHER_OPAQUE_QUALITY=0 BASISD_SUPPORT_PVRTC2=0 BASISD_SUPPORT_FXT1=0 BASISD_SUPPORT_ETC2_EAC_RG11=0 BASISU_SUPPORT_ENCODING=0 ${KTX2_DEFINITION} ${ZSTD_DEFINITION} )
    target_compile_options(basis_transcoder.js PRIVATE -O3 -fno-strict-aliasing)
    target_include_directories(basis_transcoder.js PRIVATE ../../transcoder)
- 
++  
 +  if(ZSTD_LIBRARIES)
 +      target_link_libraries(basis_transcoder.js ${ZSTD_LIBRARIES})
 +  endif()
-+
+ 
    set_target_properties(basis_transcoder.js PROPERTIES
        OUTPUT_NAME "basis_transcoder"
-       SUFFIX ".js"
diff --git a/external_imported/vcpkg/ports/ktx/0003-libtool.patch b/external_imported/vcpkg/ports/ktx/0003-libtool.patch
deleted file mode 100644
index 1736d8f4b..000000000
--- a/external_imported/vcpkg/ports/ktx/0003-libtool.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bc679fd1..13052501 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -826,7 +826,7 @@ set(CLI OFF) # Only build as library not the CLI astcencoder
- add_subdirectory(lib/astc-encoder)
- set_property(TARGET ${ASTC_LIB_TARGET} PROPERTY POSITION_INDEPENDENT_CODE ON)
- 
--if(KTX_FEATURE_STATIC_LIBRARY AND NOT WIN32 AND NOT EMSCRIPTEN)
-+if(KTX_FEATURE_STATIC_LIBRARY AND APPLE)
-     # Make a single static library to simplify linking.
-     add_dependencies(ktx ${ASTC_LIB_TARGET})
-     add_custom_command( TARGET ktx
-@@ -856,7 +856,7 @@ if(KTX_FEATURE_DOC)
- endif()
- 
- set(KTX_INSTALL_TARGETS ktx)
--if(KTX_FEATURE_STATIC_LIBRARY AND (WIN32 OR EMSCRIPTEN))
-+if(KTX_FEATURE_STATIC_LIBRARY AND NOT APPLE)
-     list(APPEND KTX_INSTALL_TARGETS ${ASTC_LIB_TARGET})
- endif()
- 
diff --git a/external_imported/vcpkg/ports/ktx/0003-mkversion.patch b/external_imported/vcpkg/ports/ktx/0003-mkversion.patch
new file mode 100644
index 000000000..ee8b3c4af
--- /dev/null
+++ b/external_imported/vcpkg/ports/ktx/0003-mkversion.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/version.cmake b/cmake/version.cmake
+index 9a90622..0fc3521 100644
+--- a/cmake/version.cmake
++++ b/cmake/version.cmake
+@@ -176,7 +176,7 @@ function( create_version_header dest_path target )
+         add_custom_command(
+             OUTPUT ${version_h_output}
+             # On Windows this command has to be invoked by a shell in order to work
+-            COMMAND ${BASH_EXECUTABLE} -c "\"./mkversion\" \"-o\" \"version.h\" \"${dest_path}\""
++            COMMAND "${BASH_EXECUTABLE}" -- ./mkversion -o version.h "${dest_path}"
+             WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+             COMMENT "Generate ${version_h_output}"
+             VERBATIM
diff --git a/external_imported/vcpkg/ports/ktx/0004-quirks.patch b/external_imported/vcpkg/ports/ktx/0004-quirks.patch
new file mode 100644
index 000000000..afc34236d
--- /dev/null
+++ b/external_imported/vcpkg/ports/ktx/0004-quirks.patch
@@ -0,0 +1,21 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1500844..810914e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -263,7 +263,7 @@ if(MSVC)
+     # ";" argument separator is problematic. Can't use a GenEx `$<IF:`
+     # because `/W4;/WX` is returned as a single string.
+     add_compile_options( /W4;$<$<BOOL:${KTX_WERROR}>:/WX> )
+-    add_compile_options( $<IF:$<CONFIG:Debug>,/Gz,/O2> )
++    add_compile_options( $<IF:$<CONFIG:Debug>,,/O2> )
+     # Enable UTF-8 support
+     add_compile_options( $<$<C_COMPILER_ID:MSVC>:/utf-8> )
+     add_compile_options( $<$<CXX_COMPILER_ID:MSVC>:/utf-8> )
+@@ -946,6 +946,7 @@ if(EMSCRIPTEN)
+ endif()
+ 
+ add_library( objUtil STATIC
++    EXCLUDE_FROM_ALL
+     utils/argparser.cpp
+     utils/argparser.h
+     utils/ktxapp.h
diff --git a/external_imported/vcpkg/ports/ktx/0005-no-vendored-libs.patch b/external_imported/vcpkg/ports/ktx/0005-no-vendored-libs.patch
new file mode 100644
index 000000000..77cdd8518
--- /dev/null
+++ b/external_imported/vcpkg/ports/ktx/0005-no-vendored-libs.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d7ca937..ffcbe95 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1059,10 +1059,10 @@ endif()
+ # except for building the ktx library.
+ if((KTX_FEATURE_TOOLS OR KTX_FEATURE_TESTS) AND NOT TARGET fmt::fmt)
+     set(FMT_SYSTEM_HEADERS ON)
+-    add_subdirectory(other_projects/fmt)
++    find_package(fmt CONFIG REQUIRED)
+ endif()
+ if(KTX_FEATURE_TOOLS AND NOT TARGET cxxopts::cxxopts)
+-    add_subdirectory(other_projects/cxxopts)
++    find_package(cxxopts CONFIG REQUIRED)
+ endif()
+ 
+ # Tools
diff --git a/external_imported/vcpkg/ports/ktx/portfile.cmake b/external_imported/vcpkg/ports/ktx/portfile.cmake
index c1e508c0a..935b2ac86 100644
--- a/external_imported/vcpkg/ports/ktx/portfile.cmake
+++ b/external_imported/vcpkg/ports/ktx/portfile.cmake
@@ -1,59 +1,63 @@
-set(PORT_VERSION 4.1.0-rc3)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KhronosGroup/KTX-Software
-    REF f8dc35f0c22b38064c4d1f05830cea69c79f0d38 #v${PORT_VERSION}
-    SHA512 9af28506141f7f016ef6295ee980907024c591a0ba4704c90713ecdb3accbd82363b42829efadaa3897e154250123bf52152a6f0751166bea84cf6e0f4bd5e79
+    REF "v${VERSION}"
+    SHA512 5a89f8986464705ec36ac1becaddd0ff335e4c3c235468aaef0e963fcfeda4c0d669a086b91e61c16a3ae9e1fa5bf456dccf12cc65720e1a22e7cc0f30552541
     HEAD_REF master
-    FILE_DISAMBIGUATOR 1
     PATCHES
         0001-Use-vcpkg-zstd.patch
         0002-Fix-versioning.patch
-        0003-libtool.patch
+        0003-mkversion.patch
+        0004-quirks.patch
+        0005-no-vendored-libs.patch
 )
+file(REMOVE "${SOURCE_PATH}/other_include/zstd_errors.h")
 
+vcpkg_list(SET OPTIONS)
 if(VCPKG_TARGET_IS_WINDOWS)
     vcpkg_acquire_msys(MSYS_ROOT
         PACKAGES
             bash
         DIRECT_PACKAGES
             # Required for "getopt"
-            "https://repo.msys2.org/msys/x86_64/util-linux-2.35.2-1-x86_64.pkg.tar.zst"
-            ff951c2cd96d0fda87bacb505c93e4aa1f9aeb35f829c52b5a7862d05e167f69605a4927a0e7197b5ee2b2fa5cb56619ad7a6ba293ede4765fdcacedf2ed35da
-        )
+            "https://repo.msys2.org/msys/x86_64/util-linux-2.35.2-3-x86_64.pkg.tar.zst"
+            da26540881cd5734072717133307e5d1a27a60468d3656885507833b80f24088c5382eaa0234b30bdd9e8484a6638b4514623f5327f10b19eed36f12158e8edb
+            # Required for "dos2unix"
+            "https://mirror.msys2.org/msys/x86_64/dos2unix-7.5.1-1-x86_64.pkg.tar.zst"
+            83d85e6ccea746ef9e8153a0d605e774dbe7efc0ee952804acfee4ffd7e3b0386a353b45ff989dd99bc3ce75968209fea3d246ad2af88bbb5c4eca12fc5a8f92
+    )
     vcpkg_add_to_path("${MSYS_ROOT}/usr/bin")
-
-    file(REMOVE
-        "${SOURCE_PATH}/other_include/zstd.h"
-        "${SOURCE_PATH}/other_include/zstd_errors.h")
+    vcpkg_list(APPEND OPTIONS "-DBASH_EXECUTABLE=${MSYS_ROOT}/usr/bin/bash.exe")
 endif()
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC)
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
-        tools KTX_FEATURE_TOOLS
-        vulkan KTX_FEATURE_VULKAN
+        tools   KTX_FEATURE_TOOLS
+        vulkan  KTX_FEATURE_VK_UPLOAD
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-        -DKTX_VERSION_FULL=v${PORT_VERSION}
+        -DKTX_VERSION_FULL=v${VERSION}
         -DKTX_FEATURE_TESTS=OFF
         -DKTX_FEATURE_LOADTEST_APPS=OFF
         -DKTX_FEATURE_STATIC_LIBRARY=${ENABLE_STATIC}
         ${FEATURE_OPTIONS}
+        ${OPTIONS}
+        # Do not regenerate headers (needs more dependencies)
+        -DCMAKE_DISABLE_FIND_PACKAGE_Vulkan=1
     DISABLE_PARALLEL_CONFIGURE
 )
 
 vcpkg_cmake_install()
-vcpkg_copy_pdbs()
 
 if(tools IN_LIST FEATURES)
     vcpkg_copy_tools(
         TOOL_NAMES
+            ktx
             toktx
             ktxsc
             ktxinfo
@@ -61,18 +65,18 @@ if(tools IN_LIST FEATURES)
             ktx2check
         AUTO_CLEAN
     )
-    vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
+else()
+    vcpkg_copy_pdbs()
 endif()
 
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ktx)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin")
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
 
-configure_file("${SOURCE_PATH}/LICENSE.md" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
 file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*")
 file(COPY ${LICENSE_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSES")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
diff --git a/external_imported/vcpkg/ports/ktx/vcpkg.json b/external_imported/vcpkg/ports/ktx/vcpkg.json
index 8ee67f896..102e28131 100644
--- a/external_imported/vcpkg/ports/ktx/vcpkg.json
+++ b/external_imported/vcpkg/ports/ktx/vcpkg.json
@@ -1,11 +1,14 @@
 {
   "name": "ktx",
-  "version-semver": "4.1.0-rc3",
+  "version-semver": "4.3.0-beta1",
   "port-version": 1,
-  "description": "A small library of functions for writing and reading KTX files, and instantiating OpenGL®, OpenGL ES™� and Vulkan® textures from them",
+  "description": [
+    "The Khronos KTX library and tools.",
+    "Functions for writing and reading KTX files, and instantiating OpenGL®, OpenGL ES™� and Vulkan® textures from them."
+  ],
   "homepage": "https://github.com/KhronosGroup/KTX-Software",
-  "license": "Apache-2.0",
-  "supports": "!(uwp | x86 | (arm & !arm64))",
+  "license": null,
+  "supports": "arm64 | x64 | !windows",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
@@ -19,10 +22,16 @@
   ],
   "features": {
     "tools": {
-      "description": "Build tools"
+      "description": "Build tools",
+      "supports": "!android",
+      "dependencies": [
+        "cxxopts",
+        "fmt"
+      ]
     },
     "vulkan": {
-      "description": "Build Vulkan support"
+      "description": "Build Vulkan support",
+      "supports": "!emscripten"
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/kubazip/portfile.cmake b/external_imported/vcpkg/ports/kubazip/portfile.cmake
index e08713a12..b7cba8bf6 100644
--- a/external_imported/vcpkg/ports/kubazip/portfile.cmake
+++ b/external_imported/vcpkg/ports/kubazip/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO kuba--/zip
-    REF 42151612e8546c55485ec38cf0d57e57e51a8abd #v0.2.4
-    SHA512 9cbb7bcb8095c365c4529f06c883f3aa0c1038ed3aa6a0419dafb90355abf6e5cd02f7ffd5cbb54fe3893102bb21f568d415b71500630ad203a1f911b6e52ef5
+    REF "v${VERSION}"
+    SHA512 959805452f566b24ee78bc56794403733d19e86885a7f94581fca4218817a65ea4ea8b79457a452e0cc06992dc2165b3ff90360cec5f43cd8c0f934027ee9fd5
     HEAD_REF master
     PATCHES
         fix_targets.patch
@@ -18,4 +18,4 @@ vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/kubazip)
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/UNLICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/UNLICENSE")
diff --git a/external_imported/vcpkg/ports/kubazip/vcpkg.json b/external_imported/vcpkg/ports/kubazip/vcpkg.json
index 1d296ea8e..aee73b083 100644
--- a/external_imported/vcpkg/ports/kubazip/vcpkg.json
+++ b/external_imported/vcpkg/ports/kubazip/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kubazip",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "description": "A portable, simple zip library written in C",
   "homepage": "https://github.com/kuba--/zip",
   "license": "Unlicense",
diff --git a/external_imported/vcpkg/ports/kuku/portfile.cmake b/external_imported/vcpkg/ports/kuku/portfile.cmake
index 98ff18775..0cfe1ebf4 100644
--- a/external_imported/vcpkg/ports/kuku/portfile.cmake
+++ b/external_imported/vcpkg/ports/kuku/portfile.cmake
@@ -1,23 +1,23 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+if(VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO microsoft/Kuku
-    REF 1338c4ae2211ab4c739022ff57f48ce5a76531d5
-    SHA512 6cba13b7fc8c453acbfcb4921ee3acc9c3e91d4bba0e01480ea396e17f85288d0179342090111a2e3c056b6918c7b09ec63c41116eb4021e63c54acc19631156
-    HEAD_REF master
+    REF "v${VERSION}"
+    SHA512 4b0f0cae191c70d20337fb1581fa06a8fe363a942cf3a3b6be59fbef551b70446405fb1e4e5e7ec917d5519e8d2ad0ea59bd59c36dbf917e838fc1a1cd6a3bef
+    HEAD_REF main
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE
 )
 
-vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Kuku-2.1)
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Kuku-2.1)
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/kuku/vcpkg.json b/external_imported/vcpkg/ports/kuku/vcpkg.json
index 2f7b13515..df16f989c 100644
--- a/external_imported/vcpkg/ports/kuku/vcpkg.json
+++ b/external_imported/vcpkg/ports/kuku/vcpkg.json
@@ -1,7 +1,17 @@
 {
   "name": "kuku",
-  "version-string": "2.1",
-  "port-version": 1,
-  "description": "Kuku is a simple open-source (MIT licensed) cuckoo hashing library developed by the Cryptography and Privacy Research group at Microsoft.",
-  "homepage": "https://github.com/microsoft/Kuku"
+  "version": "2.1.0",
+  "description": "Kuku is a compact and convenient cuckoo hashing library written in C++.",
+  "homepage": "https://github.com/microsoft/Kuku",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/kvasir-mpl/portfile.cmake b/external_imported/vcpkg/ports/kvasir-mpl/portfile.cmake
index 7208bcc8a..f41ef5c96 100644
--- a/external_imported/vcpkg/ports/kvasir-mpl/portfile.cmake
+++ b/external_imported/vcpkg/ports/kvasir-mpl/portfile.cmake
@@ -6,24 +6,22 @@ vcpkg_from_github(
     HEAD_REF development
 )
 
-vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES
     test   BUILD_WITH_TEST
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS -DBUILD_TESTING=${BUILD_WITH_TEST}
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
 # Move CMake config files to the right place
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/kvasir_mpl)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/kvasir_mpl)
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
 
 # Handle copyright
-file(COPY ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
\ No newline at end of file
+file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/kvasir-mpl/vcpkg.json b/external_imported/vcpkg/ports/kvasir-mpl/vcpkg.json
index 4d817575a..0f64a72dc 100644
--- a/external_imported/vcpkg/ports/kvasir-mpl/vcpkg.json
+++ b/external_imported/vcpkg/ports/kvasir-mpl/vcpkg.json
@@ -1,9 +1,19 @@
 {
   "name": "kvasir-mpl",
-  "version-string": "2019-08-06",
-  "port-version": 1,
+  "version-date": "2019-08-06",
+  "port-version": 3,
   "description": "This library is part of the Kvasir project. Kvasir is a collection of zero cost statically checked libraries for resource constrained systems including microcontrollers.",
   "homepage": "https://github.com/kvasir-io/mpl",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
   "features": {
     "test": {
       "description": "Build with test"
diff --git a/external_imported/vcpkg/ports/lager/portfile.cmake b/external_imported/vcpkg/ports/lager/portfile.cmake
index ed2bb6da5..7c55973bd 100644
--- a/external_imported/vcpkg/ports/lager/portfile.cmake
+++ b/external_imported/vcpkg/ports/lager/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO arximboldi/lager
-    REF c87a4c7fd0368bea346f41191b8bc0b54a3e9d80
-    SHA512 788586078fdc07f0bd899148ddb0ad255fc6e18254901de65c2d1e43f9637ed8a8c121e8d0d26f043e86c7764ea1ff6ce323a791ba7d577589b4c80a329619d4
+    REF 2016df38be90ee176bcb73ea414be2318bc1ef31
+    SHA512 07d9f2cf128ad2e751abbfaa03969524ffba785ac2696e6b94ee8e28166fc3ab427de2fc6a98eba50d2f936879b9e878a011c3ba9a25ba39109e7939d39c4902
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/lager/vcpkg.json b/external_imported/vcpkg/ports/lager/vcpkg.json
index ee05059aa..112af4136 100644
--- a/external_imported/vcpkg/ports/lager/vcpkg.json
+++ b/external_imported/vcpkg/ports/lager/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "lager",
-  "version-date": "2022-02-21",
+  "version-date": "2023-03-19",
   "description": "C++ library for value-oriented design using the unidirectional data-flow architecture",
   "homepage": "https://sinusoid.es/lager/",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/lapack-reference/portfile.cmake b/external_imported/vcpkg/ports/lapack-reference/portfile.cmake
index 2f569f803..1eb3401e9 100644
--- a/external_imported/vcpkg/ports/lapack-reference/portfile.cmake
+++ b/external_imported/vcpkg/ports/lapack-reference/portfile.cmake
@@ -69,6 +69,7 @@ vcpkg_cmake_configure(
         "-DUSE_OPTIMIZED_BLAS=${USE_OPTIMIZED_BLAS}"
         "-DCMAKE_REQUIRE_FIND_PACKAGE_BLAS=${USE_OPTIMIZED_BLAS}"
         "-DCBLAS=${CBLAS}"
+        "-DTEST_FORTRAN_COMPILER=OFF"
         ${FORTRAN_CMAKE}
     MAYBE_UNUSED_VARIABLES
         CMAKE_REQUIRE_FIND_PACKAGE_BLAS
diff --git a/external_imported/vcpkg/ports/lapack-reference/vcpkg.json b/external_imported/vcpkg/ports/lapack-reference/vcpkg.json
index e073cf664..6f30ae7a6 100644
--- a/external_imported/vcpkg/ports/lapack-reference/vcpkg.json
+++ b/external_imported/vcpkg/ports/lapack-reference/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "lapack-reference",
   "version": "3.11.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "LAPACK - Linear Algebra PACKage",
   "homepage": "http://www.netlib.org/lapack/",
   "license": "BSD-3-Clause-Open-MPI",
diff --git a/external_imported/vcpkg/ports/lapack/portfile.cmake b/external_imported/vcpkg/ports/lapack/portfile.cmake
index 2a59fa726..ea9381244 100644
--- a/external_imported/vcpkg/ports/lapack/portfile.cmake
+++ b/external_imported/vcpkg/ports/lapack/portfile.cmake
@@ -1,5 +1,5 @@
 SET(VCPKG_POLICY_EMPTY_PACKAGE enabled)
 
 # Make sure LAPACK can be found
-vcpkg_configure_cmake(SOURCE_PATH ${CURRENT_PORT_DIR}
-                      OPTIONS -DCMAKE_PREFIX_PATH="${CURRENT_PACKAGES_DIR}")
+vcpkg_cmake_configure(SOURCE_PATH "${CURRENT_PORT_DIR}"
+                      OPTIONS "-DCMAKE_PREFIX_PATH=${CURRENT_PACKAGES_DIR}")
diff --git a/external_imported/vcpkg/ports/lapack/vcpkg.json b/external_imported/vcpkg/ports/lapack/vcpkg.json
index 70a2aabec..5112e419d 100644
--- a/external_imported/vcpkg/ports/lapack/vcpkg.json
+++ b/external_imported/vcpkg/ports/lapack/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "lapack",
   "version-date": "2022-02-22",
+  "port-version": 2,
   "description": "Metapackage for packages which provide LAPACK",
   "license": null,
   "dependencies": [
@@ -11,6 +12,10 @@
     {
       "name": "lapack-reference",
       "platform": "!((arm & windows) | uwp)"
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/launch-darkly-server/fix-confilct-with-openssl.patch b/external_imported/vcpkg/ports/launch-darkly-server/fix-confilct-with-openssl.patch
new file mode 100644
index 000000000..871a1540b
--- /dev/null
+++ b/external_imported/vcpkg/ports/launch-darkly-server/fix-confilct-with-openssl.patch
@@ -0,0 +1,26 @@
+diff --git a/sha1.c b/sha1.c
+index fe8da83..53ad2c4 100644
+--- a/sha1.c
++++ b/sha1.c
+@@ -279,7 +279,7 @@ void SHA1Final(
+     memset(&finalcount, '\0', sizeof(finalcount));
+ }
+ 
+-void SHA1(
++void SHA1_CLIBS(
+     char *hash_out,
+     const char *str,
+     int len)
+diff --git a/sha1.h b/sha1.h
+index 96bb008..53c4b01 100644
+--- a/sha1.h
++++ b/sha1.h
+@@ -36,7 +36,7 @@ void SHA1Final(
+     SHA1_CTX * context
+     );
+ 
+-void SHA1(
++void SHA1_CLIBS(
+     char *hash_out,
+     const char *str,
+     int len);
diff --git a/external_imported/vcpkg/ports/launch-darkly-server/fix-depend-clib.patch b/external_imported/vcpkg/ports/launch-darkly-server/fix-depend-clib.patch
new file mode 100644
index 000000000..297343b00
--- /dev/null
+++ b/external_imported/vcpkg/ports/launch-darkly-server/fix-depend-clib.patch
@@ -0,0 +1,13 @@
+diff --git a/src/evaluate.c b/src/evaluate.c
+index f702419..e80fa6c 100644
+--- a/src/evaluate.c
++++ b/src/evaluate.c
+@@ -1246,7 +1246,7 @@ LDi_bucketUser(
+             char        digest[21], encoded[17];
+             const float longScale = 1152921504606846975.0;
+ 
+-            SHA1(digest, raw, strlen(raw));
++            SHA1_CLIBS(digest, raw, strlen(raw));
+ 
+             /* encodes to hex, and shortens, 16 characters in hex 8 bytes */
+             status = hexify(
diff --git a/external_imported/vcpkg/ports/launch-darkly-server/portfile.cmake b/external_imported/vcpkg/ports/launch-darkly-server/portfile.cmake
index 0bc1a9ec1..f05a7889b 100644
--- a/external_imported/vcpkg/ports/launch-darkly-server/portfile.cmake
+++ b/external_imported/vcpkg/ports/launch-darkly-server/portfile.cmake
@@ -7,6 +7,8 @@ vcpkg_from_github(
     PATCHES
         findPCRE.patch
         FixStrictPrototypes.patch # required with clang-15
+        removeWarningAsError.patch
+        fix-depend-clib.patch
 )
 
 
@@ -36,6 +38,8 @@ vcpkg_from_github(
     REF fa1d96ec293d2968791603548125e3274bd6b472
     SHA512 fd7dfbed4ac10e2c482da1cd460dabf0a53965e6fa17fab97156becb8214e435ee3605b2748705141380e254de7c32ab42da5e42cd6e4494f7ecaafb3b9e19f0
     HEAD_REF master
+    PATCHES
+        fix-confilct-with-openssl.patch
 )
 
 vcpkg_from_github(
diff --git a/external_imported/vcpkg/ports/launch-darkly-server/removeWarningAsError.patch b/external_imported/vcpkg/ports/launch-darkly-server/removeWarningAsError.patch
new file mode 100644
index 000000000..8174ed47a
--- /dev/null
+++ b/external_imported/vcpkg/ports/launch-darkly-server/removeWarningAsError.patch
@@ -0,0 +1,32 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9acff7d..12904e6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -184,7 +184,6 @@ else()
+                 -pedantic
+                 -Wall
+                 -Wextra
+-                -Werror
+                 -Wstrict-prototypes
+                 -Wmissing-prototypes
+                 -Wmissing-declarations
+diff --git a/c-sdk-common/CMakeLists.txt b/c-sdk-common/CMakeLists.txt
+index 15340f7..091e46d 100644
+--- a/c-sdk-common/CMakeLists.txt
++++ b/c-sdk-common/CMakeLists.txt
+@@ -87,7 +87,6 @@ else()
+                 -pedantic
+                 -Wall
+                 -Wextra
+-                -Werror
+                 -Wstrict-prototypes
+                 -Wmissing-prototypes
+                 -Wmissing-declarations
+@@ -123,7 +122,6 @@ else()
+         PRIVATE -fno-omit-frame-pointer
+                 -Wall
+                 -Wextra
+-                -Werror
+                 -Wstrict-prototypes
+                 -Wmissing-prototypes
+                 -Wmissing-declarations
diff --git a/external_imported/vcpkg/ports/launch-darkly-server/vcpkg.json b/external_imported/vcpkg/ports/launch-darkly-server/vcpkg.json
index 9f08c2e88..3bb4be09e 100644
--- a/external_imported/vcpkg/ports/launch-darkly-server/vcpkg.json
+++ b/external_imported/vcpkg/ports/launch-darkly-server/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "launch-darkly-server",
   "version": "2.8.6",
+  "port-version": 2,
   "description": "LaunchDarkly server-side SDK for C/C++",
   "homepage": "https://github.com/launchdarkly/c-server-sdk",
   "license": "Apache-2.0",
-  "supports": "!uwp & !arm",
+  "supports": "!uwp",
   "dependencies": [
     "curl",
     "pcre",
diff --git a/external_imported/vcpkg/ports/lazy-importer/portfile.cmake b/external_imported/vcpkg/ports/lazy-importer/portfile.cmake
index 808452099..a735967e4 100644
--- a/external_imported/vcpkg/ports/lazy-importer/portfile.cmake
+++ b/external_imported/vcpkg/ports/lazy-importer/portfile.cmake
@@ -3,12 +3,11 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO JustasMasiulis/lazy_importer
-    REF edac6afddb9e0df2e3affa8b2d631caafcba69ed
-    SHA512 45f024c34fa1c8854b8b77706934ce95449b2416a5c1dcab970d0df068c9b5bf0de12994c13ac215e629f8ae21fdab75b4ce6535f56ca7508f490a4c664e5b1a
+    REF 4810f51d63438865e508c2784ea00811d9beb2ea
+    SHA512 1b2f330586cb80d8ecf13dd27c5a407c778c3a12aeffa493d31b75fa9c3186ed9f67838164c48c64e2bb4a9fe804a77625dd1cd996d661545580e29d57c3494b
     HEAD_REF master
 )
 
 file(COPY "${SOURCE_PATH}/include/lazy_importer.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
 
-# Handle copyright
-configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/lazy-importer/vcpkg.json b/external_imported/vcpkg/ports/lazy-importer/vcpkg.json
index 7f3073487..51aa00e96 100644
--- a/external_imported/vcpkg/ports/lazy-importer/vcpkg.json
+++ b/external_imported/vcpkg/ports/lazy-importer/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "lazy-importer",
-  "version-date": "2022-02-09",
+  "version-date": "2023-08-03",
   "description": "Library for importing functions from dlls in a hidden, reverse engineer unfriendly way",
   "homepage": "https://github.com/JustasMasiulis/lazy_importer"
 }
diff --git a/external_imported/vcpkg/ports/lcm/vcpkg.json b/external_imported/vcpkg/ports/lcm/vcpkg.json
index a76cae68a..3a0666e9a 100644
--- a/external_imported/vcpkg/ports/lcm/vcpkg.json
+++ b/external_imported/vcpkg/ports/lcm/vcpkg.json
@@ -1,14 +1,14 @@
 {
   "name": "lcm",
   "version": "1.4.0",
-  "port-version": 5,
+  "port-version": 6,
   "description": [
     "Lightweight Communications and Marshalling (LCM)",
     "LCM is a set of libraries and tools for message passing and data marshalling, targeted at real-time systems where high-bandwidth and low latency are critical. It provides a publish/subscribe message passing model and automatic marshalling/unmarshalling code generation with bindings for applications in a variety of programming languages."
   ],
   "homepage": "https://github.com/lcm-proj/lcm",
   "license": "LGPL-2.1-or-later",
-  "supports": "!osx",
+  "supports": "!osx & !xbox",
   "dependencies": [
     "glib",
     {
diff --git a/external_imported/vcpkg/ports/leaf/vcpkg.json b/external_imported/vcpkg/ports/leaf/vcpkg.json
index 88c24fca5..aa842d473 100644
--- a/external_imported/vcpkg/ports/leaf/vcpkg.json
+++ b/external_imported/vcpkg/ports/leaf/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "leaf",
-  "version-string": "0.2.2",
-  "port-version": 1,
+  "version": "0.2.2",
+  "port-version": 2,
   "description": "Deprecated boost-leaf port.",
   "dependencies": [
     "boost-leaf"
diff --git a/external_imported/vcpkg/ports/lemon/vcpkg.json b/external_imported/vcpkg/ports/lemon/vcpkg.json
index b75102e54..453d7f280 100644
--- a/external_imported/vcpkg/ports/lemon/vcpkg.json
+++ b/external_imported/vcpkg/ports/lemon/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "lemon",
-  "version-string": "0",
-  "port-version": 1,
+  "version": "0",
+  "port-version": 2,
   "description": "Deprecated port, use liblemon instead",
   "dependencies": [
     "liblemon"
diff --git a/external_imported/vcpkg/ports/lensfun/fix_build.patch b/external_imported/vcpkg/ports/lensfun/fix_build.patch
new file mode 100644
index 000000000..000cba86f
--- /dev/null
+++ b/external_imported/vcpkg/ports/lensfun/fix_build.patch
@@ -0,0 +1,22 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 087928c..d1664ce 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -102,7 +102,7 @@ IF(BUILD_FOR_SSE2)
+   ENDIF()
+ ENDIF()
+ 
+-IF(WIN32)
++IF(0)
+   INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/libs/getopt)
+   # base path for searching for glib on windows
+   IF(NOT GLIB2_BASE_DIR)
+@@ -205,7 +205,7 @@ IF(BUILD_DOC)
+   ADD_SUBDIRECTORY(docs)
+ ENDIF()
+ 
+-IF(WIN32 AND NOT BUILD_STATIC)
++IF(0)
+   FIND_FILE(GLIB2_DLL
+             NAMES glib-2.0-0.dll glib-2.dll glib-2-vs9.dll
+             PATHS "${GLIB2_BASE_DIR}/bin"
diff --git a/external_imported/vcpkg/ports/lensfun/portfile.cmake b/external_imported/vcpkg/ports/lensfun/portfile.cmake
new file mode 100644
index 000000000..766c7a201
--- /dev/null
+++ b/external_imported/vcpkg/ports/lensfun/portfile.cmake
@@ -0,0 +1,66 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO lensfun/lensfun
+    REF "v${VERSION}"
+    SHA512 4db9a08d51ba50c7c2ff528d380bb28e34698b2bb5c40e5f3deeaa5544c888ac7e0f638bbc3f33a4f75dbb67e0425ca36ce6d8cd1d8c043a4173a2df47de08c6
+    HEAD_REF master
+    PATCHES fix_build.patch
+)
+
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" LENSFUN_STATIC_LIB)
+string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" LENSFUN_STATIC_CRT)
+
+set(LENSFUN_EXTRA_OPTS "")
+if("python" IN_LIST FEATURES)
+    find_file(INITIAL_PYTHON3
+        NAMES "python3${VCPKG_HOST_EXECUTABLE_SUFFIX}" "python${VCPKG_HOST_EXECUTABLE_SUFFIX}"
+        PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools/python3"
+        NO_DEFAULT_PATH
+        REQUIRED
+    )
+    x_vcpkg_get_python_packages(OUT_PYTHON_VAR PYTHON3
+        PYTHON_EXECUTABLE "${INITIAL_PYTHON3}"
+        PYTHON_VERSION "3"
+        PACKAGES setuptools
+    )
+else()
+    set(PYTHON3 "false")
+endif()
+
+if(VCPKG_TARGET_IS_WINDOWS)
+    list(APPEND LENSFUN_EXTRA_OPTS -DPLATFORM_WINDOWS=ON)
+endif()
+
+if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
+    list(APPEND LENSFUN_EXTRA_OPTS -DBUILD_FOR_SSE=OFF -DBUILD_FOR_SSE2=OFF)
+endif()
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        ${LENSFUN_EXTRA_OPTS}
+        -DBUILD_STATIC=${LENSFUN_STATIC_LIB}
+        -DBUILD_WITH_MSVC_STATIC_RUNTIME=${LENSFUN_STATIC_CRT}
+        -DBUILD_TESTS=OFF
+        -DBUILD_DOC=OFF
+        -DBUILD_LENSTOOL=OFF
+        -DINSTALL_HELPER_SCRIPTS=OFF
+        "-DPYTHON=${PYTHON3}"
+)
+
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+vcpkg_fixup_pkgconfig()
+
+file(REMOVE_RECURSE
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/debug/share"
+)
+
+file(READ "${SOURCE_PATH}/README.md" license_comment)
+string(REGEX REPLACE "^.*\n(LICENSE\n)---+\n(.*)" "\\1\\2" license_comment "${license_comment}")
+string(REGEX REPLACE "[^\n]+\n---+.*\$" "" license_comment "${license_comment}")
+vcpkg_install_copyright(
+    COMMENT "${license_comment}"
+    FILE_LIST "${SOURCE_PATH}/docs/gpl-3.0.txt" "${SOURCE_PATH}/docs/lgpl-3.0.txt"
+)
diff --git a/external_imported/vcpkg/ports/lensfun/vcpkg.json b/external_imported/vcpkg/ports/lensfun/vcpkg.json
new file mode 100644
index 000000000..36e771514
--- /dev/null
+++ b/external_imported/vcpkg/ports/lensfun/vcpkg.json
@@ -0,0 +1,30 @@
+{
+  "name": "lensfun",
+  "version": "0.3.4",
+  "port-version": 2,
+  "description": "Provide a open source database of photographic lenses and their characteristics",
+  "homepage": "https://lensfun.github.io/",
+  "license": null,
+  "supports": "!arm",
+  "dependencies": [
+    "glib",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
+  "features": {
+    "python": {
+      "description": "Build python module",
+      "supports": "native & !windows",
+      "dependencies": [
+        "python3",
+        "vcpkg-get-python-packages"
+      ]
+    }
+  }
+}
diff --git a/external_imported/vcpkg/ports/lest/vcpkg.json b/external_imported/vcpkg/ports/lest/vcpkg.json
index f8b68ff73..cd46d0193 100644
--- a/external_imported/vcpkg/ports/lest/vcpkg.json
+++ b/external_imported/vcpkg/ports/lest/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "lest",
-  "version-string": "1.35.1",
-  "port-version": 2,
+  "version": "1.35.1",
+  "port-version": 3,
   "description": "A modern, C++11-native, single-file header-only, tiny framework for unit-tests, TDD and BDD (includes C++98 variant)",
   "homepage": "https://github.com/martinmoene/lest"
 }
diff --git a/external_imported/vcpkg/ports/leveldb/fix-dependencies.patch b/external_imported/vcpkg/ports/leveldb/fix-dependencies.patch
index a0fe68651..5efc6385f 100644
--- a/external_imported/vcpkg/ports/leveldb/fix-dependencies.patch
+++ b/external_imported/vcpkg/ports/leveldb/fix-dependencies.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 98b87dc..76d2e9b 100644
+index f8285b8..39536fc 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -35,8 +35,14 @@ include(CheckIncludeFile)
+@@ -38,8 +38,14 @@ include(CheckIncludeFile)
  check_include_file("unistd.h" HAVE_UNISTD_H)
  
  include(CheckLibraryExists)
@@ -19,7 +19,7 @@ index 98b87dc..76d2e9b 100644
  check_library_exists(tcmalloc malloc "" HAVE_TCMALLOC)
  
  include(CheckCXXSymbolExists)
-@@ -246,10 +252,10 @@ if(HAVE_CLANG_THREAD_SAFETY)
+@@ -268,10 +274,10 @@ if(HAVE_CLANG_THREAD_SAFETY)
  endif(HAVE_CLANG_THREAD_SAFETY)
  
  if(HAVE_CRC32C)
diff --git a/external_imported/vcpkg/ports/leveldb/fix-util-install.patch b/external_imported/vcpkg/ports/leveldb/fix-util-install.patch
new file mode 100644
index 000000000..fb6502317
--- /dev/null
+++ b/external_imported/vcpkg/ports/leveldb/fix-util-install.patch
@@ -0,0 +1,16 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 39536fc..648de6d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -477,6 +477,11 @@ if(LEVELDB_INSTALL)
+     DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/leveldb"
+   )
+ 
++  file(GLOB HEADER_UTIL "${PROJECT_SOURCE_DIR}/util/*.h" )
++  file(GLOB HEADER_TABLE "${PROJECT_SOURCE_DIR}/table/*.h" )
++  install(FILES ${HEADER_UTIL} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/leveldb/util)
++  install(FILES ${HEADER_TABLE} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/leveldb/table)
++
+   include(CMakePackageConfigHelpers)
+   configure_package_config_file(
+     "cmake/${PROJECT_NAME}Config.cmake.in"
diff --git a/external_imported/vcpkg/ports/leveldb/fix_config.patch b/external_imported/vcpkg/ports/leveldb/fix_config.patch
deleted file mode 100644
index c5a83296b..000000000
--- a/external_imported/vcpkg/ports/leveldb/fix_config.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1409c06..98b87dc 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -437,6 +437,12 @@ if(LEVELDB_INSTALL)
-       "${PROJECT_BINARY_DIR}/leveldbConfigVersion.cmake"
-       COMPATIBILITY SameMajorVersion
-   )
-+  configure_package_config_file(${PROJECT_SOURCE_DIR}/cmake/leveldbConfig.cmake.in
-+              leveldbConfig.cmake
-+              INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/leveldb
-+              NO_CHECK_REQUIRED_COMPONENTS_MACRO
-+              PATH_VARS CMAKE_INSTALL_INCLUDEDIR
-+              )
-   install(
-     EXPORT leveldbTargets
-     NAMESPACE leveldb::
-@@ -444,7 +450,7 @@ if(LEVELDB_INSTALL)
-   )
-   install(
-     FILES
--      "${PROJECT_SOURCE_DIR}/cmake/leveldbConfig.cmake"
-+      "${PROJECT_BINARY_DIR}/leveldbConfig.cmake"
-       "${PROJECT_BINARY_DIR}/leveldbConfigVersion.cmake"
-     DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/leveldb"
-   )
diff --git a/external_imported/vcpkg/ports/leveldb/leveldbConfig.cmake.in b/external_imported/vcpkg/ports/leveldb/leveldbConfig.cmake.in
index 65b9bac51..4097fac7e 100644
--- a/external_imported/vcpkg/ports/leveldb/leveldbConfig.cmake.in
+++ b/external_imported/vcpkg/ports/leveldb/leveldbConfig.cmake.in
@@ -1,7 +1,6 @@
 @PACKAGE_INIT@
 include(CMakeFindDependencyMacro)
 
-set_and_check(leveldb_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
 find_dependency(Threads)
 
 if (@WITH_CRC32C@)
diff --git a/external_imported/vcpkg/ports/leveldb/portfile.cmake b/external_imported/vcpkg/ports/leveldb/portfile.cmake
index 2a01cbe8e..92c283b50 100644
--- a/external_imported/vcpkg/ports/leveldb/portfile.cmake
+++ b/external_imported/vcpkg/ports/leveldb/portfile.cmake
@@ -3,12 +3,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/leveldb
-    REF 1.22
-    SHA512 f9bbf5f466e7f707b94e19261762319ea9f65d41911690e84f59098551e2e69beccf756a414d705ade74ee96fd979bdb8b94c171c6f2cc83873cbd4a9380dbab
+    REF "${VERSION}"
+    SHA512 ac15eac29387b9f702a901b6567d47a9f8c17cf5c7d8700a77ec771da25158c83b04959c33f3d4de7a3f033ef08f545d14ba823a8d527e21889c4b78065b0f84
     HEAD_REF master
     PATCHES
-        fix_config.patch
         fix-dependencies.patch
+        fix-util-install.patch
 )
 
 file(COPY "${CURRENT_PORT_DIR}/leveldbConfig.cmake.in" DESTINATION "${SOURCE_PATH}/cmake")
@@ -37,4 +37,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/leveldb/vcpkg.json b/external_imported/vcpkg/ports/leveldb/vcpkg.json
index 050746db7..f33c459d1 100644
--- a/external_imported/vcpkg/ports/leveldb/vcpkg.json
+++ b/external_imported/vcpkg/ports/leveldb/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "leveldb",
-  "version": "1.22",
-  "port-version": 6,
+  "version": "1.23",
   "description": "LevelDB is a fast key-value storage library written at Google that provides an ordered mapping from string keys to string values.",
   "homepage": "https://github.com/google/leveldb",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/levmar/portfile.cmake b/external_imported/vcpkg/ports/levmar/portfile.cmake
index 1ed0ad75d..9efcacf99 100644
--- a/external_imported/vcpkg/ports/levmar/portfile.cmake
+++ b/external_imported/vcpkg/ports/levmar/portfile.cmake
@@ -4,15 +4,14 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 5b4c64b63be9b29d6ad2df435af86cd2c2e3216313378561a670ac6a392a51bbf1951e96c6b1afb77c570f23dd8e194017808e46929fec2d8d9a7fe6cf37022b
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
+vcpkg_extract_source_archive(
+    SOURCE_PATH
+    ARCHIVE "${ARCHIVE}"
     PATCHES add-install.patch # patch just adding the install commands to original CMakeLists.txt
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE
     OPTIONS
         -DHAVE_LAPACK=OFF
@@ -20,10 +19,10 @@ vcpkg_configure_cmake(
         -DBUILD_DEMO=OFF
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 
 # Handle duplicated debug includes
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/external_imported/vcpkg/ports/levmar/vcpkg.json b/external_imported/vcpkg/ports/levmar/vcpkg.json
index a72eb4b3f..217521f44 100644
--- a/external_imported/vcpkg/ports/levmar/vcpkg.json
+++ b/external_imported/vcpkg/ports/levmar/vcpkg.json
@@ -1,8 +1,14 @@
 {
   "name": "levmar",
   "version": "2.6",
-  "port-version": 1,
+  "port-version": 3,
   "description": "Levenberg-Marquardt nonlinear least squares optimization algorithm",
   "homepage": "http://users.ics.forth.gr/~lourakis/levmar/",
-  "supports": "windows & !uwp"
+  "supports": "windows & !uwp",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/lexbor/portfile.cmake b/external_imported/vcpkg/ports/lexbor/portfile.cmake
new file mode 100644
index 000000000..7f6bc8c21
--- /dev/null
+++ b/external_imported/vcpkg/ports/lexbor/portfile.cmake
@@ -0,0 +1,25 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO lexbor/lexbor
+    REF v${VERSION}
+    SHA512 add1832f2e1927538206329703cd717fb30cb6ae2f52e1a0042961062cbcafd2e3ce4437ee2081ad7b2d51c6b63b910be06987e47c4a7007321db52b2812e515
+)
+
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+    -DLEXBOR_BUILD_SHARED=${BUILD_SHARED}
+    -DLEXBOR_BUILD_STATIC=${BUILD_STATIC}
+)
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" 
+    "${CURRENT_PACKAGES_DIR}/include/lexbor/html/tree/insertion_mode"
+    "${CURRENT_PACKAGES_DIR}/debug/include/lexbor/html/tree/insertion_mode"
+)
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/lexbor/vcpkg.json b/external_imported/vcpkg/ports/lexbor/vcpkg.json
new file mode 100644
index 000000000..680ebf77d
--- /dev/null
+++ b/external_imported/vcpkg/ports/lexbor/vcpkg.json
@@ -0,0 +1,17 @@
+{
+  "name": "lexbor",
+  "version": "2.3.0",
+  "description": "Lexbor is development of an open source HTML Renderer library.",
+  "homepage": "https://github.com/lexbor/lexbor",
+  "supports": "!uwp",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/libaaplus/portfile.cmake b/external_imported/vcpkg/ports/libaaplus/portfile.cmake
index f7387aa85..0d88d1df5 100644
--- a/external_imported/vcpkg/ports/libaaplus/portfile.cmake
+++ b/external_imported/vcpkg/ports/libaaplus/portfile.cmake
@@ -7,10 +7,10 @@ vcpkg_download_distfile(
     SHA512 a7abf20feb49df00b95be987809a3dc8df3e9ff706dd5a873ecfdd695af125f858264e092b6b856e83685e9eb46fd46520cf09dfae892c32cbb71f925ba17b86
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE ${ARCHIVE_FILE}
-    REF ${VERSION}
+    SOURCE_BASE ${VERSION}
     NO_REMOVE_ONE_LEVEL
     PATCHES
         fix-cmakelists.patch
diff --git a/external_imported/vcpkg/ports/libaaplus/vcpkg.json b/external_imported/vcpkg/ports/libaaplus/vcpkg.json
index 35572ec24..2282eba6c 100644
--- a/external_imported/vcpkg/ports/libaaplus/vcpkg.json
+++ b/external_imported/vcpkg/ports/libaaplus/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "libaaplus",
   "version": "2.36",
+  "port-version": 1,
   "description": "libaaplus is an astronomical computations library by naughter software",
   "homepage": "http://www.naughter.com/aa.html",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/libadlmidi/cmake-package-export.patch b/external_imported/vcpkg/ports/libadlmidi/cmake-package-export.patch
index 263bfb487..1344ebbf0 100644
--- a/external_imported/vcpkg/ports/libadlmidi/cmake-package-export.patch
+++ b/external_imported/vcpkg/ports/libadlmidi/cmake-package-export.patch
@@ -66,21 +66,21 @@ index 271bb9b..1b6ba8f 100644
          DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
 +        
 +include(CMakePackageConfigHelpers)
-+configure_package_config_file(libADLMIDI-config.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/libADLMIDI-config.cmake"
++configure_package_config_file(libADLMIDIConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/libADLMIDIConfig.cmake"
 +    PATH_VARS CMAKE_INSTALL_PREFIX CMAKE_INSTALL_FULL_BINDIR CMAKE_INSTALL_FULL_INCLUDEDIR CMAKE_INSTALL_FULL_LIBDIR
 +    INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/libADLMIDI"
 +)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libADLMIDI-config.cmake
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libADLMIDIConfig.cmake
 +    DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/libADLMIDI"
 +)
  
  file(GLOB DOCTXT_FILES
      "${libADLMIDI_SOURCE_DIR}/LICENSE*.txt"
-diff --git a/libADLMIDI-config.cmake.in b/libADLMIDI-config.cmake.in
+diff --git a/libADLMIDIConfig.cmake.in b/libADLMIDIConfig.cmake.in
 new file mode 100644
 index 0000000..bd875fc
 --- /dev/null
-+++ b/libADLMIDI-config.cmake.in
++++ b/libADLMIDIConfig.cmake.in
 @@ -0,0 +1,30 @@
 +include(FeatureSummary)
 +set_package_properties(libADLMIDI PROPERTIES
diff --git a/external_imported/vcpkg/ports/libadlmidi/portfile.cmake b/external_imported/vcpkg/ports/libadlmidi/portfile.cmake
index 8792fa76c..8cf14e8a0 100644
--- a/external_imported/vcpkg/ports/libadlmidi/portfile.cmake
+++ b/external_imported/vcpkg/ports/libadlmidi/portfile.cmake
@@ -4,6 +4,7 @@ vcpkg_from_github(
     REF v${VERSION}
     SHA512 d827f13c60086b62bb4ffb098faeaa214fd83df52d3d5c19533b970d74b470c677e0aec76e91e05753574cf9bae1ccd02b77bd24d0ec1b2ad80b21cf541c7261
     PATCHES
+        # patches from master, they should be removed when a new version is out
         cmake-package-export.patch
         cmake-build-shared-libs-support.patch
 )
diff --git a/external_imported/vcpkg/ports/libadlmidi/vcpkg.json b/external_imported/vcpkg/ports/libadlmidi/vcpkg.json
index d32b607b7..dd6ed2d4a 100644
--- a/external_imported/vcpkg/ports/libadlmidi/vcpkg.json
+++ b/external_imported/vcpkg/ports/libadlmidi/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "libadlmidi",
   "version": "1.5.1",
+  "port-version": 1,
   "description": "libADLMIDI is a free Software MIDI synthesizer library with OPL3 emulation",
   "homepage": "https://github.com/Wohlstand/libADLMIDI",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/libadwaita/portfile.cmake b/external_imported/vcpkg/ports/libadwaita/portfile.cmake
index fc697195f..95bff5161 100644
--- a/external_imported/vcpkg/ports/libadwaita/portfile.cmake
+++ b/external_imported/vcpkg/ports/libadwaita/portfile.cmake
@@ -2,8 +2,8 @@ vcpkg_from_gitlab(
     GITLAB_URL https://gitlab.gnome.org/
     OUT_SOURCE_PATH SOURCE_PATH
     REPO GNOME/libadwaita
-    REF a905117bd2150de9e85d65f8cdce8d8fb001b89e # 1.2.0
-    SHA512 7fc3c054e261d09acefde5571848f36cbe0956c2a9a8c7b4dda255e2a48b96496b3481b325b13e9a93232f2280acb74d63872f3452b64d510d749109c0b0b078
+    REF "${VERSION}"
+    SHA512 5cea6396bab3439fb3ddef95fe86bc84955ce1eb426fc5dd323329eeab8a51e10de5f4d9c45380f905ceea43e094362a577a67386a3ddcefff362af030c8c7e3
     HEAD_REF main
     PATCHES
 )
@@ -20,7 +20,7 @@ vcpkg_configure_meson(
         -Dexamples=false
         -Dvapi=false
     ADDITIONAL_BINARIES
-        glib-genmarshal='${GLIB_TOOLS_DIR}/glib-genmarshal${VCPKG_HOST_EXECUTABLE_SUFFIX}'
+        glib-genmarshal='${GLIB_TOOLS_DIR}/glib-genmarshal'
         glib-mkenums='${GLIB_TOOLS_DIR}/glib-mkenums'
         glib-compile-resources='${GLIB_TOOLS_DIR}/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}'
         glib-compile-schemas='${GLIB_TOOLS_DIR}/glib-compile-schemas${VCPKG_HOST_EXECUTABLE_SUFFIX}'
diff --git a/external_imported/vcpkg/ports/libadwaita/vcpkg.json b/external_imported/vcpkg/ports/libadwaita/vcpkg.json
index 7c43a9e5a..8f1f5d229 100644
--- a/external_imported/vcpkg/ports/libadwaita/vcpkg.json
+++ b/external_imported/vcpkg/ports/libadwaita/vcpkg.json
@@ -1,9 +1,11 @@
 {
   "name": "libadwaita",
-  "version": "1.2.0",
+  "version": "1.3.2",
+  "port-version": 1,
   "description": "Building blocks for modern GNOME applications",
   "homepage": "https://gnome.pages.gitlab.gnome.org/libadwaita",
   "license": "LGPL-2.1-or-later",
+  "supports": "!xbox",
   "dependencies": [
     {
       "name": "glib",
diff --git a/external_imported/vcpkg/ports/libaes-siv/CMakeLists.txt b/external_imported/vcpkg/ports/libaes-siv/CMakeLists.txt
new file mode 100644
index 000000000..0e3f20a15
--- /dev/null
+++ b/external_imported/vcpkg/ports/libaes-siv/CMakeLists.txt
@@ -0,0 +1,74 @@
+cmake_minimum_required(VERSION 3.19)
+set(no_lib_project_name "aes_siv")
+project(libaes-siv LANGUAGES C)
+set(PROJECT_VERSION "${VERSION}")
+
+set(Header_Files "${no_lib_project_name}.h")
+set(Source_Files "${no_lib_project_name}.c")
+
+add_library("${PROJECT_NAME}" "${Header_Files}" "${Source_Files}")
+
+include(GNUInstallDirs)
+target_include_directories(
+  "${PROJECT_NAME}"
+  PUBLIC
+  "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>"
+  "$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>"
+  "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
+)
+target_compile_features("${PROJECT_NAME}" PRIVATE c_std_99)
+set(config_file "${CMAKE_BINARY_DIR}/include/${no_lib_project_name}_config.h")
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/config.h.in" "${config_file}")
+if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
+    set(CMAKE_C_FLAGS_DEBUG "-Wall -Wextra -Wstrict-prototypes -Wconversion -Og -ggdb3 -ftree-vectorize")
+    set(CMAKE_C_FLAGS_RELEASE "-Wall -Wextra -Wstrict-prototypes -Wconversion -O3 -fomit-frame-pointer -funroll-loops -ftree-vectorize -DNDEBUG")
+    set(CMAKE_C_FLAGS_RELWITHDEBINFO "-Wall -Wextra -Wstrict-prototypes -Wconversion  -ggdb3 -O3 -funroll-loops -ftree-vectorize -DNDEBUG")
+    set(CMAKE_C_FLAGS_MINSIZEREL "-Wall -Wextra -Wstrict-prototypes -Wconversion -Os -fomit-frame-pointer -ftree-vectorize -DNDEBUG")
+endif(CMAKE_C_COMPILER_ID STREQUAL "GNU")
+
+if(CMAKE_C_COMPILER_ID STREQUAL Clang OR CMAKE_C_COMPILER_ID STREQUAL AppleClang)
+    set(CMAKE_C_FLAGS_DEBUG "-Wall -Wextra -Wstrict-prototypes -Wconversion -O0 -ggdb3 -ftree-vectorize")
+    set(CMAKE_C_FLAGS_RELEASE "-Wall -Wextra -Wstrict-prototypes -Wconversion -O3 -fomit-frame-pointer -funroll-loops -ftree-vectorize -DNDEBUG")
+    set(CMAKE_C_FLAGS_RELWITHDEBINFO "-Wall -Wextra -Wstrict-prototypes -Wconversion -ggdb3 -O3 -funroll-loops -ftree-vectorize -DNDEBUG")
+    set(CMAKE_C_FLAGS_MINSIZEREL "-Wall -Wextra -Wstrict-prototypes -Wconversion -Os -fomit-frame-pointer -ftree-vectorize -DNDEBUG")
+endif(CMAKE_C_COMPILER_ID STREQUAL Clang OR CMAKE_C_COMPILER_ID STREQUAL AppleClang)
+
+find_package(OpenSSL REQUIRED COMPONENTS Crypto)
+target_link_libraries("${PROJECT_NAME}" PRIVATE OpenSSL::Crypto)
+
+install(
+  TARGETS                   "${PROJECT_NAME}"
+  EXPORT                    "unofficial-${PROJECT_NAME}Config"
+  RUNTIME       DESTINATION "${CMAKE_INSTALL_BINDIR}"
+  ARCHIVE       DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+  LIBRARY       DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+  PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+)
+set(cmake_config_file "${CMAKE_CURRENT_BINARY_DIR}/unofficial-${PROJECT_NAME}-config.cmake")
+file(CONFIGURE
+        OUTPUT  "${cmake_config_file}"
+        CONTENT [[
+include(CMakeFindDependencyMacro)
+find_dependency(OpenSSL)
+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-@PROJECT_NAME@Targets.cmake")
+]]
+        @ONLY
+)
+
+include(CMakePackageConfigHelpers)
+set(VERSION_FILE_PATH "${CMAKE_CURRENT_BINARY_DIR}/unofficial-${PROJECT_NAME}ConfigVersion.cmake")
+write_basic_package_version_file(
+        "${VERSION_FILE_PATH}"
+        VERSION       "${PROJECT_VERSION}"
+        COMPATIBILITY SameMajorVersion
+)
+install(FILES "${cmake_config_file}" "${VERSION_FILE_PATH}" DESTINATION "share/unofficial-${PROJECT_NAME}")
+install(FILES ${Header_Files} "${config_file}"
+        DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+
+install(
+  EXPORT      "unofficial-${PROJECT_NAME}Config"
+  FILE        "unofficial-${PROJECT_NAME}Targets.cmake"
+  NAMESPACE   "unofficial::${PROJECT_NAME}::"
+  DESTINATION "share/unofficial-${PROJECT_NAME}")
+
diff --git a/external_imported/vcpkg/ports/libaes-siv/header_rename.patch b/external_imported/vcpkg/ports/libaes-siv/header_rename.patch
new file mode 100644
index 000000000..db8ba1361
--- /dev/null
+++ b/external_imported/vcpkg/ports/libaes-siv/header_rename.patch
@@ -0,0 +1,39 @@
+diff --git a/aes_siv.c b/aes_siv.c
+index 00a510d..2b31ed3 100644
+--- a/aes_siv.c
++++ b/aes_siv.c
+@@ -5,7 +5,7 @@
+ #define _POSIX_C_SOURCE 200112L
+ #define _ISOC99_SOURCE 1
+
+-#include "config.h"
++#include "aes_siv_config.h"
+ #include "aes_siv.h"
+
+ #include <assert.h>
+diff --git a/bench.c b/bench.c
+index ea5a29b..61cb485 100644
+--- a/bench.c
++++ b/bench.c
+@@ -2,7 +2,7 @@
+  * SPDX-License-Identifier: Apache-2.0
+  */
+
+-#include "config.h"
++#include "aes_siv_config.h"
+ #include "aes_siv.h"
+
+ #define _POSIX_C_SOURCE 200112L
+diff --git a/tests.c b/tests.c
+index 996cc58..9ff9637 100644
+--- a/tests.c
++++ b/tests.c
+@@ -5,7 +5,7 @@
+ #define _POSIX_C_SOURCE 200112L
+ #define _ISOC99_SOURCE 1
+
+-#include "config.h"
++#include "aes_siv_config.h"
+ #include "aes_siv.h"
+
+ #undef NDEBUG
diff --git a/external_imported/vcpkg/ports/libaes-siv/portfile.cmake b/external_imported/vcpkg/ports/libaes-siv/portfile.cmake
new file mode 100644
index 000000000..5b625dae5
--- /dev/null
+++ b/external_imported/vcpkg/ports/libaes-siv/portfile.cmake
@@ -0,0 +1,34 @@
+if(VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO            dfoxfranke/libaes_siv
+    REF             9681279cfaa6e6399bb7ca3afbbc27fc2e19df4b
+    SHA512          96441420339bd11f37f4feff29f9306afa60e5b07ac7e7b879778c0e6964f8f679ffb7c1deca43ca054b7851e4e7bf5fca548dc60c92469fe9d3235cb5a37776
+    HEAD_REF        master
+    PATCHES
+        header_rename.patch
+)
+
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+     DESTINATION "${SOURCE_PATH}")
+
+vcpkg_cmake_configure(
+        SOURCE_PATH "${SOURCE_PATH}"
+        OPTIONS
+        "-DVERSION=${VERSION}"
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT})
+
+# Handle copyright
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
+
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage"
+     DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share"
+                    "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/external_imported/vcpkg/ports/libaes-siv/usage b/external_imported/vcpkg/ports/libaes-siv/usage
new file mode 100644
index 000000000..9d08d6cd6
--- /dev/null
+++ b/external_imported/vcpkg/ports/libaes-siv/usage
@@ -0,0 +1,3 @@
+libaes-siv provides CMake targets:
+    find_package(unofficial-libaes-siv CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE unofficial::libaes-siv::libaes-siv)
diff --git a/external_imported/vcpkg/ports/libaes-siv/vcpkg.json b/external_imported/vcpkg/ports/libaes-siv/vcpkg.json
new file mode 100644
index 000000000..f1dc46551
--- /dev/null
+++ b/external_imported/vcpkg/ports/libaes-siv/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "libaes-siv",
+  "version-date": "2020-10-15",
+  "description": "An RFC5297-compliant C implementation of AES-SIV.",
+  "homepage": "https://github.com/dfoxfranke/libaes_siv",
+  "license": "Apache-2.0",
+  "dependencies": [
+    "openssl",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/libaiff/portfile.cmake b/external_imported/vcpkg/ports/libaiff/portfile.cmake
index 97d8673b6..38c799e4c 100644
--- a/external_imported/vcpkg/ports/libaiff/portfile.cmake
+++ b/external_imported/vcpkg/ports/libaiff/portfile.cmake
@@ -11,17 +11,16 @@ vcpkg_from_sourceforge(
         buffer_uninitialized.patch
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h DESTINATION ${SOURCE_PATH}/libaiff)
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/config.h" DESTINATION "${SOURCE_PATH}/libaiff")
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS_DEBUG
         -DDISABLE_INSTALL_HEADERS=ON
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
 file(GLOB HEADERS "${CURRENT_PACKAGES_DIR}/include/libaiff/*.h")
 foreach(HEADER ${HEADERS})
@@ -34,4 +33,4 @@ foreach(HEADER ${HEADERS})
 endforeach()
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/external_imported/vcpkg/ports/libaiff/vcpkg.json b/external_imported/vcpkg/ports/libaiff/vcpkg.json
index d8e0abb4c..d5eaa228a 100644
--- a/external_imported/vcpkg/ports/libaiff/vcpkg.json
+++ b/external_imported/vcpkg/ports/libaiff/vcpkg.json
@@ -1,7 +1,13 @@
 {
   "name": "libaiff",
-  "version-string": "5.0",
-  "port-version": 7,
+  "version": "5.0",
+  "port-version": 9,
   "description": "LibAiff is an open-source library, providing C applications transparent read & write operations for Audio Interchange File Format (AIFF) files, with the goal of supporting all of its features",
-  "homepage": "https://sourceforge.net/projects/aifftools"
+  "homepage": "https://sourceforge.net/projects/aifftools",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/libalkimia/dll_names.diff b/external_imported/vcpkg/ports/libalkimia/dll_names.diff
deleted file mode 100644
index 3fb5a3a36..000000000
--- a/external_imported/vcpkg/ports/libalkimia/dll_names.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 643ffcf3d7b4ce59285343f92a1407927c111881..382d3c6ed244e24dec9f144c02e0c3459e8369a9 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -156,10 +156,12 @@ install(
- 
- generate_export_header(alkimia BASE_NAME alk EXPORT_FILE_NAME alkimia/alk_export.h)
- 
--if(WIN32)
--    set_target_properties(alkimia PROPERTIES SUFFIX "-${ALKIMIA_LIB_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
--else()
--    set_target_properties(alkimia PROPERTIES VERSION ${ALKIMIA_LIB_VERSION} SOVERSION ${ALKIMIA_LIB_SOVERSION})
-+if(BUILD_SHARED_LIBS)
-+    if(WIN32)
-+        set_target_properties(alkimia PROPERTIES SUFFIX "-${ALKIMIA_LIB_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
-+    else()
-+        set_target_properties(alkimia PROPERTIES VERSION ${ALKIMIA_LIB_VERSION} SOVERSION ${ALKIMIA_LIB_SOVERSION})
-+    endif()
- endif()
- set_target_properties(alkimia PROPERTIES OUTPUT_NAME alkimia${ALKIMIA_LIB_SUFFIX})
- set(INCLUDE_INSTALL_DIR include/alkimia/${ALKIMIA_INCLUDE_SUFFIX})
diff --git a/external_imported/vcpkg/ports/libalkimia/fix_explicit_shared_lib.diff b/external_imported/vcpkg/ports/libalkimia/fix_explicit_shared_lib.diff
deleted file mode 100644
index 598ee3d60..000000000
--- a/external_imported/vcpkg/ports/libalkimia/fix_explicit_shared_lib.diff
+++ /dev/null
@@ -1,70 +0,0 @@
-diff --git a/qml/CMakeLists.txt b/qml/CMakeLists.txt
-index f74449b591bafd4ad0c41627139a08e29028ab21..a317307a438542e4cf26d50643057b5e9b649594 100644
---- a/qml/CMakeLists.txt
-+++ b/qml/CMakeLists.txt
-@@ -22,7 +22,7 @@ else()
- endif()
- 
- configure_file(qmldir ${IMPORTS_DIR}/qmldir)
--add_library(qmlalkimia SHARED qmlalkimiaplugin.cpp)
-+add_library(qmlalkimia qmlalkimiaplugin.cpp)
- target_link_libraries(qmlalkimia ${LIBS} alkimia)
- 
- install(TARGETS qmlalkimia
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index e57c94adf6c3785e5c646c7c95b586392737d686..b467849c7ff25d2ce424b30591cfe9a1e9357a46 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -103,7 +103,7 @@ endforeach()
- add_definitions(-DKNSRC_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
- 
- ki18n_wrap_ui(alkimia_LIB_SRCS ${alkimia_UI} )
--add_library(alkimia SHARED ${alkimia_LIB_SRCS} ${alkimia_INTERNAL_SRCS} ${alkimia_LIB_HEADERS} ${alkimia_LIB_PRIVATE_HEADERS})
-+add_library(alkimia ${alkimia_LIB_SRCS} ${alkimia_INTERNAL_SRCS} ${alkimia_LIB_HEADERS} ${alkimia_LIB_PRIVATE_HEADERS})
- 
- kde_target_enable_exceptions(alkimia PUBLIC)
- if(BUILD_QT4)
-@@ -164,7 +164,13 @@ endif()
- set_target_properties(alkimia PROPERTIES OUTPUT_NAME alkimia${ALKIMIA_LIB_SUFFIX})
- set(INCLUDE_INSTALL_DIR include/alkimia/${ALKIMIA_INCLUDE_SUFFIX})
- 
--install(TARGETS alkimia
-+if(${BUILD_SHARED_LIBS})
-+    set(alkimia_export_targets alkimia)
-+else()
-+    set(alkimia_export_targets alkimia alkimia-internal)
-+endif()
-+
-+install(TARGETS ${alkimia_export_targets}
-     EXPORT  alkimiaTargets
-     ${INSTALL_TARGETS_DEFAULT_ARGS}
- )
-@@ -228,7 +234,7 @@ configure_package_config_file(
- 
- ########### install files ###############
- 
--export(TARGETS alkimia
-+export(TARGETS ${alkimia_export_targets}
-     FILE "${CMAKE_CURRENT_BINARY_DIR}/LibAlkimia${ALKIMIA_PATH_SUFFIX}Targets.cmake"
-     NAMESPACE Alkimia::
- )
-diff --git a/src/LibAlkimiaConfig.cmake.in b/src/LibAlkimiaConfig.cmake.in
-index a8893c6fe347ce2d2fe1e0a2854a206e0e41901c..8dcfdf8c13f4306a349052d1c4194e65725a50b4 100644
---- a/src/LibAlkimiaConfig.cmake.in
-+++ b/src/LibAlkimiaConfig.cmake.in
-@@ -12,6 +12,15 @@ else()
- endif()
- find_dependency(@MP_CMAKE_MODULE@)
- 
-+if (NOT @BUILD_SHARED_LIBS@)
-+    find_dependency(KF5Completion)
-+    find_dependency(KF5I18n)
-+    find_dependency(KF5NewStuff)
-+    find_dependency(KF5IconThemes)
-+    find_dependency(KF5TextWidgets)
-+    find_dependency(KF5KIO)
-+endif()
-+
- include("${CMAKE_CURRENT_LIST_DIR}/LibAlkimia@ALKIMIA_PATH_SUFFIX@Targets.cmake")
- 
- set_and_check(LIBALKIMIA_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
diff --git a/external_imported/vcpkg/ports/libalkimia/portfile.cmake b/external_imported/vcpkg/ports/libalkimia/portfile.cmake
index a9ba9230e..c45555c99 100644
--- a/external_imported/vcpkg/ports/libalkimia/portfile.cmake
+++ b/external_imported/vcpkg/ports/libalkimia/portfile.cmake
@@ -1,12 +1,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/alkimia
-    REF 595186bee8409f30e5db091fffa245fc53ad92e8
-    SHA512 509082e22bc0a2ce0586e1167df14fd42ac85321315c1ee2914f60e695d1e2e8beae4fc93d16d0053edb520fc391a3dbe30777638285b295e761ad70512688ca
+    REF "v${VERSION}"
+	SHA512 ec7867e439178d6ed104c388c60bfe0bad223a9e35f4d9e05f2a7b3b2b2badac74b9a872f7922f58bb2b7a1127da742c430eff7caca71388085abdd1ad12cb1d
     HEAD_REF master
-    PATCHES
-        fix_explicit_shared_lib.diff
-        dll_names.diff                  # https://invent.kde.org/office/alkimia/-/commit/0ff901025a747ab31ab7efba9f8899b06774f60a
 )
 
 # Prevent KDEClangFormat from writing to source effectively blocking parallel configure
diff --git a/external_imported/vcpkg/ports/libalkimia/vcpkg.json b/external_imported/vcpkg/ports/libalkimia/vcpkg.json
index 90cd8e2e0..69e3ce0cf 100644
--- a/external_imported/vcpkg/ports/libalkimia/vcpkg.json
+++ b/external_imported/vcpkg/ports/libalkimia/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "libalkimia",
-  "version": "8.1.70",
-  "port-version": 1,
+  "version": "8.1.72",
   "description": "Common functionality for finance applications.",
   "homepage": "https://community.kde.org/Alkimia/libalkimia",
   "license": "LGPL-2.1-or-later",
+  "supports": "!xbox",
   "dependencies": [
     "ecm",
     {
diff --git a/external_imported/vcpkg/ports/libao/vcpkg.json b/external_imported/vcpkg/ports/libao/vcpkg.json
index 18f7a2675..fe6117b53 100644
--- a/external_imported/vcpkg/ports/libao/vcpkg.json
+++ b/external_imported/vcpkg/ports/libao/vcpkg.json
@@ -1,11 +1,11 @@
 {
   "name": "libao",
   "version": "1.2.2",
-  "port-version": 4,
+  "port-version": 5,
   "description": "libao - A Cross-platform Audio Library",
   "homepage": "https://github.com/xiph/libao",
   "license": "GPL-2.0",
-  "supports": "!uwp",
+  "supports": "!uwp & !xbox",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/libass/CMakeLists.txt b/external_imported/vcpkg/ports/libass/CMakeLists.txt
index 9fb8548cb..f4f0aa299 100644
--- a/external_imported/vcpkg/ports/libass/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/libass/CMakeLists.txt
@@ -1,23 +1,20 @@
 cmake_minimum_required(VERSION 3.9)
-project(libass C CXX)
+project(libass C)
 
-set(LIBASS_VERSION 0.16.0)
-
-configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h)
+set(LIBASS_VERSION 0.17.1)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
-add_compile_definitions(CONFIG_FREETYPE)
-add_compile_definitions(CONFIG_FRIBIDI)
-add_compile_definitions(CONFIG_HARFBUZZ)
+set(CONFIG_FREETYPE 1)
+set(CONFIG_FRIBIDI 1)
+set(CONFIG_HARFBUZZ 1)
 
-file (GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/libass/*.c)
+file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/libass/*.c)
 
-include(CheckCSourceCompiles)
 set(PKG_REQUIRES_LIBASS "harfbuzz >= 1.2.3, fribidi >= 0.19.1, freetype2 >= 9.17.3")
 set(PKG_LIBS_LIBASS)
 if(WIN32)
-  add_compile_definitions(CONFIG_DIRECTWRITE)
+  set(CONFIG_DIRECTWRITE 1)
   list(FILTER SOURCES EXCLUDE REGEX ".*ass_coretext.c$")
   list(FILTER SOURCES EXCLUDE REGEX ".*ass_fontconfig.c$")
 
@@ -25,10 +22,11 @@ if(WIN32)
   set(FONT_LIBRARY gdi32)
   set(PKG_LIBS_LIBASS -lgdi32)
 elseif(APPLE)
-  add_compile_definitions(CONFIG_CORETEXT)
+  set(CONFIG_CORETEXT 1)
   list(FILTER SOURCES EXCLUDE REGEX ".*ass_directwrite.c$")
   list(FILTER SOURCES EXCLUDE REGEX ".*ass_fontconfig.c$")
 
+  include(CheckCSourceCompiles)
   check_c_source_compiles(
     "
     #include <ApplicationServices/ApplicationServices.h>
@@ -39,56 +37,51 @@ elseif(APPLE)
     "
     CHECK_OLD_OSX
   )
-  if (CHECK_OLD_OSX)
+  if(CHECK_OLD_OSX)
     set(FONT_LIBRARY "-framework ApplicationServices -framework CoreFoundation")
     set(PKG_LIBS_LIBASS "-framework ApplicationServices -framework CoreFoundation")
   else()
     set(FONT_LIBRARY "-framework CoreText -framework CoreFoundation")
     set(PKG_LIBS_LIBASS "-framework CoreText -framework CoreFoundation")
   endif()
-else()
-  add_compile_definitions(CONFIG_FONTCONFIG)
+elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+  set(CONFIG_FONTCONFIG 1)
   list(FILTER SOURCES EXCLUDE REGEX ".*ass_coretext.c$")
   list(FILTER SOURCES EXCLUDE REGEX ".*ass_directwrite.c$")
 
   find_package(Fontconfig REQUIRED)
   set(FONT_LIBRARY Fontconfig::Fontconfig)
   set(PKG_REQUIRES_LIBASS "fontconfig >= 2.10.92, ${PKG_REQUIRES_LIBASS}")
+else()
+  list(FILTER SOURCES EXCLUDE REGEX ".*ass_directwrite.c$")
+  list(FILTER SOURCES EXCLUDE REGEX ".*ass_coretext.c$")
+  list(FILTER SOURCES EXCLUDE REGEX ".*ass_fontconfig.c$")
 endif()
 
-if (NOT WIN32)
+if(NOT WIN32)
   set(PKG_LIBS_LIBASS "${PKG_LIBS_LIBASS} -lm")
 endif()
 
 find_package(Freetype REQUIRED)
 
-find_path(FRIBIDI_INCLUDE_DIR
-          NAMES fribidi.h
-          PATH_SUFFIXES fribidi)
-
-find_path(HARFBUZZ_INCLUDE_DIR
-          NAMES hb.h
-          PATH_SUFFIXES harfbuzz)
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(FRIBIDI REQUIRED IMPORTED_TARGET fribidi)
+pkg_check_modules(HARFBUZZ REQUIRED IMPORTED_TARGET harfbuzz)
 
 # libass use win32 api to open files on windows since https://github.com/libass/libass/commit/f664ced049394e2a5d4300ba526e206df73ec729
 # so remove dependency dirent.
 
-find_library(FRIBIDI_LIBRARY NAMES libfribidi fribidi)
-find_library(HARFBUZZ_LIBRARY NAMES harfbuzz)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h)
 
 add_library(ass ${SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/libass.def)
 
 target_include_directories(ass PRIVATE
-  ${FRIBIDI_INCLUDE_DIR}
-  ${HARFBUZZ_INCLUDE_DIR})
-if(DIRENT_INCLUDE_DIR)
-    target_include_directories(ass PRIVATE
-      ${DIRENT_INCLUDE_DIR})
-endif()
+  PkgConfig::FRIBIDI
+  PkgConfig::HARFBUZZ)
 target_link_libraries(ass PRIVATE
   Freetype::Freetype
-  ${FRIBIDI_LIBRARY}
-  ${HARFBUZZ_LIBRARY}
+  PkgConfig::FRIBIDI
+  PkgConfig::HARFBUZZ
   ${FONT_LIBRARY})
 
 install(TARGETS ass
@@ -103,11 +96,11 @@ set(libdir ${CMAKE_INSTALL_PREFIX}/lib)
 set(includedir ${CMAKE_INSTALL_PREFIX}/include)
 set(PACKAGE_VERSION ${LIBASS_VERSION})
 if(BUILD_SHARED_LIBS)
-  set(PKG_REQUIRES_PRIVATE ${PKG_REQUIRES_LIBASS})
-  set(PKG_LIBS_PRIVATE ${PKG_LIBS_LIBASS})
-else()
   set(PKG_REQUIRES_PUBLIC ${PKG_REQUIRES_LIBASS})
   set(PKG_LIBS_PUBLIC ${PKG_LIBS_LIBASS})
+else()
+  set(PKG_REQUIRES_PRIVATE ${PKG_REQUIRES_LIBASS})
+  set(PKG_LIBS_PRIVATE ${PKG_LIBS_LIBASS})
 endif()
 configure_file(libass.pc.in libass.pc @ONLY)
 install(FILES
diff --git a/external_imported/vcpkg/ports/libass/config.h.in b/external_imported/vcpkg/ports/libass/config.h.in
index ffc4c1b49..fc2445dde 100644
--- a/external_imported/vcpkg/ports/libass/config.h.in
+++ b/external_imported/vcpkg/ports/libass/config.h.in
@@ -1 +1,14 @@
-#define CONFIG_SOURCEVERSION "tarball: 0.16.0"
+#define CONFIG_SOURCEVERSION "tarball: @LIBASS_VERSION@"
+
+#cmakedefine CONFIG_ICONV
+#cmakedefine CONFIG_FREETYPE
+#cmakedefine CONFIG_FRIBIDI
+#cmakedefine CONFIG_HARFBUZZ
+#cmakedefine CONFIG_LIBPNG
+#cmakedefine CONFIG_UNIBREAK
+#cmakedefine CONFIG_FONTCONFIG
+#cmakedefine CONFIG_CORETEXT
+#cmakedefine CONFIG_DIRECTWRITE
+#cmakedefine01 CONFIG_ASM
+#cmakedefine01 ARCH_X86
+#cmakedefine01 CONFIG_LARGE_TILES
diff --git a/external_imported/vcpkg/ports/libass/portfile.cmake b/external_imported/vcpkg/ports/libass/portfile.cmake
index 45cf6ad53..0ea90c7fd 100644
--- a/external_imported/vcpkg/ports/libass/portfile.cmake
+++ b/external_imported/vcpkg/ports/libass/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libass/libass
-    REF 0.16.0
-    SHA512 fea93b36d05cd69a5920b603951dd63f46b2434e0dcbb12414bf6e1e584bacc2743fbfc03682d0a672bbfe9bcc057452a942f9967d95a30e535bd3694e40fc7d
+    REF 0.17.1
+    SHA512 8bc83347c87c47577cd52230b3698c34301250e9a23f190a565c913defcd47a05695a4f7d9cd2e9a6ad0cfc6341e8ea2d6d779b1d714b2d6144466d2dea53951
     HEAD_REF master
 )
 
@@ -15,6 +15,10 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
 file(COPY ${SOURCE_PATH}/libass/ass.h ${SOURCE_PATH}/libass/ass_types.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/ass)
 
+vcpkg_find_acquire_program(PKGCONFIG)
+get_filename_component(PKGCONFIG_EXE_PATH ${PKGCONFIG} DIRECTORY)
+vcpkg_add_to_path(${PKGCONFIG_EXE_PATH})
+
 vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
 )
diff --git a/external_imported/vcpkg/ports/libass/vcpkg.json b/external_imported/vcpkg/ports/libass/vcpkg.json
index 31d51e293..56aac58a6 100644
--- a/external_imported/vcpkg/ports/libass/vcpkg.json
+++ b/external_imported/vcpkg/ports/libass/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "libass",
-  "version": "0.16.0",
+  "version": "0.17.1",
   "description": "libass is a portable subtitle renderer for the ASS/SSA (Advanced Substation Alpha/Substation Alpha) subtitle format",
   "homepage": "https://github.com/libass/libass",
   "license": "ISC",
diff --git a/external_imported/vcpkg/ports/libassert/portfile.cmake b/external_imported/vcpkg/ports/libassert/portfile.cmake
new file mode 100644
index 000000000..76473094d
--- /dev/null
+++ b/external_imported/vcpkg/ports/libassert/portfile.cmake
@@ -0,0 +1,29 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO jeremy-rifkin/libassert
+    REF "v${VERSION}"
+    SHA512 beba94e033f7e43c84123736a32725a333c915392d5dc57c26a63f832a507564d79f290a151cb136de8bded3d8d343dad3c4bf2efec9977d878df3c9a8677554
+    HEAD_REF main
+    PATCHES
+      runtime_destination.patch
+)
+
+vcpkg_list(SET options -DASSERT_USE_EXTERNAL_CPPTRACE=On)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+  vcpkg_list(APPEND options -DASSERT_STATIC=On)
+endif()
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS ${options}
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(
+    PACKAGE_NAME "libassert"
+    CONFIG_PATH "lib/cmake/assert"
+)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/libassert/runtime_destination.patch b/external_imported/vcpkg/ports/libassert/runtime_destination.patch
new file mode 100644
index 000000000..ae93937b7
--- /dev/null
+++ b/external_imported/vcpkg/ports/libassert/runtime_destination.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ccc959e..d3e5d09 100644
+--- a/CMakeLists.txt	2023-11-13 15:53:51.177963300 -0500
++++ b/CMakeLists.txt	2023-11-13 16:10:15.969939100 -0500
+@@ -112,7 +112,7 @@
+     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+     INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-    RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    RUNTIME DESTINATION bin
+   )
+ 
+   install(
diff --git a/external_imported/vcpkg/ports/libassert/vcpkg.json b/external_imported/vcpkg/ports/libassert/vcpkg.json
new file mode 100644
index 000000000..bb5639e1d
--- /dev/null
+++ b/external_imported/vcpkg/ports/libassert/vcpkg.json
@@ -0,0 +1,19 @@
+{
+  "name": "libassert",
+  "version": "1.2.2",
+  "description": "The most over-engineered and overpowered C++ assertion library.",
+  "homepage": "https://github.com/jeremy-rifkin/libassert",
+  "license": "MIT",
+  "supports": "!uwp",
+  "dependencies": [
+    "cpptrace",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/libassuan/cross-tools.patch b/external_imported/vcpkg/ports/libassuan/cross-tools.patch
index b999ef1fa..c805f6236 100644
--- a/external_imported/vcpkg/ports/libassuan/cross-tools.patch
+++ b/external_imported/vcpkg/ports/libassuan/cross-tools.patch
@@ -20,8 +20,8 @@ index 6b9a46d..5156865 100644
  	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) \
            $(LDFLAGS_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c
  
--assuan.h: assuan.h.in mkheader $(parts_of_assuan_h)
--	./mkheader $(host_os) $(srcdir)/assuan.h.in \
-+assuan.h: assuan.h.in $(HOST_TOOLS_PREFIX)/mkheader $(parts_of_assuan_h)
-+	$(HOST_TOOLS_PREFIX)/mkheader $(host_os) $(srcdir)/assuan.h.in \
+-assuan.h: assuan.h.in mkheader$(EXEEXT_FOR_BUILD) $(parts_of_assuan_h)
+-	./mkheader$(EXEEXT_FOR_BUILD) $(host_os) $(srcdir)/assuan.h.in \
++assuan.h: assuan.h.in $(HOST_TOOLS_PREFIX)/mkheader$(EXEEXT_FOR_BUILD) $(parts_of_assuan_h)
++	$(HOST_TOOLS_PREFIX)/mkheader$(EXEEXT_FOR_BUILD) $(host_os) $(srcdir)/assuan.h.in \
                     $(PACKAGE_VERSION) $(VERSION_NUMBER) >$@
diff --git a/external_imported/vcpkg/ports/libassuan/portfile.cmake b/external_imported/vcpkg/ports/libassuan/portfile.cmake
index 833b73f45..c840ee2e4 100644
--- a/external_imported/vcpkg/ports/libassuan/portfile.cmake
+++ b/external_imported/vcpkg/ports/libassuan/portfile.cmake
@@ -1,12 +1,10 @@
-vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
-
 vcpkg_download_distfile(tarball
     URLS
         "https://gnupg.org/ftp/gcrypt/libassuan/libassuan-${VERSION}.tar.bz2"
         "https://mirrors.dotsrc.org/gcrypt/libassuan/libassuan-${VERSION}.tar.bz2"
         "https://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/libassuan/libassuan-${VERSION}.tar.bz2"
     FILENAME "libassuan-${VERSION}.tar.bz2"
-    SHA512 70117f77aa43bbbe0ed28da5ef23834c026780a74076a92ec775e30f851badb423e9a2cb9e8d142c94e4f6f8a794988c1b788fd4bd2271e562071adf0ab16403
+    SHA512 dcca942d222a2c226a7e34ba7988ee0c3c55bd6032166eb472caf2053db89aeeea7a40e93d8c2887c7ee73c5f838e8b0725e8cfb595accc1606646559362f7ee
 )
 vcpkg_extract_source_archive(
     SOURCE_PATH
@@ -24,25 +22,29 @@ vcpkg_configure_make(
     AUTOCONFIG
     OPTIONS
         --disable-doc
-        --disable-silent-rules
-        OPTIONS_RELEASE
-            "GPG_ERROR_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/bin/gpg-error-config"
-        OPTIONS_DEBUG
-            "GPG_ERROR_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/debug/bin/gpg-error-config"
+        "GPG_ERROR_CONFIG=no"
+    OPTIONS_RELEASE
+        "GPGRT_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/bin/gpgrt-config"
+    OPTIONS_DEBUG
+        "GPGRT_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/debug/bin/gpgrt-config"
 )
 
 vcpkg_install_make()
 vcpkg_fixup_pkgconfig()
 vcpkg_copy_pdbs()
 
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/libassuan-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..")
+set(install_prefix "${CURRENT_INSTALLED_DIR}")
+if(VCPKG_HOST_IS_WINDOWS)
+    string(REGEX REPLACE "^([a-zA-Z]):/" "/\\1/" install_prefix "${install_prefix}")
+endif()
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/libassuan-config" "${install_prefix}" "`dirname $0`/../../..")
 if(NOT VCPKG_BUILD_TYPE)
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/libassuan-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/libassuan-config" "${install_prefix}" "`dirname $0`/../../../..")
 endif()
 
 if(NOT VCPKG_CROSSCOMPILING)
     file(INSTALL
-            "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/mkheader${VCPKG_TARGET_SUFFIX}"
+            "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/mkheader${VCPKG_TARGET_EXECUTABLE_SUFFIX}"
         DESTINATION "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}"
         USE_SOURCE_PERMISSIONS
     )
diff --git a/external_imported/vcpkg/ports/libassuan/vcpkg.json b/external_imported/vcpkg/ports/libassuan/vcpkg.json
index aaaf23e6c..75249750f 100644
--- a/external_imported/vcpkg/ports/libassuan/vcpkg.json
+++ b/external_imported/vcpkg/ports/libassuan/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "libassuan",
-  "version": "2.5.5",
+  "version": "2.5.6",
   "description": "A library implementing the so-called Assuan protocol",
   "homepage": "https://gnupg.org/software/libassuan/index.html",
   "license": "LGPL-2.1-or-later",
diff --git a/external_imported/vcpkg/ports/libatomic-ops/portfile.cmake b/external_imported/vcpkg/ports/libatomic-ops/portfile.cmake
index 239de3c26..45be0c270 100644
--- a/external_imported/vcpkg/ports/libatomic-ops/portfile.cmake
+++ b/external_imported/vcpkg/ports/libatomic-ops/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ivmai/libatomic_ops
-    REF 7a8de3bd9c6c61c68a866b849e7b1d17d76d2d36 # v7.7.0-20211109
-    SHA512 05555792a199526d8e164833f590cc57c5ee34672d81952787a09dd7008e947e4e8b6ad63fb6b8ee315294b98fdf743639622b3d9156d8a8f8363b431e875c45
+    REF "v${VERSION}"
+    SHA512 6b0ab1c01600346413184f66eaff1f707d1bc46fad9fd52ac855f2c66a55097dfad620c68b898459527142c1eb7ba50fde34498f962f24cec83268500c5bcccb
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/libatomic-ops/vcpkg.json b/external_imported/vcpkg/ports/libatomic-ops/vcpkg.json
index 46fcf653c..b85015f8f 100644
--- a/external_imported/vcpkg/ports/libatomic-ops/vcpkg.json
+++ b/external_imported/vcpkg/ports/libatomic-ops/vcpkg.json
@@ -1,10 +1,9 @@
 {
   "name": "libatomic-ops",
-  "version": "7.7.0",
-  "port-version": 1,
+  "version": "7.8.2",
   "description": "The atomic_ops project (Atomic memory update operations portable implementation)",
   "homepage": "https://github.com/ivmai/libatomic_ops",
-  "license": null,
+  "license": "MIT OR GPL-2.0-or-later",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/libavif/find-dependency.patch b/external_imported/vcpkg/ports/libavif/find-dependency.patch
new file mode 100644
index 000000000..42498eaf9
--- /dev/null
+++ b/external_imported/vcpkg/ports/libavif/find-dependency.patch
@@ -0,0 +1,51 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 46c6059..c0c047a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -660,7 +660,7 @@ endif()
+ if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
+     install(
+         TARGETS avif
+-        EXPORT ${PROJECT_NAME}-config
++        EXPORT ${PROJECT_NAME}-targets
+         RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+         ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+         LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+@@ -668,7 +668,7 @@ if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
+ 
+     # Enable CMake configs in VCPKG mode
+     if(BUILD_SHARED_LIBS OR VCPKG_TARGET_TRIPLET)
+-        install(EXPORT ${PROJECT_NAME}-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
++        install(EXPORT ${PROJECT_NAME}-targets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
+ 
+         include(CMakePackageConfigHelpers)
+         write_basic_package_version_file(
+@@ -677,6 +677,28 @@ if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
+         install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake
+                 DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+         )
++        file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake.in "@PACKAGE_INIT@\n")
++        if(UNIX AND NOT BUILD_SHARED_LIBS)
++            file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake.in "
++                include(CMakeFindDependencyMacro)
++                set(CMAKE_THREAD_PREFER_PTHREADS ON)
++                set(THREADS_PREFER_PTHREAD_FLAG ON)
++                find_dependency(Threads)
++                ")
++        endif()
++        file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake.in "include(\${CMAKE_CURRENT_LIST_DIR}/${PROJECT_NAME}-targets.cmake)")
++
++        # Install CMake configuration export file.
++        configure_package_config_file(
++            ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake.in
++            ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake
++            INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++            NO_SET_AND_CHECK_MACRO NO_CHECK_REQUIRED_COMPONENTS_MACRO
++        )
++        install(
++            FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake
++            DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++        )
+     endif()
+ 
+     # Handle both relative and absolute paths (e.g. NixOS) for a relocatable package
diff --git a/external_imported/vcpkg/ports/libavif/fix-compiler-warnings.patch b/external_imported/vcpkg/ports/libavif/fix-compiler-warnings.patch
deleted file mode 100644
index c3d5fd1ee..000000000
--- a/external_imported/vcpkg/ports/libavif/fix-compiler-warnings.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/read.c b/src/read.c
-index e45db4e..0ddb05a 100644
---- a/src/read.c
-+++ b/src/read.c
-@@ -945,7 +945,7 @@ static avifResult avifDecoderItemMaxExtent(const avifDecoderItem * item, const a
-                     return AVIF_RESULT_BMFF_PARSE_FAILED;
-                 }
-                 startOffset += remainingOffset;
--                extentSize -= remainingOffset;
-+                extentSize -= (size_t)remainingOffset;
-                 remainingOffset = 0;
-             }
-         }
-@@ -3147,7 +3147,7 @@ static avifResult avifDecoderPrepareSample(avifDecoder * decoder, avifDecodeSamp
-             if ((decoder->io->sizeHint > 0) && (sample->offset > decoder->io->sizeHint)) {
-                 return AVIF_RESULT_BMFF_PARSE_FAILED;
-             }
--            avifResult readResult = decoder->io->read(decoder->io, 0, sample->offset, bytesToRead, &sampleContents);
-+            avifResult readResult = decoder->io->read(decoder->io, 0, (size_t)sample->offset, bytesToRead, &sampleContents);
-             if (readResult != AVIF_RESULT_OK) {
-                 return readResult;
-             }
diff --git a/external_imported/vcpkg/ports/libavif/portfile.cmake b/external_imported/vcpkg/ports/libavif/portfile.cmake
index 6ff442f0a..d317345c4 100644
--- a/external_imported/vcpkg/ports/libavif/portfile.cmake
+++ b/external_imported/vcpkg/ports/libavif/portfile.cmake
@@ -2,18 +2,24 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO AOMediaCodec/libavif
     REF "v${VERSION}"
-    SHA512 4a9e2711fccddf35c477db6e2fa2f76c0648aafaa98b4e3f34df62c0fbd02ddcd57762f1f8149822da4f1bc3757ee75ec1d9ced5e56a54dbe9d0b43265aacd4c
+    SHA512 b713f35fd3e54e105e16f46012becdada86f522b4ed8ab7097a93fd437524b4f2c997c42d6f06828f93b53253b1d90302417afdb0bd8e09d176f64f19c7a0faa
     HEAD_REF master
     PATCHES
         disable-source-utf8.patch
-        fix-compiler-warnings.patch
+        find-dependency.patch # from https://github.com/AOMediaCodec/libavif/pull/1339
+)
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        aom AVIF_CODEC_AOM
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-        -DAVIF_CODEC_AOM=ON
         -DAVIF_BUILD_APPS=OFF
+        -DCMAKE_REQUIRE_FIND_PACKAGE_libyuv=ON
+        ${FEATURE_OPTIONS}
 )
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/libavif/vcpkg.json b/external_imported/vcpkg/ports/libavif/vcpkg.json
index 5b97bb38d..3643f297c 100644
--- a/external_imported/vcpkg/ports/libavif/vcpkg.json
+++ b/external_imported/vcpkg/ports/libavif/vcpkg.json
@@ -1,11 +1,10 @@
 {
   "name": "libavif",
-  "version-semver": "0.11.1",
+  "version-semver": "1.0.3",
   "description": "Library for encoding and decoding AVIF files",
   "homepage": "https://github.com/AOMediaCodec/libavif",
   "license": "BSD-2-Clause AND Apache-2.0",
   "dependencies": [
-    "aom",
     "libyuv",
     {
       "name": "vcpkg-cmake",
@@ -15,5 +14,13 @@
       "name": "vcpkg-cmake-config",
       "host": true
     }
-  ]
+  ],
+  "features": {
+    "aom": {
+      "description": "AV1 codec library",
+      "dependencies": [
+        "aom"
+      ]
+    }
+  }
 }
diff --git a/external_imported/vcpkg/ports/libbacktrace/portfile.cmake b/external_imported/vcpkg/ports/libbacktrace/portfile.cmake
index 1931568fc..1dfc5784c 100644
--- a/external_imported/vcpkg/ports/libbacktrace/portfile.cmake
+++ b/external_imported/vcpkg/ports/libbacktrace/portfile.cmake
@@ -5,8 +5,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ianlancetaylor/libbacktrace
-    REF 4f57c999716847e45505b3df170150876b545088
-    SHA512 1df2c9d3c119a2ec7b8b8940bff7ba6d28fe99587f565066ae25c216021431d3c26c8b336c38dd0490165244c66d68f9cba20dfc7836042b62f9d588946be4b5
+    REF 14818b7783eeb9a56c3f0fca78cefd3143f8c5f6
+    SHA512 d96c337cda6d230b162d983b2ab6ff6643895158f1d6f2e814bf28a2212a0cf46313935c2ed95a4408e6ad1da3c0c1ccb09847cf8b8b2ca6ad299101b8f79dd4
 )
 
 vcpkg_configure_make(
diff --git a/external_imported/vcpkg/ports/libbacktrace/vcpkg.json b/external_imported/vcpkg/ports/libbacktrace/vcpkg.json
index 4136d4f6b..5b70495e1 100644
--- a/external_imported/vcpkg/ports/libbacktrace/vcpkg.json
+++ b/external_imported/vcpkg/ports/libbacktrace/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "libbacktrace",
-  "version-date": "2021-03-14",
-  "port-version": 1,
+  "version-date": "2023-11-30",
   "description": "The libbacktrace library may be linked into a program or library and used to produce symbolic backtraces.",
   "homepage": "https://github.com/ianlancetaylor/libbacktrace",
   "supports": "!windows"
diff --git a/external_imported/vcpkg/ports/libbf/portfile.cmake b/external_imported/vcpkg/ports/libbf/portfile.cmake
index 7aa235a24..01b732c57 100644
--- a/external_imported/vcpkg/ports/libbf/portfile.cmake
+++ b/external_imported/vcpkg/ports/libbf/portfile.cmake
@@ -1,9 +1,26 @@
+vcpkg_download_distfile(
+    STDEXCEPT_PATCH
+    URLS https://github.com/mavam/libbf/commit/7720a2cdfdf211ac10d5f9c5b0988e1cae03d3ba.patch?full_index=1
+    SHA512 0f414bec3797361ad8c0cd2c869d21ee9c8f05609d2c00295e0b7cf252ca42ad2230bfece7dde839ac5d47221b54034446056337f16739a346510a14b383566c
+    FILENAME 7720a2cdfdf211ac10d5f9c5b0988e1cae03d3ba.patch
+)
+
+vcpkg_download_distfile(
+    ALGORITHM_PATCH
+    URLS https://github.com/mavam/libbf/commit/b2168dc4590a0251ec40ada4ab835eb3aec893e7.patch?full_index=1
+    SHA512 549163cec577d611c382d50f2dfbd99716f54d2d95b675ebd1cde5842e795b64272116cc0997c1415dad916cb7d1f538bd275d4f57013224af1eb9af7cfdf2e6
+    FILENAME b2168dc4590a0251ec40ada4ab835eb3aec893e7.patch
+)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mavam/libbf
     REF v1.0.0
     SHA512 04db7adbeb4bc6b20aed7f2676840499ed1afe499b4cab67f27d4a0ad234c1fb06eced24259f37870ec4760fe74d6d6307b5d11b3cd928b975661eb2966d4db8
     HEAD_REF master
+    PATCHES
+        "${STDEXCEPT_PATCH}"
+        "${ALGORITHM_PATCH}"
 )
 
 vcpkg_cmake_configure(
diff --git a/external_imported/vcpkg/ports/libbf/vcpkg.json b/external_imported/vcpkg/ports/libbf/vcpkg.json
index ec43ed92a..1433d3453 100644
--- a/external_imported/vcpkg/ports/libbf/vcpkg.json
+++ b/external_imported/vcpkg/ports/libbf/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libbf",
   "version": "1.0.0",
-  "port-version": 3,
+  "port-version": 4,
   "description": "Bloom filters for C++11.",
   "license": "BSD-3-Clause",
   "supports": "!windows",
diff --git a/external_imported/vcpkg/ports/libbson/disable-dynamic-when-static.patch b/external_imported/vcpkg/ports/libbson/disable-dynamic-when-static.patch
deleted file mode 100644
index 58942b05d..000000000
--- a/external_imported/vcpkg/ports/libbson/disable-dynamic-when-static.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/src/libbson/CMakeLists.txt b/src/libbson/CMakeLists.txt
-index d6df66f..88de79a 100644
---- a/src/libbson/CMakeLists.txt
-+++ b/src/libbson/CMakeLists.txt
-@@ -209,6 +209,7 @@ set (HEADERS_FORWARDING
-    ${PROJECT_SOURCE_DIR}/src/bson/forwarding/bson.h
- )
- 
-+if(NOT MONGOC_ENABLE_STATIC_BUILD)
- add_library (bson_shared SHARED ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING})
- set (CMAKE_CXX_VISIBILITY_PRESET hidden)
- target_compile_definitions (bson_shared
-@@ -275,6 +276,7 @@ if (WIN32)
-    # must be handled specially since we can't resolve them
-    set (BSON_SYSTEM_LIBRARIES ${BSON_SYSTEM_LIBRARIES} ws2_32)
- endif ()
-+endif()
- 
- if (MONGOC_ENABLE_STATIC_BUILD)
-    add_library (bson_static STATIC ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING})
-@@ -349,7 +351,7 @@ set (BSON_HEADER_INSTALL_DIR
- )
- 
- if (MONGOC_ENABLE_STATIC_INSTALL)
--   set (TARGETS_TO_INSTALL bson_shared bson_static)
-+   set (TARGETS_TO_INSTALL bson_static)
- else ()
-    set (TARGETS_TO_INSTALL bson_shared)
- endif ()
-@@ -400,12 +402,14 @@ configure_file (
-    ${CMAKE_CURRENT_BINARY_DIR}/src/libbson-1.0.pc
-    @ONLY)
- 
-+if(NOT MONGOC_ENABLE_STATIC_INSTALL)
- install (
-    FILES
-       ${CMAKE_CURRENT_BINARY_DIR}/src/libbson-1.0.pc
-    DESTINATION
-       ${CMAKE_INSTALL_LIBDIR}/pkgconfig
- )
-+endif()
- 
- if (MONGOC_ENABLE_STATIC_INSTALL)
-    configure_file (
diff --git a/external_imported/vcpkg/ports/libbson/fix-include-directory.patch b/external_imported/vcpkg/ports/libbson/fix-include-directory.patch
index 02a35320d..398644f90 100644
--- a/external_imported/vcpkg/ports/libbson/fix-include-directory.patch
+++ b/external_imported/vcpkg/ports/libbson/fix-include-directory.patch
@@ -1,33 +1,13 @@
 diff --git a/src/libbson/CMakeLists.txt b/src/libbson/CMakeLists.txt
-index 88de79a..c3cfd7e 100644
+index e3eaca4..ef3644b 100644
 --- a/src/libbson/CMakeLists.txt
 +++ b/src/libbson/CMakeLists.txt
-@@ -347,7 +347,7 @@ if (ENABLE_EXAMPLES)
- endif () # ENABLE_EXAMPLES
+@@ -302,7 +302,7 @@ endif () # ENABLE_EXAMPLES
+ # 8888888 888  888  88888P'  "Y888 "Y888888 888 888
  
  set (BSON_HEADER_INSTALL_DIR
 -   "${CMAKE_INSTALL_INCLUDEDIR}/libbson-${BSON_API_VERSION}"
 +   "${CMAKE_INSTALL_INCLUDEDIR}"
  )
- 
- if (MONGOC_ENABLE_STATIC_INSTALL)
-diff --git a/src/libbson/src/libbson-1.0.pc.in b/src/libbson/src/libbson-1.0.pc.in
-index b65abbc..33346f3 100644
---- a/src/libbson/src/libbson-1.0.pc.in
-+++ b/src/libbson/src/libbson-1.0.pc.in
-@@ -7,4 +7,4 @@ Name: libbson
- Description: The libbson BSON serialization library.
- Version: @VERSION@
- Libs: -L${libdir} -lbson-@BSON_API_VERSION@
--Cflags: -I${includedir}/libbson-@BSON_API_VERSION@
-+Cflags: -I${includedir}
-diff --git a/src/libbson/src/libbson-static-1.0.pc.in b/src/libbson/src/libbson-static-1.0.pc.in
-index 6ee58d0..e03a95b 100644
---- a/src/libbson/src/libbson-static-1.0.pc.in
-+++ b/src/libbson/src/libbson-static-1.0.pc.in
-@@ -7,4 +7,4 @@ Name: libbson static archive
- Description: The libbson BSON serialization library.
- Version: @VERSION@
- Libs: -L${libdir} -lbson-static-@BSON_API_VERSION@ @LIBBSON_LIBRARIES@
--Cflags: -I${includedir}/libbson-@BSON_API_VERSION@ -DBSON_STATIC
-+Cflags: -I${includedir} -DBSON_STATIC
+ function(install_export_target target)
+    # Tell pkg-config where the headers are going:
diff --git a/external_imported/vcpkg/ports/libbson/portfile.cmake b/external_imported/vcpkg/ports/libbson/portfile.cmake
index e83f51079..503bb788d 100644
--- a/external_imported/vcpkg/ports/libbson/portfile.cmake
+++ b/external_imported/vcpkg/ports/libbson/portfile.cmake
@@ -6,23 +6,27 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mongodb/mongo-c-driver
     REF "${VERSION}"
-    SHA512 36cd8844b1cc9a935c50afc240523f9aaac7cffa58a5d0f9850848f22ab0f1f5a7202ec9b56b0a7d15f075f665bcecbec63b28d2074d35a7cf25065f9075c15e
+    SHA512 a80e20917edb752ac5eb42534beaa0122a383037f83a554ee00ce37ae690be68521eaa282b4a5802a5440b61038bcd5414356e16a2ce729ba1193d0738a6ce1c
     HEAD_REF master
     PATCHES
-        disable-dynamic-when-static.patch
         fix-include-directory.patch # vcpkg legacy decision
 )
 file(WRITE "${SOURCE_PATH}/VERSION_CURRENT" "${VERSION}")
 
 # Cannot use string(COMPARE EQUAL ...)
 set(ENABLE_STATIC OFF)
+set(ENABLE_SHARED OFF)
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     set(ENABLE_STATIC ON)
+else()
+    set(ENABLE_SHARED ON)
 endif()
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    DISABLE_PARALLEL_CONFIGURE # because it writes the file VERSION_CURRENT in the source directory
     OPTIONS
+        "-DBUILD_VERSION=${VERSION}"
         -DENABLE_BSON=ON
         -DENABLE_EXAMPLES=OFF
         -DENABLE_ICU=OFF
@@ -32,10 +36,15 @@ vcpkg_cmake_configure(
         -DENABLE_SRV=OFF
         -DENABLE_SSL=OFF
         -DENABLE_STATIC=${ENABLE_STATIC}
+        -DENABLE_SHARED=${ENABLE_SHARED}
         -DENABLE_TESTS=OFF
         -DENABLE_UNINSTALL=OFF
         -DENABLE_ZLIB=SYSTEM
         -DENABLE_ZSTD=OFF
+        -DCMAKE_DISABLE_FIND_PACKAGE_Python=ON
+        -DCMAKE_DISABLE_FIND_PACKAGE_Python3=ON
+    MAYBE_UNUSED_VARIABLES
+        ENABLE_ICU
 )
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
diff --git a/external_imported/vcpkg/ports/libbson/vcpkg.json b/external_imported/vcpkg/ports/libbson/vcpkg.json
index d83d179c0..175d79b5c 100644
--- a/external_imported/vcpkg/ports/libbson/vcpkg.json
+++ b/external_imported/vcpkg/ports/libbson/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "libbson",
-  "version": "1.22.2",
+  "version": "1.25.4",
   "description": "libbson is a library providing useful routines related to building, parsing, and iterating BSON documents.",
   "homepage": "https://github.com/mongodb/mongo-c-driver/tree/master/src/libbson",
   "license": null,
diff --git a/external_imported/vcpkg/ports/libcaer/fix-libusb.diff b/external_imported/vcpkg/ports/libcaer/fix-libusb.diff
index d95120ccf..926f77fb1 100644
--- a/external_imported/vcpkg/ports/libcaer/fix-libusb.diff
+++ b/external_imported/vcpkg/ports/libcaer/fix-libusb.diff
@@ -1,17 +1,62 @@
 diff --git a/cmakemod/libcaerConfig.cmake.in b/cmakemod/libcaerConfig.cmake.in
-index cdf9f88..475d543 100644
+index cdf9f88..f0a17ba 100644
 --- a/cmakemod/libcaerConfig.cmake.in
 +++ b/cmakemod/libcaerConfig.cmake.in
-@@ -21,6 +21,12 @@
+@@ -21,6 +21,10 @@
  CMAKE_POLICY(PUSH)
  CMAKE_POLICY(VERSION 3.10)
  
 +include(CMakeFindDependencyMacro)
-+if(NOT "@CC_MSVC@")
-+    find_dependency(PkgConfig)
-+    pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0)
-+endif()
++find_dependency(PkgConfig)
++pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0)
 +
  INCLUDE(@PACKAGE_export_destination@/libcaer-exports.cmake)
  SET(libcaer_INCLUDE_DIRS @PACKAGE_include_dirs@)
  
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3ce94a6..f03d7ae 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -52,16 +52,12 @@ MESSAGE(STATUS "Base libraries: ${BASE_LIBS}")
+ INCLUDE(FindPkgConfig)
+ 
+ # Required: basic USB devices support
+-IF(CC_MSVC)
+-	FIND_PACKAGE(libusb CONFIG REQUIRED)
+-ELSE()
+-	PKG_CHECK_MODULES(
+-		libusb
+-		REQUIRED
+-		IMPORTED_TARGET
+-		libusb-1.0>=1.0.17)
+-	SET(LIBCAER_PKGCONFIG_REQUIRES_PRIVATE "libusb-1.0 >= 1.0.17")
+-ENDIF()
++PKG_CHECK_MODULES(
++    libusb
++    REQUIRED
++    IMPORTED_TARGET
++    libusb-1.0>=1.0.17)
++SET(LIBCAER_PKGCONFIG_REQUIRES_PRIVATE "libusb-1.0 >= 1.0.17")
+ 
+ # Optional: serial devices support
+ IF(ENABLE_SERIALDEV)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 0ef4ac7..6f70a26 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -49,12 +49,11 @@ ENDIF()
+ 
+ IF(CC_MSVC)
+ 	LIST(APPEND LIBCAER_SOURCES ../thirdparty/simple-stdatomic/stdatomic.c)
+-	INCLUDE_DIRECTORIES(${LIBUSB_INCLUDE_DIRS})
+-	LIST(APPEND LIBCAER_LINK_LIBRARIES_PRIVATE ${LIBUSB_LIBRARIES})
+-ELSE()
+-	LIST(APPEND LIBCAER_LINK_LIBRARIES_PRIVATE PkgConfig::libusb)
+ ENDIF()
+ 
++LIST(APPEND LIBCAER_LINK_LIBRARIES_PRIVATE PkgConfig::libusb)
++
++
+ # Set full RPATH
+ SET(CMAKE_INSTALL_RPATH ${USER_LOCAL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
+ 
diff --git a/external_imported/vcpkg/ports/libcaer/portfile.cmake b/external_imported/vcpkg/ports/libcaer/portfile.cmake
index e69687584..2c3a88719 100644
--- a/external_imported/vcpkg/ports/libcaer/portfile.cmake
+++ b/external_imported/vcpkg/ports/libcaer/portfile.cmake
@@ -2,20 +2,28 @@ vcpkg_from_gitlab(
     GITLAB_URL https://gitlab.com/inivation/
     OUT_SOURCE_PATH SOURCE_PATH
     REPO dv/libcaer
-    REF 933dfa60a138091afb03014f8c24183bab7bba4e
-    SHA512 f3ac74bb4cfc4077e5a226307f66a9b8b263201d2342d9e61ee98a23f95e7897895da9f148b4e910535779f779a26f5c192925386a99a70e9d22540a5421d646
+    REF "${VERSION}"
+    SHA512 29f8ac47f97a7640d8102eb5c693259da7506d918975be0f3e4e970ab7135dfff67f1c48dd17240462bf846bf31745d518a421229b8c453b29410ea26e489aa3
     HEAD_REF master
     PATCHES
         fix-libusb.diff
 )
 
+find_program(PKGCONFIG NAMES pkgconf PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf" NO_DEFAULT_PATH REQUIRED)
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        opencv     ENABLE_OPENCV
+)
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE # writes to include/libcaer/libcaer.h
     OPTIONS
-        -DENABLE_OPENCV=ON
+        ${FEATURE_OPTIONS}
         -DEXAMPLES_INSTALL=OFF
         -DBUILD_CONFIG_VCPKG=ON
+        "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}"
 )
 vcpkg_cmake_install()
 
@@ -25,4 +33,6 @@ vcpkg_cmake_config_fixup()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+set(stdatomic_license "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/LICENSE for simple-stdatomic (x86,x64 MSVC)")
+file(COPY_FILE "${SOURCE_PATH}/thirdparty/simple-stdatomic/LICENSE" "${stdatomic_license}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE" "${stdatomic_license}")
diff --git a/external_imported/vcpkg/ports/libcaer/vcpkg.json b/external_imported/vcpkg/ports/libcaer/vcpkg.json
index d75865dc5..58d88c9c3 100644
--- a/external_imported/vcpkg/ports/libcaer/vcpkg.json
+++ b/external_imported/vcpkg/ports/libcaer/vcpkg.json
@@ -1,17 +1,17 @@
 {
   "name": "libcaer",
-  "version-date": "2022-07-25",
-  "port-version": 3,
+  "version": "3.3.15",
+  "port-version": 1,
   "description": "Minimal C library to access, configure and get data from neuromorphic sensors and processors.",
   "homepage": "https://gitlab.com/inivation/dv/libcaer",
-  "license": "BSD-2-Clause",
+  "license": "BSD-2-Clause AND Apache-2.0",
+  "supports": "!(arm & windows & !mingw)",
   "dependencies": [
     "libusb",
     {
-      "name": "opencv4",
-      "default-features": false
+      "name": "pkgconf",
+      "host": true
     },
-    "pkgconf",
     {
       "name": "vcpkg-cmake",
       "host": true
@@ -20,5 +20,16 @@
       "name": "vcpkg-cmake-config",
       "host": true
     }
-  ]
+  ],
+  "features": {
+    "opencv": {
+      "description": "Enable support for frame enhancements using OpenCV",
+      "dependencies": [
+        {
+          "name": "opencv4",
+          "default-features": false
+        }
+      ]
+    }
+  }
 }
diff --git a/external_imported/vcpkg/ports/libcap/configure b/external_imported/vcpkg/ports/libcap/configure
new file mode 100755
index 000000000..fc3874839
--- /dev/null
+++ b/external_imported/vcpkg/ports/libcap/configure
@@ -0,0 +1,50 @@
+#!/bin/sh
+
+set -e
+
+linkage=shared
+prefix=
+for OPTION; do
+    case "${OPTION}" in
+    --prefix=*)
+        prefix="${OPTION#--prefix=}"
+        ;;
+    --enable-static)
+        linkage=static
+        ;;
+    esac
+done
+
+cat > Makefile.vcpkg <<END_MAKEFILE ;
+
+BUILD_OPTIONS = \
+    "AR=$AR" \
+    "BUILD_CC=$CC" \
+    "CC=$CC" \
+    "RANLIB=$RANLIB" \
+    "lib=lib" \
+    "prefix=$prefix"
+
+ifeq ($linkage,shared)
+libs := libcap.so libpsx.so
+BUILD_OPTIONS += SHARED=yes
+else
+libs := libcap.a libpsx.a
+BUILD_OPTIONS += SHARED=no
+endif
+
+all: libcap/cap_names.h
+	\$(MAKE) -C libcap pcs \$(libs) \$(BUILD_OPTIONS)
+
+libcap/cap_names.h:
+	\$(MAKE) -C libcap cap_names.h \$(BUILD_OPTIONS)
+
+install: install-cap_names
+	\$(MAKE) -C libcap install-$linkage \$(BUILD_OPTIONS)
+
+install-cap_names:
+	mkdir -p -m 0755 "\$(DESTDIR)$prefix/include/sys/libcap-private"
+	install -m 0644 libcap/cap_names.h "\$(DESTDIR)$prefix/include/sys/libcap-private"
+	install -m 0644 libcap/cap_names.list.h "\$(DESTDIR)$prefix/include/sys/libcap-private"
+
+END_MAKEFILE
diff --git a/external_imported/vcpkg/ports/libcap/portfile.cmake b/external_imported/vcpkg/ports/libcap/portfile.cmake
new file mode 100644
index 000000000..c463ae169
--- /dev/null
+++ b/external_imported/vcpkg/ports/libcap/portfile.cmake
@@ -0,0 +1,32 @@
+vcpkg_download_distfile(ARCHIVE
+    URLS https://git.kernel.org/pub/scm/libs/libcap/libcap.git/snapshot/libcap-3c7dda330bd9a154bb5b878d31fd591e4951fe17.tar.gz
+    FILENAME libpcap-${VERSION}.tar.gz
+    SHA512 0732c9f07be38c2bb06409f1f31d7ed5ad31b38ae380650b334074856f89b885deabb9603e21a989e81b530050c068bbbf60157adbf3ca3893e4bca7d61f63d2
+)
+
+vcpkg_extract_source_archive(SOURCE_PATH
+    ARCHIVE "${ARCHIVE}"
+)
+
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/configure" DESTINATION "${SOURCE_PATH}")
+
+if(VCPKG_CROSSCOMPILING)
+    file(TOUCH "${SOURCE_PATH}/libcap/_makenames")
+    file(COPY "${CURRENT_HOST_INSTALLED_DIR}/include/sys/libcap-private/cap_names.list.h" DESTINATION "${SOURCE_PATH}/libcap/")
+    file(COPY "${CURRENT_HOST_INSTALLED_DIR}/include/sys/libcap-private/cap_names.h" DESTINATION "${SOURCE_PATH}/libcap/")
+    file(TOUCH "${SOURCE_PATH}/libcap/cap_names.h")
+endif()
+
+vcpkg_configure_make(
+    SOURCE_PATH "${SOURCE_PATH}"
+    COPY_SOURCE
+    DETERMINE_BUILD_TRIPLET
+)
+vcpkg_install_make(
+    MAKEFILE "Makefile.vcpkg"
+)
+vcpkg_fixup_pkgconfig()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/License")
diff --git a/external_imported/vcpkg/ports/libcap/vcpkg.json b/external_imported/vcpkg/ports/libcap/vcpkg.json
new file mode 100644
index 000000000..867f738b8
--- /dev/null
+++ b/external_imported/vcpkg/ports/libcap/vcpkg.json
@@ -0,0 +1,19 @@
+{
+  "name": "libcap",
+  "version": "2.69",
+  "port-version": 3,
+  "description": "A library for getting and setting POSIX.1e (formerly POSIX 6) draft 15 capabilities.",
+  "homepage": "https://git.kernel.org/pub/scm/libs/libcap/libcap.git",
+  "license": "BSD-3-Clause OR GPL-2.0-only",
+  "supports": "linux",
+  "dependencies": [
+    {
+      "name": "libcap",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-get-vars",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/libcds/portfile.cmake b/external_imported/vcpkg/ports/libcds/portfile.cmake
index 4cdf9f267..481d9d1d0 100644
--- a/external_imported/vcpkg/ports/libcds/portfile.cmake
+++ b/external_imported/vcpkg/ports/libcds/portfile.cmake
@@ -12,9 +12,8 @@ vcpkg_from_github(
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" DISABLE_INSTALL_STATIC)
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" DISABLE_INSTALL_SHARED)
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DENABLE_UNIT_TEST=OFF
         -DENABLE_STRESS_TEST=OFF
@@ -23,14 +22,14 @@ vcpkg_configure_cmake(
         "-DLIB_SUFFIX="
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/LibCDS)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/LibCDS)
 
 file(INSTALL
-    ${SOURCE_PATH}/LICENSE
-    DESTINATION ${CURRENT_PACKAGES_DIR}/share/libcds RENAME copyright)
+    "${SOURCE_PATH}/LICENSE"
+    DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 
 vcpkg_copy_pdbs()
diff --git a/external_imported/vcpkg/ports/libcds/vcpkg.json b/external_imported/vcpkg/ports/libcds/vcpkg.json
index ceb4e56a2..ffedd68de 100644
--- a/external_imported/vcpkg/ports/libcds/vcpkg.json
+++ b/external_imported/vcpkg/ports/libcds/vcpkg.json
@@ -1,13 +1,21 @@
 {
   "name": "libcds",
   "version": "2.3.3",
-  "port-version": 2,
+  "port-version": 4,
   "description": "a collection of concurrent containers that don't require external (manual) synchronization for shared access, and safe memory reclamation (SMR) algorithms like Hazard Pointer and user-space RCU that is used as an epoch-based SMR.",
   "homepage": "https://github.com/khizmax/libcds",
   "license": "BSL-1.0",
   "supports": "!(arm & (osx | windows)) & !uwp",
   "dependencies": [
     "boost-system",
-    "boost-thread"
+    "boost-thread",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ]
 }
diff --git a/external_imported/vcpkg/ports/libcerf/portfile.cmake b/external_imported/vcpkg/ports/libcerf/portfile.cmake
index aada71bd4..d3b5280fc 100644
--- a/external_imported/vcpkg/ports/libcerf/portfile.cmake
+++ b/external_imported/vcpkg/ports/libcerf/portfile.cmake
@@ -10,8 +10,8 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 4df711d3e9fd00de99959c3253a9565d1dc2c41f75a5800ced9c52f89cbd13185fbdca3ad75de788fd16c044082738ab345b7fb6a8820ac588edafe1812944aa
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE ${ARCHIVE}
     PATCHES 001-fix-static-build.patch
 )
diff --git a/external_imported/vcpkg/ports/libcerf/vcpkg.json b/external_imported/vcpkg/ports/libcerf/vcpkg.json
index 2788bc96d..eed2bb6cc 100644
--- a/external_imported/vcpkg/ports/libcerf/vcpkg.json
+++ b/external_imported/vcpkg/ports/libcerf/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libcerf",
   "version": "1.13",
-  "port-version": 3,
+  "port-version": 4,
   "description": "A self-contained numeric library that provides an efficient and accurate implementation of complex error functions, along with Dawson, Faddeeva, and Voigt functions.",
   "homepage": "https://jugit.fz-juelich.de/mlz/libcerf",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/libconfig/CMakeLists.txt b/external_imported/vcpkg/ports/libconfig/CMakeLists.txt
deleted file mode 100644
index ab6711ad9..000000000
--- a/external_imported/vcpkg/ports/libconfig/CMakeLists.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-cmake_minimum_required(VERSION 3.5.1)
-project(libconfig C CXX)
-
-if(MSVC)
-  add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS -DYY_NO_UNISTD_H -DYY_USE_CONST)
-endif()
-
-set(C_SOURCES
-  lib/grammar.c
-  lib/libconfig.c
-  lib/scanctx.c
-  lib/scanner.c
-  lib/strbuf.c
-  lib/strvec.c
-  lib/util.c
-  lib/wincompat.c
-)
-
-set(CPP_SOURCES
-  lib/libconfigcpp.cc
-)
-
-set(CMAKE_C_STANDARD 99)
-
-include_directories(lib ${STDINT_H})
-
-add_library(libconfig  ${C_SOURCES})
-add_library(libconfig++ ${CPP_SOURCES})
-
-if(BUILD_SHARED_LIBS)
-  target_compile_definitions(libconfig PRIVATE -DLIBCONFIG_EXPORTS)
-  target_compile_definitions(libconfig++ PRIVATE -DLIBCONFIGXX_EXPORTS)
-else()
-  target_compile_definitions(libconfig PUBLIC -DLIBCONFIG_STATIC)
-  target_compile_definitions(libconfig++ PUBLIC -DLIBCONFIGXX_STATIC)
-endif()
-
-if (WIN32)
-  # Linux doesn't have shlwapi
-  target_link_libraries(libconfig shlwapi)
-endif()
-target_link_libraries(libconfig++ PRIVATE libconfig)
-
-install(
-  TARGETS libconfig libconfig++
-  RUNTIME DESTINATION bin
-  LIBRARY DESTINATION lib
-  ARCHIVE DESTINATION lib
-)
-
-if(NOT DISABLE_INSTALL_HEADERS)
-  install(FILES lib/libconfig.h++ lib/libconfig.h DESTINATION include)
-endif()
diff --git a/external_imported/vcpkg/ports/libconfig/libconfig++-cmake-export.diff b/external_imported/vcpkg/ports/libconfig/libconfig++-cmake-export.diff
new file mode 100644
index 000000000..d7ef5911a
--- /dev/null
+++ b/external_imported/vcpkg/ports/libconfig/libconfig++-cmake-export.diff
@@ -0,0 +1,22 @@
+diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
+index 3a64deb..233c89f 100644
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -112,7 +112,7 @@ install(TARGETS ${libname}
+ )
+ 
+ install(TARGETS ${libname}++
+-    EXPORT libconfig++Targets
++    EXPORT libconfigTargets
+     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+@@ -121,7 +121,7 @@ install(TARGETS ${libname}++
+ 
+ 
+ include(CMakePackageConfigHelpers)
+-foreach(target_name libconfig libconfig++)
++foreach(target_name libconfig)
+   write_basic_package_version_file("${target_name}ConfigVersion.cmake"
+     VERSION ${PACKAGE_VERSION}
+     COMPATIBILITY SameMajorVersion
diff --git a/external_imported/vcpkg/ports/libconfig/portfile.cmake b/external_imported/vcpkg/ports/libconfig/portfile.cmake
index 06b462677..f9362db45 100644
--- a/external_imported/vcpkg/ports/libconfig/portfile.cmake
+++ b/external_imported/vcpkg/ports/libconfig/portfile.cmake
@@ -1,54 +1,29 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO hyperrealm/libconfig
-    REF v1.7.3
+    REF "v${VERSION}"
     SHA512 3749bf9eb29bab0f6b14f4fc759f0c419ed27a843842aaabed1ec1fbe0faa8c93322ff875ca1291d69cb28a39ece86d512aec42c2140d566c38c56dc616734f4
     HEAD_REF master
+    PATCHES
+        libconfig++-cmake-export.diff
+        static-build.diff
 )
 
-if (NOT VCPKG_USE_HEAD_VERSION)
-  message("If you would like to use cmake with the port, use `--head` option with vcpkg install.")
-  file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-endif()
-
-if (NOT VCPKG_USE_HEAD_VERSION)
-  vcpkg_configure_cmake(
-      SOURCE_PATH ${SOURCE_PATH}
-      PREFER_NINJA
-      OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON
-  )
-else()
-  vcpkg_configure_cmake(
-      SOURCE_PATH ${SOURCE_PATH}
-      PREFER_NINJA
-      OPTIONS
-          -DBUILD_EXAMPLES=OFF
-          -DBUILD_TESTS=OFF
-  )
-endif()
-
-vcpkg_install_cmake()
-
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_EXAMPLES=OFF
+        -DBUILD_TESTS=OFF
+)
+vcpkg_cmake_install()
 vcpkg_copy_pdbs()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libconfig)
 
-if (VCPKG_USE_HEAD_VERSION)
-  file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-  vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libconfig)
-endif()
-
-foreach(FILE ${CURRENT_PACKAGES_DIR}/include/libconfig.h++ ${CURRENT_PACKAGES_DIR}/include/libconfig.h)
-  file(READ ${FILE} _contents)
-  string(REPLACE "defined(LIBCONFIGXX_EXPORTS)" "0" _contents "${_contents}")
-  string(REPLACE "defined(LIBCONFIG_EXPORTS)" "0" _contents "${_contents}")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-  if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    string(REPLACE "defined(LIBCONFIGXX_STATIC)" "0" _contents "${_contents}")
-    string(REPLACE "defined(LIBCONFIG_STATIC)" "0" _contents "${_contents}")
-  else()
-    string(REPLACE "defined(LIBCONFIGXX_STATIC)" "1" _contents "${_contents}")
-    string(REPLACE "defined(LIBCONFIG_STATIC)" "1" _contents "${_contents}")
-  endif()
-  file(WRITE ${FILE} "${_contents}")
-endforeach()
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libconfig.h" "defined(LIBCONFIG_STATIC)" "1")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libconfig.h++" "defined(LIBCONFIGXX_STATIC)" "1")
+endif()
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/libconfig/static-build.diff b/external_imported/vcpkg/ports/libconfig/static-build.diff
new file mode 100644
index 000000000..1b1a0f420
--- /dev/null
+++ b/external_imported/vcpkg/ports/libconfig/static-build.diff
@@ -0,0 +1,34 @@
+diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
+index 233c89f..8164b41 100644
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -25,7 +25,6 @@ set(libinc_cpp
+     libconfig.hh)
+ 
+ set(libsrc_cpp
+-    ${libsrc}
+     libconfigcpp.cc)
+ 
+ if(MSVC)
+@@ -55,8 +54,10 @@ set_target_properties(${libname}++
+ #check_symbol_exists(freelocale "locale.h" HAVE_FREELOCALE)
+ 
+ if(BUILD_SHARED_LIBS)
++    target_sources(${libname}++ PRIVATE ${libsrc})
+     target_compile_definitions(${libname}++ PRIVATE LIBCONFIG_STATIC)
+ else()
++    target_link_libraries(${libname}++ PRIVATE ${libname})
+     target_compile_definitions(${libname} PUBLIC LIBCONFIG_STATIC)
+     target_compile_definitions(${libname}++ PUBLIC LIBCONFIGXX_STATIC)
+ endif()
+@@ -91,8 +92,8 @@ if(MSVC)
+ endif()
+ 
+ if(WIN32)
+-    target_link_libraries(${libname} shlwapi)
+-    target_link_libraries(${libname}++ shlwapi)
++    target_link_libraries(${libname} PRIVATE  shlwapi)
++    target_link_libraries(${libname}++ PRIVATE shlwapi)
+ endif()
+ 
+ target_include_directories(${libname}
diff --git a/external_imported/vcpkg/ports/libconfig/vcpkg.json b/external_imported/vcpkg/ports/libconfig/vcpkg.json
index 6acd72878..fba3d05e5 100644
--- a/external_imported/vcpkg/ports/libconfig/vcpkg.json
+++ b/external_imported/vcpkg/ports/libconfig/vcpkg.json
@@ -1,7 +1,17 @@
 {
   "name": "libconfig",
-  "version-string": "1.7.3",
-  "port-version": 1,
+  "version": "1.7.3",
+  "port-version": 5,
   "description": "C/C++ library for processing configuration files",
-  "homepage": "https://github.com/hyperrealm/libconfig"
+  "homepage": "https://github.com/hyperrealm/libconfig",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/libconfuse/vcpkg.json b/external_imported/vcpkg/ports/libconfuse/vcpkg.json
index 570596daf..a193aa2c0 100644
--- a/external_imported/vcpkg/ports/libconfuse/vcpkg.json
+++ b/external_imported/vcpkg/ports/libconfuse/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libconfuse",
-  "version-string": "2019-07-14",
-  "port-version": 3,
+  "version-date": "2019-07-14",
+  "port-version": 4,
   "description": "Small configuration file parser library for C",
   "homepage": "https://github.com/martinh/libconfuse",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/libcopp/portfile.cmake b/external_imported/vcpkg/ports/libcopp/portfile.cmake
index 050e7d96f..9fe462a42 100644
--- a/external_imported/vcpkg/ports/libcopp/portfile.cmake
+++ b/external_imported/vcpkg/ports/libcopp/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO owent/libcopp
     REF "v${VERSION}"
-    SHA512 0e18641a8d94527417b9c85b3e2ddd60c6c3dc10a9ccf75186cec4344239114245c50ac154a411f3e42a1f9e021a9bcf3c6b71b0cd2f9be82a76b0cd10791589
+    SHA512 aa594e1cab9e8489feb864539834a66f700be51000e551840456cbb27971894b3481b300be88a8273f7efc189e3003ecc680eabb3ae8131a90daa2ba90447973
     HEAD_REF v2
     PATCHES fix-x86-windows.patch
 )
@@ -11,8 +11,8 @@ vcpkg_from_github(
 vcpkg_from_github(
   OUT_SOURCE_PATH ATFRAMEWORK_CMAKE_TOOLSET
   REPO atframework/cmake-toolset
-  REF v1.3.5
-  SHA512 5048c204eb6358547d99712a06866836e1a6dc20dee44cc33fae77181bdf9ece5686f30062eff6a231e1ec898d5a37ebaddb243e7e3484c002bb96240aa496a5
+  REF v1.10.1
+  SHA512 7ea18e41fabd35af5fd72fb954a1c60480ba85a9ff820104785d263e719751ba699eeca801ce5155041d8bf51fb2c37ea53f6ed404e4a4e7e810f1eb9bacead4
   HEAD_REF main
   )
 
diff --git a/external_imported/vcpkg/ports/libcopp/vcpkg.json b/external_imported/vcpkg/ports/libcopp/vcpkg.json
index 8a82b8b89..a4f406719 100644
--- a/external_imported/vcpkg/ports/libcopp/vcpkg.json
+++ b/external_imported/vcpkg/ports/libcopp/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "libcopp",
-  "version": "2.1.2",
+  "version": "2.2.0",
   "maintainers": "owent <admin@owent.net>",
   "description": "A cross-platfrom coroutine library for C++",
   "homepage": "https://github.com/owent/libcopp",
diff --git a/external_imported/vcpkg/ports/libcoro/0001-allow-shared-lib.patch b/external_imported/vcpkg/ports/libcoro/0001-allow-shared-lib.patch
new file mode 100644
index 000000000..47de8119b
--- /dev/null
+++ b/external_imported/vcpkg/ports/libcoro/0001-allow-shared-lib.patch
@@ -0,0 +1,9 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -92,4 +92,4 @@
+ endif()
+ 
+-add_library(${PROJECT_NAME} STATIC ${LIBCORO_SOURCE_FILES})
++add_library(${PROJECT_NAME} ${LIBCORO_SOURCE_FILES})
+ set_target_properties(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE CXX PREFIX "")
diff --git a/external_imported/vcpkg/ports/libcoro/0002-disable-git-config.patch b/external_imported/vcpkg/ports/libcoro/0002-disable-git-config.patch
new file mode 100644
index 000000000..f25833ae0
--- /dev/null
+++ b/external_imported/vcpkg/ports/libcoro/0002-disable-git-config.patch
@@ -0,0 +1,18 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -7,9 +7,9 @@
+ 
+ # Set the githooks directory to auto format and update the readme.
+-message("${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR} -> git config --local core.hooksPath .githooks")
+-execute_process(
+-    COMMAND git config --local core.hooksPath .githooks
+-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+-)
++#message("${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR} -> git config --local core.hooksPath .githooks")
++#execute_process(
++#    COMMAND git config --local core.hooksPath .githooks
++#    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
++#)
+ 
+ option(LIBCORO_EXTERNAL_DEPENDENCIES "Use Cmake find_package to resolve dependencies instead of embedded libraries, Default=OFF." OFF)
diff --git a/external_imported/vcpkg/ports/libcoro/0003-fix-pkgconfig-includedir.patch b/external_imported/vcpkg/ports/libcoro/0003-fix-pkgconfig-includedir.patch
new file mode 100644
index 000000000..ed4cf3076
--- /dev/null
+++ b/external_imported/vcpkg/ports/libcoro/0003-fix-pkgconfig-includedir.patch
@@ -0,0 +1,10 @@
+diff --git a/libcoro.pc.in b/libcoro.pc.in
+--- a/libcoro.pc.in
++++ b/libcoro.pc.in
+@@ -1,5 +1,5 @@
+ prefix="@CMAKE_INSTALL_PREFIX@"
+ libdir="${prefix}/lib"
+-includedir="@CMAKE_INSTALL_INCLUDEDIR@"
++includedir="${prefix}/include"
+ 
+ Name: @PROJECT_NAME@
diff --git a/external_imported/vcpkg/ports/libcoro/0004-fix-pkgconfig-on-windows.patch b/external_imported/vcpkg/ports/libcoro/0004-fix-pkgconfig-on-windows.patch
new file mode 100644
index 000000000..4adbad981
--- /dev/null
+++ b/external_imported/vcpkg/ports/libcoro/0004-fix-pkgconfig-on-windows.patch
@@ -0,0 +1,16 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -186,7 +186,11 @@
+ 
+ 
+ # generate pc file for pkg-config
+-string(REGEX REPLACE "^lib" "" target1 ${PROJECT_NAME})
++if(MSVC)
++    set(target1 ${PROJECT_NAME})
++else()
++    string(REGEX REPLACE "^lib" "" target1 ${PROJECT_NAME})
++endif()
+ configure_file(libcoro.pc.in libcoro.pc @ONLY)
+ 
+ install(TARGETS libcoro)
diff --git a/external_imported/vcpkg/ports/libcoro/portfile.cmake b/external_imported/vcpkg/ports/libcoro/portfile.cmake
new file mode 100644
index 000000000..c4a16fb68
--- /dev/null
+++ b/external_imported/vcpkg/ports/libcoro/portfile.cmake
@@ -0,0 +1,40 @@
+if(VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO jbaldwin/libcoro
+    REF "v${VERSION}"
+    SHA512 88d5954591493ad2942fa68ead65b67fa9ac26bcc260b3156844244968dd8477d62a3559a9d3b7b1175bf813e5f23ca2d288a72baeb3ebd774e756d3c06bfee8
+    HEAD_REF master
+    PATCHES
+        0001-allow-shared-lib.patch
+        0002-disable-git-config.patch
+        0003-fix-pkgconfig-includedir.patch
+        0004-fix-pkgconfig-on-windows.patch
+)
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        networking   LIBCORO_FEATURE_NETWORKING
+        platform     LIBCORO_FEATURE_PLATFORM
+        ssl          LIBCORO_FEATURE_SSL
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        ${FEATURE_OPTIONS}
+        -DLIBCORO_EXTERNAL_DEPENDENCIES=ON
+        -DLIBCORO_BUILD_TESTS=OFF
+        -DLIBCORO_BUILD_EXAMPLES=OFF
+)
+
+vcpkg_cmake_install()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+
+vcpkg_fixup_pkgconfig()
diff --git a/external_imported/vcpkg/ports/libcoro/vcpkg.json b/external_imported/vcpkg/ports/libcoro/vcpkg.json
new file mode 100644
index 000000000..0746f3708
--- /dev/null
+++ b/external_imported/vcpkg/ports/libcoro/vcpkg.json
@@ -0,0 +1,42 @@
+{
+  "name": "libcoro",
+  "version": "0.10",
+  "description": "C++20 coroutine library",
+  "homepage": "https://github.com/jbaldwin/libcoro",
+  "license": "Apache-2.0",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ],
+  "default-features": [
+    "networking",
+    "ssl"
+  ],
+  "features": {
+    "networking": {
+      "description": "Include networking features.",
+      "dependencies": [
+        "c-ares"
+      ]
+    },
+    "platform": {
+      "description": "Include linux platform features.",
+      "supports": "linux"
+    },
+    "ssl": {
+      "description": "Include SSL features.",
+      "dependencies": [
+        {
+          "name": "libcoro",
+          "default-features": false,
+          "features": [
+            "networking"
+          ]
+        },
+        "openssl"
+      ]
+    }
+  }
+}
diff --git a/external_imported/vcpkg/ports/libcroco/CMakeLists.txt b/external_imported/vcpkg/ports/libcroco/CMakeLists.txt
index 9e05f376d..20d787268 100644
--- a/external_imported/vcpkg/ports/libcroco/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/libcroco/CMakeLists.txt
@@ -1,15 +1,9 @@
 cmake_minimum_required(VERSION 3.11)
 project(libcroco C)
 
-find_package(Iconv REQUIRED)
-find_package(Intl REQUIRED)
 find_package(PkgConfig REQUIRED)
-pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 gmodule-2.0 gio-2.0 IMPORTED_TARGET)
-find_package(LibXml2 REQUIRED)
-if(NOT WIN32)
-    find_package(Threads REQUIRED)
-endif()
-find_path(GLIB_INCLUDE_DIR glib.h)
+set(libcroco_pc_requires glib-2.0 libxml-2.0)
+pkg_check_modules(LIBCROCO_LINK_PUBLIC ${libcroco_pc_requires} IMPORTED_TARGET REQUIRED)
 
 file(GLOB SOURCES
 	src/cr-utils.c
@@ -67,18 +61,10 @@ file(GLOB SOURCES
 	src/libcroco.def
 )
 
-set(CMAKE_DEBUG_POSTFIX "d")
-
 add_library(croco-0.6 ${SOURCES})
-
-target_include_directories(croco-0.6 PRIVATE ${GLIB_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIR})
-target_link_libraries(croco-0.6 PRIVATE 
-    PkgConfig::GLIB2
-    ${LIBXML2_LIBRARIES} ${Intl_LIBRARIES} Iconv::Iconv
-)
+target_link_libraries(croco-0.6 PRIVATE PkgConfig::LIBCROCO_LINK_PUBLIC)
 
 install(TARGETS croco-0.6
-    EXPORT libcroco-targets
     RUNTIME DESTINATION bin
     LIBRARY DESTINATION lib
     ARCHIVE DESTINATION lib
@@ -113,26 +99,20 @@ install(FILES
 	src/cr-parsing-location.h
 	src/cr-string.h
 	src/libcroco-config.h
-    DESTINATION include/libcroco
+    DESTINATION include/libcroco-0.6/libcroco
 )
 
-install(
-    EXPORT libcroco-targets
-    NAMESPACE unofficial::libcroco::
-    FILE unofficial-libcroco-targets.cmake
-    DESTINATION share/unofficial-libcroco
-)
+string(REGEX MATCH "^([0-9]*)[.]([0-9]*)[.].*" unused "${VERSION}" )
+set(LIBCROCO_MAJOR_VERSION "${CMAKE_MATCH_1}")
+set(LIBCROCO_MINOR_VERSION "${CMAKE_MATCH_2}")
+
+set(prefix "${CMAKE_INSTALL_PREFIX}")
+set(exec_prefix "\${prefix}")
+set(libdir "\${prefix}/lib")
+set(includedir "\${prefix}/include")
 
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/unofficial-libcroco-config.cmake "
-include(CMakeFindDependencyMacro)
-find_dependency(Intl)
-find_dependency(Iconv)
-find_dependency(PkgConfig)
-pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 gmodule-2.0 gio-2.0 IMPORTED_TARGET)
-find_dependency(LibXml2)
-if(NOT WIN32)
-    find_dependency(Threads)
-endif()
-include(\${CMAKE_CURRENT_LIST_DIR}/unofficial-libcroco-targets.cmake)
-")
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-libcroco-config.cmake DESTINATION share/unofficial-libcroco)
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/libcroco.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libcroco.pc" @ONLY)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libcroco.pc"
+	DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
+	RENAME "libcroco-${LIBCROCO_MAJOR_VERSION}.${LIBCROCO_MINOR_VERSION}.pc"
+)
diff --git a/external_imported/vcpkg/ports/libcroco/portfile.cmake b/external_imported/vcpkg/ports/libcroco/portfile.cmake
index b7429589a..170201b12 100644
--- a/external_imported/vcpkg/ports/libcroco/portfile.cmake
+++ b/external_imported/vcpkg/ports/libcroco/portfile.cmake
@@ -19,15 +19,15 @@ vcpkg_find_acquire_program(PKGCONFIG)
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-       "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}"
+        "-DVERSION=${VERSION}"
+        "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}"
 )
-
 vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+vcpkg_fixup_pkgconfig()
 
-vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-libcroco)
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-# Handle copyright
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-
-vcpkg_copy_pdbs()
+file(COPY "${CURRENT_PORT_DIR}/unofficial-libcroco-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-libcroco")
+file(COPY "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/libcroco/unofficial-libcroco-config.cmake b/external_imported/vcpkg/ports/libcroco/unofficial-libcroco-config.cmake
new file mode 100644
index 000000000..a116ae8d8
--- /dev/null
+++ b/external_imported/vcpkg/ports/libcroco/unofficial-libcroco-config.cmake
@@ -0,0 +1,14 @@
+file(READ "${CMAKE_CURRENT_LIST_DIR}/../libcroco/usage" usage)
+message(WARNING "find_package(unofficial-libcroco) is deprecated.\n${usage}")
+
+include(CMakeFindDependencyMacro)
+find_dependency(PkgConfig)
+pkg_check_modules(VCPKG_LIBCROCO libcroco-0.6 IMPORTED_TARGET)
+if(NOT VCPKG_LIBCROCO_FOUND)
+    set(${CMAKE_FIND_PACKAGE_NAME}_FOUND 0)
+elseif(NOT TARGET unofficial::libcroco::croco-0.6)
+    add_library(unofficial::libcroco::croco-0.6 INTERFACE IMPORTED)
+    set_target_properties(unofficial::libcroco::croco-0.6 PROPERTIES
+        INTERFACE_LINK_LIBRARIES PkgConfig::VCPKG_LIBCROCO
+    )
+endif()
diff --git a/external_imported/vcpkg/ports/libcroco/usage b/external_imported/vcpkg/ports/libcroco/usage
new file mode 100644
index 000000000..cee11583d
--- /dev/null
+++ b/external_imported/vcpkg/ports/libcroco/usage
@@ -0,0 +1,5 @@
+libcroco can be imported via CMake FindPkgConfig module:
+
+    find_package(PkgConfig REQUIRED)
+    pkg_check_modules(LIBCROCO libcroco-0.6 IMPORTED_TARGET REQUIRED)
+    target_link_libraries(main PRIVATE PkgConfig::LIBCROCO)
diff --git a/external_imported/vcpkg/ports/libcroco/vcpkg.json b/external_imported/vcpkg/ports/libcroco/vcpkg.json
index 5a801f476..a92872f94 100644
--- a/external_imported/vcpkg/ports/libcroco/vcpkg.json
+++ b/external_imported/vcpkg/ports/libcroco/vcpkg.json
@@ -1,18 +1,15 @@
 {
   "name": "libcroco",
   "version": "0.6.13",
-  "port-version": 4,
+  "port-version": 6,
   "description": "A standalone css2 parsing and manipulation library",
+  "license": "LGPL-2.0-only",
   "dependencies": [
     "glib",
     "libxml2",
     {
       "name": "vcpkg-cmake",
       "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/libcsv/vcpkg.json b/external_imported/vcpkg/ports/libcsv/vcpkg.json
index 5c3b46ec5..520c00e4b 100644
--- a/external_imported/vcpkg/ports/libcsv/vcpkg.json
+++ b/external_imported/vcpkg/ports/libcsv/vcpkg.json
@@ -1,7 +1,9 @@
 {
   "name": "libcsv",
   "version": "3.0.3",
+  "port-version": 1,
   "description": "CSV parser and writer library",
   "homepage": "https://github.com/rgamble/libcsv",
-  "license": "GPL-2.0-or-later"
+  "license": "GPL-2.0-or-later",
+  "supports": "!xbox"
 }
diff --git a/external_imported/vcpkg/ports/libdatachannel/0001-fix-for-vcpkg.patch b/external_imported/vcpkg/ports/libdatachannel/0001-fix-for-vcpkg.patch
deleted file mode 100644
index 25eb2905f..000000000
--- a/external_imported/vcpkg/ports/libdatachannel/0001-fix-for-vcpkg.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 28b4566..4347b6a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -28,7 +28,6 @@ endif()
- 
- list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
- set(CMAKE_POSITION_INDEPENDENT_CODE ON)
--set(BUILD_SHARED_LIBS OFF) # to force usrsctp to be built static
- 
- if(WIN32)
- 	add_definitions(-DWIN32_LEAN_AND_MEAN)
-@@ -200,12 +199,14 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
- set(THREADS_PREFER_PTHREAD_FLAG TRUE)
- find_package(Threads REQUIRED)
- 
--set(CMAKE_POLICY_DEFAULT_CMP0048 NEW)
--add_subdirectory(deps/plog EXCLUDE_FROM_ALL)
-+find_library(USRSCTP_LIBRARY usrsctp REQUIRED)
-+find_path(PLOG_INCLUDE_DIRS "plog/Appenders/AndroidAppender.h")
- 
- if(SCTP_DEBUG)
- 	add_definitions(-DSCTP_DEBUG)
- endif()
-+
-+if(0)
- option(sctp_build_shared_lib OFF)
- option(sctp_build_programs OFF)
- option(sctp_inet OFF)
-@@ -219,8 +220,9 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-     target_compile_options(usrsctp PRIVATE -Wno-error=format-truncation)
- endif()
- add_library(Usrsctp::Usrsctp ALIAS usrsctp)
-+endif()
- 
--add_library(datachannel SHARED
-+add_library(datachannel
- 	${LIBDATACHANNEL_SOURCES}
- 	${LIBDATACHANNEL_HEADERS}
- 	${LIBDATACHANNEL_IMPL_SOURCES}
-@@ -244,16 +246,18 @@ target_include_directories(datachannel PUBLIC
-     $<INSTALL_INTERFACE:include>)
- target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc)
- target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
-+target_include_directories(datachannel PRIVATE ${PLOG_INCLUDE_DIRS})
- target_link_libraries(datachannel PRIVATE Threads::Threads)
--target_link_libraries(datachannel PRIVATE Usrsctp::Usrsctp plog::plog)
-+target_link_libraries(datachannel PRIVATE ${USRSCTP_LIBRARY})
- 
- target_include_directories(datachannel-static PUBLIC
-     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-     $<INSTALL_INTERFACE:include>)
- target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc)
- target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
-+target_include_directories(datachannel PRIVATE ${PLOG_INCLUDE_DIRS})
- target_link_libraries(datachannel-static PRIVATE Threads::Threads)
--target_link_libraries(datachannel-static PRIVATE Usrsctp::Usrsctp plog::plog)
-+target_link_libraries(datachannel-static PRIVATE ${USRSCTP_LIBRARY})
- 
- if(WIN32)
- 	target_link_libraries(datachannel PUBLIC ws2_32) # winsock2
diff --git a/external_imported/vcpkg/ports/libdatachannel/fix-for-vcpkg.patch b/external_imported/vcpkg/ports/libdatachannel/fix-for-vcpkg.patch
new file mode 100644
index 000000000..2b5f27f80
--- /dev/null
+++ b/external_imported/vcpkg/ports/libdatachannel/fix-for-vcpkg.patch
@@ -0,0 +1,30 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a3837943..2c34d7fb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -446,11 +446,25 @@ if(WARNINGS_AS_ERRORS)
+        endif()
+ endif()
+ 
++if(DATACHANNEL_STATIC_LINKAGE)
++set_target_properties(datachannel PROPERTIES EXCLUDE_FROM_ALL 1)
++set_target_properties(datachannel-static PROPERTIES EXCLUDE_FROM_ALL 0)
++
++install(TARGETS datachannel-static EXPORT LibDataChannelTargets
++       RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++       LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++       ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++)
++else()
++set_target_properties(datachannel PROPERTIES EXCLUDE_FROM_ALL 0)
++set_target_properties(datachannel-static PROPERTIES EXCLUDE_FROM_ALL 1)
++
+ install(TARGETS datachannel EXPORT LibDataChannelTargets
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ )
++endif()
+ 
+ install(FILES ${LIBDATACHANNEL_HEADERS}
+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rtc
diff --git a/external_imported/vcpkg/ports/libdatachannel/fix_dependency.patch b/external_imported/vcpkg/ports/libdatachannel/fix_dependency.patch
new file mode 100644
index 000000000..88e44dcd9
--- /dev/null
+++ b/external_imported/vcpkg/ports/libdatachannel/fix_dependency.patch
@@ -0,0 +1,40 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f604628..1610166 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -239,7 +239,7 @@ set(THREADS_PREFER_PTHREAD_FLAG TRUE)
+ find_package(Threads REQUIRED)
+ 
+ if(USE_SYSTEM_PLOG)
+-	find_package(plog REQUIRED)
++	find_package(plog CONFIG REQUIRED)
+ else()
+ 	set(CMAKE_POLICY_DEFAULT_CMP0048 NEW)
+ 	add_subdirectory(deps/plog EXCLUDE_FROM_ALL)
+@@ -250,7 +250,7 @@ if(SCTP_DEBUG)
+ endif()
+ 
+ if(USE_SYSTEM_USRSCTP)
+-	find_package(Usrsctp REQUIRED)
++	find_package(unofficial-usrsctp CONFIG REQUIRED)
+ else()
+ 	option(sctp_build_shared_lib OFF)
+ 	option(sctp_build_programs OFF)
+@@ -294,7 +294,7 @@ target_include_directories(datachannel PUBLIC
+ target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc)
+ target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
+ target_link_libraries(datachannel PRIVATE Threads::Threads)
+-target_link_libraries(datachannel PRIVATE Usrsctp::Usrsctp plog::plog)
++target_link_libraries(datachannel PRIVATE unofficial::usrsctp::usrsctp plog::plog)
+ 
+ target_include_directories(datachannel-static PUBLIC
+     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+@@ -302,7 +302,7 @@ target_include_directories(datachannel-static PUBLIC
+ target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc)
+ target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
+ target_link_libraries(datachannel-static PRIVATE Threads::Threads)
+-target_link_libraries(datachannel-static PRIVATE Usrsctp::Usrsctp plog::plog)
++target_link_libraries(datachannel-static PRIVATE unofficial::usrsctp::usrsctp plog::plog)
+ 
+ if(WIN32)
+ 	target_link_libraries(datachannel PUBLIC ws2_32) # winsock2
diff --git a/external_imported/vcpkg/ports/libdatachannel/portfile.cmake b/external_imported/vcpkg/ports/libdatachannel/portfile.cmake
index 5d96d3eff..6bb2603bb 100644
--- a/external_imported/vcpkg/ports/libdatachannel/portfile.cmake
+++ b/external_imported/vcpkg/ports/libdatachannel/portfile.cmake
@@ -1,4 +1,4 @@
-set(PATCHES 0001-fix-for-vcpkg.patch)
+set(PATCHES fix-for-vcpkg.patch)
 
 if(VCPKG_TARGET_IS_UWP)
     list(APPEND PATCHES uwp-warnings.patch)
@@ -8,11 +8,14 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO paullouisageneau/libdatachannel
     REF "v${VERSION}"
-    SHA512 ede45221b8fb4ebc2a812f187372bc65da2a495311058e3b486ba7a2a584817ecdef286d956386a8635752786aebd5d0507bd84a84e484b9bf73ecd2dd92f918
+    SHA512 63551a9f2ce8de7f7aba13b2114418d3d705a6c190d91eac7cf6deba93ccbe9bda053000feb7ac109d538646c77da62b31686a58f83d752f191cac3a015f2d69
     HEAD_REF master
-    PATCHES
+    PATCHES 
         ${PATCHES}
+        fix_dependency.patch
 )
+file(REMOVE "${SOURCE_PATH}/cmake/Modules/FindLibJuice.cmake")
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" DATACHANNEL_STATIC_LINKAGE)
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
@@ -26,10 +29,10 @@ vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         ${FEATURE_OPTIONS}
-        -DUSE_SYSTEM_SRTP=ON
-        -DUSE_SYSTEM_JUICE=ON
+        -DPREFER_SYSTEM_LIB=ON
         -DNO_EXAMPLES=ON
         -DNO_TESTS=ON
+        -DDATACHANNEL_STATIC_LINKAGE=${DATACHANNEL_STATIC_LINKAGE}
 )
 
 vcpkg_cmake_install()
@@ -43,6 +46,8 @@ include(CMakeFindDependencyMacro)
 find_dependency(Threads)
 find_dependency(OpenSSL)
 find_dependency(LibJuice)
+find_dependency(plog CONFIG)
+find_dependency(unofficial-usrsctp CONFIG)
 ${DATACHANNEL_CONFIG}")
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
diff --git a/external_imported/vcpkg/ports/libdatachannel/uwp-warnings.patch b/external_imported/vcpkg/ports/libdatachannel/uwp-warnings.patch
index 560040a4e..75bddb5d6 100644
--- a/external_imported/vcpkg/ports/libdatachannel/uwp-warnings.patch
+++ b/external_imported/vcpkg/ports/libdatachannel/uwp-warnings.patch
@@ -1,14 +1,14 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4347b6a..e3d6d19 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -394,6 +394,9 @@ if(WARNINGS_AS_ERRORS)
- 	endif()
- endif()
- 
-+target_compile_options(datachannel PRIVATE /wd4996)
-+target_compile_options(datachannel-static PRIVATE /wd4996)
-+
- install(TARGETS datachannel EXPORT LibDataChannelTargets
- 	RUNTIME DESTINATION bin
- 	LIBRARY DESTINATION lib
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2c34d7fb..1bedd212 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -446,6 +446,9 @@ if(WARNINGS_AS_ERRORS)
+        endif()
+ endif()
+ 
++target_compile_options(datachannel PRIVATE /wd4996)
++target_compile_options(datachannel-static PRIVATE /wd4996)
++
+ if(DATACHANNEL_STATIC_LINKAGE)
+ set_target_properties(datachannel PROPERTIES EXCLUDE_FROM_ALL 1)
+ set_target_properties(datachannel-static PROPERTIES EXCLUDE_FROM_ALL 0)
diff --git a/external_imported/vcpkg/ports/libdatachannel/vcpkg.json b/external_imported/vcpkg/ports/libdatachannel/vcpkg.json
index ac0945611..df0e5a493 100644
--- a/external_imported/vcpkg/ports/libdatachannel/vcpkg.json
+++ b/external_imported/vcpkg/ports/libdatachannel/vcpkg.json
@@ -1,11 +1,14 @@
 {
   "name": "libdatachannel",
-  "version-semver": "0.18.2",
+  "version-semver": "0.19.5",
+  "port-version": 2,
   "description": "libdatachannel is a standalone implementation of WebRTC Data Channels, WebRTC Media Transport, and WebSockets in C++17 with C bindings for POSIX platforms (including GNU/Linux, Android, and Apple macOS) and Microsoft Windows.",
   "homepage": "https://github.com/paullouisageneau/libdatachannel",
   "license": "MPL-2.0",
+  "supports": "!xbox",
   "dependencies": [
     "libjuice",
+    "nlohmann-json",
     "openssl",
     "plog",
     "usrsctp",
diff --git a/external_imported/vcpkg/ports/libde265/fix-interface-include.patch b/external_imported/vcpkg/ports/libde265/fix-interface-include.patch
new file mode 100644
index 000000000..1e252c504
--- /dev/null
+++ b/external_imported/vcpkg/ports/libde265/fix-interface-include.patch
@@ -0,0 +1,13 @@
+diff --git a/libde265/CMakeLists.txt b/libde265/CMakeLists.txt
+index d0d6762..06e1660 100644
+--- a/libde265/CMakeLists.txt
++++ b/libde265/CMakeLists.txt
+@@ -114,7 +114,7 @@ endif()
+ 
+ add_library(de265 ${libde265_sources} ${ENCODER_OBJECTS} ${X86_OBJECTS})
+ target_link_libraries(de265 PRIVATE Threads::Threads)
+-target_include_directories(de265 PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR})
++target_include_directories(de265 PRIVATE $<BUILD_INTERFACE:${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}> PUBLIC $<INSTALL_INTERFACE:include>)
+ 
+ write_basic_package_version_file(libde265ConfigVersion.cmake COMPATIBILITY ExactVersion)
+ 
diff --git a/external_imported/vcpkg/ports/libde265/fix-libde265-headers.patch b/external_imported/vcpkg/ports/libde265/fix-libde265-headers.patch
deleted file mode 100644
index fac2e35a8..000000000
--- a/external_imported/vcpkg/ports/libde265/fix-libde265-headers.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/libde265/CMakeLists.txt b/libde265/CMakeLists.txt
-index 749c7fb..45e7419 100644
---- a/libde265/CMakeLists.txt
-+++ b/libde265/CMakeLists.txt
-@@ -43,7 +43,7 @@ set (libde265_headers
-   bitstream.h
-   cabac.h
-   configparam.h
--  de265-version.h
-+  ${CMAKE_CURRENT_BINARY_DIR}/de265-version.h
-   contextmodel.h
-   de265.h
-   deblock.h
-@@ -119,7 +119,6 @@ install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Config
- )
- 
- install(FILES ${libde265_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/de265-version.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})
- 
- install(EXPORT ${PROJECT_NAME}Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
- 
diff --git a/external_imported/vcpkg/ports/libde265/portfile.cmake b/external_imported/vcpkg/ports/libde265/portfile.cmake
index 87418395b..7d52d0d83 100644
--- a/external_imported/vcpkg/ports/libde265/portfile.cmake
+++ b/external_imported/vcpkg/ports/libde265/portfile.cmake
@@ -1,46 +1,22 @@
-# Used for .pc file
-set(VERSION "1.0.8")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO strukturag/libde265
-    REF 8aed7472df0af25b811828fa14f2f169dc34d35a # v1.0.8
-    SHA512 e2da1436e5b0d8a3841087e879fbbff5a92de4ebb69d097959972ec8c9407305bc2a17020cb46139fbacc84f91ff8cfb4d9547308074ba213e002ee36bb2e006
+    REF "v${VERSION}"
+    SHA512 df380f1ea6345e20ed1f907df3c7cdaaac44358a6746e29e16699005783ce96524d30fec7bba457c9f9773a6373250aaaf0b9cd41224057b269798117964b8b5
     HEAD_REF master
     PATCHES
-        fix-libde265-headers.patch
-)
-
-vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    INVERTED_FEATURES
-        sse DISABLE_SSE
+        fix-interface-include.patch
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-        -DCMAKE_DISABLE_FIND_PACKAGE_SDL=ON
-        ${FEATURE_OPTIONS}
+        -DENABLE_SDL=OFF
 )
 
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libde265)
-vcpkg_copy_tools(TOOL_NAMES dec265 enc265 AUTO_CLEAN)
-
-set(prefix "")
-set(exec_prefix [[${prefix}]])
-set(libdir [[${prefix}/lib]])
-set(includedir [[${prefix}/include]])
-set(LIBS "")
-configure_file("${SOURCE_PATH}/libde265.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libde265.pc" @ONLY)
-# The produced library name is `liblibde265.a` or `libde265.lib`
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libde265.pc" "-lde265" "-llibde265")
-# libde265's pc file assumes libstdc++, which isn't always true.
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libde265.pc" " -lstdc++" "")
-if(NOT VCPKG_BUILD_TYPE)
-    configure_file("${SOURCE_PATH}/libde265.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libde265.pc" @ONLY)
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libde265.pc" "-lde265" "-llibde265")
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libde265.pc" " -lstdc++" "")
-endif()
+vcpkg_copy_tools(TOOL_NAMES dec265 AUTO_CLEAN)
 vcpkg_fixup_pkgconfig()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
@@ -51,4 +27,4 @@ else()
 endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/libde265/vcpkg.json b/external_imported/vcpkg/ports/libde265/vcpkg.json
index f0882e202..4cafa8709 100644
--- a/external_imported/vcpkg/ports/libde265/vcpkg.json
+++ b/external_imported/vcpkg/ports/libde265/vcpkg.json
@@ -1,11 +1,10 @@
 {
   "name": "libde265",
-  "version": "1.0.8",
-  "port-version": 7,
+  "version": "1.0.15",
   "description": "Open h.265 video codec implementation.",
   "homepage": "https://www.libde265.org/",
   "license": "LGPL-3.0-only",
-  "supports": "!uwp & !(arm & windows)",
+  "supports": "!uwp & !xbox",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
@@ -15,11 +14,5 @@
       "name": "vcpkg-cmake-config",
       "host": true
     }
-  ],
-  "features": {
-    "sse": {
-      "description": "Enable SSE optimizations",
-      "supports": "x86 | x64"
-    }
-  }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/libdeflate/portfile.cmake b/external_imported/vcpkg/ports/libdeflate/portfile.cmake
index 7d852a8de..ae83dae06 100644
--- a/external_imported/vcpkg/ports/libdeflate/portfile.cmake
+++ b/external_imported/vcpkg/ports/libdeflate/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ebiggers/libdeflate
     REF "v${VERSION}"
-    SHA512 4e2c0f78e55befc8cbc390722ee5e9e7662315eaafe1979e300972990acf4afffc32a1220cca7a6e944d551a430dd13d36b40066dfe8141789de1a5418ac620f
+    SHA512 fe57542a0d28ad61d70bef9b544bb6805f9f30930b16432712b3b1caab041f1f4e64315a4306a0635b96c2632239c5af0e45a3915581d0b89975729fc2e95613
     HEAD_REF master
     PATCHES
         remove_wrong_c_flags_modification.diff
@@ -12,8 +12,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
         compression   LIBDEFLATE_COMPRESSION_SUPPORT
         decompression LIBDEFLATE_DECOMPRESSION_SUPPORT
-        gzip          LIBDEFLATE_ZLIB_SUPPORT
-        zlib          LIBDEFLATE_GZIP_SUPPORT
+        gzip          LIBDEFLATE_GZIP_SUPPORT
+        zlib          LIBDEFLATE_ZLIB_SUPPORT
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" LIBDEFLATE_BUILD_STATIC)
@@ -32,6 +32,17 @@ vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/libdeflate")
 vcpkg_fixup_pkgconfig()
 
+if(VCPKG_TARGET_IS_WINDOWS)
+    if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libdeflate.h" "defined(LIBDEFLATE_DLL)" "1")
+    elseif(NOT VCPKG_TARGET_IS_MINGW)
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libdeflate.pc" " -ldeflate" " -ldeflatestatic")
+        if(NOT VCPKG_BUILD_TYPE)
+            vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libdeflate.pc" " -ldeflate" " -ldeflatestatic")
+        endif()
+    endif()
+endif()
+
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/libdeflate/usage b/external_imported/vcpkg/ports/libdeflate/usage
index 0c41e9570..c7a57452f 100644
--- a/external_imported/vcpkg/ports/libdeflate/usage
+++ b/external_imported/vcpkg/ports/libdeflate/usage
@@ -1,4 +1,4 @@
-The package zstd provides CMake targets:
+libdeflate provides CMake targets:
 
     find_package(libdeflate CONFIG REQUIRED)
     target_link_libraries(main PRIVATE $<IF:$<TARGET_EXISTS:libdeflate::libdeflate_shared>,libdeflate::libdeflate_shared,libdeflate::libdeflate_static>)
diff --git a/external_imported/vcpkg/ports/libdeflate/vcpkg.json b/external_imported/vcpkg/ports/libdeflate/vcpkg.json
index 4c0483d83..b32949266 100644
--- a/external_imported/vcpkg/ports/libdeflate/vcpkg.json
+++ b/external_imported/vcpkg/ports/libdeflate/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "libdeflate",
-  "version": "1.17",
+  "version": "1.19",
+  "port-version": 1,
   "description": "libdeflate is a library for fast, whole-buffer DEFLATE-based compression and decompression.",
   "homepage": "https://github.com/ebiggers/libdeflate",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/libdisasm/vcpkg.json b/external_imported/vcpkg/ports/libdisasm/vcpkg.json
index ce2926842..d5a6f418c 100644
--- a/external_imported/vcpkg/ports/libdisasm/vcpkg.json
+++ b/external_imported/vcpkg/ports/libdisasm/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "libdisasm",
-  "version-string": "0.23",
-  "port-version": 9,
+  "version": "0.23",
+  "port-version": 11,
   "description": "x86 Disassembler Library.",
   "homepage": "https://sourceforge.net/projects/bastard",
+  "license": "ClArtistic",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/libdjinterop/portfile.cmake b/external_imported/vcpkg/ports/libdjinterop/portfile.cmake
index 9f5981d25..dbc6e9a70 100644
--- a/external_imported/vcpkg/ports/libdjinterop/portfile.cmake
+++ b/external_imported/vcpkg/ports/libdjinterop/portfile.cmake
@@ -1,18 +1,22 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO xsco/libdjinterop
-    REF 0.16.0
-    SHA512 7653e3752b8d597a967fb5f83f8b14c0db5d9cdb05a9bb22f6d9f34a890327fafdbd81996ce9af09552b69da4b9f7f0b41d631b1704b11e46e335f205c6886bf
+    REF "${VERSION}"
+    SHA512 2f75a57326cc958bce6634aba407707313cec646d1713c80d9286d9d2448a68dd304eacd02b38c237a6bb869f07b9b3d3b1cc7fcb7c3a9cdf6ba7515166be6cf
     HEAD_REF master
 )
 
-vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}")
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DCMAKE_DISABLE_FIND_PACKAGE_Boost=ON
+    )
 vcpkg_cmake_install()
 
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/DjInterop)
+vcpkg_cmake_config_fixup(PACKAGE_NAME djinterop CONFIG_PATH lib/cmake/DjInterop)
 vcpkg_fixup_pkgconfig()
 vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/libdjinterop/vcpkg.json b/external_imported/vcpkg/ports/libdjinterop/vcpkg.json
index 7ccfa916e..c168b3670 100644
--- a/external_imported/vcpkg/ports/libdjinterop/vcpkg.json
+++ b/external_imported/vcpkg/ports/libdjinterop/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "libdjinterop",
-  "version": "0.16.0",
+  "version": "0.20.1",
   "description": "C++ library for access to DJ record libraries. Currently only supports Denon Engine Prime databases",
   "homepage": "https://github.com/xsco/libdjinterop",
   "license": "LGPL-3.0-or-later",
+  "supports": "!xbox",
   "dependencies": [
     "sqlite3",
     {
diff --git a/external_imported/vcpkg/ports/libdwarf/dependencies.diff b/external_imported/vcpkg/ports/libdwarf/dependencies.diff
new file mode 100644
index 000000000..84c731873
--- /dev/null
+++ b/external_imported/vcpkg/ports/libdwarf/dependencies.diff
@@ -0,0 +1,54 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 70839abd..04b0f86f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -196,6 +196,12 @@ if (ENABLE_DECOMPRESSION)
+     set(HAVE_ZSTD TRUE)
+     set(HAVE_ZSTD_H TRUE)
+   endif()
++  find_package(zstd CONFIG REQUIRED)
++  if(TARGET zstd::libzstd_shared)
++    set(ZSTD_LIB zstd::libzstd_shared)
++  else()
++    set(ZSTD_LIB zstd::libzstd_static)
++  endif()
+ endif ()
+ 
+ message(STATUS "CMAKE_SIZEOF_VOID_P ... " ${CMAKE_SIZEOF_VOID_P} )
+ 
+ #  DW_FWALLXX are gnu C++ options.
+diff --git a/src/lib/libdwarf/CMakeLists.txt b/src/lib/libdwarf/CMakeLists.txt
+index 7500c9f4..ae367cc1 100644
+--- a/src/lib/libdwarf/CMakeLists.txt
++++ b/src/lib/libdwarf/CMakeLists.txt
+@@ -105,7 +105,7 @@ target_include_directories(dwarf PUBLIC
+     $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+   )
+ if(ZLIB_FOUND AND ZSTD_FOUND)
+-  target_link_libraries(dwarf PRIVATE  ZLIB::ZLIB ZSTD::ZSTD ) 
++  target_link_libraries(dwarf PRIVATE  ZLIB::ZLIB ${ZSTD_LIB} ) 
+ endif()
+ set_target_properties(dwarf PROPERTIES PUBLIC_HEADER "libdwarf.h;dwarf.h")
+ 
+
+diff --git a/src/lib/libdwarf/cmake/libdwarf-config.cmake b/src/lib/libdwarf/cmake/libdwarf-config.cmake
+index 604c563c..53623603 100644
+--- a/src/lib/libdwarf/cmake/libdwarf-config.cmake
++++ b/src/lib/libdwarf/cmake/libdwarf-config.cmake
+@@ -1,3 +1,6 @@
++include(CMakeFindDependencyMacro)
++find_dependency(ZLIB)
++find_dependency(zstd CONFIG)
+ if (NOT TARGET libdwarf::libdwarf)
+     include(${CMAKE_CURRENT_LIST_DIR}/libdwarf-targets.cmake)
+ endif()
+diff --git a/src/lib/libdwarf/libdwarf.pc.cmake b/src/lib/libdwarf/libdwarf.pc.cmake
+index 6b18c77c..8862d5b4 100644
+--- a/src/lib/libdwarf/libdwarf.pc.cmake
++++ b/src/lib/libdwarf/libdwarf.pc.cmake
+@@ -9,4 +9,4 @@ Description: DWARF debug symbols library
+ Version: @PACKAGE_VERSION@
+ Libs: -L${libdir} -ldwarf
+ Cflags: -I${includedir}
+-
++Requires.private: zlib libzstd
diff --git a/external_imported/vcpkg/ports/libdwarf/msvc-runtime.diff b/external_imported/vcpkg/ports/libdwarf/msvc-runtime.diff
new file mode 100644
index 000000000..3232921a8
--- /dev/null
+++ b/external_imported/vcpkg/ports/libdwarf/msvc-runtime.diff
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 28076ee..f9795dd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -19,6 +19,8 @@ endmacro()
+ set(LIBDWARF_CRT "MD" CACHE STRING "Either MT or MD, specifies whether to use the static or dynamic MSVCRT.")
+ 
+ if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
++  set(LIBDWARF_CRT ignore)
++elseif(0)
+   # Use CMAKE_MSVC_RUNTIME in versions 3.15 and up
+   if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15")
+     cmake_policy(SET CMP0091 NEW)
diff --git a/external_imported/vcpkg/ports/libdwarf/off_t.diff b/external_imported/vcpkg/ports/libdwarf/off_t.diff
new file mode 100644
index 000000000..f7338a831
--- /dev/null
+++ b/external_imported/vcpkg/ports/libdwarf/off_t.diff
@@ -0,0 +1,16 @@
+diff --git a/src/lib/libdwarf/libdwarf_private.h b/src/lib/libdwarf/libdwarf_private.h
+index b37ae994..7fa89256 100644
+--- a/src/lib/libdwarf/libdwarf_private.h
++++ b/src/lib/libdwarf/libdwarf_private.h
+@@ -26,11 +26,7 @@
+ #ifdef _MSC_VER /* Macro to select VS compiler */
+ #include <windows.h>
+ typedef SSIZE_T ssize_t;
+-#ifdef _WIN64
+-typedef long long off_t;
+-#else
+ typedef long off_t;
+-#endif
+ #endif /* _MSC_VER */
+ 
+ #ifndef TRUE
diff --git a/external_imported/vcpkg/ports/libdwarf/portfile.cmake b/external_imported/vcpkg/ports/libdwarf/portfile.cmake
new file mode 100644
index 000000000..7b84eda96
--- /dev/null
+++ b/external_imported/vcpkg/ports/libdwarf/portfile.cmake
@@ -0,0 +1,35 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO davea42/libdwarf-code
+    REF "v${VERSION}"
+    SHA512 8e1addaf2b970db792c4488fa416b712c7b48dfe501bbfd5c40a7eaf71f07377abaa70f682982d11de9cf9573d8fd8dc5fd16c020eb9b68b5be558139a0799a1
+    HEAD_REF main
+    PATCHES
+        dependencies.diff
+        msvc-runtime.diff
+        off_t.diff
+)
+
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_NON_SHARED)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_NON_SHARED=${BUILD_NON_SHARED}
+        -DBUILD_SHARED=${BUILD_SHARED}
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/libdwarf")
+vcpkg_fixup_pkgconfig()
+
+vcpkg_copy_tools(TOOL_NAMES dwarfdump AUTO_CLEAN)
+
+if(BUILD_SHARED)
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libdwarf.h" "ifndef LIBDWARF_STATIC" "if 1")
+endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/libdwarf/vcpkg.json b/external_imported/vcpkg/ports/libdwarf/vcpkg.json
new file mode 100644
index 000000000..e5be30cbb
--- /dev/null
+++ b/external_imported/vcpkg/ports/libdwarf/vcpkg.json
@@ -0,0 +1,19 @@
+{
+  "name": "libdwarf",
+  "version": "0.9.1",
+  "description": "A library for reading DWARF2 and later DWARF.",
+  "homepage": "https://github.com/davea42/libdwarf-code",
+  "license": "LGPL-2.1-only",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    "zlib",
+    "zstd"
+  ]
+}
diff --git a/external_imported/vcpkg/ports/libe57/vcpkg.json b/external_imported/vcpkg/ports/libe57/vcpkg.json
index 8688922e1..396a28bc6 100644
--- a/external_imported/vcpkg/ports/libe57/vcpkg.json
+++ b/external_imported/vcpkg/ports/libe57/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "libe57",
   "version-semver": "1.1.332",
-  "port-version": 3,
+  "port-version": 4,
   "description": "An open source implementation of the ASTM E2807 Standard Specification for 3D Imaging Data Exchange in the C++ language.",
   "homepage": "http://www.libe57.org/",
   "license": "BSL-1.0",
+  "supports": "!android",
   "dependencies": [
     "boost-crc",
     "boost-filesystem",
diff --git a/external_imported/vcpkg/ports/libe57format/portfile.cmake b/external_imported/vcpkg/ports/libe57format/portfile.cmake
index ec47b23d6..8f22d2ba5 100644
--- a/external_imported/vcpkg/ports/libe57format/portfile.cmake
+++ b/external_imported/vcpkg/ports/libe57format/portfile.cmake
@@ -2,21 +2,28 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO asmaloney/libE57Format
     REF "v${VERSION}"
-    SHA512 5458e35b319f41290594daefe5de18476ff1c4ed94712d881ed907b72a9c7a470e4d091d68cc1d6115838843e682ed158fc8c7a9fa68eef6c2cf421cda361f7e
+    SHA512 9be79a969b74008801e20531530cdf3dc1f0041d6fbd2be1aaa8d58b35b06309b1f324309ad1d989a345389ed168c96c325ebe65844efec9bbffd183bf2e4766
     HEAD_REF master
-    PATCHES
-        prevent_warning_as_errors.diff # see https://github.com/asmaloney/libE57Format/issues/232
 )
 
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" E57_BUILD_SHARED)
+string(COMPARE NOTEQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" E57_USING_STATIC_XERCES)
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DE57_BUILD_TEST=OFF
+        -DE57_BUILD_SHARED=${E57_BUILD_SHARED}
+        -DUSING_STATIC_XERCES=${E57_USING_STATIC_XERCES}
 )
 vcpkg_cmake_install()
 
 vcpkg_cmake_config_fixup(PACKAGE_NAME E57Format CONFIG_PATH "lib/cmake/E57Format")
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/debug/share"
+)
+
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/libe57format RENAME copyright)
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
diff --git a/external_imported/vcpkg/ports/libe57format/prevent_warning_as_errors.diff b/external_imported/vcpkg/ports/libe57format/prevent_warning_as_errors.diff
deleted file mode 100644
index aa32bf22b..000000000
--- a/external_imported/vcpkg/ports/libe57format/prevent_warning_as_errors.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cmake/CompilerWarnings.cmake b/cmake/CompilerWarnings.cmake
-index 9a9e507..eb1a1c5 100644
---- a/cmake/CompilerWarnings.cmake
-+++ b/cmake/CompilerWarnings.cmake
-@@ -86,6 +86,8 @@ endif()
- 
- # Treat warnings as errors
- function( set_warning_as_error )
-+    return()
-+
-     message( STATUS "[${PROJECT_NAME}] Treating warnings as errors")
- 
-     if ( CMAKE_VERSION VERSION_GREATER_EQUAL "3.24" )
diff --git a/external_imported/vcpkg/ports/libe57format/usage b/external_imported/vcpkg/ports/libe57format/usage
new file mode 100644
index 000000000..eb3f45998
--- /dev/null
+++ b/external_imported/vcpkg/ports/libe57format/usage
@@ -0,0 +1,4 @@
+libe57format provides CMake targets:
+
+    find_package(e57format CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE E57Format)
diff --git a/external_imported/vcpkg/ports/libe57format/vcpkg.json b/external_imported/vcpkg/ports/libe57format/vcpkg.json
index b0c08548e..7d00f4ee0 100644
--- a/external_imported/vcpkg/ports/libe57format/vcpkg.json
+++ b/external_imported/vcpkg/ports/libe57format/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "libe57format",
-  "version": "3.0.0",
+  "version": "3.1.1",
   "description": "A library to provide read & write support for the E57 file format.",
   "homepage": "https://github.com/asmaloney/libE57Format",
   "license": "BSL-1.0",
diff --git a/external_imported/vcpkg/ports/libebur128/vcpkg.json b/external_imported/vcpkg/ports/libebur128/vcpkg.json
index 52dc27186..5d0f6ace7 100644
--- a/external_imported/vcpkg/ports/libebur128/vcpkg.json
+++ b/external_imported/vcpkg/ports/libebur128/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libebur128",
-  "version-string": "1.2.6",
-  "port-version": 1,
+  "version": "1.2.6",
+  "port-version": 2,
   "description": "A library implementing the EBU R128 audio loudness standard",
   "homepage": "https://github.com/jiixyj/libebur128",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/libenvpp/portfile.cmake b/external_imported/vcpkg/ports/libenvpp/portfile.cmake
index 31eae10e9..2d017dc2e 100644
--- a/external_imported/vcpkg/ports/libenvpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/libenvpp/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ph3at/libenvpp
     REF v${VERSION}
-    SHA512 d8d2e6405311be1cba47cdf1c8b29018c84716a0d34a18bf3b6fa8c05f5eddf447ddee407a407d765e92296c5d7e7b5f2fe4561fb66f5165826825158ef82fc8
+    SHA512 5e56404983770b6838d43311490cbd49ef68aad84868b3d9cb9dcb104d33e34eb3588d494bc120179c75c242a3bdc0c4e39c36f7fb732a37a843c1b79c22886f
     HEAD_REF main
     PATCHES
         fix-dependencies.patch
diff --git a/external_imported/vcpkg/ports/libenvpp/vcpkg.json b/external_imported/vcpkg/ports/libenvpp/vcpkg.json
index 1037daeae..bae1e3136 100644
--- a/external_imported/vcpkg/ports/libenvpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/libenvpp/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "libenvpp",
-  "version": "1.0.0",
+  "version": "1.4.0",
   "description": "A modern C++ library for type-safe environment variable parsing ",
   "homepage": "https://github.com/ph3at/libenvpp",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/libepoxy/portfile.cmake b/external_imported/vcpkg/ports/libepoxy/portfile.cmake
index 42cc13134..d39b95423 100644
--- a/external_imported/vcpkg/ports/libepoxy/portfile.cmake
+++ b/external_imported/vcpkg/ports/libepoxy/portfile.cmake
@@ -16,11 +16,16 @@ vcpkg_from_github(
 
 if (VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_OSX)
     set(OPTIONS -Dglx=no -Degl=no -Dx11=false)
+elseif(VCPKG_TARGET_IS_ANDROID)
+    set(OPTIONS -Dglx=no -Degl=yes -Dx11=false)
 else()
     set(OPTIONS -Dglx=yes -Degl=yes -Dx11=true)
 endif()
 if(VCPKG_TARGET_IS_WINDOWS)
     list(APPEND OPTIONS -Dc_std=c99)
+    if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+        list(APPEND OPTIONS "-Dc_args=-DEPOXY_PUBLIC=extern")
+    endif()
 endif()
 
 vcpkg_configure_meson(
@@ -34,6 +39,13 @@ vcpkg_copy_pdbs()
 
 vcpkg_fixup_pkgconfig()
 
+if(VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/epoxy/common.h" "# if defined(_MSC_VER)" "# if defined(_WIN32)")
+    if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/epoxy/common.h" "__declspec(dllimport)" "")
+    endif()
+endif()
+
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/pkgconfig")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig")
 
diff --git a/external_imported/vcpkg/ports/libepoxy/vcpkg.json b/external_imported/vcpkg/ports/libepoxy/vcpkg.json
index cb75b5943..8c736266e 100644
--- a/external_imported/vcpkg/ports/libepoxy/vcpkg.json
+++ b/external_imported/vcpkg/ports/libepoxy/vcpkg.json
@@ -1,14 +1,15 @@
 {
   "name": "libepoxy",
   "version": "1.5.10",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Epoxy is a library for handling OpenGL function pointer management for you",
   "homepage": "https://github.com/anholt/libepoxy",
   "license": "MIT",
+  "supports": "!uwp & !(windows & staticcrt)",
   "dependencies": [
     {
       "name": "egl-registry",
-      "platform": "linux"
+      "platform": "!osx & !windows"
     },
     {
       "name": "vcpkg-tool-meson",
diff --git a/external_imported/vcpkg/ports/libev/portfile.cmake b/external_imported/vcpkg/ports/libev/portfile.cmake
new file mode 100644
index 000000000..2a44f859c
--- /dev/null
+++ b/external_imported/vcpkg/ports/libev/portfile.cmake
@@ -0,0 +1,27 @@
+vcpkg_download_distfile(ARCHIVE
+    URLS "http://dist.schmorp.de/libev/Attic/libev-4.33.tar.gz"
+    FILENAME "libev-4.33.tar.gz"
+    SHA512 c662a65360115e0b2598e3e8824cf7b33360c43a96ac9233f6b6ea2873a10102551773cad0e89e738541e75af9fd4f3e3c11cd2f251c5703aa24f193128b896b
+)
+
+vcpkg_extract_source_archive(
+    SOURCE_PATH
+    ARCHIVE "${ARCHIVE}"
+)
+
+vcpkg_configure_make(
+    SOURCE_PATH "${SOURCE_PATH}"
+    AUTOCONFIG
+)
+
+vcpkg_install_make()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+file(RENAME "${CURRENT_PACKAGES_DIR}/include" "${CURRENT_PACKAGES_DIR}/include.tmp")
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include")
+file(RENAME "${CURRENT_PACKAGES_DIR}/include.tmp" "${CURRENT_PACKAGES_DIR}/include/${PORT}")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/unofficial-libev-config.cmake"
+     DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}")
diff --git a/external_imported/vcpkg/ports/libev/unofficial-libev-config.cmake b/external_imported/vcpkg/ports/libev/unofficial-libev-config.cmake
new file mode 100644
index 000000000..c25155841
--- /dev/null
+++ b/external_imported/vcpkg/ports/libev/unofficial-libev-config.cmake
@@ -0,0 +1,25 @@
+if(NOT TARGET unofficial::libev::libev)
+    get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+    get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+    get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+
+    add_library(unofficial::libev::libev UNKNOWN IMPORTED)
+
+    set_target_properties(unofficial::libev::libev PROPERTIES
+      INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
+    )
+
+    find_library(LIBEV_LIBRARY_DEBUG NAMES ev libev PATHS "${_IMPORT_PREFIX}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH)
+    if(EXISTS "${LIBEV_LIBRARY_DEBUG}")
+        set_property(TARGET unofficial::libev::libev APPEND PROPERTY IMPORTED_CONFIGURATIONS "Debug")
+        set_target_properties(unofficial::libev::libev PROPERTIES IMPORTED_LOCATION_DEBUG "${LIBEV_LIBRARY_DEBUG}")
+    endif()
+
+    find_library(LIBEV_LIBRARY_RELEASE NAMES ev libev PATHS "${_IMPORT_PREFIX}/" PATH_SUFFIXES lib NO_DEFAULT_PATH)
+    if(EXISTS "${LIBEV_LIBRARY_RELEASE}")
+        set_property(TARGET unofficial::libev::libev APPEND PROPERTY IMPORTED_CONFIGURATIONS "Release")
+        set_target_properties(unofficial::libev::libev PROPERTIES IMPORTED_LOCATION_RELEASE "${LIBEV_LIBRARY_RELEASE}")
+    endif()
+
+    unset(_IMPORT_PREFIX)
+endif()
diff --git a/external_imported/vcpkg/ports/libev/vcpkg.json b/external_imported/vcpkg/ports/libev/vcpkg.json
new file mode 100644
index 000000000..930e6d9fe
--- /dev/null
+++ b/external_imported/vcpkg/ports/libev/vcpkg.json
@@ -0,0 +1,9 @@
+{
+  "name": "libev",
+  "version": "4.33",
+  "port-version": 2,
+  "description": "libev is a high-performance event loop/event model with lots of features.",
+  "homepage": "http://software.schmorp.de/pkg/libev.html",
+  "license": "BSD-2-Clause OR GPL-2.0-or-later",
+  "supports": "!windows"
+}
diff --git a/external_imported/vcpkg/ports/libeventheader-decode/portfile.cmake b/external_imported/vcpkg/ports/libeventheader-decode/portfile.cmake
new file mode 100644
index 000000000..7cc80c9be
--- /dev/null
+++ b/external_imported/vcpkg/ports/libeventheader-decode/portfile.cmake
@@ -0,0 +1,24 @@
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO "microsoft/LinuxTracepoints"
+    REF "v${VERSION}"
+    SHA512 6b22ecded7029dfb9d9fba4fb76a8c25a28fbb3a6295b8ff6f66cea83d5b7645a85244126f52896065eccb9d08cbafa89dd1a23971c38842c4f752a274e5a72d
+    HEAD_REF main)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}/libeventheader-decode-cpp"
+    OPTIONS
+        -DBUILD_SAMPLES=OFF
+        -DBUILD_TOOLS=OFF)
+
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+
+vcpkg_cmake_config_fixup(
+    PACKAGE_NAME eventheader-decode
+    CONFIG_PATH lib/cmake/eventheader-decode)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/external_imported/vcpkg/ports/libeventheader-decode/vcpkg.json b/external_imported/vcpkg/ports/libeventheader-decode/vcpkg.json
new file mode 100644
index 000000000..3169dfbdd
--- /dev/null
+++ b/external_imported/vcpkg/ports/libeventheader-decode/vcpkg.json
@@ -0,0 +1,26 @@
+{
+  "name": "libeventheader-decode",
+  "version": "1.3.0",
+  "description": "C++ classes for decoding EventHeader-encoded Linux Tracepoints",
+  "homepage": "https://github.com/microsoft/LinuxTracepoints/",
+  "license": "MIT",
+  "supports": "linux | windows",
+  "dependencies": [
+    {
+      "name": "libeventheader-tracepoint",
+      "version>=": "1.3.0"
+    },
+    {
+      "name": "libtracepoint-decode",
+      "version>=": "1.3.0"
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/libeventheader-tracepoint/portfile.cmake b/external_imported/vcpkg/ports/libeventheader-tracepoint/portfile.cmake
new file mode 100644
index 000000000..0da581146
--- /dev/null
+++ b/external_imported/vcpkg/ports/libeventheader-tracepoint/portfile.cmake
@@ -0,0 +1,37 @@
+if(VCPKG_TARGET_IS_WINDOWS)
+    set(VCPKG_BUILD_TYPE release) # Windows port only includes headers.
+endif()
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO "microsoft/LinuxTracepoints"
+    REF "v${VERSION}"
+    SHA512 6b22ecded7029dfb9d9fba4fb76a8c25a28fbb3a6295b8ff6f66cea83d5b7645a85244126f52896065eccb9d08cbafa89dd1a23971c38842c4f752a274e5a72d
+    HEAD_REF main)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}/libeventheader-tracepoint"
+    OPTIONS
+        -DBUILD_SAMPLES=OFF
+        -DBUILD_TOOLS=OFF)
+
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+
+if(NOT VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_cmake_config_fixup(
+        PACKAGE_NAME eventheader-tracepoint
+        CONFIG_PATH lib/cmake/eventheader-tracepoint
+        DO_NOT_DELETE_PARENT_CONFIG_PATH)
+endif()
+
+vcpkg_cmake_config_fixup(
+    PACKAGE_NAME eventheader-headers
+    CONFIG_PATH lib/cmake/eventheader-headers)
+
+if(VCPKG_TARGET_IS_WINDOWS)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/external_imported/vcpkg/ports/libeventheader-tracepoint/vcpkg.json b/external_imported/vcpkg/ports/libeventheader-tracepoint/vcpkg.json
new file mode 100644
index 000000000..0e78b42f6
--- /dev/null
+++ b/external_imported/vcpkg/ports/libeventheader-tracepoint/vcpkg.json
@@ -0,0 +1,22 @@
+{
+  "name": "libeventheader-tracepoint",
+  "version": "1.3.0",
+  "description": "C/C++ interface for generating EventHeader-encoded Linux Tracepoints",
+  "homepage": "https://github.com/microsoft/LinuxTracepoints/",
+  "license": "MIT",
+  "supports": "linux | windows",
+  "dependencies": [
+    {
+      "name": "libtracepoint",
+      "version>=": "1.3.0"
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/libevhtp/vcpkg.json b/external_imported/vcpkg/ports/libevhtp/vcpkg.json
index 6928b00eb..d50439667 100644
--- a/external_imported/vcpkg/ports/libevhtp/vcpkg.json
+++ b/external_imported/vcpkg/ports/libevhtp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libevhtp",
   "version": "1.2.18",
-  "port-version": 4,
+  "port-version": 5,
   "description": "Libevhtp was created as a replacement API for Libevent's current HTTP API.",
   "homepage": "https://github.com/criticalstack/libevhtp",
   "supports": "!windows",
@@ -20,6 +20,12 @@
     "openssl": {
       "description": "Support SSL for libevhtp",
       "dependencies": [
+        {
+          "name": "libevent",
+          "features": [
+            "openssl"
+          ]
+        },
         "openssl"
       ]
     },
diff --git a/external_imported/vcpkg/ports/libexif/CMakeLists.txt b/external_imported/vcpkg/ports/libexif/CMakeLists.txt
deleted file mode 100644
index be7e4ed75..000000000
--- a/external_imported/vcpkg/ports/libexif/CMakeLists.txt
+++ /dev/null
@@ -1,158 +0,0 @@
-cmake_minimum_required(VERSION 3.0)
-project(libexif LANGUAGES C)
-
-set(PACKAGE "libexif")
-
-option(ENABLE_NLS "Enable NLS" OFF)
-
-set(HEADERS
-    libexif/_stdint.h
-    libexif/exif.h
-    libexif/exif-byte-order.h
-    libexif/exif-content.h
-    libexif/exif-data.h
-    libexif/exif-data-type.h
-    libexif/exif-entry.h
-    libexif/exif-format.h
-    libexif/exif-gps-ifd.h
-    libexif/exif-ifd.h
-    libexif/exif-loader.h
-    libexif/exif-log.h
-    libexif/exif-mem.h
-    libexif/exif-mnote-data.h
-    libexif/exif-mnote-data-priv.h
-    libexif/exif-system.h
-    libexif/exif-tag.h
-    libexif/exif-utils.h
-)
-
-set(SOURCES
-    libexif/exif-byte-order.c
-    libexif/exif-content.c
-    libexif/exif-data.c
-    libexif/exif-entry.c
-    libexif/exif-format.c
-    libexif/exif-gps-ifd.c
-    libexif/exif-ifd.c
-    libexif/exif-loader.c
-    libexif/exif-log.c
-    libexif/exif-mem.c
-    libexif/exif-mnote-data.c
-    libexif/exif-tag.c
-    libexif/exif-utils.c
-)
-
-set(HEADERS_APPLE
-    libexif/apple/exif-mnote-data-apple.h
-    libexif/apple/mnote-apple-entry.h
-    libexif/apple/mnote-apple-tag.h
-)
-
-set(SOURCES_APPLE
-    libexif/apple/exif-mnote-data-apple.c
-    libexif/apple/mnote-apple-entry.c
-    libexif/apple/mnote-apple-tag.c
-)
-
-set(HEADERS_CANON
-    libexif/canon/exif-mnote-data-canon.h
-    libexif/canon/mnote-canon-entry.h
-    libexif/canon/mnote-canon-tag.h
-)
-
-set(SOURCES_CANON
-    libexif/canon/exif-mnote-data-canon.c
-    libexif/canon/mnote-canon-entry.c
-    libexif/canon/mnote-canon-tag.c
-)
-
-set(HEADERS_FUJI
-    libexif/fuji/exif-mnote-data-fuji.h
-    libexif/fuji/mnote-fuji-entry.h
-    libexif/fuji/mnote-fuji-tag.h
-)
-
-set(SOURCES_FUJI
-    libexif/fuji/exif-mnote-data-fuji.c
-    libexif/fuji/mnote-fuji-entry.c
-    libexif/fuji/mnote-fuji-tag.c
-)
-
-set(HEADERS_OLYMPUS
-    libexif/olympus/exif-mnote-data-olympus.h
-    libexif/olympus/mnote-olympus-entry.h
-    libexif/olympus/mnote-olympus-tag.h
-)
-
-set(SOURCES_OLYMPUS
-    libexif/olympus/exif-mnote-data-olympus.c
-    libexif/olympus/mnote-olympus-entry.c
-    libexif/olympus/mnote-olympus-tag.c
-)
-
-set(HEADERS_PENTAX
-    libexif/pentax/exif-mnote-data-pentax.h
-    libexif/pentax/mnote-pentax-entry.h
-    libexif/pentax/mnote-pentax-tag.h
-)
-
-set(SOURCES_PENTAX
-    libexif/pentax/exif-mnote-data-pentax.c
-    libexif/pentax/mnote-pentax-entry.c
-    libexif/pentax/mnote-pentax-tag.c
-)
-
-if(MSVC)
-    set(SOURCES_MSVC "libexif.def")
-endif()
-
-add_library(libexif
-    ${SOURCES} 
-    ${SOURCES_APPLE}
-    ${SOURCES_CANON} 
-    ${SOURCES_FUJI} 
-    ${SOURCES_OLYMPUS}
-    ${SOURCES_PENTAX}
-    ${SOURCES_MSVC}
-)
-
-target_include_directories(libexif PRIVATE .)
-target_include_directories(libexif PRIVATE ${CMAKE_BINARY_DIR})
-target_compile_definitions(libexif PRIVATE -D_CRT_SECURE_NO_WARNINGS)
-target_compile_definitions(libexif PRIVATE -DGETTEXT_PACKAGE="${PACKAGE}")
-
-include(CheckFunctionExists)
-include(CheckIncludeFile)
-
-check_function_exists(dcgettext HAVE_DCGETTEXT)
-check_function_exists(gettext HAVE_DCGETTEXT)
-check_function_exists(iconv HAVE_DCGETTEXT)
-check_function_exists(localtime_r HAVE_DCGETTEXT)
-
-check_include_file(dlfcn.h HAVE_DLFCN_H)
-check_include_file(inttypes.h HAVE_INTTYPES_H)
-check_include_file(memory.h HAVE_MEMORY_H)
-check_include_file(stdint.h HAVE_STDINT_H)
-check_include_file(stdlib.h HAVE_STDLIB_H)
-check_include_file(strings.h HAVE_STRINGS_H)
-check_include_file(string.h HAVE_STRING_H)
-check_include_file(sys/stat.h HAVE_SYS_STAT_H)
-check_include_file(sys/stat.h HAVE_SYS_STAT_H)
-check_include_file(sys/types.h HAVE_SYS_TYPES_H)
-check_include_file(unistd.h HAVE_UNISTD_H)
-
-configure_file(config.h.cmake config.h)
-
-install(
-    TARGETS libexif
-    RUNTIME DESTINATION bin
-    ARCHIVE DESTINATION lib
-    LIBRARY DESTINATION lib
-)
-
-install(FILES ${HEADERS}         DESTINATION include/libexif)
-install(FILES ${HEADERS_APPLE}   DESTINATION include/libexif/apple)
-install(FILES ${HEADERS_CANON}   DESTINATION include/libexif/canon)
-install(FILES ${HEADERS_FUJI}    DESTINATION include/libexif/fuji)
-install(FILES ${HEADERS_OLYMPUS} DESTINATION include/libexif/olympus)
-install(FILES ${HEADERS_PENTAX}  DESTINATION include/libexif/pentax)
diff --git a/external_imported/vcpkg/ports/libexif/add-missing-_stdint-h.patch b/external_imported/vcpkg/ports/libexif/add-missing-_stdint-h.patch
deleted file mode 100644
index 1c4c95d1c..000000000
--- a/external_imported/vcpkg/ports/libexif/add-missing-_stdint-h.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-diff --git a/libexif/_stdint.h b/libexif/_stdint.h
-new file mode 100644
-index 0000000..9a6118b
---- /dev/null
-+++ b/libexif/_stdint.h
-@@ -0,0 +1 @@
-+#include <stdint.h>
diff --git a/external_imported/vcpkg/ports/libexif/config.h.cmake b/external_imported/vcpkg/ports/libexif/config.h.cmake
deleted file mode 100644
index 4dfbdb1b0..000000000
--- a/external_imported/vcpkg/ports/libexif/config.h.cmake
+++ /dev/null
@@ -1,96 +0,0 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if translation of program messages to the user's native
-   language is requested. */
-#cmakedefine ENABLE_NLS
-
-/* Define if the GNU dcgettext() function is already present or preinstalled.
-   */
-#cmakedefine HAVE_DCGETTEXT
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#cmakedefine HAVE_DLFCN_H
-
-/* Define if the GNU gettext() function is already present or preinstalled. */
-#cmakedefine HAVE_GETTEXT
-
-/* Define if you have the iconv() function. */
-#cmakedefine HAVE_ICONV
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#cmakedefine HAVE_INTTYPES_H
-
-/* Define to 1 if you have the `localtime_r' function. */
-#cmakedefine HAVE_LOCALTIME_R
-
-/* Define to 1 if you have the <memory.h> header file. */
-#cmakedefine HAVE_MEMORY_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#cmakedefine HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#cmakedefine HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#cmakedefine HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#cmakedefine HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#cmakedefine HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#cmakedefine HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#cmakedefine HAVE_UNISTD_H
-
-/* Define as const if the declaration of iconv() needs const. */
-#cmakedefine ICONV_CONST
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#cmakedefine LT_OBJDIR
-
-/* Name of package */
-#cmakedefine PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#cmakedefine PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#cmakedefine PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#cmakedefine PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#cmakedefine PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#cmakedefine PACKAGE_URL
-
-/* Define to the version of this package. */
-#cmakedefine PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#cmakedefine STDC_HEADERS
-
-/* Version number of package */
-#cmakedefine VERSION
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#cmakedefine const
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-#cmakedefine inline
-#endif
-
-#ifdef _MSC_VER
-#include <BaseTsd.h>
-typedef SSIZE_T ssize_t;
-#endif
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/libexif/fix-ssize.patch b/external_imported/vcpkg/ports/libexif/fix-ssize.patch
new file mode 100644
index 000000000..afcd87cf7
--- /dev/null
+++ b/external_imported/vcpkg/ports/libexif/fix-ssize.patch
@@ -0,0 +1,16 @@
+diff --git a/libexif/exif-loader.c b/libexif/exif-loader.c
+index ad4ae96..8a24ef6 100644
+--- a/libexif/exif-loader.c
++++ b/libexif/exif-loader.c
+@@ -19,6 +19,11 @@
+  */
+ 
+ #include <config.h>
++#ifdef _WIN32
++#include <stddef.h>
++#define ssize_t ptrdiff_t
++#endif
++
+ 
+ #include <libexif/exif-loader.h>
+ #include <libexif/exif-utils.h>
diff --git a/external_imported/vcpkg/ports/libexif/libexif.def b/external_imported/vcpkg/ports/libexif/libexif.def
deleted file mode 100644
index 7013674a8..000000000
--- a/external_imported/vcpkg/ports/libexif/libexif.def
+++ /dev/null
@@ -1,136 +0,0 @@
-EXPORTS
-    exif_array_set_byte_order
-    exif_byte_order_get_name
-    exif_content_add_entry
-    exif_content_dump
-    exif_content_fix
-    exif_content_foreach_entry
-    exif_content_free
-    exif_content_get_entry
-    exif_content_get_ifd
-    exif_content_log
-    exif_content_new
-    exif_content_new_mem
-    exif_content_ref
-    exif_content_remove_entry
-    exif_content_unref
-    exif_data_dump
-    exif_data_fix
-    exif_data_foreach_content
-    exif_data_free
-    exif_data_get_byte_order
-    exif_data_get_data_type
-    exif_data_get_log
-    exif_data_get_mnote_data
-    exif_data_load_data
-    exif_data_log
-    exif_data_new
-    exif_data_new_from_data
-    exif_data_new_from_file
-    exif_data_new_mem
-    exif_data_option_get_description
-    exif_data_option_get_name
-    exif_data_ref
-    exif_data_save_data
-    exif_data_set_byte_order
-    exif_data_set_data_type
-    exif_data_set_option
-    exif_data_unref
-    exif_data_unset_option
-    exif_entry_dump
-    exif_entry_fix
-    exif_entry_free
-    exif_entry_get_value
-    exif_entry_initialize
-    exif_entry_new
-    exif_entry_new_mem
-    exif_entry_ref
-    exif_entry_unref
-    exif_format_get_name
-    exif_format_get_size
-    exif_get_gps_tag_info
-    exif_get_long
-    exif_get_rational
-    exif_get_short
-    exif_get_slong
-    exif_get_srational
-    exif_get_sshort
-    exif_ifd_get_name
-    exif_loader_get_buf
-    exif_loader_get_data
-    exif_loader_log
-    exif_loader_new
-    exif_loader_new_mem
-    exif_loader_ref
-    exif_loader_reset
-    exif_loader_unref
-    exif_loader_write
-    exif_loader_write_file
-    exif_log
-    exif_log_code_get_message
-    exif_log_code_get_title
-    exif_log_free
-    exif_log_new
-    exif_log_new_mem
-    exif_log_ref
-    exif_log_set_func
-    exif_log_unref
-    exif_logv
-    exif_mem_alloc
-    exif_mem_free
-    exif_mem_new
-    exif_mem_new_default
-    exif_mem_realloc
-    exif_mem_ref
-    exif_mem_unref
-    exif_mnote_data_apple_new
-    exif_mnote_data_canon_new
-    exif_mnote_data_construct
-    exif_mnote_data_count
-    exif_mnote_data_get_description
-    exif_mnote_data_get_id
-    exif_mnote_data_get_name
-    exif_mnote_data_get_title
-    exif_mnote_data_get_value
-    exif_mnote_data_load
-    exif_mnote_data_log
-    exif_mnote_data_olympus_new
-    exif_mnote_data_pentax_new
-    exif_mnote_data_ref
-    exif_mnote_data_save
-    exif_mnote_data_set_byte_order
-    exif_mnote_data_set_offset
-    exif_mnote_data_unref
-    exif_set_long
-    exif_set_rational
-    exif_set_short
-    exif_set_slong
-    exif_set_srational
-    exif_set_sshort
-    exif_tag_from_name
-    exif_tag_get_description
-    exif_tag_get_description_in_ifd
-    exif_tag_get_name
-    exif_tag_get_name_in_ifd
-    exif_tag_get_support_level_in_ifd
-    exif_tag_get_title
-    exif_tag_get_title_in_ifd
-    exif_tag_table_count
-    exif_tag_table_get_name
-    exif_tag_table_get_tag
-    mnote_apple_entry_get_value
-    mnote_apple_tag_get_description
-    mnote_apple_tag_get_name
-    mnote_apple_tag_get_title
-    mnote_canon_entry_get_value
-    mnote_canon_tag_get_description
-    mnote_canon_tag_get_name
-    mnote_canon_tag_get_title
-    mnote_olympus_entry_get_value
-    mnote_olympus_tag_get_description
-    mnote_olympus_tag_get_name
-    mnote_olympus_tag_get_title
-    mnote_pentax_entry_get_value
-    mnote_pentax_tag_get_description
-    mnote_pentax_tag_get_name
-    mnote_pentax_tag_get_title
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/libexif/portfile.cmake b/external_imported/vcpkg/ports/libexif/portfile.cmake
index 83fc06ec8..320c1ac05 100644
--- a/external_imported/vcpkg/ports/libexif/portfile.cmake
+++ b/external_imported/vcpkg/ports/libexif/portfile.cmake
@@ -1,24 +1,33 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libexif/libexif
-    REF v0.6.24
+    REF "v${VERSION}"
     SHA512 eac1b5220ca0e02370837a0d78a6d38e91c5afa0956d4196b26a8d2a8a2c5dea18d58c0e473285f278653c3863923241651b7dff4d007cc46385eb29ea188330
     HEAD_REF master
     PATCHES
-        add-missing-_stdint-h.patch
+        fix-ssize.patch
 )
 
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/config.h.cmake" DESTINATION "${SOURCE_PATH}")
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/libexif.def"    DESTINATION "${SOURCE_PATH}")
+vcpkg_list(SET options)
+if("nls" IN_LIST FEATURES)
+    vcpkg_list(APPEND options "--enable-nls")
+else()
+    vcpkg_list(APPEND options "--disable-nls")
+endif()
 
-vcpkg_cmake_configure(
+vcpkg_configure_make(
     SOURCE_PATH "${SOURCE_PATH}"
+    AUTOCONFIG
+    OPTIONS
+        ${options}
+        --enable-internal-docs=no
+        --enable-ship-binaries=no
 )
 
-vcpkg_cmake_install()
-vcpkg_copy_pdbs()
+vcpkg_install_make()
+vcpkg_fixup_pkgconfig()
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/unofficial-libexif-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/libexif/unofficial-libexif-config.cmake b/external_imported/vcpkg/ports/libexif/unofficial-libexif-config.cmake
new file mode 100644
index 000000000..80ae7915e
--- /dev/null
+++ b/external_imported/vcpkg/ports/libexif/unofficial-libexif-config.cmake
@@ -0,0 +1,28 @@
+
+if(NOT TARGET unofficial::libexif::libexif)
+    add_library(unofficial::libexif::libexif UNKNOWN IMPORTED)
+    get_filename_component(z_vcpkg_LIBEXIF_root "${CMAKE_CURRENT_LIST_FILE}" PATH)
+    get_filename_component(z_vcpkg_LIBEXIF_root "${z_vcpkg_libexif_root}" PATH)
+    get_filename_component(z_vcpkg_LIBEXIF_root "${z_vcpkg_libexif_root}" PATH)
+    set_target_properties(unofficial::libexif::libexif PROPERTIES
+      INTERFACE_INCLUDE_DIRECTORIES "${z_vcpkg_libexif_root}/include"
+    )
+    find_library(Z_VCPKG_LIBEXIF_LIBRARY_RELEASE NAMES libexif PATHS "${z_vcpkg_LIBEXIF_root }/lib" NO_DEFAULT_PATH REQUIRED)
+    find_library(Z_VCPKG_LIBEXIF_LIBRARY_DEBUG NAMES libexif PATHS "${z_vcpkg_LIBEXIF_root }/debug/lib" NO_DEFAULT_PATH)
+    
+    if(EXISTS "${Z_VCPKG_LIBEXIF_LIBRARY_RELEASE}")
+        set_property(TARGET unofficial::libexif::libexif APPEND PROPERTY IMPORTED_CONFIGURATIONS "Release")
+        set_target_properties(unofficial::libexif::libexif PROPERTIES
+            IMPORTED_LOCATION_RELEASE  "${Z_VCPKG_LIBEXIF_LIBRARY_RELEASE}"
+        )
+    endif()
+  
+    if(EXISTS "${Z_VCPKG_LIBEXIF_LIBRARY_DEBUG}")
+        set_property(TARGET unofficial::libexif::libexif APPEND PROPERTY IMPORTED_CONFIGURATIONS "Debug")
+        set_target_properties(unofficial::libexif::libexif PROPERTIES
+            IMPORTED_LOCATION_DEBUG "${Z_VCPKG_LIBEXIF_LIBRARY_DEBUG}"
+        )
+    endif()
+
+    unset(z_vcpkg_LIBEXIF_root)
+endif()
diff --git a/external_imported/vcpkg/ports/libexif/vcpkg.json b/external_imported/vcpkg/ports/libexif/vcpkg.json
index 77c7c25ae..41d4eb3d0 100644
--- a/external_imported/vcpkg/ports/libexif/vcpkg.json
+++ b/external_imported/vcpkg/ports/libexif/vcpkg.json
@@ -1,14 +1,35 @@
 {
   "name": "libexif",
   "version": "0.6.24",
+  "port-version": 2,
   "description": "a library for parsing, editing, and saving EXIF data",
   "homepage": "https://libexif.github.io/",
   "license": "LGPL-2.1-or-later",
   "supports": "!uwp",
   "dependencies": [
+    {
+      "$comment": "Needs gettext m4 files and autopoint during autoreconf. No runtime dependency.",
+      "name": "gettext",
+      "host": true
+    },
     {
       "name": "vcpkg-cmake",
       "host": true
     }
-  ]
+  ],
+  "features": {
+    "nls": {
+      "description": "Enable native language support.",
+      "dependencies": [
+        {
+          "name": "gettext",
+          "host": true,
+          "features": [
+            "tools"
+          ]
+        },
+        "gettext-libintl"
+      ]
+    }
+  }
 }
diff --git a/external_imported/vcpkg/ports/libfabric/portfile.cmake b/external_imported/vcpkg/ports/libfabric/portfile.cmake
index 03b2ec3fa..b87a10ba7 100644
--- a/external_imported/vcpkg/ports/libfabric/portfile.cmake
+++ b/external_imported/vcpkg/ports/libfabric/portfile.cmake
@@ -13,24 +13,16 @@ vcpkg_from_github(
 set(LIBFABRIC_RELEASE_CONFIGURATION "Release-v142")
 set(LIBFABRIC_DEBUG_CONFIGURATION "Debug-v142")
 
-vcpkg_install_msbuild(
-    SOURCE_PATH ${SOURCE_PATH}
+vcpkg_msbuild_install(
+    SOURCE_PATH "${SOURCE_PATH}"
     PROJECT_SUBPATH libfabric.vcxproj
-    INCLUDES_SUBPATH include
-    LICENSE_SUBPATH COPYING
     PLATFORM "x64"
     RELEASE_CONFIGURATION ${LIBFABRIC_RELEASE_CONFIGURATION}
-    DEBUG_CONFIGURATION ${LIBFABRIC_RELEASE_CONFIGURATION}
-    USE_VCPKG_INTEGRATION
-    ALLOW_ROOT_INCLUDES
+    DEBUG_CONFIGURATION ${LIBFABRIC_DEBUG_CONFIGURATION}
     OPTIONS
       /p:SolutionDir=${SOURCE_PATH}
-      /p:AdditionalIncludeDirectories="${CURRENT_INSTALLED_DIR}/include"
 )
 
-#Move includes under subdirectory to avoid colisions with other libraries
-file(RENAME "${CURRENT_PACKAGES_DIR}/include" "${CURRENT_PACKAGES_DIR}/includetemp")
-file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include")
-file(RENAME "${CURRENT_PACKAGES_DIR}/includetemp" "${CURRENT_PACKAGES_DIR}/include/libfabric")
+file(COPY "${SOURCE_PATH}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/libfabric")
 
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/libfabric/vcpkg.json b/external_imported/vcpkg/ports/libfabric/vcpkg.json
index 547c77e3c..3478c994c 100644
--- a/external_imported/vcpkg/ports/libfabric/vcpkg.json
+++ b/external_imported/vcpkg/ports/libfabric/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libfabric",
   "version-semver": "1.13.2",
-  "port-version": 1,
+  "port-version": 2,
   "description": "The OpenFabrics Interfaces Working Group (OFIWG) and the Libfabric open-source community are pleased to announce the release of version v1.6.2 of libfabric. See NEWS.md for the list of features and enhancements that have been added since the last release.",
   "homepage": "https://github.com/ofiwg/libfabric",
   "supports": "windows & !uwp & x64 & !static",
@@ -9,6 +9,11 @@
     {
       "name": "networkdirect-sdk",
       "platform": "windows"
+    },
+    {
+      "name": "vcpkg-msbuild",
+      "host": true,
+      "platform": "windows"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/libffi/CMakeLists.txt b/external_imported/vcpkg/ports/libffi/CMakeLists.txt
deleted file mode 100644
index 21da1306c..000000000
--- a/external_imported/vcpkg/ports/libffi/CMakeLists.txt
+++ /dev/null
@@ -1,249 +0,0 @@
-cmake_minimum_required(VERSION 3.9)
-project(libffi C ASM)
-
-set(CMAKE_SHARED_LIBRARY_PREFIX)
-set(CMAKE_STATIC_LIBRARY_PREFIX)
-
-if(NOT CMAKE_SYSTEM_PROCESSOR)
-    set(CMAKE_SYSTEM_PROCESSOR "${CMAKE_HOST_SYSTEM_PROCESSOR}")
-endif()
-
-# config variables for ffi.h.in
-set(VERSION 3.4.4)
-
-set(KNOWN_PROCESSORS x86 x86_64 amd64 arm arm64 i386 i686 armv7l armv7-a aarch64 mips64el riscv32 riscv64)
-
-string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" lower_system_processor)
-
-if(NOT lower_system_processor IN_LIST KNOWN_PROCESSORS)
-    message(FATAL_ERROR "Unknown processor: ${CMAKE_SYSTEM_PROCESSOR}")
-endif()
-
-if(CMAKE_SYSTEM_NAME MATCHES "Windows" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
-    set(TARGET ARM_WIN32)
-elseif(CMAKE_SYSTEM_NAME MATCHES "Windows" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
-    set(TARGET ARM_WIN64)
-elseif(CMAKE_SYSTEM_NAME MATCHES "Windows" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
-    set(TARGET X86_WIN32)
-elseif(CMAKE_SYSTEM_NAME MATCHES "Windows" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
-    set(TARGET X86_WIN64)
-elseif(lower_system_processor MATCHES "arm64|aarch64")
-    set(TARGET ARM64)
-elseif(lower_system_processor MATCHES "mips64")
-    set(TARGET MIPS64)
-elseif(lower_system_processor MATCHES "arm")
-    set(TARGET ARM)
-elseif(lower_system_processor MATCHES "riscv")
-    set(TARGET RISCV)
-elseif(CMAKE_SYSTEM_NAME MATCHES "BSD" AND CMAKE_SIZEOF_VOID_P EQUAL 4)
-    set(TARGET X86_FREEBSD)
-elseif(CMAKE_SYSTEM_NAME MATCHES "Darwin"  AND CMAKE_SIZEOF_VOID_P EQUAL 4)
-    set(TARGET X86_DARWIN)
-elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
-    set(TARGET X86_64)
-elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
-    set(TARGET X86)
-else()
-    message(FATAL_ERROR "Cannot determine target. Please consult ${CMAKE_CURRENT_SOURCE_DIR}/configure.ac and add your platform to this CMake file.")
-endif()
-
-if("${TARGET}" STREQUAL "X86_64" OR "${TARGET}" STREQUAL "MIPS64")
-    set(HAVE_LONG_DOUBLE 1)
-else()
-    set(HAVE_LONG_DOUBLE 0)
-endif()
-set(FFI_EXEC_TRAMPOLINE_TABLE 0)
-
-# mimic layout of original buildsystem
-configure_file(include/ffi.h.in ${CMAKE_BINARY_DIR}/include/ffi.h)
-file(COPY ${FFI_CONFIG_FILE} DESTINATION ${CMAKE_BINARY_DIR})
-
-if ("${TARGET}" STREQUAL "ARM_WIN64" OR "${TARGET}" STREQUAL "ARM64")
-    file(COPY src/aarch64/ffitarget.h DESTINATION ${CMAKE_BINARY_DIR}/include)
-elseif ("${TARGET}" STREQUAL "ARM_WIN32" OR "${TARGET}" STREQUAL "ARM")
-    file(COPY src/arm/ffitarget.h DESTINATION ${CMAKE_BINARY_DIR}/include)
-elseif ("${TARGET}" MATCHES "MIPS")
-    file(COPY src/mips/ffitarget.h DESTINATION ${CMAKE_BINARY_DIR}/include)
-elseif ("${TARGET}" STREQUAL "RISCV")
-    file(COPY src/riscv/ffitarget.h DESTINATION ${CMAKE_BINARY_DIR}/include)
-else()
-    file(COPY src/x86/ffitarget.h DESTINATION ${CMAKE_BINARY_DIR}/include)
-endif()
-
-include_directories(${CMAKE_BINARY_DIR}/include)
-include_directories(${CMAKE_BINARY_DIR})
-include_directories(include)
-
-add_definitions(-DFFI_BUILDING)
-if(BUILD_SHARED_LIBS AND WIN32)
-    add_definitions(-DFFI_BUILDING_DLL)
-endif()
-
-set(FFI_SOURCES
-    src/closures.c
-    src/prep_cif.c
-    src/types.c
-    src/tramp.c)
-
-if ("${TARGET}" STREQUAL "ARM_WIN64" OR "${TARGET}" STREQUAL "ARM64")
-    set(FFI_SOURCES
-        ${FFI_SOURCES}
-        src/aarch64/ffi.c)
-elseif("${TARGET}" STREQUAL "ARM_WIN32" OR "${TARGET}" STREQUAL "ARM")
-    set(FFI_SOURCES
-        ${FFI_SOURCES}
-        src/arm/ffi.c)
-elseif("${TARGET}" MATCHES "MIPS")
-    set(FFI_SOURCES
-        ${FFI_SOURCES}
-        src/mips/ffi.c)
-elseif("${TARGET}" STREQUAL "RISCV")
-   set(FFI_SOURCES
-	${FFI_SOURCES}
-	src/riscv/ffi.c)
-else()
-    set(FFI_SOURCES
-        ${FFI_SOURCES}
-        src/java_raw_api.c
-        src/raw_api.c)
-    if("${TARGET}" STREQUAL "X86_WIN32" OR "${TARGET}" STREQUAL "X86_DARWIN" OR "${TARGET}" STREQUAL "X86")
-        set(FFI_SOURCES
-            ${FFI_SOURCES}
-            src/x86/ffi.c)
-    elseif("${TARGET}" STREQUAL "X86_WIN64")
-        set(FFI_SOURCES
-            ${FFI_SOURCES}
-            src/x86/ffiw64.c)
-    elseif("${TARGET}" STREQUAL "X86_64")
-        set(FFI_SOURCES
-            ${FFI_SOURCES}
-            src/x86/ffi64.c
-            src/x86/ffiw64.c)
-    endif()
-endif()
-
-macro(add_assembly ASMFILE)
-    get_filename_component(ASMFILE_FULL "${ASMFILE}" ABSOLUTE)
-    if(MSVC)
-        if ("${TARGET}" STREQUAL "ARM_WIN64")
-            set(ARCH_ASSEMBLER armasm64)
-        elseif ("${TARGET}" STREQUAL "ARM_WIN32")
-            set(ARCH_ASSEMBLER armasm)
-        elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
-            set(ARCH_ASSEMBLER ml /safeseh /c /Zi)
-        else()
-            set(ARCH_ASSEMBLER ml64 /c /Zi)
-        endif()
-
-        get_filename_component(ARCH_ASM_NAME "${ASMFILE_FULL}" NAME_WE)
-
-        execute_process(
-            COMMAND ${CMAKE_C_COMPILER} /nologo /EP /I. /Iinclude /I${CMAKE_CURRENT_SOURCE_DIR}/include "${ASMFILE_FULL}"
-            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-            OUTPUT_FILE ${ARCH_ASM_NAME}.asm
-            RESULT_VARIABLE retcode
-        )
-
-        if(NOT ${retcode} STREQUAL "0")
-            message(FATAL_ERROR "Unable to assemble, exit code: '${retcode}'.")
-        endif()
-
-        # Produced *.asm file could be just added to sources.
-        # It works in x64 mode, but for some strange reason MASM returns error code when in x86,
-        # (even though it didn't report any errors and correctly generated object file)
-        # which in turn causes MSBUILD to stop.
-        execute_process(
-            COMMAND ${ARCH_ASSEMBLER} ${ARCH_ASM_NAME}.asm
-            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-            RESULT_VARIABLE retcode
-        )
-
-        if(NOT ${retcode} STREQUAL "0")
-            message(FATAL_ERROR "Unable to compile assembly, exit code: '${retcode}'.")
-        endif()
-
-        list(APPEND FFI_SOURCES ${CMAKE_BINARY_DIR}/${ARCH_ASM_NAME}.obj)
-    else()
-        list(APPEND FFI_SOURCES ${ASMFILE})
-    endif()
-endmacro()
-
-if("${TARGET}" STREQUAL "X86")
-    set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -m32")
-endif()
-
-if("${TARGET}" STREQUAL "X86" OR "${TARGET}" STREQUAL "X86_DARWIN")
-    add_assembly(src/x86/sysv.S)
-elseif("${TARGET}" STREQUAL "X86_64")
-    add_assembly(src/x86/unix64.S)
-    add_assembly(src/x86/win64.S)
-elseif("${TARGET}" STREQUAL "X86_WIN32")
-    if(MSVC)
-        add_assembly(src/x86/sysv_intel.S)
-    else()
-        add_assembly(src/x86/sysv.S)
-    endif()
-elseif("${TARGET}" STREQUAL "X86_WIN64")
-    if(MSVC)
-        add_assembly(src/x86/win64_intel.S)
-    else()
-        add_assembly(src/x86/win64.S)
-    endif()
-elseif("${TARGET}" STREQUAL "ARM_WIN32")
-    if(MSVC)
-        add_assembly(src/arm/sysv_msvc_arm32.S)
-    else()
-        add_assembly(src/arm/sysv.S)
-    endif()
-elseif("${TARGET}" STREQUAL "ARM")
-    add_assembly(src/arm/sysv.S)
-elseif("${TARGET}" STREQUAL "ARM_WIN64")
-    if(MSVC)
-        add_assembly(src/aarch64/win64_armasm.S)
-    else()
-        add_assembly(src/aarch64/sysv.S)
-    endif()
-elseif("${TARGET}" STREQUAL "ARM64")
-    add_assembly(src/aarch64/sysv.S)
-elseif("${TARGET}" MATCHES "MIPS")
-    add_assembly(src/mips/n32.S)
-elseif("${TARGET}" MATCHES "RISCV")
-    add_assembly(src/riscv/sysv.S)
-else()
-    message(FATAL_ERROR "Target not implemented")
-endif()
-
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    list(APPEND FFI_SOURCES src/debug.c)
-    add_definitions(-DFFI_DEBUG)
-endif()
-
-add_library(libffi ${FFI_SOURCES})
-
-install(TARGETS libffi
-    EXPORT ${PROJECT_NAME}Targets
-    RUNTIME DESTINATION bin
-    ARCHIVE DESTINATION lib
-    LIBRARY DESTINATION lib)
-
-include(CMakePackageConfigHelpers)
-
-configure_package_config_file(${PROJECT_NAME}Config.cmake.in
-     "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
-     INSTALL_DESTINATION share/${PROJECT_NAME})
-write_basic_package_version_file(
-    ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
-    VERSION ${VERSION}
-    COMPATIBILITY AnyNewerVersion)
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
-              "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
-    DESTINATION share/${PROJECT_NAME})
-install(EXPORT ${PROJECT_NAME}Targets
-    DESTINATION share/${PROJECT_NAME})
-
-if(NOT FFI_SKIP_HEADERS)
-    install(FILES
-        ${CMAKE_BINARY_DIR}/include/ffi.h
-        ${CMAKE_BINARY_DIR}/include/ffitarget.h
-        DESTINATION include)
-endif()
diff --git a/external_imported/vcpkg/ports/libffi/dll-bindir.diff b/external_imported/vcpkg/ports/libffi/dll-bindir.diff
new file mode 100644
index 000000000..51e15413d
--- /dev/null
+++ b/external_imported/vcpkg/ports/libffi/dll-bindir.diff
@@ -0,0 +1,12 @@
+diff --git a/configure.host b/configure.host
+index f23716f..78d317b 100644
+--- a/configure.host
++++ b/configure.host
+@@ -103,6 +103,7 @@ case "${host}" in
+ 	else
+ 	  AM_LTLDFLAGS='-no-undefined -bindir "$(bindir)"';
+ 	fi
++	AM_LTLDFLAGS='-no-undefined';
+ 	;;
+ 
+   i?86-*-darwin* | x86_64-*-darwin* | i?86-*-ios | x86_64-*-ios)
diff --git a/external_imported/vcpkg/ports/libffi/fficonfig.h b/external_imported/vcpkg/ports/libffi/fficonfig.h
deleted file mode 100644
index 7d9a45c63..000000000
--- a/external_imported/vcpkg/ports/libffi/fficonfig.h
+++ /dev/null
@@ -1,65 +0,0 @@
-#ifdef __linux__
-#define EH_FRAME_FLAGS "a"
-#endif
-#define HAVE_ALLOCA 1
-#ifndef _WIN64
-#define HAVE_AS_ASCII_PSEUDO_OP 1
-#endif
-#ifndef _WIN64
-#define HAVE_AS_STRING_PSEUDO_OP 1
-#endif
-#ifndef _WIN64
-#define HAVE_AS_X86_PCREL 1
-#endif
-#ifdef __linux__
-#define HAVE_HIDDEN_VISIBILITY_ATTRIBUTE 1
-#endif
-#define HAVE_INTTYPES_H 1
-#define HAVE_MEMORY_H 1
-#define HAVE_STDINT_H 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STRING_H 1
-#define HAVE_SYS_STAT_H 1
-#define HAVE_SYS_TYPES_H 1
-#define LT_OBJDIR ".libs/"
-#define PACKAGE "libffi"
-#define PACKAGE_BUGREPORT "http://github.com/libffi/libffi/issues"
-#define PACKAGE_NAME "libffi"
-#define PACKAGE_STRING "libffi 3.4.4"
-#define PACKAGE_TARNAME "libffi"
-#define PACKAGE_URL ""
-#define PACKAGE_VERSION "3.4.4"
-#define SIZEOF_DOUBLE 8
-#define SIZEOF_LONG_DOUBLE 8
-#ifndef _WIN64
-#define SIZEOF_SIZE_T 4
-#else
-#define SIZEOF_SIZE_T 8
-#endif
-#define STDC_HEADERS 1
-#ifndef __linux__
-#ifndef _WIN64
-#define SYMBOL_UNDERSCORE 1
-#endif
-#endif
-#define VERSION "3.4.4"
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-#  define WORDS_BIGENDIAN 1
-# endif
-#endif
-
-#ifdef HAVE_HIDDEN_VISIBILITY_ATTRIBUTE
-#ifdef LIBFFI_ASM
-#define FFI_HIDDEN(name) .hidden name
-#else
-#define FFI_HIDDEN __attribute__ ((visibility ("hidden")))
-#endif
-#else
-#ifdef LIBFFI_ASM
-#define FFI_HIDDEN(name)
-#else
-#define FFI_HIDDEN
-#endif
-#endif
-
diff --git a/external_imported/vcpkg/ports/libffi/fix_undefind_func.patch b/external_imported/vcpkg/ports/libffi/fix_undefind_func.patch
new file mode 100644
index 000000000..de2004540
--- /dev/null
+++ b/external_imported/vcpkg/ports/libffi/fix_undefind_func.patch
@@ -0,0 +1,28 @@
+diff --git a/include/ffi_common.h b/include/ffi_common.h
+index 2bd31b0..c53a794 100644
+--- a/include/ffi_common.h
++++ b/include/ffi_common.h
+@@ -128,6 +128,10 @@ void *ffi_data_to_code_pointer (void *data) FFI_HIDDEN;
+    static trampoline. */
+ int ffi_tramp_is_present (void *closure) FFI_HIDDEN;
+ 
++/* Return a file descriptor of a temporary zero-sized file in a
++   writable and executable filesystem. */
++int open_temp_exec_file(void) FFI_HIDDEN;
++
+ /* Extended cif, used in callback from assembly routine */
+ typedef struct
+ {
+diff --git a/src/tramp.c b/src/tramp.c
+index b9d273a..90efb07 100644
+--- a/src/tramp.c
++++ b/src/tramp.c
+@@ -39,6 +39,8 @@
+ #ifdef __linux__
+ #define _GNU_SOURCE 1
+ #endif
++#include <ffi.h>
++#include <ffi_common.h>
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <stdlib.h>
diff --git a/external_imported/vcpkg/ports/libffi/libffiConfig.cmake b/external_imported/vcpkg/ports/libffi/libffiConfig.cmake
new file mode 100644
index 000000000..a510862e1
--- /dev/null
+++ b/external_imported/vcpkg/ports/libffi/libffiConfig.cmake
@@ -0,0 +1,7 @@
+file(READ "${CMAKE_CURRENT_LIST_DIR}/usage" usage)
+message(WARNING "find_package(libffi) is deprecated.\n${usage}")
+include(CMakeFindDependencyMacro)
+find_dependency(unofficial-libffi CONFIG REQUIRED)
+if(NOT TARGET libffi)
+    add_library(libffi ALIAS unofficial::libffi::libffi)
+endif()
diff --git a/external_imported/vcpkg/ports/libffi/libffiConfig.cmake.in b/external_imported/vcpkg/ports/libffi/libffiConfig.cmake.in
deleted file mode 100644
index ebdf1488a..000000000
--- a/external_imported/vcpkg/ports/libffi/libffiConfig.cmake.in
+++ /dev/null
@@ -1,7 +0,0 @@
-@PACKAGE_INIT@
-
-include(CMakeFindDependencyMacro)
-
-if(NOT TARGET libffi)
-  include("${CMAKE_CURRENT_LIST_DIR}/libffiTargets.cmake")
-endif()
diff --git a/external_imported/vcpkg/ports/libffi/portfile.cmake b/external_imported/vcpkg/ports/libffi/portfile.cmake
index 086ead770..f37cf125a 100644
--- a/external_imported/vcpkg/ports/libffi/portfile.cmake
+++ b/external_imported/vcpkg/ports/libffi/portfile.cmake
@@ -1,68 +1,73 @@
-vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO libffi/libffi
-    REF "v${VERSION}"
-    SHA512 e3b261a7900cec61225c768ebd443884465669e0904db3f523aaaeeed74b4c03dbe23d74ff8bb69554791a798e25894a5fcbe2b13b883d3ee38aeff4c1e16a49
-    HEAD_REF master
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://github.com/libffi/libffi/releases/download/v${VERSION}/libffi-${VERSION}.tar.gz"
+    FILENAME "libffi-${VERSION}.tar.gz"
+    SHA512 88680aeb0fa0dc0319e5cd2ba45b4b5a340bc9b4bcf20b1e0613b39cd898f177a3863aa94034d8e23a7f6f44d858a53dcd36d1bb8dee13b751ef814224061889
+)
+vcpkg_extract_source_archive(
+    SOURCE_PATH
+    ARCHIVE "${ARCHIVE}"
+    PATCHES
+        dll-bindir.diff
+        fix_undefind_func.patch
 )
 
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/libffiConfig.cmake.in" DESTINATION "${SOURCE_PATH}")
+vcpkg_list(SET options)
+if(VCPKG_TARGET_IS_WINDOWS)
+    set(extra_cflags "-DFFI_BUILDING")
+    if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+        string(APPEND extra_cflags " -DFFI_BUILDING_DLL")
+    endif()
+    vcpkg_list(APPEND options "CFLAGS=\${CFLAGS} ${extra_cflags}")
+endif()
 
-vcpkg_cmake_configure(
+set(ccas_options "")
+vcpkg_cmake_get_vars(cmake_vars_file)
+include("${cmake_vars_file}")
+if(VCPKG_DETECTED_CMAKE_C_COMPILER_ID STREQUAL "MSVC")
+    set(ccas "${SOURCE_PATH}/msvcc.sh")
+    if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
+        string(APPEND ccas_options " -m32")
+    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
+        string(APPEND ccas_options " -m64")
+    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
+        string(APPEND ccas_options " -marm")
+    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
+        string(APPEND ccas_options " -marm64")
+    endif()
+else()
+    set(ccas "${VCPKG_DETECTED_CMAKE_C_COMPILER}")
+endif()
+cmake_path(GET ccas PARENT_PATH ccas_dir)
+vcpkg_add_to_path("${ccas_dir}")
+cmake_path(GET ccas FILENAME ccas_command)
+vcpkg_list(APPEND options "CCAS=${ccas_command}${ccas_options}")
+
+vcpkg_configure_make(
     SOURCE_PATH "${SOURCE_PATH}"
+    DETERMINE_BUILD_TRIPLET
+    USE_WRAPPERS
     OPTIONS
-        "-DFFI_CONFIG_FILE=${CMAKE_CURRENT_LIST_DIR}/fficonfig.h"
-    OPTIONS_DEBUG
-        -DFFI_SKIP_HEADERS=ON
+        --enable-portable-binary
+        --disable-docs
+        --disable-multi-os-directory
+        ${options}
 )
 
-vcpkg_cmake_install()
-
-# Create pkgconfig file
-set(PACKAGE_VERSION ${VERSION})
-set(prefix "${CURRENT_INSTALLED_DIR}")
-set(exec_prefix "\${prefix}")
-set(libdir "\${prefix}/lib")
-set(toolexeclibdir "\${libdir}")
-set(includedir "\${prefix}/include")
-configure_file("${SOURCE_PATH}/libffi.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libffi.pc" @ONLY)
-
-# debug
-if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-  set(prefix "${CURRENT_INSTALLED_DIR}/debug")
-  set(exec_prefix "\${prefix}")
-  set(libdir "\${prefix}/lib")
-  set(toolexeclibdir "\${libdir}")
-  set(includedir "\${prefix}/../include")
-    configure_file("${SOURCE_PATH}/libffi.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libffi.pc" @ONLY)
-endif()
-
+vcpkg_install_make()
 vcpkg_copy_pdbs()
-vcpkg_cmake_config_fixup()
+vcpkg_fixup_pkgconfig()
 
-if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW)
-    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libffi.pc"
-            "-lffi" "-llibffi")
-    endif()
-    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libffi.pc"
-            "-lffi" "-llibffi")
-    endif()
+if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/ffi.h" "!defined FFI_BUILDING" "0")
 endif()
-vcpkg_fixup_pkgconfig()
 
-if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/ffi.h"
-        "   *know* they are going to link with the static library.  */"
-        "   *know* they are going to link with the static library.  */
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/unofficial-libffi-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-libffi")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/libffiConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 
-#define FFI_BUILDING
-"
-    )
-endif()
+file(REMOVE_RECURSE
+    "${CURRENT_PACKAGES_DIR}/debug/share"
+    "${CURRENT_PACKAGES_DIR}/share/man3"
+)
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/libffi/unofficial-libffi-config.cmake b/external_imported/vcpkg/ports/libffi/unofficial-libffi-config.cmake
new file mode 100644
index 000000000..453f6347e
--- /dev/null
+++ b/external_imported/vcpkg/ports/libffi/unofficial-libffi-config.cmake
@@ -0,0 +1,20 @@
+if(NOT TARGET unofficial::libffi::libffi)
+    get_filename_component(VCPKG_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_DIR}/../../" ABSOLUTE)
+    find_library(VCPKG_LIBFFI_LIBRARY_RELEASE NAMES ffi PATHS "${VCPKG_IMPORT_PREFIX}/lib" REQUIRED)
+    find_library(VCPKG_LIBFFI_LIBRARY_DEBUG NAMES ffi PATHS "${VCPKG_IMPORT_PREFIX}/debug/lib")
+    mark_as_advanced(VCPKG_LIBFFI_LIBRARY_RELEASE VCPKG_LIBFFI_LIBRARY_DEBUG)
+    add_library(unofficial::libffi::libffi UNKNOWN IMPORTED)
+    set_target_properties(unofficial::libffi::libffi PROPERTIES
+        IMPORTED_CONFIGURATIONS "Release"
+        INTERFACE_INCLUDE_DIRECTORIES "${VCPKG_IMPORT_PREFIX}/include"
+        IMPORTED_LOCATION_RELEASE "${VCPKG_LIBFFI_LIBRARY_RELEASE}"
+        IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
+    )
+    if(VCPKG_LIBFFI_LIBRARY_DEBUG)
+        set_property(TARGET unofficial::libffi::libffi APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug)
+        set_target_properties(unofficial::libffi::libffi PROPERTIES
+            IMPORTED_LOCATION_DEBUG "${VCPKG_LIBFFI_LIBRARY_DEBUG}"
+            IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "C"
+        )
+    endif()
+endif()
diff --git a/external_imported/vcpkg/ports/libffi/usage b/external_imported/vcpkg/ports/libffi/usage
new file mode 100644
index 000000000..3c5ecab10
--- /dev/null
+++ b/external_imported/vcpkg/ports/libffi/usage
@@ -0,0 +1,10 @@
+libffi can be imported via CMake FindPkgConfig module:
+
+    find_package(PkgConfig)
+    pkg_check_modules(LIBFFI REQUIRED IMPORTED_TARGET libffi)
+    target_link_libraries(main PRIVATE PkgConfig::LIBFFI)
+
+vcpkg provides proprietary CMake targets:
+
+    find_package(unofficial-libffi CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE unofficial::libffi::libffi)
diff --git a/external_imported/vcpkg/ports/libffi/vcpkg.json b/external_imported/vcpkg/ports/libffi/vcpkg.json
index 6c4c452a5..5c8fcc9ab 100644
--- a/external_imported/vcpkg/ports/libffi/vcpkg.json
+++ b/external_imported/vcpkg/ports/libffi/vcpkg.json
@@ -1,17 +1,13 @@
 {
   "name": "libffi",
   "version": "3.4.4",
-  "port-version": 1,
+  "port-version": 6,
   "description": "Portable, high level programming interface to various calling conventions",
   "homepage": "https://github.com/libffi/libffi",
   "license": "MIT",
   "dependencies": [
     {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
+      "name": "vcpkg-cmake-get-vars",
       "host": true
     }
   ]
diff --git a/external_imported/vcpkg/ports/libflac/portfile.cmake b/external_imported/vcpkg/ports/libflac/portfile.cmake
index 20fc109d2..c8c788c40 100644
--- a/external_imported/vcpkg/ports/libflac/portfile.cmake
+++ b/external_imported/vcpkg/ports/libflac/portfile.cmake
@@ -2,10 +2,9 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO xiph/flac
     REF "${VERSION}"
-    SHA512 1b4992024dffe83916f0da8726f73bf932a52d8c3346c35ab1ee81b82d68ff01faa8c477aa29d7099a09611664dee723db5be3087f709218c33e564f77810013
+    SHA512 3571467a1d557bc03eade2ae9bb1a72fd94a89222e6ad9563078d646aac0b65ed1c3d829fb45dd3a6cdca806f7ba3b6393f0ce6571b43651959acaa1c2106396
     HEAD_REF master
     PATCHES
-        uwp-library-console.patch
         fix-compile-options.patch
 )
 
diff --git a/external_imported/vcpkg/ports/libflac/uwp-library-console.patch b/external_imported/vcpkg/ports/libflac/uwp-library-console.patch
deleted file mode 100644
index bf65642d2..000000000
--- a/external_imported/vcpkg/ports/libflac/uwp-library-console.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/share/win_utf8_io/win_utf8_io.c b/src/share/win_utf8_io/win_utf8_io.c
-index bbb6a74a..8b20bbb7 100644
---- a/src/share/win_utf8_io/win_utf8_io.c
-+++ b/src/share/win_utf8_io/win_utf8_io.c
-@@ -110,7 +110,11 @@ int get_utf8_argv(int *argc, char ***argv)
- 	char **utf8argv;
- 	int ret, i;
- 
-+#if defined (WINAPI_FAMILY_PARTITION) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM)
-+	if ((handle = LoadPackagedLibrary("msvcrt.dll", 0)) == NULL) return 1;
-+#else
- 	if ((handle = LoadLibraryW(L"msvcrt.dll")) == NULL) return 1;
-+#endif
- 	if ((wgetmainargs = (wgetmainargs_t)GetProcAddress(handle, "__wgetmainargs")) == NULL) {
- 		FreeLibrary(handle);
- 		return 1;
diff --git a/external_imported/vcpkg/ports/libflac/vcpkg.json b/external_imported/vcpkg/ports/libflac/vcpkg.json
index 9bd32667f..31c3d8301 100644
--- a/external_imported/vcpkg/ports/libflac/vcpkg.json
+++ b/external_imported/vcpkg/ports/libflac/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "libflac",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "description": "Library for manipulating FLAC files",
   "homepage": "https://xiph.org/flac/",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/libfreenect2/fix-dependency-libusb.patch b/external_imported/vcpkg/ports/libfreenect2/fix-dependency-libusb.patch
index a5de8f3be..f8f210449 100644
--- a/external_imported/vcpkg/ports/libfreenect2/fix-dependency-libusb.patch
+++ b/external_imported/vcpkg/ports/libfreenect2/fix-dependency-libusb.patch
@@ -1,31 +1,31 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1e0d192..aedc576 100644
+index 3648fb5..43c3d28 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -90,7 +90,7 @@ SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
+@@ -91,7 +91,7 @@ SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
  
  # dependencies
  FIND_PACKAGE(PkgConfig)    # try find PKGConfig as it will be used if found
 -FIND_PACKAGE(LibUSB REQUIRED)
-+FIND_PACKAGE(libusb CONFIG REQUIRED)
++pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0)
  
  # Add includes
  INCLUDE_DIRECTORIES(
-@@ -98,7 +98,7 @@ INCLUDE_DIRECTORIES(
+@@ -99,7 +99,7 @@ INCLUDE_DIRECTORIES(
    "${MY_DIR}/include/internal"
    ${PROJECT_BINARY_DIR} # for generated headers
    ${LIBFREENECT2_THREADING_INCLUDE_DIR}
 -  ${LibUSB_INCLUDE_DIRS}
-+  ${LIBUSB_INCLUDE_DIRS}
++  ${libusb_INCLUDE_DIRS}
  )
  
  SET(RESOURCES_INC_FILE "${PROJECT_BINARY_DIR}/resources.inc.h")
-@@ -154,7 +154,7 @@ SET(SOURCES
+@@ -157,7 +157,7 @@ SET(SOURCES
  )
  
  SET(LIBRARIES
 -  ${LibUSB_LIBRARIES}
-+  ${LIBUSB_LIBRARIES}
++  PkgConfig::libusb
    ${LIBFREENECT2_THREADING_LIBRARIES}
  )
  
diff --git a/external_imported/vcpkg/ports/libfreenect2/portfile.cmake b/external_imported/vcpkg/ports/libfreenect2/portfile.cmake
index a235bc592..efc6c9980 100644
--- a/external_imported/vcpkg/ports/libfreenect2/portfile.cmake
+++ b/external_imported/vcpkg/ports/libfreenect2/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO OpenKinect/libfreenect2
-    REF v0.2.0
-    SHA512 3525e3f21462cecd3b198f64545786ffddc2cafdfd8146e5a46f0300b83f29f1ad0739618a07ab195c276149d7e2e909f7662e2d379a2880593cac75942b0666
+    REF "v${VERSION}"
+    SHA512 0fcee5471deb013d2b57581ef8d8838f652dfed2f457c4240d5b754674e949c59337a167ac74ad04b25ace69af470a7e014e0474a688d930a3323946feadee67
     HEAD_REF master
     PATCHES
         fix-dependency-libusb.patch
@@ -21,13 +21,26 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
         openni2    BUILD_OPENNI2_DRIVER
 )
 
+vcpkg_find_acquire_program(PKGCONFIG)
+
+if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+    set(path_suffix "/debug")
+endif()
+if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+    set(path_suffix "")
+endif()
+vcpkg_backup_env_variables(VARS PKG_CONFIG_PATH)
+vcpkg_host_path_list(PREPEND ENV{PKG_CONFIG_PATH} "${CURRENT_INSTALLED_DIR}${path_suffix}/lib/pkgconfig")
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
+        "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}"
         -DENABLE_CUDA=OFF
         -DBUILD_EXAMPLES=OFF
         ${FEATURE_OPTIONS}
 )
+vcpkg_restore_env_variables(VARS PKG_CONFIG_PATH)
 
 vcpkg_cmake_install()
 
@@ -37,6 +50,6 @@ vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/GPL2" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/GPL2")
 
 vcpkg_fixup_pkgconfig()
diff --git a/external_imported/vcpkg/ports/libfreenect2/vcpkg.json b/external_imported/vcpkg/ports/libfreenect2/vcpkg.json
index cbeaef735..4c78115ec 100644
--- a/external_imported/vcpkg/ports/libfreenect2/vcpkg.json
+++ b/external_imported/vcpkg/ports/libfreenect2/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "libfreenect2",
-  "version": "0.2.0",
-  "port-version": 9,
+  "version": "0.2.1",
+  "port-version": 1,
   "description": "Open source drivers for the Kinect for Windows v2 device",
   "homepage": "https://github.com/OpenKinect/libfreenect2",
   "license": "GPL-2.0-only",
+  "supports": "!xbox",
   "dependencies": [
     "libjpeg-turbo",
     "libusb",
diff --git a/external_imported/vcpkg/ports/libftdi/vcpkg.json b/external_imported/vcpkg/ports/libftdi/vcpkg.json
index e86412400..30c851440 100644
--- a/external_imported/vcpkg/ports/libftdi/vcpkg.json
+++ b/external_imported/vcpkg/ports/libftdi/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libftdi",
-  "version-string": "0.20",
-  "port-version": 4,
+  "version": "0.20",
+  "port-version": 5,
   "description": "FTDI USB driver with bitbang mode (v0.20)",
   "dependencies": [
     "libusb-win32",
diff --git a/external_imported/vcpkg/ports/libftdi1/portfile.cmake b/external_imported/vcpkg/ports/libftdi1/portfile.cmake
index e294a804c..c51808805 100644
--- a/external_imported/vcpkg/ports/libftdi1/portfile.cmake
+++ b/external_imported/vcpkg/ports/libftdi1/portfile.cmake
@@ -4,10 +4,10 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 c525b2ab6aff9ef9254971ae7d57f3549a36a36875765c48f947d52532814a2a004de1232389d4fe824a8c8ab84277b08427308573476e1da9b7db83db802f6f
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE ${ARCHIVE}
-    REF 1.5
+    SOURCE_BASE 1.5
     PATCHES
         libusb-fix.patch
         libconfuse-fix.patch
diff --git a/external_imported/vcpkg/ports/libftdi1/vcpkg.json b/external_imported/vcpkg/ports/libftdi1/vcpkg.json
index 42d4123c2..982f2b5e9 100644
--- a/external_imported/vcpkg/ports/libftdi1/vcpkg.json
+++ b/external_imported/vcpkg/ports/libftdi1/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libftdi1",
   "version": "1.5",
-  "port-version": 3,
+  "port-version": 4,
   "description": "FTDI USB driver with bitbang mode",
   "dependencies": [
     "libconfuse",
diff --git a/external_imported/vcpkg/ports/libgcrypt/portfile.cmake b/external_imported/vcpkg/ports/libgcrypt/portfile.cmake
index 72d595b14..37e7271d5 100644
--- a/external_imported/vcpkg/ports/libgcrypt/portfile.cmake
+++ b/external_imported/vcpkg/ports/libgcrypt/portfile.cmake
@@ -1,18 +1,17 @@
-vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
-
 vcpkg_download_distfile(tarball
     URLS
         "https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-${VERSION}.tar.bz2"
         "https://mirrors.dotsrc.org/gcrypt/libgcrypt/libgcrypt-${VERSION}.tar.bz2"
         "https://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${VERSION}.tar.bz2"
     FILENAME "libgcrypt-${VERSION}.tar.bz2"
-    SHA512 e5ca7966624fff16c3013795836a2c4377f0193dbb4ac5ad2b79654b1fa8992e17d83816569a402212dc8367a7980d4141f5d6ac282bae6b9f02186365b61f13
+    SHA512 3a850baddfe8ffe8b3e96dc54af3fbb9e1dab204db1f06b9b90b8fbbfb7fb7276260cd1e61ba4dde5a662a2385385007478834e62e95f785d2e3d32652adb29e
 )
 vcpkg_extract_source_archive(
     SOURCE_PATH
     ARCHIVE "${tarball}"
     PATCHES
         cross-tools.patch
+        upstream-fa21ddc1.patch
 )
 
 if(VCPKG_CROSSCOMPILING)
@@ -28,12 +27,12 @@ vcpkg_configure_make(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         --disable-doc
-        --disable-silent-rules
         "AS=${VCPKG_DETECTED_CMAKE_ASM_COMPILER}"
+        "GPG_ERROR_CONFIG=no"
     OPTIONS_RELEASE
-        "GPG_ERROR_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/bin/gpg-error-config"
+        "GPGRT_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/bin/gpgrt-config"
     OPTIONS_DEBUG
-        "GPG_ERROR_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/debug/bin/gpg-error-config"
+        "GPGRT_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/debug/bin/gpgrt-config"
 )
 
 vcpkg_install_make(OPTIONS "CCAS=${VCPKG_DETECTED_CMAKE_ASM_COMPILER}")
@@ -42,16 +41,20 @@ vcpkg_copy_pdbs()
 
 if(NOT VCPKG_CROSSCOMPILING)
     file(INSTALL
-            "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/cipher/gost-s-box${VCPKG_TARGET_SUFFIX}"
+            "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/cipher/gost-s-box${VCPKG_TARGET_EXECUTABLE_SUFFIX}"
         DESTINATION "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}"
         USE_SOURCE_PERMISSIONS
     )
     vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}")
 endif()
 
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/libgcrypt-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..")
+set(install_prefix "${CURRENT_INSTALLED_DIR}")
+if(VCPKG_HOST_IS_WINDOWS)
+    string(REGEX REPLACE "^([a-zA-Z]):/" "/\\1/" install_prefix "${install_prefix}")
+endif()
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/libgcrypt-config" "${install_prefix}" "`dirname $0`/../../..")
 if(NOT VCPKG_BUILD_TYPE)
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/libgcrypt-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/libgcrypt-config" "${install_prefix}" "`dirname $0`/../../../..")
 endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
diff --git a/external_imported/vcpkg/ports/libgcrypt/upstream-fa21ddc1.patch b/external_imported/vcpkg/ports/libgcrypt/upstream-fa21ddc1.patch
new file mode 100644
index 000000000..b70408def
--- /dev/null
+++ b/external_imported/vcpkg/ports/libgcrypt/upstream-fa21ddc1.patch
@@ -0,0 +1,20 @@
+diff --git a/random/rndgetentropy.c b/random/rndgetentropy.c
+index 513da0b95..a6f3c4ab1 100644
+--- a/random/rndgetentropy.c
++++ b/random/rndgetentropy.c
+@@ -81,6 +81,7 @@ _gcry_rndgetentropy_gather_random (void (*add)(const void*, size_t,
+       do
+         {
+           _gcry_pre_syscall ();
++#ifdef GRND_RANDOM
+           if (fips_mode ())
+             {
+               /* DRBG chaining defined in SP 800-90A (rev 1) specify
+@@ -98,6 +99,7 @@ _gcry_rndgetentropy_gather_random (void (*add)(const void*, size_t,
+               ret = getrandom (buffer, nbytes, GRND_RANDOM);
+             }
+           else
++#endif
+             {
+               nbytes = length < sizeof (buffer) ? length : sizeof (buffer);
+               ret = getentropy (buffer, nbytes);
diff --git a/external_imported/vcpkg/ports/libgcrypt/vcpkg.json b/external_imported/vcpkg/ports/libgcrypt/vcpkg.json
index bcd7ae2b1..522c600be 100644
--- a/external_imported/vcpkg/ports/libgcrypt/vcpkg.json
+++ b/external_imported/vcpkg/ports/libgcrypt/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "libgcrypt",
-  "version": "1.10.1",
-  "port-version": 1,
+  "version": "1.10.2",
   "description": "A general purpose cryptographic library",
   "homepage": "https://gnupg.org/software/libgcrypt/index.html",
   "license": null,
diff --git a/external_imported/vcpkg/ports/libgeotiff/vcpkg.json b/external_imported/vcpkg/ports/libgeotiff/vcpkg.json
index 6a4f05b5b..5305df2f0 100644
--- a/external_imported/vcpkg/ports/libgeotiff/vcpkg.json
+++ b/external_imported/vcpkg/ports/libgeotiff/vcpkg.json
@@ -1,12 +1,18 @@
 {
   "name": "libgeotiff",
   "version": "1.7.1",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Libgeotiff is an open source library on top of libtiff for reading and writing GeoTIFF information tags.",
   "homepage": "https://github.com/OSGeo/libgeotiff",
   "license": "MIT",
   "dependencies": [
-    "proj",
+    {
+      "name": "proj",
+      "default-features": false,
+      "features": [
+        "tiff"
+      ]
+    },
     {
       "name": "tiff",
       "default-features": false
diff --git a/external_imported/vcpkg/ports/libgig/0001-msvc-fix-ssize_t.patch b/external_imported/vcpkg/ports/libgig/0001-msvc-fix-ssize_t.patch
new file mode 100644
index 000000000..d2edce0e7
--- /dev/null
+++ b/external_imported/vcpkg/ports/libgig/0001-msvc-fix-ssize_t.patch
@@ -0,0 +1,16 @@
+diff --git a/src/Serialization.h b/src/Serialization.h
+index cccfc54..91a8fa4 100644
+--- a/src/Serialization.h
++++ b/src/Serialization.h
+@@ -40,6 +40,11 @@
+ #include <assert.h>
+ #include <functional>
+
++#ifdef _MSC_VER
++#include <BaseTsd.h>
++using ssize_t = SSIZE_T;
++#endif
++
+ #ifndef __has_extension
+ # define __has_extension(x) 0
+ #endif
diff --git a/external_imported/vcpkg/ports/libgig/0002-cmake-fixes.patch b/external_imported/vcpkg/ports/libgig/0002-cmake-fixes.patch
new file mode 100644
index 000000000..19982f251
--- /dev/null
+++ b/external_imported/vcpkg/ports/libgig/0002-cmake-fixes.patch
@@ -0,0 +1,18 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ae66913..893e3ea 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,9 +1,9 @@
+-cmake_minimum_required(VERSION 3.0)
++cmake_minimum_required(VERSION 3.1)
+ project(libgig)
+ 
+-if(NOT MSVC)
+-	message(FATAL_ERROR "Please use configure and make, this cmake file is currently only to generate msvc solution files")
+-endif()
++#To force the compiler to use C++ 11
++set(CMAKE_CXX_STANDARD 11)
++set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
+ 
+ 
+ #configuration options
diff --git a/external_imported/vcpkg/ports/libgig/0003-fix-usage.patch b/external_imported/vcpkg/ports/libgig/0003-fix-usage.patch
new file mode 100644
index 000000000..0b2c040bc
--- /dev/null
+++ b/external_imported/vcpkg/ports/libgig/0003-fix-usage.patch
@@ -0,0 +1,19 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 893e3ea..2eef641 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -128,12 +128,11 @@ install(TARGETS libgig EXPORT libgig-config
+ 	ARCHIVE DESTINATION lib
+ 	RUNTIME DESTINATION bin
+ 	PUBLIC_HEADER DESTINATION include/libgig)
+-install(EXPORT libgig-config NAMESPACE libgig:: DESTINATION share/libgig)
+ 
+-install(TARGETS libakai EXPORT libakai-config
++install(TARGETS libakai EXPORT libgig-config
+ 	LIBRARY DESTINATION lib
+ 	ARCHIVE DESTINATION lib
+ 	RUNTIME DESTINATION bin
+ 	PUBLIC_HEADER DESTINATION include/libgig)
+-install(EXPORT libakai-config NAMESPACE libgig:: DESTINATION share/libgig)
++install(EXPORT libgig-config NAMESPACE libgig:: DESTINATION share/libgig)
+ 
diff --git a/external_imported/vcpkg/ports/libgig/portfile.cmake b/external_imported/vcpkg/ports/libgig/portfile.cmake
new file mode 100644
index 000000000..57f2748f8
--- /dev/null
+++ b/external_imported/vcpkg/ports/libgig/portfile.cmake
@@ -0,0 +1,40 @@
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://download.linuxsampler.org/packages/libgig-4.3.0.tar.bz2"
+    FILENAME "libgig-4.3.0.tar.bz2"
+    SHA512 683c09b1d17acf69020c631452b7dfb25ac54c3701db5e97471d4e7973e9a06267667bf19bfe4eb00d2964223e8446f248d93b4cf29c062dec2588758b4dfba2
+)
+
+vcpkg_extract_source_archive(
+    SOURCE_PATH
+    ARCHIVE "${ARCHIVE}"
+    PATCHES
+        0001-msvc-fix-ssize_t.patch
+        0002-cmake-fixes.patch
+        0003-fix-usage.patch
+)
+
+string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} dynamic LIBGIG_BUILD_SHARED)
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        extra-tools LIBGIG_BUILD_TOOLS
+        tests LIBGIG_ENABLE_TESTING
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        ${FEATURE_OPTIONS}
+        -DLIBGIG_BUILD_SHARED=${LIBGIG_BUILD_SHARED}
+)
+
+vcpkg_cmake_install()
+if("tools" IN_LIST FEATURES)
+    vcpkg_copy_tools(TOOL_NAMES dlsdump gigdump gigmerge korg2gig korgdump rifftree sf2dump
+        SEARCH_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin")
+endif()
+vcpkg_cmake_config_fixup()
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/external_imported/vcpkg/ports/libgig/vcpkg.json b/external_imported/vcpkg/ports/libgig/vcpkg.json
new file mode 100644
index 000000000..917fb405e
--- /dev/null
+++ b/external_imported/vcpkg/ports/libgig/vcpkg.json
@@ -0,0 +1,31 @@
+{
+  "name": "libgig",
+  "version": "4.3.0",
+  "description": "C++ library for loading Gigasampler files and DLS Level 1/2 files",
+  "homepage": "https://www.linuxsampler.org/libgig/",
+  "supports": "windows & !uwp",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
+  "features": {
+    "tests": {
+      "description": "Build test cases",
+      "dependencies": [
+        "cppunit"
+      ]
+    },
+    "tools": {
+      "description": "Build extra tools",
+      "dependencies": [
+        "libsndfile"
+      ]
+    }
+  }
+}
diff --git a/external_imported/vcpkg/ports/libgit2/c-standard.diff b/external_imported/vcpkg/ports/libgit2/c-standard.diff
new file mode 100644
index 000000000..8775f7724
--- /dev/null
+++ b/external_imported/vcpkg/ports/libgit2/c-standard.diff
@@ -0,0 +1,26 @@
+diff --git a/src/libgit2/CMakeLists.txt b/src/libgit2/CMakeLists.txt
+index c2a97e1..8c5b2ea 100644
+--- a/src/libgit2/CMakeLists.txt
++++ b/src/libgit2/CMakeLists.txt
+@@ -2,7 +2,7 @@
+ # git library functionality.
+ 
+ add_library(libgit2 OBJECT)
+-set_target_properties(libgit2 PROPERTIES C_STANDARD 90)
++set_target_properties(libgit2 PROPERTIES C_STANDARD 99)
+ set_target_properties(libgit2 PROPERTIES C_EXTENSIONS OFF)
+ 
+ include(PkgBuildConfig)
+diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
+index ee35eb9..158fac2 100644
+--- a/src/util/CMakeLists.txt
++++ b/src/util/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ # util: a shared library for common utility functions for libgit2 projects
+ 
+ add_library(util OBJECT)
+-set_target_properties(util PROPERTIES C_STANDARD 90)
++set_target_properties(util PROPERTIES C_STANDARD 99)
+ set_target_properties(util PROPERTIES C_EXTENSIONS OFF)
+ 
+ configure_file(git2_features.h.in git2_features.h)
diff --git a/external_imported/vcpkg/ports/libgit2/cli-include-dirs.diff b/external_imported/vcpkg/ports/libgit2/cli-include-dirs.diff
new file mode 100644
index 000000000..e2a779c82
--- /dev/null
+++ b/external_imported/vcpkg/ports/libgit2/cli-include-dirs.diff
@@ -0,0 +1,12 @@
+diff --git a/src/cli/CMakeLists.txt b/src/cli/CMakeLists.txt
+index 84b6c19..df2119c 100644
+--- a/src/cli/CMakeLists.txt
++++ b/src/cli/CMakeLists.txt
+@@ -46,6 +46,7 @@ set_target_properties(git2_cli PROPERTIES OUTPUT_NAME ${LIBGIT2_FILENAME})
+ ide_split_sources(git2_cli)
+ 
+ target_include_directories(git2_cli PRIVATE ${CLI_INCLUDES})
++target_include_directories(git2_cli SYSTEM PRIVATE ${LIBGIT2_SYSTEM_INCLUDES})
+ 
+ if(MSVC_IDE)
+ 	# Precompiled headers
diff --git a/external_imported/vcpkg/ports/libgit2/dependencies.diff b/external_imported/vcpkg/ports/libgit2/dependencies.diff
new file mode 100644
index 000000000..1e046208e
--- /dev/null
+++ b/external_imported/vcpkg/ports/libgit2/dependencies.diff
@@ -0,0 +1,41 @@
+diff --git a/cmake/SelectRegex.cmake b/cmake/SelectRegex.cmake
+index 2a3a91b..523fa72 100644
+--- a/cmake/SelectRegex.cmake
++++ b/cmake/SelectRegex.cmake
+@@ -17,7 +17,9 @@ if(REGEX_BACKEND STREQUAL "regcomp_l")
+ 	add_feature_info(regex ON "using system regcomp_l")
+ 	set(GIT_REGEX_REGCOMP_L 1)
+ elseif(REGEX_BACKEND STREQUAL "pcre2")
+-	find_package(PCRE2)
++	find_package(PkgConfig REQUIRED)
++	pkg_check_modules(PCRE2 REQUIRED libpcre2-8)
++	set(PCRE2_LIBRARIES "${PCRE2_LINK_LIBRARIES}")
+ 
+ 	if(NOT PCRE2_FOUND)
+ 		MESSAGE(FATAL_ERROR "PCRE2 support was requested but not found")
+@@ -33,6 +35,9 @@ elseif(REGEX_BACKEND STREQUAL "pcre")
+ 	add_feature_info(regex ON "using system PCRE")
+ 	set(GIT_REGEX_PCRE 1)
+ 
++	find_package(PkgConfig REQUIRED)
++	pkg_check_modules(PCRE REQUIRED libpcre)
++	set(PCRE_LIBRARIES "${PCRE_LINK_LIBRARIES}")
+ 	list(APPEND LIBGIT2_SYSTEM_INCLUDES ${PCRE_INCLUDE_DIRS})
+ 	list(APPEND LIBGIT2_SYSTEM_LIBS ${PCRE_LIBRARIES})
+ 	list(APPEND LIBGIT2_PC_REQUIRES "libpcre")
+diff --git a/cmake/SelectSSH.cmake b/cmake/SelectSSH.cmake
+index 23dfc97..f481527 100644
+--- a/cmake/SelectSSH.cmake
++++ b/cmake/SelectSSH.cmake
+@@ -1,6 +1,10 @@
+ # Optional external dependency: libssh2
+ if(USE_SSH)
+-	find_pkglibraries(LIBSSH2 libssh2)
++	find_package(PkgConfig REQUIRED)
++	pkg_check_modules(LIBSSH2 REQUIRED libssh2)
++	set(LIBSSH2_LIBRARIES "${LIBSSH2_LINK_LIBRARIES}")
++	set(LIBSSH2_LDFLAGS "")
++	list(APPEND LIBGIT2_PC_REQUIRES "libssh2")
+ 	if(NOT LIBSSH2_FOUND)
+ 		find_package(LibSSH2)
+ 		set(LIBSSH2_INCLUDE_DIRS ${LIBSSH2_INCLUDE_DIR})
diff --git a/external_imported/vcpkg/ports/libgit2/fix-configcmake.patch b/external_imported/vcpkg/ports/libgit2/fix-configcmake.patch
deleted file mode 100644
index 1cc67d897..000000000
--- a/external_imported/vcpkg/ports/libgit2/fix-configcmake.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --git a/cmake/SelectRegex.cmake b/cmake/SelectRegex.cmake
-index 2a3a91b8c..cbb409350 100644
---- a/cmake/SelectRegex.cmake
-+++ b/cmake/SelectRegex.cmake
-@@ -1,5 +1,4 @@
- # Specify regular expression implementation
--find_package(PCRE)
- 
- if(REGEX_BACKEND STREQUAL "")
- 	check_symbol_exists(regcomp_l "regex.h;xlocale.h" HAVE_REGCOMP_L)
-@@ -33,8 +32,8 @@ elseif(REGEX_BACKEND STREQUAL "pcre")
- 	add_feature_info(regex ON "using system PCRE")
- 	set(GIT_REGEX_PCRE 1)
- 
--	list(APPEND LIBGIT2_SYSTEM_INCLUDES ${PCRE_INCLUDE_DIRS})
--	list(APPEND LIBGIT2_SYSTEM_LIBS ${PCRE_LIBRARIES})
-+	find_package(unofficial-pcre CONFIG REQUIRED)
-+	list(APPEND LIBGIT2_SYSTEM_LIBS unofficial::pcre::pcre)
- 	list(APPEND LIBGIT2_PC_REQUIRES "libpcre")
- elseif(REGEX_BACKEND STREQUAL "regcomp")
- 	add_feature_info(regex ON "using system regcomp")
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index e7b54d036..6b549deef 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -298,10 +298,28 @@ if(MSVC_IDE)
- endif()
- 
- # Install
--install(TARGETS git2
-+install(TARGETS git2 EXPORT unofficial-git2Targets
- 	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
- 	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
- 	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
- )
-+
-+install(EXPORT unofficial-git2Targets
-+    NAMESPACE unofficial::git2::
-+    DESTINATION share/unofficial-git2
-+)
-+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-git2-config.cmake.in"
-+[[include(CMakeFindDependencyMacro)
-+if(@USE_BUNDLED_ZLIB@ STREQUAL "OFF")
-+    find_dependency(ZLIB)
-+endif()
-+if(@REGEX_BACKEND@ STREQUAL "pcre")
-+    find_dependency(unofficial-pcre CONFIG)
-+endif()
-+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-git2Targets.cmake")
-+]])
-+configure_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-git2-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-git2-config.cmake" @ONLY)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-git2-config.cmake DESTINATION share/unofficial-git2)
-+
- install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/git2 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
- install(FILES ${PROJECT_SOURCE_DIR}/include/git2.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
diff --git a/external_imported/vcpkg/ports/libgit2/mingw-winhttp.diff b/external_imported/vcpkg/ports/libgit2/mingw-winhttp.diff
new file mode 100644
index 000000000..80f24aeef
--- /dev/null
+++ b/external_imported/vcpkg/ports/libgit2/mingw-winhttp.diff
@@ -0,0 +1,13 @@
+diff --git a/cmake/SelectWinHTTP.cmake b/cmake/SelectWinHTTP.cmake
+index 96e0bdb..31c3a56 100644
+--- a/cmake/SelectWinHTTP.cmake
++++ b/cmake/SelectWinHTTP.cmake
+@@ -3,7 +3,7 @@ if(WIN32 AND USE_WINHTTP)
+ 
+ 	# Since MinGW does not come with headers or an import library for winhttp,
+ 	# we have to include a private header and generate our own import library
+-	if(MINGW)
++	if(0)
+ 		add_subdirectory("${PROJECT_SOURCE_DIR}/deps/winhttp" "${PROJECT_BINARY_DIR}/deps/winhttp")
+ 		list(APPEND LIBGIT2_SYSTEM_LIBS winhttp)
+ 		list(APPEND LIBGIT2_DEPENDENCY_INCLUDES "${PROJECT_SOURCE_DIR}/deps/winhttp")
diff --git a/external_imported/vcpkg/ports/libgit2/portfile.cmake b/external_imported/vcpkg/ports/libgit2/portfile.cmake
index 867d0b175..54e33d147 100644
--- a/external_imported/vcpkg/ports/libgit2/portfile.cmake
+++ b/external_imported/vcpkg/ports/libgit2/portfile.cmake
@@ -1,14 +1,25 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libgit2/libgit2
-    REF v1.4.2
-    SHA512 144bec7f8e66d97b20335d87d1eb68d522f5e59064b0c557505c088d3c486d45704f023d701f51de572efa8e2eb111e3136eb5d23c035e29d16698206b5ec277
-    HEAD_REF maint/v1.4
+    REF v1.6.4
+    SHA512 fd73df91710f19b0d6c3765c37c7f529233196da91cf4d58028a8d3840244f11df44abafabd74a8ed1cbe4826d1afd6ff9f01316d183ace0924c65e7cf0eb8d5
+    HEAD_REF maint/v1.6
     PATCHES
-        fix-configcmake.patch
+        c-standard.diff # for 'inline' in system headers
+        cli-include-dirs.diff
+        dependencies.diff
+        mingw-winhttp.diff
+        unofficial-config-export.diff
+)
+file(REMOVE_RECURSE
+    "${SOURCE_PATH}/cmake/FindPCRE.cmake"
+    "${SOURCE_PATH}/cmake/FindPCRE2.cmake"
+    "${SOURCE_PATH}/deps/chromium-zlib"
+    "${SOURCE_PATH}/deps/http-parser"
+    "${SOURCE_PATH}/deps/pcre"
+    "${SOURCE_PATH}/deps/winhttp"
+    "${SOURCE_PATH}/deps/zlib"
 )
-
-file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/FindPCRE.cmake")
 
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT)
 
@@ -37,19 +48,10 @@ foreach(GIT2_FEATURE ${FEATURES})
     elseif(GIT2_FEATURE STREQUAL "openssl")
         set_tls_backend("OpenSSL")
     elseif(GIT2_FEATURE STREQUAL "winhttp")
-        if(NOT VCPKG_TARGET_IS_WINDOWS)
-            message(FATAL_ERROR "winhttp is not supported on non-Windows and uwp platforms")
-        endif()
         set_tls_backend("WinHTTP")
     elseif(GIT2_FEATURE STREQUAL "sectransp")
-        if(NOT VCPKG_TARGET_IS_OSX)
-            message(FATAL_ERROR "sectransp is not supported on non-Apple platforms")
-        endif()
         set_tls_backend("SecureTransport")
     elseif(GIT2_FEATURE STREQUAL "mbedtls")
-        if(VCPKG_TARGET_IS_WINDOWS)
-            message(FATAL_ERROR "mbedtls is not supported on Windows because a certificate file must be specified at compile time")
-        endif()
         set_tls_backend("mbedTLS")
     endif()
 endforeach()
@@ -58,10 +60,13 @@ if(NOT REGEX_BACKEND)
     message(FATAL_ERROR "Must choose pcre or pcre2 regex backend")
 endif()
 
+vcpkg_find_acquire_program(PKGCONFIG)
+
 vcpkg_check_features(
     OUT_FEATURE_OPTIONS GIT2_FEATURES
-    FEATURES
-        ssh USE_SSH
+    FEATURES    
+        ssh     USE_SSH
+        tools   BUILD_CLI
 )
 
 vcpkg_cmake_configure(
@@ -72,13 +77,36 @@ vcpkg_cmake_configure(
         -DUSE_HTTPS=${USE_HTTPS}
         -DREGEX_BACKEND=${REGEX_BACKEND}
         -DSTATIC_CRT=${STATIC_CRT}
+        "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}"
+        -DCMAKE_DISABLE_FIND_PACKAGE_GSSAPI:BOOL=ON
         ${GIT2_FEATURES}
+    OPTIONS_DEBUG
+        -DBUILD_CLI=OFF
+    MAYBE_UNUSED_VARIABLES
+        STATIC_CRT
 )
 
 vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-git2 CONFIG_PATH share/unofficial-git2)
 vcpkg_fixup_pkgconfig()
 
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/unofficial-git2-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-git2")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/unofficial-libgit2-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-libgit2")
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-libgit2 CONFIG_PATH share/unofficial-libgit2)
+
+if("tools" IN_LIST FEATURES)
+    vcpkg_copy_tools(TOOL_NAMES git2 AUTO_CLEAN)
+endif()
+
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+
+set(file_list "${SOURCE_PATH}/COPYING")
+if(NOT VCPKG_TARGET_IS_WINDOWS)
+    file(WRITE "${CURRENT_BUILDTREES_DIR}/Notice for ntlmclient" [[
+Copyright (c) Edward Thomson.  All rights reserved.
+These source files are part of ntlmclient, distributed under the MIT license.
+]])
+    list(APPEND file_list "${CURRENT_BUILDTREES_DIR}/Notice for ntlmclient")
+endif()
+vcpkg_install_copyright(FILE_LIST ${file_list})
diff --git a/external_imported/vcpkg/ports/libgit2/unofficial-config-export.diff b/external_imported/vcpkg/ports/libgit2/unofficial-config-export.diff
new file mode 100644
index 000000000..084c83903
--- /dev/null
+++ b/external_imported/vcpkg/ports/libgit2/unofficial-config-export.diff
@@ -0,0 +1,21 @@
+diff --git a/src/libgit2/CMakeLists.txt b/src/libgit2/CMakeLists.txt
+index dcb4279..20acdc8 100644
+--- a/src/libgit2/CMakeLists.txt
++++ b/src/libgit2/CMakeLists.txt
+@@ -128,10 +128,16 @@ FILE(WRITE "${PROJECT_BINARY_DIR}/include/${LIBGIT2_FILENAME}.h" ${LIBGIT2_INCLU
+ 
+ # Install
+ 
++target_include_directories(libgit2package SYSTEM PUBLIC $<INSTALL_INTERFACE:include>)
+ install(TARGETS libgit2package
++	EXPORT unofficial-libgit2-targets
+ 	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+ 	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ 	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
++install(EXPORT unofficial-libgit2-targets
++	NAMESPACE unofficial::libgit2::
++	DESTINATION share/unofficial-libgit2
++)
+ install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/git2/
+         DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${LIBGIT2_FILENAME}")
+ install(FILES ${PROJECT_BINARY_DIR}/include/git2/experimental.h
diff --git a/external_imported/vcpkg/ports/libgit2/unofficial-git2-config.cmake b/external_imported/vcpkg/ports/libgit2/unofficial-git2-config.cmake
new file mode 100644
index 000000000..9f407fcc2
--- /dev/null
+++ b/external_imported/vcpkg/ports/libgit2/unofficial-git2-config.cmake
@@ -0,0 +1,6 @@
+file(READ "${CMAKE_CURRENT_LIST_DIR}/../unofficial-libgit2/usage" usage)
+message(WARNING "find_package(unofficial-git2) is deprecated.\n${usage}")
+include(CMakeFindDependencyMacro)
+find_dependency(unofficial-libgit2 CONFIG)
+add_library(unofficial::git2::libgit2package INTERFACE IMPORTED)
+set_target_properties(unofficial::git2::libgit2package PROPERTIES INTERFACE_LINK_LIBRARIES unofficial::libgit2::libgit2package)
diff --git a/external_imported/vcpkg/ports/libgit2/unofficial-libgit2-config.cmake b/external_imported/vcpkg/ports/libgit2/unofficial-libgit2-config.cmake
new file mode 100644
index 000000000..01ebca678
--- /dev/null
+++ b/external_imported/vcpkg/ports/libgit2/unofficial-libgit2-config.cmake
@@ -0,0 +1,3 @@
+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-libgit2-targets.cmake")
+add_library(unofficial::libgit2::libgit2 INTERFACE IMPORTED)
+set_target_properties(unofficial::libgit2::libgit2 PROPERTIES INTERFACE_LINK_LIBRARIES unofficial::libgit2::libgit2package)
diff --git a/external_imported/vcpkg/ports/libgit2/usage b/external_imported/vcpkg/ports/libgit2/usage
new file mode 100644
index 000000000..8ed1d2efa
--- /dev/null
+++ b/external_imported/vcpkg/ports/libgit2/usage
@@ -0,0 +1,11 @@
+libgit2 can be imported via CMake FindPkgConfig module:
+
+    find_package(PkgConfig REQUIRED)
+    pkg_check_modules(LIBGIT2 REQUIRED IMPORTED_TARGET libgit2)
+    target_link_libraries(main PRIVATE PkgConfig::LIBGIT2)
+
+vcpkg provides proprietary CMake targets:
+
+    find_package(unofficial-libgit2 CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE unofficial::libgit2::libgit2)
+
diff --git a/external_imported/vcpkg/ports/libgit2/vcpkg.json b/external_imported/vcpkg/ports/libgit2/vcpkg.json
index 1614564db..c179d4d39 100644
--- a/external_imported/vcpkg/ports/libgit2/vcpkg.json
+++ b/external_imported/vcpkg/ports/libgit2/vcpkg.json
@@ -1,8 +1,10 @@
 {
   "name": "libgit2",
-  "version-semver": "1.4.2",
-  "description": "Git linkable library",
+  "version-semver": "1.6.4",
+  "port-version": 1,
+  "description": "A C library implementing the Git core methods with a solid API",
   "homepage": "https://github.com/libgit2/libgit2",
+  "license": null,
   "supports": "!uwp",
   "dependencies": [
     "http-parser",
@@ -23,6 +25,7 @@
   "features": {
     "mbedtls": {
       "description": "SSL support (mbedTLS)",
+      "supports": "!windows",
       "dependencies": [
         "mbedtls"
       ]
@@ -46,18 +49,12 @@
       ]
     },
     "sectransp": {
-      "description": "SSL support (sectransp)"
+      "description": "SSL support (sectransp)",
+      "supports": "osx"
     },
     "ssh": {
       "description": "SSH support via libssh2",
       "dependencies": [
-        {
-          "name": "libgit2",
-          "default-features": false,
-          "features": [
-            "openssl"
-          ]
-        },
         "libssh2"
       ]
     },
@@ -90,8 +87,12 @@
         }
       ]
     },
+    "tools": {
+      "description": "Build CLI tools"
+    },
     "winhttp": {
-      "description": "SSL support (WinHTTP)"
+      "description": "SSL support (WinHTTP)",
+      "supports": "windows & !uwp"
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/libgme/disable-player-and-demo.patch b/external_imported/vcpkg/ports/libgme/disable-player-and-demo.patch
new file mode 100644
index 000000000..79315167a
--- /dev/null
+++ b/external_imported/vcpkg/ports/libgme/disable-player-and-demo.patch
@@ -0,0 +1,10 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6b352102db48f265448a35b731cb712b8e112d39..62349bd48ddd3d6c44e6ee68243605781814de2f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -102,5 +102,3 @@ endif ()
+ add_subdirectory(gme)
+ 
+ # EXCLUDE_FROM_ALL adds build rules but keeps it out of default build
+-add_subdirectory(player EXCLUDE_FROM_ALL)
+-add_subdirectory(demo EXCLUDE_FROM_ALL)
diff --git a/external_imported/vcpkg/ports/libgme/disable-static-zlib-hack.patch b/external_imported/vcpkg/ports/libgme/disable-static-zlib-hack.patch
new file mode 100644
index 000000000..616482ef5
--- /dev/null
+++ b/external_imported/vcpkg/ports/libgme/disable-static-zlib-hack.patch
@@ -0,0 +1,13 @@
+diff --git a/gme/CMakeLists.txt b/gme/CMakeLists.txt
+index b1b2bf0aee0d79dbeb76fd46756ad9709af57ae3..aacb5a8067f77cfeac560d65cc1538dd75008c9b 100644
+--- a/gme/CMakeLists.txt
++++ b/gme/CMakeLists.txt
+@@ -17,7 +17,7 @@ set(libgme_SRCS Blip_Buffer.cpp
+ # static builds need to find static zlib (and static forms of other needed
+ # libraries.  Ensure CMake looks only for static libs if we're doing a static
+ # build.  See https://stackoverflow.com/a/44738756
+-if(NOT BUILD_SHARED_LIBS)
++if(0)
+     set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+ endif()
+ 
diff --git a/external_imported/vcpkg/ports/libgme/portfile.cmake b/external_imported/vcpkg/ports/libgme/portfile.cmake
new file mode 100644
index 000000000..72b20746b
--- /dev/null
+++ b/external_imported/vcpkg/ports/libgme/portfile.cmake
@@ -0,0 +1,66 @@
+vcpkg_from_bitbucket(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO mpyne/game-music-emu
+    REF "${VERSION}"
+    SHA512 3d5e0dafb7ba239fb1c4cebf47c7e195a350bfe7a43606deff1ecff1ab21a0aac47343205004c0aba06ae249a0e186122c1b7dec06fc52272d4baaea9a480796
+    PATCHES
+        disable-player-and-demo.patch
+        disable-static-zlib-hack.patch
+)
+
+# This file is generated during the CMake build
+file(REMOVE "${SOURCE_PATH}/gme/gme_types.h")
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        ay      USE_GME_AY
+        gbs     USE_GME_GBS
+        gym     USE_GME_GYM
+        hes     USE_GME_HES
+        kss     USE_GME_KSS
+        nsf     USE_GME_NSF
+        nsfe    USE_GME_NSFE
+        sap     USE_GME_SAP
+        spc     USE_GME_SPC
+        vgm     USE_GME_VGM
+        spc-isolated-echo-buffer    GME_SPC_ISOLATED_ECHO_BUFFER
+)
+
+set(CMAKE_DISABLE_FIND_PACKAGE_ZLIB ON)
+set(CMAKE_REQUIRE_FIND_PACKAGE_ZLIB OFF)
+if("vgm" IN_LIST FEATURES)
+    set(CMAKE_DISABLE_FIND_PACKAGE_ZLIB OFF)
+    set(CMAKE_REQUIRE_FIND_PACKAGE_ZLIB ON)
+endif()
+
+if("vgm" IN_LIST FEATURES OR "gym" IN_LIST FEATURES)
+    set(GME_YM2612_EMU Nuked)
+    message(STATUS "This version of libgme uses the Nuked YM2612 emulator. To use the MAME or GENS instead, create an overlay port of this with GME_YM2612_EMU set to \"MAME\" or \"GENS\" accordingly.")
+    message(STATUS "This recipe is at ${CMAKE_CURRENT_LIST_DIR}")
+    message(STATUS "See the overlay ports documentation at https://github.com/microsoft/vcpkg/blob/master/docs/specifications/ports-overlay.md")
+endif()
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        ${FEATURE_OPTIONS}
+        -DGME_YM2612_EMU=${GME_YM2612_EMU}
+        -DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=${CMAKE_DISABLE_FIND_PACKAGE_ZLIB}
+        -DCMAKE_REQUIRE_FIND_PACKAGE_ZLIB=${CMAKE_REQUIRE_FIND_PACKAGE_ZLIB}
+        -DENABLE_UBSAN=OFF
+    MAYBE_UNUSED_VARIABLES
+        GME_YM2612_EMU
+        GME_SPC_ISOLATED_ECHO_BUFFER
+)
+
+vcpkg_cmake_install()
+vcpkg_fixup_pkgconfig()
+
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE 
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+)
+
+file(GLOB LICENSE_FILES "${SOURCE_PATH}/license*")
+vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES})
diff --git a/external_imported/vcpkg/ports/libgme/vcpkg.json b/external_imported/vcpkg/ports/libgme/vcpkg.json
new file mode 100644
index 000000000..5db9f020d
--- /dev/null
+++ b/external_imported/vcpkg/ports/libgme/vcpkg.json
@@ -0,0 +1,63 @@
+{
+  "name": "libgme",
+  "version": "0.6.3",
+  "description": "Video game music file emulation/playback library",
+  "homepage": "https://bitbucket.org/mpyne/game-music-emu/wiki/Home",
+  "license": "LGPL-2.1-or-later OR GPL-2.0-or-later",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ],
+  "default-features": [
+    "ay",
+    "gbs",
+    "gym",
+    "hes",
+    "kss",
+    "nsf",
+    "nsfe",
+    "sap",
+    "spc",
+    "vgm"
+  ],
+  "features": {
+    "ay": {
+      "description": "Enable Spectrum ZX music emulation"
+    },
+    "gbs": {
+      "description": "Enable Game Boy music emulation"
+    },
+    "gym": {
+      "description": "Enable Sega MegaDrive/Genesis music emulation"
+    },
+    "hes": {
+      "description": "Enable PC Engine/TurboGrafx-16 music emulation"
+    },
+    "kss": {
+      "description": "Enable MSX or other Z80 systems music emulation"
+    },
+    "nsf": {
+      "description": "Enable NES NSF music emulation"
+    },
+    "nsfe": {
+      "description": "Enable NES NSFE and NSF music emulation"
+    },
+    "sap": {
+      "description": "Enable Atari SAP music emulation"
+    },
+    "spc": {
+      "description": "Enable SNES SPC music emulation"
+    },
+    "spc-isolated-echo-buffer": {
+      "description": "Enable isolated echo buffer on SPC emulator to allow correct playing of \"dodgy\" SPC files made for various ROM hacks ran on ZSNES"
+    },
+    "vgm": {
+      "description": "Enable Sega VGM/VGZ music emulation",
+      "dependencies": [
+        "zlib"
+      ]
+    }
+  }
+}
diff --git a/external_imported/vcpkg/ports/libgnutls/portfile.cmake b/external_imported/vcpkg/ports/libgnutls/portfile.cmake
index 784a81303..58daad088 100644
--- a/external_imported/vcpkg/ports/libgnutls/portfile.cmake
+++ b/external_imported/vcpkg/ports/libgnutls/portfile.cmake
@@ -1,5 +1,3 @@
-vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
-
 string(REGEX REPLACE "^([0-9]*[.][0-9]*)[.].*" "\\1" GNUTLS_BRANCH "${VERSION}")
 vcpkg_download_distfile(tarball
     URLS
@@ -7,7 +5,7 @@ vcpkg_download_distfile(tarball
         "https://mirrors.dotsrc.org/gcrypt/gnutls/v${GNUTLS_BRANCH}/gnutls-${VERSION}.tar.xz"
         "https://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/gnutls/v${GNUTLS_BRANCH}/gnutls-${VERSION}.tar.xz"
     FILENAME "gnutls-${VERSION}.tar.xz"
-    SHA512 4199bcf7c9e3aab2f52266aadceefc563dfe2d938d0ea1f3ec3be95d66f4a8c8e5494d3a800c03dd02ad386dec1738bd63e1fe0d8b394a2ccfc7d6c6a0cc9359
+    SHA512 22e78db86b835843df897d14ad633d8a553c0f9b1389daa0c2f864869c6b9ca889028d434f9552237dc4f1b37c978fbe0cce166e3768e5d4e8850ff69a6fc872
 )
 vcpkg_extract_source_archive(SOURCE_PATH
     ARCHIVE "${tarball}"
@@ -28,8 +26,18 @@ if ("openssl" IN_LIST FEATURES)
     vcpkg_list(APPEND options "--enable-openssl-compatibility")
 endif()
 
-if(VCPKG_TARGET_IS_OSX)
-    vcpkg_list(APPEND options "LDFLAGS=\$LDFLAGS -framework CoreFoundation")
+if(VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_list(APPEND options "LIBS=\$LIBS -liconv -lcharset") # for libunistring
+endif()
+
+if(VCPKG_CROSSCOMPILING)
+    vcpkg_cmake_get_vars(cmake_vars_file)
+    include("${cmake_vars_file}")
+    set(ccas "${VCPKG_DETECTED_CMAKE_C_COMPILER}")
+    cmake_path(GET ccas PARENT_PATH ccas_dir)
+    vcpkg_add_to_path("${ccas_dir}")
+    cmake_path(GET ccas FILENAME ccas_command)
+    vcpkg_list(APPEND options "CCAS=${ccas_command}")
 endif()
 
 set(ENV{GTKDOCIZE} true) # true, the program
@@ -42,7 +50,6 @@ vcpkg_configure_make(
         --disable-guile
         --disable-libdane
         --disable-maintainer-mode
-        --disable-silent-rules
         --disable-rpath
         --disable-tests
         --with-brotli=no
@@ -57,6 +64,7 @@ vcpkg_configure_make(
 )
 vcpkg_install_make()
 vcpkg_fixup_pkgconfig()
+vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin")
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
diff --git a/external_imported/vcpkg/ports/libgnutls/vcpkg.json b/external_imported/vcpkg/ports/libgnutls/vcpkg.json
index 55cc72344..17f86699f 100644
--- a/external_imported/vcpkg/ports/libgnutls/vcpkg.json
+++ b/external_imported/vcpkg/ports/libgnutls/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "libgnutls",
-  "version": "3.7.8",
+  "version": "3.8.1",
+  "port-version": 1,
   "description": "A secure communications library implementing the SSL, TLS and DTLS protocols.",
   "homepage": "https://www.gnutls.org/",
   "license": null,
@@ -11,20 +12,25 @@
     "libtasn1",
     "libunistring",
     "nettle",
+    {
+      "name": "vcpkg-cmake-get-vars",
+      "host": true,
+      "platform": "!native"
+    },
     "zlib"
   ],
   "features": {
     "nls": {
       "description": "Enable native language support.",
       "dependencies": [
-        "gettext",
         {
           "name": "gettext",
           "host": true,
           "features": [
             "tools"
           ]
-        }
+        },
+        "gettext-libintl"
       ]
     },
     "openssl": {
diff --git a/external_imported/vcpkg/ports/libgpg-error/gpgrt-config.patch b/external_imported/vcpkg/ports/libgpg-error/gpgrt-config.patch
new file mode 100644
index 000000000..926b88af9
--- /dev/null
+++ b/external_imported/vcpkg/ports/libgpg-error/gpgrt-config.patch
@@ -0,0 +1,51 @@
+diff --git a/src/gpgrt-config.in b/src/gpgrt-config.in
+index bada0f2..8c03a05 100644
+--- a/src/gpgrt-config.in
++++ b/src/gpgrt-config.in
+@@ -78,7 +78,7 @@ substitute_vars () {
+ 	esac
+     done
+ 
+-    echo "$__result"
++    echo "$__result" | sed -e 's,",,g'
+ }
+ 
+ #
+@@ -132,7 +132,6 @@ EOF2
+ 		*:|*:\ ) ;;
+ 		*)
+ 		    echo "Error reading $_filename: $_line" 1>&2
+-		    exit 1
+ 		    ;;
+ 	    esac
+ 	fi
+@@ -166,6 +165,7 @@ read_config_file () {
+ 	fi
+ 	exit 1
+     fi
++    VAR_pcfiledir="${RESULT%/*}" \
+     read_config_from_stdin $RESULT < $RESULT
+ }
+ 
+@@ -540,6 +540,11 @@ while test $# -gt 0; do
+ 	    ;;
+     esac
+ done
++vcpkg_prefix=$(echo "$0" | sed -e 's,^\([a-zA-Z]\):/,/\1/,')
++case "$vcpkg_prefix" in
++*/tools/libgpg-error/debug/bin/gpgrt-config)  libdir="${vcpkg_prefix%/*/*/*/*/*}/debug/lib" ;;
++*/tools/libgpg-error/bin/gpgrt-config)        libdir="${vcpkg_prefix%/*/*/*/*}/lib" ;;
++esac
+ 
+ if env | grep '^PKG_CONFIG_LIBDIR=$' >/dev/null 2>&1; then
+   # The variable set as empty, we use PKG_CONFIG_PATH in this case,
+@@ -598,7 +603,8 @@ output=""
+ 
+ mt="no"
+ 
+-VAR_list=VAR_pc_sysrootdir
++VAR_list="VAR_pcfiledir VAR_pc_sysrootdir"
++VAR_pcfiledir=""
+ if [ -z "$PKG_CONFIG_SYSROOT_DIR" ]; then
+     VAR_pc_sysrootdir="/"
+ else
diff --git a/external_imported/vcpkg/ports/libgpg-error/portfile.cmake b/external_imported/vcpkg/ports/libgpg-error/portfile.cmake
index 36f2c2e43..9c85d1191 100644
--- a/external_imported/vcpkg/ports/libgpg-error/portfile.cmake
+++ b/external_imported/vcpkg/ports/libgpg-error/portfile.cmake
@@ -1,18 +1,17 @@
-vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
-
 vcpkg_download_distfile(tarball
     URLS
         "https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-${VERSION}.tar.bz2"
         "https://mirrors.dotsrc.org/gcrypt/libgpg-error/libgpg-error-${VERSION}.tar.bz2"
         "https://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${VERSION}.tar.bz2"
     FILENAME "libgpg-error-${VERSION}.tar.bz2"
-    SHA512 b06223bb2b0f67d3db5d0d9ab116361a0eda175d4667352b5c0941408d37f2b0ba8e507297e480ccebb88cbba9d0a133820b896914b07d264fb3edaac7b8c99d
+    SHA512 bbb4b15dae75856ee5b1253568674b56ad155524ae29a075cb5b0a7e74c4af685131775c3ea2226fff2f84ef80855e77aa661645d002b490a795c7ae57b66a30
 )
 vcpkg_extract_source_archive(
     SOURCE_PATH
     ARCHIVE "${tarball}"
     PATCHES
         cross-tools.patch
+        gpgrt-config.patch
         pkgconfig-libintl.patch
 )
 
@@ -35,8 +34,6 @@ vcpkg_configure_make(
         ${options}
         --disable-tests
         --disable-doc
-        --disable-silent-rules
-        --enable-install-gpg-error-config # still used downstream
 )
 
 vcpkg_install_make()
@@ -45,19 +42,14 @@ vcpkg_copy_pdbs()
 
 if(NOT VCPKG_CROSSCOMPILING)
     file(INSTALL
-            "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/mkerrcodes${VCPKG_TARGET_SUFFIX}"
-            "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/mkheader${VCPKG_TARGET_SUFFIX}"
+            "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/mkerrcodes${VCPKG_TARGET_EXECUTABLE_SUFFIX}"
+            "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/mkheader${VCPKG_TARGET_EXECUTABLE_SUFFIX}"
         DESTINATION "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}"
         USE_SOURCE_PERMISSIONS
     )
     vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}")
 endif()
 
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/gpg-error-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..")
-if(NOT VCPKG_BUILD_TYPE)
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/gpg-error-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..")
-endif()
-
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 if(NOT "nls" IN_LIST FEATURES)
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}/locale")
diff --git a/external_imported/vcpkg/ports/libgpg-error/vcpkg.json b/external_imported/vcpkg/ports/libgpg-error/vcpkg.json
index 62a3c7eee..eb5a83e66 100644
--- a/external_imported/vcpkg/ports/libgpg-error/vcpkg.json
+++ b/external_imported/vcpkg/ports/libgpg-error/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "libgpg-error",
-  "version": "1.46",
+  "version": "1.47",
   "description": "A common dependency of all GnuPG components",
   "homepage": "https://gnupg.org/software/libgpg-error/index.html",
   "license": "LGPL-2.1-or-later",
@@ -8,22 +8,21 @@
   "dependencies": [
     {
       "name": "libgpg-error",
-      "host": true,
-      "default-features": false
+      "host": true
     }
   ],
   "features": {
     "nls": {
       "description": "Enable native language support",
       "dependencies": [
-        "gettext",
         {
           "name": "gettext",
           "host": true,
           "features": [
             "tools"
           ]
-        }
+        },
+        "gettext-libintl"
       ]
     }
   }
diff --git a/external_imported/vcpkg/ports/libgpiod/portfile.cmake b/external_imported/vcpkg/ports/libgpiod/portfile.cmake
index bffa9e8b6..1e55e1f3d 100644
--- a/external_imported/vcpkg/ports/libgpiod/portfile.cmake
+++ b/external_imported/vcpkg/ports/libgpiod/portfile.cmake
@@ -1,8 +1,11 @@
-vcpkg_from_git(
-    OUT_SOURCE_PATH SOURCE_PATH
-    URL git://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git
-    REF dfc5d361e6748d5f48b706e5c4ac949d133b5470 # v1.6.3
-    PATCHES
+vcpkg_download_distfile(ARCHIVE
+    URLS https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-9068bb08dc3bf183eee6de2577ad266fe6b8f434.tar.gz
+    FILENAME libgpiod-${VERSION}.tar.gz
+    SHA512 3c569471007d12d94cb74377187dfe8b979de08f3747dca6348a4212ffb6d5f699af1d1135c25c70bcd17d533b09499fd0f1b3c5deac7d0a2d1bbf31092033c3
+)
+
+vcpkg_extract_source_archive(SOURCE_PATH
+    ARCHIVE "${ARCHIVE}"
 )
 
 if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
diff --git a/external_imported/vcpkg/ports/libgpiod/vcpkg.json b/external_imported/vcpkg/ports/libgpiod/vcpkg.json
index 11d6da378..b42665a6e 100644
--- a/external_imported/vcpkg/ports/libgpiod/vcpkg.json
+++ b/external_imported/vcpkg/ports/libgpiod/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "libgpiod",
-  "version": "1.6.3",
-  "port-version": 2,
+  "version": "2.1",
   "description": "C library and tools for interacting with the linux GPIO character device",
   "homepage": "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git",
   "license": "LGPL-2.1-or-later",
diff --git a/external_imported/vcpkg/ports/libgta/vcpkg.json b/external_imported/vcpkg/ports/libgta/vcpkg.json
index b2fad2ce9..04bd89c94 100644
--- a/external_imported/vcpkg/ports/libgta/vcpkg.json
+++ b/external_imported/vcpkg/ports/libgta/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libgta",
-  "version-string": "1.0.8",
-  "port-version": 4,
+  "version": "1.0.8",
+  "port-version": 5,
   "description": "Libgta is a portable library that implements the Generic Tagged Array (GTA) file format.",
   "homepage": "https://download.savannah.nongnu.org/releases/gta",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/libguarded/fix-install.patch b/external_imported/vcpkg/ports/libguarded/fix-install.patch
new file mode 100644
index 000000000..c75f80a82
--- /dev/null
+++ b/external_imported/vcpkg/ports/libguarded/fix-install.patch
@@ -0,0 +1,41 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 20eaf53..b81f056 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -32,20 +32,7 @@ include(CheckIncludeFiles)
+ include(CheckTypeSize)
+ 
+ # location for install or package
+-if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
+-   include(GNUInstallDirs)
+-   set(CMAKE_INSTALL_RPATH "@executable_path")
+-
+-elseif (CMAKE_SYSTEM_NAME MATCHES "(Linux|OpenBSD|FreeBSD|NetBSD|DragonFly)")
+-   include(GNUInstallDirs)
+-   set(CMAKE_INSTALL_RPATH "\$ORIGIN")
+-
+-elseif (CMAKE_SYSTEM_NAME MATCHES "Windows")
+-   set(CMAKE_INSTALL_BINDIR bin)
+-   set(CMAKE_INSTALL_LIBDIR lib)
+-   set(CMAKE_INSTALL_INCLUDEDIR include)
+-
+-endif()
++include(GNUInstallDirs)
+ 
+ set(PACKAGE           "cs_libguarded")
+ set(PACKAGE_NAME      "CsLibGuarded")
+@@ -98,13 +85,7 @@ else()
+ endif()
+ 
+ # destination for cmake export files
+-if (CMAKE_SYSTEM_NAME MATCHES "Windows")
+-   set(PKG_PREFIX "cmake/CsLibGuarded")
+-
+-else()
+-   set(PKG_PREFIX "${CMAKE_INSTALL_LIBDIR}/cmake/CsLibGuarded")
+-
+-endif()
++set(PKG_PREFIX "${CMAKE_INSTALL_LIBDIR}/cmake/CsLibGuarded")
+ 
+ # catch2 set up
+ if(BUILD_TESTS)
diff --git a/external_imported/vcpkg/ports/libguarded/portfile.cmake b/external_imported/vcpkg/ports/libguarded/portfile.cmake
index dd6b93686..2da6715a3 100644
--- a/external_imported/vcpkg/ports/libguarded/portfile.cmake
+++ b/external_imported/vcpkg/ports/libguarded/portfile.cmake
@@ -1,11 +1,25 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO copperspice/cs_libguarded
-    REF 1f159aa866a50f5d2952de41d8a99821b8ec37df
-    SHA512 91380262e65ec7b8990c500c60b8d141960be24b69e01a4661c2e8fbfdb8e315c9a4509c2c65a74bc60a8fe690d6dbc8f2b39757d13da5068c95283a19d4c6c4
+    REF 9c1e82f42f228345f3b024bed5d08be643c00f8a
+    SHA512 ab690489151f5f8451c63c8a78a89a586950f88d19b6df685d979db9442f36b68db402ae5a6749e75b17ac3e1c06447d2d4803d43f9d373031cc05d9b25770e9
     HEAD_REF master
+    PATCHES
+        fix-install.patch
 )
 
-File(COPY ${SOURCE_PATH}/src/libguarded DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+set(VCPKG_BUILD_TYPE release) # header-only port
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_TESTS=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME CsLibGuarded CONFIG_PATH lib/cmake/CsLibGuarded)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/libguarded/usage b/external_imported/vcpkg/ports/libguarded/usage
new file mode 100644
index 000000000..90453be93
--- /dev/null
+++ b/external_imported/vcpkg/ports/libguarded/usage
@@ -0,0 +1,4 @@
+CsLibGuarded provides CMake targets:
+
+    find_package(CsLibGuarded CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE CsLibGuarded::CsLibGuarded)
diff --git a/external_imported/vcpkg/ports/libguarded/vcpkg.json b/external_imported/vcpkg/ports/libguarded/vcpkg.json
index d6bc46396..26d509160 100644
--- a/external_imported/vcpkg/ports/libguarded/vcpkg.json
+++ b/external_imported/vcpkg/ports/libguarded/vcpkg.json
@@ -1,7 +1,17 @@
 {
   "name": "libguarded",
-  "version-string": "2019-08-27",
-  "port-version": 2,
-  "description": "The libGuarded library is a standalone header-only library for multithreaded programming.",
-  "homepage": "https://github.com/copperspice/libguarded"
+  "version": "1.4.1",
+  "description": "Header-only library for multithreaded programming.",
+  "homepage": "https://github.com/copperspice/libguarded",
+  "license": "BSD-2-Clause",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/libgwenhywfar/portfile.cmake b/external_imported/vcpkg/ports/libgwenhywfar/portfile.cmake
index 3ea00a459..a0ffa609e 100644
--- a/external_imported/vcpkg/ports/libgwenhywfar/portfile.cmake
+++ b/external_imported/vcpkg/ports/libgwenhywfar/portfile.cmake
@@ -1,64 +1,66 @@
-set(VERSION_MAJOR 5)
-set(VERSION_MINOR 6)
-set(VERSION_PATCH 0)
-set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
-
 vcpkg_download_distfile(ARCHIVE
     URLS "https://www.aquamaniac.de/rdm/attachments/download/364/gwenhywfar-${VERSION}.tar.gz"
     FILENAME "gwenhywfar-${VERSION}.tar.gz"
     SHA512 9875d677f49fc0a46f371fd1954d15d99c7d5994e90b16f1be7a5b8a1cbcd74ae9733e4541afd6d8251a2ba1a0a37c28e0f248952b7c917313fbf5b38b1d8d11
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
-    REF ${VERSION}
+vcpkg_extract_source_archive(
+    SOURCE_PATH
+    ARCHIVE "${ARCHIVE}"
+    SOURCE_BASE "${VERSION}"
 )
 
+vcpkg_list(SET options)
 if ("libxml2" IN_LIST FEATURES)
-   set(WITH_LIBXML2_CODE "--with-libxml2-code=yes")
+    vcpkg_list(APPEND options "--with-libxml2-code=yes")
 endif()
+
 if ("cpp" IN_LIST FEATURES)
-   list(APPEND FEATURES_GUI "cpp")
+    list(APPEND FEATURES_GUI "cpp")
 endif()
 if ("qt5" IN_LIST FEATURES)
-   list(APPEND FEATURES_GUI "qt5")
+    list(APPEND FEATURES_GUI "qt5")
 endif()
-
 list(JOIN FEATURES_GUI " " GUIS)
+vcpkg_list(APPEND options "--with-guis=${GUIS}")
 
 if(VCPKG_TARGET_IS_OSX)
-    set(LDFLAGS "-framework CoreFoundation -framework Security")
-else()
-    set(LDFLAGS "")
+    vcpkg_list(APPEND options "LDFLAGS=\$LDFLAGS -framework CoreFoundation -framework Security")
 endif()
 
 vcpkg_configure_make(
-    SOURCE_PATH ${SOURCE_PATH}
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-        --disable-silent-rules
         --disable-binreloc
-        --with-guis=${GUIS}
-        --with-libgpg-error-prefix=${CURRENT_INSTALLED_DIR}/tools/libgpg-error
-        --with-libgcrypt-prefix=${CURRENT_INSTALLED_DIR}/tools/libgcrypt
-        --with-qt5-qmake=${CURRENT_INSTALLED_DIR}/tools/qt5/bin/qmake
-        --with-qt5-moc=${CURRENT_INSTALLED_DIR}/tools/qt5/bin/moc
-        --with-qt5-uic=${CURRENT_INSTALLED_DIR}/tools/qt5/bin/uic
-        ${WITH_LIBXML2_CODE}
-        "LDFLAGS=${LDFLAGS}"
+        ${options}
+    OPTIONS_RELEASE
+        "--with-qt5-qmake=${CURRENT_HOST_INSTALLED_DIR}/tools/qt5/bin/qmake"
+        "--with-qt5-moc=${CURRENT_HOST_INSTALLED_DIR}/tools/qt5/bin/moc"
+        "--with-qt5-uic=${CURRENT_HOST_INSTALLED_DIR}/tools/qt5/bin/uic"
+        "GPG_ERROR_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/bin/gpgrt-config"
+        "gpg_error_config_args=gpg-error"
+        "LIBGCRYPT_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgcrypt/bin/libgcrypt-config"
+    OPTIONS_DEBUG
+        "--with-qt5-qmake=${CURRENT_HOST_INSTALLED_DIR}/tools/qt5/debug/bin/qmake"
+        "--with-qt5-moc=${CURRENT_HOST_INSTALLED_DIR}/tools/qt5/debug/bin/moc"
+        "--with-qt5-uic=${CURRENT_HOST_INSTALLED_DIR}/tools/qt5/debug/bin/uic"
+        "GPG_ERROR_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/debug/bin/gpgrt-config"
+        "gpg_error_config_args=gpg-error"
+        "LIBGCRYPT_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgcrypt/debug/bin/libgcrypt-config"
 )
 
 vcpkg_install_make()
 vcpkg_copy_pdbs()
 vcpkg_fixup_pkgconfig()
 
+string(REGEX MATCH "^([0-9]*[.][0-9]*)" MAJOR_MINOR "${VERSION}")
 foreach(GUI IN LISTS FEATURES_GUI)
-    vcpkg_cmake_config_fixup(PACKAGE_NAME  gwengui-cpp CONFIG_PATH lib/cmake/gwengui-${GUI}-${VERSION_MAJOR}.${VERSION_MINOR} DO_NOT_DELETE_PARENT_CONFIG_PATH)
+    vcpkg_cmake_config_fixup(PACKAGE_NAME gwengui-${GUI} CONFIG_PATH lib/cmake/gwengui-${GUI}-${MAJOR_MINOR} DO_NOT_DELETE_PARENT_CONFIG_PATH)
 endforeach()
-vcpkg_cmake_config_fixup(PACKAGE_NAME gwenhywfar CONFIG_PATH lib/cmake/gwenhywfar-${VERSION_MAJOR}.${VERSION_MINOR})
+vcpkg_cmake_config_fixup(PACKAGE_NAME gwenhywfar CONFIG_PATH lib/cmake/gwenhywfar-${MAJOR_MINOR})
 
 if ("tools" IN_LIST FEATURES)
-    vcpkg_copy_tools(SEARCH_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin TOOL_NAMES gct-tool gsa mklistdoc typemaker typemaker2 xmlmerge AUTO_CLEAN)
+    vcpkg_copy_tools(SEARCH_DIR "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin" TOOL_NAMES gct-tool gsa mklistdoc typemaker typemaker2 xmlmerge AUTO_CLEAN)
 endif()
 
 # the `dir` variable is not used in the script
@@ -68,4 +70,4 @@ if(NOT VCPKG_BUILD_TYPE)
 endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/libgwenhywfar/vcpkg.json b/external_imported/vcpkg/ports/libgwenhywfar/vcpkg.json
index 6c56ae3f8..01962b311 100644
--- a/external_imported/vcpkg/ports/libgwenhywfar/vcpkg.json
+++ b/external_imported/vcpkg/ports/libgwenhywfar/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "libgwenhywfar",
   "version-semver": "5.6.0",
-  "port-version": 2,
+  "port-version": 5,
   "description": "A helper library for networking and security applications and libraries",
   "homepage": "https://www.aquamaniac.de/rdm/",
-  "supports": "!windows",
+  "supports": "!windows & !(osx & arm64)",
   "dependencies": [
     "libgcrypt",
     {
@@ -29,13 +29,19 @@
     "libxml2": {
       "description": "Enables libXML2-depending functionality",
       "dependencies": [
-        "libxml2"
+        {
+          "name": "libxml2",
+          "default-features": false
+        }
       ]
     },
     "qt5": {
       "description": "Qt bindings",
       "dependencies": [
-        "qt5-base"
+        {
+          "name": "qt5-base",
+          "default-features": false
+        }
       ]
     },
     "tools": {
diff --git a/external_imported/vcpkg/ports/libgxps/portfile.cmake b/external_imported/vcpkg/ports/libgxps/portfile.cmake
index d7dd89ba2..234ccffb5 100644
--- a/external_imported/vcpkg/ports/libgxps/portfile.cmake
+++ b/external_imported/vcpkg/ports/libgxps/portfile.cmake
@@ -7,10 +7,10 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 d3d56e4906477b68d088bf83bde666f9ea8bf383add592772aad53dd571e727f1bc0410dd020e12212ede5ff8e26cb46150a9860a6f7af29c4d195f03e946fe9
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE ${ARCHIVE}
-    REF ${LIBGXPS_VERSION}
+    SOURCE_BASE ${LIBGXPS_VERSION}
     PATCHES
         "${CMAKE_CURRENT_LIST_DIR}/libgxps-0.3.2_fix_meson_warnings.patch" # https://gitlab.gnome.org/GNOME/libgxps/-/commit/a18e1260
 )
diff --git a/external_imported/vcpkg/ports/libgxps/vcpkg.json b/external_imported/vcpkg/ports/libgxps/vcpkg.json
index e052c37d9..acebb6e8e 100644
--- a/external_imported/vcpkg/ports/libgxps/vcpkg.json
+++ b/external_imported/vcpkg/ports/libgxps/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libgxps",
   "version": "0.3.2",
-  "port-version": 1,
+  "port-version": 2,
   "description": "libgxps is a GObject based library for handling and rendering XPS documents.",
   "homepage": "https://wiki.gnome.org/Projects/libgxps",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/libharu/portfile.cmake b/external_imported/vcpkg/ports/libharu/portfile.cmake
index 764dc6342..db1752498 100644
--- a/external_imported/vcpkg/ports/libharu/portfile.cmake
+++ b/external_imported/vcpkg/ports/libharu/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libharu/libharu
     REF v${VERSION}
-    SHA512 4b01dd0d23bdcaec6f69fe5f059902e7f49eafdf19d53d4cce8b4d52a54b2057b764de29390f4da9e75aeb32cb6af8606b23478b04edf9f7dcb1e4b769c5fff2
+    SHA512 422210b09f89643cb25808559aeea109db5cce8a71c779d51f87222cdd50434f4f0f92322ebe429fca8f85ad73592bcabb14c3e36cd0bea19b6ec4c729220522
     HEAD_REF master
     PATCHES
         fix-include-path.patch
diff --git a/external_imported/vcpkg/ports/libharu/vcpkg.json b/external_imported/vcpkg/ports/libharu/vcpkg.json
index d71ae0bdf..9e18fc42c 100644
--- a/external_imported/vcpkg/ports/libharu/vcpkg.json
+++ b/external_imported/vcpkg/ports/libharu/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "libharu",
-  "version": "2.4.3",
+  "version": "2.4.4",
   "description": "libharu - free PDF library",
   "homepage": "https://github.com/libharu/libharu",
   "license": "Zlib",
diff --git a/external_imported/vcpkg/ports/libhdfs3/fix_dependency_uuid.patch b/external_imported/vcpkg/ports/libhdfs3/fix_dependency_uuid.patch
new file mode 100644
index 000000000..4056a4ce9
--- /dev/null
+++ b/external_imported/vcpkg/ports/libhdfs3/fix_dependency_uuid.patch
@@ -0,0 +1,25 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1a8b109..6ea24f8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -21,7 +21,9 @@ FIND_PACKAGE(KERBEROS REQUIRED)
+ FIND_PACKAGE(GSasl REQUIRED)
+ 
+ IF(OS_LINUX)
+-    FIND_PACKAGE(LibUUID REQUIRED)
++    find_package(unofficial-libuuid CONFIG REQUIRED)
++    set(LIBUUID_LIBRARIES unofficial::UUID::uuid) 
++    add_library(uuid ALIAS unofficial::UUID::uuid)
+ ENDIF(OS_LINUX)
+ 
+ ADD_SUBDIRECTORY(mock)
+diff --git a/hdfs_benchmark/CMakeLists.txt b/hdfs_benchmark/CMakeLists.txt
+index dcb4c0a..f4274b6 100644
+--- a/hdfs_benchmark/CMakeLists.txt
++++ b/hdfs_benchmark/CMakeLists.txt
+@@ -10,4 +10,4 @@ set(SOURCE_FILES main.cpp)
+ add_executable(hdfs_benchmark ${SOURCE_FILES})
+ add_dependencies(hdfs_benchmark libhdfs3-shared)
+
+-target_link_libraries(hdfs_benchmark uuid pthread libhdfs3-shared)
++target_link_libraries(hdfs_benchmark pthread libhdfs3-shared)
diff --git a/external_imported/vcpkg/ports/libhdfs3/portfile.cmake b/external_imported/vcpkg/ports/libhdfs3/portfile.cmake
index ebe16a4fb..9ad42a571 100644
--- a/external_imported/vcpkg/ports/libhdfs3/portfile.cmake
+++ b/external_imported/vcpkg/ports/libhdfs3/portfile.cmake
@@ -4,8 +4,25 @@ vcpkg_from_github(
     REF 9a60d79812d6dee72455f61bff57a93c3c7d56f5
     SHA512 2b635ab979230c251243f01717105872245d7948f75832e58f50a09b0b06d1b366b3c5f3a3253fa538076e9f199003f28d10b9958293144dbc301276073a0633
     HEAD_REF apache-rpc-9
+    PATCHES
+        fix_dependency_uuid.patch
 )
 
+if(VCPKG_TARGET_IS_LINUX )
+    message(STATUS [[
+To build libhdfs3, the following libraries are needed.
+    libgsasl
+This development package can be installed on the system by
+    apt install libgsasl-dev
+]])
+elseif(VCPKG_TARGET_IS_OSX)
+    message(WARNING [[
+To build libhdfs3, the following libraries are needed.
+    libgsasl
+These development packages can be installed on the system via
+    git clone https://gitlab.com/gsasl/gsasl.git]])
+endif()
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
 )
diff --git a/external_imported/vcpkg/ports/libhdfs3/vcpkg.json b/external_imported/vcpkg/ports/libhdfs3/vcpkg.json
index 490f81976..6a92fadf6 100644
--- a/external_imported/vcpkg/ports/libhdfs3/vcpkg.json
+++ b/external_imported/vcpkg/ports/libhdfs3/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libhdfs3",
   "version-date": "2019-11-05",
-  "port-version": 4,
+  "port-version": 5,
   "description": "Native Hadoop RPC protocol and HDFS data transfer protocol implementation",
   "homepage": "https://github.com/erikmuttersbach/libhdfs3",
   "supports": "!windows",
diff --git a/external_imported/vcpkg/ports/libheif/gdk-pixbuf.patch b/external_imported/vcpkg/ports/libheif/gdk-pixbuf.patch
index 0ecd41d0f..257b46669 100644
--- a/external_imported/vcpkg/ports/libheif/gdk-pixbuf.patch
+++ b/external_imported/vcpkg/ports/libheif/gdk-pixbuf.patch
@@ -1,11 +1,10 @@
-diff --git a/gdk-pixbuf/CMakeLists.txt b/gdk-pixbuf/CMakeLists.txt
-index 85ad59708..d6aa4a5f9 100644
---- a/gdk-pixbuf/CMakeLists.txt
-+++ b/gdk-pixbuf/CMakeLists.txt
-@@ -1,13 +1,10 @@
+diff --git "a/gdk-pixbuf/CMakeLists.txt" "b/gdk-pixbuf/CMakeLists.txt"
+index eeb2727..20a6b16 100644
+--- "a/gdk-pixbuf/CMakeLists.txt"
++++ "b/gdk-pixbuf/CMakeLists.txt"
+@@ -1,12 +1,9 @@
  if(UNIX OR MINGW)
    find_package(PkgConfig)
-   find_package(Threads)
 -  pkg_check_modules(GDKPIXBUF2 gdk-pixbuf-2.0)
 +  pkg_check_modules(GDKPIXBUF2 gdk-pixbuf-2.0 IMPORTED_TARGET)
  
@@ -18,7 +17,7 @@ index 85ad59708..d6aa4a5f9 100644
  
      add_library(pixbufloader-heif MODULE pixbufloader-heif.c)
  
-@@ -15,7 +12,7 @@ if(UNIX)
+@@ -14,7 +11,7 @@ if(UNIX OR MINGW)
  
      target_link_directories(pixbufloader-heif PRIVATE ${GDKPIXBUF2_LIBRARY_DIRS})
  
@@ -27,4 +26,3 @@ index 85ad59708..d6aa4a5f9 100644
  
      install(TARGETS pixbufloader-heif DESTINATION ${GDKPIXBUF2_MODULE_DIR})
    endif()
-
diff --git a/external_imported/vcpkg/ports/libheif/portfile.cmake b/external_imported/vcpkg/ports/libheif/portfile.cmake
index 6106aae7f..0572f84ed 100644
--- a/external_imported/vcpkg/ports/libheif/portfile.cmake
+++ b/external_imported/vcpkg/ports/libheif/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO  strukturag/libheif 
-    REF 06f6acfe735379b9c3bcf865285f6dba80611e90 #v1.15.1
-    SHA512 46666ff26c45ed51fdf454fd0be440ac78d6d17571dcf49dd202299248ee28078b1a500b3768b9a391a32e005f021f626e4d0956f9fab6731d17503020c31031
+    REF "v${VERSION}"
+    SHA512 e8f7a9d8d7af1947e9ca43e8387fc082551c884bb66fef7484c82748f3b81524efa7a2988f31d059a85a10539ff42bd3125b0f066f7b8b652bd9450737b2bc89
     HEAD_REF master
     PATCHES
         gdk-pixbuf.patch
@@ -13,6 +13,7 @@ vcpkg_cmake_configure(
     OPTIONS
         -DWITH_EXAMPLES=OFF
         -DWITH_DAV1D=OFF
+        -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=ON
 )
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
@@ -38,4 +39,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/libheif" "${CURRENT_PACKAGES_DI
 
 vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libheif/heif_version.h" "#define LIBHEIF_PLUGIN_DIRECTORY \"${CURRENT_PACKAGES_DIR}/lib/libheif\"" "")
 
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/libheif/vcpkg.json b/external_imported/vcpkg/ports/libheif/vcpkg.json
index 306e29730..81e0c3ae0 100644
--- a/external_imported/vcpkg/ports/libheif/vcpkg.json
+++ b/external_imported/vcpkg/ports/libheif/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "libheif",
-  "version": "1.15.1",
-  "description": "Open h.265 video codec implementation.",
+  "version": "1.17.6",
+  "description": "libheif is an HEIF and AVIF file format decoder and encoder.",
   "homepage": "http://www.libheif.org/",
   "license": "LGPL-3.0-only",
+  "supports": "!xbox",
   "dependencies": [
     {
       "name": "gdk-pixbuf",
diff --git a/external_imported/vcpkg/ports/libhsplasma/portfile.cmake b/external_imported/vcpkg/ports/libhsplasma/portfile.cmake
index e805e844f..9a45aa559 100644
--- a/external_imported/vcpkg/ports/libhsplasma/portfile.cmake
+++ b/external_imported/vcpkg/ports/libhsplasma/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO H-uru/libhsplasma
-    REF 2327302a62b891f551b5f6daf899cf86997dce72 # 2022.05.19
-    SHA512 89755e502e4a66a56013e3ff52c8d0c2350e5681be49c1b47f580591e3c3da24c587dee5af4f9524ea43f2d86f24ecef611d62d6045b293eb8d09cd5f0ac3d18
+    REF 448ad712015c0b8a293af7bd56ab623dd2e6e131 # 2023.05.08
+    SHA512 c08e7708f1a6e392075cc6eccbbf2ac932ce77d789ecb192e6805e478fe32f412c4b964494bdcc8574ed18c47b16c02e99b98994a63478ea6768ccedea6a3417
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/libhsplasma/vcpkg.json b/external_imported/vcpkg/ports/libhsplasma/vcpkg.json
index 44639e11c..9b8acabb2 100644
--- a/external_imported/vcpkg/ports/libhsplasma/vcpkg.json
+++ b/external_imported/vcpkg/ports/libhsplasma/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "libhsplasma",
-  "version-date": "2022-05-19",
+  "version-date": "2023-05-08",
   "description": "Cross-platform Plasma data and network library",
   "homepage": "https://github.com/H-uru/libhsplasma",
   "license": "GPL-3.0-or-later",
-  "supports": "!(arm | uwp)",
+  "supports": "!(arm | uwp | xbox)",
   "dependencies": [
     "libjpeg-turbo",
     "libpng",
diff --git a/external_imported/vcpkg/ports/libhv/d77287e954f02706502028baadc8c87e7382301b.patch b/external_imported/vcpkg/ports/libhv/d77287e954f02706502028baadc8c87e7382301b.patch
deleted file mode 100644
index c1637a709..000000000
--- a/external_imported/vcpkg/ports/libhv/d77287e954f02706502028baadc8c87e7382301b.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From d77287e954f02706502028baadc8c87e7382301b Mon Sep 17 00:00:00 2001
-From: ithewei <ithewei@163.com>
-Date: Tue, 29 Nov 2022 10:37:21 +0800
-Subject: [PATCH] judge BYTE_ORDER
-
----
- base/hplatform.h | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/base/hplatform.h b/base/hplatform.h
-index 60023230..5e0a290c 100644
---- a/base/hplatform.h
-+++ b/base/hplatform.h
-@@ -237,13 +237,19 @@
- 
- // BYTE_ORDER
- #ifndef BYTE_ORDER
--#if defined(ARCH_X86)  || defined(ARCH_X86_64)   || \
--    defined(__ARMEL__) || defined(__AARCH64EL__) || \
--    defined(__MIPSEL)  || defined(__MIPS64EL)
-+#if defined(__BYTE_ORDER)
-+    #define BYTE_ORDER  __BYTE_ORDER
-+#elif defined(__BYTE_ORDER__)
-+    #define BYTE_ORDER  __BYTE_ORDER__
-+#elif defined(ARCH_X86)  || defined(ARCH_X86_64)   || \
-+      defined(__ARMEL__) || defined(__AARCH64EL__) || \
-+      defined(__MIPSEL)  || defined(__MIPS64EL)
-     #define BYTE_ORDER  LITTLE_ENDIAN
- #elif defined(__ARMEB__) || defined(__AARCH64EB__) || \
-       defined(__MIPSEB)  || defined(__MIPS64EB)
-     #define BYTE_ORDER  BIG_ENDIAN
-+#elif defined(OS_WIN)
-+    #define BYTE_ORDER  LITTLE_ENDIAN
- #else
-     #warning "Unknown byte order!"
- #endif
diff --git a/external_imported/vcpkg/ports/libhv/portfile.cmake b/external_imported/vcpkg/ports/libhv/portfile.cmake
index 8df398889..181eddb42 100644
--- a/external_imported/vcpkg/ports/libhv/portfile.cmake
+++ b/external_imported/vcpkg/ports/libhv/portfile.cmake
@@ -1,11 +1,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ithewei/libhv
-    REF 3a67fe506a291ee94ed80bbdd73553fcb6a6b1ef #v1.3.0
-    SHA512 3aa341a94950b0d4f3351a6f62a4c34947b481bb59f1954dd8d031313e73d9c6add1017cf386c507b231b114d80cfc0739a50bed179bdbc31052c86e2f1321a3
+    REF "v${VERSION}"
+    SHA512 9dffb6e844df8ba825df88ef984c280923fbf1d50edcbbbe0b36927172ad82c057d65b9b752163c3e2383eb44db0261fd4e3623e3630a55a3f8987088bef0bd7
     HEAD_REF master
-    PATCHES
-        d77287e954f02706502028baadc8c87e7382301b.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
@@ -32,4 +30,4 @@ vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libhv)
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/libhv/vcpkg.json b/external_imported/vcpkg/ports/libhv/vcpkg.json
index 3819c0e30..b35e83431 100644
--- a/external_imported/vcpkg/ports/libhv/vcpkg.json
+++ b/external_imported/vcpkg/ports/libhv/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "libhv",
-  "version": "1.3.0",
-  "port-version": 1,
+  "version": "1.3.2",
   "description": "Libhv is a C/C++ network library similar to libevent/libuv.",
   "homepage": "https://github.com/ithewei/libhv",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/libical/portfile.cmake b/external_imported/vcpkg/ports/libical/portfile.cmake
index cddeeff79..bfb357c20 100644
--- a/external_imported/vcpkg/ports/libical/portfile.cmake
+++ b/external_imported/vcpkg/ports/libical/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libical/libical
-    REF 5990fd0ac00ee3f068909ac86aa642c940720150 #v3.0.16
-    SHA512 46e9330373e0c5ff4ffb658c2bd0a18cf082b539edf467323926c9b256122613b75190305f3365e52f26371bf51142c16dd40b8c18d2d13020e703b1d5d45042
+    REF "v${VERSION}"
+    SHA512 11fbb4aba7503a3264b0efa30ad56aa923d31ec193bdb0b87b92bc88db9019fa670c8c9ee7998caa3a870e706446a58ead475f31bd703f0d2cb7aabf0f6a3aa7
 )
 
 vcpkg_find_acquire_program(PERL)
diff --git a/external_imported/vcpkg/ports/libical/vcpkg.json b/external_imported/vcpkg/ports/libical/vcpkg.json
index 843b27cd1..52dacb74d 100644
--- a/external_imported/vcpkg/ports/libical/vcpkg.json
+++ b/external_imported/vcpkg/ports/libical/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "libical",
-  "version": "3.0.16",
-  "port-version": 1,
+  "version": "3.0.17",
   "description": "Reference implementation of the iCalendar data type and serialization format",
   "homepage": "https://github.com/libical/libical",
   "license": "MPL-2.0",
diff --git a/external_imported/vcpkg/ports/libiconv/portfile.cmake b/external_imported/vcpkg/ports/libiconv/portfile.cmake
index b834b2aad..134de5683 100644
--- a/external_imported/vcpkg/ports/libiconv/portfile.cmake
+++ b/external_imported/vcpkg/ports/libiconv/portfile.cmake
@@ -1,4 +1,4 @@
-if(NOT VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_ANDROID)
+if(NOT VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_ANDROID AND NOT VCPKG_TARGET_IS_IOS)
     set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
     file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/iconv")
     file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/iconv")
diff --git a/external_imported/vcpkg/ports/libiconv/vcpkg.json b/external_imported/vcpkg/ports/libiconv/vcpkg.json
index 0ed97096b..67225b186 100644
--- a/external_imported/vcpkg/ports/libiconv/vcpkg.json
+++ b/external_imported/vcpkg/ports/libiconv/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libiconv",
   "version": "1.17",
-  "port-version": 1,
+  "port-version": 2,
   "description": "GNU Unicode text conversion",
   "homepage": "https://www.gnu.org/software/libiconv/",
   "license": null
diff --git a/external_imported/vcpkg/ports/libics/fix-integral-include.patch b/external_imported/vcpkg/ports/libics/fix-integral-include.patch
new file mode 100644
index 000000000..4546dadc7
--- /dev/null
+++ b/external_imported/vcpkg/ports/libics/fix-integral-include.patch
@@ -0,0 +1,12 @@
+diff --git a/support/cpp_interface/libics.hpp b/support/cpp_interface/libics.hpp
+index 73f76e6..4ea2b1e 100644
+--- a/support/cpp_interface/libics.hpp
++++ b/support/cpp_interface/libics.hpp
+@@ -40,6 +40,7 @@
+ #include <string>
+ #include <utility>
+ #include <vector>
++#include <cstdint>
+ 
+ #if defined(__WIN32__) && !defined(WIN32)
+ #  define WIN32
diff --git a/external_imported/vcpkg/ports/libics/portfile.cmake b/external_imported/vcpkg/ports/libics/portfile.cmake
index 2d66f4225..1a8350bc1 100644
--- a/external_imported/vcpkg/ports/libics/portfile.cmake
+++ b/external_imported/vcpkg/ports/libics/portfile.cmake
@@ -1,9 +1,10 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO svi-opensource/libics
-    REF ae55128e0532d78aaea4adce21a3fa553d208b83 # 1.6.5
-    SHA512 37a1e9034d7e32954840e18f3e3c19f6ed2f8c651ce0da53f678e2f04653be0fc4d9ab3dca8b6f0bfcaec2a9cc560ccfbc7d9034977faa14036281d6a3ca662a
+    REF "${VERSION}"
+    SHA512 290d6d7bd3f5611d0b46aa6406ef10449ee768bc14d0b34f0bb365ca46f98b7fd4065c94fd9594e357427a4d0644f2724a1f773c7f3b43adc3db2389b94ee88e
     HEAD_REF master
+    PATCHES fix-integral-include.patch
 )
 
 vcpkg_cmake_configure(
diff --git a/external_imported/vcpkg/ports/libics/vcpkg.json b/external_imported/vcpkg/ports/libics/vcpkg.json
index 09e069155..444c9aa0a 100644
--- a/external_imported/vcpkg/ports/libics/vcpkg.json
+++ b/external_imported/vcpkg/ports/libics/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "libics",
-  "version": "1.6.5",
+  "version": "1.6.6",
   "description": "Reference library for ICS (Image Cytometry Standard), an open standard for writing images of any dimensionality and data type to file, together with associated information regarding the recording equipment or recorded subject.",
   "homepage": "https://github.com/svi-opensource/libics",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/libideviceactivation/001_fix_static_build.patch b/external_imported/vcpkg/ports/libideviceactivation/001_fix_static_build.patch
new file mode 100644
index 000000000..be47327f0
--- /dev/null
+++ b/external_imported/vcpkg/ports/libideviceactivation/001_fix_static_build.patch
@@ -0,0 +1,21 @@
+diff --git a/src/activation.c b/src/activation.c
+index 4260c20..29bb2e8 100644
+--- a/src/activation.c
++++ b/src/activation.c
+@@ -90,6 +90,7 @@ struct idevice_activation_response_private {
+ 	int has_errors;
+ };
+ 
++#ifndef LIBIDEVICEACTIVATION_STATIC  // disable dll constructor
+ 
+ static void internal_libideviceactivation_init(void)
+ {
+@@ -162,6 +163,8 @@ BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpReserved)
+ #warning No compiler support for constructor/destructor attributes, some features might not be available.
+ #endif
+ 
++#endif  // disable dll constructor
++
+ static int debug_level = 0;
+ 
+ IDEVICE_ACTIVATION_API void idevice_activation_set_debug_level(int level) {
diff --git a/external_imported/vcpkg/ports/libideviceactivation/002_fix_api.patch b/external_imported/vcpkg/ports/libideviceactivation/002_fix_api.patch
new file mode 100644
index 000000000..8aea70d50
--- /dev/null
+++ b/external_imported/vcpkg/ports/libideviceactivation/002_fix_api.patch
@@ -0,0 +1,21 @@
+diff --git a/src/activation.c b/src/activation.c
+index 29bb2e8..69ec7b4 100644
+--- a/src/activation.c
++++ b/src/activation.c
+@@ -32,15 +32,11 @@
+ #include <libxml/HTMLtree.h>
+ #include <curl/curl.h>
+ 
+-#ifdef WIN32
+-#define IDEVICE_ACTIVATION_API __declspec( dllexport )
+-#else
+-#ifdef HAVE_FVISIBILITY
++#if !defined(_WIN32) && !defined(LIBIDEVICEACTIVATION_STATIC)
+ #define IDEVICE_ACTIVATION_API __attribute__((visibility("default")))
+ #else
+ #define IDEVICE_ACTIVATION_API
+ #endif
+-#endif
+ 
+ #ifdef WIN32
+ #include <windows.h>
diff --git a/external_imported/vcpkg/ports/libideviceactivation/003_fix_tools_msvc.patch b/external_imported/vcpkg/ports/libideviceactivation/003_fix_tools_msvc.patch
new file mode 100644
index 000000000..e89ae7fee
--- /dev/null
+++ b/external_imported/vcpkg/ports/libideviceactivation/003_fix_tools_msvc.patch
@@ -0,0 +1,14 @@
+diff --git a/tools/ideviceactivation.c b/tools/ideviceactivation.c
+index 757c54e..e75e9e9 100644
+--- a/tools/ideviceactivation.c
++++ b/tools/ideviceactivation.c
+@@ -28,7 +28,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#ifndef _MSC_VER
+ #include <unistd.h>
++#endif
+ #include <ctype.h>
+ #ifndef WIN32
+ #include <signal.h>
diff --git a/external_imported/vcpkg/ports/libideviceactivation/CMakeLists.txt b/external_imported/vcpkg/ports/libideviceactivation/CMakeLists.txt
index 05ab295e6..833545eb7 100644
--- a/external_imported/vcpkg/ports/libideviceactivation/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/libideviceactivation/CMakeLists.txt
@@ -1,39 +1,103 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.15)
 project(libideviceactivation C)
 
-# find dependencies
-find_library(libplist NAMES plist plist-2.0 libplist libplist-2.0 REQUIRED)
-find_path(libimobiledevice_INCLUDES endianness.h)
-find_library(libimobiledevice NAMES imobiledevice imobiledevice-1.0 libimobiledevice libimobiledevice-1.0 REQUIRED)
-find_package(LibXml2 REQUIRED)
-find_package(CURL REQUIRED)
+option(BUILD_TOOLS "Build tools." OFF)
 
-# ready to create library
-file(GLOB_RECURSE IDVCACTV_TOOLS_SRC common/*.c)
+include(GNUInstallDirs)
 
-file(GLOB_RECURSE IDVCACTV_PUBLIC_HDR include/*.h)
-file(GLOB_RECURSE IDVCACTV_SRC src/*.c)
+file(GLOB_RECURSE LIBIDEVICEACTIVATION_HEADER include/*.h)
+file(GLOB_RECURSE LIBIDEVICEACTIVATION_SOURCE src/*.c)
 
-add_library(libideviceactivation ${IDVCACTV_TOOLS_SRC} ${IDVCACTV_SRC} ${IDVCACTV_PUBLIC_HDR})
-target_include_directories(libideviceactivation PRIVATE ${libimobiledevice_INCLUDES} ${LIBXML2_INCLUDE_DIR} ${CURL_INCLUDE_DIRS} include)
-target_compile_definitions(libideviceactivation PRIVATE -DHAVE_OPENSSL)
-target_link_libraries(libideviceactivation PRIVATE ${libplist} ${libimobiledevice} ${CURL_LIBRARIES} ${LIBXML2_LIBRARIES})
+set(DEFINITIONS)
+
+if(BUILD_SHARED_LIBS)
+    if(WIN32)
+        list(APPEND LIBIDEVICEACTIVATION_SOURCE exports.def)
+    endif()
+else()
+    list(APPEND DEFINITIONS -DLIBIDEVICEACTIVATION_STATIC)
+endif()
+
+if(WIN32)
+    list(APPEND DEFINITIONS -D_CRT_SECURE_NO_WARNINGS)
+    list(APPEND DEFINITIONS -DWIN32_LEAN_AND_MEAN)
+    list(APPEND DEFINITIONS -DWIN32)
+endif()
+
+find_package(unofficial-libplist CONFIG REQUIRED)
+find_package(unofficial-libimobiledevice CONFIG REQUIRED)
+find_package(CURL CONFIG REQUIRED)
+find_package(LibXml2 CONFIG REQUIRED)
+
+add_library(libideviceactivation ${LIBIDEVICEACTIVATION_SOURCE})
+target_include_directories(libideviceactivation PUBLIC
+    "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
+    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
+)
+target_compile_definitions(libideviceactivation PRIVATE ${DEFINITIONS})
+target_link_libraries(libideviceactivation
+    PRIVATE
+        CURL::libcurl
+        LibXml2::LibXml2
+    PUBLIC
+        unofficial::libplist::libplist
+        unofficial::libimobiledevice::libimobiledevice
+)
+set_target_properties(libideviceactivation PROPERTIES OUTPUT_NAME ideviceactivation-1.0)
+
+install(TARGETS libideviceactivation EXPORT unofficial-libideviceactivation)
 
-# install
 install(
-    TARGETS libideviceactivation
-    RUNTIME DESTINATION bin
-    ARCHIVE DESTINATION lib
-    LIBRARY DESTINATION lib
+    EXPORT unofficial-libideviceactivation
+    FILE unofficial-libideviceactivation-config.cmake
+    DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/unofficial-libideviceactivation"
+    NAMESPACE unofficial::libideviceactivation::
 )
+
+install(
+    FILES ${LIBIDEVICEACTIVATION_HEADER}
+    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+)
+
+set(LIBPLIST_VERSION 2.0)
+set(LIBIMOBILEDEVICE_VERSION 1.0)
+set(LIBCURL_VERSION 7.0)
+set(LIBXML2_VERSION 2.0)
+set(PACKAGE_NAME libideviceactivation)
+set(PACKAGE_VERSION 1.0)
+set(prefix "")
+set(exec_prefix "\${prefix}")
+set(libdir "\${prefix}/lib")
+set(includedir "\${prefix}/include")
+
 configure_file(
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/libideviceactivation-1.0.pc.in
-    ${CMAKE_CURRENT_BINARY_DIR}/libideviceactivation-1.0.pc
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/libideviceactivation-1.0.pc.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/libideviceactivation-1.0.pc"
     @ONLY
 )
 install(
-    FILES ${CMAKE_CURRENT_BINARY_DIR}/libideviceactivation-1.0.pc
-    DESTINATION lib/pkgconfig
+    FILES "${CMAKE_CURRENT_BINARY_DIR}/libideviceactivation-1.0.pc"
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
 )
 
-install(FILES ${IDVCACTV_PUBLIC_HDR} DESTINATION include)
\ No newline at end of file
+if(BUILD_TOOLS)
+    add_executable(ideviceactivation "tools/ideviceactivation.c")
+    target_compile_definitions(ideviceactivation PRIVATE
+        -DPACKAGE_VERSION="1.1.1"
+        -DPACKAGE_URL="https://github.com/libimobiledevice/libideviceactivation"
+        -DPACKAGE_BUGREPORT="https://github.com/libimobiledevice/libideviceactivation/issues"
+    )
+    if(WIN32)
+        target_compile_definitions(ideviceactivation PRIVATE
+            -D_CRT_SECURE_NO_WARNINGS
+            -DWIN32_LEAN_AND_MEAN
+            -DWIN32
+        )
+    endif()
+    target_link_libraries(ideviceactivation PRIVATE libideviceactivation)
+
+    install(
+        TARGETS ideviceactivation
+        RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+    )
+endif()
diff --git a/external_imported/vcpkg/ports/libideviceactivation/exports.def b/external_imported/vcpkg/ports/libideviceactivation/exports.def
new file mode 100644
index 000000000..346b0c83b
--- /dev/null
+++ b/external_imported/vcpkg/ports/libideviceactivation/exports.def
@@ -0,0 +1,31 @@
+EXPORTS
+    idevice_activation_set_debug_level
+    idevice_activation_request_new
+    idevice_activation_request_new_from_lockdownd
+    idevice_activation_drm_handshake_request_new
+    idevice_activation_request_free
+    idevice_activation_request_get_fields
+    idevice_activation_request_set_fields
+    idevice_activation_request_set_fields_from_response
+    idevice_activation_request_set_field
+    idevice_activation_request_get_field
+    idevice_activation_request_get_url
+    idevice_activation_request_set_url
+    idevice_activation_response_new
+    idevice_activation_response_new_from_html
+    idevice_activation_response_to_buffer
+    idevice_activation_response_free
+    idevice_activation_response_get_field
+    idevice_activation_response_get_fields
+    idevice_activation_response_get_label
+    idevice_activation_response_get_placeholder
+    idevice_activation_response_get_title
+    idevice_activation_response_get_description
+    idevice_activation_response_get_activation_record
+    idevice_activation_response_get_headers
+    idevice_activation_response_is_activation_acknowledged
+    idevice_activation_response_is_authentication_required
+    idevice_activation_response_field_requires_input
+    idevice_activation_response_field_secure_input
+    idevice_activation_response_has_errors
+    idevice_activation_send_request
diff --git a/external_imported/vcpkg/ports/libideviceactivation/portfile.cmake b/external_imported/vcpkg/ports/libideviceactivation/portfile.cmake
index e438cba37..db91abae0 100644
--- a/external_imported/vcpkg/ports/libideviceactivation/portfile.cmake
+++ b/external_imported/vcpkg/ports/libideviceactivation/portfile.cmake
@@ -1,21 +1,47 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO libimobiledevice-win32/libideviceactivation
-    REF fbe0476cfeddc2fc317ceb900eec12302c1d4c11 # v1.3.17
-    SHA512 18fdf1b42744da33e0f0f037e83a72b76cc0b63a0b712e78d9736adcde113582327f3712bc2bfa7b6fdb692465700a9106286f383fd7d11f9351ca7939b20e24
-    HEAD_REF msvc-master
+    REPO libimobiledevice/libideviceactivation
+    REF 067c439e0b18d6f1c8a37dde791f9d91191a922e # commits on 2023-05-01
+    SHA512 0afd74720abc6a1e47e035243879d291444b27667ce0a1908a4e66fea92185ff002e5390a1911ae95dc05d0bb0518a0043c77b531edcc5ac8b59c913aea9d487
+    HEAD_REF master
+    PATCHES
+        001_fix_static_build.patch
+        002_fix_api.patch
+        003_fix_tools_msvc.patch
 )
 
-configure_file("${CURRENT_PORT_DIR}/CMakeLists.txt" "${SOURCE_PATH}/CMakeLists.txt" COPYONLY)
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/exports.def" DESTINATION "${SOURCE_PATH}")
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        tools BUILD_TOOLS
+)
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        ${FEATURE_OPTIONS}
 )
 
 vcpkg_cmake_install()
-vcpkg_copy_pdbs()
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT})
+vcpkg_fixup_pkgconfig()
+if("tools" IN_LIST FEATURES)
+    vcpkg_copy_tools(TOOL_NAMES ideviceactivation AUTO_CLEAN)
+endif()
+
+file(READ "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake" cmake_config)
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake"
+"include(CMakeFindDependencyMacro)
+find_dependency(unofficial-libplist CONFIG)
+find_dependency(unofficial-libimobiledevice CONFIG)
+find_dependency(CURL CONFIG)
+find_dependency(LibXml2 CONFIG)
+${cmake_config}
+")
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-# Handle copyright
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/libideviceactivation/usage b/external_imported/vcpkg/ports/libideviceactivation/usage
new file mode 100644
index 000000000..7ba822f37
--- /dev/null
+++ b/external_imported/vcpkg/ports/libideviceactivation/usage
@@ -0,0 +1,4 @@
+libideviceactivation provides CMake targets:
+
+    find_package(unofficial-libideviceactivation CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE unofficial::libideviceactivation::libideviceactivation)
diff --git a/external_imported/vcpkg/ports/libideviceactivation/vcpkg.json b/external_imported/vcpkg/ports/libideviceactivation/vcpkg.json
index 7eadb89a3..855b589ca 100644
--- a/external_imported/vcpkg/ports/libideviceactivation/vcpkg.json
+++ b/external_imported/vcpkg/ports/libideviceactivation/vcpkg.json
@@ -1,7 +1,11 @@
 {
   "name": "libideviceactivation",
-  "version": "1.3.17",
+  "version-date": "2023-05-01",
+  "port-version": 1,
   "description": "A library to handle the activation process of iOS devices",
+  "homepage": "https://libimobiledevice.org/",
+  "license": "LGPL-2.1-or-later",
+  "supports": "!uwp",
   "dependencies": [
     "curl",
     "libimobiledevice",
@@ -10,6 +14,16 @@
     {
       "name": "vcpkg-cmake",
       "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
+  "features": {
+    "tools": {
+      "description": "build command line tool",
+      "supports": "!android & !ios & !xbox"
     }
-  ]
+  }
 }
diff --git a/external_imported/vcpkg/ports/libidn2/portfile.cmake b/external_imported/vcpkg/ports/libidn2/portfile.cmake
index 000dd544b..0fa9a5ddb 100644
--- a/external_imported/vcpkg/ports/libidn2/portfile.cmake
+++ b/external_imported/vcpkg/ports/libidn2/portfile.cmake
@@ -29,9 +29,9 @@ vcpkg_list(SET options)
 if("nls" IN_LIST FEATURES)
     vcpkg_list(APPEND options "--enable-nls")
 else()
-    set(ENV{AUTOPOINT} true) # true, the program
     vcpkg_list(APPEND options "--disable-nls")
 endif()
+set(ENV{AUTOPOINT} true) # true, the program
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     vcpkg_list(APPEND options "CPPFLAGS=\$CPPFLAGS -DIDN2_STATIC")
diff --git a/external_imported/vcpkg/ports/libidn2/vcpkg.json b/external_imported/vcpkg/ports/libidn2/vcpkg.json
index e56062289..f0c5add11 100644
--- a/external_imported/vcpkg/ports/libidn2/vcpkg.json
+++ b/external_imported/vcpkg/ports/libidn2/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libidn2",
   "version": "2.3.4",
-  "port-version": 2,
+  "port-version": 3,
   "description": "GNU Libidn is an implementation of the Stringprep, Punycode and IDNA 2003 specifications. Libidn's purpose is to encode and decode internationalized domain names.",
   "homepage": "https://www.gnu.org/software/libidn/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/libigl/dependencies.patch b/external_imported/vcpkg/ports/libigl/dependencies.patch
new file mode 100644
index 000000000..9308057d8
--- /dev/null
+++ b/external_imported/vcpkg/ports/libigl/dependencies.patch
@@ -0,0 +1,128 @@
+diff --git a/cmake/igl/modules/copyleft/cgal.cmake b/cmake/igl/modules/copyleft/cgal.cmake
+index f6abe8c..7ee7d84 100644
+--- a/cmake/igl/modules/copyleft/cgal.cmake
++++ b/cmake/igl/modules/copyleft/cgal.cmake
+@@ -14,13 +14,12 @@ file(GLOB SRC_FILES "${libigl_SOURCE_DIR}/include/igl/copyleft/cgal/*.cpp")
+ igl_target_sources(igl_copyleft_cgal ${INC_FILES} ${SRC_FILES})
+ 
+ # 4. Dependencies
+-include(cgal)
++find_package(CGAL CONFIG REQUIRED COMPONENTS Core)
+ igl_include(copyleft core)
+ target_link_libraries(igl_copyleft_cgal ${IGL_SCOPE}
+     igl::core
+     igl_copyleft::core
+     CGAL::CGAL
+-    CGAL::CGAL_Core
+ )
+ 
+ # 5. Unit tests
+diff --git a/cmake/igl/modules/core.cmake b/cmake/igl/modules/core.cmake
+index 2aefcd6..137d30b 100644
+--- a/cmake/igl/modules/core.cmake
++++ b/cmake/igl/modules/core.cmake
+@@ -20,7 +20,7 @@ igl_target_sources(igl_core ${INC_FILES} ${SRC_FILES})
+ igl_install(igl_core ${INC_FILES} ${SRC_FILES})
+ 
+ # 5. Dependencies
+-include(eigen)
++find_package(Eigen3 CONFIG REQUIRED)
+ find_package(Threads REQUIRED)
+ target_link_libraries(igl_core ${IGL_SCOPE}
+     Eigen3::Eigen
+diff --git a/cmake/igl/modules/embree.cmake b/cmake/igl/modules/embree.cmake
+index 6f22319..de85066 100644
+--- a/cmake/igl/modules/embree.cmake
++++ b/cmake/igl/modules/embree.cmake
+@@ -14,10 +14,10 @@ file(GLOB SRC_FILES "${libigl_SOURCE_DIR}/include/igl/embree/*.cpp")
+ igl_target_sources(igl_embree ${INC_FILES} ${SRC_FILES})
+ 
+ # 4. Dependencies
+-include(embree)
++find_package(embree 3 CONFIG REQUIRED)
+ target_link_libraries(igl_embree ${IGL_SCOPE}
+     igl::core
+-    embree::embree
++    $<TARGET_NAME:embree>
+ )
+ 
+ # 5. Unit tests
+diff --git a/cmake/igl/modules/glfw.cmake b/cmake/igl/modules/glfw.cmake
+index 79c2126..6d06775 100644
+--- a/cmake/igl/modules/glfw.cmake
++++ b/cmake/igl/modules/glfw.cmake
+@@ -14,12 +14,12 @@ file(GLOB SRC_FILES "${libigl_SOURCE_DIR}/include/igl/opengl/glfw/*.cpp")
+ igl_target_sources(igl_glfw ${INC_FILES} ${SRC_FILES})
+ 
+ # 4. Dependencies
+-include(glfw)
++find_package(glfw3 CONFIG REQUIRED)
+ igl_include(opengl)
+ target_link_libraries(igl_glfw ${IGL_SCOPE}
+     igl::core
+     igl::opengl
+-    glfw::glfw
++    $<TARGET_NAME:glfw>
+ )
+ 
+ # 5. Unit tests
+diff --git a/cmake/igl/modules/imgui.cmake b/cmake/igl/modules/imgui.cmake
+index d7ffb9d..f331854 100644
+--- a/cmake/igl/modules/imgui.cmake
++++ b/cmake/igl/modules/imgui.cmake
+@@ -14,14 +14,12 @@ file(GLOB SRC_FILES "${libigl_SOURCE_DIR}/include/igl/opengl/glfw/imgui/*.cpp")
+ igl_target_sources(igl_imgui ${INC_FILES} ${SRC_FILES})
+ 
+ # 4. Dependencies
+-include(imgui)
+-include(imguizmo)
+-include(libigl_imgui_fonts)
++find_package(imgui CONFIG REQUIRED)
++find_package(imguizmo CONFIG REQUIRED)
+ igl_include(glfw)
+ target_link_libraries(igl_imgui ${IGL_SCOPE}
+     igl::core
+     igl::glfw
+     imgui::imgui
+     imguizmo::imguizmo
+-    igl::imgui_fonts
+ )
+diff --git a/cmake/igl/modules/opengl.cmake b/cmake/igl/modules/opengl.cmake
+index 4580c03..dfadb38 100644
+--- a/cmake/igl/modules/opengl.cmake
++++ b/cmake/igl/modules/opengl.cmake
+@@ -14,7 +14,7 @@ file(GLOB SRC_FILES "${libigl_SOURCE_DIR}/include/igl/opengl/*.cpp")
+ igl_target_sources(igl_opengl ${INC_FILES} ${SRC_FILES})
+ 
+ # 4. Dependencies
+-include(glad)
++find_package(glad CONFIG REQUIRED)
+ find_package(OpenGL REQUIRED OPTIONAL_COMPONENTS OpenGL)
+ target_link_libraries(igl_opengl ${IGL_SCOPE}
+     igl::core
+diff --git a/cmake/igl/modules/xml.cmake b/cmake/igl/modules/xml.cmake
+index 3763b77..31ab979 100644
+--- a/cmake/igl/modules/xml.cmake
++++ b/cmake/igl/modules/xml.cmake
+@@ -14,7 +14,7 @@ file(GLOB SRC_FILES "${libigl_SOURCE_DIR}/include/igl/xml/*.cpp")
+ igl_target_sources(igl_xml ${INC_FILES} ${SRC_FILES})
+ 
+ # 4. Dependencies
+-include(tinyxml2)
++find_package(tinyxml2 CONFIG REQUIRED)
+ target_link_libraries(igl_xml ${IGL_SCOPE}
+     igl::core
+     tinyxml2::tinyxml2
+diff --git a/cmake/recipes/external/comiso.cmake b/cmake/recipes/external/comiso.cmake
+index d2879cb..5a0bd58 100644
+--- a/cmake/recipes/external/comiso.cmake
++++ b/cmake/recipes/external/comiso.cmake
+@@ -11,7 +11,7 @@ FetchContent_Declare(
+     GIT_TAG 536440e714f412e7ef6c0b96b90ba37b1531bb39
+ )
+ 
+-include(eigen)
++find_package(Eigen3 CONFIG REQUIRED)
+ 
+ FetchContent_MakeAvailable(comiso)
+ 
diff --git a/external_imported/vcpkg/ports/libigl/fix-config.patch b/external_imported/vcpkg/ports/libigl/fix-config.patch
deleted file mode 100644
index 523569b05..000000000
--- a/external_imported/vcpkg/ports/libigl/fix-config.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/cmake/libigl-config.cmake.in b/cmake/libigl-config.cmake.in
-index 21aa2468..0aa6d8a0 100644
---- a/cmake/libigl-config.cmake.in
-+++ b/cmake/libigl-config.cmake.in
-@@ -27,5 +27,23 @@ if (TARGET igl::common)
-   endif()
- endif()
- 
-+ include(CMakeFindDependencyMacro)
-+if (TARGET igl::embree)
-+  find_dependency(embree 3 CONFIG REQUIRED)
-+endif()
-+if (TARGET igl::xml)
-+  find_dependency(tinyxml2 CONFIG REQUIRED)
-+endif()
-+if (TARGET igl::opengl)
-+  find_dependency(OpenGL REQUIRED)
-+  find_dependency(glad CONFIG REQUIRED)
-+  if (TARGET igl::opengl_glfw)
-+    find_dependency(glfw3 CONFIG REQUIRED)
-+    if (TARGET igl::opengl_glfw_imgui)
-+      find_dependency(imgui CONFIG REQUIRED)
-+    endif()
-+  endif()
-+endif()
-+
- check_required_components(libigl)
- 
diff --git a/external_imported/vcpkg/ports/libigl/fix-dependency.patch b/external_imported/vcpkg/ports/libigl/fix-dependency.patch
deleted file mode 100644
index f7ed9f7f2..000000000
--- a/external_imported/vcpkg/ports/libigl/fix-dependency.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-diff --git a/cmake/LibiglWindows.cmake b/cmake/LibiglWindows.cmake
-index b98aa55..46c68a7 100644
---- a/cmake/LibiglWindows.cmake
-+++ b/cmake/LibiglWindows.cmake
-@@ -1,4 +1,4 @@
--if(MSVC)
-+if(0)
- 	option(IGL_STATIC_RUNTIME "Use libigl with the static MSVC runtime." OFF)
- 	if(IGL_STATIC_RUNTIME)
- 		message(STATUS "MSVC -> forcing use of statically-linked runtime.")
-diff --git a/cmake/libigl.cmake b/cmake/libigl.cmake
-index 6de1b41..46ecbf0 100644
---- a/cmake/libigl.cmake
-+++ b/cmake/libigl.cmake
-@@ -107,7 +107,8 @@ if(HUNTER_ENABLED)
- endif()
- 
- # Eigen
--if(NOT TARGET Eigen3::Eigen)
-+find_package(Eigen3 CONFIG REQUIRED)
-+if(0)
-   igl_download_eigen()
-   add_library(igl_eigen INTERFACE)
-   target_include_directories(igl_eigen SYSTEM INTERFACE
-@@ -296,9 +297,9 @@ endif()
- ################################################################################
- ### Compile the embree part ###
- if(LIBIGL_WITH_EMBREE)
--  set(EMBREE_DIR "${LIBIGL_EXTERNAL}/embree")
-+  find_package(embree 3 CONFIG REQUIRED)
- 
--  if(NOT TARGET embree)
-+  if(0)
-     igl_download_embree()
- 
-     # Note: On macOS, building embree as a static lib can only be done with a single ISA target.
-@@ -317,8 +318,11 @@ if(LIBIGL_WITH_EMBREE)
- 
-   compile_igl_module("embree")
-   target_link_libraries(igl_embree ${IGL_SCOPE} embree)
--  target_include_directories(igl_embree ${IGL_SCOPE} ${EMBREE_DIR}/include)
--  target_compile_definitions(igl_embree ${IGL_SCOPE} -DEMBREE_STATIC_LIB)
-+  if(LIBIGL_USE_STATIC_LIBRARY)
-+    find_package(TBB CONFIG REQUIRED)
-+    target_link_libraries(igl_embree ${IGL_SCOPE} TBB::tbb)
-+    target_compile_definitions(igl_embree ${IGL_SCOPE} -DEMBREE_STATIC_LIB)
-+  endif()
- endif()
- 
- ################################################################################
-@@ -359,11 +363,12 @@ if(LIBIGL_WITH_OPENGL)
-   endif()
- 
-   # glad module
--  if(NOT TARGET glad)
-+  find_package(glad CONFIG REQUIRED)
-+  if(0)
-     igl_download_glad()
-     add_subdirectory(${LIBIGL_EXTERNAL}/glad glad)
-   endif()
--  target_link_libraries(igl_opengl ${IGL_SCOPE} glad)
-+  target_link_libraries(igl_opengl ${IGL_SCOPE} glad::glad)
- endif()
- 
- ################################################################################
-@@ -372,7 +377,8 @@ if(LIBIGL_WITH_OPENGL_GLFW)
-   if(TARGET igl::opengl)
-     # GLFW module
-     compile_igl_module("opengl/glfw")
--    if(NOT TARGET glfw)
-+    find_package(glfw3 CONFIG REQUIRED)
-+    if(0)
-       igl_download_glfw()
-       option(GLFW_BUILD_EXAMPLES "Build the GLFW example programs" OFF)
-       option(GLFW_BUILD_TESTS "Build the GLFW test programs" OFF)
-@@ -395,17 +401,19 @@ if(LIBIGL_WITH_OPENGL_GLFW_IMGUI)
-   if(TARGET igl::opengl_glfw)
-     # ImGui module
-     compile_igl_module("opengl/glfw/imgui")
--    if(NOT TARGET imgui)
-+    find_package(imgui CONFIG REQUIRED)
-+    if(0)
-       igl_download_imgui()
-       add_subdirectory(${LIBIGL_EXTERNAL}/libigl-imgui imgui)
-     endif()
--    if(NOT TARGET imguizmo)
-+	find_package(imguizmo CONFIG REQUIRED)
-+    if(0)
-       igl_download_imguizmo()
-       add_library(imguizmo ${LIBIGL_EXTERNAL}/imguizmo/ImGuizmo.cpp ${LIBIGL_EXTERNAL}/imguizmo/ImGuizmo.h)
-       target_compile_features(imguizmo PUBLIC cxx_std_11)
-       target_link_libraries(imguizmo PUBLIC imgui)
-     endif()
--    target_link_libraries(igl_opengl_glfw_imgui ${IGL_SCOPE} igl_opengl_glfw imgui imguizmo)
-+    target_link_libraries(igl_opengl_glfw_imgui ${IGL_SCOPE} igl_opengl_glfw imgui::imgui imguizmo::imguizmo)
-   endif()
- endif()
- 
-@@ -415,12 +423,22 @@ if(LIBIGL_WITH_PNG)
-   # png/ module is anomalous because it also depends on opengl it really should
-   # be moved into the opengl/ directory and namespace ...
-   if(TARGET igl_opengl)
--    if(NOT TARGET stb_image)
-+    find_path(stb_include_dir stb.h)
-+    find_package(opengl REQUIRED)
-+    find_package(libpng CONFIG REQUIRED)
-+    find_package(glad CONFIG REQUIRED)
-+    if (BUILD_SHARED_LIBS)
-+        set(libpng_LIBRARIES png)
-+    else()
-+        set(libpng_LIBRARIES png_static)
-+    endif()
-+    if(0)
-       igl_download_stb()
-       add_subdirectory(${LIBIGL_EXTERNAL}/stb stb_image)
-     endif()
-     compile_igl_module("png" "")
--    target_link_libraries(igl_png ${IGL_SCOPE} igl_stb_image igl_opengl)
-+    target_include_directories(igl_png INTERFACE ${stb_include_dir})
-+    target_link_libraries(igl_png ${IGL_SCOPE} OpenGL::GL ${libpng_LIBRARIES} glad::glad)
-   endif()
- endif()
- 
-@@ -468,7 +486,8 @@ endif()
- ### Compile the xml part ###
- if(LIBIGL_WITH_XML)
-   set(TINYXML2_DIR "${LIBIGL_EXTERNAL}/tinyxml2")
--  if(NOT TARGET tinyxml2)
-+  find_package(tinyxml2 CONFIG REQUIRED)
-+  if(0)
-     igl_download_tinyxml2()
-     add_library(tinyxml2 STATIC ${TINYXML2_DIR}/tinyxml2.cpp ${TINYXML2_DIR}/tinyxml2.h)
-     target_include_directories(tinyxml2 PUBLIC ${TINYXML2_DIR})
-@@ -478,8 +497,7 @@ if(LIBIGL_WITH_XML)
-             SOVERSION "3")
-   endif()
-   compile_igl_module("xml")
--  target_link_libraries(igl_xml ${IGL_SCOPE} tinyxml2)
--  target_include_directories(igl_xml ${IGL_SCOPE} ${TINYXML2_DIR})
-+  target_link_libraries(igl_xml ${IGL_SCOPE} tinyxml2::tinyxml2)
- endif()
- 
- ################################################################################
-diff --git a/include/igl/opengl/glfw/imgui/ImGuiHelpers.h b/include/igl/opengl/glfw/imgui/ImGuiHelpers.h
-index 0663390..f35f097 100644
---- a/include/igl/opengl/glfw/imgui/ImGuiHelpers.h
-+++ b/include/igl/opengl/glfw/imgui/ImGuiHelpers.h
-@@ -10,7 +10,7 @@
- 
- ////////////////////////////////////////////////////////////////////////////////
- #include "ImGuiTraits.h"
--#include <imgui/imgui.h>
-+#include <imgui.h>
- #include <vector>
- #include <string>
- #include <algorithm>
-diff --git a/include/igl/opengl/glfw/imgui/ImGuiMenu.cpp b/include/igl/opengl/glfw/imgui/ImGuiMenu.cpp
-index c91c1cc..0836142 100644
---- a/include/igl/opengl/glfw/imgui/ImGuiMenu.cpp
-+++ b/include/igl/opengl/glfw/imgui/ImGuiMenu.cpp
-@@ -9,7 +9,7 @@
- #include "ImGuiMenu.h"
- #include "ImGuiHelpers.h"
- #include <igl/project.h>
--#include <imgui/imgui.h>
-+#include <imgui.h>
- #include <imgui_impl_glfw.h>
- #include <imgui_impl_opengl3.h>
- #include <imgui_fonts_droid_sans.h>
-diff --git a/include/igl/opengl/glfw/imgui/ImGuiTraits.h b/include/igl/opengl/glfw/imgui/ImGuiTraits.h
-index 7dae22a..e6911c5 100644
---- a/include/igl/opengl/glfw/imgui/ImGuiTraits.h
-+++ b/include/igl/opengl/glfw/imgui/ImGuiTraits.h
-@@ -8,7 +8,7 @@
- #ifndef IGL_OPENGL_GLFW_IMGUI_IMGUITRAITS_H
- #define IGL_OPENGL_GLFW_IMGUI_IMGUITRAITS_H
- 
--#include <imgui/imgui.h>
-+#include <imgui.h>
- 
- // Extend ImGui by populating its namespace directly
- namespace ImGui
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 2410c19..a7659a3 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -15,12 +15,11 @@ igl_download_test_data()
- set(IGL_TEST_DATA ${LIBIGL_EXTERNAL}/../tests/data)
- 
- ### Download Catch2 unit test framework
--igl_download_catch2()
-+find_package(Catch2 CONFIG REQUIRED)
- list(APPEND CMAKE_MODULE_PATH ${LIBIGL_EXTERNAL}/catch2/contrib)
- 
- 
- # Add catch2
--add_subdirectory(${LIBIGL_EXTERNAL}/catch2 catch2)
- 
- 
- # Create test executable
-diff --git a/tutorial/106_ViewerMenu/main.cpp b/tutorial/106_ViewerMenu/main.cpp
-index a8e49d6..c7946f9 100644
---- a/tutorial/106_ViewerMenu/main.cpp
-+++ b/tutorial/106_ViewerMenu/main.cpp
-@@ -2,7 +2,7 @@
- #include <igl/opengl/glfw/Viewer.h>
- #include <igl/opengl/glfw/imgui/ImGuiMenu.h>
- #include <igl/opengl/glfw/imgui/ImGuiHelpers.h>
--#include <imgui/imgui.h>
-+#include <imgui.h>
- #include <iostream>
- #include "tutorial_shared_path.h"
- 
diff --git a/external_imported/vcpkg/ports/libigl/install-extra-headers.patch b/external_imported/vcpkg/ports/libigl/install-extra-headers.patch
deleted file mode 100644
index 77ee2aa2a..000000000
--- a/external_imported/vcpkg/ports/libigl/install-extra-headers.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff --git a/cmake/libigl.cmake b/cmake/libigl.cmake
-index a33cefa..0014375 100644
---- a/cmake/libigl.cmake
-+++ b/cmake/libigl.cmake
-@@ -560,6 +560,85 @@ export(
- # Install headers for core library
- install_dir_files(core)
- install_dir_files(copyleft)
-+ 
-+if (LIBIGL_WITH_EMBREE)
-+    install_dir_files(embree)
-+#    if(NOT LIBIGL_USE_STATIC_LIBRARY)
-+    install(TARGETS igl_embree EXPORT igl-export)
-+    export(TARGETS igl_embree
-+        APPEND FILE libigl-export.cmake EXPORT_LINK_INTERFACE_LIBRARIES
-+    )
-+#    endif()
-+endif()
-+ 
-+if (LIBIGL_WITH_CGAL)
-+    install_dir_files(copyleft/cgal)
-+endif()
-+ 
-+if (LIBIGL_WITH_COMISO)
-+    install_dir_files(copyleft/comiso)
-+endif()
-+ 
-+if (LIBIGL_WITH_CORK)
-+    install_dir_files(copyleft/cork)
-+endif()
-+ 
-+if (LIBIGL_WITH_TETGEN)
-+    install_dir_files(copyleft/tetgen)
-+endif()
-+
-+if (LIBIGL_WITH_OPENGL OR LIBIGL_WITH_OPENGL_GLFW OR LIBIGL_WITH_OPENGL_GLFW_IMGUI)
-+    install_dir_files(copyleft/opengl2)
-+    install_dir_files(opengl)
-+#    if(NOT LIBIGL_USE_STATIC_LIBRARY)
-+    install(TARGETS igl_opengl EXPORT igl-export)
-+    export(TARGETS igl_opengl
-+        APPEND FILE libigl-export.cmake EXPORT_LINK_INTERFACE_LIBRARIES
-+    )
-+#    endif()
-+endif()
-+
-+if (LIBIGL_WITH_OPENGL_GLFW OR LIBIGL_WITH_OPENGL_GLFW_IMGUI)
-+    install_dir_files(opengl/glfw)
-+#    if(NOT LIBIGL_USE_STATIC_LIBRARY)
-+    install(TARGETS igl_opengl_glfw EXPORT igl-export)
-+    export(TARGETS igl_opengl_glfw
-+        APPEND FILE libigl-export.cmake EXPORT_LINK_INTERFACE_LIBRARIES
-+    )
-+#    endif()
-+endif()
-+
-+if (LIBIGL_WITH_OPENGL_GLFW_IMGUI)
-+    install_dir_files(opengl/glfw/imgui)
-+#    if(NOT LIBIGL_USE_STATIC_LIBRARY)
-+    install(TARGETS igl_opengl_glfw_imgui EXPORT igl-export)
-+    export(TARGETS igl_opengl_glfw_imgui
-+        APPEND FILE libigl-export.cmake EXPORT_LINK_INTERFACE_LIBRARIES
-+    )
-+#    endif()
-+endif()
-+
-+if (LIBIGL_WITH_PNG)
-+    install_dir_files(png)
-+endif()
-+
-+if (LIBIGL_WITH_PREDICATES)
-+    install_dir_files(predicates)
-+endif()
-+
-+if (LIBIGL_WITH_TRIANGLE)
-+    install_dir_files(triangle)
-+endif()
-+
-+if (LIBIGL_WITH_XML)
-+    install_dir_files(xml)
-+#    if(NOT LIBIGL_USE_STATIC_LIBRARY)
-+    install(TARGETS igl_xml EXPORT igl-export)
-+    export(TARGETS igl_xml
-+        APPEND FILE libigl-export.cmake EXPORT_LINK_INTERFACE_LIBRARIES
-+    )
-+#    endif()
-+endif()
- 
- # Write package configuration file
- configure_package_config_file(
diff --git a/external_imported/vcpkg/ports/libigl/install-extra-targets.patch b/external_imported/vcpkg/ports/libigl/install-extra-targets.patch
new file mode 100644
index 000000000..ea8320c68
--- /dev/null
+++ b/external_imported/vcpkg/ports/libigl/install-extra-targets.patch
@@ -0,0 +1,170 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4a98749..bc121a5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -166,7 +166,7 @@ if(LIBIGL_INSTALL)
+     set(version_config_file "${CMAKE_CURRENT_BINARY_DIR}/LibiglConfigVersion.cmake")
+     set(export_dest_dir "${CMAKE_INSTALL_LIBDIR}/cmake/igl")
+ 
+-    foreach(suffix IN ITEMS "") #"_restricted" "_copyleft")
++    foreach(suffix IN ITEMS "" "_copyleft") #  "_restricted"
+         install(EXPORT LibiglTargets${suffix}
+             DESTINATION ${export_dest_dir}
+             NAMESPACE igl${suffix}::
+diff --git a/cmake/igl/libigl-config.cmake.in b/cmake/igl/libigl-config.cmake.in
+index d3ff19f..60e50c7 100644
+--- a/cmake/igl/libigl-config.cmake.in
++++ b/cmake/igl/libigl-config.cmake.in
+@@ -4,4 +4,27 @@ include(CMakeFindDependencyMacro)
+ find_dependency(Eigen3 REQUIRED)
+ find_dependency(Threads REQUIRED)
+ include("${CMAKE_CURRENT_LIST_DIR}/LibiglConfigTargets.cmake")
++if(TARGET igl::igl_embree)
++  find_dependency(embree 3)
++endif()
++if(TARGET igl::igl_glfw)
++  find_dependency(glfw3)
++endif()
++if(TARGET igl::igl_imgui)
++  find_dependency(imgui)
++  find_dependency(imguizmo)
++endif()
++if(TARGET igl::igl_opengl)
++  find_dependency(OpenGL)
++  find_dependency(glad)
++endif()
++if(TARGET igl::igl_xml)
++  find_dependency(tinyxml2)
++endif()
++
++include("${CMAKE_CURRENT_LIST_DIR}/LibiglConfigTargets_copyleft.cmake" OPTIONAL)
++if(TARGET igl_copyleft::igl_copyleft_cgal)
++  find_dependency(CGAL)
++endif()
++
+ check_required_components(Libigl)
+diff --git a/cmake/igl/modules/copyleft/cgal.cmake b/cmake/igl/modules/copyleft/cgal.cmake
+index 7ee7d84..d06c6ee 100644
+--- a/cmake/igl/modules/copyleft/cgal.cmake
++++ b/cmake/igl/modules/copyleft/cgal.cmake
+@@ -9,7 +9,7 @@ target_include_directories(igl_copyleft_cgal ${IGL_SCOPE}
+ )
+ 
+ # 3. Target sources
+-file(GLOB INC_FILES "${libigl_SOURCE_DIR}/include/igl/copyleft/cgal/*.h")
++file(GLOB INC_FILES "${libigl_SOURCE_DIR}/include/igl/copyleft/cgal/*.h" "${libigl_SOURCE_DIR}/include/igl/copyleft/cgal/*.hpp")
+ file(GLOB SRC_FILES "${libigl_SOURCE_DIR}/include/igl/copyleft/cgal/*.cpp")
+ igl_target_sources(igl_copyleft_cgal ${INC_FILES} ${SRC_FILES})
+ 
+@@ -22,6 +22,8 @@ target_link_libraries(igl_copyleft_cgal ${IGL_SCOPE}
+     CGAL::CGAL
+ )
+ 
++igl_install(igl_copyleft_cgal ${INC_FILES} ${SRC_FILES})
++
+ # 5. Unit tests
+ file(GLOB SRC_FILES
+     "${libigl_SOURCE_DIR}/tests/include/igl/copyleft/boolean/*.cpp"
+@@ -31,3 +33,4 @@ igl_add_test(igl_copyleft_cgal ${SRC_FILES})
+ if(TARGET test_igl_copyleft_cgal)
+     igl_copy_dll(test_igl_copyleft_cgal)
+ endif()
++
+diff --git a/cmake/igl/modules/copyleft/core.cmake b/cmake/igl/modules/copyleft/core.cmake
+index 8d03a90..aff8241 100644
+--- a/cmake/igl/modules/copyleft/core.cmake
++++ b/cmake/igl/modules/copyleft/core.cmake
+@@ -17,3 +17,5 @@ igl_target_sources(igl_copyleft_core ${INC_FILES} ${SRC_FILES})
+ target_link_libraries(igl_copyleft_core ${IGL_SCOPE}
+     igl::core
+ )
++
++igl_install(igl_copyleft_core ${INC_FILES} ${SRC_FILES})
+diff --git a/cmake/igl/modules/core.cmake b/cmake/igl/modules/core.cmake
+index 137d30b..597c26b 100644
+--- a/cmake/igl/modules/core.cmake
++++ b/cmake/igl/modules/core.cmake
+@@ -12,8 +12,8 @@ target_include_directories(igl_core ${IGL_SCOPE}
+ )
+ 
+ # 3. Target sources
+-file(GLOB INC_FILES "${libigl_SOURCE_DIR}/include/igl/*.h")
+-file(GLOB SRC_FILES "${libigl_SOURCE_DIR}/include/igl/*.cpp")
++file(GLOB INC_FILES "${libigl_SOURCE_DIR}/include/igl/*.h" "${libigl_SOURCE_DIR}/include/igl/*.hpp")
++file(GLOB SRC_FILES "${libigl_SOURCE_DIR}/include/igl/*.cpp" "${libigl_SOURCE_DIR}/include/igl/*.c")
+ igl_target_sources(igl_core ${INC_FILES} ${SRC_FILES})
+ 
+ # 4. Install target & headers
+diff --git a/cmake/igl/modules/embree.cmake b/cmake/igl/modules/embree.cmake
+index de85066..c54949c 100644
+--- a/cmake/igl/modules/embree.cmake
++++ b/cmake/igl/modules/embree.cmake
+@@ -20,6 +20,8 @@ target_link_libraries(igl_embree ${IGL_SCOPE}
+     $<TARGET_NAME:embree>
+ )
+ 
++igl_install(igl_embree ${INC_FILES} ${SRC_FILES})
++
+ # 5. Unit tests
+ file(GLOB SRC_FILES "${libigl_SOURCE_DIR}/tests/include/igl/embree/*.cpp")
+ igl_add_test(igl_embree ${SRC_FILES})
+diff --git a/cmake/igl/modules/glfw.cmake b/cmake/igl/modules/glfw.cmake
+index 6d06775..7126a23 100644
+--- a/cmake/igl/modules/glfw.cmake
++++ b/cmake/igl/modules/glfw.cmake
+@@ -22,6 +22,9 @@ target_link_libraries(igl_glfw ${IGL_SCOPE}
+     $<TARGET_NAME:glfw>
+ )
+ 
++
++igl_install(igl_glfw ${INC_FILES} ${SRC_FILES})
++
+ # 5. Unit tests
+ if(LIBIGL_GLFW_TESTS)
+   file(GLOB SRC_FILES "${libigl_SOURCE_DIR}/tests/include/igl/opengl/glfw/*.cpp")
+diff --git a/cmake/igl/modules/imgui.cmake b/cmake/igl/modules/imgui.cmake
+index f331854..6e0de4c 100644
+--- a/cmake/igl/modules/imgui.cmake
++++ b/cmake/igl/modules/imgui.cmake
+@@ -23,3 +23,6 @@ target_link_libraries(igl_imgui ${IGL_SCOPE}
+     imgui::imgui
+     imguizmo::imguizmo
+ )
++
++igl_install(igl_imgui ${INC_FILES} ${SRC_FILES})
++
+diff --git a/cmake/igl/modules/opengl.cmake b/cmake/igl/modules/opengl.cmake
+index dfadb38..d3deaba 100644
+--- a/cmake/igl/modules/opengl.cmake
++++ b/cmake/igl/modules/opengl.cmake
+@@ -22,3 +22,6 @@ target_link_libraries(igl_opengl ${IGL_SCOPE}
+     # Link against OpenGL::OpenGL if available, or fallback to OpenGL::GL
+     $<IF:$<TARGET_EXISTS:OpenGL::OpenGL>,OpenGL::OpenGL,OpenGL::GL>
+ )
++
++igl_install(igl_opengl ${INC_FILES} ${SRC_FILES})
++
+diff --git a/cmake/igl/modules/xml.cmake b/cmake/igl/modules/xml.cmake
+index 31ab979..815ea62 100644
+--- a/cmake/igl/modules/xml.cmake
++++ b/cmake/igl/modules/xml.cmake
+@@ -19,3 +19,5 @@ target_link_libraries(igl_xml ${IGL_SCOPE}
+     igl::core
+     tinyxml2::tinyxml2
+ )
++
++igl_install(igl_xml ${INC_FILES} ${SRC_FILES})
+
+diff --git a/cmake/igl/modules/stb.cmake b/cmake/igl/modules/stb.cmake
+index 20607ec..5bc3211 100644
+--- a/cmake/igl/modules/stb.cmake
++++ b/cmake/igl/modules/stb.cmake
+@@ -21,7 +21,7 @@ endif()
+ igl_target_sources(igl_stb ${INC_FILES} ${SRC_FILES})
+ 
+ # 4. Dependencies
+-include(stb)
++find_package(Stb REQUIRED)
+ target_link_libraries(igl_stb ${IGL_SCOPE}
+     igl::core
+     stb::stb
diff --git a/external_imported/vcpkg/ports/libigl/portfile.cmake b/external_imported/vcpkg/ports/libigl/portfile.cmake
index 4c722d070..4860e7021 100644
--- a/external_imported/vcpkg/ports/libigl/portfile.cmake
+++ b/external_imported/vcpkg/ports/libigl/portfile.cmake
@@ -1,52 +1,74 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libigl/libigl
-    REF  e60423e28c86b6aa2a3f6eb0112e8fd881f96777 #2.3.0
-    SHA512 3fecb710825e58745c1d67eab694ee365a5b86151a5a1ca3758c1000c124059d38dbc78e8c6e941be6d85a716f928ed8fea42bb6007b8e24da0123332c2c96da
+    REF  fdaac01bcc52888994f7afd029dcc045dd408484 #2.5.0
+    SHA512 214f6af92026987d9ee3bad5e1849ef96d8455b1de38a03d068b7d7ab88b66a08f3a1f7c11b0cabc8d0744c19855ee2fdd544ac15ad826d117ef1ba97a318a2f
     HEAD_REF master
     PATCHES
-        fix-dependency.patch
-        install-extra-headers.patch
-        fix-config.patch
+        dependencies.patch
+        install-extra-targets.patch
+)
+file(REMOVE
+    "${SOURCE_PATH}/cmake/find/FindGMP.cmake"
+    "${SOURCE_PATH}/cmake/find/FindMPFR.cmake"
+    "${SOURCE_PATH}/cmake/recipes/external/boost.cmake"
+    "${SOURCE_PATH}/cmake/recipes/external/catch2.cmake"
+    "${SOURCE_PATH}/cmake/recipes/external/cgal.cmake"
+    "${SOURCE_PATH}/cmake/recipes/external/eigen.cmake"
+    "${SOURCE_PATH}/cmake/recipes/external/embree.cmake"
+    "${SOURCE_PATH}/cmake/recipes/external/glad.cmake"
+    "${SOURCE_PATH}/cmake/recipes/external/glfw.cmake"
+    "${SOURCE_PATH}/cmake/recipes/external/gmp.cmake"
+    "${SOURCE_PATH}/cmake/recipes/external/gmp_mpfr.cmake"
+    "${SOURCE_PATH}/cmake/recipes/external/imgui.cmake"
+    "${SOURCE_PATH}/cmake/recipes/external/imguizmo.cmake"
+    "${SOURCE_PATH}/cmake/recipes/external/libigl_imgui_fonts.cmake"
+    "${SOURCE_PATH}/cmake/recipes/external/mpfr.cmake"
+    "${SOURCE_PATH}/cmake/recipes/external/stb.cmake"
+    "${SOURCE_PATH}/cmake/recipes/external/tinyxml2.cmake"
+    "${SOURCE_PATH}/cmake/recipes/external/spectra.cmake"
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
-        embree LIBIGL_WITH_EMBREE
-        opengl LIBIGL_WITH_OPENGL
-        glfw   LIBIGL_WITH_OPENGL_GLFW
-        imgui  LIBIGL_WITH_OPENGL_GLFW_IMGUI
-        #png LIBIGL_WITH_PNG # Disable this feature due to issue https://github.com/libigl/libigl/issues/1199
-        xml    LIBIGL_WITH_XML
-        #python LIBIGL_WITH_PYTHON # Python binding are in the process of being redone.
-        cgal   LIBIGL_WITH_CGAL
+        cgal            LIBIGL_COPYLEFT_CGAL
+        embree          LIBIGL_EMBREE
+        glfw            LIBIGL_GLFW
+        imgui           LIBIGL_IMGUI
+        opengl          LIBIGL_OPENGL
+        xml             LIBIGL_XML
+        # Features removed: missing binary libs / separate ports
+        comiso          LIBIGL_COPYLEFT_COMISO
+        predicates      LIBIGL_PREDICATES
+        tetgen          LIBIGL_COPYLEFT_TETGEN
+        triangle        LIBIGL_RESTRICTED_TRIANGLE
 )
 
+set(VCPKG_BUILD_TYPE release) # header-only
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE
-    OPTIONS ${FEATURE_OPTIONS}
-        -DLIBIGL_BUILD_PYTHON=OFF
-        -DLIBIGL_EXPORT_TARGETS=ON
-        -DLIBIGL_USE_STATIC_LIBRARY=OFF # Header-only mode
-        -DLIBIGL_WITH_COMISO=OFF
-        -DLIBIGL_WITH_TETGEN=OFF
-        -DLIBIGL_WITH_TRIANGLE=OFF
-        -DLIBIGL_WITH_PREDICATES=OFF
-        -DLIBIGL_BUILD_TUTORIALS=OFF
-        -DLIBIGL_WITH_PNG=OFF
+    OPTIONS
+        ${FEATURE_OPTIONS}
         -DLIBIGL_BUILD_TESTS=OFF
-        -DPYTHON_EXECUTABLE=${PYTHON2}
-    MAYBE_UNUSED_VARIABLES
-        PYTHON_EXECUTABLE
+        -DLIBIGL_BUILD_TUTORIALS=OFF
+        -DLIBIGL_INSTALL=ON
+        -DLIBIGL_RESTRICTED_MATLAB=OFF
+        -DLIBIGL_RESTRICTED_MOSEK=OFF
+        -DLIBIGL_USE_STATIC_LIBRARY=OFF
+        -DHUNTER_ENABLED=OFF
+        -DLIBIGL_SPECTRA=OFF
+        ${ADDITIONAL_OPTIONS}
 )
 
 vcpkg_cmake_install()
-
-vcpkg_cmake_config_fixup(CONFIG_PATH share/libigl/cmake)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/igl)
 vcpkg_copy_pdbs()
 
-# libigl is a header-only library.
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE.GPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+if(NOT LIBIGL_COPYLEFT_CGAL)
+    vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.MPL2")
+else()
+    vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.MPL2" "${SOURCE_PATH}/LICENSE.GPL" COMMENT "GPL for targets in \"igl_copyleft::\" namespace.")
+endif()
diff --git a/external_imported/vcpkg/ports/libigl/vcpkg.json b/external_imported/vcpkg/ports/libigl/vcpkg.json
index fca500d19..7404a9c2e 100644
--- a/external_imported/vcpkg/ports/libigl/vcpkg.json
+++ b/external_imported/vcpkg/ports/libigl/vcpkg.json
@@ -1,13 +1,12 @@
 {
   "name": "libigl",
-  "version": "2.3.0",
-  "port-version": 2,
+  "version": "2.5.0",
   "description": "libigl is a simple C++ geometry processing library. We have a wide functionality including construction of sparse discrete differential geometry operators and finite-elements matrices such as the cotangent Laplacian and diagonalized mass matrix, simple facet and edge-based topology data structures, mesh-viewing utilities for OpenGL and GLSL, and many core functions for matrix manipulation which make Eigen feel a lot more like MATLAB.",
   "homepage": "https://github.com/libigl/libigl",
-  "license": "GPL-3.0-only",
-  "supports": "!(arm | uwp)",
+  "license": null,
   "dependencies": [
     "eigen3",
+    "stb",
     {
       "name": "vcpkg-cmake",
       "host": true
@@ -21,13 +20,19 @@
     "cgal": {
       "description": "Build with cgal",
       "dependencies": [
-        "cgal"
+        {
+          "name": "cgal",
+          "default-features": false
+        }
       ]
     },
     "embree": {
       "description": "Build with embree",
       "dependencies": [
-        "embree3"
+        {
+          "name": "embree3",
+          "default-features": false
+        }
       ]
     },
     "glfw": {
diff --git a/external_imported/vcpkg/ports/libimobiledevice-glue/001_fix_win32_defs.patch b/external_imported/vcpkg/ports/libimobiledevice-glue/001_fix_win32_defs.patch
new file mode 100644
index 000000000..f0dd322de
--- /dev/null
+++ b/external_imported/vcpkg/ports/libimobiledevice-glue/001_fix_win32_defs.patch
@@ -0,0 +1,57 @@
+diff --git a/include/libimobiledevice-glue/socket.h b/include/libimobiledevice-glue/socket.h
+index 53f58b8..f3cc6c6 100644
+--- a/include/libimobiledevice-glue/socket.h
++++ b/include/libimobiledevice-glue/socket.h
+@@ -32,7 +32,7 @@ enum fd_mode {
+ };
+ typedef enum fd_mode fd_mode;
+ 
+-#ifdef WIN32
++#ifdef _WIN32
+ #include <winsock2.h>
+ #define SHUT_RD SD_READ
+ #define SHUT_WR SD_WRITE
+@@ -41,7 +41,7 @@ typedef enum fd_mode fd_mode;
+ #include <sys/socket.h>
+ #endif
+ 
+-#ifndef WIN32
++#ifndef _WIN32
+ int socket_create_unix(const char *filename);
+ int socket_connect_unix(const char *filename);
+ #endif
+diff --git a/include/libimobiledevice-glue/thread.h b/include/libimobiledevice-glue/thread.h
+index 2aadc6e..b5c2ac1 100644
+--- a/include/libimobiledevice-glue/thread.h
++++ b/include/libimobiledevice-glue/thread.h
+@@ -24,7 +24,7 @@
+ 
+ #include <stddef.h>
+ 
+-#ifdef WIN32
++#ifdef _WIN32
+ #include <windows.h>
+ typedef HANDLE THREAD_T;
+ typedef CRITICAL_SECTION mutex_t;
+@@ -61,7 +61,7 @@ int thread_alive(THREAD_T thread);
+ 
+ int thread_cancel(THREAD_T thread);
+ 
+-#ifdef WIN32
++#ifdef _WIN32
+ #undef HAVE_THREAD_CLEANUP
+ #else
+ #ifdef HAVE_PTHREAD_CANCEL
+diff --git a/include/libimobiledevice-glue/utils.h b/include/libimobiledevice-glue/utils.h
+index 1a21871..2421270 100644
+--- a/include/libimobiledevice-glue/utils.h
++++ b/include/libimobiledevice-glue/utils.h
+@@ -29,7 +29,7 @@
+ #include <config.h>
+ #endif
+ 
+-#ifdef WIN32
++#ifdef _WIN32
+ #include <windows.h>
+ #endif
+ 
diff --git a/external_imported/vcpkg/ports/libimobiledevice-glue/002_fix_msvc.patch b/external_imported/vcpkg/ports/libimobiledevice-glue/002_fix_msvc.patch
new file mode 100644
index 000000000..d8a8c9871
--- /dev/null
+++ b/external_imported/vcpkg/ports/libimobiledevice-glue/002_fix_msvc.patch
@@ -0,0 +1,47 @@
+diff --git a/src/socket.c b/src/socket.c
+index 4b8b857..4cf8a92 100644
+--- a/src/socket.c
++++ b/src/socket.c
+@@ -26,10 +26,12 @@
+ #include <stddef.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <unistd.h>
+ #include <errno.h>
+-#include <sys/time.h>
+ #include <sys/stat.h>
++#ifndef _MSC_VER
++#include <unistd.h>
++#include <sys/time.h>
++#endif
+ #ifdef WIN32
+ #include <winsock2.h>
+ #include <ws2tcpip.h>
+diff --git a/src/termcolors.c b/src/termcolors.c
+index 5c436f2..9a84ff2 100644
+--- a/src/termcolors.c
++++ b/src/termcolors.c
+@@ -28,7 +28,9 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#ifndef _MSC_VER
+ #include <unistd.h>
++#endif
+ #include <string.h>
+ #include <stdarg.h>
+ 
+diff --git a/src/utils.c b/src/utils.c
+index ad8e9c4..b9803ac 100644
+--- a/src/utils.c
++++ b/src/utils.c
+@@ -30,7 +30,9 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <time.h>
++#ifndef _MSC_VER
+ #include <sys/time.h>
++#endif
+ #include <inttypes.h>
+ #include <ctype.h>
+ #include <errno.h>
diff --git a/external_imported/vcpkg/ports/libimobiledevice-glue/003_fix_static_build.patch b/external_imported/vcpkg/ports/libimobiledevice-glue/003_fix_static_build.patch
new file mode 100644
index 000000000..4e587cfd4
--- /dev/null
+++ b/external_imported/vcpkg/ports/libimobiledevice-glue/003_fix_static_build.patch
@@ -0,0 +1,19 @@
+diff --git a/src/glue.c b/src/glue.c
+index 7970679..bad3269 100644
+--- a/src/glue.c
++++ b/src/glue.c
+@@ -29,6 +29,8 @@
+ #include "common.h"
+ #include "libimobiledevice-glue/thread.h"
+ 
++#ifndef LIBIMOBILEDEVICEGLUE_STATIC  // disable dll constructor
++
+ extern void term_colors_init();
+ 
+ static void internal_glue_init(void)
+@@ -78,3 +80,5 @@ BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpReserved)
+ #else
+ #warning No compiler support for constructor/destructor attributes, some features might not be available.
+ #endif
++
++#endif  // disable dll constructor
diff --git a/external_imported/vcpkg/ports/libimobiledevice-glue/004_fix_api.patch b/external_imported/vcpkg/ports/libimobiledevice-glue/004_fix_api.patch
new file mode 100644
index 000000000..9eea9589c
--- /dev/null
+++ b/external_imported/vcpkg/ports/libimobiledevice-glue/004_fix_api.patch
@@ -0,0 +1,20 @@
+diff --git a/src/common.h b/src/common.h
+index bd22e3d..144a799 100644
+--- a/src/common.h
++++ b/src/common.h
+@@ -25,14 +25,10 @@
+ #include <config.h>
+ #endif
+ 
+-#ifdef WIN32
+-#define LIBIMOBILEDEVICE_GLUE_API __declspec( dllexport )
+-#else
+-#ifdef HAVE_FVISIBILITY
++#if !defined(_WIN32) && !defined(LIBIMOBILEDEVICEGLUE_STATIC)
+ #define LIBIMOBILEDEVICE_GLUE_API __attribute__((visibility("default")))
+ #else
+ #define LIBIMOBILEDEVICE_GLUE_API
+ #endif
+-#endif
+ 
+ #endif
diff --git a/external_imported/vcpkg/ports/libimobiledevice-glue/CMakeLists.txt b/external_imported/vcpkg/ports/libimobiledevice-glue/CMakeLists.txt
new file mode 100644
index 000000000..56bbaab60
--- /dev/null
+++ b/external_imported/vcpkg/ports/libimobiledevice-glue/CMakeLists.txt
@@ -0,0 +1,77 @@
+cmake_minimum_required(VERSION 3.15)
+project(libimobiledevice-glue C CXX)
+
+include(GNUInstallDirs)
+
+file(GLOB_RECURSE LIBIMOBILEDEVICEGLUE_SOURCE src/*.c)
+
+set(DEFINITIONS)
+
+if(BUILD_SHARED_LIBS)
+    if(WIN32)
+        list(APPEND LIBIMOBILEDEVICEGLUE_SOURCE exports.def)
+    endif()
+else()
+    list(APPEND DEFINITIONS -DLIBIMOBILEDEVICEGLUE_STATIC)
+endif()
+
+if(UNIX)
+    list(APPEND DEFINITIONS -DHAVE_GETIFADDRS)
+endif()
+
+if(WIN32)
+    list(APPEND DEFINITIONS -D_CRT_SECURE_NO_WARNINGS)
+    list(APPEND DEFINITIONS -DWIN32)
+endif()
+
+find_package(unofficial-libplist CONFIG REQUIRED)
+
+add_library(libimobiledevice-glue ${LIBIMOBILEDEVICEGLUE_SOURCE})
+target_include_directories(libimobiledevice-glue
+    PRIVATE
+        "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
+    PUBLIC
+        "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
+)
+target_compile_definitions(libimobiledevice-glue PRIVATE ${DEFINITIONS})
+target_link_libraries(libimobiledevice-glue 
+    PUBLIC
+        unofficial::libplist::libplist
+)
+set_target_properties(libimobiledevice-glue PROPERTIES OUTPUT_NAME imobiledevice-glue-1.0)
+
+if(WIN32)
+    target_link_libraries(libimobiledevice-glue PRIVATE Ws2_32 Iphlpapi)
+endif()
+
+install(TARGETS libimobiledevice-glue EXPORT unofficial-libimobiledevice-glue)
+
+install(
+    EXPORT unofficial-libimobiledevice-glue
+    FILE unofficial-libimobiledevice-glue-config.cmake
+    DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/unofficial-libimobiledevice-glue"
+    NAMESPACE unofficial::libimobiledevice-glue::
+)
+
+install(
+    DIRECTORY "${CMAKE_SOURCE_DIR}/include/libimobiledevice-glue"
+    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+)
+
+set(LIBPLIST_VERSION 2.0)
+set(PACKAGE_NAME libimobiledevice-glue)
+set(PACKAGE_VERSION 1.0)
+set(prefix "")
+set(exec_prefix "\${prefix}")
+set(libdir "\${prefix}/lib")
+set(includedir "\${prefix}/include")
+
+configure_file(
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/libimobiledevice-glue-1.0.pc.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/libimobiledevice-glue-1.0.pc"
+    @ONLY
+)
+install(
+    FILES "${CMAKE_CURRENT_BINARY_DIR}/libimobiledevice-glue-1.0.pc"
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
+)
diff --git a/external_imported/vcpkg/ports/libimobiledevice-glue/exports.def b/external_imported/vcpkg/ports/libimobiledevice-glue/exports.def
new file mode 100644
index 000000000..03aca563a
--- /dev/null
+++ b/external_imported/vcpkg/ports/libimobiledevice-glue/exports.def
@@ -0,0 +1,81 @@
+EXPORTS
+
+    ; src/cbuf.c
+    char_buf_new
+    char_buf_free
+    char_buf_append
+
+    ; src/collention.c
+    collection_init
+    collection_free
+    collection_add
+    collection_remove
+    collection_count
+    collection_copy
+
+    ; opack.c
+    opack_encode_from_plist
+    opack_decode_to_plist
+
+    ; src/socket.c
+    socket_set_verbose
+    socket_addr_to_string
+    ;socket_create_unix
+    ;socket_connect_unix
+    socket_create
+    get_primary_mac_address
+    socket_connect_addr
+    socket_connect
+    socket_check_fd
+    socket_accept
+    socket_shutdown
+    socket_close
+    socket_receive
+    socket_peek
+    socket_receive_timeout
+    socket_send
+    socket_get_socket_port
+
+    ; src/termcolors.c
+    term_colors_init
+    term_colors_set_enabled
+    cvfprintf
+    cfprintf
+    cprintf
+
+    ; src/thread.c
+    thread_new
+    thread_detach
+    thread_free
+    thread_join
+    thread_alive
+    thread_cancel
+    mutex_init
+    mutex_destroy
+    mutex_lock
+    mutex_unlock
+    thread_once
+    cond_init
+    cond_destroy
+    cond_signal
+    cond_wait
+    cond_wait_timeout
+
+    ; src/tlv.c
+    tlv_buf_new
+    tlv_buf_free
+    tlv_buf_append
+    tlv_get_data_ptr
+    tlv_data_get_uint
+    tlv_data_get_uint8
+    tlv_data_copy_data
+
+    ; src/utils.c
+    string_concat
+    string_append
+    string_build_path
+    string_format_size
+    string_toupper
+    generate_uuid
+    buffer_read_from_filename
+    buffer_write_to_filename
diff --git a/external_imported/vcpkg/ports/libimobiledevice-glue/portfile.cmake b/external_imported/vcpkg/ports/libimobiledevice-glue/portfile.cmake
new file mode 100644
index 000000000..7daca5189
--- /dev/null
+++ b/external_imported/vcpkg/ports/libimobiledevice-glue/portfile.cmake
@@ -0,0 +1,35 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO libimobiledevice/libimobiledevice-glue
+    REF 214bafdde6a1434ead87357afe6cb41b32318495 # commits on 2023-05-13
+    SHA512 a12ace7690ebab0ac6372f61e1a6722d506bc20a89130f39441af4da74e8fe9cdae45d947eb3e864a5f043b621432b59418f8e4660857e25b648a9476c552ac6
+    HEAD_REF master
+    PATCHES
+        001_fix_win32_defs.patch
+        002_fix_msvc.patch
+        003_fix_static_build.patch
+        004_fix_api.patch
+)
+
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/exports.def" DESTINATION "${SOURCE_PATH}")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT})
+vcpkg_fixup_pkgconfig()
+
+file(READ "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake" cmake_config)
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake"
+"include(CMakeFindDependencyMacro)
+find_dependency(unofficial-libplist CONFIG)
+${cmake_config}
+")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/libimobiledevice-glue/usage b/external_imported/vcpkg/ports/libimobiledevice-glue/usage
new file mode 100644
index 000000000..c4868a6be
--- /dev/null
+++ b/external_imported/vcpkg/ports/libimobiledevice-glue/usage
@@ -0,0 +1,4 @@
+libimobiledevice-glue provides CMake targets:
+
+    find_package(unofficial-libimobiledevice-glue CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE unofficial::libimobiledevice-glue::libimobiledevice-glue)
diff --git a/external_imported/vcpkg/ports/libimobiledevice-glue/vcpkg.json b/external_imported/vcpkg/ports/libimobiledevice-glue/vcpkg.json
new file mode 100644
index 000000000..79b8ab580
--- /dev/null
+++ b/external_imported/vcpkg/ports/libimobiledevice-glue/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "libimobiledevice-glue",
+  "version-date": "2023-05-13",
+  "description": "Library with common code used by the libraries and tools around the libimobiledevice project.",
+  "homepage": "https://libimobiledevice.org/",
+  "license": "LGPL-2.1-or-later",
+  "dependencies": [
+    "libplist",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/libimobiledevice/001_fix_msvc.patch b/external_imported/vcpkg/ports/libimobiledevice/001_fix_msvc.patch
new file mode 100644
index 000000000..bea25f00e
--- /dev/null
+++ b/external_imported/vcpkg/ports/libimobiledevice/001_fix_msvc.patch
@@ -0,0 +1,166 @@
+diff --git a/common/userpref.c b/common/userpref.c
+index b64c703..7ff325c 100644
+--- a/common/userpref.c
++++ b/common/userpref.c
+@@ -35,7 +35,9 @@
+ #ifndef WIN32
+ #include <pwd.h>
+ #endif
++#ifndef _MSC_VER
+ #include <unistd.h>
++#endif
+ #include <usbmuxd.h>
+ #if defined(HAVE_OPENSSL)
+ #include <openssl/bn.h>
+@@ -65,7 +67,9 @@
+ #endif
+ 
+ #include <dirent.h>
++#ifndef _MSC_VER
+ #include <libgen.h>
++#endif
+ #include <sys/stat.h>
+ #include <errno.h>
+ 
+diff --git a/include/libimobiledevice/libimobiledevice.h b/include/libimobiledevice/libimobiledevice.h
+index 6851145..55ef753 100644
+--- a/include/libimobiledevice/libimobiledevice.h
++++ b/include/libimobiledevice/libimobiledevice.h
+@@ -30,6 +30,11 @@
+ extern "C" {
+ #endif
+ 
++#if defined(_MSC_VER)
++#include <BaseTsd.h>
++typedef SSIZE_T ssize_t;
++#endif
++
+ #include <stdint.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+diff --git a/src/afc.c b/src/afc.c
+index d8c3db0..ab2c4ff 100644
+--- a/src/afc.c
++++ b/src/afc.c
+@@ -26,7 +26,9 @@
+ #endif
+ #include <stdio.h>
+ #include <stdlib.h>
++#ifndef _MSC_VER
+ #include <unistd.h>
++#endif
+ #include <string.h>
+ 
+ #include "afc.h"
+diff --git a/src/house_arrest.c b/src/house_arrest.c
+index ac92130..e12bde5 100644
+--- a/src/house_arrest.c
++++ b/src/house_arrest.c
+@@ -24,7 +24,9 @@
+ #endif
+ #include <string.h>
+ #include <stdlib.h>
++#ifndef _MSC_VER
+ #include <unistd.h>
++#endif
+ #include <plist/plist.h>
+ 
+ #include "house_arrest.h"
+diff --git a/src/installation_proxy.c b/src/installation_proxy.c
+index 9602876..2f02514 100644
+--- a/src/installation_proxy.c
++++ b/src/installation_proxy.c
+@@ -26,7 +26,9 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <inttypes.h>
++#ifndef _MSC_VER
+ #include <unistd.h>
++#endif
+ #include <plist/plist.h>
+ 
+ #include "installation_proxy.h"
+diff --git a/src/lockdown-cu.c b/src/lockdown-cu.c
+index d8d7f42..eb11afa 100644
+--- a/src/lockdown-cu.c
++++ b/src/lockdown-cu.c
+@@ -29,7 +29,9 @@
+ #define __USE_GNU 1
+ #include <stdio.h>
+ #include <ctype.h>
++#ifndef _MSC_VER
+ #include <unistd.h>
++#endif
+ #include <plist/plist.h>
+ 
+ #include "idevice.h"
+diff --git a/src/lockdown.c b/src/lockdown.c
+index 92af186..a9b9b88 100644
+--- a/src/lockdown.c
++++ b/src/lockdown.c
+@@ -32,7 +32,9 @@
+ #define __USE_GNU 1
+ #include <stdio.h>
+ #include <ctype.h>
++#ifndef _MSC_VER
+ #include <unistd.h>
++#endif
+ #include <plist/plist.h>
+ #include <libimobiledevice-glue/utils.h>
+ 
+diff --git a/src/misagent.c b/src/misagent.c
+index af925f9..5fe618e 100644
+--- a/src/misagent.c
++++ b/src/misagent.c
+@@ -24,7 +24,9 @@
+ #endif
+ #include <string.h>
+ #include <stdlib.h>
++#ifndef _MSC_VER
+ #include <unistd.h>
++#endif
+ #include <plist/plist.h>
+ #include <stdio.h>
+ 
+diff --git a/src/mobile_image_mounter.c b/src/mobile_image_mounter.c
+index 9ccfd85..c4f540c 100644
+--- a/src/mobile_image_mounter.c
++++ b/src/mobile_image_mounter.c
+@@ -24,7 +24,9 @@
+ #endif
+ #include <string.h>
+ #include <stdlib.h>
++#ifndef _MSC_VER
+ #include <unistd.h>
++#endif
+ #include <plist/plist.h>
+ 
+ #include "mobile_image_mounter.h"
+diff --git a/src/notification_proxy.c b/src/notification_proxy.c
+index e17e2fe..679739c 100644
+--- a/src/notification_proxy.c
++++ b/src/notification_proxy.c
+@@ -24,7 +24,9 @@
+ #endif
+ #include <string.h>
+ #include <stdlib.h>
++#ifndef _MSC_VER
+ #include <unistd.h>
++#endif
+ #include <plist/plist.h>
+ 
+ #include "notification_proxy.h"
+diff --git a/src/sbservices.c b/src/sbservices.c
+index ccb7c4b..f0b832e 100644
+--- a/src/sbservices.c
++++ b/src/sbservices.c
+@@ -24,7 +24,9 @@
+ #endif
+ #include <string.h>
+ #include <stdlib.h>
++#ifndef _MSC_VER
+ #include <unistd.h>
++#endif
+ #include <plist/plist.h>
+ 
+ #include "sbservices.h"
diff --git a/external_imported/vcpkg/ports/libimobiledevice/002_fix_static_build.patch b/external_imported/vcpkg/ports/libimobiledevice/002_fix_static_build.patch
new file mode 100644
index 000000000..3ea317b16
--- /dev/null
+++ b/external_imported/vcpkg/ports/libimobiledevice/002_fix_static_build.patch
@@ -0,0 +1,22 @@
+diff --git a/src/idevice.c b/src/idevice.c
+index 719cd28..0ae8a1c 100644
+--- a/src/idevice.c
++++ b/src/idevice.c
+@@ -124,6 +124,8 @@ static void id_function(CRYPTO_THREADID *thread)
+ #endif
+ #endif /* HAVE_OPENSSL */
+ 
++#ifndef LIBIMOBILEDEVICE_STATIC  // disable dll constructor
++
+ static void internal_idevice_init(void)
+ {
+ #if defined(HAVE_OPENSSL)
+@@ -219,6 +221,8 @@ BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpReserved)
+ #warning No compiler support for constructor/destructor attributes, some features might not be available.
+ #endif
+ 
++#endif  // disable dll constructor
++
+ struct idevice_subscription_context {
+ 	idevice_event_cb_t callback;
+ 	void *user_data;
diff --git a/external_imported/vcpkg/ports/libimobiledevice/003_fix_api.patch b/external_imported/vcpkg/ports/libimobiledevice/003_fix_api.patch
new file mode 100644
index 000000000..1558ab61f
--- /dev/null
+++ b/external_imported/vcpkg/ports/libimobiledevice/003_fix_api.patch
@@ -0,0 +1,21 @@
+diff --git a/src/idevice.h b/src/idevice.h
+index 2509e48..384f178 100644
+--- a/src/idevice.h
++++ b/src/idevice.h
+@@ -37,15 +37,11 @@
+ #include <mbedtls/ctr_drbg.h>
+ #endif
+ 
+-#ifdef WIN32
+-#define LIBIMOBILEDEVICE_API __declspec( dllexport )
+-#else
+-#ifdef HAVE_FVISIBILITY
++#if !defined(_WIN32) && !defined(LIBIMOBILEDEVICEGLUE_STATIC)
+ #define LIBIMOBILEDEVICE_API __attribute__((visibility("default")))
+ #else
+ #define LIBIMOBILEDEVICE_API
+ #endif
+-#endif
+ 
+ #include "common/userpref.h"
+ #include "libimobiledevice/libimobiledevice.h"
diff --git a/external_imported/vcpkg/ports/libimobiledevice/004_fix_tools_msvc.patch b/external_imported/vcpkg/ports/libimobiledevice/004_fix_tools_msvc.patch
new file mode 100644
index 000000000..395eb1d6d
--- /dev/null
+++ b/external_imported/vcpkg/ports/libimobiledevice/004_fix_tools_msvc.patch
@@ -0,0 +1,273 @@
+diff --git a/tools/idevicebackup.c b/tools/idevicebackup.c
+index 5694c12..77fd81f 100644
+--- a/tools/idevicebackup.c
++++ b/tools/idevicebackup.c
+@@ -50,7 +50,9 @@
+ #else
+ #error No supported crypto library enabled
+ #endif
++#ifndef _MSC_VER
+ #include <unistd.h>
++#endif
+ #include <ctype.h>
+ #include <time.h>
+ 
+@@ -68,6 +70,18 @@
+ #define LOCK_ATTEMPTS 50
+ #define LOCK_WAIT 200000
+ 
++#ifdef _MSC_VER
++static void usleep(__int64 usec) {
++    HANDLE timer;
++    LARGE_INTEGER ft;
++    ft.QuadPart = -(10*usec);
++    timer = CreateWaitableTimer(NULL, TRUE, NULL);
++    SetWaitableTimer(timer, &ft, 0, NULL, NULL, 0);
++    WaitForSingleObject(timer, INFINITE);
++    CloseHandle(timer);
++}
++#endif
++
+ #ifdef WIN32
+ #include <windows.h>
+ #define sleep(x) Sleep(x*1000)
+diff --git a/tools/idevicebackup2.c b/tools/idevicebackup2.c
+index c73b269..33157c9 100644
+--- a/tools/idevicebackup2.c
++++ b/tools/idevicebackup2.c
+@@ -31,9 +31,13 @@
+ #include <errno.h>
+ #include <stdlib.h>
+ #include <signal.h>
++#ifndef _MSC_VER
+ #include <unistd.h>
++#endif
+ #include <dirent.h>
++#ifndef _MSC_VER
+ #include <libgen.h>
++#endif
+ #include <ctype.h>
+ #include <time.h>
+ #include <getopt.h>
+@@ -54,6 +58,62 @@
+ #define LOCK_ATTEMPTS 50
+ #define LOCK_WAIT 200000
+ 
++#ifdef _MSC_VER
++static void usleep(__int64 usec) {
++    HANDLE timer;
++    LARGE_INTEGER ft;
++    ft.QuadPart = -(10*usec);
++    timer = CreateWaitableTimer(NULL, TRUE, NULL);
++    SetWaitableTimer(timer, &ft, 0, NULL, NULL, 0);
++    WaitForSingleObject(timer, INFINITE);
++    CloseHandle(timer);
++}
++#ifndef ISSLASH
++#define ISSLASH(C) ((C) == '/' || (C) == '\\')
++#endif
++#ifndef FILESYSTEM_PREFIX_LEN
++#define FILESYSTEM_PREFIX_LEN(Filename) 0
++#endif
++static char *basename(char const *name) {
++    char const *base = name + FILESYSTEM_PREFIX_LEN(name);
++    char const *p;
++
++    for (p = base; *p; p++) {
++        if (ISSLASH(*p)) {
++            do p++;
++            while (ISSLASH(*p));
++
++            if (!*p) {
++                if (ISSLASH(*base))
++                    base = p - 1;
++                break;
++            }
++            base = p;
++        }
++    }
++
++    return (char *) base;
++}
++static size_t dirlen(char const *path) {
++    size_t prefix_length = FILESYSTEM_PREFIX_LEN(path);
++    size_t length;
++    for (length = basename(path) - path; prefix_length < length; length--)
++        if (!ISSLASH(path[length - 1]))
++            return length;
++    return prefix_length + ISSLASH(path[prefix_length]);
++}
++static char *dirname(char const *path) {
++    size_t length = dirlen(path);
++    int append_dot = (length == FILESYSTEM_PREFIX_LEN(path));
++    char *newpath = (char *) malloc(length + append_dot + 1);
++    memcpy(newpath, path, length);
++    if (append_dot)
++        newpath[length++] = '.';
++    newpath[length] = 0;
++    return newpath;
++}
++#endif
++
+ #ifdef WIN32
+ #include <windows.h>
+ #include <conio.h>
+diff --git a/tools/idevicebtlogger.c b/tools/idevicebtlogger.c
+index 8de6b22..8fbf40d 100644
+--- a/tools/idevicebtlogger.c
++++ b/tools/idevicebtlogger.c
+@@ -31,7 +31,9 @@
+ #include <errno.h>
+ #include <signal.h>
+ #include <stdlib.h>
++#ifndef _MSC_VER
+ #include <unistd.h>
++#endif
+ #include <getopt.h>
+ #include <assert.h>
+ #include <fcntl.h>
+diff --git a/tools/idevicecrashreport.c b/tools/idevicecrashreport.c
+index 09bd537..9f53b30 100644
+--- a/tools/idevicecrashreport.c
++++ b/tools/idevicecrashreport.c
+@@ -29,7 +29,14 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#ifndef _MSC_VER
+ #include <unistd.h>
++#else
++#define S_IFIFO _S_IFIFO
++#define S_IFBLK 0x3000
++#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
++#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
++#endif
+ #include <getopt.h>
+ #ifndef WIN32
+ #include <signal.h>
+diff --git a/tools/idevicedebug.c b/tools/idevicedebug.c
+index 36c594e..9c11781 100644
+--- a/tools/idevicedebug.c
++++ b/tools/idevicedebug.c
+@@ -30,8 +30,12 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <time.h>
++#ifndef _MSC_VER
+ #include <unistd.h>
++#endif
++#ifndef _MSC_VER
+ #include <libgen.h>
++#endif
+ #include <getopt.h>
+ 
+ #ifdef WIN32
+diff --git a/tools/idevicedevmodectl.c b/tools/idevicedevmodectl.c
+index ba9b935..8e28e4b 100644
+--- a/tools/idevicedevmodectl.c
++++ b/tools/idevicedevmodectl.c
+@@ -30,7 +30,9 @@
+ #include <string.h>
+ #include <getopt.h>
+ #include <sys/stat.h>
++#ifndef _MSC_VER
+ #include <unistd.h>
++#endif
+ #include <errno.h>
+ #ifndef WIN32
+ #include <signal.h>
+diff --git a/tools/ideviceimagemounter.c b/tools/ideviceimagemounter.c
+index f551b6c..26bb80c 100644
+--- a/tools/ideviceimagemounter.c
++++ b/tools/ideviceimagemounter.c
+@@ -32,9 +32,13 @@
+ #include <string.h>
+ #include <getopt.h>
+ #include <errno.h>
++#ifndef _MSC_VER
+ #include <libgen.h>
++#endif
+ #include <time.h>
++#ifndef _MSC_VER
+ #include <sys/time.h>
++#endif
+ #include <inttypes.h>
+ #ifndef WIN32
+ #include <signal.h>
+diff --git a/tools/idevicename.c b/tools/idevicename.c
+index 69b76f6..cb8c9a6 100644
+--- a/tools/idevicename.c
++++ b/tools/idevicename.c
+@@ -27,7 +27,9 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
++#ifndef _MSC_VER
+ #include <unistd.h>
++#endif
+ #include <stdlib.h>
+ #include <getopt.h>
+ #ifndef WIN32
+diff --git a/tools/idevicepair.c b/tools/idevicepair.c
+index 94d3f04..129c409 100644
+--- a/tools/idevicepair.c
++++ b/tools/idevicepair.c
+@@ -31,7 +31,9 @@
+ #include <stdlib.h>
+ #include <getopt.h>
+ #include <ctype.h>
++#ifndef _MSC_VER
+ #include <unistd.h>
++#endif
+ #ifdef WIN32
+ #include <windows.h>
+ #include <conio.h>
+diff --git a/tools/ideviceprovision.c b/tools/ideviceprovision.c
+index 4080a28..f64e2c4 100644
+--- a/tools/ideviceprovision.c
++++ b/tools/ideviceprovision.c
+@@ -42,6 +42,14 @@
+ #include <arpa/inet.h>
+ #endif
+ 
++#ifdef _MSC_VER
++#include <Winsock2.h>
++#ifndef _S_ISTYPE
++#define _S_ISTYPE(mode, mask)  (((mode) & _S_IFMT) == (mask))
++#define S_ISDIR(mode) _S_ISTYPE((mode), _S_IFDIR)
++#endif
++#endif
++
+ #include <libimobiledevice/libimobiledevice.h>
+ #include <libimobiledevice/lockdown.h>
+ #include <libimobiledevice/misagent.h>
+diff --git a/tools/idevicescreenshot.c b/tools/idevicescreenshot.c
+index 0e694c7..6f4b1c5 100644
+--- a/tools/idevicescreenshot.c
++++ b/tools/idevicescreenshot.c
+@@ -31,7 +31,11 @@
+ #include <getopt.h>
+ #include <errno.h>
+ #include <time.h>
++#ifndef _MSC_VER
+ #include <unistd.h>
++#else
++#define F_OK 0
++#endif
+ #ifndef WIN32
+ #include <signal.h>
+ #endif
+diff --git a/tools/idevicesyslog.c b/tools/idevicesyslog.c
+index 5600be2..69b7b03 100644
+--- a/tools/idevicesyslog.c
++++ b/tools/idevicesyslog.c
+@@ -31,7 +31,9 @@
+ #include <errno.h>
+ #include <signal.h>
+ #include <stdlib.h>
++#ifndef _MSC_VER
+ #include <unistd.h>
++#endif
+ #include <getopt.h>
+ 
+ #ifdef WIN32
diff --git a/external_imported/vcpkg/ports/libimobiledevice/CMakeLists.txt b/external_imported/vcpkg/ports/libimobiledevice/CMakeLists.txt
index ab9866a4a..e8980cfcd 100644
--- a/external_imported/vcpkg/ports/libimobiledevice/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/libimobiledevice/CMakeLists.txt
@@ -1,61 +1,183 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.15)
 project(libimobiledevice C)
 
-# find dependencies
-find_library(libplist NAMES plist plist-2.0 libplist libplist-2.0 REQUIRED)
-find_library(libusbmuxd NAMES usbmuxd libusbmuxd REQUIRED)
-find_package(OpenSSL REQUIRED)
-find_path(dirent_INCLUDE_DIR dirent.h)
-if (WIN32)
-    find_library(getopt getopt REQUIRED)
+option(BUILD_TOOLS "Build tools." OFF)
+
+include(GNUInstallDirs)
+
+file(GLOB_RECURSE LIBIMOBILEDEVICE_SOURCE src/*.c src/*.h)
+file(GLOB_RECURSE LIBIMOBILEDEVICE_COMMON_SOURCE common/*.c common/*.h)
+
+set(DEFINITIONS)
+
+list(APPEND DEFINITIONS -DHAVE_OPENSSL)
+
+if(BUILD_SHARED_LIBS)
+    if(WIN32)
+        list(APPEND LIBIMOBILEDEVICE_SOURCE exports.def)
+    endif()
+else()
+    list(APPEND DEFINITIONS -DLIBIMOBILEDEVICE_STATIC)
 endif()
 
-# ready to create library
-file(GLOB_RECURSE IMOBDEV_COMMON_HDR common/*.h)
-file(GLOB_RECURSE IMOBDEV_COMMON_SRC common/*.c)
+if(UNIX)
+    list(APPEND DEFINITIONS -DHAVE_STPCPY)
+    list(APPEND DEFINITIONS -DHAVE_VASPRINTF)
+    list(APPEND DEFINITIONS -DHAVE_ASPRINTF)
+    list(APPEND DEFINITIONS -DHAVE_GETIFADDRS)
+endif()
 
-file(GLOB IMOBDEV_PUBLIC_HDR include/*.h)
-file(GLOB IMOBDEV_PUBLIC_SUB_HDR include/libimobiledevice/*.h)
-file(GLOB_RECURSE IMOBDEV_PRIVATE_HDR src/*.h)
-file(GLOB_RECURSE IMOBDEV_SRC src/*.c)
+if(WIN32)
+    list(APPEND DEFINITIONS -D_CRT_SECURE_NO_WARNINGS)
+    list(APPEND DEFINITIONS -DWIN32_LEAN_AND_MEAN)
+    list(APPEND DEFINITIONS -DWIN32)
+endif()
+
+find_package(unofficial-libplist CONFIG REQUIRED)
+find_package(unofficial-libimobiledevice-glue CONFIG REQUIRED)
+find_package(unofficial-libusbmuxd CONFIG REQUIRED)
+find_package(OpenSSL REQUIRED)
 
-add_library(libimobiledevice ${IMOBDEV_SRC} ${IMOBDEV_PUBLIC_HDR} ${IMOBDEV_PUBLIC_SUB_HDR} ${IMOBDEV_PRIVATE_HDR} ${IMOBDEV_COMMON_HDR} ${IMOBDEV_COMMON_SRC})
+add_library(libimobiledevice ${LIBIMOBILEDEVICE_SOURCE} ${LIBIMOBILEDEVICE_COMMON_SOURCE})
+target_include_directories(libimobiledevice PUBLIC
+    "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>"
+    "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
+    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
+)
+target_compile_definitions(libimobiledevice PRIVATE ${DEFINITIONS})
+target_link_libraries(libimobiledevice
+    PRIVATE
+        unofficial::libimobiledevice-glue::libimobiledevice-glue
+        unofficial::libusbmuxd::libusbmuxd
+        OpenSSL::SSL
+        OpenSSL::Crypto
+    PUBLIC
+        unofficial::libplist::libplist
+)
 set_target_properties(libimobiledevice PROPERTIES OUTPUT_NAME imobiledevice-1.0)
-target_include_directories(libimobiledevice PRIVATE ${dirent_INCLUDE_DIR} include .)
-target_compile_definitions(libimobiledevice PRIVATE -DHAVE_OPENSSL)
-target_link_libraries(libimobiledevice PRIVATE ${libplist} ${libusbmuxd} ${getopt} OpenSSL::SSL OpenSSL::Crypto)
-if (WIN32)
+
+if(WIN32)
     target_link_libraries(libimobiledevice PRIVATE Ws2_32)
 endif()
-if (UNIX)
-    target_compile_definitions(libimobiledevice PRIVATE -DHAVE_STPCPY -DHAVE_VASPRINTF -DHAVE_ASPRINTF -DHAVE_GETIFADDRS)
-endif()
 
-# install
+install(TARGETS libimobiledevice EXPORT unofficial-libimobiledevice)
+
 install(
-    TARGETS libimobiledevice
-    RUNTIME DESTINATION bin
-    ARCHIVE DESTINATION lib
-    LIBRARY DESTINATION lib
+    EXPORT unofficial-libimobiledevice
+    FILE unofficial-libimobiledevice-config.cmake
+    DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/unofficial-libimobiledevice"
+    NAMESPACE unofficial::libimobiledevice::
+)
+
+install(
+    DIRECTORY "${CMAKE_SOURCE_DIR}/include/libimobiledevice"
+    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+)
+
+install(
+    FILES "${CMAKE_SOURCE_DIR}/include/endianness.h"
+    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
 )
 
 set(LIBPLIST_VERSION 2.0)
+set(LIMD_GLUE_VERSION 1.0)
 set(LIBUSBMUXD_VERSION 2.0)
 set(PACKAGE_NAME libimobiledevice)
 set(PACKAGE_VERSION 1.0)
-set(prefix ${CMAKE_INSTALL_PREFIX})
-set(exec_prefix \${prefix})
-set(libdir \${prefix}/lib)
-set(includedir \${prefix}/../include)
+set(prefix "")
+set(exec_prefix "\${prefix}")
+set(libdir "\${prefix}/lib")
+set(includedir "\${prefix}/include")
+
 configure_file(
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/libimobiledevice-1.0.pc.in
-    ${CMAKE_CURRENT_BINARY_DIR}/libimobiledevice-1.0.pc
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/libimobiledevice-1.0.pc.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/libimobiledevice-1.0.pc"
     @ONLY
 )
 install(
-    FILES ${CMAKE_CURRENT_BINARY_DIR}/libimobiledevice-1.0.pc
-    DESTINATION lib/pkgconfig
+    FILES "${CMAKE_CURRENT_BINARY_DIR}/libimobiledevice-1.0.pc"
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
 )
 
-install(FILES ${IMOBDEV_PUBLIC_HDR} DESTINATION include)
-install(FILES ${IMOBDEV_PUBLIC_SUB_HDR} DESTINATION include/libimobiledevice)
\ No newline at end of file
+if(BUILD_TOOLS)
+    if(WIN32)
+        find_package(unofficial-getopt-win32 REQUIRED)
+    endif()
+
+    function(add_tool name source)
+        add_executable("${name}" "${source}" ${LIBIMOBILEDEVICE_COMMON_SOURCE})
+        target_compile_definitions("${name}" PRIVATE
+            -DPACKAGE_VERSION="2.0.2"
+            -DPACKAGE_URL="https://github.com/libimobiledevice/libusbmuxd"
+            -DPACKAGE_BUGREPORT="https://github.com/libimobiledevice/libusbmuxd/issues"
+            -DHAVE_OPENSSL
+        )
+        target_link_libraries("${name}" PRIVATE 
+            libimobiledevice
+            unofficial::libimobiledevice-glue::libimobiledevice-glue
+            unofficial::libusbmuxd::libusbmuxd
+            OpenSSL::SSL
+            OpenSSL::Crypto
+        )
+        if(WIN32)
+            target_compile_definitions("${name}" PRIVATE
+                -D_CRT_SECURE_NO_WARNINGS
+                -DWIN32_LEAN_AND_MEAN
+                -DWIN32
+            )
+            target_link_libraries("${name}" PRIVATE unofficial::getopt-win32::getopt Ws2_32)
+        endif()
+        if(UNIX)
+            target_compile_definitions("${name}" PRIVATE
+                -DHAVE_VASPRINTF
+                -DHAVE_ASPRINTF
+            )
+        endif()
+    endfunction(add_tool)
+
+    add_tool(idevice_id "tools/idevice_id.c")
+    add_tool(idevicebackup "tools/idevicebackup.c")
+    add_tool(idevicebackup2 "tools/idevicebackup2.c")
+    add_tool(idevicebtlogger "tools/idevicebtlogger.c")
+    add_tool(idevicecrashreport "tools/idevicecrashreport.c")
+    add_tool(idevicedate "tools/idevicedate.c")
+    add_tool(idevicedebug "tools/idevicedebug.c")
+    add_tool(idevicedebugserverproxy "tools/idevicedebugserverproxy.c")
+    add_tool(idevicedevmodectl "tools/idevicedevmodectl.c")
+    add_tool(idevicediagnostics "tools/idevicediagnostics.c")
+    add_tool(ideviceenterrecovery "tools/ideviceenterrecovery.c")
+    add_tool(ideviceimagemounter "tools/ideviceimagemounter.c")
+    add_tool(ideviceinfo "tools/ideviceinfo.c")
+    add_tool(idevicename "tools/idevicename.c")
+    add_tool(idevicenotificationproxy "tools/idevicenotificationproxy.c")
+    add_tool(idevicepair "tools/idevicepair.c")
+    add_tool(ideviceprovision "tools/ideviceprovision.c")
+    add_tool(idevicescreenshot "tools/idevicescreenshot.c")
+    add_tool(idevicesetlocation "tools/idevicesetlocation.c")
+    add_tool(idevicesyslog "tools/idevicesyslog.c")
+
+    install(
+        TARGETS
+            idevice_id
+            idevicebackup
+            idevicebackup2
+            idevicebtlogger
+            idevicecrashreport
+            idevicedate
+            idevicedebug
+            idevicedebugserverproxy
+            idevicedevmodectl
+            idevicediagnostics
+            ideviceenterrecovery
+            ideviceimagemounter
+            ideviceinfo
+            idevicename
+            idevicenotificationproxy
+            idevicepair
+            ideviceprovision
+            idevicescreenshot
+            idevicesetlocation
+            idevicesyslog
+        RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+    )
+endif()
diff --git a/external_imported/vcpkg/ports/libimobiledevice/exports.def b/external_imported/vcpkg/ports/libimobiledevice/exports.def
new file mode 100644
index 000000000..a9f63d084
--- /dev/null
+++ b/external_imported/vcpkg/ports/libimobiledevice/exports.def
@@ -0,0 +1,369 @@
+EXPORTS
+
+    ; src/mobilebackup2.c
+    mobilebackup2_client_new
+    mobilebackup2_client_start_service
+    mobilebackup2_client_free
+    mobilebackup2_send_message
+    mobilebackup2_receive_message
+    mobilebackup2_send_raw
+    mobilebackup2_receive_raw
+    mobilebackup2_version_exchange
+    mobilebackup2_send_request
+    mobilebackup2_send_status_response
+
+    ; src/misagent.c
+    misagent_client_new
+    misagent_client_start_service
+    misagent_client_free
+    misagent_install
+    misagent_copy
+    misagent_copy_all
+    misagent_remove
+    misagent_get_status_code
+
+    ; src/mobileactivation.c
+    mobileactivation_client_new
+    mobileactivation_client_start_service
+    mobileactivation_client_free
+    mobileactivation_get_activation_state
+    mobileactivation_create_activation_session_info
+    mobileactivation_create_activation_info
+    mobileactivation_create_activation_info_with_session
+    mobileactivation_activate
+    mobileactivation_activate_with_session
+    mobileactivation_deactivate
+
+    ; src/heartbeat.c
+    heartbeat_client_new
+    heartbeat_client_start_service
+    heartbeat_client_free
+    heartbeat_send
+    heartbeat_receive
+    heartbeat_receive_with_timeout
+
+    ; src/lockdown-cu.c
+    lockdownd_cu_pairing_create
+    lockdownd_cu_send_request_and_get_reply
+    lockdownd_get_value_cu
+    lockdownd_pair_cu
+
+    ; src/preboard.c
+    preboard_client_new
+    preboard_client_start_service
+    preboard_client_free
+    preboard_send
+    preboard_receive_with_timeout
+    preboard_receive
+    preboard_create_stashbag
+    preboard_commit_stashbag
+
+    ; src/screenshotr.c
+    screenshotr_client_new
+    screenshotr_client_start_service
+    screenshotr_client_free
+    screenshotr_take_screenshot
+
+    ; src/property_list_service.c
+    property_list_service_client_new
+    property_list_service_client_free
+    property_list_service_send_xml_plist
+    property_list_service_send_binary_plist
+    property_list_service_receive_plist_with_timeout
+    property_list_service_receive_plist
+    property_list_service_enable_ssl
+    property_list_service_disable_ssl
+    property_list_service_get_service_client
+
+    ; src/file_relay.c
+    file_relay_client_new
+    file_relay_client_start_service
+    file_relay_client_free
+    file_relay_request_sources_timeout
+    file_relay_request_sources
+
+    ; src/reverse_proxy.c
+    reverse_proxy_client_start_proxy
+    reverse_proxy_client_create_with_service
+    reverse_proxy_client_create_with_port
+    reverse_proxy_client_free
+    reverse_proxy_get_type
+    reverse_proxy_client_set_status_callback
+    reverse_proxy_client_set_log_callback
+    reverse_proxy_client_set_data_callback
+
+    ; src/service.c
+    service_client_new
+    service_client_factory_start_service
+    service_client_free
+    service_send
+    service_receive_with_timeout
+    service_receive
+    service_enable_ssl
+    service_disable_ssl
+    service_disable_bypass_ssl
+    service_get_connection
+
+    ; src/installation_proxy.c
+    instproxy_client_new
+    instproxy_client_start_service
+    instproxy_client_free
+    instproxy_browse_with_callback
+    instproxy_browse
+    instproxy_lookup
+    instproxy_install
+    instproxy_upgrade
+    instproxy_uninstall
+    instproxy_lookup_archives
+    instproxy_archive
+    instproxy_restore
+    instproxy_remove_archive
+    instproxy_check_capabilities_match
+    instproxy_status_get_error
+    instproxy_status_get_name
+    instproxy_status_get_percent_complete
+    instproxy_status_get_current_list
+    instproxy_command_get_name
+    instproxy_client_options_new
+    instproxy_client_options_add
+    instproxy_client_options_set_return_attributes
+    instproxy_client_options_free
+    instproxy_client_get_path_for_bundle_identifier
+
+    ; src/companion_proxy.c
+    companion_proxy_client_new
+    companion_proxy_client_start_service
+    companion_proxy_client_free
+    companion_proxy_send
+    companion_proxy_receive
+    companion_proxy_get_device_registry
+    companion_proxy_start_listening_for_devices
+    companion_proxy_stop_listening_for_devices
+    companion_proxy_get_value_from_registry
+    companion_proxy_start_forwarding_service_port
+    companion_proxy_stop_forwarding_service_port
+
+    ; src/restore.c
+    restored_client_free
+    restored_client_set_label
+    restored_receive
+    restored_send
+    restored_query_type
+    restored_query_value
+    restored_get_value
+    restored_client_new
+    restored_goodbye
+    restored_start_restore
+    restored_reboot
+
+    ; src/notification_proxy.c
+    np_client_new
+    np_client_start_service
+    np_client_free
+    np_post_notification
+    np_observe_notification
+    np_observe_notifications
+    np_set_notify_callback
+
+    ; src/house_arrest.c
+    house_arrest_client_new
+    house_arrest_client_start_service
+    house_arrest_client_free
+    house_arrest_send_request
+    house_arrest_send_command
+    house_arrest_get_result
+    afc_client_new_from_house_arrest_client
+
+    ; src/mobilesync.c
+    mobilesync_client_new
+    mobilesync_client_start_service
+    mobilesync_client_free
+    mobilesync_receive
+    mobilesync_send
+    mobilesync_start
+    mobilesync_finish
+    mobilesync_get_all_records_from_device
+    mobilesync_get_changes_from_device
+    mobilesync_receive_changes
+    mobilesync_clear_all_records_on_device
+    mobilesync_acknowledge_changes_from_device
+    mobilesync_ready_to_send_changes_from_computer
+    mobilesync_send_changes
+    mobilesync_remap_identifiers
+    mobilesync_cancel
+    mobilesync_anchors_new
+    mobilesync_anchors_free
+    mobilesync_actions_new
+    mobilesync_actions_add
+    mobilesync_actions_free
+
+    ; src/idevice.c
+    idevice_events_subscribe
+    idevice_events_unsubscribe
+    idevice_event_subscribe
+    idevice_event_unsubscribe
+    idevice_get_device_list_extended
+    idevice_device_list_extended_free
+    idevice_get_device_list
+    idevice_device_list_free
+    idevice_set_debug_level
+    idevice_new_with_options
+    idevice_new
+    idevice_free
+    idevice_connect
+    idevice_disconnect
+    idevice_connection_send
+    idevice_connection_receive_timeout
+    idevice_connection_receive
+    idevice_connection_get_fd
+    idevice_get_handle
+    idevice_get_udid
+    idevice_connection_enable_ssl
+    idevice_connection_disable_ssl
+    idevice_connection_disable_bypass_ssl
+
+    ; src/mobilebackup.c
+    mobilebackup_client_new
+    mobilebackup_client_start_service
+    mobilebackup_client_free
+    mobilebackup_receive
+    mobilebackup_send
+    mobilebackup_request_backup
+    mobilebackup_send_backup_file_received
+    mobilebackup_request_restore
+    mobilebackup_receive_restore_file_received
+    mobilebackup_receive_restore_application_received
+    mobilebackup_send_restore_complete
+    mobilebackup_send_error
+
+    ; src/diagnostics_relay.c
+    diagnostics_relay_client_new
+    diagnostics_relay_client_start_service
+    diagnostics_relay_client_free
+    diagnostics_relay_goodbye
+    diagnostics_relay_sleep
+    diagnostics_relay_restart
+    diagnostics_relay_shutdown
+    diagnostics_relay_request_diagnostics
+    diagnostics_relay_query_mobilegestalt
+    diagnostics_relay_query_ioregistry_entry
+    diagnostics_relay_query_ioregistry_plane
+
+    ; src/webinspector.c
+    webinspector_client_new
+    webinspector_client_start_service
+    webinspector_client_free
+    webinspector_send
+    webinspector_receive
+    webinspector_receive_with_timeout
+
+    ; src/afc.c
+    afc_client_new_with_service_client
+    afc_client_new
+    afc_client_start_service
+    afc_client_free
+    afc_read_directory
+    afc_get_device_info
+    afc_get_device_info_key
+    afc_remove_path
+    afc_rename_path
+    afc_make_directory
+    afc_get_file_info
+    afc_file_open
+    afc_file_read
+    afc_file_write
+    afc_file_close
+    afc_file_lock
+    afc_file_seek
+    afc_file_tell
+    afc_file_truncate
+    afc_truncate
+    afc_make_link
+    afc_set_file_time
+    afc_remove_path_and_contents
+    afc_dictionary_free
+
+    ; src/debugserver.c
+    debugserver_client_new
+    debugserver_client_start_service
+    debugserver_client_free
+    debugserver_client_send
+    debugserver_client_receive_with_timeout
+    debugserver_client_receive
+    debugserver_command_new
+    debugserver_command_free
+    debugserver_encode_string
+    debugserver_decode_string
+    debugserver_client_set_ack_mode
+    debugserver_client_set_receive_params
+    debugserver_client_receive_response
+    debugserver_client_send_command
+    debugserver_client_set_environment_hex_encoded
+    debugserver_client_set_argv
+
+    ; src/sbservices.c
+    sbservices_client_new
+    sbservices_client_start_service
+    sbservices_client_free
+    sbservices_get_icon_state
+    sbservices_set_icon_state
+    sbservices_get_icon_pngdata
+    sbservices_get_interface_orientation
+    sbservices_get_home_screen_wallpaper_pngdata
+
+    ; src/bt_packet_logger.c
+    bt_packet_logger_client_new
+    bt_packet_logger_client_start_service
+    bt_packet_logger_client_free
+    bt_packet_logger_receive_with_timeout
+    bt_packet_logger_start_capture
+    bt_packet_logger_stop_capture
+
+    ; src/mobile_image_mounter.c
+    mobile_image_mounter_new
+    mobile_image_mounter_start_service
+    mobile_image_mounter_free
+    mobile_image_mounter_lookup_image
+    mobile_image_mounter_upload_image
+    mobile_image_mounter_mount_image
+    mobile_image_mounter_hangup
+
+    ; src/lockdown.c
+    lockdownd_stop_session
+    lockdownd_client_free
+    lockdownd_client_set_label
+    lockdownd_receive
+    lockdownd_send
+    lockdownd_query_type
+    lockdownd_get_value
+    lockdownd_set_value
+    lockdownd_remove_value
+    lockdownd_get_device_udid
+    lockdownd_get_device_name
+    lockdownd_client_new
+    lockdownd_client_new_with_handshake
+    lockdownd_pair
+    lockdownd_pair_with_options
+    lockdownd_validate_pair
+    lockdownd_unpair
+    lockdownd_enter_recovery
+    lockdownd_goodbye
+    lockdownd_start_session
+    lockdownd_start_service
+    lockdownd_start_service_with_escrow_bag
+    lockdownd_activate
+    lockdownd_deactivate
+    lockdownd_get_sync_data_classes
+    lockdownd_data_classes_free
+    lockdownd_service_descriptor_free
+    lockdownd_strerror
+
+    ; src/syslog_relay.c
+    syslog_relay_client_new
+    syslog_relay_client_start_service
+    syslog_relay_client_free
+    syslog_relay_receive
+    syslog_relay_receive_with_timeout
+    syslog_relay_start_capture
+    syslog_relay_start_capture_raw
+    syslog_relay_stop_capture
diff --git a/external_imported/vcpkg/ports/libimobiledevice/portfile.cmake b/external_imported/vcpkg/ports/libimobiledevice/portfile.cmake
index 47d530b4e..81a788ff7 100644
--- a/external_imported/vcpkg/ports/libimobiledevice/portfile.cmake
+++ b/external_imported/vcpkg/ports/libimobiledevice/portfile.cmake
@@ -1,23 +1,71 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO libimobiledevice-win32/libimobiledevice
-    REF 0d4a7e905baeadafa098e629a5241fac6fbf7d24 # v1.3.17
-    SHA512 db6369b2fa8e7b659948602ac8c4cd568bf37c0f73e58150f61f1af7000de95aa1a6a9ae546d6a37de4cb08a8059127fe5ed067351c4092c01a45350586f755a
-    HEAD_REF msvc-master
+    REPO libimobiledevice/libimobiledevice
+    REF 6fc41f57fc607df9b07446ca45bdf754225c9bd9 # commits on 2023-07-05
+    SHA512 0ceae43eb5c193c173536a20a6efde44b0ff4b5e6029342f59cb6b0dcad2fd629713db922f17b331b5f359a649b5402c18637e636bcdb5eb5c53bec12ff94903
+    HEAD_REF master
+    PATCHES
+        001_fix_msvc.patch
+        002_fix_static_build.patch
+        003_fix_api.patch
+        004_fix_tools_msvc.patch
 )
 
-configure_file("${CURRENT_PORT_DIR}/CMakeLists.txt" "${SOURCE_PATH}/CMakeLists.txt" COPYONLY)
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/exports.def" DESTINATION "${SOURCE_PATH}")
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        tools BUILD_TOOLS
+)
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        ${FEATURE_OPTIONS}
 )
 
 vcpkg_cmake_install()
-vcpkg_copy_pdbs()
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT})
 vcpkg_fixup_pkgconfig()
+if("tools" IN_LIST FEATURES)
+    vcpkg_copy_tools(
+        TOOL_NAMES
+            idevice_id
+            idevicebackup
+            idevicebackup2
+            idevicebtlogger
+            idevicecrashreport
+            idevicedate
+            idevicedebug
+            idevicedebugserverproxy
+            idevicedevmodectl
+            idevicediagnostics
+            ideviceenterrecovery
+            ideviceimagemounter
+            ideviceinfo
+            idevicename
+            idevicenotificationproxy
+            idevicepair
+            ideviceprovision
+            idevicescreenshot
+            idevicesetlocation
+            idevicesyslog
+        AUTO_CLEAN
+    )
+endif()
+
+file(READ "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake" cmake_config)
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake"
+"include(CMakeFindDependencyMacro)
+find_dependency(unofficial-libplist CONFIG)
+find_dependency(unofficial-libimobiledevice-glue CONFIG)
+find_dependency(unofficial-libusbmuxd CONFIG)
+find_dependency(OpenSSL)
+${cmake_config}
+")
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-# Handle copyright
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
\ No newline at end of file
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/libimobiledevice/usage b/external_imported/vcpkg/ports/libimobiledevice/usage
index 922db8f3e..566ef2ba4 100644
--- a/external_imported/vcpkg/ports/libimobiledevice/usage
+++ b/external_imported/vcpkg/ports/libimobiledevice/usage
@@ -1,5 +1,4 @@
-libimobiledevice provides usage:
-
-    find_package(PkgConfig REQUIRED)
-    pkg_check_modules(LIBIMOBILEDEVICE REQUIRED IMPORTED_TARGET libimobiledevice-1.0)
-    target_link_libraries(main PRIVATE PkgConfig::LIBIMOBILEDEVICE)
+libimobiledevice provides CMake targets:
+
+    find_package(unofficial-libimobiledevice CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE unofficial::libimobiledevice::libimobiledevice)
diff --git a/external_imported/vcpkg/ports/libimobiledevice/vcpkg.json b/external_imported/vcpkg/ports/libimobiledevice/vcpkg.json
index 5fb2d2715..a288fe627 100644
--- a/external_imported/vcpkg/ports/libimobiledevice/vcpkg.json
+++ b/external_imported/vcpkg/ports/libimobiledevice/vcpkg.json
@@ -1,20 +1,33 @@
 {
   "name": "libimobiledevice",
-  "version": "1.3.17",
-  "port-version": 2,
+  "version-date": "2023-07-05",
+  "port-version": 1,
   "description": "A cross-platform protocol library to communicate with iOS devices",
   "homepage": "http://www.libimobiledevice.org",
-  "license": "LGPL-2.1-only",
+  "license": "LGPL-2.1-or-later",
+  "supports": "!uwp",
   "dependencies": [
     "dirent",
-    "getopt",
+    "libimobiledevice-glue",
     "libplist",
     "libusbmuxd",
     "openssl",
-    "pkgconf",
     {
       "name": "vcpkg-cmake",
       "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
+  "features": {
+    "tools": {
+      "description": "build command line tool",
+      "supports": "!android & !ios & !xbox",
+      "dependencies": [
+        "getopt"
+      ]
     }
-  ]
+  }
 }
diff --git a/external_imported/vcpkg/ports/libirecovery/001_fix_static_build.patch b/external_imported/vcpkg/ports/libirecovery/001_fix_static_build.patch
new file mode 100644
index 000000000..795bd076b
--- /dev/null
+++ b/external_imported/vcpkg/ports/libirecovery/001_fix_static_build.patch
@@ -0,0 +1,22 @@
+diff --git a/src/libirecovery.c b/src/libirecovery.c
+index 6e7647b..45ff6f2 100644
+--- a/src/libirecovery.c
++++ b/src/libirecovery.c
+@@ -470,6 +470,8 @@ static void _irecv_deinit(void)
+ static thread_once_t init_once = THREAD_ONCE_INIT;
+ static thread_once_t deinit_once = THREAD_ONCE_INIT;
+ 
++#ifndef IRECV_STATIC  // disable dll constructor
++
+ #ifndef HAVE_ATTRIBUTE_CONSTRUCTOR
+   #if defined(__llvm__) || defined(__GNUC__)
+     #define HAVE_ATTRIBUTE_CONSTRUCTOR
+@@ -505,6 +507,8 @@ BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpReserved)
+ #warning No compiler support for constructor/destructor attributes, some features might not be available.
+ #endif
+ 
++#endif  // disable dll constructor
++
+ #ifdef HAVE_IOKIT
+ static int iokit_get_string_descriptor_ascii(irecv_client_t client, uint8_t desc_index, unsigned char * buffer, int size)
+ {
diff --git a/external_imported/vcpkg/ports/libirecovery/002_fix_api.patch b/external_imported/vcpkg/ports/libirecovery/002_fix_api.patch
new file mode 100644
index 000000000..ae02df6b5
--- /dev/null
+++ b/external_imported/vcpkg/ports/libirecovery/002_fix_api.patch
@@ -0,0 +1,24 @@
+diff --git a/include/libirecovery.h b/include/libirecovery.h
+index 33879a4..41fc8bb 100644
+--- a/include/libirecovery.h
++++ b/include/libirecovery.h
+@@ -30,17 +30,13 @@ extern "C" {
+ #ifdef IRECV_STATIC
+   #define IRECV_API
+ #elif defined(_WIN32)
+-  #ifdef DLL_EXPORT
++  #ifdef IRECV_EXPORT
+     #define IRECV_API __declspec(dllexport)
+   #else
+     #define IRECV_API __declspec(dllimport)
+   #endif
+ #else
+-  #if __GNUC__ >= 4
+-    #define IRECV_API __attribute__((visibility("default")))
+-  #else
+-    #define IRECV_API
+-  #endif
++  #define IRECV_API __attribute__((visibility("default")))
+ #endif
+ 
+ enum irecv_mode {
diff --git a/external_imported/vcpkg/ports/libirecovery/003_fix_msvc.patch b/external_imported/vcpkg/ports/libirecovery/003_fix_msvc.patch
new file mode 100644
index 000000000..66852ec42
--- /dev/null
+++ b/external_imported/vcpkg/ports/libirecovery/003_fix_msvc.patch
@@ -0,0 +1,25 @@
+diff --git a/src/libirecovery.c b/src/libirecovery.c
+index 45ff6f2..d9ff1e6 100644
+--- a/src/libirecovery.c
++++ b/src/libirecovery.c
+@@ -29,7 +29,9 @@
+ #include <string.h>
+ #include <inttypes.h>
+ #include <ctype.h>
++#ifndef _MSC_VER
+ #include <unistd.h>
++#endif
+ #include <sys/stat.h>
+ 
+ #include <libimobiledevice-glue/collection.h>
+@@ -59,6 +61,10 @@
+ 
+ #include "libirecovery.h"
+ 
++#ifdef _MSC_VER
++#define strcasecmp _stricmp
++#endif
++
+ struct irecv_client_private {
+ 	int debug;
+ 	int usb_config;
diff --git a/external_imported/vcpkg/ports/libirecovery/004_fix_tools_msvc.patch b/external_imported/vcpkg/ports/libirecovery/004_fix_tools_msvc.patch
new file mode 100644
index 000000000..b29d98f2e
--- /dev/null
+++ b/external_imported/vcpkg/ports/libirecovery/004_fix_tools_msvc.patch
@@ -0,0 +1,14 @@
+diff --git a/tools/irecovery.c b/tools/irecovery.c
+index 34e80bf..deffe89 100644
+--- a/tools/irecovery.c
++++ b/tools/irecovery.c
+@@ -27,7 +27,9 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#ifndef _MSC_VER
+ #include <unistd.h>
++#endif
+ #include <string.h>
+ #include <getopt.h>
+ #include <inttypes.h>
diff --git a/external_imported/vcpkg/ports/libirecovery/CMakeLists.txt b/external_imported/vcpkg/ports/libirecovery/CMakeLists.txt
new file mode 100644
index 000000000..5345b3298
--- /dev/null
+++ b/external_imported/vcpkg/ports/libirecovery/CMakeLists.txt
@@ -0,0 +1,125 @@
+cmake_minimum_required(VERSION 3.15)
+project(libirecovery C)
+
+option(BUILD_TOOLS "Build tools." OFF)
+
+include(GNUInstallDirs)
+
+file(GLOB_RECURSE LIBIRECOVERY_HEADER include/*.h)
+file(GLOB_RECURSE LIBIRECOVERY_SOURCE src/*.c)
+
+set(DEFINITIONS)
+
+if(BUILD_SHARED_LIBS)
+    if(WIN32)
+        list(APPEND DEFINITIONS -DIRECV_EXPORT)
+    endif()
+else()
+    list(APPEND DEFINITIONS -DIRECV_STATIC)
+endif()
+
+if(APPLE)
+    list(APPEND DEFINITIONS -DHAVE_IOKIT)
+endif()
+
+if(WIN32)
+    list(APPEND DEFINITIONS -D_CRT_SECURE_NO_WARNINGS)
+    list(APPEND DEFINITIONS -DWIN32_LEAN_AND_MEAN)
+    list(APPEND DEFINITIONS -DWIN32)
+endif()
+
+find_package(unofficial-libimobiledevice-glue CONFIG REQUIRED)
+
+add_library(libirecovery ${LIBIRECOVERY_SOURCE})
+target_include_directories(libirecovery PUBLIC
+    "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
+    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
+)
+target_compile_definitions(libirecovery PRIVATE ${DEFINITIONS})
+target_link_libraries(libirecovery
+    PRIVATE
+        unofficial::libimobiledevice-glue::libimobiledevice-glue
+)
+if(NOT WIN32 AND NOT APPLE)
+    find_package(PkgConfig REQUIRED)
+    pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0)
+    target_link_libraries(libirecovery PRIVATE PkgConfig::libusb)
+endif()
+set_target_properties(libirecovery PROPERTIES OUTPUT_NAME irecovery-1.0)
+
+if(WIN32)
+    target_link_libraries(libirecovery PRIVATE Setupapi)
+endif()
+
+if(APPLE)
+    target_link_libraries(libirecovery PRIVATE "-framework IOKit" "-framework CoreFoundation")
+endif()
+
+install(TARGETS libirecovery EXPORT unofficial-libirecovery)
+
+install(
+    EXPORT unofficial-libirecovery
+    FILE unofficial-libirecovery-config.cmake
+    DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/unofficial-libirecovery"
+    NAMESPACE unofficial::libirecovery::
+)
+
+install(
+    FILES ${LIBIRECOVERY_HEADER}
+    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+)
+
+set(LIMD_GLUE_VERSION 1.0)
+set(PACKAGE_NAME libirecovery)
+set(PACKAGE_VERSION 1.0)
+set(prefix "")
+set(exec_prefix "\${prefix}")
+set(libdir "\${prefix}/lib")
+set(includedir "\${prefix}/include")
+
+configure_file(
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/libirecovery-1.0.pc.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/libirecovery-1.0.pc"
+    @ONLY
+)
+install(
+    FILES "${CMAKE_CURRENT_BINARY_DIR}/libirecovery-1.0.pc"
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
+)
+
+if(BUILD_TOOLS)
+    add_executable(irecovery "tools/irecovery.c")
+    target_compile_definitions(irecovery PRIVATE
+        -DPACKAGE_VERSION="1.1.0"
+        -DPACKAGE_URL="https://github.com/libimobiledevice/libirecovery"
+        -DPACKAGE_BUGREPORT="https://github.com/libimobiledevice/libirecovery/issues"
+    )
+    if(NOT BUILD_SHARED_LIBS)
+        target_compile_definitions(irecovery PRIVATE -DIRECV_STATIC)
+    endif()
+    if(WIN32)
+        target_compile_definitions(irecovery PRIVATE
+            -D_CRT_SECURE_NO_WARNINGS
+            -DWIN32_LEAN_AND_MEAN
+            -DWIN32
+        )
+        find_package(unofficial-getopt-win32 REQUIRED)
+        target_link_libraries(irecovery PRIVATE unofficial::getopt-win32::getopt Ws2_32)
+    endif()
+    if(APPLE)
+        target_compile_definitions(irecovery PRIVATE -DHAVE_IOKIT)
+        target_link_libraries(irecovery PRIVATE "-framework IOKit" "-framework CoreFoundation")
+    endif()
+    if(NOT WIN32 AND NOT APPLE)
+        find_package(PkgConfig REQUIRED)
+        pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0)
+        target_link_libraries(irecovery PRIVATE PkgConfig::libusb)
+    endif()
+    find_package(PkgConfig REQUIRED)
+    pkg_check_modules(readline REQUIRED IMPORTED_TARGET readline)
+    target_link_libraries(irecovery PRIVATE libirecovery PkgConfig::readline)
+    install(
+        TARGETS irecovery
+        RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+    )
+endif()
diff --git a/external_imported/vcpkg/ports/libirecovery/portfile.cmake b/external_imported/vcpkg/ports/libirecovery/portfile.cmake
index 5fd9c0ee8..2ef67eda4 100644
--- a/external_imported/vcpkg/ports/libirecovery/portfile.cmake
+++ b/external_imported/vcpkg/ports/libirecovery/portfile.cmake
@@ -1,20 +1,63 @@
-vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO libimobiledevice-win32/libirecovery
-    REF 1.0.25
-    SHA512 0dd91d4fe3ded2bc1bbd91aea964e31e7f59bce18be01aa096e974f37dc1be281644d6c44e3f9b49470dd961e3df2e3ff8a09bcc6b803a959073e7d7d9a8d3e7
-    HEAD_REF msvc-master
+    REPO libimobiledevice/libirecovery
+    REF c7b488fbf2a9ab95e451df1319e68662fff7b9b7 # commits on 2023-05-13
+    SHA512 a8638b71789c0cedf5913a877ca42fef079c968592b6149dfa578d2dc7840f63c1d1fadd934d7cfbd5139cea2b3a4249886a88b69c3edb19dbd3f893c266f665
+    HEAD_REF master
+    PATCHES
+        001_fix_static_build.patch
+        002_fix_api.patch
+        003_fix_msvc.patch
+        004_fix_tools_msvc.patch
 )
 
-vcpkg_install_msbuild(
-    SOURCE_PATH ${SOURCE_PATH}
-    PROJECT_SUBPATH libirecovery.sln
-    INCLUDES_SUBPATH include
-    LICENSE_SUBPATH COPYING
-    USE_VCPKG_INTEGRATION
-    ALLOW_ROOT_INCLUDES
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        tools BUILD_TOOLS
+)
+
+if("tools" IN_LIST FEATURES)
+    vcpkg_find_acquire_program(PKGCONFIG)
+    list(APPEND FEATURE_OPTIONS "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}")
+endif()
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        ${FEATURE_OPTIONS}
 )
 
-file(REMOVE ${CURRENT_PACKAGES_DIR}/include/Makefile.am)
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT})
+vcpkg_fixup_pkgconfig()
+if("tools" IN_LIST FEATURES)
+    vcpkg_copy_tools(TOOL_NAMES irecovery AUTO_CLEAN)
+endif()
+
+if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libirecovery.h"
+        "#ifdef IRECV_STATIC" "#if 1"
+    )
+else()
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libirecovery.h"
+        "#ifdef IRECV_STATIC" "#if 0"
+    )
+endif()
+
+file(READ "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake" cmake_config)
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake"
+"include(CMakeFindDependencyMacro)
+find_dependency(unofficial-libimobiledevice-glue CONFIG)
+if(NOT WIN32 AND NOT APPLE)
+    find_package(PkgConfig REQUIRED)
+    pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0)
+endif()
+${cmake_config}
+")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/libirecovery/usage b/external_imported/vcpkg/ports/libirecovery/usage
new file mode 100644
index 000000000..fbb5c0152
--- /dev/null
+++ b/external_imported/vcpkg/ports/libirecovery/usage
@@ -0,0 +1,4 @@
+libirecovery provides CMake targets:
+
+    find_package(unofficial-libirecovery CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE unofficial::libirecovery::libirecovery)
diff --git a/external_imported/vcpkg/ports/libirecovery/vcpkg.json b/external_imported/vcpkg/ports/libirecovery/vcpkg.json
index 2a9a35287..ac8b91957 100644
--- a/external_imported/vcpkg/ports/libirecovery/vcpkg.json
+++ b/external_imported/vcpkg/ports/libirecovery/vcpkg.json
@@ -1,13 +1,34 @@
 {
   "name": "libirecovery",
-  "version": "1.0.25",
-  "port-version": 6,
+  "version-date": "2023-05-13",
+  "port-version": 2,
   "description": "Library and utility to talk to iBoot/iBSS via USB on Mac OS X, Windows, and Linux",
-  "license": "LGPL-2.1-only",
-  "supports": "windows & !arm64 & !static & !staticcrt",
+  "homepage": "https://libimobiledevice.org/",
+  "license": "LGPL-2.1-or-later",
+  "supports": "!uwp",
   "dependencies": [
-    "getopt",
-    "libusbmuxd",
-    "readline"
-  ]
+    "libimobiledevice-glue",
+    {
+      "name": "libusb",
+      "platform": "!windows & !osx"
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
+  "features": {
+    "tools": {
+      "description": "build command line tool",
+      "supports": "!android & !ios & !xbox",
+      "dependencies": [
+        "getopt",
+        "readline"
+      ]
+    }
+  }
 }
diff --git a/external_imported/vcpkg/ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch b/external_imported/vcpkg/ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch
index 9c4efd37e..32d679a7a 100644
--- a/external_imported/vcpkg/ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch
+++ b/external_imported/vcpkg/ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c384aae..c9a15a0 100644
+index adb0ca45..e66928bf 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -194,6 +194,12 @@ option(ENABLE_SHARED "Build shared libraries" TRUE)
+@@ -222,6 +222,12 @@ option(ENABLE_SHARED "Build shared libraries" TRUE)
  boolean_number(ENABLE_SHARED)
  option(ENABLE_STATIC "Build static libraries" TRUE)
  boolean_number(ENABLE_STATIC)
@@ -14,8 +14,8 @@ index c384aae..c9a15a0 100644
 +boolean_number(INSTALL_HEADERS)
  option(REQUIRE_SIMD "Generate a fatal error if SIMD extensions are not available for this platform (default is to fall back to a non-SIMD build)" FALSE)
  boolean_number(REQUIRE_SIMD)
- option(WITH_12BIT "Encode/decode JPEG images with 12-bit samples (implies WITH_ARITH_DEC=0 WITH_ARITH_ENC=0 WITH_JAVA=0 WITH_SIMD=0 WITH_TURBOJPEG=0 )" FALSE)
-@@ -662,6 +668,7 @@ if(WITH_TURBOJPEG)
+ option(WITH_ARITH_DEC "Include arithmetic decoding support when emulating the libjpeg v6b API/ABI" TRUE)
+@@ -699,6 +705,7 @@ if(WITH_TURBOJPEG)
          LINK_FLAGS "${TJMAPFLAG}${TJMAPFILE}")
      endif()
  
@@ -23,15 +23,20 @@ index c384aae..c9a15a0 100644
      add_executable(tjunittest tjunittest.c tjutil.c md5/md5.c md5/md5hl.c)
      target_link_libraries(tjunittest turbojpeg)
  
-@@ -673,6 +680,7 @@ if(WITH_TURBOJPEG)
+@@ -710,9 +717,11 @@ if(WITH_TURBOJPEG)
  
      add_executable(tjexample tjexample.c)
      target_link_libraries(tjexample turbojpeg)
+-
++    endif()
++    if(INSTALL_DOCS)
+     add_custom_target(tjdoc COMMAND doxygen -s doxygen.config
+       WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
 +    endif()
    endif()
  
    if(ENABLE_STATIC)
-@@ -685,6 +693,7 @@ if(WITH_TURBOJPEG)
+@@ -733,6 +742,7 @@ if(WITH_TURBOJPEG)
        set_target_properties(turbojpeg-static PROPERTIES OUTPUT_NAME turbojpeg)
      endif()
  
@@ -39,7 +44,7 @@ index c384aae..c9a15a0 100644
      add_executable(tjunittest-static tjunittest.c tjutil.c md5/md5.c
        md5/md5hl.c)
      target_link_libraries(tjunittest-static turbojpeg-static)
-@@ -694,6 +703,7 @@ if(WITH_TURBOJPEG)
+@@ -742,6 +752,7 @@ if(WITH_TURBOJPEG)
      if(UNIX)
        target_link_libraries(tjbench-static m)
      endif()
@@ -47,17 +52,36 @@ index c384aae..c9a15a0 100644
    endif()
  endif()
  
-@@ -708,7 +718,7 @@ else()
-   set(DJPEG_BMP_SOURCES wrbmp.c wrtarga.c)
- endif()
- 
--if(ENABLE_STATIC)
-+if(ENABLE_STATIC AND ENABLE_EXECUTABLES)
-   add_executable(cjpeg-static cjpeg.c cdjpeg.c rdgif.c rdppm.c rdswitch.c
-     ${CJPEG_BMP_SOURCES})
-   set_property(TARGET cjpeg-static PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
-@@ -724,9 +734,11 @@ if(ENABLE_STATIC)
-   set_property(TARGET jpegtran-static PROPERTY COMPILE_FLAGS "${USE_SETMODE}")
+@@ -760,13 +771,15 @@ if(ENABLE_STATIC)
+   add_library(cjpeg16-static OBJECT rdgif.c rdppm.c)
+   set_property(TARGET cjpeg16-static PROPERTY COMPILE_FLAGS
+     "-DBITS_IN_JSAMPLE=16 -DGIF_SUPPORTED -DPPM_SUPPORTED")
++  if(ENABLE_EXECUTABLES)
+   add_executable(cjpeg-static cjpeg.c cdjpeg.c rdbmp.c rdgif.c rdppm.c
+     rdswitch.c rdtarga.c $<TARGET_OBJECTS:cjpeg12-static>
+     $<TARGET_OBJECTS:cjpeg16-static>)
+   set_property(TARGET cjpeg-static PROPERTY COMPILE_FLAGS
+     ${CDJPEG_COMPILE_FLAGS})
+   target_link_libraries(cjpeg-static jpeg-static)
+-
++  endif()
++  
+   # Compile a separate version of these source files with 12-bit and 16-bit
+   # data precision.
+   add_library(djpeg12-static OBJECT rdcolmap.c wrgif.c wrppm.c)
+@@ -775,6 +788,7 @@ if(ENABLE_STATIC)
+   add_library(djpeg16-static OBJECT wrppm.c)
+   set_property(TARGET djpeg16-static PROPERTY COMPILE_FLAGS
+     "-DBITS_IN_JSAMPLE=16 -DPPM_SUPPORTED")
++  if(ENABLE_EXECUTABLES)
+   add_executable(djpeg-static djpeg.c cdjpeg.c rdcolmap.c rdswitch.c wrbmp.c
+     wrgif.c wrppm.c wrtarga.c $<TARGET_OBJECTS:djpeg12-static>
+     $<TARGET_OBJECTS:djpeg16-static>)
+@@ -788,11 +802,14 @@ if(ENABLE_STATIC)
+ 
+   add_executable(example-static example.c)
+   target_link_libraries(example-static jpeg-static)
++  endif()
  endif()
  
 +if(ENABLE_EXECUTABLES)
@@ -68,7 +92,7 @@ index c384aae..c9a15a0 100644
  
  
  ###############################################################################
-@@ -1464,8 +1476,10 @@ if(WITH_TURBOJPEG)
+@@ -1721,8 +1738,10 @@ if(WITH_TURBOJPEG)
        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
@@ -79,7 +103,7 @@ index c384aae..c9a15a0 100644
      if(NOT CMAKE_VERSION VERSION_LESS "3.1" AND MSVC AND
        CMAKE_C_LINKER_SUPPORTS_PDB)
        install(FILES "$<TARGET_PDB_FILE:turbojpeg>"
-@@ -1476,7 +1490,7 @@ if(WITH_TURBOJPEG)
+@@ -1733,7 +1752,7 @@ if(WITH_TURBOJPEG)
      install(TARGETS turbojpeg-static EXPORT ${CMAKE_PROJECT_NAME}Targets
        INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
@@ -88,7 +112,7 @@ index c384aae..c9a15a0 100644
        if(GENERATOR_IS_MULTI_CONFIG)
          set(DIR "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}")
        else()
-@@ -1486,15 +1500,17 @@ if(WITH_TURBOJPEG)
+@@ -1743,15 +1762,17 @@ if(WITH_TURBOJPEG)
          DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME tjbench${EXE})
      endif()
    endif()
@@ -107,7 +131,7 @@ index c384aae..c9a15a0 100644
      if(GENERATOR_IS_MULTI_CONFIG)
        set(DIR "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}")
      else()
-@@ -1509,8 +1525,11 @@ if(ENABLE_STATIC)
+@@ -1766,8 +1787,11 @@ if(ENABLE_STATIC)
    endif()
  endif()
  
@@ -117,9 +141,9 @@ index c384aae..c9a15a0 100644
  
 +if(INSTALL_DOCS)
  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.ijg
-   ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/example.txt
+   ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/example.c
    ${CMAKE_CURRENT_SOURCE_DIR}/tjexample.c
-@@ -1522,8 +1541,9 @@ if(WITH_JAVA)
+@@ -1779,8 +1803,9 @@ if(WITH_JAVA)
    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/java/TJExample.java
      DESTINATION ${CMAKE_INSTALL_DOCDIR})
  endif()
@@ -130,7 +154,7 @@ index c384aae..c9a15a0 100644
    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cjpeg.1
      ${CMAKE_CURRENT_SOURCE_DIR}/djpeg.1 ${CMAKE_CURRENT_SOURCE_DIR}/jpegtran.1
      ${CMAKE_CURRENT_SOURCE_DIR}/rdjpgcom.1
-@@ -1544,10 +1564,12 @@ install(EXPORT ${CMAKE_PROJECT_NAME}Targets
+@@ -1801,11 +1826,12 @@ install(EXPORT ${CMAKE_PROJECT_NAME}Targets
    NAMESPACE ${CMAKE_PROJECT_NAME}::
    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CMAKE_PROJECT_NAME})
  
@@ -139,28 +163,44 @@ index c384aae..c9a15a0 100644
    ${CMAKE_CURRENT_SOURCE_DIR}/jerror.h ${CMAKE_CURRENT_SOURCE_DIR}/jmorecfg.h
    ${CMAKE_CURRENT_SOURCE_DIR}/jpeglib.h
    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+-
 +endif()
- 
  include(cmakescripts/BuildPackages.cmake)
  
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmakescripts/cmake_uninstall.cmake.in"
 diff --git a/sharedlib/CMakeLists.txt b/sharedlib/CMakeLists.txt
-index aea0b9d..069dbe2 100644
+index 8e942569..6f3454a9 100644
 --- a/sharedlib/CMakeLists.txt
 +++ b/sharedlib/CMakeLists.txt
-@@ -76,6 +76,7 @@ else()
-   set(DJPEG_BMP_SOURCES ../wrbmp.c ../wrtarga.c)
- endif()
- 
+@@ -76,12 +76,13 @@ set_property(TARGET cjpeg12 PROPERTY COMPILE_FLAGS
+ add_library(cjpeg16 OBJECT ../rdgif.c ../rdppm.c)
+ set_property(TARGET cjpeg16 PROPERTY COMPILE_FLAGS
+   "-DBITS_IN_JSAMPLE=16 -DGIF_SUPPORTED -DPPM_SUPPORTED")
 +if(ENABLE_EXECUTABLES)
- add_executable(cjpeg ../cjpeg.c ../cdjpeg.c ../rdgif.c ../rdppm.c
-   ../rdswitch.c ${CJPEG_BMP_SOURCES})
- set_property(TARGET cjpeg PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
-@@ -92,14 +93,17 @@ set_property(TARGET jpegtran PROPERTY COMPILE_FLAGS "${USE_SETMODE}")
+ add_executable(cjpeg ../cjpeg.c ../cdjpeg.c ../rdbmp.c ../rdgif.c ../rdppm.c
+   ../rdswitch.c ../rdtarga.c $<TARGET_OBJECTS:cjpeg12>
+   $<TARGET_OBJECTS:cjpeg16>)
+ set_property(TARGET cjpeg PROPERTY COMPILE_FLAGS ${CDJPEG_COMPILE_FLAGS})
+ target_link_libraries(cjpeg jpeg)
+-
++endif()
+ # Compile a separate version of these source files with 12-bit and 16-bit data
+ # precision.
+ add_library(djpeg12 OBJECT ../rdcolmap.c ../wrgif.c ../wrppm.c)
+@@ -90,6 +91,7 @@ set_property(TARGET djpeg12 PROPERTY COMPILE_FLAGS
+ add_library(djpeg16 OBJECT ../wrppm.c)
+ set_property(TARGET djpeg16 PROPERTY COMPILE_FLAGS
+   "-DBITS_IN_JSAMPLE=16 -DPPM_SUPPORTED")
++if(ENABLE_EXECUTABLES)
+ add_executable(djpeg ../djpeg.c ../cdjpeg.c ../rdcolmap.c ../rdswitch.c
+   ../wrbmp.c ../wrgif.c ../wrppm.c ../wrtarga.c $<TARGET_OBJECTS:djpeg12>
+   $<TARGET_OBJECTS:djpeg16>)
+@@ -105,14 +107,16 @@ target_link_libraries(example jpeg)
  
  add_executable(jcstest ../jcstest.c)
  target_link_libraries(jcstest jpeg)
+-
 +endif()
- 
  install(TARGETS jpeg EXPORT ${CMAKE_PROJECT_NAME}Targets
    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
diff --git a/external_imported/vcpkg/ports/libjpeg-turbo/portfile.cmake b/external_imported/vcpkg/ports/libjpeg-turbo/portfile.cmake
index 0ce6aadfe..2e2b1b9e3 100644
--- a/external_imported/vcpkg/ports/libjpeg-turbo/portfile.cmake
+++ b/external_imported/vcpkg/ports/libjpeg-turbo/portfile.cmake
@@ -6,7 +6,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libjpeg-turbo/libjpeg-turbo
     REF "${VERSION}"
-    SHA512 bcd946eed0fb3712eae2485d300d5e2b84596b1c8cfd4e944902bb141125d411b727024f054e2ad6c23855d06a02dcb926696f05cb107869a7b81814d4cfcaeb
+    SHA512 9dddc039d9fd43fe2e2ff6a8b14fab4344f778ff270ec6f38f6496846501701df10b5127e2fe8b778cc236cac38b73889b9cc5bf884f8a43c37c4736097abb25
     HEAD_REF master
     PATCHES
         add-options-for-exes-docs-headers.patch
@@ -14,7 +14,9 @@ vcpkg_from_github(
         workaround_cmake_system_processor.patch
 )
 
-if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR (VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore"))
+if(VCPKG_TARGET_ARCHITECTURE STREQUAL "wasm32")
+    set(LIBJPEGTURBO_SIMD -DWITH_SIMD=OFF)
+elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR (VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore"))
     set(LIBJPEGTURBO_SIMD -DWITH_SIMD=ON -DNEON_INTRINSICS=ON)
 else()
     set(LIBJPEGTURBO_SIMD -DWITH_SIMD=ON)
diff --git a/external_imported/vcpkg/ports/libjpeg-turbo/usage b/external_imported/vcpkg/ports/libjpeg-turbo/usage
index ccd47717f..6d70f46ff 100644
--- a/external_imported/vcpkg/ports/libjpeg-turbo/usage
+++ b/external_imported/vcpkg/ports/libjpeg-turbo/usage
@@ -1,5 +1,9 @@
-The package libjpeg-turbo is compatible with built-in CMake targets:
+libjpeg-turbo is compatible with built-in implementation-agnostic CMake targets:
 
     find_package(JPEG REQUIRED)
-    target_link_libraries(main PRIVATE ${JPEG_LIBRARIES})
-    target_include_directories(main PRIVATE ${JPEG_INCLUDE_DIR})
+    target_include_directories(main PRIVATE JPEG::JPEG)
+
+libjpeg-turbo provides CMake targets for the TurboJPEG C API:
+
+    find_package(libjpeg-turbo CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE $<IF:$<TARGET_EXISTS:libjpeg-turbo::turbojpeg>,libjpeg-turbo::turbojpeg,libjpeg-turbo::turbojpeg-static>)
diff --git a/external_imported/vcpkg/ports/libjpeg-turbo/vcpkg.json b/external_imported/vcpkg/ports/libjpeg-turbo/vcpkg.json
index 37cac9ea1..9db0fa4c8 100644
--- a/external_imported/vcpkg/ports/libjpeg-turbo/vcpkg.json
+++ b/external_imported/vcpkg/ports/libjpeg-turbo/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "libjpeg-turbo",
-  "version": "2.1.5.1",
+  "version": "3.0.2",
   "description": "libjpeg-turbo is a JPEG image codec that uses SIMD instructions (MMX, SSE2, NEON, AltiVec) to accelerate baseline JPEG compression and decompression on x86, x86-64, ARM, and PowerPC systems.",
   "homepage": "https://github.com/libjpeg-turbo/libjpeg-turbo",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/libjuice/portfile.cmake b/external_imported/vcpkg/ports/libjuice/portfile.cmake
index 2adc028c4..76fd50330 100644
--- a/external_imported/vcpkg/ports/libjuice/portfile.cmake
+++ b/external_imported/vcpkg/ports/libjuice/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO paullouisageneau/libjuice
-    REF eff89f7ae3450d66fcebe4d3d1d2aacca527eb8c #v1.0.6
-    SHA512 f28e8116e9437f7e2c114c0b6e296ec2c4bda264428ca94c3aa7356bfc3c76ac77f4664678579c933f70e6cb380c68ad42c03a83d5140bf41e20fc4272f1ae54
+    REF "v${VERSION}"
+    SHA512 0c690940fab9c29c52955ee96c254c086f4170c8e59a26b767b9ffc288db9ecc7195136f958b9773903201e2719279bca63c7f64b6bb89bf8a41b6dd1da4eb63
     HEAD_REF master
     PATCHES
         fix-for-vcpkg.patch
@@ -24,7 +24,13 @@ vcpkg_cmake_install()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-vcpkg_cmake_config_fixup(PACKAGE_NAME LibJuice CONFIG_PATH lib/cmake/LibJuice)
+vcpkg_cmake_config_fixup(PACKAGE_NAME libjuice CONFIG_PATH lib/cmake/LibJuice)
 vcpkg_fixup_pkgconfig()
 
+file(READ "${CURRENT_PACKAGES_DIR}/share/libjuice/LibJuiceConfig.cmake" DATACHANNEL_CONFIG)
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/libjuice/LibJuiceConfig.cmake" "
+include(CMakeFindDependencyMacro)
+find_dependency(Threads)
+${DATACHANNEL_CONFIG}")
+
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/external_imported/vcpkg/ports/libjuice/vcpkg.json b/external_imported/vcpkg/ports/libjuice/vcpkg.json
index ccd998ba1..962e59db2 100644
--- a/external_imported/vcpkg/ports/libjuice/vcpkg.json
+++ b/external_imported/vcpkg/ports/libjuice/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "libjuice",
-  "version": "1.0.6",
+  "version": "1.3.4",
+  "port-version": 1,
   "description": "The library is a simplified implementation of the Interactive Connectivity Establishment (ICE) protocol in C for POSIX platforms (including Linux and Apple macOS) and Microsoft Windows.",
   "homepage": "https://github.com/paullouisageneau/libjuice",
   "license": "LGPL-2.1-only",
diff --git a/external_imported/vcpkg/ports/libjxl/fix-dependencies.patch b/external_imported/vcpkg/ports/libjxl/fix-dependencies.patch
index 6ec3b52bb..eeca99927 100644
--- a/external_imported/vcpkg/ports/libjxl/fix-dependencies.patch
+++ b/external_imported/vcpkg/ports/libjxl/fix-dependencies.patch
@@ -2,20 +2,15 @@ diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
 index 8ee9864..b8a22a5 100644
 --- a/third_party/CMakeLists.txt
 +++ b/third_party/CMakeLists.txt
-@@ -47,7 +47,16 @@ endif()
+@@ -47,7 +47,11 @@ endif()
  # brotli
  if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/brotli/c/include/brotli/decode.h" OR
      JPEGXL_FORCE_SYSTEM_BROTLI)
 -  find_package(Brotli)
 +  find_package(Brotli NAMES unofficial-brotli REQUIRED)
 +  foreach(brlib IN ITEMS brotlienc brotlidec brotlicommon)
-+    if(TARGET unofficial::brotli::${brlib})
 +      add_library(${brlib} ALIAS unofficial::brotli::${brlib})
 +      add_library(${brlib}-static ALIAS unofficial::brotli::${brlib})
-+    else()
-+      add_library(${brlib} ALIAS unofficial::brotli::${brlib}-static)
-+      add_library(${brlib}-static ALIAS unofficial::brotli::${brlib}-static)
-+    endif()
 +  endforeach()
    if (NOT Brotli_FOUND)
      message(FATAL_ERROR
diff --git a/external_imported/vcpkg/ports/libjxl/portfile.cmake b/external_imported/vcpkg/ports/libjxl/portfile.cmake
index 4562c07cc..e5219990a 100644
--- a/external_imported/vcpkg/ports/libjxl/portfile.cmake
+++ b/external_imported/vcpkg/ports/libjxl/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libjxl/libjxl
     REF "v${VERSION}"
-    SHA512 8011f2181cb627c2b516c7e1b8ecec78a201f357f3be6e568f7814a6a9c42d5979f4bb4ed040a67d68f6649d1f5c564f3cb2fac7e52702f755749084d903a737
+    SHA512 769f102c46755d11a705ce47ae9e2ef49627ae708f416693bf1293aeeb713934baf4466e45b9c70b04ec1fc8b4a00d5ca7688c8ca03f0a91c9a15252c522a887
     HEAD_REF main
     PATCHES
         fix-dependencies.patch
diff --git a/external_imported/vcpkg/ports/libjxl/vcpkg.json b/external_imported/vcpkg/ports/libjxl/vcpkg.json
index 357ff7711..4ce6ff6d4 100644
--- a/external_imported/vcpkg/ports/libjxl/vcpkg.json
+++ b/external_imported/vcpkg/ports/libjxl/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "libjxl",
-  "version-semver": "0.8.1",
+  "version-semver": "0.8.2",
+  "port-version": 1,
   "description": "JPEG XL image format reference implementation",
   "homepage": "https://github.com/libjxl/libjxl",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/libkeyfinder/portfile.cmake b/external_imported/vcpkg/ports/libkeyfinder/portfile.cmake
index afd3dd1d1..c6239987b 100644
--- a/external_imported/vcpkg/ports/libkeyfinder/portfile.cmake
+++ b/external_imported/vcpkg/ports/libkeyfinder/portfile.cmake
@@ -6,14 +6,10 @@ vcpkg_from_github(
     HEAD_REF main
 )
 
-vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    FEATURES
-      test BUILD_TESTING
-)
-
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS ${FEATURE_OPTIONS}
+    OPTIONS
+        -DBUILD_TESTING=OFF
 )
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/libkeyfinder/vcpkg.json b/external_imported/vcpkg/ports/libkeyfinder/vcpkg.json
index f362d64cc..cb2f71d49 100644
--- a/external_imported/vcpkg/ports/libkeyfinder/vcpkg.json
+++ b/external_imported/vcpkg/ports/libkeyfinder/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "libkeyfinder",
   "version": "2.2.6",
+  "port-version": 1,
   "description": "Musical key detection for digital audio",
   "homepage": "https://github.com/mixxxdj/libkeyfinder",
   "license": "GPL-3.0-or-later",
@@ -14,13 +15,5 @@
       "name": "vcpkg-cmake-config",
       "host": true
     }
-  ],
-  "features": {
-    "test": {
-      "description": "Build tests",
-      "dependencies": [
-        "catch2"
-      ]
-    }
-  }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/libkml/fix-minizip.patch b/external_imported/vcpkg/ports/libkml/fix-minizip.patch
index 358f664a3..ccf7b43bd 100644
--- a/external_imported/vcpkg/ports/libkml/fix-minizip.patch
+++ b/external_imported/vcpkg/ports/libkml/fix-minizip.patch
@@ -7,10 +7,10 @@ index 9728ead..028f50a 100644
  endif()
  
 -find_package(MiniZip)
-+find_package(MINIZIP NAMES minizip REQUIRED)
++find_package(MINIZIP NAMES unofficial-minizip REQUIRED)
  if(MINIZIP_FOUND)
 -  include_directories(${MINIZIP_INCLUDE_DIR})
-+  set(MINIZIP_LIBRARY minizip::minizip)
++  set(MINIZIP_LIBRARY unofficial::minizip::minizip)
  else()
    include(External_minizip)
    list(APPEND KMLBASE_DEPENDS MINIZIP)
@@ -20,7 +20,7 @@ index 3e295f4..97826df 100644
 +++ b/cmake/LibKMLConfig.cmake.in
 @@ -1,3 +1,6 @@
 +include(CMakeFindDependencyMacro)
-+find_dependency(minizip CONFIG)
++find_dependency(unofficial-minizip CONFIG)
 +
  # Compute paths
  get_filename_component(LIBKML_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
diff --git a/external_imported/vcpkg/ports/libkml/portfile.cmake b/external_imported/vcpkg/ports/libkml/portfile.cmake
index c50175990..7ab2fddb3 100644
--- a/external_imported/vcpkg/ports/libkml/portfile.cmake
+++ b/external_imported/vcpkg/ports/libkml/portfile.cmake
@@ -28,6 +28,9 @@ vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DCMAKE_POLICY_DEFAULT_CMP0022=NEW
+        # libkml uses std::unary_function that was deprecated in C++11 and removed in C++17
+        # compilers are starting to ship C++17 as the defualt so explicitly set C++11
+        -DCMAKE_CXX_STANDARD=11
 )
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/libkml/vcpkg.json b/external_imported/vcpkg/ports/libkml/vcpkg.json
index e9301fcae..9ab9bdaea 100644
--- a/external_imported/vcpkg/ports/libkml/vcpkg.json
+++ b/external_imported/vcpkg/ports/libkml/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libkml",
   "version": "1.3.0",
-  "port-version": 11,
+  "port-version": 13,
   "description": "Reference implementation of OGC KML 2.2",
   "homepage": "https://github.com/libkml/libkml",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/liblas/fix-crosscompiling.diff b/external_imported/vcpkg/ports/liblas/fix-crosscompiling.diff
new file mode 100644
index 000000000..4d9eb5a7f
--- /dev/null
+++ b/external_imported/vcpkg/ports/liblas/fix-crosscompiling.diff
@@ -0,0 +1,13 @@
+diff --git a/cmake/liblas-config-version.cmake.in b/cmake/liblas-config-version.cmake.in
+index f9b7c7cb..5dd2aba1 100644
+--- a/cmake/liblas-config-version.cmake.in
++++ b/cmake/liblas-config-version.cmake.in
+@@ -22,7 +22,7 @@ elseif (MSVC AND NOT MSVC_VERSION STREQUAL "@MSVC_VERSION@")
+   # Reject if there's a mismatch in MSVC compiler versions
+   set (REASON "_MSC_VER = @MSVC_VERSION@")
+   set (PACKAGE_VERSION_UNSUITABLE TRUE)
+-elseif (NOT CMAKE_CROSSCOMPILING STREQUAL "@CMAKE_CROSSCOMPILING@")
++elseif (0)
+   # Reject if there's a mismatch in ${CMAKE_CROSSCOMPILING}
+   set (REASON "cross-compiling = @CMAKE_CROSSCOMPILING@")
+   set (PACKAGE_VERSION_UNSUITABLE TRUE)
diff --git a/external_imported/vcpkg/ports/liblas/force-cpp11.patch b/external_imported/vcpkg/ports/liblas/force-cpp11.patch
new file mode 100644
index 000000000..d5f44a839
--- /dev/null
+++ b/external_imported/vcpkg/ports/liblas/force-cpp11.patch
@@ -0,0 +1,27 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9732bcb..5af9ac2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -66,6 +66,8 @@ set(WITH_ENDIANAWARE FALSE CACHE BOOL "Choose whether or not libLAS should do ru
+ ###############################################################################
+ # CMake settings
+ 
++set(CMAKE_CXX_STANDARD 11) # Boost v1.84.0 libraries require C++11
++
+ set(CMAKE_COLOR_MAKEFILE ON)
+ 
+ # Allow advanced users to generate Makefiles printing detailed commands
+@@ -149,12 +151,7 @@ else()
+ 	" -Wextra -Wall -Wno-unused-parameter -Wno-unused-variable -Wpointer-arith -Wcast-align -Wcast-qual -Wfloat-equal -Wredundant-decls -Wno-long-long")
+ 
+   if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+-
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LIBLAS_COMMON_CXX_FLAGS}")
+-    if (CMAKE_COMPILER_IS_GNUCXX)
+-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98 -ansi")
+-    endif()
+-
+   elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER}" MATCHES "clang")
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LIBLAS_COMMON_CXX_FLAGS}")
+   endif()
+
diff --git a/external_imported/vcpkg/ports/liblas/portfile.cmake b/external_imported/vcpkg/ports/liblas/portfile.cmake
index fb8437357..57dfe35ef 100644
--- a/external_imported/vcpkg/ports/liblas/portfile.cmake
+++ b/external_imported/vcpkg/ports/liblas/portfile.cmake
@@ -9,13 +9,16 @@ vcpkg_download_distfile(ARCHIVE
     HEAD_REF master
 )
 
-vcpkg_extract_source_archive_ex(
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
-    OUT_SOURCE_PATH SOURCE_PATH
     PATCHES
         fix-boost-headers.patch
         fix-cmake-config.patch
+        fix-crosscompiling.diff
         misc-fixes.patch
+        remove_unnecessary_boost_dependency.diff
+        force-cpp11.patch
 )
 
 file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/modules")
@@ -44,8 +47,8 @@ else()
 endif()
 
 vcpkg_replace_string ("${CURRENT_PACKAGES_DIR}/share/liblas/liblas-config.cmake" "_DIR}/.." "_DIR}/../..")
-vcpkg_replace_string ("${CURRENT_PACKAGES_DIR}/share/liblas/liblas-config.cmake" "/lib" "$<$<CONFIG:DEBUG>:/debug>/lib")
-vcpkg_replace_string ("${CURRENT_PACKAGES_DIR}/share/liblas/liblas-config.cmake" "/bin" "/tools/${PORT}")
+vcpkg_replace_string ("${CURRENT_PACKAGES_DIR}/share/liblas/liblas-config.cmake" "\${PROJECT_ROOT_DIR}/lib" "\${PROJECT_ROOT_DIR}/$<$<CONFIG:DEBUG>:/debug>/lib")
+vcpkg_replace_string ("${CURRENT_PACKAGES_DIR}/share/liblas/liblas-config.cmake" "\${PROJECT_ROOT_DIR}/bin" "\${PROJECT_ROOT_DIR}/tools/${PORT}")
 
 file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/debug/include"
diff --git a/external_imported/vcpkg/ports/liblas/remove_unnecessary_boost_dependency.diff b/external_imported/vcpkg/ports/liblas/remove_unnecessary_boost_dependency.diff
new file mode 100644
index 000000000..9c36bec15
--- /dev/null
+++ b/external_imported/vcpkg/ports/liblas/remove_unnecessary_boost_dependency.diff
@@ -0,0 +1,22 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d246a88d..634157c0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -190,11 +190,13 @@ if(WIN32)
+ endif(WIN32)
+ 
+ find_package(Threads)
+-find_package(Boost 1.42 COMPONENTS program_options thread system iostreams filesystem REQUIRED)
++find_package(Boost 1.42 COMPONENTS iostreams program_options serialization thread REQUIRED)
++ 
++# The following header-only and their dependencies are additionally required,
++# but cannot be explicitly requested via find_package, so make sure they exists:
++# - foreach interprocess lambda property_tree uuid
+ 
+-if(Boost_FOUND AND Boost_PROGRAM_OPTIONS_FOUND)
+-  include_directories(${Boost_INCLUDE_DIRS})
+-endif()
++include_directories(${Boost_INCLUDE_DIRS})
+ 
+ # make these available for the user to set.
+ mark_as_advanced(CLEAR Boost_INCLUDE_DIR)
diff --git a/external_imported/vcpkg/ports/liblas/usage b/external_imported/vcpkg/ports/liblas/usage
index 871700547..8626d5a0d 100644
--- a/external_imported/vcpkg/ports/liblas/usage
+++ b/external_imported/vcpkg/ports/liblas/usage
@@ -3,7 +3,9 @@ liblas provides CMake targets:
     # C API
     find_package(libLAS CONFIG REQUIRED)
     target_link_libraries(main PRIVATE $<$<PLATFORM_ID:Windows>:lib>las_c)
+    target_include_directories(main SYSTEM PRIVATE ${libLAS_INCLUDE_DIRS})
 
     # C++ API
     find_package(libLAS CONFIG REQUIRED)
     target_link_libraries(main PRIVATE $<$<PLATFORM_ID:Windows>:lib>las)
+    target_include_directories(main SYSTEM PRIVATE ${libLAS_INCLUDE_DIRS})
diff --git a/external_imported/vcpkg/ports/liblas/vcpkg.json b/external_imported/vcpkg/ports/liblas/vcpkg.json
index 2ec7d4351..36ab504e3 100644
--- a/external_imported/vcpkg/ports/liblas/vcpkg.json
+++ b/external_imported/vcpkg/ports/liblas/vcpkg.json
@@ -1,20 +1,17 @@
 {
   "name": "liblas",
   "version": "1.8.1",
-  "port-version": 11,
+  "port-version": 14,
   "description": "A C/C++ library for reading and writing the very common LAS LiDAR format.",
   "license": null,
   "supports": "!arm & !staticcrt",
   "dependencies": [
-    "boost-detail",
-    "boost-filesystem",
+    "boost-foreach",
     "boost-interprocess",
     "boost-iostreams",
     "boost-lambda",
-    "boost-multi-index",
     "boost-program-options",
-    "boost-system",
-    "boost-thread",
+    "boost-property-tree",
     "boost-uuid",
     "libgeotiff",
     {
diff --git a/external_imported/vcpkg/ports/libleidenalg/portfile.cmake b/external_imported/vcpkg/ports/libleidenalg/portfile.cmake
index 2bedc2c7a..8e1e7a07f 100644
--- a/external_imported/vcpkg/ports/libleidenalg/portfile.cmake
+++ b/external_imported/vcpkg/ports/libleidenalg/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO theAeon/libleidenalg
-    REF 748dfca386b997fe5a140e21b9ef0f78a6e95ee6
-    SHA512 c88f0d9912981b8179d58c7084761e9123e2d7fdd4d971c348f1c0ec066b77914cf5592e0cdff21e371262fd28bbb50f2a09b06404adf2a1468f2f20c228a42f
+    REPO vtraag/libleidenalg
+    REF "${VERSION}"
+    SHA512 a3077592b68cb6fd9bc24127898a64576982b608ff3c123e8b1c7ea1b8da2dfb302123fba64cbf93c16b9310ab42199ddc8de5efa5b6606dd49ee47f074f7f2f
     HEAD_REF main
 )
 
diff --git a/external_imported/vcpkg/ports/libleidenalg/vcpkg.json b/external_imported/vcpkg/ports/libleidenalg/vcpkg.json
index b67e3e56d..569c63f14 100644
--- a/external_imported/vcpkg/ports/libleidenalg/vcpkg.json
+++ b/external_imported/vcpkg/ports/libleidenalg/vcpkg.json
@@ -1,13 +1,17 @@
 {
   "name": "libleidenalg",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "port-version": 1,
   "maintainers": "Andrew Robbins <andrew@robbinsa.me>",
   "description": "Leiden is a general algorithm for methods of community detection in large networks.",
   "homepage": "https://github.com/vtraag/libleidenalg",
   "license": "GPL-3.0-or-later",
+  "supports": "!xbox",
   "dependencies": [
-    "igraph",
+    {
+      "name": "igraph",
+      "version>=": "0.10.1"
+    },
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/external_imported/vcpkg/ports/liblemon/cmake.patch b/external_imported/vcpkg/ports/liblemon/cmake.patch
deleted file mode 100644
index 3b08a2d98..000000000
--- a/external_imported/vcpkg/ports/liblemon/cmake.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 03e1cc7..fd9d737 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -280,6 +280,13 @@ ELSEIF(WIN32)
-   )
- ENDIF()
- 
-+install(
-+    EXPORT lemon-targets
-+    FILE lemon-config.cmake
-+    NAMESPACE lemon::
-+    DESTINATION share/lemon
-+)
-+
- CONFIGURE_FILE(
-   ${PROJECT_SOURCE_DIR}/cmake/version.cmake.in
-   ${PROJECT_BINARY_DIR}/cmake/version.cmake
-diff --git a/lemon/CMakeLists.txt b/lemon/CMakeLists.txt
-index 4e6567e..76f9cae 100644
---- a/lemon/CMakeLists.txt
-+++ b/lemon/CMakeLists.txt
-@@ -71,6 +71,11 @@ INSTALL(
-   COMPONENT library
- )
- 
-+install(TARGETS lemon EXPORT lemon-targets
-+    LIBRARY DESTINATION lib
-+    ARCHIVE DESTINATION lib
-+)
-+
- INSTALL(
-   DIRECTORY . bits concepts
-   DESTINATION include/lemon
diff --git a/external_imported/vcpkg/ports/liblemon/fix-cmake.patch b/external_imported/vcpkg/ports/liblemon/fix-cmake.patch
new file mode 100644
index 000000000..17717295b
--- /dev/null
+++ b/external_imported/vcpkg/ports/liblemon/fix-cmake.patch
@@ -0,0 +1,78 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4406bc2..5717680 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -295,7 +295,7 @@ CONFIGURE_FILE(
+   ${PROJECT_BINARY_DIR}/cmake/LEMONConfig.cmake
+   @ONLY
+ )
+-IF(UNIX)
++IF(UNIX OR TRUE)
+   INSTALL(
+     FILES ${PROJECT_BINARY_DIR}/cmake/LEMONConfig.cmake
+     DESTINATION share/lemon/cmake
+@@ -307,6 +307,13 @@ ELSEIF(WIN32)
+   )
+ ENDIF()
+ 
++install(
++    EXPORT lemon-targets
++    FILE lemon-targets.cmake
++    NAMESPACE unofficial::lemon::
++    DESTINATION share/lemon/cmake
++)
++
+ CONFIGURE_FILE(
+   ${PROJECT_SOURCE_DIR}/cmake/version.cmake.in
+   ${PROJECT_BINARY_DIR}/cmake/version.cmake
+diff --git a/cmake/LEMONConfig.cmake.in b/cmake/LEMONConfig.cmake.in
+index b0d2d8b..6bb662a 100644
+--- a/cmake/LEMONConfig.cmake.in
++++ b/cmake/LEMONConfig.cmake.in
+@@ -1,4 +1,4 @@
+-SET(LEMON_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include" CACHE PATH "LEMON include directory")
++SET(LEMON_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}/../../include" CACHE PATH "LEMON include directory")
+ SET(LEMON_INCLUDE_DIRS "${LEMON_INCLUDE_DIR}")
+ 
+ IF(UNIX)
+@@ -7,7 +7,12 @@ ELSEIF(WIN32)
+   SET(LEMON_LIB_NAME "lemon.lib")
+ ENDIF(UNIX)
+ 
+-SET(LEMON_LIBRARY "@CMAKE_INSTALL_PREFIX@/lib/${LEMON_LIB_NAME}" CACHE FILEPATH "LEMON library")
++SET(LEMON_LIBRARY
++  optimized "${CMAKE_CURRENT_LIST_DIR}/../../lib/${LEMON_LIB_NAME}"
++  debug "${CMAKE_CURRENT_LIST_DIR}/../../debug/lib/${LEMON_LIB_NAME}"
++  CACHE FILEPATH "LEMON library")
+ SET(LEMON_LIBRARIES "${LEMON_LIBRARY}")
+ 
+ MARK_AS_ADVANCED(LEMON_LIBRARY LEMON_INCLUDE_DIR)
++
++INCLUDE(${CMAKE_CURRENT_LIST_DIR}/lemon-targets.cmake)
+diff --git a/lemon/CMakeLists.txt b/lemon/CMakeLists.txt
+index 4e6567e..ad6f5bf 100644
+--- a/lemon/CMakeLists.txt
++++ b/lemon/CMakeLists.txt
+@@ -56,6 +56,10 @@ ENDIF()
+ 
+ ADD_LIBRARY(lemon ${LEMON_SOURCES})
+ 
++INCLUDE(GNUInstallDirs)
++
++TARGET_INCLUDE_DIRECTORIES(lemon PUBLIC $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
++
+ TARGET_LINK_LIBRARIES(lemon
+   ${GLPK_LIBRARIES} ${COIN_LIBRARIES} ${ILOG_LIBRARIES} ${SOPLEX_LIBRARIES}
+   )
+@@ -71,6 +75,11 @@ INSTALL(
+   COMPONENT library
+ )
+ 
++install(TARGETS lemon EXPORT lemon-targets
++    LIBRARY DESTINATION lib
++    ARCHIVE DESTINATION lib
++)
++
+ INSTALL(
+   DIRECTORY . bits concepts
+   DESTINATION include/lemon
diff --git a/external_imported/vcpkg/ports/liblemon/fixup-targets.patch b/external_imported/vcpkg/ports/liblemon/fixup-targets.patch
deleted file mode 100644
index 883e2a6ee..000000000
--- a/external_imported/vcpkg/ports/liblemon/fixup-targets.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9a7c918..3d6cf35 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -268,7 +268,7 @@ CONFIGURE_FILE(
-   ${PROJECT_BINARY_DIR}/cmake/LEMONConfig.cmake
-   @ONLY
- )
--IF(UNIX)
-+IF(UNIX OR TRUE)
-   INSTALL(
-     FILES ${PROJECT_BINARY_DIR}/cmake/LEMONConfig.cmake
-     DESTINATION share/lemon/cmake
-@@ -282,9 +282,9 @@ ENDIF()
- 
- install(
-     EXPORT lemon-targets
--    FILE lemon-config.cmake
--    NAMESPACE lemon::
--    DESTINATION share/lemon
-+    FILE lemon-targets.cmake
-+    NAMESPACE unofficial::lemon::
-+    DESTINATION share/lemon/cmake
- )
- 
- CONFIGURE_FILE(
-diff --git a/cmake/LEMONConfig.cmake.in b/cmake/LEMONConfig.cmake.in
-index b0d2d8b..ce54986 100644
---- a/cmake/LEMONConfig.cmake.in
-+++ b/cmake/LEMONConfig.cmake.in
-@@ -1,4 +1,4 @@
--SET(LEMON_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include" CACHE PATH "LEMON include directory")
-+SET(LEMON_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}/../../include" CACHE PATH "LEMON include directory")
- SET(LEMON_INCLUDE_DIRS "${LEMON_INCLUDE_DIR}")
- 
- IF(UNIX)
-@@ -7,7 +7,12 @@ ELSEIF(WIN32)
-   SET(LEMON_LIB_NAME "lemon.lib")
- ENDIF(UNIX)
- 
--SET(LEMON_LIBRARY "@CMAKE_INSTALL_PREFIX@/lib/${LEMON_LIB_NAME}" CACHE FILEPATH "LEMON library")
-+SET(LEMON_LIBRARY
-+  optimized "${CMAKE_CURRENT_LIST_DIR}/../../lib/${LEMON_LIB_NAME}"
-+  debug "${CMAKE_CURRENT_LIST_DIR}/../../debug/lib/${LEMON_LIB_NAME}"
-+  CACHE FILEPATH "LEMON library")
- SET(LEMON_LIBRARIES "${LEMON_LIBRARY}")
- 
- MARK_AS_ADVANCED(LEMON_LIBRARY LEMON_INCLUDE_DIR)
-+
-+include(${CMAKE_CURRENT_LIST_DIR}/lemon-targets.cmake)
diff --git a/external_imported/vcpkg/ports/liblemon/portfile.cmake b/external_imported/vcpkg/ports/liblemon/portfile.cmake
index 28b1df939..6db26e442 100644
--- a/external_imported/vcpkg/ports/liblemon/portfile.cmake
+++ b/external_imported/vcpkg/ports/liblemon/portfile.cmake
@@ -13,13 +13,13 @@ vcpkg_extract_source_archive(
     ARCHIVE "${ARCHIVE}"
     SOURCE_BASE "${VERSION}"
     PATCHES
-        cmake.patch
-        fixup-targets.patch
+        fix-cmake.patch
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
+        -DCMAKE_CXX_STANDARD=14
         -DLEMON_ENABLE_GLPK=OFF
         -DLEMON_ENABLE_ILOG=OFF
         -DLEMON_ENABLE_COIN=OFF
@@ -30,15 +30,15 @@ vcpkg_cmake_install()
 
 vcpkg_cmake_config_fixup(CONFIG_PATH share/lemon/cmake PACKAGE_NAME lemon)
 
+vcpkg_fixup_pkgconfig()
+
 file(GLOB EXE "${CURRENT_PACKAGES_DIR}/bin/*.exe")
-file(COPY ${EXE} DESTINATION "{CURRENT_PACKAGES_DIR}/tools/liblemon/")
-vcpkg_copy_tool_dependencies("{CURRENT_PACKAGES_DIR}/tools/liblemon")
+file(COPY ${EXE} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/liblemon/")
+vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/liblemon")
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc")
 
-# Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-vcpkg_fixup_pkgconfig()
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/liblemon/vcpkg.json b/external_imported/vcpkg/ports/liblemon/vcpkg.json
index eaca2c922..bcc8b89de 100644
--- a/external_imported/vcpkg/ports/liblemon/vcpkg.json
+++ b/external_imported/vcpkg/ports/liblemon/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "liblemon",
-  "version-string": "2019-06-13",
-  "port-version": 4,
+  "version-date": "2019-06-13",
+  "port-version": 9,
   "description": "Library for Efficient Modeling and Optimization in Networks",
   "homepage": "https://lemon.cs.elte.hu/trac/lemon",
+  "supports": "!uwp",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/liblo/vcpkg.json b/external_imported/vcpkg/ports/liblo/vcpkg.json
index dca5a0318..ec59f5420 100644
--- a/external_imported/vcpkg/ports/liblo/vcpkg.json
+++ b/external_imported/vcpkg/ports/liblo/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "liblo",
-  "version-string": "0.31",
-  "port-version": 3,
+  "version": "0.31",
+  "port-version": 4,
   "description": "liblo is an implementation of the Open Sound Control protocol for POSIX systems",
   "homepage": "https://github.com/radarsat1/liblo",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/liblsl/portfile.cmake b/external_imported/vcpkg/ports/liblsl/portfile.cmake
index aaf9b2b9d..d862c2a5f 100644
--- a/external_imported/vcpkg/ports/liblsl/portfile.cmake
+++ b/external_imported/vcpkg/ports/liblsl/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO sccn/liblsl
     REF v${VERSION}
-    SHA512 d3af9be687c11272f0122585c8ba48c5d7482af6e6f0cecf640e674682da319246b490b536a890407c7511fcc07a59749ed43134bf7683d30304ac4e3989a73c
+    SHA512 141f364034a7156caf9ffafbb2f43cc9a932116a3ef1c1b76822649996d6b99b3017b18d91d9c25a9cd718419c5c3b037fa97b2845540bda195f55dd9de27ab1
     HEAD_REF master
     PATCHES
         use-find-package-asio.patch
diff --git a/external_imported/vcpkg/ports/liblsl/vcpkg.json b/external_imported/vcpkg/ports/liblsl/vcpkg.json
index b4f53be8d..2c2b3db33 100644
--- a/external_imported/vcpkg/ports/liblsl/vcpkg.json
+++ b/external_imported/vcpkg/ports/liblsl/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "liblsl",
-  "version": "1.16.1",
-  "port-version": 1,
+  "version": "1.16.2",
   "description": "C++ lsl library for multi-modal time-synched data transmission over the local network",
   "homepage": "https://github.com/sccn/liblsl",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/liblsquic/fix-found-boringssl.patch b/external_imported/vcpkg/ports/liblsquic/fix-found-boringssl.patch
new file mode 100644
index 000000000..a3a632c5e
--- /dev/null
+++ b/external_imported/vcpkg/ports/liblsquic/fix-found-boringssl.patch
@@ -0,0 +1,53 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5d4086a..e085a83 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -120,10 +120,12 @@ IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
+     SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} -Od")
+     #SET (MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} -DFIU_ENABLE=1")
+     #SET(LIBS ${LIBS} fiu)
++    SET(LIB_NAME ssld cryptod)
+ ELSE()
+     SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} -Ox")
+     # Comment out the following line to compile out debug messages:
+     #SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} -DLSQUIC_LOWEST_LOG_LEVEL=LSQ_LOG_INFO")
++    SET(LIB_NAME ssl crypto)
+ ENDIF()
+ 
+ ENDIF() #MSVC
+@@ -191,7 +193,7 @@ IF (NOT DEFINED BORINGSSL_LIB AND DEFINED BORINGSSL_DIR)
+ ELSE()
+ 
+ 
+-    FOREACH(LIB_NAME ssl crypto)
++    FOREACH(LIB ${LIB_NAME})
+         # If BORINGSSL_LIB is defined, try find each lib. Otherwise, user should define BORINGSSL_LIB_ssl,
+         # BORINGSSL_LIB_crypto and so on explicitly. For example, including boringssl and lsquic both via
+         # add_subdirectory:
+@@ -201,20 +203,20 @@ ELSE()
+         #   add_subdirectory(third_party/lsquic)
+         IF (DEFINED BORINGSSL_LIB)
+             IF (CMAKE_SYSTEM_NAME STREQUAL Windows)
+-                FIND_LIBRARY(BORINGSSL_LIB_${LIB_NAME}
+-                    NAMES ${LIB_NAME}
++                FIND_LIBRARY(BORINGSSL_LIB_${LIB}
++                    NAMES ${LIB}
+                     PATHS ${BORINGSSL_LIB}
+                     PATH_SUFFIXES Debug Release MinSizeRel RelWithDebInfo
+                     NO_DEFAULT_PATH)
+             ELSE()
+-                FIND_LIBRARY(BORINGSSL_LIB_${LIB_NAME}
+-                    NAMES lib${LIB_NAME}${LIB_SUFFIX}
++                FIND_LIBRARY(BORINGSSL_LIB_${LIB}
++                    NAMES lib${LI}${LIB_SUFFIX}
+                     PATHS ${BORINGSSL_LIB}
+-                    PATH_SUFFIXES ${LIB_NAME}
++                    PATH_SUFFIXES ${LIB}
+                     NO_DEFAULT_PATH)
+             ENDIF()
+         ENDIF()
+-        IF(BORINGSSL_LIB_${LIB_NAME})
++        IF(BORINGSSL_LIB_${LIB})
+             MESSAGE(STATUS "Found ${LIB_NAME} library: ${BORINGSSL_LIB_${LIB_NAME}}")
+         ELSE()
+             MESSAGE(FATAL_ERROR "BORINGSSL_LIB_${LIB_NAME} library not found")
diff --git a/external_imported/vcpkg/ports/liblsquic/portfile.cmake b/external_imported/vcpkg/ports/liblsquic/portfile.cmake
index 847500e02..922610fa1 100644
--- a/external_imported/vcpkg/ports/liblsquic/portfile.cmake
+++ b/external_imported/vcpkg/ports/liblsquic/portfile.cmake
@@ -6,17 +6,20 @@ endif()
 
 vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH
     REPO litespeedtech/lsquic
-    REF v3.1.1
-    SHA512 b4675be355703fea12f4b7d24812b93e739b2dbef04e3d8108b6fbe45dd16c129c9e04e58cdcfdf2a4448ee2edea68565dbd2445a76515bbdc8d9980f4210bee
+    REF v${VERSION}
+    SHA512 40d742779bfa2dc6fdaf0ee8e9349498d373dcffcc6dd27867c18d87309a288ea6811d693043b5d98364d816b818b49445214497475844201241193c0f37b349
     HEAD_REF master
-    PATCHES disable-asan.patch)
+    PATCHES 
+        disable-asan.patch
+        fix-found-boringssl.patch
+)
 
 # Submodules
 vcpkg_from_github(OUT_SOURCE_PATH LSQPACK_SOURCE_PATH
     REPO litespeedtech/ls-qpack
-    REF v2.3.0
+    REF v2.5.3
     HEAD_REF master
-    SHA512 7f5a9dd15bcd32c1bfafbecc5cea4da30f50a852c02d2bd140a2baaafd80ccb822c1701b0d20699af6367e9c712f4fe019741507c44156e9897d25162de0b8b4
+    SHA512 f90502c763abc84532f33d1b8f952aea7869e4e0c5f6bd344532ddd51c4a180958de4086d88b9ec96673a059c806eec9e70007651d4d4e1a73395919dee47ce0
 )
 if(NOT EXISTS "${SOURCE_PATH}/src/ls-hpack/CMakeLists.txt")
     file(REMOVE_RECURSE "${SOURCE_PATH}/src/liblsquic/ls-qpack")
@@ -25,9 +28,9 @@ endif()
 
 vcpkg_from_github(OUT_SOURCE_PATH LSHPACK_SOURCE_PATH
     REPO litespeedtech/ls-hpack
-    REF v2.3.0
+    REF v2.3.2
     HEAD_REF master
-    SHA512 45866b18042125cbbd008eed2935a938a42e1682030aa52ff4a324ddbad7bf9bd483161352cc8988bae668e132ee8b4b043ddc09d9e0316a66aaefd927ae2d76
+    SHA512 45d6c8296e8eee511e6a083f89460d5333fc9a49bc078dac55fdec6c46db199de9f150379f02e054571f954a5e3c79af3864dbc53dc57d10a8d2ed26a92d4278
 )
 if(NOT EXISTS "${SOURCE_PATH}/src/lshpack/CMakeLists.txt")
     file(REMOVE_RECURSE "${SOURCE_PATH}/src/lshpack")
diff --git a/external_imported/vcpkg/ports/liblsquic/vcpkg.json b/external_imported/vcpkg/ports/liblsquic/vcpkg.json
index 09570d936..7c9e6f183 100644
--- a/external_imported/vcpkg/ports/liblsquic/vcpkg.json
+++ b/external_imported/vcpkg/ports/liblsquic/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "liblsquic",
-  "version": "3.1.1",
-  "port-version": 1,
+  "version": "3.3.2",
   "description": "An implementation of the QUIC and HTTP/3 protocols.",
   "homepage": "https://github.com/litespeedtech/lsquic",
   "license": "MIT AND BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/liblzma/portfile.cmake b/external_imported/vcpkg/ports/liblzma/portfile.cmake
index 8631df28b..0fdc38dff 100644
--- a/external_imported/vcpkg/ports/liblzma/portfile.cmake
+++ b/external_imported/vcpkg/ports/liblzma/portfile.cmake
@@ -1,9 +1,9 @@
-vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
-vcpkg_from_sourceforge(
+vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO lzmautils
-    FILENAME "xz-${VERSION}.tar.xz"
-    SHA512 f890ee5207799fbc7bb9ae031f444d39d82275b0e1b8cc7f01fdb9270050e38849bd1269db2a2f12fe87b5e23e03f9e809a5c3456d066c0a56e6f98d728553ea
+    REPO tukaani-project/xz
+    REF "v${VERSION}"
+    SHA512 c28461123562564e030f3f733f078bc4c840e87598d9f4b718d4bca639120d8133f969c45d7bdc62f33f081d789ec0f14a1791fb7da18515682bfe3c0c7362e0
+    HEAD_REF master
     PATCHES
         fix_config_include.patch
         win_output_name.patch # Fix output name on Windows. Autotool build does not generate lib prefixed libraries on windows. 
@@ -28,7 +28,9 @@ vcpkg_cmake_configure(
         -DBUILD_TESTING=OFF
         -DCREATE_XZ_SYMLINKS=OFF
         -DCREATE_LZMA_SYMLINKS=OFF
+        -DCMAKE_MSVC_DEBUG_INFORMATION_FORMAT=   # using flags from (vcpkg) toolchain
     MAYBE_UNUSED_VARIABLES
+        CMAKE_MSVC_DEBUG_INFORMATION_FORMAT
         CREATE_XZ_SYMLINKS
         CREATE_LZMA_SYMLINKS
 )
@@ -39,7 +41,7 @@ set(exec_prefix "\${prefix}")
 set(libdir "\${prefix}/lib")
 set(includedir "\${prefix}/include")
 set(PACKAGE_URL https://tukaani.org/xz/)
-set(PACKAGE_VERSION 5.2.5)
+set(PACKAGE_VERSION 5.4.3)
 if(NOT VCPKG_TARGET_IS_WINDOWS)
     set(PTHREAD_CFLAGS -pthread)
 endif()
@@ -81,4 +83,4 @@ endif()
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/liblzma/vcpkg.json b/external_imported/vcpkg/ports/liblzma/vcpkg.json
index d0ac62bed..e9168357c 100644
--- a/external_imported/vcpkg/ports/liblzma/vcpkg.json
+++ b/external_imported/vcpkg/ports/liblzma/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "liblzma",
-  "version-semver": "5.4.1",
-  "port-version": 1,
+  "version": "5.4.4",
   "description": "Compression library with an API similar to that of zlib.",
   "homepage": "https://tukaani.org/xz/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/liblzma/win_output_name.patch b/external_imported/vcpkg/ports/liblzma/win_output_name.patch
index 7011475de..9a845bdba 100644
--- a/external_imported/vcpkg/ports/liblzma/win_output_name.patch
+++ b/external_imported/vcpkg/ports/liblzma/win_output_name.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e80b524..cddbccb 100644
+index 0c6d4b7..62a824a 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -462,8 +462,11 @@ set_target_properties(liblzma PROPERTIES
+@@ -868,8 +868,11 @@ set_target_properties(liblzma PROPERTIES
  
      # It's liblzma.so or liblzma.dll, not libliblzma.so or lzma.dll.
      # Avoid the name lzma.dll because it would conflict with LZMA SDK.
@@ -13,5 +13,5 @@ index e80b524..cddbccb 100644
 +    set_target_properties(liblzma PROPERTIES RUNTIME_OUTPUT_NAME liblzma)
 +endif()
  
- # Create liblzma-config-version.cmake. We use this spelling instead of
- # liblzmaConfig.cmake to make find_package work in case insensitive manner
+ # Create liblzma-config-version.cmake.
+ #
diff --git a/external_imported/vcpkg/ports/libmad/0001-Fix-MSVC-ARM.patch b/external_imported/vcpkg/ports/libmad/0001-Fix-MSVC-ARM.patch
deleted file mode 100644
index 9cdc57c7b..000000000
--- a/external_imported/vcpkg/ports/libmad/0001-Fix-MSVC-ARM.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/mad.h b/mad.h
-index 9ef6cc8..5e3f7aa 100644
---- a/mad.h
-+++ b/mad.h
-@@ -24,7 +24,11 @@
- extern "C" {
- # endif
- 
-+#ifdef _WIN64
-+# define FPM_64BIT
-+#else
- # define FPM_INTEL
-+#endif
- 
- 
- 
-@@ -184,7 +188,7 @@ typedef mad_fixed_t mad_sample_t;
- 
- # elif defined(FPM_INTEL)
- 
--#  if defined(_MSC_VER)
-+#  if defined(_MSC_VER) && defined(_M_IX86)
- #   pragma warning(push)
- #   pragma warning(disable: 4035)  /* no return value */
- static __forceinline
diff --git a/external_imported/vcpkg/ports/libmad/CMakeLists.txt b/external_imported/vcpkg/ports/libmad/CMakeLists.txt
deleted file mode 100644
index 47db84c41..000000000
--- a/external_imported/vcpkg/ports/libmad/CMakeLists.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-project(libmad)
-
-set(SOURCES
-    bit.c
-    bit.h
-    config.h
-    decoder.c
-    decoder.h
-    fixed.c
-    fixed.h
-    frame.c
-    frame.h
-    global.h
-    huffman.c
-    huffman.h
-    layer12.c
-    layer12.h
-    layer3.c
-    layer3.h
-    mad.h
-    stream.c
-    stream.h
-    synth.c
-    synth.h
-    timer.c
-    timer.h
-    version.c
-    version.h
-)
-
-add_library(
-    mad
-    ${SOURCES}
-)
-
-target_compile_definitions(mad
-    PRIVATE _LIB _MBCS ASO_ZEROCHECK HAVE_CONFIG_H FPM_DEFAULT
-    PRIVATE _CRT_SECURE_NO_WARNINGS
-)
-
-install(
-    TARGETS mad
-    RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib
-)
-
-install(
-    FILES mad.h
-    DESTINATION include
-)
diff --git a/external_imported/vcpkg/ports/libmad/portfile.cmake b/external_imported/vcpkg/ports/libmad/portfile.cmake
index 5981c3598..9bdade74b 100644
--- a/external_imported/vcpkg/ports/libmad/portfile.cmake
+++ b/external_imported/vcpkg/ports/libmad/portfile.cmake
@@ -1,27 +1,27 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+if(VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
 
-vcpkg_from_sourceforge(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO mad/libmad
-    REF 0.15.1b
-    FILENAME "libmad-0.15.1b.tar.gz"
-    SHA512 2cad30347fb310dc605c46bacd9da117f447a5cabedd8fefdb24ab5de641429e5ec5ce8af7aefa6a75a3f545d3adfa255e3fa0a2d50971f76bc0c4fc0400cc45
-    PATCHES 0001-Fix-MSVC-ARM.patch
+vcpkg_download_distfile(
+    ARCHIVE
+    URLS "https://codeberg.org/tenacityteam/libmad/releases/download/${VERSION}/libmad-${VERSION}.tar.gz"
+    FILENAME "tenacityteam-libmad-${VERSION}.tar.gz"
+    SHA512 5b0a826408395e8b6b8a33953401355d6c2f1b33ec5085530b4ac8a538c39ffa903ce2e6845e9dcad73936933078959960b2f3fbba11ae091fda5bc5ee310df5
 )
 
-#The archive only contains a Visual Studio 6.0 era DSP project file, so use a custom CMakeLists.txt
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
-
-#Use the msvc++ config.h header
-file(COPY "${SOURCE_PATH}/msvc++/config.h" DESTINATION "${SOURCE_PATH}")
+vcpkg_extract_source_archive(SOURCE_PATH ARCHIVE "${ARCHIVE}")
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DEXAMPLE=OFF
 )
 
 vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME "mad" CONFIG_PATH "lib/cmake/mad")
+vcpkg_fixup_pkgconfig()
 vcpkg_copy_pdbs()
 
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/external_imported/vcpkg/ports/libmad/vcpkg.json b/external_imported/vcpkg/ports/libmad/vcpkg.json
index 9a03de492..405735f86 100644
--- a/external_imported/vcpkg/ports/libmad/vcpkg.json
+++ b/external_imported/vcpkg/ports/libmad/vcpkg.json
@@ -1,13 +1,17 @@
 {
   "name": "libmad",
-  "version-string": "0.15.1",
-  "port-version": 10,
+  "version": "0.16.4",
+  "port-version": 1,
   "description": "high-quality MPEG audio decoder",
-  "homepage": "http://www.mars.org/home/rob/proj/mpeg/",
+  "homepage": "http://codeberg.org/tenacityteam/libmad",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
       "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/libmagic/0003-Fix-WIN32-macro-checks.patch b/external_imported/vcpkg/ports/libmagic/0003-Fix-WIN32-macro-checks.patch
index eb0f7ebda..e90beb4d4 100644
--- a/external_imported/vcpkg/ports/libmagic/0003-Fix-WIN32-macro-checks.patch
+++ b/external_imported/vcpkg/ports/libmagic/0003-Fix-WIN32-macro-checks.patch
@@ -31,13 +31,13 @@ index 299ac0c..2c365a6 100644
  #define PATHSEP	':'
 @@ -103,7 +103,7 @@
  
- #define private static
+ #define file_private static
  
 -#if HAVE_VISIBILITY && !defined(WIN32)
 +#if HAVE_VISIBILITY && !defined(_WIN32)
- #define public  __attribute__ ((__visibility__("default")))
- #ifndef protected
- #define protected __attribute__ ((__visibility__("hidden")))
+ #define file_public  __attribute__ ((__visibility__("default")))
+ #ifndef file_protected
+ #define file_protected __attribute__ ((__visibility__("hidden")))
 -- 
 2.29.2.windows.2
 
diff --git a/external_imported/vcpkg/ports/libmagic/0005-Include-dirent.h-for-S_ISREG-and-S_ISDIR.patch b/external_imported/vcpkg/ports/libmagic/0005-Include-dirent.h-for-S_ISREG-and-S_ISDIR.patch
index 76cbc1222..afcb658d8 100644
--- a/external_imported/vcpkg/ports/libmagic/0005-Include-dirent.h-for-S_ISREG-and-S_ISDIR.patch
+++ b/external_imported/vcpkg/ports/libmagic/0005-Include-dirent.h-for-S_ISREG-and-S_ISDIR.patch
@@ -11,14 +11,15 @@ diff --git a/src/file.h b/src/file.h
 index 0332506..4aa9f60 100644
 --- a/src/file.h
 +++ b/src/file.h
-@@ -88,6 +88,7 @@
+@@ -88,7 +88,8 @@
  /* Do this here and now, because struct stat gets re-defined on solaris */
  #include <sys/stat.h>
  #include <stdarg.h>
 +#include <dirent.h>
- 
- #define ENABLE_CONDITIONALS
- 
+ #include <locale.h>
+ #if defined(HAVE_XLOCALE_H)
+ #include <xlocale.h>
+ #endif
 -- 
 2.29.2.windows.2
 
diff --git a/external_imported/vcpkg/ports/libmagic/0006-Remove-Wrap-POSIX-headers.patch b/external_imported/vcpkg/ports/libmagic/0006-Remove-Wrap-POSIX-headers.patch
index 56efac248..169561d24 100644
--- a/external_imported/vcpkg/ports/libmagic/0006-Remove-Wrap-POSIX-headers.patch
+++ b/external_imported/vcpkg/ports/libmagic/0006-Remove-Wrap-POSIX-headers.patch
@@ -161,7 +161,7 @@ index 3ab52d1..fc48d84 100644
 --- a/src/pread.c
 +++ b/src/pread.c
 @@ -3,7 +3,9 @@
- FILE_RCSID("@(#)$File: pread.c,v 1.2 2013/04/02 16:23:07 christos Exp $")
+ FILE_RCSID("@(#)$File: pread.c,v 1.5 2022/09/24 20:30:13 christos Exp $")
  #endif  /* lint */
  #include <fcntl.h>
 +#ifdef HAVE_UNISTD_H
diff --git a/external_imported/vcpkg/ports/libmagic/0009-No-fcntl-in-magic.c.patch b/external_imported/vcpkg/ports/libmagic/0009-No-fcntl-in-magic.c.patch
deleted file mode 100644
index 47bf16165..000000000
--- a/external_imported/vcpkg/ports/libmagic/0009-No-fcntl-in-magic.c.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6d10bef865b69764f6e0ddd2b0f6a84e484cdb37 Mon Sep 17 00:00:00 2001
-From: Long Nguyen <nguyen.long.908132@gmail.com>
-Date: Sun, 9 May 2021 13:25:14 +0700
-Subject: [PATCH 09/14] No fcntl in magic.c
-
----
- src/magic.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/magic.c b/src/magic.c
-index e9aeafa..382bd96 100644
---- a/src/magic.c
-+++ b/src/magic.c
-@@ -462,7 +462,7 @@ file_or_fd(struct magic_set *ms, const char *inname, int fd)
- 			rv = 0;
- 			goto done;
- 		}
--#if O_CLOEXEC == 0
-+#if O_CLOEXEC == 0 && !defined(_WIN32)
- 		(void)fcntl(fd, F_SETFD, FD_CLOEXEC);
- #endif
- 	}
--- 
-2.29.2.windows.2
-
diff --git a/external_imported/vcpkg/ports/libmagic/0010-Properly-check-for-the-presence-of-bitmasks.patch b/external_imported/vcpkg/ports/libmagic/0010-Properly-check-for-the-presence-of-bitmasks.patch
index f0d8738e4..e241f5e49 100644
--- a/external_imported/vcpkg/ports/libmagic/0010-Properly-check-for-the-presence-of-bitmasks.patch
+++ b/external_imported/vcpkg/ports/libmagic/0010-Properly-check-for-the-presence-of-bitmasks.patch
@@ -17,7 +17,7 @@ index 5204f20..7244841 100644
  #undef HAVE_MAJOR
 -#ifdef	S_IFLNK
 +#if S_IFLNK != 0
- private int
+ file_private int
  bad_link(struct magic_set *ms, int err, char *buf)
  {
 @@ -108,7 +108,7 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb)
diff --git a/external_imported/vcpkg/ports/libmagic/0011-Remove-pipe-related-functions-in-funcs.c.patch b/external_imported/vcpkg/ports/libmagic/0011-Remove-pipe-related-functions-in-funcs.c.patch
index ae2720ca3..13c24faac 100644
--- a/external_imported/vcpkg/ports/libmagic/0011-Remove-pipe-related-functions-in-funcs.c.patch
+++ b/external_imported/vcpkg/ports/libmagic/0011-Remove-pipe-related-functions-in-funcs.c.patch
@@ -11,21 +11,19 @@ diff --git a/src/funcs.c b/src/funcs.c
 index b926625..b585486 100644
 --- a/src/funcs.c
 +++ b/src/funcs.c
-@@ -809,6 +809,7 @@ file_print_guid(char *str, size_t len, const uint64_t *guid)
- 	    g->data4[6], g->data4[7]);
+@@ -888,5 +888,6 @@
  }
  
 +#ifndef _WIN32
- protected int
+ file_protected int
  file_pipe_closexec(int *fds)
  {
-@@ -827,6 +828,7 @@ protected int
- file_clear_closexec(int fd) {
- 	return fcntl(fd, F_SETFD, 0);
+@@ -914,5 +915,6 @@
+ #endif
  }
 +#endif
  
- protected char *
+ file_protected char *
  file_strtrim(char *str)
 -- 
 2.29.2.windows.2
diff --git a/external_imported/vcpkg/ports/libmagic/0014-Define-POSIX-macros-if-missing.patch b/external_imported/vcpkg/ports/libmagic/0014-Define-POSIX-macros-if-missing.patch
deleted file mode 100644
index 09ac7a119..000000000
--- a/external_imported/vcpkg/ports/libmagic/0014-Define-POSIX-macros-if-missing.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From fa0e11f36bb0e322250e1e488ced9f2bf166874f Mon Sep 17 00:00:00 2001
-From: Long Nguyen <nguyen.long.908132@gmail.com>
-Date: Fri, 14 May 2021 18:11:39 +0700
-Subject: [PATCH 14/14] Define POSIX macros if missing
-
----
- src/file.h | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/src/file.h b/src/file.h
-index ccfe0da..98cd37b 100644
---- a/src/file.h
-+++ b/src/file.h
-@@ -100,6 +100,21 @@
- #include <stdarg.h>
- #include <dirent.h>
- 
-+#if !defined(S_IFBLK)
-+#define S_IFBLK 0
-+#define	S_ISBLK(mode)  (((mode) & S_IFMT) == S_IFBLK)
-+#endif
-+
-+#if !defined(S_IFLNK)
-+#define S_IFLNK 0
-+#define	S_ISLNK(mode)  (((mode) & S_IFMT) == S_IFLNK)
-+#endif
-+
-+#if !defined(S_IFSOCK)
-+#define S_IFSOCK 0
-+#define	S_ISSOCK(mode)  (((mode) & S_IFMT) == S_IFSOCK)
-+#endif
-+
- #define ENABLE_CONDITIONALS
- 
- #ifndef MAGIC
--- 
-2.29.2.windows.2
-
diff --git a/external_imported/vcpkg/ports/libmagic/0015-MSYS2-Remove-ioctl-call.patch b/external_imported/vcpkg/ports/libmagic/0015-MSYS2-Remove-ioctl-call.patch
index da8ef79df..13fe3cf0c 100644
--- a/external_imported/vcpkg/ports/libmagic/0015-MSYS2-Remove-ioctl-call.patch
+++ b/external_imported/vcpkg/ports/libmagic/0015-MSYS2-Remove-ioctl-call.patch
@@ -7,20 +7,20 @@ diff --git a/src/compress.c b/src/compress.c
 index 33ce2bc..f172eda 100644
 --- a/src/compress.c
 +++ b/src/compress.c
-@@ -378,7 +378,7 @@
+@@ -407,7 +407,7 @@
  sread(int fd, void *buf, size_t n, int canbepipe __attribute__((__unused__)))
  {
  	ssize_t rv;
--#ifdef FIONREAD
+-#if defined(FIONREAD) && !defined(__MINGW32__)
 +#if defined(FIONREAD) && !defined(__MINGW32__) && !defined(WIN32)
  	int t = 0;
  #endif
  	size_t rn = n;
-@@ -386,7 +386,7 @@
+@@ -418,7 +418,7 @@
  	if (fd == STDIN_FILENO)
  		goto nocheck;
  
--#ifdef FIONREAD
+-#if defined(FIONREAD) && !defined(__MINGW32__)
 +#if defined(FIONREAD) && !defined(__MINGW32__) && !defined(WIN32)
  	if (canbepipe && (ioctl(fd, FIONREAD, &t) == -1 || t == 0)) {
  #ifdef FD_ZERO
diff --git a/external_imported/vcpkg/ports/libmagic/0016-Fix-file_famagic-function.patch b/external_imported/vcpkg/ports/libmagic/0016-Fix-file_famagic-function.patch
new file mode 100644
index 000000000..5eaba925a
--- /dev/null
+++ b/external_imported/vcpkg/ports/libmagic/0016-Fix-file_famagic-function.patch
@@ -0,0 +1,40 @@
+diff --git a/src/fsmagic.c b/src/fsmagic.c
+index 7244841..2c553c1 100644
+--- a/src/fsmagic.c
++++ b/src/fsmagic.c
+@@ -66,7 +66,7 @@ # define major(dev)  (((dev) >> 8) & 0xff)
+ # define minor(dev)  ((dev) & 0xff)
+ #endif
+ #undef HAVE_MAJOR
+-#if S_IFLNK != 0
++#if S_IFLNK != 0 && ! defined(_WIN32)
+ file_private int
+ bad_link(struct magic_set *ms, int err, char *buf)
+ {
+@@ -108,7 +108,7 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb)
+ 	int ret, did = 0;
+ 	int mime = ms->flags & MAGIC_MIME;
+ 	int silent = ms->flags & (MAGIC_APPLE|MAGIC_EXTENSION);
+-#if S_IFLNK != 0
++#if S_IFLNK != 0 && ! defined(_WIN32)
+ 	char buf[BUFSIZ+4];
+ 	ssize_t nch;
+ 	struct stat tstatbuf;
+@@ -122,7 +122,7 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb)
+ 	 * Fstat is cheaper but fails for files you don't have read perms on.
+ 	 * On 4.2BSD and similar systems, use lstat() to identify symlinks.
+ 	 */
+-#if S_IFLNK != 0
++#if S_IFLNK != 0 && ! defined(_WIN32)
+ 	if ((ms->flags & MAGIC_SYMLINK) == 0)
+ 		ret = lstat(fn, sb);
+ 	else
+@@ -290,7 +290,7 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb)
+ 			return -1;
+ 		break;
+ #endif
+-#if S_IFLNK != 0
++#if S_IFLNK != 0 && ! defined(_WIN32)
+ 	case S_IFLNK:
+ 		if ((nch = readlink(fn, buf, BUFSIZ-1)) <= 0) {
+ 			if (ms->flags & MAGIC_ERROR) {
diff --git a/external_imported/vcpkg/ports/libmagic/portfile.cmake b/external_imported/vcpkg/ports/libmagic/portfile.cmake
index ed155792b..c1afade49 100644
--- a/external_imported/vcpkg/ports/libmagic/portfile.cmake
+++ b/external_imported/vcpkg/ports/libmagic/portfile.cmake
@@ -8,21 +8,20 @@ if(VCPKG_TARGET_IS_WINDOWS)
         "0006-Remove-Wrap-POSIX-headers.patch"
         "0007-Substitute-unistd-macros-for-MSVC.patch"
         "0008-Add-FILENO-defines.patch"
-        "0009-No-fcntl-in-magic.c.patch"
         "0010-Properly-check-for-the-presence-of-bitmasks.patch"
         "0011-Remove-pipe-related-functions-in-funcs.c.patch"
         "0012-Convert-MSYS2-paths-to-Windows-paths.patch"
         "0013-Check-for-backslash-in-argv-0-on-Windows.patch"
-        "0014-Define-POSIX-macros-if-missing.patch"
         "0015-MSYS2-Remove-ioctl-call.patch"
+        "0016-Fix-file_famagic-function.patch"
     )
 endif()
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO file/file
-    REF FILE5_40
-    SHA512 d76bfe5326e1b40368e055c2e049a24b4ffdbd727371f4f3aa1dd3f53787d16b88550b3cc71ecf02151e2fb3e567eb2598e4707badab8c391eb71113c2dcc319
+    REF FILE5_45
+    SHA512 fdd4c5d13d5ea1d25686c76d8ebc3252c54040c4871e3f0f623c4548b3841795d4e36050292a9453eedf0fbf932573890e9d6ac9fa63ccf577215598ae84b9ea
     HEAD_REF master
     PATCHES ${PATCHES}
 )
@@ -67,5 +66,13 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}/man5")
 
-# Handle copyright
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+include(CMakePackageConfigHelpers)
+configure_package_config_file(
+    "${CMAKE_CURRENT_LIST_DIR}/unofficial-${PORT}-config.cmake.in"
+    "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake"
+    INSTALL_DESTINATION "share/unofficial-${PORT}"
+)
+
+# Handle copyright and usage
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/libmagic/unofficial-libmagic-config.cmake.in b/external_imported/vcpkg/ports/libmagic/unofficial-libmagic-config.cmake.in
new file mode 100644
index 000000000..8f22d30f9
--- /dev/null
+++ b/external_imported/vcpkg/ports/libmagic/unofficial-libmagic-config.cmake.in
@@ -0,0 +1,69 @@
+@PACKAGE_INIT@
+
+if(WIN32 AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
+    include(CMakeFindDependencyMacro)
+    find_dependency(unofficial-tre)
+endif()
+
+# Compute the installation prefix relative to this file.
+get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+if(_IMPORT_PREFIX STREQUAL "/")
+    set(_IMPORT_PREFIX "")
+endif()
+
+if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
+    add_library(unofficial::libmagic::libmagic STATIC IMPORTED)
+else()
+    add_library(unofficial::libmagic::libmagic SHARED IMPORTED)
+endif()
+
+set_target_properties(unofficial::libmagic::libmagic PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
+)
+
+if(WIN32 AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
+    set_target_properties(unofficial::libmagic::libmagic PROPERTIES
+        INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:unofficial::tre::tre>"
+    )
+endif()
+
+macro(add_library_config config prefix)
+    set_property(TARGET unofficial::libmagic::libmagic APPEND PROPERTY IMPORTED_CONFIGURATIONS ${config})
+    if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
+        set_target_properties(unofficial::libmagic::libmagic PROPERTIES
+            IMPORTED_LOCATION_${config} "${_IMPORT_PREFIX}/${prefix}lib/@VCPKG_TARGET_STATIC_LIBRARY_PREFIX@magic@VCPKG_TARGET_STATIC_LIBRARY_SUFFIX@"
+            IMPORTED_LINK_INTERFACE_LANGUAGES_${config} "C"
+        )
+    else()
+        if(WIN32)
+            set(library_dir "${_IMPORT_PREFIX}/${prefix}bin/")
+            set(soversion_suffix "-1")
+            set_target_properties(unofficial::libmagic::libmagic PROPERTIES
+                IMPORTED_IMPLIB_${config} "${_IMPORT_PREFIX}/${prefix}/lib/@VCPKG_TARGET_IMPORT_LIBRARY_PREFIX@magic@VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX@"
+            )
+        else()
+            set(library_dir "${_IMPORT_PREFIX}/${prefix}lib/")
+        endif()
+        set_target_properties(unofficial::libmagic::libmagic PROPERTIES
+            IMPORTED_LOCATION_${config} "${library_dir}@VCPKG_TARGET_SHARED_LIBRARY_PREFIX@magic${soversion_suffix}@VCPKG_TARGET_SHARED_LIBRARY_SUFFIX@"
+        )
+        unset(soversion_suffix)
+        unset(library_dir)
+    endif()
+endmacro()
+
+if("@VCPKG_BUILD_TYPE@" STREQUAL "" OR "@VCPKG_BUILD_TYPE@" STREQUAL "debug")
+    add_library_config(DEBUG "debug/")
+endif()
+
+if("@VCPKG_BUILD_TYPE@" STREQUAL "" OR "@VCPKG_BUILD_TYPE@" STREQUAL "release")
+    add_library_config(RELEASE "")
+endif()
+
+set_and_check(unofficial-libmagic_DICTIONARY "${_IMPORT_PREFIX}/share/libmagic/misc/magic.mgc")
+
+unset(_IMPORT_PREFIX)
+
+check_required_components(unofficial-libmagic)
diff --git a/external_imported/vcpkg/ports/libmagic/usage b/external_imported/vcpkg/ports/libmagic/usage
new file mode 100644
index 000000000..3f7bb80fb
--- /dev/null
+++ b/external_imported/vcpkg/ports/libmagic/usage
@@ -0,0 +1,6 @@
+libmagic provides CMake targets:
+
+    find_package(unofficial-libmagic REQUIRED)
+    target_link_libraries(main PRIVATE unofficial::libmagic::libmagic)
+
+The magic.mgc file can be accessed from the unofficial-libmagic_DICTIONARY variable.
diff --git a/external_imported/vcpkg/ports/libmagic/vcpkg.json b/external_imported/vcpkg/ports/libmagic/vcpkg.json
index 9f63ac322..a556d5d34 100644
--- a/external_imported/vcpkg/ports/libmagic/vcpkg.json
+++ b/external_imported/vcpkg/ports/libmagic/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "libmagic",
-  "version-string": "5.40",
+  "version": "5.45",
   "port-version": 1,
   "description": "This library can be used to classify files according to magic number tests.",
   "homepage": "https://github.com/file/file",
+  "license": "BSD-2-Clause",
   "dependencies": [
     {
       "name": "dirent",
diff --git a/external_imported/vcpkg/ports/libmariadb/vcpkg.json b/external_imported/vcpkg/ports/libmariadb/vcpkg.json
index 3718a3a91..cd4b708c8 100644
--- a/external_imported/vcpkg/ports/libmariadb/vcpkg.json
+++ b/external_imported/vcpkg/ports/libmariadb/vcpkg.json
@@ -1,11 +1,11 @@
 {
   "name": "libmariadb",
   "version-semver": "3.3.1",
-  "port-version": 2,
+  "port-version": 3,
   "description": "MariaDB Connector/C is used to connect C/C++ applications to MariaDB and MySQL databases",
   "homepage": "https://github.com/MariaDB/mariadb-connector-c",
   "license": "LGPL-2.1-or-later",
-  "supports": "!uwp",
+  "supports": "!uwp & !xbox",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/libmaxminddb/CMakeLists.txt b/external_imported/vcpkg/ports/libmaxminddb/CMakeLists.txt
deleted file mode 100644
index c46c6319b..000000000
--- a/external_imported/vcpkg/ports/libmaxminddb/CMakeLists.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-cmake_minimum_required (VERSION 3.9)
-project(maxminddb C)
-
-set(CMAKE_DEBUG_POSTFIX d)
-set(CMAKE_SHARED_LIBRARY_PREFIX lib)
-set(CMAKE_STATIC_LIBRARY_PREFIX lib)
-
-if(MSVC)
-  add_compile_options(-D_CRT_SECURE_NO_WARNINGS)
-endif()
-
-set(SRCS
-  src/maxminddb.c
-  src/data-pool.c
-)
-
-include_directories(. src include projects/VS12)
-
-add_library(maxminddb ${SRCS})
-
-if(WIN32)
-  target_link_libraries(maxminddb ws2_32)
-endif()
-
-install(
-  TARGETS maxminddb
-  RUNTIME DESTINATION bin
-  LIBRARY DESTINATION lib
-  ARCHIVE DESTINATION lib
-)
-
-if(NOT DISABLE_INSTALL_HEADERS)
-  install(FILES include/maxminddb.h projects/VS12/maxminddb_config.h DESTINATION include/maxminddb)
-endif()
diff --git a/external_imported/vcpkg/ports/libmaxminddb/fix-linux-build.patch b/external_imported/vcpkg/ports/libmaxminddb/fix-linux-build.patch
deleted file mode 100644
index bdf9b7780..000000000
--- a/external_imported/vcpkg/ports/libmaxminddb/fix-linux-build.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/include/maxminddb.h b/include/maxminddb.h
-index 13b276f..6c70e49 100644
---- a/include/maxminddb.h
-+++ b/include/maxminddb.h
-@@ -24,11 +24,12 @@ extern "C" {
- #include <stdio.h>
- #include <sys/types.h>
- 
-+/* libmaxminddb package version from configure */
-+#define PACKAGE_VERSION "1.4.3"
-+
- #ifdef _WIN32
- #include <winsock2.h>
- #include <ws2tcpip.h>
--/* libmaxminddb package version from configure */
--#define PACKAGE_VERSION "1.4.3"
- 
- typedef ADDRESS_FAMILY sa_family_t;
- 
diff --git a/external_imported/vcpkg/ports/libmaxminddb/portfile.cmake b/external_imported/vcpkg/ports/libmaxminddb/portfile.cmake
index 7c437a091..f58b4cee7 100644
--- a/external_imported/vcpkg/ports/libmaxminddb/portfile.cmake
+++ b/external_imported/vcpkg/ports/libmaxminddb/portfile.cmake
@@ -3,22 +3,26 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO maxmind/libmaxminddb
-    REF 07797e9dfb6771190f9fa41a33babe19425ef552 #1.4.3
-    SHA512 94f7fbd46a7846c804edad9759ceedf2f7c4b2085430322f74bea5c89f6c3fa0824f154f551119a8c69becec5120650efef89c6d7f5a2ef3df476086070c8c7e
-    HEAD_REF master
-    PATCHES fix-linux-build.patch
+    REF "${VERSION}"
+    SHA512 0fc69bb09b74b892317c64d11822e29311e016566b60fc217efb20aec713e29dc02400839497cfcf5e837fcee9efa3536452997fa76bbc23464fad92a5a89bef
+    HEAD_REF main
 )
 
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
-
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_TESTING=OFF
+        -DCMAKE_SHARED_LIBRARY_PREFIX=lib
+        -DCMAKE_STATIC_LIBRARY_PREFIX=lib
     OPTIONS_DEBUG
-        -DDISABLE_INSTALL_HEADERS=ON
+        -DCMAKE_DEBUG_POSTFIX=d
 )
-
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
+vcpkg_fixup_pkgconfig()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/maxminddb PACKAGE_NAME maxminddb)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
 # Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
\ No newline at end of file
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/libmaxminddb/vcpkg.json b/external_imported/vcpkg/ports/libmaxminddb/vcpkg.json
index 142ae74e0..07fafac38 100644
--- a/external_imported/vcpkg/ports/libmaxminddb/vcpkg.json
+++ b/external_imported/vcpkg/ports/libmaxminddb/vcpkg.json
@@ -1,13 +1,16 @@
 {
   "name": "libmaxminddb",
-  "version-string": "1.4.3",
-  "port-version": 2,
+  "version": "1.9.1",
   "description": "C library for the MaxMind DB file format",
   "homepage": "https://github.com/maxmind/libmaxminddb",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
       "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/libmediainfo/dependencies.diff b/external_imported/vcpkg/ports/libmediainfo/dependencies.diff
new file mode 100644
index 000000000..be62f8553
--- /dev/null
+++ b/external_imported/vcpkg/ports/libmediainfo/dependencies.diff
@@ -0,0 +1,26 @@
+diff --git a/Project/CMake/cmake/modules/FindTinyXML.cmake b/Project/CMake/cmake/modules/FindTinyXML.cmake
+index af97107..4667b65 100644
+--- a/Project/CMake/cmake/modules/FindTinyXML.cmake
++++ b/Project/CMake/cmake/modules/FindTinyXML.cmake
+@@ -23,7 +23,7 @@ endif(PKG_CONFIG_FOUND)
+ 
+ set(TinyXML_INCLUDE_DIRS ${PC_TINYXML_INCLUDE_DIRS} CACHE PATH "TinyXML include directory" FORCE)
+ set(TinyXML_LIBRARY_DIRS ${PC_TINYXML_LIBRARY_DIRS} CACHE PATH "TinyXML library directory" FORCE)
+-set(TinyXML_LIBRARIES ${PC_TINYXML_LIBRARIES} CACHE STRING "TinyXML libraries" FORCE)
++set(TinyXML_LIBRARIES ${PC_TINYXML_LINK_LIBRARIES} CACHE STRING "TinyXML libraries" FORCE)
+ include(FindPackageHandleStandardArgs)
+ 
+ find_package_handle_standard_args(TinyXML
+diff --git a/Project/CMake/libmediainfo.pc.in b/Project/CMake/libmediainfo.pc.in
+index 31e53fe..0829d71 100644
+--- a/Project/CMake/libmediainfo.pc.in
++++ b/Project/CMake/libmediainfo.pc.in
+@@ -8,6 +8,6 @@ Name: libmediainfo
+ Version: @MediaInfoLib_VERSION@
+ Description: MediaInfoLib
+ Requires: libzen
+-Requires.private:@CURL_PC@
+-Libs: -L${libdir} -lmediainfo -lz
++Requires.private: libcurl tinyxml2 zlib
++Libs: -L${libdir} -lmediainfo
+ Cflags: -I${includedir}
diff --git a/external_imported/vcpkg/ports/libmediainfo/msvc-arm.diff b/external_imported/vcpkg/ports/libmediainfo/msvc-arm.diff
new file mode 100644
index 000000000..c7bef0750
--- /dev/null
+++ b/external_imported/vcpkg/ports/libmediainfo/msvc-arm.diff
@@ -0,0 +1,25 @@
+diff --git a/Source/ThirdParty/aes-gladman/aesopt.h b/Source/ThirdParty/aes-gladman/aesopt.h
+index d3ac0f9..eeefa40 100644
+--- a/Source/ThirdParty/aes-gladman/aesopt.h
++++ b/Source/ThirdParty/aes-gladman/aesopt.h
+@@ -183,7 +183,7 @@ Issue Date: 20/12/2007
+ 	AES_REV_DKS must NOT be defined when such assembler files are
+ 	built
+ */
+-#if 1 && defined( _WIN64 ) && defined( _MSC_VER )
++#if 1 && defined( _WIN64 ) && defined( _MSC_VER ) && defined( _M_AMD64 )
+ #  define INTEL_AES_POSSIBLE
+ #endif
+ 
+diff --git a/Source/ThirdParty/aes-gladman/brg_endian.h b/Source/ThirdParty/aes-gladman/brg_endian.h
+index b44c5cb..6ba31c1 100644
+--- a/Source/ThirdParty/aes-gladman/brg_endian.h
++++ b/Source/ThirdParty/aes-gladman/brg_endian.h
+@@ -101,6 +101,7 @@ Issue Date: 20/12/2007
+       defined( __i386__ )  || defined( _M_I86 )  || defined( _M_IX86 )    || \
+       defined( __OS2__ )   || defined( sun386 )  || defined( __TURBOC__ ) || \
+       defined( vax )       || defined( vms )     || defined( VMS )        || \
++      defined( _M_ARM64 )  || defined ( _M_ARM ) || \
+       defined( __VMS )     || defined( _M_X64 )
+ #  define PLATFORM_BYTE_ORDER IS_LITTLE_ENDIAN
+ 
diff --git a/external_imported/vcpkg/ports/libmediainfo/no-windows-namespace.diff b/external_imported/vcpkg/ports/libmediainfo/no-windows-namespace.diff
new file mode 100644
index 000000000..6f3918a87
--- /dev/null
+++ b/external_imported/vcpkg/ports/libmediainfo/no-windows-namespace.diff
@@ -0,0 +1,56 @@
+diff --git a/Source/MediaInfo/MediaInfo_Internal.cpp b/Source/MediaInfo/MediaInfo_Internal.cpp
+index 05e0d53..1da1ef5 100644
+--- a/Source/MediaInfo/MediaInfo_Internal.cpp
++++ b/Source/MediaInfo/MediaInfo_Internal.cpp
+@@ -66,12 +66,14 @@
+ #if MEDIAINFO_ADVANCED && defined(MEDIAINFO_FILE_YES)
+     #include <limits>
+     #ifdef WINDOWS
+-    namespace WindowsNamespace
+-    {
++        #ifndef WIN32_LEAN_AND_MEAN
++            #define WIN32_LEAN_AND_MEAN
++        #endif
++        #ifndef NOMINMAX
++            #define NOMINMAX
++        #endif
+         #include <windows.h>
+         #undef Yield
+-        #undef max
+-    }
+     #else
+         #include <unistd.h>
+         #include <signal.h>
+@@ -973,7 +975,7 @@ static void CtrlC_Received()
+ }
+ 
+ #ifdef WINDOWS
+-static WindowsNamespace::BOOL WINAPI SignalHandler(WindowsNamespace::DWORD SignalType)
++static BOOL WINAPI SignalHandler(DWORD SignalType)
+ {
+     if (SignalType==CTRL_C_EVENT)
+     {
+@@ -986,12 +988,12 @@ static WindowsNamespace::BOOL WINAPI SignalHandler(WindowsNamespace::DWORD Signa
+ 
+ static void CtrlC_Register()
+ {
+-    WindowsNamespace::SetConsoleCtrlHandler(SignalHandler, TRUE);
++    SetConsoleCtrlHandler(SignalHandler, TRUE);
+ }
+ 
+ static void CtrlC_Unregister()
+ {
+-    WindowsNamespace::SetConsoleCtrlHandler(SignalHandler, FALSE);
++    SetConsoleCtrlHandler(SignalHandler, FALSE);
+ }
+ #else //WINDOWS
+ static void SignalHandler(int SignalType)
+@@ -1445,7 +1447,7 @@ void MediaInfo_Internal::Entry()
+                     }
+ 
+                     #ifdef WINDOWS
+-                        WindowsNamespace::Sleep(0);
++                        Sleep(0);
+                     #elif defined(_POSIX_PRIORITY_SCHEDULING)
+                         sched_yield();
+                     #endif //_POSIX_PRIORITY_SCHEDULING
diff --git a/external_imported/vcpkg/ports/libmediainfo/portfile.cmake b/external_imported/vcpkg/ports/libmediainfo/portfile.cmake
index 40229288c..5493c35e3 100644
--- a/external_imported/vcpkg/ports/libmediainfo/portfile.cmake
+++ b/external_imported/vcpkg/ports/libmediainfo/portfile.cmake
@@ -1,31 +1,34 @@
+string(REGEX REPLACE "^([0-9]+)[.]([1-9])\$" "\\1.0\\2" MEDIAINFO_VERSION "${VERSION}")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO MediaArea/MediaInfoLib
-    REF v21.03
-    SHA512 1317b27dc3ac1ad224ef9b7ca7c08a8f55983ac6984b5e8daf6309fa33094fbad8a0a5fbe0cff086b7a5c9233b3e24e26995b037d16adf83f63877f2c753f811
+    REF "v${MEDIAINFO_VERSION}"
+    SHA512 1407f5690415ccb7997cc9bcbe7d90980a52b1d06e543a446a0da8e4cb3f09ba8fcfbf6be80b043d7f76eeb2ba219242da1c34f3225e0f0bfe044b2394c0c3ae
     HEAD_REF master
-    PATCHES vcpkg_support_in_cmakelists.patch
+    PATCHES
+        msvc-arm.diff
+        dependencies.diff
+        no-windows-namespace.diff
 )
 
+vcpkg_find_acquire_program(PKGCONFIG)
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}/Project/CMake"
     OPTIONS
         -DBUILD_ZENLIB=0
         -DBUILD_ZLIB=0
+        "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}"
+        -DCMAKE_REQUIRE_FIND_PACKAGE_PkgConfig=1
+        -DCMAKE_REQUIRE_FIND_PACKAGE_TinyXML=1
 )
-
 vcpkg_cmake_install()
-
-if(EXISTS "${CURRENT_PACKAGES_DIR}/share/mediainfolib")
-    file(RENAME "${CURRENT_PACKAGES_DIR}/share/mediainfolib" "${CURRENT_PACKAGES_DIR}/share/MediaInfoLib")
-endif()
-
-if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/share/mediainfolib")
-    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/mediainfolib" "${CURRENT_PACKAGES_DIR}/debug/share/MediaInfoLib")
-endif()
-vcpkg_cmake_config_fixup(PACKAGE_NAME MediaInfoLib CONFIG_PATH share/MediaInfoLib)
+vcpkg_cmake_config_fixup(PACKAGE_NAME mediainfolib)
 vcpkg_fixup_pkgconfig()
+if(NOT VCPKG_BUILD_TYPE AND VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libmediainfo.pc" " -lmediainfo" " -lmediainfod")
+endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/libmediainfo/vcpkg.json b/external_imported/vcpkg/ports/libmediainfo/vcpkg.json
index f6832d265..072cdd1db 100644
--- a/external_imported/vcpkg/ports/libmediainfo/vcpkg.json
+++ b/external_imported/vcpkg/ports/libmediainfo/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "libmediainfo",
-  "version-string": "21.03",
-  "port-version": 2,
+  "version": "23.10",
   "description": "Get most relevant technical and tag data from video and audio files",
   "homepage": "https://github.com/MediaArea/MediaInfoLib",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/libmediainfo/vcpkg_support_in_cmakelists.patch b/external_imported/vcpkg/ports/libmediainfo/vcpkg_support_in_cmakelists.patch
deleted file mode 100644
index c38c919c8..000000000
--- a/external_imported/vcpkg/ports/libmediainfo/vcpkg_support_in_cmakelists.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --git a/Project/CMake/CMakeLists.txt b/Project/CMake/CMakeLists.txt
-index f983343..c6ba5ea 100644
---- a/Project/CMake/CMakeLists.txt
-+++ b/Project/CMake/CMakeLists.txt
-@@ -88,7 +88,7 @@ endif()
- find_package(TinyXML)
- 
- # use system curl if is present
--find_package(CURL)
-+find_package(CURL CONFIG REQUIRED)
- 
- include_directories(${MediaInfoLib_SOURCES_PATH})
- include_directories(${MediaInfoLib_SOURCES_PATH}/ThirdParty/md5/)
-@@ -400,13 +400,7 @@ endif()
- target_link_libraries(mediainfo ${ZenLib_LIBRARY} ${ZLIB_LIBRARIES})
- 
- if(MSVC AND BUILD_SHARED_LIBS)
--  get_target_property(LOCATION mediainfo LOCATION_DEBUG)
--  string(REGEX REPLACE "\\.[^.]*$" ".pdb" LOCATION "${LOCATION}")
--  install(FILES ${LOCATION} DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug)
--
--  get_target_property(LOCATION mediainfo LOCATION_RELWITHDEBINFO)
--  string(REGEX REPLACE "\\.[^.]*$" ".pdb" LOCATION "${LOCATION}")
--  install(FILES ${LOCATION} DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo)
-+  install(FILES $<TARGET_PDB_FILE:mediainfo> DESTINATION ${BIN_INSTALL_DIR} OPTIONAL)
- endif()
- 
- if (APPLE)
-diff --git a/Source/ThirdParty/aes-gladman/aesopt.h b/Source/ThirdParty/aes-gladman/aesopt.h
-index d3ac0f9..eeefa40 100644
---- a/Source/ThirdParty/aes-gladman/aesopt.h
-+++ b/Source/ThirdParty/aes-gladman/aesopt.h
-@@ -183,7 +183,7 @@ Issue Date: 20/12/2007
- 	AES_REV_DKS must NOT be defined when such assembler files are
- 	built
- */
--#if 1 && defined( _WIN64 ) && defined( _MSC_VER )
-+#if 1 && defined( _WIN64 ) && defined( _MSC_VER ) && defined( _M_AMD64 )
- #  define INTEL_AES_POSSIBLE
- #endif
- 
-diff --git a/Source/ThirdParty/aes-gladman/brg_endian.h b/Source/ThirdParty/aes-gladman/brg_endian.h
-index b44c5cb..8c34364 100644
---- a/Source/ThirdParty/aes-gladman/brg_endian.h
-+++ b/Source/ThirdParty/aes-gladman/brg_endian.h
-@@ -110,7 +110,8 @@ Issue Date: 20/12/2007
-       defined( __MRC__ ) || defined( __MVS__ )   || defined( __MWERKS__ ) || \
-       defined( sparc )   || defined( __sparc)    || defined( SYMANTEC_C ) || \
-       defined( __VOS__ ) || defined( __TIGCC__ ) || defined( __TANDEM )   || \
--      defined( THINK_C ) || defined( __VMCMS__ ) || defined( _AIX )
-+      defined( THINK_C ) || defined( __VMCMS__ ) || defined( _AIX )       || \
-+      defined( _M_ARM64 ) || defined ( _M_ARM )
- #  define PLATFORM_BYTE_ORDER IS_BIG_ENDIAN
- 
- #elif 0     /* **** EDIT HERE IF NECESSARY **** */
diff --git a/external_imported/vcpkg/ports/libmesh/portfile.cmake b/external_imported/vcpkg/ports/libmesh/portfile.cmake
index c4810b560..b0cf639b4 100644
--- a/external_imported/vcpkg/ports/libmesh/portfile.cmake
+++ b/external_imported/vcpkg/ports/libmesh/portfile.cmake
@@ -16,7 +16,7 @@ endif()
 # but there are a lot more which need to be checked/fixed
 # So this port can only be considered a Work In Progress
 vcpkg_configure_make(
-    SOURCE_PATH ${SOURCE_PATH}
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS ${OPTIONS}
     OPTIONS_DEBUG --with-methods=dbg
     OPTIONS_RELEASE --with-methods=opt
@@ -24,30 +24,24 @@ vcpkg_configure_make(
 
 vcpkg_install_make()
 
-if (EXISTS ${CURRENT_PACKAGES_DIR}/contrib/bin/libtool)
-    file(COPY ${CURRENT_PACKAGES_DIR}/contrib/bin/libtool DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT})
-    file(REMOVE ${CURRENT_PACKAGES_DIR}/contrib/bin/libtool)
-endif()
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/contrib)
-
-file(GLOB LIBMESH_EXAMPLES ${CURRENT_PACKAGES_DIR}/examples/*)
-foreach (LIBMESH_EXAMPLE ${LIBMESH_EXAMPLES})
-    file(COPY ${LIBMESH_EXAMPLE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT})
-endforeach()
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/examples)
+file(RENAME "${CURRENT_PACKAGES_DIR}/examples" "${CURRENT_PACKAGES_DIR}/share/${PORT}/examples")
 
 if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
 
 # Remove tools and debug include directories
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/contrib ${CURRENT_PACKAGES_DIR}/debug/etc
-                    ${CURRENT_PACKAGES_DIR}/debug/examples ${CURRENT_PACKAGES_DIR}/debug/include
-                    ${CURRENT_PACKAGES_DIR}/debug/share ${CURRENT_PACKAGES_DIR}/tools/libmesh/debug
-                    ${CURRENT_PACKAGES_DIR}/Make.common ${CURRENT_PACKAGES_DIR}/debug/Make.common)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/contrib" "${CURRENT_PACKAGES_DIR}/debug/contrib"
+                    "${CURRENT_PACKAGES_DIR}/etc" "${CURRENT_PACKAGES_DIR}/debug/etc"
+                    "${CURRENT_PACKAGES_DIR}/debug/examples" "${CURRENT_PACKAGES_DIR}/debug/include"
+                    "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/tools/libmesh/debug"
+                    "${CURRENT_PACKAGES_DIR}/Make.common" "${CURRENT_PACKAGES_DIR}/debug/Make.common")
+
+file(GLOB config_files "${CURRENT_PACKAGES_DIR}/bin/*-config" "${CURRENT_PACKAGES_DIR}/debug/bin/*-config" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/*-config")
+file(REMOVE_RECURSE ${config_files})
 
 vcpkg_copy_pdbs()
 vcpkg_fixup_pkgconfig()
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libmesh/libmesh_config.h" "${CURRENT_INSTALLED_DIR}" "")
 
-file(INSTALL ${CURRENT_PORT_DIR}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-
+vcpkg_install_copyright(FILE_LIST "${CURRENT_PORT_DIR}/copyright")
diff --git a/external_imported/vcpkg/ports/libmesh/vcpkg.json b/external_imported/vcpkg/ports/libmesh/vcpkg.json
index d7240de55..3127369e0 100644
--- a/external_imported/vcpkg/ports/libmesh/vcpkg.json
+++ b/external_imported/vcpkg/ports/libmesh/vcpkg.json
@@ -1,8 +1,9 @@
 {
   "name": "libmesh",
   "version": "1.5.0",
-  "port-version": 4,
+  "port-version": 6,
   "description": "The libMesh library provides a framework for the numerical simulation of partial differential equations using arbitrary unstructured discretizations on serial and parallel platforms. A major goal of the library is to provide support for adaptive mesh refinement (AMR) computations in parallel while allowing a research scientist to focus on the physics they are modeling.",
   "homepage": "https://github.com/libMesh/libmesh",
-  "license": "LGPL-2.1-only"
+  "license": "LGPL-2.1-only",
+  "supports": "linux"
 }
diff --git a/external_imported/vcpkg/ports/libmicrodns/vcpkg.json b/external_imported/vcpkg/ports/libmicrodns/vcpkg.json
index b522539d5..82095357c 100644
--- a/external_imported/vcpkg/ports/libmicrodns/vcpkg.json
+++ b/external_imported/vcpkg/ports/libmicrodns/vcpkg.json
@@ -1,9 +1,11 @@
 {
   "name": "libmicrodns",
   "version": "0.2.0",
+  "port-version": 2,
   "description": "Minimal mDNS resolver (and announcer) library",
   "homepage": "https://github.com/videolabs/libmicrodns",
   "license": "LGPL-2.1-or-later",
+  "supports": "!xbox & !uwp",
   "dependencies": [
     {
       "name": "vcpkg-tool-meson",
diff --git a/external_imported/vcpkg/ports/libmicrohttpd/portfile.cmake b/external_imported/vcpkg/ports/libmicrohttpd/portfile.cmake
index 4fcca42aa..f689d7ccf 100644
--- a/external_imported/vcpkg/ports/libmicrohttpd/portfile.cmake
+++ b/external_imported/vcpkg/ports/libmicrohttpd/portfile.cmake
@@ -1,16 +1,15 @@
-set(MICROHTTPD_VERSION 0.9.75)
-
 vcpkg_download_distfile(ARCHIVE
     URLS
-        "https://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-${MICROHTTPD_VERSION}.tar.gz"
-        "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-${MICROHTTPD_VERSION}.tar.gz"
-    FILENAME "libmicrohttpd-${MICROHTTPD_VERSION}.tar.gz"
-    SHA512 4dc62ed191342a61cc2767171bb1ff4050f390db14ef7100299888237b52ea0b04b939c843878fe7f5daec2b35a47b3c1b7e7c11fb32d458184fe6b19986a37c
+        "https://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-${VERSION}.tar.gz"
+        "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-${VERSION}.tar.gz"
+    FILENAME "libmicrohttpd-${VERSION}.tar.gz"
+    SHA512 001025c023dd94c4a0cf017ed575e65a577b5ce595e7e450346bfb75def77eaa8a4cfbeffb9f4b912e34165c2cfca147c02c895e067a4f6c5a321a12035758a5
 )
 
-vcpkg_extract_source_archive_ex(
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
-    OUT_SOURCE_PATH SOURCE_PATH
+    PATCHES remove_pdb_install.patch
 )
 
 if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
@@ -20,27 +19,36 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
         set(CFG_SUFFIX "static")
     endif()
 
-    vcpkg_install_msbuild(
+    vcpkg_msbuild_install(
         SOURCE_PATH "${SOURCE_PATH}"
-        PROJECT_SUBPATH w32/VS2015/libmicrohttpd.vcxproj
+        PROJECT_SUBPATH w32/VS-Any-Version/libmicrohttpd.vcxproj
         RELEASE_CONFIGURATION "Release-${CFG_SUFFIX}"
         DEBUG_CONFIGURATION "Debug-${CFG_SUFFIX}"
     )
     
-    file(GLOB MICROHTTPD_HEADERS "${SOURCE_PATH}/src/include/microhttpd*.h")
+    file(GLOB MICROHTTPD_HEADERS "${SOURCE_PATH}/src/include/microhttpd.h")
     file(COPY ${MICROHTTPD_HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include")
 else()
+    vcpkg_list(SET config_args)
     if(VCPKG_TARGET_IS_OSX AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
         set(ENV{LIBS} "$ENV{LIBS} -framework Foundation -framework AppKit") # TODO: Get this from the extracted cmake vars somehow
     endif()
+    if("https" IN_LIST FEATURES)
+        vcpkg_list(APPEND config_args "--enable-https")
+    else()
+        vcpkg_list(APPEND config_args "--disable-https")
+    endif()
+
     vcpkg_configure_make(
         SOURCE_PATH "${SOURCE_PATH}"
         OPTIONS
             --disable-doc
+            --disable-nls
             --disable-examples
             --disable-curl
-            --disable-https
-            --with-gnutls=no
+            ${config_args}
+        OPTIONS_DEBUG --enable-asserts
+        OPTIONS_RELEASE --disable-asserts
     )
 
     vcpkg_install_make()
@@ -49,4 +57,4 @@ else()
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 endif()
 
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/libmicrohttpd/remove_pdb_install.patch b/external_imported/vcpkg/ports/libmicrohttpd/remove_pdb_install.patch
new file mode 100644
index 000000000..9b5e4eba9
--- /dev/null
+++ b/external_imported/vcpkg/ports/libmicrohttpd/remove_pdb_install.patch
@@ -0,0 +1,15 @@
+diff --git a/w32/common/libmicrohttpd-build-settings.props b/w32/common/libmicrohttpd-build-settings.props
+index 97d84a87f..8ffcb19c4 100644
+--- a/w32/common/libmicrohttpd-build-settings.props
++++ b/w32/common/libmicrohttpd-build-settings.props
+@@ -37,10 +37,6 @@
+     <Lib>
+       <AdditionalDependencies>Ws2_32.lib</AdditionalDependencies>
+     </Lib>
+-    <PostBuildEvent>
+-      <Command>xcopy /F /I /Y "$(IntermediateOutputPath)$(TargetName).pdb" "$(OutputPath)"</Command>
+-      <Message>Copy .pdb to output directory</Message>
+-    </PostBuildEvent>
+   </ItemDefinitionGroup>
+   <ItemDefinitionGroup Condition="'$(ConfigurationType)'=='DynamicLibrary'">
+     <ClCompile>
diff --git a/external_imported/vcpkg/ports/libmicrohttpd/vcpkg.json b/external_imported/vcpkg/ports/libmicrohttpd/vcpkg.json
index 1418a7ff4..c47efff7b 100644
--- a/external_imported/vcpkg/ports/libmicrohttpd/vcpkg.json
+++ b/external_imported/vcpkg/ports/libmicrohttpd/vcpkg.json
@@ -1,13 +1,29 @@
 {
   "name": "libmicrohttpd",
-  "version": "0.9.75",
+  "version": "0.9.77",
+  "port-version": 2,
   "description": "GNU libmicrohttpd is a small C library that is supposed to make it easy to run an HTTP server as part of another application",
   "homepage": "https://www.gnu.org/software/libmicrohttpd/",
-  "supports": "!(arm | uwp)",
+  "license": "LGPL-2.1-or-later",
+  "supports": "!((arm & windows) | uwp)",
   "dependencies": [
     {
       "name": "gettext",
       "platform": "!windows"
+    },
+    {
+      "name": "vcpkg-msbuild",
+      "host": true,
+      "platform": "windows"
+    }
+  ],
+  "features": {
+    "https": {
+      "description": "Enable HTTPS protocol support",
+      "supports": "!windows | mingw",
+      "dependencies": [
+        "libgnutls"
+      ]
     }
-  ]
+  }
 }
diff --git a/external_imported/vcpkg/ports/libmikmod/vcpkg.json b/external_imported/vcpkg/ports/libmikmod/vcpkg.json
index fa13d1eb9..03bf5c263 100644
--- a/external_imported/vcpkg/ports/libmikmod/vcpkg.json
+++ b/external_imported/vcpkg/ports/libmikmod/vcpkg.json
@@ -1,11 +1,11 @@
 {
   "name": "libmikmod",
   "version": "3.3.11.1",
-  "port-version": 11,
+  "port-version": 12,
   "description": "Mikmod is a module player and library supporting many formats, including mod, s3m, it, and xm.",
   "homepage": "https://sourceforge.net/projects/mikmod/",
   "license": "LGPL-2.1-or-later",
-  "supports": "!osx & !uwp",
+  "supports": "!(osx | uwp | xbox)",
   "dependencies": [
     "openal-soft",
     {
diff --git a/external_imported/vcpkg/ports/libmodbus/portfile.cmake b/external_imported/vcpkg/ports/libmodbus/portfile.cmake
index 59487c1eb..3e1631590 100644
--- a/external_imported/vcpkg/ports/libmodbus/portfile.cmake
+++ b/external_imported/vcpkg/ports/libmodbus/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO stephane/libmodbus
-    REF v3.1.6
-    SHA512 9eaa395c75e1170e703e01f8c52c6e6e87efe4eaa22adfc3b51153fd5535d545aea35cf68e1aba29720a6c1dd13d9c60b6b08a5c8098dccd13ccfdc6944420a9
+    REF "v${VERSION}"
+    SHA512 6a01da1f8b486e356ff44874f1479d9d121463958a5ed06e60d910328ccc9b2d431b4a1fd72861c5c645c97b5887a076b763ad6a9ae6b18402dd043ec525b1e2
     HEAD_REF master
     PATCHES fix-static-linkage.patch
 )
@@ -26,6 +26,6 @@ if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
 endif()
 
 # Handle copyright
-file(INSTALL "${SOURCE_PATH}/COPYING.LESSER" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING.LESSER")
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/external_imported/vcpkg/ports/libmodbus/vcpkg.json b/external_imported/vcpkg/ports/libmodbus/vcpkg.json
index f42ee0aae..1f383188a 100644
--- a/external_imported/vcpkg/ports/libmodbus/vcpkg.json
+++ b/external_imported/vcpkg/ports/libmodbus/vcpkg.json
@@ -1,11 +1,10 @@
 {
   "name": "libmodbus",
-  "version": "3.1.6",
-  "port-version": 4,
+  "version": "3.1.10",
   "description": "libmodbus is a free software library to send/receive data with a device which respects the Modbus protocol",
   "homepage": "https://github.com/stephane/libmodbus",
   "license": "LGPL-2.1-or-later",
-  "supports": "!uwp",
+  "supports": "!uwp & !xbox",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/libmodman/portfile.cmake b/external_imported/vcpkg/ports/libmodman/portfile.cmake
index 816160f30..82ef06cc8 100644
--- a/external_imported/vcpkg/ports/libmodman/portfile.cmake
+++ b/external_imported/vcpkg/ports/libmodman/portfile.cmake
@@ -11,13 +11,13 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 1fecc0fa3637c4aa86d114f5bc991605172d39183fa0f39d8c7858ef5d0d894152025bd426de4dd017a41372d800bf73f53b2328c57b77352a508e12792729fa
 )
 
-vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS 
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES 
     tests BUILD_TESTING
 )
 
-vcpkg_extract_source_archive_ex(
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE ${ARCHIVE}
-    OUT_SOURCE_PATH SOURCE_PATH
     PATCHES
         fix-install-path.patch
         fix-undefined-typeid.patch
diff --git a/external_imported/vcpkg/ports/libmodman/vcpkg.json b/external_imported/vcpkg/ports/libmodman/vcpkg.json
index 4b00d5851..8d9ec1170 100644
--- a/external_imported/vcpkg/ports/libmodman/vcpkg.json
+++ b/external_imported/vcpkg/ports/libmodman/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libmodman",
-  "version-string": "2.0.1",
-  "port-version": 4,
+  "version": "2.0.1",
+  "port-version": 5,
   "description": "a simple library for managing modules",
   "homepage": "https://code.google.com/p/libmodman",
   "supports": "!uwp",
diff --git a/external_imported/vcpkg/ports/libmorton/portfile.cmake b/external_imported/vcpkg/ports/libmorton/portfile.cmake
index 80c774e0e..46e3dd457 100644
--- a/external_imported/vcpkg/ports/libmorton/portfile.cmake
+++ b/external_imported/vcpkg/ports/libmorton/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Forceflow/libmorton
     REF "v${VERSION}"
-    SHA512 ff1b0ebca3d38e886b4320bab38360dd537c3f63bf02aedfe5b00a81e026e52aff1a929361f8e2c4de9a18272a9e2a24c0085d7beb1be0adf6434777aad02ae5
+    SHA512 020d9ba97204b8c028a8700d7212821dd75b6dbe1b4a77776777d06ef29bcad75cdc4e830f211daf6250779cc81ed4842a0632f89a7b7017eb071869a3c938fa
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/libmorton/vcpkg.json b/external_imported/vcpkg/ports/libmorton/vcpkg.json
index 8fff9e427..084c22d58 100644
--- a/external_imported/vcpkg/ports/libmorton/vcpkg.json
+++ b/external_imported/vcpkg/ports/libmorton/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "libmorton",
-  "version": "0.2.11",
+  "version": "0.2.12",
   "description": "Header-only library for encoding/decoding Morton codes in/from 2D/3D coordinates",
   "dependencies": [
     {
diff --git a/external_imported/vcpkg/ports/libmount/portfile.cmake b/external_imported/vcpkg/ports/libmount/portfile.cmake
index d34ecb7dd..3bba418e2 100644
--- a/external_imported/vcpkg/ports/libmount/portfile.cmake
+++ b/external_imported/vcpkg/ports/libmount/portfile.cmake
@@ -1,41 +1,50 @@
-set(VERSION_MAJOR 2)
-set(VERSION_MINOR 38)
-set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR})
-
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v${VERSION_MAJOR}.${VERSION_MINOR}/util-linux-${VERSION}.tar.xz"
+    URLS "https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v${VERSION}/util-linux-${VERSION}.tar.xz"
     FILENAME "util-linux-${VERSION}.tar.xz"
-    SHA512 d0f7888f457592067938e216695871ce6475a45d83a092cc3fd72b8cf8fca145ca5f3a99122f1744ef60b4f773055cf4e178dc6c59cd30837172aee0b5597e8c
+    SHA512 3d59a0f114c06be19ef7f86fca37ba5b9073823d011b3fc37997ddb00124b4505ea32903b78798a64dffbccf0ba645a692678ee845cc65a5b321824448a82a94
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
-    REF ${VERSION}
+    SOURCE_BASE ${VERSION}
 )
 
 set(ENV{GTKDOCIZE} true)
 
+vcpkg_list(SET options)
+if("nls" IN_LIST FEATURES)
+    vcpkg_list(APPEND options "--enable-nls")
+else()
+    set(ENV{AUTOPOINT} true) # true, the program
+    vcpkg_list(APPEND options "--disable-nls")
+endif()
+
 vcpkg_configure_make(
     AUTOCONFIG
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
+        ${options}
         --disable-asciidoc
         --disable-all-programs
+        --disable-dependency-tracking
         --enable-libmount
         --enable-libblkid
+        "--mandir=${CURRENT_PACKAGES_DIR}/share/man"
 )
 
 vcpkg_install_make()
 vcpkg_fixup_pkgconfig()
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/sbin" "${CURRENT_PACKAGES_DIR}/debug/sbin")
-endif()
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools") # empty folder
+file(REMOVE_RECURSE
+    "${CURRENT_PACKAGES_DIR}/debug/bin"
+    "${CURRENT_PACKAGES_DIR}/debug/sbin"
+    "${CURRENT_PACKAGES_DIR}/debug/share"
+    "${CURRENT_PACKAGES_DIR}/bin"
+    "${CURRENT_PACKAGES_DIR}/sbin"
+    "${CURRENT_PACKAGES_DIR}/share"
+    "${CURRENT_PACKAGES_DIR}/tools"
+)
 
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/README.licensing" "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/libmount/vcpkg.json b/external_imported/vcpkg/ports/libmount/vcpkg.json
index 5f0bf1834..55da323da 100644
--- a/external_imported/vcpkg/ports/libmount/vcpkg.json
+++ b/external_imported/vcpkg/ports/libmount/vcpkg.json
@@ -1,9 +1,23 @@
 {
   "name": "libmount",
-  "version": "2.38",
-  "port-version": 1,
+  "version": "2.39",
   "description": "Block device identification library from util-linux",
   "homepage": "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/about/",
-  "license": "GPL-2.0-only",
-  "supports": "linux"
+  "license": null,
+  "supports": "linux",
+  "features": {
+    "nls": {
+      "description": "Enable native language support",
+      "dependencies": [
+        {
+          "name": "gettext",
+          "host": true,
+          "features": [
+            "tools"
+          ]
+        },
+        "gettext-libintl"
+      ]
+    }
+  }
 }
diff --git a/external_imported/vcpkg/ports/libmspack/portfile.cmake b/external_imported/vcpkg/ports/libmspack/portfile.cmake
index ad80eadc3..07d318fd8 100644
--- a/external_imported/vcpkg/ports/libmspack/portfile.cmake
+++ b/external_imported/vcpkg/ports/libmspack/portfile.cmake
@@ -1,11 +1,11 @@
 set(LIB_NAME libmspack)
-set(LIB_VERSION 0.10.1alpha)
+set(LIB_VERSION 0.11alpha)
 set(LIB_FILENAME ${LIB_NAME}-${LIB_VERSION}.tar.gz)
 
 vcpkg_download_distfile(ARCHIVE
     URLS "https://www.cabextract.org.uk/libmspack/${LIB_FILENAME}"
     FILENAME "${LIB_FILENAME}"
-    SHA512 a7b5f7caa49190c5021f3e768b92f2e51cc0ce685c9ab6ed6fb36de885c73231b58d47a8a3b5c5aa5c9ac56c25c500eb683d84dbf11f09f97f6cb4fff5adc245
+    SHA512 40c487e5b4e2f63a6cada26d29db51f605e8c29525a1cb088566d02cf2b1cc9dba263f80e2101d7f8e9d69cf7684a15bcaf791fb4891ad013a56afc7256dfa62
 )
 
 vcpkg_extract_source_archive(
diff --git a/external_imported/vcpkg/ports/libmspack/vcpkg.json b/external_imported/vcpkg/ports/libmspack/vcpkg.json
index bbdb83f7a..468378b5b 100644
--- a/external_imported/vcpkg/ports/libmspack/vcpkg.json
+++ b/external_imported/vcpkg/ports/libmspack/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "libmspack",
-  "version-string": "0.10.1",
-  "port-version": 5,
+  "version": "0.11",
   "description": "libmspack is a portable library for some loosely related Microsoft compression formats.",
   "homepage": "https://www.cabextract.org.uk/libmspack",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/libmt32emu/portfile.cmake b/external_imported/vcpkg/ports/libmt32emu/portfile.cmake
index a7fc0a2c6..5741c5ecc 100644
--- a/external_imported/vcpkg/ports/libmt32emu/portfile.cmake
+++ b/external_imported/vcpkg/ports/libmt32emu/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO munt/munt
-    REF 08aba2f0018f4e7c2af855c268a97b8b84f8dc06  #vlibmt32emu_2_7_0
-    SHA512 ef277767c6c18b1aa341b2e2cdac04c27bc19ef0aa2f1e0a4125c92128f64d5938eab53cf1d6bf2f9abaa5a59d14873e91e1518878165af48ac6b93c3e208aa5
+    REF libmt32emu_2_7_1
+    SHA512 369d1c5f16b37f3d8544ad30a30c3aa9d0796f67fcf5988e789958bff14bba119f7c5fd4c43816eb369a14b56f22f0c7eb3016ff838cd36d1d6f22ed84a2e8b9
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/libmt32emu/vcpkg.json b/external_imported/vcpkg/ports/libmt32emu/vcpkg.json
index 45be996b2..ae3ea2bf0 100644
--- a/external_imported/vcpkg/ports/libmt32emu/vcpkg.json
+++ b/external_imported/vcpkg/ports/libmt32emu/vcpkg.json
@@ -1,8 +1,8 @@
 {
   "name": "libmt32emu",
-  "version": "2.7.0",
+  "version": "2.7.1",
   "description": "A MT-32 emulator",
-  "homepage": "https://github.com/munt/munt/tree/master/mt32emu",
+  "homepage": "https://github.com/munt/munt",
   "license": "GPL-2.0-or-later",
   "dependencies": [
     {
diff --git a/external_imported/vcpkg/ports/libmupdf/CMakeLists.txt b/external_imported/vcpkg/ports/libmupdf/CMakeLists.txt
index 95ec646f8..9e3b5030d 100644
--- a/external_imported/vcpkg/ports/libmupdf/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/libmupdf/CMakeLists.txt
@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.9)
-project(libmupdf C)
+project(libmupdf)
+
+option(ENABLE_OCR "Build with OCR" OFF)
 
 set(CMAKE_DEBUG_POSTFIX d)
 
@@ -25,11 +27,20 @@ find_package(ZLIB REQUIRED)
 find_package(OpenJPEG CONFIG REQUIRED)
 find_library(JBIG2DEC_LIB NAMES jbig2decd jbig2dec)
 
-file(GLOB_RECURSE SOURCES "source/*.c" "generated/*.c")
+if (ENABLE_OCR)
+  find_package(Leptonica CONFIG REQUIRED)
+  find_package(Tesseract CONFIG REQUIRED)
+endif()
+
+file(GLOB_RECURSE SOURCES "source/*.c" "generated/*.c" "source/*.h")
 list(FILTER SOURCES EXCLUDE REGEX "source/tools/[a-z]*\\.c$")
 list(FILTER SOURCES EXCLUDE REGEX "source/tests/.*.c$")
 list(FILTER SOURCES EXCLUDE REGEX "source/fitz/output-docx.c")
 
+if (ENABLE_OCR)
+  list(APPEND SOURCES "source/fitz/tessocr.cpp")
+endif()
+
 add_library(libmupdf ${SOURCES})
 
 if(WIN32)
@@ -37,6 +48,14 @@ if(WIN32)
 else()
   target_compile_definitions(libmupdf PRIVATE -DHAVE_PTHREAD=1 -DSHARE_JPEG -DFZ_ENABLE_JS=0 -DFZ_ENABLE_ICC=0 -DMEMENTO_MUPDF_HACKS -DFZ_ENABLE_DOCX_OUTPUT=0 -DFZ_ENABLE_ODT_OUTPUT=0)
 endif()
+
+
+if (ENABLE_OCR)
+  target_compile_definitions(libmupdf PRIVATE -DHAVE_TESSERACT=1 -DHAVE_LEPTONICA=1)
+else()
+  target_compile_definitions(libmupdf PRIVATE -DOCR_DISABLED=1)
+endif()
+
 target_include_directories(libmupdf
   PUBLIC
     include
@@ -45,6 +64,14 @@ target_include_directories(libmupdf
     ${JPEG_INCLUDE_DIR}
     ${HARFBUZZ_INCLUDE}
 )
+
+if (ENABLE_OCR)
+target_include_directories(libmupdf
+  PRIVATE
+    ${Leptonica_INCLUDE_DIRS}
+)
+endif()
+
 target_link_libraries(libmupdf PRIVATE
   openjp2
   freetype
diff --git a/external_imported/vcpkg/ports/libmupdf/portfile.cmake b/external_imported/vcpkg/ports/libmupdf/portfile.cmake
index 3ef0146ba..1f9fbf4b2 100644
--- a/external_imported/vcpkg/ports/libmupdf/portfile.cmake
+++ b/external_imported/vcpkg/ports/libmupdf/portfile.cmake
@@ -3,21 +3,27 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ArtifexSoftware/mupdf
-    REF 61b63d734a7b9df618f6b45dda2466aed442f7f0 # 1.19.0-rc2
-    SHA512 16661c012e18ac72b24c46caf5c02515c29a05e0a8dcf95076eff3a1f2e87c225245037480ed37068858fe6e04ff4a404f69877599b208ab9265d054ec117820
+    REF "${VERSION}"
+    SHA512 8109630f4dba31ff05458b69626c99ab36ddd47be42c03dd1f3962bf2be5d520be97a1c7e97a72307faa57a96c1ff50e8e3a593c519e47e5eb71897e7e373825
     HEAD_REF master
     PATCHES
         dont-generate-extract-3rd-party-things.patch
-        use-if-instead-of-ifdef-in-writer.patch
 )
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
+vcpkg_check_features(
+    OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        ocr ENABLE_OCR
+)
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE
     OPTIONS
         -DBUILD_EXAMPLES=OFF
+	${FEATURE_OPTIONS}
 )
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/libmupdf/use-if-instead-of-ifdef-in-writer.patch b/external_imported/vcpkg/ports/libmupdf/use-if-instead-of-ifdef-in-writer.patch
deleted file mode 100644
index 25dff5960..000000000
--- a/external_imported/vcpkg/ports/libmupdf/use-if-instead-of-ifdef-in-writer.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/source/fitz/writer.c
-+++ b/source/fitz/writer.c
-@@ -169,7 +169,7 @@ fz_new_document_writer(fz_context *ctx, const char *path, const char *explicit_f
-                format = strrchr(path, '.');
-        while (format)
-        {
--#ifdef FZ_ENABLE_OCR_OUTPUT
-+#if FZ_ENABLE_OCR_OUTPUT
-                if (is_extension(format, "ocr"))
-                        return fz_new_pdfocr_writer(ctx, path, options);
- #endif
-@@ -219,11 +219,11 @@ fz_new_document_writer(fz_context *ctx, const char *path, const char *explicit_f
-                if (is_extension(format, "stext.json"))
-                        return fz_new_text_writer(ctx, "stext.json", path, options);
- 
--#ifdef FZ_ENABLE_ODT_OUTPUT
-+#if FZ_ENABLE_ODT_OUTPUT
-                if (is_extension(format, "odt"))
-                        return fz_new_odt_writer(ctx, path, options);
- #endif
--#ifdef FZ_ENABLE_DOCX_OUTPUT
-+#if FZ_ENABLE_DOCX_OUTPUT
-                if (is_extension(format, "docx"))
-                        return fz_new_docx_writer(ctx, path, options);
- #endif
-@@ -267,11 +267,11 @@ fz_new_document_writer_with_output(fz_context *ctx, fz_output *out, const char *
-        if (is_extension(format, "stext.json"))
-                return fz_new_text_writer_with_output(ctx, "stext.json", out, options);
- 
--#ifdef FZ_ENABLE_ODT_OUTPUT
-+#if FZ_ENABLE_ODT_OUTPUT
-        if (is_extension(format, "odt"))
-                return fz_new_odt_writer_with_output(ctx, out, options);
- #endif
--#ifdef FZ_ENABLE_DOCX_OUTPUT
-+#if FZ_ENABLE_DOCX_OUTPUT
-        if (is_extension(format, "docx"))
-                return fz_new_docx_writer_with_output(ctx, out, options);
- #endif
diff --git a/external_imported/vcpkg/ports/libmupdf/vcpkg.json b/external_imported/vcpkg/ports/libmupdf/vcpkg.json
index d6c2cd491..b3e9330bd 100644
--- a/external_imported/vcpkg/ports/libmupdf/vcpkg.json
+++ b/external_imported/vcpkg/ports/libmupdf/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "libmupdf",
-  "version": "1.19.0-rc2",
+  "version": "1.22.1",
   "port-version": 1,
   "description": "a lightweight PDF, XPS, and E-book library",
   "homepage": "https://github.com/ArtifexSoftware/mupdf",
+  "license": "AGPL-3.0-only",
   "supports": "!osx",
   "dependencies": [
     "curl",
@@ -19,5 +20,14 @@
       "host": true
     },
     "zlib"
-  ]
+  ],
+  "features": {
+    "ocr": {
+      "description": "Enable OCR support",
+      "dependencies": [
+        "leptonica",
+        "tesseract"
+      ]
+    }
+  }
 }
diff --git a/external_imported/vcpkg/ports/libmysql/004-added-limits-include.patch b/external_imported/vcpkg/ports/libmysql/004-added-limits-include.patch
deleted file mode 100644
index d02641ad7..000000000
--- a/external_imported/vcpkg/ports/libmysql/004-added-limits-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/sql-common/sql_string.cc b/sql-common/sql_string.cc
-index 40435729..8b6ee827 100644
---- a/sql-common/sql_string.cc
-+++ b/sql-common/sql_string.cc
-@@ -23,6 +23,7 @@
- #include "sql_string.h"
- 
- #include <algorithm>
-+#include <limits>
- 
- #include "my_dbug.h"
- #include "my_macros.h"
diff --git a/external_imported/vcpkg/ports/libmysql/Add-target-include-directories.patch b/external_imported/vcpkg/ports/libmysql/Add-target-include-directories.patch
deleted file mode 100644
index 87b0ba640..000000000
--- a/external_imported/vcpkg/ports/libmysql/Add-target-include-directories.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake
-index 88b53e7..f49e44d 100644
---- a/cmake/libutils.cmake
-+++ b/cmake/libutils.cmake
-@@ -179,6 +179,7 @@ MACRO(MERGE_LIBRARIES_SHARED)
-     ADD_VERSION_INFO(${TARGET} SHARED SRC)
-   ENDIF()
-   ADD_LIBRARY(${TARGET} SHARED ${SRC})
-+  TARGET_INCLUDE_DIRECTORIES(${TARGET} INTERFACE $<INSTALL_INTERFACE:include>)
- 
-   IF(ARG_EXCLUDE_FROM_ALL)
-     IF(NOT ARG_SKIP_INSTALL)
-@@ -274,6 +275,7 @@ MACRO(MERGE_CONVENIENCE_LIBRARIES)
-   SET(SOURCE_FILE
-     ${CMAKE_BINARY_DIR}/archive_output_directory/${TARGET}_depends.c)
-   ADD_LIBRARY(${TARGET} STATIC ${SOURCE_FILE})
-+  TARGET_INCLUDE_DIRECTORIES(${TARGET} INTERFACE $<INSTALL_INTERFACE:include>)
- 
-   IF(ARG_EXCLUDE_FROM_ALL)
-     IF(NOT ARG_SKIP_INSTALL)
diff --git a/external_imported/vcpkg/ports/libmysql/cross-build.patch b/external_imported/vcpkg/ports/libmysql/cross-build.patch
new file mode 100644
index 000000000..a91118b4f
--- /dev/null
+++ b/external_imported/vcpkg/ports/libmysql/cross-build.patch
@@ -0,0 +1,162 @@
+diff --git a/cmake/os/Darwin.cmake b/cmake/os/Darwin.cmake
+index 725b9bd..289bb3d 100644
+--- a/cmake/os/Darwin.cmake
++++ b/cmake/os/Darwin.cmake
+@@ -31,13 +31,9 @@ ENDIF()
+ # We require at least XCode 10.0
+ IF(NOT FORCE_UNSUPPORTED_COMPILER)
+   IF(MY_COMPILER_IS_CLANG)
+-    CHECK_C_SOURCE_RUNS("
+-      int main()
+-      {
+-        return (__clang_major__ < 10);
+-      }" HAVE_SUPPORTED_CLANG_VERSION)
+-    IF(NOT HAVE_SUPPORTED_CLANG_VERSION)
+-      MESSAGE(FATAL_ERROR "XCode 10.0 or newer is required!")
++    IF (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10)
++      MESSAGE(FATAL_ERROR
++        "XCode 10.0 or newer is required! Compiler version was ${CMAKE_CXX_COMPILER_VERSION}")
+     ENDIF()
+   ELSE()
+     MESSAGE(FATAL_ERROR "Unsupported compiler!")
+diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt
+index 8e22453..2b63413 100644
+--- a/libmysql/CMakeLists.txt
++++ b/libmysql/CMakeLists.txt
+@@ -259,6 +259,7 @@ ELSEIF(FREEBSD)
+   MESSAGE(STATUS "BSD built in DNS SRV APIs")
+ ELSE()
+   FIND_LIBRARY(RESOLV_LIBRARY NAMES resolv)
++  FIND_LIBRARY(RESOLV_LIBRARY NAMES resolv PATHS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES} NO_DEFAULT_PATH)
+   IF (RESOLV_LIBRARY)
+     LIST(APPEND LIBS_TO_LINK ${RESOLV_LIBRARY})
+     SET(HAVE_UNIX_DNS_SRV 1 PARENT_SCOPE)
+@@ -413,6 +414,7 @@ MYSQL_ADD_EXECUTABLE(libmysql_api_test
+   ${CMAKE_CURRENT_BINARY_DIR}/api_test.c
+   LINK_LIBRARIES libmysql ${LIBRT}
+   SKIP_INSTALL
++  EXCLUDE_FROM_ALL
+   )
+ # Clang/UBSAN needs this on some platforms.
+ SET_TARGET_PROPERTIES(libmysql_api_test PROPERTIES LINKER_LANGUAGE CXX)
+@@ -439,6 +441,6 @@ ADD_CUSTOM_COMMAND(
+   COMMAND libmysql_api_test
+   > ${CMAKE_CURRENT_BINARY_DIR}/libmysql_api_test.out
+   )
+-MY_ADD_CUSTOM_TARGET(run_libmysql_api_test ALL
++MY_ADD_CUSTOM_TARGET(run_libmysql_api_test
+   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/libmysql_api_test.out
+   )
+diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
+index 8e93387..d971acb 100644
+--- a/scripts/CMakeLists.txt
++++ b/scripts/CMakeLists.txt
+@@ -69,7 +69,6 @@ ADD_CUSTOM_COMMAND(
+ 
+ # Add target for the above to be built
+ MY_ADD_CUSTOM_TARGET(GenFixPrivs
+-  ALL
+   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.h
+ )
+ 
+diff --git a/scripts/sys_schema/CMakeLists.txt b/scripts/sys_schema/CMakeLists.txt
+index aaba357..a0e5265 100644
+--- a/scripts/sys_schema/CMakeLists.txt
++++ b/scripts/sys_schema/CMakeLists.txt
+@@ -221,7 +221,6 @@ MY_ADD_CUSTOM_TARGET(sql_commands
+   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/sql_commands.h)
+ 
+ MY_ADD_CUSTOM_TARGET(GenSysSchemaC
+-  ALL
+   DEPENDS comp_sql sql_commands
+   COMMENT "Generating Sys Schema C code"
+ )
+diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
+index 28cde40..be916cb 100644
+--- a/share/CMakeLists.txt
++++ b/share/CMakeLists.txt
+@@ -47,8 +47,12 @@ SET(dirs
+   ukrainian
+   )
+ 
+-FOREACH (dir ${dirs})
+-  INSTALL(DIRECTORY ${CMAKE_BINARY_DIR}/${INSTALL_MYSQLSHAREDIR}/${dir}
++  set(src_dir ${CMAKE_BINARY_DIR}/share/libmysql)
++  if(CMAKE_CROSSCOMPILING)
++    set(src_dir ${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/share/libmysql)
++  endif()
++  FOREACH (dir ${dirs})
++  INSTALL(DIRECTORY ${src_dir}/${dir}
+     DESTINATION ${INSTALL_MYSQLSHAREDIR}
+     COMPONENT Server
+     )
+diff --git a/strings/CMakeLists.txt b/strings/CMakeLists.txt
+index 665b35d..88f0743 100644
+--- a/strings/CMakeLists.txt
++++ b/strings/CMakeLists.txt
+@@ -69,6 +69,13 @@ SET(ZH_HANS_SRC_FILE ${CMAKE_SOURCE_DIR}/strings/lang_data/zh_hans.txt)
+ SET(ZH_HANS_DST_FILE ${CMAKE_BINARY_DIR}/strings/uca900_zh_tbls.cc)
+ SET(JA_HANS_SRC_FILE ${CMAKE_SOURCE_DIR}/strings/lang_data/ja_hans.txt)
+ SET(JA_HANS_DST_FILE ${CMAKE_BINARY_DIR}/strings/uca900_ja_tbls.cc)
++if(CMAKE_CROSSCOMPILING)
++  file(COPY
++    "${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/share/libmysql/${PROJECT_VERSION}/uca900_zh_tbls.cc"
++    "${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/share/libmysql/${PROJECT_VERSION}/uca900_ja_tbls.cc"
++    DESTINATION "${CMAKE_BINARY_DIR}/strings"
++  )
++else()
+ ADD_CUSTOM_COMMAND(OUTPUT ${ZH_HANS_DST_FILE}
+                           ${JA_HANS_DST_FILE}
+                    COMMAND uca9dump zh
+@@ -79,6 +86,8 @@ ADD_CUSTOM_COMMAND(OUTPUT ${ZH_HANS_DST_FILE}
+                      --out_file=${JA_HANS_DST_FILE}
+                    DEPENDS uca9dump ${ZH_HANS_SRC_FILE} ${JA_HANS_SRC_FILE}
+                   )
++install(FILES "${ZH_HANS_DST_FILE}" "${JA_HANS_DST_FILE}" DESTINATION "share/libmysql/${PROJECT_VERSION}")
++endif()
+ 
+ SET_SOURCE_FILES_PROPERTIES(
+   ${JA_HANS_DST_FILE} ${ZH_HANS_DST_FILE}
+diff --git a/utilities/CMakeLists.txt b/utilities/CMakeLists.txt
+index da34524..dc397da 100644
+--- a/utilities/CMakeLists.txt
++++ b/utilities/CMakeLists.txt
+@@ -39,6 +39,21 @@ MYSQL_ADD_EXECUTABLE(comp_client_err
+   SKIP_INSTALL
+   )
+ 
++if(CMAKE_CROSSCOMPILING)
++  file(COPY
++    ${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/include/mysql/mysqld_error.h
++    ${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/share/libmysql/${PROJECT_VERSION}/mysqlclient_ername.h
++    ${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/share/libmysql/${PROJECT_VERSION}/mysqld_ername.h
++    ${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/share/libmysql/${PROJECT_VERSION}/mysqld_errmsg.h
++    DESTINATION ${PROJECT_BINARY_DIR}/include
++  )
++  file(COPY
++    ${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/share/libmysql/${PROJECT_VERSION}/errmsg.sys
++    DESTINATION ${PROJECT_BINARY_DIR}/share/libmysql/english
++  )
++  add_custom_target(GenClientError)
++  add_custom_target(GenError)
++else()
+ ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/include/mysqlclient_ername.h
+   COMMAND comp_client_err
+   --in_file=${PROJECT_SOURCE_DIR}/include/errmsg.h
+@@ -97,6 +112,16 @@ MYSQL_ADD_EXECUTABLE(range_check_err
+   SKIP_INSTALL
+   )
+ 
++  install(
++    FILES
++      ${PROJECT_BINARY_DIR}/include/mysqlclient_ername.h
++      ${PROJECT_BINARY_DIR}/include/mysqld_ername.h
++      ${PROJECT_BINARY_DIR}/include/mysqld_errmsg.h
++      ${PROJECT_BINARY_DIR}/share/libmysql/english/errmsg.sys
++    DESTINATION share/libmysql/${PROJECT_VERSION}
++  )
++endif()
++
+ # Set InnoDB mutex type
+ ADD_DEFINITIONS(-DMUTEX_EVENT)
+ 
diff --git a/external_imported/vcpkg/ports/libmysql/dependencies.patch b/external_imported/vcpkg/ports/libmysql/dependencies.patch
new file mode 100644
index 000000000..0129d71e9
--- /dev/null
+++ b/external_imported/vcpkg/ports/libmysql/dependencies.patch
@@ -0,0 +1,140 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e17ec1d0..465e42f0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -818,8 +818,12 @@ INCLUDE(fileutils)
+ INCLUDE(zlib)
+ INCLUDE(zstd)
+ INCLUDE(lz4)
+-INCLUDE(icu)
+-INCLUDE(libevent)
++macro(MYSQL_CHECK_ICU)
++endmacro()
++macro(MYSQL_CHECK_LIBEVENT)
++endmacro()
++macro(WARN_MISSING_SYSTEM_LIBEVENT)
++endmacro()
+ INCLUDE(ssl)
+ INCLUDE(sasl)
+ INCLUDE(ldap)
+@@ -837,7 +841,8 @@ INCLUDE(curl)
+ INCLUDE(rapidjson)
+ INCLUDE(fprofile)
+ INCLUDE(gloves)
+-INCLUDE(fido2)
++macro(MYSQL_CHECK_FIDO)
++endmacro()
+ INCLUDE(win_jemalloc)
+ 
+ IF(UNIX)
+@@ -1942,7 +1947,7 @@ MYSQL_CHECK_RAPIDJSON()
+ MYSQL_CHECK_FIDO()
+ MYSQL_CHECK_FIDO_DLLS()
+ 
+-IF(APPLE)
++IF(0)
+   GET_FILENAME_COMPONENT(HOMEBREW_BASE ${HOMEBREW_HOME} DIRECTORY)
+   IF(EXISTS ${HOMEBREW_BASE}/include/boost)
+     FOREACH(SYSTEM_LIB ICU LIBEVENT LZ4 PROTOBUF ZSTD FIDO)
+diff --git a/cmake/boost.cmake b/cmake/boost.cmake
+index c979055c..53e55fcf 100644
+--- a/cmake/boost.cmake
++++ b/cmake/boost.cmake
+@@ -301,7 +301,7 @@ IF(NOT BOOST_MAJOR_VERSION EQUAL 10)
+   COULD_NOT_FIND_BOOST()
+ ENDIF()
+ 
+-IF(NOT BOOST_MINOR_VERSION EQUAL 77)
++IF(NOT BOOST_MINOR_VERSION EQUAL 77 AND NOT IGNORE_BOOST_VERSION)
+   MESSAGE(WARNING "Boost minor version found is ${BOOST_MINOR_VERSION} "
+     "we need 77"
+     )
+diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake
+index 7107f4bd..bb7f3733 100644
+--- a/cmake/libutils.cmake
++++ b/cmake/libutils.cmake
+@@ -534,7 +534,7 @@ MACRO(MERGE_CONVENIENCE_LIBRARIES TARGET_ARG)
+ 
+   # On Windows, ssleay32.lib/libeay32.lib or libssl.lib/libcrypto.lib
+   # must be merged into mysqlclient.lib
+-  IF(WIN32 AND ${TARGET} STREQUAL "mysqlclient")
++  IF(0)
+     SET(LINKER_EXTRA_FLAGS "")
+     FOREACH(LIB ${SSL_LIBRARIES})
+       STRING_APPEND(LINKER_EXTRA_FLAGS " ${LIB}")
+diff --git a/cmake/lz4.cmake b/cmake/lz4.cmake
+index 10e7e8c8..48772329 100644
+--- a/cmake/lz4.cmake
++++ b/cmake/lz4.cmake
+@@ -46,7 +46,7 @@ FUNCTION(FIND_SYSTEM_LZ4)
+   FIND_PATH(LZ4_INCLUDE_DIR
+     NAMES lz4frame.h)
+   FIND_LIBRARY(LZ4_SYSTEM_LIBRARY
+-    NAMES lz4)
++    NAMES lz4d lz4 NAMES_PER_DIR)
+   IF (LZ4_INCLUDE_DIR AND LZ4_SYSTEM_LIBRARY)
+     SET(SYSTEM_LZ4_FOUND 1 CACHE INTERNAL "")
+     ADD_LIBRARY(lz4_interface INTERFACE)
+diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake
+index 04e3af87..8ae52c82 100644
+--- a/cmake/ssl.cmake
++++ b/cmake/ssl.cmake
+@@ -273,7 +273,18 @@ MACRO (MYSQL_CHECK_SSL)
+     FIND_ALTERNATIVE_SYSTEM_SSL()
+   ENDIF()
+ 
+-  IF(WITH_SSL STREQUAL "system" OR WITH_SSL_PATH OR ALTERNATIVE_SYSTEM_SSL)
++  IF(WITH_SSL STREQUAL "system")
++    find_package(OpenSSL REQUIRED)
++    set(OPENSSL_LIBRARY OpenSSL::SSL CACHE STRING "")
++    set(CRYPTO_LIBRARY OpenSSL::Crypto CACHE STRING "")
++    find_program(OPENSSL_EXECUTABLE openssl
++          DOC "path to the openssl executable")
++    set(SSL_DEFINES "-DHAVE_OPENSSL")
++    add_library(ext::openssl ALIAS OpenSSL::SSL)
++    set(SSL_LIBRARIES ext::openssl)
++    set(OPENSSL_APPLINK_C "${OPENSSL_APPLINK_SOURCE}")
++    include_directories(SYSTEM ${OPENSSL_INCLUDE_DIR})
++  ELSEIF(WITH_SSL STREQUAL "system" OR WITH_SSL_PATH OR ALTERNATIVE_SYSTEM_SSL)
+     IF((APPLE OR WIN32) AND WITH_SSL STREQUAL "system")
+       # FindOpenSSL.cmake knows about
+       # http://www.slproweb.com/products/Win32OpenSSL.html
+diff --git a/cmake/zlib.cmake b/cmake/zlib.cmake
+index 3781fe09..ac312ad0 100644
+--- a/cmake/zlib.cmake
++++ b/cmake/zlib.cmake
+@@ -124,7 +124,7 @@ MACRO (MYSQL_CHECK_ZLIB)
+     MESSAGE(FATAL_ERROR "WITH_ZLIB must be bundled or system")
+   ENDIF()
+ 
+-  ADD_LIBRARY(ext::zlib ALIAS zlib_interface)
++  ADD_LIBRARY(ext::zlib ALIAS ZLIB::ZLIB)
+ 
+   IF(ZLIB_VERSION VERSION_LESS MIN_ZLIB_VERSION_REQUIRED)
+     MESSAGE(FATAL_ERROR
+diff --git a/cmake/zstd.cmake b/cmake/zstd.cmake
+index 425426d1..0ae1a907 100644
+--- a/cmake/zstd.cmake
++++ b/cmake/zstd.cmake
+@@ -90,15 +90,16 @@ MACRO (MYSQL_CHECK_ZSTD)
+   IF(WITH_ZSTD STREQUAL "bundled")
+     MYSQL_USE_BUNDLED_ZSTD()
+   ELSEIF(WITH_ZSTD STREQUAL "system")
+-    FIND_SYSTEM_ZSTD()
+-    IF (NOT SYSTEM_ZSTD_FOUND)
+-      MESSAGE(FATAL_ERROR "Cannot find system zstd libraries.")
+-    ENDIF()
++    find_package(ZSTD NAMES zstd REQUIRED)
+   ELSE()
+     MESSAGE(FATAL_ERROR "WITH_ZSTD must be bundled or system")
+   ENDIF()
+ 
+-  ADD_LIBRARY(ext::zstd ALIAS zstd_interface)
++  if(TARGET zstd::libzstd_shared)
++    add_library(ext::zstd ALIAS zstd::libzstd_shared)
++  else()
++    add_library(ext::zstd ALIAS zstd::libzstd_static)
++  endif()
+ 
+   IF(ZSTD_VERSION VERSION_LESS MIN_ZSTD_VERSION_REQUIRED)
+     MESSAGE(FATAL_ERROR
diff --git a/external_imported/vcpkg/ports/libmysql/export-cmake-targets.patch b/external_imported/vcpkg/ports/libmysql/export-cmake-targets.patch
deleted file mode 100644
index 62fb9d670..000000000
--- a/external_imported/vcpkg/ports/libmysql/export-cmake-targets.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake
-index c3a05ec..0d44ef2 100644
---- a/cmake/install_macros.cmake
-+++ b/cmake/install_macros.cmake
-@@ -100,7 +100,7 @@ ENDFUNCTION()
- 
- FUNCTION(MYSQL_INSTALL_TARGETS)
-   MYSQL_PARSE_ARGUMENTS(ARG
--    "DESTINATION;COMPONENT"
-+    "DESTINATION;COMPONENT;EXPORT"
-   ""
-   ${ARGN}
-   )
-@@ -115,7 +115,21 @@ FUNCTION(MYSQL_INSTALL_TARGETS)
-   IF(ARG_COMPONENT)
-     SET(COMP COMPONENT ${ARG_COMPONENT})
-   ENDIF()
--  INSTALL(TARGETS ${TARGETS} DESTINATION ${ARG_DESTINATION} ${COMP})
-+  IF (ARG_EXPORT)
-+    FILE(WRITE "${CMAKE_CURRENT_BINARY_DIR}/${ARG_EXPORT}-config.cmake"
-+"include(CMakeFindDependencyMacro)
-+find_dependency(ZLIB)
-+find_dependency(OpenSSL)
-+find_dependency(Threads)
-+include(\"\${CMAKE_CURRENT_LIST_DIR}/${ARG_EXPORT}-targets.cmake\")
-+")
-+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${ARG_EXPORT}-config.cmake DESTINATION share/${ARG_EXPORT})
-+    set(EXPORT_ARGS EXPORT ${ARG_EXPORT}-targets)
-+  ENDIF()
-+  INSTALL(TARGETS ${TARGETS} ${EXPORT_ARGS} RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ${COMP})
-+  IF (ARG_EXPORT)
-+    INSTALL(${EXPORT_ARGS} DESTINATION share/${ARG_EXPORT})
-+  ENDIF()
-   SET(INSTALL_LOCATION ${ARG_DESTINATION} )
-   INSTALL_DEBUG_SYMBOLS("${TARGETS}")
-   SET(INSTALL_LOCATION)
-diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake
-index 5481fae..3fa58da 100644
---- a/cmake/libutils.cmake
-+++ b/cmake/libutils.cmake
-@@ -237,7 +237,7 @@ MACRO(MERGE_LIBRARIES_SHARED)
-     IF(ARG_COMPONENT)
-       SET(COMP COMPONENT ${ARG_COMPONENT})
-     ENDIF()
--    MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION "${INSTALL_LIBDIR}" ${COMP})
-+    MYSQL_INSTALL_TARGETS(${TARGET} EXPORT unofficial-libmysql DESTINATION "${INSTALL_LIBDIR}" ${COMP})
-   ENDIF()
- ENDMACRO()
- 
-@@ -372,7 +372,7 @@ MACRO(MERGE_CONVENIENCE_LIBRARIES)
-       SET(COMP COMPONENT ${ARG_COMPONENT})
-     ENDIF()
-     IF(INSTALL_STATIC_LIBRARIES)
--      MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION "${INSTALL_LIBDIR}" ${COMP})
-+      MYSQL_INSTALL_TARGETS(${TARGET} EXPORT unofficial-libmysql DESTINATION "${INSTALL_LIBDIR}" ${COMP})
-     ENDIF()
-   ENDIF()
- ENDMACRO()
-diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt
-index 605288d..c5d0f5d 100644
---- a/libmysql/CMakeLists.txt
-+++ b/libmysql/CMakeLists.txt
-@@ -245,8 +245,16 @@ ENDIF()
- # LDAP authentication SASL client plugin
- ADD_SUBDIRECTORY(authentication_ldap)
- 
-+IF (BUILD_SHARED_LIBS)
-+  set(INSTALL_SHARED )
-+  set(INSTALL_STATIC SKIP_INSTALL)
-+ELSE()
-+  set(INSTALL_SHARED SKIP_INSTALL)
-+  set(INSTALL_STATIC )
-+ENDIF()
-+
- # Merge several convenience libraries into one big mysqlclient
--MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development)
-+MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} ${INSTALL_STATIC} COMPONENT Development)
- TARGET_LINK_LIBRARIES(mysqlclient PRIVATE ${LIBS_TO_LINK})
- 
- # Visual Studio users need debug  static library for debug projects
-@@ -283,6 +291,7 @@ ENDIF()
- # Merge several convenience libraries into one big mysqlclient
- # and link them together into shared library.
- MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE}
-+  ${INSTALL_SHARED}
-   EXPORTS
-   ${CLIENT_API_FUNCTIONS}
-   ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}
-@@ -370,6 +379,7 @@ CONFIGURE_FILE(api_test.c.in ${CMAKE_CURRENT_BINARY_DIR}/api_test.c)
- # from @CLIENT_API_FUNCTIONS@ are declared by <mysql.h>. It will fail
- # to run if not all of these symbols are exported by the library.
- #
-+IF (ENABLE_TESTING)
- MYSQL_ADD_EXECUTABLE(libmysql_api_test
-   ${CMAKE_CURRENT_BINARY_DIR}/api_test.c
-   LINK_LIBRARIES libmysql ${LIBRT}
-@@ -398,3 +408,4 @@ ADD_CUSTOM_COMMAND(TARGET libmysql_api_test POST_BUILD
-   COMMAND libmysql_api_test
-   > ${CMAKE_CURRENT_BINARY_DIR}/libmysql_api_test.out
-   )
-+ENDIF()
-\ No newline at end of file
-diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
-index a5fa18e..0f2e15c 100644
---- a/scripts/CMakeLists.txt
-+++ b/scripts/CMakeLists.txt
-@@ -329,13 +329,13 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
-   STRING(REGEX REPLACE "^[ ]+" "" ${var} "${${var}}")
-   STRING(REGEX REPLACE "[ ]+$" "" ${var} "${${var}}")
- ENDMACRO()
--
-+IF (NOT BUILD_SHARED_LIBS)
- EXTRACT_LINK_LIBRARIES(mysqlclient CLIENT_LIBS)
--
--IF(MSVC)
-+ENDIF()
-+IF(MSVC AND NOT BUILD_SHARED_LIBS)
-   GET_TARGET_PROPERTY(LIBMYSQL_OS_SHLIB_VERSION mysqlclient VERSION)
-   GET_TARGET_PROPERTY(LIBMYSQL_OS_OUTPUT_NAME mysqlclient OUTPUT_NAME)
--ELSE()
-+ELSEIF(BUILD_SHARED_LIBS)
-   GET_TARGET_PROPERTY(LIBMYSQL_OS_SHLIB_VERSION libmysql VERSION)
-   GET_TARGET_PROPERTY(LIBMYSQL_OS_OUTPUT_NAME libmysql OUTPUT_NAME)
- ENDIF()
diff --git a/external_imported/vcpkg/ports/libmysql/fix_dup_symbols.patch b/external_imported/vcpkg/ports/libmysql/fix_dup_symbols.patch
new file mode 100644
index 000000000..352fd8af8
--- /dev/null
+++ b/external_imported/vcpkg/ports/libmysql/fix_dup_symbols.patch
@@ -0,0 +1,20 @@
+diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
+index 058967b..bcd8841 100644
+--- a/client/CMakeLists.txt
++++ b/client/CMakeLists.txt
+@@ -43,7 +43,6 @@ MYSQL_ADD_EXECUTABLE(mysql
+   pattern_matcher.cc
+   readline.cc
+   client_query_attributes.cc
+-  multi_factor_passwordopt-vars.cc
+   ${CMAKE_CURRENT_SOURCE_DIR}/common/user_registration.cc
+   LINK_LIBRARIES mysqlclient client_base ${EDITLINE_LIBRARY}
+   )
+@@ -226,7 +226,6 @@ SET(MYSQLBINLOG_SOURCES
+   ${CMAKE_SOURCE_DIR}/sql/binlog_reader.cc
+   ${CMAKE_SOURCE_DIR}/sql/stream_cipher.cc
+   ${CMAKE_SOURCE_DIR}/sql/rpl_log_encryption.cc
+-  ${CMAKE_SOURCE_DIR}/libbinlogevents/src/trx_boundary_parser.cpp
+   )
+ 
+ SET(MYSQLBINLOG_LIBRARIES
diff --git a/external_imported/vcpkg/ports/libmysql/ignore-boost-version.patch b/external_imported/vcpkg/ports/libmysql/ignore-boost-version.patch
deleted file mode 100644
index 99cee2450..000000000
--- a/external_imported/vcpkg/ports/libmysql/ignore-boost-version.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cmake/boost.cmake b/cmake/boost.cmake
-index 592a67f..202a770 100644
---- a/cmake/boost.cmake
-+++ b/cmake/boost.cmake
-@@ -297,7 +297,7 @@ IF(NOT BOOST_MAJOR_VERSION EQUAL 10)
-   COULD_NOT_FIND_BOOST()
- ENDIF()
- 
--IF(NOT BOOST_MINOR_VERSION EQUAL 70)
-+IF(NOT BOOST_MINOR_VERSION EQUAL 70 AND NOT IGNORE_BOOST_VERSION)
-   MESSAGE(WARNING "Boost minor version found is ${BOOST_MINOR_VERSION} "
-     "we need 70"
-     )
diff --git a/external_imported/vcpkg/ports/libmysql/install-exports.patch b/external_imported/vcpkg/ports/libmysql/install-exports.patch
new file mode 100644
index 000000000..3cf34ed3b
--- /dev/null
+++ b/external_imported/vcpkg/ports/libmysql/install-exports.patch
@@ -0,0 +1,121 @@
+diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake
+index baf49cd5..c45fda71 100644
+--- a/cmake/install_macros.cmake
++++ b/cmake/install_macros.cmake
+@@ -113,8 +113,30 @@ FUNCTION(MYSQL_INSTALL_TARGET target_arg)
+   IF(ARG_NAMELINK_SKIP)
+     SET(LIBRARY_INSTALL_ARGS NAMELINK_SKIP)
+   ENDIF()
++  if(target STREQUAL "libmysql" OR target STREQUAL "mysqlclient")
++    target_include_directories(${target} INTERFACE $<INSTALL_INTERFACE:include>)
++    if(target STREQUAL "mysqlclient")
++      set_target_properties(${target} PROPERTIES EXPORT_NAME libmysql) # uniform
++    endif()
++    FILE(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmysql-config.cmake"
++"include(CMakeFindDependencyMacro)
++find_dependency(OpenSSL)
++find_dependency(Threads)
++find_dependency(ZLIB)
++find_dependency(zstd CONFIG)
++include(\"\${CMAKE_CURRENT_LIST_DIR}/unofficial-libmysql-targets.cmake\")
++if(NOT TARGET ${target}) # legacy vcpkg
++  add_library(${target} INTERFACE IMPORTED)
++  set_target_properties(${target} PROPERTIES INTERFACE_LINK_LIBRARIES unofficial::libmysql::libmysql)
++endif()
++")
++    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmysql-config.cmake" DESTINATION "share/unofficial-libmysql")
++    install(EXPORT "unofficial-libmysql-targets" NAMESPACE unofficial::libmysql:: DESTINATION "share/unofficial-libmysql")
++    set(LIBRARY_EXPORT_ARGS EXPORT unofficial-libmysql-targets)
++  endif()
+   INSTALL(TARGETS ${target}
+-    RUNTIME DESTINATION ${ARG_DESTINATION} ${COMP}
++    ${LIBRARY_EXPORT_ARGS}
++    RUNTIME DESTINATION bin ${COMP}
+     ARCHIVE DESTINATION ${ARG_DESTINATION} ${COMP}
+     LIBRARY DESTINATION ${ARG_DESTINATION} ${COMP} ${LIBRARY_INSTALL_ARGS})
+   SET(INSTALL_LOCATION ${ARG_DESTINATION} )
+diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake
+index a5333987..c954bfb1 100644
+--- a/cmake/libutils.cmake
++++ b/cmake/libutils.cmake
+@@ -385,8 +385,12 @@ MACRO(MERGE_LIBRARIES_SHARED TARGET_ARG)
+     IF(ARG_NAMELINK_SKIP)
+       SET(INSTALL_ARGS NAMELINK_SKIP)
+     ENDIF()
++    if(INSTALL_STATIC_LIBRARIES)
++      set_target_properties(${TARGET} PROPERTIES EXCLUDE_FROM_ALL 1)
++    else()
+     MYSQL_INSTALL_TARGET(${TARGET} DESTINATION "${DESTINATION}" ${COMP}
+       ${INSTALL_ARGS})
++    endif()
+   ENDIF()
+ 
+   IF(WIN32)
+@@ -563,6 +567,8 @@ MACRO(MERGE_CONVENIENCE_LIBRARIES TARGET_ARG)
+     ENDIF()
+     IF(INSTALL_STATIC_LIBRARIES)
+       MYSQL_INSTALL_TARGET(${TARGET} DESTINATION "${INSTALL_LIBDIR}" ${COMP})
++    else()
++      set_target_properties(${TARGET} PROPERTIES EXCLUDE_FROM_ALL 1)
+     ENDIF()
+   ENDIF()
+ ENDMACRO(MERGE_CONVENIENCE_LIBRARIES)
+diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
+index c4ef5694..8e933877 100644
+--- a/scripts/CMakeLists.txt
++++ b/scripts/CMakeLists.txt
+@@ -315,10 +315,14 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
+     FOREACH(lib ${TARGET_LIB_DEPENDS})
+       IF (lib MATCHES "^\\-l")
+         SET(${var} "${${var}} ${lib} ")
++      elseif(lib MATCHES "^ext::(openssl|zlib|zstd)" AND NOT WIN32)
++        list(APPEND ext_targets "${CMAKE_MATCH_1}")
+       ELSEIF (lib MATCHES "^ext::")
+         STRING(REGEX MATCH "ext::([a-z]+)" MATCH_LIB "${lib}")
+         SET(SYSTEM_LIB ${CMAKE_MATCH_1})
+         SET(${var} "${${var}} -l${SYSTEM_LIB} ")
++      elseif(TARGET "${lib}" AND NOT WIN32)
++        # merged or shared, not external
+       ELSEIF (lib MATCHES "^\\-L")
+         # Search directory. Test on FreeBSD: -L/usr/local/lib -lunwind
+         SET(${var} "${${var}} ${lib} ")
+@@ -354,6 +358,7 @@ IF(MSVC)
+   GET_TARGET_PROPERTY(LIBMYSQL_OS_SHLIB_VERSION mysqlclient VERSION)
+   GET_TARGET_PROPERTY(LIBMYSQL_OS_OUTPUT_NAME mysqlclient OUTPUT_NAME)
+ ELSE()
++  EXTRACT_LINK_LIBRARIES(libmysql CLIENT_LIBS)
+   GET_TARGET_PROPERTY(LIBMYSQL_OS_SHLIB_VERSION libmysql VERSION)
+   GET_TARGET_PROPERTY(LIBMYSQL_OS_OUTPUT_NAME libmysql OUTPUT_NAME)
+ ENDIF()
+@@ -373,6 +378,10 @@ IF (WITH_SSL STREQUAL "system")
+       "${CONFIG_LIBS_PRIVATE}")
+   ENDIF()
+ ENDIF()
++list(APPEND CONFIG_REQUIRES_PRIVATE ${ext_targets})
++list(REMOVE_DUPLICATES CONFIG_REQUIRES_PRIVATE)
++list(JOIN CONFIG_REQUIRES_PRIVATE " " CONFIG_REQUIRES_PRIVATE)
++string(REPLACE "zstd" "libzstd" CONFIG_REQUIRES_PRIVATE "${CONFIG_REQUIRES_PRIVATE}" )
+ 
+ MESSAGE(STATUS "CONFIG_CLIENT_LIBS ${CONFIG_CLIENT_LIBS}")
+ MESSAGE(STATUS "CONFIG_LIBS_PRIVATE ${CONFIG_LIBS_PRIVATE}")
+diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh
+index 6e8520be..bf1a45af 100644
+--- a/scripts/mysql_config.sh
++++ b/scripts/mysql_config.sh
+@@ -119,6 +119,16 @@ fi
+ # Create options 
+ libs="-L$pkglibdir@RPATH_OPTION@"
+ libs="$libs -l@LIBMYSQL_OS_OUTPUT_NAME@ @CONFIG_CLIENT_LIBS@"
++if test -z "${PKG_CONFIG}" ; then
++  if pkg-config --version >/dev/null 2>&1 ; then
++    PKG_CONFIG=pkg-config
++  elif pkgconf --version >/dev/null 2>&1 ; then
++    PKG_CONFIG=pkgconf
++  else
++    PKG_CONFIG=false
++  fi
++fi
++libs="$libs $(${PKG_CONFIG} --libs @CONFIG_REQUIRES_PRIVATE@)"
+ 
+ cflags="-I$pkgincludedir @CFLAGS@"
+ cxxflags="-I$pkgincludedir @CXXFLAGS@"
diff --git a/external_imported/vcpkg/ports/libmysql/libmysql-config.cmake b/external_imported/vcpkg/ports/libmysql/libmysql-config.cmake
new file mode 100644
index 000000000..e3af81d27
--- /dev/null
+++ b/external_imported/vcpkg/ports/libmysql/libmysql-config.cmake
@@ -0,0 +1,6 @@
+file(READ "${CMAKE_CURRENT_LIST_DIR}/usage" usage)
+message(WARNING "find_package(libmysql) is deprecated.\n${usage}")
+include(CMakeFindDependencyMacro)
+find_dependency(unofficial-libmysql CONFIG REQUIRED)
+set(libmysql_FOUND 1)
+set(MYSQL_LIBRARIES unofficial::libmysql::libmysql)
diff --git a/external_imported/vcpkg/ports/libmysql/openssl.patch b/external_imported/vcpkg/ports/libmysql/openssl.patch
deleted file mode 100644
index 3abbcf98f..000000000
--- a/external_imported/vcpkg/ports/libmysql/openssl.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-diff --git a/mysys/my_md5.cc b/mysys/my_md5.cc
-index dea997b252c..81484f0652b 100644
---- a/mysys/my_md5.cc
-+++ b/mysys/my_md5.cc
-@@ -35,6 +35,10 @@
- #include <openssl/crypto.h>
- #include <openssl/md5.h>
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
-+#include <openssl/evp.h>
-+#endif
-+
- static void my_md5_hash(unsigned char *digest, unsigned const char *buf,
-                         int len) {
-   MD5_CTX ctx;
-@@ -56,7 +60,11 @@ static void my_md5_hash(unsigned char *digest, unsigned const char *buf,
- int compute_md5_hash(char *digest, const char *buf, int len) {
-   int retval = 0;
-   int fips_mode = 0;
-+  #if OPENSSL_VERSION_NUMBER < 0x30000000L
-   fips_mode = FIPS_mode();
-+  #else
-+  fips_mode = EVP_default_properties_is_fips_enabled(NULL);
-+  #endif
-   /* If fips mode is ON/STRICT restricted method calls will result into abort,
-    * skipping call. */
-   if (fips_mode == 0) {
-diff --git a/plugin/x/client/xconnection_impl.cc b/plugin/x/client/xconnection_impl.cc
-index 13bc6794ea5..8752bcea9bf 100644
---- a/plugin/x/client/xconnection_impl.cc
-+++ b/plugin/x/client/xconnection_impl.cc
-@@ -51,6 +51,10 @@
- #include "plugin/x/src/config/config.h"
- #include "sql-common/net_ns.h"
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
-+#include <openssl/evp.h>
-+#endif
-+
- #ifndef WIN32
- #include <netdb.h>
- #include <sys/socket.h>
-@@ -524,12 +528,20 @@ int set_fips_mode(const uint32_t fips_mode,
-   if (fips_mode > 2) {
-     goto EXIT;
-   }
-+  #if OPENSSL_VERSION_NUMBER < 0x30000000L
-   fips_mode_old = FIPS_mode();
-+  #else
-+  fips_mode_old = EVP_default_properties_is_fips_enabled(NULL);
-+  #endif
-   if (fips_mode_old == fips_mode) {
-     rc = 1;
-     goto EXIT;
-   }
-+  #if OPENSSL_VERSION_NUMBER < 0x30000000L
-   if (!(rc = FIPS_mode_set(fips_mode))) {
-+  #else
-+  if (!(rc = EVP_default_properties_enable_fips(fips_mode))) {
-+  #endif
-     err_library = ERR_get_error();
-     ERR_error_string_n(err_library, err_string, OPENSSL_ERROR_LENGTH - 1);
-     err_string[OPENSSL_ERROR_LENGTH - 1] = '\0';
-diff --git a/vio/viosslfactories.cc b/vio/viosslfactories.cc
-index 6c04029ccb0..164b727e3dc 100644
---- a/vio/viosslfactories.cc
-+++ b/vio/viosslfactories.cc
-@@ -40,6 +40,10 @@
- 
- #include <openssl/dh.h>
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
-+#include <openssl/evp.h>
-+#endif
-+
- #if OPENSSL_VERSION_NUMBER < 0x10002000L
- #include <openssl/ec.h>
- #endif /* OPENSSL_VERSION_NUMBER < 0x10002000L */
-@@ -498,12 +502,20 @@ int set_fips_mode(const uint fips_mode, char err_string[OPENSSL_ERROR_LENGTH]) {
-   if (fips_mode > 2) {
-     goto EXIT;
-   }
-+  #if OPENSSL_VERSION_NUMBER < 0x30000000L
-   fips_mode_old = FIPS_mode();
-+  #else
-+  fips_mode_old = EVP_default_properties_is_fips_enabled(NULL);
-+  #endif
-   if (fips_mode_old == fips_mode) {
-     rc = 1;
-     goto EXIT;
-   }
-+  #if OPENSSL_VERSION_NUMBER < 0x30000000L
-   if (!(rc = FIPS_mode_set(fips_mode))) {
-+  #else
-+  if (!(rc = EVP_default_properties_enable_fips(NULL, fips_mode))) {
-+  #endif
-     /*
-       If OS doesn't have FIPS enabled openssl library and user sets FIPS mode
-       ON, It fails with proper error. But in the same time it doesn't allow to
-@@ -511,7 +523,11 @@ int set_fips_mode(const uint fips_mode, char err_string[OPENSSL_ERROR_LENGTH]) {
-       error, setting old working FIPS mode value in the OpenSSL library. It will
-       allow successful cryptographic operation and will not abort the server.
-     */
-+    #if OPENSSL_VERSION_NUMBER < 0x30000000L
-     FIPS_mode_set(fips_mode_old);
-+    #else
-+    EVP_default_properties_enable_fips(NULL, fips_mode_old);
-+    #endif
-     err_library = ERR_get_error();
-     ERR_error_string_n(err_library, err_string, OPENSSL_ERROR_LENGTH - 1);
-     err_string[OPENSSL_ERROR_LENGTH - 1] = '\0';
-@@ -525,7 +541,13 @@ EXIT:
- 
-   @returns openssl current fips mode
- */
-+#if OPENSSL_VERSION_NUMBER < 0x30000000L
- uint get_fips_mode() { return FIPS_mode(); }
-+#else
-+uint get_fips_mode() {
-+  return EVP_default_properties_is_fips_enabled(NULL);
-+}
-+#endif
- 
- long process_tls_version(const char *tls_version) {
-   const char *separator = ",";
diff --git a/external_imported/vcpkg/ports/libmysql/portfile.cmake b/external_imported/vcpkg/ports/libmysql/portfile.cmake
index 11bac55bb..9a9c8c49e 100644
--- a/external_imported/vcpkg/ports/libmysql/portfile.cmake
+++ b/external_imported/vcpkg/ports/libmysql/portfile.cmake
@@ -2,31 +2,23 @@ if (EXISTS "${CURRENT_INSTALLED_DIR}/include/mysql/mysql.h")
     message(FATAL_ERROR "FATAL ERROR: ${PORT} and libmariadb are incompatible.")
 endif()
 
-if(NOT VCPKG_TARGET_IS_WINDOWS)
-    message(WARNING "'autoconf-archive' must be installed via your system package manager (brew, apt, etc.).")
-endif()
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mysql/mysql-server
-    REF 7d10c82196c8e45554f27c00681474a9fb86d137 # 8.0.20
-    SHA512 9f5e8cc254ea2a4cf76313287c7bb6fc693400810464dd2901e67d51ecb27f8916009464fd8aed8365c3038314b845b3d517db6e82ae5c7908612f0b3b72335f
+    REF mysql-${VERSION}
+    SHA512 5df45c1ce1e2c620856b9274666cf56738d6a0308c33c9c96583b494c987fb0e862e676301109b9e4732070d54e6086596a62ad342f35adc59ca9f749e37b561
     HEAD_REF master
     PATCHES
-        ignore-boost-version.patch
-        system-libs.patch
-        rename-version.patch
-        export-cmake-targets.patch
-        004-added-limits-include.patch
-        openssl.patch
-        Add-target-include-directories.patch
+        dependencies.patch
+        install-exports.patch
+        fix_dup_symbols.patch
+        cross-build.patch
 )
 
-file(REMOVE_RECURSE "${SOURCE_PATH}/include/boost_1_70_0")
-
-set(STACK_DIRECTION "")
-if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
-    set(STACK_DIRECTION -DSTACK_DIRECTION=-1)
+file(GLOB third_party "${SOURCE_PATH}/extra/*" "${SOURCE_PATH}/include/boost_1_70_0")
+list(REMOVE_ITEM third_party "${SOURCE_PATH}/extra/libedit")
+if (third_party)
+    file(REMOVE_RECURSE ${third_party})
 endif()
 
 #Skip the version check for Visual Studio
@@ -38,31 +30,56 @@ endif()
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static"  BUILD_STATIC_LIBS)
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static"  STATIC_CRT_LINKAGE)
 
+set(cross_options "")
+if(VCPKG_CROSSCOMPILING)
+    list(APPEND cross_options
+        -DCMAKE_CROSSCOMPILING=1
+        -DVCPKG_HOST_TRIPLET=${HOST_TRIPLET}
+        # required, skip try_run
+        -DHAVE_RAPIDJSON_WITH_STD_REGEX=1
+    )
+    if(NOT VCPKG_TARGET_IS_WINDOWS)
+        list(APPEND cross_options
+            # optimistic, skip try_run
+            -DHAVE_CLOCK_GETTIME=1
+            -DHAVE_CLOCK_REALTIME=1
+            # pessimistic, skip try_run
+            -DHAVE_C_FLOATING_POINT_FUSED_MADD=1
+            -DHAVE_CXX_FLOATING_POINT_FUSED_MADD=1
+            -DHAVE_SETNS=0
+        )
+    endif()
+endif()
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
+        ${cross_options}
+        -DINSTALL_INCLUDEDIR=include/mysql
+        -DINSTALL_DOCDIR=share/${PORT}/doc
+        -DINSTALL_MANDIR=share/${PORT}/doc
+        -DINSTALL_INFODIR=share/${PORT}/doc
+        -DINSTALL_DOCREADMEDIR=share/${PORT}
+        -DINSTALL_SHAREDIR=share
+        -DINSTALL_MYSQLSHAREDIR=share/${PORT}
         -DWITHOUT_SERVER=ON
+        -DWITH_BUILD_ID=OFF
         -DWITH_UNIT_TESTS=OFF
         -DENABLED_PROFILING=OFF
-        -DENABLE_TESTING=OFF
         -DWIX_DIR=OFF
-        ${STACK_DIRECTION}
         -DIGNORE_BOOST_VERSION=ON
-        -DWITH_SYSTEMD=OFF
         -DWITH_TEST_TRACE_PLUGIN=OFF
         -DMYSQL_MAINTAINER_MODE=OFF
         -DBUNDLE_RUNTIME_LIBRARIES=OFF
         -DDOWNLOAD_BOOST=OFF
-        -DENABLE_DOWNLOADS=OFF
-        -DWITH_NDB_TEST=OFF
-        -DWITH_NDB_NODEJS_DEFAULT=OFF
-        -DWITH_NDBAPI_EXAMPLES=OFF
-        -DMYSQLX_ADDITIONAL_TESTS_ENABLE=OFF
-        -DWITH_SSL=system
-        -DWITH_ICU=system
-        -DWITH_LIBEVENT=system
+        -DWITH_CURL=none
+        -DWITH_EDITLINE=bundled # not in vcpkg
         -DWITH_LZ4=system
+        -DWITH_RAPIDJSON=system
+        -DWITH_SSL=system
+        -DWITH_SYSTEMD=OFF
         -DWITH_ZLIB=system
+        -DWITH_ZSTD=system
         -DFORCE_UNSUPPORTED_COMPILER=${FORCE_UNSUPPORTED_COMPILER}
         -DINSTALL_STATIC_LIBRARIES=${BUILD_STATIC_LIBS}
         -DLINK_STATIC_RUNTIME_LIBRARIES=${STATIC_CRT_LINKAGE}
@@ -70,15 +87,18 @@ vcpkg_cmake_configure(
         BUNDLE_RUNTIME_LIBRARIES # only on windows
         LINK_STATIC_RUNTIME_LIBRARIES # only on windows
         WIX_DIR # only on windows
+        WITH_BUILD_ID # only on windows
 )
 
 vcpkg_cmake_install(ADD_BIN_TO_PATH)
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-libmysql)
+vcpkg_fixup_pkgconfig()
 
-list(APPEND MYSQL_TOOLS
-    comp_err
+set(MYSQL_TOOLS
     my_print_defaults
     mysql
     mysql_config_editor
+    mysql_migrate_keyring
     mysql_secure_installation
     mysql_ssl_rsa_setup
     mysqladmin
@@ -93,7 +113,11 @@ list(APPEND MYSQL_TOOLS
     perror
     zlib_decompress
 )
-
+if (NOT VCPKG_CROSSCOMPILING)
+    list(APPEND MYSQL_TOOLS
+        comp_err
+    )
+endif()
 if (VCPKG_TARGET_IS_WINDOWS)
     list(APPEND MYSQL_TOOLS
         echo
@@ -106,49 +130,21 @@ endif()
 
 vcpkg_copy_tools(TOOL_NAMES ${MYSQL_TOOLS} AUTO_CLEAN)
 
-file(RENAME "${CURRENT_PACKAGES_DIR}/share" "${CURRENT_PACKAGES_DIR}/${PORT}")
-file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share")
-file(RENAME "${CURRENT_PACKAGES_DIR}/${PORT}" "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-
-if(NOT VCPKG_BUILD_TYPE)
-    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/${PORT}")
-    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/share")
-    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/${PORT}" "${CURRENT_PACKAGES_DIR}/debug/share/${PORT}")
-endif()
-
-vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-libmysql CONFIG_PATH share/${PORT}/unofficial-libmysql)
-
-# switch mysql into /mysql
-file(RENAME "${CURRENT_PACKAGES_DIR}/include" "${CURRENT_PACKAGES_DIR}/include2")
-file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include")
-file(RENAME "${CURRENT_PACKAGES_DIR}/include2" "${CURRENT_PACKAGES_DIR}/include/mysql")
-
-## delete useless vcruntime/scripts/bin/msg file
 file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/debug/include"
     "${CURRENT_PACKAGES_DIR}/debug/share"
-    "${CURRENT_PACKAGES_DIR}/docs"
-    "${CURRENT_PACKAGES_DIR}/debug/docs"
     "${CURRENT_PACKAGES_DIR}/lib/debug"
-    "${CURRENT_PACKAGES_DIR}/lib/plugin"
-    "${CURRENT_PACKAGES_DIR}/lib/plugin/debug"
-)
-
-## remove misc files
-file(REMOVE
-    "${CURRENT_PACKAGES_DIR}/LICENSE"
-    "${CURRENT_PACKAGES_DIR}/README"
-    "${CURRENT_PACKAGES_DIR}/debug/LICENSE"
-    "${CURRENT_PACKAGES_DIR}/debug/README"
 )
 
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/mysql/mysql_com.h" "#include <mysql/udf_registration_types.h>" "#include \"mysql/udf_registration_types.h\"")
 if (NOT VCPKG_TARGET_IS_WINDOWS)
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libmysql/mysql_config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../..")
+    set(MYSQL_CONFIG_FILE "${CURRENT_PACKAGES_DIR}/tools/libmysql/mysql_config")
+    vcpkg_replace_string("${MYSQL_CONFIG_FILE}" "/bin/mysql_.*config" "/tools/libmysql/mysql_.*config")
+    vcpkg_replace_string("${MYSQL_CONFIG_FILE}" "'${CURRENT_PACKAGES_DIR}" "\"\$basedir\"\'")
 endif()
 
-file(INSTALL "${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+file(INSTALL "${CURRENT_PORT_DIR}/libmysql-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 
-# copy license
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+set(libedit_copying "${SOURCE_PATH}/COPYING for libedit")
+file(COPY_FILE "${SOURCE_PATH}/extra/libedit/libedit-20210910-3.1/COPYING" "${libedit_copying}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE" "${libedit_copying}")
diff --git a/external_imported/vcpkg/ports/libmysql/rename-version.patch b/external_imported/vcpkg/ports/libmysql/rename-version.patch
deleted file mode 100644
index 155983825..000000000
--- a/external_imported/vcpkg/ports/libmysql/rename-version.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/VERSION b/VERSION.txt
-similarity index 100%
-rename from VERSION
-rename to VERSION.txt
-diff --git a/cmake/mysql_version.cmake b/cmake/mysql_version.cmake
-index bed6e9f02e2..a924ef09bac 100644
---- a/cmake/mysql_version.cmake
-+++ b/cmake/mysql_version.cmake
-@@ -30,7 +30,7 @@ SET(PROTOCOL_VERSION "10")
- 
- # Generate "something" to trigger cmake rerun when VERSION changes
- CONFIGURE_FILE(
--  ${CMAKE_SOURCE_DIR}/VERSION
-+  ${CMAKE_SOURCE_DIR}/VERSION.txt
-   ${CMAKE_BINARY_DIR}/VERSION.dep
- )
- 
-@@ -38,7 +38,7 @@ CONFIGURE_FILE(
- 
- MACRO(MYSQL_GET_CONFIG_VALUE keyword var)
-  IF(NOT ${var})
--   FILE (STRINGS ${CMAKE_SOURCE_DIR}/VERSION str REGEX "^[ ]*${keyword}=")
-+   FILE (STRINGS ${CMAKE_SOURCE_DIR}/VERSION.txt str REGEX "^[ ]*${keyword}=")
-    IF(str)
-      STRING(REPLACE "${keyword}=" "" str ${str})
-      STRING(REGEX REPLACE  "[ ].*" ""  str "${str}")
diff --git a/external_imported/vcpkg/ports/libmysql/system-libs.patch b/external_imported/vcpkg/ports/libmysql/system-libs.patch
deleted file mode 100644
index 547573fc5..000000000
--- a/external_imported/vcpkg/ports/libmysql/system-libs.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-diff --git a/cmake/icu.cmake b/cmake/icu.cmake
-index fde3a75..9f694b9 100644
---- a/cmake/icu.cmake
-+++ b/cmake/icu.cmake
-@@ -38,49 +38,11 @@
- # install_root is either 'system' or is assumed to be a path.
- #
- MACRO (FIND_ICU install_root)
--  IF("${install_root}" STREQUAL "system")
--    SET(EXTRA_FIND_LIB_ARGS)
--    SET(EXTRA_FIND_INC_ARGS)
--  ELSE()
--    SET(EXTRA_FIND_LIB_ARGS HINTS "${install_root}"
--      PATH_SUFFIXES "lib" "lib64" NO_DEFAULT_PATH)
--    SET(EXTRA_FIND_INC_ARGS HINTS "${install_root}"
--      PATH_SUFFIXES "include"     NO_DEFAULT_PATH)
--  ENDIF()
--
--  FIND_PATH(ICU_INCLUDE_DIR NAMES unicode/regex.h ${EXTRA_FIND_INC_ARGS})
--  IF (NOT ICU_INCLUDE_DIR)
--    MESSAGE(FATAL_ERROR "Cannot find ICU regular expression headers")
--  ENDIF()
--
--  IF(WIN32)
--    SET(ICU_LIBS icuuc icuio icudt icuin)
--  ELSE()
--    SET(ICU_LIBS icuuc icuio icudata icui18n)
--  ENDIF()
--
--  SET(ICU_SYSTEM_LIBRARIES)
--  FOREACH(ICU_LIB ${ICU_LIBS})
--    UNSET(ICU_LIB_PATH CACHE)
--    FIND_LIBRARY(ICU_LIB_PATH NAMES ${ICU_LIB} ${EXTRA_FIND_LIB_ARGS})
--    IF(NOT ICU_LIB_PATH)
--      MESSAGE(FATAL_ERROR "Cannot find the ICU library ${ICU_LIB}")
--    ENDIF()
--    LIST(APPEND ICU_SYSTEM_LIBRARIES ${ICU_LIB_PATH})
--  ENDFOREACH()
--
--  # To do: If we include the path in ICU_INCLUDE_DIR, it leads to GUnit
--  # picking up the wrong regex.h header. And it looks like we don't need it;
--  # at least on Linux, the header gets installed in an OS path anyway.
--  IF(NOT "${install_root}" STREQUAL "system")
--    SET(ICU_INCLUDE_DIRS ${ICU_INCLUDE_DIR})
--  ENDIF()
--
--  SET(ICU_LIBRARIES ${ICU_SYSTEM_LIBRARIES})
--
--  # Needed for version information.
--  SET(ICU_COMMON_DIR ${ICU_INCLUDE_DIR})
- 
-+ find_package(ICU REQUIRED COMPONENTS uc io dt in)
-+ set(ICU_SYSTEM_LIBRARIES ICU::uc ICU::io ICU::dt ICU::in)
-+ set(ICU_COMMON_DIR ${ICU_INCLUDE_DIR})
-+ SET(ICU_INCLUDE_DIRS ${ICU_INCLUDE_DIR})
- ENDMACRO()
- 
- MACRO (MYSQL_USE_BUNDLED_ICU)
-diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake
-index 3fa58da..88b53e7 100644
---- a/cmake/libutils.cmake
-+++ b/cmake/libutils.cmake
-@@ -350,12 +350,7 @@ MACRO(MERGE_CONVENIENCE_LIBRARIES)
-   # On Windows, ssleay32.lib/libeay32.lib or libssl.lib/libcrypto.lib
-   # must be merged into mysqlclient.lib
-   IF(WIN32 AND ${TARGET} STREQUAL "mysqlclient")
--    SET(LINKER_EXTRA_FLAGS "")
--    FOREACH(LIB ${SSL_LIBRARIES})
--      STRING_APPEND(LINKER_EXTRA_FLAGS " ${LIB}")
--    ENDFOREACH()
--    SET_TARGET_PROPERTIES(${TARGET}
--      PROPERTIES STATIC_LIBRARY_FLAGS "${LINKER_EXTRA_FLAGS}")
-+    TARGET_LINK_LIBRARIES(${TARGET} PRIVATE ${SSL_LIBRARIES})
-   ENDIF()
- 
-   IF(OSLIBS)
-diff --git a/cmake/lz4.cmake b/cmake/lz4.cmake
-index 9aad130..68cbaba 100644
---- a/cmake/lz4.cmake
-+++ b/cmake/lz4.cmake
-@@ -25,7 +25,7 @@
- 
- MACRO (FIND_SYSTEM_LZ4)
-   FIND_PATH(PATH_TO_LZ4 NAMES lz4frame.h)
--  FIND_LIBRARY(LZ4_SYSTEM_LIBRARY NAMES lz4)
-+  FIND_LIBRARY(LZ4_SYSTEM_LIBRARY NAMES lz4d lz4)
-   IF (PATH_TO_LZ4 AND LZ4_SYSTEM_LIBRARY)
-     SET(SYSTEM_LZ4_FOUND 1)
-     INCLUDE_DIRECTORIES(SYSTEM ${PATH_TO_LZ4})
-diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake
-index 52feade..1e71bd7 100644
---- a/cmake/ssl.cmake
-+++ b/cmake/ssl.cmake
-@@ -93,7 +93,20 @@ ENDMACRO()
- # Provides the following configure options:
- # WITH_SSL=[yes|system|<path/to/custom/installation>]
- MACRO (MYSQL_CHECK_SSL)
-+  find_package(OpenSSL REQUIRED)
-+  set(OPENSSL_LIBRARY OpenSSL::SSL CACHE STRING "")
-+  set(CRYPTO_LIBRARY OpenSSL::Crypto CACHE STRING "")
-+  FIND_PROGRAM(OPENSSL_EXECUTABLE openssl
-+        DOC "path to the openssl executable")
-+  SET(SSL_DEFINES "-DHAVE_OPENSSL")
-+  set(SSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto)
-+  if(NOT WIN32)
-+    find_package(Threads REQUIRED)
-+    list(APPEND SSL_LIBRARIES Threads::Threads)
-+  endif()
-+ENDMACRO()
- 
-+MACRO (MYSQL_CHECK_SSL_OLD)
-   IF(NOT WITH_SSL)
-     SET(WITH_SSL "system" CACHE STRING ${WITH_SSL_DOC_STRING} FORCE)
-   ENDIF()
-diff --git a/cmake/zlib.cmake b/cmake/zlib.cmake
-index 26c56fe..65bebb4 100644
---- a/cmake/zlib.cmake
-+++ b/cmake/zlib.cmake
-@@ -51,28 +51,7 @@ MACRO (MYSQL_CHECK_ZLIB_WITH_COMPRESS)
-   IF(WITH_ZLIB STREQUAL "bundled")
-     MYSQL_USE_BUNDLED_ZLIB()
-   ELSE()
--    SET(ZLIB_FIND_QUIETLY TRUE)
--    INCLUDE(FindZLIB)
--    IF(ZLIB_FOUND)
--      INCLUDE(CheckFunctionExists)
--      SET(SAVE_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
--      SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} z)
--      CHECK_FUNCTION_EXISTS(crc32 HAVE_CRC32)
--      CHECK_FUNCTION_EXISTS(compressBound HAVE_COMPRESSBOUND)
--      CHECK_FUNCTION_EXISTS(deflateBound HAVE_DEFLATEBOUND)
--      SET(CMAKE_REQUIRED_LIBRARIES ${SAVE_CMAKE_REQUIRED_LIBRARIES})
--      IF(HAVE_CRC32 AND HAVE_COMPRESSBOUND AND HAVE_DEFLATEBOUND)
--        SET(ZLIB_LIBRARY ${ZLIB_LIBRARIES} CACHE INTERNAL "System zlib library")
--        SET(WITH_ZLIB "system" CACHE STRING
--          "Which zlib to use (possible values are 'bundled' or 'system')")
--        SET(ZLIB_SOURCES "")
--      ELSE()
--        SET(ZLIB_FOUND FALSE CACHE INTERNAL "Zlib found but not usable")
--        MESSAGE(STATUS "system zlib found but not usable")
--      ENDIF()
--    ENDIF()
--    IF(NOT ZLIB_FOUND)
--      MYSQL_USE_BUNDLED_ZLIB()
--    ENDIF()
-+   find_package(ZLIB REQUIRED)
-+   SET(ZLIB_LIBRARY ZLIB::ZLIB CACHE INTERNAL "System zlib library")
-   ENDIF()
- ENDMACRO()
diff --git a/external_imported/vcpkg/ports/libmysql/usage b/external_imported/vcpkg/ports/libmysql/usage
index 8c2b814d2..09f1e0d68 100644
--- a/external_imported/vcpkg/ports/libmysql/usage
+++ b/external_imported/vcpkg/ports/libmysql/usage
@@ -1,4 +1,4 @@
-The package libmysql provides CMake targets:
+libmysql provides CMake targets:
 
-    find_package(libmysql REQUIRED)
-    target_link_libraries(main PRIVATE ${MYSQL_LIBRARIES})
+    find_package(unofficial-libmysql REQUIRED)
+    target_link_libraries(main PRIVATE unofficial::libmysql::libmysql)
diff --git a/external_imported/vcpkg/ports/libmysql/vcpkg-cmake-wrapper.cmake b/external_imported/vcpkg/ports/libmysql/vcpkg-cmake-wrapper.cmake
deleted file mode 100644
index d7f0e7560..000000000
--- a/external_imported/vcpkg/ports/libmysql/vcpkg-cmake-wrapper.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-find_package(unofficial-libmysql CONFIG REQUIRED)
-if (TARGET mysqlclient)
-    set(MYSQL_LIBRARY mysqlclient)
-elseif (TARGET libmysql)
-    set(MYSQL_LIBRARY libmysql)
-endif()
-
-set(libmysql_FOUND 1)
-set(MYSQL_LIBRARIES ${MYSQL_LIBRARY})
diff --git a/external_imported/vcpkg/ports/libmysql/vcpkg.json b/external_imported/vcpkg/ports/libmysql/vcpkg.json
index cf955cc80..611d79d05 100644
--- a/external_imported/vcpkg/ports/libmysql/vcpkg.json
+++ b/external_imported/vcpkg/ports/libmysql/vcpkg.json
@@ -1,25 +1,28 @@
 {
   "name": "libmysql",
-  "version": "8.0.20",
-  "port-version": 10,
+  "version": "8.0.34",
+  "port-version": 1,
   "description": "A MySQL client library for C development",
   "homepage": "https://github.com/mysql/mysql-server",
   "license": "GPL-2.0-or-later",
-  "supports": "!(windows & x86) & !uwp",
+  "supports": "!android & !mingw & !uwp & !xbox",
   "dependencies": [
     "boost-algorithm",
     "boost-functional",
     "boost-geometry",
     "boost-graph",
     "boost-optional",
-    "icu",
-    "libevent",
+    {
+      "name": "libmysql",
+      "host": true
+    },
     "lz4",
     {
       "name": "ncurses",
       "platform": "!windows | mingw"
     },
     "openssl",
+    "rapidjson",
     {
       "name": "vcpkg-cmake",
       "host": true
@@ -28,6 +31,7 @@
       "name": "vcpkg-cmake-config",
       "host": true
     },
-    "zlib"
+    "zlib",
+    "zstd"
   ]
 }
diff --git a/external_imported/vcpkg/ports/libnice-gst/portfile.cmake b/external_imported/vcpkg/ports/libnice-gst/portfile.cmake
new file mode 100644
index 000000000..1d90ef02c
--- /dev/null
+++ b/external_imported/vcpkg/ports/libnice-gst/portfile.cmake
@@ -0,0 +1,92 @@
+vcpkg_from_gitlab(
+    GITLAB_URL https://gitlab.freedesktop.org
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO libnice/libnice
+    REF 0.1.21
+    SHA512 8808523d663da5974e81ffeef10812b758792b1f762edc1f3713d09962598a8a30d17ac1985438361d2a284b9bc82b5ba1e8d73c6e1ca86c93901bc06b634e9a
+    HEAD_REF master
+    PATCHES
+    skip_libnice.patch
+)
+
+set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
+
+vcpkg_configure_meson(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -Dgtk_doc=disabled #Enable generating the API reference (depends on GTK-Doc)
+        -Dintrospection=disabled #Enable GObject Introspection (depends on GObject)'
+        -Dtests=disabled
+        -Dexamples=disabled
+        -Dgstreamer=enabled
+        -Dcrypto-library=openssl
+    ADDITIONAL_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal'
+                        glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums'
+)
+
+# Could be features:
+# option('gupnp', type: 'feature', value: 'auto',
+  # description: 'Enable or disable GUPnP IGD support')
+# option('ignored-network-interface-prefix', type: 'array', value: ['docker', 'veth', 'virbr', 'vnet'],
+  # description: 'Ignore network interfaces whose name starts with a string from this list in the ICE connection check algorithm. For example, "virbr" to ignore virtual bridge interfaces added by virtd, which do not help in finding connectivity.')
+# option('crypto-library', type: 'combo', choices : ['auto', 'gnutls', 'openssl'], value : 'auto')
+
+vcpkg_install_meson()
+
+vcpkg_copy_pdbs()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    # Move plugin pkg-config file
+    file(COPY           "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/pkgconfig/gstnice.pc"
+         DESTINATION    "${CURRENT_PACKAGES_DIR}/lib/pkgconfig")
+    file(COPY           "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/pkgconfig/gstnice.pc"
+         DESTINATION    "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/pkgconfig/"
+                        "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/pkgconfig/")
+endif()
+
+vcpkg_fixup_pkgconfig()
+
+vcpkg_install_copyright(
+  FILE_LIST
+    "${SOURCE_PATH}/COPYING"
+    "${SOURCE_PATH}/COPYING.LGPL"
+    "${SOURCE_PATH}/COPYING.MPL"
+)
+
+set(USAGE_FILE "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage")
+file(WRITE "${USAGE_FILE}" "${PORT} usage:\n\n")
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    file(APPEND "${USAGE_FILE}" "\tMake sure one of the following paths is added to the 'GST_PLUGIN_PATH' environment variable\n")
+    file(APPEND "${USAGE_FILE}" "\tFor more information on GStreamer environment variables see https://gstreamer.freedesktop.org/documentation/gstreamer/running.html?gi-language=c#environment-variables\n")
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/plugins/gstreamer")
+        file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/${CMAKE_SHARED_LIBRARY_PREFIX}gstnice${CMAKE_SHARED_LIBRARY_SUFFIX}"
+                    "${CURRENT_PACKAGES_DIR}/debug/plugins/gstreamer/${CMAKE_SHARED_LIBRARY_PREFIX}gstnice${CMAKE_SHARED_LIBRARY_SUFFIX}")
+        if(VCPKG_TARGET_IS_WINDOWS)
+            file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/gstnice.pdb"
+                        "${CURRENT_PACKAGES_DIR}/debug/plugins/gstreamer/gstnice.pdb")
+        else()
+            file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib")
+        endif()
+
+        file(APPEND "${USAGE_FILE}" "\t\t* '<path-to-vcpkg_installed>/${TARGET_TRIPLET}/debug/plugins/gstreamer/'\n")
+    endif()
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+        file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/plugins/gstreamer")
+        file(RENAME "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/${CMAKE_SHARED_LIBRARY_PREFIX}gstnice${CMAKE_SHARED_LIBRARY_SUFFIX}"
+                    "${CURRENT_PACKAGES_DIR}/plugins/gstreamer/${CMAKE_SHARED_LIBRARY_PREFIX}gstnice${CMAKE_SHARED_LIBRARY_SUFFIX}")
+        if(VCPKG_TARGET_IS_WINDOWS)
+            file(RENAME "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/gstnice.pdb"
+                        "${CURRENT_PACKAGES_DIR}/plugins/gstreamer/gstnice.pdb")
+        else()
+            file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+        endif()
+
+        file(APPEND "${USAGE_FILE}" "\t\t* '<path-to-vcpkg_installed>/${TARGET_TRIPLET}/plugins/gstreamer/'\n")
+    endif()
+else()
+    file(APPEND "${USAGE_FILE}" "\tRegister static plugin with gst_plugin_register_static()\n")
+    file(APPEND "${USAGE_FILE}" "\thttps://gstreamer.freedesktop.org/documentation/application-development/appendix/compiling.html#embedding-static-elements-in-your-application\n")
+endif()
diff --git a/external_imported/vcpkg/ports/libnice-gst/skip_libnice.patch b/external_imported/vcpkg/ports/libnice-gst/skip_libnice.patch
new file mode 100644
index 000000000..045c80910
--- /dev/null
+++ b/external_imported/vcpkg/ports/libnice-gst/skip_libnice.patch
@@ -0,0 +1,43 @@
+diff --git a/gst/meson.build b/gst/meson.build
+index 572c6ab..325a3d5 100644
+--- a/gst/meson.build
++++ b/gst/meson.build
+@@ -13,12 +13,12 @@ libgstnice = library('gstnice',
+   c_args : gst_nice_args,
+   include_directories: nice_incs,
+   dependencies: [nice_deps, gst_dep],
+-  link_with: libnice,
+   install_dir: gst_plugins_install_dir,
+   install: true)
+ plugins = [libgstnice]
+ 
+ # Generate pc files for static plugins if we build static plugins
+ if get_option('default_library') != 'shared'
++  pkg = import('pkgconfig')
+   pkg.generate(libgstnice, install_dir: join_paths(gst_plugins_install_dir, 'pkgconfig'))
+ endif
+diff --git a/meson.build b/meson.build
+index 60ca250..05fc8c7 100644
+--- a/meson.build
++++ b/meson.build
+@@ -90,6 +90,7 @@ version_conf.set('NICE_VERSION_MINOR', version_minor)
+ version_conf.set('NICE_VERSION_MICRO', version_micro)
+ version_conf.set('NICE_VERSION_NANO', version_nano)
+ nice_version_h = configure_file(output: 'nice-version.h',
++  install: false,
+   install_dir: get_option('includedir') / 'nice',
+   configuration: version_conf)
+ 
+@@ -298,11 +299,7 @@ endif
+ 
+ gir = find_program('g-ir-scanner', required : get_option('introspection'))
+ 
+-subdir('agent')
+-subdir('stun')
+-subdir('socket')
+-subdir('random')
+-subdir('nice')
++nice_deps += [dependency('nice', version: '= @0@'.format(meson.project_version()), required: true)]
+ 
+ if gst_dep.found()
+   subdir('gst')
diff --git a/external_imported/vcpkg/ports/libnice-gst/vcpkg.json b/external_imported/vcpkg/ports/libnice-gst/vcpkg.json
new file mode 100644
index 000000000..71d9c6f1a
--- /dev/null
+++ b/external_imported/vcpkg/ports/libnice-gst/vcpkg.json
@@ -0,0 +1,13 @@
+{
+  "name": "libnice-gst",
+  "version": "0.1.21",
+  "port-version": 3,
+  "description": "Gstreamer Libnice plugins.",
+  "homepage": "https://nice.freedesktop.org",
+  "license": "LGPL-2.1-only AND MPL-1.1",
+  "supports": "!xbox",
+  "dependencies": [
+    "gstreamer",
+    "libnice"
+  ]
+}
diff --git a/external_imported/vcpkg/ports/libnice/portfile.cmake b/external_imported/vcpkg/ports/libnice/portfile.cmake
index 58ed00f05..5758a61f7 100644
--- a/external_imported/vcpkg/ports/libnice/portfile.cmake
+++ b/external_imported/vcpkg/ports/libnice/portfile.cmake
@@ -2,10 +2,10 @@ vcpkg_from_gitlab(
     GITLAB_URL https://gitlab.freedesktop.org
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libnice/libnice
-    REF 55b71d47f2b427b3baa8812818ed3f059acc748d # 0.1.18
-    SHA512 78575c487d74734d2dff1c04103fd55c76cf5e78edde03ffd68050348881a3efc985513cfd30553bfce0568c8edfcd61be7dea8991731efc749ee4fee2f503d6
+    REF 0.1.21
+    SHA512 8808523d663da5974e81ffeef10812b758792b1f762edc1f3713d09962598a8a30d17ac1985438361d2a284b9bc82b5ba1e8d73c6e1ca86c93901bc06b634e9a
     HEAD_REF master
-) 
+)
 
 vcpkg_configure_meson(
     SOURCE_PATH "${SOURCE_PATH}"
@@ -16,13 +16,11 @@ vcpkg_configure_meson(
         -Dexamples=disabled
         -Dgstreamer=disabled
         -Dcrypto-library=openssl
-    ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal'
-                               glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums'
-    ADDITIONAL_CROSS_BINARIES  glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal'
-                               glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums'
+    ADDITIONAL_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal'
+                        glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums'
 )
 
-# Could be features: 
+# Could be features:
 # option('gupnp', type: 'feature', value: 'auto',
   # description: 'Enable or disable GUPnP IGD support')
 # option('ignored-network-interface-prefix', type: 'array', value: ['docker', 'veth', 'virbr', 'vnet'],
diff --git a/external_imported/vcpkg/ports/libnice/vcpkg.json b/external_imported/vcpkg/ports/libnice/vcpkg.json
index 4a278f10d..200ad1d2a 100644
--- a/external_imported/vcpkg/ports/libnice/vcpkg.json
+++ b/external_imported/vcpkg/ports/libnice/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "libnice",
-  "version": "0.1.18",
+  "version": "0.1.21",
   "port-version": 1,
   "description": "Libnice is an implementation of the IETF's Interactive Connectivity Establishment (ICE) standard (RFC 5245) and the Session Traversal Utilities for NAT (STUN) standard (RFC 5389).",
   "homepage": "https://nice.freedesktop.org",
   "license": "LGPL-2.1-only AND MPL-1.1",
+  "supports": "!xbox",
   "dependencies": [
     "glib",
     {
diff --git a/external_imported/vcpkg/ports/libnick/portfile.cmake b/external_imported/vcpkg/ports/libnick/portfile.cmake
new file mode 100644
index 000000000..a39afb176
--- /dev/null
+++ b/external_imported/vcpkg/ports/libnick/portfile.cmake
@@ -0,0 +1,32 @@
+if(VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO NickvisionApps/libnick
+    REF "${VERSION}"
+    SHA512 dd824109dbf0538b9064c215f3e145a2be0043ed2c26e4c5b2e875e7bfb03f37cd413fb54f6b5193cbc19f7d146ace635667f6f59e5fa160559fd24b366c9c6e
+    HEAD_REF main
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_TESTING=OFF
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libnick)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+vcpkg_copy_pdbs()
+
+vcpkg_fixup_pkgconfig()
+
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY)
diff --git a/external_imported/vcpkg/ports/libnick/usage b/external_imported/vcpkg/ports/libnick/usage
new file mode 100644
index 000000000..53c8caee9
--- /dev/null
+++ b/external_imported/vcpkg/ports/libnick/usage
@@ -0,0 +1,8 @@
+libnick provides CMake targets:
+
+    find_package(libnick CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE libnick::libnick)
+
+libnick provides pkg-config modules:
+
+    libnick
diff --git a/external_imported/vcpkg/ports/libnick/vcpkg.json b/external_imported/vcpkg/ports/libnick/vcpkg.json
new file mode 100644
index 000000000..258cde11e
--- /dev/null
+++ b/external_imported/vcpkg/ports/libnick/vcpkg.json
@@ -0,0 +1,38 @@
+{
+  "name": "libnick",
+  "version": "2024.2.1",
+  "maintainers": "Nicholas Logozzo nlogozzo225@gmail.com",
+  "description": "A cross-platform base for native Nickvision applications.",
+  "homepage": "https://github.com/NickvisionApps/libnick",
+  "documentation": "https://github.com/NickvisionApps/libnick/tree/main/docs",
+  "license": "GPL-3.0",
+  "supports": "(windows & x64) | (linux & x64)",
+  "dependencies": [
+    "boost-locale",
+    "curl",
+    "gettext-libintl",
+    {
+      "name": "glib",
+      "platform": "linux"
+    },
+    "jsoncpp",
+    {
+      "name": "libsecret",
+      "platform": "linux"
+    },
+    {
+      "name": "libuuid",
+      "platform": "linux"
+    },
+    "maddy",
+    "openssl",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/libnop/portfile.cmake b/external_imported/vcpkg/ports/libnop/portfile.cmake
index 5c10f5e60..e26104295 100644
--- a/external_imported/vcpkg/ports/libnop/portfile.cmake
+++ b/external_imported/vcpkg/ports/libnop/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/libnop
-    REF 910b55815be16109f04f4180e9adee14fb4ce281
-    SHA512 74c5324eaa1b6b2ac8dfef94c835b5c5b044625f8e5efe3522470b1ecc4798ff43d344a013cee2f6901e83267c6167072947b754e63f1552ae7044cffe234c36
+    REF 35e800d81f28c632956c5a592e3cbe8085ecd430
+    SHA512 27f62710afb41165db5ef54bb2d09f89ed9c0c0cb401bffe2c52590bb28c67ed6ba68922510cdedd6dc7cc75fc267a02a2f9cbcca4bfa85042792a121e27097e
 )
 file(INSTALL ${SOURCE_PATH}/include/nop DESTINATION ${CURRENT_PACKAGES_DIR}/include)
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/libnop/vcpkg.json b/external_imported/vcpkg/ports/libnop/vcpkg.json
index be09bef23..f342378f1 100644
--- a/external_imported/vcpkg/ports/libnop/vcpkg.json
+++ b/external_imported/vcpkg/ports/libnop/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "libnop",
-  "version-date": "2021-03-01",
+  "version-date": "2021-11-03",
   "description": "libnop is a header-only library for serializing and deserializing C++ data types without external code generators or runtime support libraries",
   "homepage": "https://github.com/google/libnop"
 }
diff --git a/external_imported/vcpkg/ports/libobfuscate/portfile.cmake b/external_imported/vcpkg/ports/libobfuscate/portfile.cmake
new file mode 100644
index 000000000..801c9d4e6
--- /dev/null
+++ b/external_imported/vcpkg/ports/libobfuscate/portfile.cmake
@@ -0,0 +1,11 @@
+vcpkg_from_github(
+  OUT_SOURCE_PATH SOURCE_PATH
+  REPO adamyaxley/Obfuscate
+  REF 674a53f34c05a1dd092561face7a6807f921d223
+  SHA512 9a3ef203386f149d916d9511492da94b6ab02fb001475ecb423eaf3f5510f6332ac57ce889a6b26a8a7c54066ec3d5ffabc5886338ecdaf0590423c385c449d9
+  HEAD_REF master
+)
+
+file(INSTALL ${SOURCE_PATH}/obfuscate.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/libobfuscate/vcpkg.json b/external_imported/vcpkg/ports/libobfuscate/vcpkg.json
new file mode 100644
index 000000000..33c7d516b
--- /dev/null
+++ b/external_imported/vcpkg/ports/libobfuscate/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "libobfuscate",
+  "version-date": "2023-03-23",
+  "description": "Guaranteed compile-time string literal obfuscation header-only library for C++14.",
+  "homepage": "https://github.com/adamyaxley/Obfuscate",
+  "license": "Unlicense"
+}
diff --git a/external_imported/vcpkg/ports/libodb-pgsql/portfile.cmake b/external_imported/vcpkg/ports/libodb-pgsql/portfile.cmake
index 53cf5db23..284fb69e2 100644
--- a/external_imported/vcpkg/ports/libodb-pgsql/portfile.cmake
+++ b/external_imported/vcpkg/ports/libodb-pgsql/portfile.cmake
@@ -4,8 +4,8 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 535515356233b815f144c0098940174f7a530e7fa4e930c0a9ebdc255fdb8bac8cdcceac31f25be4864105323e00bfe50808efa648e7c8ffb5a944e52f514b69
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
 )
 file(REMOVE "${SOURCE_PATH}/version")
diff --git a/external_imported/vcpkg/ports/libodb-pgsql/vcpkg.json b/external_imported/vcpkg/ports/libodb-pgsql/vcpkg.json
index 10a86d94b..dbc4b807c 100644
--- a/external_imported/vcpkg/ports/libodb-pgsql/vcpkg.json
+++ b/external_imported/vcpkg/ports/libodb-pgsql/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libodb-pgsql",
   "version": "2.4.0",
-  "port-version": 6,
+  "port-version": 7,
   "description": "Description: PostgreSQL support for the ODB ORM library",
   "homepage": "https://www.codesynthesis.com/products/odb/",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/libofx/vcpkg.json b/external_imported/vcpkg/ports/libofx/vcpkg.json
index d0e335540..32fe77d10 100644
--- a/external_imported/vcpkg/ports/libofx/vcpkg.json
+++ b/external_imported/vcpkg/ports/libofx/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "libofx",
   "version": "0.10.9",
+  "port-version": 1,
   "description": "OFX banking protocol abstraction library",
   "homepage": "https://github.com/libofx/libofx",
   "license": "GPL-2.0-only",
-  "supports": "!uwp",
+  "supports": "!uwp & !xbox",
   "dependencies": [
     "libopensp",
     {
diff --git a/external_imported/vcpkg/ports/libopenmpt/CMakeLists.txt b/external_imported/vcpkg/ports/libopenmpt/CMakeLists.txt
index cce387beb..e33601cc0 100644
--- a/external_imported/vcpkg/ports/libopenmpt/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/libopenmpt/CMakeLists.txt
@@ -11,7 +11,7 @@ endif()
 
 find_package(ZLIB REQUIRED)
 find_package(mpg123 CONFIG REQUIRED)
-find_package(Vorbis REQUIRED)
+find_package(Vorbis CONFIG REQUIRED)
 
 file(GLOB HEADERS libopenmpt/*.h libopenmpt/*.hpp src/openmpt/all/*.hpp)
 list(FILTER HEADERS EXCLUDE REGEX "_impl\\.hpp$|_internal\\.h$")
@@ -82,16 +82,16 @@ set(exec_prefix [[${prefix}]])
 set(includedir [[${prefix}/include]])
 set(libdir [[${prefix}/lib]])
 configure_file(libopenmpt/libopenmpt.pc.in libopenmpt.pc)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenmpt.pc DESTINATION lib/pkgconfig)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libopenmpt.pc" DESTINATION lib/pkgconfig)
 
 install(TARGETS libopenmpt EXPORT libopenmpt-targets)
 install(EXPORT libopenmpt-targets DESTINATION share/libopenmpt NAMESPACE libopenmpt::)
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/libopenmpt-config.cmake [[
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/libopenmpt-config.cmake" [[
 include(CMakeFindDependencyMacro)
 find_dependency(ZLIB)
 find_dependency(mpg123 CONFIG)
-find_dependency(Vorbis)
-include(${CMAKE_CURRENT_LIST_DIR}/libopenmpt-targets.cmake)
+find_dependency(Vorbis CONFIG)
+include("${CMAKE_CURRENT_LIST_DIR}/libopenmpt-targets.cmake")
 ]])
 install(FILES ${HEADERS} DESTINATION include/libopenmpt)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenmpt-config.cmake DESTINATION share/libopenmpt)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libopenmpt-config.cmake" DESTINATION share/libopenmpt)
diff --git a/external_imported/vcpkg/ports/libopenmpt/portfile.cmake b/external_imported/vcpkg/ports/libopenmpt/portfile.cmake
index c568c7a84..a0fb876fd 100644
--- a/external_imported/vcpkg/ports/libopenmpt/portfile.cmake
+++ b/external_imported/vcpkg/ports/libopenmpt/portfile.cmake
@@ -1,20 +1,17 @@
 vcpkg_from_github(
-  OUT_SOURCE_PATH SOURCE_PATH
-  REPO OpenMPT/openmpt
-  REF 6860d1dec9bd31ed450a44148e789c4054925ed0 # libopenmpt-0.6.7
-  SHA512 04c9d6e2d604dc412574f20ec2ef055dc721530ea1b6ea276f93071be4e6f451a78cc66c30470e361c95995f27759c69534f70419856f1ba6cfe69478b9207db
-  HEAD_REF master
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO OpenMPT/openmpt
+    REF "libopenmpt-${VERSION}"
+    SHA512 ff89a4bf9b1831a5ca1241bddbeff30a16bb32132165e73fb51f6ad43450c23ed236a1ad26e99f1e4af4a65cb58c8ca6140e09b7ac7cd57771526dec160d851b
+    HEAD_REF master
 )
 
-file(READ ${CMAKE_CURRENT_LIST_DIR}/vcpkg.json vcpkg_json)
-string(JSON version GET "${vcpkg_json}" "version")
-
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
 vcpkg_cmake_configure(
-  SOURCE_PATH ${SOURCE_PATH}
-  OPTIONS
-    -DVERSION=${version}
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        "-DVERSION=${VERSION}"
 )
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup()
@@ -27,5 +24,5 @@ else()
     vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/libopenmpt/libopenmpt_config.h "defined(LIBOPENMPT_USE_DLL)" "1")
 endif()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/libopenmpt/vcpkg.json b/external_imported/vcpkg/ports/libopenmpt/vcpkg.json
index e60b7afbf..63ad48fa8 100644
--- a/external_imported/vcpkg/ports/libopenmpt/vcpkg.json
+++ b/external_imported/vcpkg/ports/libopenmpt/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libopenmpt",
-  "version": "0.6.7",
-  "description": "a cross-platform C++ and C library to decode tracked music files (modules) into a raw PCM audio stream.",
+  "version": "0.6.12",
+  "description": "A cross-platform C++ and C library to decode tracked music files (modules) into a raw PCM audio stream.",
   "homepage": "https://openmpt.org/",
   "license": "BSD-3-Clause",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/libopensp/opensp.pc.in b/external_imported/vcpkg/ports/libopensp/opensp.pc.in
index 9ca06dce8..2b659bd42 100644
--- a/external_imported/vcpkg/ports/libopensp/opensp.pc.in
+++ b/external_imported/vcpkg/ports/libopensp/opensp.pc.in
@@ -5,8 +5,8 @@ includedir=${prefix}/include/OpenSP
 
 Name: opensp
 Description: SGML parser algorithm library
-Version: @OPENSP_VERSION@
+Version: @VERSION@
 Libs: -L${libdir} -losp
 Libs.private: @EXTRA_LIBS@
 Cflags: -I${includedir}
-Cflags.private:
\ No newline at end of file
+Cflags.private:
diff --git a/external_imported/vcpkg/ports/libopensp/portfile.cmake b/external_imported/vcpkg/ports/libopensp/portfile.cmake
index cf92ff86f..5466e207a 100644
--- a/external_imported/vcpkg/ports/libopensp/portfile.cmake
+++ b/external_imported/vcpkg/ports/libopensp/portfile.cmake
@@ -1,6 +1,7 @@
-set(OPENSP_VERSION 1.5.2)
-
-set(PATCHES opensp_1.5.2-13.diff)                   # http://deb.debian.org/debian/pool/main/o/opensp/opensp_1.5.2-13.diff.gz
+set(PATCHES
+    opensp_1.5.2-13.diff                   # http://deb.debian.org/debian/pool/main/o/opensp/opensp_1.5.2-13.diff.gz
+    use-cpp-using-declarations.patch
+)
 if (VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
     list(APPEND PATCHES windows_cmake_build.diff)   # https://invent.kde.org/packaging/craft-blueprints-kde/-/tree/master/libs/libopensp
 endif()
@@ -9,15 +10,15 @@ if (VCPKG_TARGET_IS_UWP)
 endif()
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://downloads.sourceforge.net/project/openjade/opensp/${OPENSP_VERSION}/OpenSP-${OPENSP_VERSION}.tar.gz"
-    FILENAME "OpenSP-${OPENSP_VERSION}.tar.gz"
+    URLS "https://downloads.sourceforge.net/project/openjade/opensp/${VERSION}/OpenSP-${VERSION}.tar.gz"
+    FILENAME "OpenSP-${VERSION}.tar.gz"
     SHA512 a7dcc246ba7f58969ecd6d107c7b82dede811e65f375b7aa3e683621f2c6ff3e7dccefdd79098fcadad6cca8bb94c2933c63f4701be2c002f9a56f1bbe6b047e
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
-    REF ${OPENSP_VERSION}
+    SOURCE_BASE ${VERSION}
     PATCHES ${PATCHES}
 )
 
diff --git a/external_imported/vcpkg/ports/libopensp/use-cpp-using-declarations.patch b/external_imported/vcpkg/ports/libopensp/use-cpp-using-declarations.patch
new file mode 100644
index 000000000..4a6e8bdc5
--- /dev/null
+++ b/external_imported/vcpkg/ports/libopensp/use-cpp-using-declarations.patch
@@ -0,0 +1,72 @@
+diff --git a/include/IList.h b/include/IList.h
+index e66cd00..c94cfed 100644
+--- a/include/IList.h
++++ b/include/IList.h
+@@ -26,7 +26,9 @@ public:
+   void swap(IList<T> &list) { IListBase::swap(list); }
+   T *head() const { return (T *)IListBase::head(); }
+   T *get() { return (T *)IListBase::get(); }
++  using
+   IListBase::clear;
++  using
+   IListBase::empty;
+ friend class IListIter<T>;
+ private:
+diff --git a/include/IListIter.h b/include/IListIter.h
+index 74e1bd6..d322bf8 100644
+--- a/include/IListIter.h
++++ b/include/IListIter.h
+@@ -17,7 +17,9 @@ public:
+   IListIter(const IList<T> &list) : IListIterBase(list) { }
+   T *cur() const { return (T *)IListIterBase::cur(); }
+   
++  using
+   IListIterBase::next;
++  using
+   IListIterBase::done;
+ };
+ 
+diff --git a/include/Ptr.h b/include/Ptr.h
+index c6b2767..5dda0ca 100644
+--- a/include/Ptr.h
++++ b/include/Ptr.h
+@@ -69,7 +69,9 @@ public:
+   const T *operator->() const { return Ptr<T>::pointer(); }
+   const T &operator*() const { return *Ptr<T>::pointer(); }
+   void swap(ConstPtr<T> &p) { Ptr<T>::swap(p); }
++  using
+   Ptr<T>::isNull;
++  using
+   Ptr<T>::clear;
+   Boolean operator==(const Ptr<T> &p) const { return Ptr<T>::operator==(p); }
+   Boolean operator!=(const Ptr<T> &p) const { return Ptr<T>::operator!=(p); }
+diff --git a/lib/Parser.h b/lib/Parser.h
+index e721000..c6c41b2 100644
+--- a/lib/Parser.h
++++ b/lib/Parser.h
+@@ -62,15 +62,25 @@ public:
+   Parser(const SgmlParser::Params &);
+   Event *nextEvent();
+   void parseAll(EventHandler &, const volatile sig_atomic_t *cancelPtr);
++  using
+   ParserState::sdPointer;
++  using
+   ParserState::instanceSyntaxPointer;
++  using
+   ParserState::prologSyntaxPointer;
++  using
+   ParserState::activateLinkType;
++  using
+   ParserState::allLinkTypesActivated;
++  using
+   ParserState::entityManager;
++  using
+   ParserState::entityCatalog;
++  using
+   ParserState::baseDtd;
++  using
+   ParserState::options;
++  using 
+   ParserState::instantiateDtd;
+   friend class PiAttspecParser;
+ private:
diff --git a/external_imported/vcpkg/ports/libopensp/vcpkg.json b/external_imported/vcpkg/ports/libopensp/vcpkg.json
index adf16ff17..879e19683 100644
--- a/external_imported/vcpkg/ports/libopensp/vcpkg.json
+++ b/external_imported/vcpkg/ports/libopensp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libopensp",
   "version": "1.5.2",
-  "port-version": 1,
+  "port-version": 3,
   "description": "SGML parser algorithm",
   "homepage": "http://openjade.sourceforge.net",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/libopnmidi/cmake-package-export.patch b/external_imported/vcpkg/ports/libopnmidi/cmake-package-export.patch
index d4d77403d..3a5eb342e 100644
--- a/external_imported/vcpkg/ports/libopnmidi/cmake-package-export.patch
+++ b/external_imported/vcpkg/ports/libopnmidi/cmake-package-export.patch
@@ -76,21 +76,21 @@ index 66d4848..4276e23 100644
          DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
  
 +include(CMakePackageConfigHelpers)
-+configure_package_config_file(libOPNMIDI-config.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/libOPNMIDI-config.cmake"
++configure_package_config_file(libOPNMIDIConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/libOPNMIDIConfig.cmake"
 +    PATH_VARS CMAKE_INSTALL_PREFIX CMAKE_INSTALL_FULL_BINDIR CMAKE_INSTALL_FULL_INCLUDEDIR CMAKE_INSTALL_FULL_LIBDIR
 +    INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/libOPNMIDI"
 +)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libOPNMIDI-config.cmake
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libOPNMIDIConfig.cmake
 +        DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/libOPNMIDI")
 +
  if(WITH_EXTRA_BANKS AND NOT APPLE)
      file(GLOB WOPN_FILES ${libOPNMIDI_SOURCE_DIR}/fm_banks/*.wopn)
      install(FILES ${WOPN_FILES}
-diff --git a/libOPNMIDI-config.cmake.in b/libOPNMIDI-config.cmake.in
+diff --git a/libOPNMIDIConfig.cmake.in b/libOPNMIDIConfig.cmake.in
 new file mode 100644
 index 0000000..f292e48
 --- /dev/null
-+++ b/libOPNMIDI-config.cmake.in
++++ b/libOPNMIDIConfig.cmake.in
 @@ -0,0 +1,33 @@
 +include(FeatureSummary)
 +set_package_properties(libOPNMIDI PROPERTIES
diff --git a/external_imported/vcpkg/ports/libopnmidi/vcpkg.json b/external_imported/vcpkg/ports/libopnmidi/vcpkg.json
index 5f380c0f3..960d4aac2 100644
--- a/external_imported/vcpkg/ports/libopnmidi/vcpkg.json
+++ b/external_imported/vcpkg/ports/libopnmidi/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "libopnmidi",
   "version": "1.5.1",
+  "port-version": 1,
   "description": "libOPNMIDI is a free Software MIDI synthesizer library with OPN2 (YM2612) and OPNA (YM2608) emulation",
   "homepage": "https://github.com/Wohlstand/libOPNMIDI",
   "license": "LGPL-2.1-or-later OR GPL-2.0-or-later OR GPL-3.0-or-later OR MIT",
diff --git a/external_imported/vcpkg/ports/libopusenc/vcpkg.json b/external_imported/vcpkg/ports/libopusenc/vcpkg.json
index ea02bcad5..81c87aca6 100644
--- a/external_imported/vcpkg/ports/libopusenc/vcpkg.json
+++ b/external_imported/vcpkg/ports/libopusenc/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libopusenc",
-  "version-string": "0.2.1",
-  "port-version": 2,
+  "version": "0.2.1",
+  "port-version": 3,
   "description": "Library for encoding .opus audio files and live streams.",
   "homepage": "https://github.com/xiph/libopusenc",
   "supports": "!uwp",
diff --git a/external_imported/vcpkg/ports/libosip2/portfile.cmake b/external_imported/vcpkg/ports/libosip2/portfile.cmake
index e289d493b..ed636c21c 100644
--- a/external_imported/vcpkg/ports/libosip2/portfile.cmake
+++ b/external_imported/vcpkg/ports/libosip2/portfile.cmake
@@ -1,9 +1,7 @@
-set(LIBOSIP2_VER "5.2.0")
-
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://ftp.gnu.org/gnu/osip/libosip2-${LIBOSIP2_VER}.tar.gz" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/osip/libosip2-${LIBOSIP2_VER}.tar.gz"
-    FILENAME "libosip2-${LIBOSIP2_VER}.tar.gz"
-    SHA512 cc714ab5669c466ee8f0de78cf74a8b7633f3089bf104c9c1474326840db3d791270159456f9deb877af2df346b04493e8f796b2bb7d2be134f6c08b25a29f83
+    URLS "https://ftp.gnu.org/gnu/osip/libosip2-${VERSION}.tar.gz" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/osip/libosip2-${VERSION}.tar.gz"
+    FILENAME "libosip2-${VERSION}.tar.gz"
+    SHA512 cd9db7a736cca90c6862b84c4941ef025f5affab8af9bbc02ce0dd3310a2c555e0922c1bfa72d8ac08791fa1441bbcc30b627d52ca8b51f3471573a10ac82a00
 )
 
 set(PATCHES)
@@ -11,9 +9,9 @@ if(VCPKG_TARGET_IS_WINDOWS)
     list(APPEND PATCHES fix-path-in-project.patch)
 endif()
 
-vcpkg_extract_source_archive_ex(
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
-    OUT_SOURCE_PATH SOURCE_PATH
     PATCHES ${PATCHES}
 )
 
@@ -29,18 +27,16 @@ if(VCPKG_TARGET_IS_WINDOWS)
         )
     endforeach()
 
-    vcpkg_install_msbuild(
+    vcpkg_msbuild_install(
         SOURCE_PATH "${SOURCE_PATH}"
         PROJECT_SUBPATH "platform/vsnet/osip2.vcxproj"
-        INCLUDES_SUBPATH include
-        USE_VCPKG_INTEGRATION
-        REMOVE_ROOT_INCLUDES
     )
 
-    vcpkg_install_msbuild(
+    file(COPY "${SOURCE_PATH}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include" PATTERN Makefile.* EXCLUDE)
+
+    vcpkg_msbuild_install(
         SOURCE_PATH "${SOURCE_PATH}"
         PROJECT_SUBPATH "platform/vsnet/osipparser2.vcxproj"
-        USE_VCPKG_INTEGRATION
     )
 
 elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
@@ -50,8 +46,6 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
 
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-
 endif()
 
-# Handle copyright
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/libosip2/vcpkg.json b/external_imported/vcpkg/ports/libosip2/vcpkg.json
index a524d3460..ac9798c9c 100644
--- a/external_imported/vcpkg/ports/libosip2/vcpkg.json
+++ b/external_imported/vcpkg/ports/libosip2/vcpkg.json
@@ -1,11 +1,15 @@
 {
   "name": "libosip2",
-  "version": "5.2.0",
-  "port-version": 2,
+  "version": "5.3.1",
   "description": "oSIP is an LGPL implementation of SIP. It's stable, portable, flexible and compliant! -may be more-! It is used mostly with eXosip2 stack (GPL) which provides simpler API for User-Agent implementation.",
   "homepage": "https://www.gnu.org/software/osip/",
-  "supports": "!(windows & arm)",
+  "supports": "!(windows & arm) & !uwp",
   "dependencies": [
-    "pthread"
+    "pthread",
+    {
+      "name": "vcpkg-msbuild",
+      "host": true,
+      "platform": "windows"
+    }
   ]
 }
diff --git a/external_imported/vcpkg/ports/libosmium/portfile.cmake b/external_imported/vcpkg/ports/libosmium/portfile.cmake
index f0443e3d6..719d98c99 100644
--- a/external_imported/vcpkg/ports/libosmium/portfile.cmake
+++ b/external_imported/vcpkg/ports/libosmium/portfile.cmake
@@ -1,22 +1,23 @@
-# header-only library
+set(VCPKG_BUILD_TYPE release) # header-only
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO osmcode/libosmium
-    REF v2.18.0
-    SHA512 bfe4d5b08e284abb21280205437c62d260948c8585cc8d10f0c3496fd29df1ff6c6bc436283207f292d6a8af911835ebef64403c3fde2a262b55fde5296c13ce
+    REF "v${VERSION}"
+    SHA512 72e881e221dc3e62d7459b5cd84bf65de4fc0149bed66fe0534107d0d4dc30e5d474df685b44af07e6065a690dd7b31b877b5b040b8e0b4b0b971738175c34a3
 )
-set(BOOST_ROOT "${CURRENT_INSTALLED_DIR}")
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DBUILD_TESTING=OFF
         -DBUILD_EXAMPLES=OFF
+        -DCMAKE_DISABLE_FIND_PACKAGE_GDAL=ON
+        # for transitive dependencies via pkgconf 
+        -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=1
+        -DVCPKG_HOST_TRIPLET=${HOST_TRIPLET}
 )
-
 vcpkg_cmake_install()
 
-# Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
\ No newline at end of file
+file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/libosmium/usage b/external_imported/vcpkg/ports/libosmium/usage
new file mode 100644
index 000000000..813a70522
--- /dev/null
+++ b/external_imported/vcpkg/ports/libosmium/usage
@@ -0,0 +1,4 @@
+libosmium is header-only and can be used from CMake via:
+
+    find_path(OSMIUM_INCLUDE_DIRS "osmium/version.hpp")
+    target_include_directories(main PRIVATE ${OSMIUM_INCLUDE_DIRS})
diff --git a/external_imported/vcpkg/ports/libosmium/vcpkg.json b/external_imported/vcpkg/ports/libosmium/vcpkg.json
index 13ab8f0ab..e526a2e40 100644
--- a/external_imported/vcpkg/ports/libosmium/vcpkg.json
+++ b/external_imported/vcpkg/ports/libosmium/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "libosmium",
-  "version-semver": "2.18.0",
+  "version-semver": "2.20.0",
   "port-version": 1,
   "description": "A fast and flexible C++ library for working with OpenStreetMap data",
   "homepage": "https://osmcode.org/libosmium/",
diff --git a/external_imported/vcpkg/ports/libosmscout/portfile.cmake b/external_imported/vcpkg/ports/libosmscout/portfile.cmake
index f1c4990fd..b10ac9d37 100644
--- a/external_imported/vcpkg/ports/libosmscout/portfile.cmake
+++ b/external_imported/vcpkg/ports/libosmscout/portfile.cmake
@@ -6,20 +6,13 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
-	vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-		cairo OSMDCOUT_BUILD_MAP_CAIRO
-		directx OSMDCOUT_BUILD_MAP_DIRECTX
-		gdi OSMDCOUT_BUILD_MAP_GDI
-		svg OSMDCOUT_BUILD_MAP_SVG
-	)
-else()
-	vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-		cairo OSMDCOUT_BUILD_MAP_CAIRO
-		svg OSMDCOUT_BUILD_MAP_SVG
-	)
-	list(APPEND FEATURE_OPTIONS -DOSMDCOUT_BUILD_MAP_DIRECTX=OFF -DOSMDCOUT_BUILD_MAP_GDI=OFF)
-endif()
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES
+    cairo   OSMSCOUT_BUILD_MAP_CAIRO
+    directx OSMSCOUT_BUILD_MAP_DIRECTX
+    gdi     OSMSCOUT_BUILD_MAP_GDI
+    svg     OSMSCOUT_BUILD_MAP_SVG
+    qt5      OSMSCOUT_BUILD_MAP_QT
+)
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
@@ -34,7 +27,6 @@ vcpkg_cmake_configure(
         -DOSMSCOUT_BUILD_TOOL_STYLEEDITOR=OFF
         -DOSMSCOUT_BUILD_EXTERN_MATLAB=OFF
         -DOSMSCOUT_BUILD_TESTS=OFF
-        -DOSMDCOUT_BUILD_MAP_QT=OFF
         ${FEATURE_OPTIONS}
 )
 
@@ -42,7 +34,7 @@ vcpkg_cmake_install()
 vcpkg_copy_tools(TOOL_NAMES Import AUTO_CLEAN)
 vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/libosmscout)
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
diff --git a/external_imported/vcpkg/ports/libosmscout/vcpkg.json b/external_imported/vcpkg/ports/libosmscout/vcpkg.json
index 571584487..e49ed461e 100644
--- a/external_imported/vcpkg/ports/libosmscout/vcpkg.json
+++ b/external_imported/vcpkg/ports/libosmscout/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libosmscout",
-  "version-string": "1.1.1",
-  "port-version": 1,
+  "version": "1.1.1",
+  "port-version": 4,
   "description": "libosmscout offers applications simple, high-level interfaces for offline location and POI lokup, rendering and routing functionalities based on OpenStreetMap (OSM) data.",
   "homepage": "http://libosmscout.sourceforge.net/",
   "documentation": "http://libosmscout.sourceforge.net/documentation/",
@@ -33,10 +33,19 @@
       ]
     },
     "directx": {
-      "description": "Direct2D backend renderer"
+      "description": "Direct2D backend renderer",
+      "supports": "windows"
     },
     "gdi": {
-      "description": "GDI+ backend renderer"
+      "description": "GDI+ backend renderer",
+      "supports": "windows"
+    },
+    "qt5": {
+      "description": "Enable build of Qt5 map drawing backend",
+      "dependencies": [
+        "qt5-base",
+        "qt5-svg"
+      ]
     },
     "svg": {
       "description": "SVG backend renderer",
diff --git a/external_imported/vcpkg/ports/libp7client/vcpkg.json b/external_imported/vcpkg/ports/libp7client/vcpkg.json
index a116182e7..c3db1e637 100644
--- a/external_imported/vcpkg/ports/libp7client/vcpkg.json
+++ b/external_imported/vcpkg/ports/libp7client/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libp7client",
-  "version-string": "5.6",
-  "port-version": 3,
+  "version": "5.6",
+  "port-version": 4,
   "description": "Open source, cross-platform, fastest library for sending logs, telemetry & trace data from your application.",
   "homepage": "https://baical.net/",
   "supports": "!(arm | uwp | osx)",
diff --git a/external_imported/vcpkg/ports/libpcap/add-disable-packet-option.patch b/external_imported/vcpkg/ports/libpcap/add-disable-packet-option.patch
index 9d89a5505..8cec80674 100644
--- a/external_imported/vcpkg/ports/libpcap/add-disable-packet-option.patch
+++ b/external_imported/vcpkg/ports/libpcap/add-disable-packet-option.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2f675d1..e9d6d96 100644
+index 650be01..7565e58 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -244,6 +244,7 @@ set(SEPTEL_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../septel" CACHE PATH "Path to dire
+@@ -521,6 +521,7 @@ set(SEPTEL_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../septel" CACHE PATH "Path to dire
  option(DISABLE_SNF "Disable Myricom SNF support" OFF)
  
  option(DISABLE_TC "Disable Riverbed TurboCap support" OFF)
@@ -10,22 +10,20 @@ index 2f675d1..e9d6d96 100644
  
  #
  # Debugging options.
-@@ -302,7 +303,7 @@ if(WIN32)
+@@ -579,7 +580,7 @@ if(WIN32)
      if(IS_DIRECTORY ${CMAKE_HOME_DIRECTORY}/../../Common)
          include_directories(${CMAKE_HOME_DIRECTORY}/../../Common)
      endif(IS_DIRECTORY ${CMAKE_HOME_DIRECTORY}/../../Common)
 -
 +    if(NOT DISABLE_PACKET)
      find_package(Packet)
-     if(PACKET_FOUND)
+     if(Packet_FOUND)
          set(HAVE_PACKET32 TRUE)
-@@ -317,7 +318,8 @@ if(WIN32)
+@@ -594,6 +595,7 @@ if(WIN32)
          check_function_exists(PacketGetTimestampModes HAVE_PACKET_GET_TIMESTAMP_MODES)
          cmake_pop_check_state()
-     endif(PACKET_FOUND)
--
+     endif(Packet_FOUND)
 +    endif()
-+    
+ 
      message(STATUS "checking for Npcap's version.h")
      check_symbol_exists(WINPCAP_PRODUCT_NAME "${CMAKE_SOURCE_DIR}/../../version.h" HAVE_VERSION_H)
-     if(HAVE_VERSION_H)
diff --git a/external_imported/vcpkg/ports/libpcap/install-pc-on-msvc.patch b/external_imported/vcpkg/ports/libpcap/install-pc-on-msvc.patch
index 6dd18f202..2cc9513ac 100644
--- a/external_imported/vcpkg/ports/libpcap/install-pc-on-msvc.patch
+++ b/external_imported/vcpkg/ports/libpcap/install-pc-on-msvc.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b83fbbd..2f675d1 100644
+index 58c5159..650be01 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -2678,9 +2678,12 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pcap.h DESTINATION include)
+@@ -3238,9 +3238,12 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pcap.h DESTINATION include)
  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pcap-bpf.h DESTINATION include)
  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pcap-namedb.h DESTINATION include)
  
@@ -10,28 +10,28 @@ index b83fbbd..2f675d1 100644
 -# pcap-config and process man pages and arrange that they be installed.
 -if(NOT MSVC)
 +# Generate libpcap.pc
-+if(BUILD_SHARED_LIBS)
-+    set(PACKAGE_NAME ${LIBRARY_NAME})
++if(MSVC AND NOT BUILD_SHARED_LIBS)
++    set(PACKAGE_NAME ${LIBRARY_NAME}_static)
 +else()
-+    set(PACKAGE_NAME pcap)
++    set(PACKAGE_NAME ${LIBRARY_NAME})
 +endif()
      set(prefix ${CMAKE_INSTALL_PREFIX})
      set(exec_prefix "\${prefix}")
      set(includedir "\${prefix}/include")
-@@ -2715,10 +2718,14 @@ if(NOT MSVC)
-     foreach(LIB ${PCAP_LINK_LIBRARIES})
-         set(LIBS "${LIBS} -l${LIB}")
-     endforeach(LIB)
+@@ -3308,10 +3311,14 @@ if(NOT MSVC)
+             set(RPATH "")
+         endif()
+     endif()
 -    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/pcap-config.in ${CMAKE_CURRENT_BINARY_DIR}/pcap-config @ONLY)
      configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpcap.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libpcap.pc @ONLY)
 -    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/pcap-config DESTINATION bin)
      install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpcap.pc DESTINATION lib/pkgconfig)
-+    
 +# On UN*X, and on Windows when not using MSVC, generate libpcap.pc and
 +# pcap-config and process man pages and arrange that they be installed.
 +if(NOT MSVC)
 +    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/pcap-config.in ${CMAKE_CURRENT_BINARY_DIR}/pcap-config @ONLY)
 +    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/pcap-config DESTINATION bin)
++  
  
      #
      # Man pages.
diff --git a/external_imported/vcpkg/ports/libpcap/portfile.cmake b/external_imported/vcpkg/ports/libpcap/portfile.cmake
index 4d1823bcb..d412bab8c 100644
--- a/external_imported/vcpkg/ports/libpcap/portfile.cmake
+++ b/external_imported/vcpkg/ports/libpcap/portfile.cmake
@@ -14,8 +14,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO the-tcpdump-group/libpcap
-    REF c7642e2cc0c5bd65754685b160d25dc23c76c6bd #1.10.1
-    SHA512 ed46095863aaee79ca2833d26438f6c837cc3e64acb73efd5a388a11ff7d0d1245d23e5404070a9f2c2c77840c93c09328746761e4481e9a530593a5cbf2ad6f
+    REF "libpcap-${VERSION}"
+    SHA512 7352ff4d5bded916c0802e4a846fcb6b26e3ea8025dbbf58543abd9d9f6e8f7f5d60e03bcadb222d20434b7e052f663a560d7487af4b81fba74cf5aea040d733
     HEAD_REF master
     PATCHES 
         install-pc-on-msvc.patch
@@ -33,6 +33,7 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" USE_STATIC_RT)
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    DISABLE_PARALLEL_CONFIGURE
     OPTIONS
         -DDISABLE_NETMAP=ON
         -DDISABLE_BLUETOOTH=ON
@@ -48,7 +49,7 @@ vcpkg_cmake_configure(
 )
 
 vcpkg_cmake_install()
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
 
 # On Windows 64-bit, libpcap 1.10.1 installs the libraries in a x64 subdirectory of the usual directories
 if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
diff --git a/external_imported/vcpkg/ports/libpcap/vcpkg.json b/external_imported/vcpkg/ports/libpcap/vcpkg.json
index 166a8ce90..bf007b514 100644
--- a/external_imported/vcpkg/ports/libpcap/vcpkg.json
+++ b/external_imported/vcpkg/ports/libpcap/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "libpcap",
-  "version-semver": "1.10.1",
+  "version-semver": "1.10.4",
   "port-version": 1,
   "description": "A portable C/C++ library for network traffic capture",
   "homepage": "https://www.tcpdump.org/",
+  "license": "BSD-3-Clause",
   "supports": "!uwp",
   "dependencies": [
     {
diff --git a/external_imported/vcpkg/ports/libpff/portfile.cmake b/external_imported/vcpkg/ports/libpff/portfile.cmake
index 04e25f71f..882825a2a 100644
--- a/external_imported/vcpkg/ports/libpff/portfile.cmake
+++ b/external_imported/vcpkg/ports/libpff/portfile.cmake
@@ -10,10 +10,10 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 ad2cf4b0841c448b60738cd2f340868c0f11eb34167bfe5b093645a2a080d694e199afe4fef5eeea1016487820132be33f8e51910d2142ff032320ad2dbeb59d
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE ${ARCHIVE}
-    REF ${LIB_VERSION}
+    SOURCE_BASE ${LIB_VERSION}
 )
 
 
diff --git a/external_imported/vcpkg/ports/libpff/vcpkg.json b/external_imported/vcpkg/ports/libpff/vcpkg.json
index 079e4fa82..2703c6215 100644
--- a/external_imported/vcpkg/ports/libpff/vcpkg.json
+++ b/external_imported/vcpkg/ports/libpff/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "libpff",
   "version-date": "2021-11-14",
+  "port-version": 2,
   "description": "Library and tools to access the Personal Folder File (PFF) and the Offline Folder File (OFF) format.",
   "homepage": "https://github.com/libyal/libpff",
-  "license": "LGPL-3.0",
-  "supports": "windows & !(static & windows) & !uwp",
+  "license": "LGPL-3.0-or-later",
+  "supports": "windows & !(static & windows) & !uwp & !xbox",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/libphonenumber/fix-find-protobuf.patch b/external_imported/vcpkg/ports/libphonenumber/fix-find-protobuf.patch
index 19055f6df..6dd1dcada 100644
--- a/external_imported/vcpkg/ports/libphonenumber/fix-find-protobuf.patch
+++ b/external_imported/vcpkg/ports/libphonenumber/fix-find-protobuf.patch
@@ -1,8 +1,8 @@
 diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
-index 86f2212..46913fd 100644
+index 10b6dce7..50f06eda 100644
 --- a/cpp/CMakeLists.txt
 +++ b/cpp/CMakeLists.txt
-@@ -44,6 +44,7 @@ function (print_error DESCRIPTION FILE)
+@@ -46,6 +46,7 @@ function (print_error DESCRIPTION FILE)
      "Can't find ${DESCRIPTION}: can't locate ${FILE}. Please read the README.")
  endfunction ()
  
diff --git a/external_imported/vcpkg/ports/libphonenumber/fix-icui18n-lib-name.patch b/external_imported/vcpkg/ports/libphonenumber/fix-icui18n-lib-name.patch
index fc44f7d30..1cc5a41e5 100644
--- a/external_imported/vcpkg/ports/libphonenumber/fix-icui18n-lib-name.patch
+++ b/external_imported/vcpkg/ports/libphonenumber/fix-icui18n-lib-name.patch
@@ -1,13 +1,17 @@
-diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
-index cdd7a08..627f897 100644
---- a/cpp/CMakeLists.txt
-+++ b/cpp/CMakeLists.txt
-@@ -192,7 +192,7 @@ set (ICU_INCLUDE_DIR ${ICU_UC_INCLUDE_DIR})
- set (ICU_LIB ${ICU_UC_LIB})
- # If ICU regexp engine is used or if the geocoder is built, use icui18n as well.
- if (USE_ICU_REGEXP OR BUILD_GEOCODER)
--  find_required_library (ICU_I18N unicode/regex.h icui18n "ICU")
-+  find_required_library (ICU_I18N unicode/regex.h icuin "ICU")
-   check_library_version (PC_ICU_I18N icu-i18n>=4.4)
-   list (APPEND ICU_INCLUDE_DIR ${ICU_I18N_INCLUDE_DIR})
-   list (APPEND ICU_LIB ${ICU_I18N_LIB})
+diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
+index cdd7a081..10b6dce7 100644
+--- a/cpp/CMakeLists.txt
++++ b/cpp/CMakeLists.txt
+@@ -192,7 +192,11 @@ set (ICU_INCLUDE_DIR ${ICU_UC_INCLUDE_DIR})
+ set (ICU_LIB ${ICU_UC_LIB})
+ # If ICU regexp engine is used or if the geocoder is built, use icui18n as well.
+ if (USE_ICU_REGEXP OR BUILD_GEOCODER)
+-  find_required_library (ICU_I18N unicode/regex.h icui18n "ICU")
++  if (NOT WIN32)
++  find_required_library (ICU_I18N unicode/regex.h "icui18n" "ICU")
++  else ()
++  find_required_library (ICU_I18N unicode/regex.h "icuin" "ICU")
++  endif ()
+   check_library_version (PC_ICU_I18N icu-i18n>=4.4)
+   list (APPEND ICU_INCLUDE_DIR ${ICU_I18N_INCLUDE_DIR})
+   list (APPEND ICU_LIB ${ICU_I18N_LIB})
diff --git a/external_imported/vcpkg/ports/libphonenumber/fix-re2-identifiers.patch b/external_imported/vcpkg/ports/libphonenumber/fix-re2-identifiers.patch
index 91344ed4f..41de0befa 100644
--- a/external_imported/vcpkg/ports/libphonenumber/fix-re2-identifiers.patch
+++ b/external_imported/vcpkg/ports/libphonenumber/fix-re2-identifiers.patch
@@ -1,13 +1,13 @@
-diff --git a/cpp/src/phonenumbers/regexp_adapter_re2.cc b/cpp/src/phonenumbers/regexp_adapter_re2.cc
-index bb54223..398f369 100644
---- a/cpp/src/phonenumbers/regexp_adapter_re2.cc
-+++ b/cpp/src/phonenumbers/regexp_adapter_re2.cc
-@@ -31,6 +31,8 @@
- namespace i18n {
- namespace phonenumbers {
- 
-+using re2::StringPiece;
-+
- // Implementation of RegExpInput abstract class.
- class RE2RegExpInput : public RegExpInput {
-  public:
+diff --git a/cpp/src/phonenumbers/regexp_adapter_re2.cc b/cpp/src/phonenumbers/regexp_adapter_re2.cc
+index bb542234..398f369b 100644
+--- a/cpp/src/phonenumbers/regexp_adapter_re2.cc
++++ b/cpp/src/phonenumbers/regexp_adapter_re2.cc
+@@ -31,6 +31,8 @@
+ namespace i18n {
+ namespace phonenumbers {
+ 
++using re2::StringPiece;
++
+ // Implementation of RegExpInput abstract class.
+ class RE2RegExpInput : public RegExpInput {
+  public:
diff --git a/external_imported/vcpkg/ports/libphonenumber/portfile.cmake b/external_imported/vcpkg/ports/libphonenumber/portfile.cmake
index 5ebe478ea..a6f5f71ee 100644
--- a/external_imported/vcpkg/ports/libphonenumber/portfile.cmake
+++ b/external_imported/vcpkg/ports/libphonenumber/portfile.cmake
@@ -4,12 +4,13 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/libphonenumber
     REF "v${VERSION}"
-    SHA512 401d6bdfe603ffd994ebb76c8b073e0f0d135390bee72fe4783b5fd9b684e2531af154906f49bf7803d3e720b2d0ccc00fc0ea6fbbd2729556a488c5f5647bee
+    SHA512 bdfc51a8e2ecf59b092a74a7d5b99594194c21e62bc9e956e7263f98d8a6cdd85a9b04f2e5aa01e501319335ddf77feec66e74967e3b1b186f899543ebadb8ca
     HEAD_REF master
     PATCHES 
-        "fix-re2-identifiers.patch"
-        "fix-icui18n-lib-name.patch"
+        fix-re2-identifiers.patch
+        fix-icui18n-lib-name.patch
         fix-find-protobuf.patch
+        re2-2023-07-01-compat.patch
 )
 
 vcpkg_cmake_configure(
@@ -23,8 +24,11 @@ vcpkg_cmake_configure(
         -DBUILD_TESTING=OFF)
 
 vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
+
 vcpkg_copy_pdbs()
 
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake)
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/libphonenumber/re2-2023-07-01-compat.patch b/external_imported/vcpkg/ports/libphonenumber/re2-2023-07-01-compat.patch
new file mode 100644
index 000000000..2ba8ea67a
--- /dev/null
+++ b/external_imported/vcpkg/ports/libphonenumber/re2-2023-07-01-compat.patch
@@ -0,0 +1,13 @@
+diff --git a/cpp/src/phonenumbers/regexp_adapter_re2.cc b/cpp/src/phonenumbers/regexp_adapter_re2.cc
+index 398f369b..3dd5d854 100644
+--- a/cpp/src/phonenumbers/regexp_adapter_re2.cc
++++ b/cpp/src/phonenumbers/regexp_adapter_re2.cc
+@@ -41,7 +41,7 @@ class RE2RegExpInput : public RegExpInput {
+         utf8_input_(string_) {}
+ 
+   virtual string ToString() const {
+-    return utf8_input_.ToString();
++    return string(utf8_input_.data(), utf8_input_.size());
+   }
+ 
+   StringPiece* Data() {
diff --git a/external_imported/vcpkg/ports/libphonenumber/usage b/external_imported/vcpkg/ports/libphonenumber/usage
new file mode 100644
index 000000000..d54aaf85f
--- /dev/null
+++ b/external_imported/vcpkg/ports/libphonenumber/usage
@@ -0,0 +1,4 @@
+libphonenumber provides CMake targets:
+
+    find_package(libphonenumber CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE libphonenumber::phonenumber)
diff --git a/external_imported/vcpkg/ports/libphonenumber/vcpkg.json b/external_imported/vcpkg/ports/libphonenumber/vcpkg.json
index bb4dabfec..18a7a65e6 100644
--- a/external_imported/vcpkg/ports/libphonenumber/vcpkg.json
+++ b/external_imported/vcpkg/ports/libphonenumber/vcpkg.json
@@ -1,9 +1,8 @@
 {
   "name": "libphonenumber",
-  "version": "8.13.7",
+  "version": "8.13.29",
   "description": "Google's common Java, C++ and JavaScript library for parsing, formatting, and validating international phone numbers.",
   "license": "Apache-2.0",
-  "supports": "!linux & !osx",
   "dependencies": [
     "abseil",
     "boost-date-time",
diff --git a/external_imported/vcpkg/ports/libplist/001_fix_static_build.patch b/external_imported/vcpkg/ports/libplist/001_fix_static_build.patch
new file mode 100644
index 000000000..f346423b6
--- /dev/null
+++ b/external_imported/vcpkg/ports/libplist/001_fix_static_build.patch
@@ -0,0 +1,22 @@
+diff --git a/src/plist.c b/src/plist.c
+index 19279edb..a62687eb 100644
+--- a/src/plist.c
++++ b/src/plist.c
+@@ -51,6 +51,8 @@
+ typedef SSIZE_T ssize_t;
+ #endif
+ 
++#ifndef LIBPLIST_STATIC  // disable dll constructor
++
+ extern void plist_xml_init(void);
+ extern void plist_xml_deinit(void);
+ extern void plist_bin_init(void);
+@@ -137,6 +139,8 @@ BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpReserved)
+ #warning No compiler support for constructor/destructor attributes, some features might not be available.
+ #endif
+ 
++#endif  // disable dll constructor
++
+ #ifndef HAVE_MEMMEM
+ // see https://sourceware.org/legacy-ml/libc-alpha/2007-12/msg00000.html
+ 
diff --git a/external_imported/vcpkg/ports/libplist/002_fix_api.patch b/external_imported/vcpkg/ports/libplist/002_fix_api.patch
new file mode 100644
index 000000000..71cedee15
--- /dev/null
+++ b/external_imported/vcpkg/ports/libplist/002_fix_api.patch
@@ -0,0 +1,24 @@
+diff --git a/include/plist/plist.h b/include/plist/plist.h
+index 47eda513..9df379ab 100644
+--- a/include/plist/plist.h
++++ b/include/plist/plist.h
+@@ -78,17 +78,13 @@ extern "C"
+ #ifdef LIBPLIST_STATIC
+   #define PLIST_API
+ #elif defined(_WIN32)
+-  #ifdef DLL_EXPORT
++  #ifdef PLIST_EXPORT
+     #define PLIST_API __declspec(dllexport)
+   #else
+     #define PLIST_API __declspec(dllimport)
+   #endif
+ #else
+-  #if __GNUC__ >= 4
+-    #define PLIST_API __attribute__((visibility("default")))
+-  #else
+-    #define PLIST_API
+-  #endif
++  #define PLIST_API __attribute__((visibility("default")))
+ #endif
+ 
+ #include <sys/types.h>
diff --git a/external_imported/vcpkg/ports/libplist/003_fix_msvc.patch b/external_imported/vcpkg/ports/libplist/003_fix_msvc.patch
new file mode 100644
index 000000000..083e5f4e9
--- /dev/null
+++ b/external_imported/vcpkg/ports/libplist/003_fix_msvc.patch
@@ -0,0 +1,106 @@
+diff --git a/src/bplist.c b/src/bplist.c
+index 953c2c77..d7b4777a 100644
+--- a/src/bplist.c
++++ b/src/bplist.c
+@@ -87,6 +87,28 @@ union plist_uint_ptr
+     uint64_t *u64ptr;
+ };
+ 
++#ifdef _MSC_VER
++uint64_t get_unaligned_64(uint64_t *ptr)
++{
++	uint64_t temp;
++	memcpy(&temp, ptr, sizeof(temp));
++	return temp;
++}
++
++uint32_t get_unaligned_32(uint32_t *ptr)
++{
++	uint32_t temp;
++	memcpy(&temp, ptr, sizeof(temp));
++	return temp;
++}
++
++uint16_t get_unaligned_16(uint16_t *ptr)
++{
++	uint16_t temp;
++	memcpy(&temp, ptr, sizeof(temp));
++	return temp;
++}
++#else
+ #define get_unaligned(ptr)			  \
+   ({                                              \
+     struct __attribute__((packed)) {		  \
+@@ -94,6 +116,7 @@ union plist_uint_ptr
+     } *__p = (void *) (ptr);			  \
+     __p->__v;					  \
+   })
++#endif
+ 
+ 
+ #ifndef bswap16
+@@ -148,10 +171,23 @@ union plist_uint_ptr
+ #define beNtoh(x,n) be64toh((x) << ((8-(n)) << 3))
+ #endif
+ 
++#ifdef _MSC_VER
++uint64_t UINT_TO_HOST(void* x, uint8_t n)
++{
++		union plist_uint_ptr __up;
++		__up.src = (n > 8) ? (char *)x + (n - 8) : x;
++		return (n >= 8 ? be64toh( get_unaligned_64(__up.u64ptr) ) :
++		(n == 4 ? be32toh( get_unaligned_32(__up.u32ptr) ) :
++		(n == 2 ? be16toh( get_unaligned_16(__up.u16ptr) ) :
++                (n == 1 ? *__up.u8ptr :
++		beNtoh( get_unaligned_64(__up.u64ptr), n)
++		))));
++}
++#else
+ #define UINT_TO_HOST(x, n) \
+ 	({ \
+ 		union plist_uint_ptr __up; \
+-		__up.src = ((n) > 8) ? (x) + ((n) - 8) : (x); \
++		__up.src = ((n) > 8) ? ((char *)x) + ((n) - 8) : (x); \
+ 		((n) >= 8 ? be64toh( get_unaligned(__up.u64ptr) ) : \
+ 		((n) == 4 ? be32toh( get_unaligned(__up.u32ptr) ) : \
+ 		((n) == 2 ? be16toh( get_unaligned(__up.u16ptr) ) : \
+@@ -159,6 +195,7 @@ union plist_uint_ptr
+ 		beNtoh( get_unaligned(__up.u64ptr), n) \
+ 		)))); \
+ 	})
++#endif
+ 
+ #define get_needed_bytes(x) \
+ 		( ((uint64_t)(x)) < (1ULL << 8) ? 1 : \
+@@ -277,11 +314,19 @@ static plist_t parse_real_node(const char **bnode, uint8_t size)
+     switch (size)
+     {
+     case sizeof(uint32_t):
++#ifdef _MSC_VER
++        *(uint32_t*)buf = float_bswap32(get_unaligned_32((uint32_t*)*bnode));
++#else
+         *(uint32_t*)buf = float_bswap32(get_unaligned((uint32_t*)*bnode));
++#endif
+         data->realval = *(float *) buf;
+         break;
+     case sizeof(uint64_t):
++#ifdef _MSC_VER
++        *(uint64_t*)buf = float_bswap64(get_unaligned_64((uint64_t*)*bnode));
++#else
+         *(uint64_t*)buf = float_bswap64(get_unaligned((uint64_t*)*bnode));
++#endif
+         data->realval = *(double *) buf;
+         break;
+     default:
+@@ -343,7 +388,11 @@ static char *plist_utf16be_to_utf8(uint16_t *unistr, long len, long *items_read,
+ 	}
+ 
+ 	while (i < len) {
++#if _MSC_VER
++		wc = be16toh(get_unaligned_16(unistr + i));
++#else
+ 		wc = be16toh(get_unaligned(unistr + i));
++#endif
+ 		i++;
+ 		if (wc >= 0xD800 && wc <= 0xDBFF) {
+ 			if (!read_lead_surrogate) {
diff --git a/external_imported/vcpkg/ports/libplist/004_fix_tools_msvc.patch b/external_imported/vcpkg/ports/libplist/004_fix_tools_msvc.patch
new file mode 100644
index 000000000..38910012c
--- /dev/null
+++ b/external_imported/vcpkg/ports/libplist/004_fix_tools_msvc.patch
@@ -0,0 +1,18 @@
+diff --git a/tools/plistutil.c b/tools/plistutil.c
+index 8121a7d..98b440e 100644
+--- a/tools/plistutil.c
++++ b/tools/plistutil.c
+@@ -32,10 +32,13 @@
+ #include <string.h>
+ #include <sys/stat.h>
+ #include <errno.h>
++#ifndef _MSC_VER
+ #include <unistd.h>
++#endif
+ 
+ #ifdef _MSC_VER
+ #pragma warning(disable:4996)
++#define STDIN_FILENO _fileno(stdin)
+ #endif
+ 
+ typedef struct _options
diff --git a/external_imported/vcpkg/ports/libplist/CMakeLists.txt b/external_imported/vcpkg/ports/libplist/CMakeLists.txt
index 800f46283..970334396 100644
--- a/external_imported/vcpkg/ports/libplist/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/libplist/CMakeLists.txt
@@ -1,79 +1,103 @@
-cmake_minimum_required(VERSION 3.8)
-project(plist C CXX)
-
-file(GLOB_RECURSE PLIST_HEADER include/plist/*.h)
-
-set(PLIST_SRC
-    src/base64.c
-    src/bytearray.c
-    src/hashtable.c
-    src/ptrarray.c
-    src/time64.c
-    src/xplist.c
-    src/bplist.c
-    src/plist.c
-)
-
-set(PLISTPP_SRC
-    src/Node.cpp
-    src/Structure.cpp
-    src/Array.cpp
-    src/Boolean.cpp
-    src/Data.cpp
-    src/Date.cpp
-    src/Dictionary.cpp
-    src/Integer.cpp
-    src/Key.cpp
-    src/Real.cpp
-    src/String.cpp
-    src/Uid.cpp
-)
-
-file(GLOB_RECURSE LIBCNARY_HEADER libcnary/include/*.h)
-file(GLOB_RECURSE LIBCNARY_SRC libcnary/*c)
-
-add_library(plist ${PLIST_SRC} ${PLIST_HEADER} ${LIBCNARY_SRC} ${LIBCNARY_HEADER})
-target_include_directories(plist PRIVATE src include libcnary/include)
-set_target_properties(plist PROPERTIES OUTPUT_NAME plist-2.0)
-
-add_library(plist++ STATIC ${PLISTPP_SRC} ${PLIST_HEADER} ${LIBCNARY_SRC} ${LIBCNARY_HEADER})
-set_target_properties(plist++ PROPERTIES OUTPUT_NAME plist++-2.0)
-target_include_directories(plist++ PRIVATE src include libcnary/include)
-
-if(WIN32 AND BUILD_SHARED_LIBS)
-    target_compile_options(plist PRIVATE -W3 -WX- -sdl-)
-    target_compile_definitions(plist PRIVATE -DLIBPLIST_EXPORTS)
-    target_compile_options(plist++ PRIVATE -W3 -WX- -sdl-)
-    target_compile_definitions(plist++ PRIVATE -DLIBPLIST_EXPORTS)
-endif()
-if(NOT BUILD_SHARED_LIBS)
-    target_compile_definitions(plist PRIVATE -DLIBPLIST_STATIC_LIBRARY)
-endif()
-
-target_link_libraries(plist++ PRIVATE plist)
-
-install(
-    TARGETS plist plist++
-    RUNTIME DESTINATION bin
-    ARCHIVE DESTINATION lib
-    LIBRARY DESTINATION lib
-)
-
-set(PACKAGE_NAME libplist)
-set(PACKAGE_VERSION 2.0)
-set(prefix ${CMAKE_INSTALL_PREFIX})
-set(exec_prefix \${prefix})
-set(libdir \${prefix}/lib)
-set(includedir \${prefix}/../include)
-foreach (PLIST_PKGCONFIG libplist-2.0.pc libplist++-2.0.pc)
-configure_file(
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/${PLIST_PKGCONFIG}.in
-    ${CMAKE_CURRENT_BINARY_DIR}/${PLIST_PKGCONFIG}
-    @ONLY
-)
-install(
-    FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLIST_PKGCONFIG}
-    DESTINATION lib/pkgconfig)
-endforeach()
-
-install(FILES ${PLIST_HEADER} DESTINATION include/plist)
+cmake_minimum_required(VERSION 3.15)
+project(libplist C CXX)
+
+option(BUILD_TOOLS "Build tools." OFF)
+
+include(GNUInstallDirs)
+
+file(GLOB_RECURSE LIBCNARY_SOURCE libcnary/node.c libcnary/node_list.c)
+file(GLOB_RECURSE LIBPLIST_SOURCE src/*.c)
+file(GLOB_RECURSE LIBPLISTPP_SOURCE src/*.cpp)
+
+set(DEFINITIONS)
+
+if(BUILD_SHARED_LIBS)
+    if(WIN32)
+        list(APPEND DEFINITIONS -DLIBPLIST_EXPORT)
+    endif()
+else()
+    list(APPEND DEFINITIONS -DLIBPLIST_STATIC)
+endif()
+
+if(UNIX)
+    list(APPEND DEFINITIONS -DHAVE_STRNDUP)
+endif()
+
+if(WIN32)
+    list(APPEND DEFINITIONS -D_CRT_SECURE_NO_WARNINGS)
+endif()
+
+add_library(libplist ${LIBPLIST_SOURCE} ${LIBCNARY_SOURCE})
+target_include_directories(libplist PUBLIC
+    "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/libcnary/include>"
+    "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src>"
+    "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
+    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
+)
+target_compile_definitions(libplist PRIVATE ${DEFINITIONS})
+set_target_properties(libplist PROPERTIES OUTPUT_NAME plist-2.0)
+if(UNIX AND NOT APPLE)
+    target_link_libraries(libplist PRIVATE m)
+endif()
+
+add_library(libplist++ STATIC ${LIBPLISTPP_SOURCE} ${LIBCNARY_SOURCE})
+target_include_directories(libplist++ PUBLIC
+    "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/libcnary/include>"
+    "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src>"
+    "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
+    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
+)
+target_compile_definitions(libplist++ PRIVATE ${DEFINITIONS})
+target_link_libraries(libplist++ PUBLIC libplist)
+set_target_properties(libplist++ PROPERTIES OUTPUT_NAME plist++-2.0)
+
+install(TARGETS libplist libplist++ EXPORT unofficial-libplist)
+
+install(
+    EXPORT unofficial-libplist
+    FILE unofficial-libplist-config.cmake
+    DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/unofficial-libplist"
+    NAMESPACE unofficial::libplist::
+)
+
+install(
+    DIRECTORY "${CMAKE_SOURCE_DIR}/include/plist"
+    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+)
+
+set(PACKAGE_NAME libplist)
+set(PACKAGE_VERSION 2.0)
+set(prefix "")
+set(exec_prefix "\${prefix}")
+set(libdir "\${prefix}/lib")
+set(includedir "\${prefix}/include")
+
+foreach(PLIST_PKGCONFIG libplist-2.0.pc libplist++-2.0.pc)
+    configure_file(
+        "${CMAKE_CURRENT_SOURCE_DIR}/src/${PLIST_PKGCONFIG}.in"
+        "${CMAKE_CURRENT_BINARY_DIR}/${PLIST_PKGCONFIG}"
+        @ONLY
+    )
+    install(
+        FILES "${CMAKE_CURRENT_BINARY_DIR}/${PLIST_PKGCONFIG}"
+        DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
+    )
+endforeach()
+
+if(BUILD_TOOLS)
+    add_executable(plistutil "tools/plistutil.c")
+    target_compile_definitions(plistutil PRIVATE
+        -DPACKAGE_VERSION="2.3.0"
+        -DPACKAGE_URL="https://github.com/libimobiledevice/libplist"
+        -DPACKAGE_BUGREPORT="https://github.com/libimobiledevice/libplist/issues"
+    )
+    if(NOT BUILD_SHARED_LIBS)
+        target_compile_definitions(plistutil PRIVATE -DLIBPLIST_STATIC)
+    endif()
+    target_link_libraries(plistutil PRIVATE libplist)
+
+    install(
+        TARGETS plistutil
+        RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+    )
+endif()
diff --git a/external_imported/vcpkg/ports/libplist/dllexport.patch b/external_imported/vcpkg/ports/libplist/dllexport.patch
deleted file mode 100644
index f5e006210..000000000
--- a/external_imported/vcpkg/ports/libplist/dllexport.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/include/plist/plist.h b/include/plist/plist.h
-index 2863c74..9cdb219 100644
---- a/include/plist/plist.h
-+++ b/include/plist/plist.h
-@@ -42,7 +42,7 @@ extern "C"
- #include <stdint.h>
- #endif
- 
--#ifdef _MSC_VER 
-+#if defined(_MSC_VER) && defined(LIBPLIST_EXPORTS)
- #define PLIST_API_MSC __declspec( dllexport ) 
- #else  
- #define PLIST_API_MSC 
-diff --git a/src/plist.h b/src/plist.h
-index 1e5d0d1..6690343 100644
---- a/src/plist.h
-+++ b/src/plist.h
-@@ -39,10 +39,7 @@
- #include <sys/time.h>
- #endif
- 
--#ifdef _MSC_VER
--  #define PLIST_API __declspec( dllexport )
--#else
--#ifdef WIN32
-+#if (defined(_MSC_VER) || defined(WIN32)) && defined(LIBPLIST_EXPORTS)
-   #define PLIST_API __declspec( dllexport )
- #else
-   #ifdef HAVE_FVISIBILITY
-@@ -51,7 +48,6 @@
-     #define PLIST_API
-   #endif
- #endif
--#endif
- 
- struct plist_data_s
- {
diff --git a/external_imported/vcpkg/ports/libplist/fix_static_build.patch b/external_imported/vcpkg/ports/libplist/fix_static_build.patch
deleted file mode 100644
index eeedef8ca..000000000
--- a/external_imported/vcpkg/ports/libplist/fix_static_build.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/plist.c b/src/plist.c
-index 57f0be4..cbe10ad 100644
---- a/src/plist.c
-+++ b/src/plist.c
-@@ -62,6 +62,8 @@ static void internal_plist_deinit(void)
-     plist_xml_deinit();
- }
- 
-+#ifndef LIBPLIST_STATIC_LIBRARY
-+
- #ifdef WIN32
- 
- typedef volatile struct {
-@@ -116,6 +118,8 @@ static void __attribute__((destructor)) libplist_deinitialize(void)
- 
- #endif
- 
-+#endif
-+
- #ifndef HAVE_MEMMEM
- // see https://sourceware.org/legacy-ml/libc-alpha/2007-12/msg00000.html
- 
diff --git a/external_imported/vcpkg/ports/libplist/portfile.cmake b/external_imported/vcpkg/ports/libplist/portfile.cmake
index c057cc218..d29483de6 100644
--- a/external_imported/vcpkg/ports/libplist/portfile.cmake
+++ b/external_imported/vcpkg/ports/libplist/portfile.cmake
@@ -1,46 +1,47 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO libimobiledevice-win32/libplist
-    REF bbba7cabb78aad180a7a982ada5e1f21ff0ba873 # v1.3.6
-    SHA512 4cd59ed87c647259d0da99a20a05e01aa880f01f6b5cecd29e4247029a3d29f0f68b4552571eb3fd3c5549b4cb357801ffe43338b8ff34d44d6be5393d2e6b9d
-    HEAD_REF msvc-master
+    REPO libimobiledevice/libplist
+    REF 2d8d7ef272db06783989f77ba1ed80aa0f4d2dfd # commits on 2023-06-15
+    SHA512 ec7c723ffb0492fe9901ee3854df16465e1b5b051cc8a716d89ff8fbf8f782134b7dda4d3a9656016fcf15c7cdf0eef7c80551b38a62317a11f056500e5c9ef4
+    HEAD_REF master
     PATCHES
-        dllexport.patch
-        fix_static_build.patch
+        001_fix_static_build.patch
+        002_fix_api.patch
+        003_fix_msvc.patch
+        004_fix_tools_msvc.patch
 )
 
-configure_file("${CURRENT_PORT_DIR}/CMakeLists.txt" "${SOURCE_PATH}/CMakeLists.txt" COPYONLY)
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        tools BUILD_TOOLS
+)
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        ${FEATURE_OPTIONS}
 )
 
 vcpkg_cmake_install()
-vcpkg_copy_pdbs()
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT})
 vcpkg_fixup_pkgconfig()
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-
-set(pcfile "libplist-2.0.pc")
-set(pcfiletarget "libplist.pc")
-set(basepath "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/")
-if(EXISTS "${basepath}${pcfile}")
-    file(CREATE_LINK "${basepath}${pcfile}" "${basepath}${pcfiletarget}" COPY_ON_ERROR)
-endif()
-set(basepath "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/")
-if(EXISTS "${basepath}${pcfile}")
-    file(CREATE_LINK "${basepath}${pcfile}" "${basepath}${pcfiletarget}" COPY_ON_ERROR)
+if("tools" IN_LIST FEATURES)
+    vcpkg_copy_tools(TOOL_NAMES plistutil AUTO_CLEAN)
 endif()
 
-set(pcfile "libplist++-2.0.pc")
-set(pcfiletarget "libplist++.pc")
-set(basepath "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/")
-if(EXISTS "${basepath}${pcfile}")
-    file(CREATE_LINK "${basepath}${pcfile}" "${basepath}${pcfiletarget}" COPY_ON_ERROR)
-endif()
-set(basepath "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/")
-if(EXISTS "${basepath}${pcfile}")
-    file(CREATE_LINK "${basepath}${pcfile}" "${basepath}${pcfiletarget}" COPY_ON_ERROR)
+if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/plist/plist.h"
+        "#ifdef LIBPLIST_STATIC" "#if 1"
+    )
+else()
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/plist/plist.h"
+        "#ifdef LIBPLIST_STATIC" "#if 0"
+    )
 endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/libplist/usage b/external_imported/vcpkg/ports/libplist/usage
new file mode 100644
index 000000000..81c34ead0
--- /dev/null
+++ b/external_imported/vcpkg/ports/libplist/usage
@@ -0,0 +1,4 @@
+libplist provides CMake targets:
+
+    find_package(unofficial-libplist CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE unofficial::libplist::libplist unofficial::libplist::libplist++)
diff --git a/external_imported/vcpkg/ports/libplist/vcpkg.json b/external_imported/vcpkg/ports/libplist/vcpkg.json
index 459a3df20..f7dec8548 100644
--- a/external_imported/vcpkg/ports/libplist/vcpkg.json
+++ b/external_imported/vcpkg/ports/libplist/vcpkg.json
@@ -1,14 +1,24 @@
 {
   "name": "libplist",
-  "version": "1.3.6",
-  "port-version": 2,
+  "version-date": "2023-06-15",
+  "port-version": 1,
   "description": "A library to handle Apple Property List format in binary or XML",
   "homepage": "https://libimobiledevice.org/",
-  "license": "LGPL-2.1-only",
+  "license": "LGPL-2.1-or-later",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
       "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
+  "features": {
+    "tools": {
+      "description": "build command line tool",
+      "supports": "!android & !ios & !xbox"
     }
-  ]
+  }
 }
diff --git a/external_imported/vcpkg/ports/libpng/cmake.patch b/external_imported/vcpkg/ports/libpng/cmake.patch
index 0e00c3b80..66a373116 100644
--- a/external_imported/vcpkg/ports/libpng/cmake.patch
+++ b/external_imported/vcpkg/ports/libpng/cmake.patch
@@ -1,13 +1,13 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8652564..d0681d2 100644
+index e355e4d..6dfe543 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -614,7 +614,7 @@ if(PNG_STATIC)
-   # MSVC doesn't use a different file extension for shared vs. static
-   # libs. We are able to change OUTPUT_NAME to remove the _static
-   # for all other platforms.
--  if(NOT MSVC)
-+  if(1)
-     set_target_properties(png_static PROPERTIES
-                           OUTPUT_NAME "${PNG_LIB_NAME}"
-                           CLEAN_DIRECT_OUTPUT 1)
+@@ -632,7 +632,7 @@ else()
+   # We also need to use a custom suffix, in order to distinguish between the
+   # shared import library name and the static library name.
+   set(PNG_SHARED_OUTPUT_NAME "libpng${PNGLIB_ABI_VERSION}")
+-  set(PNG_STATIC_OUTPUT_NAME "libpng${PNGLIB_ABI_VERSION}_static")
++  set(PNG_STATIC_OUTPUT_NAME "libpng${PNGLIB_ABI_VERSION}")
+ endif()
+ 
+ if(PNG_SHARED)
diff --git a/external_imported/vcpkg/ports/libpng/fix-export-targets.patch b/external_imported/vcpkg/ports/libpng/fix-export-targets.patch
index 577dc2f8f..bea2daaf5 100644
--- a/external_imported/vcpkg/ports/libpng/fix-export-targets.patch
+++ b/external_imported/vcpkg/ports/libpng/fix-export-targets.patch
@@ -1,17 +1,17 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c01cdcb..0ad4ba4 100644
+index e355e4d..3e2f346 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1033,6 +1033,12 @@ if(NOT SKIP_INSTALL_EXPORT AND NOT SKIP_INSTALL_ALL)
+@@ -1053,6 +1053,12 @@ if(NOT SKIP_INSTALL_EXPORT AND NOT SKIP_INSTALL_ALL)
    install(EXPORT libpng
            DESTINATION lib/libpng
-           FILE lib${PNG_LIB_NAME}.cmake)
+           FILE libpng${PNGLIB_ABI_VERSION}.cmake)
 +  file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/libpng-config.cmake" "
 +  include(CMakeFindDependencyMacro)
 +  find_dependency(ZLIB)
-+  include(\"\${CMAKE_CURRENT_LIST_DIR}/lib${PNG_LIB_NAME}.cmake\")
++  include(\"\${CMAKE_CURRENT_LIST_DIR}/libpng${PNGLIB_ABI_VERSION}.cmake\")
 +  ")
-+  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libpng-config.cmake" DESTINATION "${CMAKE_INSTALL_LIBDIR}/libpng")        
++  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libpng-config.cmake" DESTINATION "${CMAKE_INSTALL_LIBDIR}/libpng")
  endif()
  
  # TODO: Create MSVC import lib for MinGW-compiled shared lib.
diff --git a/external_imported/vcpkg/ports/libpng/fix-msa-support-for-mips.patch b/external_imported/vcpkg/ports/libpng/fix-msa-support-for-mips.patch
index fb41e161e..163586a5d 100644
--- a/external_imported/vcpkg/ports/libpng/fix-msa-support-for-mips.patch
+++ b/external_imported/vcpkg/ports/libpng/fix-msa-support-for-mips.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a249d42..1176c60 100644
+index e355e4d..990e32a 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -171,8 +171,8 @@ endif()
+@@ -188,8 +188,8 @@ endif()
  # Set definitions and sources for MIPS.
  if(TARGET_ARCH MATCHES "mipsel*" OR
     TARGET_ARCH MATCHES "mips64el*")
@@ -13,7 +13,7 @@ index a249d42..1176c60 100644
        CACHE STRING "Enable MIPS_MSA optimizations: on|off; on is default")
    set_property(CACHE PNG_MIPS_MSA
                 PROPERTY STRINGS ${PNG_MIPS_MSA_POSSIBLE_VALUES})
-@@ -185,6 +185,8 @@ if(TARGET_ARCH MATCHES "mipsel*" OR
+@@ -202,6 +202,8 @@ if(TARGET_ARCH MATCHES "mipsel*" OR
          mips/filter_msa_intrinsics.c)
      if(${PNG_MIPS_MSA} STREQUAL "on")
        add_definitions(-DPNG_MIPS_MSA_OPT=2)
diff --git a/external_imported/vcpkg/ports/libpng/libm.patch b/external_imported/vcpkg/ports/libpng/libm.patch
new file mode 100644
index 000000000..a60e65cd1
--- /dev/null
+++ b/external_imported/vcpkg/ports/libpng/libm.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 958b1d6..21c8941 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -84,6 +84,12 @@ endif()
+ 
+ if(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU AND NOT EMSCRIPTEN)
+   find_library(M_LIBRARY m)
++  if(NOT M_LIBRARY)
++    find_library(M_LIBRARY m PATHS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES} NO_DEFAULT_PATH)
++    if(M_LIBRARY)
++      set(M_LIBRARY m)
++    endif()
++  endif()
+   if(NOT M_LIBRARY)
+     set(M_LIBRARY "")
+   endif()
diff --git a/external_imported/vcpkg/ports/libpng/pkgconfig.patch b/external_imported/vcpkg/ports/libpng/pkgconfig.patch
index 2a04c192a..ed92a94f1 100644
--- a/external_imported/vcpkg/ports/libpng/pkgconfig.patch
+++ b/external_imported/vcpkg/ports/libpng/pkgconfig.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0ad4ba4..a249d42 100644
+index e355e4d..b5b9172 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -932,12 +932,15 @@ endif()
+@@ -960,12 +960,15 @@ endif()
  # We use the same files like ./configure, so we have to set its vars.
  # Only do this on Windows for Cygwin - the files don't make much sense
  # outside of a UNIX look-alike.
@@ -18,13 +18,13 @@ index 0ad4ba4..a249d42 100644
 +    string(APPEND LIBS "-lm")
 +  endif()
    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng.pc.in
-                  ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc
+                  ${CMAKE_CURRENT_BINARY_DIR}/libpng${PNGLIB_ABI_VERSION}.pc
                   @ONLY)
-@@ -1010,6 +1013,9 @@ if(NOT SKIP_INSTALL_PROGRAMS AND NOT SKIP_INSTALL_ALL)
+@@ -1030,6 +1033,9 @@ if(NOT SKIP_INSTALL_PROGRAMS AND NOT SKIP_INSTALL_ALL)
  endif()
  
  if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL)
-+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc
++    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng${PNGLIB_ABI_VERSION}.pc
 +            DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 +elseif(0)
    # Install the man pages.
diff --git a/external_imported/vcpkg/ports/libpng/portfile.cmake b/external_imported/vcpkg/ports/libpng/portfile.cmake
index d4628ac09..1f0914566 100644
--- a/external_imported/vcpkg/ports/libpng/portfile.cmake
+++ b/external_imported/vcpkg/ports/libpng/portfile.cmake
@@ -13,7 +13,7 @@ if ("apng" IN_LIST FEATURES)
     vcpkg_download_distfile(LIBPNG_APNG_PATCH_ARCHIVE
         URLS "https://downloads.sourceforge.net/project/libpng-apng/libpng16/${VERSION}/${LIBPNG_APNG_PATCH_NAME}.gz"
         FILENAME "${LIBPNG_APNG_PATCH_NAME}.gz"
-        SHA512 97a182da0b3b54aecf735e3655d8e8f1a569ae957b23fc3d7a9c8cc65dcdd26f34f173ce9f60af99b01d5347267b2afefaf787c500ce1005e86bf2810b3d0738
+        SHA512 373cc9f0df15f7c77c0a59ddaac22374cfae37174b63a642e68e3a17a6d0bb1015399d771998c7eb6b356b634f157f0009743f4cc659f3b8e480a9533010ef9c
     )
     set(LIBPNG_APNG_PATCH_PATH "${CURRENT_BUILDTREES_DIR}/src/${LIBPNG_APNG_PATCH_NAME}")
     if (NOT EXISTS "${LIBPNG_APNG_PATCH_PATH}")
@@ -32,12 +32,13 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO glennrp/libpng
     REF v${VERSION}
-    SHA512 d61408cee5850582baa57166547ccab6cc171bc809076e53494ace26157fd7787c3209e3b757fd68c541bfb95afe309745d887fb5cd2005b2024af7355c809a0
+    SHA512 5f36a145c7d41f1c417d5f4e03be0155dae3499d72e67170acaad92c1af418c0bb6bc508e9b4b27ef4206bf0074cbf74978bade3bff28bc291867b8f8c2a38cf
     HEAD_REF master
     PATCHES
         "${LIBPNG_APNG_PATCH_PATH}"
         cmake.patch
         fix-export-targets.patch
+        libm.patch
         pkgconfig.patch
         fix-msa-support-for-mips.patch
 )
@@ -102,4 +103,4 @@ file(INSTALL "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libpng16.pc" DESTINATION "${
 vcpkg_copy_pdbs()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/libpng/vcpkg.json b/external_imported/vcpkg/ports/libpng/vcpkg.json
index a5fb4f90b..7661399e2 100644
--- a/external_imported/vcpkg/ports/libpng/vcpkg.json
+++ b/external_imported/vcpkg/ports/libpng/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "libpng",
-  "version": "1.6.39",
+  "version": "1.6.40",
   "port-version": 1,
   "description": "libpng is a library implementing an interface for reading and writing PNG (Portable Network Graphics) format files",
   "homepage": "https://github.com/glennrp/libpng",
diff --git a/external_imported/vcpkg/ports/libpopt/vcpkg.json b/external_imported/vcpkg/ports/libpopt/vcpkg.json
index 1329ae49a..8eb546202 100644
--- a/external_imported/vcpkg/ports/libpopt/vcpkg.json
+++ b/external_imported/vcpkg/ports/libpopt/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libpopt",
-  "version-string": "1.16",
-  "port-version": 15,
+  "version": "1.16",
+  "port-version": 16,
   "description": "Library for parsing command line parameters",
   "dependencies": [
     {
diff --git a/external_imported/vcpkg/ports/libpq/Makefile b/external_imported/vcpkg/ports/libpq/Makefile
index ee2ffcaf1..67994f4ba 100644
--- a/external_imported/vcpkg/ports/libpq/Makefile
+++ b/external_imported/vcpkg/ports/libpq/Makefile
@@ -2,14 +2,12 @@ subdir = .
 top_builddir = .
 include src/Makefile.global
 
-.NOTPARALLEL:
-
 ifeq ($(LIBPQ_LIBRARY_TYPE), static)
 LIBPQ_INSTALL_LIBS = install-stlib
 endif
 
 ifeq ($(LIBPQ_LIBRARY_TYPE), shared)
-ifeq ($(USING_MINGW), yes)
+ifeq ($(LIBPQ_USING_MINGW), yes)
 # The import library name is the same as the static library name
 EXTRA_TARGET = install-lib-static
 endif
@@ -17,21 +15,40 @@ endif
 
 .PHONY: all
 all:
-	$(MAKE) -C src/include MAKELEVEL=0
-	$(MAKE) -C src/common MAKELEVEL=0
-	$(MAKE) -C src/port MAKELEVEL=0
-	$(MAKE) -C src/interfaces/libpq MAKELEVEL=0 all-$(LIBPQ_LIBRARY_TYPE)-lib
-	$(MAKE) -C src/bin/pg_config MAKELEVEL=0
+	$(MAKE) -C src/include
+	$(MAKE) -C src/common
+	$(MAKE) -C src/port
+	$(MAKE) -C src/interfaces/libpq all-$(LIBPQ_LIBRARY_TYPE)-lib
+	$(MAKE) -C src/interfaces/ecpg/include
+	$(MAKE) -C src/interfaces/ecpg/pgtypeslib
+	$(MAKE) -C src/interfaces/ecpg/ecpglib
+	$(MAKE) -C src/interfaces/ecpg/compatlib
+ifeq ($(LIBPQ_ENABLE_TOOLS), yes)
+	$(MAKE) -C src/interfaces/ecpg/preproc
+	$(MAKE) -C src/fe_utils
+	$(MAKE) -C src/bin
+else
+	$(MAKE) -C src/bin/pg_config
+endif
 
 .PHONY: install-stlib
 install-stlib:
-	$(MAKE) -C src/common MAKELEVEL=0 install -o all
+	$(MAKE) -C src/common install -o all
 	rm -f '$(DESTDIR)$(libdir)/libpgcommon_shlib.a'
-	$(MAKE) -C src/port MAKELEVEL=0 install -o all
+	$(MAKE) -C src/port install -o all
 	rm -f '$(DESTDIR)$(libdir)/libpgport_shlib.a'
 
 .PHONY: install
 install: $(LIBPQ_INSTALL_LIBS)
-	$(MAKE) -C src/include MAKELEVEL=0 install
-	$(MAKE) -C src/interfaces/libpq MAKELEVEL=0 $(EXTRA_TARGET) install-lib-$(LIBPQ_LIBRARY_TYPE) install-lib-pc install -o all -o install-lib
-	$(MAKE) -C src/bin/pg_config MAKELEVEL=0 install
+	$(MAKE) -C src/include install
+	$(MAKE) -C src/interfaces/libpq $(EXTRA_TARGET) install-lib-$(LIBPQ_LIBRARY_TYPE) install-lib-pc install -o all -o install-lib
+	$(MAKE) -C src/interfaces/ecpg/include install
+	$(MAKE) -C src/interfaces/ecpg/pgtypeslib install
+	$(MAKE) -C src/interfaces/ecpg/ecpglib install
+	$(MAKE) -C src/interfaces/ecpg/compatlib install
+ifeq ($(LIBPQ_ENABLE_TOOLS), yes)
+	$(MAKE) -C src/interfaces/ecpg/preproc install
+	$(MAKE) -C src/bin install
+else
+	$(MAKE) -C src/bin/pg_config install
+endif
diff --git a/external_imported/vcpkg/ports/libpq/android/unversioned_so.patch b/external_imported/vcpkg/ports/libpq/android/unversioned_so.patch
new file mode 100644
index 000000000..42096a367
--- /dev/null
+++ b/external_imported/vcpkg/ports/libpq/android/unversioned_so.patch
@@ -0,0 +1,16 @@
+diff --git a/src/Makefile.shlib b/src/Makefile.shlib
+index f94d59d1c597..8ca51ca03f75 100644
+--- a/src/Makefile.shlib
++++ b/src/Makefile.shlib
+@@ -183,6 +183,11 @@ endif
+ ifeq ($(PORTNAME), linux)
+   LINK.shared		= $(COMPILER) -shared
+   ifdef soname
++    ifneq (,$(findstring linux-android,$(host_os)))
++      # Android uses unversioned shared libraries
++      shlib		= $(shlib_bare)
++      soname		= $(shlib_bare)
++    endif
+     LINK.shared		+= -Wl,-soname,$(soname)
+   endif
+   BUILD.exports		= ( echo '{ global:'; $(AWK) '/^[^\#]/ {printf "%s;\n",$$1}' $<; echo ' local: *; };' ) >$@
diff --git a/external_imported/vcpkg/ports/libpq/build-msvc.cmake b/external_imported/vcpkg/ports/libpq/build-msvc.cmake
new file mode 100644
index 000000000..34d969487
--- /dev/null
+++ b/external_imported/vcpkg/ports/libpq/build-msvc.cmake
@@ -0,0 +1,80 @@
+function(build_msvc build_type source_path)
+    if(build_type STREQUAL "DEBUG")
+        set(vcpkg_configuration "Debug")
+        set(label "${TARGET_TRIPLET}-dbg")
+        set(packages_dir "${CURRENT_PACKAGES_DIR}/debug")
+    else()
+        set(vcpkg_configuration "Release")
+        set(label "${TARGET_TRIPLET}-rel")
+        set(packages_dir "${CURRENT_PACKAGES_DIR}")
+    endif()
+
+    set(build_path "${CURRENT_BUILDTREES_DIR}/${label}")
+    file(REMOVE_RECURSE "${build_path}")
+    file(COPY "${source_path}/" DESTINATION "${build_path}")
+
+    if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+        vcpkg_replace_string("${build_path}/src/include/port/win32.h" "__declspec (dllimport)" "")
+    endif()
+    vcpkg_replace_string("${build_path}/src/tools/msvc/MSBuildProject.pm" "perl " "\"${PERL}\" ")
+    configure_file("${CURRENT_PORT_DIR}/libpq.props.in" "${build_path}/libpq.props" @ONLY)
+    configure_file("${CURRENT_PORT_DIR}/vcpkg-libs.props.in" "${build_path}/vcpkg-libs.props" @ONLY)
+    set(config "# Generated by ${CMAKE_CURRENT_LIST_FILE}\n\n")
+    foreach(var IN ITEMS VCPKG_TARGET_ARCHITECTURE VCPKG_LIBRARY_LINKAGE VCPKG_CRT_LINKAGE)
+        string(APPEND config "\$config->{${var}} = \"${${var}}\";\n")
+    endforeach()
+    foreach(option IN ITEMS icu lz4 nls openssl python tcl xml xslt zlib zstd)
+        if(option IN_LIST FEATURES)
+            string(APPEND config "\$config->{${option}} = \"${CURRENT_INSTALLED_DIR}\";\n")
+        endif()
+    endforeach()
+    if("openssl" IN_LIST FEATURES)
+        file(STRINGS "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/openssl.pc" OPENSSL_VERSION REGEX "Version:")
+        string(APPEND config "\$config->{openssl_version} = '${OPENSSL_VERSION}';\n")
+    endif()
+    string(APPEND config "\$config->{python_version} = '3.${PYTHON_VERSION_MINOR}';\n")
+    string(APPEND config "\$config->{tcl_version} = '90';\n")
+    file(WRITE "${build_path}/src/tools/msvc/config.pl" "${config}")
+
+    set(build_in_parallel "-m")
+    set(build_targets libpq libecpg_compat)
+    set(install_target core)
+    if(HAS_TOOLS AND NOT build_type STREQUAL "DEBUG")
+        set(build_in_parallel "") # mitigate winflex races
+        set(build_targets client)
+        set(install_target client)
+    endif()
+
+    string(REPLACE "x86" "Win32" platform "${VCPKG_TARGET_ARCHITECTURE}")
+    vcpkg_get_windows_sdk(VCPKG_TARGET_PLATFORM_VERSION)
+    set(ENV{MSBFLAGS} "\
+        /p:Platform=${platform} \
+        /p:PlatformToolset=${VCPKG_PLATFORM_TOOLSET} \
+        /p:VCPkgLocalAppDataDisabled=true \
+        /p:UseIntelMKL=No \
+        /p:WindowsTargetPlatformVersion=${VCPKG_TARGET_PLATFORM_VERSION} \
+        /p:VcpkgConfiguration=${vcpkg_configuration} \
+        ${build_in_parallel} \
+        /p:ForceImportBeforeCppTargets=\"${SCRIPTS}/buildsystems/msbuild/vcpkg.targets;${build_path}/vcpkg-libs.props\" \
+        /p:VcpkgTriplet=${TARGET_TRIPLET} \
+        /p:VcpkgCurrentInstalledDir=\"${CURRENT_INSTALLED_DIR}\" \
+        /p:ForceImportAfterCppTargets=\"${build_path}/libpq.props\" \
+    ")
+
+    message(STATUS "Building ${label}")
+    foreach(target IN LISTS build_targets)
+        string(REPLACE "client" "" target "${target}")
+        vcpkg_execute_required_process(
+            COMMAND "${PERL}" build.pl ${build_type} ${target}
+            WORKING_DIRECTORY "${build_path}/src/tools/msvc"
+            LOGNAME "build-${target}-${label}"
+        )
+    endforeach()
+
+    message(STATUS "Installing ${label}")
+    vcpkg_execute_required_process(
+        COMMAND "${PERL}" install.pl "${packages_dir}" ${install_target}
+        WORKING_DIRECTORY "${build_path}/src/tools/msvc"
+        LOGNAME "install-${label}"
+    )
+endfunction()
diff --git a/external_imported/vcpkg/ports/libpq/config.pl b/external_imported/vcpkg/ports/libpq/config.pl
deleted file mode 100644
index 412eb09c4..000000000
--- a/external_imported/vcpkg/ports/libpq/config.pl
+++ /dev/null
@@ -1,29 +0,0 @@
-our $config = {
-	asserts => 0,    # --enable-cassert
-	     # float4byval=>1,         # --disable-float4-byval, on by default
-
-	# float8byval=> $platformbits == 64, # --disable-float8-byval,
-	# off by default on 32 bit platforms, on by default on 64 bit platforms
-
-	# blocksize => 8,      # --with-blocksize, 8kB by default
-	# wal_blocksize => 8,  # --with-wal-blocksize, 8kB by default
-	ldap      => 1,        # --with-ldap
-	extraver  => undef,    # --with-extra-version=<string>
-	gss       => undef,    # --with-gssapi=<path>
-	icu       => undef,    # --with-icu=<path>
-	lz4       => undef,    # --with-lz4=<path>
-	zstd      => undef,    # --with-zstd=<path>
-	nls       => undef,    # --enable-nls=<path>
-	tap_tests => undef,    # --enable-tap-tests
-	tcl       => undef,    # --with-tcl=<path>
-	perl      => undef,    # --with-perl=<path>
-	python    => undef,    # --with-python=<path>
-	openssl   => undef,    # --with-ssl=openssl with <path>
-	uuid      => undef,    # --with-uuid=<path>
-	xml       => undef,    # --with-libxml=<path>
-	xslt      => undef,    # --with-libxslt=<path>
-	iconv     => undef,    # (not in configure, path to iconv)
-	zlib      => undef     # --with-zlib=<path>
-};
-
-1;
diff --git a/external_imported/vcpkg/ports/libpq/libpq.props.in b/external_imported/vcpkg/ports/libpq/libpq.props.in
index d172a4af4..223e528fe 100644
--- a/external_imported/vcpkg/ports/libpq/libpq.props.in
+++ b/external_imported/vcpkg/ports/libpq/libpq.props.in
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
-    <CLCompile>
+    <ClCompile>
       <AdditionalOptions>%(AdditionalOptions) @VCPKG_COMBINED_C_FLAGS_DEBUG@</AdditionalOptions>
-    </CLCompile>
+    </ClCompile>
     <Link>
       <AdditionalOptions>%(AdditionalOptions) @VCPKG_COMBINED_SHARED_LINKER_FLAGS_DEBUG@</AdditionalOptions>
     </Link>
@@ -12,9 +12,9 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
-    <CLCompile>
+    <ClCompile>
       <AdditionalOptions>%(AdditionalOptions) @VCPKG_COMBINED_C_FLAGS_RELEASE@</AdditionalOptions>
-    </CLCompile>
+    </ClCompile>
     <Link>
       <AdditionalOptions>%(AdditionalOptions) @VCPKG_COMBINED_SHARED_LINKER_FLAGS_RELEASE@</AdditionalOptions>
     </Link>
diff --git a/external_imported/vcpkg/ports/libpq/patches/windows/MSBuildProject-static-crt.patch b/external_imported/vcpkg/ports/libpq/patches/windows/MSBuildProject-static-crt.patch
deleted file mode 100644
index 03bd832f8..000000000
--- a/external_imported/vcpkg/ports/libpq/patches/windows/MSBuildProject-static-crt.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm
-index 823357c02..faa3e336f 100644
---- a/src/tools/msvc/MSBuildProject.pm
-+++ b/src/tools/msvc/MSBuildProject.pm
-@@ -84,16 +84,16 @@ EOF
- 			defs    => "_DEBUG;DEBUG=1",
- 			opt     => 'Disabled',
- 			strpool => 'false',
--			runtime => 'MultiThreadedDebugDLL'
-+			runtime => 'MultiThreadedDebug'
- 		});
- 	$self->WriteItemDefinitionGroup(
- 		$f,
- 		'Release',
- 		{
- 			defs    => "",
- 			opt     => 'Full',
- 			strpool => 'true',
--			runtime => 'MultiThreadedDLL'
-+			runtime => 'MultiThreaded'
- 		});
- 	return;
- }
diff --git a/external_imported/vcpkg/ports/libpq/patches/windows/MSBuildProject-static-lib.patch b/external_imported/vcpkg/ports/libpq/patches/windows/MSBuildProject-static-lib.patch
deleted file mode 100644
index 70cd22d60..000000000
--- a/external_imported/vcpkg/ports/libpq/patches/windows/MSBuildProject-static-lib.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm
-index 823357c02..e1dc59aa7 100644
---- a/src/tools/msvc/MSBuildProject.pm
-+++ b/src/tools/msvc/MSBuildProject.pm
-@@ -265,7 +265,7 @@ sub WriteConfigurationPropertyGroup
- 	my $cfgtype =
- 	  ($self->{type} eq "exe")
- 	  ? 'Application'
--	  : ($self->{type} eq "dll" ? 'DynamicLibrary' : 'StaticLibrary');
-+	  : ($self->{type} eq "dll" ? 'StaticLibrary' : 'StaticLibrary');
- 
- 	print $f <<EOF;
-   <PropertyGroup Condition="'\$(Configuration)|\$(Platform)'=='$cfgname|$self->{platform}'" Label="Configuration">
diff --git a/external_imported/vcpkg/ports/libpq/patches/windows/MSBuildProject_fix_gendef_perl.patch b/external_imported/vcpkg/ports/libpq/patches/windows/MSBuildProject_fix_gendef_perl.patch
deleted file mode 100644
index 10955c3f9..000000000
--- a/external_imported/vcpkg/ports/libpq/patches/windows/MSBuildProject_fix_gendef_perl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm
-index 823357c02..b93992f22 100644
---- a/src/tools/msvc/MSBuildProject.pm
-+++ b/src/tools/msvc/MSBuildProject.pm
-@@ -384,7 +384,7 @@ EOF
- 		print $f <<EOF;
-     <PreLinkEvent>
-       <Message>Generate DEF file</Message>
--      <Command>perl src\\tools\\msvc\\gendef.pl $cfgname\\$self->{name} $self->{platform}</Command>
-+      <Command>perl "src\\tools\\msvc\\gendef.pl" $cfgname\\$self->{name} $self->{platform}</Command>
-     </PreLinkEvent>
- EOF
- 	}
diff --git a/external_imported/vcpkg/ports/libpq/patches/windows/Mkvcbuild-static-lib.patch b/external_imported/vcpkg/ports/libpq/patches/windows/Mkvcbuild-static-lib.patch
deleted file mode 100644
index 554d8527a..000000000
--- a/external_imported/vcpkg/ports/libpq/patches/windows/Mkvcbuild-static-lib.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
-index 99f39caa5..4f51c12f2 100644
---- a/src/tools/msvc/Mkvcbuild.pm
-+++ b/src/tools/msvc/Mkvcbuild.pm
-@@ -199,7 +199,7 @@ sub mkvcbuild
- 		'syncrep_gram.y');
- 	$postgres->AddFiles('src/backend/utils/adt', 'jsonpath_scan.l',
- 		'jsonpath_gram.y');
--	$postgres->AddDefine('BUILDING_DLL');
-+	# $postgres->AddDefine('BUILDING_DLL');
- 	$postgres->AddLibrary('secur32.lib');
- 	$postgres->AddLibrary('ws2_32.lib');
- 	$postgres->AddLibrary('wldap32.lib') if ($solution->{options}->{ldap});
diff --git a/external_imported/vcpkg/ports/libpq/patches/windows/Solution.patch b/external_imported/vcpkg/ports/libpq/patches/windows/Solution.patch
deleted file mode 100644
index 3387349e0..000000000
--- a/external_imported/vcpkg/ports/libpq/patches/windows/Solution.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
-index 51711c2bf..d33fdc3b0 100644
---- a/src/tools/msvc/Solution.pm	
-+++ b/src/tools/msvc/Solution.pm
-@@ -63,17 +63,21 @@ sub DeterminePlatform
- 	my $self = shift;
- 
- 	if ($^O eq "MSWin32")
- 	{
- 		# Examine CL help output to determine if we are in 32 or 64-bit mode.
- 		my $output = `cl /help 2>&1`;
- 		$? >> 8 == 0 or die "cl command not found";
--		$self->{platform} =
--		  ($output =~ /^\/favor:<.+AMD64/m) ? 'x64' : 'Win32';
-+		if ($output =~ m/x64\s/) { $self->{platform} = 'x64';
-+		} elsif ($output =~ m/x86\s/) { $self->{platform} = 'Win32';
-+		} elsif ($output =~ m/ARM64\s/) { $self->{platform} = 'ARM64';
-+		} elsif ($output =~ m/ARM\s/) { $self->{platform} = 'ARM';
-+		} else { $self->{platform} = 'Unknown'
-+		}
- 	}
- 	else
- 	{
- 		$self->{platform} = 'FAKE';
- 	}
- 	print "Detected hardware platform: $self->{platform}\n";
- 	return;
- }
-@@ -757,14 +757,14 @@ EOF
-                  || confess "Could not open pg_config_paths.h";
-                print $o <<EOF;
- #define PGBINDIR "/bin"
--#define PGSHAREDIR "/share"
-+#define PGSHAREDIR "/share/libpq"
- #define SYSCONFDIR "/etc"
- #define INCLUDEDIR "/include"
- #define PKGINCLUDEDIR "/include"
- #define INCLUDEDIRSERVER "/include/server"
- #define LIBDIR "/lib"
- #define PKGLIBDIR "/lib"
--#define LOCALEDIR "/share/locale"
-+#define LOCALEDIR "/share/libpq/locale"
- #define DOCDIR "/doc"
- #define HTMLDIR "/doc"
- #define MANDIR "/man"
diff --git a/external_imported/vcpkg/ports/libpq/patches/windows/Solution_DEBUG.patch b/external_imported/vcpkg/ports/libpq/patches/windows/Solution_DEBUG.patch
deleted file mode 100644
index 67c00e7a6..000000000
--- a/external_imported/vcpkg/ports/libpq/patches/windows/Solution_DEBUG.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
-index 2820ace22..7fddbf0fb 100644
---- a/src/tools/msvc/Solution.pm
-+++ b/src/tools/msvc/Solution.pm
-@@ -948,7 +948,7 @@ sub AddProject
- 	if ($self->{options}->{zlib})
- 	{
- 		$proj->AddIncludeDir($self->{options}->{zlib} . '\include');
--		$proj->AddLibrary($self->{options}->{zlib} . '\lib\zdll.lib');
-+		$proj->AddLibrary($self->{options}->{zlib} . '\debug\lib\zlibd.lib');
- 	}
- 	if ($self->{options}->{openssl})
- 	{
-@@ -989,8 +989,11 @@ sub AddProject
- 				# On both Win32 and Win64 the same library
- 				# names are used without a debugging context.
- 				$dbgsuffix     = 0;
--				$libsslpath    = '\lib\libssl.lib';
--				$libcryptopath = '\lib\libcrypto.lib';
-+				$libsslpath    = '\debug\lib\libssl.lib'; #
-+				$libcryptopath = '\debug\lib\libcrypto.lib'; #
-+				$proj->AddLibrary('crypt32.lib');
-+				$proj->AddLibrary('ws2_32.lib');
-+				$proj->AddLibrary('secur32.lib');
- 			}
- 
- 			$proj->AddLibrary($self->{options}->{openssl} . $libsslpath,
-@@ -1024,7 +1024,7 @@ sub AddProject
- 	if ($self->{options}->{nls})
- 	{
- 		$proj->AddIncludeDir($self->{options}->{nls} . '\include');
--		$proj->AddLibrary($self->{options}->{nls} . '\lib\libintl.lib');
-+		$proj->AddLibrary($self->{options}->{nls} . '\debug\lib\intl.lib'); #
- 	}
- 	if ($self->{options}->{gss})
- 	{
-@@ -1051,21 +1051,21 @@ sub AddProject
- 	}
- 	if ($self->{options}->{iconv})
- 	{
- 		$proj->AddIncludeDir($self->{options}->{iconv} . '\include');
--		$proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib');
-+		$proj->AddLibrary($self->{options}->{iconv} . '\debug\lib\iconv.lib'); #
- 	}
- 	if ($self->{options}->{icu})
- 	{
- 		$proj->AddIncludeDir($self->{options}->{icu} . '\include');
- 		if ($self->{platform} eq 'Win32')
- 		{
--			$proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib');
--			$proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib');
--			$proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib');
-+			$proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuind.lib'); #
-+			$proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuucd.lib'); #
-+			$proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icudtd.lib'); # 
- 		}
- 		else
- 		{
--			$proj->AddLibrary($self->{options}->{icu} . '\lib64\icuin.lib');
--			$proj->AddLibrary($self->{options}->{icu} . '\lib64\icuuc.lib');
--			$proj->AddLibrary($self->{options}->{icu} . '\lib64\icudt.lib');
-+			$proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuind.lib'); #
-+			$proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuucd.lib'); #
-+			$proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icudtd.lib'); #
- 		}
-@@ -1074,27 +1074,27 @@ sub AddProject
- 	{
- 		$proj->AddIncludeDir($self->{options}->{xml} . '\include');
- 		$proj->AddIncludeDir($self->{options}->{xml} . '\include\libxml2');
--		$proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib');
-+		$proj->AddLibrary($self->{options}->{xml} . '\debug\lib\libxml2.lib'); #
- 	}
- 	if ($self->{options}->{xslt})
- 	{
- 		$proj->AddIncludeDir($self->{options}->{xslt} . '\include');
--		$proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib');
-+		$proj->AddLibrary($self->{options}->{xslt} . '\debug\lib\libxslt.lib'); #
- 	}
- 	if ($self->{options}->{lz4})
- 	{
- 		$proj->AddIncludeDir($self->{options}->{lz4} . '\include');
--		$proj->AddLibrary($self->{options}->{lz4} . '\lib\liblz4.lib');
-+		$proj->AddLibrary($self->{options}->{lz4} . '\debug\lib\lz4d.lib'); #
- 	}
- 	if ($self->{options}->{zstd})
- 	{
- 		$proj->AddIncludeDir($self->{options}->{zstd} . '\include');
--		$proj->AddLibrary($self->{options}->{zstd} . '\lib\libzstd.lib');
-+		$proj->AddLibrary($self->{options}->{zstd} . '\debug\lib\zstd.lib');
- 	}
- 	if ($self->{options}->{uuid})
- 	{
- 		$proj->AddIncludeDir($self->{options}->{uuid} . '\include');
--		$proj->AddLibrary($self->{options}->{uuid} . '\lib\uuid.lib');
-+		$proj->AddLibrary($self->{options}->{uuid} . '\debug\lib\uuid.lib'); #
- 	}
- 	return $proj;
- }
diff --git a/external_imported/vcpkg/ports/libpq/patches/windows/Solution_RELEASE.patch b/external_imported/vcpkg/ports/libpq/patches/windows/Solution_RELEASE.patch
deleted file mode 100644
index d0bb48041..000000000
--- a/external_imported/vcpkg/ports/libpq/patches/windows/Solution_RELEASE.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
-index 2820ace22..7fddbf0fb 100644
---- a/src/tools/msvc/Solution.pm
-+++ b/src/tools/msvc/Solution.pm
-@@ -948,7 +948,7 @@ sub AddProject
- 	if ($self->{options}->{zlib})
- 	{
- 		$proj->AddIncludeDir($self->{options}->{zlib} . '\include');
--		$proj->AddLibrary($self->{options}->{zlib} . '\lib\zdll.lib');
-+		$proj->AddLibrary($self->{options}->{zlib} . '\lib\zlib.lib');
- 	}
- 	if ($self->{options}->{openssl})
- 	{
-@@ -989,8 +989,11 @@ sub AddProject
- 				# On both Win32 and Win64 the same library
- 				# names are used without a debugging context.
- 				$dbgsuffix     = 0;
--				$libsslpath    = '\lib\libssl.lib';
--				$libcryptopath = '\lib\libcrypto.lib';
-+				$libsslpath    = '\lib\libssl.lib'; #
-+				$libcryptopath = '\lib\libcrypto.lib'; #
-+				$proj->AddLibrary('crypt32.lib');
-+				$proj->AddLibrary('ws2_32.lib');
-+				$proj->AddLibrary('secur32.lib');
- 			}
- 
- 			$proj->AddLibrary($self->{options}->{openssl} . $libsslpath,
-@@ -1024,7 +1024,7 @@ sub AddProject
- 	if ($self->{options}->{nls})
- 	{
- 		$proj->AddIncludeDir($self->{options}->{nls} . '\include');
--		$proj->AddLibrary($self->{options}->{nls} . '\lib\libintl.lib');
-+		$proj->AddLibrary($self->{options}->{nls} . '\lib\intl.lib'); #
- 	}
- 	if ($self->{options}->{gss})
- 	{
-@@ -1051,21 +1051,21 @@ sub AddProject
- 	}
- 	if ($self->{options}->{iconv})
- 	{
- 		$proj->AddIncludeDir($self->{options}->{iconv} . '\include');
--		$proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib');
-+		$proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib'); #
- 	}
- 	if ($self->{options}->{icu})
- 	{
- 		$proj->AddIncludeDir($self->{options}->{icu} . '\include');
- 		if ($self->{platform} eq 'Win32')
- 		{
--			$proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib');
--			$proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib');
--			$proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib');
-+			$proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); #
-+			$proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib'); #
-+			$proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib'); # 
- 		}
- 		else
- 		{
--			$proj->AddLibrary($self->{options}->{icu} . '\lib64\icuin.lib');
--			$proj->AddLibrary($self->{options}->{icu} . '\lib64\icuuc.lib');
--			$proj->AddLibrary($self->{options}->{icu} . '\lib64\icudt.lib');
-+			$proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); #
-+			$proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib'); #
-+			$proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib'); #
- 		}
-@@ -1074,27 +1074,27 @@ sub AddProject
- 	{
- 		$proj->AddIncludeDir($self->{options}->{xml} . '\include');
- 		$proj->AddIncludeDir($self->{options}->{xml} . '\include\libxml2');
--		$proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib');
-+		$proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib'); #
- 	}
- 	if ($self->{options}->{xslt})
- 	{
- 		$proj->AddIncludeDir($self->{options}->{xslt} . '\include');
--		$proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib');
-+		$proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib'); #
- 	}
- 	if ($self->{options}->{lz4})
- 	{
- 		$proj->AddIncludeDir($self->{options}->{lz4} . '\include');
--		$proj->AddLibrary($self->{options}->{lz4} . '\lib\liblz4.lib');
-+		$proj->AddLibrary($self->{options}->{lz4} . '\lib\lz4.lib'); #
- 	}
- 	if ($self->{options}->{zstd})
- 	{
- 		$proj->AddIncludeDir($self->{options}->{zstd} . '\include');
--		$proj->AddLibrary($self->{options}->{zstd} . '\lib\libzstd.lib');
-+		$proj->AddLibrary($self->{options}->{zstd} . '\lib\zstd.lib');
- 	}
- 	if ($self->{options}->{uuid})
- 	{
- 		$proj->AddIncludeDir($self->{options}->{uuid} . '\include');
--		$proj->AddLibrary($self->{options}->{uuid} . '\lib\uuid.lib');
-+		$proj->AddLibrary($self->{options}->{uuid} . '\lib\uuid.lib'); #
- 	}
- 	return $proj;
- }
diff --git a/external_imported/vcpkg/ports/libpq/patches/windows/arm.patch b/external_imported/vcpkg/ports/libpq/patches/windows/arm.patch
deleted file mode 100644
index c6329b14e..000000000
--- a/external_imported/vcpkg/ports/libpq/patches/windows/arm.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
-index 99f39caa5..4f51c12f2 100644
---- a/src/tools/msvc/Mkvcbuild.pm
-+++ b/src/tools/msvc/Mkvcbuild.pm
-@@ -110,8 +110,8 @@ sub mkvcbuild
- 
- 	if ($vsVersion >= '9.00')
- 	{
--		push(@pgportfiles, 'pg_crc32c_sse42_choose.c');
--		push(@pgportfiles, 'pg_crc32c_sse42.c');
-+		#push(@pgportfiles, 'pg_crc32c_sse42_choose.c');
-+		#push(@pgportfiles, 'pg_crc32c_sse42.c');
- 		push(@pgportfiles, 'pg_crc32c_sb8.c');
- 	}
- 	else
-diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm
-index 823357c02..625f32bf8 100644
---- a/src/tools/msvc/MSBuildProject.pm	
-+++ b/src/tools/msvc/MSBuildProject.pm
-@@ -307,7 +307,6 @@ sub WriteItemDefinitionGroup
- 	  : ($self->{type} eq "dll" ? 'DynamicLibrary' : 'StaticLibrary');
- 	my $libs = $self->GetAdditionalLinkerDependencies($cfgname, ';');
- 
--	my $targetmachine =
--	  $self->{platform} eq 'Win32' ? 'MachineX86' : 'MachineX64';
--
-+	my $targetmachine = $self->{platform} eq 'ARM64' ? 'MachineARM64' : 'MachineARM';
-+    
- 	my $includes = join ';', @{ $self->{includes} }, "";
-@@ -347,7 +349,6 @@ sub WriteItemDefinitionGroup
-       <ProgramDatabaseFile>.\\$cfgname\\$self->{name}\\$self->{name}.pdb</ProgramDatabaseFile>
-       <GenerateMapFile>false</GenerateMapFile>
-       <MapFileName>.\\$cfgname\\$self->{name}\\$self->{name}.map</MapFileName>
--      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-       <!-- Permit links to MinGW-built, 32-bit DLLs (default before VS2012). -->
-       <ImageHasSafeExceptionHandlers/>
-       <SubSystem>Console</SubSystem>
diff --git a/external_imported/vcpkg/ports/libpq/patches/windows/fix-compile-flag-Zi.patch b/external_imported/vcpkg/ports/libpq/patches/windows/fix-compile-flag-Zi.patch
deleted file mode 100644
index b5e3b6cdb..000000000
--- a/external_imported/vcpkg/ports/libpq/patches/windows/fix-compile-flag-Zi.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm
-index b93992f..2397511 100644
---- a/src/tools/msvc/MSBuildProject.pm
-+++ b/src/tools/msvc/MSBuildProject.pm
-@@ -336,7 +336,7 @@ sub WriteItemDefinitionGroup
-       <BrowseInformation>false</BrowseInformation>
-       <WarningLevel>Level3</WarningLevel>
-       <SuppressStartupBanner>true</SuppressStartupBanner>
--      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-+      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-       <CompileAs>Default</CompileAs>
-     </ClCompile>
-     <Link>
-diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm
-index e0c9a88..98f9e67 100644
---- a/src/tools/msvc/Install.pm
-+++ b/src/tools/msvc/Install.pm
-@@ -352,9 +352,12 @@ sub CopySolutionOutput
- 				  || croak "Could not copy $pf.$ext\n";
- 			}
- 		}
--		lcopy("$conf\\$pf\\$pf.pdb", "$target\\bin\\$pf.pdb")
--		  || croak "Could not copy $pf.pdb\n";
--		print ".";
-+        if ($1 eq 'DynamicLibrary')
-+        {
-+            lcopy("$conf\\$pf\\$pf.pdb", "$target\\bin\\$pf.pdb")
-+            || croak "Could not copy $pf.pdb\n";
-+            print ".";
-+        }
- 	}
- 	print "\n";
- 	return;
diff --git a/external_imported/vcpkg/ports/libpq/patches/windows/install.patch b/external_imported/vcpkg/ports/libpq/patches/windows/install.patch
deleted file mode 100644
index 0d7a6d69a..000000000
--- a/external_imported/vcpkg/ports/libpq/patches/windows/install.patch
+++ /dev/null
@@ -1,223 +0,0 @@
-diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm
-index d109b2c90..75c7446e6 100644
---- a/src/tools/msvc/Install.pm
-+++ b/src/tools/msvc/Install.pm
-@@ -89,10 +89,10 @@ sub Install
- 	my $majorver = DetermineMajorVersion();
- 	print "Installing version $majorver for $conf in $target\n";
- 
--	my @client_dirs = ('bin', 'lib', 'share', 'symbols');
-+	my @client_dirs = ('bin', 'lib', 'share', 'tools', 'share/libpq', 'tools/libpq');
- 	my @all_dirs = (
--		@client_dirs, 'doc', 'doc/contrib', 'doc/extension', 'share/contrib',
--		'share/extension', 'share/timezonesets', 'share/tsearch_data');
-+		@client_dirs, 'doc', 'doc/libpq', 'doc/libpq/contrib', 'doc/libpq/extension', 'share/libpq/contrib',
-+		'share/libpq/extension', 'share/libpq/timezonesets', 'share/libpq/tsearch_data');
- 	if ($insttype eq "client")
- 	{
- 		EnsureDirectories($target, @client_dirs);
-@@ -117,7 +117,7 @@ sub Install
- 			}
- 		},
- 		@top_dir);
--	CopySetOfFiles('config files', $sample_files, $target . '/share/');
-+	CopySetOfFiles('config files', $sample_files, $target . '/share/libpq/');
- 	CopyFiles(
- 		'Import libraries',
- 		$target . '/lib/',
-@@ -131,35 +131,35 @@ sub Install
- 		CopySetOfFiles(
- 			'timezone names',
- 			[ glob('src\timezone\tznames\*.txt') ],
--			$target . '/share/timezonesets/');
-+			$target . '/share/libpq/timezonesets/');
- 		CopyFiles(
- 			'timezone sets',
--			$target . '/share/timezonesets/',
-+			$target . '/share/libpq/timezonesets/',
- 			'src/timezone/tznames/', 'Default', 'Australia', 'India');
- 		CopySetOfFiles(
- 			'BKI files',
- 			[ glob("src\\backend\\catalog\\postgres.*") ],
--			$target . '/share/');
-+			$target . '/share/libpq/');
- 		CopySetOfFiles(
- 			'SQL files',
- 			[ glob("src\\backend\\catalog\\*.sql") ],
--			$target . '/share/');
-+			$target . '/share/libpq/');
- 		CopyFiles(
--			'Information schema data', $target . '/share/',
-+			'Information schema data', $target . '/share/libpq/',
- 			'src/backend/catalog/',    'sql_features.txt');
- 		CopyFiles(
--			'Error code data',    $target . '/share/',
-+			'Error code data',    $target . '/share/libpq/',
- 			'src/backend/utils/', 'errcodes.txt');
- 		GenerateTimezoneFiles($target, $conf);
- 		GenerateTsearchFiles($target);
- 		CopySetOfFiles(
- 			'Stopword files',
- 			[ glob("src\\backend\\snowball\\stopwords\\*.stop") ],
--			$target . '/share/tsearch_data/');
-+			$target . '/share/libpq/tsearch_data/');
- 		CopySetOfFiles(
- 			'Dictionaries sample files',
- 			[ glob("src\\backend\\tsearch\\dicts\\*_sample*") ],
--			$target . '/share/tsearch_data/');
-+			$target . '/share/libpq/tsearch_data/');
- 
- 		my $pl_extension_files = [];
- 		my @pldirs             = ('src/pl/plpgsql/src');
-@@ -178,7 +178,7 @@ sub Install
- 			},
- 			@pldirs);
- 		CopySetOfFiles('PL Extension files',
--			$pl_extension_files, $target . '/share/extension/');
-+			$pl_extension_files, $target . '/share/libpq/extension/');
- 	}
- 
- 	GenerateNLSFiles($target, $config->{nls}, $majorver) if ($config->{nls});
-@@ -293,23 +293,26 @@ sub CopySolutionOutput
- 		{
- 			if ($1 == 1)
- 			{
--				push(@{ $install_list{'bin'} }, "exe");
-+				push(@{ $install_list{'tools\\libpq'} }, "exe");
- 			}
- 			elsif ($1 == 2)
- 			{
--				push(@{ $install_list{'lib'} }, "dll");
-+				push(@{ $install_list{'bin'} }, "dll");
- 				if ($is_sharedlib)
- 				{
- 					push(@{ $install_list{'bin'} }, "dll");
- 					push(@{ $install_list{'lib'} }, "lib");
- 				}
-+				else
-+				{
-+					push(@{ $install_list{'lib'} }, "lib");
-+				}
- 			}
- 			else
- 			{
--
-+				push(@{ $install_list{'lib'} }, "lib");
- 				# Static libraries, such as libpgport, only used internally
- 				# during build, don't install.
--				next;
- 			}
- 		}
- 		elsif ($vcproj eq 'vcxproj'
-@@ -320,11 +320,11 @@ sub CopySolutionOutput
- 		{
- 			if ($1 eq 'Application')
- 			{
--				push(@{ $install_list{'bin'} }, "exe");
-+				push(@{ $install_list{'tools\\libpq'} }, "exe");
- 			}
- 			elsif ($1 eq 'DynamicLibrary')
- 			{
--				push(@{ $install_list{'lib'} }, "dll");
-+				push(@{ $install_list{'bin'} }, "dll");
- 				if ($is_sharedlib)
- 				{
- 					push(@{ $install_list{'bin'} }, "dll");
-@@ -333,10 +333,9 @@ sub CopySolutionOutput
- 			}
- 			else    # 'StaticLibrary'
- 			{
--
-+				push(@{ $install_list{'lib'} }, "lib");
- 				# Static lib, such as libpgport, only used internally
- 				# during build, don't install.
--				next;
- 			}
- 		}
- 		else
-@@ -352,7 +352,7 @@ sub CopySolutionOutput
- 				  || croak "Could not copy $pf.$ext\n";
- 			}
- 		}
--		lcopy("$conf\\$pf\\$pf.pdb", "$target\\symbols\\$pf.pdb")
-+		lcopy("$conf\\$pf\\$pf.pdb", "$target\\bin\\$pf.pdb")
- 		  || croak "Could not copy $pf.pdb\n";
- 		print ".";
- 	}
-@@ -374,5 +374,5 @@ sub GenerateTimezoneFiles
- 	print "Generating timezone files...";
- 
--	my @args = ("$conf/zic/zic", '-d', "$target/share/timezone");
-+	my @args = ("$conf/zic/zic", '-d', "$target/share/libpq/timezone");
- 	foreach (@tzfiles)
- 	{
-@@ -398,7 +398,7 @@ sub GenerateTsearchFiles
- 	$mf =~ /^LANGUAGES\s*=\s*(.*)$/m
- 	  || die "Could not find LANGUAGES line in snowball Makefile\n";
- 	my @pieces = split /\s+/, $1;
--	open($F, '>', "$target/share/snowball_create.sql")
-+	open($F, '>', "$target/share/libpq/snowball_create.sql")
- 	  || die "Could not write snowball_create.sql";
- 	print $F read_file('src/backend/snowball/snowball_func.sql.in');
- 
-@@ -483,7 +483,7 @@ sub CopySubdirFiles
- 		foreach my $f (split /\s+/, $flist)
- 		{
- 			lcopy("$subdir/$module/$f.control",
--				"$target/share/extension/$f.control")
-+				"$target/share/libpq/extension/$f.control")
- 			  || croak("Could not copy file $f.control in contrib $module");
- 			print '.';
- 		}
-@@ -501,7 +501,7 @@ sub CopySubdirFiles
- 		foreach my $f (split /\s+/, $flist)
- 		{
- 			lcopy("$subdir/$module/$f",
--				"$target/share/$moduledir/" . basename($f))
-+				"$target/share/libpq/$moduledir/" . basename($f))
- 			  || croak("Could not copy file $f in contrib $module");
- 			print '.';
- 		}
-@@ -516,7 +516,7 @@ sub CopySubdirFiles
- 		foreach my $f (split /\s+/, $flist)
- 		{
- 			lcopy("$subdir/$module/$f",
--				"$target/share/tsearch_data/" . basename($f))
-+				"$target/share/libpq/tsearch_data/" . basename($f))
- 			  || croak("Could not copy file $f in $subdir $module");
- 			print '.';
- 		}
-@@ -579,7 +579,7 @@ sub CopySubdirFiles
- 		  if ($module eq 'spi');
- 		foreach my $f (split /\s+/, $flist)
- 		{
--			lcopy("$subdir/$module/$f", "$target/doc/$moduledir/$f")
-+			lcopy("$subdir/$module/$f", "$target/doc/libpq/$moduledir/$f")
- 			  || croak("Could not copy file $f in contrib $module");
- 			print '.';
- 		}
-@@ -708,7 +708,7 @@ sub GenerateNLSFiles
- 	my $majorver = shift;
- 
- 	print "Installing NLS files...";
--	EnsureDirectories($target, "share/locale");
-+	EnsureDirectories($target, "share/libpq/locale");
- 	my @flist;
- 	File::Find::find(
- 		{
-@@ -730,12 +730,12 @@ sub GenerateNLSFiles
- 			next unless /([^\/]+)\.po/;
- 			$lang = $1;
- 
--			EnsureDirectories($target, "share/locale/$lang",
--				"share/locale/$lang/LC_MESSAGES");
-+			EnsureDirectories($target, "share/libpq/locale/$lang",
-+				"share/libpq/locale/$lang/LC_MESSAGES");
- 			my @args = (
- 				"$nlspath\\bin\\msgfmt",
- 				'-o',
--				"$target\\share\\locale\\$lang\\LC_MESSAGES\\$prgm-$majorver.mo",
-+				"$target\\share\\libpq\\locale\\$lang\\LC_MESSAGES\\$prgm-$majorver.mo",
- 				$_);
- 			system(@args) && croak("Could not run msgfmt on $dir\\$_");
- 			print ".";
diff --git a/external_imported/vcpkg/ports/libpq/patches/windows/minimize_install.patch b/external_imported/vcpkg/ports/libpq/patches/windows/minimize_install.patch
deleted file mode 100644
index 1a57c275f..000000000
--- a/external_imported/vcpkg/ports/libpq/patches/windows/minimize_install.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm
-index d109b2c90..75c7446e6 100644
---- a/src/tools/msvc/Install.pm
-+++ b/src/tools/msvc/Install.pm
-@@ -22,13 +22,13 @@ our (@ISA, @EXPORT_OK);
- 
- my $insttype;
- my @client_contribs = ('oid2name', 'pgbench', 'vacuumlo');
--my @client_program_files = (
--	'clusterdb',     'createdb',       'createuser', 'dropdb',
--	'dropuser',      'ecpg',           'libecpg',    'libecpg_compat',
--	'libpgtypes',    'libpq',          'pg_amcheck', 'pg_basebackup',
--	'pg_config',     'pg_dump',        'pg_dumpall', 'pg_isready',
--	'pg_receivewal', 'pg_recvlogical', 'pg_restore', 'psql',
--	'reindexdb',     'vacuumdb',       @client_contribs);
-+my @client_program_files = ( 'libecpg','libecpg_compat', 'libpgtypes', 'libpq' );
-+	#'clusterdb',     'createdb',       'createuser', 'dropdb',
-+	#'dropuser',      'ecpg',           'libecpg',    'libecpg_compat',
-+	#'libpgtypes',    'libpq',          'pg_amcheck', 'pg_basebackup',
-+	#'pg_config',     'pg_dump',        'pg_dumpall', 'pg_isready',
-+	#'pg_receivewal', 'pg_recvlogical', 'pg_restore', 'psql',
-+	#'reindexdb',     'vacuumdb',       @client_contribs);
- 
- sub lcopy
- {
-@@ -121,7 +121,7 @@ sub Install
- 	CopyFiles(
- 		'Import libraries',
- 		$target . '/lib/',
--		"$conf\\", "postgres\\postgres.lib", "libpgcommon\\libpgcommon.lib",
-+		"$conf\\", "libpgcommon\\libpgcommon.lib",
- 		"libpgport\\libpgport.lib");
- 	CopyContribFiles($config, $target);
- 	CopyIncludeFiles($target);
-
diff --git a/external_imported/vcpkg/ports/libpq/patches/windows/msgfmt.patch b/external_imported/vcpkg/ports/libpq/patches/windows/msgfmt.patch
deleted file mode 100644
index 98be285bc..000000000
--- a/external_imported/vcpkg/ports/libpq/patches/windows/msgfmt.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm
-index 66c0c3483..2154c6cf6 100644
---- a/src/tools/msvc/Install.pm	
-+++ b/src/tools/msvc/Install.pm
-@@ -733,7 +733,7 @@ sub GenerateNLSFiles
- 			EnsureDirectories($target, "share/libpq/locale/$lang",
- 				"share/libpq/locale/$lang/LC_MESSAGES");
- 			my @args = (
--				"$nlspath\\bin\\msgfmt",
-+				"msgfmt.exe",
- 				'-o',
- 				"$target\\share\\libpq\\locale\\$lang\\LC_MESSAGES\\$prgm-$majorver.mo",
- 				$_);
diff --git a/external_imported/vcpkg/ports/libpq/patches/windows/openssl-version.patch b/external_imported/vcpkg/ports/libpq/patches/windows/openssl-version.patch
deleted file mode 100644
index 77f464041..000000000
--- a/external_imported/vcpkg/ports/libpq/patches/windows/openssl-version.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
-index 72c5b98..0d153c0 100644
---- a/src/tools/msvc/Solution.pm
-+++ b/src/tools/msvc/Solution.pm
-@@ -128,6 +128,9 @@ sub copyFile
- sub GetOpenSSLVersion
- {
- 	my $self = shift;
-+	if (($ENV{'VCPKG_OPENSSL_VERSION'} // '') =~ /(\d+)\.(\d+)\.(\d+)/m) {
-+		return ($1, $2, $3);
-+	}
- 
- 	# Attempt to get OpenSSL version and location.  This assumes that
- 	# openssl.exe is in the specified directory.
diff --git a/external_imported/vcpkg/ports/libpq/patches/windows/python3_build_DEBUG.patch b/external_imported/vcpkg/ports/libpq/patches/windows/python3_build_DEBUG.patch
deleted file mode 100644
index 532a066f9..000000000
--- a/external_imported/vcpkg/ports/libpq/patches/windows/python3_build_DEBUG.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
-index 99f39caa5..21b5559d6 100644
---- a/src/tools/msvc/Mkvcbuild.pm	
-+++ b/src/tools/msvc/Mkvcbuild.pm
-@@ -494,14 +494,15 @@ sub mkvcbuild
- 
- 		# Attempt to get python version and location.
- 		# Assume python.exe in specified dir.
--		my $pythonprog = "import sys;print(sys.prefix);"
--		  . "print(str(sys.version_info[0])+str(sys.version_info[1]))";
--		my $prefixcmd =
--		  qq("$solution->{options}->{python}\\python" -c "$pythonprog");
--		my $pyout = `$prefixcmd`;
--		die "Could not query for python version!\n" if $?;
--		my ($pyprefix, $pyver) = split(/\r?\n/, $pyout);
--
-+		#my $pythonprog = "import sys;print(sys.prefix);"
-+		#  . "print(str(sys.version_info[0])+str(sys.version_info[1]))";
-+		#my $prefixcmd =
-+		#  qq("$solution->{options}->{python}\\python" -c "$pythonprog");
-+		#my $pyout = `$prefixcmd`;
-+		#die "Could not query for python version!\n" if $?;
-+		#my ($pyprefix, $pyver) = split(/\r?\n/, $pyout);
-+		my $pyprefix = $solution->{options}->{python};
-+		my $pyver = 310;
- 		# Sometimes (always?) if python is not present, the execution
- 		# appears to work, but gives no data...
- 		die "Failed to query python for version information\n"
-@@ -510,11 +511,12 @@ sub mkvcbuild
- 		die
- 		  "Python version $pyver is too old (version 3 or later is required)"
- 		  if int($pymajorver) < 3;
- 
- 		my $plpython = $solution->AddProject('plpython' . $pymajorver,
- 			'dll', 'PLs', 'src/pl/plpython');
--		$plpython->AddIncludeDir($pyprefix . '/include');
--		$plpython->AddLibrary($pyprefix . "/Libs/python$pyver.lib");
-+		$plpython->AddIncludeDir($pyprefix . '/include/python3.10');
-+		$plpython->AddDefine('_DEBUG'); # required for python autolink linking correctly!
-+		$plpython->AddLibrary($pyprefix . "/debug/lib/python$pyver" . "_d.lib");
- 		$plpython->AddReference($postgres);
- 
- 		# Add transform modules dependent on plpython
- 
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/libpq/patches/windows/python3_build_RELEASE.patch b/external_imported/vcpkg/ports/libpq/patches/windows/python3_build_RELEASE.patch
deleted file mode 100644
index 5a1137894..000000000
--- a/external_imported/vcpkg/ports/libpq/patches/windows/python3_build_RELEASE.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
-index 99f39caa5..21b5559d6 100644
---- a/src/tools/msvc/Mkvcbuild.pm	
-+++ b/src/tools/msvc/Mkvcbuild.pm
-@@ -494,14 +494,15 @@ sub mkvcbuild
- 
- 		# Attempt to get python version and location.
- 		# Assume python.exe in specified dir.
--		my $pythonprog = "import sys;print(sys.prefix);"
--		  . "print(str(sys.version_info[0])+str(sys.version_info[1]))";
--		my $prefixcmd =
--		  qq("$solution->{options}->{python}\\python" -c "$pythonprog");
--		my $pyout = `$prefixcmd`;
--		die "Could not query for python version!\n" if $?;
--		my ($pyprefix, $pyver) = split(/\r?\n/, $pyout);
--
-+		#my $pythonprog = "import sys;print(sys.prefix);"
-+		#  . "print(str(sys.version_info[0])+str(sys.version_info[1]))";
-+		#my $prefixcmd =
-+		#  qq("$solution->{options}->{python}\\python" -c "$pythonprog");
-+		#my $pyout = `$prefixcmd`;
-+		#die "Could not query for python version!\n" if $?;
-+		#my ($pyprefix, $pyver) = split(/\r?\n/, $pyout);
-+		my $pyprefix = $solution->{options}->{python};
-+		my $pyver = 310;
- 		# Sometimes (always?) if python is not present, the execution
- 		# appears to work, but gives no data...
- 		die "Failed to query python for version information\n"
-@@ -510,11 +511,11 @@ sub mkvcbuild
- 		die
- 		  "Python version $pyver is too old (version 3 or later is required)"
- 		  if int($pymajorver) < 3;
- 
- 		my $plpython = $solution->AddProject('plpython' . $pymajorver,
- 			'dll', 'PLs', 'src/pl/plpython');
--		$plpython->AddIncludeDir($pyprefix . '/include');
--		$plpython->AddLibrary($pyprefix . "/Libs/python$pyver.lib");
-+		$plpython->AddIncludeDir($pyprefix . '/include/python3.10');
-+		$plpython->AddLibrary($pyprefix . "/lib/python$pyver.lib");
- 		$plpython->AddReference($postgres);
- 
- 		# Add transform modules dependent on plpython
diff --git a/external_imported/vcpkg/ports/libpq/patches/windows/tcl_version.patch b/external_imported/vcpkg/ports/libpq/patches/windows/tcl_version.patch
deleted file mode 100644
index 5518949a3..000000000
--- a/external_imported/vcpkg/ports/libpq/patches/windows/tcl_version.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
-index e2fbe95..8c4f279 100644
---- a/src/tools/msvc/Mkvcbuild.pm
-+++ b/src/tools/msvc/Mkvcbuild.pm
-@@ -226,7 +226,7 @@ sub mkvcbuild
- 		$pltcl->AddIncludeDir($solution->{options}->{tcl} . '/include');
- 		$pltcl->AddReference($postgres);
- 
--		for my $tclver (qw(86t 86 85 84))
-+		for my $tclver (qw(90 90g 90s 90sg))
- 		{
- 			my $tcllib = $solution->{options}->{tcl} . "/lib/tcl$tclver.lib";
- 			if (-e $tcllib)
diff --git a/external_imported/vcpkg/ports/libpq/portfile.cmake b/external_imported/vcpkg/ports/libpq/portfile.cmake
index dbff64f8b..59517d15e 100644
--- a/external_imported/vcpkg/ports/libpq/portfile.cmake
+++ b/external_imported/vcpkg/ports/libpq/portfile.cmake
@@ -1,363 +1,161 @@
-set(PORT_VERSION ${VERSION})
-# NOTE: the python patches must be regenerated on version update
-
-## Download and extract sources
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://ftp.postgresql.org/pub/source/v${PORT_VERSION}/postgresql-${PORT_VERSION}.tar.bz2"
-    FILENAME "postgresql-${PORT_VERSION}.tar.bz2"
-    SHA512 115a8a4234791bba4e6dcc4617e9dd77abedcf767894ce9472c59cce9d5d4ef2d4e1746f3a0c7a99de4fc4385fb716652b70dce9f48be45a9db5a682517db7e8
+    URLS "https://ftp.postgresql.org/pub/source/v${VERSION}/postgresql-${VERSION}.tar.bz2"
+    FILENAME "postgresql-${VERSION}.tar.bz2"
+    SHA512 c66b72d2d9bc503b9ad19c67384517ae921c494b2916f32157c2528dcbb38aefeb4a8cd5003fd40ba8a19612ea64511d534ff5d99e7a1b266024232f983bcf39
 )
 
-set(PATCHES
-        patches/windows/install.patch
-        patches/windows/win_bison_flex.patch
-        patches/windows/openssl-version.patch
-        patches/windows/Solution.patch
-        patches/windows/MSBuildProject_fix_gendef_perl.patch
-        patches/windows/msgfmt.patch
-        patches/windows/python_lib.patch
-        patches/windows/fix-compile-flag-Zi.patch
-        patches/windows/tcl_version.patch
-        patches/windows/macro-def.patch
-        patches/fix-configure.patch
-        )
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    list(APPEND PATCHES patches/windows/MSBuildProject-static-lib.patch)
-    list(APPEND PATCHES patches/windows/Mkvcbuild-static-lib.patch)
-endif()
-if(VCPKG_CRT_LINKAGE STREQUAL "static")
-    list(APPEND PATCHES patches/windows/MSBuildProject-static-crt.patch)
-endif()
-if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm")
-    list(APPEND PATCHES patches/windows/arm.patch)
-endif()
-if(NOT "${FEATURES}" MATCHES "client")
-    list(APPEND PATCHES patches/windows/minimize_install.patch)
-else()
-    set(HAS_TOOLS TRUE)
-endif()
 vcpkg_extract_source_archive(
     SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
-    PATCHES ${PATCHES}
+    PATCHES
+        unix/installdirs.patch
+        unix/fix-configure.patch
+        unix/single-linkage.patch
+        unix/no-server-tools.patch
+        unix/mingw-install.patch
+        unix/python.patch
+        windows/macro-def.patch
+        windows/python_lib.patch
+        windows/win_bison_flex.patch
+        windows/msbuild.patch
+        windows/spin_delay.patch
+	android/unversioned_so.patch
 )
-unset(buildenv_contents)
-# Get paths to required programs
-set(REQUIRED_PROGRAMS PERL)
+
+file(GLOB _py3_include_path "${CURRENT_HOST_INSTALLED_DIR}/include/python3*")
+string(REGEX MATCH "python3\\.([0-9]+)" _python_version_tmp "${_py3_include_path}")
+set(PYTHON_VERSION_MINOR "${CMAKE_MATCH_1}")
+
+if("client" IN_LIST FEATURES)
+    set(HAS_TOOLS TRUE)
+else()
+    set(HAS_TOOLS FALSE)
+endif()
+
+set(required_programs PERL)
 if(VCPKG_TARGET_IS_WINDOWS)
-    list(APPEND REQUIRED_PROGRAMS BISON FLEX)
+    list(APPEND required_programs BISON FLEX)
 endif()
-foreach(program_name ${REQUIRED_PROGRAMS})
+foreach(program_name IN LISTS required_programs)
     # Need to rename win_bison and win_flex to just bison and flex
     vcpkg_find_acquire_program(${program_name})
-    get_filename_component(${program_name}_EXE_PATH ${${program_name}} DIRECTORY)
-    vcpkg_add_to_path(PREPEND "${${program_name}_EXE_PATH}")
-    set(buildenv_contents "${buildenv_contents}\n\$ENV{'PATH'}=\$ENV{'PATH'} . ';${${program_name}_EXE_PATH}';")
+    get_filename_component(program_dir ${${program_name}} DIRECTORY)
+    vcpkg_add_to_path(PREPEND "${program_dir}")
 endforeach()
 
-## Setup build types
-if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE MATCHES "[Rr][Ee][Ll][Ee][Aa][Ss][Ee]")
-    set(_buildtype RELEASE)
-    set(_short rel)
-    list(APPEND port_config_list ${_buildtype})
-    set(INSTALL_PATH_SUFFIX_${_buildtype} "")
-    set(BUILDPATH_${_buildtype} "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${_short}")
-    file(REMOVE_RECURSE "${BUILDPATH_${_buildtype}}") #Clean old builds
-    set(PACKAGE_DIR_${_buildtype} ${CURRENT_PACKAGES_DIR})
-    unset(_short)
-    unset(_buildtype)
-endif()
-if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE MATCHES "[Dd][Ee][Bb][Uu][Gg]")
-    set(_buildtype DEBUG)
-    set(_short dbg)
-    list(APPEND port_config_list ${_buildtype})
-    set(INSTALL_PATH_SUFFIX_${_buildtype} "/debug")
-    set(BUILDPATH_${_buildtype} "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${_short}")
-    file(REMOVE_RECURSE "${BUILDPATH_${_buildtype}}") #Clean old builds
-    set(PACKAGE_DIR_${_buildtype} "${CURRENT_PACKAGES_DIR}${INSTALL_PATH_SUFFIX_${_buildtype}}")
-    unset(_short)
-    unset(_buildtype)
-endif()
-
-file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_cmake_get_vars(cmake_vars_file)
+include("${cmake_vars_file}")
 
-## Do the build
-if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
-    vcpkg_cmake_get_vars(vars_file)
-    include("${vars_file}")
-
-    file(STRINGS "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/openssl.pc" OPENSSL_VERSION REGEX "Version:")
-    if(OPENSSL_VERSION)
-        set(ENV{VCPKG_OPENSSL_VERSION} "${OPENSSL_VERSION}")
+if(VCPKG_DETECTED_MSVC)
+    if("nls" IN_LIST FEATURES)
+        vcpkg_acquire_msys(MSYS_ROOT PACKAGES gettext)
+        vcpkg_add_to_path("${MSYS_ROOT}/usr/bin")
     endif()
-
-    file(GLOB SOURCE_FILES ${SOURCE_PATH}/*)
-    foreach(_buildtype ${port_config_list})
-        # Copy libpq sources.
-        message(STATUS "Copying libpq source files to ${BUILDPATH_${_buildtype}}...")
-        foreach(SOURCE_FILE ${SOURCE_FILES})
-            file(COPY ${SOURCE_FILE} DESTINATION "${BUILDPATH_${_buildtype}}")
-        endforeach()
-        message(STATUS "Copying libpq source files... done")
-
-        vcpkg_apply_patches(
-            SOURCE_PATH "${BUILDPATH_${_buildtype}}"
-            PATCHES patches/windows/Solution_${_buildtype}.patch
-                    patches/windows/python3_build_${_buildtype}.patch
+    if("xml" IN_LIST FEATURES)
+        x_vcpkg_pkgconfig_get_modules(
+            PREFIX PC_LIBXML2
+            MODULES --msvc-syntax libxml-2.0
+            LIBS
         )
-        message(STATUS "Patches applied!")
-        file(COPY "${CURRENT_PORT_DIR}/config.pl" DESTINATION "${BUILDPATH_${_buildtype}}/src/tools/msvc")
-
-        set(MSPROJ_PERL "${BUILDPATH_${_buildtype}}/src/tools/msvc/MSBuildProject.pm")
-        file(READ "${MSPROJ_PERL}" _contents)
-        string(REPLACE "perl" "\"${PERL}\"" _contents "${_contents}")
-        file(WRITE "${MSPROJ_PERL}" "${_contents}")
-
-        set(CONFIG_FILE "${BUILDPATH_${_buildtype}}/src/tools/msvc/config.pl")
-        file(READ "${CONFIG_FILE}" _contents)
-
-        ##	ldap      => undef,    # --with-ldap
-        ##	extraver  => undef,    # --with-extra-version=<string>
-        ##	gss       => undef,    # --with-gssapi=<path>
-        ##	icu       => undef,    # --with-icu=<path>                      ##done
-        ##	nls       => undef,    # --enable-nls=<path>                    ##done
-        ##	tap_tests => undef,    # --enable-tap-tests
-        ##	tcl       => undef,    # --with-tcl=<path>                      #done
-        ##	perl      => undef,    # --with-perl
-        ##	python    => undef,    # --with-python=<path>                   ##done
-        ##	openssl   => undef,    # --with-openssl=<path>                  ##done
-        ##	uuid      => undef,    # --with-ossp-uuid
-        ##	xml       => undef,    # --with-libxml=<path>                   ##done
-        ##	xslt      => undef,    # --with-libxslt=<path>                  ##done
-        ##	iconv     => undef,    # (not in configure, path to iconv)      ##done (needed by xml)
-        ##	zlib      => undef     # --with-zlib=<path>                     ##done
-
-        ## Setup external dependencies
-        ##"-DFEATURES=core;openssl;zlib" "-DALL_FEATURES=openssl;zlib;readline;libedit;python;tcl;nls;systemd;llvm;icu;bonjour;uuid;xml;xslt;"
-        if("${FEATURES}" MATCHES "icu")
-           string(REPLACE "icu       => undef" "icu      => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}")
-        endif()
-        if("${FEATURES}" MATCHES "nls")
-           string(REPLACE "nls       => undef" "nls      => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}")
-           vcpkg_acquire_msys(MSYS_ROOT PACKAGES gettext)
-           vcpkg_add_to_path("${MSYS_ROOT}/usr/bin")
-        endif()
-        if("${FEATURES}" MATCHES "openssl")
-            string(REPLACE "openssl   => undef" "openssl   => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}")
-        endif()
-        if("${FEATURES}" MATCHES "python")
-           #vcpkg_find_acquire_program(PYTHON3)
-           #get_filename_component(PYTHON3_EXE_PATH ${PYTHON3} DIRECTORY)
-           #vcpkg_add_to_path("${PYTHON3_EXE_PATH}")
-           string(REPLACE "python    => undef" "python    => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}")
-        endif()
-        if("${FEATURES}" MATCHES "tcl")
-           string(REPLACE "tcl       => undef" "tcl       => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}")
-        endif()
-        if("${FEATURES}" MATCHES "xml")
-           string(REPLACE "xml       => undef" "xml      => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}")
-           string(REPLACE "iconv     => undef" "iconv      => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}")
-        endif()
-        if("${FEATURES}" MATCHES "xslt")
-           string(REPLACE "xslt      => undef" "xslt      => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}")
-        endif()
-        if("${FEATURES}" MATCHES "zlib")
-           string(REPLACE "zlib      => undef" "zlib      => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}")
-        endif()
-        if("${FEATURES}" MATCHES "lz4")
-           string(REPLACE "lz4       => undef" "lz4       => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}")
-        endif()
-        if("${FEATURES}" MATCHES "zstd")
-           string(REPLACE "zstd      => undef" "zstd      => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}")
-        endif()
-
-        file(WRITE "${CONFIG_FILE}" "${_contents}")
-        file(WRITE "${BUILDPATH_${_buildtype}}/src/tools/msvc/buildenv.pl" "${buildenv_contents}")
-        configure_file("${CURRENT_PORT_DIR}/libpq.props.in" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/libpq.props" @ONLY)
-        vcpkg_get_windows_sdk(VCPKG_TARGET_PLATFORM_VERSION)
-        set(ENV{MSBFLAGS} "/p:PlatformToolset=${VCPKG_PLATFORM_TOOLSET}
-            /p:VCPkgLocalAppDataDisabled=true
-            /p:UseIntelMKL=No
-            /p:WindowsTargetPlatformVersion=${VCPKG_TARGET_PLATFORM_VERSION}
-            /m
-            /p:ForceImportBeforeCppTargets=\"${SCRIPTS}/buildsystems/msbuild/vcpkg.targets\"
-            /p:ForceImportAfterCppTargets=\"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/libpq.props\"
-            /p:VcpkgTriplet=${TARGET_TRIPLET}
-            /p:VcpkgCurrentInstalledDir=\"${CURRENT_INSTALLED_DIR}\""
-            )
-        if(HAS_TOOLS)
-            if(VCPKG_TARGET_ARCHITECTURE STREQUAL x86)
-                set(ENV{MSBFLAGS} "$ENV{MSBFLAGS} /p:Platform=Win32")
-            endif()
-            message(STATUS "Building libpq ${TARGET_TRIPLET}-${_buildtype}...")
-            vcpkg_execute_required_process(
-                COMMAND ${PERL} build.pl ${_buildtype}
-                WORKING_DIRECTORY "${BUILDPATH_${_buildtype}}/src/tools/msvc"
-                LOGNAME "build-${TARGET_TRIPLET}-${_buildtype}"
-            )
-            message(STATUS "Building libpq ${TARGET_TRIPLET}-${_buildtype}... done")
-        else()
-            set(build_libs libpq libecpg_compat)
-            foreach(build_lib ${build_libs})
-                message(STATUS "Building ${build_lib} ${TARGET_TRIPLET}-${_buildtype}...")
-                vcpkg_execute_required_process(
-                    COMMAND ${PERL} build.pl ${_buildtype} ${build_lib}
-                    WORKING_DIRECTORY "${BUILDPATH_${_buildtype}}/src/tools/msvc"
-                    LOGNAME "build-${build_lib}-${TARGET_TRIPLET}-${_buildtype}"
-                )
-                message(STATUS "Building ${build_lib} ${TARGET_TRIPLET}-${_buildtype}... done")
-            endforeach()
-        endif()
-
-        message(STATUS "Installing libpq ${TARGET_TRIPLET}-${_buildtype}...")
-        vcpkg_execute_required_process(
-            COMMAND ${PERL} install.pl "${CURRENT_PACKAGES_DIR}${INSTALL_PATH_SUFFIX_${_buildtype}}" client
-            WORKING_DIRECTORY "${BUILDPATH_${_buildtype}}/src/tools/msvc"
-            LOGNAME "install-${TARGET_TRIPLET}-${_buildtype}"
+        separate_arguments(LIBXML2_LIBS_DEBUG NATIVE_COMMAND "${PC_LIBXML2_LIBS_DEBUG}")
+        separate_arguments(LIBXML2_LIBS_RELEASE NATIVE_COMMAND "${PC_LIBXML2_LIBS_RELEASE}")
+    endif()
+    if("xslt" IN_LIST FEATURES)
+        x_vcpkg_pkgconfig_get_modules(
+            PREFIX PC_LIBXSLT
+            MODULES --msvc-syntax libxslt
+            LIBS
         )
-        message(STATUS "Installing libpq ${TARGET_TRIPLET}-${_buildtype}... done")
-    endforeach()
+        separate_arguments(LIBXSLT_LIBS_DEBUG NATIVE_COMMAND "${PC_LIBXSLT_LIBS_DEBUG}")
+        separate_arguments(LIBXSLT_LIBS_RELEASE NATIVE_COMMAND "${PC_LIBXSLT_LIBS_RELEASE}")
+    endif()
 
-    message(STATUS "Cleanup libpq ${TARGET_TRIPLET}...")
-    #Cleanup
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/doc")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/symbols")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/symbols")
+    include("${CMAKE_CURRENT_LIST_DIR}/build-msvc.cmake")
+    if(NOT VCPKG_BUILD_TYPE)
+        build_msvc(DEBUG "${SOURCE_PATH}")
+    endif()
+    build_msvc(RELEASE "${SOURCE_PATH}")
 
     if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
         file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
     endif()
 
-    if(NOT HAS_TOOLS)
-        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools")
-    else()
+    if(HAS_TOOLS)
         vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}")
+    else()
+        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools")
     endif()
-
-    message(STATUS "Cleanup libpq ${TARGET_TRIPLET}... - done")
-    set(USE_DL OFF)
 else()
     file(COPY "${CMAKE_CURRENT_LIST_DIR}/Makefile" DESTINATION "${SOURCE_PATH}")
-    
+
+    vcpkg_list(SET BUILD_OPTS)
+    foreach(option IN ITEMS icu lz4 nls openssl readline xml xslt zlib zstd)
+        if(option IN_LIST FEATURES)
+            list(APPEND BUILD_OPTS --with-${option})
+        else()
+            list(APPEND BUILD_OPTS --without-${option})
+        endif()
+    endforeach()
     if("nls" IN_LIST FEATURES)
-        list(APPEND BUILD_OPTS --enable-nls)
         set(ENV{MSGFMT} "${CURRENT_HOST_INSTALLED_DIR}/tools/gettext/bin/msgfmt${VCPKG_HOST_EXECUTABLE_SUFFIX}")
-    else()
-        list(APPEND BUILD_OPTS --disable-nls)
-    endif()
-    if("openssl" IN_LIST FEATURES)
-        list(APPEND BUILD_OPTS --with-openssl)
-    else()
-        list(APPEND BUILD_OPTS --without-openssl)
-    endif()
-    if("zlib" IN_LIST FEATURES)
-        list(APPEND BUILD_OPTS --with-zlib)
-    else()
-        list(APPEND BUILD_OPTS --without-zlib)
-    endif()
-    if("zstd" IN_LIST FEATURES)
-        list(APPEND BUILD_OPTS --with-zstd)
-    else()
-        list(APPEND BUILD_OPTS --without-zstd)
-    endif()
-    if("icu" IN_LIST FEATURES)
-        list(APPEND BUILD_OPTS --with-icu)
-    else()
-        list(APPEND BUILD_OPTS --without-icu)
-    endif()
-    if("lz4" IN_LIST FEATURES)
-        list(APPEND BUILD_OPTS --with-lz4)
-    else()
-        list(APPEND BUILD_OPTS --without-lz4)
-    endif()
-    if("readline" IN_LIST FEATURES)
-        list(APPEND BUILD_OPTS --with-readline)
-    else()
-        list(APPEND BUILD_OPTS --without-readline)
-    endif()
-    if("xml" IN_LIST FEATURES)
-        list(APPEND BUILD_OPTS --with-libxml)
-    else()
-        list(APPEND BUILD_OPTS --without-libxml)
-    endif()
-    if("xslt" IN_LIST FEATURES)
-        list(APPEND BUILD_OPTS --with-libxslt)
-    else()
-        list(APPEND BUILD_OPTS --without-libxslt)
+        if(VCPKG_TARGET_IS_ANDROID)
+            list(APPEND BUILD_OPTS [[LIBS=$LIBS -liconv]])
+        endif()
     endif()
     if("python" IN_LIST FEATURES)
-        list(APPEND BUILD_OPTS --with-python)
-    else()
-        list(APPEND BUILD_OPTS --without-python)
+        list(APPEND BUILD_OPTS --with-python=3.${PYTHON_VERSION_MINOR})
+        vcpkg_find_acquire_program(PYTHON3)
+        list(APPEND BUILD_OPTS "PYTHON=${PYTHON3}")
     endif()
     if(VCPKG_TARGET_IS_ANDROID) # AND CMAKE_SYSTEM_VERSION LESS 26)
         list(APPEND BUILD_OPTS ac_cv_header_langinfo_h=no)
     endif()
-    vcpkg_cmake_get_vars(cmake_vars_file)
-    include("${cmake_vars_file}")
     if(VCPKG_DETECTED_CMAKE_OSX_SYSROOT)
         list(APPEND BUILD_OPTS "PG_SYSROOT=${VCPKG_DETECTED_CMAKE_OSX_SYSROOT}")
     endif()
     vcpkg_configure_make(
-        AUTOCONFIG
         SOURCE_PATH "${SOURCE_PATH}"
         COPY_SOURCE
-        DETERMINE_BUILD_TRIPLET
+        AUTOCONFIG
+        ADDITIONAL_MSYS_PACKAGES autoconf-archive
+            DIRECT_PACKAGES
+                "https://mirror.msys2.org/msys/x86_64/tzcode-2023c-1-x86_64.pkg.tar.zst"
+                7550b843964744607f736a7138f10c6cd92489406a1b84ac71d9a9d8aa16bc69048aa1b24e1f49291b010347047008194c334ca9c632e17fa8245e85549e3c7a
         OPTIONS
             ${BUILD_OPTS}
-        OPTIONS_RELEASE
-            "DYLD_FALLBACK_LIBRARY_PATH=${CURRENT_INSTALLED_DIR}/lib:${CURRENT_INSTALLED_DIR}/debug/lib"
         OPTIONS_DEBUG
             --enable-debug
-            "DYLD_FALLBACK_LIBRARY_PATH=${CURRENT_INSTALLED_DIR}/debug/lib:${CURRENT_INSTALLED_DIR}/lib"
     )
 
     if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-      set(ENV{LIBPQ_LIBRARY_TYPE} shared)
+        set(ENV{LIBPQ_LIBRARY_TYPE} shared)
     else()
-      set(ENV{LIBPQ_LIBRARY_TYPE} static)
+        set(ENV{LIBPQ_LIBRARY_TYPE} static)
     endif()
     if(VCPKG_TARGET_IS_MINGW)
-        set(ENV{USING_MINGW} yes)
+        set(ENV{LIBPQ_USING_MINGW} yes)
     endif()
-    vcpkg_install_make()
-
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-    if(NOT HAS_TOOLS)
-        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin")
-    else()
-        vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin")
-        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug")
-    endif()
-    if(VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-        if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-            file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin")
-            file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libpq.a" "${CURRENT_PACKAGES_DIR}/lib/libpq.dll.a")
-            file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libpq.dll" "${CURRENT_PACKAGES_DIR}/bin/libpq.dll")
-        endif()
-        if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-            file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin")
-            file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libpq.a" "${CURRENT_PACKAGES_DIR}/debug/lib/libpq.dll.a")
-            file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libpq.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/libpq.dll")
-        endif()
-    endif()
-    if(VCPKG_TARGET_IS_MINGW)
-        set(USE_DL OFF)
-    else()
-        set(USE_DL ON)
+    if(HAS_TOOLS)
+        set(ENV{LIBPQ_ENABLE_TOOLS} yes)
     endif()
+    vcpkg_install_make()
 
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/postgresql/server/pg_config.h" "#define CONFIGURE_ARGS" "// #define CONFIGURE_ARGS")
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/pg_config.h" "#define CONFIGURE_ARGS" "// #define CONFIGURE_ARGS")
 endif()
 
+vcpkg_fixup_pkgconfig()
 configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/postgresql/vcpkg-cmake-wrapper.cmake" @ONLY)
+
+file(REMOVE_RECURSE
+    "${CURRENT_PACKAGES_DIR}/debug/doc"
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/debug/share"
+    "${CURRENT_PACKAGES_DIR}/debug/symbols"
+    "${CURRENT_PACKAGES_DIR}/debug/tools"
+    "${CURRENT_PACKAGES_DIR}/symbols"
+    "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug"
+)
+
 file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-vcpkg_fixup_pkgconfig()
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYRIGHT")
diff --git a/external_imported/vcpkg/ports/libpq/patches/fix-configure.patch b/external_imported/vcpkg/ports/libpq/unix/fix-configure.patch
similarity index 80%
rename from external_imported/vcpkg/ports/libpq/patches/fix-configure.patch
rename to external_imported/vcpkg/ports/libpq/unix/fix-configure.patch
index 6fd28899c..e5e1b9165 100644
--- a/external_imported/vcpkg/ports/libpq/patches/fix-configure.patch
+++ b/external_imported/vcpkg/ports/libpq/unix/fix-configure.patch
@@ -1,17 +1,18 @@
 diff --git a/configure.ac b/configure.ac
-index fba79ee..4fadb94 100644
+index 7f97248..48ff1a1 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -19,7 +19,7 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
+@@ -19,7 +19,8 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
  
- AC_INIT([PostgreSQL], [15.2], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/])
+ AC_INIT([PostgreSQL], [16.0], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/])
  
 -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.
++cross_compiling=yes # Avoid conftest loading shared objects
 +m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_warn([unsupported],[Autoconf version 2.69 is required.
  Untested combinations of 'autoconf' and PostgreSQL versions are not
  recommended.  You can remove the check from 'configure.ac' but it is then
  your responsibility whether the result works or not.])])
-@@ -1184,7 +1184,8 @@ if test "$enable_thread_safety" = yes; then
+@@ -1311,7 +1312,8 @@ if test "$enable_thread_safety" = yes; then
  fi
  
  if test "$with_readline" = yes; then
@@ -21,7 +22,7 @@ index fba79ee..4fadb94 100644
    if test x"$pgac_cv_check_readline" = x"no"; then
      AC_MSG_ERROR([readline library not found
  If you have readline already installed, see config.log for details on the
-@@ -1194,7 +1195,7 @@ Use --without-readline to disable readline support.])
+@@ -1321,7 +1323,7 @@ Use --without-readline to disable readline support.])
  fi
  
  if test "$with_zlib" = yes; then
@@ -30,7 +31,7 @@ index fba79ee..4fadb94 100644
                 [AC_MSG_ERROR([zlib library not found
  If you have zlib already installed, see config.log for details on the
  failure.  It is possible the compiler isn't looking in the proper directory.
-@@ -1243,6 +1244,9 @@ if test "$with_ssl" = openssl ; then
+@@ -1370,6 +1372,9 @@ if test "$with_ssl" = openssl ; then
    # Minimum required OpenSSL version is 1.0.1
    AC_DEFINE(OPENSSL_API_COMPAT, [0x10001000L],
              [Define to the OpenSSL API version in use. This avoids deprecation warnings from newer OpenSSL versions.])
@@ -40,15 +41,15 @@ index fba79ee..4fadb94 100644
    if test "$PORTNAME" != "win32"; then
       AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])])
       AC_CHECK_LIB(ssl,    SSL_new, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])])
-@@ -1250,6 +1254,7 @@ if test "$with_ssl" = openssl ; then
+@@ -1377,6 +1382,7 @@ if test "$with_ssl" = openssl ; then
       AC_SEARCH_LIBS(CRYPTO_new_ex_data, [eay32 crypto], [], [AC_MSG_ERROR([library 'eay32' or 'crypto' is required for OpenSSL])])
       AC_SEARCH_LIBS(SSL_new, [ssleay32 ssl], [], [AC_MSG_ERROR([library 'ssleay32' or 'ssl' is required for OpenSSL])])
    fi
 +  fi
-   # Function introduced in OpenSSL 1.0.2.
-   AC_CHECK_FUNCS([X509_get_signature_nid])
-   # Functions introduced in OpenSSL 1.1.0. We used to check for
-@@ -1365,15 +1365,18 @@ if test "$with_pam" = yes ; then
+   # Functions introduced in OpenSSL 1.0.2. LibreSSL does not have
+   # SSL_CTX_set_cert_cb().
+   AC_CHECK_FUNCS([X509_get_signature_nid SSL_CTX_set_cert_cb])
+@@ -1403,19 +1409,23 @@ if test "$with_pam" = yes ; then
  fi
  
  if test "$with_libxml" = yes ; then
@@ -71,8 +72,8 @@ index fba79ee..4fadb94 100644
  
  if test "$with_zstd" = yes ; then
 -  AC_CHECK_LIB(zstd, ZSTD_compress, [], [AC_MSG_ERROR([library 'zstd' is required for ZSTD support])])
-+  PKG_CHECK_MODULES([zstd], [zstd], [AC_DEFINE(HAVE_LIBZSTD,1,[Define to 1 if with lz4])], [AC_MSG_ERROR([library 'zstd' is required for ZSTD support])])
-+  LIBS="$LZ4_LIBS $LIBS"
++  PKG_CHECK_MODULES([ZSTD], [libzstd], [AC_DEFINE(HAVE_LIBZSTD,1,[Define to 1 if with zstd])], [AC_MSG_ERROR([library 'zstd' is required for ZSTD support])])
++  LIBS="$ZSTD_LIBS $LIBS"
  fi
  
  # Note: We can test for libldap_r only after we know PTHREAD_LIBS;
diff --git a/external_imported/vcpkg/ports/libpq/unix/installdirs.patch b/external_imported/vcpkg/ports/libpq/unix/installdirs.patch
new file mode 100644
index 000000000..ae6653f90
--- /dev/null
+++ b/external_imported/vcpkg/ports/libpq/unix/installdirs.patch
@@ -0,0 +1,48 @@
+diff --git a/src/Makefile.global.in b/src/Makefile.global.in
+index 5dacc4d..a9a797e 100644
+--- a/src/Makefile.global.in
++++ b/src/Makefile.global.in
+@@ -100,14 +100,14 @@ datarootdir := @datarootdir@
+ 
+ bindir := @bindir@
+ 
+-datadir := @datadir@
++datadir := @datadir@/postgresql
+ ifeq "$(findstring pgsql, $(datadir))" ""
+ ifeq "$(findstring postgres, $(datadir))" ""
+ override datadir := $(datadir)/postgresql
+ endif
+ endif
+ 
+-sysconfdir := @sysconfdir@
++sysconfdir := @sysconfdir@/postgresql
+ ifeq "$(findstring pgsql, $(sysconfdir))" ""
+ ifeq "$(findstring postgres, $(sysconfdir))" ""
+ override sysconfdir := $(sysconfdir)/postgresql
+@@ -116,7 +116,7 @@ endif
+ 
+ libdir := @libdir@
+ 
+-pkglibdir = $(libdir)
++pkglibdir = $(libdir)/postgresql
+ ifeq "$(findstring pgsql, $(pkglibdir))" ""
+ ifeq "$(findstring postgres, $(pkglibdir))" ""
+ override pkglibdir := $(pkglibdir)/postgresql
+@@ -125,7 +125,7 @@ endif
+ 
+ includedir := @includedir@
+ 
+-pkgincludedir = $(includedir)
++pkgincludedir = $(includedir)/postgresql
+ ifeq "$(findstring pgsql, $(pkgincludedir))" ""
+ ifeq "$(findstring postgres, $(pkgincludedir))" ""
+ override pkgincludedir := $(pkgincludedir)/postgresql
+@@ -134,7 +134,7 @@ endif
+ 
+ mandir := @mandir@
+ 
+-docdir := @docdir@
++docdir := @docdir@/postgresql
+ ifeq "$(findstring pgsql, $(docdir))" ""
+ ifeq "$(findstring postgres, $(docdir))" ""
+ override docdir := $(docdir)/postgresql
diff --git a/external_imported/vcpkg/ports/libpq/unix/mingw-install.patch b/external_imported/vcpkg/ports/libpq/unix/mingw-install.patch
new file mode 100644
index 000000000..ffeea023c
--- /dev/null
+++ b/external_imported/vcpkg/ports/libpq/unix/mingw-install.patch
@@ -0,0 +1,36 @@
+diff --git a/src/Makefile.shlib b/src/Makefile.shlib
+index 16255d7..51e9ed2 100644
+--- a/src/Makefile.shlib
++++ b/src/Makefile.shlib
+@@ -85,7 +85,11 @@ else
+ # Naming convention for dynamically loadable modules
+ shlib		= $(NAME)$(DLSUFFIX)
+ endif
++ifeq ($(PORTNAME)-$(LIBPQ_LIBRARY_TYPE), win32-shared)
++stlib		= lib$(NAME).dll.a
++else
+ stlib		= lib$(NAME).a
++endif
+ 
+ ifndef soname
+ # additional flags for backend modules
+@@ -468,6 +472,9 @@ endif
+ else # no soname
+ 	$(INSTALL_SHLIB) $< '$(DESTDIR)$(pkglibdir)/$(shlib)'
+ endif
++ifeq ($(PORTNAME)-$(LIBPQ_LIBRARY_TYPE), win32-shared)
++	mv '$(DESTDIR)$(libdir)/$(shlib)' '$(DESTDIR)$(libdir)/../bin/$(shlib)'
++endif
+ 
+ 
+ installdirs-lib:
+@@ -476,6 +483,9 @@ ifdef soname
+ else
+ 	$(MKDIR_P) '$(DESTDIR)$(pkglibdir)'
+ endif
++ifeq ($(PORTNAME)-$(LIBPQ_LIBRARY_TYPE), win32-shared)
++	$(MKDIR_P) '$(DESTDIR)$(libdir)/../bin'
++endif
+ 
+ 
+ ##
diff --git a/external_imported/vcpkg/ports/libpq/unix/no-server-tools.patch b/external_imported/vcpkg/ports/libpq/unix/no-server-tools.patch
new file mode 100644
index 000000000..f83682afb
--- /dev/null
+++ b/external_imported/vcpkg/ports/libpq/unix/no-server-tools.patch
@@ -0,0 +1,37 @@
+diff --git a/src/bin/Makefile b/src/bin/Makefile
+index 7f9dde9..bc6d835 100644
+--- a/src/bin/Makefile
++++ b/src/bin/Makefile
+@@ -13,29 +13,20 @@ subdir = src/bin
+ top_builddir = ../..
+ include $(top_builddir)/src/Makefile.global
+ 
++.NOTPARALLEL:
++# incl. https://www.postgresql.org/docs/current/reference-client.html
++# excl. https://www.postgresql.org/docs/current/reference-server.html
+ SUBDIRS = \
+-	initdb \
+ 	pg_amcheck \
+-	pg_archivecleanup \
+ 	pg_basebackup \
+-	pg_checksums \
+ 	pg_config \
+-	pg_controldata \
+-	pg_ctl \
+ 	pg_dump \
+-	pg_resetwal \
+-	pg_rewind \
+-	pg_test_fsync \
+-	pg_test_timing \
+-	pg_upgrade \
+ 	pg_verifybackup \
+-	pg_waldump \
+ 	pgbench \
+ 	psql \
+ 	scripts
+ 
+ ifeq ($(PORTNAME), win32)
+-SUBDIRS += pgevent
+ else
+ ALWAYS_SUBDIRS += pgevent
+ endif
diff --git a/external_imported/vcpkg/ports/libpq/unix/python.patch b/external_imported/vcpkg/ports/libpq/unix/python.patch
new file mode 100644
index 000000000..7d8f58d4a
--- /dev/null
+++ b/external_imported/vcpkg/ports/libpq/unix/python.patch
@@ -0,0 +1,35 @@
+diff --git a/configure.ac b/configure.ac
+index 7f97248992..33b6c84fc4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -891,7 +891,9 @@ AC_SUBST(with_perl)
+ # Optionally build Python modules (PL/Python)
+ #
+ AC_MSG_CHECKING([whether to build Python modules])
+-PGAC_ARG_BOOL(with, python, no, [build Python modules (PL/Python)])
++PGAC_ARG_OPTARG(with, python, [PYTHON_VERSION], [build Python modules (PL/Python)],
++                [],
++                [python_version=$withval])
+ AC_MSG_RESULT([$with_python])
+ AC_SUBST(with_python)
+ 
+@@ -1214,7 +1216,18 @@ fi
+ 
+ if test "$with_python" = yes; then
+   PGAC_PATH_PYTHON
+-  PGAC_CHECK_PYTHON_EMBED_SETUP
++  python_majorversion=3
++  PKG_CHECK_MODULES(PYTHON_EMBED, python-${python_version}-embed)
++  python_includespec="${PYTHON_EMBED_CFLAGS}"
++  python_libdir=[$(echo " ${PYTHON_EMBED_LIBS}" | sed -e 's/\( -L[^ ]*\).*/\1/' -e 's/^.* -L//')]
++  python_libspec="${PYTHON_EMBED_LIBS}"
++  python_additional_libs=""
++  AC_SUBST(python_majorversion)
++  AC_SUBST(python_version)
++  AC_SUBST(python_includespec)
++  AC_SUBST(python_libdir)
++  AC_SUBST(python_libspec)
++  AC_SUBST(python_additional_libs)
+ fi
+ 
+ if test x"$cross_compiling" = x"yes" && test -z "$with_system_tzdata"; then
diff --git a/external_imported/vcpkg/ports/libpq/unix/single-linkage.patch b/external_imported/vcpkg/ports/libpq/unix/single-linkage.patch
new file mode 100644
index 000000000..dd149c7d3
--- /dev/null
+++ b/external_imported/vcpkg/ports/libpq/unix/single-linkage.patch
@@ -0,0 +1,56 @@
+diff --git a/src/Makefile.shlib b/src/Makefile.shlib
+index 551023c..16255d7 100644
+--- a/src/Makefile.shlib
++++ b/src/Makefile.shlib
+@@ -260,10 +260,14 @@ endif
+ 
+ .PHONY: all-lib all-static-lib all-shared-lib
+ 
++ifndef LIBPQ_LIBRARY_TYPE
+ all-lib: all-shared-lib
+ ifdef soname
+ # no static library when building a dynamically loadable module
+ all-lib: all-static-lib
++endif
++else
++all-lib: all-$(LIBPQ_LIBRARY_TYPE)-lib
+ all-lib: lib$(NAME).pc
+ endif
+ 
+@@ -417,9 +421,13 @@ endif # PORTNAME == cygwin || PORTNAME == win32
+ ##
+ 
+ .PHONY: install-lib install-lib-static install-lib-shared installdirs-lib
++ifndef LIBPQ_LIBRARY_TYPE
+ install-lib: install-lib-shared
+ ifdef soname
+ install-lib: install-lib-static
++endif
++else
++install-lib: install-lib-$(LIBPQ_LIBRARY_TYPE)
+ install-lib: install-lib-pc
+ endif
+ 
+diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile
+index 8abdb09..185461e 100644
+--- a/src/interfaces/libpq/Makefile
++++ b/src/interfaces/libpq/Makefile
+@@ -115,6 +115,7 @@ backend_src = $(top_srcdir)/src/backend
+ # Also skip the test on platforms where libpq infrastructure may be provided
+ # by statically-linked libraries, as we can't expect them to honor this
+ # coding rule.
++ifeq ($(LIBPQ_LIBRARY_TYPE), shared)
+ libpq-refs-stamp: $(shlib)
+ ifneq ($(enable_coverage), yes)
+ ifeq (,$(filter aix solaris,$(PORTNAME)))
+@@ -124,6 +125,10 @@ ifeq (,$(filter aix solaris,$(PORTNAME)))
+ endif
+ endif
+ 	touch $@
++else
++.PHONY: libpq-refs-stamp
++libpq-refs-stamp:
++endif
+ 
+ # Make dependencies on pg_config_paths.h visible in all builds.
+ fe-connect.o: fe-connect.c $(top_builddir)/src/port/pg_config_paths.h
diff --git a/external_imported/vcpkg/ports/libpq/vcpkg-cmake-wrapper.cmake b/external_imported/vcpkg/ports/libpq/vcpkg-cmake-wrapper.cmake
index 311f3bb9d..6f1432570 100644
--- a/external_imported/vcpkg/ports/libpq/vcpkg-cmake-wrapper.cmake
+++ b/external_imported/vcpkg/ports/libpq/vcpkg-cmake-wrapper.cmake
@@ -6,7 +6,7 @@ PATHS
 NO_DEFAULT_PATH
 )
 _find_package(${ARGS})
-if(PostgreSQL_FOUND AND @USE_DL@)
+if(PostgreSQL_FOUND AND NOT "@VCPKG_TARGET_IS_WINDOWS@")
     find_library(PostgreSQL_DL_LIBRARY NAMES dl)
     if(PostgreSQL_DL_LIBRARY)
         list(APPEND PostgreSQL_LIBRARIES "dl")
diff --git a/external_imported/vcpkg/ports/libpq/vcpkg-libs.props.in b/external_imported/vcpkg/ports/libpq/vcpkg-libs.props.in
new file mode 100644
index 000000000..cb7e5f92c
--- /dev/null
+++ b/external_imported/vcpkg/ports/libpq/vcpkg-libs.props.in
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
+    <VcpkgIcuLibs>@CURRENT_INSTALLED_DIR@/debug/lib/icuind.lib;@CURRENT_INSTALLED_DIR@/debug/lib/icuucd.lib;@CURRENT_INSTALLED_DIR@/debug/lib/icudtd.lib;</VcpkgIcuLibs>
+    <VcpkgLz4Libs>@CURRENT_INSTALLED_DIR@/debug/lib/lz4d.lib</VcpkgLz4Libs>
+    <VcpkgNlsLibs>@CURRENT_INSTALLED_DIR@/debug/lib/intl.lib;@CURRENT_INSTALLED_DIR@/debug/lib/iconv.lib;@CURRENT_INSTALLED_DIR@/debug/lib/charset.lib</VcpkgNlsLibs>
+    <VcpkgOpensslLibs>@CURRENT_INSTALLED_DIR@/debug/lib/libssl.lib;@CURRENT_INSTALLED_DIR@/debug/lib/libcrypto.lib;crypt32.lib;ws2_32.lib;secur32.lib</VcpkgOpensslLibs>
+    <VcpkgPythonLibs>@CURRENT_INSTALLED_DIR@/debug/lib/python3@PYTHON_VERSION_MINOR@_d.lib</VcpkgPythonLibs>
+    <VcpkgTcl90Libs>@CURRENT_INSTALLED_DIR@/debug/lib/tcl90g.lib</VcpkgTcl90Libs>
+    <VcpkgTcl90sLibs>@CURRENT_INSTALLED_DIR@/debug/lib/tcl90sg.lib</VcpkgTcl90sLibs>
+    <VcpkgTcl90sxLibs>@CURRENT_INSTALLED_DIR@/debug/lib/tcl90sgx.lib</VcpkgTcl90sxLibs>
+    <VcpkgXmlLibs>@LIBXML2_LIBS_DEBUG@</VcpkgXmlLibs>
+    <VcpkgXsltLibs>@LIBXSLT_LIBS_DEBUG@</VcpkgXsltLibs>
+    <VcpkgZlibLibs>@CURRENT_INSTALLED_DIR@/debug/lib/zlibd.lib</VcpkgZlibLibs>
+    <VcpkgZstdLibs>@CURRENT_INSTALLED_DIR@/debug/lib/zstd.lib</VcpkgZstdLibs>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'">
+    <VcpkgIcuLibs>@CURRENT_INSTALLED_DIR@/lib/icuin.lib;@CURRENT_INSTALLED_DIR@/lib/icuuc.lib;@CURRENT_INSTALLED_DIR@/lib/icudt.lib;</VcpkgIcuLibs>
+    <VcpkgLz4Libs>@CURRENT_INSTALLED_DIR@/lib/lz4.lib</VcpkgLz4Libs>
+    <VcpkgNlsLibs>@CURRENT_INSTALLED_DIR@/lib/intl.lib;@CURRENT_INSTALLED_DIR@/lib/iconv.lib;@CURRENT_INSTALLED_DIR@/lib/charset.lib</VcpkgNlsLibs>
+    <VcpkgOpensslLibs>@CURRENT_INSTALLED_DIR@/lib/libssl.lib;@CURRENT_INSTALLED_DIR@/lib/libcrypto.lib;crypt32.lib;ws2_32.lib;secur32.lib</VcpkgOpensslLibs>
+    <VcpkgPythonLibs>@CURRENT_INSTALLED_DIR@/lib/python3@PYTHON_VERSION_MINOR@.lib</VcpkgPythonLibs>
+    <VcpkgTcl90Libs>@CURRENT_INSTALLED_DIR@/lib/tcl90.lib</VcpkgTcl90Libs>
+    <VcpkgTcl90sLibs>@CURRENT_INSTALLED_DIR@/lib/tcl90s.lib</VcpkgTcl90sLibs>
+    <VcpkgTcl90sxLibs>@CURRENT_INSTALLED_DIR@/lib/tcl90sx.lib</VcpkgTcl90sxLibs>
+    <VcpkgXmlLibs>@LIBXML2_LIBS_RELEASE@</VcpkgXmlLibs>
+    <VcpkgXsltLibs>@LIBXSLT_LIBS_RELEASE@</VcpkgXsltLibs>
+    <VcpkgZlibLibs>@CURRENT_INSTALLED_DIR@/lib/zlib.lib</VcpkgZlibLibs>
+    <VcpkgZstdLibs>@CURRENT_INSTALLED_DIR@/lib/zstd.lib</VcpkgZstdLibs>
+  </PropertyGroup>
+</Project>
diff --git a/external_imported/vcpkg/ports/libpq/vcpkg.json b/external_imported/vcpkg/ports/libpq/vcpkg.json
index be8c59ad6..426a33132 100644
--- a/external_imported/vcpkg/ports/libpq/vcpkg.json
+++ b/external_imported/vcpkg/ports/libpq/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libpq",
-  "version": "15.2",
-  "port-version": 1,
+  "version": "16.0",
+  "port-version": 2,
   "description": "The official database access API of postgresql",
   "homepage": "https://www.postgresql.org/",
   "license": "PostgreSQL",
@@ -18,6 +18,11 @@
     {
       "name": "vcpkg-cmake-get-vars",
       "host": true
+    },
+    {
+      "name": "vcpkg-pkgconfig-get-modules",
+      "host": true,
+      "platform": "windows & !mingw"
     }
   ],
   "default-features": [
@@ -26,28 +31,78 @@
     "zlib"
   ],
   "features": {
+    "all": {
+      "description": "Build all supported features",
+      "dependencies": [
+        {
+          "name": "libpq",
+          "features": [
+            "client",
+            "icu",
+            "xml",
+            "xslt",
+            "zstd"
+          ]
+        },
+        {
+          "name": "libpq",
+          "features": [
+            "bonjour"
+          ],
+          "platform": "osx"
+        },
+        {
+          "name": "libpq",
+          "features": [
+            "nls"
+          ],
+          "platform": "!osx"
+        },
+        {
+          "name": "libpq",
+          "features": [
+            "readline"
+          ],
+          "platform": "!windows"
+        },
+        {
+          "name": "libpq",
+          "features": [
+            "python"
+          ],
+          "platform": "!android & !mingw"
+        },
+        {
+          "name": "libpq",
+          "features": [
+            "tcl"
+          ],
+          "platform": "windows & !mingw & !arm"
+        }
+      ]
+    },
     "bonjour": {
-      "description": "Build with Bonjour support (--with-bonjour)",
+      "description": "Build with Bonjour support",
       "supports": "osx"
     },
     "client": {
-      "description": "Build all client tools and libraries (dynamic only?)",
-      "supports": "!(windows & !mingw & static)"
+      "description": "Build all client tools and libraries"
     },
     "icu": {
-      "description": "Build with support for the ICU library (--with-icu)",
+      "description": "Build with support for the ICU library",
       "dependencies": [
         "icu"
       ]
     },
     "lz4": {
-      "description": "Use lz4 (else --without-lz4)",
+      "description": "Use lz4",
       "dependencies": [
         "lz4"
       ]
     },
     "nls": {
-      "description": "Native Language Support (--enable-nls[=LANGUAGES])",
+      "description": "Native Language Support",
+      "supports": "!osx",
       "dependencies": [
         "gettext",
         {
@@ -55,19 +110,20 @@
           "host": true,
           "features": [
             "tools"
-          ]
+          ],
+          "platform": "!windows, mingw"
         }
       ]
     },
     "openssl": {
-      "description": "support for encrypted client connections and random number generation on platforms that do not have \"/dev/urandom\" (except windows) (--with-openssl)",
+      "description": "support for encrypted client connections and random number generation on platforms that do not have \"/dev/urandom\" (except windows)",
       "dependencies": [
         "openssl"
       ]
     },
     "python": {
-      "description": "build the PL/Python server programming language (dynamic only?) (--with-python)",
-      "supports": "!(windows & (static | mingw))",
+      "$supports": "!(windows & (static | mingw))",
+      "description": "build the PL/Python server programming language",
       "dependencies": [
         {
           "name": "libpq",
@@ -80,15 +136,16 @@
       ]
     },
     "readline": {
-      "description": "Use readline (else --without-readline)",
+      "description": "Use readline",
       "supports": "!windows, mingw",
       "dependencies": [
         "readline"
       ]
     },
     "tcl": {
-      "description": "build the PL/Tcl procedural language(dynamic only?) (--with-tcl)",
-      "supports": "!(windows & (static | mingw))",
+      "$supports": "!(windows & (static | mingw))",
+      "description": "build the PL/Tcl procedural language",
+      "supports": "windows & !mingw",
       "dependencies": [
         {
           "name": "libpq",
@@ -101,13 +158,16 @@
       ]
     },
     "xml": {
-      "description": "Build with libxml (--with-libxml)",
+      "description": "Build with libxml",
       "dependencies": [
-        "libxml2"
+        {
+          "name": "libxml2",
+          "default-features": false
+        }
       ]
     },
     "xslt": {
-      "description": "Build with libxslt (--with-libxslt)",
+      "description": "Build with libxslt",
       "dependencies": [
         {
           "name": "libpq",
@@ -120,13 +180,13 @@
       ]
     },
     "zlib": {
-      "description": "Use zlib (else --without-zlib)",
+      "description": "Use zlib",
       "dependencies": [
         "zlib"
       ]
     },
     "zstd": {
-      "description": "Use zstd (else --without-zstd)",
+      "description": "Use zstd",
       "dependencies": [
         "zstd"
       ]
diff --git a/external_imported/vcpkg/ports/libpq/patches/windows/macro-def.patch b/external_imported/vcpkg/ports/libpq/windows/macro-def.patch
similarity index 100%
rename from external_imported/vcpkg/ports/libpq/patches/windows/macro-def.patch
rename to external_imported/vcpkg/ports/libpq/windows/macro-def.patch
diff --git a/external_imported/vcpkg/ports/libpq/windows/msbuild.patch b/external_imported/vcpkg/ports/libpq/windows/msbuild.patch
new file mode 100644
index 000000000..27ff54644
--- /dev/null
+++ b/external_imported/vcpkg/ports/libpq/windows/msbuild.patch
@@ -0,0 +1,411 @@
+diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm
+index 05548d7..097db91 100644
+--- a/src/tools/msvc/Install.pm
++++ b/src/tools/msvc/Install.pm
+@@ -53,6 +53,11 @@ sub Install
+ 	my $target = shift;
+ 	$insttype = shift;
+ 	$insttype = "all" unless ($insttype);
++	if ($insttype eq 'core')
++	{
++		$insttype = 'client';
++		@client_program_files = ( 'libecpg','libecpg_compat', 'libpgtypes', 'libpq' );
++	}
+ 
+ 	# if called from vcregress, the config will be passed to us
+ 	# so no need to re-include these
+@@ -89,7 +94,7 @@ sub Install
+ 	my $majorver = DetermineMajorVersion();
+ 	print "Installing version $majorver for $conf in $target\n";
+ 
+-	my @client_dirs = ('bin', 'lib', 'share', 'symbols');
++	my @client_dirs = ('bin', 'lib', 'share', 'tools', 'share/libpq', 'tools/libpq');
+ 	my @all_dirs = (
+ 		@client_dirs, 'doc', 'doc/contrib', 'doc/extension', 'share/contrib',
+ 		'share/extension', 'share/timezonesets', 'share/tsearch_data');
+@@ -117,11 +122,11 @@ sub Install
+ 			}
+ 		},
+ 		@top_dir);
+-	CopySetOfFiles('config files', $sample_files, $target . '/share/');
++	CopySetOfFiles('config files', $sample_files, $target . '/share/libpq/');
+ 	CopyFiles(
+ 		'Import libraries',
+ 		$target . '/lib/',
+-		"$conf\\", "postgres\\postgres.lib", "libpgcommon\\libpgcommon.lib",
++		"$conf\\", "libpgcommon\\libpgcommon.lib",
+ 		"libpgport\\libpgport.lib");
+ 	CopyContribFiles($config, $target);
+ 	CopyIncludeFiles($target);
+@@ -293,7 +298,16 @@ sub CopySolutionOutput
+ 		{
+ 			if ($1 == 1)
+ 			{
+-				push(@{ $install_list{'bin'} }, "exe");
++				push(@{ $install_list{'tools\\libpq'} }, "exe");
++			}
++			elsif ($1 == 2)
++			{
++				push(@{ $install_list{'bin'} }, "dll");
++				push(@{ $install_list{'lib'} }, "lib") if $is_sharedlib; # not for plugins
++			}
++			elsif ($is_sharedlib) # forced to static lib by vcpkg triplet
++			{
++				push(@{ $install_list{'lib'} }, "lib");
+ 			}
+ 			elsif ($1 == 2)
+ 			{
+@@ -317,7 +331,16 @@ sub CopySolutionOutput
+ 		{
+ 			if ($1 eq 'Application')
+ 			{
+-				push(@{ $install_list{'bin'} }, "exe");
++				push(@{ $install_list{'tools\\libpq'} }, "exe");
++			}
++			elsif ($1 eq 'DynamicLibrary')
++			{
++				push(@{ $install_list{'bin'} }, "dll");
++				push(@{ $install_list{'lib'} }, "lib") if $is_sharedlib; # not for plugins
++			}
++			elsif ($is_sharedlib) # forced to static lib by vcpkg triplet
++			{
++				push(@{ $install_list{'lib'} }, "lib");
+ 			}
+ 			elsif ($1 eq 'DynamicLibrary')
+ 			{
+@@ -350,7 +373,8 @@ sub CopySolutionOutput
+ 				  || croak "Could not copy $pf.$ext\n";
+ 			}
+ 		}
+-		lcopy("$conf\\$pf\\$pf.pdb", "$target\\symbols\\$pf.pdb")
++		$1 ne 'DynamicLibrary' ||
++		lcopy("$conf\\$pf\\$pf.pdb", "$target\\bin\\$pf.pdb")
+ 		  || croak "Could not copy $pf.pdb\n";
+ 		print ".";
+ 	}
+@@ -453,7 +477,7 @@ sub CopySubdirFiles
+ 		foreach my $f (split /\s+/, $flist)
+ 		{
+ 			lcopy("$subdir/$module/$f.control",
+-				"$target/share/extension/$f.control")
++				"$target/share/libpq/extension/$f.control")
+ 			  || croak("Could not copy file $f.control in contrib $module");
+ 			print '.';
+ 		}
+@@ -471,7 +495,7 @@ sub CopySubdirFiles
+ 		foreach my $f (split /\s+/, $flist)
+ 		{
+ 			lcopy("$subdir/$module/$f",
+-				"$target/share/$moduledir/" . basename($f))
++				"$target/share/libpq/$moduledir/" . basename($f))
+ 			  || croak("Could not copy file $f in contrib $module");
+ 			print '.';
+ 		}
+@@ -486,7 +510,7 @@ sub CopySubdirFiles
+ 		foreach my $f (split /\s+/, $flist)
+ 		{
+ 			lcopy("$subdir/$module/$f",
+-				"$target/share/tsearch_data/" . basename($f))
++				"$target/share/libpq/tsearch_data/" . basename($f))
+ 			  || croak("Could not copy file $f in $subdir $module");
+ 			print '.';
+ 		}
+@@ -549,7 +573,7 @@ sub CopySubdirFiles
+ 		  if ($module eq 'spi');
+ 		foreach my $f (split /\s+/, $flist)
+ 		{
+-			lcopy("$subdir/$module/$f", "$target/doc/$moduledir/$f")
++			lcopy("$subdir/$module/$f", "$target/share/libpq/doc/$moduledir/$f")
+ 			  || croak("Could not copy file $f in contrib $module");
+ 			print '.';
+ 		}
+@@ -675,7 +699,7 @@ sub GenerateNLSFiles
+ 	my $majorver = shift;
+ 
+ 	print "Installing NLS files...";
+-	EnsureDirectories($target, "share/locale");
++	EnsureDirectories($target, "share/libpq/locale");
+ 	my @flist;
+ 	File::Find::find(
+ 		{
+@@ -697,12 +721,12 @@ sub GenerateNLSFiles
+ 			next unless /([^\/]+)\.po/;
+ 			$lang = $1;
+ 
+-			EnsureDirectories($target, "share/locale/$lang",
+-				"share/locale/$lang/LC_MESSAGES");
++			EnsureDirectories($target, "share/libpq/locale/$lang",
++				"share/libpq/locale/$lang/LC_MESSAGES");
+ 			my @args = (
+-				"$nlspath\\bin\\msgfmt",
++				"msgfmt",
+ 				'-o',
+-				"$target\\share\\locale\\$lang\\LC_MESSAGES\\$prgm-$majorver.mo",
++				"$target\\share\\libpq\\locale\\$lang\\LC_MESSAGES\\$prgm-$majorver.mo",
+ 				$_);
+ 			system(@args) && croak("Could not run msgfmt on $dir\\$_");
+ 			print ".";
+diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm
+index 62fec1f..ecb1b86 100644
+--- a/src/tools/msvc/MSBuildProject.pm
++++ b/src/tools/msvc/MSBuildProject.pm
+@@ -80,14 +80,14 @@ EOF
+ 	print $f <<EOF;
+   </PropertyGroup>
+ EOF
+-
++    my $maybe_dll = $self->{solution}->{options}->{VCPKG_CRT_LINKAGE} eq 'dynamic' ? "DLL" : '';
+ 	$self->WriteItemDefinitionGroup(
+ 		$f, 'Debug',
+ 		{
+ 			defs => "_DEBUG;DEBUG=1",
+ 			opt => 'Disabled',
+ 			strpool => 'false',
+-			runtime => 'MultiThreadedDebugDLL'
++			runtime => 'MultiThreadedDebug' . $maybe_dll
+ 		});
+ 	$self->WriteItemDefinitionGroup(
+ 		$f,
+@@ -96,7 +96,7 @@ EOF
+ 			defs => "",
+ 			opt => 'Full',
+ 			strpool => 'true',
+-			runtime => 'MultiThreadedDLL'
++			runtime => 'MultiThreaded' . $maybe_dll
+ 		});
+ 	return;
+ }
+@@ -266,6 +266,8 @@ sub WriteConfigurationPropertyGroup
+ 	  ($self->{type} eq "exe")
+ 	  ? 'Application'
+ 	  : ($self->{type} eq "dll" ? 'DynamicLibrary' : 'StaticLibrary');
++	if ($self->{solution}->{options}->{VCPKG_LIBRARY_LINKAGE} eq 'static')
++	  { $cfgtype =~ s/DynamicLibrary/StaticLibrary/; }
+ 
+ 	print $f <<EOF;
+   <PropertyGroup Condition="'\$(Configuration)|\$(Platform)'=='$cfgname|$self->{platform}'" Label="Configuration">
+@@ -311,7 +313,9 @@ sub WriteItemDefinitionGroup
+ 	my $libs = $self->GetAdditionalLinkerDependencies($cfgname, ';');
+ 
+ 	my $targetmachine =
+-	  $self->{platform} eq 'Win32' ? 'MachineX86' : 'MachineX64';
++	  'Machine' . uc($self->{platform});
++	$targetmachine =~ s/WIN32/X86/;
++	my $randomizebase = ($self->{platform} =~ /^ARM/) ? 'true' : 'false';
+ 	my $arch = $self->{platform} eq 'Win32' ? 'x86' : 'x86_64';
+ 
+ 	my $includes = join ';', @{ $self->{includes} }, "";
+diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
+index 9e05eb9..8ac0a5d 100644
+--- a/src/tools/msvc/Mkvcbuild.pm
++++ b/src/tools/msvc/Mkvcbuild.pm
+@@ -125,8 +125,10 @@ sub mkvcbuild
+ 
+ 	if ($vsVersion >= '9.00')
+ 	{
++        if ($solution->{platform} !~ /^ARM/) {
+ 		push(@pgportfiles, 'pg_crc32c_sse42_choose.c');
+ 		push(@pgportfiles, 'pg_crc32c_sse42.c');
++        }
+ 		push(@pgportfiles, 'pg_crc32c_sb8.c');
+ 	}
+ 	else
+@@ -208,6 +210,7 @@ sub mkvcbuild
+ 		'syncrep_gram.y');
+ 	$postgres->AddFiles('src/backend/utils/adt', 'jsonpath_scan.l',
+ 		'jsonpath_gram.y');
++    ($config->{VCPKG_LIBRARY_LINKAGE} eq 'dynamic') &&
+ 	$postgres->AddDefine('BUILDING_DLL');
+ 	$postgres->AddLibrary('secur32.lib');
+ 	$postgres->AddLibrary('ws2_32.lib');
+@@ -252,12 +255,13 @@ sub mkvcbuild
+ 		$pltcl->AddIncludeDir($solution->{options}->{tcl} . '/include');
+ 		$pltcl->AddReference($postgres);
+ 
+-		for my $tclver (qw(86t 86 85 84))
++		my $v = $solution->{options}->{tcl_version};
++		for my $tclver ( ("${v}","${v}s","${v}sx") )
+ 		{
+ 			my $tcllib = $solution->{options}->{tcl} . "/lib/tcl$tclver.lib";
+ 			if (-e $tcllib)
+ 			{
+-				$pltcl->AddLibrary($tcllib);
++				$pltcl->AddLibrary("\$(VcpkgTcl${tclver}Libs)");
+ 				$found = 1;
+ 				last;
+ 			}
+@@ -512,8 +516,7 @@ sub mkvcbuild
+ 		  . "print(str(sys.version_info[0])+str(sys.version_info[1]))";
+ 		my $prefixcmd =
+ 		  qq("$solution->{options}->{python}\\python" -c "$pythonprog");
+-		my $pyout = `$prefixcmd`;
+-		die "Could not query for python version!\n" if $?;
++        my $pyout = "$solution->{options}->{python}\n$solution->{options}->{python_version}";
+ 		my ($pyprefix, $pyver) = split(/\r?\n/, $pyout);
+ 
+ 		# Sometimes (always?) if python is not present, the execution
+@@ -529,8 +532,8 @@ sub mkvcbuild
+ 
+ 		my $plpython = $solution->AddProject('plpython' . $pymajorver,
+ 			'dll', 'PLs', 'src/pl/plpython');
+-		$plpython->AddIncludeDir($pyprefix . '/include');
+-		$plpython->AddLibrary($pyprefix . "/Libs/python$pyver.lib");
++		$plpython->AddIncludeDir($pyprefix . "/include/python$pyver");
++		$plpython->AddLibrary('$(VcpkgPythonLibs)');
+ 		$plpython->AddReference($postgres);
+ 
+ 		# Add transform modules dependent on plpython
+diff --git a/src/tools/msvc/Project.pm b/src/tools/msvc/Project.pm
+index 0507ad0..48caab9 100644
+--- a/src/tools/msvc/Project.pm
++++ b/src/tools/msvc/Project.pm
+@@ -167,6 +167,11 @@ sub AddReference
+ 		}
+ 		$self->AddLibrary(
+ 			"__CFGNAME__/" . $ref->{name} . "/" . $ref->{name} . ".lib");
++
++		if ($self->{solution}->{options}->{VCPKG_LIBRARY_LINKAGE} eq 'static')
++		{
++			map { $self->AddLibrary($_) } @{ $ref->{libraries} };
++		}
+ 	}
+ 	return;
+ }
+diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
+index b6d31c3..27d89fc 100644
+--- a/src/tools/msvc/Solution.pm
++++ b/src/tools/msvc/Solution.pm
+@@ -63,6 +63,11 @@ sub DeterminePlatform
+ 	my $self = shift;
+ 
+ 	if ($^O eq "MSWin32")
++	{
++		$self->{platform} = uc($self->{options}->{VCPKG_TARGET_ARCHITECTURE});
++		$self->{platform} =~ s/^X86$/Win32/;
++	}
++	elsif (0)
+ 	{
+ 		# Examine CL help output to determine if we are in 32 or 64-bit mode.
+ 		my $output = `cl /help 2>&1`;
+@@ -124,6 +129,9 @@ sub copyFile
+ sub GetOpenSSLVersion
+ {
+ 	my $self = shift;
++	if ($self->{options}->{openssl_version} =~ /(\d+)\.(\d+)\.(\d+)/m) {
++		return ($1, $2, $3);
++	}
+ 
+ 	# Attempt to get OpenSSL version and location.  This assumes that
+ 	# openssl.exe is in the specified directory.
+@@ -148,7 +156,7 @@ sub GetOpenSSLVersion
+ sub GenerateFiles
+ {
+ 	my $self = shift;
+-	my $bits = $self->{platform} eq 'Win32' ? 32 : 64;
++	my $bits          = $self->{platform} =~ /64/ ? 64 : 32;
+ 	my $ac_init_found = 0;
+ 	my $package_name;
+ 	my $package_version;
+@@ -440,7 +448,7 @@ sub GenerateFiles
+ 		USE_PAM => undef,
+ 		USE_SLICING_BY_8_CRC32C => undef,
+ 		USE_SSE42_CRC32C => undef,
+-		USE_SSE42_CRC32C_WITH_RUNTIME_CHECK => 1,
++		USE_SSE42_CRC32C_WITH_RUNTIME_CHECK => $self->{platform} =~ /^ARM/ ? undef : 1,
+ 		USE_SYSTEMD => undef,
+ 		USE_SYSV_SEMAPHORES => undef,
+ 		USE_SYSV_SHARED_MEMORY => undef,
+@@ -725,14 +733,14 @@ sub GenerateFiles
+ 		  || confess "Could not open pg_config_paths.h";
+ 		print $o <<EOF;
+ #define PGBINDIR "/bin"
+-#define PGSHAREDIR "/share"
++#define PGSHAREDIR "/share/libpq"
+ #define SYSCONFDIR "/etc"
+ #define INCLUDEDIR "/include"
+ #define PKGINCLUDEDIR "/include"
+ #define INCLUDEDIRSERVER "/include/server"
+ #define LIBDIR "/lib"
+ #define PKGLIBDIR "/lib"
+-#define LOCALEDIR "/share/locale"
++#define LOCALEDIR "/share/libpq/locale"
+ #define DOCDIR "/doc"
+ #define HTMLDIR "/doc"
+ #define MANDIR "/man"
+@@ -957,11 +965,15 @@ sub AddProject
+ 	if ($self->{options}->{zlib})
+ 	{
+ 		$proj->AddIncludeDir($self->{options}->{zlib} . '\include');
+-		$proj->AddLibrary($self->{options}->{zlib} . '\lib\zdll.lib');
++		$proj->AddLibrary('$(VcpkgZlibLibs)');
+ 	}
+ 	if ($self->{options}->{openssl})
+ 	{
+ 		$proj->AddIncludeDir($self->{options}->{openssl} . '\include');
++		$proj->AddLibrary('$(VcpkgOpensslLibs)');
++	}
++	elsif (0)
++	{
+ 		my ($digit1, $digit2, $digit3) = $self->GetOpenSSLVersion();
+ 
+ 		# Starting at version 1.1.0 the OpenSSL installers have
+@@ -1032,7 +1044,7 @@ sub AddProject
+ 	if ($self->{options}->{nls})
+ 	{
+ 		$proj->AddIncludeDir($self->{options}->{nls} . '\include');
+-		$proj->AddLibrary($self->{options}->{nls} . '\lib\libintl.lib');
++		$proj->AddLibrary('$(VcpkgNlsLibs)');
+ 	}
+ 	if ($self->{options}->{gss})
+ 	{
+@@ -1065,6 +1077,10 @@ sub AddProject
+ 	if ($self->{options}->{icu})
+ 	{
+ 		$proj->AddIncludeDir($self->{options}->{icu} . '\include');
++		$proj->AddLibrary('$(VcpkgIcuLibs)');
++	}
++	elsif (0)
++	{
+ 		if ($self->{platform} eq 'Win32')
+ 		{
+ 			$proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib');
+@@ -1082,22 +1098,22 @@ sub AddProject
+ 	{
+ 		$proj->AddIncludeDir($self->{options}->{xml} . '\include');
+ 		$proj->AddIncludeDir($self->{options}->{xml} . '\include\libxml2');
+-		$proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib');
++		$proj->AddLibrary('$(VcpkgXmlLibs)');
+ 	}
+ 	if ($self->{options}->{xslt})
+ 	{
+ 		$proj->AddIncludeDir($self->{options}->{xslt} . '\include');
+-		$proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib');
++		$proj->AddLibrary('$(VcpkgXsltLibs)');
+ 	}
+ 	if ($self->{options}->{lz4})
+ 	{
+ 		$proj->AddIncludeDir($self->{options}->{lz4} . '\include');
+-		$proj->AddLibrary($self->{options}->{lz4} . '\lib\liblz4.lib');
++		$proj->AddLibrary('$(VcpkgLz4Libs)');
+ 	}
+ 	if ($self->{options}->{zstd})
+ 	{
+ 		$proj->AddIncludeDir($self->{options}->{zstd} . '\include');
+-		$proj->AddLibrary($self->{options}->{zstd} . '\lib\libzstd.lib');
++		$proj->AddLibrary('$(VcpkgZstdLibs)');
+ 	}
+ 	if ($self->{options}->{uuid})
+ 	{
+diff --git a/src/tools/msvc/gendef.pl b/src/tools/msvc/gendef.pl
+index cf83d7d..2d9a4ec 100644
+--- a/src/tools/msvc/gendef.pl
++++ b/src/tools/msvc/gendef.pl
+@@ -122,7 +122,7 @@ sub writedef
+ 
+ 		# Strip the leading underscore for win32, but not x64
+ 		$f =~ s/^_//
+-		  unless ($arch eq "x86_64");
++		  if ($arch eq "Win32");
+ 
+ 		# Emit just the name if it's a function symbol, or emit the name
+ 		# decorated with the DATA option for variables.
diff --git a/external_imported/vcpkg/ports/libpq/patches/windows/python_lib.patch b/external_imported/vcpkg/ports/libpq/windows/python_lib.patch
similarity index 100%
rename from external_imported/vcpkg/ports/libpq/patches/windows/python_lib.patch
rename to external_imported/vcpkg/ports/libpq/windows/python_lib.patch
diff --git a/external_imported/vcpkg/ports/libpq/windows/spin_delay.patch b/external_imported/vcpkg/ports/libpq/windows/spin_delay.patch
new file mode 100644
index 000000000..163e8e6ef
--- /dev/null
+++ b/external_imported/vcpkg/ports/libpq/windows/spin_delay.patch
@@ -0,0 +1,24 @@
+diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
+index 4d3ffc7..658b1a1 100644
+--- a/src/include/storage/s_lock.h
++++ b/src/include/storage/s_lock.h
+@@ -953,12 +953,18 @@ typedef LONG slock_t;
+ /* If using Visual C++ on Win64, inline assembly is unavailable.
+  * Use a _mm_pause intrinsic instead of rep nop.
+  */
+-#if defined(_WIN64)
++#if defined(_M_X64) && !defined(_M_ARM64EC)
+ static __forceinline void
+ spin_delay(void)
+ {
+ 	_mm_pause();
+ }
++#elif defined(_M_ARM) || defined(_M_ARM64) || defined(_M_ARM64EC)
++static __forceinline void
++spin_delay(void)
++{
++	__yield();
++}
+ #else
+ static __forceinline void
+ spin_delay(void)
diff --git a/external_imported/vcpkg/ports/libpq/patches/windows/win_bison_flex.patch b/external_imported/vcpkg/ports/libpq/windows/win_bison_flex.patch
similarity index 79%
rename from external_imported/vcpkg/ports/libpq/patches/windows/win_bison_flex.patch
rename to external_imported/vcpkg/ports/libpq/windows/win_bison_flex.patch
index 645d53af2..fc8230193 100644
--- a/external_imported/vcpkg/ports/libpq/patches/windows/win_bison_flex.patch
+++ b/external_imported/vcpkg/ports/libpq/windows/win_bison_flex.patch
@@ -1,6 +1,26 @@
+diff --git a/src/tools/msvc/pgbison.pl b/src/tools/msvc/pgbison.pl
+index 25df669..373bedd 100644
+--- a/src/tools/msvc/pgbison.pl
++++ b/src/tools/msvc/pgbison.pl
+@@ -13,7 +13,7 @@ use File::Basename;
+ 
+ do './src/tools/msvc/buildenv.pl' if -e 'src/tools/msvc/buildenv.pl';
+ 
+-my ($bisonver) = `bison -V`;                 # grab first line
++my ($bisonver) = `win_bison -V`;    # grab first line
+ $bisonver = (split(/\s+/, $bisonver))[3];    # grab version number
+ 
+ unless ($bisonver ge '2.3')
+@@ -51,5 +51,5 @@ my $headerflag = ($make =~ /^$basetarg:\s+BISONFLAGS\b.*-d/m ? '-d' : '');
+ 
+ my $nodep = $bisonver ge '3.0' ? "-Wno-deprecated" : "";
+ 
+-system("bison $nodep $headerflag $input -o $output");
++system("win_bison $nodep $headerflag $input -o $output");
+ exit $? >> 8;
 diff --git a/src/tools/msvc/pgflex.pl b/src/tools/msvc/pgflex.pl
-index aceed5ffd..f6ed215e8 100644
---- a/src/tools/msvc/pgflex.pl	
+index c308a08..0807ce7 100644
+--- a/src/tools/msvc/pgflex.pl
 +++ b/src/tools/msvc/pgflex.pl
 @@ -16,7 +16,7 @@ $ENV{CYGWIN} = 'nodosfilewarning';
  
@@ -20,24 +40,3 @@ index aceed5ffd..f6ed215e8 100644
  if ($? == 0)
  {
  
-diff --git a/src/tools/msvc/pgbison.pl b/src/tools/msvc/pgbison.pl
-index 895e398c0..f5b524a5d 100644
---- a/src/tools/msvc/pgbison.pl	
-+++ b/src/tools/msvc/pgbison.pl
-@@ -13,7 +13,7 @@ use File::Basename;
- 
- do './src/tools/msvc/buildenv.pl' if -e 'src/tools/msvc/buildenv.pl';
- 
--my ($bisonver) = `bison -V`;    # grab first line
-+my ($bisonver) = `win_bison -V`;    # grab first line
- $bisonver = (split(/\s+/, $bisonver))[3];    # grab version number
- 
- unless ($bisonver eq '1.875' || $bisonver ge '2.2')
-@@ -51,5 +51,5 @@ close($mf);
- 
- my $nodep = $bisonver ge '3.0' ? "-Wno-deprecated" : "";
- 
--system("bison $nodep $headerflag $input -o $output");
-+system("win_bison $nodep $headerflag $input -o $output");
- exit $? >> 8;
-
diff --git a/external_imported/vcpkg/ports/libpqxx/fix_build_with_vs2017.patch b/external_imported/vcpkg/ports/libpqxx/fix_build_with_vs2017.patch
index 9892415b0..48b648b4f 100644
--- a/external_imported/vcpkg/ports/libpqxx/fix_build_with_vs2017.patch
+++ b/external_imported/vcpkg/ports/libpqxx/fix_build_with_vs2017.patch
@@ -27,48 +27,48 @@ index abc1a39..cba0242 100644
  #if defined(PQXX_HAVE_LIKELY)
  #  define PQXX_LIKELY [[likely]]
 diff --git a/include/pqxx/stream_from.hxx b/include/pqxx/stream_from.hxx
-index ff4a93d..5b300d6 100644
+index 1e8a272..299248c 100644
 --- a/include/pqxx/stream_from.hxx
 +++ b/include/pqxx/stream_from.hxx
-@@ -153,7 +153,7 @@ public:
+@@ -160,7 +160,7 @@ public:
    /** @deprecated Use factories @ref table or @ref raw_table instead.
     */
    template<typename Iter>
--  [[deprecated("Use table() or raw_table() factory instead.")]] stream_from(
-+  PQXX_DEPRECATED("Use table() or raw_table() factory instead.") stream_from(
+-  [[deprecated("Use transaction_base::stream instead.")]] stream_from(
++  PQXX_DEPRECATED("Use transaction_base::stream instead.") stream_from(
      transaction_base &, from_table_t, std::string_view table,
      Iter columns_begin, Iter columns_end);
  
-@@ -161,13 +161,13 @@ public:
+@@ -168,13 +168,13 @@ public:
    /** @deprecated Use factory function @ref query instead.
     */
    template<typename Columns>
--  [[deprecated("Use table() or raw_table() factory instead.")]] stream_from(
-+  PQXX_DEPRECATED("Use table() or raw_table() factory instead.") stream_from(
+-  [[deprecated("Use transaction_base::stream() instead.")]] stream_from(
++  PQXX_DEPRECATED("Use transaction_base::stream() instead.") stream_from(
      transaction_base &tx, from_table_t, std::string_view table,
      Columns const &columns);
  
  #include "pqxx/internal/ignore-deprecated-pre.hxx"
    /// @deprecated Use factories @ref table or @ref raw_table instead.
--  [[deprecated("Use the from_table_t overload instead.")]] stream_from(
-+  PQXX_DEPRECATED("Use the from_table_t overload instead.") stream_from(
+-  [[deprecated("Use transaction_base::stream instead.")]] stream_from(
++  PQXX_DEPRECATED("Use transaction_base::stream instead.") stream_from(
      transaction_base &tx, std::string_view table) :
            stream_from{tx, from_table, table}
    {}
-@@ -175,14 +175,14 @@ public:
+@@ -182,14 +182,14 @@ public:
  
    /// @deprecated Use factories @ref table or @ref raw_table instead.
    template<typename Columns>
--  [[deprecated("Use the from_table_t overload instead.")]] stream_from(
-+  PQXX_DEPRECATED("Use the from_table_t overload instead.") stream_from(
+-  [[deprecated("Use transaction_base::stream instead.")]] stream_from(
++  PQXX_DEPRECATED("Use transaction_base::stream instead.") stream_from(
      transaction_base &tx, std::string_view table, Columns const &columns) :
            stream_from{tx, from_table, table, columns}
    {}
  
    /// @deprecated Use factories @ref table or @ref raw_table instead.
    template<typename Iter>
--  [[deprecated("Use the from_table_t overload instead.")]] stream_from(
-+  PQXX_DEPRECATED("Use the from_table_t overload instead.") stream_from(
+-  [[deprecated("Use transaction_base::stream instead.")]] stream_from(
++  PQXX_DEPRECATED("Use transaction_base::stream instead.") stream_from(
      transaction_base &, std::string_view table, Iter columns_begin,
      Iter columns_end);
  
diff --git a/external_imported/vcpkg/ports/libpqxx/portfile.cmake b/external_imported/vcpkg/ports/libpqxx/portfile.cmake
index cdbde3f58..da75692fb 100644
--- a/external_imported/vcpkg/ports/libpqxx/portfile.cmake
+++ b/external_imported/vcpkg/ports/libpqxx/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO jtv/libpqxx
-    REF 17e5a6c8ac3abc05329891aaa378bd6004b9c8ee # 7.7.4
-    SHA512 51dc5525e801696b7716e4a4a7d8d794baa5bf7372da62a30e4b602bfb09ff53a4355bfc5e39945636cff018095d2917c9a79181bb3f824091b7780863b0073c
+    REF "${VERSION}"
+    SHA512 ce37fdfce2671d97e422ae3339fb5650065111b0635a7293200c56a8755a7dc7de80806816863c606c46b6049e4cb490d24dfb97446ea0014b55907554862fed
     HEAD_REF master
     PATCHES
         fix_build_with_vs2017.patch
@@ -23,6 +23,6 @@ vcpkg_copy_pdbs()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libpqxx)
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
 
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
 
 vcpkg_fixup_pkgconfig()
diff --git a/external_imported/vcpkg/ports/libpqxx/vcpkg.json b/external_imported/vcpkg/ports/libpqxx/vcpkg.json
index 43e3536c0..29e8aced8 100644
--- a/external_imported/vcpkg/ports/libpqxx/vcpkg.json
+++ b/external_imported/vcpkg/ports/libpqxx/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "libpqxx",
-  "version": "7.7.4",
+  "version": "7.8.1",
   "description": "The official C++ client API for PostgreSQL",
   "homepage": "https://www.postgresql.org/",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/libprotobuf-mutator/portfile.cmake b/external_imported/vcpkg/ports/libprotobuf-mutator/portfile.cmake
index 6ffb602fb..4f79efcd7 100644
--- a/external_imported/vcpkg/ports/libprotobuf-mutator/portfile.cmake
+++ b/external_imported/vcpkg/ports/libprotobuf-mutator/portfile.cmake
@@ -5,8 +5,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/libprotobuf-mutator
-    REF v1.0
-    SHA512 75e423289f938d4332d98033062cd9608b71141b7ca1df4e8f28c927c51a16e7ff2f5bf08867308d2a291fc2422e4456f8928ab2c11d545eeb982ea732baf2e9
+    REF "v${VERSION}"
+    SHA512 cafc59c6c1e26a3e4873ec47f12db290739e98f229a17352c740aa17ac41f1435268eb0c45518b07e5c33280c18da1c4e363a31200569ffe636250e7c904b55e
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/libprotobuf-mutator/vcpkg.json b/external_imported/vcpkg/ports/libprotobuf-mutator/vcpkg.json
index 27feafd7b..8e7a1ad80 100644
--- a/external_imported/vcpkg/ports/libprotobuf-mutator/vcpkg.json
+++ b/external_imported/vcpkg/ports/libprotobuf-mutator/vcpkg.json
@@ -1,9 +1,9 @@
 {
   "name": "libprotobuf-mutator",
-  "version-string": "1.0",
-  "port-version": 1,
+  "version": "1.1",
   "description": "Library for structured fuzzing with protobuffers.",
   "dependencies": [
+    "liblzma",
     "protobuf",
     {
       "name": "vcpkg-cmake",
@@ -12,6 +12,7 @@
     {
       "name": "vcpkg-cmake-config",
       "host": true
-    }
+    },
+    "zlib"
   ]
 }
diff --git a/external_imported/vcpkg/ports/libproxy/fix-install-py.patch b/external_imported/vcpkg/ports/libproxy/fix-install-py.patch
index c4a630b97..6c03602fb 100644
--- a/external_imported/vcpkg/ports/libproxy/fix-install-py.patch
+++ b/external_imported/vcpkg/ports/libproxy/fix-install-py.patch
@@ -6,11 +6,11 @@ index 7c36e51..ee2c5bc 100644
  add_custom_target(PMlibproxy ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Libproxy.pm ${CMAKE_BINARY_DIR}/perl/Net/Libproxy.pm)
 -install( FILES Libproxy.pm DESTINATION ${PX_PERL_ARCH}/Net )
 diff --git a/bindings/perl/src/CMakeLists.txt b/bindings/perl/src/CMakeLists.txt
-index 2800a85..c5d8e0f 100644
+index 29e656d..dec5799 100644
 --- a/bindings/perl/src/CMakeLists.txt
 +++ b/bindings/perl/src/CMakeLists.txt
-@@ -21,5 +21,3 @@ target_link_libraries(PLlibproxy ${PLlibproxy_LIB_DEPENDENCIES})
- target_compile_options(PLlibproxy PRIVATE ${PX_PERL_CCFLAGS})
+@@ -20,5 +20,3 @@ endif()
+ target_link_libraries(PLlibproxy ${PLlibproxy_LIB_DEPENDENCIES})
  set_target_properties(PLlibproxy PROPERTIES OUTPUT_NAME "Libproxy")
  set_target_properties(PLlibproxy PROPERTIES PREFIX "")
 -
diff --git a/external_imported/vcpkg/ports/libproxy/fix-tools-path.patch b/external_imported/vcpkg/ports/libproxy/fix-tools-path.patch
deleted file mode 100644
index ba5061170..000000000
--- a/external_imported/vcpkg/ports/libproxy/fix-tools-path.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/libproxy/cmake/pxmodule.cmk b/libproxy/cmake/pxmodule.cmk
-index bbbd989..956948a 100644
---- a/libproxy/cmake/pxmodule.cmk
-+++ b/libproxy/cmake/pxmodule.cmk
-@@ -20,7 +20,7 @@ function(px_module name build builtin)
-       add_library(${name} MODULE modules/${name}.cpp)
-       target_link_libraries(${name} libproxy)
-       set_target_properties(${name} PROPERTIES PREFIX "")
--      install(TARGETS ${name} LIBRARY DESTINATION ${MODULE_INSTALL_DIR})
-+      install(TARGETS ${name} LIBRARY DESTINATION tools)
-       if(${ARGC} GREATER 3)
-         target_link_libraries(${name} ${ARGN})
-       endif()
-diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
-index 52010c6..0a3f4b5 100644
---- a/utils/CMakeLists.txt
-+++ b/utils/CMakeLists.txt
-@@ -1,5 +1,7 @@
- include_directories("../libproxy")
- 
-+if (BUILD_TOOLS)
- add_executable(proxy proxy.c)
- target_link_libraries(proxy libproxy)
--install(TARGETS proxy RUNTIME DESTINATION ${BIN_INSTALL_DIR})
-+install(TARGETS proxy RUNTIME DESTINATION tools)
-+endif()
-\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/libproxy/portfile.cmake b/external_imported/vcpkg/ports/libproxy/portfile.cmake
index 676425600..e1540a676 100644
--- a/external_imported/vcpkg/ports/libproxy/portfile.cmake
+++ b/external_imported/vcpkg/ports/libproxy/portfile.cmake
@@ -1,11 +1,10 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libproxy/libproxy
-    REF 8fec01ed4b95afc71bf7710bf5b736a5de03b343 #0.4.18
-    SHA512 6367d21b8816d7e5e3c75ee124c230ec89abbffa09538b6700c9ae61be33629f864617f51a2317e18d2fb960b09e26cae0e3503d747112f23921d1910856b109
+    REF "${VERSION}"
+    SHA512 1148d688a9f070273a1a2b110a788561789799089660292bbba59fbf0a9caf7d28cb039a9ccdcb935f752e1e34739b2d2f4c784b1bb3bbaa03d108e7b38a4754
     HEAD_REF master
     PATCHES
-        fix-tools-path.patch
         support-windows.patch
         fix-install-py.patch
         fix-module-lib-name.patch
@@ -38,6 +37,8 @@ vcpkg_cmake_configure(
         WITH_PYTHON3
         WITH_VALA
         MSVC_STATIC
+        BUILD_TOOLS
+        WITH_GNOME3
 )
 
 vcpkg_cmake_install()
@@ -45,9 +46,14 @@ vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/Modules)
 vcpkg_copy_pdbs()
 vcpkg_fixup_pkgconfig()
 
+vcpkg_copy_tools(TOOL_NAMES proxy AUTO_CLEAN)
+
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake"
           "${CMAKE_CURRENT_LIST_DIR}/usage"
           DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
 
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/libproxy/support-windows.patch b/external_imported/vcpkg/ports/libproxy/support-windows.patch
index 1cad01ff4..d49fa2c0a 100644
--- a/external_imported/vcpkg/ports/libproxy/support-windows.patch
+++ b/external_imported/vcpkg/ports/libproxy/support-windows.patch
@@ -29,3 +29,13 @@ index de68e5c..9356486 100644
 -install(TARGETS libproxy DESTINATION ${LIB_INSTALL_DIR})
 +install(TARGETS libproxy RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
  install(FILES   proxy.h  DESTINATION ${INCLUDE_INSTALL_DIR})
+diff --git a/libproxy/cmake/pkgconfig.cmk b/libproxy/cmake/pkgconfig.cmk
+index 89bfc62..ffa0897 100644
+--- a/libproxy/cmake/pkgconfig.cmk
++++ b/libproxy/cmake/pkgconfig.cmk
+@@ -1,4 +1,4 @@
+-if(NOT WIN32 AND NOT APPLE)
++if(NOT WIN32)
+   find_package(PkgConfig)
+
+   # Define our magical px_check_modules function
diff --git a/external_imported/vcpkg/ports/libproxy/usage b/external_imported/vcpkg/ports/libproxy/usage
index a37b13c5a..2a8d88486 100644
--- a/external_imported/vcpkg/ports/libproxy/usage
+++ b/external_imported/vcpkg/ports/libproxy/usage
@@ -1,5 +1,5 @@
 The package libproxy provides CMake targets:
 
-    find_package(libproxy CONFIG REQUIRED)
+    find_package(libproxy REQUIRED)
     target_include_directories(main PRIVATE ${LIBPROXY_INCLUDE_DIR})
     target_link_libraries(main PRIVATE ${LIBPROXY_LIBRARIES})
diff --git a/external_imported/vcpkg/ports/libproxy/vcpkg.json b/external_imported/vcpkg/ports/libproxy/vcpkg.json
index 75752ab39..0a2624508 100644
--- a/external_imported/vcpkg/ports/libproxy/vcpkg.json
+++ b/external_imported/vcpkg/ports/libproxy/vcpkg.json
@@ -1,11 +1,11 @@
 {
   "name": "libproxy",
   "version": "0.4.18",
-  "port-version": 1,
+  "port-version": 3,
   "description": "libproxy is a library that provides automatic proxy configuration management.",
   "homepage": "https://github.com/libproxy/libproxy",
   "license": "LGPL-2.1-only",
-  "supports": "!uwp",
+  "supports": "!(uwp | xbox | android)",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/libqcow/vcpkg.json b/external_imported/vcpkg/ports/libqcow/vcpkg.json
index 5a7cdc406..007db5163 100644
--- a/external_imported/vcpkg/ports/libqcow/vcpkg.json
+++ b/external_imported/vcpkg/ports/libqcow/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "libqcow",
   "version": "20221124",
+  "port-version": 1,
   "description": "Library and tools to access the QEMU Copy-On-Write (QCOW) image format.",
   "homepage": "https://github.com/libyal/libqcow",
   "license": "LGPL-3.0-or-later",
-  "supports": "!uwp",
+  "supports": "!uwp & !xbox",
   "dependencies": [
     "gettext",
     "openssl",
diff --git a/external_imported/vcpkg/ports/libqglviewer/Add-compile-definitions.patch b/external_imported/vcpkg/ports/libqglviewer/Add-compile-definitions.patch
new file mode 100644
index 000000000..addf619c2
--- /dev/null
+++ b/external_imported/vcpkg/ports/libqglviewer/Add-compile-definitions.patch
@@ -0,0 +1,23 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -58,9 +58,19 @@
+    "${PROJECT_SOURCE_DIR}/QGLViewer/quaternion.cpp"
+    "${PROJECT_SOURCE_DIR}/QGLViewer/saveSnapshot.cpp"
+    "${PROJECT_SOURCE_DIR}/QGLViewer/vec.cpp")
+-add_library(QGLViewer SHARED ${QGLViewer_SRC})
++add_library(QGLViewer ${QGLViewer_SRC})
+ target_include_directories(QGLViewer INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
+ target_link_libraries(QGLViewer PRIVATE ${QtLibs} OpenGL::GL OpenGL::GLU)
++if(MSVC)
++  target_compile_definitions(QGLViewer PRIVATE NOMINMAX)
++endif()
++if(WIN32)
++  if(BUILD_SHARED_LIBS)
++    target_compile_definitions(QGLViewer PRIVATE CREATE_QGLVIEWER_DLL)
++  else()
++    target_compile_definitions(QGLViewer PUBLIC QGLVIEWER_STATIC)
++  endif()
++endif()
+ 
+ # Example: animation.
+ set(animation_SRC
diff --git a/external_imported/vcpkg/ports/libqglviewer/Fix-error-c2039.patch b/external_imported/vcpkg/ports/libqglviewer/Fix-error-c2039.patch
new file mode 100644
index 000000000..629380dc6
--- /dev/null
+++ b/external_imported/vcpkg/ports/libqglviewer/Fix-error-c2039.patch
@@ -0,0 +1,52 @@
+diff --git a/QGLViewer/VRender/NVector3.h b/QGLViewer/VRender/NVector3.h
+index 40b7f98..f2d8305 100644
+--- a/QGLViewer/VRender/NVector3.h
++++ b/QGLViewer/VRender/NVector3.h
+@@ -7,6 +7,8 @@
+ namespace vrender
+ {
+   class Vector3;
++  class NVector3;
++  std::ostream& operator<<(std::ostream &out,const NVector3 &u);
+ 
+   class NVector3
+   {
+diff --git a/QGLViewer/VRender/Primitive.h b/QGLViewer/VRender/Primitive.h
+index 88ab11d..d38470d 100644
+--- a/QGLViewer/VRender/Primitive.h
++++ b/QGLViewer/VRender/Primitive.h
+@@ -21,6 +21,7 @@ namespace vrender
+ {
+ 	class Feedback3DColor ;
+ 	class Primitive ;
++    std::ostream& operator<<(std::ostream&, const Feedback3DColor&) ;
+ 
+ #define EPS_SMOOTH_LINE_FACTOR 0.06  /* Lower for better smooth lines. */
+ 
+diff --git a/QGLViewer/VRender/Vector2.h b/QGLViewer/VRender/Vector2.h
+index f6aaaf3..7b9b82a 100644
+--- a/QGLViewer/VRender/Vector2.h
++++ b/QGLViewer/VRender/Vector2.h
+@@ -6,7 +6,9 @@
+ 
+ namespace vrender
+ {
++  class Vector2;
+   class Vector3;
++  std::ostream& operator<< (std::ostream&,const Vector2&);
+ 
+   class Vector2
+ 	{
+diff --git a/QGLViewer/VRender/Vector3.h b/QGLViewer/VRender/Vector3.h
+index 32597e8..f6d5099 100644
+--- a/QGLViewer/VRender/Vector3.h
++++ b/QGLViewer/VRender/Vector3.h
+@@ -10,6 +10,8 @@
+ namespace vrender
+ {
+   class NVector3;
++  class Vector3;
++  std::ostream& operator<< (std::ostream&, const Vector3&);
+ 
+ 	class Vector3
+ 	{
diff --git a/external_imported/vcpkg/ports/libqglviewer/destdir.patch b/external_imported/vcpkg/ports/libqglviewer/destdir.patch
deleted file mode 100644
index d1cd4f3cc..000000000
--- a/external_imported/vcpkg/ports/libqglviewer/destdir.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/QGLViewer/QGLViewer.pro b/QGLViewer/QGLViewer.pro
-index 263a141..51e3359 100644
---- a/QGLViewer/QGLViewer.pro
-+++ b/QGLViewer/QGLViewer.pro
-@@ -38,7 +38,6 @@ SOURCES = \
- 
- HEADERS *= $${QGL_HEADERS}
- DISTFILES *= qglviewer-icon.xpm
--DESTDIR = $${PWD}
- 
- TRANSLATIONS = qglviewer_fr.ts
- 
-@@ -273,7 +272,7 @@ win32 {
- 		QMAKE_CXXFLAGS *= -TP -GR
- 		DEFINES += NOMINMAX
- 		win32-msvc {
--			QMAKE_CXXFLAGS *= -EHs -FS
-+			QMAKE_CXXFLAGS *= -EHs -FS
- 		} else {
- 			QMAKE_CXXFLAGS *= -EHs
- 		}
diff --git a/external_imported/vcpkg/ports/libqglviewer/portfile.cmake b/external_imported/vcpkg/ports/libqglviewer/portfile.cmake
index 0c46c11c2..d8c64a1fd 100644
--- a/external_imported/vcpkg/ports/libqglviewer/portfile.cmake
+++ b/external_imported/vcpkg/ports/libqglviewer/portfile.cmake
@@ -1,24 +1,21 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO GillesDebunne/libQGLViewer
-    REF fee0916f2af3d0993df51956d2e5a51bbaf0c1f0 #v2.7.2
-    SHA512 449bf4ccadaf50d4333bd91050e9b50f440a64229391827aaf4a80ade2c3f5fc60501d2baee885cf1214f7e2a8a04615bafe9ac7da9f866ffa4ebe33b9b999d8
-    HEAD_REF master
+    REF "v${VERSION}"
+    SHA512 09bfc5c0f07e51625a9af0094b83f40f84ead55a67c6e492c9702521f58c6b461bc840382fb73b64d16ad71a0a2a75d04aa12a77a78ced0a19e0e784e8d36bd7
     PATCHES
-        use-default-config-on-all-platforms.patch
-        destdir.patch
+        Add-compile-definitions.patch
+        Fix-error-c2039.patch #https://github.com/GillesDebunne/libQGLViewer/pull/80
 )
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    set(OPTIONS CONFIG*=staticlib)
-endif()
-
-vcpkg_configure_qmake(
-    SOURCE_PATH ${SOURCE_PATH}/QGLViewer/QGLViewer.pro
-    OPTIONS ${OPTIONS}
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
 )
 
-vcpkg_install_qmake()
+vcpkg_cmake_install()
+
+vcpkg_fixup_pkgconfig()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL ${SOURCE_PATH}/QGLViewer DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN "*.h")
-file(INSTALL ${SOURCE_PATH}/LICENCE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libqglviewer RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENCE")
diff --git a/external_imported/vcpkg/ports/libqglviewer/use-default-config-on-all-platforms.patch b/external_imported/vcpkg/ports/libqglviewer/use-default-config-on-all-platforms.patch
deleted file mode 100644
index bd8281f22..000000000
--- a/external_imported/vcpkg/ports/libqglviewer/use-default-config-on-all-platforms.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/QGLViewer/QGLViewer.pro b/QGLViewer/QGLViewer.pro
-index e0205e5..6db4c81 100644
---- a/QGLViewer/QGLViewer.pro
-+++ b/QGLViewer/QGLViewer.pro
-@@ -108,9 +108,6 @@ contains( DEFINES, NO_VECTORIAL_RENDER ) {
- # --  U n i x  --
- # ---------------
- unix {
--	CONFIG -= debug debug_and_release
--	CONFIG *= release
--
- 	# INCLUDE_DIR and LIB_DIR specify where to install the include files and the library.
- 	# Use qmake INCLUDE_DIR=... LIB_DIR=... , or qmake PREFIX=... to customize your installation.
- 	isEmpty( PREFIX ) {
-@@ -250,9 +247,6 @@ macx|darwin-g++ {
- # --  W i n d o w s  --
- # ---------------------
- win32 {
--	# Windows requires a debug lib version to link against debug applications
--	CONFIG *= debug_and_release build_all
--
- 	# Needed by Intel C++, (icl.exe) so that WINGDIAPI is a defined symbol in gl.h.
- 	DEFINES *= WIN32
- 
-@@ -279,7 +273,7 @@ win32 {
- 		QMAKE_CXXFLAGS *= -TP -GR
- 		DEFINES += NOMINMAX
- 		win32-msvc {
--			QMAKE_CXXFLAGS *= -EH -FS
-+			QMAKE_CXXFLAGS *= -EHs -FS
- 		} else {
- 			QMAKE_CXXFLAGS *= -EHs
- 		}
diff --git a/external_imported/vcpkg/ports/libqglviewer/vcpkg.json b/external_imported/vcpkg/ports/libqglviewer/vcpkg.json
index 048875292..11cbb9890 100644
--- a/external_imported/vcpkg/ports/libqglviewer/vcpkg.json
+++ b/external_imported/vcpkg/ports/libqglviewer/vcpkg.json
@@ -1,12 +1,19 @@
 {
   "name": "libqglviewer",
-  "version-string": "2.7.2",
-  "port-version": 4,
+  "version": "2.9.1",
+  "port-version": 2,
   "description": "libQGLViewer is an open source C++ library based on Qt that eases the creation of OpenGL 3D viewers.",
+  "homepage": "http://libqglviewer.com/",
+  "license": "GPL-2.0-or-later",
+  "supports": "!xbox",
   "dependencies": [
     {
-      "name": "qt5-base",
+      "name": "qtbase",
       "default-features": false
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/libqtrest/portfile.cmake b/external_imported/vcpkg/ports/libqtrest/portfile.cmake
new file mode 100644
index 000000000..f518909e0
--- /dev/null
+++ b/external_imported/vcpkg/ports/libqtrest/portfile.cmake
@@ -0,0 +1,35 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO qtrest/qtrest
+    REF ${VERSION}
+    SHA512 2bdbbdde7c4f7a27943c93a2a26abe89e087e6b7c32d0e481422a8ad3e78c66c6921ef00c1cbf17f3b61db8a678685371c819218d10576ac9ec1548262415c04	
+    HEAD_REF master
+)
+
+if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    set(BUILD_TYPE SHARED)
+else()
+    set(BUILD_TYPE STATIC)
+endif()
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        qml WITH_QML_SUPPORT
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_TYPE=${BUILD_TYPE}
+        -DBUILD_EXAMPLE=0
+        ${FEATURE_OPTIONS}
+)
+
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
diff --git a/external_imported/vcpkg/ports/libqtrest/vcpkg.json b/external_imported/vcpkg/ports/libqtrest/vcpkg.json
new file mode 100644
index 000000000..4ba8ac6a4
--- /dev/null
+++ b/external_imported/vcpkg/ports/libqtrest/vcpkg.json
@@ -0,0 +1,29 @@
+{
+  "name": "libqtrest",
+  "version": "0.4.0",
+  "description": "Small and simple REST API (Json/Xml) client for any Qt/QML C++ application",
+  "homepage": "https://github.com/qtrest/qtrest",
+  "license": "MIT",
+  "supports": "!uwp",
+  "dependencies": [
+    {
+      "name": "qt5-base",
+      "default-features": false
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ],
+  "features": {
+    "qml": {
+      "description": "Enable QML support to compile with required dependencies",
+      "dependencies": [
+        {
+          "name": "qt5-declarative",
+          "default-features": false
+        }
+      ]
+    }
+  }
+}
diff --git a/external_imported/vcpkg/ports/libraqm/CMakeLists.txt b/external_imported/vcpkg/ports/libraqm/CMakeLists.txt
index 9ad1db64a..5ae36d9d7 100644
--- a/external_imported/vcpkg/ports/libraqm/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/libraqm/CMakeLists.txt
@@ -35,4 +35,4 @@ install(TARGETS raqm
 set(RAQM_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src")
 set(RAQM_LIBRARY raqm)
 set(RAQM_LIBRARIES ${HARFBUZZ_LIBRARY} ${FRIBIDI_LIBRARY} ${RAQM_LIBRARY})
-file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/src/raqm.h ${CMAKE_CURRENT_BINARY_DIR}/src/raqm-version.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/raqm.h ${CMAKE_CURRENT_BINARY_DIR}/src/raqm-version.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
diff --git a/external_imported/vcpkg/ports/libraqm/portfile.cmake b/external_imported/vcpkg/ports/libraqm/portfile.cmake
index f871328e0..84d967ff4 100644
--- a/external_imported/vcpkg/ports/libraqm/portfile.cmake
+++ b/external_imported/vcpkg/ports/libraqm/portfile.cmake
@@ -1,19 +1,19 @@
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 set(RAQM_VERSION_MAJOR 0)
-set(RAQM_VERSION_MINOR 9)
-set(RAQM_VERSION_MICRO 0)
+set(RAQM_VERSION_MINOR 10)
+set(RAQM_VERSION_MICRO 1)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO HOST-Oman/libraqm
     REF v${RAQM_VERSION_MAJOR}.${RAQM_VERSION_MINOR}.${RAQM_VERSION_MICRO}
-    SHA512 a45c442a087c806143e5a96878e1d84a31afb7b682d71931fcb014c8d56b974d5a0d6186b163067d44a15952b3c549763f84354ed799f20473795f15d719f060
+    SHA512 d35fd37764c153235ad89721be7a2a11212c1d3241383d81499ca5fe83e90d625e29e42a00edd626bff78bd0f72209f36826c84f59cd1504258079ed532329b6
     HEAD_REF master
 )
 
-file(COPY ${CURRENT_PORT_DIR}/FindFribidi.cmake DESTINATION ${SOURCE_PATH})
-file(COPY ${CURRENT_PORT_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY "${CURRENT_PORT_DIR}/FindFribidi.cmake" DESTINATION "${SOURCE_PATH}")
+file(COPY "${CURRENT_PORT_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
 vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
@@ -29,4 +29,5 @@ vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libraqm RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
+
diff --git a/external_imported/vcpkg/ports/libraqm/vcpkg.json b/external_imported/vcpkg/ports/libraqm/vcpkg.json
index 34fd9966b..3401c2bea 100644
--- a/external_imported/vcpkg/ports/libraqm/vcpkg.json
+++ b/external_imported/vcpkg/ports/libraqm/vcpkg.json
@@ -1,7 +1,8 @@
 {
   "name": "libraqm",
-  "version-string": "0.9.0",
+  "version": "0.10.1",
   "description": "A library for complex text layout",
+  "homepage": "https://github.com/HOST-Oman/libraqm",
   "dependencies": [
     "freetype",
     "fribidi",
diff --git a/external_imported/vcpkg/ports/libraw/install-interface.patch b/external_imported/vcpkg/ports/libraw/install-interface.patch
new file mode 100644
index 000000000..065df7586
--- /dev/null
+++ b/external_imported/vcpkg/ports/libraw/install-interface.patch
@@ -0,0 +1,32 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 484e76b..adbcd10 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -111,6 +111,9 @@ if(MSVC)
+     add_definitions(-D_AFX_SECURE_NO_WARNINGS)
+ endif()
+ 
++# For variables in $<INSTALL_INTERFACE:...>
++include(GNUInstallDirs)
++
+ # -- Check dependencies --------------------------------------------------------------------------------
+ 
+ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH} )
+@@ -489,7 +492,7 @@ endif()
+ 
+ target_include_directories(raw
+         PUBLIC
+-            $<INSTALL_INTERFACE:libraw>
++            $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/libraw>
+             $<BUILD_INTERFACE:${LIBRAW_PATH}>)
+ 
+ target_link_libraries(raw PUBLIC ${MATH_LIBRARY})
+@@ -558,7 +561,7 @@ set_target_properties(raw_r PROPERTIES POSITION_INDEPENDENT_CODE ON)
+ target_link_libraries(raw_r PUBLIC ${MATH_LIBRARY})
+ target_include_directories(raw_r
+         PUBLIC
+-        $<INSTALL_INTERFACE:libraw>
++        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/libraw>
+         $<BUILD_INTERFACE:${LIBRAW_PATH}>)
+ 
+ if(WIN32)
diff --git a/external_imported/vcpkg/ports/libraw/portfile.cmake b/external_imported/vcpkg/ports/libraw/portfile.cmake
index 4969ed466..34c53024a 100644
--- a/external_imported/vcpkg/ports/libraw/portfile.cmake
+++ b/external_imported/vcpkg/ports/libraw/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO LibRaw/LibRaw
     REF "${VERSION}"
-    SHA512 6cea6d859961d713382a9017107c730c7a8777be85d454bd05f1417a69fda902aa9591151eac5f4bd231ce2a86fc39da56e3a024104101f24d6069197fcabbc7
+    SHA512 a8b0ec275cc0055d6eb2069008c3312ae007cd86e481111f68d5d60544afcd76b728f8418bf63a80d35d7d00283536da63e03f5eecb4cc28f4cc8d92070e8b39
     HEAD_REF master
 )
 
@@ -14,6 +14,7 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
         dependencies.patch
+        install-interface.patch
         # Move the non-thread-safe library to manual-link. This is unfortunately needed
         # because otherwise libraries that build on top of libraw have to choose.
         fix-install.patch
diff --git a/external_imported/vcpkg/ports/libraw/vcpkg.json b/external_imported/vcpkg/ports/libraw/vcpkg.json
index 48cf4134e..f45b3ff64 100644
--- a/external_imported/vcpkg/ports/libraw/vcpkg.json
+++ b/external_imported/vcpkg/ports/libraw/vcpkg.json
@@ -1,12 +1,15 @@
 {
   "name": "libraw",
-  "version": "0.21.1",
+  "version": "0.21.2",
   "description": "raw image decoder library",
   "homepage": "https://www.libraw.org",
   "license": "LGPL-2.1-only OR CDDL-1.0",
-  "supports": "!uwp",
+  "supports": "!uwp & !xbox",
   "dependencies": [
-    "jasper",
+    {
+      "name": "jasper",
+      "default-features": false
+    },
     "lcms",
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/librdkafka/fix_curl.patch b/external_imported/vcpkg/ports/librdkafka/fix_curl.patch
deleted file mode 100644
index 7d81ccf15..000000000
--- a/external_imported/vcpkg/ports/librdkafka/fix_curl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 37b43c4..106fe38 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -213,6 +213,11 @@ if(WITH_ZLIB)
-   target_link_libraries(rdkafka PUBLIC ZLIB::ZLIB)
- endif()
- 
-+if(WITH_CURL)
-+  find_package(CURL CONFIG REQUIRED)
-+  target_link_libraries(rdkafka PUBLIC CURL::libcurl)
-+endif()
-+
- if(WITH_ZSTD)
-   target_link_libraries(rdkafka PRIVATE ${ZSTD_LIBRARY})
-   target_include_directories(rdkafka PRIVATE ${ZSTD_INCLUDE_DIR})
-@@ -296,7 +301,7 @@ if(NOT RDKAFKA_BUILD_STATIC)
-   set(PKG_CONFIG_DESCRIPTION "The Apache Kafka C/C++ library")
- 
-   if(WITH_CURL)
--    string(APPEND PKG_CONFIG_REQUIRES "curl ")
-+    string(APPEND PKG_CONFIG_REQUIRES "libcurl ")
-   endif()
- 
-   if(WITH_ZLIB)
diff --git a/external_imported/vcpkg/ports/librdkafka/portfile.cmake b/external_imported/vcpkg/ports/librdkafka/portfile.cmake
index c28963f3a..44f116e23 100644
--- a/external_imported/vcpkg/ports/librdkafka/portfile.cmake
+++ b/external_imported/vcpkg/ports/librdkafka/portfile.cmake
@@ -1,12 +1,11 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO edenhill/librdkafka
-    REF v2.0.2
-    SHA512 b1f5bc7bb998051275f1bfa43b67dd3d830349a87906828a90149375ac66c2a04e769454d0eb0ec91f712132814bcc328c49c4247872977272932849de83d98e
+    REF "v${VERSION}"
+    SHA512 a68b7382ec5a9afc0eb8513e97d8563c599021d774f7790a61af80565600678a497e4957dcdd823f8b9a426a19b9c5392cacd42d02d70493d993319f3343fe96
     HEAD_REF master
     PATCHES
         lz4.patch
-        fix_curl.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" RDKAFKA_BUILD_STATIC)
diff --git a/external_imported/vcpkg/ports/librdkafka/vcpkg.json b/external_imported/vcpkg/ports/librdkafka/vcpkg.json
index 264bdce65..c598545c5 100644
--- a/external_imported/vcpkg/ports/librdkafka/vcpkg.json
+++ b/external_imported/vcpkg/ports/librdkafka/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "librdkafka",
-  "version": "2.0.2",
+  "version": "2.3.0",
   "description": "The Apache Kafka C/C++ library",
   "homepage": "https://github.com/edenhill/librdkafka",
   "license": null,
diff --git a/external_imported/vcpkg/ports/libredwg/vcpkg.json b/external_imported/vcpkg/ports/libredwg/vcpkg.json
index 8843498f6..841af79d2 100644
--- a/external_imported/vcpkg/ports/libredwg/vcpkg.json
+++ b/external_imported/vcpkg/ports/libredwg/vcpkg.json
@@ -1,9 +1,11 @@
 {
   "name": "libredwg",
   "version": "0.12.5.5178",
+  "port-version": 1,
   "description": "GNU LibreDWG is a free C library to handle DWG files. It aims to be a free replacement for the OpenDWG libraries. DWG is the native file format of AutoCAD.",
   "homepage": "https://www.gnu.org/software/libredwg/",
   "license": "GPL-3.0",
+  "supports": "!xbox",
   "dependencies": [
     "jsmn",
     {
diff --git a/external_imported/vcpkg/ports/libremidi/portfile.cmake b/external_imported/vcpkg/ports/libremidi/portfile.cmake
new file mode 100644
index 000000000..455f1caba
--- /dev/null
+++ b/external_imported/vcpkg/ports/libremidi/portfile.cmake
@@ -0,0 +1,27 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO jcelerier/libremidi
+    REF "v${VERSION}"
+    SHA512 899528b10dcc26321f9c5cd00fd3e8bee19b6e1adc56bc8f213760d91137faee36cd545285e20b93ee6996b330b6c2d98975d000624e3897dfe4036549361d70
+    HEAD_REF master
+)
+
+vcpkg_list(SET options)
+if(VCPKG_TARGET_IS_LINUX)
+    vcpkg_list(APPEND options -DLIBREMIDI_NO_ALSA=OFF)
+else()
+    vcpkg_list(APPEND options -DLIBREMIDI_NO_ALSA=ON)
+endif()
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        ${options}
+        -DLIBREMIDI_NO_BOOST=ON
+        -DLIBREMIDI_NO_JACK=ON
+)
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
diff --git a/external_imported/vcpkg/ports/libremidi/vcpkg.json b/external_imported/vcpkg/ports/libremidi/vcpkg.json
new file mode 100644
index 000000000..850d3282b
--- /dev/null
+++ b/external_imported/vcpkg/ports/libremidi/vcpkg.json
@@ -0,0 +1,21 @@
+{
+  "name": "libremidi",
+  "version": "4.3.0",
+  "description": "A modern C++ MIDI real-time & file I/O library",
+  "homepage": "https://github.com/jcelerier/libremidi",
+  "license": "BSD-2-Clause",
+  "dependencies": [
+    {
+      "name": "alsa",
+      "platform": "linux"
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/libressl/0001-enable-ocspcheck-on-msvc.patch b/external_imported/vcpkg/ports/libressl/0001-enable-ocspcheck-on-msvc.patch
index 05444ca3e..6ae51b3dd 100644
--- a/external_imported/vcpkg/ports/libressl/0001-enable-ocspcheck-on-msvc.patch
+++ b/external_imported/vcpkg/ports/libressl/0001-enable-ocspcheck-on-msvc.patch
@@ -1,16 +1,10 @@
 diff --git a/apps/ocspcheck/CMakeLists.txt b/apps/ocspcheck/CMakeLists.txt
-index 2dddb6e..fd35685 100644
+index 9cf7a8b..67ace03 100644
 --- a/apps/ocspcheck/CMakeLists.txt
 +++ b/apps/ocspcheck/CMakeLists.txt
-@@ -1,5 +1,3 @@
--if(NOT MSVC)
--
- set(
- 	OCSPCHECK_SRC
- 	http.c
-@@ -13,13 +11,27 @@ else()
-         set(OCSPCHECK_SRC ${OCSPCHECK_SRC} compat/memmem.c)
- endif()
+@@ -4,6 +4,20 @@ set(
+ 	ocspcheck.c
+ )
  
 +check_function_exists(getopt HAVE_GETOPT)
 +if(HAVE_GETOPT)
@@ -26,23 +20,33 @@ index 2dddb6e..fd35685 100644
 +	set(FTRUNCATE_SRC compat/ftruncate.c)
 +endif()
 +
- if(NOT "${OPENSSLDIR}" STREQUAL "")
- 	add_definitions(-DDEFAULT_CA_FILE=\"${OPENSSLDIR}/cert.pem\")
- else()
+ check_function_exists(memmem HAVE_MEMMEM)
+ if(HAVE_MEMMEM)
+ 	add_definitions(-DHAVE_MEMMEM)
+@@ -17,7 +31,7 @@ else()
  	add_definitions(-DDEFAULT_CA_FILE=\"${CMAKE_INSTALL_PREFIX}/etc/ssl/cert.pem\")
  endif()
  
 -add_executable(ocspcheck ${OCSPCHECK_SRC})
 +add_executable(ocspcheck ${OCSPCHECK_SRC} ${GETOPT_SRC} ${FTRUNCATE_SRC})
- target_include_directories(ocspcheck PUBLIC ../../include)
- target_include_directories(ocspcheck PRIVATE . ./compat ../../include/compat)
- target_link_libraries(ocspcheck tls ${OPENSSL_LIBS})
-@@ -29,5 +41,3 @@ if(ENABLE_LIBRESSL_INSTALL)
- 	install(FILES ocspcheck.8 DESTINATION ${CMAKE_INSTALL_MANDIR}/man8)
+ target_include_directories(ocspcheck
+ 	PRIVATE
+ 		../../include/compat
+diff --git a/apps/ocspcheck/ocspcheck.c b/apps/ocspcheck/ocspcheck.c
+index 516642b..3afb68b 100644
+--- a/apps/ocspcheck/ocspcheck.c
++++ b/apps/ocspcheck/ocspcheck.c
+@@ -561,6 +561,10 @@ main(int argc, char **argv)
+ 	ssize_t written, w;
+ 	short port;
  
- endif(ENABLE_LIBRESSL_INSTALL)
--
--endif()
++#ifndef HAVE_GETOPT
++#include "getopt.h"
++#endif
++
+ 	while ((ch = getopt(argc, argv, "C:i:No:v")) != -1) {
+ 		switch (ch) {
+ 		case 'C':
 diff --git a/apps/ocspcheck/compat/ftruncate.c b/apps/ocspcheck/compat/ftruncate.c
 new file mode 100644
 index 0000000..e825e50
@@ -225,30 +229,3 @@ index 0000000..ada142e
 +
 +#endif
 \ No newline at end of file
-diff --git a/apps/ocspcheck/ocspcheck.c b/apps/ocspcheck/ocspcheck.c
-index 551a8fa..c608578 100644
---- a/apps/ocspcheck/ocspcheck.c
-+++ b/apps/ocspcheck/ocspcheck.c
-@@ -519,6 +519,10 @@ main(int argc, char **argv)
- 	ssize_t written, w;
- 	short port;
- 
-+#ifndef HAVE_GETOPT
-+#include "getopt.h"
-+#endif
-+
- 	while ((ch = getopt(argc, argv, "C:i:No:v")) != -1) {
- 		switch (ch) {
- 		case 'C':
-diff --git a/include/compat/unistd.h b/include/compat/unistd.h
-index f521b94..f11db44 100644
---- a/include/compat/unistd.h
-+++ b/include/compat/unistd.h
-@@ -23,6 +23,7 @@ ssize_t pwrite(int d, const void *buf, size_t nbytes, off_t offset);
- #include <io.h>
- #include <process.h>
- 
-+#define STDIN_FILENO    0
- #define STDOUT_FILENO   1
- #define STDERR_FILENO   2
- 
diff --git a/external_imported/vcpkg/ports/libressl/0002-suppress-msvc-warnings.patch b/external_imported/vcpkg/ports/libressl/0002-suppress-msvc-warnings.patch
index 79d756622..28d76c9aa 100644
--- a/external_imported/vcpkg/ports/libressl/0002-suppress-msvc-warnings.patch
+++ b/external_imported/vcpkg/ports/libressl/0002-suppress-msvc-warnings.patch
@@ -1,47 +1,45 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a6a7554..b20fd4b 100644
+index 2f0dfa0..594c56f 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -111,6 +111,11 @@ if(WIN32)
- 	set(PLATFORM_LIBS ${PLATFORM_LIBS} ws2_32 bcrypt)
+@@ -136,6 +136,10 @@ if(WIN32)
+ 	endif()
+ 	set(PLATFORM_LIBS ${PLATFORM_LIBS} ws2_32 ntdll bcrypt)
  endif()
- 
 +if(MSVC AND MSVC_VERSION GREATER_EQUAL 1912)
 +	message(STATUS "Setting /Qspectre switch")
 +	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Qspectre")
 +endif()
-+
+ 
  if(MSVC)
  	add_definitions(-Dinline=__inline)
- 	message(STATUS "Using [${CMAKE_C_COMPILER_ID}] compiler")
-@@ -123,16 +128,29 @@ if(MSVC)
+@@ -149,16 +153,29 @@ if(MSVC)
  			"C4127" # conditional expression is constant
  			"C4146" # unary minus operator applied to unsigned type,
- 				# result still unsigned
+ 			        # result still unsigned
 +			"C4242" # 'identifier' : conversion from 'type1' to 'type2',
-+				# possible loss of data
++				    # possible loss of data
  			"C4244" # 'argument' : conversion from 'type1' to 'type2',
- 				# possible loss of data
+ 			        # possible loss of data
  			"C4245" # 'conversion' : conversion from 'type1' to 'type2',
- 				# signed/unsigned mismatch
+ 			        # signed/unsigned mismatch
 +			"C4255" # 'function' : no function prototype given:
-+				# converting '()' to '(void)'
++                    # converting '()' to '(void)'
  			"C4267" # 'var' : conversion from 'size_t' to 'type',
- 				# possible loss of data
+ 			        # possible loss of data
 +			"C4388" # 'expression': signed/unsigned mismatch
  			"C4389" # 'operator' : signed/unsigned mismatch
 +			"C4464" # relative include path contains '..'
 +			"C4668" # 'symbol' is not defined as a preprocessor macro,
-+				# replacing with '0' for 'directives'
++                    # replacing with '0' for 'directives'
  			"C4706" # assignment within conditional expression
 +			"C4710" # 'function' : function not inlined
 +			"C4711" # function 'function' selected for inline expansion
 +			"C4820" # 'bytes' bytes padding added after construct 'member_name'
  			"C4996" # The POSIX name for this item is deprecated.
- 				# Instead, use the ISO C and C++ conformant name
+ 			        # Instead, use the ISO C and C++ conformant name
 +			"C5045" # Compiler will insert Spectre mitigation for memory load
-+				# if /Qspectre switch specified
++                    # if /Qspectre switch specified
  		)
  	elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
  		add_definitions(-D_CRT_SUPPRESS_RESTRICT)
-
diff --git a/external_imported/vcpkg/ports/libressl/portfile.cmake b/external_imported/vcpkg/ports/libressl/portfile.cmake
index e6ec383d5..fe9a826fa 100644
--- a/external_imported/vcpkg/ports/libressl/portfile.cmake
+++ b/external_imported/vcpkg/ports/libressl/portfile.cmake
@@ -9,7 +9,7 @@ vcpkg_download_distfile(
     URLS "https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${PORT}-${VERSION}.tar.gz"
          "https://ftp.fau.de/openbsd/LibreSSL/${PORT}-${VERSION}.tar.gz"
     FILENAME "${PORT}-${VERSION}.tar.gz"
-    SHA512 8fc81e05d1c9f9259d06508ca97d5a1ba5d46b857088c273c20e6b242921f7eac58a1136564ad9831c923758ee63f7b0897c8c6c7b1e53ab8132a995cc559aeb
+    SHA512 81765174fdd60223529182fab96249a28978c1d02b5894313d9b0b3aa365a1da2f7e5906403ab368114bdcba2fa861d1ad69b752f8344e6ea61d44666b483122
 )
 
 vcpkg_extract_source_archive(
@@ -58,10 +58,6 @@ vcpkg_copy_pdbs()
 
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
 
-if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
-    file(GLOB_RECURSE LIBS "${CURRENT_PACKAGES_DIR}/*.lib")
-    foreach(LIB ${LIBS})
-        string(REGEX REPLACE "(.+)-[0-9]+\\.lib" "\\1.lib" LINK "${LIB}")
-        file(CREATE_LINK "${LIB}" "${LINK}")
-    endforeach()
-endif()
+vcpkg_fixup_pkgconfig()
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/LibreSSL")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
diff --git a/external_imported/vcpkg/ports/libressl/vcpkg.json b/external_imported/vcpkg/ports/libressl/vcpkg.json
index bd1c0cdab..ca9456f0c 100644
--- a/external_imported/vcpkg/ports/libressl/vcpkg.json
+++ b/external_imported/vcpkg/ports/libressl/vcpkg.json
@@ -1,13 +1,16 @@
 {
   "name": "libressl",
-  "version": "3.6.2",
+  "version": "3.8.2",
   "description": "LibreSSL is a version of the TLS/crypto stack forked from OpenSSL in 2014, with goals of modernizing the codebase, improving security, and applying best practice development processes.",
   "license": "ISC",
-  "supports": "!(uwp | arm)",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
       "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
     }
   ],
   "features": {
diff --git a/external_imported/vcpkg/ports/librsvg/CMakeLists.txt b/external_imported/vcpkg/ports/librsvg/CMakeLists.txt
index 13c319486..36efa65bc 100644
--- a/external_imported/vcpkg/ports/librsvg/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/librsvg/CMakeLists.txt
@@ -1,22 +1,38 @@
 cmake_minimum_required(VERSION 3.11)
 project(librsvg C)
 
-find_package(unofficial-libcroco CONFIG REQUIRED)
-find_package(PkgConfig REQUIRED)
-pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 gmodule-2 gio-2 IMPORTED_TARGET)
-pkg_check_modules(CAIRO cairo IMPORTED_TARGET)
-pkg_check_modules(GDK_PIXBUF gdk-pixbuf-2.0 IMPORTED_TARGET)
-pkg_check_modules(PANGO pango pangocairo IMPORTED_TARGET)
-find_package(LibXml2 REQUIRED)
-if(CMAKE_SYSTEM_NAME MATCHES "Windows")
-elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
-else()
-    pkg_check_modules(PANGO2 pangoft2 pangofc IMPORTED_TARGET)
-    set(PANGO_FT2_LIB PkgConfig::PANGO2)
+set(RSVG_API_MAJOR_VERSION 2)
+set(RSVG_API_VERSION "2.0")
+Set(VERSION "2.40.20")
+set(LIBRSVG_TARGET "rsvg-${RSVG_API_MAJOR_VERSION}")
+
+Set(prefix "${CMAKE_INSTALL_PREFIX}")
+Set(exec_prefix "\${prefix}")
+Set(libdir "\${prefix}/lib")
+Set(includedir "\${prefix}/include")
+
+# Public required modules (cf. headers and librsvg.pc)
+set(librsvg_pc_requires glib-2.0 gio-2.0 gdk-pixbuf-2.0 cairo)
+# Other required modules from configure.ac
+set(librsvg_pc_requires_private
+    libxml-2.0
+    pangocairo
+    pangoft2
+    cairo-png
+    libcroco-0.6
+    gthread-2.0
+    gmodule-2.0
+    gobject-2.0
+    gio-unix-2.0
+    fontconfig
+)
+if(WIN32)
+    string(REPLACE "gio-unix" "gio-windows" librsvg_pc_requires_private "${librsvg_pc_requires_private}")
 endif()
 
-# Add include directories
-include_directories(${CAIRO_INCLUDE_DIRS} ${GDK_PIXBUF_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS} ${PANGO_INCLUDE_DIRS} ${PANGO2_INCLUDE_DIRS})
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(LIBRSVG_LINK_PUBLIC ${librsvg_pc_requires} IMPORTED_TARGET REQUIRED)
+pkg_check_modules(LIBRSVG_LINK_PRIVATE ${librsvg_pc_requires_private} IMPORTED_TARGET REQUIRED)
 
 set(LIBRSVG_SOURCES
     librsvg-features.c
@@ -71,79 +87,87 @@ set(LIBRSVG_SOURCES
     librsvg-enum-types.h
 )
 
-set(PIXBUFLOADERSVG_SOURCES 
-    gdk-pixbuf-loader/io-svg.c
-)
-
 if(WIN32)
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.win32 ${CMAKE_CURRENT_SOURCE_DIR}/config.h COPYONLY)
-    add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/rsvg.def
-        COMMAND echo "EXPORTS" > ${CMAKE_CURRENT_SOURCE_DIR}/rsvg.def
-        COMMAND ${CMAKE_C_COMPILER} /EP ${CMAKE_CURRENT_SOURCE_DIR}/rsvg.symbols >> ${CMAKE_CURRENT_SOURCE_DIR}/rsvg.def)
-    list(APPEND LIBRSVG_SOURCES rsvg.def)
+    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/config.h.win32" "${CMAKE_CURRENT_BINARY_DIR}/config.h" COPYONLY)
+    file(READ "${CMAKE_CURRENT_SOURCE_DIR}/rsvg.symbols" rsvg_symbols)
+    string(REGEX REPLACE "/[*][^*]*[*]/" "" rsvg_symbols "${rsvg_symbols}")
+    file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/rsvg.def" "EXPORTS\n${rsvg_symbols}")
+    list(APPEND LIBRSVG_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/rsvg.def")
 else()
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.linux ${CMAKE_CURRENT_SOURCE_DIR}/config.h COPYONLY)
+    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/config.h.linux" "${CMAKE_CURRENT_BINARY_DIR}/config.h" COPYONLY)
     list(APPEND LIBRSVG_SOURCES rsvg.symbols)
 endif()
 
-add_library(rsvg-2.40 ${LIBRSVG_SOURCES})
-add_library(pixbufloader-svg ${PIXBUFLOADERSVG_SOURCES})
-
-target_compile_definitions(rsvg-2.40 PRIVATE -DRSVG_COMPILATION -D_CRT_SECURE_NO_WARNINGS -DSRCDIR="${CMAKE_CURRENT_SOURCE_DIR}")
-
-target_include_directories(pixbufloader-svg PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
-target_compile_definitions(pixbufloader-svg PRIVATE 
-    -DRSVG_COMPILATION 
+add_library(${LIBRSVG_TARGET} ${LIBRSVG_SOURCES})
+target_compile_definitions(${LIBRSVG_TARGET} PRIVATE
+    -DRSVG_COMPILATION
     -D_CRT_SECURE_NO_WARNINGS
-    -DSRCDIR="${CMAKE_CURRENT_SOURCE_DIR}" 
-    -DGDK_PIXBUF_ENABLE_BACKEND 
-    -DG_LOG_DOMAIN="libpixbufloader-svg")
-
-target_link_libraries(rsvg-2.40 PRIVATE
-    PkgConfig::GLIB2
-    ${LIBXML2_LIBRARIES}
-    PkgConfig::PANGO
-    PkgConfig::GDK_PIXBUF
-    ${PANGO_FT2_LIB}
-    unofficial::libcroco::croco-0.6
+    -DSRCDIR=""
+    $<$<BOOL:${MINGW}>:HAVE_STRTOK_R>
 )
-target_link_libraries(pixbufloader-svg PRIVATE
-    rsvg-2.40
-    PkgConfig::GLIB2
-    PkgConfig::GDK_PIXBUF
+target_include_directories(${LIBRSVG_TARGET}
+    PRIVATE
+        "${CMAKE_CURRENT_BINARY_DIR}"
+    PUBLIC
+        "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>"
+        "$<INSTALL_INTERFACE:include/librsvg-${RSVG_API_VERSION}>"
 )
-
-install(TARGETS rsvg-2.40 pixbufloader-svg
-    EXPORT librsvg-targets
+target_link_libraries(${LIBRSVG_TARGET}
+    PUBLIC
+        PkgConfig::LIBRSVG_LINK_PUBLIC
+    PRIVATE
+        PkgConfig::LIBRSVG_LINK_PRIVATE
+)
+install(TARGETS ${LIBRSVG_TARGET}
     RUNTIME DESTINATION bin
     LIBRARY DESTINATION lib
     ARCHIVE DESTINATION lib
 )
-
 install(
-    EXPORT librsvg-targets
-    NAMESPACE unofficial::librsvg::
-    FILE unofficial-librsvg-targets.cmake
-    DESTINATION share/unofficial-librsvg
+    FILES
+        rsvg.h
+        rsvg-cairo.h
+        librsvg-features.h
+        librsvg-enum-types.h
+    DESTINATION include/librsvg-${RSVG_API_VERSION}/librsvg
 )
 
-install(FILES
-    rsvg.h
-    rsvg-cairo.h
-    librsvg-features.h
-    librsvg-enum-types.h
-    DESTINATION include/librsvg
+
+set(gdk_pixbuf_pc_requires_private gdk-pixbuf-2.0)
+pkg_check_modules(GDK_PIXBUF ${gdk_pixbuf_pc_requires_private} IMPORTED_TARGET REQUIRED)
+pkg_get_variable(GDK_PIXBUF_MODULEDIR ${gdk_pixbuf_pc_requires_private} gdk_pixbuf_moduledir)
+
+set(PIXBUFLOADERSVG_SOURCES
+    gdk-pixbuf-loader/io-svg.c
+)
+
+add_library(pixbufloader-svg MODULE ${PIXBUFLOADERSVG_SOURCES})
+target_include_directories(pixbufloader-svg
+    PRIVATE
+        "${CMAKE_CURRENT_BINARY_DIR}"
+        "${CMAKE_CURRENT_SOURCE_DIR}"
+)
+target_compile_definitions(pixbufloader-svg PRIVATE
+    -DRSVG_COMPILATION
+    -D_CRT_SECURE_NO_WARNINGS
+    -DSRCDIR=""
+    -DGDK_PIXBUF_ENABLE_BACKEND
+    -DG_LOG_DOMAIN="libpixbufloader-svg"
+)
+target_link_libraries(pixbufloader-svg
+    PRIVATE
+        ${LIBRSVG_TARGET}
+        PkgConfig::GDK_PIXBUF
+)
+install(TARGETS pixbufloader-svg
+    RUNTIME DESTINATION "${GDK_PIXBUF_MODULEDIR}"
+    LIBRARY DESTINATION "${GDK_PIXBUF_MODULEDIR}"
 )
 
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/unofficial-librsvg-config.cmake "
-include(CMakeFindDependencyMacro)
-find_dependency(PkgConfig)
-pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 gmodule-2 gio-2 IMPORTED_TARGET)
-pkg_check_modules(CAIRO cairo IMPORTED_TARGET)
-pkg_check_modules(GDK_PIXBUF gdk-pixbuf IMPORTED_TARGET)
-pkg_check_modules(PANGO pango pangocairo IMPORTED_TARGET)
-find_dependency(unofficial-libcroco CONFIG)
 
-include(\${CMAKE_CURRENT_LIST_DIR}/unofficial-librsvg-targets.cmake)
-")
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-librsvg-config.cmake DESTINATION share/unofficial-librsvg)
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/librsvg.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/librsvg.pc" @ONLY)
+file(READ "${CMAKE_CURRENT_BINARY_DIR}/librsvg.pc" librsvg_pc)
+list(JOIN librsvg_pc_requires_private " " requires_private)
+string(REPLACE "Requires.private:" "Requires.private: ${requires_private}" librsvg_pc "${librsvg_pc}")
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/librsvg.pc" "${librsvg_pc}")
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/librsvg.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" RENAME "librsvg-${RSVG_API_VERSION}.pc")
diff --git a/external_imported/vcpkg/ports/librsvg/portfile.cmake b/external_imported/vcpkg/ports/librsvg/portfile.cmake
index 8e47fada4..5252b6547 100644
--- a/external_imported/vcpkg/ports/librsvg/portfile.cmake
+++ b/external_imported/vcpkg/ports/librsvg/portfile.cmake
@@ -1,33 +1,40 @@
 # port update requires rust/cargo
 
+string(REGEX REPLACE "^([0-9]*[.][0-9]*)[.].*" "\\1" MAJOR_MINOR "${VERSION}")
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://download.gnome.org/sources/librsvg/2.40/librsvg-2.40.20.tar.xz"
-    FILENAME "librsvg-2.40.20.tar.xz"
+    URLS "https://download.gnome.org/sources/librsvg/${MAJOR_MINOR}/librsvg-${VERSION}.tar.xz"
+         "https://www.mirrorservice.org/sites/ftp.gnome.org/pub/GNOME/sources/librsvg/${MAJOR_MINOR}/librsvg-${VERSION}.tar.xz"
+    FILENAME "librsvg-${VERSION}.tar.xz"
     SHA512 cdd8224deb4c3786e29f48ed02c32ed9dff5cb15aba574a5ef845801ad3669cfcc3eedb9d359c22213dc7a29de24c363248825adad5877c40abf73b3688ff12f
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
+vcpkg_extract_source_archive(
+    SOURCE_PATH
+    ARCHIVE "${ARCHIVE}"
 )
 
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
-configure_file("${CMAKE_CURRENT_LIST_DIR}/config.h.linux" "${SOURCE_PATH}/config.h.linux" COPYONLY)
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" "${CMAKE_CURRENT_LIST_DIR}/config.h.linux" DESTINATION "${SOURCE_PATH}")
 
 vcpkg_find_acquire_program(PKGCONFIG)
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    DISABLE_PARALLEL_CONFIGURE 
     OPTIONS
-        -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}
+        "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}"
 )
 
 vcpkg_cmake_install()
-
 vcpkg_copy_pdbs()
+vcpkg_fixup_pkgconfig()
 
-vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-librsvg CONFIG_PATH share/unofficial-librsvg)
+if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+    file(GLOB_RECURSE pc_files "${CURRENT_PACKAGES_DIR}/*.pc")
+    foreach(pc_file IN LISTS pc_files)
+        vcpkg_replace_string("${pc_file}" " -lm" "")
+    endforeach()
+endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
\ No newline at end of file
+file(COPY "${CURRENT_PORT_DIR}/unofficial-librsvg-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-librsvg")
+file(COPY "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/librsvg/unofficial-librsvg-config.cmake b/external_imported/vcpkg/ports/librsvg/unofficial-librsvg-config.cmake
new file mode 100644
index 000000000..6bff45d87
--- /dev/null
+++ b/external_imported/vcpkg/ports/librsvg/unofficial-librsvg-config.cmake
@@ -0,0 +1,14 @@
+file(READ "${CMAKE_CURRENT_LIST_DIR}/../librsvg/usage" usage)
+message(WARNING "find_package(unofficial-librsvg) is deprecated.\n${usage}")
+
+include(CMakeFindDependencyMacro)
+find_dependency(PkgConfig)
+pkg_check_modules(VCPKG_LIBRSVG librsvg-2.0 IMPORTED_TARGET)
+if(NOT VCPKG_LIBRSVG_FOUND)
+    set(${CMAKE_FIND_PACKAGE_NAME}_FOUND 0)
+elseif(NOT TARGET unofficial::librsvg::rsvg-2)
+    add_library(unofficial::librsvg::rsvg-2 INTERFACE IMPORTED)
+    set_target_properties(unofficial::librsvg::rsvg-2 PROPERTIES
+        INTERFACE_LINK_LIBRARIES PkgConfig::VCPKG_LIBRSVG
+    )
+endif()
diff --git a/external_imported/vcpkg/ports/librsvg/usage b/external_imported/vcpkg/ports/librsvg/usage
new file mode 100644
index 000000000..22bfe67e7
--- /dev/null
+++ b/external_imported/vcpkg/ports/librsvg/usage
@@ -0,0 +1,5 @@
+librsvg can be imported via CMake FindPkgConfig module:
+
+    find_package(PkgConfig REQUIRED)
+    pkg_check_modules(LIBRSVG librsvg-2.0 IMPORTED_TARGET REQUIRED)
+    target_link_libraries(main PRIVATE PkgConfig::LIBRSVG)
diff --git a/external_imported/vcpkg/ports/librsvg/vcpkg.json b/external_imported/vcpkg/ports/librsvg/vcpkg.json
index eea2a5efd..86fdf2cad 100644
--- a/external_imported/vcpkg/ports/librsvg/vcpkg.json
+++ b/external_imported/vcpkg/ports/librsvg/vcpkg.json
@@ -1,20 +1,23 @@
 {
   "name": "librsvg",
   "version": "2.40.20",
-  "port-version": 5,
+  "port-version": 10,
   "description": "A small library to render Scalable Vector Graphics (SVG)",
   "homepage": "https://gitlab.gnome.org/GNOME/librsvg",
+  "license": "LGPL-2.0-or-later",
   "dependencies": [
     "cairo",
+    "fontconfig",
     "gdk-pixbuf",
+    "glib",
     "libcroco",
-    "pango",
     {
-      "name": "vcpkg-cmake",
-      "host": true
+      "name": "libxml2",
+      "default-features": false
     },
+    "pango",
     {
-      "name": "vcpkg-cmake-config",
+      "name": "vcpkg-cmake",
       "host": true
     }
   ]
diff --git a/external_imported/vcpkg/ports/librsync/portfile.cmake b/external_imported/vcpkg/ports/librsync/portfile.cmake
index a0a07bad3..663e47b1d 100644
--- a/external_imported/vcpkg/ports/librsync/portfile.cmake
+++ b/external_imported/vcpkg/ports/librsync/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO librsync/librsync
-    REF 42b636d2a65ab6914ea7cac50886da28192aaf9b # V2.3.2
-    SHA512 4903a64e327a7d49ae5f741b7b9fe3a76018010147249e2bc53917b06d31ee0f9b917f6c3e36a2d241ae66c19fa881113b59911d777742a859922486d9fe9c4c
+    REF "v${VERSION}"
+    SHA512 ac01413b875e774db9fec3888210a4b9a5f3d32c081f1ed5f2cf9dc29cfae6ecedf6eac42062631e6dcf188853313fce4520430549768a0f68993419b07e58d9
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/librsync/vcpkg.json b/external_imported/vcpkg/ports/librsync/vcpkg.json
index 7fda0a64d..0287ac3c2 100644
--- a/external_imported/vcpkg/ports/librsync/vcpkg.json
+++ b/external_imported/vcpkg/ports/librsync/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "librsync",
-  "version-semver": "2.3.2",
-  "port-version": 1,
+  "version-semver": "2.3.4",
   "description": "librsync is a library for calculating and applying network deltas, with an interface designed to ease integration into diverse network applications.",
   "homepage": "http://librsync.sourcefrog.net/",
   "supports": "!uwp",
diff --git a/external_imported/vcpkg/ports/librttopo/portfile.cmake b/external_imported/vcpkg/ports/librttopo/portfile.cmake
index 1186d45f7..a7470eb6d 100644
--- a/external_imported/vcpkg/ports/librttopo/portfile.cmake
+++ b/external_imported/vcpkg/ports/librttopo/portfile.cmake
@@ -8,9 +8,9 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 ${LIBRTTOPO_PACKAGE_SUM}
 )
 
-vcpkg_extract_source_archive_ex(
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
-    OUT_SOURCE_PATH SOURCE_PATH
     PATCHES
         fix-makefiles.patch
         geos-config.patch
diff --git a/external_imported/vcpkg/ports/librttopo/vcpkg.json b/external_imported/vcpkg/ports/librttopo/vcpkg.json
index 5c401dc5f..de9fb5178 100644
--- a/external_imported/vcpkg/ports/librttopo/vcpkg.json
+++ b/external_imported/vcpkg/ports/librttopo/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "librttopo",
   "version": "1.1.0",
-  "port-version": 7,
+  "port-version": 8,
   "description": "The RT Topology Library exposes an API to create and manage standard (ISO 13249 aka SQL/MM) topologies using user-provided data stores.",
   "homepage": "https://git.osgeo.org/gitea/rttopo/librttopo",
   "license": "GPL-2.0-or-later",
diff --git a/external_imported/vcpkg/ports/libsbml/dependencies.diff b/external_imported/vcpkg/ports/libsbml/dependencies.diff
new file mode 100644
index 000000000..1f54a0400
--- /dev/null
+++ b/external_imported/vcpkg/ports/libsbml/dependencies.diff
@@ -0,0 +1,131 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a8af3a4..3926b68 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -421,8 +421,9 @@ set(LIBSBML_XML_LIBRARY_LIBS)
+ if(WITH_EXPAT)
+   
+     if(NOT TARGET EXPAT::EXPAT)
+-    find_package(EXPAT REQUIRED)
+     endif()
++    find_package(EXPAT NAMES expat REQUIRED)
++    set(EXPAT_LIBRARY expat::expat)
+ 
+     add_definitions( -DUSE_EXPAT )
+     list(APPEND SWIG_EXTRA_ARGS -DUSE_EXPAT)
+@@ -443,7 +444,8 @@ endif(WITH_EXPAT)
+ set(USE_LIBXML OFF)
+ if(WITH_LIBXML)
+ 
+-  find_package(LIBXML REQUIRED)
++  find_package(LIBXML NAMES LibXml2 REQUIRED)
++  set(LIBXML_LIBRARY LibXml2::LibXml2)
+   
+   add_definitions( -DUSE_LIBXML )
+   list(APPEND SWIG_EXTRA_ARGS -DUSE_LIBXML)
+@@ -495,7 +497,7 @@ endif()
+ option(WITH_BZIP2    "Enable the use of bzip2 compression."  ${BZIP_INITIAL_VALUE})
+ set(USE_BZ2 OFF)
+ if(WITH_BZIP2)
+-  find_package(BZ2 REQUIRED)
++  find_package(BZip2 REQUIRED)
+   set(USE_BZ2 ON)
+   add_definitions( -DUSE_BZ2 )
+   list(APPEND SWIG_EXTRA_ARGS -DUSE_BZ2)
+@@ -521,6 +525,9 @@ Separate multiple directories using semicolons." )
+ # Locate zlib
+ #
+ 
++if(WITH_ZLIB)
++    find_package(ZLIB REQUIRED)
++endif()
+ set(ZLIB_INITIAL_VALUE)
+ if (NOT LIBZ_LIBRARY)
+ find_library(LIBZ_LIBRARY
+@@ -614,7 +621,6 @@ valid. It should contain the file zlib.h, but it does not.")
+ endif(WITH_ZLIB)
+ 
+ # install find scripts only for used dependencies
+-install(FILES ${LIBSBML_FIND_MODULES} DESTINATION share/cmake/Modules)
+ 
+ ###############################################################################
+ #
+@@ -671,7 +677,12 @@ if(WITH_CHECK)
+ 
+   enable_testing()
+ 
+-  find_package(CHECK REQUIRED)
++  find_package(CHECK NAMES check REQUIRED)
++  if(BUILD_SHARED_LIBS)
++    add_library(CHECK::CHECK ALIAS Check::checkShared)
++  else()
++    add_library(CHECK::CHECK ALIAS Check::check)
++  endif()
+ 
+   if (UNIX)
+       # setup valgrind
+@@ -1005,17 +1016,18 @@ install(FILES ${DOCUMENTATION_FILES} DESTINATION ${MISC_PREFIX})
+ #
+ 
+ set (PRIVATE_LIBS "-lstdc++ -lm")
++set (PRIVATE_REQUIRES "")
+ if (WITH_ZLIB)
+-set (PRIVATE_LIBS "${LIBZ_LIBRARY} ${PRIVATE_LIBS}")
++    string(APPEND PRIVATE_REQUIRES " zlib")
+ endif()
+ if (WITH_BZIP2)
+-set (PRIVATE_LIBS "${LIBBZ_LIBRARY} ${PRIVATE_LIBS}")
++    string(APPEND PRIVATE_REQUIRES " bzip2")
+ endif()
+ if (WITH_LIBXML)
+-set (PRIVATE_LIBS "${LIBXML_LIBRARY} ${PRIVATE_LIBS}")
++    string(APPEND PRIVATE_REQUIRES " libxml-2.0")
+ endif()
+ if (WITH_EXPAT)
+-set (PRIVATE_LIBS "${LIBEXPAT_LIBRARY} ${PRIVATE_LIBS}")
++    string(APPEND PRIVATE_REQUIRES " expat")
+ endif()
+ if (WITH_XERCES)
+ set (PRIVATE_LIBS "${XERCES_LIBRARY} ${PRIVATE_LIBS}")
+@@ -1037,9 +1049,7 @@ if (WITH_XERCES)
+ file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/libsbml.pc" "Conflicts: xerces-c = 2.6.0\n")
+ endif()
+ 
+-if (WITH_LIBXML)
+-file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/libsbml.pc" "Requires.private: libxml-2.0 >= 2.6.22\n")
+-endif()
++file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/libsbml.pc" "Requires.private: ${PRIVATE_REQUIRES}\n")
+ 
+ if (UNIX OR MINGW)
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libsbml.pc"
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 79301a6..0957d29 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -311,7 +311,7 @@ if(WITH_BZIP2)
+         sbml/compress/bzfstream.h
+         sbml/compress/bzfstream.cpp
+         )
+-  set(LIBSBML_LIBS ${LIBSBML_LIBS} BZ2::BZ2)
++  set(LIBSBML_LIBS ${LIBSBML_LIBS} BZip2::BZip2)
+ 
+ endif()
+ 
+@@ -405,7 +405,7 @@ if(WITH_EXPAT)
+         sbml/xml/ExpatHandler.h
+         sbml/xml/ExpatParser.h
+     )
+-    set(LIBSBML_LIBS ${LIBSBML_LIBS} EXPAT::EXPAT)
++    set(LIBSBML_LIBS ${LIBSBML_LIBS} expat::expat)
+ 
+ endif(WITH_EXPAT)
+ 
+@@ -423,7 +423,7 @@ if(WITH_LIBXML)
+         sbml/xml/LibXMLParser.h
+         sbml/xml/LibXMLTranscode.h
+     )
+-    set(LIBSBML_LIBS ${LIBSBML_LIBS} LIBXML::LIBXML)
++    set(LIBSBML_LIBS ${LIBSBML_LIBS} LibXml2::LibXml2)
+ 
+ endif(WITH_LIBXML)
+ 
diff --git a/external_imported/vcpkg/ports/libsbml/dirent.diff b/external_imported/vcpkg/ports/libsbml/dirent.diff
new file mode 100644
index 000000000..538bca3fd
--- /dev/null
+++ b/external_imported/vcpkg/ports/libsbml/dirent.diff
@@ -0,0 +1,28 @@
+diff --git a/src/sbml/validator/test/tps/dirent.c b/src/sbml/validator/test/tps/dirent.c
+index beafc5e..48a60ca 100644
+--- a/src/sbml/validator/test/tps/dirent.c
++++ b/src/sbml/validator/test/tps/dirent.c
+@@ -1,3 +1,4 @@
++#if 0
+ /* /////////////////////////////////////////////////////////////////////////////
+  * File:    dirent.c
+  *
+@@ -239,3 +240,4 @@ struct dirent *readdir(DIR *dir)
+ }
+ 
+ /* ////////////////////////////////////////////////////////////////////////// */
++#endif
+diff --git a/src/sbml/validator/test/tps/dirent.h b/src/sbml/validator/test/tps/dirent.h
+index 4703aa2..8e4c29c 100644
+--- a/src/sbml/validator/test/tps/dirent.h
++++ b/src/sbml/validator/test/tps/dirent.h
+@@ -46,6 +46,9 @@
+ 
+ #ifndef SYNSOFT_UNIXEM_INCL_H_DIRENT
+ #define SYNSOFT_UNIXEM_INCL_H_DIRENT
++#include <dirent.h>
++#endif
++#if 0
+ 
+ #ifndef _SYNSOFT_DOCUMENTATION_SKIP_SECTION
+ # define SYNSOFT_UNIXEM_VER_H_DIRENT_MAJOR      2
diff --git a/external_imported/vcpkg/ports/libsbml/libsbml-config.cmake b/external_imported/vcpkg/ports/libsbml/libsbml-config.cmake
new file mode 100644
index 000000000..c0cd40a1d
--- /dev/null
+++ b/external_imported/vcpkg/ports/libsbml/libsbml-config.cmake
@@ -0,0 +1,6 @@
+include(CMakeFindDependencyMacro)
+find_dependency(@name@ CONFIG)
+if(NOT TARGET libsbml)
+    add_library(libsbml INTERFACE IMPORTED)
+    target_link_libraries(libsbml INTERFACE $<TARGET_NAME:@name@>)
+endif()
diff --git a/external_imported/vcpkg/ports/libsbml/no-docs.diff b/external_imported/vcpkg/ports/libsbml/no-docs.diff
new file mode 100644
index 000000000..acac8f31f
--- /dev/null
+++ b/external_imported/vcpkg/ports/libsbml/no-docs.diff
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8ad678a..f856774 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1012,7 +1012,6 @@ set(DOCUMENTATION_FILES
+         VERSION.txt
+ )
+ 
+-install(FILES ${DOCUMENTATION_FILES} DESTINATION ${MISC_PREFIX})
+ 
+ ###############################################################################
+ #
diff --git a/external_imported/vcpkg/ports/libsbml/portfile.cmake b/external_imported/vcpkg/ports/libsbml/portfile.cmake
index e4961abb2..cab0f5008 100644
--- a/external_imported/vcpkg/ports/libsbml/portfile.cmake
+++ b/external_imported/vcpkg/ports/libsbml/portfile.cmake
@@ -1,13 +1,24 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO sbmlteam/libsbml
-    REF 118ffbf11f1a5245cc544c1eac71019d979ecb20 #libSBML-5.19.0
-    SHA512 7fe8b4d594876c6408e01c646187cb1587d0b4e12707a43286150d4e4646841e547bde971de917de1cdfbbb9365172aeac43c8e02f7d354400f9166f0f1c2c3d
+    REF "v${VERSION}"
+    SHA512 2770c1d3295e22ed8fb8dfa2480efa160fc61fbeeca3a9e214e210acb3fd6531a5cfb22eeb72c5334158bf8ba21c27015d0910487a7ef060f594a708f197676c
     HEAD_REF development
+    PATCHES
+        dependencies.diff
+        dirent.diff
+        no-docs.diff
+        test-shared.diff
 )
 
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_RUNTIME)
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" STATIC_LIBRARY)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" DYNAMIC_LIBRARY)
+
+if("expat" IN_LIST FEATURES AND "libxml2" IN_LIST FEATURES)
+    message("Feature expat conflicts with feature libxml2. Selecting libxml2.")
+    list(REMOVE_ITEM FEATURES "expat")
+endif()
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
@@ -18,71 +29,47 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
         multi       ENABLE_MULTI
         qual        ENABLE_QUAL
         render      ENABLE_RENDER
-        render      ENABLE_LAYOUT
         bzip2       WITH_BZIP2
+        expat       WITH_EXPAT
+        libxml2     WITH_LIBXML
         zlib        WITH_ZLIB
         test        WITH_CHECK
         namespace   WITH_CPP_NAMESPACE
 )
 
-# Handle conflict features
-set(WITH_EXPAT OFF)
-if ("expat" IN_LIST FEATURES)
-    set(WITH_EXPAT ON)
-endif()
-
-set(WITH_LIBXML OFF)
-if ("libxml2" IN_LIST FEATURES)
-    set(WITH_LIBXML ON)
-endif()
-
-if (WITH_EXPAT AND WITH_LIBXML)
-    message("Feature expat conflict with feature libxml2, currently using libxml2...")
-    set(WITH_EXPAT OFF)
-endif()
-
-if ("test" IN_LIST FEATURES AND WIN32)
-    message(FATAL_ERROR "Feature test only support UNIX.")
-endif()
-
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS ${FEATURE_OPTIONS}
-        -DWITH_EXPAT=${WITH_EXPAT}
-        -DWITH_LIBXML=${WITH_LIBXML}
+    OPTIONS
+        ${FEATURE_OPTIONS}
         -DENABLE_L3V2EXTENDEDMATH:BOOL=ON
         -DWITH_STATIC_RUNTIME=${STATIC_RUNTIME}
         -DLIBSBML_SKIP_SHARED_LIBRARY=${STATIC_LIBRARY}
+        -DLIBSBML_SKIP_STATIC_LIBRARY=${DYNAMIC_LIBRARY}
+    MAYBE_UNUSED_VARIABLES
+        WITH_STATIC_RUNTIME
 )
 
 vcpkg_cmake_install()
-
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake)
-
 vcpkg_copy_pdbs()
+vcpkg_fixup_pkgconfig()
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-
-file(GLOB TXT_FILES "${CURRENT_PACKAGES_DIR}/debug/*.txt")
-if (TXT_FILES)
-    file(REMOVE ${TXT_FILES})
-endif()
-file(GLOB TXT_FILES "${CURRENT_PACKAGES_DIR}/*.txt")
-if (TXT_FILES)
-    file(REMOVE ${TXT_FILES})
-endif()
-
-if (EXISTS "${CURRENT_PACKAGES_DIR}/debug/share")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-endif()
-
-if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/README.md")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/README.md")
+foreach(name IN ITEMS libsbml libsbml-static sbml sbml-static)
+    if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/${name}-config.cmake")
+        vcpkg_cmake_config_fixup(PACKAGE_NAME "${name}" CONFIG_PATH lib/cmake)
+        if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake")
+            configure_file("${CURRENT_PORT_DIR}/libsbml-config.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" @ONLY)
+        endif()
+        break()
+    endif()
+endforeach()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/sbml/common/extern.h" "defined LIBSBML_STATIC" "1")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/sbml/xml/XMLExtern.h" "defined(LIBLAX_STATIC)" "1")
 endif()
 
-if(EXISTS "${CURRENT_PACKAGES_DIR}/README.md")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/README.md")
-endif()
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-vcpkg_fixup_pkgconfig()
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/external_imported/vcpkg/ports/libsbml/test-shared.diff b/external_imported/vcpkg/ports/libsbml/test-shared.diff
new file mode 100644
index 000000000..71bc68086
--- /dev/null
+++ b/external_imported/vcpkg/ports/libsbml/test-shared.diff
@@ -0,0 +1,14 @@
+diff --git a/src/sbml/test/CMakeLists.txt b/src/sbml/test/CMakeLists.txt
+index 7a408d7..462d58a 100644
+--- a/src/sbml/test/CMakeLists.txt
++++ b/src/sbml/test/CMakeLists.txt
+@@ -49,6 +49,9 @@ if (EXTRA_INCLUDE_DIRS)
+  include_directories(${EXTRA_INCLUDE_DIRS})
+ endif(EXTRA_INCLUDE_DIRS)
+ 
++if(NOT TARGET ${LIBSBML_LIBRARY}-static)
++	add_library(${LIBSBML_LIBRARY}-static ALIAS ${LIBSBML_LIBRARY})
++endif()
+ 
+ add_executable(test_sbml_sbml ${TEST_FILES})
+ target_link_libraries(test_sbml_sbml ${LIBSBML_LIBRARY}-static CHECK::CHECK)
diff --git a/external_imported/vcpkg/ports/libsbml/usage b/external_imported/vcpkg/ports/libsbml/usage
new file mode 100644
index 000000000..a9e155c1a
--- /dev/null
+++ b/external_imported/vcpkg/ports/libsbml/usage
@@ -0,0 +1,4 @@
+libsbml provides CMake targets:
+
+    find_package(libsbml CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE libsbml)
diff --git a/external_imported/vcpkg/ports/libsbml/vcpkg.json b/external_imported/vcpkg/ports/libsbml/vcpkg.json
index 4d6373023..3b3c6f7a8 100644
--- a/external_imported/vcpkg/ports/libsbml/vcpkg.json
+++ b/external_imported/vcpkg/ports/libsbml/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "libsbml",
-  "version": "5.19.0",
-  "port-version": 2,
+  "version": "5.20.2",
   "description": "A library for reading / writing SBML files",
-  "supports": "!uwp",
+  "homepage": "https://github.com/sbmlteam/libsbml",
+  "license": "LGPL-2.1",
+  "supports": "!uwp & !xbox",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
@@ -16,7 +17,6 @@
   ],
   "default-features": [
     "comp",
-    "expat",
     "fbc",
     "groups",
     "layout",
@@ -64,12 +64,23 @@
       "description": "support for Qualitative Modeling"
     },
     "render": {
-      "description": "support for Rendering information"
+      "description": "support for Rendering information",
+      "dependencies": [
+        {
+          "name": "libsbml",
+          "default-features": false,
+          "features": [
+            "layout"
+          ]
+        }
+      ]
     },
     "test": {
       "description": "Unit testing of libSBMLs implementation",
+      "supports": "!windows | mingw | (windows & static)",
       "dependencies": [
-        "check"
+        "check",
+        "dirent"
       ]
     },
     "zlib": {
diff --git a/external_imported/vcpkg/ports/libsecret/portfile.cmake b/external_imported/vcpkg/ports/libsecret/portfile.cmake
index 900762ce3..ff0783df9 100644
--- a/external_imported/vcpkg/ports/libsecret/portfile.cmake
+++ b/external_imported/vcpkg/ports/libsecret/portfile.cmake
@@ -14,7 +14,7 @@ vcpkg_configure_meson(
         -Dgtk_doc=false
         -Dmanpage=false
         -Dvapi=false
-    ADDITIONAL_NATIVE_BINARIES
+    ADDITIONAL_BINARIES
          gdbus-codegen='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/gdbus-codegen'
          glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums'
 )
diff --git a/external_imported/vcpkg/ports/libsecret/vcpkg.json b/external_imported/vcpkg/ports/libsecret/vcpkg.json
index 3c57811cc..d5062de93 100644
--- a/external_imported/vcpkg/ports/libsecret/vcpkg.json
+++ b/external_imported/vcpkg/ports/libsecret/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libsecret",
   "version": "0.20.4",
-  "port-version": 1,
+  "port-version": 2,
   "description": "libsecret is a GObject-based library for accessing the Secret Service API of the freedesktop.org project, a cross-desktop effort to access passwords, tokens and other types of secrets. libsecret provides a convenient wrapper for these methods so consumers do not have to call the low-level DBus methods.",
   "homepage": "https://gitlab.gnome.org/GNOME/libsecret/",
   "license": "LGPL-2.1-or-later",
diff --git a/external_imported/vcpkg/ports/libsigcpp/disable_tests_enable_static_build.patch b/external_imported/vcpkg/ports/libsigcpp/disable_tests_enable_static_build.patch
index 017a0ac1b..c0e3acf67 100644
--- a/external_imported/vcpkg/ports/libsigcpp/disable_tests_enable_static_build.patch
+++ b/external_imported/vcpkg/ports/libsigcpp/disable_tests_enable_static_build.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e1b28fe..b9a9d40 100644
+index c4b291c..2475881 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -84,13 +84,13 @@ install (FILES
+@@ -86,13 +86,13 @@ install (FILES
  		DESTINATION 
  			"${CMAKE_INSTALL_PREFIX}/lib/pkgconfig")
  
@@ -20,10 +20,10 @@ index e1b28fe..b9a9d40 100644
  
  set (PROJECT_CMAKE_NAME		"${PROJECT_NAME}-3")
 diff --git a/sigc++/CMakeLists.txt b/sigc++/CMakeLists.txt
-index fa5a91a..86f1be7 100644
+index dd2d339..8480a5e 100644
 --- a/sigc++/CMakeLists.txt
 +++ b/sigc++/CMakeLists.txt
-@@ -23,7 +23,7 @@ set (SOURCE_FILES
+@@ -24,7 +24,7 @@ set (SOURCE_FILES
  
  set (SIGCPP_LIB_NAME sigc-${SIGCXX_API_VERSION})
  
diff --git a/external_imported/vcpkg/ports/libsigcpp/fix-shared-windows-build.patch b/external_imported/vcpkg/ports/libsigcpp/fix-shared-windows-build.patch
index 83cd2b9dc..f18fc1ced 100644
--- a/external_imported/vcpkg/ports/libsigcpp/fix-shared-windows-build.patch
+++ b/external_imported/vcpkg/ports/libsigcpp/fix-shared-windows-build.patch
@@ -1,32 +1,19 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e1b28fe..73990c4 100644
+index 2475881..3828a13 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -53,6 +53,13 @@ set (PROJECT_SOURCE_DIR "${sigc++_SOURCE_DIR}/sigc++")
+@@ -54,6 +54,14 @@ set (PROJECT_SOURCE_DIR "${sigc++_SOURCE_DIR}/sigc++")
  include_directories (${sigc++_SOURCE_DIR})
  include_directories (${sigc++_BINARY_DIR})
  
 +if (BUILD_SHARED_LIBS)
-+    add_compile_options (-DBUILD_SHARED)
 +    if (MSVC)
 +        add_compile_options (-D_WINDLL)
 +    endif()
++else()
++    add_compile_options (-DLIBSIGCXX_STATIC)
 +endif()
 +
  configure_file (sigc++config.h.cmake sigc++config.h)
  
  set (prefix ${CMAKE_INSTALL_PREFIX})
-diff --git a/sigc++config.h.cmake b/sigc++config.h.cmake
-index 74d348a..43a99c5 100644
---- a/sigc++config.h.cmake
-+++ b/sigc++config.h.cmake
-@@ -16,7 +16,9 @@
- # if defined(_MSC_VER)
- #  define SIGC_MSC 1
- #  define SIGC_WIN32 1
-+# ifdef BUILD_SHARED
- #  define SIGC_DLL 1
-+# endif
- # elif defined(__CYGWIN__)
- #  define SIGC_CONFIGURE 1
- # elif defined(__MINGW32__)
diff --git a/external_imported/vcpkg/ports/libsigcpp/fix_include_path.patch b/external_imported/vcpkg/ports/libsigcpp/fix_include_path.patch
index 582eed595..d0bdb85ed 100644
--- a/external_imported/vcpkg/ports/libsigcpp/fix_include_path.patch
+++ b/external_imported/vcpkg/ports/libsigcpp/fix_include_path.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 73990c4..38424a2 100644
+index 3828a13..bc0a854 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -84,7 +84,7 @@ add_custom_target(uninstall
+@@ -87,7 +87,7 @@ endif()
  install (FILES
  			"${CMAKE_CURRENT_BINARY_DIR}/sigc++config.h"
  		DESTINATION
@@ -11,7 +11,7 @@ index 73990c4..38424a2 100644
  
  install (FILES 
  			"${CMAKE_CURRENT_BINARY_DIR}/sigc++-${SIGCXX_API_VERSION}.pc"
-@@ -102,7 +102,7 @@ add_subdirectory (sigc++)
+@@ -105,7 +105,7 @@ add_subdirectory (sigc++)
  
  set (PROJECT_CMAKE_NAME		"${PROJECT_NAME}-3")
  set (VERSION_CONFIG     	"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_CMAKE_NAME}ConfigVersion.cmake")
@@ -21,20 +21,20 @@ index 73990c4..38424a2 100644
  set (CONFIG_INSTALL_DIR 	"lib/cmake/${PROJECT_CMAKE_NAME}")
  set (TARGETS_EXPORT_NAME    "${PROJECT_CMAKE_NAME}Targets")
 diff --git a/sigc++.pc.in b/sigc++.pc.in
-index 05de315..171b38d 100644
+index e162f2f..7e9b298 100644
 --- a/sigc++.pc.in
 +++ b/sigc++.pc.in
 @@ -15,4 +15,4 @@ Description: Typesafe signal and callback system for C++
  Version: @PACKAGE_VERSION@
  URL: https://libsigcplusplus.github.io/libsigcplusplus/
  Libs: -L${libdir} -lsigc-@SIGCXX_API_VERSION@
--Cflags: -I${includedir}/sigc++-@SIGCXX_API_VERSION@ -I${libdir}/sigc++-@SIGCXX_API_VERSION@/include
-+Cflags: -I${includedir}
+-Cflags: -I${includedir}/sigc++-@SIGCXX_API_VERSION@ -I${libdir}/sigc++-@SIGCXX_API_VERSION@/include @MSVC_STATIC_CXXFLAG@
++Cflags: -I${includedir} @MSVC_STATIC_CXXFLAG@
 diff --git a/sigc++/CMakeLists.txt b/sigc++/CMakeLists.txt
-index 86f1be7..076959b 100644
+index 8480a5e..b51b023 100644
 --- a/sigc++/CMakeLists.txt
 +++ b/sigc++/CMakeLists.txt
-@@ -29,7 +29,7 @@ set_property (TARGET ${SIGCPP_LIB_NAME} PROPERTY VERSION ${PACKAGE_VERSION})
+@@ -30,7 +30,7 @@ set_property (TARGET ${SIGCPP_LIB_NAME} PROPERTY VERSION ${PACKAGE_VERSION})
  set_property(TARGET ${SIGCPP_LIB_NAME}  PROPERTY SOVERSION ${LIBSIGCPP_SOVERSION})
  target_compile_definitions( ${SIGCPP_LIB_NAME} PRIVATE -DSIGC_BUILD )
  
diff --git a/external_imported/vcpkg/ports/libsigcpp/portfile.cmake b/external_imported/vcpkg/ports/libsigcpp/portfile.cmake
index cc0705cdf..8978888ef 100644
--- a/external_imported/vcpkg/ports/libsigcpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/libsigcpp/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libsigcplusplus/libsigcplusplus
     REF "${VERSION}"
-    SHA512 8b80f0988daea4eb2c827be57de21167f54a9bf3e9704d64d17d12aef064d8ad87d00f95ce4b5add7666452561c5ca42aa45cf677e54068974a4ea813af3b235
+    SHA512 0d22275995a1629ae73b0cc2b2f2598b18aa0ed6d35bd3f1735a50f54d356fb248dedc8d9b5f2794830866b04e0f58ce641048e2df7215ec2e6eac744de58a27
     HEAD_REF master
     PATCHES
         disable_tests_enable_static_build.patch
diff --git a/external_imported/vcpkg/ports/libsigcpp/vcpkg.json b/external_imported/vcpkg/ports/libsigcpp/vcpkg.json
index 59583e62f..e70f6e3f6 100644
--- a/external_imported/vcpkg/ports/libsigcpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/libsigcpp/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "libsigcpp",
-  "version": "3.4.0",
+  "version": "3.6.0",
   "description": "Typesafe callback framework for C++",
   "homepage": "https://libsigcplusplus.github.io/libsigcplusplus/",
   "license": "LGPL-3.0-or-later",
diff --git a/external_imported/vcpkg/ports/libsmb2/portfile.cmake b/external_imported/vcpkg/ports/libsmb2/portfile.cmake
index 958de2f59..dbce16c20 100644
--- a/external_imported/vcpkg/ports/libsmb2/portfile.cmake
+++ b/external_imported/vcpkg/ports/libsmb2/portfile.cmake
@@ -3,23 +3,26 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO sahlberg/libsmb2
-    REF d8c85a3119a0bd769590e448216130b368cd1099
-    SHA512 d15a040ed6314ad6f7984cfa7b52d9ede9934b2a7ec9827e833f574c25c9f694b5372b3e0950e258a6244b7aaf32b9e59987a75a88681d8031d9837ba94629d5
+    REF 99125c96750e192e2c50176548bf461e4a28f135
+    SHA512 30cdc9bbcdcd384868e5865706b41f683b977ece4056040a29bb3b81ffdf83788ba8a39426132810b8cbbb778ae7db8e5e1be0b7c0a82d8beed75040de708240
     HEAD_REF master
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        # TODO: Add a feature to enable gssapi/krb5 support
+        -DCMAKE_DISABLE_FIND_PACKAGE_GSSAPI=ON
 )
 
 vcpkg_cmake_install()
-vcpkg_copy_pdbs()
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
+vcpkg_cmake_config_fixup(PACKAGE_NAME smb2 CONFIG_PATH "lib/cmake/${PORT}")
 vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-
-#the debug/share folder is generated empty by the provided cmake system
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/smb2")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/libsmb2/usage b/external_imported/vcpkg/ports/libsmb2/usage
new file mode 100644
index 000000000..f58d837fb
--- /dev/null
+++ b/external_imported/vcpkg/ports/libsmb2/usage
@@ -0,0 +1,5 @@
+libsmb2 can be used from CMake via:
+
+    find_package(SMB2 REQUIRED)
+    target_include_directories(main PRIVATE ${SMB2_INCLUDE_DIRS})
+    target_link_libraries(main PRIVATE ${SMB2_LIBRARIES})
diff --git a/external_imported/vcpkg/ports/libsmb2/vcpkg-cmake-wrapper.cmake b/external_imported/vcpkg/ports/libsmb2/vcpkg-cmake-wrapper.cmake
new file mode 100644
index 000000000..c40858165
--- /dev/null
+++ b/external_imported/vcpkg/ports/libsmb2/vcpkg-cmake-wrapper.cmake
@@ -0,0 +1,6 @@
+set(SMB2_PREV_MODULE_PATH ${CMAKE_MODULE_PATH})
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
+
+_find_package(${ARGS})
+
+set(CMAKE_MODULE_PATH ${SMB2_PREV_MODULE_PATH})
diff --git a/external_imported/vcpkg/ports/libsmb2/vcpkg.json b/external_imported/vcpkg/ports/libsmb2/vcpkg.json
index 303a41ab8..387bd6b0d 100644
--- a/external_imported/vcpkg/ports/libsmb2/vcpkg.json
+++ b/external_imported/vcpkg/ports/libsmb2/vcpkg.json
@@ -1,12 +1,10 @@
 {
   "name": "libsmb2",
-  "version-date": "2021-04-29",
-  "port-version": 2,
+  "version-date": "2023-08-11",
   "description": "SMB2/3 Userspace Client",
   "homepage": "https://github.com/sahlberg/libsmb2",
-  "supports": "!osx",
+  "license": "LGPL-2.1-or-later",
   "dependencies": [
-    "openssl",
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/external_imported/vcpkg/ports/libsndfile/001-avoid-installing-find-modules.patch b/external_imported/vcpkg/ports/libsndfile/001-avoid-installing-find-modules.patch
new file mode 100644
index 000000000..3ae1b21b0
--- /dev/null
+++ b/external_imported/vcpkg/ports/libsndfile/001-avoid-installing-find-modules.patch
@@ -0,0 +1,16 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b501f08..022864f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -855,11 +847,6 @@ if (ENABLE_PACKAGE_CONFIG)
+ 			${CMAKE_CURRENT_BINARY_DIR}/SndFileConfigVersion.cmake
+ 		DESTINATION	${CMAKE_INSTALL_PACKAGEDIR}
+ 		)
+-
+-		if (NOT BUILD_SHARED_LIBS AND FIND_MODULES_INSTALL_LIST)
+-			file(COPY ${FIND_MODULES_INSTALL_LIST} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+-			install(FILES ${FIND_MODULES_INSTALL_LIST} DESTINATION ${CMAKE_INSTALL_PACKAGEDIR})
+-		endif ()
+ else ()
+ 
+ 	install (TARGETS sndfile ${sdnfile_PROGRAMS}
diff --git a/external_imported/vcpkg/ports/libsndfile/portfile.cmake b/external_imported/vcpkg/ports/libsndfile/portfile.cmake
index c182e5ad1..710932b4d 100644
--- a/external_imported/vcpkg/ports/libsndfile/portfile.cmake
+++ b/external_imported/vcpkg/ports/libsndfile/portfile.cmake
@@ -1,9 +1,11 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libsndfile/libsndfile
-    REF 1.2.0
-    SHA512 58d2567a4eb67f9af7a472ae02f62ce64bb6f54687bf670c84335a4d1c194d3e8d6933089ae9e2603137a035155447df4b0f59c054731d74d9814c1b757c833a
+    REF 1.2.2
+    SHA512 fb8b4d367240a8ac9d55be6f053cb19419890691c56a8552d1600d666257992b6e8e41a413a444c9f2d6c5d71406013222c92a3bfa67228944a26475444240a1
     HEAD_REF master
+    PATCHES
+        001-avoid-installing-find-modules.patch
 )
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
@@ -39,7 +41,7 @@ vcpkg_cmake_configure(
 
 vcpkg_cmake_install()
 
-if(WIN32 AND (NOT MINGW) AND (NOT CYGWIN))
+if(EXISTS "${CURRENT_PACKAGES_DIR}/cmake")
     set(CONFIG_PATH cmake)
 else()
     set(CONFIG_PATH lib/cmake/SndFile)
diff --git a/external_imported/vcpkg/ports/libsndfile/vcpkg.json b/external_imported/vcpkg/ports/libsndfile/vcpkg.json
index b8ab13edb..3633fc1ce 100644
--- a/external_imported/vcpkg/ports/libsndfile/vcpkg.json
+++ b/external_imported/vcpkg/ports/libsndfile/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "libsndfile",
-  "version-semver": "1.2.0",
+  "version-semver": "1.2.2",
   "description": "A library for reading and writing audio files",
   "homepage": "https://github.com/erikd/libsndfile",
   "license": "LGPL-2.1-or-later",
+  "supports": "!xbox",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/libsodium/CMakeLists.txt b/external_imported/vcpkg/ports/libsodium/CMakeLists.txt
index bedd2e507..24701e2ae 100644
--- a/external_imported/vcpkg/ports/libsodium/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/libsodium/CMakeLists.txt
@@ -44,6 +44,14 @@ if (ENABLE_MINIMAL)
     set(SODIUM_LIBRARY_MINIMAL_DEF "#define SODIUM_LIBRARY_MINIMAL 1")
 endif ()
 
+set(prefix "${CMAKE_INSTALL_PREFIX}")
+set(exec_prefix "\${prefix}")
+set(libdir "\${prefix}/lib")
+set(includedir "\${prefix}/include")
+
+set(PACKAGE_NAME "${PROJECT_NAME}")
+set(PACKAGE_VERSION "${VERSION}")
+
 configure_file(
     src/libsodium/include/sodium/version.h.in
     ${CMAKE_BINARY_DIR}/sodium/version.h
@@ -681,9 +689,21 @@ else ()
     target_sources(${PROJECT_NAME}
         PRIVATE
             ${CMAKE_BINARY_DIR}/sodium/version.h
-
-            ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c
-            ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/xchacha20poly1305/sodium/aead_xchacha20poly1305.c
+            
+            ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/aegis128l/aead_aegis128l.c
+            ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/aegis128l/aegis128l_common.h
+            ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/aegis128l/aegis128l_soft.c
+            ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/aegis128l/aegis128l_soft.h
+            ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/aegis128l/implementations.h
+            ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/aegis256/aead_aegis256.c
+            ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/aegis256/aegis256_common.h
+            ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/aegis256/aegis256_soft.c
+            ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/aegis256/aegis256_soft.h
+            ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/aegis256/implementations.h
+            ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/aes256gcm/aead_aes256gcm.c
+            
+            ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/chacha20poly1305/aead_chacha20poly1305.c
+            ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/xchacha20poly1305/aead_xchacha20poly1305.c
             ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_auth/crypto_auth.c
             ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_auth/hmacsha256/auth_hmacsha256.c
             ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_auth/hmacsha512/auth_hmacsha512.c
@@ -697,6 +717,7 @@ else ()
             ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_core/hsalsa20/ref2/core_hsalsa20_ref2.c
             ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_core/hsalsa20/core_hsalsa20.c
             ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_core/salsa/ref/core_salsa_ref.c
+            ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_core/softaes/softaes.c
             ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_generichash/crypto_generichash.c
             ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_generichash/blake2b/generichash_blake2.c
             ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_generichash/blake2b/ref/blake2.h
@@ -713,6 +734,8 @@ else ()
             ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_hash/sha512/cp/hash_sha512_cp.c
             ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_kdf/blake2b/kdf_blake2b.c
             ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_kdf/crypto_kdf.c
+            ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_kdf/hkdf/kdf_hkdf_sha256.c
+            ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_kdf/hkdf/kdf_hkdf_sha512.c
             ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_kx/crypto_kx.c
             ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_onetimeauth/crypto_onetimeauth.c
             ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_onetimeauth/poly1305/onetimeauth_poly1305.c
@@ -761,13 +784,15 @@ else ()
             ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/salsa20/stream_salsa20.c
             ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/salsa20/stream_salsa20.h
             ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/xsalsa20/stream_xsalsa20.c
-            ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_verify/sodium/verify.c
+            ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_verify/verify.c
+            ${PROJECT_SOURCE_DIR}/src/libsodium/include/sodium/private/asm_cet.h
             ${PROJECT_SOURCE_DIR}/src/libsodium/include/sodium/private/chacha20_ietf_ext.h
             ${PROJECT_SOURCE_DIR}/src/libsodium/include/sodium/private/common.h
             ${PROJECT_SOURCE_DIR}/src/libsodium/include/sodium/private/ed25519_ref10.h
             ${PROJECT_SOURCE_DIR}/src/libsodium/include/sodium/private/implementations.h
             ${PROJECT_SOURCE_DIR}/src/libsodium/include/sodium/private/mutex.h
             ${PROJECT_SOURCE_DIR}/src/libsodium/include/sodium/private/sse2_64_32.h
+            ${PROJECT_SOURCE_DIR}/src/libsodium/include/sodium/private/softaes.h
             ${PROJECT_SOURCE_DIR}/src/libsodium/randombytes/randombytes.c
             ${PROJECT_SOURCE_DIR}/src/libsodium/sodium/codecs.c
             ${PROJECT_SOURCE_DIR}/src/libsodium/sodium/core.c
@@ -818,7 +843,6 @@ else ()
             ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_scalarmult/curve25519/sandy2x/fe51_nsquare.S
             ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_scalarmult/curve25519/sandy2x/fe51_pack.S
             ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_scalarmult/curve25519/sandy2x/ladder.S
-            ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_scalarmult/curve25519/sandy2x/ladder_base.S
     )
 
     if (HAVE_AVX_ASM)
@@ -881,6 +905,10 @@ else ()
 
     add_library(${PROJECT_NAME}_aesni
         OBJECT
+            ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/aegis128l/aegis128l_aesni.c
+            ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/aegis128l/aegis128l_aesni.h
+            ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/aegis256/aegis256_aesni.c
+            ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/aegis256/aegis256_aesni.h
             ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/aes256gcm/aesni/aead_aes256gcm_aesni.c
     )
 
@@ -1081,11 +1109,15 @@ if (BUILD_TESTING)
     endforeach ()
 endif ()
 
+configure_file ("${CMAKE_SOURCE_DIR}/libsodium.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libsodium.pc" @ONLY)
+install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libsodium.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig")
+
 install(DIRECTORY src/libsodium/include/
     DESTINATION include/
     USE_SOURCE_PERMISSIONS
     PATTERN "*.h"
     PATTERN "*.h.in" EXCLUDE
+    PATTERN "*.in" EXCLUDE
     REGEX "private($|/)" EXCLUDE
 )
 
diff --git a/external_imported/vcpkg/ports/libsodium/portfile.cmake b/external_imported/vcpkg/ports/libsodium/portfile.cmake
index 934cf8cf7..50035ed52 100644
--- a/external_imported/vcpkg/ports/libsodium/portfile.cmake
+++ b/external_imported/vcpkg/ports/libsodium/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO jedisct1/libsodium
-    REF 1.0.18
-    SHA512 727fe50a5fb1df86ec5d807770f408a52609cbeb8510b4f4183b2a35a537905719bdb6348afcb103ff00ce946a8094ac9559b6e3e5b2ccc2a2d0c08f75577eeb
+    REF ${VERSION}
+    SHA512 6094d7bf191ea3be85f2ddab76b71f1b9c69c786493db5b84d3c5d5a0237003377ddf6a8687a962ea651fe4a9369cf5ee1676ba0bae82690f5f7ef31a698efa9
     HEAD_REF master
 )
 
@@ -26,6 +26,7 @@ vcpkg_copy_pdbs()
 vcpkg_cmake_config_fixup(
     PACKAGE_NAME unofficial-sodium
 )
+vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/debug/include"
@@ -40,4 +41,4 @@ configure_file(
     @ONLY
 )
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/libsodium/vcpkg.json b/external_imported/vcpkg/ports/libsodium/vcpkg.json
index b4f0e9dea..10d93456c 100644
--- a/external_imported/vcpkg/ports/libsodium/vcpkg.json
+++ b/external_imported/vcpkg/ports/libsodium/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "libsodium",
-  "version": "1.0.18",
-  "port-version": 8,
+  "version": "1.0.19",
   "description": "A modern and easy-to-use crypto library",
   "homepage": "https://github.com/jedisct1/libsodium",
   "license": "ISC",
diff --git a/external_imported/vcpkg/ports/libsonic/CMakeLists.txt b/external_imported/vcpkg/ports/libsonic/CMakeLists.txt
new file mode 100644
index 000000000..d89ece215
--- /dev/null
+++ b/external_imported/vcpkg/ports/libsonic/CMakeLists.txt
@@ -0,0 +1,34 @@
+cmake_minimum_required(VERSION 3.8)
+project(sonic
+    VERSION 0.2.0
+    LANGUAGES C
+)
+
+option(BUILD_TOOL "Build sonic tool" ON)
+
+add_library(libsonic sonic.c)
+set_target_properties(libsonic
+    PROPERTIES
+        PUBLIC_HEADER "${CMAKE_SOURCE_DIR}/sonic.h"
+        SOVERSION ${PROJECT_VERSION_MAJOR}
+        VERSION ${CMAKE_PROJECT_VERSION}
+        OUTPUT_NAME sonic
+)
+
+install(TARGETS libsonic
+    ARCHIVE         DESTINATION lib
+    LIBRARY         DESTINATION lib
+    PUBLIC_HEADER   DESTINATION include
+)
+
+if (BUILD_TOOL)
+    add_executable(sonic wave.c main.c)
+    target_link_libraries(sonic
+        PRIVATE
+            libsonic
+    )
+
+    install(TARGETS sonic
+        RUNTIME         DESTINATION bin
+    )
+endif()
diff --git a/external_imported/vcpkg/ports/libsonic/portfile.cmake b/external_imported/vcpkg/ports/libsonic/portfile.cmake
new file mode 100644
index 000000000..adacd0a2a
--- /dev/null
+++ b/external_imported/vcpkg/ports/libsonic/portfile.cmake
@@ -0,0 +1,30 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO waywardgeek/sonic
+    REF "release-${VERSION}"
+    SHA512 e70510c89c4f29c30f2a3443a1c4fc1aab2c99147e2ebd1dea3cbb2b89b8bdcee14dc504600ac1f04e82d32c19f17b06fbb417311853beb764c24d15687a126f
+    HEAD_REF master
+)
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        tool BUILD_TOOL
+)
+
+
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_TOOL=${BUILD_TOOL}
+)
+
+vcpkg_cmake_install()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+if(BUILD_TOOL)
+    vcpkg_copy_tools(TOOL_NAMES sonic AUTO_CLEAN)
+endif()
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/libsonic/vcpkg.json b/external_imported/vcpkg/ports/libsonic/vcpkg.json
new file mode 100644
index 000000000..9b3009679
--- /dev/null
+++ b/external_imported/vcpkg/ports/libsonic/vcpkg.json
@@ -0,0 +1,19 @@
+{
+  "name": "libsonic",
+  "version": "0.2.0",
+  "description": "Simple library to speed up or slow down speech",
+  "homepage": "https://github.com/waywardgeek/sonic",
+  "license": "Apache-2.0",
+  "supports": "linux | osx",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ],
+  "features": {
+    "tool": {
+      "description": "Build tool"
+    }
+  }
+}
diff --git a/external_imported/vcpkg/ports/libspatialite/fix-mingw.patch b/external_imported/vcpkg/ports/libspatialite/fix-mingw.patch
index c29b03449..abbe3520a 100644
--- a/external_imported/vcpkg/ports/libspatialite/fix-mingw.patch
+++ b/external_imported/vcpkg/ports/libspatialite/fix-mingw.patch
@@ -1,23 +1,10 @@
-diff --git a/src/gaiageo/gg_shape.c b/src/gaiageo/gg_shape.c
-index ee2f1cf..01f2571 100644
---- a/src/gaiageo/gg_shape.c
-+++ b/src/gaiageo/gg_shape.c
-@@ -58,7 +58,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
- #endif
- 
- #ifdef _WIN32
--#include <Windows.h>
-+#include <windows.h>
- #endif
- 
- #if OMIT_ICONV == 0		/* if ICONV is disabled no SHP support is available */
 diff --color -ur a/configure.ac b/configure.ac
 --- a/configure.ac	2022-07-21 17:23:50.490298108 +0200
 +++ b/configure.ac	2022-07-21 17:25:45.671489524 +0200
 @@ -116,7 +116,6 @@
  
  # Checks for installed libraries
- AC_CHECK_LIB(sqlite3,sqlite3_prepare_v2,,AC_MSG_ERROR(['libsqlite3' is required but it doesn't seem to be installed on this system.]),-lm)
+ # AC_CHECK_LIB(sqlite3,sqlite3_prepare_v2,,AC_MSG_ERROR(['libsqlite3' is required but it doesn't seem to be installed on this system.]),-lm)
 -AC_CHECK_LIB(z,inflateInit_,,AC_MSG_ERROR(['libz' is required but it doesn't seem to be installed on this system.]),-lm)
  
  AC_CONFIG_FILES([Makefile \
diff --git a/external_imported/vcpkg/ports/libspatialite/fix-utf8-source.patch b/external_imported/vcpkg/ports/libspatialite/fix-utf8-source.patch
new file mode 100644
index 000000000..76dcf77a5
--- /dev/null
+++ b/external_imported/vcpkg/ports/libspatialite/fix-utf8-source.patch
@@ -0,0 +1,32 @@
+diff --git a/src/srsinit/epsg_inlined_21.c b/src/srsinit/epsg_inlined_21.c
+index 94aa9d4..457b38a 100644
+--- a/src/srsinit/epsg_inlined_21.c
++++ b/src/srsinit/epsg_inlined_21.c
+@@ -619,9 +619,9 @@ initialize_epsg_21 (int filter, struct epsg_defs **first, struct epsg_defs **las
+     add_srs_wkt (p, 27,
+         "lic, Chad, Chile, China, Christmas Island, Cocos (Keelin");
+     add_srs_wkt (p, 28,
+-        "g) Islands, Comoros, Congo, Cook Islands, Costa Rica, CÃ");
++        "g) Islands, Comoros, Congo, Cook Islands, Costa Rica, Cô");
+     add_srs_wkt (p, 29,
+-        "´te d'Ivoire (Ivory Coast), Croatia, Cuba, Curacao, Cypr");
++        "te d'Ivoire (Ivory Coast), Croatia, Cuba, Curacao, Cypr");
+     add_srs_wkt (p, 30,
+         "us, Czechia, Denmark, Djibouti, Dominica, Dominican Repu");
+     add_srs_wkt (p, 31,
+diff --git a/src/srsinit/epsg_inlined_25.c b/src/srsinit/epsg_inlined_25.c
+index 1071eb1..a09cb8c 100644
+--- a/src/srsinit/epsg_inlined_25.c
++++ b/src/srsinit/epsg_inlined_25.c
+@@ -3180,9 +3180,9 @@ initialize_epsg_25 (int filter, struct epsg_defs **first, struct epsg_defs **las
+     add_srs_wkt (p, 26,
+         "lic, Chad, Chile, China, Christmas Island, Cocos (Keelin");
+     add_srs_wkt (p, 27,
+-        "g) Islands, Comoros, Congo, Cook Islands, Costa Rica, CÃ");
++        "g) Islands, Comoros, Congo, Cook Islands, Costa Rica, Cô");
+     add_srs_wkt (p, 28,
+-        "´te d'Ivoire (Ivory Coast), Croatia, Cuba, Curacao, Cypr");
++        "te d'Ivoire (Ivory Coast), Croatia, Cuba, Curacao, Cypr");
+     add_srs_wkt (p, 29,
+         "us, Czechia, Denmark, Djibouti, Dominica, Dominican Repu");
+     add_srs_wkt (p, 30,
diff --git a/external_imported/vcpkg/ports/libspatialite/portfile.cmake b/external_imported/vcpkg/ports/libspatialite/portfile.cmake
index 38a8c2798..2d18c9b2d 100644
--- a/external_imported/vcpkg/ports/libspatialite/portfile.cmake
+++ b/external_imported/vcpkg/ports/libspatialite/portfile.cmake
@@ -1,25 +1,24 @@
-set(LIBSPATIALITE_VERSION_STR "5.0.1")
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-${LIBSPATIALITE_VERSION_STR}.tar.gz"
-    FILENAME "libspatialite-${LIBSPATIALITE_VERSION_STR}.tar.gz"
-    SHA512 c2552994bc30d69d1e80aa274760f048cd384f71e8350a1e48a47cb8222ba71a1554a69c6534eedde9a09dc582c39c089967bcc1c57bf158cc91a3e7b1840ddf
+    URLS "https://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-${VERSION}.tar.gz"
+    FILENAME "libspatialite-${VERSION}.tar.gz"
+    SHA512 2745b373e31cea58623224def6090c491b58409803bb71231450dfa2cfdf3aafc3fc6f680585d55d085008f8cf362c3062ae67ffc7d80257775a22eb81ef1e57
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
     PATCHES
         fix-makefiles.patch
         fix-linux-configure.patch
         gaiaconfig-msvc.patch
         fix-mingw.patch
+        fix-utf8-source.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS unused
     FEATURES
         freexl          ENABLE_FREEXL
         gcp             ENABLE_GCP
-        geocallbacks    ENABLE_GEOCALLBACKS
         rttopo          ENABLE_RTTOPO
 )
 
@@ -39,9 +38,6 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
     if(ENABLE_GCP)
         string(APPEND CL_FLAGS " /DENABLE_GCP")
     endif()
-    if(NOT ENABLE_GEOCALLBACKS)
-        string(APPEND CL_FLAGS " /DOMIT_GEOCALLBACKS")
-    endif()
     if(ENABLE_RTTOPO)
         string(APPEND CL_FLAGS " /DENABLE_RTTOPO")
     endif()
@@ -116,7 +112,6 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
     endif()
 
     set(infile "${SOURCE_PATH}/spatialite.pc.in")
-    set(VERSION "${LIBSPATIALITE_VERSION_STR}")
     set(libdir [[${prefix}/lib]])
     set(exec_prefix [[${prefix}]])
     list(JOIN pkg_config_modules " " requires_private)
@@ -185,10 +180,10 @@ else()
             ${TARGET_ALIAS}
             ${FREEXL_OPTION}
             ${GCP_OPTION}
-            ${GEOCALLBACKS_OPTION}
             ${RTTOPO_OPTION}
             "--disable-examples"
             "--disable-minizip"
+            "cross_compiling=yes" # avoid conftest rpath trouble
         OPTIONS_DEBUG
             "LIBS=${PKGCONFIG_LIBS_DEBUG} ${SYSTEM_LIBS}"
         OPTIONS_RELEASE
diff --git a/external_imported/vcpkg/ports/libspatialite/vcpkg.json b/external_imported/vcpkg/ports/libspatialite/vcpkg.json
index 94f4f9674..64ebbafd0 100644
--- a/external_imported/vcpkg/ports/libspatialite/vcpkg.json
+++ b/external_imported/vcpkg/ports/libspatialite/vcpkg.json
@@ -1,14 +1,20 @@
 {
   "name": "libspatialite",
-  "version": "5.0.1",
-  "port-version": 10,
+  "version": "5.1.0",
+  "port-version": 1,
   "description": "SpatiaLite is an open source library intended to extend the SQLite core to support fully fledged Spatial SQL capabilities.",
-  "homepage": "https://www.gaia-gis.it/gaia-sins/libspatialite-sources",
+  "homepage": "https://www.gaia-gis.it/fossil/libspatialite/index",
   "license": null,
   "dependencies": [
     "geos",
     "libiconv",
-    "libxml2",
+    {
+      "name": "libxml2",
+      "default-features": false,
+      "features": [
+        "http"
+      ]
+    },
     "proj",
     {
       "name": "sqlite3",
@@ -24,8 +30,7 @@
     "zlib"
   ],
   "default-features": [
-    "freexl",
-    "geocallbacks"
+    "freexl"
   ],
   "features": {
     "freexl": {
@@ -37,9 +42,6 @@
     "gcp": {
       "description": "Ground control points support. This feature reduces the license options to GPLv2+."
     },
-    "geocallbacks": {
-      "description": "Geometry callbacks support."
-    },
     "rttopo": {
       "description": "RTTOPO support. This feature reduces the license options to GPLv2+.",
       "dependencies": [
diff --git a/external_imported/vcpkg/ports/libspng/fix-spngconfig-cmake.patch b/external_imported/vcpkg/ports/libspng/fix-spngconfig-cmake.patch
new file mode 100644
index 000000000..b4e868099
--- /dev/null
+++ b/external_imported/vcpkg/ports/libspng/fix-spngconfig-cmake.patch
@@ -0,0 +1,11 @@
+diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in
+index d0123db..5756179 100644
+--- a/cmake/Config.cmake.in
++++ b/cmake/Config.cmake.in
+@@ -1,5 +1,6 @@
+ @PACKAGE_INIT@
+ 
++include(CMakeFindDependencyMacro)
+ find_dependency(ZLIB REQUIRED)
+ 
+ include("${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake")
diff --git a/external_imported/vcpkg/ports/libspng/portfile.cmake b/external_imported/vcpkg/ports/libspng/portfile.cmake
new file mode 100644
index 000000000..2105ae108
--- /dev/null
+++ b/external_imported/vcpkg/ports/libspng/portfile.cmake
@@ -0,0 +1,33 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO randy408/libspng
+    REF "v${VERSION}"
+    SHA512 cd729653599ed97f80d19f3048c1b3bc2ac16f922b3465804b1913bc45d9fc8b28b56bc2121fda36e9d3dcdd12612cced5383313b722a5342b613f8781879f1a
+    HEAD_REF master
+    PATCHES
+        fix-spngconfig-cmake.patch
+)
+
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SPNG_BUILD_STATIC)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SPNG_BUILD_SHARED)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DSPNG_STATIC=${SPNG_BUILD_STATIC}
+        -DSPNG_SHARED=${SPNG_BUILD_SHARED}
+        -DBUILD_EXAMPLES=OFF
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/spng PACKAGE_NAME spng)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_copy_pdbs()
+vcpkg_fixup_pkgconfig()
+
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/libspng/usage b/external_imported/vcpkg/ports/libspng/usage
new file mode 100644
index 000000000..bc69e6a04
--- /dev/null
+++ b/external_imported/vcpkg/ports/libspng/usage
@@ -0,0 +1,4 @@
+libspng provides CMake targets:
+
+    find_package(SPNG CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE $<IF:$<TARGET_EXISTS:spng::spng>,spng::spng,spng::spng_static>) 
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/libspng/vcpkg.json b/external_imported/vcpkg/ports/libspng/vcpkg.json
new file mode 100644
index 000000000..ce1250801
--- /dev/null
+++ b/external_imported/vcpkg/ports/libspng/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "libspng",
+  "version": "0.7.4",
+  "description": "Simple, modern libpng alternative",
+  "homepage": "https://github.com/randy408/libspng",
+  "license": "BSD-2-Clause",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    "zlib"
+  ]
+}
diff --git a/external_imported/vcpkg/ports/libsrt/vcpkg.json b/external_imported/vcpkg/ports/libsrt/vcpkg.json
index d96d44844..7e62bfdd1 100644
--- a/external_imported/vcpkg/ports/libsrt/vcpkg.json
+++ b/external_imported/vcpkg/ports/libsrt/vcpkg.json
@@ -1,11 +1,11 @@
 {
   "name": "libsrt",
   "version": "1.5.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Secure Reliable Transport (SRT) is an open source transport technology that optimizes streaming performance across unpredictable networks, such as the Internet.",
   "homepage": "https://github.com/Haivision/srt",
   "license": "MPL-2.0",
-  "supports": "!uwp",
+  "supports": "!uwp & !xbox",
   "dependencies": [
     "openssl",
     {
diff --git a/external_imported/vcpkg/ports/libsrtp/portfile.cmake b/external_imported/vcpkg/ports/libsrtp/portfile.cmake
index 10d0fe706..1e106fdea 100644
--- a/external_imported/vcpkg/ports/libsrtp/portfile.cmake
+++ b/external_imported/vcpkg/ports/libsrtp/portfile.cmake
@@ -1,31 +1,29 @@
-vcpkg_download_distfile(CMAKE_PR_PATCH
-    URLS https://patch-diff.githubusercontent.com/raw/cisco/libsrtp/pull/573.diff
-    FILENAME libsrtp-pr-573.patch
-    SHA512 58c07977ccbd3dce114f59583a5e10813bbee907af5ef23ec1961b4cfd0791c14326845a376470430978e878c78fb1f598851898a9e9031225628739fb248176
-)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO cisco/libsrtp
-    REF v2.4.2
-    SHA512 6E4805E6D34B2050A6F68F629B0B42356B1D27F2CBAA6CC6166E56957609C3D9AA6B723DCC674E5C74180D122D27BADD2F9496639CCB1E0C210B9E1F7949D0E2
-    PATCHES 
-        ${CMAKE_PR_PATCH}
+    REF "v${VERSION}"
+    SHA512 bd679ab65ccf22ca30fe867b9649a0b84cfa6fad6e22eb10f081141632f6dd56479a04d525b865f11fd46007303ca211065d9c170e4820d6ea7055403702340a
+    PATCHES
         fix-runtime-destination.patch
 )
 
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        openssl ENABLE_OPENSSL
+)
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         "-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake"
+        -DTEST_APPS=OFF
+        ${FEATURE_OPTIONS}
 )
 
 vcpkg_cmake_install()
 
-vcpkg_cmake_config_fixup(
-    CONFIG_PATH lib/cmake/libSRTP
-)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libSRTP)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libsrtp" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/libsrtp/vcpkg.json b/external_imported/vcpkg/ports/libsrtp/vcpkg.json
index be97d2e98..c6f64a826 100644
--- a/external_imported/vcpkg/ports/libsrtp/vcpkg.json
+++ b/external_imported/vcpkg/ports/libsrtp/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "libsrtp",
-  "version": "2.4.2",
-  "port-version": 3,
+  "version": "2.5.0",
+  "port-version": 1,
   "description": "This package provides an implementation of the Secure Real-time Transport Protocol (SRTP), the Universal Security Transform (UST), and a supporting cryptographic kernel.",
   "homepage": "https://github.com/cisco/libsrtp/",
-  "license": null,
+  "license": "BSD-3-Clause",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
@@ -14,5 +14,13 @@
       "name": "vcpkg-cmake-config",
       "host": true
     }
-  ]
+  ],
+  "features": {
+    "openssl": {
+      "description": "Enable OpenSSL support",
+      "dependencies": [
+        "openssl"
+      ]
+    }
+  }
 }
diff --git a/external_imported/vcpkg/ports/libssh/0001-export-pkgconfig-file.patch b/external_imported/vcpkg/ports/libssh/0001-export-pkgconfig-file.patch
index 368ba83b8..9e325b84e 100644
--- a/external_imported/vcpkg/ports/libssh/0001-export-pkgconfig-file.patch
+++ b/external_imported/vcpkg/ports/libssh/0001-export-pkgconfig-file.patch
@@ -18,7 +18,7 @@ index 741dc61..42f0e8f 100644
 +    file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/libssh.pc "\nLibs.private: -lmbedcrypto -lpthread")
 +  else ()
 +    if (WIN32)
-+      file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/libssh.pc "\nLibs.private: -llibcrypto -lUser32 -lCrypt32")
++      file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/libssh.pc "\nLibs.private: -llibcrypto -luser32 -lcrypt32")
 +    else ()
 +      file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/libssh.pc " libcrypto\nLibs.private:")
 +    endif ()
@@ -27,7 +27,7 @@ index 741dc61..42f0e8f 100644
 +    file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/libssh.pc " -lpthread")
 +  endif ()
 +  if (WIN32)
-+    file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/libssh.pc " -lws2_32 -lShell32 -lAdvapi32")
++    file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/libssh.pc " -lws2_32 -lshell32 -ladvapi32")
 +  endif ()
  install(
    FILES
diff --git a/external_imported/vcpkg/ports/libssh/portfile.cmake b/external_imported/vcpkg/ports/libssh/portfile.cmake
index 711721134..bac05c0d6 100644
--- a/external_imported/vcpkg/ports/libssh/portfile.cmake
+++ b/external_imported/vcpkg/ports/libssh/portfile.cmake
@@ -1,8 +1,10 @@
-vcpkg_from_git(
-    OUT_SOURCE_PATH SOURCE_PATH
-    URL https://git.libssh.org/projects/libssh.git
-    REF 9941e89f307e73352d887cac14e4e26b481a0a82 # Latest commit on 2022-11-23
-    FETCH_REF master
+vcpkg_download_distfile(distfile
+    URLS https://www.libssh.org/files/0.10/libssh-${VERSION}.tar.xz
+    FILENAME libssh-${VERSION}.tar.xz
+    SHA512 2b758f9df2b5937865d4aee775ffeafafe3ae6739a89dfc470e38c7394e3c3cb5fcf8f842fdae04929890ee7e47bf8f50e3a38e82dfd26a009f3aae009d589e0
+)
+vcpkg_extract_source_archive(SOURCE_PATH
+    ARCHIVE "${distfile}"
     PATCHES
         0001-export-pkgconfig-file.patch
         0002-mingw_for_Android.patch
@@ -12,7 +14,6 @@ vcpkg_from_git(
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
-        mbedtls WITH_MBEDTLS
         zlib    WITH_ZLIB
 )
 
@@ -35,7 +36,6 @@ vcpkg_cmake_configure(
         -DWITH_SYMBOL_VERSIONING=OFF)
 
 vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
 vcpkg_copy_pdbs()
 #Fixup pthread naming
 if(NOT VCPKG_TARGET_IS_MINGW AND VCPKG_TARGET_IS_WINDOWS)
@@ -55,14 +55,19 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     )
 endif()
 
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libssh)
+file(READ "${CURRENT_PACKAGES_DIR}/share/libssh/libssh-config.cmake" cmake_config)
 if(VCPKG_TARGET_IS_WINDOWS)
-    vcpkg_replace_string(
-        "${CURRENT_PACKAGES_DIR}/share/libssh/libssh-config.cmake"
-        ".dll"
-        ".lib"
-    )
+    string(REPLACE ".dll" ".lib" cmake_config "${cmake_config}")
 endif()
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/libssh/libssh-config.cmake"
+"include(CMakeFindDependencyMacro)
+set(THREADS_PREFER_PTHREAD_FLAG ON)
+find_dependency(Threads)
+${cmake_config}
+")
+
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/libssh/usage b/external_imported/vcpkg/ports/libssh/usage
index 39cb551c3..12998496c 100644
--- a/external_imported/vcpkg/ports/libssh/usage
+++ b/external_imported/vcpkg/ports/libssh/usage
@@ -1,4 +1,4 @@
-The package libssh is compatible with built-in CMake targets:
+libssh provides CMake targets:
 
     find_package(libssh CONFIG REQUIRED)
     target_link_libraries(main PRIVATE ssh)
diff --git a/external_imported/vcpkg/ports/libssh/vcpkg.json b/external_imported/vcpkg/ports/libssh/vcpkg.json
index 55bf4385e..dc6a38f1d 100644
--- a/external_imported/vcpkg/ports/libssh/vcpkg.json
+++ b/external_imported/vcpkg/ports/libssh/vcpkg.json
@@ -1,19 +1,15 @@
 {
   "name": "libssh",
-  "version": "0.10.4+20221123",
-  "port-version": 3,
+  "version": "0.10.5",
+  "port-version": 1,
   "description": "libssh is a multiplatform C library implementing the SSHv2 protocol on client and server side",
   "homepage": "https://www.libssh.org/",
   "license": "LGPL-2.1-only",
-  "supports": "!uwp",
+  "supports": "!uwp & !xbox",
   "dependencies": [
     {
-      "name": "libssh",
-      "default-features": false,
-      "features": [
-        "mbedtls"
-      ],
-      "platform": "android"
+      "name": "openssl",
+      "default-features": false
     },
     {
       "name": "vcpkg-cmake",
@@ -24,43 +20,7 @@
       "host": true
     }
   ],
-  "default-features": [
-    "crypto"
-  ],
   "features": {
-    "crypto": {
-      "description": "Default crypto backend",
-      "dependencies": [
-        {
-          "name": "libssh",
-          "features": [
-            "mbedtls"
-          ]
-        }
-      ]
-    },
-    "mbedtls": {
-      "description": "Crypto support (mbedTLS)",
-      "dependencies": [
-        {
-          "name": "mbedtls",
-          "default-features": false
-        },
-        {
-          "name": "mbedtls",
-          "features": [
-            "pthreads"
-          ],
-          "platform": "!android"
-        }
-      ]
-    },
-    "openssl": {
-      "description": "Crypto support (OpenSSL)",
-      "dependencies": [
-        "openssl"
-      ]
-    },
     "zlib": {
       "description": "libssh with zlib",
       "dependencies": [
diff --git a/external_imported/vcpkg/ports/libssh2/0001-Fix-UWP.patch b/external_imported/vcpkg/ports/libssh2/0001-Fix-UWP.patch
deleted file mode 100644
index 8a7190f89..000000000
--- a/external_imported/vcpkg/ports/libssh2/0001-Fix-UWP.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 6401acf..64de3e9 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -349,7 +349,7 @@ target_include_directories(libssh2 PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
- # Check for the OS.
- # Daniel's note: this should not be necessary and we need to work to
- # get this removed.
--if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-+if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows" OR ${CMAKE_SYSTEM_NAME} STREQUAL "WindowsStore")
-   target_compile_definitions(libssh2 PRIVATE LIBSSH2_WIN32)
- elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
-   target_compile_definitions(libssh2 PRIVATE LIBSSH2_DARWIN)
-diff --git a/src/agent.c b/src/agent.c
-index c2ba422..f1799f8 100644
---- a/src/agent.c
-+++ b/src/agent.c
-@@ -55,6 +55,10 @@
- #include <stdlib.h>
- #endif
- 
-+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP)
-+#define IS_UWP 1
-+#endif  /* #if defined(WINAPI_FAMILY) */
-+
- /* Requests from client to agent for protocol 1 key operations */
- #define SSH_AGENTC_REQUEST_RSA_IDENTITIES 1
- #define SSH_AGENTC_RSA_CHALLENGE 3
-@@ -254,7 +258,7 @@ struct agent_ops agent_ops_unix = {
- };
- #endif  /* PF_UNIX */
- 
--#ifdef WIN32
-+#if defined(WIN32) && !defined(IS_UWP)
- /* Code to talk to Pageant was taken from PuTTY.
-  *
-  * Portions copyright Robert de Bath, Joris van Rantwijk, Delian
-@@ -362,8 +366,8 @@ static struct {
-     const char *name;
-     struct agent_ops *ops;
- } supported_backends[] = {
--#ifdef WIN32
--    {"Pageant", &agent_ops_pageant},
-+#if defined(WIN32) && !defined(IS_UWP)
-+    {"Pageant", &agent_ops_pageant},
-     {"OpenSSH", &agent_ops_openssh},
- #endif  /* WIN32 */
- #ifdef PF_UNIX
-diff --git a/src/agent_win.c b/src/agent_win.c
---- a/src/agent_win.c
-+++ b/src/agent_win.c
-@@ -55,7 +55,11 @@
- #include <stdlib.h>
- #endif
- 
--#ifdef WIN32
-+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP)
-+#define IS_UWP 1
-+#endif  /* #if defined(WINAPI_FAMILY) */
-+
-+#if defined(WIN32) && !defined(IS_UWP)
- /* Code to talk to OpenSSH was taken and modified from the Win32 port of
-  * Portable OpenSSH by the PowerShell team. Commit
-  * 8ab565c53f3619d6a1f5ac229e212cad8a52852c of
diff --git a/external_imported/vcpkg/ports/libssh2/0002-fix-macros.patch b/external_imported/vcpkg/ports/libssh2/0002-fix-macros.patch
deleted file mode 100644
index dc0f71933..000000000
--- a/external_imported/vcpkg/ports/libssh2/0002-fix-macros.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 2539607..eceb5a0 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -355,9 +355,12 @@ target_include_directories(libssh2 PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
- # Daniel's note: this should not be necessary and we need to work to
- # get this removed.
- if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows" OR ${CMAKE_SYSTEM_NAME} STREQUAL "WindowsStore")
--  target_compile_definitions(libssh2 PRIVATE LIBSSH2_WIN32)
-+  target_compile_definitions(libssh2 PUBLIC LIBSSH2_WIN32)
-+  if (BUILD_SHARED_LIBS)
-+    target_compile_definitions(libssh2 PUBLIC _WINDLL PRIVATE LIBSSH2_LIBRARY)
-+  endif()
- elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
--  target_compile_definitions(libssh2 PRIVATE LIBSSH2_DARWIN)
-+  target_compile_definitions(libssh2 PUBLIC LIBSSH2_DARWIN)
- endif()
- 
- if(MSVC)
diff --git a/external_imported/vcpkg/ports/libssh2/0003-fix-openssl3.patch b/external_imported/vcpkg/ports/libssh2/0003-fix-openssl3.patch
deleted file mode 100644
index 71aa61827..000000000
--- a/external_imported/vcpkg/ports/libssh2/0003-fix-openssl3.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cmake/max_warnings.cmake b/cmake/max_warnings.cmake
-index b176d30..e986461 100644
---- a/cmake/max_warnings.cmake
-+++ b/cmake/max_warnings.cmake
-@@ -13,6 +13,8 @@ if(MSVC)
- 
-   # Disable broken warnings
-   add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE)
-+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996")
-+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996")
- elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-   if(NOT CMAKE_CXX_FLAGS MATCHES "-Wall")
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
diff --git a/external_imported/vcpkg/ports/libssh2/portfile.cmake b/external_imported/vcpkg/ports/libssh2/portfile.cmake
index d81f25812..eb463470d 100644
--- a/external_imported/vcpkg/ports/libssh2/portfile.cmake
+++ b/external_imported/vcpkg/ports/libssh2/portfile.cmake
@@ -1,19 +1,27 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libssh2/libssh2
-    REF libssh2-1.10.0
-    SHA512 615E28880695911F5700CC7AC3DDA6B894384C0B1D8B02B53C2EB58F1839F47211934A292F490AD7DDEF7E63F332E0EBF44F8E6334F64BE8D143C72032356C1F
+    REF "libssh2-${VERSION}"
+    SHA512 8ae38d76e7fae82843c7c6990760ad5827cb55e2aba096f684b832016614d76983d1871ae0857ba28efcb9fd65018ae0b34420f6841da6bb6c6ccebd9689ec0f
     HEAD_REF master
-    PATCHES
-        0001-Fix-UWP.patch
-        0002-fix-macros.patch
-        0003-fix-openssl3.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
-        zlib ENABLE_ZLIB_COMPRESSION
+        zlib    ENABLE_ZLIB_COMPRESSION
+    INVERTED_FEATURES
+        zlib    CMAKE_DISABLE_FIND_PACKAGE_ZLIB # for use by the cryto backend
 )
+if("openssl" IN_LIST FEATURES)
+    list(APPEND FEATURE_OPTIONS "-DCRYPTO_BACKEND=OpenSSL")
+elseif(VCPKG_TARGET_IS_WINDOWS)
+    list(APPEND FEATURE_OPTIONS "-DCRYPTO_BACKEND=WinCNG")
+else()
+    message(FATAL_ERROR "Port ${PORT} only supports OpenSSL and WinCNG crypto backends.")
+endif()
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    list(APPEND FEATURE_OPTIONS "-DBUILD_STATIC_LIBS:BOOL=OFF")
+endif()
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
@@ -23,10 +31,13 @@ vcpkg_cmake_configure(
         ${FEATURE_OPTIONS}
     OPTIONS_DEBUG
         -DENABLE_DEBUG_LOGGING=OFF
+    MAYBE_UNUSED_VARIABLES
+        CMAKE_DISABLE_FIND_PACKAGE_ZLIB
 )
 
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
+vcpkg_fixup_pkgconfig()
 
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libssh2)
 
@@ -37,14 +48,18 @@ if (VCPKG_TARGET_IS_WINDOWS)
     else()
         vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libssh2.h" "ifdef _WINDLL" "if 0")
     endif()
+    if(VCPKG_TARGET_STATIC_LIBRARY_PREFIX STREQUAL "")
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libssh2.pc" " -lssh2" " -llibssh2")
+        if(NOT VCPKG_BUILD_TYPE)
+            vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libssh2.pc" " -lssh2" " -llibssh2")
+        endif()
+    endif()
 endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-# Do not delete the entire share directory as it contains the *-config.cmake files
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/man")
 
-vcpkg_fixup_pkgconfig()
-
+file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/external_imported/vcpkg/ports/libssh2/usage b/external_imported/vcpkg/ports/libssh2/usage
new file mode 100644
index 000000000..19cb75198
--- /dev/null
+++ b/external_imported/vcpkg/ports/libssh2/usage
@@ -0,0 +1,4 @@
+libssh2 provides CMake targets:
+
+    find_package(Libssh2 CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE $<IF:$<TARGET_EXISTS:Libssh2::libssh2_shared>,Libssh2::libssh2_shared,Libssh2::libssh2_static>)
diff --git a/external_imported/vcpkg/ports/libssh2/vcpkg.json b/external_imported/vcpkg/ports/libssh2/vcpkg.json
index 157bf7243..26a31cb8c 100644
--- a/external_imported/vcpkg/ports/libssh2/vcpkg.json
+++ b/external_imported/vcpkg/ports/libssh2/vcpkg.json
@@ -1,12 +1,19 @@
 {
   "name": "libssh2",
-  "version": "1.10.0",
-  "port-version": 4,
+  "version": "1.11.0",
+  "port-version": 1,
   "description": "libssh2 is a client-side C library implementing the SSH2 protocol.",
   "homepage": "https://www.libssh2.org",
   "license": "BSD-3-Clause",
   "dependencies": [
-    "openssl",
+    {
+      "name": "libssh2",
+      "default-features": false,
+      "features": [
+        "openssl"
+      ],
+      "platform": "!windows"
+    },
     {
       "name": "vcpkg-cmake",
       "host": true
@@ -17,11 +24,18 @@
     }
   ],
   "default-features": [
+    "openssl",
     "zlib"
   ],
   "features": {
+    "openssl": {
+      "description": "Use the openssl crypto backend",
+      "dependencies": [
+        "openssl"
+      ]
+    },
     "zlib": {
-      "description": "Use compressing via zlib",
+      "description": "Use compression via zlib",
       "dependencies": [
         "zlib"
       ]
diff --git a/external_imported/vcpkg/ports/libstemmer/vcpkg.json b/external_imported/vcpkg/ports/libstemmer/vcpkg.json
index 0934c2c02..9061c7b63 100644
--- a/external_imported/vcpkg/ports/libstemmer/vcpkg.json
+++ b/external_imported/vcpkg/ports/libstemmer/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libstemmer",
-  "version-string": "2017-9",
-  "port-version": 7,
+  "version": "2017-9",
+  "port-version": 8,
   "description": "Snowball is a small string processing language designed for creating stemming algorithms for use in Information Retrieval",
   "homepage": "https://snowball.tartarus.org/",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/libstk/vcpkg.json b/external_imported/vcpkg/ports/libstk/vcpkg.json
index 508767d2c..39abd67e9 100644
--- a/external_imported/vcpkg/ports/libstk/vcpkg.json
+++ b/external_imported/vcpkg/ports/libstk/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libstk",
-  "version-string": "4.6.1",
-  "port-version": 2,
+  "version": "4.6.1",
+  "port-version": 3,
   "description": "The Synthesis ToolKit in C++ (STK) is a set of open source audio signal processing and algorithmic synthesis classes written in the C++ programming language.",
   "dependencies": [
     {
diff --git a/external_imported/vcpkg/ports/libsvm/portfile.cmake b/external_imported/vcpkg/ports/libsvm/portfile.cmake
index 674014c0f..f56d16938 100644
--- a/external_imported/vcpkg/ports/libsvm/portfile.cmake
+++ b/external_imported/vcpkg/ports/libsvm/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO cjlin1/libsvm
-    REF v325
-    SHA512 D5323B128DFCDC7F64B2161E70FA7999C0A93D47C90B366BE066AA01EA92B5817F04812DEF2E05469DEE1F26C6A83DA5E50EEAE3F50B4062D9B24AC0944C6203
+    REF v332
+    SHA512 1b649e6baa7b23a082d510921d0be7b75c04331844c3057587db36b0f5a5a0a6a44ae3f187c2ffa19d70bc1bf25ea8c724ac2cd5c1842d684747469b5c99b9f6
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/libsvm/vcpkg.json b/external_imported/vcpkg/ports/libsvm/vcpkg.json
index d99a9112d..a26218dcb 100644
--- a/external_imported/vcpkg/ports/libsvm/vcpkg.json
+++ b/external_imported/vcpkg/ports/libsvm/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "libsvm",
-  "version": "3.25",
+  "version": "3.32",
   "description": "A library for Support Vector Machines.",
   "homepage": "https://www.csie.ntu.edu.tw/~cjlin/libsvm/",
   "dependencies": [
@@ -15,7 +15,8 @@
   ],
   "features": {
     "tools": {
-      "description": "build libsvm CLI tools."
+      "description": "build libsvm CLI tools.",
+      "supports": "!uwp"
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/libsystemd/pkgconfig.patch b/external_imported/vcpkg/ports/libsystemd/pkgconfig.patch
new file mode 100644
index 000000000..1c6f5dee3
--- /dev/null
+++ b/external_imported/vcpkg/ports/libsystemd/pkgconfig.patch
@@ -0,0 +1,11 @@
+diff --git a/src/libsystemd/libsystemd.pc.in b/src/libsystemd/libsystemd.pc.in
+index da6e4e667e..3786238ccb 100644
+--- a/src/libsystemd/libsystemd.pc.in
++++ b/src/libsystemd/libsystemd.pc.in
+@@ -17,4 +17,6 @@ Description: systemd Library
+ URL: {{PROJECT_URL}}
+ Version: {{PROJECT_VERSION}}
+ Libs: -L${libdir} -lsystemd
++Libs.private: -lrt
++Requires.private: libcap libcrypt liblz4 liblzma libzstd mount
+ Cflags: -I${includedir}
diff --git a/external_imported/vcpkg/ports/libsystemd/portfile.cmake b/external_imported/vcpkg/ports/libsystemd/portfile.cmake
new file mode 100644
index 000000000..2db5d2866
--- /dev/null
+++ b/external_imported/vcpkg/ports/libsystemd/portfile.cmake
@@ -0,0 +1,60 @@
+vcpkg_from_github(
+  OUT_SOURCE_PATH SOURCE_PATH
+  REPO systemd/systemd
+  REF "v${VERSION}"
+  SHA512 84b4d16980fe2e64d5c3c95b9b4fbaad1076f368f493fdd745cbafbe7ce825293384f5fa0b6360ba8188da23c4575e87402fb666a3b71f84ff8b323aba0c07ff
+  PATCHES
+    pkgconfig.patch
+)
+
+vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/gperf")
+
+vcpkg_configure_meson(
+  SOURCE_PATH "${SOURCE_PATH}"
+  OPTIONS
+    -Dstatic-libsystemd=true
+    -Daudit=false
+    -Dgcrypt=false
+  OPTIONS_DEBUG
+    -Drootprefix=${CURRENT_PACKAGES_DIR}/debug
+    -Dpkgconfiglibdir={CURRENT_PACKAGES_DIR}/debug
+  OPTIONS_RELEASE
+    -Drootprefix=${CURRENT_PACKAGES_DIR}
+    -Dpkgconfiglibdir={CURRENT_PACKAGES_DIR}
+)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+  vcpkg_build_ninja(
+    TARGETS libsystemd.a devel
+  )
+else()
+  vcpkg_build_ninja(
+    TARGETS libsystemd devel
+  )
+endif()
+
+file(INSTALL "${SOURCE_PATH}/src/systemd" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN "*.h")
+
+set(BUILD_DIR_RELEASE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+  file(INSTALL "${BUILD_DIR_RELEASE}/libsystemd.a" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
+else()
+  file(INSTALL "${BUILD_DIR_RELEASE}/libsystemd.so" DESTINATION "${CURRENT_PACKAGES_DIR}/lib" FOLLOW_SYMLINK_CHAIN)
+endif()
+
+if(NOT VCPKG_BUILD_TYPE)
+  set(BUILD_DIR_DEBUG "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg")
+  if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(INSTALL "${BUILD_DIR_DEBUG}/libsystemd.a" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
+  else()
+    file(INSTALL "${BUILD_DIR_DEBUG}/libsystemd.so" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" FOLLOW_SYMLINK_CHAIN)
+  endif()
+endif()
+
+file(INSTALL "${BUILD_DIR_RELEASE}/src/libsystemd/libsystemd.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig")
+if(NOT VCPKG_BUILD_TYPE)
+  file(INSTALL "${BUILD_DIR_DEBUG}/src/libsystemd/libsystemd.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
+endif()
+
+vcpkg_fixup_pkgconfig()
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.LGPL2.1")
diff --git a/external_imported/vcpkg/ports/libsystemd/vcpkg.json b/external_imported/vcpkg/ports/libsystemd/vcpkg.json
new file mode 100644
index 000000000..71bd37655
--- /dev/null
+++ b/external_imported/vcpkg/ports/libsystemd/vcpkg.json
@@ -0,0 +1,25 @@
+{
+  "name": "libsystemd",
+  "version": "254",
+  "port-version": 2,
+  "description": "Libsystemd",
+  "homepage": "https://github.com/systemd/systemd",
+  "license": "LGPL-2.1+",
+  "supports": "linux",
+  "dependencies": [
+    {
+      "name": "gperf",
+      "host": true
+    },
+    "libcap",
+    "liblzma",
+    "libmount",
+    "libxcrypt",
+    "lz4",
+    {
+      "name": "vcpkg-tool-meson",
+      "host": true
+    },
+    "zstd"
+  ]
+}
diff --git a/external_imported/vcpkg/ports/libtar/portfile.cmake b/external_imported/vcpkg/ports/libtar/portfile.cmake
new file mode 100644
index 000000000..23ba8c956
--- /dev/null
+++ b/external_imported/vcpkg/ports/libtar/portfile.cmake
@@ -0,0 +1,15 @@
+vcpkg_from_git(
+    OUT_SOURCE_PATH SOURCE_PATH
+    URL https://repo.or.cz/libtar.git
+    REF 6d0ab4c78e7a8305c36a0c3d63fd25cd1493de65 # latest on master
+)
+
+vcpkg_configure_make(
+    SOURCE_PATH "${SOURCE_PATH}"
+)
+
+vcpkg_install_make()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include"  "${CURRENT_PACKAGES_DIR}/debug/share")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYRIGHT")
diff --git a/external_imported/vcpkg/ports/libtar/vcpkg.json b/external_imported/vcpkg/ports/libtar/vcpkg.json
new file mode 100644
index 000000000..d07de7154
--- /dev/null
+++ b/external_imported/vcpkg/ports/libtar/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "libtar",
+  "version": "1.2.20",
+  "description": "libtar - C library for manipulating tar files",
+  "homepage": "https://repo.or.cz/libtar.git",
+  "supports": "!windows"
+}
diff --git a/external_imported/vcpkg/ports/libtcod/portfile.cmake b/external_imported/vcpkg/ports/libtcod/portfile.cmake
index 8322bef1f..0c8051c79 100644
--- a/external_imported/vcpkg/ports/libtcod/portfile.cmake
+++ b/external_imported/vcpkg/ports/libtcod/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libtcod/libtcod
-    REF 1.23.1
-    SHA512 d01e168b02c0540e193f65ad630180b26ac1690b9386aac039149493f436938fed4a0499ac70235f53d2675df595b7223401804b3bd2d8660917020e911f12c9
+    REF 1.24.0
+    SHA512 21aae343297ea4aefb89f3bc8fd06c7059e4f59dc34c26ef294f4211873f29bf26b5c600746db8af7eda9e9f5ab270bfd862ab34ae3c409051dcad6bb219df8a
     HEAD_REF main
 )
 
diff --git a/external_imported/vcpkg/ports/libtcod/vcpkg.json b/external_imported/vcpkg/ports/libtcod/vcpkg.json
index b3b15e936..5e5a205e0 100644
--- a/external_imported/vcpkg/ports/libtcod/vcpkg.json
+++ b/external_imported/vcpkg/ports/libtcod/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "libtcod",
-  "version": "1.23.1",
+  "version": "1.24.0",
   "maintainers": "Kyle Benesch <4b796c65+github@gmail.com>",
   "description": "Common algorithms and tools for roguelikes.",
   "homepage": "https://github.com/libtcod/libtcod",
diff --git a/external_imported/vcpkg/ports/libtheora/CMakeLists.txt b/external_imported/vcpkg/ports/libtheora/CMakeLists.txt
index 79d882779..1e2d4b8a7 100644
--- a/external_imported/vcpkg/ports/libtheora/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/libtheora/CMakeLists.txt
@@ -141,3 +141,16 @@ install(EXPORT unofficial-theora-targets
   NAMESPACE unofficial::theora::
   DESTINATION "lib/unofficial-theora"
 )
+
+set(prefix "${CMAKE_INSTALL_PREFIX}")
+set(libdir "\${prefix}/lib")
+set(exec_prefix "\${prefix}")
+set(includedir "\${prefix}/include")
+configure_file(theora.pc.in theora.pc @ONLY)
+configure_file(theoradec.pc.in theoradec.pc @ONLY)
+configure_file(theoraenc.pc.in theoraenc.pc @ONLY)
+
+install(
+  FILES "${PROJECT_BINARY_DIR}/theora.pc" "${PROJECT_BINARY_DIR}/theoradec.pc" "${PROJECT_BINARY_DIR}/theoraenc.pc"
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
+)
diff --git a/external_imported/vcpkg/ports/libtheora/portfile.cmake b/external_imported/vcpkg/ports/libtheora/portfile.cmake
index 670fe8a42..b2e324e2e 100644
--- a/external_imported/vcpkg/ports/libtheora/portfile.cmake
+++ b/external_imported/vcpkg/ports/libtheora/portfile.cmake
@@ -21,12 +21,13 @@ endif()
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
+        "-DVERSION:STRING=${VERSION}"
         -DUSE_X86=${THEORA_X86_OPT}
 )
 
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH "lib/unofficial-theora" PACKAGE_NAME "unofficial-theora")
-
+vcpkg_fixup_pkgconfig()
 vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/external_imported/vcpkg/ports/libtheora/vcpkg.json b/external_imported/vcpkg/ports/libtheora/vcpkg.json
index abbc322d3..a64f03104 100644
--- a/external_imported/vcpkg/ports/libtheora/vcpkg.json
+++ b/external_imported/vcpkg/ports/libtheora/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libtheora",
   "version-string": "1.2.0alpha1-20170719",
-  "port-version": 6,
+  "port-version": 7,
   "description": "Theora is a free and open video compression format from the Xiph.org Foundation.",
   "homepage": "https://github.com/xiph/theora",
   "license": null,
diff --git a/external_imported/vcpkg/ports/libtins/fix_include.patch b/external_imported/vcpkg/ports/libtins/fix_include.patch
new file mode 100644
index 000000000..c069cc0cc
--- /dev/null
+++ b/external_imported/vcpkg/ports/libtins/fix_include.patch
@@ -0,0 +1,22 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 94bc8bf..14a15e9 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -211,6 +211,7 @@ ADD_LIBRARY(
+ )
+ 
+ TARGET_LINK_LIBRARIES(tins ${PCAP_LIBRARY} ${OPENSSL_LIBRARIES} ${LIBTINS_OS_LIBS})
++target_include_directories(tins PUBLIC $<INSTALL_INTERFACE:include>)
+ 
+ SET_TARGET_PROPERTIES(tins PROPERTIES OUTPUT_NAME tins)
+ SET_TARGET_PROPERTIES(tins PROPERTIES VERSION ${LIBTINS_VERSION} SOVERSION ${LIBTINS_VERSION} )
+diff --git a/libtins.pc.in b/libtins.pc.in
+index e9a5c29..c7e3f6c 100644
+--- a/libtins.pc.in
++++ b/libtins.pc.in
+@@ -7,4 +7,4 @@ Name: libtins
+ Description: C++ packet crafting, sniffing and interpretation library.
+ Version: @pkgconfig_version@
+ Libs: -L${libdir} -ltins
+-Cflags: -I${includedir}/tins
++Cflags: -I${includedir}
diff --git a/external_imported/vcpkg/ports/libtins/portfile.cmake b/external_imported/vcpkg/ports/libtins/portfile.cmake
index 62cbde451..5d46ddbe5 100644
--- a/external_imported/vcpkg/ports/libtins/portfile.cmake
+++ b/external_imported/vcpkg/ports/libtins/portfile.cmake
@@ -1,12 +1,13 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mfontanini/libtins
-    REF v4.3
-    SHA512 29d606004fe9a440c9a53eede42fd5c6dbd049677d2cca2c5cfd26311ee2ca4c64ca3e665fbc81efd5bfab5577a5181ed0754c617e139317d9ae0cabba05aff7
+    REF "v${VERSION}"
+    SHA512 d8887949cb545dbaf4247c8405feb5cc1032f370bb418dd5344043dc97555b1b826a8d33cfc7dd0a7a9a9af6f3a46bd6fcbed89f98d5eb23fdd10294f823fcd6
     HEAD_REF master
     PATCHES
         fix-source-writes.patch
         find-pcap_static.patch
+        fix_include.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LIBTINS_BUILD_SHARED)
diff --git a/external_imported/vcpkg/ports/libtins/vcpkg.json b/external_imported/vcpkg/ports/libtins/vcpkg.json
index c9a7daa96..8dcb5c09e 100644
--- a/external_imported/vcpkg/ports/libtins/vcpkg.json
+++ b/external_imported/vcpkg/ports/libtins/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "libtins",
-  "version": "4.3",
-  "port-version": 6,
+  "version": "4.5",
   "description": "High-level, multiplatform C++ network packet sniffing and crafting library",
   "license": "BSD-2-Clause",
   "supports": "!uwp",
diff --git a/external_imported/vcpkg/ports/libtomcrypt/vcpkg.json b/external_imported/vcpkg/ports/libtomcrypt/vcpkg.json
index 4607ff076..ef092d8e3 100644
--- a/external_imported/vcpkg/ports/libtomcrypt/vcpkg.json
+++ b/external_imported/vcpkg/ports/libtomcrypt/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libtomcrypt",
-  "version-string": "1.18.2",
-  "port-version": 2,
+  "version": "1.18.2",
+  "port-version": 3,
   "description": "LibTomCrypt is a fairly comprehensive, modular and portable cryptographic toolkit that provides developers with a vast array of well known published block ciphers, one-way hash functions, chaining modes, pseudo-random number generators, public key cryptography and a plethora of other routines.",
   "homepage": "https://www.libtom.net/LibTomCrypt/",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/libtommath/portfile.cmake b/external_imported/vcpkg/ports/libtommath/portfile.cmake
index 746ead449..b01e62e69 100644
--- a/external_imported/vcpkg/ports/libtommath/portfile.cmake
+++ b/external_imported/vcpkg/ports/libtommath/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libtom/libtommath
-    REF v1.2.0
-    SHA512 500bce4467d6cdb0b014e6c66d3b994a8d63b51475db6c3cd77c15c8368fbab4e3b5c458fcd5b35838b74c457a33c15b42d2356964f5ef2a0bd31fd544735c9a
+    REF "v${VERSION}"
+    SHA512 8da4a935913e8a44a24ba7d8c2bc4926398bdc9aea0cd4975418771979c2b7667c2ee04e8a7e38f04cc87abe5bb369fcbf9167ab662ad747602fc840cb3788e6
     HEAD_REF develop
 )
 
diff --git a/external_imported/vcpkg/ports/libtommath/vcpkg.json b/external_imported/vcpkg/ports/libtommath/vcpkg.json
index e6472aa8f..aa0312f7f 100644
--- a/external_imported/vcpkg/ports/libtommath/vcpkg.json
+++ b/external_imported/vcpkg/ports/libtommath/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "libtommath",
-  "version-string": "1.2.0",
-  "port-version": 2,
+  "version": "1.2.1",
   "description": "LibTomMath is a free open source portable number theoretic multiple-precision integer library written entirely in C.",
   "homepage": "https://www.libtom.net/LibTomMath/"
 }
diff --git a/external_imported/vcpkg/ports/libtorch/clang-cl.patch b/external_imported/vcpkg/ports/libtorch/clang-cl.patch
new file mode 100644
index 000000000..4c1968319
--- /dev/null
+++ b/external_imported/vcpkg/ports/libtorch/clang-cl.patch
@@ -0,0 +1,47 @@
+diff --git a/c10/util/Exception.h b/c10/util/Exception.h
+index 2dd1001..b3f3d60 100644
+--- a/c10/util/Exception.h
++++ b/c10/util/Exception.h
+@@ -233,12 +233,16 @@ struct C10_API WarnAlways {
+ // IndexError when they cross to Python.
+ class C10_API IndexError : public Error {
+   using Error::Error;
++public:
++  inline IndexError(SourceLocation source_location, std::string msg) : Error(source_location,msg) {};
+ };
+ 
+ // Used in ATen for invalid values.  These turn into
+ // ValueError when they cross to Python.
+ class C10_API ValueError : public Error {
+   using Error::Error;
++public:
++  inline ValueError(SourceLocation source_location, std::string msg) : Error(source_location,msg) {};
+ };
+ 
+ // Used in ATen for invalid types.  These turn into
+diff --git a/caffe2/CMakeLists.txt b/caffe2/CMakeLists.txt
+index cf349c2..f7a595e 100644
+--- a/caffe2/CMakeLists.txt
++++ b/caffe2/CMakeLists.txt
+@@ -830,7 +830,7 @@ if(BUILD_CAFFE2 AND NOT MSVC)
+   target_compile_options(torch_cpu PRIVATE "-Wno-sign-compare")
+ endif()
+ 
+-if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" AND NOT USE_VULKAN AND NOT USE_IOS AND NOT USE_PYTORCH_METAL AND NOT USE_COREML_DELEGATE)
++if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" AND NOT USE_VULKAN AND NOT USE_IOS AND NOT USE_PYTORCH_METAL AND NOT USE_COREML_DELEGATE AND NOT MSVC)
+   target_compile_options_if_supported(torch_cpu "-Wmissing-prototypes")
+   target_compile_options_if_supported(torch_cpu "-Werror=missing-prototypes")
+   get_target_property(TORCH_CPU_SOURCES torch_cpu SOURCES)
+diff --git a/functorch/csrc/dim/arena.h b/functorch/csrc/dim/arena.h
+index 3251321..cb09b7c 100644
+--- a/functorch/csrc/dim/arena.h
++++ b/functorch/csrc/dim/arena.h
+@@ -8,7 +8,7 @@
+ #include <ATen/ATen.h>
+ #include "minpybind.h"
+ 
+-#ifdef _WIN32
++#if defined(_WIN32) && !defined(__clang__)
+ #include <intrin.h>
+ // https://stackoverflow.com/questions/355967/how-to-use-msvc-intrinsics-to-get-the-equivalent-of-this-gcc-code
+ inline unsigned int __builtin_clz(unsigned int x) {
diff --git a/external_imported/vcpkg/ports/libtorch/cmake-fixes.patch b/external_imported/vcpkg/ports/libtorch/cmake-fixes.patch
new file mode 100644
index 000000000..e094e3751
--- /dev/null
+++ b/external_imported/vcpkg/ports/libtorch/cmake-fixes.patch
@@ -0,0 +1,235 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3a48eaf4e2..7b8bc7cb6e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1049,8 +1049,7 @@ if(USE_MIMALLOC)
+   set(MI_BUILD_OBJECT OFF)
+   set(MI_BUILD_TESTS OFF)
+   add_definitions(-DUSE_MIMALLOC)
+-  add_subdirectory(third_party/mimalloc)
+-  include_directories(third_party/mimalloc/include)
++  find_package(mimalloc REQUIRED)
+ endif()
+ 
+ # ---[ Main build
+diff --git a/aten/src/ATen/native/quantized/cpu/qnnpack/CMakeLists.txt b/aten/src/ATen/native/quantized/cpu/qnnpack/CMakeLists.txt
+index fd6b7ff551..d185233529 100644
+--- a/aten/src/ATen/native/quantized/cpu/qnnpack/CMakeLists.txt
++++ b/aten/src/ATen/native/quantized/cpu/qnnpack/CMakeLists.txt
+@@ -368,7 +368,7 @@ elseif(NOT TARGET pthreadpool AND USE_SYSTEM_PTHREADPOOL)
+   if(NOT PTHREADPOOL_LIBRARY)
+     message(FATAL_ERROR "Cannot find pthreadpool")
+   endif()
+-  message("-- Found pthreadpool: ${PTHREADPOOL_LIBRARY}")
++  message("-- Found pthreadpool cpu qnnpack: ${PTHREADPOOL_LIBRARY}")
+   set_target_properties(pthreadpool PROPERTIES
+     IMPORTED_LOCATION "${PTHREADPOOL_LIBRARY}")
+   add_library(pthreadpool_interface INTERFACE)
+diff --git a/c10/CMakeLists.txt b/c10/CMakeLists.txt
+index feebad7cbb..ad407e18cb 100644
+--- a/c10/CMakeLists.txt
++++ b/c10/CMakeLists.txt
+@@ -109,8 +109,7 @@ else()
+ endif()
+ 
+ if(USE_MIMALLOC)
+-  target_link_libraries(c10 PRIVATE "mimalloc-static")
+-  add_dependencies(c10 mimalloc-static)
++  target_link_libraries(c10 PRIVATE "mimalloc")
+ endif()
+ 
+ if(ANDROID)
+diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
+index c3abce52e4..cd27c728ff 100644
+--- a/cmake/Dependencies.cmake
++++ b/cmake/Dependencies.cmake
+@@ -285,7 +285,7 @@ endif()
+ set(AT_FFTW_ENABLED 0)
+ set(USE_FFTW OFF)
+ if(USE_FFTW OR NOT MKL_FOUND)
+-  find_library(LIBFFTW3 fftw3)
++  find_library(LIBFFTW3 NAMES fftw3 REQUIRED)
+   if(LIBFFTW3)
+     find_path(FFTW3_INCLUDE_DIR NAMES fftw3.h ONLY_CMAKE_FIND_ROOT_PATH)
+     if(FFTW3_INCLUDE_DIR)
+@@ -415,8 +415,8 @@ if(INTERN_BUILD_MOBILE OR NOT DISABLE_NNPACK_AND_FAMILY)
+ 
+   if(NOT TARGET pthreadpool)
+     if(USE_SYSTEM_PTHREADPOOL)
+-      add_library(pthreadpool SHARED IMPORTED)
+-      find_library(PTHREADPOOL_LIBRARY pthreadpool)
++      add_library(pthreadpool UNKNOWN IMPORTED)
++      find_library(PTHREADPOOL_LIBRARY pthreadpool PATH_SUFFIXES lib)
+       set_property(TARGET pthreadpool PROPERTY IMPORTED_LOCATION "${PTHREADPOOL_LIBRARY}")
+       if(NOT PTHREADPOOL_LIBRARY)
+         message(FATAL_ERROR "Cannot find pthreadpool")
+@@ -450,13 +450,15 @@ endif()
+ 
+ # ---[ Caffe2 uses cpuinfo library in the thread pool
+ if(NOT TARGET cpuinfo AND USE_SYSTEM_CPUINFO)
+-  add_library(cpuinfo SHARED IMPORTED)
+-  find_library(CPUINFO_LIBRARY cpuinfo)
++  add_library(cpuinfo UNKNOWN IMPORTED)
++  find_library(CPUINFO_LIBRARY NAMES cpuinfo REQUIRED)
++  find_library(CLOG_LIBRARY NAMES clog REQUIRED)
+   if(NOT CPUINFO_LIBRARY)
+     message(FATAL_ERROR "Cannot find cpuinfo")
+   endif()
+   message("Found cpuinfo: ${CPUINFO_LIBRARY}")
+   set_target_properties(cpuinfo PROPERTIES IMPORTED_LOCATION "${CPUINFO_LIBRARY}")
++  target_link_libraries(cpuinfo INTERFACE "${CLOG_LIBRARY}")
+ elseif(NOT TARGET cpuinfo)
+   if(NOT DEFINED CPUINFO_SOURCE_DIR)
+     set(CPUINFO_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/../third_party/cpuinfo" CACHE STRING "cpuinfo source directory")
+@@ -659,8 +661,8 @@ if(USE_XNNPACK AND NOT USE_SYSTEM_XNNPACK)
+   include_directories(SYSTEM ${XNNPACK_INCLUDE_DIR})
+   list(APPEND Caffe2_DEPENDENCY_LIBS XNNPACK)
+ elseif(NOT TARGET XNNPACK AND USE_SYSTEM_XNNPACK)
+-  add_library(XNNPACK SHARED IMPORTED)
+-  find_library(XNNPACK_LIBRARY XNNPACK)
++  add_library(XNNPACK UNKNOWN IMPORTED)
++  find_library(XNNPACK_LIBRARY NAMES XNNPACK REQUIRED)
+   set_property(TARGET XNNPACK PROPERTY IMPORTED_LOCATION "${XNNPACK_LIBRARY}")
+   if(NOT XNNPACK_LIBRARY)
+     message(FATAL_ERROR "Cannot find XNNPACK")
+@@ -858,7 +860,7 @@ endif()
+ 
+ # ---[ LMDB
+ if(USE_LMDB)
+-  find_package(LMDB)
++  find_package(LMDB REQUIRED)
+   if(LMDB_FOUND)
+     include_directories(SYSTEM ${LMDB_INCLUDE_DIR})
+     list(APPEND Caffe2_DEPENDENCY_LIBS ${LMDB_LIBRARIES})
+@@ -1002,8 +1004,9 @@ if(NOT TARGET fp16 AND NOT USE_SYSTEM_FP16)
+     "${FP16_SOURCE_DIR}"
+     "${CONFU_DEPENDENCIES_BINARY_DIR}/FP16")
+ elseif(NOT TARGET fp16 AND USE_SYSTEM_FP16)
+-  add_library(fp16 STATIC "/usr/include/fp16.h")
+-  set_target_properties(fp16 PROPERTIES LINKER_LANGUAGE C)
++  find_path(FP16_INCLUDE_DIR NAMES fp16.h PATH_SUFFIXES include)
++  add_library(fp16 INTERFACE)
++  target_include_directories(fp16 INTERFACE "${FP16_INCLUDE_DIR}")
+ endif()
+ list(APPEND Caffe2_DEPENDENCY_LIBS fp16)
+ 
+@@ -1244,8 +1247,8 @@ endif(USE_LLVM)
+ 
+ # ---[ cuDNN
+ if(USE_CUDNN)
+-  set(CUDNN_FRONTEND_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/../third_party/cudnn_frontend/include)
+-  target_include_directories(torch::cudnn INTERFACE ${CUDNN_FRONTEND_INCLUDE_DIR})
++  find_package(CUDNN REQUIRED)
++  target_include_directories(torch::cudnn INTERFACE "${CUDNN_INCLUDE_DIR}")
+ endif()
+ 
+ # ---[ HIP
+@@ -1555,7 +1558,10 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX)
+       set_target_properties(onnx_proto PROPERTIES CXX_STANDARD 17)
+     endif()
+   endif()
+-  add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../third_party/foxi EXCLUDE_FROM_ALL)
++  
++  # setup foxi
++  find_library(FOXI_LOADER_LIBPATH NAMES foxi_loader REQUIRED)
++  list(APPEND Caffe2_DEPENDENCY_LIBS "${FOXI_LOADER_LIBPATH}")
+ 
+   add_definitions(-DONNX_NAMESPACE=${ONNX_NAMESPACE})
+   if(NOT USE_SYSTEM_ONNX)
+@@ -1573,14 +1579,14 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX)
+       target_compile_options(onnx PRIVATE -Wno-deprecated-declarations)
+     endif()
+   else()
+-    add_library(onnx SHARED IMPORTED)
+-    find_library(ONNX_LIBRARY onnx)
++    add_library(onnx UNKNOWN IMPORTED)
++    find_library(ONNX_LIBRARY NAMES onnx REQUIRED)
+     if(NOT ONNX_LIBRARY)
+       message(FATAL_ERROR "Cannot find onnx")
+     endif()
+     set_property(TARGET onnx PROPERTY IMPORTED_LOCATION ${ONNX_LIBRARY})
+-    add_library(onnx_proto SHARED IMPORTED)
+-    find_library(ONNX_PROTO_LIBRARY onnx_proto)
++    add_library(onnx_proto UNKNOWN IMPORTED)
++    find_library(ONNX_PROTO_LIBRARY NAMES onnx_proto REQUIRED)
+     if(NOT ONNX_PROTO_LIBRARY)
+       message(FATAL_ERROR "Cannot find onnx")
+     endif()
+@@ -1589,7 +1595,7 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX)
+     list(APPEND Caffe2_DEPENDENCY_LIBS onnx_proto onnx)
+   endif()
+   include_directories(${FOXI_INCLUDE_DIRS})
+-  list(APPEND Caffe2_DEPENDENCY_LIBS foxi_loader)
++  list(APPEND Caffe2_DEPENDENCY_LIBS "${FOXI_LOADER_LIBPATH}")
+   # Recover the build shared libs option.
+   set(BUILD_SHARED_LIBS ${TEMP_BUILD_SHARED_LIBS})
+ endif()
+@@ -1834,8 +1840,8 @@ endif()
+ #
+ set(TEMP_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
+ set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libs" FORCE)
+-add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/fmt)
+-
++#add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/fmt)
++find_package(fmt REQUIRED)
+ # Disable compiler feature checks for `fmt`.
+ #
+ # CMake compiles a little program to check compiler features. Some of our build
+@@ -1843,7 +1849,6 @@ add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/fmt)
+ # CMAKE_CXX_FLAGS in ways that break feature checks. Since we already know
+ # `fmt` is compatible with a superset of the compilers that PyTorch is, it
+ # shouldn't be too bad to just disable the checks.
+-set_target_properties(fmt-header-only PROPERTIES INTERFACE_COMPILE_FEATURES "")
+ 
+ list(APPEND Caffe2_DEPENDENCY_LIBS fmt::fmt-header-only)
+ set(BUILD_SHARED_LIBS ${TEMP_BUILD_SHARED_LIBS} CACHE BOOL "Build shared libs" FORCE)
+diff --git a/cmake/Modules/FindLMDB.cmake b/cmake/Modules/FindLMDB.cmake
+index 2f0adb1b6d..8a817fd6f1 100644
+--- a/cmake/Modules/FindLMDB.cmake
++++ b/cmake/Modules/FindLMDB.cmake
+@@ -12,12 +12,8 @@
+ # Copyright 2013 Conrad Steenberg <conrad.steenberg@gmail.com>
+ # Aug 31, 2013
+ 
+-if(MSVC)
+-  find_package(LMDB NO_MODULE)
+-else()
+-  find_path(LMDB_INCLUDE_DIR NAMES  lmdb.h PATHS "$ENV{LMDB_DIR}/include")
+-  find_library(LMDB_LIBRARIES NAMES lmdb   PATHS "$ENV{LMDB_DIR}/lib" )
+-endif()
++find_path(LMDB_INCLUDE_DIR NAMES  lmdb.h PATHS "$ENV{LMDB_DIR}/include")
++find_library(LMDB_LIBRARIES NAMES lmdb   PATHS "$ENV{LMDB_DIR}/lib" )
+ 
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(LMDB DEFAULT_MSG LMDB_INCLUDE_DIR LMDB_LIBRARIES)
+diff --git a/cmake/public/cuda.cmake b/cmake/public/cuda.cmake
+index 32f3ba375b..411293794f 100644
+--- a/cmake/public/cuda.cmake
++++ b/cmake/public/cuda.cmake
+@@ -67,8 +67,8 @@ if(NOT CMAKE_CUDA_COMPILER_VERSION STREQUAL CUDAToolkit_VERSION OR
+                       "V${CUDAToolkit_VERSION} in '${CUDAToolkit_INCLUDE_DIR}'")
+ endif()
+ 
+-if(NOT TARGET CUDA::nvToolsExt)
+-  message(FATAL_ERROR "Failed to find nvToolsExt")
++if(NOT TARGET CUDA::nvToolsExt AND TARGET CUDA::nvtx3)
++  add_library(CUDA::nvToolsExt ALIAS CUDA::nvtx3)
+ endif()
+ 
+ message(STATUS "Caffe2: CUDA detected: " ${CUDA_VERSION})
+diff --git a/cmake/public/utils.cmake b/cmake/public/utils.cmake
+index 4d48c0f0f3..ebdd39a7fd 100644
+--- a/cmake/public/utils.cmake
++++ b/cmake/public/utils.cmake
+@@ -185,9 +185,9 @@ endfunction()
+ macro(caffe2_update_option variable value)
+   if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO)
+     get_property(__help_string CACHE ${variable} PROPERTY HELPSTRING)
+-    set(${variable} ${value} CACHE BOOL ${__help_string} FORCE)
++    set("${variable}" "${value}" CACHE BOOL "${__help_string}" FORCE)
+   else()
+-    set(${variable} ${value})
++    set("${variable}" "${value}")
+   endif()
+ endmacro()
+ 
diff --git a/external_imported/vcpkg/ports/libtorch/cuda-adjustments.patch b/external_imported/vcpkg/ports/libtorch/cuda-adjustments.patch
new file mode 100644
index 000000000..38a0c0d0a
--- /dev/null
+++ b/external_imported/vcpkg/ports/libtorch/cuda-adjustments.patch
@@ -0,0 +1,61 @@
+diff --git a/cmake/Modules_CUDA_fix/upstream/FindCUDA/run_nvcc.cmake b/cmake/Modules_CUDA_fix/upstream/FindCUDA/run_nvcc.cmake
+index 9293df3..11bc4bf 100644
+--- a/cmake/Modules_CUDA_fix/upstream/FindCUDA/run_nvcc.cmake
++++ b/cmake/Modules_CUDA_fix/upstream/FindCUDA/run_nvcc.cmake
+@@ -126,11 +126,11 @@ list(APPEND CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS_${build_configuration}})
+ # Any -ccbin existing in CUDA_NVCC_FLAGS gets highest priority
+ list( FIND CUDA_NVCC_FLAGS "-ccbin" ccbin_found0 )
+ list( FIND CUDA_NVCC_FLAGS "--compiler-bindir" ccbin_found1 )
+-if( ccbin_found0 LESS 0 AND ccbin_found1 LESS 0 AND CUDA_HOST_COMPILER )
++if( ccbin_found0 LESS 0 AND ccbin_found1 LESS 0 AND CUDA_HOST_COMPILER AND 0)
+   if (CUDA_HOST_COMPILER STREQUAL "@_CUDA_MSVC_HOST_COMPILER@" AND DEFINED CCBIN)
+-    set(CCBIN -ccbin "${CCBIN}")
++    #set(CCBIN -ccbin "${CCBIN}")
+   else()
+-    set(CCBIN -ccbin "${CUDA_HOST_COMPILER}")
++    #set(CCBIN -ccbin "${CUDA_HOST_COMPILER}")
+   endif()
+ endif()
+ 
+diff --git a/cmake/Modules_CUDA_fix/upstream/FindCUDA/select_compute_arch.cmake b/cmake/Modules_CUDA_fix/upstream/FindCUDA/select_compute_arch.cmake
+index d917738..8f832fe 100644
+--- a/cmake/Modules_CUDA_fix/upstream/FindCUDA/select_compute_arch.cmake
++++ b/cmake/Modules_CUDA_fix/upstream/FindCUDA/select_compute_arch.cmake
+@@ -30,7 +30,7 @@ endif()
+ set(CUDA_KNOWN_GPU_ARCHITECTURES  "Kepler" "Maxwell")
+ 
+ # This list will be used for CUDA_ARCH_NAME = Common option (enabled by default)
+-set(CUDA_COMMON_GPU_ARCHITECTURES "3.5" "5.0")
++# set(CUDA_COMMON_GPU_ARCHITECTURES "3.5" "5.0")
+ 
+ # This list is used to filter CUDA archs when autodetecting
+ set(CUDA_ALL_GPU_ARCHITECTURES "3.5" "5.0")
+diff --git a/cmake/Modules_CUDA_fix/upstream/FindCUDA.cmake b/cmake/Modules_CUDA_fix/upstream/FindCUDA.cmake
+index 420ee63..f029b66 100644
+--- a/cmake/Modules_CUDA_fix/upstream/FindCUDA.cmake
++++ b/cmake/Modules_CUDA_fix/upstream/FindCUDA.cmake
+@@ -1694,9 +1694,9 @@ function(CUDA_LINK_SEPARABLE_COMPILATION_OBJECTS output_file cuda_target options
+     if( ccbin_found0 LESS 0 AND ccbin_found1 LESS 0 AND CUDA_HOST_COMPILER )
+       # Match VERBATIM check below.
+       if(CUDA_HOST_COMPILER MATCHES "\\$\\(VCInstallDir\\)")
+-        list(APPEND nvcc_flags -ccbin "\"${CUDA_HOST_COMPILER}\"")
++        #list(APPEND nvcc_flags -ccbin "\"${CUDA_HOST_COMPILER}\"")
+       else()
+-        list(APPEND nvcc_flags -ccbin "${CUDA_HOST_COMPILER}")
++        #list(APPEND nvcc_flags -ccbin "${CUDA_HOST_COMPILER}")
+       endif()
+     endif()
+ 
+diff --git a/cmake/public/cuda.cmake b/cmake/public/cuda.cmake
+index 4112937..3e1af83 100644
+--- a/cmake/public/cuda.cmake
++++ b/cmake/public/cuda.cmake
+@@ -42,7 +42,7 @@ set(CUDAToolkit_ROOT "${CUDA_TOOLKIT_ROOT_DIR}")
+ # Must be done before CUDA language is enabled, see
+ # https://cmake.org/cmake/help/v3.15/variable/CMAKE_CUDA_HOST_COMPILER.html
+ if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+-  set(CMAKE_CUDA_HOST_COMPILER "${CMAKE_C_COMPILER}")
++  #set(CMAKE_CUDA_HOST_COMPILER "${CMAKE_C_COMPILER}")
+ endif()
+ enable_language(CUDA)
+ if("X${CMAKE_CUDA_STANDARD}" STREQUAL "X" )
diff --git a/external_imported/vcpkg/ports/libtorch/fix-api-export.patch b/external_imported/vcpkg/ports/libtorch/fix-api-export.patch
new file mode 100644
index 000000000..bf5bf01b8
--- /dev/null
+++ b/external_imported/vcpkg/ports/libtorch/fix-api-export.patch
@@ -0,0 +1,39 @@
+diff --git a/aten/src/ATen/Context.h b/aten/src/ATen/Context.h
+index 285c6f7..1040acc 100644
+--- a/aten/src/ATen/Context.h
++++ b/aten/src/ATen/Context.h
+@@ -28,7 +28,7 @@ namespace at {
+ 
+ class Tensor;
+ 
+-enum class TORCH_API Float32MatmulPrecision { HIGHEST, HIGH, MEDIUM };
++enum class Float32MatmulPrecision { HIGHEST, HIGH, MEDIUM };
+ 
+ class TORCH_API Context {
+  public:
+diff --git a/aten/src/ATen/core/function_schema.h b/aten/src/ATen/core/function_schema.h
+index c48e9b0..cd8d4dd 100644
+--- a/aten/src/ATen/core/function_schema.h
++++ b/aten/src/ATen/core/function_schema.h
+@@ -206,7 +206,7 @@ inline bool operator!=(const Argument& lhs, const Argument& rhs) {
+   return !(lhs == rhs);
+ }
+ 
+-enum struct TORCH_API SchemaArgType { input, output };
++enum struct SchemaArgType { input, output };
+ 
+ /**
+  * struct SchemaArgument
+diff --git a/torch/csrc/jit/runtime/static/native_ops.cpp b/torch/csrc/jit/runtime/static/native_ops.cpp
+index 7f3cbcf..fe80ab1 100644
+--- a/torch/csrc/jit/runtime/static/native_ops.cpp
++++ b/torch/csrc/jit/runtime/static/native_ops.cpp
+@@ -1055,7 +1055,7 @@ namespace {
+   execution is completed, future is marked as complete to
+   indicate aten::wait() to proceed
+ */
+-class TORCH_API ForkedSubgraphSRLauncher {
++class ForkedSubgraphSRLauncher {
+  public:
+   ForkedSubgraphSRLauncher(
+       std::shared_ptr<StaticModule> smodule,
diff --git a/external_imported/vcpkg/ports/libtorch/fix-build.patch b/external_imported/vcpkg/ports/libtorch/fix-build.patch
new file mode 100644
index 000000000..b47fc815d
--- /dev/null
+++ b/external_imported/vcpkg/ports/libtorch/fix-build.patch
@@ -0,0 +1,184 @@
+diff --git a/c10/cuda/CMakeLists.txt b/c10/cuda/CMakeLists.txt
+index c0628d0c96..5dfb7f2abb 100644
+--- a/c10/cuda/CMakeLists.txt
++++ b/c10/cuda/CMakeLists.txt
+@@ -74,7 +74,11 @@ add_subdirectory(test)
+ # Note: for now, we will put all export path into one single Caffe2Targets group
+ # to deal with the cmake deployment need. Inside the Caffe2Targets set, the
+ # individual libraries like libc10.so and libcaffe2.so are still self-contained.
+-install(TARGETS c10_cuda EXPORT Caffe2Targets DESTINATION lib)
++install(TARGETS c10_cuda EXPORT Caffe2Targets 
++  RUNTIME DESTINATION bin
++  ARCHIVE DESTINATION lib
++  LIBRARY DESTINATION lib
++  )
+ foreach(file ${C10_CUDA_HEADERS})
+   get_filename_component( dir ${file} DIRECTORY )
+   install( FILES ${file} DESTINATION include/c10/cuda/${dir} )
+diff --git a/c10/util/Exception.h b/c10/util/Exception.h
+index ecbc7c1345..2dd1001c9e 100644
+--- a/c10/util/Exception.h
++++ b/c10/util/Exception.h
+@@ -14,6 +14,9 @@
+ #define __func__ __FUNCTION__
+ #endif
+ 
++#ifdef _MSC_VER
++#pragma warning(suppress : 4251)
++#endif
+ namespace c10 {
+ 
+ /// The primary ATen error class.
+diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
+index 2c5c5b95d8..8c1742591f 100644
+--- a/cmake/Dependencies.cmake
++++ b/cmake/Dependencies.cmake
+@@ -1581,19 +1581,10 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX)
+       target_compile_options(onnx PRIVATE -Wno-deprecated-declarations)
+     endif()
+   else()
+-    add_library(onnx UNKNOWN IMPORTED)
+-    find_library(ONNX_LIBRARY NAMES onnx REQUIRED)
+-    if(NOT ONNX_LIBRARY)
+-      message(FATAL_ERROR "Cannot find onnx")
+-    endif()
+-    set_property(TARGET onnx PROPERTY IMPORTED_LOCATION ${ONNX_LIBRARY})
+-    add_library(onnx_proto UNKNOWN IMPORTED)
+-    find_library(ONNX_PROTO_LIBRARY NAMES onnx_proto REQUIRED)
+-    if(NOT ONNX_PROTO_LIBRARY)
+-      message(FATAL_ERROR "Cannot find onnx")
+-    endif()
+-    set_property(TARGET onnx_proto PROPERTY IMPORTED_LOCATION ${ONNX_PROTO_LIBRARY})
+-    message("-- Found onnx: ${ONNX_LIBRARY} ${ONNX_PROTO_LIBRARY}")
++    find_package(onnx REQUIRED)
++    set(ONNX_LIBRARY onnx)
++    set(ONNX_PROTO_LIBRARY onnx_proto)
++    message("-- Found onnx")
+     list(APPEND Caffe2_DEPENDENCY_LIBS onnx_proto onnx)
+   endif()
+   include_directories(${FOXI_INCLUDE_DIRS})
+diff --git a/pyproject.toml b/pyproject.toml
+index eb764cb895..c70f317c2f 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -4,11 +4,9 @@ requires = [
+     "wheel",
+     "astunparse",
+     "numpy",
+-    "ninja",
+     "pyyaml",
+-    "cmake",
+     "typing-extensions",
+-    "requests",
++#    "requests",
+ ]
+ # Use legacy backend to import local packages in setup.py
+ build-backend = "setuptools.build_meta:__legacy__"
+diff --git a/setup.py b/setup.py
+index 17bf16b89a..b90ebbc9eb 100644
+--- a/setup.py
++++ b/setup.py
+@@ -263,7 +263,7 @@ from tools.setup_helpers.env import build_type, IS_DARWIN, IS_LINUX, IS_WINDOWS
+ ################################################################################
+ 
+ VERBOSE_SCRIPT = True
+-RUN_BUILD_DEPS = True
++RUN_BUILD_DEPS = False
+ # see if the user passed a quiet flag to setup.py arguments and respect
+ # that in our parts of the build
+ EMIT_BUILD_WARNING = False
+@@ -307,9 +307,9 @@ else:
+ 
+ # Constant known variables used throughout this file
+ cwd = os.path.dirname(os.path.abspath(__file__))
+-lib_path = os.path.join(cwd, "torch", "lib")
++lib_path = os.path.join(cwd, "../../@TARGET_TRIPLET@/", "lib")
+ third_party_path = os.path.join(cwd, "third_party")
+-caffe2_build_dir = os.path.join(cwd, "build")
++caffe2_build_dir = os.path.join(cwd, "../../@TARGET_TRIPLET@")
+ 
+ # CMAKE: full path to python library
+ if IS_WINDOWS:
+@@ -759,7 +759,7 @@ class build_ext(setuptools.command.build_ext.build_ext):
+             with open(filename) as f:
+                 return json.load(f)
+ 
+-        ninja_files = glob.glob("build/*compile_commands.json")
++        ninja_files = glob.glob("../../@TARGET_TRIPLET@/*compile_commands.json")
+         cmake_files = glob.glob("torch/lib/build/*/compile_commands.json")
+         all_commands = [entry for f in ninja_files + cmake_files for entry in load(f)]
+ 
+diff --git a/third_party/nvfuser/csrc/instrumentation.h b/third_party/nvfuser/csrc/instrumentation.h
+index cd57825a24..75e81e9fac 100644
+--- a/third_party/nvfuser/csrc/instrumentation.h
++++ b/third_party/nvfuser/csrc/instrumentation.h
+@@ -2,7 +2,7 @@
+ 
+ #include <utils.h>
+ 
+-#include <nvToolsExt.h>
++#include <nvtx3/nvToolsExt.h>
+ 
+ // NOLINTNEXTLINE(modernize-deprecated-headers)
+ #include <stdio.h>
+diff --git a/tools/setup_helpers/env.py b/tools/setup_helpers/env.py
+index d87e97a2bb..e1bc42e87c 100644
+--- a/tools/setup_helpers/env.py
++++ b/tools/setup_helpers/env.py
+@@ -19,7 +19,7 @@ CONDA_DIR = os.path.join(os.path.dirname(sys.executable), "..")
+ 
+ IS_64BIT = struct.calcsize("P") == 8
+ 
+-BUILD_DIR = "build"
++BUILD_DIR = "../../@TARGET_TRIPLET@"
+ 
+ 
+ def check_env_flag(name: str, default: str = "") -> bool:
+diff --git a/torch/lib/libshm/CMakeLists.txt b/torch/lib/libshm/CMakeLists.txt
+index 20158a9a25..7d3c475a9b 100644
+--- a/torch/lib/libshm/CMakeLists.txt
++++ b/torch/lib/libshm/CMakeLists.txt
+@@ -71,6 +71,10 @@ target_link_libraries(torch_shm_manager PRIVATE shm)
+ set_target_properties(torch_shm_manager PROPERTIES
+   INSTALL_RPATH "${_rpath_portable_origin}/../lib")
+ 
+-install(TARGETS shm LIBRARY DESTINATION ${LIBSHM_INSTALL_LIB_SUBDIR})
++install(TARGETS shm 
++  RUNTIME DESTINATION bin
++  ARCHIVE DESTINATION lib
++  LIBRARY DESTINATION lib
++)
+ install(FILES libshm.h DESTINATION "include")
+ install(TARGETS torch_shm_manager DESTINATION "bin")
+diff --git a/torch/lib/libshm_windows/CMakeLists.txt b/torch/lib/libshm_windows/CMakeLists.txt
+index df2a106493..b86e0b6872 100644
+--- a/torch/lib/libshm_windows/CMakeLists.txt
++++ b/torch/lib/libshm_windows/CMakeLists.txt
+@@ -19,9 +19,12 @@ target_include_directories(shm PRIVATE
+ target_link_libraries(shm torch c10)
+ 
+ 
+-install(TARGETS shm DESTINATION "${LIBSHM_INSTALL_LIB_SUBDIR}")
++install(TARGETS shm 
++  LIBRARY DESTINATION "${LIBSHM_INSTALL_LIB_SUBDIR}"
++  ARCHIVE DESTINATION "${LIBSHM_INSTALL_LIB_SUBDIR}"
++  RUNTIME DESTINATION "${LIBSHM_INSTALL_BIN_SUBDIR}")
+ install(FILES libshm.h DESTINATION "include")
+ 
+ if(MSVC AND BUILD_SHARED_LIBS)
+-  install(FILES $<TARGET_PDB_FILE:shm> DESTINATION "${LIBSHM_INSTALL_LIB_SUBDIR}" OPTIONAL)
++  install(FILES $<TARGET_PDB_FILE:shm> DESTINATION "${LIBSHM_INSTALL_BIN_SUBDIR}" OPTIONAL)
+ endif()
+diff --git a/torch/utils/cpp_extension.py b/torch/utils/cpp_extension.py
+index 6600eb3cb5..1d5e451c14 100644
+--- a/torch/utils/cpp_extension.py
++++ b/torch/utils/cpp_extension.py
+@@ -38,7 +38,7 @@ SHARED_FLAG = '/DLL' if IS_WINDOWS else '-shared'
+ 
+ _HERE = os.path.abspath(__file__)
+ _TORCH_PATH = os.path.dirname(os.path.dirname(_HERE))
+-TORCH_LIB_PATH = os.path.join(_TORCH_PATH, 'lib')
++TORCH_LIB_PATH = os.path.join(_TORCH_PATH, '../../../@TARGET_TRIPLET@', 'lib')
+ 
+ 
+ SUBPROCESS_DECODE_ARGS = ('oem',) if IS_WINDOWS else ()
diff --git a/external_imported/vcpkg/ports/libtorch/fix-c10-glog.patch b/external_imported/vcpkg/ports/libtorch/fix-c10-glog.patch
deleted file mode 100644
index beb2a6a3f..000000000
--- a/external_imported/vcpkg/ports/libtorch/fix-c10-glog.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/c10/util/Logging.cpp b/c10/util/Logging.cpp
-index fe74e49..06e09d6 100644
---- a/c10/util/Logging.cpp
-+++ b/c10/util/Logging.cpp
-@@ -4,7 +4,7 @@
- #ifdef FBCODE_CAFFE2
- #include <folly/synchronization/SanitizeThread.h>
- #endif
--
-+#include <glog/logging.h>
- #include <algorithm>
- #include <cstdlib>
- #include <cstring>
-@@ -192,23 +194,13 @@ C10_DEFINE_int(
-     google::GLOG_WARNING,
-     "The minimum log level that caffe2 will output.");
- 
--// Google glog's api does not have an external function that allows one to check
--// if glog is initialized or not. It does have an internal function - so we are
--// declaring it here. This is a hack but has been used by a bunch of others too
--// (e.g. Torch).
--namespace google {
--namespace glog_internal_namespace_ {
--bool IsGoogleLoggingInitialized();
--} // namespace glog_internal_namespace_
--} // namespace google
--
- namespace c10 {
- namespace {
- 
- void initGoogleLogging(char const* name) {
- #if !defined(_MSC_VER)
-   // This trick can only be used on UNIX platforms
--  if (!::google::glog_internal_namespace_::IsGoogleLoggingInitialized())
-+  if (!::google::IsGoogleLoggingInitialized())
- #endif
-   {
-     ::google::InitGoogleLogging(name);
-diff --git a/c10/util/Logging.cpp b/c10/util/Logging.cpp
-index 1864f17..b958fa0 100644
---- a/c10/util/Logging.cpp
-+++ b/c10/util/Logging.cpp
-@@ -154,18 +154,6 @@ void setLogLevelFlagFromEnv();
- } // namespace detail
- } // namespace c10
- 
--#if defined(C10_USE_GFLAGS) && defined(C10_USE_GLOG)
--// When GLOG depends on GFLAGS, these variables are being defined in GLOG
--// directly via the GFLAGS definition, so we will use DECLARE_* to declare
--// them, and use them in Caffe2.
--// GLOG's minloglevel
--DECLARE_int32(minloglevel);
--// GLOG's verbose log value.
--DECLARE_int32(v);
--// GLOG's logtostderr value
--DECLARE_bool(logtostderr);
--#endif // defined(C10_USE_GFLAGS) && defined(C10_USE_GLOG)
--
- #if !defined(C10_USE_GLOG)
- // This backward compatibility flags are in order to deal with cases where
- // Caffe2 are not built with glog, but some init flags still pass in these
diff --git a/external_imported/vcpkg/ports/libtorch/fix-cmake.patch b/external_imported/vcpkg/ports/libtorch/fix-cmake.patch
deleted file mode 100644
index fbcb5a1d7..000000000
--- a/external_imported/vcpkg/ports/libtorch/fix-cmake.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4bf1e85..48b01ae 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -693,7 +693,7 @@ endif()
- 
- set(BUILD_ONEDNN_GRAPH OFF)
- 
--include(cmake/Dependencies.cmake)
-+include(cmake/vcpkg-dependencies.cmake)
- 
- if(USE_CUDA AND (CMAKE_CUDA_COMPILER_VERSION VERSION_LESS 10.2) AND (CMAKE_HOST_SYSTEM_NAME MATCHES "Windows"))
-   # CUDA < 10.2 doesn't support compiling and extracting header dependencies in
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 48b01ae..8e46275 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -660,7 +660,7 @@ if(NOT CMAKE_BUILD_TYPE)
- endif()
- 
- # The below means we are cross compiling for arm64 or x86_64 on MacOSX
--if(NOT IOS AND CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_OSX_ARCHITECTURES MATCHES "^(x86_64|arm64)$")
-+if(false)
-   set(CROSS_COMPILING_MACOSX TRUE)
-   # We need to compile a universal protoc to not fail protobuf build
-   # We set CMAKE_TRY_COMPILE_TARGET_TYPE to STATIC_LIBRARY (vs executable) to succeed the cmake compiler check for cross-compiling
-@@ -678,6 +678,7 @@ if(NOT IOS AND CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_OSX_ARCHITECTURES M
-   set(PROTOBUF_PROTOC_EXECUTABLE "${PROJECT_SOURCE_DIR}/build_host_protoc/bin/protoc")
-   set(CAFFE2_CUSTOM_PROTOC_EXECUTABLE "${PROJECT_SOURCE_DIR}/build_host_protoc/bin/protoc")
- endif()
-+include(cmake/ProtoBuf.cmake)
- 
- # ---[ Misc checks to cope with various compiler modes
- include(cmake/MiscCheck.cmake)
-diff --git a/caffe2/CMakeLists.txt b/caffe2/CMakeLists.txt
-index 328210c..c407442 100644
---- a/caffe2/CMakeLists.txt
-+++ b/caffe2/CMakeLists.txt
-@@ -112,13 +112,8 @@ endif()
- # addressed yet.
- 
- if(NOT MSVC AND USE_XNNPACK)
--  if(NOT TARGET fxdiv)
--    set(FXDIV_BUILD_TESTS OFF CACHE BOOL "")
--    set(FXDIV_BUILD_BENCHMARKS OFF CACHE BOOL "")
--    add_subdirectory(
--      "${FXDIV_SOURCE_DIR}"
--      "${CMAKE_BINARY_DIR}/FXdiv")
--  endif()
-+  find_path(FXDIV_INCLUDE_DIRS "fxdiv.h" REQUIRED)
-+  include_directories(${FXDIV_INCLUDE_DIRS})
- endif()
- 
- add_subdirectory(core)
-diff --git a/caffe2/CMakeLists.txt b/caffe2/CMakeLists.txt
-index c407442..16fa898 100644
---- a/caffe2/CMakeLists.txt
-+++ b/caffe2/CMakeLists.txt
-@@ -1011,10 +1011,6 @@ if(USE_CUDA OR USE_ROCM)
-   include(${TORCH_SRC_DIR}/csrc/jit/codegen/cuda/nvfuser.cmake)
- endif()
- 
--if(NOT MSVC AND USE_XNNPACK)
--  TARGET_LINK_LIBRARIES(torch_cpu PRIVATE fxdiv)
--endif()
--
- # ==========================================================
- # formerly-libtorch flags
- # ==========================================================
-diff --git a/c10/CMakeLists.txt b/c10/CMakeLists.txt
-index 41b1a1a..3b390ec 100644
---- a/c10/CMakeLists.txt
-+++ b/c10/CMakeLists.txt
-@@ -110,7 +110,11 @@ endif()
- # Note: for now, we will put all export path into one single Caffe2Targets group
- # to deal with the cmake deployment need. Inside the Caffe2Targets set, the
- # individual libraries like libc10.so and libcaffe2.so are still self-contained.
--install(TARGETS c10 EXPORT Caffe2Targets DESTINATION lib)
-+install(TARGETS c10 EXPORT Caffe2Targets
-+  RUNTIME DESTINATION bin
-+  LIBRARY DESTINATION lib
-+  ARCHIVE DESTINATION lib
-+)
- install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
-         DESTINATION include
-         FILES_MATCHING PATTERN "*.h")
-diff --git a/caffe2/CMakeLists.txt b/caffe2/CMakeLists.txt
-index 16fa898..7a343f7 100644
---- a/caffe2/CMakeLists.txt
-+++ b/caffe2/CMakeLists.txt
-@@ -1547,7 +1547,11 @@ endif()
- 
- caffe2_interface_library(torch torch_library)
- 
--install(TARGETS torch_cpu torch_cpu_library EXPORT Caffe2Targets DESTINATION "${TORCH_INSTALL_LIB_DIR}")
-+install(TARGETS torch_cpu torch_cpu_library EXPORT Caffe2Targets
-+  RUNTIME DESTINATION "${TORCH_INSTALL_BIN_DIR}"
-+  LIBRARY DESTINATION "${TORCH_INSTALL_LIB_DIR}"
-+  ARCHIVE DESTINATION "${TORCH_INSTALL_LIB_DIR}"
-+)
- 
- if(USE_CUDA)
-   install(TARGETS torch_cuda torch_cuda_library EXPORT Caffe2Targets DESTINATION "${TORCH_INSTALL_LIB_DIR}")
-@@ -1558,7 +1562,11 @@ if(USE_CUDA)
- elseif(USE_ROCM)
-   install(TARGETS torch_hip torch_hip_library EXPORT Caffe2Targets DESTINATION "${TORCH_INSTALL_LIB_DIR}")
- endif()
--install(TARGETS torch torch_library EXPORT Caffe2Targets DESTINATION "${TORCH_INSTALL_LIB_DIR}")
-+install(TARGETS torch torch_library EXPORT Caffe2Targets
-+  RUNTIME DESTINATION "${TORCH_INSTALL_BIN_DIR}"
-+  LIBRARY DESTINATION "${TORCH_INSTALL_LIB_DIR}"
-+  ARCHIVE DESTINATION "${TORCH_INSTALL_LIB_DIR}"
-+)
- 
- target_link_libraries(torch PUBLIC torch_cpu_library)
- 
-@@ -1688,7 +1696,11 @@ if(BUILD_SHARED_LIBS)
-     target_link_libraries(torch_global_deps TBB::tbb)
-   endif()
- 
--  install(TARGETS torch_global_deps DESTINATION "${TORCH_INSTALL_LIB_DIR}")
-+  install(TARGETS torch_global_deps
-+    RUNTIME DESTINATION "${TORCH_INSTALL_BIN_DIR}"
-+    LIBRARY DESTINATION "${TORCH_INSTALL_LIB_DIR}"
-+    ARCHIVE DESTINATION "${TORCH_INSTALL_LIB_DIR}"
-+  )
- endif()
- 
- # ---[ Caffe2 HIP sources.
-diff --git a/caffe2/CMakeLists.txt b/caffe2/CMakeLists.txt
-index 7a343f7..3390f9b 100644
---- a/caffe2/CMakeLists.txt
-+++ b/caffe2/CMakeLists.txt
-@@ -1673,7 +1673,7 @@ target_link_libraries(torch_cpu PRIVATE flatbuffers)
- # namespaces, so libtorch is loaded with all its dependencies in a local scope.
- # That usually leads to missing symbol errors at run-time, so to avoid a situation like
- # this we have to preload those libs in a global namespace.
--if(BUILD_SHARED_LIBS)
-+if(BUILD_SHARED_LIBS AND (NOT WIN32))
-   add_library(torch_global_deps SHARED ${TORCH_SRC_DIR}/csrc/empty.c)
-   if(HAVE_SOVERSION)
-     set_target_properties(torch_global_deps PROPERTIES
diff --git a/external_imported/vcpkg/ports/libtorch/fix-fbgemm-include.patch b/external_imported/vcpkg/ports/libtorch/fix-fbgemm-include.patch
deleted file mode 100644
index 721aa6401..000000000
--- a/external_imported/vcpkg/ports/libtorch/fix-fbgemm-include.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/aten/src/ATen/native/quantized/cpu/qembeddingbag_prepack.cpp b/aten/src/ATen/native/quantized/cpu/qembeddingbag_prepack.cpp
-index 224a66f..eb42317 100644
---- a/aten/src/ATen/native/quantized/cpu/qembeddingbag_prepack.cpp
-+++ b/aten/src/ATen/native/quantized/cpu/qembeddingbag_prepack.cpp
-@@ -8,7 +8,10 @@
- #include <torch/library.h>
- 
- #include <c10/util/irange.h>
--
-+#ifdef USE_FBGEMM
-+#include <fbgemm/Fbgemm.h>
-+#include <fbgemm/FbgemmEmbedding.h>
-+#endif
- int register_embedding_params();
- 
- /*
-diff --git a/aten/src/ATen/native/quantized/cpu/qembeddingbag_unpack.cpp b/aten/src/ATen/native/quantized/cpu/qembeddingbag_unpack.cpp
-index f94d27b..299b88b 100644
---- a/aten/src/ATen/native/quantized/cpu/qembeddingbag_unpack.cpp
-+++ b/aten/src/ATen/native/quantized/cpu/qembeddingbag_unpack.cpp
-@@ -4,7 +4,10 @@
- #include <ATen/native/quantized/cpu/fbgemm_utils.h>
- #include <c10/util/irange.h>
- #include <torch/library.h>
--
-+#ifdef USE_FBGEMM
-+#include <fbgemm/Fbgemm.h>
-+#include <fbgemm/FbgemmEmbedding.h>
-+#endif
- int register_embedding_params();
- 
- at::Tensor PackedEmbeddingBagWeight::unpack() {
diff --git a/external_imported/vcpkg/ports/libtorch/fix-glog.patch b/external_imported/vcpkg/ports/libtorch/fix-glog.patch
new file mode 100644
index 000000000..4db040b17
--- /dev/null
+++ b/external_imported/vcpkg/ports/libtorch/fix-glog.patch
@@ -0,0 +1,30 @@
+diff --git a/c10/util/Logging.cpp b/c10/util/Logging.cpp
+index ff8e1d6cc..306dac51f 100644
+--- a/c10/util/Logging.cpp	
++++ b/c10/util/Logging.cpp
+@@ -218,24 +218,11 @@ C10_DEFINE_int(
+     google::GLOG_WARNING,
+     "The minimum log level that caffe2 will output.");
+ 
+-// Google glog's api does not have an external function that allows one to check
+-// if glog is initialized or not. It does have an internal function - so we are
+-// declaring it here. This is a hack but has been used by a bunch of others too
+-// (e.g. Torch).
+-namespace google {
+-namespace glog_internal_namespace_ {
+-bool IsGoogleLoggingInitialized();
+-} // namespace glog_internal_namespace_
+-} // namespace google
+-
+ namespace c10 {
+ namespace {
+ 
+ void initGoogleLogging(char const* name) {
+-#if !defined(_MSC_VER)
+-  // This trick can only be used on UNIX platforms
+-  if (!::google::glog_internal_namespace_::IsGoogleLoggingInitialized())
+-#endif
++  if (!::google::IsGoogleLoggingInitialized())
+   {
+     ::google::InitGoogleLogging(name);
+ #if !defined(_MSC_VER)
diff --git a/external_imported/vcpkg/ports/libtorch/fix-msvc-ICE.patch b/external_imported/vcpkg/ports/libtorch/fix-msvc-ICE.patch
new file mode 100644
index 000000000..c6f768459
--- /dev/null
+++ b/external_imported/vcpkg/ports/libtorch/fix-msvc-ICE.patch
@@ -0,0 +1,15 @@
+diff --git a/aten/src/ATen/cpu/vec/vec_base.h b/aten/src/ATen/cpu/vec/vec_base.h
+index f68e9c6eb..c42a9b8bb 100644
+--- a/aten/src/ATen/cpu/vec/vec_base.h	
++++ b/aten/src/ATen/cpu/vec/vec_base.h
+@@ -150,9 +150,8 @@ public:
+   // versions GCC/Clang have buggy determinations on whether or not an
+   // identifier is odr-used or not, and in any case it's hard to tell if
+   // a variable is odr-used or not.  So best to just cut the problem at the root.
+-  static constexpr size_type size_T = sizeof(T);  // Workaround to compile with VS2022.
+   static constexpr size_type size() {
+-    return VECTOR_WIDTH / size_T;
++    return VECTOR_WIDTH / sizeof(T);
+   }
+   Vectorized() : values{static_cast<T>(0)} {}
+   Vectorized(T val) {
diff --git a/external_imported/vcpkg/ports/libtorch/fix-onnx-case.patch b/external_imported/vcpkg/ports/libtorch/fix-onnx-case.patch
new file mode 100644
index 000000000..0bf56df8d
--- /dev/null
+++ b/external_imported/vcpkg/ports/libtorch/fix-onnx-case.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
+index 8c1742591..a2ca73b6e 100644
+--- a/cmake/Dependencies.cmake	
++++ b/cmake/Dependencies.cmake
+@@ -1581,7 +1581,7 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX)
+       target_compile_options(onnx PRIVATE -Wno-deprecated-declarations)
+     endif()
+   else()
+-    find_package(onnx REQUIRED)
++    find_package(ONNX REQUIRED)
+     set(ONNX_LIBRARY onnx)
+     set(ONNX_PROTO_LIBRARY onnx_proto)
+     message("-- Found onnx")
diff --git a/external_imported/vcpkg/ports/libtorch/fix-sleef.patch b/external_imported/vcpkg/ports/libtorch/fix-sleef.patch
new file mode 100644
index 000000000..a6d608a5b
--- /dev/null
+++ b/external_imported/vcpkg/ports/libtorch/fix-sleef.patch
@@ -0,0 +1,22 @@
+diff --git a/aten/src/ATen/CMakeLists.txt b/aten/src/ATen/CMakeLists.txt
+index f3281d3cb..c8b6ed30e 100644
+--- a/aten/src/ATen/CMakeLists.txt	
++++ b/aten/src/ATen/CMakeLists.txt
+@@ -418,7 +418,7 @@ if(NOT MSVC AND NOT EMSCRIPTEN AND NOT INTERN_BUILD_MOBILE)
+     list(APPEND ATen_THIRD_PARTY_INCLUDE ${CMAKE_BINARY_DIR}/include)
+     link_directories(${CMAKE_BINARY_DIR}/sleef/lib)
+   else()
+-    add_library(sleef SHARED IMPORTED)
++    add_library(sleef UNKNOWN IMPORTED)
+     find_library(SLEEF_LIBRARY sleef)
+     if(NOT SLEEF_LIBRARY)
+       message(FATAL_ERROR "Cannot find sleef")
+@@ -426,7 +426,7 @@ if(NOT MSVC AND NOT EMSCRIPTEN AND NOT INTERN_BUILD_MOBILE)
+     message("Found sleef: ${SLEEF_LIBRARY}")
+     set_target_properties(sleef PROPERTIES IMPORTED_LOCATION "${SLEEF_LIBRARY}")
+   endif()
+-  list(APPEND ATen_CPU_DEPENDENCY_LIBS sleef)
++  list(APPEND ATen_CPU_DEPENDENCY_LIBS ${SLEEF_LIBRARY})
+ 
+   set(CMAKE_C_FLAGS_DEBUG ${OLD_CMAKE_C_FLAGS_DEBUG})
+   set(CMAKE_CXX_FLAGS ${OLD_CMAKE_CXX_FLAGS})
diff --git a/external_imported/vcpkg/ports/libtorch/fix-windows.patch b/external_imported/vcpkg/ports/libtorch/fix-windows.patch
deleted file mode 100644
index ee207d52e..000000000
--- a/external_imported/vcpkg/ports/libtorch/fix-windows.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff --git a/torch/csrc/jit/tensorexpr/bounds_overlap.h b/torch/csrc/jit/tensorexpr/bounds_overlap.h
-index c78884d..baf44bb 100644
---- a/torch/csrc/jit/tensorexpr/bounds_overlap.h
-+++ b/torch/csrc/jit/tensorexpr/bounds_overlap.h
-@@ -65,6 +65,10 @@ enum OverlapKind { ContainedOrEqual, Contains, PartialOverlap, NoOverlap };
- //     operator
- //     NOT_DETERMINED: Some elements satify the given comparison operator and
- //     some elements not
-+#if defined(_WIN32)
-+#undef TRUE
-+#undef FALSE
-+#endif
- enum CmpEvalResult { TRUE, FALSE, NOT_DETERMINED };
- 
- // Returns the kind of overlap between Bound A and Bound A in a single
-diff --git a/caffe2/CMakeLists.txt b/caffe2/CMakeLists.txt
-index 3390f9b..578d0bd 100644
---- a/caffe2/CMakeLists.txt
-+++ b/caffe2/CMakeLists.txt
-@@ -1425,7 +1425,7 @@ target_include_directories(torch_cpu SYSTEM PRIVATE "${Caffe2_DEPENDENCY_INCLUDE
- torch_set_target_props(torch_cpu)
- 
- 
--target_compile_options(torch_cpu PRIVATE "-DCAFFE2_BUILD_MAIN_LIB")
-+target_compile_definitions(torch_cpu PRIVATE CAFFE2_BUILD_MAIN_LIB)
- if(BUILD_SPLIT_CUDA)
-   target_compile_options(torch_cuda_cu PRIVATE "-DTORCH_CUDA_CU_BUILD_MAIN_LIB")
-   target_compile_options(torch_cuda_cpp PRIVATE "-DTORCH_CUDA_CPP_BUILD_MAIN_LIB")
-@@ -1525,12 +1525,12 @@ if(MSVC AND NOT BUILD_SHARED_LIBS)
-   #
-   # NB: This must be target_compile_definitions, not target_compile_options,
-   # as the latter is not respected by nvcc
--  target_compile_definitions(torch_cpu PUBLIC "AT_CORE_STATIC_WINDOWS=1")
-+  target_compile_definitions(torch_cpu PUBLIC AT_CORE_STATIC_WINDOWS=1)
- endif()
- if(MSVC AND BUILD_SHARED_LIBS)
-   # ONNX is linked statically and needs to be exported from this library
-   # to be used externally. Make sure that references match the export.
--  target_compile_options(torch_cpu PRIVATE "-DONNX_BUILD_MAIN_LIB")
-+  target_compile_definitions(torch_cpu PRIVATE ONNX_BUILD_MAIN_LIB)
- endif()
- 
- caffe2_interface_library(torch_cpu torch_cpu_library)
-diff --git a/aten/src/ATen/Parallel.h b/aten/src/ATen/Parallel.h
-index 0b494d9..06b5d88 100644
---- a/aten/src/ATen/Parallel.h
-+++ b/aten/src/ATen/Parallel.h
-@@ -28,13 +28,7 @@ TORCH_API bool in_parallel_region();
- namespace internal {
- 
- // Initialise num_threads lazily at first parallel call
--inline TORCH_API void lazy_init_num_threads() {
--  thread_local bool init = false;
--  if (C10_UNLIKELY(!init)) {
--    at::init_num_threads();
--    init = true;
--  }
--}
-+TORCH_API void lazy_init_num_threads();
- 
- TORCH_API void set_thread_num(int);
- 
-diff --git a/aten/src/ATen/ParallelCommon.cpp b/aten/src/ATen/ParallelCommon.cpp
-index 068c9d3..b869fde 100644
---- a/aten/src/ATen/ParallelCommon.cpp
-+++ b/aten/src/ATen/ParallelCommon.cpp
-@@ -17,6 +17,17 @@
- 
- namespace at {
- 
-+namespace internal {
-+/// @see https://github.com/pytorch/pytorch/issues/87957
-+void lazy_init_num_threads() {
-+  thread_local bool init = false;
-+  if (C10_UNLIKELY(!init)) {
-+    at::init_num_threads();
-+    init = true;
-+  }
-+}
-+} // namespace internal
-+
- namespace {
- 
- const char* get_env_var(
-diff --git a/c10/CMakeLists.txt b/c10/CMakeLists.txt
-index 3b390ec..7cfa2b0 100644
---- a/c10/CMakeLists.txt
-+++ b/c10/CMakeLists.txt
-@@ -45,7 +45,10 @@ if(HAVE_SOVERSION)
-       VERSION ${TORCH_VERSION} SOVERSION ${TORCH_SOVERSION})
- endif()
- # If building shared library, set dllimport/dllexport proper.
--target_compile_options(c10 PRIVATE "-DC10_BUILD_MAIN_LIB")
-+target_compile_definitions(c10 PRIVATE C10_BUILD_MAIN_LIB)
-+if(WIN32)
-+  target_compile_definitions(c10 PRIVATE NOMINMAX)
-+endif()
- # Enable hidden visibility if compiler supports it.
- if(${COMPILER_SUPPORTS_HIDDEN_VISIBILITY})
-   target_compile_options(c10 PRIVATE "-fvisibility=hidden")
diff --git a/external_imported/vcpkg/ports/libtorch/fxdiv.patch b/external_imported/vcpkg/ports/libtorch/fxdiv.patch
new file mode 100644
index 000000000..3f68bb98a
--- /dev/null
+++ b/external_imported/vcpkg/ports/libtorch/fxdiv.patch
@@ -0,0 +1,44 @@
+diff --git a/aten/src/ATen/native/quantized/cpu/qnnpack/CMakeLists.txt b/aten/src/ATen/native/quantized/cpu/qnnpack/CMakeLists.txt
+index d18523352..1f53945cf 100644
+--- a/aten/src/ATen/native/quantized/cpu/qnnpack/CMakeLists.txt
++++ b/aten/src/ATen/native/quantized/cpu/qnnpack/CMakeLists.txt
+@@ -389,12 +389,12 @@ if(NOT TARGET fxdiv AND NOT USE_SYSTEM_FXDIV)
+     "${FXDIV_SOURCE_DIR}"
+     "${CONFU_DEPENDENCIES_BINARY_DIR}/fxdiv")
+ elseif(NOT TARGET fxdiv AND USE_SYSTEM_FXDIV)
+-  find_file(FXDIV_HDR fxdiv.h PATH_SUFFIXES include)
++  find_path(FXDIV_HDR fxdiv.h PATH_SUFFIXES include)
+   if(NOT FXDIV_HDR)
+     message(FATAL_ERROR "Cannot find fxdiv")
+   endif()
+-  add_library(fxdiv STATIC "${FXDIV_HDR}")
+-  set_property(TARGET fxdiv PROPERTY LINKER_LANGUAGE C)
++  add_library(fxdiv INTERFACE IMPORTED)
++  target_include_directories(fxdiv INTERFACE "${FXDIV_HDR}")
+ endif()
+ target_link_libraries(pytorch_qnnpack PRIVATE fxdiv)
+ 
+diff --git a/caffe2/CMakeLists.txt b/caffe2/CMakeLists.txt
+index f7a595e1b..fb315c435 100644
+--- a/caffe2/CMakeLists.txt
++++ b/caffe2/CMakeLists.txt
+@@ -108,11 +108,18 @@ endif()
+ # addressed yet.
+ 
+ if(NOT MSVC AND USE_XNNPACK)
+-  if(NOT TARGET fxdiv)
++  if(NOT TARGET fxdiv AND NOT USE_SYSTEM_FXDIV)
+     set(FXDIV_BUILD_TESTS OFF CACHE BOOL "")
+     set(FXDIV_BUILD_BENCHMARKS OFF CACHE BOOL "")
+     add_subdirectory(
+       "${FXDIV_SOURCE_DIR}"
+       "${CMAKE_BINARY_DIR}/FXdiv")
++  elseif(NOT TARGET fxdiv AND USE_SYSTEM_FXDIV)
++    find_path(FXDIV_HDR fxdiv.h PATH_SUFFIXES include)
++    if(NOT FXDIV_HDR)
++      message(FATAL_ERROR "Cannot find fxdiv")
++    endif()
++    add_library(fxdiv INTERFACE IMPORTED)
++    target_include_directories(fxdiv INTERFACE "${FXDIV_HDR}")
+   endif()
+ endif()
diff --git a/external_imported/vcpkg/ports/libtorch/kineto.patch b/external_imported/vcpkg/ports/libtorch/kineto.patch
new file mode 100644
index 000000000..80810625b
--- /dev/null
+++ b/external_imported/vcpkg/ports/libtorch/kineto.patch
@@ -0,0 +1,34 @@
+diff --git a/libkineto/CMakeLists.txt b/libkineto/CMakeLists.txt
+index 7d36ffb9d4..8f97998114 100644
+--- a/libkineto/CMakeLists.txt
++++ b/libkineto/CMakeLists.txt
+@@ -111,27 +111,8 @@ endif()
+ target_compile_options(kineto_base PRIVATE "${KINETO_COMPILE_OPTIONS}")
+ target_compile_options(kineto_api PRIVATE "${KINETO_COMPILE_OPTIONS}")
+ 
+-if(NOT TARGET fmt)
+-  if(NOT FMT_SOURCE_DIR)
+-    set(FMT_SOURCE_DIR "${LIBKINETO_THIRDPARTY_DIR}/fmt"
+-      CACHE STRING "fmt source directory from submodules")
+-  endif()
+-
+-  # Build FMT.
+-  # FMT and some other libraries use BUILD_SHARED_LIBS to control
+-  # the library type.
+-  # Save and restore the value after configuring FMT
+-  set(TEMP_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
+-  set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libs" FORCE)
+-  set(FMT_LIBRARY_TYPE static CACHE STRING "Set lib type to static")
+-  add_subdirectory("${FMT_SOURCE_DIR}" "${LIBKINETO_BINARY_DIR}/fmt")
+-  set_property(TARGET fmt PROPERTY POSITION_INDEPENDENT_CODE ON)
+-  set(BUILD_SHARED_LIBS ${TEMP_BUILD_SHARED_LIBS} CACHE BOOL "Build shared libs" FORCE)
+-endif()
+-
+-set(FMT_INCLUDE_DIR "${FMT_SOURCE_DIR}/include")
+-message(STATUS "Kineto: FMT_SOURCE_DIR = ${FMT_SOURCE_DIR}")
+-message(STATUS "Kineto: FMT_INCLUDE_DIR = ${FMT_INCLUDE_DIR}")
++find_package(fmt REQUIRED)
++
+ if (NOT CUPTI_INCLUDE_DIR)
+     set(CUPTI_INCLUDE_DIR "${CUDA_SOURCE_DIR}/extras/CUPTI/include")
+ endif()
diff --git a/external_imported/vcpkg/ports/libtorch/more-fixes.patch b/external_imported/vcpkg/ports/libtorch/more-fixes.patch
new file mode 100644
index 000000000..0c7c8d810
--- /dev/null
+++ b/external_imported/vcpkg/ports/libtorch/more-fixes.patch
@@ -0,0 +1,351 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7b8bc7cb6e..fa6da328b8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -383,7 +383,7 @@ if(WIN32)
+       NAMES uv libuv
+       HINTS $ENV{CONDA_PREFIX}\\Library $ENV{PREFIX}\\Library
+       PATH_SUFFIXES lib
+-      NO_DEFAULT_PATH)
++      )
+     if(NOT libuv_tmp_LIBRARY)
+       set(USE_DISTRIBUTED OFF)
+       set(USE_GLOO OFF)
+@@ -1151,10 +1151,6 @@ if(BUILD_SHARED_LIBS)
+       ${PROJECT_SOURCE_DIR}/cmake/Modules_CUDA_fix
+       DESTINATION share/cmake/Caffe2/
+       COMPONENT dev)
+-  install(FILES
+-      ${PROJECT_SOURCE_DIR}/cmake/Modules/FindCUDAToolkit.cmake
+-      DESTINATION share/cmake/Caffe2/
+-      COMPONENT dev)
+   install(FILES
+       ${PROJECT_SOURCE_DIR}/cmake/Modules/FindCUSPARSELT.cmake
+       DESTINATION share/cmake/Caffe2/
+diff --git a/aten/src/ATen/native/vulkan/api/Allocator.h b/aten/src/ATen/native/vulkan/api/Allocator.h
+index d0c8bdf9ec..50df97ae09 100644
+--- a/aten/src/ATen/native/vulkan/api/Allocator.h
++++ b/aten/src/ATen/native/vulkan/api/Allocator.h
+@@ -47,7 +47,7 @@
+ #pragma clang diagnostic ignored "-Wunused-variable"
+ #endif /* __clang__ */
+ 
+-#include <include/vk_mem_alloc.h>
++#include <vk_mem_alloc.h>
+ 
+ #ifdef __clang__
+ #pragma clang diagnostic pop
+diff --git a/aten/src/ATen/native/vulkan/ops/Clamp.cpp b/aten/src/ATen/native/vulkan/ops/Clamp.cpp
+index dc22b987ef..f91fbf6788 100644
+--- a/aten/src/ATen/native/vulkan/ops/Clamp.cpp
++++ b/aten/src/ATen/native/vulkan/ops/Clamp.cpp
+@@ -1,3 +1,6 @@
++#define _USE_MATH_DEFINES 
++#include <cmath>
++
+ #include <ATen/native/vulkan/ops/Common.h>
+ #include <torch/library.h>
+ 
+diff --git a/c10/CMakeLists.txt b/c10/CMakeLists.txt
+index ad407e18cb..bbca41bab2 100644
+--- a/c10/CMakeLists.txt
++++ b/c10/CMakeLists.txt
+@@ -139,7 +139,11 @@ endif()
+ # Note: for now, we will put all export path into one single Caffe2Targets group
+ # to deal with the cmake deployment need. Inside the Caffe2Targets set, the
+ # individual libraries like libc10.so and libcaffe2.so are still self-contained.
+-install(TARGETS c10 EXPORT Caffe2Targets DESTINATION lib)
++install(TARGETS c10 EXPORT Caffe2Targets
++        RUNTIME DESTINATION bin
++        ARCHIVE DESTINATION lib
++        ARCHIVE DESTINATION lib
++        )
+ install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
+         DESTINATION include
+         FILES_MATCHING PATTERN "*.h")
+diff --git a/caffe2/CMakeLists.txt b/caffe2/CMakeLists.txt
+index 74d0d55719..cf349c2fa8 100644
+--- a/caffe2/CMakeLists.txt
++++ b/caffe2/CMakeLists.txt
+@@ -632,7 +632,11 @@ if(USE_CUDA)
+ 
+   target_link_libraries(caffe2_nvrtc ${CUDA_NVRTC} ${CUDA_CUDA_LIB} ${CUDA_NVRTC_LIB} ${DELAY_LOAD_FLAGS})
+   target_include_directories(caffe2_nvrtc PRIVATE ${CUDA_INCLUDE_DIRS})
+-  install(TARGETS caffe2_nvrtc DESTINATION "${TORCH_INSTALL_LIB_DIR}")
++  install(TARGETS caffe2_nvrtc 
++    RUNTIME DESTINATION "${TORCH_INSTALL_BIN_DIR}"
++    LIBRARY DESTINATION "${TORCH_INSTALL_LIB_DIR}"
++    ARCHIVE DESTINATION "${TORCH_INSTALL_LIB_DIR}"
++  )
+   if(USE_NCCL)
+     list(APPEND Caffe2_GPU_SRCS
+       ${TORCH_SRC_DIR}/csrc/cuda/nccl.cpp)
+@@ -694,7 +698,11 @@ if(USE_ROCM)
+   add_library(caffe2_nvrtc SHARED ${ATen_NVRTC_STUB_SRCS})
+   target_link_libraries(caffe2_nvrtc ${PYTORCH_HIP_HCC_LIBRARIES} ${ROCM_HIPRTC_LIB})
+   target_compile_definitions(caffe2_nvrtc PRIVATE USE_ROCM __HIP_PLATFORM_HCC__)
+-  install(TARGETS caffe2_nvrtc DESTINATION "${TORCH_INSTALL_LIB_DIR}")
++  install(TARGETS caffe2_nvrtc
++      RUNTIME DESTINATION "${TORCH_INSTALL_BIN_DIR}"
++      LIBRARY DESTINATION "${TORCH_INSTALL_LIB_DIR}"
++      ARCHIVE DESTINATION "${TORCH_INSTALL_LIB_DIR}"
++    )
+ endif()
+ 
+ if(NOT NO_API AND NOT BUILD_LITE_INTERPRETER)
+@@ -1013,7 +1021,11 @@ elseif(USE_CUDA)
+           CUDA::culibos ${CMAKE_DL_LIBS})
+     endif()
+     set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/../aten/src/ATen/native/cuda/LinearAlgebraStubs.cpp PROPERTIES COMPILE_FLAGS "-DBUILD_LAZY_CUDA_LINALG")
+-    install(TARGETS torch_cuda_linalg DESTINATION "${TORCH_INSTALL_LIB_DIR}")
++    install(TARGETS torch_cuda_linalg
++      RUNTIME DESTINATION "${TORCH_INSTALL_BIN_DIR}"
++      LIBRARY DESTINATION "${TORCH_INSTALL_LIB_DIR}"
++      ARCHIVE DESTINATION "${TORCH_INSTALL_LIB_DIR}"
++    )
+   endif()
+ 
+   if(USE_PRECOMPILED_HEADERS)
+@@ -1475,14 +1487,26 @@ endif()
+ 
+ caffe2_interface_library(torch torch_library)
+ 
+-install(TARGETS torch_cpu torch_cpu_library EXPORT Caffe2Targets DESTINATION "${TORCH_INSTALL_LIB_DIR}")
++install(TARGETS torch_cpu torch_cpu_library EXPORT Caffe2Targets
++      RUNTIME DESTINATION "${TORCH_INSTALL_BIN_DIR}"
++      LIBRARY DESTINATION "${TORCH_INSTALL_LIB_DIR}"
++      ARCHIVE DESTINATION "${TORCH_INSTALL_LIB_DIR}")
+ 
+ if(USE_CUDA)
+-  install(TARGETS torch_cuda torch_cuda_library EXPORT Caffe2Targets DESTINATION "${TORCH_INSTALL_LIB_DIR}")
++  install(TARGETS torch_cuda torch_cuda_library EXPORT Caffe2Targets
++      RUNTIME DESTINATION "${TORCH_INSTALL_BIN_DIR}"
++      LIBRARY DESTINATION "${TORCH_INSTALL_LIB_DIR}"
++      ARCHIVE DESTINATION "${TORCH_INSTALL_LIB_DIR}")
+ elseif(USE_ROCM)
+-  install(TARGETS torch_hip torch_hip_library EXPORT Caffe2Targets DESTINATION "${TORCH_INSTALL_LIB_DIR}")
++  install(TARGETS torch_hip torch_hip_library EXPORT Caffe2Targets
++      RUNTIME DESTINATION "${TORCH_INSTALL_BIN_DIR}"
++      LIBRARY DESTINATION "${TORCH_INSTALL_LIB_DIR}"
++      ARCHIVE DESTINATION "${TORCH_INSTALL_LIB_DIR}")
+ endif()
+-install(TARGETS torch torch_library EXPORT Caffe2Targets DESTINATION "${TORCH_INSTALL_LIB_DIR}")
++install(TARGETS torch torch_library EXPORT Caffe2Targets
++      RUNTIME DESTINATION "${TORCH_INSTALL_BIN_DIR}"
++      LIBRARY DESTINATION "${TORCH_INSTALL_LIB_DIR}"
++      ARCHIVE DESTINATION "${TORCH_INSTALL_LIB_DIR}")
+ 
+ target_link_libraries(torch PUBLIC torch_cpu_library)
+ 
+@@ -1499,11 +1523,11 @@ endif()
+ 
+ # Install PDB files for MSVC builds
+ if(MSVC AND BUILD_SHARED_LIBS)
+-  install(FILES $<TARGET_PDB_FILE:torch_cpu> DESTINATION "${TORCH_INSTALL_LIB_DIR}" OPTIONAL)
++  install(FILES $<TARGET_PDB_FILE:torch_cpu> DESTINATION "${TORCH_INSTALL_BIN_DIR}" OPTIONAL)
+   if(USE_CUDA)
+-    install(FILES $<TARGET_PDB_FILE:torch_cuda> DESTINATION "${TORCH_INSTALL_LIB_DIR}" OPTIONAL)
++    install(FILES $<TARGET_PDB_FILE:torch_cuda> DESTINATION "${TORCH_INSTALL_BIN_DIR}" OPTIONAL)
+   elseif(USE_ROCM)
+-    install(FILES $<TARGET_PDB_FILE:torch_hip> DESTINATION "${TORCH_INSTALL_LIB_DIR}" OPTIONAL)
++    install(FILES $<TARGET_PDB_FILE:torch_hip> DESTINATION "${TORCH_INSTALL_BIN_DIR}" OPTIONAL)
+   endif()
+ endif()
+ 
+@@ -1577,7 +1601,10 @@ if(BUILD_SHARED_LIBS)
+     target_link_libraries(torch_global_deps TBB::tbb)
+   endif()
+ 
+-  install(TARGETS torch_global_deps DESTINATION "${TORCH_INSTALL_LIB_DIR}")
++  install(TARGETS torch_global_deps
++      RUNTIME DESTINATION "${TORCH_INSTALL_BIN_DIR}"
++      LIBRARY DESTINATION "${TORCH_INSTALL_LIB_DIR}"
++      ARCHIVE DESTINATION "${TORCH_INSTALL_LIB_DIR}")
+ endif()
+ 
+ # ---[ Caffe2 HIP sources.
+diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
+index cd27c728ff..2c5c5b95d8 100644
+--- a/cmake/Dependencies.cmake
++++ b/cmake/Dependencies.cmake
+@@ -1130,7 +1130,7 @@ if(BUILD_PYTHON)
+     # Observers are required in the python build
+     caffe2_update_option(USE_OBSERVERS ON)
+   else()
+-    message(WARNING "Python dependencies not met. Not compiling with python. Suppress this warning with -DBUILD_PYTHON=OFF")
++    message(FATAL_ERROR "Python dependencies not met. Not compiling with python. Suppress this warning with -DBUILD_PYTHON=OFF")
+     caffe2_update_option(BUILD_PYTHON OFF)
+   endif()
+ endif()
+@@ -1234,7 +1234,7 @@ endif()
+ # ---[ LLVM
+ if(USE_LLVM)
+   message(STATUS "Looking for LLVM in ${USE_LLVM}")
+-  find_package(LLVM PATHS ${USE_LLVM} NO_DEFAULT_PATH)
++  find_package(LLVM)
+ 
+   if(LLVM_FOUND)
+     message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
+@@ -1248,6 +1248,8 @@ endif(USE_LLVM)
+ # ---[ cuDNN
+ if(USE_CUDNN)
+   find_package(CUDNN REQUIRED)
++  set(CUDNN_FRONTEND_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/../third_party/cudnn_frontend/include)
++  target_include_directories(torch::cudnn INTERFACE ${CUDNN_FRONTEND_INCLUDE_DIR})
+   target_include_directories(torch::cudnn INTERFACE "${CUDNN_INCLUDE_DIR}")
+ endif()
+ 
+diff --git a/cmake/Modules/FindCUSPARSELT.cmake b/cmake/Modules/FindCUSPARSELT.cmake
+index 8727f44a90..1e41281b1b 100644
+--- a/cmake/Modules/FindCUSPARSELT.cmake
++++ b/cmake/Modules/FindCUSPARSELT.cmake
+@@ -24,13 +24,13 @@ list(APPEND CMAKE_PREFIX_PATH ${CUSPARSELT_ROOT})
+ set(CUSPARSELT_INCLUDE_DIR $ENV{CUSPARSELT_INCLUDE_DIR} CACHE PATH "Folder containing NVIDIA cuSPARSELt header files")
+ 
+ find_path(CUSPARSELT_INCLUDE_PATH cusparseLt.h
+-  HINTS ${CUSPARSELT_INCLUDE_DIR}
++  HINTS ${CUSPARSELT_INCLUDE_DIR} ENV CUDA_PATH
+   PATH_SUFFIXES cuda/include cuda include)
+ 
+ set(CUSPARSELT_LIBRARY $ENV{CUSPARSELT_LIBRARY} CACHE PATH "Path to the cusparselt library file (e.g., libcusparseLt.so)")
+ 
+-find_library(CUSPARSELT_LIBRARY_PATH libcusparseLt.so
+-  PATHS ${CUSPARSELT_LIBRARY}
++find_library(CUSPARSELT_LIBRARY_PATH cusparseLt
++  PATHS ${CUSPARSELT_LIBRARY} ENV CUDA_PATH
+   PATH_SUFFIXES lib lib64 cuda/lib cuda/lib64 lib/x64)
+ 
+ find_package_handle_standard_args(CUSPARSELT DEFAULT_MSG CUSPARSELT_LIBRARY_PATH CUSPARSELT_INCLUDE_PATH)
+diff --git a/cmake/Modules/FindMAGMA.cmake b/cmake/Modules/FindMAGMA.cmake
+index d2bff53d9b..3af9012503 100644
+--- a/cmake/Modules/FindMAGMA.cmake
++++ b/cmake/Modules/FindMAGMA.cmake
+@@ -30,18 +30,13 @@ FIND_PATH(MAGMA_INCLUDE_DIR magma.h
+   HINTS $ENV{MAGMA_HOME} /usr/local/magma
+   PATH_SUFFIXES include)
+ 
+-IF (MAGMA_LIBRARIES)
+-  SET(MAGMA_FOUND TRUE)
+-ELSE (MAGMA_LIBRARIES)
+-  SET(MAGMA_FOUND FALSE)
+-ENDIF (MAGMA_LIBRARIES)
+-
+-add_library(torch::magma INTERFACE IMPORTED)
+-set_property(TARGET torch::magma
+-             PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${MAGMA_INCLUDE_DIR}")
+-set_property(TARGET torch::magma
+-             PROPERTY INTERFACE_LINK_LIBRARIES "${MAGMA_LIBRARIES}")
+-
++if(NOT TARGET torch::magma)
++  add_library(torch::magma INTERFACE IMPORTED)
++  set_property(TARGET torch::magma
++               PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${MAGMA_INCLUDE_DIR}")
++  set_property(TARGET torch::magma
++               PROPERTY INTERFACE_LINK_LIBRARIES "${MAGMA_LIBRARIES}")
++endif()
+ # Check for Magma V2
+ include(CheckPrototypeDefinition)
+ check_prototype_definition(magma_get_sgeqrf_nb
+@@ -53,3 +48,5 @@ if(MAGMA_V2)
+   set_property(TARGET torch::magma
+                PROPERTY INTERFACE_COMPILE_DEFINITIONS "MAGMA_V2")
+ endif(MAGMA_V2)
++
++find_package_handle_standard_args(MAGMA REQUIRED_VARS MAGMA_INCLUDE_DIR MAGMA_LIBRARIES)
+\ No newline at end of file
+diff --git a/test/cpp/jit/CMakeLists.txt b/test/cpp/jit/CMakeLists.txt
+index 2376f1bc43..a8ae4367fd 100644
+--- a/test/cpp/jit/CMakeLists.txt
++++ b/test/cpp/jit/CMakeLists.txt
+@@ -124,7 +124,7 @@ endif()
+ set(JIT_TEST_DEPENDENCIES torch gtest jitbackend_test backend_with_compiler)
+ 
+ if(MSVC)
+-  list(APPEND JIT_TEST_DEPENDENCIES onnx_library)
++  list(APPEND JIT_TEST_DEPENDENCIES onnx)
+ endif(MSVC)
+ 
+ target_link_libraries(test_jit PRIVATE ${JIT_TEST_DEPENDENCIES})
+diff --git a/third_party/nvfuser/CMakeLists.txt b/third_party/nvfuser/CMakeLists.txt
+index b148418af0..7b96083893 100644
+--- a/third_party/nvfuser/CMakeLists.txt
++++ b/third_party/nvfuser/CMakeLists.txt
+@@ -158,7 +158,10 @@ endif()
+ target_include_directories(${NVFUSER_CODEGEN}
+                            PUBLIC $<BUILD_INTERFACE:${NVFUSER_SRCS_DIR}>)
+ set_property(TARGET ${NVFUSER_CODEGEN} PROPERTY CXX_STANDARD 17)
+-install(TARGETS ${NVFUSER_CODEGEN} EXPORT NvfuserTargets DESTINATION "${TORCH_INSTALL_LIB_DIR}")
++install(TARGETS ${NVFUSER_CODEGEN} EXPORT NvfuserTargets
++      RUNTIME DESTINATION "${TORCH_INSTALL_BIN_DIR}"
++      LIBRARY DESTINATION "${TORCH_INSTALL_LIB_DIR}"
++      ARCHIVE DESTINATION "${TORCH_INSTALL_LIB_DIR}")
+ # installing nvfuser python tests
+ install(DIRECTORY "${NVFUSER_ROOT}/python_tests/"
+         DESTINATION "${TORCH_ROOT}/test/_nvfuser"
+diff --git a/torch/CMakeLists.txt b/torch/CMakeLists.txt
+index 62ee4c12a9..f75073cf3c 100644
+--- a/torch/CMakeLists.txt
++++ b/torch/CMakeLists.txt
+@@ -107,7 +107,7 @@ set(TORCH_PYTHON_LINK_FLAGS "")
+ 
+ if(MSVC)
+     string(APPEND TORCH_PYTHON_LINK_FLAGS " /NODEFAULTLIB:LIBCMT.LIB")
+-    list(APPEND TORCH_PYTHON_LINK_LIBRARIES ${PYTHON_LIBRARIES} onnx_library)
++    list(APPEND TORCH_PYTHON_LINK_LIBRARIES ${PYTHON_LIBRARIES} onnx)
+     if(NOT CMAKE_BUILD_TYPE MATCHES "Release")
+       string(APPEND TORCH_PYTHON_LINK_FLAGS " /DEBUG:FULL")
+     endif()
+@@ -374,7 +374,10 @@ if(NOT TORCH_PYTHON_LINK_FLAGS STREQUAL "")
+     set_target_properties(torch_python PROPERTIES LINK_FLAGS ${TORCH_PYTHON_LINK_FLAGS})
+ endif()
+ 
+-install(TARGETS torch_python DESTINATION "${TORCH_INSTALL_LIB_DIR}")
++install(TARGETS torch_python       
++      RUNTIME DESTINATION "${TORCH_INSTALL_BIN_DIR}"
++      LIBRARY DESTINATION "${TORCH_INSTALL_LIB_DIR}"
++      ARCHIVE DESTINATION "${TORCH_INSTALL_LIB_DIR}")
+ 
+ # Generate torch/version.py from the appropriate CMake cache variables.
+ if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
+diff --git a/torch/csrc/cuda/shared/nvtx.cpp b/torch/csrc/cuda/shared/nvtx.cpp
+index 4fb72c5f79..1abe1b76d6 100644
+--- a/torch/csrc/cuda/shared/nvtx.cpp
++++ b/torch/csrc/cuda/shared/nvtx.cpp
+@@ -1,7 +1,7 @@
+ #ifdef _WIN32
+ #include <wchar.h> // _wgetenv for nvtx
+ #endif
+-#include <nvToolsExt.h>
++#include <nvtx3/nvToolsExt.h>
+ #include <torch/csrc/utils/pybind.h>
+ 
+ namespace torch::cuda::shared {
+diff --git a/torch/csrc/jit/tensorexpr/llvm_codegen.h b/torch/csrc/jit/tensorexpr/llvm_codegen.h
+index 7ab506fa8f..2ee3b68b6b 100644
+--- a/torch/csrc/jit/tensorexpr/llvm_codegen.h
++++ b/torch/csrc/jit/tensorexpr/llvm_codegen.h
+@@ -41,9 +41,9 @@ class TORCH_API LLVMCodeGen : public CodeGen {
+   // users can continue to call this kernel using `call` and `call_raw`.
+   void cleanup_memory();
+ 
+-  TORCH_API void call(const std::vector<CallArg>& args) override;
+-  TORCH_API void call_raw(const std::vector<void*>& args) override;
+-  TORCH_API void call_with_numel(void** args, int64_t numel) override;
++  void call(const std::vector<CallArg>& args) override;
++  void call_raw(const std::vector<void*>& args) override;
++  void call_with_numel(void** args, int64_t numel) override;
+ 
+   at::Tensor empty_strided(
+       c10::IntArrayRef size,
+diff --git a/torch/csrc/profiler/stubs/cuda.cpp b/torch/csrc/profiler/stubs/cuda.cpp
+index dec87576f3..3bb368a4df 100644
+--- a/torch/csrc/profiler/stubs/cuda.cpp
++++ b/torch/csrc/profiler/stubs/cuda.cpp
+@@ -1,6 +1,6 @@
+ #include <sstream>
+ 
+-#include <nvToolsExt.h>
++#include <nvtx3/nvToolsExt.h>
+ 
+ #include <c10/cuda/CUDAGuard.h>
+ #include <c10/util/irange.h>
diff --git a/external_imported/vcpkg/ports/libtorch/portfile.cmake b/external_imported/vcpkg/ports/libtorch/portfile.cmake
index 98c8cfe93..9b5ed4d13 100644
--- a/external_imported/vcpkg/ports/libtorch/portfile.cmake
+++ b/external_imported/vcpkg/ports/libtorch/portfile.cmake
@@ -3,27 +3,68 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO pytorch/pytorch
-    REF v1.12.1
-    SHA512 afeb551904ebd9b5901ae623a98eadbb3045115247cedf8006a940742cfad04e5ce24cfaf363336a9ed88d7ce6a4ac53dbb6a5c690aef6efdf20477c3a22c7ca
+    REF "v${VERSION}"
+    SHA512 a8961d78ad785b13c959a0612563a60e0de17a7c8bb9822ddea9a24072796354d07e81c47b6cc8761b21a6448845b088cf80e1661d9e889b0ed5474d3dc76756
     HEAD_REF master
     PATCHES
-        pytorch-pr-85958.patch # https://github.com/pytorch/pytorch/pull/85958
-        fix-cmake.patch
-        fix-fbgemm-include.patch
-        fix-c10-glog.patch
-        use-flatbuffers2.patch # check with codegen-flatc-mobile_bytecode
-        fix-windows.patch # https://github.com/pytorch/pytorch/issues/87957
+        cmake-fixes.patch
+        more-fixes.patch
+        fix-build.patch
+        clang-cl.patch
+        cuda-adjustments.patch
+        fix-api-export.patch
+        fix-onnx-case.patch
+        fxdiv.patch
+        protoc.patch
+        fix-sleef.patch
+        fix-glog.patch
+        fix-msvc-ICE.patch
 )
 file(REMOVE_RECURSE "${SOURCE_PATH}/caffe2/core/macros.h") # We must use generated header files
 
-# Editing ${SOURCE_PATH}/cmake/Dependencies.cmake makes HORRIBLE readability...
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-dependencies.cmake" DESTINATION "${SOURCE_PATH}/cmake")
+vcpkg_from_github(
+    OUT_SOURCE_PATH src_kineto
+    REPO pytorch/kineto
+    REF 49e854d805d916b2031e337763928d2f8d2e1fbf
+    SHA512 ae63d48dc5b8ac30c38c2ace60f16834c7e9275fa342dc9f109d4fbc87b7bd674664f6413c36d0c1ab5a7da786030a4108d83daa4502b2f30239283ea3acdb16
+    HEAD_REF main
+    PATCHES
+      kineto.patch
+)
+file(COPY "${src_kineto}/" DESTINATION "${SOURCE_PATH}/third_party/kineto")
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH src_cudnn
+    REPO NVIDIA/cudnn-frontend # new port ?
+    REF 12f35fa2be5994c1106367cac2fba21457b064f4
+    SHA512 a7e4bf58f82ca0b767df35da1b3588e2639ea2ef22ed0c47e989fb4cde5a28b0605b228b42fcaefbdf721bfbb91f2a9e7d41352ff522bd80b63db6d27e44ec20
+    HEAD_REF main
+)
+file(COPY "${src_cudnn}/" DESTINATION "${SOURCE_PATH}/third_party/cudnn_frontend")
+
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH src_cutlass
+    REPO NVIDIA/cutlass # new port ?
+    REF 6f47420213f757831fae65c686aa471749fa8d60
+    SHA512 f3b3c43fbd7942f96407669405385c9a99274290e99f86cab5bb8657664bf1951e4da27f3069500a4825c427adeec883e05e81302b58390df3a3adb8c08e31ed
+    HEAD_REF main
+)
+file(COPY "${src_cutlass}/" DESTINATION "${SOURCE_PATH}/third_party/cutlass")
+
+file(REMOVE
+  "${SOURCE_PATH}/cmake/Modules/FindBLAS.cmake"
+  "${SOURCE_PATH}/cmake/Modules/FindLAPACK.cmake"
+  "${SOURCE_PATH}/cmake/Modules/FindCUDA.cmake"
+  "${SOURCE_PATH}/cmake/Modules/FindCUDAToolkit.cmake"
+  "${SOURCE_PATH}/cmake/Modules/Findpybind11.cmake"
+)
 
 find_program(FLATC NAMES flatc PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools/flatbuffers" REQUIRED NO_DEFAULT_PATH NO_CMAKE_PATH)
 message(STATUS "Using flatc: ${FLATC}")
 
 vcpkg_execute_required_process(
-    COMMAND ${FLATC} --cpp --gen-object-api --gen-mutable mobile_bytecode.fbs
+    COMMAND ${FLATC} --cpp --no-prefix --scoped-enums --gen-mutable mobile_bytecode.fbs
     LOGNAME codegen-flatc-mobile_bytecode
     WORKING_DIRECTORY "${SOURCE_PATH}/torch/csrc/jit/serialization"
 )
@@ -36,6 +77,7 @@ x_vcpkg_get_python_packages(
     PACKAGES typing-extensions pyyaml numpy
     OUT_PYTHON_VAR PYTHON3
 )
+#set(PYTHON3 "${CURRENT_HOST_INSTALLED_DIR}/tools/python3/python${VCPKG_HOST_EXECUTABLE_SUFFIX}")
 message(STATUS "Using Python3: ${PYTHON3}")
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -46,10 +88,11 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     fftw3   AT_FFTW_ENABLED
     fbgemm  USE_FBGEMM
     opencv  USE_OPENCV
-    tbb     USE_TBB
-    tbb     AT_PARALLEL_NATIVE_TBB
-    openmp  USE_OPENMP
-    openmp  AT_PARALLEL_OPENMP
+    # These are alternatives !
+    # tbb     USE_TBB
+    # tbb     AT_PARALLEL_NATIVE_TBB # AT_PARALLEL_ are alternatives
+    # openmp  USE_OPENMP
+    # openmp  AT_PARALLEL_OPENMP # AT_PARALLEL_ are alternatives
     leveldb USE_LEVELDB
     opencl  USE_OPENCL
     cuda    USE_CUDA
@@ -59,20 +102,22 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     cuda    USE_NVRTC
     cuda    AT_CUDA_ENABLED
     cuda    AT_CUDNN_ENABLED
+    cuda    USE_MAGMA
     vulkan  USE_VULKAN
-    vulkan  USE_VULKAN_WRAPPER
-    vulkan  USE_VULKAN_SHADERC_RUNTIME
+    #vulkan  USE_VULKAN_SHADERC_RUNTIME
     vulkan  USE_VULKAN_RELAXED_PRECISION
+    rocm    USE_ROCM  # This is an alternative to cuda not a feature! (Not in vcpkg.json!) -> disabled
+    llvm    USE_LLVM
+    mpi     USE_MPI
     nnpack  USE_NNPACK  # todo: check use of `DISABLE_NNPACK_AND_FAMILY`
     nnpack  AT_NNPACK_ENABLED
     xnnpack USE_XNNPACK
-    xnnpack USE_SYSTEM_XNNPACK
     qnnpack USE_QNNPACK # todo: check use of `USE_PYTORCH_QNNPACK`
+#   No feature in vcpkg yet so disabled. -> Requires numpy build by vcpkg itself
+    python  BUILD_PYTHON
+    python  USE_NUMPY
 )
 
-if(CMAKE_CXX_COMPILER_ID MATCHES GNU)
-    list(APPEND FEATURE_OPTIONS -DUSE_NATIVE_ARCH=ON)
-endif()
 if("dist" IN_LIST FEATURES)
     if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
         list(APPEND FEATURE_OPTIONS -DUSE_TENSORPIPE=ON)
@@ -83,20 +128,6 @@ if("dist" IN_LIST FEATURES)
     list(APPEND FEATURE_OPTIONS -DUSE_GLOO=${VCPKG_TARGET_IS_LINUX})
 endif()
 
-# BLAS: MKL, OpenBLAS, or Accelerate
-#   The feature will be disabled if "generic" BLAS is not found
-if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS)
-    list(APPEND BLAS_OPTIONS -DBLAS=Accelerate -DUSE_BLAS=ON)
-elseif(VCPKG_TARGET_IS_WINDOWS)
-    list(APPEND BLAS_OPTIONS -DBLAS=OpenBLAS -DUSE_BLAS=ON)
-elseif(VCPKG_TARGET_IS_LINUX)
-    list(APPEND BLAS_OPTIONS -DBLAS=generic -DUSE_BLAS=ON)
-endif()
-
-if("tbb" IN_LIST FEATURES)
-    list(APPEND FEATURE_OPTIONS -DMKLDNN_CPU_RUNTIME=TBB)
-endif()
-
 if(VCPKG_TARGET_IS_ANDROID OR VCPKG_TARGET_IS_IOS)
     list(APPEND FEATURE_OPTIONS -DINTERN_BUILD_MOBILE=ON)
 else()
@@ -113,71 +144,133 @@ vcpkg_cmake_configure(
         -DProtobuf_PROTOC_EXECUTABLE:FILEPATH=${PROTOC}
         -DCAFFE2_CUSTOM_PROTOC_EXECUTABLE:FILEPATH=${PROTOC}
         -DPYTHON_EXECUTABLE:FILEPATH=${PYTHON3}
-        -DPython3_EXECUTABLE:FILEPATH=${PYTHON3}
+        #-DPython3_EXECUTABLE:FILEPATH=${PYTHON3}
+        -DCAFFE2_STATIC_LINK_CUDA=ON
         -DCAFFE2_USE_MSVC_STATIC_RUNTIME=${USE_STATIC_RUNTIME}
         -DBUILD_CUSTOM_PROTOBUF=OFF
         -DUSE_LITE_PROTO=OFF
         -DBUILD_TEST=OFF
         -DATEN_NO_TEST=ON
         -DUSE_SYSTEM_LIBS=ON
-        -DBUILD_PYTHON=OFF
-        -DUSE_NUMPY=OFF
         -DUSE_METAL=OFF
         -DUSE_PYTORCH_METAL=OFF
         -DUSE_PYTORCH_METAL_EXPORT=OFF
         -DUSE_GFLAGS=ON
         -DUSE_GLOG=ON
         -DUSE_LMDB=ON
-        -DUSE_ROCKSDB=OFF
-        -DUSE_OBSERVERS=OFF 
+        -DUSE_ITT=OFF
+        -DUSE_ROCKSDB=ON
+        -DUSE_OBSERVERS=OFF
         -DUSE_PYTORCH_QNNPACK=OFF
         -DUSE_KINETO=OFF
         -DUSE_ROCM=OFF
-        -DUSE_DEPLOY=OFF
-        -DUSE_FFTW=OFF
         -DUSE_NUMA=OFF
-        -DUSE_MPI=${VCPKG_TARGET_IS_LINUX}
+        -DUSE_SYSTEM_ONNX=ON
+        -DUSE_SYSTEM_FP16=ON
+        -DUSE_SYSTEM_EIGEN_INSTALL=ON
+        -DUSE_SYSTEM_CPUINFO=ON
+        -DUSE_SYSTEM_PTHREADPOOL=ON
+        -DUSE_SYSTEM_PYBIND11=ON
+        -DUSE_SYSTEM_ZSTD=ON
+        -DUSE_SYSTEM_XNNPACK=ON
+        -DUSE_SYSTEM_GLOO=ON
+        -DUSE_SYSTEM_NCCL=ON
+        -DUSE_SYSTEM_LIBS=ON
+        -DUSE_SYSTEM_FXDIV=ON
+        -DUSE_SYSTEM_SLEEF=ON
         -DBUILD_JNI=${VCPKG_TARGET_IS_ANDROID}
         -DUSE_NNAPI=${VCPKG_TARGET_IS_ANDROID}
         ${BLAS_OPTIONS}
         # BLAS=MKL not supported in this port
         -DUSE_MKLDNN=OFF
         -DUSE_MKLDNN_CBLAS=OFF
-        -DCAFFE2_USE_MKL=OFF
-        -DCAFFE2_USE_MKLDNN=OFF
-        -DAT_MKL_ENABLED=OFF
+        #-DCAFFE2_USE_MKL=ON
+        #-DAT_MKL_ENABLED=ON
         -DAT_MKLDNN_ENABLED=OFF
+        -DUSE_OPENCL=ON
+        -DUSE_NUMPY=ON
+        -DUSE_KINETO=OFF #
+    OPTIONS_RELEASE
+      -DPYTHON_LIBRARY=${CURRENT_INSTALLED_DIR}/lib/python311.lib
+    OPTIONS_DEBUG
+      -DPYTHON_LIBRARY=${CURRENT_INSTALLED_DIR}/debug/lib/python311_d.lib
     MAYBE_UNUSED_VARIABLES
         USE_NUMA
         USE_SYSTEM_BIND11
-        USE_VULKAN_WRAPPER
         MKLDNN_CPU_RUNTIME
+        PYTHON_LIBRARY
 )
-vcpkg_cmake_build(TARGET __aten_op_header_gen LOGFILE_BASE build-header_gen) # explicit codegen is required
-vcpkg_cmake_build(TARGET torch_cpu  LOGFILE_BASE build-torch_cpu)
+
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include"
-                    "${CURRENT_PACKAGES_DIR}/debug/share"
-                    "${CURRENT_PACKAGES_DIR}/share"
-                    "${CURRENT_PACKAGES_DIR}/include/c10/test/core/impl"
-                    "${CURRENT_PACKAGES_DIR}/include/c10/hip"
-                    "${CURRENT_PACKAGES_DIR}/include/c10/benchmark"
-                    "${CURRENT_PACKAGES_DIR}/include/c10/test"
-                    "${CURRENT_PACKAGES_DIR}/include/c10/cuda"
-                    "${CURRENT_PACKAGES_DIR}/include/c10d/quantization"
-                    "${CURRENT_PACKAGES_DIR}/include/caffe2/ideep/operators/quantization"
-                    "${CURRENT_PACKAGES_DIR}/include/caffe2/python"
-                    "${CURRENT_PACKAGES_DIR}/include/caffe2/share/contrib/depthwise"
-                    "${CURRENT_PACKAGES_DIR}/include/caffe2/share/contrib/nnpack"
-                    "${CURRENT_PACKAGES_DIR}/include/caffe2/mobile"
-                    "${CURRENT_PACKAGES_DIR}/include/caffe2/experiments/python"
-                    "${CURRENT_PACKAGES_DIR}/include/caffe2/test"
-                    "${CURRENT_PACKAGES_DIR}/include/caffe2/utils/hip"
-                    "${CURRENT_PACKAGES_DIR}/include/caffe2/opt/nql/tests"
-                    "${CURRENT_PACKAGES_DIR}/include/caffe2/contrib"
-                    "${CURRENT_PACKAGES_DIR}/include/caffe2/core/nomnigraph/Representations"
-                    "${CURRENT_PACKAGES_DIR}/include/torch/csrc"
+vcpkg_cmake_config_fixup(PACKAGE_NAME caffe2 CONFIG_PATH "share/cmake/Caffe2" DO_NOT_DELETE_PARENT_CONFIG_PATH)
+vcpkg_cmake_config_fixup(PACKAGE_NAME torch CONFIG_PATH "share/cmake/Torch")
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/torch/TorchConfig.cmake" "/../../../" "/../../")
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/caffe2/Caffe2Config.cmake" "/../../../" "/../../")
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/caffe2/Caffe2Config.cmake"
+  "set(Caffe2_MAIN_LIBS torch_library)"
+  "set(Caffe2_MAIN_LIBS torch_library)\nfind_dependency(Eigen3)")
+
+
+
+# Traverse the folder and remove "some" empty folders
+function(cleanup_once folder)
+    if(NOT IS_DIRECTORY "${folder}")
+        return()
+    endif()
+    file(GLOB paths LIST_DIRECTORIES true "${folder}/*")
+    list(LENGTH paths count)
+    # 1. remove if the given folder is empty
+    if(count EQUAL 0)
+        file(REMOVE_RECURSE "${folder}")
+        message(STATUS "Removed ${folder}")
+        return()
+    endif()
+    # 2. repeat the operation for hop 1 sub-directories 
+    foreach(path ${paths})
+        cleanup_once(${path})
+    endforeach()
+endfunction()
+
+# Some folders may contain empty folders. They will become empty after `cleanup_once`.
+# Repeat given times to delete new empty folders.
+function(cleanup_repeat folder repeat)
+    if(NOT IS_DIRECTORY "${folder}")
+        return()
+    endif()
+    while(repeat GREATER_EQUAL 1)
+        math(EXPR repeat "${repeat} - 1" OUTPUT_FORMAT DECIMAL)
+        cleanup_once("${folder}")
+    endwhile()
+endfunction()
+
+cleanup_repeat("${CURRENT_PACKAGES_DIR}/include" 5)
+cleanup_repeat("${CURRENT_PACKAGES_DIR}/lib/site-packages" 13)
+
+file(REMOVE_RECURSE
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/debug/share"
 )
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+
+# Cannot build python bindings yet
+#if("python" IN_LIST FEATURES)
+#  set(ENV{USE_SYSTEM_LIBS} 1)
+#  vcpkg_replace_string("${SOURCE_PATH}/setup.py" "@TARGET_TRIPLET@" "${TARGET_TRIPLET}-rel")
+#  vcpkg_replace_string("${SOURCE_PATH}/tools/setup_helpers/env.py" "@TARGET_TRIPLET@" "${TARGET_TRIPLET}-rel")
+#  vcpkg_replace_string("${SOURCE_PATH}/torch/utils/cpp_extension.py" "@TARGET_TRIPLET@" "${TARGET_TRIPLET}-rel")
+#  vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}" OPTIONS -x)
+#endif()
+
+set(VCPKG_POLICY_DLLS_WITHOUT_EXPORTS enabled) # torch_global_deps.dll is empty.c and just for linking deps
+
+set(config "${CURRENT_PACKAGES_DIR}/share/torch/TorchConfig.cmake")
+file(READ "${config}" contents)
+string(REGEX REPLACE "set\\\(NVTOOLEXT_HOME[^)]+" "set(NVTOOLEXT_HOME \"\$ENV{CUDA_PATH}\"" contents "${contents}")
+#string(REGEX REPLACE "set\\\(NVTOOLEXT_HOME[^)]+" "set(NVTOOLEXT_HOME \"\${CMAKE_CURRENT_LIST_DIR}/../../tools/cuda/\"" contents "${contents}")
+string(REGEX REPLACE "\\\${NVTOOLEXT_HOME}/lib/x64/nvToolsExt64_1.lib" "" contents "${contents}")
+file(WRITE "${config}" "${contents}")
+
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/torch/csrc/autograd/custom_function.h" "struct TORCH_API Function" "struct Function")
diff --git a/external_imported/vcpkg/ports/libtorch/protoc.patch b/external_imported/vcpkg/ports/libtorch/protoc.patch
new file mode 100644
index 000000000..9690ed615
--- /dev/null
+++ b/external_imported/vcpkg/ports/libtorch/protoc.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fa6da328b..80bbfc6bb 100644
+--- a/CMakeLists.txt	
++++ b/CMakeLists.txt
+@@ -686,7 +686,7 @@ if(NOT CMAKE_BUILD_TYPE)
+ endif()
+ 
+ # The below means we are cross compiling for arm64 or x86_64 on MacOSX
+-if(NOT IOS AND CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_OSX_ARCHITECTURES MATCHES "^(x86_64|arm64)$")
++if(0)
+   set(CROSS_COMPILING_MACOSX TRUE)
+   # We need to compile a universal protoc to not fail protobuf build
+   # We set CMAKE_TRY_COMPILE_TARGET_TYPE to STATIC_LIBRARY (vs executable) to succeed the cmake compiler check for cross-compiling
diff --git a/external_imported/vcpkg/ports/libtorch/pytorch-pr-85958.patch b/external_imported/vcpkg/ports/libtorch/pytorch-pr-85958.patch
deleted file mode 100644
index 5e4e6a2e7..000000000
--- a/external_imported/vcpkg/ports/libtorch/pytorch-pr-85958.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/aten/src/ATen/cpu/vec/vec_base.h b/aten/src/ATen/cpu/vec/vec_base.h
-index 635ec8c82e5d..1974d55943b3 100644
---- a/aten/src/ATen/cpu/vec/vec_base.h
-+++ b/aten/src/ATen/cpu/vec/vec_base.h
-@@ -132,8 +132,9 @@ struct Vectorized {
-   // versions GCC/Clang have buggy determinations on whether or not an
-   // identifier is odr-used or not, and in any case it's hard to tell if
-   // a variable is odr-used or not.  So best to just cut the problem at the root.
-+  static constexpr size_type size_T = sizeof(T);  // Workaround to compile with VS2022.
-   static constexpr size_type size() {
--    return VECTOR_WIDTH / sizeof(T);
-+    return VECTOR_WIDTH / size_T;
-   }
-   Vectorized() : values{static_cast<T>(0)} {}
-   Vectorized(T val) {
diff --git a/external_imported/vcpkg/ports/libtorch/use-flatbuffers2.patch b/external_imported/vcpkg/ports/libtorch/use-flatbuffers2.patch
deleted file mode 100644
index 53d54c677..000000000
--- a/external_imported/vcpkg/ports/libtorch/use-flatbuffers2.patch
+++ /dev/null
@@ -1,276 +0,0 @@
-diff --git a/torch/csrc/jit/mobile/flatbuffer_loader.cpp b/torch/csrc/jit/mobile/flatbuffer_loader.cpp
-index 0e126ff..4e6048e 100644
---- a/torch/csrc/jit/mobile/flatbuffer_loader.cpp
-+++ b/torch/csrc/jit/mobile/flatbuffer_loader.cpp
-@@ -123,29 +123,29 @@ FlatbufferLoader::FlatbufferLoader()
-     : mcu_(std::make_shared<mobile::CompilationUnit>()),
-       cu_(std::make_shared<CompilationUnit>()),
-       ivalue_parsers_{nullptr} {
--  registerIValueParser(mobile::serialization::IValueUnion::NONE, &parseBasic);
--  registerIValueParser(mobile::serialization::IValueUnion::Int, &parseBasic);
--  registerIValueParser(mobile::serialization::IValueUnion::Bool, &parseBasic);
--  registerIValueParser(mobile::serialization::IValueUnion::Double, &parseBasic);
-+  registerIValueParser(mobile::serialization::IValueUnion::IValueUnion_NONE, &parseBasic);
-+  registerIValueParser(mobile::serialization::IValueUnion::IValueUnion_Int, &parseBasic);
-+  registerIValueParser(mobile::serialization::IValueUnion::IValueUnion_Bool, &parseBasic);
-+  registerIValueParser(mobile::serialization::IValueUnion::IValueUnion_Double, &parseBasic);
-   registerIValueParser(
--      mobile::serialization::IValueUnion::ComplexDouble, &parseBasic);
-+      mobile::serialization::IValueUnion::IValueUnion_ComplexDouble, &parseBasic);
-   registerIValueParser(
--      mobile::serialization::IValueUnion::TensorMetadata, &parseTensor);
--  registerIValueParser(mobile::serialization::IValueUnion::String, &parseBasic);
--  registerIValueParser(mobile::serialization::IValueUnion::List, &parseList);
-+      mobile::serialization::IValueUnion::IValueUnion_TensorMetadata, &parseTensor);
-+  registerIValueParser(mobile::serialization::IValueUnion::IValueUnion_String, &parseBasic);
-+  registerIValueParser(mobile::serialization::IValueUnion::IValueUnion_List, &parseList);
-   registerIValueParser(
--      mobile::serialization::IValueUnion::IntList, &parseIntList);
-+      mobile::serialization::IValueUnion::IValueUnion_IntList, &parseIntList);
-   registerIValueParser(
--      mobile::serialization::IValueUnion::DoubleList, &parseDoubleList);
-+      mobile::serialization::IValueUnion::IValueUnion_DoubleList, &parseDoubleList);
-   registerIValueParser(
--      mobile::serialization::IValueUnion::BoolList, &parseBoolList);
--  registerIValueParser(mobile::serialization::IValueUnion::Tuple, &parseTuple);
--  registerIValueParser(mobile::serialization::IValueUnion::Dict, &parseDict);
-+      mobile::serialization::IValueUnion::IValueUnion_BoolList, &parseBoolList);
-+  registerIValueParser(mobile::serialization::IValueUnion::IValueUnion_Tuple, &parseTuple);
-+  registerIValueParser(mobile::serialization::IValueUnion::IValueUnion_Dict, &parseDict);
-   registerIValueParser(
--      mobile::serialization::IValueUnion::Object, &parseObject);
--  registerIValueParser(mobile::serialization::IValueUnion::Device, &parseBasic);
-+      mobile::serialization::IValueUnion::IValueUnion_Object, &parseObject);
-+  registerIValueParser(mobile::serialization::IValueUnion::IValueUnion_Device, &parseBasic);
-   registerIValueParser(
--      mobile::serialization::IValueUnion::EnumValue, &parseEnum);
-+      mobile::serialization::IValueUnion::IValueUnion_EnumValue, &parseEnum);
-   internal_registerTypeResolver(&resolveType);
- }
- 
-@@ -334,21 +334,21 @@ IValue parseBasic(
-     FlatbufferLoader&,
-     const mobile::serialization::IValue& ivalue) {
-   switch (ivalue.val_type()) {
--    case mobile::serialization::IValueUnion::NONE:
-+    case mobile::serialization::IValueUnion::IValueUnion_NONE:
-       return {};
--    case mobile::serialization::IValueUnion::Int:
-+    case mobile::serialization::IValueUnion::IValueUnion_Int:
-       return ivalue.val_as_Int()->int_val();
--    case mobile::serialization::IValueUnion::Bool:
-+    case mobile::serialization::IValueUnion::IValueUnion_Bool:
-       return ivalue.val_as_Bool()->bool_val();
--    case mobile::serialization::IValueUnion::Double:
-+    case mobile::serialization::IValueUnion::IValueUnion_Double:
-       return ivalue.val_as_Double()->double_val();
--    case mobile::serialization::IValueUnion::ComplexDouble: {
-+    case mobile::serialization::IValueUnion::IValueUnion_ComplexDouble: {
-       const auto* comp = ivalue.val_as_ComplexDouble();
-       return c10::complex<double>(comp->real(), comp->imag());
-     }
--    case mobile::serialization::IValueUnion::String:
-+    case mobile::serialization::IValueUnion::IValueUnion_String:
-       return ivalue.val_as_String()->data()->str();
--    case mobile::serialization::IValueUnion::Device: {
-+    case mobile::serialization::IValueUnion::IValueUnion_Device: {
-       return c10::Device(ivalue.val_as_Device()->str()->str());
-     }
-     default:
-@@ -504,7 +504,7 @@ ClassTypePtr FlatbufferLoader::getOrCreateClassTypeForObject(
-     TORCH_CHECK(object->type_index() < all_ivalues_.size());
-     all_types_[object->type_index()] = cls;
- 
--    if (obj_type->type() == mobile::serialization::TypeType::CLASS_WITH_FIELD) {
-+    if (obj_type->type() == mobile::serialization::TypeType::TypeType_CLASS_WITH_FIELD) {
-       for (uint32_t i = 0; i < object->attrs()->size(); i++) {
-         IValue val = getIValue(object->attrs()->Get(i));
-         // Need to use concrete object's field's type to set type of field.
-@@ -529,7 +529,7 @@ IValue parseObject(
-   auto cls = loader.getOrCreateClassTypeForObject(object);
-   Stack stack;
-   switch (obj_type->type()) {
--    case mobile::serialization::TypeType::CLASS_WITH_FIELD: {
-+    case mobile::serialization::TypeType::TypeType_CLASS_WITH_FIELD: {
-       auto obj = c10::ivalue::Object::create(
-           at::StrongTypePtr(loader.cu_, cls), object->attrs()->size());
-       for (uint32_t i = 0; i < object->attrs()->size(); i++) {
-@@ -538,7 +538,7 @@ IValue parseObject(
-       }
-       return obj;
-     }
--    case mobile::serialization::TypeType::CLASS_WITH_SETSTATE: {
-+    case mobile::serialization::TypeType::TypeType_CLASS_WITH_SETSTATE: {
-       IValue input = loader.getIValue(object->state());
-       mobile::Function* setstate = loader.getFunction(object->setstate_func());
-       auto obj =
-@@ -548,7 +548,7 @@ IValue parseObject(
-       setstate->run(stack);
-       return obj;
-     }
--    case mobile::serialization::TypeType::CUSTOM_CLASS: {
-+    case mobile::serialization::TypeType::TypeType_CUSTOM_CLASS: {
-       auto custom_class_type =
-           torch::jit::getCustomClass(cls->name()->qualifiedName());
-       IValue input = loader.getIValue(object->state());
-diff --git a/torch/csrc/jit/mobile/flatbuffer_loader.h b/torch/csrc/jit/mobile/flatbuffer_loader.h
-index 7e88326..dc95202 100644
---- a/torch/csrc/jit/mobile/flatbuffer_loader.h
-+++ b/torch/csrc/jit/mobile/flatbuffer_loader.h
-@@ -151,7 +151,7 @@ class TORCH_API FlatbufferLoader {
-   std::vector<IValue> all_ivalues_;
-   std::array<
-       IValueParser,
--      static_cast<uint8_t>(mobile::serialization::IValueUnion::MAX) + 1>
-+      static_cast<uint8_t>(mobile::serialization::IValueUnion::IValueUnion_MAX) + 1>
-       ivalue_parsers_;
-   TypeResolver type_resolver_ = nullptr;
-   mobile::serialization::Module* module_ = nullptr;
-diff --git a/torch/csrc/jit/serialization/flatbuffer_serializer.cpp b/torch/csrc/jit/serialization/flatbuffer_serializer.cpp
-index 066a78c..a9e19bb 100644
---- a/torch/csrc/jit/serialization/flatbuffer_serializer.cpp
-+++ b/torch/csrc/jit/serialization/flatbuffer_serializer.cpp
-@@ -336,7 +336,7 @@ flatbuffers::DetachedBuffer FlatbufferSerializer::serializeModule(
-   mcu_ = &module.compilation_unit();
- 
-   // first element is None.
--  insertIValue(CreateIValue(fbb, mobile::serialization::IValueUnion::NONE, 0));
-+  insertIValue(CreateIValue(fbb, mobile::serialization::IValueUnion::IValueUnion_NONE, 0));
- 
-   auto methods = module.get_methods();
-   std::vector<uint32_t> functions_index;
-@@ -459,7 +459,7 @@ flatbuffers::Offset<mobile::serialization::Dict> FlatbufferSerializer::dictToFB(
- flatbuffers::Offset<mobile::serialization::ObjectType> FlatbufferSerializer::
-     classTypeToFB(FlatBufferBuilder& fbb, ClassTypePtr class_ptr) {
-   mobile::serialization::TypeType typetype =
--      mobile::serialization::TypeType::UNSET;
-+      mobile::serialization::TypeType::TypeType_UNSET;
- 
-   flatbuffers::Offset<
-       flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>>>
-@@ -469,11 +469,11 @@ flatbuffers::Offset<mobile::serialization::ObjectType> FlatbufferSerializer::
-   const mobile::Function* setstate = mcu_->find_function(setstate_name);
-   const mobile::Function* getstate = mcu_->find_function(getstate_name);
-   if (setstate != nullptr && getstate != nullptr) {
--    typetype = mobile::serialization::TypeType::CLASS_WITH_SETSTATE;
-+    typetype = mobile::serialization::TypeType::TypeType_CLASS_WITH_SETSTATE;
-   } else if (
-       class_ptr->findMethod("__setstate__") &&
-       class_ptr->findMethod("__getstate__")) {
--    typetype = mobile::serialization::TypeType::CUSTOM_CLASS;
-+    typetype = mobile::serialization::TypeType::TypeType_CUSTOM_CLASS;
-   } else {
-     size_t num_attr = class_ptr->numAttributes();
-     std::vector<flatbuffers::Offset<flatbuffers::String>> names;
-@@ -482,7 +482,7 @@ flatbuffers::Offset<mobile::serialization::ObjectType> FlatbufferSerializer::
-       names.push_back(fbb.CreateSharedString(class_ptr->getAttributeName(i)));
-     }
-     names_offset = fbb.CreateVector(names);
--    typetype = mobile::serialization::TypeType::CLASS_WITH_FIELD;
-+    typetype = mobile::serialization::TypeType::TypeType_CLASS_WITH_FIELD;
-   }
- 
-   auto name_offset = fbb.CreateString(class_ptr->name()->qualifiedName());
-@@ -500,7 +500,7 @@ uint32_t FlatbufferSerializer::storeFunctionAndGetIndex(
- 
-   auto offset = CreateIValue(
-       fbb,
--      mobile::serialization::IValueUnion::Function,
-+      mobile::serialization::IValueUnion::IValueUnion_Function,
-       functionToFB(fbb, qn, function).Union());
- 
-   uint32_t index = insertIValue(offset);
-@@ -662,68 +662,68 @@ flatbuffers::Offset<mobile::serialization::IValue> FlatbufferSerializer::
-     iValueToFB(flatbuffers::FlatBufferBuilder& fbb, const IValue& ivalue) {
-   using mobile::serialization::IValueUnion;
- 
--  IValueUnion ivalue_type = IValueUnion::NONE;
-+  IValueUnion ivalue_type = IValueUnion::IValueUnion_NONE;
-   flatbuffers::Offset<void> offset = 0;
- 
-   if (ivalue.isTensor()) {
--    ivalue_type = IValueUnion::TensorMetadata;
-+    ivalue_type = IValueUnion::IValueUnion_TensorMetadata;
-     offset = tensorToFB(fbb, ivalue).Union();
-   } else if (ivalue.isTuple()) {
--    ivalue_type = IValueUnion::Tuple;
-+    ivalue_type = IValueUnion::IValueUnion_Tuple;
-     offset = tupleToFB(fbb, ivalue).Union();
-   } else if (ivalue.isDouble()) {
--    ivalue_type = IValueUnion::Double;
-+    ivalue_type = IValueUnion::IValueUnion_Double;
-     offset = fbb.CreateStruct(mobile::serialization::Double(ivalue.toDouble()))
-                  .Union();
-   } else if (ivalue.isComplexDouble()) {
-     auto comp = ivalue.toComplexDouble();
--    ivalue_type = IValueUnion::ComplexDouble;
-+    ivalue_type = IValueUnion::IValueUnion_ComplexDouble;
-     offset = fbb.CreateStruct(mobile::serialization::ComplexDouble(
-                                   comp.real(), comp.imag()))
-                  .Union();
-   } else if (ivalue.isInt()) {
--    ivalue_type = IValueUnion::Int;
-+    ivalue_type = IValueUnion::IValueUnion_Int;
-     offset =
-         fbb.CreateStruct(mobile::serialization::Int(ivalue.toInt())).Union();
-   } else if (ivalue.isBool()) {
--    ivalue_type = IValueUnion::Bool;
-+    ivalue_type = IValueUnion::IValueUnion_Bool;
-     offset =
-         fbb.CreateStruct(mobile::serialization::Bool(ivalue.toBool())).Union();
-   } else if (ivalue.isString()) {
--    ivalue_type = IValueUnion::String;
-+    ivalue_type = IValueUnion::IValueUnion_String;
-     offset = mobile::serialization::CreateString(
-                  fbb, fbb.CreateSharedString(ivalue.toString()->string()))
-                  .Union();
-   } else if (ivalue.isGenericDict()) {
--    ivalue_type = IValueUnion::Dict;
-+    ivalue_type = IValueUnion::IValueUnion_Dict;
-     offset = dictToFB(fbb, ivalue).Union();
-   } else if (ivalue.isNone()) {
--    ivalue_type = IValueUnion::NONE;
-+    ivalue_type = IValueUnion::IValueUnion_NONE;
-     offset = 0;
-   } else if (ivalue.isIntList()) {
--    ivalue_type = IValueUnion::IntList;
-+    ivalue_type = IValueUnion::IValueUnion_IntList;
-     offset = mobile::serialization::CreateIntList(
-                  fbb, fbb.CreateVector(ivalue.toIntVector()))
-                  .Union();
-   } else if (ivalue.isDoubleList()) {
--    ivalue_type = IValueUnion::DoubleList;
-+    ivalue_type = IValueUnion::IValueUnion_DoubleList;
-     offset = mobile::serialization::CreateDoubleList(
-                  fbb, fbb.CreateVector(ivalue.toDoubleVector()))
-                  .Union();
-   } else if (ivalue.isBoolList()) {
--    ivalue_type = IValueUnion::BoolList;
-+    ivalue_type = IValueUnion::IValueUnion_BoolList;
-     auto boollist = ivalue.toBoolList();
-     std::vector<uint8_t> bool_vec(boollist.begin(), boollist.end());
-     offset =
-         mobile::serialization::CreateBoolListDirect(fbb, &bool_vec).Union();
-   } else if (ivalue.isList()) {
--    ivalue_type = IValueUnion::List;
-+    ivalue_type = IValueUnion::IValueUnion_List;
-     offset = listToFB(fbb, ivalue).Union();
-   } else if (ivalue.isObject()) {
--    ivalue_type = IValueUnion::Object;
-+    ivalue_type = IValueUnion::IValueUnion_Object;
-     offset = objectToFB(fbb, ivalue).Union();
-   } else if (ivalue.isDevice()) {
--    ivalue_type = IValueUnion::Device;
-+    ivalue_type = IValueUnion::IValueUnion_Device;
-     offset = mobile::serialization::CreateDevice(
-                  fbb, fbb.CreateSharedString(ivalue.toDevice().str()))
-                  .Union();
-@@ -732,7 +732,7 @@ flatbuffers::Offset<mobile::serialization::IValue> FlatbufferSerializer::
-     const auto& qualified_class_name =
-         enum_holder->type()->qualifiedClassName();
-     uint32_t ival_pos = storeIValueAndGetIndex(fbb, enum_holder->value());
--    ivalue_type = IValueUnion::EnumValue;
-+    ivalue_type = IValueUnion::IValueUnion_EnumValue;
-     offset = mobile::serialization::CreateEnumValue(
-                  fbb,
-                  fbb.CreateSharedString(qualified_class_name.qualifiedName()),
diff --git a/external_imported/vcpkg/ports/libtorch/vcpkg-dependencies.cmake b/external_imported/vcpkg/ports/libtorch/vcpkg-dependencies.cmake
deleted file mode 100644
index bf6028b92..000000000
--- a/external_imported/vcpkg/ports/libtorch/vcpkg-dependencies.cmake
+++ /dev/null
@@ -1,257 +0,0 @@
-# caffe2/core/macros.h.in
-set(CAFFE2_USE_GOOGLE_GLOG 1)
-set(CAFFE2_USE_LITE_PROTO 0)
-# set(CAFFE2_FORCE_FALLBACK_CUDA_MPI 0)
-
-# aten/src/ATen/Config.h.in
-set(AT_POCKETFFT_ENABLED 0)
-set(AT_MKL_ENABLED 0)
-set(AT_FFTW_ENABLED 0)
-set(AT_PARALLEL_NATIVE 1)
-if(USE_OPENMP OR USE_TBB)
-  set(AT_PARALLEL_NATIVE 0)
-endif()
-
-find_program(Python3_EXECUTABLE NAMES python3 python REQUIRED)
-find_program(PYTHON_EXECUTABLE NAMES python3 python REQUIRED)
-
-find_package(Python3 REQUIRED COMPONENTS Interpreter)
-if(BUILD_PYTHON)
-    find_package(Python3 REQUIRED COMPONENTS Development NumPy)
-    list(APPEND Caffe2_DEPENDENCY_LIBS Python3::Python Python3::NumPy)
-    find_package(pybind11 CONFIG REQUIRED)
-    list(APPEND Caffe2_DEPENDENCY_LIBS pybind11::pybind11)
-endif()
-
-find_path(FP16_INCLUDE_DIRS "fp16.h" REQUIRED)
-find_path(PSIMD_INCLUDE_DIRS "psimd.h" REQUIRED)
-find_path(FXDIV_INCLUDE_DIRS "fxdiv.h" REQUIRED)
-
-find_library(FOXI_LOADER_LIBPATH NAMES foxi_loader REQUIRED)
-list(APPEND Caffe2_DEPENDENCY_LIBS ${FOXI_LOADER_LIBPATH})
-
-find_package(Threads REQUIRED) # Threads::Threads
-find_package(gemmlowp CONFIG REQUIRED) # gemmlowp::gemmlowp
-find_package(gflags CONFIG REQUIRED) # gflags::gflags
-find_package(glog CONFIG REQUIRED) # glog::glog
-find_package(cpuinfo CONFIG REQUIRED) # cpuinfo::clog cpuinfo::cpuinfo
-find_package(unofficial-pthreadpool CONFIG REQUIRED) # unofficial::pthreadpool
-list(APPEND Caffe2_DEPENDENCY_LIBS
-  gemmlowp::gemmlowp gflags::gflags glog::glog
-  cpuinfo::clog cpuinfo::cpuinfo unofficial::pthreadpool
-)
-link_directories(
-  $<$<CONFIG:Debug>:${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib>
-  $<$<CONFIG:Release>:${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib>
-)
-
-set(USE_PTHREADPOOL 1)
-set(USE_INTERNAL_PTHREADPOOL_IMPL 0)
-add_compile_definitions(USE_PTHREADPOOL)
-
-find_package(fmt CONFIG REQUIRED) # fmt::fmt-header-only
-list(APPEND Caffe2_DEPENDENCY_LIBS fmt::fmt-header-only)
-
-find_package(Eigen3 CONFIG REQUIRED) # Eigen3::Eigen
-include_directories(SYSTEM ${EIGEN3_INCLUDE_DIR})
-list(APPEND Caffe2_DEPENDENCY_LIBS Eigen3::Eigen)
-set(CAFFE2_USE_EIGEN_FOR_BLAS 1) # see caff2/core/macros.h.in
-
-if(BLAS STREQUAL "Accelerate")
-  set(WITH_BLAS "accelerate")
-  find_package(BLAS REQUIRED) # cmake/Modules/FindBLAS.cmake
-  find_package(LAPACK REQUIRED) # cmake/Modules/FindLAPACK.cmake
-  set(USE_LAPACK 1)
-  list(APPEND Caffe2_PRIVATE_DEPENDENCY_LIBS ${LAPACK_LIBRARIES})
-
-elseif(BLAS STREQUAL "Open")
-  set(WITH_BLAS "open")
-  find_package(BLAS)
-  if(BLAS_FOUND)
-    set(USE_BLAS 1)
-    list(APPEND Caffe2_PRIVATE_DEPENDENCY_LIBS ${BLAS_LIBRARIES})
-  else()
-    set(USE_BLAS 0) # if we couldn't find the BLAS, disable the feature
-  endif()
-  set(USE_LAPACK 0)
-
-elseif(BLAS STREQUAL "MKL")
-  if(USE_TBB)
-    set(MKL_THREADING "TBB")
-  else()
-    set(MKL_THREADING "SEQ")
-  endif()
-  find_package(MKL REQUIRED)
-  include(${CMAKE_CURRENT_LIST_DIR}/public/mkl.cmake)
-  include_directories(AFTER SYSTEM ${MKL_INCLUDE_DIR})
-  list(APPEND Caffe2_PUBLIC_DEPENDENCY_LIBS caffe2::mkl)
-  set(WITH_BLAS "mkl")
-  find_package(BLAS REQUIRED) # cmake/Modules/FindBLAS.cmake
-
-else()
-  set(USE_BLAS 0)
-  set(WITH_BLAS "generic")
-  find_package(BLAS)
-  if(BLAS_FOUND)
-    set(USE_BLAS 1)
-    list(APPEND Caffe2_PRIVATE_DEPENDENCY_LIBS ${BLAS_LIBRARIES})
-  endif()
-
-endif()
-
-if(USE_MKLDNN)
-  find_package(MKLDNN REQUIRED) # BLAS::BLAS
-  include(cmake/public/mkldnn.cmake)
-  include_directories(AFTER SYSTEM ${MKLDNN_INCLUDE_DIR})
-  list(APPEND Caffe2_PUBLIC_DEPENDENCY_LIBS caffe2::mkldnn)
-endif()
-
-if(USE_TBB)
-  find_package(TBB CONFIG REQUIRED) # TBB::tbb
-  list(APPEND Caffe2_DEPENDENCY_LIBS TBB::tbb)
-endif()
-
-if(USE_NNPACK)
-  find_library(NNPACK_LIB NAMES nnpack REQUIRED)
-  list(APPEND Caffe2_DEPENDENCY_LIBS ${NNPACK_LIB})
-  string(APPEND CMAKE_CXX_FLAGS " -DUSE_NNPACK")
-endif()
-
-if(USE_FBGEMM)
-  find_package(asmjit CONFIG REQUIRED) # asmjit::asmjit (required by fbgemm)
-  find_package(fbgemmLibrary CONFIG REQUIRED) # fbgemm
-  list(APPEND Caffe2_DEPENDENCY_LIBS asmjit::asmjit fbgemm)
-  if(USE_CUDA)
-    # todo: fbgemm-gpu
-  endif()
-endif()
-
-if(USE_LMDB)
-  find_package(LMDB) # from cmake/Modules/FindLMDB.cmake
-  if(LMDB_FOUND)
-    list(APPEND Caffe2_DEPENDENCY_LIBS ${LMDB_LIBRARIES})
-  else()
-    find_package(lmdb CONFIG REQUIRED) # lmdb
-    list(APPEND Caffe2_DEPENDENCY_LIBS lmdb)
-  endif()
-endif()
-
-if(USE_LEVELDB)
-  find_package(Snappy CONFIG REQUIRED) # Snappy::snappy
-  list(APPEND Caffe2_DEPENDENCY_LIBS Snappy::snappy)
-  find_package(LevelDB) # from cmake/Modules/FindLevelDB.cmake
-  if(LevelDB_FOUND)
-    list(APPEND Caffe2_DEPENDENCY_LIBS ${LevelDB_LIBRARIES})
-  else()
-    find_package(leveldb CONFIG REQUIRED) # leveldb::leveldb
-    list(APPEND Caffe2_DEPENDENCY_LIBS leveldb::leveldb)
-  endif()
-endif()
- 
-if(USE_QNNPACK)
-  find_library(QNNPACK_LIB NAME qnnpack REQUIRED)
-  list(APPEND Caffe2_DEPENDENCY_LIBS ${QNNPACK_LIB})
-endif()
-
-if(USE_XNNPACK)
-  find_library(XNNPACK_LIBRARY NAMES xnnpack XNNPACK REQUIRED) # xnnpack
-  list(APPEND Caffe2_DEPENDENCY_LIBS ${XNNPACK_LIBRARY})
-endif()
- 
-if(USE_ZSTD)
-  find_package(zstd CONFIG REQUIRED) # zstd::libzstd_static
-  list(APPEND Caffe2_DEPENDENCY_LIBS $<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>)
-endif()
-
-if(USE_SYSTEM_ONNX)
-  find_package(ONNX CONFIG REQUIRED) # onnx onnx_proto onnxifi_loader
-  find_package(ONNXOptimizer CONFIG REQUIRED) # onnx_optimizer
-  list(APPEND Caffe2_DEPENDENCY_LIBS onnx onnx_proto onnx_optimizer)
-  if(ONNX_ML)
-    add_compile_definitions(ONNX_ML=1)
-  endif()
-endif()
-
-if(USE_CUDA)
-  set(CMAKE_CUDA_STANDARD 14)
-  find_package(CUDA  10.1 REQUIRED) # https://cmake.org/cmake/help/latest/module/FindCUDA.html
-  find_package(CUDNN 8.0  REQUIRED) # CuDNN::CuDNN
-  cuda_select_nvcc_arch_flags(ARCH_FLAGS 6.0 6.2 7.5)
-  list(APPEND CUDA_NVCC_FLAGS
-    ${ARCH_FLAGS}                # check TORCH_NVCC_FLAGS in this project
-    -D__CUDA_NO_HALF_OPERATORS__ # see https://github.com/torch/cutorch/issues/797
-  )
-  set(CAFFE2_USE_CUDA 1)
-  set(CAFFE2_USE_CUDNN 1)
-  set(CAFFE2_USE_NVRTC 0)
-  set(CAFFE2_USE_TENSORRT 0)
-  include(cmake/public/cuda.cmake)
-  list(APPEND Caffe2_DEPENDENCY_LIBS
-    CuDNN::CuDNN
-  )
-  list(APPEND Caffe2_PUBLIC_CUDA_DEPENDENCY_LIBS
-    caffe2::cufft caffe2::curand caffe2::cublas
-    caffe2::cudnn-public
-    # caffe2::cuda caffe2::nvrtc # for CAFFE2_USE_NVRTC
-    # caffe2::tensorrt # for CAFFE2_USE_TENSORRT
-  )
-endif()
-
-if(USE_NUMA) # Linux package 'libnuma-dev'
-  find_package(Numa REQUIRED)
-  include_directories(SYSTEM ${Numa_INCLUDE_DIR})
-  list(APPEND Caffe2_DEPENDENCY_LIBS ${Numa_LIBRARIES})
-endif()
-
-if(USE_GLOO)
-  find_package(Gloo CONFIG REQUIRED)
-  list(APPEND Caffe2_DEPENDENCY_LIBS gloo)
-endif()
-
-if(USE_VULKAN)
-  find_package(Vulkan REQUIRED)
-  list(APPEND Caffe2_DEPENDENCY_LIBS Vulkan::Vulkan)
-endif()
-
-if(USE_TENSORPIPE)
-  find_package(libuv CONFIG REQUIRED)
-  find_package(Tensorpipe CONFIG REQUIRED) # tensorpipe
-  list(APPEND Caffe2_DEPENDENCY_LIBS uv_a tensorpipe)
-endif()
-
-if(USE_MPI)
-  find_package(MPI REQUIRED) # APT package: libopenmpi-dev
-  if(NOT MPI_CXX_FOUND)
-    message(FATAL_ERROR "Failed to find MPI_CXX")
-  endif()
-  include_directories(SYSTEM ${MPI_CXX_INCLUDE_PATH})
-  list(APPEND Caffe2_DEPENDENCY_LIBS ${MPI_CXX_LIBRARIES})
-  list(APPEND CMAKE_EXE_LINKER_FLAGS ${MPI_CXX_LINK_FLAGS})
-
-  find_program(OMPI_INFO NAMES ompi_info HINTS ${MPI_CXX_LIBRARIES}/../bin)
-  if(OMPI_INFO)
-    execute_process(COMMAND ${OMPI_INFO} OUTPUT_VARIABLE _output)
-    if(_output MATCHES "smcuda")
-      message(STATUS "Found OpenMPI with CUDA support built.")
-    else()
-      message(WARNING "OpenMPI found, but it is not built with CUDA support.")
-      set(CAFFE2_FORCE_FALLBACK_CUDA_MPI 1)
-    endif()
-  endif()
-endif()
-
-if(USE_OPENCV)
-  find_package(OpenCV CONFIG REQUIRED COMPONENTS core highgui imgproc imgcodecs videoio video)
-  include_directories(SYSTEM ${OpenCV_INCLUDE_DIRS})
-  list(APPEND Caffe2_DEPENDENCY_LIBS ${OpenCV_LIBS})
-  if(MSVC AND USE_CUDA)
-    list(APPEND Caffe2_CUDA_DEPENDENCY_LIBS ${OpenCV_LIBS})
-  endif()
-endif()
-
-if(USE_OPENCL)
-  find_package(OpenCL REQUIRED)
-  include_directories(SYSTEM ${OpenCL_INCLUDE_DIRS})
-  include_directories(${CMAKE_CURRENT_LIST_DIR}/../caffe2/contrib/opencl)
-  list(APPEND Caffe2_DEPENDENCY_LIBS OpenCL::OpenCL)
-endif()
diff --git a/external_imported/vcpkg/ports/libtorch/vcpkg.json b/external_imported/vcpkg/ports/libtorch/vcpkg.json
index 31e25a533..919e1c28d 100644
--- a/external_imported/vcpkg/ports/libtorch/vcpkg.json
+++ b/external_imported/vcpkg/ports/libtorch/vcpkg.json
@@ -1,12 +1,12 @@
 {
   "name": "libtorch",
-  "version": "1.12.1",
-  "port-version": 1,
+  "version": "2.1.2",
   "description": "Tensors and Dynamic neural networks in Python with strong GPU acceleration",
   "homepage": "https://pytorch.org/",
   "license": null,
   "supports": "(windows & !static) | osx | linux",
   "dependencies": [
+    "blas",
     "cpuinfo",
     "eigen3",
     "flatbuffers",
@@ -16,25 +16,24 @@
     },
     "fmt",
     "foxi",
+    "foxi",
+    "fp16",
     "gemmlowp",
     "gflags",
     "glog",
+    "lapack",
     "lmdb",
-    {
-      "name": "mpi",
-      "platform": "linux"
-    },
+    "mimalloc",
     "onnx",
     "onnx-optimizer",
-    {
-      "name": "openblas",
-      "platform": "windows"
-    },
+    "opencl",
+    "pocketfft",
     "protobuf",
     {
       "name": "protobuf",
       "host": true
     },
+    "pthreadpool",
     "sleef",
     {
       "name": "vcpkg-cmake",
@@ -50,9 +49,24 @@
     }
   ],
   "default-features": [
-    "xnnpack"
+    {
+      "name": "cuda",
+      "platform": "windows & !x86"
+    },
+    "fftw3",
+    "opencv",
+    "xnnpack",
+    "zstd"
   ],
   "features": {
+    "cuda": {
+      "description": "Build with CUDA GPU backend",
+      "dependencies": [
+        "cuda",
+        "cudnn",
+        "magma"
+      ]
+    },
     "dist": {
       "description": "Use distributed with MPI, Gloo, libuv, TensorPipe",
       "dependencies": [
@@ -61,12 +75,16 @@
           "platform": "linux"
         },
         {
-          "name": "libuv",
-          "platform": "windows | osx"
+          "name": "libtorch",
+          "default-features": false,
+          "features": [
+            "mpi"
+          ],
+          "platform": "linux"
         },
         {
-          "name": "openmpi",
-          "platform": "linux | osx"
+          "name": "libuv",
+          "platform": "windows | osx"
         },
         {
           "name": "tensorpipe",
@@ -74,6 +92,12 @@
         }
       ]
     },
+    "fftw3": {
+      "description": "Build with fftw3",
+      "dependencies": [
+        "fftw3"
+      ]
+    },
     "leveldb": {
       "description": "Build with LevelDB",
       "dependencies": [
@@ -81,6 +105,18 @@
         "snappy"
       ]
     },
+    "llvm": {
+      "description": "Build with LLVM",
+      "dependencies": [
+        "llvm"
+      ]
+    },
+    "mpi": {
+      "description": "Build with MPI",
+      "dependencies": [
+        "mpi"
+      ]
+    },
     "nnpack": {
       "description": "Build with NNPack",
       "supports": "linux | osx",
@@ -94,22 +130,21 @@
         "opencv"
       ]
     },
-    "tbb": {
-      "description": "Build with Intel TBB",
-      "dependencies": [
-        "tbb"
-      ]
-    },
     "vulkan": {
       "description": "Build with Vulkan GPU backend",
-      "supports": "!windows",
       "dependencies": [
-        "vulkan"
+        "vulkan",
+        "vulkan-loader",
+        "vulkan-memory-allocator"
       ]
     },
     "xnnpack": {
       "description": "Build with XNNPack",
       "dependencies": [
+        {
+          "name": "fxdiv",
+          "platform": "!windows"
+        },
         "xnnpack"
       ]
     },
diff --git a/external_imported/vcpkg/ports/libtorrent/0001-fix-build-error-on-Windows-ARM64-by-add-new-define.patch b/external_imported/vcpkg/ports/libtorrent/0001-fix-build-error-on-Windows-ARM64-by-add-new-define.patch
deleted file mode 100644
index bc72079ec..000000000
--- a/external_imported/vcpkg/ports/libtorrent/0001-fix-build-error-on-Windows-ARM64-by-add-new-define.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 24b9c178ed316b39236e62dd655c85f3405e147a Mon Sep 17 00:00:00 2001
-From: David Liu <wbsdty331@outlook.com>
-Date: Mon, 13 Feb 2023 18:03:58 +0800
-Subject: [PATCH] fix build error on Windows ARM64 by add new define
-
-fix build error on Windows ARM64 by add new define
----
- src/assert.cpp | 17 +++++++++++------
- 1 file changed, 11 insertions(+), 6 deletions(-)
-
-diff --git a/src/assert.cpp b/src/assert.cpp
-index d623605b5..482345451 100644
---- a/src/assert.cpp
-+++ b/src/assert.cpp
-@@ -190,16 +190,21 @@ TORRENT_EXPORT void print_backtrace(char* out, int len, int max_depth
- 	std::array<void*, 50> stack;
- 
- 	STACKFRAME64 stack_frame = {};
--#if defined(_WIN64)
--	int const machine_type = IMAGE_FILE_MACHINE_AMD64;
--	stack_frame.AddrPC.Offset = context_record.Rip;
--	stack_frame.AddrFrame.Offset = context_record.Rbp;
--	stack_frame.AddrStack.Offset = context_record.Rsp;
--#else
-+#if defined(_M_IX86)
- 	int const machine_type = IMAGE_FILE_MACHINE_I386;
- 	stack_frame.AddrPC.Offset = context_record.Eip;
- 	stack_frame.AddrFrame.Offset = context_record.Ebp;
- 	stack_frame.AddrStack.Offset = context_record.Esp;
-+#elif defined(_M_X64)
-+	int const machine_type = IMAGE_FILE_MACHINE_AMD64;
-+	stack_frame.AddrPC.Offset = context_record.Rip;
-+	stack_frame.AddrFrame.Offset = context_record.Rbp;
-+	stack_frame.AddrStack.Offset = context_record.Rsp;
-+#elif defined(_M_ARM64)
-+	int const machine_type = IMAGE_FILE_MACHINE_ARM64;
-+	stack_frame.AddrPC.Offset = context_record.Pc;
-+	stack_frame.AddrFrame.Offset = context_record.Fp;
-+	stack_frame.AddrStack.Offset = context_record.Sp;
- #endif
- 	stack_frame.AddrPC.Mode = AddrModeFlat;
- 	stack_frame.AddrFrame.Mode = AddrModeFlat;
--- 
-2.39.1.windows.1
-
diff --git a/external_imported/vcpkg/ports/libtorrent/portfile.cmake b/external_imported/vcpkg/ports/libtorrent/portfile.cmake
index ce9de31d2..5dc86b3ba 100644
--- a/external_imported/vcpkg/ports/libtorrent/portfile.cmake
+++ b/external_imported/vcpkg/ports/libtorrent/portfile.cmake
@@ -30,11 +30,9 @@ endif()
 vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO arvidn/libtorrent
-        REF 64817e0e8793d0875fc10245de52ffb2540a223d # v2.0.8
-        SHA512 607172e6a806d78bb34443101bd384ac7a42e0edc3e7c4a2cf5c3ab5f2be64f84557726dce16c2fbaaa2ba254529a8871b3123b0e79fe87cd5bf26021ecb59da
+        REF "v${VERSION}"
+        SHA512 cc9c0d9ae66bd7c7df7487e33e8d452ba7b5756987be35a3309038a1dec576e91de5fbabe9d05e58bea9c82d83aad33c607804eeefaf3113a51354bef1a25340
         HEAD_REF RC_2_0
-        PATCHES
-            0001-fix-build-error-on-Windows-ARM64-by-add-new-define.patch
 )
 
 vcpkg_from_github(
@@ -80,7 +78,7 @@ vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(PACKAGE_NAME LibtorrentRasterbar CONFIG_PATH lib/cmake/LibtorrentRasterbar)
 
 # Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
 
 # Do not duplicate include files
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/share/cmake")
diff --git a/external_imported/vcpkg/ports/libtorrent/vcpkg.json b/external_imported/vcpkg/ports/libtorrent/vcpkg.json
index f4cd3f0d0..36c64f840 100644
--- a/external_imported/vcpkg/ports/libtorrent/vcpkg.json
+++ b/external_imported/vcpkg/ports/libtorrent/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "libtorrent",
-  "version": "2.0.8",
+  "version": "2.0.9",
   "maintainers": "Arvid Norberg <arvid.norberg@gmail.com>",
   "description": "An efficient feature complete C++ BitTorrent implementation",
   "homepage": "https://libtorrent.org",
diff --git a/external_imported/vcpkg/ports/libtracepoint-control/portfile.cmake b/external_imported/vcpkg/ports/libtracepoint-control/portfile.cmake
new file mode 100644
index 000000000..cd0869504
--- /dev/null
+++ b/external_imported/vcpkg/ports/libtracepoint-control/portfile.cmake
@@ -0,0 +1,21 @@
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO "microsoft/LinuxTracepoints"
+    REF "v${VERSION}"
+    SHA512 6b22ecded7029dfb9d9fba4fb76a8c25a28fbb3a6295b8ff6f66cea83d5b7645a85244126f52896065eccb9d08cbafa89dd1a23971c38842c4f752a274e5a72d
+    HEAD_REF main)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}/libtracepoint-control-cpp")
+
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+
+vcpkg_cmake_config_fixup(
+    PACKAGE_NAME tracepoint-control
+    CONFIG_PATH lib/cmake/tracepoint-control)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/external_imported/vcpkg/ports/libtracepoint-control/vcpkg.json b/external_imported/vcpkg/ports/libtracepoint-control/vcpkg.json
new file mode 100644
index 000000000..49dd75286
--- /dev/null
+++ b/external_imported/vcpkg/ports/libtracepoint-control/vcpkg.json
@@ -0,0 +1,22 @@
+{
+  "name": "libtracepoint-control",
+  "version": "1.3.0",
+  "description": "C++ classes for collecting Linux Tracepoints",
+  "homepage": "https://github.com/microsoft/LinuxTracepoints/",
+  "license": "MIT",
+  "supports": "linux",
+  "dependencies": [
+    {
+      "name": "libtracepoint-decode",
+      "version>=": "1.3.0"
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/libtracepoint-decode/portfile.cmake b/external_imported/vcpkg/ports/libtracepoint-decode/portfile.cmake
new file mode 100644
index 000000000..579cdf8de
--- /dev/null
+++ b/external_imported/vcpkg/ports/libtracepoint-decode/portfile.cmake
@@ -0,0 +1,21 @@
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO "microsoft/LinuxTracepoints"
+    REF "v${VERSION}"
+    SHA512 6b22ecded7029dfb9d9fba4fb76a8c25a28fbb3a6295b8ff6f66cea83d5b7645a85244126f52896065eccb9d08cbafa89dd1a23971c38842c4f752a274e5a72d
+    HEAD_REF main)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}/libtracepoint-decode-cpp")
+
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+
+vcpkg_cmake_config_fixup(
+    PACKAGE_NAME tracepoint-decode
+    CONFIG_PATH lib/cmake/tracepoint-decode)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/external_imported/vcpkg/ports/libtracepoint-decode/vcpkg.json b/external_imported/vcpkg/ports/libtracepoint-decode/vcpkg.json
new file mode 100644
index 000000000..8409d8f68
--- /dev/null
+++ b/external_imported/vcpkg/ports/libtracepoint-decode/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "libtracepoint-decode",
+  "version": "1.3.0",
+  "description": "C++ classes for decoding Linux Tracepoints",
+  "homepage": "https://github.com/microsoft/LinuxTracepoints/",
+  "license": "MIT",
+  "supports": "linux | windows",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/libtracepoint/portfile.cmake b/external_imported/vcpkg/ports/libtracepoint/portfile.cmake
new file mode 100644
index 000000000..e72ae72f9
--- /dev/null
+++ b/external_imported/vcpkg/ports/libtracepoint/portfile.cmake
@@ -0,0 +1,37 @@
+if(VCPKG_TARGET_IS_WINDOWS)
+    set(VCPKG_BUILD_TYPE release) # Windows port only includes headers.
+endif()
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO "microsoft/LinuxTracepoints"
+    REF "v${VERSION}"
+    SHA512 6b22ecded7029dfb9d9fba4fb76a8c25a28fbb3a6295b8ff6f66cea83d5b7645a85244126f52896065eccb9d08cbafa89dd1a23971c38842c4f752a274e5a72d
+    HEAD_REF main)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}/libtracepoint"
+    OPTIONS
+        -DBUILD_SAMPLES=OFF
+        -DBUILD_TESTS=OFF)
+
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+
+if(NOT VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_cmake_config_fixup(
+        PACKAGE_NAME tracepoint
+        CONFIG_PATH lib/cmake/tracepoint
+        DO_NOT_DELETE_PARENT_CONFIG_PATH)
+endif()
+
+vcpkg_cmake_config_fixup(
+    PACKAGE_NAME tracepoint-headers
+    CONFIG_PATH lib/cmake/tracepoint-headers)
+
+if(VCPKG_TARGET_IS_WINDOWS)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/external_imported/vcpkg/ports/libtracepoint/vcpkg.json b/external_imported/vcpkg/ports/libtracepoint/vcpkg.json
new file mode 100644
index 000000000..bb45ea60d
--- /dev/null
+++ b/external_imported/vcpkg/ports/libtracepoint/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "libtracepoint",
+  "version": "1.3.0",
+  "description": "C/C++ interface for generating Linux Tracepoints",
+  "homepage": "https://github.com/microsoft/LinuxTracepoints/",
+  "license": "MIT",
+  "supports": "linux | windows",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/libudns/vcpkg.json b/external_imported/vcpkg/ports/libudns/vcpkg.json
index f1b9679a3..14593afec 100644
--- a/external_imported/vcpkg/ports/libudns/vcpkg.json
+++ b/external_imported/vcpkg/ports/libudns/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libudns",
-  "version-string": "0.4",
-  "port-version": 4,
+  "version": "0.4",
+  "port-version": 5,
   "description": "The DNS library, udns, implements thread-safe stub DNS resolver functionality, which may be used both traditional, syncronous way and asyncronously, with application-supplied event loop.",
   "homepage": "https://github.com/ortclib/udns",
   "supports": "!windows & !osx"
diff --git a/external_imported/vcpkg/ports/libunibreak/portfile.cmake b/external_imported/vcpkg/ports/libunibreak/portfile.cmake
index c73851614..db55dfc87 100644
--- a/external_imported/vcpkg/ports/libunibreak/portfile.cmake
+++ b/external_imported/vcpkg/ports/libunibreak/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO adah1972/libunibreak
-  REF libunibreak_5_0 # libunibreak_5_0
-  SHA512 909c12cf5df92f0374050fc7a0ef9e91bc1efe6a5dc5a80f4e2c81a507f1228ecaba417c3ee001e11b2422024bea68cc14eb66e08360ae69f830cdaa18764484
+  REF libunibreak_5_1
+  SHA512 c47d6445cab36febb214b31aeb48585a4d3685714588079e84be87019f6e6ffb752e0e0e527232e2d164b1efeeeea64b8b4b21e605ebc60f10fb5a169edc2ed0
   HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/libunibreak/vcpkg.json b/external_imported/vcpkg/ports/libunibreak/vcpkg.json
index 3c4a6f438..63501324e 100644
--- a/external_imported/vcpkg/ports/libunibreak/vcpkg.json
+++ b/external_imported/vcpkg/ports/libunibreak/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "libunibreak",
-  "version": "5.0",
-  "port-version": 1,
+  "version": "5.1",
   "description": "an implementation of the line breaking and word breaking algorithms as described in [Unicode Standard Annex 14] 1 and [Unicode Standard Annex 29] 2. Check the project's [home page] 3 for up-to-date information.",
   "homepage": "https://github.com/adah1972/libunibreak",
   "license": "zlib-acknowledgement",
diff --git a/external_imported/vcpkg/ports/libunifex/fix-linux-timespec.patch b/external_imported/vcpkg/ports/libunifex/fix-linux-timespec.patch
new file mode 100644
index 000000000..99c2398b8
--- /dev/null
+++ b/external_imported/vcpkg/ports/libunifex/fix-linux-timespec.patch
@@ -0,0 +1,13 @@
+diff --git a/source/linux/io_uring_context.cpp b/source/linux/io_uring_context.cpp
+index f869b3f..8300961 100644
+--- a/source/linux/io_uring_context.cpp
++++ b/source/linux/io_uring_context.cpp
+@@ -17,7 +17,7 @@
+ #include <unifex/config.hpp>
+ 
+ #if !UNIFEX_NO_LIBURING
+-
++#include <linux/time_types.h>
+ #include <unifex/linux/io_uring_context.hpp>
+ 
+ #include <unifex/scope_guard.hpp>
diff --git a/external_imported/vcpkg/ports/libunifex/portfile.cmake b/external_imported/vcpkg/ports/libunifex/portfile.cmake
index 836ea7f62..fbc11b0dd 100644
--- a/external_imported/vcpkg/ports/libunifex/portfile.cmake
+++ b/external_imported/vcpkg/ports/libunifex/portfile.cmake
@@ -3,17 +3,16 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebookexperimental/libunifex
-    REF 591ec09e7d51858ad05be979d4034574215f5971
-    SHA512 b07ebad2e6fa9a40c73fe2712e65cfe49591857bf784bd901acb7f35549746a36679c969df89321866530fd774bde176aa2d800f3da1462e818eecb8d0822842
-    HEAD_REF master
+    REF "v${VERSION}"
+    SHA512 9625a248b9ed43f7ac8e3da054020e7c5c71d3da253cfa587ee62eb8a1d4cfee794758b7d28896e4038c1924b204c92be7230c20cf525684e2c304ceaa4a6321
+    HEAD_REF main
     PATCHES
         fix-compile-error.patch
+        fix-linux-timespec.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
-        test    BUILD_TESTING
-        test    UNIFEX_BUILD_EXAMPLES
         coroutines CXX_COROUTINES_HAVE_COROUTINES
 )
 
@@ -22,6 +21,8 @@ vcpkg_cmake_configure(
     OPTIONS
         ${FEATURE_OPTIONS}
         -DCMAKE_CXX_STANDARD:STRING=20
+        -DBUILD_TESTING=OFF
+        -DUNIFEX_BUILD_EXAMPLES=OFF
 )
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/libunifex/vcpkg.json b/external_imported/vcpkg/ports/libunifex/vcpkg.json
index 63582d180..4bc86b527 100644
--- a/external_imported/vcpkg/ports/libunifex/vcpkg.json
+++ b/external_imported/vcpkg/ports/libunifex/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "libunifex",
-  "version-date": "2023-01-25",
+  "version": "0.4.0",
   "description": "Unified Executors",
   "homepage": "https://github.com/facebookexperimental/libunifex",
   "dependencies": [
@@ -20,12 +20,6 @@
   "features": {
     "coroutines": {
       "description": "Support coroutine"
-    },
-    "test": {
-      "description": "Build test/example programs",
-      "dependencies": [
-        "gtest"
-      ]
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/libunistring/vcpkg.json b/external_imported/vcpkg/ports/libunistring/vcpkg.json
index d3dc3e759..9d3340347 100644
--- a/external_imported/vcpkg/ports/libunistring/vcpkg.json
+++ b/external_imported/vcpkg/ports/libunistring/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "libunistring",
   "version": "1.1",
-  "port-version": 2,
+  "port-version": 3,
   "description": "GNU libunistring provides functions for manipulating Unicode strings and for manipulating C strings according to the Unicode standard.",
   "homepage": "https://www.gnu.org/software/libunistring/",
   "license": "LGPL-3.0-or-later OR GPL-2.0-or-later",
+  "supports": "!xbox",
   "dependencies": [
     "libiconv"
   ]
diff --git a/external_imported/vcpkg/ports/libunwind/portfile.cmake b/external_imported/vcpkg/ports/libunwind/portfile.cmake
new file mode 100644
index 000000000..b49534266
--- /dev/null
+++ b/external_imported/vcpkg/ports/libunwind/portfile.cmake
@@ -0,0 +1,18 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO "libunwind/libunwind"
+    REF "v${VERSION}"
+    HEAD_REF "v1.7-stable"
+    SHA512 b560f45cfa8ca3a60b41779afbcd862860c0f7af4014298c0b22eaec8b39740349c2077a940fb0d235c8f7d6a567e00c5cb0a04c251053f90c51320616784fd2
+)
+
+vcpkg_configure_make(
+    SOURCE_PATH "${SOURCE_PATH}"
+    AUTOCONFIG
+)
+vcpkg_install_make()
+vcpkg_fixup_pkgconfig()
+
+
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/libunwind/usage b/external_imported/vcpkg/ports/libunwind/usage
new file mode 100644
index 000000000..0152567b3
--- /dev/null
+++ b/external_imported/vcpkg/ports/libunwind/usage
@@ -0,0 +1,6 @@
+The package libunwind can be imported via CMake FindPkgConfig module:
+
+    find_package(PkgConfig)
+    pkg_check_modules(libunwind REQUIRED IMPORTED_TARGET GLOBAL libunwind)
+    
+    target_link_libraries(main PRIVATE PkgConfig::libunwind)
diff --git a/external_imported/vcpkg/ports/libunwind/vcpkg.json b/external_imported/vcpkg/ports/libunwind/vcpkg.json
new file mode 100644
index 000000000..e1a1cf06e
--- /dev/null
+++ b/external_imported/vcpkg/ports/libunwind/vcpkg.json
@@ -0,0 +1,14 @@
+{
+  "name": "libunwind",
+  "version": "1.7.2",
+  "description": "Unix libray for portable stack unwinding",
+  "homepage": "https://www.nongnu.org/libunwind",
+  "license": "MIT",
+  "supports": "linux",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/liburing/fix-configure.patch b/external_imported/vcpkg/ports/liburing/fix-configure.patch
index 52b6c39ba..ae718c097 100644
--- a/external_imported/vcpkg/ports/liburing/fix-configure.patch
+++ b/external_imported/vcpkg/ports/liburing/fix-configure.patch
@@ -1,29 +1,28 @@
 diff --git a/configure b/configure
-index 2c2441b..620c443 100644
+index 88b8ee7..bf9312f 100755
 --- a/configure
 +++ b/configure
-@@ -14,7 +14,7 @@ for opt do
+@@ -20,7 +20,7 @@ for opt do
    ;;
-   --includedir=*) includedir="$optarg"
+   --mandir=*) mandir="$optarg"
    ;;
--  --libdir=*) libdir="$optarg"
-+  --datarootdir=*) libdir="$optarg"
+-  --datadir=*) datadir="$optarg"
++  --datarootdir=*) datadir="$optarg"
    ;;
-   --libdevdir=*) libdevdir="$optarg"
+   --cc=*) cc="$optarg"
    ;;
 @@ -28,10 +28,12 @@ for opt do
    ;;
-   --nolibc) liburing_nolibc="yes"
+   --use-libc) use_libc=yes
    ;;
 +  --enable-shared) ENABLE_SHARED=1
 +  ;;
 +  --enable-static) ENABLE_SHARED=0
-+  ;;  
++  ;;
    *)
--    echo "ERROR: unknown option $opt"
+     echo "ERROR: unknown option $opt"
 -    echo "Try '$0 --help' for more information"
 -    exit 1
-+    echo "WARNING: unknown option $opt"
    ;;
    esac
  done
diff --git a/external_imported/vcpkg/ports/liburing/portfile.cmake b/external_imported/vcpkg/ports/liburing/portfile.cmake
index 3d36e55c4..03edb9079 100644
--- a/external_imported/vcpkg/ports/liburing/portfile.cmake
+++ b/external_imported/vcpkg/ports/liburing/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO axboe/liburing
-    REF dda4848a9911120a903bef6284fb88286f4464c9 #liburing-2.2
-    SHA512 c2e4969ffb895996bf7465ce86143d4d3401a052624ec19580d34e8adbb2b57801e03541493f61e19a3137984714db645b135b1bc3b41987bccfd926bb486c09 
+    REF "liburing-${VERSION}"
+    SHA512 53742c23211de7194322874eb8186b942ccc1611c231d49f60fd1d8bc2bb93d231ed521af77802db68c30557d71fa5799ae40cbacfc24ba1db3d650c7ba8cc62
     HEAD_REF master
     PATCHES
         fix-configure.patch     # ignore unsupported options, handle ENABLE_SHARED
@@ -13,12 +13,13 @@ vcpkg_from_github(
 vcpkg_configure_make(
     SOURCE_PATH "${SOURCE_PATH}"
     COPY_SOURCE
+    OPTIONS
+        [[--libdevdir=\${prefix}/lib]] # must match libdir
 )
 vcpkg_install_make()
 vcpkg_fixup_pkgconfig()
 
-file(INSTALL "${SOURCE_PATH}/LICENSE"
-     DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
 file(INSTALL "${CURRENT_PORT_DIR}/usage"
      DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 
diff --git a/external_imported/vcpkg/ports/liburing/vcpkg.json b/external_imported/vcpkg/ports/liburing/vcpkg.json
index e0f882ac3..6f5161198 100644
--- a/external_imported/vcpkg/ports/liburing/vcpkg.json
+++ b/external_imported/vcpkg/ports/liburing/vcpkg.json
@@ -1,9 +1,8 @@
 {
   "name": "liburing",
-  "version": "2.2",
-  "port-version": 1,
+  "version": "2.5",
   "description": "Linux-native io_uring I/O access library",
   "homepage": "https://github.com/axboe/liburing",
-  "license": null,
+  "license": "MIT OR LGPL-2.1 OR GPL-2.0",
   "supports": "linux"
 }
diff --git a/external_imported/vcpkg/ports/libusb-win32/vcpkg.json b/external_imported/vcpkg/ports/libusb-win32/vcpkg.json
index 547edbd39..5dc428868 100644
--- a/external_imported/vcpkg/ports/libusb-win32/vcpkg.json
+++ b/external_imported/vcpkg/ports/libusb-win32/vcpkg.json
@@ -1,11 +1,11 @@
 {
   "name": "libusb-win32",
   "version": "1.2.6.0",
-  "port-version": 9,
+  "port-version": 10,
   "description": "Allows user space applications to access many USB device on Windows.",
   "homepage": "https://sourceforge.net/projects/libusb-win32",
   "license": "LGPL-3.0-only",
-  "supports": "windows & !static",
+  "supports": "windows & !static & !xbox",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/libusb/portfile.cmake b/external_imported/vcpkg/ports/libusb/portfile.cmake
index e00798cd5..232287223 100644
--- a/external_imported/vcpkg/ports/libusb/portfile.cmake
+++ b/external_imported/vcpkg/ports/libusb/portfile.cmake
@@ -1,72 +1,69 @@
 if(VCPKG_TARGET_IS_LINUX)
-    message("${PORT} currently requires the following tools and libraries from the system package manager:\n    autoreconf\n    libudev\n\nThese can be installed on Ubuntu systems via apt-get install autoreconf libudev-dev")
+    message("${PORT} currently requires the following tools and libraries from the system package manager:\n    autoreconf\n    libudev\n\nThese can be installed on Ubuntu systems via apt-get install autoconf libudev-dev")
 endif()
 
 set(VERSION 1.0.26)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libusb/libusb
-    REF 4239bc3a50014b8e6a5a2a59df1fff3b7469543b # v1.0.26
-    SHA512 f07ec9ef4df555733dab9388595cd10bc87195da54f4c646478d4a0496ee7b8933de03e957c7466291c120102d8801e8b26846cb27b201bb9cbca5df03f3a6ef
+    REF fcf0c710ef5911ae37fbbf1b39d48a89f6f14e8a # v1.0.26.11791 2023-03-12
+    SHA512 0aa6439f7988487adf2a3bff473fec80b5c722a47f117a60696d2aa25c87cc3f20fb6aaca7c66e49be25db6a35eb0bb5f71ed7b211d1b8ee064c5d7f1b985c73
     HEAD_REF master
 )
 
 if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
-  if(VCPKG_PLATFORM_TOOLSET MATCHES "v142")
-    set(MSVS_VERSION 2019)
-  elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v141")
-    set(MSVS_VERSION 2017)
-  else()
-    set(MSVS_VERSION 2015)
-  endif()
 
   if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
       set(LIBUSB_PROJECT_TYPE dll)
-      if (VCPKG_CRT_LINKAGE STREQUAL static)
-        file(READ "${SOURCE_PATH}/msvc/libusb_${LIBUSB_PROJECT_TYPE}_${MSVS_VERSION}.vcxproj" PROJ_FILE)
-        string(REPLACE "<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>" "<RuntimeLibrary>MultiThreaded</RuntimeLibrary>" PROJ_FILE "${PROJ_FILE}")
-        string(REPLACE "<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>" "<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>" PROJ_FILE "${PROJ_FILE}")
-        file(WRITE "${SOURCE_PATH}/msvc/libusb_${LIBUSB_PROJECT_TYPE}_${MSVS_VERSION}.vcxproj" "${PROJ_FILE}")
-      endif()
   else()
       set(LIBUSB_PROJECT_TYPE static)
-      if (VCPKG_CRT_LINKAGE STREQUAL dynamic)
-        file(READ "${SOURCE_PATH}/msvc/libusb_${LIBUSB_PROJECT_TYPE}_${MSVS_VERSION}.vcxproj" PROJ_FILE)
-        string(REPLACE "<RuntimeLibrary>MultiThreaded</RuntimeLibrary>" "<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>" PROJ_FILE "${PROJ_FILE}")
-        string(REPLACE "<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>" "<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>" PROJ_FILE "${PROJ_FILE}")
-        file(WRITE "${SOURCE_PATH}/msvc/libusb_${LIBUSB_PROJECT_TYPE}_${MSVS_VERSION}.vcxproj" "${PROJ_FILE}")
-      endif()
   endif()
 
   # The README.md file in the archive is a symlink to README
   # which causes issues with the windows MSBUILD process
   file(REMOVE "${SOURCE_PATH}/README.md")
 
-  vcpkg_install_msbuild(
+  vcpkg_msbuild_install(
       SOURCE_PATH "${SOURCE_PATH}"
-      PROJECT_SUBPATH msvc/libusb_${LIBUSB_PROJECT_TYPE}_${MSVS_VERSION}.vcxproj
-      LICENSE_SUBPATH COPYING
+      PROJECT_SUBPATH msvc/libusb_${LIBUSB_PROJECT_TYPE}.vcxproj
   )
+
   file(INSTALL "${SOURCE_PATH}/libusb/libusb.h"  DESTINATION "${CURRENT_PACKAGES_DIR}/include/libusb-1.0")
   set(prefix "")
   set(exec_prefix [[${prefix}]])
   set(libdir [[${prefix}/lib]])
   set(includedir [[${prefix}/include]])  
   configure_file("${SOURCE_PATH}/libusb-1.0.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libusb-1.0.pc" @ONLY)
+  vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libusb-1.0.pc" " -lusb-1.0" " -llibusb-1.0")
   if(NOT VCPKG_BUILD_TYPE)
       set(includedir [[${prefix}/../include]])  
       configure_file("${SOURCE_PATH}/libusb-1.0.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libusb-1.0.pc" @ONLY)
+      vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libusb-1.0.pc" " -lusb-1.0" " -llibusb-1.0")
   endif()
 else()
+    vcpkg_list(SET MAKE_OPTIONS)
+    vcpkg_list(SET LIBUSB_LINK_LIBRARIES)
+    if(VCPKG_TARGET_IS_EMSCRIPTEN)
+        vcpkg_list(APPEND MAKE_OPTIONS BUILD_TRIPLET --host=wasm32)
+    endif()
+    if("udev" IN_LIST FEATURES)
+        vcpkg_list(APPEND MAKE_OPTIONS "--enable-udev")
+        vcpkg_list(APPEND LIBUSB_LINK_LIBRARIES udev)
+    else()
+        vcpkg_list(APPEND MAKE_OPTIONS "--disable-udev")
+    endif()
     vcpkg_configure_make(
         SOURCE_PATH "${SOURCE_PATH}"
         AUTOCONFIG
+        OPTIONS 
+            ${MAKE_OPTIONS}
+            "--enable-examples-build=no"
+            "--enable-tests-build=no"
     )
     vcpkg_install_make()
 endif()
 
 vcpkg_fixup_pkgconfig()
 
-configure_file("${CURRENT_PORT_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY)
-configure_file("${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY)
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/libusb/usage b/external_imported/vcpkg/ports/libusb/usage
index de236d46a..98cce9c01 100644
--- a/external_imported/vcpkg/ports/libusb/usage
+++ b/external_imported/vcpkg/ports/libusb/usage
@@ -1,5 +1,5 @@
-The package @PORT@:@TARGET_TRIPLET@ provides CMake targets:
+libusb can be imported via CMake FindPkgConfig module:
+    find_package(PkgConfig REQUIRED)
+    pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0)
 
-    find_package(@PORT@ CONFIG REQUIRED)
-    target_include_directories(main PRIVATE ${LIBUSB_INCLUDE_DIRS})
-    target_link_libraries(main PRIVATE ${LIBUSB_LIBRARIES})
+    target_link_libraries(main PRIVATE PkgConfig::libusb)
diff --git a/external_imported/vcpkg/ports/libusb/vcpkg-cmake-wrapper.cmake b/external_imported/vcpkg/ports/libusb/vcpkg-cmake-wrapper.cmake
deleted file mode 100644
index 8e8c28806..000000000
--- a/external_imported/vcpkg/ports/libusb/vcpkg-cmake-wrapper.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-include(SelectLibraryConfigurations)
-
-find_path(LIBUSB_INCLUDE_DIR libusb.h PATH_SUFFIXES libusb-1.0)
-find_library(LIBUSB_LIBRARY_DEBUG NAMES libusb-1.0 usb-1.0 NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH)
-find_library(LIBUSB_LIBRARY_RELEASE NAMES libusb-1.0 usb-1.0 NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH)
-
-select_library_configurations(LIBUSB)
-
-set(LIBUSB_INCLUDE_DIRS "${LIBUSB_INCLUDE_DIR}")
-
-if (@VCPKG_TARGET_IS_LINUX@)
-    list(APPEND LIBUSB_LIBRARIES udev)
-endif()
-
-if (@VCPKG_TARGET_IS_OSX@)
-    list(APPEND LIBUSB_LIBRARIES "-framework Cocoa")
-    list(APPEND LIBUSB_LIBRARIES "-framework IOKit")
-    list(APPEND LIBUSB_LIBRARIES "-framework Security")
-endif()
diff --git a/external_imported/vcpkg/ports/libusb/vcpkg.json b/external_imported/vcpkg/ports/libusb/vcpkg.json
index d7df1073f..25ccdd7ea 100644
--- a/external_imported/vcpkg/ports/libusb/vcpkg.json
+++ b/external_imported/vcpkg/ports/libusb/vcpkg.json
@@ -1,9 +1,28 @@
 {
   "name": "libusb",
-  "version": "1.0.26",
-  "port-version": 3,
+  "version": "1.0.26.11791",
+  "port-version": 7,
   "description": "a cross-platform library to access USB devices",
   "homepage": "https://github.com/libusb/libusb",
   "license": "LGPL-2.1-or-later",
-  "supports": "!uwp"
+  "supports": "!uwp",
+  "dependencies": [
+    {
+      "name": "vcpkg-msbuild",
+      "host": true,
+      "platform": "windows"
+    }
+  ],
+  "default-features": [
+    {
+      "name": "udev",
+      "platform": "linux"
+    }
+  ],
+  "features": {
+    "udev": {
+      "description": "Enable udev",
+      "supports": "linux"
+    }
+  }
 }
diff --git a/external_imported/vcpkg/ports/libusbmuxd/001_fix_win32_defs.patch b/external_imported/vcpkg/ports/libusbmuxd/001_fix_win32_defs.patch
new file mode 100644
index 000000000..952a9dc2f
--- /dev/null
+++ b/external_imported/vcpkg/ports/libusbmuxd/001_fix_win32_defs.patch
@@ -0,0 +1,13 @@
+diff --git a/include/usbmuxd-proto.h b/include/usbmuxd-proto.h
+index a2a731e..38473f5 100644
+--- a/include/usbmuxd-proto.h
++++ b/include/usbmuxd-proto.h
+@@ -26,7 +26,7 @@
+ #include <stdint.h>
+ #define USBMUXD_PROTOCOL_VERSION 0
+ 
+-#if defined(WIN32) || defined(__CYGWIN__)
++#if defined(_WIN32) || defined(__CYGWIN__)
+ #define USBMUXD_SOCKET_PORT 27015
+ #else
+ #define USBMUXD_SOCKET_FILE "/var/run/usbmuxd"
diff --git a/external_imported/vcpkg/ports/libusbmuxd/002_fix_struct_pack.patch b/external_imported/vcpkg/ports/libusbmuxd/002_fix_struct_pack.patch
new file mode 100644
index 000000000..0dfd27f98
--- /dev/null
+++ b/external_imported/vcpkg/ports/libusbmuxd/002_fix_struct_pack.patch
@@ -0,0 +1,50 @@
+diff --git a/include/usbmuxd-proto.h b/include/usbmuxd-proto.h
+index 38473f5..d004232 100644
+--- a/include/usbmuxd-proto.h
++++ b/include/usbmuxd-proto.h
+@@ -57,28 +57,30 @@ enum usbmuxd_msgtype {
+ 	MESSAGE_PLIST = 8,
+ };
+ 
++#pragma pack(push, 1)
++
+ struct usbmuxd_header {
+ 	uint32_t length;    // length of message, including header
+ 	uint32_t version;   // protocol version
+ 	uint32_t message;   // message type
+ 	uint32_t tag;       // responses to this query will echo back this tag
+-} __attribute__((__packed__));
++};
+ 
+ struct usbmuxd_result_msg {
+ 	struct usbmuxd_header header;
+ 	uint32_t result;
+-} __attribute__((__packed__));
++};
+ 
+ struct usbmuxd_connect_request {
+ 	struct usbmuxd_header header;
+ 	uint32_t device_id;
+ 	uint16_t port;   // TCP port number
+ 	uint16_t reserved;   // set to zero
+-} __attribute__((__packed__));
++};
+ 
+ struct usbmuxd_listen_request {
+ 	struct usbmuxd_header header;
+-} __attribute__((__packed__));
++};
+ 
+ struct usbmuxd_device_record {
+ 	uint32_t device_id;
+@@ -86,7 +88,9 @@ struct usbmuxd_device_record {
+ 	char serial_number[256];
+ 	uint16_t padding;
+ 	uint32_t location;
+-} __attribute__((__packed__));
++};
++
++#pragma pack(pop)
+ 
+ #ifdef __cplusplus
+ }
diff --git a/external_imported/vcpkg/ports/libusbmuxd/003_fix_msvc.patch b/external_imported/vcpkg/ports/libusbmuxd/003_fix_msvc.patch
new file mode 100644
index 000000000..e285d2268
--- /dev/null
+++ b/external_imported/vcpkg/ports/libusbmuxd/003_fix_msvc.patch
@@ -0,0 +1,37 @@
+diff --git a/src/libusbmuxd.c b/src/libusbmuxd.c
+index 95e322f..c5c8f09 100644
+--- a/src/libusbmuxd.c
++++ b/src/libusbmuxd.c
+@@ -49,7 +49,9 @@
+ #define ECONNREFUSED 107
+ #endif
+ 
++#ifndef _MSC_VER
+ #include <unistd.h>
++#endif
+ #include <signal.h>
+ 
+ #ifdef WIN32
+@@ -91,6 +93,10 @@ static char* stpncpy(char *dst, const char *src, size_t len)
+ }
+ #endif
+ 
++#ifdef _MSC_VER
++#define strcasecmp _stricmp
++#endif
++
+ #include <plist/plist.h>
+ #define PLIST_CLIENT_VERSION_STRING PACKAGE_STRING
+ #define PLIST_LIBUSBMUX_VERSION 3
+@@ -1590,7 +1596,11 @@ USBMUXD_API int usbmuxd_send(int sfd, const char *data, uint32_t len, uint32_t *
+ 	num_sent = socket_send(sfd, (void*)data, len);
+ 	if (num_sent < 0) {
+ 		*sent_bytes = 0;
++#ifdef WIN32
++		num_sent = WSAGetLastError();
++#else
+ 		num_sent = errno;
++#endif
+ 		LIBUSBMUXD_DEBUG(1, "%s: Error %d when sending: %s\n", __func__, num_sent, strerror(num_sent));
+ 		return -num_sent;
+ 	}
diff --git a/external_imported/vcpkg/ports/libusbmuxd/004_fix_api.patch b/external_imported/vcpkg/ports/libusbmuxd/004_fix_api.patch
new file mode 100644
index 000000000..c06e19d03
--- /dev/null
+++ b/external_imported/vcpkg/ports/libusbmuxd/004_fix_api.patch
@@ -0,0 +1,22 @@
+diff --git a/src/libusbmuxd.c b/src/libusbmuxd.c
+index c5c8f09..edab706 100644
+--- a/src/libusbmuxd.c
++++ b/src/libusbmuxd.c
+@@ -29,14 +29,10 @@
+ #include <stdio.h>
+ #include <string.h>
+ 
+-#ifdef WIN32
+-  #define USBMUXD_API __declspec( dllexport )
++#if !defined(_WIN32) && !defined(LIBUSBMUXD_STATIC)
++#define USBMUXD_API __attribute__((visibility("default")))
+ #else
+-  #ifdef HAVE_FVISIBILITY
+-    #define USBMUXD_API __attribute__((visibility("default")))
+-  #else
+-    #define USBMUXD_API
+-  #endif
++#define USBMUXD_API
+ #endif
+ 
+ #ifndef EPROTO
diff --git a/external_imported/vcpkg/ports/libusbmuxd/005_fix_tools_msvc.patch b/external_imported/vcpkg/ports/libusbmuxd/005_fix_tools_msvc.patch
new file mode 100644
index 000000000..2804e6105
--- /dev/null
+++ b/external_imported/vcpkg/ports/libusbmuxd/005_fix_tools_msvc.patch
@@ -0,0 +1,42 @@
+diff --git a/tools/inetcat.c b/tools/inetcat.c
+index f70215b..748db15 100644
+--- a/tools/inetcat.c
++++ b/tools/inetcat.c
+@@ -33,7 +33,9 @@
+ #include <string.h>
+ #include <fcntl.h>
+ #include <stddef.h>
++#ifndef _MSC_VER
+ #include <unistd.h>
++#endif
+ #include <errno.h>
+ #include <getopt.h>
+ #ifdef WIN32
+@@ -50,6 +52,13 @@
+ #include "usbmuxd.h"
+ #include <libimobiledevice-glue/socket.h>
+ 
++#ifdef _MSC_VER
++#include <BaseTsd.h>
++typedef SSIZE_T ssize_t;
++#define STDIN_FILENO  _fileno(stdin)
++#define STDOUT_FILENO _fileno(stdout)
++#endif
++
+ static int debug_level = 0;
+ 
+ static size_t read_data_socket(int fd, uint8_t* buf, size_t bufsize)
+diff --git a/tools/iproxy.c b/tools/iproxy.c
+index d5f66b6..6510cb8 100644
+--- a/tools/iproxy.c
++++ b/tools/iproxy.c
+@@ -34,7 +34,9 @@
+ #include <string.h>
+ #include <fcntl.h>
+ #include <stddef.h>
++#ifndef _MSC_VER
+ #include <unistd.h>
++#endif
+ #include <errno.h>
+ #include <getopt.h>
+ #ifdef WIN32
diff --git a/external_imported/vcpkg/ports/libusbmuxd/CMakeLists.txt b/external_imported/vcpkg/ports/libusbmuxd/CMakeLists.txt
index b075a8a7d..cfe8eae8a 100644
--- a/external_imported/vcpkg/ports/libusbmuxd/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/libusbmuxd/CMakeLists.txt
@@ -1,54 +1,117 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.15)
 project(libusbmuxd C)
 
-# find dependencies
-find_path(libplist_INCLUDES plist.h PATH_SUFFIXES plist)
-set(libplist_INCLUDES ${libplist_INCLUDES}/../)
-find_library(libplist NAMES plist libplist plist-2.0 libplist-2.0 REQUIRED)
+option(BUILD_TOOLS "Build tools." OFF)
 
-# ready to create library
-file(GLOB_RECURSE IDVCACTV_TOOLS_HDR common/*.h)
-file(GLOB_RECURSE IDVCACTV_TOOLS_SRC common/*.c)
+include(GNUInstallDirs)
 
-file(GLOB_RECURSE IDVCACTV_PUBLIC_HDR include/*.h)
-file(GLOB_RECURSE IDVCACTV_SRC src/*.c)
+file(GLOB_RECURSE LIBUSBMUXD_HEADER include/*.h)
+file(GLOB_RECURSE LIBUSBMUXD_SOURCE src/*.c)
 
-add_library(libusbmuxd ${IDVCACTV_TOOLS_HDR} ${IDVCACTV_TOOLS_SRC} ${IDVCACTV_SRC} ${IDVCACTV_PUBLIC_HDR})
-set_target_properties(libusbmuxd PROPERTIES OUTPUT_NAME usbmuxd)
-target_include_directories(libusbmuxd PRIVATE ${libplist_INCLUDES} include common)
-target_compile_definitions(libusbmuxd PRIVATE -DPACKAGE_STRING="1.2.77")
-if (WIN32)
-    target_compile_definitions(libusbmuxd PRIVATE -DWIN32)
-    target_link_libraries(libusbmuxd PRIVATE Ws2_32)
+set(DEFINITIONS)
+
+list(APPEND DEFINITIONS -DPACKAGE_STRING="2.0.2")
+
+if(BUILD_SHARED_LIBS)
+    if(WIN32)
+        list(APPEND LIBUSBMUXD_SOURCE exports.def)
+    endif()
+else()
+    list(APPEND DEFINITIONS -DLIBUSBMUXD_STATIC)
 endif()
-if (UNIX)
-    target_compile_definitions(libusbmuxd PRIVATE -DHAVE_STPNCPY)
+
+if(UNIX)
+    list(APPEND DEFINITIONS -DHAVE_GETIFADDRS)
+    list(APPEND DEFINITIONS -DHAVE_STPNCPY)
+endif()
+
+if(WIN32)
+    list(APPEND DEFINITIONS -D_CRT_SECURE_NO_WARNINGS)
+    list(APPEND DEFINITIONS -DWIN32_LEAN_AND_MEAN)
+    list(APPEND DEFINITIONS -DWIN32)
+endif()
+
+find_package(unofficial-libplist CONFIG REQUIRED)
+find_package(unofficial-libimobiledevice-glue CONFIG REQUIRED)
+
+add_library(libusbmuxd ${LIBUSBMUXD_SOURCE})
+target_include_directories(libusbmuxd PUBLIC
+    "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
+    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
+)
+target_compile_definitions(libusbmuxd PRIVATE ${DEFINITIONS})
+target_link_libraries(libusbmuxd
+    PRIVATE
+        unofficial::libplist::libplist
+        unofficial::libimobiledevice-glue::libimobiledevice-glue
+)
+set_target_properties(libusbmuxd PROPERTIES OUTPUT_NAME usbmuxd-2.0)
+
+if(WIN32)
+    target_link_libraries(libusbmuxd PRIVATE Ws2_32)
 endif()
-target_link_libraries(libusbmuxd PRIVATE ${libplist})
 
-# install
+install(TARGETS libusbmuxd EXPORT unofficial-libusbmuxd)
+
+install(
+    EXPORT unofficial-libusbmuxd
+    FILE unofficial-libusbmuxd-config.cmake
+    DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/unofficial-libusbmuxd"
+    NAMESPACE unofficial::libusbmuxd::
+)
+
 install(
-    TARGETS libusbmuxd
-    RUNTIME DESTINATION bin
-    ARCHIVE DESTINATION lib
-    LIBRARY DESTINATION lib
+    FILES ${LIBUSBMUXD_HEADER}
+    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
 )
 
 set(LIBPLIST_VERSION 2.0)
+set(LIMD_GLUE_VERSION 1.0)
 set(PACKAGE_NAME libusbmuxd)
 set(PACKAGE_VERSION 2.0)
-set(prefix ${CMAKE_INSTALL_PREFIX})
-set(exec_prefix \${prefix})
-set(libdir \${prefix}/lib)
-set(includedir \${prefix}/../include)
+set(prefix "")
+set(exec_prefix "\${prefix}")
+set(libdir "\${prefix}/lib")
+set(includedir "\${prefix}/include")
+
 configure_file(
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/libusbmuxd-2.0.pc.in
-    ${CMAKE_CURRENT_BINARY_DIR}/libusbmuxd-2.0.pc
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/libusbmuxd-2.0.pc.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/libusbmuxd-2.0.pc"
     @ONLY
 )
 install(
-    FILES ${CMAKE_CURRENT_BINARY_DIR}/libusbmuxd-2.0.pc
-    DESTINATION lib/pkgconfig
+    FILES "${CMAKE_CURRENT_BINARY_DIR}/libusbmuxd-2.0.pc"
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
 )
 
-install(FILES ${IDVCACTV_PUBLIC_HDR} DESTINATION include)
\ No newline at end of file
+if(BUILD_TOOLS)
+    if(WIN32)
+        find_package(unofficial-getopt-win32 REQUIRED)
+    endif()
+
+    function(add_tool name source)
+        add_executable("${name}" "${source}")
+        target_compile_definitions("${name}" PRIVATE
+            -DPACKAGE_VERSION="2.0.2"
+            -DPACKAGE_URL="https://github.com/libimobiledevice/libusbmuxd"
+            -DPACKAGE_BUGREPORT="https://github.com/libimobiledevice/libusbmuxd/issues"
+        )
+        target_link_libraries("${name}" PRIVATE libusbmuxd unofficial::libimobiledevice-glue::libimobiledevice-glue)
+        if(WIN32)
+            target_compile_definitions("${name}" PRIVATE
+                -D_CRT_SECURE_NO_WARNINGS
+                -DWIN32_LEAN_AND_MEAN
+                -DWIN32
+            )
+            target_link_libraries("${name}" PRIVATE unofficial::getopt-win32::getopt Ws2_32)
+        endif()
+    endfunction(add_tool)
+
+    add_tool(inetcat "tools/inetcat.c")
+    add_tool(iproxy "tools/iproxy.c")
+
+    install(
+        TARGETS inetcat iproxy
+        RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+    )
+endif()
diff --git a/external_imported/vcpkg/ports/libusbmuxd/exports.def b/external_imported/vcpkg/ports/libusbmuxd/exports.def
new file mode 100644
index 000000000..a89e7e7fe
--- /dev/null
+++ b/external_imported/vcpkg/ports/libusbmuxd/exports.def
@@ -0,0 +1,21 @@
+EXPORTS
+    usbmuxd_events_subscribe
+    usbmuxd_events_unsubscribe
+    usbmuxd_subscribe
+    usbmuxd_unsubscribe
+    usbmuxd_get_device_list
+    usbmuxd_device_list_free
+    usbmuxd_get_device_by_udid
+    usbmuxd_get_device
+    usbmuxd_connect
+    usbmuxd_disconnect
+    usbmuxd_send
+    usbmuxd_recv_timeout
+    usbmuxd_recv
+    usbmuxd_read_buid
+    usbmuxd_read_pair_record
+    usbmuxd_save_pair_record_with_device_id
+    usbmuxd_save_pair_record
+    usbmuxd_delete_pair_record
+    libusbmuxd_set_use_inotify
+    libusbmuxd_set_debug_level
diff --git a/external_imported/vcpkg/ports/libusbmuxd/fix-win-build.patch b/external_imported/vcpkg/ports/libusbmuxd/fix-win-build.patch
deleted file mode 100644
index a1b7f2ef2..000000000
--- a/external_imported/vcpkg/ports/libusbmuxd/fix-win-build.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/src/libusbmuxd.c b/src/libusbmuxd.c
-index e85cf4a..35ed1b5 100644
---- a/src/libusbmuxd.c
-+++ b/src/libusbmuxd.c
-@@ -86,6 +86,15 @@ static char* stpncpy(char *dst, const char *src, size_t len)
- }
- #endif
- 
-+#ifdef WIN32
-+int strcasecmp(char *s1, char *s2)
-+{
-+   while  (toupper((unsigned char)*s1) == toupper((unsigned char)*s2++))
-+       if (*s1++ == '\0') return 0;
-+   return(toupper((unsigned char)*s1) - toupper((unsigned char)*--s2));
-+}
-+#endif
-+
- #include <plist/plist.h>
- #define PLIST_CLIENT_VERSION_STRING PACKAGE_STRING
- #define PLIST_LIBUSBMUX_VERSION 3
diff --git a/external_imported/vcpkg/ports/libusbmuxd/portfile.cmake b/external_imported/vcpkg/ports/libusbmuxd/portfile.cmake
index 38fbca4f9..3bd300e45 100644
--- a/external_imported/vcpkg/ports/libusbmuxd/portfile.cmake
+++ b/external_imported/vcpkg/ports/libusbmuxd/portfile.cmake
@@ -1,23 +1,47 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO libimobiledevice-win32/libusbmuxd
-    REF ac86b23f57879b8b702f3712ba66729008d059a3 # v1.2.219
-    SHA512 ced85088bc6ebb416ccb635d6b4e79662fb34f427d869b64b61847e5fde7b4ae094cebb1f7916d9387c314aeb84106a618fbd7497dc4b36151b236dcb55bd0e4
-    HEAD_REF msvc-master
-    PATCHES fix-win-build.patch
+    REPO libimobiledevice/libusbmuxd
+    REF 8d30a559cf0585625d9d05dc8ce0dd495b1de4f4 # commits on 2023-06-21
+    SHA512 ace920d13908c12afcc9182776a668f6876b2f037b21a151c1dca897aa24bc24cb41898471cd258487963772963753457be5efba2657571cf2c07c8225b68a5f
+    HEAD_REF master
+    PATCHES
+        001_fix_win32_defs.patch
+        002_fix_struct_pack.patch
+        003_fix_msvc.patch
+        004_fix_api.patch
+        005_fix_tools_msvc.patch
 )
 
-configure_file(${CURRENT_PORT_DIR}/CMakeLists.txt ${SOURCE_PATH}/CMakeLists.txt COPYONLY)
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/exports.def" DESTINATION "${SOURCE_PATH}")
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        tools BUILD_TOOLS
+)
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        ${FEATURE_OPTIONS}
 )
 
 vcpkg_cmake_install()
-vcpkg_copy_pdbs()
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT})
 vcpkg_fixup_pkgconfig()
+if("tools" IN_LIST FEATURES)
+    vcpkg_copy_tools(TOOL_NAMES inetcat iproxy AUTO_CLEAN)
+endif()
+
+file(READ "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake" cmake_config)
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake"
+"include(CMakeFindDependencyMacro)
+find_dependency(unofficial-libplist CONFIG)
+find_dependency(unofficial-libimobiledevice-glue CONFIG)
+${cmake_config}
+")
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/libusbmuxd/usage b/external_imported/vcpkg/ports/libusbmuxd/usage
new file mode 100644
index 000000000..2f98e1d33
--- /dev/null
+++ b/external_imported/vcpkg/ports/libusbmuxd/usage
@@ -0,0 +1,4 @@
+libusbmuxd provides CMake targets:
+
+    find_package(unofficial-libusbmuxd CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE unofficial::libusbmuxd::libusbmuxd)
diff --git a/external_imported/vcpkg/ports/libusbmuxd/vcpkg.json b/external_imported/vcpkg/ports/libusbmuxd/vcpkg.json
index 5ad272b73..78a75a374 100644
--- a/external_imported/vcpkg/ports/libusbmuxd/vcpkg.json
+++ b/external_imported/vcpkg/ports/libusbmuxd/vcpkg.json
@@ -1,15 +1,30 @@
 {
   "name": "libusbmuxd",
-  "version": "1.2.219",
-  "port-version": 3,
+  "version-date": "2023-06-21",
+  "port-version": 1,
   "description": "A client library to multiplex connections from and to iOS devices",
-  "license": "LGPL-2.1-only",
+  "homepage": "https://libimobiledevice.org/",
+  "license": "LGPL-2.1-or-later",
   "supports": "!uwp",
   "dependencies": [
+    "libimobiledevice-glue",
     "libplist",
     {
       "name": "vcpkg-cmake",
       "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
+  "features": {
+    "tools": {
+      "description": "build command line tool",
+      "supports": "!android & !ios & !xbox",
+      "dependencies": [
+        "getopt"
+      ]
     }
-  ]
+  }
 }
diff --git a/external_imported/vcpkg/ports/libuuid/CMakeLists.txt b/external_imported/vcpkg/ports/libuuid/CMakeLists.txt
index 9f4bb0605..a2789541b 100644
--- a/external_imported/vcpkg/ports/libuuid/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/libuuid/CMakeLists.txt
@@ -19,6 +19,7 @@ add_library(uuid STATIC
     uuid_time.c
 )
 target_compile_options(uuid PRIVATE -include "${CMAKE_CURRENT_BINARY_DIR}/config.h")
+target_include_directories(uuid PUBLIC "$<INSTALL_INTERFACE:include>")
 
 add_executable(test_uuid test_uuid.c)
 target_link_libraries(test_uuid uuid)
diff --git a/external_imported/vcpkg/ports/libuuid/portfile.cmake b/external_imported/vcpkg/ports/libuuid/portfile.cmake
index e42f64f22..74bf515e2 100644
--- a/external_imported/vcpkg/ports/libuuid/portfile.cmake
+++ b/external_imported/vcpkg/ports/libuuid/portfile.cmake
@@ -35,8 +35,6 @@ endif()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/unofficial-libuuid PACKAGE_NAME unofficial-libuuid)
 vcpkg_fixup_pkgconfig()
 
-file(INSTALL
-    "${SOURCE_PATH}/COPYING"
-    DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
 
 vcpkg_copy_pdbs()
diff --git a/external_imported/vcpkg/ports/libuuid/vcpkg.json b/external_imported/vcpkg/ports/libuuid/vcpkg.json
index 4da714b0e..405adfb81 100644
--- a/external_imported/vcpkg/ports/libuuid/vcpkg.json
+++ b/external_imported/vcpkg/ports/libuuid/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "libuuid",
   "version": "1.0.3",
-  "port-version": 12,
+  "port-version": 14,
   "description": "Universally unique id library",
   "homepage": "https://sourceforge.net/projects/libuuid",
+  "license": "BSD-3-Clause",
   "supports": "!osx & !windows",
   "dependencies": [
     {
diff --git a/external_imported/vcpkg/ports/libuv/fix-build-type.patch b/external_imported/vcpkg/ports/libuv/fix-build-type.patch
index 9977e48d0..41235b7a2 100644
--- a/external_imported/vcpkg/ports/libuv/fix-build-type.patch
+++ b/external_imported/vcpkg/ports/libuv/fix-build-type.patch
@@ -1,72 +1,46 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ac52412..15d5cb2 100644
+index 93733dd0..769025cf 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -381,7 +381,7 @@ endif()
- if(APPLE OR CMAKE_SYSTEM_NAME MATCHES "DragonFly|FreeBSD|Linux|NetBSD|OpenBSD")
-   list(APPEND uv_test_libraries util)
- endif()
--
-+if (BUILD_SHARED_LIBS)
- add_library(uv SHARED ${uv_sources})
- target_compile_definitions(uv
-   INTERFACE
-@@ -401,7 +401,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "OS390")
-   set_target_properties(uv PROPERTIES LINKER_LANGUAGE CXX)
- endif()
- target_link_libraries(uv ${uv_libraries})
+@@ -460,8 +460,7 @@ if(LIBUV_BUILD_SHARED)
+   endif()
+   target_link_libraries(uv ${uv_libraries})
+   set_target_properties(uv PROPERTIES OUTPUT_NAME "uv")
+-endif()
 -
 +else()
  add_library(uv_a STATIC ${uv_sources})
  target_compile_definitions(uv_a PRIVATE ${uv_defines})
  target_compile_options(uv_a PRIVATE ${uv_cflags})
-@@ -416,7 +416,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "OS390")
-   set_target_properties(uv_a PROPERTIES LINKER_LANGUAGE CXX)
+@@ -480,6 +479,7 @@ set_target_properties(uv_a PROPERTIES OUTPUT_NAME "uv")
+ if(MSVC)
+   set_target_properties(uv_a PROPERTIES PREFIX "lib")
  endif()
- target_link_libraries(uv_a ${uv_libraries})
--
 +endif()
+ 
  if(LIBUV_BUILD_TESTS)
    # Small hack: use ${uv_test_sources} now to get the runner skeleton,
-   # before the actual tests are added.
-@@ -659,26 +659,39 @@ string(REPLACE ";" " " LIBS "${LIBS}")
- file(STRINGS configure.ac configure_ac REGEX ^AC_INIT)
- string(REGEX MATCH "([0-9]+)[.][0-9]+[.][0-9]+" PACKAGE_VERSION "${configure_ac}")
- set(UV_VERSION_MAJOR "${CMAKE_MATCH_1}")
-+if (BUILD_SHARED_LIBS)
- # The version in the filename is mirroring the behaviour of autotools.
- set_target_properties(uv PROPERTIES
-   VERSION ${UV_VERSION_MAJOR}.0.0
-   SOVERSION ${UV_VERSION_MAJOR})
-+endif()
- set(includedir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR})
- set(libdir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
- set(prefix ${CMAKE_INSTALL_PREFIX})
-+if (BUILD_SHARED_LIBS)
- configure_file(libuv.pc.in libuv.pc @ONLY)
-+else()
- configure_file(libuv-static.pc.in libuv-static.pc @ONLY)
-+endif()
- 
+@@ -737,10 +737,6 @@ configure_file(libuv-static.pc.in libuv-static.pc @ONLY)
  install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
  install(FILES LICENSE DESTINATION ${CMAKE_INSTALL_DOCDIR})
--install(FILES ${PROJECT_BINARY_DIR}/libuv.pc ${PROJECT_BINARY_DIR}/libuv-static.pc
-+if (BUILD_SHARED_LIBS)
-+install(FILES ${PROJECT_BINARY_DIR}/libuv.pc
-+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ install(FILES LICENSE-extra DESTINATION ${CMAKE_INSTALL_DOCDIR})
+-install(FILES ${PROJECT_BINARY_DIR}/libuv-static.pc
+-        DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+-install(TARGETS uv_a EXPORT libuvConfig
+-        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ install(EXPORT libuvConfig
+ 	DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libuv
+ 	NAMESPACE libuv::)
+@@ -757,6 +753,11 @@ if(LIBUV_BUILD_SHARED)
+           RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+           LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+           ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 +else()
 +install(FILES ${PROJECT_BINARY_DIR}/libuv-static.pc
-         DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-+endif()
-+if (BUILD_SHARED_LIBS)
- install(TARGETS uv EXPORT libuvConfig
-         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+else()
- install(TARGETS uv_a EXPORT libuvConfig
-         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+endif()
- install(EXPORT libuvConfig DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libuv)
++        DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
++install(TARGETS uv_a EXPORT libuvConfig
++        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ endif()
  
  if(MSVC)
+
diff --git a/external_imported/vcpkg/ports/libuv/portfile.cmake b/external_imported/vcpkg/ports/libuv/portfile.cmake
index 036bb2676..1de13194e 100644
--- a/external_imported/vcpkg/ports/libuv/portfile.cmake
+++ b/external_imported/vcpkg/ports/libuv/portfile.cmake
@@ -1,16 +1,20 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libuv/libuv
-    REF 0c1fa696aa502eb749c2c4735005f41ba00a27b8 #v1.44.2
-    SHA512 4b63745d48c5318d75ef3580fc6d6288b1ca26a25f69fbef2af4b6fe1d1fe1255986cbb1fb5124e1ba6cd324868ebccdc6f6965e08e3e0fbde29f22e7e20ce89
+    REF "v${VERSION}"
+    SHA512 e3a7c10ffd909f9b128fb2316e09b8456e87278107178b49368f31ba30e7f62d64e7eba650cc59ef2d7eb178199c7a2c5b5c99b333849200492235116d7aee7a
     HEAD_REF v1.x
     PATCHES fix-build-type.patch
 )
 
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LIBUV_BUILD_SHARED)
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DLIBUV_BUILD_TESTS=OFF
+        -DLIBUV_BUILD_BENCH=OFF
+        -DLIBUV_BUILD_SHARED=${LIBUV_BUILD_SHARED}
         -DQEMU=OFF
         -DASAN=OFF
         -DTSAN=OFF
diff --git a/external_imported/vcpkg/ports/libuv/usage b/external_imported/vcpkg/ports/libuv/usage
index b93ab2855..60de86a85 100644
--- a/external_imported/vcpkg/ports/libuv/usage
+++ b/external_imported/vcpkg/ports/libuv/usage
@@ -1,4 +1,4 @@
 libuv provides CMake targets:
 
     find_package(libuv CONFIG REQUIRED)
-    target_link_libraries(main PRIVATE $<IF:$<TARGET_EXISTS:uv_a>,uv_a,uv>)
+    target_link_libraries(main PRIVATE $<IF:$<TARGET_EXISTS:libuv::uv_a>,libuv::uv_a,libuv::uv>)
diff --git a/external_imported/vcpkg/ports/libuv/vcpkg.json b/external_imported/vcpkg/ports/libuv/vcpkg.json
index 1393311a9..2bb7f826a 100644
--- a/external_imported/vcpkg/ports/libuv/vcpkg.json
+++ b/external_imported/vcpkg/ports/libuv/vcpkg.json
@@ -1,9 +1,11 @@
 {
   "name": "libuv",
-  "version-semver": "1.44.2",
+  "version-semver": "1.46.0",
+  "port-version": 1,
   "description": "libuv is a multi-platform support library with a focus on asynchronous I/O.",
   "homepage": "https://github.com/libuv/libuv",
   "license": "BSD-3-Clause",
+  "supports": "!uwp",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/libuvc/build_fix.patch b/external_imported/vcpkg/ports/libuvc/build_fix.patch
index 3c5bfcd44..74d618a5f 100644
--- a/external_imported/vcpkg/ports/libuvc/build_fix.patch
+++ b/external_imported/vcpkg/ports/libuvc/build_fix.patch
@@ -1,13 +1,14 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f3c8116..b9a6d38 100644
+index fbaffc9..451b689 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -39,10 +39,10 @@ set(SOURCES
+@@ -39,10 +39,11 @@ set(SOURCES
    src/misc.c
  )
  
 -find_package(LibUSB)
-+find_package(libusb CONFIG REQUIRED)
++FIND_PACKAGE(PkgConfig REQUIRED)
++pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0)
  
  # JpegPkg name to differ from shipped with CMake
 -find_package(JpegPkg QUIET)
@@ -15,23 +16,20 @@ index f3c8116..b9a6d38 100644
  if(JPEG_FOUND)
    message(STATUS "Building libuvc with JPEG support.")
    set(LIBUVC_HAS_JPEG TRUE)
-@@ -107,9 +107,10 @@ foreach(target_name IN LISTS UVC_TARGETS)
-       $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
-       $<INSTALL_INTERFACE:include>
+@@ -116,7 +117,7 @@ foreach(target_name IN LISTS UVC_TARGETS)
    )
-+  target_include_directories(${target_name} PRIVATE ${LIBUSB_INCLUDE_DIRS})
    target_link_libraries(${target_name}
      # libusb-1.0 used internally so we link to it privately.
--    PRIVATE LibUSB::LibUSB
-+    PRIVATE ${LIBUSB_LIBRARIES}
+-    PRIVATE LibUSB::LibUSB ${threads}
++    PRIVATE PkgConfig::libusb ${threads}
    )
    if(JPEG_FOUND)
      target_link_libraries(${target_name}
 diff --git a/libuvcConfig.cmake b/libuvcConfig.cmake
-index b9887ea..e8f09dc 100644
+index b9887ea..c704ab5 100644
 --- a/libuvcConfig.cmake
 +++ b/libuvcConfig.cmake
-@@ -10,8 +10,8 @@ if(${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED)
+@@ -10,8 +10,11 @@ if(${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED)
    list(APPEND extraArgs REQUIRED)
  endif()
  
@@ -39,6 +37,9 @@ index b9887ea..e8f09dc 100644
 -find_package(LibUSB ${extraArgs})
 +include(CMakeFindDependencyMacro)
 +find_dependency(JPEG ${extraArgs})
++find_dependency(Threads)
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0)
  include("${CMAKE_CURRENT_LIST_DIR}/libuvcTargets.cmake")
  
  set(libuvc_FOUND TRUE)
diff --git a/external_imported/vcpkg/ports/libuvc/portfile.cmake b/external_imported/vcpkg/ports/libuvc/portfile.cmake
index 6f68f14b7..b95ca4589 100644
--- a/external_imported/vcpkg/ports/libuvc/portfile.cmake
+++ b/external_imported/vcpkg/ports/libuvc/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libuvc/libuvc
-    REF c612d4509eb0ff19ce414abc3dca18d0f6263a84
-    SHA512 df3f23463728e8ffd69dc52e251ea2610ea8df32b02f6d26dd2a6910cf217650245bb1a11e67be61df875c6992d592c9cb17675d914997bd72c9fe7eb5b65c32
+    REF "v${VERSION}"
+    SHA512 cf2c0a6cc04717f284f25bed17f178a4b2b2a2bb3e5937e50be144e88db2c481c5ea763c164fe0234834fea4837f96fcc13bdbdafd4610d2985943562dfcc72f
     HEAD_REF master
     PATCHES build_fix.patch
 )
@@ -29,4 +29,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_
 
 vcpkg_fixup_pkgconfig()
 # Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/external_imported/vcpkg/ports/libuvc/vcpkg.json b/external_imported/vcpkg/ports/libuvc/vcpkg.json
index ff8763108..46a243bd5 100644
--- a/external_imported/vcpkg/ports/libuvc/vcpkg.json
+++ b/external_imported/vcpkg/ports/libuvc/vcpkg.json
@@ -1,14 +1,12 @@
 {
   "name": "libuvc",
-  "version-date": "2020-11-24",
-  "port-version": 3,
+  "version": "0.0.7",
   "description": "a cross-platform library for USB video devices",
   "homepage": "https://github.com/libuvc/libuvc",
   "supports": "linux",
   "dependencies": [
     "libjpeg-turbo",
     "libusb",
-    "libusb",
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/external_imported/vcpkg/ports/libvault/0001-fix-dependencies.patch b/external_imported/vcpkg/ports/libvault/0001-fix-dependencies.patch
new file mode 100644
index 000000000..1ff1696e6
--- /dev/null
+++ b/external_imported/vcpkg/ports/libvault/0001-fix-dependencies.patch
@@ -0,0 +1,37 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cd4482b..ac50fb5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -17,9 +17,8 @@ option(LINK_CURL "Link curl library for vault" OFF)
+ option(BUILD_SHARED_LIBS "Build vault as a shared library" ON)
+ option(INSTALL "Run install targets" ON)
+ 
+-find_package(CURL)
++find_package(CURL CONFIG REQUIRED)
+ if(CURL_FOUND)
+-  include_directories(${CURL_INCLUDE_DIR})
+ else(CURL_FOUND)
+   message(FATAL_ERROR "CURL not found")
+ endif(CURL_FOUND)
+@@ -126,7 +125,7 @@ set_target_properties(
+ target_include_directories(vault PRIVATE src)
+ 
+ if(LINK_CURL)
+-  target_link_libraries(vault curl)
++  target_link_libraries(vault CURL::libcurl)
+ endif(LINK_CURL)
+ 
+ if(ENABLE_COVERAGE)
+diff --git a/VaultConfig.cmake.in b/VaultConfig.cmake.in
+index 67a40ab..82db52d 100644
+--- a/VaultConfig.cmake.in
++++ b/VaultConfig.cmake.in
+@@ -1,5 +1,8 @@
+ @PACKAGE_INIT@
+ 
++include(CMakeFindDependencyMacro)
++find_dependency(CURL CONFIG)
++
+ include("${CMAKE_CURRENT_LIST_DIR}/libvaultTargets.cmake")
+ 
+ check_required_components(vault)
diff --git a/external_imported/vcpkg/ports/libvault/portfile.cmake b/external_imported/vcpkg/ports/libvault/portfile.cmake
new file mode 100644
index 000000000..34b2b0ed1
--- /dev/null
+++ b/external_imported/vcpkg/ports/libvault/portfile.cmake
@@ -0,0 +1,32 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO            abedra/libvault
+    REF             0.56.0
+    SHA512          6a8d14a755ea3d39c2912ee6d33cec9c6f30a498c57efc40603cecbbd90d400dba52be7b42287c87cd425694c89edbae86218021b2beaa5edca748c3d5dd7c77
+    PATCHES
+        0001-fix-dependencies.patch
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DENABLE_TEST=OFF
+        -DLINK_CURL=ON
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(PACKAGE_NAME libvault CONFIG_PATH lib/cmake/libvault)
+vcpkg_fixup_pkgconfig()
+
+vcpkg_copy_pdbs()
+
+
+file(INSTALL "${SOURCE_PATH}/LICENSE"
+     DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
+     RENAME copyright)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include"
+                    "${CURRENT_PACKAGES_DIR}/debug/share")
+
+# Install usage
+configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY)
diff --git a/external_imported/vcpkg/ports/libvault/usage b/external_imported/vcpkg/ports/libvault/usage
new file mode 100644
index 000000000..766be39f0
--- /dev/null
+++ b/external_imported/vcpkg/ports/libvault/usage
@@ -0,0 +1,4 @@
+libvault provides CMake targets:
+
+    find_package(libvault CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE libvault::vault)
diff --git a/external_imported/vcpkg/ports/libvault/vcpkg.json b/external_imported/vcpkg/ports/libvault/vcpkg.json
new file mode 100644
index 000000000..e39477c98
--- /dev/null
+++ b/external_imported/vcpkg/ports/libvault/vcpkg.json
@@ -0,0 +1,19 @@
+{
+  "name": "libvault",
+  "version": "0.56.0",
+  "description": "A C++ library for Hashicorp Vault",
+  "homepage": "https://github.com/abedra/libvault",
+  "license": "MIT",
+  "supports": "!uwp",
+  "dependencies": [
+    "curl",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/libvmdk/CMakeLists.txt b/external_imported/vcpkg/ports/libvmdk/CMakeLists.txt
index 1fb043d90..d04b627bb 100644
--- a/external_imported/vcpkg/ports/libvmdk/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/libvmdk/CMakeLists.txt
@@ -9,7 +9,6 @@ if(MSVC)
     add_compile_definitions(_CRT_NONSTDC_NO_DEPRECATE)
 endif()
 
-add_compile_definitions(HAVE_LOCAL_LIBCAES)
 add_compile_definitions(HAVE_LOCAL_LIBCERROR)
 add_compile_definitions(HAVE_LOCAL_LIBCTHREADS)
 add_compile_definitions(HAVE_LOCAL_LIBCDATA)
diff --git a/external_imported/vcpkg/ports/libvmdk/portfile.cmake b/external_imported/vcpkg/ports/libvmdk/portfile.cmake
index 11c689cb0..89a244783 100644
--- a/external_imported/vcpkg/ports/libvmdk/portfile.cmake
+++ b/external_imported/vcpkg/ports/libvmdk/portfile.cmake
@@ -1,16 +1,15 @@
-set(LIB_VERSION 20200926)
-set(LIB_FILENAME libvmdk-alpha-${LIB_VERSION}.tar.gz)
+set(LIB_FILENAME libvmdk-alpha-${VERSION}.tar.gz)
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/libyal/libvmdk/releases/download/${LIB_VERSION}/${LIB_FILENAME}"
+    URLS "https://github.com/libyal/libvmdk/releases/download/${VERSION}/${LIB_FILENAME}"
     FILENAME "${LIB_FILENAME}"
-    SHA512 e70c42580dc58ad0a6459fe461504a8ef128f8d5df9d500f84f316e627232606f22eb4906fc1debc3e75e71daa6a07951af80822695de13d5e466adda4cfd5e0
+    SHA512 7d7ea415d7c2cb1077d591d53ab3c37a7ab6e01dc9525159a70588e6f55e56bbef4d3f49f6e1c01ff0b1ddcede5ec2beb05aca7f12e5212843761e14f6459bcb
 )
 
 vcpkg_extract_source_archive(
     SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
-    SOURCE_BASE "${LIB_VERSION}"
+    SOURCE_BASE "${VERSION}"
 )
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
diff --git a/external_imported/vcpkg/ports/libvmdk/vcpkg.json b/external_imported/vcpkg/ports/libvmdk/vcpkg.json
index 3f753346a..e8ab9b1e6 100644
--- a/external_imported/vcpkg/ports/libvmdk/vcpkg.json
+++ b/external_imported/vcpkg/ports/libvmdk/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "libvmdk",
-  "version-string": "20200926",
-  "port-version": 3,
+  "version": "20221124",
   "description": "Library and tools to access the VMware Virtual Disk (VMDK) format",
   "homepage": "https://github.com/libyal/libvmdk",
   "supports": "!uwp",
diff --git a/external_imported/vcpkg/ports/libvpx/0003-add-uwp-v142-and-v143-support.patch b/external_imported/vcpkg/ports/libvpx/0003-add-uwp-v142-and-v143-support.patch
index ce323c498..43cebde31 100644
--- a/external_imported/vcpkg/ports/libvpx/0003-add-uwp-v142-and-v143-support.patch
+++ b/external_imported/vcpkg/ports/libvpx/0003-add-uwp-v142-and-v143-support.patch
@@ -1,5 +1,5 @@
 diff --git a/build/make/configure.sh b/build/make/configure.sh
-index 119d206..41bac75 100644
+index 110f16e..c161d0e 100644
 --- a/build/make/configure.sh
 +++ b/build/make/configure.sh
 @@ -1038,7 +1038,7 @@ EOF
@@ -85,21 +85,19 @@ index 58bb66b..b4cad6c 100644
                  fi
              fi
 diff --git a/configure b/configure
-index beea650..91ae3c8 100644
+index ae289f7..78f5fc1 100644
 --- a/configure
 +++ b/configure
-@@ -102,16 +102,24 @@ all_platforms="${all_platforms} arm64-darwin-gcc"
- all_platforms="${all_platforms} arm64-darwin20-gcc"
+@@ -103,6 +103,8 @@ all_platforms="${all_platforms} arm64-darwin20-gcc"
  all_platforms="${all_platforms} arm64-darwin21-gcc"
+ all_platforms="${all_platforms} arm64-darwin22-gcc"
  all_platforms="${all_platforms} arm64-linux-gcc"
 +all_platforms="${all_platforms} arm64-uwp-vs16"
 +all_platforms="${all_platforms} arm64-uwp-vs17"
  all_platforms="${all_platforms} arm64-win64-gcc"
  all_platforms="${all_platforms} arm64-win64-vs15"
-+all_platforms="${all_platforms} arm64-win64-vs16"
-+all_platforms="${all_platforms} arm64-win64-vs17"
- all_platforms="${all_platforms} armv7-android-gcc"   #neon Cortex-A8
- all_platforms="${all_platforms} armv7-darwin-gcc"    #neon Cortex-A8
+ all_platforms="${all_platforms} arm64-win64-vs16"
+@@ -112,6 +114,8 @@ all_platforms="${all_platforms} armv7-darwin-gcc"    #neon Cortex-A8
  all_platforms="${all_platforms} armv7-linux-rvct"    #neon Cortex-A8
  all_platforms="${all_platforms} armv7-linux-gcc"     #neon Cortex-A8
  all_platforms="${all_platforms} armv7-none-rvct"     #neon Cortex-A8
@@ -108,12 +106,7 @@ index beea650..91ae3c8 100644
  all_platforms="${all_platforms} armv7-win32-gcc"
  all_platforms="${all_platforms} armv7-win32-vs14"
  all_platforms="${all_platforms} armv7-win32-vs15"
-+all_platforms="${all_platforms} armv7-win32-vs16"
-+all_platforms="${all_platforms} armv7-win32-vs17"
- all_platforms="${all_platforms} armv7s-darwin-gcc"
- all_platforms="${all_platforms} armv8-linux-gcc"
- all_platforms="${all_platforms} loongarch32-linux-gcc"
-@@ -138,6 +146,8 @@ all_platforms="${all_platforms} x86-linux-gcc"
+@@ -143,6 +147,8 @@ all_platforms="${all_platforms} x86-linux-gcc"
  all_platforms="${all_platforms} x86-linux-icc"
  all_platforms="${all_platforms} x86-os2-gcc"
  all_platforms="${all_platforms} x86-solaris-gcc"
@@ -122,7 +115,7 @@ index beea650..91ae3c8 100644
  all_platforms="${all_platforms} x86-win32-gcc"
  all_platforms="${all_platforms} x86-win32-vs14"
  all_platforms="${all_platforms} x86-win32-vs15"
-@@ -161,6 +171,8 @@ all_platforms="${all_platforms} x86_64-iphonesimulator-gcc"
+@@ -167,6 +173,8 @@ all_platforms="${all_platforms} x86_64-iphonesimulator-gcc"
  all_platforms="${all_platforms} x86_64-linux-gcc"
  all_platforms="${all_platforms} x86_64-linux-icc"
  all_platforms="${all_platforms} x86_64-solaris-gcc"
@@ -131,7 +124,7 @@ index beea650..91ae3c8 100644
  all_platforms="${all_platforms} x86_64-win64-gcc"
  all_platforms="${all_platforms} x86_64-win64-vs14"
  all_platforms="${all_platforms} x86_64-win64-vs15"
-@@ -485,11 +497,10 @@ process_targets() {
+@@ -491,11 +499,10 @@ process_targets() {
      ! enabled multithread && DIST_DIR="${DIST_DIR}-nomt"
      ! enabled install_docs && DIST_DIR="${DIST_DIR}-nodocs"
      DIST_DIR="${DIST_DIR}-${tgt_isa}-${tgt_os}"
@@ -147,7 +140,7 @@ index beea650..91ae3c8 100644
      if [ -f "${source_path}/build/make/version.sh" ]; then
          ver=`"$source_path/build/make/version.sh" --bare "$source_path"`
          DIST_DIR="${DIST_DIR}-${ver}"
-@@ -578,6 +589,10 @@ process_detect() {
+@@ -584,6 +591,10 @@ process_detect() {
  
              # Specialize windows and POSIX environments.
              case $toolchain in
diff --git a/external_imported/vcpkg/ports/libvpx/0005-fix-arm64-build.patch b/external_imported/vcpkg/ports/libvpx/0005-fix-arm64-build.patch
new file mode 100644
index 000000000..76c0c8171
--- /dev/null
+++ b/external_imported/vcpkg/ports/libvpx/0005-fix-arm64-build.patch
@@ -0,0 +1,13 @@
+diff --git a/vp9/encoder/arm/neon/vp9_diamond_search_sad_neon.c b/vp9/encoder/arm/neon/vp9_diamond_search_sad_neon.c
+index 33753f7..997775a 100644
+--- a/vp9/encoder/arm/neon/vp9_diamond_search_sad_neon.c
++++ b/vp9/encoder/arm/neon/vp9_diamond_search_sad_neon.c
+@@ -220,7 +220,7 @@ int vp9_diamond_search_sad_neon(const MACROBLOCK *x,
+       // Look up the component cost of the residual motion vector
+       {
+         uint32_t cost[4];
+-        int16_t __attribute__((aligned(16))) rowcol[8];
++        DECLARE_ALIGNED(16, int16_t, rowcol[8]);
+         vst1q_s16(rowcol, v_diff_mv_w);
+ 
+         // Note: This is a use case for gather instruction
diff --git a/external_imported/vcpkg/ports/libvpx/portfile.cmake b/external_imported/vcpkg/ports/libvpx/portfile.cmake
index 478fadbf8..5730cf588 100644
--- a/external_imported/vcpkg/ports/libvpx/portfile.cmake
+++ b/external_imported/vcpkg/ports/libvpx/portfile.cmake
@@ -1,39 +1,36 @@
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
-set(LIBVPX_VERSION 1.12.0)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO webmproject/libvpx
-    REF v${LIBVPX_VERSION}
-    SHA512 dc059bc3102b75524ae29989372334b3e0f2acf1520e5a4daa4073831bb55949d82897c498fb9d2d38b59f1a66bb0ad24407d0d086b1e3a8394a4933f04f2ed0
+    REF "v${VERSION}"
+    SHA512 49706838563c92fab7334376848d0f374efcbc1729ef511e967c908fd2ecd40e8d197f1d85da6553b3a7026bdbc17e5a76595319858af26ce58cb9a4c3854897
     HEAD_REF master
     PATCHES
         0002-Fix-nasm-debug-format-flag.patch
         0003-add-uwp-v142-and-v143-support.patch
         0004-remove-library-suffixes.patch
+        0005-fix-arm64-build.patch # Upstream commit: https://github.com/webmproject/libvpx/commit/858a8c611f4c965078485860a6820e2135e6611b
 )
 
-vcpkg_find_acquire_program(PERL)
-
-get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY)
-
 if(CMAKE_HOST_WIN32)
-    vcpkg_acquire_msys(MSYS_ROOT PACKAGES make)
-    set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)
-    set(ENV{PATH} "${MSYS_ROOT}/usr/bin;$ENV{PATH};${PERL_EXE_PATH}")
+    vcpkg_acquire_msys(MSYS_ROOT PACKAGES make perl)
+    set(ENV{PATH} "${MSYS_ROOT}/usr/bin;$ENV{PATH}")
 else()
-    set(BASH /bin/bash)
+    vcpkg_find_acquire_program(PERL)
+    get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY)
     set(ENV{PATH} "${MSYS_ROOT}/usr/bin:$ENV{PATH}:${PERL_EXE_PATH}")
 endif()
 
+find_program(BASH NAME bash HINTS ${MSYS_ROOT}/usr/bin REQUIRED NO_CACHE)
+
 vcpkg_find_acquire_program(NASM)
 get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY)
 vcpkg_add_to_path(${NASM_EXE_PATH})
 
 if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
 
-    file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}")
+    file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-tmp")
 
     if(VCPKG_CRT_LINKAGE STREQUAL static)
         set(LIBVPX_CRT_LINKAGE --enable-static-msvcrt)
@@ -83,7 +80,7 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
     endif()
 
     message(STATUS "Generating makefile")
-    file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}")
+    file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-tmp")
     vcpkg_execute_required_process(
         COMMAND
             ${BASH} --noprofile --norc
@@ -92,47 +89,27 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
             ${LIBVPX_CRT_LINKAGE}
             ${OPTIONS}
             --as=nasm
-        WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}"
+        WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-tmp"
         LOGNAME configure-${TARGET_TRIPLET})
 
     message(STATUS "Generating MSBuild projects")
     vcpkg_execute_required_process(
         COMMAND
             ${BASH} --noprofile --norc -c "make dist"
-        WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}"
+        WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-tmp"
         LOGNAME generate-${TARGET_TRIPLET})
 
-    vcpkg_build_msbuild(
-        PROJECT_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/vpx.vcxproj"
-        OPTIONS /p:UseEnv=True
+    vcpkg_msbuild_install(
+        SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-tmp"
+        PROJECT_SUBPATH vpx.vcxproj
     )
 
-    # note: pdb file names are hardcoded in the lib file, cannot rename
-    set(LIBVPX_OUTPUT_PREFIX "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/${LIBVPX_ARCH_DIR}")
-    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-        file(INSTALL "${LIBVPX_OUTPUT_PREFIX}/Release/vpx.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
-        if (EXISTS "${LIBVPX_OUTPUT_PREFIX}/Release/vpx.pdb")
-            file(INSTALL "${LIBVPX_OUTPUT_PREFIX}/Release/vpx.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
-        else()
-            file(INSTALL "${LIBVPX_OUTPUT_PREFIX}/Release/vpx/vpx.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
-        endif()
-    endif()
-
-    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-        file(INSTALL "${LIBVPX_OUTPUT_PREFIX}/Debug/vpx.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
-        if (EXISTS "${LIBVPX_OUTPUT_PREFIX}/Debug/vpx.pdb")
-            file(INSTALL "${LIBVPX_OUTPUT_PREFIX}/Debug/vpx.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
-        else()
-            file(INSTALL "${LIBVPX_OUTPUT_PREFIX}/Debug/vpx/vpx.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
-        endif()
-    endif()
-
     if (VCPKG_TARGET_ARCHITECTURE STREQUAL arm64)
-        set(LIBVPX_INCLUDE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/vpx-vp8-vp9-nopost-nodocs-${LIBVPX_TARGET_ARCH}${LIBVPX_CRT_SUFFIX}-${LIBVPX_TARGET_VS}-v${LIBVPX_VERSION}/include/vpx")
+        set(LIBVPX_INCLUDE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vpx-vp8-vp9-nopost-nodocs-${LIBVPX_TARGET_ARCH}${LIBVPX_CRT_SUFFIX}-${LIBVPX_TARGET_VS}-v${VERSION}/include/vpx")
     elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL arm)
-        set(LIBVPX_INCLUDE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/vpx-vp8-vp9-nopost-nomt-nodocs-${LIBVPX_TARGET_ARCH}${LIBVPX_CRT_SUFFIX}-${LIBVPX_TARGET_VS}-v${LIBVPX_VERSION}/include/vpx")
+        set(LIBVPX_INCLUDE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vpx-vp8-vp9-nopost-nomt-nodocs-${LIBVPX_TARGET_ARCH}${LIBVPX_CRT_SUFFIX}-${LIBVPX_TARGET_VS}-v${VERSION}/include/vpx")
     else()
-        set(LIBVPX_INCLUDE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/vpx-vp8-vp9-nodocs-${LIBVPX_TARGET_ARCH}${LIBVPX_CRT_SUFFIX}-${LIBVPX_TARGET_VS}-v${LIBVPX_VERSION}/include/vpx")
+        set(LIBVPX_INCLUDE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vpx-vp8-vp9-nodocs-${LIBVPX_TARGET_ARCH}${LIBVPX_CRT_SUFFIX}-${LIBVPX_TARGET_VS}-v${VERSION}/include/vpx")
     endif()
     file(
         INSTALL
@@ -157,6 +134,7 @@ else()
 
     set(OPTIONS_DEBUG "--enable-debug-libs --enable-debug --prefix=${CURRENT_PACKAGES_DIR}/debug")
     set(OPTIONS_RELEASE "--prefix=${CURRENT_PACKAGES_DIR}")
+    set(AS_NASM "--as=nasm")
 
     if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
         set(OPTIONS "${OPTIONS} --disable-static --enable-shared")
@@ -176,26 +154,75 @@ else()
         set(LIBVPX_TARGET_ARCH "x86")
     elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x64)
         set(LIBVPX_TARGET_ARCH "x86_64")
+    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL arm)
+        set(LIBVPX_TARGET_ARCH "armv7")
     elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64)
         set(LIBVPX_TARGET_ARCH "arm64")
     else()
         message(FATAL_ERROR "libvpx does not support architecture ${VCPKG_TARGET_ARCHITECTURE}")
     endif()
 
-	if(VCPKG_TARGET_IS_MINGW)
-		if(LIBVPX_TARGET_ARCH STREQUAL "x86")
-			set(LIBVPX_TARGET "x86-win32-gcc")
-		else()
-			set(LIBVPX_TARGET "x86_64-win64-gcc")
-		endif()
-	elseif(VCPKG_TARGET_IS_LINUX)
+    vcpkg_cmake_get_vars(cmake_vars_file)
+    include("${cmake_vars_file}")
+
+    # Set environment variables for configure
+    if(VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "([^\/]*-)gcc$")
+        message(STATUS "Cross-building for ${TARGET_TRIPLET} with ${CMAKE_MATCH_1}")
+        set(ENV{CROSS} ${CMAKE_MATCH_1})
+        unset(AS_NASM)
+    else()
+        set(ENV{CC} ${VCPKG_DETECTED_CMAKE_C_COMPILER})
+        set(ENV{CXX} ${VCPKG_DETECTED_CMAKE_CXX_COMPILER})
+        set(ENV{AR} ${VCPKG_DETECTED_CMAKE_AR})
+        set(ENV{LD} ${VCPKG_DETECTED_CMAKE_LINKER})
+        set(ENV{RANLIB} ${VCPKG_DETECTED_CMAKE_RANLIB})
+        set(ENV{STRIP} ${VCPKG_DETECTED_CMAKE_STRIP})
+    endif()
+
+    if(VCPKG_TARGET_IS_MINGW)
+        if(LIBVPX_TARGET_ARCH STREQUAL "x86")
+            set(LIBVPX_TARGET "x86-win32-gcc")
+        else()
+            set(LIBVPX_TARGET "x86_64-win64-gcc")
+        endif()
+    elseif(VCPKG_TARGET_IS_LINUX)
         set(LIBVPX_TARGET "${LIBVPX_TARGET_ARCH}-linux-gcc")
+    elseif(VCPKG_TARGET_IS_ANDROID)
+        set(LIBVPX_TARGET "generic-gnu")
+        # Settings
+        if(VCPKG_TARGET_ARCHITECTURE STREQUAL x86)
+            set(OPTIONS "${OPTIONS} --disable-sse4_1 --disable-avx --disable-avx2 --disable-avx512")
+        elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x64)
+            set(OPTIONS "${OPTIONS} --disable-avx --disable-avx2 --disable-avx512")
+        elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL arm)
+            set(OPTIONS "${OPTIONS} --enable-thumb --disable-neon")
+        elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64)
+            set(OPTIONS "${OPTIONS} --enable-thumb")
+        endif()
+        # Set environment variables for configure
+        set(ENV{AS} ${VCPKG_DETECTED_CMAKE_C_COMPILER})
+        set(ENV{LDFLAGS} "${LDFLAGS} --target=${VCPKG_DETECTED_CMAKE_C_COMPILER_TARGET}")
+        # Set clang target
+        set(OPTIONS "${OPTIONS} --extra-cflags=--target=${VCPKG_DETECTED_CMAKE_C_COMPILER_TARGET} --extra-cxxflags=--target=${VCPKG_DETECTED_CMAKE_CXX_COMPILER_TARGET}")
+        # Unset nasm and let AS do its job
+        unset(AS_NASM)
     elseif(VCPKG_TARGET_IS_OSX)
         if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
             set(LIBVPX_TARGET "arm64-darwin20-gcc")
+            if(DEFINED VCPKG_OSX_DEPLOYMENT_TARGET)
+                set(MAC_OSX_MIN_VERSION_CFLAGS --extra-cflags=-mmacosx-version-min=${VCPKG_OSX_DEPLOYMENT_TARGET} --extra-cxxflags=-mmacosx-version-min=${VCPKG_OSX_DEPLOYMENT_TARGET})
+            endif()
         else()
             set(LIBVPX_TARGET "${LIBVPX_TARGET_ARCH}-darwin17-gcc") # enable latest CPU instructions for best performance and less CPU usage on MacOS
         endif()
+    elseif(VCPKG_TARGET_IS_IOS)
+        if(VCPKG_TARGET_ARCHITECTURE STREQUAL arm)
+            set(LIBVPX_TARGET "armv7-darwin-gcc")
+        elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64)
+            set(LIBVPX_TARGET "arm64-darwin-gcc")
+        else()
+            message(FATAL_ERROR "libvpx does not support architecture ${VCPKG_TARGET_ARCHITECTURE} on iOS")
+        endif()
     else()
         set(LIBVPX_TARGET "generic-gnu") # use default target
     endif()
@@ -212,14 +239,15 @@ else()
             --target=${LIBVPX_TARGET}
             ${OPTIONS}
             ${OPTIONS_RELEASE}
-            --as=nasm
+            ${MAC_OSX_MIN_VERSION_CFLAGS}
+            ${AS_NASM}
         WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
         LOGNAME configure-${TARGET_TRIPLET}-rel)
 
         message(STATUS "Building libvpx for Release")
         vcpkg_execute_required_process(
             COMMAND
-                ${BASH} --noprofile --norc -c "make -j8"
+                ${BASH} --noprofile --norc -c "make -j${VCPKG_CONCURRENCY}"
             WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
             LOGNAME build-${TARGET_TRIPLET}-rel
         )
@@ -245,14 +273,15 @@ else()
             --target=${LIBVPX_TARGET}
             ${OPTIONS}
             ${OPTIONS_DEBUG}
-            --as=nasm
+            ${MAC_OSX_MIN_VERSION_CFLAGS}
+            ${AS_NASM}
         WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg"
         LOGNAME configure-${TARGET_TRIPLET}-dbg)
 
         message(STATUS "Building libvpx for Debug")
         vcpkg_execute_required_process(
             COMMAND
-                ${BASH} --noprofile --norc -c "make -j8"
+                ${BASH} --noprofile --norc -c "make -j${VCPKG_CONCURRENCY}"
             WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg"
             LOGNAME build-${TARGET_TRIPLET}-dbg
         )
@@ -280,4 +309,4 @@ endif()
 
 configure_file("${CMAKE_CURRENT_LIST_DIR}/unofficial-libvpx-config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/unofficial-libvpx/unofficial-libvpx-config.cmake" @ONLY)
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/libvpx/vcpkg.json b/external_imported/vcpkg/ports/libvpx/vcpkg.json
index 06c3d7d76..e1916eb48 100644
--- a/external_imported/vcpkg/ports/libvpx/vcpkg.json
+++ b/external_imported/vcpkg/ports/libvpx/vcpkg.json
@@ -1,9 +1,21 @@
 {
   "name": "libvpx",
-  "version": "1.12.0",
+  "version": "1.13.1",
+  "port-version": 2,
   "description": "The reference software implementation for the video coding formats VP8 and VP9.",
   "homepage": "https://github.com/webmproject/libvpx",
   "license": "BSD-3-Clause",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake-get-vars",
+      "host": true
+    },
+    {
+      "name": "vcpkg-msbuild",
+      "host": true,
+      "platform": "windows"
+    }
+  ],
   "features": {
     "highbitdepth": {
       "description": "use VP9 high bit depth (10/12) profiles"
diff --git a/external_imported/vcpkg/ports/libvpx/vpx.pc.in b/external_imported/vcpkg/ports/libvpx/vpx.pc.in
index c01bb2e9b..6df64d4b4 100644
--- a/external_imported/vcpkg/ports/libvpx/vpx.pc.in
+++ b/external_imported/vcpkg/ports/libvpx/vpx.pc.in
@@ -1,13 +1,12 @@
-prefix=@LIBVPX_PREFIX@
-# pkg-config file from libvpx v1.10.0
-exec_prefix=${prefix}
-libdir=${prefix}/lib
-includedir=${prefix}/include
-
-Name: vpx
-Description: WebM Project VPx codec implementation
-Version: @LIBVPX_VERSION@
-Requires:
-Conflicts:
-Libs: -L"${libdir}" -lvpx
-Cflags: -I"${includedir}"
+prefix=@LIBVPX_PREFIX@
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: vpx
+Description: WebM Project VPx codec implementation
+Version: @VERSION@
+Requires:
+Conflicts:
+Libs: -L"${libdir}" -lvpx
+Cflags: -I"${includedir}"
diff --git a/external_imported/vcpkg/ports/libwebp/0002-cmake-config.patch b/external_imported/vcpkg/ports/libwebp/0002-cmake-config.patch
index 834034b4a..af6be5232 100644
--- a/external_imported/vcpkg/ports/libwebp/0002-cmake-config.patch
+++ b/external_imported/vcpkg/ports/libwebp/0002-cmake-config.patch
@@ -2,9 +2,9 @@ diff --git a/cmake/WebPConfig.cmake.in b/cmake/WebPConfig.cmake.in
 index f334739..43f10e0 100644
 --- a/cmake/WebPConfig.cmake.in
 +++ b/cmake/WebPConfig.cmake.in
-@@ -12,5 +12,12 @@ include ("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
+@@ -12,5 +12,12 @@ include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
  
- set(WebP_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
+ set_and_check(WebP_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
  set(WEBP_INCLUDE_DIRS ${WebP_INCLUDE_DIRS})
 -set(WebP_LIBRARIES "@INSTALLED_LIBRARIES@")
 +set(WebP_LIBRARIES "")
diff --git a/external_imported/vcpkg/ports/libwebp/0003-simd.patch b/external_imported/vcpkg/ports/libwebp/0003-simd.patch
new file mode 100644
index 000000000..523e05d44
--- /dev/null
+++ b/external_imported/vcpkg/ports/libwebp/0003-simd.patch
@@ -0,0 +1,23 @@
+diff --git a/cmake/cpu.cmake b/cmake/cpu.cmake
+index 7513ca8..38ec73b 100644
+--- a/cmake/cpu.cmake
++++ b/cmake/cpu.cmake
+@@ -50,7 +50,7 @@ if(MSVC AND CMAKE_C_COMPILER_ID STREQUAL "MSVC")
+   if(MSVC_VERSION GREATER_EQUAL 1800 AND NOT CMAKE_C_FLAGS MATCHES "/arch:")
+     set(SIMD_ENABLE_FLAGS)
+   else()
+-    set(SIMD_ENABLE_FLAGS "/arch:AVX;/arch:SSE2;;;;")
++    set(SIMD_ENABLE_FLAGS          ";/arch:SSE2;;;;") # /arch:AVX is too much for SSE4
+   endif()
+   set(SIMD_DISABLE_FLAGS)
+ else()
+@@ -110,6 +110,9 @@ foreach(I_SIMD RANGE ${WEBP_SIMD_FLAGS_RANGE})
+        "src/dsp/*${WEBP_SIMD_FILE_EXTENSION}")
+   if(WEBP_HAVE_${WEBP_SIMD_FLAG})
+     # Memorize the file and flags.
++    if("${SIMD_COMPILE_FLAG}" STREQUAL "")
++      set(SIMD_COMPILE_FLAG " ")
++    endif()
+     foreach(FILE ${SIMD_FILES})
+       list(APPEND WEBP_SIMD_FILES_TO_INCLUDE ${FILE})
+       list(APPEND WEBP_SIMD_FLAGS_TO_INCLUDE ${SIMD_COMPILE_FLAG})
diff --git a/external_imported/vcpkg/ports/libwebp/0007-fix-arm-build.patch b/external_imported/vcpkg/ports/libwebp/0007-fix-arm-build.patch
deleted file mode 100644
index 909b7c293..000000000
--- a/external_imported/vcpkg/ports/libwebp/0007-fix-arm-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cmake/cpu.cmake b/cmake/cpu.cmake
-index bc0dbc9..381f64a 100644
---- a/cmake/cpu.cmake
-+++ b/cmake/cpu.cmake
-@@ -97,7 +97,7 @@ foreach(I_SIMD RANGE ${WEBP_SIMD_FLAGS_RANGE})
-     set(CMAKE_REQUIRED_FLAGS ${SIMD_COMPILE_FLAG})
-     webp_check_compiler_flag(${WEBP_SIMD_FLAG} ${WEBP_ENABLE_SIMD})
-   else()
--    if(MSVC AND SIMD_ENABLE_FLAGS)
-+    if(MSVC AND SIMD_ENABLE_FLAGS AND NOT (CMAKE_GENERATOR_PLATFORM MATCHES "^ARM"))
-       # The detection for SSE2/SSE4 support under MSVC is based on the compiler
-       # version so e.g., clang-cl will require flags to enable the assembly.
-       list(GET SIMD_ENABLE_FLAGS ${I_SIMD} SIMD_COMPILE_FLAG)
diff --git a/external_imported/vcpkg/ports/libwebp/0008-sdl.patch b/external_imported/vcpkg/ports/libwebp/0008-sdl.patch
index 466388a89..134ed975f 100644
--- a/external_imported/vcpkg/ports/libwebp/0008-sdl.patch
+++ b/external_imported/vcpkg/ports/libwebp/0008-sdl.patch
@@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 0a5af42..636eef7 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -635,16 +635,22 @@ if(WEBP_BUILD_EXTRAS)
+@@ -647,26 +647,32 @@ if(WEBP_BUILD_EXTRAS)
                          ${CMAKE_CURRENT_BINARY_DIR}/src ${SDL_INCLUDE_DIR})
      set(WEBP_HAVE_SDL 1)
      target_compile_definitions(vwebp_sdl PUBLIC WEBP_HAVE_SDL)
@@ -14,6 +14,16 @@ index 0a5af42..636eef7 100644
  endif()
  
  if(WEBP_BUILD_WEBP_JS)
+   # The default stack size changed from 5MB to 64KB in 3.1.27. See
+   # https://crbug.com/webp/614.
+   if(EMSCRIPTEN_VERSION VERSION_GREATER_EQUAL "3.1.27")
+      # TOTAL_STACK size was renamed to STACK_SIZE in 3.1.27. The old name was
+      # kept for compatibility, but prefer the new one in case it is removed in
+      # the future.
+      set(emscripten_stack_size "-sSTACK_SIZE=5MB")
+   else()
+      set(emscripten_stack_size "-sTOTAL_STACK=5MB")
+   endif()
    # wasm2js does not support SIMD.
 +  find_package(SDL REQUIRED)
    if(NOT WEBP_ENABLE_SIMD)
@@ -26,7 +36,7 @@ index 0a5af42..636eef7 100644
      set(WEBP_HAVE_SDL 1)
      set_target_properties(
        webp_js
-@@ -653,12 +659,15 @@ if(WEBP_BUILD_WEBP_JS)
+@@ -675,12 +681,15 @@ if(WEBP_BUILD_WEBP_JS)
           -sEXPORTED_RUNTIME_METHODS=cwrap")
      set_target_properties(webp_js PROPERTIES OUTPUT_NAME webp)
      target_compile_definitions(webp_js PUBLIC EMSCRIPTEN WEBP_HAVE_SDL)
@@ -42,4 +52,4 @@ index 0a5af42..636eef7 100644
 +  target_compile_definitions(webp_wasm PUBLIC EMSCRIPTEN WEBP_HAVE_JUST_SDL_H)
    set_target_properties(
      webp_wasm
-     PROPERTIES LINK_FLAGS "-sWASM=1 \
+     PROPERTIES LINK_FLAGS "-sWASM=1 ${emscripten_stack_size} \
diff --git a/external_imported/vcpkg/ports/libwebp/0011-fix-include.patch b/external_imported/vcpkg/ports/libwebp/0011-fix-include.patch
new file mode 100644
index 000000000..899378541
--- /dev/null
+++ b/external_imported/vcpkg/ports/libwebp/0011-fix-include.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/WebPConfig.cmake.in b/cmake/WebPConfig.cmake.in
+index 74a5891..4c084d9 100644
+--- a/cmake/WebPConfig.cmake.in
++++ b/cmake/WebPConfig.cmake.in
+@@ -11,7 +11,7 @@ endif()
+ include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
+ 
+ set_and_check(WebP_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
+-set(WEBP_INCLUDE_DIRS ${WebP_INCLUDE_DIRS})
++set(WEBP_INCLUDE_DIRS ${WebP_INCLUDE_DIR})
+ set(WebP_LIBRARIES "")
+ include(SelectLibraryConfigurations)
+ foreach(_vcpkg_libwebp_lib IN ITEMS @INSTALLED_LIBRARIES@ sharpyuv)
diff --git a/external_imported/vcpkg/ports/libwebp/portfile.cmake b/external_imported/vcpkg/ports/libwebp/portfile.cmake
index 7ce123c71..45bb1c311 100644
--- a/external_imported/vcpkg/ports/libwebp/portfile.cmake
+++ b/external_imported/vcpkg/ports/libwebp/portfile.cmake
@@ -2,13 +2,14 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO webmproject/libwebp
     REF "v${VERSION}"
-    SHA512 96f73ba6caee4e65535721ca80faa976f51930eb6693e4499593e896f15269dfb756defabe7afbefb3bd2ef90afc0c95e3ba49d8020bc18589c34e9e680d955a
+    SHA512 2faa1bee1b73ded2b1460fc50a5973a37eefdc7b88d6a013491ba1c921d61413a653d44a953e8f6a3161ca6183f57ca9fe3be0f0a72b480895a299429a500dcf
     HEAD_REF master
     PATCHES
         0002-cmake-config.patch
-        0007-fix-arm-build.patch
+        0003-simd.patch
         0008-sdl.patch
         0010-fix_build.patch
+        0011-fix-include.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -72,4 +73,4 @@ if(NOT BIN_NAMES STREQUAL "")
 endif()
 
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST ${SOURCE_PATH}/COPYING ${SOURCE_PATH}/PATENTS)
diff --git a/external_imported/vcpkg/ports/libwebp/vcpkg.json b/external_imported/vcpkg/ports/libwebp/vcpkg.json
index e59cd8bc9..614a9455e 100644
--- a/external_imported/vcpkg/ports/libwebp/vcpkg.json
+++ b/external_imported/vcpkg/ports/libwebp/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "libwebp",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "description": "WebP codec: library to encode and decode images in WebP format",
   "homepage": "https://github.com/webmproject/libwebp",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/libxcrypt/portfile.cmake b/external_imported/vcpkg/ports/libxcrypt/portfile.cmake
new file mode 100644
index 000000000..fac97500e
--- /dev/null
+++ b/external_imported/vcpkg/ports/libxcrypt/portfile.cmake
@@ -0,0 +1,20 @@
+set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO besser82/libxcrypt
+    REF "v${VERSION}"
+    SHA512 61e5e393654f37775457474d4170098314879ee79963d423c1c461e80dc5dc74f0c161dd8754f016ce96109167be6c580ad23994fa1d2c38c54b96e602f3aece
+)
+
+vcpkg_configure_make(
+    SOURCE_PATH "${SOURCE_PATH}"
+    AUTOCONFIG
+)
+
+vcpkg_install_make()
+vcpkg_fixup_pkgconfig()
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSING" "${SOURCE_PATH}/COPYING.LIB")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
diff --git a/external_imported/vcpkg/ports/libxcrypt/vcpkg.json b/external_imported/vcpkg/ports/libxcrypt/vcpkg.json
new file mode 100644
index 000000000..e0f08eb18
--- /dev/null
+++ b/external_imported/vcpkg/ports/libxcrypt/vcpkg.json
@@ -0,0 +1,8 @@
+{
+  "name": "libxcrypt",
+  "version": "4.4.36",
+  "description": "libxcrypt is a modern library for one-way hashing of passwords. On Linux-based systems, by default libxcrypt will be binary backward compatible with the libcrypt.so.1 shipped as part of the GNU C Library.",
+  "homepage": "https://github.com/besser82/libxcrypt",
+  "license": "LGPL-2.1-only",
+  "supports": "linux"
+}
diff --git a/external_imported/vcpkg/ports/libxdf/fix-pugixml-dependency.patch b/external_imported/vcpkg/ports/libxdf/fix-pugixml-dependency.patch
new file mode 100644
index 000000000..5b888b986
--- /dev/null
+++ b/external_imported/vcpkg/ports/libxdf/fix-pugixml-dependency.patch
@@ -0,0 +1,65 @@
+From ca070dfdd96db5c9eb9a5a88d1193f25b13e01f3 Mon Sep 17 00:00:00 2001
+From: myd7349 <myd7349@gmail.com>
+Date: Mon, 31 Jul 2023 23:50:40 +0800
+Subject: [PATCH] Fix missing pugixml dependency in generated CMake package
+ file
+
+---
+ CMakeLists.txt        | 14 ++++++++++++--
+ libxdfConfig.cmake.in |  9 +++++++++
+ 2 files changed, 21 insertions(+), 2 deletions(-)
+ create mode 100644 libxdfConfig.cmake.in
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 98cc03f..42f9a91 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -43,18 +43,28 @@ target_include_directories(xdf PUBLIC
+ 	$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>
+ 	$<INSTALL_INTERFACE:include>
+ )
++include(CMakePackageConfigHelpers)
+ include(GNUInstallDirs)
++configure_package_config_file(
++    ${CMAKE_CURRENT_LIST_DIR}/libxdfConfig.cmake.in
++    ${CMAKE_CURRENT_BINARY_DIR}/libxdfConfig.cmake
++    INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++)
+ install(TARGETS xdf
+-	EXPORT "${PROJECT_NAME}Config"
++	EXPORT "${PROJECT_NAME}Targets"
+ 	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ 	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ 	PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+ )
+-install(EXPORT "${PROJECT_NAME}Config"
++install(EXPORT "${PROJECT_NAME}Targets"
+ 	COMPONENT ${PROJECT_NAME}
+ 	NAMESPACE "XDF::"
+ 	DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+ )
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libxdfConfig.cmake
++    COMPONENT ${PROJECT_NAME}
++    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++)
+ 
+ # set(CPACK_STRIP_FILES ON)
+ # set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
+diff --git a/libxdfConfig.cmake.in b/libxdfConfig.cmake.in
+new file mode 100644
+index 0000000..84331f0
+--- /dev/null
++++ b/libxdfConfig.cmake.in
+@@ -0,0 +1,9 @@
++@PACKAGE_INIT@
++
++include(CMakeFindDependencyMacro)
++
++find_dependency(pugixml)
++
++if(NOT TARGET XDF::xdf)
++    include("${CMAKE_CURRENT_LIST_DIR}/libxdfTargets.cmake")
++endif()
+-- 
+2.30.1.windows.1
+
diff --git a/external_imported/vcpkg/ports/libxdf/portfile.cmake b/external_imported/vcpkg/ports/libxdf/portfile.cmake
new file mode 100644
index 000000000..ac5f9d409
--- /dev/null
+++ b/external_imported/vcpkg/ports/libxdf/portfile.cmake
@@ -0,0 +1,25 @@
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO xdf-modules/libxdf
+    REF "v${VERSION}"
+    SHA512 81ff3598442d3ea166ec54b74248ad7b7eca5fcfdb72526978966398ad9e6524883183e71b68e349c46c2705779bf2b4922ce097f01afe7a62faa449ab8fa075
+    HEAD_REF main
+    PATCHES
+        fix-pugixml-dependency.patch
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DXDF_NO_SYSTEM_PUGIXML=OFF
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/external_imported/vcpkg/ports/libxdf/vcpkg.json b/external_imported/vcpkg/ports/libxdf/vcpkg.json
new file mode 100644
index 000000000..c2075708d
--- /dev/null
+++ b/external_imported/vcpkg/ports/libxdf/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "libxdf",
+  "version": "0.99.8",
+  "description": "C++ library for loading multimodal, multi-rate signals stored in XDF files.",
+  "homepage": "https://xdf-modules.github.io/libxdf/",
+  "license": "BSD-2-Clause",
+  "dependencies": [
+    "pugixml",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/libxdiff/fix-usage-error.patch b/external_imported/vcpkg/ports/libxdiff/fix-usage-error.patch
new file mode 100644
index 000000000..e7f28e30b
--- /dev/null
+++ b/external_imported/vcpkg/ports/libxdiff/fix-usage-error.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 33c34c2..1d93cde 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -87,8 +87,9 @@ INSTALL (
+     EXPORT XDiffTargets
+     ARCHIVE DESTINATION lib
+     LIBRARY DESTINATION lib
+-    RUNTIME DESTINATION lib
++    RUNTIME DESTINATION bin
+ )
++target_include_directories(xdiff INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>" "$<INSTALL_INTERFACE:include>") 
+ 
+ WRITE_BASIC_PACKAGE_VERSION_FILE (
+     "${CMAKE_CURRENT_BINARY_DIR}/XDiff/XDiffConfigVersion.cmake"
diff --git a/external_imported/vcpkg/ports/libxdiff/portfile.cmake b/external_imported/vcpkg/ports/libxdiff/portfile.cmake
index eb2bc8277..74dbc2d30 100644
--- a/external_imported/vcpkg/ports/libxdiff/portfile.cmake
+++ b/external_imported/vcpkg/ports/libxdiff/portfile.cmake
@@ -9,6 +9,8 @@ vcpkg_from_github(
     REF ${LIBXDIFF_REF}
     SHA512 ${LIBXDIFF_SHA512}
     HEAD_REF master
+    PATCHES
+        fix-usage-error.patch
 )
 
 vcpkg_cmake_configure(
@@ -35,7 +37,7 @@ if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release)
     endif()
 endif()
 
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
 
 vcpkg_copy_pdbs()
 
diff --git a/external_imported/vcpkg/ports/libxdiff/vcpkg.json b/external_imported/vcpkg/ports/libxdiff/vcpkg.json
index 73a404c92..5c54cdf44 100644
--- a/external_imported/vcpkg/ports/libxdiff/vcpkg.json
+++ b/external_imported/vcpkg/ports/libxdiff/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libxdiff",
   "version": "0.23",
-  "port-version": 3,
+  "port-version": 4,
   "description": "The LibXDiff library implements basic and yet complete functionalities to create file differences/patches to both binary and text files. The library uses memory files as file abstraction to achieve both performance and portability.",
   "homepage": "https://github.com/Drako/libxdiff",
   "supports": "!uwp",
diff --git a/external_imported/vcpkg/ports/libxkbcommon/vcpkg.json b/external_imported/vcpkg/ports/libxkbcommon/vcpkg.json
index ffd8259ae..a3f5bfce9 100644
--- a/external_imported/vcpkg/ports/libxkbcommon/vcpkg.json
+++ b/external_imported/vcpkg/ports/libxkbcommon/vcpkg.json
@@ -1,13 +1,17 @@
 {
   "name": "libxkbcommon",
   "version": "1.4.1",
+  "port-version": 1,
   "description": "keymap handling library for toolkits and window systems",
   "homepage": "https://xkbcommon.org/",
   "license": null,
   "dependencies": [
     "getopt",
     "libx11",
-    "tool-meson",
+    {
+      "name": "vcpkg-tool-meson",
+      "host": true
+    },
     {
       "name": "wayland",
       "platform": "linux"
diff --git a/external_imported/vcpkg/ports/libxlsxwriter/dependencies.diff b/external_imported/vcpkg/ports/libxlsxwriter/dependencies.diff
new file mode 100644
index 000000000..eb7a1cf9f
--- /dev/null
+++ b/external_imported/vcpkg/ports/libxlsxwriter/dependencies.diff
@@ -0,0 +1,26 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e656184..776c88a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -225,8 +225,8 @@ message("zlib version: " ${ZLIB_VERSION})
+ 
+ # MINIZIP
+ if (USE_SYSTEM_MINIZIP)
+-    find_package(MINIZIP REQUIRED "1.0")
+-    list(APPEND LXW_PRIVATE_INCLUDE_DIRS ${MINIZIP_INCLUDE_DIRS})
++    find_package(MINIZIP NAMES unofficial-minizip REQUIRED)
++    set(MINIZIP_LIBRARIES unofficial::minizip::minizip)
+ endif()
+ 
+ # LIBRARY
+diff --git a/dev/release/pkg-config.txt b/dev/release/pkg-config.txt
+index a87d080..fa58047 100644
+--- a/dev/release/pkg-config.txt
++++ b/dev/release/pkg-config.txt
+@@ -7,4 +7,5 @@ Name: libxlsxwriter
+ Description: A C library for creating Excel XLSX files
+ Version: @VERSION@
+ Cflags: -I${includedir}
+-Libs: -L${libdir} -lxlsxwriter -lz
++Libs: -L${libdir} -lxlsxwriter
++Requires.private: minizip zlib
diff --git a/external_imported/vcpkg/ports/libxlsxwriter/fix-zlib-ver-required.patch b/external_imported/vcpkg/ports/libxlsxwriter/fix-zlib-ver-required.patch
new file mode 100644
index 000000000..d2d1b104a
--- /dev/null
+++ b/external_imported/vcpkg/ports/libxlsxwriter/fix-zlib-ver-required.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 776c88a..ccc057d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -219,7 +219,7 @@ enable_language(CXX)
+ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+ 
+ # ZLIB
+-find_package(ZLIB REQUIRED "1.0")
++find_package(ZLIB "1.0" REQUIRED)
+ list(APPEND LXW_PRIVATE_INCLUDE_DIRS ${ZLIB_INCLUDE_DIRS})
+ message("zlib version: " ${ZLIB_VERSION})
+ 
diff --git a/external_imported/vcpkg/ports/libxlsxwriter/portfile.cmake b/external_imported/vcpkg/ports/libxlsxwriter/portfile.cmake
index 02053c7ec..7d9427d48 100644
--- a/external_imported/vcpkg/ports/libxlsxwriter/portfile.cmake
+++ b/external_imported/vcpkg/ports/libxlsxwriter/portfile.cmake
@@ -1,20 +1,24 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO jmcnamara/libxlsxwriter
-    REF RELEASE_1.1.5
+    REF "RELEASE_${VERSION}"
     SHA512 bd7db0fcf25ebf492b4d8f7da8fdb6cc79400d7d0fa5856ddae259cb24817034fc97d4828cbde42434f41198dcfb6732ac63c756abd962689f4249ca64bf19c6
     HEAD_REF master
+    PATCHES
+        dependencies.diff
+        fix-zlib-ver-required.patch
 )
+file(REMOVE_RECURSE "${SOURCE_PATH}/third_party/minizip")
 
+set(USE_WINDOWSSTORE OFF)
 if (VCPKG_TARGET_IS_UWP)
-  set(USE_WINDOWSSTORE ON)
-else()
-  set(USE_WINDOWSSTORE OFF)
+    set(USE_WINDOWSSTORE ON)
 endif()
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS 
+        -DUSE_SYSTEM_MINIZIP=1
         -DWINDOWSSTORE=${USE_WINDOWSSTORE}
 )
 
@@ -24,5 +28,4 @@ vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/License.txt")
diff --git a/external_imported/vcpkg/ports/libxlsxwriter/vcpkg.json b/external_imported/vcpkg/ports/libxlsxwriter/vcpkg.json
index 5fd73fa2c..f7d4f00af 100644
--- a/external_imported/vcpkg/ports/libxlsxwriter/vcpkg.json
+++ b/external_imported/vcpkg/ports/libxlsxwriter/vcpkg.json
@@ -1,10 +1,12 @@
 {
   "name": "libxlsxwriter",
   "version": "1.1.5",
+  "port-version": 2,
   "description": "Libxlsxwriter is a C library that can be used to write text, numbers, formulas and hyperlinks to multiple worksheets in an Excel 2007+ XLSX file.",
   "homepage": "https://github.com/jmcnamara/libxlsxwriter",
   "license": null,
   "dependencies": [
+    "minizip",
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/external_imported/vcpkg/ports/libxml2/fix_cmakelist.patch b/external_imported/vcpkg/ports/libxml2/fix_cmakelist.patch
index f8c60d0f1..7be171290 100644
--- a/external_imported/vcpkg/ports/libxml2/fix_cmakelist.patch
+++ b/external_imported/vcpkg/ports/libxml2/fix_cmakelist.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f922d5ab..685964b3 100644
+index 9701bdc..39e96ee 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -420,15 +420,15 @@ endif()
+@@ -393,15 +393,15 @@ endif()
  if(LIBXML2_WITH_ICU)
  	target_link_libraries(LibXml2 PRIVATE ICU::data ICU::i18n ICU::uc)
  	if(WIN32)
@@ -21,7 +21,7 @@ index f922d5ab..685964b3 100644
  endif()
  
  if(LIBXML2_WITH_THREADS)
-@@ -438,7 +438,7 @@ endif()
+@@ -411,7 +411,7 @@ endif()
  
  if(LIBXML2_WITH_ZLIB)
  	target_link_libraries(LibXml2 PRIVATE ZLIB::ZLIB)
@@ -30,7 +30,7 @@ index f922d5ab..685964b3 100644
  endif()
  
  set_target_properties(
-@@ -490,23 +490,9 @@ set_target_properties(
+@@ -425,23 +425,9 @@ set_target_properties(
          SOVERSION ${LIBXML_MAJOR_VERSION}
  )
  
@@ -56,7 +56,7 @@ index f922d5ab..685964b3 100644
  endif()
  
  install(FILES ${LIBXML2_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libxml2/libxml COMPONENT development)
-@@ -654,30 +640,30 @@ install(DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/libxml2 COMPONEN
+@@ -574,30 +560,30 @@ endif()
  
  configure_package_config_file(
  	libxml2-config.cmake.cmake.in libxml2-config.cmake
@@ -92,8 +92,19 @@ index f922d5ab..685964b3 100644
  	NAMESPACE LibXml2::
  	FILE libxml2-export.cmake
  	COMPONENT development
+@@ -635,9 +621,7 @@ set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
+ configure_file(libxml-2.0.pc.in libxml-2.0.pc @ONLY)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libxml-2.0.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT development)
+ 
+-if(WIN32)
+-	set(prefix "\$(cd \"\$(dirname \"\$0\")\"; pwd -P)/..")
+-endif()
++set(prefix "\$(cd \"\$(dirname \"\$0\")\"; pwd -P)/..")
+ configure_file(xml2-config.in xml2-config @ONLY)
+ install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/xml2-config DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT development)
+
 diff --git a/libxml-2.0.pc.in b/libxml-2.0.pc.in
-index 2653a7c5..2eb2f362 100644
+index 88e3963b..0d1706c9 100644
 --- a/libxml-2.0.pc.in
 +++ b/libxml-2.0.pc.in
 @@ -8,6 +8,7 @@ Name: libXML
@@ -104,5 +115,5 @@ index 2653a7c5..2eb2f362 100644
 -Libs.private: @XML_PRIVATE_LIBS@ @LIBS@
 +Requires.private: @ICU_LIBS@ @Z_LIBS@ @LZMA_LIBS@
 +Libs: -L${libdir} -l@XML_LIB_NAME@
-+Libs.private: @THREAD_LIBS@ @ICONV_LIBS@ @LIBM@ @WIN32_EXTRA_LIBADD@ @LIBS@
++Libs.private: @THREAD_LIBS@ @ICONV_LIBS@ @LIBM@ @WINSOCK_LIBS@ @LIBS@
  Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@
diff --git a/external_imported/vcpkg/ports/libxml2/portfile.cmake b/external_imported/vcpkg/ports/libxml2/portfile.cmake
index db81b5ddf..c2e479465 100644
--- a/external_imported/vcpkg/ports/libxml2/portfile.cmake
+++ b/external_imported/vcpkg/ports/libxml2/portfile.cmake
@@ -2,42 +2,35 @@ vcpkg_from_gitlab(
     GITLAB_URL https://gitlab.gnome.org/
     OUT_SOURCE_PATH SOURCE_PATH
     REPO GNOME/libxml2
-    REF f507d167f1755b7eaea09fb1a44d29aab828b6d1
-    SHA512 2ac3dcab31111f608a3fe33dde492c9653ad2bd49a792373acdd03d2787e1a4ef70eeb7a3d47cf67eefd43aee2ab75ec50b36cdcd124445ca206de924abb6021
+    REF "v${VERSION}"
+    SHA512 27ce97deb8c60742dcaf95992544dc79342435a55f9a74b479b978a06361a41e902bf269c6ef40b18dae63c2a13c31268f2bb5b0673aca8843ad6ad631e68f9d
     HEAD_REF master
-    PATCHES 
+    PATCHES
         disable-docs.patch
         fix_cmakelist.patch
 )
 
-if (VCPKG_TARGET_IS_UWP)
-    message(WARNING "Feature network couldn't be enabled on UWP, disable http and ftp automatically.")
-    set(ENABLE_NETWORK 0)
-else()
-    set(ENABLE_NETWORK 1)
-endif()
-
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
-        "tools"     LIBXML2_WITH_PROGRAMS
+        "ftp" LIBXML2_WITH_FTP
+        "http" LIBXML2_WITH_HTTP
+        "iconv" LIBXML2_WITH_ICONV
+        "legacy" LIBXML2_WITH_LEGACY
+        "lzma" LIBXML2_WITH_LZMA
+        "zlib" LIBXML2_WITH_ZLIB
+        "tools" LIBXML2_WITH_PROGRAMS
+        "icu"  LIBXML2_WITH_ICU
 )
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         ${FEATURE_OPTIONS}
         -DLIBXML2_WITH_TESTS=OFF
-        -DLIBXML2_WITH_HTTP=${ENABLE_NETWORK}
-        -DLIBXML2_WITH_FTP=${ENABLE_NETWORK}
         -DLIBXML2_WITH_HTML=ON
         -DLIBXML2_WITH_C14N=ON
         -DLIBXML2_WITH_CATALOG=ON
-        -DLIBXML2_WITH_DEBUG=ON 
-        -DLIBXML2_WITH_ICONV=ON
-        -DLIBXML2_WITH_ISO8859X=ON 
-        -DLIBXML2_WITH_ZLIB=ON
-        -DLIBXML2_WITH_ICU=OFF # Culprit of linkage issues? Solving this is probably another PR
-        -DLIBXML2_WITH_LZMA=ON
-        -DLIBXML2_WITH_LEGACY=ON
+        -DLIBXML2_WITH_DEBUG=ON
+        -DLIBXML2_WITH_ISO8859X=ON
         -DLIBXML2_WITH_MEM_DEBUG=OFF
         -DLIBXML2_WITH_MODULES=ON
         -DLIBXML2_WITH_OUTPUT=ON
@@ -46,7 +39,6 @@ vcpkg_cmake_configure(
         -DLIBXML2_WITH_PYTHON=OFF
         -DLIBXML2_WITH_READER=ON
         -DLIBXML2_WITH_REGEXPS=ON
-        -DLIBXML2_WITH_RUN_DEBUG=OFF
         -DLIBXML2_WITH_SAX1=ON
         -DLIBXML2_WITH_SCHEMAS=ON
         -DLIBXML2_WITH_SCHEMATRON=ON
@@ -70,9 +62,11 @@ vcpkg_copy_pdbs()
 if("tools" IN_LIST FEATURES)
     vcpkg_copy_tools(TOOL_NAMES xmllint xmlcatalog AUTO_CLEAN)
 endif()
+
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
+
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
     set(_file "${CURRENT_PACKAGES_DIR}/include/libxml2/libxml/xmlexports.h")
     file(READ "${_file}" _contents)
@@ -80,9 +74,9 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
     file(WRITE "${_file}" "${_contents}")
 endif()
 
-file(COPY "${CURRENT_PACKAGES_DIR}/include/libxml2/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") # TODO: Fix usage in all dependent ports hardcoding the wrong include path. 
+file(COPY "${CURRENT_PACKAGES_DIR}/include/libxml2/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") # TODO: Fix usage in all dependent ports hardcoding the wrong include path.
 
-#Cleanup
+# Cleanup
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/xml2Conf.sh" "${CURRENT_PACKAGES_DIR}/debug/lib/xml2Conf.sh")
@@ -92,4 +86,4 @@ file(COPY
     "${CMAKE_CURRENT_LIST_DIR}/usage"
     DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
 )
-file(INSTALL "${SOURCE_PATH}/Copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/Copyright")
diff --git a/external_imported/vcpkg/ports/libxml2/vcpkg.json b/external_imported/vcpkg/ports/libxml2/vcpkg.json
index 4e8045545..2ed3e6f8d 100644
--- a/external_imported/vcpkg/ports/libxml2/vcpkg.json
+++ b/external_imported/vcpkg/ports/libxml2/vcpkg.json
@@ -1,12 +1,11 @@
 {
   "name": "libxml2",
-  "version": "2.10.3",
+  "version": "2.11.6",
+  "port-version": 1,
   "description": "Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform).",
   "homepage": "https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home",
   "license": "MIT",
   "dependencies": [
-    "libiconv",
-    "liblzma",
     {
       "name": "vcpkg-cmake",
       "host": true
@@ -14,12 +13,51 @@
     {
       "name": "vcpkg-cmake-config",
       "host": true
-    },
+    }
+  ],
+  "default-features": [
+    "iconv",
+    "lzma",
     "zlib"
   ],
   "features": {
+    "ftp": {
+      "description": "Add the FTP support",
+      "supports": "!uwp"
+    },
+    "http": {
+      "description": "Add the HTTP support",
+      "supports": "!uwp"
+    },
+    "iconv": {
+      "description": "Add ICONV support",
+      "dependencies": [
+        "libiconv"
+      ]
+    },
+    "icu": {
+      "description": "Add ICU support",
+      "dependencies": [
+        "icu"
+      ]
+    },
+    "legacy": {
+      "description": "Add deprecated APIs for compatibility"
+    },
+    "lzma": {
+      "description": "Use LZMA",
+      "dependencies": [
+        "liblzma"
+      ]
+    },
     "tools": {
       "description": "Build tools"
+    },
+    "zlib": {
+      "description": "Use ZLib",
+      "dependencies": [
+        "zlib"
+      ]
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/libxmlpp/portfile.cmake b/external_imported/vcpkg/ports/libxmlpp/portfile.cmake
index 1620e79b3..011bc5f48 100644
--- a/external_imported/vcpkg/ports/libxmlpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/libxmlpp/portfile.cmake
@@ -7,8 +7,8 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 ae8d7a178e7a3b48a9f0e1ea303e8a4e4d879d0d9367124ede3783d0c31e31c862b98e5d28d72edc4c0b19c6b457ead2d25664efd33d65e44fd52c5783ec3091
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
 )
 
diff --git a/external_imported/vcpkg/ports/libxmlpp/vcpkg.json b/external_imported/vcpkg/ports/libxmlpp/vcpkg.json
index ff1b69a48..517ba3f2d 100644
--- a/external_imported/vcpkg/ports/libxmlpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/libxmlpp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libxmlpp",
   "version": "5.0.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "a C++ wrapper for the libxml XML parser library.",
   "supports": "!(windows & static)",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/libxmp-lite/0001-msvc-buildfix.patch b/external_imported/vcpkg/ports/libxmp-lite/0001-msvc-buildfix.patch
deleted file mode 100644
index dfd548186..000000000
--- a/external_imported/vcpkg/ports/libxmp-lite/0001-msvc-buildfix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur .\libxmp-lite-4.4.1/src/common.h .\libxmp-lite-4.4.1-orig/src/common.h
---- a/src/common.h	2016-07-16 13:37:36 +0200
-+++ b/src/common.h	2017-05-23 00:52:17 +0200
-@@ -77,19 +77,12 @@
- #ifndef CLIB_DECL
- #define CLIB_DECL
- #endif
--#ifdef DEBUG
--#ifndef ATTR_PRINTF
--#define ATTR_PRINTF(x,y)
--#endif
--void CLIB_DECL D_(const char *text, ...) ATTR_PRINTF(1,2);
--#else
- // VS prior to VC7.1 does not support variadic macros. VC8.0 does not optimize unused parameters passing
- #if _MSC_VER < 1400
- void __inline CLIB_DECL D_(const char *text, ...) { do {} while (0); }
- #else
- #define D_(args, ...) do {} while (0)
- #endif
--#endif
- 
- #elif defined __ANDROID__
- 
diff --git a/external_imported/vcpkg/ports/libxmp-lite/0002-fix-symbols.patch b/external_imported/vcpkg/ports/libxmp-lite/0002-fix-symbols.patch
deleted file mode 100644
index f765a7bf0..000000000
--- a/external_imported/vcpkg/ports/libxmp-lite/0002-fix-symbols.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/lite/src/format.c b/lite/src/format.c
---- a/src/format.c
-+++ b/src/format.c
-@@ -27,20 +27,20 @@
- #endif
- #include "format.h"
- 
--extern const struct format_loader xm_loader;
--extern const struct format_loader mod_loader;
--extern const struct format_loader it_loader;
--extern const struct format_loader s3m_loader;
-+extern const struct format_loader libxmp_loader_xm;
-+extern const struct format_loader libxmp_loader_mod;
-+extern const struct format_loader libxmp_loader_it;
-+extern const struct format_loader libxmp_loader_s3m;
- 
- extern const struct pw_format *const pw_format[];
- 
- const struct format_loader *const format_loader[5] = {
--	&xm_loader,
--	&mod_loader,
-+	&libxmp_loader_xm,
-+	&libxmp_loader_mod,
- #ifndef LIBXMP_CORE_DISABLE_IT
--	&it_loader,
-+	&libxmp_loader_it,
- #endif
--	&s3m_loader,
-+	&libxmp_loader_s3m,
- 	NULL
- };
- 
-diff --git a/lite/src/loaders/mod_load.c b/lite/src/loaders/mod_load.c
---- a/src/loaders/mod_load.c
-+++ b/src/loaders/mod_load.c
-@@ -36,7 +36,7 @@
- static int mod_test (HIO_HANDLE *, char *, const int);
- static int mod_load (struct module_data *, HIO_HANDLE *, const int);
- 
--const struct format_loader mod_loader = {
-+const struct format_loader libxmp_loader_mod = {
-     "Protracker",
-     mod_test,
-     mod_load
diff --git a/external_imported/vcpkg/ports/libxmp-lite/CMakeLists.txt b/external_imported/vcpkg/ports/libxmp-lite/CMakeLists.txt
deleted file mode 100644
index e1f14f377..000000000
--- a/external_imported/vcpkg/ports/libxmp-lite/CMakeLists.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-cmake_minimum_required(VERSION 3.4)
-project(libxmp-lite)
-
-set(HEADERS "include/libxmp-lite/xmp.h")
-
-set(SOURCES src/virtual.c
-            src/format.c
-            src/period.c
-            src/player.c
-            src/read_event.c
-            src/dataio.c
-            src/lfo.c
-            src/scan.c
-            src/control.c
-            src/filter.c
-            src/effects.c
-            src/mixer.c
-            src/mix_all.c
-            src/load_helpers.c
-            src/load.c
-            src/hio.c
-            src/smix.c
-            src/memio.c
-            src/loaders/common.c
-            src/loaders/itsex.c
-            src/loaders/sample.c
-            src/loaders/xm_load.c
-            src/loaders/mod_load.c
-            src/loaders/s3m_load.c
-            src/loaders/it_load.c
-)
-
-include_directories(include/libxmp-lite src)
-
-option(BUILD_SHARED_LIBS "Build shared libs" OFF)
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    option(INSTALL_HEADERS "Install header files" OFF)
-else()
-    option(INSTALL_HEADERS "Install header files" ON)
-endif()
-
-add_library(libxmp-lite ${SOURCES})
-target_compile_definitions(libxmp-lite PRIVATE
-            LIBXMP_CORE_PLAYER=1
-            inline=__inline
-            _USE_MATH_DEFINES=1
-)
-
-# Fix UWP /sdl compile errors
-# Disable C4703: Not initialized
-# Disable C4996: Deprecated
-set_target_properties(libxmp-lite PROPERTIES COMPILE_FLAGS "/wd4703 /wd4996")
-
-install(
-    TARGETS libxmp-lite
-    ARCHIVE DESTINATION lib
-    LIBRARY DESTINATION lib
-    RUNTIME DESTINATION bin
-)
-
-if(INSTALL_HEADERS)
-    install(FILES ${HEADERS} DESTINATION include)
-endif()
diff --git a/external_imported/vcpkg/ports/libxmp-lite/portfile.cmake b/external_imported/vcpkg/ports/libxmp-lite/portfile.cmake
deleted file mode 100644
index abcad6008..000000000
--- a/external_imported/vcpkg/ports/libxmp-lite/portfile.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
-vcpkg_from_sourceforge(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO xmp/libxmp
-    REF 4.4.1
-    FILENAME "libxmp-lite-4.4.1.tar.gz"
-    SHA512 f27e3f9fb79ff15ce90b51fb29641c01cadf7455150da57cde6860c2ba075ed497650eb44ec9143bdd3538288228c609f7db6d862c9d73f007f686eccb05543e
-    PATCHES
-        0001-msvc-buildfix.patch
-        0002-fix-symbols.patch
-)
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-)
-
-vcpkg_cmake_install()
-vcpkg_copy_pdbs()
-
-file(INSTALL "${SOURCE_PATH}/README" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/external_imported/vcpkg/ports/libxmp-lite/vcpkg.json b/external_imported/vcpkg/ports/libxmp-lite/vcpkg.json
deleted file mode 100644
index 3e0d85044..000000000
--- a/external_imported/vcpkg/ports/libxmp-lite/vcpkg.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "name": "libxmp-lite",
-  "version": "4.4.1",
-  "port-version": 8,
-  "description": "Lightweight version of libxmp that supports MOD, S3M, XM and IT modules.",
-  "homepage": "https://sourceforge.net/projects/xmp/",
-  "supports": "windows",
-  "dependencies": [
-    {
-      "name": "vcpkg-cmake",
-      "host": true
-    }
-  ]
-}
diff --git a/external_imported/vcpkg/ports/libxmp/fix-cmake-config-dir.patch b/external_imported/vcpkg/ports/libxmp/fix-cmake-config-dir.patch
new file mode 100644
index 000000000..95c35d95e
--- /dev/null
+++ b/external_imported/vcpkg/ports/libxmp/fix-cmake-config-dir.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1794cb2c1534d53d502785e0446d302e5439216a..c960405632c0d1b4797470424fce4ff8a7ec1aef 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -170,7 +170,7 @@ add_subdirectory(docs)
+ 
+ include(CMakePackageConfigHelpers)
+ 
+-if(WIN32)
++if(0)
+     set(cmake_install_cmakdir "cmake")
+ else()
+     set(cmake_install_cmakdir "${CMAKE_INSTALL_LIBDIR}/cmake/libxmp")
diff --git a/external_imported/vcpkg/ports/libxmp/portfile.cmake b/external_imported/vcpkg/ports/libxmp/portfile.cmake
new file mode 100644
index 000000000..47fcb1826
--- /dev/null
+++ b/external_imported/vcpkg/ports/libxmp/portfile.cmake
@@ -0,0 +1,42 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO libxmp/libxmp
+    REF libxmp-${VERSION}
+    SHA512 5f7690e274f3857bd6889cd2ba637473f4a85359a6ef87c76313f87d0c725e3880ba6e428b542dbbf0c8a7725a87b5019289b3f19d2c5bb49527b380f1b4f7e4
+    PATCHES
+        fix-cmake-config-dir.patch
+)
+
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED)
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    INVERTED_FEATURES
+        depackers  LIBXMP_DISABLE_DEPACKERS
+        prowizard  LIBXMP_DISABLE_PROWIZARD
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        ${FEATURE_OPTIONS}
+        -DBUILD_STATIC=${BUILD_STATIC}
+        -DBUILD_SHARED=${BUILD_SHARED}
+        -DLIBXMP_DOCS=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+
+vcpkg_cmake_config_fixup(
+    PACKAGE_NAME "libxmp"
+    CONFIG_PATH "lib/cmake/libxmp"
+)
+
+vcpkg_fixup_pkgconfig()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/docs/COPYING.LIB")
diff --git a/external_imported/vcpkg/ports/libxmp/usage b/external_imported/vcpkg/ports/libxmp/usage
new file mode 100644
index 000000000..6dcd832f1
--- /dev/null
+++ b/external_imported/vcpkg/ports/libxmp/usage
@@ -0,0 +1,4 @@
+libxmp provides CMake targets:
+
+    find_package(libxmp CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE $<IF:$<TARGET_EXISTS:libxmp::xmp_shared>,libxmp::xmp_shared,libxmp::xmp_static>)
diff --git a/external_imported/vcpkg/ports/libxmp/vcpkg.json b/external_imported/vcpkg/ports/libxmp/vcpkg.json
new file mode 100644
index 000000000..551016eef
--- /dev/null
+++ b/external_imported/vcpkg/ports/libxmp/vcpkg.json
@@ -0,0 +1,31 @@
+{
+  "name": "libxmp",
+  "version": "4.6.0",
+  "port-version": 1,
+  "description": "Libxmp is a library that renders module files to PCM data.",
+  "homepage": "https://sourceforge.net/projects/xmp/",
+  "license": "LGPL-2.1-or-later",
+  "supports": "!xbox",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
+  "default-features": [
+    "depackers",
+    "prowizard"
+  ],
+  "features": {
+    "depackers": {
+      "description": "Enable archive depackers."
+    },
+    "prowizard": {
+      "description": "Enable ProWizard format loaders."
+    }
+  }
+}
diff --git a/external_imported/vcpkg/ports/libxpm/portfile.cmake b/external_imported/vcpkg/ports/libxpm/portfile.cmake
index 631346d51..10c8f6932 100644
--- a/external_imported/vcpkg/ports/libxpm/portfile.cmake
+++ b/external_imported/vcpkg/ports/libxpm/portfile.cmake
@@ -8,8 +8,8 @@ vcpkg_from_gitlab(
     GITLAB_URL https://gitlab.freedesktop.org/xorg
     OUT_SOURCE_PATH SOURCE_PATH
     REPO lib/libxpm
-    REF libXpm-3.5.14
-    SHA512 1ae8c48b0d928265cfc6baac1286f241f20e70c88d6f9b6881ccccd7f2e290ca0afaf0f3a051ad5526449dec93c6cc41c48bb6e488e29e2baec87238f17f6bcf
+    REF "libXpm-${VERSION}"
+    SHA512 006d5fb2fd951b8857b8d409d65ebe4f819dc51df3bbe933ef9b879a9dc832b0828481c7c0cac453a82a1e81f39990fc49819314a443a1082bdaea6044bb3013
     PATCHES
         remove_strings_h.patch
         fix-dependency-gettext.patch
@@ -47,4 +47,4 @@ endif()
 
 # Handle copyright
 file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-endif()
\ No newline at end of file
+endif()
diff --git a/external_imported/vcpkg/ports/libxpm/vcpkg.json b/external_imported/vcpkg/ports/libxpm/vcpkg.json
index 9169553d2..f34d6b6ae 100644
--- a/external_imported/vcpkg/ports/libxpm/vcpkg.json
+++ b/external_imported/vcpkg/ports/libxpm/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "libxpm",
-  "version": "3.5.14",
+  "version": "3.5.16",
   "description": "XPM format pixmap library",
   "homepage": "https://github.com/freedesktop/libXpm",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/libxslt/portfile.cmake b/external_imported/vcpkg/ports/libxslt/portfile.cmake
index d2ac80d90..6624f6a78 100644
--- a/external_imported/vcpkg/ports/libxslt/portfile.cmake
+++ b/external_imported/vcpkg/ports/libxslt/portfile.cmake
@@ -66,6 +66,15 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libexslt/exsltexports.h" "ifdef LIBEXSLT_STATIC" "if 1")
 endif()
 
+if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libxslt.pc" " -lxslt" " -llibxslt")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libexslt.pc" " -lexslt" " -llibexslt")
+    if(NOT VCPKG_BUILD_TYPE)
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libxslt.pc" " -lxslt" " -llibxslt")
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libexslt.pc" " -lexslt" " -llibexslt")
+        endif()
+endif()
+
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
diff --git a/external_imported/vcpkg/ports/libxslt/vcpkg.json b/external_imported/vcpkg/ports/libxslt/vcpkg.json
index e5b9489b6..d3499b09e 100644
--- a/external_imported/vcpkg/ports/libxslt/vcpkg.json
+++ b/external_imported/vcpkg/ports/libxslt/vcpkg.json
@@ -1,13 +1,16 @@
 {
   "name": "libxslt",
   "version": "1.1.37",
-  "port-version": 1,
+  "port-version": 3,
   "description": "Libxslt is a XSLT library implemented in C for XSLT 1.0 and most of EXSLT",
   "homepage": "https://github.com/GNOME/libxslt",
   "license": null,
   "supports": "!uwp",
   "dependencies": [
-    "libxml2",
+    {
+      "name": "libxml2",
+      "default-features": false
+    },
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/external_imported/vcpkg/ports/libxt/add-missing-process-h.patch b/external_imported/vcpkg/ports/libxt/add-missing-process-h.patch
new file mode 100644
index 000000000..f38db36ce
--- /dev/null
+++ b/external_imported/vcpkg/ports/libxt/add-missing-process-h.patch
@@ -0,0 +1,14 @@
+diff --git a/src/Shell.c b/src/Shell.c
+index fcf10a5..67e24bf 100644
+--- a/src/Shell.c
++++ b/src/Shell.c
+@@ -90,6 +90,9 @@ in this Software without prior written authorization from The Open Group.
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
++#ifdef _WIN32
++#include <process.h>
++#endif // _WIN32
+ 
+ #ifdef EDITRES
+ #include <X11/Xmu/Editres.h>
diff --git a/external_imported/vcpkg/ports/libxt/portfile.cmake b/external_imported/vcpkg/ports/libxt/portfile.cmake
index 50928e36d..a6e3ceebb 100644
--- a/external_imported/vcpkg/ports/libxt/portfile.cmake
+++ b/external_imported/vcpkg/ports/libxt/portfile.cmake
@@ -20,10 +20,12 @@ vcpkg_from_gitlab(
     REF edd70bdfbbd16247e3d9564ca51d864f82626eb7 # 1.2.1
     SHA512  c49876253dfd187e7d56a098d3d992157daefa2c25ee732eaae5818ee04513bedd807d2f265085db2e82c0b1821e152a88fb4998c0002f6ac57204543fe18566
     HEAD_REF master
-    PATCHES windows_build.patch
-            globals.patch
-            getcwd.patch
-            ${PATCHES}
+    PATCHES
+        windows_build.patch
+        globals.patch
+        getcwd.patch
+        add-missing-process-h.patch
+        ${PATCHES}
 ) 
 
 set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"")
diff --git a/external_imported/vcpkg/ports/libxt/vcpkg.json b/external_imported/vcpkg/ports/libxt/vcpkg.json
index 473e3fb82..990299210 100644
--- a/external_imported/vcpkg/ports/libxt/vcpkg.json
+++ b/external_imported/vcpkg/ports/libxt/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "libxt",
   "version": "1.2.1",
+  "port-version": 1,
   "description": "X Toolkit Intrinsics library",
   "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxt",
   "license": null,
diff --git a/external_imported/vcpkg/ports/libyaml/vcpkg.json b/external_imported/vcpkg/ports/libyaml/vcpkg.json
index 06a3e7600..4dd2ec9bf 100644
--- a/external_imported/vcpkg/ports/libyaml/vcpkg.json
+++ b/external_imported/vcpkg/ports/libyaml/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libyaml",
-  "version-string": "0.2.5",
-  "port-version": 3,
+  "version": "0.2.5",
+  "port-version": 4,
   "description": "A C library for parsing and emitting YAML.",
   "homepage": "https://github.com/yaml/libyaml",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/libzen/portfile.cmake b/external_imported/vcpkg/ports/libzen/portfile.cmake
index 7f49cb722..75a7dca39 100644
--- a/external_imported/vcpkg/ports/libzen/portfile.cmake
+++ b/external_imported/vcpkg/ports/libzen/portfile.cmake
@@ -1,23 +1,30 @@
-if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+if(VCPKG_TARGET_IS_WINDOWS)
     vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 endif()
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO MediaArea/ZenLib
-    REF 13b9d3dbd2088390fbdccab32ae4560526389fbc # v0.4.39
-    SHA512 ec63af7ea60be2548d45702518a9b638b4f424044ecaebfbca97d9872b3ecafddc9c59aed4a5bae7bd5bbdffbd543c4ed9e106e5c406ec576a9c0970f0aadcac
+    REF "v${VERSION}"
+    SHA512 4232eb6e73e9b380f6fe2ce3cfeb9fe343936362a35ca8d088c783dc6277332df762d689efe023e3f1418c2e6d2629e0b82ac93df9cce3ae0ab346c2ed1911f1
     HEAD_REF master
 )
 
+vcpkg_find_acquire_program(PKGCONFIG)
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}/Project/CMake"
+    OPTIONS
+        "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}"
+        -DCMAKE_REQUIRE_FIND_PACKAGE_PkgConfig=1
 )
-
 vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(PACKAGE_NAME zenlib CONFIG_PATH share/zenlib)
+vcpkg_cmake_config_fixup(PACKAGE_NAME zenlib)
 vcpkg_fixup_pkgconfig()
+if(NOT VCPKG_BUILD_TYPE AND VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libzen.pc" " -lzen" " -lzend")
+endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
 
-file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/License.txt")
diff --git a/external_imported/vcpkg/ports/libzen/vcpkg.json b/external_imported/vcpkg/ports/libzen/vcpkg.json
index 6b53cd483..69bb33dad 100644
--- a/external_imported/vcpkg/ports/libzen/vcpkg.json
+++ b/external_imported/vcpkg/ports/libzen/vcpkg.json
@@ -1,8 +1,9 @@
 {
   "name": "libzen",
-  "version": "0.4.39",
-  "port-version": 1,
+  "version": "0.4.41",
   "description": "ZenLib is a C++ utility library for easiest cross-platform development",
+  "homepage": "https://github.com/MediaArea/ZenLib",
+  "license": "Zlib",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/libzim/cross-builds.diff b/external_imported/vcpkg/ports/libzim/cross-builds.diff
new file mode 100644
index 000000000..8e3b4679a
--- /dev/null
+++ b/external_imported/vcpkg/ports/libzim/cross-builds.diff
@@ -0,0 +1,45 @@
+diff --git a/meson.build b/meson.build
+index f3e7a27..d946c49 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1,9 +1,9 @@
+ project('libzim', ['c', 'cpp'],
+   version : '9.0.0',
+   license : 'GPL2',
+-  default_options : ['c_std=c11', 'cpp_std=c++17', 'werror=true'])
++  default_options : ['c_std=c11', 'cpp_std=c++17'])
+ 
+-if build_machine.system() != 'windows'
++if host_machine.system() != 'windows' or meson.get_compiler('cpp').get_id() == 'gcc'
+   add_project_arguments('-D_LARGEFILE64_SOURCE=1', '-D_FILE_OFFSET_BITS=64', language: 'cpp')
+ endif
+ 
+@@ -56,8 +56,8 @@ private_conf.set('ENABLE_XAPIAN', xapian_dep.found())
+ public_conf.set('LIBZIM_WITH_XAPIAN', xapian_dep.found())
+ 
+ pkg_requires = ['liblzma', 'libzstd']
+-if build_machine.system() == 'windows'
+-    extra_link_args = ['-lRpcrt4', '-lWs2_32', '-lwinmm', '-licuuc', '-licuin']
++if host_machine.system() == 'windows'
++    extra_link_args = ['-lrpcrt4', '-lws2_32', '-lwinmm']
+     extra_cpp_args = ['-DSORTPP_PASS']
+ else
+     extra_link_args = []
+@@ -65,7 +65,7 @@ else
+ endif
+ 
+ compiler = meson.get_compiler('cpp')
+-if (compiler.get_id() == 'gcc' and build_machine.system() == 'linux') or host_machine.system() == 'freebsd'
++if (compiler.get_id() == 'gcc' and host_machine.system() == 'linux') or host_machine.system() == 'freebsd'
+   # C++ std::thread is implemented using pthread on linux by gcc
+   thread_dep = dependency('threads')
+ else
+@@ -74,6 +74,8 @@ endif
+ 
+ if xapian_dep.found()
+     pkg_requires += ['xapian-core']
++endif
++if true
+     icu_dep = dependency('icu-i18n', static:static_linkage)
+     pkg_requires += ['icu-i18n']
+ else
diff --git a/external_imported/vcpkg/ports/libzim/dllexport.diff b/external_imported/vcpkg/ports/libzim/dllexport.diff
new file mode 100644
index 000000000..212eb9e54
--- /dev/null
+++ b/external_imported/vcpkg/ports/libzim/dllexport.diff
@@ -0,0 +1,16 @@
+diff --git a/include/zim/zim.h b/include/zim/zim.h
+index 80e8596..631cfab 100644
+--- a/include/zim/zim.h
++++ b/include/zim/zim.h
+@@ -35,8 +35,10 @@
+ 
+ #include <zim/zim_config.h>
+ 
+-#if defined(_MSC_VER) && defined(LIBZIM_EXPORT_DLL)
++#if defined(_WIN32) && defined(LIBZIM_EXPORT_DLL)
+     #define LIBZIM_API __declspec(dllexport)
++#elif defined(_WIN32) && defined(LIBZIM_IMPORT_DLL)
++    #define LIBZIM_API __declspec(dllimport)
+ #else
+     #define LIBZIM_API
+ #endif
diff --git a/external_imported/vcpkg/ports/libzim/portfile.cmake b/external_imported/vcpkg/ports/libzim/portfile.cmake
new file mode 100644
index 000000000..c1a751a4b
--- /dev/null
+++ b/external_imported/vcpkg/ports/libzim/portfile.cmake
@@ -0,0 +1,37 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO openzim/libzim
+    REF "${VERSION}"
+    SHA512 55d18535d677d3249c8331ceac1acd4afa650de1f61a0aa3ffc1c98ca2a395bc657c774d01780f1a2c2aedd7d9c5d2e7d9f5e717ed879de84dc6d1be6accfe5e
+    HEAD_REF main
+    PATCHES
+        cross-builds.diff
+        dllexport.diff
+        subdirs.diff
+)
+
+set(EXTRA_OPTIONS "")
+
+if(NOT "xapian" IN_LIST FEATURES)
+    list(APPEND EXTRA_OPTIONS "-Dwith_xapian=false")
+endif()
+
+vcpkg_configure_meson(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+      -Dexamples=false
+      ${EXTRA_OPTIONS}
+)
+
+vcpkg_install_meson()
+
+vcpkg_copy_pdbs()
+
+vcpkg_fixup_pkgconfig()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/zim/zim.h" "defined(LIBZIM_IMPORT_DLL)" "1")
+endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/libzim/subdirs.diff b/external_imported/vcpkg/ports/libzim/subdirs.diff
new file mode 100644
index 000000000..a30a1444f
--- /dev/null
+++ b/external_imported/vcpkg/ports/libzim/subdirs.diff
@@ -0,0 +1,20 @@
+diff --git a/meson.build b/meson.build
+index d946c49..eded01d 100644
+--- a/meson.build
++++ b/meson.build
+@@ -90,6 +90,7 @@ subdir('include')
+ subdir('scripts')
+ subdir('static')
+ subdir('src')
++if false
+ if get_option('examples')
+   subdir('examples')
+ endif
+@@ -97,6 +98,7 @@ subdir('test')
+ if get_option('doc')
+   subdir('docs')
+ endif
++endif
+ 
+ pkg_mod = import('pkgconfig')
+ pkg_mod.generate(libraries : libzim,
diff --git a/external_imported/vcpkg/ports/libzim/vcpkg.json b/external_imported/vcpkg/ports/libzim/vcpkg.json
new file mode 100644
index 000000000..53ab0e0a2
--- /dev/null
+++ b/external_imported/vcpkg/ports/libzim/vcpkg.json
@@ -0,0 +1,25 @@
+{
+  "name": "libzim",
+  "version": "9.0.0",
+  "description": "The Libzim is the reference implementation for the ZIM file format. It's a software library to read and write ZIM files on many systems and architectures. More information about the ZIM format and the openZIM project at https://openzim.org/.",
+  "homepage": "https://github.com/openzim/libzim",
+  "license": "GPL-2.0-or-later",
+  "supports": "!android & !uwp & !xbox",
+  "dependencies": [
+    "icu",
+    "liblzma",
+    {
+      "name": "vcpkg-tool-meson",
+      "host": true
+    },
+    "zstd"
+  ],
+  "features": {
+    "xapian": {
+      "description": "Enable xapian support",
+      "dependencies": [
+        "xapian"
+      ]
+    }
+  }
+}
diff --git a/external_imported/vcpkg/ports/libzip/fix-dependency.patch b/external_imported/vcpkg/ports/libzip/fix-dependency.patch
index c3d0ec294..f2c1a06bd 100644
--- a/external_imported/vcpkg/ports/libzip/fix-dependency.patch
+++ b/external_imported/vcpkg/ports/libzip/fix-dependency.patch
@@ -1,27 +1,14 @@
 diff --git a/libzip-config.cmake.in b/libzip-config.cmake.in
-index 5b9aa55..0723f3c 100644
+index 8061530..81a38bb 100644
 --- a/libzip-config.cmake.in
 +++ b/libzip-config.cmake.in
-@@ -1,8 +1,20 @@
- @PACKAGE_INIT@
+@@ -2,7 +2,7 @@
  
- # only needed for static library, and doesn't work as-is
--#include(CMakeFindDependencyMacro)
--#find_dependency(ZLIB::ZLIB)
-+include(CMakeFindDependencyMacro)
-+if(@ENABLE_BZIP2@)
-+    find_dependency(BZip2)
-+endif()
-+if(@ENABLE_LZMA@)
-+    find_dependency(LibLZMA)
-+endif()
-+if(@ENABLE_ZSTD@)
-+    find_dependency(Zstd)
-+endif()
-+if(@ENABLE_OPENSSL@)
-+    find_dependency(OpenSSL)
-+endif()
-+find_dependency(ZLIB)
- # how to handle the optional dependencies?
- # Provide all our library targets to users.
- include("${CMAKE_CURRENT_LIST_DIR}/libzip-targets.cmake")
+ # We need to supply transitive dependencies if this config is for a static library
+ set(IS_SHARED @BUILD_SHARED_LIBS@)
+-if (NOT IS_SHARED)
++if (1)
+   include(CMakeFindDependencyMacro)
+   set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_LIST_DIR}/modules")
+ 
+ 
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/libzip/portfile.cmake b/external_imported/vcpkg/ports/libzip/portfile.cmake
index 871948315..18b491382 100644
--- a/external_imported/vcpkg/ports/libzip/portfile.cmake
+++ b/external_imported/vcpkg/ports/libzip/portfile.cmake
@@ -1,11 +1,12 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO nih-at/libzip
-    REF 5532f9baa0c44cc5435ad135686a4ea009075b9a #v1.9.2
-    SHA512 1105bc48c8a554a7fce84028197427b02ff53508592889b37e81cc419eb208d91112b98df2bf2d6f5629887e4418230ee36e3bf03c9ae39cdc39cfa90e7e3e7f
+    REF "v${VERSION}"
+    SHA512 1b0bffe579de5d2c52b23075f5351a5670e9f7a364c14a876ca3c490a85c0c9b1ebd9a97e729c5c7e71d496a3a0a8f28505bfadd7d8423954d3547a9a8f63841
     HEAD_REF master
     PATCHES
         fix-dependency.patch
+        use-requires.patch
 )
 
 vcpkg_check_features(
@@ -45,4 +46,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/libzip" "${CURRENT_PACKAGES_DIR
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 # Copy copright information
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/libzip/use-requires.patch b/external_imported/vcpkg/ports/libzip/use-requires.patch
new file mode 100644
index 000000000..3d4debe2d
--- /dev/null
+++ b/external_imported/vcpkg/ports/libzip/use-requires.patch
@@ -0,0 +1,85 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b2e7724..0af7929 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -43,12 +43,14 @@ endif()
+ if(ENABLE_GNUTLS)
+   find_package(Nettle 3.0)
+   find_package(GnuTLS)
++  list(APPEND REQUIRES nettle)
+ endif()
+ if(ENABLE_MBEDTLS)
+   find_package(MbedTLS 1.0)
+ endif()
+ if(ENABLE_OPENSSL)
+   find_package(OpenSSL)
++  list(APPEND REQUIRES openssl)
+ endif()
+ if(WIN32)
+   if(ENABLE_WINDOWS_CRYPTO)
+@@ -191,6 +193,7 @@ int main(int argc, char *argv[]) { }" HAVE_NULLABLE)
+ test_big_endian(WORDS_BIGENDIAN)
+ 
+ find_package(ZLIB 1.1.2 REQUIRED)
++list(APPEND REQUIRES zlib)
+ # so developers on systems where zlib is named differently (Windows, sometimes)
+ # can override the name used in the pkg-config file
+ if (NOT ZLIB_LINK_LIBRARY_NAME)
+@@ -227,6 +230,7 @@ if(ENABLE_BZIP2)
+   else()
+     message(WARNING "-- bzip2 library not found; bzip2 support disabled")
+   endif(BZIP2_FOUND)
++  list(APPEND REQUIRES bzip2)
+ endif(ENABLE_BZIP2)
+ 
+ if(ENABLE_LZMA)
+@@ -236,6 +240,7 @@ if(ENABLE_LZMA)
+   else()
+     message(WARNING "-- lzma library not found; lzma/xz support disabled")
+   endif(LIBLZMA_FOUND)
++  list(APPEND REQUIRES liblzma)
+ endif(ENABLE_LZMA)
+ 
+ if(ENABLE_ZSTD)
+@@ -250,6 +255,7 @@ if(ENABLE_ZSTD)
+   else()
+     message(WARNING "-- zstd library not found; zstandard support disabled")
+   endif(zstd_FOUND)
++  list(APPEND REQUIRES libzstd)
+ endif(ENABLE_ZSTD)
+ 
+ if (COMMONCRYPTO_FOUND)
+@@ -347,15 +353,16 @@ foreach(LIB ${LIBS_PRIVATE})
+   set(LIBS "${LIBS} -l${LIB}")
+ endforeach()
+ STRING(CONCAT zlib_link_name "-l" ${ZLIB_LINK_LIBRARY_NAME})
+-string(REGEX REPLACE "-lBZip2::BZip2" "-lbz2" LIBS ${LIBS})
+-string(REGEX REPLACE "-lLibLZMA::LibLZMA" "-llzma" LIBS ${LIBS})
++string(REGEX REPLACE "-lBZip2::BZip2" "" LIBS ${LIBS})
++string(REGEX REPLACE "-lLibLZMA::LibLZMA" "" LIBS ${LIBS})
+ if(ENABLE_ZSTD)
+-  string(REGEX REPLACE "-l${zstd_TARGET}" "-lzstd" LIBS ${LIBS})
++  string(REGEX REPLACE "-l${zstd_TARGET}" "" LIBS ${LIBS})
+ endif()
+-string(REGEX REPLACE "-lOpenSSL::Crypto" "-lssl -lcrypto" LIBS ${LIBS})
+-string(REGEX REPLACE "-lZLIB::ZLIB" ${zlib_link_name} LIBS ${LIBS})
++string(REGEX REPLACE "-lOpenSSL::Crypto" "" LIBS ${LIBS})
++string(REGEX REPLACE "-lZLIB::ZLIB" "" LIBS ${LIBS})
+ string(REGEX REPLACE "-lGnuTLS::GnuTLS" "-lgnutls" LIBS ${LIBS})
+ string(REGEX REPLACE "-lNettle::Nettle" "-lnettle" LIBS ${LIBS})
++list(JOIN REQUIRES " " REQUIRES)
+ configure_file(libzip.pc.in libzip.pc @ONLY)
+ if(LIBZIP_DO_INSTALL)
+   install(FILES ${PROJECT_BINARY_DIR}/libzip.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+diff --git a/libzip.pc.in b/libzip.pc.in
+index d51b0ab..07b3b50 100644
+--- a/libzip.pc.in
++++ b/libzip.pc.in
+@@ -9,6 +9,7 @@ zipcmp=${bindir}/zipcmp
+ Name: libzip
+ Description: library for handling zip archives
+ Version: @PROJECT_VERSION@
++Requires.private: @REQUIRES@
+ Libs: @PKG_CONFIG_RPATH@ -L${libdir} -lzip
+ Libs.private: @LIBS@
+ Cflags: -I${includedir}
diff --git a/external_imported/vcpkg/ports/libzip/vcpkg.json b/external_imported/vcpkg/ports/libzip/vcpkg.json
index ffbf0bb12..7ff39ae36 100644
--- a/external_imported/vcpkg/ports/libzip/vcpkg.json
+++ b/external_imported/vcpkg/ports/libzip/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "libzip",
-  "version": "1.9.2",
+  "version": "1.10.1",
   "description": "A library for reading, creating, and modifying zip archives.",
   "homepage": "https://github.com/nih-at/libzip",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/libzippp/fix-find-lzma.patch b/external_imported/vcpkg/ports/libzippp/fix-find-lzma.patch
deleted file mode 100644
index bc52cbd8f..000000000
--- a/external_imported/vcpkg/ports/libzippp/fix-find-lzma.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cmake/FindLIBZIP.cmake b/cmake/FindLIBZIP.cmake
-index c51c09a..a32bb13 100644
---- a/cmake/FindLIBZIP.cmake
-+++ b/cmake/FindLIBZIP.cmake
-@@ -50,7 +50,7 @@ if (LIBZIP_FOUND)
-             set_property(TARGET libzip::zip APPEND PROPERTY INTERFACE_LINK_LIBRARIES Nettle::Nettle)
-         endif()
-         if(_have_extra_libs MATCHES "-llzma")
--            find_package(LibLZMA::LibLZMA REQUIRED)
-+            find_package(LibLZMA REQUIRED)
-             set_property(TARGET libzip::zip APPEND PROPERTY INTERFACE_LINK_LIBRARIES LibLZMA::LibLZMA)
-         endif()
-         if(_have_extra_libs MATCHES "-lz")
diff --git a/external_imported/vcpkg/ports/libzippp/portfile.cmake b/external_imported/vcpkg/ports/libzippp/portfile.cmake
index b8968e1f9..5b9c82058 100644
--- a/external_imported/vcpkg/ports/libzippp/portfile.cmake
+++ b/external_imported/vcpkg/ports/libzippp/portfile.cmake
@@ -1,10 +1,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ctabin/libzippp
-    REF 681bac0362b82bba8f28117d8a48dca54f028ee5 #v6.0-1.9.2 with CXX std version c++11
-    SHA512 2f9ab671de2af0e97d5b3fe4f367504ad47f2e1f6df8009aec8e96680f34bf0e3ae5b45ebaea846676b2527d0a5fd31d91c6f62a2bba2867c6010a387ff24150
+    REF 7bc5e5d7de8808acd0a00fc2f993bf9141086c22 #v7.0-1.10.1 with CXX std version c++11
+    SHA512 f84aaab7ccf3d2f90ed1b49e9d71059c045e8aab08bc185a2d63f2ff6ba106c185e7d8938fe653fe96797e9f4f36fb04c12927a4339250ac431eed01ebf900bb
     HEAD_REF master
-    PATCHES fix-find-lzma.patch
 )
 
 vcpkg_check_features( 
diff --git a/external_imported/vcpkg/ports/libzippp/vcpkg.json b/external_imported/vcpkg/ports/libzippp/vcpkg.json
index 97fe8a502..4aa6d9e78 100644
--- a/external_imported/vcpkg/ports/libzippp/vcpkg.json
+++ b/external_imported/vcpkg/ports/libzippp/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "libzippp",
-  "version": "6.0-1.9.2",
+  "version": "7.0-1.10.1",
   "description": "Simple basic C++ wrapper around the libzip library. It is meant to be a portable and easy-to-use library for ZIP handling",
   "homepage": "https://github.com/ctabin/libzippp",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/licensepp/0002-fix-cmake.patch b/external_imported/vcpkg/ports/licensepp/0002-fix-cmake.patch
deleted file mode 100644
index 5f13d03e1..000000000
--- a/external_imported/vcpkg/ports/licensepp/0002-fix-cmake.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 5a7cbbe8423ee3daf533bcc1fefa7d1f1315634c Mon Sep 17 00:00:00 2001
-From: Nicole Mazzuca <mazzucan@outlook.com>
-Date: Wed, 23 Sep 2020 09:43:37 -0700
-Subject: [PATCH 2/2] fix cmake
-
-Remove this patch if https://github.com/amrayn/licensepp/pull/33 is merged
----
- CMakeLists.txt | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b2c39d1..0d49632 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -35,10 +35,8 @@ if (APPLE)
-     endif()
- endif()
- 
--if(MSVC)
--    list (APPEND CMAKE_CXX_FLAGS " -std=c++11 -O3 ")
--else()
--    list (APPEND CMAKE_CXX_FLAGS " -std=c++11 -O3 -Wall -Werror ")
-+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O3 -Wall")
- endif()
- 
- # Check for cryptopp (static)
-@@ -73,6 +71,7 @@ endif()
- set_target_properties (licensepp-lib PROPERTIES
-     VERSION ${LICENSEPP_SOVERSION}
- )
-+target_include_directories(licensepp-lib PUBLIC $<INSTALL_INTERFACE:include>)
- target_link_libraries (licensepp-lib
-     ${CRYPTOPP_LIBRARIES}
- )
--- 
-2.24.3 (Apple Git-128)
-
diff --git a/external_imported/vcpkg/ports/licensepp/0002-fix-compilation-macos.patch b/external_imported/vcpkg/ports/licensepp/0002-fix-compilation-macos.patch
new file mode 100644
index 000000000..3bad0b9f3
--- /dev/null
+++ b/external_imported/vcpkg/ports/licensepp/0002-fix-compilation-macos.patch
@@ -0,0 +1,26 @@
+From b0e09221f5f782e6dc2dedf197eba8064095edcd Mon Sep 17 00:00:00 2001
+From: Michael Migliore <michael.migliore@z-emotion.com>
+Date: Thu, 6 Apr 2023 09:36:17 +0200
+Subject: [PATCH] Fix compilation on macOS
+
+---
+ src/json-object.h | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/src/json-object.h b/src/json-object.h
+index 712e9a0..9764514 100644
+--- a/src/json-object.h
++++ b/src/json-object.h
+@@ -80,12 +80,6 @@ class JsonObject
+         return get<bool>(key, defaultValue);
+     }
+ 
+-    inline const char* getCString(const std::string& key,
+-                                  const char* defaultValue = "") const
+-    {
+-        return getString(key, defaultValue).c_str();
+-    }
+-
+     inline bool hasKey(const std::string& key) const
+     {
+          return m_root.count(key) > 0;
diff --git a/external_imported/vcpkg/ports/licensepp/portfile.cmake b/external_imported/vcpkg/ports/licensepp/portfile.cmake
index c43eee7cf..807841f9f 100644
--- a/external_imported/vcpkg/ports/licensepp/portfile.cmake
+++ b/external_imported/vcpkg/ports/licensepp/portfile.cmake
@@ -3,12 +3,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO amrayn/licensepp
-    REF 0b6d669c0b323be004f73d8c811d38158ce8c0c7
-    SHA512 2161575815d8ff49110d7c2823662ba30d9f1ca2eb6be6dad1ee0807fb3fa9f28483839a133c9d380035254df7c452f8d6fa7f17fd4f29acd8b9bfbbda059291
+    REF e9501da1470a3bd29254975577d806612a3d3e3c
+    SHA512 6f70904d1214036af3891dc54f71ea2052acd8f60c277dbd2a5f3190ce4610771f36108d4d5a123c0e7312aded410d652460018d74586fc4f41b05fabb6100bd
     HEAD_REF master
     PATCHES
         0001-use-old-pem-pack.patch
-        0002-fix-cmake.patch
+        0002-fix-compilation-macos.patch
 )
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/FindCryptoPP.cmake" DESTINATION "${SOURCE_PATH}/cmake")
diff --git a/external_imported/vcpkg/ports/licensepp/vcpkg.json b/external_imported/vcpkg/ports/licensepp/vcpkg.json
index d24f81b57..ecb29ffda 100644
--- a/external_imported/vcpkg/ports/licensepp/vcpkg.json
+++ b/external_imported/vcpkg/ports/licensepp/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "licensepp",
-  "version-date": "2020-05-19",
-  "port-version": 4,
+  "version-date": "2020-11-24",
   "description": "Cross platform software licensing library",
   "homepage": "https://github.com/zuhd-org/licensepp",
   "supports": "!uwp",
diff --git a/external_imported/vcpkg/ports/lightningscanner/portfile.cmake b/external_imported/vcpkg/ports/lightningscanner/portfile.cmake
new file mode 100644
index 000000000..ebb2fc656
--- /dev/null
+++ b/external_imported/vcpkg/ports/lightningscanner/portfile.cmake
@@ -0,0 +1,26 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO localcc/LightningScanner
+    REF v${VERSION}
+    SHA512 fa2aefb6a6097544f578a96592b7b2ff58d5bccac7b10a0ab45fbe87e1204b3cbde5c16c64974e7434ea385727fb150b39080bf809f9698d944f75a6c110fe3c
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DLIGHTNING_SCANNER_INSTALL=ON
+        -DLIGHTNING_SCANNER_BUILD_BENCH=OFF
+        -DLIGHTNING_SCANNER_BUILD_DOCS=OFF
+        -DLIGHTNING_SCANNER_BUILD_TESTS=OFF
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/LightningScanner)
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
diff --git a/external_imported/vcpkg/ports/lightningscanner/usage b/external_imported/vcpkg/ports/lightningscanner/usage
new file mode 100644
index 000000000..2be4d6475
--- /dev/null
+++ b/external_imported/vcpkg/ports/lightningscanner/usage
@@ -0,0 +1,4 @@
+The package lightningscanner is compatible with built-in CMake targets:
+
+    find_package(LightningScanner REQUIRED)
+    target_link_libraries(main PRIVATE LightningScanner::LightningScanner)
diff --git a/external_imported/vcpkg/ports/lightningscanner/vcpkg.json b/external_imported/vcpkg/ports/lightningscanner/vcpkg.json
new file mode 100644
index 000000000..7f8d8c63a
--- /dev/null
+++ b/external_imported/vcpkg/ports/lightningscanner/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "lightningscanner",
+  "version": "1.0.1",
+  "description": "A lightning-fast memory signature/pattern scanner, capable of scanning gigabytes of data per second.",
+  "homepage": "https://localcc.github.io/LightningScanner/",
+  "license": "MIT",
+  "supports": "!arm",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/linalg/portfile.cmake b/external_imported/vcpkg/ports/linalg/portfile.cmake
index 23ae4c83c..27aa89180 100644
--- a/external_imported/vcpkg/ports/linalg/portfile.cmake
+++ b/external_imported/vcpkg/ports/linalg/portfile.cmake
@@ -1,11 +1,13 @@
 #header-only library
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO sgorsten/linalg
-    REF v2.1
-    SHA512 48d8248ea1bca3d4fe35d038690f496cd0c8c9469d76eca684668ce6fef5df0eb9556f9b49e4da90e2c2e8ef475791877aa815c3f9437c097fbfc303134d02d7
+    REF "v${VERSION}"
+    SHA512 736f6ff83fcc4a772ef5ab8e574b0e56aca9fcf2318d92f56f94684ffbd7283540b6496381d52834545b4902147bc67a3afa21ab877bc44bba84471c2eff6862
     HEAD_REF master
 )
 
-configure_file(${SOURCE_PATH}/UNLICENSE ${CURRENT_PACKAGES_DIR}/share/linalg/copyright COPYONLY)
-configure_file(${SOURCE_PATH}/linalg.h ${CURRENT_PACKAGES_DIR}/include/linalg.h COPYONLY)
\ No newline at end of file
+file(INSTALL "${SOURCE_PATH}/linalg.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/UNLICENSE")
diff --git a/external_imported/vcpkg/ports/linalg/vcpkg.json b/external_imported/vcpkg/ports/linalg/vcpkg.json
index 07871bcfd..2b0d2d594 100644
--- a/external_imported/vcpkg/ports/linalg/vcpkg.json
+++ b/external_imported/vcpkg/ports/linalg/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "linalg",
-  "version-string": "2.1",
-  "port-version": 1,
-  "description": "linalg.h is a single header public domain linear algebra library for C++11"
+  "version": "2.2",
+  "description": "linalg.h is a single header public domain linear algebra library for C++11",
+  "homepage": "https://github.com/sgorsten/linalg",
+  "license": "Unlicense"
 }
diff --git a/external_imported/vcpkg/ports/lionkor-commandline/add-install.patch b/external_imported/vcpkg/ports/lionkor-commandline/add-install.patch
index 5b7947373..8d6ce1df1 100644
--- a/external_imported/vcpkg/ports/lionkor-commandline/add-install.patch
+++ b/external_imported/vcpkg/ports/lionkor-commandline/add-install.patch
@@ -1,10 +1,11 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b4db57c..7ace55c 100644
+index b04634b..ba08ef4 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -22,3 +22,5 @@ if(BUILD_EXAMPLES)
-     target_link_libraries(test commandline)
+@@ -44,3 +44,5 @@ if(BUILD_EXAMPLES)
+     set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT commandline_test)
  endif()
  
 +set_target_properties(commandline PROPERTIES PUBLIC_HEADER "commandline.h")
 +install(TARGETS commandline RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib PUBLIC_HEADER DESTINATION include)
+ 
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/lionkor-commandline/portfile.cmake b/external_imported/vcpkg/ports/lionkor-commandline/portfile.cmake
index 51232f1b4..0aab65873 100644
--- a/external_imported/vcpkg/ports/lionkor-commandline/portfile.cmake
+++ b/external_imported/vcpkg/ports/lionkor-commandline/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO lionkor/commandline
-    REF 01434c11aaf82d37a126dc70f5aa02cc523dbbb4
-    SHA512 fb9554c07d13aa4c5d84f8288ad39e67ab302da4b286172e0f8fbc22b351234a83fb60f1c085a238d10477a379fded32302338cbddbe7ee0fdda54c6c4a75593
+    REF v${VERSION}
+    SHA512 55473defd4e3837497c552511fdf0552a7a51a8510363d58f436b657e149241e23439c23622a42cf377bc94c8da502cf75e3ce70331e295520b427328bc0a140
     HEAD_REF master
     PATCHES
         add-install.patch
diff --git a/external_imported/vcpkg/ports/lionkor-commandline/vcpkg.json b/external_imported/vcpkg/ports/lionkor-commandline/vcpkg.json
index f9256896c..a87389507 100644
--- a/external_imported/vcpkg/ports/lionkor-commandline/vcpkg.json
+++ b/external_imported/vcpkg/ports/lionkor-commandline/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "lionkor-commandline",
-  "version-semver": "2.0.0",
+  "version-semver": "2.2.0",
   "description": "A C++ commandline for use in servers and chat software. Provides very simple asynchronous input/output.",
   "homepage": "https://github.com/lionkor/commandline/",
   "license": "MIT",
-  "supports": "!osx & !uwp",
+  "supports": "!uwp",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/live555/CMakeLists.txt b/external_imported/vcpkg/ports/live555/CMakeLists.txt
index 2e306c83a..fa26729c9 100644
--- a/external_imported/vcpkg/ports/live555/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/live555/CMakeLists.txt
@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 3.5)
 project(live555 C CXX)
 
+set(CMAKE_CXX_STANDARD 20)
 include_directories(
     BasicUsageEnvironment/include
     groupsock/include
@@ -16,6 +17,13 @@ if (NOT MSVC)
     add_compile_options(-DSOCKLEN_T=socklen_t)
 endif()
 
+if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
+   add_compile_options(-DBSD=1)
+   add_compile_options(-DHAVE_SOCKADDR_LEN=1)
+   add_compile_options(-DTIME_BASE=int)
+   add_compile_options(-DNEED_XLOCALE_H=1)
+endif()
+
 file(GLOB BASIC_USAGE_ENVIRONMENT_SRCS BasicUsageEnvironment/*.c BasicUsageEnvironment/*.cpp)
 add_library(BasicUsageEnvironment ${BASIC_USAGE_ENVIRONMENT_SRCS})
 
diff --git a/external_imported/vcpkg/ports/live555/fix-RTSPClient.patch b/external_imported/vcpkg/ports/live555/fix-RTSPClient.patch
index f63894e27..bdf36cf9b 100644
--- a/external_imported/vcpkg/ports/live555/fix-RTSPClient.patch
+++ b/external_imported/vcpkg/ports/live555/fix-RTSPClient.patch
@@ -1,13 +1,13 @@
 diff --git a/liveMedia/RTSPClient.cpp b/liveMedia/RTSPClient.cpp
-index 130baa9..8e1ea10 100644
+index 66e0c79..13255af 100644
 --- a/liveMedia/RTSPClient.cpp
 +++ b/liveMedia/RTSPClient.cpp
-@@ -2022,7 +2022,7 @@ int RTSPClient::write(const char* data, unsigned count) {
+@@ -2029,7 +2029,7 @@ int RTSPClient::write(const char* data, unsigned count) {
        if (fOutputTLS->isNeeded) {
  	return fOutputTLS->write(data, count);
        } else {
--	return send(fOutputSocketNum, data, count, 0);
-+	return send(fOutputSocketNum, (const char *)data, count, 0);
+-	return send(fOutputSocketNum, data, count, MSG_NOSIGNAL);
++	return send(fOutputSocketNum, (const char *)data, count, MSG_NOSIGNAL);
        }
  }
  
diff --git a/external_imported/vcpkg/ports/live555/fix_operator_overload.patch b/external_imported/vcpkg/ports/live555/fix_operator_overload.patch
new file mode 100644
index 000000000..09206185c
--- /dev/null
+++ b/external_imported/vcpkg/ports/live555/fix_operator_overload.patch
@@ -0,0 +1,13 @@
+diff --git a/liveMedia/MPEGVideoStreamFramer.cpp b/liveMedia/MPEGVideoStreamFramer.cpp
+index 59c4656..a705e68 100644
+--- a/liveMedia/MPEGVideoStreamFramer.cpp
++++ b/liveMedia/MPEGVideoStreamFramer.cpp
+@@ -129,7 +129,7 @@ void MPEGVideoStreamFramer
+     fPictureTimeBase = fFrameRate == 0.0 ? 0.0 : tc.pictures/fFrameRate;
+     fTcSecsBase = (((tc.days*24)+tc.hours)*60+tc.minutes)*60+tc.seconds;
+     fHaveSeenFirstTimeCode = True;
+-  } else if (fCurGOPTimeCode == fPrevGOPTimeCode) {
++  } else if (fCurGOPTimeCode.TimeCode::operator==(fPrevGOPTimeCode)) {
+     // The time code has not changed since last time.  Adjust for this:
+     fPicturesAdjustment += picturesSinceLastGOP;
+   } else {
diff --git a/external_imported/vcpkg/ports/live555/portfile.cmake b/external_imported/vcpkg/ports/live555/portfile.cmake
index 1dce70ce7..f79d5fcdb 100644
--- a/external_imported/vcpkg/ports/live555/portfile.cmake
+++ b/external_imported/vcpkg/ports/live555/portfile.cmake
@@ -1,9 +1,9 @@
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://live555.com/liveMedia/public/live.2023.01.19.tar.gz"
-    FILENAME "live.2023.01.19.tar.gz"
-    SHA512 155c38097d37864978d6b68bf0a7268a9cc88160ebbe679ca5654bd925c5400ef5f74aa6307f53c9584a4611d914d0c8edd275b66b7ca9a66be6591a5b5a8f4f
+    URLS "http://live555.com/liveMedia/public/live.2023.11.30.tar.gz"
+    FILENAME "live.2023.11.30.tar.gz"
+    SHA512 c91703197448f65d63a8a6e07597791da1ee63d3b59a0809454468a3869d86e21533c7fc434d0178a179d5a2e0e5614539e47daad813fbbe7468028419026892
 )
 
 vcpkg_extract_source_archive(
@@ -11,6 +11,7 @@ vcpkg_extract_source_archive(
     ARCHIVE "${ARCHIVE}"
     PATCHES
         fix-RTSPClient.patch
+        fix_operator_overload.patch
 )
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
diff --git a/external_imported/vcpkg/ports/live555/vcpkg.json b/external_imported/vcpkg/ports/live555/vcpkg.json
index f37e36ed5..65aaf3d70 100644
--- a/external_imported/vcpkg/ports/live555/vcpkg.json
+++ b/external_imported/vcpkg/ports/live555/vcpkg.json
@@ -1,9 +1,11 @@
 {
   "name": "live555",
-  "version-date": "2023-01-19",
+  "version-date": "2023-11-30",
+  "port-version": 1,
   "description": "A complete RTSP server application",
   "homepage": "http://www.live555.com/liveMedia",
   "license": "GPL-3.0-or-later",
+  "supports": "!xbox",
   "dependencies": [
     "openssl",
     {
diff --git a/external_imported/vcpkg/ports/llfio/portfile.cmake b/external_imported/vcpkg/ports/llfio/portfile.cmake
index 1722bb977..f24881af5 100644
--- a/external_imported/vcpkg/ports/llfio/portfile.cmake
+++ b/external_imported/vcpkg/ports/llfio/portfile.cmake
@@ -8,8 +8,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ned14/llfio
-    REF b588deb7593d62e3afc025f85477d09b8012fb90
-    SHA512 47b43c716406d2847b16c33730376dc2a98ad8d079319387087ba4b37fdf5623c660fc53c92e2f90995a877001a7a739985d15d0b5133e079254e2d85ba5d8e4
+    REF aa2be6c0db56b4164837d3bc20938785dea7419d
+    SHA512 37ebb7ad87cd5c6eedad25221ee34809587fd18245b3c6af56fa64f165d46e826310c66f61ad7e1ab6bfab9cf9331dc51ea08389b9adea11b1225f3fc63f0240
     HEAD_REF develop
     PATCHES
 )
@@ -17,8 +17,8 @@ vcpkg_from_github(
 vcpkg_from_github(
     OUT_SOURCE_PATH NTKEC_SOURCE_PATH
     REPO ned14/ntkernel-error-category
-    REF bbd44623594142155d49bd3ce8820d3cf9da1e1e
-    SHA512 589d3bc7bca98ca8d05ce9f5cf009dd98b8884bdf3739582f2f6cbf5a324ce95007ea041450ed935baa4a401b4a0242c181fb6d2dcf7ad91587d75f05491f50e
+    REF 278b90e2c7bb07e70d155ad8c7b904188280b7dc
+    SHA512 a0e35fb196085012da0299d0dc456e70f4d4044144bc720f24c9a0ac1483724c137ef89740dc65821d135ca070650775a6802c0b21b24703a93d4ef60a30ffdb
     HEAD_REF master
 )
 
@@ -35,7 +35,7 @@ file(RENAME "${NTKEC_SOURCE_PATH}" "${SOURCE_PATH}/include/llfio/ntkernel-error-
 set(extra_config)
 # cmake does not correctly set CMAKE_SYSTEM_PROCESSOR when targeting ARM on Windows
 if(VCPKG_TARGET_IS_WINDOWS AND (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64"))
-  list(APPEND extra_config -DLLFIO_ASSUME_CROSS_COMPILING=On)
+  list(APPEND extra_config -DLLFIO_ASSUME_CROSS_COMPILING=ON)
 endif()
 # setting CMAKE_CXX_STANDARD here to prevent llfio from messing with compiler flags
 # the cmake package config requires said C++ standard target transitively via quickcpplib
@@ -57,14 +57,15 @@ endif()
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-        -DPROJECT_IS_DEPENDENCY=On
-        -Dquickcpplib_DIR=${CURRENT_INSTALLED_DIR}/share/quickcpplib
+        -Dllfio_IS_DEPENDENCY=On
+        "-DCMAKE_PREFIX_PATH=${CURRENT_INSTALLED_DIR}"
         ${LLFIO_FEATURE_OPTIONS}
         -DLLFIO_FORCE_OPENSSL_OFF=ON
         -DLLFIO_ENABLE_DEPENDENCY_SMOKE_TEST=ON  # Leave this always on to test everything compiles
         -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
         -DCXX_CONCEPTS_FLAGS=
         -DCXX_COROUTINES_FLAGS=
+        -DCMAKE_POLICY_DEFAULT_CMP0091=NEW # MSVC <filesystem> detection fails without this
         ${extra_config}
 )
 
@@ -83,8 +84,9 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/llfio)
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
 
 if("status-code" IN_LIST FEATURES)
-    file(INSTALL "${CURRENT_PORT_DIR}/usage-status-code-${VCPKG_LIBRARY_LINKAGE}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+    set(_USAGE_FEATURE "status-code")
 else()
-    file(INSTALL "${CURRENT_PORT_DIR}/usage-error-code-${VCPKG_LIBRARY_LINKAGE}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+    set(_USAGE_FEATURE "error-code")
 endif()
+file(INSTALL "${CURRENT_PORT_DIR}/usage-${_USAGE_FEATURE}-${VCPKG_LIBRARY_LINKAGE}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME usage)
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/Licence.txt")
diff --git a/external_imported/vcpkg/ports/llfio/vcpkg.json b/external_imported/vcpkg/ports/llfio/vcpkg.json
index da0e059b5..e48433923 100644
--- a/external_imported/vcpkg/ports/llfio/vcpkg.json
+++ b/external_imported/vcpkg/ports/llfio/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "llfio",
-  "version-date": "2023-03-13",
-  "port-version": 1,
+  "version-date": "2023-11-06",
   "maintainers": [
     "Niall Douglas <s_github@nedprod.com>",
     "Henrik Gaßmann <henrik@gassmann.onl>"
diff --git a/external_imported/vcpkg/ports/llgi/fix-cmake-use-vcpkg.patch b/external_imported/vcpkg/ports/llgi/fix-cmake-use-vcpkg.patch
new file mode 100644
index 000000000..d5205d41c
--- /dev/null
+++ b/external_imported/vcpkg/ports/llgi/fix-cmake-use-vcpkg.patch
@@ -0,0 +1,49 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 30cb2da..dbc051b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -232,8 +232,13 @@ if(BUILD_VULKAN_COMPILER OR BUILD_TOOL)
+       spirv-cross-util)
+ 
+   else()
+-    list(APPEND LLGI_THIRDPARTY_INCLUDES ${GLSLANG_INCLUDE_DIR}
+-         ${SPIRVCROSS_INCLUDE_DIR})
++    # from vcpkg
++    find_package(glslang CONFIG REQUIRED)
++    find_package(spirv_cross_core CONFIG REQUIRED)
++    find_package(spirv_cross_glsl CONFIG REQUIRED)
++    find_package(spirv_cross_hlsl CONFIG REQUIRED)
++    find_package(spirv_cross_msl CONFIG REQUIRED)
++    find_package(spirv_cross_cpp CONFIG REQUIRED)
+ 
+   endif()
+ 
+diff --git a/tools/ShaderTranspilerCore/CMakeLists.txt b/tools/ShaderTranspilerCore/CMakeLists.txt
+index 4ce40d4..d4950ce 100644
+--- a/tools/ShaderTranspilerCore/CMakeLists.txt
++++ b/tools/ShaderTranspilerCore/CMakeLists.txt
+@@ -24,6 +24,10 @@ else()
+ 
+ endif()
+ 
++target_link_libraries(ShaderTranspilerCore PUBLIC
++  glslang::glslang glslang::SPIRV glslang::OSDependent glslang::MachineIndependent glslang::GenericCodeGen glslang::glslang-default-resource-limits glslang::OGLCompiler glslang::SPVRemapper glslang::HLSL
++  spirv-cross-cpp spirv-cross-glsl spirv-cross-msl spirv-cross-hlsl
++)
+ if(USE_THIRDPARTY_DIRECTORY)
+   add_dependencies(ShaderTranspilerCore EP_glslang EP_SPIRV-Cross)
+ endif()
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dbc051b..b898b4c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -27,9 +27,6 @@ option(SPIRVCROSS_WITHOUT_INSTALL "Compile with spirv-cross without install"
+        OFF)
+ option(USE_CREATE_COMPILER_FUNCTION "Whether LLGI::CreateCompiler is used." ON)
+ 
+-if(LINUX)
+-  set(BUILD_VULKAN TRUE)
+-endif()
+ 
+ option(USE_MSVC_RUNTIME_LIBRARY_DLL "compile as multithreaded DLL" ON)
+ 
diff --git a/external_imported/vcpkg/ports/llgi/fix-sources.patch b/external_imported/vcpkg/ports/llgi/fix-sources.patch
new file mode 100644
index 000000000..90837de54
--- /dev/null
+++ b/external_imported/vcpkg/ports/llgi/fix-sources.patch
@@ -0,0 +1,14 @@
+diff --git a/tools/ShaderTranspilerCore/ShaderTranspilerCore.h b/tools/ShaderTranspilerCore/ShaderTranspilerCore.h
+index 269afa6..1d1015f 100644
+--- a/tools/ShaderTranspilerCore/ShaderTranspilerCore.h
++++ b/tools/ShaderTranspilerCore/ShaderTranspilerCore.h
+@@ -1,7 +1,7 @@
+ 
+ #pragma once
+-
+-#include <stdint.h>
++#include <cstddef>
++#include <cstdint>
+ 
+ #include "../../src/LLGI.Base.h"
+ #include <memory>
diff --git a/external_imported/vcpkg/ports/llgi/portfile.cmake b/external_imported/vcpkg/ports/llgi/portfile.cmake
new file mode 100644
index 000000000..9ddbcda29
--- /dev/null
+++ b/external_imported/vcpkg/ports/llgi/portfile.cmake
@@ -0,0 +1,52 @@
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO altseed/LLGI
+    REF 8f8510e2dffa1d747ff6ebb0da341198e75291ec
+    SHA512 d521b47f293b90faed28f9648facdfae327c6122ea6391683a08e48558fdf62ce0d3977f78aef3bc276d77ab19fc40ab3cc4d27311dd5a292e0884635fe7c9d3
+    HEAD_REF master
+    PATCHES
+        fix-cmake-use-vcpkg.patch
+        fix-sources.patch
+)
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        vulkan  BUILD_VULKAN
+        vulkan  BUILD_VULKAN_COMPILER
+        tool    BUILD_TOOL
+)
+
+string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" USE_DYNAMIC_RUNTIME)
+
+# linux build requires x11-xcb
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        ${FEATURE_OPTIONS}
+        -DBUILD_TEST=OFF
+        -DBUILD_EXAMPLE=OFF
+        -DUSE_CREATE_COMPILER_FUNCTION=ON
+        -DUSE_THIRDPARTY_DIRECTORY=OFF # prevent ExternalProject_Add
+        -DUSE_MSVC_RUNTIME_LIBRARY_DLL:BOOL=${USE_DYNAMIC_RUNTIME}
+        -DGLSLANG_WITHOUT_INSTALL=OFF
+        -DSPIRVCROSS_WITHOUT_INSTALL=OFF
+    MAYBE_UNUSED_VARIABLES
+        USE_MSVC_RUNTIME_LIBRARY_DLL
+)
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake")
+
+if("tool" IN_LIST FEATURES)
+    vcpkg_copy_tools(TOOL_NAMES ShaderTranspiler AUTO_CLEAN)
+endif()
+
+file(REMOVE_RECURSE
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/debug/share"
+    "${CURRENT_PACKAGES_DIR}/debug/bin"
+    "${CURRENT_PACKAGES_DIR}/bin"
+)
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/llgi/vcpkg.json b/external_imported/vcpkg/ports/llgi/vcpkg.json
new file mode 100644
index 000000000..8bc8e525b
--- /dev/null
+++ b/external_imported/vcpkg/ports/llgi/vcpkg.json
@@ -0,0 +1,35 @@
+{
+  "name": "llgi",
+  "version-date": "2023-12-19",
+  "homepage": "https://github.com/altseed/LLGI",
+  "license": null,
+  "supports": "!(uwp | android)",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
+  "features": {
+    "tool": {
+      "description": "Build ShaderTranspiler",
+      "dependencies": [
+        "glslang",
+        "spirv-cross"
+      ]
+    },
+    "vulkan": {
+      "description": "Build vulkan modules",
+      "supports": "windows | linux",
+      "dependencies": [
+        "glslang",
+        "spirv-cross",
+        "vulkan"
+      ]
+    }
+  }
+}
diff --git a/external_imported/vcpkg/ports/llhttp/fix-usage.patch b/external_imported/vcpkg/ports/llhttp/fix-usage.patch
new file mode 100644
index 000000000..3118ea1d3
--- /dev/null
+++ b/external_imported/vcpkg/ports/llhttp/fix-usage.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bdef288..72555c6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -77,6 +77,10 @@ function(config_library target)
+     NAMESPACE llhttp::
+     DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/llhttp
+   )
++  target_include_directories(${target}
++    PRIVATE include ${CMAKE_CURRENT_BINARY_DIR}
++    INTERFACE $<INSTALL_INTERFACE:include>
++  )
+ endfunction(config_library target)
+ 
+ if(BUILD_SHARED_LIBS)
diff --git a/external_imported/vcpkg/ports/llhttp/portfile.cmake b/external_imported/vcpkg/ports/llhttp/portfile.cmake
index 03ce69a11..0e85e7e39 100644
--- a/external_imported/vcpkg/ports/llhttp/portfile.cmake
+++ b/external_imported/vcpkg/ports/llhttp/portfile.cmake
@@ -1,8 +1,12 @@
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO nodejs/llhttp
-    REF refs/tags/release/v8.1.0
-    SHA512 3b79555f734a6a200a790f04f10be6d3ce5bd999c027a43c0900bb408e7d64be38fe4bbe9f15e57e389f07ba26b8089fc6ba5eef3b497742484f0719e92e9722
+    REF refs/tags/release/v${VERSION}
+    SHA512 971ec2cb403942bc43e4b67a6dd392bca10d4233a25f453550d9f2bfbcb9572df309bde77af030e94e2af840aec1d96de164df0cbb1183bb2f5623e8fcf3162c
+    PATCHES
+        fix-usage.patch
 )
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" LLHTTP_BUILD_STATIC)
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LLHTTP_BUILD_SHARED)
diff --git a/external_imported/vcpkg/ports/llhttp/vcpkg.json b/external_imported/vcpkg/ports/llhttp/vcpkg.json
index e97f3cc11..af1177215 100644
--- a/external_imported/vcpkg/ports/llhttp/vcpkg.json
+++ b/external_imported/vcpkg/ports/llhttp/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "llhttp",
-  "version": "8.1.0",
-  "port-version": 1,
+  "version": "9.1.3",
   "description": "Port of http_parser to llparse.",
   "homepage": "https://github.com/nodejs/llhttp",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/llvm/0001-fix-install-package-dir.patch b/external_imported/vcpkg/ports/llvm/0001-fix-install-package-dir.patch
new file mode 100644
index 000000000..6bbe1af08
--- /dev/null
+++ b/external_imported/vcpkg/ports/llvm/0001-fix-install-package-dir.patch
@@ -0,0 +1,13 @@
+ openmp/tools/Modules/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/openmp/tools/Modules/CMakeLists.txt b/openmp/tools/Modules/CMakeLists.txt
+index 22d818eea72d..75aacc4468d4 100644
+--- a/openmp/tools/Modules/CMakeLists.txt
++++ b/openmp/tools/Modules/CMakeLists.txt
+@@ -12,4 +12,4 @@
+ 
+ 
+ install(FILES "FindOpenMPTarget.cmake"
+-              DESTINATION "${OPENMP_INSTALL_LIBDIR}/cmake/openmp")
++              DESTINATION "share/openmp")
diff --git a/external_imported/vcpkg/ports/llvm/0002-fix-install-paths.patch b/external_imported/vcpkg/ports/llvm/0002-fix-install-paths.patch
deleted file mode 100644
index c5a2885f4..000000000
--- a/external_imported/vcpkg/ports/llvm/0002-fix-install-paths.patch
+++ /dev/null
@@ -1,161 +0,0 @@
- clang/cmake/modules/CMakeLists.txt              | 4 ++--
- compiler-rt/cmake/Modules/CompilerRTUtils.cmake | 2 +-
- flang/cmake/modules/CMakeLists.txt              | 4 ++--
- lld/cmake/modules/CMakeLists.txt                | 4 ++--
- llvm/cmake/modules/AddLLVM.cmake                | 2 +-
- llvm/cmake/modules/CMakeLists.txt               | 2 +-
- mlir/cmake/modules/CMakeLists.txt               | 4 ++--
- mlir/test/CMakeLists.txt                        | 2 +-
- openmp/tools/Modules/CMakeLists.txt             | 2 +-
- polly/cmake/CMakeLists.txt                      | 4 ++--
- 10 files changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/clang/cmake/modules/CMakeLists.txt b/clang/cmake/modules/CMakeLists.txt
-index c6f6ce9fe5d6..fc886b23a1a8 100644
---- a/clang/cmake/modules/CMakeLists.txt
-+++ b/clang/cmake/modules/CMakeLists.txt
-@@ -5,11 +5,11 @@ include(FindPrefixFromConfig)
- # Generate a list of CMake library targets so that other CMake projects can
- # link against them. LLVM calls its version of this file LLVMExports.cmake, but
- # the usual CMake convention seems to be ${Project}Targets.cmake.
--set(CLANG_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/clang)
-+set(CLANG_INSTALL_PACKAGE_DIR share/clang)
- set(clang_cmake_builddir "${CMAKE_BINARY_DIR}/${CLANG_INSTALL_PACKAGE_DIR}")
- 
- # Keep this in sync with llvm/cmake/CMakeLists.txt!
--set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm)
-+set(LLVM_INSTALL_PACKAGE_DIR share/llvm)
- set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}")
- 
- get_property(CLANG_EXPORTS GLOBAL PROPERTY CLANG_EXPORTS)
-diff --git a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake
-index 052095801aae..f3402793b60c 100644
---- a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake
-+++ b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake
-@@ -376,7 +376,7 @@ macro(load_llvm_config)
-       file(TO_CMAKE_PATH ${LLVM_CMAKE_DIR_FROM_LLVM_CONFIG} LLVM_CMAKE_DIR)
-     else()
-       file(TO_CMAKE_PATH ${LLVM_BINARY_DIR} LLVM_BINARY_DIR_CMAKE_STYLE)
--      set(LLVM_CMAKE_DIR "${LLVM_BINARY_DIR_CMAKE_STYLE}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm")
-+      set(LLVM_CMAKE_DIR "${LLVM_BINARY_DIR_CMAKE_STYLE}/share/llvm")
-     endif()
- 
-     set(LLVM_CMAKE_INCLUDE_FILE "${LLVM_CMAKE_DIR}/LLVMConfig.cmake")
-diff --git a/flang/cmake/modules/CMakeLists.txt b/flang/cmake/modules/CMakeLists.txt
-index 170568c80dde..1bf6d6a829e2 100644
---- a/flang/cmake/modules/CMakeLists.txt
-+++ b/flang/cmake/modules/CMakeLists.txt
-@@ -4,11 +4,11 @@ include(FindPrefixFromConfig)
- # Generate a list of CMake library targets so that other CMake projects can
- # link against them. LLVM calls its version of this file LLVMExports.cmake, but
- # the usual CMake convention seems to be ${Project}Targets.cmake.
--set(FLANG_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/flang)
-+set(FLANG_INSTALL_PACKAGE_DIR share/flang)
- set(flang_cmake_builddir "${CMAKE_BINARY_DIR}/${FLANG_INSTALL_PACKAGE_DIR}")
- 
- # Keep this in sync with llvm/cmake/CMakeLists.txt!
--set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm)
-+set(LLVM_INSTALL_PACKAGE_DIR share/llvm)
- set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}")
- 
- get_property(FLANG_EXPORTS GLOBAL PROPERTY FLANG_EXPORTS)
-diff --git a/lld/cmake/modules/CMakeLists.txt b/lld/cmake/modules/CMakeLists.txt
-index 760c9d5f8d87..acd8a65808f5 100644
---- a/lld/cmake/modules/CMakeLists.txt
-+++ b/lld/cmake/modules/CMakeLists.txt
-@@ -4,11 +4,11 @@ include(FindPrefixFromConfig)
- # Generate a list of CMake library targets so that other CMake projects can
- # link against them. LLVM calls its version of this file LLVMExports.cmake, but
- # the usual CMake convention seems to be ${Project}Targets.cmake.
--set(LLD_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/lld)
-+set(LLD_INSTALL_PACKAGE_DIR share/lld)
- set(lld_cmake_builddir "${CMAKE_BINARY_DIR}/${LLD_INSTALL_PACKAGE_DIR}")
- 
- # Keep this in sync with llvm/cmake/CMakeLists.txt!
--set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm)
-+set(LLVM_INSTALL_PACKAGE_DIR share/llvm)
- set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}")
- 
- get_property(LLD_EXPORTS GLOBAL PROPERTY LLD_EXPORTS)
-diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake
-index 37bc98f9e021..7cbfa2a9a577 100644
---- a/llvm/cmake/modules/AddLLVM.cmake
-+++ b/llvm/cmake/modules/AddLLVM.cmake
-@@ -1049,7 +1049,7 @@ function(process_llvm_pass_plugins)
- 
-       ## Part 1: Extension header to be included whenever we need extension
-       #  processing.
--      set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm)
-+      set(LLVM_INSTALL_PACKAGE_DIR share/llvm)
-       set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}")
-       file(WRITE
-           "${llvm_cmake_builddir}/LLVMConfigExtensions.cmake"
-diff --git a/llvm/cmake/modules/CMakeLists.txt b/llvm/cmake/modules/CMakeLists.txt
-index cea0c1df0a14..639c5422b04a 100644
---- a/llvm/cmake/modules/CMakeLists.txt
-+++ b/llvm/cmake/modules/CMakeLists.txt
-@@ -2,7 +2,7 @@ include(ExtendPath)
- include(LLVMDistributionSupport)
- include(FindPrefixFromConfig)
- 
--set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm)
-+set(LLVM_INSTALL_PACKAGE_DIR share/llvm)
- set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}")
- 
- # First for users who use an installed LLVM, create the LLVMExports.cmake file.
-diff --git a/mlir/cmake/modules/CMakeLists.txt b/mlir/cmake/modules/CMakeLists.txt
-index d6703993bd74..e2f6cd3ea8cb 100644
---- a/mlir/cmake/modules/CMakeLists.txt
-+++ b/mlir/cmake/modules/CMakeLists.txt
-@@ -5,11 +5,11 @@ include(FindPrefixFromConfig)
- # Generate a list of CMake library targets so that other CMake projects can
- # link against them. LLVM calls its version of this file LLVMExports.cmake, but
- # the usual CMake convention seems to be ${Project}Targets.cmake.
--set(MLIR_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/mlir)
-+set(MLIR_INSTALL_PACKAGE_DIR share/mlir)
- set(mlir_cmake_builddir "${CMAKE_BINARY_DIR}/${MLIR_INSTALL_PACKAGE_DIR}")
- 
- # Keep this in sync with llvm/cmake/CMakeLists.txt!
--set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm)
-+set(LLVM_INSTALL_PACKAGE_DIR share/llvm)
- set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}")
- 
- get_property(MLIR_EXPORTS GLOBAL PROPERTY MLIR_EXPORTS)
-diff --git a/mlir/test/CMakeLists.txt b/mlir/test/CMakeLists.txt
-index 8e44a9c37cf1..f6edc7d77ffd 100644
---- a/mlir/test/CMakeLists.txt
-+++ b/mlir/test/CMakeLists.txt
-@@ -8,7 +8,7 @@ endif()
- # Passed to lit.site.cfg.py.so that the out of tree Standalone dialect test
- # can find MLIR's CMake configuration
- set(MLIR_CMAKE_DIR
--  "${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/mlir")
-+  "${CMAKE_BINARY_DIR}/share/mlir")
- 
- # Passed to lit.site.cfg.py.in to set up the path where to find the libraries
- # for linalg integration tests.
-diff --git a/openmp/tools/Modules/CMakeLists.txt b/openmp/tools/Modules/CMakeLists.txt
-index 22d818eea72d..75aacc4468d4 100644
---- a/openmp/tools/Modules/CMakeLists.txt
-+++ b/openmp/tools/Modules/CMakeLists.txt
-@@ -12,4 +12,4 @@
- 
- 
- install(FILES "FindOpenMPTarget.cmake"
--              DESTINATION "${OPENMP_INSTALL_LIBDIR}/cmake/openmp")
-+              DESTINATION "share/openmp")
-diff --git a/polly/cmake/CMakeLists.txt b/polly/cmake/CMakeLists.txt
-index 7a0190b69df6..cdd3b4f126bb 100644
---- a/polly/cmake/CMakeLists.txt
-+++ b/polly/cmake/CMakeLists.txt
-@@ -3,8 +3,8 @@
- include(ExtendPath)
- include(FindPrefixFromConfig)
- 
--set(LLVM_INSTALL_PACKAGE_DIR "lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm")
--set(POLLY_INSTALL_PACKAGE_DIR "lib${LLVM_LIBDIR_SUFFIX}/cmake/polly")
-+set(LLVM_INSTALL_PACKAGE_DIR "share/llvm")
-+set(POLLY_INSTALL_PACKAGE_DIR "share/polly")
- if (CMAKE_CONFIGURATION_TYPES)
-   set(POLLY_EXPORTS_FILE_NAME "PollyExports-$<LOWER_CASE:$<CONFIG>>.cmake")
- else()
diff --git a/external_imported/vcpkg/ports/llvm/0002-fix-tools-install-dir.patch b/external_imported/vcpkg/ports/llvm/0002-fix-tools-install-dir.patch
new file mode 100644
index 000000000..4d0e5710a
--- /dev/null
+++ b/external_imported/vcpkg/ports/llvm/0002-fix-tools-install-dir.patch
@@ -0,0 +1,213 @@
+ bolt/cmake/modules/AddBOLT.cmake                 | 2 +-
+ clang-tools-extra/clang-tidy/tool/CMakeLists.txt | 2 +-
+ clang-tools-extra/modularize/CMakeLists.txt      | 2 +-
+ clang/cmake/modules/AddClang.cmake               | 2 +-
+ clang/tools/c-index-test/CMakeLists.txt          | 2 +-
+ clang/tools/clang-format/CMakeLists.txt          | 2 +-
+ clang/tools/scan-build-py/CMakeLists.txt         | 4 ++--
+ clang/tools/scan-build/CMakeLists.txt            | 2 +-
+ clang/tools/scan-view/CMakeLists.txt             | 2 +-
+ flang/cmake/modules/AddFlang.cmake               | 2 +-
+ flang/tools/f18/CMakeLists.txt                   | 2 +-
+ flang/tools/flang-driver/CMakeLists.txt          | 2 +-
+ lld/cmake/modules/AddLLD.cmake                   | 2 +-
+ lld/tools/lld/CMakeLists.txt                     | 2 +-
+ lldb/cmake/modules/AddLLDB.cmake                 | 2 +-
+ 15 files changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/bolt/cmake/modules/AddBOLT.cmake b/bolt/cmake/modules/AddBOLT.cmake
+index 1f69b9046320..b0de5186dde4 100644
+--- a/bolt/cmake/modules/AddBOLT.cmake
++++ b/bolt/cmake/modules/AddBOLT.cmake
+@@ -17,7 +17,7 @@ macro(add_bolt_tool name)
+     get_target_export_arg(${name} BOLT export_to_bolttargets)
+     install(TARGETS ${name}
+       ${export_to_bolttargets}
+-      RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++      RUNTIME DESTINATION "${BOLT_TOOLS_INSTALL_DIR}"
+       COMPONENT bolt)
+ 
+     if(NOT LLVM_ENABLE_IDE)
+diff --git a/clang-tools-extra/clang-tidy/tool/CMakeLists.txt b/clang-tools-extra/clang-tidy/tool/CMakeLists.txt
+index 3ce552872015..ce5a899ebe6d 100644
+--- a/clang-tools-extra/clang-tidy/tool/CMakeLists.txt
++++ b/clang-tools-extra/clang-tidy/tool/CMakeLists.txt
+@@ -64,6 +64,6 @@ install(PROGRAMS clang-tidy-diff.py
+   DESTINATION "${CMAKE_INSTALL_DATADIR}/clang"
+   COMPONENT clang-tidy)
+ install(PROGRAMS run-clang-tidy.py
+-  DESTINATION "${CMAKE_INSTALL_BINDIR}"
++  DESTINATION "${CLANG_TOOLS_INSTALL_DIR}"
+   COMPONENT clang-tidy
+   RENAME run-clang-tidy)
+diff --git a/clang-tools-extra/modularize/CMakeLists.txt b/clang-tools-extra/modularize/CMakeLists.txt
+index 28635ca1089d..4516c8fb7ad0 100644
+--- a/clang-tools-extra/modularize/CMakeLists.txt
++++ b/clang-tools-extra/modularize/CMakeLists.txt
+@@ -24,5 +24,5 @@ clang_target_link_libraries(modularize
+   )
+ 
+ install(TARGETS modularize
+-        RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++        RUNTIME DESTINATION "${CLANG_TOOLS_INSTALL_DIR}"
+         COMPONENT clang-extras)
+diff --git a/clang/cmake/modules/AddClang.cmake b/clang/cmake/modules/AddClang.cmake
+index 75b0080f6715..46e32ddbe0cd 100644
+--- a/clang/cmake/modules/AddClang.cmake
++++ b/clang/cmake/modules/AddClang.cmake
+@@ -169,7 +169,7 @@ macro(add_clang_tool name)
+       get_target_export_arg(${name} Clang export_to_clangtargets)
+       install(TARGETS ${name}
+         ${export_to_clangtargets}
+-        RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++        RUNTIME DESTINATION "${CLANG_TOOLS_INSTALL_DIR}"
+         COMPONENT ${name})
+ 
+       if(NOT LLVM_ENABLE_IDE)
+diff --git a/clang/tools/c-index-test/CMakeLists.txt b/clang/tools/c-index-test/CMakeLists.txt
+index 0ae1b4e55244..7774cd27afcd 100644
+--- a/clang/tools/c-index-test/CMakeLists.txt
++++ b/clang/tools/c-index-test/CMakeLists.txt
+@@ -49,7 +49,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
+     set_property(TARGET c-index-test APPEND PROPERTY INSTALL_RPATH
+        "@executable_path/../../lib")
+   else()
+-    set(INSTALL_DESTINATION "${CMAKE_INSTALL_BINDIR}")
++    set(INSTALL_DESTINATION "${CLANG_TOOLS_INSTALL_DIR}")
+   endif()
+ 
+   install(TARGETS c-index-test
+diff --git a/clang/tools/clang-format/CMakeLists.txt b/clang/tools/clang-format/CMakeLists.txt
+index 30c93f8667c8..5c6f87f62e8e 100644
+--- a/clang/tools/clang-format/CMakeLists.txt
++++ b/clang/tools/clang-format/CMakeLists.txt
+@@ -36,5 +36,5 @@ install(FILES clang-format.py
+   DESTINATION "${CMAKE_INSTALL_DATADIR}/clang"
+   COMPONENT clang-format)
+ install(PROGRAMS git-clang-format
+-  DESTINATION "${CMAKE_INSTALL_BINDIR}"
++  DESTINATION "${CLANG_TOOLS_INSTALL_DIR}"
+   COMPONENT clang-format)
+diff --git a/clang/tools/scan-build-py/CMakeLists.txt b/clang/tools/scan-build-py/CMakeLists.txt
+index 3aca22c0b0a8..a8283219c99f 100644
+--- a/clang/tools/scan-build-py/CMakeLists.txt
++++ b/clang/tools/scan-build-py/CMakeLists.txt
+@@ -43,7 +43,7 @@ foreach(BinFile ${BinFiles})
+                          ${CMAKE_BINARY_DIR}/bin/scan-build-py
+                        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/scan-build)
+     install (PROGRAMS "bin/scan-build"
+-             DESTINATION "${CMAKE_INSTALL_BINDIR}"
++             DESTINATION "${CLANG_TOOLS_INSTALL_DIR}"
+              RENAME scan-build-py
+              COMPONENT scan-build-py)
+     list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/scan-build-py)
+@@ -56,7 +56,7 @@ foreach(BinFile ${BinFiles})
+                          ${CMAKE_BINARY_DIR}/bin/
+                        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile})
+     install(PROGRAMS bin/${BinFile}
+-            DESTINATION "${CMAKE_INSTALL_BINDIR}"
++            DESTINATION "${CLANG_TOOLS_INSTALL_DIR}"
+             COMPONENT scan-build-py)
+     list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile})
+   endif()
+diff --git a/clang/tools/scan-build/CMakeLists.txt b/clang/tools/scan-build/CMakeLists.txt
+index ef687b0e90a1..47f31efc9174 100644
+--- a/clang/tools/scan-build/CMakeLists.txt
++++ b/clang/tools/scan-build/CMakeLists.txt
+@@ -47,7 +47,7 @@ if(CLANG_INSTALL_SCANBUILD)
+                        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile})
+     list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile})
+     install(PROGRAMS bin/${BinFile}
+-            DESTINATION "${CMAKE_INSTALL_BINDIR}"
++            DESTINATION "${CLANG_TOOLS_INSTALL_DIR}"
+             COMPONENT scan-build)
+   endforeach()
+ 
+diff --git a/clang/tools/scan-view/CMakeLists.txt b/clang/tools/scan-view/CMakeLists.txt
+index 07aec76ee66f..55a945bb278d 100644
+--- a/clang/tools/scan-view/CMakeLists.txt
++++ b/clang/tools/scan-view/CMakeLists.txt
+@@ -20,7 +20,7 @@ if(CLANG_INSTALL_SCANVIEW)
+                        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile})
+     list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile})
+     install(PROGRAMS bin/${BinFile}
+-            DESTINATION "${CMAKE_INSTALL_BINDIR}"
++            DESTINATION "${CLANG_TOOLS_INSTALL_DIR}"
+             COMPONENT scan-view)
+   endforeach()
+ 
+diff --git a/flang/cmake/modules/AddFlang.cmake b/flang/cmake/modules/AddFlang.cmake
+index 41ce8738e7bf..d9659c4cf53a 100644
+--- a/flang/cmake/modules/AddFlang.cmake
++++ b/flang/cmake/modules/AddFlang.cmake
+@@ -115,7 +115,7 @@ macro(add_flang_tool name)
+     get_target_export_arg(${name} Flang export_to_flangtargets)
+     install(TARGETS ${name}
+       ${export_to_flangtargets}
+-      RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++      RUNTIME DESTINATION "${FLANG_TOOLS_INSTALL_DIR}"
+       COMPONENT ${name})
+ 
+     if(NOT LLVM_ENABLE_IDE)
+diff --git a/flang/tools/f18/CMakeLists.txt b/flang/tools/f18/CMakeLists.txt
+index d7538feef121..ec8b7737ee22 100644
+--- a/flang/tools/f18/CMakeLists.txt
++++ b/flang/tools/f18/CMakeLists.txt
+@@ -75,7 +75,7 @@ if (NOT WIN32)
+     @ONLY
+   )
+   add_custom_target(flang-to-external-fc ALL DEPENDS ${CMAKE_BINARY_DIR}/bin/flang-to-external-fc)
+-  install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang-to-external-fc DESTINATION "${CMAKE_INSTALL_BINDIR}")
++  install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang-to-external-fc DESTINATION "${FLANG_TOOLS_INSTALL_DIR}")
+ endif()
+ 
+ # TODO Move this to a more suitable location
+diff --git a/flang/tools/flang-driver/CMakeLists.txt b/flang/tools/flang-driver/CMakeLists.txt
+index 3ce8b407450d..6b2e2b0dc33a 100644
+--- a/flang/tools/flang-driver/CMakeLists.txt
++++ b/flang/tools/flang-driver/CMakeLists.txt
+@@ -43,4 +43,4 @@ if(FLANG_PLUGIN_SUPPORT)
+   export_executable_symbols_for_plugins(flang-new)
+ endif()
+ 
+-install(TARGETS flang-new DESTINATION "${CMAKE_INSTALL_BINDIR}")
++install(TARGETS flang-new DESTINATION "${FLANG_TOOLS_INSTALL_DIR}")
+diff --git a/lld/cmake/modules/AddLLD.cmake b/lld/cmake/modules/AddLLD.cmake
+index d3924f7243d4..318b41b73705 100644
+--- a/lld/cmake/modules/AddLLD.cmake
++++ b/lld/cmake/modules/AddLLD.cmake
+@@ -47,7 +47,7 @@ macro(add_lld_tool name)
+     get_target_export_arg(${name} LLD export_to_lldtargets)
+     install(TARGETS ${name}
+       ${export_to_lldtargets}
+-      RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++      RUNTIME DESTINATION "${LLD_TOOLS_INSTALL_DIR}"
+       COMPONENT ${name})
+ 
+     if(NOT CMAKE_CONFIGURATION_TYPES)
+diff --git a/lld/tools/lld/CMakeLists.txt b/lld/tools/lld/CMakeLists.txt
+index 12628395680b..ee58ed439a3a 100644
+--- a/lld/tools/lld/CMakeLists.txt
++++ b/lld/tools/lld/CMakeLists.txt
+@@ -29,7 +29,7 @@ lld_target_link_libraries(lld
+   )
+ 
+ install(TARGETS lld
+-  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
++  RUNTIME DESTINATION "${LLD_TOOLS_INSTALL_DIR}")
+ 
+ if(NOT LLD_SYMLINKS_TO_CREATE)
+   set(LLD_SYMLINKS_TO_CREATE
+diff --git a/lldb/cmake/modules/AddLLDB.cmake b/lldb/cmake/modules/AddLLDB.cmake
+index d47a30f5e109..f0bbc0e50627 100644
+--- a/lldb/cmake/modules/AddLLDB.cmake
++++ b/lldb/cmake/modules/AddLLDB.cmake
+@@ -216,7 +216,7 @@ function(add_lldb_executable name)
+   endif()
+ 
+   if(ARG_GENERATE_INSTALL)
+-    set(install_dest bin)
++    set(install_dest "${LLVM_TOOLS_INSTALL_DIR}")
+     if(ARG_INSTALL_PREFIX)
+       set(install_dest ${ARG_INSTALL_PREFIX})
+     endif()
diff --git a/external_imported/vcpkg/ports/llvm/0003-fix-llvm-config.patch b/external_imported/vcpkg/ports/llvm/0003-fix-llvm-config.patch
new file mode 100644
index 000000000..e1231d578
--- /dev/null
+++ b/external_imported/vcpkg/ports/llvm/0003-fix-llvm-config.patch
@@ -0,0 +1,16 @@
+ llvm/tools/llvm-config/llvm-config.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/llvm/tools/llvm-config/llvm-config.cpp b/llvm/tools/llvm-config/llvm-config.cpp
+index e86eb2b44b10..04e00944f891 100644
+--- a/llvm/tools/llvm-config/llvm-config.cpp
++++ b/llvm/tools/llvm-config/llvm-config.cpp
+@@ -304,7 +304,7 @@ int main(int argc, char **argv) {
+   // bin dir).
+   sys::fs::make_absolute(CurrentPath);
+   CurrentExecPrefix =
+-      sys::path::parent_path(sys::path::parent_path(CurrentPath)).str();
++      sys::path::parent_path(sys::path::parent_path(sys::path::parent_path(CurrentPath))).str();
+ 
+   // Check to see if we are inside a development tree by comparing to possible
+   // locations (prefix style or CMake style).
diff --git a/external_imported/vcpkg/ports/llvm/0004-disable-libomp-aliases.patch b/external_imported/vcpkg/ports/llvm/0004-disable-libomp-aliases.patch
new file mode 100644
index 000000000..6736f2a31
--- /dev/null
+++ b/external_imported/vcpkg/ports/llvm/0004-disable-libomp-aliases.patch
@@ -0,0 +1,32 @@
+ openmp/runtime/src/CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/openmp/runtime/src/CMakeLists.txt b/openmp/runtime/src/CMakeLists.txt
+index bb5822264514..340cef14df89 100644
+--- a/openmp/runtime/src/CMakeLists.txt
++++ b/openmp/runtime/src/CMakeLists.txt
+@@ -215,7 +215,7 @@ endif()
+ set(LIBOMP_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE)
+ 
+ # Add symbolic links to libomp
+-if(NOT WIN32)
++if(0)
+   add_custom_command(TARGET omp POST_BUILD
+     COMMAND ${CMAKE_COMMAND} -E create_symlink ${LIBOMP_LIB_FILE}
+       libgomp${LIBOMP_LIBRARY_SUFFIX}
+@@ -367,6 +367,7 @@ if(WIN32)
+   install(TARGETS omp ${export_to_llvmexports} RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
+   install(TARGETS ${LIBOMP_IMP_LIB_TARGET} ARCHIVE DESTINATION "${OPENMP_INSTALL_LIBDIR}")
+   # Create aliases (regular copies) of the library for backwards compatibility
++  if(0)
+   set(LIBOMP_ALIASES "libiomp5md")
+   foreach(alias IN LISTS LIBOMP_ALIASES)
+     install(CODE "execute_process(COMMAND \"\${CMAKE_COMMAND}\" -E copy \"${LIBOMP_LIB_FILE}\"
+@@ -375,6 +376,7 @@ if(WIN32)
+     install(CODE "execute_process(COMMAND \"\${CMAKE_COMMAND}\" -E copy \"${LIBOMP_IMP_LIB_FILE}\"
+       \"${alias}${CMAKE_STATIC_LIBRARY_SUFFIX}\" WORKING_DIRECTORY \"${outdir}\")")
+   endforeach()
++  endif()
+ else()
+ 
+   install(TARGETS omp ${export_to_llvmexports} ${LIBOMP_INSTALL_KIND} DESTINATION "${OPENMP_INSTALL_LIBDIR}")
diff --git a/external_imported/vcpkg/ports/llvm/0004-fix-dr-1734.patch b/external_imported/vcpkg/ports/llvm/0004-fix-dr-1734.patch
deleted file mode 100644
index 3a2f4a28e..000000000
--- a/external_imported/vcpkg/ports/llvm/0004-fix-dr-1734.patch
+++ /dev/null
@@ -1,17 +0,0 @@
- llvm/include/llvm/Support/type_traits.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/llvm/include/llvm/Support/type_traits.h b/llvm/include/llvm/Support/type_traits.h
-index 7b7d5d991f3f..469b681deea3 100644
---- a/llvm/include/llvm/Support/type_traits.h
-+++ b/llvm/include/llvm/Support/type_traits.h
-@@ -176,7 +176,8 @@ class is_trivially_copyable {
-       (has_deleted_copy_assign || has_trivial_copy_assign) &&
-       (has_deleted_copy_constructor || has_trivial_copy_constructor);
- 
--#ifdef HAVE_STD_IS_TRIVIALLY_COPYABLE
-+// due to DR 1734, a type can be std::is_trivially_copyable but not llvm::is_trivially_copyable
-+#if 0
-   static_assert(value == std::is_trivially_copyable<T>::value,
-                 "inconsistent behavior between llvm:: and std:: implementation of is_trivially_copyable");
- #endif
diff --git a/external_imported/vcpkg/ports/llvm/0005-fix-tools-path.patch b/external_imported/vcpkg/ports/llvm/0005-fix-tools-path.patch
deleted file mode 100644
index 1b1142ec9..000000000
--- a/external_imported/vcpkg/ports/llvm/0005-fix-tools-path.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- llvm/tools/llvm-config/llvm-config.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/llvm/tools/llvm-config/llvm-config.cpp b/llvm/tools/llvm-config/llvm-config.cpp
-index 8ed88f33ead4..3f2d1b98adcc 100644
---- a/llvm/tools/llvm-config/llvm-config.cpp
-+++ b/llvm/tools/llvm-config/llvm-config.cpp
-@@ -305,7 +305,7 @@ int main(int argc, char **argv) {
-   // bin dir).
-   sys::fs::make_absolute(CurrentPath);
-   CurrentExecPrefix =
--      sys::path::parent_path(sys::path::parent_path(CurrentPath)).str();
-+      sys::path::parent_path(sys::path::parent_path(sys::path::parent_path(CurrentPath))).str();
- 
-   // Check to see if we are inside a development tree by comparing to possible
-   // locations (prefix style or CMake style).
diff --git a/external_imported/vcpkg/ports/llvm/0005-remove-numpy.patch b/external_imported/vcpkg/ports/llvm/0005-remove-numpy.patch
new file mode 100644
index 000000000..966af9c31
--- /dev/null
+++ b/external_imported/vcpkg/ports/llvm/0005-remove-numpy.patch
@@ -0,0 +1,16 @@
+ mlir/cmake/modules/MLIRDetectPythonEnv.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mlir/cmake/modules/MLIRDetectPythonEnv.cmake b/mlir/cmake/modules/MLIRDetectPythonEnv.cmake
+index 0a486c1bbb54..c07c55b1e17a 100644
+--- a/mlir/cmake/modules/MLIRDetectPythonEnv.cmake
++++ b/mlir/cmake/modules/MLIRDetectPythonEnv.cmake
+@@ -19,7 +19,7 @@ macro(mlir_configure_python_dev_packages)
+   set(_python_development_component Development.Module)
+ 
+   find_package(Python3 ${LLVM_MINIMUM_PYTHON_VERSION}
+-    COMPONENTS Interpreter ${_python_development_component} NumPy REQUIRED)
++    COMPONENTS Interpreter ${_python_development_component} REQUIRED)
+   unset(_python_development_component)
+   message(STATUS "Found python include dirs: ${Python3_INCLUDE_DIRS}")
+   message(STATUS "Found python libraries: ${Python3_LIBRARIES}")
diff --git a/external_imported/vcpkg/ports/llvm/0006-create-destination-mlir-directory.patch b/external_imported/vcpkg/ports/llvm/0006-create-destination-mlir-directory.patch
new file mode 100644
index 000000000..4950a48c3
--- /dev/null
+++ b/external_imported/vcpkg/ports/llvm/0006-create-destination-mlir-directory.patch
@@ -0,0 +1,16 @@
+ mlir/python/CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/mlir/python/CMakeLists.txt b/mlir/python/CMakeLists.txt
+index 50fbca38a08f..957a6722c21c 100644
+--- a/mlir/python/CMakeLists.txt
++++ b/mlir/python/CMakeLists.txt
+@@ -527,6 +527,8 @@ add_mlir_python_common_capi_library(MLIRPythonCAPI
+     ${_ADDL_TEST_SOURCES}
+ )
+ 
++file(MAKE_DIRECTORY "${MLIR_BINARY_DIR}/python_packages/mlir_core/mlir/_mlir_libs")
++
+ ################################################################################
+ # Custom targets.
+ ################################################################################
diff --git a/external_imported/vcpkg/ports/llvm/0007-fix-compiler-rt-install-path.patch b/external_imported/vcpkg/ports/llvm/0007-fix-compiler-rt-install-path.patch
deleted file mode 100644
index c33dd9963..000000000
--- a/external_imported/vcpkg/ports/llvm/0007-fix-compiler-rt-install-path.patch
+++ /dev/null
@@ -1,44 +0,0 @@
- clang/lib/Headers/CMakeLists.txt       | 2 +-
- clang/runtime/CMakeLists.txt           | 2 +-
- compiler-rt/cmake/base-config-ix.cmake | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/clang/lib/Headers/CMakeLists.txt b/clang/lib/Headers/CMakeLists.txt
-index 078988980c52..795f495b32d6 100644
---- a/clang/lib/Headers/CMakeLists.txt
-+++ b/clang/lib/Headers/CMakeLists.txt
-@@ -234,7 +234,7 @@ set_target_properties(clang-resource-headers PROPERTIES
-   FOLDER "Misc"
-   RUNTIME_OUTPUT_DIRECTORY "${output_dir}")
- 
--set(header_install_dir lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include)
-+set(header_install_dir tools/llvm/lib/clang/${CLANG_VERSION}/include)
- 
- install(
-   FILES ${files} ${generated_files}
-diff --git a/clang/runtime/CMakeLists.txt b/clang/runtime/CMakeLists.txt
-index ca7e17927ee1..87d4282b36ad 100644
---- a/clang/runtime/CMakeLists.txt
-+++ b/clang/runtime/CMakeLists.txt
-@@ -84,7 +84,7 @@ if(LLVM_BUILD_EXTERNAL_COMPILER_RT AND EXISTS ${COMPILER_RT_SRC_ROOT}/)
-                -DLLVM_LIT_ARGS=${LLVM_LIT_ARGS}
-                -DCOMPILER_RT_OUTPUT_DIR=${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION}
-                -DCOMPILER_RT_EXEC_OUTPUT_DIR=${LLVM_RUNTIME_OUTPUT_INTDIR}
--               -DCOMPILER_RT_INSTALL_PATH:PATH=lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}
-+               -DCOMPILER_RT_INSTALL_PATH:PATH=tools/llvm/lib/clang/${CLANG_VERSION}
-                -DCOMPILER_RT_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS}
-                -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
-                -DLLVM_LIBDIR_SUFFIX=${LLVM_LIBDIR_SUFFIX}
-diff --git a/compiler-rt/cmake/base-config-ix.cmake b/compiler-rt/cmake/base-config-ix.cmake
-index d7b0124f3546..55e515cb1c7a 100644
---- a/compiler-rt/cmake/base-config-ix.cmake
-+++ b/compiler-rt/cmake/base-config-ix.cmake
-@@ -44,7 +44,7 @@ if (LLVM_TREE_AVAILABLE)
-   # Setup the paths where compiler-rt runtimes and headers should be stored.
-   set(COMPILER_RT_OUTPUT_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION})
-   set(COMPILER_RT_EXEC_OUTPUT_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR})
--  set(COMPILER_RT_INSTALL_PATH lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION})
-+  set(COMPILER_RT_INSTALL_PATH tools/llvm/lib/clang/${CLANG_VERSION})
-   option(COMPILER_RT_INCLUDE_TESTS "Generate and build compiler-rt unit tests."
-          ${LLVM_INCLUDE_TESTS})
-   option(COMPILER_RT_ENABLE_WERROR "Fail and stop if warning is triggered"
diff --git a/external_imported/vcpkg/ports/llvm/0007-fix-compiler-rt-warnings.patch b/external_imported/vcpkg/ports/llvm/0007-fix-compiler-rt-warnings.patch
new file mode 100644
index 000000000..67ce0079b
--- /dev/null
+++ b/external_imported/vcpkg/ports/llvm/0007-fix-compiler-rt-warnings.patch
@@ -0,0 +1,45 @@
+ compiler-rt/lib/asan/CMakeLists.txt         | 2 +-
+ compiler-rt/lib/interception/CMakeLists.txt | 2 +-
+ compiler-rt/lib/ubsan/CMakeLists.txt        | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/compiler-rt/lib/asan/CMakeLists.txt b/compiler-rt/lib/asan/CMakeLists.txt
+index 1bfc6f0c5e37..f35c385c379a 100644
+--- a/compiler-rt/lib/asan/CMakeLists.txt
++++ b/compiler-rt/lib/asan/CMakeLists.txt
+@@ -92,7 +92,7 @@ append_rtti_flag(OFF ASAN_CFLAGS)
+ 
+ # Silence warnings in system headers with MSVC.
+ if(NOT CLANG_CL)
+-  append_list_if(COMPILER_RT_HAS_EXTERNAL_FLAG "/experimental:external /external:W0 /external:anglebrackets" ASAN_CFLAGS)
++  append_list_if(COMPILER_RT_HAS_EXTERNAL_FLAG "/experimental:external;/external:W0;/external:anglebrackets" ASAN_CFLAGS)
+ endif()
+ 
+ # Too many existing bugs, needs cleanup.
+diff --git a/compiler-rt/lib/interception/CMakeLists.txt b/compiler-rt/lib/interception/CMakeLists.txt
+index 3242cf50e35f..abe9229340be 100644
+--- a/compiler-rt/lib/interception/CMakeLists.txt
++++ b/compiler-rt/lib/interception/CMakeLists.txt
+@@ -21,7 +21,7 @@ append_rtti_flag(OFF INTERCEPTION_CFLAGS)
+ 
+ # Silence warnings in system headers with MSVC.
+ if(NOT CLANG_CL)
+-  append_list_if(COMPILER_RT_HAS_EXTERNAL_FLAG "/experimental:external /external:W0 /external:anglebrackets" INTERCEPTION_CFLAGS)
++  append_list_if(COMPILER_RT_HAS_EXTERNAL_FLAG "/experimental:external;/external:W0;/external:anglebrackets" INTERCEPTION_CFLAGS)
+ endif()
+ 
+ add_compiler_rt_object_libraries(RTInterception
+diff --git a/compiler-rt/lib/ubsan/CMakeLists.txt b/compiler-rt/lib/ubsan/CMakeLists.txt
+index 520a024fbede..75b0b12b9da2 100644
+--- a/compiler-rt/lib/ubsan/CMakeLists.txt
++++ b/compiler-rt/lib/ubsan/CMakeLists.txt
+@@ -57,7 +57,7 @@ append_list_if(SANITIZER_CAN_USE_CXXABI -DUBSAN_CAN_USE_CXXABI UBSAN_CXXFLAGS)
+ 
+ # Silence warnings in system headers with MSVC.
+ if(NOT CLANG_CL)
+-  append_list_if(COMPILER_RT_HAS_EXTERNAL_FLAG "/experimental:external /external:W0 /external:anglebrackets" UBSAN_CXXFLAGS)
++  append_list_if(COMPILER_RT_HAS_EXTERNAL_FLAG "/experimental:external;/external:W0;/external:anglebrackets" UBSAN_CXXFLAGS)
+ endif()
+ 
+ set(UBSAN_LINK_FLAGS ${SANITIZER_COMMON_LINK_FLAGS})
+ 
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/llvm/0008-add-missing-case.patch b/external_imported/vcpkg/ports/llvm/0008-add-missing-case.patch
new file mode 100644
index 000000000..2ed29c34e
--- /dev/null
+++ b/external_imported/vcpkg/ports/llvm/0008-add-missing-case.patch
@@ -0,0 +1,71 @@
+diff --git a/clang/lib/Sema/SemaCodeComplete.cpp b/clang/lib/Sema/SemaCodeComplete.cpp
+index b5d29b2e9..b4fc088a1 100644
+--- a/clang/lib/Sema/SemaCodeComplete.cpp
++++ b/clang/lib/Sema/SemaCodeComplete.cpp
+@@ -4088,6 +4088,9 @@ CXCursorKind clang::getCursorKindForDecl(const Decl *D) {
+   case Decl::Concept:
+     return CXCursor_ConceptDecl;
+ 
++  case Decl::LinkageSpec:
++    return CXCursor_LinkageSpec;
++
+   default:
+     if (const auto *TD = dyn_cast<TagDecl>(D)) {
+       switch (TD->getTagKind()) {
+diff --git a/clang/test/Index/recursive-cxx-member-calls.cpp b/clang/test/Index/recursive-cxx-member-calls.cpp
+index 09f3f4141..be908c506 100644
+--- a/clang/test/Index/recursive-cxx-member-calls.cpp
++++ b/clang/test/Index/recursive-cxx-member-calls.cpp
+@@ -216,9 +216,9 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo * Name) {
+ // CHECK-tokens: Punctuation: "}" [4:63 - 4:64] ClassTemplate=pair:4:44 (Definition)
+ // CHECK-tokens: Punctuation: ";" [4:64 - 4:65] Namespace=std:3:11 (Definition)
+ // CHECK-tokens: Punctuation: "}" [5:1 - 5:2] Namespace=std:3:11 (Definition)
+-// CHECK-tokens: Keyword: "extern" [6:1 - 6:7]
+-// CHECK-tokens: Literal: ""C"" [6:8 - 6:11] UnexposedDecl=:6:8 (Definition)
+-// CHECK-tokens: Punctuation: "{" [6:12 - 6:13] UnexposedDecl=:6:8 (Definition)
++// CHECK-tokens: Keyword: "extern" [6:1 - 6:7] LinkageSpec=:6:8 (Definition)
++// CHECK-tokens: Literal: ""C"" [6:8 - 6:11] LinkageSpec=:6:8 (Definition)
++// CHECK-tokens: Punctuation: "{" [6:12 - 6:13] LinkageSpec=:6:8 (Definition)
+ // CHECK-tokens: Keyword: "int" [7:3 - 7:6] FunctionDecl=memcmp:7:7
+ // CHECK-tokens: Identifier: "memcmp" [7:7 - 7:13] FunctionDecl=memcmp:7:7
+ // CHECK-tokens: Punctuation: "(" [7:13 - 7:14] FunctionDecl=memcmp:7:7
+@@ -232,7 +232,7 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo * Name) {
+ // CHECK-tokens: Punctuation: "," [7:40 - 7:41] FunctionDecl=memcmp:7:7
+ // CHECK-tokens: Identifier: "size_t" [7:42 - 7:48] TypeRef=size_t:2:25
+ // CHECK-tokens: Punctuation: ")" [7:48 - 7:49] FunctionDecl=memcmp:7:7
+-// CHECK-tokens: Punctuation: ";" [7:49 - 7:50] UnexposedDecl=:6:8 (Definition)
++// CHECK-tokens: Punctuation: ";" [7:49 - 7:50] LinkageSpec=:6:8 (Definition)
+ // CHECK-tokens: Identifier: "size_t" [8:3 - 8:9] TypeRef=size_t:2:25
+ // CHECK-tokens: Identifier: "strlen" [8:10 - 8:16] FunctionDecl=strlen:8:10
+ // CHECK-tokens: Punctuation: "(" [8:16 - 8:17] FunctionDecl=strlen:8:10
+@@ -1532,7 +1532,7 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo * Name) {
+ // CHECK: 4:20: TemplateTypeParameter=_T1:4:20 (Definition) Extent=[4:14 - 4:23]
+ // CHECK: 4:31: TemplateTypeParameter=_T2:4:31 (Definition) Extent=[4:25 - 4:34]
+ // CHECK: 4:55: FieldDecl=second:4:55 (Definition) Extent=[4:51 - 4:61]
+-// CHECK: 6:8: UnexposedDecl=:6:8 (Definition) Extent=[6:1 - 9:2]
++// CHECK: 6:8: LinkageSpec=:6:8 (Definition) Extent=[6:1 - 9:2]
+ // CHECK: 7:7: FunctionDecl=memcmp:7:7 Extent=[7:3 - 7:49]
+ // CHECK: 7:26: ParmDecl=:7:26 (Definition) Extent=[7:14 - 7:26]
+ // CHECK: 7:40: ParmDecl=:7:40 (Definition) Extent=[7:28 - 7:40]
+diff --git a/clang/tools/c-index-test/c-index-test.c b/clang/tools/c-index-test/c-index-test.c
+index 9d66a22f3..2c0c9cb8e 100644
+--- a/clang/tools/c-index-test/c-index-test.c
++++ b/clang/tools/c-index-test/c-index-test.c
+@@ -1838,6 +1838,8 @@ static enum CXChildVisitResult PrintMangledName(CXCursor cursor, CXCursor p,
+   CXString MangledName;
+   if (clang_isUnexposed(clang_getCursorKind(cursor)))
+     return CXChildVisit_Recurse;
++  if (clang_getCursorKind(cursor) == CXCursor_LinkageSpec)
++    return CXChildVisit_Recurse;
+   PrintCursor(cursor, NULL);
+   MangledName = clang_Cursor_getMangling(cursor);
+   printf(" [mangled=%s]\n", clang_getCString(MangledName));
+@@ -1853,6 +1855,8 @@ static enum CXChildVisitResult PrintManglings(CXCursor cursor, CXCursor p,
+     return CXChildVisit_Recurse;
+   if (!clang_isDeclaration(clang_getCursorKind(cursor)))
+     return CXChildVisit_Recurse;
++  if (clang_getCursorKind(cursor) == CXCursor_LinkageSpec)
++    return CXChildVisit_Recurse;
+   if (clang_getCursorKind(cursor) == CXCursor_ParmDecl)
+     return CXChildVisit_Continue;
+   PrintCursor(cursor, NULL);
diff --git a/external_imported/vcpkg/ports/llvm/0009-fix-tools-install-path.patch b/external_imported/vcpkg/ports/llvm/0009-fix-tools-install-path.patch
deleted file mode 100644
index 294de6fda..000000000
--- a/external_imported/vcpkg/ports/llvm/0009-fix-tools-install-path.patch
+++ /dev/null
@@ -1,233 +0,0 @@
- clang-tools-extra/clang-tidy/tool/CMakeLists.txt | 2 +-
- clang-tools-extra/modularize/CMakeLists.txt      | 2 +-
- clang/cmake/modules/AddClang.cmake               | 2 +-
- clang/tools/c-index-test/CMakeLists.txt          | 2 +-
- clang/tools/clang-format/CMakeLists.txt          | 2 +-
- clang/tools/clang-linker-wrapper/CMakeLists.txt  | 2 +-
- clang/tools/clang-nvlink-wrapper/CMakeLists.txt  | 2 +-
- clang/tools/scan-build-py/CMakeLists.txt         | 4 ++--
- clang/tools/scan-build/CMakeLists.txt            | 2 +-
- clang/tools/scan-view/CMakeLists.txt             | 2 +-
- clang/utils/hmaptool/CMakeLists.txt              | 2 +-
- flang/cmake/modules/AddFlang.cmake               | 2 +-
- flang/tools/f18/CMakeLists.txt                   | 2 +-
- flang/tools/flang-driver/CMakeLists.txt          | 2 +-
- lld/cmake/modules/AddLLD.cmake                   | 2 +-
- lld/tools/lld/CMakeLists.txt                     | 2 +-
- lldb/cmake/modules/AddLLDB.cmake                 | 2 +-
- 17 files changed, 18 insertions(+), 18 deletions(-)
-
-diff --git a/clang-tools-extra/clang-tidy/tool/CMakeLists.txt b/clang-tools-extra/clang-tidy/tool/CMakeLists.txt
-index 3ce552872015..e09b917ae5f8 100644
---- a/clang-tools-extra/clang-tidy/tool/CMakeLists.txt
-+++ b/clang-tools-extra/clang-tidy/tool/CMakeLists.txt
-@@ -64,6 +64,6 @@ install(PROGRAMS clang-tidy-diff.py
-   DESTINATION "${CMAKE_INSTALL_DATADIR}/clang"
-   COMPONENT clang-tidy)
- install(PROGRAMS run-clang-tidy.py
--  DESTINATION "${CMAKE_INSTALL_BINDIR}"
-+  DESTINATION "${LLVM_TOOLS_INSTALL_DIR}"
-   COMPONENT clang-tidy
-   RENAME run-clang-tidy)
-diff --git a/clang-tools-extra/modularize/CMakeLists.txt b/clang-tools-extra/modularize/CMakeLists.txt
-index fb17e353c39f..4b409e47446a 100644
---- a/clang-tools-extra/modularize/CMakeLists.txt
-+++ b/clang-tools-extra/modularize/CMakeLists.txt
-@@ -23,5 +23,5 @@ clang_target_link_libraries(modularize
-   )
- 
- install(TARGETS modularize
--        RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-+        RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}"
-         COMPONENT clang-extras)
-diff --git a/clang/cmake/modules/AddClang.cmake b/clang/cmake/modules/AddClang.cmake
-index 9bbbfc032b7d..bd238ff249cd 100644
---- a/clang/cmake/modules/AddClang.cmake
-+++ b/clang/cmake/modules/AddClang.cmake
-@@ -160,7 +160,7 @@ macro(add_clang_tool name)
-     get_target_export_arg(${name} Clang export_to_clangtargets)
-     install(TARGETS ${name}
-       ${export_to_clangtargets}
--      RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-+      RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}"
-       COMPONENT ${name})
- 
-     if(NOT LLVM_ENABLE_IDE)
-diff --git a/clang/tools/c-index-test/CMakeLists.txt b/clang/tools/c-index-test/CMakeLists.txt
-index 0ae1b4e55244..e8a34e136194 100644
---- a/clang/tools/c-index-test/CMakeLists.txt
-+++ b/clang/tools/c-index-test/CMakeLists.txt
-@@ -49,7 +49,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
-     set_property(TARGET c-index-test APPEND PROPERTY INSTALL_RPATH
-        "@executable_path/../../lib")
-   else()
--    set(INSTALL_DESTINATION "${CMAKE_INSTALL_BINDIR}")
-+    set(INSTALL_DESTINATION "${LLVM_TOOLS_INSTALL_DIR}")
-   endif()
- 
-   install(TARGETS c-index-test
-diff --git a/clang/tools/clang-format/CMakeLists.txt b/clang/tools/clang-format/CMakeLists.txt
-index bbdef93b576b..8744e414da0a 100644
---- a/clang/tools/clang-format/CMakeLists.txt
-+++ b/clang/tools/clang-format/CMakeLists.txt
-@@ -36,5 +36,5 @@ install(PROGRAMS clang-format.py
-   DESTINATION "${CMAKE_INSTALL_DATADIR}/clang"
-   COMPONENT clang-format)
- install(PROGRAMS git-clang-format
--  DESTINATION "${CMAKE_INSTALL_BINDIR}"
-+  DESTINATION "${LLVM_TOOLS_INSTALL_DIR}"
-   COMPONENT clang-format)
-diff --git a/clang/tools/clang-linker-wrapper/CMakeLists.txt b/clang/tools/clang-linker-wrapper/CMakeLists.txt
-index 1614f40fb60e..0e78982310c7 100644
---- a/clang/tools/clang-linker-wrapper/CMakeLists.txt
-+++ b/clang/tools/clang-linker-wrapper/CMakeLists.txt
-@@ -37,4 +37,4 @@ target_link_libraries(clang-linker-wrapper
-   ${CLANG_LINKER_WRAPPER_LIB_DEPS}
-   )
- 
--install(TARGETS clang-linker-wrapper RUNTIME DESTINATION bin)
-+install(TARGETS clang-linker-wrapper RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}")
-diff --git a/clang/tools/clang-nvlink-wrapper/CMakeLists.txt b/clang/tools/clang-nvlink-wrapper/CMakeLists.txt
-index 2c979e509795..f22b801fe19a 100644
---- a/clang/tools/clang-nvlink-wrapper/CMakeLists.txt
-+++ b/clang/tools/clang-nvlink-wrapper/CMakeLists.txt
-@@ -22,4 +22,4 @@ target_link_libraries(clang-nvlink-wrapper
-   ${CLANG_NVLINK_WRAPPER_LIB_DEPS}
-   )
- 
--install(TARGETS clang-nvlink-wrapper RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
-+install(TARGETS clang-nvlink-wrapper RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}")
-diff --git a/clang/tools/scan-build-py/CMakeLists.txt b/clang/tools/scan-build-py/CMakeLists.txt
-index 061dc7ef4dd9..91499600693b 100644
---- a/clang/tools/scan-build-py/CMakeLists.txt
-+++ b/clang/tools/scan-build-py/CMakeLists.txt
-@@ -43,7 +43,7 @@ foreach(BinFile ${BinFiles})
-                          ${CMAKE_BINARY_DIR}/bin/scan-build-py
-                        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/scan-build)
-     install (PROGRAMS "bin/scan-build"
--             DESTINATION "${CMAKE_INSTALL_BINDIR}"
-+             DESTINATION "${LLVM_TOOLS_INSTALL_DIR}"
-              RENAME scan-build-py
-              COMPONENT scan-build-py)
-     list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/scan-build-py)
-@@ -56,7 +56,7 @@ foreach(BinFile ${BinFiles})
-                          ${CMAKE_BINARY_DIR}/bin/
-                        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile})
-     install(PROGRAMS bin/${BinFile}
--            DESTINATION "${CMAKE_INSTALL_BINDIR}"
-+            DESTINATION "${LLVM_TOOLS_INSTALL_DIR}"
-             COMPONENT scan-build-py)
-     list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile})
-   endif()
-diff --git a/clang/tools/scan-build/CMakeLists.txt b/clang/tools/scan-build/CMakeLists.txt
-index 4a578b4c6f3e..05574a4919f6 100644
---- a/clang/tools/scan-build/CMakeLists.txt
-+++ b/clang/tools/scan-build/CMakeLists.txt
-@@ -47,7 +47,7 @@ if(CLANG_INSTALL_SCANBUILD)
-                        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile})
-     list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile})
-     install(PROGRAMS bin/${BinFile}
--            DESTINATION "${CMAKE_INSTALL_BINDIR}"
-+            DESTINATION "${LLVM_TOOLS_INSTALL_DIR}"
-             COMPONENT scan-build)
-   endforeach()
- 
-diff --git a/clang/tools/scan-view/CMakeLists.txt b/clang/tools/scan-view/CMakeLists.txt
-index 07aec76ee66f..ca6a3380ad0c 100644
---- a/clang/tools/scan-view/CMakeLists.txt
-+++ b/clang/tools/scan-view/CMakeLists.txt
-@@ -20,7 +20,7 @@ if(CLANG_INSTALL_SCANVIEW)
-                        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile})
-     list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile})
-     install(PROGRAMS bin/${BinFile}
--            DESTINATION "${CMAKE_INSTALL_BINDIR}"
-+            DESTINATION "${LLVM_TOOLS_INSTALL_DIR}"
-             COMPONENT scan-view)
-   endforeach()
- 
-diff --git a/clang/utils/hmaptool/CMakeLists.txt b/clang/utils/hmaptool/CMakeLists.txt
-index f0d9866782b8..5fcdfc04425f 100644
---- a/clang/utils/hmaptool/CMakeLists.txt
-+++ b/clang/utils/hmaptool/CMakeLists.txt
-@@ -10,7 +10,7 @@ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HM
- 
- list(APPEND Depends ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HMAPTOOL})
- install(PROGRAMS ${CLANG_HMAPTOOL}
--        DESTINATION "${CMAKE_INSTALL_BINDIR}"
-+        DESTINATION "${LLVM_TOOLS_INSTALL_DIR}"
-         COMPONENT hmaptool)
- 
- add_custom_target(hmaptool ALL DEPENDS ${Depends})
-diff --git a/flang/cmake/modules/AddFlang.cmake b/flang/cmake/modules/AddFlang.cmake
-index 369e303e148a..3c3697c07406 100644
---- a/flang/cmake/modules/AddFlang.cmake
-+++ b/flang/cmake/modules/AddFlang.cmake
-@@ -109,7 +109,7 @@ macro(add_flang_tool name)
-     get_target_export_arg(${name} Flang export_to_flangtargets)
-     install(TARGETS ${name}
-       ${export_to_flangtargets}
--      RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-+      RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}"
-       COMPONENT ${name})
- 
-     if(NOT LLVM_ENABLE_IDE)
-diff --git a/flang/tools/f18/CMakeLists.txt b/flang/tools/f18/CMakeLists.txt
-index aa77676c6229..dd15b0b7727b 100644
---- a/flang/tools/f18/CMakeLists.txt
-+++ b/flang/tools/f18/CMakeLists.txt
-@@ -50,5 +50,5 @@ if (NOT WIN32)
-     DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/flang
-     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/flang ${CMAKE_BINARY_DIR}/bin)
-   add_custom_target(flang ALL DEPENDS ${CMAKE_BINARY_DIR}/bin/flang)
--  install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang DESTINATION "${CMAKE_INSTALL_BINDIR}")
-+  install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang DESTINATION "${LLVM_TOOLS_INSTALL_DIR}")
- endif()
-diff --git a/flang/tools/flang-driver/CMakeLists.txt b/flang/tools/flang-driver/CMakeLists.txt
-index b3e90746e786..b327e69aaeaa 100644
---- a/flang/tools/flang-driver/CMakeLists.txt
-+++ b/flang/tools/flang-driver/CMakeLists.txt
-@@ -34,4 +34,4 @@ if(FLANG_PLUGIN_SUPPORT)
-   export_executable_symbols_for_plugins(flang-new)
- endif()
- 
--install(TARGETS flang-new DESTINATION "${CMAKE_INSTALL_BINDIR}")
-+install(TARGETS flang-new DESTINATION "${LLVM_TOOLS_INSTALL_DIR}")
-diff --git a/lld/cmake/modules/AddLLD.cmake b/lld/cmake/modules/AddLLD.cmake
-index dd2898ce6236..86560bddd5e4 100644
---- a/lld/cmake/modules/AddLLD.cmake
-+++ b/lld/cmake/modules/AddLLD.cmake
-@@ -47,7 +47,7 @@ macro(add_lld_tool name)
-     get_target_export_arg(${name} LLD export_to_lldtargets)
-     install(TARGETS ${name}
-       ${export_to_lldtargets}
--      RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-+      RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}"
-       COMPONENT ${name})
- 
-     if(NOT CMAKE_CONFIGURATION_TYPES)
-diff --git a/lld/tools/lld/CMakeLists.txt b/lld/tools/lld/CMakeLists.txt
-index df48cc0d6c51..1363144fd8e1 100644
---- a/lld/tools/lld/CMakeLists.txt
-+++ b/lld/tools/lld/CMakeLists.txt
-@@ -20,7 +20,7 @@ target_link_libraries(lld
-   )
- 
- install(TARGETS lld
--  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
-+  RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}")
- 
- if(NOT LLD_SYMLINKS_TO_CREATE)
-   set(LLD_SYMLINKS_TO_CREATE
-diff --git a/lldb/cmake/modules/AddLLDB.cmake b/lldb/cmake/modules/AddLLDB.cmake
-index 3291a7c808e1..9fe9b9a7940d 100644
---- a/lldb/cmake/modules/AddLLDB.cmake
-+++ b/lldb/cmake/modules/AddLLDB.cmake
-@@ -189,7 +189,7 @@ function(add_lldb_executable name)
-   endif()
- 
-   if(ARG_GENERATE_INSTALL)
--    set(install_dest bin)
-+    set(install_dest "${LLVM_TOOLS_INSTALL_DIR}")
-     if(ARG_INSTALL_PREFIX)
-       set(install_dest ${ARG_INSTALL_PREFIX})
-     endif()
diff --git a/external_imported/vcpkg/ports/llvm/0010-fix-libffi.patch b/external_imported/vcpkg/ports/llvm/0010-fix-libffi.patch
deleted file mode 100644
index 3859b81fe..000000000
--- a/external_imported/vcpkg/ports/llvm/0010-fix-libffi.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- llvm/cmake/modules/FindFFI.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/llvm/cmake/modules/FindFFI.cmake b/llvm/cmake/modules/FindFFI.cmake
-index b0d859af8959..a756d0c8fdb0 100644
---- a/llvm/cmake/modules/FindFFI.cmake
-+++ b/llvm/cmake/modules/FindFFI.cmake
-@@ -34,7 +34,7 @@ else()
-   endif()
- endif()
- 
--find_library(FFI_LIBRARIES ffi PATHS ${FFI_LIBRARY_DIR})
-+find_library(FFI_LIBRARIES ffi libffi PATHS ${FFI_LIBRARY_DIR})
- 
- if(FFI_LIBRARIES)
-   include(CMakePushCheckState)
diff --git a/external_imported/vcpkg/ports/llvm/0011-fix-install-bolt.patch b/external_imported/vcpkg/ports/llvm/0011-fix-install-bolt.patch
deleted file mode 100644
index 1e2660fa9..000000000
--- a/external_imported/vcpkg/ports/llvm/0011-fix-install-bolt.patch
+++ /dev/null
@@ -1,22 +0,0 @@
- bolt/tools/driver/CMakeLists.txt | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/bolt/tools/driver/CMakeLists.txt b/bolt/tools/driver/CMakeLists.txt
-index d50781615663..df06604c724c 100644
---- a/bolt/tools/driver/CMakeLists.txt
-+++ b/bolt/tools/driver/CMakeLists.txt
-@@ -33,14 +33,6 @@ set(BOLT_DEPENDS
-   )
- 
- add_custom_target(bolt DEPENDS ${BOLT_DEPENDS})
--install(PROGRAMS
--  ${CMAKE_BINARY_DIR}/bin/llvm-bolt
--  ${CMAKE_BINARY_DIR}/bin/perf2bolt
--  ${CMAKE_BINARY_DIR}/bin/llvm-boltdiff
--  ${CMAKE_BINARY_DIR}/bin/llvm-bolt-heatmap
--  DESTINATION ${CMAKE_INSTALL_BINDIR}
--  COMPONENT bolt
--  )
- add_llvm_install_targets(install-bolt DEPENDS bolt COMPONENT bolt)
- set_target_properties(bolt PROPERTIES FOLDER "BOLT")
- set_target_properties(install-bolt PROPERTIES FOLDER "BOLT")
diff --git a/external_imported/vcpkg/ports/llvm/portfile.cmake b/external_imported/vcpkg/ports/llvm/portfile.cmake
index f0b6632cb..0cdc12031 100644
--- a/external_imported/vcpkg/ports/llvm/portfile.cmake
+++ b/external_imported/vcpkg/ports/llvm/portfile.cmake
@@ -3,17 +3,18 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO llvm/llvm-project
-    REF llvmorg-${VERSION}
-    SHA512 d64f97754c24f32deb5f284ebbd486b3a467978b7463d622f50d5237fff91108616137b4394f1d1ce836efa59bf7bec675b6dee257a79b241c15be52d4697460
+    REF "llvmorg-${VERSION}"
+    SHA512 362ddb94fdd22d05bd11c950f1711eafbd47424f6da0b1b061da012ef1b39dd8f7efeb91b53c036ea0708aa3845893fe39d1fb529ac3b928df738b88717d1aee
     HEAD_REF main
     PATCHES
-        0002-fix-install-paths.patch    # This patch fixes paths in ClangConfig.cmake, LLVMConfig.cmake, LLDConfig.cmake etc.
-        0004-fix-dr-1734.patch
-        0005-fix-tools-path.patch
-        0007-fix-compiler-rt-install-path.patch
-        0009-fix-tools-install-path.patch
-        0010-fix-libffi.patch
-        0011-fix-install-bolt.patch
+        0001-fix-install-package-dir.patch
+        0002-fix-tools-install-dir.patch
+        0003-fix-llvm-config.patch
+        0004-disable-libomp-aliases.patch
+        0005-remove-numpy.patch
+        0006-create-destination-mlir-directory.patch
+        0007-fix-compiler-rt-warnings.patch # fixed in upstream
+        0008-add-missing-case.patch # From upstream https://github.com/llvm/llvm-project/pull/72401
 )
 
 vcpkg_check_features(
@@ -24,10 +25,11 @@ vcpkg_check_features(
         utils LLVM_BUILD_UTILS
         utils LLVM_INCLUDE_UTILS
         utils LLVM_INSTALL_UTILS
+        enable-assertions LLVM_ENABLE_ASSERTIONS
         enable-rtti LLVM_ENABLE_RTTI
         enable-ffi LLVM_ENABLE_FFI
         enable-terminfo LLVM_ENABLE_TERMINFO
-        enable-threads LLVM_ENABLE_THREADS
+        enable-ios COMPILER_RT_ENABLE_IOS
         enable-eh LLVM_ENABLE_EH
         enable-bindings LLVM_ENABLE_BINDINGS
 )
@@ -39,14 +41,17 @@ include("${cmake_vars_file}")
 # LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON disables this error.
 # See https://developercommunity.visualstudio.com/content/problem/845933/miscompile-boolean-condition-deduced-to-be-always.html
 # and thread "[llvm-dev] Longstanding failing tests - clang-tidy, MachO, Polly" on llvm-dev Jan 21-23 2020.
-list(APPEND FEATURE_OPTIONS
-    -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON
-)
+if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND VCPKG_DETECTED_MSVC_VERSION LESS "1925")
+    list(APPEND FEATURE_OPTIONS
+        -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON
+    )
+endif()
 
 # Force enable or disable external libraries
 set(llvm_external_libraries
     zlib
     libxml2
+    zstd
 )
 foreach(external_library IN LISTS llvm_external_libraries)
     string(TOLOWER "enable-${external_library}" feature_name)
@@ -62,19 +67,6 @@ foreach(external_library IN LISTS llvm_external_libraries)
     endif()
 endforeach()
 
-# By default assertions are enabled for Debug configuration only.
-if("enable-assertions" IN_LIST FEATURES)
-    # Force enable assertions for all configurations.
-    list(APPEND FEATURE_OPTIONS
-        -DLLVM_ENABLE_ASSERTIONS=ON
-    )
-elseif("disable-assertions" IN_LIST FEATURES)
-    # Force disable assertions for all configurations.
-    list(APPEND FEATURE_OPTIONS
-        -DLLVM_ENABLE_ASSERTIONS=OFF
-    )
-endif()
-
 # LLVM_ABI_BREAKING_CHECKS can be WITH_ASSERTS (default), FORCE_ON or FORCE_OFF.
 # By default in LLVM, abi-breaking checks are enabled if assertions are enabled.
 # however, this breaks linking with the debug versions, since the option is
@@ -95,21 +87,24 @@ endif()
 set(LLVM_ENABLE_PROJECTS)
 if("bolt" IN_LIST FEATURES)
     list(APPEND LLVM_ENABLE_PROJECTS "bolt")
+    list(APPEND FEATURE_OPTIONS
+        -DBOLT_TOOLS_INSTALL_DIR:PATH=tools/llvm
+    )
 endif()
 if("clang" IN_LIST FEATURES OR "clang-tools-extra" IN_LIST FEATURES)
     list(APPEND LLVM_ENABLE_PROJECTS "clang")
-    if("disable-clang-static-analyzer" IN_LIST FEATURES)
-        list(APPEND FEATURE_OPTIONS
-            # Disable ARCMT
-            -DCLANG_ENABLE_ARCMT=OFF
-            # Disable static analyzer
-            -DCLANG_ENABLE_STATIC_ANALYZER=OFF
-        )
-    endif()
-    # 1) LLVM/Clang tools are relocated from ./bin/ to ./tools/llvm/ (LLVM_TOOLS_INSTALL_DIR=tools/llvm)
-    # 2) Clang resource files are relocated from ./lib/clang/<version> to ./tools/llvm/lib/clang/<version> (see patch 0007-fix-compiler-rt-install-path.patch)
-    # So, the relative path should be changed from ../lib/clang/<version> to ./lib/clang/<version>
-    list(APPEND FEATURE_OPTIONS -DCLANG_RESOURCE_DIR=lib/clang/${VERSION})
+    list(APPEND FEATURE_OPTIONS
+        -DCLANG_INSTALL_PACKAGE_DIR:PATH=share/clang
+        -DCLANG_TOOLS_INSTALL_DIR:PATH=tools/llvm
+        # Disable ARCMT
+        -DCLANG_ENABLE_ARCMT=OFF
+        # Disable static analyzer
+        -DCLANG_ENABLE_STATIC_ANALYZER=OFF
+    )
+    # 1) LLVM/Clang tools are relocated from ./bin/ to ./tools/llvm/ (CLANG_TOOLS_INSTALL_DIR=tools/llvm)
+    # 2) Clang resource files should be relocated from lib/clang/<major_version> to ../tools/llvm/lib/clang/<major_version>
+    string(REGEX MATCH "^[0-9]+" CLANG_VERSION_MAJOR ${VERSION})
+    list(APPEND FEATURE_OPTIONS -DCLANG_RESOURCE_DIR=lib/clang/${CLANG_VERSION_MAJOR})
 endif()
 if("clang-tools-extra" IN_LIST FEATURES)
     list(APPEND LLVM_ENABLE_PROJECTS "clang-tools-extra")
@@ -122,6 +117,10 @@ if("flang" IN_LIST FEATURES)
         message(FATAL_ERROR "Building Flang with MSVC is not supported on x86. Disable it until issues are fixed.")
     endif()
     list(APPEND LLVM_ENABLE_PROJECTS "flang")
+    list(APPEND FEATURE_OPTIONS
+        -DFLANG_INSTALL_PACKAGE_DIR:PATH=share/flang
+        -DFLANG_TOOLS_INSTALL_DIR:PATH=tools/llvm
+    )
     list(APPEND FEATURE_OPTIONS
         # Flang requires C++17
         -DCMAKE_CXX_STANDARD=17
@@ -132,6 +131,10 @@ if("libclc" IN_LIST FEATURES)
 endif()
 if("lld" IN_LIST FEATURES)
     list(APPEND LLVM_ENABLE_PROJECTS "lld")
+    list(APPEND FEATURE_OPTIONS
+        -DLLD_INSTALL_PACKAGE_DIR:PATH=share/lld
+        -DLLD_TOOLS_INSTALL_DIR:PATH=tools/llvm
+    )
 endif()
 if("lldb" IN_LIST FEATURES)
     list(APPEND LLVM_ENABLE_PROJECTS "lldb")
@@ -141,9 +144,25 @@ if("lldb" IN_LIST FEATURES)
 endif()
 if("mlir" IN_LIST FEATURES)
     list(APPEND LLVM_ENABLE_PROJECTS "mlir")
+    list(APPEND FEATURE_OPTIONS
+        -DMLIR_INSTALL_PACKAGE_DIR:PATH=share/mlir
+        -DMLIR_TOOLS_INSTALL_DIR:PATH=tools/llvm
+        -DMLIR_INSTALL_AGGREGATE_OBJECTS=OFF # Disables installation of object files in lib/objects-{CMAKE_BUILD_TYPE}.
+    )
+    if("enable-mlir-python-bindings" IN_LIST FEATURES)
+        list(APPEND FEATURE_OPTIONS
+            -DMLIR_ENABLE_BINDINGS_PYTHON=ON
+            "-Dpybind11_DIR=${CURRENT_INSTALLED_DIR}/share/pybind11"
+        )
+    endif()
 endif()
 if("openmp" IN_LIST FEATURES)
     list(APPEND LLVM_ENABLE_PROJECTS "openmp")
+    list(APPEND FEATURE_OPTIONS
+        -DLIBOMP_INSTALL_ALIASES=OFF
+        -DOPENMP_ENABLE_LIBOMPTARGET=OFF # Currently libomptarget cannot be compiled on Windows or MacOS X.
+        -DOPENMP_ENABLE_OMPT_TOOLS=OFF # Currently tools are not tested well on Windows or MacOS X.
+    )
     # Perl is required for the OpenMP run-time
     vcpkg_find_acquire_program(PERL)
     get_filename_component(PERL_PATH ${PERL} DIRECTORY)
@@ -153,30 +172,36 @@ if("openmp" IN_LIST FEATURES)
 endif()
 if("polly" IN_LIST FEATURES)
     list(APPEND LLVM_ENABLE_PROJECTS "polly")
-endif()
-if("pstl" IN_LIST FEATURES)
-    if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-        message(FATAL_ERROR "Building pstl with MSVC is not supported. Disable it until issues are fixed.")
-    endif()
-    list(APPEND LLVM_ENABLE_PROJECTS "pstl")
+    list(APPEND FEATURE_OPTIONS
+        -DPOLLY_INSTALL_PACKAGE_DIR:PATH=share/polly
+    )
 endif()
 
 set(LLVM_ENABLE_RUNTIMES)
+if("libc" IN_LIST FEATURES)
+    list(APPEND LLVM_ENABLE_RUNTIMES "libc")
+endif()
 if("libcxx" IN_LIST FEATURES)
-    if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-        message(FATAL_ERROR "Building libcxx with MSVC is not supported, as cl doesn't support the #include_next extension.")
+    if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND VCPKG_DETECTED_MSVC_VERSION LESS "1914")
+        # libcxx supports being built with clang-cl, but not with MSVC’s cl.exe, as cl doesn’t support the #include_next extension.
+        # Furthermore, VS 2017 or newer (19.14) is required.
+        # More info: https://releases.llvm.org/17.0.1/projects/libcxx/docs/BuildingLibcxx.html#support-for-windows
+        message(FATAL_ERROR "libcxx requiries MSVC 19.14 or newer.")
     endif()
     list(APPEND LLVM_ENABLE_RUNTIMES "libcxx")
 endif()
 if("libcxxabi" IN_LIST FEATURES)
-    if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-        message(FATAL_ERROR "Building libcxxabi with MSVC is not supported. Disable it until issues are fixed.")
-    endif()
     list(APPEND LLVM_ENABLE_RUNTIMES "libcxxabi")
 endif()
 if("libunwind" IN_LIST FEATURES)
     list(APPEND LLVM_ENABLE_RUNTIMES "libunwind")
 endif()
+if("pstl" IN_LIST FEATURES)
+    if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+        message(FATAL_ERROR "Building pstl with MSVC is not supported.")
+    endif()
+    list(APPEND LLVM_ENABLE_RUNTIMES "pstl")
+endif()
 
 # this is for normal targets
 set(known_llvm_targets
@@ -187,6 +212,7 @@ set(known_llvm_targets
     BPF
     Hexagon
     Lanai
+    LoongArch
     Mips
     MSP430
     NVPTX
@@ -200,7 +226,7 @@ set(known_llvm_targets
     XCore
 )
 
-set(LLVM_TARGETS_TO_BUILD "")
+set(LLVM_TARGETS_TO_BUILD)
 foreach(llvm_target IN LISTS known_llvm_targets)
     string(TOLOWER "target-${llvm_target}" feature_name)
     if(feature_name IN_LIST FEATURES)
@@ -210,10 +236,15 @@ endforeach()
 
 # this is for experimental targets
 set(known_llvm_experimental_targets
-    SPRIV
+    ARC
+    CSKY
+    DirectX
+    M68k
+    SPIRV
+    Xtensa
 )
 
-set(LLVM_EXPERIMENTAL_TARGETS_TO_BUILD "")
+set(LLVM_EXPERIMENTAL_TARGETS_TO_BUILD)
 foreach(llvm_target IN LISTS known_llvm_experimental_targets)
     string(TOLOWER "target-${llvm_target}" feature_name)
     if(feature_name IN_LIST FEATURES)
@@ -223,14 +254,26 @@ endforeach()
 
 vcpkg_find_acquire_program(PYTHON3)
 get_filename_component(PYTHON3_DIR ${PYTHON3} DIRECTORY)
-vcpkg_add_to_path(${PYTHON3_DIR})
+vcpkg_add_to_path("${PYTHON3_DIR}")
+
+file(REMOVE "${SOURCE_PATH}/llvm/cmake/modules/Findzstd.cmake")
+
+if("${LLVM_ENABLE_RUNTIMES}" STREQUAL "")
+    list(APPEND FEATURE_OPTIONS
+        -DLLVM_INCLUDE_RUNTIMES=OFF
+        -DLLVM_BUILD_RUNTIMES=OFF
+        -DLLVM_BUILD_RUNTIME=OFF
+    )
+endif()
 
-set(LLVM_LINK_JOBS 1)
+# At least one target must be specified, otherwise default to "all".
+if("${LLVM_TARGETS_TO_BUILD}" STREQUAL "")
+    set(LLVM_TARGETS_TO_BUILD "all")
+endif()
 
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}/llvm
+    SOURCE_PATH "${SOURCE_PATH}/llvm"
     OPTIONS
-        ${FEATURE_OPTIONS}
         -DLLVM_INCLUDE_EXAMPLES=OFF
         -DLLVM_BUILD_EXAMPLES=OFF
         -DLLVM_INCLUDE_TESTS=OFF
@@ -239,14 +282,18 @@ vcpkg_cmake_configure(
         -DLLVM_BUILD_BENCHMARKS=OFF
         # Force TableGen to be built with optimization. This will significantly improve build time.
         -DLLVM_OPTIMIZED_TABLEGEN=ON
+        -DPACKAGE_VERSION=${VERSION}
+        # Limit the maximum number of concurrent link jobs to 1. This should fix low amount of memory issue for link.
+        -DLLVM_PARALLEL_LINK_JOBS=1
+        -DLLVM_INSTALL_PACKAGE_DIR:PATH=share/llvm
+        -DLLVM_TOOLS_INSTALL_DIR:PATH=tools/llvm
         "-DLLVM_ENABLE_PROJECTS=${LLVM_ENABLE_PROJECTS}"
         "-DLLVM_ENABLE_RUNTIMES=${LLVM_ENABLE_RUNTIMES}"
         "-DLLVM_TARGETS_TO_BUILD=${LLVM_TARGETS_TO_BUILD}"
         "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=${LLVM_EXPERIMENTAL_TARGETS_TO_BUILD}"
-        -DPACKAGE_VERSION=${VERSION}
-        # Limit the maximum number of concurrent link jobs to 1. This should fix low amount of memory issue for link.
-        "-DLLVM_PARALLEL_LINK_JOBS=${LLVM_LINK_JOBS}"
-        -DLLVM_TOOLS_INSTALL_DIR=tools/llvm
+        ${FEATURE_OPTIONS}
+    MAYBE_UNUSED_VARIABLES 
+        COMPILER_RT_ENABLE_IOS
 )
 
 vcpkg_cmake_install(ADD_BIN_TO_PATH)
@@ -285,30 +332,34 @@ set(empty_dirs)
 
 if("clang-tools-extra" IN_LIST FEATURES)
     list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/include/clang-tidy/plugin")
+    list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/include/clang-tidy/misc/ConfusableTable")
 endif()
 
 if("pstl" IN_LIST FEATURES)
     list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/lib/cmake")
-    list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/debug/lib/cmake")
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/debug/lib/cmake")
+    endif()
 endif()
 
 if("flang" IN_LIST FEATURES)
-    list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/include/flang/Config")
     list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/include/flang/CMakeFiles")
+    list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/include/flang/Config")
     list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/include/flang/Optimizer/CMakeFiles")
     list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/include/flang/Optimizer/CodeGen/CMakeFiles")
     list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/include/flang/Optimizer/Dialect/CMakeFiles")
+    list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/include/flang/Optimizer/HLFIR/CMakeFiles")
     list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/include/flang/Optimizer/Transforms/CMakeFiles")
 endif()
 
 if(empty_dirs)
     foreach(empty_dir IN LISTS empty_dirs)
         if(NOT EXISTS "${empty_dir}")
-            message(SEND_ERROR "Directory '${empty_dir}' is not exist. Please remove it from the checking.")
+            message(WARNING "Directory '${empty_dir}' does not exist. Please remove it from the list of empty directories.")
         else()
             file(GLOB_RECURSE files_in_dir "${empty_dir}/*")
             if(files_in_dir)
-                message(SEND_ERROR "Directory '${empty_dir}' is not empty. Please remove it from the checking.")
+                message(WARNING "Directory '${empty_dir}' is not empty. Please remove it from the list of empty directories.")
             else()
                 file(REMOVE_RECURSE "${empty_dir}")
             endif()
@@ -316,7 +367,11 @@ if(empty_dirs)
     endforeach()
 endif()
 
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
+vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}")
+if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/lib")
+    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/bin/lib" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/lib")
+endif()
 
 if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include"
@@ -330,9 +385,15 @@ if("mlir" IN_LIST FEATURES)
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mlir/MLIRConfig.cmake" "${CURRENT_BUILDTREES_DIR}" "\${MLIR_INCLUDE_DIRS}")
 endif()
 
-# LLVM still generates a few DLLs in the static build:
-# * LLVM-C.dll
-# * libclang.dll
-# * LTO.dll
-# * Remarks.dll
-set(VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY enabled)
+if(VCPKG_TARGET_IS_WINDOWS)
+    # LLVM still generates a few DLLs in the static build:
+    # * LLVM-C.dll
+    # * libclang.dll
+    # * LTO.dll
+    # * Remarks.dll
+    set(VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY enabled)
+else()
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin"
+        "${CURRENT_PACKAGES_DIR}/debug/bin"
+    )
+endif()
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/llvm/vcpkg.json b/external_imported/vcpkg/ports/llvm/vcpkg.json
index 7b417eb44..1313c98ff 100644
--- a/external_imported/vcpkg/ports/llvm/vcpkg.json
+++ b/external_imported/vcpkg/ports/llvm/vcpkg.json
@@ -1,11 +1,16 @@
 {
   "name": "llvm",
-  "version": "14.0.6",
+  "version": "17.0.2",
+  "port-version": 3,
   "description": "The LLVM Compiler Infrastructure.",
   "homepage": "https://llvm.org",
   "license": "Apache-2.0",
   "supports": "!uwp & !(arm & windows)",
   "dependencies": [
+    {
+      "name": "atl",
+      "platform": "windows & !mingw"
+    },
     {
       "name": "vcpkg-cmake",
       "host": true
@@ -21,8 +26,11 @@
   ],
   "default-features": [
     "clang",
-    "default-options",
     "default-targets",
+    "enable-bindings",
+    "enable-terminfo",
+    "enable-zlib",
+    "enable-zstd",
     "lld",
     "tools"
   ],
@@ -46,7 +54,6 @@
           "name": "llvm",
           "default-features": false,
           "features": [
-            "compiler-rt",
             "tools"
           ]
         }
@@ -65,21 +72,13 @@
       ]
     },
     "compiler-rt": {
-      "description": "Include compiler's runtime libraries."
-    },
-    "default-options": {
-      "description": "Build with default options.",
+      "description": "Include compiler's runtime libraries.",
       "dependencies": [
         {
           "name": "llvm",
           "default-features": false,
           "features": [
-            "disable-assertions",
-            "disable-clang-static-analyzer",
-            "enable-bindings",
-            "enable-terminfo",
-            "enable-threads",
-            "enable-zlib"
+            "clang"
           ]
         }
       ]
@@ -87,13 +86,6 @@
     "default-targets": {
       "description": "Build with platform-specific default targets.",
       "dependencies": [
-        {
-          "name": "llvm",
-          "default-features": false,
-          "features": [
-            "target-spirv"
-          ]
-        },
         {
           "name": "llvm",
           "default-features": false,
@@ -117,23 +109,9 @@
             "target-arm"
           ],
           "platform": "arm & !arm64"
-        },
-        {
-          "name": "llvm",
-          "default-features": false,
-          "features": [
-            "target-all"
-          ],
-          "platform": "!x86 & !x64 & !arm & !arm64"
         }
       ]
     },
-    "disable-assertions": {
-      "description": "Build LLVM without assertions."
-    },
-    "disable-clang-static-analyzer": {
-      "description": "Build without static analyzer."
-    },
     "enable-abi-breaking-checks": {
       "description": "Build LLVM with LLVM_ABI_BREAKING_CHECKS=FORCE_ON."
     },
@@ -161,27 +139,57 @@
         "libffi"
       ]
     },
+    "enable-ios": {
+      "description": "Build compiler-rt for iOS SDK.",
+      "dependencies": [
+        {
+          "name": "llvm",
+          "default-features": false,
+          "features": [
+            "target-arm"
+          ]
+        }
+      ]
+    },
     "enable-libxml2": {
       "description": "Build with LibXml2.",
       "dependencies": [
         "libxml2"
       ]
     },
+    "enable-mlir-python-bindings": {
+      "description": "Build MLIR Python bindings.",
+      "supports": "!(windows & static)",
+      "dependencies": [
+        {
+          "name": "llvm",
+          "default-features": false,
+          "features": [
+            "mlir"
+          ]
+        },
+        "pybind11",
+        "python3"
+      ]
+    },
     "enable-rtti": {
       "description": "Build LLVM with run-time type information."
     },
     "enable-terminfo": {
       "description": "Use terminfo database if available."
     },
-    "enable-threads": {
-      "description": "Use threads if available."
-    },
     "enable-zlib": {
       "description": "Build with ZLib.",
       "dependencies": [
         "zlib"
       ]
     },
+    "enable-zstd": {
+      "description": "Build with zstd.",
+      "dependencies": [
+        "zstd"
+      ]
+    },
     "flang": {
       "description": "Include Fortran front end.",
       "dependencies": [
@@ -196,6 +204,20 @@
         }
       ]
     },
+    "libc": {
+      "description": "Include libc library.",
+      "supports": "linux",
+      "dependencies": [
+        {
+          "name": "llvm",
+          "default-features": false,
+          "features": [
+            "clang",
+            "tools"
+          ]
+        }
+      ]
+    },
     "libclc": {
       "description": "Include OpenCL library."
     },
@@ -206,16 +228,38 @@
           "name": "llvm",
           "default-features": false,
           "features": [
-            "libcxxabi"
+            "clang",
+            "libcxxabi",
+            "tools"
           ]
         }
       ]
     },
     "libcxxabi": {
-      "description": "Include libcxxabi library."
+      "description": "Include libcxxabi library.",
+      "dependencies": [
+        {
+          "name": "llvm",
+          "default-features": false,
+          "features": [
+            "clang",
+            "libcxx",
+            "tools"
+          ]
+        }
+      ]
     },
     "libunwind": {
-      "description": "Include libunwind library."
+      "description": "Include libunwind library.",
+      "dependencies": [
+        {
+          "name": "llvm",
+          "default-features": false,
+          "features": [
+            "tools"
+          ]
+        }
+      ]
     },
     "lld": {
       "description": "Include LLVM linker.",
@@ -236,6 +280,8 @@
           "name": "llvm",
           "default-features": false,
           "features": [
+            "clang",
+            "enable-terminfo",
             "tools"
           ]
         }
@@ -248,7 +294,8 @@
           "name": "llvm",
           "default-features": false,
           "features": [
-            "tools"
+            "tools",
+            "utils"
           ]
         }
       ]
@@ -260,6 +307,7 @@
           "name": "llvm",
           "default-features": false,
           "features": [
+            "clang",
             "utils"
           ]
         }
@@ -279,7 +327,16 @@
       ]
     },
     "pstl": {
-      "description": "Include pstl (Parallel STL) library."
+      "description": "Include pstl (Parallel STL) library.",
+      "dependencies": [
+        {
+          "name": "llvm",
+          "default-features": false,
+          "features": [
+            "tools"
+          ]
+        }
+      ]
     },
     "target-aarch64": {
       "description": "Build with AArch64 backend."
@@ -293,11 +350,16 @@
           "features": [
             "target-aarch64",
             "target-amdgpu",
+            "target-arc",
             "target-arm",
             "target-avr",
             "target-bpf",
+            "target-csky",
+            "target-directx",
             "target-hexagon",
             "target-lanai",
+            "target-loongarch",
+            "target-m68k",
             "target-mips",
             "target-msp430",
             "target-nvptx",
@@ -309,7 +371,8 @@
             "target-ve",
             "target-webassembly",
             "target-x86",
-            "target-xcore"
+            "target-xcore",
+            "target-xtensa"
           ]
         }
       ]
@@ -317,6 +380,9 @@
     "target-amdgpu": {
       "description": "Build with AMDGPU backend."
     },
+    "target-arc": {
+      "description": "Build with ARC backend (experimental)."
+    },
     "target-arm": {
       "description": "Build with ARM backend."
     },
@@ -326,12 +392,24 @@
     "target-bpf": {
       "description": "Build with BPF backend."
     },
+    "target-csky": {
+      "description": "Build with CSKY backend (experimental)."
+    },
+    "target-directx": {
+      "description": "Build with DirectX backend (experimental)."
+    },
     "target-hexagon": {
       "description": "Build with Hexagon backend."
     },
     "target-lanai": {
       "description": "Build with Lanai backend."
     },
+    "target-loongarch": {
+      "description": "Build with LoongArch backend."
+    },
+    "target-m68k": {
+      "description": "Build with M68k backend (experimental)."
+    },
     "target-mips": {
       "description": "Build with Mips backend."
     },
@@ -351,7 +429,7 @@
       "description": "Build with Sparc backend."
     },
     "target-spirv": {
-      "description": "Build with Spriv backend."
+      "description": "Build with SPIRV backend (experimental)."
     },
     "target-systemz": {
       "description": "Build with SystemZ backend."
@@ -368,17 +446,11 @@
     "target-xcore": {
       "description": "Build with XCore backend."
     },
+    "target-xtensa": {
+      "description": "Build with Xtensa backend (experimental)."
+    },
     "tools": {
-      "description": "Build LLVM tools.",
-      "dependencies": [
-        {
-          "name": "llvm",
-          "default-features": false,
-          "features": [
-            "enable-threads"
-          ]
-        }
-      ]
+      "description": "Build LLVM tools."
     },
     "utils": {
       "description": "Build LLVM utils."
diff --git a/external_imported/vcpkg/ports/lmdb/cmake/CMakeLists.txt b/external_imported/vcpkg/ports/lmdb/cmake/CMakeLists.txt
index babddef00..1388328a1 100644
--- a/external_imported/vcpkg/ports/lmdb/cmake/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/lmdb/cmake/CMakeLists.txt
@@ -1,81 +1,72 @@
-cmake_minimum_required(VERSION 2.8)
-
-file(READ "${CMAKE_CURRENT_SOURCE_DIR}/lmdb.h" VERSION_HEADER)
-string(REGEX MATCH ".*MDB_VERSION_MAJOR[ \t]+([0-9])" MAJOR_VERSION_MATCH "${VERSION_HEADER}")
-set(LMDB_MAJOR_VERSION ${CMAKE_MATCH_1})
-string(REGEX MATCH ".*MDB_VERSION_MINOR[ \t]+([0-9])" MINOR_VERSION_MATCH "${VERSION_HEADER}")
-set(LMDB_MINOR_VERSION ${CMAKE_MATCH_1})
-string(REGEX MATCH ".*MDB_VERSION_PATCH[ \t]+([0-9]+)" PATCH_VERSION_MATCH "${VERSION_HEADER}")
-set(LMDB_PATCH_VERSION ${CMAKE_MATCH_1})
-
-set(LMDB_VERSION "${LMDB_MAJOR_VERSION}.${LMDB_MINOR_VERSION}.${LMDB_PATCH_VERSION}")
+cmake_minimum_required(VERSION 3.27)
 
 project(lmdb)
 
 option(LMDB_BUILD_TOOLS "Build lmdb tools" OFF)
 option(LMDB_BUILD_TESTS "Build lmdb tests" OFF)
 option(LMDB_INSTALL_HEADERS "Install LMDB header files" ON)
-set(LMDB_INCLUDE_INSTALL_DIR include CACHE PATH "Install directory for headers")
-set(LMDB_LIBRARY_INSTALL_DIR lib CACHE PATH "Install directory for library")
-set(LMDB_RUNTIME_INSTALL_DIR bin CACHE PATH "Install directory for binaries/dlls")
-set(LMDB_CONFIG_INSTALL_DIR share/lmdb CACHE PATH "Install directory for cmake config files")
-
-if(MSVC AND BUILD_SHARED_LIBS)
-set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /DEF:\"${CMAKE_CURRENT_SOURCE_DIR}/lmdbd.def\"")
-set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /DEF:\"${CMAKE_CURRENT_SOURCE_DIR}/lmdb.def\"")
-endif()
 
-set(SRCS lmdb mdb.c lmdb.h midl.c midl.h )
-add_library(lmdb ${SRCS})
+include(GNUInstallDirs)
 
-if (WIN32)
-  target_link_libraries(lmdb PRIVATE ntdll.lib)
+add_library(lmdb mdb.c lmdb.h midl.c midl.h)
+if(WIN32 AND BUILD_SHARED_LIBS)
+    target_sources(lmdb PRIVATE lmdb.def)
 endif()
 
-install(TARGETS lmdb DESTINATION lib
-        EXPORT lmdb-targets
-        RUNTIME DESTINATION ${LMDB_RUNTIME_INSTALL_DIR}
-        LIBRARY DESTINATION ${LMDB_LIBRARY_INSTALL_DIR}
-        ARCHIVE DESTINATION ${LMDB_LIBRARY_INSTALL_DIR}
-        )
+set(THREADS_PREFER_PTHREAD_FLAG 1)
+find_package(Threads REQUIRED)
+target_link_libraries(lmdb PRIVATE Threads::Threads)
+
+install(TARGETS lmdb
+    EXPORT unofficial-lmdb-targets
+    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+    LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+    ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+)
 
 if(LMDB_INSTALL_HEADERS)
-  install(FILES lmdb.h midl.h DESTINATION ${LMDB_INCLUDE_INSTALL_DIR})
+    install(FILES lmdb.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
 endif()
+target_include_directories(lmdb INTERFACE "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
 
 include(CMakePackageConfigHelpers)
-
-set(INSTALL_INCLUDE_DIR ${LMDB_INCLUDE_INSTALL_DIR})
-configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/package-config.cmakein ${CMAKE_CURRENT_BINARY_DIR}/lmdb-config.cmake
-                              INSTALL_DESTINATION ${LMDB_CONFIG_INSTALL_DIR}
-                              PATH_VARS INSTALL_INCLUDE_DIR
-                              )
-
-write_basic_package_version_file( ${CMAKE_CURRENT_BINARY_DIR}/lmdb-config-version.cmake VERSION ${LMDB_VERSION} COMPATIBILITY SameMajorVersion )
-
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/lmdb-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/lmdb-config-version.cmake
-        DESTINATION ${LMDB_CONFIG_INSTALL_DIR} )
-
-
-install(EXPORT lmdb-targets DESTINATION ${LMDB_CONFIG_INSTALL_DIR})
+configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/package-config.cmakein" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-lmdb-config.cmake"
+    INSTALL_DESTINATION "${CMAKE_INSTALL_DATADIR}/lmdb"
+)
+write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-lmdb-config-version.cmake"
+    VERSION "${LMDB_VERSION}"
+    COMPATIBILITY SameMajorVersion
+)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/unofficial-lmdb-config.cmake" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-lmdb-config-version.cmake"
+    DESTINATION "${CMAKE_INSTALL_DATADIR}/unofficial-lmdb"
+)
+install(EXPORT unofficial-lmdb-targets
+    NAMESPACE unofficial::lmdb::
+    DESTINATION "${CMAKE_INSTALL_DATADIR}/unofficial-lmdb"
+)
 
 if(LMDB_BUILD_TOOLS)
-  # don't build mdb_dump/load/stat since they will
-  # not build on windows
-  foreach(_tool mdb_copy)
-    add_executable(${_tool} ${_tool}.c)
-    target_link_libraries(${_tool} lmdb)
-  endforeach()
+    set(getopt_libs "")
+    if(WIN32 AND NOT MINGW)
+        find_package(unofficial-getopt-win32 REQUIRED)
+        set(getopt_libs "unofficial::getopt-win32::getopt")
+    endif()
+    foreach(tool IN ITEMS mdb_copy mdb_dump mdb_load mdb_stat)
+        add_executable(${tool} ${tool}.c)
+        target_link_libraries(${tool} lmdb ${getopt_libs})
+        install(TARGETS ${tool}
+            RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+        )
+    endforeach()
 endif()
 
 if(LMDB_BUILD_TESTS)
-  enable_testing()
-  # don't use mtest6 since it will only build in static
-  # build
-  foreach(_test mtest mtest2 mtest3 mtest4 mtest5)
-    add_executable(${_test} ${_test}.c)
-    target_link_libraries(${_test} lmdb)
-    add_test(NAME ${_test}
-             COMMAND ${CMAKE_COMMAND} -DTEST=$<TARGET_FILE:"${_test}" -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/runtest.cmake)
-  endforeach()
+    enable_testing()
+    # mtest6 needs more symbols than provided by some builds of lmdb
+    foreach(test IN ITEMS mtest mtest2 mtest3 mtest4 mtest5)
+        add_executable(${test} ${test}.c)
+        target_link_libraries(${test} lmdb)
+        add_test(NAME ${test}
+            COMMAND "${CMAKE_COMMAND}" "-DTEST=$<TARGET_FILE:${test}" -P "${CMAKE_CURRENT_SOURCE_DIR}/cmake/runtest.cmake")
+    endforeach()
 endif()
diff --git a/external_imported/vcpkg/ports/lmdb/cmake/cmake/package-config.cmakein b/external_imported/vcpkg/ports/lmdb/cmake/cmake/package-config.cmakein
index 1bc3ab859..c73f07112 100644
--- a/external_imported/vcpkg/ports/lmdb/cmake/cmake/package-config.cmakein
+++ b/external_imported/vcpkg/ports/lmdb/cmake/cmake/package-config.cmakein
@@ -1,13 +1,7 @@
 @PACKAGE_INIT@
 
-include("${CMAKE_CURRENT_LIST_DIR}/lmdb-targets.cmake")
+include(CMakeFindDependencyMacro)
+set(THREADS_PREFER_PTHREAD_FLAG 1)
+find_dependency(Threads)
 
-set(${CMAKE_FIND_PACKAGE_NAME}_INCLUDE_DIR @PACKAGE_INSTALL_INCLUDE_DIR@)
-set(${CMAKE_FIND_PACKAGE_NAME}_INCLUDE_DIRS @PACKAGE_INSTALL_INCLUDE_DIR@)
-set(${CMAKE_FIND_PACKAGE_NAME}_LIBRARIES lmdb)
-
-string(TOUPPER "${CMAKE_FIND_PACKAGE_NAME}" UPPER_PACKAGE_NAME)
-
-set(${UPPER_PACKAGE_NAME}_INCLUDE_DIR @PACKAGE_INSTALL_INCLUDE_DIR@)
-set(${UPPER_PACKAGE_NAME}_INCLUDE_DIRS @PACKAGE_INSTALL_INCLUDE_DIR@)
-set(${UPPER_PACKAGE_NAME}_LIBRARIES lmdb)
+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-lmdb-targets.cmake")
diff --git a/external_imported/vcpkg/ports/lmdb/cmake/cmake/runtest.cmake b/external_imported/vcpkg/ports/lmdb/cmake/cmake/runtest.cmake
index c67b095ad..4d9416249 100644
--- a/external_imported/vcpkg/ports/lmdb/cmake/cmake/runtest.cmake
+++ b/external_imported/vcpkg/ports/lmdb/cmake/cmake/runtest.cmake
@@ -1,3 +1,3 @@
-file(MAKE_DIRECTORY testb)
-execute_process(COMMAND ${TEST})
-file(REMOVE_RECURSE testdb)
\ No newline at end of file
+file(REMOVE_RECURSE testdb)
+file(MAKE_DIRECTORY testdb)
+execute_process(COMMAND "${TEST}")
diff --git a/external_imported/vcpkg/ports/lmdb/cmake/lmdb.def b/external_imported/vcpkg/ports/lmdb/cmake/lmdb.def
index 275658c36..ef9d5e3e7 100644
--- a/external_imported/vcpkg/ports/lmdb/cmake/lmdb.def
+++ b/external_imported/vcpkg/ports/lmdb/cmake/lmdb.def
@@ -55,4 +55,4 @@ EXPORTS
    mdb_cmp
    mdb_dcmp
    mdb_reader_list
-   mdb_reader_check
\ No newline at end of file
+   mdb_reader_check
diff --git a/external_imported/vcpkg/ports/lmdb/cmake/lmdbd.def b/external_imported/vcpkg/ports/lmdb/cmake/lmdbd.def
deleted file mode 100644
index ded15386d..000000000
--- a/external_imported/vcpkg/ports/lmdb/cmake/lmdbd.def
+++ /dev/null
@@ -1,58 +0,0 @@
-LIBRARY   lmdbd
-EXPORTS
-   mdb_version
-   mdb_strerror
-   mdb_env_create
-   mdb_env_open
-   mdb_env_copy
-   mdb_env_copyfd
-   mdb_env_copy2
-   mdb_env_copyfd2
-   mdb_env_stat
-   mdb_env_info
-   mdb_env_sync
-   mdb_env_close
-   mdb_env_set_flags
-   mdb_env_get_flags
-   mdb_env_get_path
-   mdb_env_get_fd
-   mdb_env_set_mapsize
-   mdb_env_set_maxreaders
-   mdb_env_get_maxreaders
-   mdb_env_set_maxdbs
-   mdb_env_get_maxkeysize
-   mdb_env_set_userctx
-   mdb_env_get_userctx
-   mdb_env_set_assert
-   mdb_txn_begin
-   mdb_txn_env
-   mdb_txn_id
-   mdb_txn_commit
-   mdb_txn_abort
-   mdb_txn_reset
-   mdb_txn_renew
-   mdb_dbi_open
-   mdb_stat
-   mdb_dbi_flags
-   mdb_dbi_close
-   mdb_drop
-   mdb_set_compare
-   mdb_set_dupsort
-   mdb_set_relfunc
-   mdb_set_relctx
-   mdb_get
-   mdb_put
-   mdb_del
-   mdb_cursor_open
-   mdb_cursor_close
-   mdb_cursor_renew
-   mdb_cursor_txn
-   mdb_cursor_dbi
-   mdb_cursor_get
-   mdb_cursor_put
-   mdb_cursor_del
-   mdb_cursor_count
-   mdb_cmp
-   mdb_dcmp
-   mdb_reader_list
-   mdb_reader_check
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/lmdb/getopt-win32.diff b/external_imported/vcpkg/ports/lmdb/getopt-win32.diff
new file mode 100644
index 000000000..1f86f8b93
--- /dev/null
+++ b/external_imported/vcpkg/ports/lmdb/getopt-win32.diff
@@ -0,0 +1,50 @@
+diff --git a/libraries/liblmdb/mdb_dump.c b/libraries/liblmdb/mdb_dump.c
+index 7ea72e8..198230c 100644
+--- a/libraries/liblmdb/mdb_dump.c
++++ b/libraries/liblmdb/mdb_dump.c
+@@ -16,7 +16,11 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <ctype.h>
++#ifdef _MSC_VER
++#include <getopt.h>
++#else
+ #include <unistd.h>
++#endif
+ #include <signal.h>
+ #include "lmdb.h"
+ 
+diff --git a/libraries/liblmdb/mdb_load.c b/libraries/liblmdb/mdb_load.c
+index d2a3cec..f050286 100644
+--- a/libraries/liblmdb/mdb_load.c
++++ b/libraries/liblmdb/mdb_load.c
+@@ -16,7 +16,11 @@
+ #include <errno.h>
+ #include <string.h>
+ #include <ctype.h>
++#ifdef _MSC_VER
++#include <getopt.h>
++#else
+ #include <unistd.h>
++#endif
+ #include "lmdb.h"
+ 
+ #define PRINT	1
+diff --git a/libraries/liblmdb/mdb_stat.c b/libraries/liblmdb/mdb_stat.c
+index 3a81175..f1f4a75 100644
+--- a/libraries/liblmdb/mdb_stat.c
++++ b/libraries/liblmdb/mdb_stat.c
+@@ -14,7 +14,13 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#ifdef _MSC_VER
++#include <getopt.h>
++#include <BaseTsd.h>
++typedef SSIZE_T ssize_t;
++#else
+ #include <unistd.h>
++#endif
+ #include "lmdb.h"
+ 
+ #ifdef	_WIN32
diff --git a/external_imported/vcpkg/ports/lmdb/lmdb-config.cmake b/external_imported/vcpkg/ports/lmdb/lmdb-config.cmake
new file mode 100644
index 000000000..50b92707f
--- /dev/null
+++ b/external_imported/vcpkg/ports/lmdb/lmdb-config.cmake
@@ -0,0 +1,14 @@
+file(READ "${CMAKE_CURRENT_LIST_DIR}/../lmdb/usage" usage)
+message(WARNING "find_package(lmdb) is deprecated.\n${usage}")
+
+include(CMakeFindDependencyMacro)
+find_dependency(unofficial-lmdb ${${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION})
+
+set(${CMAKE_FIND_PACKAGE_NAME}_INCLUDE_DIR "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include")
+set(${CMAKE_FIND_PACKAGE_NAME}_INCLUDE_DIRS "${${CMAKE_FIND_PACKAGE_NAME}_INCLUDE_DIR}")
+set(${CMAKE_FIND_PACKAGE_NAME}_LIBRARIES lmdb)
+
+string(TOUPPER "${CMAKE_FIND_PACKAGE_NAME}" UPPER_PACKAGE_NAME)
+set(${UPPER_PACKAGE_NAME}_INCLUDE_DIR "${${CMAKE_FIND_PACKAGE_NAME}_INCLUDE_DIR}")
+set(${UPPER_PACKAGE_NAME}_INCLUDE_DIRS "${${CMAKE_FIND_PACKAGE_NAME}_INCLUDE_DIR}")
+set(${UPPER_PACKAGE_NAME}_LIBRARIES lmdb)
diff --git a/external_imported/vcpkg/ports/lmdb/portfile.cmake b/external_imported/vcpkg/ports/lmdb/portfile.cmake
index 263966bbd..2e32aca98 100644
--- a/external_imported/vcpkg/ports/lmdb/portfile.cmake
+++ b/external_imported/vcpkg/ports/lmdb/portfile.cmake
@@ -1,23 +1,43 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO LMDB/lmdb
-    REF 8ad7be2510414b9506ec9f9e24f24d04d9b04a1a # LMDB_0.9.29
-    SHA512 a18b6217761bdfcc5964d9817addd2d0c6c735d02a823717eb7ae1561a48110da0708a3290e21297d481e4d8eeb5d92a4a6860ff44888bf2da665cd9f167513c
+    REF "LMDB_${VERSION}"
+    SHA512 a5763ff94af0b5bbc2406c52890797e6232e77593bacdb240441ed30c8634e4e6de6eba206880475544e21561ccd0be2dee16733d6ec35483eb1dbbb81913a8d
     HEAD_REF master
+    PATCHES
+        getopt-win32.diff
 )
-
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/cmake/" DESTINATION "${SOURCE_PATH}/libraries/liblmdb")
 
+vcpkg_check_features(OUT_FEATURE_OPTIONS options_release
+    FEATURES
+        tools   LMDB_BUILD_TOOLS
+)
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}/libraries/liblmdb"
+    OPTIONS
+        "-DLMDB_VERSION=${VERSION}"
+    OPTIONS_RELEASE
+        ${options_release}
     OPTIONS_DEBUG
         -DLMDB_INSTALL_HEADERS=OFF
 )
 
 vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-lmdb)
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+if(LMDB_BUILD_TOOLS)
+    vcpkg_copy_tools(TOOL_NAMES mdb_copy mdb_dump mdb_load mdb_stat AUTO_CLEAN)
+endif()
 
-file(INSTALL "${SOURCE_PATH}/libraries/liblmdb/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/lmdb" RENAME copyright)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-vcpkg_copy_pdbs()
+file(COPY "${CURRENT_PORT_DIR}/lmdb-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+file(COPY "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(
+    FILE_LIST
+        "${SOURCE_PATH}/libraries/liblmdb/COPYRIGHT"
+        "${SOURCE_PATH}/libraries/liblmdb/LICENSE"
+)
diff --git a/external_imported/vcpkg/ports/lmdb/usage b/external_imported/vcpkg/ports/lmdb/usage
new file mode 100644
index 000000000..ef273ae52
--- /dev/null
+++ b/external_imported/vcpkg/ports/lmdb/usage
@@ -0,0 +1,4 @@
+lmdb provides CMake targets:
+
+  find_package(unofficial-lmdb CONFIG REQUIRED)
+  target_link_libraries(main PRIVATE unofficial::lmdb::lmdb)
diff --git a/external_imported/vcpkg/ports/lmdb/vcpkg.json b/external_imported/vcpkg/ports/lmdb/vcpkg.json
index 210c776d1..f743855b2 100644
--- a/external_imported/vcpkg/ports/lmdb/vcpkg.json
+++ b/external_imported/vcpkg/ports/lmdb/vcpkg.json
@@ -1,11 +1,9 @@
 {
   "name": "lmdb",
-  "version": "0.9.29",
-  "port-version": 2,
+  "version": "0.9.31",
   "description": "LMDB is an extraordinarily fast, memory-efficient database",
   "homepage": "https://github.com/LMDB/lmdb",
-  "license": null,
-  "supports": "!(arm & windows)",
+  "license": "OLDAP-2.8",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
@@ -15,5 +13,14 @@
       "name": "vcpkg-cmake-config",
       "host": true
     }
-  ]
+  ],
+  "features": {
+    "tools": {
+      "description": "Build tools",
+      "supports": "!uwp",
+      "dependencies": [
+        "getopt"
+      ]
+    }
+  }
 }
diff --git a/external_imported/vcpkg/ports/lockpp/portfile.cmake b/external_imported/vcpkg/ports/lockpp/portfile.cmake
index 1af259ee9..b873754c3 100644
--- a/external_imported/vcpkg/ports/lockpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/lockpp/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Soundux/lockpp
-    REF v1.0.2
-    SHA512 6d92d3bbcbad3e2afd844ab95526e1eb49a7722d0d9d972ff85df561bbb9dc0b7a8aa5c83847f6832a806e52dde427ec0bcd11570b095d9cce7e35b3717e1f51
+    REF "v${VERSION}"
+    SHA512 540caaec65fc89d1e683af9b7366997b4cd5338ebba9de3ea2003b74dc4b8249a5b1cc223892afddb0e165146c3b36ded26bd88f5fe2c77d125981de8a774baf
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/lockpp/vcpkg.json b/external_imported/vcpkg/ports/lockpp/vcpkg.json
index bc5b34877..4391b5d91 100644
--- a/external_imported/vcpkg/ports/lockpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/lockpp/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "lockpp",
-  "version": "1.0.2",
+  "version": "2.6",
   "description": "A C++17 Library that provides mutex protected objects",
   "homepage": "https://github.com/Soundux/lockpp",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/log4cplus/portfile.cmake b/external_imported/vcpkg/ports/log4cplus/portfile.cmake
index 3b26122e2..938e87e15 100644
--- a/external_imported/vcpkg/ports/log4cplus/portfile.cmake
+++ b/external_imported/vcpkg/ports/log4cplus/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO log4cplus/log4cplus
-    REF REL_2_0_7
-    SHA512 FE5FCEB346AC19A6D953661A20E8AA02AB48E872F427D958EA99C62F534DDF1FA4511FFD67A662605B1F225E3A6C06B0EE2C1B0EB62DE3AA0316F47F778DF06D
+    REF REL_2_1_1
+    SHA512 ddc63ad574aed7d13980308c1f4d3a31a7fa9c7d4a14de923f9b3a851492d17f64f34166b6be77fc8584c0e98cd1f34ed3d9ba268e7456fd1ff3b7d8125dbe3a
     HEAD_REF master
 )
 
@@ -40,13 +40,18 @@ vcpkg_cmake_configure(
 )
 
 vcpkg_cmake_install()
-
+vcpkg_fixup_pkgconfig()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/log4cplus)
-
 vcpkg_copy_pdbs()
 
+if(NOT VCPKG_BUILD_TYPE)
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/log4cplus.pc" "-llog4cplus" "-llog4cplusD")
+endif()
+
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(REMOVE "${CURRENT_PACKAGES_DIR}/share/${PORT}/ChangeLog"
+    "${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE"
+    "${CURRENT_PACKAGES_DIR}/share/${PORT}/README.md")
 
-# Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/log4cplus/vcpkg.json b/external_imported/vcpkg/ports/log4cplus/vcpkg.json
index a70adf299..2d3bd2f32 100644
--- a/external_imported/vcpkg/ports/log4cplus/vcpkg.json
+++ b/external_imported/vcpkg/ports/log4cplus/vcpkg.json
@@ -1,9 +1,9 @@
 {
   "name": "log4cplus",
-  "version": "2.0.7",
-  "port-version": 1,
+  "version": "2.1.1",
   "description": "A simple to use C++ logging API providing thread--safe, flexible, and arbitrarily granular control over log management and configuration",
   "homepage": "https://github.com/log4cplus/log4cplus",
+  "license": "Apache-2.0 AND BSD-2-Clause",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/log4cpp-log4cpp/fix_link_msvcrt.patch b/external_imported/vcpkg/ports/log4cpp-log4cpp/fix_link_msvcrt.patch
new file mode 100644
index 000000000..7e08edc00
--- /dev/null
+++ b/external_imported/vcpkg/ports/log4cpp-log4cpp/fix_link_msvcrt.patch
@@ -0,0 +1,31 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 140910b..08cde3b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -81,8 +81,12 @@ ADD_LIBRARY ( ${LOG4CPP_LIBRARY_NAME}
+ )
+ 
+ IF (WIN32)
+-  TARGET_LINK_LIBRARIES (${LOG4CPP_LIBRARY_NAME} kernel32 user32 ws2_32 advapi32 )
+-  SET_TARGET_PROPERTIES(${LOG4CPP_LIBRARY_NAME} PROPERTIES LINK_FLAGS /NODEFAULTLIB:msvcrt )
++  TARGET_LINK_LIBRARIES (${LOG4CPP_LIBRARY_NAME} kernel32 user32 ws2_32 advapi32)
++  IF ( CMAKE_BUILD_TYPE MATCHES "Debug" )
++    SET_TARGET_PROPERTIES(${LOG4CPP_LIBRARY_NAME} PROPERTIES LINK_FLAGS /NODEFAULTLIB:MSVCRT)
++  ELSE(CMAKE_BUILD_TYPE MATCHES "Debug" )
++    SET_TARGET_PROPERTIES(${LOG4CPP_LIBRARY_NAME} PROPERTIES LINK_FLAGS /NODEFAULTLIB:MSVCRTD)
++  ENDIF(CMAKE_BUILD_TYPE MATCHES "Debug" )
+ ENDIF (WIN32)
+ 
+ INSTALL (
+@@ -92,9 +96,11 @@ INSTALL (
+   PATTERN ".svn" EXCLUDE
+   PATTERN "*.am" EXCLUDE
+   PATTERN "*.in" EXCLUDE
++  PATTERN ".cvsignore" EXCLUDE
+   )
+ 
+ INSTALL (
+   TARGETS ${LOG4CPP_LIBRARY_NAME}
+   ARCHIVE DESTINATION lib
++  RUNTIME DESTINATION bin
+   )
diff --git a/external_imported/vcpkg/ports/log4cpp-log4cpp/portfile.cmake b/external_imported/vcpkg/ports/log4cpp-log4cpp/portfile.cmake
new file mode 100644
index 000000000..bab255afe
--- /dev/null
+++ b/external_imported/vcpkg/ports/log4cpp-log4cpp/portfile.cmake
@@ -0,0 +1,79 @@
+vcpkg_from_sourceforge(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO log4cpp/log4cpp-1.1.x%20%28new%29
+    REF log4cpp-1.1
+    FILENAME "log4cpp-1.1.4.tar.gz"
+    SHA512 0cdbd46ccd048d70bea3c35d22080dc5dd21fc3b9c415fe464847e60775954f57e9c8344506f0f94f16e90e8bdaa9cc6d84d3aa65191501e52ee8dfc639f0398
+    PATCHES
+        fix_link_msvcrt.patch
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+)
+
+if(VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_cmake_install()
+    vcpkg_copy_pdbs()
+
+    set(VCPKG_POLICY_DLLS_WITHOUT_EXPORTS enabled)
+    set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib" "${CURRENT_PACKAGES_DIR}/lib")
+
+    if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+    endif()
+elseif(VCPKG_TARGET_IS_LINUX)
+    #message(STATUS "Configuring ${TARGET_TRIPLET}")
+    if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+        set(SHARED_STATIC --enable-static --disable-shared)
+    else()
+        set(SHARED_STATIC --disable-static --enable-shared)
+    endif()
+
+    set(OPTIONS ${SHARED_STATIC})
+    message(STATUS "Configuring ${TARGET_TRIPLET}-dbg")
+    set(CFLAGS "${VCPKG_CXX_FLAGS} ${VCPKG_CXX_FLAGS_DEBUG} -fPIC -O0 -g -I${SOURCE_PATH}/include")
+    set(LDFLAGS "${VCPKG_LINKER_FLAGS}")
+    #create makefile
+    vcpkg_execute_required_process(
+    COMMAND ${SOURCE_PATH}/configure --prefix=${CURRENT_PACKAGES_DIR}/debug ${OPTIONS} --with-sysroot=${CURRENT_INSTALLED_DIR}/debug
+    WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
+    LOGNAME configure-${TARGET_TRIPLET}-dbg)
+    
+    message(STATUS "Building ${TARGET_TRIPLET}-dbg")
+    vcpkg_execute_required_process(
+        COMMAND make -j install "CFLAGS=${CFLAGS}" "LDFLAGS=${LDFLAGS}"
+        WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
+        LOGNAME install-${TARGET_TRIPLET}-dbg
+    )
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+    
+    #build release log4cpp
+    file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
+    file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
+    message(STATUS "Configuring ${TARGET_TRIPLET}-rel")
+    set(CFLAGS "${VCPKG_CXX_FLAGS} ${VCPKG_CXX_FLAGS_RELEASE} -fPIC -O3 -I${SOURCE_PATH}/include")
+    set(LDFLAGS "${VCPKG_LINKER_FLAGS}")
+    vcpkg_execute_required_process(
+        COMMAND ${SOURCE_PATH}/configure --prefix=${CURRENT_PACKAGES_DIR} ${OPTIONS} --with-sysroot=${CURRENT_INSTALLED_DIR}
+        WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
+        LOGNAME configure-${TARGET_TRIPLET}-rel
+    )
+    message(STATUS "Building ${TARGET_TRIPLET}-rel")
+    vcpkg_execute_required_process(
+        COMMAND make -j install "CFLAGS=${CFLAGS}" "LDFLAGS=${LDFLAGS}"
+        WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
+        LOGNAME install-${TARGET_TRIPLET}-rel
+    )
+    
+    if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+        file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+    endif()
+    vcpkg_fixup_pkgconfig()
+endif()
+
+# Handle copyright
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/log4cpp-log4cpp/vcpkg.json b/external_imported/vcpkg/ports/log4cpp-log4cpp/vcpkg.json
new file mode 100644
index 000000000..d6c118885
--- /dev/null
+++ b/external_imported/vcpkg/ports/log4cpp-log4cpp/vcpkg.json
@@ -0,0 +1,13 @@
+{
+  "name": "log4cpp-log4cpp",
+  "version": "1.1.4",
+  "description": "A library of C++ classes for flexible logging to files (rolling), syslog, IDSA and other destinations. It is modeled after the Log for Java library (http://www.log4j.org), staying as close to their API as is reasonable.",
+  "homepage": "https://sourceforge.net/projects/log4cpp/",
+  "supports": "(linux | windows) & !uwp",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/log4cpp/Fix-StaticSupport.patch b/external_imported/vcpkg/ports/log4cpp/Fix-StaticSupport.patch
deleted file mode 100644
index 8053b4ce5..000000000
--- a/external_imported/vcpkg/ports/log4cpp/Fix-StaticSupport.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 529c18e..beace9e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -21,7 +21,11 @@ SET(LOG4CPP_LIBS)
- 
- IF (WIN32)
-   SET (CMAKE_DEBUG_POSTFIX "d")
--  LIST(APPEND LOG4CPP_CFLAGS -D_CRT_SECURE_NO_WARNINGS -DLOG4CPP_HAS_DLL -DLOG4CPP_BUILD_DLL )
-+  IF (BUILD_SHARED_LIBS)
-+    LIST(APPEND LOG4CPP_CFLAGS -D_CRT_SECURE_NO_WARNINGS -DLOG4CPP_HAS_DLL -DLOG4CPP_BUILD_DLL )
-+  ELSE ()
-+    LIST(APPEND LOG4CPP_CFLAGS -D_CRT_SECURE_NO_WARNINGS )
-+  ENDIF ()
- ELSE (WIN32)
-   IF (APPLE)
- #	LIST(APPEND LOG4CPP_CFLAGS -DLOG4CPP_HAVE_SSTREAM)
-@@ -32,7 +36,7 @@ ENDIF (WIN32)
- 
- SET ( LOG4CPP_LIBRARY_NAME "orocos-log4cpp" )
- 
--ADD_LIBRARY ( ${LOG4CPP_LIBRARY_NAME} SHARED
-+ADD_LIBRARY ( ${LOG4CPP_LIBRARY_NAME}
-   src/Appender.cpp
-   src/AppenderSkeleton.cpp
-   src/AppendersFactory.cpp
diff --git a/external_imported/vcpkg/ports/log4cpp/fix-export-targets.patch b/external_imported/vcpkg/ports/log4cpp/fix-export-targets.patch
deleted file mode 100644
index 30b5320cd..000000000
--- a/external_imported/vcpkg/ports/log4cpp/fix-export-targets.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 19767a0..59dbf6c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -161,11 +161,13 @@ INSTALL (
-   )
- 
- INSTALL(TARGETS ${LOG4CPP_LIBRARY_NAME}
-+    EXPORT log4cpp-targets
-     LIBRARY DESTINATION lib
-     ARCHIVE DESTINATION lib
-     RUNTIME DESTINATION bin)
- 
- INSTALL(FILES package.xml DESTINATION share/log4cpp)
-+INSTALL(EXPORT log4cpp-targets NAMESPACE log4cpp:: DESTINATION share/log4cpp)
- 
- ###########################################################
- # DOCUMENTATION
diff --git a/external_imported/vcpkg/ports/log4cpp/fix-includepath.patch b/external_imported/vcpkg/ports/log4cpp/fix-includepath.patch
deleted file mode 100644
index 2fdac90fe..000000000
--- a/external_imported/vcpkg/ports/log4cpp/fix-includepath.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index beace9e..c8264ec 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -136,7 +136,7 @@ SET(prefix "${CMAKE_INSTALL_PREFIX}")
- SET(exec_prefix "\${prefix}")
- SET(log4cpp_cflags "")
- SET(log4cpp_libs "${LOG4CPP_LIBS}")
--SET(includedir "\${prefix}/include/orocos")
-+SET(includedir "\${prefix}/include")
- SET(libdir "\${prefix}/lib")
- CONFIGURE_FILE(log4cpp.pc.in ${CMAKE_CURRENT_BINARY_DIR}/orocos-log4cpp.pc @ONLY)
- 
-@@ -147,7 +147,7 @@ INSTALL(
- 
- INSTALL (
-   DIRECTORY include/log4cpp
--  DESTINATION include/orocos
-+  DESTINATION include
-   PATTERN "config.h.in" EXCLUDE
-   PATTERN ".svn" EXCLUDE
-   PATTERN "*.am" EXCLUDE
-@@ -157,7 +157,7 @@ INSTALL (
- 
- INSTALL (
-   FILES ${CMAKE_CURRENT_BINARY_DIR}/include/log4cpp/config.h
--  DESTINATION include/orocos/log4cpp
-+  DESTINATION include/log4cpp
-   )
- 
- INSTALL(TARGETS ${LOG4CPP_LIBRARY_NAME}
diff --git a/external_imported/vcpkg/ports/log4cpp/fix-install-targets.patch b/external_imported/vcpkg/ports/log4cpp/fix-install-targets.patch
deleted file mode 100644
index 49cdedf1d..000000000
--- a/external_imported/vcpkg/ports/log4cpp/fix-install-targets.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8db2287..529c18e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -159,7 +159,7 @@ INSTALL (
- INSTALL(TARGETS ${LOG4CPP_LIBRARY_NAME}
-     LIBRARY DESTINATION lib
-     ARCHIVE DESTINATION lib
--    RUNTIME DESTINATION lib)
-+    RUNTIME DESTINATION bin)
- 
- INSTALL(FILES package.xml DESTINATION share/log4cpp)
- 
diff --git a/external_imported/vcpkg/ports/log4cpp/log4cpp-config.in.cmake b/external_imported/vcpkg/ports/log4cpp/log4cpp-config.in.cmake
deleted file mode 100644
index cdecd4b70..000000000
--- a/external_imported/vcpkg/ports/log4cpp/log4cpp-config.in.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-
-if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT WIN32)
-    include(CMakeFindDependencyMacro)
-    find_dependency(Threads)
-endif()
-
-include(${CMAKE_CURRENT_LIST_DIR}/log4cpp-targets.cmake)
diff --git a/external_imported/vcpkg/ports/log4cpp/portfile.cmake b/external_imported/vcpkg/ports/log4cpp/portfile.cmake
deleted file mode 100644
index dd203758a..000000000
--- a/external_imported/vcpkg/ports/log4cpp/portfile.cmake
+++ /dev/null
@@ -1,35 +0,0 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO orocos-toolchain/log4cpp
-    REF v2.9.1
-    SHA512 5bd222c820a15c5d96587ac9fe864c3e2dc0fbce8389692be8dd41553ac0308002ad8d6f4ef3ef10af1d796f8ded410788d1a5d22f15505fac639da3f73e3518
-    HEAD_REF master
-    PATCHES
-        fix-install-targets.patch
-        Fix-StaticSupport.patch
-        fix-includepath.patch
-		fix-export-targets.patch
-)
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-)
-
-vcpkg_cmake_install()
-
-vcpkg_fixup_pkgconfig()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-vcpkg_cmake_config_fixup(CONFIG_PATH share/${PORT})
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-
-vcpkg_copy_pdbs()
-
-configure_file(
-    "${CMAKE_CURRENT_LIST_DIR}/log4cpp-config.in.cmake"
-    "${CURRENT_PACKAGES_DIR}/share/${PORT}/log4cpp-config.cmake"
-    @ONLY
-)
-
-# Handle copyright
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/external_imported/vcpkg/ports/log4cpp/vcpkg.json b/external_imported/vcpkg/ports/log4cpp/vcpkg.json
deleted file mode 100644
index 52ed6df72..000000000
--- a/external_imported/vcpkg/ports/log4cpp/vcpkg.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "name": "log4cpp",
-  "version": "2.9.1",
-  "port-version": 8,
-  "description": "Log4cpp is library of C++ classes for flexible logging to files, syslog, IDSA and other destinations. It is modeled after the Log4j Java library, staying as close to their API as is reasonable.",
-  "homepage": "https://github.com/orocos-toolchain/log4cpp",
-  "supports": "!uwp",
-  "dependencies": [
-    {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
-    }
-  ]
-}
diff --git a/external_imported/vcpkg/ports/log4cxx/expat.patch b/external_imported/vcpkg/ports/log4cxx/expat.patch
deleted file mode 100644
index 8248ddb47..000000000
--- a/external_imported/vcpkg/ports/log4cxx/expat.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a4b96376..8b966872 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -49,7 +49,7 @@ find_package(APR-Util REQUIRED)
- find_package( Threads REQUIRED )
- 
- # Find expat for XML parsing
--find_package(EXPAT REQUIRED)
-+find_package(expat CONFIG REQUIRED)
- if(TARGET EXPAT::EXPAT)
-   set(EXPAT_LIBRARIES EXPAT::EXPAT)
- elseif(TARGET expat::expat)
diff --git a/external_imported/vcpkg/ports/log4cxx/fix-find-package.patch b/external_imported/vcpkg/ports/log4cxx/fix-find-package.patch
new file mode 100644
index 000000000..037cf7f14
--- /dev/null
+++ b/external_imported/vcpkg/ports/log4cxx/fix-find-package.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 61c0479..3bd3327 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -60,7 +60,7 @@ find_package(APR-Util REQUIRED)
+ find_package( Threads REQUIRED )
+ 
+ # Find expat for XML parsing
+-find_package(EXPAT REQUIRED)
++find_package(expat CONFIG REQUIRED)
+ if(TARGET EXPAT::EXPAT)
+   set(EXPAT_LIBRARIES EXPAT::EXPAT)
+ elseif(TARGET expat::expat)
diff --git a/external_imported/vcpkg/ports/log4cxx/linux.patch b/external_imported/vcpkg/ports/log4cxx/linux.patch
deleted file mode 100644
index 01c51c218..000000000
--- a/external_imported/vcpkg/ports/log4cxx/linux.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/cmake/FindAPR.cmake b/src/cmake/FindAPR.cmake
-index a204ece..4d2b48d 100644
---- a/src/cmake/FindAPR.cmake
-+++ b/src/cmake/FindAPR.cmake
-@@ -45,7 +45,11 @@ if(EXISTS ${APR_CONFIG_EXECUTABLE})
- else()
-     find_path(APR_INCLUDE_DIR apr.h PATH_SUFFIXES apr-1)
-     if (APR_STATIC OR NOT BUILD_SHARED_LIBS)
--      set(APR_SYSTEM_LIBS  ws2_32  mswsock  rpcrt4)
-+      if(WIN32)
-+        set(APR_SYSTEM_LIBS  ws2_32  mswsock  rpcrt4)
-+      else()
-+        set(APR_SYSTEM_LIBS  pthread)
-+      endif()
-       set(APR_COMPILE_DEFINITIONS APR_DECLARE_STATIC)
-       find_library(APR_LIBRARIES NAMES apr-1)
-     else()
diff --git a/external_imported/vcpkg/ports/log4cxx/portfile.cmake b/external_imported/vcpkg/ports/log4cxx/portfile.cmake
index 98f22ce70..d4458a2d5 100644
--- a/external_imported/vcpkg/ports/log4cxx/portfile.cmake
+++ b/external_imported/vcpkg/ports/log4cxx/portfile.cmake
@@ -1,16 +1,13 @@
-set(VERSION 0.13.0)
 vcpkg_download_distfile(ARCHIVE
     URLS "https://archive.apache.org/dist/logging/log4cxx/${VERSION}/apache-log4cxx-${VERSION}.tar.gz"
     FILENAME "apache-log4cxx-${VERSION}.tar.gz"
-    SHA512 2a5f4fecc0415d942658c588774f0666082c497b6fd49bf64ab3328a997775206788c9b10a8c89208896c57da52fcc12c18d5d11ca1d3bf699e4633b8fcea6e5  
+    SHA512 377234407c5f1128fbff6e5d2fcda3f53aae275962cd9207257674fa016095f4bc4ac0c318c1ba2a75f3252402cce0776c1211ffa917a60f8a89a12f01d45efb
 )
 
 vcpkg_extract_source_archive(
     SOURCE_PATH ARCHIVE "${ARCHIVE}"
     PATCHES
-        expat.patch
-        threadutility.patch
-        linux.patch
+        fix-find-package.patch
 )
 
 vcpkg_cmake_configure(
diff --git a/external_imported/vcpkg/ports/log4cxx/threadutility.patch b/external_imported/vcpkg/ports/log4cxx/threadutility.patch
deleted file mode 100644
index 526f19ed8..000000000
--- a/external_imported/vcpkg/ports/log4cxx/threadutility.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/main/cpp/threadutility.cpp b/src/main/cpp/threadutility.cpp
-index b57ab66b..c14c12fd 100644
---- a/src/main/cpp/threadutility.cpp
-+++ b/src/main/cpp/threadutility.cpp
-@@ -16,8 +16,11 @@
-  */
- 
- #include "log4cxx/helpers/threadutility.h"
--#include "log4cxx/private/log4cxx_private.h"
- #include "log4cxx/helpers/loglog.h"
-+#if !defined(LOG4CXX)
-+        #define LOG4CXX 1
-+#endif
-+#include "log4cxx/private/log4cxx_private.h"
- 
- #include <signal.h>
- #include <mutex>
diff --git a/external_imported/vcpkg/ports/log4cxx/vcpkg.json b/external_imported/vcpkg/ports/log4cxx/vcpkg.json
index b1b619923..397e0f44b 100644
--- a/external_imported/vcpkg/ports/log4cxx/vcpkg.json
+++ b/external_imported/vcpkg/ports/log4cxx/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "log4cxx",
-  "version": "0.13.0.1",
+  "version": "1.2.0",
   "description": "Apache log4cxx is a logging framework for C++ patterned after Apache log4j, which uses Apache Portable Runtime for most platform-specific code and should be usable on any platform supported by APR",
   "homepage": "https://logging.apache.org/log4cxx",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/lpeg/CMakeLists.txt b/external_imported/vcpkg/ports/lpeg/CMakeLists.txt
index 993e570d7..e3ef2bf54 100644
--- a/external_imported/vcpkg/ports/lpeg/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/lpeg/CMakeLists.txt
@@ -12,6 +12,7 @@ add_library(lpeg
     lpprint.c
     lpcap.c
     lpcode.c
+    lpcset.c
     lpeg.def)
 
 target_include_directories(lpeg PRIVATE ${LPEG_INCLUDES})
diff --git a/external_imported/vcpkg/ports/lpeg/portfile.cmake b/external_imported/vcpkg/ports/lpeg/portfile.cmake
index 3a8fc8bfa..40b38be2c 100644
--- a/external_imported/vcpkg/ports/lpeg/portfile.cmake
+++ b/external_imported/vcpkg/ports/lpeg/portfile.cmake
@@ -1,9 +1,7 @@
-set(LPEG_VER 1.0.2)
-
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-${LPEG_VER}.tar.gz"
-    FILENAME "lpeg-${LPEG_VER}.tar.gz"
-    SHA512 110527ddf9f8e5e8a80ef0ae8847c8ba8cd2597dba3bfe2865cba9af60daafbb885f21e74231952f5ab793d021e050b482066a821c6954d52090a5eae77e9814
+    URLS "https://www.inf.puc-rio.br/~roberto/lpeg/lpeg-${VERSION}.tar.gz"
+    FILENAME "lpeg-${VERSION}.tar.gz"
+    SHA512 01b2a4ceb2d110e143603bc63c84a59736ea735dd0ed9866286ba115d41be48d09c9ff21c8e2327974d2296944f6508d50a5c3a18f26ac1d81b8b2fc41f61222
 )
 
 vcpkg_extract_source_archive(
diff --git a/external_imported/vcpkg/ports/lpeg/vcpkg.json b/external_imported/vcpkg/ports/lpeg/vcpkg.json
index 55ba23e74..e750e87a5 100644
--- a/external_imported/vcpkg/ports/lpeg/vcpkg.json
+++ b/external_imported/vcpkg/ports/lpeg/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "lpeg",
-  "version-string": "1.0.2",
-  "port-version": 3,
+  "version": "1.1.0",
   "description": "LPeg is a pattern-matching library for Lua, based on Parsing Expression Grammars (PEGs).",
   "homepage": "https://www.inf.puc-rio.br/~roberto/lpeg",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/ltla-aarand/portfile.cmake b/external_imported/vcpkg/ports/ltla-aarand/portfile.cmake
new file mode 100644
index 000000000..cf569bd65
--- /dev/null
+++ b/external_imported/vcpkg/ports/ltla-aarand/portfile.cmake
@@ -0,0 +1,25 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO LTLA/aarand
+    REF 84d48b65d49ce8b844398f11aff3015b86e17197
+    SHA512 78b175055768dd8b0abab421b66d0d16ad9bc23f1d1406d774874d4ea12b11e199554ccf6a6ef02d10ef96ad5f652863e403aa3ec9522211958c78d243821ee5
+    HEAD_REF master
+)
+
+set(VCPKG_BUILD_TYPE "release") # header-only port
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DAARAND_TESTS=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(
+    PACKAGE_NAME ltla_aarand
+    CONFIG_PATH lib/cmake/ltla_aarand
+)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/ltla-aarand/vcpkg.json b/external_imported/vcpkg/ports/ltla-aarand/vcpkg.json
new file mode 100644
index 000000000..60c5c7cf8
--- /dev/null
+++ b/external_imported/vcpkg/ports/ltla-aarand/vcpkg.json
@@ -0,0 +1,17 @@
+{
+  "name": "ltla-aarand",
+  "version-date": "2023-03-19",
+  "description": "Aaron's random distributions for C++",
+  "homepage": "https://github.com/LTLA/aarand",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/ltla-cppirlba/portfile.cmake b/external_imported/vcpkg/ports/ltla-cppirlba/portfile.cmake
new file mode 100644
index 000000000..5822c2bb4
--- /dev/null
+++ b/external_imported/vcpkg/ports/ltla-cppirlba/portfile.cmake
@@ -0,0 +1,26 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO LTLA/CppIrlba
+    REF 228e207778597c8c3a0284fd2bfe4347dbb4646e
+    SHA512 4bfb4a508a62e3d5e3345bc59756353e6cd68e8d9a5cb9e7dd38ae71abd924a77e6c319bf8cd31b4f939be4531bf4527fd283515b40e8d5b88beaa0fd3411aff
+    HEAD_REF master
+)
+
+set(VCPKG_BUILD_TYPE "release") # header-only port
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DIRLBA_FETCH_EXTERN=OFF
+        -DIRLBA_TESTS=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(
+    PACKAGE_NAME ltla_irlba
+    CONFIG_PATH lib/cmake/ltla_irlba
+)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/ltla-cppirlba/vcpkg.json b/external_imported/vcpkg/ports/ltla-cppirlba/vcpkg.json
new file mode 100644
index 000000000..638995702
--- /dev/null
+++ b/external_imported/vcpkg/ports/ltla-cppirlba/vcpkg.json
@@ -0,0 +1,19 @@
+{
+  "name": "ltla-cppirlba",
+  "version-date": "2023-09-20",
+  "description": "A C++ port of the IRLBA algorithm, based on the C code in the R package.",
+  "homepage": "https://github.com/LTLA/CppIrlba",
+  "license": "MIT",
+  "dependencies": [
+    "eigen3",
+    "ltla-aarand",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/ltla-cppkmeans/portfile.cmake b/external_imported/vcpkg/ports/ltla-cppkmeans/portfile.cmake
new file mode 100644
index 000000000..f98a4b2f7
--- /dev/null
+++ b/external_imported/vcpkg/ports/ltla-cppkmeans/portfile.cmake
@@ -0,0 +1,26 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO LTLA/CppKmeans
+    REF 4c5aca44bffd8ed7d7243b2451105b572028e9d4
+    SHA512 c56147bc89ab50aa4d738c1392dffcf32771ad4995cbb206a83af05294dbfe640a1da265d46e108816486374fe0e6fa45c1b1da770cdc4367a69195c3510ecd4
+    HEAD_REF master
+)
+
+set(VCPKG_BUILD_TYPE "release") # header-only port
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DKMEANS_FETCH_EXTERN=OFF
+        -DKMEANS_TESTS=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(
+    PACKAGE_NAME ltla_kmeans
+    CONFIG_PATH lib/cmake/ltla_kmeans
+)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/ltla-cppkmeans/vcpkg.json b/external_imported/vcpkg/ports/ltla-cppkmeans/vcpkg.json
new file mode 100644
index 000000000..d3a3902ba
--- /dev/null
+++ b/external_imported/vcpkg/ports/ltla-cppkmeans/vcpkg.json
@@ -0,0 +1,19 @@
+{
+  "name": "ltla-cppkmeans",
+  "version-date": "2023-03-20",
+  "description": "C++ port of R's Hartigan-Wong implementation",
+  "homepage": "https://github.com/LTLA/CppKmeans",
+  "license": "MIT",
+  "dependencies": [
+    "ltla-aarand",
+    "ltla-powerit",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/ltla-knncolle/portfile.cmake b/external_imported/vcpkg/ports/ltla-knncolle/portfile.cmake
new file mode 100644
index 000000000..98855cdb8
--- /dev/null
+++ b/external_imported/vcpkg/ports/ltla-knncolle/portfile.cmake
@@ -0,0 +1,26 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO LTLA/knncolle
+    REF 3ad6b8cdbd281d78c77390d5a6ded4513bdf3860
+    SHA512 c6e66d8ea5501cb511fd88155d18b57b31661ad0e20f3289d9a7ec8fc558f91dd409487b53d41171111fdaa2baa11fe9548f01daf307a90121d17dc398203676
+    HEAD_REF master
+)
+
+set(VCPKG_BUILD_TYPE "release") # header-only port
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DKNNCOLLE_FETCH_EXTERN=OFF
+        -DKNNCOLLE_TESTS=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(
+    PACKAGE_NAME ltla_knncolle
+    CONFIG_PATH lib/cmake/ltla_knncolle
+)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/ltla-knncolle/vcpkg.json b/external_imported/vcpkg/ports/ltla-knncolle/vcpkg.json
new file mode 100644
index 000000000..f6655c664
--- /dev/null
+++ b/external_imported/vcpkg/ports/ltla-knncolle/vcpkg.json
@@ -0,0 +1,20 @@
+{
+  "name": "ltla-knncolle",
+  "version-date": "2023-05-09",
+  "description": "Collection of KNN algorithms in C++",
+  "homepage": "https://github.com/LTLA/knncolle",
+  "license": "MIT",
+  "dependencies": [
+    "annoy",
+    "hnswlib",
+    "ltla-cppkmeans",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/ltla-powerit/portfile.cmake b/external_imported/vcpkg/ports/ltla-powerit/portfile.cmake
new file mode 100644
index 000000000..6843077ee
--- /dev/null
+++ b/external_imported/vcpkg/ports/ltla-powerit/portfile.cmake
@@ -0,0 +1,26 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO LTLA/powerit
+    REF 705c4a6209baeaf4a246c8a61c46ecd0d3473511
+    SHA512 e45172baf90fe2e76152a53feb2a3b613a355482b657e5bc71f0eca4199dff947da70b44edd87efbdc4929eb39ec4455300edaf8f95eb394f61213657c97c321
+    HEAD_REF master
+)
+
+set(VCPKG_BUILD_TYPE "release") # header-only port
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DPOWERIT_FETCH_EXTERN=OFF
+        -DPOWERIT_TESTS=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(
+    PACKAGE_NAME ltla_powerit
+    CONFIG_PATH lib/cmake/ltla_powerit
+)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/ltla-powerit/vcpkg.json b/external_imported/vcpkg/ports/ltla-powerit/vcpkg.json
new file mode 100644
index 000000000..363288278
--- /dev/null
+++ b/external_imported/vcpkg/ports/ltla-powerit/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "ltla-powerit",
+  "version-date": "2023-03-19",
+  "description": "Lightweight C++ library for power iterations",
+  "homepage": "https://github.com/LTLA/powerit",
+  "license": "MIT",
+  "dependencies": [
+    "ltla-aarand",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/ltla-umappp/portfile.cmake b/external_imported/vcpkg/ports/ltla-umappp/portfile.cmake
new file mode 100644
index 000000000..3d08dd6e1
--- /dev/null
+++ b/external_imported/vcpkg/ports/ltla-umappp/portfile.cmake
@@ -0,0 +1,26 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO LTLA/umappp
+    REF d18095ea8b6d62aa740a566411e439eaab16b71f
+    SHA512 5f05c9cd7eeac2c16e8dbb0e747c84bc5209e91e37cf8a120273b01f681e19afa69d52e03a6862386c75d9f4d62d925135087c69b835257764aa1f490d92ef3d
+    HEAD_REF master
+)
+
+set(VCPKG_BUILD_TYPE "release") # header-only port
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DUMAPPP_FETCH_EXTERN=OFF
+        -DUMAPPP_TESTS=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(
+    PACKAGE_NAME ltla_umappp
+    CONFIG_PATH lib/cmake/ltla_umappp
+)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/ltla-umappp/vcpkg.json b/external_imported/vcpkg/ports/ltla-umappp/vcpkg.json
new file mode 100644
index 000000000..5184116d9
--- /dev/null
+++ b/external_imported/vcpkg/ports/ltla-umappp/vcpkg.json
@@ -0,0 +1,20 @@
+{
+  "name": "ltla-umappp",
+  "version-date": "2023-05-11",
+  "description": "UMAP C++ implementation",
+  "homepage": "https://github.com/LTLA/umappp",
+  "license": "BSD-2-Clause",
+  "dependencies": [
+    "ltla-aarand",
+    "ltla-cppirlba",
+    "ltla-knncolle",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/lua/CMakeLists-cpp.txt b/external_imported/vcpkg/ports/lua/CMakeLists-cpp.txt
index 88e128fff..ec988b5ff 100644
--- a/external_imported/vcpkg/ports/lua/CMakeLists-cpp.txt
+++ b/external_imported/vcpkg/ports/lua/CMakeLists-cpp.txt
@@ -13,7 +13,7 @@ IF (UNIX)
         FIND_LIBRARY (LIB_DLOPEN NAMES dl)
         IF (LIB_DLOPEN)
             TARGET_COMPILE_DEFINITIONS (lua-cpp PUBLIC -DLUA_USE_DLOPEN)
-            TARGET_LINK_LIBRARIES (lua-cpp ${LIB_DLOPEN})
+            TARGET_LINK_LIBRARIES (lua-cpp ${CMAKE_DL_LIBS})
         ENDIF ()
     ENDIF ()
 ENDIF ()
diff --git a/external_imported/vcpkg/ports/lua/CMakeLists.txt b/external_imported/vcpkg/ports/lua/CMakeLists.txt
index c88b600eb..0a180032f 100644
--- a/external_imported/vcpkg/ports/lua/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/lua/CMakeLists.txt
@@ -7,11 +7,10 @@
 #     - This is a source-incompatible change because extern "C" is chosen by the including application.
 # - The lua.hpp header will not be available.
 
-PROJECT ( lua )
-
-
 CMAKE_MINIMUM_REQUIRED(VERSION 3.18)
 
+PROJECT(lua)
+
 # Build Libraries
 FILE(GLOB HDR_LIBLUA "${CMAKE_SOURCE_DIR}/src/*.h")
 # For luac.c
diff --git a/external_imported/vcpkg/ports/lua/fix-ios-system.patch b/external_imported/vcpkg/ports/lua/fix-ios-system.patch
index 3e98ce228..f51c9449b 100644
--- a/external_imported/vcpkg/ports/lua/fix-ios-system.patch
+++ b/external_imported/vcpkg/ports/lua/fix-ios-system.patch
@@ -1,23 +1,23 @@
 diff --git a/src/loslib.c b/src/loslib.c
-index e65e188..3595601 100644
+index ad5a927..7812011 100644
 --- a/src/loslib.c
 +++ b/src/loslib.c
-@@ -3,7 +3,9 @@
- ** Standard Operating System library
+@@ -4,6 +4,10 @@
  ** See Copyright Notice in lua.h
  */
--
+ 
 +#if defined(__APPLE__)
 +#include <TargetConditionals.h>
 +#endif
++
  #define loslib_c
  #define LUA_LIB
  
-@@ -143,7 +145,12 @@ static int os_execute (lua_State *L) {
+@@ -143,7 +147,12 @@ static int os_execute (lua_State *L) {
    const char *cmd = luaL_optstring(L, 1, NULL);
    int stat;
    errno = 0;
--  stat = system(cmd);
+-  stat = l_system(cmd);
 +#if defined(__APPLE__) && !TARGET_OS_OSX
 +   // system() is __IOS_PROHIBITED, __WATCHOS_PROHIBITED, and __TVOS_PROHIBITED.
 +   stat = 127; // error: shell execution failed
diff --git a/external_imported/vcpkg/ports/lua/portfile.cmake b/external_imported/vcpkg/ports/lua/portfile.cmake
index e607a6f61..293e06e48 100644
--- a/external_imported/vcpkg/ports/lua/portfile.cmake
+++ b/external_imported/vcpkg/ports/lua/portfile.cmake
@@ -1,10 +1,10 @@
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://www.lua.org/ftp/lua-5.4.4.tar.gz"
-    FILENAME "lua-5.4.4.tar.gz"
-    SHA512 af0c35d5ba00fecbb2dd617bd7b825edf7418a16a73076e04f2a0df58cdbf098dc3ff4402e974afd789eb5d86d2e12ec6df9c84b99b23656ea694a85f83bcd21
+    URLS "https://www.lua.org/ftp/lua-${VERSION}.tar.gz"
+    FILENAME "lua-${VERSION}.tar.gz"
+    SHA512 d90c6903355ee1309cb0d92a8a024522ff049091a117ea21efb585b5de35776191cd67d17a65b18c2f9d374795b7c944f047576f0e3fe818d094b26f0e4845c5
 )
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
     PATCHES
         vs2015-impl-c99.patch
diff --git a/external_imported/vcpkg/ports/lua/vcpkg.json b/external_imported/vcpkg/ports/lua/vcpkg.json
index 282bb4377..b1170fc59 100644
--- a/external_imported/vcpkg/ports/lua/vcpkg.json
+++ b/external_imported/vcpkg/ports/lua/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "lua",
-  "version": "5.4.4",
-  "port-version": 5,
+  "version": "5.4.6",
   "description": "A powerful, fast, lightweight, embeddable scripting language",
   "homepage": "https://www.lua.org",
   "license": null,
diff --git a/external_imported/vcpkg/ports/luabridge3/portfile.cmake b/external_imported/vcpkg/ports/luabridge3/portfile.cmake
index 3bf29f0b3..6f08ed3df 100644
--- a/external_imported/vcpkg/ports/luabridge3/portfile.cmake
+++ b/external_imported/vcpkg/ports/luabridge3/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO kunitoki/LuaBridge3
-    REF d811afc00bc3d19f548d5aa28ccfe16b09e62ea4 # 3.0-beta4
-    SHA512 93c6187ac171ea3cc8c01ebdd3ea215b599b06268f83e4c35e9532dbeec94fde9219b26bc1cf8929bbafa1881f5258cbaf61abf89514ee8b557e52df0f05c2eb
+    REF 0e17140276d215e98764813078f48731125e4784 # 3.0-rc3
+    SHA512 b0cafc817abf6408bb26ba76ca05641cc311e2defa3a78481af7dbd56be49f3d28c81d2b2a152aa5f0ea18721578eb9e36515614dca40f813603af5abe45d0ce
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/luabridge3/vcpkg.json b/external_imported/vcpkg/ports/luabridge3/vcpkg.json
index 53cbce6f3..746b907ea 100644
--- a/external_imported/vcpkg/ports/luabridge3/vcpkg.json
+++ b/external_imported/vcpkg/ports/luabridge3/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "luabridge3",
-  "version": "3.0-beta4",
+  "version": "3.0-rc3",
   "description": "A lightweight, dependency-free, suitable for game development library for binding Lua to C++17",
   "homepage": "https://github.com/kunitoki/LuaBridge3",
   "license": "MIT"
diff --git a/external_imported/vcpkg/ports/luafilesystem/vcpkg.json b/external_imported/vcpkg/ports/luafilesystem/vcpkg.json
index 57dd1b446..b5d82852a 100644
--- a/external_imported/vcpkg/ports/luafilesystem/vcpkg.json
+++ b/external_imported/vcpkg/ports/luafilesystem/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "luafilesystem",
-  "version-string": "1.8.0",
-  "port-version": 3,
+  "version": "1.8.0",
+  "port-version": 5,
   "description": "LuaFileSystem is a Lua library developed to complement the set of functions related to file systems offered by the standard Lua distribution.",
   "homepage": "https://github.com/keplerproject/luafilesystem",
+  "supports": "!uwp",
   "dependencies": [
     "lua",
     {
diff --git a/external_imported/vcpkg/ports/luajit/004-fix-build-path-and-crt-linkage.patch b/external_imported/vcpkg/ports/luajit/004-fix-build-path-and-crt-linkage.patch
deleted file mode 100644
index 5d3aaeaae..000000000
--- a/external_imported/vcpkg/ports/luajit/004-fix-build-path-and-crt-linkage.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat
-index d323d8d..6e61150 100644
---- a/src/msvcbuild.bat
-+++ b/src/msvcbuild.bat
-@@ -15,19 +15,20 @@
- @setlocal
- @rem Add more debug flags here, e.g. DEBUGCFLAGS=/DLUA_USE_APICHECK
- @set DEBUGCFLAGS=
--@set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline
-+@set SOURCEDIR=%1
-+@set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline /I%SOURCEDIR%
- @set LJLINK=link /nologo
- @set LJMT=mt /nologo
- @set LJLIB=lib /nologo /nodefaultlib
--@set DASMDIR=..\dynasm
-+@set DASMDIR=%SOURCEDIR%\..\dynasm
- @set DASM=%DASMDIR%\dynasm.lua
--@set DASC=vm_x64.dasc
-+@set DASC=%SOURCEDIR%\vm_x64.dasc
- @set LJDLLNAME=lua51.dll
- @set LJLIBNAME=lua51.lib
- @set BUILDTYPE=release
--@set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c lib_buffer.c
-+@set ALL_LIB=%SOURCEDIR%\lib_base.c %SOURCEDIR%\lib_math.c %SOURCEDIR%\lib_bit.c %SOURCEDIR%\lib_string.c %SOURCEDIR%\lib_table.c %SOURCEDIR%\lib_io.c %SOURCEDIR%\lib_os.c %SOURCEDIR%\lib_package.c %SOURCEDIR%\lib_debug.c %SOURCEDIR%\lib_jit.c %SOURCEDIR%\lib_ffi.c %SOURCEDIR%\lib_buffer.c
- 
--%LJCOMPILE% host\minilua.c
-+%LJCOMPILE% %SOURCEDIR%\host\minilua.c /Fdminilua.pdb
- @if errorlevel 1 goto :BAD
- %LJLINK% /out:minilua.exe minilua.obj
- @if errorlevel 1 goto :BAD
-@@ -38,20 +39,20 @@ if exist minilua.exe.manifest^
- @set LJARCH=x64
- @minilua
- @if errorlevel 8 goto :X64
--@set DASC=vm_x86.dasc
-+@set DASC=%SOURCEDIR%\vm_x86.dasc
- @set DASMFLAGS=-D WIN -D JIT -D FFI
- @set LJARCH=x86
- @set LJCOMPILE=%LJCOMPILE% /arch:SSE2
- :X64
- @if "%1" neq "nogc64" goto :GC64
- @shift
--@set DASC=vm_x86.dasc
-+@set DASC=%SOURCEDIR%\vm_x86.dasc
- @set LJCOMPILE=%LJCOMPILE% /DLUAJIT_DISABLE_GC64
- :GC64
--minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %DASC%
-+minilua %DASM% -LN %DASMFLAGS% -o %SOURCEDIR%\host\buildvm_arch.h %DASC%
- @if errorlevel 1 goto :BAD
- 
--%LJCOMPILE% /I "." /I %DASMDIR% host\buildvm*.c
-+%LJCOMPILE% /I "." /I %DASMDIR% %SOURCEDIR%\host\buildvm*.c /Fdbuildvm.pdb
- @if errorlevel 1 goto :BAD
- %LJLINK% /out:buildvm.exe buildvm*.obj
- @if errorlevel 1 goto :BAD
-@@ -60,41 +61,44 @@ if exist buildvm.exe.manifest^
- 
- buildvm -m peobj -o lj_vm.obj
- @if errorlevel 1 goto :BAD
--buildvm -m bcdef -o lj_bcdef.h %ALL_LIB%
-+buildvm -m bcdef -o %SOURCEDIR%\lj_bcdef.h %ALL_LIB%
- @if errorlevel 1 goto :BAD
--buildvm -m ffdef -o lj_ffdef.h %ALL_LIB%
-+buildvm -m ffdef -o %SOURCEDIR%\lj_ffdef.h %ALL_LIB%
- @if errorlevel 1 goto :BAD
--buildvm -m libdef -o lj_libdef.h %ALL_LIB%
-+buildvm -m libdef -o %SOURCEDIR%\lj_libdef.h %ALL_LIB%
- @if errorlevel 1 goto :BAD
--buildvm -m recdef -o lj_recdef.h %ALL_LIB%
-+buildvm -m recdef -o %SOURCEDIR%\lj_recdef.h %ALL_LIB%
- @if errorlevel 1 goto :BAD
--buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB%
-+buildvm -m vmdef -o %SOURCEDIR%\jit\vmdef.lua %ALL_LIB%
- @if errorlevel 1 goto :BAD
--buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
-+buildvm -m folddef -o %SOURCEDIR%\lj_folddef.h %SOURCEDIR%\lj_opt_fold.c
- @if errorlevel 1 goto :BAD
- 
--@if "%1" neq "debug" goto :NODEBUG
-+@if "%2"=="static" set CRT_LINKAGE=/MT
-+@if "%2"=="dynamic" set CRT_LINKAGE=/MD
-+@set LJLINK=%LJLINK% /debug
-+@if "%3" neq "debug" goto :NODEBUG
- @shift
- @set BUILDTYPE=debug
- @set LJCOMPILE=%LJCOMPILE% /Zi %DEBUGCFLAGS%
--@set LJLINK=%LJLINK% /opt:ref /opt:icf /incremental:no
-+@set CRT_LINKAGE=%CRT_LINKAGE%d
- :NODEBUG
- @set LJLINK=%LJLINK% /%BUILDTYPE%
--@if "%1"=="amalg" goto :AMALGDLL
--@if "%1"=="static" goto :STATIC
--%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL lj_*.c lib_*.c
-+@if "%3"=="amalg" goto :AMALGDLL
-+@if "%3"=="static" goto :STATIC
-+%LJCOMPILE% %CRT_LINKAGE% /DLUA_BUILD_AS_DLL %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c /Fdlua51.pdb
- @if errorlevel 1 goto :BAD
- %LJLINK% /DLL /out:%LJDLLNAME% lj_*.obj lib_*.obj
- @if errorlevel 1 goto :BAD
- @goto :MTDLL
- :STATIC
--%LJCOMPILE% lj_*.c lib_*.c
-+%LJCOMPILE% %CRT_LINKAGE% %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c  /Fdlua51.pdb
- @if errorlevel 1 goto :BAD
- %LJLIB% /OUT:%LJLIBNAME% lj_*.obj lib_*.obj
- @if errorlevel 1 goto :BAD
- @goto :MTDLL
- :AMALGDLL
--%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL ljamalg.c
-+%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL %SOURCEDIR%\ljamalg.c
- @if errorlevel 1 goto :BAD
- %LJLINK% /DLL /out:%LJDLLNAME% ljamalg.obj lj_vm.obj
- @if errorlevel 1 goto :BAD
-@@ -102,7 +106,7 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
- if exist %LJDLLNAME%.manifest^
-   %LJMT% -manifest %LJDLLNAME%.manifest -outputresource:%LJDLLNAME%;2
- 
--%LJCOMPILE% luajit.c
-+%LJCOMPILE% %CRT_LINKAGE% %SOURCEDIR%\luajit.c  /Fdluajit.pdb
- @if errorlevel 1 goto :BAD
- %LJLINK% /out:luajit.exe luajit.obj %LJLIBNAME%
- @if errorlevel 1 goto :BAD
-@@ -110,8 +114,8 @@ if exist luajit.exe.manifest^
-   %LJMT% -manifest luajit.exe.manifest -outputresource:luajit.exe
- 
- @del *.obj *.manifest minilua.exe buildvm.exe
--@del host\buildvm_arch.h
--@del lj_bcdef.h lj_ffdef.h lj_libdef.h lj_recdef.h lj_folddef.h
-+@del %SOURCEDIR%\host\buildvm_arch.h
-+@del %SOURCEDIR%\lj_bcdef.h %SOURCEDIR%\lj_ffdef.h %SOURCEDIR%\lj_libdef.h %SOURCEDIR%\lj_recdef.h %SOURCEDIR%\lj_folddef.h
- @echo.
- @echo === Successfully built LuaJIT for Windows/%LJARCH% ===
- 
-@@ -124,4 +128,5 @@ if exist luajit.exe.manifest^
- @goto :END
- :FAIL
- @echo You must open a "Visual Studio Command Prompt" to run this script
-+exit 1
- :END
diff --git a/external_imported/vcpkg/ports/luajit/Makefile.nmake b/external_imported/vcpkg/ports/luajit/Makefile.nmake
new file mode 100644
index 000000000..3ca250870
--- /dev/null
+++ b/external_imported/vcpkg/ports/luajit/Makefile.nmake
@@ -0,0 +1,20 @@
+all:
+	@echo _CL_   = $(_CL_)
+	@echo _LINK_ = $(_LINK_)
+	cd src && .\msvcbuild.bat $(MSVCBUILD_OPTIONS)
+
+install: src\luajit.exe
+	-mkdir "$(INSTALLDIR)"
+	-mkdir "$(INSTALLDIR)\bin"
+	copy src\luajit.exe "$(INSTALLDIR)\bin\"
+	if exist src\lua51.dll copy src\lua51.dll "$(INSTALLDIR)\bin\"
+	-mkdir "$(INSTALLDIR)\lib"
+	copy src\lua51.lib "$(INSTALLDIR)\lib\"
+	-mkdir "$(INSTALLDIR)\include"
+	-mkdir "$(INSTALLDIR)\include\luajit"
+	copy src\lua.h "$(INSTALLDIR)\include\luajit\"
+	copy src\luajit.h "$(INSTALLDIR)\include\luajit\"
+	copy src\luaconf.h "$(INSTALLDIR)\include\luajit\"
+	copy src\lualib.h "$(INSTALLDIR)\include\luajit\"
+	copy src\lauxlib.h "$(INSTALLDIR)\include\luajit\"
+	copy src\lua.hpp "$(INSTALLDIR)\include\luajit\"
diff --git a/external_imported/vcpkg/ports/luajit/configure b/external_imported/vcpkg/ports/luajit/configure
new file mode 100755
index 000000000..0384100aa
--- /dev/null
+++ b/external_imported/vcpkg/ports/luajit/configure
@@ -0,0 +1,86 @@
+#!/bin/sh
+
+set -e
+
+LJARCH=
+LUAJIT_BUILDMODE=
+LUAJIT_BUILDVM_X=
+LUAJIT_DASM_ARCHS=
+LUAJIT_PREFIX=
+for OPTION; do
+    case "${OPTION}" in
+	--prefix=*)
+		LUAJIT_PREFIX="${OPTION#--prefix=}"
+		;;
+	BUILDMODE=*)
+		LUAJIT_BUILDMODE="${OPTION#BUILDMODE=}"
+		;;
+	BUILDVM_X=*)
+		LUAJIT_BUILDVM_X="${OPTION#BUILDVM_X=}"
+		;;
+	DASM_ARCHS=*)
+		LUAJIT_DASM_ARCHS="${OPTION#DASM_ARCHS=}"
+		;;
+	LJARCH=*)
+		LJARCH="${OPTION#LJARCH=}"
+		;;
+	esac
+done
+
+cat > Makefile.vcpkg <<END_MAKEFILE ;
+
+COMMON_OPTIONS += 'E=@:' 'Q='
+COMMON_OPTIONS += 'BUILDMODE=${LUAJIT_BUILDMODE}'
+COMMON_OPTIONS += 'PREFIX=${LUAJIT_PREFIX}'
+COMMON_OPTIONS += 'INSTALL_TNAME=luajit'
+
+BUILD_OPTIONS += 'CC=${CC}'
+BUILD_OPTIONS += 'CCDEBUG='
+BUILD_OPTIONS += 'CFLAGS=${CPPFLAGS} ${CFLAGS}'
+BUILD_OPTIONS += 'LDFLAGS=${LDFLAGS}'
+BUILD_OPTIONS += 'LIBS=${LIBS}'
+
+ifeq (${LJARCH},)
+# native
+BUILDVM_PREFIX = ${LUAJIT_PREFIX}/manual-tools/luajit
+DASM_ARCHS = ${LUAJIT_DASM_ARCHS}
+else
+# cross
+BUILD_OPTIONS += 'HOST_CC=:'
+BUILD_OPTIONS += 'BUILDVM_T='
+BUILD_OPTIONS += 'BUILDVM_X=${LUAJIT_BUILDVM_X}'
+endif
+
+# used by src/Makefile, best effort from manual '<CC> [-m32] -E src/lj_arch.h -dM'
+TARGET_TESTARCH_COMMON += 'LJ_LE 1' 'LJ_HASJIT 1' 'LJ_HASFFI 1' 'LJ_ARCH_HASFPU 1' 'LJ_ABI_SOFTFP 0'
+TARGET_TESTARCH_COMMON_32 += \$(TARGET_TESTARCH_COMMON) 'LJ_ARCH_BITS 32'
+TARGET_TESTARCH_COMMON_64 += \$(TARGET_TESTARCH_COMMON) 'LJ_ARCH_BITS 64' 'LJ_TARGET_GC64 1'
+TARGET_TESTARCH_arm =   \$(TARGET_TESTARCH_COMMON_32) LJ_TARGET_ARM
+TARGET_TESTARCH_arm64 = \$(TARGET_TESTARCH_COMMON_64) LJ_TARGET_ARM64 'LJ_ARCH_VERSION 80'
+TARGET_TESTARCH_x86 =   \$(TARGET_TESTARCH_COMMON_32) LJ_TARGET_X86
+TARGET_TESTARCH_x64 =   \$(TARGET_TESTARCH_COMMON_64) LJ_TARGET_X64 'LJ_FR2 1'
+
+all:
+	\$(MAKE) clean \$(COMMON_OPTIONS) \$(BUILD_OPTIONS)
+	\$(MAKE) all \$(COMMON_OPTIONS) \$(BUILD_OPTIONS)
+	for DA in \$(DASM_ARCHS); do \\
+	    rm -f src/host/buildvm_arch.h src/host/*.o; \\
+	    case "\$\$DA" in \\
+	      arm)   TARGET_TESTARCH="\$(TARGET_TESTARCH_arm)" ;; \\
+	      arm64) TARGET_TESTARCH="\$(TARGET_TESTARCH_arm64)" ;; \\
+	      x86)   TARGET_TESTARCH="\$(TARGET_TESTARCH_x86)" ;; \\
+	      x64)   TARGET_TESTARCH="\$(TARGET_TESTARCH_x64)" ;; \\
+	    esac ; \\
+	    \$(MAKE) -C src host/buildvm-\$\$DA\$(EXECUTABLE_SUFFIX) \$(COMMON_OPTIONS) \$(BUILD_OPTIONS) \\
+	      BUILDVM_T=host/buildvm-\$\$DA\$(EXECUTABLE_SUFFIX) "TARGET_TESTARCH=\$\${TARGET_TESTARCH}" \\
+	    || exit 1; \\
+	done
+
+install:
+	\$(MAKE) install \$(COMMON_OPTIONS)
+	for DA in \$(DASM_ARCHS); do \\
+		mkdir -p "\$\${DESTDIR}\$(BUILDVM_PREFIX)"; \\
+		install -m 0755 "src/host/buildvm-\$\$DA\$(EXECUTABLE_SUFFIX)" "\$\${DESTDIR}\$(BUILDVM_PREFIX)/buildvm-\$\$DA\$(EXECUTABLE_SUFFIX)" || exit 1 ; \\
+	done
+
+END_MAKEFILE
diff --git a/external_imported/vcpkg/ports/luajit/luajit.pc b/external_imported/vcpkg/ports/luajit/luajit.pc
new file mode 100644
index 000000000..877303cec
--- /dev/null
+++ b/external_imported/vcpkg/ports/luajit/luajit.pc
@@ -0,0 +1,24 @@
+# Package information for LuaJIT to be used by pkg-config.
+majver=2
+minver=1
+relver=0
+version=${majver}.${minver}.${relver}-beta3
+abiver=51
+
+prefix=handled-by-fixup
+multilib=lib
+exec_prefix=${prefix}
+libdir=${exec_prefix}/${multilib}
+libname=lua${abiver}
+includedir=${prefix}/include/luajit
+
+INSTALL_LMOD=${prefix}/share/lua/${abiver}
+INSTALL_CMOD=${prefix}/${multilib}/lua/${abiver}
+
+Name: LuaJIT
+Description: Just-in-time compiler for Lua
+URL: https://luajit.org
+Version: ${version}
+Requires:
+Libs: -L${libdir} -l${libname}
+Cflags: -I${includedir}
diff --git a/external_imported/vcpkg/ports/luajit/luajit.pc.win.in b/external_imported/vcpkg/ports/luajit/luajit.pc.win.in
deleted file mode 100644
index 56c0c5783..000000000
--- a/external_imported/vcpkg/ports/luajit/luajit.pc.win.in
+++ /dev/null
@@ -1,24 +0,0 @@
-# Package information for LuaJIT to be used by pkg-config.
-majver=2
-minver=1
-relver=0
-version=${majver}.${minver}.${relver}-beta3
-abiver=51
-
-prefix=@PREFIX@
-multilib=@LJIT_LIBDIR@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/${multilib}
-libname=lua${abiver}
-includedir=${prefix}/include/luajit
-
-INSTALL_LMOD=${prefix}/share/lua/${abiver}
-INSTALL_CMOD=${prefix}/${multilib}/lua/${abiver}
-
-Name: LuaJIT
-Description: Just-in-time compiler for Lua
-URL: https://luajit.org
-Version: ${version}
-Requires:
-Libs: -L${libdir} -l${libname}
-Cflags: -I${includedir} @LJIT_MSVC_PC_CFLAGS@
diff --git a/external_imported/vcpkg/ports/luajit/msvcbuild.patch b/external_imported/vcpkg/ports/luajit/msvcbuild.patch
new file mode 100644
index 000000000..8e2e756d8
--- /dev/null
+++ b/external_imported/vcpkg/ports/luajit/msvcbuild.patch
@@ -0,0 +1,31 @@
+diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat
+index aab4ef1..e92c486 100644
+--- a/src/msvcbuild.bat
++++ b/src/msvcbuild.bat
+@@ -79,10 +79,9 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
+ @set LJCOMPILE=%LJCOMPILE% /Zi %DEBUGCFLAGS%
+ @set LJLINK=%LJLINK% /opt:ref /opt:icf /incremental:no
+ :NODEBUG
+-@set LJLINK=%LJLINK% /%BUILDTYPE%
+ @if "%1"=="amalg" goto :AMALGDLL
+ @if "%1"=="static" goto :STATIC
+-%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL lj_*.c lib_*.c
++%LJCOMPILE%     /DLUA_BUILD_AS_DLL lj_*.c lib_*.c /Fdlua51.pdb
+ @if errorlevel 1 goto :BAD
+ %LJLINK% /DLL /out:%LJDLLNAME% lj_*.obj lib_*.obj
+ @if errorlevel 1 goto :BAD
+@@ -102,7 +101,7 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
+ if exist %LJDLLNAME%.manifest^
+   %LJMT% -manifest %LJDLLNAME%.manifest -outputresource:%LJDLLNAME%;2
+ 
+-%LJCOMPILE% luajit.c
++%LJCOMPILE% luajit.c /Fdluajit.pdb
+ @if errorlevel 1 goto :BAD
+ %LJLINK% /out:luajit.exe luajit.obj %LJLIBNAME%
+ @if errorlevel 1 goto :BAD
+@@ -124,4 +123,5 @@ if exist luajit.exe.manifest^
+ @goto :END
+ :FAIL
+ @echo You must open a "Visual Studio Command Prompt" to run this script
++@exit 1
+ :END
diff --git a/external_imported/vcpkg/ports/luajit/portfile.cmake b/external_imported/vcpkg/ports/luajit/portfile.cmake
index c272e9b1e..98042ee12 100644
--- a/external_imported/vcpkg/ports/luajit/portfile.cmake
+++ b/external_imported/vcpkg/ports/luajit/portfile.cmake
@@ -1,7 +1,6 @@
+set(extra_patches "")
 if (VCPKG_TARGET_IS_OSX)
-	set (LJIT_PATCHES 005-do-not-pass-ld-e-macosx.patch)
-else()
-	set (LJIT_PATCHES "")
+	list(APPEND extra_patches 005-do-not-pass-ld-e-macosx.patch)
 endif()
 
 vcpkg_from_github(
@@ -11,124 +10,100 @@ vcpkg_from_github(
     SHA512 e4111b2d7eeb05676c62d69da13a380a51d98f082c0be575a414c09ee27ff17d101b5b4a95e1b8a1bad14d55a4d2b305718a11878fbf36e0d3d48e62ba03407f
     HEAD_REF master
     PATCHES
+        msvcbuild.patch
         003-do-not-set-macosx-deployment-target.patch
-        004-fix-build-path-and-crt-linkage.patch
-        ${LJIT_PATCHES}
+        ${extra_patches}
 )
 
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    set (LJIT_STATIC "")
-    set (LJIT_MSVC_PC_CFLAGS "/DLUA_BUILD_AS_DLL=1")
-else()
-    set (LJIT_STATIC "static")
-    set (LJIT_MSVC_PC_CFLAGS "")
-endif()
+vcpkg_cmake_get_vars(cmake_vars_file)
+include("${cmake_vars_file}")
 
-if(VCPKG_TARGET_IS_OSX)
-    set(MACOSX_DEPLOYMENT_TARGET "MACOSX_DEPLOYMENT_TARGET=${VCPKG_OSX_DEPLOYMENT_TARGET}")
-    set(TARGET_ARCHITECTURE "${VCPKG_TARGET_ARCHITECTURE}")
-    if(TARGET_ARCHITECTURE STREQUAL x64)
-        set(TARGET_ARCHITECTURE x86_64)
+if(VCPKG_DETECTED_MSVC)
+    # Due to lack of better MSVC cross-build support, just always build the host
+    # minilua tool with the target toolchain. This will work for native builds and
+    # for targeting x86 from x64 hosts. (UWP and ARM64 is unsupported.)
+    vcpkg_list(SET options)
+    if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+        list(APPEND options "MSVCBUILD_OPTIONS=static")
     endif()
-    list(APPEND MACOSX_ARCHITECTURES "TARGET_CFLAGS=--target=${TARGET_ARCHITECTURE}-apple-darwin")
-    list(APPEND MACOSX_ARCHITECTURES "TARGET_LDFLAGS=--target=${TARGET_ARCHITECTURE}-apple-darwin")
-endif()
-
-if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug)
-    message(STATUS "Building ${TARGET_TRIPLET}-dbg")
-    file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg")
-    file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg")
 
-    if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
-        vcpkg_execute_required_process_repeat(
-            COUNT 1
-            COMMAND "${SOURCE_PATH}/src/msvcbuild.bat" ${SOURCE_PATH}/src ${VCPKG_CRT_LINKAGE} debug ${LJIT_STATIC}
-            WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg"
-            LOGNAME build-${TARGET_TRIPLET}-dbg
-        )
-
-        # Note that luajit's build system responds to failure by producing no output; in particular a likely outcome is
-        # only 'minilua.exe' being produced. This resulted in:
-        # https://github.com/microsoft/vcpkg/pull/25856#issuecomment-1214285736
-        # Please ensure luajit.exe is actually produced when making future changes.
-        file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/luajit.exe" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools")
-        file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lua51.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
-        set(LJIT_LIBDIR "debug/lib")
-        configure_file("${CMAKE_CURRENT_LIST_DIR}/luajit.pc.win.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/luajit.pc" @ONLY)
+    vcpkg_install_nmake(SOURCE_PATH "${SOURCE_PATH}"
+        PROJECT_NAME "${CMAKE_CURRENT_LIST_DIR}/Makefile.nmake"
+        OPTIONS
+            ${options}
+    )
 
-        if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-            file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lua51.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
-            file(COPY "${CURRENT_PACKAGES_DIR}/debug/bin/lua51.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools")
-        endif()
-        vcpkg_copy_pdbs()
-    else()
-        vcpkg_execute_build_process(
-            COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile ${MACOSX_DEPLOYMENT_TARGET} clean
-            WORKING_DIRECTORY ${SOURCE_PATH}
-            LOGNAME clean-${TARGET_TRIPLET}-debug
-        )
-        vcpkg_execute_build_process(
-            COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile ${MACOSX_DEPLOYMENT_TARGET} ${MACOSX_ARCHITECTURES} PREFIX=${CURRENT_PACKAGES_DIR}/debug CCDEBUG=-g3 CFLAGS=-O0 BUILDMODE=${VCPKG_LIBRARY_LINKAGE} install
-            WORKING_DIRECTORY ${SOURCE_PATH}
-            LOGNAME build-${TARGET_TRIPLET}-debug
-        )
-        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/lua")
-        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin")
-        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/luajit.pc" "multilib=lib" "multilib=debug/lib")
+    if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/luajit/luaconf.h" "defined(LUA_BUILD_AS_DLL)" "1")
     endif()
-endif()
 
-if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release)
-    message(STATUS "Building ${TARGET_TRIPLET}-rel")
-    file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")
-    file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")
+    file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/luajit.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig")
+    if(NOT VCPKG_BUILD_TYPE)
+        file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/luajit.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
+    endif()
 
-    if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
-        vcpkg_execute_required_process_repeat(
-            COUNT 1
-            COMMAND "${SOURCE_PATH}/src/msvcbuild.bat" ${SOURCE_PATH}/src ${VCPKG_CRT_LINKAGE} ${LJIT_STATIC}
-            WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
-            LOGNAME build-${TARGET_TRIPLET}-rel
+    vcpkg_copy_pdbs()
+else()
+    vcpkg_list(SET options)
+    if(VCPKG_CROSSCOMPILING)
+        list(APPEND options
+            "LJARCH=${VCPKG_TARGET_ARCHITECTURE}"
+            "BUILDVM_X=${CURRENT_HOST_INSTALLED_DIR}/manual-tools/${PORT}/buildvm-${VCPKG_TARGET_ARCHITECTURE}${VCPKG_HOST_EXECUTABLE_SUFFIX}"
         )
+    endif()
 
-        file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/luajit.exe" DESTINATION "${CURRENT_PACKAGES_DIR}/tools")
-        file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lua51.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
-        set(LJIT_LIBDIR "lib")
-        configure_file("${CMAKE_CURRENT_LIST_DIR}/luajit.pc.win.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/luajit.pc" @ONLY)
+    vcpkg_list(SET make_options "EXECUTABLE_SUFFIX=${VCPKG_TARGET_EXECUTABLE_SUFFIX}")
+    set(strip_options "") # cf. src/Makefile
+    if(VCPKG_TARGET_IS_OSX)
+        vcpkg_list(APPEND make_options "TARGET_SYS=Darwin")
+        set(strip_options " -x")
+    elseif(VCPKG_TARGET_IS_IOS)
+        vcpkg_list(APPEND make_options "TARGET_SYS=iOS")
+        set(strip_options " -x")
+    elseif(VCPKG_TARGET_IS_LINUX)
+        vcpkg_list(APPEND make_options "TARGET_SYS=Linux")
+    elseif(VCPKG_TARGET_IS_WINDOWS)
+        vcpkg_list(APPEND make_options "TARGET_SYS=Windows")
+        set(strip_options " --strip-unneeded")
+    endif()
 
-        if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-            file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lua51.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
-            vcpkg_copy_tools(TOOL_NAMES luajit SEARCH_DIR ${CURRENT_PACKAGES_DIR}/tools AUTO_CLEAN)
-        endif()
-        vcpkg_copy_pdbs()
-    else()
-        vcpkg_execute_build_process(
-            COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile ${MACOSX_DEPLOYMENT_TARGET} clean
-            WORKING_DIRECTORY ${SOURCE_PATH}
-            LOGNAME clean-${TARGET_TRIPLET}-rel
-        )
-        vcpkg_execute_build_process(
-            COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile ${MACOSX_DEPLOYMENT_TARGET} ${MACOSX_ARCHITECTURES} PREFIX=${CURRENT_PACKAGES_DIR} CCDEBUG= BUILDMODE=${VCPKG_LIBRARY_LINKAGE} install
-            WORKING_DIRECTORY ${SOURCE_PATH}
-            LOGNAME build-${TARGET_TRIPLET}-rel
-        )
-        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/lua" "${CURRENT_PACKAGES_DIR}/lib/lua")
+    set(dasm_archs "")
+    if("buildvm-32" IN_LIST FEATURES)
+        string(APPEND dasm_archs " arm x86")
+    endif()
+    if("buildvm-64" IN_LIST FEATURES)
+        string(APPEND dasm_archs " arm64 x64")
     endif()
-endif()
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+    file(COPY "${CMAKE_CURRENT_LIST_DIR}/configure" DESTINATION "${SOURCE_PATH}")
+    vcpkg_configure_make(SOURCE_PATH "${SOURCE_PATH}"
+        COPY_SOURCE
+        OPTIONS
+            "BUILDMODE=${VCPKG_LIBRARY_LINKAGE}"
+            ${options}
+        OPTIONS_RELEASE
+            "DASM_ARCHS=${dasm_archs}"
+    )
+    vcpkg_install_make(
+        MAKEFILE "Makefile.vcpkg"
+        OPTIONS
+            ${make_options}
+            "TARGET_AR=${VCPKG_DETECTED_CMAKE_AR} rcus"
+            "TARGET_STRIP=${VCPKG_DETECTED_CMAKE_STRIP}${strip_options}"
+    )
 endif()
 
-file(INSTALL "${SOURCE_PATH}/src/lua.h"      DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}")
-file(INSTALL "${SOURCE_PATH}/src/luajit.h"   DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}")
-file(INSTALL "${SOURCE_PATH}/src/luaconf.h"  DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}")
-file(INSTALL "${SOURCE_PATH}/src/lualib.h"   DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}")
-file(INSTALL "${SOURCE_PATH}/src/lauxlib.h"  DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}")
-file(INSTALL "${SOURCE_PATH}/src/lua.hpp"    DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}")
+file(REMOVE_RECURSE
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/debug/lib/lua"
+    "${CURRENT_PACKAGES_DIR}/debug/share"
+    "${CURRENT_PACKAGES_DIR}/lib/lua"
+    "${CURRENT_PACKAGES_DIR}/share/lua"
+    "${CURRENT_PACKAGES_DIR}/share/man"
+)
+
+vcpkg_copy_tools(TOOL_NAMES luajit AUTO_CLEAN)
 
 vcpkg_fixup_pkgconfig()
 
-file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYRIGHT")
diff --git a/external_imported/vcpkg/ports/luajit/vcpkg.json b/external_imported/vcpkg/ports/luajit/vcpkg.json
index 91f54602f..9436f4bfc 100644
--- a/external_imported/vcpkg/ports/luajit/vcpkg.json
+++ b/external_imported/vcpkg/ports/luajit/vcpkg.json
@@ -1,11 +1,28 @@
 {
   "name": "luajit",
   "version-date": "2023-01-04",
+  "port-version": 5,
   "description": "LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language.",
   "homepage": "https://github.com/LuaJIT/LuaJIT",
   "license": "MIT",
-  "supports": "!uwp",
+  "supports": "!uwp & !(arm64 & windows)",
   "dependencies": [
+    {
+      "name": "luajit",
+      "host": true,
+      "features": [
+        "buildvm-64"
+      ],
+      "platform": "!native & (arm64 | x64) & (!windows | mingw)"
+    },
+    {
+      "name": "luajit",
+      "host": true,
+      "features": [
+        "buildvm-32"
+      ],
+      "platform": "!native & ((arm & !arm64) | x86) & (!windows | mingw)"
+    },
     {
       "name": "vcpkg-cmake",
       "host": true
@@ -13,6 +30,20 @@
     {
       "name": "vcpkg-cmake-config",
       "host": true
+    },
+    {
+      "name": "vcpkg-cmake-get-vars",
+      "host": true
+    }
+  ],
+  "features": {
+    "buildvm-32": {
+      "description": "Install host tools for 32 bit targets",
+      "supports": "native & ((arm & !arm64) | x86) & (!windows | mingw)"
+    },
+    "buildvm-64": {
+      "description": "Install host tools for 64 bit targets",
+      "supports": "native & (arm64 | x64) & (!windows | mingw)"
     }
-  ]
+  }
 }
diff --git a/external_imported/vcpkg/ports/luasec/portfile.cmake b/external_imported/vcpkg/ports/luasec/portfile.cmake
index ee2fff5a6..ced089961 100644
--- a/external_imported/vcpkg/ports/luasec/portfile.cmake
+++ b/external_imported/vcpkg/ports/luasec/portfile.cmake
@@ -1,5 +1,5 @@
-set(LUASEC_REVISION v1.1.0)
-set(LUASEC_HASH ce08be2c62e97ebfab30e867790874030d404d195ce336b149d9501d652e9b8efe201cc2d0bcbb3be16214d7e4763b5871e45cbc22db758724baab9f7cd78568)
+set(LUASEC_REVISION "v${VERSION}")
+set(LUASEC_HASH cfa4187518445abc6591bd0c24924122b62252be25ffd5564cf291f9a2ae3702a5fa299ffd265d2e0e8315b90d6783eccace4ff560f54f299161d3c5e3749508)
 
 if (VCPKG_TARGET_IS_WINDOWS)
     vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
@@ -26,7 +26,7 @@ vcpkg_copy_pdbs()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+vcpkg_install_copyright(FILE_LIST ${SOURCE_PATH}/LICENSE)
 
 # Allow empty include directory
 set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
diff --git a/external_imported/vcpkg/ports/luasec/vcpkg.json b/external_imported/vcpkg/ports/luasec/vcpkg.json
index 98f86d809..25b94e815 100644
--- a/external_imported/vcpkg/ports/luasec/vcpkg.json
+++ b/external_imported/vcpkg/ports/luasec/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "luasec",
-  "version": "1.1.0",
+  "version": "1.3.1",
   "maintainers": "Stephen Baker <baker.stephen.e@gmail.com>",
   "description": "LuaSec depends on OpenSSL, and integrates with LuaSocket to make it easy to add secure connections to any Lua applications or scripts.",
   "homepage": "https://github.com/brunoos/luasec",
diff --git a/external_imported/vcpkg/ports/luasocket/portfile.cmake b/external_imported/vcpkg/ports/luasocket/portfile.cmake
index 2b08c4769..a2a126e8a 100644
--- a/external_imported/vcpkg/ports/luasocket/portfile.cmake
+++ b/external_imported/vcpkg/ports/luasocket/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO lunarmodules/luasocket
-    REF v3.0.0
-    SHA512 4f93d6c0b602333df50ee4f939cd0419243f6de333472ffebf99334e301143e8cdee3bc1655c29f81608622d6e7850a9bcf6929a6d4748210a70cdb8218a1ec6
+    REF "v${VERSION}"
+    SHA512 1e9e98484740ec6538fe3d2b0dab74d31f052956ecf9ee3b60e229f2d0b13fcc6d4aaf74cd2a3e2ee330333dabb316fe6a43c60baaea26f0cc01069b6aa4519b
     HEAD_REF master)
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
@@ -18,28 +18,19 @@ vcpkg_copy_pdbs()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 # Handle copyright
-file(COPY "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/luasocket")
-file(RENAME "${CURRENT_PACKAGES_DIR}/share/luasocket/LICENSE" "${CURRENT_PACKAGES_DIR}/share/luasocket/copyright")
+vcpkg_install_copyright(FILE_LIST ${SOURCE_PATH}/LICENSE)
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
 # Handle socket dll name
-    file(RENAME "${CURRENT_PACKAGES_DIR}/bin/socket/socket.core.dll" "${CURRENT_PACKAGES_DIR}/bin/socket/core.dll")
-    if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/socket/socket.core.pdb")
-        file(RENAME "${CURRENT_PACKAGES_DIR}/bin/socket/socket.core.pdb" "${CURRENT_PACKAGES_DIR}/bin/socket/core.pdb")
-    endif()
-    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/socket/socket.core.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/socket/core.dll")
-    if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/socket/socket.core.pdb")
-        file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/socket/socket.core.pdb" "${CURRENT_PACKAGES_DIR}/debug/bin/socket/core.pdb")
-    endif()
+    file(RENAME "${CURRENT_PACKAGES_DIR}/bin/socket/socket.core.dll" "${CURRENT_PACKAGES_DIR}/bin/socket/core.dll" RESULT temp)
+    file(RENAME "${CURRENT_PACKAGES_DIR}/bin/socket/socket.core.pdb" "${CURRENT_PACKAGES_DIR}/bin/socket/core.pdb" RESULT temp)
+    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/socket/socket.core.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/socket/core.dll" RESULT temp)
+    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/socket/socket.core.pdb" "${CURRENT_PACKAGES_DIR}/debug/bin/socket/core.pdb" RESULT temp)
 
 # Handle mime dll name
-    file(RENAME "${CURRENT_PACKAGES_DIR}/bin/mime/mime.core.dll" "${CURRENT_PACKAGES_DIR}/bin/mime/core.dll")
-    if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/mime/mime.core.pdb")
-        file(RENAME "${CURRENT_PACKAGES_DIR}/bin/mime/mime.core.pdb" "${CURRENT_PACKAGES_DIR}/bin/mime/core.pdb")
-    endif()
-    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/mime/mime.core.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/mime/core.dll")
-    if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/mime/mime.core.pdb")
-        file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/mime/mime.core.pdb" "${CURRENT_PACKAGES_DIR}/debug/bin/mime/core.pdb")
-    endif()
+    file(RENAME "${CURRENT_PACKAGES_DIR}/bin/mime/mime.core.dll" "${CURRENT_PACKAGES_DIR}/bin/mime/core.dll" RESULT temp)
+    file(RENAME "${CURRENT_PACKAGES_DIR}/bin/mime/mime.core.pdb" "${CURRENT_PACKAGES_DIR}/bin/mime/core.pdb" RESULT temp)
+    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/mime/mime.core.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/mime/core.dll" RESULT temp)
+    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/mime/mime.core.pdb" "${CURRENT_PACKAGES_DIR}/debug/bin/mime/core.pdb" RESULT temp)
 endif()
 
 # Allow empty include directory
diff --git a/external_imported/vcpkg/ports/luasocket/vcpkg.json b/external_imported/vcpkg/ports/luasocket/vcpkg.json
index c8a652569..719065696 100644
--- a/external_imported/vcpkg/ports/luasocket/vcpkg.json
+++ b/external_imported/vcpkg/ports/luasocket/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "luasocket",
-  "version": "3.0.0",
-  "port-version": 1,
+  "version": "3.1.0",
   "description": "LuaSocket is a Lua extension library that is composed by two parts: a C core that provides support for the TCP and UDP transport layers, and a set of Lua modules that add support for functionality commonly needed by applications that deal with the Internet.",
   "homepage": "https://lunarmodules.github.io/luasocket/",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/lunarg-vulkantools/portfile.cmake b/external_imported/vcpkg/ports/lunarg-vulkantools/portfile.cmake
new file mode 100644
index 000000000..07af21b41
--- /dev/null
+++ b/external_imported/vcpkg/ports/lunarg-vulkantools/portfile.cmake
@@ -0,0 +1,37 @@
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO LunarG/VulkanTools
+    REF "vulkan-sdk-${VERSION}"
+    SHA512 fcaa25375caad32800dbf015672bb9cb23ad90469fc63a259e43789bbe82e460d94f0d8e87f8bc4b624974dc2511af19e04da763483aea1cf34e6f78818b2383
+    HEAD_REF main
+)
+
+vcpkg_replace_string("${SOURCE_PATH}/via/CMakeLists.txt" "jsoncpp_static" "JsonCpp::JsonCpp")
+
+x_vcpkg_get_python_packages(PYTHON_VERSION "3" PACKAGES jsonschema OUT_PYTHON_VAR PYTHON3)
+get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
+vcpkg_add_to_path("${PYTHON3_DIR}")
+
+vcpkg_cmake_configure(
+  SOURCE_PATH "${SOURCE_PATH}"
+  OPTIONS
+    -DVULKAN_HEADERS_INSTALL_DIR=${CURRENT_INSTALLED_DIR}
+    -DBUILD_TESTS:BOOL=OFF
+  OPTIONS_RELEASE
+    -DVULKAN_LOADER_INSTALL_DIR=${CURRENT_INSTALLED_DIR}
+  OPTIONS_DEBUG
+    -DVULKAN_LOADER_INSTALL_DIR=${CURRENT_INSTALLED_DIR}/debug
+
+)
+vcpkg_cmake_install()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
+
+vcpkg_copy_tools(TOOL_NAMES vkvia vkconfig AUTO_CLEAN )
+
+set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled)
+set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
diff --git a/external_imported/vcpkg/ports/lunarg-vulkantools/vcpkg.json b/external_imported/vcpkg/ports/lunarg-vulkantools/vcpkg.json
new file mode 100644
index 000000000..a076998ae
--- /dev/null
+++ b/external_imported/vcpkg/ports/lunarg-vulkantools/vcpkg.json
@@ -0,0 +1,27 @@
+{
+  "name": "lunarg-vulkantools",
+  "version": "1.3.275.0",
+  "description": "Tools to aid in Vulkan development",
+  "homepage": "https://github.com/LunarG/VulkanTools",
+  "license": null,
+  "supports": "!osx & !staticcrt",
+  "dependencies": [
+    "jsoncpp",
+    "qt5-base",
+    "valijson",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    {
+      "name": "vcpkg-get-python-packages",
+      "host": true
+    },
+    "vulkan-loader",
+    "vulkan-utility-libraries"
+  ]
+}
diff --git a/external_imported/vcpkg/ports/lunasvg/fix-cmake.patch b/external_imported/vcpkg/ports/lunasvg/fix-cmake.patch
new file mode 100644
index 000000000..b00ea77f2
--- /dev/null
+++ b/external_imported/vcpkg/ports/lunasvg/fix-cmake.patch
@@ -0,0 +1,31 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ea4b2d2..f622d45 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -32,7 +32,10 @@ install(FILES
+ )
+ 
+ install(TARGETS lunasvg
+-    LIBRARY     DESTINATION    ${LUNASVG_LIBDIR}
+-    ARCHIVE     DESTINATION    ${LUNASVG_LIBDIR}
+-    INCLUDES    DESTINATION    ${LUNASVG_INCDIR}
+-)
++    EXPORT unofficial-lunasvg-config
++    RUNTIME DESTINATION bin
++    LIBRARY DESTINATION lib
++    ARCHIVE DESTINATION lib
++    PUBLIC_HEADER DESTINATION include)
++
++install(EXPORT unofficial-lunasvg-config NAMESPACE unofficial::lunasvg:: DESTINATION share/unofficial-lunasvg)
+\ No newline at end of file
+diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
+index de58954..74149dc 100644
+--- a/include/CMakeLists.txt
++++ b/include/CMakeLists.txt
+@@ -1,4 +1,5 @@
+ target_include_directories(lunasvg
+ PUBLIC
+-    "${CMAKE_CURRENT_LIST_DIR}"
++    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>
++    $<INSTALL_INTERFACE:include>
+ )
diff --git a/external_imported/vcpkg/ports/lunasvg/fix-install.patch b/external_imported/vcpkg/ports/lunasvg/fix-install.patch
deleted file mode 100644
index 73b634875..000000000
--- a/external_imported/vcpkg/ports/lunasvg/fix-install.patch
+++ /dev/null
@@ -1,26 +0,0 @@
- CMakeLists.txt | 15 ++-------------
- 1 file changed, 2 insertions(+), 13 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9916c67..159f3a6 100755
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -24,16 +24,5 @@ if(LUNASVG_BUILD_EXAMPLES)
-     add_subdirectory(example)
- endif()
- 
--set(LUNASVG_LIBDIR ${CMAKE_INSTALL_PREFIX}/lib)
--set(LUNASVG_INCDIR ${CMAKE_INSTALL_PREFIX}/include)
--
--install(FILES
--    include/lunasvg.h
--    DESTINATION ${LUNASVG_INCDIR}
--)
--
--install(TARGETS lunasvg
--    LIBRARY     DESTINATION    ${LUNASVG_LIBDIR}
--    ARCHIVE     DESTINATION    ${LUNASVG_LIBDIR}
--    INCLUDES    DESTINATION    ${LUNASVG_INCDIR}
--)
-+set_target_properties(lunasvg PROPERTIES PUBLIC_HEADER "include/lunasvg.h")
-+install(TARGETS lunasvg RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib PUBLIC_HEADER DESTINATION include)
diff --git a/external_imported/vcpkg/ports/lunasvg/portfile.cmake b/external_imported/vcpkg/ports/lunasvg/portfile.cmake
index 9b40c5842..199792591 100644
--- a/external_imported/vcpkg/ports/lunasvg/portfile.cmake
+++ b/external_imported/vcpkg/ports/lunasvg/portfile.cmake
@@ -1,11 +1,11 @@
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO sammycage/lunasvg
-  REF e612abda858b53160041381a23422cd2b4f42fbd #2.3.1
-  SHA512 44f5d013d918cb5af90114a12857bdd2c204caff761516ef98b12b08d8b6215e91f6d963c281500c386f287b9d0ecd5b3d986d4c8c33423c0c34d539d744e09d
+  REF "v${VERSION}"
+  SHA512 368f76ae3c04fbcb08406d9e7793af37b5e28ab90ffe0978fae8783620a45af3270fcd4e895c553e3e651f0ba07e37355acffd9f0aab1bf9ef822f465de21073
   HEAD_REF master
   PATCHES
-    fix-install.patch
+    fix-cmake.patch
 )
 
 vcpkg_cmake_configure(
@@ -17,8 +17,10 @@ vcpkg_cmake_configure(
 
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-lunasvg)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 # Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/lunasvg/vcpkg.json b/external_imported/vcpkg/ports/lunasvg/vcpkg.json
index df3d8aaa0..661e49c2b 100644
--- a/external_imported/vcpkg/ports/lunasvg/vcpkg.json
+++ b/external_imported/vcpkg/ports/lunasvg/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "lunasvg",
-  "version": "2.3.1",
+  "version": "2.3.8",
+  "port-version": 1,
   "description": "lunasvg is a standalone SVG rendering library in C++",
   "homepage": "https://github.com/sammycage/lunasvg",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/luv/fix-find-libuv.patch b/external_imported/vcpkg/ports/luv/fix-find-libuv.patch
index 9816fe3bd..1a94fc444 100644
--- a/external_imported/vcpkg/ports/luv/fix-find-libuv.patch
+++ b/external_imported/vcpkg/ports/luv/fix-find-libuv.patch
@@ -9,7 +9,7 @@ index e63a431..163bada 100644
 -  find_package(Libuv REQUIRED)
 -  include_directories(${LIBUV_INCLUDE_DIR})
 +  find_package(libuv CONFIG REQUIRED)
-+  set(LIBUV_LIBRARIES $<IF:$<TARGET_EXISTS:uv_a>,uv_a,uv>)
++  set(LIBUV_LIBRARIES $<IF:$<TARGET_EXISTS:libuv::uv_a>,libuv::uv_a,libuv::uv>)
  else (WITH_SHARED_LIBUV)
    include_directories(deps/libuv/include)
    add_subdirectory(deps/libuv EXCLUDE_FROM_ALL)
diff --git a/external_imported/vcpkg/ports/luv/vcpkg.json b/external_imported/vcpkg/ports/luv/vcpkg.json
index 292eb6dd3..69fc5a01a 100644
--- a/external_imported/vcpkg/ports/luv/vcpkg.json
+++ b/external_imported/vcpkg/ports/luv/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "luv",
   "version-semver": "1.44.2",
+  "port-version": 1,
   "description": "Bare libuv bindings for lua",
   "homepage": "https://github.com/luvit/luv",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/lzav/portfile.cmake b/external_imported/vcpkg/ports/lzav/portfile.cmake
new file mode 100644
index 000000000..483c0fb34
--- /dev/null
+++ b/external_imported/vcpkg/ports/lzav/portfile.cmake
@@ -0,0 +1,11 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO avaneev/lzav
+    REF ${VERSION}
+    SHA512 2e5c852dbace404816efc136b99a79f7e453347b0b641fa7f35da54d089f376f779fe9801265ce642c2d0dc4e5b222aa21f2a53277a4c5c78824f000ece25ed6
+    HEAD_REF master
+)
+
+file(COPY "${SOURCE_PATH}/lzav.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/lzav/vcpkg.json b/external_imported/vcpkg/ports/lzav/vcpkg.json
new file mode 100644
index 000000000..80f55e348
--- /dev/null
+++ b/external_imported/vcpkg/ports/lzav/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "lzav",
+  "version": "3.13",
+  "description": "Fast In-Memory Data Compression Algorithm (inline C/C++)",
+  "homepage": "https://github.com/avaneev/lzav",
+  "license": "MIT"
+}
diff --git a/external_imported/vcpkg/ports/lzfse/vcpkg.json b/external_imported/vcpkg/ports/lzfse/vcpkg.json
index 0ce096d3c..c156f0504 100644
--- a/external_imported/vcpkg/ports/lzfse/vcpkg.json
+++ b/external_imported/vcpkg/ports/lzfse/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "lzfse",
-  "version-string": "1.0",
-  "port-version": 4,
+  "version": "1.0",
+  "port-version": 5,
   "description": "Lempel-Ziv style data compressor using Finite State Entropy coding.",
   "homepage": "https://github.com/lzfse/lzfse",
   "supports": "!arm",
diff --git a/external_imported/vcpkg/ports/lzo/vcpkg.json b/external_imported/vcpkg/ports/lzo/vcpkg.json
index 0fa7596c0..adcf80379 100644
--- a/external_imported/vcpkg/ports/lzo/vcpkg.json
+++ b/external_imported/vcpkg/ports/lzo/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "lzo",
-  "version-string": "2.10",
-  "port-version": 8,
+  "version": "2.10",
+  "port-version": 9,
   "description": "Lossless data compression library",
   "homepage": "https://www.oberhumer.com/opensource/lzo/",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/lzokay/vcpkg.json b/external_imported/vcpkg/ports/lzokay/vcpkg.json
index 9de82907a..e50fda6a0 100644
--- a/external_imported/vcpkg/ports/lzokay/vcpkg.json
+++ b/external_imported/vcpkg/ports/lzokay/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "lzokay",
-  "version-string": "2020-07-30",
-  "port-version": 1,
+  "version-date": "2020-07-30",
+  "port-version": 2,
   "description": "lzokay – MIT licensed C++ implementation of LZO compression/decompression algorithm",
   "homepage": "https://github.com/jackoalan/lzokay",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/maddy/CMakeLists.txt b/external_imported/vcpkg/ports/maddy/CMakeLists.txt
new file mode 100644
index 000000000..0d1297e8b
--- /dev/null
+++ b/external_imported/vcpkg/ports/maddy/CMakeLists.txt
@@ -0,0 +1,22 @@
+cmake_minimum_required(VERSION 3.12 FATAL_ERROR)
+
+project(maddy LANGUAGES CXX)
+
+include(GNUInstallDirs)
+
+add_library(maddy INTERFACE)
+target_include_directories(maddy INTERFACE $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+
+install(TARGETS maddy EXPORT unofficial-maddy)
+
+install(
+    EXPORT unofficial-maddy
+    FILE unofficial-maddy-config.cmake
+    DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/unofficial-maddy"
+    NAMESPACE unofficial::maddy::
+)
+
+install(
+    DIRECTORY "${CMAKE_SOURCE_DIR}/include/maddy"
+    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+)
diff --git a/external_imported/vcpkg/ports/maddy/portfile.cmake b/external_imported/vcpkg/ports/maddy/portfile.cmake
new file mode 100644
index 000000000..ea622127c
--- /dev/null
+++ b/external_imported/vcpkg/ports/maddy/portfile.cmake
@@ -0,0 +1,22 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO progsource/maddy
+    REF "${VERSION}"
+    SHA512 7c8b7570fcb73901f605f1c33bd3459ab1775e375a013cf1d92c8e8381880bfaeb895c7eac244429f67953cc039999d07c4c0fb6c3a5edfe8af32ef0d89ed294
+    HEAD_REF master
+)
+
+set(VCPKG_BUILD_TYPE release) # header-only port
+
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/maddy/usage b/external_imported/vcpkg/ports/maddy/usage
new file mode 100644
index 000000000..7c9c09c43
--- /dev/null
+++ b/external_imported/vcpkg/ports/maddy/usage
@@ -0,0 +1,4 @@
+maddy provides CMake targets:
+
+    find_package(unofficial-maddy CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE unofficial::maddy::maddy)
diff --git a/external_imported/vcpkg/ports/maddy/vcpkg.json b/external_imported/vcpkg/ports/maddy/vcpkg.json
new file mode 100644
index 000000000..244caf049
--- /dev/null
+++ b/external_imported/vcpkg/ports/maddy/vcpkg.json
@@ -0,0 +1,17 @@
+{
+  "name": "maddy",
+  "version": "1.3.0",
+  "description": "C++ Markdown to HTML header-only parser library",
+  "homepage": "https://github.com/progsource/maddy",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/magic-enum/portfile.cmake b/external_imported/vcpkg/ports/magic-enum/portfile.cmake
index 47167025a..24e9af0e8 100644
--- a/external_imported/vcpkg/ports/magic-enum/portfile.cmake
+++ b/external_imported/vcpkg/ports/magic-enum/portfile.cmake
@@ -1,27 +1,27 @@
-# header-only library
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO Neargye/magic_enum
-    REF v0.8.2
-    SHA512 849c426484156faf91dde3f32f6c755c7698879b16dd83e13fb86b299b53ec9bbe4d55267581386302c8acb93d80ec044cc248371fdc8608cdd8f4ab12099f0a
-    HEAD_REF master
-)
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS
-        -DMAGIC_ENUM_OPT_ENABLE_NONASCII=OFF
-        -DMAGIC_ENUM_OPT_BUILD_EXAMPLES=OFF
-        -DMAGIC_ENUM_OPT_BUILD_TESTS=OFF
-        -DMAGIC_ENUM_OPT_INSTALL=ON
-)
-
-vcpkg_cmake_install()
-
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/magic_enum PACKAGE_NAME magic_enum)
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib")
-
-# Handle copyright
-configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Neargye/magic_enum
+    REF "v${VERSION}"
+    SHA512 f1b412d15e0ef624b4588adba00a18ed12eeb1f0dabc021d53a7c047b8976ecb07701b76040f47c77c75e00151619dbce1f9a75f471db04340156a39044768f3
+    HEAD_REF master
+)
+
+set(VCPKG_BUILD_TYPE release) # header-only port
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DMAGIC_ENUM_OPT_BUILD_EXAMPLES=OFF
+        -DMAGIC_ENUM_OPT_BUILD_TESTS=OFF
+        -DMAGIC_ENUM_OPT_INSTALL=ON
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/magic_enum PACKAGE_NAME magic_enum)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+
+# Handle copyright
+configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/magic-enum/usage b/external_imported/vcpkg/ports/magic-enum/usage
new file mode 100644
index 000000000..3d3a94b53
--- /dev/null
+++ b/external_imported/vcpkg/ports/magic-enum/usage
@@ -0,0 +1,4 @@
+magic-enum provides CMake targets:
+
+    find_package(magic_enum CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE magic_enum::magic_enum)
diff --git a/external_imported/vcpkg/ports/magic-enum/vcpkg.json b/external_imported/vcpkg/ports/magic-enum/vcpkg.json
index 45c695ae9..77ac39562 100644
--- a/external_imported/vcpkg/ports/magic-enum/vcpkg.json
+++ b/external_imported/vcpkg/ports/magic-enum/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "magic-enum",
-  "version": "0.8.2",
+  "version": "0.9.5",
   "description": "Header-only C++17 library provides static reflection for enums, work with any enum type without any macro or boilerplate code.",
   "homepage": "https://github.com/Neargye/magic_enum",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/magic-get/vcpkg.json b/external_imported/vcpkg/ports/magic-get/vcpkg.json
index bb803ad76..3e5182706 100644
--- a/external_imported/vcpkg/ports/magic-get/vcpkg.json
+++ b/external_imported/vcpkg/ports/magic-get/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "magic-get",
-  "version-string": "2019-09-02",
-  "port-version": 2,
+  "version-date": "2019-09-02",
+  "port-version": 3,
   "description": "Deprecated boost-pfr port.",
   "homepage": "https://github.com/apolukhin/magic_get",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/magma/clang-cuda.patch b/external_imported/vcpkg/ports/magma/clang-cuda.patch
new file mode 100644
index 000000000..5aaee14ff
--- /dev/null
+++ b/external_imported/vcpkg/ports/magma/clang-cuda.patch
@@ -0,0 +1,50 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index eeb0bb0b8f..6a5e0a747a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -310,10 +309,17 @@ if (MAGMA_ENABLE_CUDA)
+         )
+     else()
+         # No Position Independent Code on Windows. Compiler will complain if you add that flag.
+-        target_compile_options(magma_nvcc_flags
+-            INTERFACE
+-            $<$<COMPILE_LANGUAGE:CUDA>:--compiler-options;${FORTRAN_CONVENTION}>
+-        )
++        if(NOT CMAKE_CUDA_COMPILER_ID STREQUAL "Clang")
++          target_compile_options(magma_nvcc_flags
++              INTERFACE
++              $<$<COMPILE_LANGUAGE:CUDA>:--compiler-options;${FORTRAN_CONVENTION}>
++          )
++        else()
++          target_compile_options(magma_nvcc_flags
++              INTERFACE
++              $<$<COMPILE_LANGUAGE:CUDA>:${FORTRAN_CONVENTION}>
++          )
++        endif()
+     endif(COMPILER_SUPPORTS_FPIC)
+ 
+     set(MAGMA_HAVE_CUDA "1")
+diff --git a/control/magma_internal.h b/control/magma_internal.h
+index 2310659235..c4d0eb8f6b 100644
+--- a/control/magma_internal.h
++++ b/control/magma_internal.h
+@@ -33,7 +33,7 @@
+     // functions where Microsoft fails to provide C99 standard
+     // (only with Microsoft, not with nvcc on Windows)
+     // in both magma_internal.h and testings.h
+-    #ifndef __NVCC__
++    #if !defined(__NVCC__) && !defined(__clang__)
+ 
+         #include <float.h>
+         #define copysign(x,y) _copysign(x,y)
+@@ -42,7 +42,9 @@
+         #define isfinite(x)   _finite(x)
+         // note _snprintf has slightly different semantics than snprintf
+         #define snprintf _snprintf
+-
++    #elif !defined(__NVCC__)
++        // make sure this actually uses the C version and not the C++ overloads
++        #define copysign(x,y) copysign((double)x,(double)y)
+     #endif
+ 
+ #else
diff --git a/external_imported/vcpkg/ports/magma/disable-openmp-msvc.patch b/external_imported/vcpkg/ports/magma/disable-openmp-msvc.patch
new file mode 100644
index 000000000..b1439952a
--- /dev/null
+++ b/external_imported/vcpkg/ports/magma/disable-openmp-msvc.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 828911d05f..a4f5b35ef3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -103,6 +103,10 @@ endif()
+ 
+ # ----------------------------------------
+ # locate OpenMP
++if(MSVC AND CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
++  set(CMAKE_DISBLE_FIND_PACKAGE_OpenMP ON)
++  # MSVC OpenMP is not enough to compile
++endif()
+ find_package( OpenMP )
+ if (OPENMP_FOUND)
+     message( STATUS "Found OpenMP" )
diff --git a/external_imported/vcpkg/ports/magma/no-tests.patch b/external_imported/vcpkg/ports/magma/no-tests.patch
new file mode 100644
index 000000000..4a7d92636
--- /dev/null
+++ b/external_imported/vcpkg/ports/magma/no-tests.patch
@@ -0,0 +1,35 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a4f5b35ef3..eeb0bb0b8f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -663,7 +670,7 @@ target_link_libraries( lapacktest
+ 
+ # ----------------------------------------
+ # compile tester library
+-add_library( tester ${libtest_all} )
++add_library( tester EXCLUDE_FROM_ALL ${libtest_all} )
+ target_link_libraries( tester
+     magma
+     lapacktest
+@@ -726,11 +726,12 @@ foreach( filename ${testing_all} )
+         list( APPEND testing_all_cpp ${filename} )
+     endif()
+ endforeach()
++set(testing_all_cpp "")
+ foreach( TEST ${testing_all_cpp} )
+     string( REGEX REPLACE "\\.(cpp|f90|F90)" "" EXE ${TEST} )
+     string( REGEX REPLACE "testing/" "" EXE ${EXE} )
+     #message( "${TEST} --> ${EXE}" )
+-    add_executable( ${EXE} ${TEST} )
++    add_executable( ${EXE} EXCLUDE_FROM_ALL ${TEST} )
+     target_link_libraries( ${EXE} tester lapacktest magma )
+     list( APPEND testing ${EXE} )
+ endforeach()
+@@ -749,6 +750,7 @@ endif()
+ 
+ set( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${SPARSE_TEST_DIR}" )
+ cmake_policy( SET CMP0037 OLD)
++set(sparse_testing_all "")
+ foreach( TEST ${sparse_testing_all} )
+     string( REGEX REPLACE "\\.(cpp|f90|F90)"     "" EXE ${TEST} )
+     string( REGEX REPLACE "${SPARSE_TEST_DIR}/" "" EXE ${EXE} )
diff --git a/external_imported/vcpkg/ports/magma/portfile.cmake b/external_imported/vcpkg/ports/magma/portfile.cmake
new file mode 100644
index 000000000..fc117d655
--- /dev/null
+++ b/external_imported/vcpkg/ports/magma/portfile.cmake
@@ -0,0 +1,54 @@
+
+set(opts "")
+if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+  set(opts
+    -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS:BOOL=ON
+    -DCMAKE_CUDA_SEPARABLE_COMPILATION:BOOL=OFF
+  )
+endif()
+
+vcpkg_download_distfile(
+    dist_file
+    URLS https://icl.utk.edu/projectsfiles/magma/downloads/magma-${VERSION}.tar.gz
+    FILENAME magma-${VERSION}.tar.gz
+    SHA512 7ab52ad09f452f7b997da573f74465d5bc8c83392f724747b131a7015b1445c457defdb59ae7a2fd4930e2cdc5bce3c7b99a069f04db1752a5df36ddc6e84987
+)
+
+vcpkg_extract_source_archive(
+    src_path
+    ARCHIVE "${dist_file}"
+    PATCHES 
+      disable-openmp-msvc.patch
+      no-tests.patch
+      clang-cuda.patch
+)
+
+vcpkg_cmake_configure(
+  SOURCE_PATH "${src_path}"
+  OPTIONS
+    -DMAGMA_ENABLE_CUDA=ON
+    -DMAGMA_ENABLE_HIP=OFF # HIP is backend and seems additive?!
+    -DUSE_FORTRAN=OFF
+    ${opts}
+)
+
+vcpkg_cmake_install()
+
+vcpkg_fixup_pkgconfig()
+
+file(READ "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/magma.pc" contents)
+string(REGEX REPLACE "Cflags: [^\n]+" "Cflags: -I\${includedir}" contents "${contents}")
+file(WRITE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/magma.pc" "${contents}")
+
+if(NOT VCPKG_BUILD_TYPE)
+  file(READ "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/magma.pc" contents)
+  string(REGEX REPLACE "Cflags: [^\n]+" "Cflags: -I\${includedir}" contents "${contents}")
+  file(WRITE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/magma.pc" "${contents}")
+endif()
+
+file(REMOVE_RECURSE
+  "${CURRENT_PACKAGES_DIR}/debug/include"
+  "${CURRENT_PACKAGES_DIR}/debug/share"
+)
+
+vcpkg_install_copyright(FILE_LIST "${src_path}/COPYRIGHT")
diff --git a/external_imported/vcpkg/ports/magma/vcpkg.json b/external_imported/vcpkg/ports/magma/vcpkg.json
new file mode 100644
index 000000000..eec7bc6a8
--- /dev/null
+++ b/external_imported/vcpkg/ports/magma/vcpkg.json
@@ -0,0 +1,16 @@
+{
+  "name": "magma",
+  "version": "2.7.2",
+  "description": "Matrix Algebra on GPU and Multi-core Architectures (MAGMA) is a collection of next-generation linear algebra libraries for heterogeneous computing",
+  "homepage": "https://icl.utk.edu/magma/",
+  "license": null,
+  "dependencies": [
+    "blas",
+    "cuda",
+    "lapack",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/magnum-integration/portfile.cmake b/external_imported/vcpkg/ports/magnum-integration/portfile.cmake
index 21ee8cb67..a16467e96 100644
--- a/external_imported/vcpkg/ports/magnum-integration/portfile.cmake
+++ b/external_imported/vcpkg/ports/magnum-integration/portfile.cmake
@@ -44,6 +44,12 @@ if("${FEATURES}" STREQUAL "core")
         "${CURRENT_PACKAGES_DIR}/debug"
     )
     set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
+else()
+    file(GLOB FILES "${CURRENT_PACKAGES_DIR}/debug/*")
+    list(LENGTH FILES COUNT)
+    if(COUNT EQUAL 0)
+        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+    endif()
 endif()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
diff --git a/external_imported/vcpkg/ports/magnum-integration/vcpkg.json b/external_imported/vcpkg/ports/magnum-integration/vcpkg.json
index e3d739989..f54866e43 100644
--- a/external_imported/vcpkg/ports/magnum-integration/vcpkg.json
+++ b/external_imported/vcpkg/ports/magnum-integration/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "magnum-integration",
   "version-string": "2020.06",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Integrations for magnum, C++11/C++14 graphics middleware for games and data visualization",
   "homepage": "https://magnum.graphics/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/magnum-plugins/portfile.cmake b/external_imported/vcpkg/ports/magnum-plugins/portfile.cmake
index dac769c14..744db775c 100644
--- a/external_imported/vcpkg/ports/magnum-plugins/portfile.cmake
+++ b/external_imported/vcpkg/ports/magnum-plugins/portfile.cmake
@@ -53,10 +53,14 @@ endif()
 # Head only features
 set(ALL_SUPPORTED_FEATURES ${ALL_FEATURES})
 if(NOT VCPKG_USE_HEAD_VERSION)
-    list(REMOVE_ITEM ALL_SUPPORTED_FEATURES cgltfimporter glslangshaderconverter
-        ktximageconverter ktximporter openexrimageconverter openexrimporter
-        spirvtoolsshaderconverter stbdxtimageconverter)
-    message(WARNING "Features cgltfimporter, glslangshaderconverter, ktximageconverter, ktximporter, openexrimageconverter, openexrimporter, spirvtoolsshaderconverter and stbdxtimageconverter are not available when building non-head version.")
+    set(head_only cgltfimporter glslangshaderconverter ktximageconverter ktximporter openexrimageconverter openexrimporter spirvtoolsshaderconverter stbdxtimageconverter)
+    foreach(_feature ${head_only})
+        if("${_feature}" IN_LIST FEATURES)
+            list(JOIN head_only ", " features_list)
+            message(FATAL_ERROR "Features ${features_list} are not avaliable when building non-head version.")
+        endif()
+    endforeach()
+    list(REMOVE_ITEM ALL_SUPPORTED_FEATURES ${head_only})
 endif()
 
 set(_COMPONENTS "")
@@ -74,10 +78,15 @@ endforeach()
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES ${_COMPONENTS})
 
+if(VCPKG_CROSSCOMPILING)
+    set(CORRADE_RC_EXECUTABLE "-DCORRADE_RC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/corrade/corrade-rc${VCPKG_HOST_EXECUTABLE_SUFFIX}")
+endif()
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         ${FEATURE_OPTIONS}
+        ${CORRADE_RC_EXECUTABLE}
         -DBUILD_STATIC=${BUILD_PLUGINS_STATIC}
         -DBUILD_PLUGINS_STATIC=${BUILD_PLUGINS_STATIC}
         -DMAGNUM_PLUGINS_DEBUG_DIR=${CURRENT_INSTALLED_DIR}/debug/bin/magnum-d
@@ -123,14 +132,18 @@ else()
     # We delete the import libraries here to avoid the auto-magic linking
     # for plugins which are loaded at runtime.
     if(WIN32)
+        set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled)
         file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/magnum")
         file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/magnum-d")
+        file(GLOB maybe_empty "${CURRENT_PACKAGES_DIR}/lib/*")
+        if(maybe_empty STREQUAL "")
+            file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/")
+            file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/")
+        endif()
     endif()
 endif()
 
 # Handle copyright
-file(INSTALL "${SOURCE_PATH}/COPYING"
-    DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
-    RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
 
 vcpkg_copy_pdbs()
diff --git a/external_imported/vcpkg/ports/magnum-plugins/vcpkg.json b/external_imported/vcpkg/ports/magnum-plugins/vcpkg.json
index 25b2bc701..c78dd8384 100644
--- a/external_imported/vcpkg/ports/magnum-plugins/vcpkg.json
+++ b/external_imported/vcpkg/ports/magnum-plugins/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "magnum-plugins",
   "version-string": "2020.06",
-  "port-version": 10,
+  "port-version": 12,
   "description": "Plugins for magnum, C++11/C++14 graphics middleware for games and data visualization",
   "homepage": "https://magnum.graphics/",
   "license": null,
@@ -20,11 +20,8 @@
     }
   ],
   "default-features": [
-    "cgltfimporter",
     "ddsimporter",
     "icoimporter",
-    "ktximageconverter",
-    "ktximporter",
     "miniexrimageconverter",
     "opengeximporter",
     "stanfordimporter",
diff --git a/external_imported/vcpkg/ports/magnum/004-fix-FindOpenAL.patch b/external_imported/vcpkg/ports/magnum/004-fix-FindOpenAL.patch
index 4222fb247..f108612f0 100644
--- a/external_imported/vcpkg/ports/magnum/004-fix-FindOpenAL.patch
+++ b/external_imported/vcpkg/ports/magnum/004-fix-FindOpenAL.patch
@@ -10,3 +10,16 @@ index 64371a4..375ca58 100644
  
  if(BUILD_PLUGINS_STATIC)
      set(MAGNUM_ANYAUDIOIMPORTER_BUILD_STATIC 1)
+diff --git a/src/MagnumPlugins/WavAudioImporter/CMakeLists.txt b/src/MagnumPlugins/WavAudioImporter/CMakeLists.txt
+index f4172d4..bdfd9da 100644
+--- a/src/MagnumPlugins/WavAudioImporter/CMakeLists.txt
++++ b/src/MagnumPlugins/WavAudioImporter/CMakeLists.txt
+@@ -24,6 +24,8 @@
+ #
+
+ find_package(Corrade REQUIRED PluginManager)
++include(CMakeFindDependencyMacro)
++find_dependency(OpenAL)
+
+ if(BUILD_PLUGINS_STATIC)
+     set(MAGNUM_WAVAUDIOIMPORTER_BUILD_STATIC 1)
diff --git a/external_imported/vcpkg/ports/magnum/portfile.cmake b/external_imported/vcpkg/ports/magnum/portfile.cmake
index 2f1a09266..c060e1a73 100644
--- a/external_imported/vcpkg/ports/magnum/portfile.cmake
+++ b/external_imported/vcpkg/ports/magnum/portfile.cmake
@@ -14,43 +14,16 @@ vcpkg_from_github(
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_PLUGINS_STATIC)
 
-# Remove platform-specific feature that are not available
-# on current target platform from all features.
-
-# For documentation on VCPKG_CMAKE_SYSTEM_NAME see
-# https://github.com/microsoft/vcpkg/blob/master/docs/users/triplets.md#vcpkg_cmake_system_name
-
 set(ALL_SUPPORTED_FEATURES ${ALL_FEATURES})
-# Windows Desktop
-if(NOT "${VCPKG_CMAKE_SYSTEM_NAME}" STREQUAL "")
-    list(REMOVE_ITEM ALL_SUPPORTED_FEATURES wglcontext windowlesswglapplication)
-endif()
-
-# Universal Windows Platform
-if(NOT "${VCPKG_CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
-    # No UWP specific features
-endif()
-
-# Mac OSX
-if(NOT "${VCPKG_CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
-    list(REMOVE_ITEM ALL_SUPPORTED_FEATURES cglcontext windowlesscglapplication)
-endif()
-
-# Linux
-if(NOT "${VCPKG_CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
-    list(REMOVE_ITEM ALL_SUPPORTED_FEATURES glxcontext windowlessglxapplication)
-endif()
-
-# WebAssembly / Linux
-if(NOT "${VCPKG_CMAKE_SYSTEM_NAME}" MATCHES "(Emscripten|Linux)")
-    list(REMOVE_ITEM ALL_SUPPORTED_FEATURES eglcontext windowlesseglapplication)
-endif()
 
 # Head only features
 if(NOT VCPKG_USE_HEAD_VERSION)
-    list(REMOVE_ITEM ALL_SUPPORTED_FEATURES anyshaderconverter shadertools shaderconverter
-        vk-info)
-    message(WARNING "Features anyshaderconverter, shadertools, shaderconverter and vk-info are not avaliable when building non-head version.")
+    foreach(_feature anyshaderconverter shadertools shaderconverter vk-info)
+        if("${_feature}" IN_LIST FEATURES)
+            message(FATAL_ERROR "Features anyshaderconverter, shadertools, shaderconverter and vk-info are not avaliable when building non-head version.")
+        endif()
+    endforeach()
+    list(REMOVE_ITEM ALL_SUPPORTED_FEATURES anyshaderconverter shadertools shaderconverter vk-info)
 endif()
 
 set(_COMPONENTS "")
@@ -68,10 +41,15 @@ endforeach()
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES ${_COMPONENTS})
 
+if(VCPKG_CROSSCOMPILING)
+    set(CORRADE_RC_EXECUTABLE "-DCORRADE_RC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/corrade/corrade-rc${VCPKG_HOST_EXECUTABLE_SUFFIX}")
+endif()
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         ${FEATURE_OPTIONS}
+        ${CORRADE_RC_EXECUTABLE}
         -DBUILD_STATIC=${BUILD_STATIC}
         -DBUILD_PLUGINS_STATIC=${BUILD_PLUGINS_STATIC}
         -DMAGNUM_PLUGINS_DEBUG_DIR=${CURRENT_INSTALLED_DIR}/debug/bin/magnum-d
@@ -92,9 +70,7 @@ set(_TOOLS
     imageconverter
     sceneconverter)
 if(VCPKG_USE_HEAD_VERSION)
-list(APPEND _TOOLS
-    shaderconverter
-    vk-info)
+    list(APPEND _TOOLS shaderconverter vk-info)
 endif()
 foreach(_tool IN LISTS _TOOLS)
     if("${_tool}" IN_LIST FEATURES)
@@ -152,24 +128,40 @@ else()
             file(REMOVE ${LIB_TO_REMOVE})
         endif()
 
-        file(GLOB_RECURSE LIB_TO_REMOVE_DBG "${CURRENT_PACKAGES_DIR}/debug/lib/magnum-d/*")
-        file(GLOB_RECURSE LIB_TO_KEEP_DBG "${CURRENT_PACKAGES_DIR}/debug/lib/magnum-d/*Any*")
+        if (VCPKG_TARGET_IS_UWP)
+            set(debug_dir "magnum")
+        else()
+            set(debug_dir "magnum-d")
+        endif()
+
+        file(GLOB_RECURSE LIB_TO_REMOVE_DBG "${CURRENT_PACKAGES_DIR}/debug/lib/${debug_dir}/*")
+        file(GLOB_RECURSE LIB_TO_KEEP_DBG "${CURRENT_PACKAGES_DIR}/debug/lib/${debug_dir}/*Any*")
         if(LIB_TO_KEEP_DBG)
             list(REMOVE_ITEM LIB_TO_REMOVE_DBG ${LIB_TO_KEEP_DBG})
         endif()
         if(LIB_TO_REMOVE_DBG)
             file(REMOVE ${LIB_TO_REMOVE_DBG})
         endif()
-
-        # fonts and fontconverters don't have Any* plugins
-        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/magnum/fonts")
-        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/magnum/fontconverters")
-        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/magnum-d/fonts")
-        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/magnum-d/fontconverters")
+        
+        # remove maybe empty dirs
+        foreach(subdir "fonts" "importers" "fontconverters" "imageconverters" "audioimporters")
+            file(GLOB maybe_empty "${CURRENT_PACKAGES_DIR}/lib/magnum/${subdir}/*")
+            if(maybe_empty STREQUAL "")
+                file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/magnum/${subdir}")
+                file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/${debug_dir}/${subdir}")
+            endif()
+        endforeach()
+
+        file(GLOB maybe_empty "${CURRENT_PACKAGES_DIR}/lib/magnum/*")
+        if(maybe_empty STREQUAL "")
+            file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/magnum")
+            file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/${debug_dir}")
+        endif()
+        
     endif()
 
     file(COPY "${CMAKE_CURRENT_LIST_DIR}/magnumdeploy.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/bin/magnum")
-    file(COPY "${CMAKE_CURRENT_LIST_DIR}/magnumdeploy.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/magnum-d")
+    file(COPY "${CMAKE_CURRENT_LIST_DIR}/magnumdeploy.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/${debug_dir}")
 endif()
 
 file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/external_imported/vcpkg/ports/magnum/vcpkg.json b/external_imported/vcpkg/ports/magnum/vcpkg.json
index 774a05389..f700c12ee 100644
--- a/external_imported/vcpkg/ports/magnum/vcpkg.json
+++ b/external_imported/vcpkg/ports/magnum/vcpkg.json
@@ -1,11 +1,18 @@
 {
   "name": "magnum",
   "version-string": "2020.06",
-  "port-version": 12,
+  "port-version": 17,
   "description": "C++11/C++14 graphics middleware for games and data visualization",
   "homepage": "https://magnum.graphics/",
   "license": null,
   "dependencies": [
+    {
+      "name": "corrade",
+      "host": true,
+      "features": [
+        "utility"
+      ]
+    },
     {
       "name": "corrade",
       "features": [
@@ -23,7 +30,6 @@
     "anyimageimporter",
     "anysceneconverter",
     "anysceneimporter",
-    "anyshaderconverter",
     "debugtools",
     "gl",
     "meshtools",
@@ -31,7 +37,6 @@
     "scenegraph",
     "sdl2application",
     "shaders",
-    "shadertools",
     "text",
     "texturetools",
     "trade"
@@ -54,6 +59,7 @@
       "dependencies": [
         {
           "name": "corrade",
+          "default-features": false,
           "features": [
             "pluginmanager"
           ]
@@ -135,6 +141,7 @@
     },
     "cglcontext": {
       "description": "CglContext library",
+      "supports": "osx",
       "dependencies": [
         {
           "name": "magnum",
@@ -150,6 +157,7 @@
     },
     "distancefieldconverter": {
       "description": "magnum-distancefieldconverter utility",
+      "supports": "!ios & !android",
       "dependencies": [
         {
           "name": "magnum",
@@ -164,6 +172,7 @@
     },
     "eglcontext": {
       "description": "EglContext library",
+      "supports": "!windows & !osx",
       "dependencies": [
         {
           "name": "magnum",
@@ -176,6 +185,7 @@
     },
     "fontconverter": {
       "description": "magnum-fontconverter utility",
+      "supports": "!ios & !android",
       "dependencies": [
         {
           "name": "magnum",
@@ -189,10 +199,12 @@
       ]
     },
     "gl": {
-      "description": "GL library"
+      "description": "GL library",
+      "supports": "!uwp"
     },
     "gl-info": {
       "description": "gl-info utility",
+      "supports": "!ios",
       "dependencies": [
         {
           "name": "magnum",
@@ -211,6 +223,7 @@
     },
     "glxcontext": {
       "description": "GlxContext library",
+      "supports": "!windows & !osx",
       "dependencies": [
         {
           "name": "magnum",
@@ -224,6 +237,13 @@
     "imageconverter": {
       "description": "magnum-imageconverter utility",
       "dependencies": [
+        {
+          "name": "corrade",
+          "default-features": false,
+          "features": [
+            "dynamic-pluginmanager"
+          ]
+        },
         {
           "name": "magnum",
           "default-features": false,
@@ -293,6 +313,7 @@
       "dependencies": [
         {
           "name": "corrade",
+          "default-features": false,
           "features": [
             "testsuite"
           ]
@@ -313,6 +334,7 @@
           "name": "magnum",
           "default-features": false,
           "features": [
+            "meshtools",
             "trade"
           ]
         }
@@ -321,6 +343,13 @@
     "sceneconverter": {
       "description": "magnum-sceneconverter utility",
       "dependencies": [
+        {
+          "name": "corrade",
+          "default-features": false,
+          "features": [
+            "dynamic-pluginmanager"
+          ]
+        },
         {
           "name": "magnum",
           "default-features": false,
@@ -372,6 +401,7 @@
       "dependencies": [
         {
           "name": "corrade",
+          "default-features": false,
           "features": [
             "pluginmanager"
           ]
@@ -424,6 +454,7 @@
       "dependencies": [
         {
           "name": "corrade",
+          "default-features": false,
           "features": [
             "pluginmanager"
           ]
@@ -462,6 +493,7 @@
     },
     "wglcontext": {
       "description": "WglContext library",
+      "supports": "windows & !uwp",
       "dependencies": [
         {
           "name": "magnum",
@@ -474,6 +506,7 @@
     },
     "windowlesscglapplication": {
       "description": "WindowlessCglApplication library",
+      "supports": "osx",
       "dependencies": [
         {
           "name": "magnum",
@@ -486,6 +519,7 @@
     },
     "windowlesseglapplication": {
       "description": "WindowlessEglApplication library",
+      "supports": "!windows & !osx & !ios",
       "dependencies": [
         {
           "name": "magnum",
@@ -498,6 +532,7 @@
     },
     "windowlessglxapplication": {
       "description": "WindowlessGlxApplication library",
+      "supports": "!windows & !osx & !ios",
       "dependencies": [
         {
           "name": "magnum",
@@ -510,6 +545,7 @@
     },
     "windowlesswglapplication": {
       "description": "WindowlessWglApplication library",
+      "supports": "windows & !uwp",
       "dependencies": [
         {
           "name": "magnum",
diff --git a/external_imported/vcpkg/ports/mailio/fix-library-type-and-remove-boost-test-deps.patch b/external_imported/vcpkg/ports/mailio/fix-library-type-and-remove-boost-test-deps.patch
new file mode 100644
index 000000000..b6df34610
--- /dev/null
+++ b/external_imported/vcpkg/ports/mailio/fix-library-type-and-remove-boost-test-deps.patch
@@ -0,0 +1,22 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e3b30fd..3828816 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -59,7 +59,7 @@ if(WIN32)
+     set(Boost_USE_STATIC_LIBS ON)
+ endif(WIN32)
+ 
+-find_package(Boost REQUIRED COMPONENTS system date_time regex unit_test_framework)
++find_package(Boost REQUIRED COMPONENTS system date_time regex)
+ find_package(OpenSSL)
+ set(CMAKE_THREAD_PREFER_PTHREAD)
+ # "Use of both the imported target as well as this switch is highly recommended for new code."
+@@ -123,7 +123,7 @@ if (MAILIO_BUILD_SHARED_LIBRARY)
+ else()
+     set(LIBRARY_TYPE "STATIC")
+ endif()
+-add_library(${PROJECT_NAME} ${LIBRARY_TYPE} ${project_sources} ${project_headers})
++add_library(${PROJECT_NAME} ${project_sources} ${project_headers})
+ 
+ 
+ # pkg-config support
diff --git a/external_imported/vcpkg/ports/mailio/portfile.cmake b/external_imported/vcpkg/ports/mailio/portfile.cmake
index 9171b35ea..9c8390f61 100644
--- a/external_imported/vcpkg/ports/mailio/portfile.cmake
+++ b/external_imported/vcpkg/ports/mailio/portfile.cmake
@@ -1,9 +1,10 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO karastojko/mailio
-    REF cc887a7808d9c55e07c8a7503c7ae2e2d7485120 # version_0-21-0
-    SHA512 7125bfe4274e1e126e335b2e4b5743ef54d5dc0b6fd83f0c10e7578b57924d3e398af6b3865fdee3de587e2e2d7c33d95dbe017b1966649e68cf52f2dd268ee5
+    REF "${VERSION}"
+    SHA512 e1eee9f5b80dab16017af475b8c13f8278fa3d73e1c446e507dc122cb3df5b984b41c04d753e36cf848dd15029524f95cf48e050cee265c8933b0be1ea500a5d
     HEAD_REF master
+    PATCHES fix-library-type-and-remove-boost-test-deps.patch
 )
 
 vcpkg_cmake_configure(
@@ -11,6 +12,7 @@ vcpkg_cmake_configure(
     OPTIONS
         -DMAILIO_BUILD_DOCUMENTATION=OFF
         -DMAILIO_BUILD_EXAMPLES=OFF
+        -DMAILIO_BUILD_TESTS=OFF
 )
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(
@@ -20,4 +22,5 @@ vcpkg_cmake_config_fixup(
 vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/external_imported/vcpkg/ports/mailio/vcpkg.json b/external_imported/vcpkg/ports/mailio/vcpkg.json
index c2f639f9e..8a0b1000e 100644
--- a/external_imported/vcpkg/ports/mailio/vcpkg.json
+++ b/external_imported/vcpkg/ports/mailio/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "mailio",
-  "version": "0.21.0",
-  "port-version": 2,
+  "version": "0.23.0",
   "maintainers": "Tomislav Karastojković <contact@alepho.com>",
   "description": "mailio is a cross platform C++ library for MIME format and SMTP, POP3 and IMAP protocols. It is based on the standard C++ 17 and Boost library.",
   "homepage": "https://github.com/karastojko/mailio",
diff --git a/external_imported/vcpkg/ports/makeid/portfile.cmake b/external_imported/vcpkg/ports/makeid/portfile.cmake
new file mode 100644
index 000000000..67c750901
--- /dev/null
+++ b/external_imported/vcpkg/ports/makeid/portfile.cmake
@@ -0,0 +1,17 @@
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://www.humus.name/3D/MakeID.h"
+    FILENAME "MakeID.h-${VERSION}"
+    SHA512 fd4222d2cc0b0e16b0cfbac048cb64ac59d53ede10ab7f88f710e4b866cb67ffb0ec139821c181f1804a813cc9ab20cf33282c8b73e9ef0fdba414be474c2b64
+)
+
+file(INSTALL "${ARCHIVE}" DESTINATION "${CURRENT_PACKAGES_DIR}/include" RENAME "MakeID.h")
+
+set(license_text 
+"Public Domain
+
+This file is released in the hopes that it will be useful. Use in whatever way you like, but no guarantees that it
+actually works or fits any particular purpose. It has been unit-tested and benchmarked though, and seems to do
+what it was designed to do, and seems pretty quick at it too."
+)
+
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/makeid/copyright" "${license_text}")
diff --git a/external_imported/vcpkg/ports/makeid/vcpkg.json b/external_imported/vcpkg/ports/makeid/vcpkg.json
new file mode 100644
index 000000000..188046ce1
--- /dev/null
+++ b/external_imported/vcpkg/ports/makeid/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "makeid",
+  "version": "1.0.3",
+  "description": "MakeID is a cross platform C++ library for IDs allocation/deallocation",
+  "homepage": "http://www.humus.name/index.php?page=3D",
+  "license": null
+}
diff --git a/external_imported/vcpkg/ports/manif/portfile.cmake b/external_imported/vcpkg/ports/manif/portfile.cmake
new file mode 100644
index 000000000..391810a44
--- /dev/null
+++ b/external_imported/vcpkg/ports/manif/portfile.cmake
@@ -0,0 +1,18 @@
+#header-only library
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO artivis/manif
+    REF bb3f6758ae467b7f24def71861798d131f157032
+    SHA512 aaead27e1a177a1ded644bac270702c7d6232ac5345148be41d3ebca7e181d194e106d74f175182af51a72a4f26d5632749306d86676b5cb8862ddc34ea16a05
+    HEAD_REF devel
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH share/manif/cmake)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/manif/vcpkg.json b/external_imported/vcpkg/ports/manif/vcpkg.json
new file mode 100644
index 000000000..ab0d10308
--- /dev/null
+++ b/external_imported/vcpkg/ports/manif/vcpkg.json
@@ -0,0 +1,20 @@
+{
+  "name": "manif",
+  "version-date": "2023-07-17",
+  "description": "A small C++11 header-only library for Lie theory.",
+  "homepage": "https://github.com/artivis/manif",
+  "documentation": "https://artivis.github.io/manif/",
+  "license": "MIT",
+  "dependencies": [
+    "eigen3",
+    "tl-optional",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/mapbox-variant/vcpkg.json b/external_imported/vcpkg/ports/mapbox-variant/vcpkg.json
index 91f0b61ec..b31533e46 100644
--- a/external_imported/vcpkg/ports/mapbox-variant/vcpkg.json
+++ b/external_imported/vcpkg/ports/mapbox-variant/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "mapbox-variant",
-  "version-string": "1.2.0",
-  "port-version": 1,
+  "version": "1.2.0",
+  "port-version": 2,
   "description": "C++11/C++14 Variant"
 }
diff --git a/external_imported/vcpkg/ports/mapnik/missing-include.patch b/external_imported/vcpkg/ports/mapnik/missing-include.patch
new file mode 100644
index 000000000..49b80d400
--- /dev/null
+++ b/external_imported/vcpkg/ports/mapnik/missing-include.patch
@@ -0,0 +1,13 @@
+diff --git a/plugins/input/csv/csv_utils.cpp b/plugins/input/csv/csv_utils.cpp
+index 382b1ce..c0256de 100644
+--- a/plugins/input/csv/csv_utils.cpp
++++ b/plugins/input/csv/csv_utils.cpp
+@@ -40,6 +40,8 @@
+ #include <cstdio>
+ #include <algorithm>
+ 
++#include <boost/algorithm/string/trim.hpp>
++
+ namespace csv_utils {
+ namespace detail {
+ 
diff --git a/external_imported/vcpkg/ports/mapnik/portfile.cmake b/external_imported/vcpkg/ports/mapnik/portfile.cmake
index 02cdf7c88..8ff420149 100644
--- a/external_imported/vcpkg/ports/mapnik/portfile.cmake
+++ b/external_imported/vcpkg/ports/mapnik/portfile.cmake
@@ -3,9 +3,11 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mapnik/mapnik
-    REF 4e064b8b8e324c4df7f2ae21dd72ccb85e1d4140
-    SHA512 4db329cad90058abc1a3430fded6fac5a49334f8feffb8510bd965a28dee630adf150174c933e61c76e93f6f107397e97929c863c97603d8dcef28f1a25f4628
+    REF 123232ffde565af38afd06fe3e8edd9bfdce93bc
+    SHA512 b940312688fcece8bb52b8b687fcc60eaac159d4737966eacacbafbde6fbd3245f9acf170d55a664a781908282cb21347bd4b79bd08b8ab2461270ef453b10c5
     HEAD_REF master
+    PATCHES
+        missing-include.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
diff --git a/external_imported/vcpkg/ports/mapnik/vcpkg.json b/external_imported/vcpkg/ports/mapnik/vcpkg.json
index d3e85ad0d..df63fa8ff 100644
--- a/external_imported/vcpkg/ports/mapnik/vcpkg.json
+++ b/external_imported/vcpkg/ports/mapnik/vcpkg.json
@@ -1,9 +1,11 @@
 {
   "name": "mapnik",
-  "version-date": "2023-01-17",
+  "version-date": "2023-06-12",
+  "port-version": 3,
   "description": "Mapnik is an open source toolkit for developing mapping applications.",
   "homepage": "https://github.com/mapnik/mapnik",
   "license": "LGPL-2.1-only",
+  "supports": "!xbox",
   "dependencies": [
     "boost-assign",
     "boost-bimap",
@@ -83,7 +85,10 @@
       "description": "Grid renderer"
     },
     "input-csv": {
-      "description": "CSV input plugin"
+      "description": "CSV input plugin",
+      "dependencies": [
+        "boost-algorithm"
+      ]
     },
     "input-gdal": {
       "description": "GDAL input plugin",
@@ -119,7 +124,10 @@
       ]
     },
     "input-raster": {
-      "description": "RASTER input plugin"
+      "description": "RASTER input plugin",
+      "dependencies": [
+        "boost-format"
+      ]
     },
     "input-shape": {
       "description": "SHAPE input plugin"
@@ -210,7 +218,7 @@
     "viewer": {
       "description": "Make demo viewer application",
       "dependencies": [
-        "qt5-base"
+        "qtbase"
       ]
     },
     "webp": {
diff --git a/external_imported/vcpkg/ports/marble/vcpkg.json b/external_imported/vcpkg/ports/marble/vcpkg.json
index 06c6ae814..730236632 100644
--- a/external_imported/vcpkg/ports/marble/vcpkg.json
+++ b/external_imported/vcpkg/ports/marble/vcpkg.json
@@ -1,11 +1,11 @@
 {
   "name": "marble",
   "version-string": "22.04.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Marble KDE library",
   "homepage": "https://marble.kde.org",
   "license": "LGPL-2.1-or-later",
-  "supports": "windows & x64 & !static",
+  "supports": "windows & x64 & !static & !xbox",
   "dependencies": [
     "qt5-base",
     "qt5-quickcontrols",
diff --git a/external_imported/vcpkg/ports/marl/portfile.cmake b/external_imported/vcpkg/ports/marl/portfile.cmake
index 53cb52f85..a165d6cad 100644
--- a/external_imported/vcpkg/ports/marl/portfile.cmake
+++ b/external_imported/vcpkg/ports/marl/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/marl
-    REF 9929747c9ba6354691dbacaf14f9b35433871e5b #2022-03-02
-    SHA512 454399485d292526333417474a312302aaff90cf63bc06a95c2e8b87cb92eaea547457ba3c06413e079ca29f9ea64990b9da467aeaec6ec2aa3233efddab2407
+    REF aa9e85b2189d6f5dbba6909275661b37dfb5de69 #2023-06-28
+    SHA512 fc4869d791608fa9198da896b6687fcc79e830766f3192ca6d7b28ba3156a06618901677e66f0b08a472a602a62d88f09ff49917a6749f410d92c2911f14d736
     HEAD_REF main
 )
 
@@ -31,4 +31,4 @@ vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/marl/vcpkg.json b/external_imported/vcpkg/ports/marl/vcpkg.json
index c641ba3e6..f6af1f7b1 100644
--- a/external_imported/vcpkg/ports/marl/vcpkg.json
+++ b/external_imported/vcpkg/ports/marl/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "marl",
-  "version-date": "2022-03-02",
+  "version-date": "2023-06-28",
   "description": "A hybrid thread/fiber task scheduler written in modern C++",
   "homepage": "https://github.com/google/marl",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/materialx/portfile.cmake b/external_imported/vcpkg/ports/materialx/portfile.cmake
index da56e07be..f048ea6bf 100644
--- a/external_imported/vcpkg/ports/materialx/portfile.cmake
+++ b/external_imported/vcpkg/ports/materialx/portfile.cmake
@@ -1,16 +1,27 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO AcademySoftwareFoundation/MaterialX
-    REF b1ba83b312576fc58f02a6a7db40b18ddbe4f87f # 1.38.4
-    SHA512 3988c42d487e391f9f0f3ab5f34eaa26c7f450079695d96954b871e078eecfe692daa9917279560ba3f10bf771685df3da6e26273d575a23a11c3d17fb897c62
+    REF "v${VERSION}"
+    SHA512 64d5b989fdddfd9d1b21f9dccf914d2674a23c9fd9d24f121ff451ab333e359dc8ab253f72827d68cd2ed59b0c03a51818cc71aa2adf5adfe74eabe0fd58c682
     HEAD_REF main
 )
 
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        glsl-generator MATERIALX_BUILD_GEN_GLSL
+        mdl-generator  MATERIALX_BUILD_GEN_MDL
+        osl-generator  MATERIALX_BUILD_GEN_OSL
+        render         MATERIALX_BUILD_RENDER
+)
+if ((VCPKG_TARGET_IS_ANDROID OR VCPKG_TARGET_IS_LINUX) AND MATERIALX_BUILD_RENDER)
+    message(WARNING "${PORT} currently requires the following libraries from the system package manager:\n    libx11-dev\n\nThese can be installed on Ubuntu systems via apt-get install libx11-dev.")
+endif()
+
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" OPTION_BUILD_SHARED_LIB)
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS
+    OPTIONS ${FEATURE_OPTIONS}
         "-DMATERIALX_BUILD_SHARED_LIBS:BOOL=${OPTION_BUILD_SHARED_LIB}"
         "-DMATERIALX_BUILD_JS:BOOL=NO"
         "-DMATERIALX_BUILD_PYTHON:BOOL=NO"
@@ -44,6 +55,16 @@ file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/debug/LICENSE"
     "${CURRENT_PACKAGES_DIR}/debug/README.md"
     "${CURRENT_PACKAGES_DIR}/debug/THIRD-PARTY.md"
-    "${CURRENT_PACKAGES_DIR}/debug/include")
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+
+    # MaterialXGenShader explicitely install resources
+    "${CURRENT_PACKAGES_DIR}/resources"
+    "${CURRENT_PACKAGES_DIR}/debug/resources"
+    "${CURRENT_PACKAGES_DIR}/include/MaterialXRender/External/OpenImageIO" 
+
+    # Based on how OSL does it, it could be that those `.mdl` source would be better located inside `libraries/pbrlib/genmdl/**`
+    # But it seems that they are instead installed into `libraries/mdl`
+    "${CURRENT_PACKAGES_DIR}/include/MaterialXGenMdl/mdl"
+)
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/materialx/vcpkg.json b/external_imported/vcpkg/ports/materialx/vcpkg.json
index 60fc20236..588a141b4 100644
--- a/external_imported/vcpkg/ports/materialx/vcpkg.json
+++ b/external_imported/vcpkg/ports/materialx/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "materialx",
-  "version": "1.38.4",
+  "version": "1.38.8",
+  "port-version": 1,
   "description": "MaterialX is an open standard for the exchange of rich material and look-development content across applications and renderers.",
   "homepage": "https://www.materialx.org/",
   "license": "Apache-2.0",
@@ -14,5 +15,19 @@
       "name": "vcpkg-cmake-config",
       "host": true
     }
-  ]
+  ],
+  "features": {
+    "glsl-generator": {
+      "description": "Build the GLSL shader generator back-end."
+    },
+    "mdl-generator": {
+      "description": "Build the MDL shader generator back-end."
+    },
+    "osl-generator": {
+      "description": "Build the OSL shader generator back-end."
+    },
+    "render": {
+      "description": "Build the MaterialX Render library."
+    }
+  }
 }
diff --git a/external_imported/vcpkg/ports/mathc/vcpkg.json b/external_imported/vcpkg/ports/mathc/vcpkg.json
index f32615821..531276a2b 100644
--- a/external_imported/vcpkg/ports/mathc/vcpkg.json
+++ b/external_imported/vcpkg/ports/mathc/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "mathc",
-  "version-string": "2019-09-29",
-  "port-version": 2,
+  "version-date": "2019-09-29",
+  "port-version": 3,
   "description": "Pure C math library for 2D and 3D programming",
   "homepage": "https://github.com/felselva/mathc",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/mathgl/fix-include-property.patch b/external_imported/vcpkg/ports/mathgl/fix-include-property.patch
new file mode 100644
index 000000000..1c15d38a1
--- /dev/null
+++ b/external_imported/vcpkg/ports/mathgl/fix-include-property.patch
@@ -0,0 +1,14 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index d44125c..1ad17a1 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -53,6 +53,9 @@ generate_export_header(mgl EXPORT_FILE_NAME ../include/mgl2/dllexport.h)
+ target_link_libraries(mgl ${MGL_DEP_LIBS})
+ target_link_libraries(mgl-static ${MGL_DEP_LIBS})
+ 
++target_include_directories(mgl PUBLIC $<INSTALL_INTERFACE:include>)
++target_include_directories(mgl-static PUBLIC $<INSTALL_INTERFACE:include>)
++
+ mgl_po_src(${mgl_src} ${mgl_hdr})
+ 
+ if(MGL_HAVE_MPI)
diff --git a/external_imported/vcpkg/ports/mathgl/fix_link_gsl.patch b/external_imported/vcpkg/ports/mathgl/fix_link_gsl.patch
new file mode 100644
index 000000000..7715f808a
--- /dev/null
+++ b/external_imported/vcpkg/ports/mathgl/fix_link_gsl.patch
@@ -0,0 +1,37 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1c931e2..4987f2d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -485,25 +485,13 @@ endif(enable-openmp)
+ 
+ if(enable-gsl)
+ 	set(MGL_HAVE_GSL 1)
+-	find_library(GSL_LIB gsl)
+-	find_library(GSL_CBLAS_LIB gslcblas)
+-	find_path(GSL_INCLUDE_DIR gsl/gsl_fft_complex.h)
+-	if(NOT GSL_LIB OR NOT GSL_CBLAS_LIB OR NOT GSL_INCLUDE_DIR)
+-		message(SEND_ERROR "${GSL_LIB}")
+-		message(SEND_ERROR "${GSL_CBLAS_LIB}")
+-		message(SEND_ERROR "${GSL_INCLUDE_DIR}")
+-		message(SEND_ERROR "Couldn't find GSL libraries.")
+-	else(NOT GSL_LIB OR NOT GSL_CBLAS_LIB OR NOT GSL_INCLUDE_DIR)
+-		set(CMAKE_REQUIRED_INCLUDES ${GSL_INCLUDE_DIR})
+-		set(CMAKE_REQUIRED_LIBRARIES ${GSL_LIB} ${GSL_CBLAS_LIB})
+-		CHECK_CXX_SOURCE_COMPILES("#include <gsl/gsl_multifit_nlin.h>
+-		int main(){gsl_multifit_fdfsolver *s=0;gsl_matrix *J = 0;
+-		gsl_multifit_fdfsolver_jac(s, J);}" MGL_HAVE_GSL2)
+-		unset(CMAKE_REQUIRED_INCLUDES)
+-		unset(CMAKE_REQUIRED_LIBRARIES)
+-	endif(NOT GSL_LIB OR NOT GSL_CBLAS_LIB OR NOT GSL_INCLUDE_DIR)
+-	set(MGL_DEP_LIBS ${GSL_LIB} ${GSL_CBLAS_LIB} ${MGL_DEP_LIBS})
+-	include_directories(${GSL_INCLUDE_DIR})
++    find_package(GSL REQUIRED)
++    set(MGL_DEP_LIBS GSL::gsl GSL::gslcblas ${MGL_DEP_LIBS})
++    set(CMAKE_REQUIRED_LIBRARIES GSL::gsl GSL::gslcblas)
++    CHECK_CXX_SOURCE_COMPILES("#include <gsl/gsl_multifit_nlin.h>
++    int main(){gsl_multifit_fdfsolver *s=0;gsl_matrix *J = 0;
++    gsl_multifit_fdfsolver_jac(s, J);}" MGL_HAVE_GSL2)
++    unset(CMAKE_REQUIRED_LIBRARIES)
+ else(enable-gsl)
+ 	set(MGL_HAVE_GSL 0)
+ endif(enable-gsl)
diff --git a/external_imported/vcpkg/ports/mathgl/include_functional.patch b/external_imported/vcpkg/ports/mathgl/include_functional.patch
new file mode 100644
index 000000000..1b7a2b745
--- /dev/null
+++ b/external_imported/vcpkg/ports/mathgl/include_functional.patch
@@ -0,0 +1,12 @@
+diff --git a/src/prc/writePRC.h b/src/prc/writePRC.h
+index d0b4e0e..3bc68ea 100644
+--- a/src/prc/writePRC.h
++++ b/src/prc/writePRC.h
+@@ -31,6 +31,7 @@
+ #include "PRC.h"
+ #include <float.h>
+ #include <math.h>
++#include <functional>
+ 
+ static const uint32_t m1=(uint32_t)-1;
+ static const double pi=acos(-1.0);
diff --git a/external_imported/vcpkg/ports/mathgl/portfile.cmake b/external_imported/vcpkg/ports/mathgl/portfile.cmake
index 24ada6108..6eaf3884c 100644
--- a/external_imported/vcpkg/ports/mathgl/portfile.cmake
+++ b/external_imported/vcpkg/ports/mathgl/portfile.cmake
@@ -1,8 +1,7 @@
-vcpkg_minimum_required(VERSION 2022-10-12)
 vcpkg_from_sourceforge(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mathgl/mathgl
-    REF "mathgl 8.0"
+    REF "mathgl%208.0"
     FILENAME "mathgl-${VERSION}.tar.gz"
     SHA512 1ff3023f1bbd7bfd84202777a0166a8d4255a020a07f3650b9858929345bc8a2ceea4db155d2c93ba32b762d2304474276290a9edac99fda70fb4b5bc12982c2
     PATCHES
@@ -15,6 +14,9 @@ vcpkg_from_sourceforge(
         fix-format-specifiers.patch
         fix-glut.patch
         fix-mgllab.patch
+        include_functional.patch
+        fix-include-property.patch
+        fix_link_gsl.patch
 )
 file(REMOVE_RECURSE "${SOURCE_PATH}/addons/getopt")
 
@@ -104,4 +106,4 @@ vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/mgl2/config.h" "#define MG
 vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/mgl2/config.h" "#define MGL_FONT_PATH\t\"${CURRENT_PACKAGES_DIR}/share/mathgl/fonts\"" "")
 
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/mathgl/vcpkg.json b/external_imported/vcpkg/ports/mathgl/vcpkg.json
index e56b8c62f..fd235b0b9 100644
--- a/external_imported/vcpkg/ports/mathgl/vcpkg.json
+++ b/external_imported/vcpkg/ports/mathgl/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "mathgl",
   "version": "8.0.1",
+  "port-version": 5,
   "description": "MathGL is a free library of fast C++ routines for the plotting of the data varied in one or more dimensions",
   "license": "GPL-3.0-only",
-  "supports": "!uwp",
+  "supports": "!uwp & !xbox",
   "dependencies": [
     "getopt",
     {
@@ -98,7 +99,14 @@
     "png": {
       "description": "png module",
       "dependencies": [
-        "libpng"
+        "libpng",
+        {
+          "name": "mathgl",
+          "default-features": false,
+          "features": [
+            "zlib"
+          ]
+        }
       ]
     },
     "qt5": {
diff --git a/external_imported/vcpkg/ports/matio/portfile.cmake b/external_imported/vcpkg/ports/matio/portfile.cmake
index 924b302ca..abbe06e95 100644
--- a/external_imported/vcpkg/ports/matio/portfile.cmake
+++ b/external_imported/vcpkg/ports/matio/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO tbeu/matio
-    REF e9e063e08ef2a27fcc22b1e526258fea5a5de329 # v1.5.23
-    SHA512 78b13f4796870158f5cf2b8234c0ab6dc8b449cba49608ce40c51a3f91994c33c29b8a6de1ceed94a81fc7faa798d8c3a45a275f3a3abba70a0cd7be731e1d9c
+    REF "v${VERSION}"
+    SHA512 b0ff73b7d39b68c87f371e397ed8f46040f1334e8d81d2b462f62bf7d14c6566e4f5a0c55955696cbbc035ff7b41e5811ce7429476ae48c1465f48f77b4dc6b2
     HEAD_REF master
     PATCHES fix-dependencies.patch
 )
@@ -27,10 +27,22 @@ vcpkg_cmake_configure(
 
 vcpkg_cmake_install()
 
+set(prefix "${CURRENT_INSTALLED_DIR}")
+set(exec_prefix [[${prefix}]])
+set(libdir [[${prefix}/lib]])
+set(includedir [[${prefix}/include]])
+configure_file("${SOURCE_PATH}/matio.pc.in" "${SOURCE_PATH}/matio.pc" @ONLY)
+file(INSTALL "${SOURCE_PATH}/matio.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig")
+if(NOT VCPKG_BUILD_TYPE)
+    set(includedir [[${prefix}/../include]])
+    file(INSTALL "${SOURCE_PATH}/matio.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
+endif()
 vcpkg_copy_pdbs()
+vcpkg_fixup_pkgconfig()
 
 vcpkg_copy_tools(TOOL_NAMES matdump AUTO_CLEAN)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 
 file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/external_imported/vcpkg/ports/matio/usage b/external_imported/vcpkg/ports/matio/usage
new file mode 100644
index 000000000..4a697912d
--- /dev/null
+++ b/external_imported/vcpkg/ports/matio/usage
@@ -0,0 +1,5 @@
+matio can be imported via CMake FindPkgConfig module:
+
+    find_package(PkgConfig REQUIRED)
+    pkg_check_modules(matio REQUIRED IMPORTED_TARGET matio)
+    target_link_libraries(main PRIVATE PkgConfig::matio)
diff --git a/external_imported/vcpkg/ports/matio/vcpkg.json b/external_imported/vcpkg/ports/matio/vcpkg.json
index b5ff9bbc0..4cc03ed86 100644
--- a/external_imported/vcpkg/ports/matio/vcpkg.json
+++ b/external_imported/vcpkg/ports/matio/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "matio",
-  "version": "1.5.23",
-  "port-version": 2,
+  "version": "1.5.26",
   "description": "MATLAB MAT File I/O Library",
   "homepage": "https://github.com/tbeu/matio",
   "license": "BSD-2-Clause",
diff --git a/external_imported/vcpkg/ports/matplotlib-cpp/vcpkg.json b/external_imported/vcpkg/ports/matplotlib-cpp/vcpkg.json
index 83944db18..8e379d72a 100644
--- a/external_imported/vcpkg/ports/matplotlib-cpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/matplotlib-cpp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "matplotlib-cpp",
-  "version-string": "2020-08-27",
-  "port-version": 1,
+  "version-date": "2020-08-27",
+  "port-version": 2,
   "description": "Extremely simple yet powerful header-only C++ plotting library built on the popular matplotlib",
   "homepage": "https://github.com/lava/matplotlib-cpp"
 }
diff --git a/external_imported/vcpkg/ports/matplotplusplus/fix-dependencies.patch b/external_imported/vcpkg/ports/matplotplusplus/fix-dependencies.patch
index 89ef9fba8..46be79a61 100644
--- a/external_imported/vcpkg/ports/matplotplusplus/fix-dependencies.patch
+++ b/external_imported/vcpkg/ports/matplotplusplus/fix-dependencies.patch
@@ -1,8 +1,81 @@
+diff --git a/Matplot++Config.cmake.in b/Matplot++Config.cmake.in
+index fc9ceca..1601015 100644
+--- a/Matplot++Config.cmake.in
++++ b/Matplot++Config.cmake.in
+@@ -1,4 +1,5 @@
+ @PACKAGE_INIT@
++include(CMakeFindDependencyMacro)
+ 
+ # How this Matplot++ installation was built
+ set(MATPLOT_BUILT_SHARED "@MATPLOTPP_BUILD_SHARED_LIBS@")
+@@ -10,12 +11,44 @@ if (NOT CMAKE_CXX_COMPILER_ID STREQUAL MATPLOT_BUILT_CXX_COMPILER_ID)
+     message(WARNING "This installation of Matplot++ was built with ${MATPLOT_BUILT_CXX_COMPILER_ID}.")
+ endif()
+ 
++if ("@MATPLOTPP_BUILD_EXPERIMENTAL_OPENGL_BACKEND@")
++  find_dependency(glad CONFIG)
++  find_dependency(glfw3 CONFIG)
++endif()
++find_dependency(nodesoup CONFIG )
++if ("@WITH_JPEG@")
++find_dependency(JPEG)
++endif()
++
++if ("@WITH_TIFF@")
++find_dependency(TIFF)
++endif()
++
++if ("@WITH_ZLIB@")
++find_dependency(ZLIB)
++find_dependency(libpng CONFIG)
++endif()
++
++if ("@WITH_LAPACK@")
++find_dependency(LAPACK)
++endif()
++
++if ("@WITH_BLAS@")
++find_dependency(BLAS)
++endif()
++
++if ("@WITH_FFTW3@")
++find_dependency(FFTW3 CONFIG)
++endif()
++
++if ("@WITH_OPENCV@")
++find_dependency(OpenCV CONFIG)
++endif()
++
+ # Find dependencies
+ if(NOT ${MATPLOT_BUILT_SHARED})
+-    include(CMakeFindDependencyMacro)
+     list(APPEND CMAKE_MODULE_PATH ${MATPLOT_CONFIG_INSTALL_DIR})
+     list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
+-    find_dependency(Filesystem COMPONENTS Experimental Final)
+     list(POP_BACK CMAKE_MODULE_PATH)
+ endif()
+ 
 diff --git a/source/3rd_party/CMakeLists.txt b/source/3rd_party/CMakeLists.txt
-index ab58bbd..f9fed7e 100644
+index b5656e1..7ff4046 100644
 --- a/source/3rd_party/CMakeLists.txt
 +++ b/source/3rd_party/CMakeLists.txt
-@@ -67,57 +67,69 @@ find_package(PkgConfig)
+@@ -1,6 +1,7 @@
+ #######################################################
+ ### NodeSoup                                        ###
+ #######################################################
++if(0)
+ if(WITH_SYSTEM_NODESOUP)
+   find_path(NODESOUP_INCLUDE_DIR nodesoup.hpp REQUIRED)
+   find_library(NODESOUP_LIB nodesoup REQUIRED)
+@@ -47,6 +48,7 @@ if(MASTER_PROJECT AND NOT BUILD_SHARED_LIBS)
+       ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/Matplot++)
+ endif()
+ 
++endif()
+ 
+ #######################################################
+ ### CImg                                            ###
+@@ -69,57 +71,69 @@ find_package(PkgConfig)
  #            Lots of optional packages are not a good idea in general.
  #            It makes the library much less "packagable" (https://youtu.be/sBP17HQAQjk)
  #            and much more difficult to make sure it works on multiple OSs
@@ -94,3 +167,66 @@ index ab58bbd..f9fed7e 100644
    endif()
  else()
    message("No CMAKE_MODULE_PATH path for OpenCV configured")
+diff --git a/source/matplot/CMakeLists.txt b/source/matplot/CMakeLists.txt
+index fe9ad53..b06ed7e 100644
+--- a/source/matplot/CMakeLists.txt
++++ b/source/matplot/CMakeLists.txt
+@@ -1,5 +1,4 @@
+ if(NOT MINGW)
+-find_package(Filesystem REQUIRED COMPONENTS Experimental Final)
+ endif()
+ 
+ #######################################################
+@@ -102,12 +101,13 @@ target_include_directories(matplot
+            $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+ 
+ # Dependencies
++find_package(nodesoup CONFIG REQUIRED)
+ if(NOT MINGW)
+-target_link_libraries_system(matplot
+-  PRIVATE cimg nodesoup std::filesystem)
++target_link_libraries(matplot
++  PRIVATE cimg nodesoup::nodesoup)
+ else()
+-target_link_libraries_system(matplot
+-  PRIVATE cimg nodesoup)
++target_link_libraries(matplot
++  PRIVATE cimg nodesoup::nodesoup)
+ endif()
+ 
+ # Required compiler features required
+@@ -134,7 +134,6 @@ maybe_target_pedantic_warnings(matplot)
+ # Use experimental filesystem if std::filesystem is not available yet
+ if(NOT MINGW)
+     if (CXX_FILESYSTEM_IS_EXPERIMENTAL)
+-      target_compile_definitions(matplot PRIVATE CXX_FILESYSTEM_IS_EXPERIMENTAL)
+     endif()
+ endif()
+ # Some hack to not depend on FILE* internals
+@@ -217,7 +216,7 @@ if (MATPLOTPP_BUILD_EXPERIMENTAL_OPENGL_BACKEND)
+     find_package(OpenGL REQUIRED)
+ 
+     # https://github.com/Dav1dde/glad
+-    find_package(GLAD QUIET)
++    find_package(GLAD NAMES glad CONFIG REQUIRED)
+     if (NOT GLAD_FOUND AND NOT TARGET glad)
+         # Use CPM only if not found, to avoid ODR violations
+         # find_package(GLAD REQUIRE) would suffice if it worked well
+@@ -233,7 +232,7 @@ if (MATPLOTPP_BUILD_EXPERIMENTAL_OPENGL_BACKEND)
+     endif ()
+ 
+     # https://github.com/glfw/glfw
+-    find_package(glfw3 QUIET)
++    find_package(GLFW3 NAMES glfw3 CONFIG REQUIRED)
+     if (NOT GLFW3_FOUND AND NOT TARGET glfw)
+         # Use CPM only if not found, to avoid ODR violations
+         # find_package(glfw3 REQUIRE) would suffice if it worked well
+@@ -247,7 +246,7 @@ if (MATPLOTPP_BUILD_EXPERIMENTAL_OPENGL_BACKEND)
+             backend/opengl.h
+             backend/opengl.cpp
+             )
+-    target_link_libraries(matplot_opengl PUBLIC matplot glad glfw ${CMAKE_DL_LIBS})
++    target_link_libraries(matplot_opengl PUBLIC matplot glad::glad glfw ${CMAKE_DL_LIBS})
+ 
+     list(APPEND TARGETS matplot_opengl)
+ endif()
diff --git a/external_imported/vcpkg/ports/matplotplusplus/install-3rd-libraries.patch b/external_imported/vcpkg/ports/matplotplusplus/install-3rd-libraries.patch
deleted file mode 100644
index d4b139b58..000000000
--- a/external_imported/vcpkg/ports/matplotplusplus/install-3rd-libraries.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/source/3rd_party/CMakeLists.txt b/source/3rd_party/CMakeLists.txt
-index bef0c08..e7521a7 100644
---- a/source/3rd_party/CMakeLists.txt
-+++ b/source/3rd_party/CMakeLists.txt
-@@ -41,7 +41,9 @@ endif()
- if(MASTER_PROJECT AND NOT BUILD_SHARED_LIBS)
-   install(TARGETS nodesoup
-       EXPORT Matplot++Targets
--      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/Matplot++)
-+      RUNTIME DESTINATION bin
-+      LIBRARY DESTINATION lib
-+      ARCHIVE DESTINATION lib)
- endif()
- 
- 
diff --git a/external_imported/vcpkg/ports/matplotplusplus/portfile.cmake b/external_imported/vcpkg/ports/matplotplusplus/portfile.cmake
index 155d07384..5531f19ad 100644
--- a/external_imported/vcpkg/ports/matplotplusplus/portfile.cmake
+++ b/external_imported/vcpkg/ports/matplotplusplus/portfile.cmake
@@ -9,18 +9,17 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO alandefreitas/matplotplusplus
-    REF 36d8dc6c3b94b7a71c4f129763f2c6ad8fc0b54a
-    SHA512 ac8902e953a2a9f6bd62e14e2eb0bd42e407bae6c0b2921ad16ce547e4921ba2c8d8a9cc68e75831676dce3cd89cdf8294862710e838510b68e20f8a6cdf806f
+    REF "v${VERSION}"
+    SHA512 9193381fd9d4925259f28a03da33231b3da1273237e7510b93da1ca076610455746feb4ea0d8aa9a4a9e46a5f5f344fc1322f7ffc57963837dbe8b0be0b811ac
     HEAD_REF master
     PATCHES
-        install-3rd-libraries.patch # Remove this patch when nodesoup is added in vcpkg
-        fix-dependencies.patch
+                fix-dependencies.patch
 )
 
 vcpkg_check_features(
     OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
-        opengl  BUILD_EXPERIMENTAL_OPENGL_BACKEND
+        opengl  MATPLOTPP_BUILD_EXPERIMENTAL_OPENGL_BACKEND
         jpeg    WITH_JPEG
         tiff    WITH_TIFF
         zlib    WITH_ZLIB
@@ -33,14 +32,14 @@ vcpkg_check_features(
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS ${FEATURE_OPTIONS}
-        -DCPM_USE_LOCAL_PACKAGES=ON
-        -DBUILD_EXAMPLES=OFF
-        -DBUILD_TESTS=OFF
-        -DBUILD_INSTALLER=ON
-        -DBUILD_PACKAGE=OFF
-        -DBUILD_WITH_PEDANTIC_WARNINGS=OFF
+        -DMATPLOTPP_BUILD_EXAMPLES=OFF
+        -DMATPLOTPP_BUILD_TESTS=OFF
+        -DMATPLOTPP_BUILD_INSTALLER=ON
+        -DMATPLOTPP_BUILD_PACKAGE=OFF
+        -DMATPLOTPP_BUILD_WITH_PEDANTIC_WARNINGS=OFF
         -DWITH_SYSTEM_CIMG=ON
-        -DBUILD_HIGH_RESOLUTION_WORLD_MAP=${BUILD_WORLD_MAP}
+        -DMATPLOTPP_BUILD_HIGH_RESOLUTION_WORLD_MAP=${BUILD_WORLD_MAP}
+        -DMATPLOTPP_BUILD_WITH_SANITIZERS=OFF
 )
 
 vcpkg_cmake_install()
@@ -52,3 +51,4 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME matplot++ CONFIG_PATH lib/cmake/Matplot++)
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
 
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/matplotplusplus/")
diff --git a/external_imported/vcpkg/ports/matplotplusplus/usage b/external_imported/vcpkg/ports/matplotplusplus/usage
new file mode 100644
index 000000000..75a127b3a
--- /dev/null
+++ b/external_imported/vcpkg/ports/matplotplusplus/usage
@@ -0,0 +1,4 @@
+The package matplotplusplus provides CMake targets:
+
+    find_package(Matplot++ CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE Matplot++::cimg  Matplot++::matplot)
diff --git a/external_imported/vcpkg/ports/matplotplusplus/vcpkg.json b/external_imported/vcpkg/ports/matplotplusplus/vcpkg.json
index dce9fa30f..6b6795991 100644
--- a/external_imported/vcpkg/ports/matplotplusplus/vcpkg.json
+++ b/external_imported/vcpkg/ports/matplotplusplus/vcpkg.json
@@ -1,13 +1,14 @@
 {
   "name": "matplotplusplus",
-  "version-date": "2021-04-11",
-  "port-version": 6,
+  "version": "1.2.0",
+  "port-version": 1,
   "description": "A C++ graphics library for data visualization",
   "homepage": "https://alandefreitas.github.io/matplotplusplus/",
   "license": "MIT",
   "supports": "!uwp & !(windows & arm)",
   "dependencies": [
     "cimg",
+    "nodesoup",
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/external_imported/vcpkg/ports/matroska/portfile.cmake b/external_imported/vcpkg/ports/matroska/portfile.cmake
index eac14d7b7..1d07a9012 100644
--- a/external_imported/vcpkg/ports/matroska/portfile.cmake
+++ b/external_imported/vcpkg/ports/matroska/portfile.cmake
@@ -1,12 +1,8 @@
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-    message(FATAL_ERROR "matroska does not currently support UWP")
-endif()
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Matroska-Org/libmatroska
-    REF release-1.6.3
-    SHA512 f4b4cd5b5e76c452fb559ead28c4bcb5ec4e28d74898f13c1709a6ab75d95cf82b319118445d7a7f895708bb0d5d1f3c09040d3e3263c6a2f2a27ffc92d35c2f
+    REF release-1.7.1
+    SHA512 abb4fb4b527266944b1a59516866462498675c5e71bb679758894dff6156169d7132dddaa2e2ef6187a6dbce4a4aa377eeb75dd869268fd44933c769b34be5b9
     HEAD_REF master
 )
 
@@ -24,3 +20,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 # Handle copyright
 file(INSTALL "${SOURCE_PATH}/LICENSE.LGPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+vcpkg_copy_pdbs()
diff --git a/external_imported/vcpkg/ports/matroska/vcpkg.json b/external_imported/vcpkg/ports/matroska/vcpkg.json
index 2987f36de..bd2141554 100644
--- a/external_imported/vcpkg/ports/matroska/vcpkg.json
+++ b/external_imported/vcpkg/ports/matroska/vcpkg.json
@@ -1,11 +1,14 @@
 {
   "name": "matroska",
-  "version": "1.6.3",
+  "version": "1.7.1",
+  "port-version": 2,
   "description": "a C++ library to parse Matroska files (.mkv and .mka)",
   "homepage": "https://github.com/Matroska-Org/libmatroska",
-  "supports": "!uwp",
   "dependencies": [
-    "ebml",
+    {
+      "name": "ebml",
+      "version>=": "1.4.4"
+    },
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/external_imported/vcpkg/ports/mbedtls/enable-pthread.patch b/external_imported/vcpkg/ports/mbedtls/enable-pthread.patch
index 635310376..67c2dde8b 100755
--- a/external_imported/vcpkg/ports/mbedtls/enable-pthread.patch
+++ b/external_imported/vcpkg/ports/mbedtls/enable-pthread.patch
@@ -1,16 +1,16 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8833246..f68ab02 100644
+index b001bb7..b9fb566 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -28,6 +28,7 @@ set(MBEDTLS_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+@@ -44,6 +44,7 @@ set(MBEDTLS_DIR ${CMAKE_CURRENT_SOURCE_DIR})
  
- option(USE_PKCS11_HELPER_LIBRARY "Build mbed TLS with the pkcs11-helper library." OFF)
- option(ENABLE_ZLIB_SUPPORT "Build mbed TLS with zlib library." OFF)
-+option(ENABLE_PTHREAD "Build mbed TLS with pthread" OFF)
+ option(USE_PKCS11_HELPER_LIBRARY "Build Mbed TLS with the pkcs11-helper library." OFF)
+ option(ENABLE_ZLIB_SUPPORT "Build Mbed TLS with zlib library." OFF)
++option(ENABLE_PTHREAD "Build Mbed TLS with pthread" OFF)
  
- option(ENABLE_PROGRAMS "Build mbed TLS programs." ON)
+ option(ENABLE_PROGRAMS "Build Mbed TLS programs." ON)
  
-@@ -231,6 +232,8 @@ else()
+@@ -263,6 +264,8 @@ else()
      set(LIB_INSTALL_DIR lib)
  endif()
  
@@ -19,7 +19,7 @@ index 8833246..f68ab02 100644
  if(ENABLE_ZLIB_SUPPORT)
      find_package(ZLIB)
  
-@@ -239,6 +242,17 @@ if(ENABLE_ZLIB_SUPPORT)
+@@ -271,6 +274,17 @@ if(ENABLE_ZLIB_SUPPORT)
      endif(ZLIB_FOUND)
  endif(ENABLE_ZLIB_SUPPORT)
  
@@ -38,11 +38,11 @@ index 8833246..f68ab02 100644
  
  add_subdirectory(3rdparty)
 diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
-index 62c0f62..7923202 100644
+index 11b417b..5ca44c3 100644
 --- a/include/CMakeLists.txt
 +++ b/include/CMakeLists.txt
 @@ -1,10 +1,14 @@
- option(INSTALL_MBEDTLS_HEADERS "Install mbed TLS headers." ON)
+ option(INSTALL_MBEDTLS_HEADERS "Install Mbed TLS headers." ON)
  
 +configure_file(mbedtls/config_threading.h.in mbedtls/config_threading.h)
 +
@@ -58,11 +58,11 @@ index 62c0f62..7923202 100644
          DESTINATION include/mbedtls
          PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
 diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h
-index 1e6e052..51c20da 100644
+index ac2146e..4cd831a 100644
 --- a/include/mbedtls/config.h
 +++ b/include/mbedtls/config.h
-@@ -24,6 +24,8 @@
-  *  limitations under the License.
+@@ -12,6 +12,8 @@
+  *  SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
   */
  
 +#include "mbedtls/config_threading.h"
@@ -84,10 +84,10 @@ index 0000000..9d5d42e
 +#endif
 \ No newline at end of file
 diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
-index 33e2cfc..4b99331 100644
+index 1b2980d..8c495fe 100644
 --- a/library/CMakeLists.txt
 +++ b/library/CMakeLists.txt
-@@ -137,7 +137,11 @@ if(ENABLE_ZLIB_SUPPORT)
+@@ -149,7 +149,11 @@ if(ENABLE_ZLIB_SUPPORT)
  endif(ENABLE_ZLIB_SUPPORT)
  
  if(LINK_WITH_PTHREAD)
diff --git a/external_imported/vcpkg/ports/mbedtls/portfile.cmake b/external_imported/vcpkg/ports/mbedtls/portfile.cmake
index e2aff063c..eb6398162 100644
--- a/external_imported/vcpkg/ports/mbedtls/portfile.cmake
+++ b/external_imported/vcpkg/ports/mbedtls/portfile.cmake
@@ -3,8 +3,8 @@ set(VCPKG_LIBRARY_LINKAGE static)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ARMmbed/mbedtls
-    REF v2.28.1
-    SHA512 b71d052acfb83daff11e0182f32b0ad0af7c59d2b74bd19f270531a3da9ed3ce1d3adcaf756e161bf05a10fe1b6b7753e360e9dbb5b7b123f09201b1202ef689
+    REF "v${VERSION}"
+    SHA512 b61dd319606c88c834b3a8e8f9f85e68a22b6b21ca177b340a972dfabe9efee984b8a9f6ed5d3b1829f229c689394e9f393b94efb38d82bda3a1e53d1e7a2861
     HEAD_REF mbedtls-2.28
     PATCHES
         enable-pthread.patch
diff --git a/external_imported/vcpkg/ports/mbedtls/vcpkg.json b/external_imported/vcpkg/ports/mbedtls/vcpkg.json
index b0eb96bb4..17803e7c3 100644
--- a/external_imported/vcpkg/ports/mbedtls/vcpkg.json
+++ b/external_imported/vcpkg/ports/mbedtls/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "mbedtls",
-  "version": "2.28.1",
+  "version": "2.28.7",
   "description": "An open source, portable, easy to use, readable and flexible SSL library",
   "homepage": "https://github.com/ARMmbed/mbedtls",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/mchehab-zbar/portfile.cmake b/external_imported/vcpkg/ports/mchehab-zbar/portfile.cmake
index c2da7714e..9992aaaaf 100644
--- a/external_imported/vcpkg/ports/mchehab-zbar/portfile.cmake
+++ b/external_imported/vcpkg/ports/mchehab-zbar/portfile.cmake
@@ -17,29 +17,9 @@ if("nls" IN_LIST FEATURES)
 else()
     vcpkg_list(APPEND options "--disable-nls")
     set(ENV{AUTOPOINT} true) # true, the program
+    # Simulate the relevant effects of (interactive) `gettextize`.
     file(TOUCH "${SOURCE_PATH}/po/Makefile.in.in")
-    # Get missing build-time m4 files from gettext source
-    set(gettext_version 0.21.1)
-    vcpkg_download_distfile(gettext_archive
-        URLS "https://ftp.gnu.org/pub/gnu/gettext/gettext-${gettext_version}.tar.gz"
-             "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gettext/gettext-${gettext_version}.tar.gz"
-        FILENAME "gettext-${gettext_version}.tar.gz"
-        SHA512 ccd43a43fab3c90ed99b3e27628c9aeb7186398153b137a4997f8c7ddfd9729b0ba9d15348567e5206af50ac027673d2b8a3415bb3fc65f87ad778f85dc03a05
-    )
-    file(ARCHIVE_EXTRACT INPUT "${gettext_archive}"
-        DESTINATION "${SOURCE_PATH}/gettext-autoconf"
-        PATTERNS "*/gettext-runtime/m4/gettext.m4"
-                 "*/gettext-runtime/m4/iconv.m4"
-                 "*/gettext-runtime/m4/intlmacosx.m4"
-                 "*/gettext-runtime/m4/nls.m4"
-                 "*/gettext-runtime/m4/po.m4"
-                 "*/gettext-runtime/m4/progtest.m4"
-                 "*/gettext-runtime/gnulib-m4/host-cpu-c-abi.m4"
-                 "*/gettext-runtime/gnulib-m4/lib-ld.m4"
-                 "*/gettext-runtime/gnulib-m4/lib-link.m4"
-                 "*/gettext-runtime/gnulib-m4/lib-prefix.m4"
-    )
-    file(GLOB_RECURSE m4_files "${SOURCE_PATH}/gettext-autoconf/*/*.m4")
+    file(GLOB_RECURSE m4_files "${CURRENT_HOST_INSTALLED_DIR}/share/gettext/aclocal/*.m4")
     file(INSTALL ${m4_files} DESTINATION "${SOURCE_PATH}/config")
 endif()
 
diff --git a/external_imported/vcpkg/ports/mchehab-zbar/vcpkg.json b/external_imported/vcpkg/ports/mchehab-zbar/vcpkg.json
index cf61794cc..c56b3f779 100644
--- a/external_imported/vcpkg/ports/mchehab-zbar/vcpkg.json
+++ b/external_imported/vcpkg/ports/mchehab-zbar/vcpkg.json
@@ -1,26 +1,30 @@
 {
   "name": "mchehab-zbar",
   "version": "0.23.90",
-  "port-version": 3,
+  "port-version": 5,
   "description": "ZBar is an open source software suite for reading bar codes from various sources, including webcams. This fork is actively maintained.",
   "homepage": "https://github.com/mchehab/zbar",
   "license": "LGPL-2.1-or-later",
-  "supports": "!uwp",
+  "supports": "!uwp & !xbox",
   "dependencies": [
+    {
+      "name": "gettext",
+      "host": true
+    },
     "libiconv"
   ],
   "features": {
     "nls": {
       "description": "Native Language Support",
       "dependencies": [
-        "gettext",
         {
           "name": "gettext",
           "host": true,
           "features": [
             "tools"
           ]
-        }
+        },
+        "gettext-libintl"
       ]
     }
   }
diff --git a/external_imported/vcpkg/ports/mcpp/vcpkg.json b/external_imported/vcpkg/ports/mcpp/vcpkg.json
index e7636ef29..dbb305d35 100644
--- a/external_imported/vcpkg/ports/mcpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/mcpp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "mcpp",
-  "version-string": "2.7.2.14",
-  "port-version": 4,
+  "version": "2.7.2.14",
+  "port-version": 5,
   "description": "Fork of mcpp, a C/C++ preprocessor",
   "homepage": "https://github.com/zeroc-ice/mcpp",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/mdl-sdk/001-freeimage-from-vcpkg.patch b/external_imported/vcpkg/ports/mdl-sdk/001-freeimage-from-vcpkg.patch
index d02479f7a..78712f73e 100644
--- a/external_imported/vcpkg/ports/mdl-sdk/001-freeimage-from-vcpkg.patch
+++ b/external_imported/vcpkg/ports/mdl-sdk/001-freeimage-from-vcpkg.patch
@@ -30,7 +30,7 @@ index b11573a..703458e 100644
      set(FREEIMAGE_DIR "NOT-SPECIFIED" CACHE PATH "Directory that contains the freeimage library and the corresponding headers.")
      #-----------------------------------------------------------------------------------------------
  
-@@ -90,6 +93,35 @@ function(FIND_FREEIMAGE_EXT)
+@@ -90,6 +93,37 @@ function(FIND_FREEIMAGE_EXT)
          endif()
      endif()
  
@@ -55,6 +55,8 @@ index b11573a..703458e 100644
 +            if(NOT _FREEIMAGE_LIB)
 +                get_target_property(_FREEIMAGE_LIB freeimage::FreeImage IMPORTED_IMPLIB_DEBUG)
 +            endif()
++        elseif(WINDOWS)
++            set(_FREEIMAGE_LIB "${_FREEIMAGE_SHARED}")
 +        endif()
 +        
 +        find_file(_FREEIMAGE_HEADER_FILE "FreeImage.h"
@@ -66,3 +68,16 @@ index b11573a..703458e 100644
      # error if dependencies can not be resolved
      if(NOT EXISTS ${_FREEIMAGE_INCLUDE} OR (WINDOWS AND NOT EXISTS ${_FREEIMAGE_LIB}) OR NOT EXISTS ${_FREEIMAGE_SHARED})
          message(STATUS "FREEIMAGE_DIR: ${FREEIMAGE_DIR}")
+diff --git a/src/shaders/plugin/freeimage/CMakeLists.txt b/src/shaders/plugin/freeimage/CMakeLists.txt
+index a28b50e..910141e 100644
+--- a/src/shaders/plugin/freeimage/CMakeLists.txt
++++ b/src/shaders/plugin/freeimage/CMakeLists.txt
+@@ -69,7 +69,7 @@ add_library(mdl::nv_freeimage ALIAS ${PROJECT_NAME})
+ # add dependencies other dependencies
+ target_add_dependencies(TARGET ${PROJECT_NAME} 
+     DEPENDS
+-        freeimage
++        freeimage::FreeImage
+         mdl::base-system-version
+     )
+ 
diff --git a/external_imported/vcpkg/ports/mdl-sdk/010-workaround-gcc-bit.patch b/external_imported/vcpkg/ports/mdl-sdk/010-workaround-gcc-bit.patch
new file mode 100644
index 000000000..9583a4681
--- /dev/null
+++ b/external_imported/vcpkg/ports/mdl-sdk/010-workaround-gcc-bit.patch
@@ -0,0 +1,13 @@
+diff --git a/include/mi/base/types.h b/include/mi/base/types.h
+index a6faabe..47f836b 100644
+--- a/include/mi/base/types.h
++++ b/include/mi/base/types.h
+@@ -349,7 +349,7 @@ namespace {
+ ///     float  fval( 0.0f );
+ ///     Uint32 uval( binary_cast<Uint32>(fval) );
+ /// \endcode
+-#if (defined(_WIN32) && defined(_HAS_CXX20) && _HAS_CXX20) || (defined(__GNUC__) && (__GNUC__ >= 11 ))
++#if (defined(_WIN32) && defined(_HAS_CXX20) && _HAS_CXX20) || (defined(__GNUC__) && (__GNUC__ >= 12 ))
+ #include <bit>
+ template<class T, class S> constexpr T binary_cast(const S& src) noexcept { return std::bit_cast<T,S>(src); }
+ #else
diff --git a/external_imported/vcpkg/ports/mdl-sdk/011-fix-python.patch b/external_imported/vcpkg/ports/mdl-sdk/011-fix-python.patch
new file mode 100644
index 000000000..e0a9ff5fe
--- /dev/null
+++ b/external_imported/vcpkg/ports/mdl-sdk/011-fix-python.patch
@@ -0,0 +1,11 @@
+--- a/src/mdl/compiler/compiler_hlsl/gen_hlsl_intrinsics.py
++++ b/src/mdl/compiler/compiler_hlsl/gen_hlsl_intrinsics.py
+@@ -383,7 +383,7 @@ namespace {
+ def get_db_hlsl():
+     global g_db_hlsl
+     if g_db_hlsl is None:
+-        with open(g_templ_name, "rU") as f:
++        with open(g_templ_name, "r") as f:
+             g_db_hlsl = db_hlsl(f)
+     return g_db_hlsl
+ 
diff --git a/external_imported/vcpkg/ports/mdl-sdk/portfile.cmake b/external_imported/vcpkg/ports/mdl-sdk/portfile.cmake
index 316a78a27..8148fa1a6 100644
--- a/external_imported/vcpkg/ports/mdl-sdk/portfile.cmake
+++ b/external_imported/vcpkg/ports/mdl-sdk/portfile.cmake
@@ -65,6 +65,25 @@ endif()
 
 # MDL-SDK
 
+# The patch "workaround gcc bit" works around <bit> included with gcc included with Ubuntu 22.04
+# failing to compile as used here, with errors originating *inside* <bit> like:
+# [156/1742] /usr/bin/c++ -DBIT64=1 -DDEBUG -DHAS_SSE -DMDL_SOURCE_RELEASE -DMI_PLATFORM=\"linux-x86-64-gcc\" -DMI_PLATFORM_UNIX -DX86=1 -D_DEBUG -I/home/bion/vcpkg/buildtrees/mdl-sdk/x64-linux-dbg/src/base/system/main -I/home/bion/vcpkg/buildtrees/mdl-sdk/src/830ab63109-115b19fca8/src/base/system/main -I/home/bion/vcpkg/buildtrees/mdl-sdk/src/830ab63109-115b19fca8/include -I/home/bion/vcpkg/buildtrees/mdl-sdk/src/830ab63109-115b19fca8/src -fPIC -g -fPIC -fno-strict-aliasing -march=nocona -gdwarf-3 -gstrict-dwarf -Wall -Wvla -Wno-init-list-lifetime -Wno-placement-new -Wno-parentheses -Wno-sign-compare -Wno-narrowing -Wno-unused-but-set-variable -Wno-unused-local-typedefs -Wno-deprecated-declarations -Wno-unknown-pragmas -std=gnu++17 -MD -MT src/base/system/main/CMakeFiles/base-system-main.dir/module_registration_entry.cpp.o -MF src/base/system/main/CMakeFiles/base-system-main.dir/module_registration_entry.cpp.o.d -o src/base/system/main/CMakeFiles/base-system-main.dir/module_registration_entry.cpp.o -c /home/bion/vcpkg/buildtrees/mdl-sdk/src/830ab63109-115b19fca8/src/base/system/main/module_registration_entry.cpp
+# FAILED: src/base/system/main/CMakeFiles/base-system-main.dir/module_registration_entry.cpp.o 
+# /usr/bin/c++ -DBIT64=1 -DDEBUG -DHAS_SSE -DMDL_SOURCE_RELEASE -DMI_PLATFORM=\"linux-x86-64-gcc\" -DMI_PLATFORM_UNIX -DX86=1 -D_DEBUG -I/home/bion/vcpkg/buildtrees/mdl-sdk/x64-linux-dbg/src/base/system/main -I/home/bion/vcpkg/buildtrees/mdl-sdk/src/830ab63109-115b19fca8/src/base/system/main -I/home/bion/vcpkg/buildtrees/mdl-sdk/src/830ab63109-115b19fca8/include -I/home/bion/vcpkg/buildtrees/mdl-sdk/src/830ab63109-115b19fca8/src -fPIC -g -fPIC -fno-strict-aliasing -march=nocona -gdwarf-3 -gstrict-dwarf -Wall -Wvla -Wno-init-list-lifetime -Wno-placement-new -Wno-parentheses -Wno-sign-compare -Wno-narrowing -Wno-unused-but-set-variable -Wno-unused-local-typedefs -Wno-deprecated-declarations -Wno-unknown-pragmas -std=gnu++17 -MD -MT src/base/system/main/CMakeFiles/base-system-main.dir/module_registration_entry.cpp.o -MF src/base/system/main/CMakeFiles/base-system-main.dir/module_registration_entry.cpp.o.d -o src/base/system/main/CMakeFiles/base-system-main.dir/module_registration_entry.cpp.o -c /home/bion/vcpkg/buildtrees/mdl-sdk/src/830ab63109-115b19fca8/src/base/system/main/module_registration_entry.cpp
+# In file included from /home/bion/vcpkg/buildtrees/mdl-sdk/src/830ab63109-115b19fca8/src/base/system/main/types.h:37,
+#                  from /home/bion/vcpkg/buildtrees/mdl-sdk/src/830ab63109-115b19fca8/src/base/system/main/module_registration_entry.h:39,
+#                  from /home/bion/vcpkg/buildtrees/mdl-sdk/src/830ab63109-115b19fca8/src/base/system/main/module_registration_entry.cpp:34:
+# /home/bion/vcpkg/buildtrees/mdl-sdk/src/830ab63109-115b19fca8/include/mi/base/types.h: In function ‘constexpr T mi::base::binary_cast(const S&)’:
+# /home/bion/vcpkg/buildtrees/mdl-sdk/src/830ab63109-115b19fca8/include/mi/base/types.h:356:89: error: ‘bit_cast’ is not a member of ‘mi::base::std’
+#   356 | template<class T, class S> constexpr T binary_cast(const S& src) noexcept { return std::bit_cast<T,S>(src); }
+#       |                                                                                         ^~~~~~~~
+# /home/bion/vcpkg/buildtrees/mdl-sdk/src/830ab63109-115b19fca8/include/mi/base/types.h:356:99: error: expected primary-expression before ‘,’ token
+#   356 | template<class T, class S> constexpr T binary_cast(const S& src) noexcept { return std::bit_cast<T,S>(src); }
+#       |                                                                                                   ^
+# /home/bion/vcpkg/buildtrees/mdl-sdk/src/830ab63109-115b19fca8/include/mi/base/types.h:356:101: error: expected primary-expression before ‘>’ token
+#   356 | template<class T, class S> constexpr T binary_cast(const S& src) noexcept { return std::bit_cast<T,S>(src); }
+#       |                                                                                                     ^
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO NVIDIA/MDL-SDK
@@ -81,6 +100,8 @@ vcpkg_from_github(
         007-plugin-options.patch
         008-build-static-llvm.patch
         009-include-priority-vendored-llvm.patch
+        010-workaround-gcc-bit.patch
+        011-fix-python.patch
 )
 
 string(COMPARE NOTEQUAL "${VCPKG_CRT_LINKAGE}" "static" _MVSC_CRT_LINKAGE_OPTION)
diff --git a/external_imported/vcpkg/ports/mdl-sdk/vcpkg.json b/external_imported/vcpkg/ports/mdl-sdk/vcpkg.json
index 1b2b48093..c049a4773 100644
--- a/external_imported/vcpkg/ports/mdl-sdk/vcpkg.json
+++ b/external_imported/vcpkg/ports/mdl-sdk/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "mdl-sdk",
   "version": "2021.1.2",
+  "port-version": 4,
   "description": "NVIDIA Material Definition Language SDK",
   "homepage": "https://github.com/NVIDIA/MDL-SDK",
   "license": "BSD-3-Clause",
-  "supports": "!arm & !x86 & !(windows & static)",
+  "supports": "!arm & !x86 & !staticcrt",
   "dependencies": [
     "boost-algorithm",
     "boost-any",
diff --git a/external_imported/vcpkg/ports/mdns/portfile.cmake b/external_imported/vcpkg/ports/mdns/portfile.cmake
index 272ef3b93..d6628d7ba 100644
--- a/external_imported/vcpkg/ports/mdns/portfile.cmake
+++ b/external_imported/vcpkg/ports/mdns/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mjansson/mdns
-    REF 1.4.2
-    SHA512 fa3fcf130721ee6f7012225c1e7952bd41703c2488b1d0ffe2b8c73ed06744d1cd9f03b6ab19aa0b8074fbfaafe46f8e102d6a648756725a60dc076e896cfbf6
+    REF "${VERSION}"
+    SHA512 0bbfeefdd3f324a8e5aa85227bfa45c2b5cd88c12a9f77df2a1c48cb2661ba8b283dd53541e39d20ed2705646dc8d8724a0287c58f9efa91d2b1b796a0ca9a7a
     HEAD_REF master
 )
 
@@ -17,4 +17,4 @@ vcpkg_cmake_configure(
 vcpkg_cmake_install()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/mdns/vcpkg.json b/external_imported/vcpkg/ports/mdns/vcpkg.json
index c0dade8e7..728a2a1f3 100644
--- a/external_imported/vcpkg/ports/mdns/vcpkg.json
+++ b/external_imported/vcpkg/ports/mdns/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "mdns",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "description": "Public domain mDNS/DNS-SD library in C",
   "homepage": "https://github.com/mjansson/mdns",
   "license": "Unlicense",
diff --git a/external_imported/vcpkg/ports/mdnsresponder/portfile.cmake b/external_imported/vcpkg/ports/mdnsresponder/portfile.cmake
index 365e1ba09..144978310 100644
--- a/external_imported/vcpkg/ports/mdnsresponder/portfile.cmake
+++ b/external_imported/vcpkg/ports/mdnsresponder/portfile.cmake
@@ -14,25 +14,7 @@ ENDIF()
 
 function(FIX_VCXPROJ VCXPROJ_PATH)
   file(READ ${VCXPROJ_PATH} ORIG)
-  if(${VCPKG_CRT_LINKAGE} STREQUAL "dynamic")
-    string(REGEX REPLACE
-      "<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>"
-      "<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>"
-      ORIG "${ORIG}")
-    string(REGEX REPLACE
-      "<RuntimeLibrary>MultiThreaded</RuntimeLibrary>"
-      "<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>"
-      ORIG "${ORIG}")
-  else()
-    string(REGEX REPLACE
-      "<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>"
-      "<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>"
-      ORIG "${ORIG}")
-    string(REGEX REPLACE
-      "<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>"
-      "<RuntimeLibrary>MultiThreaded</RuntimeLibrary>"
-      ORIG "${ORIG}")
-  endif()
+
   if(${VCPKG_LIBRARY_LINKAGE} STREQUAL "dynamic")
     string(REPLACE
       "<ConfigurationType>StaticLibrary</ConfigurationType>"
@@ -44,11 +26,7 @@ function(FIX_VCXPROJ VCXPROJ_PATH)
       "<ConfigurationType>StaticLibrary</ConfigurationType>"
       ORIG "${ORIG}")
   endif()
-  
-  string(REPLACE
-    "<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>"
-    "<DebugInformationFormat>OldStyle</DebugInformationFormat>"
-    ORIG "${ORIG}")
+
   file(WRITE ${VCXPROJ_PATH} "${ORIG}")
 endfunction()
 
@@ -58,15 +36,13 @@ if(${VCPKG_CRT_LINKAGE} STREQUAL "dynamic" AND ${VCPKG_LIBRARY_LINKAGE} STREQUAL
 endif()
 FIX_VCXPROJ("${SOURCE_PATH}/Clients/DNS-SD.VisualStudio/dns-sd.vcxproj")
 
-vcpkg_install_msbuild(
+vcpkg_msbuild_install(
     SOURCE_PATH "${SOURCE_PATH}"
-    PROJECT_SUBPATH "mDNSWindows/mDNSResponder.sln"
+    PROJECT_SUBPATH mDNSWindows/mDNSResponder.sln
     PLATFORM ${BUILD_ARCH}
     TARGET dns-sd
-    SKIP_CLEAN
 )
 
 file(INSTALL "${SOURCE_PATH}/mDNSShared/dns_sd.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
 
-vcpkg_copy_pdbs()
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/mdnsresponder/vcpkg.json b/external_imported/vcpkg/ports/mdnsresponder/vcpkg.json
index d517b6d17..d157e4fae 100644
--- a/external_imported/vcpkg/ports/mdnsresponder/vcpkg.json
+++ b/external_imported/vcpkg/ports/mdnsresponder/vcpkg.json
@@ -1,8 +1,16 @@
 {
   "name": "mdnsresponder",
   "version": "1557.140.5.0.1",
+  "port-version": 1,
   "description": "The mDNSResponder project is a component of Bonjour, Apple's ease-of-use IP networking initiative.",
   "homepage": "https://github.com/apple-oss-distributions/mDNSResponder",
   "license": "Apache-2.0",
-  "supports": "windows & !uwp & !arm"
+  "supports": "windows & !uwp & !arm",
+  "dependencies": [
+    {
+      "name": "vcpkg-msbuild",
+      "host": true,
+      "platform": "windows"
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/mdspan/portfile.cmake b/external_imported/vcpkg/ports/mdspan/portfile.cmake
index d179f7ddc..b0b29d450 100644
--- a/external_imported/vcpkg/ports/mdspan/portfile.cmake
+++ b/external_imported/vcpkg/ports/mdspan/portfile.cmake
@@ -1,17 +1,19 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO kokkos/mdspan
-    REF mdspan-0.5.0
-    SHA512 f14b021006f945434435c5575a734bcf308598b5c21fd62a54248ad6c5b1ffe29ba4bcf57935751f5c8dd3dd9b56bd799a502c4818f06f8594a32f0202b1b52e
+    REF "mdspan-${VERSION}"
+    SHA512 d0e247b5ed5765f3ddd04634462c428b19beceb81b0b7d8221443b3f6ab122e232e85c15d56c208b244be2f6667d7e1db571848b61190b64ec110f7d31c3e0c9
     HEAD_REF stable
 )
 
+set(VCPKG_BUILD_TYPE release) # header-only port
+
 vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}")
 
 vcpkg_cmake_install()
 
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/mdspan)
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/mdspan/vcpkg.json b/external_imported/vcpkg/ports/mdspan/vcpkg.json
index 5f307a6bc..4004be788 100644
--- a/external_imported/vcpkg/ports/mdspan/vcpkg.json
+++ b/external_imported/vcpkg/ports/mdspan/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "mdspan",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "A non-owning multi-dimensional array reference type.",
   "homepage": "https://github.com/kokkos/mdspan",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/mecab/fix-missing-functional.patch b/external_imported/vcpkg/ports/mecab/fix-missing-functional.patch
new file mode 100644
index 000000000..773429ccc
--- /dev/null
+++ b/external_imported/vcpkg/ports/mecab/fix-missing-functional.patch
@@ -0,0 +1,12 @@
+diff --git a/mecab/src/dictionary.h b/mecab/src/dictionary.h
+index 7046023..32ad358 100644
+--- a/mecab/src/dictionary.h
++++ b/mecab/src/dictionary.h
+@@ -10,6 +10,7 @@
+ #include "mmap.h"
+ #include "darts.h"
+ #include "char_property.h"
++#include <functional>
+ 
+ namespace MeCab {
+ 
diff --git a/external_imported/vcpkg/ports/mecab/portfile.cmake b/external_imported/vcpkg/ports/mecab/portfile.cmake
index 62db155ca..b288e2ab3 100644
--- a/external_imported/vcpkg/ports/mecab/portfile.cmake
+++ b/external_imported/vcpkg/ports/mecab/portfile.cmake
@@ -10,6 +10,7 @@ vcpkg_from_github(
 	HEAD_REF master
 	PATCHES
 		fix_wpath_unsigned.patch
+		fix-missing-functional.patch
 )
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}/mecab/src")
@@ -25,4 +26,4 @@ vcpkg_cmake_install()
 vcpkg_cmake_config_fixup()
 vcpkg_copy_pdbs()
 
-file(INSTALL "${SOURCE_PATH}/mecab/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/mecab/COPYING")
diff --git a/external_imported/vcpkg/ports/mecab/vcpkg.json b/external_imported/vcpkg/ports/mecab/vcpkg.json
index 772720cda..b59d7130e 100644
--- a/external_imported/vcpkg/ports/mecab/vcpkg.json
+++ b/external_imported/vcpkg/ports/mecab/vcpkg.json
@@ -1,9 +1,9 @@
 {
   "name": "mecab",
-  "version-string": "2019-09-25",
-  "port-version": 3,
+  "version-date": "2019-09-25",
+  "port-version": 5,
   "description": "A morphological analysis engine based on CRF",
-  "supports": "!(uwp | arm | arm64)",
+  "supports": "!uwp & !(arm & windows)",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/memorymodule/vcpkg.json b/external_imported/vcpkg/ports/memorymodule/vcpkg.json
index 49b5726ad..3d7c422ce 100644
--- a/external_imported/vcpkg/ports/memorymodule/vcpkg.json
+++ b/external_imported/vcpkg/ports/memorymodule/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "memorymodule",
-  "version-string": "2019-12-31",
-  "port-version": 2,
+  "version-date": "2019-12-31",
+  "port-version": 3,
   "description": "Library to load a DLL from memory",
   "homepage": "https://github.com/fancycode/MemoryModule",
   "supports": "!linux & !osx & !uwp",
diff --git a/external_imported/vcpkg/ports/mesa/clover-llvm-move-to-modern-pass-manager.patch b/external_imported/vcpkg/ports/mesa/clover-llvm-move-to-modern-pass-manager.patch
new file mode 100644
index 000000000..902336776
--- /dev/null
+++ b/external_imported/vcpkg/ports/mesa/clover-llvm-move-to-modern-pass-manager.patch
@@ -0,0 +1,127 @@
+From 2d4fe5f229791fde52846b3f583c12508b5109d6 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@redhat.com>
+Date: Fri, 25 Aug 2023 12:43:44 +1000
+Subject: [PATCH] clover/llvm: move to modern pass manager.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This seems like it should work, but I haven't tested it yet.
+
+Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24879>
+---
+ .../frontends/clover/llvm/invocation.cpp      | 64 +++++++++++++++----
+ 1 file changed, 51 insertions(+), 13 deletions(-)
+
+diff --git a/src/gallium/frontends/clover/llvm/invocation.cpp b/src/gallium/frontends/clover/llvm/invocation.cpp
+index 7a50fea332395..43d26fe1abbce 100644
+--- a/src/gallium/frontends/clover/llvm/invocation.cpp
++++ b/src/gallium/frontends/clover/llvm/invocation.cpp
+@@ -27,13 +27,17 @@
+ #include <llvm/IR/DiagnosticPrinter.h>
+ #include <llvm/IR/DiagnosticInfo.h>
+ #include <llvm/IR/LLVMContext.h>
++#include <llvm/IR/Module.h>
+ #include <llvm/Support/raw_ostream.h>
+-#include <llvm/Transforms/IPO/PassManagerBuilder.h>
++#include <llvm/Transforms/IPO/Internalize.h>
+ #include <llvm-c/Target.h>
+ #ifdef HAVE_CLOVER_SPIRV
+ #include <LLVMSPIRVLib/LLVMSPIRVLib.h>
+ #endif
+ 
++#include <llvm-c/TargetMachine.h>
++#include <llvm-c/Transforms/PassBuilder.h>
++#include <llvm/Support/CBindingWrapping.h>
+ #include <clang/CodeGen/CodeGenAction.h>
+ #include <clang/Lex/PreprocessorOptions.h>
+ #include <clang/Frontend/TextDiagnosticBuffer.h>
+@@ -439,10 +443,10 @@ clover::llvm::compile_program(const std::string &source,
+ 
+ namespace {
+    void
+-   optimize(Module &mod, unsigned optimization_level,
++   optimize(Module &mod,
++            const std::string& ir_target,
++            unsigned optimization_level,
+             bool internalize_symbols) {
+-      ::llvm::legacy::PassManager pm;
+-
+       // By default, the function internalizer pass will look for a function
+       // called "main" and then mark all other functions as internal.  Marking
+       // functions as internal enables the optimizer to perform optimizations
+@@ -458,19 +462,53 @@ namespace {
+       if (internalize_symbols) {
+          std::vector<std::string> names =
+             map(std::mem_fn(&Function::getName), get_kernels(mod));
+-         pm.add(::llvm::createInternalizePass(
++         internalizeModule(mod,
+                       [=](const ::llvm::GlobalValue &gv) {
+                          return std::find(names.begin(), names.end(),
+                                           gv.getName()) != names.end();
+-                      }));
++                      });
+       }
+ 
+-      ::llvm::PassManagerBuilder pmb;
+-      pmb.OptLevel = optimization_level;
+-      pmb.LibraryInfo = new ::llvm::TargetLibraryInfoImpl(
+-         ::llvm::Triple(mod.getTargetTriple()));
+-      pmb.populateModulePassManager(pm);
+-      pm.run(mod);
++
++      const char *opt_str = NULL;
++      LLVMCodeGenOptLevel level;
++      switch (optimization_level) {
++      case 0:
++      default:
++         opt_str = "default<O0>";
++         level = LLVMCodeGenLevelNone;
++         break;
++      case 1:
++         opt_str = "default<O1>";
++         level = LLVMCodeGenLevelLess;
++         break;
++      case 2:
++         opt_str = "default<O2>";
++         level = LLVMCodeGenLevelDefault;
++         break;
++      case 3:
++         opt_str = "default<O3>";
++         level = LLVMCodeGenLevelAggressive;
++         break;
++      }
++
++      const target &target = ir_target;
++      LLVMTargetRef targ;
++      char *err_message;
++
++      if (LLVMGetTargetFromTriple(target.triple.c_str(), &targ, &err_message))
++         return;
++      LLVMTargetMachineRef tm =
++         LLVMCreateTargetMachine(targ, target.triple.c_str(),
++                                 target.cpu.c_str(), "", level,
++                                 LLVMRelocDefault, LLVMCodeModelDefault);
++
++      if (!tm)
++         return;
++      LLVMPassBuilderOptionsRef opts = LLVMCreatePassBuilderOptions();
++      LLVMRunPasses(wrap(&mod), opt_str, tm, opts);
++
++      LLVMDisposeTargetMachine(tm);
+    }
+ 
+    std::unique_ptr<Module>
+@@ -500,7 +538,7 @@ clover::llvm::link_program(const std::vector<binary> &binaries,
+    auto c = create_compiler_instance(dev, dev.ir_target(), options, r_log);
+    auto mod = link(*ctx, *c, binaries, r_log);
+ 
+-   optimize(*mod, c->getCodeGenOpts().OptimizationLevel, !create_library);
++   optimize(*mod, dev.ir_target(), c->getCodeGenOpts().OptimizationLevel, !create_library);
+ 
+    static std::atomic_uint seq(0);
+    const std::string id = "." + mod->getModuleIdentifier() + "-" +
+-- 
+GitLab
+
diff --git a/external_imported/vcpkg/ports/mesa/clover.patch b/external_imported/vcpkg/ports/mesa/clover.patch
deleted file mode 100644
index 6e39e180f..000000000
--- a/external_imported/vcpkg/ports/mesa/clover.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From b7c465dc43693cb1ad7e073cc7d8f89f5cfbd0ac Mon Sep 17 00:00:00 2001
-From: pal1000 <liviuprodea@yahoo.com>
-Date: Sat, 13 Nov 2021 11:39:58 +0200
-Subject: [PATCH] clover: Use static pipe loader on Windows
-
-Currently this only supports linking in swrast, but more Windows-supporting
-drivers can be added pretty easily.
----
- src/gallium/targets/opencl/meson.build | 18 +++++++++++++++---
- src/gallium/targets/opencl/target.c    |  2 ++
- 2 files changed, 17 insertions(+), 3 deletions(-)
- create mode 100644 src/gallium/targets/opencl/target.c
-
-diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build
-index ec65fcbe18e..f6ca4a28f20 100644
---- a/src/gallium/targets/opencl/meson.build
-+++ b/src/gallium/targets/opencl/meson.build
-@@ -85,19 +85,31 @@ if not (dep_clang.found() and dep_clang_usable)
-   endif
- endif
- 
-+if host_machine.system() == 'windows'
-+  libpipe_loader = libpipe_loader_static
-+  target_files = ['target.c']
-+else
-+  libpipe_loader = libpipe_loader_dynamic
-+  target_files = []
-+endif
-+
- ocldef = files(opencl_libname + '.def')[0]
- 
- libopencl = shared_library(
-   opencl_libname,
--  [],
-+  target_files,
-+  include_directories : [
-+    inc_include, inc_util, inc_src, inc_gallium, inc_gallium_winsys, inc_gallium_drivers, inc_gallium_aux
-+  ],
-   vs_module_defs : ocldef,
-   link_args : [ld_args_gc_sections, opencl_link_args],
-   link_depends : opencl_link_deps,
-   link_whole : libclover,
--  link_with : [libpipe_loader_dynamic, libgallium],
-+  link_with : [libpipe_loader, libgallium, libws_null, libwsw],
-   dependencies : [
-     idep_mesautil,
--    dep_clock, dep_dl, dep_unwind, dep_elf, dep_clang, dep_version
-+    dep_clock, dep_dl, dep_unwind, dep_elf, dep_clang, dep_version,
-+    driver_swrast
-   ],
-   version : '@0@.0.0'.format(opencl_version),
-   install : true,
-diff --git a/src/gallium/targets/opencl/target.c b/src/gallium/targets/opencl/target.c
-new file mode 100644
-index 00000000000..308e23bb4a0
---- /dev/null
-+++ b/src/gallium/targets/opencl/target.c
-@@ -0,0 +1,2 @@
-+#include "target-helpers/drm_helper.h"
-+#include "target-helpers/sw_helper.h"
--- 
-2.33.1.windows.1
-
diff --git a/external_imported/vcpkg/ports/mesa/def-fixes.patch b/external_imported/vcpkg/ports/mesa/def-fixes.patch
deleted file mode 100644
index 650187273..000000000
--- a/external_imported/vcpkg/ports/mesa/def-fixes.patch
+++ /dev/null
@@ -1,3571 +0,0 @@
-diff --git a/bin/gen_vs_module_defs.py b/bin/gen_vs_module_defs.py
-new file mode 100644
-index 0000000000000000000000000000000000000000..dff8ab36f92ffbc18dbb2779563c25df567bb7b0
---- /dev/null
-+++ b/bin/gen_vs_module_defs.py
-@@ -0,0 +1,98 @@
-+#!/usr/bin/env python3
-+# Copyright © 2021-2021 Yonggang Luo
-+
-+# Permission is hereby granted, free of charge, to any person obtaining a copy
-+# of this software and associated documentation files (the "Software"), to deal
-+# in the Software without restriction, including without limitation the rights
-+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+# copies of the Software, and to permit persons to whom the Software is
-+# furnished to do so, subject to the following conditions:
-+
-+# The above copyright notice and this permission notice shall be included in
-+# all copies or substantial portions of the Software.
-+
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-+# SOFTWARE.
-+
-+gen_help = """Generates visual studio module definition file."""
-+
-+import argparse
-+
-+"""
-+For input template definition file
-+For gcc/x64,gcc/arm64,visual studio
-+`wglMakeCurrent@8                     @357` => `wglMakeCurrent @357`
-+`DrvCopyContext@12` => `DrvCopyContext`
-+`stw_get_device` => `stw_get_device`
-+For gcc/x86,gcc/arm
-+`wglMakeCurrent@8                     @357` => `wglMakeCurrent@8 @357 == wglMakeCurrent`
-+`DrvCopyContext@12` => `DrvCopyContext@12 == DrvCopyContext`
-+`stw_get_device` => `stw_get_device`
-+
-+"""
-+def gen_vs_module_def(in_file: str, out_file: str, compiler_id: str, cpu_family: str) -> None:
-+    out_file_lines = ['EXPORTS']
-+    with open(in_file, 'r', encoding='utf-8') as f:
-+        lines = f.readlines()
-+        for line in lines:
-+            line = line.strip()
-+            tokens = line.split(';')
-+            if not tokens:
-+                continue
-+            def_infos = [x for x in tokens[0].split(' ') if len(x) > 0]
-+            if not def_infos:
-+                if line:
-+                    out_file_lines.append('\t' + line)
-+                else:
-+                    out_file_lines.append('')
-+                continue
-+            name_infos = def_infos[0].split('@')
-+            if not name_infos:
-+                out_file_lines.append('\t;' + line)
-+                continue
-+            order_info = '' if len(def_infos) <= 1 else def_infos[1]
-+            if def_infos[0] != name_infos[0] and \
-+                (compiler_id == 'gcc') and (cpu_family not in {'x86_64', 'aarch64'}):
-+                if order_info:
-+                    out_file_lines.append('\t' + def_infos[0] + ' ' + order_info + ' == ' + name_infos[0])
-+                else:
-+                    out_file_lines.append('\t' + def_infos[0] + ' == ' + name_infos[0])
-+            else:
-+                if order_info:
-+                    out_file_lines.append('\t' + name_infos[0] + ' ' + order_info)
-+                else:
-+                    out_file_lines.append('\t' + name_infos[0])
-+    with open(out_file, 'wb') as f:
-+        out_file_content = '\n'.join(out_file_lines) + '\n'
-+        f.write(out_file_content.encode('utf-8'))
-+'''
-+python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/libgl-gdi/opengl32.def.in --out_file src/gallium/targets/libgl-gdi/opengl32.def --compiler_id gcc --cpu_family x86_64
-+python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/libgl-gdi/opengl32.def.in --out_file src/gallium/targets/libgl-gdi/opengl32.mingw.def --compiler_id gcc --cpu_family x86
-+
-+python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/osmesa/osmesa.def.in --out_file src/gallium/targets/osmesa/osmesa.def --compiler_id gcc --cpu_family x86_64
-+python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/osmesa/osmesa.def.in --out_file src/gallium/targets/osmesa/osmesa.mingw.def --compiler_id gcc --cpu_family x86
-+
-+python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/wgl/gallium_wgl.def.in --out_file src/gallium/targets/wgl/gallium_wgl.def --compiler_id gcc --cpu_family x86_64
-+python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/wgl/gallium_wgl.def.in --out_file src/gallium/targets/wgl/gallium_wgl.mingw.def --compiler_id gcc --cpu_family x86
-+
-+python ./bin/gen_vs_module_defs.py --in_file src/egl/main/egl.def.in --out_file src/egl/main/egl.def --compiler_id gcc --cpu_family x86_64
-+python ./bin/gen_vs_module_defs.py --in_file src/egl/main/egl.def.in --out_file src/egl/main/egl.mingw.def --compiler_id gcc --cpu_family x86
-+
-+python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/lavapipe/vulkan_lvp.def.in --out_file src/gallium/targets/lavapipe/vulkan_lvp.def --compiler_id gcc --cpu_family x86_64
-+python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/lavapipe/vulkan_lvp.def.in --out_file src/gallium/targets/lavapipe/vulkan_lvp.mingw.def --compiler_id gcc --cpu_family x86
-+
-+'''
-+if __name__ == "__main__":
-+    parser = argparse.ArgumentParser(description=gen_help)
-+    parser.add_argument('--in_file', help='input template moudle definition file')
-+    parser.add_argument('--out_file', help='output moudle definition file')
-+    parser.add_argument('--compiler_id', help='compiler id')
-+    parser.add_argument('--cpu_family', help='cpu family')
-+    args = parser.parse_args()
-+    # print(args)
-+    gen_vs_module_def(args.in_file, args.out_file, args.compiler_id, args.cpu_family)
-diff --git a/bin/meson.build b/bin/meson.build
-index 000abef770966c4baecd0b47922f42c532a8c2cf..1b7301585f9e4b0f0556ce2ae11b03b128ab4677 100644
---- a/bin/meson.build
-+++ b/bin/meson.build
-@@ -19,5 +19,6 @@
- # SOFTWARE.
- 
- git_sha1_gen_py = files('git_sha1_gen.py')
-+gen_vs_module_defs_py = files('gen_vs_module_defs.py')
- symbols_check = find_program('symbols-check.py')
- install_megadrivers_py = find_program('install_megadrivers.py')
-diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build
-index 523782f281f650d0558af64a0c0a2bf77c217e1e..b6ecd999e71ab3ecb780af4fa2146c617e3c8e41 100644
---- a/src/amd/vulkan/meson.build
-+++ b/src/amd/vulkan/meson.build
-@@ -149,12 +149,10 @@ if with_ld_version_script
-   libvulkan_radeon_link_depends += files('vulkan.sym')
- endif
- 
--vulkan_radv_def = 'vulkan_radv.def'
--
- libvulkan_radeon = shared_library(
-   'vulkan_radeon',
-   [libradv_files, radv_entrypoints, sha1_h],
--  vs_module_defs : vulkan_radv_def,
-+  vs_module_defs : vulkan_api_def,
-   include_directories : [
-     inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_amd, inc_amd_common, inc_amd_common_llvm, inc_compiler, inc_util,
-   ],
-diff --git a/src/amd/vulkan/vulkan_radv.def b/src/amd/vulkan/vulkan_radv.def
-deleted file mode 100644
-index 64a9caae59398a4768f663f18f8598476991f85c..0000000000000000000000000000000000000000
---- a/src/amd/vulkan/vulkan_radv.def
-+++ /dev/null
-@@ -1,4 +0,0 @@
--EXPORTS
--vk_icdNegotiateLoaderICDInterfaceVersion
--vk_icdGetInstanceProcAddr
--vk_icdGetPhysicalDeviceProcAddr
-diff --git a/src/egl/main/egl.def b/src/egl/main/egl.def
-deleted file mode 100644
-index 54ae76b330929db865dc4ef0fd1723a88dc47979..0000000000000000000000000000000000000000
---- a/src/egl/main/egl.def
-+++ /dev/null
-@@ -1,47 +0,0 @@
--EXPORTS
--   eglBindAPI
--   eglBindTexImage
--   eglChooseConfig
--   eglClientWaitSync
--   eglCopyBuffers
--   eglCreateContext
--   eglCreateImage
--   eglCreatePbufferFromClientBuffer
--   eglCreatePbufferSurface
--   eglCreatePixmapSurface
--   eglCreatePlatformPixmapSurface
--   eglCreatePlatformWindowSurface
--   eglCreateSync
--   eglCreateWindowSurface
--   eglDestroyContext
--   eglDestroyImage
--   eglDestroySurface
--   eglDestroySync
--   eglGetConfigAttrib
--   eglGetConfigs
--   eglGetCurrentContext
--   eglGetCurrentDisplay
--   eglGetCurrentSurface
--   eglGetDisplay
--   eglGetError
--   eglGetPlatformDisplay
--   eglGetProcAddress
--   eglGetSyncAttrib
--   eglInitialize
--   eglMakeCurrent
--   eglQueryAPI
--   eglQueryContext
--   eglQueryString
--   eglQuerySurface
--   eglReleaseTexImage
--   eglReleaseThread
--   eglSurfaceAttrib
--   eglSwapBuffers
--   eglSwapInterval
--   eglTerminate
--   eglWaitClient
--   eglWaitGL
--   eglWaitNative
--   eglWaitSync
--   MesaGLInteropEGLQueryDeviceInfo
--   MesaGLInteropEGLExportObject
-diff --git a/src/egl/main/egl.def.in b/src/egl/main/egl.def.in
-new file mode 100644
-index 0000000000000000000000000000000000000000..b2439d9a2caaef26b48e737c8f6cd8314398ddeb
---- /dev/null
-+++ b/src/egl/main/egl.def.in
-@@ -0,0 +1,49 @@
-+; stdcall calling convention have @number suffix on 32 bits architecture for gcc
-+eglBindAPI@4
-+eglBindTexImage@12
-+eglChooseConfig@20
-+eglClientWaitSync@20
-+eglCopyBuffers@12
-+eglCreateContext@16
-+eglCreateImage@20
-+eglCreatePbufferFromClientBuffer@20
-+eglCreatePbufferSurface@12
-+eglCreatePixmapSurface@16
-+eglCreatePlatformPixmapSurface@16
-+eglCreatePlatformWindowSurface@16
-+eglCreateSync@12
-+eglCreateWindowSurface@16
-+eglDestroyContext@8
-+eglDestroyImage@8
-+eglDestroySurface@8
-+eglDestroySync@8
-+eglGetConfigAttrib@16
-+eglGetConfigs@16
-+eglGetCurrentContext@0
-+eglGetCurrentDisplay@0
-+eglGetCurrentSurface@4
-+eglGetDisplay@4
-+eglGetError@0
-+eglGetPlatformDisplay@12
-+eglGetProcAddress@4
-+eglGetSyncAttrib@16
-+eglInitialize@12
-+eglMakeCurrent@16
-+eglQueryAPI@0
-+eglQueryContext@16
-+eglQueryString@8
-+eglQuerySurface@16
-+eglReleaseTexImage@12
-+eglReleaseThread@0
-+eglSurfaceAttrib@16
-+eglSwapBuffers@8
-+eglSwapInterval@8
-+eglTerminate@4
-+eglWaitClient@0
-+eglWaitGL@0
-+eglWaitNative@4
-+eglWaitSync@12
-+
-+; __cdecl calling convention have no @number suffix
-+MesaGLInteropEGLQueryDeviceInfo
-+MesaGLInteropEGLExportObject
-diff --git a/src/egl/meson.build b/src/egl/meson.build
-index 315a95013f39b76a47067073f106eda518dc6b71..53044297322ad6ea3137bd1fe48b778a61608f5e 100644
---- a/src/egl/meson.build
-+++ b/src/egl/meson.build
-@@ -177,6 +177,15 @@ else
-   )
- endif
- 
-+egl_def = custom_target(
-+  'egl.def',
-+  input: 'main/egl.def.in',
-+  output : 'egl.def',
-+  command : [prog_python, gen_vs_module_defs_py,
-+             '--in_file', '@INPUT@', '--out_file', '@OUTPUT@',
-+             '--compiler_id', cc.get_id(), '--cpu_family', host_machine.cpu_family()]
-+)
-+
- libegl = shared_library(
-   egl_lib_name,
-   files_egl,
-@@ -194,7 +203,7 @@ libegl = shared_library(
-   version : egl_lib_version,
-   soversion : egl_lib_soversion,
-   name_prefix : 'lib', # even on windows
--  vs_module_defs : 'main/egl.def'
-+  vs_module_defs : egl_def
- )
- 
- if not with_glvnd
-diff --git a/src/gallium/frontends/d3d10umd/d3d10_sw.def b/src/gallium/frontends/d3d10umd/d3d10_sw.def
-deleted file mode 100644
-index 5b76bfccefaabc9c09e000ffab579d1487a3a31c..0000000000000000000000000000000000000000
---- a/src/gallium/frontends/d3d10umd/d3d10_sw.def
-+++ /dev/null
-@@ -1,53 +0,0 @@
--EXPORTS
--	OpenAdapter10
--	OpenAdapter10_2
--	D3DKMTAcquireKeyedMutex
--	D3DKMTCloseAdapter
--	D3DKMTConfigureSharedResource
--	D3DKMTCreateAllocation
--	D3DKMTCreateAllocation2
--	D3DKMTCreateContext
--	D3DKMTCreateDevice
--	D3DKMTCreateKeyedMutex
--	D3DKMTCreateSynchronizationObject
--	D3DKMTCreateSynchronizationObject2
--	D3DKMTDestroyAllocation
--	D3DKMTDestroyContext
--	D3DKMTDestroyDevice
--	D3DKMTDestroyKeyedMutex
--	D3DKMTDestroySynchronizationObject
--	D3DKMTEscape
--	D3DKMTGetContextSchedulingPriority
--	;D3DKMTGetDeviceSchedulingPriority
--	D3DKMTGetDeviceState
--	D3DKMTGetDisplayModeList
--	D3DKMTGetMultisampleMethodList
--	D3DKMTGetRuntimeData
--	D3DKMTGetSharedPrimaryHandle
--	D3DKMTLock
--	D3DKMTOpenAdapterFromDeviceName
--	D3DKMTOpenAdapterFromGdiDisplayName
--	D3DKMTOpenKeyedMutex
--	D3DKMTOpenResource
--	D3DKMTOpenResource2
--	D3DKMTOpenSynchronizationObject
--	D3DKMTPresent
--	D3DKMTQueryAdapterInfo
--	D3DKMTQueryAllocationResidency
--	D3DKMTQueryResourceInfo
--	D3DKMTReleaseKeyedMutex
--	D3DKMTRender
--	D3DKMTSetAllocationPriority
--	D3DKMTSetContextSchedulingPriority
--	;D3DKMTSetDeviceSchedulingPriority
--	D3DKMTSetDisplayMode
--	D3DKMTSetDisplayPrivateDriverFormat
--	D3DKMTSetGammaRamp
--	D3DKMTSetVidPnSourceOwner
--	D3DKMTSetVidPnSourceOwner1
--	D3DKMTSignalSynchronizationObject
--	D3DKMTSignalSynchronizationObject2
--	D3DKMTUnlock
--	D3DKMTWaitForSynchronizationObject
--	D3DKMTWaitForSynchronizationObject2
--	D3DKMTWaitForVerticalBlankEvent
-diff --git a/src/gallium/frontends/osmesa/meson.build b/src/gallium/frontends/osmesa/meson.build
-index e5848fd9934afc22119a14122e6c2d095ab8f350..fe78a4daa31bb01bf8535ff4498172241e554610 100644
---- a/src/gallium/frontends/osmesa/meson.build
-+++ b/src/gallium/frontends/osmesa/meson.build
-@@ -20,7 +20,7 @@
- 
- osmesa_st_c_args = []
- if with_platform_windows
--  osmesa_st_c_args += ['-DBUILD_GL32', '-DWIN32_LEAN_AND_MEAN']
-+  osmesa_st_c_args += ['-DWIN32_LEAN_AND_MEAN']
-   if not with_shared_glapi
-     osmesa_st_c_args += ['-D_GLAPI_NO_EXPORTS']
-   endif
-diff --git a/src/gallium/targets/d3d10sw/d3d10_sw.def.in b/src/gallium/targets/d3d10sw/d3d10_sw.def.in
-new file mode 100644
-index 0000000000000000000000000000000000000000..a81de54c4d285c67b1dd9a6da855a65446239831
---- /dev/null
-+++ b/src/gallium/targets/d3d10sw/d3d10_sw.def.in
-@@ -0,0 +1,76 @@
-+; stdcall calling convention have @number suffix on 32 bits architecture for gcc
-+OpenAdapter10@4
-+OpenAdapter10_2@4
-+D3DKMTAcquireKeyedMutex@4
-+;D3DKMTCheckExclusiveOwnership@0
-+;D3DKMTCheckMonitorPowerState@4
-+;D3DKMTCheckOcclusion@4
-+;D3DKMTCheckSharedResourceAccess@4
-+;D3DKMTCheckVidPnExclusiveOwnership@4
-+D3DKMTCloseAdapter@4
-+D3DKMTConfigureSharedResource@4
-+D3DKMTCreateAllocation2@4
-+D3DKMTCreateAllocation@4
-+D3DKMTCreateContext@4
-+;D3DKMTCreateDCFromMemory@4
-+D3DKMTCreateDevice@4
-+D3DKMTCreateKeyedMutex@4
-+;D3DKMTCreateOverlay@4
-+D3DKMTCreateSynchronizationObject2@4
-+D3DKMTCreateSynchronizationObject@4
-+D3DKMTDestroyAllocation@4
-+D3DKMTDestroyContext@4
-+;D3DKMTDestroyDCFromMemory@4
-+D3DKMTDestroyDevice@4
-+D3DKMTDestroyKeyedMutex@4
-+;D3DKMTDestroyOverlay@4
-+D3DKMTDestroySynchronizationObject@4
-+D3DKMTEscape@4
-+;D3DKMTFlipOverlay@4
-+D3DKMTGetContextSchedulingPriority@4
-+D3DKMTGetDeviceState@4
-+D3DKMTGetDisplayModeList@4
-+D3DKMTGetMultisampleMethodList@4
-+;D3DKMTGetOverlayState@4
-+;D3DKMTGetPresentHistory@4
-+;D3DKMTGetPresentQueueEvent@8
-+;D3DKMTGetProcessSchedulingPriorityClass@8
-+D3DKMTGetRuntimeData@4
-+;D3DKMTGetScanLine@4
-+D3DKMTGetSharedPrimaryHandle@4
-+;D3DKMTInvalidateActiveVidPn@4
-+D3DKMTLock@4
-+D3DKMTOpenAdapterFromDeviceName@4
-+D3DKMTOpenAdapterFromGdiDisplayName@4
-+;D3DKMTOpenAdapterFromHdc@4
-+D3DKMTOpenKeyedMutex@4
-+D3DKMTOpenResource2@4
-+D3DKMTOpenResource@4
-+D3DKMTOpenSynchronizationObject@4
-+;D3DKMTPollDisplayChildren@4
-+D3DKMTPresent@4
-+D3DKMTQueryAdapterInfo@4
-+D3DKMTQueryAllocationResidency@4
-+D3DKMTQueryResourceInfo@4
-+;D3DKMTQueryStatistics@4
-+D3DKMTReleaseKeyedMutex@4
-+;D3DKMTReleaseProcessVidPnSourceOwners@4
-+D3DKMTRender@4
-+D3DKMTSetAllocationPriority@4
-+D3DKMTSetContextSchedulingPriority@4
-+D3DKMTSetDisplayMode@4
-+D3DKMTSetDisplayPrivateDriverFormat@4
-+D3DKMTSetGammaRamp@4
-+;D3DKMTSetProcessSchedulingPriorityClass@8
-+;D3DKMTSetQueuedLimit@4
-+D3DKMTSetVidPnSourceOwner@4
-+;D3DKMTSharedPrimaryLockNotification@4
-+;D3DKMTSharedPrimaryUnLockNotification@4
-+D3DKMTSignalSynchronizationObject2@4
-+D3DKMTSignalSynchronizationObject@4
-+D3DKMTUnlock@4
-+;D3DKMTUpdateOverlay@4
-+;D3DKMTWaitForIdle@4
-+D3DKMTWaitForSynchronizationObject2@4
-+D3DKMTWaitForSynchronizationObject@4
-+D3DKMTWaitForVerticalBlankEvent@4
-diff --git a/src/gallium/targets/d3d10sw/meson.build b/src/gallium/targets/d3d10sw/meson.build
-index fe8632d3c7ff3f1a61a20f6bd88f25e697316e10..8b90c561152f96be787f838467d0e3407a1bd134 100644
---- a/src/gallium/targets/d3d10sw/meson.build
-+++ b/src/gallium/targets/d3d10sw/meson.build
-@@ -19,20 +19,22 @@
- # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- # SOFTWARE.
- 
--d3d10sw_def = files('../../frontends/d3d10umd/d3d10_sw.def')[0]
--_link_args_d3d10sw = []
--if cc.get_id() == 'gcc'
--  _link_args_d3d10sw += '-Wl,--enable-stdcall-fixup'
--endif
-+d3d10_sw_def = custom_target(
-+  'd3d10_sw.def',
-+  input: 'd3d10_sw.def.in',
-+  output : 'd3d10_sw.def',
-+  command : [prog_python, gen_vs_module_defs_py,
-+             '--in_file', '@INPUT@', '--out_file', '@OUTPUT@',
-+             '--compiler_id', cc.get_id(), '--cpu_family', host_machine.cpu_family()]
-+)
- 
- libd3d10sw = shared_library(
-   'd3d10sw',
-   ['d3d10_gdi.c'],
--  vs_module_defs : d3d10sw_def,
-+  vs_module_defs : d3d10_sw_def,
-   include_directories : [
-     inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_d3d10umd, inc_gallium_winsys, inc_gallium_winsys_sw, inc_gallium_drivers,
-   ],
--  link_args : _link_args_d3d10sw,
-   link_whole : [libd3d10umd],
-   link_with : [
-     libgallium, libwsgdi
-diff --git a/src/gallium/targets/lavapipe/meson.build b/src/gallium/targets/lavapipe/meson.build
-index f2b363099ae154b71efd7c217598e0eb48ff3a0c..bda4fbc574d7f5d7ca2b903ff928c72951022132 100644
---- a/src/gallium/targets/lavapipe/meson.build
-+++ b/src/gallium/targets/lavapipe/meson.build
-@@ -1,14 +1,9 @@
- 
--if cc.get_id() == 'gcc' and host_machine.cpu_family() != 'x86_64'
--  vulkan_lvp_def = 'vulkan_lvp.mingw.def'
--else
--  vulkan_lvp_def = 'vulkan_lvp.def'
--endif
- 
- libvulkan_lvp = shared_library(
-   'vulkan_lvp',
-   [ 'target.c' ],
--  vs_module_defs : vulkan_lvp_def,
-+  vs_module_defs : vulkan_api_def,
-   include_directories : [ inc_src, inc_util, inc_include, inc_gallium, inc_gallium_aux, inc_gallium_winsys, inc_gallium_drivers ],
-   link_whole : [ liblavapipe_st ],
-   link_with : [libpipe_loader_static, libgallium, libwsw, libswdri, libws_null, libswkmsdri ],
-diff --git a/src/gallium/targets/lavapipe/vulkan_lvp.def b/src/gallium/targets/lavapipe/vulkan_lvp.def
-deleted file mode 100644
-index 64a9caae59398a4768f663f18f8598476991f85c..0000000000000000000000000000000000000000
---- a/src/gallium/targets/lavapipe/vulkan_lvp.def
-+++ /dev/null
-@@ -1,4 +0,0 @@
--EXPORTS
--vk_icdNegotiateLoaderICDInterfaceVersion
--vk_icdGetInstanceProcAddr
--vk_icdGetPhysicalDeviceProcAddr
-diff --git a/src/gallium/targets/lavapipe/vulkan_lvp.mingw.def b/src/gallium/targets/lavapipe/vulkan_lvp.mingw.def
-deleted file mode 100644
-index c9638323ab044f072ad30f5089074909f769b8d4..0000000000000000000000000000000000000000
---- a/src/gallium/targets/lavapipe/vulkan_lvp.mingw.def
-+++ /dev/null
-@@ -1,4 +0,0 @@
--EXPORTS
--vk_icdNegotiateLoaderICDInterfaceVersion@4
--vk_icdGetInstanceProcAddr = vk_icdGetInstanceProcAddr@8
--vk_icdGetPhysicalDeviceProcAddr = vk_icdGetPhysicalDeviceProcAddr@8
-diff --git a/src/gallium/targets/libgl-gdi/meson.build b/src/gallium/targets/libgl-gdi/meson.build
-index 25300000221d44c7d669ec49df1fb88396f5c968..b333eae0f34227b0dfd1abc08006680ea5359224 100644
---- a/src/gallium/targets/libgl-gdi/meson.build
-+++ b/src/gallium/targets/libgl-gdi/meson.build
-@@ -20,20 +20,20 @@
- 
- 
- opengl32_link_args = []
--if cc.get_id() == 'gcc' and host_machine.cpu_family() != 'x86_64'
--  opengl32_link_args += ['-Wl,--enable-stdcall-fixup']
--endif
- 
--if cc.get_id() == 'gcc' and host_machine.cpu_family() != 'x86_64'
--  ogl_def = 'opengl32.mingw.def'
--else
--  ogl_def = 'opengl32.def'
--endif
-+opengl32_def = custom_target(
-+  'opengl32.def',
-+  input: 'opengl32.def.in',
-+  output : 'opengl32.def',
-+  command : [prog_python, gen_vs_module_defs_py,
-+             '--in_file', '@INPUT@', '--out_file', '@OUTPUT@',
-+             '--compiler_id', cc.get_id(), '--cpu_family', host_machine.cpu_family()]
-+)
- 
- libopengl32 = shared_library(
-   'opengl32',
-   ['stw_wgl.c'],
--  vs_module_defs : ogl_def,
-+  vs_module_defs : opengl32_def,
-   include_directories : [
-     inc_include, inc_wgl, inc_src,
-   ],
-diff --git a/src/gallium/targets/libgl-gdi/opengl32.def b/src/gallium/targets/libgl-gdi/opengl32.def
-deleted file mode 100644
-index d89f0bdb52ab65dc8c1ebb8b9ff79eaf5da41fd8..0000000000000000000000000000000000000000
---- a/src/gallium/targets/libgl-gdi/opengl32.def
-+++ /dev/null
-@@ -1,388 +0,0 @@
--EXPORTS
--;	GlmfBeginGlsBlock                @1
--;	GlmfCloseMetaFile                @2
--;	GlmfEndGlsBlock                  @3
--;	GlmfEndPlayback                  @4
--;	GlmfInitPlayback                 @5
--;	GlmfPlayGlsRecord                @6
--	glAccum                          @7
--	glAlphaFunc                      @8
--	glAreTexturesResident            @9
--	glArrayElement                   @10
--	glBegin                          @11
--	glBindTexture                    @12
--	glBitmap                         @13
--	glBlendFunc                      @14
--	glCallList                       @15
--	glCallLists                      @16
--	glClear                          @17
--	glClearAccum                     @18
--	glClearColor                     @19
--	glClearDepth                     @20
--	glClearIndex                     @21
--	glClearStencil                   @22
--	glClipPlane                      @23
--	glColor3b                        @24
--	glColor3bv                       @25
--	glColor3d                        @26
--	glColor3dv                       @27
--	glColor3f                        @28
--	glColor3fv                       @29
--	glColor3i                        @30
--	glColor3iv                       @31
--	glColor3s                        @32
--	glColor3sv                       @33
--	glColor3ub                       @34
--	glColor3ubv                      @35
--	glColor3ui                       @36
--	glColor3uiv                      @37
--	glColor3us                       @38
--	glColor3usv                      @39
--	glColor4b                        @40
--	glColor4bv                       @41
--	glColor4d                        @42
--	glColor4dv                       @43
--	glColor4f                        @44
--	glColor4fv                       @45
--	glColor4i                        @46
--	glColor4iv                       @47
--	glColor4s                        @48
--	glColor4sv                       @49
--	glColor4ub                       @50
--	glColor4ubv                      @51
--	glColor4ui                       @52
--	glColor4uiv                      @53
--	glColor4us                       @54
--	glColor4usv                      @55
--	glColorMask                      @56
--	glColorMaterial                  @57
--	glColorPointer                   @58
--	glCopyPixels                     @59
--	glCopyTexImage1D                 @60
--	glCopyTexImage2D                 @61
--	glCopyTexSubImage1D              @62
--	glCopyTexSubImage2D              @63
--	glCullFace                       @64
--;	glDebugEntry                     @65
--	glDeleteLists                    @66
--	glDeleteTextures                 @67
--	glDepthFunc                      @68
--	glDepthMask                      @69
--	glDepthRange                     @70
--	glDisable                        @71
--	glDisableClientState             @72
--	glDrawArrays                     @73
--	glDrawBuffer                     @74
--	glDrawElements                   @75
--	glDrawPixels                     @76
--	glEdgeFlag                       @77
--	glEdgeFlagPointer                @78
--	glEdgeFlagv                      @79
--	glEnable                         @80
--	glEnableClientState              @81
--	glEnd                            @82
--	glEndList                        @83
--	glEvalCoord1d                    @84
--	glEvalCoord1dv                   @85
--	glEvalCoord1f                    @86
--	glEvalCoord1fv                   @87
--	glEvalCoord2d                    @88
--	glEvalCoord2dv                   @89
--	glEvalCoord2f                    @90
--	glEvalCoord2fv                   @91
--	glEvalMesh1                      @92
--	glEvalMesh2                      @93
--	glEvalPoint1                     @94
--	glEvalPoint2                     @95
--	glFeedbackBuffer                 @96
--	glFinish                         @97
--	glFlush                          @98
--	glFogf                           @99
--	glFogfv                          @100
--	glFogi                           @101
--	glFogiv                          @102
--	glFrontFace                      @103
--	glFrustum                        @104
--	glGenLists                       @105
--	glGenTextures                    @106
--	glGetBooleanv                    @107
--	glGetClipPlane                   @108
--	glGetDoublev                     @109
--	glGetError                       @110
--	glGetFloatv                      @111
--	glGetIntegerv                    @112
--	glGetLightfv                     @113
--	glGetLightiv                     @114
--	glGetMapdv                       @115
--	glGetMapfv                       @116
--	glGetMapiv                       @117
--	glGetMaterialfv                  @118
--	glGetMaterialiv                  @119
--	glGetPixelMapfv                  @120
--	glGetPixelMapuiv                 @121
--	glGetPixelMapusv                 @122
--	glGetPointerv                    @123
--	glGetPolygonStipple              @124
--	glGetString                      @125
--	glGetTexEnvfv                    @126
--	glGetTexEnviv                    @127
--	glGetTexGendv                    @128
--	glGetTexGenfv                    @129
--	glGetTexGeniv                    @130
--	glGetTexImage                    @131
--	glGetTexLevelParameterfv         @132
--	glGetTexLevelParameteriv         @133
--	glGetTexParameterfv              @134
--	glGetTexParameteriv              @135
--	glHint                           @136
--	glIndexMask                      @137
--	glIndexPointer                   @138
--	glIndexd                         @139
--	glIndexdv                        @140
--	glIndexf                         @141
--	glIndexfv                        @142
--	glIndexi                         @143
--	glIndexiv                        @144
--	glIndexs                         @145
--	glIndexsv                        @146
--	glIndexub                        @147
--	glIndexubv                       @148
--	glInitNames                      @149
--	glInterleavedArrays              @150
--	glIsEnabled                      @151
--	glIsList                         @152
--	glIsTexture                      @153
--	glLightModelf                    @154
--	glLightModelfv                   @155
--	glLightModeli                    @156
--	glLightModeliv                   @157
--	glLightf                         @158
--	glLightfv                        @159
--	glLighti                         @160
--	glLightiv                        @161
--	glLineStipple                    @162
--	glLineWidth                      @163
--	glListBase                       @164
--	glLoadIdentity                   @165
--	glLoadMatrixd                    @166
--	glLoadMatrixf                    @167
--	glLoadName                       @168
--	glLogicOp                        @169
--	glMap1d                          @170
--	glMap1f                          @171
--	glMap2d                          @172
--	glMap2f                          @173
--	glMapGrid1d                      @174
--	glMapGrid1f                      @175
--	glMapGrid2d                      @176
--	glMapGrid2f                      @177
--	glMaterialf                      @178
--	glMaterialfv                     @179
--	glMateriali                      @180
--	glMaterialiv                     @181
--	glMatrixMode                     @182
--	glMultMatrixd                    @183
--	glMultMatrixf                    @184
--	glNewList                        @185
--	glNormal3b                       @186
--	glNormal3bv                      @187
--	glNormal3d                       @188
--	glNormal3dv                      @189
--	glNormal3f                       @190
--	glNormal3fv                      @191
--	glNormal3i                       @192
--	glNormal3iv                      @193
--	glNormal3s                       @194
--	glNormal3sv                      @195
--	glNormalPointer                  @196
--	glOrtho                          @197
--	glPassThrough                    @198
--	glPixelMapfv                     @199
--	glPixelMapuiv                    @200
--	glPixelMapusv                    @201
--	glPixelStoref                    @202
--	glPixelStorei                    @203
--	glPixelTransferf                 @204
--	glPixelTransferi                 @205
--	glPixelZoom                      @206
--	glPointSize                      @207
--	glPolygonMode                    @208
--	glPolygonOffset                  @209
--	glPolygonStipple                 @210
--	glPopAttrib                      @211
--	glPopClientAttrib                @212
--	glPopMatrix                      @213
--	glPopName                        @214
--	glPrioritizeTextures             @215
--	glPushAttrib                     @216
--	glPushClientAttrib               @217
--	glPushMatrix                     @218
--	glPushName                       @219
--	glRasterPos2d                    @220
--	glRasterPos2dv                   @221
--	glRasterPos2f                    @222
--	glRasterPos2fv                   @223
--	glRasterPos2i                    @224
--	glRasterPos2iv                   @225
--	glRasterPos2s                    @226
--	glRasterPos2sv                   @227
--	glRasterPos3d                    @228
--	glRasterPos3dv                   @229
--	glRasterPos3f                    @230
--	glRasterPos3fv                   @231
--	glRasterPos3i                    @232
--	glRasterPos3iv                   @233
--	glRasterPos3s                    @234
--	glRasterPos3sv                   @235
--	glRasterPos4d                    @236
--	glRasterPos4dv                   @237
--	glRasterPos4f                    @238
--	glRasterPos4fv                   @239
--	glRasterPos4i                    @240
--	glRasterPos4iv                   @241
--	glRasterPos4s                    @242
--	glRasterPos4sv                   @243
--	glReadBuffer                     @244
--	glReadPixels                     @245
--	glRectd                          @246
--	glRectdv                         @247
--	glRectf                          @248
--	glRectfv                         @249
--	glRecti                          @250
--	glRectiv                         @251
--	glRects                          @252
--	glRectsv                         @253
--	glRenderMode                     @254
--	glRotated                        @255
--	glRotatef                        @256
--	glScaled                         @257
--	glScalef                         @258
--	glScissor                        @259
--	glSelectBuffer                   @260
--	glShadeModel                     @261
--	glStencilFunc                    @262
--	glStencilMask                    @263
--	glStencilOp                      @264
--	glTexCoord1d                     @265
--	glTexCoord1dv                    @266
--	glTexCoord1f                     @267
--	glTexCoord1fv                    @268
--	glTexCoord1i                     @269
--	glTexCoord1iv                    @270
--	glTexCoord1s                     @271
--	glTexCoord1sv                    @272
--	glTexCoord2d                     @273
--	glTexCoord2dv                    @274
--	glTexCoord2f                     @275
--	glTexCoord2fv                    @276
--	glTexCoord2i                     @277
--	glTexCoord2iv                    @278
--	glTexCoord2s                     @279
--	glTexCoord2sv                    @280
--	glTexCoord3d                     @281
--	glTexCoord3dv                    @282
--	glTexCoord3f                     @283
--	glTexCoord3fv                    @284
--	glTexCoord3i                     @285
--	glTexCoord3iv                    @286
--	glTexCoord3s                     @287
--	glTexCoord3sv                    @288
--	glTexCoord4d                     @289
--	glTexCoord4dv                    @290
--	glTexCoord4f                     @291
--	glTexCoord4fv                    @292
--	glTexCoord4i                     @293
--	glTexCoord4iv                    @294
--	glTexCoord4s                     @295
--	glTexCoord4sv                    @296
--	glTexCoordPointer                @297
--	glTexEnvf                        @298
--	glTexEnvfv                       @299
--	glTexEnvi                        @300
--	glTexEnviv                       @301
--	glTexGend                        @302
--	glTexGendv                       @303
--	glTexGenf                        @304
--	glTexGenfv                       @305
--	glTexGeni                        @306
--	glTexGeniv                       @307
--	glTexImage1D                     @308
--	glTexImage2D                     @309
--	glTexParameterf                  @310
--	glTexParameterfv                 @311
--	glTexParameteri                  @312
--	glTexParameteriv                 @313
--	glTexSubImage1D                  @314
--	glTexSubImage2D                  @315
--	glTranslated                     @316
--	glTranslatef                     @317
--	glVertex2d                       @318
--	glVertex2dv                      @319
--	glVertex2f                       @320
--	glVertex2fv                      @321
--	glVertex2i                       @322
--	glVertex2iv                      @323
--	glVertex2s                       @324
--	glVertex2sv                      @325
--	glVertex3d                       @326
--	glVertex3dv                      @327
--	glVertex3f                       @328
--	glVertex3fv                      @329
--	glVertex3i                       @330
--	glVertex3iv                      @331
--	glVertex3s                       @332
--	glVertex3sv                      @333
--	glVertex4d                       @334
--	glVertex4dv                      @335
--	glVertex4f                       @336
--	glVertex4fv                      @337
--	glVertex4i                       @338
--	glVertex4iv                      @339
--	glVertex4s                       @340
--	glVertex4sv                      @341
--	glVertexPointer                  @342
--	glViewport                       @343
--	wglChoosePixelFormat             @344
--	wglCopyContext                   @345
--	wglCreateContext                 @346
--	wglCreateLayerContext            @347
--	wglDeleteContext                 @348
--	wglDescribeLayerPlane            @349
--	wglDescribePixelFormat           @350
--	wglGetCurrentContext             @351
--	wglGetCurrentDC                  @352
--;	wglGetDefaultProcAddress         @353
--	wglGetLayerPaletteEntries        @354
--	wglGetPixelFormat                @355
--	wglGetProcAddress                @356
--	wglMakeCurrent                   @357
--	wglRealizeLayerPalette           @358
--	wglSetLayerPaletteEntries        @359
--	wglSetPixelFormat                @360
--	wglShareLists                    @361
--	wglSwapBuffers                   @362
--	wglSwapLayerBuffers              @363
--	wglSwapMultipleBuffers           @364
--	wglUseFontBitmapsA               @365
--	wglUseFontBitmapsW               @366
--	wglUseFontOutlinesA              @367
--	wglUseFontOutlinesW              @368
--	DrvCopyContext
--	DrvCreateContext
--	DrvCreateLayerContext
--	DrvDeleteContext
--	DrvDescribeLayerPlane
--	DrvDescribePixelFormat
--	DrvGetLayerPaletteEntries
--	DrvGetProcAddress
--	DrvPresentBuffers
--	DrvRealizeLayerPalette
--	DrvReleaseContext
--	DrvSetCallbackProcs
--	DrvSetContext
--	DrvSetLayerPaletteEntries
--	DrvSetPixelFormat
--	DrvShareLists
--	DrvSwapBuffers
--	DrvSwapLayerBuffers
--	DrvValidateVersion
-diff --git a/src/gallium/targets/libgl-gdi/opengl32.def.in b/src/gallium/targets/libgl-gdi/opengl32.def.in
-new file mode 100644
-index 0000000000000000000000000000000000000000..ceffdf09936f95506090d79a99ef95ef89cc7ddc
---- /dev/null
-+++ b/src/gallium/targets/libgl-gdi/opengl32.def.in
-@@ -0,0 +1,389 @@
-+; stdcall calling convention have @number suffix on 32 bits architecture for gcc
-+;GlmfBeginGlsBlock@4                 @1
-+;GlmfCloseMetaFile@4                 @2
-+;GlmfEndGlsBlock@4                   @3
-+;GlmfEndPlayback@4                   @4
-+;GlmfInitPlayback@12                 @5
-+;GlmfPlayGlsRecord@16                @6
-+glAccum@8                            @7
-+glAlphaFunc@8                        @8
-+glAreTexturesResident@12             @9
-+glArrayElement@4                     @10
-+glBegin@4                            @11
-+glBindTexture@8                      @12
-+glBitmap@28                          @13
-+glBlendFunc@8                        @14
-+glCallList@4                         @15
-+glCallLists@12                       @16
-+glClear@4                            @17
-+glClearAccum@16                      @18
-+glClearColor@16                      @19
-+glClearDepth@8                       @20
-+glClearIndex@4                       @21
-+glClearStencil@4                     @22
-+glClipPlane@8                        @23
-+glColor3b@12                         @24
-+glColor3bv@4                         @25
-+glColor3d@24                         @26
-+glColor3dv@4                         @27
-+glColor3f@12                         @28
-+glColor3fv@4                         @29
-+glColor3i@12                         @30
-+glColor3iv@4                         @31
-+glColor3s@12                         @32
-+glColor3sv@4                         @33
-+glColor3ub@12                        @34
-+glColor3ubv@4                        @35
-+glColor3ui@12                        @36
-+glColor3uiv@4                        @37
-+glColor3us@12                        @38
-+glColor3usv@4                        @39
-+glColor4b@16                         @40
-+glColor4bv@4                         @41
-+glColor4d@32                         @42
-+glColor4dv@4                         @43
-+glColor4f@16                         @44
-+glColor4fv@4                         @45
-+glColor4i@16                         @46
-+glColor4iv@4                         @47
-+glColor4s@16                         @48
-+glColor4sv@4                         @49
-+glColor4ub@16                        @50
-+glColor4ubv@4                        @51
-+glColor4ui@16                        @52
-+glColor4uiv@4                        @53
-+glColor4us@16                        @54
-+glColor4usv@4                        @55
-+glColorMask@16                       @56
-+glColorMaterial@8                    @57
-+glColorPointer@16                    @58
-+glCopyPixels@20                      @59
-+glCopyTexImage1D@28                  @60
-+glCopyTexImage2D@32                  @61
-+glCopyTexSubImage1D@24               @62
-+glCopyTexSubImage2D@32               @63
-+glCullFace@4                         @64
-+;glDebugEntry@8                       @65
-+glDeleteLists@8                      @66
-+glDeleteTextures@8                   @67
-+glDepthFunc@4                        @68
-+glDepthMask@4                        @69
-+glDepthRange@16                      @70
-+glDisable@4                          @71
-+glDisableClientState@4               @72
-+glDrawArrays@12                      @73
-+glDrawBuffer@4                       @74
-+glDrawElements@16                    @75
-+glDrawPixels@20                      @76
-+glEdgeFlag@4                         @77
-+glEdgeFlagPointer@8                  @78
-+glEdgeFlagv@4                        @79
-+glEnable@4                           @80
-+glEnableClientState@4                @81
-+glEnd@0                              @82
-+glEndList@0                          @83
-+glEvalCoord1d@8                      @84
-+glEvalCoord1dv@4                     @85
-+glEvalCoord1f@4                      @86
-+glEvalCoord1fv@4                     @87
-+glEvalCoord2d@16                     @88
-+glEvalCoord2dv@4                     @89
-+glEvalCoord2f@8                      @90
-+glEvalCoord2fv@4                     @91
-+glEvalMesh1@12                       @92
-+glEvalMesh2@20                       @93
-+glEvalPoint1@4                       @94
-+glEvalPoint2@8                       @95
-+glFeedbackBuffer@12                  @96
-+glFinish@0                           @97
-+glFlush@0                            @98
-+glFogf@8                             @99
-+glFogfv@8                            @100
-+glFogi@8                             @101
-+glFogiv@8                            @102
-+glFrontFace@4                        @103
-+glFrustum@48                         @104
-+glGenLists@4                         @105
-+glGenTextures@8                      @106
-+glGetBooleanv@8                      @107
-+glGetClipPlane@8                     @108
-+glGetDoublev@8                       @109
-+glGetError@0                         @110
-+glGetFloatv@8                        @111
-+glGetIntegerv@8                      @112
-+glGetLightfv@12                      @113
-+glGetLightiv@12                      @114
-+glGetMapdv@12                        @115
-+glGetMapfv@12                        @116
-+glGetMapiv@12                        @117
-+glGetMaterialfv@12                   @118
-+glGetMaterialiv@12                   @119
-+glGetPixelMapfv@8                    @120
-+glGetPixelMapuiv@8                   @121
-+glGetPixelMapusv@8                   @122
-+glGetPointerv@8                      @123
-+glGetPolygonStipple@4                @124
-+glGetString@4                        @125
-+glGetTexEnvfv@12                     @126
-+glGetTexEnviv@12                     @127
-+glGetTexGendv@12                     @128
-+glGetTexGenfv@12                     @129
-+glGetTexGeniv@12                     @130
-+glGetTexImage@20                     @131
-+glGetTexLevelParameterfv@16          @132
-+glGetTexLevelParameteriv@16          @133
-+glGetTexParameterfv@12               @134
-+glGetTexParameteriv@12               @135
-+glHint@8                             @136
-+glIndexMask@4                        @137
-+glIndexPointer@12                    @138
-+glIndexd@8                           @139
-+glIndexdv@4                          @140
-+glIndexf@4                           @141
-+glIndexfv@4                          @142
-+glIndexi@4                           @143
-+glIndexiv@4                          @144
-+glIndexs@4                           @145
-+glIndexsv@4                          @146
-+glIndexub@4                          @147
-+glIndexubv@4                         @148
-+glInitNames@0                        @149
-+glInterleavedArrays@12               @150
-+glIsEnabled@4                        @151
-+glIsList@4                           @152
-+glIsTexture@4                        @153
-+glLightModelf@8                      @154
-+glLightModelfv@8                     @155
-+glLightModeli@8                      @156
-+glLightModeliv@8                     @157
-+glLightf@12                          @158
-+glLightfv@12                         @159
-+glLighti@12                          @160
-+glLightiv@12                         @161
-+glLineStipple@8                      @162
-+glLineWidth@4                        @163
-+glListBase@4                         @164
-+glLoadIdentity@0                     @165
-+glLoadMatrixd@4                      @166
-+glLoadMatrixf@4                      @167
-+glLoadName@4                         @168
-+glLogicOp@4                          @169
-+glMap1d@32                           @170
-+glMap1f@24                           @171
-+glMap2d@56                           @172
-+glMap2f@40                           @173
-+glMapGrid1d@20                       @174
-+glMapGrid1f@12                       @175
-+glMapGrid2d@40                       @176
-+glMapGrid2f@24                       @177
-+glMaterialf@12                       @178
-+glMaterialfv@12                      @179
-+glMateriali@12                       @180
-+glMaterialiv@12                      @181
-+glMatrixMode@4                       @182
-+glMultMatrixd@4                      @183
-+glMultMatrixf@4                      @184
-+glNewList@8                          @185
-+glNormal3b@12                        @186
-+glNormal3bv@4                        @187
-+glNormal3d@24                        @188
-+glNormal3dv@4                        @189
-+glNormal3f@12                        @190
-+glNormal3fv@4                        @191
-+glNormal3i@12                        @192
-+glNormal3iv@4                        @193
-+glNormal3s@12                        @194
-+glNormal3sv@4                        @195
-+glNormalPointer@12                   @196
-+glOrtho@48                           @197
-+glPassThrough@4                      @198
-+glPixelMapfv@12                      @199
-+glPixelMapuiv@12                     @200
-+glPixelMapusv@12                     @201
-+glPixelStoref@8                      @202
-+glPixelStorei@8                      @203
-+glPixelTransferf@8                   @204
-+glPixelTransferi@8                   @205
-+glPixelZoom@8                        @206
-+glPointSize@4                        @207
-+glPolygonMode@8                      @208
-+glPolygonOffset@8                    @209
-+glPolygonStipple@4                   @210
-+glPopAttrib@0                        @211
-+glPopClientAttrib@0                  @212
-+glPopMatrix@0                        @213
-+glPopName@0                          @214
-+glPrioritizeTextures@12              @215
-+glPushAttrib@4                       @216
-+glPushClientAttrib@4                 @217
-+glPushMatrix@0                       @218
-+glPushName@4                         @219
-+glRasterPos2d@16                     @220
-+glRasterPos2dv@4                     @221
-+glRasterPos2f@8                      @222
-+glRasterPos2fv@4                     @223
-+glRasterPos2i@8                      @224
-+glRasterPos2iv@4                     @225
-+glRasterPos2s@8                      @226
-+glRasterPos2sv@4                     @227
-+glRasterPos3d@24                     @228
-+glRasterPos3dv@4                     @229
-+glRasterPos3f@12                     @230
-+glRasterPos3fv@4                     @231
-+glRasterPos3i@12                     @232
-+glRasterPos3iv@4                     @233
-+glRasterPos3s@12                     @234
-+glRasterPos3sv@4                     @235
-+glRasterPos4d@32                     @236
-+glRasterPos4dv@4                     @237
-+glRasterPos4f@16                     @238
-+glRasterPos4fv@4                     @239
-+glRasterPos4i@16                     @240
-+glRasterPos4iv@4                     @241
-+glRasterPos4s@16                     @242
-+glRasterPos4sv@4                     @243
-+glReadBuffer@4                       @244
-+glReadPixels@28                      @245
-+glRectd@32                           @246
-+glRectdv@8                           @247
-+glRectf@16                           @248
-+glRectfv@8                           @249
-+glRecti@16                           @250
-+glRectiv@8                           @251
-+glRects@16                           @252
-+glRectsv@8                           @253
-+glRenderMode@4                       @254
-+glRotated@32                         @255
-+glRotatef@16                         @256
-+glScaled@24                          @257
-+glScalef@12                          @258
-+glScissor@16                         @259
-+glSelectBuffer@8                     @260
-+glShadeModel@4                       @261
-+glStencilFunc@12                     @262
-+glStencilMask@4                      @263
-+glStencilOp@12                       @264
-+glTexCoord1d@8                       @265
-+glTexCoord1dv@4                      @266
-+glTexCoord1f@4                       @267
-+glTexCoord1fv@4                      @268
-+glTexCoord1i@4                       @269
-+glTexCoord1iv@4                      @270
-+glTexCoord1s@4                       @271
-+glTexCoord1sv@4                      @272
-+glTexCoord2d@16                      @273
-+glTexCoord2dv@4                      @274
-+glTexCoord2f@8                       @275
-+glTexCoord2fv@4                      @276
-+glTexCoord2i@8                       @277
-+glTexCoord2iv@4                      @278
-+glTexCoord2s@8                       @279
-+glTexCoord2sv@4                      @280
-+glTexCoord3d@24                      @281
-+glTexCoord3dv@4                      @282
-+glTexCoord3f@12                      @283
-+glTexCoord3fv@4                      @284
-+glTexCoord3i@12                      @285
-+glTexCoord3iv@4                      @286
-+glTexCoord3s@12                      @287
-+glTexCoord3sv@4                      @288
-+glTexCoord4d@32                      @289
-+glTexCoord4dv@4                      @290
-+glTexCoord4f@16                      @291
-+glTexCoord4fv@4                      @292
-+glTexCoord4i@16                      @293
-+glTexCoord4iv@4                      @294
-+glTexCoord4s@16                      @295
-+glTexCoord4sv@4                      @296
-+glTexCoordPointer@16                 @297
-+glTexEnvf@12                         @298
-+glTexEnvfv@12                        @299
-+glTexEnvi@12                         @300
-+glTexEnviv@12                        @301
-+glTexGend@16                         @302
-+glTexGendv@12                        @303
-+glTexGenf@12                         @304
-+glTexGenfv@12                        @305
-+glTexGeni@12                         @306
-+glTexGeniv@12                        @307
-+glTexImage1D@32                      @308
-+glTexImage2D@36                      @309
-+glTexParameterf@12                   @310
-+glTexParameterfv@12                  @311
-+glTexParameteri@12                   @312
-+glTexParameteriv@12                  @313
-+glTexSubImage1D@28                   @314
-+glTexSubImage2D@36                   @315
-+glTranslated@24                      @316
-+glTranslatef@12                      @317
-+glVertex2d@16                        @318
-+glVertex2dv@4                        @319
-+glVertex2f@8                         @320
-+glVertex2fv@4                        @321
-+glVertex2i@8                         @322
-+glVertex2iv@4                        @323
-+glVertex2s@8                         @324
-+glVertex2sv@4                        @325
-+glVertex3d@24                        @326
-+glVertex3dv@4                        @327
-+glVertex3f@12                        @328
-+glVertex3fv@4                        @329
-+glVertex3i@12                        @330
-+glVertex3iv@4                        @331
-+glVertex3s@12                        @332
-+glVertex3sv@4                        @333
-+glVertex4d@32                        @334
-+glVertex4dv@4                        @335
-+glVertex4f@16                        @336
-+glVertex4fv@4                        @337
-+glVertex4i@16                        @338
-+glVertex4iv@4                        @339
-+glVertex4s@16                        @340
-+glVertex4sv@4                        @341
-+glVertexPointer@16                   @342
-+glViewport@16                        @343
-+wglChoosePixelFormat@8               @344
-+wglCopyContext@12                    @345
-+wglCreateContext@4                   @346
-+wglCreateLayerContext@8              @347
-+wglDeleteContext@4                   @348
-+wglDescribeLayerPlane@20             @349
-+wglDescribePixelFormat@16            @350
-+wglGetCurrentContext@0               @351
-+wglGetCurrentDC@0                    @352
-+;wglGetDefaultProcAddress@4          @353
-+wglGetLayerPaletteEntries@20         @354
-+wglGetPixelFormat@4                  @355
-+wglGetProcAddress@4                  @356
-+wglMakeCurrent@8                     @357
-+wglRealizeLayerPalette@12            @358
-+wglSetLayerPaletteEntries@20         @359
-+wglSetPixelFormat@12                 @360
-+wglShareLists@8                      @361
-+wglSwapBuffers@4                     @362
-+wglSwapLayerBuffers@8                @363
-+wglSwapMultipleBuffers@8             @364
-+wglUseFontBitmapsA@16                @365
-+wglUseFontBitmapsW@16                @366
-+wglUseFontOutlinesA@32               @367
-+wglUseFontOutlinesW@32               @368
-+
-+DrvCopyContext@12
-+DrvCreateContext@4
-+DrvCreateLayerContext@8
-+DrvDeleteContext@4
-+DrvDescribeLayerPlane@20
-+DrvDescribePixelFormat@16
-+DrvGetLayerPaletteEntries@20
-+DrvGetProcAddress@4
-+DrvPresentBuffers@8
-+DrvRealizeLayerPalette@12
-+DrvReleaseContext@4
-+DrvSetCallbackProcs@8
-+DrvSetContext@12
-+DrvSetLayerPaletteEntries@20
-+DrvSetPixelFormat@8
-+DrvShareLists@8
-+DrvSwapBuffers@4
-+DrvSwapLayerBuffers@8
-+DrvValidateVersion@4
-diff --git a/src/gallium/targets/libgl-gdi/opengl32.mingw.def b/src/gallium/targets/libgl-gdi/opengl32.mingw.def
-deleted file mode 100644
-index 485c9d44a877e59827d48cb967f30710f6f5749d..0000000000000000000000000000000000000000
---- a/src/gallium/targets/libgl-gdi/opengl32.mingw.def
-+++ /dev/null
-@@ -1,357 +0,0 @@
--EXPORTS
--	glAccum = glAccum@8
--	glAlphaFunc = glAlphaFunc@8
--	glAreTexturesResident = glAreTexturesResident@12
--	glArrayElement = glArrayElement@4
--	glBegin = glBegin@4
--	glBindTexture = glBindTexture@8
--	glBitmap = glBitmap@28
--	glBlendFunc = glBlendFunc@8
--	glCallList = glCallList@4
--	glCallLists = glCallLists@12
--	glClear = glClear@4
--	glClearAccum = glClearAccum@16
--	glClearColor = glClearColor@16
--	glClearDepth = glClearDepth@8
--	glClearIndex = glClearIndex@4
--	glClearStencil = glClearStencil@4
--	glClipPlane = glClipPlane@8
--	glColor3b = glColor3b@12
--	glColor3bv = glColor3bv@4
--	glColor3d = glColor3d@24
--	glColor3dv = glColor3dv@4
--	glColor3f = glColor3f@12
--	glColor3fv = glColor3fv@4
--	glColor3i = glColor3i@12
--	glColor3iv = glColor3iv@4
--	glColor3s = glColor3s@12
--	glColor3sv = glColor3sv@4
--	glColor3ub = glColor3ub@12
--	glColor3ubv = glColor3ubv@4
--	glColor3ui = glColor3ui@12
--	glColor3uiv = glColor3uiv@4
--	glColor3us = glColor3us@12
--	glColor3usv = glColor3usv@4
--	glColor4b = glColor4b@16
--	glColor4bv = glColor4bv@4
--	glColor4d = glColor4d@32
--	glColor4dv = glColor4dv@4
--	glColor4f = glColor4f@16
--	glColor4fv = glColor4fv@4
--	glColor4i = glColor4i@16
--	glColor4iv = glColor4iv@4
--	glColor4s = glColor4s@16
--	glColor4sv = glColor4sv@4
--	glColor4ub = glColor4ub@16
--	glColor4ubv = glColor4ubv@4
--	glColor4ui = glColor4ui@16
--	glColor4uiv = glColor4uiv@4
--	glColor4us = glColor4us@16
--	glColor4usv = glColor4usv@4
--	glColorMask = glColorMask@16
--	glColorMaterial = glColorMaterial@8
--	glColorPointer = glColorPointer@16
--	glCopyPixels = glCopyPixels@20
--	glCopyTexImage1D = glCopyTexImage1D@28
--	glCopyTexImage2D = glCopyTexImage2D@32
--	glCopyTexSubImage1D = glCopyTexSubImage1D@24
--	glCopyTexSubImage2D = glCopyTexSubImage2D@32
--	glCullFace = glCullFace@4
--;	glDebugEntry = glDebugEntry@8
--	glDeleteLists = glDeleteLists@8
--	glDeleteTextures = glDeleteTextures@8
--	glDepthFunc = glDepthFunc@4
--	glDepthMask = glDepthMask@4
--	glDepthRange = glDepthRange@16
--	glDisable = glDisable@4
--	glDisableClientState = glDisableClientState@4
--	glDrawArrays = glDrawArrays@12
--	glDrawBuffer = glDrawBuffer@4
--	glDrawElements = glDrawElements@16
--	glDrawPixels = glDrawPixels@20
--	glEdgeFlag = glEdgeFlag@4
--	glEdgeFlagPointer = glEdgeFlagPointer@8
--	glEdgeFlagv = glEdgeFlagv@4
--	glEnable = glEnable@4
--	glEnableClientState = glEnableClientState@4
--	glEnd = glEnd@0
--	glEndList = glEndList@0
--	glEvalCoord1d = glEvalCoord1d@8
--	glEvalCoord1dv = glEvalCoord1dv@4
--	glEvalCoord1f = glEvalCoord1f@4
--	glEvalCoord1fv = glEvalCoord1fv@4
--	glEvalCoord2d = glEvalCoord2d@16
--	glEvalCoord2dv = glEvalCoord2dv@4
--	glEvalCoord2f = glEvalCoord2f@8
--	glEvalCoord2fv = glEvalCoord2fv@4
--	glEvalMesh1 = glEvalMesh1@12
--	glEvalMesh2 = glEvalMesh2@20
--	glEvalPoint1 = glEvalPoint1@4
--	glEvalPoint2 = glEvalPoint2@8
--	glFeedbackBuffer = glFeedbackBuffer@12
--	glFinish = glFinish@0
--	glFlush = glFlush@0
--	glFogf = glFogf@8
--	glFogfv = glFogfv@8
--	glFogi = glFogi@8
--	glFogiv = glFogiv@8
--	glFrontFace = glFrontFace@4
--	glFrustum = glFrustum@48
--	glGenLists = glGenLists@4
--	glGenTextures = glGenTextures@8
--	glGetBooleanv = glGetBooleanv@8
--	glGetClipPlane = glGetClipPlane@8
--	glGetDoublev = glGetDoublev@8
--	glGetError = glGetError@0
--	glGetFloatv = glGetFloatv@8
--	glGetIntegerv = glGetIntegerv@8
--	glGetLightfv = glGetLightfv@12
--	glGetLightiv = glGetLightiv@12
--	glGetMapdv = glGetMapdv@12
--	glGetMapfv = glGetMapfv@12
--	glGetMapiv = glGetMapiv@12
--	glGetMaterialfv = glGetMaterialfv@12
--	glGetMaterialiv = glGetMaterialiv@12
--	glGetPixelMapfv = glGetPixelMapfv@8
--	glGetPixelMapuiv = glGetPixelMapuiv@8
--	glGetPixelMapusv = glGetPixelMapusv@8
--	glGetPointerv = glGetPointerv@8
--	glGetPolygonStipple = glGetPolygonStipple@4
--	glGetString = glGetString@4
--	glGetTexEnvfv = glGetTexEnvfv@12
--	glGetTexEnviv = glGetTexEnviv@12
--	glGetTexGendv = glGetTexGendv@12
--	glGetTexGenfv = glGetTexGenfv@12
--	glGetTexGeniv = glGetTexGeniv@12
--	glGetTexImage = glGetTexImage@20
--	glGetTexLevelParameterfv = glGetTexLevelParameterfv@16
--	glGetTexLevelParameteriv = glGetTexLevelParameteriv@16
--	glGetTexParameterfv = glGetTexParameterfv@12
--	glGetTexParameteriv = glGetTexParameteriv@12
--	glHint = glHint@8
--	glIndexMask = glIndexMask@4
--	glIndexPointer = glIndexPointer@12
--	glIndexd = glIndexd@8
--	glIndexdv = glIndexdv@4
--	glIndexf = glIndexf@4
--	glIndexfv = glIndexfv@4
--	glIndexi = glIndexi@4
--	glIndexiv = glIndexiv@4
--	glIndexs = glIndexs@4
--	glIndexsv = glIndexsv@4
--	glIndexub = glIndexub@4
--	glIndexubv = glIndexubv@4
--	glInitNames = glInitNames@0
--	glInterleavedArrays = glInterleavedArrays@12
--	glIsEnabled = glIsEnabled@4
--	glIsList = glIsList@4
--	glIsTexture = glIsTexture@4
--	glLightModelf = glLightModelf@8
--	glLightModelfv = glLightModelfv@8
--	glLightModeli = glLightModeli@8
--	glLightModeliv = glLightModeliv@8
--	glLightf = glLightf@12
--	glLightfv = glLightfv@12
--	glLighti = glLighti@12
--	glLightiv = glLightiv@12
--	glLineStipple = glLineStipple@8
--	glLineWidth = glLineWidth@4
--	glListBase = glListBase@4
--	glLoadIdentity = glLoadIdentity@0
--	glLoadMatrixd = glLoadMatrixd@4
--	glLoadMatrixf = glLoadMatrixf@4
--	glLoadName = glLoadName@4
--	glLogicOp = glLogicOp@4
--	glMap1d = glMap1d@32
--	glMap1f = glMap1f@24
--	glMap2d = glMap2d@56
--	glMap2f = glMap2f@40
--	glMapGrid1d = glMapGrid1d@20
--	glMapGrid1f = glMapGrid1f@12
--	glMapGrid2d = glMapGrid2d@40
--	glMapGrid2f = glMapGrid2f@24
--	glMaterialf = glMaterialf@12
--	glMaterialfv = glMaterialfv@12
--	glMateriali = glMateriali@12
--	glMaterialiv = glMaterialiv@12
--	glMatrixMode = glMatrixMode@4
--	glMultMatrixd = glMultMatrixd@4
--	glMultMatrixf = glMultMatrixf@4
--	glNewList = glNewList@8
--	glNormal3b = glNormal3b@12
--	glNormal3bv = glNormal3bv@4
--	glNormal3d = glNormal3d@24
--	glNormal3dv = glNormal3dv@4
--	glNormal3f = glNormal3f@12
--	glNormal3fv = glNormal3fv@4
--	glNormal3i = glNormal3i@12
--	glNormal3iv = glNormal3iv@4
--	glNormal3s = glNormal3s@12
--	glNormal3sv = glNormal3sv@4
--	glNormalPointer = glNormalPointer@12
--	glOrtho = glOrtho@48
--	glPassThrough = glPassThrough@4
--	glPixelMapfv = glPixelMapfv@12
--	glPixelMapuiv = glPixelMapuiv@12
--	glPixelMapusv = glPixelMapusv@12
--	glPixelStoref = glPixelStoref@8
--	glPixelStorei = glPixelStorei@8
--	glPixelTransferf = glPixelTransferf@8
--	glPixelTransferi = glPixelTransferi@8
--	glPixelZoom = glPixelZoom@8
--	glPointSize = glPointSize@4
--	glPolygonMode = glPolygonMode@8
--	glPolygonOffset = glPolygonOffset@8
--	glPolygonStipple = glPolygonStipple@4
--	glPopAttrib = glPopAttrib@0
--	glPopClientAttrib = glPopClientAttrib@0
--	glPopMatrix = glPopMatrix@0
--	glPopName = glPopName@0
--	glPrioritizeTextures = glPrioritizeTextures@12
--	glPushAttrib = glPushAttrib@4
--	glPushClientAttrib = glPushClientAttrib@4
--	glPushMatrix = glPushMatrix@0
--	glPushName = glPushName@4
--	glRasterPos2d = glRasterPos2d@16
--	glRasterPos2dv = glRasterPos2dv@4
--	glRasterPos2f = glRasterPos2f@8
--	glRasterPos2fv = glRasterPos2fv@4
--	glRasterPos2i = glRasterPos2i@8
--	glRasterPos2iv = glRasterPos2iv@4
--	glRasterPos2s = glRasterPos2s@8
--	glRasterPos2sv = glRasterPos2sv@4
--	glRasterPos3d = glRasterPos3d@24
--	glRasterPos3dv = glRasterPos3dv@4
--	glRasterPos3f = glRasterPos3f@12
--	glRasterPos3fv = glRasterPos3fv@4
--	glRasterPos3i = glRasterPos3i@12
--	glRasterPos3iv = glRasterPos3iv@4
--	glRasterPos3s = glRasterPos3s@12
--	glRasterPos3sv = glRasterPos3sv@4
--	glRasterPos4d = glRasterPos4d@32
--	glRasterPos4dv = glRasterPos4dv@4
--	glRasterPos4f = glRasterPos4f@16
--	glRasterPos4fv = glRasterPos4fv@4
--	glRasterPos4i = glRasterPos4i@16
--	glRasterPos4iv = glRasterPos4iv@4
--	glRasterPos4s = glRasterPos4s@16
--	glRasterPos4sv = glRasterPos4sv@4
--	glReadBuffer = glReadBuffer@4
--	glReadPixels = glReadPixels@28
--	glRectd = glRectd@32
--	glRectdv = glRectdv@8
--	glRectf = glRectf@16
--	glRectfv = glRectfv@8
--	glRecti = glRecti@16
--	glRectiv = glRectiv@8
--	glRects = glRects@16
--	glRectsv = glRectsv@8
--	glRenderMode = glRenderMode@4
--	glRotated = glRotated@32
--	glRotatef = glRotatef@16
--	glScaled = glScaled@24
--	glScalef = glScalef@12
--	glScissor = glScissor@16
--	glSelectBuffer = glSelectBuffer@8
--	glShadeModel = glShadeModel@4
--	glStencilFunc = glStencilFunc@12
--	glStencilMask = glStencilMask@4
--	glStencilOp = glStencilOp@12
--	glTexCoord1d = glTexCoord1d@8
--	glTexCoord1dv = glTexCoord1dv@4
--	glTexCoord1f = glTexCoord1f@4
--	glTexCoord1fv = glTexCoord1fv@4
--	glTexCoord1i = glTexCoord1i@4
--	glTexCoord1iv = glTexCoord1iv@4
--	glTexCoord1s = glTexCoord1s@4
--	glTexCoord1sv = glTexCoord1sv@4
--	glTexCoord2d = glTexCoord2d@16
--	glTexCoord2dv = glTexCoord2dv@4
--	glTexCoord2f = glTexCoord2f@8
--	glTexCoord2fv = glTexCoord2fv@4
--	glTexCoord2i = glTexCoord2i@8
--	glTexCoord2iv = glTexCoord2iv@4
--	glTexCoord2s = glTexCoord2s@8
--	glTexCoord2sv = glTexCoord2sv@4
--	glTexCoord3d = glTexCoord3d@24
--	glTexCoord3dv = glTexCoord3dv@4
--	glTexCoord3f = glTexCoord3f@12
--	glTexCoord3fv = glTexCoord3fv@4
--	glTexCoord3i = glTexCoord3i@12
--	glTexCoord3iv = glTexCoord3iv@4
--	glTexCoord3s = glTexCoord3s@12
--	glTexCoord3sv = glTexCoord3sv@4
--	glTexCoord4d = glTexCoord4d@32
--	glTexCoord4dv = glTexCoord4dv@4
--	glTexCoord4f = glTexCoord4f@16
--	glTexCoord4fv = glTexCoord4fv@4
--	glTexCoord4i = glTexCoord4i@16
--	glTexCoord4iv = glTexCoord4iv@4
--	glTexCoord4s = glTexCoord4s@16
--	glTexCoord4sv = glTexCoord4sv@4
--	glTexCoordPointer = glTexCoordPointer@16
--	glTexEnvf = glTexEnvf@12
--	glTexEnvfv = glTexEnvfv@12
--	glTexEnvi = glTexEnvi@12
--	glTexEnviv = glTexEnviv@12
--	glTexGend = glTexGend@16
--	glTexGendv = glTexGendv@12
--	glTexGenf = glTexGenf@12
--	glTexGenfv = glTexGenfv@12
--	glTexGeni = glTexGeni@12
--	glTexGeniv = glTexGeniv@12
--	glTexImage1D = glTexImage1D@32
--	glTexImage2D = glTexImage2D@36
--	glTexParameterf = glTexParameterf@12
--	glTexParameterfv = glTexParameterfv@12
--	glTexParameteri = glTexParameteri@12
--	glTexParameteriv = glTexParameteriv@12
--	glTexSubImage1D = glTexSubImage1D@28
--	glTexSubImage2D = glTexSubImage2D@36
--	glTranslated = glTranslated@24
--	glTranslatef = glTranslatef@12
--	glVertex2d = glVertex2d@16
--	glVertex2dv = glVertex2dv@4
--	glVertex2f = glVertex2f@8
--	glVertex2fv = glVertex2fv@4
--	glVertex2i = glVertex2i@8
--	glVertex2iv = glVertex2iv@4
--	glVertex2s = glVertex2s@8
--	glVertex2sv = glVertex2sv@4
--	glVertex3d = glVertex3d@24
--	glVertex3dv = glVertex3dv@4
--	glVertex3f = glVertex3f@12
--	glVertex3fv = glVertex3fv@4
--	glVertex3i = glVertex3i@12
--	glVertex3iv = glVertex3iv@4
--	glVertex3s = glVertex3s@12
--	glVertex3sv = glVertex3sv@4
--	glVertex4d = glVertex4d@32
--	glVertex4dv = glVertex4dv@4
--	glVertex4f = glVertex4f@16
--	glVertex4fv = glVertex4fv@4
--	glVertex4i = glVertex4i@16
--	glVertex4iv = glVertex4iv@4
--	glVertex4s = glVertex4s@16
--	glVertex4sv = glVertex4sv@4
--	glVertexPointer = glVertexPointer@16
--	glViewport = glViewport@16
--	DrvCopyContext
--	DrvCreateContext
--	DrvCreateLayerContext
--	DrvDeleteContext
--	DrvDescribeLayerPlane
--	DrvDescribePixelFormat
--	DrvGetLayerPaletteEntries
--	DrvGetProcAddress
--	DrvPresentBuffers
--	DrvRealizeLayerPalette
--	DrvReleaseContext
--	DrvSetCallbackProcs
--	DrvSetContext
--	DrvSetLayerPaletteEntries
--	DrvSetPixelFormat
--	DrvShareLists
--	DrvSwapBuffers
--	DrvSwapLayerBuffers
--	DrvValidateVersion
-diff --git a/src/gallium/targets/osmesa/meson.build b/src/gallium/targets/osmesa/meson.build
-index 38fcaca13b9513d7d69122f3f3734330697695f4..97a9fd954ac61fb6945217e193eb9f1eaab5c590 100644
---- a/src/gallium/targets/osmesa/meson.build
-+++ b/src/gallium/targets/osmesa/meson.build
-@@ -32,11 +32,14 @@ if with_ld_version_script
-   osmesa_link_deps += files('osmesa.sym')
- endif
- 
--if cc.get_id() == 'gcc' and host_machine.cpu_family() != 'x86_64'
--  osmesa_def = 'osmesa.mingw.def'
--else
--  osmesa_def = 'osmesa.def'
--endif
-+osmesa_def = custom_target(
-+  'osmesa.def',
-+  input: 'osmesa.def.in',
-+  output : 'osmesa.def',
-+  command : [prog_python, gen_vs_module_defs_py,
-+             '--in_file', '@INPUT@', '--out_file', '@OUTPUT@',
-+             '--compiler_id', cc.get_id(), '--cpu_family', host_machine.cpu_family()]
-+)
- 
- libosmesa = shared_library(
-   osmesa_lib_name,
-diff --git a/src/gallium/targets/osmesa/osmesa.def b/src/gallium/targets/osmesa/osmesa.def
-deleted file mode 100644
-index f6d09b81ef8c42463f8b3a67ac0ced2525b0599a..0000000000000000000000000000000000000000
---- a/src/gallium/targets/osmesa/osmesa.def
-+++ /dev/null
-@@ -1,354 +0,0 @@
--;DESCRIPTION 'Mesa OSMesa lib for Win32'
--VERSION 4.1
--
--EXPORTS
--	OSMesaCreateContext
--	OSMesaCreateContextAttribs
--	OSMesaCreateContextExt
--	OSMesaDestroyContext
--	OSMesaMakeCurrent
--	OSMesaGetCurrentContext
--	OSMesaPixelStore
--	OSMesaGetIntegerv
--	OSMesaGetDepthBuffer
--	OSMesaGetColorBuffer
--	OSMesaGetProcAddress
--	OSMesaColorClamp
--	OSMesaPostprocess
--	glAccum
--	glAlphaFunc
--	glAreTexturesResident
--	glArrayElement
--	glBegin
--	glBindTexture
--	glBitmap
--	glBlendFunc
--	glCallList
--	glCallLists
--	glClear
--	glClearAccum
--	glClearColor
--	glClearDepth
--	glClearIndex
--	glClearStencil
--	glClipPlane
--	glColor3b
--	glColor3bv
--	glColor3d
--	glColor3dv
--	glColor3f
--	glColor3fv
--	glColor3i
--	glColor3iv
--	glColor3s
--	glColor3sv
--	glColor3ub
--	glColor3ubv
--	glColor3ui
--	glColor3uiv
--	glColor3us
--	glColor3usv
--	glColor4b
--	glColor4bv
--	glColor4d
--	glColor4dv
--	glColor4f
--	glColor4fv
--	glColor4i
--	glColor4iv
--	glColor4s
--	glColor4sv
--	glColor4ub
--	glColor4ubv
--	glColor4ui
--	glColor4uiv
--	glColor4us
--	glColor4usv
--	glColorMask
--	glColorMaterial
--	glColorPointer
--	glCopyPixels
--	glCopyTexImage1D
--	glCopyTexImage2D
--	glCopyTexSubImage1D
--	glCopyTexSubImage2D
--	glCullFace
--;	glDebugEntry
--	glDeleteLists
--	glDeleteTextures
--	glDepthFunc
--	glDepthMask
--	glDepthRange
--	glDisable
--	glDisableClientState
--	glDrawArrays
--	glDrawBuffer
--	glDrawElements
--	glDrawPixels
--	glEdgeFlag
--	glEdgeFlagPointer
--	glEdgeFlagv
--	glEnable
--	glEnableClientState
--	glEnd
--	glEndList
--	glEvalCoord1d
--	glEvalCoord1dv
--	glEvalCoord1f
--	glEvalCoord1fv
--	glEvalCoord2d
--	glEvalCoord2dv
--	glEvalCoord2f
--	glEvalCoord2fv
--	glEvalMesh1
--	glEvalMesh2
--	glEvalPoint1
--	glEvalPoint2
--	glFeedbackBuffer
--	glFinish
--	glFlush
--	glFogf
--	glFogfv
--	glFogi
--	glFogiv
--	glFrontFace
--	glFrustum
--	glGenLists
--	glGenTextures
--	glGetBooleanv
--	glGetClipPlane
--	glGetDoublev
--	glGetError
--	glGetFloatv
--	glGetIntegerv
--	glGetLightfv
--	glGetLightiv
--	glGetMapdv
--	glGetMapfv
--	glGetMapiv
--	glGetMaterialfv
--	glGetMaterialiv
--	glGetPixelMapfv
--	glGetPixelMapuiv
--	glGetPixelMapusv
--	glGetPointerv
--	glGetPolygonStipple
--	glGetString
--	glGetTexEnvfv
--	glGetTexEnviv
--	glGetTexGendv
--	glGetTexGenfv
--	glGetTexGeniv
--	glGetTexImage
--	glGetTexLevelParameterfv
--	glGetTexLevelParameteriv
--	glGetTexParameterfv
--	glGetTexParameteriv
--	glHint
--	glIndexMask
--	glIndexPointer
--	glIndexd
--	glIndexdv
--	glIndexf
--	glIndexfv
--	glIndexi
--	glIndexiv
--	glIndexs
--	glIndexsv
--	glIndexub
--	glIndexubv
--	glInitNames
--	glInterleavedArrays
--	glIsEnabled
--	glIsList
--	glIsTexture
--	glLightModelf
--	glLightModelfv
--	glLightModeli
--	glLightModeliv
--	glLightf
--	glLightfv
--	glLighti
--	glLightiv
--	glLineStipple
--	glLineWidth
--	glListBase
--	glLoadIdentity
--	glLoadMatrixd
--	glLoadMatrixf
--	glLoadName
--	glLogicOp
--	glMap1d
--	glMap1f
--	glMap2d
--	glMap2f
--	glMapGrid1d
--	glMapGrid1f
--	glMapGrid2d
--	glMapGrid2f
--	glMaterialf
--	glMaterialfv
--	glMateriali
--	glMaterialiv
--	glMatrixMode
--	glMultMatrixd
--	glMultMatrixf
--	glNewList
--	glNormal3b
--	glNormal3bv
--	glNormal3d
--	glNormal3dv
--	glNormal3f
--	glNormal3fv
--	glNormal3i
--	glNormal3iv
--	glNormal3s
--	glNormal3sv
--	glNormalPointer
--	glOrtho
--	glPassThrough
--	glPixelMapfv
--	glPixelMapuiv
--	glPixelMapusv
--	glPixelStoref
--	glPixelStorei
--	glPixelTransferf
--	glPixelTransferi
--	glPixelZoom
--	glPointSize
--	glPolygonMode
--	glPolygonOffset
--	glPolygonStipple
--	glPopAttrib
--	glPopClientAttrib
--	glPopMatrix
--	glPopName
--	glPrioritizeTextures
--	glPushAttrib
--	glPushClientAttrib
--	glPushMatrix
--	glPushName
--	glRasterPos2d
--	glRasterPos2dv
--	glRasterPos2f
--	glRasterPos2fv
--	glRasterPos2i
--	glRasterPos2iv
--	glRasterPos2s
--	glRasterPos2sv
--	glRasterPos3d
--	glRasterPos3dv
--	glRasterPos3f
--	glRasterPos3fv
--	glRasterPos3i
--	glRasterPos3iv
--	glRasterPos3s
--	glRasterPos3sv
--	glRasterPos4d
--	glRasterPos4dv
--	glRasterPos4f
--	glRasterPos4fv
--	glRasterPos4i
--	glRasterPos4iv
--	glRasterPos4s
--	glRasterPos4sv
--	glReadBuffer
--	glReadPixels
--	glRectd
--	glRectdv
--	glRectf
--	glRectfv
--	glRecti
--	glRectiv
--	glRects
--	glRectsv
--	glRenderMode
--	glRotated
--	glRotatef
--	glScaled
--	glScalef
--	glScissor
--	glSelectBuffer
--	glShadeModel
--	glStencilFunc
--	glStencilMask
--	glStencilOp
--	glTexCoord1d
--	glTexCoord1dv
--	glTexCoord1f
--	glTexCoord1fv
--	glTexCoord1i
--	glTexCoord1iv
--	glTexCoord1s
--	glTexCoord1sv
--	glTexCoord2d
--	glTexCoord2dv
--	glTexCoord2f
--	glTexCoord2fv
--	glTexCoord2i
--	glTexCoord2iv
--	glTexCoord2s
--	glTexCoord2sv
--	glTexCoord3d
--	glTexCoord3dv
--	glTexCoord3f
--	glTexCoord3fv
--	glTexCoord3i
--	glTexCoord3iv
--	glTexCoord3s
--	glTexCoord3sv
--	glTexCoord4d
--	glTexCoord4dv
--	glTexCoord4f
--	glTexCoord4fv
--	glTexCoord4i
--	glTexCoord4iv
--	glTexCoord4s
--	glTexCoord4sv
--	glTexCoordPointer
--	glTexEnvf
--	glTexEnvfv
--	glTexEnvi
--	glTexEnviv
--	glTexGend
--	glTexGendv
--	glTexGenf
--	glTexGenfv
--	glTexGeni
--	glTexGeniv
--	glTexImage1D
--	glTexImage2D
--	glTexParameterf
--	glTexParameterfv
--	glTexParameteri
--	glTexParameteriv
--	glTexSubImage1D
--	glTexSubImage2D
--	glTranslated
--	glTranslatef
--	glVertex2d
--	glVertex2dv
--	glVertex2f
--	glVertex2fv
--	glVertex2i
--	glVertex2iv
--	glVertex2s
--	glVertex2sv
--	glVertex3d
--	glVertex3dv
--	glVertex3f
--	glVertex3fv
--	glVertex3i
--	glVertex3iv
--	glVertex3s
--	glVertex3sv
--	glVertex4d
--	glVertex4dv
--	glVertex4f
--	glVertex4fv
--	glVertex4i
--	glVertex4iv
--	glVertex4s
--	glVertex4sv
--	glVertexPointer
--	glViewport
-diff --git a/src/gallium/targets/osmesa/osmesa.def.in b/src/gallium/targets/osmesa/osmesa.def.in
-new file mode 100644
-index 0000000000000000000000000000000000000000..d60457797963451ff3fd4f13690d1bab971bc5b3
---- /dev/null
-+++ b/src/gallium/targets/osmesa/osmesa.def.in
-@@ -0,0 +1,353 @@
-+; Mesa OSMesa lib for Win32
-+
-+; stdcall calling convention have @number suffix on 32 bits architecture for gcc
-+OSMesaCreateContext@8
-+OSMesaCreateContextAttribs@8
-+OSMesaCreateContextExt@20
-+OSMesaDestroyContext@4
-+OSMesaMakeCurrent@20
-+OSMesaGetCurrentContext@0
-+OSMesaPixelStore@8
-+OSMesaGetIntegerv@8
-+OSMesaGetDepthBuffer@20
-+OSMesaGetColorBuffer@20
-+OSMesaGetProcAddress@4
-+OSMesaColorClamp@4
-+OSMesaPostprocess@12
-+glAccum@8
-+glAlphaFunc@8
-+glAreTexturesResident@12
-+glArrayElement@4
-+glBegin@4
-+glBindTexture@8
-+glBitmap@28
-+glBlendFunc@8
-+glCallList@4
-+glCallLists@12
-+glClear@4
-+glClearAccum@16
-+glClearColor@16
-+glClearDepth@8
-+glClearIndex@4
-+glClearStencil@4
-+glClipPlane@8
-+glColor3b@12
-+glColor3bv@4
-+glColor3d@24
-+glColor3dv@4
-+glColor3f@12
-+glColor3fv@4
-+glColor3i@12
-+glColor3iv@4
-+glColor3s@12
-+glColor3sv@4
-+glColor3ub@12
-+glColor3ubv@4
-+glColor3ui@12
-+glColor3uiv@4
-+glColor3us@12
-+glColor3usv@4
-+glColor4b@16
-+glColor4bv@4
-+glColor4d@32
-+glColor4dv@4
-+glColor4f@16
-+glColor4fv@4
-+glColor4i@16
-+glColor4iv@4
-+glColor4s@16
-+glColor4sv@4
-+glColor4ub@16
-+glColor4ubv@4
-+glColor4ui@16
-+glColor4uiv@4
-+glColor4us@16
-+glColor4usv@4
-+glColorMask@16
-+glColorMaterial@8
-+glColorPointer@16
-+glCopyPixels@20
-+glCopyTexImage1D@28
-+glCopyTexImage2D@32
-+glCopyTexSubImage1D@24
-+glCopyTexSubImage2D@32
-+glCullFace@4
-+;glDebugEntry@8
-+glDeleteLists@8
-+glDeleteTextures@8
-+glDepthFunc@4
-+glDepthMask@4
-+glDepthRange@16
-+glDisable@4
-+glDisableClientState@4
-+glDrawArrays@12
-+glDrawBuffer@4
-+glDrawElements@16
-+glDrawPixels@20
-+glEdgeFlag@4
-+glEdgeFlagPointer@8
-+glEdgeFlagv@4
-+glEnable@4
-+glEnableClientState@4
-+glEnd@0
-+glEndList@0
-+glEvalCoord1d@8
-+glEvalCoord1dv@4
-+glEvalCoord1f@4
-+glEvalCoord1fv@4
-+glEvalCoord2d@16
-+glEvalCoord2dv@4
-+glEvalCoord2f@8
-+glEvalCoord2fv@4
-+glEvalMesh1@12
-+glEvalMesh2@20
-+glEvalPoint1@4
-+glEvalPoint2@8
-+glFeedbackBuffer@12
-+glFinish@0
-+glFlush@0
-+glFogf@8
-+glFogfv@8
-+glFogi@8
-+glFogiv@8
-+glFrontFace@4
-+glFrustum@48
-+glGenLists@4
-+glGenTextures@8
-+glGetBooleanv@8
-+glGetClipPlane@8
-+glGetDoublev@8
-+glGetError@0
-+glGetFloatv@8
-+glGetIntegerv@8
-+glGetLightfv@12
-+glGetLightiv@12
-+glGetMapdv@12
-+glGetMapfv@12
-+glGetMapiv@12
-+glGetMaterialfv@12
-+glGetMaterialiv@12
-+glGetPixelMapfv@8
-+glGetPixelMapuiv@8
-+glGetPixelMapusv@8
-+glGetPointerv@8
-+glGetPolygonStipple@4
-+glGetString@4
-+glGetTexEnvfv@12
-+glGetTexEnviv@12
-+glGetTexGendv@12
-+glGetTexGenfv@12
-+glGetTexGeniv@12
-+glGetTexImage@20
-+glGetTexLevelParameterfv@16
-+glGetTexLevelParameteriv@16
-+glGetTexParameterfv@12
-+glGetTexParameteriv@12
-+glHint@8
-+glIndexMask@4
-+glIndexPointer@12
-+glIndexd@8
-+glIndexdv@4
-+glIndexf@4
-+glIndexfv@4
-+glIndexi@4
-+glIndexiv@4
-+glIndexs@4
-+glIndexsv@4
-+glIndexub@4
-+glIndexubv@4
-+glInitNames@0
-+glInterleavedArrays@12
-+glIsEnabled@4
-+glIsList@4
-+glIsTexture@4
-+glLightModelf@8
-+glLightModelfv@8
-+glLightModeli@8
-+glLightModeliv@8
-+glLightf@12
-+glLightfv@12
-+glLighti@12
-+glLightiv@12
-+glLineStipple@8
-+glLineWidth@4
-+glListBase@4
-+glLoadIdentity@0
-+glLoadMatrixd@4
-+glLoadMatrixf@4
-+glLoadName@4
-+glLogicOp@4
-+glMap1d@32
-+glMap1f@24
-+glMap2d@56
-+glMap2f@40
-+glMapGrid1d@20
-+glMapGrid1f@12
-+glMapGrid2d@40
-+glMapGrid2f@24
-+glMaterialf@12
-+glMaterialfv@12
-+glMateriali@12
-+glMaterialiv@12
-+glMatrixMode@4
-+glMultMatrixd@4
-+glMultMatrixf@4
-+glNewList@8
-+glNormal3b@12
-+glNormal3bv@4
-+glNormal3d@24
-+glNormal3dv@4
-+glNormal3f@12
-+glNormal3fv@4
-+glNormal3i@12
-+glNormal3iv@4
-+glNormal3s@12
-+glNormal3sv@4
-+glNormalPointer@12
-+glOrtho@48
-+glPassThrough@4
-+glPixelMapfv@12
-+glPixelMapuiv@12
-+glPixelMapusv@12
-+glPixelStoref@8
-+glPixelStorei@8
-+glPixelTransferf@8
-+glPixelTransferi@8
-+glPixelZoom@8
-+glPointSize@4
-+glPolygonMode@8
-+glPolygonOffset@8
-+glPolygonStipple@4
-+glPopAttrib@0
-+glPopClientAttrib@0
-+glPopMatrix@0
-+glPopName@0
-+glPrioritizeTextures@12
-+glPushAttrib@4
-+glPushClientAttrib@4
-+glPushMatrix@0
-+glPushName@4
-+glRasterPos2d@16
-+glRasterPos2dv@4
-+glRasterPos2f@8
-+glRasterPos2fv@4
-+glRasterPos2i@8
-+glRasterPos2iv@4
-+glRasterPos2s@8
-+glRasterPos2sv@4
-+glRasterPos3d@24
-+glRasterPos3dv@4
-+glRasterPos3f@12
-+glRasterPos3fv@4
-+glRasterPos3i@12
-+glRasterPos3iv@4
-+glRasterPos3s@12
-+glRasterPos3sv@4
-+glRasterPos4d@32
-+glRasterPos4dv@4
-+glRasterPos4f@16
-+glRasterPos4fv@4
-+glRasterPos4i@16
-+glRasterPos4iv@4
-+glRasterPos4s@16
-+glRasterPos4sv@4
-+glReadBuffer@4
-+glReadPixels@28
-+glRectd@32
-+glRectdv@8
-+glRectf@16
-+glRectfv@8
-+glRecti@16
-+glRectiv@8
-+glRects@16
-+glRectsv@8
-+glRenderMode@4
-+glRotated@32
-+glRotatef@16
-+glScaled@24
-+glScalef@12
-+glScissor@16
-+glSelectBuffer@8
-+glShadeModel@4
-+glStencilFunc@12
-+glStencilMask@4
-+glStencilOp@12
-+glTexCoord1d@8
-+glTexCoord1dv@4
-+glTexCoord1f@4
-+glTexCoord1fv@4
-+glTexCoord1i@4
-+glTexCoord1iv@4
-+glTexCoord1s@4
-+glTexCoord1sv@4
-+glTexCoord2d@16
-+glTexCoord2dv@4
-+glTexCoord2f@8
-+glTexCoord2fv@4
-+glTexCoord2i@8
-+glTexCoord2iv@4
-+glTexCoord2s@8
-+glTexCoord2sv@4
-+glTexCoord3d@24
-+glTexCoord3dv@4
-+glTexCoord3f@12
-+glTexCoord3fv@4
-+glTexCoord3i@12
-+glTexCoord3iv@4
-+glTexCoord3s@12
-+glTexCoord3sv@4
-+glTexCoord4d@32
-+glTexCoord4dv@4
-+glTexCoord4f@16
-+glTexCoord4fv@4
-+glTexCoord4i@16
-+glTexCoord4iv@4
-+glTexCoord4s@16
-+glTexCoord4sv@4
-+glTexCoordPointer@16
-+glTexEnvf@12
-+glTexEnvfv@12
-+glTexEnvi@12
-+glTexEnviv@12
-+glTexGend@16
-+glTexGendv@12
-+glTexGenf@12
-+glTexGenfv@12
-+glTexGeni@12
-+glTexGeniv@12
-+glTexImage1D@32
-+glTexImage2D@36
-+glTexParameterf@12
-+glTexParameterfv@12
-+glTexParameteri@12
-+glTexParameteriv@12
-+glTexSubImage1D@28
-+glTexSubImage2D@36
-+glTranslated@24
-+glTranslatef@12
-+glVertex2d@16
-+glVertex2dv@4
-+glVertex2f@8
-+glVertex2fv@4
-+glVertex2i@8
-+glVertex2iv@4
-+glVertex2s@8
-+glVertex2sv@4
-+glVertex3d@24
-+glVertex3dv@4
-+glVertex3f@12
-+glVertex3fv@4
-+glVertex3i@12
-+glVertex3iv@4
-+glVertex3s@12
-+glVertex3sv@4
-+glVertex4d@32
-+glVertex4dv@4
-+glVertex4f@16
-+glVertex4fv@4
-+glVertex4i@16
-+glVertex4iv@4
-+glVertex4s@16
-+glVertex4sv@4
-+glVertexPointer@16
-+glViewport@16
-diff --git a/src/gallium/targets/osmesa/osmesa.mingw.def b/src/gallium/targets/osmesa/osmesa.mingw.def
-deleted file mode 100644
-index b77af60a93f2fcf9c73262993d6d204563e3eeae..0000000000000000000000000000000000000000
---- a/src/gallium/targets/osmesa/osmesa.mingw.def
-+++ /dev/null
-@@ -1,351 +0,0 @@
--EXPORTS
--	OSMesaCreateContext = OSMesaCreateContext@8
--	OSMesaCreateContextAttribs = OSMesaCreateContextAttribs@8
--	OSMesaCreateContextExt = OSMesaCreateContextExt@20
--	OSMesaDestroyContext = OSMesaDestroyContext@4
--	OSMesaMakeCurrent = OSMesaMakeCurrent@20
--	OSMesaGetCurrentContext = OSMesaGetCurrentContext@0
--	OSMesaPixelStore = OSMesaPixelStore@8
--	OSMesaGetIntegerv = OSMesaGetIntegerv@8
--	OSMesaGetDepthBuffer = OSMesaGetDepthBuffer@20
--	OSMesaGetColorBuffer = OSMesaGetColorBuffer@20
--	OSMesaGetProcAddress = OSMesaGetProcAddress@4
--	OSMesaColorClamp = OSMesaColorClamp@4
--	OSMesaPostprocess = OSMesaPostprocess@12
--	glAccum = glAccum@8
--	glAlphaFunc = glAlphaFunc@8
--	glAreTexturesResident = glAreTexturesResident@12
--	glArrayElement = glArrayElement@4
--	glBegin = glBegin@4
--	glBindTexture = glBindTexture@8
--	glBitmap = glBitmap@28
--	glBlendFunc = glBlendFunc@8
--	glCallList = glCallList@4
--	glCallLists = glCallLists@12
--	glClear = glClear@4
--	glClearAccum = glClearAccum@16
--	glClearColor = glClearColor@16
--	glClearDepth = glClearDepth@8
--	glClearIndex = glClearIndex@4
--	glClearStencil = glClearStencil@4
--	glClipPlane = glClipPlane@8
--	glColor3b = glColor3b@12
--	glColor3bv = glColor3bv@4
--	glColor3d = glColor3d@24
--	glColor3dv = glColor3dv@4
--	glColor3f = glColor3f@12
--	glColor3fv = glColor3fv@4
--	glColor3i = glColor3i@12
--	glColor3iv = glColor3iv@4
--	glColor3s = glColor3s@12
--	glColor3sv = glColor3sv@4
--	glColor3ub = glColor3ub@12
--	glColor3ubv = glColor3ubv@4
--	glColor3ui = glColor3ui@12
--	glColor3uiv = glColor3uiv@4
--	glColor3us = glColor3us@12
--	glColor3usv = glColor3usv@4
--	glColor4b = glColor4b@16
--	glColor4bv = glColor4bv@4
--	glColor4d = glColor4d@32
--	glColor4dv = glColor4dv@4
--	glColor4f = glColor4f@16
--	glColor4fv = glColor4fv@4
--	glColor4i = glColor4i@16
--	glColor4iv = glColor4iv@4
--	glColor4s = glColor4s@16
--	glColor4sv = glColor4sv@4
--	glColor4ub = glColor4ub@16
--	glColor4ubv = glColor4ubv@4
--	glColor4ui = glColor4ui@16
--	glColor4uiv = glColor4uiv@4
--	glColor4us = glColor4us@16
--	glColor4usv = glColor4usv@4
--	glColorMask = glColorMask@16
--	glColorMaterial = glColorMaterial@8
--	glColorPointer = glColorPointer@16
--	glCopyPixels = glCopyPixels@20
--	glCopyTexImage1D = glCopyTexImage1D@28
--	glCopyTexImage2D = glCopyTexImage2D@32
--	glCopyTexSubImage1D = glCopyTexSubImage1D@24
--	glCopyTexSubImage2D = glCopyTexSubImage2D@32
--	glCullFace = glCullFace@4
--;	glDebugEntry = glDebugEntry@8
--	glDeleteLists = glDeleteLists@8
--	glDeleteTextures = glDeleteTextures@8
--	glDepthFunc = glDepthFunc@4
--	glDepthMask = glDepthMask@4
--	glDepthRange = glDepthRange@16
--	glDisable = glDisable@4
--	glDisableClientState = glDisableClientState@4
--	glDrawArrays = glDrawArrays@12
--	glDrawBuffer = glDrawBuffer@4
--	glDrawElements = glDrawElements@16
--	glDrawPixels = glDrawPixels@20
--	glEdgeFlag = glEdgeFlag@4
--	glEdgeFlagPointer = glEdgeFlagPointer@8
--	glEdgeFlagv = glEdgeFlagv@4
--	glEnable = glEnable@4
--	glEnableClientState = glEnableClientState@4
--	glEnd = glEnd@0
--	glEndList = glEndList@0
--	glEvalCoord1d = glEvalCoord1d@8
--	glEvalCoord1dv = glEvalCoord1dv@4
--	glEvalCoord1f = glEvalCoord1f@4
--	glEvalCoord1fv = glEvalCoord1fv@4
--	glEvalCoord2d = glEvalCoord2d@16
--	glEvalCoord2dv = glEvalCoord2dv@4
--	glEvalCoord2f = glEvalCoord2f@8
--	glEvalCoord2fv = glEvalCoord2fv@4
--	glEvalMesh1 = glEvalMesh1@12
--	glEvalMesh2 = glEvalMesh2@20
--	glEvalPoint1 = glEvalPoint1@4
--	glEvalPoint2 = glEvalPoint2@8
--	glFeedbackBuffer = glFeedbackBuffer@12
--	glFinish = glFinish@0
--	glFlush = glFlush@0
--	glFogf = glFogf@8
--	glFogfv = glFogfv@8
--	glFogi = glFogi@8
--	glFogiv = glFogiv@8
--	glFrontFace = glFrontFace@4
--	glFrustum = glFrustum@48
--	glGenLists = glGenLists@4
--	glGenTextures = glGenTextures@8
--	glGetBooleanv = glGetBooleanv@8
--	glGetClipPlane = glGetClipPlane@8
--	glGetDoublev = glGetDoublev@8
--	glGetError = glGetError@0
--	glGetFloatv = glGetFloatv@8
--	glGetIntegerv = glGetIntegerv@8
--	glGetLightfv = glGetLightfv@12
--	glGetLightiv = glGetLightiv@12
--	glGetMapdv = glGetMapdv@12
--	glGetMapfv = glGetMapfv@12
--	glGetMapiv = glGetMapiv@12
--	glGetMaterialfv = glGetMaterialfv@12
--	glGetMaterialiv = glGetMaterialiv@12
--	glGetPixelMapfv = glGetPixelMapfv@8
--	glGetPixelMapuiv = glGetPixelMapuiv@8
--	glGetPixelMapusv = glGetPixelMapusv@8
--	glGetPointerv = glGetPointerv@8
--	glGetPolygonStipple = glGetPolygonStipple@4
--	glGetString = glGetString@4
--	glGetTexEnvfv = glGetTexEnvfv@12
--	glGetTexEnviv = glGetTexEnviv@12
--	glGetTexGendv = glGetTexGendv@12
--	glGetTexGenfv = glGetTexGenfv@12
--	glGetTexGeniv = glGetTexGeniv@12
--	glGetTexImage = glGetTexImage@20
--	glGetTexLevelParameterfv = glGetTexLevelParameterfv@16
--	glGetTexLevelParameteriv = glGetTexLevelParameteriv@16
--	glGetTexParameterfv = glGetTexParameterfv@12
--	glGetTexParameteriv = glGetTexParameteriv@12
--	glHint = glHint@8
--	glIndexMask = glIndexMask@4
--	glIndexPointer = glIndexPointer@12
--	glIndexd = glIndexd@8
--	glIndexdv = glIndexdv@4
--	glIndexf = glIndexf@4
--	glIndexfv = glIndexfv@4
--	glIndexi = glIndexi@4
--	glIndexiv = glIndexiv@4
--	glIndexs = glIndexs@4
--	glIndexsv = glIndexsv@4
--	glIndexub = glIndexub@4
--	glIndexubv = glIndexubv@4
--	glInitNames = glInitNames@0
--	glInterleavedArrays = glInterleavedArrays@12
--	glIsEnabled = glIsEnabled@4
--	glIsList = glIsList@4
--	glIsTexture = glIsTexture@4
--	glLightModelf = glLightModelf@8
--	glLightModelfv = glLightModelfv@8
--	glLightModeli = glLightModeli@8
--	glLightModeliv = glLightModeliv@8
--	glLightf = glLightf@12
--	glLightfv = glLightfv@12
--	glLighti = glLighti@12
--	glLightiv = glLightiv@12
--	glLineStipple = glLineStipple@8
--	glLineWidth = glLineWidth@4
--	glListBase = glListBase@4
--	glLoadIdentity = glLoadIdentity@0
--	glLoadMatrixd = glLoadMatrixd@4
--	glLoadMatrixf = glLoadMatrixf@4
--	glLoadName = glLoadName@4
--	glLogicOp = glLogicOp@4
--	glMap1d = glMap1d@32
--	glMap1f = glMap1f@24
--	glMap2d = glMap2d@56
--	glMap2f = glMap2f@40
--	glMapGrid1d = glMapGrid1d@20
--	glMapGrid1f = glMapGrid1f@12
--	glMapGrid2d = glMapGrid2d@40
--	glMapGrid2f = glMapGrid2f@24
--	glMaterialf = glMaterialf@12
--	glMaterialfv = glMaterialfv@12
--	glMateriali = glMateriali@12
--	glMaterialiv = glMaterialiv@12
--	glMatrixMode = glMatrixMode@4
--	glMultMatrixd = glMultMatrixd@4
--	glMultMatrixf = glMultMatrixf@4
--	glNewList = glNewList@8
--	glNormal3b = glNormal3b@12
--	glNormal3bv = glNormal3bv@4
--	glNormal3d = glNormal3d@24
--	glNormal3dv = glNormal3dv@4
--	glNormal3f = glNormal3f@12
--	glNormal3fv = glNormal3fv@4
--	glNormal3i = glNormal3i@12
--	glNormal3iv = glNormal3iv@4
--	glNormal3s = glNormal3s@12
--	glNormal3sv = glNormal3sv@4
--	glNormalPointer = glNormalPointer@12
--	glOrtho = glOrtho@48
--	glPassThrough = glPassThrough@4
--	glPixelMapfv = glPixelMapfv@12
--	glPixelMapuiv = glPixelMapuiv@12
--	glPixelMapusv = glPixelMapusv@12
--	glPixelStoref = glPixelStoref@8
--	glPixelStorei = glPixelStorei@8
--	glPixelTransferf = glPixelTransferf@8
--	glPixelTransferi = glPixelTransferi@8
--	glPixelZoom = glPixelZoom@8
--	glPointSize = glPointSize@4
--	glPolygonMode = glPolygonMode@8
--	glPolygonOffset = glPolygonOffset@8
--	glPolygonStipple = glPolygonStipple@4
--	glPopAttrib = glPopAttrib@0
--	glPopClientAttrib = glPopClientAttrib@0
--	glPopMatrix = glPopMatrix@0
--	glPopName = glPopName@0
--	glPrioritizeTextures = glPrioritizeTextures@12
--	glPushAttrib = glPushAttrib@4
--	glPushClientAttrib = glPushClientAttrib@4
--	glPushMatrix = glPushMatrix@0
--	glPushName = glPushName@4
--	glRasterPos2d = glRasterPos2d@16
--	glRasterPos2dv = glRasterPos2dv@4
--	glRasterPos2f = glRasterPos2f@8
--	glRasterPos2fv = glRasterPos2fv@4
--	glRasterPos2i = glRasterPos2i@8
--	glRasterPos2iv = glRasterPos2iv@4
--	glRasterPos2s = glRasterPos2s@8
--	glRasterPos2sv = glRasterPos2sv@4
--	glRasterPos3d = glRasterPos3d@24
--	glRasterPos3dv = glRasterPos3dv@4
--	glRasterPos3f = glRasterPos3f@12
--	glRasterPos3fv = glRasterPos3fv@4
--	glRasterPos3i = glRasterPos3i@12
--	glRasterPos3iv = glRasterPos3iv@4
--	glRasterPos3s = glRasterPos3s@12
--	glRasterPos3sv = glRasterPos3sv@4
--	glRasterPos4d = glRasterPos4d@32
--	glRasterPos4dv = glRasterPos4dv@4
--	glRasterPos4f = glRasterPos4f@16
--	glRasterPos4fv = glRasterPos4fv@4
--	glRasterPos4i = glRasterPos4i@16
--	glRasterPos4iv = glRasterPos4iv@4
--	glRasterPos4s = glRasterPos4s@16
--	glRasterPos4sv = glRasterPos4sv@4
--	glReadBuffer = glReadBuffer@4
--	glReadPixels = glReadPixels@28
--	glRectd = glRectd@32
--	glRectdv = glRectdv@8
--	glRectf = glRectf@16
--	glRectfv = glRectfv@8
--	glRecti = glRecti@16
--	glRectiv = glRectiv@8
--	glRects = glRects@16
--	glRectsv = glRectsv@8
--	glRenderMode = glRenderMode@4
--	glRotated = glRotated@32
--	glRotatef = glRotatef@16
--	glScaled = glScaled@24
--	glScalef = glScalef@12
--	glScissor = glScissor@16
--	glSelectBuffer = glSelectBuffer@8
--	glShadeModel = glShadeModel@4
--	glStencilFunc = glStencilFunc@12
--	glStencilMask = glStencilMask@4
--	glStencilOp = glStencilOp@12
--	glTexCoord1d = glTexCoord1d@8
--	glTexCoord1dv = glTexCoord1dv@4
--	glTexCoord1f = glTexCoord1f@4
--	glTexCoord1fv = glTexCoord1fv@4
--	glTexCoord1i = glTexCoord1i@4
--	glTexCoord1iv = glTexCoord1iv@4
--	glTexCoord1s = glTexCoord1s@4
--	glTexCoord1sv = glTexCoord1sv@4
--	glTexCoord2d = glTexCoord2d@16
--	glTexCoord2dv = glTexCoord2dv@4
--	glTexCoord2f = glTexCoord2f@8
--	glTexCoord2fv = glTexCoord2fv@4
--	glTexCoord2i = glTexCoord2i@8
--	glTexCoord2iv = glTexCoord2iv@4
--	glTexCoord2s = glTexCoord2s@8
--	glTexCoord2sv = glTexCoord2sv@4
--	glTexCoord3d = glTexCoord3d@24
--	glTexCoord3dv = glTexCoord3dv@4
--	glTexCoord3f = glTexCoord3f@12
--	glTexCoord3fv = glTexCoord3fv@4
--	glTexCoord3i = glTexCoord3i@12
--	glTexCoord3iv = glTexCoord3iv@4
--	glTexCoord3s = glTexCoord3s@12
--	glTexCoord3sv = glTexCoord3sv@4
--	glTexCoord4d = glTexCoord4d@32
--	glTexCoord4dv = glTexCoord4dv@4
--	glTexCoord4f = glTexCoord4f@16
--	glTexCoord4fv = glTexCoord4fv@4
--	glTexCoord4i = glTexCoord4i@16
--	glTexCoord4iv = glTexCoord4iv@4
--	glTexCoord4s = glTexCoord4s@16
--	glTexCoord4sv = glTexCoord4sv@4
--	glTexCoordPointer = glTexCoordPointer@16
--	glTexEnvf = glTexEnvf@12
--	glTexEnvfv = glTexEnvfv@12
--	glTexEnvi = glTexEnvi@12
--	glTexEnviv = glTexEnviv@12
--	glTexGend = glTexGend@16
--	glTexGendv = glTexGendv@12
--	glTexGenf = glTexGenf@12
--	glTexGenfv = glTexGenfv@12
--	glTexGeni = glTexGeni@12
--	glTexGeniv = glTexGeniv@12
--	glTexImage1D = glTexImage1D@32
--	glTexImage2D = glTexImage2D@36
--	glTexParameterf = glTexParameterf@12
--	glTexParameterfv = glTexParameterfv@12
--	glTexParameteri = glTexParameteri@12
--	glTexParameteriv = glTexParameteriv@12
--	glTexSubImage1D = glTexSubImage1D@28
--	glTexSubImage2D = glTexSubImage2D@36
--	glTranslated = glTranslated@24
--	glTranslatef = glTranslatef@12
--	glVertex2d = glVertex2d@16
--	glVertex2dv = glVertex2dv@4
--	glVertex2f = glVertex2f@8
--	glVertex2fv = glVertex2fv@4
--	glVertex2i = glVertex2i@8
--	glVertex2iv = glVertex2iv@4
--	glVertex2s = glVertex2s@8
--	glVertex2sv = glVertex2sv@4
--	glVertex3d = glVertex3d@24
--	glVertex3dv = glVertex3dv@4
--	glVertex3f = glVertex3f@12
--	glVertex3fv = glVertex3fv@4
--	glVertex3i = glVertex3i@12
--	glVertex3iv = glVertex3iv@4
--	glVertex3s = glVertex3s@12
--	glVertex3sv = glVertex3sv@4
--	glVertex4d = glVertex4d@32
--	glVertex4dv = glVertex4dv@4
--	glVertex4f = glVertex4f@16
--	glVertex4fv = glVertex4fv@4
--	glVertex4i = glVertex4i@16
--	glVertex4iv = glVertex4iv@4
--	glVertex4s = glVertex4s@16
--	glVertex4sv = glVertex4sv@4
--	glVertexPointer = glVertexPointer@16
--	glViewport = glViewport@16
-diff --git a/src/gallium/targets/wgl/gallium_wgl.def b/src/gallium/targets/wgl/gallium_wgl.def
-deleted file mode 100644
-index 6d39d2eadc9bb2e941f3399efcc54f4b1c2c79da..0000000000000000000000000000000000000000
---- a/src/gallium/targets/wgl/gallium_wgl.def
-+++ /dev/null
-@@ -1,38 +0,0 @@
--EXPORTS
--	DrvCopyContext
--	DrvCreateContext
--	DrvCreateLayerContext
--	DrvDeleteContext
--	DrvDescribeLayerPlane
--	DrvDescribePixelFormat
--	DrvGetLayerPaletteEntries
--	DrvGetProcAddress
--	DrvPresentBuffers
--	DrvRealizeLayerPalette
--	DrvReleaseContext
--	DrvSetCallbackProcs
--	DrvSetContext
--	DrvSetLayerPaletteEntries
--	DrvSetPixelFormat
--	DrvShareLists
--	DrvSwapBuffers
--	DrvSwapLayerBuffers
--	DrvValidateVersion
--
--	stw_get_device
--	stw_init_screen
--	stw_get_current_context
--	stw_get_current_dc
--	stw_pixelformat_choose
--	stw_pixelformat_get
--	stw_pixelformat_get_info
--	stw_override_opengl32_entry_points
--	stw_create_context_attribs
--	stw_destroy_context
--	stw_unbind_context
--	stw_current_context
--	stw_make_current
--	stw_framebuffer_create
--	stw_framebuffer_release_locked
--	stw_framebuffer_unlock
--	stw_framebuffer_swap_locked
-diff --git a/src/gallium/targets/wgl/gallium_wgl.def.in b/src/gallium/targets/wgl/gallium_wgl.def.in
-new file mode 100644
-index 0000000000000000000000000000000000000000..860389d48cc44bd61c4a3df6d1405c2ccf06f099
---- /dev/null
-+++ b/src/gallium/targets/wgl/gallium_wgl.def.in
-@@ -0,0 +1,39 @@
-+; stdcall calling convention have @number suffix on 32 bits architecture for gcc
-+DrvCopyContext@12
-+DrvCreateContext@4
-+DrvCreateLayerContext@8
-+DrvDeleteContext@4
-+DrvDescribeLayerPlane@20
-+DrvDescribePixelFormat@16
-+DrvGetLayerPaletteEntries@20
-+DrvGetProcAddress@4
-+DrvPresentBuffers@8
-+DrvRealizeLayerPalette@12
-+DrvReleaseContext@4
-+DrvSetCallbackProcs@8
-+DrvSetContext@12
-+DrvSetLayerPaletteEntries@20
-+DrvSetPixelFormat@8
-+DrvShareLists@8
-+DrvSwapBuffers@4
-+DrvSwapLayerBuffers@8
-+DrvValidateVersion@4
-+
-+; __cdecl calling convention have no @number suffix
-+stw_get_device
-+stw_init_screen
-+stw_get_current_context
-+stw_get_current_dc
-+stw_pixelformat_choose
-+stw_pixelformat_get
-+stw_pixelformat_get_info
-+stw_override_opengl32_entry_points
-+stw_create_context_attribs
-+stw_destroy_context
-+stw_unbind_context
-+stw_current_context
-+stw_make_current
-+stw_framebuffer_create
-+stw_framebuffer_release_locked
-+stw_framebuffer_unlock
-+stw_framebuffer_swap_locked
-diff --git a/src/gallium/targets/wgl/gallium_wgl.mingw.def b/src/gallium/targets/wgl/gallium_wgl.mingw.def
-deleted file mode 100644
-index ee23392d95ec26ca1d774f57b5979a153eab76a0..0000000000000000000000000000000000000000
---- a/src/gallium/targets/wgl/gallium_wgl.mingw.def
-+++ /dev/null
-@@ -1,26 +0,0 @@
--EXPORTS
--	DrvCopyContext = DrvCopyContext@12
--	DrvCreateContext = DrvCreateContext@4
--	DrvCreateLayerContext = DrvCreateLayerContext@8
--	DrvDeleteContext = DrvDeleteContext@4
--	DrvDescribeLayerPlane = DrvDescribeLayerPlane@20
--	DrvDescribePixelFormat = DrvDescribePixelFormat@16
--	DrvGetLayerPaletteEntries = DrvGetLayerPaletteEntries@20
--	DrvGetProcAddress = DrvGetProcAddress@4
--	DrvPresentBuffers = DrvPresentBuffers@8
--	DrvRealizeLayerPalette = DrvRealizeLayerPalette@12
--	DrvReleaseContext = DrvReleaseContext@4
--	DrvSetCallbackProcs = DrvSetCallbackProcs@8
--	DrvSetContext = DrvSetContext@12
--	DrvSetLayerPaletteEntries = DrvSetLayerPaletteEntries@20
--	DrvSetPixelFormat = DrvSetPixelFormat@8
--	DrvShareLists = DrvShareLists@8
--	DrvSwapBuffers = DrvSwapBuffers@4
--	DrvSwapLayerBuffers = DrvSwapLayerBuffers@8
--	DrvValidateVersion = DrvValidateVersion@4
--
--	stw_get_current_context = stw_get_current_context@0
--	stw_get_current_dc = stw_get_current_dc@0
--	stw_pixelformat_choose = stw_pixelformat_choose@8
--	stw_pixelformat_get = stw_pixelformat_get@4
--	stw_override_opengl32_entry_points = stw_override_opengl32_entry_points@8
-diff --git a/src/gallium/targets/wgl/meson.build b/src/gallium/targets/wgl/meson.build
-index 92571a7c8f7bcf6847360bcd725732bd144f35c9..ace7c33eb9499a8058598570890d3e408918e7ff 100644
---- a/src/gallium/targets/wgl/meson.build
-+++ b/src/gallium/targets/wgl/meson.build
-@@ -20,15 +20,15 @@
- 
- 
- gallium_wgl_link_args = []
--if cc.get_id() == 'gcc' and host_machine.cpu_family() != 'x86_64'
--  gallium_wgl_link_args += ['-Wl,--enable-stdcall-fixup']
--endif
- 
--if cc.get_id() == 'gcc' and host_machine.cpu_family() != 'x86_64'
--  wgl_def = 'gallium_wgl.mingw.def'
--else
--  wgl_def = 'gallium_wgl.def'
--endif
-+wgl_def = custom_target(
-+  'gallium_wgl.def',
-+  input: 'gallium_wgl.def.in',
-+  output : 'gallium_wgl.def',
-+  command : [prog_python, gen_vs_module_defs_py,
-+             '--in_file', '@INPUT@', '--out_file', '@OUTPUT@',
-+             '--compiler_id', cc.get_id(), '--cpu_family', host_machine.cpu_family()]
-+)
- 
- libgallium_wgl = shared_library(
-   'gallium_wgl',
-diff --git a/src/mapi/es1api/gles1.def.in b/src/mapi/es1api/gles1.def.in
-new file mode 100644
-index 0000000000000000000000000000000000000000..b09aff6a8739e1ce197f8abe481f4b79a94d3adb
---- /dev/null
-+++ b/src/mapi/es1api/gles1.def.in
-@@ -0,0 +1,146 @@
-+; stdcall calling convention have @number suffix on 32 bits architecture for gcc
-+glActiveTexture@4
-+glAlphaFunc@8
-+glAlphaFuncx@8
-+glBindBuffer@8
-+glBindTexture@8
-+glBlendFunc@8
-+glBufferData@16
-+glBufferSubData@16
-+glClear@4
-+glClearColor@16
-+glClearColorx@16
-+glClearDepthf@4
-+glClearDepthx@4
-+glClearStencil@4
-+glClientActiveTexture@4
-+glClipPlanef@8
-+glClipPlanex@8
-+glColor4f@16
-+glColor4ub@16
-+glColor4x@16
-+glColorMask@16
-+glColorPointer@16
-+glCompressedTexImage2D@32
-+glCompressedTexSubImage2D@36
-+glCopyTexImage2D@32
-+glCopyTexSubImage2D@32
-+glCullFace@4
-+glDeleteBuffers@8
-+glDeleteTextures@8
-+glDepthFunc@4
-+glDepthMask@4
-+glDepthRangef@8
-+glDepthRangex@8
-+glDisable@4
-+glDisableClientState@4
-+glDrawArrays@12
-+glDrawElements@16
-+glEnable@4
-+glEnableClientState@4
-+glFinish@0
-+glFlush@0
-+glFogf@8
-+glFogfv@8
-+glFogx@8
-+glFogxv@8
-+glFrontFace@4
-+glFrustumf@24
-+glFrustumx@24
-+glGenBuffers@8
-+glGenTextures@8
-+glGetBooleanv@8
-+glGetBufferParameteriv@12
-+glGetClipPlanef@8
-+glGetClipPlanex@8
-+glGetError@0
-+glGetFixedv@8
-+glGetFloatv@8
-+glGetIntegerv@8
-+glGetLightfv@12
-+glGetLightxv@12
-+glGetMaterialfv@12
-+glGetMaterialxv@12
-+glGetPointerv@8
-+glGetString@4
-+glGetTexEnvfv@12
-+glGetTexEnviv@12
-+glGetTexEnvxv@12
-+glGetTexParameterfv@12
-+glGetTexParameteriv@12
-+glGetTexParameterxv@12
-+glHint@8
-+glIsBuffer@4
-+glIsEnabled@4
-+glIsTexture@4
-+glLightModelf@8
-+glLightModelfv@8
-+glLightModelx@8
-+glLightModelxv@8
-+glLightf@12
-+glLightfv@12
-+glLightx@12
-+glLightxv@12
-+glLineWidth@4
-+glLineWidthx@4
-+glLoadIdentity@0
-+glLoadMatrixf@4
-+glLoadMatrixx@4
-+glLogicOp@4
-+glMaterialf@12
-+glMaterialfv@12
-+glMaterialx@12
-+glMaterialxv@12
-+glMatrixMode@4
-+glMultMatrixf@4
-+glMultMatrixx@4
-+glMultiTexCoord4f@20
-+glMultiTexCoord4x@20
-+glNormal3f@12
-+glNormal3x@12
-+glNormalPointer@12
-+glOrthof@24
-+glOrthox@24
-+glPixelStorei@8
-+glPointParameterf@8
-+glPointParameterfv@8
-+glPointParameterx@8
-+glPointParameterxv@8
-+glPointSize@4
-+glPointSizePointerOES@12
-+glPointSizex@4
-+glPolygonOffset@8
-+glPolygonOffsetx@8
-+glPopMatrix@0
-+glPushMatrix@0
-+glReadPixels@28
-+glRotatef@16
-+glRotatex@16
-+glSampleCoverage@8
-+glSampleCoveragex@8
-+glScalef@12
-+glScalex@12
-+glScissor@16
-+glShadeModel@4
-+glStencilFunc@12
-+glStencilMask@4
-+glStencilOp@12
-+glTexCoordPointer@16
-+glTexEnvf@12
-+glTexEnvfv@12
-+glTexEnvi@12
-+glTexEnviv@12
-+glTexEnvx@12
-+glTexEnvxv@12
-+glTexImage2D@36
-+glTexParameterf@12
-+glTexParameterfv@12
-+glTexParameteri@12
-+glTexParameteriv@12
-+glTexParameterx@12
-+glTexParameterxv@12
-+glTexSubImage2D@36
-+glTranslatef@12
-+glTranslatex@12
-+glVertexPointer@16
-+glViewport@16
-diff --git a/src/mapi/es1api/meson.build b/src/mapi/es1api/meson.build
-index 8b749b1a3324be96f0d69816e638f1131ec8c307..4bca37b5e32f77d55655c49ca0580b75707edc6b 100644
---- a/src/mapi/es1api/meson.build
-+++ b/src/mapi/es1api/meson.build
-@@ -29,12 +29,22 @@ es1_glapi_mapi_tmp_h = custom_target(
- 
- _es1_c_args = []
- if with_platform_windows
--  _es1_c_args += ['-D_GDI32_', '-DBUILD_GL32']
-+  _es1_c_args += ['-D_GDI32_']
- endif
- 
-+gles1_def = custom_target(
-+  'gles1.def',
-+  input: 'gles1.def.in',
-+  output : 'gles1.def',
-+  command : [prog_python, gen_vs_module_defs_py,
-+             '--in_file', '@INPUT@', '--out_file', '@OUTPUT@',
-+             '--compiler_id', cc.get_id(), '--cpu_family', host_machine.cpu_family()]
-+)
-+
- libglesv1_cm = shared_library(
-   'GLESv1_CM' + get_option('gles-lib-suffix'),
-   ['../entry.c', es1_glapi_mapi_tmp_h],
-+  vs_module_defs : gles1_def,
-   c_args : [
-     c_msvc_compat_args,
-     _es1_c_args,
-diff --git a/src/mapi/es2api/gles2.def.in b/src/mapi/es2api/gles2.def.in
-new file mode 100644
-index 0000000000000000000000000000000000000000..4517ea8b739e72d950930ee94b51dc71829dea8e
---- /dev/null
-+++ b/src/mapi/es2api/gles2.def.in
-@@ -0,0 +1,359 @@
-+; stdcall calling convention have @number suffix on 32 bits architecture for gcc
-+glActiveShaderProgram@8
-+glActiveTexture@4
-+glAttachShader@8
-+glBeginQuery@8
-+glBeginTransformFeedback@4
-+glBindAttribLocation@12
-+glBindBuffer@8
-+glBindBufferBase@12
-+glBindBufferRange@20
-+glBindFramebuffer@8
-+glBindImageTexture@28
-+glBindProgramPipeline@4
-+glBindRenderbuffer@8
-+glBindSampler@8
-+glBindTexture@8
-+glBindTransformFeedback@8
-+glBindVertexArray@4
-+glBindVertexBuffer@16
-+glBlendBarrier@0
-+glBlendColor@16
-+glBlendEquation@4
-+glBlendEquationSeparate@8
-+glBlendEquationSeparatei@12
-+glBlendEquationi@8
-+glBlendFunc@8
-+glBlendFuncSeparate@16
-+glBlendFuncSeparatei@20
-+glBlendFunci@12
-+glBlitFramebuffer@40
-+glBufferData@16
-+glBufferSubData@16
-+glCheckFramebufferStatus@4
-+glClear@4
-+glClearBufferfi@16
-+glClearBufferfv@12
-+glClearBufferiv@12
-+glClearBufferuiv@12
-+glClearColor@16
-+glClearDepthf@4
-+glClearStencil@4
-+glClientWaitSync@16
-+glColorMask@16
-+glColorMaski@20
-+glCompileShader@4
-+glCompressedTexImage2D@32
-+glCompressedTexImage3D@36
-+glCompressedTexSubImage2D@36
-+glCompressedTexSubImage3D@44
-+glCopyBufferSubData@20
-+glCopyImageSubData@60
-+glCopyTexImage2D@32
-+glCopyTexSubImage2D@32
-+glCopyTexSubImage3D@36
-+glCreateProgram@0
-+glCreateShader@4
-+glCreateShaderProgramv@12
-+glCullFace@4
-+glDebugMessageCallback@8
-+glDebugMessageControl@24
-+glDebugMessageInsert@24
-+glDeleteBuffers@8
-+glDeleteFramebuffers@8
-+glDeleteProgram@4
-+glDeleteProgramPipelines@8
-+glDeleteQueries@8
-+glDeleteRenderbuffers@8
-+glDeleteSamplers@8
-+glDeleteShader@4
-+glDeleteSync@4
-+glDeleteTextures@8
-+glDeleteTransformFeedbacks@8
-+glDeleteVertexArrays@8
-+glDepthFunc@4
-+glDepthMask@4
-+glDepthRangef@8
-+glDetachShader@8
-+glDisable@4
-+glDisableVertexAttribArray@4
-+glDisablei@8
-+glDispatchCompute@12
-+glDispatchComputeIndirect@4
-+glDrawArrays@12
-+glDrawArraysIndirect@8
-+glDrawArraysInstanced@16
-+glDrawBuffers@8
-+glDrawElements@16
-+glDrawElementsBaseVertex@20
-+glDrawElementsIndirect@12
-+glDrawElementsInstanced@20
-+glDrawElementsInstancedBaseVertex@24
-+glDrawRangeElements@24
-+glDrawRangeElementsBaseVertex@28
-+glEnable@4
-+glEnableVertexAttribArray@4
-+glEnablei@8
-+glEndQuery@4
-+glEndTransformFeedback@0
-+glFenceSync@8
-+glFinish@0
-+glFlush@0
-+glFlushMappedBufferRange@12
-+glFramebufferParameteri@12
-+glFramebufferRenderbuffer@16
-+glFramebufferTexture2D@20
-+glFramebufferTexture@16
-+glFramebufferTextureLayer@20
-+glFrontFace@4
-+glGenBuffers@8
-+glGenFramebuffers@8
-+glGenProgramPipelines@8
-+glGenQueries@8
-+glGenRenderbuffers@8
-+glGenSamplers@8
-+glGenTextures@8
-+glGenTransformFeedbacks@8
-+glGenVertexArrays@8
-+glGenerateMipmap@4
-+glGetActiveAttrib@28
-+glGetActiveUniform@28
-+glGetActiveUniformBlockName@20
-+glGetActiveUniformBlockiv@16
-+glGetActiveUniformsiv@20
-+glGetAttachedShaders@16
-+glGetAttribLocation@8
-+glGetBooleani_v@12
-+glGetBooleanv@8
-+glGetBufferParameteri64v@12
-+glGetBufferParameteriv@12
-+glGetBufferPointerv@12
-+glGetDebugMessageLog@32
-+glGetError@0
-+glGetFloatv@8
-+glGetFragDataLocation@8
-+glGetFramebufferAttachmentParameteriv@16
-+glGetFramebufferParameteriv@12
-+glGetGraphicsResetStatus@0
-+glGetInteger64i_v@12
-+glGetInteger64v@8
-+glGetIntegeri_v@12
-+glGetIntegerv@8
-+glGetInternalformativ@20
-+glGetMultisamplefv@12
-+glGetObjectLabel@20
-+glGetObjectPtrLabel@16
-+glGetPointerv@8
-+glGetProgramBinary@20
-+glGetProgramInfoLog@16
-+glGetProgramInterfaceiv@16
-+glGetProgramPipelineInfoLog@16
-+glGetProgramPipelineiv@12
-+glGetProgramResourceIndex@12
-+glGetProgramResourceLocation@12
-+glGetProgramResourceName@24
-+glGetProgramResourceiv@32
-+glGetProgramiv@12
-+glGetQueryObjectuiv@12
-+glGetQueryiv@12
-+glGetRenderbufferParameteriv@12
-+glGetSamplerParameterIiv@12
-+glGetSamplerParameterIuiv@12
-+glGetSamplerParameterfv@12
-+glGetSamplerParameteriv@12
-+glGetShaderInfoLog@16
-+glGetShaderPrecisionFormat@16
-+glGetShaderSource@16
-+glGetShaderiv@12
-+glGetString@4
-+glGetStringi@8
-+glGetSynciv@20
-+glGetTexLevelParameterfv@16
-+glGetTexLevelParameteriv@16
-+glGetTexParameterIiv@12
-+glGetTexParameterIuiv@12
-+glGetTexParameterfv@12
-+glGetTexParameteriv@12
-+glGetTransformFeedbackVarying@28
-+glGetUniformBlockIndex@8
-+glGetUniformIndices@16
-+glGetUniformLocation@8
-+glGetUniformfv@12
-+glGetUniformiv@12
-+glGetUniformuiv@12
-+glGetVertexAttribIiv@12
-+glGetVertexAttribIuiv@12
-+glGetVertexAttribPointerv@12
-+glGetVertexAttribfv@12
-+glGetVertexAttribiv@12
-+glGetnUniformfv@16
-+glGetnUniformiv@16
-+glGetnUniformuiv@16
-+glHint@8
-+glInvalidateFramebuffer@12
-+glInvalidateSubFramebuffer@28
-+glIsBuffer@4
-+glIsEnabled@4
-+glIsEnabledi@8
-+glIsFramebuffer@4
-+glIsProgram@4
-+glIsProgramPipeline@4
-+glIsQuery@4
-+glIsRenderbuffer@4
-+glIsSampler@4
-+glIsShader@4
-+glIsSync@4
-+glIsTexture@4
-+glIsTransformFeedback@4
-+glIsVertexArray@4
-+glLineWidth@4
-+glLinkProgram@4
-+glMapBufferRange@16
-+glMemoryBarrier@4
-+glMemoryBarrierByRegion@4
-+glMinSampleShading@4
-+glObjectLabel@16
-+glObjectPtrLabel@12
-+glPatchParameteri@8
-+glPauseTransformFeedback@0
-+glPixelStorei@8
-+glPolygonOffset@8
-+glPopDebugGroup@0
-+glPrimitiveBoundingBox@32
-+glProgramBinary@16
-+glProgramParameteri@12
-+glProgramUniform1f@12
-+glProgramUniform1fv@16
-+glProgramUniform1i@12
-+glProgramUniform1iv@16
-+glProgramUniform1ui@12
-+glProgramUniform1uiv@16
-+glProgramUniform2f@16
-+glProgramUniform2fv@16
-+glProgramUniform2i@16
-+glProgramUniform2iv@16
-+glProgramUniform2ui@16
-+glProgramUniform2uiv@16
-+glProgramUniform3f@20
-+glProgramUniform3fv@16
-+glProgramUniform3i@20
-+glProgramUniform3iv@16
-+glProgramUniform3ui@20
-+glProgramUniform3uiv@16
-+glProgramUniform4f@24
-+glProgramUniform4fv@16
-+glProgramUniform4i@24
-+glProgramUniform4iv@16
-+glProgramUniform4ui@24
-+glProgramUniform4uiv@16
-+glProgramUniformMatrix2fv@20
-+glProgramUniformMatrix2x3fv@20
-+glProgramUniformMatrix2x4fv@20
-+glProgramUniformMatrix3fv@20
-+glProgramUniformMatrix3x2fv@20
-+glProgramUniformMatrix3x4fv@20
-+glProgramUniformMatrix4fv@20
-+glProgramUniformMatrix4x2fv@20
-+glProgramUniformMatrix4x3fv@20
-+glPushDebugGroup@16
-+glReadBuffer@4
-+glReadPixels@28
-+glReadnPixels@32
-+glReleaseShaderCompiler@0
-+glRenderbufferStorage@16
-+glRenderbufferStorageMultisample@20
-+glResumeTransformFeedback@0
-+glSampleCoverage@8
-+glSampleMaski@8
-+glSamplerParameterIiv@12
-+glSamplerParameterIuiv@12
-+glSamplerParameterf@12
-+glSamplerParameterfv@12
-+glSamplerParameteri@12
-+glSamplerParameteriv@12
-+glScissor@16
-+glShaderBinary@20
-+glShaderSource@16
-+glStencilFunc@12
-+glStencilFuncSeparate@16
-+glStencilMask@4
-+glStencilMaskSeparate@8
-+glStencilOp@12
-+glStencilOpSeparate@16
-+glTexBuffer@12
-+glTexBufferRange@20
-+glTexImage2D@36
-+glTexImage3D@40
-+glTexParameterIiv@12
-+glTexParameterIuiv@12
-+glTexParameterf@12
-+glTexParameterfv@12
-+glTexParameteri@12
-+glTexParameteriv@12
-+glTexStorage2D@20
-+glTexStorage2DMultisample@24
-+glTexStorage3D@24
-+glTexStorage3DMultisample@28
-+glTexSubImage2D@36
-+glTexSubImage3D@44
-+glTransformFeedbackVaryings@16
-+glUniform1f@8
-+glUniform1fv@12
-+glUniform1i@8
-+glUniform1iv@12
-+glUniform1ui@8
-+glUniform1uiv@12
-+glUniform2f@12
-+glUniform2fv@12
-+glUniform2i@12
-+glUniform2iv@12
-+glUniform2ui@12
-+glUniform2uiv@12
-+glUniform3f@16
-+glUniform3fv@12
-+glUniform3i@16
-+glUniform3iv@12
-+glUniform3ui@16
-+glUniform3uiv@12
-+glUniform4f@20
-+glUniform4fv@12
-+glUniform4i@20
-+glUniform4iv@12
-+glUniform4ui@20
-+glUniform4uiv@12
-+glUniformBlockBinding@12
-+glUniformMatrix2fv@16
-+glUniformMatrix2x3fv@16
-+glUniformMatrix2x4fv@16
-+glUniformMatrix3fv@16
-+glUniformMatrix3x2fv@16
-+glUniformMatrix3x4fv@16
-+glUniformMatrix4fv@16
-+glUniformMatrix4x2fv@16
-+glUniformMatrix4x3fv@16
-+glUnmapBuffer@4
-+glUseProgram@4
-+glUseProgramStages@12
-+glValidateProgram@4
-+glValidateProgramPipeline@4
-+glVertexAttrib1f@8
-+glVertexAttrib1fv@8
-+glVertexAttrib2f@12
-+glVertexAttrib2fv@8
-+glVertexAttrib3f@16
-+glVertexAttrib3fv@8
-+glVertexAttrib4f@20
-+glVertexAttrib4fv@8
-+glVertexAttribBinding@8
-+glVertexAttribDivisor@8
-+glVertexAttribFormat@20
-+glVertexAttribI4i@20
-+glVertexAttribI4iv@8
-+glVertexAttribI4ui@20
-+glVertexAttribI4uiv@8
-+glVertexAttribIFormat@16
-+glVertexAttribIPointer@20
-+glVertexAttribPointer@24
-+glVertexBindingDivisor@8
-+glViewport@16
-+glWaitSync@16
-diff --git a/src/mapi/es2api/meson.build b/src/mapi/es2api/meson.build
-index 356c5760c495e5b8a52abc2c841741f9b2b47222..8b133daa131276025072b4a85318e423206981cc 100644
---- a/src/mapi/es2api/meson.build
-+++ b/src/mapi/es2api/meson.build
-@@ -29,12 +29,22 @@ es2_glapi_mapi_tmp_h = custom_target(
- 
- _es2_c_args = []
- if with_platform_windows
--  _es2_c_args += ['-D_GDI32_', '-DBUILD_GL32']
-+  _es2_c_args += ['-D_GDI32_']
- endif
- 
-+gles2_def = custom_target(
-+  'gles2.def',
-+  input: 'gles2.def.in',
-+  output : 'gles2.def',
-+  command : [prog_python, gen_vs_module_defs_py,
-+             '--in_file', '@INPUT@', '--out_file', '@OUTPUT@',
-+             '--compiler_id', cc.get_id(), '--cpu_family', host_machine.cpu_family()]
-+)
-+
- libgles2 = shared_library(
-   'GLESv2' + get_option('gles-lib-suffix'),
-   ['../entry.c', es2_glapi_mapi_tmp_h],
-+  vs_module_defs : gles2_def,
-   c_args : [
-     c_msvc_compat_args,
-     _es2_c_args,
-diff --git a/src/mapi/glapi/meson.build b/src/mapi/glapi/meson.build
-index 270b9870b400803d5cc8c484242c65b96ba99b9d..9f06207fe0a24e123b542ddf886ce2b325b0e105 100644
---- a/src/mapi/glapi/meson.build
-+++ b/src/mapi/glapi/meson.build
-@@ -52,7 +52,7 @@ if with_shared_glapi
- else
-   static_glapi_args += '-DMAPI_MODE_UTIL'
-   if with_platform_windows
--    static_glapi_args += ['-D_GDI32_', '-DBUILD_GL32', '-DKHRONOS_DLL_EXPORTS', '-D_GLAPI_NO_EXPORTS']
-+    static_glapi_args += ['-D_GDI32_', '-DKHRONOS_DLL_EXPORTS', '-D_GLAPI_NO_EXPORTS']
-   endif
-   static_glapi_files += files(
-     'glapi_dispatch.c',
-diff --git a/src/mesa/meson.build b/src/mesa/meson.build
-index bc7963413ff46781ae4a58a7762a58a73e67a23a..08b0cac497490fa40230861bd24bdba6e83016ad 100644
---- a/src/mesa/meson.build
-+++ b/src/mesa/meson.build
-@@ -489,7 +489,6 @@ _mesa_windows_args = []
- if with_platform_windows
-   _mesa_windows_args += [
-     '-D_GDI32_',    # prevent gl* being declared __declspec(dllimport) in MS headers
--    '-DBUILD_GL32'  # declare gl* as __declspec(dllexport) in Mesa headers
-   ]
-   if not with_shared_glapi
-     # prevent _glapi_* from being declared __declspec(dllimport)
-diff --git a/src/vulkan/meson.build b/src/vulkan/meson.build
-index 6384af782976e3f8300cf5e69d11e98fa6ac5e83..8c2f0dd08632116eebbd982516e1004e9db01e09 100644
---- a/src/vulkan/meson.build
-+++ b/src/vulkan/meson.build
-@@ -27,6 +27,15 @@ vulkan_wsi_args = []
- vulkan_wsi_deps = []
- vulkan_wsi_list = []
- 
-+vulkan_api_def = custom_target(
-+  'vulkan_api.def',
-+  input: 'vulkan_api.def.in',
-+  output : 'vulkan_api.def',
-+  command : [prog_python, gen_vs_module_defs_py,
-+             '--in_file', '@INPUT@', '--out_file', '@OUTPUT@',
-+             '--compiler_id', cc.get_id(), '--cpu_family', host_machine.cpu_family()]
-+)
-+
- if with_platform_x11
-   vulkan_wsi_deps += [
-     dep_xcb,
-diff --git a/src/vulkan/vulkan_api.def.in b/src/vulkan/vulkan_api.def.in
-new file mode 100644
-index 0000000000000000000000000000000000000000..678e4d99278b96d0ef1ee15c51e5febf8fcea58e
---- /dev/null
-+++ b/src/vulkan/vulkan_api.def.in
-@@ -0,0 +1,4 @@
-+; stdcall calling convention have @number suffix on 32 bits architecture for gcc
-+vk_icdNegotiateLoaderICDInterfaceVersion@4
-+vk_icdGetInstanceProcAddr@8
-+vk_icdGetPhysicalDeviceProcAddr@8
diff --git a/external_imported/vcpkg/ports/mesa/gallium-fix-build-with-llvm-17.patch b/external_imported/vcpkg/ports/mesa/gallium-fix-build-with-llvm-17.patch
new file mode 100644
index 000000000..cea5a17f3
--- /dev/null
+++ b/external_imported/vcpkg/ports/mesa/gallium-fix-build-with-llvm-17.patch
@@ -0,0 +1,42 @@
+From cda32e18a08fa2f2289a7409f37f44d5643e6aea Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 23 Jun 2023 01:20:38 -0700
+Subject: [PATCH] gallium: Fix build with llvm 17
+
+These headers are not available for C files in llvm 17+
+and they seem to be not needed to compile after all with llvm 17
+so add conditions to exclude them for llvm >= 17
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/gallium/auxiliary/gallivm/lp_bld_init.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c b/src/gallium/auxiliary/gallivm/lp_bld_init.c
+index cd2108f3a088d..b1a4d0388a6a0 100644
+--- a/src/gallium/auxiliary/gallivm/lp_bld_init.c
++++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c
+@@ -46,15 +46,19 @@
+ #if GALLIVM_USE_NEW_PASS == 1
+ #include <llvm-c/Transforms/PassBuilder.h>
+ #elif GALLIVM_HAVE_CORO == 1
++#if LLVM_VERSION_MAJOR < 17
+ #include <llvm-c/Transforms/Scalar.h>
+-#if LLVM_VERSION_MAJOR >= 7
++#endif
++#if LLVM_VERSION_MAJOR >= 7 && LLVM_VERSION_MAJOR < 17
+ #include <llvm-c/Transforms/Utils.h>
+ #endif
+ #if LLVM_VERSION_MAJOR <= 8 && (DETECT_ARCH_AARCH64 || DETECT_ARCH_ARM || DETECT_ARCH_S390 || DETECT_ARCH_MIPS64)
+ #include <llvm-c/Transforms/IPO.h>
+ #endif
++#if LLVM_VERSION_MAJOR < 17
+ #include <llvm-c/Transforms/Coroutines.h>
+ #endif
++#endif
+ 
+ unsigned gallivm_perf = 0;
+ 
+-- 
+GitLab
+
diff --git a/external_imported/vcpkg/ports/mesa/portfile.cmake b/external_imported/vcpkg/ports/mesa/portfile.cmake
index aef9f9347..d2f25670d 100644
--- a/external_imported/vcpkg/ports/mesa/portfile.cmake
+++ b/external_imported/vcpkg/ports/mesa/portfile.cmake
@@ -1,14 +1,3 @@
-# Build-Depends: From X Window PR: zstd, drm (!windows), elfutils (!windows), wayland (!windows), wayland-protocols (!windows), xdamage, xshmfence (!windows), x11, xcb, xfixes, xext, xxf86vm, xrandr, xv, xvmc (!windows), egl-registry, opengl-registry, tool-meson
-# Required LLVM modules: LLVM (modules: bitwriter, core, coroutines, engine, executionengine, instcombine, mcdisassembler, mcjit, scalaropts, transformutils) found: YES 
-
-# Patches are from https://github.com/pal1000/mesa-dist-win/tree/master/patches
-set(PATCHES
-    # Fix symbols exporting for MinGW GCC x86
-    def-fixes.patch
-    # Clover build on Windows
-    clover.patch
-)
-
 vcpkg_check_linkage(ONLY_DYNAMIC_CRT)
 if(VCPKG_TARGET_IS_WINDOWS)
     set(VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY enabled) # some parts of this port can only build as a shared library.
@@ -18,21 +7,22 @@ vcpkg_from_gitlab(
     GITLAB_URL https://gitlab.freedesktop.org
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mesa/mesa
-    REF mesa-22.1.7
-    SHA512 41302fc55ef429c14b1595832db3a898380230f86d2b84ac1ae3bd453d0aad87ec7ad310004dc64fcf34f58d8ea2736c13971c04eba056bcc549a4e3cc7c9470
+    REF mesa-${VERSION}
+    SHA512 96f7602c98d532a269116bd5d3f9cbe87ca4425b309467cc19f83277a0faaa9804edea72dcaeb6f7774cac17790d5d76b58c357ef639cb6064e7480d93b861bf
     FILE_DISAMBIGUATOR 1
     HEAD_REF master
-    PATCHES ${PATCHES}
-) 
-
+    PATCHES
+        gallium-fix-build-with-llvm-17.patch
+        clover-llvm-move-to-modern-pass-manager.patch
+)
 
-x_vcpkg_get_python_packages(PYTHON_VERSION "3" OUT_PYTHON_VAR "PYTHON3" PACKAGES setuptools mako )
+x_vcpkg_get_python_packages(PYTHON_VERSION "3" OUT_PYTHON_VAR "PYTHON3" PACKAGES setuptools mako)
 
 vcpkg_find_acquire_program(FLEX)
-get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY )
+get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY)
 vcpkg_add_to_path(PREPEND "${FLEX_DIR}")
 vcpkg_find_acquire_program(BISON)
-get_filename_component(BISON_DIR "${BISON}" DIRECTORY )
+get_filename_component(BISON_DIR "${BISON}" DIRECTORY)
 vcpkg_add_to_path(PREPEND "${BISON_DIR}")
 
 if(WIN32) # WIN32 HOST probably has win_flex and win_bison!
@@ -147,4 +137,8 @@ if(VCPKG_TARGET_IS_WINDOWS)
     endif()
 endif()
 
+if(FEATURES STREQUAL "core")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+endif()
+
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/docs/license.rst")
diff --git a/external_imported/vcpkg/ports/mesa/vcpkg.json b/external_imported/vcpkg/ports/mesa/vcpkg.json
index 643623135..dbf67a89b 100644
--- a/external_imported/vcpkg/ports/mesa/vcpkg.json
+++ b/external_imported/vcpkg/ports/mesa/vcpkg.json
@@ -1,11 +1,10 @@
 {
   "name": "mesa",
-  "version": "22.1.7",
-  "port-version": 1,
+  "version": "23.2.1",
   "description": "Mesa - The 3D Graphics Library",
   "homepage": "https://www.mesa3d.org/",
   "license": "MIT AND BSL-1.0 AND SGI-B-2.0",
-  "supports": "!(windows & arm) & !staticcrt",
+  "supports": "!(windows & arm) & !staticcrt & !uwp",
   "dependencies": [
     {
       "name": "vcpkg-get-python-packages",
@@ -112,7 +111,16 @@
       ]
     },
     "offscreen": {
-      "description": "Build with support for offscreen rendering (OSMesa)"
+      "description": "Build with support for offscreen rendering (OSMesa)",
+      "dependencies": [
+        {
+          "name": "mesa",
+          "default-features": false,
+          "features": [
+            "opengl"
+          ]
+        }
+      ]
     },
     "opengl": {
       "description": "Build support for OpenGL (all versions)",
diff --git a/external_imported/vcpkg/ports/meshoptimizer/no-werror.patch b/external_imported/vcpkg/ports/meshoptimizer/no-werror.patch
deleted file mode 100644
index 9a5de4648..000000000
--- a/external_imported/vcpkg/ports/meshoptimizer/no-werror.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b13d946..1aa1304 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -55,9 +55,9 @@ set(GLTF_SOURCES
- )
- 
- if(MSVC)
--    add_compile_options(/W4 /WX)
-+    add_compile_options(/W4)
- else()
--    add_compile_options(-Wall -Wextra -Wshadow -Wno-missing-field-initializers -Werror)
-+    add_compile_options(-Wall -Wextra -Wshadow -Wno-missing-field-initializers)
- endif()
- 
- if(MESHOPT_BUILD_SHARED_LIBS)
diff --git a/external_imported/vcpkg/ports/meshoptimizer/portfile.cmake b/external_imported/vcpkg/ports/meshoptimizer/portfile.cmake
index 4e89ff462..4a34d18fe 100644
--- a/external_imported/vcpkg/ports/meshoptimizer/portfile.cmake
+++ b/external_imported/vcpkg/ports/meshoptimizer/portfile.cmake
@@ -1,11 +1,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO zeux/meshoptimizer
-    REF v0.18
-    SHA512 b9fd6ce61c7d7b673892ace74feb300628d4bbbba4e912dba4a756d9709b952dde45b706c581df3fd0aef1e7065ff730d1827b0d6c724d716ccf41efb1953d3e
+    REF v${VERSION}
+    SHA512 29f9987325b1e00e2b4bf5cb7745323456f5f766f6bdc189aeb192c802e7c73d6ec4484cd7c91d070ee940b423a680bee31c79e4db4a49da99346d21f70c58d6
     HEAD_REF master
-    PATCHES
-      no-werror.patch
 )
 
 # If we want basisu support in gltfpack we need a particular fork of basisu
diff --git a/external_imported/vcpkg/ports/meshoptimizer/vcpkg.json b/external_imported/vcpkg/ports/meshoptimizer/vcpkg.json
index fb62ed1f8..587304685 100644
--- a/external_imported/vcpkg/ports/meshoptimizer/vcpkg.json
+++ b/external_imported/vcpkg/ports/meshoptimizer/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "meshoptimizer",
-  "version": "0.18",
-  "port-version": 1,
+  "version": "0.20",
   "description": "Mesh optimization library that makes meshes smaller and faster to render",
   "homepage": "https://github.com/zeux/meshoptimizer",
   "license": "MIT",
@@ -17,7 +16,8 @@
   ],
   "features": {
     "gltfpack": {
-      "description": "Build gltfpack tool"
+      "description": "Build gltfpack tool",
+      "supports": "!uwp"
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/mfl/portfile.cmake b/external_imported/vcpkg/ports/mfl/portfile.cmake
index 845310f68..d23f3919e 100644
--- a/external_imported/vcpkg/ports/mfl/portfile.cmake
+++ b/external_imported/vcpkg/ports/mfl/portfile.cmake
@@ -15,7 +15,11 @@ vcpkg_from_github(
         fix-clang-detection.patch
 )
 
-vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}")
+vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DWARNINGS_AS_ERRORS=FALSE
+)
+
 vcpkg_cmake_install()
 
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/mfl)
diff --git a/external_imported/vcpkg/ports/mfl/vcpkg.json b/external_imported/vcpkg/ports/mfl/vcpkg.json
index 9cac2e0ca..26aeaec07 100644
--- a/external_imported/vcpkg/ports/mfl/vcpkg.json
+++ b/external_imported/vcpkg/ports/mfl/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "mfl",
   "version": "0.0.1",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Computes the layout information for mathematical formulas provided in TeX-like syntax.",
   "homepage": "https://github.com/cpp-niel/mfl",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/mfx-dispatch/fix-pkgconf.patch b/external_imported/vcpkg/ports/mfx-dispatch/fix-pkgconf.patch
index d0d2d80bd..c0310e12a 100644
--- a/external_imported/vcpkg/ports/mfx-dispatch/fix-pkgconf.patch
+++ b/external_imported/vcpkg/ports/mfx-dispatch/fix-pkgconf.patch
@@ -24,9 +24,16 @@ diff --git a/libmfx.pc.cmake b/libmfx.pc.cmake
 index fabb541..5d248fe 100644
 --- a/libmfx.pc.cmake
 +++ b/libmfx.pc.cmake
-@@ -11,4 +11,4 @@ Requires.private:
+@@ -6,9 +6,9 @@ Requires.private:
+ Name: libmfx
+ Description: Intel Media SDK Dispatched static library
+-Version: 2013
++Version: 1.35
+ Requires:
+ Requires.private:
  Conflicts:
- Libs: -L${libdir} -lsupc++ ${libdir}/libmfx.lib
+-Libs: -L${libdir} -lsupc++ ${libdir}/libmfx.lib
++Libs: -L${libdir} -llibmfx
  Libs.private:
 -Cflags: -I${includedir} -I@INTELMEDIASDK_PATH@
 +Cflags: -I${includedir}
diff --git a/external_imported/vcpkg/ports/mfx-dispatch/fix-unresolved-symbol.patch b/external_imported/vcpkg/ports/mfx-dispatch/fix-unresolved-symbol.patch
index ce12f8bd7..98a48914b 100644
--- a/external_imported/vcpkg/ports/mfx-dispatch/fix-unresolved-symbol.patch
+++ b/external_imported/vcpkg/ports/mfx-dispatch/fix-unresolved-symbol.patch
@@ -54,11 +54,12 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
 diff --git a/src/mfx_driver_store_loader.cpp b/src/mfx_driver_store_loader.cpp
 --- a/src/mfx_driver_store_loader.cpp	(revision 388559e9e8234eb0989e1598a9beea4035a04132)
 +++ b/src/mfx_driver_store_loader.cpp	(revision 5ebef171699530ca01594a5cef10a68811f4d105)
-@@ -24,6 +24,8 @@
+@@ -24,6 +24,9 @@
  #include "mfx_dispatcher_log.h"
  #include "mfx_load_dll.h"
  
 +#pragma comment(lib, "Ole32.lib")
++#pragma comment(lib, "Advapi32.lib")
 +
  namespace MFX
  {
diff --git a/external_imported/vcpkg/ports/mfx-dispatch/vcpkg.json b/external_imported/vcpkg/ports/mfx-dispatch/vcpkg.json
index 869a1e9ab..505a076b1 100644
--- a/external_imported/vcpkg/ports/mfx-dispatch/vcpkg.json
+++ b/external_imported/vcpkg/ports/mfx-dispatch/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "mfx-dispatch",
   "version": "1.35.1",
-  "port-version": 1,
+  "port-version": 3,
   "description": "Open source Intel media sdk dispatcher",
   "homepage": "https://github.com/lu-zero/mfx_dispatch",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/microsoft-signalr/find-msgpack.patch b/external_imported/vcpkg/ports/microsoft-signalr/find-msgpack.patch
new file mode 100644
index 000000000..04a812758
--- /dev/null
+++ b/external_imported/vcpkg/ports/microsoft-signalr/find-msgpack.patch
@@ -0,0 +1,29 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 676cde2..4562873 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -45,8 +45,8 @@ set(JSONCPP_LIB "jsoncpp_static" CACHE STRING "jsoncpp target name")
+ endif()
+ 
+ if(USE_MSGPACK)
+-  find_package(msgpack CONFIG REQUIRED)
+-  set(MSGPACK_LIB "msgpackc-cxx")
++  find_package(msgpack-cxx CONFIG REQUIRED)
++  set(MSGPACK_LIB "msgpack-cxx")
+ endif()
+ 
+ include_directories (include)
+diff --git a/src/signalrclient/microsoft-signalr-config.in.cmake b/src/signalrclient/microsoft-signalr-config.in.cmake
+index b28235b..09a7d56 100644
+--- a/src/signalrclient/microsoft-signalr-config.in.cmake
++++ b/src/signalrclient/microsoft-signalr-config.in.cmake
+@@ -7,7 +7,7 @@ endif()
+ find_dependency(jsoncpp)
+ 
+ if(@USE_MSGPACK@)
+-  find_dependency(msgpack)
++  find_dependency(msgpack-cxx CONFIG)
+ endif()
+ 
+ include("${CMAKE_CURRENT_LIST_DIR}/microsoft-signalr-targets.cmake")
+\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/microsoft-signalr/portfile.cmake b/external_imported/vcpkg/ports/microsoft-signalr/portfile.cmake
index 3b71eafec..d48abb7fe 100644
--- a/external_imported/vcpkg/ports/microsoft-signalr/portfile.cmake
+++ b/external_imported/vcpkg/ports/microsoft-signalr/portfile.cmake
@@ -1,9 +1,11 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO aspnet/SignalR-Client-Cpp
-    REF v0.1.0-alpha4
+    REF "v${VERSION}"
     SHA512 b87c94e8bc81781c1cfb4292f1fe3ce046a5f192a25c02104f454b533349c1c0ed965570bd749b496bb316ccb89ae51c5e7461ffa06055e71dac659fbde79456
     HEAD_REF main
+    PATCHES
+        find-msgpack.patch
 )
 
 vcpkg_check_features(
@@ -13,16 +15,13 @@ vcpkg_check_features(
         messagepack USE_MSGPACK
 )
 
-if("cpprestsdk" IN_LIST FEATURES AND VCPKG_TARGET_IS_UWP)
-    message(FATAL_ERROR "microsoft-signalr[cpprestsdk] is not supported on UWP, use microsoft-signalr[core] instead")
-endif()
-
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DBUILD_TESTING=OFF
         ${FEATURE_OPTIONS}
         -DWALL=OFF
+        "-DJSONCPP_LIB=JsonCpp::JsonCpp"
 )
 
 vcpkg_cmake_install()
@@ -31,7 +30,7 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/share/microsoft-signalr)
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/share" "${CURRENT_PACKAGES_DIR}/lib/share")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
 file(COPY "${SOURCE_PATH}/third-party-notices.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 
-vcpkg_copy_pdbs()
\ No newline at end of file
+vcpkg_copy_pdbs()
diff --git a/external_imported/vcpkg/ports/microsoft-signalr/vcpkg.json b/external_imported/vcpkg/ports/microsoft-signalr/vcpkg.json
index 78df0f3dd..b6a78e67c 100644
--- a/external_imported/vcpkg/ports/microsoft-signalr/vcpkg.json
+++ b/external_imported/vcpkg/ports/microsoft-signalr/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "microsoft-signalr",
   "version": "0.1.0-alpha4",
-  "port-version": 2,
+  "port-version": 8,
   "description": "C++ Client for ASP.NET Core SignalR.",
   "homepage": "https://github.com/aspnet/SignalR-Client-Cpp",
   "dependencies": [
+    "jsoncpp",
     {
       "name": "vcpkg-cmake",
       "host": true
@@ -15,7 +16,7 @@
     }
   ],
   "default-features": [
-    "default-features"
+    "cpprestsdk"
   ],
   "features": {
     "cpprestsdk": {
@@ -24,25 +25,11 @@
         {
           "name": "cpprestsdk",
           "features": [
-            "default-features",
             "websockets"
           ]
         }
       ]
     },
-    "default-features": {
-      "description": "Features installed by default",
-      "dependencies": [
-        "jsoncpp",
-        {
-          "name": "microsoft-signalr",
-          "features": [
-            "cpprestsdk"
-          ],
-          "platform": "!uwp"
-        }
-      ]
-    },
     "messagepack": {
       "description": "Add support for the messagepack hub protocol, must enable in code still",
       "dependencies": [
diff --git a/external_imported/vcpkg/ports/mikktspace/vcpkg.json b/external_imported/vcpkg/ports/mikktspace/vcpkg.json
index e9afd5100..317420cc9 100644
--- a/external_imported/vcpkg/ports/mikktspace/vcpkg.json
+++ b/external_imported/vcpkg/ports/mikktspace/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "mikktspace",
-  "version-string": "2020-10-06",
-  "port-version": 2,
+  "version-date": "2020-10-06",
+  "port-version": 3,
   "description": "A common standard for tangent space used in baking tools to produce normal maps",
   "homepage": "https://github.com/mmikk/MikkTSpace",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/mimalloc/portfile.cmake b/external_imported/vcpkg/ports/mimalloc/portfile.cmake
index 4e6dc1aaa..88f33916d 100644
--- a/external_imported/vcpkg/ports/mimalloc/portfile.cmake
+++ b/external_imported/vcpkg/ports/mimalloc/portfile.cmake
@@ -1,11 +1,12 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO microsoft/mimalloc
-    REF v2.0.9
-    SHA512 bf6945bfb600ade35dab34c7f570ee4f69a77612547ad874bbbd989a4e594a6a219c222a22c90c5e36f205aae4d5cd1a5e4651caed5433db275d414c6769bf49
+    REF "v${VERSION}"
+    SHA512 927b046e67783b325a6e41e3a9a6d3d78306fa1c82255defd1f3a7a60a27fd809a601f65b1b27fa38f2064e124f29856d7c0e5ccc33c54c2e4b6ebb9816d74b1
     HEAD_REF master
     PATCHES
         fix-cmake.patch
+        template-param-types.diff
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -39,6 +40,7 @@ vcpkg_copy_pdbs()
 
 file(COPY
     "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake"
+    "${CMAKE_CURRENT_LIST_DIR}/usage"
     DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
 )
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/mimalloc)
@@ -55,4 +57,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 vcpkg_fixup_pkgconfig()
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/mimalloc/template-param-types.diff b/external_imported/vcpkg/ports/mimalloc/template-param-types.diff
new file mode 100644
index 000000000..1f1b70374
--- /dev/null
+++ b/external_imported/vcpkg/ports/mimalloc/template-param-types.diff
@@ -0,0 +1,22 @@
+diff --git a/src/arena.c b/src/arena.c
+index a04a04c..1340a96 100644
+--- a/src/arena.c
++++ b/src/arena.c
+@@ -476,7 +476,7 @@ static void mi_arena_schedule_purge(mi_arena_t* arena, size_t bitmap_idx, size_t
+     // schedule decommit
+     mi_msecs_t expire = mi_atomic_loadi64_relaxed(&arena->purge_expire);
+     if (expire != 0) {
+-      mi_atomic_addi64_acq_rel(&arena->purge_expire, delay/10);  // add smallish extra delay
++      mi_atomic_addi64_acq_rel(&arena->purge_expire, (mi_msecs_t)delay/10);  // add smallish extra delay
+     }
+     else {
+       mi_atomic_storei64_release(&arena->purge_expire, _mi_clock_now() + delay);
+@@ -520,7 +520,7 @@ static bool mi_arena_try_purge(mi_arena_t* arena, mi_msecs_t now, bool force, mi
+   if (!force && expire > now) return false;
+ 
+   // reset expire (if not already set concurrently)
+-  mi_atomic_casi64_strong_acq_rel(&arena->purge_expire, &expire, 0);
++  mi_atomic_casi64_strong_acq_rel(&arena->purge_expire, &expire, (mi_msecs_t)0);
+   
+   // potential purges scheduled, walk through the bitmap
+   bool any_purged = false;
diff --git a/external_imported/vcpkg/ports/mimalloc/usage b/external_imported/vcpkg/ports/mimalloc/usage
new file mode 100644
index 000000000..45cd37e75
--- /dev/null
+++ b/external_imported/vcpkg/ports/mimalloc/usage
@@ -0,0 +1,4 @@
+mimalloc provides CMake targets:
+
+  find_package(mimalloc CONFIG REQUIRED)
+  target_link_libraries(main PRIVATE $<IF:$<TARGET_EXISTS:mimalloc-static>,mimalloc-static,mimalloc)
diff --git a/external_imported/vcpkg/ports/mimalloc/vcpkg.json b/external_imported/vcpkg/ports/mimalloc/vcpkg.json
index 70e0c1348..0a3c8e93a 100644
--- a/external_imported/vcpkg/ports/mimalloc/vcpkg.json
+++ b/external_imported/vcpkg/ports/mimalloc/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "mimalloc",
-  "version": "2.0.9",
+  "version": "2.1.2",
+  "port-version": 1,
   "description": "Compact general purpose allocator with excellent performance",
   "homepage": "https://github.com/microsoft/mimalloc",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/minhook/portfile.cmake b/external_imported/vcpkg/ports/minhook/portfile.cmake
index 8c95a4dcd..a7fd5e401 100644
--- a/external_imported/vcpkg/ports/minhook/portfile.cmake
+++ b/external_imported/vcpkg/ports/minhook/portfile.cmake
@@ -11,9 +11,9 @@ endif()
 # Download files to enable CMake support for minhook - Adds CMakeLists.txt and minhook-config.cmake.in
 vcpkg_download_distfile(
     CMAKE_SUPPORT_PATCH
-    URLS https://github.com/TsudaKageyu/minhook/commit/3f2e34976c1685ee372a09f54c0c8c8f4240ef90.patch
+    URLS https://github.com/TsudaKageyu/minhook/commit/3f2e34976c1685ee372a09f54c0c8c8f4240ef90.patch?full_index=1
     FILENAME minhook-cmake-support.patch
-    SHA512 5f353b167e2c31e5e06258420c78fbae0095368cf687ff06a350d6b69b30476824785dde5dbcea3e30ff827e7cdb293727a73e6b1e6875f00aa891b2980c3877
+    SHA512 7863c51a4563fbc3694149595a7ef301500a1b3b324cc5571b0843386c2fdb5ae10b7e830c9b9fcc973dd17f77f386fd1dedcd493ce8475d2dcf2c44bb7306d0
 )
 
 vcpkg_from_github(
diff --git a/external_imported/vcpkg/ports/minhook/vcpkg.json b/external_imported/vcpkg/ports/minhook/vcpkg.json
index e2a0b7b77..1ba209054 100644
--- a/external_imported/vcpkg/ports/minhook/vcpkg.json
+++ b/external_imported/vcpkg/ports/minhook/vcpkg.json
@@ -1,8 +1,10 @@
 {
   "name": "minhook",
   "version": "1.3.3",
-  "port-version": 3,
+  "port-version": 4,
   "description": "The Minimalistic x86/x64 API Hooking Library for Windows.",
+  "homepage": "https://github.com/TsudaKageyu/minhook",
+  "license": "BSD-2-Clause",
   "supports": "windows & !uwp & !arm",
   "dependencies": [
     {
diff --git a/external_imported/vcpkg/ports/miniaudio/portfile.cmake b/external_imported/vcpkg/ports/miniaudio/portfile.cmake
index 0d8d843c6..8837a8bf4 100644
--- a/external_imported/vcpkg/ports/miniaudio/portfile.cmake
+++ b/external_imported/vcpkg/ports/miniaudio/portfile.cmake
@@ -2,8 +2,8 @@
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO mackron/miniaudio
-  REF a0dc1037f99a643ff5fad7272cd3d6461f2d63fa
-  SHA512 396608d8326777adfffb50216322198b9f86d73c6a83c5886dc9eaef93b82a4e8f44f446192990b7b9fabac53fad073546214692a000415307e70812a50fb0c2
+  REF "${VERSION}"
+  SHA512 0c67ff7d9112409fea5af7756c1bc14bca4acfa45a97896ea339cdab228ac3dcc843c492e6da9dc75d4cd6f6b795ee80fe3ad9c4c746d7db691b1216f86e456d
   HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/miniaudio/vcpkg.json b/external_imported/vcpkg/ports/miniaudio/vcpkg.json
index ee452c112..b20a03c70 100644
--- a/external_imported/vcpkg/ports/miniaudio/vcpkg.json
+++ b/external_imported/vcpkg/ports/miniaudio/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "miniaudio",
-  "version": "0.11.11",
+  "version": "0.11.21",
   "description": "Audio playback and capture library written in C, in a single source file",
   "homepage": "https://github.com/mackron/miniaudio",
   "license": "Unlicense OR MIT-0"
diff --git a/external_imported/vcpkg/ports/minifb/portfile.cmake b/external_imported/vcpkg/ports/minifb/portfile.cmake
index eb299edb1..3389c2a13 100644
--- a/external_imported/vcpkg/ports/minifb/portfile.cmake
+++ b/external_imported/vcpkg/ports/minifb/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO emoon/minifb
-    REF 1e087f1e9fe5bd33cdb2210b8e92d513ff7dc339 # 2023-02-03
-    SHA512 482bdcdb81d9f163ac7ff1224297331bfee68e53778a9170bfec52c8150c840445cb1338250bfc3e780aef011e3e95e7df3d7134183e59df947f69109a27108a
+    REF 2ce2449b1bc8d7c6d20c31b86244f1e540f2e788 # 2023-09-21
+    SHA512 cbadc06df99f833fedcd9eb9d5afab4572272a9dfd0f4084a2b79a64dc98f19bcddbb6f43992b16f005d26054c454e3cfc34e3e210cdd93ad1adb89e19463a4d
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/minifb/vcpkg.json b/external_imported/vcpkg/ports/minifb/vcpkg.json
index 7059dca89..07ef62085 100644
--- a/external_imported/vcpkg/ports/minifb/vcpkg.json
+++ b/external_imported/vcpkg/ports/minifb/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "minifb",
-  "version-date": "2023-02-03",
+  "version-date": "2023-09-21",
   "description": "MiniFB (Mini FrameBuffer) is a small cross platform library that makes it easy to render (32-bit) pixels in a window.",
   "homepage": "https://github.com/emoon/minifb",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/miniply/fix-cmake.patch b/external_imported/vcpkg/ports/miniply/fix-cmake.patch
new file mode 100644
index 000000000..808a940db
--- /dev/null
+++ b/external_imported/vcpkg/ports/miniply/fix-cmake.patch
@@ -0,0 +1,45 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bde25da..e1129db 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2,19 +2,29 @@ cmake_minimum_required(VERSION 3.5)
+ 
+ project(miniply LANGUAGES CXX)
+ 
++include(GNUInstallDirs)
++
+ set(CMAKE_CXX_STANDARD 11)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+ 
+-include_directories(.)
++add_library(miniply miniply.cpp)
++
++target_include_directories(miniply
++        PUBLIC
++        $<INSTALL_INTERFACE:include>
++        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
++
++install(FILES ${CMAKE_SOURCE_DIR}/miniply.h
++        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
++
++install(TARGETS miniply EXPORT miniply-config
++        RUNTIME DESTINATION bin
++        ARCHIVE DESTINATION lib
++        LIBRARY DESTINATION lib
++        INCLUDES DESTINATION include)
+ 
+-add_executable(miniply-perf
+-  miniply.cpp
+-  miniply.h
+-  extra/miniply-perf.cpp
+-)
++install(EXPORT miniply-config
++	FILE unofficial-miniply-config.cmake
++	NAMESPACE unofficial::miniply::
++	DESTINATION share/unofficial-miniply)
+ 
+-add_executable(miniply-info
+-  miniply.cpp
+-  miniply.h
+-  extra/miniply-info.cpp
+-)
diff --git a/external_imported/vcpkg/ports/miniply/portfile.cmake b/external_imported/vcpkg/ports/miniply/portfile.cmake
new file mode 100644
index 000000000..342293490
--- /dev/null
+++ b/external_imported/vcpkg/ports/miniply/portfile.cmake
@@ -0,0 +1,21 @@
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO vilya/miniply
+    REF 1a235c70390fadf789695c9ccbf285ae712416b3
+    SHA512 856bb39bd36dab588026b9ee886a996bd697df5c1a24de2abff822e037a0fb7af0be19dca5e2f6ccc524453b0b9ee6e225510565ca78f6b965dd7406ba67dac1
+    HEAD_REF master
+    PATCHES
+        fix-cmake.patch
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+)
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-miniply)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
diff --git a/external_imported/vcpkg/ports/miniply/vcpkg.json b/external_imported/vcpkg/ports/miniply/vcpkg.json
new file mode 100644
index 000000000..61e20ae06
--- /dev/null
+++ b/external_imported/vcpkg/ports/miniply/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "miniply",
+  "version-date": "2022-09-15",
+  "port-version": 1,
+  "description": "A fast and easy-to-use PLY parsing library in a single c++11 header and cpp file",
+  "homepage": "https://github.com/vilya/miniply",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/minisat-master-keying/portfile.cmake b/external_imported/vcpkg/ports/minisat-master-keying/portfile.cmake
index 3b487e3c0..a88e29b66 100644
--- a/external_imported/vcpkg/ports/minisat-master-keying/portfile.cmake
+++ b/external_imported/vcpkg/ports/minisat-master-keying/portfile.cmake
@@ -1,11 +1,20 @@
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
+vcpkg_download_distfile(
+    ADD_MISSING_HEADERS
+    URLS https://github.com/master-keying/minisat/commit/dde8a20c9c5ab0d2333ba7a338a7f4a769632b75.patch?full_index=1
+    SHA512 14b1ea9e72d969b0931a6ee571e4d7a591b6bdadd6b9c1e3696d902ab85caf22e0a65e4aadff3c16e55b2d5b04fa9f007bc015b6e914425c9932ca731f8445f2
+    FILENAME dde8a20c9c5ab0d2333ba7a338a7f4a769632b75.patch
+)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO master-keying/minisat
-    REF v2.3.6
-    SHA512 48E7AC1C97EA58070EAB9310F977404295E881B1403D527A33E059A0BB5A16CAA9AF2FA9E5230AD7E53E008B83077E300B3BAEEB0C220BE4E52B6B85887A05E1
+    REF v2.3.6
+    SHA512 48E7AC1C97EA58070EAB9310F977404295E881B1403D527A33E059A0BB5A16CAA9AF2FA9E5230AD7E53E008B83077E300B3BAEEB0C220BE4E52B6B85887A05E1
     HEAD_REF master
+    PATCHES
+        "${ADD_MISSING_HEADERS}"
 )
 
 vcpkg_cmake_configure(
diff --git a/external_imported/vcpkg/ports/minisat-master-keying/vcpkg.json b/external_imported/vcpkg/ports/minisat-master-keying/vcpkg.json
index c2a89562e..7b5a96c46 100644
--- a/external_imported/vcpkg/ports/minisat-master-keying/vcpkg.json
+++ b/external_imported/vcpkg/ports/minisat-master-keying/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "minisat-master-keying",
   "version": "2.3.6",
+  "port-version": 1,
   "description": [
     "A minimalistic high-performance SAT solver",
     "This is a modernized, cross-platform, CMake-enabled fork of the original MiniSat."
diff --git a/external_imported/vcpkg/ports/minitrace/CMakeLists.txt b/external_imported/vcpkg/ports/minitrace/CMakeLists.txt
deleted file mode 100644
index fcae7841e..000000000
--- a/external_imported/vcpkg/ports/minitrace/CMakeLists.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-cmake_minimum_required(VERSION 3.8)
-project(minitrace C)
-
-set(minitrace_HEADERS minitrace.h)
-set(minitrace_SOURCES minitrace.c)
-
-add_library(minitrace ${minitrace_SOURCES})
-
-# Install headers
-install(FILES ${minitrace_HEADERS} DESTINATION include/minitrace)
-
-# Install minitrace
-install(
-	TARGETS minitrace EXPORT minitraceConfig
-	RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
-	LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
-	ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
-)
-
-# Export config file for minitrace
-export(
-	TARGETS minitrace
-	NAMESPACE minitrace::
-	FILE "${CMAKE_CURRENT_BINARY_DIR}/minitrace-config.cmake"
-)
-
-# Install config file
-install(
-	EXPORT minitraceConfig
-	DESTINATION "${CMAKE_INSTALL_PREFIX}/share/minitrace"
-	NAMESPACE minitrace::
-)
diff --git a/external_imported/vcpkg/ports/minitrace/portfile.cmake b/external_imported/vcpkg/ports/minitrace/portfile.cmake
index 06b43396e..b5a4b5a6e 100644
--- a/external_imported/vcpkg/ports/minitrace/portfile.cmake
+++ b/external_imported/vcpkg/ports/minitrace/portfile.cmake
@@ -1,15 +1,11 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO hrydgard/minitrace
-    REF a48215c409dd848fa0a76c5eb4dfaba4ca3bca39
-    SHA512 591fa52132b6bbe8e7e121526a43d07056deff8fe026227c1a4c26bebf95536e5d68750fa8551d23afebf048fe8b8503017b9a93650e18a992cf2e5678d46135
+    REF a45ca4f58c8af2fc4d4d6042e68aa68bfea422c9
+    SHA512 5ea6fb58a1f2397444e58e449fd32b4b45f5a15afe8f8694115a0025f5444cf493ba8228a58f0772ca1dc149fd1633fc897b0a264b8927cfd6cc15eefa40c336
     HEAD_REF master
 )
 
-file(COPY "${CURRENT_PORT_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
-
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
 )
diff --git a/external_imported/vcpkg/ports/minitrace/vcpkg.json b/external_imported/vcpkg/ports/minitrace/vcpkg.json
index cb27c98a2..8c09d5320 100644
--- a/external_imported/vcpkg/ports/minitrace/vcpkg.json
+++ b/external_imported/vcpkg/ports/minitrace/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "minitrace",
-  "version-string": "2019.02.06",
-  "port-version": 2,
+  "version-date": "2023-04-23",
   "description": "Simple C/C++ library for producing JSON traces suitable for Chrome's built-in trace viewer.",
   "dependencies": [
     {
diff --git a/external_imported/vcpkg/ports/miniupnpc/cmakelists.diff b/external_imported/vcpkg/ports/miniupnpc/cmakelists.diff
deleted file mode 100644
index 4df7ef74d..000000000
--- a/external_imported/vcpkg/ports/miniupnpc/cmakelists.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/miniupnpc/CMakeLists.txt	2018-05-07 13:12:58.000000000 +0200
-+++ b/miniupnpc/CMakeLists.txt	2018-11-13 11:51:57.897598000 +0100
-@@ -124,7 +124,7 @@
-   target_link_libraries (libminiupnpc-shared PRIVATE miniupnpc-private)
-   target_compile_definitions(libminiupnpc-shared PRIVATE MINIUPNP_EXPORTS)
- 
--  target_include_directories(libminiupnpc-static INTERFACE ../${CMAKE_CURRENT_SOURCE_DIR})
-+  target_include_directories(libminiupnpc-shared INTERFACE ../${CMAKE_CURRENT_SOURCE_DIR})
-   if (WIN32)
-     target_link_libraries(libminiupnpc-shared INTERFACE ws2_32 iphlpapi)
-   endif()
diff --git a/external_imported/vcpkg/ports/miniupnpc/portfile.cmake b/external_imported/vcpkg/ports/miniupnpc/portfile.cmake
index 3961a0321..72d587277 100644
--- a/external_imported/vcpkg/ports/miniupnpc/portfile.cmake
+++ b/external_imported/vcpkg/ports/miniupnpc/portfile.cmake
@@ -1,11 +1,10 @@
+string(REPLACE "." "_" MINIUPNPC_VERSION "${VERSION}")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO miniupnp/miniupnp
-    REF miniupnpc_2_1
-    SHA512 f2ab5116c094982f7838ccab460d3db07a99de1094448277fc45841e0e64ea1b4216d75a7e5dd471c79ff9b0132b89e4d801c3ad1b60d55631c12c916df658f5
+    REF "miniupnpc_${MINIUPNPC_VERSION}"
+    SHA512 575d6be8271c11bb48f95c7f0a7aed82619e9cb871a530d75a47867ef663807e888a6e66be0cd201f29ef3c7df860ee855481d464edb65881e83a6f16279ba76
     HEAD_REF master
-    PATCHES
-        cmakelists.diff
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" MINIUPNPC_BUILD_SHARED)
@@ -23,5 +22,21 @@ vcpkg_cmake_configure(
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
+vcpkg_cmake_config_fixup(CONFIG_PATH "/lib/cmake/${PORT}")
+vcpkg_fixup_pkgconfig()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+else()
+    file(GLOB DEBUG_TOOLS "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe")
+    file(GLOB RELEASE_TOOLS "${CURRENT_PACKAGES_DIR}/bin/*.exe")
+    file(
+        INSTALL ${RELEASE_TOOLS}
+        DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}"
+    )
+    vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}")
+    file(REMOVE ${DEBUG_TOOLS} ${RELEASE_TOOLS})
+endif()
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/miniupnpc/vcpkg.json b/external_imported/vcpkg/ports/miniupnpc/vcpkg.json
index c1798a9d4..dab22f509 100644
--- a/external_imported/vcpkg/ports/miniupnpc/vcpkg.json
+++ b/external_imported/vcpkg/ports/miniupnpc/vcpkg.json
@@ -1,12 +1,16 @@
 {
   "name": "miniupnpc",
-  "version-string": "2.1",
-  "port-version": 3,
+  "version": "2.2.5",
   "description": "UPnP client library/tool to access Internet Gateway Devices",
+  "supports": "!uwp",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
       "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/minizip-ng/Modify-header-file-path.patch b/external_imported/vcpkg/ports/minizip-ng/Modify-header-file-path.patch
deleted file mode 100644
index ac1c6fee8..000000000
--- a/external_imported/vcpkg/ports/minizip-ng/Modify-header-file-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9ef8023..ec1ee55 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -81,7 +81,7 @@ include(FeatureSummary)
- 
- set(INSTALL_BIN_DIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Installation directory for executables")
- set(INSTALL_LIB_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Installation directory for libraries")
--set(INSTALL_INC_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Installation directory for headers")
-+set(INSTALL_INC_DIR ${CMAKE_INSTALL_INCLUDEDIR}/minizip-ng CACHE PATH "Installation directory for headers")
- set(INSTALL_MAN_DIR ${CMAKE_INSTALL_MANDIR} CACHE PATH "Installation directory for manual pages")
- 
- set(STDLIB_DEF)
diff --git a/external_imported/vcpkg/ports/minizip-ng/fix_find_zstd.patch b/external_imported/vcpkg/ports/minizip-ng/fix_find_zstd.patch
new file mode 100644
index 000000000..1348b518d
--- /dev/null
+++ b/external_imported/vcpkg/ports/minizip-ng/fix_find_zstd.patch
@@ -0,0 +1,27 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0902052..f301b43 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -340,20 +340,8 @@ endif()
+ if(MZ_ZSTD)
+     # Check if zstd is present
+     if(NOT MZ_FORCE_FETCH_LIBS)
+-        find_package(PkgConfig QUIET)
+-        if(PKGCONFIG_FOUND)
+-            pkg_check_modules(ZSTD libzstd)
+-        endif()
+-        if(NOT ZSTD_FOUND)
+-            find_package(ZSTD QUIET)
+-            if(ZSTD_FOUND)
+-                if(TARGET zstd::libzstd_static)
+-                    list(APPEND ZSTD_LIBRARIES zstd::libzstd_static)
+-                else()
+-                    list(APPEND ZSTD_LIBRARIES zstd::libzstd_shared)
+-                endif()
+-            endif()
+-        endif()
++        find_package(ZSTD NAMES zstd REQUIRED)
++        list(APPEND ZSTD_LIBRARIES $<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>)
+     endif()
+ 
+     if(ZSTD_FOUND AND NOT MZ_FORCE_FETCH_LIBS)
diff --git a/external_imported/vcpkg/ports/minizip-ng/portfile.cmake b/external_imported/vcpkg/ports/minizip-ng/portfile.cmake
index 1e290c3be..78ca51277 100644
--- a/external_imported/vcpkg/ports/minizip-ng/portfile.cmake
+++ b/external_imported/vcpkg/ports/minizip-ng/portfile.cmake
@@ -5,18 +5,17 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO zlib-ng/minizip-ng
-    REF 241428886216f0f0efd6926efcaaaa13794e51bd #v3.0.7
-    SHA512 779a53fafe63b64f5f703448262871c323f5753cbb58001dd0d0ef10de8d3bd7bb6055db4e763e664ccb5b781ce8dd06bf7c3e6b38eca019de835322a833fa06
+    REF "${VERSION}"
+    SHA512 2662ddf90666babe73474f6fc48f5a64f276d555b7a0f04f790b9edef570cb958356e900632c3795fb2053f4813c449240ff101d32b063eca4ad869bef0546fd
     HEAD_REF master
-    PATCHES 
-        Modify-header-file-path.patch
+    PATCHES
+        fix_find_zstd.patch
 )
 
 vcpkg_check_features(
     OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
         pkcrypt MZ_PKCRYPT
-        signing MZ_SIGNING
         wzaes MZ_WZAES
         openssl MZ_OPENSSL
         bzip2 MZ_BZIP2
@@ -31,16 +30,17 @@ vcpkg_cmake_configure(
     OPTIONS 
         ${FEATURE_OPTIONS}
         -DMZ_FETCH_LIBS=OFF
-        -DMZ_PROJECT_SUFFIX:STRING=-ng
+        -DMZ_LIB_SUFFIX=-ng
+        -DMZ_ICONV=OFF
 )
 
 vcpkg_cmake_install()
 
 vcpkg_fixup_pkgconfig()
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/minizip-ng)
 vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/minizip-ng/vcpkg.json b/external_imported/vcpkg/ports/minizip-ng/vcpkg.json
index e7c89c8f9..3b2d1ce8f 100644
--- a/external_imported/vcpkg/ports/minizip-ng/vcpkg.json
+++ b/external_imported/vcpkg/ports/minizip-ng/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "minizip-ng",
-  "version": "3.0.7",
+  "version": "4.0.4",
   "description": "minizip-ng is a zip manipulation library written in C that is supported on Windows, macOS, and Linux.",
   "homepage": "https://github.com/zlib-ng/minizip-ng",
   "license": "Zlib",
@@ -19,7 +19,6 @@
     "bzip2",
     "lzma",
     "pkcrypt",
-    "signing",
     "wzaes",
     "zlib",
     "zstd"
@@ -46,19 +45,6 @@
     "pkcrypt": {
       "description": "Enables PKWARE traditional encryption"
     },
-    "signing": {
-      "description": "Enables zip signing support",
-      "dependencies": [
-        {
-          "name": "minizip-ng",
-          "default-features": false,
-          "features": [
-            "openssl"
-          ],
-          "platform": "!windows & !osx"
-        }
-      ]
-    },
     "wzaes": {
       "description": "Enables WinZIP AES encryption",
       "dependencies": [
diff --git a/external_imported/vcpkg/ports/minizip/0003-no-io64.patch b/external_imported/vcpkg/ports/minizip/0003-no-io64.patch
deleted file mode 100644
index 6e72e3c91..000000000
--- a/external_imported/vcpkg/ports/minizip/0003-no-io64.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/contrib/minizip/ioapi.c b/contrib/minizip/ioapi.c
-index 7f5c191..d42e050 100644
---- a/contrib/minizip/ioapi.c
-+++ b/contrib/minizip/ioapi.c
-@@ -17,8 +17,8 @@
- #if defined(__APPLE__) || defined(IOAPI_NO_64)
- // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
- #define FOPEN_FUNC(filename, mode) fopen(filename, mode)
--#define FTELLO_FUNC(stream) ftello(stream)
--#define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin)
-+#define FTELLO_FUNC(stream) ftell(stream)
-+#define FSEEKO_FUNC(stream, offset, origin) fseek(stream, offset, origin)
- #else
- #define FOPEN_FUNC(filename, mode) fopen64(filename, mode)
- #define FTELLO_FUNC(stream) ftello64(stream)
-diff --git a/contrib/minizip/miniunz.c b/contrib/minizip/miniunz.c
-index 3d65401..a1269ea 100644
---- a/contrib/minizip/miniunz.c
-+++ b/contrib/minizip/miniunz.c
-@@ -33,9 +33,9 @@
- #define FTELLO_FUNC(stream) ftello(stream)
- #define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin)
- #else
--#define FOPEN_FUNC(filename, mode) fopen64(filename, mode)
--#define FTELLO_FUNC(stream) ftello64(stream)
--#define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin)
-+#define FOPEN_FUNC(filename, mode) fopen(filename, mode)
-+#define FTELLO_FUNC(stream) ftell(stream)
-+#define FSEEKO_FUNC(stream, offset, origin) fseek(stream, offset, origin)
- #endif
- 
- 
-diff --git a/contrib/minizip/minizip.c b/contrib/minizip/minizip.c
-index 4288962..02267fb 100644
---- a/contrib/minizip/minizip.c
-+++ b/contrib/minizip/minizip.c
-@@ -34,9 +34,9 @@
- #define FTELLO_FUNC(stream) ftello(stream)
- #define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin)
- #else
--#define FOPEN_FUNC(filename, mode) fopen64(filename, mode)
--#define FTELLO_FUNC(stream) ftello64(stream)
--#define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin)
-+#define FOPEN_FUNC(filename, mode) fopen(filename, mode)
-+#define FTELLO_FUNC(stream) ftell(stream)
-+#define FSEEKO_FUNC(stream, offset, origin) fseek(stream, offset, origin)
- #endif
- 
- 
diff --git a/external_imported/vcpkg/ports/minizip/CMakeLists.txt b/external_imported/vcpkg/ports/minizip/CMakeLists.txt
index 313450b96..db79e7229 100644
--- a/external_imported/vcpkg/ports/minizip/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/minizip/CMakeLists.txt
@@ -1,104 +1,111 @@
-cmake_minimum_required(VERSION 3.8)
-project(minizip VERSION 1.2.13 LANGUAGES C)
+cmake_minimum_required(VERSION 3.25)
+project(minizip LANGUAGES C)
 
 if(MSVC)
   add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS)
 endif()
 
-find_package(ZLIB REQUIRED)
-set(MIN_SRC contrib/minizip)
-
-include_directories(${MIN_SRC} ${ZLIB_INCLUDE_DIRS})
-
-set(MINIZIP_LIBRARIES ZLIB::ZLIB)
-if(ENABLE_BZIP2)
-  message(STATUS "Building with bzip2 support")
-  find_package(BZip2)
-
-  include_directories(${BZIP2_INCLUDE_DIR})
-  set(MINIZIP_LIBRARIES ${MINIZIP_LIBRARIES} ${BZIP2_LIBRARIES})
-else()
-  message(STATUS "Building without bzip2 support")
-endif()
-
 set(SRC
-  ${MIN_SRC}/ioapi.c
-  ${MIN_SRC}/unzip.c
-  ${MIN_SRC}/zip.c
-  ${MIN_SRC}/mztools.c
+  ioapi.c
+  unzip.c
+  zip.c
+  mztools.c
 )
-if(WIN32)
-  list(APPEND SRC ${MIN_SRC}/iowin32.c)
-endif()
-
 set(HEADERS
-  ${MIN_SRC}/crypt.h
-  ${MIN_SRC}/ioapi.h
-  ${MIN_SRC}/unzip.h
-  ${MIN_SRC}/zip.h
-  ${MIN_SRC}/mztools.h
+  crypt.h
+  ioapi.h
+  unzip.h
+  zip.h
+  mztools.h
 )
 if(WIN32)
-  list(APPEND HEADERS ${MIN_SRC}/iowin32.h)
+  list(APPEND SRC iowin32.c minizip-win32.def)
+  list(APPEND HEADERS iowin32.h)
 endif()
 
 add_library(minizip ${SRC})
+target_include_directories(minizip PUBLIC $<INSTALL_INTERFACE:include/minizip>)
 
-target_link_libraries(minizip PRIVATE ZLIB::ZLIB)
+find_package(ZLIB REQUIRED)
 target_compile_definitions(minizip PRIVATE -D_ZLIB_H)
+target_link_libraries(minizip PUBLIC ZLIB::ZLIB)
+set(MINIZIP_REQUIRES zlib)
 
 if(ENABLE_BZIP2)
-  target_link_libraries(minizip PUBLIC ${BZIP2_LIBRARIES})
+  message(STATUS "Building with bzip2 support")
+  find_package(BZip2 REQUIRED)
   target_compile_definitions(minizip PRIVATE -DHAVE_BZIP2=1)
+  target_link_libraries(minizip PUBLIC BZip2::BZip2)
+  list(APPEND MINIZIP_REQUIRES bzip2)
+else()
+  message(STATUS "Building without bzip2 support")
 endif()
-if(ANDROID)
-  target_compile_definitions(minizip PRIVATE IOAPI_NO_64)
+
+if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+  target_compile_definitions(minizip PRIVATE -DIOWIN32_USING_WINRT_API)
 endif()
+
 if(NOT DISABLE_INSTALL_TOOLS)
-  add_executable(minizip_bin ${MIN_SRC}/minizip.c)
-  add_executable(miniunz_bin ${MIN_SRC}/miniunz.c)
+  add_executable(minizip_bin minizip.c)
+  add_executable(miniunz_bin miniunz.c)
 
-  target_link_libraries(minizip_bin minizip ${MINIZIP_LIBRARIES})
-  target_link_libraries(miniunz_bin minizip ${MINIZIP_LIBRARIES})
+  target_link_libraries(minizip_bin minizip)
+  target_link_libraries(miniunz_bin minizip)
 
   set_target_properties(minizip_bin PROPERTIES OUTPUT_NAME minizip)
   set_target_properties(miniunz_bin PROPERTIES OUTPUT_NAME miniunz)
+
+  install (
+    TARGETS minizip_bin miniunz_bin
+    RUNTIME DESTINATION bin
+  )
 endif()
 
 install(
   TARGETS minizip
-  EXPORT minizipTargets
+  EXPORT unofficial-minizipTargets
   RUNTIME DESTINATION bin
   LIBRARY DESTINATION lib
   ARCHIVE DESTINATION lib
 )
 
 include(CMakePackageConfigHelpers)
-write_basic_package_version_file("${PROJECT_BINARY_DIR}/minizipConfigVersion.cmake"
-                                    COMPATIBILITY SameMajorVersion)
+write_basic_package_version_file("${PROJECT_BINARY_DIR}/unofficial-minizipConfigVersion.cmake"
+  VERSION "${PACKAGE_VERSION}"
+  COMPATIBILITY SameMajorVersion
+)
 
-configure_package_config_file(${PROJECT_SOURCE_DIR}/cmake/minizipConfig.cmake.in
-                                minizipConfig.cmake
-                                INSTALL_DESTINATION share/minizip)
+configure_package_config_file(unofficial-minizipConfig.cmake.in
+  unofficial-minizipConfig.cmake
+  INSTALL_DESTINATION share/unofficial-minizip
+)
 
 install(FILES
-        "${PROJECT_BINARY_DIR}/minizipConfig.cmake"
-        "${PROJECT_BINARY_DIR}/minizipConfigVersion.cmake"
-        DESTINATION share/minizip
+        "${PROJECT_BINARY_DIR}/unofficial-minizipConfig.cmake"
+        "${PROJECT_BINARY_DIR}/unofficial-minizipConfigVersion.cmake"
+        DESTINATION share/unofficial-minizip
 )
 
-install(EXPORT minizipTargets
-        NAMESPACE minizip::
-        DESTINATION share/minizip
+install(EXPORT unofficial-minizipTargets
+        NAMESPACE unofficial::minizip::
+        DESTINATION share/unofficial-minizip
 )
 
-if(NOT DISABLE_INSTALL_TOOLS)
-  install (
-    TARGETS minizip_bin miniunz_bin
-    RUNTIME DESTINATION tools/minizip
-  )
-endif()
-
 if(NOT DISABLE_INSTALL_HEADERS)
   install(FILES ${HEADERS} DESTINATION include/minizip)
 endif()
+
+list(JOIN MINIZIP_REQUIRES " " MINIZIP_REQUIRES)
+set(exec_prefix "\${prefix}")
+set(libdir "\${prefix}/lib")
+set(includedir "\${prefix}/include")
+configure_file(
+    "${CMAKE_CURRENT_SOURCE_DIR}/minizip.pc.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/minizip.pc"
+    @ONLY
+)
+install(
+    FILES "${CMAKE_CURRENT_BINARY_DIR}/minizip.pc"
+    DESTINATION lib/pkgconfig
+)
+
diff --git a/external_imported/vcpkg/ports/minizip/android-fileapi.patch b/external_imported/vcpkg/ports/minizip/android-fileapi.patch
new file mode 100644
index 000000000..36171d0dd
--- /dev/null
+++ b/external_imported/vcpkg/ports/minizip/android-fileapi.patch
@@ -0,0 +1,17 @@
+diff --git a/contrib/minizip/ioapi.h b/contrib/minizip/ioapi.h
+index c588a18..b5395e2 100644
+--- a/contrib/minizip/ioapi.h
++++ b/contrib/minizip/ioapi.h
+@@ -21,6 +21,12 @@
+ #ifndef _ZLIBIOAPI64_H
+ #define _ZLIBIOAPI64_H
+ 
++#if defined(__ANDROID_API__) && __ANDROID_API__ < 24
++    // Cf. https://android.googlesource.com/platform/bionic/+/master/docs/32-bit-abi.md#32_bit-and
++    // stdio functions for off_t are incomplete.
++    #define USE_FILE32API
++#endif
++
+ #if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
+ 
+   // Linux needs this to support file operation on files larger then 4+GB
diff --git a/external_imported/vcpkg/ports/minizip/lib-to-def.cmake b/external_imported/vcpkg/ports/minizip/lib-to-def.cmake
new file mode 100644
index 000000000..f603702f2
--- /dev/null
+++ b/external_imported/vcpkg/ports/minizip/lib-to-def.cmake
@@ -0,0 +1,40 @@
+function(lib_to_def)
+    if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW OR NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+        return()
+    endif()
+
+    cmake_parse_arguments(PARSE_ARGV 0 arg "" "BASENAME;REGEX" "")
+    if(NOT arg_BASENAME)
+        message(FATAL_ERROR "BASENAME is a required argument.")
+    endif()
+    if(NOT arg_REGEX)
+        set(arg_REGEX "[^ ]+")
+    endif()
+
+    set(logfile "${CURRENT_BUILDTREES_DIR}/dumpbin-${arg_BASENAME}-${TARGET_TRIPLET}-symbols.log")
+    vcpkg_execute_required_process(
+        COMMAND dumpbin /symbols "/OUT:${logfile}" "${CURRENT_PACKAGES_DIR}/lib/${arg_BASENAME}.lib"
+        WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}"
+        LOGNAME "dumpbin-${arg_BASENAME}-${TARGET_TRIPLET}"
+    )
+    file(STRINGS "${logfile}" symbols REGEX "^... ........ SECT.. notype ..    External     [|] ${arg_REGEX}")
+    list(TRANSFORM symbols REPLACE "^[^|]+[|] " "     ")
+    if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
+        string(REPLACE " _" " " symbols "${symbols}")
+    endif()
+    list(JOIN symbols "\n" symbols)
+    set(symbols "EXPORTS\n${symbols}\n")
+    set(def_file "${CMAKE_CURRENT_LIST_DIR}/${arg_BASENAME}-${VCPKG_TARGET_ARCHITECTURE}.def")
+    if(NOT EXISTS "${def_file}")
+        set(def_file "${CMAKE_CURRENT_LIST_DIR}/${arg_BASENAME}-win32.def")
+    endif()
+    if(EXISTS "${def_file}")
+        file(READ "${def_file}" original_symbols)
+    else()
+        set(original_symbols "")
+    endif()
+    if(NOT symbols STREQUAL original_symbols)
+        file(WRITE "${CURRENT_BUILDTREES_DIR}/${arg_BASENAME}-${VCPKG_TARGET_ARCHITECTURE}.def.log" "${symbols}")
+        message(SEND_ERROR "${arg_BASENAME}-${VCPKG_TARGET_ARCHITECTURE}.def has changed.")
+    endif()
+endfunction()
diff --git a/external_imported/vcpkg/ports/minizip/minizip-win32.def b/external_imported/vcpkg/ports/minizip/minizip-win32.def
new file mode 100644
index 000000000..2f108199d
--- /dev/null
+++ b/external_imported/vcpkg/ports/minizip/minizip-win32.def
@@ -0,0 +1,78 @@
+EXPORTS
+     fill_win32_filefunc
+     fill_win32_filefunc64
+     fill_win32_filefunc64A
+     fill_win32_filefunc64W
+     win32_open64_file_func
+     win32_open64_file_funcA
+     win32_open64_file_funcW
+     win32_open_file_func
+     win32_read_file_func
+     win32_write_file_func
+     win32_tell_file_func
+     win32_tell64_file_func
+     win32_seek_file_func
+     win32_seek64_file_func
+     win32_close_file_func
+     win32_error_file_func
+     unzRepair
+     zip_copyright
+     zipOpen
+     zipOpen64
+     zipOpen2
+     zipOpen2_64
+     zipOpen3
+     zipOpenNewFileInZip
+     zipOpenNewFileInZip64
+     zipOpenNewFileInZip2
+     zipOpenNewFileInZip2_64
+     zipOpenNewFileInZip3
+     zipOpenNewFileInZip3_64
+     zipOpenNewFileInZip4
+     zipOpenNewFileInZip4_64
+     zipWriteInFileInZip
+     zipCloseFileInZip
+     zipCloseFileInZipRaw
+     zipCloseFileInZipRaw64
+     zipClose
+     zipRemoveExtraInfoBlock
+     unz_copyright
+     unzStringFileNameCompare
+     unzOpen
+     unzOpen64
+     unzOpen2
+     unzOpen2_64
+     unzClose
+     unzGetGlobalInfo
+     unzGetGlobalInfo64
+     unzGetGlobalComment
+     unzGoToFirstFile
+     unzGoToNextFile
+     unzLocateFile
+     unzGetFilePos
+     unzGoToFilePos
+     unzGetFilePos64
+     unzGoToFilePos64
+     unzGetCurrentFileInfo64
+     unzGetCurrentFileInfo
+     unzGetCurrentFileZStreamPos64
+     unzOpenCurrentFile
+     unzOpenCurrentFilePassword
+     unzOpenCurrentFile2
+     unzOpenCurrentFile3
+     unzCloseCurrentFile
+     unzReadCurrentFile
+     unztell
+     unztell64
+     unzeof
+     unzGetLocalExtrafield
+     unzGetOffset64
+     unzGetOffset
+     unzSetOffset64
+     unzSetOffset
+     fill_fopen64_filefunc
+     fill_fopen_filefunc
+     call_zopen64
+     call_zseek64
+     call_ztell64
+     fill_zlib_filefunc64_32_def_from_filefunc32
diff --git a/external_imported/vcpkg/ports/minizip/minizipConfig.cmake.in b/external_imported/vcpkg/ports/minizip/minizipConfig.cmake.in
index 17fc694e7..4527b18d6 100644
--- a/external_imported/vcpkg/ports/minizip/minizipConfig.cmake.in
+++ b/external_imported/vcpkg/ports/minizip/minizipConfig.cmake.in
@@ -1,12 +1,10 @@
-#@PACKAGE_INIT@
+message(WARNING "'find_package(minizip CONFIG)' is deprecated. Please use 'find_package(unofficial-minizip CONFIG)' instead.")
 
 include(CMakeFindDependencyMacro)
-
-find_dependency(ZLIB)
-
-if (@ENABLE_BZIP2@)
-    find_dependency(BZip2)
+find_dependency(unofficial-minizip ${${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION} CONFIG)
+if(NOT TARGET unofficial::minizip::minizip)
+    set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE)
+elseif(NOT TARGET minizip::minizip)
+    add_library(minizip::minizip INTERFACE IMPORTED)
+    set_target_properties(minizip::minizip PROPERTIES INTERFACE_LINK_LIBRARIES unofficial::minizip::minizip)
 endif()
-
-include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
-check_required_components("@PROJECT_NAME@")
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/minizip/pkgconfig.patch b/external_imported/vcpkg/ports/minizip/pkgconfig.patch
new file mode 100644
index 000000000..107f9fc32
--- /dev/null
+++ b/external_imported/vcpkg/ports/minizip/pkgconfig.patch
@@ -0,0 +1,11 @@
+diff --git a/contrib/minizip/minizip.pc.in b/contrib/minizip/minizip.pc.in
+index 69b5b7f..9e43084 100644
+--- a/contrib/minizip/minizip.pc.in
++++ b/contrib/minizip/minizip.pc.in
+@@ -8,5 +8,5 @@ Description: Minizip zip file manipulation library
+ Requires:
+ Version: @PACKAGE_VERSION@
+ Libs: -L${libdir} -lminizip
+-Libs.private: -lz
++Requires.private: @MINIZIP_REQUIRES@
+ Cflags: -I${includedir}
diff --git a/external_imported/vcpkg/ports/minizip/portfile.cmake b/external_imported/vcpkg/ports/minizip/portfile.cmake
index b929116f5..7972ca378 100644
--- a/external_imported/vcpkg/ports/minizip/portfile.cmake
+++ b/external_imported/vcpkg/ports/minizip/portfile.cmake
@@ -1,49 +1,74 @@
-# When this port is updated, the minizip port should be updated at the same time
-
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
+# When zlib updated, the minizip port should be updated at the same time
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO madler/zlib
-    REF v1.2.13
-    SHA512 44b834fbfb50cca229209b8dbe1f96b258f19a49f5df23b80970b716371d856a4adf525edb4c6e0e645b180ea949cb90f5365a1d896160f297f56794dd888659
+    REF "v${VERSION}"
+    SHA512 8c9642495bafd6fad4ab9fb67f09b268c69ff9af0f4f20cf15dfc18852ff1f312bd8ca41de761b3f8d8e90e77d79f2ccacd3d4c5b19e475ecf09d021fdfe9088
     HEAD_REF master
     PATCHES
         0001-remove-ifndef-NOUNCRYPT.patch
         0002-add-declaration-for-mkdir.patch
-        0003-no-io64.patch
+        pkgconfig.patch
+        android-fileapi.patch
 )
 
+# Maintainer switch: Temporarily set this to 1 to re-generate the lists
+# of exported symbols. This is needed when the version is bumped.
+set(GENERATE_SYMBOLS 0)
+if(GENERATE_SYMBOLS)
+    vcpkg_cmake_get_vars(cmake_vars_file)
+    include("${cmake_vars_file}")
+    if(VCPKG_DETECTED_CMAKE_C_COMPILER_ID STREQUAL "MSVC")
+        vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+    else()
+        set(GENERATE_SYMBOLS 0)
+    endif()
+endif()
+
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
         bzip2   ENABLE_BZIP2
+    INVERTED_FEATURES
+        tools   DISABLE_INSTALL_TOOLS
 )
 
-configure_file("${CMAKE_CURRENT_LIST_DIR}/minizipConfig.cmake.in" "${SOURCE_PATH}/cmake/minizipConfig.cmake.in" COPYONLY)
-configure_file("${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" "${SOURCE_PATH}/CMakeLists.txt" COPYONLY)
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+          "${CMAKE_CURRENT_LIST_DIR}/minizip-win32.def"
+          "${CMAKE_CURRENT_LIST_DIR}/unofficial-minizipConfig.cmake.in"
+    DESTINATION "${SOURCE_PATH}/contrib/minizip"
+)
 
 vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
+    SOURCE_PATH "${SOURCE_PATH}/contrib/minizip"
     OPTIONS
         ${FEATURE_OPTIONS}
-        -DDISABLE_INSTALL_TOOLS=${VCPKG_TARGET_IS_IOS}
+        -DPACKAGE_VERSION=${VERSION}
     OPTIONS_DEBUG
         -DDISABLE_INSTALL_HEADERS=ON
+        -DDISABLE_INSTALL_TOOLS=ON
 )
 
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
-vcpkg_cmake_config_fixup()
-vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/minizip")
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-minizip)
+vcpkg_fixup_pkgconfig()
+
+if("tools" IN_LIST FEATURES)
+    vcpkg_copy_tools(TOOL_NAMES minizip miniunz AUTO_CLEAN)
+endif()
 
 if ("bzip2" IN_LIST FEATURES)
     file(GLOB HEADERS "${CURRENT_PACKAGES_DIR}/include/minizip/*.h")
     foreach(HEADER ${HEADERS})
-        file(READ "${HEADER}" _contents)
-        string(REPLACE "#ifdef HAVE_BZIP2" "#if 1" _contents "${_contents}")
-        file(WRITE "${HEADER}" "${_contents}")
+        vcpkg_replace_string("${HEADER}" "#ifdef HAVE_BZIP2" "#if 1")
     endforeach()
 endif()
 
+configure_file("${CMAKE_CURRENT_LIST_DIR}/minizipConfig.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/minizipConfig.cmake" @ONLY)
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-file(INSTALL "${SOURCE_PATH}/contrib/minizip/MiniZip64_info.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/contrib/minizip/MiniZip64_info.txt")
+
+if(GENERATE_SYMBOLS)
+    include("${CMAKE_CURRENT_LIST_DIR}/lib-to-def.cmake")
+    lib_to_def(BASENAME minizip REGEX "(call|fill|unz|win32|zip)")
+endif()
diff --git a/external_imported/vcpkg/ports/minizip/unofficial-minizipConfig.cmake.in b/external_imported/vcpkg/ports/minizip/unofficial-minizipConfig.cmake.in
new file mode 100644
index 000000000..f2afcbb32
--- /dev/null
+++ b/external_imported/vcpkg/ports/minizip/unofficial-minizipConfig.cmake.in
@@ -0,0 +1,10 @@
+@PACKAGE_INIT@
+
+include(CMakeFindDependencyMacro)
+find_dependency(ZLIB)
+if ("@ENABLE_BZIP2@")
+    find_dependency(BZip2)
+endif()
+
+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-minizipTargets.cmake")
+check_required_components(unofficial-minizip)
diff --git a/external_imported/vcpkg/ports/minizip/usage b/external_imported/vcpkg/ports/minizip/usage
index 38a634066..6113742b8 100644
--- a/external_imported/vcpkg/ports/minizip/usage
+++ b/external_imported/vcpkg/ports/minizip/usage
@@ -1,4 +1,4 @@
 minizip provides CMake targets:
 
-    find_package(minizip CONFIG REQUIRED)
-    target_link_libraries(main PRIVATE minizip::minizip)
+    find_package(unofficial-minizip CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE unofficial::minizip::minizip)
diff --git a/external_imported/vcpkg/ports/minizip/vcpkg.json b/external_imported/vcpkg/ports/minizip/vcpkg.json
index 89f610ccc..fa376cc92 100644
--- a/external_imported/vcpkg/ports/minizip/vcpkg.json
+++ b/external_imported/vcpkg/ports/minizip/vcpkg.json
@@ -1,10 +1,9 @@
 {
   "name": "minizip",
-  "version-semver": "1.2.13",
-  "description": "Zip compression library",
+  "version": "1.3.1",
+  "description": "Minizip zip file manipulation library",
   "homepage": "https://github.com/madler/zlib",
   "license": "Zlib",
-  "supports": "!uwp",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
@@ -14,6 +13,10 @@
       "name": "vcpkg-cmake-config",
       "host": true
     },
+    {
+      "name": "vcpkg-cmake-get-vars",
+      "host": true
+    },
     "zlib"
   ],
   "features": {
@@ -22,6 +25,10 @@
       "dependencies": [
         "bzip2"
       ]
+    },
+    "tools": {
+      "description": "Install tools",
+      "supports": "!ios"
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/mio/portfile.cmake b/external_imported/vcpkg/ports/mio/portfile.cmake
index c6a530e26..a835b20cb 100644
--- a/external_imported/vcpkg/ports/mio/portfile.cmake
+++ b/external_imported/vcpkg/ports/mio/portfile.cmake
@@ -2,8 +2,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mandreyel/mio
-    REF 3f86a95c0784d73ce6815237ec33ed25f233b643
-    SHA512 18bbc41d5c3b29ecafe19cef29687380d8f4f27279af08edb0d5e65ee1d71162f3cf75d8efaa324cd11301f3f49fadaec3e4c1514607d5065ddd7a65bf32ee2a
+    REF 8b6b7d878c89e81614d05edca7936de41ccdd2da
+    SHA512 444131d4839f2244dd88722f5bfad2cfa47336e2a4405518a2ff8f0d80f2755321d7d627f8d5b890864a5dc3f3f810a1c7dd6588ff3e9039a6ef7d010e0f2f06
     HEAD_REF master
 )
 
@@ -20,4 +20,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/mio)
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
 
 # Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/mio/vcpkg.json b/external_imported/vcpkg/ports/mio/vcpkg.json
index a1bb8adda..5d991a15c 100644
--- a/external_imported/vcpkg/ports/mio/vcpkg.json
+++ b/external_imported/vcpkg/ports/mio/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "mio",
-  "version-date": "2023-01-25",
+  "version-date": "2023-03-03",
   "description": "Cross-platform header-only C++11 library for memory mapped file IO.",
   "homepage": "https://github.com/mandreyel/mio",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/mlpack/portfile.cmake b/external_imported/vcpkg/ports/mlpack/portfile.cmake
index 71ca9715a..069b2f106 100644
--- a/external_imported/vcpkg/ports/mlpack/portfile.cmake
+++ b/external_imported/vcpkg/ports/mlpack/portfile.cmake
@@ -2,8 +2,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mlpack/mlpack
-    REF ${VERSION}
-    SHA512 4a3a3c8c770a67f949252f664837f0bbfd0c4ef073536c6b2d28cd127cf514e08ab524bdec44559ac14ced65ba48d9c2ab99b16651649cfd100e92932ab126bb
+    REF "${VERSION}"
+    SHA512 6b7c16190fa5106dde76cbedddc42ed0a4a97fcc606dc0b962744fdc812ac81f59a21b6cf071e3a8661c58cb9de2654a4eabd03c4f44d6091f99175887735c41
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/mlpack/vcpkg.json b/external_imported/vcpkg/ports/mlpack/vcpkg.json
index 051fae704..8c68206a7 100644
--- a/external_imported/vcpkg/ports/mlpack/vcpkg.json
+++ b/external_imported/vcpkg/ports/mlpack/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "mlpack",
-  "version": "4.0.1",
+  "version": "4.3.0",
   "description": "mlpack is an intuitive, fast, and flexible header-only C++ machine learning library with bindings to other languages.",
   "homepage": "https://github.com/mlpack/mlpack",
   "license": "BSD-3-Clause",
@@ -9,25 +9,6 @@
     "armadillo",
     "cereal",
     "ensmallen",
-    "stb",
-    {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
-    }
-  ],
-  "features": {
-    "openmp": {
-      "description": "use OpenMP for parallelization."
-    },
-    "tools": {
-      "description": "Build command-line executables.",
-      "dependencies": [
-        "boost-format"
-      ]
-    }
-  }
+    "stb"
+  ]
 }
diff --git a/external_imported/vcpkg/ports/mmloader/fix-platform-name.patch b/external_imported/vcpkg/ports/mmloader/fix-platform-name.patch
new file mode 100644
index 000000000..c30d381fc
--- /dev/null
+++ b/external_imported/vcpkg/ports/mmloader/fix-platform-name.patch
@@ -0,0 +1,18 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b672037..f9a6a15 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -14,6 +14,13 @@ if ((NOT DEFINED CMAKE_VS_PLATFORM_NAME) OR (CMAKE_VS_PLATFORM_NAME STREQUAL "")
+     message(STATUS "CMAKE_VS_PLATFORM_NAME is empty, use default: Win32")
+     set(CMAKE_VS_PLATFORM_NAME Win32)
+ endif()
++
++if(VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
++    set(CMAKE_VS_PLATFORM_NAME "Win32")
++else()
++    set(CMAKE_VS_PLATFORM_NAME "${VCPKG_TARGET_ARCHITECTURE}")
++endif()
++
+ message(STATUS "CMAKE_VS_PLATFORM_NAME=" ${CMAKE_VS_PLATFORM_NAME})
+ string(COMPARE EQUAL "${CMAKE_VS_PLATFORM_NAME}" Win32 BUILD_ARC_X8632)
+ string(COMPARE EQUAL "${CMAKE_VS_PLATFORM_NAME}" x64 BUILD_ARC_X8664)
diff --git a/external_imported/vcpkg/ports/mmloader/portfile.cmake b/external_imported/vcpkg/ports/mmloader/portfile.cmake
index 1250881fa..08226de45 100644
--- a/external_imported/vcpkg/ports/mmloader/portfile.cmake
+++ b/external_imported/vcpkg/ports/mmloader/portfile.cmake
@@ -6,6 +6,8 @@ vcpkg_from_github(
     REF 1.0.1
     SHA512 a41749e1b62d5549b821429a03e456a0cb41fbc1ea3fe5e8067f80994fb4645c3145dd1e2a3ccaed13b091ec24338d4e542849628d346f26d2275b0cbff8f4c6
     HEAD_REF master
+    PATCHES
+        fix-platform-name.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -23,4 +25,4 @@ vcpkg_cmake_install(DISABLE_PARALLEL)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/License" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/License")
diff --git a/external_imported/vcpkg/ports/mmloader/vcpkg.json b/external_imported/vcpkg/ports/mmloader/vcpkg.json
index e436ab111..52a8e56af 100644
--- a/external_imported/vcpkg/ports/mmloader/vcpkg.json
+++ b/external_imported/vcpkg/ports/mmloader/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "mmloader",
   "version": "1.0.1",
-  "port-version": 2,
+  "port-version": 3,
   "description": "A library for loading dll module bypassing windows PE loader from memory (x86/x64)",
   "homepage": "http://tishion.github.io/mmLoader/",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/mnn/portfile.cmake b/external_imported/vcpkg/ports/mnn/portfile.cmake
index 90a492cb3..4ae56b276 100644
--- a/external_imported/vcpkg/ports/mnn/portfile.cmake
+++ b/external_imported/vcpkg/ports/mnn/portfile.cmake
@@ -17,19 +17,16 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     test        MNN_BUILD_TEST
     test        MNN_BUILD_BENCHMARK
     cuda        MNN_CUDA
-    cuda        MNN_GPU_TRACE
     vulkan      MNN_VULKAN
-    vulkan      MNN_GPU_TRACE
-    vulkan      MNN_USE_SYSTEM_LIB
     opencl      MNN_OPENCL
-    opencl      MNN_USE_SYSTEM_LIB
     metal       MNN_METAL
-    metal       MNN_GPU_TRACE
     tools       MNN_BUILD_TOOLS
     tools       MNN_BUILD_QUANTOOLS
     tools       MNN_BUILD_TRAIN
     tools       MNN_EVALUATION
     tools       MNN_BUILD_CONVERTER
+    gpu         MNN_GPU_TRACE
+    system      MNN_USE_SYSTEM_LIB
 )
 
 # 'cuda' feature in Windows failes with Ninja because of parallel PDB access. Make it optional
diff --git a/external_imported/vcpkg/ports/mnn/vcpkg.json b/external_imported/vcpkg/ports/mnn/vcpkg.json
index 5a587ff67..013a8352f 100644
--- a/external_imported/vcpkg/ports/mnn/vcpkg.json
+++ b/external_imported/vcpkg/ports/mnn/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "mnn",
   "version": "1.1.0",
-  "port-version": 4,
+  "port-version": 5,
   "description": "MNN is a blazing fast, lightweight deep learning framework, battle-tested by business-critical use cases in Alibaba",
   "homepage": "https://www.mnn.zone/",
   "license": "Apache-2.0",
@@ -24,18 +24,44 @@
       "description": "Enable CUDA API backend",
       "dependencies": [
         "cuda",
-        "cudnn"
+        "cudnn",
+        {
+          "name": "mnn",
+          "features": [
+            "gpu"
+          ]
+        }
       ]
     },
+    "gpu": {
+      "description": "Enable MNN Gpu Debug"
+    },
     "metal": {
-      "description": "Enable Metal API backend for Apple platforms"
+      "description": "Enable Metal API backend for Apple platforms",
+      "dependencies": [
+        {
+          "name": "mnn",
+          "features": [
+            "gpu"
+          ]
+        }
+      ]
     },
     "opencl": {
       "description": "Enable OpenCL API backend",
       "dependencies": [
+        {
+          "name": "mnn",
+          "features": [
+            "system"
+          ]
+        },
         "opencl"
       ]
     },
+    "system": {
+      "description": "For opencl and vulkan, use system lib or use dlopen"
+    },
     "test": {
       "description": "Build MNN test programs"
     },
@@ -48,6 +74,13 @@
     "vulkan": {
       "description": "Enable Vulkan API backend",
       "dependencies": [
+        {
+          "name": "mnn",
+          "features": [
+            "gpu",
+            "system"
+          ]
+        },
         "vulkan"
       ]
     }
diff --git a/external_imported/vcpkg/ports/modern-cpp-kafka/CMakeLists.txt b/external_imported/vcpkg/ports/modern-cpp-kafka/CMakeLists.txt
new file mode 100644
index 000000000..5dc8106ed
--- /dev/null
+++ b/external_imported/vcpkg/ports/modern-cpp-kafka/CMakeLists.txt
@@ -0,0 +1,27 @@
+cmake_minimum_required(VERSION 3.12 FATAL_ERROR)
+
+project(modern-cpp-kafka LANGUAGES CXX)
+
+include(GNUInstallDirs)
+
+find_package(RdKafka CONFIG REQUIRED)
+find_package(Boost REQUIRED)
+find_package(RapidJSON CONFIG REQUIRED)
+
+add_library(modern-cpp-kafka INTERFACE)
+target_include_directories(modern-cpp-kafka INTERFACE $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+target_link_libraries(modern-cpp-kafka INTERFACE RdKafka::rdkafka Boost::boost rapidjson)
+
+install(TARGETS modern-cpp-kafka EXPORT unofficial-modern-cpp-kafka)
+
+install(
+    EXPORT unofficial-modern-cpp-kafka
+    FILE unofficial-modern-cpp-kafka-config.cmake
+    DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/unofficial-modern-cpp-kafka"
+    NAMESPACE unofficial::modern-cpp-kafka::
+)
+
+install(
+    DIRECTORY "${CMAKE_SOURCE_DIR}/include/kafka"
+    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+)
diff --git a/external_imported/vcpkg/ports/modern-cpp-kafka/portfile.cmake b/external_imported/vcpkg/ports/modern-cpp-kafka/portfile.cmake
new file mode 100644
index 000000000..fbbe3d25e
--- /dev/null
+++ b/external_imported/vcpkg/ports/modern-cpp-kafka/portfile.cmake
@@ -0,0 +1,32 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO morganstanley/modern-cpp-kafka
+    REF "v${VERSION}"
+    SHA512 5071ba4aeb80d94fd078df054e3a36249e2e433bda2af4c26686cd5b0615d622cfd964c7193d075cc549a572cfa5b11bc4bbab9e00de7c80ea2bbf4a9d797201
+    HEAD_REF main
+)
+
+set(VCPKG_BUILD_TYPE release) # header-only port
+
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup()
+
+file(READ "${CURRENT_PACKAGES_DIR}/share/unofficial-modern-cpp-kafka/unofficial-modern-cpp-kafka-config.cmake" cmake_config)
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/unofficial-modern-cpp-kafka/unofficial-modern-cpp-kafka-config.cmake"
+"include(CMakeFindDependencyMacro)
+find_dependency(RdKafka CONFIG)
+find_dependency(Boost)
+find_dependency(RapidJSON CONFIG)
+${cmake_config}
+")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/modern-cpp-kafka/usage b/external_imported/vcpkg/ports/modern-cpp-kafka/usage
new file mode 100644
index 000000000..6ed3611d2
--- /dev/null
+++ b/external_imported/vcpkg/ports/modern-cpp-kafka/usage
@@ -0,0 +1,4 @@
+modern-cpp-kafka provides CMake targets:
+
+    find_package(unofficial-modern-cpp-kafka CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE unofficial::modern-cpp-kafka::modern-cpp-kafka)
diff --git a/external_imported/vcpkg/ports/modern-cpp-kafka/vcpkg.json b/external_imported/vcpkg/ports/modern-cpp-kafka/vcpkg.json
new file mode 100644
index 000000000..3dae28c28
--- /dev/null
+++ b/external_imported/vcpkg/ports/modern-cpp-kafka/vcpkg.json
@@ -0,0 +1,20 @@
+{
+  "name": "modern-cpp-kafka",
+  "version-string": "2023.03.07",
+  "description": "A C++ API for Kafka clients (i.e. KafkaProducer, KafkaConsumer, AdminClient)",
+  "homepage": "https://github.com/morganstanley/modern-cpp-kafka",
+  "license": "Apache-2.0",
+  "dependencies": [
+    "boost-optional",
+    "librdkafka",
+    "rapidjson",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/mongo-c-driver/disable-dynamic-when-static.patch b/external_imported/vcpkg/ports/mongo-c-driver/disable-dynamic-when-static.patch
index 4b6e5a462..5b20964b7 100644
--- a/external_imported/vcpkg/ports/mongo-c-driver/disable-dynamic-when-static.patch
+++ b/external_imported/vcpkg/ports/mongo-c-driver/disable-dynamic-when-static.patch
@@ -1,72 +1,38 @@
 diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt
-index 7fcdd86..1b32e6c 100644
+index c36dff1..525e065 100644
 --- a/src/libmongoc/CMakeLists.txt
 +++ b/src/libmongoc/CMakeLists.txt
-@@ -758,6 +758,7 @@ if (MONGOC_ENABLE_MONGODB_AWS_AUTH)
-    endif()
+@@ -812,7 +812,7 @@ if (MONGOC_ENABLE_STATIC_BUILD)
+    set_target_properties (mcd_rpc PROPERTIES OUTPUT_NAME "mcd-rpc")
  endif ()
  
+-if (ENABLE_SHARED)
 +if (NOT MONGOC_ENABLE_STATIC_BUILD)
- add_library (mongoc_shared SHARED ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING})
- set_target_properties (mongoc_shared PROPERTIES CMAKE_CXX_VISIBILITY_PRESET hidden)
- target_link_libraries (mongoc_shared PRIVATE ${LIBRARIES} PUBLIC ${BSON_LIBRARIES})
-@@ -796,7 +797,7 @@ target_include_directories (
- set_target_properties (mongoc_shared PROPERTIES VERSION 0.0.0 SOVERSION 0)
- set_target_properties (mongoc_shared PROPERTIES OUTPUT_NAME "${MONGOC_OUTPUT_BASENAME}-${MONGOC_API_VERSION}")
- 
--if (MONGOC_ENABLE_STATIC_BUILD)
-+else ()
-    add_library (mongoc_static STATIC ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING})
-    target_link_libraries (mongoc_static PUBLIC ${STATIC_LIBRARIES} ${BSON_STATIC_LIBRARIES})
-    if (NOT WIN32 AND ENABLE_PIC)
-@@ -847,7 +848,11 @@ if (ENABLE_APPLE_FRAMEWORK)
+    add_library (mongoc_shared SHARED ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING})
+    if(WIN32)
+       # Add resource-definition script for Windows shared library (.dll).
+@@ -1253,7 +1253,7 @@ if (MONGOC_ENABLE_STATIC_INSTALL)
+    list (APPEND TARGETS_TO_INSTALL mongoc_static)
  endif ()
  
- add_executable (mongoc-stat ${PROJECT_SOURCE_DIR}/../../src/tools/mongoc-stat.c)
+-if (ENABLE_SHARED)
 +if (NOT MONGOC_ENABLE_STATIC_BUILD)
- target_link_libraries (mongoc-stat mongoc_shared ${LIBRARIES})
-+else()
-+target_link_libraries (mongoc-stat mongoc_static ${LIBRARIES})
-+endif()
+    list (APPEND TARGETS_TO_INSTALL mongoc_shared)
+ endif ()
  
- # mongoc-stat works if shared memory performance counters are enabled.
- if (ENABLE_SHM_COUNTERS STREQUAL "ON")
-@@ -1161,7 +1166,7 @@ file (COPY ${PROJECT_SOURCE_DIR}/tests/x509gen DESTINATION ${PROJECT_BINARY_DIR}
- file (COPY ${PROJECT_SOURCE_DIR}/tests/release_files DESTINATION ${PROJECT_BINARY_DIR}/tests)
+@@ -1308,6 +1308,7 @@ endif()
+ set_property(TARGET ${TARGETS_TO_INSTALL} APPEND PROPERTY pkg_config_INCLUDE_DIRECTORIES "${MONGOC_HEADER_INSTALL_DIR}")
  
- if (MONGOC_ENABLE_STATIC_INSTALL)
--   set (TARGETS_TO_INSTALL mongoc_shared mongoc_static)
-+   set (TARGETS_TO_INSTALL mongoc_static)
- else ()
-    set (TARGETS_TO_INSTALL mongoc_shared)
- endif ()
-@@ -1226,10 +1231,12 @@ configure_file (
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/libmongoc-1.0.pc.in
-    ${CMAKE_CURRENT_BINARY_DIR}/src/libmongoc-1.0.pc
- @ONLY)
-+if(NOT MONGOC_ENABLE_STATIC_INSTALL)
- install (
-    FILES ${CMAKE_CURRENT_BINARY_DIR}/src/libmongoc-1.0.pc
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
- )
-+endif()
- if (MONGOC_ENABLE_STATIC_INSTALL)
-    configure_file (
-       ${CMAKE_CURRENT_SOURCE_DIR}/src/libmongoc-static-1.0.pc.in
-@@ -1239,7 +1246,7 @@ if (MONGOC_ENABLE_STATIC_INSTALL)
-       FILES ${CMAKE_CURRENT_BINARY_DIR}/src/libmongoc-static-1.0.pc
-       DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
-    )
--endif ()
-+else()
  # Deprecated alias for libmongoc-1.0.pc, see CDRIVER-2086.
++if(NOT MONGOC_ENABLE_STATIC_INSTALL)
  if (MONGOC_ENABLE_SSL)
     configure_file (
-@@ -1251,6 +1258,7 @@ if (MONGOC_ENABLE_SSL)
+       ${CMAKE_CURRENT_SOURCE_DIR}/src/libmongoc-ssl-1.0.pc.in
+@@ -1318,6 +1319,7 @@ if (MONGOC_ENABLE_SSL)
        DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
     )
  endif ()
-+endif()
++endif ()
  
  include (CMakePackageConfigHelpers)
- set (INCLUDE_INSTALL_DIRS "${MONGOC_HEADER_INSTALL_DIR}")
+ 
diff --git a/external_imported/vcpkg/ports/mongo-c-driver/fix-dependencies.patch b/external_imported/vcpkg/ports/mongo-c-driver/fix-dependencies.patch
index 510abe072..2cb09d591 100644
--- a/external_imported/vcpkg/ports/mongo-c-driver/fix-dependencies.patch
+++ b/external_imported/vcpkg/ports/mongo-c-driver/fix-dependencies.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 71c13fd..8464824 100644
+index 1fe4c76..96be699 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -205,11 +205,9 @@ if (ENABLE_BSON STREQUAL SYSTEM)
+@@ -347,11 +347,9 @@ if (USE_SYSTEM_LIBBSON)
  
     set (USING_SYSTEM_BSON TRUE)
     if (NOT TARGET mongo::bson_shared)
@@ -14,29 +14,48 @@ index 71c13fd..8464824 100644
     endif ()
     set (BSON_STATIC_LIBRARIES mongo::bson_static)
  endif ()
+diff --git a/build/cmake/libmongoc-1.0-config.cmake.in b/build/cmake/libmongoc-1.0-config.cmake.in
+index a068408..d0aeadd 100644
+--- a/build/cmake/libmongoc-1.0-config.cmake.in
++++ b/build/cmake/libmongoc-1.0-config.cmake.in
+@@ -24,6 +24,9 @@ set (MONGOC_VERSION_FULL @libmongoc_VERSION_FULL@)
+ 
+ include(CMakeFindDependencyMacro)
+ find_dependency (mongoc-1.0)
++if("@ENABLE_SNAPPY@" STREQUAL "ON")
++    find_dependency(Snappy CONFIG)
++endif()
+ 
+ set(MONGOC_LIBRARY mongo::mongoc_shared)
+ set(MONGOC_LIBRARIES mongo::mongoc_shared)
+diff --git a/build/cmake/libmongoc-static-1.0-config.cmake.in b/build/cmake/libmongoc-static-1.0-config.cmake.in
+index bec3163..a32d5f3 100644
+--- a/build/cmake/libmongoc-static-1.0-config.cmake.in
++++ b/build/cmake/libmongoc-static-1.0-config.cmake.in
+@@ -24,6 +24,9 @@ set (MONGOC_STATIC_VERSION_FULL @libmongoc_VERSION_FULL@)
+ 
+ include(CMakeFindDependencyMacro)
+ find_dependency (mongoc-1.0)
++if("@ENABLE_SNAPPY@" STREQUAL "ON")
++    find_dependency(Snappy CONFIG)
++endif()
+ 
+ set(MONGOC_STATIC_LIBRARY mongo::mongoc_static)
+ set(MONGOC_STATIC_LIBRARIES mongo::mongoc_static)
 diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt
-index d108e5d..a097016 100644
+index 5f553c5..4675313 100644
 --- a/src/libmongoc/CMakeLists.txt
 +++ b/src/libmongoc/CMakeLists.txt
-@@ -55,7 +55,7 @@ configure_file (
+@@ -50,7 +50,7 @@ endif ()
  set (ZLIB_INCLUDE_DIRS "")
  if (ENABLE_ZLIB MATCHES "SYSTEM|AUTO")
     message (STATUS "Searching for zlib CMake packages")
 -   include (FindZLIB)
 +   find_package(ZLIB REQUIRED)
     if (ZLIB_FOUND)
-       message ("--   zlib found version \"${ZLIB_VERSION_STRING}\"")
-       message ("--   zlib include path \"${ZLIB_INCLUDE_DIRS}\"")
-@@ -150,7 +150,7 @@ if (NOT ENABLE_SSL STREQUAL OFF)
-    if (ENABLE_SSL STREQUAL "OPENSSL"
-        OR (NOT APPLE AND NOT WIN32 AND ENABLE_SSL STREQUAL "AUTO"))
-       # Sets OPENSSL_FOUND on success.
--      include (FindOpenSSL)
-+      find_package(OpenSSL REQUIRED)
-    endif ()
- 
-    if (ENABLE_SSL STREQUAL LIBRESSL)
-@@ -364,10 +364,10 @@ else ()
+       message (STATUS "   zlib found version \"${ZLIB_VERSION_STRING}\"")
+       message (STATUS "   zlib include path \"${ZLIB_INCLUDE_DIRS}\"")
+@@ -468,10 +468,10 @@ else ()
  endif ()
  
  # Sets SNAPPY_LIBRARIES and SNAPPY_INCLUDE_DIRS.
@@ -49,45 +68,17 @@ index d108e5d..a097016 100644
 -   include_directories ("${SNAPPY_INCLUDE_DIRS}")
  endif ()
  
- set (MONGOC_ENABLE_SHM_COUNTERS 0)
-diff --git a/src/libmongoc/build/cmake/libmongoc-1.0-config.cmake.in b/src/libmongoc/build/cmake/libmongoc-1.0-config.cmake.in
-index feeca02..1ec92ae 100644
---- a/src/libmongoc/build/cmake/libmongoc-1.0-config.cmake.in
-+++ b/src/libmongoc/build/cmake/libmongoc-1.0-config.cmake.in
-@@ -19,6 +19,10 @@ set (MONGOC_MINOR_VERSION @MONGOC_MINOR_VERSION@)
- set (MONGOC_MICRO_VERSION @MONGOC_MICRO_VERSION@)
- set (MONGOC_VERSION @MONGOC_VERSION@)
- 
-+include(CMakeFindDependencyMacro)
-+if("@ENABLE_SNAPPY@" STREQUAL "ON")
-+    find_dependency(Snappy CONFIG)
-+endif()
- find_package (libbson-1.0 "@MONGOC_MAJOR_VERSION@.@MONGOC_MINOR_VERSION@" REQUIRED)
- 
- @PACKAGE_INIT@
-diff --git a/src/libmongoc/build/cmake/libmongoc-static-1.0-config.cmake.in b/src/libmongoc/build/cmake/libmongoc-static-1.0-config.cmake.in
-index 6f05b0c..0e388e6 100644
---- a/src/libmongoc/build/cmake/libmongoc-static-1.0-config.cmake.in
-+++ b/src/libmongoc/build/cmake/libmongoc-static-1.0-config.cmake.in
-@@ -19,6 +19,10 @@ set (MONGOC_STATIC_MINOR_VERSION @MONGOC_MINOR_VERSION@)
- set (MONGOC_STATIC_MICRO_VERSION @MONGOC_MICRO_VERSION@)
- set (MONGOC_STATIC_VERSION @MONGOC_VERSION@)
- 
-+include(CMakeFindDependencyMacro)
-+if("@ENABLE_SNAPPY@" STREQUAL "ON")
-+    find_dependency(Snappy CONFIG)
-+endif()
- find_package (libbson-static-1.0 "@MONGOC_MAJOR_VERSION@.@MONGOC_MINOR_VERSION@" REQUIRED)
- 
- @PACKAGE_INIT@
+ mongo_bool01 (MONGOC_ENABLE_SHM_COUNTERS ENABLE_SHM_COUNTERS)
 diff --git a/src/libmongoc/src/mongoc-config.cmake b/src/libmongoc/src/mongoc-config.cmake
-index 7fe7cf4..12611a3 100644
+index 31e6cbc..365fb5b 100644
 --- a/src/libmongoc/src/mongoc-config.cmake
 +++ b/src/libmongoc/src/mongoc-config.cmake
-@@ -1,3 +1,6 @@
+@@ -1,5 +1,8 @@
  include(CMakeFindDependencyMacro)
+ find_dependency(bson-1.0 @libmongoc_VERSION@)
 +if("@ENABLE_SNAPPY@" STREQUAL "ON")
 +    find_dependency(Snappy CONFIG)
 +endif()
- find_dependency(bson-1.0 @MONGOC_MAJOR_VERSION@.@MONGOC_MINOR_VERSION@.@MONGOC_MICRO_VERSION@)
- include("${CMAKE_CURRENT_LIST_DIR}/mongoc-targets.cmake")
+ 
+ # If we need to import a TLS package for our imported targets, do that now:
+ set(MONGOC_TLS_BACKEND [[@TLS_BACKEND@]])
diff --git a/external_imported/vcpkg/ports/mongo-c-driver/fix-include-directory.patch b/external_imported/vcpkg/ports/mongo-c-driver/fix-include-directory.patch
index 411604fe3..965f1d17a 100644
--- a/external_imported/vcpkg/ports/mongo-c-driver/fix-include-directory.patch
+++ b/external_imported/vcpkg/ports/mongo-c-driver/fix-include-directory.patch
@@ -1,8 +1,8 @@
 diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt
-index 86f59ae..d108e5d 100644
+index 4675313..847e073 100644
 --- a/src/libmongoc/CMakeLists.txt
 +++ b/src/libmongoc/CMakeLists.txt
-@@ -1172,7 +1172,7 @@ else ()
+@@ -1255,7 +1255,7 @@ else ()
  endif ()
  
  set (MONGOC_HEADER_INSTALL_DIR
@@ -11,23 +11,3 @@ index 86f59ae..d108e5d 100644
  )
  
  install (
-diff --git a/src/libmongoc/src/libmongoc-1.0.pc.in b/src/libmongoc/src/libmongoc-1.0.pc.in
-index 1b489d8..991603e 100644
---- a/src/libmongoc/src/libmongoc-1.0.pc.in
-+++ b/src/libmongoc/src/libmongoc-1.0.pc.in
-@@ -8,4 +8,4 @@ Description: The libmongoc MongoDB client library.
- Version: @VERSION@
- Requires: libbson-1.0
- Libs: -L${libdir} -lmongoc-1.0
--Cflags: -I${includedir}/libmongoc-@MONGOC_API_VERSION@
-+Cflags: -I${includedir}
-diff --git a/src/libmongoc/src/libmongoc-static-1.0.pc.in b/src/libmongoc/src/libmongoc-static-1.0.pc.in
-index d59ee64..c23bb62 100644
---- a/src/libmongoc/src/libmongoc-static-1.0.pc.in
-+++ b/src/libmongoc/src/libmongoc-static-1.0.pc.in
-@@ -8,4 +8,4 @@ Description: The libmongoc MongoDB client library.
- Version: @VERSION@
- Requires: libbson-static-1.0
- Libs: -L${libdir} -lmongoc-static-1.0 @MONGOC_LIBRARIES@
--Cflags: -I${includedir}/libmongoc-@MONGOC_API_VERSION@ -DMONGOC_STATIC
-+Cflags: -I${includedir}/libmongoc -DMONGOC_STATIC
diff --git a/external_imported/vcpkg/ports/mongo-c-driver/fix-mingw.patch b/external_imported/vcpkg/ports/mongo-c-driver/fix-mingw.patch
index 2695cea12..4ff5c8658 100644
--- a/external_imported/vcpkg/ports/mongo-c-driver/fix-mingw.patch
+++ b/external_imported/vcpkg/ports/mongo-c-driver/fix-mingw.patch
@@ -1,55 +1,42 @@
-diff --git a/build/cmake/FindResSearch.cmake b/build/cmake/FindResSearch.cmake
-index fcd791b..346f715 100644
---- a/build/cmake/FindResSearch.cmake
-+++ b/build/cmake/FindResSearch.cmake
-@@ -2,7 +2,7 @@ include (CheckSymbolExists)
- 
- if (ENABLE_SRV STREQUAL ON OR ENABLE_SRV STREQUAL AUTO)
-    if (WIN32)
--      set (RESOLV_LIBRARIES Dnsapi)
-+      set (RESOLV_LIBRARIES dnsapi)
-       set (MONGOC_HAVE_DNSAPI 1)
-       set (MONGOC_HAVE_RES_NSEARCH 0)
-       set (MONGOC_HAVE_RES_NDESTROY 0)
 diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt
-index 2e1f854..95e6b6b 100644
+index 847e073..5338bea 100644
 --- a/src/libmongoc/CMakeLists.txt
 +++ b/src/libmongoc/CMakeLists.txt
-@@ -688,7 +688,7 @@ if (NOT ENABLE_SSL STREQUAL OFF)
-          ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-stream-tls-secure-channel.c
-          ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-secure-channel.c
-       )
--      set (SSL_LIBRARIES secur32.lib crypt32.lib Bcrypt.lib)
-+      set (SSL_LIBRARIES secur32.lib crypt32.lib bcrypt.lib)
-    elseif (LIBRESSL)
-       message (STATUS "Compiling against LibreSSL")
-       set (SOURCES ${SOURCES}
-@@ -714,7 +714,7 @@ if (MONGOC_ENABLE_SASL)
-       message (STATUS "Compiling against Windows SSPI")
-       set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-cluster-sspi.c)
-       set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-sspi.c)
--      set (SASL_LIBRARIES secur32.lib crypt32.lib Shlwapi.lib)
-+      set (SASL_LIBRARIES secur32.lib crypt32.lib shlwapi.lib)
-    endif ()
- else ()
-    message (STATUS "SASL disabled")
+@@ -189,7 +189,7 @@ endfunction()
+ # Per-backend link libs/options:
+ set(SecureTransport/LINK_LIBRARIES "-framework CoreFoundation" "-framework Security")
+ set(SecureTransport/pkg_config_LIBS -framework Corefoundation -framework Security)
+-set(SecureChannel/LINK_LIBRARIES secur32.lib crypt32.lib Bcrypt.lib)
++set(SecureChannel/LINK_LIBRARIES secur32.lib crypt32.lib bcrypt.lib)
+ set(SecureChannel/pkg_config_LIBS ${SecureChannel/LINK_LIBRARIES})
+ set(LibreSSL/LINK_LIBRARIES LibreSSL::TLS LibreSSL::Crypto)
+ set(LibreSSL/pkg_config_LIBS -ltls -lcrypto)
+@@ -340,7 +340,7 @@ function(_use_sasl libname)
+    target_link_libraries(_mongoc-dependencies INTERFACE _mongoc-sasl_backend)
+    install(TARGETS _mongoc-sasl_backend EXPORT mongoc-targets)
+    if(libname STREQUAL "SSPI")
+-      target_link_libraries(_mongoc-sasl_backend INTERFACE secur32.lib crypt32.lib Shlwapi.lib)
++      target_link_libraries(_mongoc-sasl_backend INTERFACE secur32.lib crypt32.lib shlwapi.lib)
+       set(backend "SSPI")
+    elseif(libname STREQUAL "CYRUS")
+       find_package(SASL2 2.0 REQUIRED)
 diff --git a/src/libmongoc/src/mongoc/mongoc-client.c b/src/libmongoc/src/mongoc/mongoc-client.c
-index 457c841..7b6d585 100644
+index 15517e6..00cd017 100644
 --- a/src/libmongoc/src/mongoc/mongoc-client.c
 +++ b/src/libmongoc/src/mongoc/mongoc-client.c
-@@ -19,8 +19,8 @@
+@@ -18,8 +18,8 @@
  #include "mongoc-config.h"
  #ifdef MONGOC_HAVE_DNSAPI
  /* for DnsQuery_UTF8 */
 -#include <Windows.h>
 -#include <WinDNS.h>
 +#include <windows.h>
-+#include <windns.h>
++#include <winDNS.h>
  #include <ws2tcpip.h>
  #else
  #if defined(MONGOC_HAVE_RES_NSEARCH) || defined(MONGOC_HAVE_RES_SEARCH)
 diff --git a/src/libmongoc/src/mongoc/mongoc-socket.c b/src/libmongoc/src/mongoc/mongoc-socket.c
-index e085adb..592bc89 100644
+index a77d805..15d39b4 100644
 --- a/src/libmongoc/src/mongoc/mongoc-socket.c
 +++ b/src/libmongoc/src/mongoc/mongoc-socket.c
 @@ -25,7 +25,7 @@
diff --git a/external_imported/vcpkg/ports/mongo-c-driver/pkgconfig.patch b/external_imported/vcpkg/ports/mongo-c-driver/pkgconfig.patch
deleted file mode 100644
index 65a94c20b..000000000
--- a/external_imported/vcpkg/ports/mongo-c-driver/pkgconfig.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt
-index 1b32e6c..2e1f854 100644
---- a/src/libmongoc/CMakeLists.txt
-+++ b/src/libmongoc/CMakeLists.txt
-@@ -1207,6 +1207,22 @@ set (VERSION "${MONGOC_VERSION}")
- set (prefix "${CMAKE_INSTALL_PREFIX}")
- set (libdir "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
- 
-+set(MONGOC_REQUIRES_PRIVATE zlib)
-+set(ZLIB_LIBRARIES "")
-+if(ENABLE_SSL STREQUAL "OPENSSL")
-+   string(APPEND MONGOC_REQUIRES_PRIVATE " openssl")
-+   set(SSL_LIBRARIES "")
-+endif()
-+if(ENABLE_ICU)
-+   string(APPEND MONGOC_REQUIRES_PRIVATE " icu-uc")
-+   set(ICU_LIBRARIES "")
-+endif()
-+if(ENABLE_SNAPPY)
-+   set(SNAPPY_LIBRARIES "-lsnappy")
-+   if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-+      string(APPEND SNAPPY_LIBRARIES "d")
-+   endif()
-+endif()
- foreach (
-       FLAG
-       ${SASL_LIBRARIES} ${SSL_LIBRARIES} ${SHM_LIBRARIES} ${RESOLV_LIBRARIES}
-diff --git a/src/libmongoc/src/libmongoc-static-1.0.pc.in b/src/libmongoc/src/libmongoc-static-1.0.pc.in
-index c23bb62..7b38f0a 100644
---- a/src/libmongoc/src/libmongoc-static-1.0.pc.in
-+++ b/src/libmongoc/src/libmongoc-static-1.0.pc.in
-@@ -9,3 +9,4 @@ Version: @VERSION@
- Requires: libbson-static-1.0
- Libs: -L${libdir} -lmongoc-static-1.0 @MONGOC_LIBRARIES@
- Cflags: -I${includedir}/libmongoc -DMONGOC_STATIC
-+Requires.private: @MONGOC_REQUIRES_PRIVATE@
diff --git a/external_imported/vcpkg/ports/mongo-c-driver/portfile.cmake b/external_imported/vcpkg/ports/mongo-c-driver/portfile.cmake
index fc1f6116c..d54926f63 100644
--- a/external_imported/vcpkg/ports/mongo-c-driver/portfile.cmake
+++ b/external_imported/vcpkg/ports/mongo-c-driver/portfile.cmake
@@ -1,19 +1,15 @@
 # This port needs to be updated at the same time as libbson
-
-vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mongodb/mongo-c-driver
     REF "${VERSION}"
-    SHA512 36cd8844b1cc9a935c50afc240523f9aaac7cffa58a5d0f9850848f22ab0f1f5a7202ec9b56b0a7d15f075f665bcecbec63b28d2074d35a7cf25065f9075c15e
+    SHA512 a80e20917edb752ac5eb42534beaa0122a383037f83a554ee00ce37ae690be68521eaa282b4a5802a5440b61038bcd5414356e16a2ce729ba1193d0738a6ce1c
     HEAD_REF master
     PATCHES
         disable-dynamic-when-static.patch
-        fix-include-directory.patch # vcpkg legacy decision
         fix-dependencies.patch
+        fix-include-directory.patch
         fix-mingw.patch
-        pkgconfig.patch
 )
 file(WRITE "${SOURCE_PATH}/VERSION_CURRENT" "${VERSION}")
 
@@ -46,9 +42,11 @@ endif()
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    DISABLE_PARALLEL_CONFIGURE
     OPTIONS
         ${OPTIONS}
-        -DENABLE_BSON=SYSTEM
+        "-DBUILD_VERSION=${VERSION}"
+        -DUSE_SYSTEM_LIBBSON=ON
         -DENABLE_EXAMPLES=OFF
         -DENABLE_SHM_COUNTERS=OFF
         -DENABLE_STATIC=${ENABLE_STATIC}
@@ -56,6 +54,10 @@ vcpkg_cmake_configure(
         -DENABLE_UNINSTALL=OFF
         -DENABLE_ZLIB=SYSTEM
         -DVCPKG_HOST_TRIPLET=${HOST_TRIPLET} # for host pkgconf in PATH
+        -DCMAKE_DISABLE_FIND_PACKAGE_Python=ON
+        -DCMAKE_DISABLE_FIND_PACKAGE_Python3=ON
+    MAYBE_UNUSED_VARIABLES
+        ENABLE_ICU 
 )
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
diff --git a/external_imported/vcpkg/ports/mongo-c-driver/vcpkg.json b/external_imported/vcpkg/ports/mongo-c-driver/vcpkg.json
index db0a19e56..8db615bb1 100644
--- a/external_imported/vcpkg/ports/mongo-c-driver/vcpkg.json
+++ b/external_imported/vcpkg/ports/mongo-c-driver/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "mongo-c-driver",
-  "version": "1.22.2",
+  "version": "1.25.4",
+  "port-version": 1,
   "description": "Client library written in C for MongoDB.",
   "homepage": "https://github.com/mongodb/mongo-c-driver",
   "license": null,
diff --git a/external_imported/vcpkg/ports/mongo-cxx-driver/fix-dependencies.patch b/external_imported/vcpkg/ports/mongo-cxx-driver/fix-dependencies.patch
index fde0d3b66..8d94b5a7f 100644
--- a/external_imported/vcpkg/ports/mongo-cxx-driver/fix-dependencies.patch
+++ b/external_imported/vcpkg/ports/mongo-cxx-driver/fix-dependencies.patch
@@ -1,14 +1,47 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a1b60bd..78c6907 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -100,7 +100,6 @@ if(NEED_DOWNLOAD_C_DRIVER)
+         set(BUILD_TESTING OFF)
+         string(REPLACE " -Werror" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+         string(REPLACE " -Werror" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+-        add_subdirectory(${mongo-c-driver_SOURCE_DIR} ${mongo-c-driver_BINARY_DIR})
+         set(CMAKE_CXX_FLAGS ${OLD_CMAKE_CXX_FLAGS})
+         set(CMAKE_C_FLAGS ${OLD_CMAKE_C_FLAGS})
+         set(ENABLE_TESTS ${OLD_ENABLE_TESTS})
 diff --git a/src/bsoncxx/CMakeLists.txt b/src/bsoncxx/CMakeLists.txt
-index d87d588..16ba095 100644
+index 1e241f5..adf9a27 100644
 --- a/src/bsoncxx/CMakeLists.txt
 +++ b/src/bsoncxx/CMakeLists.txt
-@@ -218,6 +221,9 @@ if(BSONCXX_BUILD_STATIC)
-     bsoncxx_install_deprecated_cmake(bsoncxx-static)
-     list(APPEND bsoncxx_target_list bsoncxx_static)
-     set(bsoncxx_pkg_dep "find_dependency(bson-1.0 REQUIRED)")
-+    if(BSONCXX_POLY_USE_BOOST)
-+        string(APPEND bsoncxx_pkg_dep "\nfind_dependency(Boost)")
-+    endif()
- endif()
- bsoncxx_install("${bsoncxx_target_list}" "${bsoncxx_pkg_dep}")
+@@ -105,7 +105,7 @@ else()
+     else()
+         # Require package of old libbson name (with lib).
+         if(NOT BSONCXX_LINK_WITH_STATIC_MONGOC)
+-            find_package(libbson-${LIBBSON_REQUIRED_ABI_VERSION} ${LIBBSON_REQUIRED_VERSION} REQUIRED)
++            find_package(libbson-${LIBBSON_REQUIRED_ABI_VERSION} REQUIRED)
+             message(STATUS "found libbson version ${BSON_VERSION}")
+             set(libbson_target ${BSON_LIBRARIES})
+             set(libbson_include_directories ${BSON_INCLUDE_DIRS})
+diff --git a/src/mongocxx/CMakeLists.txt b/src/mongocxx/CMakeLists.txt
+index 4fe323f..2e27410 100644
+--- a/src/mongocxx/CMakeLists.txt
++++ b/src/mongocxx/CMakeLists.txt
+@@ -41,7 +41,7 @@ if(TARGET mongoc_shared OR TARGET mongoc_static)
+     set(MONGOCXX_PKG_DEP "find_dependency(mongoc-${LIBMONGOC_REQUIRED_ABI_VERSION} REQUIRED)")
+ else()
+     # Attempt to find libmongoc by new package name (without lib).
+-    find_package(mongoc-${LIBMONGOC_REQUIRED_ABI_VERSION} ${LIBMONGOC_REQUIRED_VERSION} QUIET)
++    find_package(mongoc-${LIBMONGOC_REQUIRED_ABI_VERSION} CONFIG REQUIRED)
  
+     if(mongoc-${LIBMONGOC_REQUIRED_ABI_VERSION}_FOUND)
+         message(STATUS "found libmongoc version ${mongoc-${LIBMONGOC_REQUIRED_ABI_VERSION}_VERSION}")
+@@ -56,7 +56,7 @@ else()
+     else()
+         # Require package of old libmongoc name (with lib).
+         if(NOT MONGOCXX_LINK_WITH_STATIC_MONGOC)
+-            find_package(libmongoc-${LIBMONGOC_REQUIRED_ABI_VERSION} ${LIBMONGOC_REQUIRED_VERSION} REQUIRED)
++            find_package(libmongoc-${LIBMONGOC_REQUIRED_ABI_VERSION} REQUIRED)
+             message(STATUS "found libmongoc version ${MONGOC_VERSION}")
+             set(libmongoc_target ${MONGOC_LIBRARIES})
+             set(libmongoc_definitions ${MONGOC_DEFINITIONS})
diff --git a/external_imported/vcpkg/ports/mongo-cxx-driver/fix-msvc-cxx17.patch b/external_imported/vcpkg/ports/mongo-cxx-driver/fix-msvc-cxx17.patch
deleted file mode 100644
index be52e99b7..000000000
--- a/external_imported/vcpkg/ports/mongo-cxx-driver/fix-msvc-cxx17.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/bsoncxx/stdx/make_unique.hpp b/src/bsoncxx/stdx/make_unique.hpp
-index d954eae..c4dea9d 100644
---- a/src/bsoncxx/stdx/make_unique.hpp
-+++ b/src/bsoncxx/stdx/make_unique.hpp
-@@ -48,7 +48,7 @@ using ::boost::make_unique;
- BSONCXX_INLINE_NAMESPACE_END
- }  // namespace bsoncxx
- 
--#elif __cplusplus >= 201402L
-+#elif __cplusplus >= 201402L || defined(_MSVC_LANG)
- 
- #include <memory>
- 
diff --git a/external_imported/vcpkg/ports/mongo-cxx-driver/portfile.cmake b/external_imported/vcpkg/ports/mongo-cxx-driver/portfile.cmake
index b2634c288..de8e1752e 100644
--- a/external_imported/vcpkg/ports/mongo-cxx-driver/portfile.cmake
+++ b/external_imported/vcpkg/ports/mongo-cxx-driver/portfile.cmake
@@ -1,14 +1,11 @@
-vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mongodb/mongo-cxx-driver
     REF "r${VERSION}"
-    SHA512 d30404b0201bd211633b167d874406598481c69de85a00034dfde8b6bc38cced59f7b705327c239b16231f9570bfc2bf29659fef9bb18338fcb8af04403169e2
+    SHA512 34ff303d496dd2c9b8cada16dc215c40fddccfe660bdc7fe59c92449861876b820c3ea4e3e5c91029e0322411bbe98a11cb1f3fa046b028d92d3c9a3509ce988
     HEAD_REF master
     PATCHES
         fix-dependencies.patch
-        fix-msvc-cxx17.patch
 )
 file(WRITE "${SOURCE_PATH}/build/VERSION_CURRENT" "${VERSION}")
 
@@ -33,6 +30,8 @@ vcpkg_cmake_configure(
         -DMONGOCXX_HEADER_INSTALL_DIR=include
     MAYBE_UNUSED_VARIABLES
         CMAKE_DISABLE_FIND_PACKAGE_Boost
+        BSONCXX_HEADER_INSTALL_DIR
+        MONGOCXX_HEADER_INSTALL_DIR
 )
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
@@ -41,12 +40,8 @@ vcpkg_fixup_pkgconfig()
 vcpkg_cmake_config_fixup(PACKAGE_NAME "bsoncxx" CONFIG_PATH "lib/cmake/bsoncxx-${VERSION}" DO_NOT_DELETE_PARENT_CONFIG_PATH)
 vcpkg_cmake_config_fixup(PACKAGE_NAME "mongocxx" CONFIG_PATH "lib/cmake/mongocxx-${VERSION}" DO_NOT_DELETE_PARENT_CONFIG_PATH)
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/bsoncxx/config/export.hpp"
-        "#define BSONCXX_API_H" "#define BSONCXX_API_H\n#ifndef BSONCXX_STATIC\n#define BSONCXX_STATIC\n#endif")
     vcpkg_cmake_config_fixup(PACKAGE_NAME "libbsoncxx-static" CONFIG_PATH "lib/cmake/libbsoncxx-static-${VERSION}" DO_NOT_DELETE_PARENT_CONFIG_PATH)
     file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/libbsoncxx-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libbsoncxx")
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/mongocxx/config/export.hpp"
-        "#define MONGOCXX_API_H" "#define MONGOCXX_API_H\n#ifndef MONGOCXX_STATIC\n#define MONGOCXX_STATIC\n#endif")
     vcpkg_cmake_config_fixup(PACKAGE_NAME "libmongocxx-static" CONFIG_PATH "lib/cmake/libmongocxx-static-${VERSION}")
     file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/libmongocxx-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libmongocxx")
 else()
diff --git a/external_imported/vcpkg/ports/mongo-cxx-driver/vcpkg.json b/external_imported/vcpkg/ports/mongo-cxx-driver/vcpkg.json
index 83782350d..4cc9f79cf 100644
--- a/external_imported/vcpkg/ports/mongo-cxx-driver/vcpkg.json
+++ b/external_imported/vcpkg/ports/mongo-cxx-driver/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "mongo-cxx-driver",
-  "version": "3.7.0",
+  "version": "3.9.0",
   "description": "MongoDB C++ Driver.",
   "homepage": "https://github.com/mongodb/mongo-cxx-driver",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/mongoose/portfile.cmake b/external_imported/vcpkg/ports/mongoose/portfile.cmake
index 92f8945dd..fefa7abe2 100644
--- a/external_imported/vcpkg/ports/mongoose/portfile.cmake
+++ b/external_imported/vcpkg/ports/mongoose/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO cesanta/mongoose
     REF "${VERSION}"
-    SHA512 d4e3d7100c3a25f2792bd4d8aef7fbc9a038025b4afe59627bbe2f3ba6eac4143729a6a81189775c43dfa7487db956245a9fbef89836f46d9ddb7650fb8c8119
+    SHA512 b243ab3e801c99f4c7c063be001e9a0cb30b301c719e2e44e47bdb815618cf1607bb57eba316332927b98de69460ff94ff521a2cf8c02fa03a201304193d4058
     HEAD_REF master
 )
 
@@ -28,7 +28,7 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT} CONFIG_PATH share/unoff
 if("ssl" IN_LIST FEATURES)
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake"
     [[# Generated by CMake]]
-    [[# Generated by CMake 
+    [[# Generated by CMake
 include(CMakeFindDependencyMacro)
 find_dependency(OpenSSL)]])
 endif()
diff --git a/external_imported/vcpkg/ports/mongoose/vcpkg.json b/external_imported/vcpkg/ports/mongoose/vcpkg.json
index 829a9a892..679ebe427 100644
--- a/external_imported/vcpkg/ports/mongoose/vcpkg.json
+++ b/external_imported/vcpkg/ports/mongoose/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "mongoose",
-  "version": "7.9",
+  "version": "7.12",
   "description": "Embedded web server / embedded networking library",
   "homepage": "https://cesanta.com/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/monkeys-audio/fix-outdir.patch b/external_imported/vcpkg/ports/monkeys-audio/fix-outdir.patch
new file mode 100644
index 000000000..1263b6562
--- /dev/null
+++ b/external_imported/vcpkg/ports/monkeys-audio/fix-outdir.patch
@@ -0,0 +1,18 @@
+diff --git a/Source/Projects/VS2022/MACDll/MACDll.vcxproj b/Source/Projects/VS2022/MACDll/MACDll.vcxproj
+index f5b20e8eb..d9fd63c20 100644
+--- a/Source/Projects/VS2022/MACDll/MACDll.vcxproj
++++ b/Source/Projects/VS2022/MACDll/MACDll.vcxproj
+@@ -150,10 +150,10 @@
+     <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+-    <OutDir>C:\Applications\Winamp\plugins\</OutDir>
+-    <IntDir>$(Configuration)\</IntDir>
++    <OutDir>$(Platform)\$(Configuration)\</OutDir>
++    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+     <LinkIncremental>false</LinkIncremental>
+-    <TargetName>in_APE</TargetName>
++    <TargetName>MACDll</TargetName>
+     <TargetExt>.dll</TargetExt>
+     <EnableClangTidyCodeAnalysis>true</EnableClangTidyCodeAnalysis>
+     <ClangTidyChecks>-clang-diagnostic-c++98-compat,-clang-diagnostic-zero-as-null-pointer-constant,-clang-diagnostic-language-extension-token,-clang-diagnostic-global-constructors,-clang-diagnostic-exit-time-destructors</ClangTidyChecks>
diff --git a/external_imported/vcpkg/ports/monkeys-audio/portfile.cmake b/external_imported/vcpkg/ports/monkeys-audio/portfile.cmake
index 57d227f3c..d24c030ab 100644
--- a/external_imported/vcpkg/ports/monkeys-audio/portfile.cmake
+++ b/external_imported/vcpkg/ports/monkeys-audio/portfile.cmake
@@ -1,11 +1,11 @@
 vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
 
-set(MA_VERSION 904)
+set(MA_VERSION 1008)
 
 vcpkg_download_distfile(ARCHIVE
     URLS "https://monkeysaudio.com/files/MAC_${MA_VERSION}_SDK.zip"
     FILENAME "MAC_${MA_VERSION}_SDK.zip"
-    SHA512 d104421e9bfa8c36dee89bd292c06629ff39a33e84569a5578f4a255432238a0cf09a7d03c5f7df3daf0e41d5cf3ac88f3b58581daf09a94935de91056334681
+    SHA512 0c96b6fa8da9d412679e8c9b43e98d475a650899694a9d085c3b0272775cf229bb09c7c4f24a18ab7ee5516d2d34f7acd59e4216aca8fe08ed04f75e33e29322
 )
 
 vcpkg_extract_source_archive(
@@ -14,6 +14,7 @@ vcpkg_extract_source_archive(
     NO_REMOVE_ONE_LEVEL
     PATCHES
         remove-certificate-step.patch
+        fix-outdir.patch
 )
 
 file(REMOVE_RECURSE
@@ -49,13 +50,15 @@ foreach(VCXPROJ IN ITEMS
 endforeach()
 
 if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    vcpkg_install_msbuild(
+    list(APPEND VCPKG_C_FLAGS "-D_AFXDLL")
+    list(APPEND VCPKG_CXX_FLAGS "-D_AFXDLL")
+    vcpkg_msbuild_install(
         SOURCE_PATH "${SOURCE_PATH}"
         PROJECT_SUBPATH "Source/Projects/VS2022/MACDll/MACDll.vcxproj"
         PLATFORM ${PLATFORM}
     )
 else()
-    vcpkg_install_msbuild(
+    vcpkg_msbuild_install(
         SOURCE_PATH "${SOURCE_PATH}"
         PROJECT_SUBPATH "Source/Projects/VS2022/MACLib/MACLib.vcxproj"
         PLATFORM ${PLATFORM}
@@ -63,7 +66,7 @@ else()
 endif()
 
 if ("tools" IN_LIST FEATURES)
-    vcpkg_install_msbuild(
+    vcpkg_msbuild_install(
         SOURCE_PATH "${SOURCE_PATH}"
         PROJECT_SUBPATH "Source/Projects/VS2022/Console/Console.vcxproj"
         PLATFORM ${PLATFORM}
@@ -71,17 +74,11 @@ if ("tools" IN_LIST FEATURES)
 
     file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/Console.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/Console.lib")
     file(RENAME "${CURRENT_PACKAGES_DIR}/tools/monkeys-audio/Console.exe" "${CURRENT_PACKAGES_DIR}/tools/monkeys-audio/mac.exe")
+    vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}")
 endif()
-if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
-    file(COPY "${CURRENT_PACKAGES_DIR}/bin/MACDll.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
-    file(COPY "${CURRENT_PACKAGES_DIR}/lib/MACDll.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
-elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
-    file(COPY "${CURRENT_PACKAGES_DIR}/bin/MACDll64.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
-    file(COPY "${CURRENT_PACKAGES_DIR}/lib/MACDll64.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
-endif()
+
 if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled)
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib" "${CURRENT_PACKAGES_DIR}/lib")
+    file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/MACLib.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/MACLib.lib")
 endif()
 
 
diff --git a/external_imported/vcpkg/ports/monkeys-audio/remove-certificate-step.patch b/external_imported/vcpkg/ports/monkeys-audio/remove-certificate-step.patch
index 97904b232..579952089 100644
--- a/external_imported/vcpkg/ports/monkeys-audio/remove-certificate-step.patch
+++ b/external_imported/vcpkg/ports/monkeys-audio/remove-certificate-step.patch
@@ -1,24 +1,54 @@
 diff --git a/Source/Projects/VS2022/Console/Console.vcxproj b/Source/Projects/VS2022/Console/Console.vcxproj
-index 4a811b6..86c2c4f 100644
+index e7eea4d..754e209 100644
 --- a/Source/Projects/VS2022/Console/Console.vcxproj
 +++ b/Source/Projects/VS2022/Console/Console.vcxproj
-@@ -189,9 +189,6 @@
-       <TargetMachine>MachineX86</TargetMachine>
-       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+@@ -273,9 +273,6 @@
+     <Link>
+       <SubSystem>Console</SubSystem>
+     </Link>
+-    <PostBuildEvent>
+-      <Command>..\..\..\Certificate\signtool.exe sign /f ..\..\..\Certificate\MAC.pfx /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td sha256 /fd sha256 /a /as /p password "$(TargetPath)"</Command>
+-    </PostBuildEvent>
+   </ItemDefinitionGroup>
+   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+     <ClCompile>
+@@ -299,9 +296,6 @@
+     <Link>
+       <SubSystem>Console</SubSystem>
      </Link>
 -    <PostBuildEvent>
 -      <Command>..\..\..\Certificate\signtool.exe sign /f ..\..\..\Certificate\MAC.pfx /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td sha256 /fd sha256 /a /as /p password "$(TargetPath)"</Command>
 -    </PostBuildEvent>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-     <Midl>
-@@ -285,9 +282,6 @@
-       <TargetMachine>MachineX64</TargetMachine>
-       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+     <ClCompile>
+@@ -388,9 +382,6 @@
+     <Link>
+       <SubSystem>Console</SubSystem>
+     </Link>
+-    <PostBuildEvent>
+-      <Command>..\..\..\Certificate\signtool.exe sign /f ..\..\..\Certificate\MAC.pfx /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td sha256 /fd sha256 /a /as /p password "$(TargetPath)"</Command>
+-    </PostBuildEvent>
+   </ItemDefinitionGroup>
+   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">
+     <ClCompile>
+@@ -414,9 +405,6 @@
+     <Link>
+       <SubSystem>Console</SubSystem>
+     </Link>
+-    <PostBuildEvent>
+-      <Command>..\..\..\Certificate\signtool.exe sign /f ..\..\..\Certificate\MAC.pfx /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td sha256 /fd sha256 /a /as /p password "$(TargetPath)"</Command>
+-    </PostBuildEvent>
+   </ItemDefinitionGroup>
+   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+     <ClCompile>
+@@ -440,9 +428,6 @@
+     <Link>
+       <SubSystem>Console</SubSystem>
      </Link>
 -    <PostBuildEvent>
 -      <Command>..\..\..\Certificate\signtool.exe sign /f ..\..\..\Certificate\MAC.pfx /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td sha256 /fd sha256 /a /as /p password "$(TargetPath)"</Command>
 -    </PostBuildEvent>
    </ItemDefinitionGroup>
    <ItemGroup>
-     <ClCompile Include="..\..\..\Console\Console.cpp">
+     <ClCompile Include="..\..\..\Console\Console.cpp" />
diff --git a/external_imported/vcpkg/ports/monkeys-audio/vcpkg.json b/external_imported/vcpkg/ports/monkeys-audio/vcpkg.json
index cc00d9b75..f47b7ed32 100644
--- a/external_imported/vcpkg/ports/monkeys-audio/vcpkg.json
+++ b/external_imported/vcpkg/ports/monkeys-audio/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "monkeys-audio",
-  "version-string": "9.04",
-  "port-version": 4,
+  "version-string": "10.08",
+  "port-version": 1,
   "description": [
     "Monkey's Audio is an excellent audio compression tool which has multiple advantages over traditional methods.",
     "Audio files compressed with it end with .ape extension."
@@ -9,6 +9,13 @@
   "homepage": "https://monkeysaudio.com",
   "license": null,
   "supports": "!(uwp | osx | linux)",
+  "dependencies": [
+    {
+      "name": "vcpkg-msbuild",
+      "host": true,
+      "platform": "windows"
+    }
+  ],
   "features": {
     "tools": {
       "description": "Build monkeys-audio tools"
diff --git a/external_imported/vcpkg/ports/moos-core/include_functional.patch b/external_imported/vcpkg/ports/moos-core/include_functional.patch
new file mode 100644
index 000000000..1245ca873
--- /dev/null
+++ b/external_imported/vcpkg/ports/moos-core/include_functional.patch
@@ -0,0 +1,12 @@
+diff --git a/Core/libMOOS/Utils/MOOSUtilityFunctions.cpp b/Core/libMOOS/Utils/MOOSUtilityFunctions.cpp
+index 9d4473f..3f91018 100644
+--- a/Core/libMOOS/Utils/MOOSUtilityFunctions.cpp
++++ b/Core/libMOOS/Utils/MOOSUtilityFunctions.cpp
+@@ -47,6 +47,7 @@
+ #include <time.h>
+ #include <stdarg.h>
+ #include <math.h>
++#include <functional>
+ 
+ #ifndef _WIN32
+ #include <unistd.h>
diff --git a/external_imported/vcpkg/ports/moos-core/portfile.cmake b/external_imported/vcpkg/ports/moos-core/portfile.cmake
index b799cc2ed..3bd8a627b 100644
--- a/external_imported/vcpkg/ports/moos-core/portfile.cmake
+++ b/external_imported/vcpkg/ports/moos-core/portfile.cmake
@@ -3,18 +3,17 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO themoos/core-moos
-    REF v10.4.0
+    REF "v${VERSION}"
     SHA512 8a82074bd219bbedbe56c2187afe74a55a252b0654a675c64d1f75e62353b0874e7b405d9f677fadb297e955d11aea50a07e8f5f3546be3c4ddab76fe356a51e
     HEAD_REF master
     PATCHES
         cmake_fix.patch
+        include_functional.patch
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE
-    OPTIONS
-        -DCMAKE_ENABLE_EXPORT=OFF
 )
 
 vcpkg_cmake_install()
@@ -26,4 +25,4 @@ file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools")
 file(RENAME "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/Core/GPLCore.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/Core/GPLCore.txt")
diff --git a/external_imported/vcpkg/ports/moos-core/vcpkg.json b/external_imported/vcpkg/ports/moos-core/vcpkg.json
index 068e390a1..2fc2564e5 100644
--- a/external_imported/vcpkg/ports/moos-core/vcpkg.json
+++ b/external_imported/vcpkg/ports/moos-core/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "moos-core",
   "version": "10.4.0",
-  "port-version": 7,
+  "port-version": 10,
   "description": "A very light weight, easy to use middleware.",
   "homepage": "https://sites.google.com/site/moossoftware/",
-  "license": null,
+  "license": "GPL-2.0-or-later",
+  "supports": "!xbox & !uwp",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/moos-essential/vcpkg.json b/external_imported/vcpkg/ports/moos-essential/vcpkg.json
index d6128e8ed..7cfbe5f65 100644
--- a/external_imported/vcpkg/ports/moos-essential/vcpkg.json
+++ b/external_imported/vcpkg/ports/moos-essential/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "moos-essential",
-  "version-string": "10.0.1",
-  "port-version": 4,
+  "version": "10.0.1",
+  "port-version": 5,
   "description": "a set of useful applications that leverage the core-moos communications layer.",
   "homepage": "https://sites.google.com/site/moossoftware/",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/moos-ui/vcpkg.json b/external_imported/vcpkg/ports/moos-ui/vcpkg.json
index 71e509a5e..a625ef30b 100644
--- a/external_imported/vcpkg/ports/moos-ui/vcpkg.json
+++ b/external_imported/vcpkg/ports/moos-ui/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "moos-ui",
-  "version-string": "10.0.1",
-  "port-version": 4,
+  "version": "10.0.1",
+  "port-version": 5,
   "description": "set of user interface tools to use and leverage the MOOS project.",
   "homepage": "https://sites.google.com/site/moossoftware/",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/morton-nd/vcpkg.json b/external_imported/vcpkg/ports/morton-nd/vcpkg.json
index 161e7064f..422dc9cf0 100644
--- a/external_imported/vcpkg/ports/morton-nd/vcpkg.json
+++ b/external_imported/vcpkg/ports/morton-nd/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "morton-nd",
-  "version-string": "4.0.0",
-  "port-version": 2,
+  "version": "4.0.0",
+  "port-version": 3,
   "description": "header-only constexpr library for fast Morton encoding/decoding in N dimensions.",
   "homepage": "https://github.com/kevinhartman/morton-nd",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/mosquitto/0002-win64-support.patch b/external_imported/vcpkg/ports/mosquitto/0002-win64-support.patch
deleted file mode 100644
index c140a7873..000000000
--- a/external_imported/vcpkg/ports/mosquitto/0002-win64-support.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2775a3da..ddd81b04 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -67,12 +67,7 @@ option(WITH_THREADING "Include client library threading support?" ON)
- if (WITH_THREADING)
- 	add_definitions("-DWITH_THREADING")
- 	if (WIN32)
--		if (CMAKE_CL_64)
--			set (PTHREAD_LIBRARIES C:\\pthreads\\Pre-built.2\\lib\\x64\\pthreadVC2.lib)
--		else (CMAKE_CL_64)
--			set (PTHREAD_LIBRARIES C:\\pthreads\\Pre-built.2\\lib\\x86\\pthreadVC2.lib)
--		endif (CMAKE_CL_64)
--		set (PTHREAD_INCLUDE_DIR C:\\pthreads\\Pre-built.2\\include)
-+		find_package(pthread REQUIRED)
- 	elseif (ANDROID)
- 		set (PTHREAD_LIBRARIES "")
- 		set (PTHREAD_INCLUDE_DIR "")
diff --git a/external_imported/vcpkg/ports/mosquitto/0005-websocket-shared-lib-name.patch b/external_imported/vcpkg/ports/mosquitto/0005-websocket-shared-lib-name.patch
index 4ce8a8267..33074e9c1 100644
--- a/external_imported/vcpkg/ports/mosquitto/0005-websocket-shared-lib-name.patch
+++ b/external_imported/vcpkg/ports/mosquitto/0005-websocket-shared-lib-name.patch
@@ -1,20 +1,20 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 9380a046..f2929e19 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -194,13 +194,13 @@ endif (WIN32)
- 
- if (WITH_WEBSOCKETS)
- 	if (STATIC_WEBSOCKETS)
--		set (MOSQ_LIBS ${MOSQ_LIBS} websockets_static)
-+		set (MOSQ_LIBS ${MOSQ_LIBS} websockets)
- 		if (WIN32)
- 			set (MOSQ_LIBS ${MOSQ_LIBS} iphlpapi)
- 			link_directories(${mosquitto_SOURCE_DIR})
- 		endif (WIN32)
- 	else (STATIC_WEBSOCKETS)
--		set (MOSQ_LIBS ${MOSQ_LIBS} websockets)
-+		set (MOSQ_LIBS ${MOSQ_LIBS} websockets_shared)
- 	endif (STATIC_WEBSOCKETS)
- endif (WITH_WEBSOCKETS)
- 
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 62ce99e..61f941e 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -194,13 +194,13 @@ endif (WIN32)
+ 
+ if (WITH_WEBSOCKETS)
+ 	if (STATIC_WEBSOCKETS)
+-		set (MOSQ_LIBS ${MOSQ_LIBS} websockets_static)
++		set (MOSQ_LIBS ${MOSQ_LIBS} websockets)
+ 		if (WIN32)
+ 			set (MOSQ_LIBS ${MOSQ_LIBS} iphlpapi)
+ 			link_directories(${mosquitto_SOURCE_DIR})
+ 		endif (WIN32)
+ 	else (STATIC_WEBSOCKETS)
+-		set (MOSQ_LIBS ${MOSQ_LIBS} websockets)
++		set (MOSQ_LIBS ${MOSQ_LIBS} websockets_shared)
+ 	endif (STATIC_WEBSOCKETS)
+ endif (WITH_WEBSOCKETS)
+ 
diff --git a/external_imported/vcpkg/ports/mosquitto/0006-pthreads-for-windows.patch b/external_imported/vcpkg/ports/mosquitto/0006-pthreads-for-windows.patch
new file mode 100644
index 000000000..14d59946f
--- /dev/null
+++ b/external_imported/vcpkg/ports/mosquitto/0006-pthreads-for-windows.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4c55e05..adece3e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -68,8 +68,8 @@ option(WITH_THREADING "Include client library threading support?" ON)
+ if (WITH_THREADING)
+ 	add_definitions("-DWITH_THREADING")
+ 	if (WIN32)
+-		find_package(Threads REQUIRED)
+-		set (PTHREAD_LIBRARIES Threads::Threads)
++		find_package(pthread CONFIG REQUIRED)
++		set (PTHREAD_LIBRARIES PThreads4W::PThreads4W)
+ 		set (PTHREAD_INCLUDE_DIR "")
+ 	elseif (ANDROID)
+ 		set (PTHREAD_LIBRARIES "")
diff --git a/external_imported/vcpkg/ports/mosquitto/portfile.cmake b/external_imported/vcpkg/ports/mosquitto/portfile.cmake
index ab11f068f..f1487108e 100644
--- a/external_imported/vcpkg/ports/mosquitto/portfile.cmake
+++ b/external_imported/vcpkg/ports/mosquitto/portfile.cmake
@@ -2,13 +2,13 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO eclipse/mosquitto
     HEAD_REF master
-    REF v2.0.14
-    SHA512 4b7066acd7d8ecb05fef6089997632381c34ce6631b7106afedf95b7f72d7280e45c9b2f8cce49349bf599520770ebbebb68ff71930bc44b615d177b4056a945
+    REF "v${VERSION}"
+    SHA512 667216f3e60f9916d5de200d3a205fb5a5c798564c96e44939af6c8e3af85fffa36a63eba47db009b432d14f43883dbca5b92547a458215dd269e91f6bcfb7fa
     PATCHES
-        0002-win64-support.patch
         0003-add-find_package-libwebsockets.patch
         0004-support-static-build.patch
         0005-websocket-shared-lib-name.patch
+        0006-pthreads-for-windows.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" STATIC_LINKAGE)
diff --git a/external_imported/vcpkg/ports/mosquitto/vcpkg.json b/external_imported/vcpkg/ports/mosquitto/vcpkg.json
index db3138070..d298cf9f3 100644
--- a/external_imported/vcpkg/ports/mosquitto/vcpkg.json
+++ b/external_imported/vcpkg/ports/mosquitto/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "mosquitto",
-  "version": "2.0.14",
+  "version": "2.0.18",
   "description": "Mosquitto is an open source message broker that implements the MQ Telemetry Transport protocol versions 3.1 and 3.1.1, MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model, This makes it suitable for machine to machine messaging such as with low power sensors or mobile devices such as phones, embedded computers or microcontrollers like the Arduino",
   "homepage": "https://mosquitto.org/",
   "license": "EPL-2.0",
+  "supports": "!android",
   "dependencies": [
     "c-ares",
     "libwebsockets",
diff --git a/external_imported/vcpkg/ports/mozjpeg/portfile.cmake b/external_imported/vcpkg/ports/mozjpeg/portfile.cmake
index 939352426..a792158cc 100644
--- a/external_imported/vcpkg/ports/mozjpeg/portfile.cmake
+++ b/external_imported/vcpkg/ports/mozjpeg/portfile.cmake
@@ -5,8 +5,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mozilla/mozjpeg
-    REF a2d2907ff023227e80c1e4efa809812410275a12    #v4.1.1
-    SHA512 77c003406a0b86859c461d92bd216168d6c4f5d55735e4a9ab473d3dbcad03fd4e398204f884dfd03f0fa883da296ac05a8c5242aa40792a3e179627e51db154
+    REF "v${VERSION}"
+    SHA512 90e1b0067740b161398d908e90b976eccc2ee7174496ce9693ba3cdf4727559ecff39744611657d847dd83164b80993152739692a5233aca577ebd052efaf501
     HEAD_REF master
     PATCHES
         fix-install-error.patch
diff --git a/external_imported/vcpkg/ports/mozjpeg/vcpkg.json b/external_imported/vcpkg/ports/mozjpeg/vcpkg.json
index b3c6bf882..ca0ec7d8c 100644
--- a/external_imported/vcpkg/ports/mozjpeg/vcpkg.json
+++ b/external_imported/vcpkg/ports/mozjpeg/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "mozjpeg",
-  "version": "4.1.1",
+  "version": "4.1.5",
   "description": "MozJPEG reduces file sizes of JPEG images while retaining quality and compatibility with the vast majority of the world's deployed decoders. It's compatible with libjpeg API and ABI, and can be used as a drop-in replacement for libjpeg.",
   "homepage": "https://github.com/mozilla/mozjpeg",
   "license": "IJG AND BSD-3-Clause AND Zlib",
diff --git a/external_imported/vcpkg/ports/mp-units/config.patch b/external_imported/vcpkg/ports/mp-units/config.patch
index b5f6bd6d2..12539f7f0 100644
--- a/external_imported/vcpkg/ports/mp-units/config.patch
+++ b/external_imported/vcpkg/ports/mp-units/config.patch
@@ -1,14 +1,16 @@
 diff --git a/src/mp-unitsConfig.cmake b/src/mp-unitsConfig.cmake
+index 519b180b..6005e9f8 100644
 --- a/src/mp-unitsConfig.cmake
 +++ b/src/mp-unitsConfig.cmake
-@@ -39,8 +39,8 @@ function(__check_libcxx_in_use variable)
- endfunction()
- 
+@@ -23,9 +23,9 @@
  include(CMakeFindDependencyMacro)
--find_dependency(fmt)
+ 
+ if(MP_UNITS_USE_LIBFMT)
+-    find_dependency(fmt)
++  find_dependency(fmt CONFIG)
+ endif()
+ 
 -find_dependency(gsl-lite)
-+find_dependency(fmt CONFIG)
 +find_dependency(gsl-lite CONFIG)
  
- # add range-v3 dependency only for clang + libc++
- if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+ include("${CMAKE_CURRENT_LIST_DIR}/mp-unitsTargets.cmake")
diff --git a/external_imported/vcpkg/ports/mp-units/portfile.cmake b/external_imported/vcpkg/ports/mp-units/portfile.cmake
index 04236589d..68ead3a49 100644
--- a/external_imported/vcpkg/ports/mp-units/portfile.cmake
+++ b/external_imported/vcpkg/ports/mp-units/portfile.cmake
@@ -1,14 +1,25 @@
+if(VCPKG_TARGET_IS_LINUX)
+    message("Note: `mp-units` requires Clang16+ or GCC11+")
+endif()
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mpusz/units
-    REF v0.7.0
-    SHA512 72175f34f358d0741650ce9c8a7b28fced90cc45ddd3f1662ae1cb9ff7d31403ff742ee07ab4c96bd2d95af714d9111a888cf6acccb91e568e12d1ef663b2f64
+    REF "v${VERSION}"
+    SHA512 d23589ba6e5e18e3477a9bab9fe25cffed5e8777862b4811e4335e294f86d129a48c7e001d57cec0739ddd1f0a936e42d06f2b4782b1bd8b8bb15f86f8d32d53
     PATCHES
-        config.patch
+      config.patch
 )
 
+set(USE_LIBFMT OFF)
+if ("use-libfmt" IN_LIST FEATURES)
+    set(USE_LIBFMT ON)
+endif()
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}/src"
+    OPTIONS
+      -DMP_UNITS_USE_LIBFMT=${USE_LIBFMT}
 )
 
 vcpkg_cmake_install()
@@ -16,8 +27,8 @@ vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
 
 # Handle copyright/readme/package files
-file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
 file(INSTALL "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug"
-                    "${CURRENT_PACKAGES_DIR}/lib") # Header only
\ No newline at end of file
+                    "${CURRENT_PACKAGES_DIR}/lib") # Header only
diff --git a/external_imported/vcpkg/ports/mp-units/vcpkg.json b/external_imported/vcpkg/ports/mp-units/vcpkg.json
index 7454612bc..ada675dc7 100644
--- a/external_imported/vcpkg/ports/mp-units/vcpkg.json
+++ b/external_imported/vcpkg/ports/mp-units/vcpkg.json
@@ -1,12 +1,10 @@
 {
   "name": "mp-units",
-  "version-semver": "0.7.0",
-  "port-version": 1,
+  "version": "2.1.0",
   "description": "mp-units - A Units Library for C++",
   "homepage": "https://github.com/mpusz/units",
   "license": "MIT",
   "dependencies": [
-    "fmt",
     "gsl-lite",
     {
       "name": "vcpkg-cmake",
@@ -16,5 +14,28 @@
       "name": "vcpkg-cmake-config",
       "host": true
     }
-  ]
+  ],
+  "default-features": [
+    "default-features"
+  ],
+  "features": {
+    "default-features": {
+      "description": "Platform specific default features",
+      "dependencies": [
+        {
+          "name": "mp-units",
+          "features": [
+            "use-libfmt"
+          ],
+          "platform": "osx"
+        }
+      ]
+    },
+    "use-libfmt": {
+      "description": "Use libfmt instead of std::format",
+      "dependencies": [
+        "fmt"
+      ]
+    }
+  }
 }
diff --git a/external_imported/vcpkg/ports/mp3lame/portfile.cmake b/external_imported/vcpkg/ports/mp3lame/portfile.cmake
index a178f7627..38fb8f215 100644
--- a/external_imported/vcpkg/ports/mp3lame/portfile.cmake
+++ b/external_imported/vcpkg/ports/mp3lame/portfile.cmake
@@ -1,5 +1,3 @@
-set(VERSION 3.100)
-
 vcpkg_from_sourceforge(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO lame/lame
@@ -54,7 +52,7 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
         file(WRITE "${SOURCE_PATH}/vc_solution/${machine}_${vcxproj}" "${vcxproj_con}")
     endforeach()
 
-    vcpkg_install_msbuild(
+     vcpkg_msbuild_install(
         SOURCE_PATH "${SOURCE_PATH}"
         PROJECT_SUBPATH "vc_solution/${machine}_vc11_lame.sln"
         TARGET "lame"
@@ -119,4 +117,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}/doc" "${CURRENT_PACKA
 file(COPY "${SOURCE_PATH}/include/lame.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/lame")
 configure_file("${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/mp3lame-config.cmake" @ONLY)
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/mp3lame/vcpkg.json b/external_imported/vcpkg/ports/mp3lame/vcpkg.json
index 0773b73fb..03925de59 100644
--- a/external_imported/vcpkg/ports/mp3lame/vcpkg.json
+++ b/external_imported/vcpkg/ports/mp3lame/vcpkg.json
@@ -1,8 +1,15 @@
 {
   "name": "mp3lame",
   "version": "3.100",
-  "port-version": 10,
+  "port-version": 11,
   "description": "LAME is a high quality MPEG Audio Layer III (MP3) encoder licensed under the LGPL.",
   "homepage": "https://sourceforge.net/projects/lame",
-  "license": "LGPL-2.0-only"
+  "license": "LGPL-2.0-only",
+  "dependencies": [
+    {
+      "name": "vcpkg-msbuild",
+      "host": true,
+      "platform": "windows"
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/mpark-patterns/portfile.cmake b/external_imported/vcpkg/ports/mpark-patterns/portfile.cmake
new file mode 100644
index 000000000..639fdceb5
--- /dev/null
+++ b/external_imported/vcpkg/ports/mpark-patterns/portfile.cmake
@@ -0,0 +1,23 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO mpark/patterns 
+    REF b3270e0dd7b6312f7a4fe8647e2333dbb86e355e
+    SHA512 ca8062b92cf0d5874aba7067615ff8cb089c22cb921d6131762a8dcb2f50d4f47d80c59b62b1c9b7e70dae2dfb68a44c2a4feeb78ab5e5473e0fbdd089538314
+    HEAD_REF master
+)
+
+set(VCPKG_BUILD_TYPE release) #header-only library
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(PACKAGE_NAME mpark_patterns CONFIG_PATH "lib/cmake/mpark_patterns")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
+
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/mpark-patterns/usage b/external_imported/vcpkg/ports/mpark-patterns/usage
new file mode 100644
index 000000000..8e4f5d536
--- /dev/null
+++ b/external_imported/vcpkg/ports/mpark-patterns/usage
@@ -0,0 +1,5 @@
+The package mpark-patterns provides CMake targets:
+
+    find_package(mpark_patterns CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE mpark_patterns)
+
diff --git a/external_imported/vcpkg/ports/mpark-patterns/vcpkg.json b/external_imported/vcpkg/ports/mpark-patterns/vcpkg.json
new file mode 100644
index 000000000..a9619173b
--- /dev/null
+++ b/external_imported/vcpkg/ports/mpark-patterns/vcpkg.json
@@ -0,0 +1,17 @@
+{
+  "name": "mpark-patterns",
+  "version-date": "2019-10-03",
+  "description": "MPark.Patterns is an experimental pattern matching library for C++17.",
+  "homepage": "https://github.com/mpark/patterns",
+  "license": "BSL-1.0",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/mpark-variant/vcpkg.json b/external_imported/vcpkg/ports/mpark-variant/vcpkg.json
index 9694c0748..06c30e54e 100644
--- a/external_imported/vcpkg/ports/mpark-variant/vcpkg.json
+++ b/external_imported/vcpkg/ports/mpark-variant/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "mpark-variant",
-  "version-string": "1.4.0",
-  "port-version": 2,
+  "version": "1.4.0",
+  "port-version": 3,
   "description": "an implementation of C++17 std::variant for C++11/14/17.",
   "dependencies": [
     {
diff --git a/external_imported/vcpkg/ports/mpc/portfile.cmake b/external_imported/vcpkg/ports/mpc/portfile.cmake
index 7ecd9b325..4052fa823 100644
--- a/external_imported/vcpkg/ports/mpc/portfile.cmake
+++ b/external_imported/vcpkg/ports/mpc/portfile.cmake
@@ -1,26 +1,24 @@
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://ftp.gnu.org/gnu/mpc/mpc-1.2.0.tar.gz"
-    FILENAME "mpc-1.2.0.tar.gz"
-    SHA512 84fa3338f51d369111456a63ad040256a1beb70699e21e2a932c779aa1c3bd08b201412c1659ecbb58403ea0548faacc35996d94f88f0639549269b7563c61b7
-)
-
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
-)
-
-vcpkg_configure_make(
-    SOURCE_PATH "${SOURCE_PATH}"
-    AUTOCONFIG
-)
-
-vcpkg_install_make()
-
-vcpkg_fixup_pkgconfig()
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-
-# # Handle copyright
-file(INSTALL "${SOURCE_PATH}/COPYING.LESSER" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://ftp.gnu.org/gnu/mpc/mpc-${VERSION}.tar.gz"
+    FILENAME "mpc-${VERSION}.tar.gz"
+    SHA512 4bab4ef6076f8c5dfdc99d810b51108ced61ea2942ba0c1c932d624360a5473df20d32b300fc76f2ba4aa2a97e1f275c9fd494a1ba9f07c4cb2ad7ceaeb1ae97
+)
+
+vcpkg_extract_source_archive(
+    SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+)
+
+vcpkg_configure_make(
+    SOURCE_PATH "${SOURCE_PATH}"
+    AUTOCONFIG
+)
+
+vcpkg_install_make()
+
+vcpkg_fixup_pkgconfig()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+
+file(INSTALL "${SOURCE_PATH}/COPYING.LESSER" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/external_imported/vcpkg/ports/mpc/vcpkg.json b/external_imported/vcpkg/ports/mpc/vcpkg.json
index 9f79c44a8..0b0c26f13 100644
--- a/external_imported/vcpkg/ports/mpc/vcpkg.json
+++ b/external_imported/vcpkg/ports/mpc/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "mpc",
-  "version": "1.2.0",
-  "port-version": 2,
+  "version": "1.3.1",
   "description": "GNU MPC is a C library for the arithmetic of complex numbers with arbitrarily high precision and correct rounding of the result.",
   "homepage": "http://www.multiprecision.org/mpc/",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/mpfr/portfile.cmake b/external_imported/vcpkg/ports/mpfr/portfile.cmake
index e1a1ad204..219b92d13 100644
--- a/external_imported/vcpkg/ports/mpfr/portfile.cmake
+++ b/external_imported/vcpkg/ports/mpfr/portfile.cmake
@@ -3,7 +3,7 @@ vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
 vcpkg_download_distfile(ARCHIVE
     URLS "http://www.mpfr.org/mpfr-${VERSION}/mpfr-${VERSION}.tar.xz" "https://ftp.gnu.org/gnu/mpfr/mpfr-${VERSION}.tar.xz"
     FILENAME "mpfr-${VERSION}.tar.xz"
-    SHA512 58e843125884ca58837ae5159cd4092af09e8f21931a2efd19c15de057c9d1dc0753ae95c592e2ce59a727fbc491af776db8b00a055320413cdcf2033b90505c
+    SHA512 bc68c0d755d5446403644833ecbb07e37360beca45f474297b5d5c40926df1efc3e2067eecffdf253f946288bcca39ca89b0613f545d46a9e767d1d4cf358475
 )
 
 vcpkg_extract_source_archive(
diff --git a/external_imported/vcpkg/ports/mpfr/vcpkg.json b/external_imported/vcpkg/ports/mpfr/vcpkg.json
index e77193dda..ec36b1208 100644
--- a/external_imported/vcpkg/ports/mpfr/vcpkg.json
+++ b/external_imported/vcpkg/ports/mpfr/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "mpfr",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "description": "The MPFR library is a C library for multiple-precision floating-point computations with correct rounding",
   "homepage": "https://www.mpfr.org",
   "license": "LGPL-3.0-or-later",
+  "supports": "!xbox",
   "dependencies": [
     "gmp"
   ]
diff --git a/external_imported/vcpkg/ports/mpg123/fix-checktypesize.patch b/external_imported/vcpkg/ports/mpg123/fix-checktypesize.patch
new file mode 100644
index 000000000..68af0ca9e
--- /dev/null
+++ b/external_imported/vcpkg/ports/mpg123/fix-checktypesize.patch
@@ -0,0 +1,14 @@
+diff --git a/ports/cmake/src/CMakeLists.txt b/ports/cmake/src/CMakeLists.txt
+index 79e1f9b..e057567 100644
+--- a/ports/cmake/src/CMakeLists.txt
++++ b/ports/cmake/src/CMakeLists.txt
+@@ -5,6 +5,7 @@ include(CheckFunctionExists)
+ include(CheckIncludeFile)
+ include(CheckIncludeFiles)
+ include(CheckSymbolExists)
++include(CheckTypeSize)
+ include(CMakeDependentOption)
+ include(TestBigEndian)
+ 
+ 
+
diff --git a/external_imported/vcpkg/ports/mpg123/fix-modules-cmake-cflags.patch b/external_imported/vcpkg/ports/mpg123/fix-modules-cmake-cflags.patch
new file mode 100644
index 000000000..b43bb5cf6
--- /dev/null
+++ b/external_imported/vcpkg/ports/mpg123/fix-modules-cmake-cflags.patch
@@ -0,0 +1,19 @@
+diff --git a/ports/cmake/src/libout123/modules/CMakeLists.txt b/ports/cmake/src/libout123/modules/CMakeLists.txt
+index 21810c6..51c673d 100644
+--- a/ports/cmake/src/libout123/modules/CMakeLists.txt
++++ b/ports/cmake/src/libout123/modules/CMakeLists.txt
+@@ -17,11 +17,11 @@ if(NOT USE_MODULES)
+         $<$<STREQUAL:${DEFAULT_OUTPUT_MODULE},win32>:${WIN32_LIBRARIES}>
+         $<$<STREQUAL:${DEFAULT_OUTPUT_MODULE},win32_wasapi>:${WIN32_WASAPI_LIBRARIES}>)
+     if(DEFAULT_OUTPUT_MODULE STREQUAL "pulse")
+-        target_compile_definitions(defaultmodule PRIVATE ${PULSE_CFLAGS})
++        target_compile_options(defaultmodule PRIVATE ${PULSE_CFLAGS})
+     elseif(DEFAULT_OUTPUT_MODULE STREQUAL "jack")
+-        target_compile_definitions(defaultmodule PRIVATE ${JACK_CFLAGS})
++        target_compile_options(defaultmodule PRIVATE ${JACK_CFLAGS})
+     elseif(DEFAULT_OUTPUT_MODULE STREQUAL "tinyalsa")
+-        target_compile_definitions(defaultmodule PRIVATE ${TINYALSA_CFLAGS})
++        target_compile_options(defaultmodule PRIVATE ${TINYALSA_CFLAGS})
+     endif()
+     if(BUILD_SHARED_LIBS)
+         set_target_properties(defaultmodule PROPERTIES POSITION_INDEPENDENT_CODE ON)
diff --git a/external_imported/vcpkg/ports/mpg123/portfile.cmake b/external_imported/vcpkg/ports/mpg123/portfile.cmake
index 7761054c4..933b611a3 100644
--- a/external_imported/vcpkg/ports/mpg123/portfile.cmake
+++ b/external_imported/vcpkg/ports/mpg123/portfile.cmake
@@ -5,20 +5,27 @@ vcpkg_from_sourceforge(
     FILENAME "mpg123-${VERSION}.tar.bz2"
     SHA512 5dd550e06f5d0d432cac1b7e546215e56378b44588c1a98031498473211e08bc4228de45be41f7ba764f7f6c0eb752a6501235bcc3712c9a8d8852ae3c607d98
     PATCHES
+        fix-checktypesize.patch
         fix-modulejack.patch
         fix-m1-build.patch
+        fix-modules-cmake-cflags.patch
 )
 
 if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
-    include("${CURRENT_INSTALLED_DIR}/share/yasm-tool-helper/yasm-tool-helper.cmake")
     yasm_tool_helper(APPEND_TO_PATH)
 endif()
 
+vcpkg_list(SET options)
+if(VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_list(APPEND options "-DLIBMPG123_LIBS=-lshlwapi")
+endif()
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}/ports/cmake"
     OPTIONS
         -DUSE_MODULES=OFF
         -DBUILD_PROGRAMS=OFF
+        ${options}
     MAYBE_UNUSED_VARIABLES
         BUILD_PROGRAMS
 )
diff --git a/external_imported/vcpkg/ports/mpg123/vcpkg.json b/external_imported/vcpkg/ports/mpg123/vcpkg.json
index f5de8d828..d4e95cf19 100644
--- a/external_imported/vcpkg/ports/mpg123/vcpkg.json
+++ b/external_imported/vcpkg/ports/mpg123/vcpkg.json
@@ -1,9 +1,11 @@
 {
   "name": "mpg123",
   "version": "1.31.3",
+  "port-version": 4,
   "description": "mpg123 is a real time MPEG 1.0/2.0/2.5 audio player/decoder for layers 1, 2 and 3 (MPEG 1.0 layer 3 also known as MP3).",
   "homepage": "https://sourceforge.net/projects/mpg123/",
   "license": "LGPL-2.1-or-later",
+  "supports": "!xbox",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
@@ -14,8 +16,12 @@
       "host": true
     },
     {
-      "name": "yasm-tool-helper",
-      "platform": "windows"
+      "name": "yasm",
+      "host": true,
+      "features": [
+        "tools"
+      ],
+      "platform": "windows & !mingw"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/mpi/vcpkg.json b/external_imported/vcpkg/ports/mpi/vcpkg.json
index 2d5bbaddf..57d6419ab 100644
--- a/external_imported/vcpkg/ports/mpi/vcpkg.json
+++ b/external_imported/vcpkg/ports/mpi/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "mpi",
-  "version-string": "1",
-  "port-version": 3,
+  "version": "1",
+  "port-version": 4,
   "description": "Message Passing Interface (MPI) is a standardized and portable message-passing standard designed by a group of researchers from academia and industry to function on a wide variety of parallel computing architectures. The standard defines the syntax and semantics of a core of library routines useful to a wide range of users writing portable message-passing programs in C, C++, and Fortran. There are several well-tested and efficient implementations of MPI, many of which are open-source or in the public domain.",
   "license": null,
   "supports": "!uwp",
diff --git a/external_imported/vcpkg/ports/mpir/fix-static-include-files.patch b/external_imported/vcpkg/ports/mpir/fix-static-include-files.patch
new file mode 100644
index 000000000..5ae30734b
--- /dev/null
+++ b/external_imported/vcpkg/ports/mpir/fix-static-include-files.patch
@@ -0,0 +1,69 @@
+diff --git a/build.vc/postbuild.bat b/build.vc/postbuild.bat
+index de1ed08..e4ecceb 100644
+--- a/build.vc/postbuild.bat
++++ b/build.vc/postbuild.bat
+@@ -37,12 +37,10 @@ set bin_dir="..\%extn%\%plat%\%conf%\"
+ set hdr_dir="..\%extn%\%plat%\%conf%\"
+ 
+ rem output parametrers for the MPIR tests
+-if /i "%filename%" EQU "mpirxx" goto skip 
+ echo (set ldir=%loc%)   > output_params.bat
+ echo (set libr=%extn%) >> output_params.bat
+ echo (set plat=%plat%) >> output_params.bat
+ echo (set conf=%conf%) >> output_params.bat
+-:skip
+ 
+ echo copying outputs from %tgt_dir% to %bin_dir%
+ if not exist %bin_dir% md %bin_dir%
+diff --git a/build.vc15/lib_mpir_cxx/lib_mpir_cxx.vcxproj b/build.vc15/lib_mpir_cxx/lib_mpir_cxx.vcxproj
+index 3a23f01..1f44b22 100644
+--- a/build.vc15/lib_mpir_cxx/lib_mpir_cxx.vcxproj
++++ b/build.vc15/lib_mpir_cxx/lib_mpir_cxx.vcxproj
+@@ -70,6 +70,11 @@
+     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mpirxx</TargetName>
+   </PropertyGroup>
+   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
++    <PreBuildEvent>
++      <Command>cd ..\..\build.vc
++prebuild gc Win32 15
++      </Command>
++    </PreBuildEvent>
+     <ClCompile>
+       <AdditionalIncludeDirectories>..\..\</AdditionalIncludeDirectories>
+       <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+@@ -82,6 +87,11 @@ postbuild "$(TargetPath)" 15
+     </PostBuildEvent>
+   </ItemDefinitionGroup>
+   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
++    <PreBuildEvent>
++      <Command>cd ..\..\build.vc
++prebuild gc Win32 15
++      </Command>
++    </PreBuildEvent>
+     <ClCompile>
+       <AdditionalIncludeDirectories>..\..\</AdditionalIncludeDirectories>
+       <PreprocessorDefinitions>_DEBUG;WIN32;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+@@ -94,6 +104,11 @@ postbuild "$(TargetPath)" 15
+     </PostBuildEvent>
+   </ItemDefinitionGroup>
+   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
++    <PreBuildEvent>
++      <Command>cd ..\..\build.vc
++prebuild gc Win32 15
++      </Command>
++    </PreBuildEvent>
+     <ClCompile>
+       <AdditionalIncludeDirectories>..\..\</AdditionalIncludeDirectories>
+       <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;HAVE_CONFIG_H;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+@@ -106,6 +121,11 @@ postbuild "$(TargetPath)" 15
+     </PostBuildEvent>
+   </ItemDefinitionGroup>
+   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
++    <PreBuildEvent>
++      <Command>cd ..\..\build.vc
++prebuild gc Win32 15
++      </Command>
++    </PreBuildEvent>
+     <ClCompile>
+       <AdditionalIncludeDirectories>..\..\</AdditionalIncludeDirectories>
+       <PreprocessorDefinitions>_DEBUG;WIN32;_LIB;HAVE_CONFIG_H;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/external_imported/vcpkg/ports/mpir/portfile.cmake b/external_imported/vcpkg/ports/mpir/portfile.cmake
index db2e2163e..3ce9ca3b2 100644
--- a/external_imported/vcpkg/ports/mpir/portfile.cmake
+++ b/external_imported/vcpkg/ports/mpir/portfile.cmake
@@ -1,27 +1,24 @@
-if(EXISTS "${CURRENT_INSTALLED_DIR}/include/gmp.h" OR "${CURRENT_INSTALLED_DIR}/include/gmpxx.h")
+if(EXISTS "${CURRENT_INSTALLED_DIR}/include/gmp.h" OR EXISTS "${CURRENT_INSTALLED_DIR}/include/gmpxx.h")
     message(FATAL_ERROR "Can't build ${PORT} if gmp is installed. Please remove gmp, and try to install ${PORT} again if you need it.")
 endif()
 
-if(VCPKG_CRT_LINKAGE STREQUAL "static" AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    message(FATAL_ERROR "${PORT} currently can only be built using the dynamic CRT when building DLLs")
-endif()
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO wbhart/mpir
     REF cdd444aedfcbb190f00328526ef278428702d56e # 3.0.0
     SHA512 f46e45bdba27c9f89953ba23186b694486fd3010bd370ea2de71a4649a2816e716a6520c9baa96936f1884437ef03f92b21c0b1fb5b757beba5a05fed30b2bfc
     HEAD_REF master
-    PATCHES enable-runtimelibrary-toggle.patch
+    PATCHES 
+        enable-runtimelibrary-toggle.patch
+        fix-static-include-files.patch
 )
 
-if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
+if(NOT VCPKG_TARGET_IS_WINDOWS)
     vcpkg_find_acquire_program(YASM)
 
+    set(SHARED_STATIC --disable-static --enable-shared)
     if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
         set(SHARED_STATIC --enable-static --disable-shared --with-pic)
-    else()
-        set(SHARED_STATIC --disable-static --enable-shared)
     endif()
 
     set(OPTIONS --disable-silent-rules --enable-gmpcompat --enable-cxx ${SHARED_STATIC})
@@ -39,96 +36,48 @@ if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
         ${AUTOCONFIG}
         OPTIONS ${OPTIONS}
     )
-
     vcpkg_install_make()
-
-    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-    endif()
-
-elseif(VCPKG_TARGET_IS_WINDOWS)
-    if(VCPKG_PLATFORM_TOOLSET MATCHES "v141")
+else()
+    set(MSVC_VERSION 14)
+    if(VCPKG_PLATFORM_TOOLSET MATCHES "v14(1|2|3)")
         set(MSVC_VERSION 15)
-    else()
-        set(MSVC_VERSION 14)
     endif()
 
-    if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-        set(DLL_OR_LIB dll)
-    else()
+    set(DLL_OR_LIB dll)
+    if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
         set(DLL_OR_LIB lib)
     endif()
 
-    if(VCPKG_CRT_LINKAGE STREQUAL "static")
-        set(RuntimeLibraryExt "")
-    else()
-        set(RuntimeLibraryExt "DLL")
-    endif()
-
-    file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}")
-    file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}")
-    file(GLOB FILES "${SOURCE_PATH}/*")
-    file(COPY ${FILES} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}")
-
-    vcpkg_build_msbuild(
-        PROJECT_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/build.vc${MSVC_VERSION}/${DLL_OR_LIB}_mpir_gc/${DLL_OR_LIB}_mpir_gc.vcxproj"
-        OPTIONS_DEBUG "/p:RuntimeLibrary=MultiThreadedDebug${RuntimeLibraryExt}"
-        OPTIONS_RELEASE "/p:RuntimeLibrary=MultiThreaded${RuntimeLibraryExt}"
+    # Note: Could probably be moved to use vcpkg_configure_make on windows
+    vcpkg_msbuild_install(
+        SOURCE_PATH "${SOURCE_PATH}"
+        PROJECT_SUBPATH "build.vc${MSVC_VERSION}/${DLL_OR_LIB}_mpir_gc/${DLL_OR_LIB}_mpir_gc.vcxproj"
     )
 
     if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-        vcpkg_build_msbuild(
-            PROJECT_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/build.vc${MSVC_VERSION}/${DLL_OR_LIB}_mpir_cxx/${DLL_OR_LIB}_mpir_cxx.vcxproj"
-            OPTIONS_DEBUG "/p:RuntimeLibrary=MultiThreadedDebug${RuntimeLibraryExt}"
-            OPTIONS_RELEASE "/p:RuntimeLibrary=MultiThreaded${RuntimeLibraryExt}"
+        vcpkg_msbuild_install(
+            SOURCE_PATH "${SOURCE_PATH}"
+            PROJECT_SUBPATH "build.vc${MSVC_VERSION}/${DLL_OR_LIB}_mpir_cxx/${DLL_OR_LIB}_mpir_cxx.vcxproj"
         )
-        if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-            file(GLOB REL_LIBS_CXX "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/mpirxx.lib")
-        endif()
-        if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-            file(GLOB DBG_LIBS_CXX "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/mpirxx.lib")
-        endif()
     endif()
 
-    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-        file(GLOB HEADERS
-            "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/gmp.h"
-            "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/gmpxx.h"
-            "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/mpir.h"
-            "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/mpirxx.h"
-        )
-        file(INSTALL ${HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include")
-
-        file(GLOB REL_DLLS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/mpir.dll")
-        file(GLOB REL_LIBS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/mpir.lib")
-        list(APPEND REL_LIBS ${REL_LIBS_CXX})
-
-        file(INSTALL ${REL_DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
-        file(INSTALL ${REL_LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
-    endif()
-    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-        file(GLOB HEADERS
-            "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/gmp.h"
-            "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/gmpxx.h"
-            "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/mpir.h"
-            "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/mpirxx.h"
-        )
-        file(INSTALL ${HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include")
-
-        file(GLOB DBG_DLLS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/mpir.dll")
-        file(GLOB DBG_LIBS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/mpir.lib")
-        list(APPEND DBG_LIBS  ${DBG_LIBS_CXX})
-
-        file(INSTALL ${DBG_DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
-        file(INSTALL ${DBG_LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
+    file(GLOB HEADERS
+        "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/*/Release/gmp.h"
+        "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/*/Release/gmpxx.h"
+        "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/*/Release/mpir.h"
+        "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/*/Release/mpirxx.h"
+    )
+    file(INSTALL ${HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include")
 
-        if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-            file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
-        endif()
-    endif()
+    file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/COPYING.LIB" "${CURRENT_PACKAGES_DIR}/debug/lib/COPYING.LIB")
+endif()
 
-    vcpkg_copy_pdbs()
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
+file(REMOVE_RECURSE
+        "${CURRENT_PACKAGES_DIR}/debug/include"
+        "${CURRENT_PACKAGES_DIR}/debug/share"
+    )
 
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING" "${SOURCE_PATH}/COPYING.LIB")
diff --git a/external_imported/vcpkg/ports/mpir/vcpkg.json b/external_imported/vcpkg/ports/mpir/vcpkg.json
index 5a9c0cc9f..9df67f4e5 100644
--- a/external_imported/vcpkg/ports/mpir/vcpkg.json
+++ b/external_imported/vcpkg/ports/mpir/vcpkg.json
@@ -1,9 +1,16 @@
 {
   "name": "mpir",
   "version-date": "2022-03-02",
-  "port-version": 1,
+  "port-version": 3,
   "description": "Multiple Precision Integers and Rationals",
   "homepage": "https://github.com/wbhart/mpir",
-  "license": "GPL-3.0-only",
-  "supports": "!(uwp | arm)"
+  "license": null,
+  "supports": "!(uwp | arm)",
+  "dependencies": [
+    {
+      "name": "vcpkg-msbuild",
+      "host": true,
+      "platform": "windows"
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/mqtt-cpp/portfile.cmake b/external_imported/vcpkg/ports/mqtt-cpp/portfile.cmake
index dfd641f31..32e9885ea 100644
--- a/external_imported/vcpkg/ports/mqtt-cpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/mqtt-cpp/portfile.cmake
@@ -1,9 +1,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO redboltz/mqtt_cpp
-    REF v13.1.0    
+    REF v${VERSION}
     SHA512
-    71907ba013d844d3b00c932b8598480067c0b2a2088ea95ae6d65a548145b851f6a25135f4e3c1e61cfc3831b024308e872f194bc9af7febe0036edc2e63b9d4
+    70da1f78a032db458b8744d1ed7c3eec97924ad78127ee5aa58cd4fb8e33351874f9d4b2f08aa94a202ee971d3f94d53167da307af3e82b9488aa89796f981e4
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/mqtt-cpp/vcpkg.json b/external_imported/vcpkg/ports/mqtt-cpp/vcpkg.json
index 4572af3d7..83ef57dbc 100644
--- a/external_imported/vcpkg/ports/mqtt-cpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/mqtt-cpp/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "mqtt-cpp",
-  "version-semver": "13.1.0",
+  "version-semver": "13.2.1",
   "description": "Header-only MQTT client/server for C++14 based on Boost.Asio.",
   "homepage": "https://github.com/redboltz/mqtt_cpp",
   "license": "BSL-1.0",
diff --git a/external_imported/vcpkg/ports/ms-gltf/fix-apple-filesystem.patch b/external_imported/vcpkg/ports/ms-gltf/fix-apple-filesystem.patch
deleted file mode 100644
index d2d1a504b..000000000
--- a/external_imported/vcpkg/ports/ms-gltf/fix-apple-filesystem.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff --git a/GLTFSDK.Samples/CMakeLists.txt b/GLTFSDK.Samples/CMakeLists.txt
-index a66ed93..d948ee2 100644
---- a/GLTFSDK.Samples/CMakeLists.txt
-+++ b/GLTFSDK.Samples/CMakeLists.txt
-@@ -1,4 +1,6 @@
- cmake_minimum_required(VERSION 3.5)
--
-+if(APPLE)
-+    set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15")
-+endif()
- add_subdirectory(Deserialize)
- add_subdirectory(Serialize)
-diff --git a/GLTFSDK.Samples/Deserialize/CMakeLists.txt b/GLTFSDK.Samples/Deserialize/CMakeLists.txt
-index 791898c..6474aee 100644
---- a/GLTFSDK.Samples/Deserialize/CMakeLists.txt
-+++ b/GLTFSDK.Samples/Deserialize/CMakeLists.txt
-@@ -17,6 +17,8 @@ if (MSVC)
- 
-     # Make sure that all PDB files on Windows are installed to the output folder.  By default, only the debug build does this.
-     set_target_properties(Deserialize PROPERTIES COMPILE_PDB_NAME "Deserialize" COMPILE_PDB_OUTPUT_DIRECTORY "${RUNTIME_OUTPUT_DIRECTORY}")
-+elseif(APPLE)
-+    set_target_properties(Deserialize PROPERTIES CXX_STANDARD 17)
- endif()
- 
- if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-diff --git a/GLTFSDK.Samples/Deserialize/Source/main.cpp b/GLTFSDK.Samples/Deserialize/Source/main.cpp
-index 80198fa..fb560e0 100644
---- a/GLTFSDK.Samples/Deserialize/Source/main.cpp
-+++ b/GLTFSDK.Samples/Deserialize/Source/main.cpp
-@@ -8,6 +8,9 @@
- 
- // Replace this with <filesystem> (and use std::filesystem rather than
- // std::experimental::filesystem) if your toolchain fully supports C++17
-+#if defined(__APPLE__)
-+#define _LIBCPP_NO_EXPERIMENTAL_DEPRECATION_WARNING_FILESYSTEM
-+#endif
- #include <experimental/filesystem>
- 
- #include <fstream>
-diff --git a/GLTFSDK.Samples/Serialize/CMakeLists.txt b/GLTFSDK.Samples/Serialize/CMakeLists.txt
-index 5269da8..1129ea0 100644
---- a/GLTFSDK.Samples/Serialize/CMakeLists.txt
-+++ b/GLTFSDK.Samples/Serialize/CMakeLists.txt
-@@ -17,6 +17,8 @@ if (MSVC)
- 
-     # Make sure that all PDB files on Windows are installed to the output folder.  By default, only the debug build does this.
-     set_target_properties(Serialize PROPERTIES COMPILE_PDB_NAME "Serialize" COMPILE_PDB_OUTPUT_DIRECTORY "${RUNTIME_OUTPUT_DIRECTORY}")
-+elseif(APPLE)
-+    set_target_properties(Serialize PROPERTIES CXX_STANDARD 17)
- endif()
- 
- if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-diff --git a/GLTFSDK.Samples/Serialize/Source/main.cpp b/GLTFSDK.Samples/Serialize/Source/main.cpp
-index ac87c10..f5c6e0b 100644
---- a/GLTFSDK.Samples/Serialize/Source/main.cpp
-+++ b/GLTFSDK.Samples/Serialize/Source/main.cpp
-@@ -10,6 +10,9 @@
- 
- // Replace this with <filesystem> (and use std::filesystem rather than
- // std::experimental::filesystem) if your toolchain fully supports C++17
-+#if defined(__APPLE__)
-+#define _LIBCPP_NO_EXPERIMENTAL_DEPRECATION_WARNING_FILESYSTEM
-+#endif
- #include <experimental/filesystem>
- 
- #include <fstream>
diff --git a/external_imported/vcpkg/ports/ms-gltf/portfile.cmake b/external_imported/vcpkg/ports/ms-gltf/portfile.cmake
index 2066ac672..2caaff22e 100644
--- a/external_imported/vcpkg/ports/ms-gltf/portfile.cmake
+++ b/external_imported/vcpkg/ports/ms-gltf/portfile.cmake
@@ -10,7 +10,6 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
         fix-install.patch
-        fix-apple-filesystem.patch
 )
 
 # note: Test/Sample executables won't be installed
@@ -37,4 +36,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
 endif()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/ms-gltf/vcpkg.json b/external_imported/vcpkg/ports/ms-gltf/vcpkg.json
index d5e7ac83e..a720155b2 100644
--- a/external_imported/vcpkg/ports/ms-gltf/vcpkg.json
+++ b/external_imported/vcpkg/ports/ms-gltf/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ms-gltf",
   "version-date": "2022-06-28",
-  "port-version": 1,
+  "port-version": 2,
   "description": "glTF-SDK is a C++ Software Development Kit for glTF",
   "homepage": "https://github.com/microsoft/glTF-SDK",
   "license": "MIT",
@@ -18,7 +18,8 @@
   ],
   "features": {
     "samples": {
-      "description": "Build with GLTF samples"
+      "description": "Build with GLTF samples",
+      "supports": "!osx & !ios & !android"
     },
     "test": {
       "description": "Build test programs",
diff --git a/external_imported/vcpkg/ports/ms-gsl/vcpkg.json b/external_imported/vcpkg/ports/ms-gsl/vcpkg.json
index ace0f12e7..8d70ddbcd 100644
--- a/external_imported/vcpkg/ports/ms-gsl/vcpkg.json
+++ b/external_imported/vcpkg/ports/ms-gsl/vcpkg.json
@@ -1,8 +1,10 @@
 {
   "name": "ms-gsl",
   "version": "4.0.0",
+  "port-version": 1,
   "description": "Microsoft implementation of the Guidelines Support Library",
   "homepage": "https://github.com/Microsoft/GSL",
+  "license": "MIT",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/ms-ifc-sdk/portfile.cmake b/external_imported/vcpkg/ports/ms-ifc-sdk/portfile.cmake
new file mode 100644
index 000000000..682345cd7
--- /dev/null
+++ b/external_imported/vcpkg/ports/ms-ifc-sdk/portfile.cmake
@@ -0,0 +1,26 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO microsoft/ifc
+    REF 0.43.1
+    SHA512 c7ce8570d776f875c1a1fed929734ebc73b2cf25106e2a5e80625269f4f91d8106d19da34525cc4d7a694d750788d124e8e1ef082c54a13c9b34fe3da7f9e82d
+    HEAD_REF main
+)
+
+set(config_path share/cmake/Microsoft.IFC)
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        "-DIFC_INSTALL_CMAKEDIR:PATH=${config_path}"
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(
+    PACKAGE_NAME Microsoft.IFC
+    CONFIG_PATH "${config_path}"
+)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+file(INSTALL "${SOURCE_PATH}/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/external_imported/vcpkg/ports/ms-ifc-sdk/usage b/external_imported/vcpkg/ports/ms-ifc-sdk/usage
new file mode 100644
index 000000000..f49a254b1
--- /dev/null
+++ b/external_imported/vcpkg/ports/ms-ifc-sdk/usage
@@ -0,0 +1,8 @@
+The package Microsoft.IFC provides CMake targets:
+
+    find_package(Microsoft.IFC CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE Microsoft.IFC::SDK)
+
+    # Or use the individual components of Microsoft.IFC::SDK for advanced use
+    find_package(Microsoft.IFC CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE Microsoft.IFC::Core Microsoft.IFC::DOM)
diff --git a/external_imported/vcpkg/ports/ms-ifc-sdk/vcpkg.json b/external_imported/vcpkg/ports/ms-ifc-sdk/vcpkg.json
new file mode 100644
index 000000000..c738f26c4
--- /dev/null
+++ b/external_imported/vcpkg/ports/ms-ifc-sdk/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "ms-ifc-sdk",
+  "version": "0.43.1",
+  "description": "SDK for the IFC specification at https://github.com/microsoft/ifc-spec",
+  "homepage": "https://github.com/microsoft/ifc",
+  "license": "Apache-2.0 WITH LLVM-exception",
+  "dependencies": [
+    "ms-gsl",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/msdfgen/portfile.cmake b/external_imported/vcpkg/ports/msdfgen/portfile.cmake
index 2457cddae..03678799f 100644
--- a/external_imported/vcpkg/ports/msdfgen/portfile.cmake
+++ b/external_imported/vcpkg/ports/msdfgen/portfile.cmake
@@ -1,13 +1,9 @@
 
-if ("tools" IN_LIST FEATURES AND VCPKG_TARGET_IS_UWP)
-    message(FATAL_ERROR "Tools cannot be built on UWP.")
-endif()
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Chlumsky/msdfgen
-    REF a811ef8935354d3f6d767cff6c4eebeb683777f2 # accessed on 2023-01-20
-    SHA512 6c7fb9e9a4f4dee2502e1dca2c4612aae005697476e30664cc263f09e336b1cd0b529d75af667cdd9063ac1dd183867ce9f5bb88731e3071687c87937dab29d9
+    REF v1.11
+    SHA512 b5223bbdbd7245e7a891914158a25ea1d570bbe1066ca6c016d1ddd469d5156690f83f91c78630b2b2efcc890de0b7e1c9e8963a67f9eb8f83c6d45284d5b08a
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/msdfgen/vcpkg.json b/external_imported/vcpkg/ports/msdfgen/vcpkg.json
index 305dba25c..c52af196a 100644
--- a/external_imported/vcpkg/ports/msdfgen/vcpkg.json
+++ b/external_imported/vcpkg/ports/msdfgen/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "msdfgen",
-  "version": "1.10.0",
+  "version": "1.11.0",
   "description": "Multi-channel signed distance field generator",
   "homepage": "https://github.com/Chlumsky/msdfgen",
   "license": "MIT",
@@ -47,7 +47,8 @@
       "description": "Build with OpenMP support for multi-threaded code."
     },
     "tools": {
-      "description": "Generates an executable inside the tools folder. Not supported on UWP.",
+      "description": "Generates an executable inside the tools folder.",
+      "supports": "!uwp",
       "dependencies": [
         {
           "name": "msdfgen",
diff --git a/external_imported/vcpkg/ports/msgpack-c/portfile.cmake b/external_imported/vcpkg/ports/msgpack-c/portfile.cmake
new file mode 100644
index 000000000..67ff6374b
--- /dev/null
+++ b/external_imported/vcpkg/ports/msgpack-c/portfile.cmake
@@ -0,0 +1,28 @@
+if (EXISTS ${CURRENT_INSTALLED_DIR}/include/msgpack/pack.h)
+    message(FATAL_ERROR "Cannot install ${PORT} when rest-rpc is already installed, please remove rest-rpc using \"./vcpkg remove rest-rpc:${TARGET_TRIPLET}\"")
+endif()
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO msgpack/msgpack-c
+    REF c-6.0.0
+    SHA512 ba7d1b649dd1318f99d45ba5fd44346e53924ba7a121104a080c3865e8c01db3842efa1dc9e01478b962274675ba4632d9daaeb163821d46531b30d6abcda161
+    HEAD_REF c_master
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DMSGPACK_BUILD_EXAMPLES=OFF
+        -DMSGPACK_BUILD_TESTS=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+
+vcpkg_cmake_config_fixup(PACKAGE_NAME msgpack-c CONFIG_PATH lib/cmake/msgpack-c)
+vcpkg_fixup_pkgconfig()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/msgpack-c/vcpkg.json b/external_imported/vcpkg/ports/msgpack-c/vcpkg.json
new file mode 100644
index 000000000..694914041
--- /dev/null
+++ b/external_imported/vcpkg/ports/msgpack-c/vcpkg.json
@@ -0,0 +1,17 @@
+{
+  "name": "msgpack-c",
+  "version": "6.0.0",
+  "description": "MessagePack is an efficient binary serialization format, which lets you exchange data among multiple languages like JSON, except that it's faster and smaller.",
+  "homepage": "https://github.com/msgpack/msgpack-c",
+  "license": "BSL-1.0",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/msgpack/portfile.cmake b/external_imported/vcpkg/ports/msgpack/portfile.cmake
index 2bdc170e1..164ccd4be 100644
--- a/external_imported/vcpkg/ports/msgpack/portfile.cmake
+++ b/external_imported/vcpkg/ports/msgpack/portfile.cmake
@@ -5,9 +5,9 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO msgpack/msgpack-c
-    REF cpp-4.1.3
-    SHA512 1252a2d61b119e9a8db6cc3667d2ae3234784d6607e2d08b836ab2f561455aa8c14ac134de0e8bb47f85a9fa86a9b325babd0a5a437daa0f270143d07738adcf
-    HEAD_REF master
+    REF cpp-6.0.0
+    SHA512 6f2ec74562f30d12ba81659737c412317848eb27fbc607a2f4f8da4b75534fbfba7d280a5af6fdae3581a6a2582e6cf06d7fbfacc3bdee1174456817dd9f7e30
+    HEAD_REF cpp_master
 )
 
 vcpkg_cmake_configure(
@@ -20,7 +20,7 @@ vcpkg_cmake_configure(
 
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
-vcpkg_cmake_config_fixup(PACKAGE_NAME msgpackc-cxx CONFIG_PATH lib/cmake/msgpackc-cxx)
+vcpkg_cmake_config_fixup(PACKAGE_NAME msgpack-cxx CONFIG_PATH lib/cmake/msgpack-cxx)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
diff --git a/external_imported/vcpkg/ports/msgpack/vcpkg.json b/external_imported/vcpkg/ports/msgpack/vcpkg.json
index e3119a9fb..fcc2ebaae 100644
--- a/external_imported/vcpkg/ports/msgpack/vcpkg.json
+++ b/external_imported/vcpkg/ports/msgpack/vcpkg.json
@@ -1,11 +1,19 @@
 {
   "name": "msgpack",
-  "version": "4.1.3",
+  "version": "6.0.0",
+  "port-version": 1,
   "description": "MessagePack is an efficient binary serialization format, which lets you exchange data among multiple languages like JSON, except that it's faster and smaller.",
   "homepage": "https://github.com/msgpack/msgpack-c",
   "license": "BSL-1.0",
   "dependencies": [
-    "boost",
+    "boost-assert",
+    "boost-fusion",
+    "boost-numeric-conversion",
+    "boost-optional",
+    "boost-predef",
+    "boost-preprocessor",
+    "boost-utility",
+    "boost-variant",
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/external_imported/vcpkg/ports/msinttypes/vcpkg.json b/external_imported/vcpkg/ports/msinttypes/vcpkg.json
index 46bc22f18..b0cf6b300 100644
--- a/external_imported/vcpkg/ports/msinttypes/vcpkg.json
+++ b/external_imported/vcpkg/ports/msinttypes/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "msinttypes",
-  "version-string": "2018-02-25",
-  "port-version": 1,
+  "version-date": "2018-02-25",
+  "port-version": 2,
   "description": "msinttypes is a package to provide missing  ISO C9x  compliant headers for Microsoft Visual Studio",
   "homepage": "https://github.com/chemeris/msinttypes"
 }
diff --git a/external_imported/vcpkg/ports/mstch/vcpkg.json b/external_imported/vcpkg/ports/mstch/vcpkg.json
index 5cda51228..405d70ec3 100644
--- a/external_imported/vcpkg/ports/mstch/vcpkg.json
+++ b/external_imported/vcpkg/ports/mstch/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "mstch",
-  "version-string": "1.0.2",
-  "port-version": 4,
+  "version": "1.0.2",
+  "port-version": 5,
   "description": "Mstch is a complete implementation of {{mustache}} templates using modern C++",
   "homepage": "https://github.com/no1msd/mstch",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/mtlt/portfile.cmake b/external_imported/vcpkg/ports/mtlt/portfile.cmake
new file mode 100644
index 000000000..45dd7ac6a
--- /dev/null
+++ b/external_imported/vcpkg/ports/mtlt/portfile.cmake
@@ -0,0 +1,23 @@
+set(VCPKG_BUILD_TYPE release) # Header-only library
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO tonitaga/MTLT
+    REF 8e30e6636b06ad008082e22f37e0d79873142e1b
+    SHA512 2addaa4f84037a14431b20734fe5ca1ea11c4d9d1a0ddf82a16b9efaacbbac3873038bd16f93ba94288559585ae76d12884166931c91a214a3e3ed0cecea6b3b
+    HEAD_REF main
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME "mtlt" CONFIG_PATH "lib/cmake/mtlt")
+vcpkg_fixup_pkgconfig()
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/mtlt/usage b/external_imported/vcpkg/ports/mtlt/usage
new file mode 100644
index 000000000..ea8d6e60a
--- /dev/null
+++ b/external_imported/vcpkg/ports/mtlt/usage
@@ -0,0 +1,4 @@
+The package mtlt provides CMake targets:
+
+    find_package(mtlt REQUIRED)
+    target_link_libraries(${PROJECT_NAME} PRIVATE mtlt::mtlt)
diff --git a/external_imported/vcpkg/ports/mtlt/vcpkg.json b/external_imported/vcpkg/ports/mtlt/vcpkg.json
new file mode 100644
index 000000000..4f29fc337
--- /dev/null
+++ b/external_imported/vcpkg/ports/mtlt/vcpkg.json
@@ -0,0 +1,17 @@
+{
+  "name": "mtlt",
+  "version": "1.0.0",
+  "description": "Tonitaga 2024. MTLT is a header-only math matrix library that allows you to do compile-time calculations, perform atomic operations, and contains all the basic operations on matrices. The library is written in STL style, supports joint work with STL algorithms. Since C++11",
+  "homepage": "https://github.com/tonitaga/MTLT",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/mujoco/vcpkg.json b/external_imported/vcpkg/ports/mujoco/vcpkg.json
index 674a758b4..ab0a312e2 100644
--- a/external_imported/vcpkg/ports/mujoco/vcpkg.json
+++ b/external_imported/vcpkg/ports/mujoco/vcpkg.json
@@ -1,8 +1,9 @@
 {
   "name": "mujoco",
   "version": "2.3.2",
+  "port-version": 1,
   "description": "Multi-Joint dynamics with Contact.",
-  "homepage": "mujoco.org",
+  "homepage": "https://mujoco.org",
   "license": "Apache-2.0",
   "supports": "!(windows & static)",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/murmur3/CMakeLists.txt b/external_imported/vcpkg/ports/murmur3/CMakeLists.txt
new file mode 100644
index 000000000..73796950f
--- /dev/null
+++ b/external_imported/vcpkg/ports/murmur3/CMakeLists.txt
@@ -0,0 +1,47 @@
+cmake_minimum_required(VERSION 3.19)
+project(murmur3 LANGUAGES C)
+set(PROJECT_VERSION "${VERSION}")
+
+set(Header_Files "${PROJECT_NAME}.h")
+set(Source_Files "${PROJECT_NAME}.c")
+
+add_library("${PROJECT_NAME}" "${Header_Files}" "${Source_Files}")
+
+include(GNUInstallDirs)
+target_include_directories(
+  "${PROJECT_NAME}"
+  PUBLIC
+  "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>"
+  "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
+)
+target_compile_features("${PROJECT_NAME}" PRIVATE c_std_90)
+set_target_properties("${PROJECT_NAME}" PROPERTIES C_VISIBILITY_PRESET hidden
+                      PUBLIC_HEADER "${Header_Files}")
+
+install(
+  TARGETS                   "${PROJECT_NAME}"
+  EXPORT                    "unofficial-${PROJECT_NAME}Config"
+  RUNTIME       DESTINATION "${CMAKE_INSTALL_BINDIR}"
+  ARCHIVE       DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+  LIBRARY       DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+  PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+)
+
+include(CMakePackageConfigHelpers)
+set(VERSION_FILE_PATH "${CMAKE_CURRENT_BINARY_DIR}/unofficial-${PROJECT_NAME}ConfigVersion.cmake")
+write_basic_package_version_file(
+  "${VERSION_FILE_PATH}"
+  VERSION       "${PROJECT_VERSION}"
+  COMPATIBILITY SameMajorVersion
+)
+install(FILES "${VERSION_FILE_PATH}" DESTINATION "share/unofficial-${PROJECT_NAME}")
+
+install(FILES ${Header_Files} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+
+install(
+  EXPORT      "unofficial-${PROJECT_NAME}Config"
+  FILE        "unofficial-${PROJECT_NAME}Config.cmake"
+  NAMESPACE   "unofficial::${PROJECT_NAME}::"
+  DESTINATION "share/unofficial-${PROJECT_NAME}")
+
+export(PACKAGE "${PROJECT_NAME}")
diff --git a/external_imported/vcpkg/ports/murmur3/portfile.cmake b/external_imported/vcpkg/ports/murmur3/portfile.cmake
new file mode 100644
index 000000000..c2cf1642d
--- /dev/null
+++ b/external_imported/vcpkg/ports/murmur3/portfile.cmake
@@ -0,0 +1,28 @@
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO            PeterScott/murmur3
+    REF             dae94be0c0f54a399d23ea6cbe54bca5a4e93ce4
+    SHA512          1bc01eefc04f06704800a7448231db9f82fc809079bd3f43ef24d7dd3d8deaec2143f252a8e556dafe366401f898b676922b0c93ac181aaf38ae69ad638adbba
+    HEAD_REF        master
+)
+
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+     DESTINATION "${SOURCE_PATH}")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        "-DVERSION=${VERSION}"
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT})
+
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "CC0-1.0")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage"
+     DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share"
+                    "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/external_imported/vcpkg/ports/murmur3/usage b/external_imported/vcpkg/ports/murmur3/usage
new file mode 100644
index 000000000..cbb2d18aa
--- /dev/null
+++ b/external_imported/vcpkg/ports/murmur3/usage
@@ -0,0 +1,3 @@
+murmur3 provides CMake targets:
+    find_package(unofficial-murmur3 CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE unofficial::murmur3::murmur3)
diff --git a/external_imported/vcpkg/ports/murmur3/vcpkg.json b/external_imported/vcpkg/ports/murmur3/vcpkg.json
new file mode 100644
index 000000000..4bc78a0f5
--- /dev/null
+++ b/external_imported/vcpkg/ports/murmur3/vcpkg.json
@@ -0,0 +1,17 @@
+{
+  "name": "murmur3",
+  "version-date": "2015-05-02",
+  "description": "Murmur3 hash in C",
+  "homepage": "https://github.com/PeterScott/murmur3",
+  "license": "CC0-1.0",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/murmurhash/vcpkg.json b/external_imported/vcpkg/ports/murmurhash/vcpkg.json
index f0e10b481..f79ceee27 100644
--- a/external_imported/vcpkg/ports/murmurhash/vcpkg.json
+++ b/external_imported/vcpkg/ports/murmurhash/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "murmurhash",
   "version-date": "2016-01-09",
-  "port-version": 6,
+  "port-version": 7,
   "description": "MurmurHash a family of hash functions.",
   "homepage": "https://github.com/aappleby/smhasher",
-  "supports": "!uwp & !arm",
+  "supports": "!uwp",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/mvfst/portfile.cmake b/external_imported/vcpkg/ports/mvfst/portfile.cmake
index 8766d87c6..13baf30fc 100644
--- a/external_imported/vcpkg/ports/mvfst/portfile.cmake
+++ b/external_imported/vcpkg/ports/mvfst/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO facebookincubator/mvfst
-    REF 28857570ac808c5493312144dc5af92d6f0a7381  #2022-11-03
-    SHA512 3e413e8906ac83f48936871f24d06980bdeff8b7a659326498549afaa53321c047bcd843a7ed971bfed7ddb51e086a28c1ac5fb0f91aabd0a078dda6a75fe488
+    REPO facebook/mvfst
+    REF "v${VERSION}"
+    SHA512 6bcc4df79b42bafb06ee69f253733dd5136ef329b8009fc5677f62c3476d205f5f0cdcca242d0bde15914bf487a37aeeab1adb4ad555d2edd5e6b3935e84dd37
     HEAD_REF main
 )
 
diff --git a/external_imported/vcpkg/ports/mvfst/vcpkg.json b/external_imported/vcpkg/ports/mvfst/vcpkg.json
index 4082b7751..e83ac843a 100644
--- a/external_imported/vcpkg/ports/mvfst/vcpkg.json
+++ b/external_imported/vcpkg/ports/mvfst/vcpkg.json
@@ -1,12 +1,19 @@
 {
   "name": "mvfst",
-  "version-date": "2022-11-03",
+  "version-string": "2024.01.01.00",
   "description": "mvfst (Pronounced move fast) is a client and server implementation of IETF QUIC protocol in C++ by Facebook.",
-  "homepage": "https://github.com/facebookincubator/mvfst",
+  "homepage": "https://github.com/facebook/mvfst",
   "license": "MIT",
   "supports": "!windows",
   "dependencies": [
-    "boost",
+    "boost-context",
+    "boost-date-time",
+    "boost-filesystem",
+    "boost-iostreams",
+    "boost-program-options",
+    "boost-regex",
+    "boost-system",
+    "boost-thread",
     "fizz",
     "fmt",
     "folly",
diff --git a/external_imported/vcpkg/ports/mygui/Install-tools.patch b/external_imported/vcpkg/ports/mygui/Install-tools.patch
index bdfc2c90f..010344f7b 100644
--- a/external_imported/vcpkg/ports/mygui/Install-tools.patch
+++ b/external_imported/vcpkg/ports/mygui/Install-tools.patch
@@ -1,14 +1,16 @@
 diff --git a/CMake/Utils/MyGUIConfigTargets.cmake b/CMake/Utils/MyGUIConfigTargets.cmake
-index 6483339..71710de 100644
+index 6483339..0b35148 100644
 --- a/CMake/Utils/MyGUIConfigTargets.cmake
 +++ b/CMake/Utils/MyGUIConfigTargets.cmake
-@@ -170,6 +170,9 @@ function(mygui_app PROJECTNAME SOLUTIONFOLDER)
+@@ -170,6 +170,11 @@ function(mygui_app PROJECTNAME SOLUTIONFOLDER)
  			set(MYGUI_EXEC_TYPE WIN32)
  		endif ()
  		add_executable(${PROJECTNAME} ${MYGUI_EXEC_TYPE} ${HEADER_FILES} ${SOURCE_FILES})
-+    install(TARGETS ${PROJECTNAME}
-+      RUNTIME DESTINATION bin
-+    )
++		if (APPLE)
++			install(TARGETS ${PROJECTNAME} BUNDLE DESTINATION bin)
++		else ()
++			install(TARGETS ${PROJECTNAME} RUNTIME DESTINATION bin)
++		endif ()
  	endif ()
  	set_target_properties(${PROJECTNAME} PROPERTIES FOLDER ${SOLUTIONFOLDER})
  
diff --git a/external_imported/vcpkg/ports/mygui/Use-vcpkg-sdl2.patch b/external_imported/vcpkg/ports/mygui/Use-vcpkg-sdl2.patch
deleted file mode 100644
index 6a6059ee6..000000000
--- a/external_imported/vcpkg/ports/mygui/Use-vcpkg-sdl2.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt
-index 2b160ff..559e6a8 100644
---- a/Common/CMakeLists.txt
-+++ b/Common/CMakeLists.txt
-@@ -99,6 +99,8 @@ add_library(${PROJECTNAME} ${HEADER_FILES} ${SOURCE_FILES})
- 
- mygui_set_platform_name(${MYGUI_RENDERSYSTEM})
- add_dependencies(${PROJECTNAME} MyGUI.${MYGUI_PLATFORM_NAME}Platform)
--target_link_libraries(${PROJECTNAME} MyGUI.${MYGUI_PLATFORM_NAME}Platform)
-+
-+find_package(SDL2 CONFIG REQUIRED)
-+target_link_libraries(${PROJECTNAME} MyGUI.${MYGUI_PLATFORM_NAME}Platform SDL2::SDL2 SDL2::SDL2main)
- 
- add_dependencies(${PROJECTNAME} MyGUIEngine)
diff --git a/external_imported/vcpkg/ports/mygui/fix-osx-build.patch b/external_imported/vcpkg/ports/mygui/fix-osx-build.patch
deleted file mode 100644
index 507770713..000000000
--- a/external_imported/vcpkg/ports/mygui/fix-osx-build.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0c1e0079653223fafb346f67c7e3bb001a39de73 Mon Sep 17 00:00:00 2001
-From: Leander Schulten <Leander.Schulten@rwth-aachen.de>
-Date: Sun, 23 Oct 2022 15:53:08 +0200
-Subject: [PATCH] do not simply include everything
-
----
- MyGUIEngine/CMakeLists.txt | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/MyGUIEngine/CMakeLists.txt b/MyGUIEngine/CMakeLists.txt
-index 33f74563b..40ec35101 100644
---- a/MyGUIEngine/CMakeLists.txt
-+++ b/MyGUIEngine/CMakeLists.txt
-@@ -48,11 +48,6 @@ if (MYGUI_USE_FREETYPE)
- 	endif()
- endif()
- 
--# platform specific dependencies
--if (APPLE)
--	include_directories(/usr/local/include /usr/include)
--endif ()
--
- if (${CMAKE_VERSION} VERSION_EQUAL "3.16" OR ${CMAKE_VERSION} VERSION_GREATER "3.16")
- 	target_precompile_headers(${PROJECTNAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include/MyGUI_Precompiled.h")
- endif ()
diff --git a/external_imported/vcpkg/ports/mygui/opengl.patch b/external_imported/vcpkg/ports/mygui/opengl.patch
new file mode 100644
index 000000000..7782b2412
--- /dev/null
+++ b/external_imported/vcpkg/ports/mygui/opengl.patch
@@ -0,0 +1,26 @@
+diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt
+index db7d6610c..eb9190e07 100644
+--- a/Common/CMakeLists.txt
++++ b/Common/CMakeLists.txt
+@@ -41,12 +41,9 @@ elseif(MYGUI_RENDERSYSTEM EQUAL 3)
+ elseif(MYGUI_RENDERSYSTEM EQUAL 4)
+ 	add_definitions("-DMYGUI_OPENGL_PLATFORM")
+ 	include_directories(SYSTEM
+-		${OPENGL_INCLUDE_DIR}
+ 		${SDL2_IMAGE_INCLUDE_DIRS}
+ 		${MYGUI_SOURCE_DIR}/Platforms/${MYGUI_PLATFORM_NAME}/${MYGUI_PLATFORM_NAME}Platform/include
+ 	)
+-	include_directories(SYSTEM include/GL)
+-	link_directories(${OPENGL_LIB_DIR})
+ 	link_directories(${SDL2_IMAGE_LIB_DIR})
+ elseif(MYGUI_RENDERSYSTEM EQUAL 5)
+ 	add_definitions("-DMYGUI_DIRECTX_PLATFORM")
+@@ -106,3 +103,8 @@ if (MYGUI_INSTALL_TOOLS OR MYGUI_INSTALL_DEMOS)
+ endif()
+ 
+ add_dependencies(${PROJECTNAME} MyGUIEngine)
++
++if(MYGUI_RENDERSYSTEM EQUAL 4)
++	find_package(OpenGL REQUIRED)
++	target_link_libraries(${PROJECTNAME} OpenGL::GL)
++endif()
diff --git a/external_imported/vcpkg/ports/mygui/portfile.cmake b/external_imported/vcpkg/ports/mygui/portfile.cmake
index c98a64f20..73cf93af1 100644
--- a/external_imported/vcpkg/ports/mygui/portfile.cmake
+++ b/external_imported/vcpkg/ports/mygui/portfile.cmake
@@ -5,17 +5,20 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO MyGUI/mygui
-    REF 81e5c67e92920607d16bc2aee1ac32f6fd7d446b #v3.4.1
-    SHA512 b13e0a08559b3ddfe42ffcc6cf017fb20d50168785fb551e16f613c60b9ea28a65056a9bc42bdab876368f40dcba1772bc704ad0928c45d8b32e909abc0f1916 
+    REF MyGUI${VERSION}
+    SHA512 88c69ca2e706af364b72d425f95013eb285501881d8094f8d67e31a54c45ca11b0eb5b62c382af0d4c43f69aa8197648259ac306b72efa7ef3e25eecb9b039cb
     HEAD_REF master
     PATCHES
         fix-generation.patch
-        Use-vcpkg-sdl2.patch
         Install-tools.patch
-        fix-osx-build.patch # from https://github.com/MyGUI/mygui/pull/244
+        opengl.patch
+        sdl2-static.patch
 )
 
-if("opengl" IN_LIST FEATURES)
+if(VCPKG_TARGET_ARCHITECTURE STREQUAL "wasm32")
+    message(STATUS "Setting MYGUI_RENDERSYSTEM to 8 (GLES) - officially supported MyGUI render system for wasm32")
+    set(MYGUI_RENDERSYSTEM 8)
+elseif("opengl" IN_LIST FEATURES)
     set(MYGUI_RENDERSYSTEM 4)
 else()
     set(MYGUI_RENDERSYSTEM 1)
diff --git a/external_imported/vcpkg/ports/mygui/sdl2-static.patch b/external_imported/vcpkg/ports/mygui/sdl2-static.patch
new file mode 100644
index 000000000..cc5cb1a55
--- /dev/null
+++ b/external_imported/vcpkg/ports/mygui/sdl2-static.patch
@@ -0,0 +1,35 @@
+diff --git a/CMake/Packages/FindSDL2.cmake b/CMake/Packages/FindSDL2.cmake
+index 4dd33abe4..3911acef3 100644
+--- a/CMake/Packages/FindSDL2.cmake
++++ b/CMake/Packages/FindSDL2.cmake
+@@ -49,7 +49,7 @@ IF(NOT SDL2_FOUND)
+     )
+ 
+     find_library(SDL2_LIBRARY
+-      NAMES SDL2
++      NAMES SDL2 SDL2-static
+       HINTS
+         ${PC_SDL2_LIBDIR}
+         ${PC_SDL2_LIBRARY_DIRS}
+@@ -87,7 +87,7 @@ IF(NOT SDL2_FOUND)
+     set(SDL2_INCLUDE_DIRS ${SDL2_INCLUDE_DIR})
+     set(SDL2_LIBRARIES ${SDL2MAIN_LIBRARY} ${SDL2_LIBRARY})
+     if (WIN32)
+-        set(SDL2_LIBRARIES ${SDL2_LIBRARIES} winmm imm32 version)
++        set(SDL2_LIBRARIES ${SDL2_LIBRARIES} winmm imm32 version setupapi)
+     endif()
+     include(FindPackageHandleStandardArgs)
+ 
+diff --git a/CMake/Packages/FindSDL2_image.cmake b/CMake/Packages/FindSDL2_image.cmake
+index 4f0bc5f17..857806b1f 100644
+--- a/CMake/Packages/FindSDL2_image.cmake
++++ b/CMake/Packages/FindSDL2_image.cmake
+@@ -41,7 +41,7 @@ IF(NOT SDL2_IMAGE_FOUND)
+     )
+ 
+     find_library(SDL2_IMAGE_LIBRARY
+-      NAMES SDL2_image
++      NAMES SDL2_image SDL2_image-static
+       HINTS
+         ${PC_SDL2_IMAGE_LIBDIR}
+         ${PC_SDL2_IMAGE_LIBRARY_DIRS}
diff --git a/external_imported/vcpkg/ports/mygui/vcpkg.json b/external_imported/vcpkg/ports/mygui/vcpkg.json
index 62f79ea63..043c5c1a7 100644
--- a/external_imported/vcpkg/ports/mygui/vcpkg.json
+++ b/external_imported/vcpkg/ports/mygui/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "mygui",
-  "version": "3.4.1",
-  "port-version": 4,
+  "version": "3.4.3",
   "description": "Fast, flexible and simple GUI",
   "homepage": "http://mygui.info",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/mysql-connector-cpp/dependencies.patch b/external_imported/vcpkg/ports/mysql-connector-cpp/dependencies.patch
new file mode 100644
index 000000000..8f4a38f65
--- /dev/null
+++ b/external_imported/vcpkg/ports/mysql-connector-cpp/dependencies.patch
@@ -0,0 +1,154 @@
+diff --git a/cdk/cmake/DepFindCompression.cmake b/cdk/cmake/DepFindCompression.cmake
+index f9fe519f..0f893da8 100644
+--- a/cdk/cmake/DepFindCompression.cmake
++++ b/cdk/cmake/DepFindCompression.cmake
+@@ -48,7 +48,12 @@ message(STATUS "Setting up compression libraries.")
+ #######
+ # ZLIB
+ #
+-add_ext(zlib zlib.h z ext_zlib)
++if (WIN32)
++  set(ZLIB_NAME zlib)
++else()
++  set(ZLIB_NAME z)
++endif()
++add_ext(zlib zlib.h ${ZLIB_NAME} ext_zlib)
+ if(NOT ZLIB_FOUND)
+   message(FATAL_ERROR "Can't build without zlib support")
+ endif()
+diff --git a/cdk/cmake/dependency.cmake b/cdk/cmake/dependency.cmake
+index e928e711..30d34fef 100644
+--- a/cdk/cmake/dependency.cmake
++++ b/cdk/cmake/dependency.cmake
+@@ -286,10 +286,18 @@ endif()
+ function(add_ext_lib EXT target name)
+   # Search for the library
+   if(DEFINED ${EXT}_ROOT_DIR)
+-    set(suffix PATHS ${${EXT}_ROOT_DIR}
+-      PATH_SUFFIXES lib lib64 dll
+-      NO_DEFAULT_PATH
+-    )
++    if(CMAKE_BUILD_TYPE STREQUAL "Debug")
++      set(name "${name}d;${name}")
++      set(suffix PATHS "${${EXT}_ROOT_DIR}/debug"
++        PATH_SUFFIXES lib lib64 dll
++        NO_DEFAULT_PATH
++      )
++    else()
++      set(suffix PATHS ${${EXT}_ROOT_DIR}
++        PATH_SUFFIXES lib lib64 dll
++        NO_DEFAULT_PATH
++      )
++    endif()
+   elseif(DEFINED ${EXT}_LIB_DIR)
+     set(suffix
+       PATHS ${${EXT}_LIB_DIR}
+@@ -326,9 +334,10 @@ endfunction(add_ext_lib)
+ #
+ function(add_ext_exec EXT target name)
+   # Search for the library
++  string(TOLOWER ${EXT} EXT_LOWER)
+   if(DEFINED ${EXT}_ROOT_DIR)
+     set(suffix PATHS ${${EXT}_ROOT_DIR}
+-      PATH_SUFFIXES bin
++      PATH_SUFFIXES tools/${EXT_LOWER}
+       NO_DEFAULT_PATH
+     )
+ 
+diff --git a/cdk/protocol/mysqlx/CMakeLists.txt b/cdk/protocol/mysqlx/CMakeLists.txt
+index 97a4b005..cfc81daf 100644
+--- a/cdk/protocol/mysqlx/CMakeLists.txt
++++ b/cdk/protocol/mysqlx/CMakeLists.txt
+@@ -135,8 +135,13 @@ else()
+   target_link_libraries(cdk_proto_mysqlx PRIVATE ext::protobuf-lite)
+ endif()
+ 
++if (WIN32)
++  set(EXT_ZLIB_NAME ext::zlib)
++else()
++  set(EXT_ZLIB_NAME ext::z)
++endif()
+ target_link_libraries(cdk_proto_mysqlx
+-  PRIVATE cdk_foundation ext::z ext::lz4 ext::zstd
++  PRIVATE cdk_foundation ${EXT_ZLIB_NAME} ext::lz4 ext::zstd
+ )
+ 
+ ADD_COVERAGE(cdk_proto_mysqlx)
+diff --git a/jdbc/cmake/DepFindMySQL.cmake b/jdbc/cmake/DepFindMySQL.cmake
+index 7977381a..d7f4e58b 100644
+--- a/jdbc/cmake/DepFindMySQL.cmake
++++ b/jdbc/cmake/DepFindMySQL.cmake
+@@ -167,13 +167,13 @@ function(main)
+ 
+   find_library(MYSQL_LIB
+     NAMES ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient${CMAKE_STATIC_LIBRARY_SUFFIX}
+-    PATHS ${MYSQL_LIB_DIR}
++    PATHS "${MYSQL_LIB_DIR}/lib"
+     NO_DEFAULT_PATH
+   )
+ 
+   find_library(MYSQL_LIB_DEBUG
+     NAMES ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient${CMAKE_STATIC_LIBRARY_SUFFIX}
+-    PATHS "${MYSQL_LIB_DIR}/debug"
++    PATHS "${MYSQL_LIB_DIR}/debug/lib"
+     NO_DEFAULT_PATH
+   )
+ 
+@@ -181,39 +181,39 @@ function(main)
+ 
+     find_library(MYSQL_DLL
+       NAMES ${CMAKE_DYNAMIC_LIBRARY_PREFIX}mysqlclient${CMAKE_DYNAMIC_LIBRARY_SUFFIX}
+-      PATHS ${MYSQL_LIB_DIR}
++      PATHS "${MYSQL_LIB_DIR}/lib"
+       NO_DEFAULT_PATH
+       )
+ 
+     find_library(MYSQL_DLL_DEBUG
+       NAMES ${CMAKE_DYNAMIC_LIBRARY_PREFIX}mysqlclient${CMAKE_DYNAMIC_LIBRARY_SUFFIX}
+-      PATHS "${MYSQL_LIB_DIR}/debug"
++      PATHS "${MYSQL_LIB_DIR}/debug/lib"
+       NO_DEFAULT_PATH
+       )
+ 
+   else() #WIN32
+ 
+-    find_library(MYSQL_DLL
+-      NAMES libmysql
+-      PATHS ${MYSQL_LIB_DIR}
++  find_file(MYSQL_DLL
++      NAMES libmysql.dll
++      PATHS "${MYSQL_LIB_DIR}/bin"
+       NO_DEFAULT_PATH
+       )
+ 
+-    find_library(MYSQL_DLL_DEBUG
+-      NAMES libmysql
+-      PATHS "${MYSQL_LIB_DIR}/debug"
++    find_file(MYSQL_DLL_DEBUG
++      NAMES libmysql.dll
++      PATHS "${MYSQL_LIB_DIR}/debug/bin"
+       NO_DEFAULT_PATH
+       )
+ 
+     find_library(MYSQL_DLL_IMP
+       NAMES libmysql.lib
+-      PATHS ${MYSQL_LIB_DIR}
++      PATHS "${MYSQL_LIB_DIR}/lib"
+       NO_DEFAULT_PATH
+     )
+ 
+     find_library(MYSQL_DLL_IMP_DEBUG
+       NAMES libmysql.lib
+-      PATHS "${MYSQL_LIB_DIR}/debug"
++      PATHS "${MYSQL_LIB_DIR}/debug/lib"
+       NO_DEFAULT_PATH
+     )
+   endif()
+@@ -383,6 +383,7 @@ function(main)
+     # external dependencies.
+     #
+ 
++    find_package(OpenSSL)
+     target_link_libraries(MySQL::client-static INTERFACE ${MYSQL_EXTERNAL_DEPENDENCIES})
+ 
+   endif()
diff --git a/external_imported/vcpkg/ports/mysql-connector-cpp/export-targets.patch b/external_imported/vcpkg/ports/mysql-connector-cpp/export-targets.patch
index 75c854024..0f9e18540 100644
--- a/external_imported/vcpkg/ports/mysql-connector-cpp/export-targets.patch
+++ b/external_imported/vcpkg/ports/mysql-connector-cpp/export-targets.patch
@@ -7,7 +7,7 @@ index e734714..6d665dc 100644
  
  merge_libraries(connector xapi devapi)
 -target_include_directories(connector PUBLIC "${PROJECT_SOURCE_DIR}/include")
-+target_include_directories(connector PRIVATE "${PROJECT_SOURCE_DIR}/include")
++target_include_directories(connector PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include> $<INSTALL_INTERFACE:include>)
  
  
  #
diff --git a/external_imported/vcpkg/ports/mysql-connector-cpp/fix-static-build8.patch b/external_imported/vcpkg/ports/mysql-connector-cpp/fix-static-build8.patch
index b0e60c088..91cf2739e 100644
--- a/external_imported/vcpkg/ports/mysql-connector-cpp/fix-static-build8.patch
+++ b/external_imported/vcpkg/ports/mysql-connector-cpp/fix-static-build8.patch
@@ -34,32 +34,6 @@ index 4c3aab0..a1596af 100644
  add_library(lz4 STATIC
      lz4.c
      lz4frame.c
-diff --git a/cdk/extra/protobuf/protobuf-3.19.4/cmake/CMakeLists.txt b/cdk/extra/protobuf/protobuf-3.19.4/cmake/CMakeLists.txt
-index efe6b97..377a817 100644
---- a/cdk/extra/protobuf/protobuf-3.19.4/cmake/CMakeLists.txt
-+++ b/cdk/extra/protobuf/protobuf-3.19.4/cmake/CMakeLists.txt
-@@ -186,9 +186,9 @@ else (protobuf_BUILD_SHARED_LIBS)
-   # Prior to CMake 3.15, the MSVC runtime library was pushed into the same flags
-   # making programmatic control difficult.  Prefer the functionality in newer
-   # CMake versions when available.
--  if(CMAKE_VERSION VERSION_GREATER 3.15 OR CMAKE_VERSION VERSION_EQUAL 3.15)
--    set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreaded$<$<CONFIG:Debug>:Debug>)
--  else()
-+  #if(CMAKE_VERSION VERSION_GREATER 3.15 OR CMAKE_VERSION VERSION_EQUAL 3.15)
-+  #  set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreaded$<$<CONFIG:Debug>:Debug>)
-+  #else()
-     # In case we are building static libraries, link also the runtime library statically
-     # so that MSVCR*.DLL is not required at runtime.
-     # https://msdn.microsoft.com/en-us/library/2kzt1wy3.aspx
-@@ -203,7 +203,7 @@ else (protobuf_BUILD_SHARED_LIBS)
-         endif(${flag_var} MATCHES "/MD")
-       endforeach(flag_var)
-     endif (MSVC AND protobuf_MSVC_STATIC_RUNTIME)
--  endif()
-+  #endif()
- endif (protobuf_BUILD_SHARED_LIBS)
- 
- if (MSVC)
 diff --git a/cdk/extra/zlib/CMakeLists.txt b/cdk/extra/zlib/CMakeLists.txt
 index 237c2c3..7746bd0 100644
 --- a/cdk/extra/zlib/CMakeLists.txt
diff --git a/external_imported/vcpkg/ports/mysql-connector-cpp/portfile.cmake b/external_imported/vcpkg/ports/mysql-connector-cpp/portfile.cmake
index 6beb0253c..7b2a2b8ff 100644
--- a/external_imported/vcpkg/ports/mysql-connector-cpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/mysql-connector-cpp/portfile.cmake
@@ -1,12 +1,19 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mysql/mysql-connector-cpp
-    REF 8.0.30
-    SHA512 fd6d8a03ba66ca028b3748218c60a721c9e2c79867c6cf2ea95d2649d3a252e9bd307986b149897dcc1d24a11785666c5480225a20c4baba7c87b376b7289a13
+    REF "${VERSION}"
+    SHA512 b65c44ef05e3f6ec8613f7d09f6662fc1b4cce5fdf515dec43a20398605acc2555572b788a89b61d6ce835dab3f68183be6610750ae42a6be7d9c24c99ecaacf
     HEAD_REF master
     PATCHES
         fix-static-build8.patch
         export-targets.patch
+        dependencies.patch
+)
+
+vcpkg_check_features(
+    OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        jdbc WITH_JDBC
 )
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/mysql-connector-cpp-config.cmake.in" DESTINATION "${SOURCE_PATH}")
@@ -21,9 +28,21 @@ vcpkg_cmake_configure(
     WINDOWS_USE_MSBUILD
     OPTIONS
         "-DWITH_SSL=${CURRENT_INSTALLED_DIR}"
+        "-DWITH_LZ4=${CURRENT_INSTALLED_DIR}"
+        "-DWITH_ZLIB=${CURRENT_INSTALLED_DIR}"
+        "-DWITH_ZSTD=${CURRENT_INSTALLED_DIR}"
+        "-DWITH_PROTOBUF=${CURRENT_INSTALLED_DIR}"
         -DBUILD_STATIC=${BUILD_STATIC}
         -DSTATIC_MSVCRT=${STATIC_MSVCRT}
         -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
+        -DWITH_JDBC=${WITH_JDBC}  # the following variables are only used by jdbc
+        "-DMYSQL_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/mysql"
+        "-DMYSQL_LIB_DIR=${CURRENT_INSTALLED_DIR}"
+        "-DWITH_BOOST=${CURRENT_INSTALLED_DIR}"
+    MAYBE_UNUSED_VARIABLES  # and they are windows only
+        MYSQL_INCLUDE_DIR
+        MYSQL_LIB_DIR
+        WITH_BOOST
 )
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/mysql-connector-cpp/vcpkg.json b/external_imported/vcpkg/ports/mysql-connector-cpp/vcpkg.json
index 76c7949be..c52ad5b5b 100644
--- a/external_imported/vcpkg/ports/mysql-connector-cpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/mysql-connector-cpp/vcpkg.json
@@ -1,13 +1,15 @@
 {
   "name": "mysql-connector-cpp",
-  "version": "8.0.30",
+  "version": "8.0.32",
   "port-version": 1,
   "description": "This is a release of MySQL Connector/C++, the C++ interface for communicating with MySQL servers.",
   "homepage": "https://github.com/mysql/mysql-connector-cpp",
   "license": null,
   "supports": "!uwp & !(windows & (arm | arm64))",
   "dependencies": [
+    "lz4",
     "openssl",
+    "protobuf",
     {
       "name": "vcpkg-cmake",
       "host": true
@@ -15,6 +17,17 @@
     {
       "name": "vcpkg-cmake-config",
       "host": true
+    },
+    "zlib",
+    "zstd"
+  ],
+  "features": {
+    "jdbc": {
+      "description": "Legacy JDBC support.",
+      "supports": "static",
+      "dependencies": [
+        "libmysql"
+      ]
     }
-  ]
+  }
 }
diff --git a/external_imported/vcpkg/ports/nameof/portfile.cmake b/external_imported/vcpkg/ports/nameof/portfile.cmake
index 4b4ba12fc..098fbdea5 100644
--- a/external_imported/vcpkg/ports/nameof/portfile.cmake
+++ b/external_imported/vcpkg/ports/nameof/portfile.cmake
@@ -1,13 +1,13 @@
-# header-only library
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Neargye/nameof
-    REF v0.10.2
-    SHA512 1ec508378d12eb4a65da1bee8011302f65e78bbcab82aae716afc673665af5283a5aae5f1d0de85c7d6f59bb7268e02fc01b171f50de26bb86dc27c3b46097fa
+    REF "v${VERSION}"
+    SHA512 2b0bad2a3309202bcd6e361c2f2d4a61b474359a6c2df0a8b9e1a6c9e077bbf0c0d18dc5b603ecb4f82cc1f74656aae51e52ece0f7049ac3f75b593f14542b93
     HEAD_REF master
 )
 
+set(VCPKG_BUILD_TYPE release) # header-only port
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
@@ -20,7 +20,7 @@ vcpkg_cmake_install()
 
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
 
-# Handle copyright
-configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/nameof/usage b/external_imported/vcpkg/ports/nameof/usage
new file mode 100644
index 000000000..db46ed2a0
--- /dev/null
+++ b/external_imported/vcpkg/ports/nameof/usage
@@ -0,0 +1,4 @@
+nameof provides CMake targets:
+
+    find_package(nameof CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE nameof::nameof)
diff --git a/external_imported/vcpkg/ports/nameof/vcpkg.json b/external_imported/vcpkg/ports/nameof/vcpkg.json
index 47f997a2d..219277869 100644
--- a/external_imported/vcpkg/ports/nameof/vcpkg.json
+++ b/external_imported/vcpkg/ports/nameof/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "nameof",
-  "version": "0.10.2",
+  "version": "0.10.3",
   "description": "Nameof operator for modern C++, simply obtain the name of a variable, type, function, macro, and enum.",
   "homepage": "https://github.com/Neargye/nameof",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/nana/vcpkg.json b/external_imported/vcpkg/ports/nana/vcpkg.json
index d5707d57c..6984de0b4 100644
--- a/external_imported/vcpkg/ports/nana/vcpkg.json
+++ b/external_imported/vcpkg/ports/nana/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "nana",
-  "version-string": "1.7.4",
-  "port-version": 3,
+  "version": "1.7.4",
+  "port-version": 5,
   "description": "Cross-platform library for GUI programming in modern C++ style.",
   "homepage": "https://github.com/cnjinhao/nana",
+  "supports": "!uwp",
   "dependencies": [
     {
       "name": "fontconfig",
diff --git a/external_imported/vcpkg/ports/nano-signal-slot/vcpkg.json b/external_imported/vcpkg/ports/nano-signal-slot/vcpkg.json
index 55e087106..983026f13 100644
--- a/external_imported/vcpkg/ports/nano-signal-slot/vcpkg.json
+++ b/external_imported/vcpkg/ports/nano-signal-slot/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "nano-signal-slot",
-  "version-string": "2.0.1",
-  "port-version": 1,
+  "version": "2.0.1",
+  "port-version": 2,
   "description": "Pure C++17 Signals and Slots",
   "homepage": "https://github.com/NoAvailableAlias/nano-signal-slot",
   "supports": "!uwp"
diff --git a/external_imported/vcpkg/ports/nanobench/portfile.cmake b/external_imported/vcpkg/ports/nanobench/portfile.cmake
index 5dc197395..1d25b7a17 100644
--- a/external_imported/vcpkg/ports/nanobench/portfile.cmake
+++ b/external_imported/vcpkg/ports/nanobench/portfile.cmake
@@ -1,23 +1,23 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO martinus/nanobench
-    REF v${VERSION}
-    SHA512 aa00dfc585445fda63b3ba1a802da259993b6b99d0bc2c9bb5f8a9dac64d25e9a61f072846d8f70ee2fea58482431749189179520ba7f6e075dbb223574a3a4d
-    HEAD_REF master
-)
-
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-)
-
-vcpkg_cmake_install()
-vcpkg_cmake_config_fixup()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
-file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO martinus/nanobench
+    REF "v${VERSION}"
+    SHA512 88697cc87e99b8c17f004dbd39efee664145b86d9feec02f5dba0d84be88e9bd272e537f392e670445d849f0d3c852b9870aea650d84968ee6fbc23a56bcff64
+    HEAD_REF master
+)
+
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/nanobench/vcpkg.json b/external_imported/vcpkg/ports/nanobench/vcpkg.json
index 644527d2f..8e32bb2a2 100644
--- a/external_imported/vcpkg/ports/nanobench/vcpkg.json
+++ b/external_imported/vcpkg/ports/nanobench/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "nanobench",
-  "version": "4.3.10",
-  "port-version": 1,
+  "version": "4.3.11",
   "description": "Simple, fast, accurate single-header microbenchmarking functionality for C++11/14/17/20",
   "homepage": "https://nanobench.ankerl.com",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/nanodbc/no-werror.patch b/external_imported/vcpkg/ports/nanodbc/no-werror.patch
new file mode 100644
index 000000000..2a71613f7
--- /dev/null
+++ b/external_imported/vcpkg/ports/nanodbc/no-werror.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1ce7232..57836fe 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -35,7 +35,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
+ message(STATUS "nanodbc compile: C++${CMAKE_CXX_STANDARD}")
+ 
+ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_COMPILER_IS_GNUCXX)
+-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror")
++  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+   include(CheckCXXCompilerFlag)
+ 
+   if (NANODBC_ENABLE_COVERAGE)
diff --git a/external_imported/vcpkg/ports/nanodbc/portfile.cmake b/external_imported/vcpkg/ports/nanodbc/portfile.cmake
index 60da9c251..ff21c5b53 100644
--- a/external_imported/vcpkg/ports/nanodbc/portfile.cmake
+++ b/external_imported/vcpkg/ports/nanodbc/portfile.cmake
@@ -12,6 +12,7 @@ vcpkg_from_github(
         rename-version.patch
         add-missing-include.patch
         find-unixodbc.patch
+        no-werror.patch
 )
 file(RENAME "${SOURCE_PATH}/VERSION" "${SOURCE_PATH}/VERSION.txt")
 
diff --git a/external_imported/vcpkg/ports/nanodbc/vcpkg.json b/external_imported/vcpkg/ports/nanodbc/vcpkg.json
index 35fd067a3..296e35283 100644
--- a/external_imported/vcpkg/ports/nanodbc/vcpkg.json
+++ b/external_imported/vcpkg/ports/nanodbc/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "nanodbc",
   "version": "2.13.0",
-  "port-version": 6,
+  "port-version": 8,
   "description": "A small C++ wrapper for the native C ODBC API.",
   "homepage": "https://github.com/nanodbc/nanodbc",
+  "supports": "!uwp",
   "dependencies": [
     {
       "name": "unixodbc",
diff --git a/external_imported/vcpkg/ports/nanoflann/portfile.cmake b/external_imported/vcpkg/ports/nanoflann/portfile.cmake
index de9d408b9..0fea664f0 100644
--- a/external_imported/vcpkg/ports/nanoflann/portfile.cmake
+++ b/external_imported/vcpkg/ports/nanoflann/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO jlblancoc/nanoflann
-    REF v1.4.3
-    SHA512 93a03357a57c8c122d01e35e7ce50751ec4490f938e2031d96521bbbbb5302de437c5933eb9e5cfb2583a8c4f28a118332bcf1be7b4f56259a2ce0af202de889
+    REF "v${VERSION}"
+    SHA512 bc4cdb285708f605ac202af41a66140d49b0fb54a96ce19642ab18e22ee0ffea6374ad1de08988ad4cef6aae8a65aad2a824b95b1c03fc0d762ccc783732b2ee
     HEAD_REF master
 )
 
@@ -19,6 +19,12 @@ vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
+file(READ "${CURRENT_PACKAGES_DIR}/share/nanoflann/nanoflannConfig.cmake" _contents)
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/nanoflann/nanoflannConfig.cmake" "
+include(CMakeFindDependencyMacro)
+find_dependency(Threads)
+${_contents}")
+
 # Handle copyright
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
 
diff --git a/external_imported/vcpkg/ports/nanoflann/vcpkg.json b/external_imported/vcpkg/ports/nanoflann/vcpkg.json
index 467c4606f..30879ab85 100644
--- a/external_imported/vcpkg/ports/nanoflann/vcpkg.json
+++ b/external_imported/vcpkg/ports/nanoflann/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "nanoflann",
-  "version": "1.4.3",
+  "version": "1.5.1",
   "description": "nanoflann is a C++11 header-only library for building KD-Trees of datasets with different topologies: R2, R3 (point clouds), SO(2) and SO(3) (2D and 3D rotation groups).",
   "homepage": "https://github.com/jlblancoc/nanoflann",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/nanojsonc/portfile.cmake b/external_imported/vcpkg/ports/nanojsonc/portfile.cmake
new file mode 100644
index 000000000..0b9fc7806
--- /dev/null
+++ b/external_imported/vcpkg/ports/nanojsonc/portfile.cmake
@@ -0,0 +1,19 @@
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+        OUT_SOURCE_PATH SOURCE_PATH
+        REPO open-source-patterns/nanojsonc
+        REF "${VERSION}"
+        SHA512 306fce8f90c1e5b9031f3f2b1cec5430722477425766fc05e430cceb03bb85188f2c451c0c7d34aed49b506e6a2cd835e419792362f992acbafc0b099fbe4b5e
+        HEAD_REF main
+)
+
+vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTS=OFF)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup() # removes /debug/share
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # removes debug/include
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") # Install License
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") # Install Usage
diff --git a/external_imported/vcpkg/ports/nanojsonc/usage b/external_imported/vcpkg/ports/nanojsonc/usage
new file mode 100644
index 000000000..6e1e2c3ae
--- /dev/null
+++ b/external_imported/vcpkg/ports/nanojsonc/usage
@@ -0,0 +1,4 @@
+The package nanojsonc provides CMake targets:
+
+    find_package(nanojsonc CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE nanojsonc::nanojsonc)
diff --git a/external_imported/vcpkg/ports/nanojsonc/vcpkg.json b/external_imported/vcpkg/ports/nanojsonc/vcpkg.json
new file mode 100644
index 000000000..48eb35f0e
--- /dev/null
+++ b/external_imported/vcpkg/ports/nanojsonc/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "nanojsonc",
+  "version": "1.0.0",
+  "maintainers": "Saad Shams",
+  "description": "Event-Driven JSON Parser for C",
+  "homepage": "https://github.com/open-source-patterns/nanojsonc",
+  "license": "BSD-3-Clause",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/nanomsg/portfile.cmake b/external_imported/vcpkg/ports/nanomsg/portfile.cmake
index 2f48e9c48..8ae77273c 100644
--- a/external_imported/vcpkg/ports/nanomsg/portfile.cmake
+++ b/external_imported/vcpkg/ports/nanomsg/portfile.cmake
@@ -49,7 +49,8 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
         "defined(NN_STATIC_LIB)"
         "1 // defined(NN_STATIC_LIB)"
     )
-
+endif()
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS)
     vcpkg_replace_string(
         ${CURRENT_PACKAGES_DIR}/share/${PORT}/nanomsg-config.cmake
         "set_and_check(nanomsg_BINDIR \${PACKAGE_PREFIX_DIR}/bin)"
diff --git a/external_imported/vcpkg/ports/nanomsg/vcpkg.json b/external_imported/vcpkg/ports/nanomsg/vcpkg.json
index 4754f58e3..d8c8ea4c2 100644
--- a/external_imported/vcpkg/ports/nanomsg/vcpkg.json
+++ b/external_imported/vcpkg/ports/nanomsg/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "nanomsg",
   "version-semver": "1.2.0",
+  "port-version": 1,
   "description": [
     "A simple high-performance implementation of several \"scalability protocols\".",
     "These scalability protocols are light-weight messaging protocols which can be used to solve a number of very common messaging patterns, such as request/reply, publish/subscribe, surveyor/respondent, and so forth. These protocols can run over a variety of transports such as TCP, UNIX sockets, and even WebSocket."
diff --git a/external_imported/vcpkg/ports/nanopb/fix-install-location.patch b/external_imported/vcpkg/ports/nanopb/fix-install-location.patch
new file mode 100644
index 000000000..9fd1c93c4
--- /dev/null
+++ b/external_imported/vcpkg/ports/nanopb/fix-install-location.patch
@@ -0,0 +1,22 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4a3d31e..82611ef 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -58,12 +58,15 @@ if(nanopb_BUILD_GENERATOR)
+         install(
+             FILES ${PROJECT_BINARY_DIR}/${generator_proto_py_file}
+                   ${generator_proto_file}
+-            DESTINATION ${PYTHON_INSTDIR}/proto/
++            DESTINATION ${CMAKE_INSTALL_BINDIR}/proto/
+         )
+     endforeach()
+ 
+     install( FILES generator/proto/_utils.py
+-             DESTINATION ${PYTHON_INSTDIR}/proto/ )
++             DESTINATION ${CMAKE_INSTALL_BINDIR}/proto/ )
++
++    install( FILES generator/proto/__init__.py
++             DESTINATION ${CMAKE_INSTALL_BINDIR}/proto/ )
+ endif()
+ 
+ if(WIN32)
diff --git a/external_imported/vcpkg/ports/nanopb/portfile.cmake b/external_imported/vcpkg/ports/nanopb/portfile.cmake
index 450cc6047..006deb809 100644
--- a/external_imported/vcpkg/ports/nanopb/portfile.cmake
+++ b/external_imported/vcpkg/ports/nanopb/portfile.cmake
@@ -8,6 +8,7 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES 
         fix-cmakelist-and-pb-header.patch
+        fix-install-location.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" nanopb_BUILD_STATIC_LIBS)
@@ -30,6 +31,7 @@ vcpkg_cmake_configure(
         -Dnanopb_MSVC_STATIC_RUNTIME=${nanopb_STATIC_LINKING}
         -Dnanopb_PROTOC_PATH="${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}"
         ${FEATURE_OPTIONS}
+        -DCMAKE_INSTALL_DATADIR=share/${PORT}
 )
 vcpkg_cmake_install()
 
@@ -37,13 +39,13 @@ vcpkg_copy_pdbs()
 
 vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
 
 if(nanopb_BUILD_GENERATOR)
     file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/nanopb_generator.py" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
     if(WIN32)
         file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/protoc-gen-nanopb.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
-        file(INSTALL "${CURRENT_PACKAGES_DIR}/Lib/site-packages/" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/site-packages")
+        file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/proto/" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/proto")
     else()
         file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/protoc-gen-nanopb" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
     endif()
diff --git a/external_imported/vcpkg/ports/nanopb/vcpkg.json b/external_imported/vcpkg/ports/nanopb/vcpkg.json
index 63e5e3300..f63e22032 100644
--- a/external_imported/vcpkg/ports/nanopb/vcpkg.json
+++ b/external_imported/vcpkg/ports/nanopb/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "nanopb",
   "version-semver": "0.4.7",
+  "port-version": 2,
   "description": "A small code-size Protocol Buffers implementation in ANSI C.",
   "homepage": "https://jpa.kapsi.fi/nanopb/",
   "license": "Zlib",
diff --git a/external_imported/vcpkg/ports/nanoprintf/portfile.cmake b/external_imported/vcpkg/ports/nanoprintf/portfile.cmake
index 7587949e1..6cbda191c 100644
--- a/external_imported/vcpkg/ports/nanoprintf/portfile.cmake
+++ b/external_imported/vcpkg/ports/nanoprintf/portfile.cmake
@@ -2,11 +2,11 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO charlesnicholson/nanoprintf
-    REF b210b50a2b8608e2f0226b47a8f82c3476177a4f
-    SHA512 8340bf3785a8609568188e28e3fb905007d6da052f860df02fe0b8b2fdef3ca1ac87b91f7ac203fbd7235bcd50c8a63f33b2fca2854cad1351899c59cd8d7646
+    REF "v${VERSION}"
+    SHA512 a82da24fcd176c385c8c2d1666416bcbafc3bf3e1b9e1365c8ffd7a0158485c7af6b0dbf7cd0821a7af55238784cd682a0f22fe37527b91ea3f3eaa702c61c46
     HEAD_REF master
 )
 
-file(COPY ${SOURCE_PATH}/nanoprintf.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+file(COPY "${SOURCE_PATH}/nanoprintf.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/nanoprintf/vcpkg.json b/external_imported/vcpkg/ports/nanoprintf/vcpkg.json
index 9828d6baa..7ed266d05 100644
--- a/external_imported/vcpkg/ports/nanoprintf/vcpkg.json
+++ b/external_imported/vcpkg/ports/nanoprintf/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "nanoprintf",
-  "version-string": "2020-05-27",
-  "port-version": 1,
+  "version": "0.3.4",
   "description": "A tiny embeddable printf replacement written in C99",
   "homepage": "https://github.com/charlesnicholson/nanoprintf"
 }
diff --git a/external_imported/vcpkg/ports/nanort/vcpkg.json b/external_imported/vcpkg/ports/nanort/vcpkg.json
index c91db27ae..bb1265efa 100644
--- a/external_imported/vcpkg/ports/nanort/vcpkg.json
+++ b/external_imported/vcpkg/ports/nanort/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "nanort",
-  "version-string": "2019-08-20",
-  "port-version": 2,
+  "version-date": "2019-08-20",
+  "port-version": 3,
   "description": "Single header only modern ray tracing kernel",
   "homepage": "https://github.com/lighttransport/nanort"
 }
diff --git a/external_imported/vcpkg/ports/nayuki-qr-code-generator/portfile.cmake b/external_imported/vcpkg/ports/nayuki-qr-code-generator/portfile.cmake
index 3066a9f2b..accc85113 100644
--- a/external_imported/vcpkg/ports/nayuki-qr-code-generator/portfile.cmake
+++ b/external_imported/vcpkg/ports/nayuki-qr-code-generator/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO nayuki/QR-Code-generator
-    REF v1.7.0
-    SHA512 34efa40c382b6e7d060a764936c4e2faa4fbbecd5ea4730492a2cb1960656ed67242d84e20a42400ffdee063ed6bcf3b860fef309d09ee71303f44abaafe9328
+    REF v1.8.0
+    SHA512 0cdf0873e71aed124fc7357da86fb26f23fd26432f94c9752fa5a044085b26e5aece2115134d0e50213ff24be7c55818e7dec31205a68751065bc82ab0c2c6ac
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/nayuki-qr-code-generator/vcpkg.json b/external_imported/vcpkg/ports/nayuki-qr-code-generator/vcpkg.json
index 7a6d9d614..960fa947a 100644
--- a/external_imported/vcpkg/ports/nayuki-qr-code-generator/vcpkg.json
+++ b/external_imported/vcpkg/ports/nayuki-qr-code-generator/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "nayuki-qr-code-generator",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "port-version": 1,
   "description": "High-quality QR Code generator library in C++",
   "homepage": "https://github.com/nayuki/QR-Code-generator",
+  "license": "MIT",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/ncnn/portfile.cmake b/external_imported/vcpkg/ports/ncnn/portfile.cmake
index dff1fe35f..f8e846e23 100644
--- a/external_imported/vcpkg/ports/ncnn/portfile.cmake
+++ b/external_imported/vcpkg/ports/ncnn/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Tencent/ncnn
-    REF 20221128
-    SHA512 589e52b63eabfac1f8e47acc34bef6a87ce365851a5c4d551665c321938a2d8e622ab211babac38771695b9f4443516577ba1634409a55c2436498a7d28d8218
+    REF "${VERSION}"
+    SHA512 722966b3b30c5a4df81c6d45237b1821acc69db0c78350a41e3bc60e3f40c3dc64587ae0ab223635c468314c665e477ee7e0c2d3d4cccbc72bb15aeb56dcda6c
     HEAD_REF master
 )
 
@@ -26,4 +26,4 @@ vcpkg_fixup_pkgconfig()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/external_imported/vcpkg/ports/ncnn/vcpkg.json b/external_imported/vcpkg/ports/ncnn/vcpkg.json
index 13b14a603..fbf005e68 100644
--- a/external_imported/vcpkg/ports/ncnn/vcpkg.json
+++ b/external_imported/vcpkg/ports/ncnn/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "ncnn",
-  "version": "20221128",
+  "version": "20231027",
   "description": "ncnn is a high-performance neural network inference computing framework.",
   "homepage": "https://github.com/Tencent/ncnn",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/ndis-driver-library/portfile.cmake b/external_imported/vcpkg/ports/ndis-driver-library/portfile.cmake
new file mode 100644
index 000000000..a818006f7
--- /dev/null
+++ b/external_imported/vcpkg/ports/ndis-driver-library/portfile.cmake
@@ -0,0 +1,11 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO microsoft/ndis-driver-library
+    REF "release/v${VERSION}"
+    SHA512 4f96c8769c9363e8e2abc89090d1342dc6b9f868c72434cd1943c3d6d52bc89195463eb7bb5aa6d128b31f1ae61a1fd5131e2fe859c1b591ef3a54de764661a3
+    HEAD_REF main
+)
+
+file(COPY "${SOURCE_PATH}/src/include/ndis" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/ndis-driver-library/vcpkg.json b/external_imported/vcpkg/ports/ndis-driver-library/vcpkg.json
new file mode 100644
index 000000000..93542ce76
--- /dev/null
+++ b/external_imported/vcpkg/ports/ndis-driver-library/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "ndis-driver-library",
+  "version": "1.2.0",
+  "description": "Code to make it easier to write an NDIS network driver on Windows",
+  "homepage": "https://github.com/microsoft/ndis-driver-library",
+  "license": "MIT"
+}
diff --git a/external_imported/vcpkg/ports/ned14-internal-quickcpplib/portfile.cmake b/external_imported/vcpkg/ports/ned14-internal-quickcpplib/portfile.cmake
index 284afcc32..d71d3b8d8 100644
--- a/external_imported/vcpkg/ports/ned14-internal-quickcpplib/portfile.cmake
+++ b/external_imported/vcpkg/ports/ned14-internal-quickcpplib/portfile.cmake
@@ -39,16 +39,6 @@ vcpkg_from_github(
         quicklib-depheaders.patch
 )
 
-# Quickcpplib deploys subsets of the dependency headers into a private subdirectory
-if (NOT QUICKCPPLIB_REQUIRE_CXX17)
-    file(COPY "${CURRENT_INSTALLED_DIR}/include/nonstd/byte.hpp"
-        DESTINATION "${SOURCE_PATH}/include/quickcpplib/byte/include/nonstd")
-endif()
-if (NOT QUICKCPPLIB_REQUIRE_CXX20)
-    file(COPY "${CURRENT_INSTALLED_DIR}/include/nonstd/span.hpp"
-        DESTINATION "${SOURCE_PATH}/include/quickcpplib/span-lite/include/nonstd")
-endif()
-
 vcpkg_from_github(
     OUT_SOURCE_PATH OPT_SOURCE_PATH
     REPO akrzemi1/Optional
@@ -66,7 +56,9 @@ set(VCPKG_BUILD_TYPE release)
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-        -DPROJECT_IS_DEPENDENCY=On
+        -Dquickcpplib_IS_DEPENDENCY=ON
+        -DQUICKCPPLIB_USE_SYSTEM_BYTE_LITE=ON
+        -DQUICKCPPLIB_USE_SYSTEM_SPAN_LITE=ON
         -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
         -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
         "-DCMAKE_INSTALL_DATADIR=${CURRENT_PACKAGES_DIR}/share/ned14-internal-quickcpplib"
@@ -77,20 +69,6 @@ vcpkg_cmake_configure(
 
 vcpkg_cmake_install()
 
-if (QUICKCPPLIB_REQUIRE_CXX17)
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quickcpplib/byte.hpp" "#if QUICKCPPLIB_USE_STD_BYTE" "#if 1")
-else ()
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quickcpplib/byte.hpp" "#if QUICKCPPLIB_USE_STD_BYTE" "#if 0")
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quickcpplib/byte.hpp" "#include \"byte/include/nonstd/byte.hpp\"" "#include <nonstd/byte.hpp>")
-endif()
-if (QUICKCPPLIB_REQUIRE_CXX20)
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quickcpplib/span.hpp" "#ifdef QUICKCPPLIB_USE_STD_SPAN" "#if 1")
-else ()
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quickcpplib/span.hpp" "#ifdef QUICKCPPLIB_USE_STD_SPAN" "#if 0")
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quickcpplib/span.hpp" "#elif(_HAS_CXX20 || __cplusplus >= 202002) && __has_include(<span>)" "#elif 0")
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quickcpplib/span.hpp" "#include \"span-lite/include/nonstd/span.hpp\"" "#include <nonstd/span.hpp>")
-endif()
-
 vcpkg_cmake_config_fixup(
     PACKAGE_NAME quickcpplib
     CONFIG_PATH lib/cmake/quickcpplib
diff --git a/external_imported/vcpkg/ports/ned14-internal-quickcpplib/sha_manifest.cmake b/external_imported/vcpkg/ports/ned14-internal-quickcpplib/sha_manifest.cmake
index 019734d10..9048e6c24 100644
--- a/external_imported/vcpkg/ports/ned14-internal-quickcpplib/sha_manifest.cmake
+++ b/external_imported/vcpkg/ports/ned14-internal-quickcpplib/sha_manifest.cmake
@@ -1,5 +1,5 @@
-set(QUICKCPPLIB_REF 79752ee52078003522dca492f98995b45d13d60c)
-set(QUICKCPPLIB_SHA512 fa0a1d0d33ab7001e47974469f1437abe8fb273b6b576f7e1da6a8d583b33b3786236a31f43a36d9822ffe3c59d062a441f857f476d0bfe175cccc9b5fdf2593)
+set(QUICKCPPLIB_REF 2af3839551eacd2152892d7197b27cd5b87deb38)
+set(QUICKCPPLIB_SHA512 7e58a4bfc2a9e0e0c4e77c6f6c597724d4824ff1255562ffcf6c903d840bdb6fe40ba96a43782fdb3ca0eb7ba4d794166fb7d7d0f76060179991682b8ae9b3d6)
 
 set(OPTIONAL_REF 2b43315458a99fc5de1da6e7bc0ddd364b26d643)
 set(OPTIONAL_SHA512 1952386cd3c7b963861f9634055e1baa4181d398d6f1b068a8a3f411368432bdcd42e47aadfa856584ed9a7c724a1c83369243ccb653e650af5c9155b42a84f4)
diff --git a/external_imported/vcpkg/ports/ned14-internal-quickcpplib/vcpkg.json b/external_imported/vcpkg/ports/ned14-internal-quickcpplib/vcpkg.json
index 6dac12d9d..b6e96e1a8 100644
--- a/external_imported/vcpkg/ports/ned14-internal-quickcpplib/vcpkg.json
+++ b/external_imported/vcpkg/ports/ned14-internal-quickcpplib/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "ned14-internal-quickcpplib",
-  "version-date": "2023-03-13",
+  "version-date": "2023-11-22",
   "maintainers": [
     "Niall Douglas <s_github@nedprod.com>",
     "Henrik Gaßmann <henrik@gassmann.onl>"
diff --git a/external_imported/vcpkg/ports/netcdf-c/fix-dependency-libzip.patch b/external_imported/vcpkg/ports/netcdf-c/fix-dependency-libzip.patch
index 9422198a2..9172a4498 100644
--- a/external_imported/vcpkg/ports/netcdf-c/fix-dependency-libzip.patch
+++ b/external_imported/vcpkg/ports/netcdf-c/fix-dependency-libzip.patch
@@ -1,32 +1,42 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b93a141..c3763a7 100644
+index 1113c7b..69f465e 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -957,7 +957,14 @@ OPTION(ENABLE_DAP_REMOTE_TESTS "Enable DAP remote tests." ON)
+@@ -960,7 +960,12 @@ OPTION(ENABLE_DAP_REMOTE_TESTS "Enable DAP remote tests." ON)
  SET(REMOTETESTSERVERS "remotetest.unidata.ucar.edu" CACHE STRING "test servers to use for remote test")
  
  # See if we have libzip
 -FIND_PACKAGE(Zip)
 +if(ENABLE_NCZARR_ZIP)
-+  find_package(libzip CONFIG REQUIRED)
++  find_package(Zip NAMES libzip REQUIRED)
 +  set(Zip_LIBRARIES libzip::zip)
-+  set(Zip_FOUND TRUE)
 +else()
 +  set(Zip_LIBRARIES "")
-+  set(Zip_FOUND FALSE)
 +endif()
  
  # Define a test flag for have curl library
  IF(Zip_FOUND)
+diff --git a/libnczarr/CMakeLists.txt b/libnczarr/CMakeLists.txt
+index 86e093b..c0efe1b 100644
+--- a/libnczarr/CMakeLists.txt
++++ b/libnczarr/CMakeLists.txt
+@@ -57,6 +57,7 @@ ENDIF()
+ # the netCDF library.
+ 
+ add_library(nczarr OBJECT ${libnczarr_SOURCES})
++target_link_libraries(nczarr PRIVATE ${Zip_LIBRARIES})
+ 
+ IF(MPI_C_INCLUDE_PATH)
+     target_include_directories(nczarr PUBLIC ${MPI_C_INCLUDE_PATH})
 diff --git a/netCDFConfig.cmake.in b/netCDFConfig.cmake.in
-index b3be259..72b4b25 100644
+index 715e33e..0167326 100644
 --- a/netCDFConfig.cmake.in
 +++ b/netCDFConfig.cmake.in
-@@ -15,6 +15,9 @@ set(netCDF_LIBRARIES netCDF::netcdf)
- include(CMakeFindDependencyMacro)
- find_dependency(HDF5 CONFIG)
- find_dependency(CURL CONFIG)
-+if(@ENABLE_NCZARR_ZIP@)
+@@ -19,6 +19,9 @@ endif()
+ if("@FOUND_CURL@")
+   find_dependency(CURL CONFIG)
+ endif()
++if("@ENABLE_NCZARR_ZIP@")
 +    find_dependency(libzip CONFIG)
 +endif()
  include("${CMAKE_CURRENT_LIST_DIR}/netCDFTargets.cmake")
diff --git a/external_imported/vcpkg/ports/netcdf-c/fix-pkgconfig.patch b/external_imported/vcpkg/ports/netcdf-c/fix-pkgconfig.patch
index 6fff98ac2..bcaa53093 100644
--- a/external_imported/vcpkg/ports/netcdf-c/fix-pkgconfig.patch
+++ b/external_imported/vcpkg/ports/netcdf-c/fix-pkgconfig.patch
@@ -17,7 +17,7 @@ index 390ac0a..4bcd909 100644
 +replace_pkgconfig_module("-lhdf5_hl"   "hdf5_hl")
 +replace_pkgconfig_module("-lhdf5"      "hdf5")
 +replace_pkgconfig_module("-lmpi"       "ompi-c")
-+replace_pkgconfig_module("-lzip"       "libzip")
++replace_pkgconfig_module("-lzip::zip"  "libzip")
 +replace_pkgconfig_module("-lCURL[^ ]*" "libcurl")
 +replace_pkgconfig_module("-lZLIB[^ ]*" "zlib")
 +
diff --git a/external_imported/vcpkg/ports/netcdf-c/portfile.cmake b/external_imported/vcpkg/ports/netcdf-c/portfile.cmake
index 441d422cc..8bbad4e4d 100644
--- a/external_imported/vcpkg/ports/netcdf-c/portfile.cmake
+++ b/external_imported/vcpkg/ports/netcdf-c/portfile.cmake
@@ -10,10 +10,10 @@ vcpkg_from_github(
         use_targets.patch
         fix-dependency-libmath.patch
         fix-linkage-error.patch
-        fix-pkgconfig.patch
         fix-manpage-msys.patch
         fix-dependency-libzip.patch
         fix-dependency-mpi.patch
+        fix-pkgconfig.patch
 )
 
 #Remove outdated find modules
@@ -41,6 +41,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
 
 if(NOT ENABLE_DAP AND NOT ENABLE_NCZARR)
     list(APPEND FEATURE_OPTIONS "-DCMAKE_DISABLE_FIND_PACKAGE_CURL=ON")
+else()
+    list(APPEND FEATURE_OPTIONS "-DCMAKE_REQUIRE_FIND_PACKAGE_CURL=ON")
 endif()
 
 if(ENABLE_HDF5)
diff --git a/external_imported/vcpkg/ports/netcdf-c/use_targets.patch b/external_imported/vcpkg/ports/netcdf-c/use_targets.patch
index 541be65b5..427499ec9 100644
--- a/external_imported/vcpkg/ports/netcdf-c/use_targets.patch
+++ b/external_imported/vcpkg/ports/netcdf-c/use_targets.patch
@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 507eb4c..c36908b 100644
+index 507eb4c..1516d0c 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -433,7 +433,6 @@ IF(NC_EXTRA_DEPS)
@@ -35,11 +35,10 @@ index 507eb4c..c36908b 100644
      ENDIF(MSVC)
  
      ##
-@@ -726,6 +716,19 @@ IF(USE_HDF5)
-       SET(HDF5_C_LIBRARY hdf5)
+@@ -727,6 +717,19 @@ IF(USE_HDF5)
      ENDIF()
    ENDIF(HDF5_C_LIBRARY AND HDF5_HL_LIBRARY AND HDF5_INCLUDE_DIR)
-+  
+ 
 +  if(TARGET hdf5::hdf5-shared)
 +    set(HDF5_C_LIBRARY hdf5::hdf5-shared)
 +    set(HDF5_C_LIBRARY_hdf5 hdf5::hdf5-shared)
@@ -52,9 +51,10 @@ index 507eb4c..c36908b 100644
 +    ADD_DEFINITIONS(-DH5_BUILT_AS_STATIC_LIB)
 +  endif()
 +  list(APPEND CMAKE_REQUIRED_LIBRARIES ${HDF5_C_LIBRARY})
- 
++
    FIND_PACKAGE(Threads)
  
+   # There is a missing case in the above code so default it
 @@ -745,6 +748,8 @@ IF(USE_HDF5)
    IF(USE_SZIP)
      # If user has specified the `SZIP_LIBRARY`, use it; otherwise try to find...
@@ -64,17 +64,24 @@ index 507eb4c..c36908b 100644
        FIND_LIBRARY(SZIP PATH NAMES szip sz)
        SET(SZIP_LIBRARY ${SZIP})
        IF(NOT SZIP)
-@@ -847,8 +852,7 @@ IF(USE_HDF5)
- ENDIF(USE_HDF5)
+@@ -848,11 +853,14 @@ ENDIF(USE_HDF5)
  
  # See if we have libcurl
--FIND_PACKAGE(CURL)
+ FIND_PACKAGE(CURL)
 -ADD_DEFINITIONS(-DCURL_STATICLIB=1)
-+FIND_PACKAGE(CURL CONFIG)
  INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS})
  
  # Define a test flag for have curl library
-@@ -2089,10 +2093,9 @@ IF(NC_LIBS)
+-IF(CURL_LIBRARIES OR CURL_LIBRARY)
++IF(CURL_FOUND)
++  SET(CURL_LIBRARY CURL::libcurl)
++  if(CURL_VERSION VERSION_GREATER_EQUAL "7.66")
++    set(HAVE_LIBCURL_766 TRUE CACHE INTERNAL "vcpkg")
++  endif()
+   SET(FOUND_CURL TRUE)
+ ELSE()
+   SET(FOUND_CURL FALSE)
+@@ -2089,10 +2097,9 @@ IF(NC_LIBS)
    STRING(REPLACE "-lhdf5::hdf5_hl-static" "-lhdf5_hl" NC_LIBS ${NC_LIBS})
  ENDIF()
  
@@ -88,7 +95,7 @@ index 507eb4c..c36908b 100644
  SET(LIBS ${NC_LIBS})
  SET(NC_LIBS "-lnetcdf")
 diff --git a/liblib/CMakeLists.txt b/liblib/CMakeLists.txt
-index 5e1692f..9e126ec 100644
+index 5e1692f..882f1dd 100644
 --- a/liblib/CMakeLists.txt
 +++ b/liblib/CMakeLists.txt
 @@ -77,6 +77,12 @@ IF(HAVE_LIBDL)
@@ -104,15 +111,6 @@ index 5e1692f..9e126ec 100644
    IF(NOT MSVC)
      # Some version of cmake define HDF5_hdf5_LIBRARY instead of
      # HDF5_LIBRARY. Same with HDF5_HL_LIBRARIES
-@@ -97,7 +103,7 @@ IF(USE_HDF5)
- ENDIF()
- 
- IF(FOUND_CURL)
--  SET(TLL_LIBS ${TLL_LIBS} ${CURL_LIBRARY})
-+  SET(TLL_LIBS ${TLL_LIBS} CURL::libcurl)
- ENDIF()
- 
- IF(USE_HDF4)
 @@ -118,7 +124,6 @@ IF(ENABLE_S3_SDK)
  ENDIF()
  
@@ -122,16 +120,20 @@ index 5e1692f..9e126ec 100644
  
  TARGET_LINK_LIBRARIES(netcdf ${TLL_LIBS})
 diff --git a/netCDFConfig.cmake.in b/netCDFConfig.cmake.in
-index 9d68eec..b3be259 100644
+index 9d68eec..715e33e 100644
 --- a/netCDFConfig.cmake.in
 +++ b/netCDFConfig.cmake.in
-@@ -12,6 +12,9 @@ set_and_check(netCDF_LIB_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@")
+@@ -12,6 +12,13 @@ set_and_check(netCDF_LIB_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@")
  set(netCDF_LIBRARIES netCDF::netcdf)
  
  # include target information
 +include(CMakeFindDependencyMacro)
-+find_dependency(HDF5 CONFIG)
-+find_dependency(CURL CONFIG)
++if("@USE_HDF5@")
++  find_dependency(HDF5 CONFIG)
++endif()
++if("@FOUND_CURL@")
++  find_dependency(CURL CONFIG)
++endif()
  include("${CMAKE_CURRENT_LIST_DIR}/netCDFTargets.cmake")
  
  # Compiling Options
diff --git a/external_imported/vcpkg/ports/netcdf-c/vcpkg.json b/external_imported/vcpkg/ports/netcdf-c/vcpkg.json
index 77df76e4d..e35868888 100644
--- a/external_imported/vcpkg/ports/netcdf-c/vcpkg.json
+++ b/external_imported/vcpkg/ports/netcdf-c/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "netcdf-c",
   "version": "4.8.1",
-  "port-version": 2,
+  "port-version": 4,
   "description": "A set of self-describing, machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data.",
   "homepage": "https://github.com/Unidata/netcdf-c",
   "dependencies": [
@@ -16,9 +16,12 @@
   ],
   "default-features": [
     "dap",
+    {
+      "name": "hdf5",
+      "platform": "!uwp & !(arm64 & windows)"
+    },
     "nczarr",
-    "netcdf-4",
-    "platform-default-features"
+    "netcdf-4"
   ],
   "features": {
     "dap": {
@@ -56,6 +59,10 @@
     "nczarr": {
       "description": "Build with NCZarr cloud storage access support",
       "dependencies": [
+        {
+          "name": "curl",
+          "default-features": false
+        },
         {
           "name": "netcdf-c",
           "default-features": false,
@@ -84,20 +91,6 @@
     "netcdf-4": {
       "description": "Build with netCDF-4 support"
     },
-    "platform-default-features": {
-      "$comment": "Break vcpkg CI cascade.",
-      "description": "Enable platform-dependent default features",
-      "dependencies": [
-        {
-          "name": "netcdf-c",
-          "default-features": false,
-          "features": [
-            "hdf5"
-          ],
-          "platform": "!uwp & !(arm64 & windows)"
-        }
-      ]
-    },
     "tools": {
       "description": "Build utilities"
     }
diff --git a/external_imported/vcpkg/ports/netcdf-cxx4/vcpkg.json b/external_imported/vcpkg/ports/netcdf-cxx4/vcpkg.json
index 5cb3d7720..ff189f7db 100644
--- a/external_imported/vcpkg/ports/netcdf-cxx4/vcpkg.json
+++ b/external_imported/vcpkg/ports/netcdf-cxx4/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "netcdf-cxx4",
-  "version-string": "4.3.1",
-  "port-version": 4,
+  "version": "4.3.1",
+  "port-version": 5,
   "description": "a set of machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data.",
   "homepage": "https://github.com/Unidata/netcdf-cxx4",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/netgen/add_filesystem.patch b/external_imported/vcpkg/ports/netgen/add_filesystem.patch
new file mode 100644
index 000000000..47f9c2ae2
--- /dev/null
+++ b/external_imported/vcpkg/ports/netgen/add_filesystem.patch
@@ -0,0 +1,12 @@
+diff --git a/libsrc/core/logging.hpp b/libsrc/core/logging.hpp
+index adfed7e..d34d3e9 100644
+--- a/libsrc/core/logging.hpp	
++++ b/libsrc/core/logging.hpp
+@@ -6,6 +6,7 @@
+ #include <memory>
+ #include <string>
+ #include <vector>
++#include <filesystem>
+ 
+ #include "exception.hpp"
+ #include "ngcore_api.hpp"
diff --git a/external_imported/vcpkg/ports/netgen/cgns-scoped-enum.patch b/external_imported/vcpkg/ports/netgen/cgns-scoped-enum.patch
new file mode 100644
index 000000000..3ea2db451
--- /dev/null
+++ b/external_imported/vcpkg/ports/netgen/cgns-scoped-enum.patch
@@ -0,0 +1,69 @@
+diff --git a/libsrc/interface/rw_cgns.cpp b/libsrc/interface/rw_cgns.cpp
+index 096fbfdca..edf199cfd 100644
+--- a/libsrc/interface/rw_cgns.cpp
++++ b/libsrc/interface/rw_cgns.cpp
+@@ -6,6 +6,37 @@
+ 
+ #include <cgnslib.h>
+ 
++//vcpkg builds cgns with scoped enumes. So the associcated types and values need to be correctly scoped.
++#define ElementType_t CGNS_ENUMT(ElementType_t)
++#define GridLocation_t CGNS_ENUMT(GridLocation_t)
++#define PointSetType_t CGNS_ENUMT(PointSetType_t)
++#define DataType_t CGNS_ENUMT(DataType_t)
++#define ZoneType_t CGNS_ENUMT(ZoneType_t)
++#define Unstructured CGNS_ENUMV(Unstructured)
++#define RealDouble CGNS_ENUMV(RealDouble)
++#define MIXED CGNS_ENUMV(MIXED)
++#define EdgeCenter CGNS_ENUMV(EdgeCenter)
++#define KFaceCenter CGNS_ENUMV(KFaceCenter)
++#define JFaceCenter CGNS_ENUMV(JFaceCenter)
++#define IFaceCenter CGNS_ENUMV(IFaceCenter)
++#define FaceCenter CGNS_ENUMV(FaceCenter)
++#define CellCenter CGNS_ENUMV(CellCenter)
++#define Vertex CGNS_ENUMV(Vertex)
++#define BAR_2 CGNS_ENUMV(BAR_2)
++#define BAR_3 CGNS_ENUMV(BAR_3)
++#define TRI_3 CGNS_ENUMV(TRI_3)
++#define TRI_6 CGNS_ENUMV(TRI_6)
++#define QUAD_4 CGNS_ENUMV(QUAD_4)
++#define QUAD_8 CGNS_ENUMV(QUAD_8)
++#define TETRA_4 CGNS_ENUMV(TETRA_4)
++#define TETRA_10 CGNS_ENUMV(TETRA_10)
++#define PYRA_5 CGNS_ENUMV(PYRA_5)
++#define PYRA_13 CGNS_ENUMV(PYRA_13)
++#define HEXA_8 CGNS_ENUMV(HEXA_8)
++#define HEXA_20 CGNS_ENUMV(HEXA_20)
++#define PENTA_6 CGNS_ENUMV(PENTA_6)
++#define PENTA_15 CGNS_ENUMV(PENTA_15)
++
+ namespace netgen::cg
+ {
+   typedef ngcore::ClosedHashTable<ngcore::INT<3,size_t>, size_t> PointTable;
+@@ -215,7 +246,7 @@ namespace netgen::cg
+     if(codim==2) name += mesh.GetCD2Name(index);
+ 
+     int ne = 0;
+-    Array<int> data;
++    Array<cgsize_t> data;
+ 
+     if(dim==3)
+       for(const auto el : mesh.VolumeElements())
+@@ -333,7 +364,7 @@ namespace netgen::cg
+       ZoneType_t zone_type;
+       int fn, base, zone;
+       int first_index_1d, first_index_2d, first_index_3d;
+-      int nv=0, ne_1d=0, ne_2d=0, ne_3d=0;
++      cgsize_t nv=0, ne_1d=0, ne_2d=0, ne_3d=0;
+ 
+       Array<string> names_1d, names_2d, names_3d;
+ 
+@@ -643,7 +674,7 @@ namespace netgen
+       int n_vertices = 0;
+       for (auto zi : Range(1, nzones+1))
+       {
+-        int size[3];
++        cgsize_t size[3];
+         char name[100];
+         cg_zone_read(fn,base,zi, name, size);
+         n_vertices += size[0];
diff --git a/external_imported/vcpkg/ports/netgen/cmake-adjustments.patch b/external_imported/vcpkg/ports/netgen/cmake-adjustments.patch
new file mode 100644
index 000000000..0683f567c
--- /dev/null
+++ b/external_imported/vcpkg/ports/netgen/cmake-adjustments.patch
@@ -0,0 +1,14 @@
+diff --git a/libsrc/core/CMakeLists.txt b/libsrc/core/CMakeLists.txt
+index c4f4795..cd5ad50 100644
+--- a/libsrc/core/CMakeLists.txt	
++++ b/libsrc/core/CMakeLists.txt
+@@ -28,8 +28,7 @@ endif(USE_PYTHON)
+ 
+ if(WIN32)
+   target_compile_options(ngcore PUBLIC /bigobj /MP /W1 /wd4068)
+-  get_WIN32_WINNT(ver)
+-  target_compile_definitions(ngcore PUBLIC _WIN32_WINNT=${ver} WNT WNT_WINDOW NOMINMAX MSVC_EXPRESS _CRT_SECURE_NO_WARNINGS HAVE_STRUCT_TIMESPEC WIN32)
++  target_compile_definitions(ngcore PUBLIC WNT WNT_WINDOW NOMINMAX MSVC_EXPRESS _CRT_SECURE_NO_WARNINGS HAVE_STRUCT_TIMESPEC WIN32)
+   target_link_options(ngcore PUBLIC /ignore:4273 /ignore:4217 /ignore:4049)
+ endif(WIN32)
+ 
diff --git a/external_imported/vcpkg/ports/netgen/downstream-fixes.patch b/external_imported/vcpkg/ports/netgen/downstream-fixes.patch
new file mode 100644
index 000000000..d570ec874
--- /dev/null
+++ b/external_imported/vcpkg/ports/netgen/downstream-fixes.patch
@@ -0,0 +1,25 @@
+diff --git a/libsrc/stlgeom/stltopology.hpp b/libsrc/stlgeom/stltopology.hpp
+index 2a3822f70..a14dc5bda 100644
+--- a/libsrc/stlgeom/stltopology.hpp
++++ b/libsrc/stlgeom/stltopology.hpp
+@@ -350,7 +350,7 @@ public:
+   int GetNP() const { return points.Size(); }
+   int AddPoint(const Point<3> & p) { points.Append(p); return points.Size(); }
+   const Point<3> & GetPoint(STLPointId nr) const { return points[nr]; } // .Get(nr); }
++  DLL_HEADER int GetPointNum (const Point<3> & p);
+-  int GetPointNum (const Point<3> & p);
+   void SetPoint(STLPointId nr, const Point<3> & p) { points[nr] = p; } // { points.Elem(nr) = p; }
+   auto & GetPoints() const { return points; }
+ 
+diff --git a/nglib/nglib.cpp b/nglib/nglib.cpp
+index ee25f3814..c8fe35cb2 100644
+--- a/nglib/nglib.cpp
++++ b/nglib/nglib.cpp
+@@ -619,6 +619,7 @@ namespace nglib
+          }
+          */
+          geo->AddEdges(readedges);
++         readedges.SetSize(0);
+       }
+ 
+       if (geo->GetStatus() == STLTopology::STL_GOOD || geo->GetStatus() == STLTopology::STL_WARNING) return NG_OK;
diff --git a/external_imported/vcpkg/ports/netgen/git-ver.patch b/external_imported/vcpkg/ports/netgen/git-ver.patch
new file mode 100644
index 000000000..710b6d60c
--- /dev/null
+++ b/external_imported/vcpkg/ports/netgen/git-ver.patch
@@ -0,0 +1,14 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6e9f4cc..bf92061 100644
+--- a/CMakeLists.txt	
++++ b/CMakeLists.txt
+@@ -430,7 +430,8 @@ endif (USE_MPEG)
+ #######################################################################
+ add_custom_target(ng_generate_version_file
+   ${CMAKE_COMMAND}
+-    -DBDIR=${CMAKE_CURRENT_BINARY_DIR}
++    -DBDIR=${CMAKE_CURRENT_BINARY_DIR}
++    -DNETGEN_VERSION_GIT=${NETGEN_VERSION_GIT}
+     -P ${CMAKE_CURRENT_LIST_DIR}/cmake/generate_version_file.cmake
+     )
+ #######################################################################
diff --git a/external_imported/vcpkg/ports/netgen/occ-78.patch b/external_imported/vcpkg/ports/netgen/occ-78.patch
new file mode 100644
index 000000000..5079bd1c4
--- /dev/null
+++ b/external_imported/vcpkg/ports/netgen/occ-78.patch
@@ -0,0 +1,159 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0846f39bd..f7516afa4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -372,25 +372,20 @@ if (USE_OCC)
+       TKGeomAlgo
+       TKGeomBase
+       TKHLR
+-      TKIGES
+       TKLCAF
+       TKMath
+       TKMesh
+       TKOffset
+       TKPrim
+-      TKSTEP
+-      TKSTEP209
+-      TKSTEPAttr
+-      TKSTEPBase
+-      TKSTL
++      TKDESTL
+       TKService
+       TKShHealing
+       TKTopAlgo
+       TKV3d
+       TKVCAF
+       TKXCAF
+-      TKXDEIGES
+-      TKXDESTEP
++      TKDEIGES
++      TKDESTEP
+       TKXSBase
+       TKernel
+     )
+diff --git a/libsrc/occ/Partition_Loop3d.hxx b/libsrc/occ/Partition_Loop3d.hxx
+index e1716691c..e8a434911 100644
+--- a/libsrc/occ/Partition_Loop3d.hxx
++++ b/libsrc/occ/Partition_Loop3d.hxx
+@@ -10,27 +10,16 @@
+ #ifndef _Partition_Loop3d_HeaderFile
+ #define _Partition_Loop3d_HeaderFile
+ 
+-#ifndef _TopTools_ListOfShape_HeaderFile
+-#include <TopTools_ListOfShape.hxx>
+-#endif
+-#ifndef _TopTools_IndexedDataMapOfShapeListOfShape_HeaderFile
+-#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
+-#endif
+-#ifndef _Standard_Boolean_HeaderFile
++#include <Standard_Version.hxx>
+ #include <Standard_Boolean.hxx>
+-#endif
+-#ifndef _Standard_Real_HeaderFile
+ #include <Standard_Real.hxx>
+-#endif
+-#ifndef _Standard_Version_HeaderFile
+-#include <Standard_Version.hxx>
+-#endif
++#include <TopTools_ListOfShape.hxx>
++#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
+ 
+-#if OCC_VERSION_HEX < 0x070000
++#if OCC_VERSION_HEX < 0x070000 || OCC_VERSION_HEX > 0x070799
+ #else
+    #include <TopTools_ShapeMapHasher.hxx>
+    #include <TopTools_OrientedShapeMapHasher.hxx>
+-   #include <TopTools_MapOfOrientedShape.hxx>
+ #endif
+ 
+ class TopoDS_Shape;
+@@ -38,6 +27,8 @@ class TopoDS_Shape;
+ #if OCC_VERSION_HEX < 0x070000
+    class TopTools_ListOfShape;
+    class TopTools_MapOfOrientedShape;
++#else
++#include <TopTools_MapOfOrientedShape.hxx>
+ #endif
+ 
+ class TopoDS_Edge;
+diff --git a/libsrc/occ/occ_edge.cpp b/libsrc/occ/occ_edge.cpp
+index 0c907d78b..fd64c9a42 100644
+--- a/libsrc/occ/occ_edge.cpp
++++ b/libsrc/occ/occ_edge.cpp
+@@ -55,7 +55,11 @@ namespace netgen
+ 
+     size_t OCCEdge::GetHash() const
+     {
++#if OCC_VERSION_HEX < 0x070800
+       return edge.HashCode(std::numeric_limits<Standard_Integer>::max());
++#else
++      return std::hash<TopoDS_Shape>{}(edge); 
++#endif
+     }
+ 
+     void OCCEdge::ProjectPoint(Point<3>& p, EdgePointGeomInfo* gi) const
+diff --git a/libsrc/occ/occ_face.cpp b/libsrc/occ/occ_face.cpp
+index 239982aa8..ea4dd15b4 100644
+--- a/libsrc/occ/occ_face.cpp
++++ b/libsrc/occ/occ_face.cpp
+@@ -32,7 +32,11 @@ namespace netgen
+ 
+     size_t OCCFace::GetHash() const
+     {
++#if OCC_VERSION_HEX < 0x070800
+       return face.HashCode(std::numeric_limits<Standard_Integer>::max());
++#else
++      return std::hash<TopoDS_Shape>{}(face); 
++#endif
+     }
+ 
+     Point<3> OCCFace::GetCenter() const
+diff --git a/libsrc/occ/occ_solid.hpp b/libsrc/occ/occ_solid.hpp
+index d598de4a2..66f28d73a 100644
+--- a/libsrc/occ/occ_solid.hpp
++++ b/libsrc/occ/occ_solid.hpp
+@@ -16,8 +16,11 @@ namespace netgen
+         OCCSolid(TopoDS_Shape dshape)
+             : solid(TopoDS::Solid(dshape))
+         { }
+-
++#if OCC_VERSION_HEX < 0x070800
+         size_t GetHash() const override { return solid.HashCode(std::numeric_limits<Standard_Integer>::max()); }
++#else
++        size_t GetHash() const override { return std::hash<TopoDS_Solid>{}(solid); }
++#endif
+     };
+ }
+ 
+diff --git a/libsrc/occ/occ_vertex.cpp b/libsrc/occ/occ_vertex.cpp
+index 6e83c8944..be8e38732 100644
+--- a/libsrc/occ/occ_vertex.cpp
++++ b/libsrc/occ/occ_vertex.cpp
+@@ -19,6 +19,10 @@ namespace netgen
+ 
+     size_t OCCVertex::GetHash() const
+     {
++#if OCC_VERSION_HEX < 0x070800
+       return vertex.HashCode(std::numeric_limits<Standard_Integer>::max());
++#else
++      return std::hash<TopoDS_Shape>{}(vertex); 
++#endif
+     }
+ }
+diff --git a/libsrc/occ/occgeom.cpp b/libsrc/occ/occgeom.cpp
+index bc0383f99..826134ba0 100644
+--- a/libsrc/occ/occgeom.cpp
++++ b/libsrc/occ/occgeom.cpp
+@@ -1716,8 +1716,12 @@ namespace netgen
+ 
+     // enumerate shapes and archive only integers
+     auto my_hash = [](const TopoDS_Shape & key) {
++#if OCC_VERSION_HEX < 0x070800
+         auto occ_hash = key.HashCode(1<<31UL);
+         return std::hash<decltype(occ_hash)>()(occ_hash);
++#else
++        return std::hash<TopoDS_Shape>{}(key);
++#endif
+     };
+     TopTools_IndexedMapOfShape shape_map;
+     Array<TopoDS_Shape> shape_list;
diff --git a/external_imported/vcpkg/ports/netgen/portfile.cmake b/external_imported/vcpkg/ports/netgen/portfile.cmake
new file mode 100644
index 000000000..7bc005f60
--- /dev/null
+++ b/external_imported/vcpkg/ports/netgen/portfile.cmake
@@ -0,0 +1,81 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO NGSolve/netgen
+    REF v${VERSION}
+    SHA512 647ccc0f1990918330457c2d014f243791e7dae8f9ec91880dbab714fa9b2e9b030387958fe74e94a9b4988c3d185c251c5c47764d587826d6d56277658b57d9
+    HEAD_REF master
+    PATCHES 
+      git-ver.patch
+      static-exports.patch
+      cmake-adjustments.patch
+      vcpkg-fix-cgns-link.patch
+      cgns-scoped-enum.patch
+      downstream-fixes.patch
+      add_filesystem.patch
+      occ-78.patch
+)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+  list(APPEND OPTIONS 
+    "-DNGLIB_LIBRARY_TYPE=STATIC"
+    "-DNGCORE_LIBRARY_TYPE=STATIC"
+    "-DNGGUI_LIBRARY_TYPE=STATIC"
+  )
+  string(APPEND VCPKG_C_FLAGS " -DNGSTATIC_BUILD")
+  string(APPEND VCPKG_CXX_FLAGS " -DNGSTATIC_BUILD")
+endif()
+
+vcpkg_cmake_configure(
+    DISABLE_PARALLEL_CONFIGURE
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS  ${OPTIONS}
+      -DUSE_PYTHON=OFF
+      -DUSE_JPEG=ON
+      -DUSE_CGNS=ON
+      -DUSE_OCC=ON
+      -DUSE_MPEG=ON
+      -DUSE_SPDLOG=OFF # will be vendored otherwise
+      -DUSE_GUI=OFF
+      -DPREFER_SYSTEM_PYBIND11=ON
+      -DENABLE_UNIT_TESTS=OFF
+      -DUSE_NATIVE_ARCH=OFF
+      -DUSE_MPI=OFF
+      -DUSE_SUPERBUILD=OFF
+      -DNETGEN_VERSION_GIT=v${VERSION} # this variable is patched in via git-ver.patch
+      -DNG_INSTALL_DIR_CMAKE=lib/cmake/netgen
+      -DNG_INSTALL_DIR_BIN=bin
+      -DNG_INSTALL_DIR_LIB=lib
+      -DNG_INSTALL_DIR_RES=share
+      -DNG_INSTALL_DIR_INCLUDE=include
+      -DSKBUILD=ON
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/netgen)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+  vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/nglib.h" "defined(NGSTATIC_BUILD)" "1")
+  vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/nglib.h" "define NGLIB" "define NGLIB\n#define OCCGEOMETRY\n#define JPEGLIB\n#define FFMPEG\n")
+  vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/core/ngcore_api.hpp" "!defined(NGSTATIC_BUILD)" "0")
+endif()
+
+set(config_file "${CURRENT_PACKAGES_DIR}/share/netgen/NetgenConfig.cmake")
+file(READ "${config_file}" contents)
+string(REPLACE "${SOURCE_PATH}" "NOT-USABLE" contents "${contents}")
+string(REGEX REPLACE "\\\$<\\\$<CONFIG:Release>:([^>]+)>" "\\1" contents "${contents}")
+string(REPLACE "\${NETGEN_CMAKE_DIR}/../" "\${NETGEN_CMAKE_DIR}/../../" contents "${contents}")
+if(NOT VCPKG_BUILD_TYPE)
+  string(REPLACE "/lib" "$<$<CONFIG:DEBUG>:/debug>/lib" contents "${contents}")
+endif()
+string(REGEX REPLACE "$<CONFIG:Release>:([^>]+)>" "\\1" contents "${contents}")
+file(WRITE "${config_file}" "${contents}")
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/netgen/NetgenConfig.cmake" "${SOURCE_PATH}" "NOT-USABLE")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
diff --git a/external_imported/vcpkg/ports/netgen/static-exports.patch b/external_imported/vcpkg/ports/netgen/static-exports.patch
new file mode 100644
index 000000000..452f14cfe
--- /dev/null
+++ b/external_imported/vcpkg/ports/netgen/static-exports.patch
@@ -0,0 +1,38 @@
+diff --git a/libsrc/core/ngcore_api.hpp b/libsrc/core/ngcore_api.hpp
+index e66e9b8..4ecaa05 100644
+--- a/libsrc/core/ngcore_api.hpp	
++++ b/libsrc/core/ngcore_api.hpp
+@@ -35,8 +35,13 @@
+ 
+ 
+ #ifdef WIN32
++#if !defined(NGSTATIC_BUILD)
+         #define NGCORE_API_EXPORT __declspec(dllexport)
+         #define NGCORE_API_IMPORT __declspec(dllimport)
++#else
++        #define NGCORE_API_EXPORT
++        #define NGCORE_API_IMPORT
++#endif
+ #else
+         #define NGCORE_API_EXPORT __attribute__((visibility("default")))
+         #define NGCORE_API_IMPORT __attribute__((visibility("default")))
+diff --git a/nglib/nglib.h b/nglib/nglib.h
+index f8c745a..e4587d2 100644
+--- a/nglib/nglib.h	
++++ b/nglib/nglib.h
+@@ -26,11 +26,15 @@
+ // Philippose - 14.02.2009
+ // Modifications for creating a DLL in Windows
+ #ifdef WIN32
++ #if defined(NGSTATIC_BUILD)
++   #define NGLIB_API
++ #else
+    #ifdef nglib_EXPORTS
+       #define NGLIB_API   __declspec(dllexport)
+    #else
+       #define NGLIB_API   __declspec(dllimport)
+    #endif
++  #endif
+ #else
+   #define NGLIB_API __attribute__((visibility("default")))
+ #endif
diff --git a/external_imported/vcpkg/ports/netgen/vcpkg-fix-cgns-link.patch b/external_imported/vcpkg/ports/netgen/vcpkg-fix-cgns-link.patch
new file mode 100644
index 000000000..e3fbc22d6
--- /dev/null
+++ b/external_imported/vcpkg/ports/netgen/vcpkg-fix-cgns-link.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bf92061..933505d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -500,7 +500,7 @@ endif(ENABLE_CPP_CORE_GUIDELINES_CHECK)
+ 
+ add_library(netgen_cgns INTERFACE)
+ if(USE_CGNS)
+-    find_library( CGNS_LIBRARY NAMES cgns cgnsdll )
++    find_library( CGNS_LIBRARY NAMES cgnsdll cgns)
+     find_path( CGNS_INCLUDE_DIR cgnslib.h )
+     target_compile_definitions(netgen_cgns INTERFACE NG_CGNS)
+     target_include_directories(netgen_cgns INTERFACE ${CGNS_INCLUDE_DIR})
diff --git a/external_imported/vcpkg/ports/netgen/vcpkg.json b/external_imported/vcpkg/ports/netgen/vcpkg.json
new file mode 100644
index 000000000..7078bbe7b
--- /dev/null
+++ b/external_imported/vcpkg/ports/netgen/vcpkg.json
@@ -0,0 +1,36 @@
+{
+  "name": "netgen",
+  "version": "6.2.2307",
+  "port-version": 1,
+  "description": "NETGEN is an automatic 3d tetrahedral mesh generator. It accepts input from constructive solid geometry (CSG) or boundary representation (BRep) from STL file format. The connection to a geometry kernel allows the handling of IGES and STEP files. NETGEN contains modules for mesh optimization and hierarchical mesh refinement.",
+  "homepage": "https://ngsolve.org/",
+  "license": "LGPL-2.1-or-later",
+  "supports": "arm64 | x64",
+  "dependencies": [
+    {
+      "name": "cgns",
+      "default-features": false
+    },
+    {
+      "name": "ffmpeg",
+      "default-features": false,
+      "features": [
+        "avcodec"
+      ]
+    },
+    "libjpeg-turbo",
+    {
+      "name": "opencascade",
+      "default-features": false
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    "zlib"
+  ]
+}
diff --git a/external_imported/vcpkg/ports/nethost/portfile.cmake b/external_imported/vcpkg/ports/nethost/portfile.cmake
index ae88f9a34..f1421eca2 100644
--- a/external_imported/vcpkg/ports/nethost/portfile.cmake
+++ b/external_imported/vcpkg/ports/nethost/portfile.cmake
@@ -1,20 +1,23 @@
-set(COMMIT_HASH v7.0.0)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO dotnet/runtime
-    REF ${COMMIT_HASH}
-    SHA512 59210df1d9541018a21a7e89e0f552ad35c849f49be31cf47e2a85086363cdabd2bf8ce652d2024479977ae059d658c3bd18de3bdaeb8cb3ddd71f2413f266bc
+    REF "v${VERSION}"
+    SHA512 a7de43bb294a62b661dd0b8f832c0ee64a6bd4a13deb4f65f51a8a8407cc5094d25cc703223d916451209284e013775a47da226098569e94694f3762a79e1de2
     HEAD_REF master
     PATCHES
         0001-nethost-cmakelists.patch
 )
 
-set(PRODUCT_VERSION "7.0.0")
-
-if(NOT VCPKG_TARGET_IS_WINDOWS)
-  execute_process(COMMAND sh -c "mkdir -p ${SOURCE_PATH}/artifacts/obj && ${SOURCE_PATH}/eng/native/version/copy_version_files.sh")
+file(MAKE_DIRECTORY "${SOURCE_PATH}/artifacts/obj")
+set(copy_version_files  sh -c "${SOURCE_PATH}/eng/native/version/copy_version_files.sh")
+if(VCPKG_HOST_IS_WINDOWS)
+  set(copy_version_files  cmd /C "eng\\native\\version\\copy_version_files.cmd")
 endif()
+vcpkg_execute_required_process(
+  COMMAND ${copy_version_files}
+  WORKING_DIRECTORY "${SOURCE_PATH}"
+  LOGNAME "copy_version_files-${TARGET_TRIPLET}"
+)
 
 if(VCPKG_TARGET_IS_WINDOWS)
   set(RID_PLAT "win")
@@ -50,12 +53,9 @@ vcpkg_cmake_configure(
     NO_CHARSET_FLAG
     OPTIONS
         "-DSKIP_VERSIONING=1"
-        "-DCLI_CMAKE_HOST_POLICY_VER:STRING=${PRODUCT_VERSION}"
-        "-DCLI_CMAKE_HOST_FXR_VER:STRING=${PRODUCT_VERSION}"
-        "-DCLI_CMAKE_HOST_VER:STRING=${PRODUCT_VERSION}"
-        "-DCLI_CMAKE_COMMON_HOST_VER:STRING=${PRODUCT_VERSION}"
         "-DCLI_CMAKE_PKG_RID:STRING=${BASE_RID}"
-        "-DCLI_CMAKE_COMMIT_HASH:STRING=${COMMIT_HASH}"
+        "-DCLI_CMAKE_FALLBACK_OS:STRING=${RID_PLAT}"
+        "-DCLI_CMAKE_COMMIT_HASH:STRING=v${VERSION}"
         "-DCLR_CMAKE_TARGET_ARCH_${ARCH_NAME}=1"
         "-DCLR_CMAKE_TARGET_ARCH=${RID_ARCH}"
         "-DCLR_CMAKE_HOST_ARCH=${RID_ARCH}"
@@ -77,5 +77,5 @@ else()
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/nethost.h" "#ifdef NETHOST_USE_AS_STATIC" "#if 0")
 endif()
 
-file(INSTALL "${SOURCE_PATH}/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.TXT")
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/nethost/vcpkg.json b/external_imported/vcpkg/ports/nethost/vcpkg.json
index 72d779ff6..2ab3bbff4 100644
--- a/external_imported/vcpkg/ports/nethost/vcpkg.json
+++ b/external_imported/vcpkg/ports/nethost/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "nethost",
-  "version": "7.0.0",
+  "version": "8.0.0",
   "description": "Provides a set of APIs that can be used to host .NET Core (dotnet)",
   "homepage": "https://github.com/dotnet/runtime/tree/main/src/native/corehost/nethost",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/nettle/ccas.patch b/external_imported/vcpkg/ports/nettle/ccas.patch
index 087081a33..703e622f5 100644
--- a/external_imported/vcpkg/ports/nettle/ccas.patch
+++ b/external_imported/vcpkg/ports/nettle/ccas.patch
@@ -7,19 +7,33 @@ index d00b565..c465d0b 100644
  %.$(OBJEXT): %.asm $(srcdir)/m4-utils.m4 $(srcdir)/asm.m4 config.m4 machine.m4
  	$(M4) $(srcdir)/m4-utils.m4 $(srcdir)/asm.m4 config.m4 machine.m4 $< >$*.s
 -	$(COMPILE) -c $*.s
-+	$(COMPILE_AS) -c $*.s
++	$(COMPILE_AS) -c $*.s -o $@
  
  %.$(OBJEXT): %.c
  	$(COMPILE) -c $< \
+diff --git a/aclocal.m4 b/aclocal.m4
+index 1d218a0..1ff02c8 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -301,7 +301,7 @@ AC_DEFUN([GMP_TRY_ASSEMBLE],
+ [cat >conftest.s <<EOF
+ [$1]
+ EOF
+-gmp_assemble="$CC $CFLAGS $CPPFLAGS -c conftest.s >conftest.out 2>&1"
++gmp_assemble="$CCAS $CPPFLAGS $ASMFLAGS -c conftest.s >conftest.out 2>&1"
+ if AC_TRY_EVAL(gmp_assemble); then
+   cat conftest.out >&AC_FD_CC
+   ifelse([$2],,:,[$2])
 diff --git a/config.make.in b/config.make.in
 index f8e1f74..4668884 100644
 --- a/config.make.in
 +++ b/config.make.in
-@@ -73,6 +73,8 @@ TEST_SHLIB_DIR = ${abs_top_builddir}/.lib
+@@ -73,6 +73,9 @@ TEST_SHLIB_DIR = ${abs_top_builddir}/.lib
  # flags before CPPFLAGS and LDFLAGS. While EXTRA_CFLAGS are added at the end.
  
  COMPILE = $(CC) $(PRE_CPPFLAGS) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(DEP_FLAGS)
 +CCAS = @CCAS@
++ASMFLAGS = @ASMFLAGS@
 +COMPILE_AS = $(CCAS) $(PRE_CPPFLAGS) $(CPPFLAGS) $(DEFS) $(ASMFLAGS) $(DEP_FLAGS)
  COMPILE_CXX = $(CXX) $(PRE_CPPFLAGS) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) $(DEP_FLAGS)
  LINK = $(CC) $(CFLAGS) $(PRE_LDFLAGS) $(LDFLAGS)
@@ -28,13 +42,32 @@ diff --git a/configure.ac b/configure.ac
 index 1012718..8db139d 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -118,6 +118,9 @@ LSH_RPATH_INIT([`echo $with_lib_path | sed 's/:/ /g'` \
+@@ -134,6 +134,10 @@ LSH_RPATH_INIT([`echo $with_lib_path | sed 's/:/ /g'` \
  
  # Checks for programs.
  AC_PROG_CC
 +# Copied from gmp
 +test -n "$CCAS" || CCAS='$(CC)'
 +AC_SUBST(CCAS)
++AC_SUBST(ASMFLAGS)
  
  NETTLE_CHECK_IFUNC
  
+@@ -321,7 +325,7 @@ W64_ABI=no   # For x86_64 windows
+ case "$host_cpu" in
+   [x86_64 | amd64])
+     AC_TRY_COMPILE([
+-#if defined(__x86_64__) || defined(__arch64__)
++#if defined(__x86_64__) || defined(__arch64__) || defined(_M_AMD64)
+ #error 64-bit x86
+ #endif
+     ], [], [
+@@ -374,7 +378,7 @@ case "$host_cpu" in
+     ;;
+   aarch64*)
+     AC_TRY_COMPILE([
+-#if defined(__aarch64__)
++#if defined(__aarch64__) || defined(_M_ARM64)
+ #error 64-bit arm
+ #endif
+     ], [], [
diff --git a/external_imported/vcpkg/ports/nettle/hogweed-arm.def b/external_imported/vcpkg/ports/nettle/hogweed-arm.def
new file mode 100644
index 000000000..dd9dccdde
--- /dev/null
+++ b/external_imported/vcpkg/ports/nettle/hogweed-arm.def
@@ -0,0 +1,282 @@
+EXPORTS
+     nettle_ed448_shake256_verify
+     nettle_ed448_shake256_sign
+     nettle_ed448_shake256_public_key
+     _nettle_ed448_shake256
+     nettle_ed25519_sha512_verify
+     nettle_ed25519_sha512_sign
+     nettle_ed25519_sha512_public_key
+     _nettle_ed25519_sha512
+     _nettle_eddsa_verify_itch
+     _nettle_eddsa_verify
+     _nettle_eddsa_sign_itch
+     _nettle_eddsa_sign
+     _nettle_eddsa_public_key_itch
+     _nettle_eddsa_public_key
+     _nettle_eddsa_hash
+     _nettle_eddsa_expand_key
+     _nettle_eddsa_decompress_itch
+     _nettle_eddsa_decompress
+     _nettle_eddsa_compress_itch
+     _nettle_eddsa_compress
+     _nettle_curve448_eh_to_x
+     nettle_curve448_mul
+     nettle_curve448_mul_g
+     _nettle_curve25519_eh_to_x
+     nettle_curve25519_mul
+     nettle_curve25519_mul_g
+     nettle_gostdsa_vko
+     nettle_gostdsa_verify
+     nettle_ecc_gostdsa_verify_itch
+     nettle_ecc_gostdsa_verify
+     nettle_gostdsa_sign
+     nettle_ecc_gostdsa_sign_itch
+     nettle_ecc_gostdsa_sign
+     nettle_ecdsa_generate_keypair
+     nettle_ecdsa_verify
+     nettle_ecc_ecdsa_verify_itch
+     nettle_ecc_ecdsa_verify
+     nettle_ecdsa_sign
+     nettle_ecc_ecdsa_sign_itch
+     nettle_ecc_ecdsa_sign
+     nettle_ecc_point_mul_g
+     nettle_ecc_point_mul
+     nettle_ecc_scalar_init
+     nettle_ecc_scalar_clear
+     nettle_ecc_scalar_set
+     nettle_ecc_scalar_get
+     nettle_ecc_point_init
+     nettle_ecc_point_clear
+     nettle_ecc_point_set
+     nettle_ecc_point_get
+     nettle_ecc_scalar_random
+     _nettle_ecc_mod_random
+     _nettle_ecc_hash
+     _nettle_gost_hash
+     _nettle_ecc_mul_a
+     _nettle_ecc_mul_g
+     _nettle_ecc_mul_m
+     _nettle_ecc_mul_a_eh
+     _nettle_ecc_mul_g_eh
+     _nettle_ecc_add_thh
+     _nettle_ecc_add_th
+     _nettle_ecc_dup_th
+     _nettle_ecc_add_ehh
+     _nettle_ecc_add_eh
+     _nettle_ecc_dup_eh
+     _nettle_ecc_eh_to_a
+     _nettle_ecc_add_jjj
+     _nettle_ecc_add_jja
+     _nettle_ecc_dup_jj
+     _nettle_ecc_a_to_j
+     _nettle_ecc_j_to_a
+     nettle_ecc_bit_size
+     nettle_ecc_size
+     nettle_ecc_size_a
+     nettle_ecc_size_j
+     _nettle_secp_521r1
+     nettle_get_secp_521r1
+     _nettle_secp_384r1
+     nettle_get_secp_384r1
+     _nettle_secp_256r1
+     nettle_get_secp_256r1
+     _nettle_secp_224r1
+     nettle_get_secp_224r1
+     _nettle_secp_192r1
+     nettle_get_secp_192r1
+     _nettle_gost_gc512a
+     nettle_get_gost_gc512a
+     _nettle_gost_gc256b
+     nettle_get_gost_gc256b
+     _nettle_curve448
+     _nettle_curve25519
+     _nettle_ecc_pm1_redc
+     _nettle_ecc_pp1_redc
+     _nettle_ecc_mod_zero_p
+     _nettle_ecc_mod_equal_p
+     _nettle_ecc_mod_add
+     _nettle_ecc_mod_sub
+     _nettle_ecc_mod_mul_1
+     _nettle_ecc_mod_addmul_1
+     _nettle_ecc_mod_submul_1
+     _nettle_ecc_mod_mul
+     _nettle_ecc_mod_sqr
+     _nettle_ecc_mod_mul_canonical
+     _nettle_ecc_mod_sqr_canonical
+     _nettle_ecc_mod_pow_2k
+     _nettle_ecc_mod_pow_2k_mul
+     _nettle_ecc_mod_inv
+     _nettle_ecc_mod
+     _nettle_cnd_copy
+     _nettle_sec_zero_p
+     _nettle_mpz_limbs_copy
+     _nettle_mpz_set_n
+     _nettle_mpn_set_base256
+     _nettle_mpn_set_base256_le
+     _nettle_mpn_get_base256
+     _nettle_mpn_get_base256_le
+     _nettle_gmp_alloc_limbs
+     _nettle_gmp_free_limbs
+     _nettle_gmp_alloc
+     _nettle_gmp_free
+     _nettle_sec_tabselect
+     _nettle_sec_sub_1
+     _nettle_sec_add_1
+     nettle_dsa_params_from_der_iterator
+     nettle_dsa_public_key_from_der_iterator
+     nettle_dsa_openssl_private_key_from_der_iterator
+     nettle_openssl_provate_key_from_der
+     nettle_rsa_public_key_from_der_iterator
+     nettle_rsa_private_key_from_der_iterator
+     nettle_rsa_keypair_from_der
+     nettle_asn1_der_get_bignum
+     nettle_asn1_der_iterator_first
+     nettle_asn1_der_iterator_next
+     nettle_asn1_der_decode_constructed
+     nettle_asn1_der_decode_constructed_last
+     nettle_asn1_der_decode_bitstring
+     nettle_asn1_der_decode_bitstring_last
+     nettle_asn1_der_get_uint32
+     nettle_rsa_keypair_to_openpgp
+     nettle_pgp_put_uint32
+     nettle_pgp_put_uint16
+     nettle_pgp_put_mpi
+     nettle_pgp_put_string
+     nettle_pgp_put_length
+     nettle_pgp_put_header
+     nettle_pgp_put_header_length
+     nettle_pgp_sub_packet_start
+     nettle_pgp_put_sub_packet
+     nettle_pgp_sub_packet_end
+     nettle_pgp_put_public_rsa_key
+     nettle_pgp_put_rsa_sha1_signature
+     nettle_pgp_put_userid
+     nettle_pgp_crc24
+     nettle_pgp_armor
+     nettle_dsa_signature_from_sexp
+     nettle_dsa_keypair_from_sexp_alist
+     nettle_dsa_sha1_keypair_from_sexp
+     nettle_dsa_sha256_keypair_from_sexp
+     nettle_dsa_keypair_to_sexp
+     nettle_dsa_sha256_verify
+     nettle_dsa_sha256_verify_digest
+     nettle_dsa_sha256_sign
+     nettle_dsa_sha256_sign_digest
+     nettle_dsa_sha1_verify
+     nettle_dsa_sha1_verify_digest
+     nettle_dsa_sha1_sign
+     nettle_dsa_sha1_sign_digest
+     _nettle_dsa_hash
+     nettle_dsa_generate_keypair
+     nettle_dsa_verify
+     nettle_dsa_sign
+     nettle_dsa_generate_params
+     nettle_dsa_compat_generate_keypair
+     nettle_dsa_public_key_init
+     nettle_dsa_public_key_clear
+     nettle_dsa_private_key_init
+     nettle_dsa_private_key_clear
+     nettle_dsa_params_init
+     nettle_dsa_params_clear
+     nettle_dsa_signature_init
+     nettle_dsa_signature_clear
+     nettle_rsa_keypair_from_sexp_alist
+     nettle_rsa_keypair_from_sexp
+     nettle_rsa_keypair_to_sexp
+     _nettle_rsa_blind
+     _nettle_rsa_unblind
+     nettle_rsa_generate_keypair
+     nettle_rsa_decrypt_tr
+     nettle_rsa_sec_decrypt
+     nettle_rsa_decrypt
+     nettle_rsa_encrypt
+     nettle_rsa_pss_sha384_verify_digest
+     nettle_rsa_pss_sha512_verify_digest
+     nettle_rsa_pss_sha384_sign_digest_tr
+     nettle_rsa_pss_sha512_sign_digest_tr
+     nettle_rsa_pss_sha256_verify_digest
+     nettle_rsa_pss_sha256_sign_digest_tr
+     nettle_rsa_sha512_verify
+     nettle_rsa_sha512_verify_digest
+     nettle_rsa_sha512_sign_tr
+     nettle_rsa_sha512_sign_digest_tr
+     nettle_rsa_sha512_sign
+     nettle_rsa_sha512_sign_digest
+     nettle_rsa_sha256_verify
+     nettle_rsa_sha256_verify_digest
+     nettle_rsa_sha256_sign_tr
+     nettle_rsa_sha256_sign_digest_tr
+     nettle_rsa_sha256_sign
+     nettle_rsa_sha256_sign_digest
+     nettle_rsa_sha1_verify
+     nettle_rsa_sha1_verify_digest
+     nettle_rsa_sha1_sign_tr
+     nettle_rsa_sha1_sign_digest_tr
+     nettle_rsa_sha1_sign
+     nettle_rsa_sha1_sign_digest
+     nettle_rsa_md5_verify
+     nettle_rsa_md5_verify_digest
+     nettle_rsa_md5_sign_tr
+     nettle_rsa_md5_sign_digest_tr
+     nettle_rsa_md5_sign
+     nettle_rsa_md5_sign_digest
+     nettle_rsa_pkcs1_verify
+     nettle_rsa_pkcs1_sign_tr
+     nettle_rsa_pkcs1_sign
+     _nettle_rsa_sec_compute_root_itch
+     _nettle_rsa_sec_compute_root
+     _nettle_rsa_verify
+     _nettle_rsa_verify_recover
+     nettle_rsa_compute_root_tr
+     _nettle_rsa_sec_compute_root_tr
+     nettle_rsa_private_key_init
+     nettle_rsa_private_key_clear
+     nettle_rsa_private_key_prepare
+     nettle_rsa_compute_root
+     nettle_rsa_public_key_init
+     nettle_rsa_public_key_clear
+     nettle_rsa_public_key_prepare
+     _nettle_rsa_check_size
+     nettle_pss_mgf1
+     nettle_pss_encode_mgf1
+     nettle_pss_verify_mgf1
+     nettle_pkcs1_rsa_sha512_encode
+     nettle_pkcs1_rsa_sha512_encode_digest
+     nettle_pkcs1_rsa_sha256_encode
+     nettle_pkcs1_rsa_sha256_encode_digest
+     nettle_pkcs1_rsa_sha1_encode
+     nettle_pkcs1_rsa_sha1_encode_digest
+     nettle_pkcs1_rsa_md5_encode
+     nettle_pkcs1_rsa_md5_encode_digest
+     nettle_pkcs1_rsa_digest_encode
+     _nettle_pkcs1_sec_decrypt
+     _nettle_pkcs1_sec_decrypt_variable
+     nettle_pkcs1_decrypt
+     nettle_pkcs1_encrypt
+     _nettle_pkcs1_signature_prefix
+     nettle_mpz_set_sexp
+     nettle_random_prime
+     _nettle_generate_pocklington_prime
+     nettle_mpz_random_size
+     nettle_mpz_random
+     nettle_mpz_sizeinbase_256_s
+     nettle_mpz_sizeinbase_256_u
+     nettle_mpz_get_str_256
+     nettle_mpz_set_str_256_s
+     nettle_mpz_init_set_str_256_s
+     nettle_mpz_set_str_256_u
+     nettle_mpz_init_set_str_256_u
+     nettle_sexp_transport_format
+     nettle_sexp_transport_vformat
+     nettle_sexp_transport_iterator_first
+     nettle_sexp_format
+     nettle_sexp_vformat
+     nettle_sexp_iterator_first
+     nettle_sexp_iterator_next
+     nettle_sexp_iterator_enter_list
+     nettle_sexp_iterator_exit_list
+     nettle_sexp_iterator_subexpr
+     nettle_sexp_iterator_get_uint32
+     nettle_sexp_iterator_check_type
+     nettle_sexp_iterator_check_types
+     nettle_sexp_iterator_assoc
diff --git a/external_imported/vcpkg/ports/nettle/hogweed-arm64.def b/external_imported/vcpkg/ports/nettle/hogweed-arm64.def
new file mode 100644
index 000000000..dd9dccdde
--- /dev/null
+++ b/external_imported/vcpkg/ports/nettle/hogweed-arm64.def
@@ -0,0 +1,282 @@
+EXPORTS
+     nettle_ed448_shake256_verify
+     nettle_ed448_shake256_sign
+     nettle_ed448_shake256_public_key
+     _nettle_ed448_shake256
+     nettle_ed25519_sha512_verify
+     nettle_ed25519_sha512_sign
+     nettle_ed25519_sha512_public_key
+     _nettle_ed25519_sha512
+     _nettle_eddsa_verify_itch
+     _nettle_eddsa_verify
+     _nettle_eddsa_sign_itch
+     _nettle_eddsa_sign
+     _nettle_eddsa_public_key_itch
+     _nettle_eddsa_public_key
+     _nettle_eddsa_hash
+     _nettle_eddsa_expand_key
+     _nettle_eddsa_decompress_itch
+     _nettle_eddsa_decompress
+     _nettle_eddsa_compress_itch
+     _nettle_eddsa_compress
+     _nettle_curve448_eh_to_x
+     nettle_curve448_mul
+     nettle_curve448_mul_g
+     _nettle_curve25519_eh_to_x
+     nettle_curve25519_mul
+     nettle_curve25519_mul_g
+     nettle_gostdsa_vko
+     nettle_gostdsa_verify
+     nettle_ecc_gostdsa_verify_itch
+     nettle_ecc_gostdsa_verify
+     nettle_gostdsa_sign
+     nettle_ecc_gostdsa_sign_itch
+     nettle_ecc_gostdsa_sign
+     nettle_ecdsa_generate_keypair
+     nettle_ecdsa_verify
+     nettle_ecc_ecdsa_verify_itch
+     nettle_ecc_ecdsa_verify
+     nettle_ecdsa_sign
+     nettle_ecc_ecdsa_sign_itch
+     nettle_ecc_ecdsa_sign
+     nettle_ecc_point_mul_g
+     nettle_ecc_point_mul
+     nettle_ecc_scalar_init
+     nettle_ecc_scalar_clear
+     nettle_ecc_scalar_set
+     nettle_ecc_scalar_get
+     nettle_ecc_point_init
+     nettle_ecc_point_clear
+     nettle_ecc_point_set
+     nettle_ecc_point_get
+     nettle_ecc_scalar_random
+     _nettle_ecc_mod_random
+     _nettle_ecc_hash
+     _nettle_gost_hash
+     _nettle_ecc_mul_a
+     _nettle_ecc_mul_g
+     _nettle_ecc_mul_m
+     _nettle_ecc_mul_a_eh
+     _nettle_ecc_mul_g_eh
+     _nettle_ecc_add_thh
+     _nettle_ecc_add_th
+     _nettle_ecc_dup_th
+     _nettle_ecc_add_ehh
+     _nettle_ecc_add_eh
+     _nettle_ecc_dup_eh
+     _nettle_ecc_eh_to_a
+     _nettle_ecc_add_jjj
+     _nettle_ecc_add_jja
+     _nettle_ecc_dup_jj
+     _nettle_ecc_a_to_j
+     _nettle_ecc_j_to_a
+     nettle_ecc_bit_size
+     nettle_ecc_size
+     nettle_ecc_size_a
+     nettle_ecc_size_j
+     _nettle_secp_521r1
+     nettle_get_secp_521r1
+     _nettle_secp_384r1
+     nettle_get_secp_384r1
+     _nettle_secp_256r1
+     nettle_get_secp_256r1
+     _nettle_secp_224r1
+     nettle_get_secp_224r1
+     _nettle_secp_192r1
+     nettle_get_secp_192r1
+     _nettle_gost_gc512a
+     nettle_get_gost_gc512a
+     _nettle_gost_gc256b
+     nettle_get_gost_gc256b
+     _nettle_curve448
+     _nettle_curve25519
+     _nettle_ecc_pm1_redc
+     _nettle_ecc_pp1_redc
+     _nettle_ecc_mod_zero_p
+     _nettle_ecc_mod_equal_p
+     _nettle_ecc_mod_add
+     _nettle_ecc_mod_sub
+     _nettle_ecc_mod_mul_1
+     _nettle_ecc_mod_addmul_1
+     _nettle_ecc_mod_submul_1
+     _nettle_ecc_mod_mul
+     _nettle_ecc_mod_sqr
+     _nettle_ecc_mod_mul_canonical
+     _nettle_ecc_mod_sqr_canonical
+     _nettle_ecc_mod_pow_2k
+     _nettle_ecc_mod_pow_2k_mul
+     _nettle_ecc_mod_inv
+     _nettle_ecc_mod
+     _nettle_cnd_copy
+     _nettle_sec_zero_p
+     _nettle_mpz_limbs_copy
+     _nettle_mpz_set_n
+     _nettle_mpn_set_base256
+     _nettle_mpn_set_base256_le
+     _nettle_mpn_get_base256
+     _nettle_mpn_get_base256_le
+     _nettle_gmp_alloc_limbs
+     _nettle_gmp_free_limbs
+     _nettle_gmp_alloc
+     _nettle_gmp_free
+     _nettle_sec_tabselect
+     _nettle_sec_sub_1
+     _nettle_sec_add_1
+     nettle_dsa_params_from_der_iterator
+     nettle_dsa_public_key_from_der_iterator
+     nettle_dsa_openssl_private_key_from_der_iterator
+     nettle_openssl_provate_key_from_der
+     nettle_rsa_public_key_from_der_iterator
+     nettle_rsa_private_key_from_der_iterator
+     nettle_rsa_keypair_from_der
+     nettle_asn1_der_get_bignum
+     nettle_asn1_der_iterator_first
+     nettle_asn1_der_iterator_next
+     nettle_asn1_der_decode_constructed
+     nettle_asn1_der_decode_constructed_last
+     nettle_asn1_der_decode_bitstring
+     nettle_asn1_der_decode_bitstring_last
+     nettle_asn1_der_get_uint32
+     nettle_rsa_keypair_to_openpgp
+     nettle_pgp_put_uint32
+     nettle_pgp_put_uint16
+     nettle_pgp_put_mpi
+     nettle_pgp_put_string
+     nettle_pgp_put_length
+     nettle_pgp_put_header
+     nettle_pgp_put_header_length
+     nettle_pgp_sub_packet_start
+     nettle_pgp_put_sub_packet
+     nettle_pgp_sub_packet_end
+     nettle_pgp_put_public_rsa_key
+     nettle_pgp_put_rsa_sha1_signature
+     nettle_pgp_put_userid
+     nettle_pgp_crc24
+     nettle_pgp_armor
+     nettle_dsa_signature_from_sexp
+     nettle_dsa_keypair_from_sexp_alist
+     nettle_dsa_sha1_keypair_from_sexp
+     nettle_dsa_sha256_keypair_from_sexp
+     nettle_dsa_keypair_to_sexp
+     nettle_dsa_sha256_verify
+     nettle_dsa_sha256_verify_digest
+     nettle_dsa_sha256_sign
+     nettle_dsa_sha256_sign_digest
+     nettle_dsa_sha1_verify
+     nettle_dsa_sha1_verify_digest
+     nettle_dsa_sha1_sign
+     nettle_dsa_sha1_sign_digest
+     _nettle_dsa_hash
+     nettle_dsa_generate_keypair
+     nettle_dsa_verify
+     nettle_dsa_sign
+     nettle_dsa_generate_params
+     nettle_dsa_compat_generate_keypair
+     nettle_dsa_public_key_init
+     nettle_dsa_public_key_clear
+     nettle_dsa_private_key_init
+     nettle_dsa_private_key_clear
+     nettle_dsa_params_init
+     nettle_dsa_params_clear
+     nettle_dsa_signature_init
+     nettle_dsa_signature_clear
+     nettle_rsa_keypair_from_sexp_alist
+     nettle_rsa_keypair_from_sexp
+     nettle_rsa_keypair_to_sexp
+     _nettle_rsa_blind
+     _nettle_rsa_unblind
+     nettle_rsa_generate_keypair
+     nettle_rsa_decrypt_tr
+     nettle_rsa_sec_decrypt
+     nettle_rsa_decrypt
+     nettle_rsa_encrypt
+     nettle_rsa_pss_sha384_verify_digest
+     nettle_rsa_pss_sha512_verify_digest
+     nettle_rsa_pss_sha384_sign_digest_tr
+     nettle_rsa_pss_sha512_sign_digest_tr
+     nettle_rsa_pss_sha256_verify_digest
+     nettle_rsa_pss_sha256_sign_digest_tr
+     nettle_rsa_sha512_verify
+     nettle_rsa_sha512_verify_digest
+     nettle_rsa_sha512_sign_tr
+     nettle_rsa_sha512_sign_digest_tr
+     nettle_rsa_sha512_sign
+     nettle_rsa_sha512_sign_digest
+     nettle_rsa_sha256_verify
+     nettle_rsa_sha256_verify_digest
+     nettle_rsa_sha256_sign_tr
+     nettle_rsa_sha256_sign_digest_tr
+     nettle_rsa_sha256_sign
+     nettle_rsa_sha256_sign_digest
+     nettle_rsa_sha1_verify
+     nettle_rsa_sha1_verify_digest
+     nettle_rsa_sha1_sign_tr
+     nettle_rsa_sha1_sign_digest_tr
+     nettle_rsa_sha1_sign
+     nettle_rsa_sha1_sign_digest
+     nettle_rsa_md5_verify
+     nettle_rsa_md5_verify_digest
+     nettle_rsa_md5_sign_tr
+     nettle_rsa_md5_sign_digest_tr
+     nettle_rsa_md5_sign
+     nettle_rsa_md5_sign_digest
+     nettle_rsa_pkcs1_verify
+     nettle_rsa_pkcs1_sign_tr
+     nettle_rsa_pkcs1_sign
+     _nettle_rsa_sec_compute_root_itch
+     _nettle_rsa_sec_compute_root
+     _nettle_rsa_verify
+     _nettle_rsa_verify_recover
+     nettle_rsa_compute_root_tr
+     _nettle_rsa_sec_compute_root_tr
+     nettle_rsa_private_key_init
+     nettle_rsa_private_key_clear
+     nettle_rsa_private_key_prepare
+     nettle_rsa_compute_root
+     nettle_rsa_public_key_init
+     nettle_rsa_public_key_clear
+     nettle_rsa_public_key_prepare
+     _nettle_rsa_check_size
+     nettle_pss_mgf1
+     nettle_pss_encode_mgf1
+     nettle_pss_verify_mgf1
+     nettle_pkcs1_rsa_sha512_encode
+     nettle_pkcs1_rsa_sha512_encode_digest
+     nettle_pkcs1_rsa_sha256_encode
+     nettle_pkcs1_rsa_sha256_encode_digest
+     nettle_pkcs1_rsa_sha1_encode
+     nettle_pkcs1_rsa_sha1_encode_digest
+     nettle_pkcs1_rsa_md5_encode
+     nettle_pkcs1_rsa_md5_encode_digest
+     nettle_pkcs1_rsa_digest_encode
+     _nettle_pkcs1_sec_decrypt
+     _nettle_pkcs1_sec_decrypt_variable
+     nettle_pkcs1_decrypt
+     nettle_pkcs1_encrypt
+     _nettle_pkcs1_signature_prefix
+     nettle_mpz_set_sexp
+     nettle_random_prime
+     _nettle_generate_pocklington_prime
+     nettle_mpz_random_size
+     nettle_mpz_random
+     nettle_mpz_sizeinbase_256_s
+     nettle_mpz_sizeinbase_256_u
+     nettle_mpz_get_str_256
+     nettle_mpz_set_str_256_s
+     nettle_mpz_init_set_str_256_s
+     nettle_mpz_set_str_256_u
+     nettle_mpz_init_set_str_256_u
+     nettle_sexp_transport_format
+     nettle_sexp_transport_vformat
+     nettle_sexp_transport_iterator_first
+     nettle_sexp_format
+     nettle_sexp_vformat
+     nettle_sexp_iterator_first
+     nettle_sexp_iterator_next
+     nettle_sexp_iterator_enter_list
+     nettle_sexp_iterator_exit_list
+     nettle_sexp_iterator_subexpr
+     nettle_sexp_iterator_get_uint32
+     nettle_sexp_iterator_check_type
+     nettle_sexp_iterator_check_types
+     nettle_sexp_iterator_assoc
diff --git a/external_imported/vcpkg/ports/nettle/install-dll.patch b/external_imported/vcpkg/ports/nettle/install-dll.patch
deleted file mode 100644
index 1d75a8f9c..000000000
--- a/external_imported/vcpkg/ports/nettle/install-dll.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 6e1585b..88c8b05 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -491,8 +491,8 @@ install-static: $(LIBTARGETS)
- 	done
- 
- install-dll-nettle:
--	$(MKDIR_P) $(DESTDIR)$(bindir)
--	$(INSTALL_DATA) $(LIBNETTLE_FORLINK) $(DESTDIR)$(bindir)/$(LIBNETTLE_FORLINK)
-+	$(MKDIR_P) $(DESTDIR)$(libdir)/../bin
-+	$(INSTALL_DATA) $(LIBNETTLE_FORLINK) $(DESTDIR)$(libdir)/../bin/$(LIBNETTLE_FORLINK)
- 
- install-shared-nettle: $(LIBNETTLE_FORLINK) @IF_DLL@ install-dll-nettle
- 	$(MKDIR_P) $(DESTDIR)$(libdir)
-@@ -504,8 +504,8 @@ install-shared-nettle: $(LIBNETTLE_FORLINK) @IF_DLL@ install-dll-nettle
- 		&& $(LN_S) $(LIBNETTLE_FILE) $(LIBNETTLE_FORLINK))
- 
- install-dll-hogweed:
--	$(MKDIR_P) $(DESTDIR)$(bindir)
--	$(INSTALL_DATA) $(LIBHOGWEED_FORLINK) $(DESTDIR)$(bindir)/$(LIBHOGWEED_FORLINK)
-+	$(MKDIR_P) $(DESTDIR)$(libdir)/../bin
-+	$(INSTALL_DATA) $(LIBHOGWEED_FORLINK) $(DESTDIR)$(libdir)/../bin/$(LIBHOGWEED_FORLINK)
- 
- install-shared-hogweed: $(LIBHOGWEED_FORLINK) @IF_DLL@ install-dll-hogweed
- 	$(MKDIR_P) $(DESTDIR)$(libdir)
diff --git a/external_imported/vcpkg/ports/nettle/msvc-support.patch b/external_imported/vcpkg/ports/nettle/msvc-support.patch
new file mode 100644
index 000000000..0e335897a
--- /dev/null
+++ b/external_imported/vcpkg/ports/nettle/msvc-support.patch
@@ -0,0 +1,85 @@
+diff --git a/Makefile.in b/Makefile.in
+index 6e1585b..88c8b05 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -29,8 +29,9 @@ include config.make
+ PRE_CPPFLAGS = -I.
+ EXTRA_CFLAGS = $(CCPIC)
+ 
+-LIBTARGETS = @IF_STATIC@ libnettle.a @IF_HOGWEED@ libhogweed.a
++LIBTARGETS = @IF_STATIC@ @LIBNETTLE_ARCHIVE@ @IF_HOGWEED@ @LIBHOGWEED_ARCHIVE@
+ SHLIBTARGETS = @IF_SHARED@ $(LIBNETTLE_FORLINK) @IF_HOGWEED@ $(LIBHOGWEED_FORLINK)
++MSVC_TARGET = @MSVC_TARGET@
+ 
+ getopt_SOURCES = getopt.c getopt1.c
+ getopt_TARGETS = $(getopt_SOURCES:.c=.$(OBJEXT))
+@@ -279,13 +280,13 @@ nettle_OBJS = $(nettle_SOURCES:.c=.$(OBJEXT)) \
+ hogweed_OBJS = $(hogweed_SOURCES:.c=.$(OBJEXT)) \
+ 	       $(OPT_HOGWEED_OBJS) @IF_MINI_GMP@ mini-gmp.$(OBJEXT)
+ 
+-libnettle.a: $(nettle_OBJS)
++@LIBNETTLE_ARCHIVE@: $(nettle_OBJS)
+ 	-rm -f $@
+ 	$(AR) $(ARFLAGS) $@ $(nettle_OBJS)
+ 	$(RANLIB) $@
+ 	echo nettle > libnettle.stamp
+ 
+-libhogweed.a: $(hogweed_OBJS)
++@LIBHOGWEED_ARCHIVE@: $(hogweed_OBJS)
+ 	-rm -f $@
+ 	$(AR) $(ARFLAGS) $@ $(hogweed_OBJS)
+ 	$(RANLIB) $@
+@@ -491,8 +492,8 @@ install-static: $(LIBTARGETS)
+ 	done
+ 
+ install-dll-nettle:
+-	$(MKDIR_P) $(DESTDIR)$(bindir)
+-	$(INSTALL_DATA) $(LIBNETTLE_FORLINK) $(DESTDIR)$(bindir)/$(LIBNETTLE_FORLINK)
++	$(MKDIR_P) $(DESTDIR)$(libdir)/../bin
++	$(INSTALL_DATA) $(LIBNETTLE_FORLINK) $(DESTDIR)$(libdir)/../bin/$(LIBNETTLE_FORLINK)
+ 
+ install-shared-nettle: $(LIBNETTLE_FORLINK) @IF_DLL@ install-dll-nettle
+ 	$(MKDIR_P) $(DESTDIR)$(libdir)
+@@ -504,8 +505,8 @@ install-shared-nettle: $(LIBNETTLE_FORLINK) @IF_DLL@ install-dll-nettle
+ 		&& $(LN_S) $(LIBNETTLE_FILE) $(LIBNETTLE_FORLINK))
+ 
+ install-dll-hogweed:
+-	$(MKDIR_P) $(DESTDIR)$(bindir)
+-	$(INSTALL_DATA) $(LIBHOGWEED_FORLINK) $(DESTDIR)$(bindir)/$(LIBHOGWEED_FORLINK)
++	$(MKDIR_P) $(DESTDIR)$(libdir)/../bin
++	$(INSTALL_DATA) $(LIBHOGWEED_FORLINK) $(DESTDIR)$(libdir)/../bin/$(LIBHOGWEED_FORLINK)
+ 
+ install-shared-hogweed: $(LIBHOGWEED_FORLINK) @IF_DLL@ install-dll-hogweed
+ 	$(MKDIR_P) $(DESTDIR)$(libdir)
+diff --git a/configure.ac b/configure.ac
+index d50d1f5..2464514 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -877,6 +877,27 @@ case "$host_os" in
+     LIBHOGWEED_LIBS='libnettle.so $(LIBS)'
+     ;;
+ esac
++AC_ARG_VAR(MSVC_TARGET,[Enable msvc and set target architecture])
++case "$MSVC_TARGET" in
++x86|x64|arm|arm64)
++  LIBNETTLE_ARCHIVE='nettle.lib'
++  LIBNETTLE_FORLINK='nettle-$(LIBNETTLE_MAJOR).dll'
++  LIBNETTLE_FILE='nettle.lib'
++  LIBNETTLE_LINK='$(CC) $(CPPFLAGS) -Wl,$(LDFLAGS) -Wl,-DLL -Wl,-IMPLIB:$(LIBNETTLE_FILE) -Wl,-DEF:$(srcdir)/nettle-$(MSVC_TARGET).def'
++  LIBNETTLE_LIBS='$(LIBS)'
++  LIBHOGWEED_FILE='hogweed.lib'
++  LIBHOGWEED_ARCHIVE='hogweed.lib'
++  LIBHOGWEED_FORLINK='hogweed-$(LIBHOGWEED_MAJOR).dll'
++  LIBHOGWEED_LINK='$(CC) $(CPPFLAGS) -Wl,$(LDFLAGS) -Wl,-DLL -Wl,-IMPLIB:$(LIBHOGWEED_FILE) -Wl,-DEF:$(srcdir)/hogweed-$(MSVC_TARGET).def'
++  LIBHOGWEED_LIBS='$(LIBNETTLE_FILE) $(LIBS)'
++  ;;
++*)
++  LIBNETTLE_ARCHIVE='libnettle.a'
++  LIBHOGWEED_ARCHIVE='libhogweed.a'
++  ;;
++esac
++AC_SUBST(LIBNETTLE_ARCHIVE)
++AC_SUBST(LIBHOGWEED_ARCHIVE)
+ 
+ ASM_SYMBOL_PREFIX=''
+ ASM_ELF_STYLE='no'
diff --git a/external_imported/vcpkg/ports/nettle/nettle-arm.def b/external_imported/vcpkg/ports/nettle/nettle-arm.def
new file mode 100644
index 000000000..d174e5f69
--- /dev/null
+++ b/external_imported/vcpkg/ports/nettle/nettle-arm.def
@@ -0,0 +1,518 @@
+EXPORTS
+     nettle_xts_aes256_set_encrypt_key
+     nettle_xts_aes256_set_decrypt_key
+     nettle_xts_aes256_encrypt_message
+     nettle_xts_aes256_decrypt_message
+     nettle_xts_aes128_set_encrypt_key
+     nettle_xts_aes128_set_decrypt_key
+     nettle_xts_aes128_encrypt_message
+     nettle_xts_aes128_decrypt_message
+     nettle_xts_encrypt_message
+     nettle_xts_decrypt_message
+     nettle_yarrow_key_event_init
+     nettle_yarrow_key_event_estimate
+     nettle_yarrow256_init
+     nettle_yarrow256_seed
+     nettle_yarrow256_update
+     nettle_yarrow256_random
+     nettle_yarrow256_is_seeded
+     nettle_yarrow256_needed_sources
+     nettle_yarrow256_fast_reseed
+     nettle_yarrow256_slow_reseed
+     _nettle_write_le64
+     _nettle_write_le32
+     _nettle_write_be32
+     nettle_version_major
+     nettle_version_minor
+     nettle_umac128_set_key
+     nettle_umac128_set_nonce
+     nettle_umac128_update
+     nettle_umac128_digest
+     nettle_umac96_set_key
+     nettle_umac96_set_nonce
+     nettle_umac96_update
+     nettle_umac96_digest
+     nettle_umac64_set_key
+     nettle_umac64_set_nonce
+     nettle_umac64_update
+     nettle_umac64_digest
+     nettle_umac32_set_key
+     nettle_umac32_set_nonce
+     nettle_umac32_update
+     nettle_umac32_digest
+     _nettle_umac_set_key
+     _nettle_umac_poly128
+     _nettle_umac_poly64
+     _nettle_umac_l3_init
+     _nettle_umac_l3
+     _nettle_umac_l2_init
+     _nettle_umac_l2
+     _nettle_umac_l2_final
+     _nettle_umac_nh_n
+     _nettle_umac_nh
+     nettle_twofish128
+     nettle_twofish192
+     nettle_twofish256
+     nettle_twofish_set_key
+     nettle_twofish128_set_key
+     nettle_twofish192_set_key
+     nettle_twofish256_set_key
+     nettle_twofish_encrypt
+     nettle_twofish_decrypt
+     nettle_streebog256
+     nettle_streebog512
+     nettle_streebog512_init
+     nettle_streebog512_update
+     nettle_streebog512_digest
+     nettle_streebog256_init
+     nettle_streebog256_digest
+     nettle_serpent128
+     nettle_serpent192
+     nettle_serpent256
+     nettle_serpent_decrypt
+     nettle_serpent_encrypt
+     nettle_serpent_set_key
+     nettle_serpent128_set_key
+     nettle_serpent192_set_key
+     nettle_serpent256_set_key
+     nettle_sm3
+     nettle_sm3_init
+     nettle_sm3_update
+     nettle_sm3_digest
+     nettle_sha3_256_shake
+     nettle_sha3_512
+     nettle_sha3_512_init
+     nettle_sha3_512_update
+     nettle_sha3_512_digest
+     nettle_sha3_384
+     nettle_sha3_384_init
+     nettle_sha3_384_update
+     nettle_sha3_384_digest
+     nettle_sha3_256
+     nettle_sha3_256_init
+     nettle_sha3_256_update
+     nettle_sha3_256_digest
+     nettle_sha3_224
+     nettle_sha3_224_init
+     nettle_sha3_224_update
+     nettle_sha3_224_digest
+     nettle_sha3_permute
+     _nettle_sha3_update
+     _nettle_sha3_pad
+     nettle_sha512_256
+     nettle_sha512_224
+     nettle_sha512
+     nettle_sha384
+     _nettle_sha512_compress
+     nettle_sha512_init
+     nettle_sha512_update
+     nettle_sha512_digest
+     nettle_sha384_init
+     nettle_sha384_digest
+     nettle_sha512_224_init
+     nettle_sha512_224_digest
+     nettle_sha512_256_init
+     nettle_sha512_256_digest
+     nettle_sha256
+     nettle_sha224
+     _nettle_sha256_compress
+     nettle_sha256_init
+     nettle_sha256_update
+     nettle_sha256_digest
+     nettle_sha224_init
+     nettle_sha224_digest
+     nettle_sha1
+     nettle_sha1_compress
+     nettle_sha1_init
+     nettle_sha1_update
+     nettle_sha1_digest
+     nettle_salsa20_256_set_key
+     nettle_salsa20_128_set_key
+     nettle_salsa20_set_nonce
+     nettle_salsa20_set_key
+     nettle_salsa20r12_crypt
+     nettle_salsa20_crypt
+     _nettle_salsa20_crypt
+     _nettle_salsa20_core
+     nettle_ripemd160
+     _nettle_ripemd160_compress
+     nettle_ripemd160_init
+     nettle_ripemd160_update
+     nettle_ripemd160_digest
+     nettle_realloc
+     nettle_xrealloc
+     _nettle_poly1305_set_key
+     _nettle_poly1305_digest
+     _nettle_poly1305_block
+     nettle_poly1305_aes_set_key
+     nettle_poly1305_aes_set_nonce
+     nettle_poly1305_aes_update
+     nettle_poly1305_aes_digest
+     nettle_pbkdf2_hmac_sha512
+     nettle_pbkdf2_hmac_sha384
+     nettle_pbkdf2_hmac_sha256
+     nettle_pbkdf2_hmac_sha1
+     nettle_pbkdf2_hmac_gosthash94cp
+     nettle_pbkdf2
+     _nettle_macs
+     nettle_get_macs
+     _nettle_hashes
+     nettle_get_hashes
+     _nettle_ciphers
+     nettle_get_ciphers
+     _nettle_armors
+     nettle_get_armors
+     _nettle_aeads
+     nettle_get_aeads
+     nettle_lookup_hash
+     nettle_memxor3
+     nettle_memxor
+     nettle_memeql_sec
+     nettle_md5
+     nettle_MD5Init
+     nettle_MD5Update
+     nettle_MD5Final
+     nettle_md5_compress
+     nettle_md5_init
+     nettle_md5_update
+     nettle_md5_digest
+     nettle_md4
+     nettle_md4_init
+     nettle_md4_update
+     nettle_md4_digest
+     nettle_md2
+     nettle_md2_init
+     nettle_md2_update
+     nettle_md2_digest
+     nettle_hkdf_extract
+     nettle_hkdf_expand
+     nettle_knuth_lfib_init
+     nettle_knuth_lfib_get
+     nettle_knuth_lfib_get_array
+     nettle_knuth_lfib_random
+     nettle_hmac_sm3
+     nettle_hmac_streebog256
+     nettle_hmac_streebog512
+     nettle_hmac_sha512
+     nettle_hmac_sha384
+     nettle_hmac_sha256
+     nettle_hmac_sha224
+     nettle_hmac_sha1
+     nettle_hmac_ripemd160
+     nettle_hmac_md5
+     nettle_hmac_sm3_set_key
+     nettle_hmac_sm3_update
+     nettle_hmac_sm3_digest
+     nettle_hmac_streebog512_set_key
+     nettle_hmac_streebog512_update
+     nettle_hmac_streebog512_digest
+     nettle_hmac_streebog256_set_key
+     nettle_hmac_streebog256_digest
+     nettle_hmac_sha512_set_key
+     nettle_hmac_sha512_update
+     nettle_hmac_sha512_digest
+     nettle_hmac_sha384_set_key
+     nettle_hmac_sha384_digest
+     nettle_hmac_sha256_set_key
+     nettle_hmac_sha256_update
+     nettle_hmac_sha256_digest
+     nettle_hmac_sha224_set_key
+     nettle_hmac_sha224_digest
+     nettle_hmac_sha1_set_key
+     nettle_hmac_sha1_update
+     nettle_hmac_sha1_digest
+     nettle_hmac_ripemd160_set_key
+     nettle_hmac_ripemd160_update
+     nettle_hmac_ripemd160_digest
+     nettle_hmac_md5_set_key
+     nettle_hmac_md5_update
+     nettle_hmac_md5_digest
+     nettle_hmac_gosthash94_set_key
+     nettle_hmac_gosthash94_update
+     nettle_hmac_gosthash94_digest
+     nettle_hmac_gosthash94cp_set_key
+     nettle_hmac_gosthash94cp_update
+     nettle_hmac_gosthash94cp_digest
+     nettle_hmac_set_key
+     nettle_hmac_update
+     nettle_hmac_digest
+     nettle_gosthash94
+     nettle_gosthash94cp
+     nettle_gosthash94_init
+     nettle_gosthash94_update
+     nettle_gosthash94_digest
+     nettle_gosthash94cp_update
+     nettle_gosthash94cp_digest
+     _nettle_gost28147_param_test_3411
+     _nettle_gost28147_param_CryptoPro_3411
+     _nettle_gost28147_encrypt_block
+     nettle_cmac_des3
+     nettle_cmac_aes256
+     nettle_cmac_aes128
+     nettle_cmac_des3_set_key
+     nettle_cmac_des3_update
+     nettle_cmac_des3_digest
+     nettle_cmac_aes256_set_key
+     nettle_cmac_aes256_update
+     nettle_cmac_aes256_digest
+     nettle_cmac_aes128_set_key
+     nettle_cmac_aes128_update
+     nettle_cmac_aes128_digest
+     nettle_cmac64_set_key
+     nettle_cmac64_init
+     nettle_cmac64_update
+     nettle_cmac64_digest
+     nettle_cmac128_set_key
+     nettle_cmac128_init
+     nettle_cmac128_update
+     nettle_cmac128_digest
+     nettle_gcm_camellia256
+     nettle_gcm_camellia256_set_key
+     nettle_gcm_camellia256_set_iv
+     nettle_gcm_camellia256_update
+     nettle_gcm_camellia256_encrypt
+     nettle_gcm_camellia256_decrypt
+     nettle_gcm_camellia256_digest
+     nettle_gcm_camellia128
+     nettle_gcm_camellia128_set_key
+     nettle_gcm_camellia128_set_iv
+     nettle_gcm_camellia128_update
+     nettle_gcm_camellia128_encrypt
+     nettle_gcm_camellia128_decrypt
+     nettle_gcm_camellia128_digest
+     nettle_gcm_aes256
+     nettle_gcm_aes256_set_key
+     nettle_gcm_aes256_update
+     nettle_gcm_aes256_set_iv
+     nettle_gcm_aes256_encrypt
+     nettle_gcm_aes256_decrypt
+     nettle_gcm_aes256_digest
+     nettle_gcm_aes192
+     nettle_gcm_aes192_set_key
+     nettle_gcm_aes192_update
+     nettle_gcm_aes192_set_iv
+     nettle_gcm_aes192_encrypt
+     nettle_gcm_aes192_decrypt
+     nettle_gcm_aes192_digest
+     nettle_gcm_aes128
+     nettle_gcm_aes128_set_key
+     nettle_gcm_aes128_update
+     nettle_gcm_aes128_set_iv
+     nettle_gcm_aes128_encrypt
+     nettle_gcm_aes128_decrypt
+     nettle_gcm_aes128_digest
+     nettle_gcm_aes_set_key
+     nettle_gcm_aes_set_iv
+     nettle_gcm_aes_update
+     nettle_gcm_aes_encrypt
+     nettle_gcm_aes_decrypt
+     nettle_gcm_aes_digest
+     nettle_gcm_set_key
+     nettle_gcm_set_iv
+     nettle_gcm_update
+     nettle_gcm_encrypt
+     nettle_gcm_decrypt
+     nettle_gcm_digest
+     _nettle_ghash_update
+     _nettle_ghash_set_key
+     nettle_eax_aes128
+     nettle_eax_aes128_set_key
+     nettle_eax_aes128_set_nonce
+     nettle_eax_aes128_update
+     nettle_eax_aes128_encrypt
+     nettle_eax_aes128_decrypt
+     nettle_eax_aes128_digest
+     nettle_eax_set_key
+     nettle_eax_set_nonce
+     nettle_eax_update
+     nettle_eax_encrypt
+     nettle_eax_decrypt
+     nettle_eax_digest
+     nettle_des3_set_key
+     nettle_des3_encrypt
+     nettle_des3_decrypt
+     nettle_des_set_key
+     nettle_des_encrypt
+     nettle_des_decrypt
+     nettle_des_check_parity
+     nettle_des_fix_parity
+     _nettle_ctr_crypt16
+     nettle_ctr_crypt
+     nettle_chacha_set_nonce
+     nettle_chacha_set_nonce96
+     nettle_chacha_set_counter
+     nettle_chacha_set_counter32
+     nettle_chacha_set_key
+     nettle_chacha_poly1305
+     nettle_chacha_poly1305_set_key
+     nettle_chacha_poly1305_set_nonce
+     nettle_chacha_poly1305_update
+     nettle_chacha_poly1305_encrypt
+     nettle_chacha_poly1305_decrypt
+     nettle_chacha_poly1305_digest
+     _nettle_chacha_core
+     nettle_chacha_crypt
+     nettle_chacha_crypt32
+     nettle_cnd_memcpy
+     nettle_siv_cmac_aes256_set_key
+     nettle_siv_cmac_aes256_encrypt_message
+     nettle_siv_cmac_aes256_decrypt_message
+     nettle_siv_cmac_aes128_set_key
+     nettle_siv_cmac_aes128_encrypt_message
+     nettle_siv_cmac_aes128_decrypt_message
+     nettle_siv_cmac_set_key
+     nettle_siv_cmac_encrypt_message
+     nettle_siv_cmac_decrypt_message
+     nettle_cfb_encrypt
+     nettle_cfb_decrypt
+     nettle_cfb8_encrypt
+     nettle_cfb8_decrypt
+     nettle_ccm_aes256_set_key
+     nettle_ccm_aes256_set_nonce
+     nettle_ccm_aes256_update
+     nettle_ccm_aes256_encrypt
+     nettle_ccm_aes256_decrypt
+     nettle_ccm_aes256_digest
+     nettle_ccm_aes256_encrypt_message
+     nettle_ccm_aes256_decrypt_message
+     nettle_ccm_aes192_set_key
+     nettle_ccm_aes192_set_nonce
+     nettle_ccm_aes192_update
+     nettle_ccm_aes192_encrypt
+     nettle_ccm_aes192_decrypt
+     nettle_ccm_aes192_digest
+     nettle_ccm_aes192_encrypt_message
+     nettle_ccm_aes192_decrypt_message
+     nettle_ccm_aes128_set_key
+     nettle_ccm_aes128_set_nonce
+     nettle_ccm_aes128_update
+     nettle_ccm_aes128_encrypt
+     nettle_ccm_aes128_decrypt
+     nettle_ccm_aes128_digest
+     nettle_ccm_aes128_encrypt_message
+     nettle_ccm_aes128_decrypt_message
+     nettle_ccm_set_nonce
+     nettle_ccm_update
+     nettle_ccm_encrypt
+     nettle_ccm_decrypt
+     nettle_ccm_digest
+     nettle_ccm_encrypt_message
+     nettle_ccm_decrypt_message
+     nettle_cbc_aes256_encrypt
+     nettle_cbc_aes192_encrypt
+     nettle_cbc_aes128_encrypt
+     nettle_cbc_encrypt
+     nettle_cbc_decrypt
+     nettle_cast128
+     nettle_cast5_set_key
+     nettle_cast128_set_key
+     nettle_cast128_encrypt
+     nettle_cast128_decrypt
+     nettle_camellia256
+     nettle_camellia256_set_decrypt_key
+     nettle_camellia256_invert_key
+     nettle_camellia192_set_decrypt_key
+     nettle_camellia256_crypt
+     nettle_camellia256_set_encrypt_key
+     nettle_camellia192_set_encrypt_key
+     nettle_camellia192
+     nettle_camellia128
+     nettle_camellia_set_decrypt_key
+     nettle_camellia128_invert_key
+     nettle_camellia128_crypt
+     nettle_camellia128_set_encrypt_key
+     _nettle_camellia_invert_key
+     _nettle_camellia_absorb
+     _nettle_camellia_table
+     _nettle_camellia_crypt
+     nettle_buffer_init
+     nettle_buffer_init_realloc
+     nettle_buffer_init_size
+     nettle_buffer_clear
+     nettle_buffer_reset
+     nettle_buffer_grow
+     nettle_buffer_write
+     nettle_buffer_space
+     nettle_buffer_copy
+     nettle_base64url
+     nettle_base64url_decode_init
+     nettle_base64url_encode_init
+     nettle_base64
+     nettle_base64_decode_init
+     nettle_base64_decode_single
+     nettle_base64_decode_update
+     nettle_base64_decode_final
+     nettle_base64_encode_init
+     nettle_base64_encode_single
+     nettle_base64_encode_update
+     nettle_base64_encode_final
+     nettle_base64_encode_raw
+     nettle_base64_encode_group
+     nettle_base16
+     nettle_base16_decode_init
+     nettle_base16_decode_single
+     nettle_base16_decode_update
+     nettle_base16_decode_final
+     nettle_base16_encode_single
+     nettle_base16_encode_update
+     nettle_blowfish_bcrypt_hash
+     nettle_blowfish_bcrypt_verify
+     _nettle_blowfish_initial_ctx
+     nettle_blowfish_set_key
+     nettle_blowfish128_set_key
+     nettle_blowfish_encrypt
+     nettle_blowfish_decrypt
+     _nettle_blowfish_encround
+     nettle_arctwo40
+     nettle_arctwo64
+     nettle_arctwo128
+     nettle_arctwo_gutmann128
+     nettle_arctwo_set_key_ekb
+     nettle_arctwo_set_key
+     nettle_arctwo40_set_key
+     nettle_arctwo64_set_key
+     nettle_arctwo128_set_key
+     nettle_arctwo_set_key_gutmann
+     nettle_arctwo128_set_key_gutmann
+     nettle_arctwo_encrypt
+     nettle_arctwo_decrypt
+     nettle_arcfour_crypt
+     nettle_arcfour_set_key
+     nettle_arcfour128_set_key
+     nettle_nist_keywrap16
+     nettle_nist_keyunwrap16
+     nettle_aes128_keywrap
+     nettle_aes192_keywrap
+     nettle_aes256_keywrap
+     nettle_aes128_keyunwrap
+     nettle_aes192_keyunwrap
+     nettle_aes256_keyunwrap
+     nettle_aes256
+     nettle_aes256_set_decrypt_key
+     nettle_aes256_invert_key
+     nettle_aes256_set_encrypt_key
+     nettle_aes192
+     nettle_aes192_set_decrypt_key
+     nettle_aes192_invert_key
+     nettle_aes192_set_encrypt_key
+     nettle_aes128
+     nettle_aes128_set_decrypt_key
+     nettle_aes128_invert_key
+     nettle_aes128_set_encrypt_key
+     nettle_aes_set_decrypt_key
+     nettle_aes_invert_key
+     nettle_aes_set_encrypt_key
+     _nettle_aes_set_key
+     _nettle_aes_invert
+     nettle_aes256_encrypt
+     nettle_aes192_encrypt
+     nettle_aes128_encrypt
+     _nettle_aes_encrypt_table
+     nettle_aes_encrypt
+     _nettle_aes_encrypt
+     nettle_aes256_decrypt
+     nettle_aes192_decrypt
+     nettle_aes128_decrypt
+     _nettle_aes_decrypt_table
+     nettle_aes_decrypt
+     _nettle_aes_decrypt
diff --git a/external_imported/vcpkg/ports/nettle/nettle-arm64.def b/external_imported/vcpkg/ports/nettle/nettle-arm64.def
new file mode 100644
index 000000000..591c1505e
--- /dev/null
+++ b/external_imported/vcpkg/ports/nettle/nettle-arm64.def
@@ -0,0 +1,542 @@
+EXPORTS
+     _nettle_sha256_compress_arm64
+     _nettle_sha1_compress_arm64
+     _nettle_ghash_update_arm64
+     _nettle_ghash_set_key_arm64
+     _nettle_chacha_4core
+     _nettle_chacha_4core32
+     _nettle_chacha_2core
+     _nettle_chacha_2core32
+     _nettle_aes256_decrypt_arm64
+     _nettle_aes256_encrypt_arm64
+     _nettle_aes192_decrypt_arm64
+     _nettle_aes192_encrypt_arm64
+     _nettle_aes128_decrypt_arm64
+     _nettle_aes128_encrypt_arm64
+     nettle_aes128_encrypt
+     nettle_aes128_decrypt
+     nettle_aes192_encrypt
+     nettle_aes192_decrypt
+     nettle_aes256_encrypt
+     nettle_aes256_decrypt
+     _nettle_ghash_set_key
+     _nettle_ghash_update
+     nettle_sha1_compress
+     _nettle_sha256_compress
+     nettle_xts_aes256_set_encrypt_key
+     nettle_xts_aes256_set_decrypt_key
+     nettle_xts_aes256_encrypt_message
+     nettle_xts_aes256_decrypt_message
+     nettle_xts_aes128_set_encrypt_key
+     nettle_xts_aes128_set_decrypt_key
+     nettle_xts_aes128_encrypt_message
+     nettle_xts_aes128_decrypt_message
+     nettle_xts_encrypt_message
+     nettle_xts_decrypt_message
+     nettle_yarrow_key_event_init
+     nettle_yarrow_key_event_estimate
+     nettle_yarrow256_init
+     nettle_yarrow256_seed
+     nettle_yarrow256_update
+     nettle_yarrow256_random
+     nettle_yarrow256_is_seeded
+     nettle_yarrow256_needed_sources
+     nettle_yarrow256_fast_reseed
+     nettle_yarrow256_slow_reseed
+     _nettle_write_le64
+     _nettle_write_le32
+     _nettle_write_be32
+     nettle_version_major
+     nettle_version_minor
+     nettle_umac128_set_key
+     nettle_umac128_set_nonce
+     nettle_umac128_update
+     nettle_umac128_digest
+     nettle_umac96_set_key
+     nettle_umac96_set_nonce
+     nettle_umac96_update
+     nettle_umac96_digest
+     nettle_umac64_set_key
+     nettle_umac64_set_nonce
+     nettle_umac64_update
+     nettle_umac64_digest
+     nettle_umac32_set_key
+     nettle_umac32_set_nonce
+     nettle_umac32_update
+     nettle_umac32_digest
+     _nettle_umac_set_key
+     _nettle_umac_poly128
+     _nettle_umac_poly64
+     _nettle_umac_l3_init
+     _nettle_umac_l3
+     _nettle_umac_l2_init
+     _nettle_umac_l2
+     _nettle_umac_l2_final
+     _nettle_umac_nh_n
+     _nettle_umac_nh
+     nettle_twofish128
+     nettle_twofish192
+     nettle_twofish256
+     nettle_twofish_set_key
+     nettle_twofish128_set_key
+     nettle_twofish192_set_key
+     nettle_twofish256_set_key
+     nettle_twofish_encrypt
+     nettle_twofish_decrypt
+     nettle_streebog256
+     nettle_streebog512
+     nettle_streebog512_init
+     nettle_streebog512_update
+     nettle_streebog512_digest
+     nettle_streebog256_init
+     nettle_streebog256_digest
+     nettle_serpent128
+     nettle_serpent192
+     nettle_serpent256
+     nettle_serpent_decrypt
+     nettle_serpent_encrypt
+     nettle_serpent_set_key
+     nettle_serpent128_set_key
+     nettle_serpent192_set_key
+     nettle_serpent256_set_key
+     nettle_sm3
+     nettle_sm3_init
+     nettle_sm3_update
+     nettle_sm3_digest
+     nettle_sha3_256_shake
+     nettle_sha3_512
+     nettle_sha3_512_init
+     nettle_sha3_512_update
+     nettle_sha3_512_digest
+     nettle_sha3_384
+     nettle_sha3_384_init
+     nettle_sha3_384_update
+     nettle_sha3_384_digest
+     nettle_sha3_256
+     nettle_sha3_256_init
+     nettle_sha3_256_update
+     nettle_sha3_256_digest
+     nettle_sha3_224
+     nettle_sha3_224_init
+     nettle_sha3_224_update
+     nettle_sha3_224_digest
+     nettle_sha3_permute
+     _nettle_sha3_update
+     _nettle_sha3_pad
+     nettle_sha512_256
+     nettle_sha512_224
+     nettle_sha512
+     nettle_sha384
+     _nettle_sha512_compress
+     nettle_sha512_init
+     nettle_sha512_update
+     nettle_sha512_digest
+     nettle_sha384_init
+     nettle_sha384_digest
+     nettle_sha512_224_init
+     nettle_sha512_224_digest
+     nettle_sha512_256_init
+     nettle_sha512_256_digest
+     nettle_sha256
+     nettle_sha224
+     _nettle_sha256_compress_c
+     nettle_sha256_init
+     nettle_sha256_update
+     nettle_sha256_digest
+     nettle_sha224_init
+     nettle_sha224_digest
+     nettle_sha1
+     _nettle_sha1_compress_c
+     nettle_sha1_init
+     nettle_sha1_update
+     nettle_sha1_digest
+     nettle_salsa20_256_set_key
+     nettle_salsa20_128_set_key
+     nettle_salsa20_set_nonce
+     nettle_salsa20_set_key
+     nettle_salsa20r12_crypt
+     nettle_salsa20_crypt
+     _nettle_salsa20_crypt
+     _nettle_salsa20_core
+     nettle_ripemd160
+     _nettle_ripemd160_compress
+     nettle_ripemd160_init
+     nettle_ripemd160_update
+     nettle_ripemd160_digest
+     nettle_realloc
+     nettle_xrealloc
+     _nettle_poly1305_set_key
+     _nettle_poly1305_digest
+     _nettle_poly1305_block
+     nettle_poly1305_aes_set_key
+     nettle_poly1305_aes_set_nonce
+     nettle_poly1305_aes_update
+     nettle_poly1305_aes_digest
+     nettle_pbkdf2_hmac_sha512
+     nettle_pbkdf2_hmac_sha384
+     nettle_pbkdf2_hmac_sha256
+     nettle_pbkdf2_hmac_sha1
+     nettle_pbkdf2_hmac_gosthash94cp
+     nettle_pbkdf2
+     _nettle_macs
+     nettle_get_macs
+     _nettle_hashes
+     nettle_get_hashes
+     _nettle_ciphers
+     nettle_get_ciphers
+     _nettle_armors
+     nettle_get_armors
+     _nettle_aeads
+     nettle_get_aeads
+     nettle_lookup_hash
+     nettle_memxor3
+     nettle_memxor
+     nettle_memeql_sec
+     nettle_md5
+     nettle_MD5Init
+     nettle_MD5Update
+     nettle_MD5Final
+     nettle_md5_compress
+     nettle_md5_init
+     nettle_md5_update
+     nettle_md5_digest
+     nettle_md4
+     nettle_md4_init
+     nettle_md4_update
+     nettle_md4_digest
+     nettle_md2
+     nettle_md2_init
+     nettle_md2_update
+     nettle_md2_digest
+     nettle_hkdf_extract
+     nettle_hkdf_expand
+     nettle_knuth_lfib_init
+     nettle_knuth_lfib_get
+     nettle_knuth_lfib_get_array
+     nettle_knuth_lfib_random
+     nettle_hmac_sm3
+     nettle_hmac_streebog256
+     nettle_hmac_streebog512
+     nettle_hmac_sha512
+     nettle_hmac_sha384
+     nettle_hmac_sha256
+     nettle_hmac_sha224
+     nettle_hmac_sha1
+     nettle_hmac_ripemd160
+     nettle_hmac_md5
+     nettle_hmac_sm3_set_key
+     nettle_hmac_sm3_update
+     nettle_hmac_sm3_digest
+     nettle_hmac_streebog512_set_key
+     nettle_hmac_streebog512_update
+     nettle_hmac_streebog512_digest
+     nettle_hmac_streebog256_set_key
+     nettle_hmac_streebog256_digest
+     nettle_hmac_sha512_set_key
+     nettle_hmac_sha512_update
+     nettle_hmac_sha512_digest
+     nettle_hmac_sha384_set_key
+     nettle_hmac_sha384_digest
+     nettle_hmac_sha256_set_key
+     nettle_hmac_sha256_update
+     nettle_hmac_sha256_digest
+     nettle_hmac_sha224_set_key
+     nettle_hmac_sha224_digest
+     nettle_hmac_sha1_set_key
+     nettle_hmac_sha1_update
+     nettle_hmac_sha1_digest
+     nettle_hmac_ripemd160_set_key
+     nettle_hmac_ripemd160_update
+     nettle_hmac_ripemd160_digest
+     nettle_hmac_md5_set_key
+     nettle_hmac_md5_update
+     nettle_hmac_md5_digest
+     nettle_hmac_gosthash94_set_key
+     nettle_hmac_gosthash94_update
+     nettle_hmac_gosthash94_digest
+     nettle_hmac_gosthash94cp_set_key
+     nettle_hmac_gosthash94cp_update
+     nettle_hmac_gosthash94cp_digest
+     nettle_hmac_set_key
+     nettle_hmac_update
+     nettle_hmac_digest
+     nettle_gosthash94
+     nettle_gosthash94cp
+     nettle_gosthash94_init
+     nettle_gosthash94_update
+     nettle_gosthash94_digest
+     nettle_gosthash94cp_update
+     nettle_gosthash94cp_digest
+     _nettle_gost28147_param_test_3411
+     _nettle_gost28147_param_CryptoPro_3411
+     _nettle_gost28147_encrypt_block
+     nettle_cmac_des3
+     nettle_cmac_aes256
+     nettle_cmac_aes128
+     nettle_cmac_des3_set_key
+     nettle_cmac_des3_update
+     nettle_cmac_des3_digest
+     nettle_cmac_aes256_set_key
+     nettle_cmac_aes256_update
+     nettle_cmac_aes256_digest
+     nettle_cmac_aes128_set_key
+     nettle_cmac_aes128_update
+     nettle_cmac_aes128_digest
+     nettle_cmac64_set_key
+     nettle_cmac64_init
+     nettle_cmac64_update
+     nettle_cmac64_digest
+     nettle_cmac128_set_key
+     nettle_cmac128_init
+     nettle_cmac128_update
+     nettle_cmac128_digest
+     nettle_gcm_camellia256
+     nettle_gcm_camellia256_set_key
+     nettle_gcm_camellia256_set_iv
+     nettle_gcm_camellia256_update
+     nettle_gcm_camellia256_encrypt
+     nettle_gcm_camellia256_decrypt
+     nettle_gcm_camellia256_digest
+     nettle_gcm_camellia128
+     nettle_gcm_camellia128_set_key
+     nettle_gcm_camellia128_set_iv
+     nettle_gcm_camellia128_update
+     nettle_gcm_camellia128_encrypt
+     nettle_gcm_camellia128_decrypt
+     nettle_gcm_camellia128_digest
+     nettle_gcm_aes256
+     nettle_gcm_aes256_set_key
+     nettle_gcm_aes256_update
+     nettle_gcm_aes256_set_iv
+     nettle_gcm_aes256_encrypt
+     nettle_gcm_aes256_decrypt
+     nettle_gcm_aes256_digest
+     nettle_gcm_aes192
+     nettle_gcm_aes192_set_key
+     nettle_gcm_aes192_update
+     nettle_gcm_aes192_set_iv
+     nettle_gcm_aes192_encrypt
+     nettle_gcm_aes192_decrypt
+     nettle_gcm_aes192_digest
+     nettle_gcm_aes128
+     nettle_gcm_aes128_set_key
+     nettle_gcm_aes128_update
+     nettle_gcm_aes128_set_iv
+     nettle_gcm_aes128_encrypt
+     nettle_gcm_aes128_decrypt
+     nettle_gcm_aes128_digest
+     nettle_gcm_aes_set_key
+     nettle_gcm_aes_set_iv
+     nettle_gcm_aes_update
+     nettle_gcm_aes_encrypt
+     nettle_gcm_aes_decrypt
+     nettle_gcm_aes_digest
+     nettle_gcm_set_key
+     nettle_gcm_set_iv
+     nettle_gcm_update
+     nettle_gcm_encrypt
+     nettle_gcm_decrypt
+     nettle_gcm_digest
+     _nettle_ghash_update_c
+     _nettle_ghash_set_key_c
+     nettle_eax_aes128
+     nettle_eax_aes128_set_key
+     nettle_eax_aes128_set_nonce
+     nettle_eax_aes128_update
+     nettle_eax_aes128_encrypt
+     nettle_eax_aes128_decrypt
+     nettle_eax_aes128_digest
+     nettle_eax_set_key
+     nettle_eax_set_nonce
+     nettle_eax_update
+     nettle_eax_encrypt
+     nettle_eax_decrypt
+     nettle_eax_digest
+     nettle_des3_set_key
+     nettle_des3_encrypt
+     nettle_des3_decrypt
+     nettle_des_set_key
+     nettle_des_encrypt
+     nettle_des_decrypt
+     nettle_des_check_parity
+     nettle_des_fix_parity
+     _nettle_ctr_crypt16
+     nettle_ctr_crypt
+     nettle_chacha_set_nonce
+     nettle_chacha_set_nonce96
+     nettle_chacha_set_counter
+     nettle_chacha_set_counter32
+     nettle_chacha_set_key
+     nettle_chacha_poly1305
+     nettle_chacha_poly1305_set_key
+     nettle_chacha_poly1305_set_nonce
+     nettle_chacha_poly1305_update
+     nettle_chacha_poly1305_encrypt
+     nettle_chacha_poly1305_decrypt
+     nettle_chacha_poly1305_digest
+     _nettle_chacha_core
+     nettle_chacha_crypt
+     nettle_chacha_crypt32
+     nettle_cnd_memcpy
+     nettle_siv_cmac_aes256_set_key
+     nettle_siv_cmac_aes256_encrypt_message
+     nettle_siv_cmac_aes256_decrypt_message
+     nettle_siv_cmac_aes128_set_key
+     nettle_siv_cmac_aes128_encrypt_message
+     nettle_siv_cmac_aes128_decrypt_message
+     nettle_siv_cmac_set_key
+     nettle_siv_cmac_encrypt_message
+     nettle_siv_cmac_decrypt_message
+     nettle_cfb_encrypt
+     nettle_cfb_decrypt
+     nettle_cfb8_encrypt
+     nettle_cfb8_decrypt
+     nettle_ccm_aes256_set_key
+     nettle_ccm_aes256_set_nonce
+     nettle_ccm_aes256_update
+     nettle_ccm_aes256_encrypt
+     nettle_ccm_aes256_decrypt
+     nettle_ccm_aes256_digest
+     nettle_ccm_aes256_encrypt_message
+     nettle_ccm_aes256_decrypt_message
+     nettle_ccm_aes192_set_key
+     nettle_ccm_aes192_set_nonce
+     nettle_ccm_aes192_update
+     nettle_ccm_aes192_encrypt
+     nettle_ccm_aes192_decrypt
+     nettle_ccm_aes192_digest
+     nettle_ccm_aes192_encrypt_message
+     nettle_ccm_aes192_decrypt_message
+     nettle_ccm_aes128_set_key
+     nettle_ccm_aes128_set_nonce
+     nettle_ccm_aes128_update
+     nettle_ccm_aes128_encrypt
+     nettle_ccm_aes128_decrypt
+     nettle_ccm_aes128_digest
+     nettle_ccm_aes128_encrypt_message
+     nettle_ccm_aes128_decrypt_message
+     nettle_ccm_set_nonce
+     nettle_ccm_update
+     nettle_ccm_encrypt
+     nettle_ccm_decrypt
+     nettle_ccm_digest
+     nettle_ccm_encrypt_message
+     nettle_ccm_decrypt_message
+     nettle_cbc_aes256_encrypt
+     nettle_cbc_aes192_encrypt
+     nettle_cbc_aes128_encrypt
+     nettle_cbc_encrypt
+     nettle_cbc_decrypt
+     nettle_cast128
+     nettle_cast5_set_key
+     nettle_cast128_set_key
+     nettle_cast128_encrypt
+     nettle_cast128_decrypt
+     nettle_camellia256
+     nettle_camellia256_set_decrypt_key
+     nettle_camellia256_invert_key
+     nettle_camellia192_set_decrypt_key
+     nettle_camellia256_crypt
+     nettle_camellia256_set_encrypt_key
+     nettle_camellia192_set_encrypt_key
+     nettle_camellia192
+     nettle_camellia128
+     nettle_camellia_set_decrypt_key
+     nettle_camellia128_invert_key
+     nettle_camellia128_crypt
+     nettle_camellia128_set_encrypt_key
+     _nettle_camellia_invert_key
+     _nettle_camellia_absorb
+     _nettle_camellia_table
+     _nettle_camellia_crypt
+     nettle_buffer_init
+     nettle_buffer_init_realloc
+     nettle_buffer_init_size
+     nettle_buffer_clear
+     nettle_buffer_reset
+     nettle_buffer_grow
+     nettle_buffer_write
+     nettle_buffer_space
+     nettle_buffer_copy
+     nettle_base64url
+     nettle_base64url_decode_init
+     nettle_base64url_encode_init
+     nettle_base64
+     nettle_base64_decode_init
+     nettle_base64_decode_single
+     nettle_base64_decode_update
+     nettle_base64_decode_final
+     nettle_base64_encode_init
+     nettle_base64_encode_single
+     nettle_base64_encode_update
+     nettle_base64_encode_final
+     nettle_base64_encode_raw
+     nettle_base64_encode_group
+     nettle_base16
+     nettle_base16_decode_init
+     nettle_base16_decode_single
+     nettle_base16_decode_update
+     nettle_base16_decode_final
+     nettle_base16_encode_single
+     nettle_base16_encode_update
+     nettle_blowfish_bcrypt_hash
+     nettle_blowfish_bcrypt_verify
+     _nettle_blowfish_initial_ctx
+     nettle_blowfish_set_key
+     nettle_blowfish128_set_key
+     nettle_blowfish_encrypt
+     nettle_blowfish_decrypt
+     _nettle_blowfish_encround
+     nettle_arctwo40
+     nettle_arctwo64
+     nettle_arctwo128
+     nettle_arctwo_gutmann128
+     nettle_arctwo_set_key_ekb
+     nettle_arctwo_set_key
+     nettle_arctwo40_set_key
+     nettle_arctwo64_set_key
+     nettle_arctwo128_set_key
+     nettle_arctwo_set_key_gutmann
+     nettle_arctwo128_set_key_gutmann
+     nettle_arctwo_encrypt
+     nettle_arctwo_decrypt
+     nettle_arcfour_crypt
+     nettle_arcfour_set_key
+     nettle_arcfour128_set_key
+     nettle_nist_keywrap16
+     nettle_nist_keyunwrap16
+     nettle_aes128_keywrap
+     nettle_aes192_keywrap
+     nettle_aes256_keywrap
+     nettle_aes128_keyunwrap
+     nettle_aes192_keyunwrap
+     nettle_aes256_keyunwrap
+     nettle_aes256
+     nettle_aes256_set_decrypt_key
+     nettle_aes256_invert_key
+     nettle_aes256_set_encrypt_key
+     nettle_aes192
+     nettle_aes192_set_decrypt_key
+     nettle_aes192_invert_key
+     nettle_aes192_set_encrypt_key
+     nettle_aes128
+     nettle_aes128_set_decrypt_key
+     nettle_aes128_invert_key
+     nettle_aes128_set_encrypt_key
+     nettle_aes_set_decrypt_key
+     nettle_aes_invert_key
+     nettle_aes_set_encrypt_key
+     _nettle_aes_set_key
+     _nettle_aes_invert
+     _nettle_aes256_encrypt_c
+     _nettle_aes192_encrypt_c
+     _nettle_aes128_encrypt_c
+     _nettle_aes_encrypt_table
+     nettle_aes_encrypt
+     _nettle_aes_encrypt
+     _nettle_aes256_decrypt_c
+     _nettle_aes192_decrypt_c
+     _nettle_aes128_decrypt_c
+     _nettle_aes_decrypt_table
+     nettle_aes_decrypt
+     _nettle_aes_decrypt
diff --git a/external_imported/vcpkg/ports/nettle/portfile.cmake b/external_imported/vcpkg/ports/nettle/portfile.cmake
index ba848f86d..a0b36b05a 100644
--- a/external_imported/vcpkg/ports/nettle/portfile.cmake
+++ b/external_imported/vcpkg/ports/nettle/portfile.cmake
@@ -1,11 +1,3 @@
-vcpkg_list(SET extra_patches)
-if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
-    vcpkg_list(APPEND extra_patches
-        yasm.patch # the asm changes are a downgrade to an older version
-        libname-windows.patch # libtool rules for lib naming, exports
-    )
-endif()
-
 vcpkg_from_gitlab(
     GITLAB_URL https://git.lysator.liu.se/
     OUT_SOURCE_PATH SOURCE_PATH
@@ -19,53 +11,72 @@ vcpkg_from_gitlab(
         compile.patch
         host-tools.patch
         ccas.patch
-        install-dll.patch
-        ${extra_patches}
+        msvc-support.patch
 )
 
-# Temporarily set to 1 to re-generate the lists of exported symbols.
-# This is needed when the version is bumped.
+vcpkg_cmake_get_vars(cmake_vars_file)
+include("${cmake_vars_file}")
+
+# Maintainer switch: Temporarily set this to 1 to re-generate the lists
+# of exported symbols. This is needed when the version is bumped.
 set(GENERATE_SYMBOLS 0)
 if(GENERATE_SYMBOLS)
-    if(VCPKG_TARGET_IS_MINGW OR NOT VCPKG_TARGET_IS_WINDOWS)
-        set(GENERATE_SYMBOLS 0)
-    else()
+    if(VCPKG_DETECTED_CMAKE_C_COMPILER_ID STREQUAL "MSVC")
         vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+    else()
+        set(GENERATE_SYMBOLS 0)
     endif()
 endif()
 
 vcpkg_list(SET OPTIONS)
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    vcpkg_list(APPEND OPTIONS --disable-static)
-else()
-    vcpkg_list(APPEND OPTIONS --disable-shared)
-endif()
-
 if("tools" IN_LIST FEATURES)
     vcpkg_list(APPEND OPTIONS --enable-tools)
 endif()
 
-if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
-    set(ENV{CCAS} "${CURRENT_HOST_INSTALLED_DIR}/tools/yasm/yasm${VCPKG_HOST_EXECUTABLE_SUFFIX}")
-    if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
-        set(asmflag win64)
-    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
-        set(asmflag win32)
+# As in gmp
+set(disable_assembly OFF)
+set(ccas "")
+set(asmflags "")
+if(VCPKG_DETECTED_CMAKE_C_COMPILER_ID STREQUAL "MSVC")
+    vcpkg_list(APPEND OPTIONS ac_cv_func_memset=yes)
+    if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
+        string(APPEND asmflags " --target=i686-pc-windows-msvc -m32")
+    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
+        string(APPEND asmflags " --target=x86_64-pc-windows-msvc")
+    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
+        string(APPEND asmflags " --target=arm64-pc-windows-msvc")
+    else()
+        set(disable_assembly ON)
+    endif()
+    if(NOT disable_assembly)
+        vcpkg_find_acquire_program(CLANG)
+        set(ccas "${CLANG}")
     endif()
-    set(ENV{ASMFLAGS} "-Xvc -f ${asmflag} -pgas -rraw")
-    vcpkg_list(APPEND OPTIONS
-        ac_cv_func_memset=yes
-        nettle_cv_asm_type_percent_function=no
-        nettle_cv_asm_align_log=no
-    )
 else()
-    vcpkg_list(APPEND OPTIONS "CCAS=") # configure will use CC
+    set(ccas "${VCPKG_DETECTED_CMAKE_C_COMPILER}")
+endif()
+
+if(disable_assembly)
+    vcpkg_list(APPEND OPTIONS "--enable-assembler=no")
+elseif(ccas)
+    cmake_path(GET ccas PARENT_PATH ccas_dir)
+    vcpkg_add_to_path("${ccas_dir}")
+    cmake_path(GET ccas FILENAME ccas_command)
+    vcpkg_list(APPEND OPTIONS "CCAS=${ccas_command}" "ASMFLAGS=${asmflags}")
 endif()
 
 if(VCPKG_CROSSCOMPILING)
     set(ENV{HOST_TOOLS_PREFIX} "${CURRENT_HOST_INSTALLED_DIR}/manual-tools/${PORT}")
 endif()
 
+if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+    file(GLOB def_files "${CMAKE_CURRENT_LIST_DIR}/*.def")
+    file(COPY ${def_files} DESTINATION "${SOURCE_PATH}")
+    vcpkg_list(APPEND OPTIONS "MSVC_TARGET=${VCPKG_TARGET_ARCHITECTURE}")
+else()
+    vcpkg_list(APPEND OPTIONS "MSVC_TARGET=no")
+endif()
+
 vcpkg_configure_make(
     SOURCE_PATH "${SOURCE_PATH}"
     AUTOCONFIG
@@ -77,40 +88,8 @@ vcpkg_configure_make(
     OPTIONS_DEBUG
         --disable-tools
 )
-
-if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
-    if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-        # def files are created by running 'llvm-nm <libname> | findstr /R /C:"[RT] _*nettle_"' on the static build and replacing '00[0-9abcdef]+ [RT]' with spaces
-        # please update the defs if the version is bumped
-        set(build_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/")
-        configure_file(
-            "${CURRENT_PORT_DIR}/nettle-${VCPKG_TARGET_ARCHITECTURE}.def"
-            "${build_dir}/nettle.def"
-            COPYONLY
-        )
-        configure_file(
-            "${CURRENT_PORT_DIR}/hogweed-${VCPKG_TARGET_ARCHITECTURE}.def"
-            "${build_dir}/hogweed.def"
-            COPYONLY
-        )
-        if(NOT VCPKG_BUILD_TYPE)
-            set(build_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/")
-            configure_file(
-                "${CURRENT_PORT_DIR}/nettle-${VCPKG_TARGET_ARCHITECTURE}.def" 
-                "${build_dir}/nettle.def"
-                COPYONLY
-            )
-            configure_file("${CURRENT_PORT_DIR}/hogweed-${VCPKG_TARGET_ARCHITECTURE}.def" 
-                "${build_dir}/hogweed.def"
-                COPYONLY
-            )
-        endif()
-    endif()
-endif()
 vcpkg_install_make()
-
-vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug")
+vcpkg_fixup_pkgconfig()
 
 if(NOT VCPKG_CROSSCOMPILING)
     set(tool_names desdata eccdata) # aes gcm sha twofish?
@@ -120,9 +99,14 @@ if(NOT VCPKG_CROSSCOMPILING)
     vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}")
 endif()
 
-vcpkg_fixup_pkgconfig()
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share/")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+if("tools" IN_LIST FEATURES)
+    vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin")
+endif()
+
+file(REMOVE_RECURSE
+    "${CURRENT_PACKAGES_DIR}/debug/share"
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+)
 
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYINGv3")
 
diff --git a/external_imported/vcpkg/ports/nettle/vcpkg.json b/external_imported/vcpkg/ports/nettle/vcpkg.json
index ade31eac4..d7c2e9308 100644
--- a/external_imported/vcpkg/ports/nettle/vcpkg.json
+++ b/external_imported/vcpkg/ports/nettle/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "nettle",
   "version": "3.8.1",
+  "port-version": 1,
   "description": "Nettle is a low-level cryptographic library that is designed to fit easily in more or less any context: In crypto toolkits for object-oriented languages (C++, Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel space.",
   "homepage": "https://git.lysator.liu.se/nettle/nettle",
   "license": null,
@@ -11,12 +12,8 @@
       "host": true
     },
     {
-      "name": "yasm",
-      "host": true,
-      "features": [
-        "tools"
-      ],
-      "platform": "windows"
+      "name": "vcpkg-cmake-get-vars",
+      "host": true
     }
   ],
   "features": {
diff --git a/external_imported/vcpkg/ports/networkdirect-sdk/portfile.cmake b/external_imported/vcpkg/ports/networkdirect-sdk/portfile.cmake
index bd378607f..1d6c73c92 100644
--- a/external_imported/vcpkg/ports/networkdirect-sdk/portfile.cmake
+++ b/external_imported/vcpkg/ports/networkdirect-sdk/portfile.cmake
@@ -12,8 +12,8 @@ vcpkg_download_distfile(LICENSE
     SHA512 7d79aae4c9beb85811a3e122a2b12aad231f519dd12a461ac49d52864a735a6b05a263d433c11ede1406d2e49b6dc62dd38487eb7bd8c079d7198a20cf85fc4d
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE ${ARCHIVE}
     NO_REMOVE_ONE_LEVEL
 )
diff --git a/external_imported/vcpkg/ports/networkdirect-sdk/vcpkg.json b/external_imported/vcpkg/ports/networkdirect-sdk/vcpkg.json
index 8313f8f60..850635164 100644
--- a/external_imported/vcpkg/ports/networkdirect-sdk/vcpkg.json
+++ b/external_imported/vcpkg/ports/networkdirect-sdk/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "networkdirect-sdk",
   "version": "2.0.1",
-  "port-version": 3,
+  "port-version": 4,
   "description": "The Network Direct architecture allows hardware vendors to expose the advanced capabilities of their networking devices.",
   "homepage": "https://www.nuget.org/packages/NetworkDirect",
   "supports": "windows & (x64 | x86) & !uwp"
diff --git a/external_imported/vcpkg/ports/nghttp2-asio/vcpkg.json b/external_imported/vcpkg/ports/nghttp2-asio/vcpkg.json
index f85bfd8f8..a33bd2085 100644
--- a/external_imported/vcpkg/ports/nghttp2-asio/vcpkg.json
+++ b/external_imported/vcpkg/ports/nghttp2-asio/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "nghttp2-asio",
   "version-date": "2022-08-11",
+  "port-version": 1,
   "description": "High level abstraction API to build HTTP/2 applications with nghttp2 and boost asio.",
   "homepage": "https://github.com/nghttp2/nghttp2-asio",
   "license": "MIT",
@@ -16,26 +17,10 @@
       "name": "nghttp2",
       "version>=": "1.51.0"
     },
+    "openssl",
     {
       "name": "vcpkg-cmake",
       "host": true
     }
-  ],
-  "default-features": [
-    "tls"
-  ],
-  "features": {
-    "tls": {
-      "description": "Support HTTP/2 over TLS aka h2.",
-      "dependencies": [
-        {
-          "name": "boost-asio",
-          "features": [
-            "ssl"
-          ]
-        },
-        "openssl"
-      ]
-    }
-  }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/nghttp2/portfile.cmake b/external_imported/vcpkg/ports/nghttp2/portfile.cmake
index fedb9a6e0..e09622d8a 100644
--- a/external_imported/vcpkg/ports/nghttp2/portfile.cmake
+++ b/external_imported/vcpkg/ports/nghttp2/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO nghttp2/nghttp2
-    REF v1.51.0
-    SHA512 801a6625edefadf348f3c50132f00ce7ad2b15a77d8addca2dd68f0006e69649d35ea3b649000103c85d959680e4159bdda9c437679cbcd6417d8516a5f2fac1
+    REF v${VERSION}
+    SHA512 bcb53ff45afae003f11a9feaa21dd80a3abfcde9b3a7fd1f04fc4382d71b5d4430e2d015765a7ae8d68454fcf06e4560c4cb585133aefb237d6ea526f61a8ebd
     HEAD_REF master
 )
 
@@ -14,11 +14,9 @@ vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DENABLE_LIB_ONLY=ON
-        -DENABLE_ASIO_LIB=OFF
         "-DENABLE_STATIC_CRT=${ENABLE_STATIC_CRT}"
         "-DENABLE_STATIC_LIB=${ENABLE_STATIC_LIB}"
         "-DENABLE_SHARED_LIB=${ENABLE_SHARED_LIB}"
-        -DCMAKE_DISABLE_FIND_PACKAGE_PythonInterp=ON
         -DCMAKE_DISABLE_FIND_PACKAGE_OpenSSL=ON
         -DCMAKE_DISABLE_FIND_PACKAGE_Libev=ON
         -DCMAKE_DISABLE_FIND_PACKAGE_Libcares=ON
@@ -26,17 +24,13 @@ vcpkg_cmake_configure(
         -DCMAKE_DISABLE_FIND_PACKAGE_Libngtcp2=ON
         -DCMAKE_DISABLE_FIND_PACKAGE_Libngtcp2_crypto_openssl=ON
         -DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON
-        -DCMAKE_DISABLE_FIND_PACKAGE_Libbpf=ON
         -DCMAKE_DISABLE_FIND_PACKAGE_Systemd=ON
         -DCMAKE_DISABLE_FIND_PACKAGE_Jansson=ON
         -DCMAKE_DISABLE_FIND_PACKAGE_Libevent=ON
-        -DCMAKE_DISABLE_FIND_PACKAGE_Cython=ON
-        -DCMAKE_DISABLE_FIND_PACKAGE_PythonLibs=ON
         -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=ON
         -DCMAKE_DISABLE_FIND_PACKAGE_Jemalloc=ON
         -DCMAKE_DISABLE_FIND_PACKAGE_Threads=ON
         -DCMAKE_DISABLE_FIND_PACKAGE_CUnit=ON
-        -DCMAKE_DISABLE_FIND_PACKAGE_Boost=ON
 )
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
diff --git a/external_imported/vcpkg/ports/nghttp2/vcpkg.json b/external_imported/vcpkg/ports/nghttp2/vcpkg.json
index a5785fa80..ea675d46c 100644
--- a/external_imported/vcpkg/ports/nghttp2/vcpkg.json
+++ b/external_imported/vcpkg/ports/nghttp2/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "nghttp2",
-  "version": "1.51.0",
-  "port-version": 1,
+  "version": "1.59.0",
   "description": "Implementation of the Hypertext Transfer Protocol version 2 in C",
   "homepage": "https://github.com/nghttp2/nghttp2",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/nghttp3/portfile.cmake b/external_imported/vcpkg/ports/nghttp3/portfile.cmake
index fb692a574..0566d2698 100644
--- a/external_imported/vcpkg/ports/nghttp3/portfile.cmake
+++ b/external_imported/vcpkg/ports/nghttp3/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ngtcp2/nghttp3
     REF v${VERSION}
-    SHA512 8671453ce43cad42a1366b0a794f4b552a550997a1d3b3443e91d8f285680e8bfd74246134693137f8863f5350243a1c426c864b102c87fd71aa0956a3129dcb
+    SHA512 7eb776612ddd30b94b9e2b51097038026873c1ca6d8f20565a03674ba648a11833eeb37d1ddd00981f687669e5f3521b61ef5c01dfdbed4f7222046399bd6270
     HEAD_REF main
 )
 
diff --git a/external_imported/vcpkg/ports/nghttp3/vcpkg.json b/external_imported/vcpkg/ports/nghttp3/vcpkg.json
index 5b053b65e..2259729f5 100644
--- a/external_imported/vcpkg/ports/nghttp3/vcpkg.json
+++ b/external_imported/vcpkg/ports/nghttp3/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "nghttp3",
-  "version": "0.9.0",
+  "version": "1.1.0",
   "description": "Implementation of RFC 9114 HTTP/3 mapping over QUIC and RFC 9204 QPACK in C",
   "homepage": "https://github.com/ngtcp2/nghttp3",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/ngspice/Fix-C2065.patch b/external_imported/vcpkg/ports/ngspice/Fix-C2065.patch
index 527b2bf44..5823d4f54 100644
--- a/external_imported/vcpkg/ports/ngspice/Fix-C2065.patch
+++ b/external_imported/vcpkg/ports/ngspice/Fix-C2065.patch
@@ -1,5 +1,5 @@
 diff --git a/visualc/sharedspice.vcxproj b/visualc/sharedspice.vcxproj
-index 51a5725..6f41ea1 100644
+index ba979bd..ce9d4df 100644
 --- a/visualc/sharedspice.vcxproj
 +++ b/visualc/sharedspice.vcxproj
 @@ -113,7 +113,7 @@
@@ -23,22 +23,22 @@ index 51a5725..6f41ea1 100644
 @@ -199,7 +199,7 @@
      <ClCompile>
        <Optimization>Disabled</Optimization>
-       <AdditionalIncludeDirectories>..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
--      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+       <AdditionalIncludeDirectories>..\src\maths\poly;..\src\osdi;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <PreprocessToFile>false</PreprocessToFile>
        <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
        <MinimalRebuild>false</MinimalRebuild>
-@@ -248,7 +248,7 @@
+@@ -249,7 +249,7 @@
        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
        <WholeProgramOptimization>true</WholeProgramOptimization>
-       <AdditionalIncludeDirectories>..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
--      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+       <AdditionalIncludeDirectories>..\src\maths\poly;..\src\osdi;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <MinimalRebuild>false</MinimalRebuild>
        <ExceptionHandling>
        </ExceptionHandling>
-@@ -292,7 +292,7 @@
+@@ -294,7 +294,7 @@
        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
        <WholeProgramOptimization>true</WholeProgramOptimization>
        <AdditionalIncludeDirectories>..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -47,17 +47,17 @@ index 51a5725..6f41ea1 100644
        <MinimalRebuild>false</MinimalRebuild>
        <ExceptionHandling />
        <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-@@ -337,7 +337,7 @@
+@@ -339,7 +339,7 @@
        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
        <WholeProgramOptimization>true</WholeProgramOptimization>
-       <AdditionalIncludeDirectories>..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
--      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+       <AdditionalIncludeDirectories>..\src\maths\poly;..\src\osdi;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <MinimalRebuild>false</MinimalRebuild>
        <ExceptionHandling>
        </ExceptionHandling>
 diff --git a/visualc/vngspice.vcxproj b/visualc/vngspice.vcxproj
-index a9d916e..393a128 100644
+index 0df1dd5..67d2029 100644
 --- a/visualc/vngspice.vcxproj
 +++ b/visualc/vngspice.vcxproj
 @@ -212,7 +212,7 @@
@@ -81,22 +81,22 @@ index a9d916e..393a128 100644
 @@ -310,7 +310,7 @@
      <ClCompile>
        <Optimization>Disabled</Optimization>
-       <AdditionalIncludeDirectories>..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
--      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;CONFIG64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;CONFIG64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+       <AdditionalIncludeDirectories>..\src\maths\poly;..\src\osdi;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;CONFIG64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;CONFIG64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <MinimalRebuild>false</MinimalRebuild>
        <ExceptionHandling>
        </ExceptionHandling>
-@@ -361,7 +361,7 @@
+@@ -362,7 +362,7 @@
        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
        <WholeProgramOptimization>true</WholeProgramOptimization>
        <AdditionalIncludeDirectories>..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
--      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);CONFIG64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);CONFIG64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);CONFIG64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);CONFIG64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <MinimalRebuild>false</MinimalRebuild>
        <ExceptionHandling>
        </ExceptionHandling>
-@@ -411,7 +411,7 @@
+@@ -413,7 +413,7 @@
      <ClCompile>
        <Optimization>Disabled</Optimization>
        <AdditionalIncludeDirectories>..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -105,7 +105,7 @@ index a9d916e..393a128 100644
        <MinimalRebuild>false</MinimalRebuild>
        <ExceptionHandling>
        </ExceptionHandling>
-@@ -458,7 +458,7 @@
+@@ -460,7 +460,7 @@
        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
        <WholeProgramOptimization>true</WholeProgramOptimization>
        <AdditionalIncludeDirectories>..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -114,25 +114,25 @@ index a9d916e..393a128 100644
        <MinimalRebuild>false</MinimalRebuild>
        <ExceptionHandling>
        </ExceptionHandling>
-@@ -508,7 +508,7 @@
+@@ -510,7 +510,7 @@
      <ClCompile>
        <Optimization>Disabled</Optimization>
        <AdditionalIncludeDirectories>..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
--      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;CONSOLE;CONFIG64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;CONSOLE;CONFIG64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;CONSOLE;CONFIG64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;CONSOLE;CONFIG64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <MinimalRebuild>false</MinimalRebuild>
        <ExceptionHandling>
        </ExceptionHandling>
-@@ -559,7 +559,7 @@
+@@ -562,7 +562,7 @@
        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
        <WholeProgramOptimization>true</WholeProgramOptimization>
        <AdditionalIncludeDirectories>..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
--      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);CONSOLE;CONFIG64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);CONSOLE;CONFIG64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);CONSOLE;CONFIG64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);CONSOLE;CONFIG64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <MinimalRebuild>false</MinimalRebuild>
        <ExceptionHandling>
        </ExceptionHandling>
-@@ -610,7 +610,7 @@
+@@ -614,7 +614,7 @@
        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
        <WholeProgramOptimization>true</WholeProgramOptimization>
        <AdditionalIncludeDirectories>..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -141,16 +141,16 @@ index a9d916e..393a128 100644
        <MinimalRebuild>false</MinimalRebuild>
        <ExceptionHandling>
        </ExceptionHandling>
-@@ -664,7 +664,7 @@
+@@ -668,7 +668,7 @@
        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
        <WholeProgramOptimization>true</WholeProgramOptimization>
        <AdditionalIncludeDirectories>..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
--      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;CONFIG64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;CONFIG64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;CONFIG64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;CONFIG64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <MinimalRebuild>false</MinimalRebuild>
        <ExceptionHandling>
        </ExceptionHandling>
-@@ -718,7 +718,7 @@
+@@ -724,7 +724,7 @@
        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
        <WholeProgramOptimization>true</WholeProgramOptimization>
        <AdditionalIncludeDirectories>..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -159,7 +159,7 @@ index a9d916e..393a128 100644
        <MinimalRebuild>false</MinimalRebuild>
        <ExceptionHandling>
        </ExceptionHandling>
-@@ -772,7 +772,7 @@
+@@ -778,7 +778,7 @@
        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
        <WholeProgramOptimization>true</WholeProgramOptimization>
        <AdditionalIncludeDirectories>..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
diff --git a/external_imported/vcpkg/ports/ngspice/portfile.cmake b/external_imported/vcpkg/ports/ngspice/portfile.cmake
index 105ab23f9..2a0f10280 100644
--- a/external_imported/vcpkg/ports/ngspice/portfile.cmake
+++ b/external_imported/vcpkg/ports/ngspice/portfile.cmake
@@ -6,15 +6,15 @@ set(VCPKG_CRT_LINKAGE static)
 vcpkg_from_sourceforge(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ngspice/ng-spice-rework
-    REF 37
-    FILENAME "ngspice-37.tar.gz"
-    SHA512 d49f7e78d3dd17ac8ea03d79dfbe8a9cf57c012395285cc0c0cf379e0c0c81f11cad68d5366dc2d2478959ed197e4d43380fbc15baf44f987f20ad00f1ee04ca
+    REF ${VERSION}
+    FILENAME "ngspice-${VERSION}.tar.gz"
+    SHA512 fb0960cc9fcde1871fad82571cacebb1f5cce09ee3297cc938a24b88173ed102a2cb3f246599cdfbde7275e45e3d551edd0368e3ba6e79c592937c4cc466325e
     PATCHES
         use-winbison-sharedspice.patch
         use-winbison-vngspice.patch
         remove-post-build.patch
         remove-64-in-codemodel-name.patch
-        Fix-C2065.patch
+        Fix-C2065.patch
 )
 
 vcpkg_find_acquire_program(BISON)
@@ -25,31 +25,29 @@ vcpkg_add_to_path(PREPEND "${BISON_DIR}")
 # Sadly, vcpkg globs .libs inside install_msbuild and whines that the 47 year old SPICE format isn't a MSVC lib ;)
 # We need to kill them off first before the source tree is copied to a tmp location by install_msbuild
 
-file(REMOVE_RECURSE "${SOURCE_PATH}/contrib")
-file(REMOVE_RECURSE "${SOURCE_PATH}/examples")
-file(REMOVE_RECURSE "${SOURCE_PATH}/man")
-file(REMOVE_RECURSE "${SOURCE_PATH}/tests")
+file(REMOVE_RECURSE "${SOURCE_PATH}/contrib")
+file(REMOVE_RECURSE "${SOURCE_PATH}/examples")
+file(REMOVE_RECURSE "${SOURCE_PATH}/man")
+file(REMOVE_RECURSE "${SOURCE_PATH}/tests")
 
 # this builds the main dll
-vcpkg_install_msbuild(
-    SOURCE_PATH "${SOURCE_PATH}"
-    INCLUDES_SUBPATH /src/include
-    LICENSE_SUBPATH COPYING
+vcpkg_msbuild_install(
+    SOURCE_PATH "${SOURCE_PATH}"
     # install_msbuild swaps x86 for win32(bad) if we dont force our own setting
     PLATFORM ${TRIPLET_SYSTEM_ARCH}
     PROJECT_SUBPATH visualc/sharedspice.sln
     TARGET Build
 )
 
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
+file(COPY "${SOURCE_PATH}/src/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+
 if("codemodels" IN_LIST FEATURES)
     # vngspice generates "codemodels" to enhance simulation capabilities
     # we cannot use install_msbuild as they output with ".cm" extensions on purpose
-    set(BUILDTREE_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}")
-    file(REMOVE_RECURSE "${BUILDTREE_PATH}")
-    file(COPY "${SOURCE_PATH}/" DESTINATION "${BUILDTREE_PATH}")
-
-    vcpkg_build_msbuild(
-        PROJECT_PATH "${BUILDTREE_PATH}/visualc/vngspice.sln"
+    vcpkg_msbuild_install(
+        SOURCE_PATH "${SOURCE_PATH}"
+        PROJECT_SUBPATH visualc/vngspice.sln
         # build_msbuild swaps x86 for win32(bad) if we dont force our own setting
         PLATFORM ${TRIPLET_SYSTEM_ARCH}
         TARGET Build
@@ -66,27 +64,26 @@ if("codemodels" IN_LIST FEATURES)
     endif()
 
     #put the code models in the intended location
-    file(GLOB NGSPICE_CODEMODELS_DEBUG
-        "${BUILDTREE_PATH}/visualc/codemodels/${OUT_ARCH}/Debug/*.cm"
-    )
-    file(COPY ${NGSPICE_CODEMODELS_DEBUG} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/ngspice")
+    if(NOT VCPKG_BUILD_TYPE)
+      file(GLOB NGSPICE_CODEMODELS_DEBUG
+          "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/visualc/codemodels/${OUT_ARCH}/Debug/*.cm"
+      )
+      file(COPY ${NGSPICE_CODEMODELS_DEBUG} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/ngspice")
+    endif()
 
     file(GLOB NGSPICE_CODEMODELS_RELEASE
-        "${BUILDTREE_PATH}/visualc/codemodels/${OUT_ARCH}/Release/*.cm"
+        "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/visualc/codemodels/${OUT_ARCH}/Release/*.cm"
     )
-    file(COPY ${NGSPICE_CODEMODELS_RELEASE} DESTINATION "${CURRENT_PACKAGES_DIR}/lib/ngspice")
-
+    file(COPY ${NGSPICE_CODEMODELS_RELEASE} DESTINATION "${CURRENT_PACKAGES_DIR}/lib/ngspice")
 
     # copy over spinit (spice init)
-    file(RENAME "${BUILDTREE_PATH}/visualc/spinit_all" "${BUILDTREE_PATH}/visualc/spinit")
-    file(COPY "${BUILDTREE_PATH}/visualc/spinit" DESTINATION "${CURRENT_PACKAGES_DIR}/share/ngspice")
+    file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/visualc/spinit_all" DESTINATION "${CURRENT_PACKAGES_DIR}/share/ngspice")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/share/ngspice/spinit_all" "${CURRENT_PACKAGES_DIR}/share/ngspice/spinit")
 endif()
 
-vcpkg_copy_pdbs()
-
 # Unforunately install_msbuild isn't able to dual include directories that effectively layer
-file(GLOB NGSPICE_INCLUDES "${SOURCE_PATH}/visualc/src/include/ngspice/*")
-file(COPY ${NGSPICE_INCLUDES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/ngspice")
+file(GLOB NGSPICE_INCLUDES "${SOURCE_PATH}/visualc/src/include/ngspice/*")
+file(COPY ${NGSPICE_INCLUDES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/ngspice")
 
 # This gets copied by install_msbuild but should not be shared
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/cppduals")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/cppduals")
diff --git a/external_imported/vcpkg/ports/ngspice/vcpkg.json b/external_imported/vcpkg/ports/ngspice/vcpkg.json
index 62c2a4438..31cfa6f91 100644
--- a/external_imported/vcpkg/ports/ngspice/vcpkg.json
+++ b/external_imported/vcpkg/ports/ngspice/vcpkg.json
@@ -1,10 +1,17 @@
 {
   "name": "ngspice",
-  "version": "37",
+  "version": "41",
   "description": "Ngspice is a mixed-level/mixed-signal electronic circuit simulator. It is a successor of the latest stable release of Berkeley SPICE",
   "homepage": "http://ngspice.sourceforge.net/",
   "license": "CC-BY-SA-4.0",
   "supports": "!(linux | osx | arm | uwp)",
+  "dependencies": [
+    {
+      "name": "vcpkg-msbuild",
+      "host": true,
+      "platform": "windows"
+    }
+  ],
   "default-features": [
     "codemodels"
   ],
diff --git a/external_imported/vcpkg/ports/ngtcp2/export-unofficical-target.patch b/external_imported/vcpkg/ports/ngtcp2/export-unofficical-target.patch
index 6a067b5ef..30960f9c3 100644
--- a/external_imported/vcpkg/ports/ngtcp2/export-unofficical-target.patch
+++ b/external_imported/vcpkg/ports/ngtcp2/export-unofficical-target.patch
@@ -1,49 +1,43 @@
 diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index d98747f..2bc20d0 100644
+index f822c8e..591a588 100644
 --- a/lib/CMakeLists.txt
 +++ b/lib/CMakeLists.txt
-@@ -80,12 +80,15 @@ if(ENABLE_SHARED_LIB)
-     C_VISIBILITY_PRESET hidden
-     POSITION_INDEPENDENT_CODE ON
-   )
--  target_include_directories(ngtcp2 PUBLIC ${ngtcp2_INCLUDE_DIRS})
--
--  install(TARGETS ngtcp2
-+  target_include_directories(ngtcp2 PRIVATE ${ngtcp2_INCLUDE_DIRS})
-+  install(TARGETS ngtcp2 EXPORT unofficial-ngtcp2-config
+@@ -69,8 +69,9 @@ set(ngtcp2_SOURCES
+ )
+ 
+ set(ngtcp2_INCLUDE_DIRS
+-  "${CMAKE_CURRENT_SOURCE_DIR}/includes"
+-  "${CMAKE_CURRENT_BINARY_DIR}/includes"
++  "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/includes>"
++  "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/includes>"
++  "$<INSTALL_INTERFACE:include>"
+ )
+ 
+ # Public shared library
+@@ -85,6 +86,7 @@ if(ENABLE_SHARED_LIB)
+   target_include_directories(ngtcp2 PUBLIC ${ngtcp2_INCLUDE_DIRS})
+ 
+   install(TARGETS ngtcp2
++    EXPORT unofficial-ngtcp2-config
      ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
      LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
      RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
-+  install(
-+    EXPORT unofficial-ngtcp2-config
-+    NAMESPACE unofficial::ngtcp2::
-+    DESTINATION share/unofficial-ngtcp2)
- endif()
- 
- if(HAVE_CUNIT OR ENABLE_STATIC_LIB)
-@@ -97,10 +100,14 @@ if(HAVE_CUNIT OR ENABLE_STATIC_LIB)
-     C_VISIBILITY_PRESET hidden
-   )
+@@ -102,10 +104,18 @@ if(HAVE_CUNIT OR ENABLE_STATIC_LIB)
    target_compile_definitions(ngtcp2_static PUBLIC "-DNGTCP2_STATICLIB")
--  target_include_directories(ngtcp2_static PUBLIC ${ngtcp2_INCLUDE_DIRS})
-+  target_include_directories(ngtcp2_static PRIVATE ${ngtcp2_INCLUDE_DIRS})
+   target_include_directories(ngtcp2_static PUBLIC ${ngtcp2_INCLUDE_DIRS})
    if(ENABLE_STATIC_LIB)
--    install(TARGETS ngtcp2_static
-+    install(TARGETS ngtcp2_static EXPORT unofficial-ngtcp2_static-config
++    add_library(ngtcp2 INTERFACE)
++    target_link_libraries(ngtcp2 INTERFACE ngtcp2_static)
+     install(TARGETS ngtcp2_static
++      ngtcp2
++      EXPORT unofficial-ngtcp2-config
        DESTINATION "${CMAKE_INSTALL_LIBDIR}")
-+    install(
-+      EXPORT unofficial-ngtcp2_static-config
-+      NAMESPACE unofficial::ngtcp2_static::
-+      DESTINATION share/unofficial-ngtcp2)
    endif()
  endif()
++install(
++  EXPORT unofficial-ngtcp2-config
++  NAMESPACE unofficial::ngtcp2::
++  DESTINATION share/unofficial-ngtcp2)
  
-diff --git a/lib/includes/CMakeLists.txt b/lib/includes/CMakeLists.txt
-index 5eabf73..78bb715 100644
---- a/lib/includes/CMakeLists.txt
-+++ b/lib/includes/CMakeLists.txt
-@@ -1,3 +1,4 @@
-+configure_file("${CMAKE_CURRENT_LIST_DIR}/ngtcp2/version.h.in" "${CMAKE_CURRENT_BINARY_DIR}/ngtcp2/version.h")
- install(FILES
-     ngtcp2/ngtcp2.h
-     "${CMAKE_CURRENT_BINARY_DIR}/ngtcp2/version.h"
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libngtcp2.pc"
+   DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
diff --git a/external_imported/vcpkg/ports/ngtcp2/portfile.cmake b/external_imported/vcpkg/ports/ngtcp2/portfile.cmake
index f21fc0a28..e02969420 100644
--- a/external_imported/vcpkg/ports/ngtcp2/portfile.cmake
+++ b/external_imported/vcpkg/ports/ngtcp2/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ngtcp2/ngtcp2
     REF "v${VERSION}"
-    SHA512 8456ca20c54da8627cd37c313605563bc7bc2f80409aae0049354877e4ccc351f8dd1129ae67bb9fd3b148a2ef69db3670d6c1d2b8df40da26fa8c1b56993e03
+    SHA512 3d266b80fbc44bf0711f4791db4787d80c989beb84ff4fe33e0f8fd25b8bb6d6d768bcbf990ca4bde0bcbaad5c7566bfb6a431b5bbec844247d8a4b417d451d9
     HEAD_REF master
     PATCHES
       export-unofficical-target.patch
@@ -16,32 +16,21 @@ vcpkg_cmake_configure(
     OPTIONS
         "-DENABLE_STATIC_LIB=${ENABLE_STATIC_LIB}"
         "-DENABLE_SHARED_LIB=${ENABLE_SHARED_LIB}"
-        -DCMAKE_DISABLE_FIND_PACKAGE_GnuTLS=ON
-        -DCMAKE_DISABLE_FIND_PACKAGE_OpenSSL=ON
-        -DCMAKE_DISABLE_FIND_PACKAGE_wolfssl=ON
-        -DCMAKE_DISABLE_FIND_PACKAGE_Jemalloc=ON
+        -DENABLE_OPENSSL=OFF
         -DCMAKE_DISABLE_FIND_PACKAGE_Libev=ON
         -DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON
         -DCMAKE_DISABLE_FIND_PACKAGE_CUnit=ON
-    MAYBE_UNUSED_VARIABLES
-        CMAKE_DISABLE_FIND_PACKAGE_GnuTLS
-        CMAKE_DISABLE_FIND_PACKAGE_Jemalloc
-        CMAKE_DISABLE_FIND_PACKAGE_wolfssl
+        -DCMAKE_INSTALL_DOCDIR=share/ngtcp2
 )
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 vcpkg_fixup_pkgconfig()
-vcpkg_cmake_config_fixup(CONFIG_PATH "share/unofficial-ngtcp2")
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-ngtcp2)
 
-# Clean
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin")
-endif()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/doc")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(REMOVE_RECURSE
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/debug/share"
+)
 
-#License
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/ngtcp2/usage b/external_imported/vcpkg/ports/ngtcp2/usage
new file mode 100644
index 000000000..97e0d2616
--- /dev/null
+++ b/external_imported/vcpkg/ports/ngtcp2/usage
@@ -0,0 +1,4 @@
+ngtcp2 provides CMake targets:
+
+    find_package(unofficial-ngtcp2 CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE unofficial::ngtcp2::ngtcp2)
diff --git a/external_imported/vcpkg/ports/ngtcp2/vcpkg.json b/external_imported/vcpkg/ports/ngtcp2/vcpkg.json
index aee922191..771b9fe65 100644
--- a/external_imported/vcpkg/ports/ngtcp2/vcpkg.json
+++ b/external_imported/vcpkg/ports/ngtcp2/vcpkg.json
@@ -1,11 +1,9 @@
 {
   "name": "ngtcp2",
-  "version": "0.13.1",
-  "port-version": 1,
+  "version": "1.2.0",
   "description": "ngtcp2 project is an effort to implement RFC9000 QUIC protocol.",
   "homepage": "https://github.com/ngtcp2/ngtcp2",
   "license": "MIT",
-  "supports": "!(arm & uwp)",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/nifly/portfile.cmake b/external_imported/vcpkg/ports/nifly/portfile.cmake
index 4c2383be4..bb6ee1084 100644
--- a/external_imported/vcpkg/ports/nifly/portfile.cmake
+++ b/external_imported/vcpkg/ports/nifly/portfile.cmake
@@ -1,10 +1,20 @@
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_download_distfile(
+    MISSING_STDINT_H
+    URLS https://github.com/ousnius/nifly/commit/a16057e349b9cbee53d9618b22d3e235505f0df0.patch?full_index=1
+    SHA512 45147c85384deba257e52eda5c2ff0c8dee559edc10b00d6e9964d5cc675669587ef941cea0228816c39846de58e33197e953506b9b73267397c4b36cd1f1374
+    FILENAME a16057e349b9cbee53d9618b22d3e235505f0df0.patch
+)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ousnius/nifly
     REF 680a3c0435ff78f8189c46de410d0c8aa9c18a06
     SHA512 b1bb4a194f95e7bcd66280e1b796d0813cd0b4dc292dae5b168092c2d529f89c966a0f11b364787dfa906556181326b30517b7f734fe85246cde4016e3a1d55b
     HEAD_REF main
+    PATCHES
+        "${MISSING_STDINT_H}"
 )
 
 vcpkg_cmake_configure(
diff --git a/external_imported/vcpkg/ports/nifly/vcpkg.json b/external_imported/vcpkg/ports/nifly/vcpkg.json
index ab3585677..e7f56bafe 100644
--- a/external_imported/vcpkg/ports/nifly/vcpkg.json
+++ b/external_imported/vcpkg/ports/nifly/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "nifly",
   "version": "1.0.0",
+  "port-version": 1,
   "description": "A C++ library for working with the NIF file format",
   "homepage": "https://github.com/ousnius/nifly",
   "supports": "!uwp",
diff --git a/external_imported/vcpkg/ports/nifticlib/portfile.cmake b/external_imported/vcpkg/ports/nifticlib/portfile.cmake
index b4d166d41..56e379552 100644
--- a/external_imported/vcpkg/ports/nifticlib/portfile.cmake
+++ b/external_imported/vcpkg/ports/nifticlib/portfile.cmake
@@ -1,10 +1,11 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO    NIFTI-Imaging/nifti_clib 
-    REF 65f801b9c2f1f15f4de4a19d45e6595c25765632
-    SHA512 be03cdc6cf17fd9ff74c5ecc1f6b2132121bb4b7973a731da334af2a8428d1f0dbbf7b94b2511d1ff7e515b8cc4cf3316d62b189566fb6ffc88c6146eebd48ff
+    REPO  NIFTI-Imaging/nifti_clib 
+    REF 5a8016be2161058f116b39ca476734bd81bb83c5
+    SHA512 782cb4e494d73b054f8e3ab5f059b952fa461ceb3a0e12989ef1485675d1009d107c496abe6a495fbc30214d92859faad2c58a3edb10899114b440476b613315
     HEAD_REF master
-    PATCHES zlib_include.patch
+    PATCHES
+        zlib_include.patch
 )
 
 if(VCPKG_TARGET_IS_WINDOWS)
@@ -50,4 +51,4 @@ endif()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/nifticlib/vcpkg.json b/external_imported/vcpkg/ports/nifticlib/vcpkg.json
index c4201194c..2e90bf03c 100644
--- a/external_imported/vcpkg/ports/nifticlib/vcpkg.json
+++ b/external_imported/vcpkg/ports/nifticlib/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "nifticlib",
-  "version-date": "2020-04-30",
-  "port-version": 4,
+  "version-date": "2022-07-04",
   "description": "Nifticlib is a C I/O library for reading and writing files in the nifti-1 data format.",
   "homepage": "https://github.com/NIFTI-Imaging/nifti_clib",
   "license": null,
diff --git a/external_imported/vcpkg/ports/nlohmann-json/portfile.cmake b/external_imported/vcpkg/ports/nlohmann-json/portfile.cmake
index 947cba357..c20c53078 100644
--- a/external_imported/vcpkg/ports/nlohmann-json/portfile.cmake
+++ b/external_imported/vcpkg/ports/nlohmann-json/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO nlohmann/json
-    REF v3.11.2
-    SHA512 70097c9bcd7a91254acbd41b8b68a6aaa371fc2dd7011f472917f69f1e2d2986155a0339dad791699d542e4a3be44dc49ae72ff73d0ee0ea4b34183296ce19a0 
+    REF "v${VERSION}"
+    SHA512 7df19b621de34f08d5d5c0a25e8225975980841ef2e48536abcf22526ed7fb99f88ad954a2cb823115db59ccc88d1dbe74fe6c281b5644b976b33fb78db9d717
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/nlohmann-json/vcpkg.json b/external_imported/vcpkg/ports/nlohmann-json/vcpkg.json
index cc65b9d20..232df9415 100644
--- a/external_imported/vcpkg/ports/nlohmann-json/vcpkg.json
+++ b/external_imported/vcpkg/ports/nlohmann-json/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "nlohmann-json",
-  "version-semver": "3.11.2",
+  "version-semver": "3.11.3",
   "description": "JSON for Modern C++",
   "homepage": "https://github.com/nlohmann/json",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/nmap/portfile.cmake b/external_imported/vcpkg/ports/nmap/portfile.cmake
index b48af3f0c..444089287 100644
--- a/external_imported/vcpkg/ports/nmap/portfile.cmake
+++ b/external_imported/vcpkg/ports/nmap/portfile.cmake
@@ -8,8 +8,8 @@ vcpkg_download_distfile(ARCHIVE
 )
 
 if(VCPKG_TARGET_IS_WINDOWS)
-    vcpkg_extract_source_archive_ex(
-        OUT_SOURCE_PATH SOURCE_PATH
+    vcpkg_extract_source_archive(
+        SOURCE_PATH
         ARCHIVE ${ARCHIVE}
         PATCHES
             fix-snprintf.patch
@@ -18,9 +18,15 @@ if(VCPKG_TARGET_IS_WINDOWS)
     )
     list(APPEND DEL_PROJS "libpcap" "libpcre" "libssh2" "libz")
     foreach (DEL_PROJ ${DEL_PROJS})
-        file(REMOVE_RECURSE ${SOURCE_PATH}/${DEL_PROJ})
+        file(REMOVE_RECURSE "${SOURCE_PATH}/${DEL_PROJ}")
     endforeach()
-    
+
+  if(NOT EXISTS "${CURRENT_INSTALLED_DIR}/bin/Packet.dll")
+    vcpkg_replace_string("${SOURCE_PATH}/mswin32/pcap-include/pcap/export-defs.h" "#define PCAP_API_DEF	__declspec(dllimport)" "#define PCAP_API_DEF		")
+  else() # editable
+    vcpkg_replace_string("${SOURCE_PATH}/mswin32/pcap-include/pcap/export-defs.h" "#define PCAP_API_DEF		" "#define PCAP_API_DEF	__declspec(dllimport)")
+  endif()
+
     # Clear
     vcpkg_execute_required_process(
         COMMAND "devenv.exe"
@@ -28,7 +34,6 @@ if(VCPKG_TARGET_IS_WINDOWS)
                 /Clean
         WORKING_DIRECTORY ${SOURCE_PATH}/mswin32
     )
-    
     # Uprade
     message(STATUS "Upgrade solution...")
     vcpkg_execute_required_process(
@@ -38,24 +43,13 @@ if(VCPKG_TARGET_IS_WINDOWS)
         WORKING_DIRECTORY ${SOURCE_PATH}/mswin32
         LOGNAME upgrade-Packet-${TARGET_TRIPLET}
     )
-    # Build
-    vcpkg_build_msbuild(
-    PROJECT_PATH ${SOURCE_PATH}/mswin32/nmap.vcxproj
-    PLATFORM ${MSBUILD_PLATFORM}
-    USE_VCPKG_INTEGRATION
+    file(REMOVE_RECURSE "${SOURCE_PATH}/mswin32/Lib")
+    vcpkg_msbuild_install(
+        SOURCE_PATH "${SOURCE_PATH}"
+        PROJECT_SUBPATH mswin32/nmap.vcxproj
+        PLATFORM ${MSBUILD_PLATFORM}
+        ADDITIONAL_LIBS Packet.lib wpcap.lib User32.lib Crypt32.lib
     )
-    
-    # Install
-    if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL Release)
-        file(INSTALL ${SOURCE_PATH}/mswin32/Release/nmap.exe
-                     ${SOURCE_PATH}/mswin32/Release/nmap.pdb
-                     DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
-    endif()
-    if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL Debug)
-        file(INSTALL ${SOURCE_PATH}/mswin32/Debug/nmap.exe
-                     ${SOURCE_PATH}/mswin32/Debug/nmap.pdb
-                     DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
-    endif()
 else()
     set(ENV{LDFLAGS} "$ENV{LDFLAGS} -pthread")
     set(OPTIONS --without-nmap-update --with-openssl=${CURRENT_INSTALLED_DIR} --with-libssh2=${CURRENT_INSTALLED_DIR} --with-libz=${CURRENT_INSTALLED_DIR} --with-libpcre=${CURRENT_INSTALLED_DIR})
@@ -112,9 +106,7 @@ else()
     set(SOURCE_PATH "${source_path_release}")
 endif()
 
-vcpkg_copy_pdbs()
-
 # Handle copyright
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
 
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/nmap/vcpkg.json b/external_imported/vcpkg/ports/nmap/vcpkg.json
index 76093aa55..59ae90b28 100644
--- a/external_imported/vcpkg/ports/nmap/vcpkg.json
+++ b/external_imported/vcpkg/ports/nmap/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "nmap",
   "version": "7.70",
-  "port-version": 8,
+  "port-version": 11,
   "description": "A library for scanning network ports.",
   "dependencies": [
     {
@@ -16,6 +16,11 @@
       "name": "python2",
       "platform": "windows"
     },
+    {
+      "name": "vcpkg-msbuild",
+      "host": true,
+      "platform": "windows"
+    },
     {
       "name": "winpcap",
       "platform": "windows"
diff --git a/external_imported/vcpkg/ports/nng/portfile.cmake b/external_imported/vcpkg/ports/nng/portfile.cmake
index 3dd2b2974..6be784c91 100644
--- a/external_imported/vcpkg/ports/nng/portfile.cmake
+++ b/external_imported/vcpkg/ports/nng/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO nanomsg/nng
-    REF v1.5.2
-    SHA512 33cda9e0422c6e8cb56e48bd812f381bf07a92a0aa2fbadddbca7cfde585c66299142186a3a76a97163e5570042452a62c1e53180ebfbf016a44eee998b16286
+    REF "v${VERSION}"
+    SHA512 b4f2c812e65f0a5cb57827d80e632912679902b50f06eb10805d5fe86ab30fc97c4441b0b4d1d8c15dbf09ac7628f4c863d699121fa14bbad0a7782c40a1e4bf
     HEAD_REF master
 )
 
@@ -50,6 +50,6 @@ if ("tools" IN_LIST FEATURES)
     vcpkg_copy_tools(TOOL_NAMES nngcat AUTO_CLEAN)
 endif()
 
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
 
 vcpkg_copy_pdbs()
diff --git a/external_imported/vcpkg/ports/nng/vcpkg.json b/external_imported/vcpkg/ports/nng/vcpkg.json
index cdb6da7df..fcf2c8a54 100644
--- a/external_imported/vcpkg/ports/nng/vcpkg.json
+++ b/external_imported/vcpkg/ports/nng/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "nng",
-  "version-semver": "1.5.2",
+  "version-semver": "1.6.0",
   "description": "nanomsg-next-gen, lightweight messaging library",
   "homepage": "https://nng.nanomsg.org",
   "license": "MIT",
+  "supports": "!uwp",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/nngpp/vcpkg.json b/external_imported/vcpkg/ports/nngpp/vcpkg.json
index a1529030b..2720e9b0d 100644
--- a/external_imported/vcpkg/ports/nngpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/nngpp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "nngpp",
-  "version-string": "1.3.0",
-  "port-version": 2,
+  "version": "1.3.0",
+  "port-version": 3,
   "description": "C++ wrapper around the nanomsg NNG API.",
   "homepage": "https://github.com/cwzx/nngpp",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/node-addon-api/portfile.cmake b/external_imported/vcpkg/ports/node-addon-api/portfile.cmake
index 2d6b96ab1..d70301a1b 100644
--- a/external_imported/vcpkg/ports/node-addon-api/portfile.cmake
+++ b/external_imported/vcpkg/ports/node-addon-api/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO nodejs/node-addon-api
   REF "v${VERSION}"
-  SHA512 f7889d676665f053577c4964b56a51d628f2da1bd9ee77b478b088cc11750952037687242e0a24036daae759d27c9b619b9f9db9c2c2839204d91af1603a1d90
+  SHA512 ff7b712b53479c10ebf34b6723b91a3e70eb946c39fc7feeebc5485a3928f15ce2af92126d3c331e54fbb852bec8286aa5ddd8211f1315f3b133fcede6e2f53c
   HEAD_REF main
 )
 
diff --git a/external_imported/vcpkg/ports/node-addon-api/unofficial-node-addon-api-config.cmake b/external_imported/vcpkg/ports/node-addon-api/unofficial-node-addon-api-config.cmake
index ace4d47b7..57e2a2625 100644
--- a/external_imported/vcpkg/ports/node-addon-api/unofficial-node-addon-api-config.cmake
+++ b/external_imported/vcpkg/ports/node-addon-api/unofficial-node-addon-api-config.cmake
@@ -1,9 +1,9 @@
 if(NOT TARGET unofficial::node-addon-api::node-addon-api)
   include(CMakeFindDependencyMacro)
-  find_dependency(unofficial-node-api CONFIG)
+  find_dependency(unofficial-node-api-headers CONFIG)
 
   add_library(unofficial::node-addon-api::node-addon-api IMPORTED INTERFACE)
-  target_link_libraries(unofficial::node-addon-api::node-addon-api INTERFACE unofficial::node-api::node-api)
+  target_link_libraries(unofficial::node-addon-api::node-addon-api INTERFACE unofficial::node-api-headers::node-api-headers)
 
   set_target_properties(unofficial::node-addon-api::node-addon-api PROPERTIES
     INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_LIST_DIR}/../../include/"
diff --git a/external_imported/vcpkg/ports/node-addon-api/vcpkg.json b/external_imported/vcpkg/ports/node-addon-api/vcpkg.json
index b1a236d1d..74a31d37a 100644
--- a/external_imported/vcpkg/ports/node-addon-api/vcpkg.json
+++ b/external_imported/vcpkg/ports/node-addon-api/vcpkg.json
@@ -1,12 +1,12 @@
 {
   "name": "node-addon-api",
-  "version": "6.0.0",
+  "version": "7.0.0",
   "description": "Module for using Node-API from C++",
   "homepage": "https://github.com/nodejs/node-addon-api",
   "license": "MIT",
   "supports": "((windows & !arm) | linux | osx) & !uwp",
   "dependencies": [
-    "node-api",
+    "node-api-headers",
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/external_imported/vcpkg/ports/node-api-headers/CMakeLists.txt b/external_imported/vcpkg/ports/node-api-headers/CMakeLists.txt
new file mode 100644
index 000000000..836055540
--- /dev/null
+++ b/external_imported/vcpkg/ports/node-api-headers/CMakeLists.txt
@@ -0,0 +1,15 @@
+project(nodelib C)
+
+add_custom_target(nodelib ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/node.lib)
+add_custom_command(
+  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/node.lib
+  COMMAND ${CMAKE_AR}
+          /def:${CMAKE_CURRENT_SOURCE_DIR}/def/node_api.def
+          /out:${CMAKE_CURRENT_BINARY_DIR}/node.lib
+          ${CMAKE_STATIC_LINKER_FLAGS}
+          $<$<CONFIG:Debug>:${CMAKE_STATIC_LINKER_FLAGS_DEBUG}>
+          $<$<CONFIG:Release>:${CMAKE_STATIC_LINKER_FLAGS_RELEASE}>
+  COMMENT "Building import library for NodeJS"
+)
+
+install(FILES ${CMAKE_BINARY_DIR}/node.lib DESTINATION lib)
diff --git a/external_imported/vcpkg/ports/node-api-headers/portfile.cmake b/external_imported/vcpkg/ports/node-api-headers/portfile.cmake
new file mode 100644
index 000000000..0d01ee222
--- /dev/null
+++ b/external_imported/vcpkg/ports/node-api-headers/portfile.cmake
@@ -0,0 +1,21 @@
+vcpkg_from_github(
+  OUT_SOURCE_PATH SOURCE_PATH
+  REPO nodejs/node-api-headers
+  REF "v${VERSION}"
+  SHA512 70871b8fd1fc16f3f525953fd229ceff99110fb604f039e35e44f21d74aa9d50d2d3be1eadc5700bf576fd27e750c71868b273277858195fb6c5739672d4455e
+  HEAD_REF main
+)
+
+if(VCPKG_TARGET_IS_WINDOWS)
+  file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
+  vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}")
+  vcpkg_cmake_install()
+endif()
+
+file(INSTALL "${SOURCE_PATH}/include" DESTINATION "${CURRENT_PACKAGES_DIR}/include" RENAME "node")
+
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+
+configure_file("${CMAKE_CURRENT_LIST_DIR}/unofficial-${PORT}-config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake" @ONLY)
diff --git a/external_imported/vcpkg/ports/node-api-headers/unofficial-node-api-headers-config.cmake.in b/external_imported/vcpkg/ports/node-api-headers/unofficial-node-api-headers-config.cmake.in
new file mode 100644
index 000000000..7eb5751fc
--- /dev/null
+++ b/external_imported/vcpkg/ports/node-api-headers/unofficial-node-api-headers-config.cmake.in
@@ -0,0 +1,41 @@
+if(NOT TARGET unofficial::node-api-headers::node-api-headers)
+  if(WIN32)
+    add_library(unofficial::node-api-headers::node-api-headers UNKNOWN IMPORTED)
+  else()
+    add_library(unofficial::node-api-headers::node-api-headers INTERFACE IMPORTED)
+  endif()
+
+  set(node-api-headers_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/../../include/node)
+
+  set_target_properties(unofficial::node-api-headers::node-api-headers PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES "${node-api-headers_INCLUDE_DIR}"
+  )
+
+  if(APPLE)
+    # setting those properties like cmake-js does
+    # https://github.com/cmake-js/cmake-js/blob/272ec1883bc1207205abae948022eecdea02e225/lib/toolset.js#L126
+    set_target_properties(unofficial::node-api-headers::node-api-headers PROPERTIES
+      INTERFACE_LINK_OPTIONS "LINKER:SHELL:-undefined dynamic_lookup"
+    )
+    set_target_properties(unofficial::node-api-headers::node-api-headers PROPERTIES
+      INTERFACE_COMPILE_DEFINITIONS "_DARWIN_USE_64_BIT_INODE=1;_LARGEFILE_SOURCE;_FILE_OFFSET_BITS=64"
+    )
+  endif()
+
+  set_property(TARGET unofficial::node-api-headers::node-api-headers APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS "BUILDING_NODE_EXTENSION")
+
+  if(WIN32)
+    find_library(node-api-headers_LIBRARY_RELEASE NAMES node PATHS "${CMAKE_CURRENT_LIST_DIR}/../../lib" NO_DEFAULT_PATH REQUIRED)
+    set_target_properties(unofficial::node-api-headers::node-api-headers PROPERTIES
+      IMPORTED_LOCATION_RELEASE "${node-api-headers_LIBRARY_RELEASE}"
+      IMPORTED_CONFIGURATIONS RELEASE
+    )
+    if("@VCPKG_BUILD_TYPE@" STREQUAL "")
+      find_library(node-api-headers_LIBRARY_DEBUG NAMES node PATHS "${CMAKE_CURRENT_LIST_DIR}/../../debug/lib" NO_DEFAULT_PATH REQUIRED)
+      set_target_properties(unofficial::node-api-headers::node-api-headers PROPERTIES
+        IMPORTED_LOCATION_DEBUG "${node-api-headers_LIBRARY_DEBUG}"
+      )
+      set_property(TARGET unofficial::node-api-headers::node-api-headers APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
+    endif()
+  endif()
+endif()
diff --git a/external_imported/vcpkg/ports/node-api-headers/usage b/external_imported/vcpkg/ports/node-api-headers/usage
new file mode 100644
index 000000000..09bf0b37c
--- /dev/null
+++ b/external_imported/vcpkg/ports/node-api-headers/usage
@@ -0,0 +1,23 @@
+node-api-headers provides CMake targets:
+
+    find_package(unofficial-node-api-headers CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE unofficial::node-api-headers::node-api-headers)
+
+Add this to your CMakeLists.txt to build a Node.js addon:
+    add_library(addon SHARED main.cpp ...)
+    set_target_properties(addon PROPERTIES OUTPUT_NAME "my-addon" PREFIX "" SUFFIX ".node")
+
+    find_package(unofficial-node-api-headers CONFIG REQUIRED)
+    target_link_libraries(addon PRIVATE unofficial::node-api-headers::node-api-headers)
+
+You will be able to load your addon in JavaScript code:
+    const addon = require("/path/to/addon/my-addon.node");
+
+Make sure that your Node.js OS/architecture matches vcpkg triplet you use.
+
+Also, make sure to register a module in your C/C++ code like official example does:
+https://github.com/nodejs/node-addon-examples/blob/main/1_hello_world/napi/hello.c
+
+This port doesn't have specific functionality for publishing npm packages.
+
+See https://nodejs.org/api/n-api.html
diff --git a/external_imported/vcpkg/ports/node-api-headers/vcpkg.json b/external_imported/vcpkg/ports/node-api-headers/vcpkg.json
new file mode 100644
index 000000000..fb54df90e
--- /dev/null
+++ b/external_imported/vcpkg/ports/node-api-headers/vcpkg.json
@@ -0,0 +1,20 @@
+{
+  "name": "node-api-headers",
+  "version": "1.1.0",
+  "description": "NodeJS API for writing modules in C++",
+  "homepage": "https://nodejs.org/api/addons.html",
+  "license": "MIT",
+  "supports": "(windows & !arm & !uwp) | linux | osx",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true,
+      "platform": "windows"
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true,
+      "platform": "windows"
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/node-api/portfile.cmake b/external_imported/vcpkg/ports/node-api/portfile.cmake
deleted file mode 100644
index 53a4f17e8..000000000
--- a/external_imported/vcpkg/ports/node-api/portfile.cmake
+++ /dev/null
@@ -1,76 +0,0 @@
-set(SHA512 0)
-
-if(VCPKG_TARGET_IS_WINDOWS)
-  set(SHA512 ee66d0c03d2e48046a42616abf7639a3983e7db24c04d8643b9141cb9209a50643e31873c5a4918853a4344e822d653480558510a4db9a2ab481396891d79917)
-  set(DIST_URL "https://nodejs.org/dist/v${VERSION}/node-v${VERSION}-headers.tar.gz")
-  if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
-    vcpkg_download_distfile(
-      out_win_lib
-      URLS "https://nodejs.org/dist/v${VERSION}/win-x64/node.lib"
-      FILENAME "node.lib"
-      SHA512 95c4b053bf88f758b6124b4a576719901545485613767f1ab996bb019ea7bb0d303c511b357f830e5a14d463dd74c6b412f126103f21d12e31ca00c7de86d853
-    )
-  elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
-    vcpkg_download_distfile(
-      out_win_lib
-      URLS "https://nodejs.org/dist/v${VERSION}/win-x86/node.lib"
-      FILENAME "node.lib"
-      SHA512 0baa54a7870088a3290f817f6362446d304e8710ee36f99075925d110bce5c1eac377aa5c4ed6cf30161f98f39032d848eeb8d459add57b1c6458b8c91c72073
-    )
-  endif()
-elseif(VCPKG_TARGET_IS_OSX)
-  if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
-    set(SHA512 8eb1713afdce23b0e8408d81aa47b3ea0955de328105d666a57efef8955b286c707c107377cff36164d8455558829ab65567b9cbe5997085afc841d95128fcd5)
-    set(DIST_URL "https://nodejs.org/dist/v${VERSION}/node-v${VERSION}-darwin-arm64.tar.gz")
-  elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
-    set(SHA512 ffe7e878fd5e424b0ff0d2e7db5e9c02f283792df2f1a748bd6381226701bcd9f93ae48f88d295412afb10d1c924ca068f70aba9857236c8893a2b812eacf248)
-    set(DIST_URL "https://nodejs.org/dist/v${VERSION}/node-v${VERSION}-darwin-x64.tar.gz")
-  endif()
-elseif(VCPKG_TARGET_IS_LINUX)
-  if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
-    set(SHA512 f137a0dba52ded9f2f6b304c5f41fd2c75ba069ee31cfb89811b14254552c0d5ba10890f7001e64e8a6fee277302cb0ba915e0a417c047577384ac495c4ff447)
-    set(DIST_URL "https://nodejs.org/dist/v${VERSION}/node-v${VERSION}-linux-x64.tar.gz")
-  elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
-    set(SHA512 a0b2f522b0ecdc4b642f3104fd2eb08b8dfa6dc2b116b5a331722b8c6d96b2b6d5df0e691ef2b56e0463e1f30d37c98c686c5d306e1aa8cd927b306c4eef0770)
-    set(DIST_URL "https://nodejs.org/dist/v${VERSION}/node-v${VERSION}-linux-arm64.tar.gz")
-  endif()
-endif()
-
-get_filename_component(DIST_FILENAME "${DIST_URL}" NAME)
-
-if(out_win_lib)
-  # nodejs requires the same node.lib to be used for both debug and release builds
-  file(COPY "${out_win_lib}" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
-  file(COPY "${out_win_lib}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
-endif()
-
-# download dist
-vcpkg_download_distfile(
-  out_dist
-  URLS "${DIST_URL}"
-  FILENAME "${DIST_FILENAME}"
-  SHA512 "${SHA512}"
-)
-
-# extract dist
-vcpkg_extract_source_archive(
-  OUT_SOURCE_PATH
-  ARCHIVE "${out_dist}"
-)
-
-# copy headers
-set(suffix "include/node")
-set(source_path "${OUT_SOURCE_PATH}/${suffix}")
-file(COPY "${source_path}" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN "*.h")
-
-# we do not take the license from the dist file because for windows it is not included as we download the headers only
-set(license_url "https://raw.githubusercontent.com/nodejs/node/v${VERSION}/LICENSE")
-vcpkg_download_distfile(
-  out_license
-  URLS "${license_url}"
-  FILENAME "LICENSE"
-  SHA512 2d79b49a12178a078cf1246ef7589d127189914403cd6f4dfe277ced2b3ef441a6e6ee131f1c75f996d1c1528b7e1ae332e83c1dc44580b2b51a933ed0c50c48
-)
-file(INSTALL "${out_license}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-
-configure_file("${CMAKE_CURRENT_LIST_DIR}/unofficial-node-api-config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-node-api-config.cmake" @ONLY)
diff --git a/external_imported/vcpkg/ports/node-api/unofficial-node-api-config.cmake.in b/external_imported/vcpkg/ports/node-api/unofficial-node-api-config.cmake.in
deleted file mode 100644
index 452d76576..000000000
--- a/external_imported/vcpkg/ports/node-api/unofficial-node-api-config.cmake.in
+++ /dev/null
@@ -1,38 +0,0 @@
-if(NOT TARGET unofficial::node-api::node-api)
-  if(WIN32)
-    add_library(unofficial::node-api::node-api UNKNOWN IMPORTED)
-  else()
-    add_library(unofficial::node-api::node-api INTERFACE IMPORTED)
-  endif()
-
-  find_path(node-api_INCLUDE_DIR
-    NAMES node.h
-    PATHS "${CMAKE_CURRENT_LIST_DIR}/../../include/node"
-    NO_DEFAULT_PATH
-    REQUIRED
-  )
-  set_target_properties(unofficial::node-api::node-api PROPERTIES
-    INTERFACE_INCLUDE_DIRECTORIES "${node-api_INCLUDE_DIR}"
-  )
-
-  if(APPLE)
-    set_target_properties(unofficial::node-api::node-api PROPERTIES
-      INTERFACE_LINK_OPTIONS "LINKER:SHELL:-undefined dynamic_lookup"
-    )
-  endif()
-
-  if(WIN32)
-    find_library(node-api_LIBRARY_RELEASE NAMES node PATHS "${CMAKE_CURRENT_LIST_DIR}/../../lib" NO_DEFAULT_PATH REQUIRED)
-    set_target_properties(unofficial::node-api::node-api PROPERTIES
-      IMPORTED_LOCATION_RELEASE "${node-api_LIBRARY_RELEASE}"
-      IMPORTED_CONFIGURATIONS RELEASE
-    )
-    if("@VCPKG_BUILD_TYPE@" STREQUAL "")
-      find_library(node-api_LIBRARY_DEBUG NAMES node PATHS "${CMAKE_CURRENT_LIST_DIR}/../../debug/lib" NO_DEFAULT_PATH REQUIRED)
-      set_target_properties(unofficial::node-api::node-api PROPERTIES
-        IMPORTED_LOCATION_DEBUG "${node-api_LIBRARY_DEBUG}"
-      )
-      set_property(TARGET unofficial::node-api::node-api APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
-    endif()
-  endif()
-endif()
diff --git a/external_imported/vcpkg/ports/node-api/vcpkg.json b/external_imported/vcpkg/ports/node-api/vcpkg.json
deleted file mode 100644
index 1aa1c247f..000000000
--- a/external_imported/vcpkg/ports/node-api/vcpkg.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "name": "node-api",
-  "version-semver": "18.12.1",
-  "port-version": 2,
-  "description": "NodeJS API for writing modules in C++",
-  "homepage": "https://nodejs.org/api/addons.html",
-  "license": null,
-  "supports": "((windows & !arm) | linux | osx) & !uwp",
-  "dependencies": [
-    {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
-    }
-  ]
-}
diff --git a/external_imported/vcpkg/ports/nodesoup/fix-cmakelists.patch b/external_imported/vcpkg/ports/nodesoup/fix-cmakelists.patch
new file mode 100644
index 000000000..6ea933f57
--- /dev/null
+++ b/external_imported/vcpkg/ports/nodesoup/fix-cmakelists.patch
@@ -0,0 +1,28 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index be6aa9d..26e59f3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -34,7 +34,7 @@ install(
+   ARCHIVE DESTINATION lib
+   INCLUDES
+   DESTINATION include
+-  PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/nodesoup)
++  PUBLIC_HEADER DESTINATION include)
+ 
+ include(CMakePackageConfigHelpers)
+ write_basic_package_version_file(
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index dbd43b9..44164c9 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -5,7 +5,9 @@ add_library(nodesoup::nodesoup ALIAS nodesoup)
+ target_include_directories(
+   nodesoup
+   PUBLIC $<BUILD_INTERFACE:${nodesoup_SOURCE_DIR}/include>
+-  PRIVATE $<BUILD_INTERFACE:${nodesoup_SOURCE_DIR}/src>)
++         $<INSTALL_INTERFACE:include>
++  PRIVATE $<BUILD_INTERFACE:${nodesoup_SOURCE_DIR}/src>
++)
+ 
+ target_compile_features(nodesoup PUBLIC cxx_std_14)
+ 
diff --git a/external_imported/vcpkg/ports/nodesoup/portfile.cmake b/external_imported/vcpkg/ports/nodesoup/portfile.cmake
new file mode 100644
index 000000000..65f535320
--- /dev/null
+++ b/external_imported/vcpkg/ports/nodesoup/portfile.cmake
@@ -0,0 +1,27 @@
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO olvb/nodesoup
+    REF 3158ad082bb0cd1abee75418b12b35522dbca74f
+    SHA512 be98cd5a1106fb1b6e6cb6b880229f590c2d4c4cc176dcceb2e2226ff3f2344ccb4510fb3a0911e9329701af50f076ee2efb9a3afc9e985b4d9c3fb92c12102d
+    HEAD_REF master
+    PATCHES
+        fix-cmakelists.patch
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS 
+        -DBUILD_DEMO=OFF
+)
+
+vcpkg_cmake_install()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+vcpkg_cmake_config_fixup(PACKAGE_NAME nodesoup CONFIG_PATH lib/cmake/nodesoup)
+
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/nodesoup/" RENAME copyright)
+file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/nodesoup/")
diff --git a/external_imported/vcpkg/ports/nodesoup/usage b/external_imported/vcpkg/ports/nodesoup/usage
new file mode 100644
index 000000000..652f4dfda
--- /dev/null
+++ b/external_imported/vcpkg/ports/nodesoup/usage
@@ -0,0 +1,4 @@
+The package nodesoup provides CMake targets:
+
+    find_package(nodesoup CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE nodesoup::nodesoup)
diff --git a/external_imported/vcpkg/ports/nodesoup/vcpkg.json b/external_imported/vcpkg/ports/nodesoup/vcpkg.json
new file mode 100644
index 000000000..3b7951dda
--- /dev/null
+++ b/external_imported/vcpkg/ports/nodesoup/vcpkg.json
@@ -0,0 +1,16 @@
+{
+  "name": "nodesoup",
+  "version-date": "2023-06-12",
+  "description": "Force-directed graph layout with Fruchterman-Reingold",
+  "license": "Unlicense",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/nonius/vcpkg.json b/external_imported/vcpkg/ports/nonius/vcpkg.json
index 31b84d02c..ae3b517b0 100644
--- a/external_imported/vcpkg/ports/nonius/vcpkg.json
+++ b/external_imported/vcpkg/ports/nonius/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "nonius",
-  "version-string": "2019-04-20",
-  "port-version": 3,
+  "version-date": "2019-04-20",
+  "port-version": 4,
   "description": "A C++ micro-benchmarking framework",
   "dependencies": [
     "boost-algorithm",
diff --git a/external_imported/vcpkg/ports/nowide/portfile.cmake b/external_imported/vcpkg/ports/nowide/portfile.cmake
index e77c50855..c251db04d 100644
--- a/external_imported/vcpkg/ports/nowide/portfile.cmake
+++ b/external_imported/vcpkg/ports/nowide/portfile.cmake
@@ -1,11 +1,11 @@
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/boostorg/nowide/releases/download/v11.2.0/nowide_standalone_v11.2.0.tar.gz"
-    FILENAME "nowide_standalone_v11.2.0.tar.gz"
-    SHA512 c3748921b85648aa0e89970f2ab24588cbc72d05edd7ddf4f61a607d9ecbddd45e9e6799d2ed83386c43045b9487693e027494a81b11a6a7bdfaa939d1251938
+    URLS "https://github.com/boostorg/nowide/releases/download/v${VERSION}/nowide_standalone_v${VERSION}.tar.gz"
+    FILENAME "nowide_standalone_v${VERSION}.tar.gz"
+    SHA512 68e4d4b11db7265bf91e90b16e35ef2ea3a8ad80031b122067393a4cb89e20e26bacff81c7abddfc7a84d22c0d545875d7ba40b0288c665fb82028f08f957524
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE ${ARCHIVE}
 )
 
@@ -20,4 +20,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/nowide)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/nowide/vcpkg.json b/external_imported/vcpkg/ports/nowide/vcpkg.json
index ec60ea01c..311b6e35e 100644
--- a/external_imported/vcpkg/ports/nowide/vcpkg.json
+++ b/external_imported/vcpkg/ports/nowide/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "nowide",
-  "version": "11.2.0",
+  "version": "11.3.0",
   "description": "Boost nowide module (standalone)",
   "homepage": "https://github.com/boostorg/nowide",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/nrf-ble-driver/gcc-11.2.0-compilation.patch b/external_imported/vcpkg/ports/nrf-ble-driver/gcc-11.2.0-compilation.patch
new file mode 100644
index 000000000..5fc659e34
--- /dev/null
+++ b/external_imported/vcpkg/ports/nrf-ble-driver/gcc-11.2.0-compilation.patch
@@ -0,0 +1,22 @@
+From 00791acc7c23ac2421102edd42a7fa562cc98bfd Mon Sep 17 00:00:00 2001
+From: Krzysztof Rosinski <krzysiek@jrdltd.co.uk>
+Date: Wed, 29 Dec 2021 09:47:40 +0100
+Subject: [PATCH] fix compilation issue (gcc-11.2.0)
+
+error: 'sleep_for' is not a member of 'std::this_thread'
+---
+ src/common/transport/uart_transport.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/common/transport/uart_transport.cpp b/src/common/transport/uart_transport.cpp
+index 1f063ff2..96e045fb 100644
+--- a/src/common/transport/uart_transport.cpp
++++ b/src/common/transport/uart_transport.cpp
+@@ -45,6 +45,7 @@
+ #include <mutex>
+ #include <sstream>
+ #include <system_error>
++#include <thread>
+ 
+ #if defined(__APPLE__)
+ #include <IOKit/serial/ioss.h>
diff --git a/external_imported/vcpkg/ports/nrf-ble-driver/portfile.cmake b/external_imported/vcpkg/ports/nrf-ble-driver/portfile.cmake
index 0cc7a6834..ad997c971 100644
--- a/external_imported/vcpkg/ports/nrf-ble-driver/portfile.cmake
+++ b/external_imported/vcpkg/ports/nrf-ble-driver/portfile.cmake
@@ -9,12 +9,13 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO NordicSemiconductor/pc-ble-driver
-    REF v4.1.4
-    SHA512 8f35e757dddc27c9b11cdb3b9920562bbe09ceac715d65957e56ec8479e8ffedf12df2f976e484ed0d24b9325d9ef2b8ad6576cccefd2de8d7fa6fa8d58b03e5
+    REF v${VERSION}-hex
+    SHA512 1e8b5882aa3754a29a8f0ec11b8e70390db7ddf7bc50e1318adaaf4cd1ba2b787129d8003f8076ad39c35ec887ef3aeadbcb23fa5100b2be24956d118370cb84
     HEAD_REF master
     PATCHES
         001-arm64-support.patch
         support-arm64-osx.diff # from https://github.com/NordicSemiconductor/pc-ble-driver/pull/271
+        gcc-11.2.0-compilation.patch # from https://github.com/NordicSemiconductor/pc-ble-driver/pull/272
 )
 
 # Ensure that git is found within CMakeLists.txt by appending vcpkg's git executable dirpath to $PATH.
@@ -34,8 +35,8 @@ vcpkg_cmake_configure(
     OPTIONS
         -DDISABLE_EXAMPLES=ON
         -DDISABLE_TESTS=ON
-        -DNRF_BLE_DRIVER_VERSION=4.1.2
-        -DCONNECTIVITY_VERSION=4.1.2
+        -DNRF_BLE_DRIVER_VERSION=${VERSION}
+        -DCONNECTIVITY_VERSION=${VERSION}
         ${OPTIONS}
     MAYBE_UNUSED_VARIABLES
         DISABLE_EXAMPLES
diff --git a/external_imported/vcpkg/ports/nrf-ble-driver/vcpkg.json b/external_imported/vcpkg/ports/nrf-ble-driver/vcpkg.json
index 7db000b64..fac748f0e 100644
--- a/external_imported/vcpkg/ports/nrf-ble-driver/vcpkg.json
+++ b/external_imported/vcpkg/ports/nrf-ble-driver/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "nrf-ble-driver",
   "version": "4.1.4",
+  "port-version": 1,
   "description": "BLE driver is a library for Bluetooth Low Energy communication using Nordic Semiconductor development kits.",
   "homepage": "https://github.com/NordicSemiconductor/pc-ble-driver",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/nspr/portfile.cmake b/external_imported/vcpkg/ports/nspr/portfile.cmake
index a7ecaafe9..5735dede5 100644
--- a/external_imported/vcpkg/ports/nspr/portfile.cmake
+++ b/external_imported/vcpkg/ports/nspr/portfile.cmake
@@ -5,10 +5,10 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 502815833116e25f79ddf71d1526484908aa92fbc55f8a892729cb404a4daafcc0470a89854cd080d2d20299fdb7d9662507c5362c7ae661cbacf308ac56ef7f
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE ${ARCHIVE}
-    REF "${VERSION}"
+    SOURCE_BASE "${VERSION}"
 )
 
 set(MOZBUILD_ROOT "${CURRENT_HOST_INSTALLED_DIR}/tools/mozbuild")
diff --git a/external_imported/vcpkg/ports/nspr/vcpkg.json b/external_imported/vcpkg/ports/nspr/vcpkg.json
index c051100fc..8d5c7115e 100644
--- a/external_imported/vcpkg/ports/nspr/vcpkg.json
+++ b/external_imported/vcpkg/ports/nspr/vcpkg.json
@@ -1,11 +1,11 @@
 {
   "name": "nspr",
   "version": "4.35",
-  "port-version": 2,
+  "port-version": 4,
   "description": "Netscape portable runtime",
   "homepage": "https://releases.mozilla.org/pub/nspr/",
   "license": "MPL-2.0",
-  "supports": "windows & !(arm | uwp | static)",
+  "supports": "windows & !(arm | uwp | static | xbox)",
   "dependencies": [
     {
       "name": "vcpkg-tool-mozbuild",
diff --git a/external_imported/vcpkg/ports/nss/portfile.cmake b/external_imported/vcpkg/ports/nss/portfile.cmake
index 80a71c67c..3e39dd0fe 100644
--- a/external_imported/vcpkg/ports/nss/portfile.cmake
+++ b/external_imported/vcpkg/ports/nss/portfile.cmake
@@ -7,10 +7,10 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 4ec7b94e537df109638b821f3a7e3b7bf31d89c3739a6e4c85cad4fab876390ae482971d6f66198818400f467661e86f39dc1d2a4a88077fd81e3a0b7ed64110
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE ${ARCHIVE}
-    REF "${VERSION}"
+    SOURCE_BASE "${VERSION}"
     PATCHES
         "01-nspr-no-lib-prefix.patch"
         "02-gen-debug-info-for-release.patch"
diff --git a/external_imported/vcpkg/ports/nss/vcpkg.json b/external_imported/vcpkg/ports/nss/vcpkg.json
index 0d5452dd6..434917cf2 100644
--- a/external_imported/vcpkg/ports/nss/vcpkg.json
+++ b/external_imported/vcpkg/ports/nss/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "nss",
   "version": "3.87",
+  "port-version": 2,
   "description": "Network Security Services from Mozilla",
   "homepage": "https://ftp.mozilla.org/pub/security/nss/releases/",
   "license": "MPL-2.0",
-  "supports": "windows & !arm",
+  "supports": "windows & !arm & !xbox",
   "dependencies": [
     "nspr",
     "sqlite3",
diff --git a/external_imported/vcpkg/ports/nsync/portfile.cmake b/external_imported/vcpkg/ports/nsync/portfile.cmake
index fe2ff4d51..d927e6308 100644
--- a/external_imported/vcpkg/ports/nsync/portfile.cmake
+++ b/external_imported/vcpkg/ports/nsync/portfile.cmake
@@ -5,8 +5,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/nsync
-    REF 1.24.0
-    SHA512 14dd582488072123a353c967664ed9a3f636865bb35e64d7256dcc809539129fa47c7979a4009fd45c9341cac537a4ca6b4b617ba2cae1d3995a7c251376339f
+    REF "${VERSION}"
+    SHA512 8aa49997f100f161f0f32e99c9004ee845d7b16c1391e7eb62eea0897e2f91b7f9e5181055fdca637518751b6b26e16a1cd53e45adceda145285752c4b74f3bf
     HEAD_REF master
     PATCHES
         fix-install.patch
diff --git a/external_imported/vcpkg/ports/nsync/vcpkg.json b/external_imported/vcpkg/ports/nsync/vcpkg.json
index 54c24f43f..2ec424eec 100644
--- a/external_imported/vcpkg/ports/nsync/vcpkg.json
+++ b/external_imported/vcpkg/ports/nsync/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "nsync",
-  "version": "1.24.0",
-  "port-version": 1,
+  "version": "1.26.0",
   "description": "nsync is a C library that exports various synchronization primitives, such as mutexes",
   "homepage": "https://github.com/google/nsync",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/nt-wrapper/vcpkg.json b/external_imported/vcpkg/ports/nt-wrapper/vcpkg.json
index 8f3403076..eef5e82c3 100644
--- a/external_imported/vcpkg/ports/nt-wrapper/vcpkg.json
+++ b/external_imported/vcpkg/ports/nt-wrapper/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "nt-wrapper",
-  "version-string": "2019-08-10",
-  "port-version": 2,
+  "version-date": "2019-08-10",
+  "port-version": 3,
   "description": "A header only wrapper library around native windows system APIs",
   "homepage": "https://github.com/JustasMasiulis/nt_wrapper",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/ntf-core/dont-use-lib64.patch b/external_imported/vcpkg/ports/ntf-core/dont-use-lib64.patch
new file mode 100644
index 000000000..89cd0dae4
--- /dev/null
+++ b/external_imported/vcpkg/ports/ntf-core/dont-use-lib64.patch
@@ -0,0 +1,17 @@
+diff --git a/repository.cmake b/repository.cmake
+index 9b6c699..ed2ce32 100644
+--- a/repository.cmake
++++ b/repository.cmake
+@@ -1737,11 +1737,7 @@ function (ntf_group_end)
+ 
+     ntf_ufid_string_has(UFID ${build_ufid} FLAG "64" OUTPUT is_64_bit)
+ 
+-    if (${is_64_bit} AND NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
+-        set(lib_name "lib64" CACHE INTERNAL "")
+-    else()
+-        set(lib_name "lib" CACHE INTERNAL "")
+-    endif()
++    set(lib_name "lib" CACHE INTERNAL "")
+ 
+     # Set the relative path to the library directory under the prefix. For
+     # example: lib64
diff --git a/external_imported/vcpkg/ports/ntf-core/portfile.cmake b/external_imported/vcpkg/ports/ntf-core/portfile.cmake
new file mode 100644
index 000000000..569f8d922
--- /dev/null
+++ b/external_imported/vcpkg/ports/ntf-core/portfile.cmake
@@ -0,0 +1,71 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO bloomberg/ntf-core
+    REF "${VERSION}"
+    SHA512 57662d2dd105b2781e580623c26cd7bde84fce8374bbd70c18595a5f6934869b7a570f0d3c2e17e115f6c7eb1067541f8d19523639815b285324061f807d3179
+    HEAD_REF main
+    PATCHES dont-use-lib64.patch
+)
+
+# ntf-core requires debugger information to for dev tooling purposes, so we just fake it
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS "-DNTF_BUILD_WITH_USAGE_EXAMPLES=0"
+            "-DNTF_TOOLCHAIN_DEBUGGER_PATH=NOT-FOUND"
+)
+
+vcpkg_cmake_build()
+
+vcpkg_cmake_install()
+
+function(fix_pkgconfig_ufid lib_dir ufid pc_name)
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/${lib_dir}/pkgconfig/${pc_name}.pc" "/${ufid}" "")
+    if ("${ufid}" MATCHES opt)
+        set(build_mode "release")
+    else()
+        set(build_mode "debug")
+    endif()
+
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/${lib_dir}/cmake/${pc_name}Targets-${build_mode}.cmake" "/${ufid}" "")
+endfunction()
+
+function(fix_install_dir lib_dir ufid)
+    message(STATUS "Fixing ufid layout for ${CURRENT_PACKAGES_DIR}/${lib_dir}/${ufid}")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/${lib_dir}/${ufid}" "${CURRENT_PACKAGES_DIR}/tmp")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/${lib_dir}")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/tmp" "${CURRENT_PACKAGES_DIR}/${lib_dir}")
+
+    fix_pkgconfig_ufid("${lib_dir}" "${ufid}" "nts")
+    fix_pkgconfig_ufid("${lib_dir}" "${ufid}" "ntc")
+endfunction()
+
+fix_install_dir("lib" "opt_exc_mt")
+fix_install_dir("debug/lib" "dbg_exc_mt")
+
+# The ntf-core build installs CMake configs for both targets into share/ntf-core, which
+# find_package will not be able to find on its own. We use vcpkg_cmake_config_fixup to install
+# CMake configs into share/nts, and then move the ntc CMake configs into share/ntc with this
+# function.
+function(ntf_core_fixup_ntc_config)
+    set(nts_share "${CURRENT_PACKAGES_DIR}/share/nts")
+    set(ntc_share "${CURRENT_PACKAGES_DIR}/share/ntc")
+    file(GLOB ntc_configs "${nts_share}/ntc*.cmake")
+    file(MAKE_DIRECTORY "${ntc_share}")
+    foreach(ntc_config IN LISTS ntc_configs)
+        file(RELATIVE_PATH ntc_config_rel "${nts_share}" "${ntc_config}")
+        file(RENAME "${ntc_config}" "${ntc_share}/${ntc_config_rel}")
+    endforeach()
+endfunction()
+
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake" PACKAGE_NAME nts)
+ntf_core_fixup_ntc_config()
+
+# Handle copyright
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+vcpkg_fixup_pkgconfig()
+
+# Usage
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
diff --git a/external_imported/vcpkg/ports/ntf-core/usage b/external_imported/vcpkg/ports/ntf-core/usage
new file mode 100644
index 000000000..e20af2f2f
--- /dev/null
+++ b/external_imported/vcpkg/ports/ntf-core/usage
@@ -0,0 +1,9 @@
+The package ntf-core provides the CMake targets:
+
+    # Blocking and non-blocking sockets for network programming
+    find_package(nts CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE nts)
+
+    # Asynchronous sockets, timers, event loops, and thread pools for network programming
+    find_package(ntc CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE ntc)
diff --git a/external_imported/vcpkg/ports/ntf-core/vcpkg.json b/external_imported/vcpkg/ports/ntf-core/vcpkg.json
new file mode 100644
index 000000000..13b983626
--- /dev/null
+++ b/external_imported/vcpkg/ports/ntf-core/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "ntf-core",
+  "version": "2.1.0",
+  "port-version": 1,
+  "description": "The Network Transport Framework: Core Libraries",
+  "license": "Apache-2.0",
+  "dependencies": [
+    "bde",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/nu-book-zxing-cpp/portfile.cmake b/external_imported/vcpkg/ports/nu-book-zxing-cpp/portfile.cmake
index 5082d532d..cb7017f06 100644
--- a/external_imported/vcpkg/ports/nu-book-zxing-cpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/nu-book-zxing-cpp/portfile.cmake
@@ -3,23 +3,16 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO zxing-cpp/zxing-cpp
-    REF v2.0.0
-    SHA512 fa22164f834a42194eafd0d3e9c09d953233c69843ac6e79c8d6513314be28d8082382b436c379368e687e0eed05cb5e566d2893ec6eb29233a36643904ae083
+    REF "v${VERSION}"
+    SHA512 a00778c1fb7bb664176f7035aa96db4bab3e7ca28b5be2862182cb591d18edd4c3dfcbd34b4af08e0797bb4af893299d523f98aa84d266b68e4c766410e2e26d
     HEAD_REF master
 )
 
-if (VCPKG_TARGET_IS_UWP)
-   set(ENV{CL} "$ENV{CL} -wd4996")
-endif()
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DBUILD_BLACKBOX_TESTS=OFF
         -DBUILD_EXAMPLES=OFF
-        -DBUILD_SYSTEM_DEPS=ALWAYS
-    MAYBE_UNUSED_VARIABLES
-        # Currently no dependencies, but this defends against future additions
-        BUILD_SYSTEM_DEPS
 )
 
 vcpkg_cmake_install()
@@ -31,6 +24,12 @@ vcpkg_cmake_config_fixup(
     PACKAGE_NAME ZXing
 )
 
+file(READ "${CURRENT_PACKAGES_DIR}/share/ZXing/ZXingConfig.cmake" _contents)
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/ZXing/ZXingConfig.cmake" "
+include(CMakeFindDependencyMacro)
+find_dependency(Threads)
+${_contents}")
+
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/nu-book-zxing-cpp" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/nu-book-zxing-cpp/vcpkg.json b/external_imported/vcpkg/ports/nu-book-zxing-cpp/vcpkg.json
index 7bc783a75..6b0230058 100644
--- a/external_imported/vcpkg/ports/nu-book-zxing-cpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/nu-book-zxing-cpp/vcpkg.json
@@ -1,10 +1,9 @@
 {
   "name": "nu-book-zxing-cpp",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "Barcode detection and decoding library.",
   "homepage": "https://github.com/zxing-cpp/zxing-cpp",
   "license": "Apache-2.0",
-  "supports": "!uwp",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/numactl/portfile.cmake b/external_imported/vcpkg/ports/numactl/portfile.cmake
index 17a058022..77e835131 100644
--- a/external_imported/vcpkg/ports/numactl/portfile.cmake
+++ b/external_imported/vcpkg/ports/numactl/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO numactl/numactl
-    REF v2.0.14
-    SHA512 ADAF405F092FD9653F26D00F8C80CB83852C56EBD5D00E714E20D505008E74AA7105B0FB7AA55A605DEAC0D1491CEFF57DE931037D33E7944FCA105BC6510ED4
+    REF "v${VERSION}"
+    SHA512 a2a76170b673b334c3f456a52b87d4991ac8e117934230e4594dba221354d38d03ba80c91d6d43a15bc5e9e31b30c94211061552710a671aa39a1318ec2fab88
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/numactl/vcpkg.json b/external_imported/vcpkg/ports/numactl/vcpkg.json
index 267e8300d..f51b3504d 100644
--- a/external_imported/vcpkg/ports/numactl/vcpkg.json
+++ b/external_imported/vcpkg/ports/numactl/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "numactl",
-  "version": "2.0.14",
-  "port-version": 1,
+  "version": "2.0.17",
   "description": "NUMA support for Linux",
   "homepage": "https://github.com/numactl/numactl",
   "supports": "linux"
diff --git a/external_imported/vcpkg/ports/numcpp/portfile.cmake b/external_imported/vcpkg/ports/numcpp/portfile.cmake
index e2dce207f..7abb36edb 100644
--- a/external_imported/vcpkg/ports/numcpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/numcpp/portfile.cmake
@@ -2,8 +2,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO dpilger26/NumCpp
-    REF Version_2.6.0
-    SHA512 4D057941F4CB541CFAA56E4188C865DFC1804CA1B2203422B9EB7D7E8EE43CCB15DC5109DA5C932234E6055B6A5554D877347FA7CAEC5EA619A2975A56D2B16C
+    REF "Version_${VERSION}"
+    SHA512 ab038f74d7aa4836de4da3f8613cbabf0c1205f40ee9bf3de9692e8a943b16846a006d5885e2ddb22f9b893256dc4761994ad70f0fb5e8cf14612bc08644b30d
     HEAD_REF master
 )
 
@@ -17,4 +17,4 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME NumCpp CONFIG_PATH share/NumCpp/cmake)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/numcpp/vcpkg.json b/external_imported/vcpkg/ports/numcpp/vcpkg.json
index d93591882..4129b4547 100644
--- a/external_imported/vcpkg/ports/numcpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/numcpp/vcpkg.json
@@ -1,11 +1,13 @@
 {
   "name": "numcpp",
-  "version": "2.6.0",
+  "version": "2.12.1",
   "description": "C++ implementation of the Python Numpy library",
   "homepage": "https://dpilger26.github.io/NumCpp",
   "license": "MIT",
   "dependencies": [
+    "boost",
     "boost-algorithm",
+    "boost-date-time",
     "boost-endian",
     "boost-integer",
     "boost-math",
diff --git a/external_imported/vcpkg/ports/nuspell/portfile.cmake b/external_imported/vcpkg/ports/nuspell/portfile.cmake
index 43b4d4c6a..b6649579c 100644
--- a/external_imported/vcpkg/ports/nuspell/portfile.cmake
+++ b/external_imported/vcpkg/ports/nuspell/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO nuspell/nuspell
-    REF v5.1.2
-    SHA512 138212ae5340836f0bc85d9d5327dc43ffdb1481ca72678b4619938b86c4c8e7c156eec1446f459636460a9015cd476031ad53d0979325e637ed97c19e2f87c8
+    REF "v${VERSION}"
+    SHA512 f4119b3fe5944be8f5bc35ccff8d7a93b0f4fa9f129bc97a7b96879a11b5b35bd714b41dd209267417e94c5fed45fd3a74b349f94424f4b90bde07d9694d1d7d
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/nuspell/vcpkg.json b/external_imported/vcpkg/ports/nuspell/vcpkg.json
index 389b56726..772563cf8 100644
--- a/external_imported/vcpkg/ports/nuspell/vcpkg.json
+++ b/external_imported/vcpkg/ports/nuspell/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "nuspell",
-  "version-semver": "5.1.2",
+  "version-semver": "5.1.4",
   "description": [
     "Nuspell is a fast and safe spelling checker software program.",
     "It is designed for languages with rich morphology and complex word compounding.",
@@ -8,6 +8,7 @@
   ],
   "homepage": "https://nuspell.github.io/",
   "license": "LGPL-3.0-or-later",
+  "supports": "!xbox",
   "dependencies": [
     "icu",
     {
diff --git a/external_imported/vcpkg/ports/nyan-lang/portfile.cmake b/external_imported/vcpkg/ports/nyan-lang/portfile.cmake
new file mode 100644
index 000000000..ded5706d5
--- /dev/null
+++ b/external_imported/vcpkg/ports/nyan-lang/portfile.cmake
@@ -0,0 +1,31 @@
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
+
+set(VERSION 0.3)
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO SFTtech/nyan
+    REF "v${VERSION}"
+    SHA512 53411795142aa2dfd197d4e550a9de4f2e68519426a228d7e9fe162e8f113886ae5febbceef8daa643c60a9089ede4b5c8dda9c136617357b58279cc732efba6
+    HEAD_REF master
+)
+
+vcpkg_find_acquire_program(FLEX)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        "-DFLEX_EXECUTABLE=${FLEX}"
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake)
+vcpkg_copy_tools(TOOL_NAMES nyancat AUTO_CLEAN)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_install_copyright(
+    FILE_LIST
+        "${SOURCE_PATH}/copying.md"
+        "${SOURCE_PATH}/legal/LGPLv3"
+        "${SOURCE_PATH}/legal/GPLv3"
+)
diff --git a/external_imported/vcpkg/ports/nyan-lang/vcpkg.json b/external_imported/vcpkg/ports/nyan-lang/vcpkg.json
new file mode 100644
index 000000000..3dcc1439d
--- /dev/null
+++ b/external_imported/vcpkg/ports/nyan-lang/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "nyan-lang",
+  "version": "0.3",
+  "description": "nyan is a data description language, It is a mixture of python, json, patch, wml, yaml and some new ideas.",
+  "homepage": "https://github.com/SFTtech/nyan",
+  "license": "LGPL-3.0-or-later",
+  "supports": "!osx & !static & !uwp",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/oatpp-sqlite/fix-usage.patch b/external_imported/vcpkg/ports/oatpp-sqlite/fix-usage.patch
new file mode 100644
index 000000000..eeec7adb3
--- /dev/null
+++ b/external_imported/vcpkg/ports/oatpp-sqlite/fix-usage.patch
@@ -0,0 +1,14 @@
+diff --git a/cmake/module-config.cmake.in b/cmake/module-config.cmake.in
+index 5cc12b0..5d94df8 100644
+--- a/cmake/module-config.cmake.in
++++ b/cmake/module-config.cmake.in
+@@ -1,5 +1,9 @@
+ @PACKAGE_INIT@
+ 
++include(CMakeFindDependencyMacro)
++find_dependency(oatpp CONFIG)
++find_dependency(unofficial-sqlite3 CONFIG)
++
+ if(NOT TARGET oatpp::@OATPP_MODULE_NAME@)
+     include("${CMAKE_CURRENT_LIST_DIR}/@OATPP_MODULE_NAME@Targets.cmake")
+ endif()
diff --git a/external_imported/vcpkg/ports/oatpp-sqlite/portfile.cmake b/external_imported/vcpkg/ports/oatpp-sqlite/portfile.cmake
index 81bd1a5e2..56727375d 100644
--- a/external_imported/vcpkg/ports/oatpp-sqlite/portfile.cmake
+++ b/external_imported/vcpkg/ports/oatpp-sqlite/portfile.cmake
@@ -8,6 +8,8 @@ vcpkg_from_github(
     REF ${OATPP_VERSION}
     SHA512 8a208145ee10ed858767b4b56c220b6befd83e6858759128103ce679b889e6218a95ed6627af5098e4d26367be8add82de26e1f1f8ef581b1913b8386f9d56de
     HEAD_REF master
+    PATCHES
+        fix-usage.patch
 )
 
 vcpkg_cmake_configure(
@@ -21,4 +23,4 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp-sqlite CONFIG_PATH lib/cmake/oatpp-s
 vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/oatpp-sqlite/vcpkg.json b/external_imported/vcpkg/ports/oatpp-sqlite/vcpkg.json
index c192d7b2e..1f7d8812e 100644
--- a/external_imported/vcpkg/ports/oatpp-sqlite/vcpkg.json
+++ b/external_imported/vcpkg/ports/oatpp-sqlite/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "oatpp-sqlite",
   "version": "1.3.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Oat++ SQLite adapter for Oat++ ORM.",
   "homepage": "https://github.com/oatpp/oatpp-sqlite",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/oatpp-zlib/fix-usage.patch b/external_imported/vcpkg/ports/oatpp-zlib/fix-usage.patch
new file mode 100644
index 000000000..c08afc711
--- /dev/null
+++ b/external_imported/vcpkg/ports/oatpp-zlib/fix-usage.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/module-utils.cmake b/cmake/module-utils.cmake
+index 8f1d35a..cade49d 100644
+--- a/cmake/module-utils.cmake
++++ b/cmake/module-utils.cmake
+@@ -5,7 +5,7 @@ macro(target_link_oatpp target)
+         message("target_link_oatpp(${target}) to installed oatpp lib")
+ 
+         target_link_libraries(${target}
+-                PRIVATE oatpp::oatpp
++                PUBLIC oatpp::oatpp
+                 PRIVATE oatpp::oatpp-test
+         )
+ 
diff --git a/external_imported/vcpkg/ports/oatpp-zlib/missing-find_dependency.patch b/external_imported/vcpkg/ports/oatpp-zlib/missing-find_dependency.patch
new file mode 100644
index 000000000..f1bdeaeb5
--- /dev/null
+++ b/external_imported/vcpkg/ports/oatpp-zlib/missing-find_dependency.patch
@@ -0,0 +1,14 @@
+diff --git a/cmake/module-config.cmake.in b/cmake/module-config.cmake.in
+index 5cc12b0..71f8f10 100644
+--- a/cmake/module-config.cmake.in
++++ b/cmake/module-config.cmake.in
+@@ -1,5 +1,9 @@
+ @PACKAGE_INIT@
+ 
++include(CMakeFindDependencyMacro)
++find_dependency(oatpp)
++find_dependency(ZLIB)
++
+ if(NOT TARGET oatpp::@OATPP_MODULE_NAME@)
+     include("${CMAKE_CURRENT_LIST_DIR}/@OATPP_MODULE_NAME@Targets.cmake")
+ endif()
diff --git a/external_imported/vcpkg/ports/oatpp-zlib/portfile.cmake b/external_imported/vcpkg/ports/oatpp-zlib/portfile.cmake
index fc141336c..69e01063c 100644
--- a/external_imported/vcpkg/ports/oatpp-zlib/portfile.cmake
+++ b/external_imported/vcpkg/ports/oatpp-zlib/portfile.cmake
@@ -8,6 +8,9 @@ vcpkg_from_github(
     REF ${OATPP_VERSION}
     SHA512 574f0440cbb2cd2bc14ad89e33538a1a300ad23ecc941629b74aa8ccb9aeae5158b1b57e2f1af09d7a6b9b97430a5685354677002dab2261120afa9c6ea74381
     HEAD_REF master
+    PATCHES
+        missing-find_dependency.patch
+        fix-usage.patch
 )
 
 vcpkg_cmake_configure(
diff --git a/external_imported/vcpkg/ports/oatpp-zlib/vcpkg.json b/external_imported/vcpkg/ports/oatpp-zlib/vcpkg.json
index 6e4049a1e..d1b17cb37 100644
--- a/external_imported/vcpkg/ports/oatpp-zlib/vcpkg.json
+++ b/external_imported/vcpkg/ports/oatpp-zlib/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "oatpp-zlib",
   "version": "1.3.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Oat++ functionality for automatically compressing/decompressing content with deflate and gzip.",
   "homepage": "https://github.com/oatpp/oatpp-zlib",
   "license": "Apache-2.0",
@@ -14,6 +14,7 @@
     {
       "name": "vcpkg-cmake-config",
       "host": true
-    }
+    },
+    "zlib"
   ]
 }
diff --git a/external_imported/vcpkg/ports/oatpp/fix-target.patch b/external_imported/vcpkg/ports/oatpp/fix-target.patch
new file mode 100644
index 000000000..e2e40c729
--- /dev/null
+++ b/external_imported/vcpkg/ports/oatpp/fix-target.patch
@@ -0,0 +1,12 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 13cccc2c..c4a3fe44 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -301,6 +301,7 @@ set_target_properties(oatpp PROPERTIES
+         CXX_EXTENSIONS OFF
+         CXX_STANDARD_REQUIRED ON
+ )
++target_compile_features(oatpp PUBLIC cxx_std_11)
+ if (MSVC)
+     target_compile_options(oatpp PRIVATE /permissive-)
+ endif()
diff --git a/external_imported/vcpkg/ports/oatpp/portfile.cmake b/external_imported/vcpkg/ports/oatpp/portfile.cmake
index 1e4a62583..202929b65 100644
--- a/external_imported/vcpkg/ports/oatpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/oatpp/portfile.cmake
@@ -8,6 +8,8 @@ vcpkg_from_github(
     REF ${OATPP_VERSION}
     SHA512 4fe8587efe1b4ecae14554ec8edb209e5558a3e4a4e6ff49bbfaaf06d2cc12f2cc306c5edc43b8dafc465aff53098ad4bebb9971694761b91a553730d5acb59a
     HEAD_REF master
+    PATCHES
+        fix-target.patch
 )
 
 if (VCPKG_CRT_LINKAGE STREQUAL "static")
diff --git a/external_imported/vcpkg/ports/oatpp/vcpkg.json b/external_imported/vcpkg/ports/oatpp/vcpkg.json
index 13495e4c6..92c799fe5 100644
--- a/external_imported/vcpkg/ports/oatpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/oatpp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "oatpp",
   "version": "1.3.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Modern web framework.",
   "homepage": "https://github.com/oatpp/oatpp",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/oboe/fix_install.patch b/external_imported/vcpkg/ports/oboe/fix_install.patch
new file mode 100644
index 000000000..6916a3206
--- /dev/null
+++ b/external_imported/vcpkg/ports/oboe/fix_install.patch
@@ -0,0 +1,16 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3e3af59..aeac85d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -94,8 +94,8 @@ target_link_libraries(oboe PRIVATE log OpenSLES)
+ 
+ # When installing oboe put the libraries in the lib/<ABI> folder e.g. lib/arm64-v8a
+ install(TARGETS oboe
+-        LIBRARY DESTINATION lib/${ANDROID_ABI}
+-        ARCHIVE DESTINATION lib/${ANDROID_ABI})
++        LIBRARY DESTINATION lib
++        ARCHIVE DESTINATION lib)
+ 
+ # Also install the headers
+ install(DIRECTORY include/oboe DESTINATION include)
+
diff --git a/external_imported/vcpkg/ports/oboe/portfile.cmake b/external_imported/vcpkg/ports/oboe/portfile.cmake
new file mode 100644
index 000000000..e6aecf1e4
--- /dev/null
+++ b/external_imported/vcpkg/ports/oboe/portfile.cmake
@@ -0,0 +1,20 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO google/oboe
+    REF ${VERSION}
+    SHA512 7eeaf85f9889e03dd1e7f5de0e9f2cee815fc555fddfdb8c4d3450d67f6ae11b0ca43b63c73e869bfc4629d2f8e5bdb23a5833c665ca5226c339f74b9b34a8ad
+    HEAD_REF master
+    PATCHES
+        fix_install.patch
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH ${SOURCE_PATH}
+    OPTIONS
+)
+
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/oboe/vcpkg.json b/external_imported/vcpkg/ports/oboe/vcpkg.json
new file mode 100644
index 000000000..e06d124b6
--- /dev/null
+++ b/external_imported/vcpkg/ports/oboe/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "oboe",
+  "version": "1.8.0",
+  "description": "Oboe is a C++ library which makes it easy to build high-performance audio apps on Android",
+  "homepage": "https://developer.android.com/games/sdk/oboe",
+  "license": "Apache-2.0",
+  "supports": "android",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/observer-ptr-lite/vcpkg.json b/external_imported/vcpkg/ports/observer-ptr-lite/vcpkg.json
index cb8c34063..027ea5703 100644
--- a/external_imported/vcpkg/ports/observer-ptr-lite/vcpkg.json
+++ b/external_imported/vcpkg/ports/observer-ptr-lite/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "observer-ptr-lite",
-  "version-string": "0.4.0",
-  "port-version": 2,
+  "version": "0.4.0",
+  "port-version": 3,
   "description": "A C++17-like observer_ptr for C++98 and later in a single-file header-only library",
   "dependencies": [
     {
diff --git a/external_imported/vcpkg/ports/ocilib/portfile.cmake b/external_imported/vcpkg/ports/ocilib/portfile.cmake
index 9636902af..efb093d7b 100644
--- a/external_imported/vcpkg/ports/ocilib/portfile.cmake
+++ b/external_imported/vcpkg/ports/ocilib/portfile.cmake
@@ -2,31 +2,24 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO vrogier/ocilib
     REF "v${VERSION}"
-    SHA512 310c25fbe47ab59570103afdc6f4517b979d4077c77665c931592d95e8c706dcf34d5c2f10309a9971534499b2c4367efd05b25cdf8ebd4de15cb2c104059760
+    SHA512 5982b17d04ebbcb281848a998b3f2f35c5a83bc6d14cd6fecb8eef695300b577fb8dcc1377e9a8827587ac06d58441328cb0d55b19ae65788c2fce8da7ce702a
     HEAD_REF master
     PATCHES fix-DisableWC4191.patch
 )
 
 
 if(VCPKG_TARGET_IS_WINDOWS)
-    if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
-        set(PLATFORM x86)
-    else()
-        set(PLATFORM x64)
-    endif()
-
     # There is no debug configuration
     # As it is a C library, build the release configuration and copy its output to the debug folder
     set(VCPKG_BUILD_TYPE release)
-    vcpkg_install_msbuild(
+    vcpkg_msbuild_install(
         SOURCE_PATH "${SOURCE_PATH}"
         PROJECT_SUBPATH proj/dll/ocilib_dll.sln
-        INCLUDES_SUBPATH include
-        LICENSE_SUBPATH LICENSE
         RELEASE_CONFIGURATION "Release - ANSI"
-        PLATFORM ${PLATFORM}
-        USE_VCPKG_INTEGRATION
-        ALLOW_ROOT_INCLUDES)
+        PLATFORM ${VCPKG_TARGET_ARCHITECTURE}
+    )
+
+    file(COPY "${SOURCE_PATH}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
 
     file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug")
     file(COPY "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug")
@@ -48,5 +41,6 @@ else()
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
     file(RENAME "${CURRENT_PACKAGES_DIR}/share/doc/${PORT}" "${CURRENT_PACKAGES_DIR}/share/${PORT}")
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc")
-    file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 endif()
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/ocilib/vcpkg.json b/external_imported/vcpkg/ports/ocilib/vcpkg.json
index 2ed663e6c..6fe117b84 100644
--- a/external_imported/vcpkg/ports/ocilib/vcpkg.json
+++ b/external_imported/vcpkg/ports/ocilib/vcpkg.json
@@ -1,8 +1,15 @@
 {
   "name": "ocilib",
-  "version": "4.7.5",
+  "version": "4.7.6",
   "description": "OCILIB is an open source and cross platform Oracle Driver that delivers efficient access to Oracle databases.",
   "homepage": "https://vrogier.github.io/ocilib/",
   "license": "Apache-2.0",
-  "supports": "!(arm | uwp)"
+  "supports": "!uwp & !(arm & windows)",
+  "dependencies": [
+    {
+      "name": "vcpkg-msbuild",
+      "host": true,
+      "platform": "windows"
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/octomap/fix-compilation.patch b/external_imported/vcpkg/ports/octomap/fix-compilation.patch
new file mode 100644
index 000000000..ebb6e4a53
--- /dev/null
+++ b/external_imported/vcpkg/ports/octomap/fix-compilation.patch
@@ -0,0 +1,22 @@
+diff --git a/octomap/include/octomap/ScanGraph.h b/octomap/include/octomap/ScanGraph.h
+index 07c7436..e54eaf5 100644
+--- a/octomap/include/octomap/ScanGraph.h
++++ b/octomap/include/octomap/ScanGraph.h
+@@ -60,7 +60,7 @@ namespace octomap {
+ 
+     ~ScanNode();
+ 
+-    bool operator == (const ScanNode& other) {
++    bool operator == (const ScanNode& other) const {
+       return (id == other.id);
+     }
+ 
+@@ -87,7 +87,7 @@ namespace octomap {
+       : first(_first), second(_second), constraint(_constraint), weight(1.0) { }
+     ScanEdge() {}
+ 
+-    bool operator == (const ScanEdge& other) {
++    bool operator == (const ScanEdge& other) const {
+       return ( (*first == *(other.first) ) && ( *second == *(other.second) ) );
+     }
+ 
diff --git a/external_imported/vcpkg/ports/octomap/portfile.cmake b/external_imported/vcpkg/ports/octomap/portfile.cmake
index be17c875b..d820b3a41 100644
--- a/external_imported/vcpkg/ports/octomap/portfile.cmake
+++ b/external_imported/vcpkg/ports/octomap/portfile.cmake
@@ -3,11 +3,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO OctoMap/octomap
-    REF c4a4304895f6cfc31723dc95df252fe7e756a0ef # v1.9.6
-    SHA512 ec321a5355091acbd3d3fda7c858e2078c29195e73461c8a34db2c4614c6b2e38b35a59671f1071f7eb397cac4df78869f14a13af2e68d64e5a2e2d8727846cd
+    REF "v${VERSION}"
+    SHA512 60afeecc36a190f136dcbe33cb9cd6c06c16233988b383b0b010f65f81e6a3630b55902c5b5ad756ac35dee4c4ec26ec5722d6bd9b8e079f70b7d286293c518e
     HEAD_REF master
     PATCHES
-      "001-fix-exported-targets.patch"
+      001-fix-exported-targets.patch
+      fix-compilation.patch
 )
 
 vcpkg_cmake_configure(
@@ -38,7 +39,7 @@ endif()
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/octomap")
 
 # Handle copyright
-file(INSTALL "${SOURCE_PATH}/octomap/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/octomap/LICENSE.txt")
 
 vcpkg_copy_pdbs()
 
diff --git a/external_imported/vcpkg/ports/octomap/vcpkg.json b/external_imported/vcpkg/ports/octomap/vcpkg.json
index 7409ae814..f22b0e8f1 100644
--- a/external_imported/vcpkg/ports/octomap/vcpkg.json
+++ b/external_imported/vcpkg/ports/octomap/vcpkg.json
@@ -1,9 +1,11 @@
 {
   "name": "octomap",
-  "version": "1.9.6",
+  "version": "1.9.8",
+  "port-version": 1,
   "description": "An Efficient Probabilistic 3D Mapping Framework Based on Octrees",
   "homepage": "https://octomap.github.io/",
   "license": "BSD-3-Clause",
+  "supports": "!uwp",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/ode/portfile.cmake b/external_imported/vcpkg/ports/ode/portfile.cmake
index 1ee0f351e..f8a494cc0 100644
--- a/external_imported/vcpkg/ports/ode/portfile.cmake
+++ b/external_imported/vcpkg/ports/ode/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_bitbucket(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO odedevs/ode
     REF ${VERSION}
-    SHA512 3ea6245f622c5ca616cc4ae5e9877526c16d9174262fe107867a98b0976284d530ad71a97e5feac1fbfcc780bcd056330f47d3c9eb2bcc66e0696e17d54b93b1
+    SHA512 d253bc06bca85ed5af95e92acc57b5a9c4382393365c4a0c852a5872a4061ce1bff875a9121624276a60d74e919fb976c2a2b37864203f6c3bcd2def8af953c6
     HEAD_REF master
     PATCHES
 )
@@ -21,8 +21,11 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 else()
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/ode-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/..")
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/ode-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../..")
+    if(NOT VCPKG_BUILD_TYPE)
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/ode-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../..")
+    endif()
 endif()
+
 file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
diff --git a/external_imported/vcpkg/ports/ode/vcpkg.json b/external_imported/vcpkg/ports/ode/vcpkg.json
index 53a97893e..8ee139a10 100644
--- a/external_imported/vcpkg/ports/ode/vcpkg.json
+++ b/external_imported/vcpkg/ports/ode/vcpkg.json
@@ -1,9 +1,11 @@
 {
   "name": "ode",
-  "version": "0.16.3",
+  "version": "0.16.4",
+  "port-version": 1,
   "description": "Open Dynamics Engine",
   "homepage": "https://bitbucket.org/odedevs/ode/src/master/",
   "license": "BSD-3-Clause OR LGPL-2.1-or-later",
+  "supports": "!uwp",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/ogre-next/avoid-name-clashes.patch b/external_imported/vcpkg/ports/ogre-next/avoid-name-clashes.patch
new file mode 100644
index 000000000..300aa94cf
--- /dev/null
+++ b/external_imported/vcpkg/ports/ogre-next/avoid-name-clashes.patch
@@ -0,0 +1,15 @@
+diff --git a/CMake/FeatureSummary.cmake b/CMake/OgreFeatureSummary.cmake
+similarity index 100%
+rename from CMake/FeatureSummary.cmake
+rename to CMake/OgreFeatureSummary.cmake
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 800e956..436c3d3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -678,5 +678,5 @@ include(Packaging)
+ 
+ 
+ # Show feature summary
+-include(FeatureSummary)
++include(OgreFeatureSummary)
+ 
diff --git a/external_imported/vcpkg/ports/ogre-next/environment-overrides.cmake b/external_imported/vcpkg/ports/ogre-next/environment-overrides.cmake
deleted file mode 100644
index 4957cdcd5..000000000
--- a/external_imported/vcpkg/ports/ogre-next/environment-overrides.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-#[[
-
-Building steps for ogre-next[d3d9]:
-
-1. Download and install "Microsoft DirectX SDK"
-https://www.microsoft.com/en-us/download/confirmation.aspx?id=6812
-
-2. Set env variable
-set DXSDK_DIR=C:/Program Files (x86)/Microsoft DirectX SDK (June 2010)
-
-3. Install port
-.\vcpkg.exe install ogre-next[d3d9] --triplet x64-windows
-
-]]
-
-set(VCPKG_ENV_PASSTHROUGH DXSDK_DIR)
diff --git a/external_imported/vcpkg/ports/ogre-next/fix-dependencies.patch b/external_imported/vcpkg/ports/ogre-next/fix-dependencies.patch
new file mode 100644
index 000000000..06014fef8
--- /dev/null
+++ b/external_imported/vcpkg/ports/ogre-next/fix-dependencies.patch
@@ -0,0 +1,69 @@
+diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt
+index cdb097a..967d33b 100644
+--- a/CMake/CMakeLists.txt
++++ b/CMake/CMakeLists.txt
+@@ -21,9 +21,7 @@ endif()
+ set(OGRE_CMAKE_DIR "share/ogre-next")
+ 
+ set(INST_FILES
+-  Packages/FindRapidjson.cmake
+   Packages/FindRemotery.cmake
+-  Packages/FindSDL2.cmake
+   Packages/FindOGRE.cmake
+   Utils/FindPkgMacros.cmake
+   Utils/MacroLogFeature.cmake
+@@ -45,12 +43,8 @@ endif ()
+ 
+ set(STATIC_INST_FILES
+   Packages/FindDirectX.cmake
+-  Packages/FindFreeImage.cmake
+-  Packages/FindFreetype.cmake
+   Packages/FindOpenGLES.cmake
+   Packages/FindOpenGLES2.cmake
+-  Packages/FindZLIB.cmake
+-  Packages/FindZZip.cmake
+   Packages/FindSoftimage.cmake
+ )
+ if (WIN32)
+diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake
+index 74cb0f4..2cad26a 100644
+--- a/CMake/Dependencies.cmake
++++ b/CMake/Dependencies.cmake
+@@ -74,21 +74,24 @@ set(CMAKE_FRAMEWORK_PATH ${OGRE_DEP_SEARCH_PATH} ${CMAKE_FRAMEWORK_PATH})
+ #######################################################################
+ 
+ # Find zlib
+-find_package(ZLIB)
++find_package(ZLIB REQUIRED)
+ macro_log_feature(ZLIB_FOUND "zlib" "Simple data compression library" "http://www.zlib.net" FALSE "" "")
+ 
+ if (ZLIB_FOUND)
+   # Find zziplib
+-  find_package(ZZip)
++  find_package(ZZip NAMES unofficial-zziplib CONFIG REQUIRED)
++  set(ZZip_LIBRARIES unofficial::zziplib::libzzip)
+   macro_log_feature(ZZip_FOUND "zziplib" "Extract data from zip archives" "http://zziplib.sourceforge.net" FALSE "" "")
+ endif ()
+ 
+ # Find FreeImage
+-find_package(FreeImage)
++find_package(FreeImage NAMES freeimage REQUIRED)
++set(FreeImage_LIBRARIES freeimage::FreeImage)
+ macro_log_feature(FreeImage_FOUND "freeimage" "Support for commonly used graphics image formats" "http://freeimage.sourceforge.net" FALSE "" "")
+ 
+ # Find FreeType
+-find_package(Freetype)
++find_package(FREETYPE NAMES freetype REQUIRED)
++set(FREETYPE_LIBRARIES freetype)
+ macro_log_feature(FREETYPE_FOUND "freetype" "Portable font engine" "http://www.freetype.org" FALSE "" "")
+ 
+ find_package(Vulkan)
+@@ -105,7 +108,7 @@ if (UNIX AND NOT APPLE AND NOT ANDROID AND NOT EMSCRIPTEN)
+ endif ()
+ 
+ # Find rapidjson
+-find_package(Rapidjson)
++find_package(Rapidjson NAMES RapidJSON CONFIG REQUIRED)
+ macro_log_feature(Rapidjson_FOUND "rapidjson" "C++ JSON parser" "https://rapidjson.org/" FALSE "" "")
+ 
+ find_package(RenderDoc)
diff --git a/external_imported/vcpkg/ports/ogre-next/fix_find_package_sdl2.patch b/external_imported/vcpkg/ports/ogre-next/fix_find_package_sdl2.patch
deleted file mode 100644
index 47aa01afb..000000000
--- a/external_imported/vcpkg/ports/ogre-next/fix_find_package_sdl2.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake
-index 3f3e2d7..0cc9606 100644
---- a/CMake/Dependencies.cmake
-+++ b/CMake/Dependencies.cmake
-@@ -267,7 +267,7 @@ endif()
- #######################################################################
- 
- # Find sdl2
--find_package(SDL2)
-+find_package(SDL2 CONFIG REQUIRED)
- macro_log_feature(SDL2_FOUND "SDL2" "Simple DirectMedia Library" "https://www.libsdl.org/" FALSE "" "")
- 
- #######################################################################
-diff --git a/CMake/InstallDependencies.cmake b/CMake/InstallDependencies.cmake
-index f98b358..e5eb9ed 100644
---- a/CMake/InstallDependencies.cmake
-+++ b/CMake/InstallDependencies.cmake
-@@ -100,8 +100,6 @@ if (OGRE_INSTALL_DEPENDENCIES)
- 	endif ()
- 
- 	if( OGRE_BUILD_SAMPLES2 )
--	  install_debug(SDL2.dll)
--	  install_release(SDL2.dll)
- 	  install_debug(openvr_api.dll)
- 	  install_release(openvr_api.dll)
- 	  install_debug(openvr_api.pdb)
-diff --git a/CMake/Packages/FindSDL2.cmake b/CMake/Packages/FindSDL2.cmake
-index 4b42a51..793eb71 100644
---- a/CMake/Packages/FindSDL2.cmake
-+++ b/CMake/Packages/FindSDL2.cmake
-@@ -182,7 +182,7 @@ ENDIF(SDL2_LIBRARY_TEMP)
- INCLUDE(FindPackageHandleStandardArgs)
- 
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2
--                                  REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR)
-+                                  REQUIRED_VARS SDL2::SDL2 SDL2_INCLUDE_DIR)
- 
- if (WIN32)
- 	set(SDL2_BIN_SEARCH_PATH ${OGRE_DEPENDENCIES_DIR}/bin ${CMAKE_SOURCE_DIR}/Dependencies/bin ${SDL2_HOME}/dll
-@@ -201,6 +201,6 @@ IF(SDL2_STATIC)
-   if (UNIX AND NOT APPLE)
-     EXECUTE_PROCESS(COMMAND sdl2-config --static-libs OUTPUT_VARIABLE SDL2_LINK_FLAGS)
-     STRING(REGEX REPLACE "(\r?\n)+$" "" SDL2_LINK_FLAGS "${SDL2_LINK_FLAGS}")
--    SET(SDL2_LIBRARY ${SDL2_LINK_FLAGS})
-+    SET(SDL2::SDL2 ${SDL2_LINK_FLAGS})
-   ENDIF()
- ENDIF(SDL2_STATIC)
-diff --git a/Samples/2.0/Common/CMakeLists.txt b/Samples/2.0/Common/CMakeLists.txt
-index b21601e..4ef90bd 100644
---- a/Samples/2.0/Common/CMakeLists.txt
-+++ b/Samples/2.0/Common/CMakeLists.txt
-@@ -49,4 +49,4 @@ add_library(${OGRE_SAMPLES_COMMON_LIBRARY} STATIC ${SOURCE_FILES} ${HEADER_FILES
- 
- link_directories(${CMAKE_CURRENT_BINARY_DIR})
- 
--target_link_libraries(${OGRE_SAMPLES_COMMON_LIBRARY} ${SDL2_LIBRARY} OgreHlmsPbs OgreHlmsUnlit)
-+target_link_libraries(${OGRE_SAMPLES_COMMON_LIBRARY} SDL2::SDL2 OgreHlmsPbs OgreHlmsUnlit)
-diff --git a/Samples/2.0/Tutorials/EmptyProject/CMake/Dependencies/OGRE.cmake b/Samples/2.0/Tutorials/EmptyProject/CMake/Dependencies/OGRE.cmake
-index 5e80709..3ba9b5a 100644
---- a/Samples/2.0/Tutorials/EmptyProject/CMake/Dependencies/OGRE.cmake
-+++ b/Samples/2.0/Tutorials/EmptyProject/CMake/Dependencies/OGRE.cmake
-@@ -224,13 +224,13 @@ endif()
- 
- if( NOT IOS )
- 	set( CMAKE_PREFIX_PATH "${OGRE_SOURCE}/Dependencies ${CMAKE_PREFIX_PATH}" )
--	find_package( SDL2 )
-+	find_package(SDL2 CONFIG REQUIRED)
- 	if( NOT SDL2_FOUND )
- 		message( "Could not find SDL2. https://www.libsdl.org/" )
- 	else()
- 		message( STATUS "Found SDL2" )
- 		include_directories( ${SDL2_INCLUDE_DIR} )
--		set( OGRE_DEPENDENCY_LIBS ${OGRE_DEPENDENCY_LIBS} ${SDL2_LIBRARY} )
-+		set( OGRE_DEPENDENCY_LIBS ${OGRE_DEPENDENCY_LIBS} SDL2::SDL2 )
- 	endif()
- endif()
- 
diff --git a/external_imported/vcpkg/ports/ogre-next/portfile.cmake b/external_imported/vcpkg/ports/ogre-next/portfile.cmake
index 266c930c2..9da922912 100644
--- a/external_imported/vcpkg/ports/ogre-next/portfile.cmake
+++ b/external_imported/vcpkg/ports/ogre-next/portfile.cmake
@@ -1,119 +1,101 @@
-# This portfile is based (shamelessly copied and adapted a bit) on 'ogre' portfile.
-if (EXISTS "${CURRENT_INSTALLED_DIR}/Media/HLMS/Blendfunctions_piece_fs.glslt")
-    message(FATAL_ERROR "FATAL ERROR: ogre-next and ogre are incompatible.")
-endif()
-
-if(NOT VCPKG_TARGET_IS_WINDOWS)
+if(NOT VCPKG_TARGET_IS_IOS AND NOT VCPKG_TARGET_IS_OSX AND NOT VCPKG_TARGET_IS_WINDOWS)
     message("${PORT} currently requires the following library from the system package manager:\n    Xaw\n\nIt can be installed on Ubuntu systems via apt-get install libxaw7-dev")
 endif()
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO OGRECave/ogre-next
-    REF e4c5f0f6d36c07af594e3ef143d017bda1581442 #v2.3.1
-    SHA512 263a50b64defa7345a109a068cc17c347a696f83f64abc071256bb46571ed6b2ef94ee3480d90938cdb7f745d36a4c4890d82677d357c62c9a2956eae8d4ac15
+    REF v${VERSION}
+    SHA512 52ed2d2a3375c0d35f0dc695b986514484ad1d47966c5c18351d3b09913123b2487b9729738c6b8b1219c1a992a8c8509a2303e097a6eb26497e152a14d48830
     HEAD_REF master
     PATCHES
         toolchain_fixes.patch
-        fix_find_package_sdl2.patch
+        avoid-name-clashes.patch
+        fix-dependencies.patch
+)
+file(REMOVE
+    "${SOURCE_PATH}/CMake/Packages/FindFreeImage.cmake"
+    "${SOURCE_PATH}/CMake/Packages/FindFreetype.cmake"
+    "${SOURCE_PATH}/CMake/Packages/FindRapidjson.cmake"
+    "${SOURCE_PATH}/CMake/Packages/FindVulkan.cmake"
+    "${SOURCE_PATH}/CMake/Packages/FindZLIB.cmake"
+    "${SOURCE_PATH}/CMake/Packages/FindZZip.cmake"
 )
 
-file(REMOVE "${SOURCE_PATH}/CMake/Packages/FindOpenEXR.cmake")
-
-if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    set(OGRE_STATIC ON)
-else()
-    set(OGRE_STATIC OFF)
-endif()
-
-
-vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+vcpkg_check_features(
+    OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
-        d3d9    OGRE_BUILD_RENDERSYSTEM_D3D9
-        java    OGRE_BUILD_COMPONENT_JAVA
-        python  OGRE_BUILD_COMPONENT_PYTHON
-        csharp  OGRE_BUILD_COMPONENT_CSHARP
+        d3d11               OGRE_BUILD_RENDERSYSTEM_DirectX11
+        d3d11               CMAKE_REQUIRE_FIND_PACKAGE_DirectX11
+        gl3plus             OGRE_BUILD_RENDERSYSTEM_GL3PLUS
+        gl3plus             CMAKE_REQUIRE_FIND_PACKAGE_OpenGL
+        metal               OGRE_BUILD_RENDERSYSTEM_METAL
+        planar-reflections  OGRE_BUILD_COMPONENT_PLANAR_REFLECTIONS
+        vulkan              OGRE_BUILD_RENDERSYSTEM_VULKAN
+        vulkan              CMAKE_REQUIRE_FIND_PACKAGE_Vulkan
 )
 
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" OGRE_STATIC)
+
+vcpkg_find_acquire_program(PKGCONFIG)
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         ${FEATURE_OPTIONS}
-        -DOGRE_BUILD_DEPENDENCIES=OFF
-        -DOGRE_COPY_DEPENDENCIES=OFF
-        -DOGRE_BUILD_SAMPLES=OFF
-        -DOGRE_BUILD_TESTS=OFF
-        -DOGRE_BUILD_TOOLS=OFF
+        -DCMAKE_CXX_STANDARD=11
+        -DCMAKE_DISABLE_FIND_PACKAGE_AMDAGS=ON
+        -DCMAKE_DISABLE_FIND_PACKAGE_CppUnit=ON
+        -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
+        -DCMAKE_DISABLE_FIND_PACKAGE_GLSLOptimizer=ON
+        -DCMAKE_DISABLE_FIND_PACKAGE_HLSL2GLSL=ON
+        -DCMAKE_DISABLE_FIND_PACKAGE_OpenVR=ON
+        -DCMAKE_DISABLE_FIND_PACKAGE_POCO=ON
+        -DCMAKE_DISABLE_FIND_PACKAGE_Remotery=ON
+        -DCMAKE_DISABLE_FIND_PACKAGE_RenderDoc=ON
+        -DCMAKE_DISABLE_FIND_PACKAGE_SDL2=ON
+        -DCMAKE_DISABLE_FIND_PACKAGE_Softimage=ON
+        -DCMAKE_DISABLE_FIND_PACKAGE_TBB=ON
+        -DCMAKE_POLICY_DEFAULT_CMP0072=NEW # Prefer GLVND
+        -DOGRE_ARCHIVE_OUTPUT=lib
+        -DOGRE_LIBRARY_OUTPUT=lib
+        -DOGRE_BUILD_LIBS_AS_FRAMEWORKS=OFF
         -DOGRE_BUILD_MSVC_MP=ON
         -DOGRE_BUILD_MSVC_ZM=ON
+        -DOGRE_BUILD_RENDERSYSTEM_GLES=OFF
+        -DOGRE_BUILD_RENDERSYSTEM_GLES2=OFF
+        -DOGRE_BUILD_SAMPLES2=OFF
+        -DOGRE_BUILD_TESTS=OFF
+        -DOGRE_BUILD_TOOLS=OFF
+        -DOGRE_COPY_DEPENDENCIES=OFF
         -DOGRE_INSTALL_DEPENDENCIES=OFF
         -DOGRE_INSTALL_DOCS=OFF
         -DOGRE_INSTALL_PDB=OFF
         -DOGRE_INSTALL_SAMPLES=OFF
         -DOGRE_INSTALL_TOOLS=OFF
         -DOGRE_INSTALL_VSPROPS=OFF
+        -DOGRE_SKIP_BOOST_SEARCHING=ON
         -DOGRE_STATIC=${OGRE_STATIC}
-        -DOGRE_CONFIG_THREAD_PROVIDER=std
-        -DOGRE_BUILD_RENDERSYSTEM_D3D11=ON
-        -DOGRE_BUILD_RENDERSYSTEM_GL=ON
-        -DOGRE_BUILD_RENDERSYSTEM_GL3PLUS=ON
-        -DOGRE_BUILD_RENDERSYSTEM_GLES=OFF
-        -DOGRE_BUILD_RENDERSYSTEM_GLES2=OFF
-        -DOGRE_CMAKE_DIR=share/ogre-next
+        -DOGRE_USE_NEW_PROJECT_NAME=ON
+        "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}"
+    MAYBE_UNUSED_VARIABLES
+        CMAKE_DISABLE_FIND_PACKAGE_AMDAGS
+        CMAKE_REQUIRE_FIND_PACKAGE_DirectX11
+        OGRE_BUILD_MSVC_MP
+        OGRE_BUILD_MSVC_ZM
+        OGRE_BUILD_RENDERSYSTEM_DirectX11
+        OGRE_COPY_DEPENDENCIES
+        OGRE_INSTALL_DEPENDENCIES
+        OGRE_INSTALL_VSPROPS
 )
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
-vcpkg_cmake_config_fixup()
-
-
-
-file(GLOB REL_CFGS "${CURRENT_PACKAGES_DIR}/bin/*.cfg")
-if(REL_CFGS)
-  file(COPY ${REL_CFGS} DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
-  file(REMOVE ${REL_CFGS})
-endif()
-
-file(GLOB DBG_CFGS "${CURRENT_PACKAGES_DIR}/debug/bin/*.cfg")
-if(DBG_CFGS)
-  file(COPY ${DBG_CFGS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
-  file(REMOVE ${DBG_CFGS})
+if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW)
+    vcpkg_fixup_pkgconfig()
 endif()
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
-endif()
-
-#Remove OgreMain*.lib from lib/ folder, because autolink would complain, since it defines a main symbol
-#manual-link subfolder is here to the rescue!
-if(VCPKG_TARGET_IS_WINDOWS)
-    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Release")
-        file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/manual-link")
-        if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-            file(RENAME "${CURRENT_PACKAGES_DIR}/lib/release/OgreMain.lib" "${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMain.lib")
-        else()
-            file(RENAME "${CURRENT_PACKAGES_DIR}/lib/release/OgreMainStatic.lib" "${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMainStatic.lib")
-        endif()
-    endif()
-    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Debug")
-        file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link")
-        if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-            file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/debug/OgreMain_d.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreMain_d.lib")
-        else()
-            file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/debug/OgreMainStatic_d.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreMainStatic_d.lib")
-        endif()
-    endif()
-
-    file(GLOB SHARE_FILES "${CURRENT_PACKAGES_DIR}/share/ogre-next/*.cmake")
-    foreach(SHARE_FILE ${SHARE_FILES})
-        file(READ "${SHARE_FILE}" _contents)
-        string(REPLACE "lib/OgreMain" "lib/manual-link/OgreMain" _contents "${_contents}")
-        file(WRITE "${SHARE_FILE}" "${_contents}")
-    endforeach()
-endif()
-
-# Handle copyright
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/ogre-next/toolchain_fixes.patch b/external_imported/vcpkg/ports/ogre-next/toolchain_fixes.patch
index ff5eb4850..6ea38a1e0 100644
--- a/external_imported/vcpkg/ports/ogre-next/toolchain_fixes.patch
+++ b/external_imported/vcpkg/ports/ogre-next/toolchain_fixes.patch
@@ -1,231 +1,136 @@
 diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt
-index f3a62f2..b53df6f 100644
+index 45d5935..cdb097a 100644
 --- a/CMake/CMakeLists.txt
 +++ b/CMake/CMakeLists.txt
-@@ -13,10 +13,12 @@
- # directory, but can also be used for custom projects.
- #############################################################
- 
--if(WIN32 OR APPLE)
--	set(OGRE_CMAKE_DIR "CMake")
--else()
--	set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake")
-+if(NOT DEFINED OGRE_CMAKE_DIR)
-+  if(WIN32 OR APPLE)
-+    set(OGRE_CMAKE_DIR "CMake")
-+  else()
-+    set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake")
-+  endif()
+@@ -18,6 +18,7 @@ if(WIN32 OR APPLE)
+ else()
+   set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/${OGRE_NEXT_PREFIX}/cmake")
  endif()
++set(OGRE_CMAKE_DIR "share/ogre-next")
  
  set(INST_FILES
-diff --git a/CMake/Packages/FindFreeImage.cmake b/CMake/Packages/FindFreeImage.cmake
-index 7c89ec5..d8314f0 100644
---- a/CMake/Packages/FindFreeImage.cmake
-+++ b/CMake/Packages/FindFreeImage.cmake
-@@ -43,7 +43,7 @@ find_path(FreeImage_INCLUDE_DIR NAMES FreeImage.h HINTS ${FreeImage_INC_SEARCH_P
- find_library(FreeImage_LIBRARY_REL NAMES ${FreeImage_LIBRARY_NAMES} HINTS ${FreeImage_LIB_SEARCH_PATH} ${FreeImage_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel)
- find_library(FreeImage_LIBRARY_DBG NAMES ${FreeImage_LIBRARY_NAMES_DBG} HINTS ${FreeImage_LIB_SEARCH_PATH} ${FreeImage_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug)
- 
--make_library_set(FreeImage_LIBRARY)
-+make_library_set(FreeImage)
- 
- findpkg_finish(FreeImage)
- 
-diff --git a/CMake/Packages/FindGLSLOptimizer.cmake b/CMake/Packages/FindGLSLOptimizer.cmake
-index dd4b179..6f158fc 100644
---- a/CMake/Packages/FindGLSLOptimizer.cmake
-+++ b/CMake/Packages/FindGLSLOptimizer.cmake
-@@ -38,7 +38,7 @@ findpkg_framework(GLSL_Optimizer)
- find_path(GLSL_Optimizer_INCLUDE_DIR NAMES glsl_optimizer.h HINTS ${GLSL_Optimizer_INC_SEARCH_PATH} ${GLSL_Optimizer_PKGC_INCLUDE_DIRS} PATH_SUFFIXES GLSL_Optimizer)
- find_library(GLSL_Optimizer_LIBRARY_REL NAMES ${GLSL_Optimizer_LIBRARY_NAMES} HINTS ${GLSL_Optimizer_LIB_SEARCH_PATH} ${GLSL_Optimizer_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel)
- find_library(GLSL_Optimizer_LIBRARY_DBG NAMES ${GLSL_Optimizer_LIBRARY_NAMES_DBG} HINTS ${GLSL_Optimizer_LIB_SEARCH_PATH} ${GLSL_Optimizer_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug)
--make_library_set(GLSL_Optimizer_LIBRARY)
-+make_library_set(GLSL_Optimizer)
- 
- findpkg_finish(GLSL_Optimizer)
- add_parent_dir(GLSL_Optimizer_INCLUDE_DIRS GLSL_Optimizer_INCLUDE_DIR)
-diff --git a/CMake/Packages/FindHLSL2GLSL.cmake b/CMake/Packages/FindHLSL2GLSL.cmake
-index 7125895..13a306f 100644
---- a/CMake/Packages/FindHLSL2GLSL.cmake
-+++ b/CMake/Packages/FindHLSL2GLSL.cmake
-@@ -38,7 +38,7 @@ findpkg_framework(HLSL2GLSL)
- find_path(HLSL2GLSL_INCLUDE_DIR NAMES hlsl2glsl.h HINTS ${HLSL2GLSL_INC_SEARCH_PATH} ${HLSL2GLSL_PKGC_INCLUDE_DIRS} PATH_SUFFIXES HLSL2GLSL)
- find_library(HLSL2GLSL_LIBRARY_REL NAMES ${HLSL2GLSL_LIBRARY_NAMES} HINTS ${HLSL2GLSL_LIB_SEARCH_PATH} ${HLSL2GLSL_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel)
- find_library(HLSL2GLSL_LIBRARY_DBG NAMES ${HLSL2GLSL_LIBRARY_NAMES_DBG} HINTS ${HLSL2GLSL_LIB_SEARCH_PATH} ${HLSL2GLSL_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug)
--make_library_set(HLSL2GLSL_LIBRARY)
-+make_library_set(HLSL2GLSL)
- 
- findpkg_finish(HLSL2GLSL)
- add_parent_dir(HLSL2GLSL_INCLUDE_DIRS HLSL2GLSL_INCLUDE_DIR)
-diff --git a/CMake/Packages/FindNVAPI.cmake b/CMake/Packages/FindNVAPI.cmake
-index 95c70cd..893ce01 100644
---- a/CMake/Packages/FindNVAPI.cmake
-+++ b/CMake/Packages/FindNVAPI.cmake
-@@ -44,7 +44,7 @@ findpkg_framework(NVAPI)
- find_path(NVAPI_INCLUDE_DIR NAMES nvapi.h HINTS ${NVAPI_FRAMEWORK_INCLUDES} ${NVAPI_INC_SEARCH_PATH} ${NVAPI_PKGC_INCLUDE_DIRS} PATH_SUFFIXES NVAPI)
- find_library(NVAPI_LIBRARY_REL NAMES ${NVAPI_LIBRARY_NAMES} HINTS ${NVAPI_LIB_SEARCH_PATH} ${NVAPI_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" release relwithdebinfo minsizerel)
- find_library(NVAPI_LIBRARY_DBG NAMES ${NVAPI_LIBRARY_NAMES_DBG} HINTS ${NVAPI_LIB_SEARCH_PATH} ${NVAPI_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" debug)
--make_library_set(NVAPI_LIBRARY)
-+make_library_set(NVAPI)
- 
- findpkg_finish(NVAPI)
- add_parent_dir(NVAPI_INCLUDE_DIRS NVAPI_INCLUDE_DIR)
-\ No newline at end of file
-diff --git a/CMake/Packages/FindPOCO.cmake b/CMake/Packages/FindPOCO.cmake
-index 6b6d7fa..3667b8b 100644
---- a/CMake/Packages/FindPOCO.cmake
-+++ b/CMake/Packages/FindPOCO.cmake
-@@ -50,7 +50,7 @@ findpkg_framework(POCO)
- find_path(POCO_INCLUDE_DIR NAMES Poco/Foundation.h HINTS ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES Foundation/include)
- find_library(POCO_LIBRARY_REL NAMES ${POCO_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
- find_library(POCO_LIBRARY_DBG NAMES ${POCO_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
--make_library_set(POCO_LIBRARY)
-+make_library_set(POCO)
- 
- findpkg_finish(POCO)
- 
-@@ -66,7 +66,7 @@ get_debug_names(POCO_Util_LIBRARY_NAMES)
- find_path(POCO_Util_INCLUDE_DIR NAMES Poco/Util/Util.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES Util/include)
- find_library(POCO_Util_LIBRARY_REL NAMES ${POCO_Util_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
- find_library(POCO_Util_LIBRARY_DBG NAMES ${POCO_Util_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
--make_library_set(POCO_Util_LIBRARY)
-+make_library_set(POCO_Util)
- findpkg_finish(POCO_Util)
- 
- # Look for Poco's Net package
-@@ -76,7 +76,7 @@ get_debug_names(POCO_Net_LIBRARY_NAMES)
- find_path(POCO_Net_INCLUDE_DIR NAMES Poco/Net/Net.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES Net/include)
- find_library(POCO_Net_LIBRARY_REL NAMES ${POCO_Net_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
- find_library(POCO_Net_LIBRARY_DBG NAMES ${POCO_Net_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
--make_library_set(POCO_Net_LIBRARY)
-+make_library_set(POCO_Net)
- findpkg_finish(POCO_Net)
- 
- # Look for Poco's NetSSL package
-@@ -86,7 +86,7 @@ get_debug_names(POCO_NetSSL_LIBRARY_NAMES)
- find_path(POCO_NetSSL_INCLUDE_DIR NAMES Poco/Net/NetSSL.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES NetSSL/include)
- find_library(POCO_NetSSL_LIBRARY_REL NAMES ${POCO_NetSSL_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
- find_library(POCO_NetSSL_LIBRARY_DBG NAMES ${POCO_NetSSL_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
--make_library_set(POCO_NetSSL_LIBRARY)
-+make_library_set(POCO_NetSSL)
- findpkg_finish(POCO_NetSSL)
- 
- # Look for Poco's XML package
-@@ -96,6 +96,6 @@ get_debug_names(POCO_XML_LIBRARY_NAMES)
- find_path(POCO_XML_INCLUDE_DIR NAMES Poco/XML/XML.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES XML/include)
- find_library(POCO_XML_LIBRARY_REL NAMES ${POCO_XML_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
- find_library(POCO_XML_LIBRARY_DBG NAMES ${POCO_XML_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
--make_library_set(POCO_XML_LIBRARY)
-+make_library_set(POCO_XML)
- findpkg_finish(POCO_XML)
- 
-diff --git a/CMake/Packages/FindTBB.cmake b/CMake/Packages/FindTBB.cmake
-index 4200aa0..35e4ea3 100644
---- a/CMake/Packages/FindTBB.cmake
-+++ b/CMake/Packages/FindTBB.cmake
-@@ -104,7 +104,7 @@ findpkg_framework(TBB)
- find_path(TBB_INCLUDE_DIR NAMES tbb/tbb.h HINTS ${TBB_INC_SEARCH_PATH} ${TBB_PKGC_INCLUDE_DIRS})
- find_library(TBB_LIBRARY_REL NAMES ${TBB_LIBRARY_NAMES} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS})
- find_library(TBB_LIBRARY_DBG NAMES ${TBB_LIBRARY_NAMES_DBG} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS})
--make_library_set(TBB_LIBRARY)
-+make_library_set(TBB)
- 
- findpkg_finish(TBB)
- 
-@@ -120,7 +120,7 @@ get_debug_names(TBB_MALLOC_LIBRARY_NAMES)
- find_path(TBB_MALLOC_INCLUDE_DIR NAMES tbb/tbb.h HINTS ${TBB_INCLUDE_DIR} ${TBB_INC_SEARCH_PATH} ${TBB_PKGC_INCLUDE_DIRS} )
- find_library(TBB_MALLOC_LIBRARY_REL NAMES ${TBB_MALLOC_LIBRARY_NAMES} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS} )
- find_library(TBB_MALLOC_LIBRARY_DBG NAMES ${TBB_MALLOC_LIBRARY_NAMES_DBG} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS} )
--make_library_set(TBB_MALLOC_LIBRARY)
-+make_library_set(TBB_MALLOC)
- findpkg_finish(TBB_MALLOC)
- 
- # Look for TBB's malloc proxy package
-@@ -130,5 +130,5 @@ get_debug_names(TBB_MALLOC_PROXY_LIBRARY_NAMES)
- find_path(TBB_MALLOC_PROXY_INCLUDE_DIR NAMES tbb/tbbmalloc_proxy.h HINTS ${TBB_INCLUDE_DIR} ${TBB_INC_SEARCH_PATH} ${TBB_PKGC_INCLUDE_DIRS})
- find_library(TBB_MALLOC_PROXY_LIBRARY_REL NAMES ${TBB_MALLOC_PROXY_LIBRARY_NAMES} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS})
- find_library(TBB_MALLOC_PROXY_LIBRARY_DBG NAMES ${TBB_MALLOC_PROXY_LIBRARY_NAMES_DBG} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS})
--make_library_set(TBB_MALLOC_PROXY_LIBRARY)
-+make_library_set(TBB_MALLOC_PROXY)
- findpkg_finish(TBB_MALLOC_PROXY)
-diff --git a/CMake/Packages/FindZZip.cmake b/CMake/Packages/FindZZip.cmake
-index c112071..214d9e5 100644
---- a/CMake/Packages/FindZZip.cmake
-+++ b/CMake/Packages/FindZZip.cmake
-@@ -39,12 +39,12 @@ use_pkgconfig(ZZip_PKGC zziplib)
- 
- findpkg_framework(ZZip)
- 
--find_path(ZZip_INCLUDE_DIR NAMES zzip/zzip.h HINTS ${ZZip_INC_SEARCH_PATH} ${ZZip_PKGC_INCLUDE_DIRS})
-+find_path(ZZip_INCLUDE_DIRS NAMES zzip/zzip.h HINTS ${ZZip_INC_SEARCH_PATH} ${ZZip_PKGC_INCLUDE_DIRS})
- 
- find_library(ZZip_LIBRARY_REL NAMES ${ZZip_LIBRARY_NAMES} HINTS ${ZZip_LIB_SEARCH_PATH} ${ZZip_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel)
- find_library(ZZip_LIBRARY_DBG NAMES ${ZZip_LIBRARY_NAMES_DBG} HINTS ${ZZip_LIB_SEARCH_PATH} ${ZZip_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug)
- 
--make_library_set(ZZip_LIBRARY)
-+make_library_set(ZZip)
- 
- findpkg_finish(ZZip)
- 
+   Packages/FindRapidjson.cmake
+diff --git a/CMake/ConfigureBuild.cmake b/CMake/ConfigureBuild.cmake
+index 9d3b1b2..11fc345 100644
+--- a/CMake/ConfigureBuild.cmake
++++ b/CMake/ConfigureBuild.cmake
+@@ -284,6 +284,11 @@ if (UNIX)
+     # there is no pkgconfig file for freeimage, so we need to add that lib manually
+     set(OGRE_ADDITIONAL_LIBS "${OGRE_ADDITIONAL_LIBS} -lfreeimage")
+     configure_file(${OGRE_TEMPLATES_DIR}/OGREStatic.pc.in ${OGRE_BINARY_DIR}/pkgconfig/${OGRE_NEXT_PREFIX}.pc @ONLY)
++    if(NOT X11_FOUND)
++      file(READ "${OGRE_BINARY_DIR}/pkgconfig/${OGRE_NEXT_PREFIX}.pc" ogre_pc)
++      string(REPLACE ", x11, xt, xaw7, gl" "" ogre_pc "${ogre_pc}")
++      file(WRITE "${OGRE_BINARY_DIR}/pkgconfig/${OGRE_NEXT_PREFIX}.pc" "${ogre_pc}")
++    endif()
+   else ()
+     configure_file(${OGRE_TEMPLATES_DIR}/OGRE.pc.in ${OGRE_BINARY_DIR}/pkgconfig/${OGRE_NEXT_PREFIX}.pc @ONLY)
+   endif ()
 diff --git a/CMake/Utils/FindPkgMacros.cmake b/CMake/Utils/FindPkgMacros.cmake
-index 53111e0..8dffbbc 100644
+index 53111e0..e0f6716 100644
 --- a/CMake/Utils/FindPkgMacros.cmake
 +++ b/CMake/Utils/FindPkgMacros.cmake
-@@ -79,15 +79,21 @@ endmacro (use_pkgconfig)
- 
- # Couple a set of release AND debug libraries (or frameworks)
+@@ -81,6 +81,12 @@ endmacro (use_pkgconfig)
  macro(make_library_set PREFIX)
--  if (${PREFIX}_FWK)
--    set(${PREFIX} ${${PREFIX}_FWK})
--  elseif (${PREFIX}_REL AND ${PREFIX}_DBG)
--    set(${PREFIX} optimized ${${PREFIX}_REL} debug ${${PREFIX}_DBG})
--  elseif (${PREFIX}_REL)
--    set(${PREFIX} ${${PREFIX}_REL})
--  elseif (${PREFIX}_DBG)
--    set(${PREFIX} ${${PREFIX}_DBG})
--  endif ()
-+  include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake)
-+  set(PREFIX_LIB "${PREFIX}_LIBRARY")
-+  if (${PREFIX_LIB}_FWK)
-+    set(${PREFIX_LIB} ${${PREFIX_LIB}_FWK})
-+  elseif (${PREFIX_LIB}_REL AND ${PREFIX_LIB}_DBG)
-+    set(${PREFIX_LIB}_RELEASE ${${PREFIX_LIB}_REL} CACHE STRING "")
-+    set(${PREFIX_LIB}_DEBUG ${${PREFIX_LIB}_DBG} CACHE STRING "")
-+    select_library_configurations(${PREFIX})
-+  elseif (${PREFIX_LIB}_REL)
-+    set(${PREFIX_LIB} ${${PREFIX_LIB}_REL})
-+    set(${PREFIX_LIB}_RELEASE ${${PREFIX_LIB}_REL})
-+  elseif (${PREFIX_LIB}_DBG)
-+    set(${PREFIX_LIB} ${${PREFIX_LIB}_DBG})
-+    set(${PREFIX_LIB}_DEBUG ${${PREFIX_LIB}_DBG})
-+  endif()
- endmacro(make_library_set)
- 
- # Generate debug names from given release names
+   if (${PREFIX}_FWK)
+     set(${PREFIX} ${${PREFIX}_FWK})
++  elseif (${PREFIX}_REL OR ${PREFIX}_DBG)
++    include("${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake")
++    set(${PREFIX}_RELEASE "${${PREFIX}_REL}")
++    set(${PREFIX}_DEBUG "${${PREFIX}_DBG}")
++    string(REPLACE "_LIBRARY" "" PREFIX_BASENAME "${PREFIX}")
++    select_library_configurations(${PREFIX_BASENAME})
+   elseif (${PREFIX}_REL AND ${PREFIX}_DBG)
+     set(${PREFIX} optimized ${${PREFIX}_REL} debug ${${PREFIX}_DBG})
+   elseif (${PREFIX}_REL)
+diff --git a/CMake/Utils/OgreConfigTargets.cmake b/CMake/Utils/OgreConfigTargets.cmake
+index d8e0208..1fdb63c 100644
+--- a/CMake/Utils/OgreConfigTargets.cmake
++++ b/CMake/Utils/OgreConfigTargets.cmake
+@@ -41,7 +41,7 @@ if (NOT OGRE_RUNTIME_OUTPUT)
+   set(OGRE_RUNTIME_OUTPUT ${OGRE_BINARY_DIR}/bin)
+ endif ()
+ 
+-if (WIN32)
++if (0)
+   set(OGRE_RELEASE_PATH "/Release")
+   set(OGRE_RELWDBG_PATH "/RelWithDebInfo")
+   set(OGRE_MINSIZE_PATH "/MinSizeRel")
+@@ -52,7 +52,7 @@ if (WIN32)
+   set(OGRE_LIB_DEBUG_PATH "/Debug")
+   set(OGRE_PLUGIN_PATH "/opt")
+   set(OGRE_SAMPLE_PATH "/opt/samples")
+-elseif (UNIX)
++elseif (1)
+   set(OGRE_RELEASE_PATH "")
+   set(OGRE_RELWDBG_PATH "")
+   set(OGRE_MINSIZE_PATH "")
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 48af55b..b18ac57 100644
+index 2786e35..7a92a7b 100755
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -282,7 +282,7 @@ if (OGRE_BUILD_PLATFORM_APPLE_IOS)
+@@ -299,7 +299,6 @@ if (OGRE_BUILD_PLATFORM_APPLE_IOS)
+     execute_process(COMMAND xcodebuild -version -sdk "${XCODE_ATTRIBUTE_SDKROOT}" Path | head -n 1 OUTPUT_VARIABLE CMAKE_OSX_SYSROOT)
+     string(REGEX REPLACE "(\r?\n)+$" "" CMAKE_OSX_SYSROOT "${CMAKE_OSX_SYSROOT}")
+   else()
+-    set(CMAKE_OSX_SYSROOT iphoneos)
+   endif()
  
-   # Set build variables
-   set(XCODE_ATTRIBUTE_SDKROOT iphoneos)
--  if(CMAKE_GENERATOR STREQUAL "Unix Makefiles")
-+  if(1)
+   set(CMAKE_EXE_LINKER_FLAGS "-framework Foundation -framework CoreGraphics -framework QuartzCore -framework UIKit")
+@@ -364,7 +363,6 @@ elseif (APPLE AND NOT OGRE_BUILD_PLATFORM_APPLE_IOS)
      execute_process(COMMAND xcodebuild -version -sdk "${XCODE_ATTRIBUTE_SDKROOT}" Path | head -n 1 OUTPUT_VARIABLE CMAKE_OSX_SYSROOT)
      string(REGEX REPLACE "(\r?\n)+$" "" CMAKE_OSX_SYSROOT "${CMAKE_OSX_SYSROOT}")
    else()
+-    set(CMAKE_OSX_SYSROOT macosx)
+   endif()
+ 
+   set( CMAKE_XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES )
 diff --git a/OgreMain/CMakeLists.txt b/OgreMain/CMakeLists.txt
-index 0424ebb..b019269 100644
+index b698b84..75fef2c 100644
 --- a/OgreMain/CMakeLists.txt
 +++ b/OgreMain/CMakeLists.txt
-@@ -434,8 +434,6 @@ if (APPLE)
-     set_target_properties(OgreMain PROPERTIES
+@@ -439,7 +439,7 @@ if (APPLE)
          LINK_FLAGS "-framework IOKit -framework Cocoa -framework Carbon -framework OpenGL -framework CoreVideo"
      )
--
+ 
 -    set(OGRE_OSX_BUILD_CONFIGURATION "$(PLATFORM_NAME)/$(CONFIGURATION)")
++    set(OGRE_OSX_BUILD_CONFIGURATION ".")
    
-   	add_custom_command(TARGET OgreMain POST_BUILD
+ 	add_custom_command(TARGET ${OGRE_NEXT}Main POST_BUILD
  		COMMAND mkdir ARGS -p ${OGRE_BINARY_DIR}/lib/${OGRE_OSX_BUILD_CONFIGURATION}/Ogre.framework/Headers/Threading
+@@ -494,6 +494,9 @@ use_precompiled_header(${OGRE_NEXT}Main
+ )
+ 
+ # install ${OGRE_NEXT}Main
++if(MSVC)
++  set(OGRE_LIB_DIRECTORY lib/manual-link)
++endif()
+ ogre_config_lib(${OGRE_NEXT}Main TRUE)
+ foreach(HEADER_FILE ${HEADER_FILES})
+ 	string(REGEX REPLACE "((${CMAKE_CURRENT_SOURCE_DIR}|${OGRE_BINARY_DIR})/)?(include|src)/" "" RELATIVE_HEADER_FILE ${HEADER_FILE})
+diff --git a/OgreMain/include/OgrePlatform.h b/OgreMain/include/OgrePlatform.h
+index 6754c4e..6b1879d 100644
+--- a/OgreMain/include/OgrePlatform.h
++++ b/OgreMain/include/OgrePlatform.h
+@@ -504,7 +504,7 @@ THE SOFTWARE.
+ 
+     // Define whether or not Ogre compiled with NEON support.
+     #if OGRE_DOUBLE_PRECISION == 0 && OGRE_CPU == OGRE_CPU_ARM && \
+-        ( defined(__aarch64__) || defined(__ARM_NEON__) || defined(_WIN32_WINNT_WIN8) && _WIN32_WINNT >= _WIN32_WINNT_WIN8 )
++        ( defined(__aarch64__) || defined(__ARM_NEON__) || defined(_M_ARM64) || defined(_WIN32_WINNT_WIN8) && _WIN32_WINNT >= _WIN32_WINNT_WIN8 )
+         #define __OGRE_HAVE_NEON  1
+     #endif
+ #endif
+diff --git a/OgreMain/include/OgreString.h b/OgreMain/include/OgreString.h
+index 8693c57..b4179ea 100644
+--- a/OgreMain/include/OgreString.h
++++ b/OgreMain/include/OgreString.h
+@@ -222,7 +222,7 @@ namespace Ogre {
+ #   endif
+ #elif OGRE_COMPILER == OGRE_COMPILER_MSVC && OGRE_COMP_VER >= 1600 && OGRE_COMP_VER < 1910 && !defined(STLPORT) // VC++ 10.0
+     typedef ::std::tr1::hash< _StringBase > _StringHash;
+-#elif !defined( _STLP_HASH_FUN_H )
++#elif 0
+     typedef stdext::hash_compare< _StringBase, std::less< _StringBase > > _StringHash;
+ #else
+     typedef std::hash< _StringBase > _StringHash;
diff --git a/external_imported/vcpkg/ports/ogre-next/vcpkg.json b/external_imported/vcpkg/ports/ogre-next/vcpkg.json
index bc4fe07bb..07cd697c7 100644
--- a/external_imported/vcpkg/ports/ogre-next/vcpkg.json
+++ b/external_imported/vcpkg/ports/ogre-next/vcpkg.json
@@ -1,19 +1,18 @@
 {
   "name": "ogre-next",
-  "version": "2.3.1",
-  "description": "Ogre 2.1 & 2.2 - scene-oriented, flexible 3D engine written in C++",
+  "version": "2.3.3",
+  "port-version": 2,
+  "description": "Ogre Next - scene-oriented, flexible 3D engine written in C++",
   "homepage": "https://github.com/OGRECave/ogre-next",
   "license": "MIT",
+  "supports": "!emscripten & !uwp & !xbox",
   "dependencies": [
-    "boost-date-time",
-    "boost-thread",
     "freeimage",
-    "freetype",
-    "openvr",
-    "poco",
+    {
+      "name": "freetype",
+      "default-features": false
+    },
     "rapidjson",
-    "sdl2",
-    "tbb",
     "tinyxml",
     {
       "name": "vcpkg-cmake",
@@ -26,20 +25,46 @@
     "zlib",
     "zziplib"
   ],
+  "default-features": [
+    {
+      "name": "d3d11",
+      "platform": "windows"
+    },
+    {
+      "name": "gl3plus",
+      "platform": "!android & !ios & !osx & !windows"
+    },
+    {
+      "name": "metal",
+      "platform": "ios | osx"
+    },
+    {
+      "name": "vulkan",
+      "platform": "android"
+    }
+  ],
   "features": {
-    "csharp": {
-      "description": "Build csharp bindings"
+    "d3d11": {
+      "description": "Direct3D 11 render system",
+      "supports": "windows"
+    },
+    "gl3plus": {
+      "description": "OpenGL 3+ render system",
+      "supports": "!android & !(arm & windows)"
     },
-    "d3d9": {
-      "description": "Build Direct3D9 RenderSystem"
+    "metal": {
+      "description": "Metal render system",
+      "supports": "osx | ios"
     },
-    "java": {
-      "description": "Build Java (JNI) bindings"
+    "planar-reflections": {
+      "description": "Component to use planar reflections, can be used by both HlmsPbs and HlmsUnlit"
     },
-    "python": {
-      "description": "Build Python bindings",
+    "vulkan": {
+      "description": "Vulkan render system",
+      "supports": "!osx",
       "dependencies": [
-        "python3"
+        "glslang",
+        "vulkan"
       ]
     }
   }
diff --git a/external_imported/vcpkg/ports/ogre/cfg-rel-paths.patch b/external_imported/vcpkg/ports/ogre/cfg-rel-paths.patch
index dcf204b10..512bf1597 100644
--- a/external_imported/vcpkg/ports/ogre/cfg-rel-paths.patch
+++ b/external_imported/vcpkg/ports/ogre/cfg-rel-paths.patch
@@ -21,16 +21,4 @@ index 09789ce..3d918e4 100644
  set(OGRE_CORE_MEDIA_DIR "${OGRE_MEDIA_DIR_REL}")
  
  # CREATE CONFIG FILES - INSTALL VERSIONS
-diff --git a/Components/Bites/CMakeLists.txt b/Components/Bites/CMakeLists.txt
-index 427c581..fc690eb 100644
---- a/Components/Bites/CMakeLists.txt
-+++ b/Components/Bites/CMakeLists.txt
-@@ -138,7 +138,7 @@ elseif(UNIX)
-     set_source_files_properties(src/OgreBitesConfigDialog.cpp PROPERTIES COMPILE_DEFINITIONS HAVE_XAW)
-     list(APPEND SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/OgreGLXConfigDialog.cpp")
-     list(APPEND DEPENDENCIES ${X11_Xt_LIB} ${XAW_LIBRARY})
--    install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/misc/GLX_backdrop.png" DESTINATION "share/OGRE/")
-+    install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/misc/GLX_backdrop.png" DESTINATION "${OGRE_MEDIA_PATH}/..")
-   endif()
- endif()
  
diff --git a/external_imported/vcpkg/ports/ogre/fix-dependencies.patch b/external_imported/vcpkg/ports/ogre/fix-dependencies.patch
index 8e8f28d32..5c8d3ef98 100644
--- a/external_imported/vcpkg/ports/ogre/fix-dependencies.patch
+++ b/external_imported/vcpkg/ports/ogre/fix-dependencies.patch
@@ -133,7 +133,7 @@ index 0c74ce2..a302b1c 100644
  if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI)
 +  find_package(imgui CONFIG REQUIRED)
 +elseif(0)
-   set(IMGUI_DIR "${PROJECT_BINARY_DIR}/imgui-1.87" CACHE PATH "")
+   set(IMGUI_DIR "${PROJECT_BINARY_DIR}/imgui-1.89.7" CACHE PATH "")
    if(NOT EXISTS ${IMGUI_DIR})
      message(STATUS "Downloading imgui")
 @@ -63,6 +65,8 @@ elseif(UNIX)
@@ -200,7 +200,7 @@ index 663a1c3..e1452cb 100644
          stbi_convert_iphone_png_to_rgb(1);
          stbi_set_unpremultiply_on_load(1);
  
--        LogManager::getSingleton().logMessage("stb_image - v2.27 - public domain image loader");
+-        LogManager::getSingleton().logMessage("stb_image - v2.28 - public domain image loader");
 +        LogManager::getSingleton().logMessage("stb_image - public domain image loader");
          
          // Register codecs
@@ -213,7 +213,7 @@ index 2fce0dd0b..631735fb2 100644
      if (key == ImGuiKey_None)
          return io.WantCaptureKeyboard;
  
--    io.AddKeyEvent(key, arg.type == OgreBites::KEYDOWN);
+-    io.AddKeyEvent(ImGuiKey(key), arg.type == OgreBites::KEYDOWN);
 +    io.AddKeyEvent(static_cast<ImGuiKey>(key), arg.type == OgreBites::KEYDOWN);
      return io.WantCaptureKeyboard;
  }
diff --git a/external_imported/vcpkg/ports/ogre/portfile.cmake b/external_imported/vcpkg/ports/ogre/portfile.cmake
index ffd6c9057..dd39a0f8d 100644
--- a/external_imported/vcpkg/ports/ogre/portfile.cmake
+++ b/external_imported/vcpkg/ports/ogre/portfile.cmake
@@ -14,13 +14,14 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO OGRECave/ogre
     REF "v${VERSION}"
-    SHA512 d4022a454e0649a01182545f24094ba1f72127099a9b096e1b438238659629e93b1d79277d02acc0aceebdc3969aab0031de7f86390077bafc66ccfd86755430
+    SHA512 adadf0ce8510515c7519b87b502090c4a8d6694af0850ebd4a030d2dda497978eeb811746c74aa0cd1dc41adc0bf5f04fe38d02eb4ff03a56999c6635efe1e0e
     HEAD_REF master
     PATCHES
         fix-dependencies.patch
         cfg-rel-paths.patch
         swig-python-polyfill.patch
         pkgconfig.patch
+        same-install-rules-all-platforms.patch
 )
 
 file(REMOVE "${SOURCE_PATH}/CMake/Packages/FindOpenEXR.cmake")
@@ -29,31 +30,35 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" OGRE_STATIC)
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" OGRE_CONFIG_STATIC_LINK_CRT)
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-  FEATURES
-    assimp   OGRE_BUILD_PLUGIN_ASSIMP
-    assimp   CMAKE_REQUIRE_FIND_PACKAGE_assimp
-    bullet   OGRE_BUILD_COMPONENT_BULLET
-    bullet   CMAKE_REQUIRE_FIND_PACKAGE_Bullet
-    d3d9     OGRE_BUILD_RENDERSYSTEM_D3D9
-    freeimage OGRE_BUILD_PLUGIN_FREEIMAGE
-    freeimage CMAKE_REQUIRE_FIND_PACKAGE_FreeImage
-    java     OGRE_BUILD_COMPONENT_JAVA
-    java     CMAKE_REQUIRE_FIND_PACKAGE_SWIG
-    openexr  OGRE_BUILD_PLUGIN_EXRCODEC
-    openexr  CMAKE_REQUIRE_FIND_PACKAGE_OpenEXR
-    python   OGRE_BUILD_COMPONENT_PYTHON
-    python   CMAKE_REQUIRE_FIND_PACKAGE_Python3
-    python   CMAKE_REQUIRE_FIND_PACKAGE_SWIG
-    csharp   OGRE_BUILD_COMPONENT_CSHARP
-    csharp   CMAKE_REQUIRE_FIND_PACKAGE_SWIG
-    overlay  OGRE_BUILD_COMPONENT_OVERLAY
-    overlay  CMAKE_REQUIRE_FIND_PACKAGE_FREETYPE
-    zip      OGRE_CONFIG_ENABLE_ZIP
-    strict   OGRE_RESOURCEMANAGER_STRICT
-    tools    OGRE_BUILD_TOOLS
-    tools    OGRE_INSTALL_TOOLS
+    FEATURES
+        assimp   OGRE_BUILD_PLUGIN_ASSIMP
+        assimp   CMAKE_REQUIRE_FIND_PACKAGE_assimp
+        bullet   OGRE_BUILD_COMPONENT_BULLET
+        bullet   CMAKE_REQUIRE_FIND_PACKAGE_Bullet
+        d3d9     OGRE_BUILD_RENDERSYSTEM_D3D9
+        freeimage OGRE_BUILD_PLUGIN_FREEIMAGE
+        freeimage CMAKE_REQUIRE_FIND_PACKAGE_FreeImage
+        java     OGRE_BUILD_COMPONENT_JAVA
+        openexr  OGRE_BUILD_PLUGIN_EXRCODEC
+        openexr  CMAKE_REQUIRE_FIND_PACKAGE_OpenEXR
+        python   OGRE_BUILD_COMPONENT_PYTHON
+        python   CMAKE_REQUIRE_FIND_PACKAGE_Python3
+        csharp   OGRE_BUILD_COMPONENT_CSHARP
+        overlay  OGRE_BUILD_COMPONENT_OVERLAY
+        zip      OGRE_CONFIG_ENABLE_ZIP
+        strict   OGRE_RESOURCEMANAGER_STRICT
+        tools    OGRE_BUILD_TOOLS
+        tools    OGRE_INSTALL_TOOLS
+    INVERTED_FEATURES
+        assimp   CMAKE_DISABLE_FIND_PACKAGE_assimp
+        bullet   CMAKE_DISABLE_FIND_PACKAGE_Bullet
+        python   CMAKE_DISABLE_FIND_PACKAGE_Python3
 )
 
+if("java" IN_LIST FEATURES OR "python" IN_LIST FEATURES OR "csharp" IN_LIST FEATURES)
+    list(APPEND FEATURE_OPTIONS "-DCMAKE_REQUIRE_FIND_PACKAGE_SWIG=ON")
+endif()
+
 if(CMAKE_REQUIRE_FIND_PACKAGE_SWIG)
     vcpkg_find_acquire_program(SWIG)
     vcpkg_list(APPEND FEATURE_OPTIONS "-DSWIG_EXECUTABLE=${SWIG}")
@@ -92,6 +97,8 @@ vcpkg_cmake_configure(
         -DOGRE_BUILD_RENDERSYSTEM_GL3PLUS=ON
         -DOGRE_BUILD_RENDERSYSTEM_GLES=OFF
         -DOGRE_BUILD_RENDERSYSTEM_GLES2=OFF
+        -DCMAKE_REQUIRE_FIND_PACKAGE_FREETYPE=ON
+        -DCMAKE_REQUIRE_FIND_PACKAGE_pugixml=ON
         -DCMAKE_REQUIRE_FIND_PACKAGE_ZLIB=ON
         -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
         -DCMAKE_DISABLE_FIND_PACKAGE_QT=ON
@@ -168,4 +175,4 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
 endif()
 
 # Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/ogre/same-install-rules-all-platforms.patch b/external_imported/vcpkg/ports/ogre/same-install-rules-all-platforms.patch
new file mode 100644
index 000000000..06f72bad7
--- /dev/null
+++ b/external_imported/vcpkg/ports/ogre/same-install-rules-all-platforms.patch
@@ -0,0 +1,14 @@
+diff --git a/CMake/Utils/OgreConfigTargets.cmake b/CMake/Utils/OgreConfigTargets.cmake
+index c4e6de8..e92da59 100644
+--- a/CMake/Utils/OgreConfigTargets.cmake
++++ b/CMake/Utils/OgreConfigTargets.cmake
+@@ -56,9 +56,6 @@ elseif (UNIX)
+   set(OGRE_LIB_RELEASE_PATH "")
+   set(OGRE_LIB_RELWDBG_PATH "")
+   set(OGRE_LIB_DEBUG_PATH "")
+-  if(APPLE AND NOT APPLE_IOS)
+-    set(OGRE_RELEASE_PATH "/${PLATFORM_NAME}")
+-  endif()
+   if(APPLE AND APPLE_IOS)
+     set(OGRE_LIB_RELEASE_PATH "/Release")
+   endif(APPLE AND APPLE_IOS)
diff --git a/external_imported/vcpkg/ports/ogre/swig-python-polyfill.patch b/external_imported/vcpkg/ports/ogre/swig-python-polyfill.patch
index 31bb01b64..f8e2b420a 100644
--- a/external_imported/vcpkg/ports/ogre/swig-python-polyfill.patch
+++ b/external_imported/vcpkg/ports/ogre/swig-python-polyfill.patch
@@ -14,6 +14,6 @@ index b6062c6..df955e3 100644
 +    if(SWIG_FOUND AND SWIG_VERSION VERSION_LESS "4.0.1" AND Python3_VERSION VERSION_GREATER_EQUAL "3.8")
 +        target_precompile_headers(${SWIG_MODULE_${target}_REAL_NAME} PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/pyobject_gc_polyfill.h")
 +    endif()
-     set_target_properties(${SWIG_MODULE_${target}_REAL_NAME} PROPERTIES 
-                         DEBUG_POSTFIX "")
-     install(TARGETS ${SWIG_MODULE_${target}_REAL_NAME} LIBRARY DESTINATION ${PYTHON_SITE_PACKAGES})
+     set_target_properties(${target} PROPERTIES DEBUG_POSTFIX "")
+     install(TARGETS ${target} LIBRARY DESTINATION ${PYTHON_SITE_PACKAGES})
+     install(FILES ${PROJECT_BINARY_DIR}/Components/Python/${target}.py DESTINATION ${PYTHON_SITE_PACKAGES})
diff --git a/external_imported/vcpkg/ports/ogre/vcpkg.json b/external_imported/vcpkg/ports/ogre/vcpkg.json
index 13e5a393b..fa466b82d 100644
--- a/external_imported/vcpkg/ports/ogre/vcpkg.json
+++ b/external_imported/vcpkg/ports/ogre/vcpkg.json
@@ -1,10 +1,16 @@
 {
   "name": "ogre",
-  "version": "13.6.2",
+  "version": "14.0.1",
+  "port-version": 2,
   "description": "3D Object-Oriented Graphics Rendering Engine",
   "homepage": "https://github.com/OGRECave/ogre",
   "license": "MIT",
+  "supports": "!uwp",
   "dependencies": [
+    {
+      "name": "freetype",
+      "default-features": false
+    },
     "pugixml",
     {
       "name": "sdl2",
@@ -70,10 +76,6 @@
     "overlay": {
       "description": "Build overlay component",
       "dependencies": [
-        {
-          "name": "freetype",
-          "default-features": false
-        },
         {
           "name": "imgui",
           "features": [
diff --git a/external_imported/vcpkg/ports/omniorb/add_win_into_autotools.patch b/external_imported/vcpkg/ports/omniorb/add_win_into_autotools.patch
new file mode 100644
index 000000000..df25c3183
--- /dev/null
+++ b/external_imported/vcpkg/ports/omniorb/add_win_into_autotools.patch
@@ -0,0 +1,315 @@
+diff --git a/configure.ac b/configure.ac
+index d485463..2ba9c82 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -231,6 +231,7 @@ case "$host" in
+   *-*-openbsd*)  plat_name="OpenBSD";  plat_def="__openbsd__";  os_v="3";;
+   *-*-sco*)      plat_name="OSR5";     plat_def="__osr5__";     os_v="5";;
+   *-*-gnu*)      plat_name="GNU";      plat_def="__hurd__" ;    os_v="0";;
++  *-*-mingw*)    plat_name="Win32Platform";      plat_def="__WIN32__" ;    os_v="4";;
+ esac
+ 
+ AC_SUBST(PLATFORM_NAME, $plat_name)
+diff --git a/mk/beforeauto.mk.in b/mk/beforeauto.mk.in
+index f078912..9aef646 100644
+--- a/mk/beforeauto.mk.in
++++ b/mk/beforeauto.mk.in
+@@ -1311,3 +1314,7 @@ endif
+ 
+ lib_depend := $(patsubst %,$(LibPattern),omnithread)
+ OMNITHREAD_LIB_DEPEND := $(GENERATE_LIB_DEPEND)
++
++ifdef Win32Platform
++include $(THIS_IMPORT_TREE)/mk/platforms/vcpkg.mk
++endif
+\ No newline at end of file
+diff --git a/mk/win32.mk b/mk/win32.mk
+index 94c9aad..f788d41 100644
+--- a/mk/win32.mk
++++ b/mk/win32.mk
+@@ -81,7 +81,6 @@ endif
+ 
+ 
+ ifndef WINVER
+-WINVER = 0x0400
+ endif
+ 
+ IMPORT_CPPFLAGS += -D__WIN32__ -D_WIN32_WINNT=$(WINVER)
+@@ -179,7 +179,7 @@ define CXXExecutable
+  $(RM) $@; \
+  $(CXXLINK) -out:$@ $(CXXLINKOPTIONS) -PDB:$@.pdb $(IMPORT_LIBRARY_FLAGS) \
+       $(filter-out $(LibPattern),$^) $$libs; \
+- $(MANIFESTTOOL) /outputresource:"$@;#1" /manifest $@.manifest; \
++ $(MANIFESTTOOL) -outputresource:"$@;#1" -manifest $@.manifest; \
+ )
+ endef
+ 
+@@ -187,7 +187,7 @@ define CExecutable
+ (set -x; \
+  $(RM) $@; \
+  $(CLINK) -out:$@ $(CLINKOPTIONS) -PDB:$@.pdb $(IMPORT_LIBRARY_FLAGS) $(filter-out $(LibPattern),$^) $$libs; \
+- $(MANIFESTTOOL) /outputresource:"$@;#1" /manifest $@.manifest; \
++ $(MANIFESTTOOL) -outputresource:"$@;#1" -manifest $@.manifest; \
+ )
+ endef
+ 
+@@ -356,18 +356,18 @@ extralinkoption="$(MSVC_DLL_CXXLINKDEBUGOPTIONS)"; \
+ else \
+ extralinkoption="$(MSVC_DLL_CXXLINKNODEBUGOPTIONS)"; \
+ fi; \
+ if [ -z "$$nodeffile" ]; then \
+ $(MakeCXXExportSymbolDefinitionFile) \
+ defflag="-def:$$defname"; \
+ fi; \
+ $(MakeResourceDefinitionFile) \
+ set -x; \
+ $(RM) $@; \
+ $(CXXLINK) -out:$$dllname -DLL $$extralinkoption \
+ $$defflag -IMPLIB:$@ $(IMPORT_LIBRARY_FLAGS) \
+ $^ $$extralibs $$resname; \
+-$(MANIFESTTOOL) /outputresource:"$$dllname;#2" /manifest $$dllname.manifest; \
++$(MANIFESTTOOL) -outputresource:"$$dllname;#2" -manifest $$dllname.manifest; \
+ $(CP) $@ $$slibname;
+ endef
+ 
+ # Export SharedLibrary
+diff --git a/acinclude.m4 b/acinclude.m4
+index cef87f8bd..cf61556bd 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -433,8 +433,8 @@ AC_SUBST(ENABLE_LONGDOUBLE, $omni_cv_enable_longdouble)
+ 
+ dnl Enable ZIOP
+ AC_DEFUN([OMNI_ENABLE_ZIOP],
+-[AC_CHECK_LIB(z,compressBound,omni_cv_enable_ziop_zlib=yes,omni_cv_enable_ziop_zlib=no)
+-AC_CHECK_LIB(zstd,ZSTD_compress,omni_cv_enable_ziop_zstd=yes,omni_cv_enable_ziop_zstd=no)
++[AC_SEARCH_LIBS(compressBound,[z zlib zlibd],omni_cv_enable_ziop_zlib=yes,omni_cv_enable_ziop_zlib=no)
++AC_SEARCH_LIBS(ZSTD_compress,[zstd zstdd],omni_cv_enable_ziop_zstd=yes,omni_cv_enable_ziop_zstd=no)
+ omni_cv_enable_ziop="no"
+ if test "$omni_cv_enable_ziop_zlib" = "yes"; then
+   omni_cv_enable_ziop="yes"
+diff --git a/mk/win32.mk b/mk/win32.mk
+index 741835b4b..7a5bff934 100644
+--- a/mk/win32.mk
++++ b/mk/win32.mk
+@@ -580,8 +580,7 @@ OMNIORB_IDL = $(OMNIORB_IDL_ONLY) $(OMNIORB_IDL_ANY_FLAGS)
+ OMNIORB_CPPFLAGS = -D__OMNIORB4__ -I$(CORBA_STUB_DIR) $(OMNITHREAD_CPPFLAGS)
+ OMNIORB_IDL_OUTPUTDIR_PATTERN = -C%
+ 
+-msvc_work_around_stub = $(patsubst %,$(LibPattern),msvcstub) \
+-                        -NODEFAULTLIB:libcmt.lib -NODEFAULTLIB:libcmtd.lib 
++msvc_work_around_stub = $(patsubst %,$(LibPattern),msvcstub) 
+ 
+ OMNIORB_LIB = $(omniorb_dll_name) \
+ 		$(omnidynamic_dll_name) \
+diff --git a/src/tool/dir.mk b/src/tool/dir.mk
+index c6cb127d9..d75ba288a 100644
+--- a/src/tool/dir.mk
++++ b/src/tool/dir.mk
+@@ -11,7 +11,7 @@ SUBDIRS = omkdepend omniidl
+ endif
+ 
+ ifdef Win32Platform
+-SUBDIRS = omniidl
++SUBDIRS = omkdepend omniidl
+ endif
+ 
+ 
+diff --git a/mk/win32.mk b/mk/win32.mk
+index 6d320a2bd..3983eba5c 100644
+--- a/mk/win32.mk
++++ b/mk/win32.mk
+@@ -40,12 +40,7 @@ SORT = sort
+ endif
+ 
+ 
+-AR = $(BASE_OMNI_TREE)/$(WRAPPER_FPATH)/libwrapper $(XLN)
+-CXX = $(BASE_OMNI_TREE)/$(WRAPPER_FPATH)/clwrapper $(XLN)
+-CXXLINK	= $(BASE_OMNI_TREE)/$(WRAPPER_FPATH)/linkwrapper $(XLN)
+ CXXMAKEDEPEND = $(BASE_OMNI_TREE)/$(WRAPPER_FPATH)/omkdepend $(MKDEPOPT) -D__cplusplus -D_MSC_VER
+-CC = $(BASE_OMNI_TREE)/$(WRAPPER_FPATH)/clwrapper $(XLN)
+-CLINK = $(BASE_OMNI_TREE)/$(WRAPPER_FPATH)/linkwrapper $(XLN)
+ CMAKEDEPEND = $(BASE_OMNI_TREE)/$(WRAPPER_FPATH)/omkdepend $(MKDEPOPT) -D_MSC_VER
+ 
+ RCTOOL          = rc.exe
+@@ -83,7 +83,7 @@ endif
+ ifndef WINVER
+ endif
+ 
+-IMPORT_CPPFLAGS += -D__WIN32__ -D_WIN32_WINNT=$(WINVER)
++IMPORT_CPPFLAGS += -D__WIN32__
+ 
+ SOCKET_LIB = ws2_32.lib mswsock.lib
+ 
+diff --git a/mk/beforeauto.mk.in b/mk/beforeauto.mk.in
+index b7087ea36..d7a826fa9 100644
+--- a/mk/beforeauto.mk.in
++++ b/mk/beforeauto.mk.in
+@@ -36,6 +36,8 @@ BINDIR  = bin
+ 
+ prefix        	 := @prefix@
+ exec_prefix   	 := @exec_prefix@
++includedir   	   := @includedir@
++libdir   	       := @libdir@
+ INSTALLTARGET 	 := 1
+ INSTALLINCDIR 	 := $(DESTDIR)@includedir@
+ INSTALLBINDIR 	 := $(DESTDIR)@bindir@
+@@ -362,6 +364,9 @@ endef
+ #
+ # Patterns for various file types
+ #
++
++ifndef Win32Platform
++
+ LibPathPattern    = -L%
+ LibNoDebugPattern = lib%.a
+ LibDebugPattern = lib%.a
+@@ -371,6 +376,37 @@ LibSearchPattern = -l%
+ BinPattern = %
+ TclScriptPattern = %
+ 
++else
++
++LibPathPattern = -libpath:%
++LibNoDebugPattern = %.lib
++LibDebugPattern = %d.lib
++DLLNoDebugPattern = %_rt.lib
++DLLDebugPattern = %_rtd.lib
++LibNoDebugSearchPattern = %.lib
++LibDebugSearchPattern = %d.lib
++DLLNoDebugSearchPattern = %_rt.lib
++DLLDebugSearchPattern = %_rtd.lib
++
++
++ifndef BuildDebugBinary
++
++LibPattern = $(LibNoDebugPattern)
++DLLPattern = $(DLLNoDebugPattern)
++LibSearchPattern = $(LibNoDebugSearchPattern)
++DLLSearchPattern = $(DLLNoDebugSearchPattern)
++
++else
++
++LibPattern = $(LibDebugPattern)
++DLLPattern = $(DLLDebugPattern)
++LibSearchPattern = $(LibDebugSearchPattern)
++DLLSearchPattern = $(DLLDebugSearchPattern)
++endif
++
++endif
++
++
+ 
+ #
+ # Stuff to generate statically-linked libraries.
+diff --git a/src/services/mklib/dynstublib/dir.mk b/src/services/mklib/dynstublib/dir.mk
+index e128aa87a..f2e1448b3 100644
+--- a/src/services/mklib/dynstublib/dir.mk
++++ b/src/services/mklib/dynstublib/dir.mk
+@@ -17,6 +17,14 @@ ifdef Win32Platform
+   MSVC_STATICLIB_CXXDEBUGFLAGS += -D_WINSTATIC
+ endif
+ 
++ifdef Win32Platform
++# in case of Win32 lossage:
++dynimps := COS$(OMNIORB_MAJOR_VERSION)$(OMNIORB_MINOR_VERSION)$(OMNIORB_MICRO_VERSION)_rt.lib \
++           $(patsubst $(DLLDebugSearchPattern),$(DLLNoDebugSearchPattern), $(OMNIORB_LIB))
++else
++dynimps := $(OMNIORB_COS_LIB) $(OMNIORB_LIB)
++endif
++
+ ifndef NoReleaseBuild
+ all:: mkstatic mkshared
+ 
+@@ -75,14 +83,6 @@ dynskshared   = shared/$(shell $(SharedLibraryFullName) $(dynsknamespec))
+ 
+ MDFLAGS += -p shared/
+ 
+-ifdef Win32Platform
+-# in case of Win32 lossage:
+-dynimps := COS$(OMNIORB_MAJOR_VERSION)$(OMNIORB_MINOR_VERSION)$(OMNIORB_MICRO_VERSION)_rt.lib \
+-           $(patsubst $(DLLDebugSearchPattern),$(DLLNoDebugSearchPattern), $(OMNIORB_LIB))
+-else
+-dynimps := $(OMNIORB_COS_LIB) $(OMNIORB_LIB)
+-endif
+-
+ mkshared::
+ 	@(dir=shared; $(CreateDir))
+ 
+diff --git a/mk/win32.mk b/mk/win32.mk
+index 83f1b1687..741835b4b 100644
+--- a/mk/win32.mk
++++ b/mk/win32.mk
+@@ -43,5 +43,5 @@ endif
+-CXXMAKEDEPEND = $(BASE_OMNI_TREE)/$(WRAPPER_FPATH)/omkdepend $(MKDEPOPT) -D__cplusplus -D_MSC_VER
++CXXMAKEDEPEND = $(OMKDEPEND) -D__cplusplus -D_MSC_VER
+-CMAKEDEPEND = $(BASE_OMNI_TREE)/$(WRAPPER_FPATH)/omkdepend $(MKDEPOPT) -D_MSC_VER
++CMAKEDEPEND = $(OMKDEPEND) $(MKDEPOPT) -D_MSC_VER
+ 
+ RCTOOL          = rc.exe
+ MANIFESTTOOL    = true
+@@ -145,7 +145,7 @@ BinPattern = %.exe
+ define StaticLinkLibrary
+ (set -x; \
+  $(RM) $@; \
+- $(AR) $@ $^; \
++ $(AR) -OUT:$@ $^; \
+ )
+ endef
+ 
+@@ -439,12 +444,11 @@ endef
+ # The pattern rules below ensured that the right compiler flags are used
+ # to compile the source for the library.
+ 
++ifndef NoReleaseBuild
++
+ static/%.o: %.cc
+ 	$(CXX) -c $(CXXDEBUGFLAGS) $(MSVC_STATICLIB_CXXNODEBUGFLAGS) $(CPPFLAGS) -Fo$@ -Fdstatic\\$(LIB_NAME)$(major).pdb $<
+ 
+-debug/%.o: %.cc
+-	$(CXX) -c  $(MSVC_STATICLIB_CXXDEBUGFLAGS) $(CPPFLAGS) -Fo$@ -Fddebug\\$(LIB_NAME)$(major)d.pdb $<
+-
+ shared/%DynSK.o: %DynSK.cc
+ 	$(CXX) -c $(CXXDEBUGFLAGS) -DUSE_core_stub_in_nt_dll $(MSVC_DLL_CXXNODEBUGFLAGS) $(CPPFLAGS) -Fo$@ -Fdshared\\ $<
+ 
+@@ -454,6 +458,18 @@ shared/%SK.o: %SK.cc
+ shared/%.o: %.cc
+ 	$(CXX) -c $(CXXDEBUGFLAGS) $(MSVC_DLL_CXXNODEBUGFLAGS) $(CPPFLAGS) -Fo$@ -Fdshared\\ $<
+ 
++static/%.o: %.c
++	$(CC) -c $(CDEBUGFLAGS) $(MSVC_STATICLIB_CXXNODEBUGFLAGS) $(CPPFLAGS) -Fo$@ -Fdstatic\\$(LIB_NAME)$(major).pdb $<
++
++shared/%.o: %.c
++	$(CC) -c $(CDEBUGFLAGS) $(MSVC_DLL_CXXNODEBUGFLAGS) $(CPPFLAGS) -Fo$@ $<
++
++endif
++
++ifndef NoDebugBuild
++
++debug/%.o: %.cc
++	$(CXX) -c  $(MSVC_STATICLIB_CXXDEBUGFLAGS) $(CPPFLAGS) -Fo$@ -Fddebug\\$(LIB_NAME)$(major)d.pdb $<
+ 
+ shareddebug/%DynSK.o: %DynSK.cc
+ 	$(CXX) -c  -DUSE_core_stub_in_nt_dll $(MSVC_DLL_CXXDEBUGFLAGS) $(CPPFLAGS) -Fo$@ -Fdshareddebug\\ $<
+@@ -464,19 +480,14 @@ shareddebug/%SK.o: %SK.cc
+ shareddebug/%.o: %.cc
+ 	$(CXX) -c  $(MSVC_DLL_CXXDEBUGFLAGS) $(CPPFLAGS) -Fo$@ -Fdshareddebug\\ $<
+ 
+-static/%.o: %.c
+-	$(CC) -c $(CDEBUGFLAGS) $(MSVC_STATICLIB_CXXNODEBUGFLAGS) $(CPPFLAGS) -Fo$@ -Fdstatic\\$(LIB_NAME)$(major).pdb $<
+-
+ debug/%.o: %.c
+ 	$(CC) -c $(MSVC_STATICLIB_CXXDEBUGFLAGS) $(CPPFLAGS) -Fo$@ -Fdstatic\\$(LIB_NAME)$(major)d.pdb $<
+ 
+-shared/%.o: %.c
+-	$(CC) -c $(CDEBUGFLAGS) $(MSVC_DLL_CXXNODEBUGFLAGS) $(CPPFLAGS) -Fo$@ $<
+-
+-
+ shareddebug/%.o: %.c
+ 	$(CC) -c  $(MSVC_DLL_CXXDEBUGFLAGS) $(CPPFLAGS) -Fo$@ $<
+ 
++endif
++
+ 
+ #
+ # Replacements for implicit rules
diff --git a/external_imported/vcpkg/ports/omniorb/def_gen_fix.patch b/external_imported/vcpkg/ports/omniorb/def_gen_fix.patch
new file mode 100644
index 000000000..5034c2e13
--- /dev/null
+++ b/external_imported/vcpkg/ports/omniorb/def_gen_fix.patch
@@ -0,0 +1,18 @@
+diff --git a/mk/win32.mk b/mk/win32.mk
+index fc179563e..15903919a 100644
+--- a/mk/win32.mk
++++ b/mk/win32.mk
+@@ -264,12 +264,12 @@ endef
+ define MakeCXXExportSymbolDefinitionFile
+ symrefdir=$${debug:+debug}; \
+ symreflib=$(SharedLibrarySymbolRefLibraryTemplate); \
+ if [ ! -f $$symreflib ]; then echo "Cannot find reference static library $$symreflib"; return 1; fi;  \
+ set -x; \
+ echo "LIBRARY $$dllbase" > $$defname; \
+ echo "VERSION $$version" >> $$defname; \
+ echo "EXPORTS" >> $$defname; \
+-DUMPBIN.EXE /SYMBOLS $$symreflib | \
++DUMPBIN.EXE $$symreflib -SYMBOLS | \
+ egrep '^[^ ]+ +[^ ]+ +SECT[^ ]+ +[^ ]+ +\(\) +External +\| +\?[^ ]*|^[^ ]+ +[^ ]+ +SECT[^ ]+ +[^ ]+ +External +\| +\?[^?][^ ]*'|\
+ egrep -v 'deleting destructor[^(]+\(unsigned int\)' | \
+ egrep -v 'anonymous namespace' | \
diff --git a/external_imported/vcpkg/ports/omniorb/fix_dependency.patch b/external_imported/vcpkg/ports/omniorb/fix_dependency.patch
new file mode 100644
index 000000000..39398c3bc
--- /dev/null
+++ b/external_imported/vcpkg/ports/omniorb/fix_dependency.patch
@@ -0,0 +1,78 @@
+diff --git a/mk/mklib.mk b/mk/mklib.mk
+index fb83cf391..9b28a314b 100644
+--- a/mk/mklib.mk
++++ b/mk/mklib.mk
+@@ -100,6 +100,10 @@ $(shlib): $(patsubst %, shared/%, $(LIB_OBJS) $(LIB_SHARED_ONLY_OBJS))
+ 	@(namespec="$(namespec)" extralibs="$(imps) $(extralibs)"; \
+          $(MakeCXXSharedLibrary))
+ 
++ifdef Win32Platform
++$(shlib): | $(staticlib)
++endif
++
+ export:: $(shlib)
+ 	@(namespec="$(namespec)"; \
+           $(ExportSharedLibrary))
+@@ -209,6 +211,10 @@ $(dbugshlib): $(patsubst %, shareddebug/%, $(LIB_OBJS) $(LIB_SHARED_ONLY_OBJS))
+ 	(namespec="$(namespec)" debug=1 extralibs="$(dbugimps) $(extralibs)"; \
+          $(MakeCXXSharedLibrary))
+ 
++ifdef Win32Platform
++$(dbugshlib): | $(dbuglib)
++endif
++
+ export:: $(dbugshlib)
+ 	@(namespec="$(namespec)" debug=1; \
+           $(ExportSharedLibrary))
+diff --git a/src/services/mklib/stublib/dir.mk b/src/services/mklib/stublib/dir.mk
+index ce46f6c5f..eb619e5c5 100644
+--- a/src/services/mklib/stublib/dir.mk
++++ b/src/services/mklib/stublib/dir.mk
+@@ -92,6 +92,10 @@ $(skshared): $(patsubst %, shared/%, $(COS_SK_OBJS))
+ 	@(namespec="$(sknamespec)"; extralibs="$(imps) $(extralibs)"; \
+          $(MakeCXXSharedLibrary))
+ 
++ifdef Win32Platform
++$(skshared): | $(sk)
++endif
++
+ export:: $(skshared)
+ 	@(namespec="$(sknamespec)"; \
+          $(ExportSharedLibrary))
+@@ -168,6 +170,10 @@ $(skshareddbug): $(patsubst %, shareddebug/%, $(COS_SK_OBJS))
+ 	(namespec="$(sknamespec)"; debug=1; extralibs="$(dbugimps) $(extralibs)"; \
+          $(MakeCXXSharedLibrary))
+ 
++ifdef Win32Platform
++$(skshareddbug): | $(skdbug)
++endif
++
+ export:: $(skshareddbug)
+ 	@(namespec="$(sknamespec)" debug=1; \
+          $(ExportSharedLibrary))
+diff --git a/src/services/mklib/dynstublib/dir.mk b/src/services/mklib/dynstublib/dir.mk
+index f2e1448b3..9134e8aba 100644
+--- a/src/services/mklib/dynstublib/dir.mk
++++ b/src/services/mklib/dynstublib/dir.mk
+@@ -92,6 +92,10 @@ $(dynskshared): $(skshared) $(patsubst %, shared/%, $(COS_DYNSK_OBJS))
+ 	@(namespec="$(dynsknamespec)"; extralibs="$(dynimps)"; \
+          $(MakeCXXSharedLibrary))
+ 
++ifdef Win32Platform
++$(dynskshared): | $(dynsk)
++endif
++
+ export:: $(dynskshared)
+ 	@(namespec="$(dynsknamespec)"; \
+          $(ExportSharedLibrary))
+@@ -169,6 +171,10 @@ $(dynskshareddbug): $(patsubst %, shareddebug/%, $(COS_DYNSK_OBJS))
+ 	@(namespec="$(dynsknamespec)"; debug=1; extralibs="$(skshareddbug) $(dbugimps) $(extralibs)"; \
+          $(MakeCXXSharedLibrary))
+ 
++ifdef Win32Platform
++$(dynskshareddbug): | $(dynskdbug)
++endif
++
+ export:: $(dynskshareddbug)
+ 	@(namespec="$(dynsknamespec)" debug=1; \
+          $(ExportSharedLibrary))
diff --git a/external_imported/vcpkg/ports/omniorb/hardcode_vaargs_for_msvc.patch b/external_imported/vcpkg/ports/omniorb/hardcode_vaargs_for_msvc.patch
new file mode 100644
index 000000000..add8ec080
--- /dev/null
+++ b/external_imported/vcpkg/ports/omniorb/hardcode_vaargs_for_msvc.patch
@@ -0,0 +1,76 @@
+diff --git a/src/tool/omniidl/cxx/cccp/cccp.c b/src/tool/omniidl/cxx/cccp/cccp.c
+index 507c330..5651b3e 100644
+--- a/src/tool/omniidl/cxx/cccp/cccp.c
++++ b/src/tool/omniidl/cxx/cccp/cccp.c
+@@ -182,15 +182,20 @@ my_bzero (b, length)
+ # endif
+ #endif
+ 
++#if defined(_MSC_VER)
++#define OMNI_HAVE_VPRINTF
++#define __STDC__
++#endif
++
+ #if defined (__STDC__) && defined (OMNI_HAVE_VPRINTF)
+ # include <stdarg.h>
+ # define VA_START(va_list, var) va_start (va_list, var)
+ # define PRINTF_ALIST(msg) char *msg, ...
+ # define PRINTF_DCL(msg)
+ # define PRINTF_PROTO(ARGS, m, n) PROTO (ARGS) __attribute__ ((format (__printf__, m, n)))
+ #else
+ # include <varargs.h>
+ # define VA_START(va_list, var) va_start (va_list)
+ # define PRINTF_ALIST(msg) msg, va_alist
+ # define PRINTF_DCL(msg) char *msg; va_dcl
+ # define PRINTF_PROTO(ARGS, m, n) () __attribute__ ((format (__printf__, m, n)))
+diff --git a/src/tool/omniidl/cxx/cccp/cexp.c b/src/tool/omniidl/cxx/cccp/cexp.c
+index 4b4679c..b534fb3 100644
+--- a/src/tool/omniidl/cxx/cccp/cexp.c
++++ b/src/tool/omniidl/cxx/cccp/cexp.c
+@@ -152,15 +152,20 @@ struct arglist {
+ # endif
+ #endif
+ 
++#if defined(_MSC_VER)
++#define OMNI_HAVE_VPRINTF
++#define __STDC__
++#endif
++
+ #if defined (__STDC__) && defined (OMNI_HAVE_VPRINTF)
+ # include <stdarg.h>
+ # define VA_START(va_list, var) va_start (va_list, var)
+ # define PRINTF_ALIST(msg) char *msg, ...
+ # define PRINTF_DCL(msg)
+ # define PRINTF_PROTO(ARGS, m, n) PROTO (ARGS) __attribute__ ((format (__printf__, m, n)))
+ #else
+ # include <varargs.h>
+ # define VA_START(va_list, var) va_start (va_list)
+ # define PRINTF_ALIST(msg) msg, va_alist
+ # define PRINTF_DCL(msg) char *msg; va_dcl
+ # define PRINTF_PROTO(ARGS, m, n) () __attribute__ ((format (__printf__, m, n)))
+diff --git a/src/tool/omniidl/cxx/cccp/cexp.y.source b/src/tool/omniidl/cxx/cccp/cexp.y.source
+index 6fc69f5..6f59873 100644
+--- a/src/tool/omniidl/cxx/cccp/cexp.y.source
++++ b/src/tool/omniidl/cxx/cccp/cexp.y.source
+@@ -111,15 +111,20 @@ struct arglist {
+ # endif
+ #endif
+ 
++#if defined(_MSC_VER)
++#define OMNI_HAVE_VPRINTF
++#define __STDC__
++#endif
++
+-#if defined (__STDC__) && defined (HAVE_VPRINTF)
++#if defined (__STDC__) && defined (OMNI_HAVE_VPRINTF)
+ # include <stdarg.h>
+ # define VA_START(va_list, var) va_start (va_list, var)
+ # define PRINTF_ALIST(msg) char *msg, ...
+ # define PRINTF_DCL(msg)
+ # define PRINTF_PROTO(ARGS, m, n) PROTO (ARGS) __attribute__ ((format (__printf__, m, n)))
+ #else
+ # include <varargs.h>
+ # define VA_START(va_list, var) va_start (va_list)
+ # define PRINTF_ALIST(msg) msg, va_alist
+ # define PRINTF_DCL(msg) char *msg; va_dcl
+ # define PRINTF_PROTO(ARGS, m, n) () __attribute__ ((format (__printf__, m, n)))
diff --git a/external_imported/vcpkg/ports/omniorb/msvc-src-build-fixes.patch b/external_imported/vcpkg/ports/omniorb/msvc-src-build-fixes.patch
new file mode 100644
index 000000000..fb7ae6716
--- /dev/null
+++ b/external_imported/vcpkg/ports/omniorb/msvc-src-build-fixes.patch
@@ -0,0 +1,13 @@
+diff --git a/include/omnithread/atomic.h b/include/omnithread/atomic.h
+index 3fed8df..e1b6a71 100644
+--- a/include/omnithread/atomic.h
++++ b/include/omnithread/atomic.h
+@@ -27,7 +27,7 @@
+ #define __omnithread_atomic_h_
+ 
+ 
+-#ifdef OMNI_HAVE_SYNC_ADD_AND_FETCH
++#if defined(OMNI_HAVE_SYNC_ADD_AND_FETCH) && !defined(_MSC_VER)
+ 
+ #  define OMNI_REFCOUNT_DEFINED
+ 
diff --git a/external_imported/vcpkg/ports/omniorb/portfile.cmake b/external_imported/vcpkg/ports/omniorb/portfile.cmake
new file mode 100644
index 000000000..67c57931c
--- /dev/null
+++ b/external_imported/vcpkg/ports/omniorb/portfile.cmake
@@ -0,0 +1,219 @@
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://netcologne.dl.sourceforge.net/project/omniorb/omniORB/omniORB-4.3.0/omniORB-4.3.0.tar.bz2"
+    FILENAME "omniORB-${VERSION}.tar.bz2"
+    SHA512 b081c1acbea3c7bee619a288fec209a0705b7d436f8e5fd4743675046356ef271a8c75882334fcbde4ff77d15f54d2da55f6cfcd117b01e42919d04fd29bfe2f
+)
+
+if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+set (PATCHES 
+      hardcode_vaargs_for_msvc.patch
+    )
+set (OPTIONS 
+      ac_cv_prog_cc_g=yes
+      ac_cv_prog_cxx_11=no
+      ac_cv_prog_cxx_g=yes
+      omni_cv_sync_add_and_fetch=no
+    )
+endif()
+
+vcpkg_extract_source_archive(
+    SOURCE_PATH
+    ARCHIVE "${ARCHIVE}"
+    PATCHES 
+      fix_dependency.patch
+      def_gen_fix.patch
+      msvc-src-build-fixes.patch
+      release-debug-static.patch
+      add_win_into_autotools.patch
+      python-fixes.patch
+      ${PATCHES}
+)
+
+vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/python3") # port ask python distutils for info.
+if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+  set(ENV{PYTHONPATH} "${CURRENT_HOST_INSTALLED_DIR}/tools/python3/Lib${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/python${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/python")
+endif()
+
+if(NOT VCPKG_TARGET_IS_WINDOWS)
+    file(GLOB _py3_include_path "${CURRENT_HOST_INSTALLED_DIR}/include/python3*")
+    string(REGEX MATCH "python3\\.([0-9]+)" _python_version_tmp "${_py3_include_path}")
+    set(PYTHON_VERSION_MINOR "${CMAKE_MATCH_1}")
+    list(APPEND OPTIONS "PYTHON=${CURRENT_HOST_INSTALLED_DIR}/tools/python3/python3.${PYTHON_VERSION_MINOR}")
+endif()
+
+vcpkg_find_acquire_program(FLEX)
+cmake_path(GET FLEX PARENT_PATH FLEX_DIR)
+vcpkg_add_to_path("${FLEX_DIR}")
+
+vcpkg_find_acquire_program(BISON)
+cmake_path(GET BISON PARENT_PATH BISON_DIR)
+vcpkg_add_to_path("${BISON_DIR}")
+
+if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+  set(z_vcpkg_org_linkage "${VCPKG_LIBRARY_LINKAGE}") 
+  # convoluted build system; shared builds requires 
+  # static library to create def file for symbol export
+  # tools seem to only dynamically link on windows due to make rules!
+  # zlib/zstd deps for ZIOP seem to not work on windows. At least configure
+  # won't run the required checks for some reasons.
+  set(VCPKG_LIBRARY_LINKAGE dynamic)
+  z_vcpkg_get_cmake_vars(cmake_vars_file)
+  include("${cmake_vars_file}")
+  if(VCPKG_BUILD_TYPE)
+    string(APPEND build_info "NoDebugBuild=1\n")
+  endif()
+  string(APPEND build_info "replace-with-per-config-text\n")
+  set(progs C_COMPILER CXX_COMPILER AR
+            LINKER RANLIB OBJDUMP MT
+            STRIP NM DLLTOOL RC_COMPILER)
+  list(TRANSFORM progs PREPEND "VCPKG_DETECTED_CMAKE_")
+  foreach(prog IN LISTS progs)
+      if(${prog})
+          set(path "${${prog}}")
+          unset(prog_found CACHE)
+          get_filename_component(${prog} "${${prog}}" NAME)
+          find_program(prog_found ${${prog}} PATHS ENV PATH NO_DEFAULT_PATH)
+          if(NOT path STREQUAL prog_found)
+              get_filename_component(path "${path}" DIRECTORY)
+              vcpkg_add_to_path(PREPEND ${path})
+          endif()
+      endif()
+  endforeach()
+  configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg.mk" "${SOURCE_PATH}/mk/platforms/vcpkg.mk" @ONLY NEWLINE_STYLE UNIX)
+  file(GLOB_RECURSE wrappers "${SOURCE_PATH}/bin/x86_win32/*")
+  file(COPY ${wrappers} DESTINATION "${SOURCE_PATH}/bin")
+endif()
+
+vcpkg_configure_make(
+  SOURCE_PATH "${SOURCE_PATH}"
+  AUTOCONFIG
+  NO_WRAPPERS
+  COPY_SOURCE
+  OPTIONS
+    ${OPTIONS}
+)
+
+if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+  vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel//mk/platforms/vcpkg.mk" "replace-with-per-config-text" "NoDebugBuild=1")
+  if(NOT VCPKG_BUILD_TYPE)
+    vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/mk/platforms/vcpkg.mk" "replace-with-per-config-text" "NoReleaseBuild=1\nBuildDebugBinary=1")
+    vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/tool/omniidl/cxx/dir.mk" "python$(subst .,,$(PYVERSION)).lib" "python$(subst .,,$(PYVERSION))_d.lib")
+    vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/tool/omniidl/cxx/dir.mk" "zlib.lib" "zlibd.lib")
+  endif()
+endif()
+
+vcpkg_install_make(
+  MAKEFILE "GNUmakefile"
+  ADD_BIN_TO_PATH
+)
+
+vcpkg_fixup_pkgconfig()
+
+if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+  file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/msvcstub.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
+  file(GLOB all_libs "${CURRENT_PACKAGES_DIR}/lib/*.lib")
+  set(import_libs "${all_libs}")
+  list(FILTER import_libs INCLUDE REGEX "(_rt.lib$|msvcstub)")
+  if(z_vcpkg_org_linkage STREQUAL "static")
+    file(REMOVE ${import_libs})
+  else()
+    list(REMOVE_ITEM all_libs ${import_libs})
+    file(REMOVE ${all_libs}) # remove installed static libs
+    set(to_copy_and_rename "${import_libs}")
+    list(FILTER to_copy_and_rename INCLUDE REGEX "3(0)?_rt.lib")
+    foreach(cp IN LISTS to_copy_and_rename)
+      string(REGEX REPLACE "3(0)?_rt" "" new_name "${cp}")
+      string(REGEX REPLACE "thread4" "thread" new_name "${new_name}")
+      file(COPY_FILE "${cp}" "${new_name}")
+    endforeach()
+    file(GLOB dll_files "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/*.dll")
+    file(COPY ${dll_files} DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
+    file(GLOB pc_files "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/*.pc")
+    foreach(pc_file IN LISTS pc_files)
+      get_filename_component(filename "${pc_file}" NAME_WE)
+      if(filename STREQUAL "omnithread3")
+        vcpkg_replace_string("${pc_file}" "-lomnithread" "-lomnithread_rt")
+      else()
+        vcpkg_replace_string("${pc_file}" "-l${filename}" "-l${filename}_rt")
+      endif()
+    endforeach()
+  endif()
+
+  if(NOT VCPKG_BUILD_TYPE) # dbg libs have no install rules so manually copy them.
+    file(GLOB all_libs "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/*.lib")
+    set(install_libs "${all_libs}")
+    if(z_vcpkg_org_linkage STREQUAL "static")
+      list(FILTER install_libs EXCLUDE REGEX "(_rtd.lib$|msvcstub)")
+    else() # dynamic lib
+      list(FILTER install_libs INCLUDE REGEX "(_rtd.lib$|msvcstub)")
+      set(to_copy_and_rename "${install_libs}")
+      list(FILTER to_copy_and_rename INCLUDE REGEX "3(0)?_rtd.lib")
+      foreach(cp IN LISTS to_copy_and_rename)
+        string(REGEX REPLACE "3(0)?_rt" "" new_name "${cp}")
+        string(REGEX REPLACE "thread4" "thread" new_name "${new_name}")
+        file(COPY_FILE "${cp}" "${new_name}")
+        list(APPEND install_libs "${new_name}")
+      endforeach()
+      file(GLOB dll_files "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/*.dll")
+      file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin")
+      file(COPY ${dll_files} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
+      file(GLOB pc_files "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*.pc")
+      foreach(pc_file IN LISTS pc_files)
+        get_filename_component(filename "${pc_file}" NAME_WE)
+        if(filename STREQUAL "omnithread3")
+          vcpkg_replace_string("${pc_file}" "-lomnithread" "-lomnithread_rtd")
+        else()
+          vcpkg_replace_string("${pc_file}" "-l${filename}" "-l${filename}_rtd")
+        endif()
+      endforeach()
+    endif()
+    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib")
+    file(COPY ${install_libs} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
+  endif()
+endif()
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING.LIB") # Lib is LGPL
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin" RENAME copyright) # Tools etc are GPL
+
+vcpkg_copy_pdbs()
+
+if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+file(COPY
+      "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/omnicpp${VCPKG_TARGET_EXECUTABLE_SUFFIX}"
+    DESTINATION
+      "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin"
+    )
+endif()
+
+file(COPY
+      "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/omniidl${VCPKG_TARGET_EXECUTABLE_SUFFIX}"
+    DESTINATION
+      "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin"
+    )
+
+vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin")
+
+# Restore old linkage info. 
+if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+   set(VCPKG_LIBRARY_LINKAGE "${z_vcpkg_org_linkage}")
+endif()
+
+if(NOT VCPKG_TARGET_IS_WINDOWS)
+  vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/omniidl" "${CURRENT_INSTALLED_DIR}" "\"os.path.dirname(__file__)+\"/../../../")
+endif()
+
+set(del_files "")
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+  file(GLOB del_files "${CURRENT_PACKAGES_DIR}/lib/*.a" "${CURRENT_PACKAGES_DIR}/debug/lib/*.a")
+  if(del_files)
+    file(REMOVE ${del_files})
+  endif()
+else()
+  file(GLOB del_files "${CURRENT_PACKAGES_DIR}/lib/*.so*" "${CURRENT_PACKAGES_DIR}/debug/lib/*.so*")
+  if(del_files)
+    file(REMOVE ${del_files})
+  endif()
+endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
diff --git a/external_imported/vcpkg/ports/omniorb/python-fixes.patch b/external_imported/vcpkg/ports/omniorb/python-fixes.patch
new file mode 100644
index 000000000..3555db758
--- /dev/null
+++ b/external_imported/vcpkg/ports/omniorb/python-fixes.patch
@@ -0,0 +1,46 @@
+diff --git a/mk/python.mk b/mk/python.mk
+index 1380018..fb321a5 100644
+--- a/mk/python.mk
++++ b/mk/python.mk
+@@ -4,7 +4,7 @@
+ 
+ PYVERSION := $(shell $(PYTHON) -c 'import sys; sys.stdout.write(".".join(sys.version.split(".")[:2]))')
+ PYPREFIX  := $(shell $(PYTHON) -c 'import sys; sys.stdout.write(sys.exec_prefix.replace("\\","/"))')
+-PYINCDIR  := $(shell $(PYTHON) -c 'import sys, distutils.sysconfig; sys.stdout.write(distutils.sysconfig.get_python_inc().replace("\\","/"))')
++PYINCDIR  := $(includedir)/python$(PYVERSION)
+ 
+ PythonSHAREDLIB_SUFFIX = $(shell $(PYTHON) -c 'import sys, distutils.sysconfig; sys.stdout.write((distutils.sysconfig.get_config_var("SO") or ".so").lstrip("."))')
+ 
+diff --git a/src/tool/omniidl/cxx/idlpython.cc b/src/tool/omniidl/cxx/idlpython.cc
+index 639515105..27ad3ee0e 100644
+--- a/src/tool/omniidl/cxx/idlpython.cc
++++ b/src/tool/omniidl/cxx/idlpython.cc
+@@ -27,8 +27,6 @@
+ 
+ // On Windows, if _DEBUG is defined, some Python versions try to force
+ // use of _d.lib libraries that are not actually present.
+-#undef _DEBUG
+-
+ #include <Python.h>
+ 
+ #include <idlsysdep.h>
+diff --git a/src/tool/omniidl/cxx/dir.mk b/src/tool/omniidl/cxx/dir.mk
+index 84f10ac03..3b5a60b87 100644
+--- a/src/tool/omniidl/cxx/dir.mk
++++ b/src/tool/omniidl/cxx/dir.mk
+@@ -190,13 +190,13 @@ ifdef Win32Platform
+ 
+ DIR_CPPFLAGS += -DMSDOS -DOMNIIDL_EXECUTABLE
+ 
+-PYLIBDIR := $(PYPREFIX)/libs $(PYPREFIX)/lib/x86_win32
++PYLIBDIR := $(libdir)
+ 
+ ifdef MinGW32Build
+ PYLIB     := -lpython$(subst .,,$(PYVERSION))
+ CXXLINKOPTIONS += $(patsubst %,-L%,$(PYLIBDIR))
+ else
+-PYLIB     := python$(subst .,,$(PYVERSION)).lib
++PYLIB     = python$(subst .,,$(PYVERSION)).lib zlib.lib Advapi32.lib
+ CXXLINKOPTIONS += $(patsubst %,-libpath:%,$(PYLIBDIR))
+ endif
+ 
diff --git a/external_imported/vcpkg/ports/omniorb/release-debug-static.patch b/external_imported/vcpkg/ports/omniorb/release-debug-static.patch
new file mode 100644
index 000000000..f9cc82409
--- /dev/null
+++ b/external_imported/vcpkg/ports/omniorb/release-debug-static.patch
@@ -0,0 +1,319 @@
+diff --git a/mk/mklib.mk b/mk/mklib.mk
+index 8f64b14dd..1d73cfdbe 100644
+--- a/mk/mklib.mk
++++ b/mk/mklib.mk
+@@ -16,6 +16,8 @@
+ # are called libfoo.a and libfoo.so.1.3 etc.
+ #
+ 
++ifndef NoReleaseBuild
++
+ all:: mkstatic mkshared
+ 
+ export:: mkstatic mkshared
+@@ -147,9 +149,13 @@ mkshared::
+ 
+ endif
+ 
++endif
++
+ ##############################################################################
+ # Build debug libraries for Win32
+ ##############################################################################
++ifndef NoDebugBuild
++
+ ifdef Win32Platform
+ 
+ ifdef BuildSharedLibrary
+@@ -231,3 +237,4 @@ veryclean::
+ 
+ endif
+ endif
++endif
+\ No newline at end of file
+diff --git a/src/lib/dir.mk b/src/lib/dir.mk
+index 732f8457c..bff3144f8 100644
+--- a/src/lib/dir.mk
++++ b/src/lib/dir.mk
+@@ -17,9 +17,14 @@ ciao::
+ ifndef EmbeddedSystem
+ ifdef Win32Platform
+ ifndef MinGW32Build
++ifndef NoReleaseBuild
+ export::
+ 	(cd $(EXPORT_TREE)/$(BINDIR); editbin /REBASE:BASE=0x68000000,DOWN *_rt.dll; )
++endif
++ifndef NoDebugBuild
++export::
+ 	(cd $(EXPORT_TREE)/$(BINDIR); editbin /REBASE:BASE=0x68000000,DOWN *_rtd.dll; )
+ endif
+ endif
+ endif
++endif
+diff --git a/src/lib/omnithread/dir.mk b/src/lib/omnithread/dir.mk
+index ed2194c98..adb87adba 100644
+--- a/src/lib/omnithread/dir.mk
++++ b/src/lib/omnithread/dir.mk
+@@ -32,14 +32,6 @@ LIB_VERSION  := $(OMNITHREAD_VERSION)
+ LIB_OBJS     := $(CXXSRCS:.cc=.o)
+ LIB_IMPORTS  := $(OMNITHREAD_PLATFORM_LIB)
+ 
+-all:: mkstatic mkshared
+-
+-export:: mkstatic mkshared
+-
+-ifdef INSTALLTARGET
+-install:: mkstatic mkshared
+-endif
+-
+ vers := $(subst ., ,$(LIB_VERSION))
+ ifeq ($(words $(vers)), 2)
+   vers  := _ $(vers)
+@@ -50,6 +42,16 @@ endif
+ 
+ namespec := $(LIB_NAME) $(vers)
+ 
++ifndef NoReleaseBuild
++
++all:: mkstatic mkshared
++
++export:: mkstatic mkshared
++
++ifdef INSTALLTARGET
++install:: mkstatic mkshared
++endif
++
+ ##############################################################################
+ # Build Static library
+ ##############################################################################
+@@ -158,9 +160,12 @@ mkshared::
+ 
+ endif
+ 
++endif
+ ##############################################################################
+ # Build debug libraries for Win32
+ ##############################################################################
++ifndef NoDebugBuild
++
+ ifdef Win32Platform
+ 
+ ifdef BuildSharedLibrary
+@@ -239,4 +244,4 @@ veryclean::
+ 
+ endif
+ endif
+-
++endif
+diff --git a/src/services/mklib/dynstublib/dir.mk b/src/services/mklib/dynstublib/dir.mk
+index 23573345d..e128aa87a 100644
+--- a/src/services/mklib/dynstublib/dir.mk
++++ b/src/services/mklib/dynstublib/dir.mk
+@@ -12,15 +12,18 @@ COS_DYNSK_SRCS = $(COS_INTERFACES:%=%DynSK.cc)
+ 
+ CXXSRCS = $(COS_DYNSK_SRCS)
+ 
+-all:: mkstatic mkshared
+-
+-export:: mkstatic mkshared
+-
+ ifdef Win32Platform
+   MSVC_STATICLIB_CXXNODEBUGFLAGS += -D_WINSTATIC
+   MSVC_STATICLIB_CXXDEBUGFLAGS += -D_WINSTATIC
+ endif
+ 
++ifndef NoReleaseBuild
++all:: mkstatic mkshared
++
++export:: mkstatic mkshared
++
++
++
+ 
+ ##############################################################################
+ # Build Static library
+@@ -108,10 +111,11 @@ else
+ mkshared::
+ 
+ endif
+-
++endif
+ ##############################################################################
+ # Build debug libraries for Win32
+ ##############################################################################
++ifndef NoDebugBuild
+ ifdef Win32Platform
+ 
+ all:: mkstaticdbug mkshareddbug
+@@ -145,6 +149,7 @@ clean::
+ #####################################################
+ #      DLL debug libraries
+ #####################################################
++
+ shareddbugversion = $(OMNIORB_VERSION)
+ 
+ dynsknamespec   = $(subst ., ,$(COS_DYNSKLIB_NAME).$(shareddbugversion))
+@@ -173,3 +178,4 @@ clean::
+ 	@(dir=shareddebug; $(CleanSharedLibrary))
+ 
+ endif
++endif
+\ No newline at end of file
+diff --git a/src/services/mklib/mkBOAlib/dir.mk b/src/services/mklib/mkBOAlib/dir.mk
+index 1869d083d..18cc38764 100644
+--- a/src/services/mklib/mkBOAlib/dir.mk
++++ b/src/services/mklib/mkBOAlib/dir.mk
+@@ -16,6 +16,8 @@ COS_SK_OBJS = $(COS_INTERFACES:%=%SK.o)
+ COS_SK_SRCS = $(COS_INTERFACES:%=%SK.cc)
+ CXXSRCS = $(COS_SK_SRCS) 
+ 
++ifndef NoReleaseBuild
++
+ all:: mkstatic mkshared
+ 
+ export:: mkstatic mkshared
+@@ -124,10 +126,11 @@ else
+ mkshared::
+ 
+ endif
+-
++endif
+ ##############################################################################
+ # Build debug libraries for Win32
+ ##############################################################################
++ifndef NoDebugBuild
+ ifdef Win32Platform
+ 
+ all:: mkstaticdbug mkshareddbug
+@@ -190,4 +193,4 @@ clean::
+ 
+ endif
+ 
+-
++endif
+diff --git a/src/services/mklib/stublib/dir.mk b/src/services/mklib/stublib/dir.mk
+index d58027d84..87f7ec22b 100644
+--- a/src/services/mklib/stublib/dir.mk
++++ b/src/services/mklib/stublib/dir.mk
+@@ -12,15 +12,18 @@ COS_SK_SRCS = $(COS_INTERFACES:%=%SK.cc)
+ 
+ CXXSRCS = $(COS_SK_SRCS)
+ 
+-all:: mkstatic mkshared
+-
+-export:: mkstatic mkshared
+-
+ ifdef Win32Platform
+   MSVC_STATICLIB_CXXNODEBUGFLAGS += -D_WINSTATIC
+   MSVC_STATICLIB_CXXDEBUGFLAGS += -D_WINSTATIC
+ endif
+ 
++ifndef NoReleaseBuild
++
++all:: mkstatic mkshared
++
++export:: mkstatic mkshared
++
++
+ 
+ ##############################################################################
+ # Build Static library
+@@ -108,10 +111,11 @@ else
+ mkshared::
+ 
+ endif
+-
++endif
+ ##############################################################################
+ # Build debug libraries for Win32
+ ##############################################################################
++ifdef NoDebugBuild
+ ifdef Win32Platform
+ 
+ all:: mkstaticdbug mkshareddbug
+@@ -173,3 +177,4 @@ clean::
+ 	@(dir=shareddebug; $(CleanSharedLibrary))
+ 
+ endif
++endif
+diff --git a/src/lib/omniORB/orbcore/dir.mk b/src/lib/omniORB/orbcore/dir.mk
+index 634e6b1e2..4370fed07 100644
+--- a/src/lib/omniORB/orbcore/dir.mk
++++ b/src/lib/omniORB/orbcore/dir.mk
+@@ -220,6 +220,7 @@ include $(BASE_OMNI_TREE)/mk/mklib.mk
+ 
+ #########################################################################
+ ifdef Win32Platform
++ifndef NoReleaseBuild
+ 
+ stublib = static/$(patsubst %,$(LibNoDebugPattern),msvcstub)
+ 
+@@ -236,6 +237,8 @@ clean::
+ 
+ veryclean::
+ 	$(RM) $(stublib)
++endif
++ifndef NoDebugBuild
+ 
+ stubdblib = debug/$(patsubst %,$(LibDebugPattern),msvcstub)
+ 
+@@ -254,6 +257,7 @@ veryclean::
+ 	$(RM) $(stubdblib)
+ 
+ endif
++endif
+ 
+ #########################################################################
+ ifdef OPEN_SSL_ROOT
+diff --git a/src/services/mklib/stublib/dir.mk b/src/services/mklib/stublib/dir.mk
+index 87f7ec22b..ce46f6c5f 100644
+--- a/src/services/mklib/stublib/dir.mk
++++ b/src/services/mklib/stublib/dir.mk
+@@ -115,7 +115,7 @@ endif
+ ##############################################################################
+ # Build debug libraries for Win32
+ ##############################################################################
+-ifdef NoDebugBuild
++ifndef NoDebugBuild
+ ifdef Win32Platform
+ 
+ all:: mkstaticdbug mkshareddbug
+diff --git a/mk/mklib.mk b/mk/mklib.mk
+index 1d73cfdbe..e6e8d65fe 100644
+--- a/mk/mklib.mk
++++ b/mk/mklib.mk
+@@ -16,16 +16,6 @@
+ # are called libfoo.a and libfoo.so.1.3 etc.
+ #
+ 
+-ifndef NoReleaseBuild
+-
+-all:: mkstatic mkshared
+-
+-export:: mkstatic mkshared
+-
+-ifdef INSTALLTARGET
+-install:: mkstatic mkshared
+-endif
+-
+ vers := $(subst ., ,$(LIB_VERSION))
+ ifeq ($(words $(vers)), 2)
+   vers  := _ $(vers)
+@@ -36,6 +26,16 @@ endif
+ 
+ namespec := $(LIB_NAME) $(vers)
+ 
++ifndef NoReleaseBuild
++
++all:: mkstatic mkshared
++
++export:: mkstatic mkshared
++
++ifdef INSTALLTARGET
++install:: mkstatic mkshared
++endif
++
+ ##############################################################################
+ # Build Static library
+ ##############################################################################
+
diff --git a/external_imported/vcpkg/ports/omniorb/vcpkg.json b/external_imported/vcpkg/ports/omniorb/vcpkg.json
new file mode 100644
index 000000000..d409fe816
--- /dev/null
+++ b/external_imported/vcpkg/ports/omniorb/vcpkg.json
@@ -0,0 +1,23 @@
+{
+  "name": "omniorb",
+  "version": "4.3.0",
+  "port-version": 2,
+  "description": "omniORB is a robust high performance CORBA ORB for C++",
+  "homepage": "https://omniorb.sourceforge.io/",
+  "license": "LGPL-2.1-or-later",
+  "supports": "!uwp & !xbox & !((arm | x86) & windows) & !osx",
+  "dependencies": [
+    "openssl",
+    "python3",
+    {
+      "name": "python3",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    "zlib",
+    "zstd"
+  ]
+}
diff --git a/external_imported/vcpkg/ports/omniorb/vcpkg.mk b/external_imported/vcpkg/ports/omniorb/vcpkg.mk
new file mode 100644
index 000000000..1dd805aeb
--- /dev/null
+++ b/external_imported/vcpkg/ports/omniorb/vcpkg.mk
@@ -0,0 +1,89 @@
+#
+# vcpkg.mk - make variables and rules specific to Visual Studio
+#
+
+WindowsNT=1
+x86Processor=1
+
+BINDIR = bin
+LIBDIR = lib
+
+ABSTOP = $(shell cd $(TOP); pwd)
+
+# Windows builds require a shared library build
+BuildSharedLibrary=1
+# This will be replaced
+
+ThreadSystem=NT
+undefine UnixPlatform
+# Windows build requires static lib to generate symbol def file
+undefine NoStaticLibrary
+platform = Win32Platform
+
+@build_info@
+
+# Use the following set of flags to build and use multithreaded DLLs
+#
+MSVC_DLL_CXXNODEBUGFLAGS       = @VCPKG_DETECTED_CMAKE_CXX_FLAGS_RELEASE@
+MSVC_DLL_CXXLINKNODEBUGOPTIONS = @VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_RELEASE@ -manifest
+MSVC_DLL_CNODEBUGFLAGS         = @VCPKG_DETECTED_CMAKE_C_FLAGS_RELEASE@
+MSVC_DLL_CLINKNODEBUGOPTIONS   = @VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_RELEASE@ -manifest
+#
+MSVC_DLL_CXXDEBUGFLAGS         = @VCPKG_DETECTED_CMAKE_CXX_FLAGS_DEBUG@ -D_DEBUG
+MSVC_DLL_CXXLINKDEBUGOPTIONS   = @VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_DEBUG@ -manifest
+MSVC_DLL_CDEBUGFLAGS           = @VCPKG_DETECTED_CMAKE_C_FLAGS_DEBUG@ -D_DEBUG
+MSVC_DLL_CLINKDEBUGOPTIONS     = @VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_DEBUG@ -manifest
+#
+# Or
+#
+# Use the following set of flags to build and use multithread static libraries
+#
+MSVC_STATICLIB_CXXNODEBUGFLAGS       = @VCPKG_DETECTED_CMAKE_CXX_FLAGS_RELEASE@
+MSVC_STATICLIB_CXXLINKNODEBUGOPTIONS = @VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_RELEASE@ -manifest
+MSVC_STATICLIB_CNODEBUGFLAGS         = @VCPKG_DETECTED_CMAKE_CXX_FLAGS_RELEASE@
+MSVC_STATICLIB_CLINKNODEBUGOPTIONS   = @VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_RELEASE@ -manifest
+
+MSVC_STATICLIB_CXXDEBUGFLAGS         = @VCPKG_DETECTED_CMAKE_CXX_FLAGS_DEBUG@ -D_DEBUG
+MSVC_STATICLIB_CXXLINKDEBUGOPTIONS   = @VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_DEBUG@ -manifest
+MSVC_STATICLIB_CDEBUGFLAGS           = @VCPKG_DETECTED_CMAKE_C_FLAGS_DEBUG@ -D_DEBUG
+MSVC_STATICLIB_CLINKDEBUGOPTIONS     = @VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_DEBUG@ -manifest
+
+#
+# Include general win32 things
+#
+
+include $(THIS_IMPORT_TREE)/mk/win32.mk
+
+MANIFESTTOOL = @VCPKG_DETECTED_CMAKE_MT@
+RCTOOL       = @VCPKG_DETECTED_CMAKE_RC_COMPILER@
+CLINK        = @VCPKG_DETECTED_CMAKE_LINKER@
+CXXLINK      = @VCPKG_DETECTED_CMAKE_LINKER@
+AR           = @VCPKG_DETECTED_CMAKE_AR@
+RANLIB       = true
+
+# To build ZIOP support, EnableZIOP must be defined and one or both of
+# the zlib and zstd sections must be defined.
+
+#EnableZIOP = 1
+
+#EnableZIOPZLib = 1
+#ZLIB_ROOT = /cygdrive/c/zlib-1.2.11
+#ZLIB_CPPFLAGS = -DOMNI_ENABLE_ZIOP_ZLIB -I$(ZLIB_ROOT)
+#ZLIB_LIB = $(patsubst %,$(LibPathPattern),$(ZLIB_ROOT)) zdll.lib
+
+#EnableZIOPZStd = 1
+#ZSTD_ROOT = /cygdrive/c/zstd
+#ZSTD_CPPFLAGS = -DOMNI_ENABLE_ZIOP_ZSTD -I$(ZSTD_ROOT)/include
+#ZSTD_LIB = $(patsubst %,$(LibPathPattern),$(ZSTD_ROOT)/lib) zstd.lib
+LN_S=cp -pR 
+
+define ExportSharedLibraryToDir
+ $(ExportLibraryToDir); \
+ $(ParseNameSpec); \
+ soname=$(SharedLibraryShortLibName); \
+ libname=$(SharedLibraryLibNameTemplate); \
+ set -x; \
+ cd $$dir; \
+ $(RM) $$soname; \
+ $(LN_S) $(<F) $$soname;
+endef
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/onednn/portfile.cmake b/external_imported/vcpkg/ports/onednn/portfile.cmake
index 643024b25..fd526254b 100644
--- a/external_imported/vcpkg/ports/onednn/portfile.cmake
+++ b/external_imported/vcpkg/ports/onednn/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO oneapi-src/oneDNN
-    REF 3fef24ec08eb89a2c4be4425162c0651af7f1de3
-    SHA512 3b012fcc92cf39b3205784f5f11607a8af9420d5affccb54079b275c7214dd93daa2ca1e29032de06483126eb103a85d2665da5291995b0f1e5e9978d4290462
+    REF "v${VERSION}"
+    SHA512 85f424403be4231e57929c77c6e30def3e6c6ae7e706b94585e4228cbebd625eb9f0440084315032310caed066c6746f4dbbbbd2f42660c0de5313d6bce34c1e
     HEAD_REF master
 )
 
@@ -21,6 +21,6 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME dnnl CONFIG_PATH lib/cmake/dnnl)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc/dnnl/reference/html")
 
-# Copyright and license
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/onednn/vcpkg.json b/external_imported/vcpkg/ports/onednn/vcpkg.json
index 77f9fc934..1156edf89 100644
--- a/external_imported/vcpkg/ports/onednn/vcpkg.json
+++ b/external_imported/vcpkg/ports/onednn/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "onednn",
-  "version": "3.0.0",
+  "version": "3.3",
   "description": "oneAPI Deep Neural Network Library (oneDNN)",
   "homepage": "https://github.com/oneapi-src/oneDNN",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/onnx-optimizer/fix-cmakelists.patch b/external_imported/vcpkg/ports/onnx-optimizer/fix-cmakelists.patch
index 4c54d77e0..1dbc27134 100644
--- a/external_imported/vcpkg/ports/onnx-optimizer/fix-cmakelists.patch
+++ b/external_imported/vcpkg/ports/onnx-optimizer/fix-cmakelists.patch
@@ -1,56 +1,75 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c2e48b3..5716fbb 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -7,10 +7,18 @@ if(NOT MSVC)
-   set(CMAKE_CXX_STANDARD 11)
- endif(NOT MSVC)
- 
-+# Add MSVC RunTime Flag
-+function(add_msvc_runtime_flag lib)
-+  if(${ONNX_USE_MSVC_STATIC_RUNTIME})
-+    target_compile_options(${lib} PRIVATE $<$<NOT:$<CONFIG:Debug>>:/MT> $<$<CONFIG:Debug>:/MTd>)    
-+  else()
-+    target_compile_options(${lib} PRIVATE $<$<NOT:$<CONFIG:Debug>>:/MD> $<$<CONFIG:Debug>:/MDd>)
-+  endif()
-+endfunction()
- set(CMAKE_POSITION_INDEPENDENT_CODE ON)
- 
--set(ONNX_ROOT ${PROJECT_SOURCE_DIR}/third_party/onnx)
--add_subdirectory(${ONNX_ROOT})
-+find_package(protobuf CONFIG REQUIRED)
-+find_package(ONNX CONFIG REQUIRED)
- 
- file(READ "${PROJECT_SOURCE_DIR}/VERSION_NUMBER" ONNX_OPTIMIZER_VERSION)
- string(STRIP "${ONNX_OPTIMIZER_VERSION}" ONNX_OPTIMIZER_VERSION)
-@@ -31,6 +39,7 @@ add_executable(onnx_optimizer_exec examples/onnx_optimizer_exec.cpp)
- target_link_libraries(onnx_optimizer_exec onnx_optimizer)
- 
- if(BUILD_ONNX_PYTHON)
-+  find_package(Python3 COMPONENTS Development REQUIRED)
-   if("${PY_EXT_SUFFIX}" STREQUAL "")
-     if(MSVC)
-       set(PY_EXT_SUFFIX ".pyd")
-@@ -51,7 +60,7 @@ if(BUILD_ONNX_PYTHON)
-                              $<INSTALL_INTERFACE:include>
-                              ${PYTHON_INCLUDE_DIR})
-   # pybind11 is a header only lib
--  find_package(pybind11 2.2)
-+  find_package(pybind11 2.2 CONFIG REQUIRED)
-   if(pybind11_FOUND)
-     target_include_directories(onnx_opt_cpp2py_export PUBLIC
-       ${pybind11_INCLUDE_DIRS})
-@@ -87,11 +96,9 @@ if(BUILD_ONNX_PYTHON)
-   endif()
- 
-   target_link_libraries(onnx_opt_cpp2py_export PRIVATE onnx_optimizer)
--
-+  target_link_directories(onnx_opt_cpp2py_export PRIVATE ${Python3_LIBRARY_DIRS})
-+  target_link_libraries(onnx_opt_cpp2py_export PRIVATE ${Python3_LIBRARIES})
-   if(MSVC)
--    find_package(PythonInterp ${PY_VERSION} REQUIRED)
--    find_package(PythonLibs ${PY_VERSION} REQUIRED)
--    target_link_libraries(onnx_opt_cpp2py_export PRIVATE ${PYTHON_LIBRARIES})
-     target_compile_options(onnx_opt_cpp2py_export
-                            PRIVATE /MP
-                                    /WX
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0063385..64458ef 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -10,6 +10,15 @@ project(onnx_optimizer C CXX)
+ 
+ set(CMAKE_CXX_STANDARD 17)
+ 
++# Add MSVC RunTime Flag
++function(add_msvc_runtime_flag lib)
++  if(${ONNX_USE_MSVC_STATIC_RUNTIME})
++    target_compile_options(${lib} PRIVATE $<$<NOT:$<CONFIG:Debug>>:/MT> $<$<CONFIG:Debug>:/MTd>)    
++  else()
++    target_compile_options(${lib} PRIVATE $<$<NOT:$<CONFIG:Debug>>:/MD> $<$<CONFIG:Debug>:/MDd>)
++  endif()
++endfunction()
++
+ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+ 
+ include(cmake/utils.cmake)
+@@ -23,12 +32,10 @@ option(ONNX_OPT_USE_SYSTEM_PROTOBUF "" OFF)
+ if(NOT ONNX_OPT_USE_SYSTEM_PROTOBUF)
+   option(protobuf_BUILD_TESTS "" OFF)
+   option(protobuf_MSVC_STATIC_RUNTIME "" ${ONNX_USE_MSVC_STATIC_RUNTIME})
+-  add_subdirectory_if_no_target(${PROJECT_SOURCE_DIR}/third_party/protobuf/cmake libprotobuf)
+ endif()
+ 
+-
+-set(ONNX_ROOT ${PROJECT_SOURCE_DIR}/third_party/onnx)
+-add_subdirectory_if_no_target(${ONNX_ROOT} ${ONNX_TARGET_NAME})
++find_package(protobuf CONFIG REQUIRED)
++find_package(ONNX CONFIG REQUIRED)
+ 
+ file(READ "${PROJECT_SOURCE_DIR}/VERSION_NUMBER" ONNX_OPTIMIZER_VERSION)
+ string(STRIP "${ONNX_OPTIMIZER_VERSION}" ONNX_OPTIMIZER_VERSION)
+@@ -70,7 +77,7 @@ if(BUILD_ONNX_PYTHON)
+       set(PY_EXT_SUFFIX ".so")
+     endif()
+   endif()
+-  find_package(Python COMPONENTS Interpreter REQUIRED)
++  find_package(Python3 COMPONENTS Development REQUIRED)
+ 
+   onnxopt_add_library(onnx_opt_cpp2py_export MODULE "onnxoptimizer/cpp2py_export.cc")
+   set_target_properties(onnx_opt_cpp2py_export PROPERTIES PREFIX "")
+@@ -84,7 +91,7 @@ if(BUILD_ONNX_PYTHON)
+                              $<INSTALL_INTERFACE:include>
+                              ${Python_INCLUDE_DIR})
+   # pybind11 is a header only lib
+-  find_package(pybind11 2.2)
++  find_package(pybind11 2.2 CONFIG REQUIRED)
+   if(pybind11_FOUND)
+     target_include_directories(onnx_opt_cpp2py_export PUBLIC
+       ${pybind11_INCLUDE_DIRS})
+@@ -121,9 +128,9 @@ if(BUILD_ONNX_PYTHON)
+ 
+   target_link_libraries(onnx_opt_cpp2py_export PRIVATE onnx_optimizer)
+ 
++  target_link_directories(onnx_opt_cpp2py_export PRIVATE ${Python3_LIBRARY_DIRS})
++  target_link_libraries(onnx_opt_cpp2py_export PRIVATE ${Python3_LIBRARIES})
+   if(MSVC)
+-    find_package(Python COMPONENTS Interpreter Development REQUIRED)
+-    target_link_libraries(onnx_opt_cpp2py_export PRIVATE ${Python_LIBRARIES})
+     target_compile_options(onnx_opt_cpp2py_export
+                            PRIVATE /MP
+                                    /WX
+diff --git a/cmake/utils.cmake b/cmake/utils.cmake
+index 6cca9f3..9d79f1a 100644
+--- a/cmake/utils.cmake
++++ b/cmake/utils.cmake
+@@ -1,5 +1,3 @@
+-include(${PROJECT_SOURCE_DIR}/third_party/onnx/cmake/Utils.cmake)
+-
+ # Poor man's FetchContent
+ function(add_subdirectory_if_no_target dir target)
+   if (NOT TARGET ${target})
diff --git a/external_imported/vcpkg/ports/onnx-optimizer/portfile.cmake b/external_imported/vcpkg/ports/onnx-optimizer/portfile.cmake
index fe62f0304..8f8fc1f85 100644
--- a/external_imported/vcpkg/ports/onnx-optimizer/portfile.cmake
+++ b/external_imported/vcpkg/ports/onnx-optimizer/portfile.cmake
@@ -3,13 +3,16 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO onnx/optimizer
-    REF v0.2.6
-    SHA512 cc6373781f04bc6fafd3282d248e26eaf93556b86acbb0dee44b4aa7a5d59c634905c1a05d035e31a50fc0f06cfc686fa483b79a324dd973faa421747d4a681b
+    REF "v${VERSION}"
+    SHA512 419aeaac60fa27f54708c864a2f907777aaa4de882725c83cade33053dec546ede6f95f7f133b50991e3b9b17e300c1a108729cad00ac99dc5ba5d2982b09737
     HEAD_REF master
     PATCHES
         fix-cmakelists.patch
+        remove-outdate-headers.patch
 )
 
+string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" USE_STATIC_RUNTIME)
+
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
         pybind11 BUILD_ONNX_PYTHON
@@ -26,6 +29,7 @@ vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         ${FEATURE_OPTIONS}
+        -DONNX_USE_MSVC_STATIC_RUNTIME=${USE_STATIC_RUNTIME}
 )
 if("pybind11" IN_LIST FEATURES)
     # This target is not in install/export
@@ -35,8 +39,7 @@ vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 vcpkg_cmake_config_fixup(PACKAGE_NAME ONNXOptimizer CONFIG_PATH lib/cmake/ONNXOptimizer)
 
-file(INSTALL "${SOURCE_PATH}/LICENSE"
-     DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include"
                     "${CURRENT_PACKAGES_DIR}/debug/share"
                     "${CURRENT_PACKAGES_DIR}/include/onnxoptimizer/test"
diff --git a/external_imported/vcpkg/ports/onnx-optimizer/remove-outdate-headers.patch b/external_imported/vcpkg/ports/onnx-optimizer/remove-outdate-headers.patch
new file mode 100644
index 000000000..ea1d3f6bf
--- /dev/null
+++ b/external_imported/vcpkg/ports/onnx-optimizer/remove-outdate-headers.patch
@@ -0,0 +1,24 @@
+diff --git a/onnxoptimizer/optimize.h b/onnxoptimizer/optimize.h
+index f25e6c3f..506e2554 100644
+--- a/onnxoptimizer/optimize.h
++++ b/onnxoptimizer/optimize.h
+@@ -9,7 +9,6 @@
+ 
+ #include "onnx/common/ir.h"
+ #include "onnx/common/ir_pb_converter.h"
+-#include "onnx/common/stl_backports.h"
+ #include "onnx/proto_utils.h"
+ 
+ #include "onnxoptimizer/pass_manager.h"
+diff --git a/onnxoptimizer/pass_registry.h b/onnxoptimizer/pass_registry.h
+index 51a2c161..b8dc26f9 100644
+--- a/onnxoptimizer/pass_registry.h
++++ b/onnxoptimizer/pass_registry.h
+@@ -12,7 +12,6 @@
+ 
+ #include "onnx/common/ir.h"
+ #include "onnx/common/ir_pb_converter.h"
+-#include "onnx/common/stl_backports.h"
+ #include "onnx/proto_utils.h"
+ #include "onnxoptimizer/passes/adjust_add.h"
+ #include "onnxoptimizer/passes/adjust_slice_and_matmul.h"
diff --git a/external_imported/vcpkg/ports/onnx-optimizer/vcpkg.json b/external_imported/vcpkg/ports/onnx-optimizer/vcpkg.json
index f38496eb0..3dfc67513 100644
--- a/external_imported/vcpkg/ports/onnx-optimizer/vcpkg.json
+++ b/external_imported/vcpkg/ports/onnx-optimizer/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "onnx-optimizer",
-  "version-semver": "0.2.6",
+  "version-semver": "0.3.18",
   "description": "Actively maintained ONNX Optimizer",
   "homepage": "https://github.com/onnx/optimizer",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/onnx/portfile.cmake b/external_imported/vcpkg/ports/onnx/portfile.cmake
index c42088a9e..a739b707b 100644
--- a/external_imported/vcpkg/ports/onnx/portfile.cmake
+++ b/external_imported/vcpkg/ports/onnx/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO onnx/onnx
     REF "v${VERSION}"
-    SHA512 325859f591dece43a083a0945aefe3427bfdb68a98ef5922343bf7ed959528947e7664d6c8e3e3d35c390d6c20ef22d07c672e5311f80c72c199931be6c256c3
+    SHA512 b46a4ab70af88053318eba45251c1f71528f15e45a33042877570e8d857febd3ec66e2e811fcda2105a4f17b84c9a1c6a0aaa22756c3287321b3ea29e83127fd
     PATCHES
         fix-cmakelists.patch
         fix-dependency-protobuf.patch
@@ -73,6 +73,7 @@ file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/include/onnx/bin"
     "${CURRENT_PACKAGES_DIR}/include/onnx/defs/controlflow"
     "${CURRENT_PACKAGES_DIR}/include/onnx/defs/generator"
+    "${CURRENT_PACKAGES_DIR}/include/onnx/defs/image"
     "${CURRENT_PACKAGES_DIR}/include/onnx/defs/logical"
     "${CURRENT_PACKAGES_DIR}/include/onnx/defs/math"
     "${CURRENT_PACKAGES_DIR}/include/onnx/defs/nn"
@@ -82,6 +83,7 @@ file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/include/onnx/defs/reduction"
     "${CURRENT_PACKAGES_DIR}/include/onnx/defs/rnn"
     "${CURRENT_PACKAGES_DIR}/include/onnx/defs/sequence"
+    "${CURRENT_PACKAGES_DIR}/include/onnx/defs/text"
     "${CURRENT_PACKAGES_DIR}/include/onnx/defs/traditionalml"
     "${CURRENT_PACKAGES_DIR}/include/onnx/defs/training"
     "${CURRENT_PACKAGES_DIR}/include/onnx/examples"
diff --git a/external_imported/vcpkg/ports/onnx/vcpkg.json b/external_imported/vcpkg/ports/onnx/vcpkg.json
index 665f3577b..69d003f9c 100644
--- a/external_imported/vcpkg/ports/onnx/vcpkg.json
+++ b/external_imported/vcpkg/ports/onnx/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "onnx",
-  "version-semver": "1.13.1",
+  "version-semver": "1.15.0",
   "description": "Open standard for machine learning interoperability",
   "homepage": "https://onnx.ai",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/onnxruntime-gpu/portfile.cmake b/external_imported/vcpkg/ports/onnxruntime-gpu/portfile.cmake
index 75ba99bc2..698bebb08 100644
--- a/external_imported/vcpkg/ports/onnxruntime-gpu/portfile.cmake
+++ b/external_imported/vcpkg/ports/onnxruntime-gpu/portfile.cmake
@@ -3,7 +3,7 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 vcpkg_download_distfile(ARCHIVE
     URLS "https://github.com/microsoft/onnxruntime/releases/download/v${VERSION}/onnxruntime-win-x64-gpu-${VERSION}.zip"
     FILENAME "onnxruntime-win-x64-gpu-${VERSION}.zip"
-    SHA512 f927302daa7b778eaf15693e446303060c0a38dfd18b8026c28ac65f545dd463ee7cd3f0aa6bfe59301c5c85ccf4512584ed968ac42ce8d78c12a79d8af2de1e
+    SHA512 7ab350a2ede0fc8c716cf083e16a9303acbcc855982e53900f8843773ec32fd20a7396f0bde82bb29f382012b1d05dea41708797f112d9096c8b5048fc5eb7d8
 )
 
 vcpkg_extract_source_archive(
@@ -12,6 +12,20 @@ vcpkg_extract_source_archive(
     NO_REMOVE_ONE_LEVEL
 )
 
+# Download repo for experimental features
+vcpkg_from_github(
+    OUT_SOURCE_PATH REPO_PATH
+    REPO microsoft/onnxruntime
+    REF v${VERSION}
+    SHA512 f2fec4ded88da6bf67ae7d0aa3082736cb3b8ba29e723b5a516d7632b68ce02aed461f24d3e82cbab20757729e0ab45d736bd986c9b7395f2879b16a091c12a1
+)
+
+file(COPY
+        ${REPO_PATH}/include/onnxruntime/core/session/experimental_onnxruntime_cxx_api.h 
+        ${REPO_PATH}/include/onnxruntime/core/session/experimental_onnxruntime_cxx_inline.h
+        DESTINATION ${CURRENT_PACKAGES_DIR}/include
+    )
+
 file(MAKE_DIRECTORY
         ${CURRENT_PACKAGES_DIR}/include
         ${CURRENT_PACKAGES_DIR}/lib
diff --git a/external_imported/vcpkg/ports/onnxruntime-gpu/vcpkg.json b/external_imported/vcpkg/ports/onnxruntime-gpu/vcpkg.json
index af971193b..9eeb2130a 100644
--- a/external_imported/vcpkg/ports/onnxruntime-gpu/vcpkg.json
+++ b/external_imported/vcpkg/ports/onnxruntime-gpu/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "onnxruntime-gpu",
-  "version": "1.14.1",
+  "version": "1.16.3",
   "description": "onnxruntime (GPU)",
   "homepage": "https://github.com/microsoft/onnxruntime",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/open62541/disable-docs.patch b/external_imported/vcpkg/ports/open62541/disable-docs.patch
new file mode 100644
index 000000000..430716532
--- /dev/null
+++ b/external_imported/vcpkg/ports/open62541/disable-docs.patch
@@ -0,0 +1,20 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7a051f12f..a751b6d83 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1529,7 +1529,6 @@ target_link_libraries(open62541 ${open62541_LIBRARIES})
+ ##########################
+ 
+ # always include, builds with make doc
+-add_subdirectory(doc)
+ 
+ if(UA_BUILD_EXAMPLES)
+     if(UA_ENABLE_AMALGAMATION)
+@@ -1565,7 +1564,6 @@ endif()
+ ########################
+ # Linting as target    #
+ ########################
+-include(linting_target)
+ 
+ ##########################
+ # Installation           #
diff --git a/external_imported/vcpkg/ports/open62541/openssl.patch b/external_imported/vcpkg/ports/open62541/openssl.patch
deleted file mode 100644
index cc68eb570..000000000
--- a/external_imported/vcpkg/ports/open62541/openssl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9184b943..bd9203f7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -526,7 +526,7 @@ if(NOT UA_FORCE_CPP AND (CMAKE_COMPILER_IS_GNUCC OR "x${CMAKE_C_COMPILER_ID}" ST
-     check_add_cc_flag("-Wall")      # Warnings
-     check_add_cc_flag("-Wextra")    # More warnings
-     check_add_cc_flag("-Wpedantic") # Standard compliance
--    check_add_cc_flag("-Werror")    # All warnings are errors
-+    #check_add_cc_flag("-Werror")    # All warnings are errors
- 
-     check_add_cc_flag("-Wno-static-in-inline") # Clang doesn't like the use of static inline methods inside static inline methods
-     check_add_cc_flag("-Wno-overlength-strings") # May happen in the nodeset compiler when complex values are directly encoded
-@@ -659,7 +659,7 @@ if(APPLE)
- endif()
- 
- if(MSVC)
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3 /WX /w44996") # Compiler warnings, error on warning
-+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3 /WX /w44996 /wd4090") # Compiler warnings, error on warning
- 
-   if(UA_MSVC_FORCE_STATIC_CRT AND NOT BUILD_SHARED_LIBS)
-     set(CompilerFlags CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_C_FLAGS
diff --git a/external_imported/vcpkg/ports/open62541/portfile.cmake b/external_imported/vcpkg/ports/open62541/portfile.cmake
index a7536e758..fa7362903 100644
--- a/external_imported/vcpkg/ports/open62541/portfile.cmake
+++ b/external_imported/vcpkg/ports/open62541/portfile.cmake
@@ -1,24 +1,31 @@
-set(VERSION v1.2.3)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO open62541/open62541
-    REF "${VERSION}"
-    SHA512 ffcc697901ec978fb9d1f8996f8a4c5114c98a0ec19206cac95d1a84f8d0fcbe38bf73e88f1df59d53bc6be481102aa2f2a6a0efa29797e7ce11123bd23131c2
+    REF "v${VERSION}"
+    SHA512 8771a70d1f38f2a02f21281200d98fdd8d41d842cc82704155793529a1768beeb2583382f7547e6aaefdab4a17c3130779af792b2a59487889a3cdea4a2fa776
     HEAD_REF master
     PATCHES
-        openssl.patch
+        disable-docs.patch
 )
 
 vcpkg_check_features(
     OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
-        openssl UA_ENABLE_ENCRYPTION_OPENSSL
-        mbedtls UA_ENABLE_ENCRYPTION_MBEDTLS
         amalgamation UA_ENABLE_AMALGAMATION
         historizing UA_ENABLE_HISTORIZING
 )
 
+if("openssl" IN_LIST FEATURES)
+    set(OPEN62541_ENCRYPTION_OPTIONS -DUA_ENABLE_ENCRYPTION=OPENSSL)
+    if("mbedtls" IN_LIST FEATURES)
+        message(WARNING "Only one encryption method can be used. When both [openssl] and [mbedtls] "
+            "are on, openssl is used. To use [mbedtls], don't enable [openssl]. To suppress this "
+            "message, don't enable [mbedtls]")
+    endif()
+elseif("mbedtls" IN_LIST FEATURES)
+    set(OPEN62541_ENCRYPTION_OPTIONS -DUA_ENABLE_ENCRYPTION=MBEDTLS)
+endif()
+
 vcpkg_find_acquire_program(PYTHON3)
 get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
 vcpkg_add_to_path("${PYTHON3_DIR}")
@@ -27,13 +34,14 @@ vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         ${FEATURE_OPTIONS}
-        -DOPEN62541_VERSION=${VERSION}
-    OPTIONS_DEBUG
-        -DCMAKE_DEBUG_POSTFIX=d
+        ${OPEN62541_ENCRYPTION_OPTIONS}
+        "-DOPEN62541_VERSION=v${VERSION}"
+        -DUA_MSVC_FORCE_STATIC_CRT=OFF
+        -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
 )
 
 vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/open62541")
 vcpkg_copy_pdbs()
 vcpkg_fixup_pkgconfig()
 
@@ -41,4 +49,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/open62541/tools")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/open62541/vcpkg.json b/external_imported/vcpkg/ports/open62541/vcpkg.json
index 59c666d5f..34aba5b42 100644
--- a/external_imported/vcpkg/ports/open62541/vcpkg.json
+++ b/external_imported/vcpkg/ports/open62541/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "open62541",
-  "version": "1.2.3",
-  "port-version": 1,
+  "version": "1.3.9",
   "description": "open62541 is an open source C (C99) implementation of OPC UA licensed under the Mozilla Public License v2.0.",
   "homepage": "https://open62541.org",
   "license": "MPL-2.0",
+  "supports": "!xbox",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/open62541pp/portfile.cmake b/external_imported/vcpkg/ports/open62541pp/portfile.cmake
new file mode 100644
index 000000000..f2988b078
--- /dev/null
+++ b/external_imported/vcpkg/ports/open62541pp/portfile.cmake
@@ -0,0 +1,28 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO open62541pp/open62541pp
+    REF "v${VERSION}"
+    SHA512 82e2a4fc5f08eb09af371202b36177cbb0073264641260008027fbcceb59a3687fafe955511445ca92399942f80ac1b0a3800eae0b5336636f47ce07924ea6db
+    HEAD_REF master
+)
+
+vcpkg_find_acquire_program(PYTHON3)
+get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
+vcpkg_add_to_path("${PYTHON3_DIR}")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DUAPP_INTERNAL_OPEN62541=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
+vcpkg_copy_pdbs()
+vcpkg_fixup_pkgconfig()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/open62541pp/usage b/external_imported/vcpkg/ports/open62541pp/usage
new file mode 100644
index 000000000..7cc720ba5
--- /dev/null
+++ b/external_imported/vcpkg/ports/open62541pp/usage
@@ -0,0 +1,4 @@
+The package open62541pp provides CMake targets:
+
+    find_package(open62541pp CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE open62541pp::open62541pp)
diff --git a/external_imported/vcpkg/ports/open62541pp/vcpkg.json b/external_imported/vcpkg/ports/open62541pp/vcpkg.json
new file mode 100644
index 000000000..3a5d6e74d
--- /dev/null
+++ b/external_imported/vcpkg/ports/open62541pp/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "open62541pp",
+  "version": "0.11.0",
+  "description": "C++ wrapper of the open62541 OPC UA library",
+  "homepage": "https://open62541pp.github.io/open62541pp/",
+  "license": "MPL-2.0",
+  "dependencies": [
+    "open62541",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/openal-soft/c12ada68951ea67a59bef7d4fcdf22334990c12a.patch b/external_imported/vcpkg/ports/openal-soft/c12ada68951ea67a59bef7d4fcdf22334990c12a.patch
new file mode 100644
index 000000000..09709ab90
--- /dev/null
+++ b/external_imported/vcpkg/ports/openal-soft/c12ada68951ea67a59bef7d4fcdf22334990c12a.patch
@@ -0,0 +1,54 @@
+From c12ada68951ea67a59bef7d4fcdf22334990c12a Mon Sep 17 00:00:00 2001
+From: Chris Robinson <chris.kcat@gmail.com>
+Date: Tue, 4 Jul 2023 11:30:18 -0700
+Subject: [PATCH] Don't use an import target for OpenSL
+
+---
+ CMakeLists.txt         |  3 ++-
+ cmake/FindOpenSL.cmake | 12 +++++-------
+ 2 files changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 34fd33122..af25a96c7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1183,7 +1183,8 @@ if(ALSOFT_BACKEND_OPENSL)
+         set(HAVE_OPENSL 1)
+         set(ALC_OBJS  ${ALC_OBJS} alc/backends/opensl.cpp alc/backends/opensl.h)
+         set(BACKENDS  "${BACKENDS} OpenSL,")
+-        set(EXTRA_LIBS "OpenSL::OpenSLES" ${EXTRA_LIBS})
++        set(EXTRA_LIBS ${OPENSL_LIBRARIES} ${EXTRA_LIBS})
++        set(INC_PATHS ${INC_PATHS} ${OPENSL_INCLUDE_DIRS})
+     endif()
+ endif()
+ if(ALSOFT_REQUIRE_OPENSL AND NOT HAVE_OPENSL)
+diff --git a/cmake/FindOpenSL.cmake b/cmake/FindOpenSL.cmake
+index 004287494..3df54d447 100644
+--- a/cmake/FindOpenSL.cmake
++++ b/cmake/FindOpenSL.cmake
+@@ -2,8 +2,9 @@
+ # Find the OpenSL libraries
+ #
+ #  This module defines the following variables and targets:
+-#     OPENSL_FOUND     - True if OPENSL was found
+-#     OpenSL::OpenSLES - The OpenSLES target
++#     OPENSL_FOUND        - True if OPENSL was found
++#     OPENSL_INCLUDE_DIRS - The OpenSL include paths
++#     OPENSL_LIBRARIES    - The OpenSL libraries to link
+ #
+ 
+ #=============================================================================
+@@ -53,11 +54,8 @@ find_package_handle_standard_args(OpenSL REQUIRED_VARS OPENSL_LIBRARY OPENSL_INC
+     OPENSL_ANDROID_INCLUDE_DIR)
+ 
+ if(OPENSL_FOUND)
+-    add_library(OpenSL::OpenSLES UNKNOWN IMPORTED)
+-    set_target_properties(OpenSL::OpenSLES PROPERTIES
+-        IMPORTED_LOCATION ${OPENSL_LIBRARY}
+-        INTERFACE_INCLUDE_DIRECTORIES ${OPENSL_INCLUDE_DIR}
+-        INTERFACE_INCLUDE_DIRECTORIES ${OPENSL_ANDROID_INCLUDE_DIR})
++    set(OPENSL_LIBRARIES ${OPENSL_LIBRARY})
++    set(OPENSL_INCLUDE_DIRS ${OPENSL_INCLUDE_DIR} ${OPENSL_ANDROID_INCLUDE_DIR})
+ endif()
+ 
+ mark_as_advanced(OPENSL_INCLUDE_DIR OPENSL_ANDROID_INCLUDE_DIR OPENSL_LIBRARY)
diff --git a/external_imported/vcpkg/ports/openal-soft/portfile.cmake b/external_imported/vcpkg/ports/openal-soft/portfile.cmake
index c63e461bb..850b24e17 100644
--- a/external_imported/vcpkg/ports/openal-soft/portfile.cmake
+++ b/external_imported/vcpkg/ports/openal-soft/portfile.cmake
@@ -2,8 +2,10 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO kcat/openal-soft
     REF ${VERSION}
-    SHA512 7384e734ba6b0668adbb2b2629c950bdb61814584a745ced2327cc20b1b9ff9bc53a8e10ec3260ef2a2915048f4e3af8499d91f8515bb18a4e61c5eeef609d1a
+    SHA512 21f768484978e4321b733004988cb5ecf43d908e7e08f2d421a338633fcfb2ade722d035de73742470ff135ab538d6b9b56df14020976adb1d1e081dfb095c6b
     HEAD_REF master
+    PATCHES
+      c12ada68951ea67a59bef7d4fcdf22334990c12a.patch # Merged upstream, remove in next version
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
diff --git a/external_imported/vcpkg/ports/openal-soft/vcpkg.json b/external_imported/vcpkg/ports/openal-soft/vcpkg.json
index 7a998e4da..87b97d7ed 100644
--- a/external_imported/vcpkg/ports/openal-soft/vcpkg.json
+++ b/external_imported/vcpkg/ports/openal-soft/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "openal-soft",
-  "version": "1.23.0",
+  "version": "1.23.1",
   "description": "OpenAL Soft is an LGPL-licensed, cross-platform, software implementation of the OpenAL 3D audio API.",
   "homepage": "https://github.com/kcat/openal-soft",
   "license": "LGPL-2.0-or-later",
-  "supports": "!uwp",
+  "supports": "!uwp & !xbox",
   "dependencies": [
     {
       "name": "alsa",
diff --git a/external_imported/vcpkg/ports/openblas/fix-space-path.patch b/external_imported/vcpkg/ports/openblas/fix-space-path.patch
deleted file mode 100644
index e0944fadd..000000000
--- a/external_imported/vcpkg/ports/openblas/fix-space-path.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/cmake/prebuild.cmake b/cmake/prebuild.cmake
-index 60b7637..a8b34ef 100644
---- a/cmake/prebuild.cmake
-+++ b/cmake/prebuild.cmake
-@@ -1322,14 +1322,14 @@ else(NOT CMAKE_CROSSCOMPILING)
- 
-   set(GETARCH_DIR "${PROJECT_BINARY_DIR}/getarch_build")
-   set(GETARCH_BIN "getarch${CMAKE_EXECUTABLE_SUFFIX}")
--  file(MAKE_DIRECTORY ${GETARCH_DIR})
--  configure_file(${TARGET_CONF_TEMP} ${GETARCH_DIR}/${TARGET_CONF} COPYONLY)
-+  file(MAKE_DIRECTORY "${GETARCH_DIR}")
-+  configure_file(${TARGET_CONF_TEMP} "${GETARCH_DIR}/${TARGET_CONF}" COPYONLY)
-   if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
--    try_compile(GETARCH_RESULT ${GETARCH_DIR}
-+    try_compile(GETARCH_RESULT "${GETARCH_DIR}"
-       SOURCES ${GETARCH_SRC}
-     COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} -I"${GETARCH_DIR}" -I"${PROJECT_SOURCE_DIR}" -I"${PROJECT_BINARY_DIR}"
-       OUTPUT_VARIABLE GETARCH_LOG
--      COPY_FILE ${PROJECT_BINARY_DIR}/${GETARCH_BIN}
-+      COPY_FILE "${PROJECT_BINARY_DIR}/${GETARCH_BIN}"
-     )
- 
-     if (NOT ${GETARCH_RESULT})
-@@ -1367,14 +1367,14 @@ execute_process(COMMAND "${BLASHELPER_BINARY_DIR}/${GETARCH_BIN}" 1 OUTPUT_VARIA
- 
-   set(GETARCH2_DIR "${PROJECT_BINARY_DIR}/getarch2_build")
-   set(GETARCH2_BIN "getarch_2nd${CMAKE_EXECUTABLE_SUFFIX}")
--  file(MAKE_DIRECTORY ${GETARCH2_DIR})
--  configure_file(${TARGET_CONF_TEMP} ${GETARCH2_DIR}/${TARGET_CONF} COPYONLY)
-+  file(MAKE_DIRECTORY "${GETARCH2_DIR}")
-+  configure_file(${TARGET_CONF_TEMP} "${GETARCH2_DIR}/${TARGET_CONF}" COPYONLY)
-   if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
--    try_compile(GETARCH2_RESULT ${GETARCH2_DIR}
--      SOURCES ${PROJECT_SOURCE_DIR}/getarch_2nd.c
-+    try_compile(GETARCH2_RESULT "${GETARCH2_DIR}"
-+      SOURCES "${PROJECT_SOURCE_DIR}/getarch_2nd.c"
-     COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} ${GETARCH2_FLAGS} -I"${GETARCH2_DIR}" -I"${PROJECT_SOURCE_DIR}" -I"${PROJECT_BINARY_DIR}"
-       OUTPUT_VARIABLE GETARCH2_LOG
--      COPY_FILE ${PROJECT_BINARY_DIR}/${GETARCH2_BIN}
-+      COPY_FILE "${PROJECT_BINARY_DIR}/${GETARCH2_BIN}"
-     )
- 
-     if (NOT ${GETARCH2_RESULT})
diff --git a/external_imported/vcpkg/ports/openblas/fix-uwp-build.patch b/external_imported/vcpkg/ports/openblas/fix-uwp-build.patch
deleted file mode 100644
index 7604cf736..000000000
--- a/external_imported/vcpkg/ports/openblas/fix-uwp-build.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/common_stackalloc.h b/common_stackalloc.h
-index d3d5466..cd157fc 100644
---- a/common_stackalloc.h
-+++ b/common_stackalloc.h
-@@ -36,7 +36,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #define STACK_ALLOC_PROTECT_CHECK
- #endif
- 
--#if defined(MAX_STACK_ALLOC) && MAX_STACK_ALLOC > 0
-+#if defined(MAX_STACK_ALLOC) && MAX_STACK_ALLOC > 0 && !(defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP))
- 
- /*
-  * Allocate a buffer on the stack if the size is smaller than MAX_STACK_ALLOC.
-@@ -63,7 +63,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #endif
- 
- 
--#if defined(MAX_STACK_ALLOC) && MAX_STACK_ALLOC > 0
-+#if defined(MAX_STACK_ALLOC) && MAX_STACK_ALLOC > 0 && !(defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP))
- #define STACK_FREE(BUFFER)    \
-   STACK_ALLOC_PROTECT_CHECK   \
-   if(!stack_alloc_size)       \
-diff --git a/interface/zgemv.c b/interface/zgemv.c
-index 3e98dba..ee597f7 100644
---- a/interface/zgemv.c
-+++ b/interface/zgemv.c
-@@ -244,7 +244,7 @@ void CNAME(enum CBLAS_ORDER order,
-   buffer_size = (buffer_size + 3) & ~3;
-   STACK_ALLOC(buffer_size, FLOAT, buffer);
- 
--#if defined(ARCH_X86_64) && defined(MAX_STACK_ALLOC) && MAX_STACK_ALLOC > 0
-+#if defined(ARCH_X86_64) && defined(MAX_STACK_ALLOC) && MAX_STACK_ALLOC > 0 && !(defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP))
-   // cgemv_t.S return NaN if there are NaN or Inf in the buffer (see bug #746)
-   if(trans && stack_alloc_size)
-     memset(buffer, 0, MIN(BUFFER_SIZE, sizeof(FLOAT) * buffer_size));
diff --git a/external_imported/vcpkg/ports/openblas/portfile.cmake b/external_imported/vcpkg/ports/openblas/portfile.cmake
index 24da7a012..8f06e235c 100644
--- a/external_imported/vcpkg/ports/openblas/portfile.cmake
+++ b/external_imported/vcpkg/ports/openblas/portfile.cmake
@@ -1,14 +1,12 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO xianyi/OpenBLAS
-    REF b89fb708caa5a5a32de8f4306c4ff132e0228e9a # v0.3.21
-    SHA512 495e885409f0c6178332cddd685f3c002dc92e7af251c4e4eb3da6935ef6e81565c2505d436245b9bf53ce58649764e0471dc43b7f5f30b6ed092366cbbc2d5c
+    REF "v${VERSION}"
+    SHA512 01d3a536fbfa62f276fd6b1ad0e218fb3d91f41545fc83ddc74979fa26372d8389f0baa20334badfe0adacd77bd944c50a47ac920577373fcc1d495553084373
     HEAD_REF develop
     PATCHES
         uwp.patch
-        fix-space-path.patch
         fix-redefinition-function.patch
-        fix-uwp-build.patch
         install-tools.patch
 )
 
@@ -27,9 +25,9 @@ vcpkg_add_to_path("${SED_EXE_PATH}")
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
-        threads         USE_THREAD
-        simplethread    USE_SIMPLE_THREADED_LEVEL3
-        "dynamic-arch"  DYNAMIC_ARCH
+        threads        USE_THREAD
+        simplethread   USE_SIMPLE_THREADED_LEVEL3
+        "dynamic-arch" DYNAMIC_ARCH
 )
 
 set(COMMON_OPTIONS -DBUILD_WITHOUT_LAPACK=ON)
@@ -43,9 +41,8 @@ endif()
 set(OPENBLAS_EXTRA_OPTIONS)
 # for UWP version, must build non uwp first for helper
 # binaries.
-if(VCPKG_TARGET_IS_UWP)    
-    list(APPEND OPENBLAS_EXTRA_OPTIONS -DCMAKE_SYSTEM_PROCESSOR=AMD64
-                "-DBLASHELPER_BINARY_DIR=${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT}")
+if(VCPKG_TARGET_IS_UWP)
+    list(APPEND OPENBLAS_EXTRA_OPTIONS "-DBLASHELPER_BINARY_DIR=${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT}")
 elseif(NOT (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW))
     string(APPEND VCPKG_C_FLAGS " -DNEEDBUNDERSCORE") # Required to get common BLASFUNC to append extra _
     string(APPEND VCPKG_CXX_FLAGS " -DNEEDBUNDERSCORE")
@@ -71,7 +68,7 @@ vcpkg_cmake_configure(
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
-vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/OpenBLAS)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/OpenBLAS)
 
 if (EXISTS "${CURRENT_PACKAGES_DIR}/bin/getarch${VCPKG_HOST_EXECUTABLE_SUFFIX}")
     vcpkg_copy_tools(TOOL_NAMES getarch AUTO_CLEAN)
@@ -112,4 +109,4 @@ vcpkg_replace_string(
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
\ No newline at end of file
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/openblas/uwp.patch b/external_imported/vcpkg/ports/openblas/uwp.patch
index 50a8e9b29..fd29ed7fe 100644
--- a/external_imported/vcpkg/ports/openblas/uwp.patch
+++ b/external_imported/vcpkg/ports/openblas/uwp.patch
@@ -1,7 +1,8 @@
 diff --git a/cmake/prebuild.cmake b/cmake/prebuild.cmake
---- a/cmake/prebuild.cmake	2019-01-28 03:05:58.422245700 -0600
-+++ b/cmake/prebuild.cmake	2019-01-28 03:07:02.885495800 -0600
-@@ -37,6 +37,9 @@
+index 730555a..1b09e00 100644
+--- a/cmake/prebuild.cmake
++++ b/cmake/prebuild.cmake
+@@ -39,6 +39,9 @@
  
  # CPUIDEMU = ../../cpuid/table.o
  
@@ -11,7 +12,7 @@ diff --git a/cmake/prebuild.cmake b/cmake/prebuild.cmake
  
  if (DEFINED CPUIDEMU)
    set(EXFLAGS "-DCPUIDEMU -DVENDOR=99")
-@@ -310,8 +313,8 @@ else(NOT CMAKE_CROSSCOMPILING)
+@@ -1401,8 +1404,8 @@ else(NOT CMAKE_CROSSCOMPILING)
    message(STATUS "Running getarch")
  
    # use the cmake binary w/ the -E param to run a shell command in a cross-platform way
@@ -22,7 +23,7 @@ diff --git a/cmake/prebuild.cmake b/cmake/prebuild.cmake
  
    message(STATUS "GETARCH results:\n${GETARCH_MAKE_OUT}")
  
-@@ -337,8 +340,8 @@ execute_process(COMMAND "${PROJECT_BINAR
+@@ -1430,8 +1433,8 @@ execute_process(COMMAND "${PROJECT_BINARY_DIR}/${GETARCH_BIN}" 1 OUTPUT_VARIABLE
    endif ()
  
    # use the cmake binary w/ the -E param to run a shell command in a cross-platform way
@@ -32,10 +33,9 @@ diff --git a/cmake/prebuild.cmake b/cmake/prebuild.cmake
 +execute_process(COMMAND "${BLASHELPER_BINARY_DIR}/${GETARCH2_BIN}" 1 OUTPUT_VARIABLE GETARCH2_CONF_OUT)
  
    # append config data from getarch_2nd to the TARGET file and read in CMake vars
-   file(APPEND ${TARGET_CONF_TEMP} ${GETARCH2_CONF_OUT})
-
+   file(APPEND "${TARGET_CONF_TEMP}" ${GETARCH2_CONF_OUT})
 diff --git a/cmake/system.cmake b/cmake/system.cmake
-index a060d98..52ffa5a 100644
+index 631e7fe..83220ce 100644
 --- a/cmake/system.cmake
 +++ b/cmake/system.cmake
 @@ -13,6 +13,9 @@ if(CMAKE_CROSSCOMPILING AND NOT DEFINED TARGET)
@@ -48,3 +48,38 @@ index a060d98..52ffa5a 100644
    else()
      message(FATAL_ERROR "When cross compiling, a TARGET is required.")
    endif()
+diff --git a/common_stackalloc.h b/common_stackalloc.h
+index d3d5466..cd157fc 100644
+--- a/common_stackalloc.h
++++ b/common_stackalloc.h
+@@ -36,7 +36,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #define STACK_ALLOC_PROTECT_CHECK
+ #endif
+ 
+-#if defined(MAX_STACK_ALLOC) && MAX_STACK_ALLOC > 0
++#if defined(MAX_STACK_ALLOC) && MAX_STACK_ALLOC > 0 && !(defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP))
+ 
+ /*
+  * Allocate a buffer on the stack if the size is smaller than MAX_STACK_ALLOC.
+@@ -63,7 +63,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #endif
+ 
+ 
+-#if defined(MAX_STACK_ALLOC) && MAX_STACK_ALLOC > 0
++#if defined(MAX_STACK_ALLOC) && MAX_STACK_ALLOC > 0 && !(defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP))
+ #define STACK_FREE(BUFFER)    \
+   STACK_ALLOC_PROTECT_CHECK   \
+   if(!stack_alloc_size)       \
+diff --git a/interface/zgemv.c b/interface/zgemv.c
+index 3e98dba..ee597f7 100644
+--- a/interface/zgemv.c
++++ b/interface/zgemv.c
+@@ -244,7 +244,7 @@ void CNAME(enum CBLAS_ORDER order,
+   buffer_size = (buffer_size + 3) & ~3;
+   STACK_ALLOC(buffer_size, FLOAT, buffer);
+ 
+-#if defined(ARCH_X86_64) && defined(MAX_STACK_ALLOC) && MAX_STACK_ALLOC > 0
++#if defined(ARCH_X86_64) && defined(MAX_STACK_ALLOC) && MAX_STACK_ALLOC > 0 && !(defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP))
+   // cgemv_t.S return NaN if there are NaN or Inf in the buffer (see bug #746)
+   if(trans && stack_alloc_size)
+     memset(buffer, 0, MIN(BUFFER_SIZE, sizeof(FLOAT) * buffer_size));
diff --git a/external_imported/vcpkg/ports/openblas/vcpkg.json b/external_imported/vcpkg/ports/openblas/vcpkg.json
index fffd24868..144676a29 100644
--- a/external_imported/vcpkg/ports/openblas/vcpkg.json
+++ b/external_imported/vcpkg/ports/openblas/vcpkg.json
@@ -1,11 +1,10 @@
 {
   "name": "openblas",
-  "version": "0.3.21",
-  "port-version": 1,
+  "version": "0.3.26",
   "description": "OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.",
   "homepage": "https://github.com/xianyi/OpenBLAS",
   "license": "BSD-3-Clause",
-  "supports": "!(arm & uwp)",
+  "supports": "!arm | arm64 | !uwp",
   "dependencies": [
     {
       "name": "openblas",
@@ -27,7 +26,7 @@
   "features": {
     "dynamic-arch": {
       "description": "Support for multiple targets in a single library",
-      "supports": "mingw"
+      "supports": "!windows | mingw"
     },
     "simplethread": {
       "description": "Use simple thread",
diff --git a/external_imported/vcpkg/ports/opencascade/dependencies.patch b/external_imported/vcpkg/ports/opencascade/dependencies.patch
new file mode 100644
index 000000000..9067a4495
--- /dev/null
+++ b/external_imported/vcpkg/ports/opencascade/dependencies.patch
@@ -0,0 +1,113 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8690528..834ca79 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -605,7 +605,8 @@ if (CAN_USE_FREETYPE)
+   if (USE_FREETYPE)
+     message (STATUS "Info: FreeType is used by OCCT")
+     add_definitions (-DHAVE_FREETYPE)
+-    OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/freetype")
++    find_package(Freetype MODULE REQUIRED)
++    set(CSF_FREETYPE Freetype::Freetype)
+   else()
+     OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_FREETYPE")
+     OCCT_CHECK_AND_UNSET ("3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2")
+@@ -622,7 +623,9 @@ endif()
+ if (USE_VTK)
+   add_definitions (-DHAVE_VTK)
+   set (OCCT_VTK_USED_TARGETS "" CACHE INTERNAL "" FORCE)
+-  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/vtk")
++  find_package(VTK REQUIRED)
++  set(CSF_VTK VTK::CommonCore)
++  set(IS_VTK_9XX 1)
+ else()
+   OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_VTK")
+ 
+@@ -638,7 +641,8 @@ endif()
+ if (CAN_USE_FREEIMAGE)
+   if (USE_FREEIMAGE)
+     add_definitions (-DHAVE_FREEIMAGE)
+-    OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/freeimage")
++    find_package(freeimage CONFIG REQUIRED)
++    set(CSF_FreeImagePlus freeimage::FreeImagePlus)
+   else()
+     OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_FREEIMAGE")
+     OCCT_CHECK_AND_UNSET ("INSTALL_FREEIMAGE")
+@@ -739,7 +743,8 @@ endif()
+ if (NOT DEFINED ANDROID AND CAN_USE_TBB)
+   if (USE_TBB)
+     add_definitions (-DHAVE_TBB)
+-    OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/tbb")
++    find_package(TBB CONFIG REQUIRED)
++    set(CSF_TBB TBB::tbb TBB::tbbmalloc)
+   else()
+     OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TBB")
+     OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TBBMALLOC")
+@@ -759,7 +764,8 @@ OCCT_IS_PRODUCT_REQUIRED (CSF_RapidJSON CAN_USE_RAPIDJSON)
+ if (CAN_USE_RAPIDJSON)
+   if (USE_RAPIDJSON)
+     add_definitions (-DHAVE_RAPIDJSON)
+-    OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/rapidjson")
++    find_package(RapidJSON CONFIG REQUIRED)
++    set(CSF_RapidJSON rapidjson)
+   else()
+     OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_RAPIDJSON")
+     OCCT_CHECK_AND_UNSET ("INSTALL_RAPIDJSON")
+diff --git a/adm/cmake/occt_toolkit.cmake b/adm/cmake/occt_toolkit.cmake
+index c939915..f707e00 100644
+--- a/adm/cmake/occt_toolkit.cmake
++++ b/adm/cmake/occt_toolkit.cmake
+@@ -475,11 +475,11 @@ else()
+   endif()
+ endif()
+ 
+-if (BUILD_SHARED_LIBS OR EXECUTABLE_PROJECT)
++if (1)
+   if(IS_VTK_9XX)
+     string (REGEX REPLACE "vtk" "VTK::" USED_TOOLKITS_BY_CURRENT_PROJECT "${USED_TOOLKITS_BY_CURRENT_PROJECT}")
+   endif()
+-  target_link_libraries (${PROJECT_NAME} ${USED_TOOLKITS_BY_CURRENT_PROJECT} ${USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT})
++  target_link_libraries (${PROJECT_NAME} PRIVATE ${USED_TOOLKITS_BY_CURRENT_PROJECT} ${USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT})
+ endif()
+ 
+ if (USE_QT)
+diff --git a/adm/templates/OpenCASCADEConfig.cmake.in b/adm/templates/OpenCASCADEConfig.cmake.in
+index e391ddf..9cc3d49 100644
+--- a/adm/templates/OpenCASCADEConfig.cmake.in
++++ b/adm/templates/OpenCASCADEConfig.cmake.in
+@@ -5,6 +5,23 @@
+ # This file is configured by OpenCASCADE.
+ #
+ 
++include(CMakeFindDependencyMacro)
++if("@USE_FREEIMAGE@")
++  find_dependency(freeimage CONFIG)
++endif()
++if("@USE_FREETYPE@")
++  find_dependency(Freetype MODULE)
++endif()
++if("@USE_RAPIDJSON@")
++  find_package(RapidJSON CONFIG REQUIRED)
++endif()
++if("@USE_TBB@")
++  find_dependency(TBB CONFIG)
++endif()
++if("@USE_VTK@")
++  find_dependency(VTK REQUIRED)
++endif()
++
+ if(OpenCASCADE_ALREADY_INCLUDED)
+   return()
+ endif()
+diff --git a/src/Image/Image_AlienPixMap.cxx b/src/Image/Image_AlienPixMap.cxx
+index f869e8f..538d5b9 100644
+--- a/src/Image/Image_AlienPixMap.cxx
++++ b/src/Image/Image_AlienPixMap.cxx
+@@ -21,7 +21,6 @@
+   #include <FreeImage.h>
+
+   #ifdef _MSC_VER
+-    #pragma comment( lib, "FreeImage.lib" )
+   #endif
+ #elif defined(HAVE_WINCODEC)
+   #include <wincodec.h>
diff --git a/external_imported/vcpkg/ports/opencascade/drop-bin-letter-d.patch b/external_imported/vcpkg/ports/opencascade/drop-bin-letter-d.patch
new file mode 100644
index 000000000..1e278d523
--- /dev/null
+++ b/external_imported/vcpkg/ports/opencascade/drop-bin-letter-d.patch
@@ -0,0 +1,45 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d2c4e570..8eac318c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -244,7 +244,6 @@ set (CMAKE_INSTALL_PREFIX "${INSTALL_DIR}" CACHE INTERNAL "" FORCE)
+ 
+ set (BIN_LETTER "")
+ if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
+-  set (BIN_LETTER "d")
+ elseif ("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo")
+   set (BIN_LETTER "i")
+ endif()
+@@ -917,6 +916,7 @@ if (WIN32)
+   set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE        "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
+   set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bini")
+   set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG          "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
++  set (CMAKE_PDB_OUTPUT_DIRECTORY_DEBUG              "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
+ endif()
+ 
+ string(TIMESTAMP CURRENT_TIME "%H:%M:%S")
+diff --git a/adm/cmake/occt_macros.cmake b/adm/cmake/occt_macros.cmake
+index 9fd3ec4c..dc9ff18b 100644
+--- a/adm/cmake/occt_macros.cmake
++++ b/adm/cmake/occt_macros.cmake
+@@ -609,7 +609,7 @@ macro (OCCT_INSERT_CODE_FOR_TARGET)
+   elseif (\"\${CMAKE_INSTALL_CONFIG_NAME}\" MATCHES \"^([Rr][Ee][Ll][Ww][Ii][Tt][Hh][Dd][Ee][Bb][Ii][Nn][Ff][Oo])$\")
+     set (OCCT_INSTALL_BIN_LETTER \"i\")
+   elseif (\"\${CMAKE_INSTALL_CONFIG_NAME}\" MATCHES \"^([Dd][Ee][Bb][Uu][Gg])$\")
+-    set (OCCT_INSTALL_BIN_LETTER \"d\")
++    set (OCCT_INSTALL_BIN_LETTER \"\")
+   endif()")
+ endmacro()
+ 
+diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
+index beb934f7..95cec74a 100644
+--- a/tools/CMakeLists.txt
++++ b/tools/CMakeLists.txt
+@@ -172,7 +172,6 @@ set (CMAKE_INSTALL_PREFIX "${INSTALL_DIR}" CACHE INTERNAL "" FORCE)
+ 
+ set (BIN_LETTER "")
+ if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
+-  set (BIN_LETTER "d")
+ elseif ("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo")
+   set (BIN_LETTER "i")
+ endif()
diff --git a/external_imported/vcpkg/ports/opencascade/fix-depend-freetype.patch b/external_imported/vcpkg/ports/opencascade/fix-depend-freetype.patch
deleted file mode 100644
index b37b7ee4e..000000000
--- a/external_imported/vcpkg/ports/opencascade/fix-depend-freetype.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fbcede5..66b127d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -563,7 +563,9 @@ if (CAN_USE_FREETYPE)
-   if (USE_FREETYPE)
-     message (STATUS "Info: FreeType is used by OCCT")
-     add_definitions (-DHAVE_FREETYPE)
--    OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/freetype")
-+    find_package(freetype CONFIG REQUIRED)
-+	get_target_property(FREETYPE_INCLUDE_DIR freetype INTERFACE_INCLUDE_DIRECTORIES)
-+    list (APPEND 3RDPARTY_INCLUDE_DIRS "${FREETYPE_INCLUDE_DIR}")
-   else()
-     OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_FREETYPE")
-     OCCT_CHECK_AND_UNSET ("3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2")
diff --git a/external_imported/vcpkg/ports/opencascade/fix-pdb-find.patch b/external_imported/vcpkg/ports/opencascade/fix-pdb-find.patch
index c74aba04f..5446f9455 100644
--- a/external_imported/vcpkg/ports/opencascade/fix-pdb-find.patch
+++ b/external_imported/vcpkg/ports/opencascade/fix-pdb-find.patch
@@ -1,33 +1,33 @@
-diff --git a/adm/cmake/cotire.cmake b/adm/cmake/cotire.cmake
-index a63f3ce..aa77c20 100644
---- a/adm/cmake/cotire.cmake
-+++ b/adm/cmake/cotire.cmake
-@@ -3114,6 +3114,7 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
- 		OSX_ARCHITECTURES OSX_ARCHITECTURES_<CONFIG> PRIVATE_HEADER PUBLIC_HEADER RESOURCE XCTEST
- 		IOS_INSTALL_COMBINED)
- 	# copy Windows platform specific stuff
-+    if (BUILD_SHARED_LIBS)
- 	cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
- 		GNUtoMS
- 		COMPILE_PDB_NAME COMPILE_PDB_NAME_<CONFIG>
-@@ -3129,6 +3130,7 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
- 		WIN32_EXECUTABLE WINDOWS_EXPORT_ALL_SYMBOLS
- 		DEPLOYMENT_REMOTE_DIRECTORY VS_CONFIGURATION_TYPE
- 		VS_SDK_REFERENCES)
-+    endif()
- 	# copy Android platform specific stuff
- 	cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
- 		ANDROID_API ANDROID_API_MIN ANDROID_GUI
-diff --git a/adm/cmake/occt_toolkit.cmake b/adm/cmake/occt_toolkit.cmake
-index 2f96c6f..78f15f0 100644
---- a/adm/cmake/occt_toolkit.cmake
-+++ b/adm/cmake/occt_toolkit.cmake
-@@ -235,7 +235,7 @@ if (EXECUTABLE_PROJECT)
- else()
-   add_library (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE} ${RESOURCE_FILES} ${${PROJECT_NAME}_MOC_FILES})
- 
--  if (MSVC)
-+  if (MSVC AND BUILD_SHARED_LIBS)
+diff --git a/adm/cmake/cotire.cmake b/adm/cmake/cotire.cmake
+index acdca71a9f..aa41f2c8b8 100644
+--- a/adm/cmake/cotire.cmake
++++ b/adm/cmake/cotire.cmake
+@@ -3291,6 +3291,7 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
+ 		OSX_ARCHITECTURES OSX_ARCHITECTURES_<CONFIG> PRIVATE_HEADER PUBLIC_HEADER RESOURCE XCTEST
+ 		IOS_INSTALL_COMBINED XCODE_EXPLICIT_FILE_TYPE XCODE_PRODUCT_TYPE)
+ 	# copy Windows platform specific stuff
++	if (BUILD_SHARED_LIBS)
+ 	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
+ 		GNUtoMS
+ 		COMPILE_PDB_NAME COMPILE_PDB_NAME_<CONFIG>
+@@ -3306,6 +3307,7 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
+ 		WIN32_EXECUTABLE WINDOWS_EXPORT_ALL_SYMBOLS
+ 		DEPLOYMENT_REMOTE_DIRECTORY VS_CONFIGURATION_TYPE
+ 		VS_SDK_REFERENCES VS_USER_PROPS VS_DEBUGGER_WORKING_DIRECTORY)
++	endif()
+ 	# copy Android platform specific stuff
+ 	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
+ 		ANDROID_API ANDROID_API_MIN ANDROID_GUI
+diff --git a/adm/cmake/occt_toolkit.cmake b/adm/cmake/occt_toolkit.cmake
+index c9399159f1..ce74b918df 100644
+--- a/adm/cmake/occt_toolkit.cmake
++++ b/adm/cmake/occt_toolkit.cmake
+@@ -278,7 +278,7 @@ else()
+     # endif()
+   endif()
+ 
+-  if (MSVC)
++  if (MSVC AND BUILD_SHARED_LIBS)
      if (BUILD_FORCE_RelWithDebInfo)
        set (aReleasePdbConf "Release")
      else()
diff --git a/external_imported/vcpkg/ports/opencascade/install-include-dir.patch b/external_imported/vcpkg/ports/opencascade/install-include-dir.patch
index 85ab582bd..9df367854 100644
--- a/external_imported/vcpkg/ports/opencascade/install-include-dir.patch
+++ b/external_imported/vcpkg/ports/opencascade/install-include-dir.patch
@@ -1,31 +1,16 @@
-From 32c4bdd88555309752215c53842d438cb51bcb62 Mon Sep 17 00:00:00 2001
-From: bloess <josua.bloess@uni-bayreuth.de>
-Date: Mon, 15 Feb 2021 16:26:36 +0100
-Subject: [PATCH] install include-dir
-
----
- CMakeLists.txt | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 100d613..464f95a 100644
+index a80e39e6..bb6ab2db 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1171,6 +1171,14 @@ foreach (OCCT_MODULE ${OCCT_MODULES})
+@@ -1273,6 +1273,11 @@ foreach (OCCT_MODULE ${OCCT_MODULES})
  endforeach()
  set (OCCT_MODULES_ENABLED ${OCCT_MODULES_ENABLED_SORTED})
  
-+foreach (OCCT_LIBRARY ${OCCT_LIBRARIES})
-+	target_include_directories(
-+		${OCCT_LIBRARY} 
-+		INTERFACE
-+		$<INSTALL_INTERFACE:include>)
-+
++foreach (OCCT_LIBRARY IN LISTS OCCT_LIBRARIES)
++  target_include_directories(${OCCT_LIBRARY} INTERFACE $<INSTALL_INTERFACE:include/opencascade>) # OpenCASCADE_INCLUDE_DIR
++  target_include_directories(${OCCT_LIBRARY} INTERFACE $<INSTALL_INTERFACE:include>) # vcpkg lock-in
 +endforeach()
 +
  # Add all targets to the build-tree export set
  export (TARGETS ${OCCT_LIBRARIES} FILE "${CMAKE_BINARY_DIR}/OpenCASCADETargets.cmake")
  
--- 
-2.14.3.windows.1
-
diff --git a/external_imported/vcpkg/ports/opencascade/portfile.cmake b/external_imported/vcpkg/ports/opencascade/portfile.cmake
index bfbea4134..a665a66c1 100644
--- a/external_imported/vcpkg/ports/opencascade/portfile.cmake
+++ b/external_imported/vcpkg/ports/opencascade/portfile.cmake
@@ -1,17 +1,19 @@
+string(REPLACE "." "_" VERSION_STR "V${VERSION}")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Open-Cascade-SAS/OCCT
-    REF bb368e271e24f63078129283148ce83db6b9670a #V7.6.2
-    SHA512 500c7ff804eb6b202bef48e1be904fe43a3c0137e9a402affe128b3b75a1adbb20bfe383cee82503b13efc083a95eb97425f1afb1f66bae38543d29f871a91f9
+    REF "${VERSION_STR}"
+    SHA512 af176cbd105c49949282c16bb6e30f69167bc6c00a50e0ae69aea555815d47ac3c4540c233e596c5add7cb846c2b33d7be267d8e02472286e758b662b4a652ab
     HEAD_REF master
     PATCHES
+        dependencies.patch
+        drop-bin-letter-d.patch
         fix-pdb-find.patch
         fix-install-prefix-path.patch
         install-include-dir.patch
-        fix-depend-freetype.patch
 )
 
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
     set(BUILD_TYPE "Shared")
 else()
     set(BUILD_TYPE "Static")
@@ -19,13 +21,14 @@ endif()
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
-        "freeimage"  USE_FREEIMAGE
-        "tbb"        USE_TBB
-        "rapidjson"  USE_RAPIDJSON
+        freeimage   USE_FREEIMAGE
+        freetype    USE_FREETYPE
+        rapidjson   USE_RAPIDJSON
+        samples     INSTALL_SAMPLES
+        tbb         USE_TBB
+        vtk         USE_VTK
 )
 
-# VTK option in opencascade not currently supported because only 6.1.0 is supported but vcpkg has >= 9.0
-
 # We turn off BUILD_MODULE_Draw as it requires TCL 8.6 and TK 8.6 specifically which conflicts with vcpkg only having TCL 9.0 
 # And pre-built ActiveTCL binaries are behind a marketing wall :(
 # We use the Unix install layout for Windows as it matches vcpkg
@@ -35,11 +38,14 @@ vcpkg_cmake_configure(
         ${FEATURE_OPTIONS}
         -DBUILD_LIBRARY_TYPE=${BUILD_TYPE}
         -DBUILD_MODULE_Draw=OFF
-        -DINSTALL_DIR_LAYOUT=Unix
-        -DBUILD_SAMPLES_MFC=OFF
-        -DBUILD_SAMPLES_QT=OFF
         -DBUILD_DOC_Overview=OFF
+        -DBUILD_MODULE_DETools=OFF
+        -DINSTALL_DIR_LAYOUT=Unix
+        -DINSTALL_DIR_DOC=share/trash
+        -DINSTALL_DIR_SCRIPT=share/trash # not relocatable
         -DINSTALL_TEST_CASES=OFF
+        -DUSE_TK=OFF
+    OPTIONS_DEBUG
         -DINSTALL_SAMPLES=OFF
 )
 
@@ -48,64 +54,26 @@ vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/opencascade)
 
 #make occt includes relative to source_file
-list(APPEND ADDITIONAL_HEADERS 
-      "ExprIntrp.tab.h"
-      "FlexLexer.h"
-      "glext.h"
-      "igesread.h"
-      "NCollection_Haft.h"
-      "OSD_PerfMeter.h"
-      "Standard_values.h"
-    )
-
-file(GLOB files "${CURRENT_PACKAGES_DIR}/include/opencascade/[a-zA-Z0-9_]*\.[hgl]xx")
+file(GLOB extra_headers
+    LIST_DIRECTORIES false
+    RELATIVE "${CURRENT_PACKAGES_DIR}/include/opencascade"
+    "${CURRENT_PACKAGES_DIR}/include/opencascade/*.h"
+)
+list(JOIN extra_headers "|" extra_headers)
+file(GLOB files "${CURRENT_PACKAGES_DIR}/include/opencascade/*.[hgl]xx")
 foreach(file_name IN LISTS files)
     file(READ "${file_name}" filedata)
-    string(REGEX REPLACE "# *include \<([a-zA-Z0-9_]*\.[hgl]xx)\>" "#include \"\\1\"" filedata "${filedata}")
-    foreach(extra_header IN LISTS ADDITIONAL_HEADERS)
-        string(REGEX REPLACE "# *include \<${extra_header}\>" "#include \"${extra_header}\"" filedata "${filedata}")
-    endforeach()
+    string(REGEX REPLACE "(# *include) <([a-zA-Z0-9_]*[.][hgl]xx|${extra_headers})>" [[\1 "\2"]] filedata "${filedata}")
     file(WRITE "${file_name}" "${filedata}")
 endforeach()
 
-# Remove libd to lib, libd just has cmake files we dont want too
-if( WIN32 )
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib")
-file(RENAME "${CURRENT_PACKAGES_DIR}/debug/libd" "${CURRENT_PACKAGES_DIR}/debug/lib")
-endif()
-
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/opencascade/samples/qt")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/trash")
 
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    # debug creates libd and bind directories that need moving
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin")
-    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bind" "${CURRENT_PACKAGES_DIR}/debug/bin")
-    
-    # fix paths in target files
-    list(APPEND TARGET_FILES 
-        "${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEApplicationFrameworkTargets-debug.cmake"
-        "${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADECompileDefinitionsAndFlags-debug.cmake"
-        "${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEDataExchangeTargets-debug.cmake"
-        "${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEFoundationClassesTargets-debug.cmake"
-        "${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEModelingAlgorithmsTargets-debug.cmake"
-        "${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEModelingDataTargets-debug.cmake"
-        "${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEVisualizationTargets-debug.cmake"
-    )
-    
-    foreach(TARGET_FILE IN LISTS TARGET_FILES)
-        file(READ "${TARGET_FILE}" filedata)
-        string(REGEX REPLACE "libd" "lib" filedata "${filedata}")
-        string(REGEX REPLACE "bind" "bin" filedata "${filedata}")
-        file(WRITE "${TARGET_FILE}" "${filedata}")
-    endforeach()
-
-    # the bin directory ends up with bat files that are noise, let's clean that up
-    file(GLOB BATS "${CURRENT_PACKAGES_DIR}/bin/*.bat")
-    file(REMOVE_RECURSE ${BATS})
-else()
-    # remove scripts in bin dir
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
-endif()
-
-file(INSTALL "${SOURCE_PATH}/OCCT_LGPL_EXCEPTION.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(
+    FILE_LIST
+        "${SOURCE_PATH}/LICENSE_LGPL_21.txt"
+        "${SOURCE_PATH}/OCCT_LGPL_EXCEPTION.txt"
+)
diff --git a/external_imported/vcpkg/ports/opencascade/vcpkg.json b/external_imported/vcpkg/ports/opencascade/vcpkg.json
index 1b16eece7..f1e32cc79 100644
--- a/external_imported/vcpkg/ports/opencascade/vcpkg.json
+++ b/external_imported/vcpkg/ports/opencascade/vcpkg.json
@@ -1,14 +1,19 @@
 {
   "name": "opencascade",
-  "version": "7.6.2",
-  "port-version": 1,
+  "version": "7.8.0",
   "description": "Open CASCADE Technology (OCCT) is an open-source software development platform for 3D CAD, CAM, CAE.",
   "homepage": "https://github.com/Open-Cascade-SAS/OCCT",
-  "license": "LGPL-2.1",
-  "supports": "!(uwp | osx | arm)",
+  "license": "LGPL-2.1-only",
+  "supports": "!xbox",
   "dependencies": [
-    "fontconfig",
-    "freetype",
+    {
+      "name": "angle",
+      "platform": "uwp"
+    },
+    {
+      "name": "opengl",
+      "platform": "!(android | ios | uwp | wasm32)"
+    },
     {
       "name": "vcpkg-cmake",
       "host": true
@@ -18,6 +23,12 @@
       "host": true
     }
   ],
+  "default-features": [
+    {
+      "name": "freetype",
+      "platform": "!uwp"
+    }
+  ],
   "features": {
     "freeimage": {
       "description": "Enable optional usage of freeimage",
@@ -25,17 +36,43 @@
         "freeimage"
       ]
     },
+    "freetype": {
+      "description": "Use of freetype",
+      "supports": "!uwp",
+      "dependencies": [
+        "fontconfig",
+        {
+          "name": "freetype",
+          "default-features": false
+        }
+      ]
+    },
     "rapidjson": {
       "description": "Enable optional usage of rapidjson",
       "dependencies": [
         "rapidjson"
       ]
     },
+    "samples": {
+      "description": "Enable optional samples"
+    },
     "tbb": {
       "description": "Enable optional usage of tbb",
       "dependencies": [
         "tbb"
       ]
+    },
+    "vtk": {
+      "description": "Enable optional usage of vtk",
+      "dependencies": [
+        {
+          "name": "vtk",
+          "default-features": false,
+          "features": [
+            "opengl"
+          ]
+        }
+      ]
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/opencl/portfile.cmake b/external_imported/vcpkg/ports/opencl/portfile.cmake
index d198183f1..318cd8631 100644
--- a/external_imported/vcpkg/ports/opencl/portfile.cmake
+++ b/external_imported/vcpkg/ports/opencl/portfile.cmake
@@ -1,9 +1,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KhronosGroup/OpenCL-Headers
-    REF a51354a85f41d203e755124ad51ae3425933df45
-    SHA512 007f852c10f486c67696a278766790102369306aea2aa0f9b238ef167868c76771e4f6a11abb01bb3614defea501f295a97684a48531865a68299e69704bedca
-    HEAD_REF master
+    REF "${VERSION}"
+    SHA512 41730e80b267de45db9d7a3bcf9e0f29bfc86b25475a86d50180a7258e1240fc8c8f2ad3e222b03b3ef50c10ef63fb5b1647c056fec615e87965aa3196e8ac60
+    HEAD_REF main
 )
 
 file(INSTALL "${SOURCE_PATH}/CL" DESTINATION ${CURRENT_PACKAGES_DIR}/include)
@@ -12,9 +12,9 @@ file(INSTALL "${SOURCE_PATH}/CL" DESTINATION ${CURRENT_PACKAGES_DIR}/include)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KhronosGroup/OpenCL-CLHPP
-    REF 4a1157466afe72a87e8abc59537ef577534ccadf
-    SHA512 8b2f6dfecba649f3eca1c6b7ef825602215bf911fb08cc0745d0d3bb627d6edd9e95cf2355ba55718686d3604421ec632c2c3381040f73861bd0218fcfc60c57
-    HEAD_REF master
+    REF "${VERSION}"
+    SHA512 30252a832287375d550a5e184779881d5b22207a636298c7f52f277c219d3a1ae6983259cfea7bf4f90f0840fec114ee0e7a8c1e6a6fe48c24fd3b5119e7a7f8
+    HEAD_REF main
 )
 
 file(INSTALL "${SOURCE_PATH}/include/CL" DESTINATION ${CURRENT_PACKAGES_DIR}/include)
@@ -23,9 +23,9 @@ file(INSTALL "${SOURCE_PATH}/include/CL" DESTINATION ${CURRENT_PACKAGES_DIR}/inc
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KhronosGroup/OpenCL-ICD-Loader
-    REF 4aa683775c4ee55594196c79def7a75103d75e4c
-    SHA512 319e33de9fd10da333e5928856d3c3f5a5d5b1b33cf57e395217cb70098588f7959c68f81fd52cd9d5717d334d2e187d29a6591cac249b7bfd65731f0f120f90
-    HEAD_REF master
+    REF "${VERSION}"
+    SHA512 e418b8f3cccb4716ed44acd0677afb96705f8b40a7714d483f1efe1a9b835f4a823c5a80f8457e72c8004f76d8a07c45d9cca55b699dd2fdaa6fe9f8cc863cbd
+    HEAD_REF main
 )
 
 string(COMPARE EQUAL ${VCPKG_CRT_LINKAGE} dynamic USE_DYNAMIC_VCXX_RUNTIME)
@@ -68,10 +68,10 @@ else()
     endif()
   elseif(VCPKG_TARGET_IS_OSX)
     if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-      file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
+      file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
     endif()
     if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-      file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+      file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
     endif()
   endif()
 endif()
@@ -80,4 +80,4 @@ vcpkg_copy_pdbs()
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT} @ONLY)
diff --git a/external_imported/vcpkg/ports/opencl/vcpkg-cmake-wrapper.cmake b/external_imported/vcpkg/ports/opencl/vcpkg-cmake-wrapper.cmake
index 0893710ff..4010eb40d 100644
--- a/external_imported/vcpkg/ports/opencl/vcpkg-cmake-wrapper.cmake
+++ b/external_imported/vcpkg/ports/opencl/vcpkg-cmake-wrapper.cmake
@@ -1,12 +1,12 @@
 _find_package(${ARGS})
-if(NOT BUILD_SHARED_LIBS AND (NOT CMAKE_SYSTEM_NAME MATCHES "Darwin"))
+if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND (NOT CMAKE_SYSTEM_NAME MATCHES "Darwin"))
   find_package(Threads REQUIRED)
   set(OpenCL_Extra_Libs ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT})
   if(CMAKE_SYSTEM_NAME MATCHES "Windows")
     list(APPEND OpenCL_Extra_Libs cfgmgr32)
-	if($ENV{WindowsSDKVersion} MATCHES "^10")
-		list(APPEND OpenCL_Extra_Libs OneCoreUAP)
-	endif()
+  if($ENV{WindowsSDKVersion} MATCHES "^10")
+    list(APPEND OpenCL_Extra_Libs OneCoreUAP)
+  endif()
   endif(CMAKE_SYSTEM_NAME MATCHES "Windows")
 
   if(TARGET OpenCL::OpenCL)
@@ -15,4 +15,5 @@ if(NOT BUILD_SHARED_LIBS AND (NOT CMAKE_SYSTEM_NAME MATCHES "Darwin"))
   if(OpenCL_LIBRARIES)
       list(APPEND OpenCL_LIBRARIES ${OpenCL_Extra_Libs})
   endif()
-endif()
\ No newline at end of file
+  unset(OpenCL_Extra_Libs)
+endif()
diff --git a/external_imported/vcpkg/ports/opencl/vcpkg.json b/external_imported/vcpkg/ports/opencl/vcpkg.json
index cbef5d4ff..454210a30 100644
--- a/external_imported/vcpkg/ports/opencl/vcpkg.json
+++ b/external_imported/vcpkg/ports/opencl/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "opencl",
-  "version-string": "v2022.09.30",
+  "version-string": "v2023.02.06",
+  "port-version": 2,
   "description": "C/C++ headers and ICD loader (Installable Client Driver) for OpenCL",
   "homepage": "https://github.com/KhronosGroup/OpenCL-Headers",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/opencolorio/fix-del-install-file.patch b/external_imported/vcpkg/ports/opencolorio/fix-del-install-file.patch
new file mode 100644
index 000000000..6605d721c
--- /dev/null
+++ b/external_imported/vcpkg/ports/opencolorio/fix-del-install-file.patch
@@ -0,0 +1,16 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 17e188d..c6c5ff5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -341,11 +341,7 @@ if (NOT BUILD_SHARED_LIBS)
+ 
+     # Install custom Find modules.
+     install(FILES
+-        ${CMAKE_CURRENT_LIST_DIR}/share/cmake/modules/Findexpat.cmake
+-        ${CMAKE_CURRENT_LIST_DIR}/share/cmake/modules/FindImath.cmake
+-        ${CMAKE_CURRENT_LIST_DIR}/share/cmake/modules/Findpystring.cmake
+         ${CMAKE_CURRENT_LIST_DIR}/share/cmake/modules/Findminizip-ng.cmake
+-        ${CMAKE_CURRENT_LIST_DIR}/share/cmake/modules/Findyaml-cpp.cmake
+         DESTINATION ${OCIO_CUSTOM_FIND_MODULE_DIR}
+     )
+ endif()
diff --git a/external_imported/vcpkg/ports/opencolorio/fix-dependency.patch b/external_imported/vcpkg/ports/opencolorio/fix-dependency.patch
index d446358fc..b08c3f357 100644
--- a/external_imported/vcpkg/ports/opencolorio/fix-dependency.patch
+++ b/external_imported/vcpkg/ports/opencolorio/fix-dependency.patch
@@ -1,17 +1,17 @@
 diff --git a/share/cmake/modules/FindExtPackages.cmake b/share/cmake/modules/FindExtPackages.cmake
-index 8787b87..f953ceb 100644
+index 5455a08..3b9530e 100644
 --- a/share/cmake/modules/FindExtPackages.cmake
 +++ b/share/cmake/modules/FindExtPackages.cmake
-@@ -26,15 +26,15 @@ set(CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY ON CACHE BOOL
+@@ -37,20 +37,20 @@ endif()
  
  # expat
  # https://github.com/libexpat/libexpat
--find_package(expat 2.2.8 REQUIRED)
+-find_package(expat 2.4.1 REQUIRED)
 +find_package(expat CONFIG REQUIRED)
  
  # yaml-cpp
  # https://github.com/jbeder/yaml-cpp
--find_package(yaml-cpp 0.6.3 REQUIRED)
+-find_package(yaml-cpp 0.7.0 REQUIRED)
 +find_package(yaml-cpp CONFIG REQUIRED)
  
  # pystring
@@ -19,27 +19,24 @@ index 8787b87..f953ceb 100644
 -find_package(pystring 1.1.3 REQUIRED)
 +find_package(pystring CONFIG REQUIRED)
  
- # Half
- # NOTE: OCIO_USE_IMATH_HALF needs to be an integer for use in utils/Half.h.in
-@@ -42,7 +42,7 @@ if(NOT OCIO_USE_OPENEXR_HALF)
+ # Imath (>=3.1)
+ # https://github.com/AcademySoftwareFoundation/Imath
+ set(_Imath_ExternalProject_VERSION "3.1.5")
+-find_package(Imath 3.0 REQUIRED)
++find_package(Imath CONFIG REQUIRED)
  
-     # Imath (>=3.0)
-     # https://github.com/AcademySoftwareFoundation/Imath
--    find_package(Imath 3.1.2 REQUIRED)
-+    find_package(Imath CONFIG REQUIRED)
-     
-     set(OCIO_HALF_LIB Imath::Imath CACHE STRING "Half library target" FORCE)
-     set(OCIO_USE_IMATH_HALF "1" CACHE STRING "Whether 'half' type will be sourced from the Imath library (>=v3.0)" FORCE)
-@@ -50,7 +50,7 @@ else()
+ ###############################################################################
+ ### ZLIB (https://github.com/madler/zlib)
+@@ -138,7 +138,7 @@ endif()
  
-     # OpenEXR/IlmBase (<=2.5)
-     # https://github.com/AcademySoftwareFoundation/openexr
--    find_package(Half 2.4.0 REQUIRED)
-+    find_package(Half CONFIG REQUIRED)
+ # minizip-ng
+ # https://github.com/zlib-ng/minizip-ng
+-find_package(minizip-ng 3.0.7 REQUIRED)
++find_package(minizip-ng CONFIG REQUIRED)
  
-     set(OCIO_HALF_LIB IlmBase::Half CACHE STRING "Half library target" FORCE)
-     set(OCIO_USE_IMATH_HALF "0" CACHE STRING "Whether 'half' type will be sourced from the Imath library (>=v3.0)" FORCE)
-@@ -65,7 +65,7 @@ if(OCIO_BUILD_APPS)
+ if(OCIO_BUILD_APPS)
+ 
+@@ -149,7 +149,7 @@ if(OCIO_BUILD_APPS)
  
      # lcms2
      # https://github.com/mm2/Little-CMS
@@ -48,34 +45,20 @@ index 8787b87..f953ceb 100644
  endif()
  
  if(OCIO_BUILD_OPENFX)
-diff --git a/src/OpenColorIO/CMakeLists.txt b/src/OpenColorIO/CMakeLists.txt
-index 034185d..b992bbc 100755
---- a/src/OpenColorIO/CMakeLists.txt
-+++ b/src/OpenColorIO/CMakeLists.txt
-@@ -226,9 +226,9 @@ target_link_libraries(OpenColorIO
-         expat::expat
-         ${OCIO_HALF_LIB}
-         pystring::pystring
--        sampleicc::sampleicc
--        utils::from_chars
--        utils::strings
-+        "$<BUILD_INTERFACE:sampleicc::sampleicc>"
-+        "$<BUILD_INTERFACE:utils::from_chars>"
-+        "$<BUILD_INTERFACE:utils::strings>"
-         yaml-cpp
- )
- 
 diff --git a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in
-index eebb2c1..7147dc3 100644
+index 6a4932a..2a08f5a 100644
 --- a/src/cmake/Config.cmake.in
 +++ b/src/cmake/Config.cmake.in
-@@ -2,4 +2,9 @@
- 
+@@ -1,6 +1,12 @@
+ @PACKAGE_INIT@
+
  include(CMakeFindDependencyMacro)
- 
 +find_dependency(expat CONFIG)
 +find_dependency(Imath CONFIG)
 +find_dependency(pystring CONFIG)
 +find_dependency(yaml-cpp CONFIG)
-+
- include(${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake)
++find_dependency(minizip-ng CONFIG)
++find_dependency(lcms2 CONFIG)
+
+ if (NOT @BUILD_SHARED_LIBS@) # NOT @BUILD_SHARED_LIBS@
+     if (APPLE)
diff --git a/external_imported/vcpkg/ports/opencolorio/fix-func-param.patch b/external_imported/vcpkg/ports/opencolorio/fix-func-param.patch
new file mode 100644
index 000000000..0da99a62a
--- /dev/null
+++ b/external_imported/vcpkg/ports/opencolorio/fix-func-param.patch
@@ -0,0 +1,93 @@
+diff --git a/src/OpenColorIO/OCIOZArchive.cpp b/src/OpenColorIO/OCIOZArchive.cpp
+index 85fc7bb..aa90943 100644
+--- a/src/OpenColorIO/OCIOZArchive.cpp
++++ b/src/OpenColorIO/OCIOZArchive.cpp
+@@ -24,9 +24,11 @@
+ #include "mz_strm_mem.h"
+ #include "mz_strm_os.h"
+ #include "mz_strm_split.h"
+-#include "mz_strm_zlib.h"
+ #include "mz_zip.h"
+ #include "mz_zip_rw.h"
++#ifndef __APPLE__
++#include "mz_strm_zlib.h"
++#endif
+ 
+ namespace OCIO_NAMESPACE
+ {
+@@ -225,7 +227,11 @@ void archiveConfig(std::ostream & ostream, const Config & config, const char * c
+     std::string configStr = ss.str();
+ 
+     // Write zip to memory stream.
++#if MZ_VERSION_BUILD >= 040000
++    write_mem_stream = mz_stream_mem_create();
++#else
+     mz_stream_mem_create(&write_mem_stream);
++#endif
+     mz_stream_mem_set_grow_size(write_mem_stream, 128 * 1024);
+     mz_stream_open(write_mem_stream, NULL, MZ_OPEN_MODE_CREATE);
+ 
+@@ -237,7 +243,11 @@ void archiveConfig(std::ostream & ostream, const Config & config, const char * c
+     options.compress_level  = ArchiveCompressionLevels::BEST;
+ 
+     // Create the writer handle.
++#if MZ_VERSION_BUILD >= 040000
++    archiver = mz_zip_writer_create();
++#else
+     mz_zip_writer_create(&archiver);
++#endif
+ 
+     // Archive options.
+     // Compression method
+@@ -332,7 +342,11 @@ void ExtractOCIOZArchive(const char * archivePath, const char * destination)
+     std::string outputDestination = pystring::os::path::normpath(destination);
+ 
+     // Create zip reader.
++#if MZ_VERSION_BUILD >= 040000
++    extracter = mz_zip_reader_create();
++#else
+     mz_zip_reader_create(&extracter);
++#endif
+ 
+     MinizipNgHandlerGuard extracterGuard(extracter, false, false);
+ 
+@@ -450,7 +464,11 @@ std::vector<uint8_t> getFileStringFromArchiveFile(const std::string & filepath,
+     std::vector<uint8_t> buffer;
+ 
+     // Create the reader object.
++#if MZ_VERSION_BUILD >= 040000
++    reader = mz_zip_reader_create();
++#else
+     mz_zip_reader_create(&reader);
++#endif
+ 
+     MinizipNgHandlerGuard extracterGuard(reader, false, true);
+ 
+@@ -510,7 +528,11 @@ void getEntriesMappingFromArchiveFile(const std::string & archivePath,
+     void *reader = NULL;
+ 
+     // Create the reader object.
++#if MZ_VERSION_BUILD >= 040000
++    reader = mz_zip_reader_create();
++#else
+     mz_zip_reader_create(&reader);
++#endif
+ 
+     MinizipNgHandlerGuard extracterGuard(reader, false, false);
+ 
+diff --git a/src/apps/ocioarchive/main.cpp b/src/apps/ocioarchive/main.cpp
+index 190cade..68054a6 100644
+--- a/src/apps/ocioarchive/main.cpp
++++ b/src/apps/ocioarchive/main.cpp
+@@ -235,7 +235,11 @@ int main(int argc, const char **argv)
+         }
+ 
+         std::string path = args[0];
++#if MZ_VERSION_BUILD >= 040000
++        reader = mz_zip_reader_create();
++#else
+         mz_zip_reader_create(&reader);
++#endif
+         struct tm tmu_date;
+         
+         err = mz_zip_reader_open_file(reader, path.c_str());
diff --git a/external_imported/vcpkg/ports/opencolorio/fix-pkgconfig.patch b/external_imported/vcpkg/ports/opencolorio/fix-pkgconfig.patch
index 7337952c8..976afe122 100644
--- a/external_imported/vcpkg/ports/opencolorio/fix-pkgconfig.patch
+++ b/external_imported/vcpkg/ports/opencolorio/fix-pkgconfig.patch
@@ -7,4 +7,4 @@ index f25c280..d9a450b 100644
  Libs: -L${libdir} -l@PROJECT_NAME@
  Cflags: -I${includedir}
 +Libs.private: -lpystring
-+Requires.private: expat Imath yaml-cpp
++Requires.private: expat Imath yaml-cpp minizip-ng
diff --git a/external_imported/vcpkg/ports/opencolorio/portfile.cmake b/external_imported/vcpkg/ports/opencolorio/portfile.cmake
index a9bf1feea..3b89e97fc 100644
--- a/external_imported/vcpkg/ports/opencolorio/portfile.cmake
+++ b/external_imported/vcpkg/ports/opencolorio/portfile.cmake
@@ -1,18 +1,16 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO AcademySoftwareFoundation/OpenColorIO
-    REF v2.1.2
-    SHA512 594e808fb1c175d5b14eb540be0dfb6f41cd37b5bf7df8c2d24d44dfe4986643ea68e52d0282eb3b25283489789001a57a201de1eecc1560fc9461780c7da353
+    REF "v${VERSION}"
+    SHA512 d5f3a4b5bd661af7336c015d07e0feccb286464a08239a3c259a97217001161e7571f5137475fc2f4d1b9af6381bbfa03c0b60f41de282f114307961b8d84fc9
     HEAD_REF master
     PATCHES
         fix-dependency.patch
+        fix-del-install-file.patch
+        fix-func-param.patch #https://github.com/AcademySoftwareFoundation/OpenColorIO/pull/1806
         fix-pkgconfig.patch
 )
 
-file(REMOVE "${SOURCE_PATH}/share/cmake/modules/Findexpat.cmake")
-file(REMOVE "${SOURCE_PATH}/share/cmake/modules/FindImath.cmake")
-file(REMOVE "${SOURCE_PATH}/share/cmake/modules/Findpystring.cmake")
-file(REMOVE "${SOURCE_PATH}/share/cmake/modules/Findyaml-cpp.cmake")
 file(REMOVE "${SOURCE_PATH}/share/cmake/modules/Findlcms2.cmake")
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -36,6 +34,7 @@ vcpkg_cmake_configure(
         ${FEATURE_OPTIONS}
     MAYBE_UNUSED_VARIABLES
         CMAKE_DISABLE_FIND_PACKAGE_OpenImageIO
+        OCIO_USE_OPENEXR_HALF
 )
 
 vcpkg_cmake_install()
@@ -61,11 +60,11 @@ file(REMOVE_RECURSE
 )
 if(OCIO_BUILD_APPS)
     vcpkg_copy_tools(
-        TOOL_NAMES ociowrite ociomakeclf ociochecklut ociocheck ociobakelut
+        TOOL_NAMES ociowrite ociomakeclf ociochecklut ociocheck ociobakelut ocioarchive ocioconvert ociolutimage ocioperf
         AUTO_CLEAN
     )
 endif()
 
 vcpkg_fixup_pkgconfig()
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/opencolorio/vcpkg.json b/external_imported/vcpkg/ports/opencolorio/vcpkg.json
index b206a5688..1b98a97ff 100644
--- a/external_imported/vcpkg/ports/opencolorio/vcpkg.json
+++ b/external_imported/vcpkg/ports/opencolorio/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "opencolorio",
-  "version-semver": "2.1.2",
+  "version-semver": "2.2.1",
+  "port-version": 1,
   "description": "OpenColorIO (OCIO) is a complete color management solution geared towards motion picture production with an emphasis on visual effects and computer animation. OCIO provides a straightforward and consistent user experience across all supporting applications while allowing for sophisticated back-end configuration options suitable for high-end production usage. OCIO is compatible with the Academy Color Encoding Specification (ACES) and is LUT-format agnostic, supporting many popular formats.",
   "homepage": "https://opencolorio.org/",
   "license": "BSD-3-Clause",
@@ -8,6 +9,7 @@
   "dependencies": [
     "expat",
     "imath",
+    "minizip-ng",
     "pystring",
     {
       "name": "vcpkg-cmake",
@@ -24,7 +26,8 @@
       "description": "Installs tools",
       "dependencies": [
         "glew",
-        "lcms"
+        "lcms",
+        "openexr"
       ]
     }
   }
diff --git a/external_imported/vcpkg/ports/opencsg/vcpkg.json b/external_imported/vcpkg/ports/opencsg/vcpkg.json
index 568f90440..d6f1d6f99 100644
--- a/external_imported/vcpkg/ports/opencsg/vcpkg.json
+++ b/external_imported/vcpkg/ports/opencsg/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "opencsg",
-  "version-string": "1.4.2",
-  "port-version": 3,
+  "version": "1.4.2",
+  "port-version": 4,
   "description": "OpenCSG is a library that does image-based CSG rendering using OpenGL. OpenCSG is written in C++ and supports most modern graphics hardware using Microsoft Windows or the Linux operating system.",
   "dependencies": [
     "glew",
diff --git a/external_imported/vcpkg/ports/opencv/vcpkg.json b/external_imported/vcpkg/ports/opencv/vcpkg.json
index 04f6147d5..6f7f217ae 100644
--- a/external_imported/vcpkg/ports/opencv/vcpkg.json
+++ b/external_imported/vcpkg/ports/opencv/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "opencv",
-  "version": "4.7.0",
+  "version": "4.8.0",
   "port-version": 1,
   "description": "Computer vision library",
   "homepage": "https://github.com/opencv/opencv",
@@ -412,6 +412,18 @@
         }
       ]
     },
+    "vulkan": {
+      "description": "Vulkan support for opencv dnn",
+      "dependencies": [
+        {
+          "name": "opencv4",
+          "default-features": false,
+          "features": [
+            "vulkan"
+          ]
+        }
+      ]
+    },
     "webp": {
       "description": "WebP support for opencv",
       "dependencies": [
diff --git a/external_imported/vcpkg/ports/opencv2/0020-missing-include.patch b/external_imported/vcpkg/ports/opencv2/0020-missing-include.patch
new file mode 100644
index 000000000..2967ebf35
--- /dev/null
+++ b/external_imported/vcpkg/ports/opencv2/0020-missing-include.patch
@@ -0,0 +1,12 @@
+diff --git a/modules/ts/src/gpu_test.cpp b/modules/ts/src/gpu_test.cpp
+index 21d9ad9..a626b0b 100644
+--- a/modules/ts/src/gpu_test.cpp
++++ b/modules/ts/src/gpu_test.cpp
+@@ -42,6 +42,7 @@
+ 
+ #include "opencv2/ts/gpu_test.hpp"
+ #include <stdexcept>
++#include <functional>
+ 
+ using namespace cv;
+ using namespace cv::gpu;
diff --git a/external_imported/vcpkg/ports/opencv2/portfile.cmake b/external_imported/vcpkg/ports/opencv2/portfile.cmake
index 5667ee761..28d221376 100644
--- a/external_imported/vcpkg/ports/opencv2/portfile.cmake
+++ b/external_imported/vcpkg/ports/opencv2/portfile.cmake
@@ -16,6 +16,7 @@ vcpkg_from_github(
       0006-fix-jasper.patch
       0007-fix-config.patch
       0019-fix-openexr.patch
+      0020-missing-include.patch
 )
 # Disallow accidental build of vendored copies
 file(REMOVE_RECURSE "${SOURCE_PATH}/3rdparty/openexr")
@@ -111,6 +112,7 @@ vcpkg_cmake_configure(
         -DWITH_ZLIB=ON
         -WITH_GTK=${WITH_GTK}
         -DWITH_CUBLAS=OFF   # newer libcublas cannot be found by the old cuda cmake script in opencv2, requires a fix
+        -DOPENCV_LAPACK_FIND_PACKAGE_ONLY=ON
 )
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/opencv2/vcpkg.json b/external_imported/vcpkg/ports/opencv2/vcpkg.json
index 559113b5e..a8fc9c1d4 100644
--- a/external_imported/vcpkg/ports/opencv2/vcpkg.json
+++ b/external_imported/vcpkg/ports/opencv2/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "opencv2",
   "version": "2.4.13.7",
-  "port-version": 16,
+  "port-version": 19,
   "description": "Open Source Computer Vision Library",
   "homepage": "https://github.com/opencv/opencv",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/opencv3/0003-force-package-requirements.patch b/external_imported/vcpkg/ports/opencv3/0003-force-package-requirements.patch
index d7990dfcf..5f7e360c9 100644
--- a/external_imported/vcpkg/ports/opencv3/0003-force-package-requirements.patch
+++ b/external_imported/vcpkg/ports/opencv3/0003-force-package-requirements.patch
@@ -72,3 +72,16 @@
    if(NOT GDCM_FOUND)
      set(HAVE_GDCM NO)
      ocv_clear_vars(GDCM_VERSION GDCM_LIBRARIES)
+diff --git a/modules/imgcodecs/CMakeLists.txt b/modules/imgcodecs/CMakeLists.txt
+index 213667a..4052387 100644
+--- a/modules/imgcodecs/CMakeLists.txt
++++ b/modules/imgcodecs/CMakeLists.txt
+@@ -24,7 +24,7 @@ endif()
+
+ if(HAVE_WEBP)
+   add_definitions(-DHAVE_WEBP)
+-  ocv_include_directories(${WEBP_INCLUDE_DIR})
++  ocv_include_directories(${WEBP_INCLUDE_DIRS})
+   list(APPEND GRFMT_LIBS ${WEBP_LIBRARIES})
+ endif()
+
diff --git a/external_imported/vcpkg/ports/opencv3/0019-missing-include.patch b/external_imported/vcpkg/ports/opencv3/0019-missing-include.patch
new file mode 100644
index 000000000..2da142b0a
--- /dev/null
+++ b/external_imported/vcpkg/ports/opencv3/0019-missing-include.patch
@@ -0,0 +1,12 @@
+diff --git a/modules/dnn/src/op_halide.cpp b/modules/dnn/src/op_halide.cpp
+index c96971bc6aac..d107e01887d0 100644
+--- a/modules/dnn/src/op_halide.cpp
++++ b/modules/dnn/src/op_halide.cpp
+@@ -11,6 +11,7 @@
+ 
+ #ifdef HAVE_HALIDE
+ #include <HalideRuntimeOpenCL.h>
++#include <thread>
+ #endif  // HAVE_HALIDE
+ 
+ namespace cv
diff --git a/external_imported/vcpkg/ports/opencv3/0020-fix-supportqnx.patch b/external_imported/vcpkg/ports/opencv3/0020-fix-supportqnx.patch
new file mode 100644
index 000000000..be592ba4e
--- /dev/null
+++ b/external_imported/vcpkg/ports/opencv3/0020-fix-supportqnx.patch
@@ -0,0 +1,21 @@
+diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp
+index 9bade08..28f006e 100644
+--- a/modules/core/src/system.cpp
++++ b/modules/core/src/system.cpp
+@@ -129,11 +129,15 @@ void* allocSingletonNewBuffer(size_t size) { return malloc(size); }
+ #include <cstdlib>        // std::abort
+ #endif
+ 
+-#if defined __ANDROID__ || defined __unix__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __HAIKU__
++#if defined __ANDROID__ || defined __unix__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __HAIKU__ || defined __QNX__
+ #  include <unistd.h>
+ #  include <fcntl.h>
+ #if defined __QNX__
+ #  include <sys/elf.h>
++#  include <sys/auxv.h>
++using Elf64_auxv_t = auxv64_t;
++#  include <elfdefinitions.h>
++constexpr decltype(auto) AT_HWCAP = NT_GNU_HWCAP;
+ #else
+ #  include <elf.h>
+ #endif
diff --git a/external_imported/vcpkg/ports/opencv3/portfile.cmake b/external_imported/vcpkg/ports/opencv3/portfile.cmake
index 1892908f1..86c96a553 100644
--- a/external_imported/vcpkg/ports/opencv3/portfile.cmake
+++ b/external_imported/vcpkg/ports/opencv3/portfile.cmake
@@ -2,6 +2,7 @@ file(READ "${CMAKE_CURRENT_LIST_DIR}/vcpkg.json" _contents)
 string(JSON OPENCV_VERSION GET "${_contents}" version)
 
 set(USE_QT_VERSION "5")
+set(ENABLE_CXX11 ON)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -21,7 +22,9 @@ vcpkg_from_github(
       0010-fix-uwp-tiff-imgcodecs.patch
       0011-remove-python2.patch
       0012-fix-zlib.patch
+      0019-missing-include.patch
       fix-tbb-error.patch
+      0020-fix-supportqnx.patch
 )
 # Disallow accidental build of vendored copies
 file(REMOVE_RECURSE "${SOURCE_PATH}/3rdparty/openexr")
@@ -282,6 +285,7 @@ if("ffmpeg" IN_LIST FEATURES)
 endif()
 
 if("halide" IN_LIST FEATURES)
+  set(ENABLE_CXX11 OFF)
   list(APPEND ADDITIONAL_BUILD_FLAGS
     # Halide 13 requires C++17
     "-DCMAKE_CXX_STANDARD=17"
@@ -369,7 +373,7 @@ vcpkg_cmake_configure(
         -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
         -DCMAKE_DISABLE_FIND_PACKAGE_JNI=ON
         # ENABLE
-        -DENABLE_CXX11=ON
+        -DENABLE_CXX11=${ENABLE_CXX11}
         ###### OPENCV vars
         "-DOPENCV_DOWNLOAD_PATH=${DOWNLOADS}/opencv-cache"
         ${BUILD_WITH_CONTRIB_FLAG}
@@ -398,6 +402,7 @@ vcpkg_cmake_configure(
         ###### Additional build flags
         ${ADDITIONAL_BUILD_FLAGS}
         -DBUILD_IPP_IW=${WITH_IPP}
+        -DOPENCV_LAPACK_FIND_PACKAGE_ONLY=ON
 )
 
 vcpkg_cmake_install()
@@ -415,7 +420,7 @@ endif()
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
   file(READ "${CURRENT_PACKAGES_DIR}/share/opencv3/OpenCVModules.cmake" OPENCV_MODULES)
   set(DEPS_STRING "include(CMakeFindDependencyMacro)
-if(${BUILD_opencv_flann})
+if(${BUILD_opencv_flann} AND NOT TARGET libprotobuf) #Check if the CMake target libprotobuf is already defined
   find_dependency(Protobuf CONFIG REQUIRED)
   if(TARGET protobuf::libprotobuf)
     add_library (libprotobuf INTERFACE IMPORTED)
@@ -533,4 +538,4 @@ endif()
 
 configure_file("${CURRENT_PORT_DIR}/usage.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY)
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/opencv3/vcpkg.json b/external_imported/vcpkg/ports/opencv3/vcpkg.json
index c78d92b83..ab3909315 100644
--- a/external_imported/vcpkg/ports/opencv3/vcpkg.json
+++ b/external_imported/vcpkg/ports/opencv3/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "opencv3",
   "version": "3.4.18",
-  "port-version": 6,
+  "port-version": 13,
   "description": "Open Source Computer Vision Library",
   "homepage": "https://github.com/opencv/opencv",
   "license": "BSD-3-Clause",
@@ -229,6 +229,13 @@
     "python": {
       "description": "Python wrapper support for opencv",
       "dependencies": [
+        {
+          "name": "opencv3",
+          "default-features": false,
+          "features": [
+            "flann"
+          ]
+        },
         "python3"
       ]
     },
diff --git a/external_imported/vcpkg/ports/opencv4/0003-force-package-requirements.patch b/external_imported/vcpkg/ports/opencv4/0003-force-package-requirements.patch
index 64bba8462..3c2bfe793 100644
--- a/external_imported/vcpkg/ports/opencv4/0003-force-package-requirements.patch
+++ b/external_imported/vcpkg/ports/opencv4/0003-force-package-requirements.patch
@@ -81,3 +81,16 @@
    if(NOT GDCM_FOUND)
      set(HAVE_GDCM NO)
      ocv_clear_vars(GDCM_VERSION GDCM_LIBRARIES)
+diff --git a/modules/imgcodecs/CMakeLists.txt b/modules/imgcodecs/CMakeLists.txt
+index 213667a..4052387 100644
+--- a/modules/imgcodecs/CMakeLists.txt
++++ b/modules/imgcodecs/CMakeLists.txt
+@@ -24,7 +24,7 @@ endif()
+ 
+ if(HAVE_WEBP)
+   add_definitions(-DHAVE_WEBP)
+-  ocv_include_directories(${WEBP_INCLUDE_DIR})
++  ocv_include_directories(${WEBP_INCLUDE_DIRS})
+   list(APPEND GRFMT_LIBS ${WEBP_LIBRARIES})
+ endif()
+ 
diff --git a/external_imported/vcpkg/ports/opencv4/0017-fix-flatbuffers.patch b/external_imported/vcpkg/ports/opencv4/0017-fix-flatbuffers.patch
new file mode 100644
index 000000000..517c6ea99
--- /dev/null
+++ b/external_imported/vcpkg/ports/opencv4/0017-fix-flatbuffers.patch
@@ -0,0 +1,20 @@
+diff --git a/cmake/OpenCVDetectFlatbuffers.cmake b/cmake/OpenCVDetectFlatbuffers.cmake
+index 537b738..6dba0fb 100644
+--- a/cmake/OpenCVDetectFlatbuffers.cmake
++++ b/cmake/OpenCVDetectFlatbuffers.cmake
+@@ -1,9 +1,11 @@
+ if(WITH_FLATBUFFERS)
+   set(HAVE_FLATBUFFERS 1)
+-  set(flatbuffers_VERSION "23.5.9")
+-  ocv_install_3rdparty_licenses(flatbuffers "${OpenCV_SOURCE_DIR}/3rdparty/flatbuffers/LICENSE.txt")
+-  ocv_add_external_target(flatbuffers "${OpenCV_SOURCE_DIR}/3rdparty/flatbuffers/include" "" "HAVE_FLATBUFFERS=1")
+-  set(CUSTOM_STATUS_flatbuffers "    Flatbuffers:" "builtin/3rdparty (${flatbuffers_VERSION})")
++  set(flatbuffers_VERSION "23.5.26")
++  #ocv_install_3rdparty_licenses(flatbuffers "${OpenCV_SOURCE_DIR}/3rdparty/flatbuffers/LICENSE.txt")
++  find_path(FLATBUFFERS_INCLUDE_DIR flatbuffers.h PATH_SUFFIXES flatbuffers)
++  get_filename_component(FLATBUFFERS_INCLUDE_DIR "${FLATBUFFERS_INCLUDE_DIR}" PATH)
++  ocv_add_external_target(flatbuffers "${FLATBUFFERS_INCLUDE_DIR}" "" "HAVE_FLATBUFFERS=1")
++  #set(CUSTOM_STATUS_flatbuffers "    Flatbuffers:" "builtin/3rdparty (${flatbuffers_VERSION})")
+ endif()
+ 
+ if(WITH_FLATBUFFERS OR HAVE_FLATBUFFERS)
diff --git a/external_imported/vcpkg/ports/opencv4/0019-fix-ogre-dependency.patch b/external_imported/vcpkg/ports/opencv4/0019-fix-ogre-dependency.patch
new file mode 100644
index 000000000..314ea821e
--- /dev/null
+++ b/external_imported/vcpkg/ports/opencv4/0019-fix-ogre-dependency.patch
@@ -0,0 +1,9 @@
+--- a/modules/ovis/CMakeLists.txt
++++ b/modules/ovis/CMakeLists.txt
+@@ -27,4 +27,6 @@ ocv_create_module()
+ ocv_add_samples(opencv_aruco)
+ 
+ ocv_warnings_disable(CMAKE_CXX_FLAGS -Wunused-parameter)
++# The target always has the name OgreGLSupport
++string(REPLACE "OgreGLSupportStatic" "OgreGLSupport" OGRE_LIBRARIES "${OGRE_LIBRARIES}")
+ ocv_target_link_libraries(${the_module} ${OGRE_LIBRARIES})
diff --git a/external_imported/vcpkg/ports/opencv4/0019-missing-include.patch b/external_imported/vcpkg/ports/opencv4/0019-missing-include.patch
new file mode 100644
index 000000000..c1d4d3c15
--- /dev/null
+++ b/external_imported/vcpkg/ports/opencv4/0019-missing-include.patch
@@ -0,0 +1,12 @@
+diff --git a/modules/dnn/src/op_halide.cpp b/modules/dnn/src/op_halide.cpp
+index 653de36146cc..db1a72278e70 100644
+--- a/modules/dnn/src/op_halide.cpp
++++ b/modules/dnn/src/op_halide.cpp
+@@ -14,6 +14,7 @@
+ #include "halide_scheduler.hpp"
+ 
+ #include <HalideRuntimeOpenCL.h>
++#include <thread>
+ #endif  // HAVE_HALIDE
+ 
+ namespace cv {
diff --git a/external_imported/vcpkg/ports/opencv4/0020-fix-compat-cuda12.2.patch b/external_imported/vcpkg/ports/opencv4/0020-fix-compat-cuda12.2.patch
new file mode 100644
index 000000000..e027f4e4e
--- /dev/null
+++ b/external_imported/vcpkg/ports/opencv4/0020-fix-compat-cuda12.2.patch
@@ -0,0 +1,32 @@
+commit ab8cb6f8a9034da2a289b84685c6d959266029be
+Author: cudawarped <12133430+cudawarped@users.noreply.github.com>
+Date:   Tue Aug 1 13:02:42 2023 +0300
+
+    cuda: fix for compatibility with CUDA Toolkit >= 12.2.0
+
+diff --git a/modules/dnn/src/cuda4dnn/primitives/normalize_bbox.hpp b/modules/dnn/src/cuda4dnn/primitives/normalize_bbox.hpp
+index f067dddaa7..91ff33f817 100644
+--- a/modules/dnn/src/cuda4dnn/primitives/normalize_bbox.hpp
++++ b/modules/dnn/src/cuda4dnn/primitives/normalize_bbox.hpp
+@@ -111,7 +111,7 @@ namespace cv { namespace dnn { namespace cuda4dnn {
+              * or there might be several weights
+              * or we don't have to scale
+              */
+-            if (weight != 1.0)
++            if (weight != static_cast<T>(1.0f))
+             {
+                 kernels::scale1_with_bias1<T>(stream, output, input, weight, 1.0);
+             }
+diff --git a/modules/dnn/src/cuda4dnn/primitives/region.hpp b/modules/dnn/src/cuda4dnn/primitives/region.hpp
+index d22d44214e..3af05155fe 100644
+--- a/modules/dnn/src/cuda4dnn/primitives/region.hpp
++++ b/modules/dnn/src/cuda4dnn/primitives/region.hpp
+@@ -121,7 +121,7 @@ namespace cv { namespace dnn { namespace cuda4dnn {
+                 new_coords
+             );
+ 
+-            if (nms_iou_threshold > 0) {
++            if (nms_iou_threshold > static_cast<T>(0.0f)) {
+                 auto output_mat = output_wrapper->getMutableHostMat();
+                 CV_Assert(output_mat.type() == CV_32F);
+                 for (int i = 0; i < input.get_axis_size(0); i++) {
diff --git a/external_imported/vcpkg/ports/opencv4/0021-static-openvino.patch b/external_imported/vcpkg/ports/opencv4/0021-static-openvino.patch
new file mode 100644
index 000000000..156aca2bc
--- /dev/null
+++ b/external_imported/vcpkg/ports/opencv4/0021-static-openvino.patch
@@ -0,0 +1,25 @@
+diff --git a/cmake/OpenCVUtils.cmake b/cmake/OpenCVUtils.cmake
+index 437042958e..a90eb5a5ab 100644
+--- a/cmake/OpenCVUtils.cmake
++++ b/cmake/OpenCVUtils.cmake
+@@ -1632,13 +1632,19 @@ function(ocv_add_external_target name inc link def)
+   endif()
+ endfunction()
+ 
++set(__OPENCV_EXPORTED_EXTERNAL_TARGETS "" CACHE INTERNAL "")
+ function(ocv_install_used_external_targets)
+   if(NOT BUILD_SHARED_LIBS
+       AND NOT (CMAKE_VERSION VERSION_LESS "3.13.0")  # upgrade CMake: https://gitlab.kitware.com/cmake/cmake/-/merge_requests/2152
+   )
+     foreach(tgt in ${ARGN})
+       if(tgt MATCHES "^ocv\.3rdparty\.")
+-        install(TARGETS ${tgt} EXPORT OpenCVModules)
++        list(FIND __OPENCV_EXPORTED_EXTERNAL_TARGETS "${tgt}" _found)
++        if(_found EQUAL -1)  # don't export target twice
++          install(TARGETS ${tgt} EXPORT OpenCVModules)
++          list(APPEND __OPENCV_EXPORTED_EXTERNAL_TARGETS "${tgt}")
++          set(__OPENCV_EXPORTED_EXTERNAL_TARGETS "${__OPENCV_EXPORTED_EXTERNAL_TARGETS}" CACHE INTERNAL "")
++        endif()
+       endif()
+     endforeach()
+   endif()
diff --git a/external_imported/vcpkg/ports/opencv4/0022-fix-supportqnx.patch b/external_imported/vcpkg/ports/opencv4/0022-fix-supportqnx.patch
new file mode 100644
index 000000000..91d145f00
--- /dev/null
+++ b/external_imported/vcpkg/ports/opencv4/0022-fix-supportqnx.patch
@@ -0,0 +1,21 @@
+diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp
+index 7811ab7..8f00891 100644
+--- a/modules/core/src/system.cpp
++++ b/modules/core/src/system.cpp
+@@ -120,11 +120,15 @@ void* allocSingletonNewBuffer(size_t size) { return malloc(size); }
+ #include <cstdlib>        // std::abort
+ #endif
+ 
+-#if defined __ANDROID__ || defined __unix__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __HAIKU__ || defined __Fuchsia__
++#if defined __ANDROID__ || defined __unix__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __HAIKU__ || defined __Fuchsia__ || defined __QNX__
+ #  include <unistd.h>
+ #  include <fcntl.h>
+ #if defined __QNX__
+ #  include <sys/elf.h>
++#  include <sys/auxv.h>
++using Elf64_auxv_t = auxv64_t;
++#  include <elfdefinitions.h>
++constexpr decltype(auto) AT_HWCAP = NT_GNU_HWCAP;
+ #else
+ #  include <elf.h>
+ #endif
diff --git a/external_imported/vcpkg/ports/opencv4/portfile.cmake b/external_imported/vcpkg/ports/opencv4/portfile.cmake
index 8d99f0f82..a85879d19 100644
--- a/external_imported/vcpkg/ports/opencv4/portfile.cmake
+++ b/external_imported/vcpkg/ports/opencv4/portfile.cmake
@@ -1,14 +1,17 @@
-file(READ "${CMAKE_CURRENT_LIST_DIR}/vcpkg.json" _contents)
-string(JSON OPENCV_VERSION GET "${_contents}" version)
-
 set(USE_QT_VERSION "6")
 
+# https://github.com/opencv/opencv/pull/24043
+vcpkg_download_distfile(ARM64_WINDOWS_FIX
+  URLS https://github.com/opencv/opencv/commit/e5e1a3bfdea96bebda2ad963bc8f6cf17930aef7.patch?full_index=1
+  SHA512 8ae2544e4a7ece19efe21261acc183f91202ac5352c1ac42fb86bf33d698352eff1b8962422b092240f4e8c7a691e9aa5ef20d6070adcd37e92bb94c6010ce56
+  FILENAME opencv4-e5e1a3bfdea96bebda2ad963bc8f6cf17930aef7.patch
+)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO opencv/opencv
-    REF ${OPENCV_VERSION}
-    SHA512 f799e1eb4ef1eb81212319cf908d0a64d2d5179c8da86b919b06e96a6870a9f3ed33251223a841b71711349018ea6782c174179fa59958a1573e22d11cc9347d
-    FILE_DISAMBIGUATOR 1
+    REF "${VERSION}"
+    SHA512 48738c3e7460a361274357aef1dd427082ccd59f749d6317d92a414b3741ce6116ea15ed4fedd2d47a25e456c705f3ba114357558646097bfc0e6dba9b3b865c
     HEAD_REF master
     PATCHES
       0001-disable-downloading.patch
@@ -23,9 +26,16 @@ vcpkg_from_github(
       0011-remove-python2.patch
       0012-fix-zlib.patch
       0015-fix-freetype.patch
+      0017-fix-flatbuffers.patch
+      0019-missing-include.patch
+      0020-fix-compat-cuda12.2.patch
+      0021-static-openvino.patch # https://github.com/opencv/opencv/pull/23963
+      "${ARM64_WINDOWS_FIX}"
+      0022-fix-supportqnx.patch
 )
 # Disallow accidental build of vendored copies
 file(REMOVE_RECURSE "${SOURCE_PATH}/3rdparty/openexr")
+file(REMOVE_RECURSE "${SOURCE_PATH}/3rdparty/flatbuffers")
 
 if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
   set(TARGET_IS_AARCH64 1)
@@ -59,11 +69,14 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
  "gtk"       WITH_GTK
  "halide"    WITH_HALIDE
  "jasper"    WITH_JASPER
+ "openjpeg"  WITH_OPENJPEG
  "jpeg"      WITH_JPEG
  "lapack"    WITH_LAPACK
  "nonfree"   OPENCV_ENABLE_NONFREE
+ "openvino"  WITH_OPENVINO
  "openexr"   WITH_OPENEXR
  "opengl"    WITH_OPENGL
+ "ovis"      CMAKE_REQUIRE_FIND_PACKAGE_OGRE
  "png"       WITH_PNG
  "quirc"     WITH_QUIRC
  "sfm"       BUILD_opencv_sfm
@@ -72,6 +85,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
  "webp"      WITH_WEBP
  "world"     BUILD_opencv_world
  "dc1394"    WITH_1394
+ "vulkan"    WITH_VULKAN
 )
 
 # Cannot use vcpkg_check_features() for "dnn", "gtk", ipp", "openmp", "ovis", "python", "qt", "tbb"
@@ -82,6 +96,12 @@ if("dnn" IN_LIST FEATURES)
   else()
     message(WARNING "The dnn module cannot be enabled on Android")
   endif()
+  set(FLATC "${CURRENT_HOST_INSTALLED_DIR}/tools/flatbuffers/flatc${VCPKG_HOST_EXECUTABLE_SUFFIX}")
+  vcpkg_execute_required_process(
+    COMMAND "${FLATC}" --cpp -o "${SOURCE_PATH}/modules/dnn/misc/tflite" "${SOURCE_PATH}/modules/dnn/src/tflite/schema.fbs"
+    WORKING_DIRECTORY "${SOURCE_PATH}/modules/dnn/misc/tflite"
+    LOGNAME flatc-${TARGET_TRIPLET}
+  )
 endif()
 
 set(WITH_QT OFF)
@@ -119,6 +139,11 @@ if("tbb" IN_LIST FEATURES)
   set(WITH_TBB ON)
 endif()
 
+set(WITH_VULKAN OFF)
+if("vulkan" IN_LIST FEATURES)
+  set(WITH_VULKAN ON)
+endif()
+
 set(WITH_PYTHON OFF)
 set(BUILD_opencv_python3 OFF)
 if("python" IN_LIST FEATURES)
@@ -163,13 +188,14 @@ if("contrib" IN_LIST FEATURES)
   vcpkg_from_github(
     OUT_SOURCE_PATH CONTRIB_SOURCE_PATH
     REPO opencv/opencv_contrib
-    REF ${OPENCV_VERSION}
-    SHA512 f0d878180655de4255cb72cf358a5949dfcf53a386e74f9a743902ac1bae12b2e812a1fc4ecc56a6afdc6adbffec867883a3245ce0b527614cc76e3710e23230
+    REF ${VERSION}
+    SHA512 81cc41cfe1ea03e60b0657edeaa76a90926e5e79a9f93a482e17bc9edbf1b5ce36b13d108fd8fb097f2fb3d6381fbeb102811f44bfc761c2de7f69bf3c5298a1
     HEAD_REF master
     PATCHES
       0007-fix-hdf5.patch
       0016-fix-freetype-contrib.patch
       0018-fix-depend-tesseract.patch
+      0019-fix-ogre-dependency.patch
   )
   set(BUILD_WITH_CONTRIB_FLAG "-DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules")
 
@@ -259,9 +285,9 @@ if(WITH_IPP)
   if(VCPKG_TARGET_IS_OSX)
     if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
       vcpkg_download_distfile(OCV_DOWNLOAD
-        URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/a56b6ac6f030c312b2dce17430eef13aed9af274/ippicv/ippicv_2020_mac_intel64_20191018_general.tgz"
-        FILENAME "opencv-cache/ippicv/1c3d675c2a2395d094d523024896e01b-ippicv_2020_mac_intel64_20191018_general.tgz"
-        SHA512 454dfaaa245e3a3b2f1ffb1aa8e27e280b03685009d66e147482b14e5796fdf2d332cac0f9b0822caedd5760fda4ee0ce2961889597456bbc18202f10bf727cd
+        URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/1224f78da6684df04397ac0f40c961ed37f79ccb/ippicv/ippicv_2021.8_mac_intel64_20230330_general.tgz"
+        FILENAME "opencv-cache/ippicv/d2b234a86af1b616958619a4560356d9-ippicv_2021.8_mac_intel64_20230330_general.tgz"
+        SHA512 f74a4b7bda9ec20bbf7fbb764171156bfd0ca4915fd4efd77ff53fc7a64ce8219d82d28d4fef5968fde1b85fd669e63f9514f4700d85c25327ce56fa47c0f007
     )
     else()
       message(WARNING "This target architecture is not supported IPPICV")
@@ -270,15 +296,15 @@ if(WITH_IPP)
   elseif(VCPKG_TARGET_IS_LINUX)
     if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
       vcpkg_download_distfile(OCV_DOWNLOAD
-        URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/a56b6ac6f030c312b2dce17430eef13aed9af274/ippicv/ippicv_2020_lnx_intel64_20191018_general.tgz"
-        FILENAME "opencv-cache/ippicv/7421de0095c7a39162ae13a6098782f9-ippicv_2020_lnx_intel64_20191018_general.tgz"
-        SHA512 de6d80695cd6deef359376476edc4ff85fdddcf94972b936e0017f8a48aaa5d18f55c4253ae37deb83bff2f71410f68408063c88b5f3bf4df3c416aa93ceca87
+        URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/1224f78da6684df04397ac0f40c961ed37f79ccb/ippicv/ippicv_2021.8_lnx_intel64_20230330_general.tgz"
+        FILENAME "opencv-cache/ippicv/43219bdc7e3805adcbe3a1e2f1f3ef3b-ippicv_2021.8_lnx_intel64_20230330_general.tgz"
+        SHA512 e54085172465a9aa82e454c1055d62be9cb970e99e75343ab7849241f36762021c5b30cf2cff0d92bab2ccec65809c467293bea865e5af3ad82af8f75bf08ea0
       )
     elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
       vcpkg_download_distfile(OCV_DOWNLOAD
-        URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/a56b6ac6f030c312b2dce17430eef13aed9af274/ippicv/ippicv_2020_lnx_ia32_20191018_general.tgz"
-        FILENAME "opencv-cache/ippicv/ad189a940fb60eb71f291321322fe3e8-ippicv_2020_lnx_ia32_20191018_general.tgz"
-        SHA512 5ca9dafc3a634e2a5f83f6a498611c990ef16d54358e9b44574b01694e9d64b118d46d6e2011506e40d37e5a9865f576f790e37ff96b7c8b503507633631a296
+        URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/1224f78da6684df04397ac0f40c961ed37f79ccb/ippicv/ippicv_2021.8_lnx_ia32_20230330_general.tgz"
+        FILENAME "opencv-cache/ippicv/165875443d72faa3fd2146869da90d07-ippicv_2021.8_lnx_ia32_20230330_general.tgz"
+        SHA512 44560b42b1a406723f7d673735c4846dcba859d1f0f29da8885b3d4ab230c6b7bf6fa20837fcfd79ca01519344917be0a33a58f4641ffdaef13d2adbb40a3053
       )
     else()
       message(WARNING "This target architecture is not supported IPPICV")
@@ -287,15 +313,15 @@ if(WITH_IPP)
   elseif(VCPKG_TARGET_IS_WINDOWS)
     if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
       vcpkg_download_distfile(OCV_DOWNLOAD
-        URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/a56b6ac6f030c312b2dce17430eef13aed9af274/ippicv/ippicv_2020_win_intel64_20191018_general.zip"
-        FILENAME "opencv-cache/ippicv/879741a7946b814455eee6c6ffde2984-ippicv_2020_win_intel64_20191018_general.zip"
-        SHA512 50c4af4b7fe2161d652264230389dad2330e8c95b734d04fb7565bffdab855c06d43085e480da554c56b04f8538087d49503538d5943221ee2a772ee7be4c93c
+        URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/1224f78da6684df04397ac0f40c961ed37f79ccb/ippicv/ippicv_2021.8_win_intel64_20230330_general.zip"
+        FILENAME "opencv-cache/ippicv/71e4f58de939f0348ec7fb58ffb17dbf-ippicv_2021.8_win_intel64_20230330_general.zip"
+        SHA512 00233de01a9ad1a8df35fa5b66218ae42b3d0bfca08ed7a14e733d4ea037d01f6932386b6cfc441b159b525c0a31c259414c2f096431ed5cb0fd32dd1d367cde
       )
     elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
       vcpkg_download_distfile(OCV_DOWNLOAD
-        URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/a56b6ac6f030c312b2dce17430eef13aed9af274/ippicv/ippicv_2020_win_ia32_20191018_general.zip"
-        FILENAME "opencv-cache/ippicv/cd39bdf0c2e1cac9a61101dad7a2413e-ippicv_2020_win_ia32_20191018_general.zip"
-        SHA512 058d00775d9f16955c7a557d554b8c2976ab9dbad4ba3fdb9823c0f768809edbd835e4397f01dc090a9bc80d81de834375e7006614d2a898f42e8004de0e04bf
+        URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/1224f78da6684df04397ac0f40c961ed37f79ccb/ippicv/ippicv_2021.8_win_ia32_20230330_general.zip"
+        FILENAME "opencv-cache/ippicv/57fd4648cfe64eae9e2ad9d50173a553-ippicv_2021.8_win_ia32_20230330_general.zip"
+        SHA512 c2942f0bdc51e0d0ee0695c62d4e366c5b87d95acaac38c5df19c2c647849cc544c5689a569134baaf64a260aa4984db51fc094ddd995afef3bd0c1d3f265465
       )
     else()
       message(WARNING "This target architecture is not supported IPPICV")
@@ -380,6 +406,7 @@ vcpkg_cmake_configure(
         -Dade_DIR=${ADE_DIR}
         ###### Disable build 3rd party libs
         -DBUILD_JASPER=OFF
+        -DBUILD_OPENJPEG=OFF
         -DBUILD_JPEG=OFF
         -DBUILD_OPENEXR=OFF
         -DBUILD_PNG=OFF
@@ -424,14 +451,15 @@ vcpkg_cmake_configure(
         -DWITH_GTK=${WITH_GTK}
         -DWITH_QT=${WITH_QT}
         -DWITH_IPP=${WITH_IPP}
+        -DWITH_VULKAN=${WITH_VULKAN}
         -DWITH_MATLAB=OFF
         -DWITH_MSMF=${WITH_MSMF}
         -DWITH_OPENMP=${WITH_OPENMP}
         -DWITH_PROTOBUF=${BUILD_opencv_dnn}
         -DWITH_PYTHON=${WITH_PYTHON}
         -DWITH_OPENCLAMDBLAS=OFF
+        -DWITH_OPENVINO=${WITH_OPENVINO}
         -DWITH_TBB=${WITH_TBB}
-        -DWITH_OPENJPEG=OFF
         -DWITH_CPUFEATURES=OFF
         ###### BUILD_options (mainly modules which require additional libraries)
         -DBUILD_opencv_ovis=${BUILD_opencv_ovis}
@@ -445,6 +473,7 @@ vcpkg_cmake_configure(
         ###### Additional build flags
         ${ADDITIONAL_BUILD_FLAGS}
         -DBUILD_IPP_IW=${WITH_IPP}
+        -DOPENCV_LAPACK_FIND_PACKAGE_ONLY=ON
 )
 
 vcpkg_cmake_install()
@@ -461,7 +490,7 @@ endif()
 
   file(READ "${CURRENT_PACKAGES_DIR}/share/opencv4/OpenCVModules.cmake" OPENCV_MODULES)
   set(DEPS_STRING "include(CMakeFindDependencyMacro)
-if(${BUILD_opencv_dnn})
+if(${BUILD_opencv_dnn} AND NOT TARGET libprotobuf)  #Check if the CMake target libprotobuf is already defined
   find_dependency(Protobuf CONFIG REQUIRED)
   if(TARGET protobuf::libprotobuf)
     add_library (libprotobuf INTERFACE IMPORTED)
@@ -509,14 +538,20 @@ find_dependency(Tesseract)")
   if("lapack" IN_LIST FEATURES)
     string(APPEND DEPS_STRING "\nfind_dependency(LAPACK)")
   endif()
+  if(WITH_OPENVINO)
+    string(APPEND DEPS_STRING "\nfind_dependency(OpenVINO CONFIG)")
+  endif()
   if("openexr" IN_LIST FEATURES)
     string(APPEND DEPS_STRING "\nfind_dependency(OpenEXR CONFIG)")
   endif()
+  if("openjpeg" IN_LIST FEATURES)
+    string(APPEND DEPS_STRING "\nfind_dependency(OpenJPEG)")
+  endif()
   if(WITH_OPENMP)
     string(APPEND DEPS_STRING "\nfind_dependency(OpenMP)")
   endif()
   if(BUILD_opencv_ovis)
-    string(APPEND DEPS_STRING "\nfind_dependency(Ogre)")
+    string(APPEND DEPS_STRING "\nfind_dependency(OGRE)")
   endif()
   if("quirc" IN_LIST FEATURES)
     string(APPEND DEPS_STRING "\nfind_dependency(quirc)")
@@ -572,6 +607,12 @@ if(VCPKG_TARGET_IS_ANDROID)
   file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/README.android")
 endif()
 
+if("python" IN_LIST FEATURES)
+  file(GLOB python_dir LIST_DIRECTORIES true RELATIVE "${CURRENT_PACKAGES_DIR}/lib/" "${CURRENT_PACKAGES_DIR}/lib/python*")
+  file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/${python_dir}/site-packages/cv2/typing")
+  file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/${python_dir}/site-packages/cv2/typing")
+endif()
+
 vcpkg_fixup_pkgconfig()
 
 configure_file("${CURRENT_PORT_DIR}/usage.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY)
diff --git a/external_imported/vcpkg/ports/opencv4/vcpkg.json b/external_imported/vcpkg/ports/opencv4/vcpkg.json
index ac42c5616..8c6eb97fc 100644
--- a/external_imported/vcpkg/ports/opencv4/vcpkg.json
+++ b/external_imported/vcpkg/ports/opencv4/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "opencv4",
-  "version": "4.7.0",
-  "port-version": 3,
+  "version": "4.8.0",
+  "port-version": 15,
   "description": "computer vision library",
   "homepage": "https://github.com/opencv/opencv",
   "license": "Apache-2.0",
@@ -103,6 +103,12 @@
     "dnn": {
       "description": "Enable dnn module",
       "dependencies": [
+        "flatbuffers",
+        {
+          "name": "flatbuffers",
+          "host": true,
+          "default-features": false
+        },
         "protobuf"
       ]
     },
@@ -201,7 +207,7 @@
       "description": "Enable Intel Integrated Performance Primitives"
     },
     "jasper": {
-      "description": "JPEG 2000 support for opencv",
+      "description": "JPEG 2000 support for opencv (deprecated)",
       "dependencies": [
         "jasper"
       ]
@@ -234,9 +240,45 @@
         "opengl"
       ]
     },
+    "openjpeg": {
+      "description": "JPEG 2000 support for opencv",
+      "dependencies": [
+        "openjpeg"
+      ]
+    },
     "openmp": {
       "description": "Enable openmp support for opencv"
     },
+    "openvino": {
+      "description": "OpenVINO support for OpenCV DNN",
+      "supports": "!uwp & !x86",
+      "dependencies": [
+        {
+          "name": "opencv4",
+          "default-features": false,
+          "features": [
+            "dnn"
+          ]
+        },
+        {
+          "name": "openvino",
+          "default-features": false,
+          "features": [
+            "auto",
+            "cpu",
+            "hetero"
+          ]
+        },
+        {
+          "name": "openvino",
+          "default-features": false,
+          "features": [
+            "gpu"
+          ],
+          "platform": "x64 & !(osx | uwp)"
+        }
+      ]
+    },
     "ovis": {
       "description": "opencv_ovis module",
       "dependencies": [
@@ -330,6 +372,18 @@
         "vtk"
       ]
     },
+    "vulkan": {
+      "description": "Vulkan support for opencv dnn",
+      "dependencies": [
+        {
+          "name": "opencv4",
+          "default-features": false,
+          "features": [
+            "dnn"
+          ]
+        }
+      ]
+    },
     "webp": {
       "description": "WebP support for opencv",
       "dependencies": [
diff --git a/external_imported/vcpkg/ports/openexr/avx.patch b/external_imported/vcpkg/ports/openexr/avx.patch
deleted file mode 100644
index 4f57a63c5..000000000
--- a/external_imported/vcpkg/ports/openexr/avx.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/lib/OpenEXRCore/unpack.c b/src/lib/OpenEXRCore/unpack.c
-index 7587eb2..79061b8 100644
---- a/src/lib/OpenEXRCore/unpack.c
-+++ b/src/lib/OpenEXRCore/unpack.c
-@@ -37,7 +39,7 @@ half_to_float8 (float* out, const uint16_t* src)
- }
- #endif
- 
--#if (defined(__x86_64__) || defined(_M_X64)) &&                                \
-+#if (defined(__x86_64__) || defined(_M_X64)) && defined(__AVX__) &&                              \
-     (defined(__F16C__) || defined(__GNUC__) || defined(__clang__))
- 
- #    if defined(__F16C__)
diff --git a/external_imported/vcpkg/ports/openexr/fix-arm64-windows-build.patch b/external_imported/vcpkg/ports/openexr/fix-arm64-windows-build.patch
new file mode 100644
index 000000000..1d3310a8b
--- /dev/null
+++ b/external_imported/vcpkg/ports/openexr/fix-arm64-windows-build.patch
@@ -0,0 +1,13 @@
+diff --git a/src/lib/OpenEXRCore/internal_dwa_simd.h b/src/lib/OpenEXRCore/internal_dwa_simd.h
+index 7b53501ac..ca69c9848 100644
+--- a/src/lib/OpenEXRCore/internal_dwa_simd.h
++++ b/src/lib/OpenEXRCore/internal_dwa_simd.h
+@@ -18,7 +18,7 @@
+ // aligned. Unaligned pointers may risk seg-faulting.
+ //
+ 
+-#if defined __SSE2__ || (_MSC_VER >= 1300 && !_M_CEE_PURE)
++#if defined __SSE2__ || (_MSC_VER >= 1300 && (_M_IX86 || _M_X64) && !_M_CEE_PURE)
+ #    define IMF_HAVE_SSE2 1
+ #    include <emmintrin.h>
+ #    include <mmintrin.h>
diff --git a/external_imported/vcpkg/ports/openexr/portfile.cmake b/external_imported/vcpkg/ports/openexr/portfile.cmake
index d6a4128d3..0861fc093 100644
--- a/external_imported/vcpkg/ports/openexr/portfile.cmake
+++ b/external_imported/vcpkg/ports/openexr/portfile.cmake
@@ -1,10 +1,11 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO AcademySoftwareFoundation/openexr
-    REF v3.1.5
-    SHA512 01ef16eacd2dde83c67b81522bae87f47ba272a41ce7d4e35d865dbdcaa03093e7ac504b95d2c1b3a19535f2364a4f937b0e0570c74243bb1c6e021fce7b620c
+    REF "v${VERSION}"
+    SHA512 ec60e79341695452e05f50bbcc0d55e0ce00fbb64cdec01a83911189c8643eb28a8046b14ee4230e5f438f018f2f1d0714f691983474d7979befd199f3f34758
     HEAD_REF master
-    PATCHES avx.patch
+    PATCHES
+        fix-arm64-windows-build.patch # https://github.com/AcademySoftwareFoundation/openexr/pull/1447
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS OPTIONS
@@ -18,7 +19,8 @@ vcpkg_cmake_configure(
         ${OPTIONS}
         -DBUILD_TESTING=OFF
         -DOPENEXR_INSTALL_EXAMPLES=OFF
-        -DDOCS=OFF
+        -DBUILD_DOCS=OFF
+        -DOPENEXR_INSTALL_PKG_CONFIG=ON
     OPTIONS_DEBUG
         -DOPENEXR_BUILD_TOOLS=OFF
         -DOPENEXR_INSTALL_TOOLS=OFF
@@ -27,6 +29,7 @@ vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/OpenEXR)
+
 vcpkg_fixup_pkgconfig()
 
 if(OPENEXR_INSTALL_TOOLS)
@@ -42,4 +45,4 @@ file(REMOVE_RECURSE
 )
 
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
diff --git a/external_imported/vcpkg/ports/openexr/vcpkg.json b/external_imported/vcpkg/ports/openexr/vcpkg.json
index f848f10af..f5536a0c4 100644
--- a/external_imported/vcpkg/ports/openexr/vcpkg.json
+++ b/external_imported/vcpkg/ports/openexr/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "openexr",
-  "version": "3.1.5",
+  "version": "3.1.8",
   "port-version": 1,
   "description": "OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial Light & Magic for use in computer imaging applications",
   "homepage": "https://www.openexr.com/",
diff --git a/external_imported/vcpkg/ports/openigtlink/vcpkg.json b/external_imported/vcpkg/ports/openigtlink/vcpkg.json
index a7cf96f2e..c517b0e6a 100644
--- a/external_imported/vcpkg/ports/openigtlink/vcpkg.json
+++ b/external_imported/vcpkg/ports/openigtlink/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "openigtlink",
-  "version-string": "3.0",
-  "port-version": 3,
+  "version": "3.0",
+  "port-version": 4,
   "description": "OpenIGTLink is an open-source network communication interface specifically designed for image-guided interventions.",
   "homepage": "https://github.com/openigtlink/OpenIGTLink",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/openimageio/fix-openexr-dll.patch b/external_imported/vcpkg/ports/openimageio/fix-openexr-dll.patch
index e686cf7af..d5b7d8c7d 100644
--- a/external_imported/vcpkg/ports/openimageio/fix-openexr-dll.patch
+++ b/external_imported/vcpkg/ports/openimageio/fix-openexr-dll.patch
@@ -1,8 +1,8 @@
 diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
-index dad053c..4d7e11c 100644
+index 0ca1fe6..1eeb5ab 100644
 --- a/src/cmake/externalpackages.cmake
 +++ b/src/cmake/externalpackages.cmake
-@@ -103,7 +103,7 @@ checked_find_package (OpenEXR REQUIRED
+@@ -105,7 +105,7 @@ checked_find_package (OpenEXR REQUIRED
  # building against Imath/OpenEXR 3.x when there is still a system-level
  # install version of 2.x.
  include_directories(BEFORE ${IMATH_INCLUDES} ${OPENEXR_INCLUDES})
@@ -10,4 +10,4 @@ index dad053c..4d7e11c 100644
 +if (WIN32 AND BUILD_SHARED_LIBS)
      add_definitions (-DOPENEXR_DLL) # Is this needed for new versions?
  endif ()
- if (OPENEXR_VERSION VERSION_GREATER_EQUAL 3.0)
+ if (OpenEXR_VERSION VERSION_GREATER_EQUAL 3.0)
diff --git a/external_imported/vcpkg/ports/openimageio/portfile.cmake b/external_imported/vcpkg/ports/openimageio/portfile.cmake
index cebea9096..ec4f38526 100644
--- a/external_imported/vcpkg/ports/openimageio/portfile.cmake
+++ b/external_imported/vcpkg/ports/openimageio/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO OpenImageIO/oiio
+    REPO AcademySoftwareFoundation/OpenImageIO
     REF "v${VERSION}"
-    SHA512 e7dd7aba8dc0baa9bc50f362c21119bf4008edbd03a0c9f31bb03e01b5b0cc18c39f8a368885a4d756f6b475965138409c7e91eeae90b0ebc18d253ff314f025
+    SHA512 6b87c805907a2f7c98f40e987fb6ebf769f8519f5d8a8b7393bed62a41cee1118bb32d2bc4d23fd464973e237077d08771ff85f72073caa57799d71bd098038f
     HEAD_REF master
     PATCHES
         fix-dependencies.patch
@@ -40,7 +40,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
         libheif     USE_LIBHEIF
         pybind11    USE_PYTHON
         tools       OIIO_BUILD_TOOLS
-        tools       USE_QT
+        viewer      ENABLE_IV
 )
 
 vcpkg_cmake_configure(
@@ -48,6 +48,7 @@ vcpkg_cmake_configure(
     OPTIONS
         ${FEATURE_OPTIONS}
         -DBUILD_TESTING=OFF
+        -DOIIO_BUILD_TESTS=OFF
         -DUSE_DCMTK=OFF
         -DUSE_NUKE=OFF
         -DUSE_OpenVDB=OFF
@@ -74,7 +75,14 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/OpenImageIO)
 
 if("tools" IN_LIST FEATURES)
     vcpkg_copy_tools(
-        TOOL_NAMES iconvert idiff igrep iinfo maketx oiiotool iv
+        TOOL_NAMES iconvert idiff igrep iinfo maketx oiiotool
+        AUTO_CLEAN
+    )
+endif()
+
+if("viewer" IN_LIST FEATURES)
+    vcpkg_copy_tools(
+        TOOL_NAMES iv
         AUTO_CLEAN
     )
 endif()
diff --git a/external_imported/vcpkg/ports/openimageio/vcpkg.json b/external_imported/vcpkg/ports/openimageio/vcpkg.json
index 2b21cb460..542742e24 100644
--- a/external_imported/vcpkg/ports/openimageio/vcpkg.json
+++ b/external_imported/vcpkg/ports/openimageio/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "openimageio",
-  "version": "2.4.9.0",
+  "version": "2.4.14.0",
+  "port-version": 3,
   "description": "A library for reading and writing images, and a bunch of related classes, utilities, and application.",
   "homepage": "https://github.com/OpenImageIO/oiio",
   "license": "BSD-3-Clause",
@@ -98,13 +99,23 @@
     "pybind11": {
       "description": "Enable Python bindings support for openimageio",
       "dependencies": [
-        "pybind11"
+        "pybind11",
+        "python3"
       ]
     },
     "tools": {
-      "description": "Build openimageio tools",
+      "description": "Build openimageio tools"
+    },
+    "viewer": {
+      "description": "Build openimageio viewer",
       "dependencies": [
         "opengl",
+        {
+          "name": "openimageio",
+          "features": [
+            "tools"
+          ]
+        },
         {
           "name": "qtbase",
           "default-features": false
diff --git a/external_imported/vcpkg/ports/openjpeg/vcpkg.json b/external_imported/vcpkg/ports/openjpeg/vcpkg.json
index be472aca9..a4abc2532 100644
--- a/external_imported/vcpkg/ports/openjpeg/vcpkg.json
+++ b/external_imported/vcpkg/ports/openjpeg/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "openjpeg",
   "version": "2.5.0",
+  "port-version": 1,
   "description": "OpenJPEG is an open-source JPEG 2000 codec written in C language. It has been developed in order to promote the use of JPEG 2000, a still-image compression standard from the Joint Photographic Experts Group (JPEG). Since April 2015, it is officially recognized by ISO/IEC and ITU-T as a JPEG 2000 Reference Software.",
   "homepage": "https://github.com/uclouvain/openjpeg",
   "license": "BSD-2-Clause",
@@ -19,7 +20,8 @@
       "description": "(deprecated)"
     },
     "jpip": {
-      "description": "Build optional component jpip"
+      "description": "Build optional component jpip",
+      "supports": "!uwp"
     },
     "jpwl": {
       "description": "(deprecated)"
diff --git a/external_imported/vcpkg/ports/openldap/portfile.cmake b/external_imported/vcpkg/ports/openldap/portfile.cmake
index dd617ce45..23656b5f7 100644
--- a/external_imported/vcpkg/ports/openldap/portfile.cmake
+++ b/external_imported/vcpkg/ports/openldap/portfile.cmake
@@ -12,8 +12,8 @@ if(NOT "${AUTOCONF_VERSION_STR}" STREQUAL "" AND "${AUTOCONF_VERSION_STR}" MATCH
     vcpkg_list(APPEND EXTRA_PATCHES m4.patch)
 endif()
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
     PATCHES
         openssl.patch
diff --git a/external_imported/vcpkg/ports/openldap/vcpkg.json b/external_imported/vcpkg/ports/openldap/vcpkg.json
index ef5173747..9f744e3b3 100644
--- a/external_imported/vcpkg/ports/openldap/vcpkg.json
+++ b/external_imported/vcpkg/ports/openldap/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "openldap",
   "version": "2.5.13",
+  "port-version": 1,
   "description": "OpenLDAP Software is an open source implementation of the Lightweight Directory Access Protocol.",
   "homepage": "https://www.openldap.org/software/",
   "license": "OLDAP-2.8",
diff --git a/external_imported/vcpkg/ports/openmama/fix-dependencies.diff b/external_imported/vcpkg/ports/openmama/fix-dependencies.diff
new file mode 100644
index 000000000..f731726c0
--- /dev/null
+++ b/external_imported/vcpkg/ports/openmama/fix-dependencies.diff
@@ -0,0 +1,26 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1332a55..2ed3770 100755
+@@ -123,7 +125,8 @@ find_package(Threads REQUIRED)
+ find_package(APR REQUIRED)
+ 
+ if (WITH_PROTON)
+-    find_package(Proton REQUIRED)
++    find_package(PROTON NAMES Proton REQUIRED)
++    set(PROTON_LIBRARIES Proton::qpid-proton)
+ endif()
+ 
+ if (WITH_UNITTEST)
+diff --git a/cmake/FindUUID.cmake b/cmake/FindUUID.cmake
+index 7a11c70..07f21ed 100644
+--- a/cmake/FindUUID.cmake
++++ b/cmake/FindUUID.cmake
+@@ -90,6 +90,9 @@ else (UUID_LIBRARIES AND UUID_INCLUDE_DIRS)
+ 
+   if (UUID_INCLUDE_DIRS AND UUID_LIBRARIES)
+      set(UUID_FOUND TRUE)
++  elseif(UUID_INCLUDE_DIRS AND APPLE)
++     set(UUID_LIBRARIES "")
++     set(UUID_FOUND TRUE)
+   endif (UUID_INCLUDE_DIRS AND UUID_LIBRARIES)
+ 
+   if (UUID_FOUND)
diff --git a/external_imported/vcpkg/ports/openmama/git-no-tags.diff b/external_imported/vcpkg/ports/openmama/git-no-tags.diff
new file mode 100644
index 000000000..5a28cfbe4
--- /dev/null
+++ b/external_imported/vcpkg/ports/openmama/git-no-tags.diff
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1332a55..2ed3770 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -23,6 +23,8 @@ if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
+             COMMAND "${GIT_BIN}" diff-index --quiet HEAD --
+             WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+             RESULT_VARIABLE is_current_source_dir_dirty)
++endif()
++if(OPENMAMA_VERSION_GIT)
+     # Strip out unwanted part of version from git
+     message(STATUS "OPENMAMA_VERSION_GIT: ${OPENMAMA_VERSION_GIT}")
+     STRING(REGEX REPLACE "^OpenMAMA-" "" OPENMAMA_VERSION ${OPENMAMA_VERSION_GIT})
diff --git a/external_imported/vcpkg/ports/openmama/portfile.cmake b/external_imported/vcpkg/ports/openmama/portfile.cmake
index 5e584f9ab..44c3b3a18 100644
--- a/external_imported/vcpkg/ports/openmama/portfile.cmake
+++ b/external_imported/vcpkg/ports/openmama/portfile.cmake
@@ -1,53 +1,37 @@
-vcpkg_find_acquire_program(FLEX)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO finos/OpenMAMA
-    REF c4925ee103add1a51c1d27be45b46d97af347f36 # https://github.com/finos/OpenMAMA/releases/tag/OpenMAMA-6.3.1-release
-    SHA512 e2773d082dd28e073fe81223fc113b1a5db7cd0d95e150e9f3f02c8c9483b9219b5d10682a125dd792c3a7877e15b90fd908084a4c89af4ec8d8c0389c282de2
+    REF "OpenMAMA-${VERSION}-release"
+    SHA512 bf6a9343546ace80b8a72072f97aa85988a3d0d047e2a60d05de638afce89b4e4f2bcae28b8e93ca808e8c0e4a83de9035ff785f69f9b4ac4ccd2616e792fa08
     HEAD_REF next
+    PATCHES
+        git-no-tags.diff
+        fix-dependencies.diff
 )
 
+vcpkg_find_acquire_program(FLEX)
+vcpkg_find_acquire_program(GIT)
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-        "-DPROTON_ROOT=${CURRENT_INSTALLED_DIR}"
-        "-DAPR_ROOT=${CURRENT_INSTALLED_DIR}"
+        "-DOPENMAMA_DEPENDENCY_ROOT=${CURRENT_INSTALLED_DIR}"
         -DINSTALL_RUNTIME_DEPENDENCIES=OFF
-        -DFLEX_EXECUTABLE=${FLEX}
+        "-DFLEX_EXECUTABLE=${FLEX}"
+        "-DGIT_BIN=${GIT}"
+        "-DOPENMAMA_VERSION=${VERSION}"
         -DWITH_EXAMPLES=OFF
         -DWITH_TESTTOOLS=OFF
 )
-
 vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/OpenMAMA)
 
-# Copy across license files and copyright
-file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-file(COPY "${SOURCE_PATH}/LICENSE-3RD-PARTY.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/")
-file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-
-# Clean up LICENSE file - vcpkg doesn't expect it to be there
-file(REMOVE "${CURRENT_PACKAGES_DIR}/LICENSE.MD" "${CURRENT_PACKAGES_DIR}/debug/LICENSE.MD")
-
-# Temporary workaround until upstream project puts dll in right place
-if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/libmamaplugindqstrategymd.dll")
-    file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libmamaplugindqstrategymd.dll" "${CURRENT_PACKAGES_DIR}/bin/libmamaplugindqstrategymd.dll")
-endif()
-if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/libmamaplugindqstrategymd.dll")
-    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libmamaplugindqstrategymd.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/libmamaplugindqstrategymd.dll")
-endif()
-
-# Vcpkg does not expect include files to be in the debug directory
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-
-foreach(OPENMAMA_ROOT_HEADER destroyhandle.h platform.h list.h lookup2.h property.h timers.h wlock.h windows)
-    if(EXISTS "${CURRENT_PACKAGES_DIR}/include/${OPENMAMA_ROOT_HEADER}")
-        file(RENAME "${CURRENT_PACKAGES_DIR}/include/${OPENMAMA_ROOT_HEADER}" "${CURRENT_PACKAGES_DIR}/include/wombat/${OPENMAMA_ROOT_HEADER}")
-    endif()
-endforeach()
-
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/mama/integration/transport.h" "list.h" "wombat/list.h")
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/mama/integration/types.h" "list.h" "wombat/list.h")
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/mama/integration/mama.h" "property.h" "wombat/property.h")
+file(REMOVE_RECURSE
+    "${CURRENT_PACKAGES_DIR}/LICENSE.md"
+    "${CURRENT_PACKAGES_DIR}/debug/LICENSE.md"
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/config"
+)
 
-vcpkg_copy_pdbs()
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
diff --git a/external_imported/vcpkg/ports/openmama/vcpkg.json b/external_imported/vcpkg/ports/openmama/vcpkg.json
index 6e1903043..0a5a20054 100644
--- a/external_imported/vcpkg/ports/openmama/vcpkg.json
+++ b/external_imported/vcpkg/ports/openmama/vcpkg.json
@@ -1,17 +1,30 @@
 {
   "name": "openmama",
-  "version-semver": "6.3.1",
-  "port-version": 2,
+  "version-semver": "6.3.2",
+  "port-version": 3,
   "description": "OpenMAMA is a high performance vendor neutral lightweight wrapper that provides a common API interface to different middleware and messaging solutions across a variety of platforms and languages",
   "homepage": "https://github.com/finos/OpenMAMA",
-  "supports": "windows & (x64 | x86)",
+  "license": "LGPL-2.1",
+  "supports": "!xbox",
   "dependencies": [
     "apr",
+    "apr-util",
     "libevent",
-    "qpid-proton",
+    {
+      "name": "libuuid",
+      "platform": "!windows & !osx"
+    },
+    {
+      "name": "qpid-proton",
+      "default-features": false
+    },
     {
       "name": "vcpkg-cmake",
       "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/openmesh/fix-library-install-path.patch b/external_imported/vcpkg/ports/openmesh/fix-library-install-path.patch
new file mode 100644
index 000000000..77430ea04
--- /dev/null
+++ b/external_imported/vcpkg/ports/openmesh/fix-library-install-path.patch
@@ -0,0 +1,89 @@
+diff --git a/cmake-library/VCI/VCICommon.cmake b/cmake-library/VCI/VCICommon.cmake
+index 7a5269c..e3f87ff 100644
+--- a/cmake-library/VCI/VCICommon.cmake
++++ b/cmake-library/VCI/VCICommon.cmake
+@@ -242,7 +242,8 @@
+     set (_and_static 0)
+   endif ()
+ 
+-  add_library (${_target} ${_type} ${ARGN} )
++  set(_and_static 0)
++  add_library (${_target} ${ARGN} )
+ 
+   # set common target properties defined in common.cmake
+   vci_set_target_props (${_target})
+index 7a5269c..e3f87ff 100644
+--- a/src/OpenMesh/Core/CMakeLists.txt
++++ b/src/OpenMesh/Core/CMakeLists.txt
+@@ -156,9 +156,9 @@
+                                           $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../..>
+                                           $<INSTALL_INTERFACE:include>)
+ 
+-  target_include_directories(OpenMeshCoreStatic PUBLIC
+-                                          $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../..>
+-                                          $<INSTALL_INTERFACE:include>)
++  #target_include_directories(OpenMeshCoreStatic PUBLIC
++  #                                        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../..>
++  #                                        $<INSTALL_INTERFACE:include>)
+ 
+   set_target_properties (OpenMeshCore PROPERTIES VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
+                                                SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} )
+@@ -180,7 +180,7 @@ endif()
+ 
+ # if we build debug and release in the same dir, we want to install both!
+ if ( ${CMAKE_PROJECT_NAME} MATCHES "OpenMesh")
+-  if ( WIN32 )
++  if ( 0 )
+     FILE(GLOB files_install_libs "${CMAKE_BINARY_DIR}/Build/lib/*.lib" )
+     FILE(GLOB files_install_dlls "${CMAKE_BINARY_DIR}/Build/*.dll" )
+     INSTALL(FILES ${files_install_libs} DESTINATION lib )
+@@ -240,7 +240,8 @@ target_include_directories(OpenMeshCore PUBLIC
+ endif ()
+ 
+ install(TARGETS OpenMeshCore EXPORT OpenMeshConfig
+-  ARCHIVE DESTINATION ${VCI_PROJECT_LIBDIR}
+-  LIBRARY DESTINATION ${VCI_PROJECT_LIBDIR}
+-  RUNTIME DESTINATION ${VCI_PROJECT_BINDIR})
++  ARCHIVE DESTINATION lib
++  LIBRARY DESTINATION lib
++  RUNTIME DESTINATION bin)
++  target_compile_features(OpenMeshCore PUBLIC cxx_std_11)
+ 
+diff --git a/src/OpenMesh/Tools/CMakeLists.txt b/src/OpenMesh/Tools/CMakeLists.txt
+index 0170e2b..e40dfa1 100644
+--- a/src/OpenMesh/Tools/CMakeLists.txt
++++ b/src/OpenMesh/Tools/CMakeLists.txt
+@@ -122,9 +122,9 @@
+                                           $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../..>
+                                           $<INSTALL_INTERFACE:include>)
+ 
+-  target_include_directories(OpenMeshToolsStatic PUBLIC
+-                                          $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../..>
+-                                          $<INSTALL_INTERFACE:include>)
++  #target_include_directories(OpenMeshToolsStatic PUBLIC
++  #                                        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../..>
++  #                                        $<INSTALL_INTERFACE:include>)
+ 
+   set_target_properties (OpenMeshTools PROPERTIES VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
+                                                 SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} )
+@@ -132,7 +132,7 @@
+ 
+ target_link_libraries (OpenMeshTools OpenMeshCore)
+ 
+-IF( NOT WIN32 )
++IF( 0 )
+   target_link_libraries (OpenMeshToolsStatic OpenMeshCoreStatic)
+ ENDIF(NOT WIN32)
+ 
+@@ -126,7 +126,8 @@ target_include_directories(OpenMeshTools PUBLIC
+ endif ()
+ 
+ install(TARGETS OpenMeshTools EXPORT OpenMeshConfig
+-  ARCHIVE DESTINATION ${VCI_PROJECT_LIBDIR}
+-  LIBRARY DESTINATION ${VCI_PROJECT_LIBDIR}
+-  RUNTIME DESTINATION ${VCI_PROJECT_BINDIR})
++  ARCHIVE DESTINATION lib
++  LIBRARY DESTINATION lib
++  RUNTIME DESTINATION bin
++)
+ 
diff --git a/external_imported/vcpkg/ports/openmesh/fix-pkgconfig.patch b/external_imported/vcpkg/ports/openmesh/fix-pkgconfig.patch
new file mode 100644
index 000000000..e2b4748e6
--- /dev/null
+++ b/external_imported/vcpkg/ports/openmesh/fix-pkgconfig.patch
@@ -0,0 +1,22 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7a5269c..e3f87ff 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -188,12 +188,15 @@
+ 
+ # Generate openmesh.pc file
+ 
++if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
++  set(_debug_postfix "${CMAKE_DEBUG_POSTFIX}")
++endif()
+ set(DEST_DIR "${CMAKE_INSTALL_PREFIX}")
+-set(PRIVATE_LIBS "-lOpenMeshCore -lOpenMeshTools")
++set(PRIVATE_LIBS "-lOpenMeshCore${_debug_postfix} -lOpenMeshTools${_debug_postfix}")
+ 
+ configure_file("openmesh.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/openmesh.pc" @ONLY)
+ 
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/openmesh.pc DESTINATION libdata/pkgconfig)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/openmesh.pc DESTINATION lib/pkgconfig)
+ 
+ # generate target file
+ 
diff --git a/external_imported/vcpkg/ports/openmesh/portfile.cmake b/external_imported/vcpkg/ports/openmesh/portfile.cmake
index 1b30fbe98..d5fca6adc 100644
--- a/external_imported/vcpkg/ports/openmesh/portfile.cmake
+++ b/external_imported/vcpkg/ports/openmesh/portfile.cmake
@@ -1,13 +1,21 @@
 # Note: upstream GitLab instance at https://graphics.rwth-aachen.de:9000 often goes down
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://www.openmesh.org/media/Releases/${VERSION}/OpenMesh-${VERSION}.tar.gz"
+    URLS "https://www.openmesh.org/media/Releases/${VERSION}/OpenMesh-${VERSION}.0.tar.gz"
     FILENAME "OpenMesh-${VERSION}.tar.gz"
-    SHA512 d4d1872204595c8ccdf1fd09b2e923b7fc5e71e95958cbee52aeca0c1a3de0e648e4fa4913aca14acee30a000ef54b5abd92a30db8cef310e87bfbfe26726afc
+    SHA512 b895e5eaabdf5d3671625df5314e1f95921ac672e9d9d945a5cf0973e20b4e395aac6517d86269a2e8c103f32bc9c8c2ecf57d811a260bbc69f592043e1307ba
 )
 
 vcpkg_extract_source_archive(
     SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
+    PATCHES
+        fix-library-install-path.patch
+        fix-pkgconfig.patch
+
+        # This patch is a combination of these two:
+        # https://gitlab.vci.rwth-aachen.de:9000/OpenMesh/OpenMesh/-/commit/1d4a866282ace376c8e3ba05c21ce3bcc6643040
+        # https://gitlab.vci.rwth-aachen.de:9000/OpenMesh/OpenMesh/-/commit/a7f30b6f70447932444f5b518840ca26e9461fa9
+        restore-c++11-compatibility.patch
 )
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
@@ -20,6 +28,8 @@ vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DBUILD_APPS=OFF
+        -DVCI_COMMON_DO_NOT_COPY_POST_BUILD=ON
+        -DVCI_NO_LIBRARY_INSTALL=ON
         -DOPENMESH_BUILD_SHARED=${OPENMESH_BUILD_SHARED}
 	MAYBE_UNUSED_VARIABLES
 		OPENMESH_BUILD_SHARED
@@ -28,33 +38,10 @@ vcpkg_cmake_configure(
 
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
-vcpkg_cmake_config_fixup(CONFIG_PATH share/OpenMesh/cmake)
-
-if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-  file(RENAME "${CURRENT_PACKAGES_DIR}/debug/libdata/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
-endif()
-if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-  file(RENAME "${CURRENT_PACKAGES_DIR}/libdata/pkgconfig" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig")
-endif()
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/libdata" "${CURRENT_PACKAGES_DIR}/libdata")
+vcpkg_cmake_config_fixup(PACKAGE_NAME OpenMesh CONFIG_PATH "share/OpenMesh/cmake")
 vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/OpenMesh/Tools/VDPM/xpm")
-# Only move dynamic libraries to bin on Windows
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-  if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin")
-    file(RENAME "${CURRENT_PACKAGES_DIR}/OpenMeshCore.dll" "${CURRENT_PACKAGES_DIR}/bin/OpenMeshCore.dll")
-    file(RENAME "${CURRENT_PACKAGES_DIR}/OpenMeshTools.dll" "${CURRENT_PACKAGES_DIR}/bin/OpenMeshTools.dll")
-  endif()
-  if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin")
-    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/OpenMeshCored.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/OpenMeshCored.dll")
-    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/OpenMeshToolsd.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/OpenMeshToolsd.dll")
-  endif()
-endif()
 
-configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/OpenMesh/vcpkg-cmake-wrapper.cmake" @ONLY)
-file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/openmesh/restore-c++11-compatibility.patch b/external_imported/vcpkg/ports/openmesh/restore-c++11-compatibility.patch
new file mode 100644
index 000000000..1122642e0
--- /dev/null
+++ b/external_imported/vcpkg/ports/openmesh/restore-c++11-compatibility.patch
@@ -0,0 +1,25 @@
+From 1d4a866282ace376c8e3ba05c21ce3bcc6643040 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20M=C3=B6bius?= <moebius@cs.rwth-aachen.de>
+Date: Tue, 9 Jan 2024 12:59:45 +0100
+Subject: [PATCH] Small patch to keep backward compatibility with c++11
+
+---
+ src/OpenMesh/Core/Utils/Property.hh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/OpenMesh/Core/Utils/Property.hh b/src/OpenMesh/Core/Utils/Property.hh
+index 485d3072..6ba66584 100644
+--- a/src/OpenMesh/Core/Utils/Property.hh
++++ b/src/OpenMesh/Core/Utils/Property.hh
+@@ -250,7 +250,7 @@ public: // inherited from BaseProperty
+   virtual void reserve(size_t _n) override { data_.reserve(_n);    }
+   virtual void resize(size_t _n) override  { data_.resize(_n);     }
+   virtual void clear() override  { data_.clear(); vector_type().swap(data_);    }
+-  virtual void push_back() override        { data_.emplace_back(); }
++  virtual void push_back() override        { data_.push_back(bool()); }
+   virtual void swap(size_t _i0, size_t _i1) override
+   { bool t(data_[_i0]); data_[_i0]=data_[_i1]; data_[_i1]=t; }
+   virtual void copy(size_t _i0, size_t _i1) override
+-- 
+GitLab
+
diff --git a/external_imported/vcpkg/ports/openmesh/usage b/external_imported/vcpkg/ports/openmesh/usage
deleted file mode 100644
index 1bfc821f5..000000000
--- a/external_imported/vcpkg/ports/openmesh/usage
+++ /dev/null
@@ -1,5 +0,0 @@
-The package openmesh provides CMake targets:
-
-    find_package(openmesh REQUIRED)
-    target_include_directories(main PRIVATE ${OPENMESH_INCLUDE_DIRS})
-    target_link_libraries(main PRIVATE ${OPENMESH_LIBRARIES})
diff --git a/external_imported/vcpkg/ports/openmesh/vcpkg-cmake-wrapper.cmake b/external_imported/vcpkg/ports/openmesh/vcpkg-cmake-wrapper.cmake
deleted file mode 100644
index ee59349e2..000000000
--- a/external_imported/vcpkg/ports/openmesh/vcpkg-cmake-wrapper.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-include(FindPackageHandleStandardArgs)
-include(SelectLibraryConfigurations)
-
-find_path(OPENMESHCORE_INCLUDE_DIR EigenVectorT.hh PATH_SUFFIXES OpenMesh/Core/Geometry)
-get_filename_component(OPENMESHCORE_INCLUDE_DIR ${OPENMESHCORE_INCLUDE_DIR} DIRECTORY)
-get_filename_component(OPENMESHCORE_INCLUDE_DIR ${OPENMESHCORE_INCLUDE_DIR} DIRECTORY)
-get_filename_component(OPENMESHCORE_INCLUDE_DIR ${OPENMESHCORE_INCLUDE_DIR} DIRECTORY)
-
-find_library(OPENMESHCORE_LIBRARY_DEBUG NAMES OpenMeshCored libOpenMeshCored NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH REQUIRED)
-find_library(OPENMESHCORE_LIBRARY_RELEASE NAMES OpenMeshCore libOpenMeshCore NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH REQUIRED)
-find_library(OPENMESHTOOLS_LIBRARY_DEBUG NAMES OpenMeshToolsd libOpenMeshToolsd NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH REQUIRED)
-find_library(OPENMESHTOOLS_LIBRARY_RELEASE NAMES OpenMeshTools libOpenMeshTools NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH REQUIRED)
-
-select_library_configurations(OPENMESHCORE)
-select_library_configurations(OPENMESHTOOLS)
-
-set(OPENMESH_INCLUDE_DIRS ${OPENMESHCORE_INCLUDE_DIR})
-set(OPENMESH_LIBRARIES ${OPENMESHCORE_LIBRARY} ${OPENMESHTOOLS_LIBRARY})
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/openmesh/vcpkg.json b/external_imported/vcpkg/ports/openmesh/vcpkg.json
index 4307e65a7..72e55cee9 100644
--- a/external_imported/vcpkg/ports/openmesh/vcpkg.json
+++ b/external_imported/vcpkg/ports/openmesh/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "openmesh",
-  "version": "9.0",
-  "port-version": 1,
+  "version": "10.0",
   "description": "A generic and efficient polygon mesh data structure",
   "homepage": "https://www.graphics.rwth-aachen.de/media/openmesh_static/Daily-Builds/Doc/index.html",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/openmpi/portfile.cmake b/external_imported/vcpkg/ports/openmpi/portfile.cmake
index 4ff603ec4..0bfdca4a8 100644
--- a/external_imported/vcpkg/ports/openmpi/portfile.cmake
+++ b/external_imported/vcpkg/ports/openmpi/portfile.cmake
@@ -1,16 +1,16 @@
 vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 
-set(OpenMPI_FULL_VERSION "4.1.3")
+set(OpenMPI_FULL_VERSION "4.1.6")
 set(OpenMPI_SHORT_VERSION "4.1")
 
 vcpkg_download_distfile(ARCHIVE
   URLS "https://download.open-mpi.org/release/open-mpi/v${OpenMPI_SHORT_VERSION}/openmpi-${OpenMPI_FULL_VERSION}.tar.gz"
   FILENAME "openmpi-${OpenMPI_FULL_VERSION}.tar.gz"
-  SHA512 f7b177121863ef79df6106639d18a89c028442b1314340638273b12025c4dc2cf9b5316cb7e6ecca8b65a51ee40a306a6b0970d7cce727fbb269a14f89af3161
+  SHA512 6fb38cafa75021f12a9674a05056d25cc9bb5e6dd88f26fee73a89736fb741bbfb37efee31e07edb372f21583144ccc2c03cd7861e9055e87699a22740173e0b
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE ${ARCHIVE}
     PATCHES
         keep_isystem.patch
@@ -26,6 +26,7 @@ vcpkg_configure_make(
         OPTIONS
             --with-hwloc=internal
             --with-libevent=internal
+            --with-pmix=internal
             --disable-mpi-fortran
         OPTIONS_DEBUG
             --enable-debug
diff --git a/external_imported/vcpkg/ports/openmpi/vcpkg.json b/external_imported/vcpkg/ports/openmpi/vcpkg.json
index e123cf9b1..e76173b15 100644
--- a/external_imported/vcpkg/ports/openmpi/vcpkg.json
+++ b/external_imported/vcpkg/ports/openmpi/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "openmpi",
-  "version": "4.1.3",
+  "version": "4.1.6",
   "port-version": 1,
   "description": "The Open MPI Project is an open source Message Passing Interface implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers.",
   "homepage": "https://www.open-mpi.org/",
diff --git a/external_imported/vcpkg/ports/openmvg/build_fixes.patch b/external_imported/vcpkg/ports/openmvg/build_fixes.patch
index 229384314..9bc868472 100644
--- a/external_imported/vcpkg/ports/openmvg/build_fixes.patch
+++ b/external_imported/vcpkg/ports/openmvg/build_fixes.patch
@@ -639,3 +639,18 @@ index 8a69c2344..1ed9a21fe 100644
          FIND_LIBRARY(OSICLP_LIBRARY NAMES OsiClp)
  
          # locate Clp libraries
+
+diff --git a/src/openMVG/matching/metric_simd.hpp b/src/openMVG/matching/metric_simd.hpp
+index 7e09f6ed..916c84e0 100644
+--- a/src/openMVG/matching/metric_simd.hpp
++++ b/src/openMVG/matching/metric_simd.hpp
+@@ -17,7 +17,9 @@
+ #include <numeric>
+
+ #include <cstdint>
++#if defined(__amd64__) || defined(__i386__)
+ #include <immintrin.h>
++#endif
+
+ namespace openMVG {
+ namespace matching {
diff --git a/external_imported/vcpkg/ports/openmvg/vcpkg.json b/external_imported/vcpkg/ports/openmvg/vcpkg.json
index d2a74ae99..4a22b21f2 100644
--- a/external_imported/vcpkg/ports/openmvg/vcpkg.json
+++ b/external_imported/vcpkg/ports/openmvg/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "openmvg",
   "version": "2.0",
-  "port-version": 6,
+  "port-version": 9,
   "description": "open Multiple View Geometry library. Basis for 3D computer vision and Structure from Motion.",
   "license": "MPL-2.0-no-copyleft-exception",
-  "supports": "!(osx & arm64)",
+  "supports": "(x86 | x64 | arm64) & !xbox",
   "dependencies": [
     "cereal",
     {
diff --git a/external_imported/vcpkg/ports/openmvs/portfile.cmake b/external_imported/vcpkg/ports/openmvs/portfile.cmake
index 5f7f39ce2..aacf18053 100644
--- a/external_imported/vcpkg/ports/openmvs/portfile.cmake
+++ b/external_imported/vcpkg/ports/openmvs/portfile.cmake
@@ -23,6 +23,12 @@ file(REMOVE "${SOURCE_PATH}/build/Modules/FindCERES.cmake")
 file(REMOVE "${SOURCE_PATH}/build/Modules/FindCGAL.cmake")
 file(REMOVE "${SOURCE_PATH}/build/Modules/FindEIGEN.cmake")
 
+if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
+    set(USE_SSE ON)
+else()
+    set(USE_SSE OFF)
+endif()
+
 vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS ${FEATURE_OPTIONS}
@@ -33,6 +39,7 @@ vcpkg_cmake_configure(
         -DOpenMVS_USE_OPENGL=ON
         -DOpenMVS_USE_BREAKPAD=OFF
         -DOpenMVS_ENABLE_TESTS=OFF
+        -DOpenMVS_USE_SSE=${USE_SSE}
     OPTIONS_RELEASE
         -DOpenMVS_BUILD_TOOLS=ON
     OPTIONS_DEBUG
diff --git a/external_imported/vcpkg/ports/openmvs/vcpkg.json b/external_imported/vcpkg/ports/openmvs/vcpkg.json
index 96022f424..2ea8a37cb 100644
--- a/external_imported/vcpkg/ports/openmvs/vcpkg.json
+++ b/external_imported/vcpkg/ports/openmvs/vcpkg.json
@@ -1,9 +1,11 @@
 {
   "name": "openmvs",
   "version": "2.1.0",
+  "port-version": 2,
   "description": "OpenMVS: open Multi-View Stereo reconstruction library",
   "homepage": "https://cdcseacave.github.io/openMVS",
   "license": "AGPL-3.0-only",
+  "supports": "!xbox",
   "dependencies": [
     "boost-iostreams",
     "boost-program-options",
diff --git a/external_imported/vcpkg/ports/openni2/portfile.cmake b/external_imported/vcpkg/ports/openni2/portfile.cmake
index e06d555e8..ce6124f98 100644
--- a/external_imported/vcpkg/ports/openni2/portfile.cmake
+++ b/external_imported/vcpkg/ports/openni2/portfile.cmake
@@ -17,13 +17,21 @@ vcpkg_from_github(
             replace_environment_variable.patch
 )
 
-file(TO_NATIVE_PATH ${CURRENT_INSTALLED_DIR} NATIVE_INSTALLED_DIR)
+file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" NATIVE_INSTALLED_DIR)
 configure_file("${SOURCE_PATH}/Source/Drivers/Kinect/Kinect.vcxproj" "${SOURCE_PATH}/Source/Drivers/Kinect/Kinect.vcxproj" @ONLY)
 
+if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
+    set(additional_options PLATFORM "x86")
+endif()
+
 # Build OpenNI2
-vcpkg_build_msbuild(
-    PROJECT_PATH "${SOURCE_PATH}/OpenNI.sln"
+vcpkg_msbuild_install(
+    SOURCE_PATH "${SOURCE_PATH}"
+    PROJECT_SUBPATH OpenNI.sln
     OPTIONS "/p:DotNetSdkRoot=${NETFXSDK_PATH}/"
+    NO_TOOLCHAIN_PROPS # Port uses /clr which conflicts with /EHs(a) from the toolchain
+    NO_INSTALL # Port seems to have its own layout regarding bin/lib
+    ${additional_options}
 )
 
 # Install OpenNI2
@@ -34,8 +42,8 @@ elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
 endif()
 
 set(SOURCE_INCLUDE_PATH "${SOURCE_PATH}/Include")
-set(SOURCE_BIN_PATH_RELEASE "${SOURCE_PATH}/Bin/${PLATFORM}-Release")
-set(SOURCE_BIN_PATH_DEBUG "${SOURCE_PATH}/Bin/${PLATFORM}-Debug")
+set(SOURCE_BIN_PATH_RELEASE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Bin/${PLATFORM}-Release")
+set(SOURCE_BIN_PATH_DEBUG "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Bin/${PLATFORM}-Debug")
 set(SOURCE_CONFIG_PATH "${SOURCE_PATH}/Config")
 set(SOURCE_THIRDPARTY_PATH "${SOURCE_PATH}/ThirdParty")
 
diff --git a/external_imported/vcpkg/ports/openni2/vcpkg.json b/external_imported/vcpkg/ports/openni2/vcpkg.json
index c0aa59876..933540a52 100644
--- a/external_imported/vcpkg/ports/openni2/vcpkg.json
+++ b/external_imported/vcpkg/ports/openni2/vcpkg.json
@@ -1,12 +1,17 @@
 {
   "name": "openni2",
   "version": "2.2.0.33",
-  "port-version": 14,
+  "port-version": 15,
   "description": "OpenNI is open source library for access to Natural Interaction (NI) devices such as RGB-D camera.",
   "homepage": "https://github.com/OpenNI/OpenNI2",
   "license": "Apache-2.0",
   "supports": "!uwp & !staticcrt",
   "dependencies": [
-    "kinectsdk1"
+    "kinectsdk1",
+    {
+      "name": "vcpkg-msbuild",
+      "host": true,
+      "platform": "windows"
+    }
   ]
 }
diff --git a/external_imported/vcpkg/ports/openscap/fix-build.patch b/external_imported/vcpkg/ports/openscap/fix-build.patch
index e40932ecb..cf6b2703e 100644
--- a/external_imported/vcpkg/ports/openscap/fix-build.patch
+++ b/external_imported/vcpkg/ports/openscap/fix-build.patch
@@ -1,28 +1,21 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4de5b57..5f483a3 100644
+index 72d9aec..8938931 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -140,15 +140,25 @@ find_package(SWIG)
- find_package(LibXml2 REQUIRED)
- find_package(LibXslt REQUIRED)
- find_package(BZip2)
-+find_package(OpenSSL REQUIRED)
-+find_package(ZLIB REQUIRED)
- 
- # PThread
+@@ -164,12 +164,19 @@ if (WIN32 AND NOT MINGW)
+ else()
+ 	find_package(Threads REQUIRED)
+ endif()
 -set(CMAKE_THREAD_PREFER_PTHREAD)
 -set(THREADS_PREFER_PTHREAD_FLAG)
--set(THREADS_USE_PTHREADS_WIN32 true)
--find_package(Threads REQUIRED)
+-set(THREADS_USE_PTHREADS_WIN32 TRUE)
 -check_library_exists(pthread pthread_timedjoin_np "" HAVE_PTHREAD_TIMEDJOIN_NP)
 -check_library_exists(pthread pthread_setname_np "" HAVE_PTHREAD_SETNAME_NP)
 -check_library_exists(pthread pthread_getname_np "" HAVE_PTHREAD_GETNAME_NP)
 +if (WIN32)
 +    set(CMAKE_THREAD_PREFER_PTHREAD)
 +    set(THREADS_PREFER_PTHREAD_FLAG)
-+    set(THREADS_USE_PTHREADS_WIN32 true)
-+    find_package(pthread CONFIG REQUIRED)
-+    set(CMAKE_THREAD_LIBS_INIT ${PThreads4W_LIBRARY})
++    set(THREADS_USE_PTHREADS_WIN32 TRUE)
 +    check_library_exists(pthread pthread_timedjoin_np "" HAVE_PTHREAD_TIMEDJOIN_NP)
 +    check_library_exists(pthread pthread_setname_np "" HAVE_PTHREAD_SETNAME_NP)
 +    check_library_exists(pthread pthread_getname_np "" HAVE_PTHREAD_GETNAME_NP)
@@ -35,7 +28,7 @@ index 4de5b57..5f483a3 100644
  
  # WITH_CRYPTO
  set(WITH_CRYPTO "gcrypt" CACHE STRING "gcrypt|nss3")
-@@ -373,19 +383,9 @@ message(STATUS "asciidoc: ${ASCIIDOC_EXECUTABLE}")
+@@ -475,19 +482,9 @@ message(STATUS "asciidoc: ${ASCIIDOC_EXECUTABLE}")
  
  # ---------- PATHS
  
@@ -57,30 +50,26 @@ index 4de5b57..5f483a3 100644
 +set(OSCAP_DEFAULT_CPE_PATH share/openscap/cpe)
  set(OSCAP_TEMP_DIR "/tmp" CACHE STRING "use different temporary directory to execute sce scripts (default=/tmp)")
  
- # ---------- RPATHS for linking
+ 
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index e9339c6..9347087 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -134,4 +134,8 @@ else()
+ 	set(OPENSCAP_INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ endif()
+ 
+-install(TARGETS openscap DESTINATION ${OPENSCAP_INSTALL_DESTINATION})
++install(TARGETS openscap
++  RUNTIME DESTINATION bin
++  LIBRARY DESTINATION lib
++  ARCHIVE DESTINATION lib
++)
 diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
-index 2a3f373..781d05a 100644
+index 93ce1f2..f500e1d 100644
 --- a/utils/CMakeLists.txt
 +++ b/utils/CMakeLists.txt
-@@ -6,27 +6,32 @@ if(ENABLE_OSCAP_UTIL)
- 	add_executable(oscap ${UTILS_SOURCES})
- 	target_link_libraries(oscap openscap)
- 	if(WIN32)
--		set(OSCAP_UTIL_DESTINATION ".")
-+        find_path(GETOPT_INCLUDE_DIR getopt.h)
-+        include(SelectLibraryConfigurations)
-+        find_library(GETOPT_LIBRARY_RELEASE NAMES getopt)
-+        find_library(GETOPT_LIBRARY_DEBUG NAMES getopt PATH_SUFFIXES debug/lib)
-+        select_library_configurations(GETOPT)
-+        
-+        message("GETOPT_INCLUDE_DIR: ${GETOPT_INCLUDE_DIR}")
-+        message("GETOPT_LIBRARY: ${GETOPT_LIBRARY}")
-+        
-+        target_include_directories(oscap PRIVATE ${GETOPT_INCLUDE_DIR})
-+        target_link_libraries(oscap PRIVATE ${GETOPT_LIBRARY})
-+        
-+		set(OSCAP_UTIL_DESTINATION tools)
- 		# Install the 'oscap' utility
+@@ -29,22 +29,15 @@ if(ENABLE_OSCAP_UTIL)
  		install(TARGETS "oscap"
  			DESTINATION ${OSCAP_UTIL_DESTINATION}
  		)
@@ -103,19 +92,5 @@ index 2a3f373..781d05a 100644
 -			DESTINATION "${CMAKE_INSTALL_MANDIR}/man8"
 +			DESTINATION share/openscap/man8
  		)
- 	endif()
- endif()
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 9e18613..e84a21f 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -125,4 +125,8 @@ else()
- 	set(OPENSCAP_INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR})
- endif()
  
--install(TARGETS openscap DESTINATION ${OPENSCAP_INSTALL_DESTINATION})
-+install(TARGETS openscap
-+  RUNTIME DESTINATION bin
-+  LIBRARY DESTINATION lib
-+  ARCHIVE DESTINATION lib
-+)
+ 		add_custom_target(oscap-chrootable-nocap
diff --git a/external_imported/vcpkg/ports/openscap/fix-buildflag-and-install.patch b/external_imported/vcpkg/ports/openscap/fix-buildflag-and-install.patch
new file mode 100644
index 000000000..c0f6971ca
--- /dev/null
+++ b/external_imported/vcpkg/ports/openscap/fix-buildflag-and-install.patch
@@ -0,0 +1,26 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8938931..d111896 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -148,9 +148,7 @@ if (APPLE)
+ endif()
+ find_package(OpenSSL REQUIRED)
+ add_definitions(${XMLSEC_DEFINITIONS})
+-if (WIN32)
+ 	add_compile_definitions("XMLSEC_CRYPTO_OPENSSL")
+-endif()
+ find_package(BZip2)
+ 
+ # PThread
+@@ -610,11 +608,6 @@ if(NOT WIN32)
+ 	if(WITH_SYSTEMD)
+ 		if(ENABLE_OSCAP_REMEDIATE_SERVICE)
+ 			# systemd service for offline (boot-time) remediation
+-			configure_file("oscap-remediate.service.in" "oscap-remediate.service" @ONLY)
+-			install(FILES
+-				${CMAKE_CURRENT_BINARY_DIR}/oscap-remediate.service
+-				DESTINATION ${SYSTEMD_UNITDIR}
+-			)
+ 		endif()
+ 	endif()
+ endif()
diff --git a/external_imported/vcpkg/ports/openscap/fix-utils.patch b/external_imported/vcpkg/ports/openscap/fix-utils.patch
new file mode 100644
index 000000000..7fad24619
--- /dev/null
+++ b/external_imported/vcpkg/ports/openscap/fix-utils.patch
@@ -0,0 +1,36 @@
+diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
+index f500e1d..ebddcbf 100644
+--- a/utils/CMakeLists.txt
++++ b/utils/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ install(PROGRAMS "oscap-run-sce-script"
+-	DESTINATION ${CMAKE_INSTALL_BINDIR}
++	DESTINATION tools/openscap
+ )
+ 
+ if(ENABLE_OSCAP_UTIL)
+@@ -24,13 +24,13 @@ if(ENABLE_OSCAP_UTIL)
+ 			target_link_libraries(oscap ${GETOPT_LIBRARY})
+ 		endif()
+ 		
+-		set(OSCAP_UTIL_DESTINATION ".")
++		set(OSCAP_UTIL_DESTINATION bin)
+ 		# Install the 'oscap' utility
+ 		install(TARGETS "oscap"
+ 			DESTINATION ${OSCAP_UTIL_DESTINATION}
+ 		)
+ 	else()
+-		set(OSCAP_UTIL_DESTINATION tools)
++		set(OSCAP_UTIL_DESTINATION bin)
+ 		# Install the 'oscap' utility
+ 		install(TARGETS "oscap"
+ 			DESTINATION ${OSCAP_UTIL_DESTINATION}
+@@ -110,7 +110,7 @@ if(ENABLE_OSCAP_UTIL_SSH)
+ endif()
+ if(ENABLE_OSCAP_UTIL_AUTOTAILOR)
+ 	install(PROGRAMS "autotailor"
+-		DESTINATION ${CMAKE_INSTALL_BINDIR}
++		DESTINATION tools/openscap
+ 	)
+ 	install(FILES "autotailor.8"
+ 		DESTINATION "${CMAKE_INSTALL_MANDIR}/man8"
diff --git a/external_imported/vcpkg/ports/openscap/portfile.cmake b/external_imported/vcpkg/ports/openscap/portfile.cmake
index 243e30d41..f8d06346c 100644
--- a/external_imported/vcpkg/ports/openscap/portfile.cmake
+++ b/external_imported/vcpkg/ports/openscap/portfile.cmake
@@ -1,11 +1,13 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO OpenSCAP/openscap
-    REF 3a4c635691380fa990a226acc8558db35d7ebabc #1.3.1
-    SHA512 12681d43b2ce067c5a5c4eb47e14d91d6e9362b1f98f1d35b05d79ad84c7ee8c29f438eaae8e8465033155e500bb0f936eb79af46fab15e4a07e03c6be8b655d
+    REF ${VERSION}
+    SHA512 88d095f350cb1b27f30222c809835ad9f182589a4410ea66f6389d9140804a45767b70176bcd52a0ad6b248ccf63153f09e44f93e70b3002d45cc445642a458f 
     HEAD_REF dev
     PATCHES
         fix-build.patch
+        fix-buildflag-and-install.patch
+        fix-utils.patch
 )
 file(REMOVE "${SOURCE_PATH}/cmake/FindThreads.cmake")
 
@@ -15,8 +17,6 @@ endif()
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
-        docs    ENABLE_DOCS
-        tests   ENABLE_TESTS
         util    ENABLE_OSCAP_UTIL
         python  ENABLE_PYTHON3
 )
@@ -35,9 +35,14 @@ vcpkg_cmake_configure(
         -DENABLE_OSCAP_UTIL_PODMAN=OFF
         -DENABLE_OSCAP_UTIL_CHROOT=OFF
         -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=ON
+        -DENABLE_TESTS=OFF
+        -DENABLE_DOCS=OFF
 )
 
 vcpkg_cmake_install()
+if(ENABLE_OSCAP_UTIL)
+    vcpkg_copy_tools(TOOL_NAMES oscap AUTO_CLEAN)
+endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
 
@@ -45,4 +50,4 @@ vcpkg_copy_pdbs()
 vcpkg_fixup_pkgconfig()
 
 #Handle copyright
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
\ No newline at end of file
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/openscap/vcpkg.json b/external_imported/vcpkg/ports/openscap/vcpkg.json
index 2468acc18..47212b839 100644
--- a/external_imported/vcpkg/ports/openscap/vcpkg.json
+++ b/external_imported/vcpkg/ports/openscap/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "openscap",
-  "version": "1.3.1",
-  "port-version": 4,
+  "version": "1.3.7",
+  "port-version": 2,
   "description": "The oscap program is a command line tool that allows users to load, scan, validate, edit, and export SCAP documents.",
   "homepage": "https://github.com/OpenSCAP/openscap",
   "license": "LGPL-2.1-or-later",
+  "supports": "!xbox",
   "dependencies": [
     "curl",
     "glib",
@@ -19,18 +20,13 @@
       "name": "vcpkg-cmake",
       "host": true
     },
+    "xmlsec",
     "zlib"
   ],
   "features": {
-    "docs": {
-      "description": "install docs"
-    },
     "python": {
       "description": "build with python3"
     },
-    "tests": {
-      "description": "build with tests"
-    },
     "util": {
       "description": "build available utils",
       "dependencies": [
diff --git a/external_imported/vcpkg/ports/openslide/fix-win-build.patch b/external_imported/vcpkg/ports/openslide/fix-win-build.patch
index 3430ddba8..f5938691c 100644
--- a/external_imported/vcpkg/ports/openslide/fix-win-build.patch
+++ b/external_imported/vcpkg/ports/openslide/fix-win-build.patch
@@ -1,5 +1,5 @@
 diff --git a/src/openslide-decode-tifflike.c b/src/openslide-decode-tifflike.c
-index 63e0ad5f2..8de1abb38 100644
+index 63e0ad5..8de1abb 100644
 --- a/src/openslide-decode-tifflike.c
 +++ b/src/openslide-decode-tifflike.c
 @@ -348,7 +348,7 @@ static bool populate_item(struct _openslide_tifflike *tl,
@@ -21,7 +21,7 @@ index 63e0ad5f2..8de1abb38 100644
                    "Value count too large");
        goto FAIL;
 diff --git a/src/openslide-features.h b/src/openslide-features.h
-index a5328fbf4..db7593d6f 100644
+index a5328fb..db7593d 100644
 --- a/src/openslide-features.h
 +++ b/src/openslide-features.h
 @@ -22,26 +22,7 @@
@@ -53,7 +53,7 @@ index a5328fbf4..db7593d6f 100644
  // for exporting from shared libraries or DLLs
  #if defined _WIN32
 diff --git a/src/openslide-private.h b/src/openslide-private.h
-index a70bcba4a..e39f288ed 100644
+index a70bcba..e39f288 100644
 --- a/src/openslide-private.h
 +++ b/src/openslide-private.h
 @@ -34,6 +34,11 @@
@@ -80,13 +80,14 @@ index a70bcba4a..e39f288ed 100644
  #define g_ascii_strtod _OPENSLIDE_POISON(_openslide_parse_double_)
  #define sqlite3_open _OPENSLIDE_POISON(_openslide_sqlite_open)
 diff --git a/test/test-common.c b/test/test-common.c
-index 8003128c9..3f369435b 100644
+index 8003128..b7c4bd4 100644
 --- a/test/test-common.c
 +++ b/test/test-common.c
-@@ -22,11 +22,12 @@
+@@ -22,11 +22,13 @@
  #ifdef WIN32
  #define _WIN32_WINNT 0x0600
  #include <windows.h>
++#include <io.h>
 +#else
 +#include <unistd.h>
  #endif
@@ -98,7 +99,7 @@ index 8003128c9..3f369435b 100644
  #include <glib.h>
  
 diff --git a/test/test.c b/test/test.c
-index 50f0651d3..7fb192a57 100644
+index 50f0651..7fb192a 100644
 --- a/test/test.c
 +++ b/test/test.c
 @@ -32,7 +32,7 @@
@@ -111,7 +112,7 @@ index 50f0651d3..7fb192a57 100644
  #include <glib.h>
  #include <cairo.h>
 diff --git a/test/try_open.c b/test/try_open.c
-index dd3a6a2f6..ad9233eb1 100644
+index dd3a6a2..ad9233e 100644
 --- a/test/try_open.c
 +++ b/test/try_open.c
 @@ -24,7 +24,7 @@
diff --git a/external_imported/vcpkg/ports/openslide/portfile.cmake b/external_imported/vcpkg/ports/openslide/portfile.cmake
index 6e6a26012..0ed9acd8e 100644
--- a/external_imported/vcpkg/ports/openslide/portfile.cmake
+++ b/external_imported/vcpkg/ports/openslide/portfile.cmake
@@ -7,7 +7,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO openslide/openslide
     REF "v${VERSION}" 
-    SHA512 1b6bc4722fd6901d7c929ec332177d4892ea15700133c1a1339c6bdcace174064b5e063d3bcb2044e2ca56801c044f7b3d1c774c0b29f9005361a8336e297e4b
+    SHA512 5b0315215f9cada56c85e0068c9493a66c70bae1230cc01dd00ce364414f53bf285728dc860d7de0ac30a10bdc3c1a76f728446b96ca337a62d588f5cc2a971c
     HEAD_REF master
     PATCHES remove-w-flags.patch
             ${PATCHES}
diff --git a/external_imported/vcpkg/ports/openslide/vcpkg.json b/external_imported/vcpkg/ports/openslide/vcpkg.json
index 7f971be05..dcaec5bb6 100644
--- a/external_imported/vcpkg/ports/openslide/vcpkg.json
+++ b/external_imported/vcpkg/ports/openslide/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "openslide",
   "version": "3.4.1",
+  "port-version": 3,
   "description": "OpenSlide is a C library for reading whole slide image files (also known as virtual slides). It provides a consistent and simple API for reading files from multiple vendors.",
   "homepage": "https://openslide.org/",
   "license": "LGPL-2.1-or-later",
-  "supports": "native & !(windows & static) & !osx",
+  "supports": "native & !(windows & static) & !xbox & !osx",
   "dependencies": [
     "cairo",
     "gdk-pixbuf",
diff --git a/external_imported/vcpkg/ports/openssl/disable-apps.patch b/external_imported/vcpkg/ports/openssl/disable-apps.patch
deleted file mode 100644
index 8dac3d683..000000000
--- a/external_imported/vcpkg/ports/openssl/disable-apps.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/Configure b/Configure
-index 5ac4b52..ad638e8 100755
---- a/Configure
-+++ b/Configure
-@@ -401,6 +401,7 @@ my @dtls = qw(dtls1 dtls1_2);
- my @disablables = (
-     "acvp-tests",
-     "afalgeng",
-+    "apps",
-     "aria",
-     "asan",
-     "asm",
diff --git a/external_imported/vcpkg/ports/openssl/disable-install-docs.patch b/external_imported/vcpkg/ports/openssl/disable-install-docs.patch
deleted file mode 100644
index 6e39790ce..000000000
--- a/external_imported/vcpkg/ports/openssl/disable-install-docs.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
-index 110ba06..5b6b1c7 100644
---- a/Configurations/unix-Makefile.tmpl
-+++ b/Configurations/unix-Makefile.tmpl
-@@ -611,7 +611,7 @@ install_sw: install_dev install_engines install_modules install_runtime
- 
- uninstall_sw: uninstall_runtime uninstall_modules uninstall_engines uninstall_dev
- 
--install_docs: install_man_docs install_html_docs
-+install_docs:
- 
- uninstall_docs: uninstall_man_docs uninstall_html_docs
- 	$(RM) -r $(DESTDIR)$(DOCDIR)
-diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
-index d054431..b5c1c88 100644
---- a/Configurations/windows-makefile.tmpl
-+++ b/Configurations/windows-makefile.tmpl
-@@ -487,7 +487,7 @@ install_sw: install_dev install_engines install_modules install_runtime
- 
- uninstall_sw: uninstall_runtime uninstall_modules uninstall_engines uninstall_dev
- 
--install_docs: install_html_docs
-+install_docs:
- 
- uninstall_docs: uninstall_html_docs
- 
diff --git a/external_imported/vcpkg/ports/openssl/portfile.cmake b/external_imported/vcpkg/ports/openssl/portfile.cmake
index 05559d42f..61b046c6d 100644
--- a/external_imported/vcpkg/ports/openssl/portfile.cmake
+++ b/external_imported/vcpkg/ports/openssl/portfile.cmake
@@ -19,10 +19,8 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO openssl/openssl
     REF "openssl-${VERSION}"
-    SHA512 877b4bc4b59126bdaf626b01322c8ac5325945234acd14907e4a23019f1fd38ec17b5fae9ff60aa9b6b0089c29b0e4255a19cd2a1743c3db82a616286c60d3b9
+    SHA512 3eed5903f37ac728522cbb0ea0081f1d5a62d9420366d487f838dc22c31813c58584838400bd3d09518608e1e71bafcb1ff83713d351e4876da6625d5543fef6
     PATCHES
-        disable-apps.patch
-        disable-install-docs.patch
         script-prefix.patch
         windows/install-layout.patch
         windows/install-pdbs.patch
@@ -35,11 +33,16 @@ vcpkg_from_github(
 vcpkg_list(SET CONFIGURE_OPTIONS
     enable-static-engine
     enable-capieng
-    no-ssl3
-    no-weak-ssl-ciphers
     no-tests
+    no-docs
 )
 
+set(INSTALL_FIPS "")
+if("fips" IN_LIST FEATURES)
+    vcpkg_list(APPEND INSTALL_FIPS install_fips)
+    vcpkg_list(APPEND CONFIGURE_OPTIONS enable-fips)
+endif()
+
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
     vcpkg_list(APPEND CONFIGURE_OPTIONS shared)
 else()
@@ -50,6 +53,15 @@ if(NOT "tools" IN_LIST FEATURES)
     vcpkg_list(APPEND CONFIGURE_OPTIONS no-apps)
 endif()
 
+if("weak-ssl-ciphers" IN_LIST FEATURES)
+    vcpkg_list(APPEND CONFIGURE_OPTIONS enable-weak-ssl-ciphers)
+endif()
+
+if("ssl3" IN_LIST FEATURES)
+    vcpkg_list(APPEND CONFIGURE_OPTIONS enable-ssl3)
+    vcpkg_list(APPEND CONFIGURE_OPTIONS enable-ssl3-method)
+endif()
+
 if(DEFINED OPENSSL_USE_NOPINSHARED)
     vcpkg_list(APPEND CONFIGURE_OPTIONS no-pinshared)
 endif()
@@ -66,4 +78,4 @@ else()
 endif()
 
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/external_imported/vcpkg/ports/openssl/unix/Makefile.emscripten b/external_imported/vcpkg/ports/openssl/unix/Makefile.emscripten
deleted file mode 100644
index 126430b5a..000000000
--- a/external_imported/vcpkg/ports/openssl/unix/Makefile.emscripten
+++ /dev/null
@@ -1,4 +0,0 @@
-build_sw:
-	$(EMSDK)/upstream/emscripten/emmake $(MAKE) -f Makefile build_sw ${VCPKG_JOBS} $(MAKEFLAGS)
-install:
-	$(EMSDK)/upstream/emscripten/emmake $(MAKE) -f Makefile install ${VCPKG_JOBS} $(MAKEFLAGS)
diff --git a/external_imported/vcpkg/ports/openssl/unix/configure b/external_imported/vcpkg/ports/openssl/unix/configure
index 5599aaa0f..2d49b3d16 100755
--- a/external_imported/vcpkg/ports/openssl/unix/configure
+++ b/external_imported/vcpkg/ports/openssl/unix/configure
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
diff --git a/external_imported/vcpkg/ports/openssl/unix/move-openssldir.patch b/external_imported/vcpkg/ports/openssl/unix/move-openssldir.patch
index 44e0183ef..2a39bdbe7 100644
--- a/external_imported/vcpkg/ports/openssl/unix/move-openssldir.patch
+++ b/external_imported/vcpkg/ports/openssl/unix/move-openssldir.patch
@@ -1,15 +1,16 @@
 diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
-index dd96254..c4458ca 100644
+index c82c086..6c5402d 100644
 --- a/Configurations/unix-Makefile.tmpl
 +++ b/Configurations/unix-Makefile.tmpl
-@@ -689,6 +689,10 @@ install_ssldirs:
- 		cp $(SRCDIR)/apps/ct_log_list.cnf $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf; \
- 		chmod 644 $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf; \
+@@ -690,6 +690,11 @@ install_ssldirs:
+ 		chmod 644 "$(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf"; \
  	fi
+ 
 +	$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)$(OPENSSLDIR)
 +	for I in $(DESTDIR)$(OPENSSLDIR)/*; do \
 +		mv $$I $(DESTDIR)$(INSTALLTOP)$(OPENSSLDIR)/; \
 +	done
- 
++
  install_dev: install_runtime_libs
  	@[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
+ 	@$(ECHO) "*** Installing development files"
diff --git a/external_imported/vcpkg/ports/openssl/unix/no-empty-dirs.patch b/external_imported/vcpkg/ports/openssl/unix/no-empty-dirs.patch
index 4c59d9eac..7cf0cf05f 100644
--- a/external_imported/vcpkg/ports/openssl/unix/no-empty-dirs.patch
+++ b/external_imported/vcpkg/ports/openssl/unix/no-empty-dirs.patch
@@ -1,21 +1,21 @@
 diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
-index 5b6b1c7..4c8c916 100644
+index 6c5402d..fc982df 100644
 --- a/Configurations/unix-Makefile.tmpl
 +++ b/Configurations/unix-Makefile.tmpl
-@@ -818,7 +818,7 @@ _install_modules_deps: install_runtime_libs build_modules
+@@ -823,7 +823,7 @@ _install_modules_deps: install_runtime_libs build_modules
  
  install_engines: _install_modules_deps
  	@[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
--	@$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(ENGINESDIR)/
+-	@$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(ENGINESDIR)/"
 +	@[ -z "$(INSTALL_ENGINES)" ] || $(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(ENGINESDIR)/
  	@$(ECHO) "*** Installing engines"
  	@set -e; for e in dummy $(INSTALL_ENGINES); do \
  		if [ "$$e" = "dummy" ]; then continue; fi; \
-@@ -842,7 +842,7 @@ uninstall_engines:
+@@ -847,7 +847,7 @@ uninstall_engines:
  
  install_modules: _install_modules_deps
  	@[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
--	@$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(MODULESDIR)/
+-	@$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(MODULESDIR)/"
 +	@[ -z "$(INSTALL_MODULES)" ] || $(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(MODULESDIR)/
  	@$(ECHO) "*** Installing modules"
  	@set -e; for e in dummy $(INSTALL_MODULES); do \
diff --git a/external_imported/vcpkg/ports/openssl/unix/no-static-libs-for-shared.patch b/external_imported/vcpkg/ports/openssl/unix/no-static-libs-for-shared.patch
index 868e682a3..d6aa34cfe 100644
--- a/external_imported/vcpkg/ports/openssl/unix/no-static-libs-for-shared.patch
+++ b/external_imported/vcpkg/ports/openssl/unix/no-static-libs-for-shared.patch
@@ -1,12 +1,12 @@
 diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
-index 4c8c916..dd96254 100644
+index fc982df..10f1c54 100644
 --- a/Configurations/unix-Makefile.tmpl
 +++ b/Configurations/unix-Makefile.tmpl
-@@ -708,6 +708,7 @@ install_dev: install_runtime_libs
+@@ -713,6 +713,7 @@ install_dev: install_runtime_libs
  	done
- 	@$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(libdir)
+ 	@$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(libdir)"
  	@set -e; for l in $(INSTALL_LIBS); do \
-+		if [ -n "$(INSTALL_SHLIBS)" ] ; then continue ; fi ; \
++        if [ -n "$(INSTALL_SHLIBS)" ] ; then continue ; fi ; \
  		fn=`basename $$l`; \
  		$(ECHO) "install $$l -> $(DESTDIR)$(libdir)/$$fn"; \
- 		cp $$l $(DESTDIR)$(libdir)/$$fn.new; \
+ 		cp $$l "$(DESTDIR)$(libdir)/$$fn.new"; \
diff --git a/external_imported/vcpkg/ports/openssl/unix/portfile.cmake b/external_imported/vcpkg/ports/openssl/unix/portfile.cmake
index 2016b68f7..02e62732d 100644
--- a/external_imported/vcpkg/ports/openssl/unix/portfile.cmake
+++ b/external_imported/vcpkg/ports/openssl/unix/portfile.cmake
@@ -45,7 +45,8 @@ vcpkg_list(SET MAKEFILE_OPTIONS)
 if(VCPKG_TARGET_IS_ANDROID)
     set(ENV{ANDROID_NDK_ROOT} "${VCPKG_DETECTED_CMAKE_ANDROID_NDK}")
     set(OPENSSL_ARCH "android-${VCPKG_DETECTED_CMAKE_ANDROID_ARCH}")
-    if(VCPKG_DETECTED_CMAKE_ANDROID_ARCH STREQUAL "arm" AND NOT VCPKG_DETECTED_CMAKE_ANDROID_ARM_NEON)
+    # asm on arm32 NEON is broken, https://github.com/openssl/openssl/pull/21583#issuecomment-1727057735
+    if(VCPKG_DETECTED_CMAKE_ANDROID_ARCH STREQUAL "arm" #[[AND NOT VCPKG_DETECTED_CMAKE_ANDROID_ARM_NEON]])
         vcpkg_list(APPEND CONFIGURE_OPTIONS no-asm)
     endif()
 elseif(VCPKG_TARGET_IS_LINUX)
@@ -87,13 +88,6 @@ elseif(VCPKG_TARGET_IS_MINGW)
         set(OPENSSL_ARCH mingw)
     endif()
 elseif(VCPKG_TARGET_IS_EMSCRIPTEN)
-    set(INTERPRETER "$ENV{EMSDK}/upstream/emscripten/emconfigure")
-    # We must wrap the build in emmake which does not pass jobserver fds.
-    vcpkg_list(SET MAKEFILE_OPTIONS
-        MAKEFILE "${CMAKE_CURRENT_LIST_DIR}/Makefile.emscripten"
-        DISABLE_PARALLEL
-    )
-    set(ENV{VCPKG_JOBS} "-j${VCPKG_CONCURRENCY}")
     vcpkg_list(APPEND CONFIGURE_OPTIONS
         threads
         no-engine
diff --git a/external_imported/vcpkg/ports/openssl/vcpkg.json b/external_imported/vcpkg/ports/openssl/vcpkg.json
index a7290324b..03a5a1827 100644
--- a/external_imported/vcpkg/ports/openssl/vcpkg.json
+++ b/external_imported/vcpkg/ports/openssl/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "openssl",
-  "version": "3.1.0",
+  "version": "3.2.1",
   "description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.",
   "homepage": "https://www.openssl.org",
   "license": "Apache-2.0",
@@ -19,9 +19,19 @@
     }
   ],
   "features": {
+    "fips": {
+      "description": "Enable fips",
+      "supports": "!static"
+    },
+    "ssl3": {
+      "description": "Enable SSL3"
+    },
     "tools": {
       "description": "Install openssl executable and scripts",
       "supports": "!uwp"
+    },
+    "weak-ssl-ciphers": {
+      "description": "Enable weak-ssl-ciphers"
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/openssl/windows/portfile.cmake b/external_imported/vcpkg/ports/openssl/windows/portfile.cmake
index a5a5da413..59da6897f 100644
--- a/external_imported/vcpkg/ports/openssl/windows/portfile.cmake
+++ b/external_imported/vcpkg/ports/openssl/windows/portfile.cmake
@@ -1,11 +1,10 @@
-vcpkg_find_acquire_program(NASM)
-get_filename_component(NASM_EXE_PATH "${NASM}" DIRECTORY)
-vcpkg_add_to_path(PREPEND "${NASM_EXE_PATH}")
-
 vcpkg_find_acquire_program(PERL)
 get_filename_component(PERL_EXE_PATH "${PERL}" DIRECTORY)
 vcpkg_add_to_path("${PERL_EXE_PATH}")
 
+vcpkg_cmake_get_vars(cmake_vars_file)
+include("${cmake_vars_file}")
+
 if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
     set(OPENSSL_ARCH VC-WIN32)
 elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
@@ -13,7 +12,13 @@ elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
 elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
     set(OPENSSL_ARCH VC-WIN32-ARM)
 elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
-    set(OPENSSL_ARCH VC-WIN64-ARM)
+    if(VCPKG_TARGET_IS_UWP)
+        set(OPENSSL_ARCH VC-WIN64-ARM)
+    elseif(VCPKG_DETECTED_CMAKE_C_COMPILER_ID MATCHES "Clang")
+        set(OPENSSL_ARCH VC-CLANG-WIN64-CLANGASM-ARM)
+    else()
+        set(OPENSSL_ARCH VC-WIN64-CLANGASM-ARM)
+    endif()
 else()
     message(FATAL_ERROR "Unsupported target architecture: ${VCPKG_TARGET_ARCHITECTURE}")
 endif()
@@ -33,17 +38,31 @@ endif()
 
 cmake_path(NATIVE_PATH CURRENT_PACKAGES_DIR NORMALIZE install_dir_native)
 
-vcpkg_cmake_get_vars(cmake_vars_file)
-include("${cmake_vars_file}")
-
 # Clang always uses /Z7;  Patching /Zi /Fd<Name> out of openssl requires more work.
 set(OPENSSL_BUILD_MAKES_PDBS ON)
 if (VCPKG_DETECTED_CMAKE_C_COMPILER_ID MATCHES "Clang" OR VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     set(OPENSSL_BUILD_MAKES_PDBS OFF)
 endif()
 
-cmake_path(NATIVE_PATH NASM NORMALIZE as)
 cmake_path(NATIVE_PATH VCPKG_DETECTED_CMAKE_C_COMPILER NORMALIZE cc)
+if(OPENSSL_ARCH MATCHES "CLANG")
+    vcpkg_find_acquire_program(CLANG)
+    cmake_path(GET CLANG PARENT_PATH clang_path)
+    vcpkg_add_to_path("${clang_path}")
+    if(VCPKG_DETECTED_CMAKE_C_COMPILER_ID MATCHES "Clang")
+        string(APPEND VCPKG_COMBINED_C_FLAGS_DEBUG " --target=aarch64-win32-msvc")
+        string(APPEND VCPKG_COMBINED_C_FLAGS_RELEASE " --target=aarch64-win32-msvc")
+    endif()
+endif()
+if(OPENSSL_ARCH MATCHES "CLANGASM")
+    vcpkg_list(APPEND CONFIGURE_OPTIONS "ASFLAGS=--target=aarch64-win32-msvc")
+else()
+    vcpkg_find_acquire_program(NASM)
+    cmake_path(NATIVE_PATH NASM NORMALIZE as)
+    cmake_path(GET NASM PARENT_PATH nasm_path)
+    vcpkg_add_to_path("${nasm_path}") # Needed by Configure
+endif()
+
 cmake_path(NATIVE_PATH VCPKG_DETECTED_CMAKE_AR NORMALIZE ar)
 cmake_path(NATIVE_PATH VCPKG_DETECTED_CMAKE_LINKER NORMALIZE ld)
 
@@ -77,7 +96,7 @@ vcpkg_build_nmake(
         "LD=${ld}"
         "LDFLAGS=${VCPKG_COMBINED_SHARED_LINKER_FLAGS_DEBUG}"
     PROJECT_NAME "makefile"
-    TARGET install_dev install_modules
+    TARGET install_dev install_modules ${INSTALL_FIPS}
     LOGFILE_ROOT install
     OPTIONS
         "INSTALL_PDBS=${OPENSSL_BUILD_MAKES_PDBS}" # install-pdbs.patch
@@ -89,6 +108,9 @@ set(scripts "bin/c_rehash.pl" "misc/CA.pl" "misc/tsget.pl")
 if("tools" IN_LIST FEATURES)
     file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
     file(RENAME "${CURRENT_PACKAGES_DIR}/openssl.cnf" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/openssl.cnf")
+    if("fips" IN_LIST FEATURES)
+	file(RENAME "${CURRENT_PACKAGES_DIR}/fipsmodule.cnf" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/fipsmodule.cnf")
+    endif()
     foreach(script IN LISTS scripts)
         file(COPY "${CURRENT_PACKAGES_DIR}/${script}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
         file(REMOVE "${CURRENT_PACKAGES_DIR}/${script}" "${CURRENT_PACKAGES_DIR}/debug/${script}")
@@ -96,6 +118,7 @@ if("tools" IN_LIST FEATURES)
     vcpkg_copy_tools(TOOL_NAMES openssl AUTO_CLEAN)
 else()
     file(REMOVE "${CURRENT_PACKAGES_DIR}/openssl.cnf")
+    file(REMOVE "${CURRENT_PACKAGES_DIR}/fipsmodule.cnf")
     foreach(script IN LISTS scripts)
         file(REMOVE "${CURRENT_PACKAGES_DIR}/${script}" "${CURRENT_PACKAGES_DIR}/debug/${script}")
     endforeach()
@@ -125,4 +148,5 @@ file(REMOVE
     "${CURRENT_PACKAGES_DIR}/debug/ct_log_list.cnf.dist"
     "${CURRENT_PACKAGES_DIR}/debug/openssl.cnf"
     "${CURRENT_PACKAGES_DIR}/debug/openssl.cnf.dist"
+    "${CURRENT_PACKAGES_DIR}/debug/fipsmodule.cnf"
 )
diff --git a/external_imported/vcpkg/ports/opensubdiv/fix-feature-cuda.patch b/external_imported/vcpkg/ports/opensubdiv/fix-feature-cuda.patch
new file mode 100644
index 000000000..e9c4e933e
--- /dev/null
+++ b/external_imported/vcpkg/ports/opensubdiv/fix-feature-cuda.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 098df7d..9314d03 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -730,7 +730,7 @@ endmacro()
+ # use when cross compiling or building multi-architecture binaries.
+ # We also provide a C++ binary implementation so that Python is not
+ # required (for backward compatibility).
+-if (OPENGL_FOUND OR OPENCL_FOUND OR DXSDK_FOUND OR METAL_FOUND)
++if (OPENGL_FOUND OR OPENCL_FOUND OR DXSDK_FOUND OR METAL_FOUND OR CUDA_FOUND)
+     if(Python_Interpreter_FOUND)
+         set(OSD_STRINGIFY_TOOL ${CMAKE_CURRENT_SOURCE_DIR}/tools/stringify/stringify.py)
+         set(OSD_STRINGIFY ${Python_EXECUTABLE} ${OSD_STRINGIFY_TOOL})
diff --git a/external_imported/vcpkg/ports/opensubdiv/portfile.cmake b/external_imported/vcpkg/ports/opensubdiv/portfile.cmake
index 6f36a1931..2d7606c52 100644
--- a/external_imported/vcpkg/ports/opensubdiv/portfile.cmake
+++ b/external_imported/vcpkg/ports/opensubdiv/portfile.cmake
@@ -13,6 +13,7 @@ vcpkg_from_github(
         fix-version-search.patch
         fix-build-type.patch
         fix-dependencies.patch
+        fix-feature-cuda.patch
 )
 
 if(VCPKG_TARGET_IS_LINUX)
@@ -135,4 +136,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include"
                     "${CURRENT_PACKAGES_DIR}/debug/bin"
 )
 
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/external_imported/vcpkg/ports/opensubdiv/vcpkg.json b/external_imported/vcpkg/ports/opensubdiv/vcpkg.json
index 3f95fcaf3..d5bcb8f9a 100644
--- a/external_imported/vcpkg/ports/opensubdiv/vcpkg.json
+++ b/external_imported/vcpkg/ports/opensubdiv/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "opensubdiv",
   "version-semver": "3.5.0",
+  "port-version": 1,
   "description": "An Open-Source subdivision surface library.",
   "homepage": "https://github.com/PixarAnimationStudios/OpenSubdiv",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/opentelemetry-cpp/add-missing-find-dependency.patch b/external_imported/vcpkg/ports/opentelemetry-cpp/add-missing-find-dependency.patch
new file mode 100644
index 000000000..1f9c12d16
--- /dev/null
+++ b/external_imported/vcpkg/ports/opentelemetry-cpp/add-missing-find-dependency.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/opentelemetry-cpp-config.cmake.in b/cmake/opentelemetry-cpp-config.cmake.in
+index adae58d..2642772 100644
+--- a/cmake/opentelemetry-cpp-config.cmake.in
++++ b/cmake/opentelemetry-cpp-config.cmake.in
+@@ -69,6 +69,8 @@ set(OPENTELEMETRY_VERSION
+ # ##############################################################################
+
+ find_package(Threads)
++include(CMakeFindDependencyMacro)
++find_dependency(absl)
+
+ set_and_check(OPENTELEMETRY_CPP_INCLUDE_DIRS "@PACKAGE_INCLUDE_INSTALL_DIR@")
+ set_and_check(OPENTELEMETRY_CPP_LIBRARY_DIRS "@PACKAGE_CMAKE_INSTALL_LIBDIR@")
diff --git a/external_imported/vcpkg/ports/opentelemetry-cpp/fix-nominmax-problems.patch b/external_imported/vcpkg/ports/opentelemetry-cpp/fix-nominmax-problems.patch
new file mode 100644
index 000000000..7cf003711
--- /dev/null
+++ b/external_imported/vcpkg/ports/opentelemetry-cpp/fix-nominmax-problems.patch
@@ -0,0 +1,224 @@
+diff --git a/api/include/opentelemetry/std/span.h b/api/include/opentelemetry/std/span.h
+index 2a3dc12a84..1160d54fbe 100644
+--- a/api/include/opentelemetry/std/span.h
++++ b/api/include/opentelemetry/std/span.h
+@@ -60,7 +60,7 @@ OPENTELEMETRY_END_NAMESPACE
+ OPENTELEMETRY_BEGIN_NAMESPACE
+ namespace nostd
+ {
+-constexpr std::size_t dynamic_extent = (std::numeric_limits<std::size_t>::max());
++constexpr std::size_t dynamic_extent = (std::numeric_limits<std::size_t>::max)();
+ 
+ template <class ElementType, std::size_t Extent = nostd::dynamic_extent>
+ using span = std::span<ElementType, Extent>;
+index 7deb369ab3..6da8bdd032 100644
+--- a/docs/cpp-ostream-exporter-design.md
++++ b/docs/cpp-ostream-exporter-design.md
+@@ -154,7 +154,7 @@ public:
+         return sdktrace::ExportResult::kSuccess;
+     }
+ 
+-    bool Shutdown(std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept
++    bool Shutdown(std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept
+     {
+         isShutdown = true;
+         return true;
+diff --git a/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h b/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h
+index 8579c99138..b72ff4f917 100644
+--- a/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h
++++ b/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h
+@@ -100,14 +100,14 @@ class ElasticsearchLogRecordExporter final : public opentelemetry::sdk::logs::Lo
+    * @return return true when all data are exported, and false when timeout
+    */
+   bool ForceFlush(
+-      std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override;
++      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
+ 
+   /**
+    * Shutdown this exporter.
+    * @param timeout The maximum time to wait for the shutdown method to return
+    */
+   bool Shutdown(
+-      std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override;
++      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
+ 
+ private:
+   // Stores if this exporter had its Shutdown() method called
+diff --git a/exporters/elasticsearch/src/es_log_record_exporter.cc b/exporters/elasticsearch/src/es_log_record_exporter.cc
+index c90072e4e4..e167faf3d9 100644
+--- a/exporters/elasticsearch/src/es_log_record_exporter.cc
++++ b/exporters/elasticsearch/src/es_log_record_exporter.cc
+@@ -430,7 +430,7 @@ bool ElasticsearchLogRecordExporter::ForceFlush(
+       std::chrono::duration_cast<std::chrono::steady_clock::duration>(timeout);
+   if (timeout_steady <= std::chrono::steady_clock::duration::zero())
+   {
+-    timeout_steady = std::chrono::steady_clock::duration::max();
++    timeout_steady = (std::chrono::steady_clock::duration::max)();
+   }
+ 
+   std::unique_lock<std::mutex> lk_cv(synchronization_data_->force_flush_cv_m);
+diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_exporter.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_exporter.h
+index 7aff1e24a5..870e5a043a 100644
+--- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_exporter.h
++++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_exporter.h
+@@ -58,7 +58,7 @@ class OtlpGrpcExporter final : public opentelemetry::sdk::trace::SpanExporter
+    * @return return true when all data are exported, and false when timeout
+    */
+   bool ForceFlush(
+-      std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override;
++      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
+ 
+   /**
+    * Shut down the exporter.
+@@ -67,7 +67,7 @@ class OtlpGrpcExporter final : public opentelemetry::sdk::trace::SpanExporter
+    * @return return the status of this operation
+    */
+   bool Shutdown(
+-      std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override;
++      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
+ 
+ private:
+   // The configuration options associated with this exporter.
+diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter.h
+index 29333703b1..f1cd96888c 100644
+--- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter.h
++++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter.h
+@@ -60,14 +60,14 @@ class OtlpGrpcLogRecordExporter : public opentelemetry::sdk::logs::LogRecordExpo
+    * @return return true when all data are exported, and false when timeout
+    */
+   bool ForceFlush(
+-      std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override;
++      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
+ 
+   /**
+    * Shutdown this exporter.
+    * @param timeout The maximum time to wait for the shutdown method to return.
+    */
+   bool Shutdown(
+-      std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override;
++      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
+ 
+ private:
+   // Configuration options for the exporter
+diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter.h
+index 1adbbc70b9..b5faf1a9b8 100644
+--- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter.h
++++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter.h
+@@ -59,7 +59,7 @@ class OPENTELEMETRY_EXPORT OtlpHttpExporter final : public opentelemetry::sdk::t
+    * @return return true when all data are exported, and false when timeout
+    */
+   bool ForceFlush(
+-      std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override;
++      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
+ 
+   /**
+    * Shut down the exporter.
+@@ -68,7 +68,7 @@ class OPENTELEMETRY_EXPORT OtlpHttpExporter final : public opentelemetry::sdk::t
+    * @return return the status of this operation
+    */
+   bool Shutdown(
+-      std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override;
++      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
+ 
+ private:
+   // The configuration options associated with this exporter.
+diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter.h
+index 4393345dfd..f481fdab0b 100644
+--- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter.h
++++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter.h
+@@ -58,14 +58,14 @@ class OtlpHttpLogRecordExporter final : public opentelemetry::sdk::logs::LogReco
+    * @return return true when all data are exported, and false when timeout
+    */
+   bool ForceFlush(
+-      std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override;
++      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
+ 
+   /**
+    * Shutdown this exporter.
+    * @param timeout The maximum time to wait for the shutdown method to return
+    */
+   bool Shutdown(
+-      std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override;
++      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
+ 
+ private:
+   // Configuration options for the exporter
+diff --git a/exporters/otlp/src/otlp_http_client.cc b/exporters/otlp/src/otlp_http_client.cc
+index 9c57a9bd83..7814199ef2 100644
+--- a/exporters/otlp/src/otlp_http_client.cc
++++ b/exporters/otlp/src/otlp_http_client.cc
+@@ -782,7 +782,7 @@ bool OtlpHttpClient::ForceFlush(std::chrono::microseconds timeout) noexcept
+       std::chrono::duration_cast<std::chrono::steady_clock::duration>(timeout);
+   if (timeout_steady <= std::chrono::steady_clock::duration::zero())
+   {
+-    timeout_steady = std::chrono::steady_clock::duration::max();
++    timeout_steady = (std::chrono::steady_clock::duration::max)();
+   }
+ 
+   while (timeout_steady > std::chrono::steady_clock::duration::zero())
+diff --git a/sdk/include/opentelemetry/sdk/logs/batch_log_record_processor.h b/sdk/include/opentelemetry/sdk/logs/batch_log_record_processor.h
+index e93ebf3d6b..d6a44df142 100644
+--- a/sdk/include/opentelemetry/sdk/logs/batch_log_record_processor.h
++++ b/sdk/include/opentelemetry/sdk/logs/batch_log_record_processor.h
+@@ -72,7 +72,7 @@ class BatchLogRecordProcessor : public LogRecordProcessor
+    * NOTE: Timeout functionality not supported yet.
+    */
+   bool ForceFlush(
+-      std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override;
++      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
+ 
+   /**
+    * Shuts down the processor and does any cleanup required. Completely drains the buffer/queue of
+@@ -82,7 +82,7 @@ class BatchLogRecordProcessor : public LogRecordProcessor
+    * NOTE: Timeout functionality not supported yet.
+    */
+   bool Shutdown(
+-      std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override;
++      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
+ 
+   /**
+    * Class destructor which invokes the Shutdown() method.
+diff --git a/sdk/include/opentelemetry/sdk/logs/multi_log_record_processor.h b/sdk/include/opentelemetry/sdk/logs/multi_log_record_processor.h
+index 335da7f668..8ca5cffcca 100644
+--- a/sdk/include/opentelemetry/sdk/logs/multi_log_record_processor.h
++++ b/sdk/include/opentelemetry/sdk/logs/multi_log_record_processor.h
+@@ -45,7 +45,7 @@ class MultiLogRecordProcessor : public LogRecordProcessor
+    * @return a result code indicating whether it succeeded, failed or timed out
+    */
+   bool ForceFlush(
+-      std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override;
++      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
+ 
+   /**
+    * Shuts down the processor and does any cleanup required.
+@@ -55,7 +55,7 @@ class MultiLogRecordProcessor : public LogRecordProcessor
+    * @return true if the shutdown succeeded, false otherwise
+    */
+   bool Shutdown(
+-      std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override;
++      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
+ 
+ private:
+   std::vector<std::unique_ptr<LogRecordProcessor>> processors_;
+diff --git a/sdk/include/opentelemetry/sdk/trace/batch_span_processor.h b/sdk/include/opentelemetry/sdk/trace/batch_span_processor.h
+index a748b06361..afbf4486b0 100644
+--- a/sdk/include/opentelemetry/sdk/trace/batch_span_processor.h
++++ b/sdk/include/opentelemetry/sdk/trace/batch_span_processor.h
+@@ -69,7 +69,7 @@ class BatchSpanProcessor : public SpanProcessor
+    * NOTE: Timeout functionality not supported yet.
+    */
+   bool ForceFlush(
+-      std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override;
++      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
+ 
+   /**
+    * Shuts down the processor and does any cleanup required. Completely drains the buffer/queue of
+@@ -79,7 +79,7 @@ class BatchSpanProcessor : public SpanProcessor
+    * NOTE: Timeout functionality not supported yet.
+    */
+   bool Shutdown(
+-      std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override;
++      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
+ 
+   /**
+    * Class destructor which invokes the Shutdown() method. The Shutdown() method is supposed to be
diff --git a/external_imported/vcpkg/ports/opentelemetry-cpp/portfile.cmake b/external_imported/vcpkg/ports/opentelemetry-cpp/portfile.cmake
index 839b5a8bb..045babe36 100644
--- a/external_imported/vcpkg/ports/opentelemetry-cpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/opentelemetry-cpp/portfile.cmake
@@ -6,10 +6,13 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO open-telemetry/opentelemetry-cpp
     REF "v${VERSION}"
-    SHA512 eb7dde38134fd9f51f22a2288a3a1db9eeec3dce3889c02fea82e20738a697449be73d632c3d1889ff159f0274d57bfd066db506149b221fe6ced8f18fdc1237
+    SHA512 38a3796a5f4c28fd54cc2a5475b3a024e2e73594acbc635fccc6358bf4d93ae897fc0ce55a93d27736a08622869ccc9fe9a9ee62e3884adadb3f135c27d378ec
     HEAD_REF main
     PATCHES
-        support_absl_cxx17.patch
+        # Missing find_dependency for Abseil
+        add-missing-find-dependency.patch
+        # Fix problems from removing NOMINMAX on Windows. Fixed in 1.14.0
+        fix-nominmax-problems.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -18,19 +21,18 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
         zipkin WITH_ZIPKIN
         prometheus WITH_PROMETHEUS
         elasticsearch WITH_ELASTICSEARCH
-        jaeger WITH_JAEGER
-        otlp WITH_OTLP
         otlp-http WITH_OTLP_HTTP
-        zpages WITH_ZPAGES
+        otlp-grpc WITH_OTLP_GRPC
+        geneva WITH_GENEVA
 )
 
 # opentelemetry-proto is a third party submodule and opentelemetry-cpp release did not pack it.
-if(WITH_OTLP)
-    set(OTEL_PROTO_VERSION "0.19.0")
+if(WITH_OTLP_GRPC OR WITH_OTLP_HTTP)
+    set(OTEL_PROTO_VERSION "1.0.0")
     vcpkg_download_distfile(ARCHIVE
         URLS "https://github.com/open-telemetry/opentelemetry-proto/archive/v${OTEL_PROTO_VERSION}.tar.gz"
         FILENAME "opentelemetry-proto-${OTEL_PROTO_VERSION}.tar.gz"
-        SHA512 b6d47aaa90ff934eb24047757d5fdb8a5be62963a49b632460511155f09a725937fb7535cf34f738b81cc799600adbbc3809442aba584d760891c0a1f0ce8c03
+        SHA512 74de78304a91fe72cfcdbd87fcb19c0d6338c161d6624ce09eac0527b1b43b8a5d8790ae055e1d3d44319eaa070a506f47e740f888c91d724a0aef8b509688f0
     )
 
     vcpkg_extract_source_archive(src ARCHIVE "${ARCHIVE}")
@@ -38,6 +40,23 @@ if(WITH_OTLP)
     file(COPY "${src}/." DESTINATION "${SOURCE_PATH}/third_party/opentelemetry-proto")
     # Create empty .git directory to prevent opentelemetry from cloning it during build time
     file(MAKE_DIRECTORY "${SOURCE_PATH}/third_party/opentelemetry-proto/.git")
+    list(APPEND FEATURE_OPTIONS -DCMAKE_CXX_STANDARD=14)
+    list(APPEND FEATURE_OPTIONS "-DgRPC_CPP_PLUGIN_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/grpc/grpc_cpp_plugin${VCPKG_HOST_EXECUTABLE_SUFFIX}")
+endif()
+
+set(OPENTELEMETRY_CPP_EXTERNAL_COMPONENTS "OFF")
+if(WITH_GENEVA)
+# Geneva exporters from opentelemetry-cpp-contrib are tightly coupled with opentelemetry-cpp repo, so they should be ported as a feature under opentelemetry-cpp.
+# TODO: merge the opentelemetry-fluentd port to opentelemery-cpp port.
+    vcpkg_from_github(
+        OUT_SOURCE_PATH CONTRIB_SOURCE_PATH
+        REPO open-telemetry/opentelemetry-cpp-contrib
+        REF 26e5ed48d81bb03fde52848ab394605dde0fb1a8
+        HEAD_REF main
+        SHA512 f483dc96a884450fbb17fdaf0b5514ba44546f1742c2f80f552fcb442e08fbfe399441594e95ffd2c644c20907baef83d52c326dd6d3d5eb70cf29d30b2c5a0e
+    )
+    set(OPENTELEMETRY_CPP_EXTERNAL_COMPONENTS "")
+    list(APPEND OPENTELEMETRY_CPP_EXTERNAL_COMPONENTS "${CONTRIB_SOURCE_PATH}/exporters/geneva")
 endif()
 
 vcpkg_cmake_configure(
@@ -45,15 +64,18 @@ vcpkg_cmake_configure(
     OPTIONS
         -DBUILD_TESTING=OFF
         -DWITH_EXAMPLES=OFF
-        -DWITH_LOGS_PREVIEW=ON
         -DOPENTELEMETRY_INSTALL=ON
+        -DWITH_ABSEIL=ON
+        -DOPENTELEMETRY_EXTERNAL_COMPONENT_PATH="${OPENTELEMETRY_CPP_EXTERNAL_COMPONENTS}"
         ${FEATURE_OPTIONS}
+    MAYBE_UNUSED_VARIABLES
+        WITH_GENEVA
 )
 
 vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
 vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/opentelemetry-cpp/support_absl_cxx17.patch b/external_imported/vcpkg/ports/opentelemetry-cpp/support_absl_cxx17.patch
deleted file mode 100644
index 545d01fd3..000000000
--- a/external_imported/vcpkg/ports/opentelemetry-cpp/support_absl_cxx17.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9df8f5ca..f68830cc 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -344,6 +344,11 @@ if(WITH_OTLP)
-   endif()
-   include(CMakeDependentOption)
- 
-+  if (ABSL_USE_CXX17)
-+    message(STATUS "Found absl uses CXX17, enable CXX17 feature.")
-+    set(CMAKE_CXX_STANDARD 17)
-+    set(WITH_STL ON)
-+  endif()
-   cmake_dependent_option(
-     WITH_OTLP_GRPC "Whether to include the OTLP gRPC exporter in the SDK" ON
-     "gRPC_FOUND" OFF)
diff --git a/external_imported/vcpkg/ports/opentelemetry-cpp/vcpkg.json b/external_imported/vcpkg/ports/opentelemetry-cpp/vcpkg.json
index 94f0f5725..dda8cae1a 100644
--- a/external_imported/vcpkg/ports/opentelemetry-cpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/opentelemetry-cpp/vcpkg.json
@@ -1,7 +1,8 @@
 {
   "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
   "name": "opentelemetry-cpp",
-  "version-semver": "1.8.3",
+  "version-semver": "1.13.0",
+  "port-version": 4,
   "description": [
     "OpenTelemetry is a collection of tools, APIs, and SDKs.",
     "You use it to instrument, generate, collect, and export telemetry data (metrics, logs, and traces) for analysis in order to understand your software's performance and behavior."
@@ -9,7 +10,7 @@
   "homepage": "https://github.com/open-telemetry/opentelemetry-cpp",
   "license": "Apache-2.0",
   "dependencies": [
-    "curl",
+    "abseil",
     "nlohmann-json",
     {
       "name": "vcpkg-cmake",
@@ -28,17 +29,17 @@
       "description": "Whether to include the ETW Exporter in the SDK",
       "supports": "windows"
     },
-    "jaeger": {
-      "description": "Whether to include the Jaeger exporter",
-      "dependencies": [
-        "thrift"
-      ]
+    "geneva": {
+      "description": "Whether to include the Geneva Exporter from the opentelemetry-cpp-contrib repository"
     },
-    "otlp": {
-      "description": "Whether to include the OpenTelemetry Protocol in the SDK",
+    "otlp-grpc": {
+      "description": "Whether to include the OTLP gRPC exporter in the SDK",
       "dependencies": [
         "grpc",
-        "protobuf"
+        {
+          "name": "grpc",
+          "host": true
+        }
       ]
     },
     "otlp-http": {
@@ -56,9 +57,6 @@
     },
     "zipkin": {
       "description": "Whether to include the Zipkin exporter in the SDK"
-    },
-    "zpages": {
-      "description": "Whether to include the Zpages Server in the SDK"
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/opentelemetry-fluentd/fix_include_path.patch b/external_imported/vcpkg/ports/opentelemetry-fluentd/fix_include_path.patch
new file mode 100644
index 000000000..e162cf12a
--- /dev/null
+++ b/external_imported/vcpkg/ports/opentelemetry-fluentd/fix_include_path.patch
@@ -0,0 +1,26 @@
+diff --git a/exporters/fluentd/src/log/recordable.cc b/exporters/fluentd/src/log/recordable.cc
+index 5af84d8..1b124eb 100644
+--- a/exporters/fluentd/src/log/recordable.cc
++++ b/exporters/fluentd/src/log/recordable.cc
+@@ -1,6 +1,9 @@
+ /// Copyright The OpenTelemetry Authors
+ // SPDX-License-Identifier: Apache-2.0
+ 
++#include "opentelemetry/logs/severity.h"
++#include "opentelemetry/trace/span_id.h"
++#include "opentelemetry/trace/trace_id.h"
+ #include "opentelemetry/exporters/fluentd/log/recordable.h"
+ #include "opentelemetry/exporters/fluentd/common/fluentd_common.h"
+ #include "opentelemetry/exporters/fluentd/common/fluentd_logging.h"
+diff --git a/exporters/fluentd/src/trace/recordable.cc b/exporters/fluentd/src/trace/recordable.cc
+index 5c0a5ed..c24aa0c 100644
+--- a/exporters/fluentd/src/trace/recordable.cc
++++ b/exporters/fluentd/src/trace/recordable.cc
+@@ -4,6 +4,7 @@
+ #include "opentelemetry/exporters/fluentd/trace/recordable.h"
+ #include "opentelemetry/exporters/fluentd/common/fluentd_common.h"
+ #include "opentelemetry/exporters/fluentd/common/fluentd_logging.h"
++#include "opentelemetry/sdk/resource/resource.h"
+ 
+ #include <map>
+ #include <string>
diff --git a/external_imported/vcpkg/ports/opentelemetry-fluentd/portfile.cmake b/external_imported/vcpkg/ports/opentelemetry-fluentd/portfile.cmake
new file mode 100644
index 000000000..10bbbc7e5
--- /dev/null
+++ b/external_imported/vcpkg/ports/opentelemetry-fluentd/portfile.cmake
@@ -0,0 +1,29 @@
+# Upon the next update, we plan to remove the standalone opentelemetry-fluentd port and incorporate it into opentelemetry-cpp as a feature. 
+# This is to avoid introducing a new pattern for managing exporters in the opentelemetry port.
+
+if(VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO open-telemetry/opentelemetry-cpp-contrib
+    REF 7afa91952f08aad1fa79b8992f20a4b0cdaadaff  # Maps to 2.0.0
+    HEAD_REF main
+    SHA512 b28415c867aee5efe99f7521a145b5c402ac555d83be75a8b1d2760aed226ac109a6d092e86d7afedcc2ed8dc848d9662ac6505133d32f99b810f51e2748d1fc
+    PATCHES
+        fix_include_path.patch
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}/exporters/fluentd"
+    OPTIONS
+        -DBUILD_TESTING=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/opentelemetry-fluentd/vcpkg.json b/external_imported/vcpkg/ports/opentelemetry-fluentd/vcpkg.json
new file mode 100644
index 000000000..f87fad123
--- /dev/null
+++ b/external_imported/vcpkg/ports/opentelemetry-fluentd/vcpkg.json
@@ -0,0 +1,22 @@
+{
+  "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
+  "name": "opentelemetry-fluentd",
+  "version-semver": "2.0.0",
+  "port-version": 2,
+  "description": "mdsd/fluentd exporter for OpenTelemetry C++",
+  "homepage": "https://github.com/open-telemetry/opentelemetry-cpp-contrib/tree/main/exporters",
+  "license": "Apache-2.0",
+  "dependencies": [
+    "curl",
+    "nlohmann-json",
+    "opentelemetry-cpp",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/openturns/portfile.cmake b/external_imported/vcpkg/ports/openturns/portfile.cmake
index 2170a11be..4b7a15698 100644
--- a/external_imported/vcpkg/ports/openturns/portfile.cmake
+++ b/external_imported/vcpkg/ports/openturns/portfile.cmake
@@ -11,10 +11,10 @@ vcpkg_from_github(
 
 vcpkg_find_acquire_program(FLEX)
 get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY)
-vcpkg_add_to_path("${FLEX_DIR}")
+vcpkg_add_to_path(PREPEND "${FLEX_DIR}")
 vcpkg_find_acquire_program(BISON)
 get_filename_component(BISON_DIR "${BISON}" DIRECTORY)
-vcpkg_add_to_path("${BISON_DIR}")
+vcpkg_add_to_path(PREPEND "${BISON_DIR}")
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
diff --git a/external_imported/vcpkg/ports/openturns/vcpkg.json b/external_imported/vcpkg/ports/openturns/vcpkg.json
index 1c170b45b..32281b5b7 100644
--- a/external_imported/vcpkg/ports/openturns/vcpkg.json
+++ b/external_imported/vcpkg/ports/openturns/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "openturns",
   "version": "1.20",
+  "port-version": 1,
   "description": "OpenTURNS is a scientific C++ and Python library featuring an internal data model and algorithms dedicated to the treatment of uncertainties.",
   "homepage": "http://www.openturns.org",
   "license": null,
diff --git a/external_imported/vcpkg/ports/openvdb/0003-fix-cmake.patch b/external_imported/vcpkg/ports/openvdb/0003-fix-cmake.patch
deleted file mode 100644
index ef10257c7..000000000
--- a/external_imported/vcpkg/ports/openvdb/0003-fix-cmake.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9330c29..a98516a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -283,13 +283,9 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
- 
- if(OPENVDB_INSTALL_CMAKE_MODULES)
-   set(OPENVDB_CMAKE_MODULES
--    cmake/FindBlosc.cmake
-     cmake/FindJemalloc.cmake
--    cmake/FindIlmBase.cmake
-     cmake/FindLog4cplus.cmake
--    cmake/FindOpenEXR.cmake
-     cmake/FindOpenVDB.cmake
--    cmake/FindTBB.cmake
-     cmake/OpenVDBGLFW3Setup.cmake
-     cmake/OpenVDBHoudiniSetup.cmake
-     cmake/OpenVDBMayaSetup.cmake
-diff --git a/cmake/FindOpenVDB.cmake b/cmake/FindOpenVDB.cmake
-index 5ff96f6..c3de6f9 100644
---- a/cmake/FindOpenVDB.cmake
-+++ b/cmake/FindOpenVDB.cmake
-@@ -490,7 +490,7 @@ endif()
- 
- # Add standard dependencies
- 
--find_package(TBB REQUIRED COMPONENTS tbb)
-+find_package(TBB CONFIG REQUIRED)
- 
- if(NOT OPENVDB_USE_STATIC_LIBS AND NOT Boost_USE_STATIC_LIBS)
-   # @note  Both of these must be set for Boost 1.70 (VFX2020) to link against
-@@ -651,7 +651,7 @@ elseif(NOT OPENVDB_USE_STATIC_LIBS)
- endif()
- 
- if(OpenVDB_USES_BLOSC)
--  find_package(Blosc REQUIRED)
-+  find_package(blosc CONFIG REQUIRED)
- endif()
- 
- if(OpenVDB_USES_ZLIB)
-@@ -665,7 +665,7 @@ endif()
- if(OpenVDB_USES_IMATH_HALF)
-   find_package(Imath CONFIG)
-   if (NOT TARGET Imath::Imath)
--    find_package(IlmBase REQUIRED COMPONENTS Half)
-+    find_package(IlmBase CONFIG REQUIRED)
-   endif()
- 
-   if(WIN32)
-@@ -716,7 +716,7 @@ set(_OPENVDB_HIDDEN_DEPENDENCIES)
- 
- if(NOT OPENVDB_USE_STATIC_LIBS)
-   if(OpenVDB_USES_BLOSC)
--    list(APPEND _OPENVDB_HIDDEN_DEPENDENCIES Blosc::blosc)
-+    list(APPEND _OPENVDB_HIDDEN_DEPENDENCIES blosc)
-   endif()
-   if(OpenVDB_USES_ZLIB)
-     list(APPEND _OPENVDB_HIDDEN_DEPENDENCIES ZLIB::ZLIB)
-diff --git a/openvdb/openvdb/CMakeLists.txt b/openvdb/openvdb/CMakeLists.txt
-index 1b48e84..5d055ac 100644
---- a/openvdb/openvdb/CMakeLists.txt
-+++ b/openvdb/openvdb/CMakeLists.txt
-@@ -130,9 +130,9 @@ if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_BOOST_VERSION)
-   endif()
- endif()
- 
--find_package(TBB ${MINIMUM_TBB_VERSION} REQUIRED COMPONENTS tbb)
-+find_package(TBB CONFIG REQUIRED)
- if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_TBB_VERSION)
--  if(${Tbb_VERSION} VERSION_LESS FUTURE_MINIMUM_TBB_VERSION)
-+  if(${TBB_VERSION} VERSION_LESS FUTURE_MINIMUM_TBB_VERSION)
-     message(DEPRECATION "Support for TBB versions < ${FUTURE_MINIMUM_TBB_VERSION} "
-       "is deprecated and will be removed.")
-   endif()
-@@ -141,7 +141,7 @@ endif()
- if(USE_IMATH_HALF)
-   find_package(Imath CONFIG)
-   if (NOT TARGET Imath::Imath)
--    find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half)
-+    find_package(IlmBase CONFIG REQUIRED)
-     if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_ILMBASE_VERSION)
-       if(${IlmBase_VERSION} VERSION_LESS FUTURE_MINIMUM_ILMBASE_VERSION)
-         message(DEPRECATION "Support for IlmBase versions < ${FUTURE_MINIMUM_ILMBASE_VERSION} "
-@@ -160,26 +160,7 @@ endif()
- 
- if(USE_BLOSC)
-   # Find Blosc libraries
--  find_package(Blosc ${MINIMUM_BLOSC_VERSION} REQUIRED)
--  if(Blosc_VERSION)
--    if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_BLOSC_VERSION)
--      if(${Blosc_VERSION} VERSION_LESS FUTURE_MINIMUM_BLOSC_VERSION)
--        message(DEPRECATION "Support for Blosc versions < ${FUTURE_MINIMUM_BLOSC_VERSION} "
--          "is deprecated and will be removed.")
--      endif()
--    endif()
--    # Print a warning if using of the blosc versions with regression issues
--    # with Blosc 1.5.0 caches.
--    if((Blosc_VERSION VERSION_GREATER_EQUAL 1.11.0 AND
--        Blosc_VERSION VERSION_LESS 1.14.0) OR
--       (Blosc_VERSION VERSION_GREATER_EQUAL 1.16.0 AND
--        Blosc_VERSION VERSION_LESS 1.16.2))
--      message(WARNING "The following Blosc versions are incompatible with the "
--        "recommended builds of OpenVDB: [1.11.0 -> 1.14.0) [1.16.0, 1.16.1]. "
--        "Found Blosc version '${Blosc_VERSION}' which falls in this range. We "
--        "strongly recommend using the new future minimum version '${FUTURE_MINIMUM_BLOSC_VERSION}'")
--    endif()
--  endif()
-+  find_package(blosc CONFIG REQUIRED)
- else()
-   message(WARNING "Blosc support is disabled. It is strongly recommended to "
-     "enable blosc for optimal builds of OpenVDB and to support compatible "
-@@ -237,7 +218,11 @@ endif()
- # /usr/local
- 
- if(USE_BLOSC)
--  list(APPEND OPENVDB_CORE_DEPENDENT_LIBS Blosc::blosc)
-+    if(BUILD_SHARED_LIBS)
-+    list(APPEND OPENVDB_CORE_DEPENDENT_LIBS blosc_shared)
-+  else()
-+    list(APPEND OPENVDB_CORE_DEPENDENT_LIBS blosc_static)
-+  endif()
- endif()
- 
- if(USE_BLOSC OR USE_ZLIB)
-diff --git a/openvdb_cmd/CMakeLists.txt b/openvdb_cmd/CMakeLists.txt
-index c4351f4..b480334 100644
---- a/openvdb_cmd/CMakeLists.txt
-+++ b/openvdb_cmd/CMakeLists.txt
-@@ -53,7 +53,7 @@ if(CONCURRENT_MALLOC STREQUAL "Jemalloc")
-   find_package(Jemalloc REQUIRED)
-   list(APPEND OPENVDB_BINARIES_DEPENDENT_LIBS Jemalloc::jemalloc)
- elseif(CONCURRENT_MALLOC STREQUAL "Tbbmalloc")
--  find_package(TBB ${MINIMUM_TBB_VERSION} REQUIRED COMPONENTS tbbmalloc)
-+  find_package(TBB CONFIG REQUIRED)
-   list(APPEND OPENVDB_BINARIES_DEPENDENT_LIBS TBB::tbbmalloc)
- endif()
- 
diff --git a/external_imported/vcpkg/ports/openvdb/fix_cmake.patch b/external_imported/vcpkg/ports/openvdb/fix_cmake.patch
new file mode 100644
index 000000000..8223c76f2
--- /dev/null
+++ b/external_imported/vcpkg/ports/openvdb/fix_cmake.patch
@@ -0,0 +1,115 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8329dda9..71f45701 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -284,12 +284,9 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
+ 
+ if(OPENVDB_INSTALL_CMAKE_MODULES)
+   set(OPENVDB_CMAKE_MODULES
+-    cmake/FindBlosc.cmake
+     cmake/FindJemalloc.cmake
+     cmake/FindLog4cplus.cmake
+-    cmake/FindOpenEXR.cmake
+     cmake/FindOpenVDB.cmake
+-    cmake/FindTBB.cmake
+     cmake/OpenVDBGLFW3Setup.cmake
+     cmake/OpenVDBHoudiniSetup.cmake
+     cmake/OpenVDBMayaSetup.cmake
+diff --git a/cmake/FindOpenVDB.cmake b/cmake/FindOpenVDB.cmake
+index c4213c85..86b24e9d 100644
+--- a/cmake/FindOpenVDB.cmake
++++ b/cmake/FindOpenVDB.cmake
+@@ -490,7 +490,7 @@ endif()
+ 
+ # Add standard dependencies
+ 
+-find_package(TBB REQUIRED COMPONENTS tbb)
++find_package(TBB CONFIG REQUIRED)
+ find_package(Boost REQUIRED COMPONENTS iostreams)
+ 
+ # Add deps for pyopenvdb
+@@ -641,7 +641,7 @@ elseif(NOT OPENVDB_USE_STATIC_LIBS)
+ endif()
+ 
+ if(OpenVDB_USES_BLOSC)
+-  find_package(Blosc REQUIRED)
++  find_package(blosc CONFIG REQUIRED)
+ endif()
+ 
+ if(OpenVDB_USES_ZLIB)
+@@ -694,7 +694,7 @@ set(_OPENVDB_HIDDEN_DEPENDENCIES)
+ 
+ if(NOT OPENVDB_USE_STATIC_LIBS)
+   if(OpenVDB_USES_BLOSC)
+-    list(APPEND _OPENVDB_HIDDEN_DEPENDENCIES Blosc::blosc)
++    list(APPEND _OPENVDB_HIDDEN_DEPENDENCIES blosc)
+   endif()
+   if(OpenVDB_USES_ZLIB)
+     list(APPEND _OPENVDB_HIDDEN_DEPENDENCIES ZLIB::ZLIB)
+diff --git a/openvdb/openvdb/CMakeLists.txt b/openvdb/openvdb/CMakeLists.txt
+index 33d4e5cc..63699b2c 100644
+--- a/openvdb/openvdb/CMakeLists.txt
++++ b/openvdb/openvdb/CMakeLists.txt
+@@ -123,7 +123,7 @@ if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_BOOST_VERSION)
+   endif()
+ endif()
+ 
+-find_package(TBB ${MINIMUM_TBB_VERSION} REQUIRED COMPONENTS tbb)
++find_package(TBB CONFIG REQUIRED)
+ if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_TBB_VERSION)
+   if(${TBB_VERSION} VERSION_LESS FUTURE_MINIMUM_TBB_VERSION)
+     message(DEPRECATION "Support for TBB versions < ${FUTURE_MINIMUM_TBB_VERSION} "
+@@ -152,26 +152,7 @@ endif()
+ 
+ if(USE_BLOSC)
+   # Find Blosc libraries
+-  find_package(Blosc ${MINIMUM_BLOSC_VERSION} REQUIRED)
+-  if(Blosc_VERSION)
+-    if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_BLOSC_VERSION)
+-      if(${Blosc_VERSION} VERSION_LESS FUTURE_MINIMUM_BLOSC_VERSION)
+-        message(DEPRECATION "Support for Blosc versions < ${FUTURE_MINIMUM_BLOSC_VERSION} "
+-          "is deprecated and will be removed.")
+-      endif()
+-    endif()
+-    # Print a warning if using of the blosc versions with regression issues
+-    # with Blosc 1.5.0 caches.
+-    if((Blosc_VERSION VERSION_GREATER_EQUAL 1.11.0 AND
+-        Blosc_VERSION VERSION_LESS 1.14.0) OR
+-       (Blosc_VERSION VERSION_GREATER_EQUAL 1.16.0 AND
+-        Blosc_VERSION VERSION_LESS 1.16.2))
+-      message(WARNING "The following Blosc versions are incompatible with the "
+-        "recommended builds of OpenVDB: [1.11.0 -> 1.14.0) [1.16.0, 1.16.1]. "
+-        "Found Blosc version '${Blosc_VERSION}' which falls in this range. We "
+-        "strongly recommend using the new future minimum version '${FUTURE_MINIMUM_BLOSC_VERSION}'")
+-    endif()
+-  endif()
++  find_package(blosc CONFIG REQUIRED)
+ else()
+   message(WARNING "Blosc support is disabled. It is strongly recommended to "
+     "enable blosc for optimal builds of OpenVDB and to support compatible "
+@@ -228,7 +209,11 @@ endif()
+ # /usr/local
+ 
+ if(USE_BLOSC)
+-  list(APPEND OPENVDB_CORE_DEPENDENT_LIBS Blosc::blosc)
++  if(BUILD_SHARED_LIBS)
++    list(APPEND OPENVDB_CORE_DEPENDENT_LIBS blosc_shared)
++  else()
++    list(APPEND OPENVDB_CORE_DEPENDENT_LIBS blosc_static)
++  endif()
+ endif()
+ 
+ if(USE_BLOSC OR USE_ZLIB)
+diff --git a/openvdb_cmd/CMakeLists.txt b/openvdb_cmd/CMakeLists.txt
+index c4351f49..b4803341 100644
+--- a/openvdb_cmd/CMakeLists.txt
++++ b/openvdb_cmd/CMakeLists.txt
+@@ -53,7 +53,7 @@ if(CONCURRENT_MALLOC STREQUAL "Jemalloc")
+   find_package(Jemalloc REQUIRED)
+   list(APPEND OPENVDB_BINARIES_DEPENDENT_LIBS Jemalloc::jemalloc)
+ elseif(CONCURRENT_MALLOC STREQUAL "Tbbmalloc")
+-  find_package(TBB ${MINIMUM_TBB_VERSION} REQUIRED COMPONENTS tbbmalloc)
++  find_package(TBB CONFIG REQUIRED)
+   list(APPEND OPENVDB_BINARIES_DEPENDENT_LIBS TBB::tbbmalloc)
+ endif()
+ 
diff --git a/external_imported/vcpkg/ports/openvdb/fix_nanovdb.patch b/external_imported/vcpkg/ports/openvdb/fix_nanovdb.patch
new file mode 100644
index 000000000..91a310d25
--- /dev/null
+++ b/external_imported/vcpkg/ports/openvdb/fix_nanovdb.patch
@@ -0,0 +1,22 @@
+diff --git a/nanovdb/nanovdb/CMakeLists.txt b/nanovdb/nanovdb/CMakeLists.txt
+index 7bb3ab86..9311ed17 100644
+--- a/nanovdb/nanovdb/CMakeLists.txt
++++ b/nanovdb/nanovdb/CMakeLists.txt
+@@ -127,7 +127,7 @@ if(NANOVDB_USE_TBB AND NOT TARGET TBB::tbb)
+ endif()
+ 
+ if(NANOVDB_USE_BLOSC AND NOT TARGET Blosc::blosc)
+-  find_package(Blosc REQUIRED)
++  find_package(Blosc REQUIRED NAMES blosc)
+ endif()
+ 
+ if(NANOVDB_USE_ZLIB AND NOT TARGET ZLIB::ZLIB)
+@@ -236,7 +236,7 @@ if(NANOVDB_USE_TBB)
+ endif()
+ 
+ if(NANOVDB_USE_BLOSC)
+-  target_link_libraries(nanovdb INTERFACE Blosc::blosc)
++  target_link_libraries(nanovdb INTERFACE $<IF:$<TARGET_EXISTS:blosc_shared>,blosc_shared,blosc_static>)
+   target_compile_definitions(nanovdb INTERFACE -DNANOVDB_USE_BLOSC)
+ endif()
+ 
diff --git a/external_imported/vcpkg/ports/openvdb/portfile.cmake b/external_imported/vcpkg/ports/openvdb/portfile.cmake
index da6297ebe..b55e1f89d 100644
--- a/external_imported/vcpkg/ports/openvdb/portfile.cmake
+++ b/external_imported/vcpkg/ports/openvdb/portfile.cmake
@@ -1,10 +1,11 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO AcademySoftwareFoundation/openvdb
-    REF be0e7a78861d2b7d9643f7a0cab04f3ab5951686 # v10.0.0
-    SHA512 92301bf675d700fedb0a2b3c4653158eeda6105e70623e5e4bda15d73391427cf0295a0426204888e2fe062847025542717bff34ceb923e51cffa1721e9d4105
+    REF "v${VERSION}"
+    SHA512 f2c90ca8435ecbacefda429341000ecb555385c746a3e0233220cd78540cee2a26cc17df7b560fdfe2dc03f2b2e960a2fa226a85980189c3e018164ccc037bd4
     PATCHES
-        0003-fix-cmake.patch
+        fix_cmake.patch
+        fix_nanovdb.patch
 )
 
 file(REMOVE "${SOURCE_PATH}/cmake/FindTBB.cmake")
@@ -19,15 +20,18 @@ vcpkg_check_features(
     OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
         "tools" OPENVDB_BUILD_TOOLS
+        "ax"    OPENVDB_BUILD_AX
+        "nanovdb" OPENVDB_BUILD_NANOVDB
 )
 
-
-if ("ax" IN_LIST FEATURES)
-  if(NOT VCPKG_TARGET_IS_WINDOWS)
-    set(OPENVDB_BUILD_AX ON)
-  else()
-    message(FATAL_ERROR "Currently no support for building OpenVDB AX on Windows.")  
-  endif()
+if (OPENVDB_BUILD_NANOVDB)
+    set(NANOVDB_OPTIONS
+    -DNANOVDB_BUILD_TOOLS=OFF
+    -DNANOVDB_USE_INTRINSICS=ON
+    -DNANOVDB_USE_CUDA=ON
+    -DNANOVDB_CUDA_KEEP_PTX=ON
+    -DNANOVDB_USE_OPENVDB=ON
+)
 endif()
 
 vcpkg_cmake_configure(
@@ -35,9 +39,8 @@ vcpkg_cmake_configure(
     OPTIONS
         -DOPENVDB_BUILD_UNITTESTS=OFF
         -DOPENVDB_BUILD_PYTHON_MODULE=OFF
-        -DOPENVDB_ENABLE_3_ABI_COMPATIBLE=OFF
+        -DOPENVDB_3_ABI_COMPATIBLE=OFF
         -DUSE_EXR=ON
-        -DUSE_GLFW3=ON
         -DUSE_IMATH_HALF=ON
         -DOPENVDB_CORE_STATIC=${OPENVDB_STATIC}
         -DOPENVDB_CORE_SHARED=${OPENVDB_SHARED}
@@ -46,7 +49,12 @@ vcpkg_cmake_configure(
         -DOPENVDB_BUILD_VDB_RENDER=${OPENVDB_BUILD_TOOLS}
         -DOPENVDB_BUILD_VDB_LOD=${OPENVDB_BUILD_TOOLS}
         -DUSE_PKGCONFIG=OFF
-        ${OPENVDB_BUILD_AX}
+        ${FEATURE_OPTIONS}
+        -DUSE_EXPLICIT_INSTANTIATION=OFF
+        ${NANOVDB_OPTIONS}
+    MAYBE_UNUSED_VARIABLES
+        OPENVDB_3_ABI_COMPATIBLE
+        OPENVDB_BUILD_TOOLS
 )
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/openvdb/vcpkg.json b/external_imported/vcpkg/ports/openvdb/vcpkg.json
index ea60355ac..e0ae6104d 100644
--- a/external_imported/vcpkg/ports/openvdb/vcpkg.json
+++ b/external_imported/vcpkg/ports/openvdb/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "openvdb",
-  "version": "10.0.0",
-  "port-version": 2,
+  "version": "11.0.0",
   "description": "Sparse volume data structure and tools",
   "homepage": "https://github.com/dreamworksanimation/openvdb",
   "license": "MPL-2.0",
+  "supports": "!xbox",
   "dependencies": [
     "blosc",
     "boost-any",
@@ -29,7 +29,20 @@
   ],
   "features": {
     "ax": {
-      "description": "Provides a powerful and easy way of interacting with OpenVDB volume and point data."
+      "description": "Provides a powerful and easy way of interacting with OpenVDB volume and point data.",
+      "supports": "!windows",
+      "dependencies": [
+        {
+          "name": "llvm",
+          "default-features": false
+        }
+      ]
+    },
+    "nanovdb": {
+      "description": "A lightweight GPU friendly version of VDB initially targeting rendering applications",
+      "dependencies": [
+        "cuda"
+      ]
     },
     "tools": {
       "description": "OpenVDB utilities: view, print and render",
diff --git a/external_imported/vcpkg/ports/openvino/001-disable-tools.patch b/external_imported/vcpkg/ports/openvino/001-disable-tools.patch
new file mode 100644
index 000000000..a74fba266
--- /dev/null
+++ b/external_imported/vcpkg/ports/openvino/001-disable-tools.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e4d31492a4..38c009b3cb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -151,7 +151,7 @@ endif()
+ 
+ include(cmake/extra_modules.cmake)
+ add_subdirectory(docs)
+-add_subdirectory(tools)
++# add_subdirectory(tools)
+ add_subdirectory(scripts)
+ add_subdirectory(licensing)
+ 
diff --git a/external_imported/vcpkg/ports/openvino/002-conditional-enabling-of-js-api.patch b/external_imported/vcpkg/ports/openvino/002-conditional-enabling-of-js-api.patch
new file mode 100644
index 000000000..f858f654a
--- /dev/null
+++ b/external_imported/vcpkg/ports/openvino/002-conditional-enabling-of-js-api.patch
@@ -0,0 +1,45 @@
+diff --git a/cmake/features.cmake b/cmake/features.cmake
+index 6e383edeeb..aadd1db976 100644
+--- a/cmake/features.cmake
++++ b/cmake/features.cmake
+@@ -177,6 +177,9 @@ ov_dependent_option (ENABLE_SYSTEM_SNAPPY "Enables use of system version of Snap
+ ov_dependent_option (ENABLE_PYTHON_PACKAGING "Enables packaging of Python API in APT / YUM" OFF
+     "ENABLE_PYTHON;UNIX" OFF)
+ 
++ov_dependent_option (ENABLE_JS "Enables JS API building" ON
++    "NOT WIN32" OFF)
++
+ ov_option(ENABLE_OPENVINO_DEBUG "Enable output for OPENVINO_DEBUG statements" OFF)
+ 
+ if(NOT BUILD_SHARED_LIBS AND ENABLE_OV_TF_FRONTEND)
+diff --git a/src/bindings/js/CMakeLists.txt b/src/bindings/js/CMakeLists.txt
+index 329a86c2fa..20bf139a54 100644
+--- a/src/bindings/js/CMakeLists.txt
++++ b/src/bindings/js/CMakeLists.txt
+@@ -2,6 +2,10 @@
+ # SPDX-License-Identifier: Apache-2.0
+ #
+ 
++if(NOT ENABLE_JS)
++    return()
++endif()
++
+ project(OpenVINO_JS_API)
+ 
+ add_subdirectory(node)
+diff --git a/src/bindings/js/node/CMakeLists.txt b/src/bindings/js/node/CMakeLists.txt
+index cc8918155f..fffceb5679 100644
+--- a/src/bindings/js/node/CMakeLists.txt
++++ b/src/bindings/js/node/CMakeLists.txt
+@@ -2,10 +2,6 @@
+ # SPDX-License-Identifier: Apache-2.0
+ #
+ 
+-if(WIN32)
+-    return()
+-endif()
+-
+ if(CMAKE_VERSION VERSION_LESS 3.14)
+     message(WARNING "JS API is not available with CMake version less than 3.14, skipping")
+     return()
+
diff --git a/external_imported/vcpkg/ports/openvino/portfile.cmake b/external_imported/vcpkg/ports/openvino/portfile.cmake
new file mode 100644
index 000000000..352b8fb85
--- /dev/null
+++ b/external_imported/vcpkg/ports/openvino/portfile.cmake
@@ -0,0 +1,143 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO openvinotoolkit/openvino
+    REF "${VERSION}"
+    SHA512 d31428a02e6869e367c00a714c5599cf84fc9839376dfc4511d2abdb4aac991fc58331318102cdc248f568ca8df0bdc7f65a6744ef2dfa52d85a60a1ec77aae9
+    PATCHES
+        # vcpkg specific patch, because OV creates a file in source tree, which is prohibited
+        001-disable-tools.patch
+        # https://github.com/openvinotoolkit/openvino/pull/22139
+        002-conditional-enabling-of-js-api.patch
+    HEAD_REF master)
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        cpu             ENABLE_INTEL_CPU
+        gpu             ENABLE_INTEL_GPU
+        auto            ENABLE_AUTO
+        hetero          ENABLE_HETERO
+        auto-batch      ENABLE_AUTO_BATCH
+        ir              ENABLE_OV_IR_FRONTEND
+        onnx            ENABLE_OV_ONNX_FRONTEND
+        paddle          ENABLE_OV_PADDLE_FRONTEND
+        pytorch         ENABLE_OV_PYTORCH_FRONTEND
+        tensorflow      ENABLE_OV_TF_FRONTEND
+        tensorflow-lite ENABLE_OV_TF_LITE_FRONTEND
+)
+
+if(ENABLE_INTEL_GPU)
+    # python is required for conversion of OpenCL source files into .cpp.
+    vcpkg_find_acquire_program(PYTHON3)
+
+    # remove 'rapidjson' directory and use vcpkg's one to comply with ODR
+    file(REMOVE_RECURSE ${SOURCE_PATH}/src/plugins/intel_gpu/thirdparty/rapidjson)
+
+    if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" AND ENABLE_INTEL_CPU)
+        message(WARNING
+            "OneDNN for GPU is not available for static build, which is required for dGPU."
+            "Please, consider using VCPKG_LIBRARY_LINKAGE=\"dynamic\" or disable CPU plugin,"
+            "which uses another flavor of oneDNN.")
+    else()
+        vcpkg_from_github(
+            OUT_SOURCE_PATH DEP_SOURCE_PATH
+            REPO oneapi-src/oneDNN
+            REF cb77937ffcf5e83b5d1cf2940c94e8b508d8f7b4
+            SHA512 30ede7480c5563753256b6c30360c72a63489d5225ab683601ad8c4654bedf17879ae36cdf4be6423707116eca71adbd92790bb643234c7a3b99dc6e4cfdf200
+        )
+        file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_gpu/thirdparty/onednn_gpu")
+    endif()
+
+    list(APPEND FEATURE_OPTIONS
+        "-DENABLE_SYSTEM_OPENCL=ON"
+        "-DPython3_EXECUTABLE=${PYTHON3}")
+endif()
+
+if(ENABLE_INTEL_CPU)
+    vcpkg_from_github(
+        OUT_SOURCE_PATH DEP_SOURCE_PATH
+        REPO openvinotoolkit/oneDNN
+        REF cb3060bbf4694e46a1359a3d4dfe70500818f72d
+        SHA512 48d28273ffdfb82ad1dc6b152c812fa09ffcac387c7851e5b1393aa473ce51f9bf114d2bd462cf2003f4897907de32ab68cd2f414459c588b3155b545f3099a4
+    )
+    file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_cpu/thirdparty/onednn")
+
+    vcpkg_from_github(
+        OUT_SOURCE_PATH DEP_SOURCE_PATH
+        REPO openvinotoolkit/mlas
+        REF 7a35e48a723944972088627be1a8b60841e8f6a5
+        SHA512 3094355e4d062457e6ec0b535b7dabbee5cf7257d05f7807b34a162614c96e8a6567d3fed8e955d70a69a15f26004e79a397e4d586ea81ed7b76a65dcd96a2a8
+    )
+    file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_cpu/thirdparty/mlas")
+
+    if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm")
+        # scons (python tool) is required for ARM Compute Library building
+        vcpkg_find_acquire_program(PYTHON3)
+
+        x_vcpkg_get_python_packages(
+            PYTHON_VERSION 3
+            PYTHON_EXECUTABLE ${PYTHON3}
+            PACKAGES scons
+            OUT_PYTHON_VAR OV_PYTHON_WITH_SCONS
+        )
+
+        vcpkg_from_github(
+            OUT_SOURCE_PATH DEP_SOURCE_PATH
+            REPO ARM-software/ComputeLibrary
+            REF v23.08
+            SHA512 8379fdf804732ef4e69a3e91807810d413f35855d035cfde9d81059679f62cd625c0347f07dc1f76468dc82c06217a5ae8df25b4581a29558ac32b2a4f7d8af4
+        )
+        file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_cpu/thirdparty/ComputeLibrary")
+    endif()
+endif()
+
+if(ENABLE_OV_TF_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_PADDLE_FRONTEND)
+    list(APPEND FEATURE_OPTIONS "-DENABLE_SYSTEM_PROTOBUF=ON")
+endif()
+
+if(ENABLE_OV_TF_FRONTEND)
+    list(APPEND FEATURE_OPTIONS "-DENABLE_SYSTEM_SNAPPY=ON")
+endif()
+
+if(ENABLE_OV_TF_LITE_FRONTEND)
+    list(APPEND FEATURE_OPTIONS "-DENABLE_SYSTEM_FLATBUFFERS=ON")
+endif()
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        ${FEATURE_OPTIONS}
+        "-DENABLE_SYSTEM_TBB=ON"
+        "-DENABLE_SYSTEM_PUGIXML=ON"
+        "-DENABLE_TBBBIND_2_5=OFF"
+        "-DENABLE_CLANG_FORMAT=OFF"
+        "-DENABLE_NCC_STYLE=OFF"
+        "-DENABLE_CPPLINT=OFF"
+        "-DENABLE_SAMPLES=OFF"
+        "-DENABLE_TEMPLATE=OFF"
+        "-DENABLE_INTEL_GNA=OFF"
+        "-DENABLE_PYTHON=OFF"
+        "-DENABLE_GAPI_PREPROCESSING=OFF"
+        "-DCPACK_GENERATOR=VCPKG"
+        "-DENABLE_JS=OFF"
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup()
+
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+
+vcpkg_install_copyright(
+    FILE_LIST
+        "${SOURCE_PATH}/LICENSE"
+        "${SOURCE_PATH}/licensing/third-party-programs.txt"
+        "${SOURCE_PATH}/licensing/onednn_third-party-programs.txt"
+        "${SOURCE_PATH}/licensing/runtime-third-party-programs.txt"
+    COMMENT
+        "OpenVINO License")
+
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/openvino/usage b/external_imported/vcpkg/ports/openvino/usage
new file mode 100644
index 000000000..ede01545d
--- /dev/null
+++ b/external_imported/vcpkg/ports/openvino/usage
@@ -0,0 +1,10 @@
+The package OpenVINO can be used in cmake scripts as:
+
+    find_package(OpenVINO REQUIRED)
+    target_link_libraries(main PRIVATE openvino::runtime)
+
+Note: static build of Intel GPU plugin disables usage of oneDNN for GPU, which is important
+for decent performance on discrete GPU devices. If you want to levarage performance of dGPU,
+please, consider either option:
+- Building with 'VCPKG_LIBRARY_LINKAGE=dynamic'
+- Disable Intel CPU plugin, because it uses different oneDNN flavor
diff --git a/external_imported/vcpkg/ports/openvino/vcpkg.json b/external_imported/vcpkg/ports/openvino/vcpkg.json
new file mode 100644
index 000000000..32a23fd56
--- /dev/null
+++ b/external_imported/vcpkg/ports/openvino/vcpkg.json
@@ -0,0 +1,155 @@
+{
+  "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
+  "name": "openvino",
+  "version": "2023.3.0",
+  "maintainers": "OpenVINO Developers <openvino@intel.com>",
+  "summary": "This is a port for Open Visual Inference And Optimization toolkit for AI inference",
+  "description": [
+    "Intel® Distribution of OpenVINO™ toolkit is an open-source toolkit for optimizing ",
+    "and deploying AI inference. It can be used to develop applications and solutions based ",
+    "on deep learning tasks, such as: emulation of human vision, automatic speech recognition, ",
+    "natural language processing, recommendation systems, etc. It provides high-performance ",
+    "and rich deployment options, from edge to cloud"
+  ],
+  "homepage": "https://github.com/openvinotoolkit/openvino",
+  "documentation": "https://docs.openvino.ai/latest/index.html",
+  "license": "Apache-2.0",
+  "supports": "!uwp & !x86",
+  "dependencies": [
+    {
+      "name": "pkgconf",
+      "host": true
+    },
+    "pugixml",
+    {
+      "name": "tbb",
+      "version>=": "2021.10.0#2"
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    {
+      "name": "vcpkg-get-python-packages",
+      "host": true
+    },
+    {
+      "name": "xbyak",
+      "platform": "!(arm | uwp)",
+      "version>=": "6.69"
+    }
+  ],
+  "default-features": [
+    "auto",
+    "auto-batch",
+    {
+      "name": "cpu",
+      "platform": "!(windows & arm)"
+    },
+    {
+      "name": "gpu",
+      "platform": "x64 & !(osx | uwp)"
+    },
+    "hetero",
+    "ir",
+    "onnx",
+    "paddle",
+    "pytorch",
+    "tensorflow",
+    "tensorflow-lite"
+  ],
+  "features": {
+    "auto": {
+      "description": "Enables Auto plugin for inference"
+    },
+    "auto-batch": {
+      "description": "Enables Auto Batch plugin for inference, useful for throughput mode"
+    },
+    "cpu": {
+      "description": "Enables CPU plugin for inference",
+      "supports": "!(windows & arm)"
+    },
+    "gpu": {
+      "description": "Enables GPU plugin for inference",
+      "supports": "x64 & !(osx | uwp)",
+      "dependencies": [
+        "opencl",
+        "rapidjson"
+      ]
+    },
+    "hetero": {
+      "description": "Enables Hetero plugin for inference"
+    },
+    "ir": {
+      "description": "Enables IR frontend for reading models in OpenVINO IR format"
+    },
+    "onnx": {
+      "description": "Enables ONNX frontend for reading models in ONNX format",
+      "dependencies": [
+        {
+          "name": "onnx",
+          "version>=": "1.13.1"
+        },
+        {
+          "name": "protobuf",
+          "version>=": "3.21.2"
+        },
+        {
+          "name": "protobuf",
+          "host": true,
+          "version>=": "3.21.2"
+        }
+      ]
+    },
+    "paddle": {
+      "description": "Enables PaddlePaddle frontend for reading models in PaddlePaddle format",
+      "dependencies": [
+        {
+          "name": "protobuf",
+          "version>=": "3.21.2"
+        },
+        {
+          "name": "protobuf",
+          "host": true,
+          "version>=": "3.21.2"
+        }
+      ]
+    },
+    "pytorch": {
+      "description": "Enables PyTorch frontend to convert models in PyTorch format"
+    },
+    "tensorflow": {
+      "description": "Enables TensorFlow frontend for reading models in TensorFlow format",
+      "dependencies": [
+        {
+          "name": "protobuf",
+          "version>=": "3.21.2"
+        },
+        {
+          "name": "protobuf",
+          "host": true,
+          "version>=": "3.21.2"
+        },
+        "snappy"
+      ]
+    },
+    "tensorflow-lite": {
+      "description": "Enables TensorFlow Lite frontend for reading models in TensorFlow Lite format",
+      "dependencies": [
+        {
+          "name": "flatbuffers",
+          "version>=": "2.0.6"
+        },
+        {
+          "name": "flatbuffers",
+          "host": true,
+          "version>=": "2.0.6"
+        }
+      ]
+    }
+  }
+}
diff --git a/external_imported/vcpkg/ports/openvpn3/vcpkg.json b/external_imported/vcpkg/ports/openvpn3/vcpkg.json
index cac878896..b96855c9a 100644
--- a/external_imported/vcpkg/ports/openvpn3/vcpkg.json
+++ b/external_imported/vcpkg/ports/openvpn3/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "openvpn3",
   "version": "3.7.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "a C++ class library that implements the functionality of an OpenVPN client, and is protocol-compatible with the OpenVPN 2.x branch.",
   "homepage": "https://openvpn.net",
   "license": "AGPL-3.0",
+  "supports": "!xbox",
   "dependencies": [
     "asio",
     "mbedtls",
diff --git a/external_imported/vcpkg/ports/openxr-loader/002-fix-hpp-gen.patch b/external_imported/vcpkg/ports/openxr-loader/002-fix-hpp-gen.patch
deleted file mode 100644
index 9f58f7626..000000000
--- a/external_imported/vcpkg/ports/openxr-loader/002-fix-hpp-gen.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/scripts/hpp_genxr.py b/scripts/hpp_genxr.py
-index 6b95fe4..3a19058 100755
---- a/scripts/hpp_genxr.py
-+++ b/scripts/hpp_genxr.py
-@@ -80,6 +80,11 @@ def genTarget(args):
-             "XR_MSFT_controller_model",
-             # Projection of static string fails
-             "XR_MSFT_spatial_graph_bridge",
-+            "XR_MSFT_spatial_anchor_persistence",
-+            "XR_MSFT_holographic_window_attachment",
-+            # Projection of UuidMSFT fails
-+            "XR_MSFT_scene_understanding",
-+            "XR_MSFT_scene_understanding_serialization",
-         ))
- 
-     # Turn lists of names/patterns into matching regular expressions
diff --git a/external_imported/vcpkg/ports/openxr-loader/portfile.cmake b/external_imported/vcpkg/ports/openxr-loader/portfile.cmake
index 04a518602..4d1127e56 100644
--- a/external_imported/vcpkg/ports/openxr-loader/portfile.cmake
+++ b/external_imported/vcpkg/ports/openxr-loader/portfile.cmake
@@ -2,8 +2,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KhronosGroup/OpenXR-SDK
-    REF release-1.0.22
-    SHA512 fe3c393c2d11981b42355acd8dbc337727120bcd0ff595abac1975c4ce5f68bb74a9a1b4c959e64e9a847ae5d504100d31979ffd7d9702c55b2dbd889de17d3e
+    REF "release-${VERSION}"
+    SHA512 6efc7596e707f95366dbcdbac9bd7d0c20735a2175b4edf56a9e8a112cf0ab8b664069fe942313164a37119032ddbf5671bc88ab5f276005dd36e4a4dabba1c7
     HEAD_REF master
     PATCHES
         fix-openxr-sdk-jsoncpp.patch
@@ -12,8 +12,8 @@ vcpkg_from_github(
 vcpkg_from_github(
     OUT_SOURCE_PATH SDK_SOURCE_PATH
     REPO KhronosGroup/OpenXR-SDK-Source
-    REF release-1.0.22
-    SHA512 92802d57a45ca1d697d3cea1b3f5619af4ba36156cb28c2c39b2295a74ebc45907caf371c916c54ec3be44a2f3ae447ffc1cd62f54b7b24f7a081408328c7651
+    REF "release-${VERSION}"
+    SHA512 04bdb0f16078209b5edd175a3396f70e1ceb8cfa382c65b8fda388e565480e3844daf68e0d987e72ed8c21d3148af0b41a2170911ec1660565887e0e5ae6d2bf
     HEAD_REF master
     PATCHES
         fix-openxr-sdk-jsoncpp.patch
@@ -23,11 +23,11 @@ vcpkg_from_github(
 vcpkg_from_github(
     OUT_SOURCE_PATH HPP_SOURCE_PATH
     REPO KhronosGroup/OpenXR-hpp
-    REF release-1.0.21
-    SHA512 cda111f20392a64d5f4de6bd71f1fe7fe39d688bb2376c6b1841763459e32fd6d03b9552804b5ee464ba84cd4c05cfdaa1a6e8a8e5da3eae6b94c7797c65cb36
+    REF 63db9919822f8af6f7bf7416ba6a015d4617202e
+    SHA512 9e768f485d1631f8e74f35f028a64e2d64e33d362c53ae1c54427a10786e3befdd24089927319aa1a4b4c3e010247bd6cb3394bcee460c467c637ab6bc7bec90
     HEAD_REF master
     PATCHES
-        002-fix-hpp-gen.patch
+        python3_8_compatibility.patch
 )
 
 # Weird behavior inside the OpenXR loader.  On Windows they force shared libraries to use static crt, and
@@ -57,16 +57,13 @@ vcpkg_cmake_configure(
 
 vcpkg_cmake_install()
 
-# Generate the OpenXR C++ bindings 
+# Generate the OpenXR C++ bindings
 set(ENV{OPENXR_REPO} "${SDK_SOURCE_PATH}")
-file(STRINGS "${HPP_SOURCE_PATH}/headers.txt" HEADER_LIST REGEX "^openxr.*")
-foreach(HEADER ${HEADER_LIST})
-    vcpkg_execute_required_process(
-        COMMAND ${PYTHON3} "${HPP_SOURCE_PATH}/scripts/hpp_genxr.py" -registry "${SDK_SOURCE_PATH}/specification/registry/xr.xml" -o "${CURRENT_PACKAGES_DIR}/include/openxr" ${HEADER}
-        WORKING_DIRECTORY "${HPP_SOURCE_PATH}"
-        LOGNAME openxrhpp
-    )
-endforeach()
+vcpkg_execute_required_process(
+    COMMAND ${PYTHON3} "${HPP_SOURCE_PATH}/scripts/hpp_genxr.py" -quiet  -registry "${SDK_SOURCE_PATH}/specification/registry/xr.xml" -o "${CURRENT_PACKAGES_DIR}/include/openxr"
+    WORKING_DIRECTORY "${HPP_SOURCE_PATH}"
+    LOGNAME "openxr-hpp"
+)
 
 if(VCPKG_TARGET_IS_WINDOWS)
     vcpkg_cmake_config_fixup(PACKAGE_NAME OpenXR CONFIG_PATH cmake)
diff --git a/external_imported/vcpkg/ports/openxr-loader/python3_8_compatibility.patch b/external_imported/vcpkg/ports/openxr-loader/python3_8_compatibility.patch
new file mode 100644
index 000000000..657bb2b7a
--- /dev/null
+++ b/external_imported/vcpkg/ports/openxr-loader/python3_8_compatibility.patch
@@ -0,0 +1,13 @@
+diff --git a/scripts/hpp_genxr.py b/scripts/hpp_genxr.py
+index ce419b0..23e1d3d 100644
+--- a/scripts/hpp_genxr.py
++++ b/scripts/hpp_genxr.py
+@@ -36,7 +36,7 @@ from xrconventions import OpenXRConventions
+ from data import EXCLUDED_EXTENSIONS
+
+
+-def makeREstring(strings: Iterable[str], default: typing.Optional[str] = None) -> str:
++def makeREstring(strings, default: typing.Optional[str] = None) -> str:
+     """Turn a list of strings into a regexp string matching exactly those strings."""
+     if strings or default is None:
+         return f"^({'|'.join(re.escape(s) for s in strings)})$"
diff --git a/external_imported/vcpkg/ports/openxr-loader/vcpkg.json b/external_imported/vcpkg/ports/openxr-loader/vcpkg.json
index c2e6b9a40..a45e3c919 100644
--- a/external_imported/vcpkg/ports/openxr-loader/vcpkg.json
+++ b/external_imported/vcpkg/ports/openxr-loader/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "openxr-loader",
-  "version": "1.0.22",
-  "port-version": 3,
+  "version": "1.0.31",
   "description": "A royalty-free, open standard that provides high-performance access to Augmented Reality (AR) and Virtual Reality (VR)—collectively known as XR—platforms and devices",
   "homepage": "https://github.com/KhronosGroup/OpenXR-SDK",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/optional-bare/vcpkg.json b/external_imported/vcpkg/ports/optional-bare/vcpkg.json
index f6d4b07da..a358a79d8 100644
--- a/external_imported/vcpkg/ports/optional-bare/vcpkg.json
+++ b/external_imported/vcpkg/ports/optional-bare/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "optional-bare",
-  "version-string": "1.1.0",
-  "port-version": 2,
+  "version": "1.1.0",
+  "port-version": 3,
   "description": "A simple version of a C++17-like optional for default-constructible, copyable types, for C++98 and later in a single-file header-only library",
   "dependencies": [
     {
diff --git a/external_imported/vcpkg/ports/opus/fix-pkgconfig-version.patch b/external_imported/vcpkg/ports/opus/fix-pkgconfig-version.patch
index e513b6199..ef9f7229c 100644
--- a/external_imported/vcpkg/ports/opus/fix-pkgconfig-version.patch
+++ b/external_imported/vcpkg/ports/opus/fix-pkgconfig-version.patch
@@ -1,13 +1,15 @@
-diff --git a/opus_functions.cmake b/opus_functions.cmake
-index a3ac1c0..ef2d4c0 100644
---- a/opus_functions.cmake
-+++ b/opus_functions.cmake
-@@ -43,6 +43,8 @@ function(get_library_version OPUS_LIBRARY_VERSION OPUS_LIBRARY_VERSION_MAJOR)
- endfunction()
+diff --git a/cmake/OpusPackageVersion.cmake b/cmake/OpusPackageVersion.cmake
+index 447ce3b..15ebd8e 100644
+--- a/cmake/OpusPackageVersion.cmake
++++ b/cmake/OpusPackageVersion.cmake
+@@ -4,7 +4,9 @@ endif()
+ set(__opus_version INCLUDED)
  
- function(get_package_version PACKAGE_VERSION)
+ function(get_package_version PACKAGE_VERSION PROJECT_VERSION)
+-
 +  set(PACKAGE_VERSION "0" CACHE STRING "opus package version")
++  set(PROJECT_VERSION "0" CACHE STRING "opus project version")
 +  return()
    find_package(Git)
-   if(Git_FOUND AND EXISTS "${CMAKE_CURRENT_LIST_DIR}/.git")
-     execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --match "v*"
+   if(GIT_FOUND AND EXISTS "${CMAKE_CURRENT_LIST_DIR}/.git")
+     execute_process(COMMAND ${GIT_EXECUTABLE}
diff --git a/external_imported/vcpkg/ports/opus/portfile.cmake b/external_imported/vcpkg/ports/opus/portfile.cmake
index e42acf3a3..9638e34d5 100644
--- a/external_imported/vcpkg/ports/opus/portfile.cmake
+++ b/external_imported/vcpkg/ports/opus/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO xiph/opus
-    REF 5c94ec3205c30171ffd01056f5b4622b7c0ab54c
-    SHA512 2423b1fc86d5b46c32d8e3bde5fc2b410a5c25c001995ce234a94a3a6c7a8b1446fdf19eafe9d6a8a7356fe0857697053db5eb8380d18f8111818aa770b4c4ea
+    REF "v${VERSION}"
+    SHA512 86df35cd62ebf3551b2739effb8f818d635656d91d386d7d600a424a92c4c0d6bfbc3986f1ec6cf4950910ac87b28dc9640b9df3b9a6a5a75eb37ae71782b72e
     HEAD_REF master
     PATCHES fix-pkgconfig-version.patch
 )
@@ -30,7 +30,7 @@ endif()
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS ${FEATURE_OPTIONS}
-        -DPACKAGE_VERSION=1.3.1
+        -DPACKAGE_VERSION=${VERSION}
         -DOPUS_STACK_PROTECTOR=${STACK_PROTECTOR}
         -DOPUS_INSTALL_PKG_CONFIG_MODULE=ON
         -DOPUS_INSTALL_CMAKE_CONFIG_MODULE=ON
diff --git a/external_imported/vcpkg/ports/opus/vcpkg.json b/external_imported/vcpkg/ports/opus/vcpkg.json
index cc909fc47..33c35ee47 100644
--- a/external_imported/vcpkg/ports/opus/vcpkg.json
+++ b/external_imported/vcpkg/ports/opus/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "opus",
-  "version": "1.3.1",
-  "port-version": 9,
+  "version": "1.4",
   "description": "Totally open, royalty-free, highly versatile audio codec",
   "homepage": "https://github.com/xiph/opus",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/orc/0003-dependencies-from-vcpkg.patch b/external_imported/vcpkg/ports/orc/0003-dependencies-from-vcpkg.patch
deleted file mode 100644
index fdabe356d..000000000
--- a/external_imported/vcpkg/ports/orc/0003-dependencies-from-vcpkg.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt
-index d4cd035..0701a7d 100644
---- a/c++/src/CMakeLists.txt
-+++ b/c++/src/CMakeLists.txt
-@@ -239,12 +239,13 @@ endif(BUILD_LIBHDFSPP)
- add_library (orc STATIC ${SOURCE_FILES})
- 
- target_link_libraries (orc
--  orc::protobuf
--  orc::zlib
--  orc::snappy
--  orc::lz4
--  orc::zstd
--  ${LIBHDFSPP_LIBRARIES}
-+  PRIVATE
-+    protobuf::libprotobuf
-+    ZLIB::ZLIB
-+    Snappy::snappy
-+    lz4::lz4
-+    $<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>
-+    ${LIBHDFSPP_LIBRARIES}
-   )
- 
- install(TARGETS orc DESTINATION lib)
-diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake
-index 6919847..ad52cf2 100644
---- a/cmake_modules/ThirdpartyToolchain.cmake
-+++ b/cmake_modules/ThirdpartyToolchain.cmake
-@@ -66,8 +66,8 @@ endif ()
- # ----------------------------------------------------------------------
- # Snappy
- 
--if (NOT "${SNAPPY_HOME}" STREQUAL "")
--  find_package (Snappy REQUIRED)
-+if (1)
-+  find_package (Snappy CONFIG REQUIRED)
-   set(SNAPPY_VENDORED FALSE)
- else ()
-   set(SNAPPY_HOME "${THIRDPARTY_DIR}/snappy_ep-install")
-@@ -90,15 +90,6 @@ else ()
-   set(SNAPPY_VENDORED TRUE)
- endif ()
- 
--add_library (orc_snappy INTERFACE)
--add_library (orc::snappy ALIAS orc_snappy)
--if (ORC_PREFER_STATIC_SNAPPY AND ${SNAPPY_STATIC_LIB})
--  target_link_libraries(orc_snappy INTERFACE ${SNAPPY_STATIC_LIB})
--else ()
--  target_link_libraries(orc_snappy INTERFACE ${SNAPPY_LIBRARY})
--endif ()
--target_include_directories (orc_snappy SYSTEM INTERFACE ${SNAPPY_INCLUDE_DIR})
--
- if (SNAPPY_VENDORED)
-   add_dependencies (orc_snappy snappy_ep)
-   if (INSTALL_VENDORED_LIBS)
-@@ -110,7 +101,7 @@ endif ()
- # ----------------------------------------------------------------------
- # ZLIB
- 
--if (NOT "${ZLIB_HOME}" STREQUAL "")
-+if (1)
-   find_package (ZLIB REQUIRED)
-   set(ZLIB_VENDORED FALSE)
- else ()
-@@ -142,15 +133,6 @@ else ()
-   set(ZLIB_VENDORED TRUE)
- endif ()
- 
--add_library (orc_zlib INTERFACE)
--add_library (orc::zlib ALIAS orc_zlib)
--if (ORC_PREFER_STATIC_ZLIB AND ${ZLIB_STATIC_LIB})
--  target_link_libraries (orc_zlib INTERFACE ${ZLIB_STATIC_LIB})
--else ()
--  target_link_libraries (orc_zlib INTERFACE ${ZLIB_LIBRARY})
--endif ()
--target_include_directories (orc_zlib SYSTEM INTERFACE ${ZLIB_INCLUDE_DIR})
--
- if (ZLIB_VENDORED)
-   add_dependencies (orc_zlib zlib_ep)
-   if (INSTALL_VENDORED_LIBS)
-@@ -162,8 +144,8 @@ endif ()
- # ----------------------------------------------------------------------
- # Zstd
- 
--if (NOT "${ZSTD_HOME}" STREQUAL "")
--  find_package (ZSTD REQUIRED)
-+if (1)
-+  find_package (ZSTD CONFIG REQUIRED)
-   set(ZSTD_VENDORED FALSE)
- else ()
-   set(ZSTD_HOME "${THIRDPARTY_DIR}/zstd_ep-install")
-@@ -201,15 +183,6 @@ else ()
-   set(ZSTD_VENDORED TRUE)
- endif ()
- 
--add_library (orc_zstd INTERFACE)
--add_library (orc::zstd ALIAS orc_zstd)
--if (ORC_PREFER_STATIC_ZSTD AND ${ZSTD_STATIC_LIB})
--  target_link_libraries (orc_zstd INTERFACE ${ZSTD_STATIC_LIB})
--else ()
--  target_link_libraries (orc_zstd INTERFACE ${ZSTD_LIBRARY})
--endif ()
--target_include_directories (orc_zstd SYSTEM INTERFACE ${ZSTD_INCLUDE_DIR})
--
- if (ZSTD_VENDORED)
-   add_dependencies (orc_zstd zstd_ep)
-   if (INSTALL_VENDORED_LIBS)
-@@ -221,8 +194,8 @@ endif ()
- # ----------------------------------------------------------------------
- # LZ4
- 
--if (NOT "${LZ4_HOME}" STREQUAL "")
--  find_package (LZ4 REQUIRED)
-+if (1)
-+  find_package (LZ4 CONFIG REQUIRED)
-   set(LZ4_VENDORED FALSE)
- else ()
-   set(LZ4_PREFIX "${THIRDPARTY_DIR}/lz4_ep-install")
-@@ -253,15 +226,6 @@ else ()
-   set(LZ4_VENDORED TRUE)
- endif ()
- 
--add_library (orc_lz4 INTERFACE)
--add_library (orc::lz4 ALIAS orc_lz4)
--if (ORC_PREFER_STATIC_LZ4 AND ${LZ4_STATIC_LIB})
--  target_link_libraries (orc_lz4 INTERFACE ${LZ4_STATIC_LIB})
--else ()
--  target_link_libraries (orc_lz4 INTERFACE ${LZ4_LIBRARY})
--endif ()
--target_include_directories (orc_lz4 SYSTEM INTERFACE ${LZ4_INCLUDE_DIR})
--
- if (LZ4_VENDORED)
-   add_dependencies (orc_lz4 lz4_ep)
-   if (INSTALL_VENDORED_LIBS)
-@@ -273,7 +237,7 @@ endif ()
- # ----------------------------------------------------------------------
- # IANA - Time Zone Database
- 
--if (WIN32)
-+if (WIN32 AND TEST_VALGRIND_MEMCHECK)
-   SET(CURRENT_TZDATA_FILE "")
-   SET(CURRENT_TZDATA_SHA512 "")
-   File(DOWNLOAD "https://ftp.osuosl.org/pub/cygwin/noarch/release/tzdata/sha512.sum" ${CMAKE_CURRENT_BINARY_DIR}/sha512.sum)
-@@ -372,8 +336,8 @@ endif ()
- # ----------------------------------------------------------------------
- # Protobuf
- 
--if (NOT "${PROTOBUF_HOME}" STREQUAL "")
--  find_package (Protobuf REQUIRED)
-+if (1)
-+  find_package (Protobuf CONFIG REQUIRED)
-   set(PROTOBUF_VENDORED FALSE)
- else ()
-   set(PROTOBUF_PREFIX "${THIRDPARTY_DIR}/protobuf_ep-install")
-@@ -421,19 +385,7 @@ add_library (orc::protobuf ALIAS orc_protobuf)
- add_library (orc_protoc INTERFACE)
- add_library (orc::protoc ALIAS orc_protoc)
- 
--if (ORC_PREFER_STATIC_PROTOBUF AND ${PROTOBUF_STATIC_LIB})
--  target_link_libraries (orc_protobuf INTERFACE ${PROTOBUF_STATIC_LIB})
--else ()
--  target_link_libraries (orc_protobuf INTERFACE ${PROTOBUF_LIBRARY})
--endif()
--target_include_directories (orc_protobuf SYSTEM INTERFACE ${PROTOBUF_INCLUDE_DIR})
--
--if (ORC_PREFER_STATIC_PROTOBUF AND ${PROTOC_STATIC_LIB})
--  target_link_libraries (orc_protoc INTERFACE ${PROTOC_STATIC_LIB})
--else ()
--  target_link_libraries (orc_protoc INTERFACE ${PROTOC_LIBRARY})
--endif()
--target_include_directories (orc_protoc SYSTEM INTERFACE ${PROTOBUF_INCLUDE_DIR})
-+include_directories (SYSTEM ${PROTOBUF_INCLUDE_DIR})
- 
- if (PROTOBUF_VENDORED)
-   add_dependencies (orc_protoc protobuf_ep)
-diff --git a/tools/src/CMakeLists.txt b/tools/src/CMakeLists.txt
-index d55581b..701fd7c 100644
---- a/tools/src/CMakeLists.txt
-+++ b/tools/src/CMakeLists.txt
-@@ -95,11 +95,7 @@ target_link_libraries (csv-import
-   )
- 
- install(TARGETS
--   orc-contents
--   orc-metadata
--   orc-statistics
-    orc-scan
-    orc-memory
--   timezone-dump
-    csv-import
--   DESTINATION bin)
-+   DESTINATION tools/orc)
diff --git a/external_imported/vcpkg/ports/orc/fix-cmake.patch b/external_imported/vcpkg/ports/orc/fix-cmake.patch
new file mode 100644
index 000000000..c15cf1b30
--- /dev/null
+++ b/external_imported/vcpkg/ports/orc/fix-cmake.patch
@@ -0,0 +1,100 @@
+diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt
+index 972f2fc03..5b39554c8 100644
+--- a/c++/src/CMakeLists.txt
++++ b/c++/src/CMakeLists.txt
+@@ -210,8 +210,16 @@ add_library (orc STATIC ${SOURCE_FILES})
+ 
++include(GNUInstallDirs)
++
++target_include_directories(orc
++  PUBLIC
++  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
++  )
++
+ target_link_libraries (orc
+-  orc::protobuf
+-  orc::zlib
+-  orc::snappy
+-  orc::lz4
+-  orc::zstd
++  PRIVATE
++  protobuf::libprotobuf
++  ZLIB::ZLIB
++  Snappy::snappy
++  lz4::lz4
++  $<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>
+   ${LIBHDFSPP_LIBRARIES}
+@@ -219,2 +227,9 @@ target_link_libraries (orc
+ 
+-install(TARGETS orc DESTINATION lib)
++install(TARGETS orc EXPORT unofficial-orc)
++
++install(
++    EXPORT unofficial-orc
++    FILE unofficial-orc-config.cmake
++    DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/unofficial-orc"
++    NAMESPACE unofficial::orc::
++)
+diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake
+index 47c1a65ba..8570b6069 100644
+--- a/cmake_modules/ThirdpartyToolchain.cmake
++++ b/cmake_modules/ThirdpartyToolchain.cmake
+@@ -73,2 +73,4 @@ endif ()
+ 
++find_package(Snappy CONFIG REQUIRED)
++if (0)
+ if (NOT "${SNAPPY_HOME}" STREQUAL "")
+@@ -113,2 +115,3 @@ if (SNAPPY_VENDORED)
+ endif ()
++endif ()
+ 
+@@ -117,2 +120,4 @@ endif ()
+ 
++find_package(ZLIB REQUIRED)
++if (0)
+ if (NOT "${ZLIB_HOME}" STREQUAL "")
+@@ -165,2 +170,3 @@ if (ZLIB_VENDORED)
+ endif ()
++endif ()
+ 
+@@ -169,2 +175,4 @@ endif ()
+ 
++find_package(zstd CONFIG REQUIRED)
++if (0)
+ if (NOT "${ZSTD_HOME}" STREQUAL "")
+@@ -224,2 +232,3 @@ if (ZSTD_VENDORED)
+ endif ()
++endif ()
+ 
+@@ -228,2 +237,4 @@ endif ()
+ 
++find_package(lz4 CONFIG REQUIRED)
++if (0)
+ if (NOT "${LZ4_HOME}" STREQUAL "")
+@@ -276,2 +287,3 @@ if (LZ4_VENDORED)
+ endif ()
++endif ()
+ 
+@@ -280,3 +292,3 @@ endif ()
+ 
+-if (WIN32)
++if (WIN32 AND TEST_VALGRIND_MEMCHECK)
+   SET(CURRENT_TZDATA_FILE "")
+@@ -383,2 +395,4 @@ endif ()
+ 
++find_package(Protobuf CONFIG REQUIRED)
++if (0)
+ if (NOT "${PROTOBUF_HOME}" STREQUAL "")
+@@ -454,2 +468,3 @@ if (PROTOBUF_VENDORED)
+ endif ()
++endif ()
+ 
+diff --git a/tools/src/CMakeLists.txt b/tools/src/CMakeLists.txt
+index 3863c408e..b71ab5eae 100644
+--- a/tools/src/CMakeLists.txt
++++ b/tools/src/CMakeLists.txt
+@@ -72,3 +72,3 @@ target_link_libraries (orc-metadata
+   orc
+-  orc::protobuf
++  protobuf::libprotobuf
+   ${CMAKE_THREAD_LIBS_INIT}
diff --git a/external_imported/vcpkg/ports/orc/fix-linux-error.patch b/external_imported/vcpkg/ports/orc/fix-linux-error.patch
deleted file mode 100644
index f4689501f..000000000
--- a/external_imported/vcpkg/ports/orc/fix-linux-error.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake
-index ad52cf2..ed7ff28 100644
---- a/cmake_modules/ThirdpartyToolchain.cmake
-+++ b/cmake_modules/ThirdpartyToolchain.cmake
-@@ -145,7 +145,7 @@ endif ()
- # Zstd
- 
- if (1)
--  find_package (ZSTD CONFIG REQUIRED)
-+  find_package (zstd CONFIG REQUIRED)
-   set(ZSTD_VENDORED FALSE)
- else ()
-   set(ZSTD_HOME "${THIRDPARTY_DIR}/zstd_ep-install")
-@@ -338,6 +338,7 @@ endif ()
- 
- if (1)
-   find_package (Protobuf CONFIG REQUIRED)
-+  include_directories(${Protobuf_INCLUDE_DIRS})
-   set(PROTOBUF_VENDORED FALSE)
- else ()
-   set(PROTOBUF_PREFIX "${THIRDPARTY_DIR}/protobuf_ep-install")
diff --git a/external_imported/vcpkg/ports/orc/portfile.cmake b/external_imported/vcpkg/ports/orc/portfile.cmake
index f8b8bb51a..fc7d0d94a 100644
--- a/external_imported/vcpkg/ports/orc/portfile.cmake
+++ b/external_imported/vcpkg/ports/orc/portfile.cmake
@@ -1,12 +1,13 @@
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO apache/orc
-    REF 7ff749a4234c3db58d272a8fc1c7cc1860245692  # rel/release-1.7.6
-    SHA512 1e7f0366530b691d7ea7ce671aa1e1a655cde2feb0fb0c3639da36ef565aceaf6f05e49a39c3c0ab7417dc324dc2cbb6e8babbf21f899ccb4cf5f0e63217afbf
-    HEAD_REF master
-    PATCHES
-        0003-dependencies-from-vcpkg.patch
-        fix-linux-error.patch
+  OUT_SOURCE_PATH SOURCE_PATH
+  REPO apache/orc
+  REF "v${VERSION}"
+  SHA512 141afbd6d83b8c8032df071838e7da61eedb3d22289642f76669b6efd167d7550b200bd3542f012d0b63c9ae2572d83fcb1b7f76537b6fa6f980aebf37e2cde2
+  HEAD_REF master
+  PATCHES
+    fix-cmake.patch
 )
 
 file(REMOVE "${SOURCE_PATH}/cmake_modules/FindGTest.cmake")
@@ -51,8 +52,20 @@ vcpkg_cmake_configure(
 )
 
 vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-orc)
 vcpkg_copy_pdbs()
 
+file(READ "${CURRENT_PACKAGES_DIR}/share/unofficial-orc/unofficial-orc-config.cmake" cmake_config)
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/unofficial-orc/unofficial-orc-config.cmake"
+"include(CMakeFindDependencyMacro)
+find_dependency(Snappy CONFIG)
+find_dependency(ZLIB)
+find_dependency(zstd CONFIG)
+find_dependency(lz4 CONFIG)
+find_dependency(Protobuf CONFIG)
+${cmake_config}
+")
+
 file(GLOB TOOLS ${CURRENT_PACKAGES_DIR}/bin/orc-*)
 if(TOOLS)
   file(COPY ${TOOLS} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/orc")
@@ -64,9 +77,12 @@ if(NOT BINS)
   file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
 
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/external_imported/vcpkg/ports/orc/usage b/external_imported/vcpkg/ports/orc/usage
index b364b8bfe..c3e7e55e7 100644
--- a/external_imported/vcpkg/ports/orc/usage
+++ b/external_imported/vcpkg/ports/orc/usage
@@ -1,11 +1,4 @@
-The package orc does not provide CMake targets:
+orc provides CMake targets:
 
-    find_package(protobuf CONFIG REQUIRED)
-    find_package(ZLIB REQUIRED)
-    find_package(Snappy CONFIG REQUIRED)
-
-    find_library(LZ4_LIBRARY NAMES lz4d lz4)
-    find_library(ZSTD_LIBRARY NAMES zstd)
-    find_library(ORC_LIBRARY NAMES orc)
-
-    target_link_libraries(main PRIVATE ${ORC_LIBRARY} protobuf::libprotoc protobuf::libprotobuf Snappy::snappy ${LZ4_LIBRARY} ${ZSTD_LIBRARY} ZLIB::ZLIB)
+    find_package(unofficial-orc CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE unofficial::orc::orc)
diff --git a/external_imported/vcpkg/ports/orc/vcpkg.json b/external_imported/vcpkg/ports/orc/vcpkg.json
index b8f09b1a2..f6fdc45c1 100644
--- a/external_imported/vcpkg/ports/orc/vcpkg.json
+++ b/external_imported/vcpkg/ports/orc/vcpkg.json
@@ -1,11 +1,11 @@
 {
   "name": "orc",
-  "version": "1.7.6",
+  "version": "1.9.2",
   "description": "The smallest, fastest columnar storage for Hadoop workloads.",
   "homepage": "https://orc.apache.org/",
   "license": "Apache-2.0",
+  "supports": "!uwp",
   "dependencies": [
-    "gtest",
     "lz4",
     "protobuf",
     {
@@ -17,6 +17,10 @@
       "name": "vcpkg-cmake",
       "host": true
     },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
     "zlib",
     "zstd"
   ]
diff --git a/external_imported/vcpkg/ports/orocos-kdl/portfile.cmake b/external_imported/vcpkg/ports/orocos-kdl/portfile.cmake
index 8b4ca89d3..e7d041161 100644
--- a/external_imported/vcpkg/ports/orocos-kdl/portfile.cmake
+++ b/external_imported/vcpkg/ports/orocos-kdl/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO orocos/orocos_kinematics_dynamics
-    REF v1.4.0
-    SHA512 7156465e2aff02f472933617512069355836a03a02d4587cfe03c1b1d667a9762a4e3ed6e055b2a44f1fce1b6746179203c7204389626a7b458dcab1b28930d8
+    REF "v${VERSION}"
+    SHA512 9774b76b755ea81168390643813789783f60d0b1cdb46cd250e3e0d27f75a6cf2fd3bfd2081c04e30a14ff4fc70d0080c9b43b82ee181c2dda82f23f052b338d
     HEAD_REF master
     PATCHES export-include-dir.patch
 )
diff --git a/external_imported/vcpkg/ports/orocos-kdl/vcpkg.json b/external_imported/vcpkg/ports/orocos-kdl/vcpkg.json
index 70ae85e67..475a66f1c 100644
--- a/external_imported/vcpkg/ports/orocos-kdl/vcpkg.json
+++ b/external_imported/vcpkg/ports/orocos-kdl/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "orocos-kdl",
-  "version": "1.4",
-  "port-version": 6,
+  "version": "1.5.1",
   "description": "Kinematics and Dynamics Library.",
   "homepage": "https://github.com/orocos/orocos_kinematics_dynamics",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/osg/fix-sdl.patch b/external_imported/vcpkg/ports/osg/fix-sdl.patch
index be0030fea..c779235ff 100644
--- a/external_imported/vcpkg/ports/osg/fix-sdl.patch
+++ b/external_imported/vcpkg/ports/osg/fix-sdl.patch
@@ -12,16 +12,3 @@ index 81328ea..c735419 100644
      FIND_PACKAGE(SDL)
      FIND_PACKAGE(Poppler-glib)
      FIND_PACKAGE(RSVG)
-diff --git a/examples/osgmovie/osgmovie.cpp b/examples/osgmovie/osgmovie.cpp
-index 9de15b1..ae96e11 100644
---- a/examples/osgmovie/osgmovie.cpp
-+++ b/examples/osgmovie/osgmovie.cpp
-@@ -691,7 +691,7 @@ int main(int argc, char** argv)
- 
- #if USE_SDL || USE_SDL2
- 
--#include "SDL.h"
-+#include <SDL/SDL.h>
- 
- static void soundReadCallback(void * user_data, uint8_t * data, int datalen)
- {
diff --git a/external_imported/vcpkg/ports/osg/portfile.cmake b/external_imported/vcpkg/ports/osg/portfile.cmake
index 99c09ebec..b9c99ca7c 100644
--- a/external_imported/vcpkg/ports/osg/portfile.cmake
+++ b/external_imported/vcpkg/ports/osg/portfile.cmake
@@ -74,7 +74,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
 # The package osg can be configured to use different OpenGL profiles via a custom triplet file:
 # Possible values are GLCORE, GL2, GL3, GLES1, GLES2, GLES3, and GLES2+GLES3
 if(NOT DEFINED osg_OPENGL_PROFILE)
-    set(osg_OPENGL_PROFILE "GL3")
+    set(osg_OPENGL_PROFILE "GL2")
 endif()
 
 # Plugin control variables are used only if prerequisites are satisfied.
@@ -134,24 +134,36 @@ vcpkg_copy_pdbs()
 configure_file("${CMAKE_CURRENT_LIST_DIR}/unofficial-osg-config.cmake" "${CURRENT_PACKAGES_DIR}/share/unofficial-osg/unofficial-osg-config.cmake" @ONLY)
 vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-osg)
 
+# Add debug folder prefix for plugin targets. vcpkg_cmake_config_fixup only handles this for targets in bin/ and lib/.
+set(osg_plugins_debug_targets "${CURRENT_PACKAGES_DIR}/share/unofficial-osg/osg-plugins-debug.cmake")
+if(EXISTS "${osg_plugins_debug_targets}")
+    file(READ "${osg_plugins_debug_targets}" contents)
+    string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${_IMPORT_PREFIX}" contents "${contents}")
+    string(REPLACE "\${_IMPORT_PREFIX}/plugins" "\${_IMPORT_PREFIX}/debug/plugins" contents "${contents}")
+    file(WRITE "${osg_plugins_debug_targets}" "${contents}")
+endif()
+
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(APPEND "${CURRENT_PACKAGES_DIR}/include/osg/Config" "#ifndef OSG_LIBRARY_STATIC\n#define OSG_LIBRARY_STATIC 1\n#endif\n")
 endif()
 
 set(osg_plugins_subdir "osgPlugins-${OSG_VER}")
+vcpkg_list(SET tools)
+if("examples" IN_LIST FEATURES AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    list(APPEND tools osg2cpp osgshaderpipeline)
+endif()
 if("tools" IN_LIST FEATURES)
-    set(osg_plugin_pattern "${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}osgdb*${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}")
-    file(GLOB osg_plugins "${CURRENT_PACKAGES_DIR}/plugins/${osg_plugins_subdir}/${osg_plugin_pattern}")
-    file(INSTALL ${osg_plugins} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/${osg_plugins_subdir}")
-    if(NOT VCPKG_BUILD_TYPE)
-        file(GLOB osg_plugins "${CURRENT_PACKAGES_DIR}/debug/plugins/${osg_plugins_subdir}/${osg_plugin_pattern}")
-        file(INSTALL ${osg_plugins} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/${osg_plugins_subdir}")
-    endif()
-
-    set(tools osgversion present3D)
+    list(APPEND tools osgversion present3D)
     if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
         list(APPEND tools osgviewer osgarchive osgconv osgfilecache)
     endif()
+endif()
+if(tools)
+    set(osg_plugin_pattern "${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}osgdb*${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}")
+    file(GLOB osg_plugins "${CURRENT_PACKAGES_DIR}/plugins/${osg_plugins_subdir}/${osg_plugin_pattern}")
+    if(NOT osg_plugins STREQUAL "")
+        file(INSTALL ${osg_plugins} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/${osg_plugins_subdir}")
+    endif()
     vcpkg_copy_tools(TOOL_NAMES ${tools} AUTO_CLEAN)
 endif()
 
diff --git a/external_imported/vcpkg/ports/osg/usage b/external_imported/vcpkg/ports/osg/usage
index 51e9c25a5..7b7388feb 100644
--- a/external_imported/vcpkg/ports/osg/usage
+++ b/external_imported/vcpkg/ports/osg/usage
@@ -1,4 +1,5 @@
 The package osg can be configured to use different OpenGL profiles via a custom triplet file.
 Possible values are GLCORE, GL2, GL3, GLES1, GLES2, GLES3 and GLES2+GLES3.
-The default value is GL3.
-set(osg_OPENGL_PROFILE GL2)
+The default value is GL2. If you want use other profiles, please add the following 
+code to a custom triplet file.
+set(osg_OPENGL_PROFILE GL3)
diff --git a/external_imported/vcpkg/ports/osg/vcpkg.json b/external_imported/vcpkg/ports/osg/vcpkg.json
index 34daa77fe..30a3d86f9 100644
--- a/external_imported/vcpkg/ports/osg/vcpkg.json
+++ b/external_imported/vcpkg/ports/osg/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "osg",
   "version": "3.6.5",
-  "port-version": 18,
+  "port-version": 22,
   "description": "The OpenSceneGraph is an open source high performance 3D graphics toolkit.",
   "homepage": "https://www.openscenegraph.com/",
   "license": null,
@@ -90,7 +90,8 @@
           "name": "osg",
           "default-features": false,
           "features": [
-            "freetype"
+            "freetype",
+            "plugins"
           ]
         },
         "sdl2"
@@ -134,7 +135,7 @@
       "description": "Set to ON to generate CPack configuration files and packaging targets"
     },
     "plugins": {
-      "description": "Build most OSG Plugins",
+      "description": "Build most OSG plugins",
       "dependencies": [
         {
           "name": "curl",
@@ -206,7 +207,8 @@
           "name": "osg",
           "default-features": false,
           "features": [
-            "freetype"
+            "freetype",
+            "plugins"
           ]
         }
       ]
diff --git a/external_imported/vcpkg/ports/osgearth/find-package.patch b/external_imported/vcpkg/ports/osgearth/find-package.patch
index 4ce2b8c5e..135b14477 100644
--- a/external_imported/vcpkg/ports/osgearth/find-package.patch
+++ b/external_imported/vcpkg/ports/osgearth/find-package.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 36ea6c81f..8ed39eb24 100755
+index cf8245b8b..233390a5f 100755
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -124,9 +124,9 @@ option(OSGEARTH_ENABLE_GEOCODER "Enable the geocoder (GDAL/OGR must be built wit
+@@ -127,9 +127,9 @@ mark_as_advanced(OSGEARTH_ASSUME_SINGLE_GL_CONTEXT)
  
  # Mobile/GLES:
  IF (OSGEARTH_USE_GLES)
@@ -14,7 +14,7 @@ index 36ea6c81f..8ed39eb24 100755
  ENDIF (OSGEARTH_USE_GLES)
  
  
-@@ -144,35 +144,52 @@ if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
+@@ -147,35 +147,54 @@ if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
  endif()
  
  # required
@@ -44,7 +44,7 @@ index 36ea6c81f..8ed39eb24 100755
 -find_package(Protobuf)
 -find_package(WEBP)
 -find_package(Blend2D)
--find_package(blosc)
+-find_package(Blosc)
 +find_package(GEOS CONFIG REQUIRED)
 +set(GEOS_LIBRARY GEOS::geos_c)
 +find_package(SQLITE3 NAMES unofficial-sqlite3 REQUIRED)
@@ -55,8 +55,10 @@ index 36ea6c81f..8ed39eb24 100755
 +find_package(Protobuf REQUIRED)
 +find_package(WEBP NAMES WebP CONFIG REQUIRED)
 +set(WEBP_LIBRARY WebP::webp)
-+find_package(BLEND2D CONFIG REQUIRED)
-+set(BLEND2D_LIBRARY blend2d::blend2d)
++if(WITH_BLEND2D)
++    find_package(BLEND2D CONFIG REQUIRED)
++    set(BLEND2D_LIBRARY blend2d::blend2d)
++endif()
 +find_package(BLOSC REQUIRED)
  
  if(OSGEARTH_ENABLE_PROFILING)
@@ -65,8 +67,8 @@ index 36ea6c81f..8ed39eb24 100755
  endif()
  
  if(OSGEARTH_BUILD_ZIP_PLUGIN)
--    find_package(LIBZIP)
-+    find_package(LIBZIP CONFIG REQUIRED)
+-    find_package(LibZip)
++    find_package(libzip CONFIG REQUIRED)
 +    set(LIBZIP_LIBRARY libzip::zip)
  endif()
  
@@ -81,7 +83,7 @@ index 36ea6c81f..8ed39eb24 100755
  endif()
  
  # Sqlite enables the MBTiles format:
-@@ -214,7 +231,7 @@ SET (PROTOBUF_USE_DLLS FALSE CACHE BOOL "Set this to true if Protobuf is compile
+@@ -221,7 +240,7 @@ SET (PROTOBUF_USE_DLLS FALSE CACHE BOOL "Set this to true if Protobuf is compile
  # Duktape is the JavaScript interpreter
  SET (WITH_EXTERNAL_DUKTAPE FALSE CACHE BOOL "Use bundled or system wide version of Duktape")
  IF (WITH_EXTERNAL_DUKTAPE)
@@ -90,7 +92,7 @@ index 36ea6c81f..8ed39eb24 100755
  ENDIF (WITH_EXTERNAL_DUKTAPE)
  
  # Whether to install shaders (glsl files).
-@@ -225,7 +242,8 @@ OPTION(OSGEARTH_INSTALL_SHADERS "Whether to deploy GLSL shaders when doing a Mak
+@@ -232,7 +251,8 @@ OPTION(OSGEARTH_INSTALL_SHADERS "Whether to deploy GLSL shaders when doing a Mak
  # TinyXML is an XML parsing library
  SET (WITH_EXTERNAL_TINYXML FALSE CACHE BOOL "Use bundled or system wide version of TinyXML")
  IF (WITH_EXTERNAL_TINYXML)
@@ -100,11 +102,11 @@ index 36ea6c81f..8ed39eb24 100755
  ENDIF (WITH_EXTERNAL_TINYXML)
  
  # postfix settings for various configs
-@@ -300,6 +318,7 @@ IF(OSGEARTH_BUILD_SHARED_LIBS)
+@@ -307,6 +327,7 @@ IF(OSGEARTH_BUILD_SHARED_LIBS)
      SET(OSGEARTH_DYNAMIC_OR_STATIC "SHARED")
  ELSE()
      SET(OSGEARTH_DYNAMIC_OR_STATIC "STATIC")
-+	ADD_DEFINITIONS(-DOSGEARTH_LIBRARY_STATIC)
++    add_definitions(-DOSGEARTH_LIBRARY_STATIC)
  ENDIF()
  
  	
diff --git a/external_imported/vcpkg/ports/osgearth/fix-osgearth-config.patch b/external_imported/vcpkg/ports/osgearth/fix-osgearth-config.patch
deleted file mode 100644
index 1da0de456..000000000
--- a/external_imported/vcpkg/ports/osgearth/fix-osgearth-config.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff --git a/osgEarthConfig.cmake.in b/osgEarthConfig.cmake.in
-index 3f27dffe9..c787e7668 100644
---- a/osgEarthConfig.cmake.in
-+++ b/osgEarthConfig.cmake.in
-@@ -6,52 +6,54 @@ set(XPREFIX OSGEARTH)
- 
- 
- 
--if (osgearth_USE_STATIC_LIBS)
-+if (osgEarth_USE_STATIC_LIBS)
-     set(XPREFIX ${XPREFIX}_STATIC)
- endif()
- 
--set(osgearth_DEFINITIONS ${${XPREFIX}_CFLAGS})
-+set(osgEarth_DEFINITIONS ${${XPREFIX}_CFLAGS})
- 
--find_path(osgearth_INCLUDE_DIR
--    NAMES OSGEARTH/RTREE.H
-+find_path(osgEarth_INCLUDE_DIR
-+    NAMES osgEarth/rtree.h
-     HINTS ${${XPREFIX}_INCLUDE_DIRS}
- )
- 
--set(OSGEARTH_NAMES osgearth)
-+set(OSGEARTH_NAMES osgEarth)
- 
--find_library(osgearth_LIBRARY
-+find_library(osgEarth_LIBRARY
-     NAMES ${OSGEARTH_NAMES}
-     HINTS ${${XPREFIX}_LIBRARY_DIRS}
- )
- 
--set(osgearth_LIBRARIES    ${osgearth_LIBRARY})
--set(osgearth_LIBRARY_DIRS ${${XPREFIX}_LIBRARY_DIRS})
--set(osgearth_LIBRARY_DIR  ${osgearth_LIBRARY_DIRS})
--set(osgearth_INCLUDE_DIRS ${osgearth_INCLUDE_DIR})
--set(osgearth_LDFLAGS      ${${XPREFIX}_LDFLAGS})
-+set(osgEarth_LIBRARIES    ${osgEarth_LIBRARY})
-+set(osgEarth_LIBRARY_DIRS ${${XPREFIX}_LIBRARY_DIRS})
-+set(osgEarth_LIBRARY_DIR  ${osgEarth_LIBRARY_DIRS})
-+set(osgEarth_INCLUDE_DIRS ${osgEarth_INCLUDE_DIR})
-+set(osgEarth_LDFLAGS      ${${XPREFIX}_LDFLAGS})
- 
- include(FindPackageHandleStandardArgs)
--find_package_handle_standard_args(osgearth DEFAULT_MSG
--    osgearth_LIBRARY
--    osgearth_INCLUDE_DIR
-+find_package_handle_standard_args(osgEarth DEFAULT_MSG
-+    osgEarth_LIBRARY
-+    osgEarth_INCLUDE_DIR
- )
- 
--string (REPLACE ";" " " osgearth_LDFLAGS "${osgearth_LDFLAGS}")
-+string (REPLACE ";" " " osgEarth_LDFLAGS "${osgEarth_LDFLAGS}")
- 
--set_target_properties(osgearth
-+add_library(osgEarth UNKNOWN IMPORTED)
-+
-+set_target_properties(osgEarth
-   PROPERTIES
--  IMPORTED_LOCATION             "${osgearth_LIBRARIES}"
--  INTERFACE_INCLUDE_DIRECTORIES "${osgearth_INCLUDE_DIRS}"
--  INTERFACE_LINK_LIBRARIES      "${osgearth_LDFLAGS}"
--  INTERFACE_COMPILE_OPTIONS     "${osgearth_DEFINITIONS}"
-+  IMPORTED_LOCATION             "${osgEarth_LIBRARIES}"
-+  INTERFACE_INCLUDE_DIRECTORIES "${osgEarth_INCLUDE_DIRS}"
-+  INTERFACE_LINK_LIBRARIES      "${osgEarth_LDFLAGS}"
-+  INTERFACE_COMPILE_OPTIONS     "${osgEarth_DEFINITIONS}"
- )
- 
--  message(STATUS "osgearth_FOUND: ${osgearth_FOUND}")
--  message(STATUS "osgearth_INCLUDE_DIRS: ${osgearth_INCLUDE_DIRS}")
--  message(STATUS "osgearth_LIBRARIES: ${osgearth_LIBRARIES}")
--  message(STATUS "osgearth_LDFLAGS: ${osgearth_LDFLAGS}")
--  message(STATUS "osgearth_DEFINITIONS: ${osgearth_DEFINITIONS}")
-+  message(STATUS "osgEarth_FOUND: ${osgEarth_FOUND}")
-+  message(STATUS "osgEarth_INCLUDE_DIRS: ${osgEarth_INCLUDE_DIRS}")
-+  message(STATUS "osgEarth_LIBRARIES: ${osgEarth_LIBRARIES}")
-+  message(STATUS "osgEarth_LDFLAGS: ${osgEarth_LDFLAGS}")
-+  message(STATUS "osgEarth_DEFINITIONS: ${osgEarth_DEFINITIONS}")
- 
- 
- 
--check_required_components(osgearth)
-\ No newline at end of file
-+check_required_components(osgEarth)
diff --git a/external_imported/vcpkg/ports/osgearth/portfile.cmake b/external_imported/vcpkg/ports/osgearth/portfile.cmake
index 385b257fc..f38385cd4 100644
--- a/external_imported/vcpkg/ports/osgearth/portfile.cmake
+++ b/external_imported/vcpkg/ports/osgearth/portfile.cmake
@@ -1,15 +1,14 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO gwaldron/osgearth
-    REF 6b5fb806a9190f7425c32db65d3ea905a55a9c16 #version 3.3
-    SHA512 fe79ce6c73341f83d4aee8cb4da5341dead56a92f998212f7898079b79725f46b2209d64e68fe3b4d99d3c5c25775a8efd1bf3c3b3a049d4f609d3e30172d3bf
+    REF "osgearth-${VERSION}"
+    SHA512 f65c31922bebcbf722474a047dc29c8c1ceec9c037b0704811af2627fc2d0a124b6e95888e7d3b9b0e5acc146a88ebf8669e3f864a75a91751c3a4571d05a630
     HEAD_REF master
     PATCHES
         link-libraries.patch
         find-package.patch
         remove-tool-debug-suffix.patch
 		remove-lerc-gltf.patch
-		fix-osgearth-config.patch
 		export-plugins.patch
 )
 
@@ -33,11 +32,12 @@ if("tools" IN_LIST FEATURES)
 endif()
 
 file(REMOVE
-    "${SOURCE_PATH}/CMakeModule/FindGEOS.cmake"
-    "${SOURCE_PATH}/CMakeModule/FindLibZip.cmake"
-    "${SOURCE_PATH}/CMakeModule/FindOSG.cmake"
-    "${SOURCE_PATH}/CMakeModule/FindSqlite3.cmake"
-    "${SOURCE_PATH}/CMakeModule/FindWEBP.cmake"
+    "${SOURCE_PATH}/CMakeModules/FindBlend2D.cmake"
+    "${SOURCE_PATH}/CMakeModules/FindGEOS.cmake"
+    "${SOURCE_PATH}/CMakeModules/FindLibZip.cmake"
+    "${SOURCE_PATH}/CMakeModules/FindOSG.cmake"
+    "${SOURCE_PATH}/CMakeModules/FindSqlite3.cmake"
+    "${SOURCE_PATH}/CMakeModules/FindWEBP.cmake"
     "${SOURCE_PATH}/src/osgEarth/tinyxml.h" # https://github.com/gwaldron/osgearth/issues/1002
 )
 
@@ -46,7 +46,7 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED)
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
         tools       OSGEARTH_BUILD_TOOLS
-        blend2d     CMAKE_REQUIRE_FIND_PACKAGE_BLEND2D
+        blend2d     WITH_BLEND2D
 )
 
 vcpkg_cmake_configure(
@@ -54,6 +54,7 @@ vcpkg_cmake_configure(
     OPTIONS
         ${FEATURE_OPTIONS}
         -DLIB_POSTFIX=
+        -DCMAKE_CXX_STANDARD=11
         -DOSGEARTH_BUILD_SHARED_LIBS=${BUILD_SHARED}
         -DOSGEARTH_BUILD_EXAMPLES=OFF
         -DOSGEARTH_BUILD_TESTS=OFF
@@ -84,11 +85,12 @@ if("tools" IN_LIST FEATURES)
             file(INSTALL ${osg_plugins} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/${osg_plugins_subdir}")
         endif()
     endif()
-    vcpkg_copy_tools(TOOL_NAMES osgearth_3pv osgearth_atlas osgearth_boundarygen osgearth_clamp
-        osgearth_conv osgearth_imgui osgearth_tfs osgearth_toc osgearth_version osgearth_viewer
+    vcpkg_copy_tools(TOOL_NAMES osgearth_3pv osgearth_atlas osgearth_bakefeaturetiles osgearth_boundarygen
+        osgearth_clamp osgearth_conv osgearth_imgui osgearth_tfs osgearth_toc osgearth_version osgearth_viewer
 		osgearth_createtile osgearth_mvtindex
         AUTO_CLEAN
     )
+	file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug")
 endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/external_imported/vcpkg/ports/osgearth/remove-lerc-gltf.patch b/external_imported/vcpkg/ports/osgearth/remove-lerc-gltf.patch
index 4c6f0fdb2..e39fbfab6 100644
--- a/external_imported/vcpkg/ports/osgearth/remove-lerc-gltf.patch
+++ b/external_imported/vcpkg/ports/osgearth/remove-lerc-gltf.patch
@@ -1,8 +1,8 @@
 diff --git a/src/osgEarthDrivers/CMakeLists.txt b/src/osgEarthDrivers/CMakeLists.txt
-index d178f951b..010896310 100644
+index 79acbe9c4..89e28b141 100644
 --- a/src/osgEarthDrivers/CMakeLists.txt
 +++ b/src/osgEarthDrivers/CMakeLists.txt
-@@ -30,7 +30,6 @@ add_subdirectory(earth)
+@@ -31,7 +31,6 @@ add_subdirectory(earth)
  add_subdirectory(engine_rex)
  add_subdirectory(featurefilter_intersect)
  add_subdirectory(featurefilter_join)
@@ -10,11 +10,9 @@ index d178f951b..010896310 100644
  add_subdirectory(kml)
  add_subdirectory(mapinspector)
  add_subdirectory(monitor)
-@@ -40,7 +39,6 @@ add_subdirectory(sky_simple)
- add_subdirectory(template)
- add_subdirectory(terrainshader)
- add_subdirectory(webp)
--add_subdirectory(lerc)
- add_subdirectory(vdatum_egm2008)
- add_subdirectory(vdatum_egm84)
- add_subdirectory(vdatum_egm96)
+@@ -61,5 +60,4 @@ endif()
+ 
+ IF(NOT APPLE AND NOT ANDROID)
+     add_subdirectory(fastdxt)
+-    add_subdirectory(lerc)
+ ENDIF()
diff --git a/external_imported/vcpkg/ports/osgearth/vcpkg.json b/external_imported/vcpkg/ports/osgearth/vcpkg.json
index df0a3246e..1459fde3f 100644
--- a/external_imported/vcpkg/ports/osgearth/vcpkg.json
+++ b/external_imported/vcpkg/ports/osgearth/vcpkg.json
@@ -1,13 +1,14 @@
 {
   "name": "osgearth",
-  "version": "3.3",
-  "port-version": 5,
+  "version": "3.4",
+  "port-version": 1,
   "description": "osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2021 Pelican Mapping.",
   "homepage": "https://github.com/gwaldron/osgearth",
   "license": "LGPL-3.0-or-later",
-  "supports": "!(x86 | wasm32)",
+  "supports": "!(arm | x86 | wasm32 | xbox)",
   "dependencies": [
     "basisu",
+    "blosc",
     "cfitsio",
     "draco",
     "geos",
diff --git a/external_imported/vcpkg/ports/osmanip/portfile.cmake b/external_imported/vcpkg/ports/osmanip/portfile.cmake
index f846f4e4c..b46a0adbf 100644
--- a/external_imported/vcpkg/ports/osmanip/portfile.cmake
+++ b/external_imported/vcpkg/ports/osmanip/portfile.cmake
@@ -3,7 +3,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO JustWhit3/osmanip
     REF "v${VERSION}"
-    SHA512 cbbae779435bec3995756e1dbc8c283868dd923453054177dfa73bc00ac3510488467e535a1c4b14726f02d198f298eaeb884c1716dcde07e9aec06d02b22d32
+    SHA512 ac5435ce5d39440851a01ee1576b7a543979efbf374a27ec32d63716361ef91662c353c2e39fecbd7e01059e8676f952f6851111643a55f941695dbbc6f03da4
     HEAD_REF main
 )
 
diff --git a/external_imported/vcpkg/ports/osmanip/vcpkg.json b/external_imported/vcpkg/ports/osmanip/vcpkg.json
index fa544473c..94357fed4 100644
--- a/external_imported/vcpkg/ports/osmanip/vcpkg.json
+++ b/external_imported/vcpkg/ports/osmanip/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "osmanip",
-  "version": "4.5.1",
+  "version": "4.6.1",
   "description": "A cross-platform library for output stream manipulation using ANSI escape sequences.",
   "homepage": "https://github.com/JustWhit3/osmanip",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/outcome/fix-find-library.patch b/external_imported/vcpkg/ports/outcome/fix-find-library.patch
deleted file mode 100644
index 5d7f22b8b..000000000
--- a/external_imported/vcpkg/ports/outcome/fix-find-library.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a292728cf4..5286b5e366 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -40,17 +40,6 @@ include(QuickCppLibRequireOutOfSourceBuild)
- include(QuickCppLibUtils)
- include(QuickCppLibPolicies)
- 
--if(OUTCOME_BUNDLE_EMBEDDED_STATUS_CODE)
--  ensure_git_subrepo("${CMAKE_CURRENT_SOURCE_DIR}/include/outcome/experimental/status-code/include" "https://github.com/ned14/status-code.git")
--else()
--  find_quickcpplib_library(status-code
--    GIT_REPOSITORY "https://github.com/ned14/status-code.git"
--    GIT_TAG "${OUTCOME_DEPENDENCY_STATUS_CODE_GIT_TAG}"
--    REQUIRED
--    IS_HEADER_ONLY
--  )
--endif()
--
- # Parse the version we tell cmake directly from the version header file
- ParseProjectVersionFromHpp("${CMAKE_CURRENT_SOURCE_DIR}/include/outcome/detail/version.hpp" VERSIONSTRING)
- # Sets the usual PROJECT_NAME etc
-@@ -99,8 +88,16 @@ else()
-     IS_HEADER_ONLY
-   )
- endif()
--if (NOT OUTCOME_BUNDLE_EMBEDDED_STATUS_CODE)
--  list_filter(${PROJECT_NAME}_HEADERS EXCLUDE REGEX /status-code/include/)
-+if(OUTCOME_BUNDLE_EMBEDDED_STATUS_CODE)
-+  ensure_git_subrepo("${CMAKE_CURRENT_SOURCE_DIR}/include/outcome/experimental/status-code/include" "https://github.com/ned14/status-code.git")
-+else()
-+  find_quickcpplib_library(status-code
-+    GIT_REPOSITORY "https://github.com/ned14/status-code.git"
-+    GIT_TAG "${OUTCOME_DEPENDENCY_STATUS_CODE_GIT_TAG}"
-+    REQUIRED
-+    IS_HEADER_ONLY
-+  )
-+  list_filter(${PROJECT_NAME}_HEADERS EXCLUDE REGEX include/outcome/experimental/status-code/)
- endif()
- 
- # Make an interface only library so dependent CMakeLists can bring in this header-only library
diff --git a/external_imported/vcpkg/ports/outcome/fix-status-code-include.patch b/external_imported/vcpkg/ports/outcome/fix-status-code-include.patch
deleted file mode 100644
index 1b601054a..000000000
--- a/external_imported/vcpkg/ports/outcome/fix-status-code-include.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/include/outcome/experimental/coroutine_support.hpp b/include/outcome/experimental/coroutine_support.hpp
-index 21759ede58..6c4b152294 100644
---- a/include/outcome/experimental/coroutine_support.hpp
-+++ b/include/outcome/experimental/coroutine_support.hpp
-@@ -45,7 +45,11 @@ Distributed under the Boost Software License, Version 1.0.
-   OUTCOME_V2_NAMESPACE_END
- 
- #ifdef __cpp_exceptions
-+#if 0
- #include "status-code/include/system_code_from_exception.hpp"
-+#else
-+#include <status-code/system_code_from_exception.hpp>
-+#endif
- OUTCOME_V2_NAMESPACE_BEGIN
- namespace awaitables
- {
diff --git a/external_imported/vcpkg/ports/outcome/portfile.cmake b/external_imported/vcpkg/ports/outcome/portfile.cmake
index d6943416d..c29dea89c 100644
--- a/external_imported/vcpkg/ports/outcome/portfile.cmake
+++ b/external_imported/vcpkg/ports/outcome/portfile.cmake
@@ -24,12 +24,10 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ned14/outcome
-    REF 90032f99503b4620f21d8160dc3af06fa343541f
-    SHA512 7eda0694098a118633c8ad0ef812f8b03db536548f51d1ca71ca98b9f9e445bcb24019cd4d1046da9215227ad85205c5b3631d0c66de6edc1fcc904b2d9e0e0f
+    REF v${VERSION}
+    SHA512 2057f2f967f7aad3f78d081c72130122c1f99b837ce23ec9de9bfe0cd0fc493ce7085071cb2a54a840252ba0d82e14d99d622c1e0fdf9a8a20f41e5f89fa4645
     HEAD_REF develop
     PATCHES
-        fix-find-library.patch # incorporated into upstream after 2.2.4
-        fix-status-code-include.patch # incorporated into upstream after 2.2.4
 )
 
 # Because outcome's deployed files are header-only, the debug build is not necessary
@@ -39,10 +37,9 @@ set(VCPKG_BUILD_TYPE release)
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-        -DPROJECT_IS_DEPENDENCY=On
-        -Dquickcpplib_DIR=${CURRENT_INSTALLED_DIR}/share/quickcpplib
+        -Doutcome_IS_DEPENDENCY=ON
+        "-DCMAKE_PREFIX_PATH=${CURRENT_INSTALLED_DIR}"
         -DOUTCOME_BUNDLE_EMBEDDED_STATUS_CODE=OFF
-        -Dstatus-code_DIR=${CURRENT_INSTALLED_DIR}/share/status-code
         -DOUTCOME_ENABLE_DEPENDENCY_SMOKE_TEST=ON  # Leave this always on to test everything compiles
         -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
         -DCXX_CONCEPTS_FLAGS=
diff --git a/external_imported/vcpkg/ports/outcome/vcpkg.json b/external_imported/vcpkg/ports/outcome/vcpkg.json
index 5ae09aacd..2c52dd078 100644
--- a/external_imported/vcpkg/ports/outcome/vcpkg.json
+++ b/external_imported/vcpkg/ports/outcome/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "outcome",
-  "version": "2.2.4",
-  "port-version": 1,
+  "version": "2.2.7",
   "maintainers": [
     "Niall Douglas <s_github@nedprod.com>",
     "Henrik Gaßmann <henrik@gassmann.onl>"
diff --git a/external_imported/vcpkg/ports/p-ranav-csv/vcpkg.json b/external_imported/vcpkg/ports/p-ranav-csv/vcpkg.json
index bfb54b053..041781021 100644
--- a/external_imported/vcpkg/ports/p-ranav-csv/vcpkg.json
+++ b/external_imported/vcpkg/ports/p-ranav-csv/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "p-ranav-csv",
-  "version-string": "2019-07-11",
-  "port-version": 2,
+  "version-date": "2019-07-11",
+  "port-version": 3,
   "description": "[deprecated] CSV for modern C++",
   "homepage": "https://github.com/p-ranav/csv",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/p-ranav-csv2/vcpkg.json b/external_imported/vcpkg/ports/p-ranav-csv2/vcpkg.json
index c639c65e6..c2dd345a2 100644
--- a/external_imported/vcpkg/ports/p-ranav-csv2/vcpkg.json
+++ b/external_imported/vcpkg/ports/p-ranav-csv2/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "p-ranav-csv2",
-  "version-string": "2020-12-14",
-  "port-version": 3,
+  "version-date": "2020-12-14",
+  "port-version": 4,
   "description": "CSV for modern C++",
   "homepage": "https://github.com/p-ranav/csv2",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/pagmo2/vcpkg.json b/external_imported/vcpkg/ports/pagmo2/vcpkg.json
index 0ad81183b..c301f4ead 100644
--- a/external_imported/vcpkg/ports/pagmo2/vcpkg.json
+++ b/external_imported/vcpkg/ports/pagmo2/vcpkg.json
@@ -1,9 +1,11 @@
 {
   "name": "pagmo2",
   "version": "2.19.0",
+  "port-version": 2,
   "description": "A C++ platform to perform parallel computations of optimization tasks (global and local) via the asynchronous generalized island model.",
   "homepage": "https://esa.github.io/pagmo2/",
   "license": "GPL-3.0-or-later OR LGPL-3.0-or-later",
+  "supports": "!xbox",
   "dependencies": [
     "boost-any",
     "boost-graph",
diff --git a/external_imported/vcpkg/ports/paho-mqtt/fix-ODR-libuuid-linux.patch b/external_imported/vcpkg/ports/paho-mqtt/fix-ODR-libuuid-linux.patch
new file mode 100644
index 000000000..2542769df
--- /dev/null
+++ b/external_imported/vcpkg/ports/paho-mqtt/fix-ODR-libuuid-linux.patch
@@ -0,0 +1,38 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 4c06409..29f53c0 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -95,6 +95,12 @@ ADD_LIBRARY(common_obj_static OBJECT ${common_src})
+ SET_TARGET_PROPERTIES(common_obj_static PROPERTIES
+     POSITION_INDEPENDENT_CODE ON
+     COMPILE_DEFINITIONS "PAHO_MQTT_STATIC=1")
++    IF(WIN32 OR APPLE)
++    ELSE()
++        find_package(unofficial-libuuid CONFIG REQUIRED)
++        target_link_libraries(common_obj_static PRIVATE unofficial::UUID::uuid)
++        target_compile_definitions(common_obj_static PUBLIC LIBUUID)
++    ENDIF()
+ ENDIF()
+ 
+ IF (PAHO_BUILD_SHARED)
+@@ -149,7 +155,6 @@ ENDIF()
+ IF (PAHO_BUILD_STATIC)
+     ADD_LIBRARY(paho-mqtt3c-static STATIC $<TARGET_OBJECTS:common_obj_static> MQTTClient.c)
+     ADD_LIBRARY(paho-mqtt3a-static STATIC $<TARGET_OBJECTS:common_obj_static> MQTTAsync.c MQTTAsyncUtils.c)
+-
+     TARGET_LINK_LIBRARIES(paho-mqtt3c-static ${LIBS_SYSTEM})
+     TARGET_LINK_LIBRARIES(paho-mqtt3a-static ${LIBS_SYSTEM})
+     IF (NOT WIN32)
+@@ -249,6 +254,12 @@ IF (PAHO_WITH_SSL)
+     	TARGET_INCLUDE_DIRECTORIES(common_ssl_obj_static PUBLIC ${OPENSSL_INCLUDE_DIR})
+     	SET_PROPERTY(TARGET common_ssl_obj_static PROPERTY POSITION_INDEPENDENT_CODE ON)
+     	SET_PROPERTY(TARGET common_ssl_obj_static PROPERTY COMPILE_DEFINITIONS "OPENSSL=1;PAHO_MQTT_STATIC=1")
++        IF(WIN32 OR APPLE)
++        ELSE()
++            find_package(unofficial-libuuid CONFIG REQUIRED)
++            target_link_libraries(common_ssl_obj_static PRIVATE unofficial::UUID::uuid)
++            target_compile_definitions(common_ssl_obj_static PUBLIC LIBUUID)
++        ENDIF()
+     
+         ADD_LIBRARY(paho-mqtt3cs-static STATIC $<TARGET_OBJECTS:common_ssl_obj_static> MQTTClient.c SSLSocket.c)
+         ADD_LIBRARY(paho-mqtt3as-static STATIC $<TARGET_OBJECTS:common_ssl_obj_static> MQTTAsync.c MQTTAsyncUtils.c SSLSocket.c)
diff --git a/external_imported/vcpkg/ports/paho-mqtt/portfile.cmake b/external_imported/vcpkg/ports/paho-mqtt/portfile.cmake
index 5257c91be..57dec0b28 100644
--- a/external_imported/vcpkg/ports/paho-mqtt/portfile.cmake
+++ b/external_imported/vcpkg/ports/paho-mqtt/portfile.cmake
@@ -1,20 +1,24 @@
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO eclipse/paho.mqtt.c
-  REF eff2da4875725509fc97641b118d6badf3e3a08f # v1.3.10
-  SHA512 5e190ffd978dad0f60b70bdad2727e567539aff2c55e38023dfbcbe9b50bcbe75d8230c501c09e9c0a0329bed3fd149d5d59d65ad0ba0f84a54f641b4f01390a
+  REF "v${VERSION}"
+  SHA512 0f436470bcff224461ed3227c8db10914f84bc2dcf76e51b55d4a78b80abaa4e636ac8f7a20e517524625888335c738e975283e5d573ae8d59147aa4de7963fc
   HEAD_REF master
   PATCHES
     fix-unresolvedsymbol-arm.patch
+    fix-ODR-libuuid-linux.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PAHO_BUILD_STATIC)
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PAHO_BUILD_DYNAMIC)
 
+vcpkg_replace_string("${SOURCE_PATH}/src/CMakeLists.txt" [[SET(OPENSSL_ROOT_DIR "" CACHE PATH "Directory containing OpenSSL libraries and includes")]] "")
+
 vcpkg_cmake_configure(
   SOURCE_PATH "${SOURCE_PATH}"
   OPTIONS
     -DPAHO_WITH_SSL=TRUE
+    -DPAHO_HIGH_PERFORMANCE=TRUE
     -DPAHO_BUILD_SHARED=${PAHO_BUILD_DYNAMIC}
     -DPAHO_BUILD_STATIC=${PAHO_BUILD_STATIC}
     -DPAHO_ENABLE_TESTING=FALSE
@@ -28,14 +32,24 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
     vcpkg_copy_tools(TOOL_NAMES MQTTVersion AUTO_CLEAN)
 endif()
 
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/eclipse-paho-mqtt-c/eclipse-paho-mqtt-cConfig.cmake"
-    [[# Generated by CMake]]
-    [[# Generated by CMake
-include(CMakeFindDependencyMacro)
-find_dependency(OpenSSL)]]
-)
+if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_OSX)
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/eclipse-paho-mqtt-c/eclipse-paho-mqtt-cConfig.cmake"
+        [[# Generated by CMake]]
+        [[# Generated by CMake
+    include(CMakeFindDependencyMacro)
+    find_dependency(OpenSSL)]]
+    )   
+else()
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/eclipse-paho-mqtt-c/eclipse-paho-mqtt-cConfig.cmake"
+        [[# Generated by CMake]]
+        [[# Generated by CMake
+    include(CMakeFindDependencyMacro)
+    find_dependency(OpenSSL)
+    find_dependency(unofficial-libuuid CONFIG)]]
+    )
+endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/paho-mqtt/vcpkg.json b/external_imported/vcpkg/ports/paho-mqtt/vcpkg.json
index 2bed81bb8..724826895 100644
--- a/external_imported/vcpkg/ports/paho-mqtt/vcpkg.json
+++ b/external_imported/vcpkg/ports/paho-mqtt/vcpkg.json
@@ -1,10 +1,15 @@
 {
   "name": "paho-mqtt",
-  "version-semver": "1.3.10",
+  "version": "1.3.13",
+  "port-version": 1,
   "description": "Paho project provides open-source client implementations of MQTT and MQTT-SN messaging protocols aimed at new, existing, and emerging applications for the Internet of Things",
   "homepage": "https://github.com/eclipse/paho.mqtt.c",
   "license": "EPL-2.0",
   "dependencies": [
+    {
+      "name": "libuuid",
+      "platform": "!osx & !windows"
+    },
     "openssl",
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/paho-mqttpp3/fix-dependency.patch b/external_imported/vcpkg/ports/paho-mqttpp3/fix-dependency.patch
deleted file mode 100644
index 1ace8a30d..000000000
--- a/external_imported/vcpkg/ports/paho-mqttpp3/fix-dependency.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
-index a9f8908..5c98f3f 100644
---- a/cmake/CMakeLists.txt
-+++ b/cmake/CMakeLists.txt
-@@ -17,6 +17,5 @@ install(EXPORT ${package_name} DESTINATION lib/cmake/${package_name}
- 
- install(FILES
-     "${CMAKE_CURRENT_BINARY_DIR}/${package_name}Config.cmake"
--    FindPahoMqttC.cmake
-     "${CMAKE_CURRENT_BINARY_DIR}/${package_name}ConfigVersion.cmake"
-     DESTINATION lib/cmake/${package_name})
-diff --git a/cmake/PahoMqttCppConfig.cmake.in b/cmake/PahoMqttCppConfig.cmake.in
-index 164e123..9beac1c 100644
---- a/cmake/PahoMqttCppConfig.cmake.in
-+++ b/cmake/PahoMqttCppConfig.cmake.in
-@@ -5,7 +5,7 @@ set(PAHO_WITH_SSL @PAHO_WITH_SSL@)
- 
- include(CMakeFindDependencyMacro)
- list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
--find_dependency(PahoMqttC REQUIRED)
-+find_dependency(eclipse-paho-mqtt-c REQUIRED)
- list(REMOVE_AT CMAKE_MODULE_PATH -1)
- find_dependency(Threads REQUIRED)
- 
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 3d43595..a25f74d 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -23,7 +23,7 @@
- #     Frank Pagliughi - made the shared library optional
- #*******************************************************************************/
- 
--find_package(PahoMqttC REQUIRED)
-+find_package(eclipse-paho-mqtt-c CONFIG REQUIRED)
- 
- # --- The headers ---
- 
-@@ -81,13 +81,21 @@ target_include_directories(paho-cpp-objs
- ## --- Build the shared library, if requested ---
- 
- if(PAHO_BUILD_SHARED)
-+    ## set PAHO_C_LIB
-+    if(PAHO_WITH_SSL)
-+        find_package(OpenSSL REQUIRED)
-+        set(_PAHO_MQTT_C_LIB_NAME eclipse-paho-mqtt-c::paho-mqtt3as eclipse-paho-mqtt-c::paho-mqtt3cs)
-+    else()
-+        set(_PAHO_MQTT_C_LIB_NAME eclipse-paho-mqtt-c::paho-mqtt3a eclipse-paho-mqtt-c::paho-mqtt3c)
-+    endif()
-+
-     ## create the shared library
-     add_library(paho-mqttpp3 SHARED $<TARGET_OBJECTS:paho-cpp-objs>)
- 
-     ## add dependencies to the shared library
-     target_link_libraries(paho-mqttpp3
-         PRIVATE ${LIBS_SYSTEM}
--        PUBLIC PahoMqttC::PahoMqttC Threads::Threads)
-+        PUBLIC ${_PAHO_MQTT_C_LIB_NAME} Threads::Threads)
- 
-     # It would be nice to exort the include paths from the obj lib, but we
-     # get an export error. Perhaps in a future version?
-@@ -119,13 +127,22 @@ endif()
- ## --- Build static version of the library, if requested ---
- 
- if(PAHO_BUILD_STATIC)
-+
-+    ## set PAHO_C_LIB
-+    if(PAHO_WITH_SSL)
-+        find_package(OpenSSL REQUIRED)
-+        set(_PAHO_MQTT_C_LIB_NAME eclipse-paho-mqtt-c::paho-mqtt3as-static eclipse-paho-mqtt-c::paho-mqtt3cs-static)
-+    else()
-+        set(_PAHO_MQTT_C_LIB_NAME  eclipse-paho-mqtt-c::paho-mqtt3a-static eclipse-paho-mqtt-c::paho-mqtt3c-static)
-+    endif()
-+
-     ## create the static library
-     add_library(paho-mqttpp3-static STATIC $<TARGET_OBJECTS:paho-cpp-objs>)
- 
-     ## add dependencies to the shared library
-     target_link_libraries(paho-mqttpp3-static
-         PRIVATE ${LIBS_SYSTEM}
--        PUBLIC PahoMqttC::PahoMqttC Threads::Threads)
-+        PUBLIC ${_PAHO_MQTT_C_LIB_NAME} Threads::Threads)
- 
-     target_include_directories(paho-mqttpp3-static PUBLIC
-         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
diff --git a/external_imported/vcpkg/ports/paho-mqttpp3/portfile.cmake b/external_imported/vcpkg/ports/paho-mqttpp3/portfile.cmake
index d2103a8c5..b2efd0b75 100644
--- a/external_imported/vcpkg/ports/paho-mqttpp3/portfile.cmake
+++ b/external_imported/vcpkg/ports/paho-mqttpp3/portfile.cmake
@@ -1,15 +1,12 @@
-# Download from Github
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO eclipse/paho.mqtt.cpp
-  REF 33921c8b68b351828650c36816e7ecf936764379 #v1.2.0
-  SHA512 3f4a91987e0106e50e637d8d4fb13a4f8aca14eea168102664fdcebd1260609434e679f5986a1c4d71746735530f1b72fc29d2ac05cb35b3ce734a6aab1a0a55
+  REF 5e0d1bf37b4826d680ec066ec42afd133851a681
+  SHA512 bcf36ab01e00959093b09d871bdd81d5c89b865357412b35da474092cf02d1501a2191d32b5ff7257afc50a5f12cfe4e5229b976c617da83ad3e5477add51731
   HEAD_REF master
-  PATCHES
-    fix-dependency.patch
 )
 
-vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS 
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
   FEATURES
     "ssl" PAHO_WITH_SSL
 )
@@ -28,7 +25,7 @@ endif()
 set(PAHO_C_INC "${CURRENT_INSTALLED_DIR}/include")
 
 
-# NOTE: the Paho C++ cmake files on Github are problematic. 
+# NOTE: the Paho C++ cmake files on Github are problematic.
 # It uses two different options PAHO_BUILD_STATIC and PAHO_BUILD_SHARED instead of just using one variable.
 # Unless the open source community cleans up the cmake files, we are stuck with setting both of them.
 if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
diff --git a/external_imported/vcpkg/ports/paho-mqttpp3/vcpkg.json b/external_imported/vcpkg/ports/paho-mqttpp3/vcpkg.json
index 4ea7289ec..7a5db99b9 100644
--- a/external_imported/vcpkg/ports/paho-mqttpp3/vcpkg.json
+++ b/external_imported/vcpkg/ports/paho-mqttpp3/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "paho-mqttpp3",
-  "version": "1.2.0",
-  "port-version": 1,
+  "version": "1.3.2",
   "description": "Paho project provides open-source C++ wrapper for Paho C library",
   "homepage": "https://github.com/eclipse/paho.mqtt.cpp",
   "license": "EPL-1.0",
diff --git a/external_imported/vcpkg/ports/palsigslot/portfile.cmake b/external_imported/vcpkg/ports/palsigslot/portfile.cmake
index 4ab6d29cb..cff3980f3 100644
--- a/external_imported/vcpkg/ports/palsigslot/portfile.cmake
+++ b/external_imported/vcpkg/ports/palsigslot/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO palacaze/sigslot
-    REF v1.2.1
-    SHA512 cd79985a09ad41562dc8e582d30bc9df0fdc9409ee3676919b56d0d70a6c1af9414587b61977d2fa2ba763ef8df65b30c7b7dc883629e016660baeb998e708f5
+    REF "v${VERSION}"
+    SHA512 ed8614d9c2e418259b1bce6d0a528b54939700876969c5e8dfcfc466c167690180cb18324602f83d521c79dcba2565e5317647416b70cf8773860ab956d9b62f
     HEAD_REF master
 )
 
@@ -22,4 +22,4 @@ file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/lib"
 )
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/palsigslot/vcpkg.json b/external_imported/vcpkg/ports/palsigslot/vcpkg.json
index 29c68fa94..c02f85a09 100644
--- a/external_imported/vcpkg/ports/palsigslot/vcpkg.json
+++ b/external_imported/vcpkg/ports/palsigslot/vcpkg.json
@@ -1,8 +1,9 @@
 {
   "name": "palsigslot",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "A header-only, thread safe implementation of signal-slots for C++.",
   "homepage": "https://github.com/palacaze/sigslot",
+  "license": "MIT",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/pango/freetype2-pc.patch b/external_imported/vcpkg/ports/pango/freetype2-pc.patch
deleted file mode 100644
index f70709989..000000000
--- a/external_imported/vcpkg/ports/pango/freetype2-pc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 723e0c2..c348730 100644
---- a/meson.build
-+++ b/meson.build
-@@ -312,7 +312,7 @@ endif
- 
- # The first version of freetype with a pkg-config file is 2.1.5,
- # CMake uses 'freetype' rather than 'freetype2' for the package name
--freetype_package_name = cc.get_argument_syntax() == 'msvc' ? \
-+freetype_package_name = false ? \
-                         'freetype' : 'freetype2'
- 
- freetype_dep = dependency(freetype_package_name,
diff --git a/external_imported/vcpkg/ports/pango/portfile.cmake b/external_imported/vcpkg/ports/pango/portfile.cmake
index c6e410ddf..c30aea119 100644
--- a/external_imported/vcpkg/ports/pango/portfile.cmake
+++ b/external_imported/vcpkg/ports/pango/portfile.cmake
@@ -4,16 +4,17 @@ vcpkg_from_gitlab(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO GNOME/pango
     REF "${VERSION}"
-    SHA512 30be64784fac2539741c5e085ed0cf515fdd2044e71b6c08121dfb838e50d1a31f4f9e53d9869b65aa1fa246ab5cc1bec18503a08dcf0337aece84290472e336
+    SHA512 5de67e711a1f25bd2c741162bb8306ae380d134f95b9103db6e96864d3a1100321ce106d8238dca54e746cd8f1cfdbe50cc407878611d3d09694404f3f128c73
     HEAD_REF master
-    PATCHES
-        freetype2-pc.patch
 ) 
 
+# Fix for https://github.com/microsoft/vcpkg/issues/31573
+# Mimics patch for Gentoo https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f688df5100ef2b88c975ecd40fd343c62e2ab276
+# Silence false positive with GCC 13 and -O3 at least
+# https://gitlab.gnome.org/GNOME/pango/-/issues/740	
+vcpkg_replace_string("${SOURCE_PATH}/meson.build" "-Werror=array-bounds" "")
+
 if("introspection" IN_LIST FEATURES)
-    if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-        message(FATAL_ERROR "Feature introspection currently only supports dynamic build.")
-    endif()
     list(APPEND OPTIONS_DEBUG -Dintrospection=disabled)
     list(APPEND OPTIONS_RELEASE -Dintrospection=enabled)
 else()
@@ -54,4 +55,4 @@ vcpkg_copy_pdbs()
 
 vcpkg_copy_tools(TOOL_NAMES pango-view pango-list pango-segmentation AUTO_CLEAN)
 
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/pango/vcpkg.json b/external_imported/vcpkg/ports/pango/vcpkg.json
index 106b4b906..e61eb9bc0 100644
--- a/external_imported/vcpkg/ports/pango/vcpkg.json
+++ b/external_imported/vcpkg/ports/pango/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "pango",
-  "version": "1.50.12",
-  "port-version": 2,
+  "version": "1.50.14",
+  "port-version": 4,
   "description": "Text and font handling library.",
   "homepage": "https://ftp.gnome.org/pub/GNOME/sources/pango/",
-  "license": "LGPL-2.0-only",
+  "license": "LGPL-2.0-or-later",
+  "supports": "!xbox",
   "dependencies": [
     {
       "name": "cairo",
@@ -38,14 +39,6 @@
     "introspection": {
       "description": "build with introspection",
       "dependencies": [
-        {
-          "name": "gobject-introspection",
-          "host": true
-        },
-        {
-          "name": "gobject-introspection",
-          "platform": "windows & x86"
-        },
         {
           "name": "harfbuzz",
           "features": [
diff --git a/external_imported/vcpkg/ports/pangomm/portfile.cmake b/external_imported/vcpkg/ports/pangomm/portfile.cmake
index 828d864f7..27b7b28fe 100644
--- a/external_imported/vcpkg/ports/pangomm/portfile.cmake
+++ b/external_imported/vcpkg/ports/pangomm/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 bffc55eedc4f278480a74afcf119b79a295bf5775123f582746ba425e19e2690d627baa9a9813b70db9e063db7efe959f365567dd7bcbc1fc862212ba8225a98
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE ${ARCHIVE}
 )
 
@@ -15,10 +15,9 @@ vcpkg_configure_meson(
     OPTIONS
         -Dmsvc14x-parallel-installable=false
         -Dbuild-documentation=false
-    ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal'
-                               glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums'
-    ADDITIONAL_CROSS_BINARIES  glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal'
-                               glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums'
+    ADDITIONAL_BINARIES
+        glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal'
+        glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums'
 )
 
 vcpkg_install_meson()
diff --git a/external_imported/vcpkg/ports/pangomm/vcpkg.json b/external_imported/vcpkg/ports/pangomm/vcpkg.json
index d44b90dee..955bef04f 100644
--- a/external_imported/vcpkg/ports/pangomm/vcpkg.json
+++ b/external_imported/vcpkg/ports/pangomm/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "pangomm",
   "version": "2.50.1",
+  "port-version": 3,
   "description": "pangomm is the official C++ interface for the Pango font layout library. See, for instance, the Pango::Layout class.",
   "homepage": "https://gitlab.gnome.org/GNOME/pangomm",
-  "license": "LGPL-2.1",
-  "supports": "!arm",
+  "license": "LGPL-2.1-or-later",
+  "supports": "!(arm | xbox)",
   "dependencies": [
     "cairo",
     "cairomm",
diff --git a/external_imported/vcpkg/ports/parallel-hashmap/portfile.cmake b/external_imported/vcpkg/ports/parallel-hashmap/portfile.cmake
index 1a6217be8..058e76a38 100644
--- a/external_imported/vcpkg/ports/parallel-hashmap/portfile.cmake
+++ b/external_imported/vcpkg/ports/parallel-hashmap/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO greg7mdp/parallel-hashmap
-    REF v1.3.8
-    SHA512 499f132aa1513942762ae5214e9a37915529d60142439d32276d9e68a446c93ecea66caa32ac00bea683e2c932101cd999c8839a89211e91032f777f236181f7
+    REF "v${VERSION}"
+    SHA512 2b9445ecf71d3b5705304e970dea1db314c80b4ee112436939bffeaac43db6199ed566bec0e68f95a4dfab415cfe6aaecd7083ef9d7b8f6b6c612e4f24612f43
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/parallel-hashmap/vcpkg.json b/external_imported/vcpkg/ports/parallel-hashmap/vcpkg.json
index d370b7296..463ab8803 100644
--- a/external_imported/vcpkg/ports/parallel-hashmap/vcpkg.json
+++ b/external_imported/vcpkg/ports/parallel-hashmap/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "parallel-hashmap",
-  "version": "1.3.8",
+  "version": "1.3.11",
   "description": "A header-only, very fast and memory-friendly family of C++ hash map & btree containers.",
   "license": "Apache-2.0",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/parallelstl/vcpkg.json b/external_imported/vcpkg/ports/parallelstl/vcpkg.json
index 96875cd55..8cae816e0 100644
--- a/external_imported/vcpkg/ports/parallelstl/vcpkg.json
+++ b/external_imported/vcpkg/ports/parallelstl/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "parallelstl",
-  "version-string": "20200330",
-  "port-version": 2,
+  "version": "20200330",
+  "port-version": 3,
   "description": "Parallel STL is an implementation of the C++ standard library algorithms with support for execution policies, as specified in ISO/IEC 14882:2017 standard, commonly called C++17.",
   "homepage": "https://github.com/intel/parallelstl",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/paraview/portfile.cmake b/external_imported/vcpkg/ports/paraview/portfile.cmake
index 9b9c38d1f..189311d7f 100644
--- a/external_imported/vcpkg/ports/paraview/portfile.cmake
+++ b/external_imported/vcpkg/ports/paraview/portfile.cmake
@@ -76,7 +76,10 @@ file(COPY "${ICET_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/ThirdParty/IceT/vtk
 if("python" IN_LIST FEATURES)
     set(python_ver "")
     if(NOT VCPKG_TARGET_IS_WINDOWS)
-        set(python_ver 3.10)
+        file(GLOB _py3_include_path "${CURRENT_HOST_INSTALLED_DIR}/include/python3*")
+        string(REGEX MATCH "python3\\.([0-9]+)" _python_version_tmp ${_py3_include_path})
+        set(PYTHON_VERSION_MINOR "${CMAKE_MATCH_1}")
+        set(python_ver "3.${PYTHON_VERSION_MINOR}")
     endif()
     list(APPEND ADDITIONAL_OPTIONS
         -DPython3_FIND_REGISTRY=NEVER
@@ -194,6 +197,11 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
 
+file(GLOB cmake_files "${CURRENT_PACKAGES_DIR}/share/${PORT}/*.cmake")
+foreach(file IN LISTS cmake_files)
+    vcpkg_replace_string("${file}" "pv5.11d.exe" "pv5.11.exe")
+endforeach() 
+ 
 # The plugins also work without these files
 file(REMOVE "${CURRENT_PACKAGES_DIR}/Applications/paraview.app/Contents/Resources/paraview.conf")
 file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/Applications/paraview.app/Contents/Resources/paraview.conf")
diff --git a/external_imported/vcpkg/ports/paraview/vcpkg.json b/external_imported/vcpkg/ports/paraview/vcpkg.json
index a0983cd4d..2292f60c9 100644
--- a/external_imported/vcpkg/ports/paraview/vcpkg.json
+++ b/external_imported/vcpkg/ports/paraview/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "paraview",
   "version": "5.11.0",
-  "port-version": 2,
+  "port-version": 4,
   "description": "VTK-based Data Analysis and Visualization Application",
   "homepage": "https://www.paraview.org/",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/parquet/vcpkg.json b/external_imported/vcpkg/ports/parquet/vcpkg.json
index c604f1a9f..8fbce1182 100644
--- a/external_imported/vcpkg/ports/parquet/vcpkg.json
+++ b/external_imported/vcpkg/ports/parquet/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "parquet",
-  "version-string": "0",
-  "port-version": 1,
+  "version": "0",
+  "port-version": 2,
   "description": "Parquet-cpp is a C++ library to read and write the Apache Parquet columnar data format.  It is now part of the arrow library.",
   "dependencies": [
     "arrow"
diff --git a/external_imported/vcpkg/ports/pbc/portfile.cmake b/external_imported/vcpkg/ports/pbc/portfile.cmake
index 235cb9f51..fd3b1f855 100644
--- a/external_imported/vcpkg/ports/pbc/portfile.cmake
+++ b/external_imported/vcpkg/ports/pbc/portfile.cmake
@@ -1,17 +1,15 @@
-set(PBC_VERSION 0.5.14)
-
 if(NOT VCPKG_TARGET_IS_WINDOWS)
     vcpkg_download_distfile(
         ARCHIVE
-        URLS "https://crypto.stanford.edu/pbc/files/pbc-${PBC_VERSION}.tar.gz"
-        FILENAME pbc-${PBC_VERSION}.tar.gz
+        URLS "https://crypto.stanford.edu/pbc/files/pbc-${VERSION}.tar.gz"
+        FILENAME pbc-${VERSION}.tar.gz
         SHA512 d75d4ceb3f67ee62c7ca41e2a91ee914fbffaeb70256675aed6734d586950ea8e64e2f16dc069d71481eddb703624df8d46497005fb58e75cf098dd7e7961333
     )
 
-    vcpkg_extract_source_archive_ex(
-        OUT_SOURCE_PATH SOURCE_PATH
+    vcpkg_extract_source_archive(
+        SOURCE_PATH
         ARCHIVE ${ARCHIVE}
-        REF ${PBC_VERSION}
+        SOURCE_BASE "${VERSION}"
         PATCHES linux.patch
     )
 
@@ -27,7 +25,7 @@ if(NOT VCPKG_TARGET_IS_WINDOWS)
     set(OPTIONS ${SHARED_STATIC} LEX=${FLEX} YACC=${BISON}\ -y)
 
     vcpkg_configure_make(
-        SOURCE_PATH ${SOURCE_PATH}
+        SOURCE_PATH "${SOURCE_PATH}"
         AUTOCONFIG
         COPY_SOURCE
         OPTIONS
@@ -36,8 +34,8 @@ if(NOT VCPKG_TARGET_IS_WINDOWS)
 
     vcpkg_install_make()
 
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share ${CURRENT_PACKAGES_DIR}/share/info)
-    file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/share/info")
+    vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
 else()
     vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
     vcpkg_from_github(
@@ -49,20 +47,17 @@ else()
         PATCHES windows.patch
     )
 
-    set(CMAKE_FIND_LIBRARY_PREFIXES "")
-    set(CMAKE_FIND_LIBRARY_SUFFIXES "")
-
-    find_path(MPIR_INCLUDE_DIR "gmp.h" HINTS ${CURRENT_INSTALLED_DIR} PATH_SUFFIXES include)
+    find_path(MPIR_INCLUDE_DIR "gmp.h" HINTS "${CURRENT_INSTALLED_DIR}" PATH_SUFFIXES include)
     if(NOT MPIR_INCLUDE_DIR)
         message(FATAL_ERROR "GMP includes not found")
     endif()
 
-    find_library(MPIR_LIBRARIES_REL NAMES "mpir.lib" HINTS ${CURRENT_INSTALLED_DIR} PATH_SUFFIXES lib)
+    find_library(MPIR_LIBRARIES_REL NAMES "mpir.lib" HINTS "${CURRENT_INSTALLED_DIR}" PATH_SUFFIXES lib)
     if(NOT MPIR_LIBRARIES_REL)
         message(FATAL_ERROR "mpir library not found")
     endif()
 
-    find_library(MPIR_LIBRARIES_DBG NAMES "mpir.lib" HINTS ${CURRENT_INSTALLED_DIR} PATH_SUFFIXES debug/lib)
+    find_library(MPIR_LIBRARIES_DBG NAMES "mpir.lib" HINTS "${CURRENT_INSTALLED_DIR}" PATH_SUFFIXES debug/lib)
     if(NOT MPIR_LIBRARIES_DBG)
         message(FATAL_ERROR "mpir debug library not found")
     endif()
@@ -75,12 +70,6 @@ else()
         set(ConfigurationSuffix " DLL")
     endif()
 
-    if(VCPKG_CRT_LINKAGE STREQUAL "static")
-        set(RuntimeLibraryExt "")
-    else()
-        set(RuntimeLibraryExt "DLL")
-    endif()
-
     if(TRIPLET_SYSTEM_ARCH STREQUAL "x86")
         set(Platform "Win32")
     else()
@@ -88,26 +77,24 @@ else()
     endif()
 
     # PBC expects mpir directory in build root
-    get_filename_component(SOURCE_PATH_PARENT ${SOURCE_PATH} DIRECTORY)
-    file(REMOVE_RECURSE ${SOURCE_PATH_PARENT}/mpir)
-    file(MAKE_DIRECTORY ${SOURCE_PATH_PARENT}/mpir)
+    get_filename_component(SOURCE_PATH_PARENT "${SOURCE_PATH}" DIRECTORY)
+    file(REMOVE_RECURSE "${SOURCE_PATH_PARENT}/mpir")
+    file(MAKE_DIRECTORY "${SOURCE_PATH_PARENT}/mpir")
     file(GLOB FILES ${MPIR_INCLUDE_DIR}/gmp*.h)
     file(COPY ${FILES} ${MPIR_LIBRARIES_REL} DESTINATION "${SOURCE_PATH_PARENT}/mpir/${LibrarySuffix}/${Platform}/Release")
     file(COPY ${FILES} ${MPIR_LIBRARIES_DBG} DESTINATION "${SOURCE_PATH_PARENT}/mpir/${LibrarySuffix}/${Platform}/Debug")
 
-    get_filename_component(SOURCE_PATH_SUFFIX ${SOURCE_PATH} NAME)
-    vcpkg_install_msbuild(SOURCE_PATH ${SOURCE_PATH_PARENT}
-        PROJECT_SUBPATH ${SOURCE_PATH_SUFFIX}/pbcwin/projects/pbclib.vcxproj
-        INCLUDES_SUBPATH ${SOURCE_PATH_SUFFIX}/include
-        LICENSE_SUBPATH ${SOURCE_PATH_SUFFIX}/COPYING
+    get_filename_component(SOURCE_PATH_SUFFIX "${SOURCE_PATH}" NAME)
+    vcpkg_msbuild_install(SOURCE_PATH "${SOURCE_PATH_PARENT}"
+        PROJECT_SUBPATH "${SOURCE_PATH_SUFFIX}/pbcwin/projects/pbclib.vcxproj"
         RELEASE_CONFIGURATION "Release${ConfigurationSuffix}"
         DEBUG_CONFIGURATION "Debug${ConfigurationSuffix}"
-        OPTIONS_DEBUG "/p:RuntimeLibrary=MultiThreadedDebug${RuntimeLibraryExt}"
-        OPTIONS_RELEASE "/p:RuntimeLibrary=MultiThreaded${RuntimeLibraryExt}"
         OPTIONS /p:SolutionDir=../
-        ALLOW_ROOT_INCLUDES ON
     )
 
+    vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
+    file(COPY "${SOURCE_PATH}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
     # clean up mpir stuff
-    file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/mpir.lib ${CURRENT_PACKAGES_DIR}/debug/lib/mpir.lib)
+    file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/mpir.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/mpir.lib")
+    file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/unofficial-pbc-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}")
 endif()
diff --git a/external_imported/vcpkg/ports/pbc/unofficial-pbc-config.cmake b/external_imported/vcpkg/ports/pbc/unofficial-pbc-config.cmake
new file mode 100644
index 000000000..5e71df0c0
--- /dev/null
+++ b/external_imported/vcpkg/ports/pbc/unofficial-pbc-config.cmake
@@ -0,0 +1,25 @@
+if(NOT TARGET unofficial::pbc::pbc)
+    get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+    get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+    get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+
+    add_library(unofficial::pbc::pbc UNKNOWN IMPORTED)
+
+    set_target_properties(unofficial::pbc::pbc PROPERTIES
+      INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
+    )
+
+    find_library(PBC_LIBRARY_DEBUG NAMES pbclib libpbc PATHS "${_IMPORT_PREFIX}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH)
+    if(EXISTS "${PBC_LIBRARY_DEBUG}")
+        set_property(TARGET unofficial::pbc::pbc APPEND PROPERTY IMPORTED_CONFIGURATIONS "Debug")
+        set_target_properties(unofficial::pbc::pbc PROPERTIES IMPORTED_LOCATION_DEBUG "${PBC_LIBRARY_DEBUG}")
+    endif()
+
+    find_library(PBC_LIBRARY_RELEASE NAMES pbclib libpbc PATHS "${_IMPORT_PREFIX}/" PATH_SUFFIXES lib NO_DEFAULT_PATH)
+    if(EXISTS "${PBC_LIBRARY_RELEASE}")
+        set_property(TARGET unofficial::pbc::pbc APPEND PROPERTY IMPORTED_CONFIGURATIONS "Release")
+        set_target_properties(unofficial::pbc::pbc PROPERTIES IMPORTED_LOCATION_RELEASE "${PBC_LIBRARY_RELEASE}")
+    endif()
+
+    unset(_IMPORT_PREFIX)
+endif()
diff --git a/external_imported/vcpkg/ports/pbc/vcpkg.json b/external_imported/vcpkg/ports/pbc/vcpkg.json
index b7a040aa8..3fb364a31 100644
--- a/external_imported/vcpkg/ports/pbc/vcpkg.json
+++ b/external_imported/vcpkg/ports/pbc/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "pbc",
   "version": "0.5.14",
-  "port-version": 6,
+  "port-version": 9,
   "description": "Pairing-Based Crypto library provides low-level routines for pairing-based cryptosystems.",
   "homepage": "https://crypto.stanford.edu/pbc",
+  "license": "LGPL-3.0",
   "supports": "!uwp & !arm",
   "dependencies": [
     {
@@ -13,6 +14,11 @@
     {
       "name": "mpir",
       "platform": "windows"
+    },
+    {
+      "name": "vcpkg-msbuild",
+      "host": true,
+      "platform": "windows"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/pcapplusplus/CMakeLists.txt b/external_imported/vcpkg/ports/pcapplusplus/CMakeLists.txt
deleted file mode 100644
index cec656d15..000000000
--- a/external_imported/vcpkg/ports/pcapplusplus/CMakeLists.txt
+++ /dev/null
@@ -1,113 +0,0 @@
-cmake_minimum_required(VERSION 3.12)
-
-project(pcapplusplus C CXX)
-
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
-
-if (WIN32)
-    set(BUILD_SHARED_LIBS OFF)
-endif()
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_EXTENSIONS ON)
-
-# dependencies
-include(FindPackageHandleStandardArgs)
-include(SelectLibraryConfigurations)
-if (WIN32)
-    find_path(PCAP_INCLUDES NAMES pcap.h)
-    find_library(PCAP_LIBRARY_RELEASE NAMES wpcap PATH_SUFFIXES lib REQUIRED)
-    find_library(PCAP_LIBRARY_DEBUG NAMES wpcap PATH_SUFFIXES lib REQUIRED)
-    find_library(PACKET_LIBRARY_RELEASE NAMES Packet PATH_SUFFIXES lib REQUIRED)
-    find_library(PACKET_LIBRARY_DEBUG NAMES Packet PATH_SUFFIXES lib REQUIRED)
-    select_library_configurations(PCAP)
-    select_library_configurations(PACKET)
-    list(APPEND PCAP_LIBRARIES ${PACKET_LIBRARIES})
-else()
-    find_path(PCAP_INCLUDES NAMES pcap.h)
-    find_library(PCAP_LIBRARY_RELEASE NAMES pcap PATH_SUFFIXES lib REQUIRED)
-    find_library(PCAP_LIBRARY_DEBUG NAMES pcap PATH_SUFFIXES lib REQUIRED)
-    select_library_configurations(PCAP)
-endif()
-
-find_package(Threads REQUIRED)
-
-# common++
-file(GLOB COMMONPP_HEADERS "${CMAKE_CURRENT_LIST_DIR}/Common++/header/*.h")
-file(GLOB COMMONPP_SOURCES "${CMAKE_CURRENT_LIST_DIR}/Common++/src/*.cpp")
-
-add_library(commonpp ${COMMONPP_SOURCES})
-
-target_include_directories(commonpp PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Common++/header> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/3rdParty/EndianPortable/include> $<INSTALL_INTERFACE:include>)
-
-set_target_properties(commonpp PROPERTIES OUTPUT_NAME Common++)
-if (WIN32)
-    target_compile_definitions(commonpp PRIVATE WPCAP HAVE_REMOTE _CRT_SECURE_NO_WARNINGS)
-elseif (UNIX AND NOT APPLE)
-    target_compile_definitions(commonpp PRIVATE LINUX)
-elseif (APPLE)
-    target_compile_definitions(commonpp PRIVATE MAC_OS_X)
-endif()
-
-# packet++
-file(GLOB PACKETPP_HEADERS "${CMAKE_CURRENT_LIST_DIR}/Packet++/header/*.h")
-file(GLOB PACKETPP_SOURCES "${CMAKE_CURRENT_LIST_DIR}/Packet++/src/*.cpp")
-list(APPEND PACKETPP_SOURCES "${CMAKE_CURRENT_LIST_DIR}/3rdParty/hash-library/md5.cpp")
-
-add_library(packetpp ${PACKETPP_SOURCES})
-
-target_include_directories(packetpp PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Packet++/header> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/3rdParty/hash-library> $<INSTALL_INTERFACE:include>)
-target_link_libraries(packetpp PRIVATE commonpp)
-set_target_properties(packetpp PROPERTIES OUTPUT_NAME Packet++)
-if (WIN32)
-    target_compile_definitions(packetpp PRIVATE WPCAP HAVE_REMOTE _CRT_SECURE_NO_WARNINGS)
-elseif (UNIX AND NOT APPLE)
-    target_compile_definitions(packetpp PRIVATE LINUX)
-elseif (APPLE)
-    target_compile_definitions(packetpp PRIVATE MAC_OS_X)
-endif()
-
-# pcap++
-file(GLOB PCAPPP_HEADERS "${CMAKE_CURRENT_LIST_DIR}/Pcap++/header/*.h")
-file(GLOB PCAPPP_SOURCES "${CMAKE_CURRENT_LIST_DIR}/Pcap++/src/*.cpp")
-file(GLOB LIGHTPCAPNG_SOURCES "${CMAKE_CURRENT_LIST_DIR}/3rdParty/LightPcapNg/LightPcapNg/src/*.c")
-
-add_library(pcappp ${PCAPPP_SOURCES} ${LIGHTPCAPNG_SOURCES})
-
-target_include_directories(pcappp PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Pcap++/header> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/3rdParty/LightPcapNg/LightPcapNg/include> "${PCAP_INCLUDES}" $<INSTALL_INTERFACE:include>)
-
-target_link_libraries(pcappp PUBLIC commonpp packetpp ${PCAP_LIBRARIES} Threads::Threads)
-
-if (WIN32)
-    target_link_libraries(pcappp PUBLIC ws2_32 iphlpapi)
-elseif (APPLE)
-    find_library(COREFOUNDATION_LIBRARY CoreFoundation)
-    find_library(SYSTEMCONFIGURATION_LIBRARY SystemConfiguration)
-    target_link_libraries(pcappp PUBLIC ${COREFOUNDATION_LIBRARY} ${SYSTEMCONFIGURATION_LIBRARY})
-endif()
-
-if (WIN32)
-    target_compile_definitions(pcappp PRIVATE WPCAP HAVE_REMOTE HAVE_STRUCT_TIMESPEC _CRT_SECURE_NO_WARNINGS)
-elseif (UNIX AND NOT APPLE)
-    target_compile_definitions(pcappp PRIVATE LINUX)
-elseif (APPLE)
-    target_compile_definitions(pcappp PRIVATE MAC_OS_X)
-endif()
-
-set_target_properties(pcappp PROPERTIES OUTPUT_NAME Pcap++)
-
-# Install
-install(FILES ${PCAPPP_HEADERS} ${COMMONPP_HEADERS} ${PACKETPP_HEADERS} DESTINATION include)
-install(FILES "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION share/pcapplusplus)
-
-install(
-  TARGETS pcappp commonpp packetpp
-  EXPORT unofficial-pcapplusplus-config
-  RUNTIME DESTINATION bin
-  LIBRARY DESTINATION lib
-  ARCHIVE DESTINATION lib
-)
-
-install(EXPORT unofficial-pcapplusplus-config
-  NAMESPACE unofficial::pcapplusplus::
-  DESTINATION share/unofficial-pcapplusplus
-)
diff --git a/external_imported/vcpkg/ports/pcapplusplus/portfile.cmake b/external_imported/vcpkg/ports/pcapplusplus/portfile.cmake
index 34c6676c0..e52619655 100644
--- a/external_imported/vcpkg/ports/pcapplusplus/portfile.cmake
+++ b/external_imported/vcpkg/ports/pcapplusplus/portfile.cmake
@@ -1,29 +1,31 @@
-if (VCPKG_TARGET_IS_WINDOWS)
+if(VCPKG_TARGET_IS_WINDOWS)
     vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 endif()
 
+# Convert PcapPlusPlus to add leading zero 23.9 => 23.09
+string(REGEX REPLACE "^([0-9]+)[.]([0-9])\$" "\\1.0\\2" PCAPPLUSPLUS_VERSION "${VERSION}")
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO seladb/PcapPlusPlus
-    REF v22.11
-    SHA512 41a507ce385d8549186eeec1a1ae138070ab2021d9ffd907829551b3b865ecb526fa05a0ff9ca01b41a2a2807a60a3cba016f62063d30d849282c83e17a2b6e1
+    REF "v${PCAPPLUSPLUS_VERSION}"
+    SHA512 e7dc1dbd85c9f0d2f9c5d3e436456c2cd183fb508c869fa8fb83f46aac99b868a16283204e5d57a0bfd7587f6ac2582b3e14c6098683fad4501708c8fededd6a
     HEAD_REF master
 )
-file(COPY "${CURRENT_PORT_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DPCAPPP_BUILD_EXAMPLES=OFF
 )
 
 vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/pcapplusplus)
+vcpkg_fixup_pkgconfig()
 vcpkg_copy_pdbs()
 
-file(APPEND ${CURRENT_PACKAGES_DIR}/share/unofficial-pcapplusplus/unofficial-pcapplusplus-config.cmake "
-include(CMakeFindDependencyMacro)
-find_dependency(Threads)")
-
-vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-pcapplusplus)
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share"
+                    "${CURRENT_PACKAGES_DIR}/debug/include"
+)
 
-file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/pcapplusplus/vcpkg.json b/external_imported/vcpkg/ports/pcapplusplus/vcpkg.json
index 9ca986c2e..963d22b64 100644
--- a/external_imported/vcpkg/ports/pcapplusplus/vcpkg.json
+++ b/external_imported/vcpkg/ports/pcapplusplus/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "pcapplusplus",
-  "version-string": "22.11",
+  "version": "23.9",
+  "port-version": 1,
   "description": "PcapPlusPlus is a multi-platform C++ library for capturing, parsing and crafting of network packets",
   "homepage": "https://github.com/seladb/PcapPlusPlus",
   "license": null,
@@ -9,10 +10,6 @@
       "name": "libpcap",
       "platform": "!windows"
     },
-    {
-      "name": "pthreads",
-      "platform": "windows"
-    },
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/external_imported/vcpkg/ports/pcg/vcpkg.json b/external_imported/vcpkg/ports/pcg/vcpkg.json
index ce5e0de21..ebabf6470 100644
--- a/external_imported/vcpkg/ports/pcg/vcpkg.json
+++ b/external_imported/vcpkg/ports/pcg/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "pcg",
-  "version-string": "2021-04-06",
-  "port-version": 1,
+  "version-date": "2021-04-06",
+  "port-version": 2,
   "description": "Permuted Congruential Generator"
 }
diff --git a/external_imported/vcpkg/ports/pciids/acquire_pciids.cmake b/external_imported/vcpkg/ports/pciids/acquire_pciids.cmake
new file mode 100644
index 000000000..6f8e8ec2b
--- /dev/null
+++ b/external_imported/vcpkg/ports/pciids/acquire_pciids.cmake
@@ -0,0 +1,9 @@
+function(acquire_pciids out_var)
+    vcpkg_from_github(
+        OUT_SOURCE_PATH SOURCE_PATH
+        REPO pciutils/pciids
+        REF 4e3f51b4b7ba7ffd3cca463d6a19daf0f4270252
+        SHA512 952b56affffdf9ecf78f6125cf4216bd01d85c55e49ec4b2dfb3a77bae2258dec6b4e2d28824d6408f072667480ef7e5f7279fd69bae65c071b7b3816fe9f504
+    )
+    set(${out_var} "${SOURCE_PATH}/pci.ids" PARENT_SCOPE)
+endfunction()
diff --git a/external_imported/vcpkg/ports/pciids/portfile.cmake b/external_imported/vcpkg/ports/pciids/portfile.cmake
new file mode 100644
index 000000000..200ee48c0
--- /dev/null
+++ b/external_imported/vcpkg/ports/pciids/portfile.cmake
@@ -0,0 +1,15 @@
+# This package doesn't "install" the pciids data file but
+# provides a maintainer function which does the download.
+
+set(VCPKG_POLICY_CMAKE_HELPER_PORT enabled)
+
+include("${CMAKE_CURRENT_LIST_DIR}/acquire_pciids.cmake")
+acquire_pciids(pciids_path)
+cmake_path(GET pciids_path PARENT_PATH pciids_dir)
+
+file(INSTALL
+    "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake"
+    "${CMAKE_CURRENT_LIST_DIR}/acquire_pciids.cmake"
+    DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
+)
+vcpkg_install_copyright(FILE_LIST "${pciids_dir}/README")
diff --git a/external_imported/vcpkg/ports/pciids/vcpkg-port-config.cmake b/external_imported/vcpkg/ports/pciids/vcpkg-port-config.cmake
new file mode 100644
index 000000000..9945df984
--- /dev/null
+++ b/external_imported/vcpkg/ports/pciids/vcpkg-port-config.cmake
@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_LIST_DIR}/acquire_pciids.cmake")
diff --git a/external_imported/vcpkg/ports/pciids/vcpkg.json b/external_imported/vcpkg/ports/pciids/vcpkg.json
new file mode 100644
index 000000000..edcb67c19
--- /dev/null
+++ b/external_imported/vcpkg/ports/pciids/vcpkg.json
@@ -0,0 +1,8 @@
+{
+  "name": "pciids",
+  "version-date": "2023-04-11",
+  "description": "Maintainer function to acquire a PCI ID Repository database snapshot",
+  "homepage": "https://pci-ids.ucw.cz/",
+  "license": "GPL-2.0-or-later OR BSD-3-Clause",
+  "supports": "native"
+}
diff --git a/external_imported/vcpkg/ports/pcl/add-gcc-version-check.patch b/external_imported/vcpkg/ports/pcl/add-gcc-version-check.patch
index 1a9740fac..fb5a5fccf 100644
--- a/external_imported/vcpkg/ports/pcl/add-gcc-version-check.patch
+++ b/external_imported/vcpkg/ports/pcl/add-gcc-version-check.patch
@@ -12,7 +12,7 @@ index 63b38df68..29f79d31b 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -311,6 +311,10 @@ if(NOT (${FLANN_LIBRARY_TYPE} MATCHES ${PCL_FLANN_REQUIRED_TYPE}) AND NOT (${PCL
-   message(FATAL_ERROR "Flann was selected with ${PCL_FLANN_REQUIRED_TYPE} but found as ${FLANN_LIBRARY_TYPE}")
+   endif()
  endif()
  
 +if(UNIX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0)
diff --git a/external_imported/vcpkg/ports/pcl/add_bigobj_option.patch b/external_imported/vcpkg/ports/pcl/add_bigobj_option.patch
deleted file mode 100644
index de0ddf27c..000000000
--- a/external_imported/vcpkg/ports/pcl/add_bigobj_option.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 17020e162..132fbcedb 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -142,8 +142,9 @@ endif()
- if(CMAKE_COMPILER_IS_MSVC)
-   add_definitions("-DBOOST_ALL_NO_LIB -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DNOMINMAX -DPCL_ONLY_CORE_POINT_TYPES ${SSE_DEFINITIONS}")
-   
-+  string(APPEND CMAKE_CXX_FLAGS " /bigobj")
-   if("${CMAKE_CXX_FLAGS}" STREQUAL "${CMAKE_CXX_FLAGS_DEFAULT}")
--    string(APPEND CMAKE_CXX_FLAGS " /fp:precise ${SSE_FLAGS} ${AVX_FLAGS} /bigobj")
-+    string(APPEND CMAKE_CXX_FLAGS " /fp:precise ${SSE_FLAGS} ${AVX_FLAGS}")
- 
-     # Add extra code generation/link optimizations
-     if(CMAKE_MSVC_CODE_LINK_OPTIMIZATION AND (NOT BUILD_CUDA) AND (NOT BUILD_GPU))
diff --git a/external_imported/vcpkg/ports/pcl/disable_kinfu_for_cuda12.patch b/external_imported/vcpkg/ports/pcl/disable_kinfu_for_cuda12.patch
deleted file mode 100644
index 7585c66e8..000000000
--- a/external_imported/vcpkg/ports/pcl/disable_kinfu_for_cuda12.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/gpu/kinfu/CMakeLists.txt b/gpu/kinfu/CMakeLists.txt
-index 29cb73e95..fbbd294fd 100644
---- a/gpu/kinfu/CMakeLists.txt
-+++ b/gpu/kinfu/CMakeLists.txt
-@@ -2,7 +2,12 @@ set(SUBSYS_NAME gpu_kinfu)
- set(SUBSYS_PATH gpu/kinfu)
- set(SUBSYS_DESC "Kinect Fusion implementation")
- set(SUBSYS_DEPS common io gpu_containers geometry search)
--set(DEFAULT TRUE)
-+if(${CUDA_VERSION_STRING} VERSION_GREATER_EQUAL "12.0")
-+  set(DEFAULT FALSE)
-+  set(REASON "Kinfu uses textures which was removed in CUDA 12")
-+else()
-+  set(DEFAULT TRUE)
-+endif()
- 
- PCL_SUBSYS_OPTION(build "${SUBSYS_NAME}" "${SUBSYS_DESC}" ${DEFAULT} "${REASON}")
- PCL_SUBSYS_DEPEND(build NAME ${SUBSYS_NAME} DEPS ${SUBSYS_DEPS})
-diff --git a/gpu/kinfu_large_scale/CMakeLists.txt b/gpu/kinfu_large_scale/CMakeLists.txt
-index d7efc4ad5..0488fcb46 100644
---- a/gpu/kinfu_large_scale/CMakeLists.txt
-+++ b/gpu/kinfu_large_scale/CMakeLists.txt
-@@ -2,7 +2,12 @@ set(SUBSYS_NAME gpu_kinfu_large_scale)
- set(SUBSYS_PATH gpu/kinfu_large_scale)
- set(SUBSYS_DESC "Kinect Fusion implementation, with volume shifting")
- set(SUBSYS_DEPS common io gpu_containers gpu_utils geometry search octree filters kdtree features surface)
--set(DEFAULT TRUE)
-+if(${CUDA_VERSION_STRING} VERSION_GREATER_EQUAL "12.0")
-+  set(DEFAULT FALSE)
-+  set(REASON "Kinfu_large_scale uses textures which was removed in CUDA 12")
-+else()
-+  set(DEFAULT TRUE)
-+endif()
- 
- PCL_SUBSYS_OPTION(build "${SUBSYS_NAME}" "${SUBSYS_DESC}" ${DEFAULT} "${REASON}")
- PCL_SUBSYS_DEPEND(build NAME ${SUBSYS_NAME} DEPS ${SUBSYS_DEPS})
diff --git a/external_imported/vcpkg/ports/pcl/fix-clang-cl.patch b/external_imported/vcpkg/ports/pcl/fix-clang-cl.patch
new file mode 100644
index 000000000..245c91791
--- /dev/null
+++ b/external_imported/vcpkg/ports/pcl/fix-clang-cl.patch
@@ -0,0 +1,26 @@
+diff --git a/common/include/pcl/impl/instantiate.hpp b/common/include/pcl/impl/instantiate.hpp
+index ea73a0c..4cfc92b 100644
+--- a/common/include/pcl/impl/instantiate.hpp
++++ b/common/include/pcl/impl/instantiate.hpp
+@@ -95,7 +95,7 @@
+ //
+ //    ((x)(y)(z))((1)(2)(3))((dracula)(radu))
+ //
+-#ifdef _MSC_VER
++#if defined(_MSC_VER) && ! defined(__clang__)
+ #define PCL_INSTANTIATE_PRODUCT_IMPL(r, product) \
+   BOOST_PP_CAT(PCL_INSTANTIATE_, BOOST_PP_SEQ_HEAD(product)) \
+           BOOST_PP_EXPAND(BOOST_PP_SEQ_TO_TUPLE(BOOST_PP_SEQ_TAIL(product))) 
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fad95c9..b4ca305 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -51,7 +51,7 @@ set(CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING
+ # Compiler identification
+ # Define a variable CMAKE_COMPILER_IS_X where X is the compiler short name.
+ # Note: CMake automatically defines one for GNUCXX, nothing to do in this case.
+-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
++if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT MSVC)
+   set(CMAKE_COMPILER_IS_CLANG 1)
+ elseif(__COMPILER_PATHSCALE)
+   set(CMAKE_COMPILER_IS_PATHSCALE 1)
diff --git a/external_imported/vcpkg/ports/pcl/fix-numeric-literals-flag.patch b/external_imported/vcpkg/ports/pcl/fix-numeric-literals-flag.patch
index b3db97390..69a1223c1 100644
--- a/external_imported/vcpkg/ports/pcl/fix-numeric-literals-flag.patch
+++ b/external_imported/vcpkg/ports/pcl/fix-numeric-literals-flag.patch
@@ -19,8 +19,8 @@ index 7cf86f74b..e07fd430a 100644
 +    add_definitions(-fext-numeric-literals)
 +endif()
  
- ### ---[ Create the config.h file
- set(pcl_config_h_in "${CMAKE_CURRENT_SOURCE_DIR}/pcl_config.h.in")
+ # System zlib (for nurbs on surface)
+ option(WITH_SYSTEM_ZLIB "Use system zlib" TRUE)
 -- 
 2.32.0.windows.1
 
diff --git a/external_imported/vcpkg/ports/pcl/fix-pcl-exports.patch b/external_imported/vcpkg/ports/pcl/fix-pcl-exports.patch
new file mode 100644
index 000000000..84d994797
--- /dev/null
+++ b/external_imported/vcpkg/ports/pcl/fix-pcl-exports.patch
@@ -0,0 +1,25 @@
+diff --git a/gpu/segmentation/include/pcl/gpu/segmentation/impl/gpu_extract_clusters.hpp b/gpu/segmentation/include/pcl/gpu/segmentation/impl/gpu_extract_clusters.hpp
+index 2e2be0de3..d1340a93c 100644
+--- a/gpu/segmentation/include/pcl/gpu/segmentation/impl/gpu_extract_clusters.hpp
++++ b/gpu/segmentation/include/pcl/gpu/segmentation/impl/gpu_extract_clusters.hpp
+@@ -44,7 +44,7 @@ namespace pcl {
+ namespace detail {
+ 
+ //// Downloads only the neccssary cluster indices from the device to the host.
+-void
++PCL_EXPORTS void
+ economical_download(const pcl::gpu::NeighborIndices& source_indices,
+                     const pcl::Indices& buffer_indices,
+                     std::size_t buffer_size,
+diff --git a/visualization/include/pcl/visualization/vtk/vtkRenderWindowInteractorFix.h b/visualization/include/pcl/visualization/vtk/vtkRenderWindowInteractorFix.h
+index b427e76d9..7958f80e6 100644
+--- a/visualization/include/pcl/visualization/vtk/vtkRenderWindowInteractorFix.h
++++ b/visualization/include/pcl/visualization/vtk/vtkRenderWindowInteractorFix.h
+@@ -38,5 +38,6 @@
+ #pragma once
+ 
+ #include <vtkRenderWindowInteractor.h>
++#include <pcl/pcl_exports.h>
+ 
+-vtkRenderWindowInteractor* vtkRenderWindowInteractorFixNew ();
++PCL_EXPORTS vtkRenderWindowInteractor* vtkRenderWindowInteractorFixNew ();
diff --git a/external_imported/vcpkg/ports/pcl/fix_opennurbs_win32.patch b/external_imported/vcpkg/ports/pcl/fix_opennurbs_win32.patch
deleted file mode 100644
index 407f2429b..000000000
--- a/external_imported/vcpkg/ports/pcl/fix_opennurbs_win32.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/surface/include/pcl/surface/3rdparty/opennurbs/opennurbs_system.h b/surface/include/pcl/surface/3rdparty/opennurbs/opennurbs_system.h
-index 384e7bac8..cde079401 100644
---- a/surface/include/pcl/surface/3rdparty/opennurbs/opennurbs_system.h
-+++ b/surface/include/pcl/surface/3rdparty/opennurbs/opennurbs_system.h
-@@ -137,15 +137,15 @@
- #if defined(_M_X64) && defined(WIN32) && defined(WIN64)
- // 23 August 2007 Dale Lear
- 
--#if defined(_INC_WINDOWS)
-+//#if defined(_INC_WINDOWS)
- // The user has included Microsoft's windows.h before opennurbs.h,
- // and windows.h has nested includes that unconditionally define WIN32.
- // Just undo the damage here or everybody that includes opennurbs.h after
- // windows.h has to fight with this Microsoft bug.
- #undef WIN32
--#else
--#error do not define WIN32 for x64 builds
--#endif
-+//#else
-+//#error do not define WIN32 for x64 builds
-+//#endif
- 
- // NOTE _WIN32 is defined for any type of Windows build
- #endif
diff --git a/external_imported/vcpkg/ports/pcl/outofcore_viewer_remove_include.patch b/external_imported/vcpkg/ports/pcl/outofcore_viewer_remove_include.patch
deleted file mode 100644
index e0435016f..000000000
--- a/external_imported/vcpkg/ports/pcl/outofcore_viewer_remove_include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/outofcore/tools/outofcore_viewer.cpp b/outofcore/tools/outofcore_viewer.cpp
-index 6ec57e09359..795e03d7598 100644
---- a/outofcore/tools/outofcore_viewer.cpp
-+++ b/outofcore/tools/outofcore_viewer.cpp
-@@ -112,7 +112,6 @@ using AlignedPointT = Eigen::aligned_allocator<PointT>;
- #include <vtkLODActor.h>
- #include <vtkMath.h>
- #include <vtkMatrix4x4.h>
--#include <vtkMutexLock.h>
- #include <vtkObjectFactory.h>
- #include <vtkPolyData.h>
- #include <vtkProperty.h>
diff --git a/external_imported/vcpkg/ports/pcl/portfile.cmake b/external_imported/vcpkg/ports/pcl/portfile.cmake
index 26a23c293..917442a3b 100644
--- a/external_imported/vcpkg/ports/pcl/portfile.cmake
+++ b/external_imported/vcpkg/ports/pcl/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO PointCloudLibrary/pcl
-    REF 371a8e1373f7b2f66bbb92291be2f3e50dc19856 # pcl-1.13.0
-    SHA512 5c023e46386882d51a5d9a3c8ac594c17585e3d14c011964109ad0ae432c660ebb7fc1fe56f1130b6eafa75d1d9ca48f05e22e1d7cbb4a0794e32982da168563
+    REF "pcl-${VERSION}"
+    SHA512 0ea388d5f4ccdc1e5fcace6a1e1b90843be1a4ed2e1d37cc3c80d8abc0e868324d8f9da80513f1cb3f16738e00586f29cac151ce0d501645514f280aee8b1d7f
     HEAD_REF master
     PATCHES
         add-gcc-version-check.patch
@@ -12,66 +12,61 @@ vcpkg_from_github(
         pcl_utils.patch
         install-examples.patch
         no-absolute.patch
-        add_bigobj_option.patch
-        outofcore_viewer_remove_include.patch
-        fix_opennurbs_win32.patch
-        disable_kinfu_for_cuda12.patch
+        fix-clang-cl.patch
+        fix-pcl-exports.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PCL_SHARED_LIBS)
 
-if ("cuda" IN_LIST FEATURES AND VCPKG_TARGET_ARCHITECTURE STREQUAL x86)
-    message(FATAL_ERROR "Feature cuda only supports 64-bit compilation.")
-endif()
-
-if ("tools" IN_LIST FEATURES AND VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    message(FATAL_ERROR "Feature tools only supports dynamic build")
-endif()
-
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
-        openni2         WITH_OPENNI2
-        qt              WITH_QT
-        pcap            WITH_PCAP
+        apps            BUILD_apps
         cuda            WITH_CUDA
         cuda            BUILD_CUDA
         cuda            BUILD_GPU
-        tools           BUILD_tools
-        opengl          WITH_OPENGL
+        examples        BUILD_examples
         libusb          WITH_LIBUSB
+        opengl          WITH_OPENGL
+        openni2         WITH_OPENNI2
+        pcap            WITH_PCAP
+        qt              WITH_QT
+        simulation      BUILD_simulation
+        surface-on-nurbs BUILD_surface_on_nurbs
+        tools           BUILD_tools
         visualization   WITH_VTK
         visualization   BUILD_visualization
-        examples        BUILD_examples
-        apps            BUILD_apps
         # These 2 apps need openni1
         #apps            BUILD_apps_in_hand_scanner
         #apps            BUILD_apps_3d_rec_framework
-        simulation      BUILD_simulation
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-        # BUILD
-        -DBUILD_surface_on_nurbs=ON
         # PCL
+        -DPCL_ALLOW_BOTH_SHARED_AND_STATIC_DEPENDENCIES=ON
         -DPCL_BUILD_WITH_BOOST_DYNAMIC_LINKING_WIN32=${PCL_SHARED_LIBS}
         -DPCL_BUILD_WITH_FLANN_DYNAMIC_LINKING_WIN32=${PCL_SHARED_LIBS}
         -DPCL_BUILD_WITH_QHULL_DYNAMIC_LINKING_WIN32=${PCL_SHARED_LIBS}
         -DPCL_SHARED_LIBS=${PCL_SHARED_LIBS}
-        -DPCL_ALLOW_BOTH_SHARED_AND_STATIC_DEPENDENCIES=ON
+        -DPCL_ENABLE_MARCHNATIVE=OFF
         # WITH
-        -DWITH_PNG=ON
-        -DWITH_QHULL=ON
-        -DWITH_OPENNI=OFF
-        -DWITH_ENSENSO=OFF
         -DWITH_DAVIDSDK=OFF
+        -DWITH_DOCS=OFF
         -DWITH_DSSDK=OFF
+        -DWITH_ENSENSO=OFF
+        -DWITH_OPENMP=OFF
+        -DWITH_OPENNI=OFF
+        -DWITH_PNG=ON
+        -DWITH_QHULL=ON
         -DWITH_RSSDK=OFF
         -DWITH_RSSDK2=OFF
-        -DWITH_OPENMP=OFF
         # FEATURES
         ${FEATURE_OPTIONS}
+    OPTIONS_DEBUG
+        -DBUILD_apps=OFF
+        -DBUILD_examples=OFF
+        -DBUILD_tools=OFF
     MAYBE_UNUSED_VARIABLES
         PCL_BUILD_WITH_FLANN_DYNAMIC_LINKING_WIN32
         PCL_BUILD_WITH_QHULL_DYNAMIC_LINKING_WIN32
@@ -111,12 +106,23 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 if(BUILD_tools OR BUILD_apps OR BUILD_examples)
-    file(GLOB EXEFILES_RELEASE "${CURRENT_PACKAGES_DIR}/bin/*${VCPKG_TARGET_EXECUTABLE_SUFFIX}")
-    file(GLOB EXEFILES_DEBUG "${CURRENT_PACKAGES_DIR}/debug/bin/*${VCPKG_TARGET_EXECUTABLE_SUFFIX}")
-    file(COPY ${EXEFILES_RELEASE} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/pcl")
-    file(REMOVE ${EXEFILES_RELEASE} ${EXEFILES_DEBUG})
-    vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/pcl")
+    file(GLOB tool_names
+        LIST_DIRECTORIES false
+        RELATIVE "${CURRENT_PACKAGES_DIR}/bin"
+        "${CURRENT_PACKAGES_DIR}/bin/*${VCPKG_TARGET_EXECUTABLE_SUFFIX}"
+    )
+    if(VCPKG_TARGET_EXECUTABLE_SUFFIX)
+        string(REPLACE "." "[.]" suffix "${VCPKG_TARGET_EXECUTABLE_SUFFIX}")
+        list(TRANSFORM tool_names REPLACE "${suffix}\$" "")
+    endif()
+    vcpkg_copy_tools(TOOL_NAMES ${tool_names} AUTO_CLEAN)
 endif()
 
+# pcl_apps.dll is only build for release but not used at all since BUILD_apps_3d_rec_framework is OFF.
+# Because it is not copied to the tool folder and there is no debug variant, we get an post build check error.
+# Since the lib is not needed. Delete it:
+file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/pcl_apps.dll" "${CURRENT_PACKAGES_DIR}/bin/pcl_apps.pdb"
+            "${CURRENT_PACKAGES_DIR}/lib/pcl_apps.lib" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/pcl_apps.pc")
+
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/external_imported/vcpkg/ports/pcl/vcpkg.json b/external_imported/vcpkg/ports/pcl/vcpkg.json
index ec9c07702..d30afe383 100644
--- a/external_imported/vcpkg/ports/pcl/vcpkg.json
+++ b/external_imported/vcpkg/ports/pcl/vcpkg.json
@@ -1,11 +1,10 @@
 {
   "name": "pcl",
-  "version": "1.13.0",
+  "version": "1.14.0",
   "port-version": 1,
   "description": "Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing.",
   "homepage": "https://github.com/PointCloudLibrary/pcl",
   "license": "BSD-3-Clause",
-  "supports": "!(arm64 & windows)",
   "dependencies": [
     "boost-asio",
     "boost-date-time",
@@ -55,6 +54,7 @@
     },
     "cuda": {
       "description": "CUDA support for PCL",
+      "supports": "x64",
       "dependencies": [
         "cuda"
       ]
@@ -62,6 +62,7 @@
     "examples": {
       "description": "Build PCL examples",
       "dependencies": [
+        "boost-format",
         {
           "name": "pcl",
           "features": [
@@ -77,7 +78,10 @@
       ]
     },
     "opengl": {
-      "description": "OpenGL support for PCL"
+      "description": "OpenGL support for PCL",
+      "dependencies": [
+        "opengl"
+      ]
     },
     "openni2": {
       "description": "OpenNI2 support for PCL",
@@ -130,8 +134,15 @@
         }
       ]
     },
+    "surface-on-nurbs": {
+      "description": "Fitting NURBS to point clouds",
+      "dependencies": [
+        "zlib"
+      ]
+    },
     "tools": {
       "description": "Build PCL utilities",
+      "supports": "!static",
       "dependencies": [
         "boost-accumulators"
       ]
diff --git a/external_imported/vcpkg/ports/pcre2/fix-cmake.patch b/external_imported/vcpkg/ports/pcre2/fix-cmake.patch
new file mode 100644
index 000000000..68a6c5f1a
--- /dev/null
+++ b/external_imported/vcpkg/ports/pcre2/fix-cmake.patch
@@ -0,0 +1,334 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8b5081e..ba2e993 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -100,6 +100,9 @@
+ # 2021-08-28 PH increased minimum version
+ # 2021-08-28 PH added test for realpath()
+ # 2022-12-10 PH added support for pcre2posix_test
++# 2023-01-15 Carlo added C99 as the minimum required
++# 2023-06-03 Theodore used standard CMake constructs to export the library's targets.
++# 2023-08-06 PH added support for setting variable length lookbehind maximum
+ 
+ # Increased minimum to 2.8.5 to support GNUInstallDirs.
+ # Increased minimum to 3.1 to support imported targets.
+@@ -136,6 +139,7 @@ INCLUDE(CheckFunctionExists)
+ INCLUDE(CheckSymbolExists)
+ INCLUDE(CheckIncludeFile)
+ INCLUDE(CheckTypeSize)
++INCLUDE(CMakePackageConfigHelpers)
+ INCLUDE(GNUInstallDirs) # for CMAKE_INSTALL_LIBDIR
+ 
+ CHECK_INCLUDE_FILE(dirent.h     HAVE_DIRENT_H)
+@@ -706,7 +710,9 @@ IF(PCRE2_BUILD_PCRE2_8)
+       VERSION ${LIBPCRE2_8_VERSION}
+       SOVERSION ${LIBPCRE2_8_SOVERSION})
+     TARGET_COMPILE_DEFINITIONS(pcre2-8-static PUBLIC PCRE2_STATIC)
+-    TARGET_INCLUDE_DIRECTORIES(pcre2-8-static PUBLIC ${PROJECT_BINARY_DIR})
++    TARGET_INCLUDE_DIRECTORIES(pcre2-8-static PUBLIC
++      $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>
++      $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+     IF(REQUIRE_PTHREAD)
+         TARGET_LINK_LIBRARIES(pcre2-8-static Threads::Threads)
+     ENDIF(REQUIRE_PTHREAD)
+@@ -719,8 +725,9 @@ IF(PCRE2_BUILD_PCRE2_8)
+       VERSION ${LIBPCRE2_POSIX_VERSION}
+       SOVERSION ${LIBPCRE2_POSIX_SOVERSION})
+     TARGET_LINK_LIBRARIES(pcre2-posix-static pcre2-8-static)
+-    TARGET_COMPILE_DEFINITIONS(pcre2-posix-static PUBLIC PCRE2_STATIC)
+-    TARGET_INCLUDE_DIRECTORIES(pcre2-posix-static PUBLIC ${PROJECT_BINARY_DIR})
++    TARGET_INCLUDE_DIRECTORIES(pcre2-posix-static PUBLIC
++      $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>
++      $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+     SET(targets ${targets} pcre2-posix-static)
+ 
+     IF(MSVC)
+@@ -737,7 +744,9 @@ IF(PCRE2_BUILD_PCRE2_8)
+ 
+   IF(BUILD_SHARED_LIBS)
+     ADD_LIBRARY(pcre2-8-shared SHARED ${PCRE2_HEADERS} ${PCRE2_SOURCES} ${PROJECT_BINARY_DIR}/config.h)
+-    TARGET_INCLUDE_DIRECTORIES(pcre2-8-shared PUBLIC ${PROJECT_BINARY_DIR})
++    TARGET_INCLUDE_DIRECTORIES(pcre2-8-shared PUBLIC
++      $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>
++      $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+     SET_TARGET_PROPERTIES(pcre2-8-shared PROPERTIES
+       COMPILE_DEFINITIONS PCRE2_CODE_UNIT_WIDTH=8
+       MACHO_COMPATIBILITY_VERSION "${LIBPCRE2_8_MACHO_COMPATIBILITY_VERSION}"
+@@ -750,7 +759,9 @@ IF(PCRE2_BUILD_PCRE2_8)
+     ENDIF(REQUIRE_PTHREAD)
+     SET(targets ${targets} pcre2-8-shared)
+     ADD_LIBRARY(pcre2-posix-shared SHARED ${PCRE2POSIX_HEADERS} ${PCRE2POSIX_SOURCES})
+-    TARGET_INCLUDE_DIRECTORIES(pcre2-posix-shared PUBLIC ${PROJECT_BINARY_DIR})
++    TARGET_INCLUDE_DIRECTORIES(pcre2-posix-shared PUBLIC
++      $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>
++      $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+     SET_TARGET_PROPERTIES(pcre2-posix-shared PROPERTIES
+       COMPILE_DEFINITIONS PCRE2_CODE_UNIT_WIDTH=8
+       MACHO_COMPATIBILITY_VERSION "${LIBPCRE2_POSIX_MACHO_COMPATIBILITY_VERSION}"
+@@ -787,7 +798,9 @@ ENDIF(PCRE2_BUILD_PCRE2_8)
+ IF(PCRE2_BUILD_PCRE2_16)
+   IF(BUILD_STATIC_LIBS)
+     ADD_LIBRARY(pcre2-16-static STATIC ${PCRE2_HEADERS} ${PCRE2_SOURCES} ${PROJECT_BINARY_DIR}/config.h)
+-    TARGET_INCLUDE_DIRECTORIES(pcre2-16-static PUBLIC ${PROJECT_BINARY_DIR})
++    TARGET_INCLUDE_DIRECTORIES(pcre2-16-static PUBLIC
++      $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>
++      $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+     SET_TARGET_PROPERTIES(pcre2-16-static PROPERTIES
+       COMPILE_DEFINITIONS PCRE2_CODE_UNIT_WIDTH=16
+       MACHO_COMPATIBILITY_VERSION "${LIBPCRE2_32_MACHO_COMPATIBILITY_VERSION}"
+@@ -812,7 +825,9 @@ IF(PCRE2_BUILD_PCRE2_16)
+ 
+   IF(BUILD_SHARED_LIBS)
+     ADD_LIBRARY(pcre2-16-shared SHARED ${PCRE2_HEADERS} ${PCRE2_SOURCES} ${PROJECT_BINARY_DIR}/config.h)
+-    TARGET_INCLUDE_DIRECTORIES(pcre2-16-shared PUBLIC ${PROJECT_BINARY_DIR})
++    TARGET_INCLUDE_DIRECTORIES(pcre2-16-shared PUBLIC
++      $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>
++      $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+     SET_TARGET_PROPERTIES(pcre2-16-shared PROPERTIES
+       COMPILE_DEFINITIONS PCRE2_CODE_UNIT_WIDTH=16
+       MACHO_COMPATIBILITY_VERSION "${LIBPCRE2_32_MACHO_COMPATIBILITY_VERSION}"
+@@ -849,7 +864,9 @@ ENDIF(PCRE2_BUILD_PCRE2_16)
+ IF(PCRE2_BUILD_PCRE2_32)
+   IF(BUILD_STATIC_LIBS)
+     ADD_LIBRARY(pcre2-32-static STATIC ${PCRE2_HEADERS} ${PCRE2_SOURCES} ${PROJECT_BINARY_DIR}/config.h)
+-    TARGET_INCLUDE_DIRECTORIES(pcre2-32-static PUBLIC ${PROJECT_BINARY_DIR})
++    TARGET_INCLUDE_DIRECTORIES(pcre2-32-static PUBLIC
++      $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>
++      $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+     SET_TARGET_PROPERTIES(pcre2-32-static PROPERTIES
+       COMPILE_DEFINITIONS PCRE2_CODE_UNIT_WIDTH=32
+       MACHO_COMPATIBILITY_VERSION "${LIBPCRE2_32_MACHO_COMPATIBILITY_VERSION}"
+@@ -874,7 +891,9 @@ IF(PCRE2_BUILD_PCRE2_32)
+ 
+   IF(BUILD_SHARED_LIBS)
+     ADD_LIBRARY(pcre2-32-shared SHARED ${PCRE2_HEADERS} ${PCRE2_SOURCES} ${PROJECT_BINARY_DIR}/config.h)
+-    TARGET_INCLUDE_DIRECTORIES(pcre2-32-shared PUBLIC ${PROJECT_BINARY_DIR})
++    TARGET_INCLUDE_DIRECTORIES(pcre2-32-shared PUBLIC
++      $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>
++      $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+     SET_TARGET_PROPERTIES(pcre2-32-shared PROPERTIES
+       COMPILE_DEFINITIONS PCRE2_CODE_UNIT_WIDTH=32
+       MACHO_COMPATIBILITY_VERSION "${LIBPCRE2_32_MACHO_COMPATIBILITY_VERSION}"
+@@ -1076,9 +1095,13 @@ ENDIF(PCRE2_BUILD_TESTS)
+ SET(CMAKE_INSTALL_ALWAYS 1)
+ 
+ INSTALL(TARGETS ${targets}
+-        RUNTIME DESTINATION bin
++        EXPORT pcre2-targets
++        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
++INSTALL(EXPORT pcre2-targets
++        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pcre2
++        NAMESPACE pcre2::)
+ INSTALL(FILES ${pkg_config_files} DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/pcre2-config"
+   DESTINATION bin
+@@ -1090,11 +1113,12 @@ INSTALL(FILES ${PCRE2_HEADERS} ${PCRE2POSIX_HEADERS} DESTINATION include)
+ # CMake config files.
+ set(PCRE2_CONFIG_IN  ${CMAKE_CURRENT_SOURCE_DIR}/cmake/pcre2-config.cmake.in)
+ set(PCRE2_CONFIG_OUT ${CMAKE_CURRENT_BINARY_DIR}/cmake/pcre2-config.cmake)
+-configure_file(${PCRE2_CONFIG_IN} ${PCRE2_CONFIG_OUT} @ONLY)
+-set(PCRE2_CONFIG_VERSION_IN  ${CMAKE_CURRENT_SOURCE_DIR}/cmake/pcre2-config-version.cmake.in)
++configure_package_config_file(${PCRE2_CONFIG_IN} ${PCRE2_CONFIG_OUT} INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pcre2)
+ set(PCRE2_CONFIG_VERSION_OUT ${CMAKE_CURRENT_BINARY_DIR}/cmake/pcre2-config-version.cmake)
+-configure_file(${PCRE2_CONFIG_VERSION_IN} ${PCRE2_CONFIG_VERSION_OUT} @ONLY)
+-install(FILES ${PCRE2_CONFIG_OUT} ${PCRE2_CONFIG_VERSION_OUT} DESTINATION cmake)
++write_basic_package_version_file(${PCRE2_CONFIG_VERSION_OUT}
++                                 VERSION ${PCRE2_MAJOR}.${PCRE2_MINOR}.0
++                                 COMPATIBILITY SameMajorVersion)
++install(FILES ${PCRE2_CONFIG_OUT} ${PCRE2_CONFIG_VERSION_OUT} DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pcre2)
+ 
+ FILE(GLOB html ${PROJECT_SOURCE_DIR}/doc/html/*.html)
+ FILE(GLOB man1 ${PROJECT_SOURCE_DIR}/doc/*.1)
+diff --git a/cmake/pcre2-config-version.cmake.in b/cmake/pcre2-config-version.cmake.in
+deleted file mode 100644
+index dac149e..0000000
+--- a/cmake/pcre2-config-version.cmake.in
++++ /dev/null
+@@ -1,15 +0,0 @@
+-set(PACKAGE_VERSION_MAJOR @PCRE2_MAJOR@)
+-set(PACKAGE_VERSION_MINOR @PCRE2_MINOR@)
+-set(PACKAGE_VERSION_PATCH 0)
+-set(PACKAGE_VERSION @PCRE2_MAJOR@.@PCRE2_MINOR@.0)
+-
+-# Check whether the requested PACKAGE_FIND_VERSION is compatible
+-if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION OR
+-   PACKAGE_VERSION_MAJOR GREATER PACKAGE_FIND_VERSION_MAJOR)
+-  set(PACKAGE_VERSION_COMPATIBLE FALSE)
+-else()
+-  set(PACKAGE_VERSION_COMPATIBLE TRUE)
+-  if(PACKAGE_VERSION VERSION_EQUAL PACKAGE_FIND_VERSION)
+-    set(PACKAGE_VERSION_EXACT TRUE)
+-  endif()
+-endif()
+diff --git a/cmake/pcre2-config.cmake.in b/cmake/pcre2-config.cmake.in
+index b313d6d..5b2aafa 100644
+--- a/cmake/pcre2-config.cmake.in
++++ b/cmake/pcre2-config.cmake.in
+@@ -5,11 +5,17 @@
+ #
+ # Static vs. shared
+ # -----------------
+-# To make use of the static library instead of the shared one, one needs
++# To force using the static library instead of the shared one, one needs
+ # to set the variable PCRE2_USE_STATIC_LIBS to ON before calling find_package.
++# If the variable is not set, the static library will be used if only that has
++# been built, otherwise the shared library will be used.
++#
++# The following components are supported: 8BIT, 16BIT, 32BIT and POSIX.
++# They used to be required but not anymore; all available targets will
++# be defined regardless of the requested components.
+ # Example:
+ #   set(PCRE2_USE_STATIC_LIBS ON)
+-#   find_package(PCRE2 CONFIG COMPONENTS 8BIT)
++#   find_package(PCRE2 CONFIG)
+ #
+ # This will define the following variables:
+ #
+@@ -23,70 +29,42 @@
+ #   PCRE2::32BIT - The 32 bit PCRE2 library.
+ #   PCRE2::POSIX - The POSIX PCRE2 library.
+ 
+-set(PCRE2_NON_STANDARD_LIB_PREFIX @NON_STANDARD_LIB_PREFIX@)
+-set(PCRE2_NON_STANDARD_LIB_SUFFIX @NON_STANDARD_LIB_SUFFIX@)
+-set(PCRE2_8BIT_NAME pcre2-8)
+-set(PCRE2_16BIT_NAME pcre2-16)
+-set(PCRE2_32BIT_NAME pcre2-32)
+-set(PCRE2_POSIX_NAME pcre2-posix)
+-find_path(PCRE2_INCLUDE_DIR NAMES pcre2.h DOC "PCRE2 include directory")
+-if (PCRE2_USE_STATIC_LIBS)
+-  if (MSVC)
+-    set(PCRE2_8BIT_NAME pcre2-8-static)
+-    set(PCRE2_16BIT_NAME pcre2-16-static)
+-    set(PCRE2_32BIT_NAME pcre2-32-static)
+-    set(PCRE2_POSIX_NAME pcre2-posix-static)
+-  endif ()
++@PACKAGE_INIT@
+ 
+-  set(PCRE2_PREFIX ${CMAKE_STATIC_LIBRARY_PREFIX})
+-  set(PCRE2_SUFFIX ${CMAKE_STATIC_LIBRARY_SUFFIX})
+-else ()
+-  set(PCRE2_PREFIX ${CMAKE_SHARED_LIBRARY_PREFIX})
+-  if (MINGW AND PCRE2_NON_STANDARD_LIB_PREFIX)
+-    set(PCRE2_PREFIX "")
+-  endif ()
++include(CMakeFindDependencyMacro)
++if("@REQUIRE_PTHREAD@") # REQUIRE_PTHREAD
++  find_dependency(Threads)
++endif()
+ 
+-  set(PCRE2_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
+-  if (MINGW AND PCRE2_NON_STANDARD_LIB_SUFFIX)
+-    set(PCRE2_SUFFIX "-0.dll")
+-  endif ()
+-endif ()
+-find_library(PCRE2_8BIT_LIBRARY NAMES ${PCRE2_PREFIX}${PCRE2_8BIT_NAME}${PCRE2_SUFFIX} ${PCRE2_PREFIX}${PCRE2_8BIT_NAME}d${PCRE2_SUFFIX} DOC "8 bit PCRE2 library")
+-find_library(PCRE2_16BIT_LIBRARY NAMES ${PCRE2_PREFIX}${PCRE2_16BIT_NAME}${PCRE2_SUFFIX} ${PCRE2_PREFIX}${PCRE2_8BIT_NAME}d${PCRE2_SUFFIX} DOC "16 bit PCRE2 library")
+-find_library(PCRE2_32BIT_LIBRARY NAMES ${PCRE2_PREFIX}${PCRE2_32BIT_NAME}${PCRE2_SUFFIX} ${PCRE2_PREFIX}${PCRE2_8BIT_NAME}d${PCRE2_SUFFIX} DOC "32 bit PCRE2 library")
+-find_library(PCRE2_POSIX_LIBRARY NAMES ${PCRE2_PREFIX}${PCRE2_POSIX_NAME}${PCRE2_SUFFIX} ${PCRE2_PREFIX}${PCRE2_8BIT_NAME}d${PCRE2_SUFFIX} DOC "8 bit POSIX PCRE2 library")
+-unset(PCRE2_NON_STANDARD_LIB_PREFIX)
+-unset(PCRE2_NON_STANDARD_LIB_SUFFIX)
+-unset(PCRE2_8BIT_NAME)
+-unset(PCRE2_16BIT_NAME)
+-unset(PCRE2_32BIT_NAME)
+-unset(PCRE2_POSIX_NAME)
++include("${CMAKE_CURRENT_LIST_DIR}/pcre2-targets.cmake")
+ 
+ # Set version
+-if (PCRE2_INCLUDE_DIR)
+-  set(PCRE2_VERSION "@PCRE2_MAJOR@.@PCRE2_MINOR@.0")
+-endif ()
+-
+-# Which components have been found.
+-if (PCRE2_8BIT_LIBRARY)
+-  set(PCRE2_8BIT_FOUND TRUE)
+-endif ()
+-if (PCRE2_16BIT_LIBRARY)
+-  set(PCRE2_16BIT_FOUND TRUE)
+-endif ()
+-if (PCRE2_32BIT_LIBRARY)
+-  set(PCRE2_32BIT_FOUND TRUE)
+-endif ()
+-if (PCRE2_POSIX_LIBRARY)
+-  set(PCRE2_POSIX_FOUND TRUE)
+-endif ()
++set(PCRE2_VERSION "@PCRE2_MAJOR@.@PCRE2_MINOR@.0")
+ 
+-# Check if at least one component has been specified.
+-list(LENGTH PCRE2_FIND_COMPONENTS PCRE2_NCOMPONENTS)
+-if (PCRE2_NCOMPONENTS LESS 1)
+-  message(FATAL_ERROR "No components have been specified. This is not allowed. Please, specify at least one component.")
+-endif ()
+-unset(PCRE2_NCOMPONENTS)
++# Chooses the linkage of the library to expose in the
++# unsuffixed edition of the target.
++macro(_pcre2_add_component_target component target)
++  # If the static library exists and either PCRE2_USE_STATIC_LIBS
++  # is defined, or the dynamic library does not exist, use the static library.
++  if(NOT TARGET PCRE2::${component})
++    if(TARGET pcre2::pcre2-${target}-static AND (PCRE2_USE_STATIC_LIBS OR NOT TARGET pcre2::pcre2-${target}-shared))
++      add_library(PCRE2::${component} ALIAS pcre2::pcre2-${target}-static)
++      set(PCRE2_${component}_FOUND TRUE)
++    # Otherwise use the dynamic library if it exists.
++    elseif(TARGET pcre2::pcre2-${target}-shared AND NOT PCRE2_USE_STATIC_LIBS)
++      add_library(PCRE2::${component} ALIAS pcre2::pcre2-${target}-shared)
++      set(PCRE2_${component}_FOUND TRUE)
++    endif()
++    if(PCRE2_${component}_FOUND)
++      get_target_property(PCRE2_${component}_LIBRARY PCRE2::${component} IMPORTED_LOCATION)
++      set(PCRE2_LIBRARIES ${PCRE2_LIBRARIES} ${PCRE2_${component}_LIBRARY})
++    endif()
++  endif()
++endmacro()
++_pcre2_add_component_target(8BIT 8)
++_pcre2_add_component_target(16BIT 16)
++_pcre2_add_component_target(32BIT 32)
++_pcre2_add_component_target(POSIX posix)
+ 
+ # When POSIX component has been specified make sure that also 8BIT component is specified.
+ set(PCRE2_8BIT_COMPONENT FALSE)
+@@ -105,41 +83,5 @@ endif()
+ unset(PCRE2_8BIT_COMPONENT)
+ unset(PCRE2_POSIX_COMPONENT)
+ 
+-include(FindPackageHandleStandardArgs)
+-set(${CMAKE_FIND_PACKAGE_NAME}_CONFIG "${CMAKE_CURRENT_LIST_FILE}")
+-find_package_handle_standard_args(PCRE2
+-  FOUND_VAR PCRE2_FOUND
+-  REQUIRED_VARS PCRE2_INCLUDE_DIR
+-  HANDLE_COMPONENTS
+-  VERSION_VAR PCRE2_VERSION
+-  CONFIG_MODE
+-)
+-
+-set(PCRE2_LIBRARIES)
+-if (PCRE2_FOUND)
+-  foreach(component ${PCRE2_FIND_COMPONENTS})
+-    if (PCRE2_USE_STATIC_LIBS)
+-      add_library(PCRE2::${component} STATIC IMPORTED)
+-      target_compile_definitions(PCRE2::${component} INTERFACE PCRE2_STATIC)
+-    else ()
+-      add_library(PCRE2::${component} SHARED IMPORTED)
+-    endif ()
+-    set_target_properties(PCRE2::${component} PROPERTIES
+-      IMPORTED_LOCATION "${PCRE2_${component}_LIBRARY}"
+-      INTERFACE_INCLUDE_DIRECTORIES "${PCRE2_INCLUDE_DIR}"
+-    )
+-    if (component STREQUAL "POSIX")
+-      set_target_properties(PCRE2::${component} PROPERTIES
+-        INTERFACE_LINK_LIBRARIES "PCRE2::8BIT"
+-        LINK_LIBRARIES "PCRE2::8BIT"
+-      )
+-    endif ()
+-
+-    set(PCRE2_LIBRARIES ${PCRE2_LIBRARIES} ${PCRE2_${component}_LIBRARY})
+-    mark_as_advanced(PCRE2_${component}_LIBRARY)
+-  endforeach()
+-endif ()
+-
+-mark_as_advanced(
+-  PCRE2_INCLUDE_DIR
+-)
++# Check for required components.
++check_required_components("PCRE2")
diff --git a/external_imported/vcpkg/ports/pcre2/portfile.cmake b/external_imported/vcpkg/ports/pcre2/portfile.cmake
index 8f5ac8c85..5d6c5c39b 100644
--- a/external_imported/vcpkg/ports/pcre2/portfile.cmake
+++ b/external_imported/vcpkg/ports/pcre2/portfile.cmake
@@ -1,40 +1,42 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO PCRE2Project/pcre2
-    REF pcre2-10.40
-    SHA512 098c21d60ecb3bb8449173f50c9ab8e6018fafd5d55548be08b15df37f8e08bcd4f851d75758c4d22505db30a3444bb65783d83cd876c63fdf0de2850815ef93
+    REF "pcre2-${VERSION}"
+    SHA512 3d0ee66e23809d3da2fe2bf4ed6e20b0fb96c293a91668935f6319e8d02e480eeef33da01e08a7436a18a1a85a116d83186b953520f394c866aad3cea73c7f5c
     HEAD_REF master
     PATCHES
         pcre2-10.35_fix-uwp.patch
         no-static-suffix.patch
+        fix-cmake.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" INSTALL_PDB)
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_STATIC_CRT)
 
-set(JIT ON)
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Emscripten" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "iOS")
-    set(JIT OFF)
-endif()
+vcpkg_check_features(
+    OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        jit   PCRE2_SUPPORT_JIT
+)
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
+        ${FEATURE_OPTIONS}
         -DBUILD_STATIC_LIBS=${BUILD_STATIC}
         -DPCRE2_STATIC_RUNTIME=${BUILD_STATIC_CRT}
         -DPCRE2_BUILD_PCRE2_8=ON
         -DPCRE2_BUILD_PCRE2_16=ON
         -DPCRE2_BUILD_PCRE2_32=ON
-        -DPCRE2_SUPPORT_JIT=${JIT}
         -DPCRE2_SUPPORT_UNICODE=ON
         -DPCRE2_BUILD_TESTS=OFF
         -DPCRE2_BUILD_PCRE2GREP=OFF
+        -DCMAKE_DISABLE_FIND_PACKAGE_BZip2=ON
+        -DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=ON
         -DCMAKE_DISABLE_FIND_PACKAGE_Readline=ON
         -DCMAKE_DISABLE_FIND_PACKAGE_Editline=ON
         -DINSTALL_MSVC_PDB=${INSTALL_PDB}
-        -DCMAKE_REQUIRE_FIND_PACKAGE_BZip2=ON
-        -DCMAKE_REQUIRE_FIND_PACKAGE_ZLIB=ON
     )
 
 vcpkg_cmake_install()
@@ -49,16 +51,14 @@ endif()
 file(WRITE "${CURRENT_PACKAGES_DIR}/include/pcre2.h" "${PCRE2_H}")
 
 vcpkg_fixup_pkgconfig()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
 
-# The cmake file provided by pcre2 has some problems, so don't use it for now.
-#vcpkg_cmake_config_fixup(CONFIG_PATH cmake)
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/cmake" "${CURRENT_PACKAGES_DIR}/debug/cmake")
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/man")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/man")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(REMOVE_RECURSE
+    "${CURRENT_PACKAGES_DIR}/man"
+    "${CURRENT_PACKAGES_DIR}/share/doc"
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/debug/man"
+    "${CURRENT_PACKAGES_DIR}/debug/share")
 
 if(BUILD_STATIC)
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
@@ -69,4 +69,5 @@ elseif(VCPKG_TARGET_IS_WINDOWS)
     endif()
 endif()
 
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/pcre2/usage b/external_imported/vcpkg/ports/pcre2/usage
new file mode 100644
index 000000000..a23aadd33
--- /dev/null
+++ b/external_imported/vcpkg/ports/pcre2/usage
@@ -0,0 +1,6 @@
+The package pcre2 is compatible with built-in CMake targets:
+
+    # Each component imports a target:
+    # TARGETS: PCRE2::8BIT PCRE2::16BIT PCRE2::32BIT PCRE2::POSIX
+    find_package(pcre2 CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE PCRE2::8BIT PCRE2::16BIT PCRE2::32BIT PCRE2::POSIX)
diff --git a/external_imported/vcpkg/ports/pcre2/vcpkg.json b/external_imported/vcpkg/ports/pcre2/vcpkg.json
index df88f3c5c..3dd6b9455 100644
--- a/external_imported/vcpkg/ports/pcre2/vcpkg.json
+++ b/external_imported/vcpkg/ports/pcre2/vcpkg.json
@@ -1,15 +1,11 @@
 {
   "name": "pcre2",
-  "version": "10.40",
+  "version": "10.42",
   "port-version": 1,
   "description": "Regular Expression pattern matching using the same syntax and semantics as Perl 5.",
   "homepage": "https://github.com/PCRE2Project/pcre2",
   "license": "BSD-3-Clause",
   "dependencies": [
-    {
-      "name": "bzip2",
-      "default-features": false
-    },
     {
       "name": "vcpkg-cmake",
       "host": true
@@ -17,7 +13,27 @@
     {
       "name": "vcpkg-cmake-config",
       "host": true
+    }
+  ],
+  "default-features": [
+    "platform-default-features"
+  ],
+  "features": {
+    "jit": {
+      "description": "Enable support for Just-In-Time compiling regex matchers",
+      "supports": "!emscripten"
     },
-    "zlib"
-  ]
+    "platform-default-features": {
+      "description": "Enable default features",
+      "dependencies": [
+        {
+          "name": "pcre2",
+          "features": [
+            "jit"
+          ],
+          "platform": "!emscripten"
+        }
+      ]
+    }
+  }
 }
diff --git a/external_imported/vcpkg/ports/pdal-c/portfile.cmake b/external_imported/vcpkg/ports/pdal-c/portfile.cmake
index bb06b4d04..559361d80 100644
--- a/external_imported/vcpkg/ports/pdal-c/portfile.cmake
+++ b/external_imported/vcpkg/ports/pdal-c/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO PDAL/CAPI
-    REF v2.1.0
-    SHA512 07c671f83af93594d7792d770890205aad1a44803696f9567aa25f69a277fa5c3f4e9f9f5f0210ebd59f5cf75aff1f80ce532bd7bbd536a699724ceb6e3277fd
+    REF "v${VERSION}"
+    SHA512 6fe2136831e37c2f87643b3c971a1397d8912c230e9bfde53a51ec1769bc5c2f08482395263906975c5d40dbabd32852a5a145a159cdcf2548390a0aff72a295
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/pdal-c/vcpkg.json b/external_imported/vcpkg/ports/pdal-c/vcpkg.json
index f02d1afdf..8626a5050 100644
--- a/external_imported/vcpkg/ports/pdal-c/vcpkg.json
+++ b/external_imported/vcpkg/ports/pdal-c/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "pdal-c",
-  "version-string": "2.1",
+  "version": "2.2.0",
   "description": "C API for the Point Data Abstraction Library (PDAL)",
   "homepage": "https://github.com/PDAL/CAPI#readme",
   "supports": "!(windows & staticcrt)",
diff --git a/external_imported/vcpkg/ports/pdal/fix-dependency.patch b/external_imported/vcpkg/ports/pdal/fix-dependency.patch
index 1c29b5689..60011e3ab 100644
--- a/external_imported/vcpkg/ports/pdal/fix-dependency.patch
+++ b/external_imported/vcpkg/ports/pdal/fix-dependency.patch
@@ -1,9 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 42cca1e..43b0ced 100644
+index d13d417..011608d 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -266,7 +265,7 @@ target_include_directories(${PDAL_BASE_LIB_NAME}
- target_link_libraries(${PDAL_BASE_LIB_NAME}
+@@ -269,7 +269,7 @@ target_link_libraries(${PDAL_BASE_LIB_NAME}
      PRIVATE
          ${CMAKE_THREAD_LIBS_INIT}
          ${CMAKE_DL_LIBS}
@@ -13,7 +12,7 @@ index 42cca1e..43b0ced 100644
          ${LIBXML2_LIBRARIES}
          ${ZLIB_LIBRARIES}
 diff --git a/cmake/zstd.cmake b/cmake/zstd.cmake
-index bfaa5b2..e73ec9e 100644
+index dfe3dc0..42a78d6 100644
 --- a/cmake/zstd.cmake
 +++ b/cmake/zstd.cmake
 @@ -4,7 +4,14 @@
@@ -32,3 +31,81 @@ index bfaa5b2..e73ec9e 100644
      set_package_properties(ZSTD PROPERTIES TYPE
          PURPOSE "General compression support")
      if (ZSTD_FOUND)
+diff --git a/pdal/private/KDImpl.hpp b/pdal/private/KDImpl.hpp
+index 473ffba..db6a7b0 100644
+--- a/pdal/private/KDImpl.hpp
++++ b/pdal/private/KDImpl.hpp
+@@ -97,7 +97,7 @@ public:
+         resultSet.init(&output[0], &out_dist_sqr[0]);
+ 
+         std::array<double, 2> pt { x, y };
+-        m_index.findNeighbors(resultSet, &pt[0], nanoflann::SearchParams(10));
++        m_index.findNeighbors(resultSet, &pt[0], nanoflann::SearchParameters(10));
+         return output;
+     }
+ 
+@@ -110,14 +110,14 @@ public:
+         resultSet.init(&indices->front(), &sqr_dists->front());
+ 
+         std::array<double, 2> pt { x, y };
+-        m_index.findNeighbors(resultSet, &pt[0], nanoflann::SearchParams(10));
++        m_index.findNeighbors(resultSet, &pt[0], nanoflann::SearchParameters(10));
+     }
+ 
+     PointIdList radius(double const& x, double const& y, double const& r) const
+     {
+         PointIdList output;
+-        std::vector<std::pair<std::size_t, double>> ret_matches;
+-        nanoflann::SearchParams params;
++        std::vector<nanoflann::ResultItem<std::size_t, double>> ret_matches;
++        nanoflann::SearchParameters params;
+         params.sorted = true;
+ 
+         std::array<double, 2> pt { x, y };
+@@ -217,7 +217,7 @@ public:
+         // neighbor at the given stride.
+         nanoflann::KNNResultSet<double, PointId, point_count_t> resultSet(k2);
+         resultSet.init(&output[0], &out_dist_sqr[0]);
+-        m_index.findNeighbors(resultSet, &pt[0], nanoflann::SearchParams());
++        m_index.findNeighbors(resultSet, &pt[0], nanoflann::SearchParameters());
+ 
+         // Perform the downsampling if a stride is provided.
+         if (stride > 1)
+@@ -241,14 +241,14 @@ public:
+         pt.push_back(x);
+         pt.push_back(y);
+         pt.push_back(z);
+-        m_index.findNeighbors(resultSet, &pt[0], nanoflann::SearchParams(10));
++        m_index.findNeighbors(resultSet, &pt[0], nanoflann::SearchParameters(10));
+     }
+ 
+     PointIdList radius(double x, double y, double z, double r) const
+     {
+         PointIdList output;
+-        std::vector<std::pair<std::size_t, double>> ret_matches;
+-        nanoflann::SearchParams params;
++        std::vector<nanoflann::ResultItem<std::size_t, double>> ret_matches;
++        nanoflann::SearchParameters params;
+         params.sorted = true;
+ 
+         std::vector<double> pt { x, y, z };
+@@ -315,7 +315,7 @@ public:
+         // neighbor at the given stride.
+         nanoflann::KNNResultSet<double, PointId, point_count_t> resultSet(k2);
+         resultSet.init(&output[0], &out_dist_sqr[0]);
+-        m_index.findNeighbors(resultSet, &pt[0], nanoflann::SearchParams());
++        m_index.findNeighbors(resultSet, &pt[0], nanoflann::SearchParameters());
+ 
+         // Perform the downsampling if a stride is provided.
+         if (stride > 1)
+@@ -330,8 +330,8 @@ public:
+     PointIdList radius(PointId idx, double r) const
+     {
+         PointIdList output;
+-        std::vector<std::pair<std::size_t, double>> ret_matches;
+-        nanoflann::SearchParams params;
++        std::vector<nanoflann::ResultItem<std::size_t, double>> ret_matches;
++        nanoflann::SearchParameters params;
+         params.sorted = true;
+ 
+         std::vector<double> pt;
diff --git a/external_imported/vcpkg/ports/pdal/fix-gcc-13-build.patch b/external_imported/vcpkg/ports/pdal/fix-gcc-13-build.patch
new file mode 100644
index 000000000..888826c17
--- /dev/null
+++ b/external_imported/vcpkg/ports/pdal/fix-gcc-13-build.patch
@@ -0,0 +1,12 @@
+diff --git a/plugins/e57/libE57Format/include/E57Format.h b/plugins/e57/libE57Format/include/E57Format.h
+index 267d8c77bb..89d2b36a09 100644
+--- a/plugins/e57/libE57Format/include/E57Format.h
++++ b/plugins/e57/libE57Format/include/E57Format.h
+@@ -31,6 +31,7 @@
+ 
+ //! @file  E57Format.h header file for the E57 API
+ 
++#include <cstdint>
+ #include <cfloat>
+ #include <memory>
+ #include <vector>
diff --git a/external_imported/vcpkg/ports/pdal/fix-gcc8-compatibility.patch b/external_imported/vcpkg/ports/pdal/fix-gcc8-compatibility.patch
deleted file mode 100644
index 58eea53bc..000000000
--- a/external_imported/vcpkg/ports/pdal/fix-gcc8-compatibility.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/pdal/util/CMakeLists.txt b/pdal/util/CMakeLists.txt
-index 5b48ba8..e031e2b 100644
---- a/pdal/util/CMakeLists.txt
-+++ b/pdal/util/CMakeLists.txt
-@@ -46,3 +46,10 @@ set_target_properties(${PDAL_UTIL_LIB_NAME} PROPERTIES
-     CLEAN_DIRECT_OUTPUT 1)
- 
- set_property(GLOBAL PROPERTY _UTIL_INCLUDED TRUE)
-+
-+# Compatibility for GCC8: std::filesystem requires linking with libstdc++fs
-+target_link_libraries(
-+  ${PDAL_UTIL_LIB_NAME}
-+  PRIVATE
-+  "$<$<AND:$<CXX_COMPILER_ID:GNU>,$<VERSION_LESS:$<CXX_COMPILER_VERSION>,9.0>>:-lstdc++fs>"
-+)
diff --git a/external_imported/vcpkg/ports/pdal/fix-unix-compiler-options.patch b/external_imported/vcpkg/ports/pdal/fix-unix-compiler-options.patch
index 79a379cb9..8143a568d 100644
--- a/external_imported/vcpkg/ports/pdal/fix-unix-compiler-options.patch
+++ b/external_imported/vcpkg/ports/pdal/fix-unix-compiler-options.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 679b4e7..08965d9 100644
+index 1705a8426..d13d41786 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -187,7 +187,7 @@ add_subdirectory(apps)
+@@ -192,7 +192,7 @@ add_subdirectory(apps)
  # so that users only need link libpdalcpp.
  #
  if (APPLE)
diff --git a/external_imported/vcpkg/ports/pdal/gdal-3.7.patch b/external_imported/vcpkg/ports/pdal/gdal-3.7.patch
new file mode 100644
index 000000000..4d3944e0a
--- /dev/null
+++ b/external_imported/vcpkg/ports/pdal/gdal-3.7.patch
@@ -0,0 +1,22 @@
+diff --git a/pdal/Geometry.cpp b/pdal/Geometry.cpp
+index 608bf86..8b010d3 100644
+--- a/pdal/Geometry.cpp
++++ b/pdal/Geometry.cpp
+@@ -153,7 +153,7 @@ Geometry& Geometry::operator=(const Geometry& input)
+ 
+ bool Geometry::srsValid() const
+ {
+-    OGRSpatialReference *srs = m_geom->getSpatialReference();
++    const OGRSpatialReference *srs = m_geom->getSpatialReference();
+     return srs && srs->GetRoot();
+ }
+ 
+@@ -172,7 +172,7 @@ Utils::StatusWithReason Geometry::transform(SpatialReference out)
+         return StatusWithReason(-2,
+             "Geometry::transform() failed.  NULL target SRS.");
+ 
+-    OGRSpatialReference *inSrs = m_geom->getSpatialReference();
++    const OGRSpatialReference *inSrs = m_geom->getSpatialReference();
+     SrsTransform transform(*inSrs, OGRSpatialReference(out.getWKT().data()));
+     if (m_geom->transform(transform.get()) != OGRERR_NONE)
+         return StatusWithReason(-1, "Geometry::transform() failed.");
diff --git a/external_imported/vcpkg/ports/pdal/install-dimbuilder.patch b/external_imported/vcpkg/ports/pdal/install-dimbuilder.patch
new file mode 100644
index 000000000..1f156de42
--- /dev/null
+++ b/external_imported/vcpkg/ports/pdal/install-dimbuilder.patch
@@ -0,0 +1,10 @@
+diff --git a/dimbuilder/CMakeLists.txt b/dimbuilder/CMakeLists.txt
+index 615e2e9..db44505 100644
+--- a/dimbuilder/CMakeLists.txt
++++ b/dimbuilder/CMakeLists.txt
+@@ -39,3 +39,5 @@ target_link_libraries(dimbuilder
+ if (MSVC)
+     target_link_options(dimbuilder PRIVATE /SUBSYSTEM:CONSOLE /ENTRY:mainCRTStartup)
+ endif(MSVC)
++
++install(TARGETS dimbuilder)
diff --git a/external_imported/vcpkg/ports/pdal/mingw.patch b/external_imported/vcpkg/ports/pdal/mingw.patch
new file mode 100644
index 000000000..3f6cb229b
--- /dev/null
+++ b/external_imported/vcpkg/ports/pdal/mingw.patch
@@ -0,0 +1,13 @@
+diff --git a/io/OptechReader.cpp b/io/OptechReader.cpp
+index bd12e70..2b7846b 100644
+--- a/io/OptechReader.cpp
++++ b/io/OptechReader.cpp
+@@ -60,7 +60,7 @@ std::string OptechReader::getName() const
+     return s_info.name;
+ }
+ 
+-#ifndef _WIN32
++#ifndef _MSC_VER
+ const size_t OptechReader::MaximumNumberOfReturns;
+ const size_t OptechReader::MaxNumRecordsInBuffer;
+ const size_t OptechReader::NumBytesInRecord;
diff --git a/external_imported/vcpkg/ports/pdal/portfile.cmake b/external_imported/vcpkg/ports/pdal/portfile.cmake
index 5e9aa1848..ee6c1467e 100644
--- a/external_imported/vcpkg/ports/pdal/portfile.cmake
+++ b/external_imported/vcpkg/ports/pdal/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO PDAL/PDAL
-    REF 2.4.3
-    SHA512 0293760c778be88e98e9c056730674c4e25bdba9094ff590e439a1ed1f61c880b7c03449b9cbc92190e12b3c0894cb337d93b2534c954f91277a0ee5cde5c78a
+    REF "${VERSION}"
+    SHA512 cefc610682f8dafd5c186ed612edc2db904690c3a53d5111ece0965d197053b064bd8cbd9adab293c47ec1894949b5e33623b0f0e6b6cad35617a20f0039bd79
     HEAD_REF master
     PATCHES
         fix-dependency.patch
@@ -12,7 +12,10 @@ vcpkg_from_github(
         fix-find-library-suffix.patch
         no-pkgconfig-requires.patch
         no-rpath.patch
-        fix-gcc8-compatibility.patch #Upstream PR: https://github.com/PDAL/PDAL/pull/3864
+        fix-gcc-13-build.patch  #upstream PR: https://github.com/PDAL/PDAL/pull/4039
+        gdal-3.7.patch
+        mingw.patch
+        install-dimbuilder.patch
 )
 
 # Prefer pristine CMake find modules + wrappers and config files from vcpkg.
@@ -35,10 +38,6 @@ file(APPEND "${SOURCE_PATH}/pdal/JsonFwd.hpp" "namespace NL = nlohmann;\n")
 
 unset(ENV{OSGEO4W_HOME})
 
-if("laszip" IN_LIST FEATURES)
-    message(WARNING "The 'laszip' feature is obsolete and will be removed in the future.")
-endif()
-
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
         draco       BUILD_PLUGIN_DRACO
@@ -49,10 +48,12 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
         pgpointcloud BUILD_PLUGIN_PGPOINTCLOUD
         zstd        WITH_ZSTD
 )
-if(BUILD_PLUGIN_DRACO)
-    vcpkg_find_acquire_program(PKGCONFIG)
+
+if(VCPKG_CROSSCOMPILING)
+    set(DIMBUILDER_EXECUTABLE "-DDIMBUILDER_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/pdal/dimbuilder${VCPKG_HOST_EXECUTABLE_SUFFIX}")
 endif()
 
+vcpkg_find_acquire_program(PKGCONFIG)
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
@@ -64,6 +65,9 @@ vcpkg_cmake_configure(
         -DCMAKE_DISABLE_FIND_PACKAGE_Libexecinfo:BOOL=ON
         -DCMAKE_DISABLE_FIND_PACKAGE_Libunwind:BOOL=ON
         ${FEATURE_OPTIONS}
+        ${DIMBUILDER_EXECUTABLE}
+    MAYBE_UNUSED_VARIABLES
+        PKG_CONFIG_EXECUTABLE
 )
 
 vcpkg_cmake_install()
@@ -80,7 +84,7 @@ file(GLOB pdal_unsupported
     "${CURRENT_PACKAGES_DIR}/debug/bin/pdal-config"
 )
 file(REMOVE ${pdal_unsupported})
-vcpkg_copy_tools(TOOL_NAMES pdal AUTO_CLEAN)
+vcpkg_copy_tools(TOOL_NAMES pdal dimbuilder AUTO_CLEAN)
 
 # Post-install clean-up
 file(REMOVE_RECURSE
diff --git a/external_imported/vcpkg/ports/pdal/usage b/external_imported/vcpkg/ports/pdal/usage
index eaf378864..759bf7feb 100644
--- a/external_imported/vcpkg/ports/pdal/usage
+++ b/external_imported/vcpkg/ports/pdal/usage
@@ -1,7 +1,7 @@
 The package pdal provides CMake variables:
 
     find_package(PDAL CONFIG REQUIRED)
-    target_include_directories(${PDAL_INCLUDE_DIRS})
+    target_include_directories(main PRIVATE ${PDAL_INCLUDE_DIRS})
     target_link_libraries(main PRIVATE ${PDAL_LIBRARIES})
         
 If necessary, override the default plugin search path by setting the
diff --git a/external_imported/vcpkg/ports/pdal/vcpkg.json b/external_imported/vcpkg/ports/pdal/vcpkg.json
index 94d3cda54..48fe2abe6 100644
--- a/external_imported/vcpkg/ports/pdal/vcpkg.json
+++ b/external_imported/vcpkg/ports/pdal/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "pdal",
-  "version": "2.4.3",
-  "port-version": 1,
+  "version": "2.5.3",
+  "port-version": 3,
   "description": "PDAL - Point Data Abstraction Library is a library for manipulating point cloud data.",
   "homepage": "https://pdal.io/",
   "license": null,
@@ -16,9 +16,19 @@
       "default-features": false
     },
     "libgeotiff",
-    "libxml2",
+    {
+      "name": "libxml2",
+      "features": [
+        "http"
+      ]
+    },
     "nanoflann",
     "nlohmann-json",
+    {
+      "name": "pdal",
+      "host": true,
+      "default-features": false
+    },
     {
       "name": "vcpkg-cmake",
       "host": true
@@ -59,9 +69,6 @@
         "zlib"
       ]
     },
-    "laszip": {
-      "description": "Obsolete. PDAL includes LAZperf."
-    },
     "liblzma": {
       "description": "Support for compression/decompression with LZMA",
       "dependencies": [
diff --git a/external_imported/vcpkg/ports/pdcurses/portfile.cmake b/external_imported/vcpkg/ports/pdcurses/portfile.cmake
index 7869f2185..f1041796e 100644
--- a/external_imported/vcpkg/ports/pdcurses/portfile.cmake
+++ b/external_imported/vcpkg/ports/pdcurses/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO wmcbrine/PDCurses
-    REF 6c1f95c4fa9f9f105879c2d99dd72a5bf335c046 # 3.9
-    SHA512 2d682a3516baaa58a97854aca64d985768b7af76d998240b54afc57ddf2a44894835a1748888f8dd7c1cc8045ede77488284f8adf1b73878879b4b4d3391218d
+    REF ${VERSION}
+    SHA512 4fd7c1221c5f34d94069a563dda7a796653148d903bc9023afe134b0f13bdc8b5d30000dfc80ab800e46e58b395ac2fb494d1316b80914998de5bacf0d7f3558
     HEAD_REF master
     PATCHES
         nmake-install.patch
@@ -39,4 +39,5 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
     endif()
 endif()
 
-file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/unofficial-pdcurses-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}")
+vcpkg_install_copyright(FILE_LIST "${CMAKE_CURRENT_LIST_DIR}/LICENSE")
diff --git a/external_imported/vcpkg/ports/pdcurses/unofficial-pdcurses-config.cmake b/external_imported/vcpkg/ports/pdcurses/unofficial-pdcurses-config.cmake
new file mode 100644
index 000000000..804e29e10
--- /dev/null
+++ b/external_imported/vcpkg/ports/pdcurses/unofficial-pdcurses-config.cmake
@@ -0,0 +1,24 @@
+if(NOT TARGET unofficial::pdcurses::pdcurses)
+    add_library(unofficial::pdcurses::pdcurses UNKNOWN IMPORTED)
+    get_filename_component(z_vcpkg_pdcurses_root "${CMAKE_CURRENT_LIST_FILE}" PATH)
+    get_filename_component(z_vcpkg_pdcurses_root "${z_vcpkg_pdcurses_root}" PATH)
+    get_filename_component(z_vcpkg_pdcurses_root "${z_vcpkg_pdcurses_root}" PATH)
+
+    set_target_properties(unofficial::pdcurses::pdcurses PROPERTIES
+      INTERFACE_INCLUDE_DIRECTORIES "${z_vcpkg_pdcurses_root}/include"
+    )
+
+    find_library(Z_VCPKG_PDCURSES_LIBRARY_RELEASE NAMES pdcurses PATHS "${z_vcpkg_pdcurses_root}/lib" NO_DEFAULT_PATH)
+    if(EXISTS "${Z_VCPKG_PDCURSES_LIBRARY_RELEASE}")
+        set_property(TARGET unofficial::pdcurses::pdcurses APPEND PROPERTY IMPORTED_CONFIGURATIONS "Release")
+        set_target_properties(unofficial::pdcurses::pdcurses PROPERTIES IMPORTED_LOCATION_RELEASE "${Z_VCPKG_PDCURSES_LIBRARY_RELEASE}")
+    endif()
+
+    find_library(Z_VCPKG_PDCURSES_LIBRARY_DEBUG NAMES pdcurses PATHS "${z_vcpkg_pdcurses_root}/debug/lib" NO_DEFAULT_PATH)
+    if(EXISTS "${Z_VCPKG_PDCURSES_LIBRARY_DEBUG}")
+        set_property(TARGET unofficial::pdcurses::pdcurses APPEND PROPERTY IMPORTED_CONFIGURATIONS "Debug")
+        set_target_properties(unofficial::pdcurses::pdcurses PROPERTIES IMPORTED_LOCATION_DEBUG "${Z_VCPKG_PDCURSES_LIBRARY_DEBUG}")
+    endif()
+
+    unset(z_vcpkg_pdcurses_root)
+endif()
diff --git a/external_imported/vcpkg/ports/pdcurses/vcpkg.json b/external_imported/vcpkg/ports/pdcurses/vcpkg.json
index fa26f9b12..c9a136e3c 100644
--- a/external_imported/vcpkg/ports/pdcurses/vcpkg.json
+++ b/external_imported/vcpkg/ports/pdcurses/vcpkg.json
@@ -1,8 +1,9 @@
 {
   "name": "pdcurses",
-  "version-string": "3.9",
-  "port-version": 3,
+  "version": "3.9",
+  "port-version": 6,
   "description": "Public Domain Curses - a curses library for environments that don't fit the termcap/terminfo model.",
   "homepage": "https://pdcurses.org/",
+  "license": null,
   "supports": "windows & !uwp & !mingw"
 }
diff --git a/external_imported/vcpkg/ports/pdqsort/vcpkg.json b/external_imported/vcpkg/ports/pdqsort/vcpkg.json
index 60a5647ea..d28616217 100644
--- a/external_imported/vcpkg/ports/pdqsort/vcpkg.json
+++ b/external_imported/vcpkg/ports/pdqsort/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "pdqsort",
-  "version-string": "2019-07-30",
-  "port-version": 1,
+  "version-date": "2019-07-30",
+  "port-version": 2,
   "description": "Pattern-defeating quicksort (pdqsort) is a novel sorting algorithm",
   "homepage": "https://github.com/orlp/pdqsort"
 }
diff --git a/external_imported/vcpkg/ports/pe-parse/no-werror.patch b/external_imported/vcpkg/ports/pe-parse/no-werror.patch
new file mode 100644
index 000000000..6fb2c555c
--- /dev/null
+++ b/external_imported/vcpkg/ports/pe-parse/no-werror.patch
@@ -0,0 +1,26 @@
+diff --git a/cmake/compilation_flags.cmake b/cmake/compilation_flags.cmake
+index 395f1b5..bb10165 100644
+--- a/cmake/compilation_flags.cmake
++++ b/cmake/compilation_flags.cmake
+@@ -26,7 +26,7 @@ else ()
+     -pedantic -Wall -Wextra -Wcast-align -Wcast-qual -Wctor-dtor-privacy -Wdisabled-optimization
+     -Wformat=2 -Winit-self -Wlong-long -Wmissing-declarations -Wmissing-include-dirs -Wcomment
+     -Wold-style-cast -Woverloaded-virtual -Wredundant-decls -Wshadow -Wsign-conversion
+-    -Wsign-promo -Wstrict-overflow=5 -Wswitch-default -Wundef -Werror -Wunused -Wuninitialized
++    -Wsign-promo -Wstrict-overflow=5 -Wswitch-default -Wundef -Wunused -Wuninitialized
+     -Wno-missing-declarations -Wno-strict-overflow
+   )
+ 
+diff --git a/examples/peaddrconv/CMakeLists.txt b/examples/peaddrconv/CMakeLists.txt
+index fbad06a..02c8bcf 100644
+--- a/examples/peaddrconv/CMakeLists.txt
++++ b/examples/peaddrconv/CMakeLists.txt
+@@ -26,7 +26,7 @@ else ()
+     -pedantic -Wall -Wextra -Wcast-align -Wcast-qual -Wctor-dtor-privacy -Wdisabled-optimization
+     -Wformat=2 -Winit-self -Wlong-long -Wmissing-declarations -Wmissing-include-dirs -Wcomment
+     -Wold-style-cast -Woverloaded-virtual -Wredundant-decls -Wshadow -Wsign-conversion
+-    -Wsign-promo -Wstrict-overflow=5 -Wswitch-default -Wundef -Werror -Wunused -Wuninitialized
++    -Wsign-promo -Wstrict-overflow=5 -Wswitch-default -Wundef -Wunused -Wuninitialized
+     -Wno-missing-declarations
+   )
+ 
diff --git a/external_imported/vcpkg/ports/pe-parse/portfile.cmake b/external_imported/vcpkg/ports/pe-parse/portfile.cmake
index 9061a385c..0ba01c1b6 100644
--- a/external_imported/vcpkg/ports/pe-parse/portfile.cmake
+++ b/external_imported/vcpkg/ports/pe-parse/portfile.cmake
@@ -6,6 +6,7 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
         arm64-windows-fix.patch
+        no-werror.patch
 )
 
 vcpkg_cmake_configure(
diff --git a/external_imported/vcpkg/ports/pe-parse/vcpkg.json b/external_imported/vcpkg/ports/pe-parse/vcpkg.json
index a50737967..d68ea6844 100644
--- a/external_imported/vcpkg/ports/pe-parse/vcpkg.json
+++ b/external_imported/vcpkg/ports/pe-parse/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "pe-parse",
   "version": "2.1.0",
+  "port-version": 1,
   "description": "pe-parse is a principled, lightweight C/C++ PE parser",
   "homepage": "https://github.com/trailofbits/pe-parse",
   "supports": "!uwp",
diff --git a/external_imported/vcpkg/ports/pegtl-2/vcpkg.json b/external_imported/vcpkg/ports/pegtl-2/vcpkg.json
index 6b313eee0..c81ec5111 100644
--- a/external_imported/vcpkg/ports/pegtl-2/vcpkg.json
+++ b/external_imported/vcpkg/ports/pegtl-2/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "pegtl-2",
-  "version-string": "2.8.3",
-  "port-version": 2,
+  "version": "2.8.3",
+  "port-version": 3,
   "description": "The Parsing Expression Grammar Template Library (PEGTL) is a zero-dependency C++ header-only parser combinator library for creating parsers according to a Parsing Expression Grammar (PEG). This version maintains compatibility with C++11.",
   "homepage": "https://github.com/taocpp/PEGTL",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/pegtl/portfile.cmake b/external_imported/vcpkg/ports/pegtl/portfile.cmake
index 5746327c2..47a5e546b 100644
--- a/external_imported/vcpkg/ports/pegtl/portfile.cmake
+++ b/external_imported/vcpkg/ports/pegtl/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO taocpp/pegtl
-    REF e65017d398a3b733aedab70bb64b8055472d47aa
-    SHA512 05ca3754a9c1c94a205c6823e4442dca1f11a890aadd4b0c96f6ccd8946eec061c0a723bc67f8b57b074154e1ab1171bdcdd035926f55e42b5517b9d5ecae873
+    REF cf639f7f4ee125f68e1ccfba8d99ebc0de57b9fe
+    SHA512 174148310e9d2fd37c67c3e5f4fd84c66847647732ebed29878e967b44aa87bcf91c304b2193ebf11b8586e458cd13f12d6ceec2fbf33a1aaeb552a100a6307f
     HEAD_REF 3.x
 )
 
diff --git a/external_imported/vcpkg/ports/pegtl/vcpkg.json b/external_imported/vcpkg/ports/pegtl/vcpkg.json
index e2455acb9..924de17d1 100644
--- a/external_imported/vcpkg/ports/pegtl/vcpkg.json
+++ b/external_imported/vcpkg/ports/pegtl/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "pegtl",
-  "version-semver": "3.2.6",
+  "version-semver": "3.2.7",
   "description": "The Parsing Expression Grammar Template Library (PEGTL) is a zero-dependency C++ header-only parser combinator library for creating parsers according to a Parsing Expression Grammar (PEG).",
   "homepage": "https://github.com/taocpp/PEGTL",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/pfring/makefile.patch b/external_imported/vcpkg/ports/pfring/makefile.patch
deleted file mode 100644
index cc17fb1f7..000000000
--- a/external_imported/vcpkg/ports/pfring/makefile.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 4b377c628..39cbf5cb4 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,10 +1,12 @@
- all:
--	cd kernel; make
--	cd userland; ./configure; make
--	cd drivers; make
-+	$(MAKE) -C kernel;
-+	#cd kernel; make
-+	cd userland; ./configure;
-+	$(MAKE) -C userland;
-+	$(MAKE) -C drivers;
- 
- install:
--	cd userland; make install
-+	$(MAKE) install -C userland;
- 
- clean:
- 	-cd kernel; make clean
-diff --git a/userland/Makefile b/userland/Makefile
-index 959470c0f..e35ca8de7 100644
---- a/userland/Makefile
-+++ b/userland/Makefile
-@@ -9,22 +9,22 @@ lib/Makefile:
- config: lib/Makefile
- 
- libpfring: config
--	cd lib; make
-+	$(MAKE) -C lib
- 
- build_nbpf: config
--	cd nbpf; make
-+	$(MAKE) -C nbpf
- 
- build_c++: libpfring
--	cd c++; make
-+	$(MAKE) -C c++
- 
- tcpdump/Makefile:
- 	cd tcpdump; ./configure --with_system_libpcap=yes
- 
- build_tcpdump: libpfring tcpdump/Makefile
--	cd tcpdump; make
-+	$(MAKE) -C tcpdump
- 
- build_extcap: libpfring
--	cd wireshark/extcap; make
-+	$(MAKE) -C wireshark/extcap
- 
- ###################
- 
-@@ -46,4 +46,4 @@ extcap_clean:
- 	cd wireshark/extcap; make clean
- 
- install: libpfring
--	cd lib; make install
-+	$(MAKE) -C lib install
diff --git a/external_imported/vcpkg/ports/pfring/portfile.cmake b/external_imported/vcpkg/ports/pfring/portfile.cmake
index 9ef166735..12b7338f2 100644
--- a/external_imported/vcpkg/ports/pfring/portfile.cmake
+++ b/external_imported/vcpkg/ports/pfring/portfile.cmake
@@ -1,63 +1,40 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ntop/PF_RING
-    REF 582fa09bc58411cfe6f27facd7e6438924f779d2
-    SHA512 78dd2d2f9df259483196905f80a904534632a835f742d1f8b3ad645ea80f2dad78356960a2b35e2678525786a7344fa248b708bd3f86101c43fb36c7abc05598
+    REF "${VERSION}"
+    SHA512 de86fb2ead8af63a3b73026225ac2dba9ae97c90d0925e30c63ed75f1d1f7f057b6ab586b06dd24fdbbfdce694048b72bbdd35fc4de0c22508701a6c3ee7c7a2
     HEAD_REF dev
-    PATCHES
-        use-vcpkg-libpcap.patch
-        makefile.patch
 )
 
-file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")
-if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-    file(COPY "${SOURCE_PATH}/" DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg")
-endif()
-if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-    file(COPY "${SOURCE_PATH}/" DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")
-endif()
-set(ENV{VCPKG_LIBPCAP_DIR} "${CURRENT_INSTALLED_DIR}")
-vcpkg_build_make()
-vcpkg_fixup_pkgconfig()
+file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/kernel")
+file(COPY "${SOURCE_PATH}/kernel/linux/pf_ring.h" DESTINATION "${CURRENT_BUILDTREES_DIR}/kernel/linux")
 
-vcpkg_copy_pdbs()
+vcpkg_find_acquire_program(BISON)
+vcpkg_find_acquire_program(FLEX)
 
-# Install manually because pfring cannot set prefix
-if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug)
-    set(PFRING_OBJ_DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
-
-    if (VCPKG_BUILD_TYPE STREQUAL debug)
-        file(GLOB_RECURSE PFRING_KO_FILES "${PFRING_OBJ_DIR}/*.ko")
-        file(INSTALL ${PFRING_KO_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/share/${PORT})
-
-        file(INSTALL ${SOURCE_PATH}/userland/lib/pfring.h DESTINATION ${CURRENT_PACKAGES_DIR}/debug/include)
-    endif()
-
-    file(GLOB_RECURSE PFRING_LIBS "${PFRING_OBJ_DIR}/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}")
-    file(INSTALL ${PFRING_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-
-    if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-        file(GLOB_RECURSE PFRING_DLLS "${PFRING_OBJ_DIR}/*${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}")
-        file(INSTALL ${PFRING_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
-    endif()
-endif()
-
-if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release)
-    set(PFRING_OBJ_DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
-
-    file(GLOB_RECURSE PFRING_KO_FILES "${PFRING_OBJ_DIR}/*.ko")
-    file(INSTALL ${PFRING_KO_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-
-    file(GLOB_RECURSE PFRING_LIBS "${PFRING_OBJ_DIR}/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}")
-    file(INSTALL ${PFRING_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-
-    if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-        file(GLOB_RECURSE PFRING_DLLS "${PFRING_OBJ_DIR}/*${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}")
-        file(INSTALL ${PFRING_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
-    endif()
-
-    file(INSTALL ${SOURCE_PATH}/userland/lib/pfring.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-endif()
+vcpkg_configure_make(
+    SOURCE_PATH "${SOURCE_PATH}"
+    PROJECT_SUBPATH "userland"
+    COPY_SOURCE
+    OPTIONS
+        --disable-archopt
+)
+string(REPLACE "dynamic" "shared" install_target "install-${VCPKG_LIBRARY_LINKAGE}")
+vcpkg_install_make(
+    SUBPATH "lib"
+    INSTALL_TARGET "${install_target}"
+    OPTIONS
+        "LEX=${FLEX}"
+        "YACC=${BISON}"
+)
 
-#Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+vcpkg_install_copyright(
+    COMMENT [[
+The user-space PF_RING library source code is distributed under the LGPLv2.1.
+The library is built using binary objects from the userland/lib/libs directory
+which adds an NTOP END USER LICENSE AGREEMENT.
+]]
+    FILE_LIST
+        "${SOURCE_PATH}/LICENSE"
+        "${SOURCE_PATH}/userland/lib/libs/EULA.txt"
+)
diff --git a/external_imported/vcpkg/ports/pfring/use-vcpkg-libpcap.patch b/external_imported/vcpkg/ports/pfring/use-vcpkg-libpcap.patch
deleted file mode 100644
index e005442bf..000000000
--- a/external_imported/vcpkg/ports/pfring/use-vcpkg-libpcap.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-diff --git a/userland/Makefile b/userland/Makefile
-index d5392c09..959470c0 100644
---- a/userland/Makefile
-+++ b/userland/Makefile
-@@ -1,4 +1,4 @@
--all: libpfring pcap build_examples build_examples_zc build_examples_ft build_extcap 
-+all: libpfring build_extcap 
- # build_tcpdump build_c++
- 
- ###################
-@@ -14,52 +14,25 @@ libpfring: config
- build_nbpf: config
- 	cd nbpf; make
- 
--libpcap/Makefile:
--	cd libpcap; ./configure --enable-ipv6 --enable-dbus=no --without-libnl --with-snf=no --disable-bluetooth --disable-canusb --with-dag=no
--
--pcap: libpfring libpcap/Makefile
--	cd libpcap; make
--
--build_examples: config
--	cd examples; make
--
--build_examples_zc: config
--	cd examples_zc; make
--
--build_examples_ft: config
--	cd examples_ft; make
--
- build_c++: libpfring
- 	cd c++; make
- 
- tcpdump/Makefile:
--	cd tcpdump; ./configure
-+	cd tcpdump; ./configure --with_system_libpcap=yes
- 
--build_tcpdump: libpfring pcap tcpdump/Makefile
-+build_tcpdump: libpfring tcpdump/Makefile
- 	cd tcpdump; make
- 
--build_extcap: libpfring pcap
-+build_extcap: libpfring
- 	cd wireshark/extcap; make
- 
- ###################
- 
--clean: libpfring_clean pcap_clean examples_clean examples_ft_clean examples_zc_clean c++_clean tcpdump_clean nbpf_clean extcap_clean
-+clean: libpfring_clean c++_clean tcpdump_clean nbpf_clean extcap_clean
- 
- libpfring_clean:
- 	cd lib; make clean
- 
--pcap_clean:
--	if test -f libpcap/config.status; then cd libpcap; make clean; fi
--
--examples_clean:
--	cd examples; make clean
--
--examples_zc_clean:
--	cd examples_zc; make clean
--
--examples_ft_clean:
--	cd examples_ft; make clean
--
- c++_clean:
- 	cd c++; make clean
- 
-@@ -72,8 +45,5 @@ nbpf_clean:
- extcap_clean:
- 	cd wireshark/extcap; make clean
- 
--install: libpfring pcap examples examples_zc examples_ft
-+install: libpfring
- 	cd lib; make install
--	cd libpcap; make install
--	cd examples; make install
--	cd examples_zc; make install
-diff --git a/userland/c++/Makefile.in b/userland/c++/Makefile.in
-index 02bf5164..b0442d84 100644
---- a/userland/c++/Makefile.in
-+++ b/userland/c++/Makefile.in
-@@ -1,8 +1,7 @@
- CPP=g++ -g 
- 
- KERNEL_DIR=../../kernel
--LIBPCAP_DIR=../libpcap
--INCLUDE=-I$(KERNEL_DIR) -I$(LIBPCAP_DIR) -I../lib `../lib/pfring_config --include`
-+INCLUDE=-I$(KERNEL_DIR) -I$(VCPKG_LIBPCAP_DIR)/include -I../lib `../lib/pfring_config --include`
- LIBPFRING_CPP=libpfring_cpp.a
- RANLIB=ranlib
- OBJ=PFring.o
-@@ -11,7 +10,7 @@ LIBS=../lib/libpfring.a `../lib/pfring_config --libs` -lpthread
- all: $(LIBPFRING_CPP) pf_test
- 
- pf_test: pf_test.cpp $(LIBPFRING_CPP)
--	$(CPP) $(INCLUDE) $< $(LIBPFRING_CPP) -o $@ $(LIBS) $(LIBPCAP_DIR)/libpcap.a @SYSLIBS@
-+	$(CPP) $(INCLUDE) $< $(LIBPFRING_CPP) -o $@ $(LIBS) $(VCPKG_LIBPCAP_DIR)/lib/libpcap.a @SYSLIBS@
- 
- $(LIBPFRING_CPP): $(OBJ)
- 	@rm -f $@
-diff --git a/userland/snort/pfring-daq-module-zc/Makefile.am b/userland/snort/pfring-daq-module-zc/Makefile.am
-index 7123de18..45998688 100644
---- a/userland/snort/pfring-daq-module-zc/Makefile.am
-+++ b/userland/snort/pfring-daq-module-zc/Makefile.am
-@@ -4,5 +4,5 @@ ACLOCAL_AMFLAGS = -I m4
- 
- pkglib_LTLIBRARIES = daq_pfring_zc.la
- daq_pfring_zc_la_SOURCES = daq_pfring_zc.c
--daq_pfring_zc_la_CFLAGS = -DBUILDING_SO  -I../../libpcap
--daq_pfring_zc_la_LDFLAGS = -module -export-dynamic -avoid-version -shared -lrt ../../libpcap/libpcap.a
-+daq_pfring_zc_la_CFLAGS = -DBUILDING_SO  -I${VCPKG_LIBPCAP_DIR}/include
-+daq_pfring_zc_la_LDFLAGS = -module -export-dynamic -avoid-version -shared -lrt ${VCPKG_LIBPCAP_DIR}/lib/libpcap.a
-diff --git a/userland/tcpdump-4.9.2/Makefile.in b/userland/tcpdump-4.9.2/Makefile.in
-index e2c74d13..47d9e2cc 100644
---- a/userland/tcpdump-4.9.2/Makefile.in
-+++ b/userland/tcpdump-4.9.2/Makefile.in
-@@ -373,7 +373,7 @@ TEST_DIST= `find tests \( -name 'DIFF' -prune \) -o \( -name NEW -prune \) -o -t
- 
- all: $(PROG) $(LIBNETDISSECT)
- 
--$(PROG): $(OBJ) @V_PCAPDEP@
-+$(PROG): $(OBJ) $(VCPKG_LIBPCAP_DIR)/lib/libpcap.a
- 	@rm -f $@
- 	$(CC) $(FULL_CFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
- 
-diff --git a/userland/wireshark/extcap/Makefile.in b/userland/wireshark/extcap/Makefile.in
-index 970b9680..3e34ccc8 100644
---- a/userland/wireshark/extcap/Makefile.in
-+++ b/userland/wireshark/extcap/Makefile.in
-@@ -20,14 +20,13 @@ LIBPFRING  = ${PFRINGDIR}/libpfring.a
- #
- O_FLAG     = -O2 -DHAVE_PF_RING
- EXTRA_LIBS =
--PCAPDIR    = ../../libpcap
--LIBPCAP    = ${PCAPDIR}/libpcap.a  ${EXTRA_LIBS}
-+LIBPCAP    = ${VCPKG_LIBPCAP_DIR}/lib/libpcap.a  ${EXTRA_LIBS}
- 
- #
- # Search directories
- #
- PFRING_KERNEL=../../../kernel
--INCLUDE    = -I${PFRING_KERNEL} -I${PFRINGDIR} -I${PCAPDIR} -Ithird-party `../../lib/pfring_config --include`
-+INCLUDE    = -I${PFRING_KERNEL} -I${PFRINGDIR} -I${VCPKG_LIBPCAP_DIR}/include -Ithird-party `../../lib/pfring_config --include`
- 
- #
- # C compiler and flags
diff --git a/external_imported/vcpkg/ports/pfring/vcpkg.json b/external_imported/vcpkg/ports/pfring/vcpkg.json
index d0f6d9191..14b48ba05 100644
--- a/external_imported/vcpkg/ports/pfring/vcpkg.json
+++ b/external_imported/vcpkg/ports/pfring/vcpkg.json
@@ -1,11 +1,8 @@
 {
   "name": "pfring",
-  "version-date": "2019-10-17",
-  "port-version": 4,
-  "description": "PF_RINGâ„¢ is a Linux kernel module and user-space framework that allows you to process packets at high-rates while providing you a consistent API for packet processing applications.",
+  "version": "8.4.0",
+  "description": "Library to interface with the PF_RINGâ„¢ kernel module for processing packets at high-rates while providing a consistent API.",
   "homepage": "https://github.com/ntop/PF_RING",
-  "supports": "!windows",
-  "dependencies": [
-    "libpcap"
-  ]
+  "license": null,
+  "supports": "linux"
 }
diff --git a/external_imported/vcpkg/ports/pfultz2-linq/vcpkg.json b/external_imported/vcpkg/ports/pfultz2-linq/vcpkg.json
index c1ff1d4e2..2c7c45b9f 100644
--- a/external_imported/vcpkg/ports/pfultz2-linq/vcpkg.json
+++ b/external_imported/vcpkg/ports/pfultz2-linq/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "pfultz2-linq",
-  "version-string": "2019-05-14",
-  "port-version": 2,
+  "version-date": "2019-05-14",
+  "port-version": 3,
   "description": "Linq for list comprehension in C++",
   "dependencies": [
     "boost-fusion",
diff --git a/external_imported/vcpkg/ports/physx/fix-compiler-flag.patch b/external_imported/vcpkg/ports/physx/fix-compiler-flag.patch
deleted file mode 100644
index a38967357..000000000
--- a/external_imported/vcpkg/ports/physx/fix-compiler-flag.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff --git a/physx/compiler/public/CMakeLists.txt b/physx/compiler/public/CMakeLists.txt
-index 77776ca7..bd7b496d 100644
---- a/physx/compiler/public/CMakeLists.txt
-+++ b/physx/compiler/public/CMakeLists.txt
-@@ -33,6 +33,8 @@ ENDIF()
- 
- project(PhysXSDK C CXX)
- 
-+SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS}" CACHE INTERNAL "PhysX Debug CXX Flags")
-+
- OPTION(PX_BUILDSNIPPETS "Generate the snippets" OFF)
- OPTION(PX_BUILDPUBLICSAMPLES "Generate the samples" OFF)
- OPTION(PX_CMAKE_SUPPRESS_REGENERATION "Disable zero_check projects" OFF)
-diff --git a/physx/source/compiler/cmake/uwp/CMakeLists.txt b/physx/source/compiler/cmake/uwp/CMakeLists.txt
-index 20dcb6ae..c7e03c3e 100644
---- a/physx/source/compiler/cmake/uwp/CMakeLists.txt
-+++ b/physx/source/compiler/cmake/uwp/CMakeLists.txt
-@@ -39,11 +39,13 @@ ELSE()
- ENDIF()
- 
- # Cache the CXX flags so the other CMakeLists.txt can use them if needed
--SET(PHYSX_CXX_FLAGS "/Wall /d2Zi+ /MP /WX /W4 /GF /GS- /GR- /Gd ${PHYSX_FP_MODE} ${PHYSX_WARNING_DISABLES}" CACHE INTERNAL "PhysX CXX")
-+SET(PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS} ${PHYSX_FP_MODE} ${PHYSX_WARNING_DISABLES}" CACHE INTERNAL "PhysX CXX")
-+if(FALSE)
- SET(PHYSX_CXX_FLAGS_DEBUG "/Od ${WINCRT_DEBUG} /Zi" CACHE INTERNAL "PhysX Debug CXX Flags")
- SET(PHYSX_CXX_FLAGS_CHECKED "/O2 ${WINCRT_NDEBUG} /Zi" CACHE INTERNAL "PhysX Checked CXX Flags")
- SET(PHYSX_CXX_FLAGS_PROFILE "/O2 ${WINCRT_NDEBUG} /Zi" CACHE INTERNAL "PhysX Profile CXX Flags")
- SET(PHYSX_CXX_FLAGS_RELEASE "/O2 ${WINCRT_NDEBUG} /Zi" CACHE INTERNAL "PhysX Release CXX Flags")
-+endif()
- 
- # These flags are local to the directory the CMakeLists.txt is in, so don't get carried over to OTHER CMakeLists.txt (thus the CACHE variables above)
- SET(CMAKE_CXX_FLAGS ${PHYSX_CXX_FLAGS})
-diff --git a/physx/source/compiler/cmake/windows/CMakeLists.txt b/physx/source/compiler/cmake/windows/CMakeLists.txt
-index a1ab3596..dbd20fb0 100644
---- a/physx/source/compiler/cmake/windows/CMakeLists.txt
-+++ b/physx/source/compiler/cmake/windows/CMakeLists.txt
-@@ -41,17 +41,19 @@ ELSE()
- 	SET(PHYSX_FP_MODE "/fp:fast")	
- ENDIF()
- IF(CMAKE_CL_64)
--	SET(PHYSX_CXX_FLAGS "/d2Zi+ /MP /WX /W4 /GF /GS- /GR- /Gd ${PHYSX_FP_MODE} /Oy ${PHYSX_WARNING_DISABLES}" CACHE INTERNAL "PhysX CXX")
-+	SET(PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS} ${PHYSX_FP_MODE} ${PHYSX_WARNING_DISABLES}" CACHE INTERNAL "PhysX CXX")
- ELSE()
--	SET(PHYSX_CXX_FLAGS "/arch:SSE2 /d2Zi+ /MP /WX /W4 /GF /GS- /GR- /Gd ${PHYSX_FP_MODE} /Oy ${PHYSX_WARNING_DISABLES}" CACHE INTERNAL "PhysX CXX")	
-+	SET(PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS} /arch:SSE2 ${PHYSX_FP_MODE} ${PHYSX_WARNING_DISABLES}" CACHE INTERNAL "PhysX CXX")
- ENDIF()
- 
-+if(FALSE)
- SET(PHYSX_CXX_FLAGS_DEBUG "/Od ${WINCRT_DEBUG} /RTCu /Zi" CACHE INTERNAL "PhysX Debug CXX Flags")
- # PT: changed /Ox to /O2 because "the /Ox compiler option enables only a subset of the speed optimization options enabled by /O2."
- # See https://docs.microsoft.com/en-us/cpp/build/reference/ox-full-optimization?view=vs-2019
- SET(PHYSX_CXX_FLAGS_CHECKED "/O2 ${WINCRT_NDEBUG} /Zi" CACHE INTERNAL "PhysX Checked CXX Flags")
- SET(PHYSX_CXX_FLAGS_PROFILE "/O2 ${WINCRT_NDEBUG} /Zi" CACHE INTERNAL "PhysX Profile CXX Flags")
- SET(PHYSX_CXX_FLAGS_RELEASE "/O2 ${WINCRT_NDEBUG} /Zi" CACHE INTERNAL "PhysX Release CXX Flags")
-+endif()
- 
- # cache lib type defs
- IF(PX_GENERATE_STATIC_LIBRARIES)	
-diff --git a/physx/source/compiler/cmake/linux/CMakeLists.txt b/physx/source/compiler/cmake/linux/CMakeLists.txt
-index 6246e488..7bf0cc30 100644
---- a/physx/source/compiler/cmake/linux/CMakeLists.txt
-+++ b/physx/source/compiler/cmake/linux/CMakeLists.txt
-@@ -36,6 +36,11 @@ IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-        SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections -fstrict-aliasing ${CLANG_WARNINGS}" CACHE INTERNAL "PhysX CXX")
- ELSEIF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-        SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections -fno-strict-aliasing ${GCC_WARNINGS}" CACHE INTERNAL "PhysX CXX")
-+
-+       # Enable SSE2 and fix double alignment for 32-bit x86 builds
-+       IF (CMAKE_SYSTEM_PROCESSOR MATCHES "i686.*|i386.*|x86.*")
-+               STRING(APPEND PHYSX_CXX_FLAGS " -malign-double -msse2")
-+       ENDIF()
- ENDIF()
- 
- # Build debug info for all configurations
-
diff --git a/external_imported/vcpkg/ports/physx/omniverse-physx-sdk-config.cmake b/external_imported/vcpkg/ports/physx/omniverse-physx-sdk-config.cmake
new file mode 100644
index 000000000..763c7daa7
--- /dev/null
+++ b/external_imported/vcpkg/ports/physx/omniverse-physx-sdk-config.cmake
@@ -0,0 +1,117 @@
+# omniverse-physx-sdk-config.cmake (from which unofficial-omniverse-physx-sdk-config.cmake is generated)
+# A user's CMakeLists.txt should:
+#   find_package(unofficial-omniverse-physx-sdk CONFIG REQUIRED)
+#   target_link_libraries(main PRIVATE unofficial::omniverse-physx-sdk::sdk)
+# the GPU acceleration .so/.dll libraries are in the port's tools/ directory (needed for late binding).
+# See the usage file for more info and more detailed explanation on how to use this.
+
+include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake)
+
+if(NOT TARGET unofficial::omniverse-physx-sdk)
+    # Find include and library directories (up one level multiple times)
+    get_filename_component(z_vcpkg_omniverse_physx_sdk_prefix "${CMAKE_CURRENT_LIST_FILE}" PATH)
+    get_filename_component(z_vcpkg_omniverse_physx_sdk_prefix "${z_vcpkg_omniverse_physx_sdk_prefix}" PATH)
+    get_filename_component(z_vcpkg_omniverse_physx_sdk_prefix "${z_vcpkg_omniverse_physx_sdk_prefix}" PATH)
+
+    get_filename_component(OMNIVERSE-PHYSX-SDK_INCLUDE_DIRS "${z_vcpkg_omniverse_physx_sdk_prefix}/include/physx" ABSOLUTE)
+    get_filename_component(OMNIVERSE-PHYSX-SDK_RELEASE_LIBS_DIR "${z_vcpkg_omniverse_physx_sdk_prefix}/lib" ABSOLUTE)
+    get_filename_component(OMNIVERSE-PHYSX-SDK_DEBUG_LIBS_DIR "${z_vcpkg_omniverse_physx_sdk_prefix}/debug/lib" ABSOLUTE)
+    get_filename_component(OMNIVERSE-PHYSX-SDK_RELEASE_BIN_DIR "${z_vcpkg_omniverse_physx_sdk_prefix}/bin" ABSOLUTE)
+    get_filename_component(OMNIVERSE-PHYSX-SDK_DEBUG_BIN_DIR "${z_vcpkg_omniverse_physx_sdk_prefix}/debug/bin" ABSOLUTE)
+    get_filename_component(OMNIVERSE-PHYSX-SDK_RELEASE_TOOLS_DIR "${z_vcpkg_omniverse_physx_sdk_prefix}/tools" ABSOLUTE)
+
+    # Find main library files
+    find_library(OMNIVERSE-PHYSX-SDK_LIBRARY_RELEASE NAMES PhysX_static_64 PhysX_64 PATHS "${OMNIVERSE-PHYSX-SDK_RELEASE_LIBS_DIR}" NO_DEFAULT_PATH)
+    find_library(OMNIVERSE-PHYSX-SDK_LIBRARY_DEBUG NAMES PhysX_static_64 PhysX_64 PATHS "${OMNIVERSE-PHYSX-SDK_DEBUG_LIBS_DIR}" NO_DEFAULT_PATH)
+
+    # Finally create the imported target that users will link against
+    set(OMNIVERSE-PHYSX-SDK_LIBRARIES "")
+    add_library(unofficial::omniverse-physx-sdk::sdk UNKNOWN IMPORTED)
+
+    # Set IMPORTED_IMPLIB for the main target in case of dynamic libraries
+    if (WIN32 AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+        set_target_properties(unofficial::omniverse-physx-sdk::sdk PROPERTIES
+            IMPORTED_IMPLIB_RELEASE "${OMNIVERSE-PHYSX-SDK_LIBRARY_RELEASE}"
+            IMPORTED_IMPLIB_DEBUG "${OMNIVERSE-PHYSX-SDK_LIBRARY_DEBUG}"
+        )
+    endif()
+
+    set_target_properties(unofficial::omniverse-physx-sdk::sdk PROPERTIES
+        IMPORTED_CONFIGURATIONS "DEBUG;RELEASE"
+        IMPORTED_LOCATION_RELEASE "${OMNIVERSE-PHYSX-SDK_LIBRARY_RELEASE}"
+        IMPORTED_LOCATION_DEBUG "${OMNIVERSE-PHYSX-SDK_LIBRARY_DEBUG}"
+        INTERFACE_INCLUDE_DIRECTORIES "${OMNIVERSE-PHYSX-SDK_INCLUDE_DIRS}"
+    )
+
+    # Add compile definitions to the target for debug/release builds
+    target_compile_definitions(unofficial::omniverse-physx-sdk::sdk INTERFACE $<$<CONFIG:Debug>:_DEBUG>)
+
+    set(lib_names
+            PhysXExtensions
+            PhysXPvdSDK
+            PhysXCharacterKinematic
+            PhysXCooking
+            PhysXCommon
+            PhysXFoundation
+            PhysXVehicle
+    )
+    if(WIN32)
+        list(APPEND lib_names PhysXVehicle2)
+    endif()
+
+    foreach(name IN LISTS lib_names)
+        find_library(OMNIVERSE_${name}_LIBRARY_RELEASE
+            NAMES ${name}_static_64 ${name}_64 # ...  all candidates, only one should be installed for a given triplet
+            PATHS "${OMNIVERSE-PHYSX-SDK_RELEASE_LIBS_DIR}"
+            NO_DEFAULT_PATH
+            REQUIRED
+        )
+        find_library(OMNIVERSE_${name}_LIBRARY_DEBUG
+            NAMES ${name}_static_64 ${name}_64 # ...  all candidates, only one should be installed for a given triplet
+            PATHS "${OMNIVERSE-PHYSX-SDK_DEBUG_LIBS_DIR}"
+            NO_DEFAULT_PATH
+            # not REQUIRED, due to release-only builds
+        )
+        add_library(unofficial::omniverse-physx-sdk::${name} UNKNOWN IMPORTED)
+        set_target_properties(unofficial::omniverse-physx-sdk::${name}
+            PROPERTIES
+                IMPORTED_CONFIGURATIONS "RELEASE"
+                IMPORTED_LOCATION_RELEASE "${OMNIVERSE_${name}_LIBRARY_RELEASE}"
+        )
+        if(OMNIVERSE_${name}_LIBRARY_DEBUG)
+            set_target_properties(unofficial::omniverse-physx-sdk::${name}
+                PROPERTIES
+                    IMPORTED_CONFIGURATIONS "DEBUG;RELEASE"
+                    IMPORTED_LOCATION_DEBUG "${OMNIVERSE_${name}_LIBRARY_DEBUG}"
+            )
+        endif()
+        set_property(TARGET unofficial::omniverse-physx-sdk::sdk APPEND PROPERTY
+            INTERFACE_LINK_LIBRARIES unofficial::omniverse-physx-sdk::${name}
+        )
+        select_library_configurations(OMNIVERSE_${name})
+    endforeach()
+
+    # Lastly also provide a target for clients to link with the GPU library (optional, provided by NVIDIA and downloaded through packman)
+
+    # Find GPU library files (these are used at late-binding to enable GPU acceleration)
+    if(WIN32)
+        find_file(OMNIVERSE-PHYSX-SDK-GPU_LIBRARY_RELEASE NAMES PhysXGpu_64.dll PATHS "${OMNIVERSE-PHYSX-SDK_RELEASE_TOOLS_DIR}" NO_DEFAULT_PATH)
+        find_file(OMNIVERSE-PHYSX-SDK-GPU_DEVICE_LIBRARY_RELEASE NAMES PhysXDevice64.dll PATHS "${OMNIVERSE-PHYSX-SDK_RELEASE_TOOLS_DIR}" NO_DEFAULT_PATH)
+    elseif(UNIX)
+        find_file(OMNIVERSE-PHYSX-SDK-GPU_LIBRARY_RELEASE NAMES libPhysXGpu_64.so PATHS "${OMNIVERSE-PHYSX-SDK_RELEASE_TOOLS_DIR}" NO_DEFAULT_PATH)
+    endif()
+
+    # Create imported targets for GPU library (only release is used)
+    add_library(unofficial::omniverse-physx-sdk::gpu-library SHARED IMPORTED)
+    set_target_properties(unofficial::omniverse-physx-sdk::gpu-library PROPERTIES
+        IMPORTED_CONFIGURATIONS "DEBUG;RELEASE"
+        IMPORTED_LOCATION "${OMNIVERSE-PHYSX-SDK-GPU_LIBRARY_RELEASE}"
+    )
+    if(WIN32)
+        add_library(unofficial::omniverse-physx-sdk::gpu-device-library SHARED IMPORTED)
+        set_target_properties(unofficial::omniverse-physx-sdk::gpu-device-library PROPERTIES
+            IMPORTED_CONFIGURATIONS "DEBUG;RELEASE"
+            IMPORTED_LOCATION "${OMNIVERSE-PHYSX-SDK-GPU_DEVICE_LIBRARY_RELEASE}"
+        )
+    endif()
+endif()
diff --git a/external_imported/vcpkg/ports/physx/portfile.cmake b/external_imported/vcpkg/ports/physx/portfile.cmake
index 6e1a7ba85..3d98b0375 100644
--- a/external_imported/vcpkg/ports/physx/portfile.cmake
+++ b/external_imported/vcpkg/ports/physx/portfile.cmake
@@ -1,123 +1,214 @@
-vcpkg_download_distfile(
-    patch1
-    URLS "https://github.com/NVIDIAGameWorks/PhysX/commit/ada4fccf04e5a5832af1353d6d1f91de691aa47d.patch"
-    FILENAME "physx-PR569-ada4fccf.patch"
-    SHA512 ec2fc2fce0b5aab4d42b77f21373bf067f129543e672516477513419241c56b99f2d663b992cb29d296933440e7e7cc31a57198f6fcc78d6eac26b7706c1e937
-)
-
-vcpkg_download_distfile(
-    patch2
-    URLS "https://github.com/NVIDIAGameWorks/PhysX/commit/d590c88e3cbf0fb682726abf7d7c16417855084f.patch"
-    FILENAME "physx-PR569-d590c88e.patch"
-    SHA512 4eb7630db1cb10b2372220c3706dfe255075f466c6b2b12654c9fbc3b17c4df69d7b91e6f0d798c92a4cb8806e1c34b66bb52b46d9358d643ca62ec0de321fd2
-)
-
-vcpkg_download_distfile(
-    patch3
-    URLS "https://github.com/NVIDIAGameWorks/PhysX/commit/cdbfc0f1283829c71b07e332ddd6ce2e5aa7d467.patch"
-    FILENAME "physx-PR569-cdbfc0f.patch"
-    SHA512 2d9d4d30d923b0e006ae1a5c413993325bb4ce5c130fe655242611e87dab945cb220776f112b6cf96b1f06c83a6cec475314a11649bf03304083f5068e282ef2
-)
+###############################################################################################################
+# Port for Omniverse PhysX 5 - NVIDIA Corporation
+# Written by Marco Alesiani <malesiani@nvidia.com>
+# Note: this port is NOT officially supported by NVIDIA.
+# This port is also not a replacement for the 'physx' port: the newest Omniverse PhysX dropped support
+# for many platforms so the old one will continue to be community maintained to support all previous platforms.
+###############################################################################################################
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO NVIDIAGameWorks/PhysX
-    REF 93c6dd21b545605185f2febc8eeacebe49a99479
-    SHA512 c9f50255ca9e0f1ebdb9926992315a62b77e2eea3addd4e65217283490714e71e24f2f687717dd8eb155078a1a6b25c9fadc123ce8bc4c5615f7ac66cd6b11aa
-    HEAD_REF master
-    PATCHES
-        fix-compiler-flag.patch
-        "${patch1}"
-        "${patch2}"
-        "${patch3}"
-        remove-werror.patch
+    REPO NVIDIA-Omniverse/PhysX
+    REF 105.1-physx-5.3.0 # newest tag
+    SHA512 fa3897738aed583f0498587365aafc77107351d72888058d0b725bd39de1c33b37c99294b6346be165eaf3aa3c6228ca7ddb0a3b18e522c1fb79e2559d70b551
+    HEAD_REF main
 )
 
-if(NOT DEFINED RELEASE_CONFIGURATION)
-    set(RELEASE_CONFIGURATION "release")
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    set(VCPKG_BUILD_STATIC_LIBS TRUE)
+else()
+    set(VCPKG_BUILD_STATIC_LIBS FALSE)
+endif()
+if(VCPKG_CRT_LINKAGE STREQUAL "static")
+    set(VCPKG_LINK_CRT_STATICALLY TRUE)
+else()
+    set(VCPKG_LINK_CRT_STATICALLY FALSE)
 endif()
-set(DEBUG_CONFIGURATION "debug")
-
-set(OPTIONS
-    "-DPHYSX_ROOT_DIR=${SOURCE_PATH}/physx"
-    "-DPXSHARED_PATH=${SOURCE_PATH}/pxshared"
-    "-DPXSHARED_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}"
-    "-DCMAKEMODULES_PATH=${SOURCE_PATH}/externals/cmakemodules"
-    "-DCMAKEMODULES_NAME=CMakeModules"
-    "-DCMAKE_MODULES_VERSION=1.27"
-    "-DPX_BUILDSNIPPETS=OFF"
-    "-DPX_BUILDPUBLICSAMPLES=OFF"
-    "-DPX_FLOAT_POINT_PRECISE_MATH=OFF"
-    "-DPX_COPY_EXTERNAL_DLL=OFF"
-    "-DGPU_DLL_COPIED=ON"
-)
 
-set(OPTIONS_RELEASE
-    "-DPX_OUTPUT_BIN_DIR=${CURRENT_PACKAGES_DIR}"
-    "-DPX_OUTPUT_LIB_DIR=${CURRENT_PACKAGES_DIR}"
-)
-set(OPTIONS_DEBUG
-    "-DPX_OUTPUT_BIN_DIR=${CURRENT_PACKAGES_DIR}/debug"
-    "-DPX_OUTPUT_LIB_DIR=${CURRENT_PACKAGES_DIR}/debug"
-    "-DNV_USE_DEBUG_WINCRT=ON"
-)
+# Target platform detection for packman (the NVIDIA dependency downloader) and CMake options settings
+if(VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
+    set(PLATFORM_OPTIONS
+        -DPX_BUILDSNIPPETS=OFF
+        -DPX_BUILDPVDRUNTIME=OFF
+        -DPX_GENERATE_STATIC_LIBRARIES=${VCPKG_BUILD_STATIC_LIBS}
+    )
+    set(targetPlatform "linux")
+elseif(VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
+    set(PLATFORM_OPTIONS
+        -DPX_BUILDSNIPPETS=OFF
+        -DPX_BUILDPVDRUNTIME=OFF
+        -DPX_GENERATE_STATIC_LIBRARIES=${VCPKG_BUILD_STATIC_LIBS}
+    )
+    set(targetPlatform "linuxAarch64")
+elseif(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
 
-if(VCPKG_TARGET_IS_UWP)
-    list(APPEND OPTIONS "-DTARGET_BUILD_PLATFORM=uwp")
-    set(configure_options WINDOWS_USE_MSBUILD)
-elseif(VCPKG_TARGET_IS_WINDOWS)
-    list(APPEND OPTIONS "-DTARGET_BUILD_PLATFORM=windows")
-elseif(VCPKG_TARGET_IS_OSX)
-    list(APPEND OPTIONS "-DTARGET_BUILD_PLATFORM=mac")
-elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_FREEBSD)
-    list(APPEND OPTIONS "-DTARGET_BUILD_PLATFORM=linux")
-elseif(VCPKG_TARGET_IS_ANDROID)
-    list(APPEND OPTIONS "-DTARGET_BUILD_PLATFORM=android")
+    set(PLATFORM_OPTIONS
+        -DPX_BUILDSNIPPETS=OFF
+        -DPX_BUILDPVDRUNTIME=OFF
+        -DPX_GENERATE_STATIC_LIBRARIES=${VCPKG_BUILD_STATIC_LIBS}
+        -DNV_USE_STATIC_WINCRT=${VCPKG_LINK_CRT_STATICALLY}
+        -DPX_FLOAT_POINT_PRECISE_MATH=OFF
+    )
+
+    # Note: it would have been more correct to specify "win64" here, but we specify this so that packman can download
+    # the right dependencies on windows (see the "platforms" field in the dependencies.xml), that will also later
+    # set up the correct PM_xxx environment variables that we can pass to the cmake generation invocation to find
+    # whatever the PhysX project needs. Note that vc17(2022) is not required: the latest repo is guaranteed to work
+    # with vc15, vc16 and vc17 on x64 Windows. The binaries for these platforms downloaded by packman should be the same.
+    set(targetPlatform "vc17win64")
 else()
-    message(FATAL_ERROR "Unhandled or unsupported target platform.")
+    message(FATAL_ERROR "Unsupported platform/architecture combination")
 endif()
 
-if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS)
-    list(APPEND OPTIONS "-DNV_FORCE_64BIT_SUFFIX=ON" "-DNV_FORCE_32BIT_SUFFIX=OFF")
-endif()
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    list(APPEND OPTIONS "-DPX_GENERATE_STATIC_LIBRARIES=OFF")
+######################## Download required deps ##############################
+
+set($ENV{PM_PATHS} "")
+
+if(VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_download_distfile(ARCHIVE
+        URLS "https://d4i3qtqj3r0z5.cloudfront.net/PhysXGpu%40105.1-5.3.4207.33265367-windows-public.7z"
+        FILENAME "PhysXGpu.7z"
+        SHA512 010b4c135026a15710b2e0d0d503197456f8f9d2eb291b32df65aa3dbeff09ba0877c52af1724f7a9384af727657d247cabf9c330e11c7ae1e1be5d1b89dce81
+    )
+
+    # 7z might not be preinstalled on Win machines
+    vcpkg_find_acquire_program(7Z)
+    set(ENV{PM_PhysXGpu_PATH} "${CURRENT_BUILDTREES_DIR}/PhysXGpu_dep")
+    file(MAKE_DIRECTORY "$ENV{PM_PhysXGpu_PATH}")
+    vcpkg_execute_required_process(
+        COMMAND "${7Z}" x "${ARCHIVE}" "-o$ENV{PM_PhysXGpu_PATH}" "-y" "-bso0" "-bsp0"
+        WORKING_DIRECTORY "$ENV{PM_PhysXGpu_PATH}"
+        LOGNAME "extract-PhysXGpu"
+    )
 else()
-    list(APPEND OPTIONS "-DPX_GENERATE_STATIC_LIBRARIES=ON")
+    vcpkg_download_distfile(ARCHIVE
+        URLS "https://d4i3qtqj3r0z5.cloudfront.net/PhysXGpu%40105.1-5.3.4207.33265367-linux-x86_64-public.7z"
+        FILENAME "PhysXGpu.7z"
+        SHA512 a6209a7d4218e80c3cbeec10a80ca3aaa08793469ddcf01ed8bc4582beef0b13697e1bb91f3a59cfdbdfe9652fe22d7569be4de9f0d08a9525a60951c2989acd
+    )
+
+    vcpkg_extract_source_archive(PHYSXGPU_SOURCE_PATH
+        NO_REMOVE_ONE_LEVEL
+        ARCHIVE "${ARCHIVE}"
+        BASE_DIRECTORY PhysXGpu_dep
+    )
+    set(ENV{PM_PhysXGpu_PATH} "${PHYSXGPU_SOURCE_PATH}")
 endif()
+message(STATUS "Extracted dependency to $ENV{PM_PhysXGpu_PATH}")
+list(APPEND ENV{PM_PATHS} $ENV{PM_PhysXGpu_PATH})
 
-if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
-    list(APPEND OPTIONS "-DNV_USE_STATIC_WINCRT=OFF")
-else()
-    list(APPEND OPTIONS "-DNV_USE_STATIC_WINCRT=ON")
+if(VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_download_distfile(ARCHIVE
+        URLS "https://d4i3qtqj3r0z5.cloudfront.net/PhysXDevice%4018.12.7.4.7z"
+        FILENAME "PhysXDevice.7z"
+        SHA512 c20eb2f1e0dcb9d692cb718ca7e3a332291e72a09614f37080f101e5ebc1591033029f0f1e6fba33a17d4c9f59f13e561f3fc81cee34cd53d50b579c01dd3f3c
+    )
+
+    set(ENV{PM_PhysXDevice_PATH} "${CURRENT_BUILDTREES_DIR}/PhysXDevice_dep")
+    file(MAKE_DIRECTORY "$ENV{PM_PhysXDevice_PATH}")
+    vcpkg_find_acquire_program(7Z)
+    vcpkg_execute_required_process(
+        COMMAND "${7Z}" x "${ARCHIVE}" "-o$ENV{PM_PhysXDevice_PATH}" "-y" "-bso0" "-bsp0"
+        WORKING_DIRECTORY "$ENV{PM_PhysXDevice_PATH}"
+        LOGNAME "extract-PhysXDevice"
+    )
 endif()
+message(STATUS "Extracted dependency to $ENV{PM_PhysXDevice_PATH}")
+list(APPEND ENV{PM_PATHS} $ENV{PM_PhysXDevice_PATH})
 
-if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
-    list(APPEND OPTIONS "-DPX_OUTPUT_ARCH=arm")
-else()
-    list(APPEND OPTIONS "-DPX_OUTPUT_ARCH=x86")
+if(targetPlatform STREQUAL "vc17win64")
+    set(ENV{PM_freeglut_PATH} "${CURRENT_BUILDTREES_DIR}/freeglut_dep")
+    file(MAKE_DIRECTORY "$ENV{PM_freeglut_PATH}")
+    vcpkg_download_distfile(ARCHIVE
+        URLS "https://d4i3qtqj3r0z5.cloudfront.net/freeglut-windows%403.4_1.1.7z"
+        FILENAME "freeglut.7z"
+        SHA512 c01cb75dd466d6889a72d7236669bfce841cc6da9e0edb4208c4affb5ca939f28d64bc3d988bc85d98c589b0b42ac3464f606c89f6c113106669fc9fe84000e5
+    )
+    vcpkg_find_acquire_program(7Z)
+    vcpkg_execute_required_process(
+        COMMAND "${7Z}" x "${ARCHIVE}" "-o$ENV{PM_freeglut_PATH}" "-y" "-bso0" "-bsp0"
+        WORKING_DIRECTORY "$ENV{PM_freeglut_PATH}"
+        LOGNAME "extract-freeglut"
+    )
+    message(STATUS "Extracted dependency to $ENV{PM_freeglut_PATH}")
+    list(APPEND ENV{PM_PATHS} $ENV{PM_freeglut_PATH})
+endif()
+
+######################## Now generate ALL cmake parameters according to our distribution ##############################
+
+set(PHYSX_ROOT_DIR "${SOURCE_PATH}/physx")
+
+# Set common parameters
+set(common_params -DCMAKE_PREFIX_PATH=$ENV{PM_PATHS} -DPHYSX_ROOT_DIR=${PHYSX_ROOT_DIR} -DPX_OUTPUT_LIB_DIR=${PHYSX_ROOT_DIR} -DPX_OUTPUT_BIN_DIR=${PHYSX_ROOT_DIR})
+
+# Set platform and compiler specific parameters
+if(targetPlatform STREQUAL "linuxAarch64")
+    set(cmakeParams -DCMAKE_INSTALL_PREFIX=${PHYSX_ROOT_DIR}/install/linux-aarch64/PhysX)
+    set(platformCMakeParams -DTARGET_BUILD_PLATFORM=linux -DPX_OUTPUT_ARCH=arm)
+elseif(targetPlatform STREQUAL "linux")
+    set(cmakeParams -DCMAKE_INSTALL_PREFIX=${PHYSX_ROOT_DIR}/install/linux/PhysX)
+    set(platformCMakeParams -DTARGET_BUILD_PLATFORM=linux -DPX_OUTPUT_ARCH=x86)
+elseif(targetPlatform STREQUAL "vc17win64") # Again: this will work for any Win64
+    set(cmakeParams -DCMAKE_INSTALL_PREFIX=${PHYSX_ROOT_DIR}/install/vc17win64/PhysX)
+    set(platformCMakeParams -DTARGET_BUILD_PLATFORM=windows -DPX_OUTPUT_ARCH=x86)
+endif()
+
+# Also make sure the packman-downloaded GPU driver is found as a binary
+list(APPEND platformCMakeParams -DPHYSX_PHYSXGPU_PATH=$ENV{PM_PhysXGpu_PATH}/bin)
+
+# Anyway the above only works for clang, see
+# source/compiler/cmake/linux/CMakeLists.txt:164
+# to avoid problems, we copy _immediately_ the extra binaries
+if(targetPlatform STREQUAL "linuxAarch64")
+    file(COPY "$ENV{PM_PhysXGpu_PATH}/bin/linux.aarch64/checked/libPhysXGpu_64.so" DESTINATION "${SOURCE_PATH}/physx/bin/linux.aarch64/debug")
+    file(COPY "$ENV{PM_PhysXGpu_PATH}/bin/linux.aarch64/release/libPhysXGpu_64.so" DESTINATION "${SOURCE_PATH}/physx/bin/linux.aarch64/release")
+elseif(targetPlatform STREQUAL "linux")
+    file(COPY "$ENV{PM_PhysXGpu_PATH}/bin/linux.clang/checked/libPhysXGpu_64.so" DESTINATION "${SOURCE_PATH}/physx/bin/linux.clang/debug")
+    file(COPY "$ENV{PM_PhysXGpu_PATH}/bin/linux.clang/release/libPhysXGpu_64.so" DESTINATION "${SOURCE_PATH}/physx/bin/linux.clang/release")
+elseif(targetPlatform STREQUAL "vc17win64")
+    file(COPY "$ENV{PM_PhysXGpu_PATH}/bin/win.x86_64.vc141.mt/checked/PhysXGpu_64.dll" DESTINATION "${SOURCE_PATH}/physx/bin/vc17win64/debug")
+    file(COPY "$ENV{PM_PhysXGpu_PATH}/bin/win.x86_64.vc141.mt/release/PhysXGpu_64.dll" DESTINATION "${SOURCE_PATH}/physx/bin/vc17win64/release")
 endif()
 
+set(cmakeParams ${platformCMakeParams} ${common_params} ${cmakeParams})
+
+# Finally invoke cmake to configure the PhysX project
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}/physx/compiler/public"
-    ${configure_options}
+    GENERATOR "${generator}"
+    WINDOWS_USE_MSBUILD
+    OPTIONS
+        -DCMAKE_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}
+        ${PLATFORM_OPTIONS}
+        -DPHYSX_ROOT_DIR=${PHYSX_ROOT_DIR}
+        ${cmakeParams}
+    OPTIONS_DEBUG
+        -DNV_USE_DEBUG_WINCRT=TRUE
     DISABLE_PARALLEL_CONFIGURE
-    OPTIONS ${OPTIONS}
-    OPTIONS_DEBUG ${OPTIONS_DEBUG}
-    OPTIONS_RELEASE ${OPTIONS_RELEASE}
+    MAYBE_UNUSED_VARIABLES
+        PX_OUTPUT_ARCH
+        PHYSX_PHYSXGPU_PATH
 )
+
+# Compile and install in vcpkg's final installation directories all of the include headers and binaries for debug/release
 vcpkg_cmake_install()
 
-# NVIDIA Gameworks release structure is generally something like <compiler>/<configuration>/[artifact]
-# It would be nice to patch this out, but that directory structure is hardcoded over many cmake files.
-# So, we have this helpful helper to copy the bins and libs out.
-function(fixup_physx_artifacts)
-    macro(_fixup _IN_DIRECTORY _OUT_DIRECTORY)
+######################## Extract to final vcpkg install locations and fixup artifacts in wrong dirs ##############################
+
+message("[PHYSX BUILD COMPLETED] Extracting build artifacts to vcpkg installation locations..")
+
+# Artifacts paths are similar to <compiler>/<configuration>/[artifact] however vcpkg expects
+# libraries, binaries and headers to be respectively in ${CURRENT_PACKAGES_DIR}/lib or ${CURRENT_PACKAGES_DIR}/debug/lib,
+# ${CURRENT_PACKAGES_DIR}/bin or ${CURRENT_PACKAGES_DIR}/debug/bin and ${CURRENT_PACKAGES_DIR}/include.
+# This function accepts a DIRECTORY named variable specifying the 'lib' or 'bin' destination directory and a SUFFIXES named
+# variable which specifies a list of suffixes to extract in that folder (e.g. all the .lib or .pdb)
+function(copy_in_vcpkg_destination_folder_physx_artifacts)
+    macro(_copy_up _IN_DIRECTORY _OUT_DIRECTORY)
         foreach(_SUFFIX IN LISTS _fpa_SUFFIXES)
             file(GLOB_RECURSE _ARTIFACTS
                 LIST_DIRECTORIES false
-                "${CURRENT_PACKAGES_DIR}/${_IN_DIRECTORY}/*${_SUFFIX}"
+                "${SOURCE_PATH}/physx/${_IN_DIRECTORY}/*${_SUFFIX}"
             )
             if(_ARTIFACTS)
                 file(COPY ${_ARTIFACTS} DESTINATION "${CURRENT_PACKAGES_DIR}/${_OUT_DIRECTORY}")
@@ -126,40 +217,97 @@ function(fixup_physx_artifacts)
     endmacro()
 
     cmake_parse_arguments(_fpa "" "DIRECTORY" "SUFFIXES" ${ARGN})
-    _fixup("bin" ${_fpa_DIRECTORY})
-    _fixup("debug/bin" "debug/${_fpa_DIRECTORY}")
+    _copy_up("bin/*/release" "${_fpa_DIRECTORY}") # could be physx/bin/linux.clang/release or physx/bin/win.x86_64.vc142.mt/release
+    _copy_up("bin/*/debug" "debug/${_fpa_DIRECTORY}")
 endfunction()
 
-fixup_physx_artifacts(
+# Create output directories
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib")
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib")
+if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    # Packman also downloads the Gpu driver shared library, so we'll place it in bin and debug/bin
+    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin")
+    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+
+copy_in_vcpkg_destination_folder_physx_artifacts(
     DIRECTORY "lib"
     SUFFIXES ${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX} ${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}
 )
-fixup_physx_artifacts(
-    DIRECTORY "bin"
-    SUFFIXES ${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX} ".pdb"
-)
 
-# Remove compiler directory and descendents.
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE
-        "${CURRENT_PACKAGES_DIR}/bin/"
-        "${CURRENT_PACKAGES_DIR}/debug/bin/"
+if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    # Also copy whatever .so/.dll were built. Remember that there should be NO /bin directory (nor debug/bin)
+    # when using static linkage
+    copy_in_vcpkg_destination_folder_physx_artifacts(
+        DIRECTORY "bin"
+        SUFFIXES ${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX} ".pdb"
     )
-else()
-    file(GLOB PHYSX_ARTIFACTS LIST_DIRECTORIES true
-        "${CURRENT_PACKAGES_DIR}/bin/*"
-        "${CURRENT_PACKAGES_DIR}/debug/bin/*"
+endif()
+
+# Special treatment is reserved for the PhysXGpu_64 shared library (downloaded by packman).
+# This is a 3rd party "optional functionality" dependency.
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools")
+set(GPULIBNAMES "")
+if(targetPlatform STREQUAL "linuxAarch64" OR targetPlatform STREQUAL "linux")
+    list(APPEND GPULIBNAMES "libPhysXGpu_64.so" "libPhysXDevice64.so")
+elseif(targetPlatform STREQUAL "vc17win64") # Again: this will work for any Win64
+    list(APPEND GPULIBNAMES "PhysXGpu_64.dll" "PhysXDevice64.dll")
+endif()
+
+function(_copy_single_files_from_dir_to_destdir _IN_FILES _IN_DIR _OUT_DIR)
+    file(GLOB_RECURSE _ARTIFACTS
+        LIST_DIRECTORIES false
+        "${_IN_DIR}"
     )
-    foreach(_ARTIFACT IN LISTS PHYSX_ARTIFACTS)
-        if(IS_DIRECTORY ${_ARTIFACT})
-            file(REMOVE_RECURSE ${_ARTIFACT})
-        endif()
+    foreach(_ARTIFACT IN LISTS _ARTIFACTS)
+        foreach(_FILE IN LISTS _IN_FILES)
+            if("${_ARTIFACT}" MATCHES "${_FILE}")
+                file(COPY "${_ARTIFACT}" DESTINATION "${_OUT_DIR}")
+            endif()
+        endforeach()
     endforeach()
-endif()
+endfunction()
+
+# Put it in binary directories, it's an optional component (only release binaries should go in tools/)
+_copy_single_files_from_dir_to_destdir("${GPULIBNAMES}" "${SOURCE_PATH}/physx/bin/*/release/*" "${CURRENT_PACKAGES_DIR}/tools")
 
+# Copy headers to port's destination folder
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include")
+
+# Renaming trick to finally have final folder structure as ${CURRENT_PACKAGES_DIR}/include/physx
+file(RENAME "${SOURCE_PATH}/physx/include" "${SOURCE_PATH}/physx/physx")
+file(COPY "${SOURCE_PATH}/physx/physx" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+
+# Remove useless build directories
 file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/debug/include"
     "${CURRENT_PACKAGES_DIR}/debug/source"
     "${CURRENT_PACKAGES_DIR}/source"
 )
-file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+# Install the cmake config that users will use, replace -if any- only @variables@
+configure_file("${CMAKE_CURRENT_LIST_DIR}/omniverse-physx-sdk-config.cmake" "${CURRENT_PACKAGES_DIR}/share/omniverse-physx-sdk/unofficial-omniverse-physx-sdk-config.cmake" @ONLY)
+
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/share")
+file(COPY "${CURRENT_PACKAGES_DIR}/share/omniverse-physx-sdk" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/share/")
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-omniverse-physx-sdk
+                         CONFIG_PATH share/omniverse-physx-sdk)
+
+# Remove fixup wrong directories
+file(REMOVE_RECURSE
+     "${CURRENT_PACKAGES_DIR}/debug/share"
+)
+
+if(targetPlatform STREQUAL "vc17win64")
+    # Remove freeglut (cannot be skipped in public release builds, but unnecessary)
+    file(REMOVE
+        "${CURRENT_PACKAGES_DIR}/bin/freeglut.dll"
+        "${CURRENT_PACKAGES_DIR}/debug/bin/freeglutd.dll"
+    )
+endif()
+
+# Install license and usage file
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+
+message("[VCPKG Omniverse PhysX port execution completed]")
diff --git a/external_imported/vcpkg/ports/physx/remove-werror.patch b/external_imported/vcpkg/ports/physx/remove-werror.patch
deleted file mode 100644
index 86f3a1d71..000000000
--- a/external_imported/vcpkg/ports/physx/remove-werror.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/physx/source/compiler/cmake/android/CMakeLists.txt b/physx/source/compiler/cmake/android/CMakeLists.txt
-index 06e0d98..2e5454d 100644
---- a/physx/source/compiler/cmake/android/CMakeLists.txt
-+++ b/physx/source/compiler/cmake/android/CMakeLists.txt
-@@ -52,6 +52,8 @@ SET(PHYSX_CXX_FLAGS_RELEASE "-O3 -g" CACHE INTERNAL "PhysX Release CXX Flags")
- 
- 
- # These flags are local to the directory the CMakeLists.txt is in
-+string(REPLACE " -Werror " " " PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS}")
-+set(PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS}" CACHE INTERNAL "PhysX CXX")
- SET(CMAKE_CXX_FLAGS ${PHYSX_CXX_FLAGS})
- 
- SET(CMAKE_CXX_FLAGS_DEBUG   ${PHYSX_CXX_FLAGS_DEBUG})
-diff --git a/physx/source/compiler/cmake/ios/CMakeLists.txt b/physx/source/compiler/cmake/ios/CMakeLists.txt
-index 5605e9a..b40500b 100644
---- a/physx/source/compiler/cmake/ios/CMakeLists.txt
-+++ b/physx/source/compiler/cmake/ios/CMakeLists.txt
-@@ -39,6 +39,8 @@ SET(PHYSX_CXX_FLAGS_PROFILE "-O3 -g" CACHE INTERNAL "PhysX Profile CXX Flags")
- SET(PHYSX_CXX_FLAGS_RELEASE "-O3 -g" CACHE INTERNAL "PhysX Release CXX Flags")
- 
- # These flags are local to the directory the CMakeLists.txt is in
-+string(REPLACE " -Werror " " " PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS}")
-+set(PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS}" CACHE INTERNAL "PhysX CXX")
- SET(CMAKE_CXX_FLAGS ${PHYSX_CXX_FLAGS})
- 
- SET(CMAKE_CXX_FLAGS_DEBUG   ${PHYSX_CXX_FLAGS_DEBUG})
-diff --git a/physx/source/compiler/cmake/linux/CMakeLists.txt b/physx/source/compiler/cmake/linux/CMakeLists.txt
-index aba5336..fd5f813 100644
---- a/physx/source/compiler/cmake/linux/CMakeLists.txt
-+++ b/physx/source/compiler/cmake/linux/CMakeLists.txt
-@@ -45,6 +45,8 @@ SET(PHYSX_CXX_FLAGS_PROFILE "-O3" CACHE INTERNAL "PhysX Profile CXX Flags")
- SET(PHYSX_CXX_FLAGS_RELEASE "-O3" CACHE INTERNAL "PhysX Release CXX Flags")
- 
- # These flags are local to the directory the CMakeLists.txt is in, so don't get carried over to OTHER CMakeLists.txt (thus the CACHE variables above)
-+string(REPLACE " -Werror " " " PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS}")
-+set(PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS}" CACHE INTERNAL "PhysX CXX")
- SET(CMAKE_CXX_FLAGS ${PHYSX_CXX_FLAGS})
- 
- SET(CMAKE_CXX_FLAGS_DEBUG   ${PHYSX_CXX_FLAGS_DEBUG})
-diff --git a/physx/source/compiler/cmake/mac/CMakeLists.txt b/physx/source/compiler/cmake/mac/CMakeLists.txt
-index bfd1357..cffb090 100644
---- a/physx/source/compiler/cmake/mac/CMakeLists.txt
-+++ b/physx/source/compiler/cmake/mac/CMakeLists.txt
-@@ -49,6 +49,8 @@ SET(PHYSX_CXX_FLAGS_PROFILE "-O3 -g" CACHE INTERNAL "PhysX Profile CXX Flags")
- SET(PHYSX_CXX_FLAGS_RELEASE "-O3 -g" CACHE INTERNAL "PhysX Release CXX Flags")
- 
- # These flags are local to the directory the CMakeLists.txt is in
-+string(REPLACE " -Werror " " " PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS}")
-+set(PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS}" CACHE INTERNAL "PhysX CXX")
- SET(CMAKE_CXX_FLAGS ${PHYSX_CXX_FLAGS})
- 
- SET(CMAKE_CXX_FLAGS_DEBUG   ${PHYSX_CXX_FLAGS_DEBUG})
diff --git a/external_imported/vcpkg/ports/physx/usage b/external_imported/vcpkg/ports/physx/usage
new file mode 100644
index 000000000..80051f955
--- /dev/null
+++ b/external_imported/vcpkg/ports/physx/usage
@@ -0,0 +1,30 @@
+[Sample port usage]
+physx provides CMake targets:
+
+    cmake_minimum_required(VERSION 3.15)
+
+    find_package(unofficial-omniverse-physx-sdk CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE unofficial::omniverse-physx-sdk::sdk)
+
+    # Optional: import the defined target to copy over the GPU acceleration libraries (3rd party provided by NVIDIA)
+    if(TARGET unofficial::omniverse-physx-sdk::gpu-library)
+        if(UNIX)
+            # Add rpath setting to find .so libraries on unix based systems
+            set_target_properties(main PROPERTIES
+                BUILD_WITH_INSTALL_RPATH TRUE
+                INSTALL_RPATH "$ORIGIN"
+            )
+        endif()
+        add_custom_command(TARGET main POST_BUILD
+                        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+                        $<TARGET_FILE:unofficial::omniverse-physx-sdk::gpu-library>
+                        $<TARGET_FILE_DIR:main>)
+        if(WIN32)
+            add_custom_command(TARGET main POST_BUILD
+                            COMMAND ${CMAKE_COMMAND} -E copy_if_different
+                            $<TARGET_FILE:unofficial::omniverse-physx-sdk::gpu-device-library>
+                            $<TARGET_FILE_DIR:main>)
+        endif()
+    else()
+        message(WARNING "GPU acceleration library target not defined - GPU acceleration will NOT be available!")
+    endif()
diff --git a/external_imported/vcpkg/ports/physx/vcpkg.json b/external_imported/vcpkg/ports/physx/vcpkg.json
index 1a6f52f45..5d098b177 100644
--- a/external_imported/vcpkg/ports/physx/vcpkg.json
+++ b/external_imported/vcpkg/ports/physx/vcpkg.json
@@ -1,15 +1,22 @@
 {
   "name": "physx",
-  "version": "4.1.2",
-  "port-version": 6,
-  "description": "The NVIDIA PhysX SDK is a scalable multi-platform physics solution supporting a wide range of devices, from smartphones to high-end multicore CPUs and GPUs",
-  "homepage": "https://github.com/NVIDIAGameWorks/PhysX",
-  "license": null,
-  "supports": "!mingw & !(windows & arm)",
+  "version": "5.3.0",
+  "description": "The NVIDIA PhysX SDK is a scalable multi-platform physics solution supporting a wide range of devices, from smartphones to high-end multicore CPUs and GPUs. This is the latest NVIDIA official version of the PhysX engine which also directly integrates into Omniverse. This port is NOT officially supported by NVIDIA.",
+  "homepage": "https://github.com/NVIDIA-Omniverse/PhysX",
+  "license": "BSD-3-Clause",
+  "supports": "(windows & x64 & !mingw & !uwp) | (linux & x64) | (linux & arm64)",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
       "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-get-vars",
+      "host": true
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/picojson/vcpkg.json b/external_imported/vcpkg/ports/picojson/vcpkg.json
index 540a2ad3d..4b4ac192c 100644
--- a/external_imported/vcpkg/ports/picojson/vcpkg.json
+++ b/external_imported/vcpkg/ports/picojson/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "picojson",
-  "version-string": "1.3.0",
-  "port-version": 2,
+  "version": "1.3.0",
+  "port-version": 3,
   "description": "A header-file-only, JSON parser serializer in C++.",
   "homepage": "https://github.com/kazuho/picojson"
 }
diff --git a/external_imported/vcpkg/ports/picosha2/vcpkg.json b/external_imported/vcpkg/ports/picosha2/vcpkg.json
index 45091e449..56ab0dcd0 100644
--- a/external_imported/vcpkg/ports/picosha2/vcpkg.json
+++ b/external_imported/vcpkg/ports/picosha2/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "picosha2",
-  "version-string": "2018-07-30",
-  "port-version": 1,
+  "version-date": "2018-07-30",
+  "port-version": 2,
   "description": "PicoSHA2 - a C++ SHA256 hash generator",
   "homepage": "https://github.com/okdshin/PicoSHA2"
 }
diff --git a/external_imported/vcpkg/ports/pipewire/portfile.cmake b/external_imported/vcpkg/ports/pipewire/portfile.cmake
index b11368ec8..e6bb7ec21 100644
--- a/external_imported/vcpkg/ports/pipewire/portfile.cmake
+++ b/external_imported/vcpkg/ports/pipewire/portfile.cmake
@@ -1,10 +1,9 @@
-vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
 vcpkg_from_gitlab(
     GITLAB_URL https://gitlab.freedesktop.org/
     OUT_SOURCE_PATH SOURCE_PATH
     REPO pipewire/pipewire
-    REF ${VERSION}
-    SHA512 94d23a3660f76624abc18a1716519b4d18258a0a4c3047438df231f813df760f21f65b80c174f34b4de111da28b49ae3a46de961637e89828d67ecf614b17ba2
+    REF "${VERSION}"
+    SHA512 97bac72c3d0e4ff8b5a68ef1c41f5ea530eaa8ff411adc3f3a5837374f62b8b04316eaf5a7815264935655c6fd0b13b09d3e15c4a9a85e2cac8754dc26d34580
     HEAD_REF master # branch name
 )
 
@@ -12,7 +11,7 @@ vcpkg_configure_meson(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -Dalsa=disabled
-        -Daudioconvert=disabled
+        -Daudioconvert=enabled
         -Daudiomixer=disabled
         -Daudiotestsrc=disabled
         -Davahi=disabled
@@ -76,7 +75,7 @@ vcpkg_install_meson()
 vcpkg_copy_pdbs()
 vcpkg_fixup_pkgconfig()
 
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
diff --git a/external_imported/vcpkg/ports/pipewire/vcpkg.json b/external_imported/vcpkg/ports/pipewire/vcpkg.json
index 4bacb36e3..c23a3f9f8 100644
--- a/external_imported/vcpkg/ports/pipewire/vcpkg.json
+++ b/external_imported/vcpkg/ports/pipewire/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "pipewire",
-  "version": "0.3.62",
+  "version": "1.0.2",
   "description": "Low-latency audio/video router and processor. This port only builds the client library, not the server.",
   "homepage": "https://pipewire.org",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/pkgconf/portfile.cmake b/external_imported/vcpkg/ports/pkgconf/portfile.cmake
index 0f269dc13..2922316e8 100644
--- a/external_imported/vcpkg/ports/pkgconf/portfile.cmake
+++ b/external_imported/vcpkg/ports/pkgconf/portfile.cmake
@@ -1,15 +1,15 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO pkgconf/pkgconf
-    REF cef30268e1a3f79efd607c26abcf556aa314c9c4 
-    SHA512 ea03b81d01521201bdc471a39cdc8b13f9452f7cc78706d5c57056595f3e4e8a3562c022ebb72ce6444f2c7a8dfc778114814ef5064eaef770a70cc294c7f7ee
+    REF "pkgconf-${VERSION}"
+    SHA512 40abbfdbd64ac95d0e9578acc5f1cb2b692d4c1bfa9f07c4eb1042380bcebff5c063434da2f64bc986c8a7163cde4f7051ba61400461b103616253ab739d4e43
     HEAD_REF master
 )
 
 vcpkg_configure_meson(
     SOURCE_PATH "${SOURCE_PATH}"
     NO_PKG_CONFIG
-    OPTIONS -Dtests=false
+    OPTIONS -Dtests=disabled
 )
 
 set(systemsuffix "")
diff --git a/external_imported/vcpkg/ports/pkgconf/vcpkg.json b/external_imported/vcpkg/ports/pkgconf/vcpkg.json
index 606759d9e..d88dce939 100644
--- a/external_imported/vcpkg/ports/pkgconf/vcpkg.json
+++ b/external_imported/vcpkg/ports/pkgconf/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "pkgconf",
-  "version": "1.8.0",
-  "port-version": 5,
+  "version": "2.1.0",
   "description": "pkgconf is a program which helps to configure compiler and linker flags for development libraries. It is similar to pkg-config from freedesktop.org.",
   "homepage": "https://github.com/pkgconf/pkgconf",
   "license": null,
diff --git a/external_imported/vcpkg/ports/platform-folders/portfile.cmake b/external_imported/vcpkg/ports/platform-folders/portfile.cmake
index 9cb354f57..df06adb9e 100644
--- a/external_imported/vcpkg/ports/platform-folders/portfile.cmake
+++ b/external_imported/vcpkg/ports/platform-folders/portfile.cmake
@@ -26,7 +26,7 @@ endif()
 if (VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_MinGW)
     vcpkg_cmake_config_fixup(PACKAGE_NAME platform_folders CONFIG_PATH cmake)
 else()
-    vcpkg_cmake_config_fixup(PACKAGE_NAME platform_folders CONFIG_PATH lib/cmake)
+    vcpkg_cmake_config_fixup(PACKAGE_NAME platform_folders CONFIG_PATH lib/cmake/platform_folders)
 endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/external_imported/vcpkg/ports/platform-folders/vcpkg.json b/external_imported/vcpkg/ports/platform-folders/vcpkg.json
index ac2e0c27e..2c6ae3d62 100644
--- a/external_imported/vcpkg/ports/platform-folders/vcpkg.json
+++ b/external_imported/vcpkg/ports/platform-folders/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "platform-folders",
   "version": "4.2.0",
+  "port-version": 1,
   "description": "A C++ library to look for special directories like \"My Documents\" and \"%APPDATA%\"",
   "homepage": "https://github.com/sago007/PlatformFolders",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/plf-colony/portfile.cmake b/external_imported/vcpkg/ports/plf-colony/portfile.cmake
index e4ec7bd47..c33598f94 100644
--- a/external_imported/vcpkg/ports/plf-colony/portfile.cmake
+++ b/external_imported/vcpkg/ports/plf-colony/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mattreecebentley/plf_colony
-    REF 7243b4601b5d7e989550c158a9918ea5a05feaf4
-    SHA512 aaf898ac5a37720545a7b7226c8bd09be80dcdd03d9c77a2c64cfe0aedbb59ede4042001c616c4b5d29f13717ae5b637c0608d83819c2bceae5606c8555a64da
+    REF abb0aa6525a3dae56aacf50899517f47e7036016
+    SHA512 6a854827b29f4c7fd6d7bae2b62d0b86064cb56ca5484fb262dfe7402a0da3a29834ebc075693bc5d3f9d348ee5b7dc5ae974b7b477bd3409c0927ce15961bd9
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/plf-colony/vcpkg.json b/external_imported/vcpkg/ports/plf-colony/vcpkg.json
index 01101a6a1..434a723db 100644
--- a/external_imported/vcpkg/ports/plf-colony/vcpkg.json
+++ b/external_imported/vcpkg/ports/plf-colony/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "plf-colony",
-  "version": "6.33",
+  "version": "7.41",
   "description": "An unordered C++ data container providing fast iteration/insertion/erasure while maintaining pointer/iterator validity to non-erased elements regardless of insertions/erasures.",
   "homepage": "https://plflib.org/colony.htm"
 }
diff --git a/external_imported/vcpkg/ports/plf-list/vcpkg.json b/external_imported/vcpkg/ports/plf-list/vcpkg.json
index e86191647..c1f91d67b 100644
--- a/external_imported/vcpkg/ports/plf-list/vcpkg.json
+++ b/external_imported/vcpkg/ports/plf-list/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "plf-list",
-  "version-string": "2019-08-10",
-  "port-version": 1,
+  "version-date": "2019-08-10",
+  "port-version": 2,
   "description": "A drop-in replacement for std::list with 293% faster insertion, 57% faster erasure, 17% faster iteration and 77% faster sorting on average",
   "homepage": "https://www.plflib.org/"
 }
diff --git a/external_imported/vcpkg/ports/plf-nanotimer/vcpkg.json b/external_imported/vcpkg/ports/plf-nanotimer/vcpkg.json
index 26e8a22e4..8d4b15c71 100644
--- a/external_imported/vcpkg/ports/plf-nanotimer/vcpkg.json
+++ b/external_imported/vcpkg/ports/plf-nanotimer/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "plf-nanotimer",
-  "version-string": "2019-08-10",
-  "port-version": 1,
+  "version-date": "2019-08-10",
+  "port-version": 2,
   "description": "A simple C++ 03/11/etc timer class for ~microsecond-precision cross-platform benchmarking",
   "homepage": "https://www.plflib.org/"
 }
diff --git a/external_imported/vcpkg/ports/plf-stack/vcpkg.json b/external_imported/vcpkg/ports/plf-stack/vcpkg.json
index 6c0a75f68..096fc1b81 100644
--- a/external_imported/vcpkg/ports/plf-stack/vcpkg.json
+++ b/external_imported/vcpkg/ports/plf-stack/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "plf-stack",
-  "version-string": "2019-08-10",
-  "port-version": 1,
+  "version-date": "2019-08-10",
+  "port-version": 2,
   "description": "A C++ data container replicating std::stack functionality but with better performance",
   "homepage": "https://www.plflib.org/"
 }
diff --git a/external_imported/vcpkg/ports/plib/portfile.cmake b/external_imported/vcpkg/ports/plib/portfile.cmake
index 603aeb3ff..514b58743 100644
--- a/external_imported/vcpkg/ports/plib/portfile.cmake
+++ b/external_imported/vcpkg/ports/plib/portfile.cmake
@@ -6,8 +6,8 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 17154cc77243fe576c2bcbcb0285b98aef1a0634658f5473e95fe0ac8fa3ed477dbe5620e44ccf0b7cc616f812af0cd44d6fcbba0c563180d3b61c9d6f158e1d
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
 )
 
diff --git a/external_imported/vcpkg/ports/plib/vcpkg.json b/external_imported/vcpkg/ports/plib/vcpkg.json
index 4579c4a46..ab7919c05 100644
--- a/external_imported/vcpkg/ports/plib/vcpkg.json
+++ b/external_imported/vcpkg/ports/plib/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "plib",
   "version": "1.8.5",
-  "port-version": 6,
+  "port-version": 8,
   "description": "A suite of portable game libraries",
   "license": "LGPL-2.0-only",
-  "supports": "!osx & !uwp",
+  "supports": "!(osx | uwp | xbox)",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/plog/portfile.cmake b/external_imported/vcpkg/ports/plog/portfile.cmake
index 705467fc5..a250a8f4c 100644
--- a/external_imported/vcpkg/ports/plog/portfile.cmake
+++ b/external_imported/vcpkg/ports/plog/portfile.cmake
@@ -2,8 +2,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO SergiusTheBest/plog
-    REF 1.1.9
-    SHA512 d979fdf0011ef9bb94a2271da5d17058dbab5bc47438a13769d084fdebe5e169e7c05a043d69acceb752896df7cdae4433f32bfbcc81e055dffd9c701be88003
+    REF ${VERSION}
+    SHA512 b1d55baadbd16bafa5165b05352f367455b51f2eec2102f1ebad2e6a049954d1b87ffdd96811b0acea2313877db1db837f780971fd027d0db683fe42aeb29573
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/plog/vcpkg.json b/external_imported/vcpkg/ports/plog/vcpkg.json
index 5a46c22aa..3cb32d0b8 100644
--- a/external_imported/vcpkg/ports/plog/vcpkg.json
+++ b/external_imported/vcpkg/ports/plog/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "plog",
-  "version": "1.1.9",
+  "version": "1.1.10",
   "description": "Portable, simple and extensible C++ logging library.",
   "homepage": "https://github.com/SergiusTheBest/plog",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/plplot/portfile.cmake b/external_imported/vcpkg/ports/plplot/portfile.cmake
index e38c3c937..e8836319c 100644
--- a/external_imported/vcpkg/ports/plplot/portfile.cmake
+++ b/external_imported/vcpkg/ports/plplot/portfile.cmake
@@ -3,7 +3,7 @@ vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
 vcpkg_from_sourceforge(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO plplot/plplot
-    REF "${VERSION} Source"
+    REF "${VERSION}%20Source"
     FILENAME "plplot-${VERSION}.tar.gz"
     SHA512 54533245569b724a7ef90392cc6e9ae65873e6cbab923df0f841c8b43def5e4307690894c7681802209bd3c8df97f54285310a706428f79b3340cce3207087c8
     PATCHES
diff --git a/external_imported/vcpkg/ports/plplot/vcpkg.json b/external_imported/vcpkg/ports/plplot/vcpkg.json
index 490c0ba7a..054a7d80c 100644
--- a/external_imported/vcpkg/ports/plplot/vcpkg.json
+++ b/external_imported/vcpkg/ports/plplot/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "plplot",
   "version-semver": "5.15.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "PLplot is a cross-platform software package for creating scientific plots whose (UTF-8) plot symbols and text are limited in practice only by what Unicode-aware system fonts are installed on a user's computer.",
   "homepage": "http://plplot.org/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/plustache/vcpkg.json b/external_imported/vcpkg/ports/plustache/vcpkg.json
index a0e805468..857f6e11b 100644
--- a/external_imported/vcpkg/ports/plustache/vcpkg.json
+++ b/external_imported/vcpkg/ports/plustache/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "plustache",
-  "version-string": "0.4.0",
-  "port-version": 3,
+  "version": "0.4.0",
+  "port-version": 4,
   "description": "{{mustaches}} for C++",
   "dependencies": [
     "boost-algorithm",
diff --git a/external_imported/vcpkg/ports/pmdk/portfile.cmake b/external_imported/vcpkg/ports/pmdk/portfile.cmake
index 6d60acbf9..9701c4cb7 100644
--- a/external_imported/vcpkg/ports/pmdk/portfile.cmake
+++ b/external_imported/vcpkg/ports/pmdk/portfile.cmake
@@ -1,54 +1,41 @@
 vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
 
-set(PMDK_VERSION "1.12.0")
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO pmem/pmdk
     REF 73d8f958e855904dc0776a7d77d0f0d3698a65b1 #v1.12.0
     SHA512 ffe77796c9028478985ca98e4162a671e3e7f580faa46b31d0dcf8c5e97aa6478044efdf7ad238285044f18f754a20a4e2a1b5992c7b9cffa709884eb62007ab
     HEAD_REF master
+    PATCHES "remove_getopt.patch"
 )
 
+file(REMOVE  "${SOURCE_PATH}/src/windows/getopt" "${SOURCE_PATH}/src/test/getopt")
+
 # Build only the selected projects
-vcpkg_build_msbuild(
-    PROJECT_PATH ${SOURCE_PATH}/src/PMDK.sln
+vcpkg_msbuild_install(
+    SOURCE_PATH "${SOURCE_PATH}"
+    PROJECT_SUBPATH src/PMDK.sln
     TARGET "Solution Items\\libpmem,Solution Items\\libpmemlog,Solution Items\\libpmemblk,Solution Items\\libpmemobj,Solution Items\\libpmempool,Solution Items\\Tools\\pmempool"
-    OPTIONS /p:SRCVERSION=${PMDK_VERSION}
+    OPTIONS /p:SRCVERSION=${VERSION}
+    ADDITIONAL_LIBS getopt.lib
 )
 
-set(DEBUG_ARTIFACTS_PATH ${SOURCE_PATH}/src/x64/Debug)
-set(RELEASE_ARTIFACTS_PATH ${SOURCE_PATH}/src/x64/Release)
+set(DEBUG_ARTIFACTS_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/x64/Debug")
+set(RELEASE_ARTIFACTS_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/x64/Release")
 
 # Install header files
-file(GLOB HEADER_FILES ${SOURCE_PATH}/src/include/*.h)
-file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-file(GLOB HEADER_FILES ${SOURCE_PATH}/src/include/libpmemobj/*.h)
-file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/libpmemobj)
+file(GLOB HEADER_FILES "${SOURCE_PATH}/src/include/*.h")
+file(INSTALL ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+file(GLOB HEADER_FILES "${SOURCE_PATH}/src/include/libpmemobj/*.h")
+file(INSTALL ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/libpmemobj")
 
 # Remove unneeded header files
-file(REMOVE ${CURRENT_PACKAGES_DIR}/include/libvmmalloc.h)
-file(REMOVE ${CURRENT_PACKAGES_DIR}/include/librpmem.h)
-
-# Install libraries (debug)
-file(GLOB LIB_DEBUG_FILES ${DEBUG_ARTIFACTS_PATH}/libs/libpmem*.lib)
-file(INSTALL ${LIB_DEBUG_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/libpmemcommon.lib)
-file(GLOB LIB_DEBUG_FILES ${DEBUG_ARTIFACTS_PATH}/libs/libpmem*.dll)
-file(INSTALL ${LIB_DEBUG_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
-
-# Install libraries (release)
-file(GLOB LIB_RELEASE_FILES ${RELEASE_ARTIFACTS_PATH}/libs/libpmem*.lib)
-file(INSTALL ${LIB_RELEASE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libpmemcommon.lib)
-file(GLOB LIB_RELEASE_FILES ${RELEASE_ARTIFACTS_PATH}/libs/libpmem*.dll)
-file(INSTALL ${LIB_RELEASE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
+file(REMOVE "${CURRENT_PACKAGES_DIR}/include/libvmmalloc.h")
+file(REMOVE "${CURRENT_PACKAGES_DIR}/include/librpmem.h")
 
 # Install tools (release only)
-file(INSTALL ${RELEASE_ARTIFACTS_PATH}/libs/pmempool.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT})
+file(INSTALL "${RELEASE_ARTIFACTS_PATH}/libs/pmempool.exe" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
 
 vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/pmdk)
 
-vcpkg_copy_pdbs()
-
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/pmdk/remove_getopt.patch b/external_imported/vcpkg/ports/pmdk/remove_getopt.patch
new file mode 100644
index 000000000..45912a874
--- /dev/null
+++ b/external_imported/vcpkg/ports/pmdk/remove_getopt.patch
@@ -0,0 +1,233 @@
+diff --git a/src/PMDK.sln b/src/PMDK.sln
+index d8220c159..1959a7a59 100644
+--- a/src/PMDK.sln
++++ b/src/PMDK.sln
+@@ -239,8 +239,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "obj_alloc", "test\obj_alloc
+ EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pmempool_info", "test\pmempool_info\pmempool_info.vcxproj", "{42CCEF95-5ADD-460C-967E-DD5B2C744943}"
+ EndProject
+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "getopt", "test\getopt\getopt.vcxproj", "{433F7840-C597-4950-84C9-E4FF7DF6A298}"
+-EndProject
+ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sys", "sys", "{45027FC5-4A32-47BD-AC5B-66CC7616B1D2}"
+ 	ProjectSection(SolutionItems) = preProject
+ 		windows\include\sys\file.h = windows\include\sys\file.h
+@@ -538,8 +538,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "obj_tx_flow", "test\obj_tx_
+ EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "srcversion", "windows\srcversion\srcversion.vcxproj", "{901F04DB-E1A5-4A41-8B81-9D31C19ACD59}"
+ EndProject
+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "getopt", "windows\getopt\getopt.vcxproj", "{9186EAC4-2F34-4F17-B940-6585D7869BCD}"
+-EndProject
+ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libpmemlog", "libpmemlog", "{91C30620-70CA-46C7-AC71-71F3C602690E}"
+ EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "obj_realloc", "test\obj_realloc\obj_realloc.vcxproj", "{91E19AEB-7B75-43E0-B8B4-D2BB60D839EA}"
+@@ -2183,7 +2181,6 @@ Global
+ 		{3ED56E55-84A6-422C-A8D4-A8439FB8F245} = {BD6CC700-B36B-435B-BAF9-FC5AFCD766C9}
+ 		{42B97D47-F800-4100-BFA2-B3AC357E8B6B} = {63C9B3F8-437D-4AD9-B32D-D04AE38C35B6}
+ 		{42CCEF95-5ADD-460C-967E-DD5B2C744943} = {59AB6976-D16B-48D0-8D16-94360D3FE51D}
+-		{433F7840-C597-4950-84C9-E4FF7DF6A298} = {B870D8A6-12CD-4DD0-B843-833695C2310A}
+ 		{45027FC5-4A32-47BD-AC5B-66CC7616B1D2} = {9A8482A7-BF0C-423D-8266-189456ED41F6}
+ 		{46629F21-089C-4205-B2F8-E01748ECE517} = {A14A4556-9092-430D-B9CA-B2B1223D56CB}
+ 		{46B82069-10BE-432A-8D93-F4D995148555} = {4C291EEB-3874-4724-9CC2-1335D13FF0EE}
+@@ -2284,7 +2281,6 @@ Global
+ 		{8D75FA1A-EC74-4F88-8AC1-CE3F98E4D828} = {63C9B3F8-437D-4AD9-B32D-D04AE38C35B6}
+ 		{8E374371-30E1-4623-8755-2A2F3742170B} = {63C9B3F8-437D-4AD9-B32D-D04AE38C35B6}
+ 		{901F04DB-E1A5-4A41-8B81-9D31C19ACD59} = {95FAF291-03D1-42FC-9C10-424D551D475D}
+-		{9186EAC4-2F34-4F17-B940-6585D7869BCD} = {95FAF291-03D1-42FC-9C10-424D551D475D}
+ 		{91C30620-70CA-46C7-AC71-71F3C602690E} = {0CC6D525-806E-433F-AB4A-6CFD546418B1}
+ 		{91E19AEB-7B75-43E0-B8B4-D2BB60D839EA} = {63C9B3F8-437D-4AD9-B32D-D04AE38C35B6}
+ 		{9233FC80-B51C-4A89-AF58-5AE86C068F6A} = {A14A4556-9092-430D-B9CA-B2B1223D56CB}
+diff --git a/src/benchmarks/pmembench.vcxproj b/src/benchmarks/pmembench.vcxproj
+index ac9b3569e..906a50269 100644
+--- a/src/benchmarks/pmembench.vcxproj
++++ b/src/benchmarks/pmembench.vcxproj
+@@ -29,9 +29,6 @@
+     <ProjectReference Include="..\libpmempool\libpmempool.vcxproj">
+       <Project>{cf9a0883-6334-44c7-ac29-349468c78e27}</Project>
+     </ProjectReference>
+-    <ProjectReference Include="..\windows\getopt\getopt.vcxproj">
+-      <Project>{9186eac4-2f34-4f17-b940-6585d7869bcd}</Project>
+-    </ProjectReference>
+   </ItemGroup>
+   <ItemGroup>
+     <ClCompile Include="..\common\ctl.c">
+@@ -205,10 +202,10 @@
+   </ImportGroup>
+   <PropertyGroup Label="UserMacros" />
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+-    <IncludePath>$(SolutionDir)\core;$(SolutionDir)\examples\libpmemobj\hashmap;$(SolutionDir)\examples\libpmemobj\map;$(SolutionDir)\examples\libpmemobj\tree_map;$(SolutionDir)\common;$(SolutionDir)\test\unittest;$(SolutionDir)\windows\include;$(SolutionDir)\libpmemobj\;$(SolutionDir)\include;$(SolutionDir)\libpmemblk;$(SolutionDir)\windows\getopt;$(IncludePath)</IncludePath>
++    <IncludePath>$(SolutionDir)\core;$(SolutionDir)\examples\libpmemobj\hashmap;$(SolutionDir)\examples\libpmemobj\map;$(SolutionDir)\examples\libpmemobj\tree_map;$(SolutionDir)\common;$(SolutionDir)\test\unittest;$(SolutionDir)\windows\include;$(SolutionDir)\libpmemobj\;$(SolutionDir)\include;$(SolutionDir)\libpmemblk;$(IncludePath)</IncludePath>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+-    <IncludePath>$(SolutionDir)\core;$(SolutionDir)\examples\libpmemobj\hashmap;$(SolutionDir)\examples\libpmemobj\map;$(SolutionDir)\examples\libpmemobj\tree_map;$(SolutionDir)\common;$(SolutionDir)\test\unittest;$(SolutionDir)\windows\include;$(SolutionDir)\libpmemobj\;$(SolutionDir)\include;$(SolutionDir)\libpmemblk;$(SolutionDir)\windows\getopt;$(IncludePath)</IncludePath>
++    <IncludePath>$(SolutionDir)\core;$(SolutionDir)\examples\libpmemobj\hashmap;$(SolutionDir)\examples\libpmemobj\map;$(SolutionDir)\examples\libpmemobj\tree_map;$(SolutionDir)\common;$(SolutionDir)\test\unittest;$(SolutionDir)\windows\include;$(SolutionDir)\libpmemobj\;$(SolutionDir)\include;$(SolutionDir)\libpmemblk;$(IncludePath)</IncludePath>
+   </PropertyGroup>
+   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+     <ClCompile>
+diff --git a/src/test/bttdevice/bttdevice.vcxproj b/src/test/bttdevice/bttdevice.vcxproj
+index bfcc74064..05cd8c15d 100644
+--- a/src/test/bttdevice/bttdevice.vcxproj
++++ b/src/test/bttdevice/bttdevice.vcxproj
+@@ -72,9 +72,6 @@
+     <ProjectReference Include="..\..\libpmem\libpmem.vcxproj">
+       <Project>{9e9e3d25-2139-4a5d-9200-18148ddead45}</Project>
+     </ProjectReference>
+-    <ProjectReference Include="..\..\windows\getopt\getopt.vcxproj">
+-      <Project>{9186eac4-2f34-4f17-b940-6585d7869bcd}</Project>
+-    </ProjectReference>
+     <ProjectReference Include="..\unittest\libut.vcxproj">
+       <Project>{ce3f2dfb-8470-4802-ad37-21caf6cb2681}</Project>
+     </ProjectReference>
+diff --git a/src/test/libpmempool_api_win/libpmempool_test_win.vcxproj b/src/test/libpmempool_api_win/libpmempool_test_win.vcxproj
+index 73cb7c0b2..ba87422ea 100644
+--- a/src/test/libpmempool_api_win/libpmempool_test_win.vcxproj
++++ b/src/test/libpmempool_api_win/libpmempool_test_win.vcxproj
+@@ -64,9 +64,6 @@
+     <ProjectReference Include="..\..\libpmem\libpmem.vcxproj">
+       <Project>{9e9e3d25-2139-4a5d-9200-18148ddead45}</Project>
+     </ProjectReference>
+-    <ProjectReference Include="..\..\windows\getopt\getopt.vcxproj">
+-      <Project>{9186eac4-2f34-4f17-b940-6585d7869bcd}</Project>
+-    </ProjectReference>
+     <ProjectReference Include="..\unittest\libut.vcxproj">
+       <Project>{ce3f2dfb-8470-4802-ad37-21caf6cb2681}</Project>
+     </ProjectReference>
+diff --git a/src/test/tools/cmpmap/cmpmap.vcxproj b/src/test/tools/cmpmap/cmpmap.vcxproj
+index 5a502106c..fc0b07bb0 100644
+--- a/src/test/tools/cmpmap/cmpmap.vcxproj
++++ b/src/test/tools/cmpmap/cmpmap.vcxproj
+@@ -17,9 +17,6 @@
+     <ProjectReference Include="..\..\..\libpmem\libpmem.vcxproj">
+       <Project>{9e9e3d25-2139-4a5d-9200-18148ddead45}</Project>
+     </ProjectReference>
+-    <ProjectReference Include="..\..\..\windows\getopt\getopt.vcxproj">
+-      <Project>{9186eac4-2f34-4f17-b940-6585d7869bcd}</Project>
+-    </ProjectReference>
+   </ItemGroup>
+   <ItemGroup>
+     <ClCompile Include="..\..\..\common\file.c" />
+diff --git a/src/test/tools/ddmap/ddmap.vcxproj b/src/test/tools/ddmap/ddmap.vcxproj
+index 0824e2bb2..d80e82da3 100644
+--- a/src/test/tools/ddmap/ddmap.vcxproj
++++ b/src/test/tools/ddmap/ddmap.vcxproj
+@@ -17,9 +17,6 @@
+     <ProjectReference Include="..\..\..\libpmem\libpmem.vcxproj">
+       <Project>{9e9e3d25-2139-4a5d-9200-18148ddead45}</Project>
+     </ProjectReference>
+-    <ProjectReference Include="..\..\..\windows\getopt\getopt.vcxproj">
+-      <Project>{9186eac4-2f34-4f17-b940-6585d7869bcd}</Project>
+-    </ProjectReference>
+   </ItemGroup>
+   <ItemGroup>
+     <ClCompile Include="..\..\..\libpmemblk\btt.c" />
+diff --git a/src/test/tools/gran_detecto/gran_detecto.vcxproj b/src/test/tools/gran_detecto/gran_detecto.vcxproj
+index abbe5bfb9..316a39c20 100644
+--- a/src/test/tools/gran_detecto/gran_detecto.vcxproj
++++ b/src/test/tools/gran_detecto/gran_detecto.vcxproj
+@@ -90,9 +90,6 @@
+     <ProjectReference Include="..\..\..\libpmem2\libpmem2.vcxproj">
+       <Project>{f596c36c-5c96-4f08-b420-8908af500954}</Project>
+     </ProjectReference>
+-    <ProjectReference Include="..\..\..\windows\getopt\getopt.vcxproj">
+-      <Project>{9186eac4-2f34-4f17-b940-6585d7869bcd}</Project>
+-    </ProjectReference>
+   </ItemGroup>
+   <ItemGroup>
+     <None Include="README" />
+diff --git a/src/test/tools/pmemalloc/pmemalloc.vcxproj b/src/test/tools/pmemalloc/pmemalloc.vcxproj
+index d84b87416..c1f910710 100644
+--- a/src/test/tools/pmemalloc/pmemalloc.vcxproj
++++ b/src/test/tools/pmemalloc/pmemalloc.vcxproj
+@@ -26,9 +26,6 @@
+     <ProjectReference Include="..\..\..\libpmem\libpmem.vcxproj">
+       <Project>{9e9e3d25-2139-4a5d-9200-18148ddead45}</Project>
+     </ProjectReference>
+-    <ProjectReference Include="..\..\..\windows\getopt\getopt.vcxproj">
+-      <Project>{9186eac4-2f34-4f17-b940-6585d7869bcd}</Project>
+-    </ProjectReference>
+   </ItemGroup>
+   <ItemGroup>
+     <ClCompile Include="pmemalloc.c" />
+diff --git a/src/test/tools/pmemdetect/pmemdetect.vcxproj b/src/test/tools/pmemdetect/pmemdetect.vcxproj
+index 1c4cfd70c..10f472eb4 100644
+--- a/src/test/tools/pmemdetect/pmemdetect.vcxproj
++++ b/src/test/tools/pmemdetect/pmemdetect.vcxproj
+@@ -93,9 +93,6 @@
+     <ProjectReference Include="..\..\..\libpmem\libpmem.vcxproj">
+       <Project>{9e9e3d25-2139-4a5d-9200-18148ddead45}</Project>
+     </ProjectReference>
+-    <ProjectReference Include="..\..\..\windows\getopt\getopt.vcxproj">
+-      <Project>{9186eac4-2f34-4f17-b940-6585d7869bcd}</Project>
+-    </ProjectReference>
+     <ProjectReference Include="..\..\unittest\libut.vcxproj">
+       <Project>{ce3f2dfb-8470-4802-ad37-21caf6cb2681}</Project>
+     </ProjectReference>
+diff --git a/src/test/tools/pmemobjcli/pmemobjcli.vcxproj b/src/test/tools/pmemobjcli/pmemobjcli.vcxproj
+index 092ad91f7..0c13bb915 100644
+--- a/src/test/tools/pmemobjcli/pmemobjcli.vcxproj
++++ b/src/test/tools/pmemobjcli/pmemobjcli.vcxproj
+@@ -20,9 +20,6 @@
+     <ProjectReference Include="..\..\..\libpmem\libpmem.vcxproj">
+       <Project>{9e9e3d25-2139-4a5d-9200-18148ddead45}</Project>
+     </ProjectReference>
+-    <ProjectReference Include="..\..\..\windows\getopt\getopt.vcxproj">
+-      <Project>{9186eac4-2f34-4f17-b940-6585d7869bcd}</Project>
+-    </ProjectReference>
+   </ItemGroup>
+   <ItemGroup>
+     <ClCompile Include="pmemobjcli.c" />
+diff --git a/src/test/tools/pmemspoil/pmemspoil.vcxproj b/src/test/tools/pmemspoil/pmemspoil.vcxproj
+index 0d7718e01..5eba7d1f7 100644
+--- a/src/test/tools/pmemspoil/pmemspoil.vcxproj
++++ b/src/test/tools/pmemspoil/pmemspoil.vcxproj
+@@ -32,9 +32,6 @@
+     <ProjectReference Include="..\..\..\libpmem\libpmem.vcxproj">
+       <Project>{9e9e3d25-2139-4a5d-9200-18148ddead45}</Project>
+     </ProjectReference>
+-    <ProjectReference Include="..\..\..\windows\getopt\getopt.vcxproj">
+-      <Project>{9186eac4-2f34-4f17-b940-6585d7869bcd}</Project>
+-    </ProjectReference>
+   </ItemGroup>
+   <ItemGroup>
+     <ClInclude Include="..\..\..\tools\pmempool\common.h" />
+diff --git a/src/test/tools/pmemwrite/pmemwrite.vcxproj b/src/test/tools/pmemwrite/pmemwrite.vcxproj
+index f4e4a229f..efc80865f 100644
+--- a/src/test/tools/pmemwrite/pmemwrite.vcxproj
++++ b/src/test/tools/pmemwrite/pmemwrite.vcxproj
+@@ -26,9 +26,6 @@
+     <ProjectReference Include="..\..\..\libpmem\libpmem.vcxproj">
+       <Project>{9e9e3d25-2139-4a5d-9200-18148ddead45}</Project>
+     </ProjectReference>
+-    <ProjectReference Include="..\..\..\windows\getopt\getopt.vcxproj">
+-      <Project>{9186eac4-2f34-4f17-b940-6585d7869bcd}</Project>
+-    </ProjectReference>
+   </ItemGroup>
+   <ItemGroup>
+     <ClCompile Include="..\..\..\libpmemblk\btt.c" />
+diff --git a/src/test/tools/sparsefile/sparsefile.vcxproj b/src/test/tools/sparsefile/sparsefile.vcxproj
+index 76710038b..481bb9332 100644
+--- a/src/test/tools/sparsefile/sparsefile.vcxproj
++++ b/src/test/tools/sparsefile/sparsefile.vcxproj
+@@ -21,9 +21,6 @@
+     <ProjectReference Include="..\..\..\common\libpmemcommon.vcxproj">
+       <Project>{492baa3d-0d5d-478e-9765-500463ae69aa}</Project>
+     </ProjectReference>
+-    <ProjectReference Include="..\..\..\windows\getopt\getopt.vcxproj">
+-      <Project>{9186eac4-2f34-4f17-b940-6585d7869bcd}</Project>
+-    </ProjectReference>
+   </ItemGroup>
+   <PropertyGroup Label="Globals">
+     <ProjectGuid>{3EC30D6A-BDA4-4971-879A-8814204EAE31}</ProjectGuid>
+diff --git a/src/tools/pmempool/pmempool.vcxproj b/src/tools/pmempool/pmempool.vcxproj
+index 120fe35b6..65709ed92 100644
+--- a/src/tools/pmempool/pmempool.vcxproj
++++ b/src/tools/pmempool/pmempool.vcxproj
+@@ -77,9 +77,6 @@
+     <ProjectReference Include="..\..\libpmem\libpmem.vcxproj">
+       <Project>{9e9e3d25-2139-4a5d-9200-18148ddead45}</Project>
+     </ProjectReference>
+-    <ProjectReference Include="..\..\windows\getopt\getopt.vcxproj">
+-      <Project>{9186eac4-2f34-4f17-b940-6585d7869bcd}</Project>
+-    </ProjectReference>
+   </ItemGroup>
+   <ItemGroup>
+     <ResourceCompile Include="pmempool.rc" />
diff --git a/external_imported/vcpkg/ports/pmdk/vcpkg.json b/external_imported/vcpkg/ports/pmdk/vcpkg.json
index ae45ff2d1..38e47d48d 100644
--- a/external_imported/vcpkg/ports/pmdk/vcpkg.json
+++ b/external_imported/vcpkg/ports/pmdk/vcpkg.json
@@ -1,8 +1,17 @@
 {
   "name": "pmdk",
   "version": "1.12.0",
+  "port-version": 2,
   "description": "Persistent Memory Development Kit",
   "homepage": "https://github.com/pmem/pmdk",
   "license": "BSD-3-Clause",
-  "supports": "!(arm | x86)"
+  "supports": "!(linux | arm | x86)",
+  "dependencies": [
+    "getopt",
+    {
+      "name": "vcpkg-msbuild",
+      "host": true,
+      "platform": "windows"
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/pmp-library/portfile.cmake b/external_imported/vcpkg/ports/pmp-library/portfile.cmake
new file mode 100644
index 000000000..f6526e1f5
--- /dev/null
+++ b/external_imported/vcpkg/ports/pmp-library/portfile.cmake
@@ -0,0 +1,25 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO pmp-library/pmp-library
+    REF "${VERSION}"
+    SHA512 8ee6f731619b92ad3d555b96c9e486446a4b9b3871992b389f9a55a0d07ca9f69cb4e03c1dc1c986357fc5a06ad60b2657ee0d58a78cb5da3c8f5692fb4c8b0f
+    HEAD_REF main
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DPMP_BUILD_EXAMPLES=OFF
+        -DPMP_BUILD_TESTS=OFF
+        -DPMP_BUILD_DOCS=OFF
+        -DPMP_BUILD_VIS=OFF
+        -DPMP_STRICT_COMPILATION=OFF
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/pmp" PACKAGE_NAME pmp)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/external_imported/vcpkg/ports/pmp-library/vcpkg.json b/external_imported/vcpkg/ports/pmp-library/vcpkg.json
new file mode 100644
index 000000000..0ef7c63a3
--- /dev/null
+++ b/external_imported/vcpkg/ports/pmp-library/vcpkg.json
@@ -0,0 +1,19 @@
+{
+  "name": "pmp-library",
+  "version": "3.0.0",
+  "description": "The Polygon Mesh Processing Library",
+  "homepage": "https://github.com/pmp-library/pmp-library",
+  "license": "MIT",
+  "supports": "!xbox",
+  "dependencies": [
+    "eigen3",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/pngpp/portfile.cmake b/external_imported/vcpkg/ports/pngpp/portfile.cmake
index f83974307..a01bd1975 100644
--- a/external_imported/vcpkg/ports/pngpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/pngpp/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 c54a74c0c20212bd0dcf86386c0c11dd824ad14952917ba0ff4c184b6547744458728a4f06018371acb7d5b842b641708914ccaa81bad8e72e173903f494ca85
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE ${ARCHIVE}
     PATCHES
         fix-stderror-win.patch
diff --git a/external_imported/vcpkg/ports/pngpp/vcpkg.json b/external_imported/vcpkg/ports/pngpp/vcpkg.json
index bff3b6994..95374c479 100644
--- a/external_imported/vcpkg/ports/pngpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/pngpp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "pngpp",
   "version": "0.2.10",
-  "port-version": 1,
+  "port-version": 2,
   "description": "A C++ wrapper for libpng library.",
   "dependencies": [
     "libpng"
diff --git a/external_imported/vcpkg/ports/pngwriter/vcpkg.json b/external_imported/vcpkg/ports/pngwriter/vcpkg.json
index 10cb62ec9..bb57c111a 100644
--- a/external_imported/vcpkg/ports/pngwriter/vcpkg.json
+++ b/external_imported/vcpkg/ports/pngwriter/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "pngwriter",
-  "version-string": "0.7.0",
-  "port-version": 4,
+  "version": "0.7.0",
+  "port-version": 5,
   "description": "PNGwriter is a very easy to use open source graphics library that uses PNG as its output format",
   "dependencies": [
     "freetype",
diff --git a/external_imported/vcpkg/ports/pocketfft/portfile.cmake b/external_imported/vcpkg/ports/pocketfft/portfile.cmake
new file mode 100644
index 000000000..6de420e2e
--- /dev/null
+++ b/external_imported/vcpkg/ports/pocketfft/portfile.cmake
@@ -0,0 +1,13 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH src_path
+    REPO mreineck/pocketfft
+    REF 9efd4da52cf8d28d14531d14e43ad9d913807546
+    SHA512 e8c2b65b23feb53f1077b3ae1e0e20d21d8f55601bd1216443af0fbc916638c3649527494ec2f23bed42d562341e0cf1fcde54c37068333161f289d23d8a9009
+    HEAD_REF cpp
+)
+
+set(VCPKG_BUILD_TYPE release) # header only
+
+file(COPY "${src_path}/pocketfft_hdronly.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+
+vcpkg_install_copyright(FILE_LIST "${src_path}/LICENSE.md")
diff --git a/external_imported/vcpkg/ports/pocketfft/vcpkg.json b/external_imported/vcpkg/ports/pocketfft/vcpkg.json
new file mode 100644
index 000000000..90c455f66
--- /dev/null
+++ b/external_imported/vcpkg/ports/pocketfft/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "pocketfft",
+  "version-date": "2023-09-25",
+  "description": "This is a heavily modified implementation of FFTPack",
+  "homepage": "https://github.com/mreineck/pocketfft",
+  "license": "BSD-3-Clause"
+}
diff --git a/external_imported/vcpkg/ports/poco/portfile.cmake b/external_imported/vcpkg/ports/poco/portfile.cmake
index 9657d24d8..286a3707f 100644
--- a/external_imported/vcpkg/ports/poco/portfile.cmake
+++ b/external_imported/vcpkg/ports/poco/portfile.cmake
@@ -1,9 +1,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO pocoproject/poco
-    REF 1211613642269b7d53bea58b02de7fcd25ece3b9 # poco-1.12.4-release
-    SHA512 bf390f7c8d7c4f0d7602afa434a933b429274944d12560159761b0f984316c76abfdb49ad422c869e02d88041058a04d66e7b5ae05142819a4f583870cc00f44
-    HEAD_REF master
+    REF "poco-1.13.0-release"
+    SHA512 5e557b4c93dd5eacd7c43af9c89646c49e65217db9d9e0fc016b3f643aca993d70e58a85ec7e63743221eb2b29d36ce9f8a3bfbf4db489d8ff24e20127f450ea
+    HEAD_REF devel
     PATCHES
         # Fix embedded copy of pcre in static linking mode
         0001-static-pcre.patch
@@ -86,7 +86,7 @@ vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
 # Move apps to the tools folder
-vcpkg_copy_tools(TOOL_NAMES cpspc f2cpsp PocoDoc tec arc AUTO_CLEAN)
+vcpkg_copy_tools(TOOL_NAMES cpspc f2cpsp PocoDoc tec poco-arc AUTO_CLEAN)
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
@@ -110,6 +110,19 @@ if(EXISTS "${CURRENT_PACKAGES_DIR}/include/Poco/SQL/SQLite")
     file(COPY "${SOURCE_PATH}/Data/SQLite/include" DESTINATION "${CURRENT_PACKAGES_DIR}")
 endif()
 
+# Copy include files of sql-parser
+file(GLOB HEADERS "${SOURCE_PATH}/Data/src/sql-parser/src/*.h")
+file(COPY ${HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include/Poco/Data/sql-parser/src")
+
+file(GLOB HEADERS "${SOURCE_PATH}/Data/src/sql-parser/src/parser/*.h")
+file(COPY ${HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include/Poco/Data/sql-parser/src/parser")
+
+file(GLOB HEADERS "${SOURCE_PATH}/Data/src/sql-parser/src/sql/*.h")
+file(COPY ${HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include/Poco/Data/sql-parser/src/sql")
+
+file(GLOB HEADERS "${SOURCE_PATH}/Data/src/sql-parser/src/util/*.h")
+file(COPY ${HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include/Poco/Data/sql-parser/src/util")
+
 if(VCPKG_TARGET_IS_WINDOWS)
   vcpkg_cmake_config_fixup(CONFIG_PATH cmake)
 else()
@@ -120,4 +133,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/poco/vcpkg.json b/external_imported/vcpkg/ports/poco/vcpkg.json
index f61665e46..6997c9923 100644
--- a/external_imported/vcpkg/ports/poco/vcpkg.json
+++ b/external_imported/vcpkg/ports/poco/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "poco",
-  "version": "1.12.4",
-  "port-version": 4,
+  "version": "1.13.0",
   "description": "Modern, powerful open source C++ class libraries for building network and internet-based applications that run on desktop, server, mobile and embedded systems.",
   "homepage": "https://github.com/pocoproject/poco",
   "license": "BSL-1.0",
diff --git a/external_imported/vcpkg/ports/podofo/0002-HAVE_UNISTD_H.patch b/external_imported/vcpkg/ports/podofo/0002-HAVE_UNISTD_H.patch
deleted file mode 100644
index 6aed4b279..000000000
--- a/external_imported/vcpkg/ports/podofo/0002-HAVE_UNISTD_H.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/podofo_config.h.in b/podofo_config.h.in
-index fea9ada..a813c7b 100644
---- a/podofo_config.h.in
-+++ b/podofo_config.h.in
-@@ -59,3 +59,10 @@
- #cmakedefine PODOFO_HAVE_OPENSSL_NO_RC4
- #cmakedefine PODOFO_HAVE_LIBIDN
- #cmakedefine PODOFO_HAVE_UNISTRING_LIB
-+
-+/* Fix build for MacOS 10.13 */
-+#if defined(__APPLE__) && !defined(__IOS__)
-+#cmakedefine01 HAVE_UNISTD_H
-+#else
-+#cmakedefine HAVE_UNISTD_H
-+#endif
diff --git a/external_imported/vcpkg/ports/podofo/0003-uwp_fix.patch b/external_imported/vcpkg/ports/podofo/0003-uwp_fix.patch
deleted file mode 100644
index 4801447c7..000000000
--- a/external_imported/vcpkg/ports/podofo/0003-uwp_fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/podofo/base/PdfCompilerCompat.h b/src/podofo/base/PdfCompilerCompat.h
-index 146731d..7041712 100644
---- a/src/podofo/base/PdfCompilerCompat.h
-+++ b/src/podofo/base/PdfCompilerCompat.h
-@@ -113,6 +113,10 @@
- #define NOMINMAX
- #endif
- 
-+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)
-+#include <combaseapi.h>
-+#endif
-+
- // Integer types - fixed size types guaranteed to work anywhere
- // because we detect the right underlying type name to use with
- // CMake. Use typedefs rather than macros for saner error messages
diff --git a/external_imported/vcpkg/ports/podofo/0005-fix-crypto.patch b/external_imported/vcpkg/ports/podofo/0005-fix-crypto.patch
deleted file mode 100644
index a873ee4c9..000000000
--- a/external_imported/vcpkg/ports/podofo/0005-fix-crypto.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f23dd5a..fd9e8ed 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -315,11 +315,12 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX)
- FIND_PACKAGE(ZLIB REQUIRED)
- MESSAGE("Found zlib headers in ${ZLIB_INCLUDE_DIR}, library at ${ZLIB_LIBRARIES}")
- 
--FIND_PACKAGE(LIBCRYPTO)
-+FIND_PACKAGE(OpenSSL)
- 
--IF(LIBCRYPTO_FOUND)
-+IF(OpenSSL_FOUND)
- 	SET(PODOFO_HAVE_OPENSSL TRUE)
--	INCLUDE_DIRECTORIES(${LIBCRYPTO_INCLUDE_DIR})
-+    LIST(APPEND OPENSSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto)
-+    ADD_DEFINITIONS(-DPODOFO_HAVE_OPENSSL_1_1)
- 	MESSAGE("Found OpenSSL's libCrypto headers in ${LIBCRYPTO_INCLUDE_DIR}, library at ${LIBCRYPTO_LIBRARIES}")
- ELSE(LIBCRYPTO_FOUND)
- 	MESSAGE("OpenSSL's libCrypto not found. Encryption support will be disabled")
-@@ -396,8 +397,6 @@ ENDIF(CppUnit_FOUND)
- 
- ENDIF(NOT PODOFO_BUILD_LIB_ONLY)
- 
--FIND_PACKAGE(OpenSSL)
--
- FIND_PACKAGE(FREETYPE REQUIRED)
- MESSAGE("Found freetype library at ${FREETYPE_LIBRARIES}, headers ${FREETYPE_INCLUDE_DIR}")
- 
diff --git a/external_imported/vcpkg/ports/podofo/fix-compiler.patch b/external_imported/vcpkg/ports/podofo/fix-compiler.patch
deleted file mode 100644
index e698da3e0..000000000
--- a/external_imported/vcpkg/ports/podofo/fix-compiler.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/podofo/CMakeLists.txt b/src/podofo/CMakeLists.txt
-index 16f0798..12fc0e8 100644
---- a/src/podofo/CMakeLists.txt
-+++ b/src/podofo/CMakeLists.txt
-@@ -1,5 +1,7 @@
- CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
- 
-+set(CMAKE_CXX_STANDARD 14)
-+
- IF(NOT PODOFO_MAIN_CMAKELISTS_READ)
-   MESSAGE(FATAL_ERROR "Run cmake on the CMakeLists.txt in the project root, not the one in the 'src' directory. You will need to delete CMakeCache.txt from the current directory.")
- ENDIF(NOT PODOFO_MAIN_CMAKELISTS_READ)
diff --git a/external_imported/vcpkg/ports/podofo/fix-interface-include.patch b/external_imported/vcpkg/ports/podofo/fix-interface-include.patch
new file mode 100644
index 000000000..a4a2ae6c7
--- /dev/null
+++ b/external_imported/vcpkg/ports/podofo/fix-interface-include.patch
@@ -0,0 +1,20 @@
+diff --git a/src/podofo/CMakeLists.txt b/src/podofo/CMakeLists.txt
+index 697e475..6c12036 100644
+--- a/src/podofo/CMakeLists.txt
++++ b/src/podofo/CMakeLists.txt
+@@ -72,6 +72,7 @@ if(PODOFO_BUILD_STATIC)
+     add_library(podofo_static STATIC ${PODOFO_SOURCES})
+     add_library(podofo::podofo ALIAS podofo_static)
+     target_link_libraries(podofo_static podofo_private ${PODOFO_LIB_DEPENDS})
++    target_include_directories(podofo_static PUBLIC "$<INSTALL_INTERFACE:include>")
+     set_target_properties(podofo_static PROPERTIES
+         VERSION "${PODOFO_VERSION}"
+         SOVERSION "${PODOFO_SOVERSION}"
+@@ -96,6 +97,7 @@ if(PODOFO_BUILD_SHARED)
+     add_library(podofo_shared SHARED ${PODOFO_SOURCES})
+     add_library(podofo::podofo ALIAS podofo_shared)
+     target_link_libraries(podofo_shared PRIVATE podofo_private ${PODOFO_LIB_DEPENDS})
++    target_include_directories(podofo_shared PUBLIC "$<INSTALL_INTERFACE:include>")
+     # TODO: set /wd4251 flag if we're doing a debug build with
+     # Visual Studio, since it produces invalid warnings about STL
+     # use.
diff --git a/external_imported/vcpkg/ports/podofo/fix-x64-osx.patch b/external_imported/vcpkg/ports/podofo/fix-x64-osx.patch
deleted file mode 100644
index 621f0f68e..000000000
--- a/external_imported/vcpkg/ports/podofo/fix-x64-osx.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/podofo/base/PdfDate.cpp b/src/podofo/base/PdfDate.cpp
-index cefa221..75d80e4 100644
---- a/src/podofo/base/PdfDate.cpp
-+++ b/src/podofo/base/PdfDate.cpp
-@@ -196,7 +196,7 @@ PdfDate::PdfDate( const PdfString & sDate )
- 
-     strncpy(m_szDate,sDate.GetString(),PDF_DATE_BUFFER_SIZE);
- 
--    struct tm _tm{};
-+    struct tm _tm; memset (&_tm, 0, sizeof(struct tm));
-     _tm.tm_mday = 1;
- 
-     const char * pszDate = sDate.GetString();
diff --git a/external_imported/vcpkg/ports/podofo/freetype.patch b/external_imported/vcpkg/ports/podofo/freetype.patch
deleted file mode 100644
index f241690f7..000000000
--- a/external_imported/vcpkg/ports/podofo/freetype.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/cmake/modules/FindFREETYPE.cmake b/cmake/modules/FindFREETYPE.cmake
-index 41114798f..0911dc092 100644
---- a/cmake/modules/FindFREETYPE.cmake
-+++ b/cmake/modules/FindFREETYPE.cmake
-@@ -15,9 +15,13 @@ SET(FREETYPE_FIND_QUIETLY 1)
- # first we try to find ft2build.h in the new location as
- # of freetype 2.5.1
- FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD ft2build.h
-+  PATHS
-   /usr/include/freetype2
-   /usr/local/include/freetype2
-   /usr/X11/include/freetype2
-+  PATH_SUFFIXES
-+  freetype2
-+  include/freetype2
-   NO_CMAKE_SYSTEM_PATH
- )
- 
diff --git a/external_imported/vcpkg/ports/podofo/install-cmake-config.patch b/external_imported/vcpkg/ports/podofo/install-cmake-config.patch
deleted file mode 100644
index 1373e5839..000000000
--- a/external_imported/vcpkg/ports/podofo/install-cmake-config.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index df623ef..8e653b8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -569,10 +569,4 @@ CONFIGURE_FILE(${PoDoFo_SOURCE_DIR}/podofo_config.h.in ${PoDoFo_BINARY_DIR}/podo
- # To use these dependencies set PODOFO_DIR to the podofo BUILD directory in
- # your build (eg -DPODOFO_DIR=/path/to/podofo when running cmake to configure
- # the app that'll use podofo). See: FIND_PACKAGE(...) in the cmake docs.
--IF(PODOFO_BUILD_SHARED)
--  EXPORT(TARGETS podofo_shared FILE "${CMAKE_CURRENT_BINARY_DIR}/PoDoFoConfig.cmake")
--ENDIF(PODOFO_BUILD_SHARED)
--IF(PODOFO_BUILD_STATIC)
--  EXPORT(TARGETS podofo_static FILE "${CMAKE_CURRENT_BINARY_DIR}/PoDoFoConfig.cmake")
--ENDIF(PODOFO_BUILD_STATIC)
- 
-diff --git a/src/podofo/CMakeLists.txt b/src/podofo/CMakeLists.txt
-index bba6b5f..16f0798 100644
---- a/src/podofo/CMakeLists.txt
-+++ b/src/podofo/CMakeLists.txt
-@@ -275,10 +275,14 @@ IF(PODOFO_BUILD_STATIC)
-         CACHE INTERNAL "Which PoDoFo library variant to depend on")
-     SET(USING_SHARED_PODOFO FALSE)
-     INSTALL(TARGETS podofo_static
-+        EXPORT PoDoFoConfig
-         RUNTIME DESTINATION "bin"
-         LIBRARY DESTINATION "${LIBDIRNAME}"
-         ARCHIVE DESTINATION "${LIBDIRNAME}"
-         )
-+    INSTALL(EXPORT PoDoFoConfig
-+        DESTINATION share/podofo
-+        )
- ENDIF(PODOFO_BUILD_STATIC)
- 
- IF(PODOFO_BUILD_SHARED)
-@@ -301,10 +305,14 @@ IF(PODOFO_BUILD_SHARED)
-         CACHE INTERNAL "Which PoDoFo library variant to depend on")
-     SET(USING_SHARED_PODOFO TRUE)
-     INSTALL(TARGETS podofo_shared
-+        EXPORT PoDoFoConfig
-         RUNTIME DESTINATION "bin"
-         LIBRARY DESTINATION "${LIBDIRNAME}"
-         ARCHIVE DESTINATION "${LIBDIRNAME}"
-         )
-+    INSTALL(EXPORT PoDoFoConfig
-+        DESTINATION share/podofo
-+        )
- 
- 
-       # Create a pkg-config file for linking against shared library
diff --git a/external_imported/vcpkg/ports/podofo/portfile.cmake b/external_imported/vcpkg/ports/podofo/portfile.cmake
index d9cc0308b..0f9300930 100644
--- a/external_imported/vcpkg/ports/podofo/portfile.cmake
+++ b/external_imported/vcpkg/ports/podofo/portfile.cmake
@@ -1,74 +1,59 @@
-set(PODOFO_VERSION 0.9.8)
-
-if (VCPKG_TARGET_IS_UWP)
-  set(ADDITIONAL_PATCH "0003-uwp_fix.patch")
-endif()
-
-vcpkg_from_sourceforge(
+vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO podofo/podofo
-    REF ${PODOFO_VERSION}
-    FILENAME "podofo-${PODOFO_VERSION}.tar.gz"
-    SHA512 b220322114450f1656c73d325f5172bc4cec0b1913e98b4eb2455f8ed7394bcaa47438d41003c9678937ef44d411e135431ddd6784f83d3663337d471baa02b1
+    REF "${VERSION}"
+    SHA512 80fa86ff7f256a69b963451ef741e49c56447084b26481e52d1a079940102b5d51d9ff1c43952bba22bae61d95c8c44eacc08f55cd18999aec6c563f615b2cf5
     PATCHES
-        0002-HAVE_UNISTD_H.patch
-        freetype.patch
-        ${ADDITIONAL_PATCH}
-        0005-fix-crypto.patch
-        fix-x64-osx.patch
-        install-cmake-config.patch
-        fix-compiler.patch
+        fix-interface-include.patch
 )
 
-set(PODOFO_NO_FONTMANAGER ON)
-if("fontconfig" IN_LIST FEATURES)
-  set(PODOFO_NO_FONTMANAGER OFF)
-endif()
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        fontconfig  CMAKE_REQUIRE_FIND_PACKAGE_Fontconfig
+    INVERTED_FEATURES
+        fontconfig  CMAKE_DISABLE_FIND_PACKAGE_Fontconfig
+)
 
-string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PODOFO_BUILD_SHARED)
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PODOFO_BUILD_STATIC)
 
-set(IS_WIN32 OFF)
-if(VCPKG_TARGET_IS_WINDOWS)
-    set(IS_WIN32 ON)
-endif()
-
 file(REMOVE "${SOURCE_PATH}/cmake/modules/FindOpenSSL.cmake")
 file(REMOVE "${SOURCE_PATH}/cmake/modules/FindZLIB.cmake")
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
+        ${FEATURE_OPTIONS}
+        -DPKG_CONFIG_FOUND=true # enable pc file for shared linkage
         -DPODOFO_BUILD_LIB_ONLY=1
-        -DPODOFO_BUILD_SHARED=${PODOFO_BUILD_SHARED}
         -DPODOFO_BUILD_STATIC=${PODOFO_BUILD_STATIC}
-        -DPODOFO_NO_FONTMANAGER=${PODOFO_NO_FONTMANAGER}
-        -DCMAKE_DISABLE_FIND_PACKAGE_FONTCONFIG=${PODOFO_NO_FONTMANAGER}
-        -DCMAKE_DISABLE_FIND_PACKAGE_LIBCRYPTO=${IS_WIN32}
-        -DCMAKE_DISABLE_FIND_PACKAGE_LIBIDN=ON
-        -DCMAKE_DISABLE_FIND_PACKAGE_CppUnit=ON
-        -DCMAKE_DISABLE_FIND_PACKAGE_Boost=ON
+        -DCMAKE_DISABLE_FIND_PACKAGE_Libidn=ON
     MAYBE_UNUSED_VARIABLES
-        CMAKE_DISABLE_FIND_PACKAGE_Boost
-        CMAKE_DISABLE_FIND_PACKAGE_CppUnit
-        CMAKE_DISABLE_FIND_PACKAGE_LIBCRYPTO
+        PKG_CONFIG_FOUND # Fix the warning of static build.
 )
 
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
-vcpkg_replace_string( "${CURRENT_PACKAGES_DIR}/share/${PORT}/PoDoFoConfig.cmake"
-    "# Create imported target podofo_shared"
-[[
-include(CMakeFindDependencyMacro)
+vcpkg_replace_string( "${CURRENT_PACKAGES_DIR}/share/${PORT}/podofo-config.cmake"
+    "# Generated by CMake"
+    "include(CMakeFindDependencyMacro)
+find_dependency(Freetype)
+find_dependency(JPEG)
+find_dependency(LibXml2)
 find_dependency(OpenSSL)
-# Create imported target podofo_shared
-]]
-)
+find_dependency(PNG)
+find_dependency(TIFF)
+find_dependency(ZLIB)
+if(\"${CMAKE_REQUIRE_FIND_PACKAGE_Fontconfig}\")
+    find_dependency(Fontconfig)
+endif()
+\n# Generated by CMake")
 
 vcpkg_cmake_config_fixup()
+vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 # Handle copyright
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/podofo/usage b/external_imported/vcpkg/ports/podofo/usage
new file mode 100644
index 000000000..b21f4bb79
--- /dev/null
+++ b/external_imported/vcpkg/ports/podofo/usage
@@ -0,0 +1,4 @@
+podofo provides CMake targets:
+
+    find_package(podofo CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE $<IF:$<TARGET_EXISTS:podofo_shared>,podofo_shared,podofo_static>)
diff --git a/external_imported/vcpkg/ports/podofo/vcpkg.json b/external_imported/vcpkg/ports/podofo/vcpkg.json
index d27ed0bfc..e9e31f0c0 100644
--- a/external_imported/vcpkg/ports/podofo/vcpkg.json
+++ b/external_imported/vcpkg/ports/podofo/vcpkg.json
@@ -1,16 +1,23 @@
 {
   "name": "podofo",
-  "version": "0.9.8",
+  "version": "0.10.3",
   "description": "PoDoFo is a library to work with the PDF file format",
-  "homepage": "https://sourceforge.net/projects/podofo/",
-  "license": "LGPL-2.0-only",
-  "supports": "!uwp",
+  "homepage": "https://github.com/podofo/podofo",
+  "license": "LGPL-2.0-or-later",
+  "supports": "!uwp & !xbox",
   "dependencies": [
     "freetype",
     "libjpeg-turbo",
     "libpng",
+    {
+      "name": "libxml2",
+      "default-features": false
+    },
     "openssl",
-    "tiff",
+    {
+      "name": "tiff",
+      "default-features": false
+    },
     {
       "name": "vcpkg-cmake",
       "host": true
@@ -21,12 +28,28 @@
     },
     "zlib"
   ],
+  "default-features": [
+    "fontmanager"
+  ],
   "features": {
     "fontconfig": {
-      "description": "Enable font manager support on Unix platforms",
+      "description": "Use Fontconfig",
       "dependencies": [
         "fontconfig"
       ]
+    },
+    "fontmanager": {
+      "description": "Enable font manager",
+      "dependencies": [
+        {
+          "name": "podofo",
+          "default-features": false,
+          "features": [
+            "fontconfig"
+          ],
+          "platform": "!windows"
+        }
+      ]
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/poly2tri/CMakeLists.txt b/external_imported/vcpkg/ports/poly2tri/CMakeLists.txt
deleted file mode 100644
index 0bb81850a..000000000
--- a/external_imported/vcpkg/ports/poly2tri/CMakeLists.txt
+++ /dev/null
@@ -1,64 +0,0 @@
-cmake_minimum_required(VERSION 3.0)
-
-if(POLICY CMP0063)
-  cmake_policy(SET CMP0063 NEW)
-endif()
-
-set(CMAKE_CXX_VISIBILITY_PRESET hidden)
-set(CMAKE_VISIBILITY_INLINES_HIDDEN TRUE)
-
-project(poly2tri LANGUAGES C CXX)
-
-set(INSTALL_BIN_DIR      "bin"                     CACHE PATH "Path where exe and dll will be installed")
-set(INSTALL_LIB_DIR      "lib"                     CACHE PATH "Path where lib will be installed")
-set(INSTALL_INCLUDE_DIR  "include/${PROJECT_NAME}" CACHE PATH "Path where headers will be installed")
-set(INSTALL_CMAKE_DIR    "share/${PROJECT_NAME}"   CACHE PATH "Path where cmake configs will be installed")
-
-set(${PROJECT_NAME}_HEADERS
-    "poly2tri/poly2tri.h"
-)
-
-set(${PROJECT_NAME}_COMMON_HEADERS
-    "poly2tri/common/shapes.h"
-    "poly2tri/common/utils.h"
-)
-
-set(${PROJECT_NAME}_SWEEP_HEADERS
-    "poly2tri/sweep/advancing_front.h"
-    "poly2tri/sweep/cdt.h"
-    "poly2tri/sweep/sweep.h"
-    "poly2tri/sweep/sweep_context.h"
-)
-
-set(${PROJECT_NAME}_SOURCES
-    "poly2tri/common/shapes.cc"
-    "poly2tri/sweep/advancing_front.cc"
-    "poly2tri/sweep/cdt.cc"
-    "poly2tri/sweep/sweep.cc"
-    "poly2tri/sweep/sweep_context.cc"
-)
-
-add_library(${PROJECT_NAME} "${${PROJECT_NAME}_HEADERS}" "${${PROJECT_NAME}_COMMON_HEADERS}" "${${PROJECT_NAME}_SWEEP_HEADERS}" "${${PROJECT_NAME}_SOURCES}")
-set_target_properties(${PROJECT_NAME} PROPERTIES PUBLIC_HEADER "${${PROJECT_NAME}_HEADERS}")
-target_include_directories(${PROJECT_NAME} PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/poly2tri>
-    $<INSTALL_INTERFACE:include>
-    $<INSTALL_INTERFACE:include/${PROJECT_NAME}>
-)
-
-install(FILES ${${PROJECT_NAME}_COMMON_HEADERS} DESTINATION "${INSTALL_INCLUDE_DIR}/common")
-install(FILES ${${PROJECT_NAME}_SWEEP_HEADERS} DESTINATION "${INSTALL_INCLUDE_DIR}/sweep")
-
-install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets
-  RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
-  LIBRARY DESTINATION "${INSTALL_LIB_DIR}"
-  ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
-  PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}"
-  COMPONENT dev
-)
-
-install (EXPORT ${PROJECT_NAME}Targets
-    FILE ${PROJECT_NAME}Config.cmake
-    NAMESPACE ${PROJECT_NAME}::
-    DESTINATION "${INSTALL_CMAKE_DIR}"
-)
diff --git a/external_imported/vcpkg/ports/poly2tri/fix-sweep-h-codepage.patch b/external_imported/vcpkg/ports/poly2tri/fix-sweep-h-codepage.patch
deleted file mode 100644
index 6b418c364..000000000
--- a/external_imported/vcpkg/ports/poly2tri/fix-sweep-h-codepage.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/poly2tri/sweep/sweep.h b/poly2tri/sweep/sweep.h
-index f62c4cc..af8af69 100644
---- a/poly2tri/sweep/sweep.h
-+++ b/poly2tri/sweep/sweep.h
-@@ -33,7 +33,7 @@
-  * Zalik, B.(2008)'Sweep-line algorithm for constrained Delaunay triangulation',
-  * International Journal of Geographical Information Science
-  *
-- * "FlipScan" Constrained Edge Algorithm invented by Thomas Åhlén, thahlen@gmail.com
-+ * "FlipScan" Constrained Edge Algorithm invented by Thomas, thahlen@gmail.com
-  */
- 
- #ifndef SWEEP_H
diff --git a/external_imported/vcpkg/ports/poly2tri/portfile.cmake b/external_imported/vcpkg/ports/poly2tri/portfile.cmake
deleted file mode 100644
index 22c463c17..000000000
--- a/external_imported/vcpkg/ports/poly2tri/portfile.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO greenm01/poly2tri
-    REF 88de49021b6d9bef6faa1bc94ceb3fbd85c3c204
-    SHA512 fa256bcf923ad59f42205edf5a7e07cac6cbd9a37cefb9a0961a2e06aea7fa8ffd09d4e26154c0028601c12804483842cb935d9f602385f5f203c9628382c4fb
-    HEAD_REF master
-    PATCHES
-        fix-sweep-h-codepage.patch
-)
-
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-)
-
-vcpkg_cmake_install()
-vcpkg_cmake_config_fixup()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/external_imported/vcpkg/ports/poly2tri/vcpkg.json b/external_imported/vcpkg/ports/poly2tri/vcpkg.json
deleted file mode 100644
index a00b5badd..000000000
--- a/external_imported/vcpkg/ports/poly2tri/vcpkg.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "name": "poly2tri",
-  "version-date": "2020-07-21",
-  "port-version": 3,
-  "description": "The Clipper library performs clipping and offsetting for both lines and polygons. All four boolean clipping operations are supported - intersection, union, difference and exclusive-or. Polygons can be of any shape including self-intersecting polygons.",
-  "homepage": "https://github.com/greenm01/poly2tri",
-  "supports": "!uwp",
-  "dependencies": [
-    {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
-    }
-  ]
-}
diff --git a/external_imported/vcpkg/ports/polyclipping/vcpkg.json b/external_imported/vcpkg/ports/polyclipping/vcpkg.json
index 424fb3578..4c53dd031 100644
--- a/external_imported/vcpkg/ports/polyclipping/vcpkg.json
+++ b/external_imported/vcpkg/ports/polyclipping/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "polyclipping",
-  "version-string": "6.4.2",
-  "port-version": 11,
+  "version": "6.4.2",
+  "port-version": 12,
   "description": "The Clipper library performs clipping and offsetting for both lines and polygons. All four boolean clipping operations are supported - intersection, union, difference and exclusive-or. Polygons can be of any shape including self-intersecting polygons.",
   "homepage": "https://sourceforge.net/projects/polyclipping/",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/polyhook2/fix-dep.patch b/external_imported/vcpkg/ports/polyhook2/fix-dep.patch
new file mode 100644
index 000000000..cd24ccaf1
--- /dev/null
+++ b/external_imported/vcpkg/ports/polyhook2/fix-dep.patch
@@ -0,0 +1,62 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a91480445..c3d432e0b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -211,14 +211,8 @@ endif()
+ 
+ #DisAsm/Zydis
+ if (POLYHOOK_USE_EXTERNAL_ZYDIS)
+-    find_library(ZYDIS_LIBRARY NAMES zydis)
+-    find_library(ZYCORE_LIBRARY NAMES zycore)
+-    find_path(ZYDIS_INCLUDE_DIR NAMES zydis/zydis.h)
+-    find_path(ZYCORE_INCLUDE_DIR NAMES zycore/zycore.h)
+-    target_link_libraries(${PROJECT_NAME} PUBLIC ${ZYDIS_LIBRARY})
+-    target_link_libraries(${PROJECT_NAME} PUBLIC ${ZYCORE_LIBRARY})
+-    target_include_directories(${PROJECT_NAME} PUBLIC ${ZYDIS_INCLUDE_DIR})
+-    target_include_directories(${PROJECT_NAME} PUBLIC ${ZYCORE_INCLUDE_DIR})
++    find_package(zydis REQUIRED)
++    target_link_libraries(${PROJECT_NAME} PUBLIC Zydis::Zydis)
+ else()
+     target_link_libraries(${PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:Zydis>)
+     target_include_directories(${PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/zydis/include>)
+@@ -231,10 +225,8 @@ install(FILES ${PROJECT_SOURCE_DIR}/polyhook2/ZydisDisassembler.hpp DESTINATION
+ 
+ function(link_asmjit)
+     if (POLYHOOK_USE_EXTERNAL_ASMJIT)
+-        find_library(ASMJIT_LIBRARY NAMES asmjit)
+-        find_path(ASMJIT_INCLUDE_DIR NAMES asmjit/asmjit.h)
+-        target_link_libraries(${PROJECT_NAME} PRIVATE ${ASMJIT_LIBRARY})
+-        target_include_directories(${PROJECT_NAME} PUBLIC ${ASMJIT_INCLUDE_DIR})
++      find_package(asmjit REQUIRED)
++      target_link_libraries(${PROJECT_NAME} PRIVATE asmjit::asmjit)
+     else()
+         target_link_libraries(${PROJECT_NAME} PRIVATE $<BUILD_INTERFACE:asmjit>)
+         target_include_directories(${PROJECT_NAME} PUBLIC "$<BUILD_INTERFACE:${ASMJIT_SRC}>")
+@@ -238,10 +238,8 @@ if(POLYHOOK_FEATURE_DETOURS)
+     link_asmjit()
+ 
+     if (POLYHOOK_USE_EXTERNAL_ASMTK)
+-        find_library(ASMTK_LIBRARY NAMES asmtk)
+-        find_path(ASMTK_INCLUDE_DIR NAMES asmtk/asmtk.h)
+-        target_link_libraries(${PROJECT_NAME} PUBLIC ${ASMTK_LIBRARY})
+-        target_include_directories(${PROJECT_NAME} PUBLIC ${ASMTK_INCLUDE_DIR})
++      find_package(asmtk REQUIRED)
++      target_link_libraries(${PROJECT_NAME} PRIVATE asmjit::asmtk)
+     else()
+         target_link_libraries(${PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:asmtk>)
+         target_include_directories(${PROJECT_NAME} PUBLIC "$<BUILD_INTERFACE:${ASMTK_SRC}>")
+diff --git a/PolyHook_2-config.cmake.in b/PolyHook_2-config.cmake.in
+index 709f8b5d9..3add035e3 100644
+--- a/PolyHook_2-config.cmake.in
++++ b/PolyHook_2-config.cmake.in
+@@ -10,5 +10,10 @@ set(POLYHOOK_FEATURE_INLINENTD @POLYHOOK_FEATURE_INLINENTD@)
+ set(POLYHOOK_FEATURE_PE @POLYHOOK_FEATURE_PE@)
+ set(POLYHOOK_FEATURE_VIRTUALS @POLYHOOK_FEATURE_VIRTUALS@)
+ 
++include(CMakeFindDependencyMacro)
++find_dependency(Zydis)
++find_dependency(asmjit)
++find_dependency(asmtk)
++
+ get_filename_component(POLYHOOK_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+ include("${POLYHOOK_CMAKE_DIR}/PolyHook_2-targets.cmake")
diff --git a/external_imported/vcpkg/ports/polyhook2/portfile.cmake b/external_imported/vcpkg/ports/polyhook2/portfile.cmake
index 25ae59786..852673df4 100644
--- a/external_imported/vcpkg/ports/polyhook2/portfile.cmake
+++ b/external_imported/vcpkg/ports/polyhook2/portfile.cmake
@@ -1,15 +1,14 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO stevemk14ebr/PolyHook_2_0
-    REF  750e78f8d7ebfc291e1c0dce3a0763c3a4b86737
-    SHA512 c542288cfde258bcb54960593f2b596b6a967cf128a691e4b8ad699127567c58dc55ce2bbf21f4d3ccbaa2d794bcacd3540503b039ee58c614a854f13d51d30e
+    REF 71553ebf0d197e73c49365cc3ab2a6aa326b3c37
+    SHA512 f8daaa0307f07990b10a6487e1b0f2719e7442fcaeff5878eae9c22a741f27b1dfa7a292b91dcf7e2039029dd7dce71083ab2288e9d84de1bc20be7567a858c8
     HEAD_REF master
+    PATCHES fix-dep.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
-        capstone  POLYHOOK_DISASM_CAPSTONE
-        zydis     POLYHOOK_DISASM_ZYDIS
         exception POLYHOOK_FEATURE_EXCEPTION
         detours   POLYHOOK_FEATURE_DETOURS
         inlinentd POLYHOOK_FEATURE_INLINENTD
@@ -31,7 +30,7 @@ vcpkg_cmake_configure(
       -DPOLYHOOK_BUILD_SHARED_LIB=${BUILD_SHARED_LIB}
       -DPOLYHOOK_BUILD_STATIC_RUNTIME=${BUILD_STATIC_RUNTIME}
       -DPOLYHOOK_USE_EXTERNAL_ASMJIT=ON
-      -DPOLYHOOK_USE_EXTERNAL_CAPSTONE=ON
+      -DPOLYHOOK_USE_EXTERNAL_ASMTK=ON
       -DPOLYHOOK_USE_EXTERNAL_ZYDIS=ON
 )
 
@@ -43,4 +42,4 @@ vcpkg_copy_pdbs()
 vcpkg_cmake_config_fixup(PACKAGE_NAME PolyHook_2 CONFIG_PATH lib/PolyHook_2)
 
 # Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/polyhook2/vcpkg.json b/external_imported/vcpkg/ports/polyhook2/vcpkg.json
index 3e1c552d8..3c0e272d7 100644
--- a/external_imported/vcpkg/ports/polyhook2/vcpkg.json
+++ b/external_imported/vcpkg/ports/polyhook2/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "polyhook2",
-  "version-date": "2022-03-01",
+  "version-date": "2023-08-11",
   "description": "C++17, x86/x64 Hooking Library v2.0",
   "homepage": "https://github.com/stevemk14ebr/PolyHook_2_0",
   "license": "MIT",
@@ -13,32 +13,24 @@
     {
       "name": "vcpkg-cmake-config",
       "host": true
-    }
+    },
+    "zydis"
   ],
   "default-features": [
-    "capstone",
     "detours",
     "exception",
     "inlinentd",
     "pe",
-    "virtuals",
-    "zydis"
+    "virtuals"
   ],
   "features": {
-    "capstone": {
-      "description": "Capstone disassembler integration.",
+    "detours": {
+      "description": "Implement detour functionality",
       "dependencies": [
-        {
-          "name": "capstone",
-          "features": [
-            "x86"
-          ]
-        }
+        "asmjit",
+        "asmtk"
       ]
     },
-    "detours": {
-      "description": "Implement detour functionality"
-    },
     "exception": {
       "description": "Implement all exception hooking functionality"
     },
@@ -53,12 +45,6 @@
     },
     "virtuals": {
       "description": "Implement all virtual table hooking functionality"
-    },
-    "zydis": {
-      "description": "Zydis disassembler integration.",
-      "dependencies": [
-        "zydis"
-      ]
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/ponder/vcpkg.json b/external_imported/vcpkg/ports/ponder/vcpkg.json
index bd06df5b8..b881cb9b4 100644
--- a/external_imported/vcpkg/ports/ponder/vcpkg.json
+++ b/external_imported/vcpkg/ports/ponder/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ponder",
-  "version-string": "3.0.0",
-  "port-version": 4,
+  "version": "3.0.0",
+  "port-version": 5,
   "description": "A C++ multi-purpose reflection library.",
   "homepage": "https://github.com/billyquith/ponder",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/poppler/portfile.cmake b/external_imported/vcpkg/ports/poppler/portfile.cmake
index 7cb2bee61..4b5e8a75d 100644
--- a/external_imported/vcpkg/ports/poppler/portfile.cmake
+++ b/external_imported/vcpkg/ports/poppler/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_gitlab(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO poppler/poppler
     REF "poppler-${POPPLER_VERSION}"
-    SHA512 18649364dc407080941b7c4010c0f26c1ce825d9ec49ff8e9ef298c62afb8d5bb77cea6a5cd1a74615190f433c265613dba42a6b7fdd80c2b5f00d372a31d21d
+    SHA512 23fe0f5445896e3a0731a0f3eae6aac84dc8f4b0718e947ae3ee3492295720408738f0c706eb2e5cbaa41e854dafc70e5c59c9c70e7d78ab33c318b2e8d7e4ff
     HEAD_REF master
     PATCHES
         export-unofficial-poppler.patch
@@ -16,15 +16,24 @@ set(POPPLER_PC_REQUIRES "freetype2 libjpeg libopenjp2 libpng libtiff-4 poppler-v
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
         cairo       WITH_Cairo
+        cairo       CMAKE_REQUIRE_FIND_PACKAGE_CAIRO
         curl        ENABLE_LIBCURL
+        curl        CMAKE_REQUIRE_FIND_PACKAGE_CURL
         private-api ENABLE_UNSTABLE_API_ABI_HEADERS
         zlib        ENABLE_ZLIB
-        glib        ENABLE_GLIB 
+        zlib        CMAKE_REQUIRE_FIND_PACKAGE_ZLIB
+        glib        ENABLE_GLIB
+        glib        CMAKE_REQUIRE_FIND_PACKAGE_GLIB
         qt          ENABLE_QT6
+        qt          CMAKE_REQUIRE_FIND_PACKAGE_Qt6
+        cms         CMAKE_REQUIRE_FIND_PACKAGE_LCMS2
+        cms         ENABLE_LCMS
 )
 if("fontconfig" IN_LIST FEATURES)
     list(APPEND FEATURE_OPTIONS "-DFONT_CONFIGURATION=fontconfig")
     string(APPEND POPPLER_PC_REQUIRES " fontconfig")
+elseif(VCPKG_TARGET_IS_ANDROID)
+    list(APPEND FEATURE_OPTIONS "-DFONT_CONFIGURATION=android")
 elseif(VCPKG_TARGET_IS_WINDOWS)
     list(APPEND FEATURE_OPTIONS "-DFONT_CONFIGURATION=win32")
 else()
@@ -40,6 +49,10 @@ if("zlib" IN_LIST FEATURES)
     string(APPEND POPPLER_PC_REQUIRES " zlib")
 endif()
 
+if("cms" IN_LIST FEATURES)
+    string(APPEND POPPLER_PC_REQUIRES " lcms2")
+endif()
+
 vcpkg_find_acquire_program(PKGCONFIG)
 vcpkg_find_acquire_program(PYTHON3)
 
@@ -57,11 +70,27 @@ vcpkg_cmake_configure(
         -DENABLE_UTILS=OFF
         -DENABLE_GOBJECT_INTROSPECTION=OFF
         -DENABLE_QT5=OFF
-        -DENABLE_CMS=none
         -DRUN_GPERF_IF_PRESENT=OFF
         -DENABLE_RELOCATABLE=OFF # https://gitlab.freedesktop.org/poppler/poppler/-/issues/1209
-        -DWITH_NSS3=OFF
+        -DENABLE_NSS3=OFF
+        -DENABLE_GPGME=OFF
+        -DCMAKE_DISABLE_FIND_PACKAGE_ECM=ON
+        -DCMAKE_REQUIRE_FIND_PACKAGE_OpenJPEG=ON
+        -DCMAKE_REQUIRE_FIND_PACKAGE_JPEG=ON
+        -DCMAKE_REQUIRE_FIND_PACKAGE_TIFF=ON
+        -DCMAKE_REQUIRE_FIND_PACKAGE_PNG=ON
+        -DCMAKE_REQUIRE_FIND_PACKAGE_Boost=ON
+        -DCMAKE_DISABLE_FIND_PACKAGE_GObjectIntrospection=ON
+        -DCMAKE_DISABLE_FIND_PACKAGE_GTK=ON
         ${FEATURE_OPTIONS}
+    MAYBE_UNUSED_VARIABLES
+        CMAKE_DISABLE_FIND_PACKAGE_GObjectIntrospection
+        CMAKE_DISABLE_FIND_PACKAGE_GTK
+        CMAKE_REQUIRE_FIND_PACKAGE_CAIRO
+        CMAKE_REQUIRE_FIND_PACKAGE_CURL
+        CMAKE_REQUIRE_FIND_PACKAGE_GLIB
+        CMAKE_REQUIRE_FIND_PACKAGE_LCMS2
+        CMAKE_REQUIRE_FIND_PACKAGE_Qt6
 )
 vcpkg_cmake_install()
 
@@ -73,6 +102,7 @@ if(NOT VCPKG_BUILD_TYPE)
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/poppler.pc" "Libs:" "Requires.private: ${POPPLER_PC_REQUIRES}\nLibs:")
 endif()
 vcpkg_fixup_pkgconfig()
+vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
diff --git a/external_imported/vcpkg/ports/poppler/vcpkg.json b/external_imported/vcpkg/ports/poppler/vcpkg.json
index a5f712a50..98010d960 100644
--- a/external_imported/vcpkg/ports/poppler/vcpkg.json
+++ b/external_imported/vcpkg/ports/poppler/vcpkg.json
@@ -1,11 +1,10 @@
 {
   "name": "poppler",
-  "version": "23.1.0",
-  "port-version": 2,
+  "version": "23.11.0",
   "description": "A PDF rendering library",
   "homepage": "https://poppler.freedesktop.org/",
   "license": "GPL-2.0-or-later",
-  "supports": "!uwp",
+  "supports": "!uwp & !xbox",
   "dependencies": [
     "boost-container",
     "boost-move",
@@ -38,6 +37,12 @@
         }
       ]
     },
+    "cms": {
+      "description": "Enable use of LCMS2 as color management system",
+      "dependencies": [
+        "lcms"
+      ]
+    },
     "curl": {
       "description": "curl for poppler",
       "dependencies": [
diff --git a/external_imported/vcpkg/ports/portable-file-dialogs/portfile.cmake b/external_imported/vcpkg/ports/portable-file-dialogs/portfile.cmake
new file mode 100644
index 000000000..873110889
--- /dev/null
+++ b/external_imported/vcpkg/ports/portable-file-dialogs/portfile.cmake
@@ -0,0 +1,11 @@
+# Header-only library
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO samhocevar/portable-file-dialogs
+    REF "${VERSION}"
+    SHA512 8f3f59534024357b1d4b9054f20f482bfb159c1666be1695220c1be8f028be6adac0d9d82aad7230922a5eea5971c051a8699e60bc99207813776f35ce6937b6
+    HEAD_REF master
+)
+
+file(INSTALL "${SOURCE_PATH}/portable-file-dialogs.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/external_imported/vcpkg/ports/portable-file-dialogs/vcpkg.json b/external_imported/vcpkg/ports/portable-file-dialogs/vcpkg.json
new file mode 100644
index 000000000..d7074d3c9
--- /dev/null
+++ b/external_imported/vcpkg/ports/portable-file-dialogs/vcpkg.json
@@ -0,0 +1,16 @@
+{
+  "name": "portable-file-dialogs",
+  "version": "0.1.0",
+  "description": "Portable GUI dialogs library",
+  "homepage": "https://github.com/samhocevar/portable-file-dialogs",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/portable-snippets/CMakeLists.txt b/external_imported/vcpkg/ports/portable-snippets/CMakeLists.txt
index 5f511265a..0931363ce 100644
--- a/external_imported/vcpkg/ports/portable-snippets/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/portable-snippets/CMakeLists.txt
@@ -62,6 +62,10 @@ foreach (subdir ${subdirs})
     else ()
         add_library(${module} STATIC ${entries})
 
+        if (MSVC)
+            target_compile_definitions(${module} PUBLIC __STDC_NO_THREADS__=1)
+        endif ()
+
         set_target_properties(
             ${module}
             PROPERTIES
diff --git a/external_imported/vcpkg/ports/portable-snippets/vcpkg.json b/external_imported/vcpkg/ports/portable-snippets/vcpkg.json
index b1f66080f..efcb6e533 100644
--- a/external_imported/vcpkg/ports/portable-snippets/vcpkg.json
+++ b/external_imported/vcpkg/ports/portable-snippets/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "portable-snippets",
   "version-date": "2019-09-20",
-  "port-version": 3,
+  "port-version": 4,
   "description": "Collection of miscellaneous portable C snippets",
   "homepage": "https://github.com/nemequ/portable-snippets",
   "license": null,
diff --git a/external_imported/vcpkg/ports/portaudio/framework_link.patch b/external_imported/vcpkg/ports/portaudio/framework_link.patch
new file mode 100644
index 000000000..658ca122c
--- /dev/null
+++ b/external_imported/vcpkg/ports/portaudio/framework_link.patch
@@ -0,0 +1,34 @@
+From 8fe2958d3202b409f7d54f53b41fca7b225c3f0e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
+Date: Thu, 27 Jul 2023 15:06:24 +0200
+Subject: [PATCH] Don't use apsolute path when linking to macOS frameworks
+
+---
+ CMakeLists.txt | 18 +++++++-----------
+ 1 file changed, 7 insertions(+), 11 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 87d0bb832..75aa89e7b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -261,13 +261,13 @@ ELSE()
+       SET(PA_PRIVATE_INCLUDES ${PA_PRIVATE_INCLUDES} ${PA_COREAUDIO_INCLUDES})
+       SET(PA_SOURCES ${PA_SOURCES} ${PA_COREAUDIO_SOURCES})
+ 
+-      FIND_LIBRARY(COREAUDIO_LIBRARY CoreAudio REQUIRED)
+-      FIND_LIBRARY(AUDIOTOOLBOX_LIBRARY AudioToolbox REQUIRED)
+-      FIND_LIBRARY(AUDIOUNIT_LIBRARY AudioUnit REQUIRED)
+-      FIND_LIBRARY(COREFOUNDATION_LIBRARY CoreFoundation REQUIRED)
+-      FIND_LIBRARY(CORESERVICES_LIBRARY CoreServices REQUIRED)
+-      MARK_AS_ADVANCED(COREAUDIO_LIBRARY AUDIOTOOLBOX_LIBRARY AUDIOUNIT_LIBRARY COREFOUNDATION_LIBRARY CORESERVICES_LIBRARY)
+-      SET(PA_LIBRARY_DEPENDENCIES ${PA_LIBRARY_DEPENDENCIES} ${COREAUDIO_LIBRARY} ${AUDIOTOOLBOX_LIBRARY} ${AUDIOUNIT_LIBRARY} ${COREFOUNDATION_LIBRARY} ${CORESERVICES_LIBRARY})
++      SET(PA_LIBRARY_DEPENDENCIES 
++        ${PA_LIBRARY_DEPENDENCIES} 
++        -Wl,-framework,CoreAudio
++        -Wl,-framework,AudioToolbox
++        -Wl,-framework,AudioUnit
++        -Wl,-framework,CoreFoundation
++        -Wl,-framework,CoreServices)
+       SET(PA_PRIVATE_COMPILE_DEFINITIONS ${PA_PRIVATE_COMPILE_DEFINITIONS} PA_USE_COREAUDIO)
+       SET(PA_PKGCONFIG_LDFLAGS "${PA_PKGCONFIG_LDFLAGS} -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework CoreFoundation -framework CoreServices")
+     ENDIF()
diff --git a/external_imported/vcpkg/ports/portaudio/portfile.cmake b/external_imported/vcpkg/ports/portaudio/portfile.cmake
index 9a9564a0c..65c5bcb04 100644
--- a/external_imported/vcpkg/ports/portaudio/portfile.cmake
+++ b/external_imported/vcpkg/ports/portaudio/portfile.cmake
@@ -5,6 +5,7 @@ vcpkg_from_github(
     SHA512 0f56e5f5b004f51915f29771b8fc1fe886f1fef5d65ab5ea1db43f43c49917476b9eec14b36aa54d3e9fb4d8bdf61e68c79624d00b7e548d4c493395a758233a
     PATCHES
         fix-library-can-not-be-found.patch
+        framework_link.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PA_BUILD_SHARED)
diff --git a/external_imported/vcpkg/ports/portaudio/vcpkg.json b/external_imported/vcpkg/ports/portaudio/vcpkg.json
index c33d20a62..8ed40572a 100644
--- a/external_imported/vcpkg/ports/portaudio/vcpkg.json
+++ b/external_imported/vcpkg/ports/portaudio/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "portaudio",
   "version": "19.7",
-  "port-version": 4,
+  "port-version": 5,
   "description": "PortAudio Portable Cross-platform Audio I/O API PortAudio is a free, cross-platform, open-source, audio I/O library.  It lets you write simple audio programs in 'C' or C++ that will compile and run on many platforms including Windows, Macintosh OS X, and Unix (OSS/ALSA). It is intended to promote the exchange of audio software between developers on different platforms. Many applications use PortAudio for Audio I/O.",
   "homepage": "http://www.portaudio.com",
   "supports": "!uwp",
diff --git a/external_imported/vcpkg/ports/portmidi/framework_link.patch b/external_imported/vcpkg/ports/portmidi/framework_link.patch
new file mode 100644
index 000000000..fabd61d42
--- /dev/null
+++ b/external_imported/vcpkg/ports/portmidi/framework_link.patch
@@ -0,0 +1,49 @@
+From aa375d4fe0bf91ab1edd445baa7912a23a5e6a60 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
+Date: Thu, 27 Jul 2023 08:30:44 +0200
+Subject: [PATCH] Don't use absolut paths to macOS frameworks
+
+This fixes https://github.com/PortMidi/portmidi/issues/56
+---
+ pm_common/CMakeLists.txt | 21 +++++++++++++--------
+ 1 file changed, 13 insertions(+), 8 deletions(-)
+
+diff --git a/pm_common/CMakeLists.txt b/pm_common/CMakeLists.txt
+index 062887b..e474244 100644
+--- a/pm_common/CMakeLists.txt
++++ b/pm_common/CMakeLists.txt
+@@ -81,21 +81,25 @@ endif()
+ # first include the appropriate system-dependent file:
+ if(UNIX AND APPLE)
+   set(Threads::Threads "" PARENT_SCOPE)
+-  find_library(COREAUDIO_LIBRARY CoreAudio REQUIRED)
+-  find_library(COREFOUNDATION_LIBRARY CoreFoundation REQUIRED)
+-  find_library(COREMIDI_LIBRARY CoreMIDI REQUIRED)
+-  find_library(CORESERVICES_LIBRARY CoreServices REQUIRED)
+   set(PM_LIB_PRIVATE_SRC 
+       ${PMDIR}/porttime/ptmacosx_mach.c
+       ${PMDIR}/pm_mac/pmmac.c
+       ${PMDIR}/pm_mac/pmmacosxcm.c
+       ${PMDIR}/pm_mac/finddefault.c
+       ${PMDIR}/pm_mac/readbinaryplist.c)
+-  set(PM_NEEDED_LIBS ${CMAKE_THREAD_LIBS_INIT} ${COREAUDIO_LIBRARY}
+-      ${COREFOUNDATION_LIBRARY} ${COREMIDI_LIBRARY} ${CORESERVICES_LIBRARY}
+-      PARENT_SCOPE)
+-  target_link_libraries(portmidi PRIVATE Threads::Threads ${COREAUDIO_LIBRARY}
+-      ${COREFOUNDATION_LIBRARY} ${COREMIDI_LIBRARY} ${CORESERVICES_LIBRARY})
++  set(PM_NEEDED_LIBS
++      ${CMAKE_THREAD_LIBS_INIT}
++      -Wl,-framework,CoreAudio
++      -Wl,-framework,CoreFoundation
++      -Wl,-framework,CoreMidi
++      -Wl,-framework,CoreServices)
++  target_link_libraries(portmidi
++    PRIVATE
++      Threads::Threads
++      -Wl,-framework,CoreAudio
++      -Wl,-framework,CoreFoundation
++      -Wl,-framework,CoreMidi
++      -Wl,-framework,CoreServices)
+   # set to CMake default; is this right?:
+   set_target_properties(portmidi PROPERTIES MACOSX_RPATH ON)
+ elseif(HAIKU)
diff --git a/external_imported/vcpkg/ports/portmidi/portfile.cmake b/external_imported/vcpkg/ports/portmidi/portfile.cmake
index d8811313d..8d17c5cbb 100644
--- a/external_imported/vcpkg/ports/portmidi/portfile.cmake
+++ b/external_imported/vcpkg/ports/portmidi/portfile.cmake
@@ -6,6 +6,7 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
         "search-for-threads-in-config.patch"
+        "framework_link.patch"
 )
 
 if(VCPKG_CRT_LINKAGE STREQUAL static)
diff --git a/external_imported/vcpkg/ports/portmidi/vcpkg.json b/external_imported/vcpkg/ports/portmidi/vcpkg.json
index 69c6966a2..31574ddd3 100644
--- a/external_imported/vcpkg/ports/portmidi/vcpkg.json
+++ b/external_imported/vcpkg/ports/portmidi/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "portmidi",
   "version": "2.0.4",
-  "port-version": 1,
+  "port-version": 3,
   "description": "PortMidi is a cross platform (Windows, macOS, Linux, and BSDs which support alsalib) library for interfacing with operating systems' MIDI I/O APIs.",
   "homepage": "https://github.com/PortMidi/portmidi",
   "license": "MIT",
@@ -9,7 +9,7 @@
   "dependencies": [
     {
       "name": "alsa",
-      "platform": "!(windows | osx)"
+      "platform": "linux | android | freebsd | openbsd"
     },
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/portsmf/portfile.cmake b/external_imported/vcpkg/ports/portsmf/portfile.cmake
index 01370f7c2..2684ee4de 100644
--- a/external_imported/vcpkg/ports/portsmf/portfile.cmake
+++ b/external_imported/vcpkg/ports/portsmf/portfile.cmake
@@ -1,9 +1,12 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO tenacityteam/portsmf
-    REF 238
-    SHA512 af619d1b0a656361af8f8b8b65d7f98047613ac8e9ea51354031629c1732ad02755f84d63ac7c4ed24cdf0ad3db46381061bf32d9afe29b7be3226dc814ef552
-    HEAD_REF main
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://codeberg.org/tenacityteam/portsmf/archive/${VERSION}.tar.gz"
+    FILENAME "${VERSION}.tar.gz"
+    SHA512 522ef6e92de6497c66d6b9adf2b6b4e419024d26fac421096718b024ea0e183d322d3f0cd9fc357e0ba983371cf313d7a0b93b8b24aff5c9cb1ab61c915725ff
+)
+vcpkg_extract_source_archive(
+    SOURCE_PATH
+    ARCHIVE "${ARCHIVE}"
+
 )
 
 vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}")
@@ -13,5 +16,5 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/PortSMF)
 vcpkg_fixup_pkgconfig()
 vcpkg_copy_pdbs()
 
-file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/license.txt")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/external_imported/vcpkg/ports/portsmf/vcpkg.json b/external_imported/vcpkg/ports/portsmf/vcpkg.json
index f3105391a..2f96f307a 100644
--- a/external_imported/vcpkg/ports/portsmf/vcpkg.json
+++ b/external_imported/vcpkg/ports/portsmf/vcpkg.json
@@ -1,9 +1,8 @@
 {
   "name": "portsmf",
-  "version": "0.238",
-  "port-version": 1,
+  "version": "239",
   "description": "Portsmf is 'Port Standard MIDI File', a cross-platform, C++ library for reading and writing Standard MIDI Files.",
-  "homepage": "https://github.com/tenacityteam/portsmf",
+  "homepage": "https://codeberg.org/tenacityteam/portsmf",
   "license": "MIT",
   "supports": "!uwp",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/ppconsul/vcpkg.json b/external_imported/vcpkg/ports/ppconsul/vcpkg.json
index ac3b3e7f9..6812951a8 100644
--- a/external_imported/vcpkg/ports/ppconsul/vcpkg.json
+++ b/external_imported/vcpkg/ports/ppconsul/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ppconsul",
-  "version-string": "0.5",
-  "port-version": 4,
+  "version": "0.5",
+  "port-version": 5,
   "description": "A C++ client library for Consul. Consul is a distributed tool for discovering and configuring services in your infrastructure.",
   "homepage": "https://github.com/oliora/ppconsul",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/ppmagic/vcpkg.json b/external_imported/vcpkg/ports/ppmagic/vcpkg.json
index 7bf584f33..79dcecfb6 100644
--- a/external_imported/vcpkg/ports/ppmagic/vcpkg.json
+++ b/external_imported/vcpkg/ports/ppmagic/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ppmagic",
-  "version-string": "2020-07-03",
-  "port-version": 1,
+  "version-date": "2020-07-03",
+  "port-version": 2,
   "description": "C/C++ preprocessor macros that you can use to simplify your life.",
   "homepage": "https://github.com/kobalicek/ppmagic"
 }
diff --git a/external_imported/vcpkg/ports/pprint/vcpkg.json b/external_imported/vcpkg/ports/pprint/vcpkg.json
index 8c14c0a9c..f1f1722b2 100644
--- a/external_imported/vcpkg/ports/pprint/vcpkg.json
+++ b/external_imported/vcpkg/ports/pprint/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "pprint",
-  "version-string": "2019-07-19",
-  "port-version": 2,
+  "version-date": "2019-07-19",
+  "port-version": 3,
   "description": "Pretty Printer for Modern C++",
   "homepage": "https://github.com/p-ranav/pprint",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/pqp/vcpkg.json b/external_imported/vcpkg/ports/pqp/vcpkg.json
index d36723e0c..f8fd02201 100644
--- a/external_imported/vcpkg/ports/pqp/vcpkg.json
+++ b/external_imported/vcpkg/ports/pqp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "pqp",
-  "version-string": "1.3",
-  "port-version": 6,
+  "version": "1.3",
+  "port-version": 7,
   "description": "a proximity query package",
   "homepage": "https://gamma.cs.unc.edu/SSV/",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/pravila00-enum-string/portfile.cmake b/external_imported/vcpkg/ports/pravila00-enum-string/portfile.cmake
new file mode 100644
index 000000000..5a099731d
--- /dev/null
+++ b/external_imported/vcpkg/ports/pravila00-enum-string/portfile.cmake
@@ -0,0 +1,13 @@
+# Header-only library
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Pravila00/enum-string
+    REF 3eec46f5520c287ee46692ea1d41833cbe0d80f2
+    SHA512 5b29c27b8ceb358bae5a2b4fb5d198b7b4cd8a7c9926bd7685c27650da5cda9f6dc85b6a9694fe151d03b22e3230d5f3faf9143e865dffc0795b2952fca5fc0f
+    HEAD_REF main
+)
+
+file(COPY "${SOURCE_PATH}/EnumString.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/pravila00-enum-string/vcpkg.json b/external_imported/vcpkg/ports/pravila00-enum-string/vcpkg.json
new file mode 100644
index 000000000..a1afb14d8
--- /dev/null
+++ b/external_imported/vcpkg/ports/pravila00-enum-string/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "pravila00-enum-string",
+  "version-date": "2023-10-16",
+  "description": "A utility to provide stringizing support for C++ enums.",
+  "homepage": "https://github.com/Pravila00/enum-string",
+  "license": "Unlicense"
+}
diff --git a/external_imported/vcpkg/ports/pravila00-make-vector/portfile.cmake b/external_imported/vcpkg/ports/pravila00-make-vector/portfile.cmake
new file mode 100644
index 000000000..285464d9b
--- /dev/null
+++ b/external_imported/vcpkg/ports/pravila00-make-vector/portfile.cmake
@@ -0,0 +1,11 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Pravila00/make-vector
+    REF 1518ac00adec9b13a645aee45ed1a36eb6ec1e98
+    SHA512 2be4af258ceeb71e990ecc5c1c2c269456f6621b7b6b8183ba4e29f5479c4c7a618bd0c737a8d66aa00052a710930ec2f2ee5bc925f7a627427ac90918b6d4fa
+    HEAD_REF main
+)
+
+file(COPY "${SOURCE_PATH}/include/make_vector.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include/make-vector")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/pravila00-make-vector/vcpkg.json b/external_imported/vcpkg/ports/pravila00-make-vector/vcpkg.json
new file mode 100644
index 000000000..04cd52a32
--- /dev/null
+++ b/external_imported/vcpkg/ports/pravila00-make-vector/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "pravila00-make-vector",
+  "version-date": "2023-04-10",
+  "description": "C++ helper for making vectors.",
+  "homepage": "https://github.com/Pravila00/make-vector",
+  "license": "BSL-1.0"
+}
diff --git a/external_imported/vcpkg/ports/proj/fix-proj4-targets-cmake.patch b/external_imported/vcpkg/ports/proj/fix-proj4-targets-cmake.patch
index f86346081..d0e132bbc 100644
--- a/external_imported/vcpkg/ports/proj/fix-proj4-targets-cmake.patch
+++ b/external_imported/vcpkg/ports/proj/fix-proj4-targets-cmake.patch
@@ -38,11 +38,11 @@ diff --git a/cmake/project-config.cmake.in b/cmake/project-config.cmake.in
 index 7d5579ae..0cf96252 100644
 --- a/cmake/project-config.cmake.in
 +++ b/cmake/project-config.cmake.in
-@@ -15,6 +15,7 @@ if(@PROJECT_VARIANT_NAME@ STREQUAL "PROJ4")
-
- cmake_policy(PUSH)
- cmake_policy(SET CMP0012 NEW)
+@@ -27,6 +27,7 @@ if(@PROJECT_VARIANT_NAME@ STREQUAL "PROJ4")
+ endif()
+ cmake_policy(POP)
+ 
 +find_dependency(unofficial-sqlite3 CONFIG)
- if("@ENABLE_TIFF@")
+ if(DEFINED PROJ_CONFIG_FIND_TIFF_DEP)
      find_dependency(TIFF)
  endif()
diff --git a/external_imported/vcpkg/ports/proj/portfile.cmake b/external_imported/vcpkg/ports/proj/portfile.cmake
index 2e280823b..fdf74fe05 100644
--- a/external_imported/vcpkg/ports/proj/portfile.cmake
+++ b/external_imported/vcpkg/ports/proj/portfile.cmake
@@ -2,12 +2,12 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO OSGeo/PROJ
     REF "${VERSION}"
-    SHA512 a48980b94b6c68738dd5ab70a1de6aa42f325fd612155623195a14774caadcaceff08035c01696458d3dd706b2277d89ea093949a1855fafa9951c59821cb1cb
+    SHA512 45775e2b2a6b5bc490743c562155521a2ef48c5a8834cc96f88784aea785df10688f8962ae22fcac64d3b2f85378539ef1d3a082243cdc0ca3695ed8b9efa18b
     HEAD_REF master
     PATCHES
         fix-win-output-name.patch
         fix-proj4-targets-cmake.patch
-        remove-doc.patch
+        remove_toolset_restriction.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -54,8 +54,12 @@ if ("tools" IN_LIST FEATURES)
     vcpkg_copy_tools(TOOL_NAMES ${TOOL_NAMES} AUTO_CLEAN)
 endif ()
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(REMOVE_RECURSE
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/debug/share"
+    "${CURRENT_PACKAGES_DIR}/share/doc"
+    "${CURRENT_PACKAGES_DIR}/share/man"
+)
 
 vcpkg_copy_pdbs()
 
diff --git a/external_imported/vcpkg/ports/proj/remove-doc.patch b/external_imported/vcpkg/ports/proj/remove-doc.patch
deleted file mode 100644
index 3812e9617..000000000
--- a/external_imported/vcpkg/ports/proj/remove-doc.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4c9744e6..a6d5e4eb 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -318,15 +335,12 @@ include_directories(${PROJ_SOURCE_DIR}/src)
- add_subdirectory(data)
- add_subdirectory(include)
- add_subdirectory(src)
--add_subdirectory(man)
- add_subdirectory(cmake)
- if(BUILD_TESTING)
-   add_subdirectory(test)
- endif()
- 
--set(docfiles COPYING NEWS AUTHORS)
--install(FILES ${docfiles}
--        DESTINATION ${CMAKE_INSTALL_DOCDIR})
-+
- 
- ################################################################################
- # pkg-config support
-@@ -378,6 +392,7 @@ set(CPACK_SOURCE_IGNORE_FILES
- 
- include(CPack)
- 
-+if(0)
- # Simplify README.md to README
- add_custom_target(README
-   COMMAND ${CMAKE_COMMAND}
-@@ -393,6 +408,7 @@ if(NOT _is_multi_config_generator)
-   )
-   message(STATUS "PROJ: Configured 'dist' target")
- endif()
-+endif()
- 
- configure_file(cmake/uninstall.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/proj_uninstall.cmake @ONLY)
- add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/proj_uninstall.cmake)
diff --git a/external_imported/vcpkg/ports/proj/remove_toolset_restriction.patch b/external_imported/vcpkg/ports/proj/remove_toolset_restriction.patch
new file mode 100644
index 000000000..7da273795
--- /dev/null
+++ b/external_imported/vcpkg/ports/proj/remove_toolset_restriction.patch
@@ -0,0 +1,19 @@
+diff --git a/cmake/project-config-version.cmake.in b/cmake/project-config-version.cmake.in
+index d9807b2c5..7ffe39364 100644
+--- a/cmake/project-config-version.cmake.in
++++ b/cmake/project-config-version.cmake.in
+@@ -28,14 +28,6 @@ elseif (NOT (APPLE OR (NOT DEFINED CMAKE_SIZEOF_VOID_P) OR
+   # since a multi-architecture library is built for that platform).
+   set (REASON "sizeof(*void) = @CMAKE_SIZEOF_VOID_P@")
+   set (PACKAGE_VERSION_UNSUITABLE TRUE)
+-elseif (MSVC AND NOT (
+-    # toolset version must be at least as great as @PROJECT_NAME@'s
+-    MSVC_TOOLSET_VERSION GREATER_EQUAL @MSVC_TOOLSET_VERSION@
+-    # and major versions must match
+-    AND MSVC_TOOLSET_MAJOR EQUAL @MSVC_TOOLSET_MAJOR@ ))
+-  # Reject if there's a mismatch in MSVC compiler versions
+-  set (REASON "MSVC_TOOLSET_VERSION = @MSVC_TOOLSET_VERSION@")
+-  set (PACKAGE_VERSION_UNSUITABLE TRUE)
+ elseif (PACKAGE_FIND_VERSION)
+   if (PACKAGE_FIND_VERSION VERSION_EQUAL PACKAGE_VERSION)
+     set (PACKAGE_VERSION_EXACT TRUE)
diff --git a/external_imported/vcpkg/ports/proj/vcpkg.json b/external_imported/vcpkg/ports/proj/vcpkg.json
index 64bdc7641..f5d93d4fd 100644
--- a/external_imported/vcpkg/ports/proj/vcpkg.json
+++ b/external_imported/vcpkg/ports/proj/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "proj",
-  "version": "9.2.0",
+  "version": "9.3.1",
   "description": "PROJ library for cartographic projections",
   "homepage": "https://proj.org/",
   "license": "MIT",
@@ -13,6 +13,7 @@
     {
       "name": "sqlite3",
       "host": true,
+      "default-features": false,
       "features": [
         "tool"
       ]
diff --git a/external_imported/vcpkg/ports/protobuf-c/portfile.cmake b/external_imported/vcpkg/ports/protobuf-c/portfile.cmake
index 7ff3a5897..69f6102e1 100644
--- a/external_imported/vcpkg/ports/protobuf-c/portfile.cmake
+++ b/external_imported/vcpkg/ports/protobuf-c/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO protobuf-c/protobuf-c
     REF v${VERSION}
-    SHA512 cba4c6116c0f2ebb034236e8455d493bfaa2517733befcd87b6f8d6d3df0c0149b17fcbf59cd1763fa2318119c664d0dae3d2d3a46ebfe2a0fec3ef4719b033b
+    SHA512 57f858118a89befc80e111ad9a57eadbcf2317d60e085b6d99e10f6604ee8c08473fe6ab1fdfb0a3196821a6e68e743943338321d23d15a1229987f140341181
     HEAD_REF master
     PATCHES
         fix-crt-linkage.patch
diff --git a/external_imported/vcpkg/ports/protobuf-c/vcpkg.json b/external_imported/vcpkg/ports/protobuf-c/vcpkg.json
index 85d59d7cc..ae408e450 100644
--- a/external_imported/vcpkg/ports/protobuf-c/vcpkg.json
+++ b/external_imported/vcpkg/ports/protobuf-c/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "protobuf-c",
-  "version-semver": "1.4.0",
-  "port-version": 2,
+  "version-semver": "1.4.1",
+  "port-version": 1,
   "description": "This is protobuf-c, a C implementation of the Google Protocol Buffers data serialization format.",
   "homepage": "https://github.com/protobuf-c/protobuf-c",
   "dependencies": [
@@ -24,7 +24,8 @@
       ]
     },
     "tools": {
-      "description": "Build tools (protoc-gen-c)."
+      "description": "Build tools (protoc-gen-c).",
+      "supports": "!uwp"
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/protobuf/portfile.cmake b/external_imported/vcpkg/ports/protobuf/portfile.cmake
index bdb5fe069..69a28ed20 100644
--- a/external_imported/vcpkg/ports/protobuf/portfile.cmake
+++ b/external_imported/vcpkg/ports/protobuf/portfile.cmake
@@ -33,6 +33,17 @@ if (VCPKG_DOWNLOAD_MODE)
     vcpkg_find_acquire_program(PKGCONFIG)
 endif()
 
+# Delete language backends we aren't targeting to reduce false positives in automated dependency
+# detectors like Dependabot.
+file(REMOVE_RECURSE
+    "${SOURCE_PATH}/csharp"
+    "${SOURCE_PATH}/java"
+    "${SOURCE_PATH}/objectivec"
+    "${SOURCE_PATH}/php"
+    "${SOURCE_PATH}/python"
+    "${SOURCE_PATH}/ruby"
+)
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
diff --git a/external_imported/vcpkg/ports/protobuf/vcpkg.json b/external_imported/vcpkg/ports/protobuf/vcpkg.json
index bda8f2707..61344a19b 100644
--- a/external_imported/vcpkg/ports/protobuf/vcpkg.json
+++ b/external_imported/vcpkg/ports/protobuf/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "protobuf",
   "version": "3.21.12",
+  "port-version": 1,
   "description": "Protocol Buffers - Google's data interchange format",
   "homepage": "https://github.com/protocolbuffers/protobuf",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/proxsuite/portfile.cmake b/external_imported/vcpkg/ports/proxsuite/portfile.cmake
new file mode 100644
index 000000000..fdc74aab6
--- /dev/null
+++ b/external_imported/vcpkg/ports/proxsuite/portfile.cmake
@@ -0,0 +1,37 @@
+set(VCPKG_BUILD_TYPE release) # header-only
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Simple-Robotics/proxsuite
+    REF "v${VERSION}"
+    SHA512 ce9d20f689cabf7668f8bd801017613a83ed816c8cab0190ae7116b2dc4880d0b5fa31bf11053f653f326b68984e3e63cdb3b43d9fd50a345554777d3d801a1b
+    HEAD_REF main
+)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH MODULES_SOURCE_PATH
+    REPO jrl-umi3218/jrl-cmakemodules
+    REF e1a71520cd2f0e6f2a611e1a70df4d8edf4d5a65
+    SHA512 a9dec01a4b4b30b42bf7f6e07c7102d58242c431f59875dac6bfc296473266f927e2ac3b823dcfa9364dad5cdbf46532d94eb65c41aa7d1ddfd7ec5212466ffa
+    HEAD_REF master
+)
+file(REMOVE_RECURSE "${SOURCE_PATH}/cmake-module")
+file(RENAME "${MODULES_SOURCE_PATH}" "${SOURCE_PATH}/cmake-module")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_TESTING=OFF
+        -DBUILD_WITH_VECTORIZATION_SUPPORT=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
+vcpkg_fixup_pkgconfig()
+
+file(REMOVE_RECURSE
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/debug/share"
+)
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/proxsuite/vcpkg.json b/external_imported/vcpkg/ports/proxsuite/vcpkg.json
new file mode 100644
index 000000000..3c98ab881
--- /dev/null
+++ b/external_imported/vcpkg/ports/proxsuite/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "proxsuite",
+  "version": "0.5.0",
+  "description": "The Advanced Proximal Optimization Toolbox",
+  "homepage": "https://github.com/Simple-Robotics/proxsuite",
+  "license": "BSD-2-Clause",
+  "dependencies": [
+    "eigen3",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/proxy/portfile.cmake b/external_imported/vcpkg/ports/proxy/portfile.cmake
index 8c3e5cf7e..f798435cf 100644
--- a/external_imported/vcpkg/ports/proxy/portfile.cmake
+++ b/external_imported/vcpkg/ports/proxy/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO microsoft/proxy
-    REF release/1.1.1
-    SHA512 47fd051cc4b774e02bf390ac6f6319ecf16f8ee063348557a93806e4fd3019229fb0157fb3f12143a90d994675615c05c8a8cf99dde5789f65c43b5ff74a7afa
+    REF ${VERSION}
+    SHA512 901815cd4456ce73d129311c8bf81ab7c5d87f290893ad47698b632c7d31c8648e9616975c942d6599d906b073452aae6fcdeffaee8f5b790febaab8a7fa4a6b
     HEAD_REF main
 )
 
diff --git a/external_imported/vcpkg/ports/proxy/vcpkg.json b/external_imported/vcpkg/ports/proxy/vcpkg.json
index da4f4c7f5..2598c916b 100644
--- a/external_imported/vcpkg/ports/proxy/vcpkg.json
+++ b/external_imported/vcpkg/ports/proxy/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "proxy",
-  "version": "1.1.1",
+  "version": "2.1.2",
   "description": "A single-header C++20 library that facilitates runtime polymorphism.",
   "homepage": "https://github.com/microsoft/proxy",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/proxygen/fix-dependency.patch b/external_imported/vcpkg/ports/proxygen/fix-dependency.patch
new file mode 100644
index 000000000..382cd9555
--- /dev/null
+++ b/external_imported/vcpkg/ports/proxygen/fix-dependency.patch
@@ -0,0 +1,75 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 112b36b..30e466a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -69,7 +69,10 @@ endif()
+ find_package(fmt REQUIRED)
+ find_package(folly REQUIRED)
+ find_package(wangle REQUIRED)
+-find_package(mvfst REQUIRED)
++find_package(fmt CONFIG REQUIRED)
++find_package(folly CONFIG REQUIRED)
++find_package(wangle CONFIG REQUIRED)
++find_package(mvfst CONFIG REQUIRED)
+ find_package(zstd CONFIG REQUIRED)
+ find_package(ZLIB REQUIRED)
+ find_package(OpenSSL REQUIRED)
+@@ -124,27 +127,8 @@ SET(GFLAG_DEPENDENCIES "")
+ SET(PROXYGEN_EXTRA_LINK_LIBRARIES "")
+ SET(PROXYGEN_EXTRA_INCLUDE_DIRECTORIES "")
+ 
+-find_package(gflags CONFIG QUIET)
+-if (gflags_FOUND)
+-  message("module path: ${CMAKE_MODULE_PATH}")
+-  message(STATUS "Found gflags from package config")
+-  if (TARGET gflags-shared)
+-    list(APPEND GFLAG_DEPENDENCIES gflags-shared)
+-  elseif (TARGET gflags)
+-    list(APPEND GFLAG_DEPENDENCIES gflags)
+-  else()
+-    message(FATAL_ERROR
+-            "Unable to determine the target name for the GFlags package.")
+-  endif()
+-  list(APPEND CMAKE_REQUIRED_LIBRARIES ${GFLAGS_LIBRARIES})
+-  list(APPEND CMAKE_REQUIRED_INCLUDES ${GFLAGS_INCLUDE_DIR})
+-else()
+-  find_package(Gflags REQUIRED MODULE)
+-  list(APPEND PROXYGEN_EXTRA_LINK_LIBRARIES ${LIBGFLAGS_LIBRARY})
+-  list(APPEND PROXYGEN_EXTRA_INCLUDE_DIRECTORIES ${LIBGFLAGS_INCLUDE_DIR})
+-  list(APPEND CMAKE_REQUIRED_LIBRARIES ${LIBGFLAGS_LIBRARY})
+-  list(APPEND CMAKE_REQUIRED_INCLUDES ${LIBGFLAGS_INCLUDE_DIR})
+-endif()
++find_package(gflags CONFIG REQUIRED)
++list(APPEND CMAKE_REQUIRED_LIBRARIES gflags::gflags)
+ 
+ include(ProxygenTest)
+ 
+diff --git a/cmake/proxygen-config.cmake.in b/cmake/proxygen-config.cmake.in
+index c79875d..0e002b9 100644
+--- a/cmake/proxygen-config.cmake.in
++++ b/cmake/proxygen-config.cmake.in
+@@ -17,17 +17,18 @@
+ @PACKAGE_INIT@
+ 
+ include(CMakeFindDependencyMacro)
+-find_dependency(fmt)
+-find_dependency(folly)
+-find_dependency(wangle)
+-find_dependency(mvfst)
+-find_dependency(Fizz)
++find_dependency(fmt CONFIG)
++find_dependency(folly CONFIG)
++find_dependency(wangle CONFIG)
++find_dependency(mvfst CONFIG)
++find_dependency(fizz CONFIG)
++find_dependency(gflags CONFIG)
+ # For now, anything that depends on Proxygen has to copy its FindZstd.cmake
+ # and issue a `find_package(Zstd)`.  Uncommenting this won't work because
+ # this Zstd module exposes a library called `zstd`.  The right fix is
+ # discussed on D24686032.
+ #
+-# find_dependency(Zstd)
++find_dependency(zstd CONFIG)
+ find_dependency(ZLIB)
+ find_dependency(OpenSSL)
+ find_dependency(Threads)
diff --git a/external_imported/vcpkg/ports/proxygen/fix-zstd-zlib-dependency.patch b/external_imported/vcpkg/ports/proxygen/fix-zstd-zlib-dependency.patch
index a56485e87..e117f1e89 100644
--- a/external_imported/vcpkg/ports/proxygen/fix-zstd-zlib-dependency.patch
+++ b/external_imported/vcpkg/ports/proxygen/fix-zstd-zlib-dependency.patch
@@ -1,21 +1,21 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ea22eab..6bf0f17 100644
+index 9bf6ec1..112b36b 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -74,7 +74,7 @@ if (BUILD_QUIC)
- else()
-  find_package(Fizz REQUIRED)
- endif()
+@@ -70,7 +70,7 @@ find_package(fmt REQUIRED)
+ find_package(folly REQUIRED)
+ find_package(wangle REQUIRED)
+ find_package(mvfst REQUIRED)
 -find_package(Zstd REQUIRED)
 +find_package(zstd CONFIG REQUIRED)
  find_package(ZLIB REQUIRED)
  find_package(OpenSSL REQUIRED)
  find_package(Threads)
 diff --git a/proxygen/lib/CMakeLists.txt b/proxygen/lib/CMakeLists.txt
-index b3fa2d1..5c50ee1 100644
+index ac5005f..fa403ab 100644
 --- a/proxygen/lib/CMakeLists.txt
 +++ b/proxygen/lib/CMakeLists.txt
-@@ -235,10 +235,10 @@ target_link_libraries(
+@@ -236,10 +236,10 @@ target_link_libraries(
      Folly::folly
      fizz::fizz
      wangle::wangle
diff --git a/external_imported/vcpkg/ports/proxygen/portfile.cmake b/external_imported/vcpkg/ports/proxygen/portfile.cmake
index f8abe645d..e3f3231f5 100644
--- a/external_imported/vcpkg/ports/proxygen/portfile.cmake
+++ b/external_imported/vcpkg/ports/proxygen/portfile.cmake
@@ -1,12 +1,13 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/proxygen
-    REF 0c932f6c57095838494520ec4ce7243a7f0c1234  #v2022.07.11.00
-    SHA512 496189c37be8f42821cb5357e501b02f013858f1917854000777ac5c0403d078837e89dc3eef5f66f30f83c7506e40316d730725d7f97070090ac6549e766093
+    REF "v${VERSION}"
+    SHA512 9a7081e0dafc93f1610a20ad2026111667711336efa46b9208873b539251f5b00d95597acde53818664aa6ea1fcda0dbd3417222af2fa23dc2f6b4c2bb079124
     HEAD_REF master
     PATCHES
         remove-register.patch
         fix-zstd-zlib-dependency.patch
+        fix-dependency.patch
 )
 
 vcpkg_find_acquire_program(PYTHON3)
@@ -28,4 +29,8 @@ vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/proxygen/vcpkg.json b/external_imported/vcpkg/ports/proxygen/vcpkg.json
index 25080b933..bb222cfb5 100644
--- a/external_imported/vcpkg/ports/proxygen/vcpkg.json
+++ b/external_imported/vcpkg/ports/proxygen/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "proxygen",
-  "version-string": "2022.07.11.00",
+  "version-string": "2024.01.01.00",
   "description": "It comprises the core C++ HTTP abstractions used at Facebook.",
   "homepage": "https://github.com/facebook/proxygen",
   "license": "BSD-3-Clause",
@@ -16,10 +16,12 @@
     "boost-thread",
     "fizz",
     "folly",
+    "gflags",
     {
       "name": "gperf",
       "host": true
     },
+    "mvfst",
     "openssl",
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/psimd/vcpkg.json b/external_imported/vcpkg/ports/psimd/vcpkg.json
index 00c0b8dbb..44ba8f565 100644
--- a/external_imported/vcpkg/ports/psimd/vcpkg.json
+++ b/external_imported/vcpkg/ports/psimd/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "psimd",
-  "version-string": "2021-02-21",
-  "port-version": 1,
+  "version-date": "2021-02-21",
+  "port-version": 2,
   "description": "Portable 128-bit SIMD intrinsics",
   "homepage": "https://github.com/Maratyszcza/psimd",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/ptc-print/portfile.cmake b/external_imported/vcpkg/ports/ptc-print/portfile.cmake
index 4d28d6809..1638033c7 100644
--- a/external_imported/vcpkg/ports/ptc-print/portfile.cmake
+++ b/external_imported/vcpkg/ports/ptc-print/portfile.cmake
@@ -4,8 +4,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO JustWhit3/ptc-print
-    REF v1.4.0
-    SHA512 17218b096bc616a448d5c257b29f3e6c5a263cb56ff0361fb4be19206daf687c012cad9c6fb551aec1d16024eb563962cd15fccff0b7c3ab71cce23dc0846a95
+    REF v1.4.1
+    SHA512 45f3008cb848f464ac0355660e7cdbd40db60338a4db5e35d29285c8c1afc0556c8dea6ac0e6939837916ec138dd8e385709d1fa89651d3404418cf3e7948fd9
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/ptc-print/vcpkg.json b/external_imported/vcpkg/ports/ptc-print/vcpkg.json
index f13a3fbeb..e90efa4e3 100644
--- a/external_imported/vcpkg/ports/ptc-print/vcpkg.json
+++ b/external_imported/vcpkg/ports/ptc-print/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "ptc-print",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "port-version": 1,
   "description": "A single-header library for custom printing to the output stream.",
   "homepage": "https://github.com/JustWhit3/ptc-print",
diff --git a/external_imported/vcpkg/ports/pthread/vcpkg.json b/external_imported/vcpkg/ports/pthread/vcpkg.json
index 7cc1edb46..be099cd31 100644
--- a/external_imported/vcpkg/ports/pthread/vcpkg.json
+++ b/external_imported/vcpkg/ports/pthread/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "pthread",
-  "version-string": "3.0.0",
-  "port-version": 1,
+  "version": "3.0.0",
+  "port-version": 2,
   "description": "empty package, linking to other port",
   "dependencies": [
     "pthreads"
diff --git a/external_imported/vcpkg/ports/pthreads/portfile.cmake b/external_imported/vcpkg/ports/pthreads/portfile.cmake
index 8f2a804fb..682ffa099 100644
--- a/external_imported/vcpkg/ports/pthreads/portfile.cmake
+++ b/external_imported/vcpkg/ports/pthreads/portfile.cmake
@@ -17,8 +17,6 @@ else()
   list(APPEND PATCH_FILES use-mt.patch)
 endif()
 
-list(APPEND PATCH_FILES fix-pthread_getname_np.patch fix-install.patch)
-
 vcpkg_from_sourceforge(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO pthreads4w
@@ -27,6 +25,9 @@ vcpkg_from_sourceforge(
   PATCHES
     fix-arm-macro.patch
     fix-arm64-version_rc.patch # https://sourceforge.net/p/pthreads4w/code/merge-requests/6/
+    fix-pthread_getname_np.patch
+    fix-install.patch
+    whitespace_in_path.patch
     ${PATCH_FILES}
 )
 
diff --git a/external_imported/vcpkg/ports/pthreads/vcpkg.json b/external_imported/vcpkg/ports/pthreads/vcpkg.json
index 127ddf938..40c9c9793 100644
--- a/external_imported/vcpkg/ports/pthreads/vcpkg.json
+++ b/external_imported/vcpkg/ports/pthreads/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "pthreads",
   "version": "3.0.0",
-  "port-version": 13,
+  "port-version": 14,
   "description": "Meta-package that provides PThreads4W on Windows, or assumes presence of system pthreads on POSIX systems.",
   "homepage": "https://sourceforge.net/projects/pthreads4w/",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/pthreads/whitespace_in_path.patch b/external_imported/vcpkg/ports/pthreads/whitespace_in_path.patch
new file mode 100644
index 000000000..77a24c1cb
--- /dev/null
+++ b/external_imported/vcpkg/ports/pthreads/whitespace_in_path.patch
@@ -0,0 +1,27 @@
+--- a/Makefile	Sat Apr 29 09:21:07 2023
++++ b/Makefile	Sat Apr 29 09:19:07 2023
+@@ -223,15 +223,15 @@
+ 
+ # Very basic install. It assumes "realclean" was done just prior to build target.
+ install:
+-	if not exist $(DLLDEST) mkdir $(DLLDEST)
+-	if not exist $(LIBDEST) mkdir $(LIBDEST)
+-	if not exist $(HDRDEST) mkdir $(HDRDEST)
+-	if exist pthreadV*.dll copy pthreadV*.dll $(DLLDEST)
+-	if exist pthreadV*.lib copy pthreadV*.lib $(LIBDEST)
+-	copy _ptw32.h $(HDRDEST)
+-	copy pthread.h $(HDRDEST)
+-	copy sched.h $(HDRDEST)
+-	copy semaphore.h $(HDRDEST)
++	if not exist "$(DLLDEST)" mkdir "$(DLLDEST)"
++	if not exist "$(LIBDEST)" mkdir "$(LIBDEST)"
++	if not exist "$(HDRDEST)" mkdir "$(HDRDEST)"
++	if exist pthreadV*.dll copy pthreadV*.dll "$(DLLDEST)"
++	if exist pthreadV*.lib copy pthreadV*.lib "$(LIBDEST)"
++	copy _ptw32.h "$(HDRDEST)"
++	copy pthread.h "$(HDRDEST)"
++	copy sched.h "$(HDRDEST)"
++	copy semaphore.h "$(HDRDEST)"
+ 
+ $(DLLS): $(DLL_OBJS)
+ 	$(CC) /LDd /Zi $(DLL_OBJS) /link /implib:$*.lib $(XLIBS) /out:$@
diff --git a/external_imported/vcpkg/ports/pugixml/portfile.cmake b/external_imported/vcpkg/ports/pugixml/portfile.cmake
index 498c86f51..5f32c2cf3 100644
--- a/external_imported/vcpkg/ports/pugixml/portfile.cmake
+++ b/external_imported/vcpkg/ports/pugixml/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO zeux/pugixml
-    REF a0e064336317c9347a91224112af9933598714e9 #v1.13.0
-    SHA512 9fe2285215520b6ac5f832d457bdfedcf183787a7058bb970a20ea7ca111e1afd864f5b90a4810c79470afefc55c0199febf04d1600634c1ffdbbe000ef6e1df
+    REF "v${VERSION}"
+    SHA512 730d203829eb24d6e1c873f9b921ae97cf7a157fd45504151bc2e61adea5c536eaf33ff38c5ad61629b54a6686135ff1834a61102b4660fbb9ead4ecf20dfd34
     HEAD_REF master
 )
 
@@ -14,9 +14,9 @@ vcpkg_cmake_configure(
 
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/pugixml)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
 vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
diff --git a/external_imported/vcpkg/ports/pugixml/vcpkg.json b/external_imported/vcpkg/ports/pugixml/vcpkg.json
index 3eafc0a78..4f81e3a62 100644
--- a/external_imported/vcpkg/ports/pugixml/vcpkg.json
+++ b/external_imported/vcpkg/ports/pugixml/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "pugixml",
-  "version": "1.13.0",
+  "version": "1.14",
   "description": "Light-weight, simple and fast XML parser for C++ with XPath support",
   "homepage": "https://github.com/zeux/pugixml",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/pulsar-client-cpp/0001-use-find-package.patch b/external_imported/vcpkg/ports/pulsar-client-cpp/0001-use-find-package.patch
new file mode 100644
index 000000000..3138706a3
--- /dev/null
+++ b/external_imported/vcpkg/ports/pulsar-client-cpp/0001-use-find-package.patch
@@ -0,0 +1,82 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fb4f1b1..1bcfd47 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -96,6 +96,7 @@ if (APPLE AND NOT LINK_STATIC)
+ else ()
+     set(LATEST_PROTOBUF FALSE)
+ endif ()
++set(LATEST_PROTOBUF FALSE)
+
+ if (NOT CMAKE_CXX_STANDARD)
+     if (LATEST_PROTOBUF)
+@@ -157,14 +158,15 @@ if (LATEST_PROTOBUF)
+     # Use Config mode to avoid FindProtobuf.cmake does not find the Abseil library
+     find_package(Protobuf REQUIRED CONFIG)
+ else ()
+-    find_package(Protobuf REQUIRED)
++    find_package(protobuf CONFIG REQUIRED)
++    set(Protobuf_LIBRARIES protobuf::libprotobuf)
+ endif ()
+ message("Protobuf_INCLUDE_DIRS: " ${Protobuf_INCLUDE_DIRS})
+ message("Protobuf_LIBRARIES: " ${Protobuf_LIBRARIES})
+
+ # NOTE: CMake might not find curl and zlib on some platforms like Ubuntu, in this case, find them manually
+ set(CURL_NO_CURL_CMAKE ON)
+-find_package(curl QUIET)
++find_package(CURL REQUIRED)
+ if (NOT CURL_FOUND)
+     find_path(CURL_INCLUDE_DIRS NAMES curl/curl.h)
+     find_library(CURL_LIBRARIES NAMES curl curllib libcurl_imp curllib_static libcurl)
+@@ -175,7 +177,7 @@ if (NOT CURL_INCLUDE_DIRS OR NOT CURL_LIBRARIES)
+     message(FATAL_ERROR "Could not find libcurl")
+ endif ()
+
+-find_package(zlib QUIET)
++find_package(ZLIB REQUIRED)
+ if (NOT ZLIB_FOUND)
+     find_path(ZLIB_INCLUDE_DIRS NAMES zlib.h)
+     find_library(ZLIB_LIBRARIES NAMES z zlib zdll zlib1 zlibstatic)
+@@ -226,6 +228,17 @@ elseif (LINK_STATIC AND VCPKG_TRIPLET)
+     if (LIB_SNAPPY)
+         message(STATUS "Found Snappy library: ${LIB_SNAPPY}")
+     endif ()
++elseif (1)
++    find_package(zstd CONFIG REQUIRED)
++    set(HAS_ZSTD 1)
++    set(LIB_ZSTD
++        $<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>)
++    find_package(Snappy CONFIG REQUIRED)
++    set(HAS_SNAPPY 1)
++    set(LIB_SNAPPY Snappy::snappy)
++    if (MSVC)
++        find_package(dlfcn-win32 CONFIG REQUIRED)
++    endif ()
+ else()
+     if (MSVC AND (${CMAKE_BUILD_TYPE} STREQUAL Debug))
+         find_library(LIB_ZSTD zstdd HINTS "${VCPKG_DEBUG_ROOT}/lib")
+diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
+index 8bd9749..551ac0c 100644
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -31,12 +31,14 @@ include_directories(${LIB_AUTOGEN_DIR})
+ # Using custom command for now
+ set(PROTO_SOURCES ${LIB_AUTOGEN_DIR}/PulsarApi.pb.cc ${LIB_AUTOGEN_DIR}/PulsarApi.pb.h)
+ set(PULSAR_SOURCES ${PULSAR_SOURCES} ${PROTO_SOURCES})
+-ADD_CUSTOM_COMMAND(
+-         OUTPUT ${PROTO_SOURCES}
+-         COMMAND ${PROTOC_PATH} -I ../proto ../proto/PulsarApi.proto --cpp_out=${LIB_AUTOGEN_DIR}
+-         DEPENDS
+-         ../proto/PulsarApi.proto
+-         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
++
++add_library(proto-objects OBJECT "${CMAKE_SOURCE_DIR}/proto/PulsarApi.proto")
++target_link_libraries(proto-objects PUBLIC protobuf::libprotobuf)
++target_include_directories(proto-objects PUBLIC "${LIB_AUTOGEN_DIR}")
++protobuf_generate(
++    TARGET proto-objects
++    IMPORT_DIRS "${CMAKE_SOURCE_DIR}/proto"
++    PROTOC_OUT_DIR "${LIB_AUTOGEN_DIR}")
+
+ set(LIBRARY_VERSION $ENV{PULSAR_LIBRARY_VERSION})
+ if (NOT LIBRARY_VERSION)
diff --git a/external_imported/vcpkg/ports/pulsar-client-cpp/portfile.cmake b/external_imported/vcpkg/ports/pulsar-client-cpp/portfile.cmake
new file mode 100644
index 000000000..595d73e3a
--- /dev/null
+++ b/external_imported/vcpkg/ports/pulsar-client-cpp/portfile.cmake
@@ -0,0 +1,41 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO apache/pulsar-client-cpp
+    REF "v${VERSION}"
+    SHA512 b1f56ca8d5edb7faaba68eb4e04fcb4e458ccf2c7a5b0fb6d66868c6507081344fb3f0ebb29afe9aef567295a249b09cdeb3fb00285746767bbccef65a0f6e70
+    HEAD_REF main
+    PATCHES
+      0001-use-find-package.patch
+)
+
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIB)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_DYNAMIC_LIB)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_TESTS=OFF
+        -DBUILD_PERF_TOOLS=OFF
+        -DBUILD_DYNAMIC_LIB=${BUILD_DYNAMIC_LIB}
+        -DBUILD_STATIC_LIB=${BUILD_STATIC_LIB}
+)
+
+vcpkg_cmake_install()
+
+if (BUILD_STATIC_LIB)
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/pulsar/defines.h"
+        "#ifdef PULSAR_STATIC"
+        "#if 1")
+endif ()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY)
+
+configure_file("${CMAKE_CURRENT_LIST_DIR}/unofficial-pulsar-config.cmake" "${CURRENT_PACKAGES_DIR}/share/unofficial-pulsar/unofficial-pulsar-config.cmake" @ONLY)
+
+vcpkg_copy_pdbs()
diff --git a/external_imported/vcpkg/ports/pulsar-client-cpp/unofficial-pulsar-config.cmake b/external_imported/vcpkg/ports/pulsar-client-cpp/unofficial-pulsar-config.cmake
new file mode 100644
index 000000000..3ae79afaf
--- /dev/null
+++ b/external_imported/vcpkg/ports/pulsar-client-cpp/unofficial-pulsar-config.cmake
@@ -0,0 +1,84 @@
+if (NOT TARGET unofficial::pulsar::pulsar)
+    get_filename_component(VCPKG_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+    get_filename_component(VCPKG_IMPORT_PREFIX "${VCPKG_IMPORT_PREFIX}" PATH)
+    get_filename_component(VCPKG_IMPORT_PREFIX "${VCPKG_IMPORT_PREFIX}" PATH)
+
+    find_path(_pulsar_include_dir NAMES "pulsar/Client.h" PATHS "${VCPKG_IMPORT_PREFIX}/include" NO_DEFAULT_PATH)
+    find_library(_pulsar_library_release NAMES pulsar pulsar-static PATHS "${VCPKG_IMPORT_PREFIX}/lib" NO_DEFAULT_PATH)
+    find_library(_pulsar_library_debug NAMES pulsar pulsar-static PATHS "${VCPKG_IMPORT_PREFIX}/debug/lib" NO_DEFAULT_PATH)
+    message(STATUS "Found _pulsar_library_release: ${_pulsar_library_release}")
+    message(STATUS "Found _pulsar_library_debug: ${_pulsar_library_debug}")
+    if (NOT _pulsar_include_dir OR NOT _pulsar_library_release)
+        message(FATAL_ERROR "Broken installation of vcpkg port pulsar-client-cpp")
+    endif ()
+
+    if (MSVC AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "dynamic")
+        find_file(_pulsar_release_dll NAMES "pulsar.dll" PATHS "${VCPKG_IMPORT_PREFIX}/bin" NO_DEFAULT_PATH)
+        find_file(_pulsar_debug_dll NAMES "pulsar.dll" PATHS "${VCPKG_IMPORT_PREFIX}/debug/bin" NO_DEFAULT_PATH)
+        if (NOT _pulsar_release_dll)
+            message(FATAL_ERROR "No pulsar.dll found")
+        endif ()
+        message(STATUS "Found _pulsar_release_dll: ${_pulsar_release_dll}")
+        message(STATUS "Found _pulsar_debug_dll: ${_pulsar_debug_dll}")
+    endif ()
+
+    # When CMAKE_BUILD_TYPE is not specified, debug libraries will be found for dependencies except ZLIB.
+    # So set it with Debug here to link debug ZLIB library by default.
+    if (NOT CMAKE_BUILD_TYPE)
+        set(CMAKE_BUILD_TYPE Debug)
+    endif ()
+
+    include(CMakeFindDependencyMacro)
+    find_dependency(OpenSSL)
+    find_dependency(ZLIB)
+    find_dependency(protobuf CONFIG)
+    find_dependency(CURL CONFIG)
+    find_dependency(zstd CONFIG)
+    find_dependency(Snappy CONFIG)
+    if (MSVC)
+        find_dependency(dlfcn-win32 CONFIG)
+    endif ()
+
+    if (_pulsar_release_dll)
+        add_library(unofficial::pulsar::pulsar SHARED IMPORTED)
+        set_target_properties(unofficial::pulsar::pulsar PROPERTIES
+            IMPORTED_CONFIGURATIONS "RELEASE"
+            IMPORTED_IMPLIB_RELEASE "${_pulsar_library_release}"
+            IMPORTED_LOCATION_RELEASE "${_pulsar_release_dll}")
+        if (_pulsar_debug_dll)
+            set_target_properties(unofficial::pulsar::pulsar PROPERTIES
+                IMPORTED_CONFIGURATIONS "DEBUG;RELEASE"
+                IMPORTED_IMPLIB_DEBUG "${_pulsar_library_debug}"
+                IMPORTED_LOCATION_DEBUG "${_pulsar_debug_dll}")
+            unset(_pulsar_debug_dll CACHE)
+        endif ()
+        unset(_pulsar_release_dll CACHE)
+    else ()
+        add_library(unofficial::pulsar::pulsar UNKNOWN IMPORTED)
+        set_target_properties(unofficial::pulsar::pulsar PROPERTIES
+            IMPORTED_CONFIGURATIONS "RELEASE"
+            IMPORTED_LOCATION_RELEASE "${_pulsar_library_release}")
+        if (_pulsar_library_debug)
+            set_target_properties(unofficial::pulsar::pulsar PROPERTIES
+                IMPORTED_CONFIGURATIONS "DEBUG;RELEASE"
+                IMPORTED_LOCATION_DEBUG "${_pulsar_library_debug}")
+            unset(_pulsar_library_debug CACHE)
+        endif ()
+    endif ()
+    set_target_properties(unofficial::pulsar::pulsar PROPERTIES
+        INTERFACE_INCLUDE_DIRECTORIES "${_pulsar_include_dir}")
+    target_link_libraries(unofficial::pulsar::pulsar INTERFACE
+        OpenSSL::SSL
+        OpenSSL::Crypto
+        ZLIB::ZLIB
+        protobuf::libprotobuf
+        CURL::libcurl
+        $<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>
+        Snappy::snappy
+        )
+    if (MSVC)
+        target_link_libraries(unofficial::pulsar::pulsar INTERFACE dlfcn-win32::dl)
+    endif ()
+    unset(_pulsar_library_release CACHE)
+    unset(_pulsar_include_dir CACHE)
+endif ()
diff --git a/external_imported/vcpkg/ports/pulsar-client-cpp/usage b/external_imported/vcpkg/ports/pulsar-client-cpp/usage
new file mode 100644
index 000000000..474d73f16
--- /dev/null
+++ b/external_imported/vcpkg/ports/pulsar-client-cpp/usage
@@ -0,0 +1,4 @@
+pulsar-client-cpp provides CMake targets:
+
+  find_package(unofficial-pulsar CONFIG REQUIRED)
+  target_link_libraries(main PRIVATE unofficial::pulsar::pulsar)
diff --git a/external_imported/vcpkg/ports/pulsar-client-cpp/vcpkg.json b/external_imported/vcpkg/ports/pulsar-client-cpp/vcpkg.json
new file mode 100644
index 000000000..7ef662ccc
--- /dev/null
+++ b/external_imported/vcpkg/ports/pulsar-client-cpp/vcpkg.json
@@ -0,0 +1,50 @@
+{
+  "name": "pulsar-client-cpp",
+  "version": "3.4.2",
+  "port-version": 2,
+  "description": "The Apache Pulsar C++ library",
+  "homepage": "https://github.com/apache/pulsar-client-cpp",
+  "license": "Apache-2.0",
+  "supports": "!(arm & windows) & !android",
+  "dependencies": [
+    "boost-accumulators",
+    "boost-algorithm",
+    "boost-any",
+    "boost-asio",
+    "boost-circular-buffer",
+    "boost-date-time",
+    "boost-format",
+    "boost-predef",
+    "boost-property-tree",
+    "boost-random",
+    "boost-serialization",
+    "boost-xpressive",
+    {
+      "name": "curl",
+      "default-features": false,
+      "features": [
+        "openssl"
+      ]
+    },
+    {
+      "name": "dlfcn-win32",
+      "platform": "windows"
+    },
+    "openssl",
+    {
+      "name": "protobuf",
+      "version>=": "3.21.12"
+    },
+    "snappy",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    "zlib",
+    "zstd"
+  ]
+}
diff --git a/external_imported/vcpkg/ports/pulzed-mini/portfile.cmake b/external_imported/vcpkg/ports/pulzed-mini/portfile.cmake
new file mode 100644
index 000000000..406f0e1b9
--- /dev/null
+++ b/external_imported/vcpkg/ports/pulzed-mini/portfile.cmake
@@ -0,0 +1,12 @@
+# Header-only library
+vcpkg_from_github(
+  OUT_SOURCE_PATH SOURCE_PATH
+  REPO pulzed/mINI
+  REF ${VERSION}
+  SHA512 af29b0e59a2bed460a3a4e071932e0c01c017a57643c9414d360e17aa643bce476dc2941760a0cd904ec24483e67ee7f0df6029dc79254052c6c3c1d0941d4d0
+  HEAD_REF master
+)
+
+file(INSTALL "${SOURCE_PATH}/src/mini/ini.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/mini")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/pulzed-mini/vcpkg.json b/external_imported/vcpkg/ports/pulzed-mini/vcpkg.json
new file mode 100644
index 000000000..da79a0771
--- /dev/null
+++ b/external_imported/vcpkg/ports/pulzed-mini/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "pulzed-mini",
+  "version": "0.9.14",
+  "description": "INI file reader and writer",
+  "homepage": "https://github.com/pulzed/mINI",
+  "license": "MIT"
+}
diff --git a/external_imported/vcpkg/ports/pybind11/fix-debug-link.patch b/external_imported/vcpkg/ports/pybind11/fix-debug-link.patch
new file mode 100644
index 000000000..15d13b291
--- /dev/null
+++ b/external_imported/vcpkg/ports/pybind11/fix-debug-link.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0d93203..031088a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -196,6 +196,7 @@ if(NOT TARGET pybind11_headers)
+ 
+   target_compile_features(pybind11_headers INTERFACE cxx_inheriting_constructors cxx_user_literals
+                                                      cxx_right_angle_brackets)
++  target_compile_definitions (pybind11_headers INTERFACE $<$<CONFIG:Debug>:Py_DEBUG>)
+   if(NOT "${PYBIND11_INTERNALS_VERSION}" STREQUAL "")
+     target_compile_definitions(
+       pybind11_headers INTERFACE "PYBIND11_INTERNALS_VERSION=${PYBIND11_INTERNALS_VERSION}")
diff --git a/external_imported/vcpkg/ports/pybind11/portfile.cmake b/external_imported/vcpkg/ports/pybind11/portfile.cmake
index 515669e1c..2c18dbb7e 100644
--- a/external_imported/vcpkg/ports/pybind11/portfile.cmake
+++ b/external_imported/vcpkg/ports/pybind11/portfile.cmake
@@ -2,19 +2,18 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO pybind/pybind11
     REF "v${VERSION}"
-    SHA512 3894400f04cd08e2dbb14b3d696339f0364434f1d6f8bb057338ac88157ec7491b2df1e1e46ebd5abccdcd5775c5e9238de6404f0db87f64f5a1802db3a5b18c
+    SHA512 ed1512ff0bca3bc0a45edc2eb8c77f8286ab9389f6ff1d5cb309be24bc608abbe0df6a7f5cb18c8f80a3bfa509058547c13551c3cd6a759af708fd0cdcdd9e95
     HEAD_REF master
+    PATCHES
+        fix-debug-link.patch
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DPYBIND11_TEST=OFF
-        -DPYBIND11_FINDPYTHON=ON
-    OPTIONS_RELEASE
-        -DPYTHON_IS_DEBUG=OFF
-    OPTIONS_DEBUG
-        -DPYTHON_IS_DEBUG=ON
+        # Disable all Python searching, Python required only for tests
+        -DPYBIND11_NOPYTHON=ON
 )
 
 vcpkg_cmake_install()
@@ -23,8 +22,5 @@ vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/")
 
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/pybind11/pybind11Tools.cmake" 
-                    [=[find_package(PythonLibsNew ${PYBIND11_PYTHON_VERSION} MODULE REQUIRED ${_pybind11_quiet})]=]
-                    [=[find_package(PythonLibs ${PYBIND11_PYTHON_VERSION} MODULE REQUIRED ${_pybind11_quiet})]=]) # CMake's PythonLibs works better with vcpkg 
-
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/pybind11/usage b/external_imported/vcpkg/ports/pybind11/usage
new file mode 100644
index 000000000..39f9166e1
--- /dev/null
+++ b/external_imported/vcpkg/ports/pybind11/usage
@@ -0,0 +1,23 @@
+pybind11 provides CMake targets. There are two modes provided; classic, which is built on the old Python
+discovery packages in CMake, or the new FindPython mode, which uses FindPython
+from 3.12+ forward (3.15+ _highly_ recommended).
+
+New FindPython mode:
+
+    find_package(Python COMPONENTS Interpreter Development)
+    find_package(pybind11 CONFIG)
+
+    # pybind11 method:
+    pybind11_add_module(MyModule1 src1.cpp)
+
+    # Python method:
+    Python_add_library(MyModule2 src2.cpp)
+    target_link_libraries(MyModule2 pybind11::headers)
+    set_target_properties(MyModule2 PROPERTIES
+        INTERPROCEDURAL_OPTIMIZATION ON
+        CXX_VISIBILITY_PRESET ON
+        VISIBILITY_INLINES_HIDDEN ON
+    )
+
+For more information see here:
+    https://pybind11.readthedocs.io/en/latest/compiling.html#building-with-cmake
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/pybind11/vcpkg.json b/external_imported/vcpkg/ports/pybind11/vcpkg.json
index 4edd356aa..b9fea48f8 100644
--- a/external_imported/vcpkg/ports/pybind11/vcpkg.json
+++ b/external_imported/vcpkg/ports/pybind11/vcpkg.json
@@ -1,12 +1,11 @@
 {
   "name": "pybind11",
-  "version": "2.10.3",
+  "version": "2.11.1",
   "description": "pybind11 is a lightweight header-only library that exposes C++ types in Python and vice versa, mainly to create Python bindings of existing C++ code",
   "homepage": "https://github.com/pybind/pybind11",
   "license": "BSD-3-Clause",
   "supports": "!(arm & windows)",
   "dependencies": [
-    "python3",
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/external_imported/vcpkg/ports/python2/portfile.cmake b/external_imported/vcpkg/ports/python2/portfile.cmake
index 227ffed41..a82280307 100644
--- a/external_imported/vcpkg/ports/python2/portfile.cmake
+++ b/external_imported/vcpkg/ports/python2/portfile.cmake
@@ -15,29 +15,29 @@ set(PYTHON_VERSION        ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.${PYTH
 set(_PYTHON_PATCHES "")
 if (VCPKG_TARGET_IS_WINDOWS)
     list(APPEND _PYTHON_PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/001-build-msvc.patch
-        ${CMAKE_CURRENT_LIST_DIR}/002-build-msvc.patch
-        ${CMAKE_CURRENT_LIST_DIR}/003-build-msvc.patch
+        "${CMAKE_CURRENT_LIST_DIR}/001-build-msvc.patch"
+        "${CMAKE_CURRENT_LIST_DIR}/002-build-msvc.patch"
+        "${CMAKE_CURRENT_LIST_DIR}/003-build-msvc.patch"
     )
 endif()
 
 if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
     list(APPEND _PYTHON_PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/004-static-library-msvc.patch
-        ${CMAKE_CURRENT_LIST_DIR}/006-static-fix-headers.patch
+        "${CMAKE_CURRENT_LIST_DIR}/004-static-library-msvc.patch"
+        "${CMAKE_CURRENT_LIST_DIR}/006-static-fix-headers.patch"
     )
 endif()
 if (VCPKG_CRT_LINKAGE STREQUAL static)
-    list(APPEND _PYTHON_PATCHES ${CMAKE_CURRENT_LIST_DIR}/005-static-crt-msvc.patch)
+    list(APPEND _PYTHON_PATCHES "${CMAKE_CURRENT_LIST_DIR}/005-static-crt-msvc.patch")
 endif()
 
 if (VCPKG_TARGET_IS_WINDOWS)
     list(APPEND _PYTHON_PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/007-fix-build-path.patch
+        "${CMAKE_CURRENT_LIST_DIR}/007-fix-build-path.patch"
     )
 else()
     list(APPEND _PYTHON_PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/008-bz2d.patch
+        "${CMAKE_CURRENT_LIST_DIR}/008-bz2d.patch"
     )
 endif()
 
@@ -48,9 +48,9 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 a7bb62b51f48ff0b6df0b18f5b0312a523e3110f49c3237936bfe56ed0e26838c0274ff5401bda6fc21bf24337477ccac49e8026c5d651e4b4cafb5eb5086f6c
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
+vcpkg_extract_source_archive(
+    SOURCE_PATH
+    ARCHIVE "${ARCHIVE}"
     PATCHES ${_PYTHON_PATCHES}
 )
 
@@ -67,27 +67,32 @@ if (VCPKG_TARGET_IS_WINDOWS)
         message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}")
     endif()
     
-    vcpkg_build_msbuild(
-        PROJECT_PATH ${SOURCE_PATH}/PCBuild/pythoncore.vcxproj
+ vcpkg_msbuild_install(
+        SOURCE_PATH "${SOURCE_PATH}"
+        PROJECT_SUBPATH "PCBuild/pythoncore.vcxproj"
         PLATFORM ${BUILD_ARCH}
     )
 
     vcpkg_copy_pdbs()
     
-    file(GLOB HEADERS ${SOURCE_PATH}/Include/*.h)
-    file(COPY ${HEADERS} ${SOURCE_PATH}/PC/pyconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
+    file(GLOB HEADERS "${SOURCE_PATH}/Include/*.h")
+    file(COPY ${HEADERS} "${SOURCE_PATH}/PC/pyconfig.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
     
-    file(COPY ${SOURCE_PATH}/Lib DESTINATION ${CURRENT_PACKAGES_DIR}/share/python${PYTHON_VERSION_MAJOR})
+    file(COPY "${SOURCE_PATH}/Lib" DESTINATION "${CURRENT_PACKAGES_DIR}/share/python${PYTHON_VERSION_MAJOR}")
     
-    file(COPY ${SOURCE_PATH}/PCBuild/${OUT_DIR}/python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-    file(COPY ${SOURCE_PATH}/PCBuild/${OUT_DIR}/python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_d.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+    file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/PCBuild/${OUT_DIR}/python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
+    if(NOT VCPKG_BUILD_TYPE)
+      file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/PCBuild/${OUT_DIR}/python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_d.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
+    endif()
     if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-        file(COPY ${SOURCE_PATH}/PCBuild/${OUT_DIR}/python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
-        file(COPY ${SOURCE_PATH}/PCBuild/${OUT_DIR}/python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_d.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
+        file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/PCBuild/${OUT_DIR}/python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
+        if(NOT VCPKG_BUILD_TYPE)
+          file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/PCBuild/${OUT_DIR}/python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_d.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
+        endif()
     endif()
 else()
     vcpkg_configure_make(
-        SOURCE_PATH ${SOURCE_PATH}
+        SOURCE_PATH "${SOURCE_PATH}"
     )
     
     vcpkg_install_make()
@@ -147,6 +152,4 @@ if (NOT VCPKG_TARGET_IS_WINDOWS)
     endforeach()
 endif()
 
-# Handle copyright
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/python${PYTHON_VERSION_MAJOR})
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/python${PYTHON_VERSION_MAJOR}/LICENSE ${CURRENT_PACKAGES_DIR}/share/python${PYTHON_VERSION_MAJOR}/copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/python2/vcpkg.json b/external_imported/vcpkg/ports/python2/vcpkg.json
index ce26b439f..efd3c6db8 100644
--- a/external_imported/vcpkg/ports/python2/vcpkg.json
+++ b/external_imported/vcpkg/ports/python2/vcpkg.json
@@ -1,9 +1,16 @@
 {
   "name": "python2",
   "version": "2.7.18",
-  "port-version": 5,
+  "port-version": 7,
   "description": "The Python programming language as an embeddable library",
   "homepage": "https://www.python.org",
   "license": "Python-2.0",
-  "supports": "!(arm & osx) & !(arm & windows) & !uwp"
+  "supports": "!(arm & osx) & !(arm & windows) & !uwp",
+  "dependencies": [
+    {
+      "name": "vcpkg-msbuild",
+      "host": true,
+      "platform": "windows"
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/python3/0001-only-build-required-projects.patch b/external_imported/vcpkg/ports/python3/0001-only-build-required-projects.patch
index 952f8daeb..1c9f047d4 100644
--- a/external_imported/vcpkg/ports/python3/0001-only-build-required-projects.patch
+++ b/external_imported/vcpkg/ports/python3/0001-only-build-required-projects.patch
@@ -26,7 +26,7 @@ diff --git a/PCbuild/pcbuild.proj b/PCbuild/pcbuild.proj
 index 4d416c589e..ede9868a8f 100644
 --- a/PCbuild/pcbuild.proj
 +++ b/PCbuild/pcbuild.proj
-@@ -49,17 +49,17 @@
+@@ -60,17 +60,17 @@
      <!-- python3.dll -->
      <Projects Include="python3dll.vcxproj" />
      <!-- py[w].exe -->
@@ -49,7 +49,7 @@ index 4d416c589e..ede9868a8f 100644
 +    <!-- _ssl will NOT build _socket as well -->
 +    <ExtensionModules Include="_socket" Condition="true" />
 +    <ExternalModules Include="_ssl;_hashlib" Condition="true" />
-     <ExternalModules Include="_tkinter" Condition="$(IncludeTkinter) and $(Platform) != 'ARM' and $(Platform) != 'ARM64'" />
+     <ExternalModules Include="_tkinter" Condition="$(IncludeTkinter)" />
      <ExtensionModules Include="@(ExternalModules->'%(Identity)')" Condition="$(IncludeExternals)" />
      <Projects Include="@(ExtensionModules->'%(Identity).vcxproj')" Condition="$(IncludeExtensions)" />
 -- 
diff --git a/external_imported/vcpkg/ports/python3/0002-static-library.patch b/external_imported/vcpkg/ports/python3/0002-static-library.patch
index bf40a2de1..10bb2c0c7 100644
--- a/external_imported/vcpkg/ports/python3/0002-static-library.patch
+++ b/external_imported/vcpkg/ports/python3/0002-static-library.patch
@@ -9,19 +9,38 @@ builds the pythoncore as a static library instead of a DLL
  PCbuild/pythoncore.vcxproj | 4 ++--
  2 files changed, 11 insertions(+), 2 deletions(-)
 
+diff --git a/Modules/getpath.c b/Modules/getpath.c
+index d7d3cf081e..34269f0b75 100644
+--- a/Modules/getpath.c
++++ b/Modules/getpath.c
+@@ -801,10 +801,12 @@ static int
+ library_to_dict(PyObject *dict, const char *key)
+ {
+ #ifdef MS_WINDOWS
++#ifdef Py_ENABLE_SHARED
+     extern HMODULE PyWin_DLLhModule;
+     if (PyWin_DLLhModule) {
+         return winmodule_to_dict(dict, key, PyWin_DLLhModule);
+     }
++#endif
+ #elif defined(WITH_NEXT_FRAMEWORK)
+     static char modPath[MAXPATHLEN + 1];
+     static int modPathInitialized = -1;
 diff --git a/PC/pyconfig.h b/PC/pyconfig.h
 index d7d3cf081e..34269f0b75 100644
 --- a/PC/pyconfig.h
 +++ b/PC/pyconfig.h
-@@ -251,6 +251,7 @@ typedef int pid_t;
+@@ -251,6 +251,9 @@ typedef int pid_t;
  
  /* For Windows the Python core is in a DLL by default.  Test
  Py_NO_ENABLE_SHARED to find out.  Also support MS_NO_COREDLL for b/w compat */
++#ifndef Py_NO_ENABLE_SHARED
 +#define Py_NO_ENABLE_SHARED
++#endif
  #if !defined(MS_NO_COREDLL) && !defined(Py_NO_ENABLE_SHARED)
  #       define Py_ENABLE_SHARED 1 /* standard symbol for shared library */
  #       define MS_COREDLL       /* deprecated old symbol */
-@@ -276,6 +277,14 @@ Py_NO_ENABLE_SHARED to find out.  Also support MS_NO_COREDLL for b/w compat */
+@@ -276,6 +277,15 @@ Py_NO_ENABLE_SHARED to find out.  Also support MS_NO_COREDLL for b/w compat */
  #                       endif /* _DEBUG */
  #               endif /* _MSC_VER */
  #       endif /* Py_BUILD_CORE */
@@ -30,6 +49,7 @@ index d7d3cf081e..34269f0b75 100644
 +#       pragma comment(lib, "version.lib")
 +#       pragma comment(lib, "shlwapi.lib")
 +#       pragma comment(lib, "ws2_32.lib")
++#       pragma comment(lib, "bcrypt.lib")
 +#       if Py_WINVER > 0x0601
 +#           pragma comment(lib, "pathcch.lib")
 +#       endif /* Py_WINVER */
@@ -71,6 +91,49 @@ index 2625d0293d..2f8bdaa931 100644
        <PreprocessorDefinitions Condition="$(IncludeExternals)">_Py_HAVE_ZLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      </ClCompile>
      <Link>
+diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
+index 2625d0293d..2f8bdaa931 100644
+--- a/PCbuild/_freeze_module.vcxproj
++++ b/PCbuild/_freeze_module.vcxproj
+@@ -88,7 +88,7 @@
+   <PropertyGroup Label="UserMacros" />
+   <ItemDefinitionGroup>
+     <ClCompile>
+-      <PreprocessorDefinitions>Py_NO_ENABLE_SHARED;Py_BUILD_CORE;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <PreprocessorDefinitions>Py_NO_ENABLE_SHARED;Py_BUILD_CORE;_CONSOLE;MS_DLL_ID="$(SysWinVer)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+       <Optimization>Disabled</Optimization>
+       <WholeProgramOptimization>false</WholeProgramOptimization>
+     </ClCompile>
+diff --git a/Python/dynload_win.c b/Python/dynload_win.c
+index ac49f7867a..f3583345ff 100644
+--- a/Python/dynload_win.c
++++ b/Python/dynload_win.c
+@@ -163,6 +163,7 @@ static char *GetPythonImport (HINSTANCE hModule)
+     return NULL;
+ }
+ 
++#ifdef Py_ENABLE_SHARED
+ /* Load python3.dll before loading any extension module that might refer
+    to it. That way, we can be sure that always the python3.dll corresponding
+    to this python DLL is loaded, not a python3.dll that might be on the path
+@@ -216,6 +217,7 @@ _Py_CheckPython3(void)
+     return hPython3 != NULL;
+     #undef MAXPATHLEN
+ }
++#endif /* Py_ENABLE_SHARED */
+ 
+ dl_funcptr _PyImport_FindSharedFuncptrWindows(const char *prefix,
+                                               const char *shortname,
+@@ -224,7 +226,9 @@ dl_funcptr _PyImport_FindSharedFuncptrWindows(const char *prefix,
+     dl_funcptr p;
+     char funcname[258], *import_python;
+ 
++#ifdef Py_ENABLE_SHARED
+     _Py_CheckPython3();
++#endif /* Py_ENABLE_SHARED */
+ 
+ #if USE_UNICODE_WCHAR_CACHE
+     const wchar_t *wpathname = _PyUnicode_AsUnicode(pathname);
 diff --git a/Python/sysmodule.c b/Python/sysmodule.c
 index ac49f7867a..f3583345ff 100644
 --- a/Python/sysmodule.c
diff --git a/external_imported/vcpkg/ports/python3/0003-use-vcpkg-zlib.patch b/external_imported/vcpkg/ports/python3/0003-use-vcpkg-zlib.patch
index 2f619949a..af0b4fa80 100644
--- a/external_imported/vcpkg/ports/python3/0003-use-vcpkg-zlib.patch
+++ b/external_imported/vcpkg/ports/python3/0003-use-vcpkg-zlib.patch
@@ -13,9 +13,9 @@ diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
 index dbe236829a..5f30a35eb3 100644
 --- a/PCbuild/pythoncore.vcxproj
 +++ b/PCbuild/pythoncore.vcxproj
-@@ -507,8 +507,10 @@
-     <ClCompile Include="..\Python\thread.c" />
-     <ClCompile Include="..\Python\traceback.c" />
+@@ -540,8 +540,10 @@
+     <ClCompile Include="..\Python\deepfreeze\deepfreeze.c" />
+     <!-- END deepfreeze -->
    </ItemGroup>
 -  <ItemGroup Condition="$(IncludeExternals)">
 +  <ItemGroup>
@@ -25,7 +25,7 @@ index dbe236829a..5f30a35eb3 100644
      <ClCompile Include="$(zlibDir)\adler32.c" />
      <ClCompile Include="$(zlibDir)\compress.c" />
      <ClCompile Include="$(zlibDir)\crc32.c" />
-@@ -556,7 +558,7 @@
+@@ -593,7 +595,7 @@
    <Target Name="_WarnAboutToolset" BeforeTargets="PrepareForBuild" Condition="$(PlatformToolset) != 'v140' and $(PlatformToolset) != 'v141' and $(PlatformToolset) != 'v142' and $(PlatformToolset) != 'v143'">
      <Warning Text="Toolset $(PlatformToolset) is not used for official builds. Your build may have errors or incompatibilities." />
    </Target>
diff --git a/external_imported/vcpkg/ports/python3/0004-devendor-external-dependencies.patch b/external_imported/vcpkg/ports/python3/0004-devendor-external-dependencies.patch
index 25e3a1489..ad31c1eea 100644
--- a/external_imported/vcpkg/ports/python3/0004-devendor-external-dependencies.patch
+++ b/external_imported/vcpkg/ports/python3/0004-devendor-external-dependencies.patch
@@ -97,7 +97,7 @@ index b2d9f5d57d..4efb826a05 100644
 -    <ClCompile>
 +    <ClCompile Condition="false">
        <AdditionalIncludeDirectories>$(PySourcePath)Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;PYEXPAT_EXPORTS;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      </ClCompile>
    </ItemDefinitionGroup>
 -  <ItemGroup>
diff --git a/external_imported/vcpkg/ports/python3/0006-restore-support-for-windows-7.patch b/external_imported/vcpkg/ports/python3/0006-restore-support-for-windows-7.patch
index cf8ed0a02..d3aa09e66 100644
--- a/external_imported/vcpkg/ports/python3/0006-restore-support-for-windows-7.patch
+++ b/external_imported/vcpkg/ports/python3/0006-restore-support-for-windows-7.patch
@@ -28,30 +28,113 @@ index 25ddc82..ff51042 100644
  #if defined(MS_WIN32) && !defined(MS_WIN64)
  #define HANDLE_TO_PYNUM(handle) \
      PyLong_FromUnsignedLong((unsigned long) handle)
+diff --git a/Modules/getpath.c b/Modules/getpath.c
+index bc730fc..7d3d559 100644
+--- a/Modules/getpath.c
++++ b/Modules/getpath.c
+@@ -11,7 +11,7 @@
+ 
+ #ifdef MS_WINDOWS
+ #  include <windows.h>            // GetFullPathNameW(), MAX_PATH
+-#  include <pathcch.h>
++#  include <Shlwapi.h>
+ #endif
+ 
+ #ifdef __APPLE__
+@@ -217,6 +217,11 @@ getpath_isfile(PyObject *Py_UNUSED(self), PyObject *args)
+     return r;
+ }
+ 
++#ifdef MS_WINDOWS
++static int _PathCchFindExtension_Initialized = 0;
++typedef HRESULT (__stdcall *PPathCchFindExtension) (PCWSTR pszPath, size_t cchPath, PCWSTR *ppszExt);
++static PPathCchFindExtension _PathCchFindExtension;
++#endif
+ 
+ static PyObject *
+ getpath_isxfile(PyObject *Py_UNUSED(self), PyObject *args)
+@@ -231,13 +235,51 @@ getpath_isxfile(PyObject *Py_UNUSED(self), PyObject *args)
+     path = PyUnicode_AsWideCharString(pathobj, &cchPath);
+     if (path) {
+ #ifdef MS_WINDOWS
++
++        if (_PathCchFindExtension_Initialized == 0) {
++            HMODULE pathapi = LoadLibraryExW(L"api-ms-win-core-path-l1-1-0.dll", NULL,
++                                             LOAD_LIBRARY_SEARCH_SYSTEM32);
++
++            if (pathapi) {
++                _PathCchFindExtension = (PPathCchFindExtension)GetProcAddress(pathapi, "PathCchFindExtension");
++            } else {
++                _PathCchFindExtension = NULL;
++            }
++
++            _PathCchFindExtension_Initialized = 1;
++        }
++
+         const wchar_t *ext;
+         DWORD attr = GetFileAttributesW(path);
+-        r = (attr != INVALID_FILE_ATTRIBUTES) &&
+-            !(attr & FILE_ATTRIBUTE_DIRECTORY) &&
+-            SUCCEEDED(PathCchFindExtension(path, cchPath + 1, &ext)) &&
+-            (CompareStringOrdinal(ext, -1, L".exe", -1, 1 /* ignore case */) == CSTR_EQUAL)
+-            ? Py_True : Py_False;
++        if (attr == INVALID_FILE_ATTRIBUTES || (attr & FILE_ATTRIBUTE_DIRECTORY)) {
++            r = Py_False;
++        }
++        else {
++            HRESULT hr = S_OK;
++            if (_PathCchFindExtension) {
++                hr = _PathCchFindExtension(path, cchPath + 1, &ext);
++            }
++            else {
++                if (cchPath > MAX_PATH) {
++                    hr = E_FAIL;
++                }
++                else {
++                    ext = PathFindExtensionW(path);
++                    if (*ext == '\0')
++                        hr = E_FAIL;
++                }
++            }
++
++            if (!SUCCEEDED(hr)) {
++                r = Py_False;
++            }
++            else if (CompareStringOrdinal(ext, -1, L".exe", -1, 1 /* ignore case */) != CSTR_EQUAL) {
++                r = Py_False;
++            }
++            else {
++                r = Py_True;
++            }
++        }
+ #else
+         struct stat st;
+         r = (_Py_wstat(path, &st) == 0) &&
 diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
 --- a/Modules/posixmodule.c
 +++ b/Modules/posixmodule.c
-@@ -20,7 +20,7 @@
- 
-       FSCTL_GET_REPARSE_POINT is not exported with WIN32_LEAN_AND_MEAN. */
+@@ -15,7 +15,7 @@
+ // whereas pycore_condvar.h defines the WIN32_LEAN_AND_MEAN macro.
+ #ifdef MS_WINDOWS
  #  include <windows.h>
 -#  include <pathcch.h>
 +#  include <Shlwapi.h>
- #endif
- 
- #ifdef __VXWORKS__
-@@ -4410,6 +4410,10 @@ os__getvolumepathname_impl(PyObject *module, path_t *path)
+ #  include <lmcons.h>             // UNLEN
+ #  include "osdefs.h"             // SEP
+ #  define HAVE_SYMLINK
+@@ -4471,6 +4471,11 @@ os__getvolumepathname_impl(PyObject *module, path_t *path)
      return result;
  }
  
++#ifdef MS_WINDOWS
 +static int _PathCchSkipRoot_Initialized = 0;
 +typedef HRESULT (__stdcall *PPathCchSkipRoot) (PCWSTR pszPath, PCWSTR *ppszRootEnd);
 +static PPathCchSkipRoot _PathCchSkipRoot;
-+
-
++#endif
+ 
  /*[clinic input]
  os._path_splitroot
-@@ -4428,6 +4432,19 @@ os__path_splitroot_impl(PyObject *module, path_t *path)
+@@ -4489,6 +4493,19 @@ os__path_splitroot_impl(PyObject *module, path_t *path)
      PyObject *result = NULL;
      HRESULT ret;
  
@@ -71,7 +154,7 @@ diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
      buffer = (wchar_t*)PyMem_Malloc(sizeof(wchar_t) * (wcslen(path->wide) + 1));
      if (!buffer) {
          return NULL;
-@@ -4438,7 +4455,14 @@ os__path_splitroot_impl(PyObject *module, path_t *path)
+@@ -4499,7 +4516,14 @@ os__path_splitroot_impl(PyObject *module, path_t *path)
      }
  
      Py_BEGIN_ALLOW_THREADS
@@ -87,119 +170,157 @@ diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
      Py_END_ALLOW_THREADS
      if (FAILED(ret)) {
          result = Py_BuildValue("sO", "", path->object);
-diff --git a/PC/getpathp.c b/PC/getpathp.c
-index 53da3a6..3d58bbf 100644
---- a/PC/getpathp.c
-+++ b/PC/getpathp.c
-@@ -90,7 +90,7 @@
- #endif
+diff --git a/PC/pyconfig.h b/PC/pyconfig.h
+index d7d3cf0..6e9c090 100644
+--- a/PC/pyconfig.h
++++ b/PC/pyconfig.h
+@@ -130,8 +130,8 @@ WIN32 is still required for the locale module.
  
- #include <windows.h>
--#include <pathcch.h>
-+#include <Shlwapi.h>
+ /* set the version macros for the windows headers */
+ /* Python 3.9+ requires Windows 8 or greater */
+-#define Py_WINVER 0x0602 /* _WIN32_WINNT_WIN8 */
+-#define Py_NTDDI NTDDI_WIN8
++#define Py_WINVER 0x0601 /* _WIN32_WINNT_WIN7 */
++#define Py_NTDDI NTDDI_WIN7
  
- #ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
-@@ -249,14 +249,43 @@ ismodule(wchar_t *filename, int update_filename)
-    stuff as fits will be appended.
- */
+ /* We only set these values when building Python - we don't want to force
+    these values on extensions, as that will affect the prototypes and
+diff --git a/PCbuild/_freeze_module.vcxproj b/PCbuild/_freeze_module.vcxproj
+index 442e343..ef0a43e 100644
+--- a/PCbuild/_freeze_module.vcxproj
++++ b/PCbuild/_freeze_module.vcxproj
+@@ -94,7 +94,7 @@
+     </ClCompile>
+     <Link>
+       <SubSystem>Console</SubSystem>
+-      <AdditionalDependencies>version.lib;ws2_32.lib;pathcch.lib;bcrypt.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>version.lib;ws2_32.lib;shlwapi.lib;bcrypt.lib;%(AdditionalDependencies)</AdditionalDependencies>
+       <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
+     </Link>
+   </ItemDefinitionGroup>
+diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
+index c39ba3e1a9..0ef3a05fb6 100644
+--- a/PCbuild/pythoncore.vcxproj
++++ b/PCbuild/pythoncore.vcxproj
+@@ -106,7 +106,7 @@
+       <PreprocessorDefinitions Condition="$(IncludeExternals)">_Py_HAVE_ZLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+     </ClCompile>
+     <Link>
+-      <AdditionalDependencies>version.lib;ws2_32.lib;pathcch.lib;bcrypt.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>version.lib;ws2_32.lib;shlwapi.lib;bcrypt.lib;%(AdditionalDependencies)</AdditionalDependencies>
+     </Link>
+   </ItemDefinitionGroup>
+   <ItemGroup>
+diff --git a/Python/fileutils.c b/Python/fileutils.c
+index c86ed40..6b1535d 100644
+--- a/Python/fileutils.c
++++ b/Python/fileutils.c
+@@ -8,7 +8,7 @@
+ #ifdef MS_WINDOWS
+ #  include <malloc.h>
+ #  include <windows.h>
+-#  include <pathcch.h>            // PathCchCombineEx
++#  include <Shlwapi.h>
+ extern int winerror_to_errno(int);
+ #endif
  
+@@ -1999,13 +1999,46 @@ _Py_wrealpath(const wchar_t *path,
+ }
+ #endif
+ 
++#ifdef MS_WINDOWS
++static int _PathCchSkipRoot_Initialized = 0;
++typedef HRESULT (__stdcall *PPathCchSkipRoot) (PCWSTR pszPath, PCWSTR *ppszRootEnd);
++static PPathCchSkipRoot _PathCchSkipRoot;
 +
-+static int _PathCchCombineEx_Initialized = 0;
-+typedef HRESULT(__stdcall *PPathCchCombineEx) (PWSTR pszPathOut, size_t cchPathOut,
-+                                               PCWSTR pszPathIn, PCWSTR pszMore,
-+                                               unsigned long dwFlags);
-+static PPathCchCombineEx _PathCchCombineEx;
-+
- static void
- join(wchar_t *buffer, const wchar_t *stuff)
++#ifndef PATHCCH_ALLOW_LONG_PATHS
++#define PATHCCH_ALLOW_LONG_PATHS 0x00000001
++#endif
++#endif
+ 
+ int
+ _Py_isabs(const wchar_t *path)
  {
--    if (FAILED(PathCchCombineEx(buffer, MAXPATHLEN+1, buffer, stuff, 0))) {
--        Py_FatalError("buffer overflow in getpathp.c's join()");
-+    if (_PathCchCombineEx_Initialized == 0) {
+ #ifdef MS_WINDOWS
++    if (_PathCchSkipRoot_Initialized == 0) {
 +        HMODULE pathapi = LoadLibraryExW(L"api-ms-win-core-path-l1-1-0.dll", NULL,
 +                                         LOAD_LIBRARY_SEARCH_SYSTEM32);
++
 +        if (pathapi) {
-+            _PathCchCombineEx = (PPathCchCombineEx)GetProcAddress(pathapi, "PathCchCombineEx");
-+        }
-+        else {
-+            _PathCchCombineEx = NULL;
++            _PathCchSkipRoot = (PPathCchSkipRoot)GetProcAddress(pathapi, "PathCchSkipRoot");
++        } else {
++            _PathCchSkipRoot = NULL;
 +        }
-+        _PathCchCombineEx_Initialized = 1;
++
++        _PathCchSkipRoot_Initialized = 1;
 +    }
-+    if (_PathCchCombineEx) {
-+        if (FAILED(_PathCchCombineEx(buffer, MAXPATHLEN+1, buffer, stuff, 0))) {
-+            Py_FatalError("buffer overflow in getpathp.c's join()");
-+        }
++
++    HRESULT hr;
+     const wchar_t *tail;
+-    HRESULT hr = PathCchSkipRoot(path, &tail);
++    if (_PathCchSkipRoot) {
++        hr = _PathCchSkipRoot(path, &tail);
 +    } else {
-+        if (!PathCombineW(buffer, buffer, stuff)) {
-+            Py_FatalError("buffer overflow in getpathp.c's join()");
++        tail = PathSkipRootW(path);
++        if (!tail) {
++            hr = E_FAIL;
++        } else {
++            hr = S_OK;
 +        }
++    }
++
+     if (FAILED(hr) || path == tail) {
+         return 0;
      }
+@@ -2086,6 +2117,11 @@ _Py_abspath(const wchar_t *path, wchar_t **abspath_p)
+ #endif
  }
  
-+static int _PathCchCanonicalizeEx_Initialized = 0;
-+typedef HRESULT(__stdcall *PPathCchCanonicalizeEx) (PWSTR pszPathOut, size_t cchPathOut,
-+    PCWSTR pszPathIn, unsigned long dwFlags);
-+static PPathCchCanonicalizeEx _PathCchCanonicalizeEx;
-+
- /* Call PathCchCanonicalizeEx(path): remove navigation elements such as "."
-    and ".." to produce a direct, well-formed path. */
- static PyStatus
-@@ -267,8 +296,26 @@ canonicalize(wchar_t *buffer, const wchar_t *path)
-         return _PyStatus_NO_MEMORY();
-     }
++#ifdef MS_WINDOWS
++static int _PathCchCombineEx_Initialized = 0;
++typedef HRESULT (__stdcall *PPathCchCombineEx) (PWSTR  pszPathOut, size_t cchPathOut, PCWSTR pszPathIn, PCWSTR pszMore, ULONG  dwFlags);
++static PPathCchCombineEx _PathCchCombineEx;
++#endif
  
--    if (FAILED(PathCchCanonicalizeEx(buffer, MAXPATHLEN + 1, path, 0))) {
--        return INIT_ERR_BUFFER_OVERFLOW();
-+    if (_PathCchCanonicalizeEx_Initialized == 0) {
+ // The caller must ensure "buffer" is big enough.
+ static int
+@@ -2093,9 +2127,36 @@ join_relfile(wchar_t *buffer, size_t bufsize,
+              const wchar_t *dirname, const wchar_t *relfile)
+ {
+ #ifdef MS_WINDOWS
+-    if (FAILED(PathCchCombineEx(buffer, bufsize, dirname, relfile,
+-        PATHCCH_ALLOW_LONG_PATHS))) {
+-        return -1;
++
++    if (_PathCchCombineEx_Initialized == 0) {
 +        HMODULE pathapi = LoadLibraryExW(L"api-ms-win-core-path-l1-1-0.dll", NULL,
 +                                         LOAD_LIBRARY_SEARCH_SYSTEM32);
++
 +        if (pathapi) {
-+            _PathCchCanonicalizeEx = (PPathCchCanonicalizeEx)GetProcAddress(pathapi, "PathCchCanonicalizeEx");
-+        }
-+        else {
-+            _PathCchCanonicalizeEx = NULL;
++            _PathCchCombineEx = (PPathCchCombineEx)GetProcAddress(pathapi, "PathCchCombineEx");
++        } else {
++            _PathCchCombineEx = NULL;
 +        }
-+        _PathCchCanonicalizeEx_Initialized = 1;
++
++        _PathCchCombineEx_Initialized = 1;
 +    }
-+    if (_PathCchCanonicalizeEx) {
-+        if (FAILED(_PathCchCanonicalizeEx(buffer, MAXPATHLEN + 1, path, 0))) {
-+            return INIT_ERR_BUFFER_OVERFLOW();
++
++    if (_PathCchCombineEx) {
++        if (FAILED(_PathCchCombineEx(buffer, bufsize, dirname, relfile,
++            PATHCCH_ALLOW_LONG_PATHS))) {
++            return -1;
 +        }
 +    }
 +    else {
-+        if (!PathCanonicalizeW(buffer, path)) {
-+            return INIT_ERR_BUFFER_OVERFLOW();
++        size_t dirlen = wcslen(dirname);
++        size_t rellen = wcslen(relfile);
++        size_t maxlen = bufsize - 1;
++        if (maxlen > MAX_PATH || dirlen >= maxlen || rellen >= maxlen - dirlen) {
++            return -1;
 +        }
++        wchar_t * r = PathCombineW(buffer, dirname, relfile);
++        if (!r)
++            return -1;
      }
-     return _PyStatus_OK();
- }
-diff --git a/PC/pyconfig.h b/PC/pyconfig.h
-index d7d3cf0..6e9c090 100644
---- a/PC/pyconfig.h
-+++ b/PC/pyconfig.h
-@@ -136,8 +136,8 @@ WIN32 is still required for the locale module.
- 
- /* set the version macros for the windows headers */
- /* Python 3.9+ requires Windows 8 or greater */
--#define Py_WINVER 0x0602 /* _WIN32_WINNT_WIN8 */
--#define Py_NTDDI NTDDI_WIN8
-+#define Py_WINVER 0x0601 /* _WIN32_WINNT_WIN7 */
-+#define Py_NTDDI NTDDI_WIN7
- 
- /* We only set these values when building Python - we don't want to force
-    these values on extensions, as that will affect the prototypes and
-diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
-index c39ba3e1a9..0ef3a05fb6 100644
---- a/PCbuild/pythoncore.vcxproj
-+++ b/PCbuild/pythoncore.vcxproj
-@@ -106,7 +106,7 @@
-       <PreprocessorDefinitions Condition="$(IncludeExternals)">_Py_HAVE_ZLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-     </ClCompile>
-     <Link>
--      <AdditionalDependencies>version.lib;ws2_32.lib;pathcch.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>version.lib;ws2_32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-     </Link>
-   </ItemDefinitionGroup>
-   <ItemGroup>
+ #else
+     assert(!_Py_isabs(relfile));
diff --git a/external_imported/vcpkg/ports/python3/0009-bz2d.patch b/external_imported/vcpkg/ports/python3/0009-bz2d.patch
deleted file mode 100644
index 70e1b925b..000000000
--- a/external_imported/vcpkg/ports/python3/0009-bz2d.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a45e64a57c58a9fe4984b866e86c7b661da7940d Mon Sep 17 00:00:00 2001
-From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
-Date: Mon, 14 Mar 2022 09:09:48 +0100
-Subject: [PATCH 09/11] bz2d
-
-fix bz2(d) search on linux (#23525)
----
- setup.py | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/setup.py b/setup.py
-index 43e807f20..df4d43d3d 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1741,6 +1741,14 @@ def detect_compress_exts(self):
-             self.add(Extension('_bz2', ['_bz2module.c'],
-                                libraries=['bz2'],
-                                extra_link_args=bz2_extra_link_args))
-+        elif (self.compiler.find_library_file(self.lib_dirs, 'bz2d')):
-+            if MACOS:
-+                bz2_extra_link_args = ('-Wl,-search_paths_first',)
-+            else:
-+                bz2_extra_link_args = ()
-+            self.add(Extension('_bz2', ['_bz2module.c'],
-+                               libraries=['bz2d'],
-+                               extra_link_args=bz2_extra_link_args))
-         else:
-             self.missing.append('_bz2')
- 
--- 
-2.37.3.windows.1
-
diff --git a/external_imported/vcpkg/ports/python3/0010-dont-skip-rpath.patch b/external_imported/vcpkg/ports/python3/0010-dont-skip-rpath.patch
index 400cd61a3..5d0b9dea6 100644
--- a/external_imported/vcpkg/ports/python3/0010-dont-skip-rpath.patch
+++ b/external_imported/vcpkg/ports/python3/0010-dont-skip-rpath.patch
@@ -4,167 +4,28 @@ Date: Thu, 4 Aug 2022 23:49:06 +0300
 Subject: [PATCH 10/11] dont skip rpath
 
 ---
- setup.py | 21 +++++++++++++++++++--
- 1 file changed, 19 insertions(+), 2 deletions(-)
+ configure.ac | 6 ++++++
+ 1 file changed, 6 insertions(+), 0 deletions(-)
 
-diff --git a/setup.py b/setup.py
+diff --git a/configure.ac b/configure.ac
 index 61b3266..4c2cfb4 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1153,6 +1153,7 @@ def detect_readline_curses(self):
-             self.add(Extension('readline', ['readline.c'],
-                                library_dirs=['/usr/lib/termcap'],
-                                extra_link_args=readline_extra_link_args,
-+                               runtime_library_dirs=self.lib_dirs,
-                                libraries=readline_libs))
-         else:
-             self.missing.append('readline')
-@@ -1189,6 +1190,7 @@ def detect_readline_curses(self):
-                                extra_compile_args=['-DPy_BUILD_CORE_MODULE'],
-                                include_dirs=curses_includes,
-                                define_macros=curses_defines,
-+                               runtime_library_dirs=self.lib_dirs,
-                                libraries=curses_libs))
-         elif curses_library == 'curses' and not MACOS:
-                 # OSX has an old Berkeley curses, not good enough for
-@@ -1203,6 +1205,7 @@ def detect_readline_curses(self):
-             self.add(Extension('_curses', ['_cursesmodule.c'],
-                                extra_compile_args=['-DPy_BUILD_CORE_MODULE'],
-                                define_macros=curses_defines,
-+                               runtime_library_dirs=self.lib_dirs,
-                                libraries=curses_libs))
-         else:
-             curses_enabled = False
-@@ -1216,6 +1219,7 @@ def detect_readline_curses(self):
-             self.add(Extension('_curses_panel', ['_curses_panel.c'],
-                            include_dirs=curses_includes,
-                            define_macros=curses_defines,
-+                           runtime_library_dirs=self.lib_dirs,
-                            libraries=[panel_library, *curses_libs]))
-         elif not skip_curses_panel:
-             self.missing.append('_curses_panel')
-@@ -1234,7 +1238,7 @@ def detect_crypt(self):
-         else:
-             libs = []
- 
--        self.add(Extension('_crypt', ['_cryptmodule.c'], libraries=libs))
-+        self.add(Extension('_crypt', ['_cryptmodule.c'], runtime_library_dirs=self.lib_dirs, libraries=libs))
- 
-     def detect_socket(self):
-         # socket(2)
-@@ -1525,6 +1529,7 @@ class db_found(Exception): pass
-                                            libraries=dblibs)
-                         break
-             if dbmext is not None:
-+                dbmext.runtime_library_dirs = self.lib_dirs
-                 self.add(dbmext)
-             else:
-                 self.missing.append('_dbm')
-@@ -1533,6 +1538,7 @@ class db_found(Exception): pass
-         if ('gdbm' in dbm_order and
-             self.compiler.find_library_file(self.lib_dirs, 'gdbm')):
-             self.add(Extension('_gdbm', ['_gdbmmodule.c'],
-+                               runtime_library_dirs=self.lib_dirs,
-                                libraries=['gdbm']))
-         else:
-             self.missing.append('_gdbm')
-@@ -1645,6 +1651,7 @@ def detect_sqlite(self):
-                                define_macros=sqlite_defines,
-                                include_dirs=include_dirs,
-                                library_dirs=sqlite_libdir,
-+                               runtime_library_dirs=self.lib_dirs,
-                                extra_link_args=sqlite_extra_link_args,
-                                libraries=["sqlite3",]))
-         else:
-@@ -1710,6 +1717,7 @@ def detect_compress_exts(self):
-                         zlib_extra_link_args = ()
-                     self.add(Extension('zlib', ['zlibmodule.c'],
-                                        libraries=['z'],
-+                                       runtime_library_dirs=self.lib_dirs,
-                                        extra_link_args=zlib_extra_link_args))
-                     have_zlib = True
-                 else:
-@@ -1732,6 +1740,7 @@ def detect_compress_exts(self):
-         self.add(Extension('binascii', ['binascii.c'],
-                            extra_compile_args=extra_compile_args,
-                            libraries=libraries,
-+                           runtime_library_dirs=self.lib_dirs,
-                            extra_link_args=extra_link_args))
- 
-         # Gustavo Niemeyer's bz2 module.
-@@ -1742,6 +1751,7 @@ def detect_compress_exts(self):
-                 bz2_extra_link_args = ()
-             self.add(Extension('_bz2', ['_bz2module.c'],
-                                libraries=['bz2'],
-+                               runtime_library_dirs=self.lib_dirs,
-                                extra_link_args=bz2_extra_link_args))
-         elif (self.compiler.find_library_file(self.lib_dirs, 'bz2d')):
-             if MACOS:
-@@ -1750,6 +1760,7 @@ def detect_compress_exts(self):
-                 bz2_extra_link_args = ()
-             self.add(Extension('_bz2', ['_bz2module.c'],
-                                libraries=['bz2d'],
-+                               runtime_library_dirs=self.lib_dirs,
-                                extra_link_args=bz2_extra_link_args))
-         else:
-             self.missing.append('_bz2')
-@@ -1757,6 +1768,7 @@ def detect_compress_exts(self):
-         # LZMA compression support.
-         if self.compiler.find_library_file(self.lib_dirs, 'lzma'):
-             self.add(Extension('_lzma', ['_lzmamodule.c'],
-+                               runtime_library_dirs=self.lib_dirs,
-                                libraries=['lzma']))
-         else:
-             self.missing.append('_lzma')
-@@ -1819,6 +1831,7 @@ def detect_expat_elementtree(self):
-                            extra_compile_args=extra_compile_args,
-                            include_dirs=expat_inc,
-                            libraries=expat_lib,
-+                           runtime_library_dirs=self.lib_dirs,
-                            sources=['pyexpat.c'] + expat_sources,
-                            depends=expat_depends))
- 
-@@ -1831,6 +1844,7 @@ def detect_expat_elementtree(self):
-                                define_macros=define_macros,
-                                include_dirs=expat_inc,
-                                libraries=expat_lib,
-+                               runtime_library_dirs=self.lib_dirs,
-                                sources=['_elementtree.c'],
-                                depends=['pyexpat.c', *expat_sources,
-                                         *expat_depends]))
-@@ -1883,6 +1897,7 @@ def detect_uuid(self):
-             else:
-                 uuid_libs = []
-             self.add(Extension('_uuid', ['_uuidmodule.c'],
-+                               runtime_library_dirs=self.lib_dirs,
-                                libraries=uuid_libs))
-         else:
-             self.missing.append('_uuid')
-@@ -2319,6 +2334,7 @@ def detect_ctypes(self):
-                 ext.extra_compile_args.append("-DHAVE_FFI_CLOSURE_ALLOC=1")
- 
-             ext.include_dirs.append(ffi_inc)
-+            ext.runtime_library_dirs = self.lib_dirs
-             ext.libraries.append(ffi_lib)
-             self.use_system_libffi = True
- 
-@@ -2485,7 +2501,7 @@ def split_var(name, sep):
-             include_dirs=openssl_includes,
-             library_dirs=openssl_libdirs,
-             libraries=openssl_libs,
--            runtime_library_dirs=runtime_library_dirs,
-+            runtime_library_dirs=self.lib_dirs,
-         )
- 
-         # This static linking is NOT OFFICIALLY SUPPORTED.
-@@ -2639,6 +2655,7 @@ def detect_nis(self):
-         self.add(Extension('nis', ['nismodule.c'],
-                            libraries=libs,
-                            library_dirs=library_dirs,
-+                           runtime_library_dirs=self.lib_dirs,
-                            include_dirs=includes_dirs))
- 
- 
+--- a/configure.ac
++++ b/configure.ac
+@@ -49,6 +49,14 @@  [$1]
+ [RESTORE_ENV]
+ )dnl
+ 
++if test "$ac_sys_system" != "Darwin"; then
++AS_VAR_IF([GNULD], [yes], [
++  LDFLAGS="-Wl,--enable-new-dtags,-rpath,$vcpkg_rpath"
++], [
++  LDFLAGS="-Wl,-rpath,$vcpkg_rpath"
++])
++fi
++
+ dnl PY_CHECK_FUNC(FUNCTION, [INCLUDES], [AC_DEFINE-VAR])
+ AC_DEFUN([PY_CHECK_FUNC],
+ [ AS_VAR_PUSHDEF([py_var], [ac_cv_func_$1])
 -- 
 2.37.3.windows.1
 
diff --git a/external_imported/vcpkg/ports/python3/0012-force-disable-curses.patch b/external_imported/vcpkg/ports/python3/0012-force-disable-curses.patch
deleted file mode 100644
index d0986e80d..000000000
--- a/external_imported/vcpkg/ports/python3/0012-force-disable-curses.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/Modules/Setup b/Modules/Setup
-index 87c6a15..7ad53f5 100644
---- a/Modules/Setup
-+++ b/Modules/Setup
-@@ -375,3 +375,7 @@ xxsubtype xxsubtype.c
- #
- #_sqlite3 _tkinter _curses pyexpat
- #_codecs_jp _codecs_kr _codecs_tw unicodedata
-+
-+*disabled*
-+_curses
-+_curses_panel
diff --git a/external_imported/vcpkg/ports/python3/0012-force-disable-modules.patch b/external_imported/vcpkg/ports/python3/0012-force-disable-modules.patch
new file mode 100644
index 000000000..f97f19e5b
--- /dev/null
+++ b/external_imported/vcpkg/ports/python3/0012-force-disable-modules.patch
@@ -0,0 +1,13 @@
+diff --git a/Modules/Setup b/Modules/Setup
+index 87c6a152f8..7ad53f5b4f 100644
+--- a/Modules/Setup
++++ b/Modules/Setup
+@@ -375,3 +375,8 @@ xxsubtype xxsubtype.c
+ #
+ # _sqlite3 _tkinter _curses pyexpat
+ # _codecs_jp _codecs_kr _codecs_tw unicodedata
++
++*disabled*
++_curses
++_curses_panel
++_tkinter
diff --git a/external_imported/vcpkg/ports/python3/0013-configure-no-libcrypt.patch b/external_imported/vcpkg/ports/python3/0013-configure-no-libcrypt.patch
deleted file mode 100644
index dfeb9b77b..000000000
--- a/external_imported/vcpkg/ports/python3/0013-configure-no-libcrypt.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/configure b/configure
-index 15c7c54b0953..70f28b0c7064 100755
---- a/configure
-+++ b/configure
-@@ -13227,6 +13227,8 @@ done
- 
- # We search for both crypt and crypt_r as one or the other may be defined
- # This gets us our -lcrypt in LIBS when required on the target platform.
-+# Save/restore LIBS to avoid linking libpython with libcrypt.
-+LIBS_SAVE=$LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing crypt" >&5
- $as_echo_n "checking for library containing crypt... " >&6; }
- if ${ac_cv_search_crypt+:} false; then :
-@@ -13368,6 +13370,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- fi
- 
-+LIBS=$LIBS_SAVE
- 
- for ac_func in clock_gettime
- do :
-diff --git a/configure.ac b/configure.ac
-index 6c65b2914bf6..afdc68363cea 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -4085,6 +4085,8 @@ AC_CHECK_FUNCS(setpgrp,
- 
- # We search for both crypt and crypt_r as one or the other may be defined
- # This gets us our -lcrypt in LIBS when required on the target platform.
-+# Save/restore LIBS to avoid linking libpython with libcrypt.
-+LIBS_SAVE=$LIBS
- AC_SEARCH_LIBS(crypt, crypt)
- AC_SEARCH_LIBS(crypt_r, crypt)
- 
-@@ -4099,6 +4101,7 @@ char *r = crypt_r("", "", &d);
-     [AC_DEFINE(HAVE_CRYPT_R, 1, [Define if you have the crypt_r() function.])],
-     [])
- )
-+LIBS=$LIBS_SAVE
- 
- AC_CHECK_FUNCS(clock_gettime, [], [
-     AC_CHECK_LIB(rt, clock_gettime, [
diff --git a/external_imported/vcpkg/ports/python3/0014-fix-get-python-inc-output.patch b/external_imported/vcpkg/ports/python3/0014-fix-get-python-inc-output.patch
new file mode 100644
index 000000000..a20d2673a
--- /dev/null
+++ b/external_imported/vcpkg/ports/python3/0014-fix-get-python-inc-output.patch
@@ -0,0 +1,44 @@
+From b6ffa6e7a0f7a013fb111e618a7f7e2c58e9d548 Mon Sep 17 00:00:00 2001
+From: Billy Robert O'Neal III <bion@microsoft.com>
+Date: Wed, 26 Apr 2023 05:17:44 +0000
+Subject: [PATCH 14/14] fix get python inc output
+
+---
+ Lib/distutils/sysconfig.py | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
+index 3414a761e7..e6ae456ee9 100644
+--- a/Lib/distutils/sysconfig.py
++++ b/Lib/distutils/sysconfig.py
+@@ -45,7 +45,7 @@
+     get_makefile_filename,
+     get_python_version,
+ )
+-
++from os.path import dirname
+ # This is better than
+ # from sysconfig import _CONFIG_VARS as _config_vars
+ # because it makes sure that the global dictionary is initialized
+@@ -292,6 +292,7 @@ def get_python_inc(plat_specific=0, prefix=None):
+                 incdir = os.path.join(get_config_var('srcdir'), 'Include')
+                 return os.path.normpath(incdir)
+         python_dir = 'python' + get_python_version() + build_flags
++        prefix = dirname(dirname(BASE_PREFIX))
+         return os.path.join(prefix, "include", python_dir)
+     elif os.name == "nt":
+         if python_build:
+@@ -299,7 +300,9 @@ def get_python_inc(plat_specific=0, prefix=None):
+             # pyconfig.h
+             return (os.path.join(prefix, "include") + os.path.pathsep +
+                     os.path.join(prefix, "PC"))
+-        return os.path.join(prefix, "include")
++        python_dir = 'python' + get_python_version() + build_flags
++        prefix = dirname(dirname(BASE_PREFIX))
++        return os.path.join(prefix, "include", python_dir)
+     else:
+         raise DistutilsPlatformError(
+             "I don't know where Python installs its C header files "
+-- 
+2.25.1
+
diff --git a/external_imported/vcpkg/ports/python3/0015-dont-use-WINDOWS-def.patch b/external_imported/vcpkg/ports/python3/0015-dont-use-WINDOWS-def.patch
new file mode 100644
index 000000000..862fe3e47
--- /dev/null
+++ b/external_imported/vcpkg/ports/python3/0015-dont-use-WINDOWS-def.patch
@@ -0,0 +1,13 @@
+diff --git a/PC/launcher.c b/PC/launcher.c
+index 734e75333..7124927cf 100644
+--- a/PC/launcher.c
++++ b/PC/launcher.c
+@@ -2015,7 +2015,7 @@ installed, use -0 for available pythons", &p[1]);
+     return rc;
+ }
+ 
+-#if defined(_WINDOWS)
++#if !defined(_CONSOLE) // _WINDOWS is defined by the vcpkg toolchain
+ 
+ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
+                    LPWSTR lpstrCmd, int nShow)
diff --git a/external_imported/vcpkg/ports/python3/0016-fix-win-cross.patch b/external_imported/vcpkg/ports/python3/0016-fix-win-cross.patch
new file mode 100644
index 000000000..fdbdf82e8
--- /dev/null
+++ b/external_imported/vcpkg/ports/python3/0016-fix-win-cross.patch
@@ -0,0 +1,34 @@
+diff --git a/PCbuild/_freeze_module.vcxproj b/PCbuild/_freeze_module.vcxproj
+index 7d3423251f..7f607742fe 100644
+--- a/PCbuild/_freeze_module.vcxproj
++++ b/PCbuild/_freeze_module.vcxproj
+@@ -366,7 +366,7 @@
+   <ImportGroup Label="ExtensionTargets">
+   </ImportGroup>
+   <Target Name="_RebuildGetPath" AfterTargets="_RebuildFrozen" Condition="$(Configuration) != 'PGUpdate'">
+-    <Exec Command='"$(TargetPath)" "%(GetPath.ModName)" "%(GetPath.FullPath)" "%(GetPath.IntFile)"' />
++    <Exec Command='"_freeze_module.exe" "%(GetPath.ModName)" "%(GetPath.FullPath)" "%(GetPath.IntFile)"' />
+ 
+     <Copy SourceFiles="%(GetPath.IntFile)"
+           DestinationFiles="%(GetPath.OutFile)"
+@@ -378,7 +378,7 @@
+              Condition="'@(_UpdatedGetPath)' != ''" Importance="high" />
+   </Target>
+   <Target Name="_RebuildFrozen" AfterTargets="AfterBuild" Condition="$(Configuration) != 'PGUpdate'">
+-    <Exec Command='"$(TargetPath)" "%(None.ModName)" "%(None.FullPath)" "%(None.IntFile)"' />
++    <Exec Command='"_freeze_module.exe" "%(None.ModName)" "%(None.FullPath)" "%(None.IntFile)"' />
+ 
+     <Copy SourceFiles="%(None.IntFile)"
+           DestinationFiles="%(None.OutFile)"
+diff --git a/PCbuild/pcbuild.proj b/PCbuild/pcbuild.proj
+index c49a8533ad..b1cdf7c8d7 100644
+--- a/PCbuild/pcbuild.proj
++++ b/PCbuild/pcbuild.proj
+@@ -14,6 +14,6 @@
+   <ItemDefinitionGroup>
+     <FreezeProjects>
+-      <Platform>$(PreferredToolArchitecture)</Platform>
++      <Platform>$(Platform)</Platform>
+       <Configuration>$(Configuration)</Configuration>
+       <Configuration Condition="$(Configuration) == 'PGInstrument'">Release</Configuration>
+       <Properties></Properties>
diff --git a/external_imported/vcpkg/ports/python3/0016-undup-ffi-symbols.patch b/external_imported/vcpkg/ports/python3/0016-undup-ffi-symbols.patch
new file mode 100644
index 000000000..7faec9f9b
--- /dev/null
+++ b/external_imported/vcpkg/ports/python3/0016-undup-ffi-symbols.patch
@@ -0,0 +1,14 @@
+diff --git a/Modules/_ctypes/malloc_closure.c b/Modules/_ctypes/malloc_closure.c
+index 788bae6a9..3938f79db 100644
+--- a/Modules/_ctypes/malloc_closure.c
++++ b/Modules/_ctypes/malloc_closure.c
+@@ -11,6 +11,9 @@
+ #endif
+ #include "ctypes.h"
+ 
++#undef Py_ffi_closure_alloc
++#undef Py_ffi_closure_free
++
+ /* BLOCKSIZE can be adjusted.  Larger blocksize will take a larger memory
+    overhead, but allocate less blocks from the system.  It may be that some
+    systems have a limit of how many mmap'd blocks can be open.
diff --git a/external_imported/vcpkg/ports/python3/0017-fix-win.patch b/external_imported/vcpkg/ports/python3/0017-fix-win.patch
new file mode 100644
index 000000000..9d3fb3efb
--- /dev/null
+++ b/external_imported/vcpkg/ports/python3/0017-fix-win.patch
@@ -0,0 +1,34 @@
+diff --git a/PCbuild/_freeze_module.vcxproj b/PCbuild/_freeze_module.vcxproj
+index 7d3423251f..7f607742fe 100644
+--- a/PCbuild/_freeze_module.vcxproj
++++ b/PCbuild/_freeze_module.vcxproj
+@@ -366,7 +366,7 @@
+   <ImportGroup Label="ExtensionTargets">
+   </ImportGroup>
+   <Target Name="_RebuildGetPath" AfterTargets="_RebuildFrozen" Condition="$(Configuration) != 'PGUpdate'">
+-    <Exec Command='"$(TargetPath)" "%(GetPath.ModName)" "%(GetPath.FullPath)" "%(GetPath.IntFile)"' />
++    <Exec Command='"$(OutDir)$(TargetName)$(TargetExt)" "%(GetPath.ModName)" "%(GetPath.FullPath)" "%(GetPath.IntFile)"' />
+ 
+     <Copy SourceFiles="%(GetPath.IntFile)"
+           DestinationFiles="%(GetPath.OutFile)"
+@@ -378,7 +378,7 @@
+              Condition="'@(_UpdatedGetPath)' != ''" Importance="high" />
+   </Target>
+   <Target Name="_RebuildFrozen" AfterTargets="AfterBuild" Condition="$(Configuration) != 'PGUpdate'">
+-    <Exec Command='"$(TargetPath)" "%(None.ModName)" "%(None.FullPath)" "%(None.IntFile)"' />
++    <Exec Command='"$(OutDir)$(TargetName)$(TargetExt)" "%(None.ModName)" "%(None.FullPath)" "%(None.IntFile)"' />
+ 
+     <Copy SourceFiles="%(None.IntFile)"
+           DestinationFiles="%(None.OutFile)"
+diff --git a/PCbuild/pcbuild.proj b/PCbuild/pcbuild.proj
+index c49a8533ad..b1cdf7c8d7 100644
+--- a/PCbuild/pcbuild.proj
++++ b/PCbuild/pcbuild.proj
+@@ -14,6 +14,6 @@
+   <ItemDefinitionGroup>
+     <FreezeProjects>
+-      <Platform>$(PreferredToolArchitecture)</Platform>
++      <Platform>$(Platform)</Platform>
+       <Configuration>$(Configuration)</Configuration>
+       <Configuration Condition="$(Configuration) == 'PGInstrument'">Release</Configuration>
+       <Properties></Properties>
diff --git a/external_imported/vcpkg/ports/python3/0018-fix-sysconfig-include.patch b/external_imported/vcpkg/ports/python3/0018-fix-sysconfig-include.patch
new file mode 100644
index 000000000..56f3406ab
--- /dev/null
+++ b/external_imported/vcpkg/ports/python3/0018-fix-sysconfig-include.patch
@@ -0,0 +1,27 @@
+diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
+index ebe371182..e351df7da 100644
+--- a/Lib/sysconfig.py
++++ b/Lib/sysconfig.py
+@@ -30,9 +30,9 @@
+         'purelib': '{base}/lib/python{py_version_short}/site-packages',
+         'platlib': '{platbase}/{platlibdir}/python{py_version_short}/site-packages',
+         'include':
+-            '{installed_base}/include/python{py_version_short}{abiflags}',
++            '{installed_base}/../../include/python{py_version_short}{abiflags}',
+         'platinclude':
+-            '{installed_platbase}/include/python{py_version_short}{abiflags}',
++            '{installed_platbase}/../../include/python{py_version_short}{abiflags}',
+         'scripts': '{base}/bin',
+         'data': '{base}',
+         },
+@@ -51,8 +51,8 @@
+         'platstdlib': '{base}/Lib',
+         'purelib': '{base}/Lib/site-packages',
+         'platlib': '{base}/Lib/site-packages',
+-        'include': '{installed_base}/Include',
+-        'platinclude': '{installed_base}/Include',
++        'include': '{installed_base}/../../include/python{py_version_short}{abiflags}',
++        'platinclude': '{installed_base}/../../include/python{py_version_short}{abiflags}',
+         'scripts': '{base}/Scripts',
+         'data': '{base}',
+         },
diff --git a/external_imported/vcpkg/ports/python3/openssl.props.in b/external_imported/vcpkg/ports/python3/openssl.props.in
index 1d404ad57..697185cf9 100644
--- a/external_imported/vcpkg/ports/python3/openssl.props.in
+++ b/external_imported/vcpkg/ports/python3/openssl.props.in
@@ -10,5 +10,14 @@
         ${CRYPTO_DEBUG};${SSL_DEBUG};%(AdditionalDependencies)
       </AdditionalDependencies>
     </Link>
+    <Lib>
+      <AdditionalDependencies>Crypt32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies Condition="'$(Configuration)|$(IncludeExternals)'=='Release|true'">
+        ${CRYPTO_RELEASE};${SSL_RELEASE};%(AdditionalDependencies)
+      </AdditionalDependencies>
+      <AdditionalDependencies Condition="'$(Configuration)|$(IncludeExternals)'=='Debug|true'">
+        ${CRYPTO_DEBUG};${SSL_DEBUG};%(AdditionalDependencies)
+      </AdditionalDependencies>
+    </Lib>
   </ItemDefinitionGroup>
 </Project>
diff --git a/external_imported/vcpkg/ports/python3/portfile.cmake b/external_imported/vcpkg/ports/python3/portfile.cmake
index 14248aaaa..cc2562dae 100644
--- a/external_imported/vcpkg/ports/python3/portfile.cmake
+++ b/external_imported/vcpkg/ports/python3/portfile.cmake
@@ -3,10 +3,25 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic AND VCPKG_CRT_LINKAGE STREQUAL static
     set(VCPKG_LIBRARY_LINKAGE static)
 endif()
 
-set(PYTHON_VERSION_MAJOR  3)
-set(PYTHON_VERSION_MINOR  10)
-set(PYTHON_VERSION_PATCH  7)
-set(PYTHON_VERSION        ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.${PYTHON_VERSION_PATCH})
+if(NOT VCPKG_HOST_IS_WINDOWS)
+    message(WARNING "${PORT} currently requires the following programs from the system package manager:
+    autoconf automake autoconf-archive
+On Debian and Ubuntu derivatives:
+    sudo apt-get install autoconf automake autoconf-archive
+On recent Red Hat and Fedora derivatives:
+    sudo dnf install autoconf automake autoconf-archive
+On Arch Linux and derivatives:
+    sudo pacman -S autoconf automake autoconf-archive
+On Alpine:
+    apk add autoconf automake autoconf-archive
+On macOS:
+    brew install autoconf automake autoconf-archive\n")
+endif()
+
+string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" PYTHON_VERSION "${VERSION}")
+set(PYTHON_VERSION_MAJOR "${CMAKE_MATCH_1}")
+set(PYTHON_VERSION_MINOR "${CMAKE_MATCH_2}")
+set(PYTHON_VERSION_PATCH "${CMAKE_MATCH_3}")
 
 set(PATCHES
     0001-only-build-required-projects.patch
@@ -14,10 +29,12 @@ set(PATCHES
     0004-devendor-external-dependencies.patch
     0005-dont-copy-vcruntime.patch
     0008-python.pc.patch
-    0009-bz2d.patch
     0010-dont-skip-rpath.patch
-    0012-force-disable-curses.patch
-    0013-configure-no-libcrypt.patch  # https://github.com/python/cpython/pull/28881
+    0012-force-disable-modules.patch
+    0014-fix-get-python-inc-output.patch
+    0015-dont-use-WINDOWS-def.patch
+    0016-undup-ffi-symbols.patch # Required for lld-link.
+    0018-fix-sysconfig-include.patch
 )
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
@@ -25,7 +42,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
 endif()
 
 # Fix build failures with GCC for built-in modules (https://github.com/microsoft/vcpkg/issues/26573)
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
+if(VCPKG_TARGET_IS_LINUX)
     list(APPEND PATCHES 0011-gcc-ldflags-fix.patch)
 endif()
 
@@ -38,20 +55,25 @@ elseif(VCPKG_TARGET_IS_WINDOWS AND CMAKE_SYSTEM_VERSION EQUAL 6.1)
     message(FATAL_ERROR "python3 requires the feature deprecated-win7-support when building on Windows 7.")
 endif()
 
-if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
+if(VCPKG_TARGET_IS_WINDOWS)
     string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PYTHON_ALLOW_EXTENSIONS)
     # The Windows 11 SDK has a problem that causes it to error on the resource files, so we patch that.
     vcpkg_get_windows_sdk(WINSDK_VERSION)
     if("${WINSDK_VERSION}" VERSION_GREATER_EQUAL "10.0.22000")
         list(APPEND PATCHES "0007-workaround-windows-11-sdk-rc-compiler-error.patch")
     endif()
+    if(VCPKG_CROSSCOMPILING)
+        list(APPEND PATCHES "0016-fix-win-cross.patch")
+    else()
+        list(APPEND PATCHES "0017-fix-win.patch")
+    endif()
 endif()
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO python/cpython
     REF v${PYTHON_VERSION}
-    SHA512 88bf6efef632a7dad7306a59b7d5da159947d6675f0d264f1f33aa49a5703b4e4595011de52098eb839cc648994ae143f668507be7209f6bf3fe8ae0ec6a9125
+    SHA512 63c1cc817844584c9ea880be0277ebcc18182c5050f59ebbb8dd42c971979bb2cee0f09af6a1e62a6c8c23143dfa6ff21fc1aba25ef50a425fdea46ff3e35896
     HEAD_REF master
     PATCHES ${PATCHES}
 )
@@ -77,7 +99,7 @@ function(make_python_pkgconfig)
     file(WRITE ${out_full_path} "${pkgconfig_file}")
 endfunction()
 
-if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
+if(VCPKG_TARGET_IS_WINDOWS)
     # Due to the way Python handles C extension modules on Windows, a static python core cannot
     # load extension modules.
     if(PYTHON_ALLOW_EXTENSIONS)
@@ -87,28 +109,33 @@ if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
         find_library(CRYPTO_DEBUG NAMES libcrypto PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
         find_library(EXPAT_RELEASE NAMES libexpat libexpatMD libexpatMT PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
         find_library(EXPAT_DEBUG NAMES libexpatd libexpatdMD libexpatdMT PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
-        find_library(FFI_RELEASE NAMES libffi PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
-        find_library(FFI_DEBUG NAMES libffi PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
+        find_library(FFI_RELEASE NAMES ffi PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
+        find_library(FFI_DEBUG NAMES ffi PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
         find_library(LZMA_RELEASE NAMES lzma PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
         find_library(LZMA_DEBUG NAMES lzma PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
         find_library(SQLITE_RELEASE NAMES sqlite3 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
         find_library(SQLITE_DEBUG NAMES sqlite3 PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
         find_library(SSL_RELEASE NAMES libssl PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
         find_library(SSL_DEBUG NAMES libssl PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
+        list(APPEND add_libs_rel "${BZ2_RELEASE};${EXPAT_RELEASE};${FFI_RELEASE};${LZMA_RELEASE};${SQLITE_RELEASE}")
+        list(APPEND add_libs_dbg "${BZ2_DEBUG};${EXPAT_DEBUG};${FFI_DEBUG};${LZMA_DEBUG};${SQLITE_DEBUG}")
     else()
         message(STATUS "WARNING: Static builds of Python will not have C extension modules available.")
     endif()
     find_library(ZLIB_RELEASE NAMES zlib PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
     find_library(ZLIB_DEBUG NAMES zlib zlibd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
+    list(APPEND add_libs_rel "${ZLIB_RELEASE}")
+    list(APPEND add_libs_dbg "${ZLIB_DEBUG}")
 
     configure_file("${SOURCE_PATH}/PC/pyconfig.h" "${SOURCE_PATH}/PC/pyconfig.h")
     configure_file("${CMAKE_CURRENT_LIST_DIR}/python_vcpkg.props.in" "${SOURCE_PATH}/PCbuild/python_vcpkg.props")
     configure_file("${CMAKE_CURRENT_LIST_DIR}/openssl.props.in" "${SOURCE_PATH}/PCbuild/openssl.props")
     file(WRITE "${SOURCE_PATH}/PCbuild/libffi.props"
-        "<?xml version='1.0' encoding='utf-8'?>
-        <Project xmlns='http://schemas.microsoft.com/developer/msbuild/2003' />"
+        "<?xml version='1.0' encoding='utf-8'?>"
+        "<Project xmlns='http://schemas.microsoft.com/developer/msbuild/2003' />"
     )
 
+    list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS "-DVCPKG_SET_CHARSET_FLAG=OFF")
     if(PYTHON_ALLOW_EXTENSIONS)
         set(OPTIONS
             "/p:IncludeExtensions=true"
@@ -138,30 +165,39 @@ if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
         list(APPEND OPTIONS "/p:_VcpkgPythonLinkage=StaticLibrary")
     endif()
 
-    # _freeze_importlib.exe is run as part of the build process, so make sure the required dynamic libs are available.
-    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-        vcpkg_add_to_path("${CURRENT_INSTALLED_DIR}/bin")
-    endif()
-    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-        vcpkg_add_to_path("${CURRENT_INSTALLED_DIR}/debug/bin")
+    vcpkg_find_acquire_program(PYTHON3)
+    get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
+    set(ENV{PythonForBuild} "${PYTHON3_DIR}/python.exe") # PythonForBuild is what's used on windows, despite the readme
+
+    if(VCPKG_CROSSCOMPILING)
+        vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/manual-tools/${PORT}")
     endif()
 
-    vcpkg_install_msbuild(
+    vcpkg_msbuild_install(
         SOURCE_PATH "${SOURCE_PATH}"
         PROJECT_SUBPATH "PCbuild/pcbuild.proj"
+        ADD_BIN_TO_PATH
         OPTIONS ${OPTIONS}
-        LICENSE_SUBPATH "LICENSE"
-        TARGET_PLATFORM_VERSION "${WINSDK_VERSION}"
-        SKIP_CLEAN
+        ADDITIONAL_LIBS_RELEASE ${add_libs_rel}
+        ADDITIONAL_LIBS_DEBUG ${add_libs_dbg}
     )
 
+    if(NOT VCPKG_CROSSCOMPILING)
+        file(GLOB_RECURSE freeze_module "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/PCbuild/**/_freeze_module.exe")
+        file(COPY "${freeze_module}" DESTINATION "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}")
+        vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}")
+    endif()
+
     # The extension modules must be placed in the DLLs directory, so we can't use vcpkg_copy_tools()
     if(PYTHON_ALLOW_EXTENSIONS)
-        file(GLOB_RECURSE PYTHON_EXTENSIONS "${CURRENT_BUILDTREES_DIR}/*.pyd")
-        list(FILTER PYTHON_EXTENSIONS EXCLUDE REGEX [[.*_d\.pyd]])
-        file(COPY ${PYTHON_EXTENSIONS} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/DLLs")
+        file(GLOB_RECURSE PYTHON_EXTENSIONS_RELEASE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.pyd")
+        file(COPY ${PYTHON_EXTENSIONS_RELEASE} DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
+        file(COPY ${PYTHON_EXTENSIONS_RELEASE} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/DLLs")
         vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/DLLs")
         file(REMOVE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/DLLs/python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}.dll")
+
+        file(GLOB_RECURSE PYTHON_EXTENSIONS_DEBUG "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*.pyd")
+        file(COPY ${PYTHON_EXTENSIONS_DEBUG} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
     endif()
 
     file(COPY "${SOURCE_PATH}/Include/" "${SOURCE_PATH}/PC/pyconfig.h"
@@ -197,8 +233,6 @@ if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
 
     vcpkg_fixup_pkgconfig()
 
-    vcpkg_clean_msbuild()
-
     # Remove static library belonging to executable
     if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
         if (EXISTS "${CURRENT_PACKAGES_DIR}/lib/python.lib")
@@ -230,10 +264,23 @@ else()
         list(APPEND OPTIONS "LIBS=-liconv -lintl")
     endif()
 
+    # The version of the build Python must match the version of the cross compiled host Python.
+    # https://docs.python.org/3/using/configure.html#cross-compiling-options
+    if(VCPKG_CROSSCOMPILING)
+        set(_python_for_build "${CURRENT_HOST_INSTALLED_DIR}/tools/python3/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
+        list(APPEND OPTIONS "--with-build-python=${_python_for_build}")
+    endif()
+
     vcpkg_configure_make(
         SOURCE_PATH "${SOURCE_PATH}"
-        OPTIONS ${OPTIONS}
-        OPTIONS_DEBUG "--with-pydebug"
+        AUTOCONFIG
+        OPTIONS
+            ${OPTIONS}
+        OPTIONS_DEBUG
+            "--with-pydebug"
+            "vcpkg_rpath=${CURRENT_INSTALLED_DIR}/debug/lib"
+        OPTIONS_RELEASE
+            "vcpkg_rpath=${CURRENT_INSTALLED_DIR}/lib"
     )
     vcpkg_install_make(ADD_BIN_TO_PATH INSTALL_TARGET altinstall)
 
@@ -255,8 +302,6 @@ else()
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin")
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug")
 
-    file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright")
-
     vcpkg_fixup_pkgconfig()
 
     # Perform some post-build checks on modules
@@ -280,6 +325,8 @@ else()
     endif()
 endif()
 
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+
 file(READ "${CMAKE_CURRENT_LIST_DIR}/usage" usage)
 if(VCPKG_TARGET_IS_WINDOWS)
     if(PYTHON_ALLOW_EXTENSIONS)
@@ -290,6 +337,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
 else()
     file(READ "${CMAKE_CURRENT_LIST_DIR}/usage.unix" usage_extra)
 endif()
+string(REPLACE "@PYTHON_VERSION_MINOR@" "${PYTHON_VERSION_MINOR}" usage_extra "${usage_extra}")
 file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" "${usage}\n${usage_extra}")
 
 function(_generate_finder)
@@ -309,6 +357,7 @@ _generate_finder(DIRECTORY "pythoninterp" PREFIX "PYTHON" NO_OVERRIDE)
 if (NOT VCPKG_TARGET_IS_WINDOWS)
     function(replace_dirs_in_config_file python_config_file)
         vcpkg_replace_string("${python_config_file}" "${CURRENT_INSTALLED_DIR}" "' + _base + '")
+        vcpkg_replace_string("${python_config_file}" "${CURRENT_HOST_INSTALLED_DIR}" "' + _base + '/../${HOST_TRIPLET}")
         vcpkg_replace_string("${python_config_file}" "${CURRENT_PACKAGES_DIR}" "' + _base + '")
         vcpkg_replace_string("${python_config_file}" "${CURRENT_BUILDTREES_DIR}" "not/existing")
     endfunction()
@@ -327,3 +376,12 @@ if (NOT VCPKG_TARGET_IS_WINDOWS)
         replace_dirs_in_config_file("${python_config_file}")
     endif()
 endif()
+
+if(VCPKG_TARGET_IS_WINDOWS)
+  vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/python3/Lib/distutils/command/build_ext.py" "'libs'" "'../../lib'")
+else()
+  vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/python3.${PYTHON_VERSION_MINOR}/distutils/command/build_ext.py" "'libs'" "'../../lib'")
+  file(COPY_FILE "${CURRENT_PACKAGES_DIR}/tools/python3/python3.${PYTHON_VERSION_MINOR}" "${CURRENT_PACKAGES_DIR}/tools/python3/python3")
+endif()
+
+configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" "${CURRENT_PACKAGES_DIR}/share/python3/vcpkg-port-config.cmake" @ONLY)
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/python3/python_vcpkg.props.in b/external_imported/vcpkg/ports/python3/python_vcpkg.props.in
index e5b6093a5..a64a17d01 100644
--- a/external_imported/vcpkg/ports/python3/python_vcpkg.props.in
+++ b/external_imported/vcpkg/ports/python3/python_vcpkg.props.in
@@ -8,11 +8,6 @@
       <AdditionalIncludeDirectories>
         %(AdditionalIncludeDirectories);${CURRENT_INSTALLED_DIR}/include
       </AdditionalIncludeDirectories>
-
-      <RuntimeLibrary Condition="'${VCPKG_CRT_LINKAGE}|$(Configuration)' == 'static|Debug'">MultiThreadedDebug</RuntimeLibrary>
-      <RuntimeLibrary Condition="'${VCPKG_CRT_LINKAGE}|$(Configuration)' == 'static|Release'">MultiThreaded</RuntimeLibrary>
-      <RuntimeLibrary Condition="'${VCPKG_CRT_LINKAGE}|$(Configuration)' == 'dynamic|Debug'">MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeLibrary Condition="'${VCPKG_CRT_LINKAGE}|$(Configuration)' == 'dynamic|Release'">MultiThreadedDLL</RuntimeLibrary>
     </CLCompile>
     <Link>
       <!-- Required Libs -->
@@ -36,6 +31,22 @@
       <!-- Required to prevent linker errors on Visual Studio 2017 with static CRT -->
       <TargetMachine Condition="'${VCPKG_TARGET_ARCHITECTURE}'=='x86'">MachineX86</TargetMachine>
       <TargetMachine Condition="'${VCPKG_TARGET_ARCHITECTURE}'=='x64'">MachineX64</TargetMachine>
+      <TargetMachine Condition="'${VCPKG_TARGET_ARCHITECTURE}'=='arm'">MachineARM</TargetMachine>
+      <!-- Required Libs -->
+      <AdditionalDependencies Condition="'$(Configuration)'=='Release'">
+        ${ZLIB_RELEASE};%(AdditionalDependencies)
+      </AdditionalDependencies>
+      <AdditionalDependencies Condition="'$(Configuration)'=='Debug'">
+        ${ZLIB_DEBUG};%(AdditionalDependencies)
+      </AdditionalDependencies>
+
+      <!-- Extension modules -->
+      <AdditionalDependencies Condition="'$(Configuration)|$(IncludeExtensions)' == 'Release|true'">
+        ${BZ2_RELEASE};${EXPAT_RELEASE};${FFI_RELEASE};${LZMA_RELEASE};${SQLITE_RELEASE};%(AdditionalDependencies)
+      </AdditionalDependencies>
+      <AdditionalDependencies Condition="'$(Configuration)|$(IncludeExtensions)' == 'Debug|true'">
+        ${BZ2_DEBUG};${EXPAT_DEBUG};${FFI_DEBUG};${LZMA_DEBUG};${SQLITE_DEBUG};%(AdditionalDependencies)
+      </AdditionalDependencies>
     </Lib>
   </ItemDefinitionGroup>
 </Project>
diff --git a/external_imported/vcpkg/ports/python3/usage.unix b/external_imported/vcpkg/ports/python3/usage.unix
index 614292c2f..fc2a575eb 100644
--- a/external_imported/vcpkg/ports/python3/usage.unix
+++ b/external_imported/vcpkg/ports/python3/usage.unix
@@ -1,6 +1,6 @@
 The package python3 provides a python interpreter that supports virtual environments:
 
-    $ tools/python3/python3.10 -m venv /path/to/venv
+    $ tools/python3/python3.@PYTHON_VERSION_MINOR@ -m venv /path/to/venv
     $ export VIRTUAL_ENV=/path/to/venv
     $ export PATH=/path/to/venv/bin:$PATH
     $ export -n PYTHONHOME
diff --git a/external_imported/vcpkg/ports/python3/usage.win b/external_imported/vcpkg/ports/python3/usage.win
index 3fcc343ed..dcbb71747 100644
--- a/external_imported/vcpkg/ports/python3/usage.win
+++ b/external_imported/vcpkg/ports/python3/usage.win
@@ -1,6 +1,6 @@
 The package python3 provides a python interpreter that supports virtual environments:
 
-    >tools\python3\python3.10 -m venv c:\path\to\venv
+    >tools\python3\python.exe -m venv c:\path\to\venv
     >set VIRTUAL_ENV=c:\path\to\venv
     >set PATH=c:\path\to\venv\bin;%PATH%
     >set PYTHONHOME=
diff --git a/external_imported/vcpkg/ports/python3/vcpkg-port-config.cmake b/external_imported/vcpkg/ports/python3/vcpkg-port-config.cmake
new file mode 100644
index 000000000..b3eab36d6
--- /dev/null
+++ b/external_imported/vcpkg/ports/python3/vcpkg-port-config.cmake
@@ -0,0 +1,12 @@
+set(PYTHON3_VERSION "@VERSION@")
+set(PYTHON3_VERSION_MAJOR "@PYTHON_VERSION_MAJOR@")
+set(PYTHON3_VERSION_MINOR "@PYTHON_VERSION_MINOR@")
+set(PYTHON3_INCLUDE "include/python${PYTHON3_VERSION_MAJOR}.${PYTHON3_VERSION_MINOR}")
+set(site_base "")
+if(VCPKG_TARGET_IS_WINDOWS)
+  set(site_base "tools/python${PYTHON3_VERSION_MAJOR}/Lib")
+else()
+  set(site_base "lib/python${PYTHON3_VERSION_MAJOR}.${PYTHON3_VERSION_MINOR}")
+endif()
+set(PYTHON3_SITE "${site_base}/site-packages")
+
diff --git a/external_imported/vcpkg/ports/python3/vcpkg.json b/external_imported/vcpkg/ports/python3/vcpkg.json
index a45ff7f8f..98052df71 100644
--- a/external_imported/vcpkg/ports/python3/vcpkg.json
+++ b/external_imported/vcpkg/ports/python3/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "python3",
-  "version": "3.10.7",
-  "port-version": 5,
+  "version": "3.11.5",
+  "port-version": 4,
   "description": "The Python programming language",
   "homepage": "https://github.com/python/cpython",
   "license": "Python-2.0",
@@ -44,6 +44,11 @@
       "name": "sqlite3",
       "platform": "!(windows & static)"
     },
+    {
+      "name": "vcpkg-msbuild",
+      "host": true,
+      "platform": "windows"
+    },
     "zlib"
   ],
   "features": {
diff --git a/external_imported/vcpkg/ports/qca/0002-fix-build-error.patch b/external_imported/vcpkg/ports/qca/0002-fix-build-error.patch
index 69993e79a..5515d21f7 100644
--- a/external_imported/vcpkg/ports/qca/0002-fix-build-error.patch
+++ b/external_imported/vcpkg/ports/qca/0002-fix-build-error.patch
@@ -23,35 +23,4 @@ index 80af6e84..ba86310d 100644
  endmacro(install_pdb)
  
  macro(normalize_path PATH)
-diff --git a/plugins/qca-ossl/qca-ossl.cpp b/plugins/qca-ossl/qca-ossl.cpp
-index b2c5d3d3..4250ec26 100644
---- a/plugins/qca-ossl/qca-ossl.cpp
-+++ b/plugins/qca-ossl/qca-ossl.cpp
-@@ -6846,6 +6846,7 @@ public:
-         else if (type == QLatin1String("aes256-ccm"))
-             return new opensslCipherContext(EVP_aes_256_ccm(), 0, this, type);
- #endif
-+#ifndef OPENSSL_NO_BF
-         else if (type == QLatin1String("blowfish-ecb"))
-             return new opensslCipherContext(EVP_bf_ecb(), 0, this, type);
-         else if (type == QLatin1String("blowfish-cfb"))
-@@ -6856,6 +6857,8 @@ public:
-             return new opensslCipherContext(EVP_bf_cbc(), 0, this, type);
-         else if (type == QLatin1String("blowfish-cbc-pkcs7"))
-             return new opensslCipherContext(EVP_bf_cbc(), 1, this, type);
-+#endif
-+#ifndef OPENSSL_NO_DES
-         else if (type == QLatin1String("tripledes-ecb"))
-             return new opensslCipherContext(EVP_des_ede3(), 0, this, type);
-         else if (type == QLatin1String("tripledes-cbc"))
-@@ -6872,6 +6875,7 @@ public:
-             return new opensslCipherContext(EVP_des_cfb(), 0, this, type);
-         else if (type == QLatin1String("des-ofb"))
-             return new opensslCipherContext(EVP_des_ofb(), 0, this, type);
-+#endif
- #ifndef OPENSSL_NO_CAST
-         else if (type == QLatin1String("cast5-ecb"))
-             return new opensslCipherContext(EVP_cast5_ecb(), 0, this, type);
--- 
-2.31.1
 
diff --git a/external_imported/vcpkg/ports/qca/portfile.cmake b/external_imported/vcpkg/ports/qca/portfile.cmake
index 4051346a8..6f1246f62 100644
--- a/external_imported/vcpkg/ports/qca/portfile.cmake
+++ b/external_imported/vcpkg/ports/qca/portfile.cmake
@@ -11,14 +11,16 @@ vcpkg_add_to_path("${PERL_EXE_PATH}")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/qca
-    REF v2.3.5
-    SHA512 c83ac69597f22d915479fd4fd1557b89c56ba384321c324f93cf2f1bd32a819cb6d7b008c44e7606fa39c8184043d97c36ee1210d23a6e8ce24c41c8a83e4fb9
+    REF "v${VERSION}"
+    SHA512 de06173aaea32aac19a24510b5dbb4bb79681217eb1e4256de36db9f7158ad485fa450ffba5e13c12a0425866923b54f9b4d6164d0eaf659fdf40e458f5ee017
     PATCHES
         0001-fix-path-for-vcpkg.patch
         0002-fix-build-error.patch
         0003-Define-NOMINMAX-for-botan-plugin-with-MSVC.patch
 )
 
+vcpkg_find_acquire_program(PKGCONFIG)
+
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
   set(QCA_FEATURE_INSTALL_DIR_DEBUG ${CURRENT_PACKAGES_DIR}/debug/bin/Qca)
   set(QCA_FEATURE_INSTALL_DIR_RELEASE ${CURRENT_PACKAGES_DIR}/bin/Qca)
@@ -45,10 +47,9 @@ vcpkg_execute_required_process(
 )
 message(STATUS "Importing certstore done")
 
+set(PLUGINS gnupg logger softstore wincrypto)
 if("botan" IN_LIST FEATURES)
-    list(APPEND QCA_OPTIONS -DWITH_botan_PLUGIN=yes)
-else()
-    list(APPEND QCA_OPTIONS -DWITH_botan_PLUGIN=no)
+    list(APPEND PLUGINS botan)
 endif()
 
 # Configure and build
@@ -56,13 +57,14 @@ vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DUSE_RELATIVE_PATHS=ON
+        "-DBUILD_PLUGINS=${PLUGINS}"
         -DBUILD_TESTS=OFF
         -DBUILD_TOOLS=OFF
         -DBUILD_WITH_QT6=ON
         -DQCA_SUFFIX=OFF
         -DQCA_FEATURE_INSTALL_DIR=share/qca/mkspecs/features
         -DOSX_FRAMEWORK=OFF
-        ${QCA_OPTIONS}
+        "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}"
     OPTIONS_DEBUG
         -DQCA_PLUGINS_INSTALL_DIR=${QCA_FEATURE_INSTALL_DIR_DEBUG}
     OPTIONS_RELEASE
@@ -90,4 +92,4 @@ file(REMOVE_RECURSE
 vcpkg_fixup_pkgconfig()
 
 # Handle copyright
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/qca/vcpkg.json b/external_imported/vcpkg/ports/qca/vcpkg.json
index 883739b43..cc1315838 100644
--- a/external_imported/vcpkg/ports/qca/vcpkg.json
+++ b/external_imported/vcpkg/ports/qca/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qca",
-  "version": "2.3.5",
+  "version": "2.3.7",
   "description": "Qt Cryptographic Architecture (QCA).",
   "homepage": "https://userbase.kde.org/QCA",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/qcoro/portfile.cmake b/external_imported/vcpkg/ports/qcoro/portfile.cmake
new file mode 100644
index 000000000..4ab92f341
--- /dev/null
+++ b/external_imported/vcpkg/ports/qcoro/portfile.cmake
@@ -0,0 +1,58 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO danvratil/qcoro
+    REF "v${VERSION}"
+    SHA512 de2e55256d3c9d35fec3ef6dc78128801b70a5e5b8ff0f3a6f235dac17f349ea44207a7c9f35375215dbeea04cb67c3412d505d0a8a95f2b926775f804a02649
+    HEAD_REF main
+)
+
+vcpkg_check_features(
+    OUT_FEATURE_OPTIONS EXTRA_OPTIONS
+    FEATURES
+        dbus        QCORO_WITH_QTDBUS
+        network     QCORO_WITH_QTNETWORK
+        websockets  QCORO_WITH_QTWEBSOCKETS
+        quick       QCORO_WITH_QTQUICK
+        qml         QCORO_WITH_QML
+        test        QCORO_WITH_QTTEST
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DUSE_QT_VERSION=6
+        -DBUILD_TESTING=OFF
+        -DQCORO_BUILD_EXAMPLES=OFF
+        ${EXTRA_OPTIONS}
+)
+
+vcpkg_cmake_install()
+
+if (QCORO_WITH_QTDBUS)
+    vcpkg_cmake_config_fixup(PACKAGE_NAME QCoro6DBus DO_NOT_DELETE_PARENT_CONFIG_PATH CONFIG_PATH lib/cmake/QCoro6DBus)
+endif()
+if (QCORO_WITH_QTNETWORK)
+    vcpkg_cmake_config_fixup(PACKAGE_NAME QCoro6Network DO_NOT_DELETE_PARENT_CONFIG_PATH CONFIG_PATH lib/cmake/QCoro6Network)
+endif()
+if (QCORO_WITH_QTWEBSOCKETS)
+    vcpkg_cmake_config_fixup(PACKAGE_NAME QCoro6WebSockets DO_NOT_DELETE_PARENT_CONFIG_PATH CONFIG_PATH lib/cmake/QCoro6WebSockets)
+endif()
+if (QCORO_WITH_QTQUICK)
+    vcpkg_cmake_config_fixup(PACKAGE_NAME QCoro6Quick DO_NOT_DELETE_PARENT_CONFIG_PATH CONFIG_PATH lib/cmake/QCoro6Quick)
+endif()
+if (QCORO_WITH_QML)
+    vcpkg_cmake_config_fixup(PACKAGE_NAME QCoro6Qml DO_NOT_DELETE_PARENT_CONFIG_PATH CONFIG_PATH lib/cmake/QCoro6Qml)
+endif()
+if (QCORO_WITH_QTTEST)
+    vcpkg_cmake_config_fixup(PACKAGE_NAME QCoro6Test DO_NOT_DELETE_PARENT_CONFIG_PATH CONFIG_PATH lib/cmake/QCoro6Test)
+endif()
+vcpkg_cmake_config_fixup(PACKAGE_NAME QCoro6Coro DO_NOT_DELETE_PARENT_CONFIG_PATH CONFIG_PATH lib/cmake/QCoro6Coro)
+vcpkg_cmake_config_fixup(PACKAGE_NAME QCoro6 DO_NOT_DELETE_PARENT_CONFIG_PATH CONFIG_PATH lib/cmake/QCoro6)
+vcpkg_cmake_config_fixup(PACKAGE_NAME QCoro6Core CONFIG_PATH lib/cmake/QCoro6Core)
+
+# Remove debug includes and CMake macros
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/qcoro/usage b/external_imported/vcpkg/ports/qcoro/usage
new file mode 100644
index 000000000..ddd875a87
--- /dev/null
+++ b/external_imported/vcpkg/ports/qcoro/usage
@@ -0,0 +1,36 @@
+qcoro-qt6 provides CMake targets:
+
+    # Generic coroutine types and tools
+    find_package(QCoro6Coro CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE QCoro6::Coro)
+
+    # Coroutine support for QtCore types
+    find_package(QCoro6Core CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE QCoro6::Core)
+
+    # Coroutine supports for QtDBus types
+    find_package(QCoro6DBus CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE QCoro6::DBus)
+
+    # Coroutine support for QtNetwork types
+    find_package(QCoro6Network CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE QCoro6::Network)
+
+    # Coroutine support for QtQml types
+    find_package(QCoro6Qml CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE QCoro6::Qml)
+
+    # Coroutine support for QML
+    find_package(QCoro6Quick CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE QCoro6::Quick)
+
+    # Coroutine support for developing tests with QtTest
+    find_package(QCoro6Test CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE QCoro6::Test)
+
+    # Coroutine support for QtWebSockets types
+    find_package(QCoro6WebSockets CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE QCoro6::WebSockets)
+
+You can also use `QCoro` target namespace for transparent
+support of both Qt5 and Qt6.
diff --git a/external_imported/vcpkg/ports/qcoro/vcpkg.json b/external_imported/vcpkg/ports/qcoro/vcpkg.json
new file mode 100644
index 000000000..ca8cc009f
--- /dev/null
+++ b/external_imported/vcpkg/ports/qcoro/vcpkg.json
@@ -0,0 +1,56 @@
+{
+  "name": "qcoro",
+  "version": "0.10.0",
+  "description": "Coroutine support for Qt",
+  "homepage": "https://www.github.com/danvratil/qcoro",
+  "documentation": "https://qcoro.dvratil.cz",
+  "license": "MIT",
+  "dependencies": [
+    "qtbase",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
+  "default-features": [
+    "dbus",
+    "network",
+    "qml",
+    "quick",
+    "test",
+    "websockets"
+  ],
+  "features": {
+    "dbus": {
+      "description": "Coroutine support for QtDBus module"
+    },
+    "network": {
+      "description": "Coroutine support for QtNetwork module"
+    },
+    "qml": {
+      "description": "Coroutine support for QtQml module",
+      "dependencies": [
+        "qtdeclarative"
+      ]
+    },
+    "quick": {
+      "description": "Coroutine support for QtQuick module",
+      "dependencies": [
+        "qtdeclarative"
+      ]
+    },
+    "test": {
+      "description": "Support code for easier testing of coroutines with QtTest."
+    },
+    "websockets": {
+      "description": "Coroutine support for QtWebSockets module",
+      "dependencies": [
+        "qtwebsockets"
+      ]
+    }
+  }
+}
diff --git a/external_imported/vcpkg/ports/qcustomplot/config.patch b/external_imported/vcpkg/ports/qcustomplot/config.patch
new file mode 100644
index 000000000..fac3a09f6
--- /dev/null
+++ b/external_imported/vcpkg/ports/qcustomplot/config.patch
@@ -0,0 +1,25 @@
+--- a/sharedlib-compilation/sharedlib-compilation.pro
++++ b/sharedlib-compilation/sharedlib-compilation.pro
+@@ -10,7 +10,6 @@
+ 
+ DEFINES += QCUSTOMPLOT_COMPILE_LIBRARY
+ TEMPLATE = lib
+-CONFIG += debug_and_release build_all
+ static {
+   CONFIG += static
+ } else {
+@@ -33,3 +32,14 @@
+ 
+ SOURCES += ../../qcustomplot.cpp
+ HEADERS += ../../qcustomplot.h
++win32 {
++    dlltarget.path = $$[QT_INSTALL_BINS]
++    INSTALLS += dlltarget
++}
++target.path    = $$[QT_INSTALL_LIBS]
++!static: target.CONFIG = no_dll
++INSTALLS     += target
++
++headers.files += ../../qcustomplot.h
++headers.path = $$[QT_INSTALL_PREFIX]/include
++INSTALLS     += headers
diff --git a/external_imported/vcpkg/ports/qcustomplot/portfile.cmake b/external_imported/vcpkg/ports/qcustomplot/portfile.cmake
index 026f62fb3..f0038d089 100644
--- a/external_imported/vcpkg/ports/qcustomplot/portfile.cmake
+++ b/external_imported/vcpkg/ports/qcustomplot/portfile.cmake
@@ -1,38 +1,32 @@
-set(QCP_VERSION 2.0.1)
-
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://www.qcustomplot.com/release/${QCP_VERSION}/QCustomPlot.tar.gz"
-    FILENAME "QCustomPlot-${QCP_VERSION}.tar.gz"
-    SHA512 a15598718146ed3c6b5d38530a56661c16269e530fe0dedb71b4cb2722b5733a3b57689d668a75994b79c19c6e61dcc133dbcb9ed77b93a165f4ac826a5685b9
+    URLS "https://www.qcustomplot.com/release/${VERSION}/QCustomPlot.tar.gz"
+    FILENAME "QCustomPlot-${VERSION}.tar.gz"
+    SHA512 2e49a9b3f7ab03bcd580e5f3c3ae0d5e8c57d3ccce0ceed9862cde7ea23e2f3672a963af988be60e504cb5aa50bc462e4b28acf577eae41cc6fea2802642dc19
 )
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
-    REF ${QCP_VERSION}
+vcpkg_extract_source_archive(
+    SOURCE_PATH
+    ARCHIVE "${ARCHIVE}"
 )
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://www.qcustomplot.com/release/${QCP_VERSION}/QCustomPlot-sharedlib.tar.gz"
-    FILENAME "QCustomPlot-sharedlib-${QCP_VERSION}.tar.gz"
-    SHA512 ce90540fca7226eac37746327e1939a9c7af38fc2595f385ed04d6d1f49560da08fb5fae15d1b9d22b6ba578583f70de8f89ef26796770d41bf599c1b15c535d
+    URLS "https://www.qcustomplot.com/release/${VERSION}/QCustomPlot-sharedlib.tar.gz"
+    FILENAME "QCustomPlot-sharedlib-${VERSION}.tar.gz"
+    SHA512 c661e4a835066fee92b254fbd7b825dbd5c58973189ff2099a01308cb81fe6bf3bac1456f5da91f01c6265f8f548f61b57e237d00a9b5c2c94acf1a024baa18e
 )
-vcpkg_extract_source_archive(SharedLib_SOURCE_PATH ARCHIVE "${ARCHIVE}")
-file(RENAME "${SharedLib_SOURCE_PATH}" "${SOURCE_PATH}/qcustomplot-sharedlib")
-
-
-vcpkg_configure_qmake(SOURCE_PATH
-    ${SOURCE_PATH}/qcustomplot-sharedlib/sharedlib-compilation/sharedlib-compilation.pro
-)
-
-vcpkg_install_qmake(
-    RELEASE_TARGETS release-all
-    DEBUG_TARGETS debug-all
+vcpkg_extract_source_archive(
+    SharedLib_SOURCE_PATH
+    ARCHIVE "${ARCHIVE}"
+    PATCHES
+        config.patch
 )
+file(RENAME "${SharedLib_SOURCE_PATH}" "${SOURCE_PATH}/qcustomplot-sharedlib")
 
-# Install header file
-file(INSTALL ${SOURCE_PATH}/qcustomplot.h
-    DESTINATION ${CURRENT_PACKAGES_DIR}/include
+vcpkg_qmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}/qcustomplot-sharedlib/sharedlib-compilation/sharedlib-compilation.pro"
+    QMAKE_OPTIONS
+        "${OSX_OPTIONS}"
 )
+vcpkg_qmake_install()
 
 vcpkg_copy_pdbs()
 
diff --git a/external_imported/vcpkg/ports/qcustomplot/vcpkg.json b/external_imported/vcpkg/ports/qcustomplot/vcpkg.json
index 6d2c2c665..c8bd342a9 100644
--- a/external_imported/vcpkg/ports/qcustomplot/vcpkg.json
+++ b/external_imported/vcpkg/ports/qcustomplot/vcpkg.json
@@ -1,11 +1,19 @@
 {
   "name": "qcustomplot",
-  "version": "2.0.1",
-  "port-version": 5,
+  "version": "2.1.1",
+  "port-version": 1,
   "description": "QCustomPlot is a Qt C++ widget for plotting and data visualization.",
+  "homepage": "https://www.qcustomplot.com/",
+  "license": "GPL-3.0-or-later",
+  "supports": "!xbox",
   "dependencies": [
     {
-      "name": "qt5-base",
+      "name": "qtbase",
+      "default-features": false
+    },
+    {
+      "name": "vcpkg-qmake",
+      "host": true,
       "default-features": false
     }
   ]
diff --git a/external_imported/vcpkg/ports/qoi/portfile.cmake b/external_imported/vcpkg/ports/qoi/portfile.cmake
new file mode 100644
index 000000000..6fedd4d1c
--- /dev/null
+++ b/external_imported/vcpkg/ports/qoi/portfile.cmake
@@ -0,0 +1,13 @@
+#header-only library
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO phoboslab/qoi
+    REF 19b3b4087b66963a3699ee45f05ec9ef205d7c0e # committed on 2023-08-10
+    SHA512 8131031ba4b3b3c50838eb83db44bed0bf2e3fc820f18a9e48202801aebef4179f9b465354487070d7bc1feea79461abe581eecde00d61a21e27fe2b8a52699f
+    HEAD_REF master
+)
+
+file(INSTALL "${SOURCE_PATH}/qoi.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/qoi/vcpkg.json b/external_imported/vcpkg/ports/qoi/vcpkg.json
new file mode 100644
index 000000000..465e4e10d
--- /dev/null
+++ b/external_imported/vcpkg/ports/qoi/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "qoi",
+  "version-date": "2023-08-10",
+  "description": "The Quite OK Image Format for fast, lossless image compression",
+  "homepage": "https://qoiformat.org/",
+  "license": "MIT"
+}
diff --git a/external_imported/vcpkg/ports/qoixx/portfile.cmake b/external_imported/vcpkg/ports/qoixx/portfile.cmake
new file mode 100644
index 000000000..b68514d92
--- /dev/null
+++ b/external_imported/vcpkg/ports/qoixx/portfile.cmake
@@ -0,0 +1,13 @@
+#header-only library
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO wx257osn2/qoixx
+    REF eac3b33fbcb96a2664c00c24fe4e3e0d35cc7a7e # committed on 2022-12-07
+    SHA512 5dd379036e064527cb25376864fb6e6cb3d461baf95a6c98148202a8072f049ae0edfbac17bf76550eeb1f367d2426b6edd0a86b9231d50bb66771878df207c4
+    HEAD_REF master
+)
+
+file(INSTALL "${SOURCE_PATH}/include/qoixx.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/qoixx/vcpkg.json b/external_imported/vcpkg/ports/qoixx/vcpkg.json
new file mode 100644
index 000000000..cef3ddb9a
--- /dev/null
+++ b/external_imported/vcpkg/ports/qoixx/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "qoixx",
+  "version-date": "2022-12-07",
+  "description": "Single Header Quite Fast QOI(Quite OK Image Format) Implementation written in C++20",
+  "homepage": "https://github.com/wx257osn2/qoixx",
+  "license": "MIT"
+}
diff --git a/external_imported/vcpkg/ports/qpid-proton/fix-dependencies.patch b/external_imported/vcpkg/ports/qpid-proton/fix-dependencies.patch
index 6828a3015..dfc5985fc 100644
--- a/external_imported/vcpkg/ports/qpid-proton/fix-dependencies.patch
+++ b/external_imported/vcpkg/ports/qpid-proton/fix-dependencies.patch
@@ -1,26 +1,23 @@
 diff --git a/c/CMakeLists.txt b/c/CMakeLists.txt
-index 27b40e7..a3a5d38 100644
+index 27b40e7..81de970 100644
 --- a/c/CMakeLists.txt
 +++ b/c/CMakeLists.txt
-@@ -377,11 +377,15 @@ if (PROACTOR STREQUAL "iocp" OR (NOT PROACTOR AND NOT PROACTOR_OK))
+@@ -377,8 +377,13 @@ if (PROACTOR STREQUAL "iocp" OR (NOT PROACTOR AND NOT PROACTOR_OK))
  endif()
  
  if (PROACTOR STREQUAL "libuv" OR (NOT PROACTOR AND NOT PROACTOR_OK))
 -  find_package(Libuv)
 +  find_package(Libuv NAMES libuv CONFIG)
    if (Libuv_FOUND)
-     set (PROACTOR_OK libuv)
-     set (qpid-proton-proactor src/proactor/libuv.c ${qpid-proton-proactor-common})
--    set (PROACTOR_LIBS Libuv::Libuv)
-+    if (TARGET uv)
-+    set (PROACTOR_LIBS uv)
++    if (TARGET libuv::uv)
++      add_library(Libuv::Libuv ALIAS libuv::uv)
 +    else()
-+    set (PROACTOR_LIBS uv_a)
++      add_library(Libuv::Libuv ALIAS libuv::uv_a)
 +    endif()
-   endif()
- endif()
- 
-@@ -727,11 +731,6 @@ install (FILES
+     set (PROACTOR_OK libuv)
+     set (qpid-proton-proactor src/proactor/libuv.c ${qpid-proton-proactor-common})
+     set (PROACTOR_LIBS Libuv::Libuv)
+@@ -727,11 +732,6 @@ install (FILES
    ${CMAKE_CURRENT_BINARY_DIR}/ProtonConfig.cmake
    ${CMAKE_CURRENT_BINARY_DIR}/ProtonConfigVersion.cmake
    DESTINATION ${LIB_INSTALL_DIR}/cmake/Proton)
@@ -33,74 +30,48 @@ index 27b40e7..a3a5d38 100644
  if (ENABLE_BENCHMARKS)
    add_subdirectory(benchmarks)
 diff --git a/c/src/ProtonConfig.cmake.in b/c/src/ProtonConfig.cmake.in
-index 6bcc3c0..2f03dc4 100644
+index 3eca7bc..fe27234 100644
 --- a/c/src/ProtonConfig.cmake.in
 +++ b/c/src/ProtonConfig.cmake.in
-@@ -23,7 +23,8 @@
+@@ -23,7 +23,7 @@
  # URL: http://qpid.apache.org/proton/
  
  @PACKAGE_INIT@
 -if (NOT Proton_USE_STATIC_LIBS)
-+include(CMakeFindDependencyMacro)
-+if (1)
++if ("1")
    include("${CMAKE_CURRENT_LIST_DIR}/ProtonTargets.cmake")
  else()
    include("${CMAKE_CURRENT_LIST_DIR}/ProtonTargetsStatic.cmake")
-@@ -32,24 +33,21 @@ endif()
+@@ -32,9 +32,8 @@ endif()
  set(Proton_VERSION @PN_VERSION@)
  
  # find dependencies, because static libs don't transitively pull them
 -if (Proton_USE_STATIC_LIBS)
--    set(CMAKE_MODULE_PATH_OLD ${CMAKE_MODULE_PATH})
++if ("1")
+     set(CMAKE_MODULE_PATH_OLD ${CMAKE_MODULE_PATH})
 -    set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
-+if (1)
  
      set(CyrusSASL_FOUND @CyrusSASL_FOUND@)
      if (CyrusSASL_FOUND)
--        find_package (CyrusSASL REQUIRED)
-+        find_dependency (CyrusSASL)
-     endif()
- 
-     set(OPENSSL_FOUND @OPENSSL_FOUND@)
-     set(OpenSSL_FOUND @OpenSSL_FOUND@)
-     if (OPENSSL_FOUND OR OpenSSL_FOUND)
--        find_package (OpenSSL REQUIRED)
-+        find_dependency (OpenSSL)
-     endif()
- 
--    find_package (Threads REQUIRED)
-+    find_dependency (Threads)
- 
--    set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH_OLD})
- endif()
- 
- set (Proton_INCLUDE_DIRS @PACKAGE_INCLUDE_INSTALL_DIR@)
 diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
-index 03fe80a..89c14ed 100644
+index 2049fe9..3dc8a06 100644
 --- a/cpp/CMakeLists.txt
 +++ b/cpp/CMakeLists.txt
-@@ -26,12 +26,15 @@ find_package(Threads)
+@@ -26,10 +26,10 @@ find_package(Threads)
  include(versions.cmake)
  
  # Check for JSON-CPP support for connection configuration
 -find_package(JsonCpp)
--option(ENABLE_JSONCPP "Use jsoncpp parser for connection configuration" ${JsonCpp_FOUND})
-+option(ENABLE_JSONCPP "Use jsoncpp parser for connection configuration" OFF)
+ option(ENABLE_JSONCPP "Use jsoncpp parser for connection configuration" ${JsonCpp_FOUND})
  if (ENABLE_JSONCPP)
 -  include_directories(${JsonCpp_INCLUDE_DIRS})
-+  find_package(jsoncpp CONFIG REQUIRED)
++  find_package(JsonCpp NAMES jsoncpp CONFIG REQUIRED)
++  set(JsonCpp_LIBRARY JsonCpp::JsonCpp)
    set(CONNECT_CONFIG_SRC src/connect_config.cpp)
--  set(CONNECT_CONFIG_LIBS ${JsonCpp_LIBRARY})
-+  if (TARGET jsoncpp_lib)
-+    set(CONNECT_CONFIG_LIBS jsoncpp_lib)
-+  elseif (TARGET jsoncpp_static)
-+    set(CONNECT_CONFIG_LIBS jsoncpp_static)
-+  endif()
+   set(CONNECT_CONFIG_LIBS ${JsonCpp_LIBRARY})
  else()
-   set(CONNECT_CONFIG_SRC src/connect_config_dummy.cpp)
- endif()
 diff --git a/cpp/ProtonCppConfig.cmake.in b/cpp/ProtonCppConfig.cmake.in
-index 74ddfaa..2fece73 100644
+index aaa1bf9..e1be025 100644
 --- a/cpp/ProtonCppConfig.cmake.in
 +++ b/cpp/ProtonCppConfig.cmake.in
 @@ -23,7 +23,9 @@
diff --git a/external_imported/vcpkg/ports/qpid-proton/portfile.cmake b/external_imported/vcpkg/ports/qpid-proton/portfile.cmake
index 686c1c089..3c4d65306 100644
--- a/external_imported/vcpkg/ports/qpid-proton/portfile.cmake
+++ b/external_imported/vcpkg/ports/qpid-proton/portfile.cmake
@@ -3,10 +3,11 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO apache/qpid-proton
-    REF fee5e94afb83b92ffa60a6f815d5102a67915166 # 0.37.0
-    SHA512 e9fbd02444dd073908186e6873b4e230e0a5971929e9b1a49758240d166f6da4e6c88d701c66d5e5539bea0beca380c763bffcef5b0e1ed5f9fc2691f5f86559 
+    REF "${VERSION}"
+    SHA512 05c3fded3db1fae0e6a7b9fbe34fe17af41a676a584ee916cbbeb82e957d7da74861524c5db06634326c403fabc82fddf938d018d9383745a6ce0cbc7a9eada3 
     HEAD_REF next
-    PATCHES fix-dependencies.patch
+    PATCHES
+        fix-dependencies.patch
 )
 
 file(REMOVE "${SOURCE_PATH}/tools/cmake/Modules/FindPython.cmake")
@@ -24,10 +25,13 @@ vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE # It may cause call CHECK_LIBRARY_EXISTS before call project to set the language
     OPTIONS
-        -DBUILD_GO=no
+        -DBUILD_BINDINGS=cpp
         -DCMAKE_DISABLE_FIND_PACKAGE_CyrusSASL=ON
+        -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
+        -DCMAKE_DISABLE_FIND_PACKAGE_SWIG=ON
         -DENABLE_JSONCPP=ON
         -DENABLE_LINKTIME_OPTIMIZATION=OFF
+        -DENABLE_OPENTELEMETRYCPP=OFF
         -DLIB_SUFFIX=
         -DENABLE_WARNING_ERROR=OFF
         -DENABLE_BENCHMARKS=OFF
@@ -39,28 +43,27 @@ vcpkg_cmake_configure(
 )
 
 vcpkg_cmake_install()
+vcpkg_copy_pdbs()
 
 # qpid-proton installs tests into share/proton; this is not desireable
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/proton")
 
-vcpkg_copy_pdbs()
 vcpkg_cmake_config_fixup(
-    PACKAGE_NAME Proton
+    PACKAGE_NAME proton
     CONFIG_PATH lib/cmake/Proton
     DO_NOT_DELETE_PARENT_CONFIG_PATH
 )
 vcpkg_cmake_config_fixup(
-    PACKAGE_NAME ProtonCpp
+    PACKAGE_NAME protoncpp
     CONFIG_PATH lib/cmake/ProtonCpp
 )
 vcpkg_fixup_pkgconfig()
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(REMOVE_RECURSE
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/debug/share"
+)
 
 vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/proton/version.h" "#define PN_INSTALL_PREFIX \"${CURRENT_PACKAGES_DIR}\"" "")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt"
-    DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
-    RENAME copyright
-)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/external_imported/vcpkg/ports/qpid-proton/vcpkg.json b/external_imported/vcpkg/ports/qpid-proton/vcpkg.json
index 1de560fe8..28d5dfbc7 100644
--- a/external_imported/vcpkg/ports/qpid-proton/vcpkg.json
+++ b/external_imported/vcpkg/ports/qpid-proton/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "qpid-proton",
-  "version": "0.37.0",
-  "port-version": 3,
+  "version": "0.38.0",
+  "port-version": 1,
   "description": "Qpid Proton is a high-performance, lightweight messaging library.",
   "homepage": "https://github.com/apache/qpid-proton",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/qscintilla/portfile.cmake b/external_imported/vcpkg/ports/qscintilla/portfile.cmake
index 07ea7faa0..2335e5445 100644
--- a/external_imported/vcpkg/ports/qscintilla/portfile.cmake
+++ b/external_imported/vcpkg/ports/qscintilla/portfile.cmake
@@ -17,21 +17,24 @@ vcpkg_find_acquire_program(PYTHON3)
 get_filename_component(PYTHON3_PATH ${PYTHON3} DIRECTORY)
 vcpkg_add_to_path(${PYTHON3_PATH})
 
-vcpkg_configure_qmake(
-    SOURCE_PATH ${SOURCE_PATH}/src
-    OPTIONS
-        CONFIG+=build_all
-        CONFIG-=hide_symbols
-        DEFINES+=SCI_NAMESPACE
+vcpkg_qmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}/src"
+    QMAKE_OPTIONS
+        "CONFIG-=hide_symbols"
+        "DEFINES+=SCI_NAMESPACE"
 )
+vcpkg_qmake_install()
 
-if(VCPKG_TARGET_IS_WINDOWS)
-    vcpkg_install_qmake(
-        RELEASE_TARGETS release
-        DEBUG_TARGETS debug
-    )
-else()
-    vcpkg_install_qmake()
+file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/lib/*.dll")
+if(DLLS)
+    file(COPY ${DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
+    file(REMOVE ${DLLS})
+endif()
+
+file(GLOB DEBUG_DLLS "${CURRENT_PACKAGES_DIR}/debug/lib/*.dll")
+if(DEBUG_DLLS)
+    file(COPY ${DEBUG_DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
+    file(REMOVE ${DEBUG_DLLS})
 endif()
 
 file(GLOB HEADER_FILES ${SOURCE_PATH}/src/Qsci/*)
diff --git a/external_imported/vcpkg/ports/qscintilla/vcpkg.json b/external_imported/vcpkg/ports/qscintilla/vcpkg.json
index fb558bd61..864d54fe5 100644
--- a/external_imported/vcpkg/ports/qscintilla/vcpkg.json
+++ b/external_imported/vcpkg/ports/qscintilla/vcpkg.json
@@ -1,21 +1,20 @@
 {
   "name": "qscintilla",
   "version": "2.13.4",
+  "port-version": 2,
   "description": "QScintilla is a port to Qt of the Scintilla editing component. Features syntax highlighting, code-completion and much more (Barebone build without python bindings (missing dependeny PyQt) and without QtDesigner plugin)",
   "homepage": "https://www.riverbankcomputing.com/software/qscintilla",
   "license": "GPL-3.0-or-later",
+  "supports": "!xbox",
   "dependencies": [
     {
-      "name": "qt5-base",
+      "name": "qtbase",
       "default-features": false
     },
     {
-      "name": "qt5-macextras",
-      "platform": "osx"
-    },
-    {
-      "name": "qt5-winextras",
-      "platform": "windows"
+      "name": "vcpkg-qmake",
+      "host": true,
+      "default-features": false
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/qt-advanced-docking-system/config_changes.patch b/external_imported/vcpkg/ports/qt-advanced-docking-system/config_changes.patch
deleted file mode 100644
index 106ba1c8e..000000000
--- a/external_imported/vcpkg/ports/qt-advanced-docking-system/config_changes.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 49cd799..6535465 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -54,7 +54,7 @@ if (UNIX AND NOT APPLE)
-     set(ads_SRCS linux/FloatingWidgetTitleBar.cpp ${ads_SRCS})
-     set(ads_HEADERS linux/FloatingWidgetTitleBar.h ${ads_HEADERS})
- endif()
--if(BUILD_STATIC)
-+if(NOT BUILD_SHARED_LIBS)
-     add_library(qtadvanceddocking STATIC ${ads_SRCS} ${ads_HEADERS})
-     target_compile_definitions(qtadvanceddocking PUBLIC ADS_STATIC)
- else()
diff --git a/external_imported/vcpkg/ports/qt-advanced-docking-system/portfile.cmake b/external_imported/vcpkg/ports/qt-advanced-docking-system/portfile.cmake
index ae300ba02..f6524e794 100644
--- a/external_imported/vcpkg/ports/qt-advanced-docking-system/portfile.cmake
+++ b/external_imported/vcpkg/ports/qt-advanced-docking-system/portfile.cmake
@@ -1,13 +1,9 @@
-vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO githubuser0xFFFF/Qt-Advanced-Docking-System
-    REF d5fefaa35fb53e299b7f39b0d8f541954c710d94
-    SHA512 fcafee34d4d5365b3677c648e0d9a1ea8afd5463ca682ae19b10661490aca44d4f010ba768ed9c639b8ada10106be7aff336c2b7b42f10dc12db6b51988b4e22
+    REF "${VERSION}"
+    SHA512 d06939e7c8a5ffb8398257889e0f393ac1d06b20fc4326327226334cbf1a3cf7bc1878a1d9d4cc73dd8f178982b6508e2aa8435f715d5a610914835fc318b471
     HEAD_REF master
-    PATCHES
-        config_changes.patch
-        qt.patch
 )
 
 if(VCPKG_CROSSCOMPILING)
@@ -23,19 +19,19 @@ vcpkg_cmake_configure(
         -DBUILD_EXAMPLES=OFF
         -DADS_VERSION=${VERSION}
         -DQT_VERSION_MAJOR=6
-        -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=TRUE
         -DBUILD_STATIC=${BUILD_STATIC}
-    MAYBE_UNUSED_VARIABLES
-        CMAKE_DISABLE_FIND_PACKAGE_Qt5
 )
 vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(PACKAGE_NAME "qtadvanceddocking" CONFIG_PATH "lib/cmake/qtadvanceddocking")
+vcpkg_cmake_config_fixup(PACKAGE_NAME "qt6advanceddocking" CONFIG_PATH "lib/cmake/qt6advanceddocking")
 
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/qt6advanceddocking/qt6advanceddockingConfig.cmake"
+"include(CMakeFindDependencyMacro)"
+[[include(CMakeFindDependencyMacro)
+find_dependency(Qt6 COMPONENTS Core Gui Widgets)]])
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/license")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/license")
 
 file(INSTALL "${SOURCE_PATH}/gnu-lgpl-v2.1.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/qt-advanced-docking-system/qt.patch b/external_imported/vcpkg/ports/qt-advanced-docking-system/qt.patch
deleted file mode 100644
index 08d5062ea..000000000
--- a/external_imported/vcpkg/ports/qt-advanced-docking-system/qt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 653546544..2091bce16 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1,6 +1,5 @@
- cmake_minimum_required(VERSION 3.5)
- project(QtAdvancedDockingSystem LANGUAGES CXX VERSION ${VERSION_SHORT})
--find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
- find_package(Qt${QT_VERSION_MAJOR} 5.5 COMPONENTS Core Gui Widgets REQUIRED)
- if (UNIX AND NOT APPLE)
-     include_directories(${Qt${QT_VERSION_MAJOR}Gui_PRIVATE_INCLUDE_DIRS})
diff --git a/external_imported/vcpkg/ports/qt-advanced-docking-system/vcpkg.json b/external_imported/vcpkg/ports/qt-advanced-docking-system/vcpkg.json
index 4ce52db41..e1a9f13b4 100644
--- a/external_imported/vcpkg/ports/qt-advanced-docking-system/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt-advanced-docking-system/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "qt-advanced-docking-system",
-  "version": "3.8.2",
-  "port-version": 2,
+  "version": "4.2.1",
   "description": "Create customizable layouts using an advanced window docking system similar to what is found in many popular IDEs such as Visual Studio",
   "homepage": "https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System",
   "license": "LGPL-2.1-only",
+  "supports": "!xbox",
   "dependencies": [
     "bzip2",
     {
diff --git a/external_imported/vcpkg/ports/qt/vcpkg.json b/external_imported/vcpkg/ports/qt/vcpkg.json
index 81b416954..0191ed184 100644
--- a/external_imported/vcpkg/ports/qt/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt",
-  "version": "6.4.3",
+  "version": "6.6.1",
   "description": "Qt",
   "homepage": "https://www.qt.io/",
   "license": null,
@@ -52,6 +52,8 @@
       "platform": "linux"
     },
     "qtdoc",
+    "qtgraphs",
+    "qtgrpc",
     {
       "name": "qtimageformats",
       "default-features": false,
@@ -182,10 +184,7 @@
     },
     {
       "name": "qtwebview",
-      "default-features": false,
-      "features": [
-        "qml"
-      ]
+      "default-features": false
     },
     {
       "name": "qtwebview",
diff --git a/external_imported/vcpkg/ports/qt3d/vcpkg.json b/external_imported/vcpkg/ports/qt3d/vcpkg.json
index 40ed73730..9e9520ba6 100644
--- a/external_imported/vcpkg/ports/qt3d/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt3d/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt3d",
-  "version": "6.4.3",
+  "version": "6.6.1",
   "description": "Qt wrapper for existing OPC UA stacks",
   "homepage": "https://www.qt.io/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/qt5-3d/portfile.cmake b/external_imported/vcpkg/ports/qt5-3d/portfile.cmake
index 95815d671..842418a20 100644
--- a/external_imported/vcpkg/ports/qt5-3d/portfile.cmake
+++ b/external_imported/vcpkg/ports/qt5-3d/portfile.cmake
@@ -1,53 +1,10 @@
-include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
+include("${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake")
 
 set(OPTIONS -system-assimp)
 
-if(VCPKG_TARGET_IS_WINDOWS)
-    set(VCVER vc140 vc141 vc142 vc143 )
-    set(CRT mt md)
-    set(DBG_NAMES)
-    set(REL_NAMES)
-    foreach(_ver IN LISTS VCVER)
-        foreach(_crt IN LISTS CRT)
-            list(APPEND DBG_NAMES assimp-${_ver}-${_crt}d)
-            list(APPEND REL_NAMES assimp-${_ver}-${_crt})
-        endforeach()
-    endforeach()
-endif()
+x_vcpkg_pkgconfig_get_modules(PREFIX assimp MODULES assimp LIBS)
 
-find_library(ASSIMP_REL NAMES assimp ${REL_NAMES} PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) 
-find_library(ASSIMP_DBG NAMES assimp assimpd ${DBG_NAMES} PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
-
-find_library(MINIZIP_REL NAMES minizip PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) 
-find_library(MINIZIP_DBG NAMES minizip minizipd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
-find_library(KUBAZIP_REL NAMES kubazip PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) 
-find_library(KUBAZIP_DBG NAMES kubazip kubazipd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
-find_library(JPEG_REL NAMES jpeg jpeg-static PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
-find_library(JPEG_DBG NAMES jpeg jpeg-static jpegd jpeg-staticd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
-find_library(LIBPNG_REL NAMES png16 libpng16 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) #Depends on zlib
-find_library(LIBPNG_DBG NAMES png16 png16d libpng16 libpng16d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
-find_library(ZLIB_REL NAMES z zlib PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
-find_library(ZLIB_DBG NAMES z zlib zd zlibd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
-find_library(PUGIXML_REL NAMES pugixml PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
-find_library(PUGIXML_DBG NAMES pugixml pugixmld PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
-find_library(POLY2TRI_REL NAMES poly2tri PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) 
-find_library(POLY2TRI_DBG NAMES poly2tri poly2trid PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
-find_library(BZ2_REL bz2 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
-find_library(BZ2_DBG bz2 bz2d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
-if(BZ2_REL)
-    string(APPEND MINIZIP_REL " ${BZ2_REL}")
-endif()
-if(BZ2_DBG)
-    string(APPEND MINIZIP_DBG " ${BZ2_DBG}")
-endif()
-if(VCPKG_TARGET_IS_WINDOWS)
-    set(SYSTEM_LIBS "Advapi32.lib user32.lib gdi32.lib")
-elseif(VCPKG_TARGET_IS_OSX)
-    set(SYSTEM_LIBS "-framework OpenGL -framework Cocoa -framework Carbon -framework IOKit -framework AppKit")
-else()
-    set(SYSTEM_LIBS "-lGL -lXxf86vm -lX11")
-endif()
-set(OPT_REL "ASSIMP_LIBS=${ASSIMP_REL} ${PUGIXML_REL} ${POLY2TRI_REL} ${JPEG_REL} ${LIBPNG_REL} ${KUBAZIP_REL} ${MINIZIP_REL} ${ZLIB_REL} ${SYSTEM_LIBS}")
-set(OPT_DBG "ASSIMP_LIBS=${ASSIMP_DBG} ${PUGIXML_DBG} ${POLY2TRI_DBG} ${JPEG_DBG} ${LIBPNG_DBG} ${KUBAZIP_DBG} ${MINIZIP_DBG} ${ZLIB_DBG} ${SYSTEM_LIBS}")
+set(OPT_REL "ASSIMP_LIBS=${assimp_LIBS_RELEASE}")
+set(OPT_DBG "ASSIMP_LIBS=${assimp_LIBS_DEBUG}")
 
 qt_submodule_installation(BUILD_OPTIONS ${OPTIONS} BUILD_OPTIONS_RELEASE ${OPT_REL} BUILD_OPTIONS_DEBUG ${OPT_DBG})
diff --git a/external_imported/vcpkg/ports/qt5-3d/vcpkg.json b/external_imported/vcpkg/ports/qt5-3d/vcpkg.json
index 38be8612d..b0eb2c5c7 100644
--- a/external_imported/vcpkg/ports/qt5-3d/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5-3d/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt5-3d",
-  "version": "5.15.8",
+  "version": "5.15.12",
   "description": "Qt5 3d Module - Functionality for near-realtime simulation systems with support for 2D and 3D rendering",
   "license": null,
   "dependencies": [
@@ -11,6 +11,10 @@
     },
     "qt5-declarative",
     "qt5-gamepad",
-    "qt5-imageformats"
+    "qt5-imageformats",
+    {
+      "name": "vcpkg-pkgconfig-get-modules",
+      "host": true
+    }
   ]
 }
diff --git a/external_imported/vcpkg/ports/qt5-activeqt/portfile.cmake b/external_imported/vcpkg/ports/qt5-activeqt/portfile.cmake
index a73a60551..d11e2a0f6 100644
--- a/external_imported/vcpkg/ports/qt5-activeqt/portfile.cmake
+++ b/external_imported/vcpkg/ports/qt5-activeqt/portfile.cmake
@@ -1,6 +1,2 @@
-if (NOT VCPKG_TARGET_IS_WINDOWS)
-    message(FATAL_ERROR "qt5-activeqt only support Windows.")
-endif()
-
-include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
-qt_submodule_installation()
\ No newline at end of file
+include("${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake")
+qt_submodule_installation()
diff --git a/external_imported/vcpkg/ports/qt5-activeqt/vcpkg.json b/external_imported/vcpkg/ports/qt5-activeqt/vcpkg.json
index 98fd62f86..02ac49806 100644
--- a/external_imported/vcpkg/ports/qt5-activeqt/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5-activeqt/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt5-activeqt",
-  "version": "5.15.8",
+  "version": "5.15.12",
   "description": "Qt5 ActiveQt Module - ActiveX components",
   "license": null,
   "supports": "windows",
@@ -8,7 +8,6 @@
     {
       "name": "qt5-base",
       "default-features": false
-    },
-    "qt5-declarative"
+    }
   ]
 }
diff --git a/external_imported/vcpkg/ports/qt5-androidextras/vcpkg.json b/external_imported/vcpkg/ports/qt5-androidextras/vcpkg.json
index ccfd39804..aaf5307b0 100644
--- a/external_imported/vcpkg/ports/qt5-androidextras/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5-androidextras/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt5-androidextras",
-  "version": "5.15.8",
+  "version": "5.15.12",
   "description": "Qt5 androidextras Module;",
   "license": null,
   "supports": "android",
diff --git a/external_imported/vcpkg/ports/qt5-base/cmake/qt_build_submodule.cmake b/external_imported/vcpkg/ports/qt5-base/cmake/qt_build_submodule.cmake
index 24e6385cf..9801136a9 100644
--- a/external_imported/vcpkg/ports/qt5-base/cmake/qt_build_submodule.cmake
+++ b/external_imported/vcpkg/ports/qt5-base/cmake/qt_build_submodule.cmake
@@ -123,4 +123,9 @@ function(qt_build_submodule SOURCE_PATH)
         endif()
     endif()
 
+    # Remove duplicate flags from qmodule.pri issue -> https://github.com/microsoft/vcpkg/issues/28835
+    file(READ "${CURRENT_INSTALLED_DIR}/tools/qt5/mkspecs/qmodule.pri" QMODULE_PRI_CONTENT)
+    string(REGEX REPLACE "QMAKE_CXXFLAGS_RELEASE\\+=[^\n]*\n" "QMAKE_CXXFLAGS_RELEASE=\n" QMODULE_PRI_CONTENT ${QMODULE_PRI_CONTENT})
+    file(WRITE "${CURRENT_INSTALLED_DIR}/tools/qt5/mkspecs/qmodule.pri" "${QMODULE_PRI_CONTENT}")
+
 endfunction()
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/qt5-base/cmake/qt_download_submodule.cmake b/external_imported/vcpkg/ports/qt5-base/cmake/qt_download_submodule.cmake
index 5c8aff033..9b5491dc0 100644
--- a/external_imported/vcpkg/ports/qt5-base/cmake/qt_download_submodule.cmake
+++ b/external_imported/vcpkg/ports/qt5-base/cmake/qt_download_submodule.cmake
@@ -5,18 +5,19 @@ endfunction()
 
 function(qt_download_submodule)
     cmake_parse_arguments(_csc "" "OUT_SOURCE_PATH" "PATCHES;BUILD_OPTIONS;BUILD_OPTIONS_RELEASE;BUILD_OPTIONS_DEBUG" ${ARGN})
-    
+
     if(NOT DEFINED _csc_OUT_SOURCE_PATH)
         message(FATAL_ERROR "qt_download_module requires parameter OUT_SOURCE_PATH to be set! Please correct the portfile!")
     endif()
-    
+
     vcpkg_buildpath_length_warning(37)
     qt_get_submodule_name(NAME)
 
     set(FULL_VERSION "${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER}")
     set(ARCHIVE_NAME "${NAME}-everywhere-opensource-src-${FULL_VERSION}.tar.xz")
-    set(URLS "https://download.qt.io/official_releases/qt/${QT_MAJOR_MINOR_VER}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}"
-    "https://mirrors.ocf.berkeley.edu/qt/official_releases/qt/${QT_MAJOR_MINOR_VER}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}"
+    set(URLS
+        "https://download.qt.io/archive/qt/${QT_MAJOR_MINOR_VER}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}"
+        "https://mirrors.ocf.berkeley.edu/qt/archive/qt/${QT_MAJOR_MINOR_VER}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}"
     )
     vcpkg_download_distfile(ARCHIVE_FILE
         URLS ${URLS}
@@ -37,5 +38,5 @@ function(qt_download_submodule)
         )
     endif()
 
-    set(${_csc_OUT_SOURCE_PATH} ${SOURCE_PATH} PARENT_SCOPE)
-endfunction()
\ No newline at end of file
+    set(${_csc_OUT_SOURCE_PATH} "${SOURCE_PATH}" PARENT_SCOPE)
+endfunction()
diff --git a/external_imported/vcpkg/ports/qt5-base/cmake/qt_port_hashes.cmake b/external_imported/vcpkg/ports/qt5-base/cmake/qt_port_hashes.cmake
index ef2838ad3..fe5e8565f 100644
--- a/external_imported/vcpkg/ports/qt5-base/cmake/qt_port_hashes.cmake
+++ b/external_imported/vcpkg/ports/qt5-base/cmake/qt_port_hashes.cmake
@@ -1,53 +1,53 @@
 # Every update requires an update of these hashes and the version within the control file of each of the 32 ports.
 # So it is probably better to have a central location for these hashes and let the ports update via a script
 set(QT_MAJOR_MINOR_VER 5.15)
-set(QT_PATCH_VER 8)
+set(QT_PATCH_VER 12)
 set(QT_UPDATE_VERSION 0) # Switch to update qt and not build qt. Creates a file cmake/qt_new_hashes.cmake in qt5-base with the new hashes.
 
 set(QT_PORT_LIST base 3d activeqt charts connectivity datavis3d declarative gamepad graphicaleffects imageformats location macextras mqtt multimedia networkauth
                  purchasing quickcontrols quickcontrols2 remoteobjects script scxml sensors serialport speech svg tools virtualkeyboard webchannel websockets
                  webview winextras xmlpatterns doc x11extras androidextras translations serialbus webengine webglplugin wayland)
 
-set(QT_HASH_qt5-3d               3b7b9e2009c9cb9a8c1246651d7c2446bdc4ef73abea9199204fde64575ddbe4dbbab599c030347b26ef1600f354e0d940abb946c952968ca19b26b25bf580b6)
-set(QT_HASH_qt5-activeqt         018a2dbaccb23e9f5ecb8f5cdf42a34199a54bbb70d4857f4cf875854460bc6a0150adbb5681f1305ba95f1809918038d2346d1acc980cb0f8522a68019538e7)
-set(QT_HASH_qt5-androidextras    46874ad3f12b33d603af3e7c4a17837835213c9ef4a0a9da00305124bfa1eeee669e02ff0a74ee72b44edd8b903e2043803df0d2892c2d28fcd381ce6d13f8e4)
-set(QT_HASH_qt5-base             29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce)
-set(QT_HASH_qt5-charts           1c57e2f92d33c038ddf17fa5f8863b474f229fb2d8f2eb16e8f48455c98b3f500d3a7d73423c0512b6c44ad33227fac3fca624bfcdbc4bbcf64da54f79b4ac7b)
-set(QT_HASH_qt5-connectivity     d600e7b600a8cc204333b69bbbd37bc6f4d578bf50406a705c9bc9b04a0399461c8cc8e3bf89a8e0a8820897e9d586d77543570de6229a0cfed312b422b9fda6)
-set(QT_HASH_qt5-datavis3d        607359e2489ed33b12f56ace2aedef71e1342d88835d4f81346008f180c8ee74d3f2897e812b7bc9ac6c586908a9ee426d61e226c4faab3baa9d162a604665cc)
-set(QT_HASH_qt5-declarative      c611cc1d25b7eea1da3e5932d253d024459044d8fff6a31066033ea5867dd20aeb183b2d2ba8a2ca71cf263fc1921126509212dd43ab680134e7a9df8d937d73)
-set(QT_HASH_qt5-doc              1e24ab1e8813928cc5240740d2a979a1194ea125ca45fb3b11154f750cc6cc3f3c9c5977f5cacbca1bec3cdee527ebf1d93b02adde5d0f604a3252903f083220)
-set(QT_HASH_qt5-gamepad          f1002906dd53f4c6108b1a7965454e9d30f433b954f90218927b943eb65a63a280f00eea78d21847f91789923e3211a7b8aa599c32157873d1f42153d2e309db)
-set(QT_HASH_qt5-graphicaleffects bac9d18492b7ce0092ae9e3b27bcbc2fa421531eb76b3f4c69d20eeaa0520201eca850a2cc692c38f00b8efb24015cd28f53bd892b350e3c1d1337003b399c28)
-set(QT_HASH_qt5-imageformats     e601a1ebd0881e59c1f87df748faf63df12f552fe668d16af27a58421848ba4de822b4dc3fc54f23c17b818408b6af2edbfb0b59c29e7da8a272d25ac51d7cdd)
-set(QT_HASH_qt5-location         a337fade917150c13fa2ea22ad1949f41541cea4ceb1f732ab53c20c2f19a63dcfc6f9f544ca64fdb5703d3ac8d2ec6e832f1f199a32e73a2f6c51febf53f514)
-set(QT_HASH_qt5-macextras        f79f337fa2555a472560cc71748a6b3c52c406704c71795f59ee6e1e2c777bb7dd9e68461e923e9953439a052a8547f2f5a85b4dcb58c850f93a22a80faacb2d)
-set(QT_HASH_qt5-mqtt             c0dd94fbdda9f031bdde89ccfe7ec4b306a8c96740f523d9807a7f1af951635f65b851b0f0dfe260bc21ca77fd2b47042218d6fa73695e509ea020b438867e69)
-set(QT_HASH_qt5-multimedia       d448a612845e0afb896d6d0292506a8fae7da0b735ee4d139ab69123c93e67723aa41280dea7e704df89e43b849e7f6da3eeea1de94eee167b43d7c35a1a39cd)
-set(QT_HASH_qt5-networkauth      1680d6ec84b2fba24c837ff808c5b9e13b73a84c7353f6d533e10986f23f879e0d3ce9cc4ce84000b4cfbd5904e12d975210977f5376b070075c2ec814eb2baf)
-set(QT_HASH_qt5-purchasing       9bff75d85b331211cdc74405c01dfb4bdd142015ea66f8292bbefa140c0a6268509ed2c635f440779e78a6433994908ef5d50a74270a5377d9a37286de278953)
-set(QT_HASH_qt5-quickcontrols    4b93b1cc69f455bc0e3e06e9702a25791f1dcd9f3b5454ce791ab66cbc5a9ad2f3a91cf664bc2e66369c64d8d52555a02262bc8333866f1d5ff9335de1ea4040)
-set(QT_HASH_qt5-quickcontrols2   d42fd70f1d9d1d951e5a8eee886311bf70f0c9b21718b3b76b87ee38fee010c654abc82259e73883c9aca36dafcefb25e5297bf34213cafe4da6a68c4f45d816)
-set(QT_HASH_qt5-remoteobjects    a6610df5da8811f0cc19a24759b84fcf84f19e6dbba8e3d45e1edefad1eef750fd56b0fe95992385790207b09f7a0cfe94eec13eddb6ae2c13b5305789f01bc7)
-set(QT_HASH_qt5-script           977bb6d134c499e010d96383fd2e81c10c2864af305770353b378af1eb81debe6bd4cfa304b296ce100af87155066ce7a09b68d83c74de6e4113e2b01a1c5638)
-set(QT_HASH_qt5-scxml            f1e560e3091eb60b70e5b7ab187511708d16c1b2e8a0c1a6d7a95358eb3ed998bdf0e57b7855e38a773509805790603e3e8e64627f52f05f305d8a29108db9f2)
-set(QT_HASH_qt5-sensors          333bc05dd3bf4ba8ca4069279bf5e73f59475dd0d6e0411f16dc796f4cceb4354a7730be931ad868ef7052ebf8e36e151155dbe6576e9f33a38494bb589611d9)
-set(QT_HASH_qt5-serialbus        7877834f775d98464a5a220348ba395b91d6c4ce0cb794f2cd56d0878e8a7a36a1aff69abbcaa231a4ee42950b2b9db9db578d27dacaa48382522b0dd9bbe88a)
-set(QT_HASH_qt5-serialport       974ae97ec9bdbb4bcecc80a07c343efe4ed686c968810e76fb0e4cd62165949c30d57a37035ac08916850cc2d207fabc0aa09e593184e65fc6d74b36bfbdc444)
-set(QT_HASH_qt5-speech           01b625f44ea0ce799ab338f76ca17701025f288b0e83d8d36f5ad0f8b1fd505bb3fa109ace6942c19b0d5734e01aae1c69b28f7da98f986066dcd0ae0d175cee)
-set(QT_HASH_qt5-svg              a110a815e7399fc96b0197b96e9c6dec289b9a2c38393711ccfc536c087791009f8452e222f9364b5b133930fa4dea77d7bea2f250511c0511a1a76aa511dcda)
-set(QT_HASH_qt5-tools            1248b61e21d1bab30c6f8380af0b83ffd2c5f4e75b2906f561f8aae3a8be2e426ca4ffa28164d64a90cc75c570652229847c7009b7aec63c6ba8e977dbdd4f4f)
-set(QT_HASH_qt5-translations     384767c1726db54935c982452b03002e209f4b090b3374c725617a3f5f3af70e8d895b7826039fa04f537fd4e0491a143190fb580298c74edaad0d72b8545917)
-set(QT_HASH_qt5-virtualkeyboard  b2f4dddf67556d5d83ee5d0587909ebc745daa9b161b2a12e7e2135b37229b35c7ee2e3a30296f805e5e83648828c973aa2e62e130f2bac739fd228cea38a327)
-set(QT_HASH_qt5-wayland          6c6e9dc20f98d71abd7dba54ff278bf4535e70f86bfc4e6dd46c1af7c87777f045a6aba02bba3eb786f7cf383da5fb72b03e1e6ec636c8be0cde0e4e5b7b5b2d)
-set(QT_HASH_qt5-webchannel       d607b74f6f433be874e42808259fdc6fa69e1ec754544e1f7d614b6a65ed266cdba76e0a7cd535d65045bc708045c8757c1b3826c7885bc08a787458b60ae1cc)
-set(QT_HASH_qt5-webengine        2c4df48de31cb93a77ba9a5119bc57749ba0509f25348d16f97111c446f122d336e5a03f580c9371a487992f3c98190c622bb7ae314b26fbdfdf27a535504dd9)
-set(QT_HASH_qt5-webglplugin      1d23543b439e5aa2c1356d7ee1023bfb11c868289c156fe8e81fb8c94358f42649ea11766029feaea9f107ad592fb0a4e7881e108a5cea5691efbbccf59470b6)
-set(QT_HASH_qt5-websockets       d44f8beab7536882cb4c8b9250a9e39a274b549b0ff6ea003f16c614a9e5f1bef7d0526acacd3d4382dea9ddc86be1631903df72a605b4cde06aa109320fe05f)
-set(QT_HASH_qt5-webview          1afa2c5b7e4a0f422986ac982345d398af9cf468c2e8690205e5d7a820b0eb8c44e4a6d711735d039a05c44c1c6c4f41faf7bfe4cb2bbbd248b278a3e6c72cb5)
-set(QT_HASH_qt5-winextras        c6e230913e255b81fd199448df7a1131e54e3d172703ec88c304f0c22ee58c0780dd1b3a6da87864a3abc465c8e747f12c2cea81ceb572d0222026b50c0bfa5e)
-set(QT_HASH_qt5-x11extras        a7b2cd611ec863b43cbf16a09868a9543b4dfc3c40b21c23317a3520345a9464e2ad34f884f3619fa67fdf563bc2d1a8b31d97d063766a8988454ee4a8c8e1fd)
-set(QT_HASH_qt5-xmlpatterns      150a1425b763d42d8fa8f06a520ed5280ac6d7874e5ef0b617bd5a452ea1899d96909a4d04bae030256f7acc8a76f6f434a7aafd0a0756abf3f1534ef4a0a0b6)
+set(QT_HASH_qt5-3d               fe66aebdfda50c75f588d5dfc1c48c4d39c1e7aa29ee342178016a10ca24dfa00284f89839810121d15aac40d47fcd471f7a3573892210a0abf14e247102a66d)
+set(QT_HASH_qt5-activeqt         4afd89ccfb142dd72841d0d5129ef2175106c31b7a710ebd6f630cca18da2009b1fcd3b094e769f2ea24d4f67e9302441b8fdd80174823328fa3d22ad5957e7c)
+set(QT_HASH_qt5-androidextras    b181b8e42c19ca2946245cbcdbe19ba8c1fd1f9ab6988a6d1b920bb1895019372b529626789953722ccf28805f9171146d3bc38c3f0c72ed5511a1753ec38e00)
+set(QT_HASH_qt5-base             55ed3d73c2486a5f7cc62c0669b6344d1e4566be442bdac5849609f5ecd4fec7b74405952215e4dc018bc48a9dc2305ef50e31b61f3ace20408b5b64a2d5e888)
+set(QT_HASH_qt5-charts           543c9fe0dfd04f19407d3c11c2a1ed93da34b493cfb758b4b2a9e86a7325476e1f754de3281e366eff52e96d8f12fb44c9ff8f3e047069c409cb171687d11df4)
+set(QT_HASH_qt5-connectivity     36cbdaf63e7f478a5bb1b51d14b8671a24251614fc99d07cab195a596a9b60f28dd013c5f2a3af914f655a12725b1e6e2318324393ee0f0586c746a1a670f224)
+set(QT_HASH_qt5-datavis3d        6a734bd1e3296aaae94358e2315a7c4b033b113b27b9e1e75f0d888231c11c2fdf1caa17c40c4ed545ad8e4a735766368c1bf04e6b36e53ba3164f0f8d66a1c6)
+set(QT_HASH_qt5-declarative      3ebe195dac22efa2e71a4520e4816592204431bc724d94a38d9f426424624990199f7e99b72c7d96f6ae324bb18b7eec89ea2b5db63ff2f1d24a997be25a0589)
+set(QT_HASH_qt5-doc              46133676da2584c533bbe78d8eef12f2b1baa95e91168f7fa3400e58046c36a31064f6198f40e1679224da8824e642c6f610fba125b71e91399069019eaf68e6)
+set(QT_HASH_qt5-gamepad          8a5f6c8fac4e7977b1c93efda698e27c6bc1e66b844f86642ae05ba104d8f14f30e6cb95ba4b3923e2e43d117af52354cfb5a6d35ffd159e29a336710fc63f93)
+set(QT_HASH_qt5-graphicaleffects c0993082e96c5d8e26cc4e2e45320542d21fb7c716dfb6b087b385a985fff358cdff7e3d5d4ca3fc8fc9813e7c110165aa034d5e8d32e8082ad007b7bf929531)
+set(QT_HASH_qt5-imageformats     c56e70e17ed29ff126257ce41e2b9fd03807f0325ac60bd307779406dcea39ff929e49d2ea99ab17f07f19a6dda5f5103d4def6bb70a52f761141fc4b2c46e7c)
+set(QT_HASH_qt5-location         c480762cea2cd1a00e6061bab05c402d5aab2d12e7decebcd606c930d2029a93f2a46f8edbb188b73c7cdcad473b03c15037ea10e0b3538de0a99b1d7d7fb333)
+set(QT_HASH_qt5-macextras        205fc0747dff5a7e8b199ccf82675484064e71c4267741fb1ae7ab4961436d8e645126dd548b9236f27f29379a297a1efce82a1f8589f081aadd752a9875034e)
+set(QT_HASH_qt5-mqtt             eaad1a8b8ad3f18181e5840dca725a9ac445ef0cdacb3eaffc682e145f6db2f4ffd1742329b2ea57653ba3d1a7168c3e9e531b9f48784ca2fef726197b4b50a4)
+set(QT_HASH_qt5-multimedia       2cef917df20da1381ea64834e4110e25ea0d5e12249176ddbe2e0314c25490926ccbf2f7cc3f89b2969d113a645ec88244fabe691aff851ffb4b2be9766bcf76)
+set(QT_HASH_qt5-networkauth      f0c48453e21ad14a4fbac25d35e6257c4d8bbb5f2ac87dad0deee44ca86aec8def618f102cd1d9af05e1611f37ea722e1630165f15a238d3d8c38d161771bc3d)
+set(QT_HASH_qt5-purchasing       5a5e8ca1de6155b20164e5f3e28daaed424afa05b1ddae3c07207e056183fb6dfce71a9de9c9c8ca1bb1e10ecb02139db79b0e5e701e8c11c6514274e21e5069)
+set(QT_HASH_qt5-quickcontrols    980b233f83991d12029bac90b0875b3a001399d4358c58185a21bbb30911f0d6fec5dfc5f157e9c3c4d17e82c3ff5302e55c62b4cd63731f23a655bd55d300bb)
+set(QT_HASH_qt5-quickcontrols2   725fb03907973fdca4479017b8f792110a4620a6e4d39f97c81c3be16280b81135394f6ce5be507fd734926307d33a249e790234139e01f387d2362cd7027128)
+set(QT_HASH_qt5-remoteobjects    fef775ccbc187064ef3e2cb73f9bc784c002bf74d89032a33767cb234ff40ea07eb5294eb919a50cede2afbf539e32c6c78df52817bc22a10617585e417c3690)
+set(QT_HASH_qt5-script           48a00763686a5455d0429d1ecd6b32e3e96a13f05faa6625361c49b91275b8a8b3a1de3627cc3db5c69d346686c07b9466022cf37abf394a6f097933b9dbed4a)
+set(QT_HASH_qt5-scxml            c451fa8fc5999aa7e3b3a336503bcf1ccc8992ef27645d003c938166384508d2cc9b35fbd21e9da641ea98a2aaa58834ac85e8713bce25b96e4aef79c3cda976)
+set(QT_HASH_qt5-sensors          25d4eb1ea43c5d7819a7b9cee22604b774007f84bdc86433f673766b1943134c5880be14ab06fac7f05fb2708491cb8b7e03f8656aae0d74538d732e31ffd917)
+set(QT_HASH_qt5-serialbus        d6571b6d54fe91ff945c0bd51bcecb97ae3d001ee3e1f30deb042a52bab17ad7e059ae943c0a3f2a4d6e7a952cb3f68b71275cef0fda1875fd233c8dc17d0d3c)
+set(QT_HASH_qt5-serialport       f27adbc07a3c3e946761e033105377ae26ac48d2c796f281947e950de1b7b9fb5a25627fd1a2c30cccd2de19181867cfd7d4a740a3318348e57885b5d96c7192)
+set(QT_HASH_qt5-speech           960eb661cfeb8a4fc01337ac998bc8ce101da73782155e75a7b128987d9809fa1e4cc6fee30cfa3cbd39f7fff9bbe7e49e55430681ac6582e7c8110242d7183a)
+set(QT_HASH_qt5-svg              c68fa1bc8e3dc782a70049aeddca62731b48ff7de972d6e1a245b06d23c0795fd6a3e3538aa39a92016d5c15a068f7b8ae1d3b6bd950fb7857a7aa2ed556f857)
+set(QT_HASH_qt5-tools            d830129777c481e1a66e32911af82a09e2858b678fdd2b802433fc1009856d9f0b8ea39b6ed1d7e93b6e9db1dda848c3a4077f6d804400f1427f33a3c7ccb40e)
+set(QT_HASH_qt5-translations     675e0902bbd6a1f910ffc0473e1e865239cf820886fff9ccc3c5cf69f6a9af862fa1e44d86538f2884f1a34ab433dc2615707487b426d56742bd26f8f0d9924a)
+set(QT_HASH_qt5-virtualkeyboard  17c63ea6287f7dbc84c82762ea43da9fbb4d1c7281a4e81971c10eacfbfe7293a855dde35a37ed9c8cf5ccc289a0e1d0a0c970e6908cea5cae15f149b9f5e3c4)
+set(QT_HASH_qt5-wayland          acd78018665db3d0d77a84bb80ce7dbb65a33e0e813c3308e09a27195df204029b5e580f353eae2536e6fdde249aa34411e37f4f1663f7645448d96c9df67a66)
+set(QT_HASH_qt5-webchannel       8b4f3c787e88a68a9b850c7c700e37b491ff17435871223fd70373a532e4d8c6d809d4b8ca0036b68f99852dbd80e21e45aa2ee2d89efffab1182fdf792d0d59)
+set(QT_HASH_qt5-webengine        84ebdab10ea3138671c0612cc558dd3257264410d2776719c34d41b8f846424183742abc7185fa61c7bb3d35d471ab2341d064eec57b92c34e30325dbc3eff63)
+set(QT_HASH_qt5-webglplugin      97670f47e582ec921c409b346f08bc70040a982811d9df967635900e4654b7069ca22ba5a6504b0f8a6b0022c317ffa71a3b60043212078d2b29cb1d2daf69ae)
+set(QT_HASH_qt5-websockets       01195f4b2f11baa66e1b3d08148c234ac979d1a80be28d72b2bb8cd57f053102f432f59b7b89daa66d0e27c6e5ee792da12772d70c76aa88fa1bbe114b6f675a)
+set(QT_HASH_qt5-webview          eaabc534a116617dee0394afdb4d35525aa367d01d974c4759c02781a7e4af2fa2d096c638109b421d2b061df4476348d8471a9a02f6f05b97170366c973ef61)
+set(QT_HASH_qt5-winextras        da230ee9c9afccad83573a678c641f22f85ab45d7063406ef1b1922097b4b41fca9f1ca81256bba835e71a3f59f6280601f9fad3f7d5be74e436a242e3ef45eb)
+set(QT_HASH_qt5-x11extras        f346f399a79aece2635e3871d86302042834d17be143adbfa130ea91a6cd692211804c50e74cecb072a5d7c388f3fbf774b2b40b0fc86498b84552da7b213fe7)
+set(QT_HASH_qt5-xmlpatterns      762c1c64e8ab269bf74de86f08afd50822859716024f3b13a70b719aeedfd35fd705fa03e32220f5cfab579361e754823d8bd584b30bde5965b026aa54b97142)
 
 if(QT_UPDATE_VERSION)
     message(STATUS "Running Qt in automatic version port update mode!")
diff --git a/external_imported/vcpkg/ports/qt5-base/patches/0001-CVE-2023-51714-qtbase-5.15.diff b/external_imported/vcpkg/ports/qt5-base/patches/0001-CVE-2023-51714-qtbase-5.15.diff
new file mode 100644
index 000000000..89f467aad
--- /dev/null
+++ b/external_imported/vcpkg/ports/qt5-base/patches/0001-CVE-2023-51714-qtbase-5.15.diff
@@ -0,0 +1,38 @@
+From ea63c28efc1d2ecb467b83a34923d12462efa96f Mon Sep 17 00:00:00 2001
+From: Marc Mutz <marc.mutz@qt.io>
+Date: Tue, 12 Dec 2023 20:51:56 +0100
+Subject: [PATCH] HPack: fix a Yoda Condition
+
+Putting the variable on the LHS of a relational operation makes the
+expression easier to read. In this case, we find that the whole
+expression is nonsensical as an overflow protection, because if
+name.size() + value.size() overflows, the result will exactly _not_
+be > max() - 32, because UB will have happened.
+
+To be fixed in a follow-up commit.
+
+As a drive-by, add parentheses around the RHS.
+
+Change-Id: I35ce598884c37c51b74756b3bd2734b9aad63c09
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+(cherry picked from commit 658607a34ead214fbacbc2cca44915655c318ea9)
+Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
+(cherry picked from commit 4f7efd41740107f90960116700e3134f5e433867)
+(cherry picked from commit 13c16b756900fe524f6d9534e8a07aa003c05e0c)
+(cherry picked from commit 1d4788a39668fb2dc5912a8d9c4272dc40e99f92)
+(cherry picked from commit 87de75b5cc946d196decaa6aef4792a6cac0b6db)
+---
+
+diff --git a/src/network/access/http2/hpacktable.cpp b/src/network/access/http2/hpacktable.cpp
+index 834214f..ab166a6 100644
+--- a/src/network/access/http2/hpacktable.cpp
++++ b/src/network/access/http2/hpacktable.cpp
+@@ -63,7 +63,7 @@
+     // 32 octets of overhead."
+ 
+     const unsigned sum = unsigned(name.size() + value.size());
+-    if (std::numeric_limits<unsigned>::max() - 32 < sum)
++    if (sum > (std::numeric_limits<unsigned>::max() - 32))
+         return HeaderSize();
+     return HeaderSize(true, quint32(sum + 32));
+ }
diff --git a/external_imported/vcpkg/ports/qt5-base/patches/0002-CVE-2023-51714-qtbase-5.15.diff b/external_imported/vcpkg/ports/qt5-base/patches/0002-CVE-2023-51714-qtbase-5.15.diff
new file mode 100644
index 000000000..00f04c1ea
--- /dev/null
+++ b/external_imported/vcpkg/ports/qt5-base/patches/0002-CVE-2023-51714-qtbase-5.15.diff
@@ -0,0 +1,59 @@
+From 23c3fc483e8b6e21012a61f0bea884446f727776 Mon Sep 17 00:00:00 2001
+From: Marc Mutz <marc.mutz@qt.io>
+Date: Tue, 12 Dec 2023 22:08:07 +0100
+Subject: [PATCH] HPack: fix incorrect integer overflow check
+
+This code never worked:
+
+For the comparison with max() - 32 to trigger, on 32-bit platforms (or
+Qt 5) signed interger overflow would have had to happen in the
+addition of the two sizes. The compiler can therefore remove the
+overflow check as dead code.
+
+On Qt 6 and 64-bit platforms, the signed integer addition would be
+very unlikely to overflow, but the following truncation to uint32
+would yield the correct result only in a narrow 32-value window just
+below UINT_MAX, if even that.
+
+Fix by using the proper tool, qAddOverflow.
+
+Manual conflict resolutions:
+ - qAddOverflow doesn't exist in Qt 5, use private add_overflow
+   predecessor API instead
+
+Change-Id: I7599f2e75ff7f488077b0c60b81022591005661c
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+(cherry picked from commit ee5da1f2eaf8932aeca02ffea6e4c618585e29e3)
+Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
+(cherry picked from commit debeb8878da2dc706ead04b6072ecbe7e5313860)
+Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
+Reviewed-by: Marc Mutz <marc.mutz@qt.io>
+(cherry picked from commit 811b9eef6d08d929af8708adbf2a5effb0eb62d7)
+(cherry picked from commit f931facd077ce945f1e42eaa3bead208822d3e00)
+(cherry picked from commit 9ef4ca5ecfed771dab890856130e93ef5ceabef5)
+Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
+---
+
+diff --git a/src/network/access/http2/hpacktable.cpp b/src/network/access/http2/hpacktable.cpp
+index ab166a6..de91fc0 100644
+--- a/src/network/access/http2/hpacktable.cpp
++++ b/src/network/access/http2/hpacktable.cpp
+@@ -40,6 +40,7 @@
+ #include "hpacktable_p.h"
+ 
+ #include <QtCore/qdebug.h>
++#include <QtCore/private/qnumeric_p.h>
+ 
+ #include <algorithm>
+ #include <cstddef>
+@@ -62,7 +63,9 @@
+     // for counting the number of references to the name and value would have
+     // 32 octets of overhead."
+ 
+-    const unsigned sum = unsigned(name.size() + value.size());
++    size_t sum;
++    if (add_overflow(size_t(name.size()), size_t(value.size()), &sum))
++        return HeaderSize();
+     if (sum > (std::numeric_limits<unsigned>::max() - 32))
+         return HeaderSize();
+     return HeaderSize(true, quint32(sum + 32));
diff --git a/external_imported/vcpkg/ports/qt5-base/patches/CVE-2023-24607-qtbase-5.15.diff b/external_imported/vcpkg/ports/qt5-base/patches/CVE-2023-24607-qtbase-5.15.diff
new file mode 100644
index 000000000..2f0973771
--- /dev/null
+++ b/external_imported/vcpkg/ports/qt5-base/patches/CVE-2023-24607-qtbase-5.15.diff
@@ -0,0 +1,332 @@
+--- a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
++++ b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
+@@ -92,23 +92,39 @@ inline static QString fromSQLTCHAR(const QVarLengthArray<SQLTCHAR>& input, int s
+     return result;
+ }
+ 
++template <size_t SizeOfChar = sizeof(SQLTCHAR)>
++void toSQLTCHARImpl(QVarLengthArray<SQLTCHAR> &result, const QString &input); // primary template undefined
++
++template <typename Container>
++void do_append(QVarLengthArray<SQLTCHAR> &result, const Container &c)
++{
++    result.append(reinterpret_cast<const SQLTCHAR *>(c.data()), c.size());
++}
++
++template <>
++void toSQLTCHARImpl<1>(QVarLengthArray<SQLTCHAR> &result, const QString &input)
++{
++    const auto u8 = input.toUtf8();
++    do_append(result, u8);
++}
++
++template <>
++void toSQLTCHARImpl<2>(QVarLengthArray<SQLTCHAR> &result, const QString &input)
++{
++    do_append(result, input);
++}
++
++template <>
++void toSQLTCHARImpl<4>(QVarLengthArray<SQLTCHAR> &result, const QString &input)
++{
++    const auto u32 = input.toUcs4();
++    do_append(result, u32);
++}
++
+ inline static QVarLengthArray<SQLTCHAR> toSQLTCHAR(const QString &input)
+ {
+     QVarLengthArray<SQLTCHAR> result;
+-    result.resize(input.size());
+-    switch(sizeof(SQLTCHAR)) {
+-        case 1:
+-            memcpy(result.data(), input.toUtf8().data(), input.size());
+-            break;
+-        case 2:
+-            memcpy(result.data(), input.unicode(), input.size() * 2);
+-            break;
+-        case 4:
+-            memcpy(result.data(), input.toUcs4().data(), input.size() * 4);
+-            break;
+-        default:
+-            qCritical("sizeof(SQLTCHAR) is %d. Don't know how to handle this.", int(sizeof(SQLTCHAR)));
+-    }
++    toSQLTCHARImpl(result, input);
+     result.append(0); // make sure it's null terminated, doesn't matter if it already is, it does if it isn't.
+     return result;
+ }
+
+--- a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
++++ b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
+@@ -1732,10 +1732,11 @@ bool QODBCResult::exec()
+             case QVariant::String:
+                 if (d->unicode) {
+                     if (bindValueType(i) & QSql::Out) {
+-                        const QByteArray &first = tmpStorage.at(i);
+-                        QVarLengthArray<SQLTCHAR> array;
+-                        array.append((const SQLTCHAR *)first.constData(), first.size());
+-                        values[i] = fromSQLTCHAR(array, first.size()/sizeof(SQLTCHAR));
++                        const QByteArray &bytes = tmpStorage.at(i);
++                        const auto strSize = bytes.size() / int(sizeof(SQLTCHAR));
++                        QVarLengthArray<SQLTCHAR> string(strSize);
++                        memcpy(string.data(), bytes.data(), strSize * sizeof(SQLTCHAR));
++                        values[i] = fromSQLTCHAR(string);
+                     }
+                     break;
+                 }
+
+--- a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
++++ b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
+@@ -779,6 +779,14 @@ QChar QODBCDriverPrivate::quoteChar()
+     return quote;
+ }
+
++static SQLRETURN qt_string_SQLSetConnectAttr(SQLHDBC handle, SQLINTEGER attr, const QString &val)
++{
++    auto encoded = toSQLTCHAR(val);
++    return SQLSetConnectAttr(handle, attr,
++                             encoded.data(),
++                             SQLINTEGER(encoded.size() * sizeof(SQLTCHAR))); // size in bytes
++}
++
+
+ bool QODBCDriverPrivate::setConnectionOptions(const QString& connOpts)
+ {
+@@ -814,10 +822,7 @@ bool QODBCDriverPrivate::setConnectionOptions(const QString& connOpts)
+             v = val.toUInt();
+             r = SQLSetConnectAttr(hDbc, SQL_ATTR_LOGIN_TIMEOUT, (SQLPOINTER) size_t(v), 0);
+         } else if (opt.toUpper() == QLatin1String("SQL_ATTR_CURRENT_CATALOG")) {
+-            val.utf16(); // 0 terminate
+-            r = SQLSetConnectAttr(hDbc, SQL_ATTR_CURRENT_CATALOG,
+-                                    toSQLTCHAR(val).data(),
+-                                    val.length()*sizeof(SQLTCHAR));
++            r = qt_string_SQLSetConnectAttr(hDbc, SQL_ATTR_CURRENT_CATALOG, val);
+         } else if (opt.toUpper() == QLatin1String("SQL_ATTR_METADATA_ID")) {
+             if (val.toUpper() == QLatin1String("SQL_TRUE")) {
+                 v = SQL_TRUE;
+@@ -832,10 +837,7 @@ bool QODBCDriverPrivate::setConnectionOptions(const QString& connOpts)
+             v = val.toUInt();
+             r = SQLSetConnectAttr(hDbc, SQL_ATTR_PACKET_SIZE, (SQLPOINTER) size_t(v), 0);
+         } else if (opt.toUpper() == QLatin1String("SQL_ATTR_TRACEFILE")) {
+-            val.utf16(); // 0 terminate
+-            r = SQLSetConnectAttr(hDbc, SQL_ATTR_TRACEFILE,
+-                                    toSQLTCHAR(val).data(),
+-                                    val.length()*sizeof(SQLTCHAR));
++            r = qt_string_SQLSetConnectAttr(hDbc, SQL_ATTR_TRACEFILE, val);
+         } else if (opt.toUpper() == QLatin1String("SQL_ATTR_TRACE")) {
+             if (val.toUpper() == QLatin1String("SQL_OPT_TRACE_OFF")) {
+                 v = SQL_OPT_TRACE_OFF;
+@@ -1038,9 +1040,12 @@ bool QODBCResult::reset (const QString& query)
+         return false;
+     }
+
+-    r = SQLExecDirect(d->hStmt,
+-                       toSQLTCHAR(query).data(),
+-                       (SQLINTEGER) query.length());
++    {
++        auto encoded = toSQLTCHAR(query);
++        r = SQLExecDirect(d->hStmt,
++                          encoded.data(),
++                          SQLINTEGER(encoded.size()));
++    }
+     if (r != SQL_SUCCESS && r != SQL_SUCCESS_WITH_INFO && r!= SQL_NO_DATA) {
+         setLastError(qMakeError(QCoreApplication::translate("QODBCResult",
+                      "Unable to execute statement"), QSqlError::StatementError, d));
+@@ -1387,9 +1392,12 @@ bool QODBCResult::prepare(const QString& query)
+         return false;
+     }
+
+-    r = SQLPrepare(d->hStmt,
+-                    toSQLTCHAR(query).data(),
+-                    (SQLINTEGER) query.length());
++    {
++        auto encoded = toSQLTCHAR(query);
++        r = SQLPrepare(d->hStmt,
++                       encoded.data(),
++                       SQLINTEGER(encoded.size()));
++    }
+
+     if (r != SQL_SUCCESS) {
+         setLastError(qMakeError(QCoreApplication::translate("QODBCResult",
+@@ -1417,7 +1425,7 @@ bool QODBCResult::exec()
+         SQLCloseCursor(d->hStmt);
+
+     QVector<QVariant>& values = boundValues();
+-    QVector<QByteArray> tmpStorage(values.count(), QByteArray()); // holds temporary buffers
++    QVector<QByteArray> tmpStorage(values.count(), QByteArray()); // targets for SQLBindParameter()
+     QVarLengthArray<SQLLEN, 32> indicators(values.count());
+     memset(indicators.data(), 0, indicators.size() * sizeof(SQLLEN));
+
+@@ -1596,35 +1604,36 @@ bool QODBCResult::exec()
+             case QVariant::String:
+                 if (d->unicode) {
+                     QByteArray &ba = tmpStorage[i];
+-                    QString str = val.toString();
++                    {
++                        const auto encoded = toSQLTCHAR(val.toString());
++                        ba = QByteArray(reinterpret_cast<const char *>(encoded.data()),
++                                        encoded.size() * sizeof(SQLTCHAR));
++                    }
++
+                     if (*ind != SQL_NULL_DATA)
+-                        *ind = str.length() * sizeof(SQLTCHAR);
+-                    int strSize = str.length() * sizeof(SQLTCHAR);
++                        *ind = ba.size();
+
+                     if (bindValueType(i) & QSql::Out) {
+-                        const QVarLengthArray<SQLTCHAR> a(toSQLTCHAR(str));
+-                        ba = QByteArray((const char *)a.constData(), a.size() * sizeof(SQLTCHAR));
+                         r = SQLBindParameter(d->hStmt,
+                                             i + 1,
+                                             qParamType[bindValueType(i) & QSql::InOut],
+                                             SQL_C_TCHAR,
+-                                            strSize > 254 ? SQL_WLONGVARCHAR : SQL_WVARCHAR,
++                                            ba.size() > 254 ? SQL_WLONGVARCHAR : SQL_WVARCHAR,
+                                             0, // god knows... don't change this!
+                                             0,
+-                                            ba.data(),
++                                            const_cast<char *>(ba.constData()), // don't detach
+                                             ba.size(),
+                                             ind);
+                         break;
+                     }
+-                    ba = QByteArray ((const char *)toSQLTCHAR(str).constData(), str.size()*sizeof(SQLTCHAR));
+                     r = SQLBindParameter(d->hStmt,
+                                           i + 1,
+                                           qParamType[bindValueType(i) & QSql::InOut],
+                                           SQL_C_TCHAR,
+-                                          strSize > 254 ? SQL_WLONGVARCHAR : SQL_WVARCHAR,
+-                                          strSize,
++                                          ba.size() > 254 ? SQL_WLONGVARCHAR : SQL_WVARCHAR,
++                                          ba.size(),
+                                           0,
+-                                          const_cast<char *>(ba.constData()),
++                                          const_cast<char *>(ba.constData()), // don't detach
+                                           ba.size(),
+                                           ind);
+                     break;
+@@ -1982,14 +1991,16 @@ bool QODBCDriver::open(const QString & db,
+     SQLSMALLINT cb;
+     QVarLengthArray<SQLTCHAR> connOut(1024);
+     memset(connOut.data(), 0, connOut.size() * sizeof(SQLTCHAR));
+-    r = SQLDriverConnect(d->hDbc,
+-                          NULL,
+-                          toSQLTCHAR(connQStr).data(),
+-                          (SQLSMALLINT)connQStr.length(),
+-                          connOut.data(),
+-                          1024,
+-                          &cb,
+-                          /*SQL_DRIVER_NOPROMPT*/0);
++    {
++        auto encoded = toSQLTCHAR(connQStr);
++        r = SQLDriverConnect(d->hDbc,
++                             nullptr,
++                             encoded.data(), SQLSMALLINT(encoded.size()),
++                             connOut.data(),
++                             1024,
++                             &cb,
++                             /*SQL_DRIVER_NOPROMPT*/0);
++    }
+
+     if (r != SQL_SUCCESS && r != SQL_SUCCESS_WITH_INFO) {
+         setLastError(qMakeError(tr("Unable to connect"), QSqlError::ConnectionError, d));
+@@ -2368,17 +2379,15 @@ QStringList QODBCDriver::tables(QSql::TableType type) const
+     if (tableType.isEmpty())
+         return tl;
+
+-    QString joinedTableTypeString = tableType.join(QLatin1Char(','));
++    {
++        auto joinedTableTypeString = toSQLTCHAR(tableType.join(u','));
+
+-    r = SQLTables(hStmt,
+-                   NULL,
+-                   0,
+-                   NULL,
+-                   0,
+-                   NULL,
+-                   0,
+-                   toSQLTCHAR(joinedTableTypeString).data(),
+-                   joinedTableTypeString.length() /* characters, not bytes */);
++        r = SQLTables(hStmt,
++                      nullptr, 0,
++                      nullptr, 0,
++                      nullptr, 0,
++                      joinedTableTypeString.data(), joinedTableTypeString.size());
++    }
+
+     if (r != SQL_SUCCESS)
+         qSqlWarning(QLatin1String("QODBCDriver::tables Unable to execute table list"), d);
+@@ -2452,28 +2461,30 @@ QSqlIndex QODBCDriver::primaryIndex(const QString& tablename) const
+                         SQL_ATTR_CURSOR_TYPE,
+                         (SQLPOINTER)SQL_CURSOR_FORWARD_ONLY,
+                         SQL_IS_UINTEGER);
+-    r = SQLPrimaryKeys(hStmt,
+-                        catalog.length() == 0 ? NULL : toSQLTCHAR(catalog).data(),
+-                        catalog.length(),
+-                        schema.length() == 0 ? NULL : toSQLTCHAR(schema).data(),
+-                        schema.length(),
+-                        toSQLTCHAR(table).data(),
+-                        table.length() /* in characters, not in bytes */);
++    {
++        auto c = toSQLTCHAR(catalog);
++        auto s = toSQLTCHAR(schema);
++        auto t = toSQLTCHAR(table);
++        r = SQLPrimaryKeys(hStmt,
++                           catalog.isEmpty() ? nullptr : c.data(), c.size(),
++                           schema.isEmpty()  ? nullptr : s.data(), s.size(),
++                           t.data(), t.size());
++    }
+
+     // if the SQLPrimaryKeys() call does not succeed (e.g the driver
+     // does not support it) - try an alternative method to get hold of
+     // the primary index (e.g MS Access and FoxPro)
+     if (r != SQL_SUCCESS) {
+-            r = SQLSpecialColumns(hStmt,
+-                        SQL_BEST_ROWID,
+-                        catalog.length() == 0 ? NULL : toSQLTCHAR(catalog).data(),
+-                        catalog.length(),
+-                        schema.length() == 0 ? NULL : toSQLTCHAR(schema).data(),
+-                        schema.length(),
+-                        toSQLTCHAR(table).data(),
+-                        table.length(),
+-                        SQL_SCOPE_CURROW,
+-                        SQL_NULLABLE);
++        auto c = toSQLTCHAR(catalog);
++        auto s = toSQLTCHAR(schema);
++        auto t = toSQLTCHAR(table);
++        r = SQLSpecialColumns(hStmt,
++                              SQL_BEST_ROWID,
++                              catalog.isEmpty() ? nullptr : c.data(), c.size(),
++                              schema.isEmpty()  ? nullptr : s.data(), s.size(),
++                              t.data(), t.size(),
++                              SQL_SCOPE_CURROW,
++                              SQL_NULLABLE);
+
+             if (r != SQL_SUCCESS) {
+                 qSqlWarning(QLatin1String("QODBCDriver::primaryIndex: Unable to execute primary key list"), d);
+@@ -2554,15 +2565,17 @@ QSqlRecord QODBCDriver::record(const QString& tablename) const
+                         SQL_ATTR_CURSOR_TYPE,
+                         (SQLPOINTER)SQL_CURSOR_FORWARD_ONLY,
+                         SQL_IS_UINTEGER);
+-    r =  SQLColumns(hStmt,
+-                     catalog.length() == 0 ? NULL : toSQLTCHAR(catalog).data(),
+-                     catalog.length(),
+-                     schema.length() == 0 ? NULL : toSQLTCHAR(schema).data(),
+-                     schema.length(),
+-                     toSQLTCHAR(table).data(),
+-                     table.length(),
+-                     NULL,
+-                     0);
++    {
++        auto c = toSQLTCHAR(catalog);
++        auto s = toSQLTCHAR(schema);
++        auto t = toSQLTCHAR(table);
++        r =  SQLColumns(hStmt,
++                        catalog.isEmpty() ? nullptr : c.data(), c.size(),
++                        schema.isEmpty()  ? nullptr : s.data(), s.size(),
++                        t.data(), t.size(),
++                        nullptr,
++                        0);
++    }
+     if (r != SQL_SUCCESS)
+         qSqlWarning(QLatin1String("QODBCDriver::record: Unable to execute column list"), d);
+
diff --git a/external_imported/vcpkg/ports/qt5-base/patches/CVE-2023-32762-qtbase-5.15.diff b/external_imported/vcpkg/ports/qt5-base/patches/CVE-2023-32762-qtbase-5.15.diff
new file mode 100644
index 000000000..eec93f033
--- /dev/null
+++ b/external_imported/vcpkg/ports/qt5-base/patches/CVE-2023-32762-qtbase-5.15.diff
@@ -0,0 +1,13 @@
+--- a/src/network/access/qhsts.cpp
++++ b/src/network/access/qhsts.cpp
+@@ -364,8 +364,8 @@ quoted-pair    = "\" CHAR
+ bool QHstsHeaderParser::parse(const QList<QPair<QByteArray, QByteArray>> &headers)
+ {
+     for (const auto &h : headers) {
+-        // We use '==' since header name was already 'trimmed' for us:
+-        if (h.first == "Strict-Transport-Security") {
++        // We compare directly because header name was already 'trimmed' for us:
++        if (h.first.compare("Strict-Transport-Security", Qt::CaseInsensitive) == 0) {
+             header = h.second;
+             // RFC6797, 8.1:
+             //
diff --git a/external_imported/vcpkg/ports/qt5-base/patches/CVE-2023-32763-qtbase-5.15.diff b/external_imported/vcpkg/ports/qt5-base/patches/CVE-2023-32763-qtbase-5.15.diff
new file mode 100644
index 000000000..a19d76948
--- /dev/null
+++ b/external_imported/vcpkg/ports/qt5-base/patches/CVE-2023-32763-qtbase-5.15.diff
@@ -0,0 +1,45 @@
+--- a/src/gui/painting/qfixed_p.h
++++ b/src/gui/painting/qfixed_p.h
+@@ -54,6 +54,7 @@
+ #include <QtGui/private/qtguiglobal_p.h>
+ #include "QtCore/qdebug.h"
+ #include "QtCore/qpoint.h"
++#include <QtCore/private/qnumeric_p.h>
+ #include "QtCore/qsize.h"
+ 
+ QT_BEGIN_NAMESPACE
+@@ -182,6 +183,14 @@ Q_DECL_CONSTEXPR inline bool operator<(int i, const QFixed &f) { return i * 64 <
+ Q_DECL_CONSTEXPR inline bool operator>(const QFixed &f, int i) { return f.value() > i * 64; }
+ Q_DECL_CONSTEXPR inline bool operator>(int i, const QFixed &f) { return i * 64 > f.value(); }
+ 
++inline bool qAddOverflow(QFixed v1, QFixed v2, QFixed *r)
++{
++    int val;
++    bool result = add_overflow(v1.value(), v2.value(), &val);
++    r->setValue(val);
++    return result;
++}
++
+ #ifndef QT_NO_DEBUG_STREAM
+ inline QDebug &operator<<(QDebug &dbg, const QFixed &f)
+ { return dbg << f.toReal(); }
+--- a/src/gui/text/qtextlayout.cpp
++++ b/src/gui/text/qtextlayout.cpp
+@@ -2163,11 +2163,14 @@ found:
+         eng->maxWidth = qMax(eng->maxWidth, line.textWidth);
+     } else {
+         eng->minWidth = qMax(eng->minWidth, lbh.minw);
+-        eng->maxWidth += line.textWidth;
++        if (qAddOverflow(eng->maxWidth, line.textWidth, &eng->maxWidth))
++            eng->maxWidth = QFIXED_MAX;
+     }
+ 
+-    if (line.textWidth > 0 && item < eng->layoutData->items.size())
+-        eng->maxWidth += lbh.spaceData.textWidth;
++    if (line.textWidth > 0 && item < eng->layoutData->items.size()) {
++        if (qAddOverflow(eng->maxWidth, lbh.spaceData.textWidth, &eng->maxWidth))
++            eng->maxWidth = QFIXED_MAX;
++    }
+ 
+     line.textWidth += trailingSpace;
+     if (lbh.spaceData.length) {
diff --git a/external_imported/vcpkg/ports/qt5-base/patches/CVE-2023-33285-qtbase-5.15.diff b/external_imported/vcpkg/ports/qt5-base/patches/CVE-2023-33285-qtbase-5.15.diff
new file mode 100644
index 000000000..fe344c6a3
--- /dev/null
+++ b/external_imported/vcpkg/ports/qt5-base/patches/CVE-2023-33285-qtbase-5.15.diff
@@ -0,0 +1,68 @@
+--- a/src/network/kernel/qdnslookup_unix.cpp
++++ b/src/network/kernel/qdnslookup_unix.cpp
+@@ -227,7 +227,6 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN
+     // responseLength in case of error, we still can extract the
+     // exact error code from the response.
+     HEADER *header = (HEADER*)response;
+-    const int answerCount = ntohs(header->ancount);
+     switch (header->rcode) {
+     case NOERROR:
+         break;
+@@ -260,18 +259,31 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN
+         return;
+     }
+ 
+-    // Skip the query host, type (2 bytes) and class (2 bytes).
+     char host[PACKETSZ], answer[PACKETSZ];
+     unsigned char *p = response + sizeof(HEADER);
+-    int status = local_dn_expand(response, response + responseLength, p, host, sizeof(host));
+-    if (status < 0) {
++    int status;
++
++    if (ntohs(header->qdcount) == 1) {
++        // Skip the query host, type (2 bytes) and class (2 bytes).
++        status = local_dn_expand(response, response + responseLength, p, host, sizeof(host));
++        if (status < 0) {
++            reply->error = QDnsLookup::InvalidReplyError;
++            reply->errorString = tr("Could not expand domain name");
++            return;
++        }
++        if ((p - response) + status + 4 >= responseLength)
++            header->qdcount = 0xffff;   // invalid reply below
++        else
++            p += status + 4;
++    }
++    if (ntohs(header->qdcount) > 1) {
+         reply->error = QDnsLookup::InvalidReplyError;
+-        reply->errorString = tr("Could not expand domain name");
++        reply->errorString = tr("Invalid reply received");
+         return;
+     }
+-    p += status + 4;
+ 
+     // Extract results.
++    const int answerCount = ntohs(header->ancount);
+     int answerIndex = 0;
+     while ((p < response + responseLength) && (answerIndex < answerCount)) {
+         status = local_dn_expand(response, response + responseLength, p, host, sizeof(host));
+@@ -283,6 +295,11 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN
+         const QString name = QUrl::fromAce(host);
+ 
+         p += status;
++
++        if ((p - response) + 10 > responseLength) {
++            // probably just a truncated reply, return what we have
++            return;
++        }
+         const quint16 type = (p[0] << 8) | p[1];
+         p += 2; // RR type
+         p += 2; // RR class
+@@ -290,6 +307,8 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN
+         p += 4;
+         const quint16 size = (p[0] << 8) | p[1];
+         p += 2;
++        if ((p - response) + size > responseLength)
++            return;             // truncated
+ 
+         if (type == QDnsLookup::A) {
+             if (size != 4) {
diff --git a/external_imported/vcpkg/ports/qt5-base/patches/CVE-2023-34410-qtbase-5.15.diff b/external_imported/vcpkg/ports/qt5-base/patches/CVE-2023-34410-qtbase-5.15.diff
new file mode 100644
index 000000000..4fe513882
--- /dev/null
+++ b/external_imported/vcpkg/ports/qt5-base/patches/CVE-2023-34410-qtbase-5.15.diff
@@ -0,0 +1,52 @@
+--- a/src/network/ssl/qsslsocket_schannel.cpp
++++ b/src/network/ssl/qsslsocket_schannel.cpp
+@@ -1880,6 +1880,28 @@ bool QSslSocketBackendPrivate::verifyCertContext(CERT_CONTEXT *certContext)
+     if (configuration.peerVerifyDepth > 0 && DWORD(configuration.peerVerifyDepth) < verifyDepth)
+         verifyDepth = DWORD(configuration.peerVerifyDepth);
+ 
++    const auto &caCertificates = q->sslConfiguration().caCertificates();
++
++    if (!rootCertOnDemandLoadingAllowed()
++            && !(chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_PARTIAL_CHAIN)
++            && (q->peerVerifyMode() == QSslSocket::VerifyPeer
++                    || (isClient && q->peerVerifyMode() == QSslSocket::AutoVerifyPeer))) {
++        // When verifying a peer Windows "helpfully" builds a chain that
++        // may include roots from the system store. But we don't want that if
++        // the user has set their own CA certificates.
++        // Since Windows claims this is not a partial chain the root is included
++        // and we have to check that it is one of our configured CAs.
++        CERT_CHAIN_ELEMENT *element = chain->rgpElement[chain->cElement - 1];
++        QSslCertificate certificate = getCertificateFromChainElement(element);
++        if (!caCertificates.contains(certificate)) {
++            auto error = QSslError(QSslError::CertificateUntrusted, certificate);
++            sslErrors += error;
++            emit q->peerVerifyError(error);
++            if (q->state() != QAbstractSocket::ConnectedState)
++                return false;
++        }
++    }
++
+     for (DWORD i = 0; i < verifyDepth; i++) {
+         CERT_CHAIN_ELEMENT *element = chain->rgpElement[i];
+         QSslCertificate certificate = getCertificateFromChainElement(element);
+--- a/src/network/ssl/qsslsocket.cpp
++++ b/src/network/ssl/qsslsocket.cpp
+@@ -2221,6 +2221,10 @@ QSslSocketPrivate::QSslSocketPrivate()
+     , flushTriggered(false)
+ {
+     QSslConfigurationPrivate::deepCopyDefaultConfiguration(&configuration);
++    // If the global configuration doesn't allow root certificates to be loaded
++    // on demand then we have to disable it for this socket as well.
++    if (!configuration.allowRootCertOnDemandLoading)
++        allowRootCertOnDemandLoading = false;
+ }
+ 
+ /*!
+@@ -2470,6 +2474,7 @@ void QSslConfigurationPrivate::deepCopyDefaultConfiguration(QSslConfigurationPri
+     ptr->sessionProtocol = global->sessionProtocol;
+     ptr->ciphers = global->ciphers;
+     ptr->caCertificates = global->caCertificates;
++    ptr->allowRootCertOnDemandLoading = global->allowRootCertOnDemandLoading;
+     ptr->protocol = global->protocol;
+     ptr->peerVerifyMode = global->peerVerifyMode;
+     ptr->peerVerifyDepth = global->peerVerifyDepth;
diff --git a/external_imported/vcpkg/ports/qt5-base/patches/CVE-2023-37369-qtbase-5.15.diff b/external_imported/vcpkg/ports/qt5-base/patches/CVE-2023-37369-qtbase-5.15.diff
new file mode 100644
index 000000000..ad2984fbe
--- /dev/null
+++ b/external_imported/vcpkg/ports/qt5-base/patches/CVE-2023-37369-qtbase-5.15.diff
@@ -0,0 +1,203 @@
+diff --git a/src/corelib/serialization/qxmlstream.cpp b/src/corelib/serialization/qxmlstream.cpp
+index 7cd457ba3a..11d162cb79 100644
+--- a/src/corelib/serialization/qxmlstream.cpp
++++ b/src/corelib/serialization/qxmlstream.cpp
+@@ -1302,15 +1302,18 @@ inline int QXmlStreamReaderPrivate::fastScanContentCharList()
+     return n;
+ }
+ 
+-inline int QXmlStreamReaderPrivate::fastScanName(int *prefix)
++// Fast scan an XML attribute name (e.g. "xml:lang").
++inline QXmlStreamReaderPrivate::FastScanNameResult
++QXmlStreamReaderPrivate::fastScanName(Value *val)
+ {
+     int n = 0;
+     uint c;
+     while ((c = getChar()) != StreamEOF) {
+         if (n >= 4096) {
+             // This is too long to be a sensible name, and
+-            // can exhaust memory
+-            return 0;
++            // can exhaust memory, or the range of decltype(*prefix)
++            raiseNamePrefixTooLongError();
++            return {};
+         }
+         switch (c) {
+         case '\n':
+@@ -1339,23 +1342,23 @@ inline int QXmlStreamReaderPrivate::fastScanName(int *prefix)
+         case '+':
+         case '*':
+             putChar(c);
+-            if (prefix && *prefix == n+1) {
+-                *prefix = 0;
++            if (val && val->prefix == n + 1) {
++                val->prefix = 0;
+                 putChar(':');
+                 --n;
+             }
+-            return n;
++            return FastScanNameResult(n);
+         case ':':
+-            if (prefix) {
+-                if (*prefix == 0) {
+-                    *prefix = n+2;
++            if (val) {
++                if (val->prefix == 0) {
++                    val->prefix = n + 2;
+                 } else { // only one colon allowed according to the namespace spec.
+                     putChar(c);
+-                    return n;
++                    return FastScanNameResult(n);
+                 }
+             } else {
+                 putChar(c);
+-                return n;
++                return FastScanNameResult(n);
+             }
+             Q_FALLTHROUGH();
+         default:
+@@ -1364,12 +1367,12 @@ inline int QXmlStreamReaderPrivate::fastScanName(int *prefix)
+         }
+     }
+ 
+-    if (prefix)
+-        *prefix = 0;
++    if (val)
++        val->prefix = 0;
+     int pos = textBuffer.size() - n;
+     putString(textBuffer, pos);
+     textBuffer.resize(pos);
+-    return 0;
++    return FastScanNameResult(0);
+ }
+ 
+ enum NameChar { NameBeginning, NameNotBeginning, NotName };
+@@ -1878,6 +1881,14 @@ void QXmlStreamReaderPrivate::raiseWellFormedError(const QString &message)
+     raiseError(QXmlStreamReader::NotWellFormedError, message);
+ }
+ 
++void QXmlStreamReaderPrivate::raiseNamePrefixTooLongError()
++{
++    // TODO: add a ImplementationLimitsExceededError and use it instead
++    raiseError(QXmlStreamReader::NotWellFormedError,
++               QXmlStream::tr("Length of XML attribute name exceeds implemnetation limits (4KiB "
++                              "characters)."));
++}
++
+ void QXmlStreamReaderPrivate::parseError()
+ {
+ 
+diff --git a/src/corelib/serialization/qxmlstream.g b/src/corelib/serialization/qxmlstream.g
+index 4321fed68a..8c6a1a5887 100644
+--- a/src/corelib/serialization/qxmlstream.g
++++ b/src/corelib/serialization/qxmlstream.g
+@@ -516,7 +516,16 @@ public:
+     int fastScanLiteralContent();
+     int fastScanSpace();
+     int fastScanContentCharList();
+-    int fastScanName(int *prefix = nullptr);
++
++    struct FastScanNameResult {
++        FastScanNameResult() : ok(false) {}
++        explicit FastScanNameResult(int len) : addToLen(len), ok(true) { }
++        operator bool() { return ok; }
++        int operator*() { Q_ASSERT(ok); return addToLen; }
++        int addToLen;
++        bool ok;
++    };
++    FastScanNameResult fastScanName(Value *val = nullptr);
+     inline int fastScanNMTOKEN();
+ 
+ 
+@@ -525,6 +534,7 @@ public:
+ 
+     void raiseError(QXmlStreamReader::Error error, const QString& message = QString());
+     void raiseWellFormedError(const QString &message);
++    void raiseNamePrefixTooLongError();
+ 
+     QXmlStreamEntityResolver *entityResolver;
+ 
+@@ -1811,7 +1821,12 @@ space_opt ::= space;
+ qname ::= LETTER;
+ /.
+         case $rule_number: {
+-            sym(1).len += fastScanName(&sym(1).prefix);
++            Value &val = sym(1);
++            if (auto res = fastScanName(&val))
++                val.len += *res;
++            else
++                return false;
++
+             if (atEnd) {
+                 resume($rule_number);
+                 return false;
+@@ -1822,7 +1837,11 @@ qname ::= LETTER;
+ name ::= LETTER;
+ /.
+         case $rule_number:
+-            sym(1).len += fastScanName();
++            if (auto res = fastScanName())
++                sym(1).len += *res;
++            else
++                return false;
++
+             if (atEnd) {
+                 resume($rule_number);
+                 return false;
+diff --git a/src/corelib/serialization/qxmlstream_p.h b/src/corelib/serialization/qxmlstream_p.h
+index e5bde7b98e..b01484cac3 100644
+--- a/src/corelib/serialization/qxmlstream_p.h
++++ b/src/corelib/serialization/qxmlstream_p.h
+@@ -1005,7 +1005,16 @@ public:
+     int fastScanLiteralContent();
+     int fastScanSpace();
+     int fastScanContentCharList();
+-    int fastScanName(int *prefix = nullptr);
++
++    struct FastScanNameResult {
++        FastScanNameResult() : ok(false) {}
++        explicit FastScanNameResult(int len) : addToLen(len), ok(true) { }
++        operator bool() { return ok; }
++        int operator*() { Q_ASSERT(ok); return addToLen; }
++        int addToLen;
++        bool ok;
++    };
++    FastScanNameResult fastScanName(Value *val = nullptr);
+     inline int fastScanNMTOKEN();
+ 
+ 
+@@ -1014,6 +1023,7 @@ public:
+ 
+     void raiseError(QXmlStreamReader::Error error, const QString& message = QString());
+     void raiseWellFormedError(const QString &message);
++    void raiseNamePrefixTooLongError();
+ 
+     QXmlStreamEntityResolver *entityResolver;
+ 
+@@ -1939,7 +1949,12 @@ bool QXmlStreamReaderPrivate::parse()
+         break;
+ 
+         case 262: {
+-            sym(1).len += fastScanName(&sym(1).prefix);
++            Value &val = sym(1);
++            if (auto res = fastScanName(&val))
++                val.len += *res;
++            else
++                return false;
++
+             if (atEnd) {
+                 resume(262);
+                 return false;
+@@ -1947,7 +1962,11 @@ bool QXmlStreamReaderPrivate::parse()
+         } break;
+ 
+         case 263:
+-            sym(1).len += fastScanName();
++            if (auto res = fastScanName())
++                sym(1).len += *res;
++            else
++                return false;
++
+             if (atEnd) {
+                 resume(263);
+                 return false;
diff --git a/external_imported/vcpkg/ports/qt5-base/patches/CVE-2023-38197-qtbase-5.15.diff b/external_imported/vcpkg/ports/qt5-base/patches/CVE-2023-38197-qtbase-5.15.diff
new file mode 100644
index 000000000..e9e622bc3
--- /dev/null
+++ b/external_imported/vcpkg/ports/qt5-base/patches/CVE-2023-38197-qtbase-5.15.diff
@@ -0,0 +1,219 @@
+diff --git a/src/corelib/serialization/qxmlstream.cpp b/src/corelib/serialization/qxmlstream.cpp
+index bf8a2a9..6ab5d49 100644
+--- a/src/corelib/serialization/qxmlstream.cpp
++++ b/src/corelib/serialization/qxmlstream.cpp
+@@ -160,7 +160,7 @@
+     addData() or by waiting for it to arrive on the device().
+ 
+     \value UnexpectedElementError The parser encountered an element
+-    that was different to those it expected.
++    or token that was different to those it expected.
+ 
+ */
+ 
+@@ -295,13 +295,34 @@
+ 
+   QXmlStreamReader is a well-formed XML 1.0 parser that does \e not
+   include external parsed entities. As long as no error occurs, the
+-  application code can thus be assured that the data provided by the
+-  stream reader satisfies the W3C's criteria for well-formed XML. For
+-  example, you can be certain that all tags are indeed nested and
+-  closed properly, that references to internal entities have been
+-  replaced with the correct replacement text, and that attributes have
+-  been normalized or added according to the internal subset of the
+-  DTD.
++  application code can thus be assured, that
++  \list
++  \li the data provided by the stream reader satisfies the W3C's
++      criteria for well-formed XML,
++  \li tokens are provided in a valid order.
++  \endlist
++
++  Unless QXmlStreamReader raises an error, it guarantees the following:
++  \list
++  \li All tags are nested and closed properly.
++  \li References to internal entities have been replaced with the
++      correct replacement text.
++  \li Attributes have been normalized or added according to the
++      internal subset of the \l DTD.
++  \li Tokens of type \l StartDocument happen before all others,
++      aside from comments and processing instructions.
++  \li At most one DOCTYPE element (a token of type \l DTD) is present.
++  \li If present, the DOCTYPE appears before all other elements,
++      aside from StartDocument, comments and processing instructions.
++  \endlist
++
++  In particular, once any token of type \l StartElement, \l EndElement,
++  \l Characters, \l EntityReference or \l EndDocument is seen, no
++  tokens of type StartDocument or DTD will be seen. If one is present in
++  the input stream, out of order, an error is raised.
++
++  \note The token types \l Comment and \l ProcessingInstruction may appear
++  anywhere in the stream.
+ 
+   If an error occurs while parsing, atEnd() and hasError() return
+   true, and error() returns the error that occurred. The functions
+@@ -620,6 +641,7 @@
+         d->token = -1;
+         return readNext();
+     }
++    d->checkToken();
+     return d->type;
+ }
+ 
+@@ -740,6 +762,14 @@
+ };
+ 
+ 
++static const char QXmlStreamReader_XmlContextString[] =
++    "Prolog\0"
++    "Body\0";
++
++static const short QXmlStreamReader_XmlContextString_indices[] = {
++    0, 7
++};
++
+ /*!
+     \property  QXmlStreamReader::namespaceProcessing
+     The namespace-processing flag of the stream reader
+@@ -775,6 +805,16 @@
+                          QXmlStreamReader_tokenTypeString_indices[d->type]);
+ }
+ 
++/*!
++   \internal
++   \return \param ctxt (Prolog/Body) as a string.
++ */
++QString contextString(QXmlStreamReaderPrivate::XmlContext ctxt)
++{
++    return QLatin1String(QXmlStreamReader_XmlContextString +
++                         QXmlStreamReader_XmlContextString_indices[static_cast<int>(ctxt)]);
++}
++
+ #endif // QT_NO_XMLSTREAMREADER
+ 
+ QXmlStreamPrivateTagStack::QXmlStreamPrivateTagStack()
+@@ -866,6 +906,8 @@
+ 
+     type = QXmlStreamReader::NoToken;
+     error = QXmlStreamReader::NoError;
++    currentContext = XmlContext::Prolog;
++    foundDTD = false;
+ }
+ 
+ /*
+@@ -4061,6 +4103,92 @@
+     }
+ }
+ 
++static bool isTokenAllowedInContext(QXmlStreamReader::TokenType type,
++                                               QXmlStreamReaderPrivate::XmlContext loc)
++{
++    switch (type) {
++    case QXmlStreamReader::StartDocument:
++    case QXmlStreamReader::DTD:
++        return loc == QXmlStreamReaderPrivate::XmlContext::Prolog;
++
++    case QXmlStreamReader::StartElement:
++    case QXmlStreamReader::EndElement:
++    case QXmlStreamReader::Characters:
++    case QXmlStreamReader::EntityReference:
++    case QXmlStreamReader::EndDocument:
++        return loc == QXmlStreamReaderPrivate::XmlContext::Body;
++
++    case QXmlStreamReader::Comment:
++    case QXmlStreamReader::ProcessingInstruction:
++        return true;
++
++    case QXmlStreamReader::NoToken:
++    case QXmlStreamReader::Invalid:
++        return false;
++    default:
++        return false;
++    }
++}
++
++/*!
++   \internal
++   \brief QXmlStreamReader::isValidToken
++   \return \c true if \param type is a valid token type.
++   \return \c false if \param type is an unexpected token,
++   which indicates a non-well-formed or invalid XML stream.
++ */
++bool QXmlStreamReaderPrivate::isValidToken(QXmlStreamReader::TokenType type)
++{
++    // Don't change currentContext, if Invalid or NoToken occur in the prolog
++    if (type == QXmlStreamReader::Invalid || type == QXmlStreamReader::NoToken)
++        return false;
++
++    // If a token type gets rejected in the body, there is no recovery
++    const bool result = isTokenAllowedInContext(type, currentContext);
++    if (result || currentContext == XmlContext::Body)
++        return result;
++
++    // First non-Prolog token observed => switch context to body and check again.
++    currentContext = XmlContext::Body;
++    return isTokenAllowedInContext(type, currentContext);
++}
++
++/*!
++   \internal
++   Checks token type and raises an error, if it is invalid
++   in the current context (prolog/body).
++ */
++void QXmlStreamReaderPrivate::checkToken()
++{
++    Q_Q(QXmlStreamReader);
++
++    // The token type must be consumed, to keep track if the body has been reached.
++    const XmlContext context = currentContext;
++    const bool ok = isValidToken(type);
++
++    // Do nothing if an error has been raised already (going along with an unexpected token)
++    if (error != QXmlStreamReader::Error::NoError)
++        return;
++
++    if (!ok) {
++        raiseError(QXmlStreamReader::UnexpectedElementError,
++                   QLatin1String("Unexpected token type %1 in %2.")
++                   .arg(q->tokenString(), contextString(context)));
++        return;
++    }
++
++    if (type != QXmlStreamReader::DTD)
++        return;
++
++    // Raise error on multiple DTD tokens
++    if (foundDTD) {
++        raiseError(QXmlStreamReader::UnexpectedElementError,
++                   QLatin1String("Found second DTD token in %1.").arg(contextString(context)));
++    } else {
++        foundDTD = true;
++    }
++}
++
+ /*!
+  \fn bool QXmlStreamAttributes::hasAttribute(const QString &qualifiedName) const
+  \since 4.5
+diff --git a/src/corelib/serialization/qxmlstream_p.h b/src/corelib/serialization/qxmlstream_p.h
+index 8f7c9e0..708059b 100644
+--- a/src/corelib/serialization/qxmlstream_p.h
++++ b/src/corelib/serialization/qxmlstream_p.h
+@@ -804,6 +804,17 @@
+ #endif
+     bool atEnd;
+ 
++    enum class XmlContext
++    {
++        Prolog,
++        Body,
++    };
++
++    XmlContext currentContext = XmlContext::Prolog;
++    bool foundDTD = false;
++    bool isValidToken(QXmlStreamReader::TokenType type);
++    void checkToken();
++
+     /*!
+       \sa setType()
+      */
diff --git a/external_imported/vcpkg/ports/qt5-base/patches/CVE-2023-43114-5.15.patch b/external_imported/vcpkg/ports/qt5-base/patches/CVE-2023-43114-5.15.patch
new file mode 100644
index 000000000..da59ce543
--- /dev/null
+++ b/external_imported/vcpkg/ports/qt5-base/patches/CVE-2023-43114-5.15.patch
@@ -0,0 +1,120 @@
+diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
+index ba683cf686..217a968c64 100644
+--- a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
++++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
+@@ -1471,36 +1471,70 @@ QT_WARNING_POP
+     return fontEngine;
+ }
+ 
+-static QList<quint32> getTrueTypeFontOffsets(const uchar *fontData)
++static QList<quint32> getTrueTypeFontOffsets(const uchar *fontData, const uchar *fileEndSentinel)
+ {
+     QList<quint32> offsets;
+-    const quint32 headerTag = *reinterpret_cast<const quint32 *>(fontData);
++    if (fileEndSentinel - fontData < 12) {
++        qCWarning(lcQpaFonts) << "Corrupted font data detected";
++        return offsets;
++    }
++
++    const quint32 headerTag = qFromUnaligned<quint32>(fontData);
+     if (headerTag != MAKE_TAG('t', 't', 'c', 'f')) {
+         if (headerTag != MAKE_TAG(0, 1, 0, 0)
+             && headerTag != MAKE_TAG('O', 'T', 'T', 'O')
+             && headerTag != MAKE_TAG('t', 'r', 'u', 'e')
+-            && headerTag != MAKE_TAG('t', 'y', 'p', '1'))
++            && headerTag != MAKE_TAG('t', 'y', 'p', '1')) {
+             return offsets;
++        }
+         offsets << 0;
+         return offsets;
+     }
++
++    const quint32 maximumNumFonts = 0xffff;
+     const quint32 numFonts = qFromBigEndian<quint32>(fontData + 8);
+-    for (uint i = 0; i < numFonts; ++i) {
+-        offsets << qFromBigEndian<quint32>(fontData + 12 + i * 4);
++    if (numFonts > maximumNumFonts) {
++        qCWarning(lcQpaFonts) << "Font collection of" << numFonts << "fonts is too large. Aborting.";
++        return offsets;
+     }
++
++    if (quintptr(fileEndSentinel - fontData) > 12 + (numFonts - 1) * 4) {
++        for (quint32 i = 0; i < numFonts; ++i)
++            offsets << qFromBigEndian<quint32>(fontData + 12 + i * 4);
++    } else {
++        qCWarning(lcQpaFonts) << "Corrupted font data detected";
++    }
++
+     return offsets;
+ }
+ 
+-static void getFontTable(const uchar *fileBegin, const uchar *data, quint32 tag, const uchar **table, quint32 *length)
++static void getFontTable(const uchar *fileBegin, const uchar *fileEndSentinel, const uchar *data, quint32 tag, const uchar **table, quint32 *length)
+ {
+-    const quint16 numTables = qFromBigEndian<quint16>(data + 4);
+-    for (uint i = 0; i < numTables; ++i) {
+-        const quint32 offset = 12 + 16 * i;
+-        if (*reinterpret_cast<const quint32 *>(data + offset) == tag) {
+-            *table = fileBegin + qFromBigEndian<quint32>(data + offset + 8);
+-            *length = qFromBigEndian<quint32>(data + offset + 12);
+-            return;
++    if (fileEndSentinel - data >= 6) {
++        const quint16 numTables = qFromBigEndian<quint16>(data + 4);
++        if (fileEndSentinel - data >= 28 + 16 * (numTables - 1)) {
++            for (quint32 i = 0; i < numTables; ++i) {
++                const quint32 offset = 12 + 16 * i;
++                if (qFromUnaligned<quint32>(data + offset) == tag) {
++                    const quint32 tableOffset = qFromBigEndian<quint32>(data + offset + 8);
++                    if (quintptr(fileEndSentinel - fileBegin) <= tableOffset) {
++                        qCWarning(lcQpaFonts) << "Corrupted font data detected";
++                        break;
++                    }
++                    *table = fileBegin + tableOffset;
++                    *length = qFromBigEndian<quint32>(data + offset + 12);
++                    if (quintptr(fileEndSentinel - *table) < *length) {
++                        qCWarning(lcQpaFonts) << "Corrupted font data detected";
++                        break;
++                    }
++                    return;
++                }
++            }
++        } else {
++            qCWarning(lcQpaFonts) << "Corrupted font data detected";
+         }
++    } else {
++        qCWarning(lcQpaFonts) << "Corrupted font data detected";
+     }
+     *table = 0;
+     *length = 0;
+@@ -1513,8 +1547,9 @@ static void getFamiliesAndSignatures(const QByteArray &fontData,
+                                      QVector<QFontValues> *values)
+ {
+     const uchar *data = reinterpret_cast<const uchar *>(fontData.constData());
++    const uchar *dataEndSentinel = data + fontData.size();
+ 
+-    QList<quint32> offsets = getTrueTypeFontOffsets(data);
++    QList<quint32> offsets = getTrueTypeFontOffsets(data, dataEndSentinel);
+     if (offsets.isEmpty())
+         return;
+ 
+@@ -1522,7 +1557,7 @@ static void getFamiliesAndSignatures(const QByteArray &fontData,
+         const uchar *font = data + offsets.at(i);
+         const uchar *table;
+         quint32 length;
+-        getFontTable(data, font, MAKE_TAG('n', 'a', 'm', 'e'), &table, &length);
++        getFontTable(data, dataEndSentinel, font, MAKE_TAG('n', 'a', 'm', 'e'), &table, &length);
+         if (!table)
+             continue;
+         QFontNames names = qt_getCanonicalFontNames(table, length);
+@@ -1532,7 +1567,7 @@ static void getFamiliesAndSignatures(const QByteArray &fontData,
+         families->append(std::move(names));
+ 
+         if (values || signatures)
+-            getFontTable(data, font, MAKE_TAG('O', 'S', '/', '2'), &table, &length);
++            getFontTable(data, dataEndSentinel, font, MAKE_TAG('O', 'S', '/', '2'), &table, &length);
+ 
+         if (values) {
+             QFontValues fontValues;
+-- 
+2.27.0.windows.1
+
diff --git a/external_imported/vcpkg/ports/qt5-base/patches/XKB_KEY_dead_lowline.patch b/external_imported/vcpkg/ports/qt5-base/patches/XKB_KEY_dead_lowline.patch
new file mode 100644
index 000000000..9bbe3efb1
--- /dev/null
+++ b/external_imported/vcpkg/ports/qt5-base/patches/XKB_KEY_dead_lowline.patch
@@ -0,0 +1,18 @@
+diff --git a/src/platformsupport/input/xkbcommon/qxkbcommon.cpp b/src/platformsupport/input/xkbcommon/qxkbcommon.cpp
+index 7bfacf4..ded358a 100644
+--- a/src/platformsupport/input/xkbcommon/qxkbcommon.cpp
++++ b/src/platformsupport/input/xkbcommon/qxkbcommon.cpp
+@@ -273,11 +273,13 @@ static constexpr const auto KeyTbl = qMakeArray(
+         Xkb2Qt<XKB_KEY_dead_small_schwa,        Qt::Key_Dead_Small_Schwa>,
+         Xkb2Qt<XKB_KEY_dead_capital_schwa,      Qt::Key_Dead_Capital_Schwa>,
+         Xkb2Qt<XKB_KEY_dead_greek,              Qt::Key_Dead_Greek>,
++#ifdef XKB_KEY_dead_lowline
+         Xkb2Qt<XKB_KEY_dead_lowline,            Qt::Key_Dead_Lowline>,
+         Xkb2Qt<XKB_KEY_dead_aboveverticalline,  Qt::Key_Dead_Aboveverticalline>,
+         Xkb2Qt<XKB_KEY_dead_belowverticalline,  Qt::Key_Dead_Belowverticalline>,
+         Xkb2Qt<XKB_KEY_dead_longsolidusoverlay, Qt::Key_Dead_Longsolidusoverlay>,
+ 
++#endif
+         // Special keys from X.org - This include multimedia keys,
+         // wireless/bluetooth/uwb keys, special launcher keys, etc.
+         Xkb2Qt<XKB_KEY_XF86Back,                Qt::Key_Back>,
diff --git a/external_imported/vcpkg/ports/qt5-base/patches/patch-qtbase-memory_resource.diff b/external_imported/vcpkg/ports/qt5-base/patches/patch-qtbase-memory_resource.diff
new file mode 100644
index 000000000..18b5b4d51
--- /dev/null
+++ b/external_imported/vcpkg/ports/qt5-base/patches/patch-qtbase-memory_resource.diff
@@ -0,0 +1,43 @@
+--- a/src/corelib/global/qcompilerdetection.h
++++ b/src/corelib/global/qcompilerdetection.h
+@@ -1050,16 +1050,22 @@
+ #   endif // !_HAS_CONSTEXPR
+ #  endif // !__GLIBCXX__ && !_LIBCPP_VERSION
+ # endif // Q_OS_QNX
+-# if (defined(Q_CC_CLANG) || defined(Q_CC_INTEL)) && defined(Q_OS_MAC) && defined(__GNUC_LIBSTD__) \
+-    && ((__GNUC_LIBSTD__-0) * 100 + __GNUC_LIBSTD_MINOR__-0 <= 402)
++# if defined(Q_CC_CLANG) && defined(Q_OS_DARWIN)
++#  if defined(__GNUC_LIBSTD__) && ((__GNUC_LIBSTD__-0) * 100 + __GNUC_LIBSTD_MINOR__-0 <= 402)
+ // Apple has not updated libstdc++ since 2007, which means it does not have
+ // <initializer_list> or std::move. Let's disable these features
+-#  undef Q_COMPILER_INITIALIZER_LISTS
+-#  undef Q_COMPILER_RVALUE_REFS
+-#  undef Q_COMPILER_REF_QUALIFIERS
++#   undef Q_COMPILER_INITIALIZER_LISTS
++#   undef Q_COMPILER_RVALUE_REFS
++#   undef Q_COMPILER_REF_QUALIFIERS
+ // Also disable <atomic>, since it's clearly not there
+-#  undef Q_COMPILER_ATOMICS
+-# endif
++#   undef Q_COMPILER_ATOMICS
++#  endif
++#  if defined(__cpp_lib_memory_resource) \
++    && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED)  && __MAC_OS_X_VERSION_MIN_REQUIRED  < 140000) \
++     || (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED < 170000))
++#   undef __cpp_lib_memory_resource // Only supported on macOS 14 and iOS 17
++#  endif
++# endif // defined(Q_CC_CLANG) && defined(Q_OS_DARWIN)
+ # if defined(Q_CC_CLANG) && defined(Q_CC_INTEL) && Q_CC_INTEL >= 1500
+ // ICC 15.x and 16.0 have their own implementation of std::atomic, which is activated when in Clang mode
+ // (probably because libc++'s <atomic> on OS X failed to compile), but they're missing some
+--- a/src/corelib/tools/qduplicatetracker_p.h
++++ b/src/corelib/tools/qduplicatetracker_p.h
+@@ -52,7 +52,7 @@
+ 
+ #include <qglobal.h>
+ 
+-#if QT_HAS_INCLUDE(<memory_resource>) && __cplusplus > 201402L
++#ifdef __cpp_lib_memory_resource
+ #  include <unordered_set>
+ #  include <memory_resource>
+ #else
diff --git a/external_imported/vcpkg/ports/qt5-base/patches/qtbug_96392.patch b/external_imported/vcpkg/ports/qt5-base/patches/qtbug_96392.patch
new file mode 100644
index 000000000..2f70dfe60
--- /dev/null
+++ b/external_imported/vcpkg/ports/qt5-base/patches/qtbug_96392.patch
@@ -0,0 +1,27 @@
+--- a/src/gui/configure.json
++++ b/src/gui/configure.json
+@@ -842,7 +842,8 @@                     "// Check if EGL is compatible with X. Some EGL implementations, typically on",
+                     "// embedded devices, are not intended to be used together with X. EGL support",
+                     "// has to be disabled in plugins like xcb in this case since the native display,",
+                     "// window and pixmap types will be different than what an X-based platform",
+-                    "// plugin would expect."
++                    "// plugin would expect.",
++                    "#define USE_X11"
+                 ],
+                 "include": [ "EGL/egl.h", "X11/Xlib.h" ],
+                 "main": [
+--- a/src/platformsupport/eglconvenience/qt_egl_p.h
++++ b/src/platformsupport/eglconvenience/qt_egl_p.h
+@@ -61,7 +61,11 @@ # endif
+ # if !defined(Q_OS_INTEGRITY)
+ #  define WIN_INTERFACE_CUSTOM   // NV
+ # endif // Q_OS_INTEGRITY
+-#endif  // QT_EGL_NO_X11
++#else // QT_EGL_NO_X11
++// If one has an eglplatform.h with https://github.com/KhronosGroup/EGL-Registry/pull/130
++// that needs USE_X11 to be defined.
++# define USE_X11
++#endif
+ 
+ #ifdef QT_EGL_WAYLAND
+ # define WAYLAND // NV
diff --git a/external_imported/vcpkg/ports/qt5-base/patches/xcode-15.patch b/external_imported/vcpkg/ports/qt5-base/patches/xcode-15.patch
new file mode 100644
index 000000000..9430967b5
--- /dev/null
+++ b/external_imported/vcpkg/ports/qt5-base/patches/xcode-15.patch
@@ -0,0 +1,28 @@
+diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf
+index 0040b6c..bfad10d 100644
+--- a/mkspecs/features/toolchain.prf
++++ b/mkspecs/features/toolchain.prf
+@@ -288,9 +288,12 @@
+                 }
+             }
+         }
+-        isEmpty(QMAKE_DEFAULT_LIBDIRS)|isEmpty(QMAKE_DEFAULT_INCDIRS): \
++        isEmpty(QMAKE_DEFAULT_INCDIRS): \
+             !integrity: \
+-                error("failed to parse default search paths from compiler output")
++                error("failed to parse default include paths from compiler output")
++        isEmpty(QMAKE_DEFAULT_LIBDIRS): \
++            !integrity:!darwin: \
++                error("failed to parse default library paths from compiler output")
+         QMAKE_DEFAULT_LIBDIRS = $$unique(QMAKE_DEFAULT_LIBDIRS)
+     } else: ghs {
+         cmd = $$QMAKE_CXX $$QMAKE_CXXFLAGS -$${LITERAL_HASH} -o /tmp/fake_output /tmp/fake_input.cpp
+@@ -411,7 +414,7 @@
+         QMAKE_DEFAULT_INCDIRS = $$split(INCLUDE, $$QMAKE_DIRLIST_SEP)
+     }
+ 
+-    unix:if(!cross_compile|host_build) {
++    unix:!darwin:if(!cross_compile|host_build) {
+         isEmpty(QMAKE_DEFAULT_INCDIRS): QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include
+         isEmpty(QMAKE_DEFAULT_LIBDIRS): QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib
+     }
diff --git a/external_imported/vcpkg/ports/qt5-base/portfile.cmake b/external_imported/vcpkg/ports/qt5-base/portfile.cmake
index b92543eab..37d3150ea 100644
--- a/external_imported/vcpkg/ports/qt5-base/portfile.cmake
+++ b/external_imported/vcpkg/ports/qt5-base/portfile.cmake
@@ -1,13 +1,11 @@
 vcpkg_buildpath_length_warning(37)
 
-if (VCPKG_TARGET_IS_LINUX)
-    message(WARNING "qt5-base currently requires some packages from the system package manager, see https://doc.qt.io/qt-5/linux-requirements.html")
-    message(WARNING 
-[[
-qt5-base for qt5-x11extras requires several libraries from the system package manager. Please refer to
-  https://github.com/microsoft/vcpkg/blob/master/scripts/azure-pipelines/linux/provision-image.sh
-  for a complete list of them.
-]]
+if(VCPKG_TARGET_IS_LINUX)
+    message(WARNING "qt5-base currently requires some packages from the system package manager. "
+    "They can be installed on Ubuntu systems via "
+    "sudo apt-get install '^libxcb.*-dev' libx11-xcb-dev libgl1-mesa-dev libxrender-dev "
+    "libxi-dev libxkbcommon-dev libxkbcommon-x11-dev. For more information, see "
+    "https://doc.qt.io/qt-5/linux.html and https://doc.qt.io/qt-5/linux-requirements.html"
     )
 elseif(VCPKG_TARGET_IS_MINGW AND CMAKE_HOST_WIN32)
     find_program(MINGW32_MAKE mingw32-make PATHS ENV PATH NO_DEFAULT_PATH REQUIRED)
@@ -48,15 +46,30 @@ endif()
 
 qt_download_submodule(  OUT_SOURCE_PATH SOURCE_PATH
                         PATCHES
+                            # CVE fixes from https://download.qt.io/official_releases/qt/5.15/
+                            patches/CVE-2023-24607-qtbase-5.15.diff
+                            patches/CVE-2023-32762-qtbase-5.15.diff
+                            patches/CVE-2023-32763-qtbase-5.15.diff
+                            patches/CVE-2023-33285-qtbase-5.15.diff
+                            patches/CVE-2023-34410-qtbase-5.15.diff
+                            patches/CVE-2023-37369-qtbase-5.15.diff
+                            patches/CVE-2023-38197-qtbase-5.15.diff
+                            patches/CVE-2023-43114-5.15.patch
+                            patches/0001-CVE-2023-51714-qtbase-5.15.diff
+                            patches/0002-CVE-2023-51714-qtbase-5.15.diff
+
                             patches/winmain_pro.patch          #Moves qtmain to manual-link
                             patches/windows_prf.patch          #fixes the qtmain dependency due to the above move
                             patches/qt_app.patch               #Moves the target location of qt5 host apps to always install into the host dir.
                             patches/gui_configure.patch        #Patches the gui configure.json to break freetype/fontconfig autodetection because it does not include its dependencies.
                             patches/xlib.patch                 #Patches Xlib check to actually use Pkgconfig instead of makeSpec only
                             patches/egl.patch                  #Fix egl detection logic.
+                            patches/qtbug_96392.patch          #Backport fix for QTBUG-96392
                             patches/mysql_plugin_include.patch #Fix include path of mysql plugin
                             patches/mysql-configure.patch      #Fix mysql project
                             patches/cocoa.patch                #Fix missing include on macOS Monterrey, https://code.qt.io/cgit/qt/qtbase.git/commit/src/plugins/platforms/cocoa?id=dece6f5840463ae2ddf927d65eb1b3680e34a547
+                            patches/xcode-15.patch             #From https://codereview.qt-project.org/c/qt/qtbase/+/503172
+                            patches/patch-qtbase-memory_resource.diff # From https://bugreports.qt.io/browse/QTBUG-114316
                             #patches/static_opengl.patch       #Use this patch if you really want to statically link angle on windows (e.g. using -opengl es2 and -static).
                                                                #Be carefull since it requires definining _GDI32_ for all dependent projects due to redefinition errors in the
                                                                #the windows supplied gl.h header and the angle gl.h otherwise.
@@ -67,6 +80,7 @@ qt_download_submodule(  OUT_SOURCE_PATH SOURCE_PATH
                             patches/Qt5GuiConfigExtras.patch   # Patches the library search behavior for EGL since angle is not build with Qt
                             patches/fix_angle.patch            # Failed to create OpenGL context for format QSurfaceFormat ...
                             patches/mingw9.patch               # Fix compile with MinGW-W64 9.0.0: Redefinition of 'struct _FILE_ID_INFO'
+                            patches/XKB_KEY_dead_lowline.patch # https://bugreports.qt.io/browse/QTBUG-117950
                     )
 
 # Remove vendored dependencies to ensure they are not picked up by the build
@@ -262,14 +276,11 @@ if(VCPKG_TARGET_IS_WINDOWS)
             "OPENSSL_LIBS=${SSL_DEBUG} ${EAY_DEBUG} ${ADDITIONAL_WINDOWS_LIBS}"
         )
     if(WITH_PGSQL_PLUGIN)
-        list(APPEND RELEASE_OPTIONS "PSQL_LIBS=${PSQL_RELEASE} ${PSQL_PORT_RELEASE} ${PSQL_COMMON_RELEASE} ${SSL_RELEASE} ${EAY_RELEASE} ${ADDITIONAL_WINDOWS_LIBS}")
-        list(APPEND DEBUG_OPTIONS "PSQL_LIBS=${PSQL_DEBUG} ${PSQL_PORT_DEBUG} ${PSQL_COMMON_DEBUG} ${SSL_DEBUG} ${EAY_DEBUG} ${ADDITIONAL_WINDOWS_LIBS}")
+        list(APPEND RELEASE_OPTIONS "PSQL_LIBS=${PSQL_RELEASE} ${PSQL_PORT_RELEASE} ${PSQL_COMMON_RELEASE} ${SSL_RELEASE} ${EAY_RELEASE} ${ADDITIONAL_WINDOWS_LIBS} -lwldap32")
+        list(APPEND DEBUG_OPTIONS "PSQL_LIBS=${PSQL_DEBUG} ${PSQL_PORT_DEBUG} ${PSQL_COMMON_DEBUG} ${SSL_DEBUG} ${EAY_DEBUG} ${ADDITIONAL_WINDOWS_LIBS} -lwldap32")
     endif()
 elseif(VCPKG_TARGET_IS_LINUX)
     list(APPEND CORE_OPTIONS -fontconfig -xcb-xlib -xcb -linuxfb)
-    if (NOT EXISTS "/usr/include/GL/glu.h")
-        message(FATAL_ERROR "qt5 requires libgl1-mesa-dev and libglu1-mesa-dev, please use your distribution's package manager to install them.\nExample: \"apt-get install libgl1-mesa-dev libglu1-mesa-dev\"")
-    endif()
     list(APPEND RELEASE_OPTIONS
             "SQLITE_LIBS=${SQLITE_RELEASE} -ldl -lpthread"
             "HARFBUZZ_LIBS=${harfbuzz_LIBRARIES_RELEASE}"
@@ -287,6 +298,14 @@ elseif(VCPKG_TARGET_IS_LINUX)
         list(APPEND DEBUG_OPTIONS "PSQL_LIBS=${PSQL_DEBUG} ${PSQL_PORT_DEBUG} ${PSQL_TYPES_DEBUG} ${PSQL_COMMON_DEBUG} ${SSL_DEBUG} ${EAY_DEBUG} -ldl -lpthread")
     endif()
 elseif(VCPKG_TARGET_IS_OSX)
+    if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+        # Avoid frameworks for vcpkg
+        list(APPEND CORE_OPTIONS -no-framework)
+        # Such that Qt executables like moc find their libs. The default path is ../Frameworks
+        list(APPEND DEBUG_OPTIONS -R ${CURRENT_INSTALLED_DIR}/debug/lib)
+        list(APPEND RELEASE_OPTIONS -R ${CURRENT_INSTALLED_DIR}/lib)
+    endif()
+
     list(APPEND CORE_OPTIONS -fontconfig)
     if("${VCPKG_TARGET_ARCHITECTURE}" MATCHES "arm64")
         FILE(READ "${SOURCE_PATH}/mkspecs/common/macx.conf" _tmp_contents)
diff --git a/external_imported/vcpkg/ports/qt5-base/vcpkg.json b/external_imported/vcpkg/ports/qt5-base/vcpkg.json
index 8d599946a..f81e8b0ed 100644
--- a/external_imported/vcpkg/ports/qt5-base/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5-base/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "qt5-base",
-  "version": "5.15.8",
-  "port-version": 5,
+  "version": "5.15.12",
+  "port-version": 1,
   "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
   "homepage": "https://www.qt.io/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/qt5-canvas3d/vcpkg.json b/external_imported/vcpkg/ports/qt5-canvas3d/vcpkg.json
index f26c201b8..9b66bfbaf 100644
--- a/external_imported/vcpkg/ports/qt5-canvas3d/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5-canvas3d/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "qt5-canvas3d",
-  "version-string": "0",
-  "port-version": 1,
+  "version": "0",
+  "port-version": 2,
   "description": "Qt5 Canvas 3d Module;",
   "dependencies": [
     {
diff --git a/external_imported/vcpkg/ports/qt5-charts/vcpkg.json b/external_imported/vcpkg/ports/qt5-charts/vcpkg.json
index f53252cd6..733dd137a 100644
--- a/external_imported/vcpkg/ports/qt5-charts/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5-charts/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt5-charts",
-  "version": "5.15.8",
+  "version": "5.15.12",
   "description": "Qt5 Charts Module - UI components for displaying charts, driven by static or dynamic data models",
   "license": null,
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/qt5-connectivity/vcpkg.json b/external_imported/vcpkg/ports/qt5-connectivity/vcpkg.json
index 37bd4a126..fc08513d9 100644
--- a/external_imported/vcpkg/ports/qt5-connectivity/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5-connectivity/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt5-connectivity",
-  "version": "5.15.8",
+  "version": "5.15.12",
   "description": "Qt5 Connectivity module - Provides access to Bluetooth and NFC hardware",
   "license": null,
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/qt5-datavis3d/vcpkg.json b/external_imported/vcpkg/ports/qt5-datavis3d/vcpkg.json
index 7d8b34238..1787da572 100644
--- a/external_imported/vcpkg/ports/qt5-datavis3d/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5-datavis3d/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt5-datavis3d",
-  "version": "5.15.8",
+  "version": "5.15.12",
   "description": "Qt5 Data Visualization 3d Module - UI Components for creating 3D data visualizations",
   "license": null,
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/qt5-declarative/portfile.cmake b/external_imported/vcpkg/ports/qt5-declarative/portfile.cmake
index b813567f9..7ab4aeb35 100644
--- a/external_imported/vcpkg/ports/qt5-declarative/portfile.cmake
+++ b/external_imported/vcpkg/ports/qt5-declarative/portfile.cmake
@@ -1,5 +1,12 @@
-include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
-qt_submodule_installation(OUT_SOURCE_PATH SOURCE_PATH)
+include("${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake")
+
+if("d3d12" IN_LIST FEATURES)
+    list(APPEND CORE_OPTIONS -d3d12)
+else()
+    list(APPEND CORE_OPTIONS -no-d3d12)
+endif()
+
+qt_submodule_installation(OUT_SOURCE_PATH SOURCE_PATH BUILD_OPTIONS ${CORE_OPTIONS})
 
 if(NOT QT_UPDATE_VERSION)
   vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/qt5/QtQml/${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER}/QtQml/private/qqmljsparser_p.h" "${SOURCE_PATH}" "")
diff --git a/external_imported/vcpkg/ports/qt5-declarative/vcpkg.json b/external_imported/vcpkg/ports/qt5-declarative/vcpkg.json
index 8e1664597..ef715e434 100644
--- a/external_imported/vcpkg/ports/qt5-declarative/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5-declarative/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt5-declarative",
-  "version": "5.15.8",
+  "version": "5.15.12",
   "description": "Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol.",
   "license": null,
   "dependencies": [
@@ -10,5 +10,26 @@
     },
     "qt5-imageformats",
     "qt5-svg"
-  ]
+  ],
+  "default-features": [
+    "platform-default-features"
+  ],
+  "features": {
+    "d3d12": {
+      "description": "Provides a Direct3D 12 backend for the scenegraph.",
+      "supports": "windows & !mingw"
+    },
+    "platform-default-features": {
+      "description": "Enable platform-dependent default features",
+      "dependencies": [
+        {
+          "name": "qt5-declarative",
+          "features": [
+            "d3d12"
+          ],
+          "platform": "windows & !mingw"
+        }
+      ]
+    }
+  }
 }
diff --git a/external_imported/vcpkg/ports/qt5-doc/vcpkg.json b/external_imported/vcpkg/ports/qt5-doc/vcpkg.json
index e4890bc98..f6cc833df 100644
--- a/external_imported/vcpkg/ports/qt5-doc/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5-doc/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt5-doc",
-  "version": "5.15.8",
+  "version": "5.15.12",
   "description": "Qt5 doc Module;",
   "license": null,
   "supports": "linux",
diff --git a/external_imported/vcpkg/ports/qt5-gamepad/vcpkg.json b/external_imported/vcpkg/ports/qt5-gamepad/vcpkg.json
index 8e4e26e9d..9f9a9a12b 100644
--- a/external_imported/vcpkg/ports/qt5-gamepad/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5-gamepad/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt5-gamepad",
-  "version": "5.15.8",
+  "version": "5.15.12",
   "description": "Qt5 Gamepad Module - Enables Qt applications to support the use of gamepad hardware",
   "license": null,
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/qt5-graphicaleffects/vcpkg.json b/external_imported/vcpkg/ports/qt5-graphicaleffects/vcpkg.json
index ef93d37fb..0a0b12764 100644
--- a/external_imported/vcpkg/ports/qt5-graphicaleffects/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5-graphicaleffects/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt5-graphicaleffects",
-  "version": "5.15.8",
+  "version": "5.15.12",
   "description": "Qt5 GraphicalEffects Module.",
   "license": null,
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/qt5-imageformats/portfile.cmake b/external_imported/vcpkg/ports/qt5-imageformats/portfile.cmake
index d82fc4217..fd97931e4 100644
--- a/external_imported/vcpkg/ports/qt5-imageformats/portfile.cmake
+++ b/external_imported/vcpkg/ports/qt5-imageformats/portfile.cmake
@@ -1,47 +1,49 @@
 set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
-include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
 
+include("${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake")
 
 list(APPEND CORE_OPTIONS
-    -system-tiff
-    -system-webp
-    -jasper 
     -no-mng # must be explicitly disabled to not automatically pick up mng
-    -verbose)
-    
-x_vcpkg_pkgconfig_get_modules(PREFIX tiff MODULES libtiff-4 LIBS)
+    -verbose
+)
 
-find_library(JPEG_RELEASE NAMES jpeg jpeg-static PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
-find_library(JPEG_DEBUG NAMES jpeg jpeg-static jpegd jpeg-staticd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
-find_library(ZLIB_RELEASE NAMES z zlib PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
-find_library(ZLIB_DEBUG NAMES z zlib zd zlibd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
+if("jasper" IN_LIST FEATURES)
+    list(APPEND CORE_OPTIONS -jasper)
 
-find_library(JASPER_RELEASE NAMES jasper PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
-find_library(JASPER_DEBUG NAMES jasperd jasper libjasperd libjasper PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
+    x_vcpkg_pkgconfig_get_modules(PREFIX jasper MODULES jasper LIBS)
 
-if(NOT VCPKG_TARGET_IS_OSX AND NOT (VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64"))
-    set(FREEGLUT_NEEDED ON)
-endif()
+    file(READ "${CURRENT_INSTALLED_DIR}/share/jasper/vcpkg_abi_info.txt" jasper_abi_info)
+    if(jasper_abi_info MATCHES "(^|;)opengl(;|$)")
+        find_library(FREEGLUT_RELEASE NAMES freeglut glut PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
+        find_library(FREEGLUT_DEBUG NAMES freeglutd freeglut glutd glut PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
+    endif()
 
-if(FREEGLUT_NEEDED)
-    find_library(FREEGLUT_RELEASE NAMES freeglut glut PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
-    find_library(FREEGLUT_DEBUG NAMES freeglutd freeglut glutd glut PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
+    list(APPEND OPT_REL "JASPER_LIBS=${jasper_LIBS_RELEASE} ${FREEGLUT_RELEASE}")
+    list(APPEND OPT_DBG "JASPER_LIBS=${jasper_LIBS_DEBUG} ${FREEGLUT_DEBUG}")
+else()
+    list(APPEND CORE_OPTIONS -no-jasper)
 endif()
 
-x_vcpkg_pkgconfig_get_modules(PREFIX webp MODULES libwebp libwebpdemux libwebpmux libwebpdecoder LIBS)
-
-set(OPT_REL "TIFF_LIBS=${tiff_LIBS_RELEASE}"
-            "WEBP_LIBS=${webp_LIBS_RELEASE}"
-            "JASPER_LIBS=${JASPER_RELEASE} ${JPEG_RELEASE} ${ZLIB_RELEASE}") # This will still fail if LIBWEBP is installed with all available features due to the missing additional dependencies
-set(OPT_DBG "TIFF_LIBS=${tiff_LIBS_DEBUG}"
-            "WEBP_LIBS=${webp_LIBS_DEBUG}"
-            "JASPER_LIBS=${JASPER_DEBUG}  ${JPEG_DEBUG} ${ZLIB_DEBUG}")
+if("tiff" IN_LIST FEATURES)
+    list(APPEND CORE_OPTIONS -system-tiff)
 
-if(FREEGLUT_NEEDED)
-    set(OPT_REL "${OPT_REL} ${FREEGLUT_RELEASE}")
-    set(OPT_DBG "${OPT_DBG} ${FREEGLUT_DEBUG}")
+    x_vcpkg_pkgconfig_get_modules(PREFIX tiff MODULES libtiff-4 LIBS)
+    list(APPEND OPT_REL "TIFF_LIBS=${tiff_LIBS_RELEASE}")
+    list(APPEND OPT_DBG "TIFF_LIBS=${tiff_LIBS_DEBUG}")
+else()
+    list(APPEND CORE_OPTIONS -no-tiff)
 endif()
 
-list(APPEND CORE_OPTIONS "WEBP_INCDIR=${CURRENT_INSTALLED_DIR}/include") # Requires libwebp[all]
+if("webp" IN_LIST FEATURES)
+    list(APPEND CORE_OPTIONS -system-webp)
+
+    x_vcpkg_pkgconfig_get_modules(PREFIX webp MODULES libwebp libwebpdemux libwebpmux libwebpdecoder LIBS)
+    list(APPEND CORE_OPTIONS "WEBP_INCDIR=${CURRENT_INSTALLED_DIR}/include") # Requires libwebp[all]
+    # This will still fail if LIBWEBP is installed with all available features due to the missing additional dependencies
+    list(APPEND OPT_REL "WEBP_LIBS=${webp_LIBS_RELEASE}")
+    list(APPEND OPT_DBG "WEBP_LIBS=${webp_LIBS_DEBUG}")
+else()
+    list(APPEND CORE_OPTIONS -no-webp)
+endif()
 
-qt_submodule_installation(BUILD_OPTIONS ${CORE_OPTIONS} BUILD_OPTIONS_RELEASE ${OPT_REL} BUILD_OPTIONS_DEBUG ${OPT_DBG})
\ No newline at end of file
+qt_submodule_installation(BUILD_OPTIONS ${CORE_OPTIONS} BUILD_OPTIONS_RELEASE ${OPT_REL} BUILD_OPTIONS_DEBUG ${OPT_DBG})
diff --git a/external_imported/vcpkg/ports/qt5-imageformats/vcpkg.json b/external_imported/vcpkg/ports/qt5-imageformats/vcpkg.json
index f02fc3610..d807aa594 100644
--- a/external_imported/vcpkg/ports/qt5-imageformats/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5-imageformats/vcpkg.json
@@ -1,20 +1,51 @@
 {
   "name": "qt5-imageformats",
-  "version": "5.15.8",
-  "port-version": 1,
+  "version": "5.15.12",
   "description": "Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP",
   "license": null,
   "dependencies": [
-    "jasper",
-    "libwebp",
     {
       "name": "qt5-base",
       "default-features": false
-    },
+    }
+  ],
+  "default-features": [
     "tiff",
-    {
-      "name": "vcpkg-pkgconfig-get-modules",
-      "host": true
+    "webp"
+  ],
+  "features": {
+    "jasper": {
+      "description": "Enable JPEG-2000 support using the JasPer library",
+      "dependencies": [
+        {
+          "name": "jasper",
+          "default-features": false
+        },
+        {
+          "name": "vcpkg-pkgconfig-get-modules",
+          "host": true
+        }
+      ]
+    },
+    "tiff": {
+      "description": "Enable TIFF support",
+      "dependencies": [
+        "tiff",
+        {
+          "name": "vcpkg-pkgconfig-get-modules",
+          "host": true
+        }
+      ]
+    },
+    "webp": {
+      "description": "Enable WEBP support",
+      "dependencies": [
+        "libwebp",
+        {
+          "name": "vcpkg-pkgconfig-get-modules",
+          "host": true
+        }
+      ]
     }
-  ]
+  }
 }
diff --git a/external_imported/vcpkg/ports/qt5-location/missing-include.patch b/external_imported/vcpkg/ports/qt5-location/missing-include.patch
new file mode 100644
index 000000000..8d2b5b33c
--- /dev/null
+++ b/external_imported/vcpkg/ports/qt5-location/missing-include.patch
@@ -0,0 +1,12 @@
+diff --git a/src/3rdparty/mapbox-gl-native/include/mbgl/util/unique_any.hpp b/src/3rdparty/mapbox-gl-native/include/mbgl/util/unique_any.hpp
+index c7dc8b3..0fb25b8 100644
+--- a/src/3rdparty/mapbox-gl-native/include/mbgl/util/unique_any.hpp
++++ b/src/3rdparty/mapbox-gl-native/include/mbgl/util/unique_any.hpp
+@@ -3,6 +3,7 @@
+ #include <typeinfo>
+ #include <type_traits>
+ #include <stdexcept>
++#include <utility>
+ namespace mbgl {
+ namespace util {
+ 
diff --git a/external_imported/vcpkg/ports/qt5-location/portfile.cmake b/external_imported/vcpkg/ports/qt5-location/portfile.cmake
index c8d591b2d..7c964477e 100644
--- a/external_imported/vcpkg/ports/qt5-location/portfile.cmake
+++ b/external_imported/vcpkg/ports/qt5-location/portfile.cmake
@@ -1,3 +1,3 @@
 message(STATUS "${PORT} has a spurious failure in which it is unable to create a parent directory! Just retry.")
 include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
-qt_submodule_installation()
+qt_submodule_installation(PATCHES missing-include.patch)
diff --git a/external_imported/vcpkg/ports/qt5-location/vcpkg.json b/external_imported/vcpkg/ports/qt5-location/vcpkg.json
index 9b9eafabb..cc0c2c92f 100644
--- a/external_imported/vcpkg/ports/qt5-location/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5-location/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt5-location",
-  "version": "5.15.8",
+  "version": "5.15.12",
   "description": "Qt5 Location Module - Displays map, navigation, and place content in a QML application.",
   "license": null,
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/qt5-macextras/vcpkg.json b/external_imported/vcpkg/ports/qt5-macextras/vcpkg.json
index 524d4815b..e05a718a9 100644
--- a/external_imported/vcpkg/ports/qt5-macextras/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5-macextras/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt5-macextras",
-  "version": "5.15.8",
+  "version": "5.15.12",
   "description": "Qt5 Mac Extras Module. Provides platform-specific APIs for mac.",
   "license": null,
   "supports": "osx",
diff --git a/external_imported/vcpkg/ports/qt5-mqtt/vcpkg.json b/external_imported/vcpkg/ports/qt5-mqtt/vcpkg.json
index 3e50c86cd..c4d6d55d6 100644
--- a/external_imported/vcpkg/ports/qt5-mqtt/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5-mqtt/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt5-mqtt",
-  "version": "5.15.8",
+  "version": "5.15.12",
   "description": "Qt5 MQTT module.",
   "license": null,
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/qt5-multimedia/portfile.cmake b/external_imported/vcpkg/ports/qt5-multimedia/portfile.cmake
index 214726759..d2f61ad98 100644
--- a/external_imported/vcpkg/ports/qt5-multimedia/portfile.cmake
+++ b/external_imported/vcpkg/ports/qt5-multimedia/portfile.cmake
@@ -1,2 +1,2 @@
 include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
-qt_submodule_installation()
\ No newline at end of file
+qt_submodule_installation(PATCHES xcode15.patch)
diff --git a/external_imported/vcpkg/ports/qt5-multimedia/vcpkg.json b/external_imported/vcpkg/ports/qt5-multimedia/vcpkg.json
index 6ec6658c2..4769d9e55 100644
--- a/external_imported/vcpkg/ports/qt5-multimedia/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5-multimedia/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt5-multimedia",
-  "version": "5.15.8",
+  "version": "5.15.12",
   "description": "Qt5 Multimedia Module - Classes and widgets for audio, video, radio and camera functionality",
   "license": null,
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/qt5-multimedia/xcode15.patch b/external_imported/vcpkg/ports/qt5-multimedia/xcode15.patch
new file mode 100644
index 000000000..699c57c0d
--- /dev/null
+++ b/external_imported/vcpkg/ports/qt5-multimedia/xcode15.patch
@@ -0,0 +1,12 @@
+diff -ur a/src/plugins/avfoundation/camera/avfcamerautility.mm b/src/plugins/avfoundation/camera/avfcamerautility.mm
+--- a/src/plugins/avfoundation/camera/avfcamerautility.mm	2023-04-01 11:51:14.736887185 -0400
++++ b/src/plugins/avfoundation/camera/avfcamerautility.mm	2023-04-01 11:54:19.979498301 -0400
+@@ -101,7 +101,7 @@
+     }
+ };
+ 
+-struct FormatHasNoFPSRange : std::unary_function<AVCaptureDeviceFormat *, bool>
++struct FormatHasNoFPSRange
+ {
+     bool operator() (AVCaptureDeviceFormat *format)
+     {
diff --git a/external_imported/vcpkg/ports/qt5-networkauth/vcpkg.json b/external_imported/vcpkg/ports/qt5-networkauth/vcpkg.json
index 73bd06c26..f9f502ad0 100644
--- a/external_imported/vcpkg/ports/qt5-networkauth/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5-networkauth/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt5-networkauth",
-  "version": "5.15.8",
+  "version": "5.15.12",
   "description": "Qt5 Network Authorization Module",
   "license": null,
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/qt5-purchasing/vcpkg.json b/external_imported/vcpkg/ports/qt5-purchasing/vcpkg.json
index 1a745e052..926b50707 100644
--- a/external_imported/vcpkg/ports/qt5-purchasing/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5-purchasing/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt5-purchasing",
-  "version": "5.15.8",
+  "version": "5.15.12",
   "description": "Qt5 Purchasing Module - Enables in-app purchase of products in Qt applications.",
   "license": null,
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/qt5-quickcontrols/vcpkg.json b/external_imported/vcpkg/ports/qt5-quickcontrols/vcpkg.json
index d032323ac..672d9483f 100644
--- a/external_imported/vcpkg/ports/qt5-quickcontrols/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5-quickcontrols/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt5-quickcontrols",
-  "version": "5.15.8",
+  "version": "5.15.12",
   "description": "Qt5 QuickControls Module.",
   "license": null,
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/qt5-quickcontrols2/vcpkg.json b/external_imported/vcpkg/ports/qt5-quickcontrols2/vcpkg.json
index 974fc3939..93278eff2 100644
--- a/external_imported/vcpkg/ports/qt5-quickcontrols2/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5-quickcontrols2/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt5-quickcontrols2",
-  "version": "5.15.8",
+  "version": "5.15.12",
   "description": "Qt5 QuickControls2 Module.",
   "license": null,
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/qt5-remoteobjects/vcpkg.json b/external_imported/vcpkg/ports/qt5-remoteobjects/vcpkg.json
index 10ea118ef..bad0a8db8 100644
--- a/external_imported/vcpkg/ports/qt5-remoteobjects/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5-remoteobjects/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt5-remoteobjects",
-  "version": "5.15.8",
+  "version": "5.15.12",
   "description": "Qt5 Remoteobjects module - Provides an easy to use mechanism for sharing a QObject's API (Properties/Signals/Slots) between processes or devices.",
   "license": null,
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/qt5-script/vcpkg.json b/external_imported/vcpkg/ports/qt5-script/vcpkg.json
index 830f115ac..5933c8cd8 100644
--- a/external_imported/vcpkg/ports/qt5-script/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5-script/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt5-script",
-  "version": "5.15.8",
+  "version": "5.15.12",
   "description": "Qt5 Script Module.",
   "license": null,
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/qt5-scxml/vcpkg.json b/external_imported/vcpkg/ports/qt5-scxml/vcpkg.json
index 3c4a886df..1b093d9b6 100644
--- a/external_imported/vcpkg/ports/qt5-scxml/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5-scxml/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt5-scxml",
-  "version": "5.15.8",
+  "version": "5.15.12",
   "description": "Qt5 SCXML Module - Provides classes and tools for creating state machines from SCXML files and embedding them in applications",
   "license": null,
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/qt5-sensors/vcpkg.json b/external_imported/vcpkg/ports/qt5-sensors/vcpkg.json
index 987f6fc60..07bdd7e98 100644
--- a/external_imported/vcpkg/ports/qt5-sensors/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5-sensors/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt5-sensors",
-  "version": "5.15.8",
+  "version": "5.15.12",
   "description": "Qt5 Sensors module - Provides access to sensor hardware and motion gesture recognition.",
   "license": null,
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/qt5-serialbus/vcpkg.json b/external_imported/vcpkg/ports/qt5-serialbus/vcpkg.json
index 46a810a24..7755413a6 100644
--- a/external_imported/vcpkg/ports/qt5-serialbus/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5-serialbus/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt5-serialbus",
-  "version": "5.15.8",
+  "version": "5.15.12",
   "description": "Qt5 Serialbus Module;",
   "license": null,
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/qt5-serialport/vcpkg.json b/external_imported/vcpkg/ports/qt5-serialport/vcpkg.json
index 5031b80ad..57a3c9cb9 100644
--- a/external_imported/vcpkg/ports/qt5-serialport/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5-serialport/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt5-serialport",
-  "version": "5.15.8",
+  "version": "5.15.12",
   "description": "Qt5 Serial Port - provides access to hardware and virtual serial ports",
   "license": null,
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/qt5-speech/vcpkg.json b/external_imported/vcpkg/ports/qt5-speech/vcpkg.json
index 92b62825b..e6f3b1169 100644
--- a/external_imported/vcpkg/ports/qt5-speech/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5-speech/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt5-speech",
-  "version": "5.15.8",
+  "version": "5.15.12",
   "description": "Qt5 Speech Module",
   "license": null,
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/qt5-svg/CVE-2023-32573-qtsvg-5.15.diff b/external_imported/vcpkg/ports/qt5-svg/CVE-2023-32573-qtsvg-5.15.diff
new file mode 100644
index 000000000..8f60fba03
--- /dev/null
+++ b/external_imported/vcpkg/ports/qt5-svg/CVE-2023-32573-qtsvg-5.15.diff
@@ -0,0 +1,32 @@
+--- a/src/svg/qsvgfont_p.h
++++ b/src/svg/qsvgfont_p.h
+@@ -74,6 +74,7 @@ public:
+ class Q_SVG_PRIVATE_EXPORT QSvgFont : public QSvgRefCounted
+ {
+ public:
++    static constexpr qreal DEFAULT_UNITS_PER_EM = 1000;
+     QSvgFont(qreal horizAdvX);
+ 
+     void setFamilyName(const QString &name);
+@@ -86,9 +87,7 @@ public:
+     void draw(QPainter *p, const QPointF &point, const QString &str, qreal pixelSize, Qt::Alignment alignment) const;
+ public:
+     QString m_familyName;
+-    qreal m_unitsPerEm;
+-    qreal m_ascent;
+-    qreal m_descent;
++    qreal m_unitsPerEm = DEFAULT_UNITS_PER_EM;
+     qreal m_horizAdvX;
+     QHash<QChar, QSvgGlyph> m_glyphs;
+ };
+--- a/src/svg/qsvghandler.cpp
++++ b/src/svg/qsvghandler.cpp
+@@ -2668,7 +2668,7 @@ static bool parseFontFaceNode(QSvgStyleProperty *parent,
+ 
+     qreal unitsPerEm = toDouble(unitsPerEmStr);
+     if (!unitsPerEm)
+-        unitsPerEm = 1000;
++        unitsPerEm = QSvgFont::DEFAULT_UNITS_PER_EM;
+ 
+     if (!name.isEmpty())
+         font->setFamilyName(name);
diff --git a/external_imported/vcpkg/ports/qt5-svg/portfile.cmake b/external_imported/vcpkg/ports/qt5-svg/portfile.cmake
index ca67a6846..1f8e4520e 100644
--- a/external_imported/vcpkg/ports/qt5-svg/portfile.cmake
+++ b/external_imported/vcpkg/ports/qt5-svg/portfile.cmake
@@ -1,2 +1,6 @@
 include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
-qt_submodule_installation(PATCHES "static_svg_link_fix.patch")
\ No newline at end of file
+qt_submodule_installation(
+    PATCHES
+        "CVE-2023-32573-qtsvg-5.15.diff" # CVE fix from https://download.qt.io/official_releases/qt/5.15/
+        "static_svg_link_fix.patch"
+)
diff --git a/external_imported/vcpkg/ports/qt5-svg/vcpkg.json b/external_imported/vcpkg/ports/qt5-svg/vcpkg.json
index 1302454f9..d60d4f785 100644
--- a/external_imported/vcpkg/ports/qt5-svg/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5-svg/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt5-svg",
-  "version": "5.15.8",
+  "version": "5.15.12",
   "description": "Qt5 SVG Module - provides classes for displaying the contents of SVG files",
   "license": null,
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/qt5-tools/fix-pkgconfig-qt5uiplugin-not-found.patch b/external_imported/vcpkg/ports/qt5-tools/fix-pkgconfig-qt5uiplugin-not-found.patch
new file mode 100644
index 000000000..699c01061
--- /dev/null
+++ b/external_imported/vcpkg/ports/qt5-tools/fix-pkgconfig-qt5uiplugin-not-found.patch
@@ -0,0 +1,14 @@
+diff --git a/src/designer/src/lib/lib.pro b/src/designer/src/lib/lib.pro
+index de0dc73..eef68be 100644
+--- a/src/designer/src/lib/lib.pro
++++ b/src/designer/src/lib/lib.pro
+@@ -1,7 +1,8 @@
+ TARGET = QtDesigner
+ MODULE = designer
+ 
+-QT = core-private gui-private widgets-private xml uiplugin
++QT = core-private gui-private widgets-private xml
++QT_PRIVATE += uiplugin
+ 
+ DEFINES += \
+     QDESIGNER_SDK_LIBRARY \
diff --git a/external_imported/vcpkg/ports/qt5-tools/portfile.cmake b/external_imported/vcpkg/ports/qt5-tools/portfile.cmake
index ecc14c6e0..6c650bafc 100644
--- a/external_imported/vcpkg/ports/qt5-tools/portfile.cmake
+++ b/external_imported/vcpkg/ports/qt5-tools/portfile.cmake
@@ -1,6 +1,9 @@
 include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
 
-qt_submodule_installation()
+qt_submodule_installation(
+    PATCHES
+        "fix-pkgconfig-qt5uiplugin-not-found.patch"
+)
 
 if(EXISTS "${CURRENT_INSTALLED_DIR}/plugins/platforms/qminimal${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}")
     file(INSTALL "${CURRENT_INSTALLED_DIR}/plugins/platforms/qminimal${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/plugins/platforms")
diff --git a/external_imported/vcpkg/ports/qt5-tools/vcpkg.json b/external_imported/vcpkg/ports/qt5-tools/vcpkg.json
index b9119665d..346de2257 100644
--- a/external_imported/vcpkg/ports/qt5-tools/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5-tools/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt5-tools",
-  "version": "5.15.8",
+  "version": "5.15.12",
   "description": "Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications",
   "license": null,
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/qt5-translations/vcpkg.json b/external_imported/vcpkg/ports/qt5-translations/vcpkg.json
index 681c7e907..10ed2e401 100644
--- a/external_imported/vcpkg/ports/qt5-translations/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5-translations/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt5-translations",
-  "version": "5.15.8",
+  "version": "5.15.12",
   "description": "Qt5 translations module",
   "license": null,
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/qt5-virtualkeyboard/vcpkg.json b/external_imported/vcpkg/ports/qt5-virtualkeyboard/vcpkg.json
index 8ab5d4c03..f81f6763b 100644
--- a/external_imported/vcpkg/ports/qt5-virtualkeyboard/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5-virtualkeyboard/vcpkg.json
@@ -1,12 +1,11 @@
 {
   "name": "qt5-virtualkeyboard",
-  "version": "5.15.8",
+  "version": "5.15.12",
   "description": "Qt5 Virtual Keyboard Module - A framework for implementing different input methods. Supports localized keyboard layouts and custom visual themes",
   "license": null,
   "dependencies": [
     "qt5-multimedia",
     "qt5-quickcontrols",
-    "qt5-quickcontrols",
     "qt5-svg"
   ]
 }
diff --git a/external_imported/vcpkg/ports/qt5-wayland/vcpkg.json b/external_imported/vcpkg/ports/qt5-wayland/vcpkg.json
index fe1e93cfa..71d68f307 100644
--- a/external_imported/vcpkg/ports/qt5-wayland/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5-wayland/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt5-wayland",
-  "version": "5.15.8",
+  "version": "5.15.12",
   "description": "Qt5 wayland Module;",
   "license": null,
   "supports": "linux",
diff --git a/external_imported/vcpkg/ports/qt5-webchannel/vcpkg.json b/external_imported/vcpkg/ports/qt5-webchannel/vcpkg.json
index 352c9bd2d..62a203c15 100644
--- a/external_imported/vcpkg/ports/qt5-webchannel/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5-webchannel/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt5-webchannel",
-  "version": "5.15.8",
+  "version": "5.15.12",
   "description": "Qt5 Web Channel module - Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients.",
   "license": null,
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/qt5-webengine/portfile.cmake b/external_imported/vcpkg/ports/qt5-webengine/portfile.cmake
index c2d7bf463..aac87b1a1 100644
--- a/external_imported/vcpkg/ports/qt5-webengine/portfile.cmake
+++ b/external_imported/vcpkg/ports/qt5-webengine/portfile.cmake
@@ -49,14 +49,19 @@ set(PATCHES common.pri.patch
             gl.patch
             build_1.patch
             build_2.patch
-            workaround-msvc2022-ice.patch)
+            workaround-msvc2022-missing-include-in-chromium-ui-accessability.patch
+            )
 
 set(OPTIONS)
 if("proprietary-codecs" IN_LIST FEATURES)
     list(APPEND OPTIONS "-webengine-proprietary-codecs")
 endif()
 if(NOT VCPKG_TARGET_IS_WINDOWS)
-    list(APPEND OPTIONS "-webengine-system-libwebp" "-webengine-system-ffmpeg" "-webengine-system-icu")
+    list(APPEND OPTIONS "-system-webengine-webp" "-system-webengine-icu")
+    vcpkg_host_path_list(PREPEND ENV{PKG_CONFIG_PATH} "${CURRENT_INSTALLED_DIR}/lib/pkgconfig")
+    vcpkg_host_path_list(PREPEND ENV{INCLUDE} "${CURRENT_INSTALLED_DIR}/include")
+    vcpkg_host_path_list(PREPEND ENV{C_INCLUDE_PATH} "${CURRENT_INSTALLED_DIR}/include")
+    vcpkg_host_path_list(PREPEND ENV{CPLUS_INCLUDE_PATH} "${CURRENT_INSTALLED_DIR}/include")
 endif()
 
 qt_submodule_installation(PATCHES ${PATCHES} BUILD_OPTIONS ${OPTIONS})
diff --git a/external_imported/vcpkg/ports/qt5-webengine/vcpkg.json b/external_imported/vcpkg/ports/qt5-webengine/vcpkg.json
index 5ec737c0c..60bbb671c 100644
--- a/external_imported/vcpkg/ports/qt5-webengine/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5-webengine/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "qt5-webengine",
-  "version": "5.15.8",
-  "port-version": 1,
+  "version": "5.15.12",
   "description": "Qt5 webengine Module;",
   "license": null,
   "supports": "!static",
diff --git a/external_imported/vcpkg/ports/qt5-webengine/workaround-msvc2022-ice.patch b/external_imported/vcpkg/ports/qt5-webengine/workaround-msvc2022-ice.patch
deleted file mode 100644
index 59cc004b6..000000000
--- a/external_imported/vcpkg/ports/qt5-webengine/workaround-msvc2022-ice.patch
+++ /dev/null
@@ -1,101 +0,0 @@
---- a/src/3rdparty/chromium/base/hash/md5_constexpr_internal.h
-+++ b/src/3rdparty/chromium/base/hash/md5_constexpr_internal.h
-@@ -281,15 +281,63 @@ struct MD5CE {
-     return IntermediateDataToMD5Digest(ProcessMessage(data, n));
-   }
- 
--  static constexpr uint64_t Hash64(const char* data, uint32_t n) {
--    IntermediateData intermediate = ProcessMessage(data, n);
--    return (static_cast<uint64_t>(SwapEndian(intermediate.a)) << 32) |
--           static_cast<uint64_t>(SwapEndian(intermediate.b));
-+  static constexpr uint64_t Hash64(const char* message, uint32_t n) {
-+    const uint32_t m = GetPaddedMessageLength(n);
-+    IntermediateData intermediate0 = kInitialIntermediateData;
-+    for (uint32_t offset = 0; offset < m; offset += 64) {
-+      RoundData data = {
-+          GetPaddedMessageWord(message, n, m, offset),
-+          GetPaddedMessageWord(message, n, m, offset + 4),
-+          GetPaddedMessageWord(message, n, m, offset + 8),
-+          GetPaddedMessageWord(message, n, m, offset + 12),
-+          GetPaddedMessageWord(message, n, m, offset + 16),
-+          GetPaddedMessageWord(message, n, m, offset + 20),
-+          GetPaddedMessageWord(message, n, m, offset + 24),
-+          GetPaddedMessageWord(message, n, m, offset + 28),
-+          GetPaddedMessageWord(message, n, m, offset + 32),
-+          GetPaddedMessageWord(message, n, m, offset + 36),
-+          GetPaddedMessageWord(message, n, m, offset + 40),
-+          GetPaddedMessageWord(message, n, m, offset + 44),
-+          GetPaddedMessageWord(message, n, m, offset + 48),
-+          GetPaddedMessageWord(message, n, m, offset + 52),
-+          GetPaddedMessageWord(message, n, m, offset + 56),
-+          GetPaddedMessageWord(message, n, m, offset + 60)};
-+      IntermediateData intermediate1 = intermediate0;
-+      for (uint32_t i = 0; i < 64; ++i)
-+        intermediate1 = ApplyStep(i, data, intermediate1);
-+      intermediate0 = Add(intermediate0, intermediate1);
-+    }
-+    return (static_cast<uint64_t>(SwapEndian(intermediate0.a)) << 32) |
-+           static_cast<uint64_t>(SwapEndian(intermediate0.b));
-   }
- 
--  static constexpr uint32_t Hash32(const char* data, uint32_t n) {
--    IntermediateData intermediate = ProcessMessage(data, n);
--    return SwapEndian(intermediate.a);
-+  static constexpr uint32_t Hash32(const char* message, uint32_t n) {
-+    const uint32_t m = GetPaddedMessageLength(n);
-+    IntermediateData intermediate0 = kInitialIntermediateData;
-+    for (uint32_t offset = 0; offset < m; offset += 64) {
-+      RoundData data = {
-+          GetPaddedMessageWord(message, n, m, offset),
-+          GetPaddedMessageWord(message, n, m, offset + 4),
-+          GetPaddedMessageWord(message, n, m, offset + 8),
-+          GetPaddedMessageWord(message, n, m, offset + 12),
-+          GetPaddedMessageWord(message, n, m, offset + 16),
-+          GetPaddedMessageWord(message, n, m, offset + 20),
-+          GetPaddedMessageWord(message, n, m, offset + 24),
-+          GetPaddedMessageWord(message, n, m, offset + 28),
-+          GetPaddedMessageWord(message, n, m, offset + 32),
-+          GetPaddedMessageWord(message, n, m, offset + 36),
-+          GetPaddedMessageWord(message, n, m, offset + 40),
-+          GetPaddedMessageWord(message, n, m, offset + 44),
-+          GetPaddedMessageWord(message, n, m, offset + 48),
-+          GetPaddedMessageWord(message, n, m, offset + 52),
-+          GetPaddedMessageWord(message, n, m, offset + 56),
-+          GetPaddedMessageWord(message, n, m, offset + 60)};
-+      IntermediateData intermediate1 = intermediate0;
-+      for (uint32_t i = 0; i < 64; ++i)
-+        intermediate1 = ApplyStep(i, data, intermediate1);
-+      intermediate0 = Add(intermediate0, intermediate1);
-+    }
-+    return SwapEndian(intermediate0.a);
-   }
- };
- 
---- a/src/3rdparty/chromium/net/third_party/quiche/src/quic/core/quic_versions.h
-+++ b/src/3rdparty/chromium/net/third_party/quiche/src/quic/core/quic_versions.h
-@@ -26,6 +26,7 @@
- #include <string>
- #include <vector>
- 
-+#include "absl/base/macros.h"
- #include "net/third_party/quiche/src/quic/core/quic_tag.h"
- #include "net/third_party/quiche/src/quic/core/quic_types.h"
- #include "net/third_party/quiche/src/quic/platform/api/quic_export.h"
-@@ -181,8 +182,14 @@ QUIC_EXPORT_PRIVATE constexpr bool ParsedQuicVersionIsValid(
-       transport_version == QUIC_VERSION_RESERVED_FOR_NEGOTIATION;
-   if (!transport_version_is_valid) {
-     // Iterators are not constexpr in C++14 which Chrome uses.
--    constexpr auto supported_transport_versions = SupportedTransportVersions();
--    for (size_t i = 0; i < supported_transport_versions.size(); ++i) {
-+    constexpr QuicTransportVersion supported_transport_versions[] = {
-+        QUIC_VERSION_IETF_DRAFT_29,
-+        QUIC_VERSION_IETF_DRAFT_27,
-+        QUIC_VERSION_51,
-+        QUIC_VERSION_50,
-+        QUIC_VERSION_46,
-+        QUIC_VERSION_43};
-+    for (size_t i = 0; i < ABSL_ARRAYSIZE(supported_transport_versions); ++i) {
-       const QuicTransportVersion& trans_vers = supported_transport_versions[i];
-       if (trans_vers == transport_version) {
-         transport_version_is_valid = true;
-
diff --git a/external_imported/vcpkg/ports/qt5-webengine/workaround-msvc2022-missing-include-in-chromium-ui-accessability.patch b/external_imported/vcpkg/ports/qt5-webengine/workaround-msvc2022-missing-include-in-chromium-ui-accessability.patch
new file mode 100644
index 000000000..6841b8bd9
--- /dev/null
+++ b/external_imported/vcpkg/ports/qt5-webengine/workaround-msvc2022-missing-include-in-chromium-ui-accessability.patch
@@ -0,0 +1,10 @@
+--- a/src/3rdparty/chromium/ui/accessibility/ax_table_info.h
++++ b/src/3rdparty/chromium/ui/accessibility/ax_table_info.h
+@@ -9,6 +9,7 @@
+ #include <set>
+ #include <unordered_map>
+ #include <vector>
++#include <string>
+ 
+ #include "base/optional.h"
+ #include "ui/accessibility/ax_export.h"
diff --git a/external_imported/vcpkg/ports/qt5-webglplugin/vcpkg.json b/external_imported/vcpkg/ports/qt5-webglplugin/vcpkg.json
index 455734a79..db3efdcc5 100644
--- a/external_imported/vcpkg/ports/qt5-webglplugin/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5-webglplugin/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt5-webglplugin",
-  "version": "5.15.8",
+  "version": "5.15.12",
   "description": "Qt5 Webglplugin Module",
   "license": null,
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/qt5-websockets/vcpkg.json b/external_imported/vcpkg/ports/qt5-websockets/vcpkg.json
index 2424b7e43..c89163a38 100644
--- a/external_imported/vcpkg/ports/qt5-websockets/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5-websockets/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt5-websockets",
-  "version": "5.15.8",
+  "version": "5.15.12",
   "description": "Qt5 Web Sockets Module - provides WebSocket communication compliant with RFC 6455",
   "license": null,
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/qt5-webview/vcpkg.json b/external_imported/vcpkg/ports/qt5-webview/vcpkg.json
index 4a873d25e..cbf066486 100644
--- a/external_imported/vcpkg/ports/qt5-webview/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5-webview/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt5-webview",
-  "version": "5.15.8",
+  "version": "5.15.12",
   "description": "Qt5 WebView module - Provides a way to display web content in a QML application without necessarily including a full web browser stack by using native APIs where it makes sense.",
   "license": null,
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/qt5-winextras/vcpkg.json b/external_imported/vcpkg/ports/qt5-winextras/vcpkg.json
index 98d6d2b67..bd482ad71 100644
--- a/external_imported/vcpkg/ports/qt5-winextras/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5-winextras/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt5-winextras",
-  "version": "5.15.8",
+  "version": "5.15.12",
   "description": "Qt5 Windows Extras Module. Provides platform-specific APIs for Windows.",
   "license": null,
   "supports": "windows",
diff --git a/external_imported/vcpkg/ports/qt5-x11extras/vcpkg.json b/external_imported/vcpkg/ports/qt5-x11extras/vcpkg.json
index 13470ffc8..317a7310a 100644
--- a/external_imported/vcpkg/ports/qt5-x11extras/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5-x11extras/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "qt5-x11extras",
-  "version": "5.15.8",
-  "port-version": 1,
+  "version": "5.15.12",
   "description": "Qt5 x11extras Module;",
   "license": null,
   "supports": "!windows",
diff --git a/external_imported/vcpkg/ports/qt5-xmlpatterns/vcpkg.json b/external_imported/vcpkg/ports/qt5-xmlpatterns/vcpkg.json
index d01b201f8..5cec3adcd 100644
--- a/external_imported/vcpkg/ports/qt5-xmlpatterns/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5-xmlpatterns/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt5-xmlpatterns",
-  "version": "5.15.8",
+  "version": "5.15.12",
   "description": "Qt5 XML Patterns Module - Support for XPath, XQuery, XSLT and XML schema validation",
   "license": null,
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/qt5/vcpkg.json b/external_imported/vcpkg/ports/qt5/vcpkg.json
index 3d818a248..0e0fd82dc 100644
--- a/external_imported/vcpkg/ports/qt5/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "qt5",
-  "version": "5.15.8",
-  "port-version": 1,
+  "version": "5.15.12",
   "description": "Qt5 Application Framework",
   "homepage": "https://www.qt.io/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/qt5compat/portfile.cmake b/external_imported/vcpkg/ports/qt5compat/portfile.cmake
index 452cf48be..d13a078b9 100644
--- a/external_imported/vcpkg/ports/qt5compat/portfile.cmake
+++ b/external_imported/vcpkg/ports/qt5compat/portfile.cmake
@@ -19,7 +19,12 @@ INVERTED_FEATURES
 
 #For iconv feature to work the following must be true:
 #CONDITION NOT FEATURE_icu AND FEATURE_textcodec AND NOT WIN32 AND NOT QNX AND NOT ANDROID AND NOT APPLE AND WrapIconv_FOUND
-#TODO: check if qtbase was built with ICU and fail if iconv is given here.
+if("iconv" IN_LIST FEATURES)
+    include("${SCRIPT_PATH}/port_status.cmake")
+    if(qtbase_with_icu)
+        message(FATAL_ERROR "qtbase was built with ICU. The iconv feature is not compatible with ICU.")
+    endif()
+endif()
 
 set(TOOL_NAMES)
 qt_install_submodule(PATCHES    ${${PORT}_PATCHES}
diff --git a/external_imported/vcpkg/ports/qt5compat/vcpkg.json b/external_imported/vcpkg/ports/qt5compat/vcpkg.json
index 9d17a62bd..7a084edd1 100644
--- a/external_imported/vcpkg/ports/qt5compat/vcpkg.json
+++ b/external_imported/vcpkg/ports/qt5compat/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt5compat",
-  "version": "6.4.3",
+  "version": "6.6.1",
   "description": "The module contains unsupported Qt 5 APIs",
   "homepage": "https://www.qt.io/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/qtactiveqt/vcpkg.json b/external_imported/vcpkg/ports/qtactiveqt/vcpkg.json
index c17be503f..0095c9dea 100644
--- a/external_imported/vcpkg/ports/qtactiveqt/vcpkg.json
+++ b/external_imported/vcpkg/ports/qtactiveqt/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtactiveqt",
-  "version": "6.4.3",
+  "version": "6.6.1",
   "description": "ActiveQt",
   "homepage": "https://www.qt.io/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/qtapplicationmanager/bump-cmake-version.patch b/external_imported/vcpkg/ports/qtapplicationmanager/bump-cmake-version.patch
deleted file mode 100644
index 31b99c71d..000000000
--- a/external_imported/vcpkg/ports/qtapplicationmanager/bump-cmake-version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f2236c0..904c5b7 100644
---- a/CMakeLists.txt	
-+++ b/CMakeLists.txt
-@@ -1,5 +1,5 @@
- 
--cmake_minimum_required(VERSION 3.16)
-+cmake_minimum_required(VERSION 3.19)
- 
- include(.cmake.conf)
- project(QtApplicationManager # special case
diff --git a/external_imported/vcpkg/ports/qtapplicationmanager/portfile.cmake b/external_imported/vcpkg/ports/qtapplicationmanager/portfile.cmake
index 2a9e77ca6..68686b02f 100644
--- a/external_imported/vcpkg/ports/qtapplicationmanager/portfile.cmake
+++ b/external_imported/vcpkg/ports/qtapplicationmanager/portfile.cmake
@@ -2,7 +2,6 @@ set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
 include("${SCRIPT_PATH}/qt_install_submodule.cmake")
 
 set(${PORT}_PATCHES 
-        bump-cmake-version.patch
         wrapper-fixes.patch
         stack-walker-arm64.patch
     )
@@ -30,6 +29,7 @@ qt_cmake_configure(${_opt}
                         -DINPUT_libyaml=system
                         -DFEATURE_am_system_libyaml=ON
                         -DFEATURE_am_system_libarchive=ON
+                        --trace-expand
                    OPTIONS_DEBUG
                    OPTIONS_RELEASE)
 
diff --git a/external_imported/vcpkg/ports/qtapplicationmanager/vcpkg.json b/external_imported/vcpkg/ports/qtapplicationmanager/vcpkg.json
index 03da0c873..cb81af69b 100644
--- a/external_imported/vcpkg/ports/qtapplicationmanager/vcpkg.json
+++ b/external_imported/vcpkg/ports/qtapplicationmanager/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtapplicationmanager",
-  "version": "6.4.3",
+  "version": "6.6.1",
   "description": "Qt component for application lifecycle management",
   "homepage": "https://www.qt.io/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/qtbase/GLIB2-static.patch b/external_imported/vcpkg/ports/qtbase/GLIB2-static.patch
index c384b741c..0384482bb 100644
--- a/external_imported/vcpkg/ports/qtbase/GLIB2-static.patch
+++ b/external_imported/vcpkg/ports/qtbase/GLIB2-static.patch
@@ -73,3 +73,31 @@ index 24a194c..91c8e41 100644
  
  include(FeatureSummary)
  set_package_properties(GLIB2 PROPERTIES
+diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake
+index 7d52f48..2b1b221 100644
+--- a/src/corelib/configure.cmake
++++ b/src/corelib/configure.cmake
+@@ -25,7 +25,7 @@ endif()
+ qt_find_package(WrapSystemDoubleConversion
+                 PROVIDED_TARGETS WrapSystemDoubleConversion::WrapSystemDoubleConversion
+                 MODULE_NAME core QMAKE_LIB doubleconversion)
+-qt_find_package(GLIB2 PROVIDED_TARGETS GLIB2::GLIB2 MODULE_NAME core QMAKE_LIB glib)
++qt_find_package(GLIB2 PROVIDED_TARGETS GLIB2::GLIB2 MODULE MODULE_NAME core QMAKE_LIB glib)
+ qt_find_package(ICU 50.1 COMPONENTS i18n uc data PROVIDED_TARGETS ICU::i18n ICU::uc ICU::data
+     MODULE_NAME core QMAKE_LIB icu)
+ 
+diff --git a/src/network/configure.cmake b/src/network/configure.cmake
+index aef7f15..21b0c1d 100644
+--- a/src/network/configure.cmake
++++ b/src/network/configure.cmake
+@@ -10,8 +10,8 @@
+ qt_find_package(WrapBrotli PROVIDED_TARGETS WrapBrotli::WrapBrotliDec MODULE_NAME network QMAKE_LIB brotli)
+ qt_find_package(Libproxy PROVIDED_TARGETS PkgConfig::Libproxy MODULE_NAME network QMAKE_LIB libproxy)
+ qt_find_package(GSSAPI PROVIDED_TARGETS GSSAPI::GSSAPI MODULE_NAME network QMAKE_LIB gssapi)
+-qt_find_package(GLIB2 OPTIONAL_COMPONENTS GOBJECT PROVIDED_TARGETS GLIB2::GOBJECT MODULE_NAME core QMAKE_LIB gobject)
+-qt_find_package(GLIB2 OPTIONAL_COMPONENTS GIO PROVIDED_TARGETS GLIB2::GIO MODULE_NAME core QMAKE_LIB gio)
++qt_find_package(GLIB2 OPTIONAL_COMPONENTS GOBJECT PROVIDED_TARGETS GLIB2::GOBJECT MODULE MODULE_NAME core QMAKE_LIB gobject)
++qt_find_package(GLIB2 OPTIONAL_COMPONENTS GIO PROVIDED_TARGETS GLIB2::GIO MODULE MODULE_NAME core QMAKE_LIB gio)
+ qt_find_package(WrapResolv PROVIDED_TARGETS WrapResolv::WrapResolv MODULE_NAME network QMAKE_LIB libresolv)
+ 
+ #### Tests
diff --git a/external_imported/vcpkg/ports/qtbase/clang-cl_QGADGET_fix.diff b/external_imported/vcpkg/ports/qtbase/clang-cl_QGADGET_fix.diff
index 37bec5f9f..0304bcc47 100644
--- a/external_imported/vcpkg/ports/qtbase/clang-cl_QGADGET_fix.diff
+++ b/external_imported/vcpkg/ports/qtbase/clang-cl_QGADGET_fix.diff
@@ -4,7 +4,7 @@ index e40cd85..ba68a01 100644
 +++ b/src/corelib/kernel/qmetatype.h
 @@ -18,6 +18,7 @@
  #endif
- #include <QtCore/qhashfunctions.h>
+ #include <QtCore/qscopeguard.h>
  
 +#include <type_traits>
  #include <array>
diff --git a/external_imported/vcpkg/ports/qtbase/clang-cl_source_location.patch b/external_imported/vcpkg/ports/qtbase/clang-cl_source_location.patch
index 6d0a9527e..5155fb4bb 100644
--- a/external_imported/vcpkg/ports/qtbase/clang-cl_source_location.patch
+++ b/external_imported/vcpkg/ports/qtbase/clang-cl_source_location.patch
@@ -2,12 +2,12 @@ diff --git a/src/corelib/kernel/qproperty.h b/src/corelib/kernel/qproperty.h
 index 823b2057b..4a8cd4fa8 100644
 --- a/src/corelib/kernel/qproperty.h
 +++ b/src/corelib/kernel/qproperty.h
-@@ -49,8 +49,8 @@
+@@ -16,8 +16,8 @@
  
  #include <QtCore/qpropertyprivate.h>
  
--#if __has_include(<source_location>) && __cplusplus >= 202002L && !defined(Q_CLANG_QDOC)
-+#if __has_include(<source_location>) && __cplusplus >= 202002L && !defined(Q_CLANG_QDOC) && defined(__cpp_consteval)
+-#if __has_include(<source_location>) && __cplusplus >= 202002L && !defined(Q_QDOC)
++#if __has_include(<source_location>) && __cplusplus >= 202002L && !defined(Q_QDOC) && ( (defined(__cpp_consteval) && defined(_MSC_VER)) || !defined(_MSC_VER) )
  #include <source_location>
  #if defined(__cpp_lib_source_location)
  #define QT_SOURCE_LOCATION_NAMESPACE std
diff --git a/external_imported/vcpkg/ports/qtbase/cmake/qt_install_submodule.cmake b/external_imported/vcpkg/ports/qtbase/cmake/qt_install_submodule.cmake
index 7a553973e..38819d707 100644
--- a/external_imported/vcpkg/ports/qtbase/cmake/qt_install_submodule.cmake
+++ b/external_imported/vcpkg/ports/qtbase/cmake/qt_install_submodule.cmake
@@ -63,9 +63,9 @@ function(qt_download_submodule_impl)
             set(sha512 SHA512 "${${_qarg_SUBMODULE}_HASH}")
         endif()
 
-        qt_get_url_filename("${_qarg_SUBMODULE}" url filename)
+        qt_get_url_filename("${_qarg_SUBMODULE}" urls filename)
         vcpkg_download_distfile(archive
-            URLS "${url}"
+            URLS ${urls}
             FILENAME "${filename}"
             ${sha512}
         )
@@ -150,6 +150,7 @@ function(qt_cmake_configure)
         ${disable_parallel}
         OPTIONS
             -DQT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS:BOOL=ON # We don't want Qt to screw with users toolchain settings.
+            -DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON # Because Qt doesn't correctly scope find_package calls. 
             #-DQT_HOST_PATH=<somepath> # For crosscompiling
             #-DQT_PLATFORM_DEFINITION_DIR=mkspecs/win32-msvc
             #-DQT_QMAKE_TARGET_MKSPEC=win32-msvc
@@ -191,6 +192,16 @@ function(qt_cmake_configure)
             QT_SYNCQT
             QT_NO_FORCE_SET_CMAKE_BUILD_TYPE
             ${_qarg_OPTIONS_MAYBE_UNUSED}
+            INPUT_bundled_xcb_xinput
+            INPUT_freetype
+            INPUT_harfbuzz
+            INPUT_libjpeg
+            INPUT_libmd4c
+            INPUT_libpng
+            INPUT_opengl
+            INPUT_openssl
+            INPUT_xcb
+            INPUT_xkbcommon
     )
     set(Z_VCPKG_CMAKE_GENERATOR "${Z_VCPKG_CMAKE_GENERATOR}" PARENT_SCOPE)
 endfunction()
diff --git a/external_imported/vcpkg/ports/qtbase/cmake/qt_port_data.cmake b/external_imported/vcpkg/ports/qtbase/cmake/qt_port_data.cmake
index f8796f3f3..ff40dae4c 100644
--- a/external_imported/vcpkg/ports/qtbase/cmake/qt_port_data.cmake
+++ b/external_imported/vcpkg/ports/qtbase/cmake/qt_port_data.cmake
@@ -1,50 +1,49 @@
-set(qtbase_HASH "a2d0779ba7ee8b8b78f5dc8db06177d04d50463fea7cad0b7785721acfc33dbbbaa1a7bfc052edb90ba1d11b488c30004daa43b6924a97126b9b8f82ad1a7f43")
-set(qttools_HASH "24dc02b760d4b1640eac539c9d0dfff9fe516332e5932f43456140daa3044c1e748731a883cc4f80e94626602241d040341e2af27efd470e7d6f50a908660382")
-set(qtdeclarative_HASH "ba1a477d4e388e93cdbf76c594650b431fbea1212af110fda994fa1ebca0d6cf2dba699c995744deba71bad2a9c45d214b671ddef01a995d7c6c82c61ef82aa2")
-set(qtsvg_HASH "75c20eff54f45e5a501ea965677b708e211a3fa435d3304868ca1b6e3cf0b4ef89e61631e4936b1ef789a06be1d3d43ec9db64be2498159eecfde1cce21e76c0")
-set(qt5compat_HASH "22e3d6360afdb83b4bd122153cf3bba09d8593dbdd65ccf5b80e032b9de437f868b05c7170e636fd6bd8f42dd1eb56b07f21b73fd0c4a5437fcb72aa070d830b")
-set(qtshadertools_HASH "11d6111c4b645d2d31b19c6cf788726546f484bd9c6a3940bdb2ce82f76eecf56a47655065fb87bf488a12968ea26e48e4c0c8b3ff9d702339bd497bef31630e")
-set(qtquicktimeline_HASH "8310e0b360859e59157b5968647a5bb82bfd09f2f61c1b289669e551781e8fd1285f3efb8ed1324013ad14b192f0d9963c8584cfec98a136c82f5956ac1de9ae")
-set(qtquick3d_HASH "511c8585ea8686b1e1cf2e3dd47ac5650ba312d583da7e86dc86aaff6769a5751e3d75ff3fd07664098ba6488f75c9dab68d060b0394ad0182c35c44b5306970")
-set(qttranslations_HASH "200dd7418263474be95de25023ddd881f1cbc46fe4a0767aa33733414564aef9615b36429f511698d012704c4e94088026b3d9e454d9078e8975b48119c45c0d")
-set(qtwayland_HASH "15d74d057c09a734dd10617d018f4dc54e6be4fef5dc96d6eefd6b3f47952bbdb98bc39cbc9545c7ae1a9ec87a512a72d2f019ee47210bfab8cbae0cf01e4ae4")
-set(qtdoc_HASH "a96f9112b9ad557695779ee2039ad3ff93c8476d0f6fa7eff7177f0a05f4089d8b25030795f1428fe69a7423151241022a6bee812e6dcc5b047e13d39934e405")
-set(qtcoap_HASH "43dae7eaa19811aeeb5c140949421c2449671e71cfc8d553bd608e6bbdf344a4bd58b2a3405d51b3e621c1b817487b0adf87e51841f237a2ae6df96573a6c735")
-set(qtopcua_HASH "c7664a438323653e809dccfbaf81717c4abcbabc552bf678461ee28bef05bed78d4c4e1c520f08d334f4f45bb4777831de20cbcc1d5e242ddbc63d5a2f4df709")
-set(qtimageformats_HASH "8e165986394c184520412533fbe088577d3a5661fecee8ef7938467ad329da28aa2771721f7ed84c75f1878426d24a17812aee3c492da68618cf6bbcc5580a36")
-set(qtmqtt_HASH "e0de3d3a3c12ac7c407f002b6e680583c1d9ca437013ce277f18cb0de97b39269c6eb45ca3de46589de9177d8c62ea4020d55a514ace4667e8ff3e7780df5f2d")
-set(qtnetworkauth_HASH "ccb488646f450541ce8546463c99d45d567339f676948e62c013fc0d7588af408c617bb0bec1d122b3fcb42e79d5ce04f5f779ad6d515fa9f223af70f06c84d9")
-set(qt3d_HASH "d283e42effdb1b7199e4bf6fba3769b0ba3358b855d166fcad00cfc71858a5e71324e902d4ce163137a18b413c4463967563825ee8b902142c4c7559ff08efe5")
-set(qtactiveqt_HASH "5fa17905697d1dbda9852b9f2555348e1c5fb428062806b5b78db22924927ebcf4db4932c04de155f517caf08487fb74d6afa30a223ed762bb46df61552ae149")
-set(qtdatavis3d_HASH "0d687d29b20bf80a4274267c94bdfbf64048764f213dbf98361a00ee98c85bb2a3c25c1fe4aa17fc4d981cd54ea727bd0cec884b4fdb7e245f1801fc917a9123")
-set(qtdeviceutilities_HASH "936a73e571f79c6c499b2c0705414ebb6eb45bb9209af6db9183285f37d81d8caac3c273ca1695f3cc1bf637a42c96242eb83b1f2034b5e9f0bcaa211368e85b")
-set(qtlottie_HASH "1a3e7a462a1a886dfe556816dcb7811f0488ccca64106aebcc8178951f9e3db78dfd977c81b2eaa003b2ceddbd5d42bd1753fda80ad5562cf3e38699eafd1d0f")
-set(qtscxml_HASH "0d6b31b1c5f29f19fb15ee5a77e100c5df122f1ccba6229131456f4d66ee99978b0392a0f3c61ae1e31923041a973e80dc23df7814ed704a4d80d75b60741fac")
-set(qtvirtualkeyboard_HASH "943a96a35df368d63102b296c7e173d9d2929665c86044c33b1eec7bdc42f7fd6d6e5ed2f75caf582ecdb6cba5738d52121d3ed466cc26f1da58c36ea3a32a4f")
-set(qtcharts_HASH "369e5e69596a0fc4be1c3ab936d32e3690d2efe5bf28344ef71022af209813a5f1435f11ad7ed42f3dd825471d2e2d38c33564bfa514ddf8dc173b708afa3994")
-set(qtconnectivity_HASH "2d5f0c6ca5ed5e0a8ef056344441b2828834a334129e337d51596c774f0e121e9f393a6a2f7ca24b8186ee28e8d398316abdf3f32fda6cd097c3139d92dd30aa")
-set(qtpositioning_HASH "ad8fa75430ef94596673de15c1067bcf648c76a5e938348b26ee44dae97f17c3d36e5a283a9ee78760be57df3d1390f36f476e47f26928dd72e466e469c795a7")
-set(qtmultimedia_HASH "1e3d6d9d78acf10863fe2d4624ed044d86149fe8a72c8c47150975eff6f76edcb8a7d4dcdb73ab127ed3cc4414b7f7100b0e9e9c633e50c90ef3c0d36134d9b5")
-set(qtremoteobjects_HASH "019bc17922eb72b2bb79d527c1d53bcf7f5b67f66a33ab79cd10391099de671eb3b7f978b8b493a560c6c943587b0a942f887f4ddeb87860ca3e6e30f30541be")
-set(qtsensors_HASH "a1a39ab73cb15384fa29e62d8193e796bfb5e8349fd85eff106e9fb6fd45677db39f200f5b8e47be268c34d8ff35142e608adc33b85cd4dcc5180f5c3220deba")
-set(qtserialbus_HASH "1ec94eebbb1e123ebcb353577f8de33710d623df364492ad33cb949ba81b36b4dfbbccbbce394d766fab2434ccc561dc47dc5d5b95b986160bf21096c78a77b4")
-set(qtserialport_HASH "4871035b714732e7a40579c9a31b0cd955ec9360a996bbffeb16781a89b8df55d9be4408947832f2c6c39646f4d3b64cfb0bf91a83fc73e1808defd108048cd4")
-set(qtwebchannel_HASH "6bab95a2df742c6ff023a72a3b192e7c5e56e23834dc7513aadc09d5ce0fadabf4b5590a9911b1dc8c83a7e1c984c4ac57c6957a3fa168de10af5d540d7d6af3")
-set(qtwebengine_HASH "e9e8bdeac942350bf779a9fabfb59ffdfec366ec23cb1c58fa416a777c9399bfa9828107f6a1c079414a8aa52a35d0547e3bd673053d994e19308e11733e0d39")
-set(qtwebsockets_HASH "231135ac75f704aeebe5286cd30640bacb6192f08785ac94fe848d6d5164597db314054c9d48a2300e9967c609681802b82055ab6bf806b3a351d891d3855bf3")
-set(qtwebview_HASH "585b73cb0ca6a9e8b9fd16c92720e3bb7535bf142049c9453cf9f479b656827d450885e6bc1b09c0f8c9462f80f722f58a388f283d2b132cf83936e28c6f217a")
-set(qtinterfaceframework_REF 35892bfbfa4c405bba2a648d1a4d4d17b1bc62b2)
-set(qtapplicationmanager_HASH "2771edec2d8195158fcdfaaa08641db7363695e569e100fc0a949300b6616403bc1c8946526d3e6f0ec0a20b0e117c0bcd0b0d7f8fc09dfe3e6bc95326ff9f30")
-set(qtlanguageserver_HASH "291239b61470c86cc1d371a533ddb4f8c289590831d3f835cff551dd24049061dcab7bdade904a1397f2c3cc8701747bc2568bad1d034ed8c51aad04257a83fa")
-set(qthttpserver_HASH "25dfb101dd57143ee97122c46a8fd85668d16c0b7520285f72ea37db6d9e0c43876a3d5c1016ecc4cb4ec08f2ed9813afbaa1b4812e6816159b11d620bb8dadf")
-set(qtquick3dphysics_REF fc155dd34fa53a8c7520f1c150a2b8eeb4c760c3)
-set(qtspeech_HASH "f101c9a27b300f5b7dfb502f342dc565f206a119f667d02ed23ec0103a2d0d8025d15bccb42bacd238853f695523691dc22e1a4b703f0ea13aab0922c922cb1f")
-
-# Not in newer releases
-set(qtlocation_HASH "a5508da406ec6fb413dc63aa29ddffed0dbd10f0344c8f10231e68178d21b6986e4cf983eb180a40bfd48bef1731e295c0722b31b6495aebe6edc18f7fa55629")
+set(qtbase_HASH "93e77b9b077a3acd5607b643db282fdd7ed0bdfa07df74c3f0d2285afeb1672a6fa229a7e7a6c8a462701305fc22ffef20c212d906484e50fb5cdb706a7b72e1")
+set(qttools_HASH "7f7bfaf7f01a5374f711c20113e9461b83a6f908b48c7b3f662f8821a70ef0c792f040f2e8e62a570fec06df2329fe5eb953c680424262b3678ab283045e6909")
+set(qtdeclarative_HASH "1a819187519670338df1c308d5980aed985670ee3e79a424e56d8e300855513541f46a1b89d9f595bdab382a0072761f0fda87d78653602041a10a5bd3e7bdcd")
+set(qtsvg_HASH "46ca0e90a864678bbf46ac9618aacd1c2265eb336a798f6f09ab39cbfa7b16267b8d842f36b01c58d482a319bcd2172e7cbf09c08cd767a9e89d9b6d89b4a417")
+set(qt5compat_HASH "2d5e2e40621590adb489dac4ae9a28fe8c2436de05dfe5aea47e449ae88ef82dd831e786d8290d04315c827f8adf217374ea5c6919ae12932496c5cd6ac28c01")
+set(qtshadertools_HASH "1cc6e1e003754dd665b5633c0e38bab749b7fa002d68d5fff9caef850895ea30145fcb2a10621c5a666297bba9b95fcfaeb047b849b02f1992de3299cd675c03")
+set(qtquicktimeline_HASH "c35c19d67ea0fcb3e052a35207a7e6a42a4c7b6784e2a33c7e9928735a56085f1cc3b4aeead428ccc9149bb74b7c70db1a94f6ab79101e6dd77dcffef937ba86")
+set(qtquick3d_HASH "1a663920b3d2010de1b38ed559a2391d31a5c42dfdb0c414723acdf778c1fce2f6f74295bb260201d0a9ac64ff30570599e8d8b97229f6c5f33229a19a1fe763")
+set(qttranslations_HASH "727d3cf53dc80754771318b2d0f32ad09e5d5f02127d5003ee3f9685bf5742d19efe3e3c1ee03d4def908b23173f0417e4115376474d3a8d7f05062960565850")
+set(qtwayland_HASH "7f6533754daad7a2804ddddcd5139608c2b8f1ef92ae8a238c1ed4fc41c8a3ee532da0b2e57266d07d4d39d1ec6c83eca487c73788a108af30035b0dae262c76")
+set(qtdoc_HASH "151727a9d578cddf0f922d7429c46fd1983419832dcb0163f82b0c7333e8f3ba5e9f810cc4070de03f1ac959aa0a3253999fdd1f7e1d451cf2169e5394cfafc1")
+set(qtcoap_HASH "0c094b7743cb675ea92cc2e16dacc44b29bb060b5fa083208c123089b82092672b7877775e335e8dd148d700b8a13475f2ca5e061888a06f5c1844a02aa1b09c")
+set(qtopcua_HASH "59cb047bd647d0418ffd10e576d8ba42c363a9a9eb62122a8b49161df6c8b8c19d30f535687e39b3a4b0ee885374a187bf60873bdfe387ccf320eba52435718a")
+set(qtimageformats_HASH "da72e093b86638da5e5a5bd78a4ca88b72675d6294ad2af4b516affe88212ccc797ea859784b1f548c75c82fe926d3cd8f96a88901b475d60dc0dc30cfedb5a0")
+set(qtmqtt_HASH "ba23048e80faae1c8cc34cb1c4731b19cd4f5c394fa190443cedfe06b6754d1f59cf7110a230deb4d6c065db14d14b035c3f86058caf62e8d0bac12cdc9cfa02")
+set(qtnetworkauth_HASH "8d52344802ed6e9e6b60f1367ee9f9c2d495908a3992fa03f67d551c090cc837d02a560ba8e4244b739610b8ded0cb1bdc84ffa3f4183a6aa89df3b42310409f")
+set(qt3d_HASH "c924ded219fb6a6f49eff83b41f9d290119f99e9910521098c6d979282ebfe1dab32afdd7a249fdedecad26a8683776087ef15b5657976e2ae85de7319c67c19")
+set(qtactiveqt_HASH "653d8e634cead141b2f53f0c2339a36ffe254b046e514d5ad4f1453acf6bce73a2bb0d38b95f78a30a5cf0f59511fcb99a2464033551c4cbe775e0d25e10a7d0")
+set(qtdatavis3d_HASH "a4d1b3b705e87b883b5cab94798c459d6151b4c560038f26ec2633998e2a18d176d7718ea876bba63b21bb61732d8e3a2097793b9f2ba57c382b40f2ca3f270c")
+set(qtdeviceutilities_HASH "8ed34c952e31edc8e90928df3a992ae85edc5401108ad0d24fe2141336d873e776c406b90155a5da6a5fa06abd09cd4d226e5befdc32fa3b04904c5dd2d5a2c0")
+set(qtlottie_HASH "ee7f2253610dec22f55ce6f1eb2479e5c26137c55ca705716961f53fa6296cae6fa6a982911131eb42f451bf59db6f17c4e0fb8725a81d12b259e253da39a779")
+set(qtscxml_HASH "3c4b117138e9437a0e7b3f212e3a77aaf42c9fcbfdb30db0693e3fbf1562c68a88558951ff627dc9e91ff10625f3b269d115479e83cada46b9f9094f3d51e5a7")
+set(qtvirtualkeyboard_HASH "9b12e3dc6bab0ae1dd86c4b2ff1b8dbff3477b2a2a17a123f34874a59aa02f3ae6ccc550046d1f3976e010ba74b4534667366498b1aa3604ac1d380db326740f")
+set(qtcharts_HASH "1af5cb891454af3b0218e3475576609d438cbbbf9b52b2e614d1016cec8aff5b453d33964574b898ed70dff9ba78b17c1c5a0a186f508116ee721efc4e410778")
+set(qtconnectivity_HASH "b1a1962d881c1965c56cef5226b3eac39613332c96778daf322fa0ccba9aa33677e1943f3bb3f7efbdd8aec81623ca6b59c2340c805346935ef77e7606210dab")
+set(qtpositioning_HASH "8114d9cec0e453ff51fdbe8b1a814c968e614e1f9aaf031bf00c0c48e732de728d925852789360411c594f63ae322404fc9403d0bc3a35500522d8dc403d79e2")
+set(qtlocation_HASH "aa820e84efe3576bf483cd7d64a3b930f731c88324d34cc1486312c1cb0107a726dea91dc226562f017695300f0d656228d947d97374747c3ac6ae597cda6bb5")
+set(qtmultimedia_HASH "11fb3e421a80fee82d30a817f20277505868de0c1a870c55dd488114a0302f6a1bf41694ed64d904e4d29b1a3ad1ba01ce8399ae11f03ae2f6994359698e9c94")
+set(qtremoteobjects_HASH "92d2ae9fa1f8ddff0e68bcaf54c9298ff54c7146fdf9e57ab60668057067797ecd1d72a08c5db827942985423075116d55213689114230c1bfa632e63756478b")
+set(qtsensors_HASH "962f8947bbf21bd08c4b1a7da367fca1d0ec934a32a9820280730efa3f7e8b377a9f547bc91d4373d321ba74a147b7913bdf153599183b21f2ef10730132bb06")
+set(qtserialbus_HASH "11245960ab411a490bbc70388f35b4f9109df43d87882da3af4994a5c0e415f052ec86f3e16931ebd4adf3d980f7fa9e3dcfc2791e6f7aebdd0eba6f32622ea2")
+set(qtserialport_HASH "5841f6227725ed61a6e88f5359c0c75ff9192a66e916cc93a8028b03c2689dd10ea8f339a67cd0a26b55b44495880b3032ea1d5d99b716342912195a9b10516a")
+set(qtwebchannel_HASH "027b22f8edfc3285199272bf367254749ed99de5a1f3724967e765c76cb3ba2e9946746414e9fac8e52ea12a52717b1da0186ddf0ac5d6e3588796c0b9592772")
+set(qtwebengine_HASH "d1e4f5b664f8aca5e0a5927968be87e29e29172f1256f21dc6a29006258fb2be2be99b5b36c94a08c704580db9fac7defbb37193534129a21ca14a511fcdeea0")
+set(qtwebsockets_HASH "0b067c263887002f415326c013a7c83634403ac486f9696a81ac601c7be421bd8a1fc97a86f10abb369fac9e4661d54571aaf559565125a1fa8005a718950559")
+set(qtwebview_HASH "cb3093b233b3c77690be4c0c7cb7c7facd2d62c5a20f5f490a7881d97216ba13320e208dc74b7c02899250caa3d643b70c7ae5996ae15d2b2167fe4619046d3b")
+set(qtinterfaceframework_REF 	a2085374e38a135eaacfe7533888f0a361d4c721)
+set(qtapplicationmanager_HASH "a6c291d63e911f5344bd5a8fa6149e361402167c1c7c3a1672e5731ac664e01131b6f8f7b31ce6cbada7a0ec91d1aa6c9af7f9ef5125870a569c7e6bd4cf80dd")
+set(qtlanguageserver_HASH "35b5c9419ca426643564a5df4bed16f586bb6841ecdf28dbd626fb1ab70f1cbd0f1da9a4e2f03a3829e68139b059d731b193bde5fe493cbc955303cb7f33086b")
+set(qthttpserver_HASH "f851c8f5ea9cd4067474dee30ca797a2acb70ecaab2d993afe6abba3622fe3139acc6245b78f7d12b7e5dca5fc90aabd5144a3429c58a5f13cf23c6fbb023c24")
+set(qtquick3dphysics_HASH "84d898ae8fa73b4ef941c16c29ca26044e680d2ab447026423ca30bf0c495cffef2753463bbf7b52228c4631ef239625982b7d3ccbc116d78d3af27378b8bf55")
+set(qtspeech_HASH "79a2f9192585efbea0567648e4dcbf8f36f31f28463b031378a5027c036870c67b7b15c1223fbf838fae7f8e5b036fb29ca0a631cb7d19b0a40c55588b34d5a5")
+set(qtgrpc_HASH "9fb537dab8ad79cac2b076989952decdeebe40c1a0fceebe3dd70ee1f1e60c679d0314637998bb36f1d0f35c894896358e77d87c1c9f832283b4a8943352317a")
+set(qtquickeffectmaker_HASH "4f61a66cd01691d5318331b3a96cdc0d6ea902ed293ab93d45fb72ce0cec5cf5df0e4877cba09114c5ff6169cfa13e0fe41eb15dc48070ad4ed81c22739fe482")
+set(qtgraphs_HASH "9f768ed53ae696ba15321b8de5658cea9a989dbdea276712ba5bc057048a13fae2b1913994dc77da1456896beb52c4644054777db1319f9c4a4dfa012bc2ba44")
 
 # Keep for beta/rc
-#set(qttools_qlitehtml_REF       0)
-#set(qttools_litehtml_REF        0)
-#set(qttools_litehtml_HASH       0)
-#set(qtwebengine_chromium_REF    0)
\ No newline at end of file
+#set(qttools_qlitehtml_REF       bd70f93ce41443a6a90a269531393f575685283e)
+#set(qtwebengine_chromium_REF    0b138dc30d0aec7930c76a2595065629948ad9f7)
diff --git a/external_imported/vcpkg/ports/qtbase/cmake/qt_port_details.cmake b/external_imported/vcpkg/ports/qtbase/cmake/qt_port_details.cmake
index 49b944565..8dd317d04 100644
--- a/external_imported/vcpkg/ports/qtbase/cmake/qt_port_details.cmake
+++ b/external_imported/vcpkg/ports/qtbase/cmake/qt_port_details.cmake
@@ -7,7 +7,7 @@
 ## 6. The build should fail with "Done downloading version and emitting hashes." This will have changed out the vcpkg.json versions of the qt ports and rewritten qt_port_data.cmake
 ## 7. Set QT_UPDATE_VERSION back to 0
 
-set(QT_VERSION 6.4.3)
+set(QT_VERSION 6.6.1)
 set(QT_DEV_BRANCH 0)
 
 set(QT_UPDATE_VERSION 0)
@@ -17,10 +17,6 @@ if(PORT MATCHES "(qtquickcontrols2)")
     return()
 endif()
 
-if(PORT MATCHES "qtlocation") # No 6.3.1 tag/branch
-    set(QT_VERSION 6.3.0)
-endif()
-
 ### Setting up the git tag.
 
 set(QT_PORTS qt
@@ -58,7 +54,7 @@ if(QT_VERSION VERSION_GREATER_EQUAL 6.2)
              ## New in 6.2
              qtconnectivity
              qtpositioning
-             qtlocation
+             qtlocation # back in 6.5 as tech preview
              qtmultimedia
              qtremoteobjects
              qtsensors
@@ -87,34 +83,61 @@ if(QT_VERSION VERSION_GREATER_EQUAL 6.4.0)
              qtquick3dphysics
              qtspeech)
 endif()
+if(QT_VERSION VERSION_GREATER_EQUAL 6.5.0)
+    list(APPEND QT_PORTS
+             ## New in 6.5.0
+             qtgrpc
+             qtquickeffectmaker
+             )
+endif()
+if(QT_VERSION VERSION_GREATER_EQUAL 6.6.0)
+    list(APPEND QT_PORTS
+             ## New in 6.6.0
+             qtgraphs
+             #qtvncserver # only commercial
+             #qtinsighttracker
+             )
+endif()
+#qtinsighttracker
+#qtvncserver
+#qtgraphs
+
 # 1. By default, modules come from the official release
 # 2. These modules are mirrored to github and have tags matching the release
-set(QT_FROM_GITHUB qtcoap qtopcua qtmqtt qtapplicationmanager qthttpserver)
+set(QT_FROM_GITHUB qtcoap qtopcua qtmqtt qtapplicationmanager)
 # 3. These modules are mirrored to github and have branches matching the release
-set(QT_FROM_GITHUB_BRANCH qtdeviceutilities qtlocation)
+set(QT_FROM_GITHUB_BRANCH qtdeviceutilities)
 # 4. These modules are not mirrored to github and not part of the release
-set(QT_FROM_QT_GIT qtinterfaceframework qtquick3dphysics)
+set(QT_FROM_QT_GIT qtinterfaceframework)
 # For beta releases uncomment the next two lines and comment the lines with QT_FROM_GITHUB, QT_FROM_GITHUB_BRANCH, QT_FROM_QT_GIT
 #set(QT_FROM_QT_GIT ${QT_PORTS})
 #list(POP_FRONT QT_FROM_QT_GIT)
 
-function(qt_get_url_filename qt_port out_url out_filename)
+function(qt_get_url_filename qt_port out_urls out_filename)
     if("${qt_port}" IN_LIST QT_FROM_GITHUB)
-        set(url "https://github.com/qt/${qt_port}/archive/v${QT_VERSION}.tar.gz")
+        set(urls "https://github.com/qt/${qt_port}/archive/v${QT_VERSION}.tar.gz")
         set(filename "qt-${qt_port}-v${QT_VERSION}.tar.gz")
     elseif("${qt_port}" IN_LIST QT_FROM_GITHUB_BRANCH)
-        set(url "https://github.com/qt/${qt_port}/archive/${QT_VERSION}.tar.gz")
+        set(urls "https://github.com/qt/${qt_port}/archive/${QT_VERSION}.tar.gz")
         set(filename "qt-${qt_port}-${QT_VERSION}.tar.gz")
     else()
         string(SUBSTRING "${QT_VERSION}" 0 3 qt_major_minor)
+
         if(NOT QT_DEV_BRANCH)
-            set(url "https://download.qt.io/archive/qt/${qt_major_minor}/${QT_VERSION}/submodules/${qt_port}-everywhere-src-${QT_VERSION}.tar.xz")
+            set(branch_subpath "archive")
         else()
-            set(url "https://download.qt.io/development_releases/qt/${qt_major_minor}/${QT_VERSION}/submodules/${qt_port}-everywhere-src-${QT_VERSION}.tar.xz")
+            set(branch_subpath "development_releases")
         endif()
+
         set(filename "${qt_port}-everywhere-src-${QT_VERSION}.tar.xz")
+        set(mirrors
+            "https://download.qt.io/"
+            "https://mirrors.ocf.berkeley.edu/qt/"
+        )
+        set(url_subpath "${branch_subpath}/qt/${qt_major_minor}/${QT_VERSION}/submodules/${filename}")
+        list(TRANSFORM mirrors APPEND "${url_subpath}" OUTPUT_VARIABLE urls)
     endif()
-    set(${out_url} "${url}" PARENT_SCOPE)
+    set(${out_urls} ${urls} PARENT_SCOPE)
     set(${out_filename} "${filename}" PARENT_SCOPE)
 endfunction()
 
@@ -142,9 +165,9 @@ if(QT_UPDATE_VERSION)
             string(SUBSTRING "${out}" 0 40 tag_sha)
             string(APPEND msg "set(${qt_port}_REF ${tag_sha})\n")
         else()
-            qt_get_url_filename("${qt_port}" url filename)
+            qt_get_url_filename("${qt_port}" urls filename)
             vcpkg_download_distfile(archive
-                URLS "${url}"
+                URLS ${urls}
                 FILENAME "${filename}"
                 SKIP_SHA512
             )
diff --git a/external_imported/vcpkg/ports/qtbase/fix-host-aliasing.patch b/external_imported/vcpkg/ports/qtbase/fix-host-aliasing.patch
new file mode 100644
index 000000000..1823a351d
--- /dev/null
+++ b/external_imported/vcpkg/ports/qtbase/fix-host-aliasing.patch
@@ -0,0 +1,17 @@
+diff --git a/cmake/QtTargetHelpers.cmake b/cmake/QtTargetHelpers.cmake
+index 180ec33..a03e3b1 100644
+--- a/cmake/QtTargetHelpers.cmake
++++ b/cmake/QtTargetHelpers.cmake
+@@ -281,10 +281,10 @@ function(qt_internal_add_target_aliases target)
+     set_target_properties("${target}" PROPERTIES _qt_versionfull_alias "${versionfull_alias}")
+ 
+     get_target_property(type "${target}" TYPE)
+-    if (type STREQUAL EXECUTABLE)
++    if (type STREQUAL EXECUTABLE AND NOT TARGET "${versionfull_alias}")
+         add_executable("${versionless_alias}" ALIAS "${target}")
+         add_executable("${versionfull_alias}" ALIAS "${target}")
+-    else()
++    elseif(NOT type STREQUAL EXECUTABLE)
+         add_library("${versionless_alias}" ALIAS "${target}")
+         add_library("${versionfull_alias}" ALIAS "${target}")
+     endif()
diff --git a/external_imported/vcpkg/ports/qtbase/fix_cmake_build_type.patch b/external_imported/vcpkg/ports/qtbase/fix_cmake_build_type.patch
new file mode 100644
index 000000000..0f4946b4a
--- /dev/null
+++ b/external_imported/vcpkg/ports/qtbase/fix_cmake_build_type.patch
@@ -0,0 +1,24 @@
+diff --git a/cmake/QtBuildInternalsExtra.cmake.in b/cmake/QtBuildInternalsExtra.cmake.in
+index 21c40f2..c212148 100644
+--- a/cmake/QtBuildInternalsExtra.cmake.in
++++ b/cmake/QtBuildInternalsExtra.cmake.in
+@@ -162,6 +162,7 @@ function(qt_internal_force_set_cmake_build_type_conditionally value)
+     # STREQUAL check needs to be expanded variables because an undefined var is not equal to an
+     # empty defined var.
+     if("${CMAKE_BUILD_TYPE}" STREQUAL "${CMAKE_BUILD_TYPE_INIT}"
++        AND NOT DEFINED CACHE{CMAKE_BUILD_TYPE}
+         AND NOT __qt_toolchain_cmake_build_type_before_project_call
+         AND NOT QT_NO_FORCE_SET_CMAKE_BUILD_TYPE
+         AND NOT __qt_internal_extras_is_multi_config)
+diff --git a/cmake/QtSetup.cmake b/cmake/QtSetup.cmake
+index 762299f..f104479 100644
+--- a/cmake/QtSetup.cmake
++++ b/cmake/QtSetup.cmake
+@@ -56,6 +56,7 @@ get_property(QT_GENERATOR_IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CON
+ # See also qt_internal_force_set_cmake_build_type_conditionally which is used
+ # to set the build type when building other repos or tests.
+ if("${CMAKE_BUILD_TYPE}" STREQUAL "${CMAKE_BUILD_TYPE_INIT}"
++    AND NOT DEFINED CACHE{CMAKE_BUILD_TYPE}
+     AND NOT __qt_auto_detect_cmake_build_type_before_project_call
+     AND NOT __qt_build_internals_cmake_build_type
+     AND NOT CMAKE_CONFIGURATION_TYPES)
diff --git a/external_imported/vcpkg/ports/qtbase/patches/0001-CVE-2023-51714-qtbase-6.6.diff b/external_imported/vcpkg/ports/qtbase/patches/0001-CVE-2023-51714-qtbase-6.6.diff
new file mode 100644
index 000000000..31850c12c
--- /dev/null
+++ b/external_imported/vcpkg/ports/qtbase/patches/0001-CVE-2023-51714-qtbase-6.6.diff
@@ -0,0 +1,36 @@
+From 13c16b756900fe524f6d9534e8a07aa003c05e0c Mon Sep 17 00:00:00 2001
+From: Marc Mutz <marc.mutz@qt.io>
+Date: Tue, 12 Dec 2023 20:51:56 +0100
+Subject: [PATCH] HPack: fix a Yoda Condition
+
+Putting the variable on the LHS of a relational operation makes the
+expression easier to read. In this case, we find that the whole
+expression is nonsensical as an overflow protection, because if
+name.size() + value.size() overflows, the result will exactly _not_
+be > max() - 32, because UB will have happened.
+
+To be fixed in a follow-up commit.
+
+As a drive-by, add parentheses around the RHS.
+
+Pick-to: 6.5 6.2 5.15
+Change-Id: I35ce598884c37c51b74756b3bd2734b9aad63c09
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+(cherry picked from commit 658607a34ead214fbacbc2cca44915655c318ea9)
+Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
+(cherry picked from commit 4f7efd41740107f90960116700e3134f5e433867)
+---
+
+diff --git a/src/network/access/http2/hpacktable.cpp b/src/network/access/http2/hpacktable.cpp
+index 74a09a2..c8c5d09 100644
+--- a/src/network/access/http2/hpacktable.cpp
++++ b/src/network/access/http2/hpacktable.cpp
+@@ -27,7 +27,7 @@
+     // 32 octets of overhead."
+ 
+     const unsigned sum = unsigned(name.size() + value.size());
+-    if (std::numeric_limits<unsigned>::max() - 32 < sum)
++    if (sum > (std::numeric_limits<unsigned>::max() - 32))
+         return HeaderSize();
+     return HeaderSize(true, quint32(sum + 32));
+ }
diff --git a/external_imported/vcpkg/ports/qtbase/patches/0002-CVE-2023-51714-qtbase-6.6.diff b/external_imported/vcpkg/ports/qtbase/patches/0002-CVE-2023-51714-qtbase-6.6.diff
new file mode 100644
index 000000000..3703c2804
--- /dev/null
+++ b/external_imported/vcpkg/ports/qtbase/patches/0002-CVE-2023-51714-qtbase-6.6.diff
@@ -0,0 +1,44 @@
+From 811b9eef6d08d929af8708adbf2a5effb0eb62d7 Mon Sep 17 00:00:00 2001
+From: Marc Mutz <marc.mutz@qt.io>
+Date: Tue, 12 Dec 2023 22:08:07 +0100
+Subject: [PATCH] HPack: fix incorrect integer overflow check
+
+This code never worked:
+
+For the comparison with max() - 32 to trigger, on 32-bit platforms (or
+Qt 5) signed interger overflow would have had to happen in the
+addition of the two sizes. The compiler can therefore remove the
+overflow check as dead code.
+
+On Qt 6 and 64-bit platforms, the signed integer addition would be
+very unlikely to overflow, but the following truncation to uint32
+would yield the correct result only in a narrow 32-value window just
+below UINT_MAX, if even that.
+
+Fix by using the proper tool, qAddOverflow.
+
+Pick-to: 6.5 6.2 5.15
+Change-Id: I7599f2e75ff7f488077b0c60b81022591005661c
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+(cherry picked from commit ee5da1f2eaf8932aeca02ffea6e4c618585e29e3)
+Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
+(cherry picked from commit debeb8878da2dc706ead04b6072ecbe7e5313860)
+Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
+Reviewed-by: Marc Mutz <marc.mutz@qt.io>
+---
+
+diff --git a/src/network/access/http2/hpacktable.cpp b/src/network/access/http2/hpacktable.cpp
+index c8c5d09..2c728b3 100644
+--- a/src/network/access/http2/hpacktable.cpp
++++ b/src/network/access/http2/hpacktable.cpp
+@@ -26,7 +26,9 @@
+     // for counting the number of references to the name and value would have
+     // 32 octets of overhead."
+ 
+-    const unsigned sum = unsigned(name.size() + value.size());
++    size_t sum;
++    if (qAddOverflow(size_t(name.size()), size_t(value.size()), &sum))
++        return HeaderSize();
+     if (sum > (std::numeric_limits<unsigned>::max() - 32))
+         return HeaderSize();
+     return HeaderSize(true, quint32(sum + 32));
diff --git a/external_imported/vcpkg/ports/qtbase/portfile.cmake b/external_imported/vcpkg/ports/qtbase/portfile.cmake
index cb304e1be..dfc68ec18 100644
--- a/external_imported/vcpkg/ports/qtbase/portfile.cmake
+++ b/external_imported/vcpkg/ports/qtbase/portfile.cmake
@@ -9,16 +9,22 @@ set(QT_IS_LATEST ON)
 include("${CMAKE_CURRENT_LIST_DIR}/cmake/qt_install_submodule.cmake")
 
 set(${PORT}_PATCHES
+        # CVE fixes from https://download.qt.io/official_releases/qt/6.6/
+        patches/0001-CVE-2023-51714-qtbase-6.6.diff
+        patches/0002-CVE-2023-51714-qtbase-6.6.diff
+
         allow_outside_prefix.patch
-        clang-cl_source_location.patch
         config_install.patch
         fix_cmake_build.patch
+        fix_cmake_build_type.patch
         harfbuzz.patch
         fix_egl.patch
         fix_egl_2.patch
-        clang-cl_QGADGET_fix.diff # Upstream is still figuring out if this is a compiler bug or not.
         installed_dir.patch
         GLIB2-static.patch # alternative is to force pkg-config
+        clang-cl_source_location.patch
+        clang-cl_QGADGET_fix.diff
+        fix-host-aliasing.patch
         )
 
 if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
@@ -33,6 +39,13 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT "doubleconversion" IN_LIST FEATURES)
     message(FATAL_ERROR "${PORT} requires feature doubleconversion on windows!" )
 endif()
 
+if(VCPKG_TARGET_IS_LINUX)
+    message(WARNING "qtbase currently requires packages from the system package manager. "
+    "They can be installed on Ubuntu systems via sudo apt-get install " 
+    "'^libxcb.*-dev' libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev libxkbcommon-dev "
+    "libxkbcommon-x11-dev libegl1-mesa-dev.")
+endif()
+
 # Features can be found via searching for qt_feature in all configure.cmake files in the source:
 # The files also contain information about the Platform for which it is searched
 # Always use FEATURE_<feature> in vcpkg_cmake_configure
@@ -110,12 +123,18 @@ list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_LTTngUST:BOOL=ON)
 list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_PPS:BOOL=ON)
 list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Slog2:BOOL=ON)
 list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Libsystemd:BOOL=ON)
+list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_WrapBacktrace:BOOL=ON)
+#list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_WrapAtomic:BOOL=ON) # Cannot be disabled on x64 platforms
+#list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_WrapRt:BOOL=ON) # Cannot be disabled on osx
+list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_PPS:BOOL=ON)
+list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Slog2:BOOL=ON)
 
 # Network features:
  vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_NET_OPTIONS
  FEATURES
     "openssl"             FEATURE_openssl
     "brotli"              FEATURE_brotli
+    "securetransport"     FEATURE_securetransport
     #"brotli"              CMAKE_REQUIRE_FIND_PACKAGE_WrapBrotli
     #"openssl"             CMAKE_REQUIRE_FIND_PACKAGE_WrapOpenSSL
  INVERTED_FEATURES
@@ -131,6 +150,7 @@ endif()
 
 list(APPEND FEATURE_NET_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Libproxy:BOOL=ON)
 list(APPEND FEATURE_NET_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_GSSAPI:BOOL=ON)
+list(APPEND FEATURE_NET_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_WrapResolv:BOOL=ON)
 
 # Gui features:
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_GUI_OPTIONS
@@ -149,7 +169,9 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_GUI_OPTIONS
     "xrender"             FEATURE_xrender # requires FEATURE_xcb_native_painting; otherwise disabled. 
     "xrender"             FEATURE_xcb_native_painting # experimental
     "gles2"               FEATURE_opengles2
-    #"vulkan"              CMAKE_REQUIRE_FIND_PACKAGE_Vulkan
+    "gles3"               FEATURE_opengles3
+    #Cannot be required since Qt will look in CONFIG mode first but is controlled via CMAKE_DISABLE_FIND_PACKAGE_Vulkan below
+    #"vulkan"              CMAKE_REQUIRE_FIND_PACKAGE_WrapVulkanHeaders 
     "egl"                 FEATURE_egl
     #"fontconfig"          CMAKE_REQUIRE_FIND_PACKAGE_Fontconfig
     #"harfbuzz"            CMAKE_REQUIRE_FIND_PACKAGE_WrapSystemHarfbuzz
@@ -166,6 +188,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_GUI_OPTIONS
     "opengl"              CMAKE_DISABLE_FIND_PACKAGE_WrapOpenGL
     "egl"                 CMAKE_DISABLE_FIND_PACKAGE_EGL
     "gles2"               CMAKE_DISABLE_FIND_PACKAGE_GLESv2
+    "gles3"               CMAKE_DISABLE_FIND_PACKAGE_GLESv3
     "fontconfig"          CMAKE_DISABLE_FIND_PACKAGE_Fontconfig
     #"freetype"            CMAKE_DISABLE_FIND_PACKAGE_WrapSystemFreetype # Bug in qt cannot be deactivated
     "harfbuzz"            CMAKE_DISABLE_FIND_PACKAGE_WrapSystemHarfbuzz
@@ -180,7 +203,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_GUI_OPTIONS
     # There are more X features but I am unsure how to safely disable them! Most of them seem to be found automaticall with find_package(X11)
      )
 
-if( "gles2" IN_LIST FEATURES)
+if("gles2" IN_LIST FEATURES)
     list(APPEND FEATURE_GUI_OPTIONS -DINPUT_opengl='es2')
     list(APPEND FEATURE_GUI_OPTIONS -DFEATURE_opengl_desktop=OFF)
 endif()
@@ -202,8 +225,7 @@ else()
     list(APPEND FEATURE_GUI_OPTIONS -DINPUT_xkbcommon=no)
 endif()
 
-# Disable GLES3
-list(APPEND FEATURE_GUI_OPTIONS -DFEATURE_opengles3:BOOL=OFF)
+# Disable OpenGL ES 3.1 and 3.2
 list(APPEND FEATURE_GUI_OPTIONS -DFEATURE_opengles31:BOOL=OFF)
 list(APPEND FEATURE_GUI_OPTIONS -DFEATURE_opengles32:BOOL=OFF)
 
@@ -232,7 +254,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_SQLDRIVERS_OPTIONS
     "sql-oci"             CMAKE_DISABLE_FIND_PACKAGE_Oracle
     )
 
-set(DB_LIST DB2 Interbase)
+set(DB_LIST DB2 Interbase Mimer)
 foreach(_db IN LISTS DB_LIST)
     list(APPEND FEATURE_SQLDRIVERS_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_${_db}:BOOL=ON)
 endforeach()
@@ -242,12 +264,12 @@ endforeach()
     # )
 list(APPEND FEATURE_PRINTSUPPORT_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_CUPS:BOOL=ON)
 
-# widgets features:
-# vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_WIDGETS_OPTIONS
-    # "gtk3"             FEATURE_gtk3
-    # There are a lot of additional features here to deactivate parts of widgets.
-    # )
-list(APPEND FEATURE_WIDGETS_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_GTK3:BOOL=ON)
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_WIDGETS_OPTIONS
+    FEATURES
+    "gtk3"              FEATURE_gtk3
+    INVERTED_FEATURES
+    "gtk3"              CMAKE_DISABLE_FIND_PACKAGE_GTK3
+)
 
 set(TOOL_NAMES
         androiddeployqt
@@ -266,7 +288,12 @@ set(TOOL_NAMES
         qtpaths
         qtpaths6
         windeployqt
+        windeployqt6
         macdeployqt
+        macdeployqt6
+        androiddeployqt6
+        syncqt
+        tracepointgen
     )
 
 qt_install_submodule(PATCHES    ${${PORT}_PATCHES}
@@ -302,16 +329,19 @@ file(COPY
         "${CURRENT_PACKAGES_DIR}/share/${PORT}"
     )
 
+file(CONFIGURE OUTPUT "${CURRENT_PACKAGES_DIR}/share/${PORT}/port_status.cmake" CONTENT "set(qtbase_with_icu ${FEATURE_icu})\n")
+
 set(other_files qt-cmake
-                 qt-cmake-private
-                 qt-cmake-standalone-test
-                 qt-configure-module
-                 qt-internal-configure-tests
+                qt-cmake-private
+                qt-cmake-standalone-test
+                qt-configure-module
+                qt-internal-configure-tests
+                qt-cmake-create
                  )
 if(CMAKE_HOST_WIN32)
-    set(script_suffix .bat)
+    set(script_suffix ".bat")
 else()
-    set(script_suffix)
+    set(script_suffix "")
 endif()
 list(TRANSFORM other_files APPEND "${script_suffix}")
 
@@ -323,6 +353,7 @@ list(APPEND other_files
                 target_qt.conf
                 qt-cmake-private-install.cmake
                 qt-testrunner.py
+                sanitizer-testrunner.py
                 )
 
 foreach(_config debug release)
@@ -348,6 +379,7 @@ foreach(_config debug release)
                 string(REPLACE "../share/" "../../../share/" _contents "${_contents}")
             endif()
             string(REGEX REPLACE "set cmake_path=[^\n]+\n" "set cmake_path=cmake\n" _contents "${_contents}")
+            string(REGEX REPLACE "original_cmake_path=[^\n]+\n" "original_cmake_path=does-not-exist\n" _contents "${_contents}")
             file(WRITE "${target_file}" "${_contents}")
         endif()
     endforeach()
@@ -428,6 +460,12 @@ string(REPLACE [[set(QT6_HOST_INFO_LIBEXECDIR "bin")]] [[set(QT6_HOST_INFO_LIBEX
 string(REPLACE [[set(QT6_HOST_INFO_BINDIR "bin")]] [[set(QT6_HOST_INFO_BINDIR "tools/Qt6/bin")]] _contents "${_contents}")
 file(WRITE "${hostinfofile}" "${_contents}")
 
+if(NOT VCPKG_CROSSCOMPILING OR EXISTS "${CURRENT_PACKAGES_DIR}/share/Qt6CoreTools/Qt6CoreToolsAdditionalTargetInfo.cmake")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/Qt6CoreTools/Qt6CoreToolsAdditionalTargetInfo.cmake"
+                         "PACKAGE_PREFIX_DIR}/bin/syncqt"
+                         "PACKAGE_PREFIX_DIR}/tools/Qt6/bin/syncqt")
+endif()
+
 set(configfile "${CURRENT_PACKAGES_DIR}/share/Qt6CoreTools/Qt6CoreToolsTargets-debug.cmake")
 if(EXISTS "${configfile}")
     file(READ "${configfile}" _contents)
@@ -449,3 +487,18 @@ endif()
 if(VCPKG_CROSSCOMPILING)
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/Qt6/Qt6Dependencies.cmake" "${CURRENT_HOST_INSTALLED_DIR}" "\${CMAKE_CURRENT_LIST_DIR}/../../../${HOST_TRIPLET}")
 endif()
+
+function(remove_original_cmake_path file)
+    file(READ "${file}" _contents)
+    string(REGEX REPLACE "original_cmake_path=[^\n]*" "original_cmake_path=''" _contents "${_contents}")
+    file(WRITE "${file}" "${_contents}")
+endfunction()
+
+if(NOT VCPKG_TARGET_IS_WINDOWS)
+    foreach(file "qt-cmake" "qt-cmake-private")
+        remove_original_cmake_path("${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/${file}")
+        if(NOT VCPKG_BUILD_TYPE)
+            remove_original_cmake_path("${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/debug/${file}")
+        endif()
+    endforeach()
+endif()
diff --git a/external_imported/vcpkg/ports/qtbase/vcpkg.json b/external_imported/vcpkg/ports/qtbase/vcpkg.json
index 3d38b2f36..99804c7a8 100644
--- a/external_imported/vcpkg/ports/qtbase/vcpkg.json
+++ b/external_imported/vcpkg/ports/qtbase/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "qtbase",
-  "version": "6.4.3",
+  "version": "6.6.1",
+  "port-version": 9,
   "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
   "homepage": "https://www.qt.io/",
   "license": null,
@@ -61,10 +62,20 @@
     "icu",
     "jpeg",
     "network",
-    "opengl",
-    "openssl",
+    {
+      "name": "opengl",
+      "platform": "!ios"
+    },
+    {
+      "name": "openssl",
+      "platform": "!ios"
+    },
     "pcre2",
     "png",
+    {
+      "name": "securetransport",
+      "platform": "ios"
+    },
     "sql",
     "sql-psql",
     "sql-sqlite",
@@ -103,7 +114,16 @@
       ]
     },
     "dbus": {
-      "description": "Qt D-Bus"
+      "description": "Qt D-Bus",
+      "dependencies": [
+        {
+          "name": "qtbase",
+          "default-features": false,
+          "features": [
+            "thread"
+          ]
+        }
+      ]
     },
     "default-features": {
       "description": "Platform-dependent default features",
@@ -166,8 +186,8 @@
       ]
     },
     "framework": {
-      "$platform": "osx",
-      "description": "MAC framework build"
+      "description": "MAC framework build",
+      "supports": "osx & !static"
     },
     "freetype": {
       "description": "Supports the FreeType 2 font engine (and its supported font formats).",
@@ -180,7 +200,7 @@
     },
     "gles2": {
       "description": "OpenGL ES 2.0",
-      "supports": "!windows",
+      "supports": "!windows & !osx",
       "dependencies": [
         {
           "name": "qtbase",
@@ -191,16 +211,46 @@
         }
       ]
     },
+    "gles3": {
+      "description": "OpenGL ES 3.0",
+      "supports": "!windows & !osx",
+      "dependencies": [
+        {
+          "name": "qtbase",
+          "default-features": false,
+          "features": [
+            "gles2"
+          ]
+        }
+      ]
+    },
     "glib": {
       "description": "GLib",
       "dependencies": [
         "glib"
       ]
     },
+    "gtk3": {
+      "description": "GTK3 platform theme plugin",
+      "supports": "linux",
+      "dependencies": [
+        "gtk3",
+        {
+          "name": "qtbase",
+          "default-features": false,
+          "features": [
+            "glib"
+          ]
+        }
+      ]
+    },
     "gui": {
       "description": "Qt Gui",
       "dependencies": [
-        "opengl",
+        {
+          "name": "opengl",
+          "platform": "!ios"
+        },
         {
           "name": "qtbase",
           "default-features": false,
@@ -208,6 +258,14 @@
             "freetype"
           ]
         },
+        {
+          "name": "qtbase",
+          "default-features": false,
+          "features": [
+            "opengl"
+          ],
+          "platform": "osx"
+        },
         {
           "name": "qtbase",
           "default-features": false,
@@ -298,6 +356,10 @@
         }
       ]
     },
+    "securetransport": {
+      "description": "Enable Secure Transport",
+      "supports": "ios | osx"
+    },
     "sql": {
       "description": "Qt Sql",
       "dependencies": [
@@ -382,7 +444,10 @@
       "description": "Thread support; provides QThread and related classes."
     },
     "vulkan": {
-      "description": "Enable Vulkan support"
+      "description": "Enable Vulkan support",
+      "dependencies": [
+        "vulkan"
+      ]
     },
     "widgets": {
       "description": "Qt Widgets",
diff --git a/external_imported/vcpkg/ports/qtbase/windeployqt.debug.bat b/external_imported/vcpkg/ports/qtbase/windeployqt.debug.bat
index 54a50ff8d..796dc4f3e 100644
--- a/external_imported/vcpkg/ports/qtbase/windeployqt.debug.bat
+++ b/external_imported/vcpkg/ports/qtbase/windeployqt.debug.bat
@@ -6,5 +6,5 @@ set BAKCD=!CD!
 cd /D %mypath%\..\..\..\debug\bin
 set PATH=!CD!;%PATH%
 cd %BAKCD%
-"%mypath%\windeployqt.exe" --qtpaths "%mypath%\qtpaths.debug.bat" %*
+"%mypath%\windeployqt6.exe" --qtpaths "%mypath%\qtpaths.debug.bat" %*
 endlocal
diff --git a/external_imported/vcpkg/ports/qtcharts/vcpkg.json b/external_imported/vcpkg/ports/qtcharts/vcpkg.json
index 0641ee353..60b23d828 100644
--- a/external_imported/vcpkg/ports/qtcharts/vcpkg.json
+++ b/external_imported/vcpkg/ports/qtcharts/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtcharts",
-  "version": "6.4.3",
+  "version": "6.6.1",
   "description": "QtCharts module",
   "homepage": "https://www.qt.io/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/qtcoap/vcpkg.json b/external_imported/vcpkg/ports/qtcoap/vcpkg.json
index 515c6930f..16632785c 100644
--- a/external_imported/vcpkg/ports/qtcoap/vcpkg.json
+++ b/external_imported/vcpkg/ports/qtcoap/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtcoap",
-  "version": "6.4.3",
+  "version": "6.6.1",
   "description": "Qt CoAP client module",
   "homepage": "https://www.qt.io/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/qtconnectivity/portfile.cmake b/external_imported/vcpkg/ports/qtconnectivity/portfile.cmake
index 1a3a6f1bf..5eefc2dec 100644
--- a/external_imported/vcpkg/ports/qtconnectivity/portfile.cmake
+++ b/external_imported/vcpkg/ports/qtconnectivity/portfile.cmake
@@ -5,6 +5,8 @@ set(${PORT}_PATCHES)
 
 qt_install_submodule(PATCHES    ${${PORT}_PATCHES}
                      CONFIGURE_OPTIONS
+                      -DCMAKE_DISABLE_FIND_PACKAGE_BlueZ:BOOL=ON
+                      -DCMAKE_DISABLE_FIND_PACKAGE_PCSCLITE:BOOL=ON
                      CONFIGURE_OPTIONS_RELEASE
                      CONFIGURE_OPTIONS_DEBUG
                     )
diff --git a/external_imported/vcpkg/ports/qtconnectivity/vcpkg.json b/external_imported/vcpkg/ports/qtconnectivity/vcpkg.json
index ff6633b74..e67dffa2c 100644
--- a/external_imported/vcpkg/ports/qtconnectivity/vcpkg.json
+++ b/external_imported/vcpkg/ports/qtconnectivity/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtconnectivity",
-  "version": "6.4.3",
+  "version": "6.6.1",
   "description": "Qt Connectivity",
   "homepage": "https://www.qt.io/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/qtdatavis3d/vcpkg.json b/external_imported/vcpkg/ports/qtdatavis3d/vcpkg.json
index 20949a208..2ebba253b 100644
--- a/external_imported/vcpkg/ports/qtdatavis3d/vcpkg.json
+++ b/external_imported/vcpkg/ports/qtdatavis3d/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtdatavis3d",
-  "version": "6.4.3",
+  "version": "6.6.1",
   "description": "Qt 3D data visualization framework",
   "homepage": "https://www.qt.io/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/qtdeclarative/portfile.cmake b/external_imported/vcpkg/ports/qtdeclarative/portfile.cmake
index 73ffd73b2..3c9525d66 100644
--- a/external_imported/vcpkg/ports/qtdeclarative/portfile.cmake
+++ b/external_imported/vcpkg/ports/qtdeclarative/portfile.cmake
@@ -25,6 +25,7 @@ vcpkg_buildpath_length_warning(44)
 qt_install_submodule(PATCHES    ${${PORT}_PATCHES}
                      TOOL_NAMES ${TOOL_NAMES}
                      CONFIGURE_OPTIONS
+                      -DCMAKE_DISABLE_FIND_PACKAGE_LTTngUST:BOOL=ON
                      CONFIGURE_OPTIONS_RELEASE
                      CONFIGURE_OPTIONS_DEBUG
                     )
diff --git a/external_imported/vcpkg/ports/qtdeclarative/vcpkg.json b/external_imported/vcpkg/ports/qtdeclarative/vcpkg.json
index a112c4760..14b170f50 100644
--- a/external_imported/vcpkg/ports/qtdeclarative/vcpkg.json
+++ b/external_imported/vcpkg/ports/qtdeclarative/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtdeclarative",
-  "version": "6.4.3",
+  "version": "6.6.1",
   "description": "Qt Declarative (Quick 2)",
   "homepage": "https://www.qt.io/",
   "license": null,
@@ -18,6 +18,7 @@
       "host": true,
       "default-features": false
     },
+    "qtlanguageserver",
     {
       "name": "qtshadertools",
       "default-features": false
diff --git a/external_imported/vcpkg/ports/qtdeviceutilities/vcpkg.json b/external_imported/vcpkg/ports/qtdeviceutilities/vcpkg.json
index 82ab496af..fb678f1d6 100644
--- a/external_imported/vcpkg/ports/qtdeviceutilities/vcpkg.json
+++ b/external_imported/vcpkg/ports/qtdeviceutilities/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtdeviceutilities",
-  "version": "6.4.3",
+  "version": "6.6.1",
   "description": "Utils for Boot2Qt",
   "homepage": "https://www.qt.io/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/qtdoc/vcpkg.json b/external_imported/vcpkg/ports/qtdoc/vcpkg.json
index 9ced6ea94..07f3c4e3f 100644
--- a/external_imported/vcpkg/ports/qtdoc/vcpkg.json
+++ b/external_imported/vcpkg/ports/qtdoc/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtdoc",
-  "version": "6.4.3",
+  "version": "6.6.1",
   "description": "Qt Documentation",
   "homepage": "https://www.qt.io/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/qtgraphs/portfile.cmake b/external_imported/vcpkg/ports/qtgraphs/portfile.cmake
new file mode 100644
index 000000000..014d19bd6
--- /dev/null
+++ b/external_imported/vcpkg/ports/qtgraphs/portfile.cmake
@@ -0,0 +1,8 @@
+set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
+include("${SCRIPT_PATH}/qt_install_submodule.cmake")
+
+qt_install_submodule(PATCHES    ${${PORT}_PATCHES}
+                     CONFIGURE_OPTIONS ${FEATURE_OPTIONS}
+                     CONFIGURE_OPTIONS_RELEASE
+                     CONFIGURE_OPTIONS_DEBUG
+                    )
diff --git a/external_imported/vcpkg/ports/qtgraphs/vcpkg.json b/external_imported/vcpkg/ports/qtgraphs/vcpkg.json
new file mode 100644
index 000000000..24557853d
--- /dev/null
+++ b/external_imported/vcpkg/ports/qtgraphs/vcpkg.json
@@ -0,0 +1,26 @@
+{
+  "name": "qtgraphs",
+  "version": "6.6.1",
+  "description": "Qt Location",
+  "homepage": "https://www.qt.io/",
+  "license": null,
+  "dependencies": [
+    {
+      "name": "qtbase",
+      "default-features": false,
+      "features": [
+        "gui",
+        "testlib",
+        "widgets"
+      ]
+    },
+    {
+      "name": "qtdeclarative",
+      "default-features": false
+    },
+    {
+      "name": "qtquick3d",
+      "default-features": false
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/qtgrpc/portfile.cmake b/external_imported/vcpkg/ports/qtgrpc/portfile.cmake
new file mode 100644
index 000000000..4304d6639
--- /dev/null
+++ b/external_imported/vcpkg/ports/qtgrpc/portfile.cmake
@@ -0,0 +1,17 @@
+set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
+include("${SCRIPT_PATH}/qt_install_submodule.cmake")
+
+set(${PORT}_PATCHES protoc-host.patch)
+set(TOOL_NAMES qtprotobufgen qtgrpcgen)
+# native_grpc ->grpc WrapgRPC
+# grp -> qt[network]
+# qtprotobufgen -> protobuf WrapProtobuf
+qt_install_submodule(PATCHES    ${${PORT}_PATCHES}
+                     TOOL_NAMES ${TOOL_NAMES}
+                     CONFIGURE_OPTIONS
+                        -DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON
+                        #--trace-expand
+                     CONFIGURE_OPTIONS_MAYBE_UNUSED
+                         QT_BUILD_EXAMPLES
+                         QT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS
+                    )
diff --git a/external_imported/vcpkg/ports/qtgrpc/protoc-host.patch b/external_imported/vcpkg/ports/qtgrpc/protoc-host.patch
new file mode 100644
index 000000000..a2d81fb5a
--- /dev/null
+++ b/external_imported/vcpkg/ports/qtgrpc/protoc-host.patch
@@ -0,0 +1,23 @@
+diff --git a/cmake/FindWrapProtoc.cmake b/cmake/FindWrapProtoc.cmake
+index 82972c8f18..08335fa746 100644
+--- a/cmake/FindWrapProtoc.cmake
++++ b/cmake/FindWrapProtoc.cmake
+@@ -13,7 +13,7 @@ if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY)
+     list(APPEND __WrapProtoc_find_package_args QUIET)
+ endif()
+ 
+-if(NOT CMAKE_CROSSCOMPILING)
++if(0)
+     if(NOT TARGET Threads::Threads)
+         find_package(Threads ${__WrapProtoc_find_package_args})
+     endif()
+@@ -52,8 +52,8 @@ if(NOT CMAKE_CROSSCOMPILING)
+     endif()
+ endif()
+ 
+-if(NOT __WrapProtoc_protoc_imported_location)
++if(1)
+    if(CMAKE_CROSSCOMPILING)
+         set(__WrapProtoc_extra_prefix_paths "${QT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH}")
+     endif()
+     find_program(__WrapProtoc_protoc_imported_location
diff --git a/external_imported/vcpkg/ports/qtgrpc/vcpkg.json b/external_imported/vcpkg/ports/qtgrpc/vcpkg.json
new file mode 100644
index 000000000..9b7c898a8
--- /dev/null
+++ b/external_imported/vcpkg/ports/qtgrpc/vcpkg.json
@@ -0,0 +1,26 @@
+{
+  "name": "qtgrpc",
+  "version": "6.6.1",
+  "description": "Qt framework based gRPC clients and services.",
+  "homepage": "https://www.qt.io/",
+  "license": null,
+  "dependencies": [
+    {
+      "name": "grpc",
+      "default-features": false
+    },
+    {
+      "name": "protobuf",
+      "default-features": false
+    },
+    {
+      "name": "qtbase",
+      "default-features": false
+    },
+    {
+      "name": "qtgrpc",
+      "host": true,
+      "default-features": false
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/qthttpserver/vcpkg.json b/external_imported/vcpkg/ports/qthttpserver/vcpkg.json
index c6f2a6750..d98f678e9 100644
--- a/external_imported/vcpkg/ports/qthttpserver/vcpkg.json
+++ b/external_imported/vcpkg/ports/qthttpserver/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qthttpserver",
-  "version": "6.4.3",
+  "version": "6.6.1",
   "description": "Qt Extension: Qt HTTP Server",
   "homepage": "https://www.qt.io/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/qtimageformats/no_target_promotion_latest.patch b/external_imported/vcpkg/ports/qtimageformats/no_target_promotion_latest.patch
index 1b76e36b5..244e09f4b 100644
--- a/external_imported/vcpkg/ports/qtimageformats/no_target_promotion_latest.patch
+++ b/external_imported/vcpkg/ports/qtimageformats/no_target_promotion_latest.patch
@@ -17,5 +17,5 @@ index 7fdd7ddbd..f189c472c 100644
 +if(TARGET JPEG::JPEG)
 +	set_property(TARGET JPEG::JPEG PROPERTY _qt_no_promote_global TRUE)
 +endif()
- find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) # special case
- find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Gui) # special case
+ find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core)
+ find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Gui)
diff --git a/external_imported/vcpkg/ports/qtimageformats/vcpkg.json b/external_imported/vcpkg/ports/qtimageformats/vcpkg.json
index a66820025..a3eb0ca62 100644
--- a/external_imported/vcpkg/ports/qtimageformats/vcpkg.json
+++ b/external_imported/vcpkg/ports/qtimageformats/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtimageformats",
-  "version": "6.4.3",
+  "version": "6.6.1",
   "description": "Additional Image Format plugins for Qt",
   "homepage": "https://www.qt.io/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/qtinterfaceframework/portfile.cmake b/external_imported/vcpkg/ports/qtinterfaceframework/portfile.cmake
index 0a76f2969..e93aa878c 100644
--- a/external_imported/vcpkg/ports/qtinterfaceframework/portfile.cmake
+++ b/external_imported/vcpkg/ports/qtinterfaceframework/portfile.cmake
@@ -49,3 +49,5 @@ if(NOT VCPKG_CROSSCOMPILING)
         file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
     endif()
 endif()
+
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/Qt6/QtInterfaceFramework/${VERSION}/QtInterfaceFramework/private/qifqueryparser_flex_p.h" "${CURRENT_BUILDTREES_DIR}" "")
diff --git a/external_imported/vcpkg/ports/qtinterfaceframework/requirements_minimal.txt b/external_imported/vcpkg/ports/qtinterfaceframework/requirements_minimal.txt
index 3c62c19ee..4e4ae361f 100644
--- a/external_imported/vcpkg/ports/qtinterfaceframework/requirements_minimal.txt
+++ b/external_imported/vcpkg/ports/qtinterfaceframework/requirements_minimal.txt
@@ -7,7 +7,7 @@ Jinja2==2.11.3
 MarkupSafe==1.1
 path.py==11.0.1
 pathtools==0.1.2
-PyYAML==5.4
+PyYAML==6.0.1
 six==1.11.0
 watchdog==2.1.7
 pytest==5.3.5
diff --git a/external_imported/vcpkg/ports/qtinterfaceframework/vcpkg.json b/external_imported/vcpkg/ports/qtinterfaceframework/vcpkg.json
index eecf56e9d..358ed4d3e 100644
--- a/external_imported/vcpkg/ports/qtinterfaceframework/vcpkg.json
+++ b/external_imported/vcpkg/ports/qtinterfaceframework/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtinterfaceframework",
-  "version": "6.4.3",
+  "version": "6.6.1",
   "description": "Qt Interface Framework",
   "homepage": "https://www.qt.io/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/qtkeychain-qt6/portfile.cmake b/external_imported/vcpkg/ports/qtkeychain-qt6/portfile.cmake
index 875ae642a..50e1b3cd8 100644
--- a/external_imported/vcpkg/ports/qtkeychain-qt6/portfile.cmake
+++ b/external_imported/vcpkg/ports/qtkeychain-qt6/portfile.cmake
@@ -3,9 +3,8 @@ message(WARNING "qtkeychain is a third-party extension to Qt and is not affiliat
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO frankosterfeld/qtkeychain
-    # 0.13.2 plus three commits, for a CMake export target fix
-    REF cd4d73299b144d11c310f6ca9a6ab1ef50c45431
-    SHA512 a1af668bec23df5d696ad49129ec2aa6d332f043b43bb9875c2b025007452571bfd9431fd37c72189e957329491c04703e8c6d1104c7a117ebf28cb91249b639
+    REF "${VERSION}"
+    SHA512 bf84b19090e667a2946297e63d9813574193d80e4eecbde2fdfca317a66da3f029b3abef326f4ffb32de032a48004f9cf1bc818468af612723d762652dc25eb6
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/qtkeychain-qt6/vcpkg.json b/external_imported/vcpkg/ports/qtkeychain-qt6/vcpkg.json
index 3df8b0829..f5d43a44d 100644
--- a/external_imported/vcpkg/ports/qtkeychain-qt6/vcpkg.json
+++ b/external_imported/vcpkg/ports/qtkeychain-qt6/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "qtkeychain-qt6",
-  "version": "0.13.2",
-  "port-version": 1,
+  "version": "0.14.1",
   "description": "(Unaffiliated with Qt) Platform-independent Qt6 API for storing passwords securely",
   "homepage": "https://github.com/frankosterfeld/qtkeychain",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/qtkeychain/portfile.cmake b/external_imported/vcpkg/ports/qtkeychain/portfile.cmake
index 53b7683d8..9ffb5d7a1 100644
--- a/external_imported/vcpkg/ports/qtkeychain/portfile.cmake
+++ b/external_imported/vcpkg/ports/qtkeychain/portfile.cmake
@@ -3,9 +3,8 @@ message(WARNING "qtkeychain is a third-party extension to Qt and is not affiliat
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO frankosterfeld/qtkeychain
-    # 0.13.2 plus three commits, for a CMake export target fix
-    REF cd4d73299b144d11c310f6ca9a6ab1ef50c45431
-    SHA512 a1af668bec23df5d696ad49129ec2aa6d332f043b43bb9875c2b025007452571bfd9431fd37c72189e957329491c04703e8c6d1104c7a117ebf28cb91249b639
+    REF "${VERSION}"
+    SHA512 bf84b19090e667a2946297e63d9813574193d80e4eecbde2fdfca317a66da3f029b3abef326f4ffb32de032a48004f9cf1bc818468af612723d762652dc25eb6
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/qtkeychain/vcpkg.json b/external_imported/vcpkg/ports/qtkeychain/vcpkg.json
index 6f1e1e257..906c0a52b 100644
--- a/external_imported/vcpkg/ports/qtkeychain/vcpkg.json
+++ b/external_imported/vcpkg/ports/qtkeychain/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "qtkeychain",
-  "version": "0.13.2",
-  "port-version": 3,
+  "version": "0.14.1",
   "description": "(Unaffiliated with Qt) Platform-independent Qt5 API for storing passwords securely",
   "homepage": "https://github.com/frankosterfeld/qtkeychain",
   "license": "BSD-3-Clause",
@@ -10,6 +9,7 @@
       "name": "libsecret",
       "platform": "!(windows | uwp | osx)"
     },
+    "qt5-base",
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/external_imported/vcpkg/ports/qtlanguageserver/vcpkg.json b/external_imported/vcpkg/ports/qtlanguageserver/vcpkg.json
index 9ba4f70e5..e29490e37 100644
--- a/external_imported/vcpkg/ports/qtlanguageserver/vcpkg.json
+++ b/external_imported/vcpkg/ports/qtlanguageserver/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtlanguageserver",
-  "version": "6.4.3",
+  "version": "6.6.1",
   "description": "An implementation of the Language Server Protocol",
   "homepage": "https://www.qt.io/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/qtlocation/portfile.cmake b/external_imported/vcpkg/ports/qtlocation/portfile.cmake
index 15fa294cd..d4afa6dfb 100644
--- a/external_imported/vcpkg/ports/qtlocation/portfile.cmake
+++ b/external_imported/vcpkg/ports/qtlocation/portfile.cmake
@@ -1,7 +1,5 @@
-set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
-message(STATUS "Upstream decided to split this into qtpositioning and qtlocation. qtlocation however is currently empty!")
-# set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
-# include("${SCRIPT_PATH}/qt_install_submodule.cmake")
+set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
+include("${SCRIPT_PATH}/qt_install_submodule.cmake")
 
 # set(${PORT}_PATCHES)
 
@@ -17,8 +15,8 @@ message(STATUS "Upstream decided to split this into qtpositioning and qtlocation
                             # "-DCMAKE_DISABLE_FIND_PACKAGE_Gconf=ON"
 # )
 
-# qt_install_submodule(PATCHES    ${${PORT}_PATCHES}
-                     # CONFIGURE_OPTIONS ${FEATURE_OPTIONS}
-                     # CONFIGURE_OPTIONS_RELEASE
-                     # CONFIGURE_OPTIONS_DEBUG
-                    # )
+qt_install_submodule(PATCHES    ${${PORT}_PATCHES}
+                     CONFIGURE_OPTIONS ${FEATURE_OPTIONS}
+                     CONFIGURE_OPTIONS_RELEASE
+                     CONFIGURE_OPTIONS_DEBUG
+                    )
diff --git a/external_imported/vcpkg/ports/qtlocation/vcpkg.json b/external_imported/vcpkg/ports/qtlocation/vcpkg.json
index be27b210a..357ebfa2e 100644
--- a/external_imported/vcpkg/ports/qtlocation/vcpkg.json
+++ b/external_imported/vcpkg/ports/qtlocation/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtlocation",
-  "version": "6.4.3",
+  "version": "6.6.1",
   "description": "Qt Location",
   "homepage": "https://www.qt.io/",
   "license": null,
@@ -17,6 +17,16 @@
       ],
       "platform": "linux"
     },
-    "qtpositioning"
+    {
+      "name": "qtpositioning",
+      "default-features": false,
+      "features": [
+        "qml"
+      ]
+    },
+    {
+      "name": "qtshadertools",
+      "default-features": false
+    }
   ]
 }
diff --git a/external_imported/vcpkg/ports/qtlottie/vcpkg.json b/external_imported/vcpkg/ports/qtlottie/vcpkg.json
index 99a5af264..bb1846a0e 100644
--- a/external_imported/vcpkg/ports/qtlottie/vcpkg.json
+++ b/external_imported/vcpkg/ports/qtlottie/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtlottie",
-  "version": "6.4.3",
+  "version": "6.6.1",
   "description": "Lottie is a family of player software for a certain json-based file format for describing 2d vector graphics animations. These files are created/exported directly from After Effects by a plugin called Bodymovin.",
   "homepage": "https://www.qt.io/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/qtmqtt/vcpkg.json b/external_imported/vcpkg/ports/qtmqtt/vcpkg.json
index 306dd5e72..93f0adb16 100644
--- a/external_imported/vcpkg/ports/qtmqtt/vcpkg.json
+++ b/external_imported/vcpkg/ports/qtmqtt/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtmqtt",
-  "version": "6.4.3",
+  "version": "6.6.1",
   "description": "Qt Module to implement MQTT protocol version 3.1 and 3.1.1 http://mqtt.org/",
   "homepage": "https://www.qt.io/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/qtmultimedia/portfile.cmake b/external_imported/vcpkg/ports/qtmultimedia/portfile.cmake
index 2d2bd8fc6..4717d040d 100644
--- a/external_imported/vcpkg/ports/qtmultimedia/portfile.cmake
+++ b/external_imported/vcpkg/ports/qtmultimedia/portfile.cmake
@@ -61,7 +61,7 @@ endif()
 if("ffmpeg" IN_LIST FEATURES)
     # Note: Requires pulsadio on linux and wmfsdk on windows
     list(APPEND FEATURE_OPTIONS "-DINPUT_ffmpeg='yes'")
-    if(VCPKG_TARGET_IS_WINDOWS)
+    if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_ANDROID)
         list(APPEND FEATURE_OPTIONS "-DINPUT_pulseaudio='no'")
     else()
         list(APPEND FEATURE_OPTIONS "-DINPUT_pulseaudio='yes'")
@@ -83,4 +83,4 @@ qt_install_submodule(PATCHES    ${${PORT}_PATCHES}
 
 if("gstreamer" IN_LIST FEATURES AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/Qt6Multimedia/Qt6QGstreamerMediaPluginDependencies.cmake" "GStreamer\;FALSE\;\;\;;GStreamer\;FALSE\;\;App\;;GStreamer\;FALSE\;\;\;Gl" "GStreamer\;FALSE\;\;\;;GStreamer\;FALSE\;\;App\;;GStreamer\;FALSE\;\;\;Gl;EGL\;FALSE\;\;\;" )
-endif()
\ No newline at end of file
+endif()
diff --git a/external_imported/vcpkg/ports/qtmultimedia/static_find_modules.patch b/external_imported/vcpkg/ports/qtmultimedia/static_find_modules.patch
index 2efe19158..cff8fa954 100644
--- a/external_imported/vcpkg/ports/qtmultimedia/static_find_modules.patch
+++ b/external_imported/vcpkg/ports/qtmultimedia/static_find_modules.patch
@@ -11,17 +11,6 @@ index 47d8769..46a5c9b 100644
        set(FFMPEG_DEFINITIONS  ${FFMPEG_DEFINITIONS}  ${${_component}_DEFINITIONS})
  
        list(APPEND FFMPEG_INCLUDE_DIRS ${${_component}_INCLUDE_DIRS})
-@@ -240,8 +240,8 @@ endfunction()
-         set_target_properties(FFmpeg::${_lowerComponent} PROPERTIES
-             INTERFACE_COMPILE_OPTIONS "${${_component}_DEFINITIONS}"
-             INTERFACE_INCLUDE_DIRECTORIES ${${_component}_INCLUDE_DIRS}
--            INTERFACE_LINK_LIBRARIES "${${_component}_LIBRARIES}"
--            INTERFACE_LINK_DIRECTORIES "${${_component}_LIBRARY_DIRS}"
-+            IMPORTED_LOCATION "${${_component}_LIBRARY}"
-+            #INTERFACE_LINK_DIRECTORIES "${${_component}_LIBRARY_DIRS}"
-         )
-         if(__ffmpeg_is_static)
-             __ffmpeg_internal_set_dependencies(${_lowerComponent})
 @@ -250,6 +250,9 @@ endfunction()
          if (UNIX AND NOT APPLE)
            target_link_options(FFmpeg::${_lowerComponent} INTERFACE  "-Wl,--exclude-libs=lib${_lowerComponent}")
diff --git a/external_imported/vcpkg/ports/qtmultimedia/vcpkg.json b/external_imported/vcpkg/ports/qtmultimedia/vcpkg.json
index 81b385eab..ccf1a2e11 100644
--- a/external_imported/vcpkg/ports/qtmultimedia/vcpkg.json
+++ b/external_imported/vcpkg/ports/qtmultimedia/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "qtmultimedia",
-  "version": "6.4.3",
+  "version": "6.6.1",
+  "port-version": 1,
   "description": "Qt Multimedia",
   "homepage": "https://www.qt.io/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/qtnetworkauth/vcpkg.json b/external_imported/vcpkg/ports/qtnetworkauth/vcpkg.json
index 8c38f4aca..355a7e835 100644
--- a/external_imported/vcpkg/ports/qtnetworkauth/vcpkg.json
+++ b/external_imported/vcpkg/ports/qtnetworkauth/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtnetworkauth",
-  "version": "6.4.3",
+  "version": "6.6.1",
   "description": "Qt Network Authenticators; QtOAuth in particular",
   "homepage": "https://www.qt.io/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/qtopcua/fix-build.patch b/external_imported/vcpkg/ports/qtopcua/fix-build.patch
new file mode 100644
index 000000000..33f4e84e7
--- /dev/null
+++ b/external_imported/vcpkg/ports/qtopcua/fix-build.patch
@@ -0,0 +1,27 @@
+diff --git a/cmake/FindOpen62541.cmake b/cmake/FindOpen62541.cmake
+index b4fcea410..91958e554 100644
+--- a/cmake/FindOpen62541.cmake
++++ b/cmake/FindOpen62541.cmake
+@@ -21,6 +21,7 @@
+ # ``open62541``
+ #     The open62541 library
+ 
++if(0)
+ find_path(Open62541_INCLUDE_DIRS
+     NAMES open62541.h
+     HINTS "${OPEN62541_INCDIR}")
+@@ -46,6 +47,14 @@ if (Open62541_FOUND)
+ endif()
+ 
+ mark_as_advanced(Open62541_INCLUDE_DIRS Open62541_LIBRARIES)
++elseif()
++    find_package(open62541 CONFIG REQUIRED)
++    if(NOT TARGET open62541)
++        add_library(open62541 INTERFACE IMPORTED)
++        set_property(TARGET open62541 APPEND PROPERTY
++            INTERFACE_LINK_LIBRARIES open62541::open62541)
++    endif()
++endif()
+ 
+ include(FeatureSummary)
+ set_package_properties(Open62541 PROPERTIES
diff --git a/external_imported/vcpkg/ports/qtopcua/portfile.cmake b/external_imported/vcpkg/ports/qtopcua/portfile.cmake
index 80738f36b..0f2c0ed59 100644
--- a/external_imported/vcpkg/ports/qtopcua/portfile.cmake
+++ b/external_imported/vcpkg/ports/qtopcua/portfile.cmake
@@ -1,6 +1,8 @@
 set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
 include("${SCRIPT_PATH}/qt_install_submodule.cmake")
 
+set(${PORT}_PATCHES fix-build.patch)
+
 # General features:
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
 FEATURES
@@ -16,17 +18,19 @@ INVERTED_FEATURES
 if("open62541" IN_LIST FEATURES)
     list(APPEND FEATURE_OPTIONS -DINPUT_open62541=system
                                 -DHAVE_open62541=true)
+    vcpkg_find_acquire_program(PYTHON3)
 else()
     list(APPEND FEATURE_OPTIONS -DINPUT_open62541=no)
 endif()
 
-if(NOT "open62541" IN_LIST FEATURES AND NOT "gds" IN_LIST FEATURES)
-    list(APPEND FEATURE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_WrapOpenSSL=ON)
+if("uacpp" IN_LIST FEATURES)
+    message(WARNING "\nPlease note that you have to install the Unified Automation C++ SDK yourself.\n")
 endif()
 
 qt_install_submodule(PATCHES    ${${PORT}_PATCHES}
                      CONFIGURE_OPTIONS
                         ${FEATURE_OPTIONS}
+                        "-DPYTHON_EXECUTABLE=${PYTHON3}"
                      CONFIGURE_OPTIONS_RELEASE
                      CONFIGURE_OPTIONS_DEBUG
                     )
diff --git a/external_imported/vcpkg/ports/qtopcua/vcpkg.json b/external_imported/vcpkg/ports/qtopcua/vcpkg.json
index cebb3ebf0..040afb1c9 100644
--- a/external_imported/vcpkg/ports/qtopcua/vcpkg.json
+++ b/external_imported/vcpkg/ports/qtopcua/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "qtopcua",
-  "version": "6.4.3",
+  "version": "6.6.1",
+  "port-version": 1,
   "description": "Qt wrapper for existing OPC UA stacks",
   "homepage": "https://www.qt.io/",
   "license": null,
@@ -27,7 +28,8 @@
       "description": "Support for global discovery server"
     },
     "ns0idgenerator": {
-      "description": "Namespace 0 NodeIds generator from the NodeIds.csv file."
+      "description": "Namespace 0 NodeIds generator from the NodeIds.csv file.",
+      "supports": "native"
     },
     "ns0idnames": {
       "description": "Support for namespace 0 NodeId names"
diff --git a/external_imported/vcpkg/ports/qtpositioning/devendor-poly2tri.patch b/external_imported/vcpkg/ports/qtpositioning/devendor-poly2tri.patch
new file mode 100644
index 000000000..85e18ca98
--- /dev/null
+++ b/external_imported/vcpkg/ports/qtpositioning/devendor-poly2tri.patch
@@ -0,0 +1,37 @@
+diff --color -Naur a/src/3rdparty/clip2tri/CMakeLists.txt b/src/3rdparty/clip2tri/CMakeLists.txt
+--- a/src/3rdparty/clip2tri/CMakeLists.txt	2023-05-13 16:59:42.377052155 +0200
++++ b/src/3rdparty/clip2tri/CMakeLists.txt	2023-05-13 23:05:44.950379088 +0200
+@@ -4,6 +4,7 @@
+ ## Bundled_Clip2Tri Generic Library:
+ #####################################################################
+ 
++find_package(poly2tri)
+ qt_internal_add_3rdparty_library(Bundled_Clip2Tri
+     QMAKE_LIB_NAME _clip2tri
+     STATIC
+@@ -13,11 +14,12 @@
+         clip2tri.cpp clip2tri.h
+     INCLUDE_DIRECTORIES
+         ../clipper
+-        ../poly2tri
+     LIBRARIES
+         Qt::Bundled_Clipper # special case
+-        Qt::Bundled_Poly2Tri # special case
++        poly2tri::poly2tri
+ )
++target_link_libraries(Bundled_Clip2Tri PRIVATE poly2tri::poly2tri)
++set_target_properties(poly2tri::poly2tri PROPERTIES INTERFACE_QT_PACKAGE_NAME poly2tri)
+ qt_disable_warnings(Bundled_Clip2Tri)
+ qt_set_symbol_visibility_hidden(Bundled_Clip2Tri)
+ 
+diff --color -Naur a/src/CMakeLists.txt b/src/CMakeLists.txt
+--- a/src/CMakeLists.txt	2023-05-13 16:59:42.379052157 +0200
++++ b/src/CMakeLists.txt	2023-05-13 17:00:19.256085781 +0200
+@@ -2,7 +2,6 @@
+ # SPDX-License-Identifier: BSD-3-Clause
+ 
+ # special case begin
+-add_subdirectory(3rdparty/poly2tri)
+ add_subdirectory(3rdparty/clipper)
+ add_subdirectory(3rdparty/clip2tri)
+ add_subdirectory(positioning)
diff --git a/external_imported/vcpkg/ports/qtpositioning/portfile.cmake b/external_imported/vcpkg/ports/qtpositioning/portfile.cmake
index 005fe5f33..dc9da8a1d 100644
--- a/external_imported/vcpkg/ports/qtpositioning/portfile.cmake
+++ b/external_imported/vcpkg/ports/qtpositioning/portfile.cmake
@@ -1,6 +1,9 @@
 set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
 include("${SCRIPT_PATH}/qt_install_submodule.cmake")
 
+set(${PORT}_PATCHES
+    devendor-poly2tri.patch)
+
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
 FEATURES
     "qml"           CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick
diff --git a/external_imported/vcpkg/ports/qtpositioning/vcpkg.json b/external_imported/vcpkg/ports/qtpositioning/vcpkg.json
index 4a89009aa..e7aa4b480 100644
--- a/external_imported/vcpkg/ports/qtpositioning/vcpkg.json
+++ b/external_imported/vcpkg/ports/qtpositioning/vcpkg.json
@@ -1,17 +1,20 @@
 {
   "name": "qtpositioning",
-  "version": "6.4.3",
+  "version": "6.6.1",
+  "port-version": 2,
   "description": "Qt Positioning",
   "homepage": "https://www.qt.io/",
   "license": null,
   "dependencies": [
+    "jhasse-poly2tri",
     {
       "name": "qtbase",
       "default-features": false
     },
     {
       "name": "qtserialport",
-      "default-features": false
+      "default-features": false,
+      "platform": "!ios"
     }
   ],
   "features": {
diff --git a/external_imported/vcpkg/ports/qtquick3d/portfile.cmake b/external_imported/vcpkg/ports/qtquick3d/portfile.cmake
index 43449146f..fc2e1d75c 100644
--- a/external_imported/vcpkg/ports/qtquick3d/portfile.cmake
+++ b/external_imported/vcpkg/ports/qtquick3d/portfile.cmake
@@ -22,6 +22,7 @@ qt_install_submodule(PATCHES    ${${PORT}_PATCHES}
                      TOOL_NAMES ${TOOL_NAMES}
                      CONFIGURE_OPTIONS
                         ${FEATURE_OPTIONS}
+                        -DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON
                      CONFIGURE_OPTIONS_RELEASE
                      CONFIGURE_OPTIONS_DEBUG
                     )
diff --git a/external_imported/vcpkg/ports/qtquick3d/vcpkg.json b/external_imported/vcpkg/ports/qtquick3d/vcpkg.json
index 9daaf7278..2d37322ea 100644
--- a/external_imported/vcpkg/ports/qtquick3d/vcpkg.json
+++ b/external_imported/vcpkg/ports/qtquick3d/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtquick3d",
-  "version": "6.4.3",
+  "version": "6.6.1",
   "description": "A new module and API for defining 3D content in Qt Quick.",
   "homepage": "https://www.qt.io/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/qtquick3dphysics/vcpkg.json b/external_imported/vcpkg/ports/qtquick3dphysics/vcpkg.json
index 7c85a586d..8a7a4e3b7 100644
--- a/external_imported/vcpkg/ports/qtquick3dphysics/vcpkg.json
+++ b/external_imported/vcpkg/ports/qtquick3dphysics/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtquick3dphysics",
-  "version": "6.4.3",
+  "version": "6.6.1",
   "description": "Physics engine integration for Qt Quick 3D",
   "homepage": "https://www.qt.io/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/qtquickeffectmaker/portfile.cmake b/external_imported/vcpkg/ports/qtquickeffectmaker/portfile.cmake
new file mode 100644
index 000000000..effa2d5b1
--- /dev/null
+++ b/external_imported/vcpkg/ports/qtquickeffectmaker/portfile.cmake
@@ -0,0 +1,14 @@
+set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
+include("${SCRIPT_PATH}/qt_install_submodule.cmake")
+
+set(${PORT}_PATCHES)
+set(TOOL_NAMES qqem)
+
+qt_install_submodule(PATCHES    ${${PORT}_PATCHES}
+                     TOOL_NAMES ${TOOL_NAMES}
+                     CONFIGURE_OPTIONS_MAYBE_UNUSED
+                         QT_BUILD_EXAMPLES
+                         QT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS
+                    )
+
+set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
diff --git a/external_imported/vcpkg/ports/qtquickeffectmaker/vcpkg.json b/external_imported/vcpkg/ports/qtquickeffectmaker/vcpkg.json
new file mode 100644
index 000000000..cce441e9c
--- /dev/null
+++ b/external_imported/vcpkg/ports/qtquickeffectmaker/vcpkg.json
@@ -0,0 +1,29 @@
+{
+  "name": "qtquickeffectmaker",
+  "version": "6.6.1",
+  "description": "Qt Quick Effect Maker (QQEM) for creating and editing custom shader effects.",
+  "homepage": "https://www.qt.io/",
+  "license": null,
+  "supports": "native",
+  "dependencies": [
+    {
+      "name": "qtbase",
+      "default-features": false,
+      "features": [
+        "gui"
+      ]
+    },
+    {
+      "name": "qtdeclarative",
+      "default-features": false
+    },
+    {
+      "name": "qtquick3d",
+      "default-features": false
+    },
+    {
+      "name": "qtshadertools",
+      "default-features": false
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/qtquicktimeline/vcpkg.json b/external_imported/vcpkg/ports/qtquicktimeline/vcpkg.json
index b1f8fc9aa..09e9ad4b4 100644
--- a/external_imported/vcpkg/ports/qtquicktimeline/vcpkg.json
+++ b/external_imported/vcpkg/ports/qtquicktimeline/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtquicktimeline",
-  "version": "6.4.3",
+  "version": "6.6.1",
   "description": "Module for keyframe-based timeline construction.",
   "homepage": "https://www.qt.io/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/qtremoteobjects/vcpkg.json b/external_imported/vcpkg/ports/qtremoteobjects/vcpkg.json
index 2d27cc8d9..497b0b3ce 100644
--- a/external_imported/vcpkg/ports/qtremoteobjects/vcpkg.json
+++ b/external_imported/vcpkg/ports/qtremoteobjects/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtremoteobjects",
-  "version": "6.4.3",
+  "version": "6.6.1",
   "description": "Qt distributed object system",
   "homepage": "https://www.qt.io/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/qtscxml/vcpkg.json b/external_imported/vcpkg/ports/qtscxml/vcpkg.json
index b196eed46..afbc4c278 100644
--- a/external_imported/vcpkg/ports/qtscxml/vcpkg.json
+++ b/external_imported/vcpkg/ports/qtscxml/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtscxml",
-  "version": "6.4.3",
+  "version": "6.6.1",
   "description": "SCXML (state machine notation) compiler and related tools",
   "homepage": "https://www.qt.io/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/qtsensors/vcpkg.json b/external_imported/vcpkg/ports/qtsensors/vcpkg.json
index f7db1f3e4..889ac9765 100644
--- a/external_imported/vcpkg/ports/qtsensors/vcpkg.json
+++ b/external_imported/vcpkg/ports/qtsensors/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtsensors",
-  "version": "6.4.3",
+  "version": "6.6.1",
   "description": "Qt Sensors",
   "homepage": "https://www.qt.io/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/qtserialbus/vcpkg.json b/external_imported/vcpkg/ports/qtserialbus/vcpkg.json
index d5a9868b3..fd3633b86 100644
--- a/external_imported/vcpkg/ports/qtserialbus/vcpkg.json
+++ b/external_imported/vcpkg/ports/qtserialbus/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtserialbus",
-  "version": "6.4.3",
+  "version": "6.6.1",
   "description": "Support for CAN and potentially other serial buses.",
   "homepage": "https://www.qt.io/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/qtserialport/vcpkg.json b/external_imported/vcpkg/ports/qtserialport/vcpkg.json
index c15abfd6d..248f08783 100644
--- a/external_imported/vcpkg/ports/qtserialport/vcpkg.json
+++ b/external_imported/vcpkg/ports/qtserialport/vcpkg.json
@@ -1,9 +1,11 @@
 {
   "name": "qtserialport",
-  "version": "6.4.3",
+  "version": "6.6.1",
+  "port-version": 1,
   "description": "Qt Serial Port support",
   "homepage": "https://www.qt.io/",
   "license": null,
+  "supports": "!ios",
   "dependencies": [
     {
       "name": "qtbase",
diff --git a/external_imported/vcpkg/ports/qtshadertools/vcpkg.json b/external_imported/vcpkg/ports/qtshadertools/vcpkg.json
index 2ae2a1524..5b3d840cc 100644
--- a/external_imported/vcpkg/ports/qtshadertools/vcpkg.json
+++ b/external_imported/vcpkg/ports/qtshadertools/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtshadertools",
-  "version": "6.4.3",
+  "version": "6.6.1",
   "description": "APIs and tools in this module provide the producer functionality for the shader pipeline that allows Qt Quick to operate on Vulkan, Metal, and Direct3D, in addition to OpenGL.",
   "homepage": "https://www.qt.io/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/qtspeech/portfile.cmake b/external_imported/vcpkg/ports/qtspeech/portfile.cmake
index 0fcc4e801..3b411aac0 100644
--- a/external_imported/vcpkg/ports/qtspeech/portfile.cmake
+++ b/external_imported/vcpkg/ports/qtspeech/portfile.cmake
@@ -22,6 +22,7 @@ qt_install_submodule(PATCHES    ${${PORT}_PATCHES}
                      TOOL_NAMES ${TOOL_NAMES}
                      CONFIGURE_OPTIONS
                         ${FEATURE_OPTIONS}
+                        -DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON
                      CONFIGURE_OPTIONS_MAYBE_UNUSED
                          QT_BUILD_EXAMPLES
                          QT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS
diff --git a/external_imported/vcpkg/ports/qtspeech/vcpkg.json b/external_imported/vcpkg/ports/qtspeech/vcpkg.json
index b369d40c4..33f4e84cb 100644
--- a/external_imported/vcpkg/ports/qtspeech/vcpkg.json
+++ b/external_imported/vcpkg/ports/qtspeech/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtspeech",
-  "version": "6.4.3",
+  "version": "6.6.1",
   "description": "Qt Speech support",
   "homepage": "https://www.qt.io/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/qtsvg/vcpkg.json b/external_imported/vcpkg/ports/qtsvg/vcpkg.json
index ff593dc7b..d78ce8975 100644
--- a/external_imported/vcpkg/ports/qtsvg/vcpkg.json
+++ b/external_imported/vcpkg/ports/qtsvg/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtsvg",
-  "version": "6.4.3",
+  "version": "6.6.1",
   "description": "Qt SVG",
   "homepage": "https://www.qt.io/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/qttools/devendor-litehtml.patch b/external_imported/vcpkg/ports/qttools/devendor-litehtml.patch
index 442244b62..ed3b43a15 100644
--- a/external_imported/vcpkg/ports/qttools/devendor-litehtml.patch
+++ b/external_imported/vcpkg/ports/qttools/devendor-litehtml.patch
@@ -54,3 +54,16 @@
    endif()
 -
 -endif()
+diff --git a/src/assistant/CMakeLists.txt b/src/assistant/CMakeLists.txt
+index 5d2bf2b67c..abd9b513d3 100644
+--- a/src/assistant/CMakeLists.txt
++++ b/src/assistant/CMakeLists.txt
+@@ -34,7 +34,7 @@ if(TARGET qlitehtml)
+     # but found in the system, because they are imported only to the subdirectory scope
+     # where find_package was called. But that's fine, we wouldn't be able to set compiler flags
+     # on them anyway.
+-    if(TARGET litehtml)
++    if(0)
+         qt_internal_set_exceptions_flags(litehtml OFF)
+         qt_disable_warnings(litehtml)
+     endif()
diff --git a/external_imported/vcpkg/ports/qttools/portfile.cmake b/external_imported/vcpkg/ports/qttools/portfile.cmake
index e42f50ef4..bb46599a6 100644
--- a/external_imported/vcpkg/ports/qttools/portfile.cmake
+++ b/external_imported/vcpkg/ports/qttools/portfile.cmake
@@ -98,9 +98,12 @@ if(VCPKG_TARGET_IS_OSX)
         list(APPEND OSX_APP_FOLDERS qdbusviewer.app)
     endif()
     foreach(_appfolder IN LISTS OSX_APP_FOLDERS)
-        message(STATUS "Moving: ${_appfolder}")
-        file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/${_appfolder}")
-        file(RENAME "${CURRENT_PACKAGES_DIR}/bin/${_appfolder}/" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/${_appfolder}/")
+        # Folders are only existing in case of native builds 
+        if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/${_appfolder}")
+            message(STATUS "Moving: ${_appfolder}")
+            file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/${_appfolder}")
+            file(RENAME "${CURRENT_PACKAGES_DIR}/bin/${_appfolder}/" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/${_appfolder}/")
+        endif()    
     endforeach()
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
diff --git a/external_imported/vcpkg/ports/qttools/vcpkg.json b/external_imported/vcpkg/ports/qttools/vcpkg.json
index 02dec9024..b7b032a03 100644
--- a/external_imported/vcpkg/ports/qttools/vcpkg.json
+++ b/external_imported/vcpkg/ports/qttools/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qttools",
-  "version": "6.4.3",
+  "version": "6.6.1",
   "description": "Qt Tools",
   "homepage": "https://www.qt.io/",
   "license": null,
@@ -76,7 +76,14 @@
     "qdoc": {
       "description": "Build QDoc.",
       "dependencies": [
-        "llvm"
+        {
+          "name": "llvm",
+          "default-features": false,
+          "features": [
+            "clang",
+            "enable-rtti"
+          ]
+        }
       ]
     },
     "qml": {
diff --git a/external_imported/vcpkg/ports/qttranslations/vcpkg.json b/external_imported/vcpkg/ports/qttranslations/vcpkg.json
index 7e7d5c682..43a325e5f 100644
--- a/external_imported/vcpkg/ports/qttranslations/vcpkg.json
+++ b/external_imported/vcpkg/ports/qttranslations/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qttranslations",
-  "version": "6.4.3",
+  "version": "6.6.1",
   "description": "Qt Translations",
   "homepage": "https://www.qt.io/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/qtvirtualkeyboard/portfile.cmake b/external_imported/vcpkg/ports/qtvirtualkeyboard/portfile.cmake
index bbe2bea69..555acfb95 100644
--- a/external_imported/vcpkg/ports/qtvirtualkeyboard/portfile.cmake
+++ b/external_imported/vcpkg/ports/qtvirtualkeyboard/portfile.cmake
@@ -8,11 +8,19 @@ if("hunspell" IN_LIST FEATURES)
 else()
     list(APPEND FEATURE_OPTIONS -DINPUT_vkb_hunspell=no)
 endif()
-if("t9write" IN_LIST FEATURES)
-    list(APPEND FEATURE_OPTIONS -DINPUT_vkb_handwriting=t9write)
-else()
-    list(APPEND FEATURE_OPTIONS -DINPUT_vkb_handwriting=no)
-endif()
+
+#
+# To use t9write, overlay this port with the following line changed to:
+# list(APPEND FEATURE_OPTIONS -DINPUT_vkb_handwriting=t9write)
+# and add t9write as a dependency.
+#
+list(APPEND FEATURE_OPTIONS 
+  -DINPUT_vkb_handwriting=no
+  -DCMAKE_DISABLE_FIND_PACKAGE_CerenceHwrAlphabetic:BOOL=ON
+  -DCMAKE_DISABLE_FIND_PACKAGE_CerenceHwrCjk:BOOL=ON
+  -DCMAKE_DISABLE_FIND_PACKAGE_CerenceXt9:BOOL=ON
+  -DCMAKE_DISABLE_FIND_PACKAGE_MyScript:BOOL=ON
+)
 
 qt_install_submodule(PATCHES    ${${PORT}_PATCHES}
                      CONFIGURE_OPTIONS ${FEATURE_OPTIONS}
diff --git a/external_imported/vcpkg/ports/qtvirtualkeyboard/vcpkg.json b/external_imported/vcpkg/ports/qtvirtualkeyboard/vcpkg.json
index 7709bdb2f..29d39ad09 100644
--- a/external_imported/vcpkg/ports/qtvirtualkeyboard/vcpkg.json
+++ b/external_imported/vcpkg/ports/qtvirtualkeyboard/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "qtvirtualkeyboard",
-  "version": "6.4.3",
-  "description": "SCXML (state machine notation) compiler and related tools",
+  "version": "6.6.1",
+  "description": "The Qt Virtual Keyboard project provides an input framework and reference keyboard frontend for Qt 6 on Linux Desktop/X11, Windows Desktop, and Boot2Qt targets.",
   "homepage": "https://www.qt.io/",
   "license": null,
   "dependencies": [
@@ -34,12 +34,6 @@
       "dependencies": [
         "hunspell"
       ]
-    },
-    "t9write": {
-      "description": "T9Write handwriting (commercial SDK requires port overlay)",
-      "dependencies": [
-        "t9write"
-      ]
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/qtwayland/vcpkg.json b/external_imported/vcpkg/ports/qtwayland/vcpkg.json
index 62a197ac2..0b9c61bea 100644
--- a/external_imported/vcpkg/ports/qtwayland/vcpkg.json
+++ b/external_imported/vcpkg/ports/qtwayland/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtwayland",
-  "version": "6.4.3",
+  "version": "6.6.1",
   "description": "A toolbox for making Qt based Wayland compositors",
   "homepage": "https://www.qt.io/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/qtwebchannel/vcpkg.json b/external_imported/vcpkg/ports/qtwebchannel/vcpkg.json
index 5531260cb..c9e5cd166 100644
--- a/external_imported/vcpkg/ports/qtwebchannel/vcpkg.json
+++ b/external_imported/vcpkg/ports/qtwebchannel/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtwebchannel",
-  "version": "6.4.3",
+  "version": "6.6.1",
   "description": "Qt WebChannel",
   "homepage": "https://www.qt.io/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/qtwebengine/clang-cl.patch b/external_imported/vcpkg/ports/qtwebengine/clang-cl.patch
new file mode 100644
index 000000000..03c87b84d
--- /dev/null
+++ b/external_imported/vcpkg/ports/qtwebengine/clang-cl.patch
@@ -0,0 +1,24 @@
+diff --git a/src/3rdparty/gn/build/build_win.ninja.template b/src/3rdparty/gn/build/build_win.ninja.template
+index 7d2704c..b14186b 100644
+--- a/src/3rdparty/gn/build/build_win.ninja.template
++++ b/src/3rdparty/gn/build/build_win.ninja.template
+@@ -8,5 +8,5 @@ rule alink_thin
+   description = LIB $out
+ 
+ rule link
+-  command = $ld /nologo $in /link $ldflags /PDB:$out.pdb /OUT:$out $solibs $libs
++  command = $ld /nologo $in $ldflags /PDB:$out.pdb /OUT:$out $solibs $libs
+   description = LINK $out
+diff --git a/src/gn/CMakeLists.txt b/src/gn/CMakeLists.txt
+index 0fe3e4e..1e2556f 100644
+--- a/src/gn/CMakeLists.txt
++++ b/src/gn/CMakeLists.txt
+@@ -31,7 +31,7 @@ find_package(Ninja 1.7.2 REQUIRED)
+ 
+ if(WIN32)
+     set(GN_EXECUTABLE gn.exe)
+-    if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT MINGW)
++    if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT MINGW OR MSVC)
+         # Use lld-link instead of clang-cl.
+         set(GN_LINKER ${CMAKE_LINKER})
+     endif()
diff --git a/external_imported/vcpkg/ports/qtwebengine/msvc-template.patch b/external_imported/vcpkg/ports/qtwebengine/msvc-template.patch
new file mode 100644
index 000000000..90dc0320a
--- /dev/null
+++ b/external_imported/vcpkg/ports/qtwebengine/msvc-template.patch
@@ -0,0 +1,140 @@
+diff --git a/src/3rdparty/chromium/third_party/webrtc/rtc_base/checks.h b/src/3rdparty/chromium/third_party/webrtc/rtc_base/checks.h
+index 459c6a5..4bc8da8 100644
+--- a/src/3rdparty/chromium/third_party/webrtc/rtc_base/checks.h
++++ b/src/3rdparty/chromium/third_party/webrtc/rtc_base/checks.h
+@@ -224,76 +224,27 @@ ToStringVal MakeVal(const T& x) {
+ template <typename... Ts>
+ class LogStreamer;
+ 
+-// Base case: Before the first << argument.
+-template <>
+-class LogStreamer<> final {
+- public:
+-  template <typename U,
+-            typename V = decltype(MakeVal(std::declval<U>())),
+-            absl::enable_if_t<std::is_arithmetic<U>::value ||
+-                              std::is_enum<U>::value>* = nullptr>
+-  RTC_FORCE_INLINE LogStreamer<V> operator<<(U arg) const {
+-    return LogStreamer<V>(MakeVal(arg), this);
+-  }
+-
+-  template <typename U,
+-            typename V = decltype(MakeVal(std::declval<U>())),
+-            absl::enable_if_t<!std::is_arithmetic<U>::value &&
+-                              !std::is_enum<U>::value>* = nullptr>
+-  RTC_FORCE_INLINE LogStreamer<V> operator<<(const U& arg) const {
+-    return LogStreamer<V>(MakeVal(arg), this);
+-  }
+-
+-#if RTC_CHECK_MSG_ENABLED
+-  template <typename... Us>
+-  RTC_NORETURN RTC_FORCE_INLINE static void Call(const char* file,
+-                                                 const int line,
+-                                                 const char* message,
+-                                                 const Us&... args) {
+-    static constexpr CheckArgType t[] = {Us::Type()..., CheckArgType::kEnd};
+-    FatalLog(file, line, message, t, args.GetVal()...);
+-  }
+-
+-  template <typename... Us>
+-  RTC_NORETURN RTC_FORCE_INLINE static void CallCheckOp(const char* file,
+-                                                        const int line,
+-                                                        const char* message,
+-                                                        const Us&... args) {
+-    static constexpr CheckArgType t[] = {CheckArgType::kCheckOp, Us::Type()...,
+-                                         CheckArgType::kEnd};
+-    FatalLog(file, line, message, t, args.GetVal()...);
+-  }
+-#else
+-  template <typename... Us>
+-  RTC_NORETURN RTC_FORCE_INLINE static void Call(const char* file,
+-                                                 const int line) {
+-    FatalLog(file, line);
+-  }
+-#endif
+-};
+ 
+ // Inductive case: We've already seen at least one << argument. The most recent
+ // one had type `T`, and the earlier ones had types `Ts`.
+ template <typename T, typename... Ts>
+ class LogStreamer<T, Ts...> final {
+  public:
+-  RTC_FORCE_INLINE LogStreamer(T arg, const LogStreamer<Ts...>* prior)
++  RTC_FORCE_INLINE LogStreamer(T arg, const LogStreamer<Ts...> * const prior)
+       : arg_(arg), prior_(prior) {}
+ 
+   template <typename U,
+-            typename V = decltype(MakeVal(std::declval<U>())),
+             absl::enable_if_t<std::is_arithmetic<U>::value ||
+                               std::is_enum<U>::value>* = nullptr>
+-  RTC_FORCE_INLINE LogStreamer<V, T, Ts...> operator<<(U arg) const {
+-    return LogStreamer<V, T, Ts...>(MakeVal(arg), this);
++  RTC_FORCE_INLINE auto operator<<(U arg) const {
++    return LogStreamer<decltype(MakeVal(arg)), T, Ts...>(MakeVal(arg), this);
+   }
+ 
+   template <typename U,
+-            typename V = decltype(MakeVal(std::declval<U>())),
+             absl::enable_if_t<!std::is_arithmetic<U>::value &&
+                               !std::is_enum<U>::value>* = nullptr>
+-  RTC_FORCE_INLINE LogStreamer<V, T, Ts...> operator<<(const U& arg) const {
+-    return LogStreamer<V, T, Ts...>(MakeVal(arg), this);
++  RTC_FORCE_INLINE auto operator<<(const U& arg) const {
++    return LogStreamer<decltype(MakeVal(arg)), T, Ts...>(MakeVal(arg), this);
+   }
+ 
+ #if RTC_CHECK_MSG_ENABLED
+@@ -328,6 +279,53 @@ class LogStreamer<T, Ts...> final {
+   const LogStreamer<Ts...>* prior_;
+ };
+ 
++
++// Base case: Before the first << argument.
++template <>
++class LogStreamer<> final {
++ public:
++  template <typename U,
++            absl::enable_if_t<std::is_arithmetic<U>::value ||
++                              std::is_enum<U>::value>* = nullptr>
++  RTC_FORCE_INLINE auto operator<<(U arg) const {
++    return LogStreamer<decltype(MakeVal(arg))>(MakeVal(arg), this);
++  }
++
++  template <typename U,
++            absl::enable_if_t<!std::is_arithmetic<U>::value &&
++                              !std::is_enum<U>::value>* = nullptr>
++  RTC_FORCE_INLINE auto operator<<(const U& arg) const {
++    return LogStreamer<decltype(MakeVal(arg))>(MakeVal(arg), this);
++  }
++
++#if RTC_CHECK_MSG_ENABLED
++  template <typename... Us>
++  RTC_NORETURN RTC_FORCE_INLINE static void Call(const char* file,
++                                                 const int line,
++                                                 const char* message,
++                                                 const Us&... args) {
++    static constexpr CheckArgType t[] = {Us::Type()..., CheckArgType::kEnd};
++    FatalLog(file, line, message, t, args.GetVal()...);
++  }
++
++  template <typename... Us>
++  RTC_NORETURN RTC_FORCE_INLINE static void CallCheckOp(const char* file,
++                                                        const int line,
++                                                        const char* message,
++                                                        const Us&... args) {
++    static constexpr CheckArgType t[] = {CheckArgType::kCheckOp, Us::Type()...,
++                                         CheckArgType::kEnd};
++    FatalLog(file, line, message, t, args.GetVal()...);
++  }
++#else
++  template <typename... Us>
++  RTC_NORETURN RTC_FORCE_INLINE static void Call(const char* file,
++                                                 const int line) {
++    FatalLog(file, line);
++  }
++#endif
++};
++
+ template <bool isCheckOp>
+ class FatalLogCall final {
+  public:
diff --git a/external_imported/vcpkg/ports/qtwebengine/portfile.cmake b/external_imported/vcpkg/ports/qtwebengine/portfile.cmake
index dbe7936ec..66d20d188 100644
--- a/external_imported/vcpkg/ports/qtwebengine/portfile.cmake
+++ b/external_imported/vcpkg/ports/qtwebengine/portfile.cmake
@@ -1,8 +1,10 @@
 set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
 include("${SCRIPT_PATH}/qt_install_submodule.cmake")
 
-set(${PORT}_PATCHES
-   )
+set(${PORT}_PATCHES 
+      "clang-cl.patch"
+      "msvc-template.patch"
+)
 
 set(TOOL_NAMES gn QtWebEngineProcess qwebengine_convert_dict)
 
@@ -30,7 +32,7 @@ set(deactivated_features   webengine_webrtc_pipewire)
 foreach(_feat IN LISTS deactivated_features)
     list(APPEND FEATURE_OPTIONS "-DFEATURE_${_feat}=OFF")
 endforeach()
-set(enabled_features  webengine_webrtc  webengine_v8_snapshot_support)
+set(enabled_features  webengine_webrtc)
 foreach(_feat IN LISTS enabled_features)
     list(APPEND FEATURE_OPTIONS "-DFEATURE_${_feat}=ON")
 endforeach()
@@ -63,8 +65,7 @@ vcpkg_add_to_path(PREPEND "${FLEX_DIR}")
 get_filename_component(BISON_DIR "${BISON}" DIRECTORY )
 vcpkg_add_to_path(PREPEND "${BISON_DIR}")
 
-vcpkg_find_acquire_program(PYTHON3)
-x_vcpkg_get_python_packages(PYTHON_EXECUTABLE "${PYTHON3}" PACKAGES html5lib)
+x_vcpkg_get_python_packages(PYTHON_VERSION "3" PACKAGES html5lib OUT_PYTHON_VAR PYTHON3)
 
 vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/gperf")
 set(GPERF "${CURRENT_HOST_INSTALLED_DIR}/tools/gperf/gperf${VCPKG_HOST_EXECUTABLE_SUFFIX}")
@@ -106,6 +107,8 @@ qt_cmake_configure( DISABLE_PARALLEL_CONFIGURE # due to in source changes.
                         -DBISON_EXECUTABLE=${BISON}
                         -DFLEX_EXECUTABLE=${FLEX}
                         -DNodejs_EXECUTABLE=${NODEJS}
+                        -DPython3_EXECUTABLE=${PYTHON3}
+                        -DQT_FEATURE_webengine_jumbo_build=0
                    OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG}
                    OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE})
 
diff --git a/external_imported/vcpkg/ports/qtwebengine/vcpkg.json b/external_imported/vcpkg/ports/qtwebengine/vcpkg.json
index e7bac0c5f..11800b39e 100644
--- a/external_imported/vcpkg/ports/qtwebengine/vcpkg.json
+++ b/external_imported/vcpkg/ports/qtwebengine/vcpkg.json
@@ -1,7 +1,8 @@
 {
   "$comment": "x86-windows is not within the upstream support matrix of Qt6",
   "name": "qtwebengine",
-  "version": "6.4.3",
+  "version": "6.6.1",
+  "port-version": 3,
   "description": "Qt WebEngine",
   "homepage": "https://www.qt.io/",
   "license": null,
@@ -57,6 +58,10 @@
     },
     {
       "name": "libxml2",
+      "default-features": false,
+      "features": [
+        "icu"
+      ],
       "platform": "!windows"
     },
     {
@@ -147,7 +152,10 @@
       "dependencies": [
         {
           "name": "qtwebchannel",
-          "default-features": false
+          "default-features": false,
+          "features": [
+            "qml"
+          ]
         }
       ]
     }
diff --git a/external_imported/vcpkg/ports/qtwebsockets/vcpkg.json b/external_imported/vcpkg/ports/qtwebsockets/vcpkg.json
index 7961411c0..f9112418d 100644
--- a/external_imported/vcpkg/ports/qtwebsockets/vcpkg.json
+++ b/external_imported/vcpkg/ports/qtwebsockets/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtwebsockets",
-  "version": "6.4.3",
+  "version": "6.6.1",
   "description": "Qt WebSockets",
   "homepage": "https://www.qt.io/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/qtwebview/portfile.cmake b/external_imported/vcpkg/ports/qtwebview/portfile.cmake
index 8a3f752c5..23218658c 100644
--- a/external_imported/vcpkg/ports/qtwebview/portfile.cmake
+++ b/external_imported/vcpkg/ports/qtwebview/portfile.cmake
@@ -6,17 +6,13 @@ set(${PORT}_PATCHES)
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
 FEATURES
-    "qml"           CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick
-    "qml"           CMAKE_REQUIRE_FIND_PACKAGE_Qt6WebEngineQuick
     "webengine"     CMAKE_REQUIRE_FIND_PACKAGE_WebEngineCore
 INVERTED_FEATURES
-    "qml"           CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick
-    "qml"           CMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineQuick
     "webengine"     CMAKE_DISABLE_FIND_PACKAGE_WebEngineCore
 )
 
 qt_install_submodule(PATCHES    ${${PORT}_PATCHES}
-                     CONFIGURE_OPTIONS
+                     CONFIGURE_OPTIONS ${FEATURE_OPTIONS}
                      CONFIGURE_OPTIONS_RELEASE
                      CONFIGURE_OPTIONS_DEBUG
                     )
diff --git a/external_imported/vcpkg/ports/qtwebview/vcpkg.json b/external_imported/vcpkg/ports/qtwebview/vcpkg.json
index bc5b98cb6..4b8c019ea 100644
--- a/external_imported/vcpkg/ports/qtwebview/vcpkg.json
+++ b/external_imported/vcpkg/ports/qtwebview/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtwebview",
-  "version": "6.4.3",
+  "version": "6.6.1",
   "description": "Qt Web View",
   "homepage": "https://www.qt.io/",
   "license": null,
@@ -11,18 +11,13 @@
       "features": [
         "gui"
       ]
+    },
+    {
+      "name": "qtdeclarative",
+      "default-features": false
     }
   ],
   "features": {
-    "qml": {
-      "description": "Build QML imports",
-      "dependencies": [
-        {
-          "name": "qtdeclarative",
-          "default-features": false
-        }
-      ]
-    },
     "webengine": {
       "description": "Build with Webengine",
       "supports": "!static",
diff --git a/external_imported/vcpkg/ports/quantlib/portfile.cmake b/external_imported/vcpkg/ports/quantlib/portfile.cmake
index d55a72930..a18336ffe 100644
--- a/external_imported/vcpkg/ports/quantlib/portfile.cmake
+++ b/external_imported/vcpkg/ports/quantlib/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO lballabio/QuantLib
-    REF QuantLib-v1.29
-    SHA512 0610e666943f29f4fcf6188f2673837a24da749c2071f2463667bfef67262aba6425612db82d9f0553f7717dc7b8214e01dfafcf29145510d39a9e2024a749fc
+    REF "v${VERSION}"
+    SHA512 d67d103ae1affcb9a6baa66b767377ffe22cd3ce308709ada261e0775bdb5bb64471801db75ca78108f3ae5b0c0178c1bfe2ed119f82b7d4f8f3715fdd64aef3
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/quantlib/vcpkg.json b/external_imported/vcpkg/ports/quantlib/vcpkg.json
index 8c6d48583..9724eac10 100644
--- a/external_imported/vcpkg/ports/quantlib/vcpkg.json
+++ b/external_imported/vcpkg/ports/quantlib/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "quantlib",
-  "version": "1.29",
+  "version": "1.33",
   "description": "The QuantLib C++ library",
   "homepage": "https://www.quantlib.org/",
   "license": "BSD-3-Clause",
@@ -10,6 +10,7 @@
     "boost-algorithm",
     "boost-any",
     "boost-assert",
+    "boost-bimap",
     "boost-bind",
     "boost-config",
     "boost-core",
diff --git a/external_imported/vcpkg/ports/quaternions/vcpkg.json b/external_imported/vcpkg/ports/quaternions/vcpkg.json
index b6d8b22e2..d4a51b77f 100644
--- a/external_imported/vcpkg/ports/quaternions/vcpkg.json
+++ b/external_imported/vcpkg/ports/quaternions/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "quaternions",
-  "version-string": "1.0.0",
-  "port-version": 1,
+  "version": "1.0.0",
+  "port-version": 2,
   "description": "A C++11 library to work with quaternions, as a single header file.",
   "homepage": "https://github.com/ferd36/quaternions",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/quazip/portfile.cmake b/external_imported/vcpkg/ports/quazip/portfile.cmake
index eb56b1f41..d2f0769cb 100644
--- a/external_imported/vcpkg/ports/quazip/portfile.cmake
+++ b/external_imported/vcpkg/ports/quazip/portfile.cmake
@@ -1,22 +1,29 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO stachenov/quazip
-    REF v1.3
-    SHA512 3861a9084059576ff2690e8b911394b0286a60542ab021a4cc588537a60ea3a186ed7903c76544698001fa383dfd0de96bdfed433abaefc44158d3b30ab16fe2
+    REF v1.4
+    SHA512 38ce3aa77df1fd92229454e56b7290c066d1e319afa36a9f8ec8477004ae94df682e8f454f13cdaf586a1d0b0e033fe698081033a19536ecd53dd1e4b0204af9
+)
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        bzip2 QUAZIP_BZIP2
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        ${FEATURE_OPTIONS}
+        -DQUAZIP_QT_MAJOR_VERSION=6
+        -DQUAZIP_FETCH_LIBS=OFF
 )
 
 vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/QuaZip-Qt5-1.3 PACKAGE_NAME quazip-qt5)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/QuaZip-Qt6-1.4 PACKAGE_NAME quazip-qt6)
 vcpkg_copy_pdbs()
-if(VCPKG_TARGET_IS_WINDOWS)
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
-else()
-    vcpkg_fixup_pkgconfig()
-endif()
+# Qt6 pkg-config files not installed https://github.com/microsoft/vcpkg/issues/25988
+# vcpkg_fixup_pkgconfig()
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/" RENAME copyright)
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/quazip/vcpkg.json b/external_imported/vcpkg/ports/quazip/vcpkg.json
index 24b51fcbd..5a144c8a6 100644
--- a/external_imported/vcpkg/ports/quazip/vcpkg.json
+++ b/external_imported/vcpkg/ports/quazip/vcpkg.json
@@ -1,12 +1,20 @@
 {
   "name": "quazip",
-  "version": "1.3",
-  "port-version": 2,
+  "version": "1.4",
+  "port-version": 1,
   "description": "Qt/C++ wrapper over minizip",
   "homepage": "https://stachenov.github.io/quazip/",
   "license": "LGPL-2.1-or-later",
+  "supports": "!xbox",
   "dependencies": [
-    "qt5-base",
+    {
+      "name": "qt5compat",
+      "default-features": false
+    },
+    {
+      "name": "qtbase",
+      "default-features": false
+    },
     {
       "name": "vcpkg-cmake",
       "host": true
@@ -16,5 +24,13 @@
       "host": true
     },
     "zlib"
-  ]
+  ],
+  "features": {
+    "bzip2": {
+      "description": "BZIP2 compression",
+      "dependencies": [
+        "bzip2"
+      ]
+    }
+  }
 }
diff --git a/external_imported/vcpkg/ports/quickfast/CMakeLists.txt b/external_imported/vcpkg/ports/quickfast/CMakeLists.txt
index 2464b6a25..65803d5d7 100644
--- a/external_imported/vcpkg/ports/quickfast/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/quickfast/CMakeLists.txt
@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 3.13)
 project(quickfast CXX)
 
+set(CMAKE_CXX_STANDARD 11) # Boost v1.84.0 libraries require C++11
+
 option(BUILD_SHARED_LIBS "Build shared instead of static library" ON)
 
 find_package(Boost REQUIRED COMPONENTS thread)
diff --git a/external_imported/vcpkg/ports/quickfast/vcpkg.json b/external_imported/vcpkg/ports/quickfast/vcpkg.json
index 217a3b2ec..2e4b45b27 100644
--- a/external_imported/vcpkg/ports/quickfast/vcpkg.json
+++ b/external_imported/vcpkg/ports/quickfast/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "quickfast",
   "version": "1.5",
-  "port-version": 3,
+  "port-version": 4,
   "description": "QuickFAST is an Open Source native C++ implementation of the FAST Protocol [SM].",
   "homepage": "https://github.com/objectcomputing/quickfast",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/quickfix/00001-fix-build.patch b/external_imported/vcpkg/ports/quickfix/00001-fix-build.patch
index ddbd6186f..27c09096b 100644
--- a/external_imported/vcpkg/ports/quickfix/00001-fix-build.patch
+++ b/external_imported/vcpkg/ports/quickfix/00001-fix-build.patch
@@ -75,7 +75,7 @@ index 0aa2cd3e..2829e110 100644
  #endif
  
 +#ifdef __cpp_noexcept_function_type
-+#define QUICKFIX_THROW(...) noexcept(false)
++#define QUICKFIX_THROW(...) noexcept
 +#else
 +#define QUICKFIX_THROW(...) throw(__VA_ARGS__)
 +#endif
diff --git a/external_imported/vcpkg/ports/quickfix/vcpkg.json b/external_imported/vcpkg/ports/quickfix/vcpkg.json
index 748140573..5ee3acb46 100644
--- a/external_imported/vcpkg/ports/quickfix/vcpkg.json
+++ b/external_imported/vcpkg/ports/quickfix/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "quickfix",
   "version": "1.15.1",
-  "port-version": 8,
+  "port-version": 9,
   "description": "QuickFIX is a free and open source implementation of the FIX protocol.",
   "homepage": "https://github.com/quickfix/quickfix",
   "supports": "!uwp & !(osx & arm64)",
diff --git a/external_imported/vcpkg/ports/quill/portfile.cmake b/external_imported/vcpkg/ports/quill/portfile.cmake
index 9e9586fbe..528e416db 100644
--- a/external_imported/vcpkg/ports/quill/portfile.cmake
+++ b/external_imported/vcpkg/ports/quill/portfile.cmake
@@ -1,18 +1,22 @@
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-vcpkg_minimum_required(VERSION 2022-11-10)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO odygrd/quill
     REF v${VERSION}
-    SHA512 2205c74e1e1160b1be925f45f956bb35a0339a62deb66640f9ad9d54f7f5461298cc958d67cfd3c09466d7bd8f6a7965829dfb3d2f94d87d4ec1dfe6849cdc1d
+    SHA512 65aa38c0c279916b6a861587834deff393fd2d7bdbcdc9b91de922a72e90d813581db20a822d47c3c4ee2c46da09a10ed4020d06fc2bf456c54e1469f3ce66ef
     HEAD_REF master
 )
 
+if(VCPKG_TARGET_IS_ANDROID)
+    set(ADDITIONAL_OPTIONS -DQUILL_NO_THREAD_NAME_SUPPORT=ON)
+endif()
+
 vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS
         -DQUILL_FMT_EXTERNAL=ON
+        ${ADDITIONAL_OPTIONS}
 )
 
 vcpkg_cmake_install()
@@ -29,6 +33,9 @@ endif()
 vcpkg_fixup_pkgconfig()
 
 vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quill/TweakMe.h" "// #define QUILL_FMT_EXTERNAL" "#define QUILL_FMT_EXTERNAL")
+if(VCPKG_TARGET_IS_ANDROID)
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quill/TweakMe.h" "// #define QUILL_NO_THREAD_NAME_SUPPORT" "#define QUILL_NO_THREAD_NAME_SUPPORT")
+endif()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/quill/vcpkg.json b/external_imported/vcpkg/ports/quill/vcpkg.json
index 5dcfa8ca9..711981f2c 100644
--- a/external_imported/vcpkg/ports/quill/vcpkg.json
+++ b/external_imported/vcpkg/ports/quill/vcpkg.json
@@ -1,10 +1,9 @@
 {
   "name": "quill",
-  "version": "2.7.0",
+  "version": "3.6.0",
   "description": "C++14 Asynchronous Low Latency Logging Library",
   "homepage": "https://github.com/odygrd/quill/",
   "license": "MIT",
-  "supports": "!android",
   "dependencies": [
     "fmt",
     {
diff --git a/external_imported/vcpkg/ports/qwt/portfile.cmake b/external_imported/vcpkg/ports/qwt/portfile.cmake
index d11f7da0f..60ee82f87 100644
--- a/external_imported/vcpkg/ports/qwt/portfile.cmake
+++ b/external_imported/vcpkg/ports/qwt/portfile.cmake
@@ -1,32 +1,33 @@
-vcpkg_from_git(
-    OUT_SOURCE_PATH SOURCE_PATH
-    URL "https://git.code.sf.net/p/qwt/git"
-    REF "06d6822b595b70c9fd567a4fe0d835759bf271fe"
-    FETCH_REF qwt-6.2
-    PATCHES 
-        config.patch
-        fix_dll_install.patch
-)
-
-string(COMPARE EQUAL  "${VCPKG_LIBRARY_LINKAGE}" "dynamic" IS_DYNAMIC)
-set(OPTIONS "")
-if(IS_DYNAMIC)
-    set(OPTIONS "QWT_CONFIG+=QwtDll")
-endif()
-vcpkg_qmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    QMAKE_OPTIONS
-        ${OPTIONS}
-        "CONFIG-=debug_and_release"
-        "CONFIG+=create_prl"
-        "CONFIG+=link_prl"
-)
-vcpkg_qmake_install()
-vcpkg_copy_pdbs()
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
-endif()
-
-# Handle copyright
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_from_git(
+    OUT_SOURCE_PATH SOURCE_PATH
+    URL "https://git.code.sf.net/p/qwt/git"
+    REF "907846e0e981b216349156ee83b13208faae2934"
+    FETCH_REF qwt-6.2
+    PATCHES
+        config.patch
+        fix_dll_install.patch
+)
+
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" IS_DYNAMIC)
+set(OPTIONS "")
+if(IS_DYNAMIC)
+    list(APPEND OPTIONS "QWT_CONFIG+=QwtDll")
+endif()
+vcpkg_qmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    QMAKE_OPTIONS
+        ${OPTIONS}
+        "CONFIG-=debug_and_release"
+        "CONFIG+=create_prl"
+        "CONFIG+=link_prl"
+)
+vcpkg_qmake_install()
+vcpkg_copy_pdbs()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/unofficial-qwt-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-qwt")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/qwt/unofficial-qwt-config.cmake b/external_imported/vcpkg/ports/qwt/unofficial-qwt-config.cmake
new file mode 100644
index 000000000..c04a5ebe8
--- /dev/null
+++ b/external_imported/vcpkg/ports/qwt/unofficial-qwt-config.cmake
@@ -0,0 +1,48 @@
+include(CMakeFindDependencyMacro)
+
+if(NOT TARGET unofficial::qwt::qwt)
+    find_dependency(Qt6 COMPONENTS Core Gui Widgets Svg OpenGL Concurrent PrintSupport OpenGLWidgets)
+
+    find_file(qwt_LIBRARY_RELEASE_DLL NAMES qwt.dll PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin" NO_DEFAULT_PATH)
+    find_file(qwt_LIBRARY_DEBUG_DLL NAMES qwtd.dll PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/bin" NO_DEFAULT_PATH)
+
+    if(EXISTS "${qwt_LIBRARY_RELEASE_DLL}")
+        add_library(unofficial::qwt::qwt SHARED IMPORTED)
+        set_target_properties(unofficial::qwt::qwt PROPERTIES INTERFACE_COMPILE_DEFINITIONS QWT_DLL)
+        set_property(TARGET unofficial::qwt::qwt APPEND PROPERTY IMPORTED_CONFIGURATIONS "Release")
+        find_library(qwt_LIBRARY_RELEASE NAMES qwt PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH REQUIRED)
+        set_target_properties(unofficial::qwt::qwt PROPERTIES IMPORTED_IMPLIB_RELEASE "${qwt_LIBRARY_RELEASE}")
+        set_target_properties(unofficial::qwt::qwt PROPERTIES IMPORTED_LOCATION_RELEASE "${qwt_LIBRARY_RELEASE_DLL}")
+        if(EXISTS "${qwt_LIBRARY_DEBUG_DLL}")
+            set_property(TARGET unofficial::qwt::qwt APPEND PROPERTY IMPORTED_CONFIGURATIONS "Debug")
+            find_library(qwt_LIBRARY_DEBUG NAMES qwtd PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH REQUIRED)
+            set_target_properties(unofficial::qwt::qwt PROPERTIES IMPORTED_IMPLIB_DEBUG "${qwt_LIBRARY_DEBUG}")
+            set_target_properties(unofficial::qwt::qwt PROPERTIES IMPORTED_LOCATION_DEBUG "${qwt_LIBRARY_DEBUG_DLL}")
+        endif()
+    else()
+        add_library(unofficial::qwt::qwt UNKNOWN IMPORTED)
+        find_library(qwt_LIBRARY_RELEASE NAMES qwt PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH)
+        if(EXISTS "${qwt_LIBRARY_RELEASE}")
+            set_property(TARGET unofficial::qwt::qwt APPEND PROPERTY IMPORTED_CONFIGURATIONS "Release")
+            set_target_properties(unofficial::qwt::qwt PROPERTIES IMPORTED_LOCATION_RELEASE "${qwt_LIBRARY_RELEASE}")
+        endif()
+        find_library(qwt_LIBRARY_DEBUG NAMES qwtd PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH)
+        if(EXISTS "${qwt_LIBRARY_DEBUG}")
+            set_property(TARGET unofficial::qwt::qwt APPEND PROPERTY IMPORTED_CONFIGURATIONS "Debug")
+            set_target_properties(unofficial::qwt::qwt PROPERTIES IMPORTED_LOCATION_DEBUG "${qwt_LIBRARY_DEBUG}")
+        endif()
+    endif()
+
+    set_target_properties(unofficial::qwt::qwt PROPERTIES
+        INTERFACE_INCLUDE_DIRECTORIES "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include"
+    )
+    target_link_libraries(unofficial::qwt::qwt
+        INTERFACE
+        Qt::Widgets
+        Qt::Svg
+        Qt::Concurrent
+        Qt::PrintSupport
+        Qt::OpenGL
+        Qt::OpenGLWidgets
+    )
+endif()
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/qwt/vcpkg.json b/external_imported/vcpkg/ports/qwt/vcpkg.json
index 18b9a2e66..07b74bc8f 100644
--- a/external_imported/vcpkg/ports/qwt/vcpkg.json
+++ b/external_imported/vcpkg/ports/qwt/vcpkg.json
@@ -1,8 +1,7 @@
 {
   "name": "qwt",
-  "version": "6.2.0+20220616",
-  "port-version": 1,
-  "description": "qt widgets library for technical applications",
+  "version-date": "2023-05-12",
+  "description": "Widgets library for technical applications",
   "homepage": "https://sourceforge.net/projects/qwt",
   "license": null,
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/rabit/vcpkg.json b/external_imported/vcpkg/ports/rabit/vcpkg.json
index 49deccd64..a979746a6 100644
--- a/external_imported/vcpkg/ports/rabit/vcpkg.json
+++ b/external_imported/vcpkg/ports/rabit/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "rabit",
-  "version-string": "0.1",
-  "port-version": 4,
+  "version": "0.1",
+  "port-version": 5,
   "description": "rabit is a light weight library that provides a fault tolerant interface of Allreduce and Broadcast. It is designed to support easy implementations of distributed machine learning programs, many of which fall naturally under the Allreduce abstraction.",
   "homepage": "https://github.com/dmlc/rabit",
   "supports": "!uwp",
diff --git a/external_imported/vcpkg/ports/ragel/vcpkg.json b/external_imported/vcpkg/ports/ragel/vcpkg.json
index c829e5a05..cc6d62c38 100644
--- a/external_imported/vcpkg/ports/ragel/vcpkg.json
+++ b/external_imported/vcpkg/ports/ragel/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ragel",
-  "version-string": "6.10",
-  "port-version": 5,
+  "version": "6.10",
+  "port-version": 6,
   "description": "Ragel State Machine Compiler",
   "homepage": "https://www.colm.net/files/ragel",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/range-v3-vs2015/vcpkg.json b/external_imported/vcpkg/ports/range-v3-vs2015/vcpkg.json
index 289515dca..73f543efd 100644
--- a/external_imported/vcpkg/ports/range-v3-vs2015/vcpkg.json
+++ b/external_imported/vcpkg/ports/range-v3-vs2015/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "range-v3-vs2015",
-  "version-string": "20151130-vcpkg5",
-  "port-version": 1,
+  "version": "20151130-vcpkg5",
+  "port-version": 2,
   "description": "Range library for C++11/14/17.",
   "homepage": "https://github.com/Microsoft/Range-V3-VS2015"
 }
diff --git a/external_imported/vcpkg/ports/rapidfuzz/portfile.cmake b/external_imported/vcpkg/ports/rapidfuzz/portfile.cmake
index 45dced19f..fcd8d5afa 100644
--- a/external_imported/vcpkg/ports/rapidfuzz/portfile.cmake
+++ b/external_imported/vcpkg/ports/rapidfuzz/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO maxbachmann/rapidfuzz-cpp
-    REF 87ee0dd61289fa6d7d0d2b5716f5363ee6b38fb7 # rapidfuzz-1.8.0
-    SHA512 c1d7c69a291e381453ccad4053353c75fa94288e850183f0b133f617e2b77cae80c9989753fed236e196eb445d821af5dd7e329acbe4994d5a96ab1318af9cf9
+    REF "v${VERSION}"
+    SHA512 02af141b123545303d634ffe84fbe83e635f06c9ffa3a6506661e53beb22fe7221942b3e46d33b2a49ef929c5de9acfb00c48cb5685c760506c5fcf37c716f9a
     HEAD_REF master
 )
 
@@ -15,4 +15,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/")
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/rapidfuzz/vcpkg.json b/external_imported/vcpkg/ports/rapidfuzz/vcpkg.json
index 2a095b98d..71e6d3e76 100644
--- a/external_imported/vcpkg/ports/rapidfuzz/vcpkg.json
+++ b/external_imported/vcpkg/ports/rapidfuzz/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "rapidfuzz",
-  "version": "1.8.0",
+  "version": "2.0.0",
   "description": "Rapid fuzzy string matching library for C++17 using the Levenshtein Distance.",
   "homepage": "https://github.com/maxbachmann/rapidfuzz-cpp",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/rapidjson/portfile.cmake b/external_imported/vcpkg/ports/rapidjson/portfile.cmake
index 232fe2203..698fe0d54 100644
--- a/external_imported/vcpkg/ports/rapidjson/portfile.cmake
+++ b/external_imported/vcpkg/ports/rapidjson/portfile.cmake
@@ -2,8 +2,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Tencent/rapidjson
-    REF 232389d4f1012dddec4ef84861face2d2ba85709 # accessed on 2022-06-28
-    SHA512 0d7d751179abdaa6ebf6167d522651a2d13bc024d20c7e3f775c7397a8aab4cd866a6c91a55521ad7847e910822fcf982625c7308c74f5df663e6fd81336c9fc
+    REF a95e013b97ca6523f32da23f5095fcc9dd6067e5 # accessed on 2023-07-17
+    SHA512 19bf9a579df70cbeaf60c7ccf25c92c327bffe95b0df14f27f2132134d5bb214e98a45e021eb287c4790e301f84bb095e0bdb3c97f65a37fbeb254970d97c005
     FILE_DISAMBIGUATOR 2
     HEAD_REF master
 )
@@ -34,10 +34,11 @@ if(VCPKG_TARGET_IS_WINDOWS)
 endif()
 
 file(READ "${CURRENT_PACKAGES_DIR}/share/${PORT}/RapidJSONConfig.cmake" _contents)
+string(REPLACE "VERSION 3.0" "VERSION 3.5" _contents "${_contents}")
 string(REPLACE "\${RapidJSON_SOURCE_DIR}" "\${RapidJSON_CMAKE_DIR}/../.." _contents "${_contents}")
 string(REPLACE "set( RapidJSON_SOURCE_DIR \"${SOURCE_PATH}\")" "" _contents "${_contents}")
 string(REPLACE "set( RapidJSON_DIR \"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel\")" "" _contents "${_contents}")
 string(REPLACE "\${RapidJSON_CMAKE_DIR}/../../../include" "\${RapidJSON_CMAKE_DIR}/../../include" _contents "${_contents}")
 file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/RapidJSONConfig.cmake" "${_contents}\nset(RAPIDJSON_INCLUDE_DIRS \"\${RapidJSON_INCLUDE_DIRS}\")\n")
 
-file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/license.txt")
diff --git a/external_imported/vcpkg/ports/rapidjson/vcpkg.json b/external_imported/vcpkg/ports/rapidjson/vcpkg.json
index c62de944b..5d1579f29 100644
--- a/external_imported/vcpkg/ports/rapidjson/vcpkg.json
+++ b/external_imported/vcpkg/ports/rapidjson/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "rapidjson",
-  "version-date": "2022-06-28",
-  "port-version": 3,
+  "version-date": "2023-07-17",
+  "port-version": 1,
   "description": "A fast JSON parser/generator for C++ with both SAX/DOM style API <http://rapidjson.org/>",
   "homepage": "http://rapidjson.org/",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/rapidxml-ns/vcpkg.json b/external_imported/vcpkg/ports/rapidxml-ns/vcpkg.json
index a0422d1eb..4521213c0 100644
--- a/external_imported/vcpkg/ports/rapidxml-ns/vcpkg.json
+++ b/external_imported/vcpkg/ports/rapidxml-ns/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "rapidxml-ns",
-  "version-string": "1.13.2",
-  "port-version": 1,
+  "version": "1.13.2",
+  "port-version": 2,
   "description": "RapidXML with added XML namespaces support."
 }
diff --git a/external_imported/vcpkg/ports/rapidxml/vcpkg.json b/external_imported/vcpkg/ports/rapidxml/vcpkg.json
index d43ff6cf8..3b6225ce5 100644
--- a/external_imported/vcpkg/ports/rapidxml/vcpkg.json
+++ b/external_imported/vcpkg/ports/rapidxml/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "rapidxml",
-  "version-string": "1.13",
-  "port-version": 5,
+  "version": "1.13",
+  "port-version": 6,
   "description": "RapidXml is an attempt to create the fastest XML parser possible, while retaining useability, portability and reasonable W3C compatibility.",
   "homepage": "https://sourceforge.net/projects/rapidxml"
 }
diff --git a/external_imported/vcpkg/ports/rappture/include_functional.patch b/external_imported/vcpkg/ports/rappture/include_functional.patch
new file mode 100644
index 000000000..b3606d220
--- /dev/null
+++ b/external_imported/vcpkg/ports/rappture/include_functional.patch
@@ -0,0 +1,12 @@
+diff --git a/src/core/RpUnits.h b/src/core/RpUnits.h
+index a640205..e697424 100644
+--- a/src/core/RpUnits.h
++++ b/src/core/RpUnits.h
+@@ -59,6 +59,7 @@ enum RP_UNITS_CONSTS {
+ #include <stdlib.h>
+ #include <errno.h>
+ #include <math.h>
++#include <functional>
+ 
+ #include "RpDict.h"
+ #include "RpUnitsStd.h"
diff --git a/external_imported/vcpkg/ports/rappture/portfile.cmake b/external_imported/vcpkg/ports/rappture/portfile.cmake
index e79ec3085..7451fffa2 100644
--- a/external_imported/vcpkg/ports/rappture/portfile.cmake
+++ b/external_imported/vcpkg/ports/rappture/portfile.cmake
@@ -6,17 +6,18 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 3b42569d056c5e80762eada3aff23d230d4ba8f6f0078de44d8571a713dde91e31e66fe3c37ceb66e934a1410b338fb481aeb5a29ef56b53da4ad2e8a2a2ae59
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE ${ARCHIVE}
     PATCHES
-    "${CMAKE_CURRENT_LIST_DIR}/rappture.patch"
+        rappture.patch
+        include_functional.patch
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}
+    SOURCE_PATH "${SOURCE_PATH}"
 )
 
 vcpkg_cmake_install()
@@ -26,10 +27,6 @@ vcpkg_cmake_config_fixup()
 vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-file(
-    INSTALL ${SOURCE_PATH}/license.terms
-    DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
-    RENAME copyright
-)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/license.terms")
diff --git a/external_imported/vcpkg/ports/rappture/vcpkg.json b/external_imported/vcpkg/ports/rappture/vcpkg.json
index 65e4caed6..ab94b10d5 100644
--- a/external_imported/vcpkg/ports/rappture/vcpkg.json
+++ b/external_imported/vcpkg/ports/rappture/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "rappture",
   "version": "1.9",
-  "port-version": 2,
+  "port-version": 4,
   "description": "Rappture is a toolkit supporting Rapid application infrastructure, making it quick and easy to develop powerful scientific applications.",
   "license": null,
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/raygui/portfile.cmake b/external_imported/vcpkg/ports/raygui/portfile.cmake
index c02130aea..3c8297172 100644
--- a/external_imported/vcpkg/ports/raygui/portfile.cmake
+++ b/external_imported/vcpkg/ports/raygui/portfile.cmake
@@ -5,7 +5,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO raysan5/raygui
     REF "${VERSION}"
-    SHA512 09643f3661879a9130122351d0f9310f1ecde5dd1242d15f7b9c61e80dc9acfc3e6b85682ae7079c8579fd39340da8c5dfdea62aabc6cc72a966dea675ddfd38
+    SHA512 8e59889af6b6163b9ff9930ae79bdfaab5015e39279d1a50d3f74c0f50b12b2015fdf17016b04d2c4f66420f4e631b25a51ede5c1627dfcde269457f55f34ff1
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/raygui/vcpkg.json b/external_imported/vcpkg/ports/raygui/vcpkg.json
index 30e235142..42ad32a5f 100644
--- a/external_imported/vcpkg/ports/raygui/vcpkg.json
+++ b/external_imported/vcpkg/ports/raygui/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "raygui",
-  "version": "3.2",
+  "version": "4.0",
   "description": "A simple and easy-to-use immediate-mode gui library",
   "homepage": "https://github.com/raysan5/raylib",
   "license": "Zlib"
diff --git a/external_imported/vcpkg/ports/raylib/portfile.cmake b/external_imported/vcpkg/ports/raylib/portfile.cmake
index b1cf363de..abf586972 100644
--- a/external_imported/vcpkg/ports/raylib/portfile.cmake
+++ b/external_imported/vcpkg/ports/raylib/portfile.cmake
@@ -15,16 +15,17 @@ if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_LINUX)
 endif()
 
 if(VCPKG_TARGET_IS_EMSCRIPTEN)
-	set(ADDITIONAL_OPTIONS "-DPLATFORM=Web")
+    set(ADDITIONAL_OPTIONS "-DPLATFORM=Web")
 endif()
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO raysan5/raylib
-    REF ${VERSION}
-    SHA512 a959abbb577a8951251a469d6505093fd20988444dcf055e26cb0b484ef4024211b2cca45187accbd465c56bc50e02d450b6f7f7cfde2cdaedcdce422f80dcbc
+    REF "${VERSION}"
+    SHA512 5956bc1646b99baac6eb1652c4d72e96af874337158672155ba144f131de8a4fd19291a58335a92fcaaa2fc818682f93ff4230af0f815efb8b49f7d2a162e9b0
     HEAD_REF master
-    PATCHES ${patches}
+    PATCHES
+        ${patches}
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED)
@@ -59,6 +60,10 @@ vcpkg_cmake_configure(
         -DENABLE_ASAN=OFF
         -DENABLE_UBSAN=OFF
         -DENABLE_MSAN=OFF
+    MAYBE_UNUSED_VARIABLES
+        SHARED
+        STATIC
+        SUPPORT_HIGH_DPI
 )
 
 vcpkg_cmake_install()
@@ -81,4 +86,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     )
 endif()
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/raylib/vcpkg.json b/external_imported/vcpkg/ports/raylib/vcpkg.json
index d7f001464..ee0e96be2 100644
--- a/external_imported/vcpkg/ports/raylib/vcpkg.json
+++ b/external_imported/vcpkg/ports/raylib/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "raylib",
-  "version-semver": "4.5.0",
+  "version": "5.0",
   "description": "A simple and easy-to-use library to enjoy videogames programming",
   "homepage": "https://github.com/raysan5/raylib",
   "license": "Zlib",
-  "supports": "!(arm | uwp)",
+  "supports": "!uwp",
   "dependencies": [
     {
       "name": "glfw3",
diff --git a/external_imported/vcpkg/ports/rbdl/portfile.cmake b/external_imported/vcpkg/ports/rbdl/portfile.cmake
index 946c4873d..425c88d97 100644
--- a/external_imported/vcpkg/ports/rbdl/portfile.cmake
+++ b/external_imported/vcpkg/ports/rbdl/portfile.cmake
@@ -3,8 +3,8 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" RBDL_STATIC)
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO rbdl/rbdl
-  REF 6e92742d469efaf59ec2503882693b621f41eca8
-  SHA512 d266732fe50a4cd5c55f9ff838649157e48994744f39d9eda9feee640dd400a5bb35ca620386ca65c9f1cdcb1adc923c34809dcb025bd6fc052baa9df57a4a6f
+  REF 619175a441ba769ab1be34a727644f4dd13bf841
+  SHA512 0c6cd78c4385e582f481a6f92d5c3a01f5d3bcd3a7cc3417a504209dae1856d788157db8d9f4173493619f103dea323bd57ddae0bc63162d72b03031dae9a822
   HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/rbdl/vcpkg.json b/external_imported/vcpkg/ports/rbdl/vcpkg.json
index 600968792..04ed043c7 100644
--- a/external_imported/vcpkg/ports/rbdl/vcpkg.json
+++ b/external_imported/vcpkg/ports/rbdl/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "rbdl",
-  "version": "3.2.0",
-  "port-version": 4,
+  "version": "3.3.0",
+  "port-version": 5,
   "description": "Rigid Body Dynamics Library",
   "homepage": "https://github.com/rbdl/rbdl",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/re2/portfile.cmake b/external_imported/vcpkg/ports/re2/portfile.cmake
index ba8e115be..d56641bec 100644
--- a/external_imported/vcpkg/ports/re2/portfile.cmake
+++ b/external_imported/vcpkg/ports/re2/portfile.cmake
@@ -1,23 +1,23 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO google/re2
-    REF "${VERSION}"
-    SHA512 164953ae0cdd52efb0c327be3df8bb62532b37200e66adc3229c2dfdbd68cb794572559dbdf2d374e016c910a56712c88bbcca4caa683fdc55357af5716b1bf5
-    HEAD_REF master
-)
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS
-        -DRE2_BUILD_TESTING=OFF
-)
-
-vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
-vcpkg_fixup_pkgconfig()
-
-vcpkg_copy_pdbs()
-
-# Handle copyright
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO google/re2
+    REF "${VERSION}"
+    SHA512 b033bb38020947cce49f7fa27c711a49bd147a0286993852ed7fea6f653af5b2f48b8de9dae324596e44a1731e8747382a4151f6f5d44b1d92ce2748b83ca85c
+    HEAD_REF master
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DRE2_BUILD_TESTING=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
+vcpkg_fixup_pkgconfig()
+
+vcpkg_copy_pdbs()
+
+# Handle copyright
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/external_imported/vcpkg/ports/re2/vcpkg.json b/external_imported/vcpkg/ports/re2/vcpkg.json
index 15bc701a4..0e93b876d 100644
--- a/external_imported/vcpkg/ports/re2/vcpkg.json
+++ b/external_imported/vcpkg/ports/re2/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "re2",
-  "version-date": "2023-02-01",
+  "version-date": "2023-07-01",
   "description": "RE2 is a fast, safe, thread-friendly alternative to backtracking regular expression engines like those used in PCRE, Perl, and Python. It is a C++ library.",
   "homepage": "https://github.com/google/re2",
   "license": "BSD-3-Clause",
   "dependencies": [
+    "abseil",
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/external_imported/vcpkg/ports/reactiveplusplus/portfile.cmake b/external_imported/vcpkg/ports/reactiveplusplus/portfile.cmake
index 35ea57311..6b76b3d08 100644
--- a/external_imported/vcpkg/ports/reactiveplusplus/portfile.cmake
+++ b/external_imported/vcpkg/ports/reactiveplusplus/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO victimsnino/ReactivePlusPlus
-    REF v0.2.2
-    SHA512 86c374c7523c028528ce985f053901a1f0f37a18c2d16085a60fd5d0819ae052cc3d6bfe6065627044b51e65b24de93399be9ba6f0ca8ec92622358112f1c821
+    REF "v${VERSION}"
+    SHA512 b19a164bf19f787ca182f88a616317eea122b76fea9ab0b90b2fe05e30ab94a7540b33aef1156003141dd4b0bc30b41bf2dc224a8cbe31707ab111bcfd7a3c5b
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/reactiveplusplus/vcpkg.json b/external_imported/vcpkg/ports/reactiveplusplus/vcpkg.json
index db2a44a99..1a25ea568 100644
--- a/external_imported/vcpkg/ports/reactiveplusplus/vcpkg.json
+++ b/external_imported/vcpkg/ports/reactiveplusplus/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "reactiveplusplus",
-  "version": "0.2.2",
+  "version": "2.0.0",
   "description": "ReactivePlusPlus is reactive programming library for C++ language",
   "homepage": "https://github.com/victimsnino/ReactivePlusPlus",
   "license": "BSL-1.0",
diff --git a/external_imported/vcpkg/ports/readline-unix/8.2p1.diff b/external_imported/vcpkg/ports/readline-unix/8.2p1.diff
new file mode 100644
index 000000000..0cb8c9c5d
--- /dev/null
+++ b/external_imported/vcpkg/ports/readline-unix/8.2p1.diff
@@ -0,0 +1,24 @@
+diff --git a/nls.c b/nls.c
+index 5c6a13b..8c027d6 100644
+--- a/nls.c
++++ b/nls.c
+@@ -141,6 +141,10 @@ _rl_init_locale (void)
+   if (lspec == 0)
+     lspec = "";
+   ret = setlocale (LC_CTYPE, lspec);	/* ok, since it does not change locale */
++  if (ret == 0 || *ret == 0)
++    ret = setlocale (LC_CTYPE, (char *)NULL);
++  if (ret == 0 || *ret == 0)
++    ret = RL_DEFAULT_LOCALE;
+ #else
+   ret = (lspec == 0 || *lspec == 0) ? RL_DEFAULT_LOCALE : lspec;
+ #endif
+diff --git a/patchlevel b/patchlevel
+index d8c9df7..fdf4740 100644
+--- a/patchlevel
++++ b/patchlevel
+@@ -1,3 +1,3 @@
+ # Do not edit -- exists only for use by patch
+ 
+-0
++1
diff --git a/external_imported/vcpkg/ports/readline-unix/portfile.cmake b/external_imported/vcpkg/ports/readline-unix/portfile.cmake
index 68d50ff03..aca06be6a 100644
--- a/external_imported/vcpkg/ports/readline-unix/portfile.cmake
+++ b/external_imported/vcpkg/ports/readline-unix/portfile.cmake
@@ -1,4 +1,3 @@
-vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
 set(filename readline-${VERSION}.tar.gz)
 vcpkg_download_distfile(
     ARCHIVE
@@ -9,7 +8,11 @@ vcpkg_download_distfile(
     SHA512 0a451d459146bfdeecc9cdd94bda6a6416d3e93abd80885a40b334312f16eb890f8618a27ca26868cebbddf1224983e631b1cbc002c1a4d1cd0d65fba9fea49a
 )
 
-vcpkg_extract_source_archive(SOURCE_PATH ARCHIVE "${ARCHIVE}")
+vcpkg_extract_source_archive(SOURCE_PATH
+    ARCHIVE "${ARCHIVE}"
+    PATCHES
+        8.2p1.diff
+)
 
 vcpkg_configure_make(
     SOURCE_PATH "${SOURCE_PATH}"
@@ -21,7 +24,10 @@ vcpkg_configure_make(
 
 vcpkg_install_make()
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(REMOVE_RECURSE
+    "${CURRENT_PACKAGES_DIR}/debug/share"
+    "${CURRENT_PACKAGES_DIR}/tools"
+)
 
 vcpkg_fixup_pkgconfig()
 
diff --git a/external_imported/vcpkg/ports/readline-unix/vcpkg.json b/external_imported/vcpkg/ports/readline-unix/vcpkg.json
index 99e9f2142..ffdc931d8 100644
--- a/external_imported/vcpkg/ports/readline-unix/vcpkg.json
+++ b/external_imported/vcpkg/ports/readline-unix/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "readline-unix",
   "version": "8.2",
+  "port-version": 1,
   "description": "The GNU Readline library provides a set of functions for use by applications that allow users to edit command lines as they are typed in.",
   "homepage": "https://tiswww.case.edu/php/chet/readline/rltop.html",
   "license": "GPL-3.0-or-later",
diff --git a/external_imported/vcpkg/ports/readline-win32/CMakeLists.txt b/external_imported/vcpkg/ports/readline-win32/CMakeLists.txt
deleted file mode 100644
index ae560029d..000000000
--- a/external_imported/vcpkg/ports/readline-win32/CMakeLists.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-cmake_minimum_required(VERSION 3.0)
-project(readline C)
-
-add_definitions(-DREADLINE_LIBRARY)
-add_definitions(-DHAVE_CONFIG_H)
-add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-
-if(BUILD_SHARED_LIBS)
-    add_definitions(-DBUILD_READLINE_DLL)
-else()
-    add_definitions(-DREADLINE_STATIC)
-endif()
-
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR} # thats where the config.h is located
-)
-
-add_library(readline
-    readline.c
-    funmap.c
-    keymaps.c
-	vi_mode.c
-    parens.c
-    rltty.c
-    complete.c
-    bind.c
-    isearch.c
-    display.c
-    signals.c
-    util.c
-    kill.c
-	undo.c
-    macro.c
-    input.c
-	callback.c
-    terminal.c
-    xmalloc.c
-	history.c
-    histsearch.c
-    histexpand.c
-	histfile.c
-    nls.c
-    search.c
-	shell.c
-    savestring.c
-    tilde.c
-	text.c
-    misc.c
-    compat.c
-	mbutil.c
-    support/wcwidth.c)
-
-file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
-install(FILES ${headers} DESTINATION include/readline)
-
-target_include_directories(readline PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<INSTALL_INTERFACE:include>)
-
-install(TARGETS readline
-    EXPORT unofficial-readline-win32-config
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
-install(EXPORT unofficial-readline-win32-config
-    NAMESPACE unofficial::readline-win32::
-    DESTINATION share/unofficial-readline-win32)
diff --git a/external_imported/vcpkg/ports/readline-win32/config.h b/external_imported/vcpkg/ports/readline-win32/config.h
deleted file mode 100644
index de0a352fe..000000000
--- a/external_imported/vcpkg/ports/readline-win32/config.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#define RETSIGTYPE void
-#define VOID_SIGHANDLER 1
-#define PROTOTYPES 1
-#define HAVE_ISASCII 1
-#define HAVE_ISXDIGIT 1
-#define HAVE_MBRLEN 1
-#define HAVE_MBRTOWC 1
-#define HAVE_MBRTOWC 1
-#define HAVE_MBSRTOWCS 1
-#define HAVE_MEMMOVE 1
-#define HAVE_PUTENV 1
-#define HAVE_SETENV 1
-#define HAVE_SETLOCALE 1
-#define HAVE_STRCOLL 1
-#define STRCOLL_BROKEN 1
-#define HAVE_STRPBRK 1
-#define HAVE_TCGETATTR 1
-#define HAVE_VSNPRINTF 1
-#define HAVE_WCTOMB 1
-#define HAVE_WCWIDTH 1
-#define STDC_HEADERS 1
-#define HAVE_LANGINFO_H 1
-#define HAVE_LIMITS_H 1
-#define HAVE_LOCALE_H 1
-#define HAVE_MEMORY_H 1
-#define HAVE_STDARG_H 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STRING_H 1
-#define HAVE_TERMIOS_H 1
-#define HAVE_WCHAR_H 1
-#define HAVE_WCTYPE_H 1
-#define HAVE_MBSTATE_T 1
-#define HAVE_LANGINFO_CODESET 1
-#define VOID_SIGHANDLER 1
-#define STRUCT_WINSIZE_IN_SYS_IOCTL 1
-#define HAVE_GETPW_DECLS 1
-#define MUST_REINSTALL_SIGHANDLERS 1
-#define CTYPE_NON_ASCII 1
-
-/* Ultrix botches type-ahead when switching from canonical to
-   non-canonical mode, at least through version 4.3 */
-#if !defined (HAVE_TERMIOS_H) || !defined (HAVE_TCGETATTR) || defined (ultrix)
-#  define TERMIOS_MISSING
-#endif
-
-#if defined (STRCOLL_BROKEN)
-#  define HAVE_STRCOLL 1
-#endif
-
-#if defined (__STDC__) && defined (HAVE_STDARG_H)
-#  define PREFER_STDARG
-#  define USE_VARARGS
-#else
-#  if defined (HAVE_VARARGS_H)
-#    define PREFER_VARARGS
-#    define USE_VARARGS
-#  endif
-#endif
diff --git a/external_imported/vcpkg/ports/readline-win32/portfile.cmake b/external_imported/vcpkg/ports/readline-win32/portfile.cmake
index a3641df86..45fd95691 100644
--- a/external_imported/vcpkg/ports/readline-win32/portfile.cmake
+++ b/external_imported/vcpkg/ports/readline-win32/portfile.cmake
@@ -1,24 +1,28 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO lltcggie/readline
-    REF ea414b4e98475e3976198738061824e8a8379a50
-    SHA512 82d54ab3e19fb2673fe97eff07117d36704791669baa283ec737c704635f872e4c7cd30485a6648d445cb2912e4364286e664e9425444f456a4c862b9e4de843
+    REPO xiaozhuai/readline-win32
+    REF 2b94fbb51f5da90b7bbd9b236da80be6f798e014
+    SHA512 1285625ca6c608b98d13a783dd34461782bd88026bc09e6c9e70fd343e28561d1d7e5392b8068e52e93308029544276bdbc8ca12703c8976836561777a03dc17
     HEAD_REF master
 )
 
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}/src/readline/5.0/readline-5.0-src")
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/config.h" DESTINATION "${SOURCE_PATH}/src/readline/5.0/readline-5.0-src")
-
 vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}/src/readline/5.0/readline-5.0-src"
+    SOURCE_PATH "${SOURCE_PATH}"
 )
 
 vcpkg_cmake_install()
 
 vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-readline-win32)
+vcpkg_fixup_pkgconfig()
+
+if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/readline/rlstdc.h"
+        "defined(USE_READLINE_STATIC)" "1"
+    )
+endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/include")
 
 vcpkg_copy_pdbs()
 
-file(INSTALL "${SOURCE_PATH}/src/readline/5.0/readline-5.0-src/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/readline-win32/vcpkg.json b/external_imported/vcpkg/ports/readline-win32/vcpkg.json
index 61bf5f62a..e09abde7e 100644
--- a/external_imported/vcpkg/ports/readline-win32/vcpkg.json
+++ b/external_imported/vcpkg/ports/readline-win32/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "readline-win32",
   "version": "5.0",
-  "port-version": 5,
+  "port-version": 8,
   "description": "Implementation of readline for Windows Desktop",
-  "homepage": "https://github.com/lltcggie/readline",
-  "license": null,
+  "homepage": "https://github.com/xiaozhuai/readline-win32",
+  "license": "GPL-2.0",
   "supports": "windows & !uwp",
   "dependencies": [
     {
diff --git a/external_imported/vcpkg/ports/readline/portfile.cmake b/external_imported/vcpkg/ports/readline/portfile.cmake
index 45db4f37a..a9543d16b 100644
--- a/external_imported/vcpkg/ports/readline/portfile.cmake
+++ b/external_imported/vcpkg/ports/readline/portfile.cmake
@@ -3,3 +3,4 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
 endif()
 
 set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+FILE(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/readline/usage b/external_imported/vcpkg/ports/readline/usage
new file mode 100644
index 000000000..6127e2ac6
--- /dev/null
+++ b/external_imported/vcpkg/ports/readline/usage
@@ -0,0 +1,10 @@
+the package readline can be used under windows via:
+
+    find_package(unofficial-readline-win32 CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE unofficial::readline-win32::readline)
+
+The package readline can be imported via the CMake FindPkgConfig module:
+    
+    find_package(PkgConfig REQUIRED)
+    pkg_check_modules(readline REQUIRED IMPORTED_TARGET readline)
+    target_link_libraries(main PRIVATE PkgConfig::readline)
diff --git a/external_imported/vcpkg/ports/readline/vcpkg.json b/external_imported/vcpkg/ports/readline/vcpkg.json
index cc79a73bf..a021fe3b3 100644
--- a/external_imported/vcpkg/ports/readline/vcpkg.json
+++ b/external_imported/vcpkg/ports/readline/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "readline",
-  "version-string": "0",
-  "port-version": 3,
+  "version": "0",
+  "port-version": 5,
   "description": "GNU readline and history libraries",
   "supports": "!uwp",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/realsense2/fix-osx.patch b/external_imported/vcpkg/ports/realsense2/fix-osx.patch
new file mode 100644
index 000000000..e09756bcf
--- /dev/null
+++ b/external_imported/vcpkg/ports/realsense2/fix-osx.patch
@@ -0,0 +1,73 @@
+diff --git a/CMake/lrs_macros.cmake b/CMake/lrs_macros.cmake
+index b19a729049..cabb376c97 100644
+--- a/CMake/lrs_macros.cmake
++++ b/CMake/lrs_macros.cmake
+@@ -7,21 +7,10 @@ macro(infoValue variableName)
+ endmacro()
+ 
+ macro(config_cxx_flags)
+-    include(CheckCXXCompilerFlag)
+-    if(MSVC OR MSVC_IDE)
+-        check_cxx_compiler_flag(/std:c++14 SUPPORTS_CXX14)
+-    else()
+-        check_cxx_compiler_flag(-std=c++14 SUPPORTS_CXX14)
+-    endif()
+-    if( NOT SUPPORTS_CXX14 )
+-        message(FATAL_ERROR "Project '${PROJECT_NAME}' requires C++14 or higher")
+-    endif()
+-    if( NOT CMAKE_CXX_STANDARD )
+-        set( CMAKE_CXX_STANDARD 14 )
+-    endif()
+     # We require that the current project (e.g., librealsense) use C++14. However, projects using
+     # the library don't need to be C++14 -- they can use C++11. Hence this is PRIVATE and not PUBLIC:
+-    target_compile_features( ${PROJECT_NAME} PRIVATE cxx_std_${CMAKE_CXX_STANDARD} )
++    target_compile_features( ${PROJECT_NAME} PRIVATE cxx_std_14 )
++    target_compile_features( ${PROJECT_NAME} INTERFACE cxx_std_11 )
+     #set( CMAKE_CUDA_STANDARD ${LRS_CXX_STANDARD} )
+ endmacro()
+ 
+
+From b049865e918c44833c5f6ea293b5ae1ccdea99e2 Mon Sep 17 00:00:00 2001
+From: Leander Schulten <Leander.Schulten@rwth-aachen.de>
+Date: Mon, 17 Jul 2023 00:48:18 +0200
+Subject: [PATCH 2/3] rsutils: specify required c++ version
+
+---
+ third-party/rsutils/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/third-party/rsutils/CMakeLists.txt b/third-party/rsutils/CMakeLists.txt
+index f6a0e41141..b31e684c43 100644
+--- a/third-party/rsutils/CMakeLists.txt
++++ b/third-party/rsutils/CMakeLists.txt
+@@ -4,6 +4,7 @@ cmake_minimum_required(VERSION 3.8.0)  # source_group(TREE)
+ project( rsutils )
+ 
+ add_library( ${PROJECT_NAME} STATIC "" )
++target_compile_features( ${PROJECT_NAME} PUBLIC cxx_std_11 )
+ set_target_properties( ${PROJECT_NAME} PROPERTIES FOLDER Library )
+ 
+ target_include_directories( ${PROJECT_NAME}
+
+From eaa61985dd54e88e943fc433264b1161c4482593 Mon Sep 17 00:00:00 2001
+From: Leander Schulten <Leander.Schulten@rwth-aachen.de>
+Date: Mon, 17 Jul 2023 00:57:00 +0200
+Subject: [PATCH 3/3] realsense-file: specify required c++ version
+
+---
+ third-party/realsense-file/CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/third-party/realsense-file/CMakeLists.txt b/third-party/realsense-file/CMakeLists.txt
+index a805cddf8c..63c3526b1d 100644
+--- a/third-party/realsense-file/CMakeLists.txt
++++ b/third-party/realsense-file/CMakeLists.txt
+@@ -27,6 +27,8 @@ add_library(${PROJECT_NAME} STATIC
+     ${SOURCE_FILES_COMPRESSION}
+ )
+ 
++target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_11)
++
+ target_include_directories(${PROJECT_NAME} PRIVATE
+         ${ROSBAG_HEADER_DIRS}
+         ${LZ4_INCLUDE_PATH}
diff --git a/external_imported/vcpkg/ports/realsense2/fix_config_osx.patch b/external_imported/vcpkg/ports/realsense2/fix_config_osx.patch
deleted file mode 100644
index d96f4bea5..000000000
--- a/external_imported/vcpkg/ports/realsense2/fix_config_osx.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/CMake/unix_config.cmake b/CMake/unix_config.cmake
-index 3e5929b..57dbe76 100644
---- a/CMake/unix_config.cmake
-+++ b/CMake/unix_config.cmake
-@@ -35,7 +35,6 @@ macro(os_set_flags)
-     
-     if(APPLE)
-         set(FORCE_RSUSB_BACKEND ON)
--        set(BUILD_WITH_TM2 ON)
-     endif()
-     
-     if(FORCE_RSUSB_BACKEND)
diff --git a/external_imported/vcpkg/ports/realsense2/portfile.cmake b/external_imported/vcpkg/ports/realsense2/portfile.cmake
index 149cdd6ba..f5899614c 100644
--- a/external_imported/vcpkg/ports/realsense2/portfile.cmake
+++ b/external_imported/vcpkg/ports/realsense2/portfile.cmake
@@ -1,12 +1,12 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO IntelRealSense/librealsense
-    REF v2.53.1
-    SHA512 ea975cf919f483dc6669bd3fbce6c301df2ffadbe592972fdec8051de373374a5243565cb87b592f21f017c5ca319634617bacb0c49557136fda3620c59f2101
+    REF "v${VERSION}"
+    SHA512 20561294da571e0e1f5f8c9ac1039828512f3361a4241e5ad320bbb684626c1e78cd18e6a6344ec80fcd86dc699742c51069bc2b6895aec1dcbd9f394d2c9998
     HEAD_REF master
     PATCHES
         fix_openni2.patch
-        fix_config_osx.patch
+        fix-osx.patch # from https://github.com/IntelRealSense/librealsense/pull/11997
 )
 
 file(COPY "${SOURCE_PATH}/src/win7/drivers/IntelRealSense_D400_series_win7.inf" DESTINATION "${SOURCE_PATH}")
@@ -14,7 +14,6 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_CRT_LINKAGE)
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
-        tm2   BUILD_WITH_TM2
         tools BUILD_TOOLS
 )
 
@@ -50,6 +49,9 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/realsense2)
 if(VCPKG_TARGET_IS_WINDOWS)
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/realsense2/realsense2Targets.cmake" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" "\${_IMPORT_PREFIX}")
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/realsense2/realsense2Targets.cmake" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" "\${_IMPORT_PREFIX}")
+	
+	file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/common/fw")
+	file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/common/fw/fw.res" DESTINATION "${CURRENT_PACKAGES_DIR}/common/fw")
 endif()
 vcpkg_copy_pdbs()
 
@@ -68,5 +70,5 @@ if(BUILD_OPENNI2_BINDINGS)
     endif()
 endif()
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
 vcpkg_fixup_pkgconfig()
diff --git a/external_imported/vcpkg/ports/realsense2/vcpkg.json b/external_imported/vcpkg/ports/realsense2/vcpkg.json
index 129751711..54616c136 100644
--- a/external_imported/vcpkg/ports/realsense2/vcpkg.json
+++ b/external_imported/vcpkg/ports/realsense2/vcpkg.json
@@ -1,9 +1,11 @@
 {
   "name": "realsense2",
-  "version": "2.53.1",
+  "version": "2.54.2",
+  "port-version": 2,
   "description": "Intel® RealSense™ SDK 2.0 is a cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300).",
   "homepage": "https://github.com/IntelRealSense/librealsense",
   "license": "Apache-2.0",
+  "supports": "!uwp & !(windows & arm)",
   "dependencies": [
     {
       "name": "libusb",
@@ -25,9 +27,6 @@
         "openni2"
       ]
     },
-    "tm2": {
-      "description": "Build Intel® RealSense™ T265 device"
-    },
     "tools": {
       "description": "Build Intel® RealSense™ tools"
     }
diff --git a/external_imported/vcpkg/ports/recast/CMakeLists.txt b/external_imported/vcpkg/ports/recast/CMakeLists.txt
deleted file mode 100644
index a82f7d91d..000000000
--- a/external_imported/vcpkg/ports/recast/CMakeLists.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-cmake_minimum_required(VERSION 3.8)
-project(recast)
-
-set(SRC
-  DebugUtils/Source/DebugDraw.cpp
-  DebugUtils/Source/DetourDebugDraw.cpp
-  DebugUtils/Source/RecastDebugDraw.cpp
-  DebugUtils/Source/RecastDump.cpp
-  Detour/Source/DetourAlloc.cpp
-  Detour/Source/DetourCommon.cpp
-  Detour/Source/DetourNavMesh.cpp
-  Detour/Source/DetourNavMeshBuilder.cpp
-  Detour/Source/DetourNavMeshQuery.cpp
-  Detour/Source/DetourNode.cpp
-  DetourCrowd/Source/DetourCrowd.cpp
-  DetourCrowd/Source/DetourLocalBoundary.cpp
-  DetourCrowd/Source/DetourObstacleAvoidance.cpp
-  DetourCrowd/Source/DetourPathCorridor.cpp
-  DetourCrowd/Source/DetourPathQueue.cpp
-  DetourCrowd/Source/DetourProximityGrid.cpp
-  DetourTileCache/Source/DetourTileCache.cpp
-  DetourTileCache/Source/DetourTileCacheBuilder.cpp
-  Recast/Source/Recast.cpp
-  Recast/Source/RecastAlloc.cpp
-  Recast/Source/RecastArea.cpp
-  Recast/Source/RecastContour.cpp
-  Recast/Source/RecastFilter.cpp
-  Recast/Source/RecastLayers.cpp
-  Recast/Source/RecastMesh.cpp
-  Recast/Source/RecastMeshDetail.cpp
-  Recast/Source/RecastRasterization.cpp
-  Recast/Source/RecastRegion.cpp
-)
-
-add_library(recast ${SRC})
-
-target_include_directories(
-  recast PUBLIC
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/DebugUtils/Include>
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Detour/Include>
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/DetourCrowd/Include>
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/DetourTileCache/Include>
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Recast/Include>
-  $<INSTALL_INTERFACE:include/recast/>
-  $<INSTALL_INTERFACE:include/recast/Detour/Include>
-  $<INSTALL_INTERFACE:include/recast/DetourCrowd/Include>
-  $<INSTALL_INTERFACE:include/recast/DetourTileCache/Include>
-  $<INSTALL_INTERFACE:include/recast/Recast/Include>
-  $<INSTALL_INTERFACE:include/recast/DebugUtils/Include>
-)
-
-install(
-  TARGETS recast
-  EXPORT unofficial-recast-config
-  LIBRARY DESTINATION lib
-  ARCHIVE DESTINATION lib
-)
-
-install(EXPORT unofficial-recast-config DESTINATION share/unofficial-recast)
-
-if(NOT DISABLE_INSTALL_HEADERS)
-  install(DIRECTORY DebugUtils/Include/ DESTINATION include/recast/DebugUtils/Include)
-  install(DIRECTORY Detour/Include/ DESTINATION include/recast/Detour/Include)
-  install(DIRECTORY DetourCrowd/Include/ DESTINATION include/recast/DetourCrowd/Include)
-  install(DIRECTORY DetourTileCache/Include/ DESTINATION include/recast/DetourTileCache/Include)
-  install(DIRECTORY Recast/Include/ DESTINATION include/recast/Recast/Include)
-endif()
diff --git a/external_imported/vcpkg/ports/recast/portfile.cmake b/external_imported/vcpkg/ports/recast/portfile.cmake
index ebace1d11..d7c7ca948 100644
--- a/external_imported/vcpkg/ports/recast/portfile.cmake
+++ b/external_imported/vcpkg/ports/recast/portfile.cmake
@@ -1,24 +1,3 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
 
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO recastnavigation/recastnavigation
-    REF 1.5.1
-    SHA512 09900d8893e0c633a79e6188d15e68d1047040a0f2bceb2542f486dded64e69b918eaae159def81416a014fae26a46502783a2a712462bee4be2a3edf7bef47f
-    HEAD_REF master
-)
-
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-)
-
-vcpkg_cmake_install()
-
-vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-recast CONFIG_PATH share/unofficial-recast)
-
-vcpkg_copy_pdbs()
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-
-file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+message(WARNING "This port is a stub port retained for compatibility. Use 'recastnavigation' instead.")
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/recast/vcpkg.json b/external_imported/vcpkg/ports/recast/vcpkg.json
index 003d3d40e..541b6560f 100644
--- a/external_imported/vcpkg/ports/recast/vcpkg.json
+++ b/external_imported/vcpkg/ports/recast/vcpkg.json
@@ -1,18 +1,10 @@
 {
   "name": "recast",
-  "version": "1.5.1",
-  "port-version": 6,
-  "description": "Navigation-mesh Toolset for Games",
+  "version-string": "deprecated",
+  "description": "A stub package that pulls in recastnavigation. Do not depend on this package.",
   "homepage": "https://github.com/recastnavigation/recastnavigation",
   "license": "Zlib",
   "dependencies": [
-    {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
-    }
+    "recastnavigation"
   ]
 }
diff --git a/external_imported/vcpkg/ports/recastnavigation/fix-detail-mesh-edge-detection.patch b/external_imported/vcpkg/ports/recastnavigation/fix-detail-mesh-edge-detection.patch
new file mode 100644
index 000000000..a4a8257a7
--- /dev/null
+++ b/external_imported/vcpkg/ports/recastnavigation/fix-detail-mesh-edge-detection.patch
@@ -0,0 +1,103 @@
+diff --git a/Recast/Source/RecastMeshDetail.cpp b/Recast/Source/RecastMeshDetail.cpp
+index 40f5b8c..d83bf1c 100644
+--- a/Recast/Source/RecastMeshDetail.cpp
++++ b/Recast/Source/RecastMeshDetail.cpp
+@@ -634,6 +634,40 @@ inline float getJitterY(const int i)
+ 	return (((i * 0xd8163841) & 0xffff) / 65535.0f * 2.0f) - 1.0f;
+ }
+ 
++static bool onHull(int a, int b, int nhull, int* hull)
++{
++	// All internal sampled points come after the hull so we can early out for those.
++	if (a >= nhull || b >= nhull)
++		return false;
++
++	for (int j = nhull - 1, i = 0; i < nhull; j = i++)
++	{
++		if (a == hull[j] && b == hull[i])
++			return true;
++	}
++
++	return false;
++}
++
++// Find edges that lie on hull and mark them as such.
++static void setTriFlags(rcIntArray& tris, int nhull, int* hull)
++{
++	// Matches DT_DETAIL_EDGE_BOUNDARY
++	const int DETAIL_EDGE_BOUNDARY = 0x1;
++
++	for (int i = 0; i < tris.size(); i += 4)
++	{
++		int a = tris[i + 0];
++		int b = tris[i + 1];
++		int c = tris[i + 2];
++		unsigned short flags = 0;
++		flags |= (onHull(a, b, nhull, hull) ? DETAIL_EDGE_BOUNDARY : 0) << 0;
++		flags |= (onHull(b, c, nhull, hull) ? DETAIL_EDGE_BOUNDARY : 0) << 2;
++		flags |= (onHull(c, a, nhull, hull) ? DETAIL_EDGE_BOUNDARY : 0) << 4;
++		tris[i + 3] = (int)flags;
++	}
++}
++
+ static bool buildPolyDetail(rcContext* ctx, const float* in, const int nin,
+ 							const float sampleDist, const float sampleMaxError,
+ 							const int heightSearchRadius, const rcCompactHeightfield& chf,
+@@ -771,6 +805,7 @@ static bool buildPolyDetail(rcContext* ctx, const float* in, const int nin,
+ 	if (minExtent < sampleDist*2)
+ 	{
+ 		triangulateHull(nverts, verts, nhull, hull, nin, tris);
++		setTriFlags(tris, nhull, hull);
+ 		return true;
+ 	}
+ 	
+@@ -875,7 +910,8 @@ static bool buildPolyDetail(rcContext* ctx, const float* in, const int nin,
+ 		tris.resize(MAX_TRIS*4);
+ 		ctx->log(RC_LOG_ERROR, "rcBuildPolyMeshDetail: Shrinking triangle count from %d to max %d.", ntris, MAX_TRIS);
+ 	}
+-	
++
++	setTriFlags(tris, nhull, hull);	
+ 	return true;
+ }
+ 
+@@ -1137,30 +1173,6 @@ static void getHeightData(rcContext* ctx, const rcCompactHeightfield& chf,
+ 	}
+ }
+ 
+-static unsigned char getEdgeFlags(const float* va, const float* vb,
+-								  const float* vpoly, const int npoly)
+-{
+-	// The flag returned by this function matches dtDetailTriEdgeFlags in Detour.
+-	// Figure out if edge (va,vb) is part of the polygon boundary.
+-	static const float thrSqr = rcSqr(0.001f);
+-	for (int i = 0, j = npoly-1; i < npoly; j=i++)
+-	{
+-		if (distancePtSeg2d(va, &vpoly[j*3], &vpoly[i*3]) < thrSqr &&
+-			distancePtSeg2d(vb, &vpoly[j*3], &vpoly[i*3]) < thrSqr)
+-			return 1;
+-	}
+-	return 0;
+-}
+-
+-static unsigned char getTriFlags(const float* va, const float* vb, const float* vc,
+-								 const float* vpoly, const int npoly)
+-{
+-	unsigned char flags = 0;
+-	flags |= getEdgeFlags(va,vb,vpoly,npoly) << 0;
+-	flags |= getEdgeFlags(vb,vc,vpoly,npoly) << 2;
+-	flags |= getEdgeFlags(vc,va,vpoly,npoly) << 4;
+-	return flags;
+-}
+ 
+ /// @par
+ ///
+@@ -1377,7 +1389,7 @@ bool rcBuildPolyMeshDetail(rcContext* ctx, const rcPolyMesh& mesh, const rcCompa
+ 			dmesh.tris[dmesh.ntris*4+0] = (unsigned char)t[0];
+ 			dmesh.tris[dmesh.ntris*4+1] = (unsigned char)t[1];
+ 			dmesh.tris[dmesh.ntris*4+2] = (unsigned char)t[2];
+-			dmesh.tris[dmesh.ntris*4+3] = getTriFlags(&verts[t[0]*3], &verts[t[1]*3], &verts[t[2]*3], poly, npoly);
++			dmesh.tris[dmesh.ntris*4+3] = (unsigned char)t[3];
+ 			dmesh.ntris++;
+ 		}
+ 	}
diff --git a/external_imported/vcpkg/ports/recastnavigation/portfile.cmake b/external_imported/vcpkg/ports/recastnavigation/portfile.cmake
new file mode 100644
index 000000000..e6f4a0d41
--- /dev/null
+++ b/external_imported/vcpkg/ports/recastnavigation/portfile.cmake
@@ -0,0 +1,30 @@
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO recastnavigation/recastnavigation
+    REF v${VERSION}
+    SHA512 7567aaa78219cc490a6f76210fba1f130f0c17aeaa06432ab1207e0fd03404abe31042e8b03971aa0d04ad65d39469f13575fe0072fb920c38581d39568b70fb
+    HEAD_REF master
+    PATCHES
+        fix-detail-mesh-edge-detection.patch #Upstream fix https://github.com/recastnavigation/recastnavigation/pull/657
+)
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DRECASTNAVIGATION_DEMO=OFF
+        -DRECASTNAVIGATION_TESTS=OFF
+        -DRECASTNAVIGATION_EXAMPLES=OFF
+
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/recastnavigation)
+
+vcpkg_fixup_pkgconfig()
+
+vcpkg_copy_pdbs()
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/License.txt")
diff --git a/external_imported/vcpkg/ports/recastnavigation/vcpkg.json b/external_imported/vcpkg/ports/recastnavigation/vcpkg.json
new file mode 100644
index 000000000..839670623
--- /dev/null
+++ b/external_imported/vcpkg/ports/recastnavigation/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "recastnavigation",
+  "version": "1.6.0",
+  "port-version": 1,
+  "description": "Navigation-mesh Toolset for Games",
+  "homepage": "https://github.com/recastnavigation/recastnavigation",
+  "license": "Zlib",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/redis-plus-plus/fix-absolute-path.patch b/external_imported/vcpkg/ports/redis-plus-plus/fix-absolute-path.patch
new file mode 100644
index 000000000..16c0ebbfa
--- /dev/null
+++ b/external_imported/vcpkg/ports/redis-plus-plus/fix-absolute-path.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a075aca..8657ef7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -168,7 +168,7 @@ set(CMAKE_REQUIRED_LIBRARIES ${HIREDIS_FEATURE_TEST_LIB})
+ 
+ CHECK_SYMBOL_EXISTS(redisEnableKeepAliveWithInterval ${HIREDIS_FEATURE_TEST_HEADER} REDIS_PLUS_PLUS_HAS_redisEnableKeepAliveWithInterval)
+ 
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/hiredis_features.h.in ${CMAKE_CURRENT_SOURCE_DIR}/${REDIS_PLUS_PLUS_SOURCE_DIR}/hiredis_features.h)
++configure_file("${CMAKE_CURRENT_SOURCE_DIR}/hiredis_features.h.in" "${CMAKE_CURRENT_SOURCE_DIR}/${REDIS_PLUS_PLUS_SOURCE_DIR}/hiredis_features.h")
+ 
+ # Restore CMAKE_REQUIRED_LIBRARIES
+ set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_BACK})
diff --git a/external_imported/vcpkg/ports/redis-plus-plus/fix-dependency-libuv.patch b/external_imported/vcpkg/ports/redis-plus-plus/fix-dependency-libuv.patch
index 0fddcc898..02045ddb9 100644
--- a/external_imported/vcpkg/ports/redis-plus-plus/fix-dependency-libuv.patch
+++ b/external_imported/vcpkg/ports/redis-plus-plus/fix-dependency-libuv.patch
@@ -9,7 +9,7 @@ index e85a158..e67681c 100644
 -        find_path(REDIS_PLUS_PLUS_ASYNC_LIB_HEADER NAMES uv.h)
 -        find_library(REDIS_PLUS_PLUS_ASYNC_LIB uv)
 +        find_package(libuv CONFIG REQUIRED)
-+        set(REDIS_PLUS_PLUS_ASYNC_LIB $<IF:$<TARGET_EXISTS:uv_a>,uv_a,uv>)
++        set(REDIS_PLUS_PLUS_ASYNC_LIB $<IF:$<TARGET_EXISTS:libuv::uv_a>,libuv::uv_a,libuv::uv>)
      else()
          message(FATAL_ERROR "invalid REDIS_PLUS_PLUS_BUILD_ASYNC")
      endif()
diff --git a/external_imported/vcpkg/ports/redis-plus-plus/portfile.cmake b/external_imported/vcpkg/ports/redis-plus-plus/portfile.cmake
index 59bfb9819..1b8087660 100644
--- a/external_imported/vcpkg/ports/redis-plus-plus/portfile.cmake
+++ b/external_imported/vcpkg/ports/redis-plus-plus/portfile.cmake
@@ -1,12 +1,18 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO sewenew/redis-plus-plus
-    REF f3b19a8a1f609d1a1b79002802e5cf8c336dc262 # 1.3.7
-    SHA512 c99a4506be06224ebc4adaa29d5eeff0f6efae8b99e48ac02c26cec4a86fb46237a7d380ddb89eddc3d2e75c0c567e9b68610bcf271a0c708bca8ca6a5641075
+    REF "${VERSION}"
+    SHA512 43741da2222a9416cee16f522244ddf243b7a188f08704bb05e66f659213b05189fcef35b7b100b128d301e889765ad3f151889e9b5b9e6510479bec58b04ce0
     HEAD_REF master
     PATCHES
         fix-conversion.patch
         fix-dependency-libuv.patch
+        fix-absolute-path.patch
+)
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        "tls"   REDIS_PLUS_PLUS_USE_TLS
 )
 
 if("cxx17" IN_LIST FEATURES)
@@ -17,10 +23,10 @@ endif()
 
 set(EXTRA_OPT "")
 if ("async" IN_LIST FEATURES)
-    list(APPEND EXTRA_OPT -DREDIS_PLUS_PLUS_BUILD_ASYNC="libuv")
+    list(APPEND EXTRA_OPT "-DREDIS_PLUS_PLUS_BUILD_ASYNC=libuv")
 endif()
 if ("async-std" IN_LIST FEATURES)
-    list(APPEND EXTRA_OPT -DREDIS_PLUS_PLUS_ASYNC_FUTURE="std")
+    list(APPEND EXTRA_OPT "-DREDIS_PLUS_PLUS_ASYNC_FUTURE=std")
 endif()
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" REDIS_PLUS_PLUS_BUILD_STATIC)
@@ -28,8 +34,9 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" REDIS_PLUS_PLUS_BUILD_
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    DISABLE_PARALLEL_CONFIGURE
     OPTIONS
-        -DREDIS_PLUS_PLUS_USE_TLS=OFF
+        ${FEATURE_OPTIONS}
         -DREDIS_PLUS_PLUS_BUILD_STATIC=${REDIS_PLUS_PLUS_BUILD_STATIC}
         -DREDIS_PLUS_PLUS_BUILD_SHARED=${REDIS_PLUS_PLUS_BUILD_SHARED}
         -DREDIS_PLUS_PLUS_BUILD_TEST=OFF
@@ -41,10 +48,19 @@ vcpkg_cmake_install()
 
 vcpkg_copy_pdbs()
 
+vcpkg_cmake_config_fixup(PACKAGE_NAME redis++ CONFIG_PATH share/cmake/redis++)
+
+if("async" IN_LIST FEATURES)
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/redis++/redis++-config.cmake"
+"include(CMakeFindDependencyMacro)"
+[[include(CMakeFindDependencyMacro)
+find_dependency(libuv CONFIG)]])
+endif()
+
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 # Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright )
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
 
 vcpkg_fixup_pkgconfig()
diff --git a/external_imported/vcpkg/ports/redis-plus-plus/vcpkg.json b/external_imported/vcpkg/ports/redis-plus-plus/vcpkg.json
index 93ee982c1..7545206f4 100644
--- a/external_imported/vcpkg/ports/redis-plus-plus/vcpkg.json
+++ b/external_imported/vcpkg/ports/redis-plus-plus/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "redis-plus-plus",
-  "version-semver": "1.3.7",
+  "version-semver": "1.3.10",
   "description": "This is a C++ client for Redis. It's based on hiredis, and written in C++ 11",
   "homepage": "https://github.com/sewenew/redis-plus-plus",
   "license": "Apache-2.0",
@@ -36,6 +36,18 @@
     },
     "cxx17": {
       "description": "Build redis-plus-plus with cxx 17 standard"
+    },
+    "tls": {
+      "description": "Build with TLS support",
+      "dependencies": [
+        {
+          "name": "hiredis",
+          "default-features": false,
+          "features": [
+            "ssl"
+          ]
+        }
+      ]
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/refl-cpp/portfile.cmake b/external_imported/vcpkg/ports/refl-cpp/portfile.cmake
index 3ef302408..59d5a4ca0 100644
--- a/external_imported/vcpkg/ports/refl-cpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/refl-cpp/portfile.cmake
@@ -2,8 +2,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO veselink1/refl-cpp
-    REF ce47c1355219f3b9af56ae91d997daf2b1555d97 #v0.12.3
-    SHA512 f73e542a9ee00d677e2445c148b732cbdf6247adc1f4f412ad8e9587c5971b3cb02b39b15cdb9b0788f53e9efea6c5a485367505ecb569a367be012f6246ea92
+    REF "v${VERSION}"
+    SHA512 fcebda170782fd7cc55395fd64012356f416deb1199e2eceee7391c7c1963e39c214e7d99c42e7ca371d6d86923173e916b09e4867cacfaeed4902b5466aed03
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/refl-cpp/vcpkg.json b/external_imported/vcpkg/ports/refl-cpp/vcpkg.json
index 88defcfdd..ab879529b 100644
--- a/external_imported/vcpkg/ports/refl-cpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/refl-cpp/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "refl-cpp",
-  "version": "0.12.3",
-  "port-version": 1,
+  "version": "0.12.4",
   "description": "Static reflection for C++17 (compile-time enumeration, attributes, proxies, overloads, template functions, metaprogramming).",
   "homepage": "https://github.com/veselink1/refl-cpp",
   "license": "MIT"
diff --git a/external_imported/vcpkg/ports/refprop-headers/portfile.cmake b/external_imported/vcpkg/ports/refprop-headers/portfile.cmake
index befb0184b..a39b5601b 100644
--- a/external_imported/vcpkg/ports/refprop-headers/portfile.cmake
+++ b/external_imported/vcpkg/ports/refprop-headers/portfile.cmake
@@ -1,16 +1,13 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO CoolProp/REFPROP-headers
-    REF 8df35c7cb557d385bb66431e92e836104a63a33c
-    SHA512 4424d036c3cd6c9028fffbeda0919d38f4b0a290fb141c6d1ff26c70cd416d9a0d2e1584c51b6ad2e989e84a8a71660f62dadaa88bb22428972165ba01131cb2
+    REF b4faab1b73911c32c4b69c526c7e92f74edb67de
+    SHA512 601fcc70e7e12419e03e71b140c2fcec80eafb19f24f9871355679662802815f98cce2d167638658ba04ba7da0e811b2cf5393ced4dbe40cb2930dee75acced5
     HEAD_REF master
+    PATCHES
+        unicode-build.diff # https://github.com/CoolProp/REFPROP-headers/issues/21
 )
 
-file(INSTALL ${SOURCE_PATH}/REFPROP_lib.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+file(INSTALL "${SOURCE_PATH}/REFPROP_lib.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
 
-# Handle copyright
-file(
-  INSTALL ${SOURCE_PATH}/LICENSE
-  DESTINATION ${CURRENT_PACKAGES_DIR}/share/refprop-headers
-  RENAME copyright
-)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/refprop-headers/unicode-build.diff b/external_imported/vcpkg/ports/refprop-headers/unicode-build.diff
new file mode 100644
index 000000000..4dc210a4c
--- /dev/null
+++ b/external_imported/vcpkg/ports/refprop-headers/unicode-build.diff
@@ -0,0 +1,13 @@
+diff --git a/REFPROP_lib.h b/REFPROP_lib.h
+index 60fb64a..df10d2c 100644
+--- a/REFPROP_lib.h
++++ b/REFPROP_lib.h
+@@ -762,7 +762,7 @@ extern "C" {
+                     #ifndef UNICODE
+                         msg = dllPath;
+                     #else
+-                        std::wstring wStr = t;
++                        std::wstring wStr = dllPath;
+                         msg = std::string(wStr.begin(), wStr.end());
+                     #endif
+                     RPPath_loaded = msg;
diff --git a/external_imported/vcpkg/ports/refprop-headers/vcpkg.json b/external_imported/vcpkg/ports/refprop-headers/vcpkg.json
index f0b73813b..a91b60028 100644
--- a/external_imported/vcpkg/ports/refprop-headers/vcpkg.json
+++ b/external_imported/vcpkg/ports/refprop-headers/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "refprop-headers",
-  "version-string": "2019-04-14",
-  "port-version": 1,
-  "description": "The REFPROP Headers",
-  "homepage": "https://github.com/CoolProp/REFPROP-headers"
+  "version-date": "2022-12-07",
+  "description": "Header files for the REFPROP fluid property library",
+  "homepage": "https://github.com/CoolProp/REFPROP-headers",
+  "license": "MIT"
 }
diff --git a/external_imported/vcpkg/ports/rendergraph/portfile.cmake b/external_imported/vcpkg/ports/rendergraph/portfile.cmake
index 8a45a50b4..d9ba86685 100644
--- a/external_imported/vcpkg/ports/rendergraph/portfile.cmake
+++ b/external_imported/vcpkg/ports/rendergraph/portfile.cmake
@@ -1,15 +1,15 @@
 vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH
     REPO DragonJoker/RenderGraph
-    REF v1.2.0
+    REF v${VERSION}
     HEAD_REF master
-    SHA512 54f2b06931ef912888ae12227b39b17d25969dd5443a37d61cb8072b0137ed6361b03e09ac18e7abe21dfd49b5a5a2ec23f0d2d8e9ede03ddb8fb589d874237c
+    SHA512 34b8991d65a792367ba1f95738297993fae0320558bc94b2f271270081acafe6c6a4463097bf9c6e69e69379fdf63651667ed62945d0c3b5f95109c6b3b89074
 )
 
 vcpkg_from_github(OUT_SOURCE_PATH CMAKE_SOURCE_PATH
     REPO DragonJoker/CMakeUtils
-    REF 7d355194fa795c437ce970cecf00e23ae10fc686
+    REF 4e0292ed50d76dab5fc8c81840ae0e021dc60c2a
     HEAD_REF master
-    SHA512 ca25b19bdeb3e8fda7abc32f8548731f0ba1cd09889a70f6f287ad76d2fdfa0fedbb7f6f65b26d356ea51543bed8926c6bb463f8e8461b7d51d3b7b33134374c
+    SHA512 c79c6a5ef2e059b56d4de20cc73e74386bf8b6acea2f6b76fd9949a6a2760f82302c90419e4a753f50c30d01cc4f3a039e04b585f5c0d4461cce3464d9fb9c95
 )
 
 get_filename_component(SRC_PATH "${CMAKE_SOURCE_PATH}" DIRECTORY)
@@ -31,7 +31,8 @@ vcpkg_cmake_configure(
         -DVULKAN_HEADERS_INCLUDE_DIRS=${CURRENT_INSTALLED_DIR}/include
 )
 
+vcpkg_copy_pdbs()
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/RenderGraph)
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/external_imported/vcpkg/ports/rendergraph/vcpkg.json b/external_imported/vcpkg/ports/rendergraph/vcpkg.json
index b8dccf4de..259fb1a1f 100644
--- a/external_imported/vcpkg/ports/rendergraph/vcpkg.json
+++ b/external_imported/vcpkg/ports/rendergraph/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "rendergraph",
-  "version": "1.2.0",
+  "version": "1.4.0",
   "description": "Vulkan render graph implementation.",
   "homepage": "https://github.com/DragonJoker/RenderGraph",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/reproc/fix-gcc13-build-error.patch b/external_imported/vcpkg/ports/reproc/fix-gcc13-build-error.patch
new file mode 100644
index 000000000..cf464b531
--- /dev/null
+++ b/external_imported/vcpkg/ports/reproc/fix-gcc13-build-error.patch
@@ -0,0 +1,28 @@
+diff --git a/reproc++/include/reproc++/reproc.hpp b/reproc++/include/reproc++/reproc.hpp
+index ab6f139..d4b370f 100644
+--- a/reproc++/include/reproc++/reproc.hpp
++++ b/reproc++/include/reproc++/reproc.hpp
+@@ -88,18 +88,18 @@ struct redirect {
+ 
+ struct options {
+   struct {
+-    env::type behavior;
++    reproc::env::type behavior;
+     /*! Implicitly converts from any STL container of string pairs to the
+     environment format expected by `reproc_start`. */
+-    class env extra;
++    reproc::env extra;
+   } env = {};
+ 
+   const char *working_directory = nullptr;
+ 
+   struct {
+-    redirect in;
+-    redirect out;
+-    redirect err;
++    struct redirect in;
++    struct redirect out;
++    struct redirect err;
+     bool parent;
+     bool discard;
+     FILE *file;
diff --git a/external_imported/vcpkg/ports/reproc/portfile.cmake b/external_imported/vcpkg/ports/reproc/portfile.cmake
index 572cce5fb..c8c9f3845 100644
--- a/external_imported/vcpkg/ports/reproc/portfile.cmake
+++ b/external_imported/vcpkg/ports/reproc/portfile.cmake
@@ -1,9 +1,11 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO DaanDeMeyer/reproc
-    REF v14.2.4
+    REF "v${VERSION}"
     SHA512 c592521960f1950d626261738091d25efdf764ee1a0c72a58c28c66eaebf6073b2c978f1dc2c8dbe89b0be7ec1629a3a45cb1fafa0ebe21b5df8d4d27c992675
     HEAD_REF main
+    PATCHES
+        fix-gcc13-build-error.patch #Please remove it in the next release version
 )
 
 vcpkg_cmake_configure(
@@ -24,8 +26,4 @@ foreach(TARGET reproc reproc++)
     )
 endforeach()
 
-file(
-    INSTALL "${SOURCE_PATH}/LICENSE"
-    DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
-    RENAME copyright
-)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/reproc/vcpkg.json b/external_imported/vcpkg/ports/reproc/vcpkg.json
index 7c4999355..4326597ed 100644
--- a/external_imported/vcpkg/ports/reproc/vcpkg.json
+++ b/external_imported/vcpkg/ports/reproc/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "reproc",
   "version": "14.2.4",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Cross-platform (C99/C++11) process library",
   "homepage": "https://github.com/DaanDeMeyer/reproc",
   "supports": "!uwp",
diff --git a/external_imported/vcpkg/ports/restbed/vcpkg.json b/external_imported/vcpkg/ports/restbed/vcpkg.json
index 408bd47a9..4807d4976 100644
--- a/external_imported/vcpkg/ports/restbed/vcpkg.json
+++ b/external_imported/vcpkg/ports/restbed/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "restbed",
   "version": "4.8",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Corvusoft's Restbed framework brings asynchronous RESTful functionality to C++14 applications.",
   "homepage": "https://github.com/corvusoft/restbed",
   "license": "AGPL-3.0-or-later OR CPL-1.0",
+  "supports": "!xbox",
   "dependencies": [
     "asio",
     {
diff --git a/external_imported/vcpkg/ports/restinio/portfile.cmake b/external_imported/vcpkg/ports/restinio/portfile.cmake
index 5b8feba26..587e7b2e5 100644
--- a/external_imported/vcpkg/ports/restinio/portfile.cmake
+++ b/external_imported/vcpkg/ports/restinio/portfile.cmake
@@ -1,17 +1,28 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO stiffstream/restinio
-    REF a5b668560138da42158511880470b19988566568 # v.0.6.17
-    SHA512 fc3cdab9c240ba30b5f4b800ec452442a38db93936d3f7557255e6e7e3176217413fa421afec8b155cfb498df5ca9fc48a74a8e9bf1903aa31c9824d26d9618c
+    REF "v.${VERSION}"
+    SHA512 b5932a08687ef2d3ae02d0b0b1384b3462706ce207f16126efa8cd3dcea130d823863169dd5088b12b8c69761ccd044b447c2fe04f31ee10d26ff33d088606ee
 )
 
+set(VCPKG_BUILD_TYPE release) # header-only
 vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}/vcpkg"
+    SOURCE_PATH "${SOURCE_PATH}/dev"
+    OPTIONS
+        -DRESTINIO_INSTALL=ON
+        -DRESTINIO_TEST=OFF
+        -DRESTINIO_SAMPLE=OFF
+        -DRESTINIO_BENCHMARK=OFF
+        -DRESTINIO_WITH_SOBJECTIZER=OFF
+        -DRESTINIO_ASIO_SOURCE=standalone
+        -DRESTINIO_DEP_STANDALONE_ASIO=find
+        -DRESTINIO_DEP_LLHTTP=find
+        -DRESTINIO_DEP_FMT=find
+        -DRESTINIO_DEP_EXPECTED_LITE=find
 )
-
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/restinio)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug")
-# Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/external_imported/vcpkg/ports/restinio/vcpkg.json b/external_imported/vcpkg/ports/restinio/vcpkg.json
index 41353f5e2..b88d21890 100644
--- a/external_imported/vcpkg/ports/restinio/vcpkg.json
+++ b/external_imported/vcpkg/ports/restinio/vcpkg.json
@@ -1,13 +1,14 @@
 {
   "name": "restinio",
-  "version": "0.6.17",
+  "version": "0.7.1",
   "description": "A header-only C++14 library that gives you an embedded HTTP/Websocket server targeted primarily for asynchronous processing of HTTP-requests.",
   "homepage": "https://github.com/Stiffstream/restinio",
   "license": "BSD-3-Clause",
   "dependencies": [
     "asio",
+    "expected-lite",
     "fmt",
-    "http-parser",
+    "llhttp",
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/external_imported/vcpkg/ports/rhash/portfile.cmake b/external_imported/vcpkg/ports/rhash/portfile.cmake
index fe40f0e84..a274e4dc9 100644
--- a/external_imported/vcpkg/ports/rhash/portfile.cmake
+++ b/external_imported/vcpkg/ports/rhash/portfile.cmake
@@ -2,8 +2,8 @@ set(RHASH_XVERSION 1.4.2)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO rhash/RHash
-    REF 02c8b1dbae01c8d56613b6a3034c3698f94a52be # v1.4.2
-    SHA512 4c1d0a91a758ba85bc9ea194cf148834d6a0ebd849ed5384444798c522723ad78c3eedf65e7460fba61989a69b2c0f9a0f12bd6583381c544778c4b1c199a4ba
+    REF "v${VERSION}"
+    SHA512 00a7e5e058b53ce20ae79509815452ed9cb699d1322b678220b72c61dea3ea2f8fa131acfade8bb6d9f6af913f0c3c472330841181b22314b8755166310c946f
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/rhash/vcpkg.json b/external_imported/vcpkg/ports/rhash/vcpkg.json
index 0e489e903..14c97cdda 100644
--- a/external_imported/vcpkg/ports/rhash/vcpkg.json
+++ b/external_imported/vcpkg/ports/rhash/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "rhash",
-  "version": "1.4.2",
-  "port-version": 1,
+  "version": "1.4.4",
   "description": "C library for computing a wide variety of hash sums",
   "homepage": "https://github.com/rhash/RHash",
   "license": "0BSD",
diff --git a/external_imported/vcpkg/ports/rhasheq/find-rhash.patch b/external_imported/vcpkg/ports/rhasheq/find-rhash.patch
new file mode 100644
index 000000000..38722fb86
--- /dev/null
+++ b/external_imported/vcpkg/ports/rhasheq/find-rhash.patch
@@ -0,0 +1,39 @@
+diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in
+index c64c475..d57179e 100644
+--- a/cmake/Config.cmake.in
++++ b/cmake/Config.cmake.in
+@@ -1,4 +1,8 @@
+ 
+ @PACKAGE_INIT@
+ 
++include(CMakeFindDependencyMacro)
++
++find_dependency(unofficial-rhash)
++
+ include ( "${CMAKE_CURRENT_LIST_DIR}/rhasheqTargets.cmake" )
+diff --git a/rhasheq/CMakeLists.txt b/rhasheq/CMakeLists.txt
+index fb7357f..baaaaf8 100644
+--- a/rhasheq/CMakeLists.txt
++++ b/rhasheq/CMakeLists.txt
+@@ -23,8 +23,9 @@ else ()
+ endif (VCPKG_TOOLCHAIN)
+ 
+ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules;${CMAKE_MODULE_PATH}")
+-find_package(LibRHash)
++find_package(unofficial-rhash CONFIG REQUIRED)
+ 
++if(0)
+ if (NOT LibRHash_FOUND)
+     set(CMAKE_FIND_LIBRARY_PREFIXES ${CMAKE_FIND_LIBRARY_PREFIXES} lib)
+     set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES} _imp.lib -d.lib -d_imp.lib)
+@@ -40,8 +41,9 @@ endif (NOT TARGET LibRHash)
+ if (NOT LibRHash_FOUND)
+     message(FATAL_ERROR "LibRHash not found")
+ endif (NOT LibRHash_FOUND)
++endif()
+ 
+-target_link_libraries("${LIBRARY_NAME}" INTERFACE "LibRHash::LibRHash")
++target_link_libraries("${LIBRARY_NAME}" INTERFACE unofficial::rhash::rhash)
+ 
+ include(GNUInstallDirs)
+ target_include_directories(
diff --git a/external_imported/vcpkg/ports/rhasheq/portfile.cmake b/external_imported/vcpkg/ports/rhasheq/portfile.cmake
index fed79c5cd..fa9847a52 100644
--- a/external_imported/vcpkg/ports/rhasheq/portfile.cmake
+++ b/external_imported/vcpkg/ports/rhasheq/portfile.cmake
@@ -1,18 +1,22 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO            offscale/rhasheq
-    REF             c42b672daf9bb1525cb94645244a09344c2a7363
-    SHA512          55947069a67e7de8561b92bad753481402dd353aa40b06719346fa1247d8d0a5073a8a3e38419e7d9028684c091eb23b11b254fea836383a24ce8dcfe0cffefc
-    HEAD_REF        master
+    REPO offscale/rhasheq
+    REF cf5442f6468871beb6088991501e6ba052fe4467
+    SHA512 2be63bc32c7cea35eefbcc7186255e9cd8ba6ed4b03cb9ee2e62740fe17ad74a81ee7e4ada37f4a2dca99a82becf790d6aa86822cdbeba3972cf11d54095ca91
+    HEAD_REF master
+    PATCHES
+        find-rhash.patch
 )
 
+file(REMOVE "${SOURCE_PATH}/cmake/modules/FindLibRHash.cmake")
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-        "-DBUILD_TESTING=OFF"
+        -DBUILD_TESTING=OFF
 )
 vcpkg_cmake_install()
-file(INSTALL "${SOURCE_PATH}/COPYING"
-     DESTINATION "${CURRENT_PACKAGES_DIR}/share/rhasheq"
-     RENAME copyright)
+vcpkg_cmake_config_fixup()
+
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/rhasheq/vcpkg.json b/external_imported/vcpkg/ports/rhasheq/vcpkg.json
index 2ada70aec..b7c231fcf 100644
--- a/external_imported/vcpkg/ports/rhasheq/vcpkg.json
+++ b/external_imported/vcpkg/ports/rhasheq/vcpkg.json
@@ -1,9 +1,9 @@
 {
   "name": "rhasheq",
-  "version": "0.0.1",
+  "version-date": "2023-06-17",
   "description": "Simple header-only librhash wrapper for verifying hashes from a file to a given `const char *`.",
+  "homepage": "https://github.com/offscale/rhasheq",
   "license": "0BSD",
-  "supports": "!uwp",
   "dependencies": [
     "c89stringutils",
     "rhash",
diff --git a/external_imported/vcpkg/ports/riffcpp/vcpkg.json b/external_imported/vcpkg/ports/riffcpp/vcpkg.json
index da8294954..08a05d946 100644
--- a/external_imported/vcpkg/ports/riffcpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/riffcpp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "riffcpp",
-  "version-string": "2.2.4",
-  "port-version": 2,
+  "version": "2.2.4",
+  "port-version": 3,
   "description": "Simple library for reading RIFF files",
   "homepage": "https://github.com/libdmusic/riffcpp",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/rivers/add-install-configuration.patch b/external_imported/vcpkg/ports/rivers/add-install-configuration.patch
new file mode 100644
index 000000000..aafe48824
--- /dev/null
+++ b/external_imported/vcpkg/ports/rivers/add-install-configuration.patch
@@ -0,0 +1,76 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 981ef20..89c5a6e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -9,20 +9,45 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+ 
+ add_library(rivers INTERFACE)
+ add_library(rivers::rivers ALIAS rivers)
+-target_include_directories(rivers INTERFACE include)
++target_include_directories(rivers
++                           INTERFACE
++                            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
++                            $<INSTALL_INTERFACE:include>
++                           )
+ 
+ option(RVR_IMPORT_FMT Off)
+ if(RVR_IMPORT_FMT)
+-    include(FetchContent)
+-    FetchContent_Declare(
+-        fmt
+-        GIT_REPOSITORY https://github.com/fmtlib/fmt.git
+-        GIT_TAG 713c7c7c62044329d26c19323ffa0e64d69d2d64
+-        )
+-    FetchContent_MakeAvailable(fmt)
+-
++    find_package(fmt CONFIG REQUIRED)
+     target_link_libraries(rivers INTERFACE fmt::fmt)
+ endif()
+ 
+-add_subdirectory(bench)
+-add_subdirectory(test)
++include(CMakePackageConfigHelpers)
++
++configure_package_config_file(
++  cmake/unofficial-rivers-config.cmake.in
++  "${CMAKE_CURRENT_BINARY_DIR}/cmake/unofficial-rivers-config.cmake"
++  INSTALL_DESTINATION lib/cmake/unofficial-rivers/
++  NO_CHECK_REQUIRED_COMPONENTS_MACRO)
++
++
++# Export.
++export(
++  TARGETS rivers
++  FILE "${CMAKE_CURRENT_BINARY_DIR}/cmake/unofficial-rivers-targets.cmake")
++
++# Install.
++install(TARGETS rivers EXPORT unofficial-rivers)
++
++install(
++  EXPORT unofficial-rivers
++  NAMESPACE unofficial-rivers::
++  FILE unofficial-rivers-targets.cmake
++  DESTINATION lib/cmake/unofficial-rivers)
++
++install(DIRECTORY include/rivers DESTINATION include)
++
++install(
++  FILES
++  "${CMAKE_CURRENT_BINARY_DIR}/cmake/unofficial-rivers-config.cmake"
++  DESTINATION lib/cmake/unofficial-rivers)
++
+diff --git a/cmake/unofficial-rivers-config.cmake.in b/cmake/unofficial-rivers-config.cmake.in
+new file mode 100644
+index 0000000..a347972
+--- /dev/null
++++ b/cmake/unofficial-rivers-config.cmake.in
+@@ -0,0 +1,9 @@
++
++@PACKAGE_INIT@
++include(CMakeFindDependencyMacro)
++
++include("${CMAKE_CURRENT_LIST_DIR}/unofficial-rivers-targets.cmake")
++if(@RVR_IMPORT_FMT@)
++  find_dependency(fmt CONFIG)
++endif()
++
diff --git a/external_imported/vcpkg/ports/rivers/portfile.cmake b/external_imported/vcpkg/ports/rivers/portfile.cmake
new file mode 100644
index 000000000..c19b82433
--- /dev/null
+++ b/external_imported/vcpkg/ports/rivers/portfile.cmake
@@ -0,0 +1,28 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO brevzin/rivers
+    REF cfbd4c3e0ca9fcde03075327d6dd628e57589342
+    SHA512 4dfa4a1e657c6a12446abe6d7c54d5bc3d47d82e8639eb91f98c7120b3ca79a6cfa761a357dc2285027823177ee76be346adddc7861f0f213cd0bc7cde041ab8
+    HEAD_REF main
+    PATCHES add-install-configuration.patch
+)
+
+set(VCPKG_BUILD_TYPE release) # header-only
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        fmt RVR_IMPORT_FMT
+)
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        ${FEATURE_OPTIONS}
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT} CONFIG_PATH "lib/cmake/unofficial-rivers")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/rivers/vcpkg.json b/external_imported/vcpkg/ports/rivers/vcpkg.json
new file mode 100644
index 000000000..78c88812b
--- /dev/null
+++ b/external_imported/vcpkg/ports/rivers/vcpkg.json
@@ -0,0 +1,25 @@
+{
+  "name": "rivers",
+  "version-date": "2022-05-16",
+  "description": "A C++ internal iteration library based loosely on Java Streams",
+  "homepage": "https://github.com/brevzin/rivers/",
+  "license": "BSL-1.0",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
+  "features": {
+    "fmt": {
+      "description": "Use fmt as rivers fommatter",
+      "dependencies": [
+        "fmt"
+      ]
+    }
+  }
+}
diff --git a/external_imported/vcpkg/ports/rmlui/add-robin-hood.patch b/external_imported/vcpkg/ports/rmlui/add-robin-hood.patch
index 4a39a8a5a..618a9e9b6 100644
--- a/external_imported/vcpkg/ports/rmlui/add-robin-hood.patch
+++ b/external_imported/vcpkg/ports/rmlui/add-robin-hood.patch
@@ -1,20 +1,20 @@
 diff --git a/CMake/FileList.cmake b/CMake/FileList.cmake
-index 9c3042c..c3820df 100644
+index cd2918a7..f063a879 100644
 --- a/CMake/FileList.cmake
 +++ b/CMake/FileList.cmake
-@@ -133,7 +133,6 @@ set(Core_PUB_HDR_FILES
+@@ -123,7 +123,6 @@ set(Core_PUB_HDR_FILES
      ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ComputedValues.h
-     ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/chobo/flat_map.hpp
-     ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/chobo/flat_set.hpp
+     ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/itlib/flat_map.hpp
+     ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/itlib/flat_set.hpp
 -    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/robin_hood.h
      ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Context.h
      ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ContextInstancer.h
      ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ConvolutionFilter.h
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 62432f1..d9287c9 100644
+index 0b552524..190e8c8e 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -387,6 +387,8 @@ if( ENABLE_SVG_PLUGIN )
+@@ -427,6 +427,8 @@ if( ENABLE_SVG_PLUGIN )
  	message("-- Can SVG plugin be enabled - yes - lunasvg library found")
  endif()
  
@@ -24,13 +24,13 @@ index 62432f1..d9287c9 100644
  if(NOT BUILD_FRAMEWORK)
  #===================================
 diff --git a/Include/RmlUi/Config/Config.h b/Include/RmlUi/Config/Config.h
-index dc42753..5249e1d 100644
+index 018ab3b1..4bc20613 100644
 --- a/Include/RmlUi/Config/Config.h
 +++ b/Include/RmlUi/Config/Config.h
 @@ -57,7 +57,7 @@
  #else
- #include "../Core/Containers/chobo/flat_map.hpp"
- #include "../Core/Containers/chobo/flat_set.hpp"
+ #include "../Core/Containers/itlib/flat_map.hpp"
+ #include "../Core/Containers/itlib/flat_set.hpp"
 -#include "../Core/Containers/robin_hood.h"
 +#include <robin_hood.h>
  #endif	// RMLUI_NO_THIRDPARTY_CONTAINERS
diff --git a/external_imported/vcpkg/ports/rmlui/portfile.cmake b/external_imported/vcpkg/ports/rmlui/portfile.cmake
index 511d2cac5..99e09b6f6 100644
--- a/external_imported/vcpkg/ports/rmlui/portfile.cmake
+++ b/external_imported/vcpkg/ports/rmlui/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
 	OUT_SOURCE_PATH SOURCE_PATH
 	REPO mikke89/RmlUi
-	REF 5.0
-	SHA512 10136893eb695b098fe6d718e23ce331c549faf3eb73413a5bb143ddd3601726b8bc42382c4e575d2abfff838ad3e6af1d4945426223a9c6f0fd048b481819dd
+	REF 5.1
+	SHA512 06bf1a24c6ff3f164ef1af80186d5f974e6a5467f6f0d50ec33bb14516e4899321fe7a5b9c4912def908a53711bf302bc782cf78117e0930862f5d1ad07dec18
 	HEAD_REF master
 	PATCHES
 		add-robin-hood.patch
diff --git a/external_imported/vcpkg/ports/rmlui/vcpkg.json b/external_imported/vcpkg/ports/rmlui/vcpkg.json
index d27047c29..09d80db3c 100644
--- a/external_imported/vcpkg/ports/rmlui/vcpkg.json
+++ b/external_imported/vcpkg/ports/rmlui/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "rmlui",
-  "version": "5.0",
+  "version": "5.1",
   "maintainers": "Michael R. P. Ragazzon <mikke89@users.noreply.github.com>",
   "description": "RmlUi is the C++ user interface library based on the HTML and CSS standards, designed as a complete solution for any project's interface needs.",
   "homepage": "https://github.com/mikke89/RmlUi",
diff --git a/external_imported/vcpkg/ports/rmqcpp/portfile.cmake b/external_imported/vcpkg/ports/rmqcpp/portfile.cmake
new file mode 100644
index 000000000..2e8b3e4c7
--- /dev/null
+++ b/external_imported/vcpkg/ports/rmqcpp/portfile.cmake
@@ -0,0 +1,29 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO bloomberg/rmqcpp
+    REF 52e583c2eb3f06707ce5fde7f29089b17428f6b2
+    SHA512 c4232f37e7bc61d0cc77c52a1283fefc1a7925b4ef8cfbe9b404393540c773feabdc2ad3adc263beb06fe079cbf22010bf1551e15eb2f55b1347f6d8c8f35f8b
+    HEAD_REF main
+)
+
+vcpkg_cmake_configure(
+  SOURCE_PATH "${SOURCE_PATH}"
+  OPTIONS
+    -DBDE_BUILD_TARGET_CPP17=ON
+    -DCMAKE_CXX_STANDARD=17
+    -DCMAKE_CXX_STANDARD_REQUIRED=ON
+    -DBDE_BUILD_TARGET_SAFE=ON
+    -DCMAKE_INSTALL_LIBDIR=lib64
+)
+
+vcpkg_cmake_build()
+
+vcpkg_cmake_install()
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY)
+
+vcpkg_cmake_config_fixup()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
diff --git a/external_imported/vcpkg/ports/rmqcpp/usage b/external_imported/vcpkg/ports/rmqcpp/usage
new file mode 100644
index 000000000..23f17565a
--- /dev/null
+++ b/external_imported/vcpkg/ports/rmqcpp/usage
@@ -0,0 +1,4 @@
+rmqcpp provides CMake targets:
+
+    find_package(rmqcpp REQUIRED)
+    target_link_libraries(main PRIVATE rmqcpp::rmq)
diff --git a/external_imported/vcpkg/ports/rmqcpp/vcpkg.json b/external_imported/vcpkg/ports/rmqcpp/vcpkg.json
new file mode 100644
index 000000000..3cf1f4f18
--- /dev/null
+++ b/external_imported/vcpkg/ports/rmqcpp/vcpkg.json
@@ -0,0 +1,36 @@
+{
+  "name": "rmqcpp",
+  "version": "1.0.0",
+  "description": "rmqcpp - A C++ library for RabbitMQ.",
+  "dependencies": [
+    {
+      "name": "bde",
+      "host": true,
+      "version>=": "3.123.0.0"
+    },
+    {
+      "name": "boost-asio",
+      "host": true
+    },
+    {
+      "name": "boost-iostreams",
+      "host": true
+    },
+    {
+      "name": "gtest",
+      "host": true
+    },
+    {
+      "name": "openssl",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/roaring/portfile.cmake b/external_imported/vcpkg/ports/roaring/portfile.cmake
index 0b5d13f44..811632bfd 100644
--- a/external_imported/vcpkg/ports/roaring/portfile.cmake
+++ b/external_imported/vcpkg/ports/roaring/portfile.cmake
@@ -1,20 +1,15 @@
-if (TARGET_TRIPLET MATCHES "^x86")
-    message(WARNING "The CRoaring authors recommend users of this lib against using a 32-bit build.")
-endif ()
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO RoaringBitmap/CRoaring
     REF "v${VERSION}"
-
-    SHA512 c51e426c13045f45b907bc2801fcb01a2bb0620054ad5c2bb113fe486f77e292c85f29348e7d4d1c61f0263845be9403b754f418d81c293c5e2fb9e5407386b0
+    SHA512 bfffdde8b9e870fd509f83a073cace14c0bcd969f6f8649ae8fd2c679174d8c6549fee59d9e166f9c409f1f26f73951e24664dc0098a5ccc4e024d0f14cdd881
     HEAD_REF master
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ROARING_BUILD_STATIC)
 
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}
+    SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE
     OPTIONS
         -DROARING_BUILD_STATIC=${ROARING_BUILD_STATIC}
@@ -25,11 +20,10 @@ vcpkg_cmake_install()
 
 vcpkg_copy_pdbs()
 
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/roaring)
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 vcpkg_fixup_pkgconfig()
 
-# Handle copyright
-configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/roaring/vcpkg.json b/external_imported/vcpkg/ports/roaring/vcpkg.json
index 4634f1457..52002a54a 100644
--- a/external_imported/vcpkg/ports/roaring/vcpkg.json
+++ b/external_imported/vcpkg/ports/roaring/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "roaring",
-  "version": "0.9.6",
+  "version": "2.0.4",
   "description": "A better compressed bitset in C (and C++)",
   "homepage": "https://github.com/RoaringBitmap/CRoaring",
   "license": "Apache-2.0 OR MIT",
diff --git a/external_imported/vcpkg/ports/rocksdb/0001-fix-dependencies.patch b/external_imported/vcpkg/ports/rocksdb/0001-fix-dependencies.patch
new file mode 100644
index 000000000..7c1665441
--- /dev/null
+++ b/external_imported/vcpkg/ports/rocksdb/0001-fix-dependencies.patch
@@ -0,0 +1,122 @@
+ CMakeLists.txt               | 33 +++++++++++++++------------------
+ cmake/RocksDBConfig.cmake.in | 11 ++++++++---
+ 2 files changed, 23 insertions(+), 21 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 23a4014bc..045f5a36d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -87,7 +87,7 @@ endif()
+ 
+ include(CMakeDependentOption)
+ 
+-if(MSVC)
++if(0)
+   option(WITH_GFLAGS "build with GFlags" OFF)
+   option(WITH_XPRESS "build with windows built in compression" OFF)
+   option(ROCKSDB_SKIP_THIRDPARTY "skip thirdparty.inc" OFF)
+@@ -136,10 +136,7 @@ else()
+   endif()
+ 
+   if(WITH_SNAPPY)
+-    find_package(Snappy CONFIG)
+-    if(NOT Snappy_FOUND)
+-      find_package(Snappy REQUIRED)
+-    endif()
++    find_package(Snappy CONFIG REQUIRED)
+     add_definitions(-DSNAPPY)
+     list(APPEND THIRDPARTY_LIBS Snappy::snappy)
+   endif()
+@@ -163,16 +160,19 @@ else()
+   endif()
+ 
+   if(WITH_LZ4)
+-    find_package(lz4 REQUIRED)
++    find_package(lz4 CONFIG REQUIRED)
+     add_definitions(-DLZ4)
+     list(APPEND THIRDPARTY_LIBS lz4::lz4)
+   endif()
+ 
+   if(WITH_ZSTD)
+-    find_package(zstd REQUIRED)
++    find_package(zstd CONFIG REQUIRED)
+     add_definitions(-DZSTD)
+-    include_directories(${ZSTD_INCLUDE_DIR})
+-    list(APPEND THIRDPARTY_LIBS zstd::zstd)
++    if(TARGET zstd::libzstd_shared)
++      list(APPEND THIRDPARTY_LIBS zstd::libzstd_shared)
++    elseif(TARGET zstd::libzstd_static)
++      list(APPEND THIRDPARTY_LIBS zstd::libzstd_static)
++    endif()
+   endif()
+ endif()
+ 
+@@ -312,11 +312,10 @@ int main() {
+ endif()
+ 
+ if (WITH_LIBURING)
+-  find_package(uring)
+-  if (uring_FOUND)
+-    add_definitions(-DROCKSDB_IOURING_PRESENT)
+-    list(APPEND THIRDPARTY_LIBS uring::uring)
+-  endif()
++  find_package(PkgConfig)
++  pkg_check_modules(liburing REQUIRED IMPORTED_TARGET GLOBAL liburing>=2.0)
++  add_definitions(-DROCKSDB_IOURING_PRESENT)
++  list(APPEND THIRDPARTY_LIBS PkgConfig::liburing)
+ endif()
+ 
+ # Reset the required flags
+@@ -382,9 +381,9 @@ endif()
+ 
+ option(WITH_TBB "build with Threading Building Blocks (TBB)" OFF)
+ if(WITH_TBB)
+-  find_package(TBB REQUIRED)
++  find_package(TBB CONFIG REQUIRED)
+   add_definitions(-DTBB)
+-  list(APPEND THIRDPARTY_LIBS TBB::TBB)
++  list(APPEND THIRDPARTY_LIBS TBB::tbb)
+ endif()
+ 
+ # Stall notifications eat some performance from inserts
+@@ -1202,8 +1201,6 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS)
+     endforeach()
+   endforeach()
+ 
+-  install(DIRECTORY "${PROJECT_SOURCE_DIR}/cmake/modules" COMPONENT devel DESTINATION ${package_config_destination})
+-
+   install(
+     TARGETS ${ROCKSDB_STATIC_LIB}
+     EXPORT RocksDBTargets
+diff --git a/cmake/RocksDBConfig.cmake.in b/cmake/RocksDBConfig.cmake.in
+index 0bd14be11..a420d8bfe 100644
+--- a/cmake/RocksDBConfig.cmake.in
++++ b/cmake/RocksDBConfig.cmake.in
+@@ -33,11 +33,11 @@ if(@WITH_BZ2@)
+ endif()
+ 
+ if(@WITH_LZ4@)
+-  find_dependency(lz4)
++  find_dependency(lz4 CONFIG)
+ endif()
+ 
+ if(@WITH_ZSTD@)
+-  find_dependency(zstd)
++  find_dependency(zstd CONFIG)
+ endif()
+ 
+ if(@WITH_NUMA@)
+@@ -45,7 +45,12 @@ if(@WITH_NUMA@)
+ endif()
+ 
+ if(@WITH_TBB@)
+-  find_dependency(TBB)
++  find_dependency(TBB CONFIG)
++endif()
++
++if(@WITH_LIBURING@)
++  find_dependency(PkgConfig)
++  pkg_check_modules(liburing REQUIRED IMPORTED_TARGET GLOBAL liburing>=2.0)
+ endif()
+ 
+ find_dependency(Threads)
diff --git a/external_imported/vcpkg/ports/rocksdb/0002-only-build-one-flavor.patch b/external_imported/vcpkg/ports/rocksdb/0002-only-build-one-flavor.patch
deleted file mode 100644
index 125149b70..000000000
--- a/external_imported/vcpkg/ports/rocksdb/0002-only-build-one-flavor.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1a6411653..526dfcf60 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1077,13 +1077,17 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS)
- 
-   install(DIRECTORY "${PROJECT_SOURCE_DIR}/cmake/modules" COMPONENT devel DESTINATION ${package_config_destination})
- 
--  install(
--    TARGETS ${ROCKSDB_STATIC_LIB}
--    EXPORT RocksDBTargets
--    COMPONENT devel
--    ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
--    INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
--  )
-+  if(NOT ROCKSDB_BUILD_SHARED)
-+    install(
-+      TARGETS ${ROCKSDB_STATIC_LIB}
-+      EXPORT RocksDBTargets
-+      COMPONENT devel
-+      ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-+      INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
-+    )
-+  else()
-+    set_target_properties(${ROCKSDB_STATIC_LIB} PROPERTIES EXCLUDE_FROM_ALL TRUE)
-+  endif()
- 
-   if(ROCKSDB_BUILD_SHARED)
-     install(
diff --git a/external_imported/vcpkg/ports/rocksdb/0003-use-find-package.patch b/external_imported/vcpkg/ports/rocksdb/0003-use-find-package.patch
deleted file mode 100644
index 821a48b28..000000000
--- a/external_imported/vcpkg/ports/rocksdb/0003-use-find-package.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7b4f47a..3d90152 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -87,7 +87,7 @@ endif()
- 
- include(CMakeDependentOption)
- 
--if(MSVC)
-+if(MSVC AND NOT VCPKG_TOOLCHAIN)
-   option(WITH_GFLAGS "build with GFlags" OFF)
-   option(WITH_XPRESS "build with windows built in compression" OFF)
-   option(ROCKSDB_SKIP_THIRDPARTY "skip thirdparty.inc" OFF)
-@@ -136,10 +136,7 @@ else()
-   endif()
- 
-   if(WITH_SNAPPY)
--    find_package(Snappy CONFIG)
--    if(NOT Snappy_FOUND)
--      find_package(Snappy REQUIRED)
--    endif()
-+    find_package(Snappy CONFIG REQUIRED)
-     add_definitions(-DSNAPPY)
-     list(APPEND THIRDPARTY_LIBS Snappy::snappy)
-   endif()
-@@ -163,16 +160,19 @@ else()
-   endif()
- 
-   if(WITH_LZ4)
--    find_package(lz4 REQUIRED)
-+    find_package(lz4 CONFIG REQUIRED)
-     add_definitions(-DLZ4)
-     list(APPEND THIRDPARTY_LIBS lz4::lz4)
-   endif()
- 
-   if(WITH_ZSTD)
--    find_package(zstd REQUIRED)
-+    find_package(zstd CONFIG REQUIRED)
-     add_definitions(-DZSTD)
--    include_directories(${ZSTD_INCLUDE_DIR})
--    list(APPEND THIRDPARTY_LIBS zstd::zstd)
-+    if(TARGET zstd::libzstd_shared)
-+      list(APPEND THIRDPARTY_LIBS zstd::libzstd_shared)
-+    elseif(TARGET zstd::libzstd_static)
-+      list(APPEND THIRDPARTY_LIBS zstd::libzstd_static)
-+    endif()
-   endif()
- endif()
- 
-@@ -402,9 +402,9 @@ endif()
- 
- option(WITH_TBB "build with Threading Building Blocks (TBB)" OFF)
- if(WITH_TBB)
--  find_package(TBB REQUIRED)
-+  find_package(TBB CONFIG REQUIRED)
-   add_definitions(-DTBB)
--  list(APPEND THIRDPARTY_LIBS TBB::TBB)
-+  list(APPEND THIRDPARTY_LIBS TBB::tbb)
- endif()
- 
- # Stall notifications eat some performance from inserts
diff --git a/external_imported/vcpkg/ports/rocksdb/0004-fix-dependency-in-config.patch b/external_imported/vcpkg/ports/rocksdb/0004-fix-dependency-in-config.patch
deleted file mode 100644
index 7688b7763..000000000
--- a/external_imported/vcpkg/ports/rocksdb/0004-fix-dependency-in-config.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/cmake/RocksDBConfig.cmake.in b/cmake/RocksDBConfig.cmake.in
-index 0bd14be11..f9f6aa878 100644
---- a/cmake/RocksDBConfig.cmake.in
-+++ b/cmake/RocksDBConfig.cmake.in
-@@ -37,7 +37,7 @@ if(@WITH_LZ4@)
- endif()
- 
- if(@WITH_ZSTD@)
--  find_dependency(zstd)
-+  find_dependency(zstd CONFIG)
- endif()
- 
- if(@WITH_NUMA@)
-@@ -45,7 +45,7 @@ if(@WITH_NUMA@)
- endif()
- 
- if(@WITH_TBB@)
--  find_dependency(TBB)
-+  find_dependency(TBB CONFIG)
- endif()
- 
- find_dependency(Threads)
diff --git a/external_imported/vcpkg/ports/rocksdb/0005-do-not-install-cmake-modules.patch b/external_imported/vcpkg/ports/rocksdb/0005-do-not-install-cmake-modules.patch
deleted file mode 100644
index dc86cb419..000000000
--- a/external_imported/vcpkg/ports/rocksdb/0005-do-not-install-cmake-modules.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3d90152..b0c5d31 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1206,7 +1206,7 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS)
-     endforeach()
-   endforeach()
- 
--  install(DIRECTORY "${PROJECT_SOURCE_DIR}/cmake/modules" COMPONENT devel DESTINATION ${package_config_destination})
-+  #install(DIRECTORY "${PROJECT_SOURCE_DIR}/cmake/modules" COMPONENT devel DESTINATION ${package_config_destination})
- 
-   if(NOT ROCKSDB_BUILD_SHARED)
-     install(
diff --git a/external_imported/vcpkg/ports/rocksdb/portfile.cmake b/external_imported/vcpkg/ports/rocksdb/portfile.cmake
index fefdce2fb..deb1cf03f 100644
--- a/external_imported/vcpkg/ports/rocksdb/portfile.cmake
+++ b/external_imported/vcpkg/ports/rocksdb/portfile.cmake
@@ -1,16 +1,11 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO facebook/rocksdb
   REF "v${VERSION}"
-  SHA512 8a64adce7cbb35449fb7f55dc92d1f902f317d9173f7afb02e6f047e42cc648f9f553364fbae14b14ed2fa3f125d32f49cccfb0c49f82f392508575396552c6e
+  SHA512 524e3e70ed2b1d2e6c61a7b401946e50473cc95684ce4efc6250062f5bc945e443e96f7907fcc3ee1ab98c71179a8b56a654383cf2c0bbe1bb20907ab1ac7523
   HEAD_REF main
   PATCHES
-    0002-only-build-one-flavor.patch
-    0003-use-find-package.patch
-    0004-fix-dependency-in-config.patch
-    0005-do-not-install-cmake-modules.patch
+    0001-fix-dependencies.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" WITH_MD_LIBRARY)
@@ -18,14 +13,14 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ROCKSDB_BUILD_SHARED)
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
   FEATURES
-      "lz4"     WITH_LZ4
-      "snappy"  WITH_SNAPPY
-      "zlib"    WITH_ZLIB
-      "zstd"    WITH_ZSTD
-      "bzip2"   WITH_BZ2
-      "tbb"     WITH_TBB
-  INVERTED_FEATURES
-      "tbb"     CMAKE_DISABLE_FIND_PACKAGE_TBB
+    "liburing" WITH_LIBURING
+    "snappy" WITH_SNAPPY
+    "lz4" WITH_LZ4
+    "zlib" WITH_ZLIB
+    "zstd" WITH_ZSTD
+    "bzip2" WITH_BZ2
+    "numa" WITH_NUMA
+    "tbb" WITH_TBB
 )
 
 vcpkg_cmake_configure(
@@ -35,18 +30,19 @@ vcpkg_cmake_configure(
     -DWITH_TESTS=OFF
     -DWITH_BENCHMARK_TOOLS=OFF
     -DWITH_TOOLS=OFF
-    -DWITH_FOLLY_DISTRIBUTED_MUTEX=OFF
-    -DUSE_RTTI=1
+    -DUSE_RTTI=ON
     -DROCKSDB_INSTALL_ON_WINDOWS=ON
     -DFAIL_ON_WARNINGS=OFF
     -DWITH_MD_LIBRARY=${WITH_MD_LIBRARY}
-    -DPORTABLE=ON
-    -DCMAKE_DEBUG_POSTFIX=d
+    -DPORTABLE=1 # Minimum CPU arch to support, or 0 = current CPU, 1 = baseline CPU
     -DROCKSDB_BUILD_SHARED=${ROCKSDB_BUILD_SHARED}
-    -DCMAKE_DISABLE_FIND_PACKAGE_NUMA=TRUE
-    -DCMAKE_DISABLE_FIND_PACKAGE_gtest=TRUE
     -DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE
     ${FEATURE_OPTIONS}
+  OPTIONS_DEBUG
+    -DCMAKE_DEBUG_POSTFIX=d
+    -DWITH_RUNTIME_DEBUG=ON
+  OPTIONS_RELEASE
+    -DWITH_RUNTIME_DEBUG=OFF
 )
 
 vcpkg_cmake_install()
@@ -60,5 +56,13 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 vcpkg_fixup_pkgconfig()
 
-file(INSTALL "${SOURCE_PATH}/LICENSE.Apache" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-file(INSTALL "${SOURCE_PATH}/LICENSE.leveldb" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(COMMENT [[
+RocksDB is dual-licensed under both the GPLv2 (found in COPYING)
+and Apache 2.0 License (found in LICENSE.Apache). You may select,
+at your option, one of the above-listed licenses.
+]]
+  FILE_LIST
+    "${SOURCE_PATH}/LICENSE.leveldb"
+    "${SOURCE_PATH}/LICENSE.Apache"
+    "${SOURCE_PATH}/COPYING"
+)
diff --git a/external_imported/vcpkg/ports/rocksdb/vcpkg.json b/external_imported/vcpkg/ports/rocksdb/vcpkg.json
index 2c22a77be..5d1bf3773 100644
--- a/external_imported/vcpkg/ports/rocksdb/vcpkg.json
+++ b/external_imported/vcpkg/ports/rocksdb/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "rocksdb",
-  "version": "7.10.2",
+  "version": "8.10.0",
   "description": "A library that provides an embeddable, persistent key-value store for fast storage",
   "homepage": "https://github.com/facebook/rocksdb",
   "license": "GPL-2.0-only OR Apache-2.0",
+  "supports": "!uwp & !(arm & !arm64 & android)",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
@@ -19,37 +20,51 @@
   ],
   "features": {
     "bzip2": {
-      "description": "bzip2 support in rocksdb",
+      "description": "build with bzip2",
       "dependencies": [
         "bzip2"
       ]
     },
+    "liburing": {
+      "description": "build with liburing",
+      "supports": "linux",
+      "dependencies": [
+        {
+          "name": "liburing",
+          "platform": "linux"
+        }
+      ]
+    },
     "lz4": {
-      "description": "lz4 support in rocksdb",
+      "description": "build with lz4",
       "dependencies": [
         "lz4"
       ]
     },
+    "numa": {
+      "description": "build with NUMA policy support",
+      "supports": "linux"
+    },
     "snappy": {
-      "description": "snappy support in rocksdb",
+      "description": "build with SNAPPY",
       "dependencies": [
         "snappy"
       ]
     },
     "tbb": {
-      "description": "tbb support in rocksdb",
+      "description": "build with Threading Building Blocks (TBB)",
       "dependencies": [
         "tbb"
       ]
     },
     "zlib": {
-      "description": "zlib support in rocksdb",
+      "description": "build with zlib",
       "dependencies": [
         "zlib"
       ]
     },
     "zstd": {
-      "description": "zstd support in rocksdb",
+      "description": "build with zstd",
       "dependencies": [
         "zstd"
       ]
diff --git a/external_imported/vcpkg/ports/rply/vcpkg.json b/external_imported/vcpkg/ports/rply/vcpkg.json
index 613505914..a81d6dee8 100644
--- a/external_imported/vcpkg/ports/rply/vcpkg.json
+++ b/external_imported/vcpkg/ports/rply/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "rply",
-  "version-string": "1.1.4",
-  "port-version": 2,
+  "version": "1.1.4",
+  "port-version": 3,
   "description": "ANSI C Library for PLY file format input and output",
   "homepage": "http://w3.impa.br/~diego/software/rply",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/rsasynccpp/portfile.cmake b/external_imported/vcpkg/ports/rsasynccpp/portfile.cmake
index 4fa5cbb81..20db58868 100644
--- a/external_imported/vcpkg/ports/rsasynccpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/rsasynccpp/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH  SOURCE_PATH
     REPO renestein/Rstein.AsyncCpp
     REF 0.0.7
-    SHA512   b4cc1c68b6fc7bb8b418457ba18b834769abec07e44305955214f8918cc57f85c4258a0521ea55388fab3ec9724488e506d2b114c765b804991c38bf33133c55
+    SHA512 b4cc1c68b6fc7bb8b418457ba18b834769abec07e44305955214f8918cc57f85c4258a0521ea55388fab3ec9724488e506d2b114c765b804991c38bf33133c55
     HEAD_REF master
 )
 
@@ -26,22 +26,16 @@ else()
   endif()
 endif()
 
-if (TRIPLET_SYSTEM_ARCH MATCHES "x86")
-    set(MSBUILD_PLATFORM "x86")
-else ()
-    set(MSBUILD_PLATFORM ${TRIPLET_SYSTEM_ARCH})
-endif()
-
-
-vcpkg_install_msbuild(
-    SOURCE_PATH ${SOURCE_PATH}
+vcpkg_msbuild_install(
+    SOURCE_PATH "${SOURCE_PATH}"
     PROJECT_SUBPATH RStein.AsyncCppLib.sln
-    LICENSE_SUBPATH LICENSE
-    PLATFORM ${MSBUILD_PLATFORM}
-    DEBUG_CONFIGURATION ${DEBUG_CONFIGURATION}
-    RELEASE_CONFIGURATION ${RELEASE_CONFIGURATION}
+    PLATFORM "${TRIPLET_SYSTEM_ARCH}"
+    DEBUG_CONFIGURATION "${DEBUG_CONFIGURATION}"
+    RELEASE_CONFIGURATION "${RELEASE_CONFIGURATION}"
 )
 
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+
 file(COPY "${SOURCE_PATH}/RStein.AsyncCpp/"
     DESTINATION "${CURRENT_PACKAGES_DIR}/include/asynccpp"
     FILES_MATCHING PATTERN "*.h")
diff --git a/external_imported/vcpkg/ports/rsasynccpp/vcpkg.json b/external_imported/vcpkg/ports/rsasynccpp/vcpkg.json
index b74ead250..2906bccab 100644
--- a/external_imported/vcpkg/ports/rsasynccpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/rsasynccpp/vcpkg.json
@@ -1,11 +1,18 @@
 {
   "name": "rsasynccpp",
   "version": "0.0.7",
-  "port-version": 1,
+  "port-version": 3,
   "maintainers": "Rene Stein <rene@renestein.net>",
   "description": "Task Parallel Library (TPL)/dataflow/actors/async primitives for C++ based on C++ 20 coroutines.",
   "homepage": "https://github.com/renestein/Rstein.AsyncCpp",
   "supports": "windows & !arm",
+  "dependencies": [
+    {
+      "name": "vcpkg-msbuild",
+      "host": true,
+      "platform": "windows"
+    }
+  ],
   "features": {
     "lib-cl-win-legacy-await": {
       "description": "Legacy coroutines (/await switch, std::experimental namespace)."
diff --git a/external_imported/vcpkg/ports/rsm-binary-io/portfile.cmake b/external_imported/vcpkg/ports/rsm-binary-io/portfile.cmake
index 121c06018..d1d0f9f33 100644
--- a/external_imported/vcpkg/ports/rsm-binary-io/portfile.cmake
+++ b/external_imported/vcpkg/ports/rsm-binary-io/portfile.cmake
@@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Ryan-rsm-McKenzie/binary_io
-    REF 2.0.5
-    SHA512 787833487b9e2b64aeb73842024a52a6ad646d2609342983ebf1539878b96565bf329c8b05afca0fb35a1e40a91174131ad7a0bdc79b168a12bf02f3d6e0cd6d
+    REF 2.0.6
+    SHA512 055290ee81e93aa8a8cda567eea848c76a830d78afb1c40bc3ba0e23b41bf80364fc8621ddaf8d48678acc4b5b7fd1ba2075e2bd23995655131954f580bdd4ae
     HEAD_REF main
 )
 
diff --git a/external_imported/vcpkg/ports/rsm-binary-io/vcpkg.json b/external_imported/vcpkg/ports/rsm-binary-io/vcpkg.json
index 1b66d5141..acda7b565 100644
--- a/external_imported/vcpkg/ports/rsm-binary-io/vcpkg.json
+++ b/external_imported/vcpkg/ports/rsm-binary-io/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "rsm-binary-io",
-  "version-semver": "2.0.5",
+  "version-semver": "2.0.6",
   "description": "A binary i/o library for C++, without the agonizing pain",
   "homepage": "https://github.com/Ryan-rsm-McKenzie/binary_io",
   "documentation": "https://ryan-rsm-mckenzie.github.io/binary_io/",
diff --git a/external_imported/vcpkg/ports/rsm-bsa/portfile.cmake b/external_imported/vcpkg/ports/rsm-bsa/portfile.cmake
index 03b46262b..d83208518 100644
--- a/external_imported/vcpkg/ports/rsm-bsa/portfile.cmake
+++ b/external_imported/vcpkg/ports/rsm-bsa/portfile.cmake
@@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Ryan-rsm-McKenzie/bsa
-    REF 4.0.3
-    SHA512 ec8a2aff1c833d7bffd6345ab989bc57137eee3fb2c5b7509027f068783d42d61bcc4b694b53a7961c1c69ee52834efadef9b3c82e1a739c0c5491af75e8dde7
+    REF 4.1.0
+    SHA512 c488a4f7cffa59064baafd429cf118a8f8a7b5594a0bd49a0ed468572b37af2e7428a83ad83cc7b13b556744a444cb7b8a4591c7018e49cadb1c5d42ae780f51
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/rsm-bsa/vcpkg.json b/external_imported/vcpkg/ports/rsm-bsa/vcpkg.json
index 354a0f17d..d27b67918 100644
--- a/external_imported/vcpkg/ports/rsm-bsa/vcpkg.json
+++ b/external_imported/vcpkg/ports/rsm-bsa/vcpkg.json
@@ -1,16 +1,13 @@
 {
   "name": "rsm-bsa",
-  "version-semver": "4.0.3",
+  "version-semver": "4.1.0",
   "description": "A C++ library for working with the Bethesda archive file format",
   "homepage": "https://github.com/Ryan-rsm-McKenzie/bsa",
   "documentation": "https://ryan-rsm-mckenzie.github.io/bsa/",
   "license": "MIT",
   "supports": "!x86 & !osx & !uwp",
   "dependencies": [
-    {
-      "name": "directxtex",
-      "platform": "windows"
-    },
+    "directxtex",
     "lz4",
     "rsm-binary-io",
     "rsm-mmio",
diff --git a/external_imported/vcpkg/ports/rsm-mmio/portfile.cmake b/external_imported/vcpkg/ports/rsm-mmio/portfile.cmake
index cec066167..83bc1f462 100644
--- a/external_imported/vcpkg/ports/rsm-mmio/portfile.cmake
+++ b/external_imported/vcpkg/ports/rsm-mmio/portfile.cmake
@@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Ryan-rsm-McKenzie/mmio
-    REF 1.1.0
-    SHA512 54c63c345d9e0a284d13078d525fcbe73d793462968121fee89a19c810cdac736aca9c81f4c8b4f5ea51db1c47ad0c55e7cea38772049e4939b0d6e280f9a332
+    REF 2.0.0
+    SHA512 a1b0d586c12708233c0379b16a9f60bab27f12cb414736ee245e37888622ac352e834a58808127087788f930311125e2b26e6dad156c72e68143f95910cda48f
     HEAD_REF main
 )
 
diff --git a/external_imported/vcpkg/ports/rsm-mmio/vcpkg.json b/external_imported/vcpkg/ports/rsm-mmio/vcpkg.json
index b88664f9c..f88d47d5e 100644
--- a/external_imported/vcpkg/ports/rsm-mmio/vcpkg.json
+++ b/external_imported/vcpkg/ports/rsm-mmio/vcpkg.json
@@ -1,9 +1,9 @@
 {
   "name": "rsm-mmio",
-  "version-semver": "1.1.0",
-  "port-version": 2,
-  "description": "A cross-platform memory-mapped io library for C++ ",
+  "version-semver": "2.0.0",
+  "description": "A cross-platform memory-mapped io library for C++",
   "homepage": "https://github.com/Ryan-rsm-McKenzie/mmio",
+  "license": "MIT",
   "supports": "!osx & !uwp",
   "dependencies": [
     {
diff --git a/external_imported/vcpkg/ports/rsocket/fix-rsockserver-build-error.patch b/external_imported/vcpkg/ports/rsocket/fix-rsockserver-build-error.patch
new file mode 100644
index 000000000..b7dd67260
--- /dev/null
+++ b/external_imported/vcpkg/ports/rsocket/fix-rsockserver-build-error.patch
@@ -0,0 +1,153 @@
+diff --git a/rsocket/RSocketServer.cpp b/rsocket/RSocketServer.cpp
+index 1e20281..3a9f6b2 100644
+--- a/rsocket/RSocketServer.cpp
++++ b/rsocket/RSocketServer.cpp
+@@ -125,7 +125,7 @@ void RSocketServer::acceptConnection(
+        weakConSet = std::weak_ptr<ConnectionSet>(connectionSet_),
+        scheduledResponder = useScheduledResponder_](
+           std::unique_ptr<DuplexConnection> conn,
+-          SetupParameters params) mutable {
++          SetupParameters params) mutable noexcept{
+         if (auto connectionSet = weakConSet.lock()) {
+           RSocketServer::onRSocketSetup(
+               serviceHandler,
+@@ -135,12 +135,15 @@ void RSocketServer::acceptConnection(
+               std::move(params));
+         }
+       },
+-      std::bind(
+-          &RSocketServer::onRSocketResume,
+-          this,
+-          serviceHandler,
+-          std::placeholders::_1,
+-          std::placeholders::_2));
++      [this, serviceHandler=serviceHandler](
++          std::unique_ptr<DuplexConnection> connection,
++          ResumeParameters resumeParameters) mutable noexcept{
++              this->onRSocketResume(
++                  serviceHandler,
++                  std::move(connection),
++                  resumeParameters
++              );
++        });
+ }
+ 
+ void RSocketServer::onRSocketSetup(
+@@ -206,7 +209,7 @@ void RSocketServer::onRSocketSetup(
+ void RSocketServer::onRSocketResume(
+     std::shared_ptr<RSocketServiceHandler> serviceHandler,
+     std::unique_ptr<DuplexConnection> connection,
+-    ResumeParameters resumeParams) {
++    ResumeParameters resumeParams) noexcept{
+   auto result = serviceHandler->onResume(resumeParams.token);
+   if (result.hasError()) {
+     stats_->resumeFailedNoState();
+diff --git a/rsocket/RSocketServer.h b/rsocket/RSocketServer.h
+index 39dae66..e2346ef 100644
+--- a/rsocket/RSocketServer.h
++++ b/rsocket/RSocketServer.h
+@@ -118,7 +118,7 @@ class RSocketServer {
+   void onRSocketResume(
+       std::shared_ptr<RSocketServiceHandler> serviceHandler,
+       std::unique_ptr<DuplexConnection> connection,
+-      rsocket::ResumeParameters setupPayload);
++      rsocket::ResumeParameters setupPayload)noexcept;
+ 
+   const std::unique_ptr<ConnectionAcceptor> duplexConnectionAcceptor_;
+   bool started{false};
+diff --git a/yarpl/flowable/AsyncGeneratorShim.h b/yarpl/flowable/AsyncGeneratorShim.h
+index 72d212c..79a09f1 100644
+--- a/yarpl/flowable/AsyncGeneratorShim.h
++++ b/yarpl/flowable/AsyncGeneratorShim.h
+@@ -96,7 +96,7 @@ class AsyncGeneratorShim {
+                     value.emplace(std::move(*item));
+                   }
+                 } catch (const std::exception& ex) {
+-                  value.emplaceException(std::current_exception(), ex);
++                  value.emplaceException(std::current_exception());
+                 } catch (...) {
+                   value.emplaceException(std::current_exception());
+                 }
+diff --git a/yarpl/flowable/Flowable.h b/yarpl/flowable/Flowable.h
+index 9dff78b..bccd70d 100644
+--- a/yarpl/flowable/Flowable.h
++++ b/yarpl/flowable/Flowable.h
+@@ -494,7 +494,7 @@ std::shared_ptr<Flowable<T>> Flowable<T>::fromGenerator(
+       }
+     } catch (const std::exception& ex) {
+       subscriber.onError(
+-          folly::exception_wrapper(std::current_exception(), ex));
++          folly::exception_wrapper(std::current_exception()));
+     } catch (...) {
+       subscriber.onError(std::runtime_error(
+           "Flowable::fromGenerator() threw from Subscriber:onNext()"));
+diff --git a/yarpl/flowable/FlowableOperator.h b/yarpl/flowable/FlowableOperator.h
+index 314ba7f..fe63504 100644
+--- a/yarpl/flowable/FlowableOperator.h
++++ b/yarpl/flowable/FlowableOperator.h
+@@ -178,7 +178,7 @@ class MapOperator : public FlowableOperator<U, D> {
+           this->subscriberOnNext(flowable->function_(std::move(value)));
+         }
+       } catch (const std::exception& exn) {
+-        folly::exception_wrapper ew{std::current_exception(), exn};
++        folly::exception_wrapper ew{std::current_exception()};
+         this->terminateErr(std::move(ew));
+       }
+     }
+@@ -190,7 +190,7 @@ class MapOperator : public FlowableOperator<U, D> {
+         }
+       } catch (const std::exception& exn) {
+         this->terminateErr(
+-            folly::exception_wrapper{std::current_exception(), exn});
++            folly::exception_wrapper{std::current_exception()});
+       }
+     }
+ 
+@@ -570,7 +570,7 @@ class FlatMapOperator : public FlowableOperator<T, R> {
+       try {
+         mappedStream = flowable_->function_(std::move(value));
+       } catch (const std::exception& exn) {
+-        folly::exception_wrapper ew{std::current_exception(), exn};
++        folly::exception_wrapper ew{std::current_exception()};
+         {
+           std::lock_guard<std::mutex> g(onErrorExGuard_);
+           onErrorEx_ = ew;
+diff --git a/yarpl/flowable/Subscriber.h b/yarpl/flowable/Subscriber.h
+index d1dc3b5..582f9c4 100644
+--- a/yarpl/flowable/Subscriber.h
++++ b/yarpl/flowable/Subscriber.h
+@@ -301,7 +301,7 @@ class Base : public LambdaSubscriber<T> {
+       next_(std::move(value));
+     } catch (const std::exception& exn) {
+       this->cancel();
+-      auto ew = folly::exception_wrapper{std::current_exception(), exn};
++      auto ew = folly::exception_wrapper{std::current_exception()};
+       LOG(ERROR) << "'next' method should not throw: " << ew.what();
+       onErrorImpl(ew);
+       return;
+diff --git a/yarpl/observable/ObservableOperator.h b/yarpl/observable/ObservableOperator.h
+index 451c6bd..0e60b48 100644
+--- a/yarpl/observable/ObservableOperator.h
++++ b/yarpl/observable/ObservableOperator.h
+@@ -196,7 +196,7 @@ class MapOperator : public ObservableOperator<U, D> {
+       try {
+         this->observerOnNext(observable_->function_(std::move(value)));
+       } catch (const std::exception& exn) {
+-        folly::exception_wrapper ew{std::current_exception(), exn};
++        folly::exception_wrapper ew{std::current_exception()};
+         this->terminateErr(std::move(ew));
+       }
+     }
+diff --git a/yarpl/single/SingleOperator.h b/yarpl/single/SingleOperator.h
+index 0b3e739..4defd64 100644
+--- a/yarpl/single/SingleOperator.h
++++ b/yarpl/single/SingleOperator.h
+@@ -197,7 +197,7 @@ class MapOperator : public SingleOperator<U, D> {
+         auto map_operator = this->getOperator();
+         this->observerOnSuccess(map_operator->function_(std::move(value)));
+       } catch (const std::exception& exn) {
+-        folly::exception_wrapper ew{std::current_exception(), exn};
++        folly::exception_wrapper ew{std::current_exception()};
+         this->observerOnError(std::move(ew));
+       }
+     }
diff --git a/external_imported/vcpkg/ports/rsocket/portfile.cmake b/external_imported/vcpkg/ports/rsocket/portfile.cmake
index f6ec73c4a..3ee27b265 100644
--- a/external_imported/vcpkg/ports/rsocket/portfile.cmake
+++ b/external_imported/vcpkg/ports/rsocket/portfile.cmake
@@ -14,6 +14,7 @@ vcpkg_from_github(
     fix-find-dependencies.patch
     use-cpp-17.patch
     fix-folly.patch
+    fix-rsockserver-build-error.patch
 )
 
 vcpkg_cmake_configure(
diff --git a/external_imported/vcpkg/ports/rsocket/vcpkg.json b/external_imported/vcpkg/ports/rsocket/vcpkg.json
index 018579f0b..5872579ee 100644
--- a/external_imported/vcpkg/ports/rsocket/vcpkg.json
+++ b/external_imported/vcpkg/ports/rsocket/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "rsocket",
   "version-string": "2021.08.30.00",
-  "port-version": 1,
+  "port-version": 3,
   "description": "C++ implementation of RSocket http://rsocket.io",
   "homepage": "https://github.com/rsocket/rsocket-cpp",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/rtabmap/0003-fix-qt.patch b/external_imported/vcpkg/ports/rtabmap/0003-fix-qt.patch
deleted file mode 100644
index facc1ffe8..000000000
--- a/external_imported/vcpkg/ports/rtabmap/0003-fix-qt.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -966,13 +966,13 @@ IF(ANDROID)
-    IF(BUILD_APP)
-       ADD_SUBDIRECTORY( app )
-    ENDIF(BUILD_APP)
-+ELSEIF(NOT WITH_QT)
-+    MESSAGE(WARNING "the GUI lib and the stand-alone application will not be compiled...")
- ELSEIF(Qt5_FOUND OR (QT4_FOUND AND QT_QTCORE_FOUND AND QT_QTGUI_FOUND))
-    ADD_SUBDIRECTORY( guilib )
-    IF(BUILD_APP)
-       ADD_SUBDIRECTORY( app )
-    ENDIF(BUILD_APP)
--ELSEIF(WITH_QT)
--   MESSAGE(WARNING "Qt not found, the GUI lib and the stand-alone application will not be compiled...")
- ENDIF()
- 
- IF(BUILD_TOOLS)
diff --git a/external_imported/vcpkg/ports/rtabmap/cpp17.patch b/external_imported/vcpkg/ports/rtabmap/cpp17.patch
deleted file mode 100644
index d595f89ee..000000000
--- a/external_imported/vcpkg/ports/rtabmap/cpp17.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-diff --git a/corelib/src/SimpleIni.h b/corelib/src/SimpleIni.h
-index 3fccf9dc1..e787be813 100644
---- a/corelib/src/SimpleIni.h
-+++ b/corelib/src/SimpleIni.h
-@@ -324,7 +324,10 @@ public:
- #endif
- 
-         /** Strict less ordering by name of key only */
--        struct KeyOrder : std::binary_function<Entry, Entry, bool> {
-+        struct KeyOrder {
-+            using result_type = bool;
-+            using first_argument_type = Entry;
-+            using second_argument_type = Entry;
-             bool operator()(const Entry & lhs, const Entry & rhs) const {
-                 const static SI_STRLESS isLess = SI_STRLESS();
-                 return isLess(lhs.pItem, rhs.pItem);
-@@ -332,7 +335,10 @@ public:
-         };
- 
-         /** Strict less ordering by order, and then name of key */
--        struct LoadOrder : std::binary_function<Entry, Entry, bool> {
-+        struct LoadOrder {
-+            using result_type = bool;
-+            using first_argument_type = Entry;
-+            using second_argument_type = Entry;
-             bool operator()(const Entry & lhs, const Entry & rhs) const {
-                 if (lhs.nOrder != rhs.nOrder) {
-                     return lhs.nOrder < rhs.nOrder;
-diff --git a/corelib/src/rtflann/algorithms/dist.h b/corelib/src/rtflann/algorithms/dist.h
-index a286f1eea..6456eb25b 100644
---- a/corelib/src/rtflann/algorithms/dist.h
-+++ b/corelib/src/rtflann/algorithms/dist.h
-@@ -517,6 +517,7 @@ struct HammingPopcnt
-             result += __builtin_popcountll(a_final ^ b_final);
-         }
- #else
-+        typedef unsigned long long pop_t;
-         HammingLUT lut;
-         result = lut(reinterpret_cast<const unsigned char*> (a),
-                      reinterpret_cast<const unsigned char*> (b), size * sizeof(pop_t));
-diff --git a/corelib/src/rtflann/algorithms/kdtree_index.h b/corelib/src/rtflann/algorithms/kdtree_index.h
-index c2ab18864..407233770 100644
---- a/corelib/src/rtflann/algorithms/kdtree_index.h
-+++ b/corelib/src/rtflann/algorithms/kdtree_index.h
-@@ -37,6 +37,7 @@
- #include <cstring>
- #include <stdarg.h>
- #include <cmath>
-+#include <random>
- 
- #include "rtflann/general.h"
- #include "rtflann/algorithms/nn_index.h"
-@@ -675,9 +676,11 @@ protected:
- 
-         tree_roots_.resize(trees_);
-         /* Construct the randomized trees. */
-+        std::random_device rd;
-+        std::mt19937 g(rd());
-         for (int i = 0; i < trees_; i++) {
-             /* Randomize the order of vectors to allow for unbiased sampling. */
--            std::random_shuffle(ind.begin(), ind.end());
-+            std::shuffle(ind.begin(), ind.end(),g);
-             tree_roots_[i] = divideTree(&ind[0], int(size_) );
-         }
-         delete[] mean_;
-diff --git a/corelib/src/rtflann/util/heap.h b/corelib/src/rtflann/util/heap.h
-index b104ee3ae..a9b50550c 100644
---- a/corelib/src/rtflann/util/heap.h
-+++ b/corelib/src/rtflann/util/heap.h
-@@ -115,8 +115,11 @@ public:
-         count = 0;
-     }
- 
--    struct CompareT : public std::binary_function<T,T,bool>
-+    struct CompareT
-     {
-+        using result_type = bool;
-+        using first_argument_type = T;
-+        using second_argument_type = T;
-         bool operator()(const T& t_1, const T& t_2) const
-         {
-             return t_2 < t_1;
-diff --git a/corelib/src/rtflann/util/lsh_table.h b/corelib/src/rtflann/util/lsh_table.h
-index 974bb9e44..5389dc743 100644
---- a/corelib/src/rtflann/util/lsh_table.h
-+++ b/corelib/src/rtflann/util/lsh_table.h
-@@ -39,6 +39,7 @@
- #include <iostream>
- #include <iomanip>
- #include <limits.h>
-+#include <random>
- // TODO as soon as we use C++0x, use the code in USE_UNORDERED_MAP
- #if RTFLANN_USE_UNORDERED_MAP
- #include <unordered_map>
-@@ -362,9 +363,11 @@ inline LshTable<unsigned char>::LshTable(unsigned int feature_size, unsigned int
-     mask_ = std::vector<size_t>((size_t)ceil((float)(feature_size * sizeof(char)) / (float)sizeof(size_t)), 0);
- 
-     // A bit brutal but fast to code
-+    std::random_device rd;
-+    std::mt19937 g(rd());
-     std::vector<size_t> indices(feature_size * CHAR_BIT);
-     for (size_t i = 0; i < feature_size * CHAR_BIT; ++i) indices[i] = i;
--    std::random_shuffle(indices.begin(), indices.end());
-+    std::shuffle(indices.begin(), indices.end(),g);
- 
-     // Generate a random set of order of subsignature_size_ bits
-     for (unsigned int i = 0; i < key_size_; ++i) {
-diff --git a/corelib/src/rtflann/util/random.h b/corelib/src/rtflann/util/random.h
-index 871c9d15f..5d96ac273 100644
---- a/corelib/src/rtflann/util/random.h
-+++ b/corelib/src/rtflann/util/random.h
-@@ -35,6 +35,7 @@
- #include <cstdlib>
- #include <cstddef>
- #include <vector>
-+#include <random>
- 
- #include "rtflann/general.h"
- 
-@@ -75,14 +76,6 @@ inline int rand_int(int high = RAND_MAX, int low = 0)
-     return low + (int) ( double(high-low) * (std::rand() / (RAND_MAX + 1.0)));
- }
- 
--
--class RandomGenerator
--{
--public:
--    ptrdiff_t operator() (ptrdiff_t i) { return rand_int(i); }
--};
--
--
- /**
-  * Random number generator that returns a distinct number from
-  * the [0,n) interval each time.
-@@ -110,14 +103,15 @@ public:
-      */
-     void init(int n)
-     {
--        static RandomGenerator generator;
-         // create and initialize an array of size n
-         vals_.resize(n);
-         size_ = n;
-         for (int i = 0; i < size_; ++i) vals_[i] = i;
- 
-         // shuffle the elements in the array
--        std::random_shuffle(vals_.begin(), vals_.end(), generator);
-+        std::random_device rd;
-+        std::mt19937 g(rd());
-+        std::shuffle(vals_.begin(), vals_.end(), g);
- 
-         counter_ = 0;
-     }
diff --git a/external_imported/vcpkg/ports/rtabmap/fix-CMake-export.patch b/external_imported/vcpkg/ports/rtabmap/fix-CMake-export.patch
deleted file mode 100644
index 810ec1671..000000000
--- a/external_imported/vcpkg/ports/rtabmap/fix-CMake-export.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ef02aa0..32a1e38 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1656,3 +1656,22 @@ MESSAGE(SEND_ERROR "No graph optimizer found! You should have at least one of th
- ENDIF(NOT GTSAM_FOUND AND NOT G2O_FOUND AND NOT WITH_TORO AND NOT WITH_CERES AND NOT CERES_FOUND)
- 
- # vim: set et ft=cmake fenc=utf-8 ff=unix sts=0 sw=2 ts=2 :
-+
-+SET(install_targets rtabmap_utilite rtabmap_core)
-+TARGET_INCLUDE_DIRECTORIES(rtabmap_utilite INTERFACE $<INSTALL_INTERFACE:include/rtabmap-0.20>)
-+TARGET_INCLUDE_DIRECTORIES(rtabmap_core INTERFACE $<INSTALL_INTERFACE:include/rtabmap-0.20>)
-+INSTALL(TARGETS ${install_targets} EXPORT unofficial-rtabmap-config)
-+
-+INSTALL(EXPORT unofficial-rtabmap-config
-+    NAMESPACE unofficial::rtabmap::
-+    DESTINATION share/unofficial-rtabmap
-+    FILE unofficial-rtabmap-config.cmake
-+)
-+
-+INCLUDE(CMakePackageConfigHelpers)
-+write_basic_package_version_file(
-+  "${CMAKE_CURRENT_BINARY_DIR}/unofficial-rtabmapConfigVersion.cmake"
-+  VERSION ${PROJECT_VERSION}
-+  COMPATIBILITY SameMajorVersion)
-+
-+INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/unofficial-rtabmapConfigVersion.cmake" DESTINATION "share/unofficial-rtabmap")
diff --git a/external_imported/vcpkg/ports/rtabmap/fix_autouic.patch b/external_imported/vcpkg/ports/rtabmap/fix_autouic.patch
new file mode 100644
index 000000000..540642dd3
--- /dev/null
+++ b/external_imported/vcpkg/ports/rtabmap/fix_autouic.patch
@@ -0,0 +1,15 @@
+diff --git a/guilib/src/CMakeLists.txt b/guilib/src/CMakeLists.txt
+index 349f6f9e..ac54b0f2 100644
+--- a/guilib/src/CMakeLists.txt
++++ b/guilib/src/CMakeLists.txt
+@@ -60,6 +60,10 @@ SET(qrc
+     ./GuiLib.qrc
+ )
+ 
++set(CMAKE_AUTOMOC OFF)
++set(CMAKE_AUTORCC OFF)
++set(CMAKE_AUTOUIC OFF)
++
+ IF(QT4_FOUND)
+     # generate rules for building source files from the resources
+     QT4_ADD_RESOURCES(srcs_qrc ${qrc})
diff --git a/external_imported/vcpkg/ports/rtabmap/fix_link.patch b/external_imported/vcpkg/ports/rtabmap/fix_link.patch
new file mode 100644
index 000000000..474da494a
--- /dev/null
+++ b/external_imported/vcpkg/ports/rtabmap/fix_link.patch
@@ -0,0 +1,15 @@
+diff --git a/corelib/src/OctoMap.cpp b/corelib/src/OctoMap.cpp
+index 8a1e1bb..d7b60da 100644
+--- a/corelib/src/OctoMap.cpp
++++ b/corelib/src/OctoMap.cpp
+@@ -278,10 +278,8 @@ RtabmapColorOcTree::StaticMemberInitializer::StaticMemberInitializer() {
+ 	 AbstractOcTree::registerTreeType(tree);
+  }
+ 
+-#ifndef _WIN32
+ // On Windows, the app freezes on start if the following is defined
+ RtabmapColorOcTree::StaticMemberInitializer RtabmapColorOcTree::RtabmapColorOcTreeMemberInit;
+-#endif
+ 
+ 
+ //////////////////////////////////////
diff --git a/external_imported/vcpkg/ports/rtabmap/portfile.cmake b/external_imported/vcpkg/ports/rtabmap/portfile.cmake
index 5a13bcf40..b06cf79e3 100644
--- a/external_imported/vcpkg/ports/rtabmap/portfile.cmake
+++ b/external_imported/vcpkg/ports/rtabmap/portfile.cmake
@@ -3,44 +3,53 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO introlab/rtabmap
-    # rtabmap stops releasing, check their CMakeLists.txt for version.
-    # currently is 0.20.23
-    REF 95e6a9f03936697a60be2c26e119c519e47c11f5
-    SHA512 082af7e15316bdeb89ff833a87a91916ddbf85de56bf4f38a0b5a40f4f330ecc057ae72a2f5ec901824e51d6f73c4a05a328116eaa5529551ffe4ca770fe0474
+    REF 0.21.0
+    SHA512 47fa00e760cd9089d42dc27cc0120f2dc2ad4b32b6a05e87fb5320fd6fe3971e68958984714895640989543be9252fd0fb96ccebf0d00d70afbad224022a7a53
     HEAD_REF master
     PATCHES
-        0003-fix-qt.patch
-        cpp17.patch
-        fix-CMake-export.patch
+        fix_autouic.patch
+        fix_link.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        gui WITH_QT
+        octomap WITH_OCTOMAP
+        realsense2 WITH_REALSENSE2
+        k4w2 WITH_K4W2
+        openni2 WITH_OPENNI2
+)
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS REL_FEATURE_OPTIONS
     FEATURES
         tools BUILD_TOOLS
+        tools BUILD_APP
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE
+    OPTIONS_DEBUG
+        -DBUILD_TOOLS=OFF
+        -DBUILD_APP=OFF
+    OPTIONS_RELEASE
+        ${REL_FEATURE_OPTIONS}
     OPTIONS
         ${FEATURE_OPTIONS}
-        -DBUILD_APP=OFF
+        -DBUILD_AS_BUNDLE=OFF
         -DBUILD_EXAMPLES=OFF
-        -DWITH_QT=OFF
-        -DWITH_ORB_OCTREE=OFF
+        -DWITH_ORB_OCTREE=ON
         -DWITH_TORCH=OFF
         -DWITH_PYTHON=OFF
         -DWITH_PYTHON_THREADING=OFF
         -DWITH_PDAL=OFF
         -DWITH_FREENECT=OFF
         -DWITH_FREENECT2=OFF
-        -DWITH_K4W2=OFF
         -DWITH_K4A=OFF
-        -DWITH_OPENNI2=OFF
         -DWITH_DC1394=OFF
-        -DWITH_G2O=OFF
+        -DWITH_G2O=ON
         -DWITH_GTSAM=OFF
-        -DWITH_CERES=OFF
+        -DWITH_CERES=ON
         -DWITH_VERTIGO=OFF
         -DWITH_CVSBA=OFF
         -DWITH_POINTMATCHER=OFF
@@ -51,10 +60,8 @@ vcpkg_cmake_configure(
         -DWITH_ZEDOC=OFF
         -DWITH_REALSENSE=OFF
         -DWITH_REALSENSE_SLAM=OFF
-        -DWITH_REALSENSE2=OFF
         -DWITH_MYNTEYE=OFF
         -DWITH_DEPTHAI=OFF
-        -DWITH_OCTOMAP=OFF
         -DWITH_CPUTSDF=OFF
         -DWITH_OPENCHISEL=OFF
         -DWITH_ALICE_VISION=OFF
@@ -70,18 +77,11 @@ vcpkg_cmake_configure(
 )
 
 vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-rtabmap CONFIG_PATH share/unofficial-rtabmap)
 
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/unofficial-rtabmap/unofficial-rtabmap-config.cmake"
-    [[# Generated by CMake]]
-    [[# Generated by CMake 
-include(CMakeFindDependencyMacro)
-find_dependency(OpenCV)
-find_dependency(PCL)
-find_dependency(ZLIB)
-find_dependency(VTK)
-find_dependency(OpenMP)]]
-)
+vcpkg_cmake_config_fixup(PACKAGE_NAME RTABMap CONFIG_PATH CMake)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 vcpkg_copy_tools(TOOL_NAMES rtabmap-res_tool AUTO_CLEAN)
 
@@ -104,13 +104,37 @@ if("tools" IN_LIST FEATURES)
         rtabmap-globalBundleAdjustment
     AUTO_CLEAN
   )
-endif()
+  if("gui" IN_LIST FEATURES)
+    vcpkg_copy_tools(
+        TOOL_NAMES
+            rtabmap
+            rtabmap-calibration
+            rtabmap-databaseViewer
+            rtabmap-dataRecorder
+            rtabmap-odometryViewer
+            rtabmap-rgbd_camera
+        AUTO_CLEAN
+    )
+    
+    # Remove duplicate files that were added by qtdeploy 
+    # that would be already deployed by vcpkg_copy_tools
+    file(RENAME "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/tmp")
+    file(GLOB RTABMAP_REL_LIBS "${CURRENT_PACKAGES_DIR}/tmp/rtabmap*")
+    file(COPY ${RTABMAP_REL_LIBS} DESTINATION  "${CURRENT_PACKAGES_DIR}/bin")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tmp")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/translations")
+    #qt.conf
+    file(COPY "${CURRENT_INSTALLED_DIR}/tools/Qt6/bin/qt.conf" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf" "./../../../" "./../../")
 
-file(REMOVE_RECURSE
-    "${CURRENT_PACKAGES_DIR}/debug/include"
-    "${CURRENT_PACKAGES_DIR}/debug/share"
-    "${CURRENT_PACKAGES_DIR}/debug/CMake"
-    "${CURRENT_PACKAGES_DIR}/CMake"
-)
+    # Debug
+    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/debug/tmp")
+    file(GLOB RTABMAP_DBG_LIBS "${CURRENT_PACKAGES_DIR}/debug/tmp/rtabmap*")
+    file(COPY ${RTABMAP_DBG_LIBS} DESTINATION  "${CURRENT_PACKAGES_DIR}/debug/bin")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tmp")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/plugins")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/translations")
+  endif()
+endif()
 
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/rtabmap/vcpkg.json b/external_imported/vcpkg/ports/rtabmap/vcpkg.json
index 000b215ac..66e28a8da 100644
--- a/external_imported/vcpkg/ports/rtabmap/vcpkg.json
+++ b/external_imported/vcpkg/ports/rtabmap/vcpkg.json
@@ -1,12 +1,14 @@
 {
   "name": "rtabmap",
-  "version": "0.20.23",
-  "port-version": 2,
+  "version": "0.21.0",
+  "port-version": 3,
   "description": "Real-Time Appearance-Based Mapping",
   "homepage": "https://introlab.github.io/rtabmap/",
   "license": "BSD-3-Clause",
   "supports": "windows & !static",
   "dependencies": [
+    "ceres",
+    "g2o",
     {
       "name": "opencv",
       "default-features": false
@@ -18,6 +20,7 @@
         "vtk"
       ]
     },
+    "sqlite3",
     {
       "name": "vcpkg-cmake",
       "host": true
@@ -29,11 +32,47 @@
     "zlib"
   ],
   "default-features": [
-    "opencv-contrib"
+    "gui",
+    "opencv-contrib",
+    "opencv-nonfree",
+    "tools"
   ],
   "features": {
+    "gui": {
+      "description": "Build RTAB-Map with GUI support (Qt)",
+      "dependencies": [
+        {
+          "name": "pcl",
+          "default-features": false,
+          "features": [
+            "qt"
+          ]
+        },
+        {
+          "name": "qtbase",
+          "default-features": false,
+          "features": [
+            "gui",
+            "opengl",
+            "widgets"
+          ]
+        }
+      ]
+    },
+    "k4w2": {
+      "description": "Build RTAB-Map with Kinect For Windows SDK 2.0 camera driver",
+      "dependencies": [
+        "kinectsdk2"
+      ]
+    },
+    "octomap": {
+      "description": "Build RTAB-Map with OctoMap support",
+      "dependencies": [
+        "octomap"
+      ]
+    },
     "opencv-contrib": {
-      "description": "Use OpenCV with contrib modules",
+      "description": "Use OpenCV with contrib modules (e.g., xfeatures2d, aruco)",
       "dependencies": [
         {
           "name": "opencv",
@@ -44,8 +83,48 @@
         }
       ]
     },
+    "opencv-cuda": {
+      "description": "Use OpenCV with CUDA (accelerated SIFT ad SURF GPU options)",
+      "dependencies": [
+        {
+          "name": "opencv",
+          "default-features": false,
+          "features": [
+            "cuda"
+          ]
+        }
+      ]
+    },
+    "opencv-nonfree": {
+      "description": "Use OpenCV with nonfree module (surf feature)",
+      "dependencies": [
+        {
+          "name": "opencv",
+          "default-features": false,
+          "features": [
+            "nonfree"
+          ]
+        }
+      ]
+    },
+    "openni2": {
+      "description": "Build RTAB-Map with OpenNI2 camera driver",
+      "dependencies": [
+        "kinectsdk1",
+        "openni2"
+      ]
+    },
+    "realsense2": {
+      "description": "Build RTAB-Map with RealSense2 camera driver",
+      "dependencies": [
+        {
+          "name": "realsense2",
+          "default-features": false
+        }
+      ]
+    },
     "tools": {
-      "description": "Build tools",
+      "description": "Build RTAB-Map's tools",
       "dependencies": [
         "yaml-cpp"
       ]
diff --git a/external_imported/vcpkg/ports/rtaudio/fix-alsa.patch b/external_imported/vcpkg/ports/rtaudio/fix-alsa.patch
deleted file mode 100644
index 3953aadae..000000000
--- a/external_imported/vcpkg/ports/rtaudio/fix-alsa.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a59e8bb..1334f5a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -123,12 +123,12 @@ endif()
- # ALSA
- if (RTAUDIO_API_ALSA)
-   set(NEED_PTHREAD ON)
--  find_package(ALSA)
-+  find_package(ALSA REQUIRED)
-   if (NOT ALSA_FOUND)
-     message(FATAL_ERROR "ALSA API requested but no ALSA dev libraries found")
-   endif()
-   list(APPEND INCDIRS ${ALSA_INCLUDE_DIR})
--  list(APPEND LINKLIBS ${ALSA_LIBRARY})
-+  list(APPEND LINKLIBS ${ALSA_LIBRARY} dl)
-   list(APPEND PKGCONFIG_REQUIRES "alsa")
-   list(APPEND API_DEFS "-D__LINUX_ALSA__")
-   list(APPEND API_LIST "alsa")
diff --git a/external_imported/vcpkg/ports/rtaudio/portfile.cmake b/external_imported/vcpkg/ports/rtaudio/portfile.cmake
index 3739afc3d..1ccb88570 100644
--- a/external_imported/vcpkg/ports/rtaudio/portfile.cmake
+++ b/external_imported/vcpkg/ports/rtaudio/portfile.cmake
@@ -1,10 +1,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO thestk/rtaudio
-    REF 46b01b5b134f33d8ddc3dab76829d4b1350e0522
-    SHA512 f26f64fe77aa18c9adf401a720fc3d929af8655827f2c149539a1b73736efb3757ac2eaf5a6535a3c801df13e5f49728a49b6ffe5c01c2f91ab23e145bad5355
+    REF ${VERSION}
+    SHA512 085feb2673185460717ba45fc87254961e477823759e11281092c1ba13301303de1cd36aa9efeba0710cbf2c70f2e2f7f9e41173cf372ded528c41612b19acd5
     HEAD_REF master
-    PATCHES fix-alsa.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" RTAUDIO_STATIC_MSVCRT)
@@ -13,6 +12,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
         asio  RTAUDIO_API_ASIO
         alsa  RTAUDIO_API_ALSA
+        pulse RTAUDIO_API_PULSE
 )
 
 vcpkg_cmake_configure(
@@ -20,7 +20,6 @@ vcpkg_cmake_configure(
     OPTIONS
         -DRTAUDIO_STATIC_MSVCRT=${RTAUDIO_STATIC_MSVCRT}
         -DRTAUDIO_API_JACK=OFF
-        -DRTAUDIO_API_PULSE=OFF
         ${FEATURE_OPTIONS}
 )
 
@@ -31,4 +30,4 @@ vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/rtaudio/vcpkg.json b/external_imported/vcpkg/ports/rtaudio/vcpkg.json
index 5eb8052b2..204980ad2 100644
--- a/external_imported/vcpkg/ports/rtaudio/vcpkg.json
+++ b/external_imported/vcpkg/ports/rtaudio/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "rtaudio",
-  "version-date": "2021-11-16",
-  "port-version": 1,
+  "version": "6.0.1",
   "description": "A set of C++ classes that provide a common API for realtime audio input/output across Linux (native ALSA, JACK, PulseAudio and OSS), Macintosh OS X (CoreAudio and JACK), and Windows (DirectSound, ASIO and WASAPI) operating systems.",
   "homepage": "https://github.com/thestk/rtaudio",
   "license": null,
@@ -27,6 +26,10 @@
     "asio": {
       "description": "Build with ASIO backend",
       "supports": "windows"
+    },
+    "pulse": {
+      "description": "Build with PulseAudio backend",
+      "supports": "linux"
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/rtmidi/fix-cmake-install.patch b/external_imported/vcpkg/ports/rtmidi/fix-cmake-install.patch
new file mode 100644
index 000000000..3e02c92f5
--- /dev/null
+++ b/external_imported/vcpkg/ports/rtmidi/fix-cmake-install.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e6af930..f3eadf2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -191,7 +191,7 @@ set_target_properties(rtmidi PROPERTIES
+ target_include_directories(rtmidi PRIVATE ${INCDIRS}
+                                   PUBLIC
+                                     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+-                                    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
++                                    $<INSTALL_INTERFACE:include>)
+ 
+ # Set compile-time definitions
+ target_compile_definitions(rtmidi PRIVATE ${API_DEFS})
diff --git a/external_imported/vcpkg/ports/rtmidi/portfile.cmake b/external_imported/vcpkg/ports/rtmidi/portfile.cmake
index 404a49ebc..0d8583716 100644
--- a/external_imported/vcpkg/ports/rtmidi/portfile.cmake
+++ b/external_imported/vcpkg/ports/rtmidi/portfile.cmake
@@ -8,7 +8,9 @@ vcpkg_from_github(
     REF 84a99422a3faf1ab417fe71c0903a48debb9376a # 5.0.0
     SHA512 388e280b7966281e22b0048d6fb2541921df1113d84e49bbc444fff591d2025588edd8d61dbe5ff017afd76c26fd05edc8f9f15d0cce16315ccc15e6aac1d57f
     HEAD_REF master
-    PATCHES fix-cmake-usage.patch # Remove this patch in the next update
+    PATCHES
+        fix-cmake-usage.patch # Remove this patch in the next update
+        fix-cmake-install.patch # Remove this patch in the next update
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
diff --git a/external_imported/vcpkg/ports/rtmidi/vcpkg.json b/external_imported/vcpkg/ports/rtmidi/vcpkg.json
index 91979a2d5..f242870f4 100644
--- a/external_imported/vcpkg/ports/rtmidi/vcpkg.json
+++ b/external_imported/vcpkg/ports/rtmidi/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "rtmidi",
   "version": "5.0.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "A set of C++ classes that provide a common API for realtime MIDI input/output across Linux (ALSA & JACK), Macintosh OS X (CoreMidi & JACK) and Windows (Multimedia)",
   "homepage": "https://github.com/thestk/rtmidi",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/rubberband/portfile.cmake b/external_imported/vcpkg/ports/rubberband/portfile.cmake
index b5238a77a..f798852e9 100644
--- a/external_imported/vcpkg/ports/rubberband/portfile.cmake
+++ b/external_imported/vcpkg/ports/rubberband/portfile.cmake
@@ -1,19 +1,42 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO breakfastquay/rubberband
-    REF v3.1.1
-    SHA512 aef4de02b6fe250ab43d627d30720dab8aea3587b428ce76fe339d0b1f0e50da6ba7fa7c76f61306704dd2cfc24241f3d4108b6c155c3d12624eac859672f86c
+    REF "v${VERSION}"
+    SHA512 6d7ce80f47a5870920748d6e2ff9425f9d90e3fd2d62d7b937158ad2134829bc1d1e34ec4fd6327de5d6f1924b4bb793dc4c9d10574102e11338383c4522ba84
     HEAD_REF default
 )
 
+
+if("cli" IN_LIST FEATURES)
+    set(CLI_FEATURE enabled)
+else()    
+    set(CLI_FEATURE disabled)
+endif()
+
+# Select fastest available FFT library according https://github.com/breakfastquay/rubberband/blob/default/COMPILING.md#fft-libraries-supported
+if(VCPKG_TARGET_IS_WINDOWS AND (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64"))
+    set(FFT_LIB "fftw")
+elseif(VCPKG_TARGET_IS_OSX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
+    set(FFT_LIB "fftw")
+else()
+    set(FFT_LIB "sleef")
+endif()
+
 vcpkg_configure_meson(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-        -Dfft=fftw                 # 'auto', 'builtin', 'kissfft', 'fftw', 'vdsp', 'ipp' 'FFT library to use. The default (auto) will use vDSP if available, the builtin implementation otherwise.')
-        -Dresampler=libsamplerate  # 'auto', 'builtin', 'libsamplerate', 'speex', 'ipp' 'Resampler library to use. The default (auto) simply uses the builtin implementation.'
+        -Dfft=${FFT_LIB}           # 'auto', 'builtin', 'kissfft', 'fftw', sleef', 'vdsp', 'ipp' 'FFT library to use. The default (auto) will use vDSP if available, the builtin implementation otherwise.')
+        -Dresampler=libsamplerate  # 'auto', 'builtin', 'libsamplerate', 'speex', 'libspeexdsp', 'ipp' 'Resampler library to use. The default (auto) simply uses the builtin implementation.'
         -Dipp_path=                # 'Path to Intel IPP libraries, if selected for any of the other options.'
         -Dextra_include_dirs=      # 'Additional local header directories to search for dependencies.'
         -Dextra_lib_dirs=          # 'Additional local library directories to search for dependencies.'
+        -Djni=disabled             # 'auto', 'disabled', 'enabled'
+        -Dladspa=disabled          # 'auto', 'disabled', 'enabled'
+        -Dlv2=disabled             # 'auto', 'disabled', 'enabled' lv2 feature is not yet supported yet because vcpkg can't isntall to 
+                                   # %APPDATA%\LV2 or %COMMONPROGRAMFILES%\LV2 but also complains about dlls in "${CURRENT_PACKAGES_DIR}/lib/lv2"
+        -Dvamp=disabled           # 'auto', 'disabled', 'enabled'
+        -Dcmdline=${CLI_FEATURE}   # 'auto', 'disabled', 'enabled'
+        -Dtests=disabled           # 'auto', 'disabled', 'enabled'
     )
 
 vcpkg_install_meson()
@@ -29,20 +52,9 @@ else()
   set(RUBBERBAND_PROGRAM_NAMES rubberband rubberband-r3)
 endif()
 
-# Features cli and lv2 are build whenever suficient dependencies are installed,
 # Remove them when not enabled.
 if("cli" IN_LIST FEATURES)
   vcpkg_copy_tools(TOOL_NAMES ${RUBBERBAND_PROGRAM_NAMES} AUTO_CLEAN)
-else()
-  vcpkg_clean_executables_in_bin(FILE_NAMES ${RUBBERBAND_PROGRAM_NAMES})
 endif()
 
-# lv2 feature is not supported yet because vcpkg can't isntall to
-# %APPDATA%\LV2 or %COMMONPROGRAMFILES%\LV2 but also complains about dlls in "${CURRENT_PACKAGES_DIR}/lib/lv2"
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/lv2" "${CURRENT_PACKAGES_DIR}/debug/lib/lv2")
-
-file(
-  INSTALL "${SOURCE_PATH}/COPYING"
-  DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
-  RENAME copyright
-)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/rubberband/vcpkg.json b/external_imported/vcpkg/ports/rubberband/vcpkg.json
index d0e3d7dfe..39322b15f 100644
--- a/external_imported/vcpkg/ports/rubberband/vcpkg.json
+++ b/external_imported/vcpkg/ports/rubberband/vcpkg.json
@@ -1,13 +1,20 @@
 {
   "name": "rubberband",
-  "version": "3.1.1",
+  "version": "3.3.0",
   "description": "A high quality software library for audio time-stretching and pitch-shifting.",
   "homepage": "https://www.breakfastquay.com/rubberband/",
   "license": "GPL-2.0-or-later",
-  "supports": "!uwp & !(windows & static)",
+  "supports": "!uwp & !(windows & static) & !xbox",
   "dependencies": [
-    "fftw3",
+    {
+      "name": "fftw3",
+      "platform": "(arm & windows) | (x86 & windows) | (arm64 & osx)"
+    },
     "libsamplerate",
+    {
+      "name": "sleef",
+      "platform": "!(arm & windows) & !(x86 & windows) & !(arm64 & osx)"
+    },
     {
       "name": "vcpkg-tool-meson",
       "host": true
diff --git a/external_imported/vcpkg/ports/ryu/portfile.cmake b/external_imported/vcpkg/ports/ryu/portfile.cmake
index c37850966..826730a3b 100644
--- a/external_imported/vcpkg/ports/ryu/portfile.cmake
+++ b/external_imported/vcpkg/ports/ryu/portfile.cmake
@@ -1,3 +1,42 @@
+function(bazel_build build_type)
+    set(c_flags "${VCPKG_COMBINED_C_FLAGS_RELEASE}")
+    set(linker_flags "${VCPKG_COMBINED_SHARED_LINKER_FLAGS_RELEASE}")
+    set(log_suffix "rel")
+    if (${build_type} STREQUAL "debug")
+        set(c_flags "${VCPKG_COMBINED_C_FLAGS_DEBUG}")
+        set(linker_flags "${VCPKG_COMBINED_SHARED_LINKER_FLAGS_DEBUG}")
+        set(log_suffix "dbg")
+        set(destination_modifier "/debug")
+    endif ()
+
+    separate_arguments(conly_opts NATIVE_COMMAND "${c_flags}")
+    separate_arguments(link_opts NATIVE_COMMAND "${linker_flags}")
+
+    if (DEFINED ENV{CC})
+        list(JOIN conly_opts ":" joined_opts)
+        set(ENV{BAZEL_CXXOPTS} "${joined_opts}")
+        list(JOIN link_opts ":" joined_opts)
+        set(ENV{BAZEL_LINKOPTS} "${joined_opts}")
+    endif ()
+
+    list(TRANSFORM conly_opts PREPEND "--conlyopt=")
+    list(TRANSFORM link_opts PREPEND "--linkopt=")
+
+    vcpkg_execute_build_process(
+            COMMAND "${BAZEL}" --batch ${BAZEL_OUTPUT} build ${BAZEL_COMPILER} ${BAZEL_CPU} ${conly_opts} ${link_opts} --verbose_failures --strategy=CppCompile=standalone //ryu //ryu:ryu_printf
+            WORKING_DIRECTORY "${SOURCE_PATH}"
+            LOGNAME "build-${TARGET_TRIPLET}-${log_suffix}"
+    )
+
+    if ("${CMAKE_STATIC_LIBRARY_SUFFIX}" STREQUAL ".lib")
+        file(INSTALL "${SOURCE_PATH}/bazel-bin/ryu/ryu.lib" DESTINATION "${CURRENT_PACKAGES_DIR}${destination_modifier}/lib")
+        file(INSTALL "${SOURCE_PATH}/bazel-bin/ryu/ryu_printf.lib" DESTINATION "${CURRENT_PACKAGES_DIR}${destination_modifier}/lib")
+    else ()
+        file(INSTALL "${SOURCE_PATH}/bazel-bin/ryu/libryu.a" DESTINATION "${CURRENT_PACKAGES_DIR}${destination_modifier}/lib")
+        file(INSTALL "${SOURCE_PATH}/bazel-bin/ryu/libryu_printf.a" DESTINATION "${CURRENT_PACKAGES_DIR}${destination_modifier}/lib")
+    endif ()
+endfunction()
+
 vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO ulfjack/ryu
@@ -6,35 +45,63 @@ vcpkg_from_github(
         HEAD_REF master
 )
 
-vcpkg_find_acquire_program(BAZEL)
+find_program(BAZEL bazel PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools" REQUIRED)
 get_filename_component(BAZEL_DIR "${BAZEL}" DIRECTORY)
-vcpkg_add_to_path(PREPEND ${BAZEL_DIR})
+vcpkg_add_to_path(PREPEND "${BAZEL_DIR}")
 set(ENV{BAZEL_BIN_PATH} "${BAZEL}")
 
-if (CMAKE_HOST_WIN32)
-    set(ENV{BAZEL_VS} $ENV{VSInstallDir})
-    set(ENV{BAZEL_VC} $ENV{VCInstallDir})
+vcpkg_cmake_get_vars(cmake_vars_file)
+include("${cmake_vars_file}")
+if (VCPKG_HOST_IS_WINDOWS)
+    if (VCPKG_DETECTED_MSVC)
+        set(ENV{BAZEL_VC} "$ENV{VCInstallDir}")
+    elseif (VCPKG_TARGET_IS_MINGW)
+        if (NOT "${VCPKG_DETECTED_CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
+            message(FATAL_ERROR "${TARGET_TRIPLET} is not supported on Windows!")
+        endif ()
+        set(BAZEL_COMPILER "--compiler=mingw-gcc")
+        # BAZEL_SH can be propagated to the build environment using VCPKG_KEEP_ENV_VARS
+        if (NOT DEFINED ENV{BAZEL_SH})
+            message("BAZEL_SH is not specified, trying to guess...")
+            get_filename_component(DIR "${VCPKG_DETECTED_CMAKE_C_COMPILER}" DIRECTORY)
+            # Bazel expects Mingw-w64 to be installed in MSYS2 (pacman -S mingw-w64-x86_64-toolchain).
+            # From BAZEL_SH it finds MSYS2 root, adds "mingw64" to the root and uses this path as the location of Mingw-w64.
+            # It is also possible to use non-MSYS2 binaries with Bazel if they are installed to a directory
+            # whose name ends with "mingw64", such as c:\mingw64 or c:\TDM-GCC-64\mingw64.
+            string(REGEX REPLACE /mingw64/bin$ "" MSYS2_ROOT "${DIR}")
+            set(ENV{BAZEL_SH} "${MSYS2_ROOT}/usr/bin/bash.exe")
+            message("BAZEL_SH $ENV{BAZEL_SH}")
+        endif ()
+    else ()
+        message(FATAL_ERROR "${TARGET_TRIPLET} is not supported!")
+    endif ()
+    if ("${VCPKG_DETECTED_CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86")
+        set(BAZEL_CPU "--cpu=x64_x86_windows")
+    elseif ("${VCPKG_DETECTED_CMAKE_SYSTEM_PROCESSOR}" STREQUAL "AMD64" OR "${VCPKG_DETECTED_CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
+        set(BAZEL_CPU "--cpu=x64_windows")
+    elseif ("${VCPKG_DETECTED_CMAKE_SYSTEM_PROCESSOR}" STREQUAL "ARM")
+        set(BAZEL_CPU "--cpu=x64_arm_windows")
+    elseif ("${VCPKG_DETECTED_CMAKE_SYSTEM_PROCESSOR}" STREQUAL "ARM64")
+        set(BAZEL_CPU "--cpu=arm64_windows")
+    else ()
+        message(FATAL_ERROR "${TARGET_TRIPLET} is not supported!")
+    endif ()
+else ()
+    if (NOT DEFINED ENV{USER})
+        set(ENV{USER} "root")
+        set(BAZEL_OUTPUT "--output_user_root=/tmp/bazel")
+    endif ()
+    set(ENV{BAZEL_USE_CPP_ONLY_TOOLCHAIN} "1")
+    set(ENV{CC} "${VCPKG_DETECTED_CMAKE_C_COMPILER}")
 endif ()
 
-vcpkg_execute_build_process(
-            COMMAND ${BAZEL} build --verbose_failures --strategy=CppCompile=standalone //ryu //ryu:ryu_printf
-            WORKING_DIRECTORY ${SOURCE_PATH}
-            LOGNAME build-${TARGET_TRIPLET}-rel
-    )
+bazel_build("release")
+if (NOT VCPKG_BUILD_TYPE)
+    bazel_build("debug")
+endif ()
 
-if (CMAKE_HOST_WIN32)
-    file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/ryu.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/)
-    file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/ryu.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/)
-    file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/ryu_printf.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/)
-    file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/ryu_printf.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/)
-else()
-    file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/libryu.a DESTINATION ${CURRENT_PACKAGES_DIR}/lib/)
-    file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/libryu.a DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/)
-    file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/libryu_printf.a DESTINATION ${CURRENT_PACKAGES_DIR}/lib/)
-    file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/libryu_printf.a DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/)
-endif()
-
-file(INSTALL ${SOURCE_PATH}/LICENSE-Boost DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-file(INSTALL ${SOURCE_PATH}/ryu/ryu.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/ryu/)
-file(INSTALL ${SOURCE_PATH}/ryu/ryu2.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/ryu/)
-file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/ryuConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(INSTALL "${SOURCE_PATH}/LICENSE-Boost" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/ryu/ryu.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/ryu")
+file(INSTALL "${SOURCE_PATH}/ryu/ryu2.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/ryu")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/ryuConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/ryu/usage b/external_imported/vcpkg/ports/ryu/usage
new file mode 100644
index 000000000..b398f2763
--- /dev/null
+++ b/external_imported/vcpkg/ports/ryu/usage
@@ -0,0 +1,4 @@
+The package ryu provides CMake targets:
+
+    find_package(ryu CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE RYU::ryu)
diff --git a/external_imported/vcpkg/ports/ryu/vcpkg.json b/external_imported/vcpkg/ports/ryu/vcpkg.json
index 19096019b..95a3a8e77 100644
--- a/external_imported/vcpkg/ports/ryu/vcpkg.json
+++ b/external_imported/vcpkg/ports/ryu/vcpkg.json
@@ -1,8 +1,17 @@
 {
   "name": "ryu",
   "version": "2.0",
-  "port-version": 6,
+  "port-version": 9,
   "description": "Ryu generates the shortest decimal representation of a floating point number that maintains round-trip safety.",
   "homepage": "https://github.com/ulfjack/ryu",
-  "supports": "!(uwp | arm | x86)"
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake-get-vars",
+      "host": true
+    },
+    {
+      "name": "vcpkg-tool-bazel",
+      "host": true
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/s2geometry/CMakeLists.txt.patch b/external_imported/vcpkg/ports/s2geometry/CMakeLists.txt.patch
deleted file mode 100644
index 69a63dced..000000000
--- a/external_imported/vcpkg/ports/s2geometry/CMakeLists.txt.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f080b4b..ba80cbc 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -26,16 +26,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
- 
- list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/third_party/cmake")
- 
--option(WITH_GFLAGS "Use gflags to change command line flags." OFF)
--add_feature_info(GFLAGS WITH_GFLAGS
--                 "allows changing command line flags.")
--
--# glog option can only be turned on if gflags is on.
--cmake_dependent_option(WITH_GLOG "Use glog for logging." ON
--                       "WITH_GFLAGS" OFF)
--add_feature_info(GLOG WITH_GLOG "provides logging configurability.")
--
--option(BUILD_SHARED_LIBS "Build shared libraries instead of static." ON)
-+option(BUILD_SHARED_LIBS "Build shared libraries instead of static." OFF)
- add_feature_info(SHARED_LIBS BUILD_SHARED_LIBS
-                  "builds shared libraries instead of static.")
- 
-@@ -46,26 +37,19 @@ add_feature_info(PYTHON WITH_PYTHON "provides python interface to S2")
- 
- feature_summary(WHAT ALL)
- 
--if (WITH_GLOG)
--    find_package(Glog REQUIRED)
--    # FindGFlags.cmake and FindGlog.cmake do not seem to implement REQUIRED;
--    # check manually.
--    if (NOT ${GLOG_FOUND})
--        message(FATAL_ERROR "Glog requested but not found")
--    endif()
--    add_definitions(-DS2_USE_GLOG)
--else()
--    # Don't output anything for LOG(INFO).
--    add_definitions(-DABSL_MIN_LOG_LEVEL=1)
-+find_package(glog CONFIG REQUIRED)
-+# FindGFlags.cmake and FindGlog.cmake do not seem to implement REQUIRED;
-+# check manually.
-+if (NOT ${GLOG_FOUND})
-+    message(FATAL_ERROR "Glog requested but not found")
- endif()
-+add_definitions(-DS2_USE_GLOG)
- 
--if (WITH_GFLAGS)
--    find_package(GFlags REQUIRED)
--    if (NOT ${GFLAGS_FOUND})
--        message(FATAL_ERROR "GFlags requested but not found")
--    endif()
--    add_definitions(-DS2_USE_GFLAGS)
-+find_package(gflags CONFIG REQUIRED)
-+if (NOT ${GFLAGS_FOUND})
-+    message(FATAL_ERROR "GFlags requested but not found")
- endif()
-+add_definitions(-DS2_USE_GFLAGS)
- 
- find_package(absl REQUIRED)
- find_package(OpenSSL REQUIRED)
-@@ -101,7 +85,7 @@ endif()
- # something like:
- # OPENSSL_ROOT_DIR=/usr/local/opt/openssl cmake ..
- include_directories(
--    ${GFLAGS_INCLUDE_DIRS} ${GLOG_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR})
-+    gflags::gflags glog::glog OpenSSL::SSL OpenSSL::Crypto)
- 
- if (WITH_PYTHON)
-     include_directories(${Python3_INCLUDE_DIRS})
-@@ -253,7 +237,10 @@ endif()
- # list(APPEND CMAKE_MODULE_PATH "<path_to_s2geometry_dir>/third_party/cmake")
- # add_subdirectory(<path_to_s2geometry_dir> s2geometry)
- # target_link_libraries(<target_name> s2)
--target_include_directories(s2 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src)
-+target_include_directories(s2 PUBLIC 
-+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
-+  $<INSTALL_INTERFACE:include>
-+)
- 
- # Add version information to the target
- set_target_properties(s2 PROPERTIES
-@@ -427,6 +414,12 @@ install(TARGETS ${S2_TARGETS}
-         RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-         ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-         LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
-+install(TARGETS s2 EXPORT unofficial-s2Targets)
-+install(EXPORT unofficial-s2Targets
-+  NAMESPACE unofficial-s2
-+  FILE unofficial-s2Targets.cmake
-+  DESTINATION share/unofficial-s2/
-+)
- 
- message("GTEST_ROOT: ${GTEST_ROOT}")
- if (GTEST_ROOT)
-@@ -569,3 +562,13 @@ endif()
- if (${SWIG_FOUND} AND ${Python3_FOUND})
-   add_subdirectory("src/python" python)
- endif()
-+
-+include(CMakePackageConfigHelpers)
-+# generate the config file that is includes the exports
-+configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in
-+  "${CMAKE_CURRENT_BINARY_DIR}/unofficial-s2Config.cmake"
-+  INSTALL_DESTINATION "share/unofficial-s2/"
-+  NO_SET_AND_CHECK_MACRO
-+  NO_CHECK_REQUIRED_COMPONENTS_MACRO
-+)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-s2Config.cmake DESTINATION "share/unofficial-s2/")
diff --git a/external_imported/vcpkg/ports/s2geometry/Config.cmake.in.patch b/external_imported/vcpkg/ports/s2geometry/Config.cmake.in.patch
deleted file mode 100644
index 30162e6b9..000000000
--- a/external_imported/vcpkg/ports/s2geometry/Config.cmake.in.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/Config.cmake.in b/Config.cmake.in
-new file mode 100644
-index 0000000..42bcf00
---- /dev/null
-+++ b/Config.cmake.in
-@@ -0,0 +1,3 @@
-+@PACKAGE_INIT@
-+
-+include ( "${CMAKE_CURRENT_LIST_DIR}/unofficial-s2Targets.cmake" )
diff --git a/external_imported/vcpkg/ports/s2geometry/portfile.cmake b/external_imported/vcpkg/ports/s2geometry/portfile.cmake
index 72715dbdf..2ccf9a15c 100644
--- a/external_imported/vcpkg/ports/s2geometry/portfile.cmake
+++ b/external_imported/vcpkg/ports/s2geometry/portfile.cmake
@@ -1,23 +1,25 @@
+if(VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/s2geometry
-    REF v0.10.0
-    SHA512 04fe955f71b584bca7e492b935ec6061ce1348ff1731797451cdaa538adb88274cb1634d91a844d5d6e3ad0ed11e865322002115d2e746d9a0127f38cabc34e3
+    REF v0.11.1
+    SHA512 c500029c6e9cc412a29a8a74961688b0a504f60b1a7698ef84c0d0ae760e3c3f05e7068fb1154c9755d907f82e3bc09f8bf1d0ff629cbd3bad6e70169187dd37
     HEAD_REF main
-    PATCHES
-        CMakeLists.txt.patch
-        Config.cmake.in.patch
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS 
+    OPTIONS
         -DBUILD_EXAMPLES=OFF
+        -DBUILD_TESTS=OFF
 )
 vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-s2)
+vcpkg_cmake_config_fixup(PACKAGE_NAME s2)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/s2geometry/" RENAME copyright)
-file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/s2geometry/")
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/s2geometry" RENAME copyright)
+file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/s2geometry")
diff --git a/external_imported/vcpkg/ports/s2geometry/usage b/external_imported/vcpkg/ports/s2geometry/usage
index 314384460..15efb61e7 100644
--- a/external_imported/vcpkg/ports/s2geometry/usage
+++ b/external_imported/vcpkg/ports/s2geometry/usage
@@ -1,4 +1,4 @@
 The package s2geometry provides CMake targets:
 
-    find_package(unofficial-s2 CONFIG REQUIRED)
-    target_link_libraries(main PRIVATE unofficial-s2::s2)
+    find_package(s2 CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE s2::s2)
diff --git a/external_imported/vcpkg/ports/s2geometry/vcpkg.json b/external_imported/vcpkg/ports/s2geometry/vcpkg.json
index cb729273d..a0def43e8 100644
--- a/external_imported/vcpkg/ports/s2geometry/vcpkg.json
+++ b/external_imported/vcpkg/ports/s2geometry/vcpkg.json
@@ -1,14 +1,11 @@
 {
   "name": "s2geometry",
-  "version": "0.10.0",
+  "version": "0.11.1",
   "description": "S2 is a library for spherical geometry that aims to have the same robustness, flexibility, and performance as the very best planar geometry libraries.",
   "homepage": "https://s2geometry.io",
   "license": "Apache-2.0",
-  "supports": "!windows",
   "dependencies": [
     "abseil",
-    "gflags",
-    "glog",
     "openssl",
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/s2n/portfile.cmake b/external_imported/vcpkg/ports/s2n/portfile.cmake
index 98bb2c08a..0909ebee5 100644
--- a/external_imported/vcpkg/ports/s2n/portfile.cmake
+++ b/external_imported/vcpkg/ports/s2n/portfile.cmake
@@ -2,10 +2,9 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO aws/s2n-tls
     REF "v${VERSION}"
-    SHA512 cfdfcdaa9d57427211e896845358da85d7498fa0478b6916dd34f36c755100c0421c07ccd624ed2d4baf9fcfe0dde6629159769619ac22e9ef1535ba20bf8979
+    SHA512 deead85f2ab22441e1110d442fc93273d96d8dd6a203940cca7ef166fc1c9e7ab75ffe2d550e013e1e1e3266b208904cff94cc2482d6fd00e0546293b0ba11d4
     PATCHES
         fix-cmake-target-path.patch
-        remove-trycompile.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
diff --git a/external_imported/vcpkg/ports/s2n/remove-trycompile.patch b/external_imported/vcpkg/ports/s2n/remove-trycompile.patch
deleted file mode 100644
index d9385fd45..000000000
--- a/external_imported/vcpkg/ports/s2n/remove-trycompile.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	(revision 4aec93c6a74aacf60cec6229b35094f56cb0f87b)
-+++ b/CMakeLists.txt	(date 1675010024800)
-@@ -393,55 +393,6 @@
-     message(STATUS "Enabling libcrypto interning")
- endif()
- 
--# Determine if EVP_md5_sha1 is available in libcrypto
--try_compile(
--        LIBCRYPTO_SUPPORTS_EVP_MD5_SHA1_HASH
--        ${CMAKE_BINARY_DIR}
--        SOURCES "${CMAKE_CURRENT_LIST_DIR}/tests/features/evp_md5_sha1.c"
--        LINK_LIBRARIES ${LINK_LIB} ${OS_LIBS}
--)
--if (LIBCRYPTO_SUPPORTS_EVP_MD5_SHA1_HASH)
--    target_compile_options(${PROJECT_NAME} PUBLIC -DS2N_LIBCRYPTO_SUPPORTS_EVP_MD5_SHA1_HASH)
--endif()
--
--# Determine if RC4 is available in libcrypto
--try_compile(
--        LIBCRYPTO_SUPPORTS_EVP_RC4
--        ${CMAKE_BINARY_DIR}
--        SOURCES "${CMAKE_CURRENT_LIST_DIR}/tests/features/evp_rc4.c"
--        LINK_LIBRARIES ${LINK_LIB} ${OS_LIBS}
--)
--
--if (LIBCRYPTO_SUPPORTS_EVP_RC4)
--    target_compile_options(${PROJECT_NAME} PUBLIC -DS2N_LIBCRYPTO_SUPPORTS_EVP_RC4)
--endif()
--
--# Determine if EVP_MD_CTX_set_pkey_ctx is available in libcrypto
--try_compile(
--        LIBCRYPTO_SUPPORTS_EVP_MD_CTX_SET_PKEY_CTX
--        ${CMAKE_BINARY_DIR}
--        SOURCES "${CMAKE_CURRENT_LIST_DIR}/tests/features/evp_md_ctx_set_pkey_ctx.c"
--        LINK_LIBRARIES ${LINK_LIB} ${OS_LIBS}
--        CMAKE_FLAGS ${ADDITIONAL_FLAGS}
--)
--
--if (LIBCRYPTO_SUPPORTS_EVP_MD_CTX_SET_PKEY_CTX)
--    target_compile_options(${PROJECT_NAME} PUBLIC -DS2N_LIBCRYPTO_SUPPORTS_EVP_MD_CTX_SET_PKEY_CTX)
--endif()
--
--# Determine if Kyber512 implementation from AWS-LC is available
--try_compile(
--        LIBCRYPTO_SUPPORTS_EVP_KYBER_512
--        ${CMAKE_BINARY_DIR}
--        SOURCES "${CMAKE_CURRENT_LIST_DIR}/tests/features/evp_kyber_512.c"
--        LINK_LIBRARIES ${LINK_LIB} ${OS_LIBS}
--        COMPILE_DEFINITIONS "-Werror"
--)
--
--if(S2N_AWSLC_KYBER_UNSTABLE AND LIBCRYPTO_SUPPORTS_EVP_KYBER_512)
--    target_compile_options(${PROJECT_NAME} PUBLIC -DS2N_LIBCRYPTO_SUPPORTS_KYBER512)
--endif()
--
- if (NOT DEFINED CMAKE_AR)
- 	message(STATUS "CMAKE_AR undefined, setting to `ar` by default")
- 	SET(CMAKE_AR ar)
diff --git a/external_imported/vcpkg/ports/s2n/vcpkg.json b/external_imported/vcpkg/ports/s2n/vcpkg.json
index 1f26ea583..76f883756 100644
--- a/external_imported/vcpkg/ports/s2n/vcpkg.json
+++ b/external_imported/vcpkg/ports/s2n/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "s2n",
-  "version": "1.3.34",
+  "version": "1.3.56",
   "description": "C99 implementation of the TLS/SSL protocols.",
   "homepage": "https://github.com/aws/s2n-tls",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/sail/portfile.cmake b/external_imported/vcpkg/ports/sail/portfile.cmake
index 6a4be5df7..93548c714 100644
--- a/external_imported/vcpkg/ports/sail/portfile.cmake
+++ b/external_imported/vcpkg/ports/sail/portfile.cmake
@@ -1,15 +1,15 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO HappySeaFox/sail
-    REF v0.9.0-rc3
-    SHA512 5de94277d57b862d4ab99266c2608cd37d7ca9eb89ef753ddddf47e4cebffab54b2cfb9c28d0c3bb7721f0d24c1310377c4b42adab477568e6965bd7ebc55b17
+    REF "v${VERSION}"
+    SHA512 c8cface60031c5e84b99eaedb216f9e3af0354d24f5db7d6d0ec1f97d593ae46cb13c86bc244b6b8673cddfecf829a8b7738fdde8620472c12e95a5b61495133
     HEAD_REF master
 )
 
 # Enable selected codecs
 set(ONLY_CODECS "")
 
-foreach(CODEC avif bmp gif ico jpeg jpeg2000 pcx png psd qoi tga tiff wal webp xbm)
+foreach(CODEC avif bmp gif ico jpeg jpeg2000 jpegxl pcx png psd qoi svg tga tiff wal webp xbm)
     if (${CODEC} IN_LIST FEATURES)
         list(APPEND ONLY_CODECS ${CODEC})
     endif()
@@ -17,14 +17,20 @@ endforeach()
 
 list(JOIN ONLY_CODECS "\;" ONLY_CODECS_ESCAPED)
 
+# Enable OpenMP
+if ("openmp" IN_LIST FEATURES)
+    set(SAIL_ENABLE_OPENMP ON)
+endif()
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
+        -DBUILD_TESTING=OFF
         -DSAIL_COMBINE_CODECS=ON
+        -DSAIL_ENABLE_OPENMP=${SAIL_ENABLE_OPENMP}
         -DSAIL_ONLY_CODECS=${ONLY_CODECS_ESCAPED}
         -DSAIL_BUILD_APPS=OFF
         -DSAIL_BUILD_EXAMPLES=OFF
-        -DSAIL_BUILD_TESTS=OFF
 )
 
 vcpkg_cmake_install()
@@ -49,7 +55,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake"
 # Fix pkg-config files
 vcpkg_fixup_pkgconfig()
 
-# Unused because SAIL_COMBINE_CODECS is On
+# Unused because SAIL_COMBINE_CODECS is ON
 vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/sail/sail-common/config.h" "#define SAIL_CODECS_PATH \"${CURRENT_PACKAGES_DIR}/lib/sail/codecs\"" "")
 
 # Handle usage
diff --git a/external_imported/vcpkg/ports/sail/vcpkg.json b/external_imported/vcpkg/ports/sail/vcpkg.json
index 19a3fefff..22ff86a9b 100644
--- a/external_imported/vcpkg/ports/sail/vcpkg.json
+++ b/external_imported/vcpkg/ports/sail/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "sail",
-  "version-semver": "0.9.0-rc3",
-  "port-version": 1,
+  "version-semver": "0.9.1",
   "description": "The missing small and fast image decoding library for humans (not for machines)",
   "homepage": "https://github.com/HappySeaFox/sail",
   "license": "MIT",
@@ -17,7 +16,7 @@
     }
   ],
   "default-features": [
-    "high-priority"
+    "highest-priority-codecs"
   ],
   "features": {
     "all": {
@@ -26,10 +25,11 @@
         {
           "name": "sail",
           "features": [
-            "high-priority",
-            "low-priority",
-            "lowest-priority",
-            "medium-priority"
+            "high-priority-codecs",
+            "highest-priority-codecs",
+            "low-priority-codecs",
+            "lowest-priority-codecs",
+            "medium-priority-codecs"
           ]
         }
       ]
@@ -49,13 +49,24 @@
         "giflib"
       ]
     },
-    "high-priority": {
-      "description": "Enable high priority codecs such as JPEG or PNG",
+    "high-priority-codecs": {
+      "description": "Enable high priority codecs such as BMP",
       "dependencies": [
         {
           "name": "sail",
           "features": [
             "bmp",
+            "svg"
+          ]
+        }
+      ]
+    },
+    "highest-priority-codecs": {
+      "description": "Enable highest priority codecs such as JPEG or PNG",
+      "dependencies": [
+        {
+          "name": "sail",
+          "features": [
             "gif",
             "jpeg",
             "png",
@@ -79,7 +90,13 @@
         "jasper"
       ]
     },
-    "low-priority": {
+    "jpegxl": {
+      "description": "Enable JPEG XL codec",
+      "dependencies": [
+        "libjxl"
+      ]
+    },
+    "low-priority-codecs": {
       "description": "Enable low priority codecs such as TGA",
       "dependencies": [
         {
@@ -94,7 +111,7 @@
         }
       ]
     },
-    "lowest-priority": {
+    "lowest-priority-codecs": {
       "description": "Enable lowest priority codecs such as XBM",
       "dependencies": [
         {
@@ -106,7 +123,7 @@
         }
       ]
     },
-    "medium-priority": {
+    "medium-priority-codecs": {
       "description": "Enable medium priority codecs such as AVIF",
       "dependencies": [
         {
@@ -114,11 +131,15 @@
           "features": [
             "avif",
             "jpeg2000",
+            "jpegxl",
             "webp"
           ]
         }
       ]
     },
+    "openmp": {
+      "description": "Enable OpenMP support"
+    },
     "pcx": {
       "description": "Enable PCX codec"
     },
@@ -134,6 +155,12 @@
     "qoi": {
       "description": "Enable QOI codec"
     },
+    "svg": {
+      "description": "Enable SVG codec",
+      "dependencies": [
+        "nanosvg"
+      ]
+    },
     "tga": {
       "description": "Enable TGA codec"
     },
diff --git a/external_imported/vcpkg/ports/sais/portfile.cmake b/external_imported/vcpkg/ports/sais/portfile.cmake
deleted file mode 100644
index 2a170918a..000000000
--- a/external_imported/vcpkg/ports/sais/portfile.cmake
+++ /dev/null
@@ -1,26 +0,0 @@
-
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://sites.google.com/site/yuta256/sais-2.4.1.zip"
-    FILENAME "sais-2.4.1.zip"
-    SHA512 6f6dd11f842f680bebc1d9b7f6b75752c9589c600fdd5e6373bb7290a686f1de35d4cc3226347e717f89a295363f7fee0ae8b1aa05ad341f4c2ea056fb5b1425
-)
-
-vcpkg_extract_source_archive(
-    SOURCE_PATH
-    ARCHIVE "${ARCHIVE}"
-)
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS
-        -DBUILD_SAIS64=ON
-)
-
-vcpkg_cmake_install()
-vcpkg_copy_pdbs()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-
-vcpkg_fixup_pkgconfig()
diff --git a/external_imported/vcpkg/ports/sais/vcpkg.json b/external_imported/vcpkg/ports/sais/vcpkg.json
deleted file mode 100644
index 531a2c03b..000000000
--- a/external_imported/vcpkg/ports/sais/vcpkg.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "name": "sais",
-  "version-string": "2.4.1",
-  "port-version": 4,
-  "description": "An implementation of the induced sorting algorithm",
-  "dependencies": [
-    {
-      "name": "vcpkg-cmake",
-      "host": true
-    }
-  ]
-}
diff --git a/external_imported/vcpkg/ports/sajson/vcpkg.json b/external_imported/vcpkg/ports/sajson/vcpkg.json
index 8c4fe8735..5c831dc14 100644
--- a/external_imported/vcpkg/ports/sajson/vcpkg.json
+++ b/external_imported/vcpkg/ports/sajson/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "sajson",
-  "version-string": "2018-09-21",
-  "port-version": 2,
+  "version-date": "2018-09-21",
+  "port-version": 3,
   "description": "Lightweight, extremely high-performance JSON parser for C++11",
   "dependencies": [
     {
diff --git a/external_imported/vcpkg/ports/salome-configuration/portfile.cmake b/external_imported/vcpkg/ports/salome-configuration/portfile.cmake
new file mode 100644
index 000000000..1561e845b
--- /dev/null
+++ b/external_imported/vcpkg/ports/salome-configuration/portfile.cmake
@@ -0,0 +1,20 @@
+vcpkg_from_git(
+    OUT_SOURCE_PATH SOURCE_PATH_CONFIG
+    URL "https://git.salome-platform.org/gitpub/tools/configuration.git"
+    REF "25f724f7a6c0000330a40c3851dcd8bc2493e1fa"
+)
+
+file(COPY "${SOURCE_PATH_CONFIG}/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH_CONFIG}/copyright/CEA_EDF.txt")
+
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-port-config.cmake" [[set(SALOME_CONFIGURATION_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}")]])
+
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+
+file(READ "${CURRENT_PACKAGES_DIR}/share/${PORT}/cmake/SalomeMacros.cmake" contents)
+if(HDF5_WITH_PARALLEL)
+    string(PREPEND contents "set(SALOME_USE_MPI ON)\n")
+endif()
+string(REPLACE [[SET(CMAKE_PREFIX_PATH "${${_envvar}}")]] "" contents "${contents}")
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/cmake/SalomeMacros.cmake" "${contents}")
diff --git a/external_imported/vcpkg/ports/salome-configuration/vcpkg.json b/external_imported/vcpkg/ports/salome-configuration/vcpkg.json
new file mode 100644
index 000000000..75bd4aa63
--- /dev/null
+++ b/external_imported/vcpkg/ports/salome-configuration/vcpkg.json
@@ -0,0 +1,15 @@
+{
+  "name": "salome-configuration",
+  "version": "9.10.0",
+  "description": "Configuration files and other utilities for SALOME platform",
+  "homepage": "https://www.salome-platform.org",
+  "license": "LGPL-2.1-or-later",
+  "supports": "windows | linux",
+  "dependencies": [
+    {
+      "$comment": "This is a dummy dependency to inject SALOME_USE_MPI depending on HDF5_WITH_PARALLEL",
+      "name": "hdf5",
+      "default-features": false
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/salome-med-fichier/hdf5-2.patch b/external_imported/vcpkg/ports/salome-med-fichier/hdf5-2.patch
new file mode 100644
index 000000000..bae9f0b24
--- /dev/null
+++ b/external_imported/vcpkg/ports/salome-med-fichier/hdf5-2.patch
@@ -0,0 +1,520 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9eceab7..3e3fb80 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -82,7 +82,7 @@ IF(WIN32)
+   ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)  # To disable windows warnings for strcpy, fopen, ...
+   ADD_DEFINITIONS(-D_SCL_SECURE_NO_WARNINGS)  # To disable windows warnings std::copy, std::transform, ...
+   ADD_DEFINITIONS(-DWNT -DWIN32)
+-  ADD_DEFINITIONS(-D_WIN32_WINNT=0x0500) # Windows 2000 or later API is required
++  #ADD_DEFINITIONS(-D_WIN32_WINNT=0x0500) # Windows 2000 or later API is required
+   ADD_DEFINITIONS(-DPPRO_NT_CALL)        # For windows system functions call
+ 
+   IF(NOT MINGW)
+diff --git a/include/med_hdfi.h b/include/med_hdfi.h
+index 517baa5..3303bf6 100644
+--- a/include/med_hdfi.h
++++ b/include/med_hdfi.h
+@@ -351,22 +351,22 @@ typedef struct {
+ extern MEDC_EXPORT
+ void * _MEDcheckAttributeStringInit( med_string_itdatas * const itdatas, const char * const attname, med_int attsize);
+ extern MEDC_EXPORT
+-med_err _MEDcheckAttributeStringFunc(med_idt id,const char *lname, const H5L_info_t *linfo, med_string_itdatas *data);
++med_err _MEDcheckAttributeStringFunc(med_idt id,const char *lname, const H5L_info1_t *linfo, med_string_itdatas *data);
+ extern MEDC_EXPORT
+ void  _MEDcheckAttributeStringFin( med_string_itdatas * const itdatas);
+ 
+ extern MEDC_EXPORT
+-med_err _MEDchecknSublinkFunc(med_idt id,const char *lname, const H5L_info_t *linfo, med_bool *data);
++med_err _MEDchecknSublinkFunc(med_idt id,const char *lname, const H5L_info1_t *linfo, med_bool *data);
+ 
+ #define MED_CHECK_ATTRIBUTE_FUNC(_check_med_type_) _MEDcheckAttributeFunc##_check_med_type_
+ #define MED_CHECK_ATTRIBUTE_INIT(_check_med_type_,_check_med_itdata_,_check_med_attname_,_check_med_attsize_) _MEDcheckAttributeInit##_check_med_type_ (_check_med_itdata_,_check_med_attname_,_check_med_attsize_)
+ 
+ 
+ extern MEDC_EXPORT
+-med_err _MEDcopyName(med_idt id,const char *lname, const H5L_info_t *linfo, void *data);
++med_err _MEDcopyName(med_idt id,const char *lname, const H5L_info1_t *linfo, void *data);
+ 
+ extern MEDC_EXPORT
+-med_err _MEDlinkobjs(med_idt id,const char *lname, const H5L_info_t *linfo, visitordatas *data);
++med_err _MEDlinkobjs(med_idt id,const char *lname, const H5L_info1_t *linfo, visitordatas *data);
+ 
+ extern MEDC_EXPORT
+ med_err _MEDsoftlinkDel(const med_idt               id,	const char * const          softlinkname,
+@@ -402,7 +402,7 @@ med_err _MEDdatasetExist(const med_idt       gid,
+ 			 med_bool   *  const datasetexist,
+ 			 med_bool   *  const isasoftlink );
+ 
+-typedef herr_t (*medvisitorfunc)( hid_t g_id, const char *name, const H5L_info_t *info, void *op_data);
++typedef herr_t (*medvisitorfunc)( hid_t g_id, const char *name, const H5L_info1_t *info, void *op_data);
+ typedef medvisitorfunc mediteratorfunc;
+ 
+ extern MEDC_EXPORT
+diff --git a/src/ci/MEDfileCompatibility.c b/src/ci/MEDfileCompatibility.c
+index ddfa489..fbd2ca3 100644
+--- a/src/ci/MEDfileCompatibility.c
++++ b/src/ci/MEDfileCompatibility.c
+@@ -114,8 +114,8 @@ MEDfileCompatibility(const char* const filename,
+ #error "Don't forget to update the test version here when you change the major version of the library !"
+ #endif
+ #if H5_VERS_MINOR > 10
+-#error "Don't forget to check the compatibility version of the library, depending on the internal hdf model choice !"
+-#error "Cf. _MEDfileCreate ..."
++//#error "Don't forget to check the compatibility version of the library, depending on the internal hdf model choice !"
++//#error "Cf. _MEDfileCreate ..."
+ #endif
+ 
+  SORTIE:
+diff --git a/src/hdfi/_MEDattributeNumWr.c b/src/hdfi/_MEDattributeNumWr.c
+index 5ec7447..cd594f2 100644
+--- a/src/hdfi/_MEDattributeNumWr.c
++++ b/src/hdfi/_MEDattributeNumWr.c
+@@ -34,7 +34,7 @@ med_err _MEDattributeNumWr(med_idt pid,
+   med_err _ret=-1;
+   med_idt  type_hdf;
+   med_access_mode MED_ACCESS_MODE;
+-  H5O_info_t      _oinfo;
++  H5O_info1_t      _oinfo;
+ 
+   if ( (MED_ACCESS_MODE = _MEDmodeAcces(pid) ) == MED_ACC_UNDEF ) {
+     MED_ERR_(_ret,MED_ERR_INVALID,MED_ERR_ACCESSMODE, "MED_ACC_UNDEF" );
+@@ -77,7 +77,7 @@ med_err _MEDattributeNumWr(med_idt pid,
+ 
+   if  ( (_attid=H5Aopen( pid, attname, H5P_DEFAULT )) >= 0 ) {
+ 
+-    if ( H5Oget_info( pid, &_oinfo ) <0) {
++    if ( H5Oget_info1( pid, &_oinfo ) <0) {
+ 	MED_ERR_(_ret,MED_ERR_CALL,MED_ERR_API,"H5Oget_info");
+ 	goto ERROR;
+     }
+diff --git a/src/hdfi/_MEDattributeNumWrByName.c b/src/hdfi/_MEDattributeNumWrByName.c
+index 229c836..e1dd020 100644
+--- a/src/hdfi/_MEDattributeNumWrByName.c
++++ b/src/hdfi/_MEDattributeNumWrByName.c
+@@ -34,7 +34,7 @@ med_err _MEDattributeNumWrByName(med_idt pid,
+   med_err _ret=-1;
+   med_idt  type_hdf;
+   med_access_mode MED_ACCESS_MODE;
+-  H5O_info_t      _oinfo;
++  H5O_info1_t      _oinfo;
+ 
+   if ( (MED_ACCESS_MODE = _MEDmodeAcces(pid) ) == MED_ACC_UNDEF ) {
+     MED_ERR_(_ret,MED_ERR_INVALID,MED_ERR_ACCESSMODE, "MED_ACC_UNDEF" );
+@@ -68,7 +68,7 @@ med_err _MEDattributeNumWrByName(med_idt pid,
+ 
+   if  ( (_attid=H5Aopen_by_name( pid, path, attname, H5P_DEFAULT, H5P_DEFAULT )) >= 0 ) {
+ 
+-    if ( H5Oget_info( pid, &_oinfo ) <0) {
++    if ( H5Oget_info1( pid, &_oinfo ) <0) {
+ 	MED_ERR_(_ret,MED_ERR_CALL,MED_ERR_API,"H5Oget_info");
+ 	goto ERROR;
+     }
+diff --git a/src/hdfi/_MEDcheckAttributeStringFunc.c b/src/hdfi/_MEDcheckAttributeStringFunc.c
+index 4def049..66ec6d9 100644
+--- a/src/hdfi/_MEDcheckAttributeStringFunc.c
++++ b/src/hdfi/_MEDcheckAttributeStringFunc.c
+@@ -22,10 +22,10 @@
+ #include <hdf5.h>
+ #include <string.h>
+ 
+-med_err _MEDcheckAttributeStringFunc(med_idt id,const char *lname, const H5L_info_t *linfo, med_string_itdatas  *data) {
++med_err _MEDcheckAttributeStringFunc(med_idt id,const char *lname, const H5L_info1_t *linfo, med_string_itdatas  *data) {
+ 
+   med_err  _ret=-1;
+-  H5O_info_t oinfo;
++  H5O_info1_t oinfo;
+ 
+ 
+ #ifdef _DEBUG_
+@@ -40,7 +40,7 @@ med_err _MEDcheckAttributeStringFunc(med_idt id,const char *lname, const H5L_inf
+     oinfo.type=H5G_LINK;
+     break;
+   case H5L_TYPE_HARD:
+-    if ( H5Oget_info_by_name( id, lname, &oinfo, H5P_DEFAULT ) <0) {
++    if ( H5Oget_info_by_name1( id, lname, &oinfo, H5P_DEFAULT ) <0) {
+       MED_ERR_(_ret,MED_ERR_CALL,MED_ERR_API,"H5Oget_info_by_name");
+       SSCRUTE(lname);
+     }
+diff --git a/src/hdfi/_MEDchecknSublinkFunc.c b/src/hdfi/_MEDchecknSublinkFunc.c
+index 2e1a284..2b1db1f 100644
+--- a/src/hdfi/_MEDchecknSublinkFunc.c
++++ b/src/hdfi/_MEDchecknSublinkFunc.c
+@@ -22,10 +22,10 @@
+ #include <hdf5.h>
+ #include <string.h>
+ 
+-med_err _MEDchecknSublinkFunc(med_idt id,const char *lname, const H5L_info_t *linfo, med_bool  *data) {
++med_err _MEDchecknSublinkFunc(med_idt id,const char *lname, const H5L_info1_t *linfo, med_bool  *data) {
+ 
+   med_err  _ret=-1;
+-  H5O_info_t oinfo;
++  H5O_info1_t oinfo;
+   H5G_info_t _group_info;
+ 
+ 
+@@ -41,7 +41,7 @@ med_err _MEDchecknSublinkFunc(med_idt id,const char *lname, const H5L_info_t *li
+     oinfo.type=H5G_LINK;
+     break;
+   case H5L_TYPE_HARD:
+-    if ( H5Oget_info_by_name( id, lname, &oinfo, H5P_DEFAULT ) <0) {
++    if ( H5Oget_info_by_name1( id, lname, &oinfo, H5P_DEFAULT ) <0) {
+       MED_ERR_(_ret,MED_ERR_CALL,MED_ERR_API,"H5Oget_info_by_name");
+       SSCRUTE(lname);
+     }
+diff --git a/src/hdfi/_MEDcopyName.c b/src/hdfi/_MEDcopyName.c
+index 45523a4..3edb463 100644
+--- a/src/hdfi/_MEDcopyName.c
++++ b/src/hdfi/_MEDcopyName.c
+@@ -24,7 +24,7 @@
+ 
+ #include <string.h>
+ 
+-med_err _MEDcopyName(med_idt id,const char *lname, const H5L_info_t *linfo, void *data)
++med_err _MEDcopyName(med_idt id,const char *lname, const H5L_info1_t *linfo, void *data)
+ {
+   if (data != NULL)
+     strcpy(data,lname);
+diff --git a/src/hdfi/_MEDdatagroupExist.c b/src/hdfi/_MEDdatagroupExist.c
+index e815d5c..5b38005 100644
+--- a/src/hdfi/_MEDdatagroupExist.c
++++ b/src/hdfi/_MEDdatagroupExist.c
+@@ -31,10 +31,10 @@ med_err _MEDdatagroupExist(const med_idt        gid,
+ 
+ {
+   med_err        _ret=-1;
+-  H5L_info_t     _linkinfo;
+-  H5O_info_t     _oinfo;
++  H5L_info1_t     _linkinfo;
++  H5O_info1_t     _oinfo;
+ 
+-  if ( H5Lget_info( gid, datagroupname,  &_linkinfo, H5P_DEFAULT ) >= 0 ) {
++  if ( H5Lget_info1( gid, datagroupname,  &_linkinfo, H5P_DEFAULT ) >= 0 ) {
+ 
+     switch ( _linkinfo.type ) {
+ 
+@@ -45,7 +45,7 @@ med_err _MEDdatagroupExist(const med_idt        gid,
+ 
+     case H5L_TYPE_HARD:
+       *isasoftlink  = MED_FALSE;
+-      if ( H5Oget_info_by_name( gid, datagroupname, &_oinfo, H5P_DEFAULT ) <0) {
++      if ( H5Oget_info_by_name1( gid, datagroupname, &_oinfo, H5P_DEFAULT ) <0) {
+ 	MED_ERR_(_ret,MED_ERR_CALL,MED_ERR_API,"H5Oget_info_by_name");
+ 	SSCRUTE( datagroupname);
+       }
+diff --git a/src/hdfi/_MEDdatasetExist.c b/src/hdfi/_MEDdatasetExist.c
+index 4852945..a1cc2a0 100644
+--- a/src/hdfi/_MEDdatasetExist.c
++++ b/src/hdfi/_MEDdatasetExist.c
+@@ -31,12 +31,12 @@ med_err _MEDdatasetExist(const med_idt       gid,
+   des datasets*/
+ {
+   med_err        _ret=-1;
+-  H5L_info_t     _linkinfo;
+-  H5O_info_t     _oinfo;
++  H5L_info1_t     _linkinfo;
++  H5O_info1_t     _oinfo;
+ 
+ 
+ 
+-  if ( H5Lget_info( gid, datasetname,  &_linkinfo, H5P_DEFAULT ) >= 0 ) {
++  if ( H5Lget_info1( gid, datasetname,  &_linkinfo, H5P_DEFAULT ) >= 0 ) {
+ 
+     switch ( _linkinfo.type ) {
+ 
+@@ -47,7 +47,7 @@ med_err _MEDdatasetExist(const med_idt       gid,
+ 
+     case H5L_TYPE_HARD:
+       *isasoftlink  = MED_FALSE;
+-      if ( H5Oget_info_by_name( gid, datasetname, &_oinfo, H5P_DEFAULT ) <0) {
++      if ( H5Oget_info_by_name1( gid, datasetname, &_oinfo, H5P_DEFAULT ) <0) {
+ 	MED_ERR_(_ret,MED_ERR_CALL,MED_ERR_API,"H5Oget_info_by_name");
+ 	SSCRUTE( datasetname);
+       }
+diff --git a/src/hdfi/_MEDdatasetExistByMedtype.c b/src/hdfi/_MEDdatasetExistByMedtype.c
+index e69a29a..0f87cb4 100644
+--- a/src/hdfi/_MEDdatasetExistByMedtype.c
++++ b/src/hdfi/_MEDdatasetExistByMedtype.c
+@@ -30,14 +30,14 @@ med_err _MEDdatasetExistByMedtype(const med_idt                       gid,
+ {
+   med_err        _ret=-1;
+   char           _datasetname[3+1]="";
+-  H5L_info_t      _linkinfo;
++  H5L_info1_t      _linkinfo;
+ 
+   if (  _MEDgetDatasetName(_datasetname,meddatatype,cmode) < 0) {
+     MED_ERR_(_ret,MED_ERR_CALL,MED_ERR_API,"_MEDgetDatasetName");
+     SSCRUTE(_datasetname);ISCRUTE_int(meddatatype);goto ERROR;
+   }
+ 
+-  if ( H5Lget_info( gid, _datasetname,  &_linkinfo, H5P_DEFAULT ) >= 0 ) {
++  if ( H5Lget_info1( gid, _datasetname,  &_linkinfo, H5P_DEFAULT ) >= 0 ) {
+     *datasetexist = MED_TRUE;
+     if ( _linkinfo.type == H5L_TYPE_SOFT )
+       *isasoftlink=MED_TRUE;
+diff --git a/src/hdfi/_MEDdatasetWr.c b/src/hdfi/_MEDdatasetWr.c
+index 67580fe..a494d99 100644
+--- a/src/hdfi/_MEDdatasetWr.c
++++ b/src/hdfi/_MEDdatasetWr.c
+@@ -35,7 +35,7 @@ med_err _MEDdatasetWr(const med_idt               id,
+   med_access_mode _MED_ACCESS_MODE;
+   med_int         _nvaluesperentity=0,_nconstituentpervalue=0;
+   int             _i=0;
+-  H5L_info_t      _linkinfo;
++  H5L_info1_t      _linkinfo;
+   hsize_t         _dim=0;
+   const void      *_value= value;
+ 
+@@ -146,7 +146,7 @@ med_err _MEDdatasetWr(const med_idt               id,
+       goto ERROR;
+     }
+ 
+-  if ( H5Lget_info( id, datasetname,  &_linkinfo, H5P_DEFAULT ) >= 0 ) {
++  if ( H5Lget_info1( id, datasetname,  &_linkinfo, H5P_DEFAULT ) >= 0 ) {
+     if ( _linkinfo.type == H5L_TYPE_SOFT )
+       if ( H5Ldelete(id,datasetname,H5P_DEFAULT) < 0 ) {
+ 	MED_ERR_(_ret,MED_ERR_DELETE,MED_ERR_LINK,datasetname);
+diff --git a/src/hdfi/_MEDfileCreate.c b/src/hdfi/_MEDfileCreate.c
+index c685eda..c2e67da 100644
+--- a/src/hdfi/_MEDfileCreate.c
++++ b/src/hdfi/_MEDfileCreate.c
+@@ -132,15 +132,15 @@ med_idt _MEDfileCreate(const char * const filename, const med_access_mode access
+     {
+     case 0: _release = MED_40_LATEST_RELEASE; break;
+ #if (MED_NUM_MINEUR == 0) && (MED_NUM_RELEASE > 1)
+-#error "Don't forget to change the value of MED_40_LATEST_RELEASE when you change the release of version 4.0 of the library !"
++//#error "Don't forget to change the value of MED_40_LATEST_RELEASE when you change the release of version 4.0 of the library !"
+ #endif
+     /* case 1: _release = 0; break; */
+     /* case 2: _release = 1; break; */
+ #if MED_NUM_MINEUR > 1
+-#error "Don't forget to add a case line version here when you change the minor version of the library !"
++//#error "Don't forget to add a case line version here when you change the minor version of the library !"
+ #endif
+ #if MED_NUM_MAJEUR != 4
+-#error "Don't forget to add a case line version here when you change the major version of the library !"
++//#error "Don't forget to add a case line version here when you change the major version of the library !"
+ #endif
+     case MED_NUM_MINEUR: _release = MED_NUM_RELEASE; break;
+     default:
+@@ -160,7 +160,7 @@ med_idt _MEDfileCreate(const char * const filename, const med_access_mode access
+    * Un test autoconf permet de fixer un intervalle de version HDF à MED.
+    */
+ #if H5_VERS_MINOR > 10
+-#error "Don't forget to change the compatibility version of the library !"
++//#error "Don't forget to change the compatibility version of the library !"
+ #endif
+    
+   if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18 ) ) {
+diff --git a/src/hdfi/_MEDfileOpen.c b/src/hdfi/_MEDfileOpen.c
+index 7044763..d567886 100644
+--- a/src/hdfi/_MEDfileOpen.c
++++ b/src/hdfi/_MEDfileOpen.c
+@@ -73,7 +73,7 @@ med_idt _MEDfileOpen(const char * const filename,const med_access_mode accessmod
+    •   The creation order tracking property, H5P_CRT_ORDER_TRACKED, has been set in the group creation property list (see H5Pset_link_creation_order). 
+   */
+ #if H5_VERS_MINOR > 10
+-#error "Don't forget to change the compatibility version of the library !"
++//#error "Don't forget to change the compatibility version of the library !"
+ #endif
+ /* L'avantage de bloquer le modèle interne HDF5 
+    est que l'on peut modifier des fichiers med de différentes versions majeures de fichiers.
+diff --git a/src/hdfi/_MEDisasoftlink.c b/src/hdfi/_MEDisasoftlink.c
+index bb03ea7..8d8cd3a 100644
+--- a/src/hdfi/_MEDisasoftlink.c
++++ b/src/hdfi/_MEDisasoftlink.c
+@@ -28,10 +28,10 @@ med_err _MEDisasoftlink(const med_idt               id,
+ 			) {
+ 
+   med_err         _ret=-1;
+-  H5L_info_t      _linkinfo;
++  H5L_info1_t      _linkinfo;
+ 
+   *isasoftlink=MED_FALSE;
+-  if ( H5Lget_info( id, linkname,  &_linkinfo, H5P_DEFAULT ) >= 0 ) {
++  if ( H5Lget_info1( id, linkname,  &_linkinfo, H5P_DEFAULT ) >= 0 ) {
+     if ( _linkinfo.type == H5L_TYPE_SOFT )
+       *isasoftlink=MED_TRUE;
+   } else  {
+diff --git a/src/hdfi/_MEDlinkObjs.c b/src/hdfi/_MEDlinkObjs.c
+index 6d00f5b..3640b2e 100644
+--- a/src/hdfi/_MEDlinkObjs.c
++++ b/src/hdfi/_MEDlinkObjs.c
+@@ -22,7 +22,7 @@
+ #include <hdf5.h>
+ #include <string.h>
+ 
+-med_err _MEDlinkobjs(med_idt id,const char *lname, const H5L_info_t *linfo, visitordatas *data) {
++med_err _MEDlinkobjs(med_idt id,const char *lname, const H5L_info1_t *linfo, visitordatas *data) {
+ 
+   med_err  _ret=-1;
+   med_idt  _gid=0,_gid1=0,_gid2=0;
+@@ -35,7 +35,7 @@ med_err _MEDlinkobjs(med_idt id,const char *lname, const H5L_info_t *linfo, visi
+   med_int  _attfalse=0;
+   char *   _tmppath=0;
+   hsize_t  _it;
+-  H5O_info_t oinfo;
++  H5O_info1_t oinfo;
+ 
+ /*   hid_t   _ocp_plist_id = H5Pcreate( H5P_OBJECT_COPY ); */
+ /*   hid_t   _lcp_plist_id = H5Pcreate( H5P_LINK_CREATE ); */
+@@ -62,7 +62,7 @@ med_err _MEDlinkobjs(med_idt id,const char *lname, const H5L_info_t *linfo, visi
+        sur un lien hard
+        Sur un lien soft H5O_TYPE_UNKNOWN
+     */
+-    if ( H5Oget_info_by_name( id, lname, &oinfo, H5P_DEFAULT ) <0) {
++    if ( H5Oget_info_by_name1( id, lname, &oinfo, H5P_DEFAULT ) <0) {
+       MED_ERR_(_ret,MED_ERR_CALL,MED_ERR_API,"H5Oget_info_by_name");
+       SSCRUTE(lname);
+     }
+diff --git a/src/hdfi/_MEDmemFileOpen.c b/src/hdfi/_MEDmemFileOpen.c
+index 7a10e9b..58e66b1 100644
+--- a/src/hdfi/_MEDmemFileOpen.c
++++ b/src/hdfi/_MEDmemFileOpen.c
+@@ -435,7 +435,7 @@ med_idt _MEDmemFileOpen(const char * const filename, med_memfile * const memfile
+   }
+ 
+ #if H5_VERS_MINOR > 10
+-#error "Don't forget to change the compatibility version of the library !"
++//#error "Don't forget to change the compatibility version of the library !"
+ #endif
+   if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18) ) {
+     MED_ERR_(_fid,MED_ERR_INIT,MED_ERR_PROPERTY,MED_ERR_FILEVERSION_MSG);
+diff --git a/src/hdfi/_MEDobjectGetRank.c b/src/hdfi/_MEDobjectGetRank.c
+index 6762533..b6e823b 100644
+--- a/src/hdfi/_MEDobjectGetRank.c
++++ b/src/hdfi/_MEDobjectGetRank.c
+@@ -27,9 +27,9 @@ med_err _MEDobjectGetRank(const med_idt        gid,
+ 			  med_size *    const  rank )
+ {
+   med_err        _ret=-1;
+-  H5L_info_t      _linkinfo;
++  H5L_info1_t      _linkinfo;
+ 
+-  if ( H5Lget_info( gid, linkname,  &_linkinfo, H5P_DEFAULT ) >= 0 ) {
++  if ( H5Lget_info1( gid, linkname,  &_linkinfo, H5P_DEFAULT ) >= 0 ) {
+     if ( _linkinfo.type == H5L_TYPE_HARD ) {
+       if ( _linkinfo.corder_valid) {
+ 	*rank = (med_size) _linkinfo.corder;
+diff --git a/src/hdfi/_MEDparFileCreate.c b/src/hdfi/_MEDparFileCreate.c
+index e1fc029..aaea0cd 100644
+--- a/src/hdfi/_MEDparFileCreate.c
++++ b/src/hdfi/_MEDparFileCreate.c
+@@ -65,7 +65,7 @@ med_idt _MEDparFileCreate(const char * const filename, const med_access_mode acc
+    * Un test autoconf permet de fixer un intervalle de version HDF à MED.
+    */
+ #if H5_VERS_MINOR > 10
+-#error "Don't forget to change the compatibility version of the library !"
++//#error "Don't forget to change the compatibility version of the library !"
+ #endif
+    
+   if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18 ) ) {
+diff --git a/src/hdfi/_MEDparFileOpen.c b/src/hdfi/_MEDparFileOpen.c
+index 875989f..e55be80 100644
+--- a/src/hdfi/_MEDparFileOpen.c
++++ b/src/hdfi/_MEDparFileOpen.c
+@@ -56,7 +56,7 @@ med_idt _MEDparFileOpen(const char * const filename,const med_access_mode access
+     goto ERROR;
+   }
+ #if H5_VERS_MINOR > 10
+-#error "Don't forget to change the compatibility version of the library !"
++//#error "Don't forget to change the compatibility version of the library !"
+ #endif
+   if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18 ) ) {
+     MED_ERR_(_fid,MED_ERR_INIT,MED_ERR_PROPERTY,MED_ERR_FILEVERSION_MSG);
+diff --git a/src/hdfi/_MEDsoftlinkDel.c b/src/hdfi/_MEDsoftlinkDel.c
+index ec76910..0054eb2 100644
+--- a/src/hdfi/_MEDsoftlinkDel.c
++++ b/src/hdfi/_MEDsoftlinkDel.c
+@@ -27,10 +27,10 @@ med_err _MEDsoftlinkDel(const med_idt               id,
+ 			) {
+ 
+   med_err         _ret=-1;
+-  H5L_info_t      _linkinfo;
++  H5L_info1_t      _linkinfo;
+ 
+ 
+-  if ( H5Lget_info( id, softlinkname,  &_linkinfo, H5P_DEFAULT ) >= 0 ) {
++  if ( H5Lget_info1( id, softlinkname,  &_linkinfo, H5P_DEFAULT ) >= 0 ) {
+     if ( _linkinfo.type == H5L_TYPE_SOFT ) {
+       if ( H5Ldelete(id,softlinkname,H5P_DEFAULT) < 0 ) {
+ 	MED_ERR_(_ret,MED_ERR_DELETE,MED_ERR_LINK,softlinkname);
+diff --git a/src/hdfi/__MEDobjectGetName.c b/src/hdfi/__MEDobjectGetName.c
+index e8f0efb..f368100 100644
+--- a/src/hdfi/__MEDobjectGetName.c
++++ b/src/hdfi/__MEDobjectGetName.c
+@@ -22,7 +22,7 @@
+ #include <hdf5.h>
+ 
+ 
+-extern med_err _MEDcopyName(med_idt id,const char *lname, const H5L_info_t *linfo, void *data);
++extern med_err _MEDcopyName(med_idt id,const char *lname, const H5L_info1_t *linfo, void *data);
+ 
+ med_err
+ __MEDobjectGetName(const med_idt fid, const char * const path, const med_size ind, char *name,
+diff --git a/tools/medimport/2.3.6/_MEDconvertStringDatasets.c b/tools/medimport/2.3.6/_MEDconvertStringDatasets.c
+index 9a1c706..b3e7625 100644
+--- a/tools/medimport/2.3.6/_MEDconvertStringDatasets.c
++++ b/tools/medimport/2.3.6/_MEDconvertStringDatasets.c
+@@ -31,11 +31,11 @@
+ #define MED_TAILLE_LNOM 80
+ #define MAX_LEN_PATH 255
+ 
+-med_err _MEDconvertStringDatasets(med_idt id, const char *lname, const H5L_info_t *linfo, visitordatas *data) {
++med_err _MEDconvertStringDatasets(med_idt id, const char *lname, const H5L_info1_t *linfo, visitordatas *data) {
+ 
+   med_err  _ret=-1,_err=-1;
+   med_idt  _gid=0;
+-  H5O_info_t oinfo;
++  H5O_info1_t oinfo;
+   char     _tmpbuff[MAX_LEN_PATH+1]="";
+   int      _tmpbuffsize=0;
+   med_int  _nbratt=0;
+@@ -52,7 +52,7 @@ med_err _MEDconvertStringDatasets(med_idt id, const char *lname, const H5L_info_
+     oinfo.type=(H5O_type_t) H5G_LINK;
+     break;
+   case H5L_TYPE_HARD:
+-    if ( H5Oget_info_by_name( id, lname, &oinfo, H5P_DEFAULT ) <0) {
++    if ( H5Oget_info_by_name1( id, lname, &oinfo, H5P_DEFAULT ) <0) {
+       MED_ERR_(_ret,MED_ERR_CALL,MED_ERR_API,"H5Oget_info_by_name");
+       SSCRUTE(lname);
+     }
+diff --git a/tools/medimport/include/MAJ_236_300.h b/tools/medimport/include/MAJ_236_300.h
+index a3647c9..f640d0a 100644
+--- a/tools/medimport/include/MAJ_236_300.h
++++ b/tools/medimport/include/MAJ_236_300.h
+@@ -51,7 +51,7 @@ extern int MAJ_236_300_string_datasets(med_idt fid,
+ 
+ extern med_err _MEDconvertStringDatasets(med_idt id,
+ 					 const char *lname,
+-					 const H5L_info_t *linfo,
++					 const H5L_info1_t *linfo,
+ 					 visitordatas *data);
+ 
+ extern void MAJ_236_300_champs(med_idt fid);
+diff --git a/src/hdfi/_MEDobjectGetName.c b/src/hdfi/_MEDobjectGetName.c
+index b9ebcf2..48aafe8 100644
+--- a/src/hdfi/_MEDobjectGetName.c
++++ b/src/hdfi/_MEDobjectGetName.c
+@@ -28,7 +28,7 @@ _MEDobjectGetName(const med_idt fid,const char * const path,const med_size ind,c
+ 
+   med_err _ret=-1;
+ 
+-  if ( H5Literate_by_name(fid,path, H5_INDEX_NAME, H5_ITER_INC,
++  if ( H5Literate_by_name1(fid,path, H5_INDEX_NAME, H5_ITER_INC,
+ 			  (hsize_t *) &ind, _MEDcopyName, name,H5P_DEFAULT ) < 0 ) {
+     MED_ERR_(_ret,MED_ERR_VISIT,MED_ERR_DATAGROUP,path);
+     /* H5Eprint1(stderr); */
+diff --git a/src/hdfi/__MEDobjectGetName.c b/src/hdfi/__MEDobjectGetName.c
+index f368100..c500b21 100644
+--- a/src/hdfi/__MEDobjectGetName.c
++++ b/src/hdfi/__MEDobjectGetName.c
+@@ -57,7 +57,7 @@ __MEDobjectGetName(const med_idt fid, const char * const path, const med_size in
+ /*     goto ERROR; */
+ /*   } */
+ 
+-  if ( H5Literate_by_name(fid,path, index_type, order, (hsize_t *) &ind, _MEDcopyName, name,H5P_DEFAULT ) < 0 ) {
++  if ( H5Literate_by_name1(fid,path, index_type, order, (hsize_t *) &ind, _MEDcopyName, name,H5P_DEFAULT ) < 0 ) {
+     MED_ERR_(_ret,MED_ERR_VISIT,MED_ERR_DATAGROUP,path);
+     /* H5Eprint1(stderr); */
+     goto ERROR;
diff --git a/external_imported/vcpkg/ports/salome-med-fichier/hdf5.patch b/external_imported/vcpkg/ports/salome-med-fichier/hdf5.patch
new file mode 100644
index 000000000..30ab80086
--- /dev/null
+++ b/external_imported/vcpkg/ports/salome-med-fichier/hdf5.patch
@@ -0,0 +1,21 @@
+diff --git a/config/cmake_files/medMacros.cmake b/config/cmake_files/medMacros.cmake
+index 79698ad..5fe3d5f 100644
+--- a/config/cmake_files/medMacros.cmake
++++ b/config/cmake_files/medMacros.cmake
+@@ -448,14 +448,14 @@ MACRO(MED_FIND_HDF5)
+     ## Requires 1.10.x version
+     ##
+     IF (NOT HDF_VERSION_MAJOR_REF EQUAL 1 OR NOT HDF_VERSION_MINOR_REF EQUAL 10 OR NOT HDF_VERSION_RELEASE_REF GREATER 1)
+-        MESSAGE(FATAL_ERROR "HDF5 version is ${HDF_VERSION_REF}. Only versions >= 1.10.2 are supported.")
++        #MESSAGE(FATAL_ERROR "HDF5 version is ${HDF_VERSION_REF}. Only versions >= 1.10.2 are supported.")
+     ENDIF()
+     ##
+     ##
+ 
+     ADD_DEFINITIONS(-DH5_USE_16_API)  
+     IF(WIN32 AND MEDFILE_BUILD_SHARED_LIBS)
+-      ADD_DEFINITIONS(-D_HDF5USEDLL_ -DH5_BUILT_AS_DYNAMIC_LIB=1)   
++      #ADD_DEFINITIONS(-D_HDF5USEDLL_ -DH5_BUILT_AS_DYNAMIC_LIB=1)   
+     ENDIF()
+     
+     # Take what is exposed by the standard FIND_PACKAGE()
diff --git a/external_imported/vcpkg/ports/salome-med-fichier/more-fixes.patch b/external_imported/vcpkg/ports/salome-med-fichier/more-fixes.patch
new file mode 100644
index 000000000..b14b09fc5
--- /dev/null
+++ b/external_imported/vcpkg/ports/salome-med-fichier/more-fixes.patch
@@ -0,0 +1,60 @@
+diff --git a/src/ci/MEDfileExist.c b/src/ci/MEDfileExist.c
+index f4f1683..6c902ae 100644
+--- a/src/ci/MEDfileExist.c
++++ b/src/ci/MEDfileExist.c
+@@ -25,6 +25,7 @@
+ #define	W_OK	2		/* Test for write permission.  */
+ #define	X_OK	1		/* Test for execute permission.  */
+ #define	F_OK	0		/* Test for existence.  */
++#include <io.h>
+ #else
+ #include <unistd.h>
+ #endif
+diff --git a/src/misc/_MEDaccess.c b/src/misc/_MEDaccess.c
+index 481203d..4c18b2a 100644
+--- a/src/misc/_MEDaccess.c
++++ b/src/misc/_MEDaccess.c
+@@ -17,6 +17,7 @@
+ 
+ #if defined(WIN32)
+ #include <windows.h>
++#include <io.h>
+ #else
+ #include <unistd.h>
+ #endif
+diff --git a/tools/mdump/mdump2.c b/tools/mdump/mdump2.c
+index 820a5f0..c711a8b 100644
+--- a/tools/mdump/mdump2.c
++++ b/tools/mdump/mdump2.c
+@@ -80,6 +80,7 @@ extern "C" {
+ 
+ #ifdef PPRO_NT
+ #define F_OK 0
++#include <io.h>
+ #else
+ #include <unistd.h>
+ #endif
+diff --git a/tools/mdump/mdump3.c b/tools/mdump/mdump3.c
+index 228fb81..cb648b5 100644
+--- a/tools/mdump/mdump3.c
++++ b/tools/mdump/mdump3.c
+@@ -81,6 +81,7 @@ extern "C" {
+ #ifdef PPRO_NT
+ #define F_OK 0
+ #define snprintf _snprintf
++#include <io.h>
+ #else
+ #include <unistd.h>
+ #endif
+diff --git a/tools/mdump/mdump4.c b/tools/mdump/mdump4.c
+index 6f2fc3d..725cd14 100644
+--- a/tools/mdump/mdump4.c
++++ b/tools/mdump/mdump4.c
+@@ -81,6 +81,7 @@ extern "C" {
+ #ifdef PPRO_NT
+ #define F_OK 0
+ #define snprintf _snprintf
++#include <io.h>
+ #else
+ #include <unistd.h>
+ #endif
diff --git a/external_imported/vcpkg/ports/salome-med-fichier/portfile.cmake b/external_imported/vcpkg/ports/salome-med-fichier/portfile.cmake
new file mode 100644
index 000000000..b1fd11e29
--- /dev/null
+++ b/external_imported/vcpkg/ports/salome-med-fichier/portfile.cmake
@@ -0,0 +1,81 @@
+# This library cannot easily be found only. Be aware that the original source repository is not accessible.
+# Checking for updates needs to be done manually by trying to increase the version in the link.
+# med-fichier is needed to build all libraries of the https://www.salome-platform.org/ since it is the io 
+# entry point to open and read .med files.
+vcpkg_download_distfile(ARCHIVE
+  URLS "https://files.salome-platform.org/Salome/other/med-${VERSION}.tar.gz"
+  FILENAME "med-${VERSION}.tar.gz"
+  SHA512 8917e7ecfe30e1259b0927c8e1c3d6efd86ed2386813f6d90217bd95589199478e587f0815031ab65cacf7901a30b77a6307414f9073caffe6e7f013e710d768
+)
+
+vcpkg_extract_source_archive(
+  SOURCE_PATH
+  ARCHIVE "${ARCHIVE}"
+  PATCHES 
+    hdf5.patch        # CMake patches for hdf5
+    hdf5-2.patch      # source patches to fix API version of HDF5
+    more-fixes.patch  # include fixes
+)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static"  MEDFILE_BUILD_STATIC_LIBS)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic"  MEDFILE_BUILD_SHARED_LIBS)
+
+# If there are problems with the cmake build try switching to autotools for !windows
+vcpkg_cmake_configure(
+    DISABLE_PARALLEL_CONFIGURE # Writes into the source dir
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+      -DMEDFILE_BUILD_SHARED_LIBS=${MEDFILE_BUILD_SHARED_LIBS}
+      -DMEDFILE_BUILD_STATIC_LIBS=${MEDFILE_BUILD_STATIC_LIBS}
+      -DMEDFILE_INSTALL_DOC=OFF
+      -DMEDFILE_BUILD_TESTS=OFF
+      -DCMAKE_Fortran_COMPILER=NOTFOUND # Disable Fortran
+    )
+
+vcpkg_cmake_install()
+if(VCPKG_TARGET_IS_WINDOWS)
+  vcpkg_cmake_config_fixup(PACKAGE_NAME MEDFile CONFIG_PATH cmake)
+  vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/MEDFile/MEDFileConfig.cmake" "/cmake/" "/share/MEDFile/")
+else()
+  vcpkg_cmake_config_fixup(PACKAGE_NAME MEDFile CONFIG_PATH share/cmake/medfile-4.1.1)
+  vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/MEDFile/MEDFileConfig.cmake" "share/cmake/medfile-${VERSION}" "share/MEDFile")
+endif()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    set(EXTRA_TOOLS medimport)
+endif()
+
+vcpkg_copy_tools(TOOL_NAMES mdump2 mdump3 mdump4 medconforme ${EXTRA_TOOLS} AUTO_CLEAN)
+foreach(xdump IN ITEMS xmdump2 xmdump3 xmdump4)
+  file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/${xdump}" "${CURRENT_PACKAGES_DIR}/debug/bin/${xdump}")
+endforeach()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+elseif(VCPKG_TARGET_IS_WINDOWS) #dynamic builds on windows
+  file(GLOB dll_files "${CURRENT_PACKAGES_DIR}/lib/*.dll")
+  foreach(dll_file IN LISTS dll_files)
+    string(REPLACE "/lib/" "/bin/" dll_file_moved "${dll_file}")
+    file(RENAME "${dll_file}" "${dll_file_moved}")
+  endforeach()
+  if(NOT VCPKG_BUILD_TYPE)
+    file(GLOB dll_files "${CURRENT_PACKAGES_DIR}/debug/lib/*.dll")
+    foreach(dll_file IN LISTS dll_files)
+      string(REPLACE "/lib/" "/bin/" dll_file_moved "${dll_file}")
+      file(RENAME "${dll_file}" "${dll_file_moved}")
+    endforeach()
+  endif()
+  set(file "${CURRENT_PACKAGES_DIR}/share/MEDFile/MEDFileTargets-release.cmake")
+  file(READ "${file}" contents)
+  string(REGEX REPLACE "/lib/([^.]+)\\.dll" "/bin/\\1.dll" contents "${contents}")
+  file(WRITE "${file}" "${contents}")
+  if(NOT VCPKG_BUILD_TYPE)
+    set(file "${CURRENT_PACKAGES_DIR}/share/MEDFile/MEDFileTargets-debug.cmake")
+    file(READ "${file}" contents)
+    string(REGEX REPLACE "/lib/([^.]+)\\.dll" "/bin/\\1.dll" contents "${contents}")
+    file(WRITE "${file}" "${contents}")
+  endif()
+endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING.LESSER") # GPL seems to be mentioned due to autotools stuff
diff --git a/external_imported/vcpkg/ports/salome-med-fichier/vcpkg.json b/external_imported/vcpkg/ports/salome-med-fichier/vcpkg.json
new file mode 100644
index 000000000..ea26b4478
--- /dev/null
+++ b/external_imported/vcpkg/ports/salome-med-fichier/vcpkg.json
@@ -0,0 +1,22 @@
+{
+  "name": "salome-med-fichier",
+  "version": "4.1.1",
+  "port-version": 1,
+  "description": "med-fichier provides a low level C API for fine-grained access to the structure of MED files (.med)",
+  "homepage": "https://www.salome-platform.org",
+  "license": "LGPL-3.0-or-later",
+  "dependencies": [
+    {
+      "name": "hdf5",
+      "default-features": false
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/salome-medcoupling/fix-missing-symbols.patch b/external_imported/vcpkg/ports/salome-medcoupling/fix-missing-symbols.patch
new file mode 100644
index 000000000..88a061ff9
--- /dev/null
+++ b/external_imported/vcpkg/ports/salome-medcoupling/fix-missing-symbols.patch
@@ -0,0 +1,13 @@
+diff --git a/src/MEDCoupling/MEDCouplingMemArray.cxx b/src/MEDCoupling/MEDCouplingMemArray.cxx
+index 60d040806..8cb6748d2 100644
+--- a/src/MEDCoupling/MEDCouplingMemArray.cxx
++++ b/src/MEDCoupling/MEDCouplingMemArray.cxx
+@@ -44,6 +44,8 @@ using namespace MEDCoupling;
+ 
+ template class MEDCOUPLING_EXPORT MEDCoupling::MemArray<mcIdType>;
+ template class MEDCOUPLING_EXPORT MEDCoupling::MemArray<double>;
++template class MEDCOUPLING_EXPORT MEDCoupling::MemArray<Int32>;
++template class MEDCOUPLING_EXPORT MEDCoupling::MemArray<Int64>;
+ template class MEDCOUPLING_EXPORT MEDCoupling::DataArrayTemplate<mcIdType>;
+ template class MEDCOUPLING_EXPORT MEDCoupling::DataArrayTemplate<double>;
+ template class MEDCOUPLING_EXPORT MEDCoupling::DataArrayTemplateClassic<Int32>;
diff --git a/external_imported/vcpkg/ports/salome-medcoupling/portfile.cmake b/external_imported/vcpkg/ports/salome-medcoupling/portfile.cmake
new file mode 100644
index 000000000..79e1ef4ba
--- /dev/null
+++ b/external_imported/vcpkg/ports/salome-medcoupling/portfile.cmake
@@ -0,0 +1,71 @@
+if(VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
+    # Fixing static builds requires fixing/removing _declspec(dllexport|dllimport)
+    # in the EXPORTS macros.
+endif()
+
+vcpkg_from_git(
+    OUT_SOURCE_PATH SOURCE_PATH
+    URL "https://git.salome-platform.org/gitpub/tools/medcoupling.git"
+    REF "fe2e38d301902c626f644907e00e499552bb2fa5"
+    PATCHES 
+        win.patch 
+        fix-missing-symbols.patch
+)
+
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static"  MEDCOUPLING_BUILD_STATIC)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS 
+      "-DCONFIGURATION_ROOT_DIR=${SALOME_CONFIGURATION_ROOT_DIR}"
+      -DMEDCOUPLING_BUILD_TESTS=OFF
+      -DMEDCOUPLING_BUILD_PY_TESTS=OFF
+      -DMEDCOUPLING_BUILD_DOC=OFF
+      -DMEDCOUPLING_BUILD_STATIC=${MEDCOUPLING_BUILD_STATIC}
+      -DMEDCOUPLING_ENABLE_PYTHON=OFF
+      -DMEDCOUPLING_ENABLE_RENUMBER=OFF
+      -DMEDCOUPLING_METIS_V5=ON
+      -DMETIS_LIBRARIES=metis # this is a target
+      -DSCOTCH_LIBRARIES=SCOTCH::scotch
+)
+
+vcpkg_cmake_install()
+
+file(GLOB dll_files "${CURRENT_PACKAGES_DIR}/lib/*.dll")
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin")
+foreach(dll_file IN LISTS dll_files)
+  string(REPLACE "/lib/" "/bin/" new_loc "${dll_file}")
+  file(RENAME "${dll_file}" "${new_loc}")
+endforeach()
+
+if(NOT VCPKG_BUILD_TYPE)
+  file(GLOB dll_files "${CURRENT_PACKAGES_DIR}/debug/lib/*.dll")
+  file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin")
+  foreach(dll_file IN LISTS dll_files)
+    string(REPLACE "/lib/" "/bin/" new_loc "${dll_file}")
+    file(RENAME "${dll_file}" "${new_loc}")
+  endforeach()
+endif()
+
+vcpkg_cmake_config_fixup(PACKAGE_NAME MEDCoupling CONFIG_PATH "cmake_files")
+if(VCPKG_TARGET_IS_WINDOWS)
+  set(file "${CURRENT_PACKAGES_DIR}/share/MEDCoupling/MEDCouplingTargets-release.cmake")
+  file(READ "${file}" contents)
+  string(REGEX REPLACE "/lib/([^.]+)\\.dll" "/bin/\\1.dll" contents "${contents}")
+  file(WRITE "${file}" "${contents}")
+
+  if(NOT VCPKG_BUILD_TYPE)
+    set(file "${CURRENT_PACKAGES_DIR}/share/MEDCoupling/MEDCouplingTargets-debug.cmake")
+    file(READ "${file}" contents)
+    string(REGEX REPLACE "/lib/([^.]+)\\.dll" "/bin/\\1.dll" contents "${contents}")
+    file(WRITE "${file}" "${contents}")
+  endif()
+endif()
+
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/MEDCoupling/MEDCouplingConfig.cmake" "/cmake_files" "/share/MEDCoupling")
+vcpkg_copy_tools(TOOL_NAMES medpartitioner AUTO_CLEAN)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include"
+                    "${CURRENT_PACKAGES_DIR}/debug/share")
diff --git a/external_imported/vcpkg/ports/salome-medcoupling/vcpkg.json b/external_imported/vcpkg/ports/salome-medcoupling/vcpkg.json
new file mode 100644
index 000000000..ba9051916
--- /dev/null
+++ b/external_imported/vcpkg/ports/salome-medcoupling/vcpkg.json
@@ -0,0 +1,30 @@
+{
+  "name": "salome-medcoupling",
+  "version": "9.10.0",
+  "description": "salome-medcoupling is a part of SALOME platform to manipulate meshes and fields in memory, and use salome-med format for files.",
+  "homepage": "https://www.salome-platform.org",
+  "license": "GPL-2.0-or-later",
+  "supports": "!(windows & static)",
+  "dependencies": [
+    "boost-chrono",
+    "boost-date-time",
+    "boost-filesystem",
+    "boost-regex",
+    "boost-serialization",
+    "boost-system",
+    "boost-thread",
+    "libxml2",
+    "metis",
+    "salome-configuration",
+    "salome-med-fichier",
+    "scotch",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/salome-medcoupling/win.patch b/external_imported/vcpkg/ports/salome-medcoupling/win.patch
new file mode 100644
index 000000000..25c1104c3
--- /dev/null
+++ b/external_imported/vcpkg/ports/salome-medcoupling/win.patch
@@ -0,0 +1,18 @@
+diff --git a/src/MEDPartitioner/CMakeLists.txt b/src/MEDPartitioner/CMakeLists.txt
+index e088a0ed4..048505267 100644
+--- a/src/MEDPartitioner/CMakeLists.txt
++++ b/src/MEDPartitioner/CMakeLists.txt
+@@ -114,8 +114,12 @@ SET(medpartitionercpp_LDFLAGS
+   interpkernel
+   medcouplingcpp
+   medloader
+-  -lpthread
+ )
++
++if(NOT WIN32)
++    list(APPEND medpartitionercpp_LDFLAGS -lpthread)
++endif()
++
+ IF(MEDCOUPLING_PARTITIONER_PARMETIS)
+   SET(medpartitionercpp_HEADERS_HXX ${medpartitionercpp_HEADERS_HXX} MEDPARTITIONER_ParMetisGraph.hxx)
+   SET(medpartitionercpp_SOURCES ${medpartitionercpp_SOURCES} MEDPARTITIONER_ParMetisGraph.cxx MEDPARTITIONER_MetisGraph.cxx)
diff --git a/external_imported/vcpkg/ports/saucer/fix-source-generation.patch b/external_imported/vcpkg/ports/saucer/fix-source-generation.patch
deleted file mode 100644
index be1dcde90..000000000
--- a/external_imported/vcpkg/ports/saucer/fix-source-generation.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3800146..61a9e60 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -80,7 +80,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE "include/saucer")
- # --------------------------------------------------------------------------------------------------------
- 
- string(TOLOWER ${saucer_backend} saucer_backed_lower)
--configure_file("constants.hpp.in" "${CMAKE_CURRENT_SOURCE_DIR}/include/saucer/constants.hpp")
-+configure_file("constants.hpp.in" "${CMAKE_BINARY_DIR}/include/saucer/constants.hpp")
- 
- # --------------------------------------------------------------------------------------------------------
- # Configure Library depending on options
-@@ -91,6 +91,7 @@ include(FetchContent)
- if (saucer_backend STREQUAL "Qt")
-     target_sources(${PROJECT_NAME} PRIVATE "src/webview.qt5.cpp" "src/window.qt5.cpp")
-     target_sources(${PROJECT_NAME} PRIVATE "src/webview.qt5.impl.hpp" "src/window.qt5.impl.hpp")
-+    target_sources(${PROJECT_NAME} PRIVATE "${CMAKE_BINARY_DIR}/include/saucer/constants.hpp")
- 
-     find_package(Qt5 COMPONENTS Widgets WebEngineWidgets WebChannel REQUIRED)
-     target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Widgets Qt5::WebEngineWidgets Qt5::WebChannel)
diff --git a/external_imported/vcpkg/ports/saucer/fix_findpkg.patch b/external_imported/vcpkg/ports/saucer/fix_findpkg.patch
new file mode 100644
index 000000000..a09b15f34
--- /dev/null
+++ b/external_imported/vcpkg/ports/saucer/fix_findpkg.patch
@@ -0,0 +1,100 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d5eccb6..5f9ab71 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -131,51 +131,16 @@ endif()
+ include("cmake/cpm.cmake")
+ include("cmake/nuget.cmake")
+ 
+-CPMFindPackage(
+-  NAME           lockpp
+-  VERSION        2.6
+-  GIT_REPOSITORY "https://github.com/Soundux/lockpp"
+-)
+-
+-CPMFindPackage(
+-  NAME           boost_callable_traits
+-  GIT_TAG        boost-1.83.0
+-  GIT_REPOSITORY "https://github.com/boostorg/callable_traits"
+-)
+-
+-CPMFindPackage(
+-  NAME           tl-expected
+-  VERSION        1.1.0
+-  GIT_REPOSITORY "https://github.com/TartanLlama/expected"
+-  OPTIONS        "EXPECTED_BUILD_TESTS OFF"
+-)
+-
+-CPMFindPackage(
+-  NAME           ereignis
+-  VERSION        2.3
+-  GIT_REPOSITORY "https://github.com/Soundux/ereignis"
+-)
+-
+-CPMFindPackage(
+-  NAME           fmt
+-  GIT_TAG        10.1.1
+-  GIT_REPOSITORY "https://github.com/fmtlib/fmt"
+-)
+-
+-CPMFindPackage(
+-  NAME           glaze
+-  VERSION        1.5.4
+-  GIT_REPOSITORY "https://github.com/stephenberry/glaze"
+-)
+-
+-CPMFindPackage(
+-  NAME           flagpp
+-  VERSION        2.1
+-  GIT_REPOSITORY "https://github.com/Curve/flagpp"
+-)
++find_path(LOCKPP_INCLUDE_DIRS "lockpp")
++find_path(BOOST_CALLTRA_INCLUDE_DIRS "boost/callable_traits")
++find_package(tl-expected CONFIG REQUIRED)
++find_path(EREIGNIS_INCLUDE_DIRS "ereignis")
++find_package(fmt CONFIG REQUIRED)
++find_package(glaze CONFIG REQUIRED)
++find_path(FLAGPP_INCLUDE_DIRS "flagpp")
+ 
+-target_link_libraries(${PROJECT_NAME} PRIVATE cr::flagpp)
+-target_link_libraries(${PROJECT_NAME} PUBLIC  lockpp boost_callable_traits tl::expected glaze::glaze ereignis fmt)
++target_include_directories(${PROJECT_NAME} PRIVATE ${EREIGNIS_INCLUDE_DIRS} ${LOCKPP_INCLUDE_DIRS} ${BOOST_CALLTRA_INCLUDE_DIRS} ${FLAGPP_INCLUDE_DIRS})
++target_link_libraries(${PROJECT_NAME} PRIVATE glaze::glaze fmt::fmt tl::expected)
+ 
+ # --------------------------------------------------------------------------------------------------------
+ # Setup Linkage
+@@ -218,7 +183,7 @@ if (saucer_backend STREQUAL "WebView2")
+   target_compile_definitions(${PROJECT_NAME} PRIVATE UNICODE=1 _UNICODE=1 NOMINMAX=1)
+ 
+   include("cmake/webview2.cmake")
+-  target_link_libraries(${PROJECT_NAME} ${saucer_linkage} Shlwapi webview2::webview2)
++  target_link_libraries(${PROJECT_NAME} ${saucer_linkage} Shlwapi unofficial::webview2::webview2)
+ endif()
+ 
+ # --------------------------------------------------------------------------------------------------------
+@@ -258,6 +223,4 @@ if (saucer_prefer_remote AND saucer_backend STREQUAL "WebView2")
+ endif()
+ 
+ install(DIRECTORY "include/saucer" TYPE INCLUDE)
+-install(DIRECTORY "$<TARGET_PROPERTY:fmt,INTERFACE_INCLUDE_DIRECTORIES>/fmt" TYPE INCLUDE)
+-install(DIRECTORY "$<TARGET_PROPERTY:glaze_glaze,INTERFACE_INCLUDE_DIRECTORIES>/glaze" TYPE INCLUDE)
+-install(DIRECTORY "$<TARGET_PROPERTY:boost_callable_traits,INTERFACE_INCLUDE_DIRECTORIES>/boost" TYPE INCLUDE)
++install(DIRECTORY "${BOOST_CALLTRA_INCLUDE_DIRS}/boost/callable_traits" DESTINATION "include/boost/callable_traits")
+diff --git a/cmake/webview2.cmake b/cmake/webview2.cmake
+index 9ee3dbc..3827e94 100644
+--- a/cmake/webview2.cmake
++++ b/cmake/webview2.cmake
+@@ -1,11 +1,11 @@
+ include("cmake/nuget.cmake")
+ 
+ if (NOT saucer_prefer_remote)
+-    find_package(webview2 CONFIG REQUIRED)
++    find_package(unofficial-webview2 CONFIG REQUIRED)
+     return()
+ endif()
+ 
+-if (NOT TARGET webview2::webview2)
++if (NOT TARGET unofficial::webview2::webview2)
+     nuget_add(WebView2 "Microsoft.Web.WebView2" ${saucer_webview2_version})
+ 
+     add_library(webview2 STATIC IMPORTED)
diff --git a/external_imported/vcpkg/ports/saucer/portfile.cmake b/external_imported/vcpkg/ports/saucer/portfile.cmake
index 0ca352fc3..eb43057ab 100644
--- a/external_imported/vcpkg/ports/saucer/portfile.cmake
+++ b/external_imported/vcpkg/ports/saucer/portfile.cmake
@@ -3,20 +3,24 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO saucer/saucer
-    REF 6ae482092cca4d4a408e6bdf24714153d9203797
-    SHA512 1865f6178b2885483f0b43c1641e602f957d4e64e77b802e64a64038b709dbf63fa2dd6037720e7180434e91341f2e1a0eb86424c1ee1556db5971cba3434bb0
+    REF "v${VERSION}"
+    SHA512 29abb465a888aa4284795e293624598c09e0ba690bb430adb7a2122d82985daa1cfcfd594120f5657fc70349f8480e63554d72bff1b23f9dca86bcdbb930d953
     HEAD_REF dev
     PATCHES
-        unofficial-webview2.patch
-        fix-source-generation.patch
+        fix_findpkg.patch
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH} 
-    OPTIONS -Dsaucer_prefer_remote=OFF -Dsaucer_remote_webview2=OFF
+    OPTIONS
+        ${BACKEND_OPTION}
+        -Dsaucer_prefer_remote=OFF
+        -Dsaucer_remote_webview2=OFF
+    MAYBE_UNUSED_VARIABLES
+        saucer_remote_webview2
 )
 
 vcpkg_cmake_install()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/saucer/unofficial-webview2.patch b/external_imported/vcpkg/ports/saucer/unofficial-webview2.patch
deleted file mode 100644
index be42769a6..000000000
--- a/external_imported/vcpkg/ports/saucer/unofficial-webview2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9fa4269..f950363 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -111,8 +111,8 @@ elseif (saucer_backend STREQUAL "WebView2")
-     endif()
- 
-     if (NOT saucer_remote_webview2)
--        find_package(webview2 CONFIG REQUIRED)
--        target_link_libraries(${PROJECT_NAME} PRIVATE webview2::webview2)
-+        find_package(unofficial-webview2 CONFIG REQUIRED)
-+        target_link_libraries(${PROJECT_NAME} PRIVATE unofficial::webview2::webview2)
-     else()
-         include("NuGet.cmake")
-         nuget_add(WebView2 "Microsoft.Web.WebView2" ${saucer_webview2_version})
diff --git a/external_imported/vcpkg/ports/saucer/vcpkg.json b/external_imported/vcpkg/ports/saucer/vcpkg.json
index a70da6bfa..e52f3ee68 100644
--- a/external_imported/vcpkg/ports/saucer/vcpkg.json
+++ b/external_imported/vcpkg/ports/saucer/vcpkg.json
@@ -1,22 +1,24 @@
 {
   "name": "saucer",
-  "version": "1.0.1",
-  "port-version": 2,
+  "version": "2.1.0",
   "description": "Next-gen desktop apps with web-frontend in C++",
   "homepage": "https://saucer.github.io/",
   "license": "MIT",
   "supports": "!uwp",
   "dependencies": [
+    "boost-callable-traits",
     "ereignis",
+    "flagpp",
     "fmt",
+    "glaze",
     "lockpp",
     "nlohmann-json",
     {
-      "name": "qt5-webchannel",
+      "name": "qtwebchannel",
       "platform": "!windows"
     },
     {
-      "name": "qt5-webengine",
+      "name": "qtwebengine",
       "platform": "!windows"
     },
     "tl-expected",
@@ -27,10 +29,6 @@
     {
       "name": "webview2",
       "platform": "windows"
-    },
-    {
-      "name": "wil",
-      "platform": "windows"
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/scenepic/portfile.cmake b/external_imported/vcpkg/ports/scenepic/portfile.cmake
index a52ef472b..8a7f97646 100644
--- a/external_imported/vcpkg/ports/scenepic/portfile.cmake
+++ b/external_imported/vcpkg/ports/scenepic/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO  microsoft/scenepic 
     REF "v${VERSION}"
-    SHA512 2d9dfcefa7a054cf0addb12113ab65cb7dd3a8a6f7b42f60558a5d47a6de45a9e801be3266b81358ff8ac075dd9e9e2b9369905d62f2383531d6e28e93406ac9
+    SHA512 2ec8cdaa54a4432386175c545c4114d0682015cb34f77968622eac0b9ef6ccd8a5f14ba663339995bf109b472958407f694d40adf6025c02e464e94ef4fe5bd0
     HEAD_REF main
     PATCHES
         "fix_dependencies.patch"
diff --git a/external_imported/vcpkg/ports/scenepic/vcpkg.json b/external_imported/vcpkg/ports/scenepic/vcpkg.json
index 162453df2..3e709eb09 100644
--- a/external_imported/vcpkg/ports/scenepic/vcpkg.json
+++ b/external_imported/vcpkg/ports/scenepic/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "scenepic",
-  "version": "1.0.16",
+  "version": "1.1.0",
   "port-version": 1,
   "description": "A Powerful, easy to use, and portable visualization toolkit for mixed 3D and 2D content",
   "homepage": "https://microsoft.github.io/scenepic/",
diff --git a/external_imported/vcpkg/ports/scintilla/portfile.cmake b/external_imported/vcpkg/ports/scintilla/portfile.cmake
index 50d61e642..3e16b3618 100644
--- a/external_imported/vcpkg/ports/scintilla/portfile.cmake
+++ b/external_imported/vcpkg/ports/scintilla/portfile.cmake
@@ -12,17 +12,17 @@ if(VCPKG_CRT_LINKAGE STREQUAL "static")
   list(APPEND PATCHES 0002-static-crt.patch)
 endif()
 
-vcpkg_extract_source_archive_ex(
-  OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+  SOURCE_PATH
   ARCHIVE ${ARCHIVE}
-  REF 4.4.6
+  SOURCE_BASE 4.4.6
   PATCHES ${PATCHES}
 )
 
 vcpkg_install_msbuild(
-  SOURCE_PATH ${SOURCE_PATH}
+  SOURCE_PATH "${SOURCE_PATH}"
   PROJECT_SUBPATH Win32/SciLexer.vcxproj
-  LICENSE_SUBPATH License.txt
 )
 
-file(INSTALL ${SOURCE_PATH}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT} FILES_MATCHING PATTERN "*.*")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/License.txt")
+file(INSTALL "${SOURCE_PATH}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}" FILES_MATCHING PATTERN "*.*")
diff --git a/external_imported/vcpkg/ports/scintilla/vcpkg.json b/external_imported/vcpkg/ports/scintilla/vcpkg.json
index 2a934dc63..156e0a97d 100644
--- a/external_imported/vcpkg/ports/scintilla/vcpkg.json
+++ b/external_imported/vcpkg/ports/scintilla/vcpkg.json
@@ -1,8 +1,15 @@
 {
   "name": "scintilla",
   "version": "4.4.6",
-  "port-version": 1,
+  "port-version": 3,
   "description": "A free source code editing component for Win32, GTK+, and OS X",
   "homepage": "https://www.scintilla.org/",
-  "supports": "!(uwp | linux | osx)"
+  "supports": "!(uwp | linux | osx)",
+  "dependencies": [
+    {
+      "name": "vcpkg-msbuild",
+      "host": true,
+      "platform": "windows"
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/sciter-js/portfile.cmake b/external_imported/vcpkg/ports/sciter-js/portfile.cmake
index 82759029e..a8e0a0d88 100644
--- a/external_imported/vcpkg/ports/sciter-js/portfile.cmake
+++ b/external_imported/vcpkg/ports/sciter-js/portfile.cmake
@@ -6,8 +6,8 @@ endif()
 
 set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled)
 
-set(SCITER_REVISION 52bfe183983118c884294c864ee7b3d0dd199de6)
-set(SCITER_SHA d31ef2a07525bf1c91b9f36ee434db6227bead732f5779cb4ee28ab6d92957bfb3d4656a960d3c47e64f3efc207f78be64853a56b1e1a14f56fd3c829b022155)
+set(SCITER_REVISION 6f18e8725a8d14b8ba44b2c0d00ca126f119ed21)
+set(SCITER_SHA 93fdc1046b325ba7bf705665cb09f9adab3c198d4e8cb40febd4ccffe48077760907440c8eb7d7d44e1f619184bc070835c5c3d5aada363eb70528b8259aa74f)
 
 if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64)
     set(SCITER_ARCH x64)
@@ -17,11 +17,12 @@ else()
 	message(FATAL_ERROR "Sciter only supports x86/x64")
 endif()
 
-# check out the `https://github.com/c-smile/sciter-js-sdk/archive/${SCITER_REVISION}.tar.gz`
+# check out the `https://gitlab.com/sciter-engine/sciter-js-sdk/-/archive/${SCITER_REVISION}/sciter-js-sdk-${SCITER_REVISION}.tar.gz`
 # hash checksum can be obtained with `curl -L -o tmp.tgz ${URL} && vcpkg hash tmp.tgz`
-vcpkg_from_github(
+vcpkg_from_gitlab(
+    GITLAB_URL https://gitlab.com
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO c-smile/sciter-js-sdk
+    REPO sciter-engine/sciter-js-sdk
     REF ${SCITER_REVISION}
     SHA512 ${SCITER_SHA}
 )
@@ -40,7 +41,7 @@ set(SCITER_TOOLS ${CURRENT_PACKAGES_DIR}/tools/sciter-js)
 set(TOOL_PERMS FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 
 # license
-file(COPY ${SOURCE_PATH}/logfile.md DESTINATION ${SCITER_SHARE})
+file(COPY ${SOURCE_PATH}/CHANGELOG.md DESTINATION ${SCITER_SHARE})
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${SCITER_SHARE} RENAME copyright)
 
 # tools
diff --git a/external_imported/vcpkg/ports/sciter-js/vcpkg.json b/external_imported/vcpkg/ports/sciter-js/vcpkg.json
index 6e5606aab..a03197a14 100644
--- a/external_imported/vcpkg/ports/sciter-js/vcpkg.json
+++ b/external_imported/vcpkg/ports/sciter-js/vcpkg.json
@@ -1,8 +1,8 @@
 {
   "name": "sciter-js",
-  "version": "4.4.8.31",
+  "version": "5.0.3.0",
   "description": "Sciter.JS - Sciter but with QuickJS on board instead of TIScript. Sciter is an embeddable HTML/CSS/scripting engine.",
-  "homepage": "https://github.com/c-smile/sciter-js-sdk",
+  "homepage": "https://gitlab.com/sciter-engine/sciter-js-sdk",
   "supports": "!uwp & !arm & !static",
   "features": {
     "windowless": {
diff --git a/external_imported/vcpkg/ports/scnlib/portfile.cmake b/external_imported/vcpkg/ports/scnlib/portfile.cmake
index 601120422..7e19546e3 100644
--- a/external_imported/vcpkg/ports/scnlib/portfile.cmake
+++ b/external_imported/vcpkg/ports/scnlib/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO eliaskosunen/scnlib
-    REF v1.0
-    SHA512 0d34b5a710a472618df5d8202bbd647f488aa0ac2ad593c4a212e42b8aee5c35882f6e0ab7a7241c766ed17c9273d5e6704b012ef7f23a1b329b2a2f28ec60c6
+    REF "v${VERSION}"
+    SHA512 5dc2cc0f0817710453c7741cb61df46b4d4a43af0ec5cbbba77e3b6fb055e906840c232f92df5c3f3a9643191268922f059eacb798978767c717cc3578eb117d
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/scnlib/vcpkg.json b/external_imported/vcpkg/ports/scnlib/vcpkg.json
index a4b786a9c..98b5c8fd2 100644
--- a/external_imported/vcpkg/ports/scnlib/vcpkg.json
+++ b/external_imported/vcpkg/ports/scnlib/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "scnlib",
-  "version": "1.0",
-  "port-version": 1,
+  "version": "1.1.2",
   "description": "scnlib is a modern C++ library for replacing scanf and std::istream",
   "homepage": "https://scnlib.dev/",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/scotch/fix-build.patch b/external_imported/vcpkg/ports/scotch/fix-build.patch
new file mode 100644
index 000000000..af623ae05
--- /dev/null
+++ b/external_imported/vcpkg/ports/scotch/fix-build.patch
@@ -0,0 +1,311 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 83144b41b..1cfe80d42 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -41,9 +41,9 @@
+ ##                                                        ##
+ ############################################################
+ 
+-project(SCOTCH)
+ cmake_minimum_required(VERSION 3.10)
+-enable_language(C Fortran)
++project(SCOTCH)
++enable_language(C)
+ 
+ # Add module directory
+ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 22a81ffbe..7746b22af 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -95,14 +95,23 @@ endif()
+ 
+ # Thread support in Scotch
+ if(THREADS)
+-  find_package(Threads)
+-  if(Threads_FOUND)
++set(USE_PTHREAD OFF)
++if(NOT WIN32)
++  find_package(Threads REQUIRED)
++  if(CMAKE_USE_PTHREADS_INIT)
+     add_definitions(-DCOMMON_PTHREAD -DSCOTCH_PTHREAD)
++    set(USE_PTHREAD ON)
+   endif()
+   include(CheckPthreadAffinity)
+   if(PTHREAD_AFFINITY_LINUX_OK)
+     add_definitions(-DCOMMON_PTHREAD_AFFINITY_LINUX)
+   endif()
++else()
++  find_package(PThreads4W REQUIRED)
++  add_definitions(-DCOMMON_PTHREAD -DSCOTCH_PTHREAD)
++  link_libraries(PThreads4W::PThreads4W)
++  set(USE_PTHREAD ON)
++endif()
+ endif()
+ 
+ # decompression libs
+@@ -174,8 +183,9 @@ if(BUILD_LIBSCOTCHMETIS)
+ endif(BUILD_LIBSCOTCHMETIS)
+ 
+ # Testing
+-add_subdirectory(check)
+-
++if(BUILD_TESTING)
++  add_subdirectory(check)
++endif()
+ ####################
+ #  Export targets  #
+ ####################
+diff --git a/src/libscotch/CMakeLists.txt b/src/libscotch/CMakeLists.txt
+index e3b0cb939..5ab322eca 100644
+--- a/src/libscotch/CMakeLists.txt
++++ b/src/libscotch/CMakeLists.txt
+@@ -503,12 +503,30 @@ set(SCOTCH_C_SOURCES
+   wgraph_part_zr.h
+   wgraph_store.c)
+ 
++add_library(scotcherr library_error.c)
++target_include_directories(scotcherr PUBLIC
++  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
++  $<BUILD_INTERFACE:${GENERATED_INCLUDE_DIR}>
++  $<INSTALL_INTERFACE:include>)
++
++add_dependencies(scotcherr scotch_h)
++
++add_library(scotcherrexit library_error_exit.c)
++target_include_directories(scotcherrexit PUBLIC
++  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
++  $<BUILD_INTERFACE:${GENERATED_INCLUDE_DIR}>
++  $<INSTALL_INTERFACE:include>)
++
++add_dependencies(scotcherrexit scotch_h)
++
+ add_library(scotch
+   ${SCOTCH_C_SOURCES})
+ set_target_properties(scotch PROPERTIES VERSION
+   ${SCOTCH_VERSION}.${SCOTCH_RELEASE}.${SCOTCH_PATCHLEVEL})
+ add_dependencies(scotch parser_yy_c parser_ll_c)
+-target_link_libraries(scotch PUBLIC m)
++if(NOT WIN32)
++    target_link_libraries(scotch PUBLIC m)
++endif()
+ target_include_directories(scotch PUBLIC
+         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+         $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
+@@ -539,10 +557,14 @@ if(LIBLZMA_FOUND)
+ endif()
+ 
+ # Add thread library
+-if(Threads_FOUND)
+-  target_compile_definitions(scotch PUBLIC COMMON_PTHREAD SCOTCH_PTHREAD)
+-  target_link_libraries(scotch PUBLIC Threads::Threads)
+-endif(Threads_FOUND)
++if(USE_PTHREAD)
++    target_compile_definitions(scotch PUBLIC COMMON_PTHREAD SCOTCH_PTHREAD)
++    if(NOT WIN32)
++      target_link_libraries(scotch PUBLIC Threads::Threads)
++    else()
++      target_link_libraries(scotch PUBLIC PThreads4W::PThreads4W)
++    endif()
++endif(USE_PTHREAD)
+ 
+ # Include files
+ add_dependencies(scotch scotch_h scotchf_h)
+@@ -555,21 +577,7 @@ if(CMAKE_BUILD_TYPE STREQUAL Debug)
+   target_compile_definitions(scotch PRIVATE SCOTCH_DEBUG_LIBRARY1)
+ endif()
+ 
+-add_library(scotcherr library_error.c)
+-target_include_directories(scotcherr PUBLIC
+-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+-  $<BUILD_INTERFACE:${GENERATED_INCLUDE_DIR}>
+-  $<INSTALL_INTERFACE:include>)
+-
+-add_dependencies(scotcherr scotch_h)
+-
+-add_library(scotcherrexit library_error_exit.c)
+-target_include_directories(scotcherrexit PUBLIC
+-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+-  $<BUILD_INTERFACE:${GENERATED_INCLUDE_DIR}>
+-  $<INSTALL_INTERFACE:include>)
+-
+-add_dependencies(scotcherrexit scotch_h)
++target_link_libraries(scotch PRIVATE scotcherr)
+ 
+ #################
+ #  libPTScotch  #
+@@ -769,10 +777,14 @@ if(BUILD_PTSCOTCH)
+     set_target_properties(ptscotch PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+   endif(APPLE)
+ 
+-  if(Threads_FOUND)
+-    target_compile_definitions(ptscotch PUBLIC SCOTCH_PTHREAD COMMON_PTHREAD)
+-    target_link_libraries(ptscotch PUBLIC Threads::Threads)
+-  endif(Threads_FOUND)
++  if(USE_PTHREAD)
++      target_compile_definitions(ptscotch PUBLIC COMMON_PTHREAD SCOTCH_PTHREAD)
++      if(NOT WIN32)
++        target_link_libraries(ptscotch PUBLIC Threads::Threads)
++      else()
++        target_link_libraries(ptscotch PUBLIC PThreads4W::PThreads4W)
++      endif()
++  endif(USE_PTHREAD)
+ 
+   add_library(ptscotcherr library_error.c)
+   target_include_directories(ptscotcherr PUBLIC
+diff --git a/src/libscotch/common_file_compress.c b/src/libscotch/common_file_compress.c
+index e1ccff54d..4dc7673a6 100644
+--- a/src/libscotch/common_file_compress.c
++++ b/src/libscotch/common_file_compress.c
+@@ -378,8 +378,11 @@ FileCompress * const        compptr)
+   encodat.avail_out = FILECOMPRESSDATASIZE;
+   do {
+     if ((encodat.avail_in == 0) && (enacval == LZMA_RUN)) {
++#ifdef _MSC_VER
++      int                 bytenbr; //According to MSDN _read only returns int
++#else
+       ssize_t             bytenbr;
+-
++#endif
+       bytenbr = read (compptr->infdnum, compptr->bufftab, FILECOMPRESSDATASIZE); /* Read from pipe */
+       if (bytenbr < 0) {
+         errorPrint ("fileCompressLzma: cannot read");
+diff --git a/src/libscotch/common_file_decompress.c b/src/libscotch/common_file_decompress.c
+index 648b6f053..02bd9412c 100644
+--- a/src/libscotch/common_file_decompress.c
++++ b/src/libscotch/common_file_decompress.c
+@@ -373,7 +373,11 @@ FileCompress * const        compptr)
+   decodat.avail_out = FILECOMPRESSDATASIZE;
+   do {
+     if ((decodat.avail_in == 0) && (deacval == LZMA_RUN)) {
++#ifdef _MSC_VER
++      size_t              bytenbr; //According to MSDN fread returns size_t
++#else
+       ssize_t             bytenbr;
++#endif
+ 
+       bytenbr = fread (compptr->bufftab, 1, FILECOMPRESSDATASIZE, compptr->oustptr); /* Read from pipe */
+       if (ferror (compptr->oustptr)) {
+diff --git a/src/libscotch/common_thread.h b/src/libscotch/common_thread.h
+index 235d92044..6d35aeb1a 100644
+--- a/src/libscotch/common_thread.h
++++ b/src/libscotch/common_thread.h
+@@ -81,6 +81,8 @@ typedef struct ThreadContext_ {
+   union {                                         /*+ Context save area for main thread   +*/
+ #ifdef COMMON_PTHREAD_AFFINITY_LINUX
+     cpu_set_t                   cpusdat;          /*+ Original thread mask of main thread +*/
++#else
++    void*                       dummy;
+ #endif /* COMMON_PTHREAD_AFFINITY_LINUX */
+   }                             savedat;
+ #endif /* COMMON_PTHREAD */
+diff --git a/src/libscotch/context.c b/src/libscotch/context.c
+index 6becac0af..a88da0099 100644
+--- a/src/libscotch/context.c
++++ b/src/libscotch/context.c
+@@ -70,7 +70,11 @@ static struct ContextValuesData_ {
+ #else /* ((defined SCOTCH_DETERMINISTIC) || (defined COMMON_RANDOM_FIXED_SEED)) */
+                               0
+ #endif /* ((defined SCOTCH_DETERMINISTIC) || (defined COMMON_RANDOM_FIXED_SEED)) */
+-  }, { } };
++  }
++#ifndef _MSC_VER
++  , { }
++#endif
++  };
+ 
+ /***********************************/
+ /*                                 */
+@@ -89,6 +93,6 @@ contextOptionsInit (
+ Context * const             contptr)
+ {
+   return (contextValuesInit (contptr, &contextvaluesdat, sizeof (contextvaluesdat),
+-                             CONTEXTOPTIONNUMNBR, (void *) &contextvaluesdat.vinttab - (void *) &contextvaluesdat,
+-                             CONTEXTOPTIONDBLNBR, (void *) &contextvaluesdat.vdbltab - (void *) &contextvaluesdat));
++                             CONTEXTOPTIONNUMNBR, (char *) &contextvaluesdat.vinttab - (char *) &contextvaluesdat,
++                             CONTEXTOPTIONDBLNBR, (char *) &contextvaluesdat.vdbltab - (char *) &contextvaluesdat));
+ }
+diff --git a/src/libscotch/parser_ll.l b/src/libscotch/parser_ll.l
+index 6a795aad6..582f5e201 100644
+--- a/src/libscotch/parser_ll.l
++++ b/src/libscotch/parser_ll.l
+@@ -85,6 +85,10 @@
+ %option noyywrap
+ %option reentrant
+ 
++/* To support build on Windows */
++%option nounistd
++
++
+ IDENT                       [A-Za-z][0-9A-Za-z]*
+ INTEGER                     [0-9]+
+ FLOAT                       [0-9]+(\.[0-9]+)?([Ee][-+]?[0-9]+)?
+diff --git a/src/libscotch/parser_yy.y b/src/libscotch/parser_yy.y
+index b287da4ca..bbc10b3ef 100644
+--- a/src/libscotch/parser_yy.y
++++ b/src/libscotch/parser_yy.y
+@@ -81,6 +81,9 @@ typedef void * YY_BUFFER_STATE;                   /* The same; Flex and Bison de
+ **  The defines and includes (bis).
+ */
+ 
++#ifdef _MSC_VER
++#define YY_NO_UNISTD_H
++#endif
+ #include "parser.h"
+ #include "parser_yy.h"
+ #include "parser_ly.h"
+diff --git a/src/scotch/CMakeLists.txt b/src/scotch/CMakeLists.txt
+index 3974f4fce..b9149b931 100644
+--- a/src/scotch/CMakeLists.txt
++++ b/src/scotch/CMakeLists.txt
+@@ -67,10 +67,15 @@ function(add_scotch_exe)
+   add_dependencies(${file_we} scotch_h)
+   target_include_directories(${file_we} PRIVATE ${GENERATED_INCLUDE_DIR})
+   target_compile_definitions(${file_we} PUBLIC "SCOTCH_CODENAME=\"${SCOTCH_CODENAME}\"")
+-  if(Threads_FOUND)
+-    target_compile_definitions(${file_we} PUBLIC SCOTCH_PTHREAD COMMON_PTHREAD)
+-    target_link_libraries(${file_we} PUBLIC Threads::Threads)
+-  endif(Threads_FOUND)
++  
++  if(USE_PTHREAD)
++      target_compile_definitions(${file_we} PUBLIC COMMON_PTHREAD SCOTCH_PTHREAD)
++      if(NOT WIN32)
++        target_link_libraries(${file_we} PUBLIC Threads::Threads)
++      else()
++        target_link_libraries(${file_we} PUBLIC PThreads4W::PThreads4W)
++      endif()
++  endif(USE_PTHREAD)
+   target_link_libraries(${file_we} PUBLIC scotch scotcherrexit)
+ endfunction(add_scotch_exe)
+ 
+@@ -110,8 +115,9 @@ endforeach()
+ 
+ # Targets which need special source lists
+ add_scotch_exe(gout gout_c.c gout_o.c)
+-target_link_libraries(gout PRIVATE m)
+-
++if(NOT WIN32)
++    target_link_libraries(gout PRIVATE m)
++endif()
+ # gpart is a special target (same source as gmap)
+ add_scotch_exe(gpart gmap.c gmap.h)
+ target_compile_definitions(gpart PRIVATE SCOTCH_COMPILE_PART)
+@@ -142,10 +148,14 @@ if(BUILD_PTSCOTCH)
+       ${GENERATED_INCLUDE_DIR}/ptscotch.h)
+     add_dependencies(${file_we} ptscotch_h)
+     target_compile_definitions(${file_we} PUBLIC "SCOTCH_CODENAME=\"${SCOTCH_CODENAME}\"")
+-    if(Threads_FOUND)
+-      target_compile_definitions(${file_we} PUBLIC SCOTCH_PTHREAD COMMON_PTHREAD)
+-      target_link_libraries(${file_we} PUBLIC Threads::Threads)
+-    endif(Threads_FOUND)
++    if(USE_PTHREAD)
++      target_compile_definitions(${file_we} PUBLIC COMMON_PTHREAD SCOTCH_PTHREAD)
++      if(NOT WIN32)
++        target_link_libraries(${file_we} PUBLIC Threads::Threads)
++      else()
++        target_link_libraries(${file_we} PUBLIC PThreads4W::PThreads4W)
++      endif()
++    endif(USE_PTHREAD)
+     target_include_directories(${file_we} PRIVATE ${GENERATED_INCLUDE_DIR})
+     target_link_libraries(${file_we} PUBLIC scotch ptscotch ptscotcherrexit)
+   endfunction(add_ptscotch_exe)
diff --git a/external_imported/vcpkg/ports/scotch/portfile.cmake b/external_imported/vcpkg/ports/scotch/portfile.cmake
new file mode 100644
index 000000000..509490e9a
--- /dev/null
+++ b/external_imported/vcpkg/ports/scotch/portfile.cmake
@@ -0,0 +1,54 @@
+if(VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
+vcpkg_from_gitlab(
+    GITLAB_URL https://gitlab.inria.fr/
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO scotch/scotch
+    REF b43864123e820e3ca541bfecd3738aed385a4c47
+    SHA512 66d84624ff608a8557789b9f48e83694151f824c4be57ce294863390b4d2f6702bed381f9dbb1527456414385e0a7793752750d7d2731f551d2f34e2aaa4f6b4
+    HEAD_REF master
+    PATCHES fix-build.patch
+)
+
+vcpkg_find_acquire_program(FLEX)
+cmake_path(GET FLEX PARENT_PATH FLEX_DIR)
+vcpkg_add_to_path("${FLEX_DIR}")
+
+vcpkg_find_acquire_program(BISON)
+cmake_path(GET BISON PARENT_PATH BISON_DIR)
+vcpkg_add_to_path("${BISON_DIR}")
+
+if(VCPKG_TARGET_IS_WINDOWS)
+    #Uses gcc intrinsics otherwise
+    string(APPEND VCPKG_C_FLAGS     " -DGRAPHMATCHNOTHREAD")
+    string(APPEND VCPKG_CXX_FLAGS   " -DGRAPHMATCHNOTHREAD")
+endif()
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_PTSCOTCH=OFF # Requires MPI
+        -DBUILD_LIBESMUMPS=OFF
+        -DBUILD_LIBSCOTCHMETIS=OFF
+        -DTHREADS=ON
+        -DMPI_THREAD_MULTIPLE=OFF
+)
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/scotch")
+vcpkg_copy_tools(TOOL_NAMES
+    acpl amk_ccc amk_fft2 amk_grf amk_hy
+    amk_m2 amk_p2 atst gbase gcv gmap gmk_hy
+    gmk_m2 gmk_m3 gmk_msh gmk_ub2 gmtst
+    gord gotst gscat gtst mcv mmk_m2 mmk_m3
+    mord mtst
+    AUTO_CLEAN
+    )
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/doc/CeCILL-C_V1-en.txt")
+
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/scotch/SCOTCHConfig.cmake" "find_dependency(Threads)" "if(NOT WIN32)\nfind_dependency(Threads)\nelse()\nfind_dependency(PThreads4W)\nendif()")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include"
+                    "${CURRENT_PACKAGES_DIR}/debug/man"
+                    "${CURRENT_PACKAGES_DIR}/man"
+                    )
diff --git a/external_imported/vcpkg/ports/scotch/vcpkg.json b/external_imported/vcpkg/ports/scotch/vcpkg.json
new file mode 100644
index 000000000..93dab01d7
--- /dev/null
+++ b/external_imported/vcpkg/ports/scotch/vcpkg.json
@@ -0,0 +1,22 @@
+{
+  "name": "scotch",
+  "version": "7.0.3",
+  "description": "Scotch: a software package for graph and mesh/hypergraph partitioning, graph clustering, and sparse matrix ordering",
+  "homepage": "https://gitlab.inria.fr/scotch/scotch",
+  "license": null,
+  "supports": "!arm & !uwp & !android & !osx",
+  "dependencies": [
+    "bzip2",
+    "liblzma",
+    "pthread",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    "zlib"
+  ]
+}
diff --git a/external_imported/vcpkg/ports/scylla-wrapper/vcpkg.json b/external_imported/vcpkg/ports/scylla-wrapper/vcpkg.json
index 79d6d09a5..2b3ff60aa 100644
--- a/external_imported/vcpkg/ports/scylla-wrapper/vcpkg.json
+++ b/external_imported/vcpkg/ports/scylla-wrapper/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "scylla-wrapper",
-  "version-string": "2018-08-26-16e6f435",
-  "port-version": 2,
+  "version": "2018-08-26-16e6f435",
+  "port-version": 3,
   "description": "This is a wrapper around Scylla.  It exports functions for IAT fixing, dumping and PE rebuilding. based on https://github.com/NtQuery/Scylla commit 0f6b7198be  (v0.9.6b).",
   "supports": "windows & !uwp & !arm & !static",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/sdbus-cpp/pic.patch b/external_imported/vcpkg/ports/sdbus-cpp/pic.patch
new file mode 100644
index 000000000..3b2c06c45
--- /dev/null
+++ b/external_imported/vcpkg/ports/sdbus-cpp/pic.patch
@@ -0,0 +1,14 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7332b23..822a594 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -130,7 +130,7 @@ target_compile_definitions(sdbus-c++-objlib PRIVATE
+ target_include_directories(sdbus-c++-objlib PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+                                                    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>)
+-if(DEFINED BUILD_SHARED_LIBS)
++if(BUILD_SHARED_LIBS)
+-    set_target_properties(sdbus-c++-objlib PROPERTIES POSITION_INDEPENDENT_CODE ${BUILD_SHARED_LIBS})
++    set_target_properties(sdbus-c++-objlib PROPERTIES POSITION_INDEPENDENT_CODE ON)
+ endif()
+ if(BUILD_LIBSYSTEMD)
+     add_dependencies(sdbus-c++-objlib LibsystemdBuildProject)
diff --git a/external_imported/vcpkg/ports/sdbus-cpp/portfile.cmake b/external_imported/vcpkg/ports/sdbus-cpp/portfile.cmake
new file mode 100644
index 000000000..d561f9eb7
--- /dev/null
+++ b/external_imported/vcpkg/ports/sdbus-cpp/portfile.cmake
@@ -0,0 +1,38 @@
+message(WARNING "You will need to install sytemd dependencies to build sdbus-cpp:\nsudo apt install libsystemd-dev\n")
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Kistler-Group/sdbus-cpp
+    REF "v${VERSION}"
+    SHA512 8f4cb9ae88b1ec0db0bcc27e131fcb9ad8a8bc88e39721b3b73f63e057bae4cd36619894e25114ccddb1a8e6c21db2f80adcabb3263ff5d8b34b72af7563afe2
+    PATCHES
+        pic.patch # can be dropped once https://github.com/Kistler-Group/sdbus-cpp/pull/361 is merged+released
+)
+
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        tool   BUILD_CODE_GEN
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS ${FEATURE_OPTIONS}
+        -DBUILD_LIBSYSTEMD=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME sdbus-c++ CONFIG_PATH lib/cmake/sdbus-c++)
+vcpkg_fixup_pkgconfig()
+file(REMOVE_RECURSE
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/debug/share"
+    "${CURRENT_PACKAGES_DIR}/debug/bin"
+)
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING" "${SOURCE_PATH}/COPYING-LGPL-Exception")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+
+if ("tool" IN_LIST FEATURES)
+    vcpkg_copy_tools(TOOL_NAMES sdbus-c++-xml2cpp AUTO_CLEAN)
+endif()
diff --git a/external_imported/vcpkg/ports/sdbus-cpp/usage b/external_imported/vcpkg/ports/sdbus-cpp/usage
new file mode 100644
index 000000000..bea252a66
--- /dev/null
+++ b/external_imported/vcpkg/ports/sdbus-cpp/usage
@@ -0,0 +1,3 @@
+sdbus-cpp provides CMake targets:
+    find_package(sdbus-c++ REQUIRED)
+    target_link_libraries(main PRIVATE SDBusCpp::sdbus-c++)
diff --git a/external_imported/vcpkg/ports/sdbus-cpp/vcpkg.json b/external_imported/vcpkg/ports/sdbus-cpp/vcpkg.json
new file mode 100644
index 000000000..10b4b0652
--- /dev/null
+++ b/external_imported/vcpkg/ports/sdbus-cpp/vcpkg.json
@@ -0,0 +1,29 @@
+{
+  "name": "sdbus-cpp",
+  "version": "1.3.0",
+  "port-version": 1,
+  "description": "High-level C++ D-Bus library for Linux designed to provide easy-to-use yet powerful API in modern C++",
+  "homepage": "https://github.com/Kistler-Group/sdbus-cpp",
+  "license": "LGPL-2.1",
+  "supports": "linux",
+  "dependencies": [
+    "dbus",
+    "libsystemd",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
+  "features": {
+    "tool": {
+      "description": "build C++ codegen tool",
+      "dependencies": [
+        "expat"
+      ]
+    }
+  }
+}
diff --git a/external_imported/vcpkg/ports/sdformat13/cmake-config.patch b/external_imported/vcpkg/ports/sdformat13/cmake-config.patch
new file mode 100644
index 000000000..34970b6dc
--- /dev/null
+++ b/external_imported/vcpkg/ports/sdformat13/cmake-config.patch
@@ -0,0 +1,23 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 3465a8f..2b57440 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -26,6 +26,7 @@ else()
+   target_link_libraries(using_parser_urdf INTERFACE
+     GzURDFDOM::GzURDFDOM)
+ endif()
++install(TARGETS using_parser_urdf EXPORT ${PROJECT_LIBRARY_TARGET_NAME} COMPONENT libraries)
+ 
+ if (BUILD_TESTING)
+   # Build this test file only if Gazebo Tools is installed.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -58,6 +58,6 @@
+   if (NOT DEFINED USE_INTERNAL_URDF OR NOT USE_INTERNAL_URDF)
+-    gz_find_package(GzURDFDOM VERSION 1.0 QUIET)
++    gz_find_package(GzURDFDOM)
+     if (NOT GzURDFDOM_FOUND)
+       if (NOT DEFINED USE_INTERNAL_URDF)
+         # fallback to internal urdf
+         set(USE_INTERNAL_URDF ON)
diff --git a/external_imported/vcpkg/ports/sdformat13/fix-find-urdfdom.patch b/external_imported/vcpkg/ports/sdformat13/fix-find-urdfdom.patch
new file mode 100644
index 000000000..4593b083d
--- /dev/null
+++ b/external_imported/vcpkg/ports/sdformat13/fix-find-urdfdom.patch
@@ -0,0 +1,24 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e797e8a..0f652d7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -56,7 +56,18 @@ if (BUILD_SDF)
+   #  2. if USE_INTERNAL_URDF is set to True, use the internal copy
+   #  3. if USE_INTERNAL_URDF is set to False, force to search system installation, fail on error
+   if (NOT DEFINED USE_INTERNAL_URDF OR NOT USE_INTERNAL_URDF)
+-    gz_find_package(GzURDFDOM)
++    find_package(urdfdom CONFIG REQUIRED)
++    add_library(GzURDFDOM::GzURDFDOM INTERFACE IMPORTED)
++    target_link_libraries(GzURDFDOM::GzURDFDOM
++      INTERFACE
++        urdfdom::urdfdom_model
++        urdfdom::urdfdom_world
++        urdfdom::urdfdom_sensor
++        urdfdom::urdfdom_model_state
++    )
++    include(FindPackageHandleStandardArgs)
++    find_package_handle_standard_args(GzURDFDOM DEFAULT_MSG)
++    
+     if (NOT GzURDFDOM_FOUND)
+       if (NOT DEFINED USE_INTERNAL_URDF)
+         # fallback to internal urdf
diff --git a/external_imported/vcpkg/ports/sdformat13/no-absolute.patch b/external_imported/vcpkg/ports/sdformat13/no-absolute.patch
new file mode 100644
index 000000000..42ea51baa
--- /dev/null
+++ b/external_imported/vcpkg/ports/sdformat13/no-absolute.patch
@@ -0,0 +1,38 @@
+diff --git a/include/sdf/config.hh.in b/include/sdf/config.hh.in
+index d1b3db53..9a9ce91d 100644
+--- a/include/sdf/config.hh.in
++++ b/include/sdf/config.hh.in
+@@ -48,5 +48,3 @@ 
+ #cmakedefine SDFORMAT_DISABLE_CONSOLE_LOGFILE 1
+ 
+-#define SDF_SHARE_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/"
+-#define SDF_VERSION_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/sdformat${SDF_MAJOR_VERSION}/${SDF_PKG_VERSION}"
+ 
+diff --git a/src/SDF.cc b/src/SDF.cc
+index 20dcd4c6..802cbde3 100644
+--- a/src/SDF.cc
++++ b/src/SDF.cc
+@@ -97,22 +97,6 @@ std::string findFile(const std::string &_filename, bool _searchLocalPath,
+     filename = filename.substr(idx + sep.length());
+   }
+ 
+-  // Next check the install path.
+-  std::string path = sdf::filesystem::append(SDF_SHARE_PATH, filename);
+-  if (sdf::filesystem::exists(path))
+-  {
+-    return path;
+-  }
+-
+-  // Next check the versioned install path.
+-  path = sdf::filesystem::append(SDF_SHARE_PATH,
+-                                 "sdformat" SDF_MAJOR_VERSION_STR,
+-                                 sdf::SDF::Version(), filename);
+-  if (sdf::filesystem::exists(path))
+-  {
+-    return path;
+-  }
+-
+   // Next check to see if the given file exists.
+-   path = filename;
++   std::string path = filename;
+   if (sdf::filesystem::exists(path))
diff --git a/external_imported/vcpkg/ports/sdformat13/portfile.cmake b/external_imported/vcpkg/ports/sdformat13/portfile.cmake
new file mode 100644
index 000000000..d506d2480
--- /dev/null
+++ b/external_imported/vcpkg/ports/sdformat13/portfile.cmake
@@ -0,0 +1,49 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO gazebosim/sdformat
+    REF "sdformat13_${VERSION}"
+    SHA512 adc555527aadaede84d6fde11555bf4872028d9e895fc47c89f4077452fde9a52b233d60d0cbff5a098e261c7810aa2dc38a6275ec9f37ba4d0161af98e2aade
+    HEAD_REF sdf13
+    PATCHES
+        no-absolute.patch
+        cmake-config.patch
+        fix-find-urdfdom.patch
+)
+
+# Ruby is required by the sdformat build process
+vcpkg_find_acquire_program(RUBY)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        "-DRUBY=${RUBY}"
+        -DBUILD_TESTING=OFF
+        -DSKIP_PYBIND11=ON
+        -DUSE_INTERNAL_URDF=OFF
+        -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
+        -DCMAKE_DISABLE_FIND_PACKAGE_Python3=ON
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/sdformat13")
+vcpkg_fixup_pkgconfig()
+
+# fix dependency urdfdom
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/sdformat13-config.cmake" "find_package(TINYXML2" [[
+if (NOT TARGET GzURDFDOM::GzURDFDOM)
+    find_package(urdfdom CONFIG ${gz_package_quiet} ${gz_package_required})
+    add_library(GzURDFDOM::GzURDFDOM INTERFACE IMPORTED)
+    target_link_libraries(GzURDFDOM::GzURDFDOM
+        INTERFACE
+        urdfdom::urdfdom_model
+        urdfdom::urdfdom_world
+        urdfdom::urdfdom_sensor
+        urdfdom::urdfdom_model_state
+    )
+endif()
+find_package(TINYXML2]])
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include"
+                    "${CURRENT_PACKAGES_DIR}/debug/share")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/sdformat13/vcpkg.json b/external_imported/vcpkg/ports/sdformat13/vcpkg.json
new file mode 100644
index 000000000..cd6c3dc4e
--- /dev/null
+++ b/external_imported/vcpkg/ports/sdformat13/vcpkg.json
@@ -0,0 +1,24 @@
+{
+  "name": "sdformat13",
+  "version": "13.5.0",
+  "port-version": 1,
+  "description": "Simulation Description Format (SDF) parser and description files.",
+  "homepage": "http://sdformat.org/",
+  "license": "Apache-2.0",
+  "supports": "!uwp",
+  "dependencies": [
+    "gz-math7",
+    "gz-tools2",
+    "gz-utils2",
+    "tinyxml2",
+    "urdfdom",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/sdl1-mixer/SDL_mixer.vcxproj.in b/external_imported/vcpkg/ports/sdl1-mixer/SDL_mixer.vcxproj.in
new file mode 100644
index 000000000..1ea5182d7
--- /dev/null
+++ b/external_imported/vcpkg/ports/sdl1-mixer/SDL_mixer.vcxproj.in
@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{F7E944B3-0815-40CD-B3E4-90B2A15B0E33}</ProjectGuid>
+    <RootNamespace>SDL_mixer</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>@LIB_TYPE@</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>@LIB_TYPE@</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>@LIB_TYPE@</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>@LIB_TYPE@</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>.\Debug\</OutDir>
+    <IntDir>.\Debug\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>.\Release\</OutDir>
+    <IntDir>.\Release\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\Debug/SDL_mixer.tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/D OGG_DYNAMIC=\"vorbisfile.dll\" %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\timidity;..\native_midi;@CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MOD_MUSIC;MOD_DYNAMIC="mikmod.dll";OGG_MUSIC;OGG_DYNAMIC="vorbisfile.dll";FLAC_MUSIC;FLAC_DYNAMIC="FLAC.dll";MP3_MUSIC;MPG123_DYNAMIC="mpg123.dll";MID_MUSIC;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <RuntimeLibrary>@CRT_TYPE_DBG@</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>.\Debug/SDL_mixer.pch</PrecompiledHeaderOutputFile>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>OldStyle</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>winmm.lib;SDL.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>.\Debug/SDL_mixer.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <AdditionalLibraryDirectories>@CURRENT_INSTALLED_DIR@/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Debug/SDL_mixer.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>X64</TargetEnvironment>
+      <TypeLibraryName>.\Debug/SDL_mixer.tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/D OGG_DYNAMIC=\"vorbisfile.dll\" %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\timidity;..\native_midi;@CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MOD_MUSIC;MOD_DYNAMIC="mikmod.dll";OGG_MUSIC;OGG_DYNAMIC="vorbisfile.dll";FLAC_MUSIC;FLAC_DYNAMIC="FLAC.dll";MP3_MUSIC;MPG123_DYNAMIC="mpg123.dll";MID_MUSIC;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <RuntimeLibrary>@CRT_TYPE_DBG@</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>.\Debug/SDL_mixer.pch</PrecompiledHeaderOutputFile>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>OldStyle</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>winmm.lib;SDL.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>.\Debug/SDL_mixer.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+      <AdditionalLibraryDirectories>@CURRENT_INSTALLED_DIR@/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Debug/SDL_mixer.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\Release/SDL_mixer.tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/D OGG_DYNAMIC=\"vorbisfile.dll\" %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\timidity;..\native_midi;@CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MOD_MUSIC;MOD_DYNAMIC="mikmod.dll";OGG_MUSIC;OGG_DYNAMIC="vorbisfile.dll";FLAC_MUSIC;FLAC_DYNAMIC="FLAC.dll";MP3_MUSIC;MPG123_DYNAMIC="mpg123.dll";MID_MUSIC;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>@CRT_TYPE_REL@</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>.\Release/SDL_mixer.pch</PrecompiledHeaderOutputFile>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>winmm.lib;SDL.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ProgramDatabaseFile>.\Release/SDL_mixer.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <AdditionalLibraryDirectories>@CURRENT_INSTALLED_DIR@/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Release/SDL_mixer.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>X64</TargetEnvironment>
+      <TypeLibraryName>.\Release/SDL_mixer.tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/D OGG_DYNAMIC=\"vorbisfile.dll\" %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\timidity;..\native_midi;@CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MOD_MUSIC;MOD_DYNAMIC="mikmod.dll";OGG_MUSIC;OGG_DYNAMIC="vorbisfile.dll";FLAC_MUSIC;FLAC_DYNAMIC="FLAC.dll";MP3_MUSIC;MPG123_DYNAMIC="mpg123.dll";MID_MUSIC;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>@CRT_TYPE_REL@</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>.\Release/SDL_mixer.pch</PrecompiledHeaderOutputFile>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>winmm.lib;SDL.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ProgramDatabaseFile>.\Release/SDL_mixer.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+      <AdditionalLibraryDirectories>@CURRENT_INSTALLED_DIR@/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Release/SDL_mixer.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\dynamic_flac.c" />
+    <ClCompile Include="..\dynamic_fluidsynth.c" />
+    <ClCompile Include="..\dynamic_mod.c" />
+    <ClCompile Include="..\dynamic_mp3.c" />
+    <ClCompile Include="..\dynamic_ogg.c" />
+    <ClCompile Include="..\effects_internal.c" />
+    <ClCompile Include="..\effect_position.c" />
+    <ClCompile Include="..\effect_stereoreverse.c" />
+    <ClCompile Include="..\load_aiff.c" />
+    <ClCompile Include="..\load_flac.c" />
+    <ClCompile Include="..\load_ogg.c" />
+    <ClCompile Include="..\load_voc.c" />
+    <ClCompile Include="..\mixer.c" />
+    <ClCompile Include="..\mp3utils.c" />
+    <ClCompile Include="..\music.c" />
+    <ClCompile Include="..\music_cmd.c" />
+    <ClCompile Include="..\music_flac.c" />
+    <ClCompile Include="..\music_fluidsynth.c" />
+    <ClCompile Include="..\music_mad.c" />
+    <ClCompile Include="..\music_mod.c" />
+    <ClCompile Include="..\music_mpg.c" />
+    <ClCompile Include="..\music_ogg.c" />
+    <ClCompile Include="..\wavestream.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\dynamic_flac.h" />
+    <ClInclude Include="..\dynamic_fluidsynth.h" />
+    <ClInclude Include="..\dynamic_mod.h" />
+    <ClInclude Include="..\dynamic_mp3.h" />
+    <ClInclude Include="..\dynamic_ogg.h" />
+    <ClInclude Include="..\effects_internal.h" />
+    <ClInclude Include="..\load_aiff.h" />
+    <ClInclude Include="..\load_flac.h" />
+    <ClInclude Include="..\load_ogg.h" />
+    <ClInclude Include="..\load_voc.h" />
+    <ClInclude Include="..\mp3utils.h" />
+    <ClInclude Include="..\music_cmd.h" />
+    <ClInclude Include="..\music_flac.h" />
+    <ClInclude Include="..\music_fluidsynth.h" />
+    <ClInclude Include="..\music_mad.h" />
+    <ClInclude Include="..\music_mod.h" />
+    <ClInclude Include="..\music_mpg.h" />
+    <ClInclude Include="..\music_ogg.h" />
+    <ClInclude Include="..\SDL_mixer.h" />
+    <ClInclude Include="..\wavestream.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Version.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="native_midi\native_midi.vcxproj">
+      <Project>{ebda67ca-4a23-4f22-bfbc-b8dbe0580d4f}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="timidity\timidity.vcxproj">
+      <Project>{b162b6f1-e876-4d5f-a1f6-e3a6dc2f4a2c}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/sdl1-mixer/SDL_mixer_2017.sln.in b/external_imported/vcpkg/ports/sdl1-mixer/SDL_mixer_2017.sln.in
new file mode 100644
index 000000000..1437f3858
--- /dev/null
+++ b/external_imported/vcpkg/ports/sdl1-mixer/SDL_mixer_2017.sln.in
@@ -0,0 +1,70 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.1321
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL_mixer", "SDL_mixer.vcxproj", "{F7E944B3-0815-40CD-B3E4-90B2A15B0E33}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "native_midi", "native_midi\native_midi.vcxproj", "{EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "playmus", "playmus\playmus.vcxproj", "{72CB0DD4-051D-486C-9CB3-75FE16F7D87A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "playwave", "playwave\playwave.vcxproj", "{AC86CEAA-9908-476F-B15F-C7193CEF81BD}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "timidity", "timidity\timidity.vcxproj", "{B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Debug|Win32.Build.0 = Debug|Win32
+		{F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Debug|x64.ActiveCfg = Debug|x64
+		{F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Debug|x64.Build.0 = Debug|x64
+		{F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Release|Win32.ActiveCfg = Release|Win32
+		{F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Release|Win32.Build.0 = Release|Win32
+		{F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Release|x64.ActiveCfg = Release|x64
+		{F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Release|x64.Build.0 = Release|x64
+		{EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Debug|Win32.Build.0 = Debug|Win32
+		{EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Debug|x64.ActiveCfg = Debug|x64
+		{EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Debug|x64.Build.0 = Debug|x64
+		{EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Release|Win32.ActiveCfg = Release|Win32
+		{EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Release|Win32.Build.0 = Release|Win32
+		{EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Release|x64.ActiveCfg = Release|x64
+		{EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Release|x64.Build.0 = Release|x64
+		{72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Debug|Win32.Build.0 = Debug|Win32
+		{72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Debug|x64.ActiveCfg = Debug|x64
+		{72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Debug|x64.Build.0 = Debug|x64
+		{72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Release|Win32.ActiveCfg = Release|Win32
+		{72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Release|Win32.Build.0 = Release|Win32
+		{72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Release|x64.ActiveCfg = Release|x64
+		{72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Release|x64.Build.0 = Release|x64
+		{AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Debug|Win32.Build.0 = Debug|Win32
+		{AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Debug|x64.ActiveCfg = Debug|x64
+		{AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Debug|x64.Build.0 = Debug|x64
+		{AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Release|Win32.ActiveCfg = Release|Win32
+		{AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Release|Win32.Build.0 = Release|Win32
+		{AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Release|x64.ActiveCfg = Release|x64
+		{AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Release|x64.Build.0 = Release|x64
+		{B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Debug|Win32.Build.0 = Debug|Win32
+		{B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Debug|x64.ActiveCfg = Debug|x64
+		{B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Debug|x64.Build.0 = Debug|x64
+		{B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Release|Win32.ActiveCfg = Release|Win32
+		{B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Release|Win32.Build.0 = Release|Win32
+		{B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Release|x64.ActiveCfg = Release|x64
+		{B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {F6077CF7-C552-4A55-AB30-0E159B015586}
+	EndGlobalSection
+EndGlobal
diff --git a/external_imported/vcpkg/ports/sdl1-mixer/mpg123_ssize_t.patch b/external_imported/vcpkg/ports/sdl1-mixer/mpg123_ssize_t.patch
new file mode 100644
index 000000000..8cead2487
--- /dev/null
+++ b/external_imported/vcpkg/ports/sdl1-mixer/mpg123_ssize_t.patch
@@ -0,0 +1,41 @@
+diff --git a/dynamic_mp3.c b/dynamic_mp3.c
+index 7c3209f0..ba80ee7a 100644
+--- a/dynamic_mp3.c
++++ b/dynamic_mp3.c
+@@ -63,7 +63,7 @@ int Mix_InitMP3(void)
+ #else
+ 		FUNCTION_LOADER(mpg123_read, int (*)(mpg123_handle *mh, unsigned char *outmemory, size_t outmemsize, size_t *done ))
+ #endif
+-		FUNCTION_LOADER(mpg123_replace_reader_handle, int (*)( mpg123_handle *mh, ssize_t (*r_read) (void *, void *, size_t), off_t (*r_lseek)(void *, off_t, int), void (*cleanup)(void*) ))
++		FUNCTION_LOADER(mpg123_replace_reader_handle, int (*)( mpg123_handle *mh, mpg123_ssize_t (*r_read) (void *, void *, size_t), off_t (*r_lseek)(void *, off_t, int), void (*cleanup)(void*) ))
+ 		FUNCTION_LOADER(mpg123_seek, off_t (*)( mpg123_handle *mh, off_t sampleoff, int whence ))
+ 		FUNCTION_LOADER(mpg123_strerror, const char* (*)(mpg123_handle *mh))
+ 		if (mpg123.mpg123_init() != MPG123_OK) {
+diff --git a/dynamic_mp3.h b/dynamic_mp3.h
+index 2e4c48af..ad63bf76 100644
+--- a/dynamic_mp3.h
++++ b/dynamic_mp3.h
+@@ -43,7 +43,7 @@ typedef struct {
+ #else
+ 	int (*mpg123_read)(mpg123_handle *mh, unsigned char *outmemory, size_t outmemsize, size_t *done );
+ #endif
+-	int (*mpg123_replace_reader_handle)( mpg123_handle *mh, ssize_t (*r_read) (void *, void *, size_t), off_t (*r_lseek)(void *, off_t, int), void (*cleanup)(void*) );
++	int (*mpg123_replace_reader_handle)( mpg123_handle *mh, mpg123_ssize_t (*r_read) (void *, void *, size_t), off_t (*r_lseek)(void *, off_t, int), void (*cleanup)(void*) );
+ 	off_t (*mpg123_seek)( mpg123_handle *mh, off_t sampleoff, int whence );
+ 	const char* (*mpg123_strerror)(mpg123_handle *mh);
+ } mpg123_loader;
+diff --git a/music_mpg.c b/music_mpg.c
+index 531615a2..7d92c28b 100644
+--- a/music_mpg.c
++++ b/music_mpg.c
+@@ -67,8 +67,8 @@ mpg_err(mpg123_handle* mpg, int code)
+ 
+ /* we're gonna override mpg123's I/O with these wrappers for RWops */
+ static
+-ssize_t rwops_read(void* p, void* dst, size_t n) {
+-    return (ssize_t)MP3_RWread((struct mp3file_t *)p, dst, 1, n);
++mpg123_ssize_t rwops_read(void* p, void* dst, size_t n) {
++    return (mpg123_ssize_t)MP3_RWread((struct mp3file_t *)p, dst, 1, n);
+ }
+ 
+ static
diff --git a/external_imported/vcpkg/ports/sdl1-mixer/native_midi.vcxproj.in b/external_imported/vcpkg/ports/sdl1-mixer/native_midi.vcxproj.in
new file mode 100644
index 000000000..eb31ce1db
--- /dev/null
+++ b/external_imported/vcpkg/ports/sdl1-mixer/native_midi.vcxproj.in
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>.\Release\</OutDir>
+    <IntDir>.\Release\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>.\Debug\</OutDir>
+    <IntDir>.\Debug\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..;..\..\native_midi;@CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>@CRT_TYPE_REL@</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>.\Release/native_midi.pch</PrecompiledHeaderOutputFile>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Release/native_midi.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..;..\..\native_midi;@CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>@CRT_TYPE_DBG@</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>.\Debug/native_midi.pch</PrecompiledHeaderOutputFile>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>OldStyle</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Debug/native_midi.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..;..\..\native_midi;@CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>@CRT_TYPE_REL@</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>.\Release/native_midi.pch</PrecompiledHeaderOutputFile>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Release/native_midi.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..;..\..\native_midi;@CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>@CRT_TYPE_DBG@</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>.\Debug/native_midi.pch</PrecompiledHeaderOutputFile>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>OldStyle</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Debug/native_midi.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\native_midi\native_midi.h" />
+    <ClInclude Include="..\..\native_midi\native_midi_common.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\native_midi\native_midi_common.c" />
+    <ClCompile Include="..\..\native_midi\native_midi_win32.c" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/sdl1-mixer/playmus.vcxproj.in b/external_imported/vcpkg/ports/sdl1-mixer/playmus.vcxproj.in
new file mode 100644
index 000000000..ba6e37f8e
--- /dev/null
+++ b/external_imported/vcpkg/ports/sdl1-mixer/playmus.vcxproj.in
@@ -0,0 +1,247 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{72CB0DD4-051D-486C-9CB3-75FE16F7D87A}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>.\Debug\</OutDir>
+    <IntDir>.\Debug\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>.\Release\</OutDir>
+    <IntDir>.\Release\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\Debug/playmus.tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <RuntimeLibrary>@CRT_TYPE_DBG@</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>.\Debug/playmus.pch</PrecompiledHeaderOutputFile>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>OldStyle</DebugInformationFormat>
+      <AdditionalIncludeDirectories>@CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>SDL.lib;manual-link\SDLmain.lib;winmm.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>.\Debug/playmus.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <AdditionalLibraryDirectories>@CURRENT_INSTALLED_DIR@/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Debug/playmus.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>X64</TargetEnvironment>
+      <TypeLibraryName>.\Debug/playmus.tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <RuntimeLibrary>@CRT_TYPE_DBG@</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>.\Debug/playmus.pch</PrecompiledHeaderOutputFile>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>OldStyle</DebugInformationFormat>
+      <AdditionalIncludeDirectories>@CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>SDL.lib;manual-link\SDLmain.lib;winmm.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>.\Debug/playmus.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+      <AdditionalLibraryDirectories>@CURRENT_INSTALLED_DIR@/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Debug/playmus.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\Release/playmus.tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>@CRT_TYPE_REL@</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>.\Release/playmus.pch</PrecompiledHeaderOutputFile>
+      <WarningLevel>Level3</WarningLevel>
+      <AdditionalIncludeDirectories>@CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>SDL.lib;manual-link\SDLmain.lib;winmm.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ProgramDatabaseFile>.\Release/playmus.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <AdditionalLibraryDirectories>@CURRENT_INSTALLED_DIR@/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Release/playmus.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>X64</TargetEnvironment>
+      <TypeLibraryName>.\Release/playmus.tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>@CRT_TYPE_REL@</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>.\Release/playmus.pch</PrecompiledHeaderOutputFile>
+      <WarningLevel>Level3</WarningLevel>
+      <AdditionalIncludeDirectories>@CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>SDL.lib;manual-link\SDLmain.lib;winmm.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ProgramDatabaseFile>.\Release/playmus.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+      <AdditionalLibraryDirectories>@CURRENT_INSTALLED_DIR@/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Release/playmus.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\playmus.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\SDL_mixer.vcxproj">
+      <Project>{f7e944b3-0815-40cd-b3e4-90b2a15b0e33}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/sdl1-mixer/playwave.vcxproj.in b/external_imported/vcpkg/ports/sdl1-mixer/playwave.vcxproj.in
new file mode 100644
index 000000000..05fe62341
--- /dev/null
+++ b/external_imported/vcpkg/ports/sdl1-mixer/playwave.vcxproj.in
@@ -0,0 +1,247 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{AC86CEAA-9908-476F-B15F-C7193CEF81BD}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>.\Release\</OutDir>
+    <IntDir>.\Release\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>.\Debug\</OutDir>
+    <IntDir>.\Debug\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\Release/playwave.tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>@CRT_TYPE_REL@</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>.\Release/playwave.pch</PrecompiledHeaderOutputFile>
+      <WarningLevel>Level3</WarningLevel>
+      <AdditionalIncludeDirectories>@CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>SDL.lib;manual-link\SDLmain.lib;winmm.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ProgramDatabaseFile>.\Release/playwave.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <AdditionalLibraryDirectories>@CURRENT_INSTALLED_DIR@/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Release/playwave.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>X64</TargetEnvironment>
+      <TypeLibraryName>.\Release/playwave.tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>@CRT_TYPE_REL@</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>.\Release/playwave.pch</PrecompiledHeaderOutputFile>
+      <WarningLevel>Level3</WarningLevel>
+      <AdditionalIncludeDirectories>@CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>SDL.lib;manual-link\SDLmain.lib;winmm.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ProgramDatabaseFile>.\Release/playwave.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+      <AdditionalLibraryDirectories>@CURRENT_INSTALLED_DIR@/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Release/playwave.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\Debug/playwave.tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <RuntimeLibrary>@CRT_TYPE_DBG@</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>.\Debug/playwave.pch</PrecompiledHeaderOutputFile>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>OldStyle</DebugInformationFormat>
+      <AdditionalIncludeDirectories>@CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>SDL.lib;manual-link\SDLmain.lib;winmm.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>.\Debug/playwave.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <AdditionalLibraryDirectories>@CURRENT_INSTALLED_DIR@/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Debug/playwave.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>X64</TargetEnvironment>
+      <TypeLibraryName>.\Debug/playwave.tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <RuntimeLibrary>@CRT_TYPE_DBG@</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>.\Debug/playwave.pch</PrecompiledHeaderOutputFile>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>OldStyle</DebugInformationFormat>
+      <AdditionalIncludeDirectories>@CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>SDL.lib;manual-link\SDLmain.lib;winmm.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>.\Debug/playwave.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+      <AdditionalLibraryDirectories>@CURRENT_INSTALLED_DIR@/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Debug/playwave.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\playwave.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\SDL_mixer.vcxproj">
+      <Project>{f7e944b3-0815-40cd-b3e4-90b2a15b0e33}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/sdl1-mixer/portfile.cmake b/external_imported/vcpkg/ports/sdl1-mixer/portfile.cmake
new file mode 100644
index 000000000..299e9db2c
--- /dev/null
+++ b/external_imported/vcpkg/ports/sdl1-mixer/portfile.cmake
@@ -0,0 +1,79 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO libsdl-org/SDL_mixer
+    REF d8b2c98ca3db62fa3d4e1dbb8801c6f57a10b8bf
+    SHA512 e22b2e26d9c7296e79589d5108118c65f5fb76e7e9d6996129e19b63313f9aa3a4c0657010e45fa040792fa81c488dae3ec6fac09e147d3b4430d612837e0132
+    HEAD_REF SDL-1.2
+    PATCHES
+        mpg123_ssize_t.patch
+)
+
+if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+    configure_file("${CMAKE_CURRENT_LIST_DIR}/SDL_mixer_2017.sln.in" "${SOURCE_PATH}/VisualC/SDL_mixer_2017.sln" COPYONLY)
+    
+    if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+        set(LIB_TYPE StaticLibrary)
+    else()
+        set(LIB_TYPE DynamicLibrary)
+    endif()
+    
+    if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
+        set(CRT_TYPE_DBG MultiThreadedDebugDLL)
+        set(CRT_TYPE_REL MultiThreadedDLL)
+    else()
+        set(CRT_TYPE_DBG MultiThreadedDebug)
+        set(CRT_TYPE_REL MultiThreaded)
+    endif()
+    
+    configure_file("${CURRENT_PORT_DIR}/SDL_mixer.vcxproj.in" "${SOURCE_PATH}/VisualC/SDL_mixer.vcxproj" @ONLY)
+    configure_file("${CURRENT_PORT_DIR}/native_midi.vcxproj.in" "${SOURCE_PATH}/VisualC/native_midi/native_midi.vcxproj" @ONLY)
+    configure_file("${CURRENT_PORT_DIR}/timidity.vcxproj.in" "${SOURCE_PATH}/VisualC/timidity/timidity.vcxproj" @ONLY)
+    configure_file("${CURRENT_PORT_DIR}/playmus.vcxproj.in" "${SOURCE_PATH}/VisualC/playmus/playmus.vcxproj" @ONLY)
+    configure_file("${CURRENT_PORT_DIR}/playwave.vcxproj.in" "${SOURCE_PATH}/VisualC/playwave/playwave.vcxproj" @ONLY)
+    
+    # This text file gets copied as a library, and included as one in the package 
+    file(REMOVE "${SOURCE_PATH}/external/libmikmod/COPYING.LIB")
+
+    # Remove unused external dlls
+    file(REMOVE "${SOURCE_PATH}/VisualC/external/lib/x86/libFLAC-8.dll")
+    file(REMOVE "${SOURCE_PATH}/VisualC/external/lib/x86/libmikmod-2.dll")
+    file(REMOVE "${SOURCE_PATH}/VisualC/external/lib/x86/libmpg123-0.dll")
+    file(REMOVE "${SOURCE_PATH}/VisualC/external/lib/x86/libogg-0.dll")
+    file(REMOVE "${SOURCE_PATH}/VisualC/external/lib/x86/libvorbis-0.dll")
+    file(REMOVE "${SOURCE_PATH}/VisualC/external/lib/x86/libvorbisfile-3.dll")
+    file(REMOVE "${SOURCE_PATH}/VisualC/external/lib/x64/libFLAC-8.dll")
+    file(REMOVE "${SOURCE_PATH}/VisualC/external/lib/x64/libmikmod-2.dll")
+    file(REMOVE "${SOURCE_PATH}/VisualC/external/lib/x64/libmpg123-0.dll")
+    file(REMOVE "${SOURCE_PATH}/VisualC/external/lib/x64/libogg-0.dll")
+    file(REMOVE "${SOURCE_PATH}/VisualC/external/lib/x64/libvorbis-0.dll")
+    file(REMOVE "${SOURCE_PATH}/VisualC/external/lib/x64/libvorbisfile-3.dll")
+    
+    file(WRITE "${SOURCE_PATH}/Directory.Build.props" "<?xml version=\"1.0\" encoding=\"utf-8\"?>
+                                                     <Project xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">
+                                                     <ItemDefinitionGroup>
+                                                     <ClCompile>
+                                                     <AdditionalIncludeDirectories>${CURRENT_PACKAGES_DIR}/include;${CURRENT_PACKAGES_DIR}/include/SDL;${CURRENT_INSTALLED_DIR}/include;${CURRENT_INSTALLED_DIR}/include/SDL</AdditionalIncludeDirectories>
+                                                     </ClCompile>
+                                                     </ItemDefinitionGroup>
+                                                     </Project>")
+
+    vcpkg_install_msbuild(
+        SOURCE_PATH "${SOURCE_PATH}"
+        PROJECT_SUBPATH VisualC/SDL_mixer_2017.sln
+        #INCLUDES_SUBPATH include
+        LICENSE_SUBPATH COPYING
+        #ALLOW_ROOT_INCLUDES
+    )
+    file(COPY "${SOURCE_PATH}/SDL_mixer.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/SDL")
+else()
+    vcpkg_configure_make(
+        SOURCE_PATH "${SOURCE_PATH}"
+    )
+    
+    vcpkg_install_make()
+    vcpkg_fixup_pkgconfig()
+    
+    vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
+endif()
+
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/sdl1-mixer/timidity.vcxproj.in b/external_imported/vcpkg/ports/sdl1-mixer/timidity.vcxproj.in
new file mode 100644
index 000000000..2689aefac
--- /dev/null
+++ b/external_imported/vcpkg/ports/sdl1-mixer/timidity.vcxproj.in
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}</ProjectGuid>
+    <RootNamespace>timidity</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>.\Release\</OutDir>
+    <IntDir>.\Release\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>.\Debug\</OutDir>
+    <IntDir>.\Debug\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>@CRT_TYPE_REL@</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>.\Release/timidity.pch</PrecompiledHeaderOutputFile>
+      <WarningLevel>Level3</WarningLevel>
+      <AdditionalIncludeDirectories>@CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Release/timidity.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>@CRT_TYPE_DBG@</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>.\Debug/timidity.pch</PrecompiledHeaderOutputFile>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>OldStyle</DebugInformationFormat>
+      <AdditionalIncludeDirectories>@CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Debug/timidity.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>@CRT_TYPE_REL@</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>.\Release/timidity.pch</PrecompiledHeaderOutputFile>
+      <WarningLevel>Level3</WarningLevel>
+      <AdditionalIncludeDirectories>@CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Release/timidity.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>@CRT_TYPE_DBG@</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>.\Debug/timidity.pch</PrecompiledHeaderOutputFile>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>OldStyle</DebugInformationFormat>
+      <AdditionalIncludeDirectories>@CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Debug/timidity.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\timidity\common.c" />
+    <ClCompile Include="..\..\timidity\ctrlmode.c" />
+    <ClCompile Include="..\..\timidity\filter.c" />
+    <ClCompile Include="..\..\timidity\instrum.c" />
+    <ClCompile Include="..\..\timidity\mix.c" />
+    <ClCompile Include="..\..\timidity\output.c" />
+    <ClCompile Include="..\..\timidity\playmidi.c" />
+    <ClCompile Include="..\..\timidity\readmidi.c" />
+    <ClCompile Include="..\..\timidity\resample.c" />
+    <ClCompile Include="..\..\timidity\sdl_a.c" />
+    <ClCompile Include="..\..\timidity\sdl_c.c" />
+    <ClCompile Include="..\..\timidity\tables.c" />
+    <ClCompile Include="..\..\timidity\timidity.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\timidity\common.h" />
+    <ClInclude Include="..\..\timidity\config.h" />
+    <ClInclude Include="..\..\timidity\ctrlmode.h" />
+    <ClInclude Include="..\..\timidity\filter.h" />
+    <ClInclude Include="..\..\timidity\instrum.h" />
+    <ClInclude Include="..\..\timidity\mix.h" />
+    <ClInclude Include="..\..\timidity\output.h" />
+    <ClInclude Include="..\..\timidity\playmidi.h" />
+    <ClInclude Include="..\..\timidity\readmidi.h" />
+    <ClInclude Include="..\..\timidity\resample.h" />
+    <ClInclude Include="..\..\timidity\tables.h" />
+    <ClInclude Include="..\..\timidity\timidity.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/sdl1-mixer/usage b/external_imported/vcpkg/ports/sdl1-mixer/usage
new file mode 100644
index 000000000..886069e41
--- /dev/null
+++ b/external_imported/vcpkg/ports/sdl1-mixer/usage
@@ -0,0 +1,4 @@
+The package sdl1-mixer is compatible with built-in CMake targets:
+
+    find_package(SDL_mixer REQUIRED)
+    target_link_libraries(main PRIVATE ${SDL_MIXER_LIBRARY})
diff --git a/external_imported/vcpkg/ports/sdl1-mixer/vcpkg.json b/external_imported/vcpkg/ports/sdl1-mixer/vcpkg.json
new file mode 100644
index 000000000..52ef800e7
--- /dev/null
+++ b/external_imported/vcpkg/ports/sdl1-mixer/vcpkg.json
@@ -0,0 +1,17 @@
+{
+  "name": "sdl1-mixer",
+  "version-date": "2023-03-25",
+  "port-version": 2,
+  "description": "An audio mixer that supports various file formats for Simple Directmedia Layer.",
+  "homepage": "https://www.libsdl.org",
+  "license": "Zlib",
+  "supports": "!osx & !uwp & !arm",
+  "dependencies": [
+    "libflac",
+    "libmikmod",
+    "libogg",
+    "libvorbis",
+    "mpg123",
+    "sdl1"
+  ]
+}
diff --git a/external_imported/vcpkg/ports/sdl1-net/vcpkg.json b/external_imported/vcpkg/ports/sdl1-net/vcpkg.json
index d76a7ba21..6be7f0e4c 100644
--- a/external_imported/vcpkg/ports/sdl1-net/vcpkg.json
+++ b/external_imported/vcpkg/ports/sdl1-net/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "sdl1-net",
-  "version-string": "1.2.8",
-  "port-version": 5,
+  "version": "1.2.8",
+  "port-version": 6,
   "description": "Networking library for SDL",
   "dependencies": [
     "sdl1",
diff --git a/external_imported/vcpkg/ports/sdl1/SDL1_2017.sln b/external_imported/vcpkg/ports/sdl1/SDL1_2017.sln.in
similarity index 100%
rename from external_imported/vcpkg/ports/sdl1/SDL1_2017.sln
rename to external_imported/vcpkg/ports/sdl1/SDL1_2017.sln.in
diff --git a/external_imported/vcpkg/ports/sdl1/portfile.cmake b/external_imported/vcpkg/ports/sdl1/portfile.cmake
index 3f46fe389..772b22899 100644
--- a/external_imported/vcpkg/ports/sdl1/portfile.cmake
+++ b/external_imported/vcpkg/ports/sdl1/portfile.cmake
@@ -13,14 +13,14 @@ vcpkg_from_github(
 configure_file("${SOURCE_PATH}/include/SDL_config.h.default" "${SOURCE_PATH}/include/SDL_config.h" COPYONLY)
 
 if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
-    file(COPY "${CMAKE_CURRENT_LIST_DIR}/SDL1_2017.sln" DESTINATION "${SOURCE_PATH}/VisualC/")
-    
+    configure_file("${CURRENT_PORT_DIR}/SDL1_2017.sln.in" "${SOURCE_PATH}/VisualC/SDL1_2017.sln" COPYONLY)
+
     if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
         set(LIB_TYPE StaticLibrary)
     else()
         set(LIB_TYPE DynamicLibrary)
     endif()
-    
+
     if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
         set(CRT_TYPE_DBG MultiThreadedDebugDLL)
         set(CRT_TYPE_REL MultiThreadedDLL)
@@ -28,27 +28,21 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
         set(CRT_TYPE_DBG MultiThreadedDebug)
         set(CRT_TYPE_REL MultiThreaded)
     endif()
-    
+
     configure_file("${CURRENT_PORT_DIR}/SDL.vcxproj.in" "${SOURCE_PATH}/VisualC/SDL/SDL.vcxproj" @ONLY)
     configure_file("${CURRENT_PORT_DIR}/SDLmain.vcxproj.in" "${SOURCE_PATH}/VisualC/SDLmain/SDLmain.vcxproj" @ONLY)
-    
-    # This text file gets copied as a library, and included as one in the package 
+
+    # This text file gets copied as a library, and included as one in the package
     file(REMOVE_RECURSE "${SOURCE_PATH}/src/hermes/COPYING.LIB")
-    
+
     vcpkg_install_msbuild(
         SOURCE_PATH "${SOURCE_PATH}"
         PROJECT_SUBPATH VisualC/SDL1_2017.sln
-        INCLUDES_SUBPATH include
-        LICENSE_SUBPATH COPYING
-        ALLOW_ROOT_INCLUDES
     )
-    
+
     #Take all the fils into include/SDL to sovle conflict with SDL2 port
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/doxyfile")
-    file(RENAME "${CURRENT_PACKAGES_DIR}/include" "${CURRENT_PACKAGES_DIR}/include.tmp")
-    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include")
-    file(RENAME "${CURRENT_PACKAGES_DIR}/include.tmp" "${CURRENT_PACKAGES_DIR}/include/SDL")
-    
+    file(INSTALL "${SOURCE_PATH}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/SDL")
+
     file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/manual-link")
     file(RENAME "${CURRENT_PACKAGES_DIR}/lib/SDLmain.lib" "${CURRENT_PACKAGES_DIR}/lib/manual-link/SDLmain.lib")
     if(NOT DEFINED VCPKG_BUILD_TYPE)
@@ -74,14 +68,13 @@ else()
     vcpkg_configure_make(
         SOURCE_PATH "${SOURCE_PATH}"
     )
-    
+
     vcpkg_install_make()
     vcpkg_fixup_pkgconfig()
-    
+
     file(REMOVE_RECURSE
         "${CURRENT_PACKAGES_DIR}/debug/share"
         "${CURRENT_PACKAGES_DIR}/share/${PORT}/man3"
     )
-
-    file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 endif()
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/sdl1/vcpkg.json b/external_imported/vcpkg/ports/sdl1/vcpkg.json
index 43968e5ed..304fabadd 100644
--- a/external_imported/vcpkg/ports/sdl1/vcpkg.json
+++ b/external_imported/vcpkg/ports/sdl1/vcpkg.json
@@ -1,9 +1,16 @@
 {
   "name": "sdl1",
   "version": "1.2.15",
-  "port-version": 17,
+  "port-version": 19,
   "description": "Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.",
   "homepage": "https://www.libsdl.org",
   "license": "LGPL-2.1-or-later",
-  "supports": "!osx & !uwp"
+  "supports": "!osx & !uwp",
+  "dependencies": [
+    {
+      "name": "vcpkg-msbuild",
+      "host": true,
+      "platform": "windows"
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/sdl2-gfx/vcpkg.json b/external_imported/vcpkg/ports/sdl2-gfx/vcpkg.json
index b5ba5206a..4e48c75f3 100644
--- a/external_imported/vcpkg/ports/sdl2-gfx/vcpkg.json
+++ b/external_imported/vcpkg/ports/sdl2-gfx/vcpkg.json
@@ -1,10 +1,13 @@
 {
   "name": "sdl2-gfx",
-  "version-string": "1.0.4",
-  "port-version": 9,
+  "version": "1.0.4",
+  "port-version": 11,
   "description": "Graphics primitives (line, circle, rectangle etc.) with AA support, rotozoomer and other drawing related support functions wrapped up in a C based add-on library for the Simple Direct Media (SDL) cross-platform API layer.",
   "dependencies": [
-    "sdl2",
+    {
+      "name": "sdl2",
+      "default-features": false
+    },
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/external_imported/vcpkg/ports/sdl2-image/vcpkg.json b/external_imported/vcpkg/ports/sdl2-image/vcpkg.json
index 8198bbd18..bcec81ee0 100644
--- a/external_imported/vcpkg/ports/sdl2-image/vcpkg.json
+++ b/external_imported/vcpkg/ports/sdl2-image/vcpkg.json
@@ -1,12 +1,16 @@
 {
   "name": "sdl2-image",
   "version": "2.6.3",
+  "port-version": 1,
   "description": "SDL_image is an image file loading library. It loads images as SDL surfaces and textures, and supports the following formats: BMP, GIF, JPEG, LBM, PCX, PNG, PNM, TGA, TIFF, WEBP, XCF, XPM, XV",
   "homepage": "https://github.com/libsdl-org/SDL_image",
   "license": "Zlib",
   "dependencies": [
     "libpng",
-    "sdl2",
+    {
+      "name": "sdl2",
+      "default-features": false
+    },
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/external_imported/vcpkg/ports/sdl2-mixer-ext/fix-dependencies.patch b/external_imported/vcpkg/ports/sdl2-mixer-ext/fix-dependencies.patch
new file mode 100644
index 000000000..f23278854
--- /dev/null
+++ b/external_imported/vcpkg/ports/sdl2-mixer-ext/fix-dependencies.patch
@@ -0,0 +1,304 @@
+diff --git a/SDL2_mixer_extConfig.cmake.in b/SDL2_mixer_extConfig.cmake.in
+index 997d4e828150d10fa4113b3341220ca185fc29a5..2d781528151075385a2e837df3863900b8d36573 100644
+--- a/SDL2_mixer_extConfig.cmake.in
++++ b/SDL2_mixer_extConfig.cmake.in
+@@ -6,10 +6,58 @@ set_package_properties(SDL2_mixer_ext PROPERTIES
+ 
+ @PACKAGE_INIT@
+ 
++set(SDL_MIXER_X_USE_OGG_VORBIS              @USE_OGG_VORBIS@)
++set(SDL_MIXER_X_USE_OPUS                    @USE_OPUS@)
++set(SDL_MIXER_X_USE_USE_FLAC                @USE_FLAC@)
++set(SDL_MIXER_X_USE_USE_WAVPACK             @USE_WAVPACK@)
++set(SDL_MIXER_X_USE_MP3_MPG123              @USE_MP3_MPG123@)
++set(SDL_MIXER_X_USE_XMP                     @USE_XMP@)
++set(SDL_MIXER_X_USE_MIDI_ADLMIDI            @USE_MIDI_ADLMIDI@)
++set(SDL_MIXER_X_USE_MIDI_OPNMIDI            @USE_MIDI_OPNMIDI@)
++set(SDL_MIXER_X_USE_MIDI_FLUIDSYNTH         @USE_MIDI_FLUIDSYNTH@)
++
+ if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/SDL2_mixer_ext-shared-targets.cmake")
+     include("${CMAKE_CURRENT_LIST_DIR}/SDL2_mixer_ext-shared-targets.cmake")
+ endif()
+ 
+ if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/SDL2_mixer_ext-static-targets.cmake")
++    include(CMakeFindDependencyMacro)
++
++    if(SDL_MIXER_X_USE_OGG_VORBIS AND NOT TARGET Vorbis::vorbisfile)
++        find_dependency(Vorbis CONFIG)
++    endif()
++
++    if(SDL_MIXER_X_USE_OPUS AND NOT TARGET OpusFile::opusfile)
++        find_dependency(OpusFile CONFIG)
++    endif()
++
++    if(SDL_MIXER_X_USE_USE_FLAC AND NOT TARGET FLAC::FLAC)
++        find_dependency(FLAC CONFIG)
++    endif()
++
++    if(SDL_MIXER_X_USE_USE_WAVPACK AND NOT TARGET WavPack::WavPack)
++        find_dependency(WavPack CONFIG)
++    endif()
++
++    if(SDL_MIXER_X_USE_MP3_MPG123 AND NOT TARGET MPG123::libmpg123)
++        find_dependency(MPG123 CONFIG)
++    endif()
++
++    if(SDL_MIXER_X_USE_XMP AND NOT TARGET libxmp::xmp_static)
++        find_dependency(libxmp CONFIG)
++    endif()
++
++    if(SDL_MIXER_X_USE_MIDI_ADLMIDI AND NOT TARGET libADLMIDI::ADLMIDI_static)
++        find_dependency(libADLMIDI CONFIG)
++    endif()
++
++    if(SDL_MIXER_X_USE_MIDI_OPNMIDI AND NOT TARGET libOPNMIDI::OPNMIDI_static)
++        find_dependency(libOPNMIDI CONFIG)
++    endif()
++
++    if(SDL_MIXER_X_USE_MIDI_FLUIDSYNTH AND NOT TARGET FluidSynth::libfluidsynth)
++        find_dependency(FluidSynth CONFIG)
++    endif()
++
+     include("${CMAKE_CURRENT_LIST_DIR}/SDL2_mixer_ext-static-targets.cmake")
+ endif()
+diff --git a/src/codecs/music_ffmpeg.cmake b/src/codecs/music_ffmpeg.cmake
+index 285d54df037a1bb126f3c680102ca08d27e83d6e..d2305f39b7c5bfeba6b9fc566764320354833765 100644
+--- a/src/codecs/music_ffmpeg.cmake
++++ b/src/codecs/music_ffmpeg.cmake
+@@ -3,7 +3,7 @@ if(USE_FFMPEG AND MIXERX_LGPL)
+     option(USE_FFMPEG_DYNAMIC "Use dynamical loading of FFMPEG" ON)
+ 
+     if(USE_SYSTEM_AUDIO_LIBRARIES)
+-        find_package(FFMPEG QUIET)
++        find_package(FFMPEG REQUIRED)
+         message("FFMPEG: [${FFMPEG_avcodec_FOUND}] ${FFMPEG_INCLUDE_DIRS} ${FFMPEG_swresample_LIBRARY} ${FFMPEG_avformat_LIBRARY} ${FFMPEG_avcodec_LIBRARY} ${FFMPEG_avutil_LIBRARY}")
+ 
+         if(USE_FFMPEG_DYNAMIC)
+@@ -18,10 +18,7 @@ if(USE_FFMPEG AND MIXERX_LGPL)
+         endif()
+ 
+         set(FFMPEG_LINK_LIBRARIES
+-            ${FFMPEG_swresample_LIBRARY}
+-            ${FFMPEG_avformat_LIBRARY}
+-            ${FFMPEG_avcodec_LIBRARY}
+-            ${FFMPEG_avutil_LIBRARY}
++            ${FFMPEG_LIBRARIES}
+         )
+     else()
+         message(WARNING "FFMPEG libraries are not a part of AudioCodecs yet. Using any available from the system.")
+@@ -43,7 +40,7 @@ if(USE_FFMPEG AND MIXERX_LGPL)
+         set(FFMPEG_swresample_FOUND 1)
+     endif()
+ 
+-    if(FFMPEG_avcodec_FOUND AND FFMPEG_avformat_FOUND AND FFMPEG_avutil_FOUND AND FFMPEG_swresample_FOUND)
++    if(1)
+         set(FFMPEG_FOUND 1)
+     endif()
+ 
+diff --git a/src/codecs/music_flac.cmake b/src/codecs/music_flac.cmake
+index 1a39a4984c6bb36c8a09978540ebdd3b8031d7ef..6726655de7ef622fbb872660cfc0a3d49b00a058 100644
+--- a/src/codecs/music_flac.cmake
++++ b/src/codecs/music_flac.cmake
+@@ -3,7 +3,10 @@ if(USE_FLAC)
+     option(USE_FLAC_DYNAMIC "Use dynamical loading of FLAC" OFF)
+ 
+     if(USE_SYSTEM_AUDIO_LIBRARIES)
+-        find_package(FLAC QUIET)
++        find_package(FLAC CONFIG REQUIRED)
++        get_target_property(FLAC_INCLUDE_DIRS FLAC::FLAC INTERFACE_INCLUDE_DIRECTORIES)
++        set(FLAC_LIBRARIES FLAC::FLAC)
++        set(FLAC_FOUND 1)
+         message("FLAC: [${FLAC_FOUND}] ${FLAC_INCLUDE_DIRS} ${FLAC_LIBRARIES}")
+         if(USE_FLAC_DYNAMIC)
+             list(APPEND SDL_MIXER_DEFINITIONS -DFLAC_DYNAMIC=\"${FLAC_DYNAMIC_LIBRARY}\")
+diff --git a/src/codecs/music_fluidsynth.cmake b/src/codecs/music_fluidsynth.cmake
+index 8dd54447317cba97928f320ce2bd5cc8364a8967..ad7a302173e06302d8a5313302445151f9c14c70 100644
+--- a/src/codecs/music_fluidsynth.cmake
++++ b/src/codecs/music_fluidsynth.cmake
+@@ -6,7 +6,10 @@ if(USE_MIDI_FLUIDSYNTH AND NOT USE_MIDI_FLUIDLITE AND MIXERX_LGPL)
+         message(WARNING "AudioCodecs doesn't ship FluidSynth, it will be recognized from a system!!!")
+     endif()
+ 
+-    find_package(FluidSynth QUIET)
++    find_package(FluidSynth CONFIG REQUIRED)
++    get_target_property(FluidSynth_INCLUDE_DIRS FluidSynth::libfluidsynth INTERFACE_INCLUDE_DIRECTORIES)
++    set(FluidSynth_LIBRARIES FluidSynth::libfluidsynth)
++    set(FluidSynth_FOUND 1)
+     message("FluidSynth: [${FluidSynth_FOUND}] ${FluidSynth_INCLUDE_DIRS} ${FluidSynth_LIBRARIES}")
+     if(USE_MIDI_FLUIDSYNTH_DYNAMIC)
+         list(APPEND SDL_MIXER_DEFINITIONS -DFLUIDSYNTH_DYNAMIC=\"${FluidSynth_DYNAMIC_LIBRARY}\")
+diff --git a/src/codecs/music_gme.cmake b/src/codecs/music_gme.cmake
+index e8a455391489080a88685e4501250f37138b38d6..124d3f3e63eff2e125cbce8139a2958a78088b15 100644
+--- a/src/codecs/music_gme.cmake
++++ b/src/codecs/music_gme.cmake
+@@ -3,7 +3,14 @@ if(USE_GME AND MIXERX_LGPL)
+     option(USE_GME_DYNAMIC "Use dynamical loading of Game Music Emulators library" OFF)
+ 
+     if(USE_SYSTEM_AUDIO_LIBRARIES)
+-        find_package(GME QUIET)
++        find_path(GME_INCLUDE_DIRS "gme.h" PATH_SUFFIXES gme)
++        find_library(GME_LIBRARY_RELEASE NAMES gme PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH)
++        find_library(GME_LIBRARY_DEBUG NAMES gme PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH)
++        include(SelectLibraryConfigurations)
++        select_library_configurations(GME)
++        find_package(ZLIB REQUIRED)
++        list(APPEND GME_LIBRARIES ${ZLIB_LIBRARIES})
++        set(GME_FOUND 1)
+         message("GME: [${GME_FOUND}] ${GME_INCLUDE_DIRS} ${GME_LIBRARIES}")
+         if(USE_GME_DYNAMIC)
+             list(APPEND SDL_MIXER_DEFINITIONS -DGME_DYNAMIC=\"${GME_DYNAMIC_LIBRARY}\")
+diff --git a/src/codecs/music_midi_adl.cmake b/src/codecs/music_midi_adl.cmake
+index c8f7bbdbfdb62e1fd0a20e5006c4a4d1b4ab8452..0be6f3b9e761263857dba8c1931e84cf22640535 100644
+--- a/src/codecs/music_midi_adl.cmake
++++ b/src/codecs/music_midi_adl.cmake
+@@ -3,7 +3,15 @@ if(USE_MIDI_ADLMIDI AND MIXERX_GPL)
+     option(USE_MIDI_ADLMIDI_DYNAMIC "Use dynamical loading of libADLMIDI library" OFF)
+ 
+     if(USE_SYSTEM_AUDIO_LIBRARIES)
+-        find_package(ADLMIDI QUIET)
++        find_package(libADLMIDI CONFIG REQUIRED)
++        if(SDL_MIXER_X_STATIC)
++            set(_adlmidi libADLMIDI::ADLMIDI_static)
++        else()
++            set(_adlmidi libADLMIDI::ADLMIDI_shared)
++        endif()
++        get_target_property(ADLMIDI_INCLUDE_DIRS ${_adlmidi} INTERFACE_INCLUDE_DIRECTORIES)
++        set(ADLMIDI_LIBRARIES ${_adlmidi})
++        set(ADLMIDI_FOUND 1)
+         message("ADLMIDI: [${ADLMIDI_FOUND}] ${ADLMIDI_INCLUDE_DIRS} ${ADLMIDI_LIBRARIES}")
+ 
+         if(USE_MIDI_ADLMIDI_DYNAMIC)
+diff --git a/src/codecs/music_midi_opn.cmake b/src/codecs/music_midi_opn.cmake
+index 62b9dda0c2771ef25a7bc91949cdce0c55ea5250..26bb304d720f7d93eb3d8b24fd81dbc33df513cc 100644
+--- a/src/codecs/music_midi_opn.cmake
++++ b/src/codecs/music_midi_opn.cmake
+@@ -3,7 +3,15 @@ if(USE_MIDI_OPNMIDI AND MIXERX_GPL)
+     option(USE_MIDI_OPNMIDI_DYNAMIC "Use dynamical loading of libOPNMIDI library" OFF)
+ 
+     if(USE_SYSTEM_AUDIO_LIBRARIES)
+-        find_package(OPNMIDI QUIET)
++        find_package(libOPNMIDI CONFIG REQUIRED)
++        if(SDL_MIXER_X_STATIC)
++            set(_opnmidi libOPNMIDI::OPNMIDI_static)
++        else()
++            set(_opnmidi libOPNMIDI::OPNMIDI_shared)
++        endif()
++        get_target_property(OPNMIDI_INCLUDE_DIRS ${_opnmidi} INTERFACE_INCLUDE_DIRECTORIES)
++        set(OPNMIDI_LIBRARIES ${_opnmidi})
++        set(OPNMIDI_FOUND 1)
+         message("OPNMIDI: [${OPNMIDI_FOUND}] ${OPNMIDI_INCLUDE_DIRS} ${OPNMIDI_LIBRARIES}")
+ 
+         if(USE_MIDI_OPNMIDI_DYNAMIC)
+diff --git a/src/codecs/music_modplug.cmake b/src/codecs/music_modplug.cmake
+index 555bcd91574d1c65761121648b331715a5fe8dad..ad065be36cd0176aa7f08631a6df48e857f76e42 100644
+--- a/src/codecs/music_modplug.cmake
++++ b/src/codecs/music_modplug.cmake
+@@ -4,7 +4,12 @@ if(USE_MODPLUG)
+     option(USE_MODPLUG_STATIC "Use linking with a static ModPlug" ON)
+ 
+     if(USE_SYSTEM_AUDIO_LIBRARIES)
+-        find_package(ModPlug QUIET)
++        find_path(ModPlug_INCLUDE_DIRS "modplug.h" PATH_SUFFIXES libmodplug)
++        find_library(ModPlug_LIBRARY_RELEASE NAMES modplug PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH)
++        find_library(ModPlug_LIBRARY_DEBUG NAMES modplug PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH)
++        include(SelectLibraryConfigurations)
++        select_library_configurations(ModPlug)
++        set(ModPlug_FOUND 1)
+         message("ModPlug: [${ModPlug_FOUND}] ${ModPlug_INCLUDE_DIRS} ${ModPlug_LIBRARIES}")
+         if(USE_MODPLUG_DYNAMIC)
+             list(APPEND SDL_MIXER_DEFINITIONS -DMODPLUG_DYNAMIC=\"${ModPlug_DYNAMIC_LIBRARY}\")
+diff --git a/src/codecs/music_mpg123.cmake b/src/codecs/music_mpg123.cmake
+index c615896cd95e2854ced2d4188ea8e0d18870ad91..602a7b136ec135d55839cf7ab103df56357a8a4c 100644
+--- a/src/codecs/music_mpg123.cmake
++++ b/src/codecs/music_mpg123.cmake
+@@ -4,7 +4,10 @@ if(USE_MP3_MPG123 AND MIXERX_LGPL)
+     option(USE_MP3_MPG123_DYNAMIC "Use dynamical loading of MPG123" OFF)
+ 
+     if(USE_SYSTEM_AUDIO_LIBRARIES)
+-        find_package(Mpg123 QUIET)
++        find_package(MPG123 CONFIG REQUIRED)
++        get_target_property(MPG123_INCLUDE_DIR MPG123::libmpg123 INTERFACE_INCLUDE_DIRECTORIES)
++        set(MPG123_LIBRARIES MPG123::libmpg123)
++        set(MPG123_FOUND 1)
+         message("MPG123 found in ${MPG123_INCLUDE_DIR} folder")
+         if(USE_MP3_MPG123_DYNAMIC)
+             list(APPEND SDL_MIXER_DEFINITIONS -DMPG123_DYNAMIC=\"${MPG123_DYNAMIC_LIBRARY}\")
+diff --git a/src/codecs/music_ogg.cmake b/src/codecs/music_ogg.cmake
+index e7930f9c7e1a583f77306f6838933b991382872f..33a8a59e72e30e3cabd4e834895a23ae7b101324 100644
+--- a/src/codecs/music_ogg.cmake
++++ b/src/codecs/music_ogg.cmake
+@@ -1,4 +1,4 @@
+-if(LIBOGG_NEEDED)
++if(0)
+     if(USE_SYSTEM_AUDIO_LIBRARIES)
+         find_package(OGG REQUIRED)
+     else()
+diff --git a/src/codecs/music_ogg_vorbis.cmake b/src/codecs/music_ogg_vorbis.cmake
+index 0de2bec5d9327af7b38f09993dd884be786f3a5b..42b94340956fb8b28a03485ddc68282e3cf57ee9 100644
+--- a/src/codecs/music_ogg_vorbis.cmake
++++ b/src/codecs/music_ogg_vorbis.cmake
+@@ -10,7 +10,10 @@ if(USE_OGG_VORBIS)
+                 find_package(Tremor QUIET)
+                 message("Tremor: [${Tremor_FOUND}] ${Tremor_INCLUDE_DIRS} ${Tremor_LIBRARIES}")
+             else()
+-                find_package(Vorbis QUIET)
++                find_package(Vorbis CONFIG REQUIRED)
++                get_target_property(Vorbis_INCLUDE_DIRS Vorbis::vorbisfile INTERFACE_INCLUDE_DIRECTORIES)
++                set(Vorbis_LIBRARIES Vorbis::vorbisfile)
++                set(Vorbis_FOUND 1)
+                 message("Vorbis: [${Vorbis_FOUND}] ${Vorbis_INCLUDE_DIRS} ${Vorbis_LIBRARIES}")
+             endif()
+ 
+diff --git a/src/codecs/music_opus.cmake b/src/codecs/music_opus.cmake
+index 61fb32e7ec1bcb4e21cb77607399f1f36317c481..44e0b5da00146492a2b34a65ab0c16846b1aeb84 100644
+--- a/src/codecs/music_opus.cmake
++++ b/src/codecs/music_opus.cmake
+@@ -3,7 +3,10 @@ if(USE_OPUS)
+     option(USE_OPUS_DYNAMIC "Use dynamical loading of Opus" OFF)
+ 
+     if(USE_SYSTEM_AUDIO_LIBRARIES)
+-        find_package(Opus QUIET)
++        find_package(OpusFile CONFIG REQUIRED)
++        get_target_property(Opus_INCLUDE_DIRS OpusFile::opusfile INTERFACE_INCLUDE_DIRECTORIES)
++        set(Opus_LIBRARIES OpusFile::opusfile)
++        set(Opus_FOUND 1)
+         message("Opus: [${Opus_FOUND}] ${Opus_INCLUDE_DIRS} ${Opus_LIBRARIES} ${LIBOPUS_LIB}")
+         if(USE_OPUS_DYNAMIC)
+             list(APPEND SDL_MIXER_DEFINITIONS -DOPUS_DYNAMIC=\"${OpusFile_DYNAMIC_LIBRARY}\")
+diff --git a/src/codecs/music_wavpack.cmake b/src/codecs/music_wavpack.cmake
+index f93acdb4315e0f44311efdbc254a3fcd69964151..95d0372e2b8d0503864edf41f01977cf28a480f9 100644
+--- a/src/codecs/music_wavpack.cmake
++++ b/src/codecs/music_wavpack.cmake
+@@ -4,7 +4,10 @@ if(USE_WAVPACK)
+     option(USE_WAVPACK_DSD "Enable WavPack DSD music support" OFF)
+ 
+     if(USE_SYSTEM_AUDIO_LIBRARIES)
+-        find_package(WavPack QUIET)
++        find_package(WavPack CONFIG REQUIRED)
++        get_target_property(WavPack_INCLUDE_DIRS WavPack::WavPack INTERFACE_INCLUDE_DIRECTORIES)
++        set(WavPack_LIBRARIES WavPack::WavPack)
++        set(WavPack_FOUND 1)
+         message("WavPack: [${WavPack_FOUND}] ${WavPack_INCLUDE_DIRS} ${WavPack_LIBRARIES}")
+         if(USE_WAVPACK_DYNAMIC)
+             list(APPEND SDL_MIXER_DEFINITIONS -DWAVPACK_DYNAMIC=\"${WavPack_DYNAMIC_LIBRARY}\")
+diff --git a/src/codecs/music_xmp.cmake b/src/codecs/music_xmp.cmake
+index 52f2048b0b8cb9c72a27f16777fb7d9112be1c2d..2eab53c039e875733f18fc2f20b2e9f178371425 100644
+--- a/src/codecs/music_xmp.cmake
++++ b/src/codecs/music_xmp.cmake
+@@ -25,7 +25,15 @@ if(USE_XMP)
+             set(XMP_LIBRARIES ${XMPLITE_LIBRARIES})
+             set(XMP_FOUND ${XMPLITE_FOUND})
+         else()
+-            find_package(XMP)
++            find_package(libxmp CONFIG REQUIRED)
++            if(SDL_MIXER_X_STATIC)
++                set(_xmp libxmp::xmp_static)
++            else()
++                set(_xmp libxmp::xmp_shared)
++            endif()
++            get_target_property(XMP_INCLUDE_DIRS ${_xmp} INTERFACE_INCLUDE_DIRECTORIES)
++            set(XMP_LIBRARIES ${_xmp})
++            set(XMP_FOUND 1)
+             message("XMP: [${XMP_FOUND}] ${XMP_INCLUDE_DIRS} ${XMP_LIBRARIES}")
+             if(USE_XMP_DYNAMIC)
+                 list(APPEND SDL_MIXER_DEFINITIONS -DXMP_DYNAMIC=\"${XMP_DYNAMIC_LIBRARY}\")
diff --git a/external_imported/vcpkg/ports/sdl2-mixer-ext/portfile.cmake b/external_imported/vcpkg/ports/sdl2-mixer-ext/portfile.cmake
new file mode 100644
index 000000000..5f92bfb1e
--- /dev/null
+++ b/external_imported/vcpkg/ports/sdl2-mixer-ext/portfile.cmake
@@ -0,0 +1,99 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO WohlSoft/SDL-Mixer-X
+    REF "${VERSION}"
+    SHA512 bdb39122ecf8492723615421c37c0d2a8d5958110d7bf2f0a01f5c54cc1f3f6e9a54887df7d348e9dc7e34906cff67794b0f5d61ca6fe5e4019f84ed88cf07e5
+    HEAD_REF master
+    PATCHES
+        fix-dependencies.patch
+)
+
+file(REMOVE
+    "${SOURCE_PATH}/cmake/find/FindOGG.cmake" # Conflicts with official configurations
+    "${SOURCE_PATH}/cmake/find/FindFFMPEG.cmake" # Using FindFFMPEG.cmake provided by vcpkg
+)
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        libvorbis   USE_OGG_VORBIS
+        opusfile    USE_OPUS
+        libflac     USE_FLAC
+        wavpack     USE_WAVPACK
+        mpg123      USE_MP3_MPG123
+        libmodplug  USE_MODPLUG
+        libxmp      USE_XMP
+        libgme      USE_GME
+        ffmpeg      USE_FFMPEG
+        pxtone      USE_PXTONE
+        cmd         USE_CMD
+        libadlmidi  USE_MIDI_ADLMIDI
+        libopnmidi  USE_MIDI_OPNMIDI
+        timidity    USE_MIDI_TIMIDITY
+        fluidsynth  USE_MIDI_FLUIDSYNTH
+        nativemidi  USE_MIDI_NATIVE_ALT
+        nativemidi  USE_MIDI_NATIVE
+)
+
+if("libadlmidi"     IN_LIST FEATURES OR 
+    "libopnmidi"    IN_LIST FEATURES OR 
+    "timidity"      IN_LIST FEATURES OR 
+    "fluidsynth"    IN_LIST FEATURES OR 
+    "nativemidi"    IN_LIST FEATURES)
+    set(USE_MIDI ON)
+else()
+    set(USE_MIDI OFF)
+endif()
+
+if("fluidsynth" IN_LIST FEATURES)
+    vcpkg_find_acquire_program(PKGCONFIG)
+    list(APPEND EXTRA_OPTIONS "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}")
+endif()
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        ${FEATURE_OPTIONS}
+        ${EXTRA_OPTIONS}
+        -DMIXERX_ENABLE_GPL=ON
+        -DMIXERX_ENABLE_LGPL=ON
+        -DUSE_SYSTEM_SDL2=ON
+        -DUSE_SYSTEM_AUDIO_LIBRARIES=ON
+        -DUSE_OGG_VORBIS_STB=OFF
+        -DUSE_DRFLAC=OFF
+        -USE_WAVPACK_DSD=ON
+        -DUSE_MP3_DRMP3=OFF
+        -DUSE_FFMPEG_DYNAMIC=OFF
+        -DUSE_MIDI=${USE_MIDI}
+        -DUSE_MIDI_EDMIDI=OFF
+        -DUSE_MIDI_FLUIDLITE=OFF
+    MAYBE_UNUSED_VARIABLES
+        USE_WAVPACK_DSD
+        USE_FFMPEG_DYNAMIC
+        USE_CMD
+        USE_MIDI_NATIVE
+        USE_MIDI_NATIVE_ALT
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(
+    PACKAGE_NAME SDL2_mixer_ext
+    CONFIG_PATH lib/cmake/SDL2_mixer_ext)
+
+vcpkg_fixup_pkgconfig()
+
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE
+    "${CURRENT_PACKAGES_DIR}/debug/share"
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+)
+
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+
+set(LICENSE_FILES
+    "${SOURCE_PATH}/COPYING.txt"
+    "${SOURCE_PATH}/GPLv2.txt"
+    "${SOURCE_PATH}/GPLv3.txt"
+    "${SOURCE_PATH}/SDL2_mixer_ext.License.txt"
+)
+vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES})
diff --git a/external_imported/vcpkg/ports/sdl2-mixer-ext/usage b/external_imported/vcpkg/ports/sdl2-mixer-ext/usage
new file mode 100644
index 000000000..4655035fa
--- /dev/null
+++ b/external_imported/vcpkg/ports/sdl2-mixer-ext/usage
@@ -0,0 +1,4 @@
+sdl2-mixer-ext provides CMake targets:
+
+    find_package(SDL2_mixer_ext CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE $<IF:$<TARGET_EXISTS:SDL2_mixer_ext::SDL2_mixer_ext>,SDL2_mixer_ext::SDL2_mixer_ext,SDL2_mixer_ext::SDL2_mixer_ext_Static>)
diff --git a/external_imported/vcpkg/ports/sdl2-mixer-ext/vcpkg.json b/external_imported/vcpkg/ports/sdl2-mixer-ext/vcpkg.json
new file mode 100644
index 000000000..bf61b0923
--- /dev/null
+++ b/external_imported/vcpkg/ports/sdl2-mixer-ext/vcpkg.json
@@ -0,0 +1,128 @@
+{
+  "name": "sdl2-mixer-ext",
+  "version": "2.6.0",
+  "port-version": 1,
+  "description": "An audio mixer library based on the SDL library, a fork of SDL_mixer",
+  "homepage": "https://wohlsoft.github.io/SDL-Mixer-X",
+  "license": "Zlib OR LGPL-2.1-or-later OR GPL-2.0-or-later OR GPL-3.0-or-later",
+  "dependencies": [
+    {
+      "name": "sdl2",
+      "default-features": false
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
+  "features": {
+    "cmd": {
+      "description": "Use external command for playing music (Linux only).",
+      "supports": "linux"
+    },
+    "ffmpeg": {
+      "description": "Use FFMPEG to play WMA and AAC audio formats.",
+      "dependencies": [
+        {
+          "name": "ffmpeg",
+          "default-features": false
+        }
+      ]
+    },
+    "fluidsynth": {
+      "description": "Use FluidSynth to play MIDI audio format.",
+      "dependencies": [
+        {
+          "name": "fluidsynth",
+          "default-features": false
+        }
+      ]
+    },
+    "libadlmidi": {
+      "description": "Use libADLMIDI to play XMI, MUS, IMF and regular MIDI audio format with OPL3 (YMF262) emulator.",
+      "dependencies": [
+        {
+          "name": "libadlmidi",
+          "default-features": false
+        }
+      ]
+    },
+    "libflac": {
+      "description": "Use libflac to play FLAC audio format.",
+      "dependencies": [
+        "libflac"
+      ]
+    },
+    "libgme": {
+      "description": "Use libgme to play chip music (AY, GBS, GYM, HES, KSS, NSF/NSFE, SAP, SPC, VGM/VGZ).",
+      "dependencies": [
+        {
+          "name": "libgme",
+          "default-features": false
+        }
+      ]
+    },
+    "libmodplug": {
+      "description": "Use libmodplug to play tracker music including exclusive formats (AMS, DMF, DSM, MT2).",
+      "dependencies": [
+        "libmodplug"
+      ]
+    },
+    "libopnmidi": {
+      "description": "Use libOPNMIDI to play MIDI and RMI audio format with OPN2 (YM2612) emulator.",
+      "dependencies": [
+        {
+          "name": "libopnmidi",
+          "default-features": false
+        }
+      ]
+    },
+    "libvorbis": {
+      "description": "Use libvorbis to play OGG audio format.",
+      "dependencies": [
+        "libvorbis"
+      ]
+    },
+    "libxmp": {
+      "description": "Use libxmp to play tracker music including exclusive formats (ABK, DIGI, DTM, EMOD, FLX, FNK, GDM, IMF, J2B, LIQ, M15, MFP, MGT, MMDC, MTN, RTM, SFX, SPM, STIM, STX, WOW).",
+      "dependencies": [
+        {
+          "name": "libxmp",
+          "default-features": false
+        }
+      ]
+    },
+    "mpg123": {
+      "description": "Use mpg123 to play MP3 audio format.",
+      "dependencies": [
+        "mpg123"
+      ]
+    },
+    "nativemidi": {
+      "description": "Use Native MIDI Player to play MIDI audio format.",
+      "supports": "(windows & !uwp) | osx"
+    },
+    "opusfile": {
+      "description": "Use opusfile to play Opus audio format.",
+      "dependencies": [
+        "opusfile"
+      ]
+    },
+    "pxtone": {
+      "description": "Use pxtone to play PPTUNE and PTCOP audio formats."
+    },
+    "timidity": {
+      "description": "Use Timidity to play MIDI audio format."
+    },
+    "wavpack": {
+      "description": "Use wavpack to play VW audio format.",
+      "dependencies": [
+        "wavpack"
+      ]
+    }
+  }
+}
diff --git a/external_imported/vcpkg/ports/sdl2-mixer/fix-deps-targets.patch b/external_imported/vcpkg/ports/sdl2-mixer/fix-deps-targets.patch
deleted file mode 100644
index ec0bfc9bb..000000000
--- a/external_imported/vcpkg/ports/sdl2-mixer/fix-deps-targets.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 54317572..5f84dd22 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -366,7 +366,7 @@ if(SDL2MIXER_OPUS)
-         endif()
-     else()
-         message(STATUS "Using system opusfile")
--        find_package(opusfile REQUIRED)
-+        find_package(OpusFile CONFIG REQUIRED)
-         if(NOT SDL2MIXER_OPUS_SHARED)
-             list(APPEND PC_REQUIRES opusfile)
-         endif()
-@@ -384,7 +384,7 @@ if(SDL2MIXER_OPUS)
-             add_dependencies(SDL2_mixer opusfile::opusfile)
-         endif()
-     else()
--        target_link_libraries(SDL2_mixer PRIVATE opusfile::opusfile)
-+        target_link_libraries(SDL2_mixer PRIVATE OpusFile::opusfile)
-     endif()
- endif()
- 
-@@ -467,7 +467,7 @@ if(SDL2MIXER_VORBIS_VORBISFILE)
-         endif()
-     else()
-         message(STATUS "Using system vorbisfile")
--        find_package(vorbisfile REQUIRED)
-+        find_package(Vorbis CONFIG REQUIRED)
-         if(NOT SDL2MIXER_VORBIS_VORBISFILE_SHARED)
-             list(APPEND PC_REQUIRES vorbisfile)
-         endif()
-@@ -485,7 +485,7 @@ if(SDL2MIXER_VORBIS_VORBISFILE)
-             add_dependencies(SDL2_mixer vorbisfile::vorbisfile)
-         endif()
-     else()
--        target_link_libraries(SDL2_mixer PRIVATE vorbisfile::vorbisfile)
-+        target_link_libraries(SDL2_mixer PRIVATE Vorbis::vorbisfile)
-     endif()
- endif()
- 
-@@ -510,7 +510,7 @@ if(SDL2MIXER_FLAC_LIBFLAC)
-         endif()
-     else()
-         message(STATUS "Using system libflac")
--        find_package(FLAC REQUIRED)
-+        find_package(FLAC CONFIG REQUIRED)
-         if(NOT SDL2MIXER_FLAC_LIBFLAC_SHARED)
-             list(APPEND PC_REQUIRES flac)
-         endif()
-@@ -528,7 +528,7 @@ if(SDL2MIXER_FLAC_LIBFLAC)
-             add_dependencies(SDL2_mixer FLAC)
-         endif()
-     else()
--        target_link_libraries(SDL2_mixer PRIVATE FLAC)
-+        target_link_libraries(SDL2_mixer PRIVATE FLAC::FLAC)
-     endif()
- endif()
- 
-@@ -643,7 +643,7 @@ if(SDL2MIXER_MP3_MPG123)
-         endif()
-     else()
-         message(STATUS "Using system mpg123")
--        find_package(MPG123 REQUIRED)
-+        find_package(MPG123 CONFIG REQUIRED)
-         if(NOT SDL2MIXER_MP3_MPG123_SHARED)
-             list(APPEND PC_REQUIRES libmpg123)
-         endif()
-@@ -661,7 +661,7 @@ if(SDL2MIXER_MP3_MPG123)
-             add_dependencies(SDL2_mixer MPG123::mpg123)
-         endif()
-     else()
--        target_link_libraries(SDL2_mixer PRIVATE MPG123::mpg123)
-+        target_link_libraries(SDL2_mixer PRIVATE MPG123::libmpg123)
-     endif()
- endif()
- 
-@@ -672,7 +672,7 @@ if(SDL2MIXER_MIDI_FLUIDSYNTH)
-         message(FATAL_ERROR "FluidSynth is not vendored.")
-     else()
-         message(STATUS "Using system FluidSynth")
--        find_package(FluidSynth REQUIRED)
-+        find_package(FluidSynth CONFIG REQUIRED)
-         if(NOT SDL2MIXER_MIDI_FLUIDSYNTH_SHARED)
-             list(APPEND PC_REQUIRES fluidsynth)
-         endif()
-@@ -690,7 +690,7 @@ if(SDL2MIXER_MIDI_FLUIDSYNTH)
-             add_dependencies(SDL2_mixer FluidSynth::FluidSynth)
-         endif()
-     else()
--        target_link_libraries(SDL2_mixer PRIVATE FluidSynth::FluidSynth)
-+        target_link_libraries(SDL2_mixer PRIVATE FluidSynth::libfluidsynth)
-     endif()
- endif()
- 
-diff --git a/SDL2_mixerConfig.cmake.in b/SDL2_mixerConfig.cmake.in
-index d65a43ce..29866349 100644
---- a/SDL2_mixerConfig.cmake.in
-+++ b/SDL2_mixerConfig.cmake.in
-@@ -54,7 +54,7 @@ if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/SDL2_mixer-static-targets.cmake")
- 
- include(CMakeFindDependencyMacro)
-     if(SDL2MIXER_FLAC_LIBFLAC AND NOT SDL2MIXER_VENDORED AND NOT TARGET FLAC::FLAC)
--        find_dependency(FLAC)
-+        find_dependency(FLAC CONFIG)
-     endif()
- 
-     if(SDL2MIXER_MOD_MODPLUG AND NOT SDL2MIXER_VENDORED AND NOT TARGET modplug::modplug)
-@@ -69,20 +69,23 @@ include(CMakeFindDependencyMacro)
-         find_dependency(libxmp-lite)
-     endif()
- 
--    if(SDL2MIXER_MP3_MPG123 AND NOT SDL2MIXER_VENDORED AND NOT TARGET MPG123::mpg123)
--        find_dependency(MPG123)
-+    if(SDL2MIXER_MP3_MPG123 AND NOT SDL2MIXER_VENDORED AND NOT TARGET MPG123::libmpg123)
-+        find_dependency(MPG123 CONFIG)
-     endif()
- 
--    if(SDL2MIXER_MIDI_FLUIDSYNTH AND NOT SDL2MIXER_VENDORED AND NOT TARGET FluidSynth::FluidSynth)
--        find_dependency(FluidSynth)
-+    if(SDL2MIXER_MIDI_FLUIDSYNTH AND NOT SDL2MIXER_VENDORED AND NOT TARGET FluidSynth::libfluidsynth)
-+        find_dependency(FluidSynth CONFIG)
-     endif()
- 
-     if(SDL2MIXER_VORBIS_TREMOR AND NOT SDL2MIXER_VENDORED AND NOT TARGET tremor::tremor)
-         find_dependency(tremor)
-     endif()
- 
--    if(SDL2MIXER_VORBIS_VORBISFILE AND NOT SDL2MIXER_VENDORED AND NOT TARGET vorbisfile::vorbisfile)
--        find_dependency(vorbisfile)
-+    if(SDL2MIXER_VORBIS_VORBISFILE AND NOT SDL2MIXER_VENDORED AND NOT TARGET Vorbis::vorbisfile)
-+        find_dependency(Vorbis CONFIG)
-+    endif()
-+    if(SDL2MIXER_OPUS AND NOT SDL2MIXER_VENDORED AND NOT TARGET OpusFile::opusfile)
-+        find_dependency(OpusFile CONFIG)
-     endif()
- 
-     if((NOT SDL2MIXER_VENDORED AND SDL2MIXER_MOD_MODPLUG) OR (HAIKU AND SDL2MIXER_MIDI_NATIVE))
diff --git a/external_imported/vcpkg/ports/sdl2-mixer/fix-pkg-prefix.patch b/external_imported/vcpkg/ports/sdl2-mixer/fix-pkg-prefix.patch
index 90a337784..71fe78470 100644
--- a/external_imported/vcpkg/ports/sdl2-mixer/fix-pkg-prefix.patch
+++ b/external_imported/vcpkg/ports/sdl2-mixer/fix-pkg-prefix.patch
@@ -1,13 +1,13 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e70c4d0b..8038abee 100644
+index dc37b28..d139596 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -753,7 +753,7 @@ if(SDL2MIXER_INSTALL)
+@@ -907,7 +907,7 @@ if(SDL2MIXER_INSTALL)
      endif()
- 
+
      ##### export files #####
 -    if(WIN32 AND NOT MINGW)
 +    if(0)
-         set(PKG_PREFIX "cmake")
+         set(SDLMIXER_INSTALL_CMAKEDIR_DEFAULT "cmake")
      else()
-         set(PKG_PREFIX "${CMAKE_INSTALL_LIBDIR}/cmake/SDL2_mixer")
+         set(SDLMIXER_INSTALL_CMAKEDIR_DEFAULT "${CMAKE_INSTALL_LIBDIR}/cmake/SDL2_mixer")
diff --git a/external_imported/vcpkg/ports/sdl2-mixer/fix-pkgconfig.patch b/external_imported/vcpkg/ports/sdl2-mixer/fix-pkgconfig.patch
deleted file mode 100644
index 8face0103..000000000
--- a/external_imported/vcpkg/ports/sdl2-mixer/fix-pkgconfig.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e70c4d0b..8038abee 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -796,7 +796,7 @@ if(SDL2MIXER_INSTALL)
-         COMPONENT devel
-     )
- 
--    if(SDL2MIXER_BUILD_SHARED_LIBS)
-+    if(1)
-         # Only create a .pc file for a shared SDL2_mixer
-         set(VERSION ${FULL_VERSION})
-         set(SDL_VERSION ${SDL_REQUIRED_VERSION})
diff --git a/external_imported/vcpkg/ports/sdl2-mixer/portfile.cmake b/external_imported/vcpkg/ports/sdl2-mixer/portfile.cmake
index 0a592cc47..deafae897 100644
--- a/external_imported/vcpkg/ports/sdl2-mixer/portfile.cmake
+++ b/external_imported/vcpkg/ports/sdl2-mixer/portfile.cmake
@@ -2,11 +2,9 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libsdl-org/SDL_mixer
     REF "release-${VERSION}"
-    SHA512 74c2b449e8a9928679d42e25bd7a5967e41fe9d51732f26197c6bbe1db9170be784125b7f268476050017f3dc970497e09a0409d50731026a18355375d0369ce
+    SHA512 e4c9a4418725ce019bb62216c8fd484cf04b34e2099af633d4c84e0e558fe6ba1921e791c5dde319266ffe3a1237f887871c819a249a8df7e9440c36fce181da
     PATCHES 
-        fix-pkg-prefix.patch 
-        fix-pkgconfig.patch 
-        fix-deps-targets.patch
+        fix-pkg-prefix.patch
 )
 
 vcpkg_check_features(
@@ -21,6 +19,8 @@ vcpkg_check_features(
         mpg123 SDL2MIXER_MP3
         mpg123 SDL2MIXER_MP3_MPG123
         opusfile SDL2MIXER_OPUS
+    MAYBE_UNUSED_VARIABLES    
+        SDL2MIXER_MP3_DRMP3
 )
 
 if("fluidsynth" IN_LIST FEATURES)
diff --git a/external_imported/vcpkg/ports/sdl2-mixer/vcpkg.json b/external_imported/vcpkg/ports/sdl2-mixer/vcpkg.json
index 63226e7c8..6106c20db 100644
--- a/external_imported/vcpkg/ports/sdl2-mixer/vcpkg.json
+++ b/external_imported/vcpkg/ports/sdl2-mixer/vcpkg.json
@@ -1,13 +1,15 @@
 {
   "name": "sdl2-mixer",
-  "version": "2.6.3",
-  "port-version": 1,
+  "version": "2.8.0",
   "description": "Multi-channel audio mixer library for SDL.",
   "homepage": "https://github.com/libsdl-org/SDL_mixer",
   "license": "Zlib",
   "dependencies": [
     "libvorbis",
-    "sdl2",
+    {
+      "name": "sdl2",
+      "default-features": false
+    },
     {
       "name": "vcpkg-cmake",
       "host": true
@@ -15,7 +17,8 @@
     {
       "name": "vcpkg-cmake-config",
       "host": true
-    }
+    },
+    "wavpack"
   ],
   "features": {
     "fluidsynth": {
diff --git a/external_imported/vcpkg/ports/sdl2-net/fix-uwp.patch b/external_imported/vcpkg/ports/sdl2-net/fix-uwp.patch
new file mode 100644
index 000000000..79f4c07a2
--- /dev/null
+++ b/external_imported/vcpkg/ports/sdl2-net/fix-uwp.patch
@@ -0,0 +1,13 @@
+diff --git a/SDLnetUDP.c b/SDLnetUDP.c
+index ee4e46b..dc9b4b0 100644
+--- a/SDLnetUDP.c
++++ b/SDLnetUDP.c
+@@ -22,7 +22,7 @@
+ #include "SDLnetsys.h"
+ #include "SDL_net.h"
+ 
+-#if defined(__WIN32__) || defined(__OS2__)
++#if defined(_WIN32) || defined(__OS2__)
+ #define srandom srand
+ #define random  rand
+ #endif
diff --git a/external_imported/vcpkg/ports/sdl2-net/portfile.cmake b/external_imported/vcpkg/ports/sdl2-net/portfile.cmake
index f5c4473ad..eac85455e 100644
--- a/external_imported/vcpkg/ports/sdl2-net/portfile.cmake
+++ b/external_imported/vcpkg/ports/sdl2-net/portfile.cmake
@@ -4,6 +4,8 @@ vcpkg_from_github(
     REF 669e75b84632e2c6cc5c65974ec9e28052cb7a4e # release-2.2.0
     SHA512 180c757d704c72dc7fcc392c13942214c87b90de22e32045ec9eb6cde5da2b762516e14120d8bee52f7f4a59ad8e30d4f71e313918432ae07ef71df8e9380e4b
     HEAD_REF main
+    PATCHES
+        fix-uwp.patch
 )
 
 vcpkg_cmake_configure(
diff --git a/external_imported/vcpkg/ports/sdl2-net/vcpkg.json b/external_imported/vcpkg/ports/sdl2-net/vcpkg.json
index 1b10deb52..72a7076ec 100644
--- a/external_imported/vcpkg/ports/sdl2-net/vcpkg.json
+++ b/external_imported/vcpkg/ports/sdl2-net/vcpkg.json
@@ -1,12 +1,15 @@
 {
   "name": "sdl2-net",
   "version": "2.2.0",
-  "port-version": 1,
+  "port-version": 3,
   "description": "Networking library for SDL",
   "homepage": "https://github.com/libsdl-org/SDL_net",
   "license": "Zlib",
   "dependencies": [
-    "sdl2",
+    {
+      "name": "sdl2",
+      "default-features": false
+    },
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/external_imported/vcpkg/ports/sdl2-ttf/vcpkg.json b/external_imported/vcpkg/ports/sdl2-ttf/vcpkg.json
index 526313c01..7594a5d81 100644
--- a/external_imported/vcpkg/ports/sdl2-ttf/vcpkg.json
+++ b/external_imported/vcpkg/ports/sdl2-ttf/vcpkg.json
@@ -1,12 +1,16 @@
 {
   "name": "sdl2-ttf",
   "version": "2.20.2",
+  "port-version": 1,
   "description": "A library for rendering TrueType fonts with SDL",
   "homepage": "https://www.libsdl.org/projects/SDL_ttf/",
   "license": "Zlib",
   "dependencies": [
     "freetype",
-    "sdl2",
+    {
+      "name": "sdl2",
+      "default-features": false
+    },
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/external_imported/vcpkg/ports/sdl2/alsa-dep-fix.patch b/external_imported/vcpkg/ports/sdl2/alsa-dep-fix.patch
new file mode 100644
index 000000000..5b2c77b93
--- /dev/null
+++ b/external_imported/vcpkg/ports/sdl2/alsa-dep-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/SDL2Config.cmake.in b/SDL2Config.cmake.in
+index cc8bcf26d..ead829767 100644
+--- a/SDL2Config.cmake.in
++++ b/SDL2Config.cmake.in
+@@ -35,7 +35,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/sdlfind.cmake")
+ 
+ set(SDL_ALSA @SDL_ALSA@)
+ set(SDL_ALSA_SHARED @SDL_ALSA_SHARED@)
+-if(SDL_ALSA AND NOT SDL_ALSA_SHARED AND TARGET SDL2::SDL2-static)
++if(SDL_ALSA)
+   sdlFindALSA()
+ endif()
+ unset(SDL_ALSA)
diff --git a/external_imported/vcpkg/ports/sdl2/portfile.cmake b/external_imported/vcpkg/ports/sdl2/portfile.cmake
index 1caf0224f..22685e6a1 100644
--- a/external_imported/vcpkg/ports/sdl2/portfile.cmake
+++ b/external_imported/vcpkg/ports/sdl2/portfile.cmake
@@ -2,10 +2,11 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libsdl-org/SDL
     REF "release-${VERSION}"
-    SHA512 b795810fdf18affd3a03f79354e8ac5525f1023b27cdf7858d463781c5977eea8b34e39c089f71c3ca2d23722af55a3910af79f70c021f40c6281ab1476e1818
+    SHA512 c7635a83a52f3970a372b804a8631f0a7e6b8d89aed1117bcc54a2040ad0928122175004cf2b42cf84a4fd0f86236f779229eaa63dfa6ca9c89517f999c5ff1c
     HEAD_REF main
     PATCHES
         deps.patch
+        alsa-dep-fix.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SDL_STATIC)
@@ -14,11 +15,15 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" FORCE_STATIC_VCRT)
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
+        alsa     SDL_ALSA
+        alsa     CMAKE_REQUIRE_FIND_PACKAGE_ALSA
+        ibus     SDL_IBUS
+        samplerate SDL_LIBSAMPLERATE
         vulkan   SDL_VULKAN
-        x11      SDL_X11
         wayland  SDL_WAYLAND
-        samplerate SDL_LIBSAMPLERATE
-        ibus     SDL_IBUS
+        x11      SDL_X11
+    INVERTED_FEATURES
+        alsa     CMAKE_DISABLE_FIND_PACKAGE_ALSA
 )
 
 if ("x11" IN_LIST FEATURES)
@@ -46,9 +51,11 @@ vcpkg_cmake_configure(
         -DSDL_TEST=OFF
         -DSDL_INSTALL_CMAKEDIR="cmake"
         -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
+        -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=ON
         -DSDL_LIBSAMPLERATE_SHARED=OFF
     MAYBE_UNUSED_VARIABLES
         SDL_FORCE_STATIC_VCRT
+        PKG_CONFIG_USE_CMAKE_PREFIX_PATH
 )
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/sdl2/vcpkg.json b/external_imported/vcpkg/ports/sdl2/vcpkg.json
index 0f084442f..1f4603754 100644
--- a/external_imported/vcpkg/ports/sdl2/vcpkg.json
+++ b/external_imported/vcpkg/ports/sdl2/vcpkg.json
@@ -1,10 +1,15 @@
 {
   "name": "sdl2",
-  "version": "2.26.4",
+  "version": "2.30.0",
   "description": "Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.",
   "homepage": "https://www.libsdl.org/download-2.0.php",
   "license": "Zlib",
   "dependencies": [
+    {
+      "name": "dbus",
+      "default-features": false,
+      "platform": "linux"
+    },
     {
       "name": "vcpkg-cmake",
       "host": true
@@ -15,20 +20,25 @@
     }
   ],
   "default-features": [
-    "base"
+    {
+      "name": "ibus",
+      "platform": "linux"
+    },
+    {
+      "name": "wayland",
+      "platform": "linux"
+    },
+    {
+      "name": "x11",
+      "platform": "linux"
+    }
   ],
   "features": {
-    "base": {
-      "description": "Base functionality for SDL",
+    "alsa": {
+      "description": "Support for alsa audio",
       "dependencies": [
         {
-          "name": "sdl2",
-          "default-features": false,
-          "features": [
-            "ibus",
-            "wayland",
-            "x11"
-          ],
+          "name": "alsa",
           "platform": "linux"
         }
       ]
diff --git a/external_imported/vcpkg/ports/sdl2pp/vcpkg.json b/external_imported/vcpkg/ports/sdl2pp/vcpkg.json
index fd8683d9b..cca338e87 100644
--- a/external_imported/vcpkg/ports/sdl2pp/vcpkg.json
+++ b/external_imported/vcpkg/ports/sdl2pp/vcpkg.json
@@ -1,12 +1,15 @@
 {
   "name": "sdl2pp",
   "version": "0.16.1",
-  "port-version": 7,
+  "port-version": 8,
   "description": "C++11 bindings/wrapper for SDL2",
   "homepage": "https://sdl2pp.amdmi3.ru",
   "license": "Zlib",
   "dependencies": [
-    "sdl2",
+    {
+      "name": "sdl2",
+      "default-features": false
+    },
     "sdl2-image",
     "sdl2-mixer",
     "sdl2-ttf",
diff --git a/external_imported/vcpkg/ports/seacas/deps-and-shared.patch b/external_imported/vcpkg/ports/seacas/deps-and-shared.patch
index 32eb1c047..eff08367e 100644
--- a/external_imported/vcpkg/ports/seacas/deps-and-shared.patch
+++ b/external_imported/vcpkg/ports/seacas/deps-and-shared.patch
@@ -101,7 +101,7 @@ diff --git a/cmake/tribits/common_tpls/FindTPLCGNS.cmake b/cmake/tribits/common_
 index 37c329cd4..9d221f64f 100644
 --- a/cmake/tribits/common_tpls/FindTPLCGNS.cmake
 +++ b/cmake/tribits/common_tpls/FindTPLCGNS.cmake
-@@ -45,12 +45,12 @@ if ((CGNS_ALLOW_MODERN AND HDF5_FOUND_MODERN_CONFIG_FILE) OR CGNS_FORCE_MODERN)
+@@ -45,14 +45,14 @@ if ((CGNS_ALLOW_MODERN AND HDF5_FOUND_MODERN_CONFIG_FILE) OR CGNS_FORCE_MODERN)
    print_var(CGNS_ALLOW_MODERN)
    print_var(CGNS_FORCE_MODERN)
    message("-- Using find_package(CGNS ${minimum_modern_CGNS_version} CONFIG) ...")
@@ -113,11 +113,12 @@ index 37c329cd4..9d221f64f 100644
      tribits_extpkg_create_imported_all_libs_target_and_config_file(
        CGNS
 -      INNER_FIND_PACKAGE_NAME  CGNS
-+      INNER_FIND_PACKAGE_NAME  cgns
 -      IMPORTED_TARGETS_FOR_ALL_LIBS   CGNS::cgns)
++      INNER_FIND_PACKAGE_NAME  cgns
 +      IMPORTED_TARGETS_FOR_ALL_LIBS   CGNS::CGNS)
      set(TPL_CGNS_NOT_FOUND FALSE)
    endif()
+ 
 diff --git a/cmake/tribits/common_tpls/FindTPLHDF5.cmake b/cmake/tribits/common_tpls/FindTPLHDF5.cmake
 index 716068c28..3d8fc8e76 100644
 --- a/cmake/tribits/common_tpls/FindTPLHDF5.cmake
@@ -134,8 +135,7 @@ index 716068c28..3d8fc8e76 100644
 @@ -17,7 +17,7 @@ if (Netcdf_ALLOW_MODERN)
      tribits_extpkg_create_imported_all_libs_target_and_config_file(
        HDF5
--      INNER_FIND_PACKAGE_NAME  HDF5
-+      INNER_FIND_PACKAGE_NAME  HDF5
+       INNER_FIND_PACKAGE_NAME  HDF5
 -      IMPORTED_TARGETS_FOR_ALL_LIBS   ${HDF5_EXPORT_LIBRARIES})
 +      IMPORTED_TARGETS_FOR_ALL_LIBS  hdf5::hdf5)
      set(HDF5_INTERNAL_IS_MODERN TRUE)
@@ -181,10 +181,6 @@ index c2c98f4be..9626cdb92 100644
                           PATH_SUFFIXES ${cgns_lib_suffixes})
  
          endif()
-diff --git a/cmake/tribits/common_tpls/find_modules/FindHDF5.cmake b/cmake/tribits/common_tpls/find_modules/FindHDF5-donotuse.cmake
-similarity index 100%
-rename from cmake/tribits/common_tpls/find_modules/FindHDF5.cmake
-rename to cmake/tribits/common_tpls/find_modules/FindHDF5-donotuse.cmake
 diff --git a/packages/seacas/libraries/aprepro_lib/CMakeLists.txt b/packages/seacas/libraries/aprepro_lib/CMakeLists.txt
 index ef391f1c6..a4869415b 100644
 --- a/packages/seacas/libraries/aprepro_lib/CMakeLists.txt
@@ -217,44 +213,44 @@ diff --git a/packages/seacas/libraries/exodus/CMakeLists.txt b/packages/seacas/l
 index 2ed3ec4ab..f80f697f1 100644
 --- a/packages/seacas/libraries/exodus/CMakeLists.txt
 +++ b/packages/seacas/libraries/exodus/CMakeLists.txt
-@@ -1,5 +1,5 @@
- TRIBITS_SUBPACKAGE(Exodus)
--
-+set(EXODUSII_BUILD_SHARED_LIBS "${BUILD_SHARED_LIBS}" CACHE BOOL "")
- if (SEACASExodus_ENABLE_STATIC)
- INCLUDE(InstallSymLink)
- endif()
-@@ -46,6 +46,8 @@ if (SEACASExodus_ENABLE_SHARED)
-       set_property(TARGET exodus_shared PROPERTY C_STANDARD 99)
-       set_target_properties(exodus_shared PROPERTIES OUTPUT_NAME exodus)
-       INSTALL(TARGETS exodus_shared DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
-+      target_compile_definitions(exodus_shared PRIVATE exoIIc_EXPORTS)
-+      target_compile_definitions(exodus PRIVATE exoIIc_EXPORTS)
-    endif()
+@@ -13,6 +13,7 @@ FILE(GLOB SOURCES src/ex_*.c)
+ if (NOT ${PACKAGE_NAME}_HIDE_DEPRECATED_CODE)
+   FILE(GLOB DEP_SOURCES src/deprecated/ex_*.c)
  endif()
++set(EXODUSII_BUILD_SHARED_LIBS "${BUILD_SHARED_LIBS}")
+ TRIBITS_CONFIGURE_FILE(exodus_config.h)
+ 
+ if (NOT ${EXODUS_THREADSAFE})
+@@ -32,6 +33,9 @@ TRIBITS_ADD_LIBRARY(
+   HEADERS ${HEADERS}
+   SOURCES ${SOURCES} ${DEP_SOURCES}
+ )
++if(BUILD_SHARED_LIBS)
++  target_compile_definitions(exodus PRIVATE exoIIc_EXPORTS)
++endif()
+ 
+ set_property(TARGET exodus PROPERTY C_STANDARD 99)
  
 diff --git a/packages/seacas/libraries/exodus/cmake/exodus_config.h.in b/packages/seacas/libraries/exodus/cmake/exodus_config.h.in
 index e4dcd51f2..a88254ab7 100644
 --- a/packages/seacas/libraries/exodus/cmake/exodus_config.h.in
 +++ b/packages/seacas/libraries/exodus/cmake/exodus_config.h.in
-@@ -4,4 +4,19 @@
+@@ -4,4 +4,17 @@
  
  @SEACAS_DEPRECATED_DECLARATIONS@
  
 +#cmakedefine EXODUSII_BUILD_SHARED_LIBS
-+#if defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) ||                \
-+  defined(__MINGW32__) || defined(_WIN64) || defined(__MINGW64__)
-+#if defined(EXODUSII_BUILD_SHARED_LIBS)
++#if defined(_WIN32)
++# if defined(EXODUSII_BUILD_SHARED_LIBS)
 +#  if defined(exoIIc_EXPORTS)
 +#    define EXODUS_EXPORT __declspec( dllexport ) extern
 +#  else
 +#    define EXODUS_EXPORT __declspec( dllimport ) extern
 +#  endif
-+#endif
++# endif
 +#else
 +#  define EXODUS_EXPORT extern
 +#endif
-+
 +
  #endif
 diff --git a/packages/seacas/libraries/exodus/include/exodusII.h b/packages/seacas/libraries/exodus/include/exodusII.h
diff --git a/external_imported/vcpkg/ports/seacas/fix-fmt-10.patch b/external_imported/vcpkg/ports/seacas/fix-fmt-10.patch
new file mode 100644
index 000000000..e5623355d
--- /dev/null
+++ b/external_imported/vcpkg/ports/seacas/fix-fmt-10.patch
@@ -0,0 +1,28 @@
+From 5a576de57ee1664d845c83f552f2100cc9303a26 Mon Sep 17 00:00:00 2001
+From: Greg Sjaardema <gsjaardema@gmail.com>
+Date: Wed, 10 May 2023 15:28:53 -0600
+Subject: [PATCH] IOSS: Fix enum printing to work with fmt-10
+
+---
+ .../seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.C     | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.C b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.C
+index b6827aa177..59507085fc 100644
+--- a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.C
++++ b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.C
+@@ -1,4 +1,4 @@
+-// Copyright(C) 1999-2020, 2022 National Technology & Engineering Solutions
++// Copyright(C) 1999-2020, 2022, 2023 National Technology & Engineering Solutions
+ // of Sandia, LLC (NTESS).  Under the terms of Contract DE-NA0003525 with
+ // NTESS, the U.S. Government retains certain rights in this software.
+ //
+@@ -802,7 +802,7 @@ namespace Iotm {
+           std::ostringstream errmsg;
+           fmt::print(errmsg,
+                      "Error: Failed to find entity of type {} with name {} for Assembly {}.\n",
+-                     type, members[j], assem->name());
++                     Ioss::Utils::entity_type_to_string(type), members[j], assem->name());
+           IOSS_ERROR(errmsg);
+         }
+       }
diff --git a/external_imported/vcpkg/ports/seacas/portfile.cmake b/external_imported/vcpkg/ports/seacas/portfile.cmake
index a9ed902f7..a2b622aa4 100644
--- a/external_imported/vcpkg/ports/seacas/portfile.cmake
+++ b/external_imported/vcpkg/ports/seacas/portfile.cmake
@@ -9,17 +9,22 @@ vcpkg_from_github(
             deps-and-shared.patch
             fix-mpi.patch
             fix-headers.patch
+            fix-fmt-10.patch
 )
+file(REMOVE "${SOURCE_PATH}/cmake/tribits/common_tpls/find_modules/FindHDF5.cmake")
 
-if(NOT VCPKG_TARGET_IS_OSX)
-    set(MPI_FEATURES mpi TPL_ENABLE_ParMETIS)
+if(HDF5_WITH_PARALLEL AND NOT "mpi" IN_LIST FEATURES)
+    message(WARNING "${HDF5_WITH_PARALLEL} Enabling MPI in seacas.")
+    list(APPEND FEATURES "mpi")
+elseif(NOT VCPKG_TARGET_IS_OSX)
+    set(PARMETIS_FEATURES mpi TPL_ENABLE_ParMETIS)
 endif()
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
         mpi     TPL_ENABLE_MPI
         # mpi     TPL_ENABLE_Pnetcdf # missing Pnetcdf port
-        ${MPI_FEATURES}
+        ${PARMETIS_FEATURES}
 )
 
 if(VCPKG_TARGET_IS_WINDOWS)
diff --git a/external_imported/vcpkg/ports/seacas/vcpkg.json b/external_imported/vcpkg/ports/seacas/vcpkg.json
index 40976631b..d18427453 100644
--- a/external_imported/vcpkg/ports/seacas/vcpkg.json
+++ b/external_imported/vcpkg/ports/seacas/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "seacas",
   "version-date": "2022-11-22",
-  "port-version": 2,
+  "port-version": 5,
   "description": "The Sandia Engineering Analysis Code Access System (SEACAS) is a suite of preprocessing, postprocessing, translation, and utility applications supporting finite element analysis software using the Exodus database file format.",
   "homepage": "https://github.com/sandialabs/seacas",
   "license": null,
diff --git a/external_imported/vcpkg/ports/seal/portfile.cmake b/external_imported/vcpkg/ports/seal/portfile.cmake
index ae3684625..b0832165f 100644
--- a/external_imported/vcpkg/ports/seal/portfile.cmake
+++ b/external_imported/vcpkg/ports/seal/portfile.cmake
@@ -1,10 +1,12 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+if(VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO microsoft/SEAL
-    REF 206648d0e4634e5c61dcf9370676630268290b59  #v4.1.1
-    SHA512 8aa2dd06766bbc482c0e10d1c8a8379b3cd9bdc08ed93ae24f5c996ff2417f2df228e576309c521e2bd2c452d50014376f8183d2272c3af74bcc6f292ae7408b
+    REF "v${VERSION}"
+    SHA512 717393b2428cd0b88a0cf75dbee6abfc92a89935664b7606dd18c17fa573c8053f24e08d530f2d63a3730e7737c0f2ca91d0002bc02a1cfecd19cf1521312823
     HEAD_REF main
     PATCHES
         shared-zstd.patch
@@ -28,23 +30,23 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    DISABLE_PARALLEL_CONFIGURE
     OPTIONS
-        "-DSEAL_BUILD_DEPS=OFF"
-        "-DSEAL_BUILD_EXAMPLES=OFF"
-        "-DSEAL_BUILD_TESTS=OFF"
-        "-DSEAL_BUILD_SEAL_C=OFF"
+        -DSEAL_BUILD_DEPS=OFF
+        -DSEAL_BUILD_EXAMPLES=OFF
+        -DSEAL_BUILD_TESTS=OFF
+        -DSEAL_BUILD_SEAL_C=OFF
         ${FEATURE_OPTIONS}
 )
 
 vcpkg_cmake_install()
 
-vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/SEAL-4.1")
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SEAL-4.1)
 
-vcpkg_fixup_pkgconfig()
+# provides pkgconfig files only on UNIX
+if(NOT VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_fixup_pkgconfig()
+endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright")
-
-vcpkg_copy_pdbs()
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/seal/vcpkg.json b/external_imported/vcpkg/ports/seal/vcpkg.json
index b098b246e..95a855627 100644
--- a/external_imported/vcpkg/ports/seal/vcpkg.json
+++ b/external_imported/vcpkg/ports/seal/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "seal",
   "version": "4.1.1",
+  "port-version": 1,
   "description": "Microsoft SEAL is an easy-to-use and powerful homomorphic encryption library.",
   "homepage": "https://github.com/microsoft/SEAL",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/seasocks/portfile.cmake b/external_imported/vcpkg/ports/seasocks/portfile.cmake
new file mode 100644
index 000000000..ec045609d
--- /dev/null
+++ b/external_imported/vcpkg/ports/seasocks/portfile.cmake
@@ -0,0 +1,40 @@
+if(VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO mattgodbolt/seasocks
+    REF "v${VERSION}"
+    SHA512 18e596a09a825efd2421eee3b0d5ea389c0056c4b01c8b2078841d03863318e3f3ad59f6fd47fbe90409989c1fe05599f29b34a397427d282124e867371733ed
+    HEAD_REF master
+)
+
+vcpkg_find_acquire_program(PYTHON3)
+get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
+vcpkg_add_to_path("${PYTHON3_DIR}")
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        zlib DEFLATE_SUPPORT
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DUNITTESTS=OFF
+        -DSEASOCKS_EXAMPLE_APP=OFF
+        ${FEATURE_OPTIONS}
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/Seasocks")
+
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/licenses")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/seasocks/vcpkg.json b/external_imported/vcpkg/ports/seasocks/vcpkg.json
new file mode 100644
index 000000000..52133d8e4
--- /dev/null
+++ b/external_imported/vcpkg/ports/seasocks/vcpkg.json
@@ -0,0 +1,29 @@
+{
+  "name": "seasocks",
+  "version": "1.4.6",
+  "description": "Simple, small, C++ embeddable webserver with WebSockets support",
+  "homepage": "https://github.com/mattgodbolt/seasocks",
+  "license": "BSD-2-Clause",
+  "supports": "!osx & !android",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
+  "default-features": [
+    "zlib"
+  ],
+  "features": {
+    "zlib": {
+      "description": "Build with Deflate support via zlib",
+      "dependencies": [
+        "zlib"
+      ]
+    }
+  }
+}
diff --git a/external_imported/vcpkg/ports/sentencepiece/portfile.cmake b/external_imported/vcpkg/ports/sentencepiece/portfile.cmake
index 7d6ab61de..e8e97eb39 100644
--- a/external_imported/vcpkg/ports/sentencepiece/portfile.cmake
+++ b/external_imported/vcpkg/ports/sentencepiece/portfile.cmake
@@ -5,8 +5,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/sentencepiece
-    REF 58f256cf6f01bb86e6fa634a5cc560de5bd1667d #v0.1.97
-    SHA512 9abe21f76aa025d35a0210bc1a5b0c6f2bb2ab9f626ef9d59bcd8950442036af048ca3945db311d80ff378d41f984a941f39c206e2aa006f1ca0278426d03932
+    REF "v${VERSION}"
+    SHA512 31dc4dc3f2ff4a7effc1ed2d6ad219bcd5d28c0bac89fdeae0336f23e93f954c597313788529e692a0d694d5fa7c3c285a485dfb84a96921efc4b49bcd465358
     HEAD_REF master
 )
 
@@ -14,19 +14,17 @@ vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DSPM_ENABLE_SHARED=OFF
+        -DSPM_USE_BUILTIN_PROTOBUF=ON
+        -DSPM_USE_EXTERNAL_ABSL=OFF
 )
 
 vcpkg_cmake_install()
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin")
-if(NOT VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_BUILD_TYPE)
-    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/sentencepiece.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/sentencepieced.lib")
-    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/sentencepiece_train.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/sentencepiece_traind.lib")
-endif()
 
-configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+
+vcpkg_copy_tools(TOOL_NAMES spm_decode spm_encode spm_export_vocab spm_normalize spm_train AUTO_CLEAN)
 
 vcpkg_copy_pdbs()
 
diff --git a/external_imported/vcpkg/ports/sentencepiece/vcpkg.json b/external_imported/vcpkg/ports/sentencepiece/vcpkg.json
index ff67cb31f..d6d3b80ac 100644
--- a/external_imported/vcpkg/ports/sentencepiece/vcpkg.json
+++ b/external_imported/vcpkg/ports/sentencepiece/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "sentencepiece",
-  "version": "0.1.97",
-  "port-version": 2,
+  "version": "0.1.99",
+  "port-version": 1,
   "description": "SentencePiece is an unsupervised text tokenizer and detokenizer mainly for Neural Network-based text generation systems where the vocabulary size is predetermined prior to the neural model training",
   "license": "Apache-2.0",
-  "supports": "!((windows | uwp) & !static)",
+  "supports": "static",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/sentry-native/fix-config-cmake.patch b/external_imported/vcpkg/ports/sentry-native/fix-config-cmake.patch
index 34aa2405e..4b4fd1a1c 100644
--- a/external_imported/vcpkg/ports/sentry-native/fix-config-cmake.patch
+++ b/external_imported/vcpkg/ports/sentry-native/fix-config-cmake.patch
@@ -1,59 +1,43 @@
-diff --git a/external/crashpad/crashpad-config.cmake.in b/external/crashpad/crashpad-config.cmake.in
-index 846797d..d7c4ae6 100644
---- a/external/crashpad/crashpad-config.cmake.in
-+++ b/external/crashpad/crashpad-config.cmake.in
-@@ -1,6 +1,9 @@
- include("${CMAKE_CURRENT_LIST_DIR}/crashpad-targets.cmake")
-
- if(@CRASHPAD_ZLIB_SYSTEM@)
-+    include(CMakeFindDependencyMacro)
-+    find_dependency(ZLIB)
-+elseif(0)
-     find_package(ZLIB REQUIRED)
-     target_include_directories(crashpad::zlib INTERFACE ${ZLIB_INCLUDE_DIRS})
-     target_compile_definitions(crashpad::zlib INTERFACE ${ZLIB_COMPILE_DEFINITIONS})
-diff --git a/external/crashpad/third_party/zlib/CMakeLists.txt b/external/crashpad/third_party/zlib/CMakeLists.txt
-index eeb449f..59a6ff1 100644
---- a/external/crashpad/third_party/zlib/CMakeLists.txt
-+++ b/external/crashpad/third_party/zlib/CMakeLists.txt
-@@ -1,11 +1,10 @@
- if(CRASHPAD_ZLIB_SYSTEM)
-     add_library(crashpad_zlib INTERFACE)
-     target_compile_definitions(crashpad_zlib INTERFACE
-         ZLIB_CONST
-         CRASHPAD_ZLIB_SOURCE_SYSTEM
--        $<BUILD_INTERFACE:${ZLIB_COMPILE_DEFINITIONS}>
-     )
-     target_link_libraries(crashpad_zlib INTERFACE ZLIB::ZLIB)
- else()
-     add_library(crashpad_zlib STATIC
-         zlib/adler32.c
 diff --git a/sentry-config.cmake.in b/sentry-config.cmake.in
-index 89ea345..acbd5e2 100644
+index 70ce7d3..796d428 100644
 --- a/sentry-config.cmake.in
 +++ b/sentry-config.cmake.in
-@@ -3,9 +3,14 @@
- set(SENTRY_BACKEND @SENTRY_BACKEND@)
- set(SENTRY_TRANSPORT @SENTRY_TRANSPORT@)
+@@ -1,5 +1,7 @@
+ @PACKAGE_INIT@
 
 +include(CMakeFindDependencyMacro)
-+if("@SENTRY_LINK_PTHREAD@")
-+	find_dependency(Threads)
-+endif()
 +
- if(SENTRY_BACKEND STREQUAL "crashpad")
- 	if(@SENTRY_CRASHPAD_SYSTEM@)
--		find_package(crashpad REQUIRED)
-+		find_dependency(crashpad)
- 	else()
- 		include("${CMAKE_CURRENT_LIST_DIR}/sentry_crashpad-targets.cmake")
+ set(SENTRY_BACKEND @SENTRY_BACKEND@)
+ set(SENTRY_TRANSPORT @SENTRY_TRANSPORT@)
+ set(SENTRY_BUILD_SHARED_LIBS @SENTRY_BUILD_SHARED_LIBS@)
+@@ -8,14 +10,14 @@ set(SENTRY_LINK_PTHREAD @SENTRY_LINK_PTHREAD@)
+ if(SENTRY_BACKEND STREQUAL "crashpad" AND NOT SENTRY_BUILD_SHARED_LIBS)
+ 	include("${CMAKE_CURRENT_LIST_DIR}/sentry_crashpad-targets.cmake")
+ 	if(NOT MSVC AND NOT SENTRY_BUILD_SHARED_LIBS)
+-		find_package(ZLIB REQUIRED)
++		find_dependency(ZLIB)
  	endif()
-@@ -14,7 +19,5 @@ endif()
+ endif()
+
+ if(SENTRY_BACKEND STREQUAL "breakpad" AND NOT SENTRY_BUILD_SHARED_LIBS)
+ 	set(SENTRY_BREAKPAD_SYSTEM @SENTRY_BREAKPAD_SYSTEM@)
+ 	if(SENTRY_BREAKPAD_SYSTEM)
+-		find_package(PkgConfig REQUIRED)
++		find_dependency(PkgConfig)
+ 		pkg_check_modules(BREAKPAD REQUIRED IMPORTED_TARGET breakpad-client)
+ 	endif()
+ endif()
+@@ -23,11 +25,9 @@ endif()
  include("${CMAKE_CURRENT_LIST_DIR}/sentry-targets.cmake")
 
- if(SENTRY_TRANSPORT STREQUAL "curl" AND NOT @BUILD_SHARED_LIBS@)
+ if(SENTRY_TRANSPORT STREQUAL "curl" AND (NOT @BUILD_SHARED_LIBS@ OR NOT SENTRY_BUILD_SHARED_LIBS))
 -	find_package(CURL REQUIRED)
 -	set_property(TARGET sentry::sentry APPEND
 -		PROPERTY INTERFACE_LINK_LIBRARIES ${CURL_LIBRARIES})
 +	find_dependency(CURL)
  endif()
+
+ if(SENTRY_LINK_PTHREAD AND NOT SENTRY_BUILD_SHARED_LIBS)
+-	find_package(Threads REQUIRED)
++	find_dependency(Threads)
+ endif()
diff --git a/external_imported/vcpkg/ports/sentry-native/fix-warningC5105.patch b/external_imported/vcpkg/ports/sentry-native/fix-warningC5105.patch
deleted file mode 100644
index 52f0dc705..000000000
--- a/external_imported/vcpkg/ports/sentry-native/fix-warningC5105.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/external/crashpad/third_party/zlib/zlib/x86.c b/external/crashpad/third_party/zlib/zlib/x86.c
-index e56fe8b..902e373 100644
---- a/external/crashpad/third_party/zlib/zlib/x86.c
-+++ b/external/crashpad/third_party/zlib/zlib/x86.c
-@@ -8,6 +8,7 @@
-  * For conditions of distribution and use, see copyright notice in zlib.h
-  */
- 
-+#pragma warning(disable : 5105)
- #include "x86.h"
- #include "zutil.h"
- 
diff --git a/external_imported/vcpkg/ports/sentry-native/portfile.cmake b/external_imported/vcpkg/ports/sentry-native/portfile.cmake
index ccfd99e6d..3404f89d5 100644
--- a/external_imported/vcpkg/ports/sentry-native/portfile.cmake
+++ b/external_imported/vcpkg/ports/sentry-native/portfile.cmake
@@ -1,7 +1,7 @@
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/getsentry/sentry-native/releases/download/0.6.0/sentry-native.zip"
-    FILENAME "sentry-native-0.6.0.zip"
-    SHA512 e41d3661679ba7ba1cc58059ce86f6fb1a93fb580d2f8e77d6f2a09988fe62f18f3636e13e324a643f736aa891aa2312100740ace043c2e542d4e6b546b61014
+    URLS "https://github.com/getsentry/sentry-native/releases/download/${VERSION}/sentry-native.zip"
+    FILENAME "sentry-native-${VERSION}.zip"
+    SHA512 745e2a4590df5412ab62ec6bb32efa7674423d4f0466f4ead9d327d6b0f9308ee8ae328b4beac00b31b34cf88d1dc0a102e81363b4a4a0395e98fcb0758c0551
 )
 
 vcpkg_extract_source_archive(
@@ -9,7 +9,6 @@ vcpkg_extract_source_archive(
     ARCHIVE "${ARCHIVE}"
     NO_REMOVE_ONE_LEVEL
     PATCHES
-        fix-warningC5105.patch
         fix-config-cmake.patch
 )
 file(REMOVE_RECURSE "${SOURCE_PATH}/external/crashpad/third_party/zlib/zlib")
diff --git a/external_imported/vcpkg/ports/sentry-native/vcpkg.json b/external_imported/vcpkg/ports/sentry-native/vcpkg.json
index b68dbb9cc..ab0ef2abd 100644
--- a/external_imported/vcpkg/ports/sentry-native/vcpkg.json
+++ b/external_imported/vcpkg/ports/sentry-native/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "sentry-native",
-  "version": "0.6.0",
+  "version": "0.7.0",
+  "port-version": 1,
   "description": "Sentry SDK for C, C++ and native applications.",
   "homepage": "https://sentry.io/",
   "license": "MIT",
-  "supports": "osx | (!arm & !uwp)",
+  "supports": "osx | linux | (!arm & !uwp)",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
@@ -27,6 +28,12 @@
         "Cf. https://github.com/getsentry/sentry-native#compile-time-options"
       ],
       "dependencies": [
+        {
+          "$comment": "pkgcong is used by the breakpad backend.",
+          "name": "pkgconf",
+          "host": true,
+          "platform": "!android & !ios"
+        },
         {
           "$comment": "zlib is used by the crashpad backend.",
           "name": "zlib",
diff --git a/external_imported/vcpkg/ports/septag-sx/vcpkg.json b/external_imported/vcpkg/ports/septag-sx/vcpkg.json
index 016f5fea6..756100f37 100644
--- a/external_imported/vcpkg/ports/septag-sx/vcpkg.json
+++ b/external_imported/vcpkg/ports/septag-sx/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "septag-sx",
-  "version-string": "2019-05-07",
-  "port-version": 4,
+  "version-date": "2019-05-07",
+  "port-version": 5,
   "description": "Portable base library for C programmers, designed for performance and simplicity.",
   "supports": "!(uwp | arm)",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/seqan/portfile.cmake b/external_imported/vcpkg/ports/seqan/portfile.cmake
index b343b82c4..c265da680 100644
--- a/external_imported/vcpkg/ports/seqan/portfile.cmake
+++ b/external_imported/vcpkg/ports/seqan/portfile.cmake
@@ -4,8 +4,8 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 9a1b4fe9dff9ad49a8761798a6a6eaeebce683ccb5e2dd78ea4b8829093918606830a16ea458d67bf3f652531ddc55b550c12cb257be913bb187c8940d96a575
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE ${ARCHIVE}
 )
 
diff --git a/external_imported/vcpkg/ports/seqan/vcpkg.json b/external_imported/vcpkg/ports/seqan/vcpkg.json
index e49b11d09..bc89f206c 100644
--- a/external_imported/vcpkg/ports/seqan/vcpkg.json
+++ b/external_imported/vcpkg/ports/seqan/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "seqan",
-  "version-string": "2.4.0",
-  "port-version": 2,
+  "version": "2.4.0",
+  "port-version": 3,
   "description": "SeqAn is an open source C++ library of efficient algorithms and data structures for the analysis of sequences with the focus on biological data."
 }
diff --git a/external_imported/vcpkg/ports/serd/vcpkg.json b/external_imported/vcpkg/ports/serd/vcpkg.json
index ae85876fd..f9b12dcba 100644
--- a/external_imported/vcpkg/ports/serd/vcpkg.json
+++ b/external_imported/vcpkg/ports/serd/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "serd",
-  "version-string": "0.30.4",
-  "port-version": 1,
+  "version": "0.30.4",
+  "port-version": 2,
   "description": "Serd is a lightweight C library for RDF syntax which supports reading and writing Turtle, TRiG, NTriples, and NQuads.",
   "homepage": "https://drobilla.net/software/serd",
   "license": "ISC",
diff --git a/external_imported/vcpkg/ports/sf2cute/vcpkg.json b/external_imported/vcpkg/ports/sf2cute/vcpkg.json
index 66679aef8..81e1e3da9 100644
--- a/external_imported/vcpkg/ports/sf2cute/vcpkg.json
+++ b/external_imported/vcpkg/ports/sf2cute/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "sf2cute",
-  "version-string": "0.2.0",
-  "port-version": 3,
+  "version": "0.2.0",
+  "port-version": 4,
   "description": "C++14 Library for SoundFont 2",
   "dependencies": [
     {
diff --git a/external_imported/vcpkg/ports/sfml/arm64.patch b/external_imported/vcpkg/ports/sfml/arm64.patch
deleted file mode 100644
index 7faefc0e6..000000000
--- a/external_imported/vcpkg/ports/sfml/arm64.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 67b61712ec..73711753ae 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -253,10 +253,12 @@ if(SFML_OS_MACOSX)
-         endif()
-     endif()
- 
--    # only the default architecture (i.e. 64-bit) is supported
--    if(NOT CMAKE_OSX_ARCHITECTURES STREQUAL "x86_64")
--        message(FATAL_ERROR "Only 64-bit architecture is supported")
--    endif()
-+    # only the default x86_64 or arm64 are supported
-+    foreach (arch IN LISTS CMAKE_OSX_ARCHITECTURES)
-+        if (NOT (arch STREQUAL "x86_64" OR arch STREQUAL "arm64"))
-+            message(FATAL_ERROR "Invalid arch ${arch}")
-+        endif()
-+    endforeach()
- 
-     # configure Xcode templates
-     set(XCODE_TEMPLATES_ARCH "\$(NATIVE_ARCH_ACTUAL)")
diff --git a/external_imported/vcpkg/ports/sfml/fix-dependencies.patch b/external_imported/vcpkg/ports/sfml/fix-dependencies.patch
index cea4ebff7..eb3a8dc68 100644
--- a/external_imported/vcpkg/ports/sfml/fix-dependencies.patch
+++ b/external_imported/vcpkg/ports/sfml/fix-dependencies.patch
@@ -1,5 +1,5 @@
 diff --git a/cmake/SFMLConfig.cmake.in b/cmake/SFMLConfig.cmake.in
-index ce81953..bd2d330 100644
+index 30194c5f..40b72309 100644
 --- a/cmake/SFMLConfig.cmake.in
 +++ b/cmake/SFMLConfig.cmake.in
 @@ -1,3 +1,8 @@
@@ -12,10 +12,22 @@ index ce81953..bd2d330 100644
  # ------------------------------------
  #
 diff --git a/cmake/SFMLConfigDependencies.cmake.in b/cmake/SFMLConfigDependencies.cmake.in
-index 1028110..927d1a4 100644
+index 0737ec5d..05bf9a8f 100644
 --- a/cmake/SFMLConfigDependencies.cmake.in
 +++ b/cmake/SFMLConfigDependencies.cmake.in
-@@ -56,6 +56,9 @@ if(SFML_STATIC_LIBRARIES)
+@@ -35,9 +35,11 @@ if(SFML_STATIC_LIBRARIES)
+         endif()
+ 
+         # No lookup in environment variables (PATH on Windows), as they may contain wrong library versions
++        if(NOT ${THIS_FRIENDLY_NAME}_LIB)
+         find_library(${THIS_FRIENDLY_NAME}_LIB NAMES ${THIS_SEARCH_NAMES}
+                      PATHS ${FIND_SFML_PATHS} PATH_SUFFIXES lib NO_SYSTEM_ENVIRONMENT_PATH)
+         mark_as_advanced(${THIS_FRIENDLY_NAME}_LIB)
++        endif()
+         if(${THIS_FRIENDLY_NAME}_LIB)
+             set_property(TARGET ${THIS_TARGET} APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${${THIS_FRIENDLY_NAME}_LIB}")
+         else()
+@@ -64,6 +66,9 @@ if(SFML_STATIC_LIBRARIES)
          if (FIND_SFML_OS_WINDOWS)
              set_property(TARGET OpenGL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "OpenGL32")
          elseif(NOT FIND_SFML_OS_IOS)
@@ -25,7 +37,7 @@ index 1028110..927d1a4 100644
              sfml_bind_dependency(TARGET OpenGL FRIENDLY_NAME "OpenGL" SEARCH_NAMES "OpenGL" "GL")
          endif()
      endif()
-@@ -63,6 +66,8 @@ if(SFML_STATIC_LIBRARIES)
+@@ -71,6 +76,8 @@ if(SFML_STATIC_LIBRARIES)
      # sfml-graphics
      list(FIND SFML_FIND_COMPONENTS "graphics" FIND_SFML_GRAPHICS_COMPONENT_INDEX)
      if(FIND_SFML_GRAPHICS_COMPONENT_INDEX GREATER -1)
@@ -35,21 +47,21 @@ index 1028110..927d1a4 100644
      endif()
  
 diff --git a/src/SFML/Graphics/CMakeLists.txt b/src/SFML/Graphics/CMakeLists.txt
-index 883c758..402efbe 100644
+index a939a988..259835f7 100644
 --- a/src/SFML/Graphics/CMakeLists.txt
 +++ b/src/SFML/Graphics/CMakeLists.txt
-@@ -97,7 +97,8 @@ sfml_add_library(sfml-graphics
+@@ -93,7 +93,8 @@ sfml_add_library(sfml-graphics
  target_link_libraries(sfml-graphics PUBLIC sfml-window)
  
  # stb_image sources
--target_include_directories(sfml-graphics PRIVATE "${PROJECT_SOURCE_DIR}/extlibs/headers/stb_image")
+-target_include_directories(sfml-graphics SYSTEM PRIVATE "${PROJECT_SOURCE_DIR}/extlibs/headers/stb_image")
 +find_path(STB_INCLUDE_DIR stb_image.h REQUIRED)
 +target_include_directories(sfml-graphics PRIVATE "${STB_INCLUDE_DIR}")
  
- # let CMake know about our additional graphics libraries paths
- if(SFML_OS_WINDOWS)
-@@ -134,7 +134,8 @@ if(SFML_OS_ANDROID)
-     target_link_libraries(sfml-graphics PRIVATE z EGL GLESv1_CM)
+ # glad sources
+ target_include_directories(sfml-graphics SYSTEM PRIVATE "${PROJECT_SOURCE_DIR}/extlibs/headers/glad/include")
+@@ -123,7 +124,8 @@ if((SFML_COMPILER_MSVC AND SFML_MSVC_VERSION GREATER_EQUAL 14) OR (SFML_COMPILER
+     target_link_libraries(sfml-graphics PRIVATE legacy_stdio_definitions.lib)
  endif()
  
 -sfml_find_package(Freetype INCLUDE "FREETYPE_INCLUDE_DIRS" LINK "FREETYPE_LIBRARY")
@@ -59,14 +71,14 @@ index 883c758..402efbe 100644
  
  # add preprocessor symbols
 diff --git a/src/SFML/Window/CMakeLists.txt b/src/SFML/Window/CMakeLists.txt
-index 98ea439..0f1fb53 100644
+index d2bdd5aa..2a9937f1 100644
 --- a/src/SFML/Window/CMakeLists.txt
 +++ b/src/SFML/Window/CMakeLists.txt
-@@ -254,7 +254,9 @@ if(SFML_OPENGL_ES)
-         target_link_libraries(sfml-window PRIVATE EGL GLESv1_CM)
-     endif()
+@@ -325,7 +325,9 @@ elseif(SFML_OS_ANDROID)
+     target_link_libraries(sfml-window PRIVATE EGL)
+     target_link_libraries(sfml-window PRIVATE GLES)
  else()
--    sfml_find_package(OpenGL INCLUDE "OPENGL_INCLUDE_DIR" LINK "OPENGL_LIBRARIES")
+-    sfml_find_package(OpenGL INCLUDE "OPENGL_INCLUDE_DIR" LINK "OPENGL_gl_LIBRARY")
 +    set(EXPORT_OpenGL_GL_PREFERENCE "${OpenGL_GL_PREFERENCE}" CACHE INTERNAL "")
 +    set(OpenGL_LIB OpenGL::GL)
 +    sfml_find_package(OpenGL LINK OpenGL_LIB)
diff --git a/external_imported/vcpkg/ports/sfml/portfile.cmake b/external_imported/vcpkg/ports/sfml/portfile.cmake
index f3379806d..4a8c497fe 100644
--- a/external_imported/vcpkg/ports/sfml/portfile.cmake
+++ b/external_imported/vcpkg/ports/sfml/portfile.cmake
@@ -1,18 +1,17 @@
 vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH
     REPO SFML/SFML
-    REF 2.5.1
+    REF "${VERSION}"
     HEAD_REF master
-    SHA512 7aed2fc29d1da98e6c4d598d5c86cf536cb4eb5c2079cdc23bb8e502288833c052579dadbe0ce13ad6461792d959bf6d9660229f54c54cf90a541c88c6b03d59
+    SHA512 b376d3b00277ed60d107fe1268c210749b3aafcee618a8f924b181a9b476e92b9cb9baddecf70a8913b5910c471d53ea0260a876ad7b2db2b98b944d9f508714
     PATCHES
         fix-dependencies.patch
-        arm64.patch
 )
 
 # The embedded FindFreetype doesn't properly handle debug libraries
 file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/Modules/FindFreetype.cmake")
 
 if(VCPKG_TARGET_IS_LINUX)
-    message(STATUS "SFML currently requires the following libraries from the system package manager:\n    libudev\n    libx11\n    libxrandr\n    opengl\n\nThese can be installed on Ubuntu systems via apt-get install libx11-dev libxrandr-dev libxi-dev libudev-dev libgl1-mesa-dev")
+    message(STATUS "SFML currently requires the following libraries from the system package manager:\n    libudev\n    libx11\n    libxrandr\n    libxcursor\n    opengl\n\nThese can be installed on Ubuntu systems via apt-get install libx11-dev libxrandr-dev libxcursor-dev libxi-dev libudev-dev libgl1-mesa-dev")
 endif()
 
 vcpkg_cmake_configure(
@@ -22,6 +21,7 @@ vcpkg_cmake_configure(
         -DSFML_USE_SYSTEM_DEPS=ON
         -DSFML_MISC_INSTALL_PREFIX=share/sfml
         -DSFML_GENERATE_PDB=OFF
+        -DSFML_WARNINGS_AS_ERRORS=OFF #Remove in the next version
 )
 
 vcpkg_cmake_install()
@@ -32,17 +32,19 @@ vcpkg_copy_pdbs()
 if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/sfml-main.lib")
     file(COPY "${CURRENT_PACKAGES_DIR}/lib/sfml-main.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/manual-link")
     file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/sfml-main.lib")
-    file(COPY "${CURRENT_PACKAGES_DIR}/debug/lib/sfml-main-d.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link")
-    file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/sfml-main-d.lib")
     file(GLOB FILES "${CURRENT_PACKAGES_DIR}/share/sfml/SFML*Targets-*.cmake")
     foreach(FILE ${FILES})
         vcpkg_replace_string("${FILE}" "/lib/sfml-main" "/lib/manual-link/sfml-main")
     endforeach()
 endif()
+if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/sfml-main-d.lib")
+    file(COPY "${CURRENT_PACKAGES_DIR}/debug/lib/sfml-main-d.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link")
+    file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/sfml-main-d.lib")
+endif()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
 
 vcpkg_fixup_pkgconfig()
 
-configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY)
-configure_file("${SOURCE_PATH}/license.md" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/license.md")
diff --git a/external_imported/vcpkg/ports/sfml/vcpkg.json b/external_imported/vcpkg/ports/sfml/vcpkg.json
index ba297ad70..3f17c0aac 100644
--- a/external_imported/vcpkg/ports/sfml/vcpkg.json
+++ b/external_imported/vcpkg/ports/sfml/vcpkg.json
@@ -1,9 +1,8 @@
 {
   "name": "sfml",
-  "version": "2.5.1",
-  "port-version": 14,
+  "version": "2.6.1",
   "description": "Simple and fast multimedia library",
-  "homepage": "https://github.com/sfml/sfml",
+  "homepage": "https://github.com/SFML/SFML",
   "license": "Zlib",
   "dependencies": [
     "freetype",
diff --git a/external_imported/vcpkg/ports/shader-slang/portfile.cmake b/external_imported/vcpkg/ports/shader-slang/portfile.cmake
index 256c1ebae..529eb2079 100644
--- a/external_imported/vcpkg/ports/shader-slang/portfile.cmake
+++ b/external_imported/vcpkg/ports/shader-slang/portfile.cmake
@@ -1,4 +1,3 @@
-vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
 vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 
 if (VCPKG_TARGET_IS_WINDOWS)
@@ -11,7 +10,7 @@ if (VCPKG_TARGET_IS_WINDOWS)
 			ARCHIVE
 			URLS "https://github.com/shader-slang/slang/releases/download/v${VERSION}/slang-${VERSION}-win64.zip"
 			FILENAME "slang-${VERSION}-win64.zip"
-			SHA512 a3f9f1a30468588fc5706eacd3a4c2dc41b014a949b34fe8a16dc1a9a2cb3e85edfcabb46473a3599fe9cd95a2ca8cbae5ab39fdf626e6b5b614a94be48e6d4d
+			SHA512 3b35447655e6223b481d402654d15eb5997535d5f0dda4ed3237fdce9709ab23619397faf3cd98170466be3735a4c624e0979d7cfc6839addb06503c629f9cee
 		)
 		set(SLANG_BIN_PATH "bin/windows-x64/release")
 	elseif (VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
@@ -19,7 +18,7 @@ if (VCPKG_TARGET_IS_WINDOWS)
 			ARCHIVE
 			URLS "https://github.com/shader-slang/slang/releases/download/v${VERSION}/slang-${VERSION}-win32.zip"
 			FILENAME "slang-${VERSION}-win32.zip"
-			SHA512 06012d3d7004f0565cda01b11fd7236e6828a8ea79ca93ad05e3e1a3e35571daf2cd6558e096dfd97c46c23ce74b802d71287e02eec5d7951c18e16c6c635da6
+			SHA512 e64c8c5a46c2288ea51a768c525cbd79990c76f8a239e21fb0bcfa896e06437165a10d7dba9812485d934292aac7c173a6e7233369d77711f03c5eed4f6fd47a
 		)
 		set(SLANG_BIN_PATH "bin/windows-x86/release")
 	else()
@@ -35,7 +34,7 @@ elseif (VCPKG_TARGET_IS_OSX)
 			ARCHIVE
 			URLS "https://github.com/shader-slang/slang/releases/download/v${VERSION}/slang-${VERSION}-macos-x64.zip"
 			FILENAME "slang-${VERSION}-macos-x64.zip"
-			SHA512 5914caa4ab9867fbceed6f0bb4f83f3b5400c05872baff40456460655efbdccb34b3590663f8ee80e953f3e584d0e729bc1da34ab8f80be33d1233ca4b043d71
+			SHA512 fbf6994dab9afe0a20853d2417b11f0d7436a6ca96c9124c0239fe421bf697f970c0f28b1e5c67aa36b3a0b5b8f7260214aa6587bcc95a1d55ffeac8446c46d4
 		)
 		set(SLANG_BIN_PATH "bin/macos-x64/release")
 	elseif (VCPKG_TARGET_ARCHITECTURE MATCHES "arm64")
@@ -43,7 +42,7 @@ elseif (VCPKG_TARGET_IS_OSX)
 			ARCHIVE
 			URLS "https://github.com/shader-slang/slang/releases/download/v${VERSION}/slang-${VERSION}-macos-aarch64.zip"
 			FILENAME "slang-${VERSION}-macos-aarch64.zip"
-			SHA512 9e792ba0dec87a892df566b48f4553691f20d48c74c7d111b93c6f55c83790a8857bd82c461746190d8507b4aef440aeadb267da9558692a6113cfda52d12c80
+			SHA512 87025c2bd3537b4730cfac9f2c954b92d696b7cf71595cebe1199cd94baa4f90d80678efa440e56767a3a4d52d993301ffd9d54f27dc547094b136793331baa5
 		)
 		set(SLANG_BIN_PATH "bin/macos-aarch64/release")
 	else()
@@ -59,7 +58,7 @@ elseif(VCPKG_TARGET_IS_LINUX)
 			ARCHIVE
 			URLS "https://github.com/shader-slang/slang/releases/download/v${VERSION}/slang-${VERSION}-linux-x86_64.tar.gz"
 			FILENAME "slang-${VERSION}-linux-x86_64.tar.gz"
-			SHA512 f6e3d49ddfdb79e0dc8183bd915ee4e2975428f1a6020498062cb54b0f078c86bcdc50d274c8ed22ba2f3ae823cb0b95d719a1067321fb0400c329f8c34149dd
+			SHA512 b6ac7a41dc3278974887ebb21b7abc6df75df0da77dc36e64e71f1740ff34a8724ddda3cdc04f4c14569c4085586f7ea50de0859799658c5c3bf59b93de98e5e
 		)
 		set(SLANG_BIN_PATH "bin/linux-x64/release")
 	else()
@@ -99,7 +98,7 @@ vcpkg_from_github(
 	OUT_SOURCE_PATH SOURCE_PATH
 	REPO shader-slang/slang
 	REF v${VERSION}
-	SHA512 ddb50eb59bebbb826844c4831f721bb40e28edb64d37d7463afb68cd27b653d7d8e1776000eaf70f4b5a882182ac06fa233dfe51167c2a3d170df89987da2cc2
+	SHA512 01bd7c75101371e7bee848c8ca78a88fe05215610958e2406f802f04bbbd36e013c8fa4ea9f0c11c06b64ce1e147e1dd1030469d676dcc9e1c65017e972c1c49
 	HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/shader-slang/vcpkg.json b/external_imported/vcpkg/ports/shader-slang/vcpkg.json
index d0d16ce8f..8f4a2be4a 100644
--- a/external_imported/vcpkg/ports/shader-slang/vcpkg.json
+++ b/external_imported/vcpkg/ports/shader-slang/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "shader-slang",
-  "version": "0.24.43",
-  "port-version": 1,
+  "version": "2023.5.1",
   "description": "Slang is a shading language that makes it easier to build and maintain large shader codebases in a modular and extensible fashion, while also maintaining the highest possible performance on modern GPUs and graphics APIs. Slang is based on years of collaboration between researchers at NVIDIA, Carnegie Mellon University, and Stanford.",
   "homepage": "https://github.com/shader-slang/slang",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/shaderc/build-version.inc b/external_imported/vcpkg/ports/shaderc/build-version.inc
index d5b1449e2..7c3207627 100644
--- a/external_imported/vcpkg/ports/shaderc/build-version.inc
+++ b/external_imported/vcpkg/ports/shaderc/build-version.inc
@@ -1 +1 @@
-"shaderc v2021.1-dev unknown hash, 2021-06-21\n"
+"shaderc v2023.7 v2023.7\n"
diff --git a/external_imported/vcpkg/ports/shaderc/cmake-config-export.patch b/external_imported/vcpkg/ports/shaderc/cmake-config-export.patch
new file mode 100644
index 000000000..ccc613f55
--- /dev/null
+++ b/external_imported/vcpkg/ports/shaderc/cmake-config-export.patch
@@ -0,0 +1,71 @@
+diff --git a/libshaderc/CMakeLists.txt b/libshaderc/CMakeLists.txt
+index e0eea6c..b54ace4 100644
+--- a/libshaderc/CMakeLists.txt
++++ b/libshaderc/CMakeLists.txt
+@@ -28,7 +28,9 @@ if (NOT BUILD_SHARED_LIBS)
+ add_library(shaderc STATIC ${SHADERC_SOURCES})
+ shaderc_default_compile_options(shaderc)
+ target_include_directories(shaderc
+-    PUBLIC include
++    PUBLIC
++    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
++    $<INSTALL_INTERFACE:include>
+     PRIVATE ${glslang_SOURCE_DIR}
+             ${SPIRV-Headers_SOURCE_DIR}/include)
+ set(shaderc_install_target shaderc)
+@@ -37,7 +39,9 @@ else()
+ add_library(shaderc_shared SHARED ${SHADERC_SOURCES})
+ shaderc_default_compile_options(shaderc_shared)
+ target_include_directories(shaderc_shared
+-    PUBLIC include
++    PUBLIC
++    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
++    $<INSTALL_INTERFACE:include>
+     PRIVATE ${glslang_SOURCE_DIR}
+             ${SPIRV-Headers_SOURCE_DIR}/include)
+ target_compile_definitions(shaderc_shared
+@@ -60,10 +64,15 @@ if(SHADERC_ENABLE_INSTALL)
+       ${CMAKE_INSTALL_INCLUDEDIR}/shaderc)
+ 
+   install(TARGETS ${shaderc_install_target} shaderc_util
++    EXPORT unofficial-shaderc-targets
+     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+     BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR}
+     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
++  install(EXPORT unofficial-shaderc-targets
++    NAMESPACE unofficial::shaderc::
++    DESTINATION share/unofficial-shaderc
++  )
+ endif(SHADERC_ENABLE_INSTALL)
+ 
+ find_package(Threads)
+@@ -80,6 +89,15 @@ else()
+ target_link_libraries(shaderc_shared PRIVATE ${SHADERC_LIBS})
+ endif()
+ 
++file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc-config.cmake" [[
++include(CMakeFindDependencyMacro)
++find_dependency(glslang CONFIG)
++find_dependency(SPIRV-Tools CONFIG)
++find_dependency(SPIRV-Tools-opt CONFIG)
++include("${CMAKE_CURRENT_LIST_DIR}/unofficial-shaderc-targets.cmake")
++]])
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc-config.cmake DESTINATION share/unofficial-shaderc)
++
+ shaderc_add_tests(
+   TEST_PREFIX shaderc
+   LINK_LIBS shaderc
+diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt
+index 99ce3c4..3d5a222 100644
+--- a/libshaderc_util/CMakeLists.txt
++++ b/libshaderc_util/CMakeLists.txt
+@@ -39,7 +39,7 @@ add_library(shaderc_util STATIC
+ 
+ shaderc_default_compile_options(shaderc_util)
+ target_include_directories(shaderc_util
+-  PUBLIC include PRIVATE ${glslang_SOURCE_DIR})
++  PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> PRIVATE ${glslang_SOURCE_DIR})
+ # We use parts of Glslang's HLSL compilation interface, which
+ # now requires this preprocessor definition.
+ add_definitions(-DENABLE_HLSL)
diff --git a/external_imported/vcpkg/ports/shaderc/cmake-project-include.cmake b/external_imported/vcpkg/ports/shaderc/cmake-project-include.cmake
new file mode 100644
index 000000000..215ded644
--- /dev/null
+++ b/external_imported/vcpkg/ports/shaderc/cmake-project-include.cmake
@@ -0,0 +1,16 @@
+set(SHADERC_GLSLANG_DIR "" CACHE STRING "unused")
+find_package(glslang CONFIG REQUIRED)
+add_library(glslang ALIAS glslang::glslang)
+add_library(HLSL ALIAS glslang::HLSL)
+add_library(MachineIndependent ALIAS glslang::MachineIndependent)
+add_library(OSDependent ALIAS glslang::OSDependent)
+add_library(OGLCompiler ALIAS glslang::OGLCompiler)
+add_library(SPIRV ALIAS glslang::SPIRV)
+
+find_path(glslang_SOURCE_DIR glslang/Public/ShaderLang.h REQUIRED)
+set(glslang_SOURCE_DIR "${glslang_SOURCE_DIR}/glslang" "${glslang_SOURCE_DIR}" CACHE STRING "" FORCE)
+
+set(SHADERC_SPIRV_TOOLS_DIR "" CACHE STRING "unused")
+find_package(SPIRV-Tools CONFIG REQUIRED)
+add_library(SPIRV-Tools ALIAS SPIRV-Tools-static) # as linked by SPIRV-Tools-opt
+find_package(SPIRV-Tools-opt CONFIG REQUIRED)
diff --git a/external_imported/vcpkg/ports/shaderc/disable-update-version.patch b/external_imported/vcpkg/ports/shaderc/disable-update-version.patch
index 7bf47bd50..f9e2f86a8 100644
--- a/external_imported/vcpkg/ports/shaderc/disable-update-version.patch
+++ b/external_imported/vcpkg/ports/shaderc/disable-update-version.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a4e779b..dc5f1a9 100644
+index 075641e..b2e92ef 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -121,11 +121,6 @@ if(${SHADERC_ENABLE_EXAMPLES})
+@@ -129,11 +129,6 @@ if(${SHADERC_ENABLE_EXAMPLES})
      add_subdirectory(examples)
  endif()
  
@@ -15,10 +15,10 @@ index a4e779b..dc5f1a9 100644
  function(define_pkg_config_file NAME LIBS)
    add_custom_target(${NAME}-pkg-config ALL
 diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt
-index acf6fb0..d0df7db 100644
+index c8fa6d5..341865a 100644
 --- a/glslc/CMakeLists.txt
 +++ b/glslc/CMakeLists.txt
-@@ -26,7 +26,6 @@ shaderc_default_compile_options(glslc_exe)
+@@ -53,7 +53,6 @@ shaderc_default_compile_options(glslc_exe)
  target_include_directories(glslc_exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/.. ${spirv-tools_SOURCE_DIR}/include)
  set_target_properties(glslc_exe PROPERTIES OUTPUT_NAME glslc)
  target_link_libraries(glslc_exe PRIVATE glslc shaderc_util shaderc)
diff --git a/external_imported/vcpkg/ports/shaderc/fix-build-type.patch b/external_imported/vcpkg/ports/shaderc/fix-build-type.patch
index 8e5cd22db..46826d3aa 100644
--- a/external_imported/vcpkg/ports/shaderc/fix-build-type.patch
+++ b/external_imported/vcpkg/ports/shaderc/fix-build-type.patch
@@ -1,5 +1,19 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b2e92ef..cf0832b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -152,6 +152,8 @@ function(define_pkg_config_file NAME LIBS)
+   endif()
+ endfunction()
+ 
++if(BUILD_SHARED_LIBS)
+ define_pkg_config_file(shaderc -lshaderc_shared)
++else()
+ define_pkg_config_file(shaderc_static "-lshaderc ${EXTRA_STATIC_PKGCONFIG_LIBS} -lshaderc_util")
+-define_pkg_config_file(shaderc_combined -lshaderc_combined)
++endif()
 diff --git a/libshaderc/CMakeLists.txt b/libshaderc/CMakeLists.txt
-index 3ada419..f3277f0 100644
+index 2cced9e..e0eea6c 100644
 --- a/libshaderc/CMakeLists.txt
 +++ b/libshaderc/CMakeLists.txt
 @@ -24,13 +24,16 @@ set(SHADERC_SOURCES
@@ -33,11 +47,11 @@ index 3ada419..f3277f0 100644
        ${CMAKE_INSTALL_INCLUDEDIR}/shaderc)
  
 -  install(TARGETS shaderc shaderc_shared
-+  install(TARGETS ${shaderc_install_target}
++  install(TARGETS ${shaderc_install_target} shaderc_util
      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-@@ -68,8 +73,11 @@ set(SHADERC_LIBS
+     BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR}
+@@ -69,8 +74,11 @@ set(SHADERC_LIBS
    SPIRV-Tools
  )
  
@@ -49,7 +63,7 @@ index 3ada419..f3277f0 100644
  
  shaderc_add_tests(
    TEST_PREFIX shaderc
-@@ -93,6 +101,7 @@ shaderc_add_tests(
+@@ -94,6 +102,7 @@ shaderc_add_tests(
      shaderc_cpp
      shaderc_private)
  
@@ -57,7 +71,7 @@ index 3ada419..f3277f0 100644
  shaderc_combine_static_lib(shaderc_combined shaderc)
  
  if(SHADERC_ENABLE_INSTALL)
-@@ -121,6 +130,7 @@ shaderc_add_tests(
+@@ -122,6 +131,7 @@ shaderc_add_tests(
    TEST_NAMES
      shaderc
      shaderc_cpp)
diff --git a/external_imported/vcpkg/ports/shaderc/fix-export-cmakefiles.patch b/external_imported/vcpkg/ports/shaderc/fix-export-cmakefiles.patch
deleted file mode 100644
index 75e3aba81..000000000
--- a/external_imported/vcpkg/ports/shaderc/fix-export-cmakefiles.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff --git a/libshaderc/CMakeLists.txt b/libshaderc/CMakeLists.txt
-index f3277f0..5fd58ef 100644
---- a/libshaderc/CMakeLists.txt
-+++ b/libshaderc/CMakeLists.txt
-@@ -28,7 +28,9 @@ if (NOT BUILD_SHARED_LIBS)
- add_library(shaderc STATIC ${SHADERC_SOURCES})
- shaderc_default_compile_options(shaderc)
- target_include_directories(shaderc
--    PUBLIC include
-+    PUBLIC
-+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/>
-+    $<INSTALL_INTERFACE:include/>
-     PRIVATE ${glslang_SOURCE_DIR}
-             ${SPIRV-Headers_SOURCE_DIR}/include)
- set(shaderc_install_target shaderc)
-@@ -37,7 +39,9 @@ else()
- add_library(shaderc_shared SHARED ${SHADERC_SOURCES})
- shaderc_default_compile_options(shaderc_shared)
- target_include_directories(shaderc_shared
--    PUBLIC include
-+    PUBLIC
-+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/>
-+    $<INSTALL_INTERFACE:include/>
-     PRIVATE ${glslang_SOURCE_DIR}
-             ${SPIRV-Headers_SOURCE_DIR}/include)
- target_compile_definitions(shaderc_shared
-@@ -59,10 +63,14 @@ if(SHADERC_ENABLE_INSTALL)
-     DESTINATION
-       ${CMAKE_INSTALL_INCLUDEDIR}/shaderc)
- 
--  install(TARGETS ${shaderc_install_target}
-+  install(TARGETS ${shaderc_install_target} EXPORT unofficial-shadercTargets
-     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+  install(EXPORT unofficial-shadercTargets
-+    NAMESPACE unofficial::shaderc::
-+    DESTINATION share/unofficial-shaderc
-+  )
- endif(SHADERC_ENABLE_INSTALL)
- 
- find_package(Threads)
-@@ -79,6 +87,11 @@ else()
- target_link_libraries(shaderc_shared PRIVATE ${SHADERC_LIBS})
- endif()
- 
-+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc-config.cmake.in"
-+[[include("${CMAKE_CURRENT_LIST_DIR}/unofficial-shadercTargets.cmake")]])
-+configure_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc-config.cmake" @ONLY)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc-config.cmake DESTINATION share/unofficial-shaderc)
-+
- shaderc_add_tests(
-   TEST_PREFIX shaderc
-   LINK_LIBS shaderc
-diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt
-index 4926203..b152d7b 100644
---- a/libshaderc_util/CMakeLists.txt
-+++ b/libshaderc_util/CMakeLists.txt
-@@ -39,7 +39,10 @@ add_library(shaderc_util STATIC
- 
- shaderc_default_compile_options(shaderc_util)
- target_include_directories(shaderc_util
--  PUBLIC include PRIVATE ${glslang_SOURCE_DIR})
-+  PUBLIC
-+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/>
-+    $<INSTALL_INTERFACE:include/>
-+  PRIVATE ${glslang_SOURCE_DIR})
- # We use parts of Glslang's HLSL compilation interface, which
- # now requires this preprocessor definition.
- add_definitions(-DENABLE_HLSL)
-@@ -50,12 +53,21 @@ target_link_libraries(shaderc_util PRIVATE
-   SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT})
- 
- if(SHADERC_ENABLE_INSTALL AND NOT BUILD_SHARED_LIBS)
--  install(TARGETS shaderc_util
-+  install(TARGETS shaderc_util EXPORT unofficial-shaderc_utilTargets
-     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+  install(EXPORT unofficial-shaderc_utilTargets
-+      NAMESPACE unofficial::shaderc_util::
-+      DESTINATION share/unofficial-shaderc_util
-+  )
- endif(SHADERC_ENABLE_INSTALL)
- 
-+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc_util-config.cmake.in"
-+[[include("${CMAKE_CURRENT_LIST_DIR}/unofficial-shaderc_utilTargets.cmake")]])
-+configure_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc_util-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc_util-config.cmake" @ONLY)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc_util-config.cmake DESTINATION share/unofficial-shaderc_util)
-+
- shaderc_add_tests(
-   TEST_PREFIX shaderc_util
-   LINK_LIBS shaderc_util
diff --git a/external_imported/vcpkg/ports/shaderc/fix-install-shaderc_util.patch b/external_imported/vcpkg/ports/shaderc/fix-install-shaderc_util.patch
deleted file mode 100644
index 7601f3020..000000000
--- a/external_imported/vcpkg/ports/shaderc/fix-install-shaderc_util.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt
-index 99ce3c4..4926203 100644
---- a/libshaderc_util/CMakeLists.txt
-+++ b/libshaderc_util/CMakeLists.txt
-@@ -49,6 +49,13 @@ target_link_libraries(shaderc_util PRIVATE
-   glslang OSDependent OGLCompiler HLSL glslang SPIRV
-   SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT})
- 
-+if(SHADERC_ENABLE_INSTALL AND NOT BUILD_SHARED_LIBS)
-+  install(TARGETS shaderc_util
-+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+endif(SHADERC_ENABLE_INSTALL)
-+
- shaderc_add_tests(
-   TEST_PREFIX shaderc_util
-   LINK_LIBS shaderc_util
diff --git a/external_imported/vcpkg/ports/shaderc/fix-tbuiltinresource-for-glslang-11-12.patch b/external_imported/vcpkg/ports/shaderc/fix-tbuiltinresource-for-glslang-11-12.patch
deleted file mode 100644
index 8740dee6b..000000000
--- a/external_imported/vcpkg/ports/shaderc/fix-tbuiltinresource-for-glslang-11-12.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/libshaderc_util/src/resources.cc b/libshaderc_util/src/resources.cc
-index d64e47f..6c662d3 100644
---- a/libshaderc_util/src/resources.cc
-+++ b/libshaderc_util/src/resources.cc
-@@ -125,6 +125,15 @@ const TBuiltInResource kDefaultTBuiltInResource = {
-     /* .maxTaskWorkGroupSizeY_NV = */ 1,
-     /* .maxTaskWorkGroupSizeZ_NV = */ 1,
-     /* .maxMeshViewCountNV = */ 4,
-+    /* .maxMeshOutputVerticesEXT = */ 256,
-+    /* .maxMeshOutputPrimitivesEXT = */ 256,
-+    /* .maxMeshWorkGroupSizeX_EXT = */ 128,
-+    /* .maxMeshWorkGroupSizeY_EXT = */ 128,
-+    /* .maxMeshWorkGroupSizeZ_EXT = */ 128,
-+    /* .maxTaskWorkGroupSizeX_EXT = */ 128,
-+    /* .maxTaskWorkGroupSizeY_EXT = */ 128,
-+    /* .maxTaskWorkGroupSizeZ_EXT = */ 128,
-+    /* .maxMeshViewCountEXT = */ 4,
-     /* .maxDualSourceDrawBuffersEXT = */ 1,
-     // This is the glslang TLimits structure.
-     // It defines whether or not the following features are enabled.
diff --git a/external_imported/vcpkg/ports/shaderc/glslang/CMakeLists.txt b/external_imported/vcpkg/ports/shaderc/glslang/CMakeLists.txt
deleted file mode 100644
index 3b31564f9..000000000
--- a/external_imported/vcpkg/ports/shaderc/glslang/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-cmake_minimum_required(VERSION 3.11)
-
-find_package(glslang CONFIG REQUIRED)
-
-set_property(TARGET glslang::glslang PROPERTY IMPORTED_GLOBAL TRUE)
-set_property(TARGET glslang::OSDependent PROPERTY IMPORTED_GLOBAL TRUE)
-set_property(TARGET glslang::OGLCompiler PROPERTY IMPORTED_GLOBAL TRUE)
-set_property(TARGET glslang::HLSL PROPERTY IMPORTED_GLOBAL TRUE)
-set_property(TARGET glslang::SPIRV PROPERTY IMPORTED_GLOBAL TRUE)
-set_property(TARGET glslang::MachineIndependent PROPERTY IMPORTED_GLOBAL TRUE)
-
-add_library(glslang ALIAS glslang::glslang)
-add_library(OSDependent ALIAS glslang::OSDependent)
-add_library(OGLCompiler ALIAS glslang::OGLCompiler)
-add_library(HLSL ALIAS glslang::HLSL)
-add_library(SPIRV ALIAS glslang::SPIRV)
-add_library(MachineIndependent ALIAS glslang::MachineIndependent)
-
-find_package(Threads REQUIRED)
-
-find_path(glslang_SOURCE_DIR glslang/Public/ShaderLang.h)
-set(glslang_SOURCE_DIR "${glslang_SOURCE_DIR}/glslang" "${glslang_SOURCE_DIR}" CACHE STRING "" FORCE)
diff --git a/external_imported/vcpkg/ports/shaderc/portfile.cmake b/external_imported/vcpkg/ports/shaderc/portfile.cmake
index 12d2a62e5..9da937cbd 100644
--- a/external_imported/vcpkg/ports/shaderc/portfile.cmake
+++ b/external_imported/vcpkg/ports/shaderc/portfile.cmake
@@ -4,48 +4,44 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/shaderc
-    REF adca18dcadd460eb517fe44f6cd2460fa0650ebe
-    SHA512 3a27d4c51be9e9396b9a854cb96d88e78ff2ca6dcb8400bd3288f6984d25876af0eae649aa1c72ad613edbbcfa4324a12809f13ceb7a0134eef41cb1a698dfdf
+    REF "v${VERSION}"
+    SHA512 f3c1db574312e7e5ee22fb64f47f6609369754dd1648eb4e51c30b3c40aafd9994e54560e8334d01ac7d00011285a94d0543fa9ecd6977ec34c39a965fd72269
     HEAD_REF master
     PATCHES 
         disable-update-version.patch
         fix-build-type.patch
-        fix-install-shaderc_util.patch
-        fix-export-cmakefiles.patch
-        # NOTE: This should be removed when shaderc gets updated to use glslang 11.12.0
-        fix-tbuiltinresource-for-glslang-11-12.patch
+        cmake-config-export.patch
 )
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/build-version.inc" DESTINATION "${SOURCE_PATH}/glslc/src")
 
-set(OPTIONS)
+set(OPTIONS "")
 if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
     list(APPEND OPTIONS -DSHADERC_ENABLE_SHARED_CRT=ON)
 endif()
 
 # shaderc uses python to manipulate copyright information
 vcpkg_find_acquire_program(PYTHON3)
-get_filename_component(PYTHON3_EXE_PATH ${PYTHON3} DIRECTORY)
+get_filename_component(PYTHON3_EXE_PATH "${PYTHON3}" DIRECTORY)
 vcpkg_add_to_path(PREPEND "${PYTHON3_EXE_PATH}")
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         ${OPTIONS}
-        -DSHADERC_SKIP_TESTS=true 
-        -DSHADERC_GLSLANG_DIR=${CMAKE_CURRENT_LIST_DIR}/glslang
-        -DSHADERC_SPIRV_TOOLS_DIR=${CMAKE_CURRENT_LIST_DIR}/spirv-tools
+        "-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake"
         -DSHADERC_ENABLE_EXAMPLES=OFF
+        -DSHADERC_SKIP_TESTS=true 
 )
 
 vcpkg_cmake_install()
 
 vcpkg_fixup_pkgconfig()
 vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-shaderc CONFIG_PATH share/unofficial-shaderc)
-vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-shaderc_util CONFIG_PATH share/unofficial-shaderc_util)
 
 vcpkg_copy_tools(TOOL_NAMES glslc AUTO_CLEAN)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/external_imported/vcpkg/ports/shaderc/spirv-tools/CMakeLists.txt b/external_imported/vcpkg/ports/shaderc/spirv-tools/CMakeLists.txt
deleted file mode 100644
index d9e013601..000000000
--- a/external_imported/vcpkg/ports/shaderc/spirv-tools/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-find_library(SPIRVTOOLSOPT SPIRV-Tools-opt)
-find_library(SPIRVTOOLS SPIRV-Tools)
-
-add_library(SPIRV-Tools-opt STATIC IMPORTED GLOBAL)
-set_property(TARGET SPIRV-Tools-opt PROPERTY IMPORTED_LOCATION "${SPIRVTOOLSOPT}")
-
-add_library(SPIRV-Tools STATIC IMPORTED GLOBAL)
-set_property(TARGET SPIRV-Tools PROPERTY IMPORTED_LOCATION "${SPIRVTOOLS}")
diff --git a/external_imported/vcpkg/ports/shaderc/usage b/external_imported/vcpkg/ports/shaderc/usage
new file mode 100644
index 000000000..8918c0155
--- /dev/null
+++ b/external_imported/vcpkg/ports/shaderc/usage
@@ -0,0 +1,4 @@
+shaderc provides CMake targets:
+
+    find_package(unofficial-shaderc CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE unofficial::shaderc::shaderc)
diff --git a/external_imported/vcpkg/ports/shaderc/vcpkg.json b/external_imported/vcpkg/ports/shaderc/vcpkg.json
index b3c400f80..2a306afbf 100644
--- a/external_imported/vcpkg/ports/shaderc/vcpkg.json
+++ b/external_imported/vcpkg/ports/shaderc/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "shaderc",
-  "version": "2021.1",
-  "port-version": 3,
+  "version": "2023.7",
   "description": "A collection of tools, libraries and tests for shader compilation.",
   "homepage": "https://github.com/google/shaderc",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/shaderwriter/portfile.cmake b/external_imported/vcpkg/ports/shaderwriter/portfile.cmake
index 0a1433693..887bae898 100644
--- a/external_imported/vcpkg/ports/shaderwriter/portfile.cmake
+++ b/external_imported/vcpkg/ports/shaderwriter/portfile.cmake
@@ -4,14 +4,14 @@ vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH
     REPO DragonJoker/ShaderWriter
     REF v${VERSION}
     HEAD_REF development
-    SHA512 d87f5e2641b064b6d6c53c2af86ed3c133f76a408728f4ad4fbc122d4392b4da21fea3faa0b2f58391e348f23c972f3c0196386c5c8c66800500da99d4522f70
+    SHA512 58a9d5ca857a21283d359a3028d52a93dfa8161d2ba8052f674ecbab22750eebc0006d240d5f12779475ff5a2f8550f1c53a32e3a50ea2346ed8212e3c5775b2
 )
 
 vcpkg_from_github(OUT_SOURCE_PATH CMAKE_SOURCE_PATH
     REPO DragonJoker/CMakeUtils
-    REF 3bea3c21f76f49cd3730e555b32e9d401b542526
+    REF 7d355194fa795c437ce970cecf00e23ae10fc686
     HEAD_REF master
-    SHA512 28c13672abe7a29e4c11192f3bbc10fd09d30f0719911370d7a1d70a534d41679feffafaad4ac1c1dd32403541ecf44b5021a1b8052418190dc040ed833ff15b
+    SHA512 ca25b19bdeb3e8fda7abc32f8548731f0ba1cd09889a70f6f287ad76d2fdfa0fedbb7f6f65b26d356ea51543bed8926c6bb463f8e8461b7d51d3b7b33134374c
 )
 
 file(REMOVE_RECURSE "${SOURCE_PATH}/CMake")
@@ -19,6 +19,13 @@ file(COPY "${CMAKE_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/CMake")
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
 
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        spirv SDW_BUILD_EXPORTER_SPIRV
+        glsl  SDW_BUILD_EXPORTER_HLSL
+        hlsl  SDW_BUILD_EXPORTER_GLSL
+)
+
 vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS
@@ -29,6 +36,7 @@ vcpkg_cmake_configure(
         -DSDW_BUILD_STATIC_SDW=${BUILD_STATIC}
         -DSDW_BUILD_STATIC_SDAST=${BUILD_STATIC}
         -DSDW_UNITY_BUILD=ON
+        ${FEATURE_OPTIONS}
 )
 
 vcpkg_copy_pdbs()
diff --git a/external_imported/vcpkg/ports/shaderwriter/vcpkg.json b/external_imported/vcpkg/ports/shaderwriter/vcpkg.json
index f2bde7d46..7ffbd0836 100644
--- a/external_imported/vcpkg/ports/shaderwriter/vcpkg.json
+++ b/external_imported/vcpkg/ports/shaderwriter/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "shaderwriter",
-  "version": "2.5.0",
+  "version": "2.7.0",
   "description": "Library to write shaders directly from C++ code, supports GLSL, HLSL and SPIRV outputs.",
   "homepage": "https://github.com/DragonJoker/ShaderWriter",
   "license": "MIT",
@@ -13,5 +13,19 @@
       "name": "vcpkg-cmake-config",
       "host": true
     }
-  ]
+  ],
+  "default-features": [
+    "spirv"
+  ],
+  "features": {
+    "glsl": {
+      "description": "Compiles GLSL exporter."
+    },
+    "hlsl": {
+      "description": "Compiles HLSL exporter."
+    },
+    "spirv": {
+      "description": "Compiles SPIR-V exporter."
+    }
+  }
 }
diff --git a/external_imported/vcpkg/ports/shapelib/fix-usage.patch b/external_imported/vcpkg/ports/shapelib/fix-usage.patch
deleted file mode 100644
index 8b22423fa..000000000
--- a/external_imported/vcpkg/ports/shapelib/fix-usage.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b3b3b51..ea3f129 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -73,8 +73,8 @@ set(
- 
- # Export build information to help other projects link installed
- # shapelib software.  Only one of these signatures is required
--# for the export_shp name.
--install(EXPORT export_shp DESTINATION ${CMAKE_INSTALL_SHP_DATADIR})
-+# for the shpConfig name.
-+install(EXPORT shpConfig DESTINATION ${CMAKE_INSTALL_SHP_DATADIR})
- 
- # Initial boilerplate done, now build library and executables.
- 
-@@ -127,12 +127,17 @@ if(USE_RPATH)
- endif(USE_RPATH)
- 
- install(TARGETS shp
--  EXPORT export_shp
-+  EXPORT shpConfig
-   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-   )
- 
-+INSTALL(EXPORT shpConfig
-+    DESTINATION share/shp
-+)
-+
-+
- # executables to be built and installed.
- set(executables
-   shpcreate
diff --git a/external_imported/vcpkg/ports/shapelib/option-build-test.patch b/external_imported/vcpkg/ports/shapelib/option-build-test.patch
deleted file mode 100644
index c91410f38..000000000
--- a/external_imported/vcpkg/ports/shapelib/option-build-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c3ef935..845ec06 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -148,7 +148,7 @@ set(executables
- find_program(BASH_EXECUTABLE bash)
- find_program(SED_EXECUTABLE sed)
- if(BASH_EXECUTABLE AND SED_EXECUTABLE)
--  set(BUILD_TEST ON)
-+  option(BUILD_TEST "" ON)
- else(BASH_EXECUTABLE AND SED_EXECUTABLE)
-   message(STATUS "WARNING: sed or bash not available so disabling testing")
- endif(BASH_EXECUTABLE AND SED_EXECUTABLE)
diff --git a/external_imported/vcpkg/ports/shapelib/portfile.cmake b/external_imported/vcpkg/ports/shapelib/portfile.cmake
index b7fe51a1e..146b05b91 100644
--- a/external_imported/vcpkg/ports/shapelib/portfile.cmake
+++ b/external_imported/vcpkg/ports/shapelib/portfile.cmake
@@ -1,50 +1,74 @@
-set(SHAPELIB_VERSION 1.5.0)
-set(SHAPELIB_HASH 230939afb33aee042808a32b38ee9dfc7ec1f39432e5a4ebe3fda99c2f87bfbebc91830d4e21691c51aae3f4bb65d7e71e7061472bb08124dcd3402c46800d6c)
-
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://download.osgeo.org/shapelib/shapelib-${SHAPELIB_VERSION}.zip"
-    FILENAME "shapelib-${SHAPELIB_VERSION}.zip"
-    SHA512 ${SHAPELIB_HASH}
+    URLS "http://download.osgeo.org/shapelib/shapelib-${VERSION}.zip"
+    FILENAME "shapelib-${VERSION}.zip"
+    SHA512 f3f43f2028fe442e020558de2559b24eae9c7a1d0c84cc242f23ea985cf1fb5ff39fbfef7738f9b8ef5df9a5d0b9f3e891a61b3d5fbbe5b224f41a46589723a3
+)
+
+vcpkg_extract_source_archive(
+    SOURCE_PATH
+    ARCHIVE "${ARCHIVE}"
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
-    PATCHES
-        option-build-test.patch
+vcpkg_check_features(OUT_FEATURE_OPTIONS options
+    FEATURES
+        contrib     BUILD_SHAPELIB_CONTRIB
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-        -DBUILD_TEST=OFF
+        ${options}
+        -DBUILD_TESTING=OFF
 )
 
 vcpkg_cmake_install()
-
-vcpkg_cmake_config_fixup(PACKAGE_NAME shp)
+vcpkg_copy_pdbs()
+vcpkg_cmake_config_fixup()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-file(GLOB EXES "${CURRENT_PACKAGES_DIR}/bin/*.exe")
-if(EXES)
-    file(COPY ${EXES} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/shapelib")
-    file(REMOVE ${EXES})
-endif()
-
-file(GLOB DEBUG_EXES "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe")
-if(DEBUG_EXES)
-    file(REMOVE ${DEBUG_EXES})
-endif()
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin")
+vcpkg_copy_tools(
+    TOOL_NAMES
+        dbfadd
+        dbfcreate
+        dbfdump
+        shpadd
+        shpcreate
+        shpdump
+        shprewind
+        shptreedump
+    AUTO_CLEAN
+)
+if(BUILD_SHAPELIB_CONTRIB)
+    vcpkg_copy_tools(
+        TOOL_NAMES
+            csv2shp
+            dbfcat
+            dbfinfo
+            Shape_PointInPoly
+            shpcat
+            shpcentrd
+            shpdata
+            shpdxf
+            shpfix
+            shpinfo
+            shpsort
+            shpwkb
+        AUTO_CLEAN
+    )
 endif()
 
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-
-vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/shapelib")
+vcpkg_install_copyright(
+    FILE_LIST "${SOURCE_PATH}/LICENSE-LGPL" "${SOURCE_PATH}/LICENSE-MIT"
+    # Cf. web/license.html
+    COMMENT [[
+The core portions of the library are made available under two
+possible licenses. The licensee can choose to use the code under
+either the Library GNU Public License described in LICENSE-LGPL
+or under the MIT license described in LICENSE-MIT.
 
-vcpkg_copy_pdbs()
+Some auxiliary portions of Shapelib, notably some of the components
+in the contrib directory come under slightly different license restrictions.
+Check the source files that you are actually using for conditions.
+]])
diff --git a/external_imported/vcpkg/ports/shapelib/vcpkg.json b/external_imported/vcpkg/ports/shapelib/vcpkg.json
index db87581cf..99eaaff05 100644
--- a/external_imported/vcpkg/ports/shapelib/vcpkg.json
+++ b/external_imported/vcpkg/ports/shapelib/vcpkg.json
@@ -1,9 +1,9 @@
 {
   "name": "shapelib",
-  "version": "1.5.0",
-  "port-version": 3,
+  "version": "1.6.0",
   "description": "Shapefile C Library is simple C API for reading and writing ESRI Shapefiles",
   "homepage": "https://download.osgeo.org/shapelib",
+  "license": "MIT OR LGPL-2.0-or-later",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
@@ -13,5 +13,11 @@
       "name": "vcpkg-cmake-config",
       "host": true
     }
-  ]
+  ],
+  "features": {
+    "contrib": {
+      "description": "Build utilities (from contrib)",
+      "license": null
+    }
+  }
 }
diff --git a/external_imported/vcpkg/ports/shiftmedia-libgnutls/portfile.cmake b/external_imported/vcpkg/ports/shiftmedia-libgnutls/portfile.cmake
index 567607078..85558d78e 100644
--- a/external_imported/vcpkg/ports/shiftmedia-libgnutls/portfile.cmake
+++ b/external_imported/vcpkg/ports/shiftmedia-libgnutls/portfile.cmake
@@ -25,10 +25,10 @@ vcpkg_download_distfile(
     SHA512 6e534b3a623efa5f473977deeed4d24669ef0e0e3ac5fcadc88c5cf2d6ad0852a07c68cd70ac748d7f9a3793704ce1a54a7d17114458a8c1f2e42d410681c340
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH GNULIB_SOURCE_PATH
+vcpkg_extract_source_archive(
+    GNULIB_SOURCE_PATH
     ARCHIVE "${GNULIB_SNAPSHOT}"
-    REF ${GNULIB_REF}
+    SOURCE_BASE ${GNULIB_REF}
 )
 
 file(REMOVE_RECURSE "${SOURCE_PATH}/gnulib")
diff --git a/external_imported/vcpkg/ports/shiftmedia-libgnutls/vcpkg.json b/external_imported/vcpkg/ports/shiftmedia-libgnutls/vcpkg.json
index b208408b3..cf9a6a589 100644
--- a/external_imported/vcpkg/ports/shiftmedia-libgnutls/vcpkg.json
+++ b/external_imported/vcpkg/ports/shiftmedia-libgnutls/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "shiftmedia-libgnutls",
   "version": "3.7.6",
+  "port-version": 3,
   "description": "Unofficial GnuTLS fork with added custom native Visual Studio project build tools. ",
   "homepage": "https://github.com/ShiftMediaProject/gnutls",
   "license": "LGPL-2.1-only",
-  "supports": "windows",
+  "supports": "windows & !arm & !mingw & !xbox",
   "dependencies": [
     "gettext",
     "gmp",
diff --git a/external_imported/vcpkg/ports/shiftmedia-libgpg-error/portfile.cmake b/external_imported/vcpkg/ports/shiftmedia-libgpg-error/portfile.cmake
index 793778e1d..383d48b63 100644
--- a/external_imported/vcpkg/ports/shiftmedia-libgpg-error/portfile.cmake
+++ b/external_imported/vcpkg/ports/shiftmedia-libgpg-error/portfile.cmake
@@ -51,7 +51,7 @@ vcpkg_install_msbuild(
 )
 
 get_filename_component(SOURCE_PATH_SUFFIX "${SOURCE_PATH}" NAME)
-file(RENAME "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${SOURCE_PATH_SUFFIX}/msvc/include" "${CURRENT_PACKAGES_DIR}/include")
+file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${SOURCE_PATH_SUFFIX}/msvc/include" DESTINATION "${CURRENT_PACKAGES_DIR}")
 
 set(exec_prefix "\${prefix}")
 set(libdir "\${prefix}/lib")
diff --git a/external_imported/vcpkg/ports/shiftmedia-libgpg-error/vcpkg.json b/external_imported/vcpkg/ports/shiftmedia-libgpg-error/vcpkg.json
index a385d41dd..c585c0c5e 100644
--- a/external_imported/vcpkg/ports/shiftmedia-libgpg-error/vcpkg.json
+++ b/external_imported/vcpkg/ports/shiftmedia-libgpg-error/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "shiftmedia-libgpg-error",
   "version": "1.45",
+  "port-version": 1,
   "description": "An unofficial libgpg-error with added native Visual Studio project system",
   "homepage": "https://github.com/ShiftMediaProject/libgpg-error",
   "license": "LGPL-2.1-only",
diff --git a/external_imported/vcpkg/ports/shiva-sfml/portfile.cmake b/external_imported/vcpkg/ports/shiva-sfml/portfile.cmake
deleted file mode 100644
index efc79a811..000000000
--- a/external_imported/vcpkg/ports/shiva-sfml/portfile.cmake
+++ /dev/null
@@ -1,144 +0,0 @@
-vcpkg_from_github(
-        OUT_SOURCE_PATH SOURCE_PATH
-        REPO Milerius/shiva
-        REF 1.0
-        SHA512 d1ce33e89b17fa8f82e21b51dfa1308e38c617fea52c34a20b7b6c8643318280df24c043238ddd73ba2dbc139c5b5de1c2cb3add1f5629a54694c78b415d73d1
-        HEAD_REF master
-	)
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS
-          -DSHIVA_BUILD_TESTS=OFF
-		  -DSHIVA_USE_SFML_AS_RENDERER=ON
-		  -DSHIVA_INSTALL_PLUGINS=ON
-		  -DSHIVA_BUILD_EXAMPLES=OFF
-)
-
-vcpkg_cmake_install()
-
-
-if (VCPKG_CMAKE_SYSTEM_NAME)
-  file(GLOB PLUGINS_RELEASE "${SOURCE_PATH}/bin/Release/systems/*")
-  file(GLOB PLUGINS_DEBUG "${SOURCE_PATH}/bin/Debug/systems/*")
-else()
-  file(GLOB PLUGINS_RELEASE "${SOURCE_PATH}/bin/Release/systems/*.dll")
-  file(GLOB PLUGINS_DEBUG "${SOURCE_PATH}/bin/Debug/systems/*.dll")
-endif()
-
-message(STATUS "PLUGINS_RELEASE -> ${PLUGINS_RELEASE}")
-message(STATUS "PLUGINS_DEBUG -> ${PLUGINS_DEBUG}")
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/shiva-sfml)
-
-
-if (VCPKG_CMAKE_SYSTEM_NAME)
-  set(SUFFIX_BINARY lib)
-else()
-  set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled)
-  set(SUFFIX_BINARY bin)
-endif()
-
-##! Pre removing
-if (VCPKG_CMAKE_SYSTEM_NAME)
-	file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib")
-endif()
-
-##! Include
-file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include")
-file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include/shiva-sfml")
-
-##! Release
-file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/${SUFFIX_BINARY}")
-file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/${SUFFIX_BINARY}/shiva")
-file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/${SUFFIX_BINARY}/shiva/plugins")
-file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml")
-file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml/Release")
-
-##! Debug
-file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug")
-file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/${SUFFIX_BINARY}")
-file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/${SUFFIX_BINARY}/shiva")
-file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/${SUFFIX_BINARY}/shiva/plugins")
-file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml")
-file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml/Debug")
-
-##! Copy Plugins
-file(COPY ${PLUGINS_RELEASE} DESTINATION "${CURRENT_PACKAGES_DIR}/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml/Release")
-file(COPY ${PLUGINS_DEBUG} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml/Debug")
-
-if (NOT VCPKG_CMAKE_SYSTEM_NAME)
-	find_file(LUADLL lua.dll PATHS "${CURRENT_INSTALLED_DIR}/bin")
-	find_file(FMTDLL fmt.dll PATHS "${CURRENT_INSTALLED_DIR}/bin")
-	find_file(FLACDLL FLAC.dll PATHS "${CURRENT_INSTALLED_DIR}/bin")
-	find_file(FREETYPEDLL freetype.dll PATHS "${CURRENT_INSTALLED_DIR}/bin")
-	find_file(LIBBZ2DLL libbz2.dll PATHS "${CURRENT_INSTALLED_DIR}/bin")
-	find_file(LIBPNG16DLL libpng16.dll PATHS "${CURRENT_INSTALLED_DIR}/bin")
-	find_file(OGGDLL ogg.dll PATHS "${CURRENT_INSTALLED_DIR}/bin")
-	find_file(OPENAL32DLL OpenAL32.dll PATHS "${CURRENT_INSTALLED_DIR}/bin")
-	find_file(SFMLAUDIO2DLL sfml-audio-2.dll PATHS "${CURRENT_INSTALLED_DIR}/bin")
-	find_file(SFMLGRAPHICS2DLL sfml-graphics-2.dll PATHS "${CURRENT_INSTALLED_DIR}/bin")
-	find_file(SFMLSYSTEM2DLL sfml-system-2.dll PATHS "${CURRENT_INSTALLED_DIR}/bin")
-	find_file(SFMLWINDOW2DLL sfml-window-2.dll PATHS "${CURRENT_INSTALLED_DIR}/bin")
-	find_file(VORBISDLL vorbis.dll PATHS "${CURRENT_INSTALLED_DIR}/bin")
-	find_file(VORBISENCDLL vorbisenc.dll PATHS "${CURRENT_INSTALLED_DIR}/bin")
-	find_file(VORBISFILEDLL vorbisfile.dll PATHS "${CURRENT_INSTALLED_DIR}/bin")
-	find_file(ZLIB1DLL zlib1.dll PATHS "${CURRENT_INSTALLED_DIR}/bin")
-	set(DEPENDANCIES_RELEASE_DLL
-		${LUADLL}
-		${FMTDLL}
-		${FLACDLL}
-		${FREETYPEDLL}
-		${LIBBZ2DLL}
-		${LIBPNG16DLL}
-		${OGGDLL}
-		${OPENAL32DLL}
-		${SFMLAUDIO2DLL}
-		${SFMLGRAPHICS2DLL}
-		${SFMLSYSTEM2DLL}
-		${SFMLWINDOW2DLL}
-		${VORBISDLL}
-		${VORBISENCDLL}
-		${VORBISFILEDLL}
-		${ZLIB1DLL})
-
-	find_file(LUADLL_D lua.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin")
-	find_file(FMTDLL_D fmtd.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin")
-	find_file(FLACDLL_D FLAC.dll PATHS $"{CURRENT_INSTALLED_DIR}/debug/bin")
-	find_file(FREETYPEDLL_D freetyped.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin")
-	find_file(LIBBZ2DLL_D libbz2d.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin")
-	find_file(LIBPNG16DLL_D libpng16d.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin")
-	find_file(OGGDLL_D ogg.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin")
-	find_file(OPENAL32DLL_D OpenAL32.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin")
-	find_file(SFMLAUDIO2DLL_D sfml-audio-d-2.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin")
-	find_file(SFMLGRAPHICS2DLL_D sfml-graphics-d-2.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin")
-	find_file(SFMLSYSTEM2DLL_D sfml-system-d-2.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin")
-	find_file(SFMLWINDOW2DLL_D sfml-window-d-2.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin")
-	find_file(VORBISDLL_D vorbis.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin")
-	find_file(VORBISENCDLL_D vorbisenc.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin")
-	find_file(VORBISFILEDLL_D vorbisfile.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin")
-	find_file(ZLIB1DLL_D zlibd1.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin")
-	set(DEPENDANCIES_DEBUG_DLL
-		${LUADLL_D}
-		${FMTDLL_D}
-		${FLACDLL_D}
-		${FREETYPEDLL_D}
-		${LIBBZ2DLL_D}
-		${LIBPNG16DLL_D}
-		${OGGDLL_D}
-		${OPENAL32DLL}
-		${SFMLAUDIO2DLL_D}
-		${SFMLGRAPHICS2DLL_D}
-		${SFMLSYSTEM2DLL_D}
-		${SFMLWINDOW2DLL_D}
-		${VORBISDLL_D}
-		${VORBISENCDLL_D}
-		${VORBISFILEDLL_D}
-		${ZLIB1DLL_D}
-		)
-
-	file(COPY ${DEPENDANCIES_RELEASE_DLL} DESTINATION "${CURRENT_PACKAGES_DIR}/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml/Release")
-    file(COPY ${DEPENDANCIES_DEBUG_DLL} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml/Debug")
-endif()
-
-file(WRITE "${CURRENT_PACKAGES_DIR}/include/shiva-sfml/empty.h" "")
-file(WRITE "${CURRENT_PACKAGES_DIR}/share/shiva-sfml/copyright" "")
diff --git a/external_imported/vcpkg/ports/shiva-sfml/vcpkg.json b/external_imported/vcpkg/ports/shiva-sfml/vcpkg.json
deleted file mode 100644
index f47e49ee7..000000000
--- a/external_imported/vcpkg/ports/shiva-sfml/vcpkg.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "name": "shiva-sfml",
-  "version-string": "1.0",
-  "port-version": 3,
-  "description": "shiva-sfml plugins of shiva C++ engine",
-  "dependencies": [
-    {
-      "name": "sfml",
-      "platform": "windows"
-    },
-    "shiva",
-    {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
-    }
-  ]
-}
diff --git a/external_imported/vcpkg/ports/shiva/find_python_and_no_copy_dll.patch b/external_imported/vcpkg/ports/shiva/find_python_and_no_copy_dll.patch
new file mode 100644
index 000000000..31f447daa
--- /dev/null
+++ b/external_imported/vcpkg/ports/shiva/find_python_and_no_copy_dll.patch
@@ -0,0 +1,25 @@
+diff --git a/modules/python/CMakeLists.txt b/modules/python/CMakeLists.txt
+index eef14ee..30130ba 100644
+--- a/modules/python/CMakeLists.txt
++++ b/modules/python/CMakeLists.txt
+@@ -1,10 +1,10 @@
+ include(CMakeSources.cmake)
+ set(MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
+ 
++find_package(Python COMPONENTS Interpreter Development)
+ find_package(pybind11 CONFIG REQUIRED)
+ 
+-
+-if (WIN32)
++if (FALSE)
+     ## We need pyton dll
+     file(GLOB PYTHON_DLL ${PYTHON_LIBRARIES}/../*.dll)
+ 
+@@ -19,6 +19,6 @@ endif ()
+ 
+ CREATE_MODULE(shiva::pyscripting "${MODULE_SOURCES}" ${MODULE_PATH} "python")
+ 
+-target_link_libraries(pyscripting INTERFACE shiva::ecs shiva::input pybind11::embed pybind11::module)
++target_link_libraries(pyscripting INTERFACE shiva::ecs shiva::input pybind11::embed pybind11::module Python::Module)
+ 
+ AUTO_TARGETS_MODULE_INSTALL(pyscripting)
diff --git a/external_imported/vcpkg/ports/shiva/no_copy_dll.patch b/external_imported/vcpkg/ports/shiva/no_copy_dll.patch
deleted file mode 100644
index add7f22a4..000000000
--- a/external_imported/vcpkg/ports/shiva/no_copy_dll.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/modules/python/CMakeLists.txt b/modules/python/CMakeLists.txt
-index eef14ee87..d52a147d8 100644
---- a/modules/python/CMakeLists.txt
-+++ b/modules/python/CMakeLists.txt
-@@ -4,7 +4,7 @@ set(MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
- find_package(pybind11 CONFIG REQUIRED)
- 
- 
--if (WIN32)
-+if (WIN32 AND FALSE)
-     ## We need pyton dll
-     file(GLOB PYTHON_DLL ${PYTHON_LIBRARIES}/../*.dll)
- 
diff --git a/external_imported/vcpkg/ports/shiva/portfile.cmake b/external_imported/vcpkg/ports/shiva/portfile.cmake
index 884a8de10..ad653af73 100644
--- a/external_imported/vcpkg/ports/shiva/portfile.cmake
+++ b/external_imported/vcpkg/ports/shiva/portfile.cmake
@@ -1,30 +1,22 @@
 vcpkg_from_github(
-        OUT_SOURCE_PATH SOURCE_PATH
-        REPO Milerius/shiva
-        REF 1.0
-        SHA512 d1ce33e89b17fa8f82e21b51dfa1308e38c617fea52c34a20b7b6c8643318280df24c043238ddd73ba2dbc139c5b5de1c2cb3add1f5629a54694c78b415d73d1
-        HEAD_REF master
-        PATCHES no_copy_dll.patch
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Milerius/shiva
+    REF ${VERSION}
+    SHA512 d1ce33e89b17fa8f82e21b51dfa1308e38c617fea52c34a20b7b6c8643318280df24c043238ddd73ba2dbc139c5b5de1c2cb3add1f5629a54694c78b415d73d1
+    HEAD_REF master
+    PATCHES find_python_and_no_copy_dll.patch
 )
 
-find_library(PYTHON_RELEASE NAMES python310 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
-find_library(PYTHON_DEBUG NAMES python310_d python310 PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
-include(SelectLibraryConfigurations)
-select_library_configurations(PYTHON)
-
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE
     OPTIONS
         -DSHIVA_BUILD_TESTS=OFF
-        "-DPYTHON_LIBRARY=${PYTHON_LIBRARIES}"
-        "-DPYTHON_LIBRARIES=${PYTHON_LIBRARIES}"
         "-DPYTHON_EXECUTABLE=${CURRENT_INSTALLED_DIR}/tools/python3/python${VCPKG_EXECUTABLE_SUFFIX}"
 )
 
 vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/shiva")
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib")
-file(COPY "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/shiva")
-file(RENAME "${CURRENT_PACKAGES_DIR}/share/shiva/LICENSE" "${CURRENT_PACKAGES_DIR}/share/shiva/copyright")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/shiva/vcpkg.json b/external_imported/vcpkg/ports/shiva/vcpkg.json
index 447297bd0..2b9f53608 100644
--- a/external_imported/vcpkg/ports/shiva/vcpkg.json
+++ b/external_imported/vcpkg/ports/shiva/vcpkg.json
@@ -1,9 +1,11 @@
 {
   "name": "shiva",
   "version": "1.0",
-  "port-version": 5,
+  "port-version": 7,
   "description": "Modern C++ Game Engine",
   "homepage": "https://github.com/Milerius/shiva",
+  "license": "MIT",
+  "supports": "!(static & windows)",
   "dependencies": [
     "boost-dll",
     "boost-filesystem",
@@ -16,6 +18,7 @@
     },
     "nlohmann-json",
     "pybind11",
+    "python3",
     "sol2",
     "spdlog",
     {
diff --git a/external_imported/vcpkg/ports/shogun/vcpkg.json b/external_imported/vcpkg/ports/shogun/vcpkg.json
index 8ae367b8f..2126c253d 100644
--- a/external_imported/vcpkg/ports/shogun/vcpkg.json
+++ b/external_imported/vcpkg/ports/shogun/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "shogun",
-  "version-string": "6.1.4",
-  "port-version": 8,
+  "version": "6.1.4",
+  "port-version": 9,
   "description": "Unified and efficient Machine Learning",
   "homepage": "https://github.com/shogun-toolbox/shogun",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/si/portfile.cmake b/external_imported/vcpkg/ports/si/portfile.cmake
new file mode 100644
index 000000000..4713cc79f
--- /dev/null
+++ b/external_imported/vcpkg/ports/si/portfile.cmake
@@ -0,0 +1,25 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO bernedom/SI
+    REF "${VERSION}"
+    SHA512 499bf6cd1c68cf5195f15b94910d4f3973a040c2d217aab4eacaa29bfefc031b441639272cffb4b810fd27ff3a664d55284c1252da5e4504ebc768d1a3567f78
+    HEAD_REF master
+)
+
+set(VCPKG_BUILD_TYPE release) # header-only port
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DSI_INSTALL_LIBRARY=ON
+        -DSI_BUILD_TESTING=OFF
+        -DSI_BUILD_DOC=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME SI CONFIG_PATH share/SI/cmake)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/si/usage b/external_imported/vcpkg/ports/si/usage
new file mode 100644
index 000000000..d63111721
--- /dev/null
+++ b/external_imported/vcpkg/ports/si/usage
@@ -0,0 +1,4 @@
+si provides CMake targets:
+
+    find_package(SI CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE SI::SI)
diff --git a/external_imported/vcpkg/ports/si/vcpkg.json b/external_imported/vcpkg/ports/si/vcpkg.json
new file mode 100644
index 000000000..fb0068c88
--- /dev/null
+++ b/external_imported/vcpkg/ports/si/vcpkg.json
@@ -0,0 +1,17 @@
+{
+  "name": "si",
+  "version": "2.5.1",
+  "description": "A header only C++ library that provides type safety and user defined literals for physical units",
+  "homepage": "https://si.dominikberner.ch/doc/",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/sigmatch/portfile.cmake b/external_imported/vcpkg/ports/sigmatch/portfile.cmake
new file mode 100644
index 000000000..afe05cca1
--- /dev/null
+++ b/external_imported/vcpkg/ports/sigmatch/portfile.cmake
@@ -0,0 +1,22 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO SpriteOvO/sigmatch
+    REF v0.2.0
+    SHA512 a2ae12bf2da4de4b4b65f443febca8bec5ded2cdcbfe5c166538869431558241883576fed04fc373b60fe5b5709c96a56110181d3b1c07dbb42ecfdddae74c06
+    HEAD_REF main
+)
+
+set(VCPKG_BUILD_TYPE release) # header-only
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DSIGMATCH_BUILD_TESTS=OFF
+)
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/sigmatch)
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
diff --git a/external_imported/vcpkg/ports/sigmatch/vcpkg.json b/external_imported/vcpkg/ports/sigmatch/vcpkg.json
new file mode 100644
index 000000000..bf71d5aa9
--- /dev/null
+++ b/external_imported/vcpkg/ports/sigmatch/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "sigmatch",
+  "version": "0.2.0",
+  "description": "Modern C++ 20 signature match / search library",
+  "homepage": "https://github.com/SpriteOvO/sigmatch",
+  "license": "Apache-2.0",
+  "supports": "windows & !uwp",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/signalrclient/vcpkg.json b/external_imported/vcpkg/ports/signalrclient/vcpkg.json
index 5df043d31..7a5bcaa0a 100644
--- a/external_imported/vcpkg/ports/signalrclient/vcpkg.json
+++ b/external_imported/vcpkg/ports/signalrclient/vcpkg.json
@@ -1,14 +1,13 @@
 {
   "name": "signalrclient",
-  "version-string": "1.0.0-beta1-9",
-  "port-version": 3,
+  "version": "1.0.0-beta1-9",
+  "port-version": 5,
   "description": "C++ client for SignalR.",
   "homepage": "https://github.com/SignalR/SignalR-Client-Cpp",
   "dependencies": [
     {
       "name": "cpprestsdk",
       "features": [
-        "default-features",
         "websockets"
       ]
     },
diff --git a/external_imported/vcpkg/ports/sigslot/vcpkg.json b/external_imported/vcpkg/ports/sigslot/vcpkg.json
index 20bf9b068..6b2cf0294 100644
--- a/external_imported/vcpkg/ports/sigslot/vcpkg.json
+++ b/external_imported/vcpkg/ports/sigslot/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "sigslot",
-  "version-string": "1.0.0",
-  "port-version": 4,
+  "version": "1.0.0",
+  "port-version": 5,
   "description": "Portable C++ type-safe, thread-safe signal/slot library for ISO C++, Unix/BSD/Linux and Win32. Sigslot allows C++ code to use the signal/slot paradigm made popular by, for example, Qt."
 }
diff --git a/external_imported/vcpkg/ports/simage/portfile.cmake b/external_imported/vcpkg/ports/simage/portfile.cmake
index e381261b6..f791c0e6f 100644
--- a/external_imported/vcpkg/ports/simage/portfile.cmake
+++ b/external_imported/vcpkg/ports/simage/portfile.cmake
@@ -2,8 +2,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Coin3D/simage
-    REF 3940692136e02b9e62b3061cf72f053827b5494e #v1.8.2
-    SHA512 9a39738e32004bdd3e2882fe96778c773758b6d74398a62ba1c5ab09836c0637f89b8a46e8485b9d4196f33864f31f75511f441cfc24d7536659fa610ddf1875
+    REF "v${VERSION}"
+    SHA512 42981f1dc67f17bc6bfc49ecbf035444b79ab467d5ece4310841856f5ec87d2b4352d5a7cb5713fb14ac5a25928f7d657fb74c93acdcd86b8b0dd89f26a5008a
     HEAD_REF master
     PATCHES requies-all-dependencies.patch
 )
diff --git a/external_imported/vcpkg/ports/simage/vcpkg.json b/external_imported/vcpkg/ports/simage/vcpkg.json
index 04b507744..346ea7217 100644
--- a/external_imported/vcpkg/ports/simage/vcpkg.json
+++ b/external_imported/vcpkg/ports/simage/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "simage",
-  "version-semver": "1.8.2",
-  "port-version": 2,
+  "version-semver": "1.8.3",
   "description": "Image file format library abstraction layer",
   "homepage": "https://github.com/coin3d/simage",
   "license": "ISC",
diff --git a/external_imported/vcpkg/ports/simd/portfile.cmake b/external_imported/vcpkg/ports/simd/portfile.cmake
index 992aff50b..e219cefc4 100644
--- a/external_imported/vcpkg/ports/simd/portfile.cmake
+++ b/external_imported/vcpkg/ports/simd/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ermig1979/Simd
     REF "v${VERSION}"
-    SHA512 d9351a6b67b8c1f38f70d252bcbaf3271f4242c1bbe453ffa1cd5281de4b78fb697f6741bccc0ddbe73bf5d9b79fd1d1ecf64a0ddfb288c67cc1077194603b2e
+    SHA512 33521f493f59e7d0a82d4307cd0178e45cd47a2daa768430190789b601a8b214b7e4d9ca0c8116a6190c804854a3bca8c7e4048b6d8e1c288d8c58f27aa2b476
     HEAD_REF master
 )
 
@@ -30,6 +30,12 @@ if(VCPKG_TARGET_IS_WINDOWS AND (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPK
     vcpkg_replace_string("${SOURCE_PATH}/prj/${SOLUTION_TYPE}/Simd.vcxproj"
 	     "<ConfigurationType>DynamicLibrary</ConfigurationType>"
 		 "<ConfigurationType>StaticLibrary</ConfigurationType>")
+    file(GLOB_RECURSE PROJ_FILES "${SOURCE_PATH}/prj/${SOLUTION_TYPE}/*.vcxproj")
+    foreach(PROJ_FILE ${PROJ_FILES})
+        vcpkg_replace_string(${PROJ_FILE}
+          "    </ClCompile>"
+          "      <DebugInformationFormat>OldStyle</DebugInformationFormat>\n    </ClCompile>")
+    endforeach()
     if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
 	  file(GLOB_RECURSE PROJ_FILES "${SOURCE_PATH}/prj/${SOLUTION_TYPE}/*.vcxproj")
 	  foreach(PROJ_FILE ${PROJ_FILES})
@@ -48,7 +54,7 @@ if(VCPKG_TARGET_IS_WINDOWS AND (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPK
   	RELEASE_CONFIGURATION "Release"
   	DEBUG_CONFIGURATION "Debug"
   )
-  
+  vcpkg_copy_pdbs()
   file(GLOB SIMD_HEADERS "${SOURCE_PATH}/src/Simd/*.hpp" "${SOURCE_PATH}/src/Simd/*.h")
   file(COPY ${SIMD_HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include/Simd")
 elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
diff --git a/external_imported/vcpkg/ports/simd/vcpkg.json b/external_imported/vcpkg/ports/simd/vcpkg.json
index ecadffb6c..0bd28b874 100644
--- a/external_imported/vcpkg/ports/simd/vcpkg.json
+++ b/external_imported/vcpkg/ports/simd/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "simd",
-  "version": "5.2.123",
+  "version": "5.3.128",
   "description": "Simd image processing and machine learning library, designed for C and C++ programmers",
   "homepage": "https://github.com/ermig1979/Simd",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/simde/fix-windows-minmax.patch b/external_imported/vcpkg/ports/simde/fix-windows-minmax.patch
deleted file mode 100644
index 52feeafc5..000000000
--- a/external_imported/vcpkg/ports/simde/fix-windows-minmax.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/simde/x86/sse.h b/simde/x86/sse.h
-index 00119d3..a9dd705 100644
---- a/simde/x86/sse.h
-+++ b/simde/x86/sse.h
-@@ -33,6 +33,7 @@
- #include "mmx.h"
- 
- #if defined(_WIN32)
-+  #define NOMINMAX
-   #include <windows.h>
- #endif
- 
diff --git a/external_imported/vcpkg/ports/simde/portfile.cmake b/external_imported/vcpkg/ports/simde/portfile.cmake
index 510d93d5d..2901a1fe8 100644
--- a/external_imported/vcpkg/ports/simde/portfile.cmake
+++ b/external_imported/vcpkg/ports/simde/portfile.cmake
@@ -2,14 +2,12 @@
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO nemequ/simde
-    REF v0.7.2
-    SHA512 E4EE5A4A7E8453F116F1325D147F91D358A300F41EA5566EA30FC19649BABABF3B87E3DC838D5608B578BD152207DF4156200FFC7FB98141BC7C0BB60C75F1F5
+    REPO simd-everywhere/simde
+    REF "v${VERSION}"
+    SHA512 de17fca563c4db6766881e1c73142ad129a57febe55fa8ea1ae780226e60a84891b13d387e75574f2722d77e4013176e3c7dfaf17bccd8682b7d3d3ec8e92a54
     HEAD_REF master
-    PATCHES
-        fix-windows-minmax.patch
 )
 
 file(COPY "${SOURCE_PATH}/simde" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
 
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/simde/vcpkg.json b/external_imported/vcpkg/ports/simde/vcpkg.json
index cfa1b0664..5d1bb5448 100644
--- a/external_imported/vcpkg/ports/simde/vcpkg.json
+++ b/external_imported/vcpkg/ports/simde/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "simde",
-  "version": "0.7.2",
-  "port-version": 1,
+  "version": "0.7.6",
   "description": "Implementations of SIMD instruction sets for systems which don't natively support them",
   "homepage": "https://github.com/simd-everywhere/simde",
   "license": "MIT"
diff --git a/external_imported/vcpkg/ports/simdjson/portfile.cmake b/external_imported/vcpkg/ports/simdjson/portfile.cmake
index f5d8db978..581b1d7f1 100644
--- a/external_imported/vcpkg/ports/simdjson/portfile.cmake
+++ b/external_imported/vcpkg/ports/simdjson/portfile.cmake
@@ -3,7 +3,7 @@ vcpkg_from_github(
     REPO simdjson/simdjson
     REF "v${VERSION}"
     HEAD_REF master
-    SHA512 e2a8c3b21b134c96158f8a6f209ea4c9c7bd63205ad967860a99ad24bc607b857f3a952ab84cdf927322ddcc6a549555d32c163751fe4ff2b5776de918685b40
+    SHA512 370a2e37dd08f6df2720f94beddc14ce3a04e8216fe1fbd5c2119166a2bd070daad80d193da1ee683bb4a320f446f3bb38cc100928d534df0a28a48ad8fb6137
 )
 
 vcpkg_check_features(
@@ -41,4 +41,4 @@ vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
\ No newline at end of file
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/simdjson/vcpkg.json b/external_imported/vcpkg/ports/simdjson/vcpkg.json
index ccdb8d42c..4693cb8ca 100644
--- a/external_imported/vcpkg/ports/simdjson/vcpkg.json
+++ b/external_imported/vcpkg/ports/simdjson/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "simdjson",
-  "version": "3.1.5",
+  "version": "3.6.2",
   "description": "A extremely fast JSON library that can parse gigabytes of JSON per second",
   "homepage": "https://simdjson.org/",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/simdutf/disable-tests-and-benchmarks.patch b/external_imported/vcpkg/ports/simdutf/disable-tests-and-benchmarks.patch
deleted file mode 100644
index d621f6d7a..000000000
--- a/external_imported/vcpkg/ports/simdutf/disable-tests-and-benchmarks.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5453644..d3f2869 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -14,17 +14,10 @@ include(cmake/simdutf-flags.cmake)
- 
- set(SIMDUTF_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
- 
--enable_testing()
- add_subdirectory(src)
--add_subdirectory(tests)
- 
- 
- 
--if(CMAKE_CXX_COMPILER_ID MATCHES GNU AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.0)
--  message(STATUS "The benchmark tool requires GCC 8.0 or better.")
--else()
--  add_subdirectory(benchmarks)
--endif()
- 
- 
- # ---- Install rules ----
diff --git a/external_imported/vcpkg/ports/simdutf/portfile.cmake b/external_imported/vcpkg/ports/simdutf/portfile.cmake
index 809247a8c..64d1e4305 100644
--- a/external_imported/vcpkg/ports/simdutf/portfile.cmake
+++ b/external_imported/vcpkg/ports/simdutf/portfile.cmake
@@ -1,20 +1,29 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO simdutf/simdutf
-    REF v1.0.0
-    SHA512 3ab09aa61cb9765bf1a77de59c5b823ee58ae5e4badfd5dd70e511fd4f378f8d3917a5b577e7f275720b975740344968132ce0b3f628452bde67f2ab6cc82337
+    REF "v${VERSION}"
+    SHA512 f9d307bc769450cc0ff967ad5d764db15a7c38011c17096fcb824e4a89c0ae29ae66137c9063b8c54a42937600d058a8bd31439cf12c68d31a0053b1b8dd619f
     HEAD_REF master
-    PATCHES
-        disable-tests-and-benchmarks.patch
+)
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+    "tools" SIMDUTF_TOOLS
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS ${FEATURE_OPTIONS}
+        -DSIMDUTF_TESTS=OFF
+        -DSIMDUTF_BENCHMARKS=OFF
 )
 
 vcpkg_cmake_install()
 
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
+if ("tools" IN_LIST FEATURES)
+    vcpkg_copy_tools(TOOL_NAMES sutf AUTO_CLEAN)
+endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(INSTALL "${SOURCE_PATH}/LICENSE-APACHE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE-APACHE")
diff --git a/external_imported/vcpkg/ports/simdutf/vcpkg.json b/external_imported/vcpkg/ports/simdutf/vcpkg.json
index 68ddc24a2..bda37ab3a 100644
--- a/external_imported/vcpkg/ports/simdutf/vcpkg.json
+++ b/external_imported/vcpkg/ports/simdutf/vcpkg.json
@@ -1,7 +1,7 @@
 {
+  "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
   "name": "simdutf",
-  "version-semver": "1.0.0",
-  "port-version": 1,
+  "version-semver": "3.2.16",
   "description": "Unicode validation and transcoding at billions of characters per second",
   "homepage": "https://github.com/simdutf/simdutf",
   "dependencies": [
@@ -13,5 +13,10 @@
       "name": "vcpkg-cmake-config",
       "host": true
     }
-  ]
+  ],
+  "features": {
+    "tools": {
+      "description": "Build the simdutf command line tool for transcoding strings"
+    }
+  }
 }
diff --git a/external_imported/vcpkg/ports/simonbrunel-qtpromise/patches/install_headers.patch b/external_imported/vcpkg/ports/simonbrunel-qtpromise/patches/install_headers.patch
new file mode 100644
index 000000000..6bbbd98ad
--- /dev/null
+++ b/external_imported/vcpkg/ports/simonbrunel-qtpromise/patches/install_headers.patch
@@ -0,0 +1,17 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -21,6 +21,14 @@ add_library(qtpromise::qtpromise ALIAS qtpromise)
+ target_link_libraries(qtpromise INTERFACE Qt${QT_VERSION_MAJOR}::Core)
+ target_include_directories(qtpromise INTERFACE "${CMAKE_CURRENT_LIST_DIR}/include")
+ 
++if(QTPROMISE_HEADER_INSTALL_DESTINATION)
++    install(
++        DIRECTORY "include" "src"
++        DESTINATION "${QTPROMISE_HEADER_INSTALL_DESTINATION}" 
++        CONFIGURATIONS "${QTPROMISE_HEADER_INSTALL_COMPONENTS}"
++    )
++endif()
++
+ add_definitions(
+     -DQT_DEPRECATED_WARNINGS
+     -DQT_NO_KEYWORDS
diff --git a/external_imported/vcpkg/ports/simonbrunel-qtpromise/patches/remove_error_flags.patch b/external_imported/vcpkg/ports/simonbrunel-qtpromise/patches/remove_error_flags.patch
new file mode 100644
index 000000000..8499cbcfd
--- /dev/null
+++ b/external_imported/vcpkg/ports/simonbrunel-qtpromise/patches/remove_error_flags.patch
@@ -0,0 +1,21 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -34,6 +34,7 @@ add_definitions(
+     -DQT_NO_KEYWORDS
+ )
+ 
++#[[ remove error flags
+ # https://github.com/simonbrunel/qtpromise/issues/10
+ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+     # https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html
+@@ -83,8 +84,10 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+         /WX
+     )
+ endif()
++]]
+ 
+ if(NOT SUBPROJECT)
+     enable_testing()
+     add_subdirectory(tests)
+ endif()
++
diff --git a/external_imported/vcpkg/ports/simonbrunel-qtpromise/portfile.cmake b/external_imported/vcpkg/ports/simonbrunel-qtpromise/portfile.cmake
new file mode 100644
index 000000000..e0907e497
--- /dev/null
+++ b/external_imported/vcpkg/ports/simonbrunel-qtpromise/portfile.cmake
@@ -0,0 +1,24 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO simonbrunel/qtpromise
+    REF "v${VERSION}"
+    SHA512 0d6316ec9503a7781b4d9e615e6d538b21b6282a76e5e28e3f323bcdb740e6f66e6c55944e31fc62cec7cc25a90b0f7318277f044a630500202971ca6e2e85b6
+    HEAD_REF master
+    PATCHES
+        patches/install_headers.patch
+        patches/remove_error_flags.patch
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}" 
+    OPTIONS 
+        -DQTPROMISE_HEADER_INSTALL_DESTINATION="${CURRENT_PACKAGES_DIR}/include/${PORT}"
+        -DQTPROMISE_HEADER_INSTALL_COMPONENTS="Release"
+)
+vcpkg_cmake_install()
+
+set(USE_QT_VERSION "6") # for Qt5, replace this number with 5, and replace the dependency on port qtbase in vcpkg.json with port qt5-base
+configure_file("${CMAKE_CURRENT_LIST_DIR}/unofficial-config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake" @ONLY)
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY)
diff --git a/external_imported/vcpkg/ports/simonbrunel-qtpromise/unofficial-config.cmake.in b/external_imported/vcpkg/ports/simonbrunel-qtpromise/unofficial-config.cmake.in
new file mode 100644
index 000000000..2458704aa
--- /dev/null
+++ b/external_imported/vcpkg/ports/simonbrunel-qtpromise/unofficial-config.cmake.in
@@ -0,0 +1,19 @@
+
+set(@PORT@_VERSION "@VERSION@")
+
+if(TARGET unofficial-@PORT@)
+    set(unofficial-@PORT@_FOUND TRUE)
+    return()
+endif()
+
+include(CMakeFindDependencyMacro)
+
+find_dependency(Qt@USE_QT_VERSION@ REQUIRED COMPONENTS Core)
+
+add_library(unofficial-@PORT@ INTERFACE)
+
+target_link_libraries(unofficial-@PORT@ INTERFACE Qt::Core)
+target_include_directories(unofficial-@PORT@ INTERFACE "${CMAKE_CURRENT_LIST_DIR}/../../include/@PORT@/include")
+
+set(unofficial-@PORT@_FOUND TRUE)
+
diff --git a/external_imported/vcpkg/ports/simonbrunel-qtpromise/usage b/external_imported/vcpkg/ports/simonbrunel-qtpromise/usage
new file mode 100644
index 000000000..ed536b15e
--- /dev/null
+++ b/external_imported/vcpkg/ports/simonbrunel-qtpromise/usage
@@ -0,0 +1,4 @@
+simonbrunel-qtpromise provides CMake targets:
+
+find_package(unofficial-simonbrunel-qtpromise CONFIG REQUIRED)
+target_link_libraries(main PRIVATE unofficial-simonbrunel-qtpromise)
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/simonbrunel-qtpromise/vcpkg.json b/external_imported/vcpkg/ports/simonbrunel-qtpromise/vcpkg.json
new file mode 100644
index 000000000..6917e4407
--- /dev/null
+++ b/external_imported/vcpkg/ports/simonbrunel-qtpromise/vcpkg.json
@@ -0,0 +1,15 @@
+{
+  "name": "simonbrunel-qtpromise",
+  "version": "0.7.0",
+  "maintainers": "Simon Brunel",
+  "description": "Promises/A+ implementation for Qt/C++",
+  "homepage": "https://qtpromise.netlify.app/",
+  "license": "MIT",
+  "dependencies": [
+    "qtbase",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/simple-fft/vcpkg.json b/external_imported/vcpkg/ports/simple-fft/vcpkg.json
index 76b399066..f0e5a9f86 100644
--- a/external_imported/vcpkg/ports/simple-fft/vcpkg.json
+++ b/external_imported/vcpkg/ports/simple-fft/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "simple-fft",
-  "version-string": "2020-06-14",
-  "port-version": 1,
+  "version-date": "2020-06-14",
+  "port-version": 2,
   "description": "Header-only C++ library implementing fast Fourier transform of 1D, 2D and 3D data",
   "homepage": "https://github.com/d1vanov/Simple-FFT"
 }
diff --git a/external_imported/vcpkg/ports/simpleble/portfile.cmake b/external_imported/vcpkg/ports/simpleble/portfile.cmake
new file mode 100644
index 000000000..36b764f84
--- /dev/null
+++ b/external_imported/vcpkg/ports/simpleble/portfile.cmake
@@ -0,0 +1,25 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO OpenBluetoothToolbox/SimpleBLE
+    HEAD_REF main
+    REF a07397dbdd7f8149b7b235b5b21b88b60e8cfbed
+    SHA512 f9bdb668da151dbc2335b9cfd17a130fdefb349e57e9ff3a270e1c0cc8b7ad1bfdf03704cd1e2c1c7c8b34f44684aa2bf649c14666c2c6fd9ea0ddad1e6bc8a3
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}/simpleble"
+    OPTIONS
+        -DLIBFMT_VENDORIZE=OFF
+)
+
+vcpkg_cmake_install()
+
+vcpkg_copy_pdbs()
+
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/simpleble")
+
+vcpkg_fixup_pkgconfig()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
diff --git a/external_imported/vcpkg/ports/simpleble/vcpkg.json b/external_imported/vcpkg/ports/simpleble/vcpkg.json
new file mode 100644
index 000000000..a6a4a44bd
--- /dev/null
+++ b/external_imported/vcpkg/ports/simpleble/vcpkg.json
@@ -0,0 +1,19 @@
+{
+  "name": "simpleble",
+  "version-date": "2023-07-29",
+  "description": "The ultimate fully-fledged cross-platform library and bindings for Bluetooth Low Energy (BLE).",
+  "homepage": "https://github.com/OpenBluetoothToolbox/SimpleBLE",
+  "license": "MIT",
+  "supports": "!android & !uwp",
+  "dependencies": [
+    "fmt",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/simsimd/portfile.cmake b/external_imported/vcpkg/ports/simsimd/portfile.cmake
new file mode 100644
index 000000000..e0beac34c
--- /dev/null
+++ b/external_imported/vcpkg/ports/simsimd/portfile.cmake
@@ -0,0 +1,11 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO ashvardanian/SimSIMD
+    REF "v${VERSION}"
+    SHA512 44a3f971bebbb4f4575dc50dc50795762fd5555f4811fc86a8699fe97dff556b4391128abb4f21b3b94210f9f6f20da854d9471d5443f4ad700a9e21ea905041
+    HEAD_REF main
+)
+
+file(INSTALL "${SOURCE_PATH}/include" DESTINATION "${CURRENT_PACKAGES_DIR}")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/simsimd/vcpkg.json b/external_imported/vcpkg/ports/simsimd/vcpkg.json
new file mode 100644
index 000000000..3945351e9
--- /dev/null
+++ b/external_imported/vcpkg/ports/simsimd/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "simsimd",
+  "version": "1.4.0",
+  "description": "Fastest similarity-measures and distance functions on the Wild West – vectors, strings, short molecules, and even DNA sequences. All with a pinch of SIMD for both x86 and ARM.",
+  "homepage": "https://github.com/ashvardanian/SimSIMD",
+  "license": "Apache-2.0"
+}
diff --git a/external_imported/vcpkg/ports/skia/add-cstdlib.patch b/external_imported/vcpkg/ports/skia/add-cstdlib.patch
new file mode 100644
index 000000000..9c7c1655b
--- /dev/null
+++ b/external_imported/vcpkg/ports/skia/add-cstdlib.patch
@@ -0,0 +1,12 @@
+diff --git a/src/dawn/common/Mutex.cpp b/src/dawn/common/Mutex.cpp
+index b8b891f..84c47af 100644
+--- a/src/dawn/common/Mutex.cpp
++++ b/src/dawn/common/Mutex.cpp
+@@ -13,6 +13,7 @@
+ // limitations under the License.
+ 
+ #include "dawn/common/Mutex.h"
++#include <cstdlib>
+ 
+ namespace dawn {
+ Mutex::~Mutex() = default;
diff --git a/external_imported/vcpkg/ports/skia/core-opengl32.patch b/external_imported/vcpkg/ports/skia/core-opengl32.patch
deleted file mode 100644
index b1eec1722..000000000
--- a/external_imported/vcpkg/ports/skia/core-opengl32.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/BUILD.gn b/BUILD.gn
-index 71d19dd..3691123 100644
---- a/BUILD.gn
-+++ b/BUILD.gn
-@@ -1393,6 +1393,9 @@ skia_component("skia") {
- 
-   defines = [ "SK_HAS_ANDROID_CODEC" ]
-   libs = []
-+  if (is_win && target_cpu != "arm64" && !skia_enable_winuwp) {
-+    libs += [ "OpenGL32.lib" ] # for src/utils/win/SkWGL_win.cpp
-+  }
- 
-   if (skia_enable_sksl) {
-     deps += [ ":dehydrate_sksl" ]
diff --git a/external_imported/vcpkg/ports/skia/dawn-dedup-native-proc-gen.patch b/external_imported/vcpkg/ports/skia/dawn-dedup-native-proc-gen.patch
new file mode 100644
index 000000000..f07b17073
--- /dev/null
+++ b/external_imported/vcpkg/ports/skia/dawn-dedup-native-proc-gen.patch
@@ -0,0 +1,26 @@
+diff --git a/src/dawn/native/BUILD.gn b/src/dawn/native/BUILD.gn
+index 24853ced..064b839b 100644
+--- a/src/dawn/native/BUILD.gn
++++ b/src/dawn/native/BUILD.gn
+@@ -882,6 +882,10 @@ dawn_json_generator("webgpu_dawn_native_proc_gen") {
+   target = "webgpu_dawn_native_proc"
+   outputs = [ "src/dawn/native/webgpu_dawn_native_proc.cpp" ]
+ }
++source_set("webgpu_dawn_native_proc_gen_sources") {
++    sources = get_target_outputs(":webgpu_dawn_native_proc_gen")
++    deps = [ ":webgpu_dawn_native_proc_gen" ]
++}
+ 
+ dawn_component("webgpu_dawn") {
+   # For a single library - build `webgpu_dawn_shared` with GN args:
+@@ -901,9 +905,8 @@ dawn_component("webgpu_dawn") {
+   DEFINE_PREFIX = "WGPU"
+   output_name = "webgpu_dawn"
+ 
+-  sources = get_target_outputs(":webgpu_dawn_native_proc_gen")
+   deps = [
+     ":static",
+-    ":webgpu_dawn_native_proc_gen",
++    ":webgpu_dawn_native_proc_gen_sources",
+   ]
+ }
diff --git a/external_imported/vcpkg/ports/skia/disable-dev-test.patch b/external_imported/vcpkg/ports/skia/disable-dev-test.patch
new file mode 100644
index 000000000..9eb1be33d
--- /dev/null
+++ b/external_imported/vcpkg/ports/skia/disable-dev-test.patch
@@ -0,0 +1,13 @@
+diff --git a/BUILD.gn b/BUILD.gn
+index 3691123..8682b8e 100644
+--- a/BUILD.gn
++++ b/BUILD.gn
+@@ -97,7 +97,7 @@ config("skia_private") {
+   if (is_skia_dev_build && !is_wasm) {
+     defines += [
+       "SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=1",
+-      "GR_TEST_UTILS=1",
++      "GR_TEST_UTILS=0",
+     ]
+     if (skia_enable_graphite) {
+       defines += [ "GRAPHITE_TEST_UTILS=1" ]
diff --git a/external_imported/vcpkg/ports/skia/example/CMakeLists.txt b/external_imported/vcpkg/ports/skia/example/CMakeLists.txt
index 114ef3f1b..109ac5fde 100644
--- a/external_imported/vcpkg/ports/skia/example/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/skia/example/CMakeLists.txt
@@ -4,7 +4,10 @@ project(skia-example)
 
 set(CMAKE_CXX_STANDARD 17)
 
-add_executable(main convert-to-nia.cpp)
+add_executable(legacy convert-to-nia.cpp)
+find_package(skia CONFIG REQUIRED)
+target_link_libraries(legacy PRIVATE skia)
 
+add_executable(main convert-to-nia.cpp)
 find_package(unofficial-skia CONFIG REQUIRED)
-target_link_libraries(main PRIVATE unofficial::skia::skia)
+target_link_libraries(main PRIVATE unofficial::skia::skia unofficial::skia::modules::skshaper)
diff --git a/external_imported/vcpkg/ports/skia/portfile.cmake b/external_imported/vcpkg/ports/skia/portfile.cmake
index 1d6c0adb0..bdcfd94ea 100644
--- a/external_imported/vcpkg/ports/skia/portfile.cmake
+++ b/external_imported/vcpkg/ports/skia/portfile.cmake
@@ -1,31 +1,36 @@
 include("${CMAKE_CURRENT_LIST_DIR}/skia-functions.cmake")
 
-vcpkg_from_git(
+vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    URL https://github.com/google/skia
-    REF f86f242886692a18f5adc1cf9cbd6740cd0870fd
+    REPO google/skia
+    REF "canvaskit/${VERSION}"
+    SHA512 4672cfef8c92f37418e27df30a4e3fd6f7ca6273521e9d6b7755d9285800ad1ea6eff66639a17f591e6921ec8b78aa828500399a83295f9984ab58ebaff0ec24
     PATCHES
         disable-msvc-env-setup.patch
         uwp.patch
-        core-opengl32.patch
+        disable-dev-test.patch
+        skdebug-stdio.patch
 )
 
 # these following aren't available in vcpkg
 # to update, visit the DEPS file in Skia's root directory
 declare_external_from_git(abseil-cpp
-    URL "https://skia.googlesource.com/external/github.com/abseil/abseil-cpp.git"
-    REF "c5a424a2a21005660b182516eb7a079cd8021699"
+    URL "https://github.com/abseil/abseil-cpp.git"
+    REF "cb436cf0142b4cbe47aae94223443df7f82e2920"
     LICENSE_FILE LICENSE
 )
 declare_external_from_git(d3d12allocator
-    URL "https://skia.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator.git"
+    URL "https://github.com/GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator.git"
     REF "169895d529dfce00390a20e69c2f516066fe7a3b"
     LICENSE_FILE LICENSE.txt
 )
 declare_external_from_git(dawn
     URL "https://dawn.googlesource.com/dawn.git"
-    REF "30fa0d8d2ced43e44baa522dd4bd4684b14a3099"
+    REF "6e25bf7674bbcb1d1e613dc0700c958830950037"
     LICENSE_FILE LICENSE
+    PATCHES
+        dawn-dedup-native-proc-gen.patch
+        add-cstdlib.patch
 )
 declare_external_from_git(dng_sdk
     URL "https://android.googlesource.com/platform/external/dng_sdk.git"
@@ -37,11 +42,6 @@ declare_external_from_git(jinja2
     REF "ee69aa00ee8536f61db6a451f3858745cf587de6"
     LICENSE_FILE LICENSE.rst
 )
-declare_external_from_git(libgifcodec
-    URL "https://skia.googlesource.com/libgifcodec"
-    REF "fd59fa92a0c86788dcdd84d091e1ce81eda06a77"
-    LICENSE_FILE LICENSE.md
-)
 declare_external_from_git(markupsafe
     URL "https://chromium.googlesource.com/chromium/src/third_party/markupsafe"
     REF "0944e71f4b2cb9a871bcbe353f95e889b64a611a"
@@ -53,60 +53,66 @@ declare_external_from_git(piex
     LICENSE_FILE LICENSE
 )
 declare_external_from_git(sfntly
-    URL "https://github.com/googlefonts/sfntly.git"
+    URL "https://github.com/googlei18n/sfntly.git"
     REF "b55ff303ea2f9e26702b514cf6a3196a2e3e2974"
     LICENSE_FILE README.md
 )
 declare_external_from_git(spirv-cross
-    URL "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross"
-    REF "61c603f3baa5270e04bcfb6acf83c654e3c57679"
+    URL "https://github.com/KhronosGroup/SPIRV-Cross"
+    REF "030d0be28c35bafebd20660c112852b1d8c8c6ca"
     LICENSE_FILE LICENSE
 )
 declare_external_from_git(spirv-headers
-    URL "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers.git"
-    REF "0bcc624926a25a2a273d07877fd25a6ff5ba1cfb"
+    URL "https://github.com/KhronosGroup/SPIRV-Headers.git"
+    REF "8e2ad27488ed2f87c068c01a8f5e8979f7086405"
     LICENSE_FILE LICENSE
 )
 declare_external_from_git(spirv-tools
-    URL "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git"
-    REF "0073a1fa36f7c52ad3d58059cb5d5de8efa825ad"
-    LICENSE_FILE LICENSE
-)
-declare_external_from_git(tint
-    URL "https://dawn.googlesource.com/tint"
-    REF "200492e32b94f042d9942154fb4fa7f93bb8289a"
+    URL "https://github.com/KhronosGroup/SPIRV-Tools.git"
+    REF "93c13345e176f3f8bdb4b07e59c5e3365b3dbf44"
     LICENSE_FILE LICENSE
 )
-declare_external_from_git(vulkan-headers
-    URL "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers"
-    REF "c896e2f920273bfee852da9cca2a356bc1c2031e"
-    LICENSE_FILE LICENSE.txt
-)
 declare_external_from_git(vulkan-tools
-    URL "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools"
-    REF "d55c7aaf041af331bee8c22fb448a6ff4c797f73"
+    URL "https://github.com/KhronosGroup/Vulkan-Tools"
+    REF "2c83dd6cb2ef710bab843b69776997d6f2c12ba4"
     LICENSE_FILE LICENSE.txt
 )
+declare_external_from_git(wuffs
+    URL "https://github.com/google/wuffs-mirror-release-c.git"
+    REF "a0041ac0310b3156b963e2f2bea09245f25ec073"
+    LICENSE_FILE LICENSE
+)
 
 declare_external_from_pkgconfig(expat)
 declare_external_from_pkgconfig(fontconfig PATH "third_party")
 declare_external_from_pkgconfig(freetype2)
 declare_external_from_pkgconfig(harfbuzz MODULES harfbuzz harfbuzz-subset)
-declare_external_from_pkgconfig(icu MODULES icu-uc DEFINES "U_USING_ICU_NAMESPACE=0")
+declare_external_from_pkgconfig(icu MODULES icu-uc)
 declare_external_from_pkgconfig(libjpeg PATH "third_party/libjpeg-turbo" MODULES libturbojpeg libjpeg)
 declare_external_from_pkgconfig(libpng)
 declare_external_from_pkgconfig(libwebp MODULES libwebpdecoder libwebpdemux libwebpmux libwebp)
 declare_external_from_pkgconfig(zlib)
 
+declare_external_from_vcpkg(vulkan_headers PATH third_party/externals/vulkan-headers)
+
 set(known_cpus x86 x64 arm arm64 wasm)
 if(NOT VCPKG_TARGET_ARCHITECTURE IN_LIST known_cpus)
     message(WARNING "Unknown target cpu '${VCPKG_TARGET_ARCHITECTURE}'.")
 endif()
 
-set(OPTIONS "target_cpu=\"${VCPKG_TARGET_ARCHITECTURE}\"")
+string(JOIN " " OPTIONS
+    "target_cpu=\"${VCPKG_TARGET_ARCHITECTURE}\""
+    skia_enable_android_utils=false
+    skia_enable_spirv_validation=false
+    skia_enable_tools=false
+    skia_enable_gpu_debug_layers=false
+    skia_use_jpeg_gainmaps=false
+    skia_use_libheif=false
+    skia_use_lua=false
+)
 set(OPTIONS_DBG "is_debug=true")
 set(OPTIONS_REL "is_official_build=true")
-vcpkg_list(SET SKIA_TARGETS ":skia")
+vcpkg_list(SET SKIA_TARGETS :skia :modules)
 
 if(VCPKG_TARGET_IS_ANDROID)
     string(APPEND OPTIONS " target_os=\"android\"")
@@ -114,11 +120,14 @@ elseif(VCPKG_TARGET_IS_IOS)
     string(APPEND OPTIONS " target_os=\"ios\"")
 elseif(VCPKG_TARGET_IS_EMSCRIPTEN)
     string(APPEND OPTIONS " target_os=\"wasm\"")
-elseif(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+elseif(VCPKG_TARGET_IS_WINDOWS)
     string(APPEND OPTIONS " target_os=\"win\"")
     if(VCPKG_TARGET_IS_UWP)
         string(APPEND OPTIONS " skia_enable_winuwp=true skia_enable_fontmgr_win=false skia_use_xps=false")
     endif()
+    if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+        string(APPEND OPTIONS " skia_enable_skparagraph=false")
+    endif()
 endif()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
@@ -130,18 +139,21 @@ endif()
 set(required_externals
     dng_sdk
     expat
-    libgifcodec
     libjpeg
     libpng
     libwebp
     piex
     sfntly
     zlib
+    wuffs
 )
 
 if("fontconfig" IN_LIST FEATURES)
     list(APPEND required_externals fontconfig)
     string(APPEND OPTIONS " skia_use_fontconfig=true")
+    if(VCPKG_TARGET_IS_WINDOWS)
+        string(APPEND OPTIONS " skia_enable_fontmgr_FontConfigInterface=false")
+    endif()
 else()
     string(APPEND OPTIONS " skia_use_fontconfig=false")
 endif()
@@ -178,8 +190,18 @@ if("metal" IN_LIST FEATURES)
 endif()
 
 if("vulkan" IN_LIST FEATURES)
+    list(APPEND required_externals
+        vulkan_headers
+        vulkan-tools
+    )
     string(APPEND OPTIONS " skia_use_vulkan=true")
-    file(COPY "${CURRENT_INSTALLED_DIR}/include/vk_mem_alloc.h" DESTINATION "${SOURCE_PATH}/third_party/vulkanmemoryallocator")
+    find_file(vk_mem_alloc_h "vk_mem_alloc.h" PATHS "${CURRENT_INSTALLED_DIR}/include" PATH_SUFFIXES "vma" REQUIRED)
+    file(COPY "${vk_mem_alloc_h}" DESTINATION "${SOURCE_PATH}/third_party/externals/vulkanmemoryallocator/include")
+    # Cf. third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator.h:25
+    vcpkg_replace_string("${SOURCE_PATH}/third_party/externals/vulkanmemoryallocator/include/vk_mem_alloc.h"
+        "#include <vulkan/vulkan.h>"
+        "#ifndef VULKAN_H_\n    #include <vulkan/vulkan.h>\n#endif"
+    )
 endif()
 
 if("direct3d" IN_LIST FEATURES)
@@ -211,27 +233,24 @@ They can be installed on Debian based systems via
         spirv-cross
         spirv-headers
         spirv-tools
-        tint
         jinja2
         markupsafe
+        vulkan_headers
 ## Remove
-        vulkan-headers
         vulkan-tools
         abseil-cpp
 ## REMOVE ^
         dawn
     )
-    string(APPEND OPTIONS " skia_use_dawn=true")
-    string(REPLACE "dynamic" "shared" DAWN_LINKAGE "${VCPKG_LIBRARY_LINKAGE}")
-    vcpkg_list(APPEND SKIA_TARGETS
-        "third_party/externals/dawn/src/dawn:proc_${DAWN_LINKAGE}"
-        "third_party/externals/dawn/src/dawn/native:${DAWN_LINKAGE}"
-        "third_party/externals/dawn/src/dawn/platform:${DAWN_LINKAGE}"
-    )
+    # cf. external dawn/src/dawn/native/BUILD.gn
+    string(APPEND OPTIONS " skia_use_dawn=true dawn_use_angle=false dawn_use_swiftshader=false")
+    if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+        string(APPEND OPTIONS " dawn_complete_static_libs=true")
+    endif()
 endif()
 
 get_externals(${required_externals})
-if(EXISTS "${SOURCE_PATH}/third_party/externals/dawn/generator/dawn_version_generator.py")
+if(EXISTS "${SOURCE_PATH}/third_party/externals/dawn")
     vcpkg_find_acquire_program(GIT)
     vcpkg_replace_string("${SOURCE_PATH}/third_party/externals/dawn/generator/dawn_version_generator.py"
         "get_git()," 
@@ -245,9 +264,11 @@ vcpkg_replace_string("${SOURCE_PATH}/gn/toolchain/BUILD.gn" "python3 " "\\\"${PY
 
 vcpkg_cmake_get_vars(cmake_vars_file)
 include("${cmake_vars_file}")
-if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+if(VCPKG_TARGET_IS_WINDOWS)
     string(REGEX REPLACE "[\\]\$" "" WIN_VC "$ENV{VCINSTALLDIR}")
     string(APPEND OPTIONS " win_vc=\"${WIN_VC}\"")
+elseif(VCPKG_TARGET_IS_ANDROID)
+    string(APPEND OPTIONS " ndk=\"${VCPKG_DETECTED_CMAKE_ANDROID_NDK}\" ndk_api=${VCPKG_DETECTED_CMAKE_SYSTEM_VERSION}")
 else()
     string(APPEND OPTIONS " \
         cc=\"${VCPKG_DETECTED_CMAKE_C_COMPILER}\" \
@@ -271,31 +292,12 @@ endif()
 
 vcpkg_gn_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS "${OPTIONS} skia_use_lua=false skia_enable_tools=false skia_enable_spirv_validation=false"
+    OPTIONS "${OPTIONS}"
     OPTIONS_DEBUG "${OPTIONS_DBG}"
     OPTIONS_RELEASE "${OPTIONS_REL}"
 )
 
-# desc json output is dual-use: logging and further processing
-vcpkg_find_acquire_program(GN)
-vcpkg_execute_required_process(
-    COMMAND "${GN}" desc --format=json --all --testonly=false "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" "*"
-    WORKING_DIRECTORY "${SOURCE_PATH}"
-    LOGNAME "desc-${TARGET_TRIPLET}-rel"
-    OUTPUT_VARIABLE desc_release
-)
-file(READ "${CURRENT_BUILDTREES_DIR}/desc-${TARGET_TRIPLET}-rel-out.log" desc_release)
-if(NOT VCPKG_BUILD_TYPE)
-    vcpkg_execute_required_process(
-        COMMAND "${GN}" desc --format=json --all --testonly=false "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" "*"
-        WORKING_DIRECTORY "${SOURCE_PATH}"
-        LOGNAME "desc-${TARGET_TRIPLET}-dbg"
-        OUTPUT_VARIABLE desc_debug
-    )
-    file(READ "${CURRENT_BUILDTREES_DIR}/desc-${TARGET_TRIPLET}-dbg-out.log" desc_debug)
-endif()
-
-vcpkg_gn_install(
+skia_gn_install(
     SOURCE_PATH "${SOURCE_PATH}"
     TARGETS ${SKIA_TARGETS}
 )
@@ -315,14 +317,6 @@ vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/skia/include/core/SkTypes.
 # vcpkg legacy layout omits "include/" component. Just duplicate.
 file(COPY "${CURRENT_PACKAGES_DIR}/include/skia/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/skia")
 
-get_definitions(SKIA_DEFINITIONS_REL "${desc_release}" "//:skia")
-get_link_libs(SKIA_DEP_REL "${desc_release}" "//:skia")
-if(NOT VCPKG_BUILD_TYPE)
-    get_definitions(SKIA_DEFINITIONS_DBG "${desc_debug}" "//:skia")
-    get_link_libs(SKIA_DEP_DBG "${desc_debug}" "//:skia")
-endif()
-file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/unofficial-skia")
-configure_file("${CMAKE_CURRENT_LIST_DIR}/unofficial-skia-config.cmake" "${CURRENT_PACKAGES_DIR}/share/unofficial-skia/unofficial-skia-config.cmake" @ONLY)
 # vcpkg legacy
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/skiaConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/skia")
 
diff --git a/external_imported/vcpkg/ports/skia/skdebug-stdio.patch b/external_imported/vcpkg/ports/skia/skdebug-stdio.patch
new file mode 100644
index 000000000..136d75928
--- /dev/null
+++ b/external_imported/vcpkg/ports/skia/skdebug-stdio.patch
@@ -0,0 +1,12 @@
+diff --git a/src/ports/SkDebug_stdio.cpp b/src/ports/SkDebug_stdio.cpp
+index 78c7072b..3d5c134d 100644
+--- a/src/ports/SkDebug_stdio.cpp
++++ b/src/ports/SkDebug_stdio.cpp
+@@ -7,6 +7,7 @@
+ 
+ #include "include/private/base/SkFeatures.h"
+ #include "include/private/base/SkLoadUserConfig.h"
++#include "include/private/base/SkDebug.h"
+ 
+ #if !defined(SK_BUILD_FOR_WIN) && !defined(SK_BUILD_FOR_ANDROID)
+ 
diff --git a/external_imported/vcpkg/ports/skia/skia-functions.cmake b/external_imported/vcpkg/ports/skia/skia-functions.cmake
index d41631c70..24c4d2f5b 100644
--- a/external_imported/vcpkg/ports/skia/skia-functions.cmake
+++ b/external_imported/vcpkg/ports/skia/skia-functions.cmake
@@ -7,6 +7,8 @@ function(declare_external_from_git name)
     endif()
     set(actual "${arg_URL}@${arg_REF}")
     file(STRINGS "${SOURCE_PATH}/DEPS" upstream REGEX "\"third_party/externals/${name}\"")
+    string(REPLACE "https://chromium.googlesource.com/external/github.com" "https://github.com" upstream "${upstream}")
+    string(REPLACE "https://skia.googlesource.com/external/github.com" "https://github.com" upstream "${upstream}")
     string(FIND "${upstream}" "${arg_URL}@${arg_REF}" pos)
     if(pos STREQUAL "-1")
         string(REGEX REPLACE "^[^:]*:  *" "" upstream "${upstream}")
@@ -22,6 +24,11 @@ function(declare_external_from_pkgconfig name)
     set(skia_external_pkgconfig_${name} "${ARGN}" PARENT_SCOPE)
 endfunction()
 
+# Declare a named external dependencies to be resolved via vcpkg installed tree.
+function(declare_external_from_vcpkg name)
+    set(skia_external_vcpkg_${name} "${ARGN}" PARENT_SCOPE)
+endfunction()
+
 # Download and integrate named external dependencies.
 # Downlods must be handled before vcpkg in order to support --only-downloads mode.
 function(get_externals)
@@ -32,11 +39,14 @@ function(get_externals)
     list(REMOVE_DUPLICATES ARGN)
     set(from_git "")
     set(from_pkgconfig "")
+    set(from_vcpkg "")
     foreach(name IN LISTS ARGN)
         if(DEFINED "skia_external_git_${name}")
             list(APPEND from_git "${name}")
         elseif(DEFINED "skia_external_pkgconfig_${name}")
             list(APPEND from_pkgconfig "${name}")
+        elseif(DEFINED "skia_external_vcpkg_${name}")
+            list(APPEND from_vcpkg "${name}")
         else()
             message(FATAL_ERROR "Unknown external dependency '${name}'")
         endif()
@@ -62,6 +72,9 @@ function(get_externals)
     foreach(name IN LISTS from_pkgconfig)
         third_party_from_pkgconfig("${name}" ${skia_external_pkgconfig_${name}})
     endforeach()
+    foreach(name IN LISTS from_vcpkg)
+        third_party_from_vcpkg("${name}" ${skia_external_vcpkg_${name}})
+    endforeach()
 endfunction()
 
 # Setup a third-party dependency from pkg-config data
@@ -109,6 +122,34 @@ function(third_party_from_pkgconfig gn_group)
     configure_file("${CMAKE_CURRENT_LIST_DIR}/third-party.gn.in" "${SOURCE_PATH}/${arg_PATH}/BUILD.gn" @ONLY)
 endfunction()
 
+# Setup a third-party dependency from vcpkg installed tree
+function(third_party_from_vcpkg gn_group)
+    cmake_parse_arguments(PARSE_ARGV 1 arg "" "PATH" "")
+    if(NOT arg_PATH)
+        set(arg_PATH "third_party/${gn_group}")
+    endif()
+    if(arg_UNPARSED_ARGUMENTS)
+        message(FATAL_ERROR "Unparsed arguments: ${arg_UNPARSED_ARGUMENTS}")
+    endif()
+    set(defines "")
+    set(include_dirs "${CURRENT_INSTALLED_DIR}/include")
+    set(libdirs_RELEASE "${CURRENT_INSTALLED_DIR}/lib")
+    set(libdirs_DEBUG "${CURRENT_INSTALLED_DIR}/lib/debug")
+    set(ldflags "")
+    foreach(config IN ITEMS DEBUG RELEASE)
+        set(lib_dirs "${libdirs_${config}}")
+        set(GN_OUT_${config} "")
+        foreach(item IN ITEMS defines include_dirs lib_dirs ldflags)
+            set("gn_${item}_${config}" "")
+            if(NOT "${${item}}" STREQUAL "")
+                list(JOIN ${item} [[", "]] list)
+                set("gn_${item}_${config}" "\"${list}\"")
+            endif()
+        endforeach()
+    endforeach()
+    configure_file("${CMAKE_CURRENT_LIST_DIR}/third-party.gn.in" "${SOURCE_PATH}/${arg_PATH}/BUILD.gn" @ONLY)
+endfunction()
+
 # Turn a space separated string into a gn list:
 # "a b c" -> ["a","b","c"]
 function(string_to_gn_list out_var input)
@@ -153,6 +194,68 @@ function(list_from_json out_var json) # <path>
     set("${out_var}" "${list}" PARENT_SCOPE)
 endfunction()
 
+# Expand gn targets for installable components.
+function(expand_gn_targets targets_var desc_var source_path)
+    set(expand_gn_targets_components "")
+    set(expand_gn_targets_visited "")
+    foreach(gn_target IN LISTS "${targets_var}")
+        expand_gn_targets_recurse("${gn_target}" "${desc_var}" "${source_path}")
+    endforeach()
+    set("${targets_var}" "${expand_gn_targets_components}" PARENT_SCOPE)
+endfunction()
+
+# Private helper for expand_gn_targets.
+function(expand_gn_targets_recurse gn_target desc_var source_path)
+    # shortcuts
+    if(gn_target IN_LIST expand_gn_targets_components)
+        return()
+    elseif(gn_target IN_LIST expand_gn_targets_visited)
+        return()
+    endif()
+    list(APPEND expand_gn_targets_visited "${gn_target}")
+
+    # current target
+    set(recurse 1)
+    string(JSON current_json GET "${${desc_var}}" "${gn_target}")
+    string(JSON target_type GET "${current_json}" "type")
+    if(target_type STREQUAL "static_library" AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+        string(REGEX REPLACE "^//([^:]*):(.*)\$" "${source_path}/\\1/BUILD.gn" build_gn_file "${gn_target}")
+        if(EXISTS "${build_gn_file}")
+            # skia's third-party "dawn_component" creates separate _shared/_static libs.
+            string(REGEX REPLACE "^(.*)(_static|_shared)\$" "(\\1\\2|\\1)" name_pattern "${CMAKE_MATCH_2}")
+            file(STRINGS "${build_gn_file}" maybe_component REGEX "component[(]\"${name_pattern}\"[)]")
+            if(NOT maybe_component STREQUAL "")
+                list(APPEND expand_gn_targets_components "${gn_target}")
+            endif()
+        else()
+            message(WARNING "No ${build_gn_file}")
+        endif()
+    elseif(target_type MATCHES "^(executable|loadable_module|shared_library)\$")
+        list(APPEND expand_gn_targets_components "${gn_target}")
+    elseif(NOT target_type MATCHES "^(group|source_set)\$")
+        set(recurse 0)
+    endif()
+
+    if(recurse)
+        list_from_json(deps "${current_json}" "deps")
+        foreach(dep IN LISTS deps)
+            expand_gn_targets_recurse("${dep}" "${desc_var}" "${source_path}")
+        endforeach()
+    endif()
+
+    set(expand_gn_targets_components "${expand_gn_targets_components}" PARENT_SCOPE)
+    set(expand_gn_targets_visited "${expand_gn_targets_visited}" PARENT_SCOPE)
+endfunction()
+
+# Provide a cmake target name (w/o namespace) in out_var
+function(get_cmake_target out_var gn_target)
+    if(gn_target MATCHES "/([^:/]+):")
+        string(REPLACE "/${CMAKE_MATCH_1}:${CMAKE_MATCH_1}" "/${CMAKE_MATCH_1}" gn_target "${gn_target}")
+    endif()
+    string(REGEX REPLACE "[:/]+" "::" target "unofficial/${PORT}${gn_target}")
+    set("${out_var}" "${target}" PARENT_SCOPE)
+endfunction()
+
 # Put the target's SK_<...> definitions in out_var
 function(get_definitions out_var desc_json target)
     list_from_json(output "${desc_json}" "${target}" "defines")
@@ -162,6 +265,8 @@ endfunction()
 
 # Put the target's link libraries in out_var
 function(get_link_libs out_var desc_json target)
+    # We don't pass this variable explicitly now.
+    separate_arguments(known_standard_libraries NATIVE_COMMAND "${VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES}")
     # From ldflags, we only want lib names or filepaths (cf. declare_external_from_pkgconfig)
     list_from_json(ldflags "${desc_json}" "${target}" "ldflags")
     string(REPLACE "-isysroot;" "-isysroot " ldflags "${ldflags}")
@@ -179,8 +284,16 @@ function(get_link_libs out_var desc_json target)
     endif()
     vcpkg_list(SET output)
     foreach(lib IN LISTS frameworks ldflags libs)
-        string(REPLACE "${CURRENT_INSTALLED_DIR}" [[${vcpkg_root}]] lib "${lib}")
-        string(REPLACE "${CURRENT_PACKAGES_DIR}" [[${vcpkg_root}]] lib "${lib}")
+        if(VCPKG_TARGET_IS_WINDOWS)
+            string(TOLOWER "${lib}" lib_key)
+        else()
+            set(lib_key "{lib}")
+        endif()
+        if(lib_key IN_LIST known_standard_libraries)
+            continue()
+        endif()
+        string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${z_vcpkg_${PORT}_root}" lib "${lib}")
+        string(REPLACE "${CURRENT_PACKAGES_DIR}" "\${z_vcpkg_${PORT}_root}" lib "${lib}")
         if(NOT lib MATCHES "^-L")
             vcpkg_list(REMOVE_ITEM output "${lib}")
         endif()
@@ -188,3 +301,152 @@ function(get_link_libs out_var desc_json target)
     endforeach()
     set("${out_var}" "${output}" PARENT_SCOPE)
 endfunction()
+
+# A revised variant of vcpkg_gn_install
+function(skia_gn_install_build_type)
+    cmake_parse_arguments(PARSE_ARGV 0 "arg" "" "BUILD_TYPE;SOURCE_PATH;INSTALL_DIR;LABEL" "TARGETS")
+    if(DEFINED arg_UNPARSED_ARGUMENTS)
+        message(FATAL_ERROR "Internal error: skia_gn_install_build_type was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}")
+    endif()
+
+    set(build_dir "${CURRENT_BUILDTREES_DIR}/${arg_LABEL}")
+
+    # `gn desc json` output is dual-use: logging (early) and further processing
+    # Cf. https://github.com/universeroc/gn/blob/master/docs/reference.md#desc
+    vcpkg_find_acquire_program(GN)
+    vcpkg_execute_required_process(
+        COMMAND "${GN}" desc --format=json --all --testonly=false "${build_dir}" "*"
+        WORKING_DIRECTORY "${arg_SOURCE_PATH}"
+        LOGNAME "desc-${arg_LABEL}"
+    )
+    
+    # build
+    set(VCPKG_BUILD_TYPE "${arg_BUILD_TYPE}")
+    vcpkg_build_ninja(TARGETS ${arg_TARGETS})
+
+    # install and export
+    set(logfile "${CURRENT_BUILDTREES_DIR}/install-${arg_LABEL}.log")
+    file(WRITE "${logfile}" "")
+    message(STATUS "Installing (${arg_LABEL})...")
+
+    file(MAKE_DIRECTORY "${arg_INSTALL_DIR}/share/unofficial-${PORT}")
+
+    list(TRANSFORM arg_TARGETS PREPEND "//")
+    file(READ "${CURRENT_BUILDTREES_DIR}/desc-${arg_LABEL}-out.log" desc)
+    expand_gn_targets(arg_TARGETS desc "${arg_SOURCE_PATH}")
+
+    string(TOUPPER "${arg_BUILD_TYPE}" cmake_build_type)
+    set(cmake_config_genex [[\$<NOT:\$<CONFIG:DEBUG>>]])
+    if(cmake_build_type STREQUAL "DEBUG")
+        set(cmake_config_genex [[\$<CONFIG:DEBUG>]])
+    endif()
+
+    foreach(gn_target IN LISTS arg_TARGETS)
+        get_cmake_target(cmake_target "${gn_target}")
+        set(add_target "add_library(${cmake_target} INTERFACE IMPORTED)")
+        set(has_location "0")
+        set(imported_location "")
+        set(not_executable "1")
+        string(JSON target_type GET "${desc}" "${gn_target}" "type")
+
+        set(link_language "C")
+        string(JSON sources ERROR_VARIABLE unused GET "${desc}" "${gn_target}" "sources")
+        if(sources MATCHES "[.]cxx|[.]cpp")
+            set(link_language "CXX")
+        endif()
+
+        list_from_json(outputs "${desc}" "${gn_target}" "outputs")
+        foreach(output IN LISTS outputs)
+            if(CMAKE_HOST_WIN32)
+                # absolute path (e.g. /C:/path/to/target.lib)
+                string(REGEX REPLACE "^/([^/]:)" "\\1" output "${output}")
+            endif()
+            # relative path (e.g. //out/Release/target.lib)
+            string(REGEX REPLACE "^//" "${arg_SOURCE_PATH}/" output "${output}")
+
+            cmake_path(GET output FILENAME filename)
+            set(add_target "add_library(${cmake_target} UNKNOWN IMPORTED)")
+            set(destination "${arg_INSTALL_DIR}/lib")
+            set(has_location "1")
+            if(target_type STREQUAL "executable")
+                set(add_target "add_executable(${cmake_target} IMPORTED)")
+                set(destination "${arg_INSTALL_DIR}/tools/${PORT}")
+                set(imported_location "${destination}/${filename}")
+                set(not_executable "0")
+            elseif(filename MATCHES "\\.(dll|pdb)\$")
+                if(CMAKE_MATCH_1 STREQUAL "pdb" AND NOT EXISTS "${output}")
+                    continue()
+                endif()
+                set(destination "${arg_INSTALL_DIR}/bin")
+                # Do not set (overwrite) imported_location
+            else()
+                set(imported_location "${destination}/${filename}")
+            endif()
+            # output artifact installation
+            file(APPEND "${logfile}" "Installing: ${destination}/${filename}\n")
+            file(COPY "${output}" DESTINATION "${destination}")
+        endforeach()
+
+        # CMake target properties
+        string(REPLACE "::" "-" basename "${cmake_target}")
+        get_definitions(interface_compile_definitions "${desc}" "${gn_target}")
+        get_link_libs(interface_link_libs "${desc}" "${gn_target}")
+        set(interface_link_targets "")
+        list_from_json(deps "${desc}" "${gn_target}" "deps")
+        foreach(dep IN LISTS deps)
+            if(dep IN_LIST arg_TARGETS)
+                get_cmake_target(cmake_dep "${dep}")
+                list(APPEND interface_link_targets "${cmake_dep}")
+            endif()
+        endforeach()
+        file(APPEND "${logfile}" "Installing: ${arg_INSTALL_DIR}/share/unofficial-${PORT}/${basename}-targets.cmake\n")
+        configure_file("${CMAKE_CURRENT_LIST_DIR}/unofficial-${PORT}-targets.cmake" "${arg_INSTALL_DIR}/share/unofficial-${PORT}/${basename}-targets.cmake" @ONLY)
+        file(APPEND "${logfile}" "Installing: ${arg_INSTALL_DIR}/share/unofficial-${PORT}/${basename}-targets-${arg_BUILD_TYPE}.cmake\n")
+        configure_file("${CMAKE_CURRENT_LIST_DIR}/unofficial-${PORT}-targets-details.cmake" "${arg_INSTALL_DIR}/share/unofficial-${PORT}/${basename}-targets-${arg_BUILD_TYPE}.cmake" @ONLY)
+    endforeach()
+
+    # Main CMake config file
+    file(APPEND "${logfile}" "Installing: ${arg_INSTALL_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake\n")
+    configure_file("${CMAKE_CURRENT_LIST_DIR}/unofficial-${PORT}-config.cmake" "${arg_INSTALL_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake" @ONLY)
+endfunction()
+
+# A revised variant of vcpkg_gn_install
+function(skia_gn_install)
+    cmake_parse_arguments(PARSE_ARGV 0 arg "" "SOURCE_PATH" "TARGETS")
+
+    if(DEFINED arg_UNPARSED_ARGUMENTS)
+        message(WARNING "vcpkg_gn_install was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}")
+    endif()
+    if(NOT DEFINED arg_SOURCE_PATH)
+        message(FATAL_ERROR "SOURCE_PATH must be specified.")
+    endif()
+
+    set(auto_clean_debug_share TRUE)
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/share")
+            set(auto_clean_debug_share FALSE)
+        endif()
+        skia_gn_install_build_type(
+            BUILD_TYPE debug
+            LABEL "${TARGET_TRIPLET}-dbg"
+            SOURCE_PATH "${arg_SOURCE_PATH}"
+            INSTALL_DIR "${CURRENT_PACKAGES_DIR}/debug"
+            TARGETS ${arg_TARGETS}
+        )
+    endif()
+
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+        skia_gn_install_build_type(
+            BUILD_TYPE release
+            LABEL "${TARGET_TRIPLET}-rel"
+            SOURCE_PATH "${arg_SOURCE_PATH}"
+            INSTALL_DIR "${CURRENT_PACKAGES_DIR}"
+            TARGETS ${arg_TARGETS}
+        )
+    endif()
+
+    vcpkg_cmake_config_fixup(PACKAGE_NAME "unofficial-${PORT}")
+    if(auto_clean_debug_share)
+        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+    endif()
+endfunction()
diff --git a/external_imported/vcpkg/ports/skia/third-party.gn.in b/external_imported/vcpkg/ports/skia/third-party.gn.in
index 7fd53dc52..b63700260 100644
--- a/external_imported/vcpkg/ports/skia/third-party.gn.in
+++ b/external_imported/vcpkg/ports/skia/third-party.gn.in
@@ -5,17 +5,17 @@ config("vcpkg_@gn_group@") {
   if(is_debug) {
     defines = [ @gn_defines_DEBUG@ ]
     include_dirs = [ @gn_include_dirs_DEBUG@ ]
-    lib_dirs = [ @gn_lib_dirs_DEBUG@ ]
   } else {
     defines = [ @gn_defines_RELEASE@ ]
     include_dirs = [ @gn_include_dirs_RELEASE@ ]
-    lib_dirs = [ @gn_lib_dirs_RELEASE@ ]
   }
 }
 config("vcpkg_@gn_group@_link_libraries") {
   if(is_debug) {
+    lib_dirs = [ @gn_lib_dirs_DEBUG@ ]
     ldflags = [ @gn_ldflags_DEBUG@ ]
   } else {
+    lib_dirs = [ @gn_lib_dirs_RELEASE@ ]
     ldflags = [ @gn_ldflags_RELEASE@ ]
   }
 }
diff --git a/external_imported/vcpkg/ports/skia/unofficial-skia-config.cmake b/external_imported/vcpkg/ports/skia/unofficial-skia-config.cmake
index 5183762b8..88c5d3e9a 100644
--- a/external_imported/vcpkg/ports/skia/unofficial-skia-config.cmake
+++ b/external_imported/vcpkg/ports/skia/unofficial-skia-config.cmake
@@ -1,11 +1,16 @@
-if(NOT TARGET unofficial::skia::skia)
-    function(z_vcpkg_skia_get_link_libraries out_var path libraries)
+if(NOT COMMAND z_vcpkg_@PORT@_get_link_libraries)
+    function(z_vcpkg_@PORT@_get_link_libraries out_var type libraries)
         set(libs "")
+        if(type STREQUAL "DEBUG")
+            set(path "${z_vcpkg_@PORT@_root}/debug/lib" "${z_vcpkg_@PORT@_root}/lib")
+        else()
+            set(path "${z_vcpkg_@PORT@_root}/lib" "${z_vcpkg_@PORT@_root}/debug/lib")
+        endif()
         foreach(lib IN LISTS libraries)
             if(lib MATCHES [[^/|^(dl|m|pthread)$|^-framework ]])
                 list(APPEND libs "${lib}")
             else()
-                string(MAKE_C_IDENTIFIER "${out_var}_${lib}" lib_var)
+                string(MAKE_C_IDENTIFIER "${out_var}_${lib}_${type}" lib_var)
                 find_library("${lib_var}" NAMES "${lib}" NAMES_PER_DIR PATH "${path}")
                 mark_as_advanced("${lib_var}")
                 if(${lib_var})
@@ -17,62 +22,16 @@ if(NOT TARGET unofficial::skia::skia)
         endforeach()
         set("${out_var}" "${libs}" PARENT_SCOPE)
     endfunction()
+endif()
 
-    # Compute the installation prefix relative to this file.
-    get_filename_component(z_vcpkg_skia_root "${CMAKE_CURRENT_LIST_FILE}" PATH)
-    get_filename_component(z_vcpkg_skia_root "${z_vcpkg_skia_root}" PATH)
-    get_filename_component(z_vcpkg_skia_root "${z_vcpkg_skia_root}" PATH)
-    if(z_vcpkg_skia_root STREQUAL "/")
-        set(z_vcpkg_skia_root "")
-    endif()
-
-    add_library(unofficial::skia::skia UNKNOWN IMPORTED)
-    set_target_properties(unofficial::skia::skia PROPERTIES
-        INTERFACE_INCLUDE_DIRECTORIES "${z_vcpkg_skia_root}/include/skia"
-    )
-
-    find_library(z_vcpkg_skia_lib_release NAMES skia skia.dll PATHS "${z_vcpkg_skia_root}/lib" NO_DEFAULT_PATH)
-    find_library(z_vcpkg_skia_lib_debug NAMES skia skia.dll PATHS "${z_vcpkg_skia_root}/debug/lib" NO_DEFAULT_PATH)
-    mark_as_advanced(z_vcpkg_skia_lib_release z_vcpkg_skia_lib_debug)
-
-    set(z_vcpkg_skia_config_debug "\$<CONFIG:Debug>")
-    if(NOT z_vcpkg_skia_lib_debug)
-        set(z_vcpkg_skia_config_debug "0")
-    endif()
+get_filename_component(z_vcpkg_@PORT@_root "${CMAKE_CURRENT_LIST_DIR}" PATH)
+get_filename_component(z_vcpkg_@PORT@_root "${z_vcpkg_@PORT@_root}" PATH)
 
-    z_vcpkg_skia_get_link_libraries(
-        z_vcpkg_skia_link_libs_release
-        "${z_vcpkg_skia_root}/lib;${z_vcpkg_skia_root}/debug/lib"
-        "@SKIA_DEP_REL@"
-    )
-    set_target_properties(unofficial::skia::skia PROPERTIES
-        IMPORTED_CONFIGURATIONS RELEASE
-        IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
-        IMPORTED_LOCATION_RELEASE "${z_vcpkg_skia_lib_release}"
-        INTERFACE_COMPILE_DEFINITIONS "\$<\$<NOT:${z_vcpkg_skia_config_debug}>:@SKIA_DEFINITIONS_REL@>"
-        INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:\$<\$<NOT:${z_vcpkg_skia_config_debug}>:${z_vcpkg_skia_link_libs_release}>>"
-    )
+file(GLOB z_vcpkg_@PORT@_config_files "${CMAKE_CURRENT_LIST_DIR}/unofficial-@PORT@-*-targets.cmake")
+foreach(z_vcpkg_@PORT@_config_file IN LISTS z_vcpkg_@PORT@_config_files)
+    include("${z_vcpkg_@PORT@_config_file}")
+endforeach()
 
-    if(z_vcpkg_skia_lib_debug)
-        z_vcpkg_skia_get_link_libraries(
-            z_vcpkg_skia_link_libs_debug
-            "${z_vcpkg_skia_root}/debug/lib;${z_vcpkg_skia_root}/lib"
-            "@SKIA_DEP_DBG@"
-        )
-        set_property(TARGET unofficial::skia::skia APPEND PROPERTY
-            IMPORTED_CONFIGURATIONS DEBUG
-        )
-        set_target_properties(unofficial::skia::skia PROPERTIES
-            IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "C"
-            IMPORTED_LOCATION_DEBUG "${z_vcpkg_skia_lib_debug}"
-        )
-        set_property(TARGET unofficial::skia::skia APPEND PROPERTY
-            INTERFACE_COMPILE_DEFINITIONS "\$<\$<CONFIG:Debug>:@SKIA_DEFINITIONS_DBG@>"
-        )
-        set_property(TARGET unofficial::skia::skia APPEND PROPERTY
-            INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:\$<\$<CONFIG:Debug>:${z_vcpkg_skia_link_libs_debug}>>"
-        )
-    endif()
-    unset(z_vcpkg_skia_config_debug)
-    unset(z_vcpkg_skia_root)
-endif()
+unset(z_vcpkg_@PORT@_config_file)
+unset(z_vcpkg_@PORT@_config_files)
+unset(z_vcpkg_@PORT@_root)
diff --git a/external_imported/vcpkg/ports/skia/unofficial-skia-targets-details.cmake b/external_imported/vcpkg/ports/skia/unofficial-skia-targets-details.cmake
new file mode 100644
index 000000000..9d74800ed
--- /dev/null
+++ b/external_imported/vcpkg/ports/skia/unofficial-skia-targets-details.cmake
@@ -0,0 +1,18 @@
+# Exported from "@gn_target@"
+if("@not_executable@")
+    set_property(TARGET @cmake_target@ APPEND PROPERTY INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:\$<@cmake_config_genex@:@interface_link_targets@>>")
+endif()
+if("@has_location@")
+    set_property(TARGET @cmake_target@ APPEND PROPERTY IMPORTED_CONFIGURATIONS "@cmake_build_type@")
+    set_target_properties(@cmake_target@ PROPERTIES IMPORTED_LOCATION_@cmake_build_type@ "@imported_location@")
+    if("@not_executable@")
+        set_property(TARGET @cmake_target@ APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS "\$<@cmake_config_genex@:@interface_compile_definitions@>")
+        set_target_properties(@cmake_target@ PROPERTIES
+            INTERFACE_INCLUDE_DIRECTORIES "@CURRENT_PACKAGES_DIR@/include/@PORT@"
+            IMPORTED_LINK_INTERFACE_LANGUAGES_@cmake_build_type@ "@link_language@"
+        )
+        z_vcpkg_@PORT@_get_link_libraries(z_vcpkg_@PORT@_link_libs "@cmake_build_type@" "@interface_link_libs@")
+        set_property(TARGET @cmake_target@ APPEND PROPERTY INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:\$<@cmake_config_genex@:${z_vcpkg_@PORT@_link_libs}>>")
+        unset(z_vcpkg_@PORT@_link_libs)
+    endif()
+endif()
diff --git a/external_imported/vcpkg/ports/skia/unofficial-skia-targets.cmake b/external_imported/vcpkg/ports/skia/unofficial-skia-targets.cmake
new file mode 100644
index 000000000..7c0c35f19
--- /dev/null
+++ b/external_imported/vcpkg/ports/skia/unofficial-skia-targets.cmake
@@ -0,0 +1,8 @@
+# Exported from "@gn_target@"
+if(NOT TARGET @cmake_target@)
+    @add_target@
+    if("@not_executable@")
+        include("${CMAKE_CURRENT_LIST_DIR}/@basename@-targets-debug.cmake" OPTIONAL)
+    endif()
+    include("${CMAKE_CURRENT_LIST_DIR}/@basename@-targets-release.cmake")
+endif()
diff --git a/external_imported/vcpkg/ports/skia/usage b/external_imported/vcpkg/ports/skia/usage
index 36b64c193..7b1bdb3f4 100644
--- a/external_imported/vcpkg/ports/skia/usage
+++ b/external_imported/vcpkg/ports/skia/usage
@@ -2,3 +2,5 @@ skia provides CMake targets:
 
     find_package(unofficial-skia CONFIG REQUIRED)
     target_link_libraries(main PRIVATE unofficial::skia::skia)
+
+    # Similar for optional components, e.g. unofficial::skia::modules::skparagraph
diff --git a/external_imported/vcpkg/ports/skia/vcpkg.json b/external_imported/vcpkg/ports/skia/vcpkg.json
index 83703ad49..8be0e9251 100644
--- a/external_imported/vcpkg/ports/skia/vcpkg.json
+++ b/external_imported/vcpkg/ports/skia/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "skia",
-  "version": "0.36.0",
-  "port-version": 7,
+  "version": "0.38.2",
+  "port-version": 4,
   "description": [
     "Skia is an open source 2D graphics library which provides common APIs that work across a variety of hardware and software platforms.",
     "It serves as the graphics engine for Google Chrome and Chrome OS, Android, Mozilla Firefox and Firefox OS, and many other products.",
@@ -9,7 +9,7 @@
   ],
   "homepage": "https://skia.org",
   "license": null,
-  "supports": "!(windows & arm & !arm64)",
+  "supports": "!(windows & arm32) & !mingw",
   "dependencies": [
     "expat",
     "libjpeg-turbo",
@@ -20,6 +20,10 @@
       "default-features": false,
       "platform": "windows & !arm64 & !uwp"
     },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
     {
       "name": "vcpkg-cmake-get-vars",
       "host": true
@@ -39,49 +43,36 @@
     "zlib"
   ],
   "default-features": [
-    "default-features"
+    {
+      "name": "direct3d",
+      "platform": "uwp"
+    },
+    {
+      "name": "fontconfig",
+      "platform": "linux"
+    },
+    {
+      "name": "freetype",
+      "platform": "!(windows | osx | ios)"
+    },
+    {
+      "name": "gl",
+      "platform": "!(windows & arm) & !uwp"
+    },
+    {
+      "name": "harfbuzz",
+      "platform": "!uwp"
+    },
+    {
+      "name": "icu",
+      "platform": "!uwp & !(windows & !static)"
+    }
   ],
   "features": {
     "dawn": {
-      "description": "dawn support for skia"
-    },
-    "default-features": {
-      "description": "Default feature configuration",
+      "description": "dawn support for skia",
       "dependencies": [
-        {
-          "name": "skia",
-          "default-features": false,
-          "features": [
-            "direct3d"
-          ],
-          "platform": "uwp"
-        },
-        {
-          "name": "skia",
-          "default-features": false,
-          "features": [
-            "fontconfig"
-          ],
-          "platform": "linux"
-        },
-        {
-          "name": "skia",
-          "default-features": false,
-          "features": [
-            "gl",
-            "harfbuzz",
-            "icu"
-          ],
-          "platform": "!uwp"
-        },
-        {
-          "name": "skia",
-          "default-features": false,
-          "features": [
-            "freetype"
-          ],
-          "platform": "!(windows | osx | ios)"
-        }
+        "vulkan-headers"
       ]
     },
     "direct3d": {
@@ -104,6 +95,10 @@
     "freetype": {
       "description": "Freetype support",
       "dependencies": [
+        {
+          "name": "dlfcn-win32",
+          "platform": "windows"
+        },
         {
           "name": "freetype",
           "default-features": false
@@ -124,7 +119,8 @@
       ]
     },
     "icu": {
-      "description": "Use icu",
+      "description": "Use icu.",
+      "supports": "!(windows & !static)",
       "dependencies": [
         "icu"
       ]
@@ -136,7 +132,7 @@
     "vulkan": {
       "description": "Vulkan support for skia",
       "dependencies": [
-        "vulkan",
+        "vulkan-headers",
         "vulkan-memory-allocator"
       ]
     }
diff --git a/external_imported/vcpkg/ports/sleef/portfile.cmake b/external_imported/vcpkg/ports/sleef/portfile.cmake
index 04fd4a7b8..e51e0374f 100644
--- a/external_imported/vcpkg/ports/sleef/portfile.cmake
+++ b/external_imported/vcpkg/ports/sleef/portfile.cmake
@@ -22,3 +22,27 @@ vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+# Install DLL and PDB files
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+        if(VCPKG_TARGET_IS_WINDOWS)
+            file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/sleef.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
+            file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/sleef.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
+            file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/sleefdft.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
+            file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/sleefdft.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
+            file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/sleefquad.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
+            file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/sleefquad.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
+        endif()
+    endif()
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        if(VCPKG_TARGET_IS_WINDOWS)
+            file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/sleef.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
+            file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/sleef.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
+            file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/sleefdft.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
+            file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/sleefdft.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
+            file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/sleefquad.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
+            file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/sleefquad.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
+        endif()
+    endif()
+endif()
diff --git a/external_imported/vcpkg/ports/sleef/vcpkg.json b/external_imported/vcpkg/ports/sleef/vcpkg.json
index 039681d14..60b71ed05 100644
--- a/external_imported/vcpkg/ports/sleef/vcpkg.json
+++ b/external_imported/vcpkg/ports/sleef/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "sleef",
   "version": "3.5.1",
-  "port-version": 3,
+  "port-version": 4,
   "description": "SIMD Library for Evaluating Elementary Functions, vectorized libm and DFT",
   "homepage": "https://sleef.org/",
   "license": "BSL-1.0",
diff --git a/external_imported/vcpkg/ports/sleepy-discord/fix-boost.patch b/external_imported/vcpkg/ports/sleepy-discord/fix-boost.patch
deleted file mode 100644
index a8279182d..000000000
--- a/external_imported/vcpkg/ports/sleepy-discord/fix-boost.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/sleepy_discord/CMakeLists.txt b/sleepy_discord/CMakeLists.txt
-index 6c134141..2d115985 100644
---- a/sleepy_discord/CMakeLists.txt
-+++ b/sleepy_discord/CMakeLists.txt
-@@ -84,7 +84,7 @@ if (NOT ONLY_SLEEPY_DISCORD)
-        elseif(USE_BOOST_ASIO)
-                #Look for boost as an alt
-                find_package(Boost REQUIRED)
--               list(APPEND LIBRARIES_TO_LINK ${Boost_LIBRARIES})
-+               list(APPEND LIBRARIES_INCLUDE_DIRS "${Boost_INCLUDE_DIRS}")
-                list(APPEND LIB_CONFIG "EXISTENT_BOOST_ASIO")
-                list(APPEND LIB_CONFIG "EXISTENT_ASIO")
-                list(APPEND REQUIRED_PACKAGES "Boost")
diff --git a/external_imported/vcpkg/ports/sleepy-discord/fix-messing-header.patch b/external_imported/vcpkg/ports/sleepy-discord/fix-messing-header.patch
new file mode 100644
index 000000000..bc82a0aa8
--- /dev/null
+++ b/external_imported/vcpkg/ports/sleepy-discord/fix-messing-header.patch
@@ -0,0 +1,12 @@
+diff --git a/include/sleepy_discord/zlib_compression.h b/include/sleepy_discord/zlib_compression.h
+index 9d95c58..b2d418e 100644
+--- a/include/sleepy_discord/zlib_compression.h
++++ b/include/sleepy_discord/zlib_compression.h
+@@ -9,6 +9,7 @@
+ #include <forward_list>
+ #include <string>
+ #include <mutex>
++#include <cstring>
+ 
+ namespace SleepyDiscord {
+ 	//This Queue is basicly a single linked list with the back and size stored
diff --git a/external_imported/vcpkg/ports/sleepy-discord/portfile.cmake b/external_imported/vcpkg/ports/sleepy-discord/portfile.cmake
index 8f70125a1..ad28383cb 100644
--- a/external_imported/vcpkg/ports/sleepy-discord/portfile.cmake
+++ b/external_imported/vcpkg/ports/sleepy-discord/portfile.cmake
@@ -12,6 +12,8 @@ vcpkg_from_github(
     REF 70b9ec13427ea68de6f4213e9dfec6129fbab21b
     SHA512 c91fbb9a672257c63ee83b40b62961b89568ca33081048b440876c390a2a2e11c602aaf43a6c9485fd85a91248f34a70d7b9ea769d0cfcd4b35b80d58a6ad737
     HEAD_REF develop
+    PATCHES
+        fix-messing-header.patch
 )
 
 # Handle version data here to prevent issues from doing this twice in parallel
@@ -32,6 +34,7 @@ vcpkg_cmake_configure(
         -DSLEEPY_VCPKG=ON 
         -DAUTO_DOWNLOAD_LIBRARY=OFF 
         -DUSE_BOOST_ASIO=ON
+        -DCMAKE_CXX_STANDARD=17
         ${FEATURE_OPTIONS}
 )
 vcpkg_cmake_install()
@@ -40,4 +43,4 @@ vcpkg_copy_pdbs()
 
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/sleepy-discord)
 
-file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
diff --git a/external_imported/vcpkg/ports/sleepy-discord/vcpkg.json b/external_imported/vcpkg/ports/sleepy-discord/vcpkg.json
index 514e661cf..372532255 100644
--- a/external_imported/vcpkg/ports/sleepy-discord/vcpkg.json
+++ b/external_imported/vcpkg/ports/sleepy-discord/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "sleepy-discord",
   "version-date": "2022-02-05",
+  "port-version": 2,
   "description": "C++ library for the Discord chat client",
   "homepage": "https://yourwaifu.dev/sleepy-discord/",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/sltbench/portfile.cmake b/external_imported/vcpkg/ports/sltbench/portfile.cmake
index e5923846e..4750fdbe9 100644
--- a/external_imported/vcpkg/ports/sltbench/portfile.cmake
+++ b/external_imported/vcpkg/ports/sltbench/portfile.cmake
@@ -1,11 +1,21 @@
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
+vcpkg_download_distfile(
+    MISSING_STDDEF_H
+    URLS https://github.com/ivafanas/sltbench/commit/ec702203f406d3b1db71dac6bd39337d175cdc2c.patch?full_index=1
+    SHA512 ada4ac8519dc7c5537438423d83cee99cd85b84172c402438800f70f6a550875819ea94be8cffcb174a45715e6709e1fd777415424aabf65a1b3e4430b503af1
+    FILENAME ec702203f406d3b1db71dac6bd39337d175cdc2c.patch
+)
+
 vcpkg_from_github(
-  OUT_SOURCE_PATH SOURCE_PATH
-  REPO ivafanas/sltbench
-  REF 52c7c7852abc3159185eb79e699ad77fadfc35bd
-  SHA512 0c66b51f5a950a09df47019775941554538bc3642788f61aaf8c5ec3644d5fef721391f73c3fddfd9529159f9b81c7d7ed76c7995a79f37adaf8d0ff55a99d4b
-  HEAD_REF master)
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO ivafanas/sltbench
+    REF 52c7c7852abc3159185eb79e699ad77fadfc35bd
+    SHA512 0c66b51f5a950a09df47019775941554538bc3642788f61aaf8c5ec3644d5fef721391f73c3fddfd9529159f9b81c7d7ed76c7995a79f37adaf8d0ff55a99d4b
+    HEAD_REF master
+    PATCHES
+        "${MISSING_STDDEF_H}"
+)
 
 vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}" WINDOWS_USE_MSBUILD)
 vcpkg_cmake_install()
@@ -14,6 +24,7 @@ vcpkg_cmake_config_fixup(CONFIG_PATH cmake)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(
-  INSTALL "${SOURCE_PATH}/LICENSE"
-  DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
-  RENAME copyright)
+    INSTALL "${SOURCE_PATH}/LICENSE"
+    DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
+    RENAME copyright
+)
diff --git a/external_imported/vcpkg/ports/sltbench/vcpkg.json b/external_imported/vcpkg/ports/sltbench/vcpkg.json
index 20c287a83..c969adb98 100644
--- a/external_imported/vcpkg/ports/sltbench/vcpkg.json
+++ b/external_imported/vcpkg/ports/sltbench/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "sltbench",
-  "version-string": "2.4.0",
-  "port-version": 1,
+  "version": "2.4.0",
+  "port-version": 3,
   "description": "C++ benchmark tool. Practical, stable and fast performance testing framework.",
   "homepage": "https://github.com/ivafanas/sltbench",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/smpeg2/001-correct-sdl-headers-dir.patch b/external_imported/vcpkg/ports/smpeg2/001-correct-sdl-headers-dir.patch
deleted file mode 100644
index 6cbcb6b9b..000000000
--- a/external_imported/vcpkg/ports/smpeg2/001-correct-sdl-headers-dir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/smpeg.h b/smpeg.h
-index 6bc2dbd..d12c8f8 100644
---- a/smpeg.h
-+++ b/smpeg.h
-@@ -22,9 +22,9 @@
- #ifndef _SMPEG_H_
- #define _SMPEG_H_
- 
--#include "SDL.h"
--#include "SDL_mutex.h"
--#include "SDL_audio.h"
-+#include "SDL2/SDL.h"
-+#include "SDL2/SDL_mutex.h"
-+#include "SDL2/SDL_audio.h"
- #include "MPEGframe.h"
- 
- #ifdef __cplusplus
diff --git a/external_imported/vcpkg/ports/smpeg2/002-use-SDL2-headers.patch b/external_imported/vcpkg/ports/smpeg2/002-use-SDL2-headers.patch
deleted file mode 100644
index 9737c6d7b..000000000
--- a/external_imported/vcpkg/ports/smpeg2/002-use-SDL2-headers.patch
+++ /dev/null
@@ -1,229 +0,0 @@
-diff --git a/MPEG.cpp b/MPEG.cpp
-index 1645965..9d44166 100644
---- a/MPEG.cpp
-+++ b/MPEG.cpp
-@@ -1,4 +1,4 @@
--#include "SDL.h"
-+#include "SDL2/SDL.h"
- 
- #include "MPEG.h"
- 
-diff --git a/MPEG.h b/MPEG.h
-index ca04260..d0b0d55 100644
---- a/MPEG.h
-+++ b/MPEG.h
-@@ -28,7 +28,7 @@
- #include <stdio.h>
- #include <string.h>
- 
--#include "SDL.h"
-+#include "SDL2/SDL.h"
- 
- #include "MPEGerror.h"
- #include "MPEGstream.h"
-diff --git a/MPEGaction.h b/MPEGaction.h
-index f9da3a3..ea0b94f 100644
---- a/MPEGaction.h
-+++ b/MPEGaction.h
-@@ -24,7 +24,7 @@
- #ifndef _MPEGACTION_H_
- #define _MPEGACTION_H_
- 
--#include "SDL.h"
-+#include "SDL2/SDL.h"
- #include "MPEGframe.h"
- 
- typedef enum {
-diff --git a/MPEGaudio.h b/MPEGaudio.h
-index 3f315d2..2ec4377 100644
---- a/MPEGaudio.h
-+++ b/MPEGaudio.h
-@@ -24,7 +24,7 @@
- #ifndef _MPEGAUDIO_H_
- #define _MPEGAUDIO_H_
- 
--#include "SDL.h"
-+#include "SDL2/SDL.h"
- #include "MPEGerror.h"
- #include "MPEGaction.h"
- 
-diff --git a/MPEGlist.h b/MPEGlist.h
-index 3a58a5f..fe0dbac 100644
---- a/MPEGlist.h
-+++ b/MPEGlist.h
-@@ -6,7 +6,7 @@
- #ifndef _MPEGLIST_H_
- #define _MPEGLIST_H_
- 
--#include "SDL.h"
-+#include "SDL2/SDL.h"
- 
- class MPEGlist {
- public:
-diff --git a/MPEGring.cpp b/MPEGring.cpp
-index 6d9dabb..0350d54 100644
---- a/MPEGring.cpp
-+++ b/MPEGring.cpp
-@@ -23,7 +23,7 @@
- #include <assert.h>
- #include <string.h>
- 
--#include "SDL_timer.h"
-+#include "SDL2/SDL_timer.h"
- 
- #include "MPEGring.h"
- 
-diff --git a/MPEGring.h b/MPEGring.h
-index 89172ac..550fbcc 100644
---- a/MPEGring.h
-+++ b/MPEGring.h
-@@ -24,8 +24,8 @@
- #ifndef _MPEGRING_H
- #define _MPEGRING_H
- 
--#include "SDL_types.h"
--#include "SDL_thread.h"
-+#include "SDL2/SDL_types.h"
-+#include "SDL2/SDL_thread.h"
- 
- class MPEG_ring {
- public:
-diff --git a/MPEGstream.h b/MPEGstream.h
-index b96c631..50e0c3a 100644
---- a/MPEGstream.h
-+++ b/MPEGstream.h
-@@ -22,7 +22,7 @@
- #ifndef _MPEGSTREAM_H_
- #define _MPEGSTREAM_H_
- 
--#include "SDL_types.h"
-+#include "SDL2/SDL_types.h"
- #include "MPEGerror.h"
- #include "MPEGvideo.h"
- #include "MPEGaudio.h"
-diff --git a/MPEGsystem.h b/MPEGsystem.h
-index 823b679..28454b3 100644
---- a/MPEGsystem.h
-+++ b/MPEGsystem.h
-@@ -6,8 +6,8 @@
- #define _MPEGSYSTEM_H_
- #define USE_SYSTEM_TIMESTAMP
- 
--#include "SDL.h"
--#include "SDL_thread.h"
-+#include "SDL2/SDL.h"
-+#include "SDL2/SDL_thread.h"
- #include "MPEGerror.h"
- 
- class MPEGstream;
-diff --git a/MPEGvideo.h b/MPEGvideo.h
-index 12da092..9f1ed43 100644
---- a/MPEGvideo.h
-+++ b/MPEGvideo.h
-@@ -24,8 +24,8 @@
- #ifndef _MPEGVIDEO_H_
- #define _MPEGVIDEO_H_
- 
--#include "SDL.h"
--#include "SDL_thread.h"
-+#include "SDL2/SDL.h"
-+#include "SDL2/SDL_thread.h"
- #include "MPEGerror.h"
- #include "MPEGaction.h"
- 
-diff --git a/README.SDL_mixer b/README.SDL_mixer
-index c01b575..5cacc4f 100644
---- a/README.SDL_mixer
-+++ b/README.SDL_mixer
-@@ -5,7 +5,7 @@ You can have the SDL mixer library mix audio from a movie by hooking into
- the SDL mixer music hooks:
- 
- #include "smpeg.h"
--#include "SDL_mixer.h"
-+#include "SDL2/SDL_mixer.h"
- 
-         .. set up the mixer audio ...
- 
-diff --git a/acinclude/sdl2.m4 b/acinclude/sdl2.m4
-index 93bc4b0..776ad42 100644
---- a/acinclude/sdl2.m4
-+++ b/acinclude/sdl2.m4
-@@ -84,7 +84,7 @@ dnl
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include "SDL.h"
-+#include "SDL2/SDL.h"
- 
- char*
- my_strdup (char *str)
-@@ -167,7 +167,7 @@ int main (int argc, char *argv[])
-           LIBS="$LIBS $SDL_LIBS"
-           AC_TRY_LINK([
- #include <stdio.h>
--#include "SDL.h"
-+#include "SDL2/SDL.h"
- 
- int main(int argc, char *argv[])
- { return 0; }
-diff --git a/configure b/configure
-index 4ac7e60..ee1d934 100644
---- a/configure
-+++ b/configure
-@@ -15270,7 +15270,7 @@ else
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include "SDL.h"
-+#include "SDL2/SDL.h"
- 
- char*
- my_strdup (char *str)
-@@ -15367,7 +15367,7 @@ $as_echo "no" >&6; }
- /* end confdefs.h.  */
- 
- #include <stdio.h>
--#include "SDL.h"
-+#include "SDL2/SDL.h"
- 
- int main(int argc, char *argv[])
- { return 0; }
-diff --git a/video/gdith.cpp b/video/gdith.cpp
-index c56da96..53ba388 100644
---- a/video/gdith.cpp
-+++ b/video/gdith.cpp
-@@ -52,7 +52,7 @@
- #include "video.h"
- #include "proto.h"
- #include "dither.h"
--#include "SDL_timer.h"
-+#include "SDL2/SDL_timer.h"
- 
- #ifdef __STDC__
- #include <stdlib.h>
-diff --git a/video/readfile.cpp b/video/readfile.cpp
-index eb71194..a19e66d 100644
---- a/video/readfile.cpp
-+++ b/video/readfile.cpp
-@@ -56,7 +56,7 @@
- #include <string.h>
- #include <signal.h>
- 
--#include "SDL_endian.h"
-+#include "SDL2/SDL_endian.h"
- #include "video.h"
- #include "proto.h"
- #include "util.h"
-diff --git a/video/video.h b/video/video.h
-index 96de89b..a35095b 100644
---- a/video/video.h
-+++ b/video/video.h
-@@ -400,7 +400,7 @@ extern unsigned int cacheMiss[8][8];
- #define __SCO__ 1
- #endif
- 
--#include "SDL_endian.h"
-+#include "SDL2/SDL_endian.h"
- #if SDL_BYTEORDER == SDL_BIG_ENDIAN
- #ifdef LITTLE_ENDIAN_ARCHITECTURE
- #undef LITTLE_ENDIAN_ARCHITECTURE
diff --git a/external_imported/vcpkg/ports/smpeg2/CMakeLists.txt b/external_imported/vcpkg/ports/smpeg2/CMakeLists.txt
index 5515c698f..3c1e11d54 100644
--- a/external_imported/vcpkg/ports/smpeg2/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/smpeg2/CMakeLists.txt
@@ -1,22 +1,15 @@
-cmake_minimum_required(VERSION 2.6)
-project(SMPEG2 CXX)
+cmake_minimum_required(VERSION 3.25)
+project(smpeg2 CXX)
 
-find_path(SDL_INCLUDE_DIR SDL2/SDL.h)
 find_package(SDL2 CONFIG REQUIRED)
 
-include_directories(${SDL_INCLUDE_DIR})
-include_directories(${SDL_INCLUDE_DIR}/SDL2)
-include_directories(${CMAKE_SOURCE_DIR})
-
 if(MSVC)
     add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+    # some c++ code just assumes memset is available
+    add_definitions(-FIstring.h)
 endif()
 add_definitions(-DNOCONTROLS -DTHREADED_AUDIO)
 
-# some c++ code just assumes memset is available
-file(WRITE ${CMAKE_SOURCE_DIR}/declare_memset.h "#include <string.h>\n")
-add_definitions(-FIdeclare_memset.h)
-
 add_library(smpeg2
     audio/bitwindow.cpp
     audio/filter.cpp
@@ -45,21 +38,34 @@ add_library(smpeg2
     MPEGsystem.cpp
     smpeg.cpp)
 
-set_target_properties(smpeg2 PROPERTIES DEFINE_SYMBOL DLL_EXPORT)
-if(BUILD_SHARED_LIBS)
+if(WIN32 AND BUILD_SHARED_LIBS)
+    target_compile_definitions(smpeg2 PRIVATE -DDLL_EXPORT)
+endif()
+
+target_include_directories(smpeg2 PUBLIC
+    "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>"
+    $<INSTALL_INTERFACE:include>
+)
+
+
+if(TARGET SDL2::SDL2)
     target_link_libraries(smpeg2 SDL2::SDL2)
 else()
     target_link_libraries(smpeg2 SDL2::SDL2-static)
 endif()
 
 install(TARGETS smpeg2
+    EXPORT smpeg2-targets
     RUNTIME DESTINATION bin
     ARCHIVE DESTINATION lib
     LIBRARY DESTINATION lib)
 
+install(EXPORT smpeg2-targets
+    FILE unofficial-smpeg2-config.cmake
+    NAMESPACE unofficial::smpeg2::
+    DESTINATION share/unofficial-smpeg2
+)
+
 if(NOT DEFINED SMPEG_SKIP_HEADERS)
     install(FILES smpeg.h MPEGframe.h DESTINATION include)
 endif()
-
-message(STATUS "Link-time dependencies:")
-message(STATUS "  " ${SDL_LIBRARY})
diff --git a/external_imported/vcpkg/ports/smpeg2/hufftable-uint.patch b/external_imported/vcpkg/ports/smpeg2/hufftable-uint.patch
new file mode 100644
index 000000000..14036a3dd
--- /dev/null
+++ b/external_imported/vcpkg/ports/smpeg2/hufftable-uint.patch
@@ -0,0 +1,27 @@
+diff --git a/audio/hufftable.cpp b/audio/hufftable.cpp
+index 6bc8e86..1ef2d7e 100644
+--- a/audio/hufftable.cpp
++++ b/audio/hufftable.cpp
+@@ -550,11 +550,11 @@ htd33[ 31][2]={{ 16,  1},{  8,  1},{  4,  1},{  2,  1},{  0,  0},{  0,  1},
+ 
+ const HUFFMANCODETABLE MPEGaudio::ht[HTN]=
+ {
+-  { 0, 0-1, 0-1, 0,  0, htd33},
++  { 0, 0u-1, 0u-1, 0,  0, htd33},
+   { 1, 2-1, 2-1, 0,  7,htd01},
+   { 2, 3-1, 3-1, 0, 17,htd02},
+   { 3, 3-1, 3-1, 0, 17,htd03},
+-  { 4, 0-1, 0-1, 0,  0, htd33},
++  { 4, 0u-1, 0u-1, 0,  0, htd33},
+   { 5, 4-1, 4-1, 0, 31,htd05},
+   { 6, 4-1, 4-1, 0, 31,htd06},
+   { 7, 6-1, 6-1, 0, 71,htd07},
+@@ -564,7 +564,7 @@ const HUFFMANCODETABLE MPEGaudio::ht[HTN]=
+   {11, 8-1, 8-1, 0,127,htd11},
+   {12, 8-1, 8-1, 0,127,htd12},
+   {13,16-1,16-1, 0,511,htd13},
+-  {14, 0-1, 0-1, 0,  0, htd33},
++  {14, 0u-1, 0u-1, 0,  0, htd33},
+   {15,16-1,16-1, 0,511,htd15},
+   {16,16-1,16-1, 1,511,htd16},
+   {17,16-1,16-1, 2,511,htd16},
diff --git a/external_imported/vcpkg/ports/smpeg2/portfile.cmake b/external_imported/vcpkg/ports/smpeg2/portfile.cmake
index b1f31968c..570bee625 100644
--- a/external_imported/vcpkg/ports/smpeg2/portfile.cmake
+++ b/external_imported/vcpkg/ports/smpeg2/portfile.cmake
@@ -1,5 +1,3 @@
-
-set(VERSION 2.0.0)
 vcpkg_download_distfile(ARCHIVE
     URLS "https://www.libsdl.org/projects/smpeg/release/smpeg2-${VERSION}.tar.gz"
     FILENAME "smpeg2-${VERSION}.tar.gz"
@@ -9,11 +7,9 @@ vcpkg_download_distfile(ARCHIVE
 vcpkg_extract_source_archive(
     SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
-    SOURCE_BASE "${VERSION}"
     PATCHES 
-        "001-correct-sdl-headers-dir.patch"
-        "002-use-SDL2-headers.patch"
-        "003-fix-double-ptr-to-int-comparison.patch"
+        hufftable-uint.patch
+        003-fix-double-ptr-to-int-comparison.patch
 )
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
@@ -21,9 +17,22 @@ file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS_DEBUG
-        -DSMPEG_SKIP_HEADERS=ON)
-
+        -DSMPEG_SKIP_HEADERS=ON
+)
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-smpeg2)
+file(READ "${CURRENT_PACKAGES_DIR}/share/unofficial-smpeg2/unofficial-smpeg2-config.cmake" config)
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/unofficial-smpeg2/unofficial-smpeg2-config.cmake"
+"include(CMakeFindDependencyMacro)
+find_dependency(SDL2 CONFIG)
+${config}"
+)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+file(READ "${SOURCE_PATH}/video/video.h" video_terms)
+string(REGEX REPLACE "#ifndef .*" "" video_terms "${video_terms}")
+file(WRITE "${SOURCE_PATH}/Additional notes" "${video_terms}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING" "${SOURCE_PATH}/Additional notes")
diff --git a/external_imported/vcpkg/ports/smpeg2/vcpkg.json b/external_imported/vcpkg/ports/smpeg2/vcpkg.json
index 4520ec7aa..5b8c653bd 100644
--- a/external_imported/vcpkg/ports/smpeg2/vcpkg.json
+++ b/external_imported/vcpkg/ports/smpeg2/vcpkg.json
@@ -1,14 +1,19 @@
 {
   "name": "smpeg2",
-  "version-string": "2.0.0",
-  "port-version": 8,
+  "version": "2.0.0",
+  "port-version": 10,
   "description": "SDL MPEG Player Library",
   "homepage": "https://www.libsdl.org/projects/smpeg/",
+  "license": null,
   "dependencies": [
     "sdl2",
     {
       "name": "vcpkg-cmake",
       "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/snap7/0001-remove-using-namespace-std.patch b/external_imported/vcpkg/ports/snap7/0001-remove-using-namespace-std.patch
new file mode 100644
index 000000000..d6c493d0c
--- /dev/null
+++ b/external_imported/vcpkg/ports/snap7/0001-remove-using-namespace-std.patch
@@ -0,0 +1,13 @@
+diff --git a/src/core/s7_partner.h b/src/core/s7_partner.h
+index 95211a2..25c1810 100644
+--- a/src/core/s7_partner.h
++++ b/src/core/s7_partner.h
+@@ -29,7 +29,7 @@
+ #include "snap_threads.h"
+ #include "s7_peer.h"
+ //---------------------------------------------------------------------------
+-using namespace std;
++//using namespace std;
+ //---------------------------------------------------------------------------
+ 
+ #define MaxPartners 256
diff --git a/external_imported/vcpkg/ports/snap7/CMakeLists.txt b/external_imported/vcpkg/ports/snap7/CMakeLists.txt
new file mode 100644
index 000000000..5dcf75ace
--- /dev/null
+++ b/external_imported/vcpkg/ports/snap7/CMakeLists.txt
@@ -0,0 +1,70 @@
+# CMakeList.txt : CMake project for Snap7, include source and define
+# project specific logic here.
+cmake_minimum_required (VERSION 3.8)
+
+project(snap7
+        VERSION 1.4.2
+        LANGUAGES CXX)
+
+# Add source to this project's executable.
+add_library(${PROJECT_NAME} SHARED "core/s7_client.cpp"
+                                   "core/s7_client.h"
+                                   "core/s7_firmware.h"
+                                   "core/s7_isotcp.cpp"
+                                   "core/s7_isotcp.h"
+                                   "core/s7_micro_client.cpp"
+                                   "core/s7_micro_client.h"
+                                   "core/s7_partner.cpp"
+                                   "core/s7_partner.h"
+                                   "core/s7_peer.cpp"
+                                   "core/s7_peer.h"
+                                   "core/s7_server.cpp"
+                                   "core/s7_server.h"
+                                   "core/s7_text.cpp"
+                                   "core/s7_text.h"
+                                   "core/s7_types.h"
+                                   "lib/snap7_libmain.cpp"
+                                   "lib/snap7_libmain.h"
+                                   "sys/snap_msgsock.cpp"
+                                   "sys/snap_msgsock.h"
+                                   "sys/snap_platform.h"
+                                   "sys/snap_sysutils.cpp"
+                                   "sys/snap_sysutils.h"
+                                   "sys/snap_tcpsrvr.cpp"
+                                   "sys/snap_tcpsrvr.h"
+                                   "sys/snap_threads.cpp"
+                                   "sys/snap_threads.h"
+                                   "sys/sol_threads.h"
+                                   "sys/unix_threads.h"
+                                   "sys/win_threads.h"
+                                   "../release/Wrappers/c-cpp/snap7.h"
+                                   "../release/Wrappers/c-cpp/snap7.cpp"
+                                   )
+
+if(MSVC)
+  target_link_libraries(${PROJECT_NAME} wsock32 ws2_32)
+  target_link_libraries(${PROJECT_NAME} winmm.lib)
+endif()
+
+add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
+
+target_include_directories(${PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/core> $<INSTALL_INTERFACE:include>)
+target_include_directories(${PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/lib> $<INSTALL_INTERFACE:include>)
+target_include_directories(${PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/sys> $<INSTALL_INTERFACE:include>)
+target_include_directories(${PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../release/Wrappers/c-cpp> $<INSTALL_INTERFACE:include>)
+
+install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME})
+
+install(
+    EXPORT ${PROJECT_NAME} 
+    FILE ${PROJECT_NAME}-config.cmake
+    DESTINATION "share/${PROJECT_NAME}"
+    NAMESPACE ${PROJECT_NAME}::
+)
+
+if(NOT DISABLE_INSTALL_HEADERS)
+  install(DIRECTORY "core/" DESTINATION include/${PROJECT_NAME} FILES_MATCHING PATTERN "*.h")
+  install(DIRECTORY "lib/" DESTINATION include/${PROJECT_NAME} FILES_MATCHING PATTERN "*.h")
+  install(DIRECTORY "sys/" DESTINATION include/${PROJECT_NAME} FILES_MATCHING PATTERN "*.h")
+  install(DIRECTORY "../release/Wrappers/c-cpp/" DESTINATION include/${PROJECT_NAME} FILES_MATCHING PATTERN "*.h")
+endif()
diff --git a/external_imported/vcpkg/ports/snap7/portfile.cmake b/external_imported/vcpkg/ports/snap7/portfile.cmake
new file mode 100644
index 000000000..143ae6796
--- /dev/null
+++ b/external_imported/vcpkg/ports/snap7/portfile.cmake
@@ -0,0 +1,24 @@
+vcpkg_from_sourceforge(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO snap7
+    REF "${VERSION}"
+    FILENAME "snap7-full-${VERSION}.7z"
+    SHA512 84F4E1AD15BFEC201F9EB1EC90A28F37DFC848E370DB5CEA22EF4946F41FF6CC514581D29D592B57EE6D4C77F4AABB4B2BBA1E3637043161821BA2FFAE7F2DD6
+    PATCHES 
+      0001-remove-using-namespace-std.patch
+)
+
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}/src")
+
+vcpkg_cmake_configure(
+  SOURCE_PATH "${SOURCE_PATH}/src"
+  OPTIONS_DEBUG
+    -DDISABLE_INSTALL_HEADERS=ON
+)
+
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/snap7/__history")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/lgpl-3.0.txt")
diff --git a/external_imported/vcpkg/ports/snap7/vcpkg.json b/external_imported/vcpkg/ports/snap7/vcpkg.json
new file mode 100644
index 000000000..4655012b4
--- /dev/null
+++ b/external_imported/vcpkg/ports/snap7/vcpkg.json
@@ -0,0 +1,15 @@
+{
+  "name": "snap7",
+  "version": "1.4.2",
+  "port-version": 1,
+  "description": "Snap7",
+  "homepage": "https://snap7.sourceforge.net/",
+  "license": "LGPL-3.0",
+  "supports": "!android & !uwp & !static",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/snappy/no-werror.patch b/external_imported/vcpkg/ports/snappy/no-werror.patch
new file mode 100644
index 000000000..4315fef4a
--- /dev/null
+++ b/external_imported/vcpkg/ports/snappy/no-werror.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -68,7 +68,7 @@ 
+ 
+   # Use -Werror for clang only.
+   if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+-    if(NOT CMAKE_CXX_FLAGS MATCHES "-Werror")
++    if(0)
+       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+     endif(NOT CMAKE_CXX_FLAGS MATCHES "-Werror")
+   endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
diff --git a/external_imported/vcpkg/ports/snappy/portfile.cmake b/external_imported/vcpkg/ports/snappy/portfile.cmake
index 8f3f3f9ef..0c7098082 100644
--- a/external_imported/vcpkg/ports/snappy/portfile.cmake
+++ b/external_imported/vcpkg/ports/snappy/portfile.cmake
@@ -5,10 +5,11 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/snappy
     REF ${version}
-    SHA512 f1f8a90f5f7f23310423574b1d8c9acb84c66ea620f3999d1060395205e5760883476837aba02f0aa913af60819e34c625d8308c18a5d7a9c4e190f35968b024
+    SHA512 3578597f1d4ec09104ce0296b825b013590351230dfe56c635081fd282ce7a13a34caf2c283ac77bd24065e2d27af6db068d1f84b98cec2fd39a0e37a0d77070
     HEAD_REF master
     PATCHES
         fix_clang-cl_build.patch
+        no-werror.patch
 )
 
 vcpkg_cmake_configure(
@@ -16,13 +17,19 @@ vcpkg_cmake_configure(
     OPTIONS
         -DSNAPPY_BUILD_TESTS=OFF
         -DSNAPPY_BUILD_BENCHMARKS=OFF
+
+        # These variables can be overriden in a custom triplet, see usage file
+        -DSNAPPY_HAVE_SSSE3=OFF
+        -DSNAPPY_HAVE_X86_CRC32=OFF
+        -DSNAPPY_HAVE_NEON_CRC32=OFF
+        -DSNAPPY_HAVE_BMI2=OFF
+        -DSNAPPY_HAVE_NEON=OFF
 )
 
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Snappy)
 vcpkg_copy_pdbs()
 
-string(JSON version GET "${manifest}" version)
 string(JSON description GET "${manifest}" description)
 set(name "${PORT}")
 
@@ -34,4 +41,7 @@ endif()
 
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/snappy/usage b/external_imported/vcpkg/ports/snappy/usage
new file mode 100644
index 000000000..64116975c
--- /dev/null
+++ b/external_imported/vcpkg/ports/snappy/usage
@@ -0,0 +1,13 @@
+snappy provides CMake targets:
+
+    find_package(Snappy CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE Snappy::snappy)
+
+Optimizations based on hardware support are disabled by default.
+You can enable them by adding corresponding flags to VCPKG_CMAKE_CONFIGURE_OPTIONS inside a custom triplet file, for example:
+
+    if("${PORT}" STREQUAL "snappy")
+        list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS -DSNAPPY_HAVE_SSSE3=ON -DSNAPPY_HAVE_BMI2=ON)
+    endif()
+
+For a full list of possible options, see project's root CMakeLists.txt.
diff --git a/external_imported/vcpkg/ports/snappy/vcpkg.json b/external_imported/vcpkg/ports/snappy/vcpkg.json
index fa9d8cf67..d443c91d6 100644
--- a/external_imported/vcpkg/ports/snappy/vcpkg.json
+++ b/external_imported/vcpkg/ports/snappy/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "snappy",
-  "version": "1.1.9",
-  "port-version": 5,
+  "version": "1.1.10",
   "description": "A fast compressor/decompressor.",
   "homepage": "https://github.com/google/snappy",
   "license": null,
diff --git a/external_imported/vcpkg/ports/sndfile/vcpkg.json b/external_imported/vcpkg/ports/sndfile/vcpkg.json
index 2f91543bd..2005e6331 100644
--- a/external_imported/vcpkg/ports/sndfile/vcpkg.json
+++ b/external_imported/vcpkg/ports/sndfile/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "sndfile",
-  "version-string": "0",
-  "port-version": 1,
+  "version": "0",
+  "port-version": 2,
   "description": "x Library to read, write and manipulate many soundfile types.",
   "dependencies": [
     "libsndfile"
diff --git a/external_imported/vcpkg/ports/snitch/portfile.cmake b/external_imported/vcpkg/ports/snitch/portfile.cmake
new file mode 100644
index 000000000..3b9518527
--- /dev/null
+++ b/external_imported/vcpkg/ports/snitch/portfile.cmake
@@ -0,0 +1,23 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO snitch-org/snitch
+    REF v1.2.4
+    SHA512 783c4667d5c75d5d719d6c85a47ee795099256bacd01324d9bd5550be5f77be265f3372190b89ac109a11479bbf99f90a9e7afb32e6bdfeaab3a936ad50a219a
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DSNITCH_DEFINE_MAIN=0
+        -DCMAKE_CXX_STANDARD=20
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(
+    CONFIG_PATH lib/cmake/snitch
+)
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
diff --git a/external_imported/vcpkg/ports/snitch/vcpkg.json b/external_imported/vcpkg/ports/snitch/vcpkg.json
new file mode 100644
index 000000000..4f4223e29
--- /dev/null
+++ b/external_imported/vcpkg/ports/snitch/vcpkg.json
@@ -0,0 +1,17 @@
+{
+  "name": "snitch",
+  "version": "1.2.4",
+  "description": "Lightweight C++20 testing framework.",
+  "homepage": "https://github.com/snitch-org/snitch",
+  "license": "BSL-1.0",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/snowhouse/vcpkg.json b/external_imported/vcpkg/ports/snowhouse/vcpkg.json
index f8d9a392f..da2f04571 100644
--- a/external_imported/vcpkg/ports/snowhouse/vcpkg.json
+++ b/external_imported/vcpkg/ports/snowhouse/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "snowhouse",
-  "version-string": "5.0.0",
-  "port-version": 1,
+  "version": "5.0.0",
+  "port-version": 2,
   "description": "An assertion library for C++"
 }
diff --git a/external_imported/vcpkg/ports/so5extra/portfile.cmake b/external_imported/vcpkg/ports/so5extra/portfile.cmake
index 81261472f..fd3af7309 100644
--- a/external_imported/vcpkg/ports/so5extra/portfile.cmake
+++ b/external_imported/vcpkg/ports/so5extra/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO stiffstream/so5extra
-    REF be3fe020c30a7e5b3d7d2ac763c83e9a5dc7941f # v.1.5.2
-    SHA512 49286808c189af9de1736e6bf3ac58273801d81c2123da4e94836a9ae83d68a8b55414a2c2373195d9c2af6a0ea7d4244754310869f6b2fab59c13547bdf478b
+    REF "v.${VERSION}"
+    SHA512 ec9de55671ecd0d49fce3e677e11776306ec9ea993b06d67eaa3e5505ea171085c35aedea3cf29e03958b2c73f438c5ccd95539c75b63fd89c50d6367ccda1fe
 )
 
 vcpkg_cmake_configure(
diff --git a/external_imported/vcpkg/ports/so5extra/vcpkg.json b/external_imported/vcpkg/ports/so5extra/vcpkg.json
index 0a60394ea..5b0b7683b 100644
--- a/external_imported/vcpkg/ports/so5extra/vcpkg.json
+++ b/external_imported/vcpkg/ports/so5extra/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "so5extra",
-  "version": "1.5.2",
+  "version": "1.6.1",
   "description": "A set of additional tools for SObjectizer framework.",
   "homepage": "https://github.com/Stiffstream/so5extra",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/sobjectizer/portfile.cmake b/external_imported/vcpkg/ports/sobjectizer/portfile.cmake
index 282bc7134..bd41024ef 100644
--- a/external_imported/vcpkg/ports/sobjectizer/portfile.cmake
+++ b/external_imported/vcpkg/ports/sobjectizer/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO stiffstream/sobjectizer
-    REF df7c3ee91b29079ae4e3525c34ad83a0d4e83d77 # v.5.7.4.2
-    SHA512 4caee3a95723c9564fbd5430492cc82513885ca17003e18b31378fc347ed8ad1b0859bd1693ecaaf514e8f82b86c07d1913a86f007250e2f28a77adfa03918b1
+    REF "v.${VERSION}"
+    SHA512 2121c33660ed9866527533a4cce660762d2c92e4224a7d1ef3130e26fd9015664fa0190b673cea89568314a4fa4cbb9414be9c86983ae87d07cacc122ced79bf
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SOBJECTIZER_BUILD_STATIC )
diff --git a/external_imported/vcpkg/ports/sobjectizer/vcpkg.json b/external_imported/vcpkg/ports/sobjectizer/vcpkg.json
index 995f4865f..9b2b75dfd 100644
--- a/external_imported/vcpkg/ports/sobjectizer/vcpkg.json
+++ b/external_imported/vcpkg/ports/sobjectizer/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "sobjectizer",
-  "version": "5.7.4.2",
+  "version": "5.8.1.1",
   "description": "SObjectizer is a C++ in-process message dispatching framework with implementation of Actor Model, Publish-Subscribe Model and CSP-like channels.",
   "homepage": "https://github.com/Stiffstream/sobjectizer",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/soci/dependencies.diff b/external_imported/vcpkg/ports/soci/dependencies.diff
new file mode 100644
index 000000000..187022d0e
--- /dev/null
+++ b/external_imported/vcpkg/ports/soci/dependencies.diff
@@ -0,0 +1,100 @@
+diff --git a/cmake/dependencies/Boost.cmake b/cmake/dependencies/Boost.cmake
+index 366d32b..7ff041b 100644
+--- a/cmake/dependencies/Boost.cmake
++++ b/cmake/dependencies/Boost.cmake
+@@ -10,4 +10,6 @@ endif()
+ set(Boost_RELEASE_VERSION
+   "${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
+ 
++set(BOOST_FOUND "${Boost_FOUND}")
++set(BOOST_LIBRARIES "${Boost_LIBRARIES}")
+ boost_external_report(Boost RELEASE_VERSION INCLUDE_DIR LIBRARIES)
+diff --git a/cmake/dependencies/MySQL.cmake b/cmake/dependencies/MySQL.cmake
+index 5599b08..0a4ce0f 100644
+--- a/cmake/dependencies/MySQL.cmake
++++ b/cmake/dependencies/MySQL.cmake
+@@ -1,5 +1,9 @@
+ set(MySQL_FIND_QUIETLY TRUE)
+ 
+-find_package(MySQL)
++find_package(MYSQL NAMES unofficial-libmysql REQUIRED)
++set(MYSQL_LIBRARIES "$<TARGET_NAME:libmysql>")
++if(TARGET mysqlclient AND NOT TARGET libmysql)
++    set(MYSQL_LIBRARIES "$<TARGET_NAME:mysqlclient>")
++endif()
+ 
+ boost_external_report(MySQL INCLUDE_DIR LIBRARIES)
+diff --git a/cmake/dependencies/PostgreSQL.cmake b/cmake/dependencies/PostgreSQL.cmake
+index c6f2154..ef6bfcd 100644
+--- a/cmake/dependencies/PostgreSQL.cmake
++++ b/cmake/dependencies/PostgreSQL.cmake
+@@ -1,5 +1,8 @@
+ set(PostgreSQL_FIND_QUIETLY TRUE)
+ 
+-find_package(PostgreSQL)
++find_package(PostgreSQL REQUIRED)
++set(POSTGRESQL_FOUND TRUE)
++set(POSTGRESQL_INCLUDE_DIRS "${PostgreSQL_INCLUDE_DIRS}")
++set(POSTGRESQL_LIBRARIES "${PostgreSQL_LIBRARIES}")
+ 
+ boost_external_report(PostgreSQL INCLUDE_DIRS LIBRARIES VERSION)
+diff --git a/cmake/dependencies/SQLite3.cmake b/cmake/dependencies/SQLite3.cmake
+index 0daa9a5..17775da 100644
+--- a/cmake/dependencies/SQLite3.cmake
++++ b/cmake/dependencies/SQLite3.cmake
+@@ -1,5 +1,6 @@
+ set(SQLITE3_FIND_QUIETLY TRUE)
+ 
+-find_package(SQLite3)
++find_package(SQLITE3 NAMES unofficial-sqlite3 CONFIG REQUIRED)
++set(SQLITE3_LIBRARIES unofficial::sqlite3::sqlite3)
+ 
+ boost_external_report(SQLite3 INCLUDE_DIR LIBRARIES)
+diff --git a/cmake/resources/SOCIConfig.cmake.in b/cmake/resources/SOCIConfig.cmake.in
+index 8096a3c..354c18b 100644
+--- a/cmake/resources/SOCIConfig.cmake.in
++++ b/cmake/resources/SOCIConfig.cmake.in
+@@ -1,3 +1,11 @@
+ @PACKAGE_INIT@
+ 
++include(CMakeFindDependencyMacro)
++if("@WITH_MYSQL@")
++    find_dependency(unofficial-libmysql)
++endif()
++if("@WITH_SQLITE3@")
++    find_dependency(unofficial-sqlite3)
++endif()
++
+ include(${CMAKE_CURRENT_LIST_DIR}/SOCITargets.cmake)
+diff --git a/include/soci/mysql/soci-mysql.h b/include/soci/mysql/soci-mysql.h
+index 376bb7e..fbe48fa 100644
+--- a/include/soci/mysql/soci-mysql.h
++++ b/include/soci/mysql/soci-mysql.h
+@@ -21,8 +21,8 @@
+ #ifdef _WIN32
+ #include <winsock.h> // SOCKET
+ #endif // _WIN32
+-#include <mysql.h> // MySQL Client
+-#include <errmsg.h> // MySQL Error codes
++#include <mysql/mysql.h> // MySQL Client
++#include <mysql/errmsg.h> // MySQL Error codes
+ #include <vector>
+ 
+ 
+diff --git a/src/backends/CMakeLists.txt b/src/backends/CMakeLists.txt
+index 871e151..3cffc80 100644
+--- a/src/backends/CMakeLists.txt
++++ b/src/backends/CMakeLists.txt
+@@ -14,9 +14,9 @@ colormsg(_HIBLUE_ "Configuring SOCI backend libraries:")
+ foreach(dep ${SOCI_BACKENDS_DB_DEPENDENCIES})
+ 	string(TOUPPER ${dep} depUP)
+ 	if (WITH_${depUP})
+-		find_package(${dep})
+-	endif()
+-	if(${dep}_FOUND OR ${depUP}_FOUND)
++		if(NOT (${dep}_FOUND OR ${depUP}_FOUND))
++			message(FATAL_ERROR "${depUP} not found, check SociDependencies.cmake")
++		endif()
+ 		set(${depUP}_FOUND ON)
+ 	else()
+ 		set(${depUP}_FOUND OFF)
diff --git a/external_imported/vcpkg/ports/soci/export-include-dirs.patch b/external_imported/vcpkg/ports/soci/export-include-dirs.patch
deleted file mode 100644
index e141363fc..000000000
--- a/external_imported/vcpkg/ports/soci/export-include-dirs.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/cmake/SociBackend.cmake b/cmake/SociBackend.cmake
-index 5d4ef0d..bb0edf2 100644
---- a/cmake/SociBackend.cmake
-+++ b/cmake/SociBackend.cmake
-@@ -159,8 +159,14 @@ macro(soci_backend NAME)
-           ${THIS_BACKEND_HEADERS})
- 
-         target_link_libraries(${THIS_BACKEND_TARGET}
-+          PUBLIC
-           ${SOCI_CORE_TARGET}
-           ${THIS_BACKEND_DEPENDS_LIBRARIES})
-+          
-+        target_include_directories(${THIS_BACKEND_TARGET}
-+          PUBLIC
-+          ${THIS_BACKEND_DEPENDS_INCLUDE_DIRS}
-+        )
- 
-         if(WIN32)
-           set_target_properties(${THIS_BACKEND_TARGET}
-@@ -197,9 +203,15 @@ macro(soci_backend NAME)
- 
-         # Still need to link the libraries for tests to work
-         target_link_libraries (${THIS_BACKEND_TARGET_STATIC}
-+          PUBLIC
-           ${THIS_BACKEND_DEPENDS_LIBRARIES}
-         )
--
-+        
-+        target_include_directories(${THIS_BACKEND_TARGET_STATIC}
-+          PUBLIC
-+          ${THIS_BACKEND_DEPENDS_INCLUDE_DIRS}
-+        )
-+        
-         set_target_properties(${THIS_BACKEND_TARGET_STATIC}
-           PROPERTIES
-           OUTPUT_NAME ${THIS_BACKEND_OUTPUT_NAME}
diff --git a/external_imported/vcpkg/ports/soci/fix-dependency-libmysql.patch b/external_imported/vcpkg/ports/soci/fix-dependency-libmysql.patch
deleted file mode 100644
index 809ec76d5..000000000
--- a/external_imported/vcpkg/ports/soci/fix-dependency-libmysql.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/cmake/modules/FindMySQL.cmake b/cmake/modules/FindMySQL.cmake
-index 1233568..9a7cb61 100644
---- a/cmake/modules/FindMySQL.cmake
-+++ b/cmake/modules/FindMySQL.cmake
-@@ -13,6 +13,9 @@
- #
- # Redistribution and use is allowed according to the terms of the BSD license.
- # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-+find_package(libmysql REQUIRED)
-+set(MySQL_FOUND 1)
-+return()
- 
- include(CheckCXXSourceCompiles)
- 
diff --git a/external_imported/vcpkg/ports/soci/fix-mysql-feature-error.patch b/external_imported/vcpkg/ports/soci/fix-mysql-feature-error.patch
deleted file mode 100644
index 05e9c4bfe..000000000
--- a/external_imported/vcpkg/ports/soci/fix-mysql-feature-error.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/backends/mysql/session.cpp b/src/backends/mysql/session.cpp
-index 383248c..86a5bfd 100644
---- a/src/backends/mysql/session.cpp
-+++ b/src/backends/mysql/session.cpp
-@@ -5,6 +5,7 @@
- // (See accompanying file LICENSE_1_0.txt or copy at
- // http://www.boost.org/LICENSE_1_0.txt)
- //
-+typedef bool my_bool;
- 
- #define SOCI_MYSQL_SOURCE
- #include "soci/mysql/soci-mysql.h"
diff --git a/external_imported/vcpkg/ports/soci/portfile.cmake b/external_imported/vcpkg/ports/soci/portfile.cmake
index 71dc324a1..b6757821d 100644
--- a/external_imported/vcpkg/ports/soci/portfile.cmake
+++ b/external_imported/vcpkg/ports/soci/portfile.cmake
@@ -5,57 +5,70 @@ vcpkg_from_github(
     SHA512 d501f55e7e7408e46b4823fd8a97d6ef587f5db0f5b98434be8dfc5693c91b8c3b84a24454279c83142ab1cd1fa139c6e54d6d9a67397b2ead61650fcc88bcdb
     HEAD_REF master
     PATCHES
-        fix-dependency-libmysql.patch
-        export-include-dirs.patch
-        fix-mysql-feature-error.patch # https://bugs.mysql.com/bug.php?id=85131
+        dependencies.diff
+        usage-requirements.diff
+)
+file(REMOVE
+    "${SOURCE_PATH}/cmake/modules/FindPostgreSQL.cmake"
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SOCI_DYNAMIC)
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SOCI_STATIC)
 
-# Handle features
-set(_COMPONENT_FLAGS "")
-foreach(_feature IN LISTS ALL_FEATURES)
-    # Uppercase the feature name and replace "-" with "_"
-    string(TOUPPER "${_feature}" _FEATURE)
-    string(REPLACE "-" "_" _FEATURE "${_FEATURE}")
-
-    # Turn "-DWITH_*=" ON or OFF depending on whether the feature
-    # is in the list.
-    if(_feature IN_LIST FEATURES)
-        list(APPEND _COMPONENT_FLAGS "-DWITH_${_FEATURE}=ON")
-    else()
-        list(APPEND _COMPONENT_FLAGS "-DWITH_${_FEATURE}=OFF")
-    endif()
-
-    if(_feature MATCHES "mysql")
-        set(MYSQL_OPT "-DMYSQL_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/mysql")
-    endif()
-endforeach()
+vcpkg_check_features(OUT_FEATURE_OPTIONS options
+    FEATURES
+        boost       WITH_BOOST
+        boost       CMAKE_REQUIRE_FIND_PACKAGE_Boost
+        empty       SOCI_EMPTY
+        mysql       WITH_MYSQL
+        odbc        WITH_ODBC
+        odbc        CMAKE_REQUIRE_FIND_PACKAGE_ODBC
+        postgresql  WITH_POSTGRESQL
+        sqlite3     WITH_SQLITE3
+    INVERTED_FEATURES
+        core        WITH_DB2
+        core        WITH_FIREBIRD
+        core        WITH_ORACLE
+        core        WITH_VALGRIND
+)
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-        -DSOCI_TESTS=OFF
         -DSOCI_CXX11=ON
-        -DSOCI_STATIC=${SOCI_STATIC}
         -DSOCI_SHARED=${SOCI_DYNAMIC}
-        ${_COMPONENT_FLAGS}
-        ${MYSQL_OPT}
+        -DSOCI_STATIC=${SOCI_STATIC}
+        -DSOCI_TESTS=OFF
+        ${options}
+    MAYBE_UNUSED_VARIABLES
+        CMAKE_REQUIRE_FIND_PACKAGE_Boost
+        CMAKE_REQUIRE_FIND_PACKAGE_ODBC
 )
 
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SOCI)
 
-if ("mysql" IN_LIST FEATURES)
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/SOCIConfig.cmake"
-        "# Create imported target SOCI::soci_mysql"
-        "\ninclude(CMakeFindDependencyMacro)\nfind_dependency(libmysql)\n# Create imported target SOCI::soci_mysql"
-    )
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/soci/soci-platform.h" "ifdef SOCI_DLL" "if 1")
 endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-# Handle copyright
+file(READ "${CURRENT_PORT_DIR}/usage" usage)
+set(backends ${FEATURES})
+list(REMOVE_ITEM backends core boost)
+if(backends STREQUAL "")
+    string(APPEND usage "
+This soci build doesn't include any backend and may not be useful.
+")
+endif()
+foreach(backend IN LISTS backends)
+    string(APPEND usage "
+    # Using the ${backend} backend directly
+    target_link_libraries(main PRIVATE $<IF:$<TARGET_EXISTS:SOCI::soci_${backend}>,SOCI::soci_${backend},SOCI::soci_${backend}_static>)
+")
+endforeach()
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" "${usage}")
+
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE_1_0.txt")
diff --git a/external_imported/vcpkg/ports/soci/usage b/external_imported/vcpkg/ports/soci/usage
new file mode 100644
index 000000000..fc3044265
--- /dev/null
+++ b/external_imported/vcpkg/ports/soci/usage
@@ -0,0 +1,5 @@
+soci provides CMake targets:
+
+    find_package(SOCI CONFIG REQUIRED)
+    # Using core (loading backends at runtime)
+    target_link_libraries(main PRIVATE $<IF:$<TARGET_EXISTS:SOCI::soci_core>,SOCI::soci_core,SOCI::soci_core_static>)
diff --git a/external_imported/vcpkg/ports/soci/usage-requirements.diff b/external_imported/vcpkg/ports/soci/usage-requirements.diff
new file mode 100644
index 000000000..9ecd405c9
--- /dev/null
+++ b/external_imported/vcpkg/ports/soci/usage-requirements.diff
@@ -0,0 +1,33 @@
+diff --git a/cmake/SociBackend.cmake b/cmake/SociBackend.cmake
+index 5d4ef0d..279cb75 100644
+--- a/cmake/SociBackend.cmake
++++ b/cmake/SociBackend.cmake
+@@ -159,8 +159,13 @@ macro(soci_backend NAME)
+           ${THIS_BACKEND_HEADERS})
+ 
+         target_link_libraries(${THIS_BACKEND_TARGET}
++          PUBLIC
+           ${SOCI_CORE_TARGET}
+           ${THIS_BACKEND_DEPENDS_LIBRARIES})
++        target_include_directories(${THIS_BACKEND_TARGET}
++          PUBLIC
++          ${THIS_BACKEND_DEPENDS_INCLUDE_DIRS}
++        )
+ 
+         if(WIN32)
+           set_target_properties(${THIS_BACKEND_TARGET}
+@@ -197,8 +202,14 @@ macro(soci_backend NAME)
+ 
+         # Still need to link the libraries for tests to work
+         target_link_libraries (${THIS_BACKEND_TARGET_STATIC}
++          PUBLIC
++          ${SOCI_CORE_TARGET}_static
+           ${THIS_BACKEND_DEPENDS_LIBRARIES}
+         )
++        target_include_directories(${THIS_BACKEND_TARGET_STATIC}
++          PUBLIC
++          ${THIS_BACKEND_DEPENDS_INCLUDE_DIRS}
++        )
+ 
+         set_target_properties(${THIS_BACKEND_TARGET_STATIC}
+           PROPERTIES
diff --git a/external_imported/vcpkg/ports/soci/vcpkg.json b/external_imported/vcpkg/ports/soci/vcpkg.json
index c7abe8b51..004473ef3 100644
--- a/external_imported/vcpkg/ports/soci/vcpkg.json
+++ b/external_imported/vcpkg/ports/soci/vcpkg.json
@@ -1,8 +1,9 @@
 {
   "name": "soci",
   "version": "4.0.3",
-  "description": "SOCI database access library",
-  "homepage": "https://github.com/SOCI/soci",
+  "port-version": 3,
+  "description": "SOCI - The C++ Database Access Library",
+  "homepage": "https://soci.sourceforge.net/",
   "license": "BSL-1.0",
   "dependencies": [
     {
@@ -25,6 +26,9 @@
         "boost-tuple"
       ]
     },
+    "empty": {
+      "description": "Build the backend skeleton for new backends development"
+    },
     "mysql": {
       "description": "Build mysql backend",
       "dependencies": [
@@ -32,18 +36,31 @@
       ]
     },
     "odbc": {
-      "description": "Build odbc backend"
+      "description": "Build odbc backend",
+      "supports": "!uwp",
+      "dependencies": [
+        {
+          "name": "unixodbc",
+          "platform": "!windows"
+        }
+      ]
     },
     "postgresql": {
       "description": "Build postgresql backend",
       "dependencies": [
-        "libpq"
+        {
+          "name": "libpq",
+          "default-features": false
+        }
       ]
     },
     "sqlite3": {
       "description": "Build sqlite3 backend",
       "dependencies": [
-        "sqlite3"
+        {
+          "name": "sqlite3",
+          "default-features": false
+        }
       ]
     }
   }
diff --git a/external_imported/vcpkg/ports/socket-io-client/fix-build.patch b/external_imported/vcpkg/ports/socket-io-client/fix-build.patch
new file mode 100644
index 000000000..e48c9486c
--- /dev/null
+++ b/external_imported/vcpkg/ports/socket-io-client/fix-build.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a9c69d5..f2852c8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -19,7 +19,7 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+ endif()
+ 
+ # Only do these if this is the main project, and not if it is included through add_subdirectory
+-if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
++if(0)
+     # Testing only available if this is the main app
+     # Note this needs to be done in the main CMakeLists
+     # since it calls enable_testing, which must be in the
diff --git a/external_imported/vcpkg/ports/socket-io-client/portfile.cmake b/external_imported/vcpkg/ports/socket-io-client/portfile.cmake
index a0f97dc5a..645a81a63 100644
--- a/external_imported/vcpkg/ports/socket-io-client/portfile.cmake
+++ b/external_imported/vcpkg/ports/socket-io-client/portfile.cmake
@@ -3,9 +3,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO socketio/socket.io-client-cpp
-    REF dbb4547d3160368feaaf55c3338ad085a8f968b8
-    SHA512 cbb2a4742d16ba9ee72ca49a56605690ed620c978f51012e0d655a86b110a557b196ffc55af8b0440c1d7cd76d9dffe6f85abd0af300095608434eb9394dc68b
+    REF 0dc2f7afea17a0e5bfb5e9b1e6d6f26ab1455cef
+    SHA512 583cc0c6e392243203e4d10163a1cb5a404497472e684dfbeef7ca9634784a1fe4717f926858eea98aa0ac4356fb503abfbbeb58fcb1dd839c917e9f6ee104b1
     HEAD_REF master
+    PATCHES
+        fix-build.patch
 )
 
 vcpkg_cmake_configure(
diff --git a/external_imported/vcpkg/ports/socket-io-client/vcpkg.json b/external_imported/vcpkg/ports/socket-io-client/vcpkg.json
index 84ee82e7a..fad58a1e3 100644
--- a/external_imported/vcpkg/ports/socket-io-client/vcpkg.json
+++ b/external_imported/vcpkg/ports/socket-io-client/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "socket-io-client",
-  "version-date": "2022-08-19",
+  "version-date": "2023-11-11",
   "description": "C++11 implementation of Socket.IO client",
   "homepage": "https://github.com/socketio/socket.io-client-cpp",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/sockpp/portfile.cmake b/external_imported/vcpkg/ports/sockpp/portfile.cmake
index 2ab525a96..6ead08eb7 100644
--- a/external_imported/vcpkg/ports/sockpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/sockpp/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO fpagliughi/sockpp
-    REF 999ad87296e34d5a8e4edf15d985315d0d84eda7
-    SHA512 159b9288f45d5f5144a002f35caf520e55a66c2d45cdb1fe325021f100db0770601e973b86ec5b032e5bea1542203b30eba3e6be20e03c78f0504b62da1900b3
+    REF "v${VERSION}"
+    SHA512 e675bd9e094108c222128f65f64519d550f5dcc36ec217c57277d2d3bfadd4410d06278cfe2858e24d36fdcc0cced8d87d05c61abb94848d073182c29860b61a
     HEAD_REF master
 )
 
@@ -22,9 +22,8 @@ vcpkg_cmake_configure(
 
 vcpkg_cmake_install()
 
-file(INSTALL "${CURRENT_PORT_DIR}/sockppConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/sockpp/sockppConfig.cmake b/external_imported/vcpkg/ports/sockpp/sockppConfig.cmake
deleted file mode 100644
index 840b96ed0..000000000
--- a/external_imported/vcpkg/ports/sockpp/sockppConfig.cmake
+++ /dev/null
@@ -1,23 +0,0 @@
-get_filename_component(_DIR "${CMAKE_CURRENT_LIST_DIR}/../../" ABSOLUTE)
-if(NOT SOCKPP_FIND_COMPONENTS)
-    set(SOCKPP_FIND_COMPONENTS sockpp)
-    if(SOCKPP_FIND_REQUIRED)
-        set(SOCKPP_FIND_REQUIRED_sockpp TRUE)
-    endif()
-    set(SOCKPP_FOUND TRUE)
-endif()
-
-set(SOCKPP_INCLUDE_DIRS ${_DIR}/include)
-set(SOCKPP_LIBRARIES)
-if (EXISTS ${_DIR}/lib/libsockpp.a)
-    list(APPEND SOCKPP_LIBRARIES optimized ${_DIR}/lib/libsockpp.a)
-endif()
-if (EXISTS ${_DIR}/debug/lib/libsockpp.a)
-    list(APPEND SOCKPP_LIBRARIES debug ${_DIR}/debug/lib/libsockpp.a)
-endif()
-if (EXISTS ${_DIR}/lib/sockpp.lib)
-    list(APPEND SOCKPP_LIBRARIES optimized ${_DIR}/lib/sockpp.lib)
-endif()
-if (EXISTS ${_DIR}/debug/lib/sockpp.lib)
-    list(APPEND SOCKPP_LIBRARIES debug ${_DIR}/debug/lib/sockpp.lib)
-endif()
diff --git a/external_imported/vcpkg/ports/sockpp/usage b/external_imported/vcpkg/ports/sockpp/usage
deleted file mode 100644
index 5cfb06d29..000000000
--- a/external_imported/vcpkg/ports/sockpp/usage
+++ /dev/null
@@ -1,5 +0,0 @@
-The package sockpp provides CMake integration:
-
-    find_package(sockpp CONFIG REQUIRED)
-    target_include_directories(main PRIVATE ${SOCKPP_INCLUDE_DIRS})
-    target_link_libraries(main PRIVATE ${SOCKPP_LIBRARIES})
diff --git a/external_imported/vcpkg/ports/sockpp/vcpkg.json b/external_imported/vcpkg/ports/sockpp/vcpkg.json
index 07d6f3f00..eeb2d570d 100644
--- a/external_imported/vcpkg/ports/sockpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/sockpp/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "sockpp",
-  "version": "0.7.1",
-  "port-version": 1,
+  "version": "0.8.1",
   "description": "Simple, modern, C++ socket library. This is a fairly low-level C++ wrapper around the Berkeley sockets library using socket, acceptor, and connector classes that are familiar concepts from other languages.",
   "homepage": "https://github.com/fpagliughi/sockpp",
   "license": "BSD-3-Clause",
@@ -10,6 +9,10 @@
     {
       "name": "vcpkg-cmake",
       "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/soem/disable-werror.patch b/external_imported/vcpkg/ports/soem/disable-werror.patch
index 7c1fd9685..18a664f53 100644
--- a/external_imported/vcpkg/ports/soem/disable-werror.patch
+++ b/external_imported/vcpkg/ports/soem/disable-werror.patch
@@ -1,23 +1,9 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1778965..4c481b7 100644
+index 7fa930c..e14b1bd 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -13,21 +13,18 @@ set(BUILD_TESTS TRUE)
- 
- if(WIN32)
-   set(OS "win32")
--  find_path(winpcap_INCLUDE_DIRS NAMES pcap.h)
--  find_library(winpcap_LIBRARY NAMES wpcap)
--  find_library(packet_LIBRARY NAMES packet)
--  include_directories(${winpcap_INCLUDE_DIRS})
-+  find_path(winpcap_INCLUDE_DIRS NAMES pcap.h)
-+  find_library(winpcap_LIBRARY NAMES wpcap)
-+  find_library(packet_LIBRARY NAMES packet)
-+  include_directories(${winpcap_INCLUDE_DIRS})
-   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_NO_WARNINGS")
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}  /WX")
--  set(OS_LIBS ${winpcap_LIBRARY} ${packet_LIBRARY} Ws2_32.lib Winmm.lib)
-+  set(OS_LIBS ${winpcap_LIBRARY} ${packet_LIBRARY} Ws2_32.lib Winmm.lib)
+@@ -31,12 +31,10 @@ if(WIN32)
+   set(OS_LIBS ${winpcap_LIBRARY} ${packet_LIBRARY} Ws2_32.lib Winmm.lib)
  elseif(UNIX AND NOT APPLE)
    set(OS "linux")
 -  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror")
@@ -29,7 +15,7 @@ index 1778965..4c481b7 100644
    set(OS_LIBS pthread pcap)
  elseif(${CMAKE_SYSTEM_NAME} MATCHES "rt-kernel")
    set(OS "rtk")
-@@ -36,10 +33,6 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "rt-kernel")
+@@ -45,10 +43,6 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "rt-kernel")
    include_directories(oshw/${OS}/${ARCH})
    file(GLOB OSHW_EXTRA_SOURCES oshw/${OS}/${ARCH}/*.c)
    set(OSHW_SOURCES "${OS_HW_SOURCES} ${OSHW_ARCHSOURCES}")
@@ -39,4 +25,4 @@ index 1778965..4c481b7 100644
 -  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-format")
    set(OS_LIBS "-Wl,--start-group -l${BSP} -l${ARCH} -lkern -ldev -lsio -lblock -lfs -lusb -llwip -leth -li2c -lrtc -lcan -lnand -lspi -lnor -lpwm -ladc -ltrace -lc -lm -Wl,--end-group")
  elseif(${CMAKE_SYSTEM_NAME} MATCHES "rtems")
-   message("Building for RTEMS")
+   message(STATUS "Building for RTEMS")
diff --git a/external_imported/vcpkg/ports/soem/portfile.cmake b/external_imported/vcpkg/ports/soem/portfile.cmake
index 338222a55..fa83adcf1 100644
--- a/external_imported/vcpkg/ports/soem/portfile.cmake
+++ b/external_imported/vcpkg/ports/soem/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO OpenEtherCATsociety/SOEM
-    REF abbf0d42e38d6cfbaa4c1e9e8e07ace651c386fd #v1.4.0
-    SHA512 2967775c6746bb63becea5eb12f136c184bbf874e1e5e8753374bfc212ec9cefbf1159350e79627b978af3562d261b61c50f38936a425c4d9c70598a1d136817
+    REF a901500618405760a564e64a6816705e29f50f9f
+    SHA512 d554bc1c3780b1a81402a7fda490f516caba6bd943a28482740b5c9d97e4273a11546e79c92796487ee9901f568cbf1b329d4e1c1d32602fdce0088a77c82443
     HEAD_REF master
     PATCHES
         winpcap.patch
@@ -13,16 +13,21 @@ vcpkg_from_github(
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+    -DBUILD_TESTS=OFF
 )
 
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
+vcpkg_cmake_config_fixup(CONFIG_PATH "share/soem/cmake")
+
 file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/bin"
     "${CURRENT_PACKAGES_DIR}/debug/bin"
     "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/debug/share"
 )
 
 # Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/soem/vcpkg.json b/external_imported/vcpkg/ports/soem/vcpkg.json
index eb303eb66..6915b4c80 100644
--- a/external_imported/vcpkg/ports/soem/vcpkg.json
+++ b/external_imported/vcpkg/ports/soem/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "soem",
-  "version": "1.4.0",
-  "port-version": 4,
+  "version-date": "2023-06-09",
+  "port-version": 1,
   "description": "Simple Open Source EtherCAT Master",
   "homepage": "https://github.com/OpenEtherCATsociety/SOEM",
   "supports": "!uwp",
@@ -10,6 +10,10 @@
       "name": "vcpkg-cmake",
       "host": true
     },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
     {
       "name": "winpcap",
       "platform": "windows"
diff --git a/external_imported/vcpkg/ports/soem/winpcap.patch b/external_imported/vcpkg/ports/soem/winpcap.patch
index 215226e6f..ca795f1fc 100644
--- a/external_imported/vcpkg/ports/soem/winpcap.patch
+++ b/external_imported/vcpkg/ports/soem/winpcap.patch
@@ -1,23 +1,25 @@
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -13,15 +13,13 @@
- 
- if(WIN32)
-   set(OS "win32")
--  include_directories(oshw/win32/wpcap/Include)
--  if(CMAKE_SIZEOF_VOID_P EQUAL 8)
--    link_directories(${CMAKE_SOURCE_DIR}/oshw/win32/wpcap/Lib/x64)
--  elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
--    link_directories(${CMAKE_SOURCE_DIR}/oshw/win32/wpcap/Lib)
--  endif()
-+  find_path(winpcap_INCLUDE_DIRS NAMES pcap.h)
-+  find_library(winpcap_LIBRARY NAMES wpcap)
-+  find_library(packet_LIBRARY NAMES packet)
-+  include_directories(${winpcap_INCLUDE_DIRS})
-   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_NO_WARNINGS")
-   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}  /WX")
--  set(OS_LIBS wpcap.lib Packet.lib Ws2_32.lib Winmm.lib)
-+  set(OS_LIBS ${winpcap_LIBRARY} ${packet_LIBRARY} Ws2_32.lib Winmm.lib)
- elseif(UNIX AND NOT APPLE)
-   set(OS "linux")
-   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror")
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index baf26bd..7fa930c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -22,15 +22,13 @@ endif()
+ 
+ if(WIN32)
+   set(OS "win32")
+-  include_directories(oshw/win32/wpcap/Include)
+-  if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+-    link_directories(${CMAKE_CURRENT_LIST_DIR}/oshw/win32/wpcap/Lib/x64)
+-  elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
+-    link_directories(${CMAKE_CURRENT_LIST_DIR}/oshw/win32/wpcap/Lib)
+-  endif()
++  find_path(winpcap_INCLUDE_DIRS NAMES pcap.h)
++  find_library(winpcap_LIBRARY NAMES wpcap)
++  find_library(packet_LIBRARY NAMES packet)
++  include_directories(${winpcap_INCLUDE_DIRS})
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_NO_WARNINGS")
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}  /WX")
+-  set(OS_LIBS wpcap.lib Packet.lib Ws2_32.lib Winmm.lib)
++  set(OS_LIBS ${winpcap_LIBRARY} ${packet_LIBRARY} Ws2_32.lib Winmm.lib)
+ elseif(UNIX AND NOT APPLE)
+   set(OS "linux")
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror")
diff --git a/external_imported/vcpkg/ports/soil2/vcpkg.json b/external_imported/vcpkg/ports/soil2/vcpkg.json
index 55acddbbb..08a5013f0 100644
--- a/external_imported/vcpkg/ports/soil2/vcpkg.json
+++ b/external_imported/vcpkg/ports/soil2/vcpkg.json
@@ -1,9 +1,11 @@
 {
   "name": "soil2",
   "version": "1.3.0",
+  "port-version": 1,
   "description": "Simple OpenGL Image Library 2",
   "homepage": "https://github.com/SpartanJ/SOIL2",
   "license": "MIT-0",
+  "supports": "!uwp & !android",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/sokol/portfile.cmake b/external_imported/vcpkg/ports/sokol/portfile.cmake
index 9785eecca..be80a3a82 100644
--- a/external_imported/vcpkg/ports/sokol/portfile.cmake
+++ b/external_imported/vcpkg/ports/sokol/portfile.cmake
@@ -3,16 +3,15 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO floooh/sokol
-    REF 425e906d2af8c976c30f7e925a303fea9f0bf879
-    SHA512 4606735b9466637f3b676402cc2d7ef96e4152836c901d7a84039c52951aec27922726de21a537e0fef2d2218f48e3a9a3c32c3bc67076c10d199f067f50dad9
+    REF d98c8b92c25070f13d0491f5fade1d9d2ca885ad
+    SHA512 bb49dc3da366e70c7b6b16ebd490f9b2c88c496b278f1b9651321b3aab0977db92707d3955c2cb2654d8032647429ac90aa585de36644380112d988eac877cd0
     HEAD_REF master
 )
 
-file(GLOB SOKOL_INCLUDE_FILES ${SOURCE_PATH}/*.h)
-file(COPY ${SOKOL_INCLUDE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+file(GLOB SOKOL_INCLUDE_FILES "${SOURCE_PATH}/*.h")
+file(COPY ${SOKOL_INCLUDE_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include")
 
-file(GLOB SOKOL_UTIL_INCLUDE_FILES ${SOURCE_PATH}/util/*.h)
-file(COPY ${SOKOL_UTIL_INCLUDE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/util)
+file(GLOB SOKOL_UTIL_INCLUDE_FILES "${SOURCE_PATH}/util/*.h")
+file(COPY ${SOKOL_UTIL_INCLUDE_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/util")
 
-# Handle copyright
-configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/sokol/vcpkg.json b/external_imported/vcpkg/ports/sokol/vcpkg.json
index 375455b94..2394bb697 100644
--- a/external_imported/vcpkg/ports/sokol/vcpkg.json
+++ b/external_imported/vcpkg/ports/sokol/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "sokol",
-  "version-string": "2019-09-09",
-  "port-version": 1,
+  "version-date": "2023-10-07",
   "description": "Minimal cross-platform standalone C headers",
-  "homepage": "https://github.com/floooh/sokol"
+  "homepage": "https://github.com/floooh/sokol",
+  "license": "Zlib"
 }
diff --git a/external_imported/vcpkg/ports/sol2/fix-namespace.patch b/external_imported/vcpkg/ports/sol2/fix-namespace.patch
deleted file mode 100644
index 79b3548d0..000000000
--- a/external_imported/vcpkg/ports/sol2/fix-namespace.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/cmake/sol2-config.cmake.in b/cmake/sol2-config.cmake.in
-index 0c48a99..62930db 100644
---- a/cmake/sol2-config.cmake.in
-+++ b/cmake/sol2-config.cmake.in
-@@ -24,9 +24,9 @@
- 
- include("${CMAKE_CURRENT_LIST_DIR}/sol2-targets.cmake")
- 
--if (TARGET sol2)
-+if (TARGET sol2::sol2)
-     get_target_property(SOL2_INCLUDE_DIRS
--        sol2 INTERFACE_INCLUDE_DIRECTORIES)
-+        sol2::sol2 INTERFACE_INCLUDE_DIRECTORIES)
-     set_and_check(SOL2_INCLUDE_DIRS "${SOL2_INCLUDE_DIRS}")
--    set(SOL2_LIBRARIES sol2)
-+    set(SOL2_LIBRARIES sol2::sol2)
- endif()
diff --git a/external_imported/vcpkg/ports/sol2/header-only.patch b/external_imported/vcpkg/ports/sol2/header-only.patch
new file mode 100644
index 000000000..06f6facad
--- /dev/null
+++ b/external_imported/vcpkg/ports/sol2/header-only.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 120dd38..0b069dc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -174,7 +174,7 @@ else()
+ endif()
+ 
+ # # # Tests, Examples and other CI suites that come with sol2
+-if (sol2-is-top-level-project)
++if (0)
+ 	# # # General project output locations
+ 	if (CMAKE_SIZEOF_VOID_P EQUAL 4)
+ 		set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/x86/lib")
diff --git a/external_imported/vcpkg/ports/sol2/portfile.cmake b/external_imported/vcpkg/ports/sol2/portfile.cmake
index c5c2cd8bc..b7ffa6538 100644
--- a/external_imported/vcpkg/ports/sol2/portfile.cmake
+++ b/external_imported/vcpkg/ports/sol2/portfile.cmake
@@ -1,28 +1,19 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ThePhD/sol2
-    REF eba86625b707e3c8c99bbfc4624e51f42dc9e561 #v3.3.0
-    SHA512 a1fbcb4efd9a8b8b97c351e90499644aea72a3db62c258e219a2912853936b76870b51e69d835c14cbf1a20733673ba474e259a0243fec419c411b995cd1511d 
+    REF "v${VERSION}"
+    SHA512 4404b124a4f331d77459c01a92cd73895301e7d3ef829a0285980f0138b9cc66782de3713d54f017d5aad7d8a11d23eeffbc5f3b39ccb4d4306a955711d385dd 
     HEAD_REF develop
-    PATCHES fix-namespace.patch
-)
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
+    PATCHES
+        header-only.patch
 )
 
+set(VCPKG_BUILD_TYPE release) # header-only
+vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}")
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/sol2)
+vcpkg_fixup_pkgconfig()
 
-file(
-    REMOVE_RECURSE
-        "${CURRENT_PACKAGES_DIR}/debug"
-        "${CURRENT_PACKAGES_DIR}/lib"
-        "${CURRENT_PACKAGES_DIR}/include"
-)
-
-file(INSTALL "${SOURCE_PATH}/include/sol" DESTINATION "${CURRENT_PACKAGES_DIR}/include/")
-
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
 
-vcpkg_fixup_pkgconfig()
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/external_imported/vcpkg/ports/sol2/vcpkg.json b/external_imported/vcpkg/ports/sol2/vcpkg.json
index 699abac23..9f4856dd1 100644
--- a/external_imported/vcpkg/ports/sol2/vcpkg.json
+++ b/external_imported/vcpkg/ports/sol2/vcpkg.json
@@ -1,14 +1,10 @@
 {
   "name": "sol2",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "description": "Sol v2.0 - a C++ <-> Lua API wrapper with advanced features and top notch performance - is here, and it's great",
   "homepage": "https://github.com/ThePhD/sol2",
   "license": "MIT",
   "dependencies": [
-    {
-      "name": "lua",
-      "platform": "windows"
-    },
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/external_imported/vcpkg/ports/sophus/portfile.cmake b/external_imported/vcpkg/ports/sophus/portfile.cmake
index 81cdf077d..772ebba0a 100644
--- a/external_imported/vcpkg/ports/sophus/portfile.cmake
+++ b/external_imported/vcpkg/ports/sophus/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO strasdat/Sophus
-    REF 49a7e1286910019f74fb4f0bb3e213c909f8e1b7
-    SHA512 d415aff722a6aff91b4f787804496fb534ad44ada8ce6f03adcf9e23dbf2e080af8d3d973b8cd2b5a024da856b76e4f5e45e60bf7c2a0500f9a77aa7b4e938e0
+    REF 1.22.10
+    SHA512 0b212a015d487b3a39a9c4beb4280ebd659782f527ec863f429b5aa57462d53c41976c9285894855b380baa97d5fda35b46dfd09aa31653fb35b51039816ac78
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/sophus/vcpkg.json b/external_imported/vcpkg/ports/sophus/vcpkg.json
index 5982c622d..f2129105f 100644
--- a/external_imported/vcpkg/ports/sophus/vcpkg.json
+++ b/external_imported/vcpkg/ports/sophus/vcpkg.json
@@ -1,14 +1,12 @@
 {
   "name": "sophus",
-  "version-date": "2021-09-14",
+  "version": "1.22.10",
   "description": "Lie group library for C++",
   "homepage": "https://github.com/strasdat/Sophus",
   "license": "MIT",
   "dependencies": [
-    "ceres",
     "eigen3",
     "fmt",
-    "suitesparse",
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/external_imported/vcpkg/ports/sord/vcpkg.json b/external_imported/vcpkg/ports/sord/vcpkg.json
index 4db1a0c11..1070a47ea 100644
--- a/external_imported/vcpkg/ports/sord/vcpkg.json
+++ b/external_imported/vcpkg/ports/sord/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "sord",
-  "version-string": "0.16.4",
-  "port-version": 1,
+  "version": "0.16.4",
+  "port-version": 2,
   "description": "Sord is a lightweight C library for storing RDF statements in memory.",
   "homepage": "https://drobilla.net/software/sord",
   "license": "ISC",
diff --git a/external_imported/vcpkg/ports/soundtouch/portfile.cmake b/external_imported/vcpkg/ports/soundtouch/portfile.cmake
index 0e2ad0626..6290fad97 100644
--- a/external_imported/vcpkg/ports/soundtouch/portfile.cmake
+++ b/external_imported/vcpkg/ports/soundtouch/portfile.cmake
@@ -2,8 +2,8 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     GITHUB_HOST https://codeberg.org
     REPO soundtouch/soundtouch
-    REF 2.3.1
-    SHA512 c9d110b06cafb79968c94c4d206360b9ea9673d63eaf1470b097a39acf18b5b9cd53759f2656ff8963c6eee6a36fecdf1ea9aa7dc014fbf8bbee0dcfb8e4e438
+    REF ${VERSION}
+    SHA512 3d4d6314d6fccb3cb899aee36b90799bb9bf7cf1aad9ff2fff6b18c73e68be7e0e00a3f4e31d5dd340c979236f5474b7ef95d51ddb813f353dde920bdef4cb51
     HEAD_REF master
 )
 
@@ -31,5 +31,6 @@ if(SOUNDSTRETCH)
   vcpkg_copy_tools(TOOL_NAMES soundstretch AUTO_CLEAN)
 endif()
 
-file(INSTALL "${SOURCE_PATH}/COPYING.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING.TXT")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
diff --git a/external_imported/vcpkg/ports/soundtouch/vcpkg.json b/external_imported/vcpkg/ports/soundtouch/vcpkg.json
index 645d9b391..6b68d46f7 100644
--- a/external_imported/vcpkg/ports/soundtouch/vcpkg.json
+++ b/external_imported/vcpkg/ports/soundtouch/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "soundtouch",
-  "version": "2.3.1",
-  "port-version": 2,
+  "version": "2.3.2",
+  "port-version": 1,
   "description": "SoundTouch is an open-source audio processing library for changing the Tempo, Pitch and Playback Rates of audio streams or audio files.",
   "homepage": "https://www.surina.net/soundtouch",
   "supports": "!uwp",
diff --git a/external_imported/vcpkg/ports/soxr/portfile.cmake b/external_imported/vcpkg/ports/soxr/portfile.cmake
index a922020de..e29f253a5 100644
--- a/external_imported/vcpkg/ports/soxr/portfile.cmake
+++ b/external_imported/vcpkg/ports/soxr/portfile.cmake
@@ -24,6 +24,7 @@ vcpkg_cmake_configure(
         -DBUILD_TESTS=OFF
         -DBUILD_EXAMPLES=OFF
         -DBUILD_SHARED_RUNTIME=${BUILD_SHARED_RUNTIME}
+        -DCMAKE_DISABLE_FIND_PACKAGE_LibAVUtil=TRUE
         ${FEATURE_OPTIONS}
 )
 
@@ -35,5 +36,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/doc")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/doc")
-
-vcpkg_fixup_pkgconfig()
+
+vcpkg_fixup_pkgconfig()
diff --git a/external_imported/vcpkg/ports/soxr/vcpkg.json b/external_imported/vcpkg/ports/soxr/vcpkg.json
index 3a7edcd3a..a2b8a9192 100644
--- a/external_imported/vcpkg/ports/soxr/vcpkg.json
+++ b/external_imported/vcpkg/ports/soxr/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "soxr",
   "version": "0.1.3",
-  "port-version": 7,
+  "port-version": 8,
   "description": "High quality audio resampling",
   "homepage": "https://sourceforge.net/projects/soxr/",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/spaceland/include_functional.patch b/external_imported/vcpkg/ports/spaceland/include_functional.patch
new file mode 100644
index 000000000..66f69bfe3
--- /dev/null
+++ b/external_imported/vcpkg/ports/spaceland/include_functional.patch
@@ -0,0 +1,24 @@
+diff --git a/src/sl/connectivity.hpp b/src/sl/connectivity.hpp
+index 1942c6c..1b66b9d 100644
+--- a/src/sl/connectivity.hpp
++++ b/src/sl/connectivity.hpp
+@@ -26,6 +26,7 @@
+ #include <sl/operators.hpp>
+ #include <sl/hash.hpp>
+ #include <cassert>
++#include <functional>
+ 
+ namespace sl {
+ 
+diff --git a/src/sl/hash.hpp b/src/sl/hash.hpp
+index 3093a13..5f5b144 100644
+--- a/src/sl/hash.hpp
++++ b/src/sl/hash.hpp
+@@ -24,6 +24,7 @@
+ #define SL_HASH_HPP
+ 
+ #include <sl/utility.hpp>
++#include <functional>
+ 
+ namespace sl {
+ 
diff --git a/external_imported/vcpkg/ports/spaceland/portfile.cmake b/external_imported/vcpkg/ports/spaceland/portfile.cmake
index 3f22a8235..cad09f420 100644
--- a/external_imported/vcpkg/ports/spaceland/portfile.cmake
+++ b/external_imported/vcpkg/ports/spaceland/portfile.cmake
@@ -9,6 +9,7 @@ vcpkg_download_distfile(ARCHIVE
 vcpkg_extract_source_archive(
     SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
+    PATCHES include_functional.patch
 )
 
 vcpkg_cmake_configure(
@@ -25,4 +26,4 @@ vcpkg_cmake_configure(
 vcpkg_cmake_install()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/spaceland/vcpkg.json b/external_imported/vcpkg/ports/spaceland/vcpkg.json
index 8a729cac2..f03ae9487 100644
--- a/external_imported/vcpkg/ports/spaceland/vcpkg.json
+++ b/external_imported/vcpkg/ports/spaceland/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "spaceland",
-  "version-string": "7.8.2",
-  "port-version": 6,
+  "version": "7.8.2",
+  "port-version": 8,
   "description": "Spaceland Lib (sl) is a suite for geometric computation, specifically adapted to OpenGL.",
   "dependencies": [
     {
diff --git a/external_imported/vcpkg/ports/sparsepp/vcpkg.json b/external_imported/vcpkg/ports/sparsepp/vcpkg.json
index 50d619be5..1affc4608 100644
--- a/external_imported/vcpkg/ports/sparsepp/vcpkg.json
+++ b/external_imported/vcpkg/ports/sparsepp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "sparsepp",
-  "version-string": "1.22",
-  "port-version": 3,
+  "version": "1.22",
+  "port-version": 4,
   "description": "A fast, memory efficient hash map for C++",
   "dependencies": [
     {
diff --git a/external_imported/vcpkg/ports/spatialite-tools/portfile.cmake b/external_imported/vcpkg/ports/spatialite-tools/portfile.cmake
index ffe3bcb84..c7e113ff7 100644
--- a/external_imported/vcpkg/ports/spatialite-tools/portfile.cmake
+++ b/external_imported/vcpkg/ports/spatialite-tools/portfile.cmake
@@ -1,11 +1,11 @@
 # Allow empty include directory
 set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
 
-set(SPATIALITE_TOOLS_VERSION_STR "5.0.1")
+string(REPLACE "-" "" SPATIALITE_TOOLS_VERSION_STR "${VERSION}")
 vcpkg_download_distfile(ARCHIVE
     URLS "https://www.gaia-gis.it/gaia-sins/spatialite-tools-sources/spatialite-tools-${SPATIALITE_TOOLS_VERSION_STR}.tar.gz"
     FILENAME "spatialite-tools-${SPATIALITE_TOOLS_VERSION_STR}.tar.gz"
-    SHA512 dad52f6ed3c66ffd95f3a5c21225cd1b20641523af616f7e8defba8e4e46921da169e5f7bf9c53a355e132b6e74750d6db3fe02c870a3386f850df49c83bb8cd
+    SHA512 cf255c9e04e78e450e20019e3c988b2b0a770c6b7857a5b1c95d0696ee29902e7a85667c1a38dec9aa164fa6d28a444be6365b0444b78015180c1f27fa68ea89
 )
 
 vcpkg_extract_source_archive(SOURCE_PATH
diff --git a/external_imported/vcpkg/ports/spatialite-tools/vcpkg.json b/external_imported/vcpkg/ports/spatialite-tools/vcpkg.json
index 87c448171..fbde91f0f 100644
--- a/external_imported/vcpkg/ports/spatialite-tools/vcpkg.json
+++ b/external_imported/vcpkg/ports/spatialite-tools/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "spatialite-tools",
-  "version": "5.0.1",
-  "port-version": 2,
+  "version": "5.1.0-a",
   "description": "Contains spatialite.exe and other command line tools to work with SpatiaLite databases (import, export, SQL queries)",
   "homepage": "https://www.gaia-gis.it/fossil/spatialite-tools/index",
   "license": "GPL-3.0-or-later",
+  "supports": "!xbox",
   "dependencies": [
     "expat",
     "libiconv",
@@ -15,7 +15,12 @@
         "rttopo"
       ]
     },
-    "libxml2",
+    {
+      "name": "libxml2",
+      "features": [
+        "http"
+      ]
+    },
     "readosm",
     "sqlite3",
     {
diff --git a/external_imported/vcpkg/ports/spdlog/fmt-header.patch b/external_imported/vcpkg/ports/spdlog/fmt-header.patch
deleted file mode 100644
index 670d5a2f0..000000000
--- a/external_imported/vcpkg/ports/spdlog/fmt-header.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/bench/bench.cpp b/bench/bench.cpp
-index 8a46837a6..ae47f047c 100644
---- a/bench/bench.cpp
-+++ b/bench/bench.cpp
-@@ -15,7 +15,7 @@
- #if defined(SPDLOG_USE_STD_FORMAT)
- #    include <format>
- #elif defined(SPDLOG_FMT_EXTERNAL)
--#    include <fmt/locale.h>
-+#    include <fmt/format.h>
- #else
- #    include "spdlog/fmt/bundled/format.h"
- #endif
diff --git a/external_imported/vcpkg/ports/spdlog/portfile.cmake b/external_imported/vcpkg/ports/spdlog/portfile.cmake
index 8d5cd5952..b063d165f 100644
--- a/external_imported/vcpkg/ports/spdlog/portfile.cmake
+++ b/external_imported/vcpkg/ports/spdlog/portfile.cmake
@@ -1,11 +1,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO gabime/spdlog
-    REF v1.11.0
-    SHA512 210f3135c7af3ec774ef9a5c77254ce172a44e2fa720bf590e1c9214782bf5c8140ff683403a85b585868bc308286fbdeb1c988e4ed1eb3c75975254ffe75412
+    REF "v${VERSION}"
+    SHA512 44fcb414ad9fbbe2a6d72c29143eeeae477b687ed30ae870d661b032a029ad4214ef43e7ef6350d02791d05504492978ade2d6733fab12ce4884d8f0bc4c6340
     HEAD_REF v1.x
-    PATCHES
-        fmt-header.patch # https://github.com/gabime/spdlog/pull/2545
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -18,12 +16,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
 if(NOT DEFINED SPDLOG_WCHAR_FILENAMES)
     set(SPDLOG_WCHAR_FILENAMES OFF)
 endif()
-if(NOT VCPKG_TARGET_IS_WINDOWS)
-    if("wchar" IN_LIST FEATURES)
-        message(WARNING "Feature 'wchar' is only supported for Windows and has no effect on other platforms.")
-    elseif(SPDLOG_WCHAR_FILENAMES)
-        message(FATAL_ERROR "Build option 'SPDLOG_WCHAR_FILENAMES' is for Windows.")
-    endif()
+if(NOT VCPKG_TARGET_IS_WINDOWS AND SPDLOG_WCHAR_FILENAMES)
+    message(FATAL_ERROR "Build option 'SPDLOG_WCHAR_FILENAMES' is for Windows.")
 endif()
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SPDLOG_BUILD_SHARED)
@@ -44,15 +38,12 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/spdlog)
 vcpkg_fixup_pkgconfig()
 vcpkg_copy_pdbs()
 
-# use vcpkg-provided fmt library (see also option SPDLOG_FMT_EXTERNAL above)
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/spdlog/fmt/bundled")
-
 # add support for integration other than cmake
 vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/spdlog/tweakme.h
     "// #define SPDLOG_FMT_EXTERNAL"
     "#ifndef SPDLOG_FMT_EXTERNAL\n#define SPDLOG_FMT_EXTERNAL\n#endif"
 )
-if(SPDLOG_WCHAR_SUPPORT AND VCPKG_TARGET_IS_WINDOWS)
+if(SPDLOG_WCHAR_SUPPORT)
     vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/spdlog/tweakme.h
         "// #define SPDLOG_WCHAR_TO_UTF8_SUPPORT"
         "#ifndef SPDLOG_WCHAR_TO_UTF8_SUPPORT\n#define SPDLOG_WCHAR_TO_UTF8_SUPPORT\n#endif"
@@ -65,7 +56,11 @@ if(SPDLOG_WCHAR_FILENAMES)
     )
 endif()
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include"
-                    "${CURRENT_PACKAGES_DIR}/debug/share")
+file(REMOVE_RECURSE
+    "${CURRENT_PACKAGES_DIR}/include/spdlog/fmt/bundled"
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/debug/share"
+)
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/spdlog/usage b/external_imported/vcpkg/ports/spdlog/usage
new file mode 100644
index 000000000..d0ce65579
--- /dev/null
+++ b/external_imported/vcpkg/ports/spdlog/usage
@@ -0,0 +1,8 @@
+The package spdlog provides CMake targets:
+
+    find_package(spdlog CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE spdlog::spdlog)
+
+    # Or use the header-only version
+    find_package(spdlog CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE spdlog::spdlog_header_only)
diff --git a/external_imported/vcpkg/ports/spdlog/vcpkg.json b/external_imported/vcpkg/ports/spdlog/vcpkg.json
index a88014f9a..f1ebe3bec 100644
--- a/external_imported/vcpkg/ports/spdlog/vcpkg.json
+++ b/external_imported/vcpkg/ports/spdlog/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "spdlog",
-  "version-semver": "1.11.0",
+  "version-semver": "1.13.0",
   "description": "Very fast, header only, C++ logging library",
   "homepage": "https://github.com/gabime/spdlog",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/speexdsp/portfile.cmake b/external_imported/vcpkg/ports/speexdsp/portfile.cmake
index 554216848..7ddc82d6f 100644
--- a/external_imported/vcpkg/ports/speexdsp/portfile.cmake
+++ b/external_imported/vcpkg/ports/speexdsp/portfile.cmake
@@ -12,10 +12,10 @@ else()
         FILENAME "speexdsp-1.2.1.tar.gz"
         SHA512 41b5f37b48db5cb8c5a0f6437a4a8266d2627a5b7c1088de8549fe0bf0bb3105b7df8024fe207eef194096e0726ea73e2b53e0a4293d8db8e133baa0f8a3bad3
     )
-    vcpkg_extract_source_archive_ex(
-        OUT_SOURCE_PATH SOURCE_PATH
+    vcpkg_extract_source_archive(
+        SOURCE_PATH
         ARCHIVE "${ARCHIVE}"
-        REF "1.2.1"
+        SOURCE_BASE "1.2.1"
         PATCHES
             jitter_ctl.patch
     )
diff --git a/external_imported/vcpkg/ports/speexdsp/vcpkg.json b/external_imported/vcpkg/ports/speexdsp/vcpkg.json
index 19fac1b33..37ff5881c 100644
--- a/external_imported/vcpkg/ports/speexdsp/vcpkg.json
+++ b/external_imported/vcpkg/ports/speexdsp/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "speexdsp",
   "version": "1.2.1",
+  "port-version": 1,
   "description": "A patent-free, Open Source/Free Software DSP library.",
   "homepage": "https://speex.org/",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/spirit-po/vcpkg.json b/external_imported/vcpkg/ports/spirit-po/vcpkg.json
index e088d9ebc..abd11903a 100644
--- a/external_imported/vcpkg/ports/spirit-po/vcpkg.json
+++ b/external_imported/vcpkg/ports/spirit-po/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "spirit-po",
-  "version-string": "1.1.2",
-  "port-version": 2,
+  "version": "1.1.2",
+  "port-version": 3,
   "description": "A header-only C++ library for localization using GNU gettext po files, based on Boost.Spirit.",
   "homepage": "https://github.com/cbeck88/spirit-po",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/spirv-cross/portfile.cmake b/external_imported/vcpkg/ports/spirv-cross/portfile.cmake
index e177784fe..73b59b7d7 100644
--- a/external_imported/vcpkg/ports/spirv-cross/portfile.cmake
+++ b/external_imported/vcpkg/ports/spirv-cross/portfile.cmake
@@ -3,13 +3,13 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KhronosGroup/SPIRV-Cross
-    REF 2021-01-15
-    SHA512 f934ef61602223f6fe6d9c826ed5beb129beb7a30b18b389625d4fc0b1efa1b8df930a2a2d2a0b4f377ef2899e8e034239819a4c6629a78c666f72004464da93
+    REF vulkan-sdk-${VERSION}
+    SHA512 970b4903af87aa4b8258b29d9c998931c1a7cd59ef7ddd13ffa75bcbb5fb7ca2040544aa87b7b13364920706313743574a9761ba10d2d596ffdad41576cac2c1
     HEAD_REF master
 )
 
 if(VCPKG_TARGET_IS_IOS)
-    message(STATUS "Using iOS trplet. Executables won't be created...")
+    message(STATUS "Using iOS triplet. Executables won't be created...")
     set(BUILD_CLI OFF)
 else()
     set(BUILD_CLI ON)
@@ -25,6 +25,7 @@ vcpkg_cmake_configure(
 )
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
+vcpkg_fixup_pkgconfig()
 
 foreach(COMPONENT core c cpp glsl hlsl msl reflect util)
     vcpkg_cmake_config_fixup(CONFIG_PATH share/spirv_cross_${COMPONENT}/cmake PACKAGE_NAME spirv_cross_${COMPONENT})
@@ -39,4 +40,4 @@ file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/debug/share"
 )
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/spirv-cross/vcpkg.json b/external_imported/vcpkg/ports/spirv-cross/vcpkg.json
index dc05fe058..bcf276dc5 100644
--- a/external_imported/vcpkg/ports/spirv-cross/vcpkg.json
+++ b/external_imported/vcpkg/ports/spirv-cross/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "spirv-cross",
-  "version-date": "2021-01-15",
-  "port-version": 2,
+  "version": "1.3.275.0",
   "description": "SPIRV-Cross is a practical tool and library for performing reflection on SPIR-V and disassembling SPIR-V back to high level languages.",
   "homepage": "https://github.com/KhronosGroup/SPIRV-Cross",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/spirv-headers/portfile.cmake b/external_imported/vcpkg/ports/spirv-headers/portfile.cmake
index 0e46e1b45..7c00de0cb 100644
--- a/external_imported/vcpkg/ports/spirv-headers/portfile.cmake
+++ b/external_imported/vcpkg/ports/spirv-headers/portfile.cmake
@@ -2,8 +2,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KhronosGroup/SPIRV-Headers
-    REF sdk-1.3.231.1
-    SHA512 d2c47127fd81430383e8656917f76933b713ca6cb93b2a9c16c9e0b125e2f62f8c497cab3a4fcc2a711decd911ec5d15f1eb0270add05442aff6672e08c890d7
+    REF "vulkan-sdk-${VERSION}"
+    SHA512 c9d448a74006a5fdf59993e6d6a9c617bab4c5df23c333b7ada386e4ca25caaae28fc83f71963ce8468646113d83d6e7b17c26c46c3b6485c8df91f142755977
     HEAD_REF master
 )
 
@@ -17,5 +17,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
 
 vcpkg_fixup_pkgconfig()
 
-# Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/spirv-headers/vcpkg.json b/external_imported/vcpkg/ports/spirv-headers/vcpkg.json
index e42ce93da..194b20196 100644
--- a/external_imported/vcpkg/ports/spirv-headers/vcpkg.json
+++ b/external_imported/vcpkg/ports/spirv-headers/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "spirv-headers",
-  "version": "1.3.231.1",
-  "port-version": 1,
+  "version": "1.3.275.0",
   "description": "Machine-readable files for the SPIR-V Registry",
   "homepage": "https://github.com/KhronosGroup/SPIRV-Headers",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/spirv-reflect/CMakeLists.txt b/external_imported/vcpkg/ports/spirv-reflect/CMakeLists.txt
deleted file mode 100644
index a76d06577..000000000
--- a/external_imported/vcpkg/ports/spirv-reflect/CMakeLists.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-cmake_minimum_required(VERSION 3.1)
-project(spirv-reflect)
-
-set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-
-find_package(SPIRV-Headers REQUIRED)
-
-add_library(spirv-reflect ${CMAKE_CURRENT_SOURCE_DIR}/spirv_reflect.h
-                          ${CMAKE_CURRENT_SOURCE_DIR}/spirv_reflect.c)
-if (SPIRV_REFLECT_ENABLE_ASSERTS)
-    target_compile_definitions(spirv-reflect PRIVATE SPIRV_REFLECT_ENABLE_ASSERTS)
-endif()
-set_target_properties(spirv-reflect PROPERTIES CXX_STANDARD 11)
-if(WIN32)
-    target_compile_definitions(spirv-reflect PRIVATE _CRT_SECURE_NO_WARNINGS)
-endif()
-target_link_libraries(spirv-reflect PUBLIC SPIRV-Headers::SPIRV-Headers)
-target_compile_definitions(spirv-reflect PUBLIC SPIRV_REFLECT_USE_SYSTEM_SPIRV_H)
-
-target_include_directories(spirv-reflect INTERFACE $<INSTALL_INTERFACE:include>)
-
-set(config_file ${CMAKE_CURRENT_BINARY_DIR}/unofficial-spirv-reflect-config.cmake)
-set(targets unofficial-spirv-reflect-targets)
-
-file(WRITE ${config_file}
-"include(CMakeFindDependencyMacro)
-find_dependency(SPIRV-Headers)
-include(\${CMAKE_CURRENT_LIST_DIR}/${targets}.cmake)")
-
-install(FILES ${config_file} DESTINATION share/unofficial-spirv-reflect)
-
-install(
-    TARGETS spirv-reflect EXPORT ${targets}
-    RUNTIME DESTINATION bin
-    ARCHIVE DESTINATION lib
-    LIBRARY DESTINATION lib
-)
-
-install(
-    EXPORT ${targets}
-    NAMESPACE unofficial::spirv-reflect::
-    DESTINATION share/unofficial-spirv-reflect
-)
-
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/spirv_reflect.h" DESTINATION include)
diff --git a/external_imported/vcpkg/ports/spirv-reflect/portfile.cmake b/external_imported/vcpkg/ports/spirv-reflect/portfile.cmake
index ee877ecab..d699e2255 100644
--- a/external_imported/vcpkg/ports/spirv-reflect/portfile.cmake
+++ b/external_imported/vcpkg/ports/spirv-reflect/portfile.cmake
@@ -3,15 +3,14 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KhronosGroup/SPIRV-Reflect
-    REF sdk-1.3.236.0
-    SHA512 8ee0b88e46feac0ece478c6584e0ceb96b2ac976c2d1dc5813e0e26b20de8fa0264499cc9eea973bb3dd9a6877a421d00557f0fef7e323926df1db314373ea90
+    REF "vulkan-sdk-${VERSION}"
+    SHA512 9bfcc88d541a4e96b22408b9c37be223ffe7010eb54c3f3c9091872311b34e52000ce31d165d3914bfabf7f9c1d5f0fa85fac9038271296a4fceb6d1a6b99030
     HEAD_REF master
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS -DSPIRV_REFLECT_STATIC_LIB=ON
 )
 
 vcpkg_cmake_install()
@@ -19,4 +18,8 @@ vcpkg_cmake_install()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/spirv-reflect" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+
+set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
+
+vcpkg_copy_tools(TOOL_NAMES spirv-reflect-pp spirv-reflect AUTO_CLEAN)
diff --git a/external_imported/vcpkg/ports/spirv-reflect/vcpkg.json b/external_imported/vcpkg/ports/spirv-reflect/vcpkg.json
index 2a118298f..1488e283d 100644
--- a/external_imported/vcpkg/ports/spirv-reflect/vcpkg.json
+++ b/external_imported/vcpkg/ports/spirv-reflect/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "spirv-reflect",
-  "version": "1.3.236.0",
+  "version": "1.3.275.0",
   "description": "SPIRV-Reflect is a lightweight library that provides a C/C++ reflection API for SPIR-V shader bytecode in Vulkan applications.",
   "homepage": "https://github.com/KhronosGroup/SPIRV-Reflect",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/spirv-tools/cmake-config-dir.diff b/external_imported/vcpkg/ports/spirv-tools/cmake-config-dir.diff
new file mode 100644
index 000000000..65a9e399b
--- /dev/null
+++ b/external_imported/vcpkg/ports/spirv-tools/cmake-config-dir.diff
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 75830b44..367fe889 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -270,7 +270,7 @@ else()
+ endif()
+ 
+ if(ENABLE_SPIRV_TOOLS_INSTALL)
+-  if(WIN32 AND NOT MINGW)
++  if(0)
+     macro(spvtools_config_package_dir TARGET PATH)
+       set(${PATH} ${TARGET}/cmake)
+     endmacro()
diff --git a/external_imported/vcpkg/ports/spirv-tools/fix-tool-deps.diff b/external_imported/vcpkg/ports/spirv-tools/fix-tool-deps.diff
new file mode 100644
index 000000000..e842277a4
--- /dev/null
+++ b/external_imported/vcpkg/ports/spirv-tools/fix-tool-deps.diff
@@ -0,0 +1,18 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 75830b44..9c9e7ba8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -281,8 +281,13 @@ if(ENABLE_SPIRV_TOOLS_INSTALL)
+   endif()
+ 
+   macro(spvtools_generate_config_file TARGET)
++    set(sgcf_find_extra "")
++    if(NOT "${TARGET}" STREQUAL "SPIRV-Tools-opt")
++      set(sgcf_find_extra "find_dependency(SPIRV-Tools-opt)\n")
++    endif()
+     file(WRITE ${CMAKE_BINARY_DIR}/${TARGET}Config.cmake
+       "include(CMakeFindDependencyMacro)\n"
++      ${sgcf_find_extra}
+       "find_dependency(${SPIRV_TOOLS})\n"
+       "include(\${CMAKE_CURRENT_LIST_DIR}/${TARGET}Targets.cmake)\n"
+       "set(${TARGET}_LIBRARIES ${TARGET})\n"
diff --git a/external_imported/vcpkg/ports/spirv-tools/portfile.cmake b/external_imported/vcpkg/ports/spirv-tools/portfile.cmake
index 717a75a3c..ddd043667 100644
--- a/external_imported/vcpkg/ports/spirv-tools/portfile.cmake
+++ b/external_imported/vcpkg/ports/spirv-tools/portfile.cmake
@@ -1,88 +1,59 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KhronosGroup/SPIRV-Tools
-    REF v2022.4
-    SHA512 d93e97e168c50f545cc42418603ffc5fa6299bb3cc30d927444e4de0d955abc5dd481c9662a59cd49fc379da6bcc6df6fb747947e3dc144cee9b489aff7c4785
+    REF "vulkan-sdk-${VERSION}"
+    SHA512 f17692509ecfbd753a853eaa01d559c06b06fa15b287971da814044418da71a94813606acfe536fa519e8aeba92bdfc80971acb749dab6e7cc395773c4f05693
+    PATCHES
+        cmake-config-dir.diff
+        spirv-tools-shared.diff
+        fix-tool-deps.diff
 )
 
 vcpkg_find_acquire_program(PYTHON3)
 get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
 vcpkg_add_to_path("${PYTHON3_DIR}")
 
-if(VCPKG_TARGET_IS_IOS)
-    message(STATUS "Using iOS trplet. Executables won't be created...")
-    set(TOOLS_INSTALL OFF)
-    set(SKIP_EXECUTABLES ON) 
-else()
-    set(TOOLS_INSTALL ON)
-    set(SKIP_EXECUTABLES OFF)
-endif()
+vcpkg_check_features(
+    OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    INVERTED_FEATURES
+        tools   SPIRV_SKIP_EXECUTABLES
+)
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-        -DSPIRV-Headers_SOURCE_DIR=${CURRENT_INSTALLED_DIR}
-        -DSPIRV_WERROR=OFF
+        ${FEATURE_OPTIONS}
+        "-DSPIRV-Headers_SOURCE_DIR=${CURRENT_INSTALLED_DIR}"
         -DSPIRV_SKIP_TESTS=ON
-        -DSPIRV_SKIP_EXECUTABLES=${SKIP_EXECUTABLES}
-        -DENABLE_SPIRV_TOOLS_INSTALL=${TOOLS_INSTALL}
         -DSPIRV_TOOLS_BUILD_STATIC=ON
-        -DENABLE_SPIRV_TOOLS_INSTALL=ON
+        -DSPIRV_WERROR=OFF
+    OPTIONS_DEBUG
+        -DSPIRV_SKIP_EXECUTABLES=ON
 )
 
 vcpkg_cmake_install()
- # the directory name is capitalized as opposed to the port name
-if(WIN32)
-    vcpkg_cmake_config_fixup(CONFIG_PATH SPIRV-Tools/cmake PACKAGE_NAME SPIRV-Tools)
-    vcpkg_cmake_config_fixup(CONFIG_PATH SPIRV-Tools-link/cmake PACKAGE_NAME SPIRV-Tools-link)
-    vcpkg_cmake_config_fixup(CONFIG_PATH SPIRV-Tools-lint/cmake PACKAGE_NAME SPIRV-Tools-lint)
-    vcpkg_cmake_config_fixup(CONFIG_PATH SPIRV-Tools-opt/cmake PACKAGE_NAME SPIRV-Tools-opt)
-    vcpkg_cmake_config_fixup(CONFIG_PATH SPIRV-Tools-reduce/cmake PACKAGE_NAME SPIRV-Tools-reduce)
-else()
-    vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SPIRV-Tools PACKAGE_NAME SPIRV-Tools DO_NOT_DELETE_PARENT_CONFIG_PATH)
-    vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SPIRV-Tools-link PACKAGE_NAME SPIRV-Tools-link DO_NOT_DELETE_PARENT_CONFIG_PATH)
-    vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SPIRV-Tools-lint PACKAGE_NAME SPIRV-Tools-lint DO_NOT_DELETE_PARENT_CONFIG_PATH)
-    vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SPIRV-Tools-opt PACKAGE_NAME SPIRV-Tools-opt DO_NOT_DELETE_PARENT_CONFIG_PATH)
-    vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SPIRV-Tools-reduce PACKAGE_NAME SPIRV-Tools-reduce) # now delete
-endif()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SPIRV-Tools PACKAGE_NAME spirv-tools DO_NOT_DELETE_PARENT_CONFIG_PATH)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SPIRV-Tools-link PACKAGE_NAME spirv-tools-link DO_NOT_DELETE_PARENT_CONFIG_PATH)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SPIRV-Tools-lint PACKAGE_NAME spirv-tools-lint DO_NOT_DELETE_PARENT_CONFIG_PATH)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SPIRV-Tools-opt PACKAGE_NAME spirv-tools-opt DO_NOT_DELETE_PARENT_CONFIG_PATH)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SPIRV-Tools-reduce PACKAGE_NAME spirv-tools-reduce) # now delete
 vcpkg_fixup_pkgconfig()
 
-if(TOOLS_INSTALL)
-    vcpkg_copy_tools(
-        TOOL_NAMES 
-            spirv-as 
-            spirv-cfg 
-            spirv-dis 
-            spirv-link 
-            spirv-lint 
-            spirv-opt 
-            spirv-reduce 
-            spirv-val 
-        AUTO_CLEAN
-    )
+if("tools" IN_LIST FEATURES)
+    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/bin/spirv-lesspipe.sh" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/spirv-lesspipe.sh")
+    file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/spirv-lesspipe.sh")
+    set(tools spirv-as spirv-cfg spirv-dis spirv-link spirv-lint spirv-opt spirv-val)
+    if(NOT VCPKG_TARGET_IS_IOS)
+        list(APPEND tools spirv-reduce)
+    endif()
+    vcpkg_copy_tools(TOOL_NAMES ${tools} AUTO_CLEAN)
 endif()
 
-if(WIN32)
-    file(REMOVE_RECURSE 
-        "${CURRENT_PACKAGES_DIR}/debug/SPIRV-Tools" 
-        "${CURRENT_PACKAGES_DIR}/debug/SPIRV-Tools-link"
-        "${CURRENT_PACKAGES_DIR}/debug/SPIRV-Tools-lint"  
-        "${CURRENT_PACKAGES_DIR}/debug/SPIRV-Tools-opt"
-        "${CURRENT_PACKAGES_DIR}/debug/SPIRV-Tools-reduce" 
-        "${CURRENT_PACKAGES_DIR}/SPIRV-Tools" 
-        "${CURRENT_PACKAGES_DIR}/SPIRV-Tools-link" 
-        "${CURRENT_PACKAGES_DIR}/SPIRV-Tools-lint" 
-        "${CURRENT_PACKAGES_DIR}/SPIRV-Tools-opt" 
-        "${CURRENT_PACKAGES_DIR}/SPIRV-Tools-reduce"
-    )
-endif()
 file(REMOVE_RECURSE 
     "${CURRENT_PACKAGES_DIR}/debug/include"
     "${CURRENT_PACKAGES_DIR}/debug/share"
 )
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    # lesspipe.sh is the only file there
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
-endif()
 
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/external_imported/vcpkg/ports/spirv-tools/spirv-tools-shared.diff b/external_imported/vcpkg/ports/spirv-tools/spirv-tools-shared.diff
new file mode 100644
index 000000000..e2bf13cae
--- /dev/null
+++ b/external_imported/vcpkg/ports/spirv-tools/spirv-tools-shared.diff
@@ -0,0 +1,35 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 75830b44..39cc039e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -390,10 +390,14 @@ add_custom_target(spirv-tools-shared-pkg-config ALL
+ 
+ # Install pkg-config file
+ if (ENABLE_SPIRV_TOOLS_INSTALL)
++  set(shared_pc "")
++  if(BUILD_SHARED_LIBS)
++    set(shared_pc "${CMAKE_CURRENT_BINARY_DIR}/SPIRV-Tools-shared.pc")
++  endif()
+   install(
+     FILES
+       ${CMAKE_CURRENT_BINARY_DIR}/SPIRV-Tools.pc
+-      ${CMAKE_CURRENT_BINARY_DIR}/SPIRV-Tools-shared.pc
++      ${shared_pc}
+     DESTINATION
+       ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ endif()
+diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
+index acfa0c12..b3286db3 100644
+--- a/source/CMakeLists.txt
++++ b/source/CMakeLists.txt
+@@ -425,6 +425,10 @@ if (ANDROID)
+ endif()
+ 
+ if(ENABLE_SPIRV_TOOLS_INSTALL)
++  if(NOT BUILD_SHARED_LIBS)
++    set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES EXCLUDE_FROM_ALL 1)
++    list(REMOVE_ITEM SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS}-shared)
++  endif()
+   install(TARGETS ${SPIRV_TOOLS_TARGETS} EXPORT ${SPIRV_TOOLS}Targets)
+   export(EXPORT ${SPIRV_TOOLS}Targets FILE ${SPIRV_TOOLS}Target.cmake)
+ 
diff --git a/external_imported/vcpkg/ports/spirv-tools/usage b/external_imported/vcpkg/ports/spirv-tools/usage
new file mode 100644
index 000000000..1890e6de9
--- /dev/null
+++ b/external_imported/vcpkg/ports/spirv-tools/usage
@@ -0,0 +1,22 @@
+spirv-tools provides CMake targets:
+
+    find_package(SPIRV-Tools CONFIG REQUIRED)
+    # The static libary is always available.
+    # It offers full public symbol visibility.
+    target_link_libraries(main PRIVATE SPIRV-Tools-static)
+    # In triplets with dynamic library linkage, there is also a shared libary.
+    target_link_libraries(main PRIVATE SPIRV-Tools-shared)
+
+    # The following libraries are static and depend on SPIRV-Tools-static.
+
+    find_package(SPIRV-Tools-link CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE SPIRV-Tools-link)
+
+    find_package(SPIRV-Tools-lint CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE SPIRV-Tools-lint)
+
+    find_package(SPIRV-Tools-opt CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE SPIRV-Tools-opt)
+
+    find_package(SPIRV-Tools-reduce CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE SPIRV-Tools-reduce)
diff --git a/external_imported/vcpkg/ports/spirv-tools/vcpkg.json b/external_imported/vcpkg/ports/spirv-tools/vcpkg.json
index dc13d9812..1651a4673 100644
--- a/external_imported/vcpkg/ports/spirv-tools/vcpkg.json
+++ b/external_imported/vcpkg/ports/spirv-tools/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "spirv-tools",
-  "version": "2022.4",
+  "version": "1.3.275.0",
   "description": "API and commands for processing SPIR-V modules",
   "homepage": "https://github.com/KhronosGroup/SPIRV-Tools",
   "license": "Apache-2.0",
@@ -14,5 +14,10 @@
       "name": "vcpkg-cmake-config",
       "host": true
     }
-  ]
+  ],
+  "features": {
+    "tools": {
+      "description": "Build tools."
+    }
+  }
 }
diff --git a/external_imported/vcpkg/ports/spix/portfile.cmake b/external_imported/vcpkg/ports/spix/portfile.cmake
deleted file mode 100644
index 3a14dd085..000000000
--- a/external_imported/vcpkg/ports/spix/portfile.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO faaxm/spix
-    REF v0.4
-    SHA512 4686199f851b4f06abf963ea79d3d2094d7bd956f009b3fe244dfbcfa7e0756d9971cb882c9963d479b44194806f3d0eaef68ac90b3468bf4ba9139948a9cd7b
-
-    HEAD_REF master
-)
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS
-        -DSPIX_BUILD_EXAMPLES=OFF
-        -DSPIX_BUILD_TESTS=OFF
-        -DSPIX_QT_MAJOR=5
-)
-
-vcpkg_cmake_install()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-
-vcpkg_copy_pdbs()
diff --git a/external_imported/vcpkg/ports/spix/vcpkg.json b/external_imported/vcpkg/ports/spix/vcpkg.json
deleted file mode 100644
index 7184dfe74..000000000
--- a/external_imported/vcpkg/ports/spix/vcpkg.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "name": "spix",
-  "version": "0.4",
-  "description": "A minimally invasive UI testing library that enables your Qt/QML app's UI to be controlled either via c++ code, or through an http RPC interface.",
-  "homepage": "https://github.com/faaxm/spix",
-  "dependencies": [
-    "anyrpc",
-    {
-      "name": "qt5-base",
-      "default-features": false
-    },
-    "qt5-declarative",
-    {
-      "name": "vcpkg-cmake",
-      "host": true
-    }
-  ]
-}
diff --git a/external_imported/vcpkg/ports/spout2/fix-dx-keyed.patch b/external_imported/vcpkg/ports/spout2/fix-dx-keyed.patch
new file mode 100644
index 000000000..08049a967
--- /dev/null
+++ b/external_imported/vcpkg/ports/spout2/fix-dx-keyed.patch
@@ -0,0 +1,18 @@
+Subject: [PATCH] fix dx keyed
+---
+Index: SPOUTSDK/SpoutDirectX/SpoutDX/SpoutDX.cpp
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/SPOUTSDK/SpoutDirectX/SpoutDX/SpoutDX.cpp b/SPOUTSDK/SpoutDirectX/SpoutDX/SpoutDX.cpp
+--- a/SPOUTSDK/SpoutDirectX/SpoutDX/SpoutDX.cpp	(revision e16402c39ed2389692876d7bbd1c7d4a771a5b86)
++++ b/SPOUTSDK/SpoutDirectX/SpoutDX/SpoutDX.cpp	(revision f3ba250699b87c8004a3430d6b00f3f537af0c0d)
+@@ -193,6 +193,7 @@
+ 	m_bSwapRB = false;
+ 	m_bAdapt = false; // Receiver switch to the sender's graphics adapter
+ 	m_bMemoryShare = GetMemoryShareMode(); // 2.006 memoryshare mode
++    m_bKeyed = false;
+ 
+ 	ZeroMemory(&m_SenderInfo, sizeof(SharedTextureInfo));
+ 	ZeroMemory(&m_ShExecInfo, sizeof(m_ShExecInfo));
diff --git a/external_imported/vcpkg/ports/spout2/fix-include-path.patch b/external_imported/vcpkg/ports/spout2/fix-include-path.patch
new file mode 100644
index 000000000..498eab321
--- /dev/null
+++ b/external_imported/vcpkg/ports/spout2/fix-include-path.patch
@@ -0,0 +1,48 @@
+Subject: [PATCH] fixup for vcpkg
+---
+Index: SPOUTSDK/SpoutDirectX/SpoutDX/CMakeLists.txt
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/SPOUTSDK/SpoutDirectX/SpoutDX/CMakeLists.txt b/SPOUTSDK/SpoutDirectX/SpoutDX/CMakeLists.txt
+--- a/SPOUTSDK/SpoutDirectX/SpoutDX/CMakeLists.txt	(revision 62362774c96547d63b502d7efd5cfbf138eb7570)
++++ b/SPOUTSDK/SpoutDirectX/SpoutDX/CMakeLists.txt	(revision e16402c39ed2389692876d7bbd1c7d4a771a5b86)
+@@ -67,6 +67,10 @@
+     SPOUT_BUILD_DLL
+     SPOUTLIBRARY_EXPORTS
+ )
++
++
++target_include_directories(SpoutDX_static PRIVATE ../../)
++target_include_directories(SpoutDX PRIVATE ../../)
+ #/-------------------------------------- . -----------------------------------\#
+ 
+ 
+Index: SPOUTSDK/SpoutDirectX/SpoutDX/SpoutDX.h
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/SPOUTSDK/SpoutDirectX/SpoutDX/SpoutDX.h b/SPOUTSDK/SpoutDirectX/SpoutDX/SpoutDX.h
+--- a/SPOUTSDK/SpoutDirectX/SpoutDX/SpoutDX.h	(revision 62362774c96547d63b502d7efd5cfbf138eb7570)
++++ b/SPOUTSDK/SpoutDirectX/SpoutDX/SpoutDX.h	(revision e16402c39ed2389692876d7bbd1c7d4a771a5b86)
+@@ -33,12 +33,12 @@
+ #define __spoutDX__
+ 
+ // Change the path as required
+-#include "..\..\SpoutGL\SpoutCommon.h" // for dll build
+-#include "..\..\SpoutGL\SpoutSenderNames.h" // for sender creation and update
+-#include "..\..\SpoutGL\SpoutDirectX.h" // for creating DX11 textures
+-#include "..\..\SpoutGL\SpoutFrameCount.h" // for mutex lock and new frame signal
+-#include "..\..\SpoutGL\SpoutCopy.h" // for pixel copy
+-#include "..\..\SpoutGL\SpoutUtils.h" // Registry utiities
++#include "SpoutGL\SpoutCommon.h" // for dll build
++#include "SpoutGL\SpoutSenderNames.h" // for sender creation and update
++#include "SpoutGL\SpoutDirectX.h" // for creating DX11 textures
++#include "SpoutGL\SpoutFrameCount.h" // for mutex lock and new frame signal
++#include "SpoutGL\SpoutCopy.h" // for pixel copy
++#include "SpoutGL\SpoutUtils.h" // Registry utiities
+ 
+ #include <direct.h> // for _getcwd
+ #include <TlHelp32.h> // for PROCESSENTRY32
diff --git a/external_imported/vcpkg/ports/spout2/portfile.cmake b/external_imported/vcpkg/ports/spout2/portfile.cmake
index 69e31ae85..e9b0ad830 100644
--- a/external_imported/vcpkg/ports/spout2/portfile.cmake
+++ b/external_imported/vcpkg/ports/spout2/portfile.cmake
@@ -3,9 +3,12 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO leadedge/Spout2
-    REF 9db0efadba16e1d884164d348f556922cfc80c50 #v2.007.009
-    SHA512 d45613590fb53155c90839cf6eb7fe646ef4ec463b6cd1624aff54870818f0bc4faccded78a6b2c089fa4e8756cf15c7e17def2ef32ac6c34144e562b58c5d8b
+    REF 62362774c96547d63b502d7efd5cfbf138eb7570 #v2.007.010
+    SHA512 89d0dcec719c068e27c2f55605e4b45b32fe3a5e097c821b0aa45f4ee9284e63830bd741ac7bb1bff917190d9a51daa36b452580fc673c05767b7bfcbc9a494f
     HEAD_REF master
+    PATCHES
+        fix-include-path.patch
+        fix-dx-keyed.patch
 )
 
 if(VCPKG_CRT_LINKAGE STREQUAL "static")
diff --git a/external_imported/vcpkg/ports/spout2/usage b/external_imported/vcpkg/ports/spout2/usage
index 5562cfaa7..4f727e01b 100644
--- a/external_imported/vcpkg/ports/spout2/usage
+++ b/external_imported/vcpkg/ports/spout2/usage
@@ -1,11 +1,8 @@
 spout2 provides CMake targets:
 
-    # Dynamic Linkage
+    # SpoutGL
     find_package(Spout2 CONFIG REQUIRED)
     target_link_libraries(main PRIVATE Spout2::Spout)
-
-    # Static Linkage
-    find_package(Spout2 CONFIG REQUIRED)
     target_link_libraries(main PRIVATE Spout2::Spout_static)
 
     # SpoutLibrary
@@ -13,8 +10,4 @@ spout2 provides CMake targets:
 
     # SpoutDX
     target_link_libraries(main PRIVATE Spout2::SpoutDX)
-
-    Note: SpoutDX (`dx` feature) is not essential to use DirectX in Spout... It is a sub-set of the
-          Spout SDK for applications using DirectX rather than OpenGL. It doesn't mean enabling
-          DirectX ability for Spout. See https://github.com/leadedge/Spout2/tree/master/SPOUTSDK
-          It is more likely: 'Use only DirectX to implement Spout, and remove all codes that need OpenGL'.
+    target_link_libraries(main PRIVATE Spout2::SpoutDX_static)
diff --git a/external_imported/vcpkg/ports/spout2/vcpkg.json b/external_imported/vcpkg/ports/spout2/vcpkg.json
index 3986cc75b..f43102f01 100644
--- a/external_imported/vcpkg/ports/spout2/vcpkg.json
+++ b/external_imported/vcpkg/ports/spout2/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "spout2",
-  "version-string": "2.007.009",
+  "version-string": "2.007.010",
   "description": "Spout is a video frame sharing system for Microsoft Windows, which allows applications to share OpenGL textures in a similar way to Syphon for the Mac.",
   "homepage": "https://github.com/leadedge/Spout2",
   "supports": "windows & !uwp & !arm64",
diff --git a/external_imported/vcpkg/ports/sprout/vcpkg.json b/external_imported/vcpkg/ports/sprout/vcpkg.json
index 22bab62af..ea8a92c10 100644
--- a/external_imported/vcpkg/ports/sprout/vcpkg.json
+++ b/external_imported/vcpkg/ports/sprout/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "sprout",
-  "version-string": "2019-06-20",
-  "port-version": 1,
+  "version-date": "2019-06-20",
+  "port-version": 2,
   "description": "C++11/14 constexpr based Containers, Algorithms, Random numbers, Parsing, Ray tracing, Synthesizer, and others",
   "homepage": "https://github.com/bolero-MURAKAMI/Sprout",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/spscqueue/vcpkg.json b/external_imported/vcpkg/ports/spscqueue/vcpkg.json
index 682705aad..162a8f81c 100644
--- a/external_imported/vcpkg/ports/spscqueue/vcpkg.json
+++ b/external_imported/vcpkg/ports/spscqueue/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "spscqueue",
-  "version-string": "1.1",
-  "port-version": 2,
+  "version": "1.1",
+  "port-version": 3,
   "description": "A bounded single-producer single-consumer wait-free and lock-free queue written in C++11",
   "homepage": "https://github.com/rigtorp/SPSCQueue",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/sqlcipher/CMakeLists.txt b/external_imported/vcpkg/ports/sqlcipher/CMakeLists.txt
index 35eeb68aa..d1972c31f 100644
--- a/external_imported/vcpkg/ports/sqlcipher/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/sqlcipher/CMakeLists.txt
@@ -37,6 +37,11 @@ if(WITH_JSON1)
     add_compile_definitions(SQLITE_ENABLE_JSON1)
 endif()
 
+
+if(WITH_FTS5)
+    add_compile_definitions(SQLITE_ENABLE_FTS5)
+endif()
+
 target_include_directories(sqlcipher INTERFACE $<INSTALL_INTERFACE:include>)
 if(NOT WIN32)
     find_package(Threads REQUIRED)
@@ -62,6 +67,14 @@ if(NOT SQLITE3_SKIP_TOOLS)
     )
 endif()
 
+SET(prefix "${CMAKE_INSTALL_PREFIX}")
+SET(exec_prefix "\${prefix}")
+SET(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
+SET(includedir "\${prefix}/include")
+SET(PACKAGE_VERSION "4.5.3")
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/sqlcipher.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/sqlcipher.pc" @ONLY)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/sqlcipher.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+
 install(
     TARGETS sqlcipher
     EXPORT sqlcipher-targets
diff --git a/external_imported/vcpkg/ports/sqlcipher/portfile.cmake b/external_imported/vcpkg/ports/sqlcipher/portfile.cmake
index b7564ab93..d12800dce 100644
--- a/external_imported/vcpkg/ports/sqlcipher/portfile.cmake
+++ b/external_imported/vcpkg/ports/sqlcipher/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO sqlcipher/sqlcipher
-    REF v4.5.2
-    SHA512 1de5b219392bb976631857e32b4523258fd660fedb558d478e536b7e10c711c72c7e7c9062e45bd8a5ceaecbc1fee717935d2357f6811c3ddf76702167f4601b
+    REF "v${VERSION}"
+    SHA512 deb592d6f27e7cc02bd641bb8f6e07b242f0dc6c7d8732e7a1e70e457eadd487add7d95c881fe9afbff516f4641a6e603473e47c63afa8396a0ddf007a5818fd
     HEAD_REF master
 )
 
@@ -49,10 +49,11 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION "${SOURCE_PATH}")
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
-    geopoly WITH_GEOPOLY
-    json1 WITH_JSON1
+        geopoly WITH_GEOPOLY
+        json1 WITH_JSON1
+        fts5 WITH_FTS5
     INVERTED_FEATURES
-    tool SQLITE3_SKIP_TOOLS
+        tool SQLITE3_SKIP_TOOLS
 )
 
 vcpkg_cmake_configure(
@@ -81,3 +82,4 @@ file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share
 
 vcpkg_copy_pdbs()
 vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}")
+vcpkg_fixup_pkgconfig()
diff --git a/external_imported/vcpkg/ports/sqlcipher/vcpkg.json b/external_imported/vcpkg/ports/sqlcipher/vcpkg.json
index 4641301c7..c1ce2b945 100644
--- a/external_imported/vcpkg/ports/sqlcipher/vcpkg.json
+++ b/external_imported/vcpkg/ports/sqlcipher/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "sqlcipher",
-  "version": "4.5.2",
+  "version": "4.5.4",
   "description": "SQLCipher extends the SQLite database library to add security enhancements that make it more suitable for encrypted local data storage.",
   "homepage": "https://www.zetetic.net/sqlcipher",
   "license": null,
@@ -18,6 +18,9 @@
     }
   ],
   "features": {
+    "fts5": {
+      "description": "enable FTS5 functionality for sqlite3"
+    },
     "geopoly": {
       "description": "enable geopoly functionality for sqlite3"
     },
diff --git a/external_imported/vcpkg/ports/sqlite-modern-cpp/vcpkg.json b/external_imported/vcpkg/ports/sqlite-modern-cpp/vcpkg.json
index 39dbdc1d1..af618db59 100644
--- a/external_imported/vcpkg/ports/sqlite-modern-cpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/sqlite-modern-cpp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "sqlite-modern-cpp",
-  "version-string": "3.2-936cd0c8",
-  "port-version": 1,
+  "version": "3.2-936cd0c8",
+  "port-version": 2,
   "description": "The C++14 wrapper around sqlite library",
   "homepage": "https://github.com/aminroosta/sqlite_modern_cpp",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/sqlite-orm/fix-dependency.patch b/external_imported/vcpkg/ports/sqlite-orm/fix-dependency.patch
index 7d39dc3ce..fac6ae289 100644
--- a/external_imported/vcpkg/ports/sqlite-orm/fix-dependency.patch
+++ b/external_imported/vcpkg/ports/sqlite-orm/fix-dependency.patch
@@ -1,3 +1,18 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a56294f29..d784c4d5f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -44,8 +44,8 @@ set(SqliteOrm_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/include")
+ add_library(sqlite_orm INTERFACE)
+ add_library(sqlite_orm::sqlite_orm ALIAS sqlite_orm)
+ 
+-find_package(SQLite3 REQUIRED)
+-target_link_libraries(sqlite_orm INTERFACE SQLite::SQLite3)
++find_package(unofficial-sqlite3 CONFIG REQUIRED)
++target_link_libraries(sqlite_orm INTERFACE unofficial::sqlite3::sqlite3)
+ 
+ target_sources(sqlite_orm INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/sqlite_orm/sqlite_orm.h>)
+ 
 diff --git a/cmake/SqliteOrmConfig.cmake.in b/cmake/SqliteOrmConfig.cmake.in
 index e0635d28a..30403cd41 100644
 --- a/cmake/SqliteOrmConfig.cmake.in
diff --git a/external_imported/vcpkg/ports/sqlite-orm/fix-features-build-error.patch b/external_imported/vcpkg/ports/sqlite-orm/fix-features-build-error.patch
deleted file mode 100644
index b4c43d6aa..000000000
--- a/external_imported/vcpkg/ports/sqlite-orm/fix-features-build-error.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 436d30a6d..d64f3cbb7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -35,15 +35,14 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
- include(CTest)
- 
- ### Dependencies
--add_subdirectory(dependencies)
- 
- ### Main Build Targets
- set(SqliteOrm_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/include")
- add_library(sqlite_orm INTERFACE)
- add_library(sqlite_orm::sqlite_orm ALIAS sqlite_orm)
- 
--find_package(SQLite3 REQUIRED)
--target_link_libraries(sqlite_orm INTERFACE SQLite::SQLite3)
-+find_package(unofficial-sqlite3 CONFIG REQUIRED)
-+target_link_libraries(sqlite_orm INTERFACE unofficial::sqlite3::sqlite3)
- 
- target_sources(sqlite_orm INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/sqlite_orm/sqlite_orm.h>)
- 
-diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
-index 2857b659e..3ee46e625 100644
---- a/examples/CMakeLists.txt
-+++ b/examples/CMakeLists.txt
-@@ -4,5 +4,5 @@ file(GLOB files "*.cpp")
- foreach(file ${files})
-     get_filename_component(file_basename ${file} NAME_WE)
-     add_executable(${file_basename} ${file})
--    target_link_libraries(${file_basename} PRIVATE sqlite_orm sqlite3)
-+    target_link_libraries(${file_basename} PRIVATE sqlite_orm)
- endforeach()
diff --git a/external_imported/vcpkg/ports/sqlite-orm/portfile.cmake b/external_imported/vcpkg/ports/sqlite-orm/portfile.cmake
index 6efd11b3e..3164a37f9 100644
--- a/external_imported/vcpkg/ports/sqlite-orm/portfile.cmake
+++ b/external_imported/vcpkg/ports/sqlite-orm/portfile.cmake
@@ -3,11 +3,10 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO fnc12/sqlite_orm
-    REF v1.8.1
-    SHA512 ada0571a5fb5f8eaec24b5046b9b7eb4de4656ebf5b9e413be8e7348d2169b34111a423c8af3128baaed48dbc945bbce0b1794527f737818b1c9153a13bbcb9a
+    REF v1.8.2
+    SHA512 65479c02246d96bfa0a6a5ed749e15650e71114c1145d17bd48f1a57560c9f494148253064f720dd43773ac9971a85635c9d4927f3b336590188339b3d656b33
     HEAD_REF master
     PATCHES 
-        fix-features-build-error.patch
         fix-dependency.patch
 )
 
diff --git a/external_imported/vcpkg/ports/sqlite-orm/vcpkg.json b/external_imported/vcpkg/ports/sqlite-orm/vcpkg.json
index 3c863bb48..68a805c35 100644
--- a/external_imported/vcpkg/ports/sqlite-orm/vcpkg.json
+++ b/external_imported/vcpkg/ports/sqlite-orm/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "sqlite-orm",
-  "version": "1.8.1",
+  "version": "1.8.2",
+  "port-version": 1,
   "description": "SQLite ORM light header only library for modern C++",
   "homepage": "https://github.com/fnc12/sqlite_orm",
   "license": "AGPL-3.0-or-later OR MIT",
@@ -21,6 +22,7 @@
     },
     "test": {
       "description": "Build sqlite_orm unit tests",
+      "supports": "!uwp",
       "dependencies": [
         "catch2"
       ]
diff --git a/external_imported/vcpkg/ports/sqlite3/CMakeLists.txt b/external_imported/vcpkg/ports/sqlite3/CMakeLists.txt
index c4fcadf9b..1144965d1 100644
--- a/external_imported/vcpkg/ports/sqlite3/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/sqlite3/CMakeLists.txt
@@ -7,7 +7,7 @@ option(SQLITE3_SKIP_TOOLS "Disable build sqlite3 executable" OFF)
 
 set(PKGCONFIG_LIBS_PRIVATE "")
 
-add_library(sqlite3 sqlite3.c)
+add_library(sqlite3 sqlite3.c sqlite3.rc)
 
 target_include_directories(sqlite3 PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}> $<INSTALL_INTERFACE:include>)
 
@@ -17,6 +17,7 @@ target_compile_definitions(
         $<$<CONFIG:Debug>:SQLITE_DEBUG=1>
         $<$<CONFIG:Debug>:SQLITE_ENABLE_SELECTTRACE>
         $<$<CONFIG:Debug>:SQLITE_ENABLE_WHERETRACE>
+        $<$<COMPILE_LANGUAGE:RC>:RC_VERONLY>
 )
 
 if (BUILD_SHARED_LIBS)
@@ -46,6 +47,10 @@ endif()
 
 if(NOT SQLITE3_SKIP_TOOLS)
     add_executable(sqlite3-bin shell.c)
+    set_target_properties(sqlite3-bin PROPERTIES
+        OUTPUT_NAME sqlite3
+        PDB_NAME "sqlite3${CMAKE_EXECUTABLE_SUFFIX}.pdb"
+    )
 
     target_link_libraries(sqlite3-bin PRIVATE sqlite3)
     if (WITH_ZLIB)
@@ -55,7 +60,7 @@ if(NOT SQLITE3_SKIP_TOOLS)
     endif()
 
     install(TARGETS sqlite3-bin sqlite3
-      RUNTIME DESTINATION tools
+      RUNTIME DESTINATION bin
       LIBRARY DESTINATION lib
       ARCHIVE DESTINATION lib
     )
diff --git a/external_imported/vcpkg/ports/sqlite3/add-config-include.patch b/external_imported/vcpkg/ports/sqlite3/add-config-include.patch
index cf67c26fc..7942c9cf3 100644
--- a/external_imported/vcpkg/ports/sqlite3/add-config-include.patch
+++ b/external_imported/vcpkg/ports/sqlite3/add-config-include.patch
@@ -1,24 +1,24 @@
 diff --git a/sqlite3.c b/sqlite3.c
-index a290c82..a5d4d97 100644
+index a1fbd60..68a4e21 100644
 --- a/sqlite3.c
 +++ b/sqlite3.c
-@@ -17,6 +17,7 @@
- ** language. The code for the "sqlite3" command-line shell is also in a
- ** separate file. This file contains only code for the core SQLite library.
+@@ -22,6 +22,7 @@
  */
-+#include <sqlite3-vcpkg-config.h>
  #define SQLITE_CORE 1
  #define SQLITE_AMALGAMATION 1
++#include "sqlite3-vcpkg-config.h"
  #ifndef SQLITE_PRIVATE
+ # define SQLITE_PRIVATE static
+ #endif
 diff --git a/sqlite3.h b/sqlite3.h
-index 24b9167..9fd81b9 100644
+index 0376113..271cf53 100644
 --- a/sqlite3.h
 +++ b/sqlite3.h
 @@ -32,6 +32,7 @@
  */
  #ifndef SQLITE3_H
  #define SQLITE3_H
-+#include "./sqlite3-vcpkg-config.h"
++#include "sqlite3-vcpkg-config.h"
  #include <stdarg.h>     /* Needed for the definition of va_list */
  
  /*
diff --git a/external_imported/vcpkg/ports/sqlite3/portfile.cmake b/external_imported/vcpkg/ports/sqlite3/portfile.cmake
index 3ab308e88..4dc157bb9 100644
--- a/external_imported/vcpkg/ports/sqlite3/portfile.cmake
+++ b/external_imported/vcpkg/ports/sqlite3/portfile.cmake
@@ -2,9 +2,9 @@ string(REGEX REPLACE "^([0-9]+)[.]([0-9]+)[.]([0-9]+)[.]([0-9]+)" "\\1,0\\2,0\\3
 string(REGEX REPLACE "^([0-9]+),0*([0-9][0-9]),0*([0-9][0-9]),0*([0-9][0-9])," "\\1\\2\\3\\4" SQLITE_VERSION "${SQLITE_VERSION}")
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://sqlite.org/2022/sqlite-amalgamation-${SQLITE_VERSION}.zip"
-    FILENAME "sqlite-amalgamation-${SQLITE_VERSION}.zip"
-    SHA512 863afdabbdbe27baaccc13477e08437ce3b4d7e6f0c51a294d1d71252476af474b6c275729ebe1bc801f004da7ca6775591a30fed1930c3a1920d8118864f1d2
+    URLS "https://sqlite.org/2024/sqlite-autoconf-${SQLITE_VERSION}.tar.gz"
+    FILENAME "sqlite-autoconf-${SQLITE_VERSION}.zip"
+    SHA512 40ae9ba1dea234aacfecf44a6b1c0713c24348d8d475503c11f1d92ed2fffb54a765bbd0669f39aa09d20f42cbcfac4dedcf7e64f4421b8762eebfc66399aa9a
 )
 
 vcpkg_extract_source_archive(
@@ -25,21 +25,30 @@ else()
     set(SQLITE_API "")
 endif()
 
-vcpkg_check_features(OUT_FEATURE_OPTIONS Unused
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        fts5                SQLITE_ENABLE_FTS5
+        math                SQLITE_ENABLE_MATH_FUNCTIONS
+        zlib                WITH_ZLIB
+    INVERTED_FEATURES
+        tool                SQLITE3_SKIP_TOOLS
+)
+vcpkg_check_features(OUT_FEATURE_OPTIONS none # only using the script-mode side-effects
     FEATURES
+        dbstat              SQLITE_ENABLE_DBSTAT_VTAB
         fts3                SQLITE_ENABLE_FTS3
         fts4                SQLITE_ENABLE_FTS4
-        fts5                SQLITE_ENABLE_FTS5
         memsys3             SQLITE_ENABLE_MEMSYS3
         memsys5             SQLITE_ENABLE_MEMSYS5
-        math                SQLITE_ENABLE_MATH_FUNCTIONS
         limit               SQLITE_ENABLE_UPDATE_DELETE_LIMIT
         rtree               SQLITE_ENABLE_RTREE
         session             SQLITE_ENABLE_SESSION
         session             SQLITE_ENABLE_PREUPDATE_HOOK
         omit-load-extension SQLITE_OMIT_LOAD_EXTENSION
         geopoly             SQLITE_ENABLE_GEOPOLY
-        json1               SQLITE_ENABLE_JSON1
+        soundex             SQLITE_SOUNDEX
+    INVERTED_FEATURES
+        json1               SQLITE_OMIT_JSON
 )
 
 if(VCPKG_TARGET_IS_WINDOWS)
@@ -55,13 +64,6 @@ file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/sqlite3.pc.in" DESTINATION "${SOURCE_PATH}")
 configure_file("${CMAKE_CURRENT_LIST_DIR}/sqlite3-vcpkg-config.h.in" "${SOURCE_PATH}/sqlite3-vcpkg-config.h" @ONLY)
 
-vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    FEATURES
-        zlib                WITH_ZLIB
-    INVERTED_FEATURES
-        tool                SQLITE3_SKIP_TOOLS
-)
-
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
@@ -69,16 +71,18 @@ vcpkg_cmake_configure(
         -DPKGCONFIG_VERSION=${VERSION}
     OPTIONS_DEBUG
         -DSQLITE3_SKIP_TOOLS=ON
+    MAYBE_UNUSED_VARIABLES
+        SQLITE_ENABLE_FTS5
+        SQLITE_ENABLE_MATH_FUNCTIONS
 )
 
 vcpkg_cmake_install()
-vcpkg_copy_pdbs()
 vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT} CONFIG_PATH share/unofficial-${PORT})
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-if(NOT SQLITE3_SKIP_TOOLS AND EXISTS "${CURRENT_PACKAGES_DIR}/tools/sqlite3-bin${VCPKG_HOST_EXECUTABLE_SUFFIX}")
-    file(RENAME "${CURRENT_PACKAGES_DIR}/tools/sqlite3-bin${VCPKG_HOST_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/sqlite3${VCPKG_HOST_EXECUTABLE_SUFFIX}")
+if("tool" IN_LIST FEATURES)
+    vcpkg_copy_tools(TOOL_NAMES sqlite3 DESTINATION "${CURRENT_PACKAGES_DIR}/tools" AUTO_CLEAN)
 endif()
 
 configure_file(
@@ -88,6 +92,7 @@ configure_file(
 )
 
 vcpkg_fixup_pkgconfig()
+vcpkg_copy_pdbs()
 
 file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "SQLite is in the Public Domain.\nhttp://www.sqlite.org/copyright.html\n")
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/sqlite3/sqlite3-vcpkg-config.h.in b/external_imported/vcpkg/ports/sqlite3/sqlite3-vcpkg-config.h.in
index a7fd17613..f3705bf50 100644
--- a/external_imported/vcpkg/ports/sqlite3/sqlite3-vcpkg-config.h.in
+++ b/external_imported/vcpkg/ports/sqlite3/sqlite3-vcpkg-config.h.in
@@ -22,7 +22,7 @@
 #cmakedefine SQLITE_ENABLE_PREUPDATE_HOOK
 #cmakedefine SQLITE_OMIT_LOAD_EXTENSION
 #cmakedefine SQLITE_ENABLE_GEOPOLY
-#cmakedefine SQLITE_ENABLE_JSON1
+#cmakedefine SQLITE_OMIT_JSON
 #cmakedefine SQLITE_OS_WIN @SQLITE_OS_WIN@
 #cmakedefine SQLITE_OS_WINRT @SQLITE_OS_WINRT@
 #define SQLITE_ENABLE_COLUMN_METADATA 1
diff --git a/external_imported/vcpkg/ports/sqlite3/vcpkg.json b/external_imported/vcpkg/ports/sqlite3/vcpkg.json
index e494628d4..fe6ec5256 100644
--- a/external_imported/vcpkg/ports/sqlite3/vcpkg.json
+++ b/external_imported/vcpkg/ports/sqlite3/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "sqlite3",
-  "version": "3.40.1",
-  "port-version": 1,
+  "version": "3.45.0",
   "description": "SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine.",
   "homepage": "https://sqlite.org/",
   "license": "blessing",
@@ -15,7 +14,13 @@
       "host": true
     }
   ],
+  "default-features": [
+    "json1"
+  ],
   "features": {
+    "dbstat": {
+      "description": "Enable the DBSTAT virtual table"
+    },
     "fts3": {
       "description": "Enable the FTS3 extension"
     },
@@ -52,8 +57,12 @@
     "session": {
       "description": "Enable the SESSION extension"
     },
+    "soundex": {
+      "description": "Enable the SOUNDEX scalar function"
+    },
     "tool": {
-      "description": "Build sqlite3 executable"
+      "description": "Build sqlite3 executable",
+      "supports": "!uwp"
     },
     "zlib": {
       "description": "Build sqlite3 command line tool with zlib support; has no effect on the library itself",
diff --git a/external_imported/vcpkg/ports/sqlitecpp/0001-unofficial-sqlite3-and-sqlcipher.patch b/external_imported/vcpkg/ports/sqlitecpp/0001-unofficial-sqlite3-and-sqlcipher.patch
deleted file mode 100644
index cb07f1ae1..000000000
--- a/external_imported/vcpkg/ports/sqlitecpp/0001-unofficial-sqlite3-and-sqlcipher.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 72b1a42..552ff50 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -284,9 +284,9 @@ else (SQLITECPP_INTERNAL_SQLITE)
-             target_link_libraries(SQLiteCpp PRIVATE ${sqlcipher_LIBRARY})
-         endif()
-     else()
--        find_package (SQLite3 REQUIRED)
-+        find_package (unofficial-sqlite3 CONFIG)
-         message(STATUS "Link to sqlite3 system library")
--        target_link_libraries(SQLiteCpp PUBLIC SQLite::SQLite3)
-+        target_link_libraries(SQLiteCpp PRIVATE unofficial::sqlite3::sqlite3)
-         if(SQLite3_VERSION VERSION_LESS "3.19")
-             set_target_properties(SQLiteCpp PROPERTIES COMPILE_FLAGS "-DSQLITECPP_HAS_MEM_STRUCT")
-         endif()
diff --git a/external_imported/vcpkg/ports/sqlitecpp/add_runtime_destination.patch b/external_imported/vcpkg/ports/sqlitecpp/add_runtime_destination.patch
new file mode 100644
index 000000000..71b2b8526
--- /dev/null
+++ b/external_imported/vcpkg/ports/sqlitecpp/add_runtime_destination.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e5723d0..ecc1ac2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -337,6 +337,7 @@ target_include_directories(SQLiteCpp
+ include(GNUInstallDirs)
+ install(TARGETS SQLiteCpp
+     EXPORT ${PROJECT_NAME}Targets
++    RUNTIME DESTINATION bin
+     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+     COMPONENT libraries)
diff --git a/external_imported/vcpkg/ports/sqlitecpp/fix_dependency.patch b/external_imported/vcpkg/ports/sqlitecpp/fix_dependency.patch
index a55c94cff..2277ca6e0 100644
--- a/external_imported/vcpkg/ports/sqlitecpp/fix_dependency.patch
+++ b/external_imported/vcpkg/ports/sqlitecpp/fix_dependency.patch
@@ -1,11 +1,28 @@
-diff --git a/cmake/SQLiteCppConfig.cmake.in b/cmake/SQLiteCppConfig.cmake.in
-index 568922f..01196db 100644
---- a/cmake/SQLiteCppConfig.cmake.in
-+++ b/cmake/SQLiteCppConfig.cmake.in
-@@ -1,5 +1,5 @@
- include(CMakeFindDependencyMacro)
--find_dependency(SQLite3 REQUIRED)
-+find_dependency(unofficial-sqlite3 REQUIRED)
- if(@UNIX@)
-     set(THREADS_PREFER_PTHREAD_FLAG @THREADS_PREFER_PTHREAD_FLAG@)
-     find_dependency(Threads REQUIRED)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index df5693d..e5723d0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -295,9 +295,9 @@ else (SQLITECPP_INTERNAL_SQLITE)
+             target_link_libraries(SQLiteCpp PRIVATE ${sqlcipher_LIBRARY})
+         endif()
+     else()
+-        find_package (SQLite3 REQUIRED)
++        find_package (unofficial-sqlite3 CONFIG)
+         message(STATUS "Link to sqlite3 system library")
+-        target_link_libraries(SQLiteCpp PUBLIC SQLite::SQLite3)
++        target_link_libraries(SQLiteCpp PRIVATE unofficial::sqlite3::sqlite3)
+         if(SQLite3_VERSION VERSION_LESS "3.19")
+             set_target_properties(SQLiteCpp PROPERTIES COMPILE_FLAGS "-DSQLITECPP_HAS_MEM_STRUCT")
+         endif()
+diff --git a/cmake/SQLiteCppConfig.cmake.in b/cmake/SQLiteCppConfig.cmake.in
+index 2b48df4..d0feda9 100644
+--- a/cmake/SQLiteCppConfig.cmake.in
++++ b/cmake/SQLiteCppConfig.cmake.in
+@@ -1,6 +1,6 @@
+ include(CMakeFindDependencyMacro)
+ if(NOT @SQLITECPP_INTERNAL_SQLITE@)
+-    find_dependency(SQLite3 REQUIRED)
++    find_dependency(unofficial-sqlite3 REQUIRED)
+ endif()
+ if(@UNIX@)
+     set(THREADS_PREFER_PTHREAD_FLAG @THREADS_PREFER_PTHREAD_FLAG@)
diff --git a/external_imported/vcpkg/ports/sqlitecpp/portfile.cmake b/external_imported/vcpkg/ports/sqlitecpp/portfile.cmake
index 14cf27e04..e2e8363dd 100644
--- a/external_imported/vcpkg/ports/sqlitecpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/sqlitecpp/portfile.cmake
@@ -1,13 +1,11 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
 vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH
     REPO "SRombauts/SQLiteCpp"
-    REF 3.2.0
+    REF ${VERSION}
     HEAD_REF master
-    SHA512 af57c3e82a8804174c52105ecc14ea7a2d4e293ef13b2fc371f2455890ea54683ed76adf4649e561686a6b4c3368676f5edcc54d9f22c4850be3ba32832d3272
+    SHA512 08a42ef2495b65e8565569842b40882aff91a3bf1887f09b5b2f2950ae4e16ef927809e7ff9870ffcf143bc187bb3eea5c3f2e4881943144e8cb6e1605ba71ce
     PATCHES
-        0001-unofficial-sqlite3-and-sqlcipher.patch
         fix_dependency.patch
+        add_runtime_destination.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -28,7 +26,6 @@ vcpkg_cmake_configure(
         -DSQLITECPP_RUN_CPPCHECK=OFF
         -DSQLITECPP_INTERNAL_SQLITE=OFF
         -DSQLITE_ENABLE_COLUMN_METADATA=ON
-        -DSQLITECPP_INTERNAL_SQLITE=OFF
         -DSQLITECPP_USE_STATIC_RUNTIME=OFF # unconditionally off because vcpkg's toolchains already do the right thing
         # See https://github.com/SRombauts/SQLiteCpp/blob/e74403264ec7093060f4ed0e84bc9208997c8344/CMakeLists.txt#L40-L46
         ${USE_STACK_PROTECTION}
diff --git a/external_imported/vcpkg/ports/sqlitecpp/vcpkg.json b/external_imported/vcpkg/ports/sqlitecpp/vcpkg.json
index 5e6213d7e..9eb7de68d 100644
--- a/external_imported/vcpkg/ports/sqlitecpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/sqlitecpp/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "sqlitecpp",
-  "version": "3.2.0",
-  "port-version": 1,
+  "version": "3.3.1",
   "description": "SQLiteC++ (SQLiteCpp) is a smart and easy to use C++ SQLite3 wrapper.",
   "homepage": "https://github.com/SRombauts/SQLiteCpp",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/sqlpp11/fix_link_sqlite3.patch b/external_imported/vcpkg/ports/sqlpp11/fix_link_sqlite3.patch
new file mode 100644
index 000000000..c843d6ef2
--- /dev/null
+++ b/external_imported/vcpkg/ports/sqlpp11/fix_link_sqlite3.patch
@@ -0,0 +1,34 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 88a8ae0..a36cb19 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -62,7 +62,7 @@ if(DEPENDENCY_CHECK AND BUILD_POSTGRESQL_CONNECTOR)
+ endif()
+ 
+ if(DEPENDENCY_CHECK AND BUILD_SQLITE3_CONNECTOR)
+-  find_package(SQLite3 REQUIRED)
++  find_package(unofficial-sqlite3 CONFIG REQUIRED)
+ endif()
+ 
+ if(DEPENDENCY_CHECK AND BUILD_SQLCIPHER_CONNECTOR)
+@@ -89,7 +89,7 @@ target_compile_features(sqlpp11 INTERFACE cxx_std_11)
+ 
+ 
+ if(BUILD_SQLITE3_CONNECTOR)
+-  add_component(NAME sqlite3 DEPENDENCIES SQLite::SQLite3)
++  add_component(NAME sqlite3 DEPENDENCIES unofficial::sqlite3::sqlite3)
+ endif()
+ 
+ if(BUILD_SQLCIPHER_CONNECTOR)
+diff --git a/cmake/configs/Sqlpp11Config.cmake b/cmake/configs/Sqlpp11Config.cmake
+index c25da97..b15524e 100644
+--- a/cmake/configs/Sqlpp11Config.cmake
++++ b/cmake/configs/Sqlpp11Config.cmake
+@@ -30,6 +30,7 @@ list(PREPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
+ include(CMakeFindDependencyMacro)
+ find_dependency(Threads)
+ find_dependency(date REQUIRED)
++find_dependency(unofficial-sqlite3 CONFIG)
+ 
+ # Work out the set of components to load
+ if(${CMAKE_FIND_PACKAGE_NAME}_FIND_COMPONENTS)
diff --git a/external_imported/vcpkg/ports/sqlpp11/portfile.cmake b/external_imported/vcpkg/ports/sqlpp11/portfile.cmake
index bb7febd55..d8f485c8c 100644
--- a/external_imported/vcpkg/ports/sqlpp11/portfile.cmake
+++ b/external_imported/vcpkg/ports/sqlpp11/portfile.cmake
@@ -1,11 +1,12 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO rbock/sqlpp11
-    REF 648183fd64070185019f9237481b888173abfaf2 # 2022-09-14
-    SHA512 0429c5972ef111a41422ebd3ca259bc7f2cca126b0abd526270e7c8553fbc9d22ee584c526340a7f3c667143a16b961c222687806641b6ddfe9a258bd5e1ccc8
+    REF ${VERSION}
+    SHA512 7b48f66e2e229ed046a5b5033acc1be36b0c2790773a81ce9c65fce4a85379d61e87dd0ff214eb4126ce87fe6cf2f314b7e6c54256b600d15d8352d74a8fac0d
     HEAD_REF master
     PATCHES
         ddl2cpp_path.patch
+        fix_link_sqlite3.patch
 )
 
 vcpkg_check_features(
diff --git a/external_imported/vcpkg/ports/sqlpp11/vcpkg.json b/external_imported/vcpkg/ports/sqlpp11/vcpkg.json
index 5cf5dd838..aa54b4995 100644
--- a/external_imported/vcpkg/ports/sqlpp11/vcpkg.json
+++ b/external_imported/vcpkg/ports/sqlpp11/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "sqlpp11",
-  "version": "0.61",
-  "port-version": 2,
+  "version": "0.64",
   "description": "A type safe embedded domain specific language for SQL queries and results in C++.",
   "homepage": "https://github.com/rbock/sqlpp11",
   "license": "BSD-2-Clause",
diff --git a/external_imported/vcpkg/ports/sratom/vcpkg.json b/external_imported/vcpkg/ports/sratom/vcpkg.json
index 2b5251e91..45710911a 100644
--- a/external_imported/vcpkg/ports/sratom/vcpkg.json
+++ b/external_imported/vcpkg/ports/sratom/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "sratom",
-  "version-string": "0.6.4",
-  "port-version": 1,
+  "version": "0.6.4",
+  "port-version": 2,
   "description": "Sratom is a library for serialising LV2 atoms to and from RDF, particularly the Turtle syntax.",
   "homepage": "https://drobilla.net/software/sratom",
   "license": "ISC",
diff --git a/external_imported/vcpkg/ports/sse2neon/portfile.cmake b/external_imported/vcpkg/ports/sse2neon/portfile.cmake
index 747c94172..1a4f5f9d1 100644
--- a/external_imported/vcpkg/ports/sse2neon/portfile.cmake
+++ b/external_imported/vcpkg/ports/sse2neon/portfile.cmake
@@ -2,8 +2,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO DLTcollab/sse2neon
-    REF v1.5.1
-    SHA512  7d14b074aa5829e218a04975d96fc67adba3fb4ffd9d580ab0bc05048f7abd9143dd308b2d9e8b1600b00427b21b24d49d7a6670c91270fcc6d053c3bca908af
+    REF "v${VERSION}"
+    SHA512  d11f8e42eaccd045354b5359991562a1d2d26a796e7f44687fdd610067fef37528e2add046632cf15bd7d068b4949371fed91673b121ba893d40b10b6232e33d
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/sse2neon/vcpkg.json b/external_imported/vcpkg/ports/sse2neon/vcpkg.json
index d12cee001..0526f2a52 100644
--- a/external_imported/vcpkg/ports/sse2neon/vcpkg.json
+++ b/external_imported/vcpkg/ports/sse2neon/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "sse2neon",
-  "version-semver": "1.5.1",
-  "port-version": 1,
+  "version": "1.6.0",
   "description": "A translator from Intel SSE intrinsics to Arm/Aarch64 NEON implementation",
   "homepage": "https://github.com/DLTcollab/sse2neon",
   "license": "MIT"
diff --git a/external_imported/vcpkg/ports/stackwalker/fix-exports.patch b/external_imported/vcpkg/ports/stackwalker/fix-exports.patch
new file mode 100644
index 000000000..3ff79bda4
--- /dev/null
+++ b/external_imported/vcpkg/ports/stackwalker/fix-exports.patch
@@ -0,0 +1,28 @@
+diff --git "a/CMakeLists.txt" "b/CMakeLists.txt"
+index 82f0206a2..8160fd789 100644
+--- "a/CMakeLists.txt"
++++ "b/CMakeLists.txt"
+@@ -79,12 +79,13 @@ add_library(${TARGET_StackWalker} STATIC
+     Main/StackWalker/StackWalker.cpp)
+ target_include_directories(${TARGET_StackWalker} PUBLIC
+     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/Main/StackWalker>
++    $<INSTALL_INTERFACE:include>
+     )
+
+-install(TARGETS "${TARGET_StackWalker}"
+-    ARCHIVE  DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-    LIBRARY  DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-    RUNTIME  DESTINATION ${CMAKE_INSTALL_BINDIR}
++install(TARGETS "${TARGET_StackWalker}" EXPORT stackwalker-config
++    ARCHIVE  DESTINATION lib
++    LIBRARY  DESTINATION lib
++    RUNTIME  DESTINATION bin
+     )
+
+ install(FILES "${CMAKE_SOURCE_DIR}/Main/StackWalker/StackWalker.h"
+@@ -114,3 +115,5 @@ else()
+
+     add_test(NAME ${TARGET_StackWalker_tests} COMMAND ${TARGET_StackWalker_tests})
+ endif()
++
++install(EXPORT stackwalker-config NAMESPACE unofficial::stackwalker:: DESTINATION share/stackwalker)
diff --git a/external_imported/vcpkg/ports/stackwalker/portfile.cmake b/external_imported/vcpkg/ports/stackwalker/portfile.cmake
new file mode 100644
index 000000000..4a5c4c423
--- /dev/null
+++ b/external_imported/vcpkg/ports/stackwalker/portfile.cmake
@@ -0,0 +1,28 @@
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO JochenKalmbach/StackWalker
+    REF "${VERSION}"
+    SHA512 6fe8c5eb6e2d94630d43644a13cf62f1725a9f39115bda2d859461ad0cc6acf27e8a246247bd9b49940fb4ec372559f6d11467e77215d3638f910f2574ac449a
+    HEAD_REF master
+    PATCHES
+        fix-exports.patch
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        ${options}
+        -DStackWalker_DISABLE_TESTS=OFF
+)
+
+vcpkg_cmake_install()
+
+vcpkg_copy_pdbs()
+
+vcpkg_cmake_config_fixup()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/stackwalker/vcpkg.json b/external_imported/vcpkg/ports/stackwalker/vcpkg.json
new file mode 100644
index 000000000..d1e311bed
--- /dev/null
+++ b/external_imported/vcpkg/ports/stackwalker/vcpkg.json
@@ -0,0 +1,17 @@
+{
+  "name": "stackwalker",
+  "version-date": "2023-06-24",
+  "description": "StackWalker - Walking the callstack.",
+  "license": "BSD-2-Clause",
+  "supports": "windows & !uwp",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/starlink-ast/cminpack.diff b/external_imported/vcpkg/ports/starlink-ast/cminpack.diff
new file mode 100644
index 000000000..deb5e2d70
--- /dev/null
+++ b/external_imported/vcpkg/ports/starlink-ast/cminpack.diff
@@ -0,0 +1,46 @@
+diff --git a/Makefile.in b/Makefile.in
+index a935107..51c5e07 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1572,13 +1572,13 @@ libast_la_SOURCES = \
+ libast_la_LDFLAGS = -version-info @version_info@
+ @EXTERNAL_CMINPACK_FALSE@@EXTERNAL_PAL_FALSE@libast_la_LIBADD = libast_pal.la libast_cminpack.la
+ @EXTERNAL_CMINPACK_FALSE@@EXTERNAL_PAL_TRUE@libast_la_LIBADD = -lpal libast_cminpack.la
+-@EXTERNAL_CMINPACK_TRUE@@EXTERNAL_PAL_FALSE@libast_la_LIBADD = libast_pal.la -lcminpack
++@EXTERNAL_CMINPACK_TRUE@@EXTERNAL_PAL_FALSE@libast_la_LIBADD = libast_pal.la $(LIBCMINPACK)
+ 
+ # Ensure libast links against libraries containing functions used within
+ # libast. If AST is configured --with-external-pal, then the internal
+ # libast_pal library will be empty, and we link to an external PAL
+ # library instead. Do the same for cminpack
+-@EXTERNAL_CMINPACK_TRUE@@EXTERNAL_PAL_TRUE@libast_la_LIBADD = -lpal -lcminpack
++@EXTERNAL_CMINPACK_TRUE@@EXTERNAL_PAL_TRUE@libast_la_LIBADD = -lpal $(LIBCMINPACK)
+ 
+ # AST_PAR is really part of GRP_F_INCLUDE_FILES, but it must not be
+ # distributed, so list it separately.
+diff --git a/configure b/configure
+index d9db3ee..f3d3fc0 100755
+--- a/configure
++++ b/configure
+@@ -15763,7 +15763,7 @@ fi
+ EXTERNAL_CMINPACK=$external_cminpack
+ 
+ if test "$external_cminpack" = "1"; then
+-   LIBCMINPACK="-lcminpack"
++   LIBCMINPACK="-lcminpack$CMINPACK_DEBUG_SUFFIX"
+ 
+ 
+ $as_echo "#define EXTERNAL_CMINPACK 1" >>confdefs.h
+diff --git a/src/polymap.c b/src/polymap.c
+index 0b436cc..1aee268 100644
+--- a/src/polymap.c
++++ b/src/polymap.c
+@@ -165,7 +165,7 @@ f     - AST_POLYTRAN: Fit a PolyMap inverse or forward transformation
+ #include "cmpmap.h"              /* Compound mappings */
+ #include "polymap.h"             /* Interface definition for this class */
+ #include "unitmap.h"             /* Unit mappings */
+-#include "cminpack/cminpack.h"   /* Levenberg - Marquardt minimization */
++#include "cminpack-1/cminpack.h"   /* Levenberg - Marquardt minimization */
+ #include "pal.h"                 /* SLALIB function definitions */
+ 
+ /* Error code definitions. */
diff --git a/external_imported/vcpkg/ports/starlink-ast/portfile.cmake b/external_imported/vcpkg/ports/starlink-ast/portfile.cmake
index 058b37bad..d416b9154 100644
--- a/external_imported/vcpkg/ports/starlink-ast/portfile.cmake
+++ b/external_imported/vcpkg/ports/starlink-ast/portfile.cmake
@@ -1,19 +1,26 @@
+if(VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
+
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/Starlink/ast/releases/download/v9.2.7/ast-9.2.7.tar.gz"
-    FILENAME "ast-9.2.7.tar.gz"
-    SHA512 4778658fe6b08af29b51807e2d988f8425d99d630a14d8fef9ca4ea43016d676df419a93c4b2fdecc0549c28c0665f61e366bd4e7aa896ebb8e47f56d5af1887
+    URLS "https://github.com/Starlink/ast/releases/download/v${VERSION}/ast-${VERSION}.tar.gz"
+    FILENAME "starlink-ast-${VERSION}.tar.gz"
+    SHA512 b559535496b88b33845bd3732bb6ee80572dc0d8d963173e0199d44be09add244244d9aab90642de84c65714bca6c73b5bdc3b3290a55f171e6f3ce7643250f5
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
+vcpkg_extract_source_archive(
+    SOURCE_PATH
+    ARCHIVE "${ARCHIVE}"
+    PATCHES
+        cminpack.diff
 )
+file(REMOVE_RECURSE "${SOURCE_PATH}/cminpack")
 
 set(CONFIGURE_OPTIONS
     --without-fortran
     --with-external-cminpack
-    star_cv_cnf_trail_type=long
-    star_cv_cnf_f2c_compatible=no
+    "--with-starlink=${CURRENT_INSTALLED_DIR}"
+    FC=false
 )
 
 if ("yaml" IN_LIST FEATURES)
@@ -33,13 +40,55 @@ vcpkg_configure_make(
     USE_WRAPPERS
     DETERMINE_BUILD_TRIPLET
     ADDITIONAL_MSYS_PACKAGES perl
-    OPTIONS ${CONFIGURE_OPTIONS}
+    OPTIONS
+        ${CONFIGURE_OPTIONS}
+    OPTIONS_DEBUG
+        CMINPACK_DEBUG_SUFFIX=_d
 )
+vcpkg_install_make(
+    OPTIONS
+        STAR_LDFLAGS= # Do not override build type's lib dirs
+)
+
+# Avoid vcpkg artifact issues with symlinks
+foreach(ast_lib IN ITEMS "${CURRENT_PACKAGES_DIR}/lib/libast" "${CURRENT_PACKAGES_DIR}/debug/lib/libast")
+    if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" AND EXISTS "${ast_lib}${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}")
+        file(REMOVE "${ast_lib}_pass2${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}")
+        file(COPY_FILE "${ast_lib}${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "${ast_lib}_pass2${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}")
+    endif()
+endforeach()
+
+file(REMOVE_RECURSE
+    "${CURRENT_PACKAGES_DIR}/debug/docs"
+    "${CURRENT_PACKAGES_DIR}/debug/help"
+    "${CURRENT_PACKAGES_DIR}/debug/manifests"
+    "${CURRENT_PACKAGES_DIR}/debug/news"
+    "${CURRENT_PACKAGES_DIR}/debug/share"
+    "${CURRENT_PACKAGES_DIR}/docs"
+    "${CURRENT_PACKAGES_DIR}/help"
+    "${CURRENT_PACKAGES_DIR}/manifests"
+    "${CURRENT_PACKAGES_DIR}/news"
+    "${CURRENT_PACKAGES_DIR}/share/${PORT}/ast"
+)
+
+# Remove cl preprocessing comments
+foreach(file IN ITEMS "include/ast.h" "include/star/ast.h")
+    file(READ "${CURRENT_PACKAGES_DIR}/${file}" cpp_output)
+    string(REGEX REPLACE "#line [^ ]+ \"[^\"]*\"" "" cpp_output "${cpp_output}")
+    file(WRITE "${CURRENT_PACKAGES_DIR}/${file}" "${cpp_output}")
+endforeach()
 
-vcpkg_install_make()
+vcpkg_install_copyright(
+    FILE_LIST
+        "${SOURCE_PATH}/COPYING.LESSER"
+        "${SOURCE_PATH}/COPYING"
+        "${SOURCE_PATH}/erfa/LICENSE"
+    COMMENT [[
+AST is distributed under the Lesser GPL licence (LGPL).
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share")
+The AST distribution includes a cut down subset of the C version of the SLALIB library written
+by Pat Wallace. This subset contains only the functions needed by the AST library. It is built as
+part of the process of building AST and is distributed under GPL.
 
-# # Handle copyright
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+The AST distribution includes the ERFA library. See LICENSE below.
+]])
diff --git a/external_imported/vcpkg/ports/starlink-ast/vcpkg.json b/external_imported/vcpkg/ports/starlink-ast/vcpkg.json
index 5acdf6d3d..52812fa27 100644
--- a/external_imported/vcpkg/ports/starlink-ast/vcpkg.json
+++ b/external_imported/vcpkg/ports/starlink-ast/vcpkg.json
@@ -1,22 +1,22 @@
 {
   "name": "starlink-ast",
-  "version": "9.2.7",
+  "version": "9.2.10",
   "port-version": 1,
   "description": "The AST library provides a comprehensive range of facilities for attaching world coordinate systems to astronomical data, for retrieving and interpreting that information and for generating graphical output based on it",
   "homepage": "https://starlink.eao.hawaii.edu/starlink/AST",
-  "supports": "windows",
+  "license": null,
   "dependencies": [
     "cminpack"
   ],
   "features": {
     "pthreads": {
-      "description": "build with POSIX threads support",
+      "description": "Build with POSIX threads support",
       "dependencies": [
         "pthreads"
       ]
     },
     "yaml": {
-      "description": "build with YAML support",
+      "description": "Build with YAML support",
       "dependencies": [
         "libyaml"
       ]
diff --git a/external_imported/vcpkg/ports/status-code/portfile.cmake b/external_imported/vcpkg/ports/status-code/portfile.cmake
index 771b15be4..2a980f68f 100644
--- a/external_imported/vcpkg/ports/status-code/portfile.cmake
+++ b/external_imported/vcpkg/ports/status-code/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ned14/status-code
-    REF 5be338838d278e730b78c07f6306ae71f6c1959c
-    SHA512 61685b7ba40fd2e8a985a8135065b335655aac7aee7778ca3317004c9730078361cfa4bd1b9ac2f9002efc707bfb6168c0275f11e0c5a6b079d42c8240528a90
+    REF 63b229c756202525d1c90d21706fdfb744096220
+    SHA512 610b40b6a967fcce9494478d4518e2529be328ce2aaccbedab8d2264d19d2791e427f51b48886fceacafecf74f24a3d25a9dd54697d375bdc8414521cce579a5
     HEAD_REF master
     PATCHES
 )
@@ -13,8 +13,11 @@ set(VCPKG_BUILD_TYPE release)
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-        -DPROJECT_IS_DEPENDENCY=On
+        -DBUILD_TESTING=OFF
+        -Dstatus-code_IS_DEPENDENCY=ON
         -DCMAKE_DISABLE_FIND_PACKAGE_Boost=ON
+    MAYBE_UNUSED_VARIABLES
+        CMAKE_DISABLE_FIND_PACKAGE_Boost
 )
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/status-code/vcpkg.json b/external_imported/vcpkg/ports/status-code/vcpkg.json
index ae08df320..58adef2d5 100644
--- a/external_imported/vcpkg/ports/status-code/vcpkg.json
+++ b/external_imported/vcpkg/ports/status-code/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "status-code",
-  "version-date": "2023-01-27",
+  "version-date": "2023-11-06",
   "port-version": 1,
   "maintainers": [
     "Niall Douglas <s_github@nedprod.com>",
diff --git a/external_imported/vcpkg/ports/status-value-lite/portfile.cmake b/external_imported/vcpkg/ports/status-value-lite/portfile.cmake
index f5f24e83f..637a543ae 100644
--- a/external_imported/vcpkg/ports/status-value-lite/portfile.cmake
+++ b/external_imported/vcpkg/ports/status-value-lite/portfile.cmake
@@ -6,7 +6,7 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES
     test BUILD_TESTS
 )
 
diff --git a/external_imported/vcpkg/ports/status-value-lite/vcpkg.json b/external_imported/vcpkg/ports/status-value-lite/vcpkg.json
index 29ac75510..2ab1839aa 100644
--- a/external_imported/vcpkg/ports/status-value-lite/vcpkg.json
+++ b/external_imported/vcpkg/ports/status-value-lite/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "status-value-lite",
-  "version-string": "1.1.0",
-  "port-version": 2,
+  "version": "1.1.0",
+  "port-version": 3,
   "description": "status_value is a single-file header-only library for objects that represent a status and an optional value. It is intended for use with C++11 and later.",
   "homepage": "https://github.com/martinmoene/status-value-lite",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/stb/portfile.cmake b/external_imported/vcpkg/ports/stb/portfile.cmake
index 8f76db772..6eda59677 100644
--- a/external_imported/vcpkg/ports/stb/portfile.cmake
+++ b/external_imported/vcpkg/ports/stb/portfile.cmake
@@ -1,16 +1,16 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO nothings/stb
-    REF 8b5f1f37b5b75829fc72d38e7b5d4bcbf8a26d55 # committed on 2022-09-09
-    SHA512 76e0ed7536146aac71f89d6246235221c1dc0bd035ae4b33d496213acf5be95413cae4455a3f1419f84113320f7bd662dc50b47788cbdc8e7208bbbbcfd23f98
+    REF 5736b15f7ea0ffb08dd38af21067c314d6a3aae9 # committed on 2023-04-11
+    SHA512 55bc75284cf8a092c527d1ae18c461c9d0ab6aacdcf3b873abde54c06d9b8a0ae249ce47c7ad25809e075bfbb58e9c879d43e1df2708083860c07ac3bbb30d60
     HEAD_REF master
 )
 
-file(GLOB HEADER_FILES "${SOURCE_PATH}/*.h")
+file(GLOB HEADER_FILES "${SOURCE_PATH}/*.h" "${SOURCE_PATH}/stb_vorbis.c")
 file(COPY ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include")
 
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/FindStb.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/stb/vcpkg.json b/external_imported/vcpkg/ports/stb/vcpkg.json
index 5a8feae32..e1057165f 100644
--- a/external_imported/vcpkg/ports/stb/vcpkg.json
+++ b/external_imported/vcpkg/ports/stb/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "stb",
-  "version-date": "2022-09-09",
+  "version-date": "2023-04-11",
+  "port-version": 1,
   "description": "public domain header-only libraries",
   "homepage": "https://github.com/nothings/stb",
   "license": "MIT OR CC-PDDC"
diff --git a/external_imported/vcpkg/ports/stdexec/fix-include-location.patch b/external_imported/vcpkg/ports/stdexec/fix-include-location.patch
deleted file mode 100644
index 5edca9397..000000000
--- a/external_imported/vcpkg/ports/stdexec/fix-include-location.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d59e51d5..166bab1a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -115,6 +115,7 @@ set_target_properties(stdexec PROPERTIES
-                       SOVERSION "${STDEXEC_VERSION_MAJOR}")
- 
- # Declare the public include directories
-+include(GNUInstallDirs)
- target_include_directories(stdexec INTERFACE
-                            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/>
-                            $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
-@@ -276,7 +277,6 @@ endif()
- # Install targets ------------------------------------------------------------
- 
- include(CPack)
--include(GNUInstallDirs)
- 
- install(TARGETS stdexec
-         DESTINATION ${CMAKE_INSTALL_LIBDIR}
diff --git a/external_imported/vcpkg/ports/stdexec/portfile.cmake b/external_imported/vcpkg/ports/stdexec/portfile.cmake
index 6d4f5aa90..c04f0e4b4 100644
--- a/external_imported/vcpkg/ports/stdexec/portfile.cmake
+++ b/external_imported/vcpkg/ports/stdexec/portfile.cmake
@@ -2,11 +2,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO NVIDIA/stdexec
-    REF 6247237ca9e061401f90a8d320bfe33a61d69a31
-    SHA512 485a8c5a5cd7de9a8875aff769d2c07fb0c7d01d552a0d53c215115384baa23b50524fdb093e5b9c7b8652f463e591df31c7cc45594f7e287664fe1106f1cd3c
+    REF 6b9f3501dced0e39611f93ff795da83d24364f30
+    SHA512 d9a88b5095234c114cc45cef352662677b9f832065f3eec9c0f371547a5627672c3cf85ca19de702b2cd78ba5c1653b5e8156abe2f52d1e27ba014929b9336f2
     HEAD_REF main
-    PATCHES
-        fix-include-location.patch # From https://github.com/NVIDIA/stdexec/pull/803
 )
 
 vcpkg_from_github(
@@ -25,9 +23,9 @@ vcpkg_download_distfile(RAPIDS_cmake
 file(COPY "${RAPIDS_cmake}" DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/")
 
 vcpkg_download_distfile(execution_bs
-    URLS "https://raw.githubusercontent.com/brycelelbach/wg21_p2300_execution/main/execution.bs"
+    URLS "https://raw.githubusercontent.com/brycelelbach/wg21_p2300_execution/R7/execution.bs"
     FILENAME "execution.bs"
-    SHA512 8b976ab932019794d356cf36744af09e027a78488b44d70772675e2c23de0a6fac4e5aaa2ed339d2975b04c75ad27c06c4c3ed95bc2bd9d13370682a019656f2
+    SHA512 90f2a1d150b03c29bb05a5420e091c2371cb973335a089916716d778bc1081764436dc1ff0fec60f642ddb0ca5492c8b0c3a6d5451c2d60a42911f918fe980fa
 )
 file(COPY "${execution_bs}" DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/")
 
@@ -47,4 +45,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/stdexec)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/external_imported/vcpkg/ports/stdexec/vcpkg.json b/external_imported/vcpkg/ports/stdexec/vcpkg.json
index abced9d82..b4bf651e2 100644
--- a/external_imported/vcpkg/ports/stdexec/vcpkg.json
+++ b/external_imported/vcpkg/ports/stdexec/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "stdexec",
-  "version-date": "2023-03-05",
+  "version-date": "2023-09-06",
+  "port-version": 3,
   "description": "stdexec is an experimental reference implementation of the Senders model of asynchronous programming proposed by P2300 - std::execution for adoption into the C++ Standard.",
   "homepage": "https://github.com/NVIDIA/stdexec",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/stduuid/fix-gsl-polyfill.patch b/external_imported/vcpkg/ports/stduuid/fix-gsl-polyfill.patch
index 2e07871bd..3ae035938 100644
--- a/external_imported/vcpkg/ports/stduuid/fix-gsl-polyfill.patch
+++ b/external_imported/vcpkg/ports/stduuid/fix-gsl-polyfill.patch
@@ -1,15 +1,14 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f45a7dc..039ee53 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -37,11 +37,11 @@ if (UUID_TIME_GENERATOR)
+@@ -43,11 +43,11 @@ if (UUID_TIME_GENERATOR)
  endif()
  
  # Using span from std
 -if (NOT UUID_USING_CXX20_SPAN)
 -    target_include_directories(${PROJECT_NAME} INTERFACE
--            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/gsl>
--            $<INSTALL_INTERFACE:include/gsl>)
+-            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+-            $<INSTALL_INTERFACE:include>)
 -    install(DIRECTORY gsl DESTINATION include)
 +if (UUID_USING_CXX20_SPAN)
 +    target_compile_features(${PROJECT_NAME} INTERFACE cxx_std_20)
@@ -18,9 +17,8 @@ index f45a7dc..039ee53 100644
 +    target_link_libraries(${PROJECT_NAME} INTERFACE Microsoft.GSL::GSL)
  endif ()
  
- # Install step and imported target
+ if(UUID_ENABLE_INSTALL)
 diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in
-index 7217b72..fb981d2 100644
 --- a/cmake/Config.cmake.in
 +++ b/cmake/Config.cmake.in
 @@ -9,6 +9,10 @@ if (@UUID_SYSTEM_GENERATOR@)
diff --git a/external_imported/vcpkg/ports/stduuid/fix-install-directory.patch b/external_imported/vcpkg/ports/stduuid/fix-install-directory.patch
index f80d5b6a6..be1a12bf7 100644
--- a/external_imported/vcpkg/ports/stduuid/fix-install-directory.patch
+++ b/external_imported/vcpkg/ports/stduuid/fix-install-directory.patch
@@ -1,8 +1,7 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fffb92c..f45a7dc 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -11,7 +11,8 @@ option(UUID_USING_CXX20_SPAN "Using span from std instead of gsl" OFF)
+@@ -18,7 +18,8 @@ option(UUID_USING_CXX20_SPAN "Using span from std instead of gsl" OFF)
  add_library(${PROJECT_NAME} INTERFACE)
  target_include_directories(${PROJECT_NAME} INTERFACE
          $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
@@ -12,12 +11,12 @@ index fffb92c..f45a7dc 100644
  
  # Using system uuid generator
  if (UUID_SYSTEM_GENERATOR)
-@@ -44,7 +45,7 @@ if (NOT UUID_USING_CXX20_SPAN)
- endif ()
+@@ -52,7 +52,7 @@
  
- # Install step and imported target
--install(FILES include/uuid.h DESTINATION include)
-+install(FILES include/uuid.h DESTINATION include/stduuid)
- install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}-targets)
- install(EXPORT ${PROJECT_NAME}-targets
-         DESTINATION lib/cmake/${PROJECT_NAME})
+ if(UUID_ENABLE_INSTALL)
+     # Install step and imported target
+-    install(FILES include/uuid.h DESTINATION include)
++    install(FILES include/uuid.h DESTINATION include/stduuid)
+     install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}-targets)
+     install(EXPORT ${PROJECT_NAME}-targets
+             DESTINATION lib/cmake/${PROJECT_NAME})
diff --git a/external_imported/vcpkg/ports/stduuid/portfile.cmake b/external_imported/vcpkg/ports/stduuid/portfile.cmake
index 27a3bf8d3..696b86763 100644
--- a/external_imported/vcpkg/ports/stduuid/portfile.cmake
+++ b/external_imported/vcpkg/ports/stduuid/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mariusbancila/stduuid
-    REF v1.2.2
-    SHA512 30970c25992e1ba35d96e3b2fc8530466c1070b8b913b8c37e9f698f39121a5a74361e2c4db4c2ba2feddb0ce9b2f14b78c4761cdac09b89a6a0117b179b08a7
+    REF "v${VERSION}"
+    SHA512 3d2fb21f680fb12559642d6787a5744d4f4fb48a6284bfef77537cb51f9bdbbe271b24a8c3bb1f954b4c845145f22c6d89a09e663df2f96a2e24d1d6f22fdf22
     HEAD_REF master
     PATCHES
         fix-install-directory.patch
@@ -20,15 +20,16 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
         gsl-span UUID_USING_CXX20_SPAN
 )
 
-vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH}
+vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS 
         -DUUID_BUILD_TESTS=OFF
+        -DUUID_ENABLE_INSTALL=ON
         ${FEATURE_OPTIONS}
 )
 vcpkg_cmake_install()
 
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
 
 if("gsl-span" IN_LIST FEATURES)
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/stduuid/uuid.h" "#ifdef __cpp_lib_span" "#if 0")
@@ -37,4 +38,4 @@ else()
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/stduuid/uuid.h" "#ifdef __cpp_lib_span" "#if 1")
 endif()
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/stduuid/vcpkg.json b/external_imported/vcpkg/ports/stduuid/vcpkg.json
index 840ce796b..406519fbd 100644
--- a/external_imported/vcpkg/ports/stduuid/vcpkg.json
+++ b/external_imported/vcpkg/ports/stduuid/vcpkg.json
@@ -1,7 +1,8 @@
 {
   "name": "stduuid",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "A C++17 cross-platform implementation for UUIDs",
+  "homepage": "https://github.com/mariusbancila/stduuid",
   "license": "MIT",
   "dependencies": [
     {
diff --git a/external_imported/vcpkg/ports/stlab/portfile.cmake b/external_imported/vcpkg/ports/stlab/portfile.cmake
index 0760996be..d05ff2c89 100644
--- a/external_imported/vcpkg/ports/stlab/portfile.cmake
+++ b/external_imported/vcpkg/ports/stlab/portfile.cmake
@@ -1,15 +1,22 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO stlab/libraries
-    REF 0a7232a4120c2daf8ddb6621ec13f313a029e495 # V1.6.2
-    SHA512 6e03a5370d02accd798fc14fd256ab593b9a33b4a9b9cda8f2233eeafacf70c389c2999d1834b7ffef6968008921d28d88bcf728a322ba7943106ddc9d8e6f16
-    HEAD_REF develop
+    REF "v${VERSION}"
+    SHA512 ceed4fffc381bebd5456d56e8f9d84094da2a9994c8be60e9c1fe4a72ae5f2c398448169927af1439615b55c549332dfe4c38a2b3b8bdf84e3c550fd14bf125c
+    HEAD_REF main
+)
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        cpp17shims   STLAB_USE_BOOST_CPP17_SHIMS
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DBUILD_TESTING=OFF
+        ${FEATURE_OPTIONS}
+        -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON
 )
 
 vcpkg_cmake_install()
@@ -19,7 +26,7 @@ vcpkg_copy_pdbs()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/share/cmake")
 
 vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/stlabConfig.cmake"
-    "find_dependency(Boost 1.60.0)"
+    "find_dependency(Boost 1.74.0)"
     "if(APPLE)\nfind_dependency(Boost)\nendif()"
 )
 
diff --git a/external_imported/vcpkg/ports/stlab/vcpkg.json b/external_imported/vcpkg/ports/stlab/vcpkg.json
index 691d05772..a4049bce6 100644
--- a/external_imported/vcpkg/ports/stlab/vcpkg.json
+++ b/external_imported/vcpkg/ports/stlab/vcpkg.json
@@ -1,16 +1,14 @@
 {
   "name": "stlab",
-  "version-string": "1.6.2",
-  "port-version": 2,
+  "version": "1.7.1",
+  "port-version": 1,
   "description": [
     "stlab is the ongoing work of what was Adobe Software Technology Lab.",
     "The Concurrency library provides futures and channels, high level constructs for implementing algorithms that eases the use of multiple CPU cores while minimizing contention. This library solves several problems of the C++11 and C++17 TS futures."
   ],
+  "homepage": "https://github.com/stlab/libraries",
+  "license": "BSL-1.0",
   "dependencies": [
-    {
-      "name": "boost-variant",
-      "platform": "osx"
-    },
     {
       "name": "vcpkg-cmake",
       "host": true
@@ -19,5 +17,17 @@
       "name": "vcpkg-cmake-config",
       "host": true
     }
-  ]
+  ],
+  "default-features": [
+    "cpp17shims"
+  ],
+  "features": {
+    "cpp17shims": {
+      "description": "Support C++11/14 by polyfilling stlab's use of `optional` and `variant` with boost. On by default.",
+      "dependencies": [
+        "boost-optional",
+        "boost-variant"
+      ]
+    }
+  }
 }
diff --git a/external_imported/vcpkg/ports/stormlib/vcpkg.json b/external_imported/vcpkg/ports/stormlib/vcpkg.json
index 1b6a60a67..2727c3b6c 100644
--- a/external_imported/vcpkg/ports/stormlib/vcpkg.json
+++ b/external_imported/vcpkg/ports/stormlib/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "stormlib",
-  "version-string": "2019-05-10",
-  "port-version": 4,
+  "version-date": "2019-05-10",
+  "port-version": 5,
   "description": "StormLib is a library for opening and manipulating Blizzard MPQ files",
   "dependencies": [
     "bzip2",
diff --git a/external_imported/vcpkg/ports/strict-variant/vcpkg.json b/external_imported/vcpkg/ports/strict-variant/vcpkg.json
index f95e19258..afcf6d20c 100644
--- a/external_imported/vcpkg/ports/strict-variant/vcpkg.json
+++ b/external_imported/vcpkg/ports/strict-variant/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "strict-variant",
-  "version-string": "0.5",
-  "port-version": 1,
+  "version": "0.5",
+  "port-version": 2,
   "description": "Tagged union implementation that will never throw an exception or make a dynamic allocation in the effort of supporting types that have throwing moves."
 }
diff --git a/external_imported/vcpkg/ports/string-theory/portfile.cmake b/external_imported/vcpkg/ports/string-theory/portfile.cmake
index 3277af3a9..6cf306ad6 100644
--- a/external_imported/vcpkg/ports/string-theory/portfile.cmake
+++ b/external_imported/vcpkg/ports/string-theory/portfile.cmake
@@ -1,13 +1,15 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO zrax/string_theory
-    REF 3.6
-    SHA512 2bbd8e6c5c2501cc9616ee6a77b60a7cac5e7c9fa58d6616f6ba39cfdee33dc1b072c5d1b34bd2f88726fb4d65d32032595be7a67854a2e894eb3d81d4a8eea9
+    REF "${VERSION}"
+    SHA512 5071fb091dd5b5279776c2949b2bff7033c6bce336b1b4916e04957228884104b07e64ff3aa248b6498889fd50947c1fa7807e5d07a74c60203ffd1aade4a5a4
     HEAD_REF master
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DST_BUILD_TESTS=OFF
 )
 
 vcpkg_cmake_install()
@@ -16,4 +18,4 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME string_theory CONFIG_PATH lib/cmake/string
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
 
-configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/string-theory/vcpkg.json b/external_imported/vcpkg/ports/string-theory/vcpkg.json
index ba3752a62..95880ba7a 100644
--- a/external_imported/vcpkg/ports/string-theory/vcpkg.json
+++ b/external_imported/vcpkg/ports/string-theory/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "string-theory",
-  "version": "3.6",
+  "version": "3.8",
   "description": "Flexible modern C++ string library with type-safe formatting.",
   "homepage": "https://github.com/zrax/string_theory",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/strong-type/portfile.cmake b/external_imported/vcpkg/ports/strong-type/portfile.cmake
index 9fd63f0ca..a89cce255 100644
--- a/external_imported/vcpkg/ports/strong-type/portfile.cmake
+++ b/external_imported/vcpkg/ports/strong-type/portfile.cmake
@@ -1,7 +1,7 @@
 vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH
     REPO "rollbear/strong_type"
-    REF "v8"
-    SHA512 "d9bd43c090aac6d36183f70f6cc066484357e997b1b2081114ecb459f80cd990ad31c9141948bf2a9d12ac504da77331a470f2f0eaadc57fbfc9bec6c4de6464"
+    REF "v${VERSION}"
+    SHA512 "ad8302b3c22404f4a12ae49fd1099ad89d1a66f6354b5e751149ce9f739466a279493931b338f9e933817782d58c795cb43afb47af7f9a214212bf85ba7c6235"
 )
 
 vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}")
@@ -9,4 +9,4 @@ vcpkg_cmake_install()
 
 vcpkg_cmake_config_fixup(PACKAGE_NAME "strong_type" CONFIG_PATH "lib/cmake/strong_type")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib")
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/strong-type/vcpkg.json b/external_imported/vcpkg/ports/strong-type/vcpkg.json
index 3051a2b18..c3ed8abdd 100644
--- a/external_imported/vcpkg/ports/strong-type/vcpkg.json
+++ b/external_imported/vcpkg/ports/strong-type/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "strong-type",
-  "version": "8",
+  "version": "12",
   "description": "An additive strong typedef library for C++14/17/20",
   "homepage": "https://github.com/rollbear/strong_type",
   "license": "BSL-1.0",
diff --git a/external_imported/vcpkg/ports/strtk/portfile.cmake b/external_imported/vcpkg/ports/strtk/portfile.cmake
index 770f183c0..b48ea0bae 100644
--- a/external_imported/vcpkg/ports/strtk/portfile.cmake
+++ b/external_imported/vcpkg/ports/strtk/portfile.cmake
@@ -5,5 +5,11 @@ vcpkg_from_github(
     SHA512 c37c0df1dd3f7bc1dfcceea83ed9303cf9388ba400ee645f26a24bca50bf85209f7b8a2169f6b98b0267ece986a29a27605ff3eaef50a44629fb7e042d06f26a
 )
 
-file(COPY ${SOURCE_PATH}/strtk.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/strtk)
+file(COPY "${SOURCE_PATH}/strtk.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+
+if("boost" IN_LIST FEATURES)
+else()
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/strtk.hpp" "#ifndef strtk_no_tr1_or_boost" "#if 0")
+endif()
+
+vcpkg_install_copyright(FILE_LIST "${CMAKE_CURRENT_LIST_DIR}/copyright")
diff --git a/external_imported/vcpkg/ports/strtk/vcpkg.json b/external_imported/vcpkg/ports/strtk/vcpkg.json
index 41a303b37..9ab9c956c 100644
--- a/external_imported/vcpkg/ports/strtk/vcpkg.json
+++ b/external_imported/vcpkg/ports/strtk/vcpkg.json
@@ -1,10 +1,16 @@
 {
   "name": "strtk",
-  "version-string": "2020-09-14",
-  "port-version": 1,
+  "version-date": "2020-09-14",
+  "port-version": 3,
   "description": "robust, optimized and portable string processing algorithms for the C++ language",
   "homepage": "https://github.com/ArashPartow/strtk",
-  "dependencies": [
-    "boost"
-  ]
+  "license": null,
+  "features": {
+    "boost": {
+      "description": "Request boost libraries",
+      "dependencies": [
+        "boost"
+      ]
+    }
+  }
 }
diff --git a/external_imported/vcpkg/ports/stxxl/vcpkg.json b/external_imported/vcpkg/ports/stxxl/vcpkg.json
index dce4ff0ed..6e801f771 100644
--- a/external_imported/vcpkg/ports/stxxl/vcpkg.json
+++ b/external_imported/vcpkg/ports/stxxl/vcpkg.json
@@ -1,8 +1,9 @@
 {
   "name": "stxxl",
   "version-date": "2018-11-15",
-  "port-version": 6,
+  "port-version": 7,
   "description": "Standard Template Library for Extra Large Data Sets",
+  "supports": "!uwp",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/superlu/portfile.cmake b/external_imported/vcpkg/ports/superlu/portfile.cmake
index a12ecf107..0cf6056ba 100644
--- a/external_imported/vcpkg/ports/superlu/portfile.cmake
+++ b/external_imported/vcpkg/ports/superlu/portfile.cmake
@@ -6,10 +6,11 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO xiaoyeli/superlu
     REF "v${VERSION}"
-    SHA512 1461b52bc18a8b0345beb70fdd46e07df497a13be840bcc061158ea1d0e61c8745806d1ad21cb2723db80f5ed762c3741f9c0ded2b2013df46da0e8bb6b77b83
+    SHA512 8feeb08404cad58724f0f6478bc785b56d8c725b549f1fdc07d3578c4e14bdbdbd8bcda1cdfd366a39417eda60765825e87cf781c68e6723a8246cb357b41439
     HEAD_REF master
     PATCHES
         remove-make.inc.patch
+        superfluous-configure.patch
 )
 
 vcpkg_cmake_configure(
diff --git a/external_imported/vcpkg/ports/superlu/superfluous-configure.patch b/external_imported/vcpkg/ports/superlu/superfluous-configure.patch
new file mode 100644
index 000000000..09b974be1
--- /dev/null
+++ b/external_imported/vcpkg/ports/superlu/superfluous-configure.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d733990..11f429a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -230,7 +230,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/superlu.pc
+ 	DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ 	
+ configure_file(${SuperLU_SOURCE_DIR}/SRC/superlu_config.h.in ${SuperLU_BINARY_DIR}/SRC/superlu_config.h)
+-configure_file(${SuperLU_SOURCE_DIR}/SRC/superlu_config.h.in ${SuperLU_SOURCE_DIR}/SRC/superlu_config.h)
+ 
+ # Following is to configure a header file for FORTRAN code
+ configure_file(${SuperLU_SOURCE_DIR}/SRC/superlu_config.h.in ${SuperLU_BINARY_DIR}/FORTRAN/superlu_config.h)
diff --git a/external_imported/vcpkg/ports/superlu/vcpkg.json b/external_imported/vcpkg/ports/superlu/vcpkg.json
index 0fab3f8db..a9d521ae3 100644
--- a/external_imported/vcpkg/ports/superlu/vcpkg.json
+++ b/external_imported/vcpkg/ports/superlu/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "superlu",
-  "version": "5.3.0",
-  "port-version": 1,
+  "version": "6.0.0",
   "description": "Supernodal sparse direct solver.",
   "homepage": "https://github.com/xiaoyeli/superlu",
   "license": "BSD-3-Clause-LBNL",
diff --git a/external_imported/vcpkg/ports/swenson-sort/portfile.cmake b/external_imported/vcpkg/ports/swenson-sort/portfile.cmake
new file mode 100644
index 000000000..b3af3d83e
--- /dev/null
+++ b/external_imported/vcpkg/ports/swenson-sort/portfile.cmake
@@ -0,0 +1,12 @@
+# header-only library, no build
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO swenson/sort
+    REF 5820a8094e4a2ae1c88ac8f8df7735c332ee62ff # accessed on 2023-06-26
+    SHA512 fbe89ba5c5531f46250e2b8128ea5f1d7bac642a590a2f6e5f2cc3befa61f175b8f1fc28317377cde50357e8947ddc7ba8e0751437cf2c9fb91b7469511be15a
+    FILE_DISAMBIGUATOR 2
+    HEAD_REF master
+)
+
+file(INSTALL "${SOURCE_PATH}/sort.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
diff --git a/external_imported/vcpkg/ports/swenson-sort/vcpkg.json b/external_imported/vcpkg/ports/swenson-sort/vcpkg.json
new file mode 100644
index 000000000..2f27a90f5
--- /dev/null
+++ b/external_imported/vcpkg/ports/swenson-sort/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "swenson-sort",
+  "version-date": "2021-05-22",
+  "description": "sort.h is an implementation of a ton of sorting algorithms in C with a user-defined type that is provided at include time.",
+  "homepage": "https://github.com/swenson/sort",
+  "license": "MIT"
+}
diff --git a/external_imported/vcpkg/ports/symengine/portfile.cmake b/external_imported/vcpkg/ports/symengine/portfile.cmake
index dc0329930..152d5884e 100644
--- a/external_imported/vcpkg/ports/symengine/portfile.cmake
+++ b/external_imported/vcpkg/ports/symengine/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO symengine/symengine
-    REF 7b1880824c2cce98787ae29a317682ba6c294484 #v0.9.0
-    SHA512 745b2616b88032ff047a28e46b703bc1912d109524f8aa411a5b7a650a6d89d3f16dc92812381e95b13bc5cf61218d2ff3db9d3809443264340eae180968cbcf
+    REF "v${VERSION}"
+    SHA512 076aac35428589c5b3524a46bd939a3a3a7da44b1c866b5f71487678b27b6e48b4da034029f1630881d7713a9252e905411a04b8016c9ec56a608b6de23365ac
     HEAD_REF master
 )
 
@@ -13,15 +13,10 @@ vcpkg_check_features(
         flint WITH_FLINT 
         mpfr WITH_MPFR
         tcmalloc WITH_TCMALLOC
+        llvm WITH_LLVM
 )
 
-if(integer-class-boostmp IN_LIST FEATURES)
-    set(INTEGER_CLASS boostmp)
-
-    if(integer-class-flint IN_LIST FEATURES)
-        message(WARNING "Both boostmp and flint are given for integer class, will use boostmp only.")
-    endif()
-elseif(integer-class-flint IN_LIST FEATURES)
+if(integer-class-flint IN_LIST FEATURES)
     set(INTEGER_CLASS flint)
 endif()
 
@@ -30,8 +25,6 @@ if(VCPKG_TARGET_IS_UWP)
     set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE")
 endif()
 
-string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" MSVC_USE_MT)
-
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
@@ -39,10 +32,10 @@ vcpkg_cmake_configure(
         -DBUILD_BENCHMARKS=no
         -DBUILD_TESTS=no
         -DMSVC_WARNING_LEVEL=3
-        -DMSVC_USE_MT=${MSVC_USE_MT}
+        -DMSVC_USE_MT=no
         -DWITH_SYMENGINE_RCP=yes
         -DWITH_SYMENGINE_TEUCHOS=no
-        -DINTEGER_CLASS=${INTEGER_CLASS}
+        -DWITH_SYMENGINE_THREAD_SAFE=yes
         ${FEATURE_OPTIONS}
 )
 
@@ -65,4 +58,4 @@ vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/symengine/SymEngineConfig.cm
     [[${SYMENGINE_CMAKE_DIR}/../../include]]
 )
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/symengine/vcpkg.json b/external_imported/vcpkg/ports/symengine/vcpkg.json
index 825797818..5fcc27122 100644
--- a/external_imported/vcpkg/ports/symengine/vcpkg.json
+++ b/external_imported/vcpkg/ports/symengine/vcpkg.json
@@ -1,12 +1,20 @@
 {
   "name": "symengine",
-  "version": "0.9.0",
+  "version": "0.11.1",
   "description": "SymEngine is a fast symbolic manipulation library",
   "homepage": "https://github.com/symengine/symengine",
   "license": "BSD-3-Clause",
+  "supports": "!uwp",
   "dependencies": [
     "boost-math",
     "boost-random",
+    {
+      "name": "symengine",
+      "default-features": false,
+      "features": [
+        "integer-class-flint"
+      ]
+    },
     {
       "name": "vcpkg-cmake",
       "host": true
@@ -17,7 +25,9 @@
     }
   ],
   "default-features": [
-    "integer-class-boostmp"
+    "arb",
+    "llvm",
+    "mpfr"
   ],
   "features": {
     "arb": {
@@ -32,17 +42,19 @@
         "flint"
       ]
     },
-    "integer-class-boostmp": {
-      "description": "Use Boost.multiprecision integer class",
+    "integer-class-flint": {
+      "description": "Use flint integer class",
       "dependencies": [
-        "boost-multiprecision"
+        "flint"
       ]
     },
-    "integer-class-flint": {
-      "description": "Use flint integer class",
+    "llvm": {
+      "description": "Build with LLVM",
       "dependencies": [
-        "flint",
-        "gmp"
+        {
+          "name": "llvm",
+          "default-features": false
+        }
       ]
     },
     "mpfr": {
diff --git a/external_imported/vcpkg/ports/systemc/vcpkg.json b/external_imported/vcpkg/ports/systemc/vcpkg.json
index d41c5dec8..86fc788bf 100644
--- a/external_imported/vcpkg/ports/systemc/vcpkg.json
+++ b/external_imported/vcpkg/ports/systemc/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "systemc",
-  "version-string": "2.3.3",
-  "port-version": 7,
+  "version": "2.3.3",
+  "port-version": 8,
   "description": "A set of C++ classes and macros which provide an event-driven simulation kernel in C++",
   "dependencies": [
     {
diff --git a/external_imported/vcpkg/ports/szip/portfile.cmake b/external_imported/vcpkg/ports/szip/portfile.cmake
index 9df8aadd7..119825480 100644
--- a/external_imported/vcpkg/ports/szip/portfile.cmake
+++ b/external_imported/vcpkg/ports/szip/portfile.cmake
@@ -5,16 +5,16 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 ada6406efb096cd8a2daf8f9217fe9111a96dcae87e29d1c31f58ddd2ad2aa7bac03f23c7205dc9360f3b62d259461759330c7189ef0c2fe559704b1ea9d40dd
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
-    REF "szip-${SZIP_VERSION}"
+    SOURCE_BASE "szip-${SZIP_VERSION}"
     PATCHES
         fix-linkage-config.patch
         mingw-lib-names.patch
 )
 
-if (VCPKG_TARGET_IS_IOS OR VCPKG_TARGET_IS_OSX)
+if (VCPKG_TARGET_IS_ANDROID OR VCPKG_TARGET_IS_IOS OR VCPKG_TARGET_IS_OSX)
     # when cross-compiling, try_run will not work.
     # LFS "large file support" is keyed on 
     # 1) 64-bit off_t (https://developer.apple.com/library/archive/documentation/Darwin/Conceptual/64bitPorting/transition/transition.html table 2-1)
@@ -22,6 +22,8 @@ if (VCPKG_TARGET_IS_IOS OR VCPKG_TARGET_IS_OSX)
     set(extra_opts 
         -DTEST_LFS_WORKS_RUN=TRUE
         -DTEST_LFS_WORKS_RUN__TRYRUN_OUTPUT=""
+        -DHAVE_DEFAULT_SOURCE_RUN=0
+        -DHAVE_DEFAULT_SOURCE_RUN__TRYRUN_OUTPUT=""
     )
 endif()
 
diff --git a/external_imported/vcpkg/ports/szip/vcpkg.json b/external_imported/vcpkg/ports/szip/vcpkg.json
index f0f879ea4..46a492bb3 100644
--- a/external_imported/vcpkg/ports/szip/vcpkg.json
+++ b/external_imported/vcpkg/ports/szip/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "szip",
   "version": "2.1.1",
-  "port-version": 10,
+  "port-version": 12,
   "description": "Szip compression software, providing lossless compression of scientific data",
   "homepage": "https://support.hdfgroup.org/ftp/lib-external/szip",
   "license": null,
diff --git a/external_imported/vcpkg/ports/tabulate/portfile.cmake b/external_imported/vcpkg/ports/tabulate/portfile.cmake
index fcc880a05..6f97e54e8 100644
--- a/external_imported/vcpkg/ports/tabulate/portfile.cmake
+++ b/external_imported/vcpkg/ports/tabulate/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO p-ranav/tabulate
-    REF v1.4
-    SHA512 37d69d53f1c628955f2a35779dbf3053c5b449f7069d846b697b541df1719b00e9b72e9d6de361d9733b7e7543c25e444b1aa139f72000730eeeafa022bbf3c1
+    REF v1.5
+    SHA512 324c9f2427d4d0e568b63fcd7bd81f4eee6743d7106af5ead134f81d637f190f77122f28cc42b9e95f7782f5058492b1903eadb44e1c3061a636b32bb93d0ed2
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/tabulate/vcpkg.json b/external_imported/vcpkg/ports/tabulate/vcpkg.json
index 351a98db9..d88fefb59 100644
--- a/external_imported/vcpkg/ports/tabulate/vcpkg.json
+++ b/external_imported/vcpkg/ports/tabulate/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "tabulate",
-  "version": "1.4",
+  "version": "1.5",
   "description": "Table maker for modern C++",
   "homepage": "https://github.com/p-ranav/tabulate",
   "license": "MIT AND BSL-1.0 AND BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/tacopie/fix-mingw-build.patch b/external_imported/vcpkg/ports/tacopie/fix-mingw-build.patch
new file mode 100644
index 000000000..a7b5bd4ec
--- /dev/null
+++ b/external_imported/vcpkg/ports/tacopie/fix-mingw-build.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -44,7 +44,7 @@ project(${PROJECT} CXX)
+ ###
+ # compilation options
+ ###
+-IF (WIN32)
++IF (MSVC)
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3 /O2 /bigobj")
+
+   # was causing conflics with gtest build
diff --git a/external_imported/vcpkg/ports/tacopie/portfile.cmake b/external_imported/vcpkg/ports/tacopie/portfile.cmake
index 6a6c4a625..1dc967365 100644
--- a/external_imported/vcpkg/ports/tacopie/portfile.cmake
+++ b/external_imported/vcpkg/ports/tacopie/portfile.cmake
@@ -9,6 +9,7 @@ vcpkg_from_github(
     PATCHES
         fix-cmakelists.patch
         fix-export.patch
+        fix-mingw-build.patch
 )
 
 if(VCPKG_CRT_LINKAGE STREQUAL dynamic)
diff --git a/external_imported/vcpkg/ports/tacopie/vcpkg.json b/external_imported/vcpkg/ports/tacopie/vcpkg.json
index 06b6fd1e6..6dc38391a 100644
--- a/external_imported/vcpkg/ports/tacopie/vcpkg.json
+++ b/external_imported/vcpkg/ports/tacopie/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "tacopie",
-  "version-string": "3.2.0",
-  "port-version": 4,
+  "version": "3.2.0",
+  "port-version": 6,
   "description": "Tacopie is a TCP Client & Server C++11 library",
   "homepage": "https://github.com/cpp-redis/tacopie",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/taglib/portfile.cmake b/external_imported/vcpkg/ports/taglib/portfile.cmake
index fc7236f5a..0a0a501d5 100644
--- a/external_imported/vcpkg/ports/taglib/portfile.cmake
+++ b/external_imported/vcpkg/ports/taglib/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO taglib/taglib
-    REF v1.13
-    SHA512 b6e3253d158b41173073c0da1915f5e4a3de947db918660817cb1c755fba7e3723ea1a335fbbc30b0dcf942348a471b493fe2ce1d52d1a808578edee14e1bfc7
+    REF v1.13.1
+    SHA512 986231ee62caa975afead7e94630d58acaac25a38bc33d4493d51bd635d79336e81bba60586d7355ebc0670e31f28d32da3ecceaf33292e4bc240c64bf00f35b
     HEAD_REF master
 )
 
@@ -47,3 +47,4 @@ vcpkg_copy_pdbs()
 file(COPY "${SOURCE_PATH}/COPYING.LGPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/taglib")
 file(COPY "${SOURCE_PATH}/COPYING.MPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/taglib")
 file(RENAME "${CURRENT_PACKAGES_DIR}/share/taglib/COPYING.LGPL" "${CURRENT_PACKAGES_DIR}/share/taglib/copyright")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/taglib/usage b/external_imported/vcpkg/ports/taglib/usage
new file mode 100644
index 000000000..09f466f8d
--- /dev/null
+++ b/external_imported/vcpkg/ports/taglib/usage
@@ -0,0 +1,11 @@
+The taglib package provides pkg-config files:
+
+    find_package(PkgConfig)
+
+    # For taglib
+    pkg_check_modules(TAGLIB REQUIRED IMPORTED_TARGET taglib)
+    target_link_libraries(main PRIVATE PkgConfig::TAGLIB)
+
+    # For C bindings
+    pkg_check_modules(TAGLIB_C REQUIRED IMPORTED_TARGET taglib_c)
+    target_link_libraries(main PRIVATE PkgConfig::TAGLIB_C)
diff --git a/external_imported/vcpkg/ports/taglib/vcpkg.json b/external_imported/vcpkg/ports/taglib/vcpkg.json
index 9f477c148..1b890327e 100644
--- a/external_imported/vcpkg/ports/taglib/vcpkg.json
+++ b/external_imported/vcpkg/ports/taglib/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "taglib",
-  "version-semver": "1.13.0",
+  "version-semver": "1.13.1",
   "port-version": 1,
   "description": "TagLib Audio Meta-Data Library",
   "homepage": "https://taglib.org/",
diff --git a/external_imported/vcpkg/ports/talib/portfile.cmake b/external_imported/vcpkg/ports/talib/portfile.cmake
new file mode 100644
index 000000000..f8218aa2b
--- /dev/null
+++ b/external_imported/vcpkg/ports/talib/portfile.cmake
@@ -0,0 +1,82 @@
+vcpkg_from_sourceforge(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO "ta-lib/ta-lib"
+    REF "${VERSION}"
+    FILENAME "ta-lib-${VERSION}-msvc.zip"
+    SHA512 5f211327b6a1d4f00d0a2b9e276adadd118d7aa29fc87c6771d550fda124a863b4a20e3803f325f7c903c82ea12bfb23121a5f0566eeaa434e0f107a6eedb737
+)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
+    set(LFLAG "d")
+else()
+    set(LFLAG "m")
+endif()
+
+# Debug build
+if (NOT VCPKG_BUILD_TYPE)
+    vcpkg_execute_build_process(
+        COMMAND nmake -f Makefile
+        WORKING_DIRECTORY "${SOURCE_PATH}/c/make/c${LFLAG}d/win32/msvc"
+        LOGNAME build-${TARGET_TRIPLET}-dbg
+    )
+
+    file(
+        INSTALL "${SOURCE_PATH}/c/lib/ta_abstract_c${LFLAG}d.lib"
+        DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
+        RENAME ta_abstract.lib
+    )
+    file(
+        INSTALL "${SOURCE_PATH}/c/lib/ta_libc_c${LFLAG}d.lib"
+        DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
+        RENAME ta_libc.lib
+    )
+    file(
+        INSTALL "${SOURCE_PATH}/c/lib/ta_func_c${LFLAG}d.lib"
+        DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
+        RENAME ta_func.lib
+    )
+    file(
+        INSTALL "${SOURCE_PATH}/c/lib/ta_common_c${LFLAG}d.lib"
+        DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
+        RENAME ta_common.lib
+    )
+endif()
+
+# Release build
+vcpkg_execute_build_process(
+    COMMAND nmake -f Makefile
+    WORKING_DIRECTORY "${SOURCE_PATH}/c/make/c${LFLAG}r/win32/msvc"
+    LOGNAME build-${TARGET_TRIPLET}-rel
+)
+
+file(
+    INSTALL "${SOURCE_PATH}/c/lib/ta_abstract_c${LFLAG}r.lib"
+    DESTINATION ${CURRENT_PACKAGES_DIR}/lib
+    RENAME ta_abstract.lib
+)
+file(
+    INSTALL "${SOURCE_PATH}/c/lib/ta_libc_c${LFLAG}r.lib"
+    DESTINATION ${CURRENT_PACKAGES_DIR}/lib
+    RENAME ta_libc.lib
+)
+file(
+    INSTALL "${SOURCE_PATH}/c/lib/ta_func_c${LFLAG}r.lib"
+    DESTINATION ${CURRENT_PACKAGES_DIR}/lib
+    RENAME ta_func.lib
+)
+file(
+    INSTALL "${SOURCE_PATH}/c/lib/ta_common_c${LFLAG}r.lib"
+    DESTINATION ${CURRENT_PACKAGES_DIR}/lib
+    RENAME ta_common.lib
+)
+
+# Include files
+file(
+    INSTALL "${SOURCE_PATH}/c/include"
+    DESTINATION ${CURRENT_PACKAGES_DIR}
+    PATTERN Makefile.* EXCLUDE
+)
+
+# License file
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.TXT")
diff --git a/external_imported/vcpkg/ports/talib/vcpkg.json b/external_imported/vcpkg/ports/talib/vcpkg.json
new file mode 100644
index 000000000..0dc503d9a
--- /dev/null
+++ b/external_imported/vcpkg/ports/talib/vcpkg.json
@@ -0,0 +1,15 @@
+{
+  "name": "talib",
+  "version-semver": "0.4.0",
+  "port-version": 1,
+  "description": "TA-Lib - Technical Analysis Library",
+  "homepage": "https://ta-lib.github.io/",
+  "license": "BSD-2-Clause",
+  "supports": "windows & !uwp",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/taocpp-json/vcpkg.json b/external_imported/vcpkg/ports/taocpp-json/vcpkg.json
index 28682b316..980575f02 100644
--- a/external_imported/vcpkg/ports/taocpp-json/vcpkg.json
+++ b/external_imported/vcpkg/ports/taocpp-json/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "taocpp-json",
-  "version-string": "2020-09-14",
-  "port-version": 2,
+  "version-date": "2020-09-14",
+  "port-version": 3,
   "description": "C++ header-only JSON library",
   "dependencies": [
     {
diff --git a/external_imported/vcpkg/ports/tap-windows6/vcpkg.json b/external_imported/vcpkg/ports/tap-windows6/vcpkg.json
index 777db703c..4a234c4bc 100644
--- a/external_imported/vcpkg/ports/tap-windows6/vcpkg.json
+++ b/external_imported/vcpkg/ports/tap-windows6/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "tap-windows6",
-  "version-string": "9.21.2-0e30f5c",
-  "port-version": 1,
+  "version": "9.21.2-0e30f5c",
+  "port-version": 2,
   "description": "an NDIS 6 implementation of the TAP-Windows driver, used by OpenVPN and other apps. Note: This package only contains the headers for the driver."
 }
diff --git a/external_imported/vcpkg/ports/task-thread-pool/portfile.cmake b/external_imported/vcpkg/ports/task-thread-pool/portfile.cmake
new file mode 100644
index 000000000..f3476542c
--- /dev/null
+++ b/external_imported/vcpkg/ports/task-thread-pool/portfile.cmake
@@ -0,0 +1,13 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO alugowski/task-thread-pool
+    REF v${VERSION}
+    SHA512 8f67e4d467c16bd0986f4fbfda6e7ca74760ddf3c4333660c764c97df0a21a40f36dc5af11c47f41e1cc0eb9c498ff2ca7b93a11a32dea296181592f5a05fd1d
+    HEAD_REF main
+)
+
+file(GLOB HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/include/*.hpp")
+
+file(INSTALL ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE-BSD.txt" "${SOURCE_PATH}/LICENSE-Boost.txt" "${SOURCE_PATH}/LICENSE-MIT.txt")
diff --git a/external_imported/vcpkg/ports/task-thread-pool/vcpkg.json b/external_imported/vcpkg/ports/task-thread-pool/vcpkg.json
new file mode 100644
index 000000000..b5cc94e86
--- /dev/null
+++ b/external_imported/vcpkg/ports/task-thread-pool/vcpkg.json
@@ -0,0 +1,8 @@
+{
+  "name": "task-thread-pool",
+  "version": "1.0.7",
+  "description": "Fast and lightweight thread pool for C++11 and newer.",
+  "homepage": "https://github.com/alugowski/task-thread-pool",
+  "documentation": "https://github.com/alugowski/task-thread-pool/blob/main/README.md",
+  "license": "BSD-2-Clause OR MIT OR BSL-1.0"
+}
diff --git a/external_imported/vcpkg/ports/taskflow/portfile.cmake b/external_imported/vcpkg/ports/taskflow/portfile.cmake
index fc38b8588..2455b5db0 100644
--- a/external_imported/vcpkg/ports/taskflow/portfile.cmake
+++ b/external_imported/vcpkg/ports/taskflow/portfile.cmake
@@ -2,8 +2,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO taskflow/taskflow
-    REF v3.5.0
-    SHA512 0e80a96eacce05cb09eb3e75634ba9f27c86d84b56903897e954e04fa68cadc3c2fe69857f8dc60da330c9abd5e4c7e1164f3c5f695ad8bb38a1ccbc001f8652
+    REF "v${VERSION}"
+    SHA512 1bf17b69cdb29b982fc74b9091f5b6c8fc4fd3004b26afe7e73e71569738e492cf8663b71d98cfbc4e240c08ceb8a99bf51cccce95254710722f89929a4bbea8
     HEAD_REF master
 )
 
@@ -25,4 +25,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Taskflow)
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib")
 
 # Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/taskflow/vcpkg.json b/external_imported/vcpkg/ports/taskflow/vcpkg.json
index 05a196997..bc1d04834 100644
--- a/external_imported/vcpkg/ports/taskflow/vcpkg.json
+++ b/external_imported/vcpkg/ports/taskflow/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "taskflow",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "description": "Fast Parallel Tasking Programming Library using Modern C++",
   "homepage": "https://github.com/taskflow/taskflow",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/tbb/portfile.cmake b/external_imported/vcpkg/ports/tbb/portfile.cmake
index c89c4481d..af090a164 100644
--- a/external_imported/vcpkg/ports/tbb/portfile.cmake
+++ b/external_imported/vcpkg/ports/tbb/portfile.cmake
@@ -1,4 +1,3 @@
-vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
 
 set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled)
 
@@ -6,31 +5,39 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO oneapi-src/oneTBB
     REF "v${VERSION}"
-    SHA512 72f68730dfd89409796f9548d3c302111787712089688a7c77092ed1b3a7bf4e7444fe4b58015d2c78b7b71259852526789b2483bf1e71bea8146c4b4676e7b4
+    SHA512 4779141b7602f2fa3a509fdd346824ba270a3a568df3649ce8cb51264d233df5cec5e5cb67b91319dd11d3d5e054697b4ed345e07216107985ddb6e1e7ef94e5
     HEAD_REF onetbb_2021
 )
 
+vcpkg_check_features(
+    OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    INVERTED_FEATURES
+        hwloc TBB_DISABLE_HWLOC_AUTOMATIC_SEARCH)
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
+        ${FEATURE_OPTIONS}
         -DTBB_TEST=OFF
         -DTBB_STRICT=OFF
 )
 
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/TBB")
-vcpkg_fixup_pkgconfig()
 vcpkg_copy_pdbs()
 
-set(arch_suffix "")
-if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
-  set(arch_suffix "32")
-endif()
-
-
 if(NOT VCPKG_BUILD_TYPE)
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/tbb${arch_suffix}.pc" "-ltbb12" "-ltbb12_debug")
+    if(VCPKG_TARGET_ARCHITECTURE MATCHES "^(x86|arm|wasm32)$")
+        set(arch_suffix "32")
+    endif()
+    if(VCPKG_TARGET_IS_WINDOWS)
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/tbb${arch_suffix}.pc" "-ltbb12" "-ltbb12_debug")
+    else()
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/tbb${arch_suffix}.pc" "-ltbb" "-ltbb_debug")
+    endif()
+    unset(arch_suffix)
 endif()
+vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/share/doc"
@@ -47,4 +54,4 @@ include(CMakeFindDependencyMacro)
 find_dependency(Threads)
 ${_contents}")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/external_imported/vcpkg/ports/tbb/vcpkg.json b/external_imported/vcpkg/ports/tbb/vcpkg.json
index 4a591ba63..1849a1799 100644
--- a/external_imported/vcpkg/ports/tbb/vcpkg.json
+++ b/external_imported/vcpkg/ports/tbb/vcpkg.json
@@ -1,10 +1,11 @@
 {
+  "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
   "name": "tbb",
-  "version": "2021.8.0",
+  "version": "2021.11.0",
   "description": "Intel's Threading Building Blocks.",
   "homepage": "https://github.com/oneapi-src/oneTBB",
   "license": "Apache-2.0",
-  "supports": "(windows & !uwp) | linux | osx | ios",
+  "supports": "!uwp",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
@@ -14,5 +15,20 @@
       "name": "vcpkg-cmake-config",
       "host": true
     }
-  ]
+  ],
+  "default-features": [
+    {
+      "name": "hwloc",
+      "platform": "!static & !osx & !uwp"
+    }
+  ],
+  "features": {
+    "hwloc": {
+      "description": "Builds TBB with TBBBind support for Hybrid CPUs or NUMA architectures.",
+      "supports": "!static & !osx & !uwp",
+      "dependencies": [
+        "hwloc"
+      ]
+    }
+  }
 }
diff --git a/external_imported/vcpkg/ports/tcb-span/portfile.cmake b/external_imported/vcpkg/ports/tcb-span/portfile.cmake
index 48edffef3..a8af49d95 100644
--- a/external_imported/vcpkg/ports/tcb-span/portfile.cmake
+++ b/external_imported/vcpkg/ports/tcb-span/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO tcbrindle/span
-    REF 427f6bd0bbf36ad46aec4d8bdd7760beeb10dd33 # master commit 2021-12-15
-    SHA512 c775bd50bc68d98fcde5e99bb9b6594c8ac9ef15fa15efe89c253b4135df77d83e58743d3c7e90d3aff03429251497a7d56d1900f6e258416c0664a82326243c
+    REF 836dc6a0efd9849cb194e88e4aa2387436bb079b # master commit 2022-06-15
+    SHA512 2ab1dfd976c5411231cfe7ec971c37e0d0b321e4470bd9b2b350f79deb4428c112a6244315712724e3953be2be2251ca4f1ac13dcd7e7a5f05898523c45e6686
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/tcb-span/vcpkg.json b/external_imported/vcpkg/ports/tcb-span/vcpkg.json
index 777f195d0..6cf5d9fcb 100644
--- a/external_imported/vcpkg/ports/tcb-span/vcpkg.json
+++ b/external_imported/vcpkg/ports/tcb-span/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "tcb-span",
-  "version-date": "2021-12-15",
+  "version-date": "2022-06-15",
   "description": "Implementation of C++20's std::span for older compilers",
   "homepage": "https://github.com/tcbrindle/span",
   "license": "BSL-1.0"
diff --git a/external_imported/vcpkg/ports/tcl/vcpkg.json b/external_imported/vcpkg/ports/tcl/vcpkg.json
index 513c6a97c..9d9b85d69 100644
--- a/external_imported/vcpkg/ports/tcl/vcpkg.json
+++ b/external_imported/vcpkg/ports/tcl/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "tcl",
   "version-string": "core-9-0-a1",
-  "port-version": 5,
+  "port-version": 6,
   "description": "Tcl provides a powerful platform for creating integration applications that tie together diverse applications, protocols, devices, and frameworks. When paired with the Tk toolkit, Tcl provides the fastest and most powerful way to create GUI applications that run on PCs, Unix, and Mac OS X. Tcl can also be used for a variety of web-related tasks and for creating powerful command languages for applications.",
   "homepage": "https://github.com/tcltk/tcl",
+  "supports": "!android & !(windows & arm) & !uwp",
   "features": {
     "profile": {
       "description": "Adds profiling hooks.  Map file is assumed."
diff --git a/external_imported/vcpkg/ports/teemo/portfile.cmake b/external_imported/vcpkg/ports/teemo/portfile.cmake
deleted file mode 100644
index a6db35396..000000000
--- a/external_imported/vcpkg/ports/teemo/portfile.cmake
+++ /dev/null
@@ -1,38 +0,0 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO winsoft666/teemo
-    REF 03f40f92bfbf3b83dc597a60ba36582505adfa54
-    SHA512 86962883dfe09f90c4892deb0235e4f71fc295fb837e2b33a9bcf240b4f91d0e191157968d28a6ec02dfe3f8cb9a3869c6bb5986b8a0ea96250fce6c27fe1172
-    HEAD_REF master
-)
-
-string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" TEEMO_STATIC)
-string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" USE_STATIC_CRT)
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS
-        -DTEEMO_STATIC:BOOL=${TEEMO_STATIC}
-        -DUSE_STATIC_CRT:BOOL=${USE_STATIC_CRT}
-        -DBUILD_TESTS:BOOL=OFF
-)
-
-vcpkg_cmake_install()
-
-if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/teemo")
-    vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/teemo)
-elseif(EXISTS "${CURRENT_PACKAGES_DIR}/share/teemo")
-    vcpkg_cmake_config_fixup(CONFIG_PATH share/teemo)
-endif()
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-  vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/teemo/teemo.h" "#ifdef TEEMO_STATIC" "#if 1")
-else()
-  vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/teemo/teemo.h" "#ifdef TEEMO_STATIC" "#if 0")
-endif()
-
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-
-vcpkg_copy_pdbs()
diff --git a/external_imported/vcpkg/ports/teemo/vcpkg.json b/external_imported/vcpkg/ports/teemo/vcpkg.json
deleted file mode 100644
index c4428ccf1..000000000
--- a/external_imported/vcpkg/ports/teemo/vcpkg.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "name": "teemo",
-  "version": "2.7",
-  "maintainers": "winsoft666 <winsoft666@outlook.com>",
-  "description": "C++ File Download Library, support Multithreading, Breakpoint Transmission, Speed Limit, Real-time Speed.",
-  "homepage": "https://github.com/winsoft666/teemo",
-  "supports": "!osx & !uwp & !arm",
-  "dependencies": [
-    {
-      "name": "curl",
-      "default-features": false
-    },
-    {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
-    }
-  ]
-}
diff --git a/external_imported/vcpkg/ports/telnetpp/vcpkg.json b/external_imported/vcpkg/ports/telnetpp/vcpkg.json
index 1eb1cd72e..2d713af60 100644
--- a/external_imported/vcpkg/ports/telnetpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/telnetpp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "telnetpp",
-  "version-string": "2.1.2",
-  "port-version": 2,
+  "version": "2.1.2",
+  "port-version": 3,
   "description": "Telnet++ is an implementation of the Telnet Session Layer protocol using C++14",
   "homepage": "https://github.com/KazDragon/telnetpp",
   "supports": "!uwp",
diff --git a/external_imported/vcpkg/ports/tensorpipe/portfile.cmake b/external_imported/vcpkg/ports/tensorpipe/portfile.cmake
index e9c57002a..290d97d62 100644
--- a/external_imported/vcpkg/ports/tensorpipe/portfile.cmake
+++ b/external_imported/vcpkg/ports/tensorpipe/portfile.cmake
@@ -1,11 +1,5 @@
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
-vcpkg_download_distfile(INSTALL_PACKAGE_CONFIG_PATCH
-    URLS "https://patch-diff.githubusercontent.com/raw/pytorch/tensorpipe/pull/435.diff"
-    FILENAME tensorpipe-pr-435.patch
-    SHA512 7bcf604a967da36b8af936f8b8ab87b442834024b0b2cb886811c15e80893be842fbee2667bbbc39886814ec9b2f4ed0c2527de51fdb7dc293b25cce515f5e4b
-)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO pytorch/tensorpipe
@@ -13,6 +7,7 @@ vcpkg_from_github(
     SHA512 1e5faf17a7236c5506c08cb28be16069b11bb929bbca64ed9745ce4277d46739186ab7d6597da7437d90ed2d166d4c37ef2f3bceabe8083ef3adbb0e8e5f227e
     PATCHES
         "${INSTALL_PACKAGE_CONFIG_PATCH}"
+        support-find-package.patch
         use-vcpkg.patch
         support-test.patch
 )
@@ -45,9 +40,9 @@ vcpkg_cmake_configure(
 )
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
-vcpkg_cmake_config_fixup(CONFIG_PATH "share/cmake/Tensorpipe" PACKAGE_NAME "Tensorpipe")
+vcpkg_cmake_config_fixup(CONFIG_PATH "share/cmake/unofficial-tensorpipe" PACKAGE_NAME "unofficial-tensorpipe")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include"
                     "${CURRENT_PACKAGES_DIR}/debug/share"
 )
diff --git a/external_imported/vcpkg/ports/tensorpipe/support-find-package.patch b/external_imported/vcpkg/ports/tensorpipe/support-find-package.patch
new file mode 100644
index 000000000..85278a26a
--- /dev/null
+++ b/external_imported/vcpkg/ports/tensorpipe/support-find-package.patch
@@ -0,0 +1,58 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 77df76d..bebb8c8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,5 +24,17 @@ include(MiscCheck)
+ add_subdirectory(tensorpipe)
+ 
+ install(EXPORT TensorpipeTargets
+-        DESTINATION share/cmake/Tensorpipe
+-        FILE TensorpipeTargets.cmake)
++        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake/unofficial-tensorpipe
++        NAMESPACE unofficial::tensorpipe::
++        FILE unofficial-tensorpipe-targets.cmake)
++
++# Create TensorpipeConfig.cmake for find_package(unofficial-tensorpipe CONFIG)
++include(CMakePackageConfigHelpers)
++get_filename_component(CONFIG_FILE_PATH ${CMAKE_CURRENT_BINARY_DIR}/unofficial-tensorpipe-config.cmake ABSOLUTE)
++configure_package_config_file(
++  cmake/unofficial-tensorpipe-config.cmake.in ${CONFIG_FILE_PATH}
++  INSTALL_DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake/unofficial-tensorpipe)
++
++# Install the generated config file
++install(FILES ${CONFIG_FILE_PATH}
++        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake/unofficial-tensorpipe)
+diff --git a/cmake/unofficial-tensorpipe-config.cmake.in b/cmake/unofficial-tensorpipe-config.cmake.in
+new file mode 100644
+index 000000000..f2ea8ce47
+--- /dev/null
++++ b/cmake/unofficial-tensorpipe-config.cmake.in
+@@ -0,0 +1,15 @@
++@PACKAGE_INIT@
++include(CMakeFindDependencyMacro)
++
++find_dependency(libuv REQUIRED)
++
++get_filename_component(_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
++file(GLOB CONFIG_FILES "${_DIR}/unofficial-tensorpipe-config-*.cmake")
++foreach(f ${CONFIG_FILES})
++  include(${f})
++endforeach()
++
++# import targets 
++include("${_DIR}/unofficial-tensorpipe-targets.cmake")
++
++check_required_components(@PROJECT_NAME@)
+diff --git a/tensorpipe/python/CMakeLists.txt b/tensorpipe/python/CMakeLists.txt
+index ce494722f..b722381f8 100644
+--- a/tensorpipe/python/CMakeLists.txt
++++ b/tensorpipe/python/CMakeLists.txt
+@@ -14,3 +14,8 @@ endif()
+ set(PYBIND11_CPP_STANDARD -std=c++14)
+ pybind11_add_module(pytensorpipe tensorpipe.cc)
+ target_link_libraries(pytensorpipe PRIVATE tensorpipe)
++
++install(TARGETS pytensorpipe
++        EXPORT TensorpipeTargets
++        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/external_imported/vcpkg/ports/tensorpipe/support-test.patch b/external_imported/vcpkg/ports/tensorpipe/support-test.patch
index af1280485..107e9166b 100644
--- a/external_imported/vcpkg/ports/tensorpipe/support-test.patch
+++ b/external_imported/vcpkg/ports/tensorpipe/support-test.patch
@@ -1,8 +1,8 @@
 diff --git a/tensorpipe/test/CMakeLists.txt b/tensorpipe/test/CMakeLists.txt
-index 53e8643..c49ada6 100644
+index 53e8643..09baaa0 100644
 --- a/tensorpipe/test/CMakeLists.txt
 +++ b/tensorpipe/test/CMakeLists.txt
-@@ -93,25 +93,24 @@ if(TP_USE_CUDA)
+@@ -93,25 +93,30 @@ if(TP_USE_CUDA)
        channel/cuda_ipc/cuda_ipc_test.cc
        )
    endif()
@@ -25,13 +25,19 @@ index 53e8643..c49ada6 100644
 -add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/googletest
 -  ${PROJECT_BINARY_DIR}/third_party/googletest EXCLUDE_FROM_ALL)
 +find_package(GTest CONFIG REQUIRED)
++
++if (TARGET libuv::uv)
++    set(LIBUV_LIBRARY libuv::uv)
++else()
++    set(LIBUV_LIBRARY libuv::uv_a)
++endif()
  
  list(APPEND TP_TEST_LINK_LIBRARIES
    tensorpipe
 -  uv::uv
 -  gmock
 -  gtest_main)
-+  unofficial::libuv::libuv
++  ${LIBUV_LIBRARY}
 +  GTest::gmock
 +  GTest::gtest_main)
  
diff --git a/external_imported/vcpkg/ports/tensorpipe/use-vcpkg.patch b/external_imported/vcpkg/ports/tensorpipe/use-vcpkg.patch
index b69d01c18..4afcd1aa2 100644
--- a/external_imported/vcpkg/ports/tensorpipe/use-vcpkg.patch
+++ b/external_imported/vcpkg/ports/tensorpipe/use-vcpkg.patch
@@ -9,10 +9,10 @@ index efcffc2..dd9bd16 100644
 -find_package(uv REQUIRED)
 -list(APPEND TP_LINK_LIBRARIES uv::uv)
 +find_package(libuv CONFIG REQUIRED) 
-+if (TARGET uv)
-+list(APPEND TP_LINK_LIBRARIES uv)
++if (TARGET libuv::uv)
++list(APPEND TP_LINK_LIBRARIES libuv::uv)
 +else()
-+list(APPEND TP_LINK_LIBRARIES uv_a)
++list(APPEND TP_LINK_LIBRARIES libuv::uv_a)
 +endif()
  
  ### shm
diff --git a/external_imported/vcpkg/ports/tensorpipe/vcpkg.json b/external_imported/vcpkg/ports/tensorpipe/vcpkg.json
index fc9865ad2..6e8139793 100644
--- a/external_imported/vcpkg/ports/tensorpipe/vcpkg.json
+++ b/external_imported/vcpkg/ports/tensorpipe/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "tensorpipe",
   "version-date": "2022-03-16",
-  "port-version": 2,
+  "port-version": 5,
   "description": "A tensor-aware point-to-point communication primitive for machine learning",
   "homepage": "https://github.com/pytorch/tensorpipe",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/tesseract/fix-debug-postfix.patch b/external_imported/vcpkg/ports/tesseract/fix-debug-postfix.patch
deleted file mode 100644
index 98933b7f5..000000000
--- a/external_imported/vcpkg/ports/tesseract/fix-debug-postfix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8c6845cb..27c1f4a2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -812,14 +812,8 @@ set_target_properties(libtesseract
- set_target_properties(libtesseract
-   PROPERTIES SOVERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
- 
--if(WIN32)
--  set_target_properties(libtesseract
--     PROPERTIES OUTPUT_NAME tesseract${VERSION_MAJOR}${VERSION_MINOR})
--  set_target_properties(libtesseract
--     PROPERTIES DEBUG_OUTPUT_NAME tesseract${VERSION_MAJOR}${VERSION_MINOR}d)
--else()
--  set_target_properties(libtesseract PROPERTIES OUTPUT_NAME tesseract)
--endif()
-+set_target_properties(libtesseract
-+  PROPERTIES OUTPUT_NAME tesseract$<$<BOOL:${WIN32}>:${VERSION_MAJOR}${VERSION_MINOR}$<$<CONFIG:DEBUG>:d>>)
- 
- if(SW_BUILD)
-   target_link_libraries(libtesseract PUBLIC org.sw.demo.danbloomberg.leptonica
-@@ -884,8 +878,10 @@ get_target_property(tesseract_NAME libtesseract NAME)
- get_target_property(tesseract_VERSION libtesseract VERSION)
- get_target_property(tesseract_OUTPUT_NAME libtesseract OUTPUT_NAME)
- 
--configure_file(tesseract.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/tesseract.pc
-+configure_file(tesseract.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/tesseract.pc.in
-                @ONLY)
-+# to resolve generator expression in OUTPUT_NAME
-+file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/tesseract.pc INPUT ${CMAKE_CURRENT_BINARY_DIR}/tesseract.pc.in)
- 
- configure_package_config_file(
-   cmake/templates/TesseractConfig.cmake.in
diff --git a/external_imported/vcpkg/ports/tesseract/fix-link-include-path.patch b/external_imported/vcpkg/ports/tesseract/fix-link-include-path.patch
new file mode 100644
index 000000000..141549434
--- /dev/null
+++ b/external_imported/vcpkg/ports/tesseract/fix-link-include-path.patch
@@ -0,0 +1,14 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 68da6c5..781fb97 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -820,7 +820,8 @@ target_include_directories(
+          $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/textord>
+          $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/viewer>
+          $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/wordrec>
+-         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/training>)
++         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/training>
++         $<INSTALL_INTERFACE:include>)
+ if(BUILD_SHARED_LIBS)
+   target_compile_definitions(
+     libtesseract
diff --git a/external_imported/vcpkg/ports/tesseract/fix-tools.patch b/external_imported/vcpkg/ports/tesseract/fix-tools.patch
deleted file mode 100644
index 09d5b71df..000000000
--- a/external_imported/vcpkg/ports/tesseract/fix-tools.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/src/training/CMakeLists.txt b/src/training/CMakeLists.txt
-index a05b216c..faab9bc2 100644
---- a/src/training/CMakeLists.txt
-+++ b/src/training/CMakeLists.txt
-@@ -259,13 +259,8 @@ if(ICU_FOUND)
-     target_link_libraries(unicharset_training
-                           PUBLIC common_training org.sw.demo.unicode.icu.i18n)
-   else()
--    if(${CMAKE_VERSION} VERSION_LESS "3.12.0")
-       target_link_libraries(unicharset_training PUBLIC common_training
-                                                        PkgConfig::ICU)
--    else()
--      target_link_libraries(unicharset_training PUBLIC common_training
--                                                       ${ICU_LIBRARIES})
--    endif()
-   endif()
-   target_include_directories(unicharset_training
-                              PUBLIC unicharset ${CMAKE_CURRENT_BINARY_DIR})
-@@ -388,11 +383,7 @@ if(ICU_FOUND)
-         target_include_directories(pango_training BEFORE
-                                    PUBLIC ${PANGO_INCLUDE_DIRS})
-         target_compile_definitions(pango_training PUBLIC -DPANGO_ENABLE_ENGINE)
--        if(${CMAKE_VERSION} VERSION_LESS "3.12.0")
--          target_link_libraries(pango_training PUBLIC PkgConfig::PANGO)
--        else()
--          target_link_libraries(pango_training PUBLIC ${PANGO_LINK_LIBRARIES})
--        endif()
-+        target_link_libraries(pango_training PUBLIC PkgConfig::PANGO)
-       endif()
-     endif()
-     target_include_directories(pango_training
diff --git a/external_imported/vcpkg/ports/tesseract/fix_static_link_icu.patch b/external_imported/vcpkg/ports/tesseract/fix_static_link_icu.patch
new file mode 100644
index 000000000..8e7c101cc
--- /dev/null
+++ b/external_imported/vcpkg/ports/tesseract/fix_static_link_icu.patch
@@ -0,0 +1,13 @@
+diff --git a/src/training/CMakeLists.txt b/src/training/CMakeLists.txt
+index 429ed04..9878fa5 100644
+--- a/src/training/CMakeLists.txt
++++ b/src/training/CMakeLists.txt
+@@ -72,7 +72,7 @@ if(NOT SW_BUILD)
+   if(PKG_CONFIG_FOUND)
+     pkg_check_modules(ICU REQUIRED IMPORTED_TARGET icu-uc icu-i18n)
+   else()
+-    find_package(ICU 52.1 COMPONENTS uc i18n)
++    find_package(ICU 72.1 COMPONENTS uc i18n dt)
+   endif()
+   if(ICU_FOUND)
+     message(">> ICU_FOUND ${ICU_FOUND} ${ICU_VERSION} ${ICU_LIBRARIES} ${ICU_INCLUDE_DIRS}")
diff --git a/external_imported/vcpkg/ports/tesseract/portfile.cmake b/external_imported/vcpkg/ports/tesseract/portfile.cmake
index 128543c66..091a0d26b 100644
--- a/external_imported/vcpkg/ports/tesseract/portfile.cmake
+++ b/external_imported/vcpkg/ports/tesseract/portfile.cmake
@@ -5,12 +5,12 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO tesseract-ocr/tesseract
-    REF 080da83cc51c4ef8b324a7e03146fe0bd7e0944b #5.3.0
-    SHA512 77f7e69ca220edb51f0d1e21fae67288759bbefb6868203cd095c4457b16d7319d78cd47dd8e72be3da5aabb357f5f649b8da7fc3f2263faedecf10f556eb431
+    REF "${VERSION}"
+    SHA512 a81c98c3754a71093df7b51390ccd43d05f661352b4cb564e403b96d81909664c2ecbf2eb6f37614c4639e6dadbf2329b926d09271dbbdaa302f2d7b6b0d628a
     PATCHES
         ${tesseract_patch}
-        fix-tools.patch # See https://github.com/tesseract-ocr/tesseract/pull/4006
-        fix-debug-postfix.patch # See https://github.com/tesseract-ocr/tesseract/pull/4008
+        fix_static_link_icu.patch
+        fix-link-include-path.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -29,6 +29,7 @@ vcpkg_cmake_configure(
         -DCMAKE_DISABLE_FIND_PACKAGE_OpenCL=ON
         -DLeptonica_DIR=YES
         -DSW_BUILD=OFF
+        -DLEPT_TIFF_RESULT=ON
     MAYBE_UNUSED_VARIABLES
         CMAKE_DISABLE_FIND_PACKAGE_OpenCL
 )
@@ -55,9 +56,8 @@ if("training-tools" IN_LIST FEATURES)
         ambiguous_words classifier_tester combine_tessdata
         cntraining dawg2wordlist mftraining shapeclustering
         wordlist2dawg combine_lang_model lstmeval lstmtraining
-        set_unicharset_properties unicharset_extractor text2image
-        merge_unicharsets
-    )
+        set_unicharset_properties unicharset_extractor merge_unicharsets
+        )
     vcpkg_copy_tools(TOOL_NAMES ${TRAINING_TOOLS} AUTO_CLEAN)
 endif()
 
@@ -65,5 +65,42 @@ endif()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
+# Install:
+file(GLOB API_HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/src/api/*.h")
+file(INSTALL ${API_HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/tesseract/api")
+
+file(GLOB ARCH_HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/src/arch/*.h")
+file(INSTALL ${ARCH_HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/tesseract/arch")
+
+file(GLOB CCMAIN_HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/src/ccmain/*.h")
+file(INSTALL ${CCMAIN_HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/tesseract/ccmain")
+
+file(GLOB CCSTRUCT_HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/src/ccstruct/*.h")
+file(INSTALL ${CCSTRUCT_HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/tesseract/ccstruct")
+
+file(GLOB CCUTIL_HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/src/ccutil/*.h")
+file(INSTALL ${CCUTIL_HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/tesseract/ccutil")
+
+file(GLOB CLASSIFY_HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/src/classify/*.h")
+file(INSTALL ${CLASSIFY_HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/tesseract/classify")
+
+file(GLOB CUTIL_HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/src/cutil/*.h")
+file(INSTALL ${CUTIL_HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/tesseract/cutil")
+
+file(GLOB DICT_HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/src/dict/*.h")
+file(INSTALL ${DICT_HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/tesseract/dict")
+
+file(GLOB LSTM_HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/src/lstm/*.h")
+file(INSTALL ${LSTM_HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/tesseract/lstm")
+
+file(GLOB TEXTORD_HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/src/textord/*.h")
+file(INSTALL ${TEXTORD_HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/tesseract/textord")
+
+file(GLOB VIEWER_HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/src/viewer/*.h")
+file(INSTALL ${VIEWER_HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/tesseract/viewer")
+
+file(GLOB WORDREC_HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/src/wordrec/*.h")
+file(INSTALL ${WORDREC_HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/tesseract/wordrec")
+
 # Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/tesseract/vcpkg.json b/external_imported/vcpkg/ports/tesseract/vcpkg.json
index 7da810964..3ebf442ed 100644
--- a/external_imported/vcpkg/ports/tesseract/vcpkg.json
+++ b/external_imported/vcpkg/ports/tesseract/vcpkg.json
@@ -1,11 +1,15 @@
 {
   "name": "tesseract",
-  "version": "5.3.0",
+  "version": "5.3.4",
   "description": "An OCR Engine that was developed at HP Labs between 1985 and 1995... and now at Google.",
   "homepage": "https://github.com/tesseract-ocr/tesseract",
   "license": "Apache-2.0",
   "supports": "!uwp",
   "dependencies": [
+    {
+      "name": "cpu-features",
+      "platform": "android"
+    },
     {
       "name": "curl",
       "default-features": false
diff --git a/external_imported/vcpkg/ports/tgbot-cpp/portfile.cmake b/external_imported/vcpkg/ports/tgbot-cpp/portfile.cmake
index a3b08a4e1..f6af2c3ef 100644
--- a/external_imported/vcpkg/ports/tgbot-cpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/tgbot-cpp/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO reo7sp/tgbot-cpp
-  REF v1.6
-  SHA512 c7dd9efb1b0edfe34de06205ed26ad076d0e61a48be22df440290478ab55917c7d926af0ea7d1c76b82b5859f4f2454217feb6dc5b7c7680e6f6177f063242a0
+  REF v1.7.2
+  SHA512 44f16e2cef6ea6407f6a707885734cd0e850d89553a35c12b63c0864ea952377f07553c9cbf5ee464a1e8390723cd9fff867caafa725c97612a664d13ca87ec1
   HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/tgbot-cpp/vcpkg.json b/external_imported/vcpkg/ports/tgbot-cpp/vcpkg.json
index 09dbdc6bb..32e9c9637 100644
--- a/external_imported/vcpkg/ports/tgbot-cpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/tgbot-cpp/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "tgbot-cpp",
-  "version": "1.6",
+  "version": "1.7.2",
   "description": "C++ library for Telegram bot API.",
   "homepage": "https://github.com/reo7sp/tgbot-cpp",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/tgc/vcpkg.json b/external_imported/vcpkg/ports/tgc/vcpkg.json
index bfc5a6829..788296adf 100644
--- a/external_imported/vcpkg/ports/tgc/vcpkg.json
+++ b/external_imported/vcpkg/ports/tgc/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "tgc",
-  "version-string": "2019-08-11",
-  "port-version": 3,
+  "version-date": "2019-08-11",
+  "port-version": 4,
   "description": "A tiny garbage collector for C",
   "homepage": "https://github.com/orangeduck/tgc",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/tgui/devendor-stb.patch b/external_imported/vcpkg/ports/tgui/devendor-stb.patch
index d346b312f..204267627 100644
--- a/external_imported/vcpkg/ports/tgui/devendor-stb.patch
+++ b/external_imported/vcpkg/ports/tgui/devendor-stb.patch
@@ -1,27 +1,41 @@
+diff --git a/include/TGUI/extlibs/IncludeStbImage.hpp b/include/TGUI/extlibs/IncludeStbImage.hpp
+index e19cccb..79d0f0c 100644
+--- a/include/TGUI/extlibs/IncludeStbImage.hpp
++++ b/include/TGUI/extlibs/IncludeStbImage.hpp
+@@ -64,7 +64,7 @@
+ #else
+ #   define STB_IMAGE_STATIC
+ #   define STB_IMAGE_IMPLEMENTATION
+-#   include <TGUI/extlibs/stb/stb_image.h>
++#   include <stb_image.h>
+ #endif
+ 
+ #if defined(__GNUC__)
+diff --git a/include/TGUI/extlibs/IncludeStbImageWrite.hpp b/include/TGUI/extlibs/IncludeStbImageWrite.hpp
+index 2e23a5b..97ce878 100644
+--- a/include/TGUI/extlibs/IncludeStbImageWrite.hpp
++++ b/include/TGUI/extlibs/IncludeStbImageWrite.hpp
+@@ -52,7 +52,7 @@
+ #else
+ #   define STB_IMAGE_WRITE_STATIC
+ #   define STB_IMAGE_WRITE_IMPLEMENTATION
+-#   include <TGUI/extlibs/stb/stb_image_write.h>
++#   include <stb_image_write.h>
+ #endif
+ 
+ #if defined(__GNUC__)
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index ebabb8a..4a166dc 100755
+index 6a08458..c575036 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -173,6 +173,9 @@ else()
+@@ -225,6 +225,10 @@ else()
+     set_target_properties(tgui PROPERTIES MINSIZEREL_POSTFIX -s)
      set_target_properties(tgui PROPERTIES RELWITHDEBINFO_POSTFIX -s)
  endif()
- 
 +find_path(STB_INCLUDE_DIR stb_image.h REQUIRED)
 +target_include_directories(tgui PRIVATE "${STB_INCLUDE_DIR}")
-+
- # Add the backend files to the library.
- # Without the ability to call target_link_libraries in a subdirectory (which was only added in CMake 3.13 in policy CMP0079),
- # the code would be more complicated when using add_subdirectory. So we just avoid creating a new scope by using include.
-diff --git a/src/Loading/ImageLoader.cpp b/src/Loading/ImageLoader.cpp
-index e3ec9c5..d2f691d 100644
---- a/src/Loading/ImageLoader.cpp
-+++ b/src/Loading/ImageLoader.cpp
-@@ -45,7 +45,7 @@
- #define STB_IMAGE_STATIC
- #define STBI_WINDOWS_UTF8
- #define STB_IMAGE_IMPLEMENTATION
--#include <TGUI/extlibs/stb/stb_image.h>
-+#include <stb_image.h>
++find_path(TGUI_SYSTEM_STB_IMAGE_WRITE_INCLUDE_DIR stb_image_write.h REQUIRED)
++target_include_directories(tgui SYSTEM PRIVATE "${TGUI_SYSTEM_STB_IMAGE_WRITE_INCLUDE_DIR}")
  
- #if defined(__GNUC__)
-     #pragma GCC diagnostic pop
+ if (TGUI_BUILD_AS_CXX_MODULE)
+     target_sources(tgui
diff --git a/external_imported/vcpkg/ports/tgui/fix-dependencies.patch b/external_imported/vcpkg/ports/tgui/fix-dependencies.patch
deleted file mode 100644
index 9432abbc1..000000000
--- a/external_imported/vcpkg/ports/tgui/fix-dependencies.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff --git a/cmake/TGUIConfig.cmake.in b/cmake/TGUIConfig.cmake.in
-index 5b58350..c9398b7 100644
---- a/cmake/TGUIConfig.cmake.in
-+++ b/cmake/TGUIConfig.cmake.in
-@@ -44,6 +44,28 @@
- #   add_executable(myapp ...)
- #   target_link_libraries(myapp tgui)
- 
-+include(CMakeFindDependencyMacro)
-+if("@TGUI_HAS_BACKEND_SFML@")
-+    find_dependency(SFML CONFIG COMPONENTS graphics)
-+endif()
-+if("@TGUI_HAS_BACKEND_SDL@")
-+    find_dependency(SDL2 CONFIG)
-+    find_dependency(SDL2_ttf CONFIG)
-+    find_dependency(Threads)
-+endif()
-+if("@EXPORT_USE_OPENGL@")
-+    cmake_policy(PUSH)
-+    if (POLICY CMP0072)
-+        cmake_policy(SET CMP0072 NEW)
-+    endif()
-+    find_package(OpenGL REQUIRED)
-+    cmake_policy(POP)
-+endif()
-+if("@EXPORT_USE_THREADS@")
-+    set(THREADS_PREFER_PTHREAD_FLAG ON)
-+    find_package(Threads REQUIRED)
-+endif()
-+
- set(FIND_TGUI_PATHS
-     "${CMAKE_CURRENT_LIST_DIR}/../.."
-     ${TGUI_ROOT}
-@@ -58,7 +80,7 @@ set(FIND_TGUI_PATHS
-     /opt)
- 
- # Choose which target definitions must be imported
--if (TGUI_STATIC_LIBRARIES)
-+if (NOT "@BUILD_SHARED_LIBS@")
- 	set(TGUI_IS_FRAMEWORK_INSTALL "@TGUI_BUILD_FRAMEWORKS@")
-     if (TGUI_IS_FRAMEWORK_INSTALL)
-         message(WARNING "Static frameworks are not supported by TGUI. Clear TGUI_DIR cache entry, \
-@@ -77,7 +99,10 @@ if (EXISTS "${targets_config_file}")
-     include("${targets_config_file}")
- 
-     # Search for X11 on Linux and BSD
--    if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR CMAKE_SYSTEM_NAME MATCHES "^k?FreeBSD$" OR CMAKE_SYSTEM_NAME MATCHES "^OpenBSD$")
-+    if(TARGET TGUI_X11)
-+        find_dependency(X11)
-+        set_property(TARGET TGUI_X11 APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${TGUI_X11_LIB}")
-+    elseif(0)
-         find_library(TGUI_X11_LIB NAMES X11 PATHS ${FIND_TGUI_PATHS} PATH_SUFFIXES lib NO_SYSTEM_ENVIRONMENT_PATH)
-         mark_as_advanced(TGUI_X11_LIB)
-         if(TGUI_X11_LIB)
-diff --git a/src/Backends/SDL/CMakeLists.txt b/src/Backends/SDL/CMakeLists.txt
-index d86f11d..3f3f3ce 100644
---- a/src/Backends/SDL/CMakeLists.txt
-+++ b/src/Backends/SDL/CMakeLists.txt
-@@ -4,7 +4,11 @@ find_package(SDL2 REQUIRED)
- find_package(SDL2_ttf REQUIRED)
- 
- # Link to SDL and set include and library search directories
--target_link_libraries(tgui PRIVATE SDL2::Core SDL2::TTF)
-+if(TARGET SDL2_ttf::SDL2_ttf)
-+    target_link_libraries(tgui PRIVATE SDL2::SDL2 SDL2_ttf::SDL2_ttf)
-+else()
-+    target_link_libraries(tgui PRIVATE SDL2::SDL2 SDL2_ttf::SDL2_ttf-static)
-+endif()
- 
- # Add the backend source files to the library
- target_sources(tgui PRIVATE
-@@ -19,10 +23,15 @@ target_sources(tgui PRIVATE
- )
- 
- add_library(tgui-sdl-interface INTERFACE)
--target_link_libraries(tgui-sdl-interface INTERFACE SDL2::Core SDL2::TTF SDL2::Main)
-+if(TARGET SDL2_ttf::SDL2_ttf)
-+    target_link_libraries(tgui-sdl-interface INTERFACE SDL2::SDL2 SDL2_ttf::SDL2_ttf SDL2::SDL2main)
-+else()
-+    target_link_libraries(tgui-sdl-interface INTERFACE SDL2::SDL2 SDL2_ttf::SDL2_ttf-static SDL2::SDL2main)
-+endif()
- 
- # Also link to OpenGL or OpenGL ES
- if(NOT TGUI_USE_GLES)
-+    set(EXPORT_USE_OPENGL 1 CACHE INTERNAL "")
-     find_package(OpenGL REQUIRED)
-     target_link_libraries(tgui PRIVATE OpenGL::GL)
-     target_link_libraries(tgui-sdl-interface INTERFACE OpenGL::GL)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 4a166dc..a53b58f 100755
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -213,6 +213,7 @@ if(TGUI_OS_LINUX OR TGUI_OS_BSD)
-     target_link_libraries(tgui PRIVATE TGUI_X11)
- 
-     # For the FileDialog we need to link to pthreads and dl on Linux and BSD (to load system icons in the background)
-+    set(EXPORT_USE_THREADS 1 CACHE INTERNAL "")
-     set(THREADS_PREFER_PTHREAD_FLAG ON)
-     find_package(Threads REQUIRED)
-     target_link_libraries(tgui PRIVATE Threads::Threads)
diff --git a/external_imported/vcpkg/ports/tgui/portfile.cmake b/external_imported/vcpkg/ports/tgui/portfile.cmake
index 7eb190017..2c92aefa8 100644
--- a/external_imported/vcpkg/ports/tgui/portfile.cmake
+++ b/external_imported/vcpkg/ports/tgui/portfile.cmake
@@ -11,11 +11,10 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO texus/TGUI
-    REF v0.9.5
-    SHA512 68c02679598448440ffaad69ee606a8413c2bcb508c91a59c2997ac866681617dadf6b9688f6c5eb07e5e38b5094a39bd79f0753a82236ec5f48498797c11134
-    HEAD_REF 0.10
+    REF "v${VERSION}"
+    SHA512 0896551286a40ea5b6e778018473bd230c7c3052cf19cbecfdc00789f029e9a753e569fdd5aab6f2e1e74c5fb8873bf1f7389e66abeaa3d628d6032941af331e
+    HEAD_REF 1.x
     PATCHES
-        fix-dependencies.patch
         devendor-stb.patch
 )
 
@@ -29,8 +28,8 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" TGUI_USE_STATIC_STD_LIBS)
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
-    sdl2    TGUI_HAS_BACKEND_SDL
-    sfml    TGUI_HAS_BACKEND_SFML
+    sdl2    TGUI_HAS_BACKEND_SDL_RENDERER
+    sfml    TGUI_HAS_BACKEND_SFML_GRAPHICS
     tool    TGUI_BUILD_GUI_BUILDER
 )
 
@@ -49,7 +48,7 @@ vcpkg_cmake_configure(
     OPTIONS_DEBUG
         -DTGUI_BUILD_GUI_BUILDER=OFF
     MAYBE_UNUSED_VARIABLES
-        TGUI_BUILD_FRAMEWORK
+        TGUI_USE_STATIC_STD_LIBS
 )
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/tgui/usage b/external_imported/vcpkg/ports/tgui/usage
index af9c2504c..c540a8108 100644
--- a/external_imported/vcpkg/ports/tgui/usage
+++ b/external_imported/vcpkg/ports/tgui/usage
@@ -1,4 +1,4 @@
 tgui provides CMake targets:
 
     find_package(TGUI CONFIG REQUIRED)
-    target_link_libraries(main PRIVATE tgui)
+    target_link_libraries(main PRIVATE TGUI::TGUI)
diff --git a/external_imported/vcpkg/ports/tgui/vcpkg.json b/external_imported/vcpkg/ports/tgui/vcpkg.json
index b7a07a0eb..86eae4ff7 100644
--- a/external_imported/vcpkg/ports/tgui/vcpkg.json
+++ b/external_imported/vcpkg/ports/tgui/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "tgui",
-  "version": "0.9.5",
+  "version": "1.1.0",
+  "port-version": 1,
   "description": "TGUI is an easy to use, cross-platform, C++ GUI for SFML.",
   "homepage": "https://tgui.eu",
   "license": "Zlib",
diff --git a/external_imported/vcpkg/ports/theia/vcpkg.json b/external_imported/vcpkg/ports/theia/vcpkg.json
index e41a283b1..19788cbb3 100644
--- a/external_imported/vcpkg/ports/theia/vcpkg.json
+++ b/external_imported/vcpkg/ports/theia/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "theia",
   "version": "0.8",
-  "port-version": 8,
+  "port-version": 9,
   "description": "An open source library for multiview geometry and structure from motion",
   "homepage": "https://github.com/sweeneychris/TheiaSfM",
   "license": "BSD-3-Clause",
+  "supports": "!uwp & !arm & !(windows & x86)",
   "dependencies": [
     "cereal",
     {
@@ -19,7 +20,12 @@
       "platform": "!osx"
     },
     "glew",
-    "openimageio",
+    {
+      "name": "openimageio",
+      "features": [
+        "viewer"
+      ]
+    },
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/external_imported/vcpkg/ports/think-cell-range/portfile.cmake b/external_imported/vcpkg/ports/think-cell-range/portfile.cmake
index 2599e517d..f5e60910d 100644
--- a/external_imported/vcpkg/ports/think-cell-range/portfile.cmake
+++ b/external_imported/vcpkg/ports/think-cell-range/portfile.cmake
@@ -1,15 +1,14 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO think-cell/range
-    REF 498839d41519d38bb81089f7d0f517026bd042cc
-    SHA512 1292ba4dd994aab2cb620c24ebd03437a47e426368ed803579dad13a3fa52762cefe42c77c9921d5c4bcbd6592775714191de63097c230e50f9b59b9498005e5
-    HEAD_REF master
+    REPO think-cell/think-cell-library
+    REF "${VERSION}"
+    SHA512 dbb391982fc8050a020c9597fa8608abf87f351b84b7060cfadac4670fd4564f34836a8862f42647983f601a21d6d8bbda95429fc6e2788e94a343fbba09ae99
+    HEAD_REF main
 )
 
-file(INSTALL ${SOURCE_PATH}/range DESTINATION ${CURRENT_PACKAGES_DIR}/include/think-cell FILES_MATCHING PATTERN "*.h")
+file(INSTALL "${SOURCE_PATH}/tc/range" DESTINATION "${CURRENT_PACKAGES_DIR}/include/think-cell" FILES_MATCHING PATTERN "*.h")
 
-file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/think-cell-range)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/think-cell-range/COPYING ${CURRENT_PACKAGES_DIR}/share/think-cell-range/copyright)
-file(COPY ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/think-cell-range)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE_1_0.txt")
+file(COPY "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 
-file(COPY ${SOURCE_PATH}/range/range.example.cpp DESTINATION ${CURRENT_PACKAGES_DIR}/share/think-cell-range)
+file(COPY "${SOURCE_PATH}/range.example.cpp" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/think-cell-range/vcpkg.json b/external_imported/vcpkg/ports/think-cell-range/vcpkg.json
index 3296cf654..846fcd857 100644
--- a/external_imported/vcpkg/ports/think-cell-range/vcpkg.json
+++ b/external_imported/vcpkg/ports/think-cell-range/vcpkg.json
@@ -1,9 +1,9 @@
 {
   "name": "think-cell-range",
-  "version-string": "498839d",
-  "port-version": 2,
+  "version": "2023.1",
   "description": "think-cell's range library",
-  "homepage": "https://github.com/think-cell/range",
+  "homepage": "https://github.com/think-cell/think-cell-library",
+  "license": "BSL-1.0",
   "dependencies": [
     "boost"
   ]
diff --git a/external_imported/vcpkg/ports/thomasmonkman-filewatch/fix-unix-listen.patch b/external_imported/vcpkg/ports/thomasmonkman-filewatch/fix-unix-listen.patch
new file mode 100644
index 000000000..c0363c5d6
--- /dev/null
+++ b/external_imported/vcpkg/ports/thomasmonkman-filewatch/fix-unix-listen.patch
@@ -0,0 +1,37 @@
+diff --git a/FileWatch.hpp b/FileWatch.hpp
+index 4eba08b..2c0ff6d 100644
+--- a/FileWatch.hpp
++++ b/FileWatch.hpp
+@@ -276,7 +276,7 @@ namespace filewatch {
+ 
+ 		FolderInfo  _directory;
+ 
+-		const std::uint32_t _listen_filters = IN_MODIFY | IN_CREATE | IN_DELETE;
++		const std::uint32_t _listen_filters = IN_MODIFY | IN_CREATE | IN_DELETE | IN_MOVE;
+ 
+ 		const static std::size_t event_size = (sizeof(struct inotify_event));
+ #endif // __unix__
+@@ -604,7 +604,7 @@ namespace filewatch {
+ 				}
+ 			}();
+ 
+-			const auto watch = inotify_add_watch(folder, watch_path.c_str(), IN_MODIFY | IN_CREATE | IN_DELETE);
++			const auto watch = inotify_add_watch(folder, watch_path.c_str(), IN_MODIFY | IN_CREATE | IN_DELETE | IN_MOVE);
+ 			if (watch < 0) 
+ 			{
+ 				throw std::system_error(errno, std::system_category());
+@@ -644,6 +644,14 @@ namespace filewatch {
+ 								{
+ 									parsed_information.emplace_back(StringType{ changed_file }, Event::modified);
+ 								}
++                               			else if (event->mask & IN_MOVED_FROM)
++                               			{
++                               			    parsed_information.emplace_back(StringType{ changed_file }, Event::renamed_old);
++                               			}
++                               			else if (event->mask & IN_MOVED_TO)
++                               			{
++                               			    parsed_information.emplace_back(StringType{ changed_file }, Event::renamed_new);
++                               			}
+ 							}
+ 						}
+ 						i += event_size + event->len;
diff --git a/external_imported/vcpkg/ports/thomasmonkman-filewatch/portfile.cmake b/external_imported/vcpkg/ports/thomasmonkman-filewatch/portfile.cmake
new file mode 100644
index 000000000..4b045ba41
--- /dev/null
+++ b/external_imported/vcpkg/ports/thomasmonkman-filewatch/portfile.cmake
@@ -0,0 +1,13 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO ThomasMonkman/filewatch
+    REF a59891baf375b73ff28144973a6fafd3fe40aa21
+    SHA512 9a110b42a499ed7047bb8a79029134943582b388db810974ad6b5f91d1ec720e45a9a3543c4a56ee97d51439f5a34222bada0fb43281dcbc2e65bdee38f836d5
+    HEAD_REF master
+    PATCHES
+        fix-unix-listen.patch
+)
+
+file(COPY "${SOURCE_PATH}/FileWatch.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include/thomasmonkman-filewatch")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/thomasmonkman-filewatch/vcpkg.json b/external_imported/vcpkg/ports/thomasmonkman-filewatch/vcpkg.json
new file mode 100644
index 000000000..c078ddf80
--- /dev/null
+++ b/external_imported/vcpkg/ports/thomasmonkman-filewatch/vcpkg.json
@@ -0,0 +1,8 @@
+{
+  "name": "thomasmonkman-filewatch",
+  "version-date": "2023-01-16",
+  "port-version": 2,
+  "description": "File watcher in C++.",
+  "homepage": "https://github.com/ThomasMonkman/filewatch",
+  "license": "MIT"
+}
diff --git a/external_imported/vcpkg/ports/thor/fix-dependency-sfml.patch b/external_imported/vcpkg/ports/thor/fix-dependency-sfml.patch
index 8b6fb09da..2ebe6f219 100644
--- a/external_imported/vcpkg/ports/thor/fix-dependency-sfml.patch
+++ b/external_imported/vcpkg/ports/thor/fix-dependency-sfml.patch
@@ -1,31 +1,13 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 03536be..abcff44 100644
+index 352fea9..01c1695 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -115,11 +115,10 @@ set (CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/Modules/;${CMAKE_MODULE_PATH
+@@ -111,7 +111,7 @@ endif()
  if(NOT THOR_SHARED_LIBS)
  	set(SFML_STATIC_LIBRARIES TRUE)
  endif()
--find_package(SFML 2 COMPONENTS audio graphics window system)
-+find_package(SFML COMPONENTS system window graphics CONFIG REQUIRED)
-+set(SFML_LIBRARIES sfml-system sfml-network sfml-graphics sfml-window)
- 
--if(SFML_FOUND)
--	include_directories(${SFML_INCLUDE_DIR})
--else()
-+if(0)
- 	set(SFML_ROOT "" CACHE PATH "SFML top-level directory")
- 	message("\n-> SFML directory not found. Set SFML_ROOT to SFML's top-level path (containing \"include\" and \"lib\" directories).")
- 	message("-> Make sure the SFML libraries with the same configuration (Release/Debug, Static/Dynamic) exist.\n")
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 75e118e..0f90ac8 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -72,6 +72,7 @@ else()
- 	add_library(${THOR_LIB} STATIC ${THOR_SRC})
- 	set_target_properties(${THOR_LIB} PROPERTIES DEBUG_POSTFIX -s-d)
- 	set_target_properties(${THOR_LIB} PROPERTIES RELEASE_POSTFIX -s)
-+    thor_link_sfml(${THOR_LIB})
- endif()
- 
+-find_package(SFML 2.5 COMPONENTS audio graphics window system REQUIRED)
++find_package(SFML COMPONENTS audio graphics window system CONFIG REQUIRED)
  
+ if(NOT SFML_FOUND)
+ 	set(SFML_DIR "" CACHE PATH "SFML top-level directory")
diff --git a/external_imported/vcpkg/ports/thor/portfile.cmake b/external_imported/vcpkg/ports/thor/portfile.cmake
index c45ca4297..780c42dfc 100644
--- a/external_imported/vcpkg/ports/thor/portfile.cmake
+++ b/external_imported/vcpkg/ports/thor/portfile.cmake
@@ -1,10 +1,11 @@
 vcpkg_from_github(
-  OUT_SOURCE_PATH SOURCE_PATH
-  REPO Bromeon/Thor
-  REF v2.0
-  SHA512 634fa5286405d9a8a837c082ace98bbb02e609521418935855b9e2fcad57003dbe35088bd771cf6a9292e55d3787f7e463d7a4cca0d0f007509de2520d9a8cf9
-  HEAD_REF master
-  PATCHES fix-dependency-sfml.patch
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Bromeon/Thor
+    REF 3e320cb52606f0b44fd9d2bb272b3cb6d01d7f20
+    SHA512 de5eeee0f3f7142ffa1fcb7694cf157a65e95af4ad22e3dc7eaa199b98c9fa2dc0dd0635d057c9ba8601a22a6b36ef7d4d420a09ade1c77360c3a6582534f12b
+    HEAD_REF master
+    PATCHES
+        fix-dependency-sfml.patch
 )
 file(REMOVE "${SOURCE_PATH}/cmake/Modules/FindSFML.cmake")
 
@@ -16,10 +17,12 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" THOR_STATIC_STD_LIBS)
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" THOR_SHARED_LIBS)
 
 vcpkg_cmake_configure(
-  SOURCE_PATH "${SOURCE_PATH}"
-  OPTIONS
-    -DTHOR_SHARED_LIBS=${THOR_SHARED_LIBS}
-    -DTHOR_STATIC_STD_LIBS=${THOR_STATIC_STD_LIBS}
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DTHOR_SHARED_LIBS=${THOR_SHARED_LIBS}
+        -DTHOR_STATIC_STD_LIBS=${THOR_STATIC_STD_LIBS}
+    MAYBE_UNUSED_VARIABLES
+        THOR_STATIC_STD_LIBS # Only on Windows
 )
 
 vcpkg_cmake_install()
@@ -47,7 +50,12 @@ if(LICENSE)
   file(REMOVE ${LICENSE})
 endif()
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/include/Aurora")
+file(REMOVE_RECURSE
+  "${CURRENT_PACKAGES_DIR}/debug/include"
+  "${CURRENT_PACKAGES_DIR}/include/Aurora"
+  "${CURRENT_PACKAGES_DIR}/cmake"
+  "${CURRENT_PACKAGES_DIR}/debug/cmake"
+)
 
 if(NOT VCPKG_TARGET_IS_WINDOWS)
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
diff --git a/external_imported/vcpkg/ports/thor/vcpkg.json b/external_imported/vcpkg/ports/thor/vcpkg.json
index 513787366..e00041eb9 100644
--- a/external_imported/vcpkg/ports/thor/vcpkg.json
+++ b/external_imported/vcpkg/ports/thor/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "thor",
-  "version": "2.0",
-  "port-version": 6,
+  "version-date": "2022-04-16",
   "description": "Extends the multimedia library SFML with higher-level features",
   "homepage": "https://bromeon.ch/libraries/thor/",
   "license": "Zlib",
diff --git a/external_imported/vcpkg/ports/thorvg/install-tools.patch b/external_imported/vcpkg/ports/thorvg/install-tools.patch
deleted file mode 100644
index 207d6ee12..000000000
--- a/external_imported/vcpkg/ports/thorvg/install-tools.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/bin/svg2png/meson.build b/src/bin/svg2png/meson.build
-index 8011410..40cf3f9 100644
---- a/src/bin/svg2png/meson.build
-+++ b/src/bin/svg2png/meson.build
-@@ -3,4 +3,5 @@ svg2png_src  = files('svg2png.cpp', 'lodepng.cpp')
- executable('svg2png',
-            svg2png_src,
-            include_directories : headers,
--           link_with : thorvg_lib)
-+           link_with : thorvg_lib,
-+           install : true, install_dir : get_option('bindir'))
-diff --git a/src/bin/svg2tvg/meson.build b/src/bin/svg2tvg/meson.build
-index 2df9fac..ffd5a20 100644
---- a/src/bin/svg2tvg/meson.build
-+++ b/src/bin/svg2tvg/meson.build
-@@ -3,4 +3,5 @@ svg2tvg_src  = files('svg2tvg.cpp')
- executable('svg2tvg',
-            svg2tvg_src,
-            include_directories : headers,
--           link_with : thorvg_lib)
-+           link_with : thorvg_lib,
-+           install : true, install_dir : get_option('bindir'))
diff --git a/external_imported/vcpkg/ports/thorvg/portfile.cmake b/external_imported/vcpkg/ports/thorvg/portfile.cmake
index 7df690d97..35bc6117d 100644
--- a/external_imported/vcpkg/ports/thorvg/portfile.cmake
+++ b/external_imported/vcpkg/ports/thorvg/portfile.cmake
@@ -1,11 +1,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO Samsung/thorvg
-    REF v0.8.3
-    SHA512 df2662b89e72608bd635ff18e7a56562e046421eb7152f11e9796df8cd0d964e34d1ffdba742a838e46f9a27f3d69ba81fb3e08a3ff3f21eac951476bdc72848
+    REPO thorvg/thorvg
+    REF "v${VERSION}"
+    SHA512 6162e05a172abc1445857999907701ed829e850d4d06677907d4cff7372304e442e6037fb1700cdbde5ecda1da5bec63145717db163c0154830b28dc339ef9d4
     HEAD_REF master
-    PATCHES
-        install-tools.patch
 )
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
@@ -15,9 +13,6 @@ else()
 endif()
 
 if ("tools" IN_LIST FEATURES)
-    if(VCPKG_TARGET_IS_WINDOWS)
-        message(FATAL_ERROR "This feature doesn't support Windows platform")
-    endif()
     list(APPEND BUILD_OPTIONS -Dtools=all)
 endif()
 
@@ -33,6 +28,7 @@ vcpkg_configure_meson(
         -Dbindings=capi
         -Dtests=false
         -Dexamples=false
+        -Dstrip=false
     OPTIONS_DEBUG
         -Dlog=true
         -Dbindir=${CURRENT_PACKAGES_DIR}/debug/bin
@@ -43,9 +39,10 @@ vcpkg_install_meson()
 vcpkg_fixup_pkgconfig()
 
 if ("tools" IN_LIST FEATURES)
-    vcpkg_copy_tools(TOOL_NAMES svg2tvg svg2png AUTO_CLEAN)
+    vcpkg_copy_tools(TOOL_NAMES svg2tvg svg2png lottie2gif AUTO_CLEAN)
 endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/thorvg/usage b/external_imported/vcpkg/ports/thorvg/usage
new file mode 100644
index 000000000..f6354eb33
--- /dev/null
+++ b/external_imported/vcpkg/ports/thorvg/usage
@@ -0,0 +1,5 @@
+The package thorvg can be imported via CMake FindPkgConfig module:
+
+    find_package(PkgConfig)
+    pkg_check_modules(thorvg REQUIRED IMPORTED_TARGET thorvg)
+    target_link_libraries(main PRIVATE PkgConfig::thorvg)
diff --git a/external_imported/vcpkg/ports/thorvg/vcpkg.json b/external_imported/vcpkg/ports/thorvg/vcpkg.json
index c7244c346..4cf9940f8 100644
--- a/external_imported/vcpkg/ports/thorvg/vcpkg.json
+++ b/external_imported/vcpkg/ports/thorvg/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "thorvg",
-  "version": "0.8.3",
+  "version": "0.12.1",
   "description": "ThorVG is a platform-independent portable library for drawing vector-based scenes and animations",
   "homepage": "https://www.thorvg.org",
   "license": "MIT",
-  "supports": "!(arm & uwp)",
+  "supports": "!uwp",
   "dependencies": [
     {
       "name": "vcpkg-tool-meson",
diff --git a/external_imported/vcpkg/ports/threadpool/vcpkg.json b/external_imported/vcpkg/ports/threadpool/vcpkg.json
index 3e16feecc..8bd1f91d2 100644
--- a/external_imported/vcpkg/ports/threadpool/vcpkg.json
+++ b/external_imported/vcpkg/ports/threadpool/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "threadpool",
-  "version-string": "0.2.5",
-  "port-version": 2,
+  "version": "0.2.5",
+  "port-version": 3,
   "description": "threadpool is a cross-platform C++ thread pool library. It provides a convenient way for dispatching asynchronous tasks and can be easily customized. threadpool is based on the high-quality Boost source libraries.",
   "homepage": "http://threadpool.sourceforge.net/",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/thrift/portfile.cmake b/external_imported/vcpkg/ports/thrift/portfile.cmake
index f9f2b70f0..15ee282ac 100644
--- a/external_imported/vcpkg/ports/thrift/portfile.cmake
+++ b/external_imported/vcpkg/ports/thrift/portfile.cmake
@@ -12,8 +12,8 @@ vcpkg_find_acquire_program(BISON)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO apache/thrift
-    REF 2a93df80f27739ccabb5b885cb12a8dc7595ecdf #0.16.0
-    SHA512 aed4f60b8a4eca5b4bce26f6f29d1178684d2b4e6de290ab1e696ac78a9f85d941afe5dca99d1d22d640371ad538b930cf445f9f899a2e322f39b0cceec307a3
+    REF "${VERSION}"
+    SHA512 f9bfaf149dde4da1f5353e540b862c2088465115564d981bf02cd89e8c1f84ca53143ca0091b63d24f8f515425d9163af52ec6122245b59810a2b98292a71650
     HEAD_REF master
     PATCHES
       "correct-paths.patch"
@@ -47,11 +47,11 @@ vcpkg_cmake_configure(
         -DBUILD_CPP=ON
         -DWITH_CPP=ON
         -DWITH_ZLIB=ON
-        -DCMAKE_FIND_PACKAGE_REQUIRE_ZLIB=TRUE
+        -DCMAKE_REQUIRE_FIND_PACKAGE_ZLIB=TRUE
         -DWITH_LIBEVENT=ON
-        -DCMAKE_FIND_PACKAGE_REQUIRE_Libevent=TRUE
+        -DCMAKE_REQUIRE_FIND_PACKAGE_Libevent=TRUE
         -DWITH_OPENSSL=ON
-        -DCMAKE_FIND_PACKAGE_REQUIRE_OpenSSL=TRUE
+        -DCMAKE_REQUIRE_FIND_PACKAGE_OpenSSL=TRUE
         -DBUILD_TUTORIALS=OFF
         -DFLEX_EXECUTABLE=${FLEX}
         -DWITH_QT5=OFF
@@ -64,9 +64,9 @@ vcpkg_cmake_configure(
     MAYBE_UNUSED_VARIABLES
         CMAKE_DISABLE_FIND_PACKAGE_GLIB
         CMAKE_DISABLE_FIND_PACKAGE_Gradle
-        CMAKE_FIND_PACKAGE_REQUIRE_Libevent
-        CMAKE_FIND_PACKAGE_REQUIRE_OpenSSL
-        CMAKE_FIND_PACKAGE_REQUIRE_ZLIB
+        CMAKE_REQUIRE_FIND_PACKAGE_Libevent
+        CMAKE_REQUIRE_FIND_PACKAGE_OpenSSL
+        CMAKE_REQUIRE_FIND_PACKAGE_ZLIB
     
 )
 
@@ -83,11 +83,11 @@ if(COMPILER)
     vcpkg_copy_tools(TOOL_NAMES thrift AUTO_CLEAN)
 endif()
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
 
 if ("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static")
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin")
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin")
 endif()
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/thrift/vcpkg.json b/external_imported/vcpkg/ports/thrift/vcpkg.json
index 5b556459a..86418421a 100644
--- a/external_imported/vcpkg/ports/thrift/vcpkg.json
+++ b/external_imported/vcpkg/ports/thrift/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "thrift",
-  "version": "0.16.0",
+  "version": "0.19.0",
   "description": "Apache Thrift is a software project spanning a variety of programming languages and use cases. Our goal is to make reliable, performant communication and data serialization across languages as efficient and seamless as possible.",
   "homepage": "https://github.com/apache/thrift",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/tidy-html5/fix_unsupport_func_uwp.patch b/external_imported/vcpkg/ports/tidy-html5/fix_unsupport_func_uwp.patch
new file mode 100644
index 000000000..7da38b6f7
--- /dev/null
+++ b/external_imported/vcpkg/ports/tidy-html5/fix_unsupport_func_uwp.patch
@@ -0,0 +1,13 @@
+diff --git a/src/sprtf.c b/src/sprtf.c
+index 3468ac1..1630405 100644
+--- a/src/sprtf.c
++++ b/src/sprtf.c
+@@ -387,7 +387,7 @@ static void wprt( PTSTR ps )
+ {
+    static char _s_woibuf[1024];
+    char * cp = _s_woibuf;
+-   int len = (int)lstrlen(ps);
++   int len = (int)wcslen(ps);
+    if(len) {
+       int ret = WideCharToMultiByte( CP_ACP, /* UINT CodePage, // code page */
+          0, /* DWORD dwFlags,            // performance and mapping flags */
diff --git a/external_imported/vcpkg/ports/tidy-html5/portfile.cmake b/external_imported/vcpkg/ports/tidy-html5/portfile.cmake
index 504e94807..298bec583 100644
--- a/external_imported/vcpkg/ports/tidy-html5/portfile.cmake
+++ b/external_imported/vcpkg/ports/tidy-html5/portfile.cmake
@@ -8,6 +8,7 @@ vcpkg_from_github(
         disable-doc.patch
         static-vs-shared.patch
         debug-postfix.patch
+        fix_unsupport_func_uwp.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED_LIB)
@@ -19,7 +20,6 @@ vcpkg_cmake_configure(
         -DTIDY_CONSOLE_SHARED=${BUILD_SHARED_LIB}
 )
 vcpkg_cmake_install()
-vcpkg_copy_pdbs()
 vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE
diff --git a/external_imported/vcpkg/ports/tidy-html5/vcpkg.json b/external_imported/vcpkg/ports/tidy-html5/vcpkg.json
index ecbe011c3..203fd8c77 100644
--- a/external_imported/vcpkg/ports/tidy-html5/vcpkg.json
+++ b/external_imported/vcpkg/ports/tidy-html5/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "tidy-html5",
   "version": "5.8.0",
+  "port-version": 1,
   "description": "Tidy tidies HTML and XML. It can tidy your documents by itself, and developers can easily integrate its features into even more powerful tools.",
   "homepage": "https://www.html-tidy.org",
   "license": null,
diff --git a/external_imported/vcpkg/ports/tiff/portfile.cmake b/external_imported/vcpkg/ports/tiff/portfile.cmake
index 39cf367c9..426d8af72 100644
--- a/external_imported/vcpkg/ports/tiff/portfile.cmake
+++ b/external_imported/vcpkg/ports/tiff/portfile.cmake
@@ -1,11 +1,9 @@
-vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
-
 vcpkg_from_gitlab(
     GITLAB_URL https://gitlab.com
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libtiff/libtiff
     REF "v${VERSION}"
-    SHA512 5227cb7b496ac6829601d8d689233bd8f318c1d04e5ce3457cdd6eac9e4f8c80cd7211d90cd092c61ad38bc8a4949169a13eabd788c46c15bcee1f72519fa022
+    SHA512 ef2f1d424219d9e245069b7d23e78f5e817cf6ee516d46694915ab6c8909522166f84997513d20a702f4e52c3f18467813935b328fafa34bea5156dee00f66fa
     HEAD_REF master
     PATCHES
         FindCMath.patch
@@ -16,8 +14,10 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
         cxx     cxx
         jpeg    jpeg
         jpeg    CMAKE_REQUIRE_FIND_PACKAGE_JPEG
+        libdeflate libdeflate
+        libdeflate CMAKE_REQUIRE_FIND_PACKAGE_Deflate
         lzma    lzma
-        lzma    CMAKE_REQUIRE_FIND_PACKAGE_LibLZMA
+        lzma    CMAKE_REQUIRE_FIND_PACKAGE_liblzma
         tools   tiff-tools
         webp    webp
         webp    CMAKE_REQUIRE_FIND_PACKAGE_WebP
@@ -31,25 +31,31 @@ vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         ${FEATURE_OPTIONS}
+        -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
         -Dtiff-docs=OFF
         -Dtiff-contrib=OFF
         -Dtiff-tests=OFF
-        -Dlibdeflate=OFF
         -Djbig=OFF # This is disabled by default due to GPL/Proprietary licensing.
         -Djpeg12=OFF
         -Dlerc=OFF
         -DCMAKE_DISABLE_FIND_PACKAGE_OpenGL=ON
         -DCMAKE_DISABLE_FIND_PACKAGE_GLUT=ON
         -DZSTD_HAVE_DECOMPRESS_STREAM=ON
+        -DHAVE_JPEGTURBO_DUAL_MODE_8_12=OFF
     OPTIONS_DEBUG
         -DCMAKE_DEBUG_POSTFIX=d # tiff sets "d" for MSVC only.
     MAYBE_UNUSED_VARIABLES
+        CMAKE_DISABLE_FIND_PACKAGE_GLUT
+        CMAKE_DISABLE_FIND_PACKAGE_OpenGL
         ZSTD_HAVE_DECOMPRESS_STREAM
 )
 
 vcpkg_cmake_install()
 
-vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
+# CMake config wasn't packaged in the past and is not yet usable now,
+# cf. https://gitlab.com/libtiff/libtiff/-/merge_requests/496
+# vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/tiff")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake" "${CURRENT_PACKAGES_DIR}/debug/lib/cmake")
 
 set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libtiff-4.pc")
 if(EXISTS "${_file}")
@@ -60,29 +66,15 @@ vcpkg_fixup_pkgconfig()
 file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/debug/include"
     "${CURRENT_PACKAGES_DIR}/debug/share"
-    "${CURRENT_PACKAGES_DIR}/share"
 )
 
 configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY)
 
 if ("tools" IN_LIST FEATURES)
     vcpkg_copy_tools(TOOL_NAMES
-        fax2ps
-        fax2tiff
-        pal2rgb
-        ppm2tiff
-        raw2tiff
-        tiff2bw
-        tiff2pdf
-        tiff2ps
-        tiff2rgba
-        tiffcmp
         tiffcp
-        tiffcrop
-        tiffdither
         tiffdump
         tiffinfo
-        tiffmedian
         tiffset
         tiffsplit
         AUTO_CLEAN
@@ -90,4 +82,5 @@ if ("tools" IN_LIST FEATURES)
 endif()
 
 vcpkg_copy_pdbs()
+file(COPY "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
diff --git a/external_imported/vcpkg/ports/tiff/usage b/external_imported/vcpkg/ports/tiff/usage
new file mode 100644
index 000000000..d47265b18
--- /dev/null
+++ b/external_imported/vcpkg/ports/tiff/usage
@@ -0,0 +1,9 @@
+tiff is compatible with built-in CMake targets:
+
+    find_package(TIFF REQUIRED)
+    target_link_libraries(main PRIVATE TIFF::TIFF)
+
+tiff provides pkg-config modules:
+
+    #  Tag Image File Format (TIFF) library.
+    libtiff-4
diff --git a/external_imported/vcpkg/ports/tiff/vcpkg-cmake-wrapper.cmake.in b/external_imported/vcpkg/ports/tiff/vcpkg-cmake-wrapper.cmake.in
index 31fef16af..1d04ec7a0 100644
--- a/external_imported/vcpkg/ports/tiff/vcpkg-cmake-wrapper.cmake.in
+++ b/external_imported/vcpkg/ports/tiff/vcpkg-cmake-wrapper.cmake.in
@@ -11,9 +11,8 @@ endif()
 
 _find_package(${ARGS})
 
-include(SelectLibraryConfigurations)
-
 if(TIFF_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
+    include(SelectLibraryConfigurations)
     set(z_vcpkg_tiff_link_libraries "")
     set(z_vcpkg_tiff_libraries "")
     if("@webp@")
@@ -53,13 +52,37 @@ if(TIFF_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
             add_library(ZSTD::ZSTD INTERFACE IMPORTED)
             set_property(TARGET ZSTD::ZSTD APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${z_vcpkg_tiff_zstd})
         endif()
-        list(APPEND z_vcpkg_tiff_libraries ${ZSTD_LIBRARIES})
         list(APPEND z_vcpkg_tiff_link_libraries ${z_vcpkg_tiff_zstd})
+        list(APPEND z_vcpkg_tiff_libraries ${ZSTD_LIBRARIES})
         unset(z_vcpkg_tiff_zstd)
         unset(z_vcpkg_tiff_zstd_configs)
         unset(z_vcpkg_config)
         unset(z_vcpkg_tiff_zstd_target)
     endif()
+    if("@libdeflate@")
+        find_package(libdeflate ${z_vcpkg_tiff_find_options})
+        set(z_vcpkg_property "IMPORTED_LOCATION_")
+        if(TARGET libdeflate::libdeflate_shared)
+            set(z_vcpkg_libdeflate_target libdeflate::libdeflate_shared)
+            if(WIN32)
+                set(z_vcpkg_property "IMPORTED_IMPLIB_")
+            endif()
+        else()
+            set(z_vcpkg_libdeflate_target libdeflate::libdeflate_static)
+        endif()
+        get_target_property(z_vcpkg_libdeflate_configs "${z_vcpkg_libdeflate_target}" IMPORTED_CONFIGURATIONS)
+        foreach(z_vcpkg_config IN LISTS z_vcpkg_libdeflate_configs)
+            get_target_property(Z_VCPKG_DEFLATE_LIBRARY_${z_vcpkg_config} "${z_vcpkg_libdeflate_target}" "${z_vcpkg_property}${z_vcpkg_config}")
+        endforeach()
+        select_library_configurations(Z_VCPKG_DEFLATE)
+        list(APPEND z_vcpkg_tiff_link_libraries "\$<LINK_ONLY:${z_vcpkg_libdeflate_target}>")
+        list(APPEND z_vcpkg_tiff_libraries ${Z_VCPKG_DEFLATE_LIBRARIES})
+        unset(z_vcpkg_config)
+        unset(z_vcpkg_libdeflate_configs)
+        unset(z_vcpkg_libdeflate_target)
+        unset(z_vcpkg_property)
+        unset(Z_VCPKG_DEFLATE_FOUND)
+    endif()
     if("@zlib@")
         find_package(ZLIB ${z_vcpkg_tiff_find_options})
         list(APPEND z_vcpkg_tiff_link_libraries "\$<LINK_ONLY:ZLIB::ZLIB>")
diff --git a/external_imported/vcpkg/ports/tiff/vcpkg.json b/external_imported/vcpkg/ports/tiff/vcpkg.json
index 58b0ca719..eea6684aa 100644
--- a/external_imported/vcpkg/ports/tiff/vcpkg.json
+++ b/external_imported/vcpkg/ports/tiff/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "tiff",
-  "version": "4.5.0",
+  "version": "4.6.0",
   "port-version": 2,
   "description": "A library that supports the manipulation of TIFF image files",
   "homepage": "https://libtiff.gitlab.io/libtiff/",
-  "license": null,
+  "license": "libtiff",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
@@ -30,6 +30,19 @@
         "libjpeg-turbo"
       ]
     },
+    "libdeflate": {
+      "description": "Use libdeflate for faster ZIP support",
+      "dependencies": [
+        "libdeflate",
+        {
+          "name": "tiff",
+          "default-features": false,
+          "features": [
+            "zip"
+          ]
+        }
+      ]
+    },
     "lzma": {
       "description": "Support LZMA compression in TIFF image files",
       "dependencies": [
diff --git a/external_imported/vcpkg/ports/tiny-aes-c/vcpkg.json b/external_imported/vcpkg/ports/tiny-aes-c/vcpkg.json
index 2357dd1ac..5e91549cf 100644
--- a/external_imported/vcpkg/ports/tiny-aes-c/vcpkg.json
+++ b/external_imported/vcpkg/ports/tiny-aes-c/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "tiny-aes-c",
-  "version-string": "2019-07-31",
-  "port-version": 2,
+  "version-date": "2019-07-31",
+  "port-version": 3,
   "description": "Small portable AES128/192/256 in C",
   "homepage": "https://github.com/kokke/tiny-AES-c",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/tiny-bignum-c/vcpkg.json b/external_imported/vcpkg/ports/tiny-bignum-c/vcpkg.json
index 383ff92fd..049e40700 100644
--- a/external_imported/vcpkg/ports/tiny-bignum-c/vcpkg.json
+++ b/external_imported/vcpkg/ports/tiny-bignum-c/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "tiny-bignum-c",
-  "version-string": "2019-07-31",
-  "port-version": 2,
+  "version-date": "2019-07-31",
+  "port-version": 3,
   "description": "Small portable multiple-precision unsigned integer arithmetic in C",
   "homepage": "https://github.com/kokke/tiny-bignum-c",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/tiny-dnn/vcpkg.json b/external_imported/vcpkg/ports/tiny-dnn/vcpkg.json
index 977ae26ad..58bd98b52 100644
--- a/external_imported/vcpkg/ports/tiny-dnn/vcpkg.json
+++ b/external_imported/vcpkg/ports/tiny-dnn/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "tiny-dnn",
-  "version-string": "2018-10-25",
-  "port-version": 1,
+  "version-date": "2018-10-25",
+  "port-version": 2,
   "description": "A C++14 implementation of deep learning. It is suitable for deep learning on limited computational resource.",
   "homepage": "https://github.com/tiny-dnn/tiny-dnn"
 }
diff --git a/external_imported/vcpkg/ports/tiny-process-library/vcpkg.json b/external_imported/vcpkg/ports/tiny-process-library/vcpkg.json
index 03f4c6858..6562566b3 100644
--- a/external_imported/vcpkg/ports/tiny-process-library/vcpkg.json
+++ b/external_imported/vcpkg/ports/tiny-process-library/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "tiny-process-library",
   "version": "2.0.4",
-  "port-version": 2,
+  "port-version": 3,
   "description": "A small platform independent library to create and stop new processes in C++",
   "homepage": "https://gitlab.com/eidheim/tiny-process-library/",
   "license": "MIT",
+  "supports": "!uwp",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/tiny-regex-c/vcpkg.json b/external_imported/vcpkg/ports/tiny-regex-c/vcpkg.json
index 3ed8ca1d0..202002ff2 100644
--- a/external_imported/vcpkg/ports/tiny-regex-c/vcpkg.json
+++ b/external_imported/vcpkg/ports/tiny-regex-c/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "tiny-regex-c",
-  "version-string": "2019-07-31",
-  "port-version": 2,
+  "version-date": "2019-07-31",
+  "port-version": 3,
   "description": "A small regex implementation in C",
   "homepage": "https://github.com/kokke/tiny-regex-c",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/tinycthread/vcpkg.json b/external_imported/vcpkg/ports/tinycthread/vcpkg.json
index ff8d59cec..a66b799ee 100644
--- a/external_imported/vcpkg/ports/tinycthread/vcpkg.json
+++ b/external_imported/vcpkg/ports/tinycthread/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "tinycthread",
-  "version-string": "2019-08-06",
-  "port-version": 2,
+  "version-date": "2019-08-06",
+  "port-version": 3,
   "description": "Small, portable implementation of the C11 threads API",
   "homepage": "https://tinycthread.github.io/",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/tinyexpr/vcpkg.json b/external_imported/vcpkg/ports/tinyexpr/vcpkg.json
index 1e9b2aeb6..7b55dfe28 100644
--- a/external_imported/vcpkg/ports/tinyexpr/vcpkg.json
+++ b/external_imported/vcpkg/ports/tinyexpr/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "tinyexpr",
-  "version-string": "2020-09-25",
-  "port-version": 1,
+  "version-date": "2020-09-25",
+  "port-version": 2,
   "description": "Tiny recursive descent parser and evaluation engine in C",
   "homepage": "https://codeplea.com/tinyexpr",
   "license": "Zlib",
diff --git a/external_imported/vcpkg/ports/tinyexr/fix-uwp.patch b/external_imported/vcpkg/ports/tinyexr/fix-uwp.patch
new file mode 100644
index 000000000..7a3cb66cb
--- /dev/null
+++ b/external_imported/vcpkg/ports/tinyexr/fix-uwp.patch
@@ -0,0 +1,12 @@
+--- a/tinyexr.h
++++ b/tinyexr.h
+@@ -608,7 +608,9 @@ extern int LoadEXRFromMemory(float **out_rgba, int *width, int *height,
+ #define NOMINMAX
+ #endif
+ #include <windows.h>  // for UTF-8 and memory-mapping
++#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP)
+ #define TINYEXR_USE_WIN32_MMAP (1)
++#endif
+ 
+ #elif defined(__linux__) || defined(__unix__)
+ #include <fcntl.h>     // for open()
diff --git a/external_imported/vcpkg/ports/tinyexr/portfile.cmake b/external_imported/vcpkg/ports/tinyexr/portfile.cmake
index 81b084ae4..4502350bf 100644
--- a/external_imported/vcpkg/ports/tinyexr/portfile.cmake
+++ b/external_imported/vcpkg/ports/tinyexr/portfile.cmake
@@ -3,11 +3,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO syoyo/tinyexr
-    REF v1.0.1
-    SHA512 ba3bc09e7c2a93016b260849eb365a05fe1113c55f824767a19a20e3a6ff2a09dd686aa15094dd6c4508e68915dc8eb4a0ccc9778de73d9b55354701e7820e76
+    REF "v${VERSION}"
+    SHA512 c15ac7d21cba70c3247ea49674191097325fcba7bfaeb8163298ded2e3b67f55b1b6486fd90a80f23f950661e96c063a28a70569f40a8938cd41249c34b4bbfe
     HEAD_REF master
     PATCHES
         fixtargets.patch
+        fix-uwp.patch # https://github.com/syoyo/tinyexr/pull/195
 )
 
 vcpkg_cmake_configure(
diff --git a/external_imported/vcpkg/ports/tinyexr/vcpkg.json b/external_imported/vcpkg/ports/tinyexr/vcpkg.json
index c87d92e0a..2871772fb 100644
--- a/external_imported/vcpkg/ports/tinyexr/vcpkg.json
+++ b/external_imported/vcpkg/ports/tinyexr/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "tinyexr",
-  "version": "1.0.1",
+  "version": "1.0.5",
   "description": "Library to load and save OpenEXR(.exr) images",
   "homepage": "https://github.com/syoyo/tinyexr",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/tinyfsm/portfile.cmake b/external_imported/vcpkg/ports/tinyfsm/portfile.cmake
new file mode 100644
index 000000000..b9d9fff41
--- /dev/null
+++ b/external_imported/vcpkg/ports/tinyfsm/portfile.cmake
@@ -0,0 +1,11 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO digint/tinyfsm
+    REF v${VERSION}
+    SHA512 1a471ba9a62658211353fcebc5f824e14506870b70af34af324ff720c957457625d819caa2701088cfe48cc055780def2e88ebcc10744f44bb6870e3fc2129a3
+    HEAD_REF master
+)
+
+file(INSTALL "${SOURCE_PATH}/include/tinyfsm.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/tinyfsm/vcpkg.json b/external_imported/vcpkg/ports/tinyfsm/vcpkg.json
new file mode 100644
index 000000000..604f02ee9
--- /dev/null
+++ b/external_imported/vcpkg/ports/tinyfsm/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "tinyfsm",
+  "version": "0.3.3",
+  "description": "A simple C++ finite state machine library",
+  "homepage": "https://digint.ch/tinyfsm/",
+  "license": "MIT"
+}
diff --git a/external_imported/vcpkg/ports/tinygltf/portfile.cmake b/external_imported/vcpkg/ports/tinygltf/portfile.cmake
index 373167a25..f49297cdb 100644
--- a/external_imported/vcpkg/ports/tinygltf/portfile.cmake
+++ b/external_imported/vcpkg/ports/tinygltf/portfile.cmake
@@ -2,8 +2,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO syoyo/tinygltf
-    REF "v.${VERSION}"
-    SHA512 e5309e4018db1c2fde8d5fcf0fef2a0a2fc37fc69524ee3cdc89cbf1a163da42e71c5e2154befe0eaac5d33e345698ff05b1aea6952f2cd18d908787c758d2f9
+    REF "v${VERSION}"
+    SHA512 b9cb2283552268e690e17520882247273a60b38b50d27980c6921f897aa3234ac4a5920219fa7191c773d6d8848d097090f31fc4a720097322ffe5894c391687
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/tinygltf/vcpkg.json b/external_imported/vcpkg/ports/tinygltf/vcpkg.json
index 6f0124dff..c8be1fe49 100644
--- a/external_imported/vcpkg/ports/tinygltf/vcpkg.json
+++ b/external_imported/vcpkg/ports/tinygltf/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "tinygltf",
-  "version": "2.8.4",
+  "version": "2.8.20",
   "description": "A header only C++11 glTF 2.0 library.",
   "homepage": "https://github.com/syoyo/tinygltf",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/tinynpy/vcpkg.json b/external_imported/vcpkg/ports/tinynpy/vcpkg.json
index aa85e1747..f70612805 100644
--- a/external_imported/vcpkg/ports/tinynpy/vcpkg.json
+++ b/external_imported/vcpkg/ports/tinynpy/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "tinynpy",
-  "version-string": "1.0.0",
-  "port-version": 5,
+  "version": "1.0.0",
+  "port-version": 6,
   "description": "tiny C++ loader/exporter of python numpy array NPY/NPZ files",
   "dependencies": [
     {
diff --git a/external_imported/vcpkg/ports/tinyorm/portfile.cmake b/external_imported/vcpkg/ports/tinyorm/portfile.cmake
new file mode 100644
index 000000000..74d14ea3b
--- /dev/null
+++ b/external_imported/vcpkg/ports/tinyorm/portfile.cmake
@@ -0,0 +1,43 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO silverqx/TinyORM
+    REF "v${VERSION}"
+    SHA512 ba3bf73972a6265663122e2c260354cf213dcdcf7bfd1f7a6a7eb43eb11e06fbed581b3f6ce28898eb60a85d0c9bfe45bfaa9596d92b62ca40702ede9856b183
+    HEAD_REF main
+    PATCHES
+        suppress-warning-STL4043.patch
+)
+
+vcpkg_check_features(
+    OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    PREFIX TINYORM
+    FEATURES
+        disable-thread-local DISABLE_THREAD_LOCAL
+        inline-constants     INLINE_CONSTANTS
+        mysql-ping           MYSQL_PING
+        orm                  ORM
+        strict-mode          STRICT_MODE
+        tom                  TOM
+        tom-example          TOM_EXAMPLE
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DCMAKE_EXPORT_PACKAGE_REGISTRY:BOOL=OFF
+        -DBUILD_TESTS:BOOL=OFF
+        -DTINY_PORT:STRING=${PORT}
+        -DTINY_VCPKG:BOOL=ON
+        -DVERBOSE_CONFIGURE:BOOL=ON
+        ${FEATURE_OPTIONS}
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup()
+
+if(TINYORM_TOM_EXAMPLE)
+    vcpkg_copy_tools(TOOL_NAMES tom AUTO_CLEAN)
+endif()
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/tinyorm/suppress-warning-STL4043.patch b/external_imported/vcpkg/ports/tinyorm/suppress-warning-STL4043.patch
new file mode 100644
index 000000000..8c048d0a4
--- /dev/null
+++ b/external_imported/vcpkg/ports/tinyorm/suppress-warning-STL4043.patch
@@ -0,0 +1,18 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8b6f2cd..7a2e32f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -41,6 +41,13 @@ project(${TinyOrm_ns}
+ set(CMAKE_CXX_STANDARD 20)
+ set(CMAKE_CXX_STANDARD_REQUIRED YES)
+ set(CMAKE_CXX_EXTENSIONS OFF)
++
++if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
++    if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "19.38.32914.95")
++        add_compile_options(-D_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING)
++    endif()
++endif()
++
+ # Set the AUTOMOC property explicitly only when needed (eg. unit tests need AUTOMOC)
+ set(CMAKE_AUTOMOC OFF)
+ 
diff --git a/external_imported/vcpkg/ports/tinyorm/vcpkg.json b/external_imported/vcpkg/ports/tinyorm/vcpkg.json
new file mode 100644
index 000000000..6ec027afc
--- /dev/null
+++ b/external_imported/vcpkg/ports/tinyorm/vcpkg.json
@@ -0,0 +1,107 @@
+{
+  "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
+  "name": "tinyorm",
+  "version-semver": "0.36.5",
+  "port-version": 2,
+  "maintainers": "Silver Zachara <silver.zachara@gmail.com>",
+  "description": "Modern C++ ORM library for Qt framework",
+  "homepage": "https://github.com/silverqx/TinyORM",
+  "documentation": "https://www.tinyorm.org",
+  "license": "MIT",
+  "supports": "!(uwp | arm | android | emscripten | osx | ios | xbox | freebsd | openbsd | wasm32)",
+  "dependencies": [
+    {
+      "name": "qtbase",
+      "default-features": false,
+      "features": [
+        "sql"
+      ]
+    },
+    "range-v3",
+    "tabulate",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
+  "default-features": [
+    "orm",
+    "sql-sqlite",
+    "tom"
+  ],
+  "features": {
+    "disable-thread-local": {
+      "description": "Remove all thread_local storage duration specifiers (disables multi-threading support)"
+    },
+    "inline-constants": {
+      "description": "Use inline constants instead of extern constants in shared builds"
+    },
+    "mysql-ping": {
+      "description": "Install MySQL C client library (libmysql) to support the mysql_ping()",
+      "dependencies": [
+        "libmysql"
+      ]
+    },
+    "orm": {
+      "description": "Enable ORM-related source code (without it only the query builder is compiled)"
+    },
+    "sql-mysql": {
+      "description": "Build Qt SQL Driver for MySQL",
+      "dependencies": [
+        {
+          "name": "qtbase",
+          "default-features": false,
+          "features": [
+            "sql-mysql"
+          ]
+        }
+      ]
+    },
+    "sql-psql": {
+      "description": "Build Qt SQL Driver for PostgreSQL",
+      "dependencies": [
+        {
+          "name": "qtbase",
+          "default-features": false,
+          "features": [
+            "sql-psql"
+          ]
+        }
+      ]
+    },
+    "sql-sqlite": {
+      "description": "Build Qt SQL Driver for SQLite",
+      "dependencies": [
+        {
+          "name": "qtbase",
+          "default-features": false,
+          "features": [
+            "sql-sqlite"
+          ]
+        }
+      ]
+    },
+    "strict-mode": {
+      "description": "Propagate strict compiler/linker options and Qt definitions"
+    },
+    "tom": {
+      "description": "Enable Tom-related source code (command-line interface)"
+    },
+    "tom-example": {
+      "description": "Build Tom command-line application example",
+      "dependencies": [
+        {
+          "name": "tinyorm",
+          "default-features": false,
+          "features": [
+            "tom"
+          ]
+        }
+      ]
+    }
+  }
+}
diff --git a/external_imported/vcpkg/ports/tinythread/vcpkg.json b/external_imported/vcpkg/ports/tinythread/vcpkg.json
index 2516f97ab..27ffb8cda 100644
--- a/external_imported/vcpkg/ports/tinythread/vcpkg.json
+++ b/external_imported/vcpkg/ports/tinythread/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "tinythread",
-  "version-string": "1.1",
-  "port-version": 5,
+  "version": "1.1",
+  "port-version": 6,
   "description": "Implements a fairly compatible subset of the C++11 thread management classes",
   "homepage": "https://tinythreadpp.bitsnbites.eu/",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/tinytoml/vcpkg.json b/external_imported/vcpkg/ports/tinytoml/vcpkg.json
index f7a894c86..d394ff452 100644
--- a/external_imported/vcpkg/ports/tinytoml/vcpkg.json
+++ b/external_imported/vcpkg/ports/tinytoml/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "tinytoml",
-  "version-string": "20180219",
-  "port-version": 2,
+  "version": "20180219",
+  "port-version": 3,
   "description": "A header only C++11 library for parsing TOML.",
   "homepage": "https://github.com/mayah/tinytoml"
 }
diff --git a/external_imported/vcpkg/ports/tinyxml/vcpkg.json b/external_imported/vcpkg/ports/tinyxml/vcpkg.json
index 7a84ea10c..65bb00a07 100644
--- a/external_imported/vcpkg/ports/tinyxml/vcpkg.json
+++ b/external_imported/vcpkg/ports/tinyxml/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "tinyxml",
-  "version-string": "2.6.2",
-  "port-version": 9,
+  "version": "2.6.2",
+  "port-version": 10,
   "description": "A simple, small, minimal, C++ XML parser that can be easily integrating into other programs.",
   "homepage": "https://sourceforge.net/projects/tinyxml",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/tl-expected/portfile.cmake b/external_imported/vcpkg/ports/tl-expected/portfile.cmake
index 2cd9721cf..4f353cb59 100644
--- a/external_imported/vcpkg/ports/tl-expected/portfile.cmake
+++ b/external_imported/vcpkg/ports/tl-expected/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO TartanLlama/expected
-    REF b74fecd4448a1a5549402d17ddc51e39faa5020c # 2022-11-24
-    SHA512 d59d7a63dc0f7244cd0a65971ed2b51e2d01de8658b043673aacb83c7bcefb90009f2d5792a49943c9d5e80f9f5811f5db3db1bb11f8429c9e732c872b91ae66
+    REF "v${VERSION}"
+    SHA512 ce970c31582869af9d0b3349f386db207dd4881db0bdfd3744331b0a62fe2886dde598a75882fb00254afa3549fb9d4c2bd1ff7682744891d403edfd4ff73492
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/tl-expected/vcpkg.json b/external_imported/vcpkg/ports/tl-expected/vcpkg.json
index 5a0e940b5..0508898d6 100644
--- a/external_imported/vcpkg/ports/tl-expected/vcpkg.json
+++ b/external_imported/vcpkg/ports/tl-expected/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "tl-expected",
-  "version-date": "2022-11-24",
+  "version": "1.1.0",
   "description": "C++11/14/17 std::expected implementation with functional-style extensions",
   "homepage": "https://github.com/TartanLlama/expected",
   "documentation": "https://tl.tartanllama.xyz/en/latest/api/expected.html",
diff --git a/external_imported/vcpkg/ports/tl-function-ref/vcpkg.json b/external_imported/vcpkg/ports/tl-function-ref/vcpkg.json
index 1a58e86da..3760dd5cb 100644
--- a/external_imported/vcpkg/ports/tl-function-ref/vcpkg.json
+++ b/external_imported/vcpkg/ports/tl-function-ref/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "tl-function-ref",
-  "version-string": "1.0.0",
-  "port-version": 3,
+  "version": "1.0.0",
+  "port-version": 4,
   "description": "A lightweight, non-owning reference to a callable.",
   "dependencies": [
     {
diff --git a/external_imported/vcpkg/ports/tlx/vcpkg.json b/external_imported/vcpkg/ports/tlx/vcpkg.json
index cf5acdf1c..b30110a40 100644
--- a/external_imported/vcpkg/ports/tlx/vcpkg.json
+++ b/external_imported/vcpkg/ports/tlx/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "tlx",
-  "version-string": "0.5.20191212",
-  "port-version": 3,
+  "version": "0.5.20191212",
+  "port-version": 4,
   "description": "tlx is a collection of C++ helpers and extensions universally needed, but not found in the STL",
   "homepage": "https://github.com/tlx/tlx",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/tmxlite/dependencies.patch b/external_imported/vcpkg/ports/tmxlite/dependencies.patch
new file mode 100644
index 000000000..e06180650
--- /dev/null
+++ b/external_imported/vcpkg/ports/tmxlite/dependencies.patch
@@ -0,0 +1,29 @@
+diff --git a/tmxlite/CMakeLists.txt b/tmxlite/CMakeLists.txt
+index a1b1882..8c0aad6 100644
+--- a/tmxlite/CMakeLists.txt
++++ b/tmxlite/CMakeLists.txt
+@@ -68,10 +68,9 @@ if(USE_EXTLIBS)
+     SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/")
+     
+     find_package(ZLIB REQUIRED)
+-    find_package(PUGIXML REQUIRED)
+-    find_package(Zstd REQUIRED)
++    find_package(pugixml CONFIG REQUIRED)
++    find_package(zstd CONFIG REQUIRED)
+     
+-    include_directories(${ZLIB_INCLUDE_DIRS} ${PUGIXML_INCLUDE_DIR} ${ZSTD_INCLUDE_DIR})
+     
+ else()
+     #add miniz and pugixml from source
+@@ -102,7 +101,10 @@ else()
+ endif()
+ 
+ if(USE_EXTLIBS)
+-    target_link_libraries(${PROJECT_NAME} ${ZLIB_LIBRARIES} ${PUGIXML_LIBRARY} ${ZSTD_LIBRARY})
++    target_link_libraries(${PROJECT_NAME} PRIVATE
++      $<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>
++      pugixml::pugixml
++      ZLIB::ZLIB)
+ else()
+     if(USE_ZSTD)
+     target_link_libraries(${PROJECT_NAME} ${ZSTD_LIBRARY})    
diff --git a/external_imported/vcpkg/ports/tmxlite/portfile.cmake b/external_imported/vcpkg/ports/tmxlite/portfile.cmake
index aaf079cb7..592746d26 100644
--- a/external_imported/vcpkg/ports/tmxlite/portfile.cmake
+++ b/external_imported/vcpkg/ports/tmxlite/portfile.cmake
@@ -1,21 +1,38 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO fallahn/tmxlite
-    REF v1.3.0
+    REF "v${VERSION}"
     HEAD_REF master
-    SHA512 3D432152080F7FDDD14A150FF87C34932695C96D7F676399C7610FF373972223CE54C9483BD9A872FD53668C113E334FCBF8596AE21CFDAF83B6159C7287A4A3
+    SHA512 0ffe0505329f00ef9872998673a7c220a9a5352f830688ef17952c0c4f001e0c2994a3a28f0e7de60cc82fff2701561cccbc2143fd51984bf4870e7d1fd0a2ba
+    PATCHES
+        dependencies.patch
 )
 
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" TMXLITE_STATIC_LIB)
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}/tmxlite"
+    OPTIONS
+        -DTMXLITE_STATIC_LIB=${TMXLITE_STATIC_LIB}
+        -DUSE_EXTLIBS=ON
+        -DPKGCONF_REQ_PUB=pugixml
 )
 
 vcpkg_cmake_install()
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+vcpkg_fixup_pkgconfig()
+vcpkg_copy_pdbs()
+
+set(STATIC_POSTFIX "")
+if(TMXLITE_STATIC_LIB)
+    set(STATIC_POSTFIX "-s")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/tmxlite.pc" "-ltmxlite" "-ltmxlite${STATIC_POSTFIX}")
+endif()
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+if(NOT VCPKG_BUILD_TYPE)
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/tmxlite.pc" "-ltmxlite" "-ltmxlite${STATIC_POSTFIX}-d")
 endif()
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/tmxlite/vcpkg.json b/external_imported/vcpkg/ports/tmxlite/vcpkg.json
index fdecfa92a..80a34c80b 100644
--- a/external_imported/vcpkg/ports/tmxlite/vcpkg.json
+++ b/external_imported/vcpkg/ports/tmxlite/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "tmxlite",
-  "version": "1.3.0",
-  "port-version": 1,
+  "version": "1.4.4",
   "description": "A lightweight C++14 parsing library for tmx map files created with the Tiled map editor.",
+  "homepage": "https://github.com/fallahn/tmxlite",
   "license": "Zlib",
   "dependencies": [
+    "pugixml",
     {
       "name": "vcpkg-cmake",
       "host": true
@@ -12,6 +13,8 @@
     {
       "name": "vcpkg-cmake-config",
       "host": true
-    }
+    },
+    "zlib",
+    "zstd"
   ]
 }
diff --git a/external_imported/vcpkg/ports/tomlplusplus/fix-android-fileapi.patch b/external_imported/vcpkg/ports/tomlplusplus/fix-android-fileapi.patch
new file mode 100644
index 000000000..7d78bf724
--- /dev/null
+++ b/external_imported/vcpkg/ports/tomlplusplus/fix-android-fileapi.patch
@@ -0,0 +1,17 @@
+diff --git a/include/toml++/impl/parser.inl b/include/toml++/impl/parser.inl
+index 6f0136f..be37f0d 100644
+--- a/include/toml++/impl/parser.inl
++++ b/include/toml++/impl/parser.inl
+@@ -23,6 +23,12 @@
+ #include "unicode.hpp"
+ TOML_DISABLE_WARNINGS;
+ #include <istream>
++
++#if defined(__ANDROID_API__) && __ANDROID_API__ < 24
++    // Cf. https://android.googlesource.com/platform/bionic/+/master/docs/32-bit-abi.md#32_bit-and
++    #define ftello ftell
++    #define fseeko fseek
++#endif
+ #include <fstream>
+ #if TOML_INT_CHARCONV || TOML_FLOAT_CHARCONV
+ #include <charconv>
diff --git a/external_imported/vcpkg/ports/tomlplusplus/portfile.cmake b/external_imported/vcpkg/ports/tomlplusplus/portfile.cmake
index dd0d7b869..25cb4544c 100644
--- a/external_imported/vcpkg/ports/tomlplusplus/portfile.cmake
+++ b/external_imported/vcpkg/ports/tomlplusplus/portfile.cmake
@@ -1,25 +1,23 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO marzer/tomlplusplus
-    REF v3.1.0
-    SHA512 b5223fa978b606f6b14fa74495884ccd491fa6017ef44b2ac9a384fa1df7100745145163e2a139255927fb51e5ecd779ee2643c19579eab6e4533b15e75c9be9
+    REF "v${VERSION}"
+    SHA512 c227fc8147c9459b29ad24002aaf6ab2c42fac22ea04c1c52b283a0172581ccd4527b33c1931e0ef0d1db6b6a53f9e9882c6d4231c7f3494cf070d0220741aa5
     HEAD_REF master
+    PATCHES
+        fix-android-fileapi.patch
 )
 
 vcpkg_configure_meson(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-        -Dgenerate_cmake_config=true
+        -Dgenerate_cmake_config=false
         -Dbuild_tests=false
         -Dbuild_examples=false
 )
 
 vcpkg_install_meson()
-vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/tomlplusplus)
-cmake_path(NATIVE_PATH SOURCE_PATH native_source_path)
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/tomlplusplus/tomlplusplusConfig.cmake" "${native_source_path}" "")
 vcpkg_fixup_pkgconfig()
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
-
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/tomlplusplus/usage b/external_imported/vcpkg/ports/tomlplusplus/usage
new file mode 100644
index 000000000..b178ba27d
--- /dev/null
+++ b/external_imported/vcpkg/ports/tomlplusplus/usage
@@ -0,0 +1,5 @@
+The package tomlplusplus can be imported via CMake FindPkgConfig module:
+
+    find_package(PkgConfig REQUIRED)
+    pkg_check_modules(tomlplusplus REQUIRED IMPORTED_TARGET tomlplusplus)
+    target_link_libraries(main PkgConfig::tomlplusplus)
diff --git a/external_imported/vcpkg/ports/tomlplusplus/vcpkg.json b/external_imported/vcpkg/ports/tomlplusplus/vcpkg.json
index 2ecfcff54..bdde65521 100644
--- a/external_imported/vcpkg/ports/tomlplusplus/vcpkg.json
+++ b/external_imported/vcpkg/ports/tomlplusplus/vcpkg.json
@@ -1,15 +1,11 @@
 {
   "name": "tomlplusplus",
-  "version": "3.1.0",
+  "version": "3.4.0",
   "description": "Header-only TOML config file parser and serializer for modern C++.",
   "homepage": "https://marzer.github.io/tomlplusplus/",
   "license": "MIT",
   "supports": "!uwp",
   "dependencies": [
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
-    },
     {
       "name": "vcpkg-tool-meson",
       "host": true
diff --git a/external_imported/vcpkg/ports/tool-meson/portfile.cmake b/external_imported/vcpkg/ports/tool-meson/portfile.cmake
deleted file mode 100644
index ed3c452cc..000000000
--- a/external_imported/vcpkg/ports/tool-meson/portfile.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-#deprecated port. -> new port "vcpkg-tool-meson" for better grouping with other vcpkg tools 
-set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
-vcpkg_find_acquire_program(MESON)
-message(STATUS "Using meson: ${MESON}")
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/tool-meson/vcpkg.json b/external_imported/vcpkg/ports/tool-meson/vcpkg.json
deleted file mode 100644
index 4601eda68..000000000
--- a/external_imported/vcpkg/ports/tool-meson/vcpkg.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "name": "tool-meson",
-  "version-date": "2022-01-21",
-  "description": "Meson build system",
-  "homepage": "https://github.com/mesonbuild/meson",
-  "dependencies": [
-    {
-      "name": "vcpkg-tool-meson",
-      "host": true
-    }
-  ]
-}
diff --git a/external_imported/vcpkg/ports/tracy/001-fix-vcxproj-vcpkg.patch b/external_imported/vcpkg/ports/tracy/001-fix-vcxproj-vcpkg.patch
index f712a4974..fa7a1c9b3 100644
--- a/external_imported/vcpkg/ports/tracy/001-fix-vcxproj-vcpkg.patch
+++ b/external_imported/vcpkg/ports/tracy/001-fix-vcxproj-vcpkg.patch
@@ -1,5 +1,113 @@
+diff --git a/capture/build/win32/capture.vcxproj b/capture/build/win32/capture.vcxproj
+index be512f84..e810395a 100644
+--- a/capture/build/win32/capture.vcxproj
++++ b/capture/build/win32/capture.vcxproj
+@@ -57,12 +57,11 @@
+       <PreprocessorDefinitions>TRACY_NO_STATISTICS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+       <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
+       <LanguageStandard>stdcpplatest</LanguageStandard>
+-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>$(VcpkgInstalledDir)\$(VcpkgTriplet)\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\capstone</AdditionalIncludeDirectories>
+     </ClCompile>
+     <Link>
+-      <AdditionalDependencies>ws2_32.lib;capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+       <SubSystem>Console</SubSystem>
+-      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\debug\lib</AdditionalLibraryDirectories>
+     </Link>
+   </ItemDefinitionGroup>
+   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+@@ -77,14 +76,13 @@
+       <PreprocessorDefinitions>TRACY_NO_STATISTICS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+       <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
+       <LanguageStandard>stdcpplatest</LanguageStandard>
+-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>$(VcpkgInstalledDir)\$(VcpkgTriplet)\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\capstone</AdditionalIncludeDirectories>
+     </ClCompile>
+     <Link>
+       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+       <OptimizeReferences>true</OptimizeReferences>
+-      <AdditionalDependencies>ws2_32.lib;capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+       <SubSystem>Console</SubSystem>
+-      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib</AdditionalLibraryDirectories>
+     </Link>
+   </ItemDefinitionGroup>
+   <ItemGroup>
+diff --git a/csvexport/build/win32/csvexport.vcxproj b/csvexport/build/win32/csvexport.vcxproj
+index b4adbf68..8715c883 100644
+--- a/csvexport/build/win32/csvexport.vcxproj
++++ b/csvexport/build/win32/csvexport.vcxproj
+@@ -57,12 +57,11 @@
+       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+       <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
+       <LanguageStandard>stdcpplatest</LanguageStandard>
+-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>$(VcpkgInstalledDir)\$(VcpkgTriplet)\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\capstone</AdditionalIncludeDirectories>
+     </ClCompile>
+     <Link>
+-      <AdditionalDependencies>ws2_32.lib;capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+       <SubSystem>Console</SubSystem>
+-      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\debug\lib</AdditionalLibraryDirectories>
+     </Link>
+   </ItemDefinitionGroup>
+   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+@@ -77,14 +76,13 @@
+       <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+       <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
+       <LanguageStandard>stdcpplatest</LanguageStandard>
+-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>$(VcpkgInstalledDir)\$(VcpkgTriplet)\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\capstone</AdditionalIncludeDirectories>
+     </ClCompile>
+     <Link>
+       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+       <OptimizeReferences>true</OptimizeReferences>
+-      <AdditionalDependencies>ws2_32.lib;capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+       <SubSystem>Console</SubSystem>
+-      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib</AdditionalLibraryDirectories>
+     </Link>
+   </ItemDefinitionGroup>
+   <ItemGroup>
+diff --git a/import-chrome/build/win32/import-chrome.vcxproj b/import-chrome/build/win32/import-chrome.vcxproj
+index 058a2aa3..86c0990b 100644
+--- a/import-chrome/build/win32/import-chrome.vcxproj
++++ b/import-chrome/build/win32/import-chrome.vcxproj
+@@ -57,12 +57,11 @@
+       <PreprocessorDefinitions>TRACY_NO_STATISTICS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+       <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
+       <LanguageStandard>stdcpplatest</LanguageStandard>
+-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>$(VcpkgInstalledDir)\$(VcpkgTriplet)\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\capstone</AdditionalIncludeDirectories>
+     </ClCompile>
+     <Link>
+-      <AdditionalDependencies>ws2_32.lib;capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+       <SubSystem>Console</SubSystem>
+-      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\debug\lib</AdditionalLibraryDirectories>
+     </Link>
+   </ItemDefinitionGroup>
+   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+@@ -77,14 +76,13 @@
+       <PreprocessorDefinitions>TRACY_NO_STATISTICS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+       <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
+       <LanguageStandard>stdcpplatest</LanguageStandard>
+-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>$(VcpkgInstalledDir)\$(VcpkgTriplet)\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\capstone</AdditionalIncludeDirectories>
+     </ClCompile>
+     <Link>
+       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+       <OptimizeReferences>true</OptimizeReferences>
+-      <AdditionalDependencies>ws2_32.lib;capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+       <SubSystem>Console</SubSystem>
+-      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib</AdditionalLibraryDirectories>
+     </Link>
+   </ItemDefinitionGroup>
+   <ItemGroup>
 diff --git a/profiler/build/win32/Tracy.vcxproj b/profiler/build/win32/Tracy.vcxproj
-index 7be39025..ddb49fbc 100644
+index 7b5d7cde..9a358b4d 100644
 --- a/profiler/build/win32/Tracy.vcxproj
 +++ b/profiler/build/win32/Tracy.vcxproj
 @@ -60,7 +60,7 @@
@@ -7,7 +115,7 @@ index 7be39025..ddb49fbc 100644
        <SDLCheck>true</SDLCheck>
        <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;IMGUI_ENABLE_FREETYPE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 -      <AdditionalIncludeDirectories>..\..\..\imgui;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>..\..\..\imgui;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>..\..\..\imgui;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <MultiProcessorCompilation>true</MultiProcessorCompilation>
        <MinimalRebuild>false</MinimalRebuild>
        <ConformanceMode>true</ConformanceMode>
@@ -15,7 +123,7 @@ index 7be39025..ddb49fbc 100644
        <FloatingPointModel>Fast</FloatingPointModel>
      </ClCompile>
      <Link>
--      <AdditionalDependencies>brotlicommon-static.lib;brotlidec-static.lib;ws2_32.lib;freetyped.lib;glfw3.lib;libpng16d.lib;zlibd.lib;bz2d.lib;capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+-      <AdditionalDependencies>brotlicommon.lib;brotlidec.lib;ws2_32.lib;freetyped.lib;glfw3.lib;libpng16d.lib;zlibd.lib;bz2d.lib;capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
 +      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
        <SubSystem>Windows</SubSystem>
 -      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\debug\lib</AdditionalLibraryDirectories>
@@ -27,7 +135,7 @@ index 7be39025..ddb49fbc 100644
        <SDLCheck>true</SDLCheck>
        <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;IMGUI_ENABLE_FREETYPE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 -      <AdditionalIncludeDirectories>..\..\..\imgui;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>..\..\..\imgui;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>..\..\..\imgui;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <MultiProcessorCompilation>true</MultiProcessorCompilation>
        <ConformanceMode>true</ConformanceMode>
        <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
@@ -35,10 +143,46 @@ index 7be39025..ddb49fbc 100644
      <Link>
        <EnableCOMDATFolding>true</EnableCOMDATFolding>
        <OptimizeReferences>true</OptimizeReferences>
--      <AdditionalDependencies>brotlicommon-static.lib;brotlidec-static.lib;ws2_32.lib;freetype.lib;glfw3.lib;libpng16.lib;zlib.lib;bz2.lib;capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
+-      <AdditionalDependencies>brotlicommon.lib;brotlidec.lib;ws2_32.lib;freetype.lib;glfw3.lib;libpng16.lib;zlib.lib;bz2.lib;capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
 +      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
        <SubSystem>Windows</SubSystem>
 -      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib</AdditionalLibraryDirectories>
      </Link>
      <Manifest>
        <EnableDpiAwareness>true</EnableDpiAwareness>
+diff --git a/update/build/win32/update.vcxproj b/update/build/win32/update.vcxproj
+index 55f0e55e..cbdf8c35 100644
+--- a/update/build/win32/update.vcxproj
++++ b/update/build/win32/update.vcxproj
+@@ -57,12 +57,11 @@
+       <PreprocessorDefinitions>TRACY_NO_STATISTICS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+       <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
+       <LanguageStandard>stdcpplatest</LanguageStandard>
+-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>$(VcpkgInstalledDir)\$(VcpkgTriplet)\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\capstone</AdditionalIncludeDirectories>
+     </ClCompile>
+     <Link>
+-      <AdditionalDependencies>ws2_32.lib;capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+       <SubSystem>Console</SubSystem>
+-      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\debug\lib</AdditionalLibraryDirectories>
+     </Link>
+   </ItemDefinitionGroup>
+   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+@@ -77,14 +76,13 @@
+       <PreprocessorDefinitions>TRACY_NO_STATISTICS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+       <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
+       <LanguageStandard>stdcpplatest</LanguageStandard>
+-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>$(VcpkgInstalledDir)\$(VcpkgTriplet)\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\capstone</AdditionalIncludeDirectories>
+     </ClCompile>
+     <Link>
+       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+       <OptimizeReferences>true</OptimizeReferences>
+-      <AdditionalDependencies>ws2_32.lib;capstone.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+       <SubSystem>Console</SubSystem>
+-      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib</AdditionalLibraryDirectories>
+     </Link>
+   </ItemDefinitionGroup>
+   <ItemGroup>
diff --git a/external_imported/vcpkg/ports/tracy/002-fix-capstone-5.patch b/external_imported/vcpkg/ports/tracy/002-fix-capstone-5.patch
deleted file mode 100644
index 2c9f4c753..000000000
--- a/external_imported/vcpkg/ports/tracy/002-fix-capstone-5.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/server/TracySourceView.cpp b/server/TracySourceView.cpp
-index cc56298..7b9370a 100644
---- a/server/TracySourceView.cpp
-+++ b/server/TracySourceView.cpp
-@@ -2,7 +2,7 @@
- #include <inttypes.h>
- #include <stdio.h>
- 
--#include <capstone.h>
-+#include <capstone/capstone.h>
- 
- #include "imgui.h"
- #include "TracyCharUtil.hpp"
-diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp
-index fcb1718..2433e59 100644
---- a/server/TracyWorker.cpp
-+++ b/server/TracyWorker.cpp
-@@ -19,7 +19,7 @@
- #include <inttypes.h>
- #include <sys/stat.h>
- 
--#include <capstone.h>
-+#include <capstone/capstone.h>
- 
- #define ZDICT_STATIC_LINKING_ONLY
- #include "../zstd/zdict.h"
diff --git a/external_imported/vcpkg/ports/tracy/002-use-internal-imgui.patch b/external_imported/vcpkg/ports/tracy/002-use-internal-imgui.patch
new file mode 100644
index 000000000..29f6d9af6
--- /dev/null
+++ b/external_imported/vcpkg/ports/tracy/002-use-internal-imgui.patch
@@ -0,0 +1,26 @@
+diff --git a/profiler/build/unix/build.mk b/profiler/build/unix/build.mk
+index b134432b..42a9ba0a 100644
+--- a/profiler/build/unix/build.mk
++++ b/profiler/build/unix/build.mk
+@@ -1,7 +1,7 @@
+ CFLAGS +=
+ CXXFLAGS := $(CFLAGS) -std=c++17
+ DEFINES += -DIMGUI_ENABLE_FREETYPE
+-INCLUDES := $(shell pkg-config --cflags freetype2 capstone wayland-egl egl wayland-cursor xkbcommon) -I../../../imgui
++INCLUDES := -I../../../imgui $(shell pkg-config --cflags freetype2 capstone wayland-egl egl wayland-cursor xkbcommon)
+ LIBS := $(shell pkg-config --libs freetype2 capstone wayland-egl egl wayland-cursor xkbcommon) -lpthread -ldl
+ 
+ PROJECT := Tracy
+diff --git a/profiler/build/unix/legacy.mk b/profiler/build/unix/legacy.mk
+index 24765f1a..dc2923c8 100644
+--- a/profiler/build/unix/legacy.mk
++++ b/profiler/build/unix/legacy.mk
+@@ -1,7 +1,7 @@
+ CFLAGS +=
+ CXXFLAGS := $(CFLAGS) -std=c++17
+ DEFINES += -DIMGUI_ENABLE_FREETYPE
+-INCLUDES := $(shell pkg-config --cflags glfw3 freetype2 capstone) -I../../../imgui
++INCLUDES := -I../../../imgui $(shell pkg-config --cflags glfw3 freetype2 capstone)
+ LIBS := $(shell pkg-config --libs glfw3 freetype2 capstone) -lpthread -ldl
+ 
+ PROJECT := Tracy
diff --git a/external_imported/vcpkg/ports/tracy/003-fix-imgui-path.patch b/external_imported/vcpkg/ports/tracy/003-fix-imgui-path.patch
deleted file mode 100644
index 9e6d94ef8..000000000
--- a/external_imported/vcpkg/ports/tracy/003-fix-imgui-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/profiler/build/unix/build.mk b/profiler/build/unix/build.mk
-index 24765f1a..dc2923c8 100644
---- a/profiler/build/unix/build.mk
-+++ b/profiler/build/unix/build.mk
-@@ -1,7 +1,7 @@
- CFLAGS +=
- CXXFLAGS := $(CFLAGS) -std=c++17
- DEFINES += -DIMGUI_ENABLE_FREETYPE
--INCLUDES := $(shell pkg-config --cflags glfw3 freetype2 capstone) -I../../../imgui
-+INCLUDES := -I../../../imgui $(shell pkg-config --cflags glfw3 freetype2 capstone)
- LIBS := $(shell pkg-config --libs glfw3 freetype2 capstone) -lpthread -ldl
- 
- PROJECT := Tracy
diff --git a/external_imported/vcpkg/ports/tracy/004-fix-crash-handler.patch b/external_imported/vcpkg/ports/tracy/004-fix-crash-handler.patch
deleted file mode 100644
index cbfd57a59..000000000
--- a/external_imported/vcpkg/ports/tracy/004-fix-crash-handler.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/public/client/TracyProfiler.cpp b/public/client/TracyProfiler.cpp
-index ea168e4f..9287d433 100644
---- a/public/client/TracyProfiler.cpp
-+++ b/public/client/TracyProfiler.cpp
-@@ -1454,7 +1454,7 @@ Profiler::~Profiler()
-     if( m_crashHandlerInstalled ) RemoveVectoredExceptionHandler( m_exceptionHandler );
- #endif
- 
--#ifdef __linux__
-+#if defined __linux__ && !defined TRACY_NO_CRASH_HANDLER
-     if( m_crashHandlerInstalled )
-     {
-         sigaction( TRACY_CRASH_SIGNAL, &m_prevSignal.pwr, nullptr );
-@@ -1520,7 +1520,7 @@ bool Profiler::ShouldExit()
- 
- void Profiler::Worker()
- {
--#ifdef __linux__
-+#if defined __linux__ && !defined TRACY_NO_CRASH_HANDLER
-     s_profilerTid = syscall( SYS_gettid );
- #endif
- 
diff --git a/external_imported/vcpkg/ports/tracy/portfile.cmake b/external_imported/vcpkg/ports/tracy/portfile.cmake
index 1e2403b95..81066f2a5 100644
--- a/external_imported/vcpkg/ports/tracy/portfile.cmake
+++ b/external_imported/vcpkg/ports/tracy/portfile.cmake
@@ -7,21 +7,19 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO wolfpld/tracy
-    REF v0.9
-    SHA512 00e8ff6d73d0428eb7a77fc5e0556458285922fbf9d5f0d42ed4f27ff98ffcd96b0f59bbaa3c103fd0903283ded6e7577d2a49362e5803cdbac0f3236af957cb
+    REF v0.10
+    SHA512 3fc406a42380f6ebe671d560482733f3cdbca16dd7721ac2fce8f1cdefb96ba87701714c2ee8161d65d9e185bc5f9a0fe587a3843eb75f851b10eb895358cb64
     HEAD_REF master
     PATCHES
         001-fix-vcxproj-vcpkg.patch
-        002-fix-capstone-5.patch
-        003-fix-imgui-path.patch
-        004-fix-crash-handler.patch
+        002-use-internal-imgui.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-        FEATURES
-            on-demand TRACY_ON_DEMAND
-        INVERTED_FEATURES
-            crash-handler TRACY_NO_CRASH_HANDLER
+    FEATURES
+        on-demand TRACY_ON_DEMAND
+    INVERTED_FEATURES
+        crash-handler TRACY_NO_CRASH_HANDLER
 )
 
 vcpkg_cmake_configure(
@@ -30,41 +28,7 @@ vcpkg_cmake_configure(
 )
 vcpkg_cmake_install()
 
-if(VCPKG_TARGET_IS_LINUX)
-    set(any_tracy_tool_requested OFF)
-    if(profiler IN_LIST FEATURES)
-        message(WARNING
-"Tracy currently requires the following libraries from the system package manager to build its tools:
-    gtk+-3.0
-    tbb
-
-These can be installed on Ubuntu systems via sudo apt install libgtk-3-dev libtbb-dev")
-        set(any_tracy_tool_requested ON)
-    else()
-        foreach(CLI_TOOL capture csvexport import-chrome update)
-            if(${CLI_TOOL} IN_LIST FEATURES)
-                message(WARNING
-"Tracy currently requires the following libraries from the system package manager to build its tools:
-    tbb
-
-These can be installed on Ubuntu systems via sudo apt install libtbb-dev")
-                set(any_tracy_tool_requested ON)
-                break()
-            endif()
-        endforeach()
-    endif()
-
-endif()
-
-vcpkg_list(SET tracy_tools)
-if("cli-tools" IN_LIST FEATURES)
-    vcpkg_list(APPEND tracy_tools capture csvexport import-chrome update)
-endif()
-if("gui-tools" IN_LIST FEATURES)
-    vcpkg_list(APPEND tracy_tools profiler)
-endif()
-
-function(tracy_tool_install_make tracy_TOOL tracy_TOOL_NAME)
+function(tracy_tool_install_unix tracy_TOOL tracy_TOOL_NAME)
     foreach(buildtype IN ITEMS "debug" "release")
         if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "${buildtype}")
             if("${buildtype}" STREQUAL "debug")
@@ -84,6 +48,7 @@ function(tracy_tool_install_make tracy_TOOL tracy_TOOL_NAME)
                 BASE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}${short_buildtype}"
                 OUTPUT_VARIABLE relative_path_makefile_dir)
 
+            set(ENV{LEGACY} 1)
             vcpkg_backup_env_variables(VARS PKG_CONFIG_PATH)
             vcpkg_host_path_list(PREPEND ENV{PKG_CONFIG_PATH} "${CURRENT_INSTALLED_DIR}${path_suffix}/lib/pkgconfig")
 
@@ -95,66 +60,45 @@ function(tracy_tool_install_make tracy_TOOL tracy_TOOL_NAME)
             )
             vcpkg_restore_env_variables(VARS PKG_CONFIG_PATH)
 
-            file(INSTALL "${SOURCE_PATH}/${tracy_TOOL}/build/unix${short_buildtype}/${tracy_TOOL_NAME}-${buildtype}" DESTINATION "${CURRENT_PACKAGES_DIR}${path_suffix}/tools/${PORT}" RENAME "${tracy_TOOL_NAME}")
+            file(INSTALL "${SOURCE_PATH}/${tracy_TOOL}/build/unix${short_buildtype}/${tracy_TOOL_NAME}-${buildtype}"
+                DESTINATION "${CURRENT_PACKAGES_DIR}${path_suffix}/tools/${PORT}"
+                RENAME "${tracy_TOOL_NAME}"
+                USE_SOURCE_PERMISSIONS)
         endif()
     endforeach()
 endfunction()
 
 function(tracy_tool_install_win32 tracy_TOOL tracy_TOOL_NAME)
-  vcpkg_install_msbuild(
-    SOURCE_PATH "${SOURCE_PATH}"
-    PROJECT_SUBPATH "${tracy_TOOL}/build/win32/${tracy_TOOL_NAME}.sln"
-    USE_VCPKG_INTEGRATION
-  )
+    vcpkg_install_msbuild(
+        SOURCE_PATH "${SOURCE_PATH}"
+        PROJECT_SUBPATH "${tracy_TOOL}/build/win32/${tracy_TOOL_NAME}.sln"
+        USE_VCPKG_INTEGRATION
+    )
 endfunction()
 
-if("capture" IN_LIST tracy_tools)
-    if(VCPKG_TARGET_IS_WINDOWS)
-        tracy_tool_install_win32(capture capture)
-    else()
-        tracy_tool_install_make(capture capture)
-    endif()
-endif()
-
-if("csvexport" IN_LIST tracy_tools)
+function(tracy_tool_install tracy_TOOL tracy_TOOL_NAME)
     if(VCPKG_TARGET_IS_WINDOWS)
-        tracy_tool_install_win32(csvexport csvexport)
+        tracy_tool_install_win32("${tracy_TOOL}" "${tracy_TOOL_NAME}")
     else()
-        tracy_tool_install_make(csvexport csvexport)
+        tracy_tool_install_unix("${tracy_TOOL}" "${tracy_TOOL_NAME}")
     endif()
-endif()
-
-if("import-chrome" IN_LIST tracy_tools)
-    if(VCPKG_TARGET_IS_WINDOWS)
-        tracy_tool_install_win32(import-chrome import-chrome)
-    else()
-        tracy_tool_install_make(import-chrome import-chrome)
-    endif()
-endif()
+endfunction()
 
-if("profiler" IN_LIST tracy_tools)
-    if(VCPKG_TARGET_IS_WINDOWS)
-        tracy_tool_install_win32(profiler Tracy)
-    else()
-        tracy_tool_install_make(profiler Tracy)
-    endif()
+if("cli-tools" IN_LIST FEATURES)
+    tracy_tool_install(capture capture)
+    tracy_tool_install(csvexport csvexport)
+    tracy_tool_install(import-chrome import-chrome)
+    tracy_tool_install(update update)
 endif()
-
-if("update" IN_LIST tracy_tools)
-    if(VCPKG_TARGET_IS_WINDOWS)
-        tracy_tool_install_win32(update update)
-    else()
-        tracy_tool_install_make(update update)
-    endif()
+if("gui-tools" IN_LIST FEATURES)
+    tracy_tool_install(profiler Tracy)
 endif()
 
 vcpkg_copy_pdbs()
 vcpkg_cmake_config_fixup(PACKAGE_NAME Tracy)
 vcpkg_fixup_pkgconfig()
 
-# Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
 
-# Cleanup
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/external_imported/vcpkg/ports/tracy/vcpkg.json b/external_imported/vcpkg/ports/tracy/vcpkg.json
index 14642e3d6..d133f7cd9 100644
--- a/external_imported/vcpkg/ports/tracy/vcpkg.json
+++ b/external_imported/vcpkg/ports/tracy/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "tracy",
-  "version-semver": "0.9.0",
-  "port-version": 3,
+  "version-semver": "0.10.0",
+  "port-version": 1,
   "description": "A real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications.",
   "homepage": "https://github.com/wolfpld/tracy",
   "license": "BSD-3-Clause",
@@ -35,6 +35,10 @@
             "arm64",
             "x86"
           ]
+        },
+        {
+          "name": "tbb",
+          "platform": "!windows"
         }
       ]
     },
@@ -53,8 +57,16 @@
             "x86"
           ]
         },
+        {
+          "name": "dbus",
+          "platform": "!windows"
+        },
         "freetype",
-        "glfw3"
+        "glfw3",
+        {
+          "name": "tbb",
+          "platform": "!windows"
+        }
       ]
     },
     "on-demand": {
diff --git a/external_imported/vcpkg/ports/trantor/000-fix-deps.patch b/external_imported/vcpkg/ports/trantor/000-fix-deps.patch
new file mode 100644
index 000000000..590e9786a
--- /dev/null
+++ b/external_imported/vcpkg/ports/trantor/000-fix-deps.patch
@@ -0,0 +1,35 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 22d9115..da6edaf 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -220,7 +220,7 @@ endif(HAVE_SPDLOG)
+ 
+ set(HAVE_C-ARES NO)
+ if (BUILD_C-ARES)
+-    find_package(c-ares)
++    find_package(c-ares CONFIG)
+     if(c-ares_FOUND)
+       message(STATUS "c-ares found!")
+       set(HAVE_C-ARES TRUE)
+@@ -231,7 +231,7 @@ if(HAVE_C-ARES)
+   if (NOT BUILD_SHARED_LIBS)
+     target_compile_definitions(${PROJECT_NAME} PRIVATE CARES_STATICLIB)
+   endif ()
+-  target_link_libraries(${PROJECT_NAME} PRIVATE c-ares_lib)
++  target_link_libraries(${PROJECT_NAME} PRIVATE c-ares::cares)
+   set(TRANTOR_SOURCES
+       ${TRANTOR_SOURCES}
+       trantor/net/inner/AresResolver.cc)
+diff --git a/cmake/templates/TrantorConfig.cmake.in b/cmake/templates/TrantorConfig.cmake.in
+index 61007bd..c5dd363 100644
+--- a/cmake/templates/TrantorConfig.cmake.in
++++ b/cmake/templates/TrantorConfig.cmake.in
+@@ -17,7 +17,7 @@ if(@Botan_FOUND@)
+   find_dependency(Botan)
+ endif()
+ if(@c-ares_FOUND@)
+-  find_dependency(c-ares)
++  find_dependency(c-ares CONFIG)
+ endif()
+ find_dependency(Threads)
+ if(@spdlog_FOUND@)
diff --git a/external_imported/vcpkg/ports/trantor/001-uwp.patch b/external_imported/vcpkg/ports/trantor/001-uwp.patch
new file mode 100644
index 000000000..55ff3651b
--- /dev/null
+++ b/external_imported/vcpkg/ports/trantor/001-uwp.patch
@@ -0,0 +1,36 @@
+diff --git a/trantor/net/inner/FileBufferNodeWin.cc b/trantor/net/inner/FileBufferNodeWin.cc
+index eb9fcbd..a0b9791 100644
+--- a/trantor/net/inner/FileBufferNodeWin.cc
++++ b/trantor/net/inner/FileBufferNodeWin.cc
+@@ -1,5 +1,11 @@
+ #include <trantor/net/inner/BufferNode.h>
+ #include <windows.h>
++#include <fileapi.h>
++#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)
++#define UWP 1
++#else
++#define UWP 0
++#endif
+ 
+ namespace trantor
+ {
+@@ -9,6 +15,11 @@ class FileBufferNode : public BufferNode
+   public:
+     FileBufferNode(const wchar_t *fileName, long long offset, long long length)
+     {
++#if UWP
++        sendHandle_ = CreateFile2(
++            fileName, GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, nullptr);
++
++#else
+         sendHandle_ = CreateFileW(fileName,
+                                   GENERIC_READ,
+                                   FILE_SHARE_READ,
+@@ -16,6 +27,7 @@ class FileBufferNode : public BufferNode
+                                   OPEN_EXISTING,
+                                   FILE_ATTRIBUTE_NORMAL,
+                                   nullptr);
++#endif
+         if (sendHandle_ == INVALID_HANDLE_VALUE)
+         {
+             LOG_SYSERR << fileName << " open error";
diff --git a/external_imported/vcpkg/ports/trantor/portfile.cmake b/external_imported/vcpkg/ports/trantor/portfile.cmake
index 85a710e4f..061540f21 100644
--- a/external_imported/vcpkg/ports/trantor/portfile.cmake
+++ b/external_imported/vcpkg/ports/trantor/portfile.cmake
@@ -1,10 +1,12 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO an-tao/trantor
-    REF v1.5.11
-    SHA512 dd65938bebb2e6714e5603db3bfc82cd1a63395c17dce014147a41fdc74548cb526e1457a7472aa51bb80ce629a9935b4db9eeadf735efaf30899ef73f776a58
+    REF "v${VERSION}"
+    SHA512 14380d3781dabaff22041c4b9abcbfc591640bbb30a08badc9724ccc6ba817ab895774e37f24311f83b1bd139ad50d232d9eab510a4ede20bf2dff89cd308728
     HEAD_REF master
     PATCHES
+        000-fix-deps.patch
+        001-uwp.patch
 )
 
 vcpkg_cmake_configure(
diff --git a/external_imported/vcpkg/ports/trantor/vcpkg.json b/external_imported/vcpkg/ports/trantor/vcpkg.json
index cd1a9272b..0be9572d0 100644
--- a/external_imported/vcpkg/ports/trantor/vcpkg.json
+++ b/external_imported/vcpkg/ports/trantor/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "trantor",
-  "version-semver": "1.5.11",
+  "version-semver": "1.5.16",
   "description": "A non-blocking I/O cross-platform TCP network library, using C++14",
   "homepage": "https://github.com/an-tao/trantor",
   "license": "BSD-2-Clause",
diff --git a/external_imported/vcpkg/ports/tre/CMakeLists.txt b/external_imported/vcpkg/ports/tre/CMakeLists.txt
index b31aa8c72..bfef8210a 100644
--- a/external_imported/vcpkg/ports/tre/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/tre/CMakeLists.txt
@@ -30,11 +30,20 @@ if (WIN32)
 endif()
 add_library(tre ${SRCS})
 
+target_include_directories(tre PUBLIC "$<INSTALL_INTERFACE:include>")
+
 install(
   TARGETS tre
+  EXPORT unofficial-tre-targets
   RUNTIME DESTINATION bin
   LIBRARY DESTINATION lib
   ARCHIVE DESTINATION lib
 )
 
+install(
+  EXPORT unofficial-tre-targets
+  NAMESPACE unofficial::tre::
+  FILE unofficial-tre-config.cmake
+  DESTINATION share/unofficial-tre)
+
 install(FILES ${HEADERS} DESTINATION include/tre)
diff --git a/external_imported/vcpkg/ports/tre/portfile.cmake b/external_imported/vcpkg/ports/tre/portfile.cmake
index e6ce5e118..1bb2e7c90 100644
--- a/external_imported/vcpkg/ports/tre/portfile.cmake
+++ b/external_imported/vcpkg/ports/tre/portfile.cmake
@@ -13,13 +13,17 @@ if(VCPKG_TARGET_IS_MINGW)
 endif()
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
 )
 
 vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT})
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/tre" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/tre/usage b/external_imported/vcpkg/ports/tre/usage
new file mode 100644
index 000000000..df5d666eb
--- /dev/null
+++ b/external_imported/vcpkg/ports/tre/usage
@@ -0,0 +1,4 @@
+tre provides CMake targets:
+
+  find_package(unofficial-tre CONFIG REQUIRED)
+  target_link_libraries(main PRIVATE unofficial::tre::tre)
diff --git a/external_imported/vcpkg/ports/tre/vcpkg.json b/external_imported/vcpkg/ports/tre/vcpkg.json
index f4402a1c6..e4ce1b25f 100644
--- a/external_imported/vcpkg/ports/tre/vcpkg.json
+++ b/external_imported/vcpkg/ports/tre/vcpkg.json
@@ -1,13 +1,18 @@
 {
   "name": "tre",
   "version": "0.8.0",
-  "port-version": 5,
+  "port-version": 6,
   "description": "TRE is a lightweight, robust, and efficient POSIX compliant regexp matching library with some exciting features such as approximate (fuzzy) matching.",
   "homepage": "https://github.com/laurikari/tre",
+  "license": "BSD-2-Clause",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
       "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/tree-similarity/portfile.cmake b/external_imported/vcpkg/ports/tree-similarity/portfile.cmake
new file mode 100644
index 000000000..1d5e21421
--- /dev/null
+++ b/external_imported/vcpkg/ports/tree-similarity/portfile.cmake
@@ -0,0 +1,18 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO DatabaseGroup/tree-similarity
+    REF 0.1.1
+    SHA512 5367f4b694d686456c4ffaaf21c7372fb7012811f3b2ded00c6bc1d18d27ecb7a6a28b3c9bd7cb91cb42c5426321b0b12a2e14ab2c838aa8fc859128b372dded
+    HEAD_REF master
+)
+
+vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}")
+
+vcpkg_cmake_install()
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+vcpkg_fixup_pkgconfig()
+
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/tree-similarity/usage b/external_imported/vcpkg/ports/tree-similarity/usage
new file mode 100644
index 000000000..dbdef8964
--- /dev/null
+++ b/external_imported/vcpkg/ports/tree-similarity/usage
@@ -0,0 +1,4 @@
+tree-similarity provides CMake targets:
+
+    find_path(TREE_SIMILARITY_INCLUDE_DIRS "tree-similiarity")
+    target_include_directories(main PRIVATE ${TREE_SIMILARITY_INCLUDE_DIRS})
diff --git a/external_imported/vcpkg/ports/tree-similarity/vcpkg.json b/external_imported/vcpkg/ports/tree-similarity/vcpkg.json
new file mode 100644
index 000000000..cb14a3f4d
--- /dev/null
+++ b/external_imported/vcpkg/ports/tree-similarity/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "tree-similarity",
+  "version-semver": "0.1.1",
+  "port-version": 1,
+  "description": "Tree edit distance (TED) and similarity measurement library, offering multiple algorithm implementation such as APTED and LGM.",
+  "homepage": "https://github.com/DatabaseGroup/tree-similarity",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/tree-sitter/pkgconfig.patch b/external_imported/vcpkg/ports/tree-sitter/pkgconfig.patch
index b75bbc10e..88de4eca4 100644
--- a/external_imported/vcpkg/ports/tree-sitter/pkgconfig.patch
+++ b/external_imported/vcpkg/ports/tree-sitter/pkgconfig.patch
@@ -10,7 +10,7 @@ index f98816cb..71a3b4f9 100644
 -libdir=@LIBDIR@
 -includedir=@INCLUDEDIR@
 +prefix=@CMAKE_INSTALL_PREFIX@
-+libdir=${prefix}@/lib
++libdir=${prefix}/lib
 +includedir=${prefix}/include
  
  Name: tree-sitter
diff --git a/external_imported/vcpkg/ports/tree-sitter/vcpkg.json b/external_imported/vcpkg/ports/tree-sitter/vcpkg.json
index 935489c48..6941c4db9 100644
--- a/external_imported/vcpkg/ports/tree-sitter/vcpkg.json
+++ b/external_imported/vcpkg/ports/tree-sitter/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "tree-sitter",
   "version-semver": "0.20.6",
+  "port-version": 1,
   "description": "An incremental parsing system for programming tools.",
   "homepage": "https://github.com/tree-sitter/tree-sitter",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/treehopper/fix-dependences.patch b/external_imported/vcpkg/ports/treehopper/fix-dependences.patch
new file mode 100644
index 000000000..7fdd26a45
--- /dev/null
+++ b/external_imported/vcpkg/ports/treehopper/fix-dependences.patch
@@ -0,0 +1,42 @@
+diff --git a/C++/API/CMakeLists.txt b/C++/API/CMakeLists.txt
+index 8537305..db3d29b 100644
+--- a/C++/API/CMakeLists.txt
++++ b/C++/API/CMakeLists.txt
+@@ -37,7 +37,10 @@ if(APPLE)
+     find_library(IOKIT IOKit)
+     target_link_libraries(treehopper pthread ${CORE_FOUNDATION} ${IOKIT})
+ elseif(UNIX)
+-    target_link_libraries(treehopper usb-1.0 pthread)
++    find_package(PkgConfig REQUIRED)
++    pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0)
++
++    target_link_libraries(treehopper PRIVATE PkgConfig::libusb pthread)
+ elseif(WIN32)
+     target_link_libraries(treehopper winusb setupapi)
+ endif(APPLE)
+diff --git a/C++/API/inc/ConnectionService.h b/C++/API/inc/ConnectionService.h
+index 66d338e..12a0192 100644
+--- a/C++/API/inc/ConnectionService.h
++++ b/C++/API/inc/ConnectionService.h
+@@ -8,7 +8,7 @@
+ #include <CoreFoundation/CFRunLoop.h>
+ #endif
+ #ifdef __linux__
+-#include "libusb-1.0/libusb.h"
++#include "libusb.h"
+ #endif
+ #include <vector>
+ 
+diff --git a/C++/API/inc/LibUsbConnection.h b/C++/API/inc/LibUsbConnection.h
+index b6d5198..e9cd29e 100644
+--- a/C++/API/inc/LibUsbConnection.h
++++ b/C++/API/inc/LibUsbConnection.h
+@@ -6,7 +6,7 @@
+ 
+ #include "Treehopper.h"
+ 
+-#include <libusb-1.0/libusb.h>
++#include <libusb.h>
+ #include "UsbConnection.h"
+ 
+ namespace Treehopper {
diff --git a/external_imported/vcpkg/ports/treehopper/portfile.cmake b/external_imported/vcpkg/ports/treehopper/portfile.cmake
index 3b6cfa9c1..d2b263386 100644
--- a/external_imported/vcpkg/ports/treehopper/portfile.cmake
+++ b/external_imported/vcpkg/ports/treehopper/portfile.cmake
@@ -3,9 +3,12 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO treehopper-electronics/treehopper-sdk
-    REF 1.11.3
+    REF "${VERSION}"
     SHA512 65b748375b798787c8b59f9657151f340920c939c3f079105b9b78f4e3b775125598106c6dfa4feba111a64d30f007003a70110ac767802a7dd1127a25c9fb14
-    HEAD_REF master)
+    HEAD_REF master
+    PATCHES
+        fix-dependences.patch
+)
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}/C++/API/"
@@ -18,6 +21,4 @@ vcpkg_cmake_config_fixup()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 file(INSTALL "${SOURCE_PATH}/C++/API/inc/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/Treehopper/")
-
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/treehopper/vcpkg.json b/external_imported/vcpkg/ports/treehopper/vcpkg.json
index 5bb63ce7c..fdf185fb7 100644
--- a/external_imported/vcpkg/ports/treehopper/vcpkg.json
+++ b/external_imported/vcpkg/ports/treehopper/vcpkg.json
@@ -1,11 +1,15 @@
 {
   "name": "treehopper",
-  "version-string": "1.11.3",
-  "port-version": 6,
+  "version": "1.11.3",
+  "port-version": 9,
   "description": "Treehopper connects the physical world to your computer, tablet, or smartphone.",
   "homepage": "https://treehopper.io",
+  "supports": "!staticcrt & !uwp",
   "dependencies": [
-    "libusb",
+    {
+      "name": "libusb",
+      "platform": "linux"
+    },
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/external_imported/vcpkg/ports/triton/fix_bin_path.patch b/external_imported/vcpkg/ports/triton/fix_bin_path.patch
new file mode 100644
index 000000000..13b02bd09
--- /dev/null
+++ b/external_imported/vcpkg/ports/triton/fix_bin_path.patch
@@ -0,0 +1,13 @@
+diff --git a/src/libtriton/CMakeLists.txt b/src/libtriton/CMakeLists.txt
+index 3c3ef6b..1adb110 100644
+--- a/src/libtriton/CMakeLists.txt
++++ b/src/libtriton/CMakeLists.txt
+@@ -318,7 +318,7 @@ install(
+     EXPORT tritonTargets
+     PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/triton"
+     INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+-    RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ )
diff --git a/external_imported/vcpkg/ports/triton/portfile.cmake b/external_imported/vcpkg/ports/triton/portfile.cmake
index 5bd17c4b7..cec442193 100644
--- a/external_imported/vcpkg/ports/triton/portfile.cmake
+++ b/external_imported/vcpkg/ports/triton/portfile.cmake
@@ -1,9 +1,11 @@
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO JonathanSalwan/Triton
-  REF 2b655f20528065cf70e0fa95e2d01b34a8ef6a17
-  SHA512 819c0c6eb9e5609240fe4be47c1f4584d2979e3b54f34c2978989ad9b3b10f73dc65ac87fca88fbfc26767f7a4df5b3a2ae70bcbda43ec89eef4c456a37bd884
+  REF a61651ce331ac53ec09e1d8fef5eab744e98c9de
+  SHA512 b53befe232e986409789533ac39b371b5701d9b9b72ee47c6486408c57f72800d2192b0f65bd0cc751147fbea2f8c0ef5b6375c913bd1d57393236a619f319c9
   HEAD_REF master
+  PATCHES
+    fix_bin_path.patch
 )
 
 string(COMPARE NOTEQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" DYNAMICLIB)
diff --git a/external_imported/vcpkg/ports/triton/vcpkg.json b/external_imported/vcpkg/ports/triton/vcpkg.json
index 86836fab7..a4d7a73a6 100644
--- a/external_imported/vcpkg/ports/triton/vcpkg.json
+++ b/external_imported/vcpkg/ports/triton/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "triton",
-  "version": "0.9",
-  "port-version": 5,
+  "version-date": "2023-08-16",
   "description": "Triton is a Dynamic Binary Analysis (DBA) framework. It provides internal components like a Dynamic Symbolic Execution (DSE) engine, a dynamic taint engine, AST representations of the x86, x86-64, ARM32 and AArch64 Instructions Set Architecture (ISA), SMT simplification passes, an SMT solver interface and, the last but not least, Python bindings.",
   "homepage": "https://github.com/JonathanSalwan/Triton",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/trompeloeil/portfile.cmake b/external_imported/vcpkg/ports/trompeloeil/portfile.cmake
index 4d6be62ae..b870a9dc0 100644
--- a/external_imported/vcpkg/ports/trompeloeil/portfile.cmake
+++ b/external_imported/vcpkg/ports/trompeloeil/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO rollbear/trompeloeil
-    REF ba406bfd71caf63f2180990a390ff5518e570c21    # v43
-    SHA512 5a638392ee4078690e94a61fd5838f6b0ffd67784a6cb139c114286c5cb8453c450252c550e9efee575aa38d02d5de1b51ba4df6a1679d02987606559a96520d
+    REF v${VERSION}
+    SHA512 c82a0ff3057056a79890b5880c1755900370a4406dc7e231f9b81545014dfd85a3cea90f90f01931083ef7528360ec7f5f14a4d6b2c5578c59e89b6d28edf110 
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/trompeloeil/vcpkg.json b/external_imported/vcpkg/ports/trompeloeil/vcpkg.json
index efaae3b10..b4079ddd0 100644
--- a/external_imported/vcpkg/ports/trompeloeil/vcpkg.json
+++ b/external_imported/vcpkg/ports/trompeloeil/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "trompeloeil",
-  "version": "43",
+  "version": "45",
   "description": "A thread-safe header-only mocking framework for C++11/14 using the Boost Software License 1.0",
   "homepage": "https://github.com/rollbear/trompeloeil",
   "license": "BSL-1.0",
diff --git a/external_imported/vcpkg/ports/tsl-hopscotch-map/vcpkg.json b/external_imported/vcpkg/ports/tsl-hopscotch-map/vcpkg.json
index 8ddb35275..65a40b67c 100644
--- a/external_imported/vcpkg/ports/tsl-hopscotch-map/vcpkg.json
+++ b/external_imported/vcpkg/ports/tsl-hopscotch-map/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "tsl-hopscotch-map",
-  "version-string": "2.3.0",
-  "port-version": 2,
+  "version": "2.3.0",
+  "port-version": 3,
   "description": "C++ implementation of a fast hash map and hash set using hopscotch hashing",
   "dependencies": [
     {
diff --git a/external_imported/vcpkg/ports/tsl-ordered-map/vcpkg.json b/external_imported/vcpkg/ports/tsl-ordered-map/vcpkg.json
index 58a063cfe..5676ffc9e 100644
--- a/external_imported/vcpkg/ports/tsl-ordered-map/vcpkg.json
+++ b/external_imported/vcpkg/ports/tsl-ordered-map/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "tsl-ordered-map",
-  "version-string": "1.0.0",
-  "port-version": 2,
+  "version": "1.0.0",
+  "port-version": 3,
   "description": "C++ hash map and hash set which preserve the order of insertion",
   "dependencies": [
     {
diff --git a/external_imported/vcpkg/ports/tsl-sparse-map/vcpkg.json b/external_imported/vcpkg/ports/tsl-sparse-map/vcpkg.json
index 652f0db08..ecc012218 100644
--- a/external_imported/vcpkg/ports/tsl-sparse-map/vcpkg.json
+++ b/external_imported/vcpkg/ports/tsl-sparse-map/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "tsl-sparse-map",
-  "version-string": "0.6.2",
-  "port-version": 2,
+  "version": "0.6.2",
+  "port-version": 3,
   "description": "C++ implementation of a memory efficient hash map and hash set",
   "dependencies": [
     {
diff --git a/external_imported/vcpkg/ports/tuplet/portfile.cmake b/external_imported/vcpkg/ports/tuplet/portfile.cmake
new file mode 100644
index 000000000..36ee02895
--- /dev/null
+++ b/external_imported/vcpkg/ports/tuplet/portfile.cmake
@@ -0,0 +1,22 @@
+# Header-only library
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO codeinred/tuplet
+    REF "v${VERSION}"
+    SHA512 afab0ad34e9e15909c43112b77014821607ec8d429c395b882eea74873432204fca2b5a2c2e04f84cf6193e19bc0a9dcb7702d1e97668a32ec1541e02b6e798a
+    HEAD_REF master
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_TESTING=OFF
+        -DCMAKE_INSTALL_INCLUDEDIR=include
+)
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME tuplet CONFIG_PATH share/tuplet/cmake)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug"
+)
+# Handle copyright
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/tuplet/vcpkg.json b/external_imported/vcpkg/ports/tuplet/vcpkg.json
new file mode 100644
index 000000000..75b47c333
--- /dev/null
+++ b/external_imported/vcpkg/ports/tuplet/vcpkg.json
@@ -0,0 +1,17 @@
+{
+  "name": "tuplet",
+  "version": "2.1.1",
+  "description": "A Lightweight Tuple Library for Modern C++",
+  "homepage": "https://github.com/codeinred/tuplet",
+  "license": "BSL-1.0",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/type-lite/portfile.cmake b/external_imported/vcpkg/ports/type-lite/portfile.cmake
index c30d27741..ab0084cb8 100644
--- a/external_imported/vcpkg/ports/type-lite/portfile.cmake
+++ b/external_imported/vcpkg/ports/type-lite/portfile.cmake
@@ -6,20 +6,22 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    test BUILD_TESTS
+vcpkg_check_features(
+    OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        test TYPE_LITE_OPT_BUILD_TESTS
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-        -DTYPE_LITE_OPT_BUILD_TESTS=${BUILD_TESTS}
-        -DTYPE_LITE_OPT_BUILD_EXAMPLES=OFF           
+        ${FEATURE_OPTIONS}
+        -DTYPE_LITE_OPT_BUILD_EXAMPLES=OFF
 )
 
 vcpkg_cmake_install()
 
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
diff --git a/external_imported/vcpkg/ports/type-lite/vcpkg.json b/external_imported/vcpkg/ports/type-lite/vcpkg.json
index 58ec0d358..e101e6165 100644
--- a/external_imported/vcpkg/ports/type-lite/vcpkg.json
+++ b/external_imported/vcpkg/ports/type-lite/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "type-lite",
-  "version-string": "0.1.0",
-  "port-version": 2,
+  "version": "0.1.0",
+  "port-version": 3,
   "description": "Strong types for C++98, C++11 and later in a single-file header-only library.",
   "homepage": "https://github.com/martinmoene/type-lite",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/type-safe/portfile.cmake b/external_imported/vcpkg/ports/type-safe/portfile.cmake
index de3a4080f..fd81bc3b8 100644
--- a/external_imported/vcpkg/ports/type-safe/portfile.cmake
+++ b/external_imported/vcpkg/ports/type-safe/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO foonathan/type_safe
-    REF v0.2.2
-    SHA512 5dbc9e906e066cfc5eb8fd9a308e952e33c7463b5d2abaadd4303ebe8c38a1d8e79865076ad6422f4c56ffa23113b291e3c11d6dd28e73ec3d6fe2e3e7a233a3
+    REF v0.2.3
+    SHA512 2064995421c5b6bad1b336adf71af9ad1dd3d2245411be1f531d3b72db782a9a959f20597c18a1bd8a71fd3e9e87e396b4fe5595a5e99a32e2d814d6a7c6222b
     HEAD_REF main
 )
 
diff --git a/external_imported/vcpkg/ports/type-safe/vcpkg.json b/external_imported/vcpkg/ports/type-safe/vcpkg.json
index 4d659c409..8d4c3d889 100644
--- a/external_imported/vcpkg/ports/type-safe/vcpkg.json
+++ b/external_imported/vcpkg/ports/type-safe/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "type-safe",
-  "version": "0.2.2",
-  "port-version": 1,
+  "version": "0.2.3",
   "description": "Zero overhead abstractions that use the C++ type system to prevent bugs.",
   "homepage": "https://github.com/foonathan/type_safe",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/udt/CMakeLists.txt b/external_imported/vcpkg/ports/udt/CMakeLists.txt
new file mode 100644
index 000000000..527200c0a
--- /dev/null
+++ b/external_imported/vcpkg/ports/udt/CMakeLists.txt
@@ -0,0 +1,35 @@
+cmake_minimum_required(VERSION 3.12 FATAL_ERROR)
+
+project(udt LANGUAGES CXX)
+
+include(GNUInstallDirs)
+
+file(GLOB UDT_HEADERS "src/*.h")
+file(GLOB UDT_SOURCES "src/*.cpp")
+
+add_library(udt ${UDT_HEADERS} ${UDT_SOURCES})
+if(WIN32)
+    target_compile_definitions(udt PRIVATE -DWIN32)
+    if(MSVC)
+        target_compile_definitions(udt PRIVATE -DUDT_EXPORTS)
+    endif()
+    target_link_libraries(udt PRIVATE ws2_32)
+elseif(UNIX AND NOT APPLE)
+    target_compile_definitions(udt PRIVATE -DLINUX)
+elseif(APPLE)
+    target_compile_definitions(udt PRIVATE -DOSX)
+endif()
+target_include_directories(udt PUBLIC
+    "$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src>"
+    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/udt>")
+
+install(TARGETS udt EXPORT unofficial-udt)
+
+install(
+    EXPORT unofficial-udt
+    FILE unofficial-udt-config.cmake
+    DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/unofficial-udt"
+    NAMESPACE unofficial::udt::
+)
+
+install(FILES ${UDT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/udt")
diff --git a/external_imported/vcpkg/ports/udt/fix_defs.patch b/external_imported/vcpkg/ports/udt/fix_defs.patch
new file mode 100644
index 000000000..31a0d96fa
--- /dev/null
+++ b/external_imported/vcpkg/ports/udt/fix_defs.patch
@@ -0,0 +1,79 @@
+diff --git a/src/api.h b/src/api.h
+index 24f1a02..db7b729 100644
+--- a/src/api.h
++++ b/src/api.h
+@@ -216,3 +216,3 @@ private:
+    pthread_key_t m_TLSError;                         // thread local error record (last error)
+-   #ifndef WIN32
++   #ifndef _WIN32
+       static void TLSDestroy(void* e) {if (NULL != e) delete (CUDTException*)e;}
+@@ -248,3 +248,3 @@ private:
+    pthread_t m_GCThread;
+-   #ifndef WIN32
++   #ifndef _WIN32
+       static void* garbageCollect(void*);
+diff --git a/src/common.h b/src/common.h
+index 3782d61..205b090 100644
+--- a/src/common.h
++++ b/src/common.h
+@@ -44,3 +44,3 @@ written by
+ 
+-#ifndef WIN32
++#ifndef _WIN32
+    #include <sys/time.h>
+@@ -55,3 +55,3 @@ written by
+ 
+-#ifdef WIN32
++#ifdef _WIN32
+    // Windows compability
+diff --git a/src/packet.h b/src/packet.h
+index 76cc951..216505a 100644
+--- a/src/packet.h
++++ b/src/packet.h
+@@ -46,3 +46,3 @@ written by
+ 
+-#ifdef WIN32
++#ifdef _WIN32
+    struct iovec
+diff --git a/src/queue.h b/src/queue.h
+index 9feff18..1062a0c 100644
+--- a/src/queue.h
++++ b/src/queue.h
+@@ -399,3 +399,3 @@ public:
+ private:
+-#ifndef WIN32
++#ifndef _WIN32
+    static void* worker(void* param);
+@@ -459,3 +459,3 @@ public:
+ private:
+-#ifndef WIN32
++#ifndef _WIN32
+    static void* worker(void* param);
+diff --git a/src/udt.h b/src/udt.h
+index 6436363..8e00091 100644
+--- a/src/udt.h
++++ b/src/udt.h
+@@ -44,3 +44,3 @@ written by
+ 
+-#ifndef WIN32
++#ifndef _WIN32
+    #include <sys/types.h>
+@@ -70,3 +70,3 @@ written by
+ 
+-#ifdef WIN32
++#ifdef _WIN32
+    #ifndef __MINGW__
+@@ -97,3 +97,3 @@ written by
+ 
+-#ifdef WIN32
++#ifdef _WIN32
+    #ifndef __MINGW__
+diff --git a/src/window.h b/src/window.h
+index f118a26..565aeb6 100644
+--- a/src/window.h
++++ b/src/window.h
+@@ -44,3 +44,3 @@ written by
+ 
+-#ifndef WIN32
++#ifndef _WIN32
+    #include <sys/time.h>
diff --git a/external_imported/vcpkg/ports/udt/portfile.cmake b/external_imported/vcpkg/ports/udt/portfile.cmake
new file mode 100644
index 000000000..556b3b605
--- /dev/null
+++ b/external_imported/vcpkg/ports/udt/portfile.cmake
@@ -0,0 +1,23 @@
+vcpkg_from_sourceforge(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO udt/udt
+    REF "${VERSION}"
+    FILENAME "udt.sdk.${VERSION}.tar.gz"
+    SHA512 fc555ce1ddde2a8bd92c8adf470fd69a9a35d0a679def32b6ddbb18d67dc8b7d9dd928d772dc8598f08b350130f1e90bb4be58c46252a0a79ecc99f61eca8a92
+    PATCHES
+        fix_defs.patch
+)
+
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-udt)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/udt/usage b/external_imported/vcpkg/ports/udt/usage
new file mode 100644
index 000000000..f9fdbd867
--- /dev/null
+++ b/external_imported/vcpkg/ports/udt/usage
@@ -0,0 +1,4 @@
+udt provides CMake targets:
+
+    find_package(unofficial-udt CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE unofficial::udt::udt)
diff --git a/external_imported/vcpkg/ports/udt/vcpkg.json b/external_imported/vcpkg/ports/udt/vcpkg.json
new file mode 100644
index 000000000..a81edec28
--- /dev/null
+++ b/external_imported/vcpkg/ports/udt/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "udt",
+  "version": "4.11",
+  "description": "UDT is a reliable UDP based application level data transport protocol for distributed data intensive applications over wide area high-speed networks.",
+  "homepage": "https://udt.sourceforge.io/",
+  "license": null,
+  "supports": "!uwp",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/uni-algo/portfile.cmake b/external_imported/vcpkg/ports/uni-algo/portfile.cmake
index 8d31cf0e5..263b0b246 100644
--- a/external_imported/vcpkg/ports/uni-algo/portfile.cmake
+++ b/external_imported/vcpkg/ports/uni-algo/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO uni-algo/uni-algo
     REF "v${VERSION}"
-    SHA512 031d6ec2a1a2c09972a68d7b9bf49a209441e69802d5d8d37b2a37d9b6e002427496d420629d2119dc1d0e80f38c7b220e253b0858db5f172789472447041799
+    SHA512 55abef9b225aba8681439c83c08636b1bebf8faa73e7c8f137fc6cb3c8c6d3c5e0488082c852522fd5680d07366574d8acb25ce762e164c53d9014f249cb572f
     HEAD_REF main
 )
 
@@ -19,8 +19,6 @@ vcpkg_cmake_config_fixup(NO_PREFIX_CORRECTION)
 vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-# Remove empty directory
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/uni_algo/impl/doc")
 
 # Install copyright and usage
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
diff --git a/external_imported/vcpkg/ports/uni-algo/vcpkg.json b/external_imported/vcpkg/ports/uni-algo/vcpkg.json
index 664bf9976..7d1ebef92 100644
--- a/external_imported/vcpkg/ports/uni-algo/vcpkg.json
+++ b/external_imported/vcpkg/ports/uni-algo/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "uni-algo",
-  "version-semver": "0.7.0",
+  "version-semver": "1.0.0",
   "description": "Unicode Algorithms Implementation",
   "homepage": "https://github.com/uni-algo/uni-algo",
   "license": "Unlicense OR MIT",
diff --git a/external_imported/vcpkg/ports/unicorn-lib/CMakeLists.txt b/external_imported/vcpkg/ports/unicorn-lib/CMakeLists.txt
index b668c3c09..4f0879e52 100644
--- a/external_imported/vcpkg/ports/unicorn-lib/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/unicorn-lib/CMakeLists.txt
@@ -4,30 +4,23 @@ project(Unicorn_Lib LANGUAGES CXX DESCRIPTION "Unicode library for C++ by Ross S
 set(CMAKE_CXX_STANDARD 17)
 option(UNICORN_LIB_SKIP_HEADERS "If the headers installation is skipped or not." OFF)
 
-include(SelectLibraryConfigurations)
 find_package(ZLIB REQUIRED)
-find_library(PCRE2_LIBRARY_DEBUG NAMES pcre2-8d pcre2-8-staticd HINTS ${INSTALLED_LIB_PATH})
-find_library(PCRE2_LIBRARY_RELEASE NAMES pcre2-8 pcre2-8-static HINTS ${INSTALLED_LIB_PATH})
-select_library_configurations(PCRE2)
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(PCRE2 IMPORTED_TARGET REQUIRED libpcre2-8)
 
-file(GLOB_RECURSE UNICORN_LIB_SOURCES ${PROJECT_SOURCE_DIR}/unicorn/*.cpp)
-foreach(ITR ${UNICORN_LIB_SOURCES})
-    if(ITR MATCHES "(.*)-test.cpp(.*)")
-        list(REMOVE_ITEM UNICORN_LIB_SOURCES ${ITR})
-    endif()
-endforeach()
-add_library(unicorn-lib ${UNICORN_LIB_SOURCES})
-target_include_directories(
-    unicorn-lib
-    PUBLIC ${PROJECT_SOURCE_DIR}
-)
-target_compile_definitions(
-    unicorn-lib
-    PRIVATE -DUNICODE -D_UNICODE _CRT_SECURE_NO_WARNINGS
-)
+file(GLOB_RECURSE UNICORN_LIB_SOURCES "${PROJECT_SOURCE_DIR}/unicorn/*.cpp")
+list(FILTER UNICORN_LIB_SOURCES EXCLUDE REGEX "(.*)-test.cpp(.*)")
 
-target_link_libraries(unicorn-lib PUBLIC ${PCRE2_LIBRARY})
-target_link_libraries(unicorn-lib PUBLIC ZLIB::ZLIB)
+add_library(unicorn-lib ${UNICORN_LIB_SOURCES})
+target_include_directories(unicorn-lib PUBLIC "${PROJECT_SOURCE_DIR}")
+target_link_libraries(unicorn-lib PRIVATE PkgConfig::PCRE2 ZLIB::ZLIB)
+if(WIN32)
+    target_compile_definitions(unicorn-lib PRIVATE -DNOMINMAX -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_WARNINGS)
+else()
+    find_package(Iconv REQUIRED)
+    target_link_libraries(unicorn-lib PRIVATE Iconv::Iconv)
+    target_compile_definitions(unicorn-lib PRIVATE -D_XOPEN_SOURCE=700)
+endif()
 
 if(NOT UNICORN_LIB_SKIP_HEADERS)
     install(DIRECTORY ${PROJECT_SOURCE_DIR}/unicorn DESTINATION include FILES_MATCHING PATTERN "*.hpp")
diff --git a/external_imported/vcpkg/ports/unicorn-lib/fix-missing-headers.patch b/external_imported/vcpkg/ports/unicorn-lib/fix-missing-headers.patch
new file mode 100644
index 000000000..a64103a12
--- /dev/null
+++ b/external_imported/vcpkg/ports/unicorn-lib/fix-missing-headers.patch
@@ -0,0 +1,12 @@
+diff --git a/unicorn/utility.hpp b/unicorn/utility.hpp
+index e6a57b7..a2afa58 100644
+--- a/unicorn/utility.hpp
++++ b/unicorn/utility.hpp
+@@ -54,6 +54,7 @@
+ #include <istream>
+ #include <iterator>
+ #include <limits>
++#include <memory>
+ #include <mutex>
+ #include <new>
+ #include <optional>
diff --git a/external_imported/vcpkg/ports/unicorn-lib/portfile.cmake b/external_imported/vcpkg/ports/unicorn-lib/portfile.cmake
index a206c633c..d953711f0 100644
--- a/external_imported/vcpkg/ports/unicorn-lib/portfile.cmake
+++ b/external_imported/vcpkg/ports/unicorn-lib/portfile.cmake
@@ -1,20 +1,23 @@
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-  message("unicorn-lib is a static library, now build with static.")
-  set(VCPKG_LIBRARY_LINKAGE static)
-endif()
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO CaptainCrowbar/unicorn-lib
-    REF 44e975ffc8dcd8dedbe01a8cbe7812e351f3f74f # 2022-01-24
+    REF 44e975ffc8dcd8dedbe01a8cbe7812e351f3f74f # 2021-10-28
     SHA512 b22264420174c950ca8025e861366118d79a53edce9297d84af9511e255af5971c3719f0b464f4a4886848edea7c2ba4ae32ce9abab135628d64adbde5fa7b0d
     HEAD_REF master
+    PATCHES
+        fix-missing-headers.patch # https://github.com/CaptainCrowbar/unicorn-lib/pull/10
 )
 
-file(COPY ${CURRENT_PORT_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY "${CURRENT_PORT_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
+
+vcpkg_find_acquire_program(PKGCONFIG)
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}"
     OPTIONS_DEBUG
         -DUNICORN_LIB_SKIP_HEADERS=ON
 )
@@ -22,6 +25,4 @@ vcpkg_cmake_configure(
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-
 file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/external_imported/vcpkg/ports/unicorn-lib/vcpkg.json b/external_imported/vcpkg/ports/unicorn-lib/vcpkg.json
index 9a7ed9aeb..46c98ef9a 100644
--- a/external_imported/vcpkg/ports/unicorn-lib/vcpkg.json
+++ b/external_imported/vcpkg/ports/unicorn-lib/vcpkg.json
@@ -1,11 +1,20 @@
 {
   "name": "unicorn-lib",
   "version-date": "2022-01-24",
+  "port-version": 2,
   "description": "Unicode library for C++ by Ross Smith",
   "homepage": "https://github.com/CaptainCrowbar/unicorn-lib",
   "license": "MIT",
+  "supports": "!uwp",
   "dependencies": [
-    "pcre2",
+    {
+      "name": "libiconv",
+      "platform": "!windows"
+    },
+    {
+      "name": "pcre2",
+      "default-features": false
+    },
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/external_imported/vcpkg/ports/unicorn/fix-build.patch b/external_imported/vcpkg/ports/unicorn/fix-build.patch
new file mode 100644
index 000000000..6e1cafcd4
--- /dev/null
+++ b/external_imported/vcpkg/ports/unicorn/fix-build.patch
@@ -0,0 +1,22 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4110ae5..a86b207 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -109,7 +109,7 @@ if(MSVC)
+     add_compile_options($<$<COMPILE_LANGUAGE:C>:/wd4267>)
+ 
+     # handle msvcrt setting being passed in CMAKE_C_FLAGS
+-    if(DEFINED CMAKE_MSVC_RUNTIME_LIBRARY)
++    if(NOT CMAKE_MSVC_RUNTIME_LIBRARY)
+         # do not support other methods of setting this (it would be more conformant, tho)
+         message(FATAL_ERROR "please set msvcrt via CMAKE_C_FLAGS")
+     endif()
+@@ -1431,7 +1431,7 @@ if(UNICORN_BUILD_TESTS)
+ endif()
+ 
+ 
+-if(UNICORN_INSTALL AND NOT MSVC)
++if(UNICORN_INSTALL)
+     include("GNUInstallDirs")
+     file(GLOB UNICORN_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/include/unicorn/*.h)
+     if (BUILD_SHARED_LIBS)
diff --git a/external_imported/vcpkg/ports/unicorn/portfile.cmake b/external_imported/vcpkg/ports/unicorn/portfile.cmake
index cccfbfe21..70f6b2180 100644
--- a/external_imported/vcpkg/ports/unicorn/portfile.cmake
+++ b/external_imported/vcpkg/ports/unicorn/portfile.cmake
@@ -1,7 +1,3 @@
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-    message(FATAL_ERROR "WindowsStore not supported")
-endif()
-
 if(VCPKG_CRT_LINKAGE STREQUAL "dynamic" AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     message(FATAL_ERROR "unicorn can currently only be built with /MT or /MTd (static CRT linkage)")
 endif()
@@ -12,45 +8,25 @@ set(VCPKG_CRT_LINKAGE "static")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO unicorn-engine/unicorn
-    REF 52f90cda023abaca510d59f021c88629270ad6c0 # v1.0.3
-    SHA512 bb47e7d680b122e38bd9390f44a3f7e3c3e314ea3ac86dbab3e755b7bcc2db5daca3a4432276a874f59675f811f7785d68ec0d39696c955d3718d6a720adf70b
+    REF "${VERSION}.post1"
+    SHA512 8694d6bc92e3424a8ad050316413d53e56e0f55e7cad7517fb3e98e670a0f1768b060ead8f195da13607cec89a964364f05a8b9d0dc074f4ac5e51026f8343ad
     HEAD_REF master
+    PATCHES
+        fix-build.patch
 )
 
-if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
-    set(UNICORN_PLATFORM "Win32")
-elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
-    set(UNICORN_PLATFORM "x64")
-else()
-    message(FATAL_ERROR "Unsupported architecture")
-endif()
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DUNICORN_BUILD_TESTS=OFF
+    )
 
-vcpkg_build_msbuild(
-    PROJECT_PATH "${SOURCE_PATH}/msvc/unicorn.sln"
-    PLATFORM "${UNICORN_PLATFORM}"
-)
+vcpkg_cmake_install()
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    file(INSTALL "${SOURCE_PATH}/msvc/${UNICORN_PLATFORM}/Release/unicorn.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
-    file(INSTALL "${SOURCE_PATH}/msvc/${UNICORN_PLATFORM}/Release/unicorn.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
-    file(INSTALL "${SOURCE_PATH}/msvc/${UNICORN_PLATFORM}/Debug/unicorn.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
-    file(INSTALL "${SOURCE_PATH}/msvc/${UNICORN_PLATFORM}/Debug/unicorn.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
-else()
-    file(INSTALL "${SOURCE_PATH}/msvc/${UNICORN_PLATFORM}/Release/unicorn_static.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
-    file(INSTALL "${SOURCE_PATH}/msvc/${UNICORN_PLATFORM}/Debug/unicorn_static.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
-endif()
+vcpkg_fixup_pkgconfig()
 
-file(
-    INSTALL "${SOURCE_PATH}/msvc/distro/include/unicorn"
-    DESTINATION "${CURRENT_PACKAGES_DIR}/include"
-    RENAME "unicorn"
-)
-file(
-    INSTALL "${SOURCE_PATH}/COPYING"
-    DESTINATION "${CURRENT_PACKAGES_DIR}/share/unicorn"
-    RENAME "copyright"
-)
-file(
-    INSTALL "${SOURCE_PATH}/COPYING_GLIB"
-    DESTINATION "${CURRENT_PACKAGES_DIR}/share/unicorn"
-)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+# Handle copyright
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/unicorn/vcpkg.json b/external_imported/vcpkg/ports/unicorn/vcpkg.json
index e4ea908ad..5ffa0d52b 100644
--- a/external_imported/vcpkg/ports/unicorn/vcpkg.json
+++ b/external_imported/vcpkg/ports/unicorn/vcpkg.json
@@ -1,8 +1,14 @@
 {
   "name": "unicorn",
-  "version": "1.0.3",
+  "version": "2.0.1",
   "description": "Unicorn is a lightweight multi-platform, multi-architecture CPU emulator framework",
   "homepage": "https://github.com/unicorn-engine/unicorn",
   "license": "GPL-2.0-only",
-  "supports": "windows & !uwp & !arm"
+  "supports": "windows & !uwp & !arm",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/unittest-cpp/portfile.cmake b/external_imported/vcpkg/ports/unittest-cpp/portfile.cmake
index 886e380d7..654ff2eea 100644
--- a/external_imported/vcpkg/ports/unittest-cpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/unittest-cpp/portfile.cmake
@@ -12,12 +12,13 @@ vcpkg_from_github(
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DUTPP_INCLUDE_TESTS_IN_BUILD=OFF
 )
 
 vcpkg_cmake_install()
 
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/UnitTest++)
-file(RENAME "${CURRENT_PACKAGES_DIR}/share/unittest-cpp" "${CURRENT_PACKAGES_DIR}/share/unittest++")
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/UnitTest++ PACKAGE_NAME unittest++)
 
 # Handle copyright
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/external_imported/vcpkg/ports/unittest-cpp/vcpkg.json b/external_imported/vcpkg/ports/unittest-cpp/vcpkg.json
index f9e1024c8..c80c29e7c 100644
--- a/external_imported/vcpkg/ports/unittest-cpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/unittest-cpp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "unittest-cpp",
   "version-semver": "2.0.0",
-  "port-version": 4,
+  "port-version": 5,
   "description": "A lightweight unit testing framework for C++",
   "homepage": "https://github.com/unittest-cpp/unittest-cpp",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/unordered-dense/portfile.cmake b/external_imported/vcpkg/ports/unordered-dense/portfile.cmake
new file mode 100644
index 000000000..acced3e55
--- /dev/null
+++ b/external_imported/vcpkg/ports/unordered-dense/portfile.cmake
@@ -0,0 +1,24 @@
+vcpkg_from_github(
+	OUT_SOURCE_PATH SOURCE_PATH
+	REPO martinus/unordered_dense
+	REF v${VERSION}
+	SHA512 82724dd3651f520a240b131fa7cac209d844b9f3a54ea36c8cbb125cb42fdbf5f38d96935f2999e5bf04c447b2b9fde4ebc740decfd7d3d4b7d45177d4f26b58
+	HEAD_REF master
+)
+
+vcpkg_cmake_configure(
+	SOURCE_PATH "${SOURCE_PATH}"
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(
+	PACKAGE_NAME unordered_dense
+	CONFIG_PATH lib/cmake/unordered_dense
+)
+
+file(REMOVE_RECURSE
+	"${CURRENT_PACKAGES_DIR}/debug"
+	"${CURRENT_PACKAGES_DIR}/lib"
+)
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/unordered-dense/vcpkg.json b/external_imported/vcpkg/ports/unordered-dense/vcpkg.json
new file mode 100644
index 000000000..190ebcfaa
--- /dev/null
+++ b/external_imported/vcpkg/ports/unordered-dense/vcpkg.json
@@ -0,0 +1,17 @@
+{
+  "name": "unordered-dense",
+  "version": "4.4.0",
+  "description": "A fast & densely stored hashmap and hashset based on robin-hood backward shift deletion",
+  "homepage": "https://github.com/martinus/unordered_dense",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/unqlite/vcpkg.json b/external_imported/vcpkg/ports/unqlite/vcpkg.json
index 4e7532c25..62e52308e 100644
--- a/external_imported/vcpkg/ports/unqlite/vcpkg.json
+++ b/external_imported/vcpkg/ports/unqlite/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "unqlite",
-  "version-string": "1.1.9",
-  "port-version": 1,
+  "version": "1.1.9",
+  "port-version": 2,
   "description": "An embedded NoSQL, transactional database engine",
   "homepage": "https://unqlite.org/",
   "license": "BSD-2-Clause",
diff --git a/external_imported/vcpkg/ports/unrar/portfile.cmake b/external_imported/vcpkg/ports/unrar/portfile.cmake
index 51d8f57b3..6924fa1fc 100644
--- a/external_imported/vcpkg/ports/unrar/portfile.cmake
+++ b/external_imported/vcpkg/ports/unrar/portfile.cmake
@@ -11,32 +11,22 @@ vcpkg_download_distfile(ARCHIVE
     FILENAME ${UNRAR_FILENAME}
     SHA512 ${UNRAR_SHA512}
 )
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
-    REF ${UNRAR_VERSION}
+vcpkg_extract_source_archive(
+    SOURCE_PATH
+    ARCHIVE "${ARCHIVE}"
+    SOURCE_BASE ${UNRAR_VERSION}
     PATCHES msbuild-use-default-sma.patch
 )
 
-vcpkg_build_msbuild(
-    PROJECT_PATH "${SOURCE_PATH}/UnRARDll.vcxproj"
-    OPTIONS_DEBUG /p:OutDir=../../${TARGET_TRIPLET}-dbg/
-    OPTIONS_RELEASE /p:OutDir=../../${TARGET_TRIPLET}-rel/
-    OPTIONS /VERBOSITY:Diagnostic /DETAILEDSUMMARY
+vcpkg_msbuild_install(
+    SOURCE_PATH "${SOURCE_PATH}"
+    PROJECT_SUBPATH "UnRARDll.vcxproj"
 )
 
 #INCLUDE (named dll.hpp in source, and unrar.h in all rarlabs distributions)
 file(INSTALL "${SOURCE_PATH}/dll.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include" RENAME unrar.h)
 
-#DLL & LIB
-file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/unrar.dll"  DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
-file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/unrar.lib"  DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
-file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/unrar.dll"  DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
-file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/unrar.lib"  DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
-
-vcpkg_copy_pdbs()
-
 configure_file("${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/unofficial-unrar/unofficial-unrar-config.cmake" @ONLY)
 
 #COPYRIGHT
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/external_imported/vcpkg/ports/unrar/vcpkg.json b/external_imported/vcpkg/ports/unrar/vcpkg.json
index 1be96cd16..2331ae20d 100644
--- a/external_imported/vcpkg/ports/unrar/vcpkg.json
+++ b/external_imported/vcpkg/ports/unrar/vcpkg.json
@@ -1,9 +1,16 @@
 {
   "name": "unrar",
   "version": "6.1.7",
-  "port-version": 1,
+  "port-version": 3,
   "description": "rarlab's unrar library",
   "homepage": "https://www.rarlab.com",
   "license": null,
-  "supports": "windows & !uwp & !arm & !static"
+  "supports": "windows & !uwp & !arm & !static",
+  "dependencies": [
+    {
+      "name": "vcpkg-msbuild",
+      "host": true,
+      "platform": "windows"
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/upb/vcpkg.json b/external_imported/vcpkg/ports/upb/vcpkg.json
index 26897ea8f..7a99b8597 100644
--- a/external_imported/vcpkg/ports/upb/vcpkg.json
+++ b/external_imported/vcpkg/ports/upb/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "upb",
   "version-date": "2022-06-21",
+  "port-version": 1,
   "description": "μpb (often written 'upb') is a small protobuf implementation written in C.",
   "homepage": "https://github.com/protocolbuffers/upb/",
   "license": "BSD-2-Clause",
@@ -24,6 +25,7 @@
   "features": {
     "codegen": {
       "description": "Build code generator machinery",
+      "supports": "!uwp",
       "dependencies": [
         "abseil",
         "protobuf"
diff --git a/external_imported/vcpkg/ports/urdfdom/0006-pc_file_for_windows.patch b/external_imported/vcpkg/ports/urdfdom/0006-pc_file_for_windows.patch
new file mode 100644
index 000000000..83471eedf
--- /dev/null
+++ b/external_imported/vcpkg/ports/urdfdom/0006-pc_file_for_windows.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -89,11 +89,11 @@
+ # Make the package config file
+-if (NOT MSVC)
++
+   set(PKG_DESC "Unified Robot Description Format")
+   set(PKG_DEPENDS "urdfdom_headers console_bridge") # make the list separated by spaces instead of ;
+   set(PKG_URDF_LIBS "-lurdfdom_sensor -lurdfdom_model_state -lurdfdom_model -lurdfdom_world")
+   set(pkg_conf_file "cmake/pkgconfig/urdfdom.pc")
+   configure_file("${CMAKE_CURRENT_SOURCE_DIR}/${pkg_conf_file}.in" "${CMAKE_BINARY_DIR}/${pkg_conf_file}" @ONLY)
+   install(FILES ${CMAKE_BINARY_DIR}/${pkg_conf_file}
+     DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/ COMPONENT pkgconfig)
+-endif()
++
+
diff --git a/external_imported/vcpkg/ports/urdfdom/portfile.cmake b/external_imported/vcpkg/ports/urdfdom/portfile.cmake
index 5a2e8a0ae..fdafe4f62 100644
--- a/external_imported/vcpkg/ports/urdfdom/portfile.cmake
+++ b/external_imported/vcpkg/ports/urdfdom/portfile.cmake
@@ -3,12 +3,13 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ros/urdfdom
-    REF 99ec1f99f2d175f07cc26e63082502ee62982dac # 3.1.0
-    SHA512 64bd96c6b56c300b92e2bd6a875c4bc3c4c5d2ee332a75a8d98099aee0db3e9c33fa7d75fdc4d013e7b6ac47296f524ef713639b06e66035135dfc2a8cca0276
+    REF ${VERSION}
+    SHA512 6386954bc7883e82d9db7c785ae074b47ca31efb7cc2686101e7813768824bed5b46a774a1296453c39ff76673a9dc77305bb2ac96b86ecf93fab22062ef2258
     HEAD_REF master
     PATCHES
         0001_use_math_defines.patch
         0005-fix-config-and-install.patch
+        0006-pc_file_for_windows.patch
 )
 
 vcpkg_cmake_configure(
diff --git a/external_imported/vcpkg/ports/urdfdom/vcpkg.json b/external_imported/vcpkg/ports/urdfdom/vcpkg.json
index 97764859e..f9ef20c91 100644
--- a/external_imported/vcpkg/ports/urdfdom/vcpkg.json
+++ b/external_imported/vcpkg/ports/urdfdom/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "urdfdom",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "description": "Provides core data structures and a simple XML parsers for populating the class data structures from an URDF file.",
   "homepage": "https://github.com/ros/urdfdom",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/urho3d/macosx.patch b/external_imported/vcpkg/ports/urho3d/macosx.patch
index edcae1460..bc346def6 100644
--- a/external_imported/vcpkg/ports/urho3d/macosx.patch
+++ b/external_imported/vcpkg/ports/urho3d/macosx.patch
@@ -1,5 +1,5 @@
 diff --git a/Source/ThirdParty/Assimp/contrib/zlib/gzguts.h b/Source/ThirdParty/Assimp/contrib/zlib/gzguts.h
-index 6378d468a..c8563db52 100644
+index 6378d46..c8563db 100644
 --- a/Source/ThirdParty/Assimp/contrib/zlib/gzguts.h
 +++ b/Source/ThirdParty/Assimp/contrib/zlib/gzguts.h
 @@ -38,6 +38,9 @@
@@ -13,7 +13,7 @@ index 6378d468a..c8563db52 100644
  #if defined(_WIN32)
  #  define WIDECHAR
 diff --git a/Source/ThirdParty/Civetweb/src/civetweb.c b/Source/ThirdParty/Civetweb/src/civetweb.c
-index 4d26e0a83..2bd577e81 100644
+index 4d26e0a..2bd577e 100644
 --- a/Source/ThirdParty/Civetweb/src/civetweb.c
 +++ b/Source/ThirdParty/Civetweb/src/civetweb.c
 @@ -167,6 +167,8 @@ mg_static_assert(sizeof(void *) >= sizeof(int), "data type size check");
@@ -25,3 +25,23 @@ index 4d26e0a83..2bd577e81 100644
  #if !defined(DEBUG_TRACE)
  #if defined(DEBUG)
  
+diff --git a/Source/ThirdParty/SDL/CMakeLists.txt b/Source/ThirdParty/SDL/CMakeLists.txt
+index 5c4ef27..fd4c4dd 100644
+--- a/Source/ThirdParty/SDL/CMakeLists.txt
++++ b/Source/ThirdParty/SDL/CMakeLists.txt
+@@ -428,15 +428,6 @@ if(USE_GCC OR USE_CLANG)
+     list(APPEND EXTRA_CFLAGS "-fno-strict-aliasing")
+   endif()
+ 
+-  check_c_compiler_flag(-Wdeclaration-after-statement HAVE_GCC_WDECLARATION_AFTER_STATEMENT)
+-  if(HAVE_GCC_WDECLARATION_AFTER_STATEMENT)
+-    check_c_compiler_flag(-Werror=declaration-after-statement HAVE_GCC_WERROR_DECLARATION_AFTER_STATEMENT)
+-    # Urho3D - bug fix - SDL does not build cleanly for Android platform with this flag on, make a tweak here rather than changing on their code
+-    if(HAVE_GCC_WERROR_DECLARATION_AFTER_STATEMENT AND NOT ANDROID)
+-      list(APPEND EXTRA_CFLAGS "-Werror=declaration-after-statement")
+-    endif()
+-    list(APPEND EXTRA_CFLAGS "-Wdeclaration-after-statement")
+-  endif()
+ 
+   if(DEPENDENCY_TRACKING)
+     check_c_source_compiles("
diff --git a/external_imported/vcpkg/ports/urho3d/portfile.cmake b/external_imported/vcpkg/ports/urho3d/portfile.cmake
index 37f24735d..81d126733 100644
--- a/external_imported/vcpkg/ports/urho3d/portfile.cmake
+++ b/external_imported/vcpkg/ports/urho3d/portfile.cmake
@@ -33,6 +33,7 @@ vcpkg_cmake_configure(
         ${FEATURE_OPTIONS}
         -DURHO3D_LIB_TYPE=${URHO3D_LIB_TYPE}
         -DURHO3D_PCH=OFF
+        -DCMAKE_DISABLE_FIND_PACKAGE_ALSA=ON
 )
 
 vcpkg_cmake_install()
@@ -116,4 +117,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/urho3d/vcpkg.json b/external_imported/vcpkg/ports/urho3d/vcpkg.json
index 4a3e308ed..52a7da5b3 100644
--- a/external_imported/vcpkg/ports/urho3d/vcpkg.json
+++ b/external_imported/vcpkg/ports/urho3d/vcpkg.json
@@ -2,7 +2,7 @@
   "$note": "Due to the upstream modification of the dependent source code, the internal port of vcpkg cannot be used.",
   "name": "urho3d",
   "version-date": "2021-03-01",
-  "port-version": 3,
+  "port-version": 5,
   "description": "Urho3D is a free lightweight, cross-platform 2D and 3D game engine implemented in C++ and released under the MIT license. Greatly inspired by OGRE and Horde3D.",
   "homepage": "https://github.com/urho3d/Urho3D",
   "supports": "!(arm | uwp)",
diff --git a/external_imported/vcpkg/ports/usbmuxd/CMakeLists.txt b/external_imported/vcpkg/ports/usbmuxd/CMakeLists.txt
new file mode 100644
index 000000000..d32f69d18
--- /dev/null
+++ b/external_imported/vcpkg/ports/usbmuxd/CMakeLists.txt
@@ -0,0 +1,52 @@
+cmake_minimum_required(VERSION 3.15)
+project(usbmuxd C)
+
+include(GNUInstallDirs)
+
+file(GLOB_RECURSE USBMUXD_SOURCE src/*.c src/*.h)
+
+set(DEFINITIONS)
+
+list(APPEND DEFINITIONS -DPACKAGE_NAME="usbmuxd")
+list(APPEND DEFINITIONS -DPACKAGE_STRING="1.1.1")
+list(APPEND DEFINITIONS -DPACKAGE_VERSION="1.1.1")
+list(APPEND DEFINITIONS -DPACKAGE_URL="https://github.com/libimobiledevice/usbmuxd")
+list(APPEND DEFINITIONS -DPACKAGE_BUGREPORT="https://github.com/libimobiledevice/usbmuxd/issues")
+
+if(UNIX)
+    list(APPEND DEFINITIONS -DHAVE_CLOCK_GETTIME)
+endif()
+
+if(UNIX AND NOT APPLE)
+    list(APPEND DEFINITIONS -DHAVE_PPOLL)
+endif()
+
+if(WIN32)
+    list(APPEND DEFINITIONS -D_CRT_SECURE_NO_WARNINGS)
+    list(APPEND DEFINITIONS -DWIN32)
+endif()
+
+find_package(unofficial-libimobiledevice CONFIG REQUIRED)
+find_package(unofficial-libimobiledevice-glue CONFIG REQUIRED)
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0)
+find_path(DIRENT_INCLUDE_DIR dirent.h REQUIRED)
+
+add_executable(usbmuxd ${USBMUXD_SOURCE})
+target_include_directories(usbmuxd PRIVATE
+    ${DIRENT_INCLUDE_DIR}
+)
+target_compile_definitions(usbmuxd PRIVATE ${DEFINITIONS})
+target_link_libraries(usbmuxd PRIVATE
+    unofficial::libimobiledevice::libimobiledevice
+    unofficial::libimobiledevice-glue::libimobiledevice-glue
+    PkgConfig::libusb
+)
+if(WIN32)
+    find_package(PThreads4W REQUIRED)
+    find_package(unofficial-getopt-win32 REQUIRED)
+    target_link_libraries(usbmuxd PRIVATE PThreads4W::PThreads4W unofficial::getopt-win32::getopt)
+endif()
+
+install(TARGETS usbmuxd
+    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
diff --git a/external_imported/vcpkg/ports/usbmuxd/fix-definitions.patch b/external_imported/vcpkg/ports/usbmuxd/fix-definitions.patch
deleted file mode 100644
index 342280524..000000000
--- a/external_imported/vcpkg/ports/usbmuxd/fix-definitions.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/usbmuxd.vcxproj b/usbmuxd.vcxproj
-index 1500a8a..61362c3 100644
---- a/usbmuxd.vcxproj
-+++ b/usbmuxd.vcxproj
-@@ -129,7 +129,7 @@
-       </PrecompiledHeader>
-       <WarningLevel>Level3</WarningLevel>
-       <Optimization>Disabled</Optimization>
--      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_USE_32BIT_TIME_T;HAVE_LIBIMOBILEDEVICE</PreprocessorDefinitions>
-+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_USE_32BIT_TIME_T;HAVE_LIBIMOBILEDEVICE;HAVE_ENUM_IDEVICE_CONNECTION_TYPE;PACKAGE_URL="";PACKAGE_BUGREPORT=""</PreprocessorDefinitions>
-       <TreatSpecificWarningsAsErrors>4013</TreatSpecificWarningsAsErrors>
-     </ClCompile>
-     <Link>
-@@ -144,7 +144,7 @@
-       </PrecompiledHeader>
-       <WarningLevel>Level3</WarningLevel>
-       <Optimization>Disabled</Optimization>
--      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;WIN32;HAVE_LIBIMOBILEDEVICE</PreprocessorDefinitions>
-+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;WIN32;HAVE_LIBIMOBILEDEVICE;HAVE_ENUM_IDEVICE_CONNECTION_TYPE;PACKAGE_URL="";PACKAGE_BUGREPORT=""</PreprocessorDefinitions>
-     </ClCompile>
-     <Link>
-       <SubSystem>Console</SubSystem>
-@@ -160,7 +160,7 @@
-       <Optimization>MaxSpeed</Optimization>
-       <FunctionLevelLinking>true</FunctionLevelLinking>
-       <IntrinsicFunctions>true</IntrinsicFunctions>
--      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_USE_32BIT_TIME_T;HAVE_LIBIMOBILEDEVICE</PreprocessorDefinitions>
-+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_USE_32BIT_TIME_T;HAVE_LIBIMOBILEDEVICE;HAVE_ENUM_IDEVICE_CONNECTION_TYPE;PACKAGE_URL="";PACKAGE_BUGREPORT=""</PreprocessorDefinitions>
-       <TreatSpecificWarningsAsErrors>4013</TreatSpecificWarningsAsErrors>
-     </ClCompile>
-     <Link>
-@@ -179,7 +179,7 @@
-       <Optimization>MaxSpeed</Optimization>
-       <FunctionLevelLinking>true</FunctionLevelLinking>
-       <IntrinsicFunctions>true</IntrinsicFunctions>
--      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;WIN32;HAVE_LIBIMOBILEDEVICE</PreprocessorDefinitions>
-+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;WIN32;HAVE_LIBIMOBILEDEVICE;HAVE_ENUM_IDEVICE_CONNECTION_TYPE;PACKAGE_URL="";PACKAGE_BUGREPORT=""</PreprocessorDefinitions>
-     </ClCompile>
-     <Link>
-       <SubSystem>Console</SubSystem>
diff --git a/external_imported/vcpkg/ports/usbmuxd/fix-dependence-pthreads.patch b/external_imported/vcpkg/ports/usbmuxd/fix-dependence-pthreads.patch
deleted file mode 100644
index 5ff4d8472..000000000
--- a/external_imported/vcpkg/ports/usbmuxd/fix-dependence-pthreads.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/usbmuxd.vcxproj b/usbmuxd.vcxproj
-index d1d8a4d..086e8a4 100644
---- a/usbmuxd.vcxproj
-+++ b/usbmuxd.vcxproj
-@@ -135,7 +135,7 @@
-     <Link>
-       <SubSystem>Console</SubSystem>
-       <GenerateDebugInformation>true</GenerateDebugInformation>
--      <AdditionalDependencies>ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadsVC2d.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadVC3d.lib;%(AdditionalDependencies)</AdditionalDependencies>
-     </Link>
-   </ItemDefinitionGroup>
-   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-@@ -149,7 +149,7 @@
-     <Link>
-       <SubSystem>Console</SubSystem>
-       <GenerateDebugInformation>true</GenerateDebugInformation>
--      <AdditionalDependencies>ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadsVC2d.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadVC3d.lib;%(AdditionalDependencies)</AdditionalDependencies>
-     </Link>
-   </ItemDefinitionGroup>
-   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-@@ -168,7 +168,7 @@
-       <EnableCOMDATFolding>true</EnableCOMDATFolding>
-       <OptimizeReferences>true</OptimizeReferences>
-       <GenerateDebugInformation>true</GenerateDebugInformation>
--      <AdditionalDependencies>ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadsVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadVC3.lib;%(AdditionalDependencies)</AdditionalDependencies>
-     </Link>
-   </ItemDefinitionGroup>
-   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-@@ -186,7 +186,7 @@
-       <EnableCOMDATFolding>true</EnableCOMDATFolding>
-       <OptimizeReferences>true</OptimizeReferences>
-       <GenerateDebugInformation>true</GenerateDebugInformation>
--      <AdditionalDependencies>ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadsVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadVC3.lib;%(AdditionalDependencies)</AdditionalDependencies>
-     </Link>
-   </ItemDefinitionGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/external_imported/vcpkg/ports/usbmuxd/portfile.cmake b/external_imported/vcpkg/ports/usbmuxd/portfile.cmake
index c9ac23d35..e7f11102c 100644
--- a/external_imported/vcpkg/ports/usbmuxd/portfile.cmake
+++ b/external_imported/vcpkg/ports/usbmuxd/portfile.cmake
@@ -1,20 +1,22 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO libimobiledevice-win32/usbmuxd
-    REF f1329e742825c93fd080bdb8253d710ef8b6f751 # v1.2.235
-    SHA512 3259040a3266ce068a6fa1fdecdea824d22f04391ca073fc61d72a1f6d401d93469b9681ddc89a8016ef410bb7443875b2c5df2b571227dd34c66248cbe87fe7
-    HEAD_REF master-msvc
-    PATCHES
-        fix-dependence-pthreads.patch
-        fix-definitions.patch
+    REPO libimobiledevice/usbmuxd
+    REF 61b99ab5c25609c11369733a0df97c03a0581a56 # commits on 2023-07-21
+    SHA512 1b67a41f43e78bbf0966cbe68c9e35351d5a163d7d82aa6e5caed6c4f8ffc3c28faf74dc96890a35481b4856f6b6d95ebec9e8d2a665a099d8909b91bf408381
+    HEAD_REF master
 )
 
-vcpkg_install_msbuild(
-    SOURCE_PATH ${SOURCE_PATH}
-    PROJECT_SUBPATH usbmuxd.vcxproj
-    LICENSE_SUBPATH COPYING.GPLv2
-    USE_VCPKG_INTEGRATION
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
 )
 
-# No headers
+vcpkg_cmake_install()
+vcpkg_copy_tools(TOOL_NAMES usbmuxd AUTO_CLEAN)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING.GPLv2" "${SOURCE_PATH}/COPYING.GPLv3")
+
 set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
diff --git a/external_imported/vcpkg/ports/usbmuxd/vcpkg.json b/external_imported/vcpkg/ports/usbmuxd/vcpkg.json
index fdbb2ef8e..952d781df 100644
--- a/external_imported/vcpkg/ports/usbmuxd/vcpkg.json
+++ b/external_imported/vcpkg/ports/usbmuxd/vcpkg.json
@@ -1,15 +1,21 @@
 {
   "name": "usbmuxd",
-  "version": "1.2.235",
-  "port-version": 3,
+  "version-date": "2023-07-21",
+  "port-version": 1,
   "description": "A socket daemon to multiplex connections from and to iOS devices",
   "homepage": "http://www.libimobiledevice.org",
-  "license": "LGPL-2.1-only",
-  "supports": "windows & !arm64 & !static",
+  "license": "LGPL-2.0-or-later",
+  "supports": "(!windows & !android & !ios) | mingw",
   "dependencies": [
+    "dirent",
+    "getopt",
     "libimobiledevice",
+    "libimobiledevice-glue",
     "libusb",
-    "libusb-win32",
-    "pthreads"
+    "pthreads",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
   ]
 }
diff --git a/external_imported/vcpkg/ports/usd/portfile.cmake b/external_imported/vcpkg/ports/usd/portfile.cmake
index 60439d3ba..d650740e4 100644
--- a/external_imported/vcpkg/ports/usd/portfile.cmake
+++ b/external_imported/vcpkg/ports/usd/portfile.cmake
@@ -1,8 +1,8 @@
 # Don't file if the bin folder exists. We need exe and custom files.
-SET(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
 
 message(STATUS [=[
-The usd port does not work the the version of Threading Building Blocks (tbb) currently chosen by vcpkg's baselines,
+The usd port does not work with the version of Threading Building Blocks (tbb) currently chosen by vcpkg's baselines,
 and does not expect to be updated to work with current versions soon. See
 https://github.com/PixarAnimationStudios/USD/issues/1600
 
@@ -14,22 +14,17 @@ string(REGEX REPLACE "^([0-9]+)[.]([0-9])\$" "\\1.0\\2" USD_VERSION "${VERSION}"
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO PixarAnimationStudios/USD
+    REPO PixarAnimationStudios/OpenUSD
     REF "v${USD_VERSION}"
-    SHA512 2529aec788cab3ff4c47041f5bc0043fde81dcef8ca313f6390f2e5fb7a10b1b0b1dd47fd6c86e3b4cfc0a1b27bff4d9b94b96bfba6bec3d5ff8f6e2fccb9e11
+    SHA512 6669191c3497e244c958949b62a749958ab01e8e1edc7b3476d59c31395e147acf6f4ba7aae069c5ceab7fe2eb321e81e4e5f66beb72814be36e0fec98d3d034
     HEAD_REF master
     PATCHES
         fix_build-location.patch
 )
 
-vcpkg_find_acquire_program(PYTHON2)
-get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY)
-vcpkg_add_to_path("${PYTHON2_DIR}")
-
-IF (VCPKG_TARGET_IS_WINDOWS)
-ELSE()
+if(NOT VCPKG_TARGET_IS_WINDOWS)
 file(REMOVE ${SOURCE_PATH}/cmake/modules/FindTBB.cmake)
-ENDIF()
+endif()
 
 vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
@@ -48,6 +43,10 @@ vcpkg_cmake_configure(
 
 vcpkg_cmake_install()
 
+# The CMake files installation is not standard in USD and will install pxrConfig.cmake in the prefix root and
+# pxrTargets.cmake in "cmake" so we are moving pxrConfig.cmake in the same folder and patch the path to pxrTargets.cmake
+vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/pxrConfig.cmake "/cmake/pxrTargets.cmake" "/pxrTargets.cmake")
+
 file(
     RENAME
         "${CURRENT_PACKAGES_DIR}/pxrConfig.cmake"
@@ -55,39 +54,40 @@ file(
 
 vcpkg_cmake_config_fixup(CONFIG_PATH cmake PACKAGE_NAME pxr)
 
-vcpkg_copy_pdbs()
-
 # Remove duplicates in debug folder
 file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/pxrConfig.cmake)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-
-# Move all dlls to bin
-file(GLOB RELEASE_DLL ${CURRENT_PACKAGES_DIR}/lib/*.dll)
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
-file(GLOB DEBUG_DLL ${CURRENT_PACKAGES_DIR}/debug/lib/*.dll)
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
-foreach(CURRENT_FROM ${RELEASE_DLL} ${DEBUG_DLL})
-    string(REPLACE "/lib/" "/bin/" CURRENT_TO ${CURRENT_FROM})
-    file(RENAME ${CURRENT_FROM} ${CURRENT_TO})
-endforeach()
-
-function(file_replace_regex filename match_string replace_string)
-    file(READ ${filename} _contents)
-    string(REGEX REPLACE "${match_string}" "${replace_string}" _contents "${_contents}")
-    file(WRITE ${filename} "${_contents}")
-endfunction()
-
-# fix dll path for cmake
-file_replace_regex(${CURRENT_PACKAGES_DIR}/share/pxr/pxrConfig.cmake "/cmake/pxrTargets.cmake" "/pxrTargets.cmake")
-file_replace_regex(${CURRENT_PACKAGES_DIR}/share/pxr/pxrTargets-debug.cmake "debug/lib/([a-zA-Z0-9_]+)\\.dll" "debug/bin/\\1.dll")
-file_replace_regex(${CURRENT_PACKAGES_DIR}/share/pxr/pxrTargets-release.cmake "lib/([a-zA-Z0-9_]+)\\.dll" "bin/\\1.dll")
-
-# fix plugInfo.json for runtime
-file(GLOB_RECURSE PLUGINFO_FILES ${CURRENT_PACKAGES_DIR}/lib/usd/*/resources/plugInfo.json)
-file(GLOB_RECURSE PLUGINFO_FILES_DEBUG ${CURRENT_PACKAGES_DIR}/debug/lib/usd/*/resources/plugInfo.json)
-foreach(PLUGINFO ${PLUGINFO_FILES} ${PLUGINFO_FILES_DEBUG})
-    file_replace_regex(${PLUGINFO} [=["LibraryPath": "../../([a-zA-Z0-9_]+).dll"]=] [=["LibraryPath": "../../../bin/\1.dll"]=])
-endforeach()
+vcpkg_install_copyright(FILE_LIST ${SOURCE_PATH}/LICENSE.txt)
+
+if(VCPKG_TARGET_IS_WINDOWS)
+    # Move all dlls to bin
+    file(GLOB RELEASE_DLL ${CURRENT_PACKAGES_DIR}/lib/*.dll)
+    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
+    file(GLOB DEBUG_DLL ${CURRENT_PACKAGES_DIR}/debug/lib/*.dll)
+    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
+    foreach(CURRENT_FROM ${RELEASE_DLL} ${DEBUG_DLL})
+        string(REPLACE "/lib/" "/bin/" CURRENT_TO ${CURRENT_FROM})
+        file(RENAME ${CURRENT_FROM} ${CURRENT_TO})
+    endforeach()
+
+    vcpkg_copy_pdbs()
+
+    function(file_replace_regex filename match_string replace_string)
+        file(READ ${filename} _contents)
+        string(REGEX REPLACE "${match_string}" "${replace_string}" _contents "${_contents}")
+        file(WRITE ${filename} "${_contents}")
+    endfunction()
+
+    # fix dll path for cmake
+    file_replace_regex(${CURRENT_PACKAGES_DIR}/share/pxr/pxrTargets-debug.cmake "debug/lib/([a-zA-Z0-9_]+)\\.dll" "debug/bin/\\1.dll")
+    file_replace_regex(${CURRENT_PACKAGES_DIR}/share/pxr/pxrTargets-release.cmake "lib/([a-zA-Z0-9_]+)\\.dll" "bin/\\1.dll")
+
+    # fix plugInfo.json for runtime
+    file(GLOB_RECURSE PLUGINFO_FILES ${CURRENT_PACKAGES_DIR}/lib/usd/*/resources/plugInfo.json)
+    file(GLOB_RECURSE PLUGINFO_FILES_DEBUG ${CURRENT_PACKAGES_DIR}/debug/lib/usd/*/resources/plugInfo.json)
+    foreach(PLUGINFO ${PLUGINFO_FILES} ${PLUGINFO_FILES_DEBUG})
+        file_replace_regex(${PLUGINFO} [=["LibraryPath": "../../([a-zA-Z0-9_]+).dll"]=] [=["LibraryPath": "../../../bin/\1.dll"]=])
+    endforeach()
+endif()
diff --git a/external_imported/vcpkg/ports/usd/vcpkg.json b/external_imported/vcpkg/ports/usd/vcpkg.json
index 677fb73e4..5f3dd840b 100644
--- a/external_imported/vcpkg/ports/usd/vcpkg.json
+++ b/external_imported/vcpkg/ports/usd/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "usd",
-  "version": "23.2",
+  "version": "23.5",
+  "port-version": 3,
   "description": "Universal Scene Description (USD) is an efficient, scalable system for authoring, reading, and streaming time-sampled scene description for interchange between graphics applications.",
   "homepage": "https://github.com/PixarAnimationStudios/USD",
   "license": null,
-  "supports": "!x86 & !arm",
+  "supports": "!x86 & !arm & !android",
   "dependencies": [
     "boost-assign",
     "boost-crc",
@@ -15,6 +16,7 @@
     "boost-program-options",
     "boost-regex",
     "boost-system",
+    "boost-variant",
     "boost-vmd",
     "tbb",
     {
diff --git a/external_imported/vcpkg/ports/usearch/portfile.cmake b/external_imported/vcpkg/ports/usearch/portfile.cmake
new file mode 100644
index 000000000..fda98d869
--- /dev/null
+++ b/external_imported/vcpkg/ports/usearch/portfile.cmake
@@ -0,0 +1,24 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO unum-cloud/usearch
+    REF "v${VERSION}"
+    SHA512 b18006b248ea76b1a8c27c9c1285954f9101305cb5228d3565c854bd1aaf92e430556a5dbeb3f43a6a307914dd60b277a3ed342b953101e502871de294962bd4
+    HEAD_REF main
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DUSEARCH_INSTALL=ON
+        -DUSEARCH_BUILD_TEST=OFF
+        -DUSEARCH_BUILD_BENCHMARK=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/usearch)
+
+vcpkg_fixup_pkgconfig()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/usearch/vcpkg.json b/external_imported/vcpkg/ports/usearch/vcpkg.json
new file mode 100644
index 000000000..87fde8f23
--- /dev/null
+++ b/external_imported/vcpkg/ports/usearch/vcpkg.json
@@ -0,0 +1,17 @@
+{
+  "name": "usearch",
+  "version": "2.3.2",
+  "description": "Fastest Search & Clustering engine × for Vectors & Strings",
+  "homepage": "https://github.com/unum-cloud/usearch",
+  "license": "Apache-2.0",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/usockets/CMakeLists.txt b/external_imported/vcpkg/ports/usockets/CMakeLists.txt
index b2daed66d..3de280813 100644
--- a/external_imported/vcpkg/ports/usockets/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/usockets/CMakeLists.txt
@@ -13,10 +13,10 @@ else()
 endif()
 
 find_package(libuv CONFIG REQUIRED)
-if (TARGET uv)
-    set(LIBUV_LIBRARY uv)
+if (TARGET libuv::uv)
+    set(LIBUV_LIBRARY libuv::uv)
 else()
-    set(LIBUV_LIBRARY uv_a)
+    set(LIBUV_LIBRARY libuv::uv_a)
 endif()
 
 file(GLOB SOURCES src/*.c src/eventing/*.c)
diff --git a/external_imported/vcpkg/ports/usockets/portfile.cmake b/external_imported/vcpkg/ports/usockets/portfile.cmake
index 0dbbdadf0..29584fc62 100644
--- a/external_imported/vcpkg/ports/usockets/portfile.cmake
+++ b/external_imported/vcpkg/ports/usockets/portfile.cmake
@@ -13,7 +13,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO uNetworking/uSockets
     REF "v${VERSION}"
-    SHA512 89aadb2d077f58e5450ff62e685b894925113cedfa15cda03a9331fb9adcedcdd2f5fd51a8eae0719143566bef89c658bd75a2553282479d20b40c1d3042d273
+    SHA512 a4f71e146003056c4a3e99512e6989fd4a37b5943dfcaf593b7b276231c426abd2e1f60de752443fb62ac5926ecf9812866af3c8ce6c8eeeddffc92fa0eb5afb
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/usockets/vcpkg.json b/external_imported/vcpkg/ports/usockets/vcpkg.json
index ec2d4cc36..bf7558ffb 100644
--- a/external_imported/vcpkg/ports/usockets/vcpkg.json
+++ b/external_imported/vcpkg/ports/usockets/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "usockets",
-  "version": "0.8.5",
+  "version": "0.8.6",
+  "port-version": 1,
   "description": "Miniscule cross-platform eventing, networking & crypto for async applications",
   "homepage": "https://github.com/uNetworking/uSockets",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/usrsctp/fix_export.patch b/external_imported/vcpkg/ports/usrsctp/fix_export.patch
new file mode 100644
index 000000000..2198094eb
--- /dev/null
+++ b/external_imported/vcpkg/ports/usrsctp/fix_export.patch
@@ -0,0 +1,28 @@
+diff --git a/usrsctplib/CMakeLists.txt b/usrsctplib/CMakeLists.txt
+index aa99cf2..c60b393 100644
+--- a/usrsctplib/CMakeLists.txt
++++ b/usrsctplib/CMakeLists.txt
+@@ -174,7 +174,8 @@ list(APPEND usrsctp_sources
+ 
+ add_library(usrsctp ${usrsctp_sources} ${usrsctp_headers})
+ 
+-target_include_directories(usrsctp PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
++target_include_directories(usrsctp PUBLIC $<INSTALL_INTERFACE:include>
++        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
+ 
+ if (WIN32)
+ 	message(STATUS "link library: ws2_32")
+@@ -188,8 +189,12 @@ set_target_properties(usrsctp PROPERTIES SOVERSION ${SOVERSION_SHORT} VERSION ${
+ # INSTALL LIBRARY AND HEADER
+ #################################################
+ 
+-install(TARGETS usrsctp DESTINATION ${CMAKE_INSTALL_LIBDIR})
++install(TARGETS usrsctp EXPORT unofficial-usrsctp-config 
++        ARCHIVE DESTINATION lib
++        LIBRARY DESTINATION lib
++        RUNTIME DESTINATION bin)
+ install(FILES usrsctp.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
++install(EXPORT unofficial-usrsctp-config NAMESPACE unofficial::usrsctp:: DESTINATION share/unofficial-usrsctp)
+ 
+ #################################################
+ # GENERATE AND INSTALL PKG-CONFIG FILE
diff --git a/external_imported/vcpkg/ports/usrsctp/portfile.cmake b/external_imported/vcpkg/ports/usrsctp/portfile.cmake
index 55ea67667..4dba4cc15 100644
--- a/external_imported/vcpkg/ports/usrsctp/portfile.cmake
+++ b/external_imported/vcpkg/ports/usrsctp/portfile.cmake
@@ -6,6 +6,8 @@ vcpkg_from_github(
     REF 0.9.5.0
     SHA512 7b28706449f9365ba9750fd39925e7171516a1e3145d123ec69a12486637ae2393ad4c587b056403298dc13c149f0b01a262cbe4852abca42e425d7680c77ee3
     HEAD_REF master
+    PATCHES
+        fix_export.patch
 )
 
 vcpkg_cmake_configure(
@@ -23,4 +25,5 @@ configure_file("${SOURCE_PATH}/LICENSE.md" "${CURRENT_PACKAGES_DIR}/share/usrsct
 
 vcpkg_copy_pdbs()
 
-vcpkg_fixup_pkgconfig()
+vcpkg_fixup_pkgconfig()
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT} CONFIG_PATH share/unofficial-${PORT})
diff --git a/external_imported/vcpkg/ports/usrsctp/vcpkg.json b/external_imported/vcpkg/ports/usrsctp/vcpkg.json
index 56683423a..a8a506196 100644
--- a/external_imported/vcpkg/ports/usrsctp/vcpkg.json
+++ b/external_imported/vcpkg/ports/usrsctp/vcpkg.json
@@ -1,12 +1,18 @@
 {
   "name": "usrsctp",
   "version": "0.9.5.0",
-  "port-version": 1,
+  "port-version": 3,
   "description": "A userland SCTP stack supporting FreeBSD, Linux, Mac OS X and Windows.",
+  "homepage": "https://github.com/sctplab/usrsctp",
+  "license": "BSD-3-Clause",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
       "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/utf8-range/fix-cmake.patch b/external_imported/vcpkg/ports/utf8-range/fix-cmake.patch
new file mode 100644
index 000000000..d006c70f1
--- /dev/null
+++ b/external_imported/vcpkg/ports/utf8-range/fix-cmake.patch
@@ -0,0 +1,12 @@
+diff --git a/third_party/utf8_range/CMakeLists.txt b/third_party/utf8_range/CMakeLists.txt
+index 344952d38..dd855df17 100644
+--- a/third_party/utf8_range/CMakeLists.txt
++++ b/third_party/utf8_range/CMakeLists.txt
+@@ -63,6 +63,7 @@ if (utf8_range_ENABLE_INSTALL)
+         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++        INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+   )
+ 
+   configure_package_config_file(
diff --git a/external_imported/vcpkg/ports/utf8-range/portfile.cmake b/external_imported/vcpkg/ports/utf8-range/portfile.cmake
new file mode 100644
index 000000000..c54d38aef
--- /dev/null
+++ b/external_imported/vcpkg/ports/utf8-range/portfile.cmake
@@ -0,0 +1,27 @@
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO protocolbuffers/protobuf
+    REF d30e326ca1f511ab537d9b2f73ce69b2f8f0c865
+    SHA512 5f22493cfb6536d3a8a7bd752505baccacb85b0eade53b35763c3a30fab9197a8ff04bc9d4b6c2f66dc295b77c09a1b670d242f509f8705c0d699767d222eb38
+    HEAD_REF main
+    PATCHES
+        fix-cmake.patch
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}/third_party/utf8_range"
+    OPTIONS
+        "-Dutf8_range_ENABLE_TESTS=off"
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME "utf8_range" CONFIG_PATH "lib/cmake/utf8_range")
+
+vcpkg_fixup_pkgconfig()
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/third_party/utf8_range/LICENSE")
diff --git a/external_imported/vcpkg/ports/utf8-range/vcpkg.json b/external_imported/vcpkg/ports/utf8-range/vcpkg.json
new file mode 100644
index 000000000..13f9c3ea3
--- /dev/null
+++ b/external_imported/vcpkg/ports/utf8-range/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "utf8-range",
+  "version-date": "2023-11-09",
+  "description": "Fast UTF-8 validation with Range algorithm (NEON+SSE4+AVX2)",
+  "homepage": "https://github.com/protocolbuffers/protobuf",
+  "license": "MIT",
+  "dependencies": [
+    "abseil",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/utfcpp/portfile.cmake b/external_imported/vcpkg/ports/utfcpp/portfile.cmake
index fcd6984e7..c054263be 100644
--- a/external_imported/vcpkg/ports/utfcpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/utfcpp/portfile.cmake
@@ -1,30 +1,18 @@
-vcpkg_minimum_required(VERSION 2022-12-14)
+set(VCPKG_BUILD_TYPE release) # header-only
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO nemtrif/utfcpp
-    REF v${VERSION}
-    SHA512 760977df613abfb34fb7864cbbe90e8f2cf1f42b8502427a5e9c2a756ce87655120b7490ebdaa6c926a2cb56caef9ead0e0e10fb7cb732cf99a5b43c0cca411b
+    REF "v${VERSION}"
+    SHA512 49ca33bfb2ee44515f555184b51191f7b706a228fb84ddc62e1e6b59c7d69a5ff836f38694daad0012a0f651b6199451974fe44ebe80081df00cf8c2759e3249
     HEAD_REF master
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS
-        -DUTF8_INSTALL=ON
-        -DUTF8_SAMPLES=OFF
-        -DUTF8_TESTS=OFF
 )
 
 vcpkg_cmake_install()
-
-if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
-    vcpkg_cmake_config_fixup(PACKAGE_NAME utf8cpp CONFIG_PATH cmake)
-else()
-    vcpkg_cmake_config_fixup(PACKAGE_NAME utf8cpp CONFIG_PATH lib/cmake/utf8cpp)
-endif()
-
-# Header only
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib")
+vcpkg_cmake_config_fixup(PACKAGE_NAME utf8cpp CONFIG_PATH share/utf8cpp/cmake)
 
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/utfcpp/vcpkg.json b/external_imported/vcpkg/ports/utfcpp/vcpkg.json
index 75d2c9d2e..256a723f7 100644
--- a/external_imported/vcpkg/ports/utfcpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/utfcpp/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "utfcpp",
-  "version": "3.2.3",
+  "version": "4.0.5",
   "description": "UTF-8 with C++ in a Portable Way",
   "homepage": "https://github.com/nemtrif/utfcpp",
   "license": "BSL-1.0",
diff --git a/external_imported/vcpkg/ports/utfz/vcpkg.json b/external_imported/vcpkg/ports/utfz/vcpkg.json
index 987c48d97..8b117915a 100644
--- a/external_imported/vcpkg/ports/utfz/vcpkg.json
+++ b/external_imported/vcpkg/ports/utfz/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "utfz",
-  "version-string": "1.2",
-  "port-version": 3,
+  "version": "1.2",
+  "port-version": 4,
   "description": "A tiny C++ library for parsing and encoding utf-8",
   "homepage": "https://github.com/IMQS/utfz",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/uvatlas/portfile.cmake b/external_imported/vcpkg/ports/uvatlas/portfile.cmake
index 0c5649fc5..f8dd8ca58 100644
--- a/external_imported/vcpkg/ports/uvatlas/portfile.cmake
+++ b/external_imported/vcpkg/ports/uvatlas/portfile.cmake
@@ -1,68 +1,69 @@
-set(UVATLAS_TAG feb2023)
+set(UVATLAS_TAG dec2023)
 
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/UVAtlas
-    REF feb2023b
-    SHA512 4780c6a7f33b7d659e8dd39f48d6adefd22b1a4ed4ff41a1f74614f05048dfed643235d13064a84bd6839642baf9eb7f55f0a8d68db0fb655b7652a7e914fde8
+    REF ${UVATLAS_TAG}
+    SHA512 44caebdb6c4c2fc42c8dbbe4acbaf7046996dfcd08e36d622c50a024c1ea3968e1174bd4bf35356068d163c76ac88b697bebb4904dcd2c2bdb6e3e2daf9781d3
     HEAD_REF main
     PATCHES openexr.patch
 )
 
-if (VCPKG_HOST_IS_LINUX)
-    message(WARNING "Build ${PORT} requires GCC version 9 or later")
-endif()
-
 vcpkg_check_features(
     OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
         eigen ENABLE_USE_EIGEN
         spectre ENABLE_SPECTRE_MITIGATION
+        tools BUILD_TOOLS
 )
 
 set(EXTRA_OPTIONS -DBUILD_TESTING=OFF)
 
-if(VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_XBOX)
-  list(APPEND EXTRA_OPTIONS -DBUILD_TOOLS=OFF)
-else()
-  list(APPEND EXTRA_OPTIONS -DBUILD_TOOLS=ON)
+if (VCPKG_HOST_IS_LINUX)
+    message(WARNING "Build ${PORT} requires GCC version 9 or later")
 endif()
 
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS ${FEATURE_OPTIONS} ${EXTRA_OPTIONS}
 )
 
 vcpkg_cmake_install()
+vcpkg_fixup_pkgconfig()
 vcpkg_cmake_config_fixup(CONFIG_PATH share/uvatlas)
 
-if(VCPKG_HOST_IS_WINDOWS AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ("eigen" IN_LIST FEATURES)))
-  vcpkg_download_distfile(
-    UVATLASTOOL_EXE
-    URLS "https://github.com/Microsoft/UVAtlas/releases/download/${UVATLAS_TAG}/uvatlastool.exe"
-    FILENAME "uvatlastool-${UVATLAS_TAG}.exe"
-    SHA512 f34aa4ec7e10bbe24eefe31ddb98841fa097385921d8c3d813e30836749c4b9f4b6e792c371f59c55e446e91845dbd9d333332f6c06cd8cd966cd2bfee89e29e
-  )
+if("tools" IN_LIST FEATURES)
 
   file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/uvatlas/")
 
-  file(INSTALL
-    ${UVATLASTOOL_EXE}
-    DESTINATION ${CURRENT_PACKAGES_DIR}/tools/uvatlas/)
+  if((VCPKG_TARGET_ARCHITECTURE STREQUAL x64) AND (NOT ("eigen" IN_LIST FEATURES)))
 
-  file(RENAME ${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool-${UVATLAS_TAG}.exe ${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool.exe)
+    vcpkg_download_distfile(
+      UVATLASTOOL_EXE
+      URLS "https://github.com/Microsoft/UVAtlas/releases/download/${UVATLAS_TAG}/uvatlastool.exe"
+      FILENAME "uvatlastool-${UVATLAS_TAG}.exe"
+      SHA512 d8c76c4745e120f45e99330be09498e53d013d64342c7df836a9d3bc6746cfc1d0d351b9d7d8ae76c24206f3032d98a4402a04b8a6450d2ced68594675f9be08
+    )
 
-elseif(VCPKG_TARGET_IS_WINDOWS AND (NOT VCPKG_TARGET_IS_UWP) AND (NOT VCPKG_TARGET_IS_XBOX))
+    file(INSTALL
+      "${UVATLASTOOL_EXE}"
+      DESTINATION "${CURRENT_PACKAGES_DIR}/tools/uvatlas/")
 
-  vcpkg_copy_tools(
-        TOOL_NAMES uvatlastool
-        SEARCH_DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/CMake
-    )
+    file(RENAME "${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool-${UVATLAS_TAG}.exe" "${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool.exe")
+
+  else()
+
+    vcpkg_copy_tools(
+          TOOL_NAMES uvatlastool
+          SEARCH_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/CMake"
+      )
 
+  endif()
 endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/uvatlas/usage b/external_imported/vcpkg/ports/uvatlas/usage
new file mode 100644
index 000000000..a5fb208b4
--- /dev/null
+++ b/external_imported/vcpkg/ports/uvatlas/usage
@@ -0,0 +1,4 @@
+The UVAtlas package provides CMake targets:
+
+    find_package(uvatlas CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE Microsoft::UVAtlas)
diff --git a/external_imported/vcpkg/ports/uvatlas/vcpkg.json b/external_imported/vcpkg/ports/uvatlas/vcpkg.json
index 74a2f3458..ccaacdc79 100644
--- a/external_imported/vcpkg/ports/uvatlas/vcpkg.json
+++ b/external_imported/vcpkg/ports/uvatlas/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "uvatlas",
-  "version-date": "2023-02-06",
-  "port-version": 2,
+  "version-date": "2023-12-31",
   "description": "UVAtlas isochart texture atlas",
   "homepage": "https://github.com/Microsoft/UVAtlas",
   "documentation": "https://github.com/Microsoft/UVAtlas/wiki",
@@ -10,18 +9,9 @@
   "dependencies": [
     {
       "name": "directx-headers",
-      "platform": "(windows & !xbox) | linux"
+      "platform": "mingw | linux"
     },
     "directxmath",
-    {
-      "name": "directxmesh",
-      "platform": "!(uwp | linux)"
-    },
-    {
-      "name": "directxtex",
-      "default-features": false,
-      "platform": "!(uwp | linux)"
-    },
     {
       "name": "ms-gdkx",
       "platform": "xbox"
@@ -45,6 +35,20 @@
     },
     "spectre": {
       "description": "Build Spectre-mitigated library"
+    },
+    "tools": {
+      "description": "meshconvert command-line tool",
+      "supports": "windows & !uwp & !xbox",
+      "dependencies": [
+        {
+          "name": "directxmesh",
+          "default-features": false
+        },
+        {
+          "name": "directxtex",
+          "default-features": false
+        }
+      ]
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/uvw/CMakeLists.txt b/external_imported/vcpkg/ports/uvw/CMakeLists.txt
deleted file mode 100644
index d768716f7..000000000
--- a/external_imported/vcpkg/ports/uvw/CMakeLists.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-cmake_minimum_required(VERSION 3.8)
-project(uvw)
-
-find_package(libuv CONFIG REQUIRED)
-
-add_library(uvw INTERFACE)
-if (TARGET uv)
-    target_link_libraries(uvw INTERFACE uv)
-else()
-    target_link_libraries(uvw INTERFACE uv_a)
-endif()
-
-install(TARGETS uvw
-    EXPORT uvw
-    INCLUDES DESTINATION include/)
-
-install(EXPORT uvw
-    DESTINATION "share/uvw"
-    FILE uvw-targets.cmake
-    NAMESPACE uvw::)
-
-install(DIRECTORY
-    src/uvw/
-    DESTINATION include/uvw/)
-
-install(FILES
-    src/uvw.hpp
-    DESTINATION include/
-)
diff --git a/external_imported/vcpkg/ports/uvw/fix-find-libuv.patch b/external_imported/vcpkg/ports/uvw/fix-find-libuv.patch
new file mode 100644
index 000000000..7fff3f37e
--- /dev/null
+++ b/external_imported/vcpkg/ports/uvw/fix-find-libuv.patch
@@ -0,0 +1,19 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 289c006..180383f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -193,6 +193,14 @@ if (BUILD_UVW_LIBS)
+         SOVERSION ${UVW_VERSION_MAJOR}
+     )
+ endif()
++
++find_package(libuv CONFIG REQUIRED)
++if (TARGET libuv::uv)
++    target_link_libraries(uvw PRIVATE libuv::uv)
++else()
++    target_link_libraries(uvw PRIVATE libuv::uv_a)
++endif()
++
+ install(
+     EXPORT uvwConfig 
+     NAMESPACE uvw:: 
diff --git a/external_imported/vcpkg/ports/uvw/portfile.cmake b/external_imported/vcpkg/ports/uvw/portfile.cmake
index 21145e6f9..30732b478 100644
--- a/external_imported/vcpkg/ports/uvw/portfile.cmake
+++ b/external_imported/vcpkg/ports/uvw/portfile.cmake
@@ -1,22 +1,34 @@
-#header-only library
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO skypjack/uvw
-    REF 3db9e8f75a4351325e1ea00e17586af2b00cf1ea # v2.12.1_libuv_v1.44
-    SHA512 35e799fe877abc26ae44d20c9b5b292497d1468d9f89c0fc19b96a0b0712e35084480100e2fe7324353e2c3805c2f018e89192357d974bfd009af9b58bfcb7ec
+    REF "v${VERSION}_libuv_v1.46"
+    SHA512 a790f74a4d151319d3d692167b7d2229e6660dee34e7dc266815c3e5579dbe99e1da55e0466832ac8ec1881073317b744e384908de60bf62ef16420ee2fbc318
+    PATCHES
+        fix-find-libuv.patch
 )
 
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_UVW_LIBS=ON
+        -DBUILD_UVW_SHARED_LIB=OFF
+        -DFETCH_LIBUV=OFF
+        -DFIND_LIBUV=OFF
 )
 
 vcpkg_cmake_install()
-vcpkg_cmake_config_fixup()
-file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/uvw-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/uvw/")
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/uvw)
+
+file(READ "${CURRENT_PACKAGES_DIR}/share/uvw/uvwConfig.cmake" cmake_config)
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/uvw/uvwConfig.cmake"
+"include(CMakeFindDependencyMacro)
+find_dependency(libuv)
+${cmake_config}
+")
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-# Handle copyright/readme/package files
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-file(INSTALL "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/uvw/usage b/external_imported/vcpkg/ports/uvw/usage
new file mode 100644
index 000000000..0ff6b9bc4
--- /dev/null
+++ b/external_imported/vcpkg/ports/uvw/usage
@@ -0,0 +1,4 @@
+uvw provides CMake targets:
+
+    find_package(uvw CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE uvw::uvw)
diff --git a/external_imported/vcpkg/ports/uvw/uvw-config.cmake b/external_imported/vcpkg/ports/uvw/uvw-config.cmake
deleted file mode 100644
index 3a6d792f9..000000000
--- a/external_imported/vcpkg/ports/uvw/uvw-config.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-find_package(libuv CONFIG REQUIRED)
-include ("${CMAKE_CURRENT_LIST_DIR}/uvw-targets.cmake")
diff --git a/external_imported/vcpkg/ports/uvw/vcpkg.json b/external_imported/vcpkg/ports/uvw/vcpkg.json
index ea974cfb1..b4e3867b4 100644
--- a/external_imported/vcpkg/ports/uvw/vcpkg.json
+++ b/external_imported/vcpkg/ports/uvw/vcpkg.json
@@ -1,8 +1,7 @@
 {
   "name": "uvw",
-  "version": "2.12.1",
-  "port-version": 2,
-  "description": "Header-only, event based, tiny and easy to use libuv wrapper in modern C++.",
+  "version": "3.2.0",
+  "description": "A compilable static library, event based, tiny and easy to use libuv wrapper in modern C++.",
   "homepage": "https://github.com/skypjack/uvw",
   "license": "MIT",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/uwebsockets/portfile.cmake b/external_imported/vcpkg/ports/uwebsockets/portfile.cmake
index 4346b7382..eee06da46 100644
--- a/external_imported/vcpkg/ports/uwebsockets/portfile.cmake
+++ b/external_imported/vcpkg/ports/uwebsockets/portfile.cmake
@@ -3,7 +3,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO uNetworking/uWebSockets
     REF "v${VERSION}"
-    SHA512 c686eaffd18a925661f2b3fbae108bdd227dc5e87981bf494e3299a9b7d8dbee2838b53eefc05d20eb9669643882dc0de4fdd6f1f57d1a878107bbe69aba6fa5
+    SHA512 8e88e64f8a3ac5f883dcd065ceb9d76b013764ef6d10ee56751bb455837ffbebba0443510ab5efd5d2c93796e6322e6c35c609c0aa6f8f9c519af0072b03fee0
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/uwebsockets/vcpkg.json b/external_imported/vcpkg/ports/uwebsockets/vcpkg.json
index 742a2098d..526e22290 100644
--- a/external_imported/vcpkg/ports/uwebsockets/vcpkg.json
+++ b/external_imported/vcpkg/ports/uwebsockets/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "uwebsockets",
-  "version-semver": "20.36.0",
+  "version-semver": "20.57.0",
   "description": "Simple, secure & standards compliant web I/O for the most demanding of applications",
   "homepage": "https://github.com/uWebSockets/uWebSockets",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/v8/portfile.cmake b/external_imported/vcpkg/ports/v8/portfile.cmake
index ef52dd930..0e316e8ae 100644
--- a/external_imported/vcpkg/ports/v8/portfile.cmake
+++ b/external_imported/vcpkg/ports/v8/portfile.cmake
@@ -171,7 +171,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     set(PREFIX ${CURRENT_PACKAGES_DIR})
     configure_file("${CURRENT_PORT_DIR}/v8.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/v8.pc" @ONLY)
     configure_file("${CURRENT_PORT_DIR}/v8_libbase.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/v8_libbase.pc" @ONLY)
-    configure_file("${CURRENT_PORT_DIR}/v8_libplatform.pc.in" "{CURRENT_PACKAGES_DIR}/lib/pkgconfig/v8_libplatform.pc" @ONLY)
+    configure_file("${CURRENT_PORT_DIR}/v8_libplatform.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/v8_libplatform.pc" @ONLY)
     file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/snapshot_blob.bin" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
 
     set(PREFIX ${CURRENT_PACKAGES_DIR}/debug)
diff --git a/external_imported/vcpkg/ports/v8/vcpkg.json b/external_imported/vcpkg/ports/v8/vcpkg.json
index 177b9e51e..a37df5320 100644
--- a/external_imported/vcpkg/ports/v8/vcpkg.json
+++ b/external_imported/vcpkg/ports/v8/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "v8",
   "version": "9.1.269.39",
-  "port-version": 5,
+  "port-version": 6,
   "description": "Google Chrome's JavaScript engine",
   "homepage": "https://v8.dev",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/valijson/fix-optional.patch b/external_imported/vcpkg/ports/valijson/fix-optional.patch
deleted file mode 100644
index 307d630a5..000000000
--- a/external_imported/vcpkg/ports/valijson/fix-optional.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/include/valijson/internal/optional.hpp b/include/valijson/internal/optional.hpp
-index c9bc47b..c73c7fb 100644
---- a/include/valijson/internal/optional.hpp
-+++ b/include/valijson/internal/optional.hpp
-@@ -9,6 +9,6 @@ namespace opt = std;
- #    endif
- #  endif
- #else
--#  include <compat/optional.hpp>
-+#  include <valijson/compat/optional.hpp>
- namespace opt = std::experimental;
- #endif
diff --git a/external_imported/vcpkg/ports/valijson/fix-picojson.patch b/external_imported/vcpkg/ports/valijson/fix-picojson.patch
deleted file mode 100644
index ae276f8eb..000000000
--- a/external_imported/vcpkg/ports/valijson/fix-picojson.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/include/valijson/adapters/picojson_adapter.hpp b/include/valijson/adapters/picojson_adapter.hpp
-index 4f5e5b6..0da2bf2 100644
---- a/include/valijson/adapters/picojson_adapter.hpp
-+++ b/include/valijson/adapters/picojson_adapter.hpp
-@@ -29,10 +29,10 @@
- 
- #ifdef _MSC_VER
- #pragma warning(disable: 4706)
--#include <picojson.h>
-+#include <picojson/picojson.h>
- #pragma warning(default: 4706)
- #else
--#include <picojson.h>
-+#include <picojson/picojson.h>
- #endif
- 
- #include <valijson/adapters/adapter.hpp>
-diff --git a/include/valijson/utils/picojson_utils.hpp b/include/valijson/utils/picojson_utils.hpp
-index 36420d2..8660c30 100644
---- a/include/valijson/utils/picojson_utils.hpp
-+++ b/include/valijson/utils/picojson_utils.hpp
-@@ -4,10 +4,10 @@
- 
- #ifdef _MSC_VER
- #pragma warning(disable: 4706)
--#include <picojson.h>
-+#include <picojson/picojson.h>
- #pragma warning(default: 4706)
- #else
--#include <picojson.h>
-+#include <picojson/picojson.h>
- #endif
- 
- #include <valijson/utils/file_utils.hpp>
diff --git a/external_imported/vcpkg/ports/valijson/portfile.cmake b/external_imported/vcpkg/ports/valijson/portfile.cmake
index 3481d8678..8f81ff82b 100644
--- a/external_imported/vcpkg/ports/valijson/portfile.cmake
+++ b/external_imported/vcpkg/ports/valijson/portfile.cmake
@@ -1,24 +1,23 @@
-#header-only library
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO tristanpenman/valijson
-    REF v0.6
-    SHA512 a493d17159e479be7fe29d45c610c7d4fdd2c2f9ba897923129734fb07257dbb41fddde4c4263dbf0aa5c7101cd1555568a048beba2f60d2b32e625dd9690749
+    REF v${VERSION}
+    SHA512 a1f9aabfcd150a36ed16c5642027a9c524ec044dd1eb636a81a75f2226b7b665cc3d2f4cd375786be8fc9dadf2c6938df17d6e6fa13f27c621fe2ca35e0d13ee
     HEAD_REF master
-    PATCHES fix-picojson.patch
-            fix-optional.patch
 )
 
-# Copy the header files
-file(GLOB HEADER_FILES ${SOURCE_PATH}/include/valijson/*)
-file(COPY ${HEADER_FILES}
-     DESTINATION ${CURRENT_PACKAGES_DIR}/include/valijson
-     REGEX "\.(gitattributes|gitignore)$" EXCLUDE)
+set(VCPKG_BUILD_TYPE release) # headers only
 
-file(COPY ${SOURCE_PATH}/include/compat/optional.hpp
-     DESTINATION ${CURRENT_PACKAGES_DIR}/include/valijson/compat)
+vcpkg_cmake_configure(
+  SOURCE_PATH "${SOURCE_PATH}"
+  OPTIONS
+    -Dvalijson_BUILD_TESTS:BOOL=OFF
+)
+vcpkg_cmake_install()
+
+
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/valijson")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
 
-# Put the licence file where vcpkg expects it
-file(COPY ${SOURCE_PATH}/LICENSE
-     DESTINATION ${CURRENT_PACKAGES_DIR}/share/valijson)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/valijson/LICENSE ${CURRENT_PACKAGES_DIR}/share/valijson/copyright)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug/lib")
diff --git a/external_imported/vcpkg/ports/valijson/vcpkg.json b/external_imported/vcpkg/ports/valijson/vcpkg.json
index f78a85c40..c416b7906 100644
--- a/external_imported/vcpkg/ports/valijson/vcpkg.json
+++ b/external_imported/vcpkg/ports/valijson/vcpkg.json
@@ -1,5 +1,15 @@
 {
   "name": "valijson",
-  "version": "0.6",
-  "description": "Header-only C++ library for JSON Schema validation"
+  "version": "1.0.1",
+  "description": "Header-only C++ library for JSON Schema validation",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/vc/Fix-internal-func-export.patch b/external_imported/vcpkg/ports/vc/Fix-internal-func-export.patch
deleted file mode 100644
index a06321649..000000000
--- a/external_imported/vcpkg/ports/vc/Fix-internal-func-export.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/support_x86.cpp b/src/support_x86.cpp
-index 0ab9669..d5c17ba 100644
---- a/src/support_x86.cpp
-+++ b/src/support_x86.cpp
-@@ -58,8 +58,9 @@ static inline bool xgetbvCheck(unsigned int bits)
- #endif
- }
- 
--Vc_TARGET_NO_SIMD
--bool isImplementationSupported(Implementation impl)
-+
-+Vc_TARGET_NO_SIMD 
-+bool Vc_VDECL isImplementationSupported(Vc::Implementation impl)
- {
-     CpuId::init();
- 
diff --git a/external_imported/vcpkg/ports/vc/portfile.cmake b/external_imported/vcpkg/ports/vc/portfile.cmake
index d185dd587..91ced9f34 100644
--- a/external_imported/vcpkg/ports/vc/portfile.cmake
+++ b/external_imported/vcpkg/ports/vc/portfile.cmake
@@ -1,12 +1,11 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO  VcDevel/Vc
-    REF 1.4.3
-    SHA512 7c0c4ccf8c7c4585334482135f2daf1a5bc088114b880093893583bdcea1fbfcec02485da6059304c510c8b1bb1b768ef04fd7ac8ccb21b9ebbad5d0d5babaef
+    REF 1.4.4
+    SHA512 b8aa0a45637dd1e0cc23f074d023b677aab570dd4a78cff94e4c2d832afb841c1b421077ae9c848a40aa4beb50ed2e31fdf075738496856ff8fe3ea1d0acba07
     HEAD_REF 1.4
     PATCHES 
        correct_cmake_config_path.patch
-       Fix-internal-func-export.patch #remove it in next version
 )
 
 vcpkg_cmake_configure(
diff --git a/external_imported/vcpkg/ports/vc/vcpkg.json b/external_imported/vcpkg/ports/vc/vcpkg.json
index 09bb05010..965a21414 100644
--- a/external_imported/vcpkg/ports/vc/vcpkg.json
+++ b/external_imported/vcpkg/ports/vc/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "vc",
-  "version": "1.4.3",
+  "version": "1.4.4",
   "description": "SIMD Vector Classes for C++ .",
   "homepage": "https://github.com/VcDevel/Vc",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/vcpkg-cmake-get-vars/cmake_get_vars/CMakeLists.txt b/external_imported/vcpkg/ports/vcpkg-cmake-get-vars/cmake_get_vars/CMakeLists.txt
index fa010eb0b..a6433e8e8 100644
--- a/external_imported/vcpkg/ports/vcpkg-cmake-get-vars/cmake_get_vars/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/vcpkg-cmake-get-vars/cmake_get_vars/CMakeLists.txt
@@ -70,6 +70,7 @@ set(COMPILERS ${VCPKG_LANGUAGES} RC)
 foreach(prog IN LISTS COMPILERS)
     list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${prog}_COMPILER)
     list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${prog}_COMPILER_ID)
+    list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${prog}_COMPILER_VERSION)
     list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${prog}_COMPILER_FRONTEND_VARIANT)
 endforeach()
 # Variables to check
@@ -217,6 +218,7 @@ file(WRITE "${VCPKG_OUTPUT_FILE}" "${OUTPUT_STRING}")
 
 # Program details:
 # CMAKE_<LANG>_COMPILER_ID
+# CMAKE_<LANG>_COMPILER_VERSION
 # MSVC
 # MSVC_VERSION
 
diff --git a/external_imported/vcpkg/ports/vcpkg-cmake-get-vars/vcpkg.json b/external_imported/vcpkg/ports/vcpkg-cmake-get-vars/vcpkg.json
index 4ac1e7b4b..f6ed57a49 100644
--- a/external_imported/vcpkg/ports/vcpkg-cmake-get-vars/vcpkg.json
+++ b/external_imported/vcpkg/ports/vcpkg-cmake-get-vars/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "vcpkg-cmake-get-vars",
-  "version-date": "2023-03-02",
+  "version-date": "2023-12-31",
   "documentation": "https://vcpkg.io/en/docs/README.html",
   "license": "MIT",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg.json b/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg.json
index 7052cc983..79c63522e 100644
--- a/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg.json
+++ b/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "vcpkg-cmake",
-  "version-date": "2022-12-22",
+  "version-date": "2023-05-04",
   "documentation": "https://vcpkg.io/en/docs/maintainers/ports/vcpkg-cmake.html",
   "license": "MIT"
 }
diff --git a/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake b/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake
index 746991f98..d7e673751 100644
--- a/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake
+++ b/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake
@@ -132,6 +132,10 @@ function(vcpkg_cmake_configure)
         vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION}")
     endif()
 
+    if(DEFINED VCPKG_XBOX_CONSOLE_TARGET)
+        vcpkg_list(APPEND arg_OPTIONS "-DXBOX_CONSOLE_TARGET=${VCPKG_XBOX_CONSOLE_TARGET}")
+    endif()
+
     if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
         vcpkg_list(APPEND arg_OPTIONS "-DBUILD_SHARED_LIBS=ON")
     elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
diff --git a/external_imported/vcpkg/ports/vcpkg-get-python-packages/portfile.cmake b/external_imported/vcpkg/ports/vcpkg-get-python-packages/portfile.cmake
index 7935b09b4..4bc168627 100644
--- a/external_imported/vcpkg/ports/vcpkg-get-python-packages/portfile.cmake
+++ b/external_imported/vcpkg/ports/vcpkg-get-python-packages/portfile.cmake
@@ -2,7 +2,6 @@ file(COPY
     "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake"
     "${CMAKE_CURRENT_LIST_DIR}/copyright"
     "${CMAKE_CURRENT_LIST_DIR}/x_vcpkg_get_python_packages.cmake"
-    "${CMAKE_CURRENT_LIST_DIR}/python310._pth"
     DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 
 include("${CMAKE_CURRENT_LIST_DIR}/x_vcpkg_get_python_packages.cmake")
diff --git a/external_imported/vcpkg/ports/vcpkg-get-python-packages/python310._pth b/external_imported/vcpkg/ports/vcpkg-get-python-packages/python310._pth
deleted file mode 100644
index f53ed18de..000000000
--- a/external_imported/vcpkg/ports/vcpkg-get-python-packages/python310._pth
+++ /dev/null
@@ -1,7 +0,0 @@
-python310.zip
-Lib
-Lib/site-packages
-.
-
-# Uncomment to run site.main() automatically
-#import site
diff --git a/external_imported/vcpkg/ports/vcpkg-get-python-packages/vcpkg.json b/external_imported/vcpkg/ports/vcpkg-get-python-packages/vcpkg.json
index f2e187d0d..8d7870ca0 100644
--- a/external_imported/vcpkg/ports/vcpkg-get-python-packages/vcpkg.json
+++ b/external_imported/vcpkg/ports/vcpkg-get-python-packages/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "vcpkg-get-python-packages",
-  "version-date": "2022-06-30",
-  "documentation": "https://vcpkg.io/en/docs/README.html",
+  "version-date": "2024-01-24",
+  "documentation": "https://learn.microsoft.com/en-us/vcpkg/maintainers/functions/vcpkg_get_python_packages",
   "license": "MIT",
   "supports": "native"
 }
diff --git a/external_imported/vcpkg/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.cmake b/external_imported/vcpkg/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.cmake
index 8b0a01646..fdda6cfe8 100644
--- a/external_imported/vcpkg/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.cmake
+++ b/external_imported/vcpkg/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.cmake
@@ -18,6 +18,10 @@ function(x_vcpkg_get_python_packages)
         endif()
     endif()
 
+    if(arg_PYTHON_VERSION STREQUAL "3")
+        set(PYTHON_VERSION_MINOR 11)
+    endif()
+
     if(NOT DEFINED arg_OUT_PYTHON_VAR)
         set(arg_OUT_PYTHON_VAR "PYTHON${arg_PYTHON_VERSION}")
     endif()
@@ -32,9 +36,6 @@ function(x_vcpkg_get_python_packages)
     get_filename_component(python_dir "${arg_PYTHON_EXECUTABLE}" DIRECTORY)
     set(ENV{PYTHONNOUSERSITE} "1")
     if("${python_dir}" MATCHES "(${DOWNLOADS}|${CURRENT_HOST_INSTALLED_DIR})" AND CMAKE_HOST_WIN32) # inside vcpkg and windows host.
-        #if(NOT EXISTS "${python_dir}/python310._pth" AND PYTHON_EXECUTABLE MATCHES "python3")
-        #    file(COPY "${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-get-python-packages/python310._pth" DESTINATION "${python_dir}")
-        #endif()
         if(NOT EXISTS "${python_dir}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}")
             if(NOT EXISTS "${python_dir}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}")
                 if(arg_PYTHON_VERSION STREQUAL 3)
@@ -74,8 +75,8 @@ function(x_vcpkg_get_python_packages)
         file(MAKE_DIRECTORY "${python_dir}/DLLs")
         set(python_sub_path /Scripts)
         set(python_venv virtualenv)
-        if(arg_PYTHON_VERSION STREQUAL 3)
-            file(COPY "${python_dir}/python310.zip" DESTINATION "${venv_path}/Scripts")
+        if(EXISTS "${python_dir}/python3${PYTHON_VERSION_MINOR}.zip")
+            file(COPY "${python_dir}/python3${PYTHON_VERSION_MINOR}.zip" DESTINATION "${venv_path}/Scripts")
         endif()
         set(python_venv_options "--app-data" "${venv_path}/data")
     else()
@@ -89,8 +90,8 @@ function(x_vcpkg_get_python_packages)
     endif()
 
     set(ENV{PYTHONNOUSERSITE} "1")
-    message(STATUS "Setting up python virtual environmnent...")
-    vcpkg_execute_required_process(COMMAND "${arg_PYTHON_EXECUTABLE}" -m "${python_venv}" ${python_venv_options} "${venv_path}"
+    message(STATUS "Setting up python virtual environment...")
+    vcpkg_execute_required_process(COMMAND "${arg_PYTHON_EXECUTABLE}" -I -m "${python_venv}" ${python_venv_options} "${venv_path}"
                                    WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}"
                                    LOGNAME "venv-setup-${TARGET_TRIPLET}")
     vcpkg_add_to_path(PREPEND "${venv_path}${python_sub_path}")
@@ -100,17 +101,17 @@ function(x_vcpkg_get_python_packages)
     unset(ENV{PYTHONPATH})
     if(DEFINED arg_REQUIREMENTS_FILE)
         message(STATUS "Installing requirements from: ${arg_REQUIREMENTS_FILE}")
-        vcpkg_execute_required_process(COMMAND "${${arg_OUT_PYTHON_VAR}}" -m pip install -r ${arg_REQUIREMENTS_FILE}
+        vcpkg_execute_required_process(COMMAND "${${arg_OUT_PYTHON_VAR}}" -I -m pip install -r ${arg_REQUIREMENTS_FILE}
                                        WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}"
                                        LOGNAME "pip-install-requirements-file-${TARGET_TRIPLET}")
     endif()
     if(DEFINED arg_PACKAGES)
         message(STATUS "Installing python packages: ${arg_PACKAGES}")
-        vcpkg_execute_required_process(COMMAND "${${arg_OUT_PYTHON_VAR}}" -m pip install ${arg_PACKAGES}
+        vcpkg_execute_required_process(COMMAND "${${arg_OUT_PYTHON_VAR}}" -I -m pip install ${arg_PACKAGES}
                                        WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}"
                                        LOGNAME "pip-install-packages-${TARGET_TRIPLET}")
     endif()
-    message(STATUS "Setting up python virtual environmnent...finished.")
-    set(${arg_OUT_PYTHON_VAR} "${PYTHON${arg_PYTHON_VERSION}}" PARENT_SCOPE)
-    set(${arg_OUT_PYTHON_VAR} "${PYTHON${arg_PYTHON_VERSION}}" CACHE PATH "" FORCE)
+    message(STATUS "Setting up python virtual environment... finished.")
+    set(${arg_OUT_PYTHON_VAR} "${${arg_OUT_PYTHON_VAR}}" PARENT_SCOPE)
+    set(${arg_OUT_PYTHON_VAR} "${${arg_OUT_PYTHON_VAR}}" CACHE PATH "" FORCE)
 endfunction()
diff --git a/external_imported/vcpkg/ports/vcpkg-msbuild/portfile.cmake b/external_imported/vcpkg/ports/vcpkg-msbuild/portfile.cmake
new file mode 100644
index 000000000..42e0ac846
--- /dev/null
+++ b/external_imported/vcpkg/ports/vcpkg-msbuild/portfile.cmake
@@ -0,0 +1,10 @@
+file(INSTALL
+    "${CMAKE_CURRENT_LIST_DIR}/vcpkg_msbuild.props.in"
+    "${CMAKE_CURRENT_LIST_DIR}/vcpkg_msbuild.targets.in"
+    "${CMAKE_CURRENT_LIST_DIR}/z_vcpkg_msbuild_create_props.cmake"
+    "${CMAKE_CURRENT_LIST_DIR}/vcpkg_msbuild_install.cmake"
+    "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake"
+    DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+
+file(INSTALL "${VCPKG_ROOT_DIR}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+set(VCPKG_POLICY_CMAKE_HELPER_PORT enabled)
diff --git a/external_imported/vcpkg/ports/vcpkg-msbuild/vcpkg-port-config.cmake b/external_imported/vcpkg/ports/vcpkg-msbuild/vcpkg-port-config.cmake
new file mode 100644
index 000000000..547ff61d9
--- /dev/null
+++ b/external_imported/vcpkg/ports/vcpkg-msbuild/vcpkg-port-config.cmake
@@ -0,0 +1,5 @@
+include_guard(GLOBAL)
+include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-cmake-get-vars/vcpkg-port-config.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-pkgconfig-get-modules/vcpkg-port-config.cmake" OPTIONAL)
+include("${CMAKE_CURRENT_LIST_DIR}/z_vcpkg_msbuild_create_props.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_msbuild_install.cmake")
diff --git a/external_imported/vcpkg/ports/vcpkg-msbuild/vcpkg.json b/external_imported/vcpkg/ports/vcpkg-msbuild/vcpkg.json
new file mode 100644
index 000000000..cdd51bc14
--- /dev/null
+++ b/external_imported/vcpkg/ports/vcpkg-msbuild/vcpkg.json
@@ -0,0 +1,25 @@
+{
+  "name": "vcpkg-msbuild",
+  "version-date": "2023-08-08",
+  "documentation": "https://vcpkg.io/en/docs/README.html",
+  "license": "MIT",
+  "supports": "native & windows",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake-get-vars",
+      "host": true
+    },
+    {
+      "name": "vcpkg-pkgconfig-get-modules",
+      "host": true
+    }
+  ],
+  "features": {
+    "pkg-config": {
+      "description": "Enable pkg-config lookup for msbuild",
+      "dependencies": [
+        "pkgconf"
+      ]
+    }
+  }
+}
diff --git a/external_imported/vcpkg/ports/vcpkg-msbuild/vcpkg_msbuild.props.in b/external_imported/vcpkg/ports/vcpkg-msbuild/vcpkg_msbuild.props.in
new file mode 100644
index 000000000..f04522c15
--- /dev/null
+++ b/external_imported/vcpkg/ports/vcpkg-msbuild/vcpkg_msbuild.props.in
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <vcpkg_msbuild_props_imported>true</vcpkg_msbuild_props_imported>
+  </PropertyGroup>
+  <PropertyGroup>
+    <WindowsTargetPlatformVersion>@arg_TARGET_PLATFORM_VERSION@</WindowsTargetPlatformVersion>
+    <PlatformToolset>@VCPKG_PLATFORM_TOOLSET@</PlatformToolset>
+    <!-- <Platform>@arg_PLATFORM@</Platform> -->
+    <VcpkgApplocalDeps>false</VcpkgApplocalDeps>
+    <VcpkgManifestInstall>false</VcpkgManifestInstall>
+    <VcpkgManifestEnabled>false</VcpkgManifestEnabled>
+    <VcpkgEnabled>false</VcpkgEnabled>
+    <VcpkgTriplet>@TARGET_TRIPLET@</VcpkgTriplet>
+    <VcpkgInstalledDir>@_VCPKG_INSTALLED_DIR@</VcpkgInstalledDir>
+    <UseIntelMKL>No</UseIntelMKL>
+    <ImportProjectExtensionProps>false</ImportProjectExtensionProps>
+    <ForceImportAfterCppProps>vcpkg_msbuild.props</ForceImportAfterCppProps>
+    <ForceImportAfterCppTargets>vcpkg_msbuild.targets</ForceImportAfterCppTargets>
+  </PropertyGroup>
+  @VCPKG_MSBUILD_ADDITIONAL_PROPS_XML@
+</Project>
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/vcpkg-msbuild/vcpkg_msbuild.targets.in b/external_imported/vcpkg/ports/vcpkg-msbuild/vcpkg_msbuild.targets.in
new file mode 100644
index 000000000..517aab0ed
--- /dev/null
+++ b/external_imported/vcpkg/ports/vcpkg-msbuild/vcpkg_msbuild.targets.in
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Condition="'$(vcpkg_msbuild_props_imported)' != 'true'" Project="vcpkg_msbuild.props" />
+  <PropertyGroup>
+    <WindowsTargetPlatformVersion>@arg_TARGET_PLATFORM_VERSION@</WindowsTargetPlatformVersion>
+    <PlatformToolset>@VCPKG_PLATFORM_TOOLSET@</PlatformToolset>
+    <!-- <Platform>@arg_PLATFORM@</Platform> -->
+    <VcpkgApplocalDeps>false</VcpkgApplocalDeps>
+    <VcpkgManifestInstall>false</VcpkgManifestInstall>
+    <VcpkgManifestEnabled>false</VcpkgManifestEnabled>
+    <VcpkgEnabled>false</VcpkgEnabled>
+    <VcpkgTriplet>@TARGET_TRIPLET@</VcpkgTriplet>
+    <VcpkgInstalledDir>@_VCPKG_INSTALLED_DIR@</VcpkgInstalledDir>
+    <UseIntelMKL>No</UseIntelMKL>
+    <ImportProjectExtensionProps>false</ImportProjectExtensionProps>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+        <!-- vcpkg -->
+        <RuntimeLibrary Condition="'${VCPKG_CRT_LINKAGE}|$(Configuration)' == 'static|${arg_DEBUG_CONFIGURATION}'">MultiThreadedDebug</RuntimeLibrary>
+        <RuntimeLibrary Condition="'${VCPKG_CRT_LINKAGE}|$(Configuration)' == 'static|${arg_RELEASE_CONFIGURATION}'">MultiThreaded</RuntimeLibrary>
+        <RuntimeLibrary Condition="'${VCPKG_CRT_LINKAGE}|$(Configuration)' == 'dynamic|${arg_DEBUG_CONFIGURATION}'">MultiThreadedDebugDLL</RuntimeLibrary>
+        <RuntimeLibrary Condition="'${VCPKG_CRT_LINKAGE}|$(Configuration)' == 'dynamic|${arg_RELEASE_CONFIGURATION}'">MultiThreadedDLL</RuntimeLibrary>
+        <AdditionalIncludeDirectories Condition="'$(Configuration)'=='${arg_DEBUG_CONFIGURATION}'"  >@MSBUILD_INCLUDE_DIRS_DEBUG@</AdditionalIncludeDirectories>
+        <AdditionalIncludeDirectories Condition="'$(Configuration)'=='${arg_RELEASE_CONFIGURATION}'">@MSBUILD_INCLUDE_DIRS_RELEASE@</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Update="@project_root@**/*.cpp;@project_root@**/*.cxx">
+        <AdditionalOptions Condition="'$(Configuration)'=='${arg_DEBUG_CONFIGURATION}'"  >%(AdditionalOptions) @VCPKG_COMBINED_CXX_FLAGS_DEBUG@ @MSBUILD_CFLAGS_DEBUG@ /WX-</AdditionalOptions>
+        <AdditionalOptions Condition="'$(Configuration)'=='${arg_RELEASE_CONFIGURATION}'">%(AdditionalOptions) @VCPKG_COMBINED_CXX_FLAGS_RELEASE@ @MSBUILD_CFLAGS_RELEASE@ /WX-</AdditionalOptions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup >
+    <ClCompile Update="@project_root@**/*.c">
+        <AdditionalOptions Condition="'$(Configuration)'=='${arg_DEBUG_CONFIGURATION}'"  >%(AdditionalOptions) @VCPKG_COMBINED_C_FLAGS_DEBUG@ @MSBUILD_CFLAGS_DEBUG@ /WX-</AdditionalOptions>
+        <AdditionalOptions Condition="'$(Configuration)'=='${arg_RELEASE_CONFIGURATION}'">%(AdditionalOptions) @VCPKG_COMBINED_C_FLAGS_RELEASE@ @MSBUILD_CFLAGS_RELEASE@ /WX-</AdditionalOptions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemDefinitionGroup>
+    <Link>
+        <!-- Required Libs -->
+        <AdditionalDependencies Condition="'$(Configuration)'=='${arg_DEBUG_CONFIGURATION}'"        >@MSBUILD_LIBRARIES_DEBUG@</AdditionalDependencies>
+        <AdditionalLibraryDirectories Condition="'$(Configuration)'=='${arg_DEBUG_CONFIGURATION}'"  >@MSBUILD_LIBRARIES_DIRS_DEBUG@</AdditionalLibraryDirectories>
+        <AdditionalDependencies Condition="'$(Configuration)'=='${arg_RELEASE_CONFIGURATION}'"      >@MSBUILD_LIBRARIES_RELEASE@</AdditionalDependencies >
+        <AdditionalLibraryDirectories Condition="'$(Configuration)'=='${arg_RELEASE_CONFIGURATION}'">@MSBUILD_LIBRARIES_DIRS_RELEASE@</AdditionalLibraryDirectories>
+        <AdditionalOptions Condition="'$(Configuration)|$(ConfigurationType)'=='${arg_DEBUG_CONFIGURATION}|DynamicLibrary'"  >%(AdditionalOptions) @VCPKG_COMBINED_SHARED_LINKER_FLAGS_DEBUG@ @MSBUILD_LIBS_DEBUG@ /WX:NO</AdditionalOptions>
+        <AdditionalOptions Condition="'$(Configuration)|$(ConfigurationType)'=='${arg_RELEASE_CONFIGURATION}|DynamicLibrary'">%(AdditionalOptions) @VCPKG_COMBINED_SHARED_LINKER_FLAGS_RELEASE@ @MSBUILD_LIBS_RELEASE@ /WX:NO</AdditionalOptions>
+        <AdditionalOptions Condition="'$(Configuration)|$(ConfigurationType)'=='${arg_DEBUG_CONFIGURATION}|Application'"  >%(AdditionalOptions) @VCPKG_COMBINED_EXE_LINKER_FLAGS_DEBUG@ @MSBUILD_LIBS_DEBUG@ /WX:NO</AdditionalOptions>
+        <AdditionalOptions Condition="'$(Configuration)|$(ConfigurationType)'=='${arg_RELEASE_CONFIGURATION}|Application'">%(AdditionalOptions) @VCPKG_COMBINED_EXE_LINKER_FLAGS_RELEASE@ @MSBUILD_LIBS_RELEASE@ /WX:NO</AdditionalOptions>
+        <AdditionalOptions Condition="'$(Configuration)|$(ConfigurationType)'=='${arg_DEBUG_CONFIGURATION}|StaticLibrary'">%(AdditionalOptions) @VCPKG_COMBINED_STATIC_LINKER_FLAGS_DEBUG@</AdditionalOptions>
+        <AdditionalOptions Condition="'$(Configuration)|$(ConfigurationType)'=='${arg_RELEASE_CONFIGURATION}|StaticLibrary'">%(AdditionalOptions) @VCPKG_COMBINED_STATIC_LINKER_FLAGS_RELEASE@</AdditionalOptions>
+    </Link>
+    <Lib>
+        <AdditionalOptions Condition="'$(Configuration)|$(ConfigurationType)'=='${arg_DEBUG_CONFIGURATION}|StaticLibrary'">%(AdditionalOptions) @VCPKG_COMBINED_STATIC_LINKER_FLAGS_DEBUG@</AdditionalOptions>
+        <AdditionalOptions Condition="'$(Configuration)|$(ConfigurationType)'=='${arg_RELEASE_CONFIGURATION}|StaticLibrary'">%(AdditionalOptions) @VCPKG_COMBINED_STATIC_LINKER_FLAGS_RELEASE@</AdditionalOptions>
+        <!-- Required to prevent linker errors on Visual Studio 2017 with static CRT -->
+        <TargetMachine Condition="'${VCPKG_TARGET_ARCHITECTURE}'=='x86'">MachineX86</TargetMachine>
+        <TargetMachine Condition="'${VCPKG_TARGET_ARCHITECTURE}'=='x64'">MachineX64</TargetMachine>
+        <TargetMachine Condition="'${VCPKG_TARGET_ARCHITECTURE}'=='arm'">MachineARM</TargetMachine>
+    </Lib>
+  </ItemDefinitionGroup>
+  @VCPKG_MSBUILD_ADDITIONAL_TARGETS_XML@
+</Project>
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/vcpkg-msbuild/vcpkg_msbuild_install.cmake b/external_imported/vcpkg/ports/vcpkg-msbuild/vcpkg_msbuild_install.cmake
new file mode 100644
index 000000000..35e84f923
--- /dev/null
+++ b/external_imported/vcpkg/ports/vcpkg-msbuild/vcpkg_msbuild_install.cmake
@@ -0,0 +1,179 @@
+function(vcpkg_msbuild_install)
+    cmake_parse_arguments(
+        PARSE_ARGV 0
+        "arg"
+        "CLEAN;NO_TOOLCHAIN_PROPS;NO_INSTALL;ADD_BIN_TO_PATH"
+        "SOURCE_PATH;PROJECT_SUBPATH;RELEASE_CONFIGURATION;DEBUG_CONFIGURATION;PLATFORM;TARGET"
+        "OPTIONS;OPTIONS_RELEASE;OPTIONS_DEBUG;DEPENDENT_PKGCONFIG;ADDITIONAL_LIBS;ADDITIONAL_LIBS_DEBUG;ADDITIONAL_LIBS_RELEASE"
+    )
+
+    if(VCPKG_CROSSCOMPILING)
+        set(arg_ADD_BIN_TO_PATH OFF)
+    endif()
+
+    if(DEFINED arg_UNPARSED_ARGUMENTS)
+        message(WARNING "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}")
+    endif()
+    if(NOT DEFINED arg_RELEASE_CONFIGURATION)
+        set(arg_RELEASE_CONFIGURATION Release)
+    endif()
+    if(NOT DEFINED arg_DEBUG_CONFIGURATION)
+        set(arg_DEBUG_CONFIGURATION Debug)
+    endif()
+
+    if(NOT DEFINED arg_PLATFORM)
+        if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
+            set(arg_PLATFORM x64)
+        elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
+            set(arg_PLATFORM Win32)
+        elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
+            set(arg_PLATFORM ARM)
+        elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
+            set(arg_PLATFORM arm64)
+        else()
+            message(FATAL_ERROR "Unsupported target architecture")
+        endif()
+    endif()
+    if(NOT DEFINED arg_PLATFORM_TOOLSET)
+        set(arg_PLATFORM_TOOLSET "${VCPKG_PLATFORM_TOOLSET}")
+    endif()
+
+    if(NOT DEFINED arg_TARGET)
+        set(arg_TARGET Rebuild)
+    endif()
+    if(DEFINED arg_ADDITIONAL_LIBS)
+        list(APPEND arg_ADDITIONAL_LIBS_DEBUG ${arg_ADDITIONAL_LIBS})
+        list(APPEND arg_ADDITIONAL_LIBS_RELEASE ${arg_ADDITIONAL_LIBS})
+    endif()
+
+    vcpkg_get_windows_sdk(arg_TARGET_PLATFORM_VERSION)
+
+    if(NOT arg_NO_TOOLCHAIN_PROPS)
+        file(RELATIVE_PATH project_root "${arg_SOURCE_PATH}/${arg_PROJECT_SUBPATH}" "${arg_SOURCE_PATH}") # required by z_vcpkg_msbuild_create_props
+        z_vcpkg_msbuild_create_props(OUTPUT_PROPS props_file
+                                     OUTPUT_TARGETS target_file
+                                     RELEASE_CONFIGURATION "${arg_RELEASE_CONFIGURATION}"
+                                     DEBUG_CONFIGURATION "${arg_DEBUG_CONFIGURATION}"
+                                     DEPENDENT_PKGCONFIG ${arg_DEPENDENT_PKGCONFIG}
+                                     ADDITIONAL_LIBS_DEBUG ${arg_ADDITIONAL_LIBS_DEBUG}
+                                     ADDITIONAL_LIBS_RELEASE ${arg_ADDITIONAL_LIBS_RELEASE})
+        list(APPEND arg_OPTIONS
+            "/p:ForceImportAfterCppProps=${props_file}"
+            "/p:ForceImportAfterCppTargets=${target_file}"
+        )
+    endif()
+
+
+    list(APPEND arg_OPTIONS
+        "/t:${arg_TARGET}"
+        "/p:UseMultiToolTask=true"
+        "/p:MultiProcMaxCount=${VCPKG_CONCURRENCY}"
+        "/p:EnforceProcessCountAcrossBuilds=true"
+        "/m:${VCPKG_CONCURRENCY}"
+        "-maxCpuCount:${VCPKG_CONCURRENCY}"
+        # other Properties 
+        "/p:Platform=${arg_PLATFORM}"
+        "/p:PlatformTarget=${TRIPLET_SYSTEM_ARCH}"
+        "/p:PlatformToolset=${arg_PLATFORM_TOOLSET}"
+        "/p:WindowsTargetPlatformVersion=${arg_TARGET_PLATFORM_VERSION}"
+        # vcpkg properties
+        "/p:VcpkgApplocalDeps=false"
+        "/p:VcpkgManifestInstall=false"
+        "/p:VcpkgManifestEnabled=false"
+        "/p:VcpkgEnabled=false"
+        "/p:VcpkgTriplet=${TARGET_TRIPLET}"
+        "/p:VcpkgInstalledDir=${_VCPKG_INSTALLED_DIR}"
+    )
+
+    if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+        # Disable LTCG for static libraries because this setting introduces ABI incompatibility between minor compiler versions
+        # TODO: Add a way for the user to override this if they want to opt-in to incompatibility
+        list(APPEND arg_OPTIONS "/p:WholeProgramOptimization=false")
+    endif()
+
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+        message(STATUS "Building ${arg_PROJECT_SUBPATH} for Release")
+        if(arg_ADD_BIN_TO_PATH)
+            vcpkg_backup_env_variables(VARS PATH)
+            if("${build_type}" STREQUAL "debug")
+                vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/debug/bin")
+            else()
+                vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/bin")
+            endif()
+        endif()
+        set(working_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")
+        file(REMOVE_RECURSE "${working_dir}")
+        file(MAKE_DIRECTORY "${working_dir}")
+        file(COPY "${arg_SOURCE_PATH}/" DESTINATION "${working_dir}")
+        vcpkg_execute_required_process(
+            COMMAND msbuild "${working_dir}/${arg_PROJECT_SUBPATH}"
+                "/p:Configuration=${arg_RELEASE_CONFIGURATION}"
+                ${arg_OPTIONS}
+                ${arg_OPTIONS_RELEASE}
+            WORKING_DIRECTORY "${working_dir}"
+            LOGNAME "build-${TARGET_TRIPLET}-rel"
+        )
+        if(NOT arg_NO_INSTALL)
+            file(GLOB_RECURSE libs "${working_dir}/*.lib")
+            file(GLOB_RECURSE dlls "${working_dir}/*.dll")
+            file(GLOB_RECURSE exes "${working_dir}/*.exe")
+            if(NOT libs STREQUAL "")
+                file(COPY ${libs} DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
+            endif()
+            if(NOT dlls STREQUAL "")
+                file(COPY ${dlls} DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
+            endif()
+            if(NOT exes STREQUAL "")
+                file(COPY ${exes} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
+                vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}")
+            endif()
+        endif()
+        if(arg_ADD_BIN_TO_PATH)
+            vcpkg_restore_env_variables(VARS PATH)
+        endif()
+    endif()
+
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        message(STATUS "Building ${arg_PROJECT_SUBPATH} for Debug")
+        if(arg_ADD_BIN_TO_PATH)
+            vcpkg_backup_env_variables(VARS PATH)
+            if("${build_type}" STREQUAL "debug")
+                vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/debug/bin")
+            else()
+                vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/bin")
+            endif()
+        endif()
+        set(working_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg")
+        file(REMOVE_RECURSE "${working_dir}")
+        file(MAKE_DIRECTORY "${working_dir}")
+        file(COPY "${arg_SOURCE_PATH}/" DESTINATION "${working_dir}")
+        vcpkg_execute_required_process(
+            COMMAND msbuild "${working_dir}/${arg_PROJECT_SUBPATH}"
+                "/p:Configuration=${arg_DEBUG_CONFIGURATION}"
+                ${arg_OPTIONS}
+                ${arg_OPTIONS_DEBUG}
+            WORKING_DIRECTORY "${working_dir}"
+            LOGNAME "build-${TARGET_TRIPLET}-dbg"
+        )
+        if(NOT arg_NO_INSTALL)
+            file(GLOB_RECURSE libs "${working_dir}/*.lib")
+            file(GLOB_RECURSE dlls "${working_dir}/*.dll")
+            if(NOT libs STREQUAL "")
+                file(COPY ${libs} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
+            endif()
+            if(NOT dlls STREQUAL "")
+                file(COPY ${dlls} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
+            endif()
+        endif()
+        if(arg_ADD_BIN_TO_PATH)
+            vcpkg_restore_env_variables(VARS PATH)
+        endif()
+    endif()
+
+    vcpkg_copy_pdbs()
+
+    if(arg_CLEAN)
+        vcpkg_clean_msbuild()
+    endif()
+
+endfunction()
diff --git a/external_imported/vcpkg/ports/vcpkg-msbuild/z_vcpkg_msbuild_create_props.cmake b/external_imported/vcpkg/ports/vcpkg-msbuild/z_vcpkg_msbuild_create_props.cmake
new file mode 100644
index 000000000..5cd6adeb3
--- /dev/null
+++ b/external_imported/vcpkg/ports/vcpkg-msbuild/z_vcpkg_msbuild_create_props.cmake
@@ -0,0 +1,76 @@
+function(z_vcpkg_msbuild_create_props)
+    cmake_parse_arguments(
+        PARSE_ARGV 0
+        "arg"
+        ""
+        "OUTPUT_PROPS;OUTPUT_TARGETS;RELEASE_CONFIGURATION;DEBUG_CONFIGURATION"
+        "DEPENDENT_PKGCONFIG;ADDITIONAL_LIBS_DEBUG;ADDITIONAL_LIBS_RELEASE"
+    )
+
+    if(NOT arg_OUTPUT_PROPS)
+        message(FATAL_ERROR "'${CMAKE_CURRENT_FUNCTION}' requires option 'OUTPUT_PROPS'!")
+    endif()
+    if(NOT arg_OUTPUT_TARGETS)
+        message(FATAL_ERROR "'${CMAKE_CURRENT_FUNCTION}' requires option 'OUTPUT_TARGETS'!")
+    endif()
+    if(DEFINED arg_UNPARSED_ARGUMENTS)
+        message(WARNING "'${CMAKE_CURRENT_FUNCTION}' was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}")
+    endif()
+
+    # TODO: detect and set these ?
+    #  <LanguageStandard>stdcpp20</LanguageStandard>
+    #  <LanguageStandard_C>stdc17</LanguageStandard_C>
+    if(NOT DEFINED arg_RELEASE_CONFIGURATION)
+        set(arg_RELEASE_CONFIGURATION Release)
+    endif()
+    if(NOT DEFINED arg_DEBUG_CONFIGURATION)
+        set(arg_DEBUG_CONFIGURATION Debug)
+    endif()
+
+    set(TARGET_PLATFORM_VERSION "")
+    vcpkg_get_windows_sdk(TARGET_PLATFORM_VERSION)
+
+    if(arg_DEPENDENT_PKGCONFIG)
+        if(NOT COMMAND x_vcpkg_pkgconfig_get_modules)
+          message(FATAL_ERROR "Port vcpkg-msbuild needs to have feature 'pkg-config' enabled for 'DEPENDENT_PKGCONFIG'")
+        endif()
+        x_vcpkg_pkgconfig_get_modules(PREFIX MSBUILD INCLUDE_DIRS LIBRARIES LIBRARIES_DIR CFLAGS USE_MSVC_SYNTAX_ON_WINDOWS MODULES ${arg_DEPENDENT_PKGCONFIG})
+
+        separate_arguments(MSBUILD_INCLUDE_DIRS_RELEASE WINDOWS_COMMAND "${MSBUILD_INCLUDE_DIRS_RELEASE}")
+        separate_arguments(MSBUILD_INCLUDE_DIRS_DEBUG WINDOWS_COMMAND "${MSBUILD_INCLUDE_DIRS_DEBUG}")
+        foreach(inc_dirs IN LISTS MSBUILD_INCLUDE_DIRS_RELEASE)
+            string(REPLACE "${inc_dirs}" "" MSBUILD_CFLAGS_RELEASE "${MSBUILD_CFLAGS_RELEASE}")
+        endforeach()
+        foreach(inc_dirs IN LISTS MSBUILD_INCLUDE_DIRS_DEBUG)
+            string(REPLACE "${inc_dirs}" "" MSBUILD_CFLAGS_DEBUG "${MSBUILD_CFLAGS_DEBUG}")
+        endforeach()
+        list(TRANSFORM MSBUILD_INCLUDE_DIRS_RELEASE REPLACE "^/I" "")
+        list(TRANSFORM MSBUILD_INCLUDE_DIRS_DEBUG REPLACE "^/I" "")
+        
+        separate_arguments(MSBUILD_LIBRARIES_DIRS_RELEASE WINDOWS_COMMAND "${MSBUILD_LIBRARIES_DIRS_RELEASE}")
+        separate_arguments(MSBUILD_LIBRARIES_DIRS_DEBUG WINDOWS_COMMAND "${MSBUILD_LIBRARIES_DIRS_DEBUG}")
+
+        separate_arguments(MSBUILD_LIBRARIES_RELEASE WINDOWS_COMMAND "${MSBUILD_LIBRARIES_RELEASE}")
+        separate_arguments(MSBUILD_LIBRARIES_DEBUG WINDOWS_COMMAND "${MSBUILD_LIBRARIES_DEBUG}")
+    endif()
+    vcpkg_cmake_get_vars(vars_file)
+    include("${vars_file}")
+    vcpkg_list(APPEND MSBUILD_INCLUDE_DIRS_RELEASE "${CURRENT_PACKAGES_DIR}/include" "${CURRENT_INSTALLED_DIR}/include")
+    vcpkg_list(APPEND MSBUILD_INCLUDE_DIRS_DEBUG "${CURRENT_PACKAGES_DIR}/include" "${CURRENT_INSTALLED_DIR}/include")
+    vcpkg_list(APPEND MSBUILD_LIBRARIES_DIRS_RELEASE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_INSTALLED_DIR}/lib")
+    vcpkg_list(APPEND MSBUILD_LIBRARIES_DIRS_DEBUG "${CURRENT_PACKAGES_DIR}/debug/lib" "${CURRENT_INSTALLED_DIR}/debug/lib")
+    vcpkg_list(APPEND MSBUILD_LIBRARIES_RELEASE ${arg_ADDITIONAL_LIBS_RELEASE})
+    vcpkg_list(APPEND MSBUILD_LIBRARIES_DEBUG   ${arg_ADDITIONAL_LIBS_DEBUG})
+
+    vcpkg_list(PREPEND MSBUILD_INCLUDE_DIRS_RELEASE "%(AdditionalIncludeDirectories)")
+    vcpkg_list(PREPEND MSBUILD_INCLUDE_DIRS_DEBUG   "%(AdditionalIncludeDirectories)")
+    vcpkg_list(PREPEND MSBUILD_LIBRARIES_DIRS_RELEASE "%(AdditionalLibraryDirectories)")
+    vcpkg_list(PREPEND MSBUILD_LIBRARIES_DIRS_DEBUG   "%(AdditionalLibraryDirectories)")
+    vcpkg_list(PREPEND MSBUILD_LIBRARIES_RELEASE "%(AdditionalDependencies)")
+    vcpkg_list(PREPEND MSBUILD_LIBRARIES_DEBUG   "%(AdditionalDependencies)")
+
+    configure_file("${CMAKE_CURRENT_FUNCTION_LIST_DIR}/vcpkg_msbuild.targets.in" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/vcpkg_msbuild.targets")
+    configure_file("${CMAKE_CURRENT_FUNCTION_LIST_DIR}/vcpkg_msbuild.props.in" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/vcpkg_msbuild.props")
+    set(${arg_OUTPUT_PROPS} "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/vcpkg_msbuild.props" PARENT_SCOPE)
+    set(${arg_OUTPUT_TARGETS} "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/vcpkg_msbuild.targets" PARENT_SCOPE)
+endfunction()
diff --git a/external_imported/vcpkg/ports/vcpkg-pkgconfig-get-modules/copyright b/external_imported/vcpkg/ports/vcpkg-pkgconfig-get-modules/copyright
deleted file mode 100644
index 2e4eac826..000000000
--- a/external_imported/vcpkg/ports/vcpkg-pkgconfig-get-modules/copyright
+++ /dev/null
@@ -1,23 +0,0 @@
-Copyright (c) Microsoft Corporation
-
-All rights reserved. 
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/external_imported/vcpkg/ports/vcpkg-pkgconfig-get-modules/portfile.cmake b/external_imported/vcpkg/ports/vcpkg-pkgconfig-get-modules/portfile.cmake
index f82cf371b..a807e7e7e 100644
--- a/external_imported/vcpkg/ports/vcpkg-pkgconfig-get-modules/portfile.cmake
+++ b/external_imported/vcpkg/ports/vcpkg-pkgconfig-get-modules/portfile.cmake
@@ -5,9 +5,10 @@ endif()
 
 file(COPY
     "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake"
-    "${CMAKE_CURRENT_LIST_DIR}/copyright"
     DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 
+file(INSTALL "${VCPKG_ROOT_DIR}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
 configure_file("${CMAKE_CURRENT_LIST_DIR}/x_vcpkg_pkgconfig_get_modules.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/x_vcpkg_pkgconfig_get_modules.cmake" @ONLY)
 
 set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
diff --git a/external_imported/vcpkg/ports/vcpkg-pkgconfig-get-modules/vcpkg.json b/external_imported/vcpkg/ports/vcpkg-pkgconfig-get-modules/vcpkg.json
index f38c13d4d..1980cdd46 100644
--- a/external_imported/vcpkg/ports/vcpkg-pkgconfig-get-modules/vcpkg.json
+++ b/external_imported/vcpkg/ports/vcpkg-pkgconfig-get-modules/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "vcpkg-pkgconfig-get-modules",
-  "version-date": "2022-02-10",
-  "port-version": 1,
+  "version-date": "2023-09-06",
   "documentation": "https://vcpkg.io/en/docs/README.html",
   "license": "MIT",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.cmake b/external_imported/vcpkg/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.cmake
index 0ed124cff..ca99de757 100644
--- a/external_imported/vcpkg/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.cmake
+++ b/external_imported/vcpkg/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.cmake
@@ -1,7 +1,7 @@
 include_guard(GLOBAL)
 
 function(x_vcpkg_pkgconfig_get_modules)
-    cmake_parse_arguments(PARSE_ARGV 0 "arg" "CFLAGS;LIBS;LIBRARIES;LIBRARIES_DIR;INCLUDE_DIRS" "PREFIX" "MODULES")
+    cmake_parse_arguments(PARSE_ARGV 0 "arg" "CFLAGS;LIBS;LIBRARIES;LIBRARIES_DIR;INCLUDE_DIRS;USE_MSVC_SYNTAX_ON_WINDOWS" "PREFIX" "MODULES")
     if(NOT DEFINED arg_PREFIX OR arg_PREFIX STREQUAL "")
         message(FATAL_ERROR "x_vcpkg_pkgconfig_get_modules requires parameter PREFIX!")
     endif()
@@ -11,8 +11,12 @@ function(x_vcpkg_pkgconfig_get_modules)
     if(DEFINED arg_UNPARSED_ARGUMENTS)
         message(FATAL_ERROR "extra arguments passed to x_vcpkg_pkgconfig_get_modules: ${arg_UNPARSED_ARGUMENTS}")
     endif()
+    set(msvc "")
+    if(arg_USE_MSVC_SYNTAX_ON_WINDOWS AND VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+        set(msvc "--msvc-syntax")
+    endif()
 
-    set(PKGCONFIG "${CURRENT_INSTALLED_DIR}/../@HOST_TRIPLET@/tools/pkgconf/pkgconf@VCPKG_HOST_EXECUTABLE_SUFFIX@")
+    set(PKGCONFIG "${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf@VCPKG_HOST_EXECUTABLE_SUFFIX@")
 
     set(backup_PKG_CONFIG_PATH "$ENV{PKG_CONFIG_PATH}")
 
@@ -21,41 +25,46 @@ function(x_vcpkg_pkgconfig_get_modules)
         z_vcpkg_set_pkgconfig_path("${CURRENT_INSTALLED_DIR}/lib/pkgconfig${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_PACKAGES_DIR}/lib/pkgconfig" "${backup_PKG_CONFIG_PATH}")
         if(arg_LIBS)
             execute_process(
-                COMMAND "${PKGCONFIG}" --libs ${arg_MODULES}
+                COMMAND "${PKGCONFIG}" ${msvc} --libs ${arg_MODULES}
                 OUTPUT_VARIABLE ${arg_PREFIX}_LIBS_RELEASE
                 OUTPUT_STRIP_TRAILING_WHITESPACE
+                COMMAND_ERROR_IS_FATAL ANY
             )
             list(APPEND var_suffixes LIBS_RELEASE)
         endif()
         if(arg_LIBRARIES)
             execute_process(
-                COMMAND "${PKGCONFIG}" --libs-only-l ${arg_MODULES}
+                COMMAND "${PKGCONFIG}" ${msvc} --libs-only-l ${arg_MODULES}
                 OUTPUT_VARIABLE ${arg_PREFIX}_LIBRARIES_RELEASE
                 OUTPUT_STRIP_TRAILING_WHITESPACE
+                COMMAND_ERROR_IS_FATAL ANY
             )
             list(APPEND var_suffixes LIBRARIES_RELEASE)
         endif()
         if(arg_LIBRARIES_DIRS)
             execute_process(
-                COMMAND "${PKGCONFIG}" --libs-only-L ${arg_MODULES}
+                COMMAND "${PKGCONFIG}" ${msvc} --libs-only-L ${arg_MODULES}
                 OUTPUT_VARIABLE ${arg_PREFIX}_LIBRARIES_DIRS_RELEASE
                 OUTPUT_STRIP_TRAILING_WHITESPACE
+                COMMAND_ERROR_IS_FATAL ANY
             )
             list(APPEND var_suffixes LIBRARIES_DIRS_RELEASE)
         endif()
         if(arg_INCLUDE_DIRS)
             execute_process(
-                COMMAND "${PKGCONFIG}" --cflags-only-I ${arg_MODULES}
+                COMMAND "${PKGCONFIG}" ${msvc} --cflags-only-I ${arg_MODULES}
                 OUTPUT_VARIABLE ${arg_PREFIX}_INCLUDE_DIRS_RELEASE
                 OUTPUT_STRIP_TRAILING_WHITESPACE
+                COMMAND_ERROR_IS_FATAL ANY
             )
             list(APPEND var_suffixes INCLUDE_DIRS_RELEASE)
         endif()
         if(arg_CFLAGS)
             execute_process(
-                COMMAND "${PKGCONFIG}" --cflags ${arg_MODULES}
+                COMMAND "${PKGCONFIG}" ${msvc} --cflags ${arg_MODULES}
                 OUTPUT_VARIABLE ${arg_PREFIX}_CFLAGS_RELEASE
                 OUTPUT_STRIP_TRAILING_WHITESPACE
+                COMMAND_ERROR_IS_FATAL ANY
             )
             list(APPEND var_suffixes CFLAGS_RELEASE)
         endif()
@@ -64,41 +73,46 @@ function(x_vcpkg_pkgconfig_get_modules)
         z_vcpkg_set_pkgconfig_path("${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig" "${backup_PKG_CONFIG_PATH}")
         if(arg_LIBS)
             execute_process(
-                COMMAND "${PKGCONFIG}" --libs ${arg_MODULES}
+                COMMAND "${PKGCONFIG}" ${msvc} --libs ${arg_MODULES}
                 OUTPUT_VARIABLE ${arg_PREFIX}_LIBS_DEBUG
                 OUTPUT_STRIP_TRAILING_WHITESPACE
+                COMMAND_ERROR_IS_FATAL ANY
             )
             list(APPEND var_suffixes LIBS_DEBUG)
         endif()
         if(arg_LIBRARIES)
             execute_process(
-                COMMAND "${PKGCONFIG}" --libs-only-l ${arg_MODULES}
+                COMMAND "${PKGCONFIG}" ${msvc} --libs-only-l ${arg_MODULES}
                 OUTPUT_VARIABLE ${arg_PREFIX}_LIBRARIES_DEBUG
                 OUTPUT_STRIP_TRAILING_WHITESPACE
+                COMMAND_ERROR_IS_FATAL ANY
             )
             list(APPEND var_suffixes LIBRARIES_DEBUG)
         endif()
         if(arg_LIBRARIES_DIRS)
             execute_process(
-                COMMAND "${PKGCONFIG}" --libs-only-L ${arg_MODULES}
+                COMMAND "${PKGCONFIG}" ${msvc} --libs-only-L ${arg_MODULES}
                 OUTPUT_VARIABLE ${arg_PREFIX}_LIBRARIES_DIRS_DEBUG
                 OUTPUT_STRIP_TRAILING_WHITESPACE
+                COMMAND_ERROR_IS_FATAL ANY
             )
             list(APPEND var_suffixes LIBRARIES_DIRS_DEBUG)
         endif()
         if(arg_INCLUDE_DIRS)
             execute_process(
-                COMMAND "${PKGCONFIG}" --cflags-only-I ${arg_MODULES}
+                COMMAND "${PKGCONFIG}" ${msvc} --cflags-only-I ${arg_MODULES}
                 OUTPUT_VARIABLE ${arg_PREFIX}_INCLUDE_DIRS_DEBUG
                 OUTPUT_STRIP_TRAILING_WHITESPACE
+                COMMAND_ERROR_IS_FATAL ANY
             )
             list(APPEND var_suffixes INCLUDE_DIRS_DEBUG)
         endif()
         if(arg_CFLAGS)
             execute_process(
-                COMMAND "${PKGCONFIG}" --cflags ${arg_MODULES}
+                COMMAND "${PKGCONFIG}" ${msvc} --cflags ${arg_MODULES}
                 OUTPUT_VARIABLE ${arg_PREFIX}_CFLAGS_DEBUG
                 OUTPUT_STRIP_TRAILING_WHITESPACE
+                COMMAND_ERROR_IS_FATAL ANY
             )
             list(APPEND var_suffixes CFLAGS_DEBUG)
         endif()
diff --git a/external_imported/vcpkg/ports/vcpkg-qmake/vcpkg.json b/external_imported/vcpkg/ports/vcpkg-qmake/vcpkg.json
index 63a50ea81..50e1cc2f1 100644
--- a/external_imported/vcpkg/ports/vcpkg-qmake/vcpkg.json
+++ b/external_imported/vcpkg/ports/vcpkg-qmake/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "vcpkg-qmake",
-  "version-date": "2022-11-16",
+  "version-date": "2023-03-22",
   "documentation": "https://vcpkg.io/en/docs/README.html",
   "license": "MIT",
   "supports": "native",
diff --git a/external_imported/vcpkg/ports/vcpkg-qmake/vcpkg_qmake_configure.cmake b/external_imported/vcpkg/ports/vcpkg-qmake/vcpkg_qmake_configure.cmake
index 9846d183c..92cdf7fdc 100644
--- a/external_imported/vcpkg/ports/vcpkg-qmake/vcpkg_qmake_configure.cmake
+++ b/external_imported/vcpkg/ports/vcpkg-qmake/vcpkg_qmake_configure.cmake
@@ -18,10 +18,6 @@ function(vcpkg_qmake_configure)
         vcpkg_list(APPEND arg_QMAKE_OPTIONS "CONFIG*=static-runtime")
     endif()
 
-    if(DEFINED VCPKG_OSX_DEPLOYMENT_TARGET)
-        set(ENV{QMAKE_MACOSX_DEPLOYMENT_TARGET} "${VCPKG_OSX_DEPLOYMENT_TARGET}")
-    endif()
-
     set(ENV{PKG_CONFIG} "${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf${VCPKG_HOST_EXECUTABLE_SUFFIX}")
     get_filename_component(PKGCONFIG_PATH "${PKGCONFIG}" DIRECTORY)
     vcpkg_add_to_path("${PKGCONFIG_PATH}")
@@ -58,6 +54,25 @@ function(vcpkg_qmake_configure)
         set(VCPKG_QMAKE_COMMAND "${CURRENT_HOST_INSTALLED_DIR}/tools/Qt6/bin/qmake${VCPKG_HOST_EXECUTABLE_SUFFIX}")
     endif()
 
+    if(VCPKG_TARGET_IS_OSX)
+        # Get Qt version
+        execute_process(
+            COMMAND ${VCPKG_QMAKE_COMMAND} -query QT_VERSION
+            OUTPUT_VARIABLE QT_VERSION
+            OUTPUT_STRIP_TRAILING_WHITESPACE
+        )
+
+        if(DEFINED VCPKG_OSX_DEPLOYMENT_TARGET)
+            vcpkg_list(APPEND arg_QMAKE_OPTIONS "QMAKE_MACOSX_DEPLOYMENT_TARGET=${VCPKG_OSX_DEPLOYMENT_TARGET}")
+        elseif(${QT_VERSION} VERSION_GREATER_EQUAL 6)
+            # https://doc.qt.io/qt-6/macos.html
+            vcpkg_list(APPEND arg_QMAKE_OPTIONS "QMAKE_MACOSX_DEPLOYMENT_TARGET=10.15")
+        else() # Qt5
+            # https://doc.qt.io/qt-5/macos.html
+            vcpkg_list(APPEND arg_QMAKE_OPTIONS "QMAKE_MACOSX_DEPLOYMENT_TARGET=10.13")
+        endif()
+    endif()
+
     set(qmake_build_tools "")
     qmake_append_program(qmake_build_tools "QMAKE_CC" "${VCPKG_DETECTED_CMAKE_C_COMPILER}")
     qmake_append_program(qmake_build_tools "QMAKE_CXX" "${VCPKG_DETECTED_CMAKE_CXX_COMPILER}")
diff --git a/external_imported/vcpkg/ports/vcpkg-tool-meson/install.cmake b/external_imported/vcpkg/ports/vcpkg-tool-meson/install.cmake
new file mode 100644
index 000000000..84201aa1a
--- /dev/null
+++ b/external_imported/vcpkg/ports/vcpkg-tool-meson/install.cmake
@@ -0,0 +1,5 @@
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/meson")
+file(INSTALL "${SOURCE_PATH}/meson.py"
+             "${SOURCE_PATH}/mesonbuild"
+    DESTINATION "${CURRENT_PACKAGES_DIR}/tools/meson"
+)
diff --git a/external_imported/vcpkg/ports/vcpkg-tool-meson/meson-intl.patch b/external_imported/vcpkg/ports/vcpkg-tool-meson/meson-intl.patch
index 614db056d..6e2bcc31b 100644
--- a/external_imported/vcpkg/ports/vcpkg-tool-meson/meson-intl.patch
+++ b/external_imported/vcpkg/ports/vcpkg-tool-meson/meson-intl.patch
@@ -1,7 +1,5 @@
-diff --git a/tools/meson/mesonbuild/dependencies/misc.py b/tools/meson/mesonbuild/dependencies/misc.py
-index 537af1f89..43d7febf2 100644
---- a/tools/meson/mesonbuild/dependencies/misc.py
-+++ b/tools/meson/mesonbuild/dependencies/misc.py
+--- a/mesonbuild/dependencies/misc.py
++++ b/mesonbuild/dependencies/misc.py
 @@ -610,7 +610,8 @@ iconv_factory = DependencyFactory(
  
  intl_factory = DependencyFactory(
diff --git a/external_imported/vcpkg/ports/vcpkg-tool-meson/portfile.cmake b/external_imported/vcpkg/ports/vcpkg-tool-meson/portfile.cmake
index 680083a45..27dfdf9a0 100644
--- a/external_imported/vcpkg/ports/vcpkg-tool-meson/portfile.cmake
+++ b/external_imported/vcpkg/ports/vcpkg-tool-meson/portfile.cmake
@@ -11,11 +11,7 @@ set(search_names meson meson.py)
 set(interpreter PYTHON3)
 set(apt_package_name "meson")
 set(brew_package_name "meson")
-set(ref bb91cea0d66d8d036063dedec1f194d663399cdf)
 set(paths_to_search "${CURRENT_PACKAGES_DIR}/tools/meson")
-set(download_urls "https://github.com/mesonbuild/meson/archive/${ref}.tar.gz")
-set(download_filename "meson-${ref}.tar.gz")
-set(download_sha512 e5888eb35dd4ab5fc0a16143cfbb5a7849f6d705e211a80baf0a8b753e2cf877a4587860a79cad129ec5f3474c12a73558ffe66439b1633d80b8044eceaff2da)
 set(supported_on_unix ON)
 set(version_command --version)
 set(extra_search_args EXACT_VERSION_MATCH)
@@ -32,26 +28,26 @@ vcpkg_find_acquire_program(PYTHON3)
 #    VERSION_COMMAND ${version_command}
 # )
 
-if(NOT "${program}")
-    vcpkg_download_distfile(archive_path
-        URLS ${download_urls}
-        SHA512 "${download_sha512}"
-        FILENAME "${download_filename}"
-    )
-    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools")
-    vcpkg_execute_in_download_mode(
-                        COMMAND "${CMAKE_COMMAND}" -E tar xzf "${archive_path}"
-                        WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools"
-                    )
-    file(RENAME "${CURRENT_PACKAGES_DIR}/tools/meson-${ref}" "${CURRENT_PACKAGES_DIR}/tools/meson")
-    z_vcpkg_apply_patches(
-        SOURCE_PATH "${CURRENT_PACKAGES_DIR}"
-        PATCHES
-            meson-intl.patch
-    )
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/meson/test cases")
-    configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-port-config.cmake" @ONLY)
-endif()
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO mesonbuild/meson
+    REF bb91cea0d66d8d036063dedec1f194d663399cdf
+    SHA512 e5888eb35dd4ab5fc0a16143cfbb5a7849f6d705e211a80baf0a8b753e2cf877a4587860a79cad129ec5f3474c12a73558ffe66439b1633d80b8044eceaff2da
+    PATCHES
+        meson-intl.patch
+        remove-freebsd-pcfile-specialization.patch
+)
+
+vcpkg_execute_required_process(
+    COMMAND "${CMAKE_COMMAND}"
+        "-DSOURCE_PATH=${SOURCE_PATH}"
+        "-DCURRENT_PACKAGES_DIR=${CURRENT_PACKAGES_DIR}"
+        -P "${CURRENT_PORT_DIR}/install.cmake"
+    WORKING_DIRECTORY "${VCPKG_ROOT_DIR}"
+    LOGNAME install
+)
+
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 
 z_vcpkg_find_acquire_program_find_internal("${program}"
     INTERPRETER "${interpreter}"
diff --git a/external_imported/vcpkg/ports/vcpkg-tool-meson/remove-freebsd-pcfile-specialization.patch b/external_imported/vcpkg/ports/vcpkg-tool-meson/remove-freebsd-pcfile-specialization.patch
new file mode 100644
index 000000000..c5e9e0f4f
--- /dev/null
+++ b/external_imported/vcpkg/ports/vcpkg-tool-meson/remove-freebsd-pcfile-specialization.patch
@@ -0,0 +1,17 @@
+--- a/mesonbuild/modules/pkgconfig.py
++++ b/mesonbuild/modules/pkgconfig.py
+@@ -583,12 +583,8 @@ class PkgConfigModule(ExtensionModule):
+         pcfile = filebase + '.pc'
+         pkgroot = pkgroot_name = kwargs.get('install_dir', default_install_dir)
+         if pkgroot is None:
+-            if mesonlib.is_freebsd():
+-                pkgroot = os.path.join(state.environment.coredata.get_option(mesonlib.OptionKey('prefix')), 'libdata', 'pkgconfig')
+-                pkgroot_name = os.path.join('{prefix}', 'libdata', 'pkgconfig')
+-            else:
+-                pkgroot = os.path.join(state.environment.coredata.get_option(mesonlib.OptionKey('libdir')), 'pkgconfig')
+-                pkgroot_name = os.path.join('{libdir}', 'pkgconfig')
++            pkgroot = os.path.join(state.environment.coredata.get_option(mesonlib.OptionKey('libdir')), 'pkgconfig')
++            pkgroot_name = os.path.join('{libdir}', 'pkgconfig')
+         if not isinstance(pkgroot, str):
+             raise mesonlib.MesonException('Install_dir must be a string.')
+         self._generate_pkgconfig_file(state, deps, subdirs, name, description, url,
diff --git a/external_imported/vcpkg/ports/vcpkg-tool-meson/vcpkg.json b/external_imported/vcpkg/ports/vcpkg-tool-meson/vcpkg.json
index 70c9690af..a4c9b9a25 100644
--- a/external_imported/vcpkg/ports/vcpkg-tool-meson/vcpkg.json
+++ b/external_imported/vcpkg/ports/vcpkg-tool-meson/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "vcpkg-tool-meson",
   "version": "0.63",
+  "port-version": 2,
   "description": "Meson build system",
   "homepage": "https://github.com/mesonbuild/meson",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/vcpkg-tool-ninja/portfile.cmake b/external_imported/vcpkg/ports/vcpkg-tool-ninja/portfile.cmake
index eb4ef16df..2c7880861 100644
--- a/external_imported/vcpkg/ports/vcpkg-tool-ninja/portfile.cmake
+++ b/external_imported/vcpkg/ports/vcpkg-tool-ninja/portfile.cmake
@@ -2,9 +2,9 @@ set(VCPKG_POLICY_CMAKE_HELPER_PORT enabled)
 
 vcpkg_download_distfile(
     LONG_PATH_PATCH
-    URLS "https://patch-diff.githubusercontent.com/raw/ninja-build/ninja/pull/2056.diff" # stable?
+    URLS "https://patch-diff.githubusercontent.com/raw/ninja-build/ninja/pull/2056.diff?full_index=1" # stable?
     FILENAME 2056.diff
-    SHA512 90f17c2cbb5e0c5b41de748f75a3fc3e0c9da8837a0507c8570a49affe15ae7258661dc1f1bc201574847d93ea8b7fe4cbecfffd868395d50ca821033c5f295d
+    SHA512 3c840b19d51a2c145561e3026aee503eccffcc2d1f28db6d848a504c8e163b699fd09cafcfd326a1a95e08f76ec3b07860e2658386229af2bc2573b615cf2fed
 )
 
 vcpkg_from_github(
diff --git a/external_imported/vcpkg/ports/vcpkg-tool-ninja/vcpkg.json b/external_imported/vcpkg/ports/vcpkg-tool-ninja/vcpkg.json
index e1eac6120..98bf21c81 100644
--- a/external_imported/vcpkg/ports/vcpkg-tool-ninja/vcpkg.json
+++ b/external_imported/vcpkg/ports/vcpkg-tool-ninja/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "vcpkg-tool-ninja",
   "version-date": "2022-03-31",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Ninja is a small build system with a focus on speed.",
   "homepage": "https://ninja-build.org/",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/veigar/portfile.cmake b/external_imported/vcpkg/ports/veigar/portfile.cmake
new file mode 100644
index 000000000..2dc26cfd6
--- /dev/null
+++ b/external_imported/vcpkg/ports/veigar/portfile.cmake
@@ -0,0 +1,26 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO winsoft666/veigar
+    HEAD_REF master
+    REF ${VERSION}
+    SHA512 f67f2ba3b059b734e8eaf56005dc3abd011949080591caf40a4a0f881257761e2eba9b40b1e1f3207881ab755e1ab8b4b29f17eb63e645be2c81d979fd6a87d0
+)
+
+string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" VEIGAR_USE_STATIC_CRT)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DVEIGAR_USE_STATIC_CRT:BOOL=${VEIGAR_USE_STATIC_CRT}
+        -DVEIGAR_BUILD_TESTS:BOOL=OFF
+        -DVEIGAR_BUILD_EXAMPLES:BOOL=OFF
+)
+
+vcpkg_cmake_install()
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+vcpkg_copy_pdbs()
diff --git a/external_imported/vcpkg/ports/veigar/vcpkg.json b/external_imported/vcpkg/ports/veigar/vcpkg.json
new file mode 100644
index 000000000..2af5409a8
--- /dev/null
+++ b/external_imported/vcpkg/ports/veigar/vcpkg.json
@@ -0,0 +1,19 @@
+{
+  "name": "veigar",
+  "version": "1.0",
+  "maintainers": "winsoft666 <winsoft666@outlook.com>",
+  "description": "Cross platform RPC library using shared memory.",
+  "homepage": "https://github.com/winsoft666/veigar",
+  "license": "GPL-3.0-or-later",
+  "supports": "linux | (windows & !uwp & !xbox)",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/vincentlaucsb-csv-parser/001-fix-cmake.patch b/external_imported/vcpkg/ports/vincentlaucsb-csv-parser/001-fix-cmake.patch
new file mode 100644
index 000000000..a86da83bc
--- /dev/null
+++ b/external_imported/vcpkg/ports/vincentlaucsb-csv-parser/001-fix-cmake.patch
@@ -0,0 +1,67 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e729a8b..c63edab 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,6 +1,12 @@
+ cmake_minimum_required(VERSION 3.9)
+ project(csv)
+ 
++include(GNUInstallDirs)
++
++find_path(HEDLEY_INCLUDE_DIRS "hedley.h")
++find_package(mio CONFIG REQUIRED)
++find_package(string-view-lite CONFIG REQUIRED)
++
+ if(CSV_CXX_STANDARD)
+ 	set(CMAKE_CXX_STANDARD ${CSV_CXX_STANDARD})
+ else()
+@@ -38,16 +44,27 @@ set(CSV_TEST_DIR ${CMAKE_CURRENT_LIST_DIR}/tests)
+ 
+ include_directories(${CSV_INCLUDE_DIR})
+ 
+-## Load developer specific CMake settings
+-if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
+-    SET(CSV_DEVELOPER TRUE)
+-endif()
++SET(CSV_DEVELOPER OFF)
+ 
+ ## Main Library
+ add_subdirectory(${CSV_SOURCE_DIR})
+ 
+-## Executables
+-add_subdirectory("programs")
++install(TARGETS csv EXPORT unofficial-vincentlaucsb-csv-parser)
++
++install(
++    EXPORT unofficial-vincentlaucsb-csv-parser
++    FILE unofficial-vincentlaucsb-csv-parser-config.cmake
++    DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/unofficial-vincentlaucsb-csv-parser"
++    NAMESPACE unofficial::vincentlaucsb-csv-parser::
++)
++
++install(
++    DIRECTORY "${CMAKE_SOURCE_DIR}/include/"
++    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/vincentlaucsb-csv-parser"
++    PATTERN "*.cpp" EXCLUDE
++    PATTERN "CMakeLists.txt" EXCLUDE
++    PATTERN "external" EXCLUDE
++)
+ 
+ ## Developer settings
+ if (CSV_DEVELOPER)
+diff --git a/include/internal/CMakeLists.txt b/include/internal/CMakeLists.txt
+index 42cac24..30ea9e7 100644
+--- a/include/internal/CMakeLists.txt
++++ b/include/internal/CMakeLists.txt
+@@ -23,5 +23,9 @@ target_sources(csv
+ 		data_type.h
+ 		)
+ 
+-set_target_properties(csv PROPERTIES LINKER_LANGUAGE CXX)
+-target_link_libraries(csv PRIVATE Threads::Threads)
++set_target_properties(csv PROPERTIES LINKER_LANGUAGE CXX OUTPUT_NAME "vincentlaucsb-csv-parser-csv")
++target_include_directories(csv
++	PUBLIC ${HEDLEY_INCLUDE_DIRS}
++	INTERFACE $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/vincentlaucsb-csv-parser>
++)
++target_link_libraries(csv PRIVATE Threads::Threads PUBLIC mio::mio mio::mio-headers nonstd::string-view-lite)
diff --git a/external_imported/vcpkg/ports/vincentlaucsb-csv-parser/002-fix-include.patch b/external_imported/vcpkg/ports/vincentlaucsb-csv-parser/002-fix-include.patch
new file mode 100644
index 000000000..18e818a4d
--- /dev/null
+++ b/external_imported/vcpkg/ports/vincentlaucsb-csv-parser/002-fix-include.patch
@@ -0,0 +1,45 @@
+diff --git a/include/internal/basic_csv_parser.hpp b/include/internal/basic_csv_parser.hpp
+index d76b2d9..8dd0110 100644
+--- a/include/internal/basic_csv_parser.hpp
++++ b/include/internal/basic_csv_parser.hpp
+@@ -15,7 +15,7 @@
+ #include <thread>
+ #include <vector>
+ 
+-#include "../external/mio.hpp"
++#include "mio/mmap.hpp"
+ #include "col_names.hpp"
+ #include "common.hpp"
+ #include "csv_format.hpp"
+diff --git a/include/internal/common.hpp b/include/internal/common.hpp
+index c132bfb..dff4d03 100644
+--- a/include/internal/common.hpp
++++ b/include/internal/common.hpp
+@@ -28,12 +28,12 @@
+ #pragma once
+ #include <type_traits>
+ 
+-#include "../external/string_view.hpp"
++#include "nonstd/string_view.hpp"
+ 
+   // If there is another version of Hedley, then the newer one 
+   // takes precedence.
+   // See: https://github.com/nemequ/hedley
+-#include "../external/hedley.h"
++#include "hedley.h"
+ 
+ namespace csv {
+ #ifdef _MSC_VER
+diff --git a/include/internal/csv_reader.hpp b/include/internal/csv_reader.hpp
+index 798ef3b..007fa23 100644
+--- a/include/internal/csv_reader.hpp
++++ b/include/internal/csv_reader.hpp
+@@ -15,7 +15,7 @@
+ #include <string>
+ #include <vector>
+ 
+-#include "../external/mio.hpp"
++#include "mio/mmap.hpp"
+ #include "basic_csv_parser.hpp"
+ #include "common.hpp"
+ #include "data_type.h"
diff --git a/external_imported/vcpkg/ports/vincentlaucsb-csv-parser/portfile.cmake b/external_imported/vcpkg/ports/vincentlaucsb-csv-parser/portfile.cmake
new file mode 100644
index 000000000..931943870
--- /dev/null
+++ b/external_imported/vcpkg/ports/vincentlaucsb-csv-parser/portfile.cmake
@@ -0,0 +1,37 @@
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO vincentlaucsb/csv-parser
+    REF "${VERSION}"
+    SHA512 26ed124ebe9592931ad141bdc53569537b7599de2ba6a7230d4a514cba27bf2684f2b320be9a39a7c5277fcfd75eb972aa3a39bd9613dd237f865b50f5437178
+    HEAD_REF master
+    PATCHES
+        001-fix-cmake.patch
+        002-fix-include.patch
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_PYTHON=OFF
+    MAYBE_UNUSED_VARIABLES
+        BUILD_PYTHON
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-vincentlaucsb-csv-parser)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+file(READ "${CURRENT_PACKAGES_DIR}/share/unofficial-vincentlaucsb-csv-parser/unofficial-vincentlaucsb-csv-parser-config.cmake" cmake_config)
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/unofficial-vincentlaucsb-csv-parser/unofficial-vincentlaucsb-csv-parser-config.cmake"
+"include(CMakeFindDependencyMacro)
+find_dependency(Threads)
+find_dependency(mio CONFIG)
+find_dependency(string-view-lite CONFIG)
+${cmake_config}
+")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/vincentlaucsb-csv-parser/usage b/external_imported/vcpkg/ports/vincentlaucsb-csv-parser/usage
new file mode 100644
index 000000000..d7d068f3d
--- /dev/null
+++ b/external_imported/vcpkg/ports/vincentlaucsb-csv-parser/usage
@@ -0,0 +1,4 @@
+csv-parser provides CMake targets:
+
+    find_package(unofficial-vincentlaucsb-csv-parser CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE unofficial::vincentlaucsb-csv-parser::csv)
diff --git a/external_imported/vcpkg/ports/vincentlaucsb-csv-parser/vcpkg.json b/external_imported/vcpkg/ports/vincentlaucsb-csv-parser/vcpkg.json
new file mode 100644
index 000000000..c931d637b
--- /dev/null
+++ b/external_imported/vcpkg/ports/vincentlaucsb-csv-parser/vcpkg.json
@@ -0,0 +1,21 @@
+{
+  "name": "vincentlaucsb-csv-parser",
+  "version": "2.1.3",
+  "description": "A modern C++ library for reading, writing, and analyzing CSV (and similar) files.",
+  "homepage": "https://github.com/vincentlaucsb/csv-parser",
+  "license": "MIT",
+  "supports": "!uwp",
+  "dependencies": [
+    "hedley",
+    "mio",
+    "string-view-lite",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/visit-struct/CMakeLists.txt b/external_imported/vcpkg/ports/visit-struct/CMakeLists.txt
index df4fa2890..ffb69d2c4 100644
--- a/external_imported/vcpkg/ports/visit-struct/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/visit-struct/CMakeLists.txt
@@ -4,13 +4,13 @@ project(visit_struct)
 add_library(visit_struct INTERFACE)
 
 install(TARGETS visit_struct
-    EXPORT visit_struct-targets
+    EXPORT unofficial-visit_struct-targets
     INCLUDES DESTINATION include)
 
-install(EXPORT visit_struct-targets
-    FILE visit_struct-config.cmake
-    NAMESPACE visit_struct::
-    DESTINATION share/visit_struct)
+install(EXPORT unofficial-visit_struct-targets
+    FILE unofficial-visit_struct-config.cmake
+    NAMESPACE unofficial::visit_struct::
+    DESTINATION share/unofficial-visit_struct)
 
 install(DIRECTORY
     include/visit_struct
diff --git a/external_imported/vcpkg/ports/visit-struct/portfile.cmake b/external_imported/vcpkg/ports/visit-struct/portfile.cmake
index 424248a94..f10ab1152 100644
--- a/external_imported/vcpkg/ports/visit-struct/portfile.cmake
+++ b/external_imported/vcpkg/ports/visit-struct/portfile.cmake
@@ -2,8 +2,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO cbeck88/visit_struct
-    REF v1.0
-    SHA512 1396d0d4c4d37f48434361d1e0ab4cb02c397aff1134678b26de713a27a4fcfa1c352890845502be645ba01e20314bf67731893fc6410b93e4521c1261d63c06
+    REF "v${VERSION}"
+    SHA512 8d1f93344ef13320bc7967cbe2696bf49d6773fe3c89ba10bcf8ee9c33be165f14086828f6195bad742fbe75fee9c0995827c455c777950df583ff8f13c21338
     HEAD_REF master
 )
 
@@ -13,7 +13,7 @@ vcpkg_cmake_configure(
 )
 
 vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(PACKAGE_NAME visit_struct)
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-visit_struct)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
 
diff --git a/external_imported/vcpkg/ports/visit-struct/vcpkg.json b/external_imported/vcpkg/ports/visit-struct/vcpkg.json
index 5287e8ecd..dd9880a4a 100644
--- a/external_imported/vcpkg/ports/visit-struct/vcpkg.json
+++ b/external_imported/vcpkg/ports/visit-struct/vcpkg.json
@@ -1,8 +1,8 @@
 {
   "name": "visit-struct",
-  "version-string": "1.0",
-  "port-version": 3,
+  "version": "1.1.0",
   "description": "A header-only library providing structure visitors for C++11 and C++14",
+  "license": "BSL-1.0",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/vit-vit-ctpl/portfile.cmake b/external_imported/vcpkg/ports/vit-vit-ctpl/portfile.cmake
new file mode 100644
index 000000000..3a25a10a5
--- /dev/null
+++ b/external_imported/vcpkg/ports/vit-vit-ctpl/portfile.cmake
@@ -0,0 +1,24 @@
+# Header-only library
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO vit-vit/ctpl
+    REF "ctpl_v.${VERSION}"
+    SHA512 5ab83a342e70559687c15f9ab8e7ca47d609713d64bf4248f05b9f311fddb44502ccd54d8352193c00ae570ebde3ea1149389ecdd0207ef46325eb8b648fb0e3
+    HEAD_REF master
+)
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        lockfree WITH_LOCKFREE
+)
+
+if(WITH_LOCKFREE)
+    file(INSTALL "${SOURCE_PATH}/ctpl.h"
+        DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+endif()
+
+file(INSTALL "${SOURCE_PATH}/ctpl_stl.h"
+    DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+
+# Handle copyright
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/vit-vit-ctpl/vcpkg.json b/external_imported/vcpkg/ports/vit-vit-ctpl/vcpkg.json
new file mode 100644
index 000000000..c650a6c28
--- /dev/null
+++ b/external_imported/vcpkg/ports/vit-vit-ctpl/vcpkg.json
@@ -0,0 +1,25 @@
+{
+  "name": "vit-vit-ctpl",
+  "version": "0.0.2",
+  "description": "Modern and efficient C++ Thread Pool Library",
+  "homepage": "https://github.com/vit-vit/ctpl",
+  "license": "Apache-2.0",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
+  "features": {
+    "lockfree": {
+      "description": "Depends on Boost Lockfree Queue library",
+      "dependencies": [
+        "boost-lockfree"
+      ]
+    }
+  }
+}
diff --git a/external_imported/vcpkg/ports/vk-bootstrap/portfile.cmake b/external_imported/vcpkg/ports/vk-bootstrap/portfile.cmake
index c7e041abd..ecdc47b30 100644
--- a/external_imported/vcpkg/ports/vk-bootstrap/portfile.cmake
+++ b/external_imported/vcpkg/ports/vk-bootstrap/portfile.cmake
@@ -1,25 +1,25 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+if(VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO charles-lunarg/vk-bootstrap
-    REF 142986cdb767037118b687387b097ff6b3e7fe7d
-    SHA512 1dc32f09f4548ffaf71d39d5200d60a9bd58971327039f2adb4327fdb885f984bbd91409d28dbfc24e5fdac8c241824e141a2558cddc1b86b84cf2376e7d7567
+    REF "v${VERSION}"
+    SHA512 c60567a5330908380efea8ac95036e63321fe1e2e72314068a5117c9c0f64cd8b80bd5e98eed9177f1f84dc4ee10a2a2dd902d111fc1a30f503287a7e4b22640
     HEAD_REF master
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-        # This option will disable build tests and example, and next release this option need to change as -DVK_BOOTSTRAP_TEST=OFF. The related upstream commit: https://github.com/charles-lunarg/vk-bootstrap/commit/4ae9513ff9182b9c519504a73435ed575a821300.
-        -DCMAKE_PROJECT_NAME=
+        -DVK_BOOTSTRAP_TEST=OFF
+        -DVK_BOOTSTRAP_INSTALL=ON
 )
 
 vcpkg_cmake_install()
-vcpkg_copy_pdbs()
 
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/${PORT}-config.cmake" "${CMAKE_CURRENT_LIST_DIR}/${PORT}-targets-release.cmake" "${CMAKE_CURRENT_LIST_DIR}/${PORT}-targets-debug.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/external_imported/vcpkg/ports/vk-bootstrap/vcpkg.json b/external_imported/vcpkg/ports/vk-bootstrap/vcpkg.json
index f0f717701..7c2b0e81f 100644
--- a/external_imported/vcpkg/ports/vk-bootstrap/vcpkg.json
+++ b/external_imported/vcpkg/ports/vk-bootstrap/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "vk-bootstrap",
-  "version": "0.5",
-  "port-version": 1,
+  "version": "1.3.273",
   "description": "Vulkan bootstraping library",
   "homepage": "https://github.com/charles-lunarg/vk-bootstrap",
   "license": "MIT",
@@ -10,6 +9,10 @@
       "name": "vcpkg-cmake",
       "host": true
     },
-    "vulkan"
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    "vulkan-headers"
   ]
 }
diff --git a/external_imported/vcpkg/ports/vk-bootstrap/vk-bootstrap-config.cmake b/external_imported/vcpkg/ports/vk-bootstrap/vk-bootstrap-config.cmake
deleted file mode 100644
index 4d2244eae..000000000
--- a/external_imported/vcpkg/ports/vk-bootstrap/vk-bootstrap-config.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
-get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
-get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
-
-add_library(vk-bootstrap::vk-bootstrap SHARED IMPORTED)
-set_target_properties(vk-bootstrap::vk-bootstrap PROPERTIES
-    INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${_IMPORT_PREFIX}/include"
-)
-
-get_filename_component(_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
-file(GLOB CONFIG_FILES "${_DIR}/vk-bootstrap-targets-*.cmake")
-foreach(f ${CONFIG_FILES})
-  include(${f})
-endforeach()
diff --git a/external_imported/vcpkg/ports/vk-bootstrap/vk-bootstrap-targets-debug.cmake b/external_imported/vcpkg/ports/vk-bootstrap/vk-bootstrap-targets-debug.cmake
deleted file mode 100644
index ec882d433..000000000
--- a/external_imported/vcpkg/ports/vk-bootstrap/vk-bootstrap-targets-debug.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-#----------------------------------------------------------------
-# Generated CMake target import file for configuration "Debug".
-#----------------------------------------------------------------
-
-set(CMAKE_IMPORT_FILE_VERSION 1)
-
-set_property(TARGET vk-bootstrap::vk-bootstrap APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
-set_target_properties(vk-bootstrap::vk-bootstrap PROPERTIES
-    IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/debug/lib/vk-bootstrap.lib"
-)
-
-set(CMAKE_IMPORT_FILE_VERSION)
diff --git a/external_imported/vcpkg/ports/vk-bootstrap/vk-bootstrap-targets-release.cmake b/external_imported/vcpkg/ports/vk-bootstrap/vk-bootstrap-targets-release.cmake
deleted file mode 100644
index a25d3be07..000000000
--- a/external_imported/vcpkg/ports/vk-bootstrap/vk-bootstrap-targets-release.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-#----------------------------------------------------------------
-# Generated CMake target import file for configuration "Debug".
-#----------------------------------------------------------------
-
-set(CMAKE_IMPORT_FILE_VERSION 1)
-
-set_property(TARGET vk-bootstrap::vk-bootstrap APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
-set_target_properties(vk-bootstrap::vk-bootstrap PROPERTIES
-    IMPORTED_IMPLIB_RELEASE "${_IMPORT_PREFIX}/lib/vk-bootstrap.lib"
-)
-
-set(CMAKE_IMPORT_FILE_VERSION)
diff --git a/external_imported/vcpkg/ports/vkfft/portfile.cmake b/external_imported/vcpkg/ports/vkfft/portfile.cmake
index 23c2a86d7..ab9283298 100644
--- a/external_imported/vcpkg/ports/vkfft/portfile.cmake
+++ b/external_imported/vcpkg/ports/vkfft/portfile.cmake
@@ -2,8 +2,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO DTolm/VkFFT
-    REF fc981ecc022ae7932d4d906bed3cf9def592ddf5 #v1.2.17
-    SHA512 c2ffae4885fe75778743f4165475026a43ab2ad2df2e02774a2750ad77ad8ceb3c6ff22a5cec56af3913af46eeb48bc09d2e119a54d893daa13af1fd768d9a9f
+    REF e1c58868a9581725dd595975daf780da0a37dad1 #v1.2.31
+    SHA512 b113f0117336ef2f6a285166cb4d68ea372e0dbb46025b7fcbae30f4f5147ad0fb1f7abfd91e1a73e2b4d72446c16ac0e90efc467785e035f176e81d95979706
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/vkfft/vcpkg.json b/external_imported/vcpkg/ports/vkfft/vcpkg.json
index 8e656038c..6c4076fe4 100644
--- a/external_imported/vcpkg/ports/vkfft/vcpkg.json
+++ b/external_imported/vcpkg/ports/vkfft/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "vkfft",
-  "version": "1.2.17",
+  "version": "1.2.31",
   "description": "Vulkan/CUDA/HIP/OpenCL/Level Zero Fast Fourier Transform library",
   "homepage": "https://github.com/DTolm/VkFFT",
   "license": "MIT"
diff --git a/external_imported/vcpkg/ports/vlfeat/vcpkg.json b/external_imported/vcpkg/ports/vlfeat/vcpkg.json
index 66f89f953..c76d31911 100644
--- a/external_imported/vcpkg/ports/vlfeat/vcpkg.json
+++ b/external_imported/vcpkg/ports/vlfeat/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "vlfeat",
-  "version-string": "2020-07-10",
-  "port-version": 2,
+  "version-date": "2020-07-10",
+  "port-version": 3,
   "description": "An open library of computer vision algorithms",
   "homepage": "https://www.vlfeat.org",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/vlpp/vcpkg.json b/external_imported/vcpkg/ports/vlpp/vcpkg.json
index 95ad4ef0f..f6b7c1ef9 100644
--- a/external_imported/vcpkg/ports/vlpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/vlpp/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "vlpp",
   "version": "1.1.0.0",
+  "port-version": 1,
   "maintainers": "vczh",
   "description": "Common C++ construction, including string operation / generic container / linq / General-LR parser generator / multithreading / reflection for C++ / etc",
   "homepage": "https://github.com/vczh-libraries/Release",
@@ -68,7 +69,8 @@
       "description": "Enable Reflection"
     },
     "tools": {
-      "description": "Build tools"
+      "description": "Build tools",
+      "supports": "!osx"
     },
     "workflowcompiler": {
       "description": "Enable VlppWorkflow Compiler",
diff --git a/external_imported/vcpkg/ports/volk/portfile.cmake b/external_imported/vcpkg/ports/volk/portfile.cmake
index 747715bcc..a6ff670be 100644
--- a/external_imported/vcpkg/ports/volk/portfile.cmake
+++ b/external_imported/vcpkg/ports/volk/portfile.cmake
@@ -4,8 +4,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO zeux/volk
-    REF 97e029bea37ae8ef443a1de684207127717de606
-    SHA512 a50b2c90499688b66bfa88a7cde438aa78dd27a43a6fe375f348b2587e321540306d0c383272091b7f78a64a8415cfe9e908d0dfc949562dfee8e0e3b4380acc
+    REF "vulkan-sdk-${VERSION}"
+    SHA512 5c61448c93171917c55a9fc50f102a2d52165a150eb0c3cfd31e41a32e38c673b597888b82685f3bb1e23883f7218e8ae6326f08c4c257ebddd42b0492bdf466
     HEAD_REF master
 )
 
@@ -21,4 +21,5 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/volk)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/volk/usage b/external_imported/vcpkg/ports/volk/usage
new file mode 100644
index 000000000..1feb18c4f
--- /dev/null
+++ b/external_imported/vcpkg/ports/volk/usage
@@ -0,0 +1,4 @@
+volk provides CMake targets:
+
+    find_package(volk CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE volk::volk volk::volk_headers)
diff --git a/external_imported/vcpkg/ports/volk/vcpkg.json b/external_imported/vcpkg/ports/volk/vcpkg.json
index fe9e60db1..805fe74a9 100644
--- a/external_imported/vcpkg/ports/volk/vcpkg.json
+++ b/external_imported/vcpkg/ports/volk/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "volk",
-  "version": "1.3.233",
-  "port-version": 1,
+  "version": "1.3.275.0",
   "description": [
     "Meta loader for Vulkan API.",
     "Note that the static library target volk::volk is built without platform-specific defines.",
diff --git a/external_imported/vcpkg/ports/vowpal-wabbit/portfile.cmake b/external_imported/vcpkg/ports/vowpal-wabbit/portfile.cmake
index 52dcd20cd..734a33c6f 100644
--- a/external_imported/vcpkg/ports/vowpal-wabbit/portfile.cmake
+++ b/external_imported/vcpkg/ports/vowpal-wabbit/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO VowpalWabbit/vowpal_wabbit
-    REF 258731cd116be6fa42d6ff6d2e59d06b9b790dc0
-    SHA512 b8a370c5c20e74ce7ccdb19ea3aa9c6d5287c9cc82d0b613804ab8b6c1d7770aafd15ad900d4933b636662435026c36f6a4b6ec0c66d597bdb52b20a4c0b6c25
+    REF "${VERSION}"
+    SHA512 37c4401e5304c20a7a4c2ffa6102bfa82085c4bbc787c796da295e789996f09472ac4b3e732b0a44016eab6579c2648085b1e67b1df2658257d52f7e46a1b683
     HEAD_REF master
     PATCHES cmake_remove_bin_targets.patch
 )
@@ -21,12 +21,14 @@ vcpkg_cmake_configure(
         -DVW_EIGEN_SYS_DEP=ON
         -DVW_BUILD_VW_C_WRAPPER=OFF
         -DBUILD_TESTING=OFF
+        -DVW_STRING_VIEW_LITE_SYS_DEP=ON
+        -DVW_SSE2NEON_SYS_DEP=ON
 )
 vcpkg_cmake_install()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
 
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/VowpalWabbit)
 vcpkg_fixup_pkgconfig()
diff --git a/external_imported/vcpkg/ports/vowpal-wabbit/vcpkg.json b/external_imported/vcpkg/ports/vowpal-wabbit/vcpkg.json
index 6fc6c8e8c..9f4dfacdc 100644
--- a/external_imported/vcpkg/ports/vowpal-wabbit/vcpkg.json
+++ b/external_imported/vcpkg/ports/vowpal-wabbit/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "vowpal-wabbit",
   "version": "9.8.0",
+  "port-version": 2,
   "description": "Reduction based online learning framework with a focus on contextual bandits and reinforcement learning.",
   "homepage": "https://github.com/vowpalwabbit/vowpal_wabbit",
   "license": "BSD-3-Clause",
@@ -12,6 +13,10 @@
     "fmt",
     "rapidjson",
     "spdlog",
+    {
+      "name": "sse2neon",
+      "platform": "arm"
+    },
     "string-view-lite",
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/vs-yasm/vcpkg.json b/external_imported/vcpkg/ports/vs-yasm/vcpkg.json
index 830838cc7..3a9192b8c 100644
--- a/external_imported/vcpkg/ports/vs-yasm/vcpkg.json
+++ b/external_imported/vcpkg/ports/vs-yasm/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "vs-yasm",
-  "version-string": "0.5.0",
-  "port-version": 1,
+  "version": "0.5.0",
+  "port-version": 2,
   "description": "Provides Visual Studio integration for the YASM assembler.",
   "homepage": "https://github.com/ShiftMediaProject/VSYASM",
   "supports": "windows & !arm"
diff --git a/external_imported/vcpkg/ports/vsg/devendor-glslang.patch b/external_imported/vcpkg/ports/vsg/devendor-glslang.patch
new file mode 100644
index 000000000..6cfe5604c
--- /dev/null
+++ b/external_imported/vcpkg/ports/vsg/devendor-glslang.patch
@@ -0,0 +1,83 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6e7ec437..db4d30f1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -37,9 +37,11 @@ find_package(Vulkan ${Vulkan_MIN_VERSION} REQUIRED)
+ 
+ find_package(Threads REQUIRED)
+ 
++find_package(glslang CONFIG REQUIRED)
++
+ # Enable/disable shader compilation support that pulls in glslang
+ set(VSG_SUPPORTS_ShaderCompiler  1 CACHE STRING "Optional shader compiler support, 0 for off, 1 for enabled." )
+-if (VSG_SUPPORTS_ShaderCompiler)
++if (FALSE)
+     if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/glslang/build_vars.cmake)
+ 
+         if (Git_FOUND)
+diff --git a/src/vsg/CMakeLists.txt b/src/vsg/CMakeLists.txt
+index 3d9625e4..96285e99 100644
+--- a/src/vsg/CMakeLists.txt
++++ b/src/vsg/CMakeLists.txt
+@@ -227,14 +227,24 @@ set(SOURCES
+     utils/LoadPagedLOD.cpp
+ )
+ 
+-if (${VSG_SUPPORTS_ShaderCompiler})
++if (FALSE)
+ 
+     # include glslang source code directly into the VulkanScenegraph library build.
+     include(../glslang/build_vars.cmake)
+ endif()
+ 
+ # set up library dependencies
+-set(LIBRARIES PUBLIC
++set(LIBRARIES
++	PRIVATE
++        glslang::glslang
++        glslang::OSDependent
++        glslang::MachineIndependent
++        glslang::GenericCodeGen
++        glslang::glslang-default-resource-limits
++        glslang::OGLCompiler
++        glslang::SPVRemapper
++        glslang::SPIRV
++	PUBLIC
+         Vulkan::Vulkan
+         Threads::Threads
+ )
+@@ -365,9 +375,6 @@ target_include_directories(vsg
+     PUBLIC
+         $<BUILD_INTERFACE:${VSG_SOURCE_DIR}/include>
+         $<BUILD_INTERFACE:${VSG_BINARY_DIR}/include>
+-    PRIVATE
+-        $<BUILD_INTERFACE:${VSG_SOURCE_DIR}/src/glslang>
+-        $<BUILD_INTERFACE:${GLSLANG_GENERATED_INCLUDEDIR}>
+ )
+ 
+ target_link_libraries(vsg ${LIBRARIES})
+diff --git a/src/vsg/utils/ShaderCompiler.cpp b/src/vsg/utils/ShaderCompiler.cpp
+index 71a7f09f..803f26a1 100644
+--- a/src/vsg/utils/ShaderCompiler.cpp
++++ b/src/vsg/utils/ShaderCompiler.cpp
+@@ -20,7 +20,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
+ #include <vsg/utils/ShaderCompiler.h>
+ 
+ #if VSG_SUPPORTS_ShaderCompiler
+-#    include <SPIRV/GlslangToSpv.h>
++#    include <glslang/SPIRV/GlslangToSpv.h>
+ #    include <glslang/Public/ResourceLimits.h>
+ #    include <glslang/Public/ShaderLang.h>
+ #endif
+diff --git a/src/vsg/vsgConfig.cmake.in b/src/vsg/vsgConfig.cmake.in
+index 7ea0de02..4f7e77bd 100644
+--- a/src/vsg/vsgConfig.cmake.in
++++ b/src/vsg/vsgConfig.cmake.in
+@@ -2,6 +2,7 @@ include(CMakeFindDependencyMacro)
+ 
+ find_package(Vulkan @Vulkan_MIN_VERSION@ REQUIRED)
+ find_dependency(Threads)
++find_dependency(glslang)
+ 
+ @FIND_DEPENDENCY_WINDOWING@
+ include("${CMAKE_CURRENT_LIST_DIR}/vsgTargets.cmake")
diff --git a/external_imported/vcpkg/ports/vsg/portfile.cmake b/external_imported/vcpkg/ports/vsg/portfile.cmake
new file mode 100644
index 000000000..5ff95b3d9
--- /dev/null
+++ b/external_imported/vcpkg/ports/vsg/portfile.cmake
@@ -0,0 +1,17 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO vsg-dev/VulkanSceneGraph
+    REF "v${VERSION}"
+    SHA512 79ea02c5816c6b99ce847938d9004e0078cb685523c720d4abce5136b91bf4d17fff52893eba972ce9ac3d6db7fe92581039cba6ef72fb9e44ff37f9d9b314f3
+    HEAD_REF master
+	PATCHES devendor-glslang.patch
+)
+
+vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}")
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME "vsg" CONFIG_PATH "lib/cmake/vsg")
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
diff --git a/external_imported/vcpkg/ports/vsg/vcpkg.json b/external_imported/vcpkg/ports/vsg/vcpkg.json
new file mode 100644
index 000000000..3c7bec627
--- /dev/null
+++ b/external_imported/vcpkg/ports/vsg/vcpkg.json
@@ -0,0 +1,19 @@
+{
+  "name": "vsg",
+  "version": "1.0.9",
+  "description": "A modern, cross platform, high performance scene graph library built upon Vulkan.",
+  "homepage": "http://www.vulkanscenegraph.org/",
+  "license": "MIT",
+  "dependencies": [
+    "glslang",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    "vulkan"
+  ]
+}
diff --git a/external_imported/vcpkg/ports/vsgimgui/devendor.patch b/external_imported/vcpkg/ports/vsgimgui/devendor.patch
new file mode 100644
index 000000000..c73c84918
--- /dev/null
+++ b/external_imported/vcpkg/ports/vsgimgui/devendor.patch
@@ -0,0 +1,144 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a9e6265..96a2ecb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -22,34 +22,13 @@ if (VULKAN_SDK)
+     set(ENV{VULKAN_SDK} ${VULKAN_SDK})
+ endif()
+ 
+-find_package(vsg 1.0.5)
++find_package(vsg REQUIRED)
++find_package(imgui REQUIRED)
++find_package(implot REQUIRED)
+ 
+ vsg_setup_dir_vars()
+ vsg_setup_build_vars()
+ 
+-if ( (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/imgui/imgui.h) OR
+-     (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/implot/implot.h) )
+-    find_package(Git QUIET)
+-
+-    execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive
+-                    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+-                    RESULT_VARIABLE GIT_SUBMOD_RESULT)
+-
+-    if(NOT GIT_SUBMOD_RESULT EQUAL "0")
+-        message(FATAL_ERROR "git submodule update --init --recursive failed with ${GIT_SUBMOD_RESULT}, please checkout submodules")
+-    endif()
+-endif()
+-
+-vsg_copy_imgui_headers(
+-    FILES
+-        ${VSGIMGUI_SOURCE_DIR}/src/imgui/imgui.h
+-        ${VSGIMGUI_SOURCE_DIR}/src/imgui/imconfig.h
+-        ${VSGIMGUI_SOURCE_DIR}/src/imgui/imgui_internal.h
+-        ${VSGIMGUI_SOURCE_DIR}/src/imgui/imstb_textedit.h
+-        ${VSGIMGUI_SOURCE_DIR}/src/imgui//misc/cpp/imgui_stdlib.h
+-        ${VSGIMGUI_SOURCE_DIR}/src/implot/implot.h
+-        ${VSGIMGUI_SOURCE_DIR}/src/implot/implot_internal.h
+-)
+ 
+ vsg_add_target_clang_format(
+     FILES
+diff --git a/include/vsgImGui/RenderImGui.h b/include/vsgImGui/RenderImGui.h
+index b4210d2..33198e4 100644
+--- a/include/vsgImGui/RenderImGui.h
++++ b/include/vsgImGui/RenderImGui.h
+@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ #include <vsg/vk/DescriptorPool.h>
+ 
+ #include <vsgImGui/Export.h>
+-#include <vsgImGui/imgui.h>
++#include <imgui.h>
+ 
+ namespace vsgImGui
+ {
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 2226b13..1200b42 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -6,34 +6,15 @@ set(EXTRA_INCLUDES)
+ SET(HEADER_PATH ${VSGIMGUI_SOURCE_DIR}/include/vsgImGui)
+ 
+ set(HEADERS
+-    ${HEADER_PATH}/imgui.h
+     ${HEADER_PATH}/SendEventsToImGui.h
+     ${HEADER_PATH}/RenderImGui.h
+     ${HEADER_PATH}/Texture.h
+-    imgui/imconfig.h
+-    imgui/imgui_internal.h
+-    imgui/imstb_rectpack.h
+-    imgui/imstb_textedit.h
+-    imgui/imstb_truetype.h
+-    imgui/misc/cpp/imgui_stdlib.h
+-    implot/implot.h
+-    implot/implot_internal.h
+ )
+ 
+ set(SOURCES
+     vsgImGui/RenderImGui.cpp
+     vsgImGui/SendEventsToImGui.cpp
+     vsgImGui/Texture.cpp
+-    imgui/imgui.cpp
+-    imgui/imgui_demo.cpp
+-    imgui/imgui_draw.cpp
+-    imgui/imgui_tables.cpp
+-    imgui/imgui_widgets.cpp
+-    imgui/backends/imgui_impl_vulkan.cpp
+-    imgui/misc/cpp/imgui_stdlib.cpp
+-    implot/implot.cpp
+-    implot/implot_demo.cpp
+-    implot/implot_items.cpp
+ )
+ 
+ 
+@@ -63,6 +44,8 @@ target_include_directories(vsgImGui PUBLIC
+ target_link_libraries(vsgImGui
+     PUBLIC
+         vsg::vsg
++        imgui::imgui
++        implot::implot
+     PRIVATE
+         ${EXTRA_LIBRARIES}
+ )
+diff --git a/src/vsgImGui/RenderImGui.cpp b/src/vsgImGui/RenderImGui.cpp
+index 5d7cf06..dac2227 100644
+--- a/src/vsgImGui/RenderImGui.cpp
++++ b/src/vsgImGui/RenderImGui.cpp
+@@ -22,9 +22,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ </editor-fold> */
+ 
+ #include <vsgImGui/RenderImGui.h>
+-#include <vsgImGui/implot.h>
++#include <implot.h>
+ 
+-#include "../imgui/backends/imgui_impl_vulkan.h"
++#include <imgui_impl_vulkan.h>
+ 
+ #include <vsg/io/Logger.h>
+ #include <vsg/vk/State.h>
+diff --git a/src/vsgImGui/SendEventsToImGui.cpp b/src/vsgImGui/SendEventsToImGui.cpp
+index 4e83e4c..b1f4d83 100644
+--- a/src/vsgImGui/SendEventsToImGui.cpp
++++ b/src/vsgImGui/SendEventsToImGui.cpp
+@@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ </editor-fold> */
+ 
+ #include <vsgImGui/SendEventsToImGui.h>
+-#include <vsgImGui/imgui.h>
++#include <imgui.h>
+ 
+ #include <vsg/ui/KeyEvent.h>
+ #include <vsg/ui/PointerEvent.h>
+diff --git a/src/vsgImGuiConfig.cmake.in b/src/vsgImGuiConfig.cmake.in
+index e2c14f2..5cf8bd9 100644
+--- a/src/vsgImGuiConfig.cmake.in
++++ b/src/vsgImGuiConfig.cmake.in
+@@ -2,5 +2,7 @@ include(CMakeFindDependencyMacro)
+ 
+ find_dependency(Vulkan)
+ find_dependency(vsg)
++find_dependency(imgui)
++find_dependency(implot)
+ 
+ include("${CMAKE_CURRENT_LIST_DIR}/vsgImGuiTargets.cmake")
diff --git a/external_imported/vcpkg/ports/vsgimgui/portfile.cmake b/external_imported/vcpkg/ports/vsgimgui/portfile.cmake
new file mode 100644
index 000000000..5c4a77334
--- /dev/null
+++ b/external_imported/vcpkg/ports/vsgimgui/portfile.cmake
@@ -0,0 +1,21 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO vsg-dev/vsgImGui
+    REF "v${VERSION}"
+    SHA512 8f3fca47ed7fd4b0a43eaff190457a3e1cf20355f69dd5000bd9f01218855f658fd934ec2abe8b768c11d3c1389a652cdafd9f0b589392878e666b4acd86fc70
+    HEAD_REF master
+    PATCHES
+        devendor.patch
+        remove-manual-font-creation.patch
+)
+
+file(REMOVE "${SOURCE_PATH}/include/vsgImGui/imgui.h")
+
+vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}")
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME "vsgImGui" CONFIG_PATH "lib/cmake/vsgImGui")
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
diff --git a/external_imported/vcpkg/ports/vsgimgui/remove-manual-font-creation.patch b/external_imported/vcpkg/ports/vsgimgui/remove-manual-font-creation.patch
new file mode 100644
index 000000000..0efbb7c4b
--- /dev/null
+++ b/external_imported/vcpkg/ports/vsgimgui/remove-manual-font-creation.patch
@@ -0,0 +1,63 @@
+diff --git a/include/vsgImGui/RenderImGui.h b/include/vsgImGui/RenderImGui.h
+index e8186c6..8059d75 100644
+--- a/include/vsgImGui/RenderImGui.h
++++ b/include/vsgImGui/RenderImGui.h
+@@ -86,7 +86,6 @@ namespace vsgImGui
+                    vsg::ref_ptr<vsg::RenderPass> renderPass,
+                    uint32_t minImageCount, uint32_t imageCount,
+                    VkExtent2D imageSize, bool useClearAttachments);
+-        void _uploadFonts();
+     };
+ 
+ } // namespace vsgImGui
+diff --git a/src/vsgImGui/RenderImGui.cpp b/src/vsgImGui/RenderImGui.cpp
+index bda3137..7ec6136 100644
+--- a/src/vsgImGui/RenderImGui.cpp
++++ b/src/vsgImGui/RenderImGui.cpp
+@@ -60,7 +60,6 @@ namespace vsgImGui
+ RenderImGui::RenderImGui(const vsg::ref_ptr<vsg::Window>& window, bool useClearAttachments)
+ {
+     _init(window, useClearAttachments);
+-    _uploadFonts();
+ }
+ 
+ RenderImGui::RenderImGui(vsg::ref_ptr<vsg::Device> device, uint32_t queueFamily,
+@@ -69,7 +68,6 @@ RenderImGui::RenderImGui(vsg::ref_ptr<vsg::Device> device, uint32_t queueFamily,
+                          VkExtent2D imageSize, bool useClearAttachments)
+ {
+     _init(device, queueFamily, renderPass, minImageCount, imageCount, imageSize, useClearAttachments);
+-    _uploadFonts();
+ }
+ 
+ RenderImGui::~RenderImGui()
+@@ -183,30 +181,6 @@ void RenderImGui::_init(
+     }
+ }
+ 
+-void RenderImGui::_uploadFonts()
+-{
+-    auto commandPool = vsg::CommandPool::create(_device, _queueFamily, VK_COMMAND_POOL_CREATE_TRANSIENT_BIT);
+-    auto fence = vsg::Fence::create(_device);
+-
+-    uint64_t timeout = 1000000000;
+-    vsg::submitCommandsToQueue(commandPool, fence, timeout, _queue, [&](vsg::CommandBuffer& commandBuffer) {
+-        ImGui_ImplVulkan_CreateFontsTexture(commandBuffer);
+-    });
+-
+-    VkResult result = fence->status();
+-    while (result == VK_NOT_READY)
+-    {
+-        result = fence->wait(timeout);
+-    }
+-
+-    if (result != VK_SUCCESS)
+-    {
+-        vsg::error("RenderImGui::_uploadFonts(), fence->state() = ", result);
+-    }
+-
+-    ImGui_ImplVulkan_DestroyFontUploadObjects();
+-}
+-
+ void RenderImGui::accept(vsg::RecordTraversal& rt) const
+ {
+     auto& commandBuffer = *(rt.getState()->_commandBuffer);
diff --git a/external_imported/vcpkg/ports/vsgimgui/vcpkg.json b/external_imported/vcpkg/ports/vsgimgui/vcpkg.json
new file mode 100644
index 000000000..4a13c6725
--- /dev/null
+++ b/external_imported/vcpkg/ports/vsgimgui/vcpkg.json
@@ -0,0 +1,25 @@
+{
+  "name": "vsgimgui",
+  "version": "0.1.0",
+  "description": "Library that integrates VulkanSceneGraph with Dear ImGui & ImPlot.",
+  "homepage": "https://github.com/vsg-dev/vsgImGui",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "imgui",
+      "features": [
+        "vulkan-binding"
+      ]
+    },
+    "implot",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    "vsg"
+  ]
+}
diff --git a/external_imported/vcpkg/ports/vsgxchange/portfile.cmake b/external_imported/vcpkg/ports/vsgxchange/portfile.cmake
new file mode 100644
index 000000000..0c556a19a
--- /dev/null
+++ b/external_imported/vcpkg/ports/vsgxchange/portfile.cmake
@@ -0,0 +1,37 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO vsg-dev/vsgXchange
+    REF "v${VERSION}"
+    SHA512 b2f8c0382dee8d91a31852c29fecd946deb8c3d45dc9a80eb1fb0d7efce8ecefb099bfd2dba4b3171ddd9e7099da41dbf0b72e11ec53bf982aaf9d04afad5104
+    HEAD_REF master
+    PATCHES require-features.patch
+)
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        assimp   VSGXCHANGE_WITH_ASSIMP
+        curl     VSGXCHANGE_WITH_CURL
+        freetype VSGXCHANGE_WITH_FREETYPE
+        gdal     VSGXCHANGE_WITH_GDAL
+        openexr  VSGXCHANGE_WITH_OPENEXR
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS ${FEATURE_OPTIONS}
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME "vsgXchange" CONFIG_PATH "lib/cmake/vsgXchange")
+vcpkg_copy_pdbs()
+
+vcpkg_copy_tools(TOOL_NAMES vsgconv AUTO_CLEAN)
+file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/vsgconvd${VCPKG_TARGET_EXECUTABLE_SUFFIX}")
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+  file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
diff --git a/external_imported/vcpkg/ports/vsgxchange/require-features.patch b/external_imported/vcpkg/ports/vsgxchange/require-features.patch
new file mode 100644
index 000000000..7edc6dc06
--- /dev/null
+++ b/external_imported/vcpkg/ports/vsgxchange/require-features.patch
@@ -0,0 +1,66 @@
+diff --git a/src/assimp/build_vars.cmake b/src/assimp/build_vars.cmake
+index 1e413fc..49d77d4 100644
+--- a/src/assimp/build_vars.cmake
++++ b/src/assimp/build_vars.cmake
+@@ -1,7 +1,6 @@
+ # add assimp if available
+-find_package(assimp 5.1 QUIET)
+-if(NOT assimp_FOUND)
+-find_package(assimp 5.0 QUIET)
++if (VSGXCHANGE_WITH_ASSIMP)
++find_package(assimp REQUIRED)
+ endif()
+ 
+ 
+diff --git a/src/curl/build_vars.cmake b/src/curl/build_vars.cmake
+index 015b68c..a4afc8a 100644
+--- a/src/curl/build_vars.cmake
++++ b/src/curl/build_vars.cmake
+@@ -1,5 +1,7 @@
+ # add CURL if available
+-find_package(CURL)
++if(VSGXCHANGE_WITH_CURL)
++find_package(CURL REQUIRED)
++endif()
+ 
+ if(CURL_FOUND)
+     OPTION(vsgXchange_curl "Optional CURL support provided" ON)
+diff --git a/src/freetype/build_vars.cmake b/src/freetype/build_vars.cmake
+index cb63a8b..327db9e 100644
+--- a/src/freetype/build_vars.cmake
++++ b/src/freetype/build_vars.cmake
+@@ -1,5 +1,7 @@
+ # add freetype if available
+-find_package(Freetype)
++if(VSGXCHANGE_WITH_FREETYPE)
++find_package(Freetype REQUIRED)
++endif()
+ 
+ if(FREETYPE_FOUND)
+     OPTION(vsgXchange_freetype "Freetype support provided" ON)
+diff --git a/src/gdal/build_vars.cmake b/src/gdal/build_vars.cmake
+index dd240b0..227c6b7 100644
+--- a/src/gdal/build_vars.cmake
++++ b/src/gdal/build_vars.cmake
+@@ -1,5 +1,7 @@
+ # add GDAL if available
+-find_package(GDAL QUIET)
++if(VSGXCHANGE_WITH_GDAL)
++find_package(GDAL REQUIRED)
++endif()
+ 
+ if(GDAL_FOUND)
+     OPTION(vsgXchange_GDAL "GDAL support provided" ON)
+diff --git a/src/openexr/build_vars.cmake b/src/openexr/build_vars.cmake
+index c4c880a..3ab27c8 100644
+--- a/src/openexr/build_vars.cmake
++++ b/src/openexr/build_vars.cmake
+@@ -1,5 +1,7 @@
+ # add openexr if available
+-find_package(OpenEXR QUIET)
++if(VSGXCHANGE_WITH_OPENEXR)
++find_package(OpenEXR REQUIRED)
++endif()
+ 
+ if(OpenEXR_FOUND)
+     OPTION(vsgXchange_openexr "Optional OpenEXR support provided" ON)
diff --git a/external_imported/vcpkg/ports/vsgxchange/vcpkg.json b/external_imported/vcpkg/ports/vsgxchange/vcpkg.json
new file mode 100644
index 000000000..a058aeea4
--- /dev/null
+++ b/external_imported/vcpkg/ports/vsgxchange/vcpkg.json
@@ -0,0 +1,51 @@
+{
+  "name": "vsgxchange",
+  "version": "1.0.5",
+  "port-version": 1,
+  "description": "Utility library for converting 3rd party images, models and fonts formats to/from VulkanSceneGraph.",
+  "homepage": "https://github.com/vsg-dev/vsgXchange",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    "vsg"
+  ],
+  "features": {
+    "assimp": {
+      "description": "Enable support for reading 3D model formats as vsg::Node via Assimp",
+      "dependencies": [
+        "assimp"
+      ]
+    },
+    "curl": {
+      "description": "Enable support for reading image and model files from http:// and https://",
+      "dependencies": [
+        "curl"
+      ]
+    },
+    "freetype": {
+      "description": "Enable support for reading fonts as vsg::Font via Freetype",
+      "dependencies": [
+        "freetype"
+      ]
+    },
+    "gdal": {
+      "description": "Enable support for reading geospatial data formats as vsg::Data via GDAL",
+      "dependencies": [
+        "gdal"
+      ]
+    },
+    "openexr": {
+      "description": "Enable support for reading EXR files as vsg::Data",
+      "dependencies": [
+        "openexr"
+      ]
+    }
+  }
+}
diff --git a/external_imported/vcpkg/ports/vtk-dicom/portfile.cmake b/external_imported/vcpkg/ports/vtk-dicom/portfile.cmake
index 9647dfd97..5c701162f 100644
--- a/external_imported/vcpkg/ports/vtk-dicom/portfile.cmake
+++ b/external_imported/vcpkg/ports/vtk-dicom/portfile.cmake
@@ -21,7 +21,10 @@ endif()
 
 set(python_ver "")
 if(NOT VCPKG_TARGET_IS_WINDOWS)
-    set(python_ver 3.10)
+    file(GLOB _py3_include_path "${CURRENT_HOST_INSTALLED_DIR}/include/python3*")
+    string(REGEX MATCH "python3\\.([0-9]+)" _python_version_tmp ${_py3_include_path})
+    set(PYTHON_VERSION_MINOR "${CMAKE_MATCH_1}")
+    set(python_ver "3.${PYTHON_VERSION_MINOR}")
 endif()
 
 vcpkg_cmake_configure(
diff --git a/external_imported/vcpkg/ports/vtk-dicom/vcpkg.json b/external_imported/vcpkg/ports/vtk-dicom/vcpkg.json
index 349438158..b1e6fb6dc 100644
--- a/external_imported/vcpkg/ports/vtk-dicom/vcpkg.json
+++ b/external_imported/vcpkg/ports/vtk-dicom/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "vtk-dicom",
   "version": "0.8.14",
-  "port-version": 1,
+  "port-version": 2,
   "description": "DICOM for VTK",
   "homepage": "https://github.com/dgobbi/vtk-dicom",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/vtk-m/omp.patch b/external_imported/vcpkg/ports/vtk-m/omp.patch
new file mode 100644
index 000000000..062799b22
--- /dev/null
+++ b/external_imported/vcpkg/ports/vtk-m/omp.patch
@@ -0,0 +1,26 @@
+diff --git a/CMake/VTKmDeviceAdapters.cmake b/CMake/VTKmDeviceAdapters.cmake
+index e9ac039..c745604 100644
+--- a/CMake/VTKmDeviceAdapters.cmake
++++ b/CMake/VTKmDeviceAdapters.cmake
+@@ -59,20 +59,14 @@ if(VTKm_ENABLE_OPENMP AND NOT TARGET vtkm::openmp)
+   find_package(OpenMP 4.0 REQUIRED COMPONENTS CXX QUIET)
+ 
+   add_library(vtkm::openmp INTERFACE IMPORTED GLOBAL)
++  target_link_libraries(vtkm::openmp INTERFACE OpenMP::OpenMP_CXX)
+   if(OpenMP_CXX_FLAGS)
+-    set_property(TARGET vtkm::openmp
+-      APPEND PROPERTY INTERFACE_COMPILE_OPTIONS $<$<COMPILE_LANGUAGE:CXX>:${OpenMP_CXX_FLAGS}>)
+-
+     if(VTKm_ENABLE_CUDA)
+       string(REPLACE ";" "," openmp_cuda_flags "-Xcompiler=${OpenMP_CXX_FLAGS}")
+       set_property(TARGET vtkm::openmp
+         APPEND PROPERTY INTERFACE_COMPILE_OPTIONS $<$<COMPILE_LANGUAGE:CUDA>:${openmp_cuda_flags}>)
+     endif()
+   endif()
+-  if(OpenMP_CXX_LIBRARIES)
+-    set_target_properties(vtkm::openmp PROPERTIES
+-      INTERFACE_LINK_LIBRARIES "${OpenMP_CXX_LIBRARIES}")
+-  endif()
+ endif()
+ 
+ if(VTKm_ENABLE_CUDA)
diff --git a/external_imported/vcpkg/ports/vtk-m/portfile.cmake b/external_imported/vcpkg/ports/vtk-m/portfile.cmake
index 17bb5ee98..31f9c5c13 100644
--- a/external_imported/vcpkg/ports/vtk-m/portfile.cmake
+++ b/external_imported/vcpkg/ports/vtk-m/portfile.cmake
@@ -42,7 +42,10 @@ vcpkg_from_gitlab(GITLAB_URL "https://gitlab.kitware.com"
                   REPO vtk/vtk-m 
                   REF 902fdac6fafb6358ce88f8747d55e2c0715241f1 # v1.9.0 Upgrading will most likly brake the VTK build
                   SHA512 f83872495ed3dbcea372776c4439a7d224568d144ff602c188fae120026778b1bee681c9e9535cc693e870cbc08ca9896af2bc954935c289f6b9a24f2471a50b
-                  FILE_DISAMBIGUATOR 1)
+                  FILE_DISAMBIGUATOR 1
+                  PATCHES
+                    omp.patch
+)
 vcpkg_cmake_configure(
   SOURCE_PATH "${SOURCE_PATH}"
   OPTIONS ${OPTIONS}
diff --git a/external_imported/vcpkg/ports/vtk-m/vcpkg.json b/external_imported/vcpkg/ports/vtk-m/vcpkg.json
index a1d97fecd..b50aa164b 100644
--- a/external_imported/vcpkg/ports/vtk-m/vcpkg.json
+++ b/external_imported/vcpkg/ports/vtk-m/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "vtk-m",
   "version": "1.9.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "VTK-m is a toolkit of scientific visualization algorithms for emerging processor architectures.",
   "homepage": "https://gitlab.kitware.com/vtk/vtk-m/",
   "license": null,
diff --git a/external_imported/vcpkg/ports/vtk/Findproj.patch b/external_imported/vcpkg/ports/vtk/Findproj.patch
deleted file mode 100644
index f5e106835..000000000
--- a/external_imported/vcpkg/ports/vtk/Findproj.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/CMake/FindLibPROJ.cmake b/CMake/FindLibPROJ.cmake
-index 6f607d4..86c85a9 100644
---- a/CMake/FindLibPROJ.cmake
-+++ b/CMake/FindLibPROJ.cmake
-@@ -1,5 +1,5 @@
- find_path(LibPROJ_INCLUDE_DIR
--  NAMES proj_api.h proj.h
-+  NAMES proj.h
-   DOC "libproj include directories")
- mark_as_advanced(LibPROJ_INCLUDE_DIR)
- 
-@@ -9,7 +9,7 @@ find_library(LibPROJ_LIBRARY_RELEASE
- mark_as_advanced(LibPROJ_LIBRARY_RELEASE)
- 
- find_library(LibPROJ_LIBRARY_DEBUG
--  NAMES projd
-+  NAMES projd proj_d proj NAMES_PER_DIR
-   DOC "libproj debug library")
- mark_as_advanced(LibPROJ_LIBRARY_DEBUG)
- 
diff --git a/external_imported/vcpkg/ports/vtk/libproj.patch b/external_imported/vcpkg/ports/vtk/libproj.patch
new file mode 100644
index 000000000..28ecfe905
--- /dev/null
+++ b/external_imported/vcpkg/ports/vtk/libproj.patch
@@ -0,0 +1,20 @@
+diff --git a/ThirdParty/libproj/CMakeLists.txt b/ThirdParty/libproj/CMakeLists.txt
+index f8888876..d57c4c18 100644
+--- a/ThirdParty/libproj/CMakeLists.txt
++++ b/ThirdParty/libproj/CMakeLists.txt
+@@ -4,10 +4,12 @@ vtk_module_third_party(
+     VERSION       "8.1.0"
+     STANDARD_INCLUDE_DIRS
+   EXTERNAL
+-    PACKAGE LibPROJ
+-    TARGETS LibPROJ::LibPROJ
+-    USE_VARIABLES LibPROJ_MAJOR_VERSION
++    PACKAGE PROJ
++    CONFIG_MODE
++    TARGETS PROJ::proj
++    USE_VARIABLES PROJ_VERSION_MAJOR
+     STANDARD_INCLUDE_DIRS)
++set(LibPROJ_MAJOR_VERSION "${PROJ_VERSION_MAJOR}")
+ 
+ if (NOT VTK_MODULE_USE_EXTERNAL_VTK_libproj)
+   set(LibPROJ_MAJOR_VERSION "8")
diff --git a/external_imported/vcpkg/ports/vtk/missing-include-fixes.patch b/external_imported/vcpkg/ports/vtk/missing-include-fixes.patch
new file mode 100644
index 000000000..e6f49cab9
--- /dev/null
+++ b/external_imported/vcpkg/ports/vtk/missing-include-fixes.patch
@@ -0,0 +1,40 @@
+diff --git a/IO/Image/vtkSEPReader.cxx b/IO/Image/vtkSEPReader.cxx
+index 2b15bc249e..cec84d1712 100644
+--- a/IO/Image/vtkSEPReader.cxx
++++ b/IO/Image/vtkSEPReader.cxx
+@@ -34,7 +34,6 @@
+ #include <vtksys/SystemTools.hxx>
+ 
+ #include <algorithm>
+-#include <cstdint>
+ 
+ namespace details
+ {
+diff --git a/IO/Image/vtkSEPReader.h b/IO/Image/vtkSEPReader.h
+index 83d127a41e..bdb33a258b 100644
+--- a/IO/Image/vtkSEPReader.h
++++ b/IO/Image/vtkSEPReader.h
+@@ -25,8 +25,9 @@
+ #include "vtkImageAlgorithm.h"
+ #include "vtkNew.h" // for ivars
+ 
+-#include <array>  // for std::array
+-#include <string> // for std::string
++#include <array>   // for std::array
++#include <cstdint> // for std::uint8_t
++#include <string>  // for std::string
+ 
+ namespace details
+ {
+diff --git a/ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp b/ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp
+index 6267684218..cf19b83af4 100644
+--- a/ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp
++++ b/ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp
+@@ -31,6 +31,7 @@
+ 
+ /*! @cond Doxygen_Suppress */
+ 
++#include <cstdint>
+ #include <vector>
+ #include <string>
+ 
diff --git a/external_imported/vcpkg/ports/vtk/portfile.cmake b/external_imported/vcpkg/ports/vtk/portfile.cmake
index 9f9308915..f33e09d50 100644
--- a/external_imported/vcpkg/ports/vtk/portfile.cmake
+++ b/external_imported/vcpkg/ports/vtk/portfile.cmake
@@ -7,11 +7,25 @@ set(VCPKG_POLICY_SKIP_ABSOLUTE_PATHS_CHECK enabled)
 
 vcpkg_download_distfile(
     STRING_PATCH
-    URLS https://gitlab.kitware.com/vtk/vtk/-/commit/bfa3e4c7621ddf5826755536eb07284c86db6474.diff
+    URLS https://gitlab.kitware.com/vtk/vtk/-/commit/bfa3e4c7621ddf5826755536eb07284c86db6474.diff?full_index=1
     FILENAME vtk-string-bfa3e4.diff
     SHA512 c5ccb1193e4e61cf78b63802f87ffb09349c5566ad8a4d51418133953f7acd6b4a206f8d41a426a9eb9be3cf1fd95242e6402973252d7979e5a9cb5e5e480d78
 )
 
+vcpkg_download_distfile(
+    MPI4PY_PATCH_1
+    URLS https://gitlab.kitware.com/vtk/vtk/-/commit/c938d30634a284fad026f6ae25c30bc84cadc07e.diff?full_index=1
+    FILENAME vtk-mpi4py-update-part1-c938d3.diff
+    SHA512 5704c1dd124075bd8f37b0734c5cebd48b470902c74bc23774fd4b69025dbc6bfddf48b7c4511520ed07f03bd666a444d6390569f02a0ab68b5d966ddde3a989
+)
+
+vcpkg_download_distfile(
+    MPI4PY_PATCH_2
+    URLS https://gitlab.kitware.com/vtk/vtk/-/commit/53e6ce92ae4591552e7e00344d69803117d56bfe.diff?full_index=1
+    FILENAME vtk-mpi4py-update-part2-53e6ce.diff
+    SHA512 794a25bff6168fda94d920a6837c3a690bd6d79284ec34dcd67666c55de78962cc7b73c0f074ce58ed78198bb149eab6bf59b2822f29cbfa792e2fe667c9327c
+)
+
 # =============================================================================
 # Clone & patch
 vcpkg_from_github(
@@ -23,7 +37,7 @@ vcpkg_from_github(
     PATCHES
         FindLZMA.patch
         FindLZ4.patch
-        Findproj.patch
+        libproj.patch
         pegtl.patch
         pythonwrapper.patch # Required by ParaView to Wrap required classes
         NoUndefDebug.patch # Required to link against correct Python library depending on build type.
@@ -38,8 +52,11 @@ vcpkg_from_github(
         vtkioss.patch
         jsoncpp.patch
         iotr.patch
-        ${STRING_PATCH}
+        "${STRING_PATCH}"
+        "${MPI4PY_PATCH_1}"
+        "${MPI4PY_PATCH_2}"
         9690.diff
+        missing-include-fixes.patch
 )
 
 # =============================================================================
@@ -47,6 +64,11 @@ vcpkg_from_github(
 file(COPY "${CURRENT_PORT_DIR}/FindHDF5.cmake" DESTINATION "${SOURCE_PATH}/CMake/patches/99") # due to usage of targets in netcdf-c
 # =============================================================================
 
+if(HDF5_WITH_PARALLEL AND NOT "mpi" IN_LIST FEATURES)
+    message(WARNING "${HDF5_WITH_PARALLEL} Enabling MPI in vtk.")
+    list(APPEND FEATURES "mpi")
+endif()
+
 # =============================================================================
 # Options:
 # Collect CMake options for optional components
@@ -124,7 +146,10 @@ endif()
 if("python" IN_LIST FEATURES)
     set(python_ver "")
     if(NOT VCPKG_TARGET_IS_WINDOWS)
-        set(python_ver 3.10)
+        file(GLOB _py3_include_path "${CURRENT_HOST_INSTALLED_DIR}/include/python3*")
+        string(REGEX MATCH "python3\\.([0-9]+)" _python_version_tmp ${_py3_include_path})
+        set(PYTHON_VERSION_MINOR "${CMAKE_MATCH_1}")
+        set(python_ver "3.${PYTHON_VERSION_MINOR}")
     endif()
     list(APPEND ADDITIONAL_OPTIONS
         -DVTK_WRAP_PYTHON=ON
diff --git a/external_imported/vcpkg/ports/vtk/vcpkg.json b/external_imported/vcpkg/ports/vtk/vcpkg.json
index a28fca9ae..79cec81ca 100644
--- a/external_imported/vcpkg/ports/vtk/vcpkg.json
+++ b/external_imported/vcpkg/ports/vtk/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "vtk",
   "version-semver": "9.2.0-pv5.11.0",
-  "port-version": 5,
+  "port-version": 10,
   "description": "Software system for 3D computer graphics, image processing, and visualization",
   "homepage": "https://github.com/Kitware/VTK",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/vulkan-headers/portfile.cmake b/external_imported/vcpkg/ports/vulkan-headers/portfile.cmake
index 750301bf2..ac57bd239 100644
--- a/external_imported/vcpkg/ports/vulkan-headers/portfile.cmake
+++ b/external_imported/vcpkg/ports/vulkan-headers/portfile.cmake
@@ -1,16 +1,15 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KhronosGroup/Vulkan-Headers
-    REF 2bb0a23104ceffd9a28d5b7401f2cee7dae35bb8
-    SHA512 06eaf7cddf2d8c9487244f3c3adee0a2ebed7f8d53a34409cc19d91847e9b5110cbd9af6b71379ae3e4c310db341cff38fc6978af713aa000e6789f1afec4b03
-    HEAD_REF v1.3.239
+    REF "vulkan-sdk-${VERSION}"
+    SHA512 e4ceb5d5d4e66bb683fb1c4ce97edeb559f833d391b75e1b095ee0eabb96e4bebb964d37f57719ac14f95657d4e39282b8450add5f4ee325f45c3a257d99ea39
+    HEAD_REF main
 )
 
 set(VCPKG_BUILD_TYPE release) # header-only port
 
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-)
+vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}")
 vcpkg_cmake_install()
 
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/vulkan-headers/usage b/external_imported/vcpkg/ports/vulkan-headers/usage
new file mode 100644
index 000000000..5b461a6d4
--- /dev/null
+++ b/external_imported/vcpkg/ports/vulkan-headers/usage
@@ -0,0 +1,4 @@
+Vulkan-Headers provides official find_package support:
+
+    find_package(VulkanHeaders CONFIG)
+    target_link_libraries(main PRIVATE Vulkan::Headers)
diff --git a/external_imported/vcpkg/ports/vulkan-headers/vcpkg.json b/external_imported/vcpkg/ports/vulkan-headers/vcpkg.json
index 83f560a77..2fece51b6 100644
--- a/external_imported/vcpkg/ports/vulkan-headers/vcpkg.json
+++ b/external_imported/vcpkg/ports/vulkan-headers/vcpkg.json
@@ -1,10 +1,9 @@
 {
   "name": "vulkan-headers",
-  "version": "1.3.239",
-  "port-version": 2,
+  "version": "1.3.275.0",
   "description": "Vulkan header files and API registry",
   "homepage": "https://github.com/KhronosGroup/Vulkan-Headers",
-  "license": "Apache-2.0",
+  "license": "Apache-2.0 OR MIT",
   "supports": "!uwp & !xbox",
   "dependencies": [
     {
diff --git a/external_imported/vcpkg/ports/vulkan-hpp/portfile.cmake b/external_imported/vcpkg/ports/vulkan-hpp/portfile.cmake
index 8f92fcf2b..489a79565 100644
--- a/external_imported/vcpkg/ports/vulkan-hpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/vulkan-hpp/portfile.cmake
@@ -1,14 +1,2 @@
-# header-only library
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO KhronosGroup/Vulkan-Hpp
-    REF ef609a2f77dd1756e672712f264e76b64acdba61 #v1.3.231
-    SHA512 071cf0d321475a55ecb6eed5874a316daac64a62265f05566c112317ae19cc569e7dfb14ceb9e5c6716a004e2cc621c167d0ffe30faf506096f362c1ed55fafd
-    HEAD_REF master
-)
-
-file(COPY "${SOURCE_PATH}/vulkan/vulkan.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vulkan")
-
-# Handle copyright
-configure_file("${SOURCE_PATH}/LICENSE.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/vulkan-hpp/usage b/external_imported/vcpkg/ports/vulkan-hpp/usage
new file mode 100644
index 000000000..b5a5e3071
--- /dev/null
+++ b/external_imported/vcpkg/ports/vulkan-hpp/usage
@@ -0,0 +1,5 @@
+vulkan-hpp is deprecated. Please use port vulkan-headers instead.
+vulkan-hpp can be used with CMake:
+
+    find_package(VulkanHeaders CONFIG)
+    target_link_libraries(main PRIVATE Vulkan::Headers)
diff --git a/external_imported/vcpkg/ports/vulkan-hpp/vcpkg.json b/external_imported/vcpkg/ports/vulkan-hpp/vcpkg.json
index c00a35303..1a159af9a 100644
--- a/external_imported/vcpkg/ports/vulkan-hpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/vulkan-hpp/vcpkg.json
@@ -1,11 +1,10 @@
 {
   "name": "vulkan-hpp",
-  "version": "1.3.231",
-  "port-version": 2,
-  "description": "Header only C++ bindings for the Vulkan C API",
-  "license": "Apache-2.0",
+  "version-string": "deprecated",
+  "description": "[deprecated] Header only C++ bindings for the Vulkan C API",
+  "license": null,
   "supports": "!uwp & !xbox",
   "dependencies": [
-    "vulkan"
+    "vulkan-headers"
   ]
 }
diff --git a/external_imported/vcpkg/ports/vulkan-loader/portfile.cmake b/external_imported/vcpkg/ports/vulkan-loader/portfile.cmake
new file mode 100644
index 000000000..d84a0ed75
--- /dev/null
+++ b/external_imported/vcpkg/ports/vulkan-loader/portfile.cmake
@@ -0,0 +1,24 @@
+set(VCPKG_LIBRARY_LINKAGE dynamic)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO KhronosGroup/Vulkan-Loader
+    REF "vulkan-sdk-${VERSION}"
+    SHA512 965bfeb238d088f80d36a3a5711be5de48c7c8547710bc0b0888ff36e5b36d37eb540c02e7aec04e4bf21129cfccd2e31e700010c7caecfd35403ba8e619beee
+    HEAD_REF main
+)
+
+vcpkg_cmake_configure(
+  SOURCE_PATH "${SOURCE_PATH}"
+  OPTIONS
+    -DBUILD_TESTS:BOOL=OFF
+)
+vcpkg_cmake_install()
+vcpkg_fixup_pkgconfig()
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/VulkanLoader" PACKAGE_NAME VulkanLoader)
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
+
+set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
+
+configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY)
diff --git a/external_imported/vcpkg/ports/vulkan-loader/usage b/external_imported/vcpkg/ports/vulkan-loader/usage
new file mode 100644
index 000000000..a260c301a
--- /dev/null
+++ b/external_imported/vcpkg/ports/vulkan-loader/usage
@@ -0,0 +1,2 @@
+The package @PORT@ provides the vulkan loader.
+Please be aware of https://github.com/KhronosGroup/Vulkan-Loader/blob/main/docs/LoaderApplicationInterface.md#bundling-the-loader-with-an-application
diff --git a/external_imported/vcpkg/ports/vulkan-loader/vcpkg.json b/external_imported/vcpkg/ports/vulkan-loader/vcpkg.json
new file mode 100644
index 000000000..e5ee630eb
--- /dev/null
+++ b/external_imported/vcpkg/ports/vulkan-loader/vcpkg.json
@@ -0,0 +1,19 @@
+{
+  "name": "vulkan-loader",
+  "version": "1.3.275.0",
+  "description": "Vulkan Development Tools",
+  "homepage": "https://github.com/KhronosGroup/Vulkan-Loader",
+  "license": null,
+  "supports": "!android",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    "vulkan-headers"
+  ]
+}
diff --git a/external_imported/vcpkg/ports/vulkan-memory-allocator-hpp/portfile.cmake b/external_imported/vcpkg/ports/vulkan-memory-allocator-hpp/portfile.cmake
index 388e9af56..72b5d54ef 100644
--- a/external_imported/vcpkg/ports/vulkan-memory-allocator-hpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/vulkan-memory-allocator-hpp/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO YaaZ/VulkanMemoryAllocator-Hpp
-    REF v3.0.1
-    SHA512 0631319ec892161acb85903ddeecf0b18ff6772fdb44b46c756f6c148d150ea0850f7a35f105a04e9b23baf6ea5aa9bb373e04c7be598f1caa23c22cacf4ee00
+    REF "v3.0.1-1"
+    SHA512 71709a889ea4527c2ee273521fe62b61bb87cda3e3c3ae2964cc18bd70ac69629aeed00b1e92d4470ba6cb08394813880018401847a6d4ed5c15e4ee1fb60ff1
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/vulkan-memory-allocator-hpp/vcpkg.json b/external_imported/vcpkg/ports/vulkan-memory-allocator-hpp/vcpkg.json
index e1f34a376..8b04a6cb3 100644
--- a/external_imported/vcpkg/ports/vulkan-memory-allocator-hpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/vulkan-memory-allocator-hpp/vcpkg.json
@@ -1,12 +1,12 @@
 {
   "name": "vulkan-memory-allocator-hpp",
-  "version": "3.0.1",
-  "port-version": 1,
-  "description": "C++ bindings for VulkanMemoryAllocator",
+  "version": "3.0.1.1",
+  "description": "C++ bindings for VulkanMemoryAllocator (Development branch)",
   "homepage": "https://github.com/YaaZ/VulkanMemoryAllocator-Hpp",
   "license": "CC0-1.0",
   "supports": "!uwp & !xbox",
   "dependencies": [
-    "vulkan"
+    "vulkan",
+    "vulkan-memory-allocator"
   ]
 }
diff --git a/external_imported/vcpkg/ports/vulkan-memory-allocator/portfile.cmake b/external_imported/vcpkg/ports/vulkan-memory-allocator/portfile.cmake
index c64df48a7..93b1ecb57 100644
--- a/external_imported/vcpkg/ports/vulkan-memory-allocator/portfile.cmake
+++ b/external_imported/vcpkg/ports/vulkan-memory-allocator/portfile.cmake
@@ -1,13 +1,22 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator
-    REF a6bfc237255a6bac1513f7c1ebde6d8aed6b5191 #v3.0.1
-    SHA512  14361ff201fd660c22b60de54c648ff20a2e2a7f65105f66853a9a4dbffbeca2ae42098dcb1528bb4e524639b92fa4ff27ebd3940c42ccfaf7c99c08bdd0d8ce
+    REF 2a28bc4b39b9b80dad909036442f629f570d7ae1
+    SHA512 cd83efc357171a5fd1ac65a566d1bf828f7de2b4c97adec92aaaf9cdfedf5a5525de3bd6eb84c453d1cd952c10c3542e6502ad4307a55b61690ce92b80dc4e2f
     HEAD_REF master
 )
 
-file(COPY "${SOURCE_PATH}/include/vk_mem_alloc.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+set(opts "")
+if(VCPKG_TARGET_IS_WINDOWS)
+  set(opts "-DCMAKE_INSTALL_INCLUDEDIR=include/vma") # Vulkan SDK layout!
+endif()
 
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/unofficial-vulkan-memory-allocator-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-vulkan-memory-allocator")
+set(VCPKG_BUILD_TYPE release) # header-only port
+vcpkg_cmake_configure(
+  SOURCE_PATH "${SOURCE_PATH}"
+  OPTIONS ${opts}
 
-configure_file("${SOURCE_PATH}/LICENSE.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
+)
+vcpkg_cmake_install()
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/vulkan-memory-allocator/unofficial-vulkan-memory-allocator-config.cmake b/external_imported/vcpkg/ports/vulkan-memory-allocator/unofficial-vulkan-memory-allocator-config.cmake
deleted file mode 100644
index fc9f62550..000000000
--- a/external_imported/vcpkg/ports/vulkan-memory-allocator/unofficial-vulkan-memory-allocator-config.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-
-get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
-get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
-get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
-
-add_library(unofficial::vulkan-memory-allocator::vulkan-memory-allocator INTERFACE IMPORTED)
-set_target_properties(unofficial::vulkan-memory-allocator::vulkan-memory-allocator PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include")
-set(_IMPORT_PREFIX)
diff --git a/external_imported/vcpkg/ports/vulkan-memory-allocator/usage b/external_imported/vcpkg/ports/vulkan-memory-allocator/usage
new file mode 100644
index 000000000..ac6bca634
--- /dev/null
+++ b/external_imported/vcpkg/ports/vulkan-memory-allocator/usage
@@ -0,0 +1,19 @@
+VulkanMemoryAllocator provides official find_package support. However, it requires the user to provide the include directory containing `vulkan/vulkan.h`. There are multiple ways to achieve this and VulkanMemoryAllocator is compatible with all of them.
+
+    find_package(Vulkan) # https://cmake.org/cmake/help/latest/module/FindVulkan.html, CMake 3.21+
+    find_package(VulkanMemoryAllocator CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE Vulkan::Vulkan GPUOpen::VulkanMemoryAllocator)
+
+or
+
+    find_package(Vulkan) # CMake 3.21+
+    find_package(VulkanMemoryAllocator CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE Vulkan::Headers GPUOpen::VulkanMemoryAllocator)
+
+or
+
+    find_package(VulkanHeaders CONFIG) # From the vulkan-headers port
+    find_package(VulkanMemoryAllocator CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE Vulkan::Headers GPUOpen::VulkanMemoryAllocator)
+
+See the documentation for more information on setting up your project: https://gpuopen-librariesandsdks.github.io/VulkanMemoryAllocator/html/index.html
diff --git a/external_imported/vcpkg/ports/vulkan-memory-allocator/vcpkg.json b/external_imported/vcpkg/ports/vulkan-memory-allocator/vcpkg.json
index ec3a72574..6aed8f35f 100644
--- a/external_imported/vcpkg/ports/vulkan-memory-allocator/vcpkg.json
+++ b/external_imported/vcpkg/ports/vulkan-memory-allocator/vcpkg.json
@@ -1,9 +1,19 @@
 {
   "name": "vulkan-memory-allocator",
   "version": "3.0.1",
-  "port-version": 1,
+  "port-version": 4,
   "description": "Easy to integrate Vulkan memory allocation library from GPUOpen",
   "homepage": "https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator",
   "license": "MIT",
-  "supports": "!uwp & !xbox"
+  "supports": "!uwp & !xbox",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/vulkan/LICENSE.txt b/external_imported/vcpkg/ports/vulkan-sdk-components/LICENSE.txt
similarity index 100%
rename from external_imported/vcpkg/ports/vulkan/LICENSE.txt
rename to external_imported/vcpkg/ports/vulkan-sdk-components/LICENSE.txt
diff --git a/external_imported/vcpkg/ports/vulkan-sdk-components/portfile.cmake b/external_imported/vcpkg/ports/vulkan-sdk-components/portfile.cmake
new file mode 100644
index 000000000..58168e253
--- /dev/null
+++ b/external_imported/vcpkg/ports/vulkan-sdk-components/portfile.cmake
@@ -0,0 +1,26 @@
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+
+set(components COMPONENTS glslang)
+if(VCPKG_TARGET_IS_WINDOWS)
+    list(APPEND components dxc)
+endif()
+
+set(vulkan_result_file "${CURRENT_BUILDTREES_DIR}/vulkan-${TARGET_TRIPLET}.cmake.log")
+vcpkg_cmake_configure(
+    SOURCE_PATH "${CURRENT_INSTALLED_DIR}/share/vulkan/detect-vulkan"
+    OPTIONS
+        "-DVCPKG_VULKAN_VERSION=${VERSION}"
+        "-DVCPKG_VULKAN_COMPONENTS=${components}"
+    OPTIONS_RELEASE
+        "-DOUTFILE=${vulkan_result_file}"
+)
+
+include("${vulkan_result_file}")
+if(NOT DETECTED_Vulkan_FOUND)
+    message(FATAL_ERROR "The Vulkan SDK wasn't found.")
+endif()
+
+find_file(vulkan_license NAMES LICENSE.txt PATHS ${DETECTED_Vulkan_INCLUDE_DIRS} "${CURRENT_PORT_DIR}" PATH_SUFFIXES "..")
+vcpkg_install_copyright(FILE_LIST "${vulkan_license}")
+
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/vulkan-sdk-components/usage b/external_imported/vcpkg/ports/vulkan-sdk-components/usage
new file mode 100644
index 000000000..436a83136
--- /dev/null
+++ b/external_imported/vcpkg/ports/vulkan-sdk-components/usage
@@ -0,0 +1,12 @@
+vulkan-sdk-components is compatible with built-in CMake targets:
+
+    # https://cmake.org/cmake/help/latest/module/FindVulkan.html
+    find_package(Vulkan REQUIRED)
+    # SPIR-V generator library
+    target_link_libraries(main PRIVATE Vulkan::glslang)
+    # DirectX Shader Compiler
+    target_link_libraries(main PRIVATE Vulkan::dxc)
+
+The vulkan-sdk-components package does not provide direct Visual Studio
+integration. For manual integration, add $(VULKAN_SDK)/include to your
+include path.
diff --git a/external_imported/vcpkg/ports/vulkan-sdk-components/vcpkg.json b/external_imported/vcpkg/ports/vulkan-sdk-components/vcpkg.json
new file mode 100644
index 000000000..c89419d5c
--- /dev/null
+++ b/external_imported/vcpkg/ports/vulkan-sdk-components/vcpkg.json
@@ -0,0 +1,47 @@
+{
+  "$comment": "Dependencies extracted from e.g. https://sdk.lunarg.com/sdk/download/1.3.268.0/windows/config.json",
+  "name": "vulkan-sdk-components",
+  "version": "1.3.275.0",
+  "description": "Installs packages which are part of the Vulkan SDK.",
+  "license": null,
+  "supports": "!uwp & !xbox",
+  "dependencies": [
+    {
+      "name": "directx-dxc",
+      "platform": "windows"
+    },
+    "glm",
+    "glslang",
+    "jsoncpp",
+    {
+      "name": "mimalloc",
+      "platform": "windows"
+    },
+    "robin-hood-hashing",
+    "sdl2",
+    "shaderc",
+    "spirv-cross",
+    "spirv-headers",
+    "valijson",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    "volk",
+    "vulkan",
+    "vulkan-memory-allocator",
+    "vulkan-utility-libraries",
+    "vulkan-validationlayers"
+  ],
+  "features": {
+    "tools": {
+      "description": "Build Vulkan related tools",
+      "dependencies": [
+        "lunarg-vulkantools",
+        "spirv-reflect",
+        "spirv-tools",
+        "vulkan-tools"
+      ]
+    }
+  }
+}
diff --git a/external_imported/vcpkg/ports/vulkan-tools/fix-parallel-config.patch b/external_imported/vcpkg/ports/vulkan-tools/fix-parallel-config.patch
new file mode 100644
index 000000000..04cf16d48
--- /dev/null
+++ b/external_imported/vcpkg/ports/vulkan-tools/fix-parallel-config.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d770ca57..00c49887 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -144,7 +144,7 @@ if(BUILD_ICD)
+     add_subdirectory(icd)
+ endif()
+ 
+-add_subdirectory(windows-runtime-installer)
++#add_subdirectory(windows-runtime-installer)
+ 
+ option(BUILD_TESTS "Build the tests")
+ if(BUILD_TESTS)
diff --git a/external_imported/vcpkg/ports/vulkan-tools/portfile.cmake b/external_imported/vcpkg/ports/vulkan-tools/portfile.cmake
new file mode 100644
index 000000000..b37c25726
--- /dev/null
+++ b/external_imported/vcpkg/ports/vulkan-tools/portfile.cmake
@@ -0,0 +1,34 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO KhronosGroup/Vulkan-Tools
+    REF "vulkan-sdk-${VERSION}"
+    SHA512 5d70498341b8d2447128cd5ab3fd081b706830f5f85d9f7e752dfca9c74fa4c1567207eef6e34e9bf99ff65ec2855b835eb30362fd544e1cf61ecc7a7119df06
+    HEAD_REF main
+    PATCHES
+        fix-parallel-config.patch
+)
+
+if(NOT VCPKG_TARGET_IS_ANDROID)
+    set(VCPKG_BUILD_TYPE release) # only builds tools
+endif()
+
+vcpkg_cmake_configure(
+  SOURCE_PATH "${SOURCE_PATH}"
+  OPTIONS
+    -DBUILD_TESTS:BOOL=OFF
+)
+vcpkg_cmake_install()
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
+
+set(tools vulkaninfo)
+if(NOT VCPKG_TARGET_IS_ANDROID)
+    list(APPEND tools vkcube vkcubepp)
+endif()
+vcpkg_copy_tools(TOOL_NAMES ${tools} AUTO_CLEAN)
+
+set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
+
+if(NOT VCPKG_TARGET_IS_ANDROID)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+endif()
diff --git a/external_imported/vcpkg/ports/vulkan-tools/vcpkg.json b/external_imported/vcpkg/ports/vulkan-tools/vcpkg.json
new file mode 100644
index 000000000..bc165f2bc
--- /dev/null
+++ b/external_imported/vcpkg/ports/vulkan-tools/vcpkg.json
@@ -0,0 +1,20 @@
+{
+  "name": "vulkan-tools",
+  "version": "1.3.275.0",
+  "description": "Vulkan Development Tools",
+  "homepage": "https://github.com/KhronosGroup/Vulkan-Tools",
+  "license": "Apache-2.0",
+  "supports": "!osx",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    "volk",
+    "vulkan-headers"
+  ]
+}
diff --git a/external_imported/vcpkg/ports/vulkan-utility-libraries/portfile.cmake b/external_imported/vcpkg/ports/vulkan-utility-libraries/portfile.cmake
new file mode 100644
index 000000000..51d3442d4
--- /dev/null
+++ b/external_imported/vcpkg/ports/vulkan-utility-libraries/portfile.cmake
@@ -0,0 +1,24 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO KhronosGroup/Vulkan-Utility-Libraries
+    REF "vulkan-sdk-${VERSION}"
+    SHA512 113be0cc1b7c3f7cce8c8cfe2459ed36e5b906e55b34f03ce1c211889a9a5a9539d2fa608919e8506e372c3bca521a23cdd1c20d4834e7914696dce33a95fc71
+    HEAD_REF main
+)
+
+vcpkg_cmake_configure(
+  SOURCE_PATH "${SOURCE_PATH}"
+  OPTIONS
+    -DBUILD_TESTS:BOOL=OFF
+)
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/VulkanUtilityLibraries PACKAGE_NAME VulkanUtilityLibraries)
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/VulkanUtilityLibraries/VulkanUtilityLibrariesConfig.cmake"
+    [[${PACKAGE_PREFIX_DIR}/lib/cmake/VulkanUtilityLibraries/VulkanUtilityLibraries-targets.cmake]]
+    [[${CMAKE_CURRENT_LIST_DIR}/VulkanUtilityLibraries-targets.cmake]]
+)
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/external_imported/vcpkg/ports/vulkan-utility-libraries/vcpkg.json b/external_imported/vcpkg/ports/vulkan-utility-libraries/vcpkg.json
new file mode 100644
index 000000000..1a0554c49
--- /dev/null
+++ b/external_imported/vcpkg/ports/vulkan-utility-libraries/vcpkg.json
@@ -0,0 +1,19 @@
+{
+  "name": "vulkan-utility-libraries",
+  "version": "1.3.275.0",
+  "port-version": 1,
+  "description": "Utility libraries for Vulkan developers",
+  "homepage": "https://github.com/KhronosGroup/Vulkan-Utility-Libraries",
+  "license": null,
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    "vulkan-headers"
+  ]
+}
diff --git a/external_imported/vcpkg/ports/vulkan-validationlayers/portfile.cmake b/external_imported/vcpkg/ports/vulkan-validationlayers/portfile.cmake
new file mode 100644
index 000000000..0e877d290
--- /dev/null
+++ b/external_imported/vcpkg/ports/vulkan-validationlayers/portfile.cmake
@@ -0,0 +1,33 @@
+set(VCPKG_LIBRARY_LINKAGE dynamic)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO KhronosGroup/Vulkan-ValidationLayers
+    REF "vulkan-sdk-${VERSION}"
+    SHA512 755bdde7e7129b7a3ed06a4bebdaf11212288802119e0dc224aab63491de30c9b1c25972bdafd4fedbfea43bf6c29cdbc409374e57fbf0331798530a8ae94a70
+    HEAD_REF main
+)
+
+vcpkg_find_acquire_program(PYTHON3)
+get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
+vcpkg_add_to_path("${PYTHON3_DIR}")
+
+vcpkg_cmake_configure(
+  SOURCE_PATH "${SOURCE_PATH}"
+  OPTIONS
+    -DBUILD_TESTS:BOOL=OFF
+)
+vcpkg_cmake_install()
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
+
+set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled)
+set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+set(layer_path "<vcpkg_installed>/bin")
+if(NOT VCPKG_TARGET_IS_WINDOWS)
+ set(layer_path "<vcpkg_installed>/share/vulkan/explicit_layer.d")
+endif()
+configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY)
diff --git a/external_imported/vcpkg/ports/vulkan-validationlayers/usage b/external_imported/vcpkg/ports/vulkan-validationlayers/usage
new file mode 100644
index 000000000..d74b33490
--- /dev/null
+++ b/external_imported/vcpkg/ports/vulkan-validationlayers/usage
@@ -0,0 +1,2 @@
+The package @PORT@ provides the vulkan validationlayers.
+To make vulkan use them you have to manually add the vcpkg path "@layer_path@" to the environment variable VK_ADD_LAYER_PATH.
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/vulkan-validationlayers/vcpkg.json b/external_imported/vcpkg/ports/vulkan-validationlayers/vcpkg.json
new file mode 100644
index 000000000..336c39081
--- /dev/null
+++ b/external_imported/vcpkg/ports/vulkan-validationlayers/vcpkg.json
@@ -0,0 +1,25 @@
+{
+  "name": "vulkan-validationlayers",
+  "version": "1.3.275.0",
+  "description": "Vulkan Validation Layers (VVL)",
+  "homepage": "https://github.com/KhronosGroup/Vulkan-ValidationLayers",
+  "license": null,
+  "dependencies": [
+    "mimalloc",
+    "robin-hood-hashing",
+    "spirv-cross",
+    "spirv-headers",
+    "spirv-reflect",
+    "spirv-tools",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    "vulkan-headers",
+    "vulkan-utility-libraries"
+  ]
+}
diff --git a/external_imported/vcpkg/ports/vulkan/CMakeLists.txt b/external_imported/vcpkg/ports/vulkan/CMakeLists.txt
new file mode 100644
index 000000000..3370eb11f
--- /dev/null
+++ b/external_imported/vcpkg/ports/vulkan/CMakeLists.txt
@@ -0,0 +1,12 @@
+cmake_minimum_required(VERSION 3.25)
+
+project(FIND_VULKAN LANGUAGES C)
+
+find_package(Vulkan ${VCPKG_VULKAN_VERSION} ${VCPKG_VULKAN_COMPONENTS})
+if(NOT Vulkan_FOUND)
+    set(CMAKE_FIND_DEBUG_MODE ON)
+    find_package(Vulkan ${VCPKG_VULKAN_VERSION} ${VCPKG_VULKAN_COMPONENTS})
+endif()
+
+set(OUTFILE "${CMAKE_CURRENT_BINARY_DIR}/vulkan-result.cmake" CACHE FILEPATH "")
+configure_file("vulkan-result.cmake.in" "${OUTFILE}" @ONLY ESCAPE_QUOTES)
diff --git a/external_imported/vcpkg/ports/vulkan/portfile.cmake b/external_imported/vcpkg/ports/vulkan/portfile.cmake
index 9f1154b67..cd198112a 100644
--- a/external_imported/vcpkg/ports/vulkan/portfile.cmake
+++ b/external_imported/vcpkg/ports/vulkan/portfile.cmake
@@ -1,44 +1,31 @@
-# Due to the complexity involved, this package doesn't install the Vulkan SDK.
-# It instead verifies that Vulkan is installed.
-# Other packages can depend on this package to declare a dependency on Vulkan.
-message(STATUS "Querying VULKAN_SDK Enviroment variable")
-file(TO_CMAKE_PATH "$ENV{VULKAN_SDK}" VULKAN_DIR)
-set(VULKAN_INCLUDE "${VULKAN_DIR}/include/vulkan/")
-set(VULKAN_ERROR_DL "Before continuing, please download and install Vulkan from:\n    https://vulkan.lunarg.com/sdk/home\nIf you have already downloaded it, make sure the VULKAN_SDK environment variable is set to vulkan's installation root.")
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
 
-if(NOT DEFINED ENV{VULKAN_SDK})
-    message(FATAL_ERROR "Could not find Vulkan SDK. ${VULKAN_ERROR_DL}")
-endif()
-
-message(STATUS "Searching " ${VULKAN_INCLUDE} " for vulkan.h")
-if(NOT EXISTS "${VULKAN_INCLUDE}/vulkan.h")
-    message(FATAL_ERROR "Could not find vulkan.h. ${VULKAN_ERROR_DL}")
-endif()
-message(STATUS "Found vulkan.h")
-
-# Check if the user left the version in the installation directory e.g. c:/vulkanSDK/1.1.82.1/
-if(VULKAN_DIR MATCHES "(([0-9]+)\\.([0-9]+)\\.([0-9]+)\\.([0-9]+))")
-    set(VULKAN_VERSION "${CMAKE_MATCH_1}")
-    set(VULKAN_MAJOR "${CMAKE_MATCH_2}")
-    set(VULKAN_MINOR "${CMAKE_MATCH_3}")
-    set(VULKAN_PATCH "${CMAKE_MATCH_4}")
-    message(STATUS "Found Vulkan SDK version ${VULKAN_VERSION}")
+set(vulkan_result_file "${CURRENT_BUILDTREES_DIR}/vulkan-${TARGET_TRIPLET}.cmake.log")
+vcpkg_cmake_configure(
+    SOURCE_PATH "${CMAKE_CURRENT_LIST_DIR}"
+    OPTIONS_RELEASE
+        "-DOUTFILE=${vulkan_result_file}"
+)
 
-    set(VULKAN_REQUIRED_VERSION "1.1.82.1")
-    if (VULKAN_MAJOR LESS 1 OR VULKAN_MINOR LESS 1 OR VULKAN_PATCH LESS 82)
-        message(FATAL_ERROR "Vulkan ${VULKAN_VERSION} but ${VULKAN_REQUIRED_VERSION} is required. Please download and install a more recent version from:"
-                            "\n    https://vulkan.lunarg.com/sdk/home\n")
-    endif()
-endif()
-
-if (EXISTS ${VULKAN_DIR}/../LICENSE.txt)
-    configure_file(${VULKAN_DIR}/../LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/vulkan/copyright COPYONLY)
-elseif(EXISTS ${VULKAN_DIR}/LICENSE.txt)
-    configure_file(${VULKAN_DIR}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/vulkan/copyright COPYONLY)
+include("${vulkan_result_file}")
+if(DETECTED_Vulkan_FOUND)
+    message(STATUS "Found Vulkan ${DETECTED_Vulkan_VERSION} (${DETECTED_Vulkan_LIBRARIES})")
 else()
-    configure_file(${CURRENT_PORT_DIR}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/vulkan/copyright COPYONLY)
+    set(message "Vulkan wasn't found.")
+    if(VCPKG_TARGET_IS_ANDROID AND DETECTED_ANDROID_NATIVE_API_LEVEL AND DETECTED_ANDROID_NATIVE_API_LEVEL LESS "24")
+        string(APPEND message " Vulkan support from the Android NDK requires API level 24 (found: ${DETECTED_ANDROID_NATIVE_API_LEVEL})")
+    endif()
+    message(FATAL_ERROR "${message}")
 endif()
 
-SET(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+             "${CMAKE_CURRENT_LIST_DIR}/vulkan-result.cmake.in"
+    DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/detect-vulkan"
+)
 
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" [[
+This is a stub package. Copyright and license information
+is provided with Vulkan headers and loader.
+For Android, the loader is provided by the NDK.
+]])
diff --git a/external_imported/vcpkg/ports/vulkan/usage b/external_imported/vcpkg/ports/vulkan/usage
index 62130b840..e742892f1 100644
--- a/external_imported/vcpkg/ports/vulkan/usage
+++ b/external_imported/vcpkg/ports/vulkan/usage
@@ -1,9 +1,5 @@
-The package vulkan does not provide cmake or visual studio integration directly.
-However, it can still easily be used.
+vulkan is compatible with built-in CMake targets:
 
-    Visual Studio:
-    Include $(VULKAN_SDK)/include to your include path.
-
-    CMake:
+    # https://cmake.org/cmake/help/latest/module/FindVulkan.html
     find_package(Vulkan REQUIRED)
     target_link_libraries(main PRIVATE Vulkan::Vulkan)
diff --git a/external_imported/vcpkg/ports/vulkan/vcpkg.json b/external_imported/vcpkg/ports/vulkan/vcpkg.json
index 96bd75075..cff6df67e 100644
--- a/external_imported/vcpkg/ports/vulkan/vcpkg.json
+++ b/external_imported/vcpkg/ports/vulkan/vcpkg.json
@@ -1,8 +1,21 @@
 {
   "name": "vulkan",
-  "version": "1.1.82.1",
-  "port-version": 5,
-  "description": "A graphics and compute API that provides high-efficiency, cross-platform access to modern GPUs on a wide variety of devices.",
+  "version-date": "2023-12-17",
+  "description": [
+    "A stub package that ensures that Vulkan headers and a loader are available.",
+    "On Android, the NDK provides a loader at API level 24 or higher."
+  ],
   "license": null,
-  "supports": "!uwp & !xbox"
+  "supports": "!uwp & !xbox",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    "vulkan-headers",
+    {
+      "name": "vulkan-loader",
+      "platform": "!android"
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/vulkan/vulkan-result.cmake.in b/external_imported/vcpkg/ports/vulkan/vulkan-result.cmake.in
new file mode 100644
index 000000000..877df8d34
--- /dev/null
+++ b/external_imported/vcpkg/ports/vulkan/vulkan-result.cmake.in
@@ -0,0 +1,5 @@
+set(DETECTED_Vulkan_FOUND "@Vulkan_FOUND@")
+set(DETECTED_Vulkan_VERSION "@Vulkan_VERSION@")
+set(DETECTED_Vulkan_INCLUDE_DIRS "@Vulkan_INCLUDE_DIRS@")
+set(DETECTED_Vulkan_LIBRARIES "@Vulkan_LIBRARIES@")
+set(DETECTED_ANDROID_NATIVE_API_LEVEL "@ANDROID_NATIVE_API_LEVEL@")
diff --git a/external_imported/vcpkg/ports/vxl/fix_limits.patch b/external_imported/vcpkg/ports/vxl/fix_limits.patch
new file mode 100644
index 000000000..3299f4f06
--- /dev/null
+++ b/external_imported/vcpkg/ports/vxl/fix_limits.patch
@@ -0,0 +1,12 @@
+diff --git a/core/vnl/vnl_bignum.cxx b/core/vnl/vnl_bignum.cxx
+index b615a9b..741bd43 100644
+--- a/core/vnl/vnl_bignum.cxx
++++ b/core/vnl/vnl_bignum.cxx
+@@ -6,6 +6,7 @@
+ #include <algorithm>
+ #include <vector>
+ #include <iostream>
++#include <limits>
+ #include "vnl_bignum.h"
+ //:
+ // \file
diff --git a/external_imported/vcpkg/ports/vxl/portfile.cmake b/external_imported/vcpkg/ports/vxl/portfile.cmake
index b56645806..c70f94a5b 100644
--- a/external_imported/vcpkg/ports/vxl/portfile.cmake
+++ b/external_imported/vcpkg/ports/vxl/portfile.cmake
@@ -16,6 +16,7 @@ vcpkg_from_github(
     PATCHES
         fix_dependency.patch
         testlib.patch
+        fix_limits.patch
 )
 
 set(USE_WIN_WCHAR_T OFF)
@@ -43,6 +44,9 @@ vcpkg_cmake_configure(
         -DVXL_USE_DCMTK=OFF # TODO : need fix dcmtk support to turn on
         -DVXL_USE_GEOTIFF=ON
         -DVXL_USE_WIN_WCHAR_T=${USE_WIN_WCHAR_T}
+    MAYBE_UNUSED_VARIABLES
+        VXL_USE_DCMTK
+        VXL_USING_NATIVE_BZLIB2
 )
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/vxl/vcpkg.json b/external_imported/vcpkg/ports/vxl/vcpkg.json
index fb87b04d2..29158b2d7 100644
--- a/external_imported/vcpkg/ports/vxl/vcpkg.json
+++ b/external_imported/vcpkg/ports/vxl/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "vxl",
   "version": "2.0.2",
-  "port-version": 4,
+  "port-version": 5,
   "description": "A multi-platform collection of C++ software libraries for Computer Vision and Image Understanding.",
   "dependencies": [
     "bzip2",
diff --git a/external_imported/vcpkg/ports/wampcc/gcc-11.patch b/external_imported/vcpkg/ports/wampcc/gcc-11.patch
new file mode 100644
index 000000000..2a49f5aef
--- /dev/null
+++ b/external_imported/vcpkg/ports/wampcc/gcc-11.patch
@@ -0,0 +1,19 @@
+diff --git a/examples/message_server/message_subscriber.cc b/examples/message_server/message_subscriber.cc
+index ba40a332..4ac75ef7 100644
+--- a/examples/message_server/message_subscriber.cc
++++ b/examples/message_server/message_subscriber.cc
+@@ -7,13 +7,9 @@
+ 
+ #include "wampcc/kernel.h"
+ #include "wampcc/data_model.h"
+-#include "wampcc/tcp_socket.h"
+-#include "wampcc/wamp_session.h"
+ #include "wampcc/rawsocket_protocol.h"
+ 
+-#include <memory>
+-#include <iostream>
+-
++#include <thread>
+ 
+ void on_string_change(const wampcc::string_subscription& sub)
+ {
diff --git a/external_imported/vcpkg/ports/wampcc/portfile.cmake b/external_imported/vcpkg/ports/wampcc/portfile.cmake
index 1d46d9a2b..93aaa4db8 100644
--- a/external_imported/vcpkg/ports/wampcc/portfile.cmake
+++ b/external_imported/vcpkg/ports/wampcc/portfile.cmake
@@ -10,6 +10,8 @@ vcpkg_from_github(
     REF 43d10a7ccf37ec1b895742712dd4a05577b73ff1
     SHA512 e830d26de00e8f5f378145f06691cb16121c40d3bd2cd663fad9a97db37251a11b56053178b619e3a2627f0cd518b6290a8381b26e517a9f16f0246d2f91958e
     HEAD_REF master
+    PATCHES
+        gcc-11.patch # https://github.com/darrenjs/wampcc/commit/d1a8c6dcabcc32e9d9774f306555e9080d871c2f
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
diff --git a/external_imported/vcpkg/ports/wampcc/vcpkg.json b/external_imported/vcpkg/ports/wampcc/vcpkg.json
index ed8f2792c..3775d5dff 100644
--- a/external_imported/vcpkg/ports/wampcc/vcpkg.json
+++ b/external_imported/vcpkg/ports/wampcc/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "wampcc",
   "version-date": "2019-09-04",
-  "port-version": 4,
+  "port-version": 5,
   "description": "Wampcc is C++ library that implements the Web Application Messaging Protocol (WAMP) protocol.",
   "license": "MIT",
   "supports": "!(windows & arm64)",
diff --git a/external_imported/vcpkg/ports/wangle/fix_dependency.patch b/external_imported/vcpkg/ports/wangle/fix_dependency.patch
index 6b80a68f8..f44d39fab 100644
--- a/external_imported/vcpkg/ports/wangle/fix_dependency.patch
+++ b/external_imported/vcpkg/ports/wangle/fix_dependency.patch
@@ -1,17 +1,26 @@
 diff --git a/wangle/CMakeLists.txt b/wangle/CMakeLists.txt
-index 8df7c76..f605f25 100644
+index 85ae066..766d3d3 100644
 --- a/wangle/CMakeLists.txt
 +++ b/wangle/CMakeLists.txt
-@@ -62,7 +62,7 @@ find_package(folly CONFIG REQUIRED)
+@@ -64,18 +64,23 @@ set(CMAKE_INSTALL_DIR lib/cmake/wangle CACHE STRING
+ find_package(folly CONFIG REQUIRED)
+ 
  find_package(fizz CONFIG REQUIRED)
- find_package(fmt CONFIG REQUIRED)
+-find_package(fmt CONFIG REQUIRED)
  find_package(OpenSSL REQUIRED)
 -find_package(Glog REQUIRED)
+-find_package(gflags CONFIG QUIET)
 +find_package(glog CONFIG REQUIRED)
- find_package(gflags CONFIG QUIET)
++find_package(gflags CONFIG REQUIRED)
++find_package(Boost REQUIRED
++  COMPONENTS
++	filesystem
++	thread
++)
++
  if (gflags_FOUND)
    message(STATUS "Found gflags from package config")
-@@ -70,8 +70,8 @@ if (gflags_FOUND)
+   message(STATUS "gflags_CONFIG=${gflags_CONFIG}")
  else()
    find_package(Gflags REQUIRED)
  endif()
@@ -22,35 +31,49 @@ index 8df7c76..f605f25 100644
  find_package(Threads REQUIRED)
  if (UNIX AND NOT APPLE)
    find_package(Librt)
-@@ -153,24 +153,23 @@ target_include_directories(
-   PUBLIC
-     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/..>
-     $<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>
-+  PRIVATE
-     ${FIZZ_INCLUDE_DIR}
-     ${FOLLY_INCLUDE_DIR}
-     ${Boost_INCLUDE_DIR}
--    ${OPENSSL_INCLUDE_DIR}
--    ${GLOG_INCLUDE_DIRS}
-     ${GFLAGS_INCLUDE_DIRS}
--    ${LIBEVENT_INCLUDE_DIR}
--    ${DOUBLE_CONVERSION_INCLUDE_DIRS}
+@@ -166,6 +171,14 @@ target_include_directories(
+     ${LIBEVENT_INCLUDE_DIR}
+     ${DOUBLE_CONVERSION_INCLUDE_DIR}
  )
++set(Boost_LIBRARIES             Boost::boost Boost::filesystem  Boost::thread )
++set(FOLLY_LIBRARIES             Folly::folly)
++set(FIZZ_LIBRARIES              fizz::fizz)
++set(GLOG_LIBRARIES              glog::glog)
++set(GFLAGS_LIBRARIES            gflags::gflags)
++set(LIBEVENT_LIB                libevent::core libevent::extra)
++set(DOUBLE_CONVERSION_LIBRARIES double-conversion::double-conversion)
++
  target_link_libraries(wangle PUBLIC
    ${FOLLY_LIBRARIES}
    ${FIZZ_LIBRARIES}
-   ${Boost_LIBRARIES}
--  ${OPENSSL_LIBRARIES}
--  ${GLOG_LIBRARIES}
-+  OpenSSL::SSL
-+  OpenSSL::Crypto
-+  glog::glog
-   ${GFLAGS_LIBRARIES}
--  ${LIBEVENT_LIB}
--  ${DOUBLE_CONVERSION_LIBRARIES}
-+  libevent::core
-+  libevent::extra
-+  double-conversion::double-conversion
-   ${CMAKE_DL_LIBS}
-   ${LIBRT_LIBRARIES}
-   Threads::Threads)
+diff --git a/wangle/cmake/wangle-config.cmake.in b/wangle/cmake/wangle-config.cmake.in
+index e0fd0dc..5f6cf14 100644
+--- a/wangle/cmake/wangle-config.cmake.in
++++ b/wangle/cmake/wangle-config.cmake.in
+@@ -15,13 +15,19 @@ set_and_check(WANGLE_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
+ set_and_check(WANGLE_CMAKE_DIR "${PACKAGE_PREFIX_DIR}/share/wangle")
+ 
+ include(CMakeFindDependencyMacro)
+-find_dependency(folly REQUIRED)
+-find_dependency(fizz REQUIRED)
+-find_dependency(glog REQUIRED)
+-find_dependency(Threads REQUIRED)
+-find_dependency(Libevent REQUIRED)
+-find_dependency(OpenSSL REQUIRED)
+-find_dependency(double-conversion REQUIRED)
++find_dependency(folly CONFIG)
++find_dependency(fizz CONFIG)
++find_dependency(gflags CONFIG)
++find_dependency(glog CONFIG)
++find_dependency(Threads)
++find_dependency(Libevent CONFIG)
++find_dependency(OpenSSL)
++find_dependency(double-conversion CONFIG)
++find_dependency(Boost
++  COMPONENTS
++    filesystem
++    thread
++)
+ 
+ if (NOT TARGET wangle::wangle)
+   include("${WANGLE_CMAKE_DIR}/wangle-targets.cmake")
diff --git a/external_imported/vcpkg/ports/wangle/portfile.cmake b/external_imported/vcpkg/ports/wangle/portfile.cmake
index bf8313bef..392875a40 100644
--- a/external_imported/vcpkg/ports/wangle/portfile.cmake
+++ b/external_imported/vcpkg/ports/wangle/portfile.cmake
@@ -3,14 +3,25 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/wangle
-    REF v2022.03.21.00
-    SHA512 069fe7758ccb2f33665f53109047f2e0158e248fda8c760eddd978afd6980acbc6421db60721bf320deca557369377c8757f13c67f8685e3a98394324e75e72e
+    REF "v${VERSION}"
+    SHA512 a3c671b19cb4f4875fa894b3374a4c24e6d4715fbb025c21434d7ca89f10f0affb8c25f392acc15793b4a92b48998d95c51b5120457e1b47ea15890221d0dd6c
     HEAD_REF master
     PATCHES
         fix-config-cmake.patch
         fix_dependency.patch
 )
 
+file(REMOVE
+  "${SOURCE_PATH}/wangle/cmake/FindDoubleConversion.cmake"
+  "${SOURCE_PATH}/build/fbcode_builder/CMake/FindGflags.cmake"
+  "${SOURCE_PATH}/build/fbcode_builder/CMake/FindGlog.cmake"
+  "${SOURCE_PATH}/build/fbcode_builder/CMake/FindGMock.cmake"
+  "${SOURCE_PATH}/build/fbcode_builder/CMake/FindLibEvent.cmake"
+  "${SOURCE_PATH}/build/fbcode_builder/CMake/FindSodium.cmake"
+  "${SOURCE_PATH}/build/fbcode_builder/CMake/FindZstd.cmake"
+)
+
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}/wangle"
     OPTIONS
@@ -38,4 +49,4 @@ file(REMOVE_RECURSE
 )
 
 file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/wangle/vcpkg.json b/external_imported/vcpkg/ports/wangle/vcpkg.json
index fb51f4338..1ba4a67e1 100644
--- a/external_imported/vcpkg/ports/wangle/vcpkg.json
+++ b/external_imported/vcpkg/ports/wangle/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "wangle",
-  "version-string": "2022.03.21.00",
+  "version-string": "2024.01.01.00",
   "description": "Wangle is a framework providing a set of common client/server abstractions for building services in a consistent, modular, and composable way.",
   "homepage": "https://github.com/facebook/wangle",
   "license": "Apache-2.0",
@@ -13,6 +13,7 @@
     "double-conversion",
     "fizz",
     "folly",
+    "gflags",
     "glog",
     "libevent",
     "openssl",
diff --git a/external_imported/vcpkg/ports/wasmedge/fix_find_zstd.patch b/external_imported/vcpkg/ports/wasmedge/fix_find_zstd.patch
new file mode 100644
index 000000000..f2be2c620
--- /dev/null
+++ b/external_imported/vcpkg/ports/wasmedge/fix_find_zstd.patch
@@ -0,0 +1,19 @@
+diff --git a/cmake/Helper.cmake b/cmake/Helper.cmake
+index f9cdcf2..a270b05 100644
+--- a/cmake/Helper.cmake
++++ b/cmake/Helper.cmake
+@@ -221,8 +221,12 @@ if((WASMEDGE_LINK_LLVM_STATIC OR WASMEDGE_BUILD_STATIC_LIB) AND WASMEDGE_BUILD_A
+   endif()
+   if (APPLE AND LLVM_VERSION_MAJOR GREATER_EQUAL 15)
+     # For LLVM 15 or greater on MacOS
+-    find_package(zstd REQUIRED)
+-    get_filename_component(ZSTD_PATH "${zstd_LIBRARY}" DIRECTORY)
++    find_package(zstd CONFIG REQUIRED)
++    if(CMAKE_BUILD_TYPE STREQUAL Debug)
++        set(ZSTD_PATH "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib")
++    else()
++        set(ZSTD_PATH "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib")
++    endif()
+     list(APPEND WASMEDGE_LLVM_LINK_STATIC_COMPONENTS
+       ${ZSTD_PATH}/libzstd.a
+     )
diff --git a/external_imported/vcpkg/ports/wasmedge/portfile.cmake b/external_imported/vcpkg/ports/wasmedge/portfile.cmake
index b685638a2..e3381439a 100644
--- a/external_imported/vcpkg/ports/wasmedge/portfile.cmake
+++ b/external_imported/vcpkg/ports/wasmedge/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO WasmEdge/WasmEdge
-    REF 0.12.0-alpha.1
-    SHA512 4218ecb6fba34b4ae94fc8c63b7da03c37f9dd2e404a9a6008be972a799b981929ada0ef213d8fababa25d10e27b777df66d22e1e61c92ff8e60b5e1caf97562
+    REF "${VERSION}"
+    SHA512 fcd6b804876a5899ec8c21aa349b7ec3e8e0b87537e93d237cb14da2ecb162410ae9ad39212c5ab01e4408191768b806d84e55934616de094a696bf6f02fe1de
     HEAD_REF master
 )
 
@@ -62,6 +62,6 @@ vcpkg_cmake_configure(
 
 vcpkg_cmake_install()
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/external_imported/vcpkg/ports/wasmedge/vcpkg.json b/external_imported/vcpkg/ports/wasmedge/vcpkg.json
index 09b98d65b..47a2e255d 100644
--- a/external_imported/vcpkg/ports/wasmedge/vcpkg.json
+++ b/external_imported/vcpkg/ports/wasmedge/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "wasmedge",
-  "version-semver": "0.12.0-alpha.1",
+  "version": "0.13.5",
+  "port-version": 1,
   "description": "WasmEdge is a high-performance WebAssembly runtime for edge computing.",
   "homepage": "https://WasmEdge.org",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/wavpack/portfile.cmake b/external_imported/vcpkg/ports/wavpack/portfile.cmake
index 5651b7c9d..a45e4b6b4 100644
--- a/external_imported/vcpkg/ports/wavpack/portfile.cmake
+++ b/external_imported/vcpkg/ports/wavpack/portfile.cmake
@@ -14,6 +14,7 @@ vcpkg_cmake_configure(
         -DWAVPACK_BUILD_WINAMP_PLUGIN=OFF
         -DBUILD_TESTING=OFF
         -DWAVPACK_BUILD_DOCS=OFF
+        -DWAVPACK_ENABLE_LIBCRYPTO=OFF
 )
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/wavpack/vcpkg.json b/external_imported/vcpkg/ports/wavpack/vcpkg.json
index c956b776e..e4a04667a 100644
--- a/external_imported/vcpkg/ports/wavpack/vcpkg.json
+++ b/external_imported/vcpkg/ports/wavpack/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "wavpack",
   "version": "5.6.0",
+  "port-version": 1,
   "description": "WavPack encode/decode library, command-line programs, and several plugins",
   "homepage": "https://github.com/dbry/WavPack",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/wcslib/portfile.cmake b/external_imported/vcpkg/ports/wcslib/portfile.cmake
new file mode 100644
index 000000000..bb61a0338
--- /dev/null
+++ b/external_imported/vcpkg/ports/wcslib/portfile.cmake
@@ -0,0 +1,27 @@
+vcpkg_download_distfile(archive
+    URLS "http://www.atnf.csiro.au/people/mcalabre/WCS/wcslib-8.2.1.tar.bz2"
+    FILENAME "wcslib-8.2.1.tar.bz2"
+    SHA512 0d1ab63445974c2a4f425225cde197866187a9e7ae0195a33dcb33ad299018294338bc16ab4cbe6a3a27fb40aded75c60377348eaa91713d16a934cd95532c25
+)
+
+vcpkg_extract_source_archive(
+    src
+    ARCHIVE "${archive}"
+)
+
+vcpkg_configure_make(
+    SOURCE_PATH ${src}
+    COPY_SOURCE
+    OPTIONS
+        --disable-flex
+        --disable-fortran
+        --without-pgplot
+        --without-cfitsio)
+
+vcpkg_install_make(MAKEFILE GNUmakefile)
+vcpkg_fixup_pkgconfig()
+vcpkg_install_copyright(FILE_LIST "${src}/COPYING")
+
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
diff --git a/external_imported/vcpkg/ports/wcslib/usage b/external_imported/vcpkg/ports/wcslib/usage
new file mode 100644
index 000000000..00db79805
--- /dev/null
+++ b/external_imported/vcpkg/ports/wcslib/usage
@@ -0,0 +1,6 @@
+wcslib can be imported via CMake FindPkgConfig module:
+
+    find_package(PkgConfig)
+    pkg_check_modules(wcslib REQUIRED IMPORTED_TARGET wcslib)
+    target_include_directories(main PRIVATE PkgConfig::wcslib)
+    target_link_libraries(main PRIVATE PkgConfig::wcslib)
diff --git a/external_imported/vcpkg/ports/wcslib/vcpkg.json b/external_imported/vcpkg/ports/wcslib/vcpkg.json
new file mode 100644
index 000000000..852730641
--- /dev/null
+++ b/external_imported/vcpkg/ports/wcslib/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "wcslib",
+  "version": "8.2.1",
+  "description": "World Coordinate System (WCS) (Library)",
+  "homepage": "https://www.atnf.csiro.au/people/mcalabre/WCS/",
+  "supports": "!windows"
+}
diff --git a/external_imported/vcpkg/ports/websocketpp/cxx20.patch b/external_imported/vcpkg/ports/websocketpp/cxx20.patch
index 34283e2b1..f70919d6d 100644
--- a/external_imported/vcpkg/ports/websocketpp/cxx20.patch
+++ b/external_imported/vcpkg/ports/websocketpp/cxx20.patch
@@ -64,3 +64,30 @@ index 8451413..4c9d836 100644
       : m_static_channels(other.m_static_channels)
       , m_dynamic_channels(other.m_dynamic_channels)
       , m_out(other.m_out)
+diff --git a/websocketpp/roles/server_endpoint.hpp b/websocketpp/roles/server_endpoint.hpp
+index 4a5865eff..04fee18f9 100644
+--- a/websocketpp/roles/server_endpoint.hpp
++++ b/websocketpp/roles/server_endpoint.hpp
+@@ -75,11 +75,11 @@ class server : public endpoint<connection<config>,config> {
+     }
+ 
+     /// Destructor
+-    ~server<config>() {}
++    ~server() {}
+ 
+ #ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
+     // no copy constructor because endpoints are not copyable
+-    server<config>(server<config> &) = delete;
++    server(server<config> &) = delete;
+ 
+     // no copy assignment operator because endpoints are not copyable
+     server<config> & operator=(server<config> const &) = delete;
+@@ -87,7 +87,7 @@ class server : public endpoint<connection<config>,config> {
+ 
+ #ifdef _WEBSOCKETPP_MOVE_SEMANTICS_
+     /// Move constructor
+-    server<config>(server<config> && o) : endpoint<connection<config>,config>(std::move(o)) {}
++    server(server<config> && o) : endpoint<connection<config>,config>(std::move(o)) {}
+ 
+ #ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
+     // no move assignment operator because of const member variables
diff --git a/external_imported/vcpkg/ports/websocketpp/vcpkg.json b/external_imported/vcpkg/ports/websocketpp/vcpkg.json
index daa7f5cf6..4bb358f37 100644
--- a/external_imported/vcpkg/ports/websocketpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/websocketpp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "websocketpp",
   "version": "0.8.2",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Library that implements RFC6455 The WebSocket Protocol",
   "homepage": "https://github.com/zaphoyd/websocketpp",
   "documentation": "http://docs.websocketpp.org/",
diff --git a/external_imported/vcpkg/ports/webview2/portfile.cmake b/external_imported/vcpkg/ports/webview2/portfile.cmake
index d2b215616..ed4c7a96d 100644
--- a/external_imported/vcpkg/ports/webview2/portfile.cmake
+++ b/external_imported/vcpkg/ports/webview2/portfile.cmake
@@ -2,18 +2,16 @@ if(VCPKG_TARGET_IS_UWP)
     vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 endif()
 
-set(VERSION 1.0.1210.39)
-
 vcpkg_download_distfile(ARCHIVE
     URLS "https://www.nuget.org/api/v2/package/Microsoft.Web.WebView2/${VERSION}"
     FILENAME "microsoft.web.webview2.${VERSION}.zip"
-    SHA512 c87812247a466f4aaeac8be8b32be49166b4ddb5bbf65581d5df81d69eda340e9911144a8dd8401baa6e51f95337001cd18ff90cd36ca0af86cc65227e8e2ccf
+    SHA512 59d2293d2becb03ed99ab0a70a753adf49d998294d318d331047c2ec7c7dcb163ed84a09ab35765873c2364c3367a8033e2b1a5ad52c5b8e99f8d7a69b8e915e
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
-    REF "${VERSION}"
+    SOURCE_BASE "${VERSION}"
     NO_REMOVE_ONE_LEVEL
 )
 
diff --git a/external_imported/vcpkg/ports/webview2/vcpkg.json b/external_imported/vcpkg/ports/webview2/vcpkg.json
index 8a0327873..22131b615 100644
--- a/external_imported/vcpkg/ports/webview2/vcpkg.json
+++ b/external_imported/vcpkg/ports/webview2/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "webview2",
-  "version": "1.0.1210.39",
+  "version": "1.0.2088.41",
   "description": "The WebView2 control allows you to embed web technologies (HTML, CSS, and JavaScript) using Microsoft Edge",
   "homepage": "https://docs.microsoft.com/en-us/microsoft-edge/webview2",
   "documentation": "https://docs.microsoft.com/en-us/microsoft-edge/webview2",
diff --git a/external_imported/vcpkg/ports/wepoll/vcpkg.json b/external_imported/vcpkg/ports/wepoll/vcpkg.json
index 23b11269f..53bb60109 100644
--- a/external_imported/vcpkg/ports/wepoll/vcpkg.json
+++ b/external_imported/vcpkg/ports/wepoll/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "wepoll",
-  "version-string": "1.5.8",
-  "port-version": 2,
+  "version": "1.5.8",
+  "port-version": 3,
   "description": "Fast epoll for windows",
   "homepage": "https://github.com/piscisaureus/wepoll",
   "supports": "windows",
diff --git a/external_imported/vcpkg/ports/wg21-linear-algebra/portfile.cmake b/external_imported/vcpkg/ports/wg21-linear-algebra/portfile.cmake
index 11bf0f3ee..ef9d98a16 100644
--- a/external_imported/vcpkg/ports/wg21-linear-algebra/portfile.cmake
+++ b/external_imported/vcpkg/ports/wg21-linear-algebra/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO BobSteagall/wg21
     REF "v${VERSION}"
-    SHA512 c249344d035d09760a9e5ea059ed6db5a1cb42b918735672bd7aa6dbda08f947855582f76ad61d33f59a847d8befe5caed57d25da2bcfc9fa8e6cef50a4c24e2
+    SHA512 ab1db0cff476d2f63a5d1fcc1d3b40acbceeacae61a99d7ad0b8d8abe21413da97b71c088a331b70c0d0c3dc4615953485c68af46698ec7f0013e14bea5f9452
 )
 
 vcpkg_cmake_configure(
diff --git a/external_imported/vcpkg/ports/wg21-linear-algebra/vcpkg.json b/external_imported/vcpkg/ports/wg21-linear-algebra/vcpkg.json
index bbc34e1d4..a0e6264c3 100644
--- a/external_imported/vcpkg/ports/wg21-linear-algebra/vcpkg.json
+++ b/external_imported/vcpkg/ports/wg21-linear-algebra/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "wg21-linear-algebra",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "description": "A linear algebra proposal for the C++ standard library",
   "license": "NCSA",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/wg21-sg14/vcpkg.json b/external_imported/vcpkg/ports/wg21-sg14/vcpkg.json
index 4999f444b..92bd9dde0 100644
--- a/external_imported/vcpkg/ports/wg21-sg14/vcpkg.json
+++ b/external_imported/vcpkg/ports/wg21-sg14/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "wg21-sg14",
-  "version-string": "2019-08-13",
-  "port-version": 1,
+  "version-date": "2019-08-13",
+  "port-version": 2,
   "description": "A library for Study Group 14 of Working Group 21 (C++)",
   "homepage": "https://github.com/WG21-SG14/SG14"
 }
diff --git a/external_imported/vcpkg/ports/wil/portfile.cmake b/external_imported/vcpkg/ports/wil/portfile.cmake
index 266e0d867..2e02f180a 100644
--- a/external_imported/vcpkg/ports/wil/portfile.cmake
+++ b/external_imported/vcpkg/ports/wil/portfile.cmake
@@ -2,11 +2,14 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/wil
-    REF d0849dca2c466bdce38a32a7e4265b193b8fb0f9
-    SHA512 9dd4eeae55c04f97da63e0b63f7e66b550726e547f52906a10ab7c92fa4b97ff000e170ac23f9eac846a04112764b86785abb96de82557672665742a8b4ba29c
+    REF v1.0.240122.1
+    SHA512 b6552924aadb036cf28d21a90d1259720b84fb7f34b2af30444257861143ed4f41cd58586a7cc4c6fb364e73264eaf77669ca988a4a9ef2fe29fdae9e992f936
     HEAD_REF master
 )
 
+# WIL is header-only, so we don't need to build it in both modes
+set(VCPKG_BUILD_TYPE release)
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
diff --git a/external_imported/vcpkg/ports/wil/vcpkg.json b/external_imported/vcpkg/ports/wil/vcpkg.json
index fd8b8b1c3..076f7211d 100644
--- a/external_imported/vcpkg/ports/wil/vcpkg.json
+++ b/external_imported/vcpkg/ports/wil/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "wil",
-  "version-date": "2023-02-02",
+  "version-date": "2024-01-22",
   "description": "The Windows Implementation Libraries (WIL) is a header-only C++ library created to make life easier for developers on Windows through readable type-safe C++ interfaces for common Windows coding patterns.",
   "homepage": "https://github.com/microsoft/wil",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/winpcap/Packet.vcxproj b/external_imported/vcpkg/ports/winpcap/Packet.vcxproj.in
similarity index 100%
rename from external_imported/vcpkg/ports/winpcap/Packet.vcxproj
rename to external_imported/vcpkg/ports/winpcap/Packet.vcxproj.in
diff --git a/external_imported/vcpkg/ports/winpcap/bison-flex.patch b/external_imported/vcpkg/ports/winpcap/bison-flex.patch
new file mode 100644
index 000000000..201de0078
--- /dev/null
+++ b/external_imported/vcpkg/ports/winpcap/bison-flex.patch
@@ -0,0 +1,22 @@
+diff --git a/wpcap/PRJ/build_scanner_parser.bat b/wpcap/PRJ/build_scanner_parser.bat
+index 31786d596..54cba739d 100644
+--- a/wpcap/PRJ/build_scanner_parser.bat
++++ b/wpcap/PRJ/build_scanner_parser.bat
+@@ -4,7 +4,7 @@ echo Building the libpcap parser and scanner...
+ del /Q /F  ..\libpcap\grammar.c > nul 2> nul
+ del /Q /F  ..\libpcap\tokdefs.h > nul 2> nul
+ 
+-bison -y -p pcap_ -d ../libpcap/GRAMMAR.Y > nul
++win_bison -y -p pcap_ -d ../libpcap/GRAMMAR.Y > nul
+ if not %ERRORLEVEL% == 0 (
+ 	echo failure in generating the grammar.
+ 	goto end
+@@ -14,7 +14,7 @@ move y.tab.c ..\libpcap\grammar.c
+ move y.tab.h ..\libpcap\tokdefs.h
+ 
+ del /Q /F ..\libpcap\scanner.c >/nul 2>/nul
+-flex -Ppcap_ -t  ../libpcap/scanner.l > ../libpcap/scanner.c
++win_flex -Ppcap_ -t  ../libpcap/scanner.l > ../libpcap/scanner.c
+ 
+ if not %ERRORLEVEL% == 0 (
+ 	echo failure in generating the scanner.
diff --git a/external_imported/vcpkg/ports/winpcap/create_bin.bat b/external_imported/vcpkg/ports/winpcap/create_bin.bat
deleted file mode 100644
index aa9e7f106..000000000
--- a/external_imported/vcpkg/ports/winpcap/create_bin.bat
+++ /dev/null
@@ -1,20 +0,0 @@
-@echo off
-
-IF "%2"=="" (set WPDPACKDESTDIR=.\WpdPack\) ELSE (set WPDPACKDESTDIR=%2)
-
-IF ""=="%1" (set WINPCAPSOURCEDIR=.\) ELSE (set WINPCAPSOURCEDIR=%1) 
-
-echo Creating \Lib folder
-mkdir %WPDPACKDESTDIR% 		>nul 2>nul
-mkdir %WPDPACKDESTDIR%\Bin 	>nul 2>nul
-mkdir %WPDPACKDESTDIR%\Bin\x64	>nul 2>nul
-
-xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Release No AirPcap\x86\wpcap.dll"		%WPDPACKDESTDIR%\Bin\ >nul
-xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Release No AirPcap\x64\wpcap.dll"		%WPDPACKDESTDIR%\Bin\x64 >nul
-xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\Release\x86\packet.dll	 	%WPDPACKDESTDIR%\Bin\ >nul
-xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\Release\x64\packet.dll	 	%WPDPACKDESTDIR%\Bin\x64 >nul
-
-echo Folder \Bin created successfully
-
-set WPDPACKDESTDIR=
-set WINPCAPSOURCEDIR=
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/winpcap/create_lib.patch b/external_imported/vcpkg/ports/winpcap/create_lib.patch
deleted file mode 100644
index 8e144fa3d..000000000
--- a/external_imported/vcpkg/ports/winpcap/create_lib.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/create_lib.bat b/create_lib.bat
-index dbe511c..d431b88 100644
---- a/create_lib.bat
-+++ b/create_lib.bat
-@@ -9,12 +9,10 @@ mkdir %WPDPACKDESTDIR% 		>nul 2>nul
- mkdir %WPDPACKDESTDIR%\Lib 	>nul 2>nul
- mkdir %WPDPACKDESTDIR%\Lib\x64	>nul 2>nul
- 
--xcopy /v /Y %WINPCAPSOURCEDIR%\wpcap\PRJ\Release\x86\wpcap.lib				%WPDPACKDESTDIR%\Lib\ >nul
--xcopy /v /Y %WINPCAPSOURCEDIR%\wpcap\PRJ\Release\x64\wpcap.lib				%WPDPACKDESTDIR%\Lib\x64 >nul
-+xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Release No AirPcap\x86\wpcap.lib"		%WPDPACKDESTDIR%\Lib\ >nul
-+xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Release No AirPcap\x64\wpcap.lib"		%WPDPACKDESTDIR%\Lib\x64 >nul
- xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\Release\x86\packet.lib	 	%WPDPACKDESTDIR%\Lib\ >nul
- xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\Release\x64\packet.lib	 	%WPDPACKDESTDIR%\Lib\x64 >nul
--xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\libpacket.a			%WPDPACKDESTDIR%\Lib\	>nul
--xcopy /v /Y %WINPCAPSOURCEDIR%\wpcap\LIB\libwpcap.a					%WPDPACKDESTDIR%\Lib\ >nul
- 
- echo Folder \Lib created successfully
- 
diff --git a/external_imported/vcpkg/ports/winpcap/fix-create-lib-batch.patch b/external_imported/vcpkg/ports/winpcap/fix-create-lib-batch.patch
deleted file mode 100644
index 0a1d9017d..000000000
--- a/external_imported/vcpkg/ports/winpcap/fix-create-lib-batch.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/create_lib.bat b/create_lib.bat
-index c70a179..4690d9e 100644
---- a/create_lib.bat
-+++ b/create_lib.bat
-@@ -7,10 +7,16 @@ IF ""=="%1" (set WINPCAPSOURCEDIR=.\) ELSE (set WINPCAPSOURCEDIR=%1)
- echo Creating \Lib folder
- mkdir %WPDPACKDESTDIR% 		>nul 2>nul
- mkdir %WPDPACKDESTDIR%\Lib 	>nul 2>nul
-+mkdir %WPDPACKDESTDIR%\Lib\debug\ 	>nul 2>nul
- mkdir %WPDPACKDESTDIR%\Lib\x64	>nul 2>nul
-+mkdir %WPDPACKDESTDIR%\Lib\x64\debug	>nul 2>nul
- 
--xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Release No AirPcap\x86\wpcap.lib"		%WPDPACKDESTDIR%\Lib\ >nul
--xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Release No AirPcap\x64\wpcap.lib"		%WPDPACKDESTDIR%\Lib\x64 >nul
-+xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Debug No AirPcap\x86\wpcap.lib"		    %WPDPACKDESTDIR%\Lib\debug\ >nul
-+xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Debug No AirPcap\x64\wpcap.lib"		    %WPDPACKDESTDIR%\Lib\x64\debug\ >nul
-+xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Release No AirPcap\x86\wpcap.lib"		%WPDPACKDESTDIR%\Lib\ >nul
-+xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Release No AirPcap\x64\wpcap.lib"		%WPDPACKDESTDIR%\Lib\x64 >nul
-+xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\Debug\x86\packet.lib	 	    %WPDPACKDESTDIR%\Lib\debug\ >nul
-+xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\Debug\x64\packet.lib	 	    %WPDPACKDESTDIR%\Lib\x64\debug\ >nul
- xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\Release\x86\packet.lib	 	%WPDPACKDESTDIR%\Lib\ >nul
- xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\Release\x64\packet.lib	 	%WPDPACKDESTDIR%\Lib\x64 >nul
- 
diff --git a/external_imported/vcpkg/ports/winpcap/portfile.cmake b/external_imported/vcpkg/ports/winpcap/portfile.cmake
index aebe6997f..f69302587 100644
--- a/external_imported/vcpkg/ports/winpcap/portfile.cmake
+++ b/external_imported/vcpkg/ports/winpcap/portfile.cmake
@@ -10,9 +10,6 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 89a5109ed17f8069f7a43497f6fec817c58620dbc5fa506e52069b9113c5bc13f69c307affe611281cb727cfa0f8529d07044d41427e350b24468ccc89a87f33
 )
 
-# MSBuild performs in-source builds, so to ensure reliability we must clear them each time
-file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/src)
-
 if(VCPKG_CRT_LINKAGE STREQUAL "static")
     set(CRT_LINKAGE "MT")
 elseif(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
@@ -21,25 +18,29 @@ endif()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     set(LIBRARY_LINKAGE "4")
+    set(lib_type StaticLibrary)
 elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
     set(LIBRARY_LINKAGE "2")
+    set(lib_type DynamicLibrary)
 endif()
 
 configure_file("${CMAKE_CURRENT_LIST_DIR}/packetNtx.patch.in" "${CURRENT_BUILDTREES_DIR}/src/packetNtx.patch" @ONLY)
 configure_file("${CMAKE_CURRENT_LIST_DIR}/wpcap.patch.in" "${CURRENT_BUILDTREES_DIR}/src/wpcap.patch" @ONLY)
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
-    REF ${WINPCAP_VERSION}
+vcpkg_extract_source_archive(
+    SOURCE_PATH
+    ARCHIVE "${ARCHIVE}"
+    SOURCE_BASE ${WINPCAP_VERSION}
     PATCHES
         "${CURRENT_BUILDTREES_DIR}/src/packetNtx.patch"
         "${CURRENT_BUILDTREES_DIR}/src/wpcap.patch"
-        "${CMAKE_CURRENT_LIST_DIR}/create_lib.patch"
-        "${CMAKE_CURRENT_LIST_DIR}/fix-create-lib-batch.patch"
+        "bison-flex.patch"
 )
 
-file(COPY "${CURRENT_PORT_DIR}/create_bin.bat" DESTINATION "${SOURCE_PATH}")
+file(REMOVE_RECURSE "${SOURCE_PATH}/wpcap/libpcap/rpcapd/win32-pthreads") # avoid copying pthreadVC.lib; TODO: maybe should also use libpcap headers instead of this vendored stuff
+
+vcpkg_replace_string("${SOURCE_PATH}/wpcap/PRJ/wpcap.vcproj" "DebugInformationFormat=\"4\"" "")
+vcpkg_replace_string("${SOURCE_PATH}/wpcap/PRJ/wpcap.vcproj" "DebugInformationFormat=\"3\"" "")
 
 if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
     set(PLATFORM Win32)
@@ -47,6 +48,14 @@ elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
     set(PLATFORM x64)
 endif()
 
+vcpkg_find_acquire_program(BISON)
+cmake_path(GET BISON PARENT_PATH BISON_DIR)
+vcpkg_add_to_path("${BISON_DIR}")
+
+vcpkg_find_acquire_program(FLEX)
+cmake_path(GET FLEX PARENT_PATH FLEX_DIR)
+vcpkg_add_to_path("${FLEX_DIR}")
+
 vcpkg_execute_required_process(
     COMMAND "devenv.exe"
             "Packet.sln"
@@ -55,48 +64,46 @@ vcpkg_execute_required_process(
     LOGNAME upgrade-Packet-${TARGET_TRIPLET}
 )
 
-if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(COPY "${CURRENT_PORT_DIR}/Packet.vcxproj" DESTINATION "${SOURCE_PATH}/packetNtx/Dll/Project/")
-endif()
-
-vcpkg_build_msbuild(
-    PROJECT_PATH "${SOURCE_PATH}/packetNtx/Dll/Project/Packet.sln"
+vcpkg_msbuild_install(
+    SOURCE_PATH "${SOURCE_PATH}"
+    PROJECT_SUBPATH "packetNtx/Dll/Project/Packet.sln"
     RELEASE_CONFIGURATION "Release"
     DEBUG_CONFIGURATION "Debug"
     PLATFORM ${PLATFORM}
 )
 
-vcpkg_find_acquire_program(BISON)
-vcpkg_find_acquire_program(FLEX)
+message(STATUS "Building Scanner/Parser")
 
 vcpkg_execute_required_process(
-    COMMAND ${SOURCE_PATH}/wpcap/PRJ/build_scanner_parser.bat
-    WORKING_DIRECTORY ${SOURCE_PATH}
+    COMMAND "${SOURCE_PATH}/wpcap/PRJ/build_scanner_parser.bat"
+    WORKING_DIRECTORY "${SOURCE_PATH}/wpcap/PRJ"
     LOGNAME build_scanner_parser-${TARGET_TRIPLET}
 )
 
+message(STATUS "Building wpcap")
+
 vcpkg_execute_required_process(
     COMMAND "devenv.exe"
             "wpcap.sln"
             /Upgrade
-    WORKING_DIRECTORY ${SOURCE_PATH}/wpcap/PRJ
+    WORKING_DIRECTORY "${SOURCE_PATH}/wpcap/PRJ"
     LOGNAME upgrade-wpcap-${TARGET_TRIPLET}
 )
 
-if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(COPY "${CURRENT_PORT_DIR}/wpcap.vcxproj" DESTINATION "${SOURCE_PATH}/wpcap/PRJ/")
-endif()
+configure_file("${CURRENT_PORT_DIR}/wpcap.vcxproj.in" "${SOURCE_PATH}/wpcap/PRJ/wpcap.vcxproj" @ONLY)
 
-vcpkg_build_msbuild(
-    PROJECT_PATH "${SOURCE_PATH}/wpcap/PRJ/wpcap.sln"
+
+vcpkg_msbuild_install(
+    SOURCE_PATH "${SOURCE_PATH}"
+    PROJECT_SUBPATH "wpcap/PRJ/wpcap.sln"
     RELEASE_CONFIGURATION "Release - No AirPcap"
     DEBUG_CONFIGURATION "Debug - No AirPcap"
     PLATFORM ${PLATFORM}
 )
 
 vcpkg_execute_required_process(
-    COMMAND ${SOURCE_PATH}/create_include.bat
-    WORKING_DIRECTORY ${SOURCE_PATH}
+    COMMAND "${SOURCE_PATH}/create_include.bat"
+    WORKING_DIRECTORY "${SOURCE_PATH}"
     LOGNAME create_include-${TARGET_TRIPLET}
 )
 
@@ -122,51 +129,6 @@ file(INSTALL
         "${SOURCE_PATH}/WpdPack/Include/pcap/vlan.h"
     DESTINATION "${CURRENT_PACKAGES_DIR}/include/pcap")
 
-vcpkg_execute_required_process(
-    COMMAND ${SOURCE_PATH}/create_lib.bat
-    WORKING_DIRECTORY ${SOURCE_PATH}
-    LOGNAME create_lib-${TARGET_TRIPLET}
-)
-
-set(PCAP_LIBRARY_PATH "${SOURCE_PATH}/WpdPack/Lib")
-if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
-    set(PCAP_LIBRARY_PATH "${PCAP_LIBRARY_PATH}/x64")
-endif()
-
-file(INSTALL
-        "${PCAP_LIBRARY_PATH}/Packet.lib"
-        "${PCAP_LIBRARY_PATH}/wpcap.lib"
-    DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
-
-file(INSTALL
-        "${PCAP_LIBRARY_PATH}/debug/Packet.lib"
-        "${PCAP_LIBRARY_PATH}/debug/wpcap.lib"
-    DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    vcpkg_execute_required_process(
-        COMMAND "${SOURCE_PATH}/create_bin.bat"
-        WORKING_DIRECTORY "${SOURCE_PATH}"
-        LOGNAME create_bin-${TARGET_TRIPLET}
-    )
-
-    set(PCAP_BINARY_PATH "${SOURCE_PATH}/WpdPack/Bin")
-    if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
-        set(PCAP_BINARY_PATH "${PCAP_BINARY_PATH}/x64")
-    endif()
-
-    file(INSTALL
-            "${PCAP_BINARY_PATH}/Packet.dll"
-            "${PCAP_BINARY_PATH}/wpcap.dll"
-        DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
-
-    file(INSTALL
-            "${PCAP_BINARY_PATH}/Packet.dll"
-            "${PCAP_BINARY_PATH}/wpcap.dll"
-        DESTINATION  "${CURRENT_PACKAGES_DIR}/debug/bin")
-endif()
-
 vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/pcap-stdinc.h" "#define inline __inline" "#ifndef __cplusplus\n#define inline __inline\n#endif")
 
-file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "The latest license is available in https://www.winpcap.org/misc/copyright.htm and in the header files.
-")
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "The latest license is available in https://www.winpcap.org/misc/copyright.htm and in the header files.")
diff --git a/external_imported/vcpkg/ports/winpcap/vcpkg.json b/external_imported/vcpkg/ports/winpcap/vcpkg.json
index be838b77b..7566e334d 100644
--- a/external_imported/vcpkg/ports/winpcap/vcpkg.json
+++ b/external_imported/vcpkg/ports/winpcap/vcpkg.json
@@ -1,8 +1,15 @@
 {
   "name": "winpcap",
   "version": "4.1.3",
-  "port-version": 8,
+  "port-version": 12,
   "description": "WinPcap is the industry-standard tool for link-layer network access in Windows environments.",
   "homepage": "https://www.winpcap.org",
-  "supports": "windows"
+  "supports": "windows & !uwp & !arm & !static",
+  "dependencies": [
+    {
+      "name": "vcpkg-msbuild",
+      "host": true,
+      "platform": "windows"
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/winpcap/wpcap.vcxproj b/external_imported/vcpkg/ports/winpcap/wpcap.vcxproj
deleted file mode 100644
index 5740dec40..000000000
--- a/external_imported/vcpkg/ports/winpcap/wpcap.vcxproj
+++ /dev/null
@@ -1,396 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug No AirPcap|Win32">
-      <Configuration>Debug No AirPcap</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug No AirPcap|x64">
-      <Configuration>Debug No AirPcap</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release No AirPcap|Win32">
-      <Configuration>Release No AirPcap</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release No AirPcap|x64">
-      <Configuration>Release No AirPcap</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{20B438DA-CBEC-4AFF-B11C-67B301D14AD5}</ProjectGuid>
-    <RootNamespace>wpcap</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release No AirPcap|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug No AirPcap|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release No AirPcap|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug No AirPcap|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release No AirPcap|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug No AirPcap|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release No AirPcap|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug No AirPcap|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>15.0.28127.55</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(ProjectDir)\$(Configuration)\x86\</OutDir>
-    <IntDir>$(ProjectDir)\$(Configuration)\x86\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(ProjectDir)\$(Configuration)\x64\</OutDir>
-    <IntDir>$(ProjectDir)\$(Configuration)\x64\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(ProjectDir)\$(Configuration)\x86\</OutDir>
-    <IntDir>$(ProjectDir)\$(Configuration)\x86\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(ProjectDir)\$(Configuration)\x64\</OutDir>
-    <IntDir>$(ProjectDir)\$(Configuration)\x64\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug No AirPcap|Win32'">
-    <OutDir>$(ProjectDir)\$(Configuration)\x86\</OutDir>
-    <IntDir>$(ProjectDir)\$(Configuration)\x86\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug No AirPcap|x64'">
-    <OutDir>$(ProjectDir)\$(Configuration)\x64\</OutDir>
-    <IntDir>$(ProjectDir)\$(Configuration)\x64\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release No AirPcap|Win32'">
-    <OutDir>$(ProjectDir)\$(Configuration)\x86\</OutDir>
-    <IntDir>$(ProjectDir)\$(Configuration)\x86\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release No AirPcap|x64'">
-    <OutDir>$(ProjectDir)\$(Configuration)\x64\</OutDir>
-    <IntDir>$(ProjectDir)\$(Configuration)\x64\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\libpcap;..\libpcap\lbl;..\libpcap\bpf\;..\..\common;..\libpcap\win32\include;..\Win32-Extensions;..\..\..\AirPcap_DevPack\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>LIBPCAP_EXPORTS;WIN32;_DEBUG;_WINDOWS;HAVE_ADDRINFO;YY_NEVER_INTERACTIVE;yylval=pcap_lval;HAVE_STRERROR;__STDC__;INET6;SIZEOF_CHAR=1;SIZEOF_SHORT=2;SIZEOF_INT=4;WPCAP;HAVE_VSNPRINTF;HAVE_REMOTE;HAVE_AIRPCAP_API;_U_=;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;HAVE_TC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;packet.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\packetNtx\Dll\Project\Debug\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>wpcap.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\libpcap;..\libpcap\lbl;..\libpcap\bpf\;..\..\common;..\libpcap\win32\include;..\Win32-Extensions;..\..\..\AirPcap_DevPack\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>LIBPCAP_EXPORTS;WIN32;_DEBUG;_WINDOWS;HAVE_ADDRINFO;YY_NEVER_INTERACTIVE;yylval=pcap_lval;HAVE_STRERROR;__STDC__;INET6;SIZEOF_CHAR=1;SIZEOF_SHORT=2;SIZEOF_INT=4;WPCAP;HAVE_VSNPRINTF;HAVE_REMOTE;HAVE_AIRPCAP_API;_U_=;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;HAVE_TC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;packet.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\packetNtx\Dll\Project\Debug\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>wpcap.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\libpcap;..\libpcap\lbl;..\libpcap\bpf\;..\..\common;..\libpcap\win32\include;..\Win32-Extensions;..\..\..\AirPcap_DevPack\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>LIBPCAP_EXPORTS;WIN32;NDEBUG;_WINDOWS;HAVE_ADDRINFO;YY_NEVER_INTERACTIVE;yylval=pcap_lval;HAVE_STRERROR;__STDC__;INET6;SIZEOF_CHAR=1;SIZEOF_SHORT=2;SIZEOF_INT=4;WPCAP;HAVE_VSNPRINTF;HAVE_REMOTE;HAVE_AIRPCAP_API;_U_=;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;HAVE_TC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;packet.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\packetNtx\Dll\Project\Release\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>wpcap.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\libpcap;..\libpcap\lbl;..\libpcap\bpf\;..\..\common;..\libpcap\win32\include;..\Win32-Extensions;..\..\..\AirPcap_DevPack\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>LIBPCAP_EXPORTS;WIN32;NDEBUG;_WINDOWS;HAVE_ADDRINFO;YY_NEVER_INTERACTIVE;yylval=pcap_lval;HAVE_STRERROR;__STDC__;INET6;SIZEOF_CHAR=1;SIZEOF_SHORT=2;SIZEOF_INT=4;WPCAP;HAVE_VSNPRINTF;HAVE_REMOTE;HAVE_AIRPCAP_API;_U_=;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;HAVE_TC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;packet.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\packetNtx\Dll\Project\Release\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>wpcap.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug No AirPcap|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\libpcap;..\libpcap\lbl;..\libpcap\bpf\;..\..\common;..\libpcap\win32\include;..\Win32-Extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>LIBPCAP_EXPORTS;WIN32;_DEBUG;_WINDOWS;HAVE_ADDRINFO;YY_NEVER_INTERACTIVE;yylval=pcap_lval;HAVE_STRERROR;__STDC__;INET6;SIZEOF_CHAR=1;SIZEOF_SHORT=2;SIZEOF_INT=4;WPCAP;HAVE_VSNPRINTF;HAVE_REMOTE;_U_=;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;HAVE_TC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;packet.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\packetNtx\Dll\Project\Debug\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>wpcap.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Lib>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug No AirPcap|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\libpcap;..\libpcap\lbl;..\libpcap\bpf\;..\..\common;..\libpcap\win32\include;..\Win32-Extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>LIBPCAP_EXPORTS;WIN32;_DEBUG;_WINDOWS;HAVE_ADDRINFO;YY_NEVER_INTERACTIVE;yylval=pcap_lval;HAVE_STRERROR;__STDC__;INET6;SIZEOF_CHAR=1;SIZEOF_SHORT=2;SIZEOF_INT=4;WPCAP;HAVE_VSNPRINTF;HAVE_REMOTE;_U_=;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;HAVE_TC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;packet.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\packetNtx\Dll\Project\Debug\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>wpcap.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release No AirPcap|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\libpcap;..\libpcap\lbl;..\libpcap\bpf\;..\..\common;..\libpcap\win32\include;..\Win32-Extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>LIBPCAP_EXPORTS;WIN32;NDEBUG;_WINDOWS;HAVE_ADDRINFO;YY_NEVER_INTERACTIVE;yylval=pcap_lval;HAVE_STRERROR;__STDC__;INET6;SIZEOF_CHAR=1;SIZEOF_SHORT=2;SIZEOF_INT=4;WPCAP;HAVE_VSNPRINTF;HAVE_REMOTE;_U_=;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;HAVE_TC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;packet.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\packetNtx\Dll\Project\Release\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>wpcap.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Lib>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release No AirPcap|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\libpcap;..\libpcap\lbl;..\libpcap\bpf\;..\..\common;..\libpcap\win32\include;..\Win32-Extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>LIBPCAP_EXPORTS;WIN32;NDEBUG;_WINDOWS;HAVE_ADDRINFO;YY_NEVER_INTERACTIVE;yylval=pcap_lval;HAVE_STRERROR;__STDC__;INET6;SIZEOF_CHAR=1;SIZEOF_SHORT=2;SIZEOF_INT=4;WPCAP;HAVE_VSNPRINTF;HAVE_REMOTE;_U_=;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;HAVE_TC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;packet.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\packetNtx\Dll\Project\Release\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>wpcap.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\libpcap\bpf\net\bpf_filter.c" />
-    <ClCompile Include="..\libpcap\bpf_dump.c" />
-    <ClCompile Include="..\libpcap\bpf_image.c" />
-    <ClCompile Include="..\libpcap\etherent.c" />
-    <ClCompile Include="..\libpcap\fad-win32.c" />
-    <ClCompile Include="..\libpcap\gencode.c" />
-    <ClCompile Include="..\libpcap\grammar.c" />
-    <ClCompile Include="..\libpcap\inet.c" />
-    <ClCompile Include="..\libpcap\nametoaddr.c" />
-    <ClCompile Include="..\libpcap\optimize.c" />
-    <ClCompile Include="..\libpcap\pcap-new.c" />
-    <ClCompile Include="..\libpcap\pcap-remote.c" />
-    <ClCompile Include="..\libpcap\pcap-tc.c" />
-    <ClCompile Include="..\libpcap\pcap-win32.c" />
-    <ClCompile Include="..\libpcap\pcap.c" />
-    <ClCompile Include="..\libpcap\savefile.c" />
-    <ClCompile Include="..\libpcap\scanner.c" />
-    <ClCompile Include="..\libpcap\sockutils.c" />
-    <ClCompile Include="..\libpcap\Win32\Src\ffs.c" />
-    <ClCompile Include="..\libpcap\Win32\Src\getservent.c" />
-    <ClCompile Include="..\Win32-Extensions\Win32-Extensions.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\libpcap\acconfig.h" />
-    <ClInclude Include="..\libpcap\arcnet.h" />
-    <ClInclude Include="..\libpcap\atmuni31.h" />
-    <ClInclude Include="..\libpcap\dlpisubs.h" />
-    <ClInclude Include="..\libpcap\ethertype.h" />
-    <ClInclude Include="..\libpcap\gencode.h" />
-    <ClInclude Include="..\libpcap\ieee80211.h" />
-    <ClInclude Include="..\libpcap\llc.h" />
-    <ClInclude Include="..\libpcap\nlpid.h" />
-    <ClInclude Include="..\libpcap\pcap-int.h" />
-    <ClInclude Include="..\libpcap\pcap-namedb.h" />
-    <ClInclude Include="..\libpcap\pcap-remote.h" />
-    <ClInclude Include="..\libpcap\pcap-stdinc.h" />
-    <ClInclude Include="..\libpcap\pcap-tc.h" />
-    <ClInclude Include="..\libpcap\pcap.h" />
-    <ClInclude Include="..\libpcap\pcap1.h" />
-    <ClInclude Include="..\libpcap\ppp.h" />
-    <ClInclude Include="..\libpcap\remote-ext.h" />
-    <ClInclude Include="..\libpcap\sockutils.h" />
-    <ClInclude Include="..\libpcap\sunatmpos.h" />
-    <ClInclude Include="..\libpcap\tokdefs.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\Win32-Extensions\version.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/winpcap/wpcap.vcxproj.in b/external_imported/vcpkg/ports/winpcap/wpcap.vcxproj.in
new file mode 100644
index 000000000..4fbaf3b8f
--- /dev/null
+++ b/external_imported/vcpkg/ports/winpcap/wpcap.vcxproj.in
@@ -0,0 +1,390 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug No AirPcap|Win32">
+      <Configuration>Debug No AirPcap</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug No AirPcap|x64">
+      <Configuration>Debug No AirPcap</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release No AirPcap|Win32">
+      <Configuration>Release No AirPcap</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release No AirPcap|x64">
+      <Configuration>Release No AirPcap</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{20B438DA-CBEC-4AFF-B11C-67B301D14AD5}</ProjectGuid>
+    <RootNamespace>wpcap</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release No AirPcap|Win32'" Label="Configuration">
+    <ConfigurationType>@lib_type@</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug No AirPcap|Win32'" Label="Configuration">
+    <ConfigurationType>@lib_type@</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>@lib_type@</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>@lib_type@</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release No AirPcap|x64'" Label="Configuration">
+    <ConfigurationType>@lib_type@</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug No AirPcap|x64'" Label="Configuration">
+    <ConfigurationType>@lib_type@</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>@lib_type@</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>@lib_type@</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release No AirPcap|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug No AirPcap|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release No AirPcap|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug No AirPcap|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>15.0.28127.55</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(ProjectDir)\$(Configuration)\x86\</OutDir>
+    <IntDir>$(ProjectDir)\$(Configuration)\x86\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(ProjectDir)\$(Configuration)\x64\</OutDir>
+    <IntDir>$(ProjectDir)\$(Configuration)\x64\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(ProjectDir)\$(Configuration)\x86\</OutDir>
+    <IntDir>$(ProjectDir)\$(Configuration)\x86\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(ProjectDir)\$(Configuration)\x64\</OutDir>
+    <IntDir>$(ProjectDir)\$(Configuration)\x64\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug No AirPcap|Win32'">
+    <OutDir>$(ProjectDir)\$(Configuration)\x86\</OutDir>
+    <IntDir>$(ProjectDir)\$(Configuration)\x86\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug No AirPcap|x64'">
+    <OutDir>$(ProjectDir)\$(Configuration)\x64\</OutDir>
+    <IntDir>$(ProjectDir)\$(Configuration)\x64\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release No AirPcap|Win32'">
+    <OutDir>$(ProjectDir)\$(Configuration)\x86\</OutDir>
+    <IntDir>$(ProjectDir)\$(Configuration)\x86\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release No AirPcap|x64'">
+    <OutDir>$(ProjectDir)\$(Configuration)\x64\</OutDir>
+    <IntDir>$(ProjectDir)\$(Configuration)\x64\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\libpcap;..\libpcap\lbl;..\libpcap\bpf\;..\..\common;..\libpcap\win32\include;..\Win32-Extensions;..\..\..\AirPcap_DevPack\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>LIBPCAP_EXPORTS;WIN32;_DEBUG;_WINDOWS;HAVE_ADDRINFO;YY_NEVER_INTERACTIVE;yylval=pcap_lval;HAVE_STRERROR;__STDC__;INET6;SIZEOF_CHAR=1;SIZEOF_SHORT=2;SIZEOF_INT=4;WPCAP;HAVE_VSNPRINTF;HAVE_REMOTE;HAVE_AIRPCAP_API;_U_=;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;HAVE_TC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>None</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;packet.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\packetNtx\Dll\Project\Debug\x86;@CURRENT_PACKAGES_DIR@/debug/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <ModuleDefinitionFile>wpcap.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\libpcap;..\libpcap\lbl;..\libpcap\bpf\;..\..\common;..\libpcap\win32\include;..\Win32-Extensions;..\..\..\AirPcap_DevPack\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>LIBPCAP_EXPORTS;WIN32;_DEBUG;_WINDOWS;HAVE_ADDRINFO;YY_NEVER_INTERACTIVE;yylval=pcap_lval;HAVE_STRERROR;__STDC__;INET6;SIZEOF_CHAR=1;SIZEOF_SHORT=2;SIZEOF_INT=4;WPCAP;HAVE_VSNPRINTF;HAVE_REMOTE;HAVE_AIRPCAP_API;_U_=;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;HAVE_TC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;packet.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\packetNtx\Dll\Project\Debug\x64;@CURRENT_PACKAGES_DIR@/debug/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <ModuleDefinitionFile>wpcap.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\libpcap;..\libpcap\lbl;..\libpcap\bpf\;..\..\common;..\libpcap\win32\include;..\Win32-Extensions;..\..\..\AirPcap_DevPack\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>LIBPCAP_EXPORTS;WIN32;NDEBUG;_WINDOWS;HAVE_ADDRINFO;YY_NEVER_INTERACTIVE;yylval=pcap_lval;HAVE_STRERROR;__STDC__;INET6;SIZEOF_CHAR=1;SIZEOF_SHORT=2;SIZEOF_INT=4;WPCAP;HAVE_VSNPRINTF;HAVE_REMOTE;HAVE_AIRPCAP_API;_U_=;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;HAVE_TC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;packet.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\packetNtx\Dll\Project\Release\x86;@CURRENT_PACKAGES_DIR@/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>wpcap.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\libpcap;..\libpcap\lbl;..\libpcap\bpf\;..\..\common;..\libpcap\win32\include;..\Win32-Extensions;..\..\..\AirPcap_DevPack\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>LIBPCAP_EXPORTS;WIN32;NDEBUG;_WINDOWS;HAVE_ADDRINFO;YY_NEVER_INTERACTIVE;yylval=pcap_lval;HAVE_STRERROR;__STDC__;INET6;SIZEOF_CHAR=1;SIZEOF_SHORT=2;SIZEOF_INT=4;WPCAP;HAVE_VSNPRINTF;HAVE_REMOTE;HAVE_AIRPCAP_API;_U_=;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;HAVE_TC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;packet.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\packetNtx\Dll\Project\Release\x64;@CURRENT_PACKAGES_DIR@/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>wpcap.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug No AirPcap|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\libpcap;..\libpcap\lbl;..\libpcap\bpf\;..\..\common;..\libpcap\win32\include;..\Win32-Extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>LIBPCAP_EXPORTS;WIN32;_DEBUG;_WINDOWS;HAVE_ADDRINFO;YY_NEVER_INTERACTIVE;yylval=pcap_lval;HAVE_STRERROR;__STDC__;INET6;SIZEOF_CHAR=1;SIZEOF_SHORT=2;SIZEOF_INT=4;WPCAP;HAVE_VSNPRINTF;HAVE_REMOTE;_U_=;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;HAVE_TC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>None</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;packet.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\packetNtx\Dll\Project\Debug\x86;@CURRENT_PACKAGES_DIR@/debug/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <ModuleDefinitionFile>wpcap.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Lib>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug No AirPcap|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\libpcap;..\libpcap\lbl;..\libpcap\bpf\;..\..\common;..\libpcap\win32\include;..\Win32-Extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>LIBPCAP_EXPORTS;WIN32;_DEBUG;_WINDOWS;HAVE_ADDRINFO;YY_NEVER_INTERACTIVE;yylval=pcap_lval;HAVE_STRERROR;__STDC__;INET6;SIZEOF_CHAR=1;SIZEOF_SHORT=2;SIZEOF_INT=4;WPCAP;HAVE_VSNPRINTF;HAVE_REMOTE;_U_=;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;HAVE_TC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;packet.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\packetNtx\Dll\Project\Debug\x64;@CURRENT_PACKAGES_DIR@/debug/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <ModuleDefinitionFile>wpcap.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release No AirPcap|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\libpcap;..\libpcap\lbl;..\libpcap\bpf\;..\..\common;..\libpcap\win32\include;..\Win32-Extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>LIBPCAP_EXPORTS;WIN32;NDEBUG;_WINDOWS;HAVE_ADDRINFO;YY_NEVER_INTERACTIVE;yylval=pcap_lval;HAVE_STRERROR;__STDC__;INET6;SIZEOF_CHAR=1;SIZEOF_SHORT=2;SIZEOF_INT=4;WPCAP;HAVE_VSNPRINTF;HAVE_REMOTE;_U_=;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;HAVE_TC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;packet.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\packetNtx\Dll\Project\Release\x86;@CURRENT_PACKAGES_DIR@/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>wpcap.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Lib>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release No AirPcap|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\libpcap;..\libpcap\lbl;..\libpcap\bpf\;..\..\common;..\libpcap\win32\include;..\Win32-Extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>LIBPCAP_EXPORTS;WIN32;NDEBUG;_WINDOWS;HAVE_ADDRINFO;YY_NEVER_INTERACTIVE;yylval=pcap_lval;HAVE_STRERROR;__STDC__;INET6;SIZEOF_CHAR=1;SIZEOF_SHORT=2;SIZEOF_INT=4;WPCAP;HAVE_VSNPRINTF;HAVE_REMOTE;_U_=;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;HAVE_TC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;packet.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\packetNtx\Dll\Project\Release\x64;@CURRENT_PACKAGES_DIR@/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>wpcap.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\libpcap\bpf\net\bpf_filter.c" />
+    <ClCompile Include="..\libpcap\bpf_dump.c" />
+    <ClCompile Include="..\libpcap\bpf_image.c" />
+    <ClCompile Include="..\libpcap\etherent.c" />
+    <ClCompile Include="..\libpcap\fad-win32.c" />
+    <ClCompile Include="..\libpcap\gencode.c" />
+    <ClCompile Include="..\libpcap\grammar.c" />
+    <ClCompile Include="..\libpcap\inet.c" />
+    <ClCompile Include="..\libpcap\nametoaddr.c" />
+    <ClCompile Include="..\libpcap\optimize.c" />
+    <ClCompile Include="..\libpcap\pcap-new.c" />
+    <ClCompile Include="..\libpcap\pcap-remote.c" />
+    <ClCompile Include="..\libpcap\pcap-tc.c" />
+    <ClCompile Include="..\libpcap\pcap-win32.c" />
+    <ClCompile Include="..\libpcap\pcap.c" />
+    <ClCompile Include="..\libpcap\savefile.c" />
+    <ClCompile Include="..\libpcap\scanner.c" />
+    <ClCompile Include="..\libpcap\sockutils.c" />
+    <ClCompile Include="..\libpcap\Win32\Src\ffs.c" />
+    <ClCompile Include="..\libpcap\Win32\Src\getservent.c" />
+    <ClCompile Include="..\Win32-Extensions\Win32-Extensions.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\libpcap\acconfig.h" />
+    <ClInclude Include="..\libpcap\arcnet.h" />
+    <ClInclude Include="..\libpcap\atmuni31.h" />
+    <ClInclude Include="..\libpcap\dlpisubs.h" />
+    <ClInclude Include="..\libpcap\ethertype.h" />
+    <ClInclude Include="..\libpcap\gencode.h" />
+    <ClInclude Include="..\libpcap\ieee80211.h" />
+    <ClInclude Include="..\libpcap\llc.h" />
+    <ClInclude Include="..\libpcap\nlpid.h" />
+    <ClInclude Include="..\libpcap\pcap-int.h" />
+    <ClInclude Include="..\libpcap\pcap-namedb.h" />
+    <ClInclude Include="..\libpcap\pcap-remote.h" />
+    <ClInclude Include="..\libpcap\pcap-stdinc.h" />
+    <ClInclude Include="..\libpcap\pcap-tc.h" />
+    <ClInclude Include="..\libpcap\pcap.h" />
+    <ClInclude Include="..\libpcap\pcap1.h" />
+    <ClInclude Include="..\libpcap\ppp.h" />
+    <ClInclude Include="..\libpcap\remote-ext.h" />
+    <ClInclude Include="..\libpcap\sockutils.h" />
+    <ClInclude Include="..\libpcap\sunatmpos.h" />
+    <ClInclude Include="..\libpcap\tokdefs.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\Win32-Extensions\version.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/winsparkle/portfile.cmake b/external_imported/vcpkg/ports/winsparkle/portfile.cmake
index 1c86809a6..a0ae2724c 100644
--- a/external_imported/vcpkg/ports/winsparkle/portfile.cmake
+++ b/external_imported/vcpkg/ports/winsparkle/portfile.cmake
@@ -1,11 +1,11 @@
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/vslavik/winsparkle/releases/download/v0.7.0/WinSparkle-0.7.0.zip"
-    FILENAME "winsparkle-070.zip"
-    SHA512 c2cf29e1880534c170110f8e5a966939aecc9a9e05afc87868400074f1492fcac949b61e2ce4636eadd2f127caad3660e0f763476e9523aad3834d673f6edd77
+    URLS "https://github.com/vslavik/winsparkle/releases/download/v0.8.1/WinSparkle-0.8.1.zip"
+    FILENAME "winsparkle-081.zip"
+    SHA512 05588793272618ca13fe884620f1ed421276b011a906f15c92f4879b1787c71b175ae1a170b80fe2adfdb7669eac90c38fac929a9bcf382388983f9aea25ba9c
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE ${ARCHIVE}
 )
 
@@ -14,11 +14,10 @@ file(INSTALL ${HEADER_LIST} DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}
 file(GLOB TOOLS_LIST "${SOURCE_PATH}/bin/*.bat")
 file(INSTALL ${TOOLS_LIST} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
 
-
-# Note: It is an explicit design goal for WinSparkle to be a single 
-# self-contained DLL with no external dependencies (to the point that 
-# it even links to static CRT!). This matters for e.g. in-app delta updates 
-# or re-launching the app after update. It is not statically linked even if a 
+# Note: It is an explicit design goal for WinSparkle to be a single
+# self-contained DLL with no external dependencies (to the point that
+# it even links to static CRT!). This matters for e.g. in-app delta updates
+# or re-launching the app after update. It is not statically linked even if a
 # static linking is used for everything else.
 set(VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY enabled)
 
@@ -27,7 +26,7 @@ if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
     file(INSTALL "${SOURCE_PATH}/Release/WinSparkle.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
     file(INSTALL "${SOURCE_PATH}/Release/WinSparkle.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
 
-    # We have no debug, but since Winsparkle is a self-contained dll, we can copy it to the Debug folder as well  
+    # We have no debug, but since Winsparkle is a self-contained dll, we can copy it to the Debug folder as well
     file(INSTALL "${SOURCE_PATH}/Release/WinSparkle.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
     file(INSTALL "${SOURCE_PATH}/Release/WinSparkle.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
     file(INSTALL "${SOURCE_PATH}/Release/WinSparkle.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
@@ -36,7 +35,7 @@ elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
     file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
     file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
 
-    # We have no debug, but since Winsparkle is a self-contained dll, we can copy it to the Debug folder as well  
+    # We have no debug, but since Winsparkle is a self-contained dll, we can copy it to the Debug folder as well
     file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
     file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
     file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
@@ -44,5 +43,4 @@ else()
     message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}")
 endif()
 
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/winsparkle/vcpkg.json b/external_imported/vcpkg/ports/winsparkle/vcpkg.json
index b2055e91a..3eda505ab 100644
--- a/external_imported/vcpkg/ports/winsparkle/vcpkg.json
+++ b/external_imported/vcpkg/ports/winsparkle/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "winsparkle",
-  "version": "0.7.0",
-  "port-version": 1,
+  "version": "0.8.1",
   "description": "WinSparkle is an easy-to-use software update library for Windows developers.",
   "homepage": "https://winsparkle.org",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/wintoast/CMakeLists.txt b/external_imported/vcpkg/ports/wintoast/CMakeLists.txt
deleted file mode 100644
index eb70fb9cf..000000000
--- a/external_imported/vcpkg/ports/wintoast/CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-cmake_minimum_required(VERSION 3.11)
-project(wintoast)
-
-set(SRC_FILES
-src/wintoastlib.cpp
-)
-
-add_library(wintoast ${SRC_FILES})
-
-target_include_directories(wintoast PUBLIC
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
-  $<INSTALL_INTERFACE:include/wintoast>
-)
-
-# Install targets
-install(TARGETS wintoast
-	RUNTIME DESTINATION bin 
-	LIBRARY DESTINATION lib 
-	ARCHIVE DESTINATION lib 
-)
-
-# Install headers
-if (INSTALL_HEADERS)
-  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/wintoastlib.h DESTINATION include/wintoast)
-endif()
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/wintoast/Config.cmake.in b/external_imported/vcpkg/ports/wintoast/Config.cmake.in
new file mode 100644
index 000000000..575d76b5b
--- /dev/null
+++ b/external_imported/vcpkg/ports/wintoast/Config.cmake.in
@@ -0,0 +1,19 @@
+if(NOT TARGET unofficial::wintoast::wintoast)
+    add_library(unofficial::wintoast::wintoast UNKNOWN IMPORTED)
+
+    set_target_properties(unofficial::wintoast::wintoast PROPERTIES
+        INTERFACE_INCLUDE_DIRECTORIES "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include"
+    )
+
+    find_library(WinToast_LIBRARY_RELEASE NAMES WinToast PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH)
+    if(EXISTS "${WinToast_LIBRARY_RELEASE}")
+        set_property(TARGET unofficial::wintoast::wintoast APPEND PROPERTY IMPORTED_CONFIGURATIONS "Release")
+        set_target_properties(unofficial::wintoast::wintoast PROPERTIES IMPORTED_LOCATION_RELEASE "${WinToast_LIBRARY_RELEASE}")
+    endif()
+
+    find_library(WinToast_LIBRARY_DEBUG NAMES WinToast PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH)
+    if(EXISTS "${WinToast_LIBRARY_DEBUG}")
+        set_property(TARGET unofficial::wintoast::wintoast APPEND PROPERTY IMPORTED_CONFIGURATIONS "Debug")
+        set_target_properties(unofficial::wintoast::wintoast PROPERTIES IMPORTED_LOCATION_DEBUG "${WinToast_LIBRARY_DEBUG}")
+    endif()
+endif()
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/wintoast/portfile.cmake b/external_imported/vcpkg/ports/wintoast/portfile.cmake
index 3cbb33b65..ea6c0d5d0 100644
--- a/external_imported/vcpkg/ports/wintoast/portfile.cmake
+++ b/external_imported/vcpkg/ports/wintoast/portfile.cmake
@@ -3,23 +3,28 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO mohabouje/WinToast
-  REF v1.2.0
-  SHA512 d8bd44439100772929eb8a4eb4aebfd66fa54562c838eb4c081a382dc1d73c545faa6d9675e320864d9b533e4a0c4a673e44058c7f643ccd56ec90830cdfaf45
+  REF "v${VERSION}"
+  SHA512 b9e34595049851754dafe506681af494f59edf94a4324c20aaeadea25b9ed0abac87e93384d2080c327dbbdd22441800e9af7c5ce6728d7cc1464796a83cffbd
   HEAD_REF master
 )
 
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
-
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS_RELEASE -DINSTALL_HEADERS=ON
-    OPTIONS_DEBUG -DINSTALL_HEADERS=OFF
-    
+    OPTIONS
+        -DWINTOASTLIB_BUILD_EXAMPLES=OFF
+        -DWINTOASTLIB_QT_ENABLED=OFF
 )
 
-vcpkg_cmake_install()
+vcpkg_cmake_build(TARGET WinToast)
+
+if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+  file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${VCPKG_TARGET_STATIC_LIBRARY_PREFIX}WinToast${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
+endif()
+if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+  file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/${VCPKG_TARGET_STATIC_LIBRARY_PREFIX}WinToast${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
+endif()
+file(INSTALL "${SOURCE_PATH}/include/wintoastlib.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+configure_file("${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake" @ONLY)
 
-# Install license
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
\ No newline at end of file
diff --git a/external_imported/vcpkg/ports/wintoast/vcpkg.json b/external_imported/vcpkg/ports/wintoast/vcpkg.json
index b96aa95b3..aa7d817e3 100644
--- a/external_imported/vcpkg/ports/wintoast/vcpkg.json
+++ b/external_imported/vcpkg/ports/wintoast/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "wintoast",
-  "version": "1.2.0",
-  "port-version": 2,
+  "version": "1.3.0",
   "description": "WinToast is a lightly library written in C++ which brings a complete integration of the modern toast notifications of Windows 8 & Windows 10.",
   "supports": "windows & !uwp",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/wmipp/portfile.cmake b/external_imported/vcpkg/ports/wmipp/portfile.cmake
new file mode 100644
index 000000000..202e47bbf
--- /dev/null
+++ b/external_imported/vcpkg/ports/wmipp/portfile.cmake
@@ -0,0 +1,11 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO sonodima/wmipp
+    REF "v${VERSION}"
+    SHA512 3cfa7bacc1e03077503fa04e636106ce5bfc66a3fce25e52033433c2328a62229fdf7baad4a0116459fb0c299839ea02507fe8da43c853b9dd8bcfcb3d2301d3
+    HEAD_REF main
+)
+
+file(COPY "${SOURCE_PATH}/include/wmipp" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/wmipp/vcpkg.json b/external_imported/vcpkg/ports/wmipp/vcpkg.json
new file mode 100644
index 000000000..981421e15
--- /dev/null
+++ b/external_imported/vcpkg/ports/wmipp/vcpkg.json
@@ -0,0 +1,8 @@
+{
+  "name": "wmipp",
+  "version": "1.2.0",
+  "description": "Streamlined Windows Management Instrumentation (WMI) integration for seamless C++ development",
+  "homepage": "https://github.com/sonodima/wmipp",
+  "license": "MIT",
+  "supports": "windows & !uwp"
+}
diff --git a/external_imported/vcpkg/ports/woff2/0001-unofficial-brotli.patch b/external_imported/vcpkg/ports/woff2/0001-unofficial-brotli.patch
index 12997b53d..611e49c56 100644
--- a/external_imported/vcpkg/ports/woff2/0001-unofficial-brotli.patch
+++ b/external_imported/vcpkg/ports/woff2/0001-unofficial-brotli.patch
@@ -2,33 +2,18 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index ecfbb83..420c578 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -34,13 +34,23 @@ endif()
+@@ -34,13 +34,6 @@ endif()
  # Find Brotli dependencies
  set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
- find_package(BrotliDec)
+-find_package(BrotliDec)
 -if (NOT BROTLIDEC_FOUND)
 -    message(FATAL_ERROR "librotlidec is needed to build woff2.")
 -endif ()
- find_package(BrotliEnc)
+-find_package(BrotliEnc)
 -if (NOT BROTLIENC_FOUND)
 -    message(FATAL_ERROR "librotlienc is needed to build woff2.")
 -endif ()
-+if(BROTLIDEC_FOUND AND BROTLIENC_FOUND)
-+  include_directories("${BROTLIDEC_INCLUDE_DIRS}" "${BROTLIENC_INCLUDE_DIRS}")
-+  set(WOFF2_BROTLIDEC libbrotlidec)
-+  set(WOFF2_BROTLIENC libbrotlienc)
-+  set(WOFF2_BORTLIDEC_LIBRARIES "${BROTLIDEC_LIBRARIES}")
-+  set(WOFF2_BORTLIENC_LIBRARIES "${BROTLIENC_LIBRARIES}")
-+else()
 +  find_package(unofficial-brotli REQUIRED)
-+  if(TARGET unofficial::brotli::brotlidec-static)
-+    set(BROTLI_LINKAGE -static)
-+  endif()
-+  set(WOFF2_BROTLIDEC unofficial::brotli::brotlidec${BROTLI_LINKAGE})
-+  set(WOFF2_BROTLIENC unofficial::brotli::brotlienc${BROTLI_LINKAGE})
-+  set(WOFF2_BORTLIDEC_LIBRARIES unofficial::brotli::brotlidec${BROTLI_LINKAGE} unofficial::brotli::brotlicommon${BROTLI_LINKAGE})
-+  set(WOFF2_BORTLIENC_LIBRARIES unofficial::brotli::brotlienc${BROTLI_LINKAGE} unofficial::brotli::brotlicommon${BROTLI_LINKAGE})
-+endif()
  
  # Set compiler flags
  if (NOT CANONICAL_PREFIXES)
@@ -49,7 +34,7 @@ index ecfbb83..420c578 100644
              src/woff2_dec.cc
              src/woff2_out.cc)
 -target_link_libraries(woff2dec woff2common "${BROTLIDEC_LIBRARIES}")
-+target_link_libraries(woff2dec woff2common ${WOFF2_BORTLIDEC_LIBRARIES})
++target_link_libraries(woff2dec woff2common unofficial::brotli::brotlidec)
  add_executable(woff2_decompress src/woff2_decompress.cc)
  target_link_libraries(woff2_decompress woff2dec)
  
@@ -58,7 +43,7 @@ index ecfbb83..420c578 100644
              src/transform.cc
              src/woff2_enc.cc)
 -target_link_libraries(woff2enc woff2common "${BROTLIENC_LIBRARIES}")
-+target_link_libraries(woff2enc woff2common ${WOFF2_BORTLIENC_LIBRARIES})
++target_link_libraries(woff2enc woff2common unofficial::brotli::brotlienc)
  add_executable(woff2_compress src/woff2_compress.cc)
  target_link_libraries(woff2_compress woff2enc)
  
diff --git a/external_imported/vcpkg/ports/woff2/vcpkg.json b/external_imported/vcpkg/ports/woff2/vcpkg.json
index 14023e2c5..fa3ece813 100644
--- a/external_imported/vcpkg/ports/woff2/vcpkg.json
+++ b/external_imported/vcpkg/ports/woff2/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "woff2",
   "version": "1.0.2",
-  "port-version": 3,
+  "port-version": 4,
   "description": "font compression reference code",
   "dependencies": [
     "brotli",
diff --git a/external_imported/vcpkg/ports/wolfmqtt/cmake-patch.diff b/external_imported/vcpkg/ports/wolfmqtt/cmake-patch.diff
new file mode 100644
index 000000000..47148665e
--- /dev/null
+++ b/external_imported/vcpkg/ports/wolfmqtt/cmake-patch.diff
@@ -0,0 +1,19 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 32f0332..4cec80c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -65,12 +65,12 @@ else()
+         target_compile_options(wolfmqtt PUBLIC ${WOLFSSL_CFLAGS_OTHER})
+     else()
+         # For support with vcpkg
+-        find_package(wolfssl CONFIG)
++        find_package(wolfssl CONFIG REQUIRED)
+         if (wolfssl_FOUND)
+             target_compile_definitions(wolfmqtt PUBLIC
+                 "ENABLE_MQTT_TLS"
+                 )
+-            target_link_libraries(wolfmqtt PUBLIC wolfssl)
++            target_link_libraries(wolfmqtt PUBLIC wolfssl::wolfssl)
+         endif()
+     endif()
+ endif()
diff --git a/external_imported/vcpkg/ports/wolfmqtt/portfile.cmake b/external_imported/vcpkg/ports/wolfmqtt/portfile.cmake
index 4e5c2014c..82799c9aa 100644
--- a/external_imported/vcpkg/ports/wolfmqtt/portfile.cmake
+++ b/external_imported/vcpkg/ports/wolfmqtt/portfile.cmake
@@ -1,9 +1,11 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO wolfssl/wolfmqtt
-    REF v1.15.0
-    SHA512 9012e4723d469ce98bd5f0e6a3e001ab6c94c0fb4fef0d2de73446d702959052f6f5fe5a9d805b088f17c2d94a25abf41ae802421c99b62f8d8cd9a14c9e7271
+    REF v1.16.0
+    SHA512 30d28a37b26adacae589b9cfee9a2cd8697fa1e84ac867d08123dab5434bb19152adb0d94224656d2c1f01833d76bcd7ff63b63da4dbce0873b352e93b6e6b12
     HEAD_REF master
+    PATCHES
+      cmake-patch.diff
     )
 
 vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH}
diff --git a/external_imported/vcpkg/ports/wolfmqtt/vcpkg.json b/external_imported/vcpkg/ports/wolfmqtt/vcpkg.json
index 9c914fe98..08ebd2081 100644
--- a/external_imported/vcpkg/ports/wolfmqtt/vcpkg.json
+++ b/external_imported/vcpkg/ports/wolfmqtt/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "wolfmqtt",
-  "version": "1.15.0",
+  "version": "1.16.0",
   "description": "MQTT library used with wolfSSL library for many platforms",
   "homepage": "https://wolfssl.com",
   "license": "GPL-2.0-or-later",
diff --git a/external_imported/vcpkg/ports/wolfssl/portfile.cmake b/external_imported/vcpkg/ports/wolfssl/portfile.cmake
index 8a5aadbc5..807e9aea1 100644
--- a/external_imported/vcpkg/ports/wolfssl/portfile.cmake
+++ b/external_imported/vcpkg/ports/wolfssl/portfile.cmake
@@ -1,13 +1,28 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO wolfssl/wolfssl
-    REF v5.5.4-stable
-    SHA512 6ecb37d614ae7b8ea9caa5bedebe2bb16b2719e172e146fc707ce1ead09a6c4d168b8e8aa52255d4cf0341a0617f17d7f4b321ba88aaa77664861c31ca7a1163
+    REF v5.6.6-stable
+    SHA512 d664ab1cd84d7c33d1b34eb934843292b7ffc07b922b4c483b45deeeeda5c425b673640e3049f731bfff364bd7e7c0c14e236afce36622a7d03242d3be0c7382
     HEAD_REF master
     PATCHES
-        pr_5949.patch
     )
 
+if ("dtls" IN_LIST FEATURES)
+    set(ENABLE_DTLS yes)
+else()
+    set(ENABLE_DTLS no)
+endif()
+
+vcpkg_cmake_get_vars(cmake_vars_file)
+include("${cmake_vars_file}")
+
+foreach(config RELEASE DEBUG)
+  string(APPEND VCPKG_COMBINED_C_FLAGS_${config} " -DWOLFSSL_ALT_CERT_CHAINS -DWOLFSSL_DES_ECB -DWOLFSSL_CUSTOM_OID -DHAVE_OID_ENCODING -DWOLFSSL_CERT_GEN -DWOLFSSL_ASN_TEMPLATE -DWOLFSSL_KEY_GEN -DHAVE_PKCS7 -DHAVE_AES_KEYWRAP -DWOLFSSL_AES_DIRECT -DHAVE_X963_KDF")
+  if ("secret-callback" IN_LIST FEATURES)
+      string(APPEND VCPKG_COMBINED_C_FLAGS_${config} " -DHAVE_SECRET_CALLBACK")
+  endif()
+endforeach()
+
 vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS
@@ -22,8 +37,13 @@ vcpkg_cmake_configure(
       -DWOLFSSL_OCSPSTAPLING_V2=yes
       -DWOLFSSL_CRL=yes
       -DWOLFSSL_DES3=yes
-      -DCMAKE_C_FLAGS='-DWOLFSSL_ALT_CERT_CHAINS\ -DWOLFSSL_DES_ECB\ -DWOLFSSL_CUSTOM_OID\ -DHAVE_OID_ENCODING\ -DWOLFSSL_CERT_GEN\ -DWOLFSSL_ASN_TEMPLATE\ -DWOLFSSL_KEY_GEN\ -DHAVE_PKCS7\ -DHAVE_AES_KEYWRAP\ -DWOLFSSL_AES_DIRECT\ -DHAVE_X963_KDF'
+      -DWOLFSSL_DTLS=${ENABLE_DTLS}
+      -DWOLFSSL_DTLS13=${ENABLE_DTLS}
+      -DWOLFSSL_DTLS_CID=${ENABLE_DTLS}
+    OPTIONS_RELEASE
+      -DCMAKE_C_FLAGS=${VCPKG_COMBINED_C_FLAGS_RELEASE}
     OPTIONS_DEBUG
+      -DCMAKE_C_FLAGS=${VCPKG_COMBINED_C_FLAGS_DEBUG}
       -DWOLFSSL_DEBUG=yes)
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/wolfssl/pr_5949.patch b/external_imported/vcpkg/ports/wolfssl/pr_5949.patch
deleted file mode 100644
index 958cc1b4e..000000000
--- a/external_imported/vcpkg/ports/wolfssl/pr_5949.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/src/internal.c b/src/internal.c
-index 1afa361f9d0..c17158b34cd 100644
---- a/src/internal.c
-+++ b/src/internal.c
-@@ -12781,9 +12781,17 @@ static int ProcessPeerCertParse(WOLFSSL* ssl, ProcPeerCertArgs* args,
-         return BAD_FUNC_ARG;
-     }
- 
-+PRAGMA_GCC_DIAG_PUSH
-+PRAGMA_GCC("GCC diagnostic ignored \"-Wstrict-overflow\"")
-+    /* Surrounded in gcc pragma to avoid -Werror=strict-overflow when the
-+     * compiler optimizes out the check and assumes no underflow. Keeping the
-+     * check in place to handle multiple build configurations and future
-+     * changes. */
-+
-     /* check to make sure certificate index is valid */
-     if (args->certIdx > args->count)
-         return BUFFER_E;
-+PRAGMA_GCC_DIAG_POP
- 
-     /* check if returning from non-blocking OCSP */
-     /* skip this section because cert is already initialized and parsed */
-
-diff --git a/wolfcrypt/src/sp_int.c b/wolfcrypt/src/sp_int.c
-index b5199ed7352..cbff871f08a 100644
---- a/wolfcrypt/src/sp_int.c
-+++ b/wolfcrypt/src/sp_int.c
-@@ -4822,6 +4822,10 @@ int sp_copy(const sp_int* a, sp_int* r)
-     }
-     /* Only copy if different pointers. */
-     else if (a != r) {
-+    PRAGMA_GCC_DIAG_PUSH
-+    PRAGMA_GCC("GCC diagnostic ignored \"-Wstrict-overflow\"")
-+    /* Surrounded in gcc pragma to avoid -Werror=strict-overflow when the
-+     * compiler optimizes out the check and assumes no overflow. */
-         /* Validated space in result. */
-         if (a->used > r->size) {
-             err = MP_VAL;
-@@ -4841,6 +4845,7 @@ int sp_copy(const sp_int* a, sp_int* r)
-             r->sign = a->sign;
-         #endif
-         }
-+    PRAGMA_GCC_DIAG_POP
-     }
- 
-     return err;
diff --git a/external_imported/vcpkg/ports/wolfssl/vcpkg.json b/external_imported/vcpkg/ports/wolfssl/vcpkg.json
index 49efd3af8..3b72985a8 100644
--- a/external_imported/vcpkg/ports/wolfssl/vcpkg.json
+++ b/external_imported/vcpkg/ports/wolfssl/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "wolfssl",
-  "version": "5.5.4",
+  "version": "5.6.6",
   "description": "TLS and Cryptographic library for many platforms",
   "homepage": "https://wolfssl.com",
   "license": "GPL-2.0-or-later",
@@ -13,6 +13,18 @@
     {
       "name": "vcpkg-cmake-config",
       "host": true
+    },
+    {
+      "name": "vcpkg-cmake-get-vars",
+      "host": true
+    }
+  ],
+  "features": {
+    "dtls": {
+      "description": "DTLS support"
+    },
+    "secret-callback": {
+      "description": "Enables callback to provide TLS keys for debugging"
     }
-  ]
+  }
 }
diff --git a/external_imported/vcpkg/ports/wolftpm/cmake-patch.diff b/external_imported/vcpkg/ports/wolftpm/cmake-patch.diff
new file mode 100644
index 000000000..18bd7fcaa
--- /dev/null
+++ b/external_imported/vcpkg/ports/wolftpm/cmake-patch.diff
@@ -0,0 +1,16 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b77a9df..0c45975 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -146,9 +146,9 @@ else()
+         target_compile_options(wolftpm PUBLIC ${WOLFSSL_CFLAGS_OTHER})
+     else()
+         # For support with vcpkg
+-        find_package(wolfssl CONFIG)
++        find_package(wolfssl CONFIG REQUIRED)
+         if (wolfssl_FOUND)
+-            target_link_libraries(wolftpm PUBLIC wolfssl)
++            target_link_libraries(wolftpm PUBLIC wolfssl::wolfssl)
+         else()
+             list(APPEND WOLFTPM_DEFINITIONS "-DWOLFTPM2_NO_WOLFCRYPT")
+         endif()
diff --git a/external_imported/vcpkg/ports/wolftpm/portfile.cmake b/external_imported/vcpkg/ports/wolftpm/portfile.cmake
index 1940eaf10..0a2686fbb 100644
--- a/external_imported/vcpkg/ports/wolftpm/portfile.cmake
+++ b/external_imported/vcpkg/ports/wolftpm/portfile.cmake
@@ -4,6 +4,8 @@ vcpkg_from_github(
     REF v2.7.0
     SHA512 1b3e1bbd9f6e35226ff30cc6de7631fb420343a2ae4c8849d1477314a5fe8a95b99800fa17e10a30a9894041142748d654c913a5c4f4dc9eaad3f5157e405276
     HEAD_REF master
+    PATCHES
+      cmake-patch.diff
     )
 
 vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH}
diff --git a/external_imported/vcpkg/ports/wolftpm/vcpkg.json b/external_imported/vcpkg/ports/wolftpm/vcpkg.json
index 687d6705f..10c7ae02d 100644
--- a/external_imported/vcpkg/ports/wolftpm/vcpkg.json
+++ b/external_imported/vcpkg/ports/wolftpm/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "wolftpm",
   "version": "2.7.0",
+  "port-version": 2,
   "description": "TPM library used with wolfSSL library for many platforms",
   "homepage": "https://wolfssl.com",
   "license": "GPL-2.0-or-later",
-  "supports": "!uwp",
+  "supports": "!uwp & !xbox",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/wordnet/vcpkg.json b/external_imported/vcpkg/ports/wordnet/vcpkg.json
index 68fa0a5c0..47aa7b137 100644
--- a/external_imported/vcpkg/ports/wordnet/vcpkg.json
+++ b/external_imported/vcpkg/ports/wordnet/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "wordnet",
-  "version-string": "3.0",
-  "port-version": 2,
+  "version": "3.0",
+  "port-version": 3,
   "description": "WordNet is a large lexical database of English",
   "dependencies": [
     {
diff --git a/external_imported/vcpkg/ports/workflow/portfile.cmake b/external_imported/vcpkg/ports/workflow/portfile.cmake
index 062005d70..78457c0a4 100644
--- a/external_imported/vcpkg/ports/workflow/portfile.cmake
+++ b/external_imported/vcpkg/ports/workflow/portfile.cmake
@@ -2,16 +2,16 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO sogou/workflow
-        REF v0.10.5-win
-        SHA512 4299b2c8bc545676b5437086c666a7b0955524aae758a8753719439697b3dd4d5b46c0a8eba9dba80c0daa9ee9c4188e46fd085f0d2f68f61b33fad1f903c4c2
+        REF "v${VERSION}-win"
+        SHA512 c34518ca35f19ab5539ea82cc73ecbc9828413530cec8dbbe56b17517ec6b7b0326a29e5b343b950afe128829c8e23e75d19494e17f7be4fce9edb524c44ee56
         HEAD_REF windows
     )
 else()
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO sogou/workflow
-        REF v0.10.5
-        SHA512 696e82a1f6a7e6c339fbabb7b1f98ffe40f5f5ee7e77f4c947c0c1532817409e7a61f020c6238a32acd9eb3e06cf3e522e6d67beda32d5bbb08ea1080c20277d
+        REF "v${VERSION}"
+        SHA512 25258e9dc161c5b30395caa3525a4ba5de5763cad5761cbdc8bb23d2468eb624ec49455a5c9ab628c219d7436f707da0138229c5fa82bcfccc24a485649acb56
         HEAD_REF master
     )
 endif()
diff --git a/external_imported/vcpkg/ports/workflow/vcpkg.json b/external_imported/vcpkg/ports/workflow/vcpkg.json
index 01c013526..895f19056 100644
--- a/external_imported/vcpkg/ports/workflow/vcpkg.json
+++ b/external_imported/vcpkg/ports/workflow/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "workflow",
-  "version": "0.10.5",
-  "port-version": 1,
+  "version": "0.10.9",
   "description": "About C++ Parallel Computing and Asynchronous Networking Engine",
   "homepage": "https://github.com/sogou/workflow",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/wpilib/fix-dependency-libuv.patch b/external_imported/vcpkg/ports/wpilib/fix-dependency-libuv.patch
deleted file mode 100644
index e5c0ca8f1..000000000
--- a/external_imported/vcpkg/ports/wpilib/fix-dependency-libuv.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3930be2..f57a46b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -87,7 +87,7 @@ else()
- endif()
- 
- if (USE_VCPKG_LIBUV)
--set (LIBUV_VCPKG_REPLACE "find_package(unofficial-libuv CONFIG)")
-+set (LIBUV_VCPKG_REPLACE "find_package(libuv CONFIG)")
- endif()
- 
- if (USE_VCPKG_EIGEN)
-diff --git a/wpiutil/CMakeLists.txt b/wpiutil/CMakeLists.txt
-index 559c8ed..0fe60e9 100644
---- a/wpiutil/CMakeLists.txt
-+++ b/wpiutil/CMakeLists.txt
-@@ -210,8 +210,12 @@ if (NOT USE_VCPKG_LIBUV)
-         endif()
-     endif()
- else()
--    find_package(unofficial-libuv CONFIG REQUIRED)
--    target_link_libraries(wpiutil unofficial::libuv::libuv)
-+    find_package(libuv CONFIG REQUIRED)
-+    if (TARGET uv)
-+        target_link_libraries(wpiutil uv)
-+    else()
-+        target_link_libraries(wpiutil uv_a)
-+    endif()
- endif()
- 
- if (MSVC)
diff --git a/external_imported/vcpkg/ports/wpilib/fix-usage.patch b/external_imported/vcpkg/ports/wpilib/fix-usage.patch
new file mode 100644
index 000000000..99d22f549
--- /dev/null
+++ b/external_imported/vcpkg/ports/wpilib/fix-usage.patch
@@ -0,0 +1,44 @@
+diff --git a/wpilibNewCommands/wpilibNewCommands-config.cmake.in b/wpilibNewCommands/wpilibNewCommands-config.cmake.in
+index 75aa6ad7d..8a8d8d8ec 100644
+--- a/wpilibNewCommands/wpilibNewCommands-config.cmake.in
++++ b/wpilibNewCommands/wpilibNewCommands-config.cmake.in
+@@ -1,5 +1,4 @@
+ include(CMakeFindDependencyMacro)
+- @FILENAME_DEP_REPLACE@
+  @WPIUTIL_DEP_REPLACE@
+  @NTCORE_DEP_REPLACE@
+  @CSCORE_DEP_REPLACE@
+@@ -8,4 +7,5 @@ include(CMakeFindDependencyMacro)
+  @WPILIBC_DEP_REPLACE@
+  @WPIMATH_DEP_REPLACE@
+ 
++ @FILENAME_DEP_REPLACE@
+  include(${SELF_DIR}/wpilibNewCommands.cmake)
+diff --git a/wpimath/wpimath-config.cmake.in b/wpimath/wpimath-config.cmake.in
+index 4769e4317..9100d7943 100644
+--- a/wpimath/wpimath-config.cmake.in
++++ b/wpimath/wpimath-config.cmake.in
+@@ -2,5 +2,9 @@ include(CMakeFindDependencyMacro)
+ @FILENAME_DEP_REPLACE@
+ @WPIUTIL_DEP_REPLACE@
+ 
++if(@USE_SYSTEM_EIGEN@)
++    find_dependency(Eigen3)
++endif()
++
+ @FILENAME_DEP_REPLACE@
+ include(${SELF_DIR}/wpimath.cmake)
+diff --git a/wpiutil/wpiutil-config.cmake.in b/wpiutil/wpiutil-config.cmake.in
+index fde839e2f..3f696c8a0 100644
+--- a/wpiutil/wpiutil-config.cmake.in
++++ b/wpiutil/wpiutil-config.cmake.in
+@@ -4,5 +4,9 @@ set(THREADS_PREFER_PTHREAD_FLAG ON)
+ find_dependency(Threads)
+ @FMTLIB_SYSTEM_REPLACE@
+ 
++if(@USE_SYSTEM_FMTLIB@)
++    find_dependency(fmt)
++endif()
++
+ @FILENAME_DEP_REPLACE@
+ include(${SELF_DIR}/wpiutil.cmake)
diff --git a/external_imported/vcpkg/ports/wpilib/missing-find_dependency.patch b/external_imported/vcpkg/ports/wpilib/missing-find_dependency.patch
new file mode 100644
index 000000000..06ccb909a
--- /dev/null
+++ b/external_imported/vcpkg/ports/wpilib/missing-find_dependency.patch
@@ -0,0 +1,12 @@
+diff --git a/ntcore/ntcore-config.cmake.in b/ntcore/ntcore-config.cmake.in
+index 17006a583..0a85f8b09 100644
+--- a/ntcore/ntcore-config.cmake.in
++++ b/ntcore/ntcore-config.cmake.in
+@@ -1,6 +1,7 @@
+ include(CMakeFindDependencyMacro)
+ @FILENAME_DEP_REPLACE@
+ @WPIUTIL_DEP_REPLACE@
++@WPINET_DEP_REPLACE@
+ 
+ @FILENAME_DEP_REPLACE@
+ include(${SELF_DIR}/ntcore.cmake)
diff --git a/external_imported/vcpkg/ports/wpilib/no-werror.patch b/external_imported/vcpkg/ports/wpilib/no-werror.patch
new file mode 100644
index 000000000..8bcd69972
--- /dev/null
+++ b/external_imported/vcpkg/ports/wpilib/no-werror.patch
@@ -0,0 +1,15 @@
+diff --git a/cmake/modules/CompileWarnings.cmake b/cmake/modules/CompileWarnings.cmake
+index 93b35b8ab..df7ff7365 100644
+--- a/cmake/modules/CompileWarnings.cmake
++++ b/cmake/modules/CompileWarnings.cmake
+@@ -1,8 +1,8 @@
+ macro(wpilib_target_warnings target)
+     if(NOT MSVC)
+-        target_compile_options(${target} PRIVATE -Wall -pedantic -Wextra -Werror -Wno-unused-parameter ${WPILIB_TARGET_WARNINGS})
++        target_compile_options(${target} PRIVATE -Wall -pedantic -Wextra -Wno-unused-parameter ${WPILIB_TARGET_WARNINGS})
+     else()
+-        target_compile_options(${target} PRIVATE /wd4146 /wd4244 /wd4251 /wd4267 /WX /D_CRT_SECURE_NO_WARNINGS ${WPILIB_TARGET_WARNINGS})
++        target_compile_options(${target} PRIVATE /wd4146 /wd4244 /wd4251 /wd4267 /D_CRT_SECURE_NO_WARNINGS ${WPILIB_TARGET_WARNINGS})
+     endif()
+ 
+     # Suppress C++-specific OpenCV warning; C compiler rejects it with an error
diff --git a/external_imported/vcpkg/ports/wpilib/portfile.cmake b/external_imported/vcpkg/ports/wpilib/portfile.cmake
index d680107fe..1d22e6e04 100644
--- a/external_imported/vcpkg/ports/wpilib/portfile.cmake
+++ b/external_imported/vcpkg/ports/wpilib/portfile.cmake
@@ -1,59 +1,59 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO wpilibsuite/allwpilib
-    REF 35eb90c135eba994a2ca2cbd50a68c367910f4b6
-    SHA512 55bc608632ab67c097f3cce7c5ad9790b2b123a633c93bf5b4008f90bf79538cc142c911850d5f49b75e3a12f43ffad9f6f5f9bcdf1351cce7513ecc4b04e439
-    PATCHES fix-dependency-libuv.patch
+    REF 165ebe4c79c437c7ba6c03af4a88a8c8680f742a
+    SHA512 f6ee07db0a119a7ac5876c4b0cf74abfb6af635d3d3ba913300138c450f62f6595ac4849bc499346f9f0179cc563f548a5e8a9a47122af593b425af453afd99f
+    PATCHES
+        no-werror.patch
+        windows-install-location.patch
+        missing-find_dependency.patch
+        fix-usage.patch
 )
 
+if("allwpilib" IN_LIST FEATURES)
+    vcpkg_from_github(
+        OUT_SOURCE_PATH SOURCE_PATH_APRILTAG
+        REPO wpilibsuite/apriltag
+        REF e55b751f2465bd40a880d9acb87d24289e2af89e
+        SHA512 a5d824d11312f7f5229bad162349586e9c855cd1dc03f33235c045f2d5235932227eb17f9e9c801b46a28991cddcf7ad16d39549560251d7d9d52ce72f094a73
+    )
+endif()
+
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-  INVERTED_FEATURES
-    cameraserver WITHOUT_CSCORE
-    allwpilib WITHOUT_ALLWPILIB
+    FEATURES
+        cameraserver WITH_CSCORE
+        allwpilib WITH_SIMULATION_MODULES
+        allwpilib WITH_WPILIB
 )
 
+vcpkg_find_acquire_program(PYTHON3)
+x_vcpkg_get_python_packages(PYTHON_EXECUTABLE "${PYTHON3}" PACKAGES jinja2)
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-      -DWITHOUT_JAVA=ON
-      ${FEATURE_OPTIONS}
-      -DUSE_VCPKG_LIBUV=ON
-      -DUSE_VCPKG_EIGEN=ON
-      -DFLAT_INSTALL_WPILIB=ON
+        ${FEATURE_OPTIONS}
+        -DWITH_JAVA=OFF
+        -DWITH_EXAMPLES=OFF
+        -DWITH_TESTS=OFF
+        -DWITH_GUI=OFF
+        -DWITH_SIMULATION_MODULES=OFF
+        -DUSE_SYSTEM_FMTLIB=ON
+        -DUSE_SYSTEM_LIBUV=ON
+        -DUSE_SYSTEM_EIGEN=ON
+        "-DFETCHCONTENT_SOURCE_DIR_APRILTAGLIB=${SOURCE_PATH_APRILTAG}"
+    MAYBE_UNUSED_VARIABLES
+        FETCHCONTENT_SOURCE_DIR_APRILTAGLIB
 )
 vcpkg_cmake_install()
-
-file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/include/ntcore/" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
-file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/include/wpiutil/" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
-
-if ("allwpilib" IN_LIST FEATURES)
-    file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/include/wpilibc/" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
-    file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/include/hal/" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/gen")
-endif()
-
-if ("cameraserver" IN_LIST FEATURES)
-    file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/include/cameraserver/" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
-    file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/include/cscore/" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
-endif()
-
-if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin" FILES_MATCHING PATTERN "*.dll")
-    file(COPY "${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin" FILES_MATCHING PATTERN "*.dll")
-
-    file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin" FILES_MATCHING PATTERN "*.so")
-    file(COPY "${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin" FILES_MATCHING PATTERN "*.so")
-
-    file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin" FILES_MATCHING PATTERN "*.dylib")
-    file(COPY "${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin" FILES_MATCHING PATTERN "*.dylib")
-endif()
-
-file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib" FILES_MATCHING PATTERN "*.lib")
-file(COPY "${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" FILES_MATCHING PATTERN "*.lib")
-
-file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib" FILES_MATCHING PATTERN "*.a")
-file(COPY "${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" FILES_MATCHING PATTERN "*.a")
+vcpkg_cmake_config_fixup(PACKAGE_NAME wpilib)
+vcpkg_cmake_config_fixup(PACKAGE_NAME ntcore)
+vcpkg_cmake_config_fixup(PACKAGE_NAME wpimath)
+vcpkg_cmake_config_fixup(PACKAGE_NAME wpinet)
+vcpkg_cmake_config_fixup(PACKAGE_NAME wpiutil)
 
 vcpkg_copy_pdbs()
 
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
diff --git a/external_imported/vcpkg/ports/wpilib/vcpkg.json b/external_imported/vcpkg/ports/wpilib/vcpkg.json
index c928da524..48d3edf19 100644
--- a/external_imported/vcpkg/ports/wpilib/vcpkg.json
+++ b/external_imported/vcpkg/ports/wpilib/vcpkg.json
@@ -1,13 +1,12 @@
 {
   "name": "wpilib",
-  "version-date": "2020-03-02",
-  "port-version": 3,
+  "version-date": "2023-08-24",
   "description": "WPILib is the software library package for the FIRST Robotics Competition. The core install includes wpiutil, a common utilies library, and ntcore, the base NetworkTables library.",
   "homepage": "https://github.com/wpilibsuite/allwpilib",
   "license": null,
-  "supports": "!osx",
   "dependencies": [
     "eigen3",
+    "fmt",
     "libuv",
     {
       "name": "vcpkg-cmake",
@@ -16,6 +15,10 @@
     {
       "name": "vcpkg-cmake-config",
       "host": true
+    },
+    {
+      "name": "vcpkg-get-python-packages",
+      "host": true
     }
   ],
   "features": {
diff --git a/external_imported/vcpkg/ports/wpilib/windows-install-location.patch b/external_imported/vcpkg/ports/wpilib/windows-install-location.patch
new file mode 100644
index 000000000..36087a71f
--- /dev/null
+++ b/external_imported/vcpkg/ports/wpilib/windows-install-location.patch
@@ -0,0 +1,338 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 012bcb7cc..ff2ab95b8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -153,7 +153,6 @@ endif()
+ 
+ set( wpilib_dest "")
+ set( include_dest include )
+-set( main_lib_dest lib )
+ set( java_lib_dest java )
+ set( jni_lib_dest jni )
+ 
+diff --git a/apriltag/CMakeLists.txt b/apriltag/CMakeLists.txt
+index 6f20e3aa0..b5459eb62 100644
+--- a/apriltag/CMakeLists.txt
++++ b/apriltag/CMakeLists.txt
+@@ -62,11 +62,7 @@ if (WITH_JAVA)
+   target_link_libraries(apriltagjni PRIVATE apriltag_jni_headers)
+   add_dependencies(apriltagjni apriltag_jar)
+ 
+-  if (MSVC)
+-    install(TARGETS apriltagjni RUNTIME DESTINATION "${jni_lib_dest}" COMPONENT Runtime)
+-  endif()
+-
+-  install(TARGETS apriltagjni EXPORT apriltagjni DESTINATION "${main_lib_dest}")
++  install(TARGETS apriltagjni EXPORT apriltagjni)
+ 
+ endif()
+ 
+@@ -94,13 +90,9 @@ target_include_directories(apriltag PUBLIC
+   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/include>
+   $<INSTALL_INTERFACE:${include_dest}/apriltag>)
+ 
+-install(TARGETS apriltag EXPORT apriltag DESTINATION "${main_lib_dest}")
++install(TARGETS apriltag EXPORT apriltag)
+ install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/apriltag")
+ 
+-if (WITH_JAVA AND MSVC)
+-    install(TARGETS apriltag RUNTIME DESTINATION "${jni_lib_dest}" COMPONENT Runtime)
+-endif()
+-
+ if (WITH_FLAT_INSTALL)
+     set (apriltag_config_dir ${wpilib_dest})
+ else()
+diff --git a/cameraserver/CMakeLists.txt b/cameraserver/CMakeLists.txt
+index 4916be3b6..665a4ef41 100644
+--- a/cameraserver/CMakeLists.txt
++++ b/cameraserver/CMakeLists.txt
+@@ -40,13 +40,9 @@ target_link_libraries(cameraserver PUBLIC ntcore cscore wpiutil ${OpenCV_LIBS})
+ 
+ set_property(TARGET cameraserver PROPERTY FOLDER "libraries")
+ 
+-install(TARGETS cameraserver EXPORT cameraserver DESTINATION "${main_lib_dest}")
++install(TARGETS cameraserver EXPORT cameraserver)
+ install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/cameraserver")
+ 
+-if (WITH_JAVA AND MSVC)
+-    install(TARGETS cameraserver RUNTIME DESTINATION "${jni_lib_dest}" COMPONENT Runtime)
+-endif()
+-
+ if (WITH_FLAT_INSTALL)
+     set (cameraserver_config_dir ${wpilib_dest})
+ else()
+diff --git a/cscore/CMakeLists.txt b/cscore/CMakeLists.txt
+index 81cdd4ec5..1036cdf31 100644
+--- a/cscore/CMakeLists.txt
++++ b/cscore/CMakeLists.txt
+@@ -40,7 +40,7 @@ target_link_libraries(cscore PUBLIC wpinet wpiutil ${OpenCV_LIBS})
+ 
+ set_property(TARGET cscore PROPERTY FOLDER "libraries")
+ 
+-install(TARGETS cscore EXPORT cscore DESTINATION "${main_lib_dest}")
++install(TARGETS cscore EXPORT cscore)
+ install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/cscore")
+ 
+ if (WITH_FLAT_INSTALL)
+@@ -129,11 +129,7 @@ if (WITH_JAVA)
+     target_link_libraries(cscorejni PRIVATE cscore_jni_headers)
+     add_dependencies(cscorejni cscore_jar)
+ 
+-    if (MSVC)
+-        install(TARGETS cscorejni RUNTIME DESTINATION "${jni_lib_dest}" COMPONENT Runtime)
+-    endif()
+-
+-    install(TARGETS cscorejni EXPORT cscorejni DESTINATION "${main_lib_dest}")
++    install(TARGETS cscorejni EXPORT cscorejni)
+ 
+ endif()
+ 
+diff --git a/glass/CMakeLists.txt b/glass/CMakeLists.txt
+index a252c2e83..9192bc7b4 100644
+--- a/glass/CMakeLists.txt
++++ b/glass/CMakeLists.txt
+@@ -22,7 +22,7 @@ target_include_directories(libglass PUBLIC
+                            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/lib/native/include>
+                            $<INSTALL_INTERFACE:${include_dest}/glass>)
+ 
+-install(TARGETS libglass EXPORT libglass DESTINATION "${main_lib_dest}")
++install(TARGETS libglass EXPORT libglass)
+ install(DIRECTORY src/lib/native/include/ DESTINATION "${include_dest}/glass")
+ 
+ #
+@@ -43,7 +43,7 @@ target_include_directories(libglassnt PUBLIC
+                            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/libnt/native/include>
+                            $<INSTALL_INTERFACE:${include_dest}/glass>)
+ 
+-install(TARGETS libglassnt EXPORT libglassnt DESTINATION "${main_lib_dest}")
++install(TARGETS libglassnt EXPORT libglassnt)
+ install(DIRECTORY src/libnt/native/include/ DESTINATION "${include_dest}/glass")
+ 
+ #
+diff --git a/hal/CMakeLists.txt b/hal/CMakeLists.txt
+index 45c55675b..52dd44ad6 100644
+--- a/hal/CMakeLists.txt
++++ b/hal/CMakeLists.txt
+@@ -55,7 +55,7 @@ target_link_libraries(hal PUBLIC wpiutil)
+ 
+ set_property(TARGET hal PROPERTY FOLDER "libraries")
+ 
+-install(TARGETS hal EXPORT hal DESTINATION "${main_lib_dest}")
++install(TARGETS hal EXPORT hal)
+ install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/hal")
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/gen/ DESTINATION "${include_dest}/hal")
+ 
+@@ -108,11 +108,7 @@ if (WITH_JAVA)
+     target_link_libraries(haljni PRIVATE hal_jni_headers)
+     add_dependencies(haljni hal_jar)
+ 
+-    if (MSVC)
+-        install(TARGETS haljni RUNTIME DESTINATION "${jni_lib_dest}" COMPONENT Runtime)
+-    endif()
+-
+-    install(TARGETS haljni EXPORT haljni DESTINATION "${main_lib_dest}")
++    install(TARGETS haljni EXPORT haljni)
+ 
+ endif()
+ 
+diff --git a/ntcore/CMakeLists.txt b/ntcore/CMakeLists.txt
+index cd5b3fb7d..1a97ac0c0 100644
+--- a/ntcore/CMakeLists.txt
++++ b/ntcore/CMakeLists.txt
+@@ -33,7 +33,7 @@ target_link_libraries(ntcore PUBLIC wpinet wpiutil)
+ 
+ set_property(TARGET ntcore PROPERTY FOLDER "libraries")
+ 
+-install(TARGETS ntcore EXPORT ntcore DESTINATION "${main_lib_dest}")
++install(TARGETS ntcore EXPORT ntcore)
+ install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/ntcore")
+ install(DIRECTORY ${WPILIB_BINARY_DIR}/ntcore/generated/main/native/include/ DESTINATION "${include_dest}/ntcore")
+ 
+@@ -81,7 +81,7 @@ if (WITH_JAVA)
+     target_link_libraries(ntcorejni PRIVATE ntcore_jni_headers)
+     add_dependencies(ntcorejni ntcore_jar)
+ 
+-    install(TARGETS ntcorejni EXPORT ntcorejni DESTINATION "${main_lib_dest}")
++    install(TARGETS ntcorejni EXPORT ntcorejni)
+ 
+ endif()
+ 
+diff --git a/simulation/halsim_ds_socket/CMakeLists.txt b/simulation/halsim_ds_socket/CMakeLists.txt
+index 6d770d9a1..4eb23bb70 100644
+--- a/simulation/halsim_ds_socket/CMakeLists.txt
++++ b/simulation/halsim_ds_socket/CMakeLists.txt
+@@ -13,4 +13,4 @@ target_include_directories(halsim_ds_socket PRIVATE src/main/native/include)
+ 
+ set_property(TARGET halsim_ds_socket PROPERTY FOLDER "libraries")
+ 
+-install(TARGETS halsim_ds_socket EXPORT halsim_ds_socket DESTINATION "${main_lib_dest}")
++install(TARGETS halsim_ds_socket EXPORT halsim_ds_socket)
+diff --git a/simulation/halsim_gui/CMakeLists.txt b/simulation/halsim_gui/CMakeLists.txt
+index 949f9f1e8..957a9c223 100644
+--- a/simulation/halsim_gui/CMakeLists.txt
++++ b/simulation/halsim_gui/CMakeLists.txt
+@@ -16,4 +16,4 @@ target_include_directories(halsim_gui PRIVATE src/main/native/include)
+ 
+ set_property(TARGET halsim_gui PROPERTY FOLDER "libraries")
+ 
+-install(TARGETS halsim_gui EXPORT halsim_gui DESTINATION "${main_lib_dest}")
++install(TARGETS halsim_gui EXPORT halsim_gui)
+diff --git a/simulation/halsim_ws_client/CMakeLists.txt b/simulation/halsim_ws_client/CMakeLists.txt
+index 5bc99dbda..18a2a120d 100644
+--- a/simulation/halsim_ws_client/CMakeLists.txt
++++ b/simulation/halsim_ws_client/CMakeLists.txt
+@@ -13,4 +13,4 @@ target_include_directories(halsim_ws_client PRIVATE src/main/native/include)
+ 
+ set_property(TARGET halsim_ws_client PROPERTY FOLDER "libraries")
+ 
+-install(TARGETS halsim_ws_client EXPORT halsim_ws_client DESTINATION "${main_lib_dest}")
++install(TARGETS halsim_ws_client EXPORT halsim_ws_client)
+diff --git a/simulation/halsim_ws_core/CMakeLists.txt b/simulation/halsim_ws_core/CMakeLists.txt
+index 91bcbb25b..f7e240fd2 100644
+--- a/simulation/halsim_ws_core/CMakeLists.txt
++++ b/simulation/halsim_ws_core/CMakeLists.txt
+@@ -13,4 +13,4 @@ target_include_directories(halsim_ws_core PUBLIC src/main/native/include)
+ 
+ set_property(TARGET halsim_ws_core PROPERTY FOLDER "libraries")
+ 
+-install(TARGETS halsim_ws_core EXPORT halsim_ws_core DESTINATION "${main_lib_dest}")
++install(TARGETS halsim_ws_core EXPORT halsim_ws_core)
+diff --git a/simulation/halsim_ws_server/CMakeLists.txt b/simulation/halsim_ws_server/CMakeLists.txt
+index e5b55c801..370d2f83f 100644
+--- a/simulation/halsim_ws_server/CMakeLists.txt
++++ b/simulation/halsim_ws_server/CMakeLists.txt
+@@ -13,4 +13,4 @@ target_include_directories(halsim_ws_server PRIVATE src/main/native/include)
+ 
+ set_property(TARGET halsim_ws_server PROPERTY FOLDER "libraries")
+ 
+-install(TARGETS halsim_ws_server EXPORT halsim_ws_server DESTINATION "${main_lib_dest}")
++install(TARGETS halsim_ws_server EXPORT halsim_ws_server)
+diff --git a/wpigui/CMakeLists.txt b/wpigui/CMakeLists.txt
+index 59c4d6faf..2a6e6b213 100644
+--- a/wpigui/CMakeLists.txt
++++ b/wpigui/CMakeLists.txt
+@@ -37,7 +37,7 @@ add_executable(wpiguidev src/dev/native/cpp/main.cpp)
+ wpilib_link_macos_gui(wpiguidev)
+ target_link_libraries(wpiguidev wpigui)
+ 
+-install(TARGETS wpigui EXPORT wpigui DESTINATION "${main_lib_dest}")
++install(TARGETS wpigui EXPORT wpigui)
+ install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/wpigui")
+ 
+ #if (WITH_FLAT_INSTALL)
+diff --git a/wpilibNewCommands/CMakeLists.txt b/wpilibNewCommands/CMakeLists.txt
+index dc218fa06..fbebf19ea 100644
+--- a/wpilibNewCommands/CMakeLists.txt
++++ b/wpilibNewCommands/CMakeLists.txt
+@@ -39,7 +39,7 @@ target_include_directories(wpilibNewCommands PUBLIC
+                             $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/include>
+                             $<INSTALL_INTERFACE:${include_dest}/wpilibNewCommands>)
+ 
+-install(TARGETS wpilibNewCommands EXPORT wpilibNewCommands DESTINATION "${main_lib_dest}")
++install(TARGETS wpilibNewCommands EXPORT wpilibNewCommands)
+ install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/wpilibNewCommands")
+ 
+ if (FLAT_INSTALL_WPILIB)
+diff --git a/wpilibc/CMakeLists.txt b/wpilibc/CMakeLists.txt
+index 8c2c85ce9..ed8583497 100644
+--- a/wpilibc/CMakeLists.txt
++++ b/wpilibc/CMakeLists.txt
+@@ -30,7 +30,7 @@ target_link_libraries(wpilibc PUBLIC hal ntcore wpimath wpiutil)
+ 
+ set_property(TARGET wpilibc PROPERTY FOLDER "libraries")
+ 
+-install(TARGETS wpilibc EXPORT wpilibc DESTINATION "${main_lib_dest}")
++install(TARGETS wpilibc EXPORT wpilibc)
+ install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/wpilibc")
+ 
+ if (WITH_FLAT_INSTALL)
+diff --git a/wpimath/CMakeLists.txt b/wpimath/CMakeLists.txt
+index 01fd5d0f8..15cede1b3 100644
+--- a/wpimath/CMakeLists.txt
++++ b/wpimath/CMakeLists.txt
+@@ -71,11 +71,7 @@ if (WITH_JAVA)
+   target_link_libraries(wpimathjni PRIVATE wpimath_jni_headers)
+   add_dependencies(wpimathjni wpimath_jar)
+ 
+-  if (MSVC)
+-    install(TARGETS wpimathjni RUNTIME DESTINATION "${jni_lib_dest}" COMPONENT Runtime)
+-  endif()
+-
+-  install(TARGETS wpimathjni EXPORT wpimathjni DESTINATION "${main_lib_dest}")
++  install(TARGETS wpimathjni EXPORT wpimathjni)
+ 
+ endif()
+ 
+@@ -116,11 +112,7 @@ target_include_directories(wpimath PUBLIC
+                             $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/include>
+                             $<INSTALL_INTERFACE:${include_dest}/wpimath>)
+ 
+-install(TARGETS wpimath EXPORT wpimath DESTINATION "${main_lib_dest}")
+-
+-if (WITH_JAVA AND MSVC)
+-    install(TARGETS wpimath RUNTIME DESTINATION "${jni_lib_dest}" COMPONENT Runtime)
+-endif()
++install(TARGETS wpimath EXPORT wpimath)
+ 
+ if (WITH_FLAT_INSTALL)
+     set (wpimath_config_dir ${wpilib_dest})
+diff --git a/wpinet/CMakeLists.txt b/wpinet/CMakeLists.txt
+index 6d92a5640..c30d21827 100644
+--- a/wpinet/CMakeLists.txt
++++ b/wpinet/CMakeLists.txt
+@@ -34,11 +34,7 @@ if (WITH_JAVA)
+   target_link_libraries(wpinetjni PRIVATE wpinet_jni_headers)
+   add_dependencies(wpinetjni wpinet_jar)
+ 
+-  if (MSVC)
+-    install(TARGETS wpinetjni RUNTIME DESTINATION "${jni_lib_dest}" COMPONENT Runtime)
+-  endif()
+-
+-  install(TARGETS wpinetjni EXPORT wpinetjni DESTINATION "${main_lib_dest}")
++  install(TARGETS wpinetjni EXPORT wpinetjni)
+ 
+ endif()
+ 
+@@ -161,11 +157,7 @@ target_include_directories(wpinet PUBLIC
+                             $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/include>
+                             $<INSTALL_INTERFACE:${include_dest}/wpinet>)
+ 
+-install(TARGETS wpinet EXPORT wpinet DESTINATION "${main_lib_dest}")
+-
+-if (WITH_JAVA AND MSVC)
+-    install(TARGETS wpinet RUNTIME DESTINATION "${jni_lib_dest}" COMPONENT Runtime)
+-endif()
++install(TARGETS wpinet EXPORT wpinet)
+ 
+ if (WITH_FLAT_INSTALL)
+     set (wpinet_config_dir ${wpilib_dest})
+diff --git a/wpiutil/CMakeLists.txt b/wpiutil/CMakeLists.txt
+index 5db2b4c65..f6486286d 100644
+--- a/wpiutil/CMakeLists.txt
++++ b/wpiutil/CMakeLists.txt
+@@ -55,11 +55,7 @@ if (WITH_JAVA)
+   target_link_libraries(wpiutiljni PRIVATE wpiutil_jni_headers)
+   add_dependencies(wpiutiljni wpiutil_jar)
+ 
+-  if (MSVC)
+-    install(TARGETS wpiutiljni RUNTIME DESTINATION "${jni_lib_dest}" COMPONENT Runtime)
+-  endif()
+-
+-  install(TARGETS wpiutiljni EXPORT wpiutiljni DESTINATION "${main_lib_dest}")
++  install(TARGETS wpiutiljni EXPORT wpiutiljni)
+ 
+ endif()
+ 
+@@ -161,11 +157,7 @@ target_include_directories(wpiutil PUBLIC
+                             $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/include>
+                             $<INSTALL_INTERFACE:${include_dest}/wpiutil>)
+ 
+-install(TARGETS wpiutil EXPORT wpiutil DESTINATION "${main_lib_dest}")
+-
+-if (WITH_JAVA AND MSVC)
+-    install(TARGETS wpiutil RUNTIME DESTINATION "${jni_lib_dest}" COMPONENT Runtime)
+-endif()
++install(TARGETS wpiutil EXPORT wpiutil)
+ 
+ if (WITH_FLAT_INSTALL)
+     set (wpiutil_config_dir ${wpilib_dest})
diff --git a/external_imported/vcpkg/ports/wt/portfile.cmake b/external_imported/vcpkg/ports/wt/portfile.cmake
index 907d0d0c3..6b437fe13 100644
--- a/external_imported/vcpkg/ports/wt/portfile.cmake
+++ b/external_imported/vcpkg/ports/wt/portfile.cmake
@@ -89,7 +89,9 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/var" "${CURRENT_PACKAGES_DIR}/debug/var")
 
 # RUNDIR is only used for wtfcgi what we don't build. See https://redmine.webtoolkit.eu/issues/9646
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/Wt/WConfig.h" "#define RUNDIR \"${CURRENT_PACKAGES_DIR}/var/run/wt\"" "")
+file(READ "${CURRENT_PACKAGES_DIR}/include/Wt/WConfig.h" W_CONFIG_H)
+string(REGEX REPLACE "([\r\n])#define RUNDIR[^\r\n]+" "\\1// RUNDIR intentionally unset by vcpkg" W_CONFIG_H "${W_CONFIG_H}")
+file(WRITE "${CURRENT_PACKAGES_DIR}/include/Wt/WConfig.h" "${W_CONFIG_H}")
 
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 vcpkg_copy_pdbs()
diff --git a/external_imported/vcpkg/ports/wt/vcpkg.json b/external_imported/vcpkg/ports/wt/vcpkg.json
index 5a5c0ceda..f629baaa1 100644
--- a/external_imported/vcpkg/ports/wt/vcpkg.json
+++ b/external_imported/vcpkg/ports/wt/vcpkg.json
@@ -1,9 +1,11 @@
 {
   "name": "wt",
   "version": "4.9.1",
+  "port-version": 2,
   "description": "Wt is a C++ library for developing web applications",
   "homepage": "https://github.com/emweb/wt",
   "license": "GPL-2.0-only",
+  "supports": "!xbox",
   "dependencies": [
     "boost-algorithm",
     "boost-array",
diff --git a/external_imported/vcpkg/ports/wxchartdir/vcpkg.json b/external_imported/vcpkg/ports/wxchartdir/vcpkg.json
index 6ff8f401d..27806462a 100644
--- a/external_imported/vcpkg/ports/wxchartdir/vcpkg.json
+++ b/external_imported/vcpkg/ports/wxchartdir/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "wxchartdir",
   "version": "2.0.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "wxChartDir provides components for the integration and use of the commercial C++ library ChartDirector, a universal chart component developed by Advanced Software Engineering Ltd, in wxWidgets based applications.",
   "homepage": "https://github.com/utelle/wxchartdir",
   "license": "GPL-3.0-only AND LGPL-3.0 AND wxWindows",
+  "supports": "!xbox",
   "dependencies": [
     "chartdir",
     {
diff --git a/external_imported/vcpkg/ports/wxwidgets/fix-glegl.patch b/external_imported/vcpkg/ports/wxwidgets/fix-glegl.patch
new file mode 100644
index 000000000..59c6ef5c3
--- /dev/null
+++ b/external_imported/vcpkg/ports/wxwidgets/fix-glegl.patch
@@ -0,0 +1,36 @@
+diff --git a/src/unix/glegl.cpp b/src/unix/glegl.cpp
+index 9e1b6b7..7407a9f 100644
+--- a/src/unix/glegl.cpp
++++ b/src/unix/glegl.cpp
+@@ -43,8 +43,9 @@
+ 
+ static const char* TRACE_EGL = "glegl";
+ 
+-#ifdef GDK_WINDOWING_WAYLAND
+-
++// We can't add a member variable to wxGLCanvasEGL in 3.2 branch, so emulate it
++// by encoding the corresponding boolean value via the presence of "this"
++// pointer in the given hash set.
+ #include "wx/hashset.h"
+ 
+ namespace
+@@ -58,8 +59,6 @@ wxGLCanvasSet gs_alreadySetSwapInterval;
+ 
+ } // anonymous namespace
+ 
+-#endif // GDK_WINDOWING_WAYLAND
+-
+ // ----------------------------------------------------------------------------
+ // wxGLContextAttrs: OpenGL rendering context attributes
+ // ----------------------------------------------------------------------------
+@@ -633,9 +632,9 @@ wxGLCanvasEGL::~wxGLCanvasEGL()
+     DestroyWaylandSubsurface();
+     g_clear_pointer(&m_wlEGLWindow, wl_egl_window_destroy);
+     g_clear_pointer(&m_wlSurface, wl_surface_destroy);
++#endif
+ 
+     gs_alreadySetSwapInterval.erase(this);
+-#endif
+ }
+ 
+ void wxGLCanvasEGL::CreateWaylandSubsurface()
diff --git a/external_imported/vcpkg/ports/wxwidgets/fix_include.patch b/external_imported/vcpkg/ports/wxwidgets/fix_include.patch
deleted file mode 100644
index e146a2e17..000000000
--- a/external_imported/vcpkg/ports/wxwidgets/fix_include.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/stc/scintilla/include/Scintilla.h b/src/stc/scintilla/include/Scintilla.h
-index 8c57520e1..54ffb27d2 100644
---- a/src/stc/scintilla/include/Scintilla.h	
-+++ b/src/stc/scintilla/include/Scintilla.h
-@@ -27,7 +27,7 @@ int Scintilla_LinkLexers(void);
- #endif
- 
- // Include header that defines basic numeric types.
--#if defined(_MSC_VER)
-+#if defined(_MSC_VER) && !defined(__clang__)
- // Older releases of MSVC did not have stdint.h.
- #include <stddef.h>
- #elif defined( __VMS )
diff --git a/external_imported/vcpkg/ports/wxwidgets/portfile.cmake b/external_imported/vcpkg/ports/wxwidgets/portfile.cmake
index 88486a92c..7ae03e194 100644
--- a/external_imported/vcpkg/ports/wxwidgets/portfile.cmake
+++ b/external_imported/vcpkg/ports/wxwidgets/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO wxWidgets/wxWidgets
     REF "v${VERSION}"
-    SHA512 8ff645fe7ee97bf6358b3619efd737ef8f9eb0235ca481e921a64d451c45eb9671ee4e2807fea285153bc0bb434266234f6f4ab15f396bb8290f262fa879e9b3 
+    SHA512 f1ba875e6dfa3970e6f03741573f96ac224a8d0bace5a4c44dcf95dd4e861031fe086e2dc4429c1c6bcb22d40656fc2c6c287abe0b4678eb9af9698691eda3d9
     HEAD_REF master
     PATCHES
         install-layout.patch
@@ -12,7 +12,7 @@ vcpkg_from_github(
         fix-pcre2.patch
         gtk3-link-libraries.patch
         sdl2.patch
-        fix_include.patch
+        fix-glegl.patch
 )
 
 vcpkg_check_features(
@@ -190,4 +190,4 @@ endif()
 configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY)
 
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-file(INSTALL "${SOURCE_PATH}/docs/licence.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/docs/licence.txt")
diff --git a/external_imported/vcpkg/ports/wxwidgets/relocatable-wx-config.patch b/external_imported/vcpkg/ports/wxwidgets/relocatable-wx-config.patch
index 8a5e7c4d5..608c9c546 100644
--- a/external_imported/vcpkg/ports/wxwidgets/relocatable-wx-config.patch
+++ b/external_imported/vcpkg/ports/wxwidgets/relocatable-wx-config.patch
@@ -1,17 +1,8 @@
 diff --git a/wx-config.in b/wx-config.in
-index 441f88c..b326867 100755
+index 4df8571..a90db3d 100644
 --- a/wx-config.in
 +++ b/wx-config.in
-@@ -91,7 +91,7 @@ EOF
- 
- 
- # Contentious tools determined by configure.
--EGREP="@EGREP@"
-+EGREP="grep -E" # no absolute path from host
- 
- 
- # For the people who know what they want, or think they do:
-@@ -402,8 +402,23 @@ is_cross()  { [ "x@cross_compiling@" = "xyes" ]; }
+@@ -398,8 +398,23 @@ is_cross()  { [ "x@cross_compiling@" = "xyes" ]; }
  
  
  # Determine the base directories we require.
@@ -37,7 +28,7 @@ index 441f88c..b326867 100755
  wxconfdir="@libdir@/wx/config"
  
  installed_configs=`cd "$wxconfdir" 2> /dev/null && ls | grep -v "^inplace-"`
-@@ -940,6 +949,9 @@ prefix=${this_prefix-$prefix}
+@@ -936,6 +951,9 @@ prefix=${this_prefix-$prefix}
  exec_prefix=${this_exec_prefix-$exec_prefix}
  
  includedir="@includedir@"
diff --git a/external_imported/vcpkg/ports/wxwidgets/vcpkg.json b/external_imported/vcpkg/ports/wxwidgets/vcpkg.json
index 66b2cc8eb..a16054590 100644
--- a/external_imported/vcpkg/ports/wxwidgets/vcpkg.json
+++ b/external_imported/vcpkg/ports/wxwidgets/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "wxwidgets",
-  "version": "3.2.2.1",
-  "port-version": 1,
+  "version": "3.2.4",
   "description": [
     "Widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications. ",
     "Set WXWIDGETS_USE_STL in a custom triplet to build with the wxUSE_STL build option.",
@@ -9,7 +8,7 @@
   ],
   "homepage": "https://github.com/wxWidgets/wxWidgets",
   "license": "LGPL-2.0-or-later WITH WxWindows-exception-3.1",
-  "supports": "!uwp",
+  "supports": "!uwp & !xbox",
   "dependencies": [
     {
       "name": "cairo",
diff --git a/external_imported/vcpkg/ports/x-plane/CMakeLists.txt b/external_imported/vcpkg/ports/x-plane/CMakeLists.txt
new file mode 100644
index 000000000..a04fbbc97
--- /dev/null
+++ b/external_imported/vcpkg/ports/x-plane/CMakeLists.txt
@@ -0,0 +1,99 @@
+cmake_minimum_required(VERSION 3.21)
+project(x-plane LANGUAGES C CXX)
+
+if(WIN32 OR APPLE)
+  add_library(unofficial::x-plane::xplm SHARED IMPORTED)
+  if(WIN32)
+    set_target_properties(
+      unofficial::x-plane::xplm
+      PROPERTIES IMPORTED_IMPLIB "${CMAKE_CURRENT_SOURCE_DIR}/Libraries/Win/XPLM_64.lib")
+    set_target_properties(
+      unofficial::x-plane::xplm PROPERTIES INTERFACE_COMPILE_DEFINITIONS
+                                              "-DIBM=1;-DAPL=0;-DLIN=0")
+  else()
+    set_target_properties(
+      unofficial::x-plane::xplm
+      PROPERTIES IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/Libraries/Mac/XPLM.framework/XPLM")
+    set_target_properties(
+      unofficial::x-plane::xplm PROPERTIES INTERFACE_COMPILE_DEFINITIONS
+                                              "-DIBM=0;-DAPL=1;-DLIN=0")
+  endif()
+else()
+  add_library(unofficial::x-plane::xplm INTERFACE IMPORTED)
+  set_target_properties(
+    unofficial::x-plane::xplm PROPERTIES INTERFACE_COMPILE_DEFINITIONS
+                                            "-DIBM=0;-DAPL=0;-DLIN=1")
+endif()
+set_target_properties(
+  unofficial::x-plane::xplm PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
+                                          "${CMAKE_CURRENT_SOURCE_DIR}/CHeaders/XPLM")
+
+if(WIN32 OR APPLE)
+  add_library(unofficial::x-plane::xpwidgets SHARED IMPORTED)
+  if(WIN32)
+    set_target_properties(
+      unofficial::x-plane::xpwidgets
+      PROPERTIES IMPORTED_IMPLIB "${CMAKE_CURRENT_SOURCE_DIR}/Libraries/Win/XPWidgets_64.lib")
+  else()
+    set_target_properties(
+      unofficial::x-plane::xpwidgets
+      PROPERTIES IMPORTED_LOCATION
+                 "${CMAKE_CURRENT_SOURCE_DIR}/Libraries/Mac/XPWidgets.framework/XPWidgets")
+  endif()
+else()
+  add_library(unofficial::x-plane::xpwidgets INTERFACE IMPORTED)
+endif()
+set_target_properties(
+  unofficial::x-plane::xpwidgets PROPERTIES INTERFACE_LINK_LIBRARIES
+                                               "unofficial::x-plane::xplm")
+set_target_properties(
+  unofficial::x-plane::xpwidgets
+  PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/CHeaders/Widgets")
+
+add_library(xplm_cpp STATIC)
+
+target_sources(
+  xplm_cpp
+  PRIVATE CHeaders/Wrappers/XPCBroadcaster.cpp
+          CHeaders/Wrappers/XPCDisplay.cpp
+          CHeaders/Wrappers/XPCListener.cpp
+          CHeaders/Wrappers/XPCProcessing.cpp
+          CHeaders/Wrappers/XPCWidget.cpp
+          CHeaders/Wrappers/XPCWidgetAttachments.cpp)
+
+target_include_directories(
+  xplm_cpp
+  INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/CHeaders/Wrappers>
+            $<INSTALL_INTERFACE:include>)
+
+target_link_libraries(xplm_cpp PUBLIC unofficial::x-plane::xplm
+                                      unofficial::x-plane::xpwidgets)
+
+install(
+  TARGETS xplm_cpp
+  EXPORT xplm-targets
+  ARCHIVE DESTINATION lib)
+
+file(GLOB HEADERS "${CMAKE_CURRENT_LIST_DIR}/CHeaders/XPLM/*.h")
+install(FILES ${HEADERS} DESTINATION "include")
+
+file(GLOB HEADERS "${CMAKE_CURRENT_LIST_DIR}/CHeaders/Widgets/*.h")
+install(FILES ${HEADERS} DESTINATION "include")
+
+file(GLOB HEADERS "${CMAKE_CURRENT_LIST_DIR}/CHeaders/Wrappers/*.h")
+install(FILES ${HEADERS} DESTINATION "include")
+
+include(CMakePackageConfigHelpers)
+configure_package_config_file(
+  "${CMAKE_CURRENT_SOURCE_DIR}/unofficial-x-plane-config.cmake.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/unofficial-x-plane-config.cmake"
+  INSTALL_DESTINATION "share/unofficial-x-plane")
+
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/unofficial-x-plane-config.cmake"
+        DESTINATION "share/unofficial-x-plane")
+
+install(
+  EXPORT xplm-targets
+  DESTINATION share/unofficial-x-plane
+  FILE unofficial-x-plane-targets.cmake
+  NAMESPACE unofficial::x-plane::)
diff --git a/external_imported/vcpkg/ports/x-plane/portfile.cmake b/external_imported/vcpkg/ports/x-plane/portfile.cmake
index 3b7c9a679..eebc06d6c 100644
--- a/external_imported/vcpkg/ports/x-plane/portfile.cmake
+++ b/external_imported/vcpkg/ports/x-plane/portfile.cmake
@@ -1,37 +1,30 @@
-vcpkg_download_distfile(ARCHIVE
-    URLS "http://developer.x-plane.com/wp-content/plugins/code-sample-generation/sample_templates/XPSDK303.zip"
-    FILENAME "XPSDK303.zip"
-    SHA512 23a1efc893fdb838ce90307ac2e1bf592b03880e9c7bf7aac51cf0d358816931b56a3d603e266f3c9041620190c689dc4d3b28b288bc39cf6e653db6f2125395
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+set(XPSDK_VERSION "401")
+vcpkg_download_distfile(
+    XPLANE_SDK_ZIP
+    URLS "https://developer.x-plane.com/wp-content/plugins/code-sample-generation/sample_templates/XPSDK${XPSDK_VERSION}.zip"
+    FILENAME "XPSDK${XPSDK_VERSION}.zip"
+    SHA512 8e00789befd15f5b1cb4f426ddf9c3f7f021c5fba50b907e8af5fbf09abbc362804b5d1543332855d01e8ae91b9c50a55933e63df6e11e88e58c10ca8f949bf4
+)
+vcpkg_extract_source_archive(
+    SOURCE_PATH
+    ARCHIVE "${XPLANE_SDK_ZIP}"
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/unofficial-x-plane-config.cmake.in" DESTINATION "${SOURCE_PATH}")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
 )
 
-# create lib dir
-if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_OSX)
-    file(MAKE_DIRECTORY
-        ${CURRENT_PACKAGES_DIR}/lib
-        ${CURRENT_PACKAGES_DIR}/debug/lib
-    )
-endif()
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-x-plane)
 
-# copy headers & sources
-file(COPY ${SOURCE_PATH}/CHeaders/Widgets/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-file(COPY ${SOURCE_PATH}/CHeaders/Wrappers/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-file(COPY ${SOURCE_PATH}/CHeaders/XPLM/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/license.txt")
 
-# copy prebuilt libs
-if(VCPKG_TARGET_IS_WINDOWS)
-    file(COPY ${SOURCE_PATH}/Libraries/Win/XPLM_64.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/)
-    file(COPY ${SOURCE_PATH}/Libraries/Win/XPWidgets_64.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/)
-    file(COPY ${SOURCE_PATH}/Libraries/Win/XPLM_64.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/)
-    file(COPY ${SOURCE_PATH}/Libraries/Win/XPWidgets_64.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/)
-elseif (VCPKG_TARGET_IS_OSX)
-    file(COPY ${SOURCE_PATH}/Libraries/Mac/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib/)
-    file(COPY ${SOURCE_PATH}/Libraries/Mac/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/)
-endif()
+configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY)
 
-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
diff --git a/external_imported/vcpkg/ports/x-plane/unofficial-x-plane-config.cmake.in b/external_imported/vcpkg/ports/x-plane/unofficial-x-plane-config.cmake.in
new file mode 100644
index 000000000..f4b7e77ed
--- /dev/null
+++ b/external_imported/vcpkg/ports/x-plane/unofficial-x-plane-config.cmake.in
@@ -0,0 +1,62 @@
+@PACKAGE_INIT@
+
+get_filename_component(ROOT "${CMAKE_CURRENT_LIST_DIR}" PATH)
+get_filename_component(ROOT "${ROOT}" PATH)
+
+if(NOT TARGET unofficial::x-plane::xplm)
+  if(WIN32 OR APPLE)
+    add_library(unofficial::x-plane::xplm SHARED IMPORTED)
+    if(WIN32)
+      set_target_properties(
+        unofficial::x-plane::xplm
+        PROPERTIES IMPORTED_IMPLIB "${ROOT}/lib/x-plane/XPLM_64.lib")
+      set_target_properties(
+        unofficial::x-plane::xplm PROPERTIES INTERFACE_COMPILE_DEFINITIONS
+                                                "-DIBM=1;-DAPL=0;-DLIN=0")
+    else()
+      set_target_properties(
+        unofficial::x-plane::xplm
+        PROPERTIES IMPORTED_LOCATION "${ROOT}/lib/x-plane/XPLM.framework/XPLM")
+      set_target_properties(
+        unofficial::x-plane::xplm PROPERTIES INTERFACE_COMPILE_DEFINITIONS
+                                                "-DIBM=0;-DAPL=1;-DLIN=0")
+    endif()
+  else()
+    add_library(unofficial::x-plane::xplm INTERFACE IMPORTED)
+    set_target_properties(
+      unofficial::x-plane::xplm PROPERTIES INTERFACE_COMPILE_DEFINITIONS
+                                              "-DIBM=0;-DAPL=0;-DLIN=1")
+  endif()
+  set_target_properties(
+    unofficial::x-plane::xplm PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
+                                            "${ROOT}/include")
+endif()
+
+if(NOT TARGET unofficial::x-plane::xpwidgets)
+  if(WIN32 OR APPLE)
+    add_library(unofficial::x-plane::xpwidgets SHARED IMPORTED)
+    if(WIN32)
+      set_target_properties(
+        unofficial::x-plane::xpwidgets
+        PROPERTIES IMPORTED_IMPLIB "${ROOT}/lib/x-plane/XPWidgets_64.lib")
+    else()
+      set_target_properties(
+        unofficial::x-plane::xpwidgets
+        PROPERTIES IMPORTED_LOCATION
+                   "${ROOT}/lib/x-plane/XPWidgets.framework/XPWidgets")
+    endif()
+  else()
+    add_library(unofficial::x-plane::xpwidgets INTERFACE IMPORTED)
+  endif()
+  set_target_properties(
+    unofficial::x-plane::xpwidgets PROPERTIES INTERFACE_LINK_LIBRARIES
+                                                 "unofficial::x-plane::xplm")
+  set_target_properties(
+    unofficial::x-plane::xpwidgets
+    PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
+               "${ROOT}/include")
+endif()
+
+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-x-plane-targets.cmake")
+
+check_required_components(unofficial-x-plane)
diff --git a/external_imported/vcpkg/ports/x-plane/usage b/external_imported/vcpkg/ports/x-plane/usage
new file mode 100644
index 000000000..de07716df
--- /dev/null
+++ b/external_imported/vcpkg/ports/x-plane/usage
@@ -0,0 +1,4 @@
+x-plane provides CMake targets:
+
+    find_package(unofficial-x-plane CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE unofficial::x-plane::xplm unofficial::x-plane::xpwidgets unofficial::x-plane::xplm_cpp)
diff --git a/external_imported/vcpkg/ports/x-plane/vcpkg.json b/external_imported/vcpkg/ports/x-plane/vcpkg.json
index 6402bd4b5..9dbb8e9e9 100644
--- a/external_imported/vcpkg/ports/x-plane/vcpkg.json
+++ b/external_imported/vcpkg/ports/x-plane/vcpkg.json
@@ -1,8 +1,18 @@
 {
   "name": "x-plane",
-  "version": "3.0.3",
-  "port-version": 1,
+  "version": "4.0.1",
   "description": "The X-Plane Plugin SDK",
   "homepage": "https://developer.x-plane.com/sdk/",
-  "supports": "!(x86 | arm | wasm32)"
+  "license": null,
+  "supports": "(windows & !uwp & x64) | (osx & (x64 | arm64)) | (linux & x64)",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/external_imported/vcpkg/ports/x264/portfile.cmake b/external_imported/vcpkg/ports/x264/portfile.cmake
index cbd951a70..9a4e24a9e 100644
--- a/external_imported/vcpkg/ports/x264/portfile.cmake
+++ b/external_imported/vcpkg/ports/x264/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mirror/x264
-    REF baee400fa9ced6f5481a728138fed6e867b0ff7f # 0.164.3095 in pc file, to be updated below
-    SHA512 3c7147457cbe0fea20cf3ed8cf7bbdca9ac15060cf86f81b9b5b54b018f922964e91b3c38962c81fedef92bc5b14489e04d0966d03d2b7a85b4dabab6ad816a2
+    REF eaa68fad9e5d201d42fde51665f2d137ae96baf0 # 0.164.3107 in pc file, to be updated below
+    SHA512 9181b222e7f8bbde4331141ff399e1ef20d3e2e7a8f939b373fbe08df6f3caa99b992afb0e559cc19f78c96f0105b88b2eb4e4b935484e25b2c15da7903d179b
     HEAD_REF stable
     PATCHES
         uwp-cflags.patch
@@ -77,6 +77,14 @@ else()
     vcpkg_list(APPEND OPTIONS_RELEASE --disable-cli)
 endif()
 
+if("chroma-format-all" IN_LIST FEATURES)
+    vcpkg_list(APPEND OPTIONS --chroma-format=all)
+endif()
+
+if(NOT "gpl" IN_LIST FEATURES)
+    vcpkg_list(APPEND OPTIONS --disable-gpl)
+endif()
+
 if(VCPKG_TARGET_IS_UWP)
     list(APPEND OPTIONS --extra-cflags=-D_WIN32_WINNT=0x0A00)
 endif()
diff --git a/external_imported/vcpkg/ports/x264/vcpkg.json b/external_imported/vcpkg/ports/x264/vcpkg.json
index 064f07140..ec4d35e72 100644
--- a/external_imported/vcpkg/ports/x264/vcpkg.json
+++ b/external_imported/vcpkg/ports/x264/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "x264",
-  "version": "0.164.3095",
-  "port-version": 2,
+  "version": "0.164.3107",
   "description": "x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format",
   "homepage": "https://www.videolan.org/developers/x264.html",
   "license": "GPL-2.0-or-later",
+  "supports": "!xbox",
   "dependencies": [
     {
       "name": "vcpkg-cmake-get-vars",
@@ -19,18 +19,25 @@
       "description": "Enable platform-specific assembly optimizations",
       "supports": "x86 | x64 | (arm & !windows) | arm64"
     },
+    "chroma-format-all": {
+      "description": "Output all chroma formats"
+    },
     "default-features": {
       "description": "Default set of features",
       "dependencies": [
         {
           "name": "x264",
           "features": [
-            "asm"
+            "asm",
+            "gpl"
           ],
           "platform": "x86 | x64 | (arm & !windows) | arm64"
         }
       ]
     },
+    "gpl": {
+      "description": "Allow use of GPL code, the resulting libs and binaries will be under GPL"
+    },
     "tool": {
       "description": "Build the command line tool",
       "supports": "!uwp"
diff --git a/external_imported/vcpkg/ports/x265/fix-pkgconfig-version.patch b/external_imported/vcpkg/ports/x265/fix-pkgconfig-version.patch
deleted file mode 100644
index f5c3d4366..000000000
--- a/external_imported/vcpkg/ports/x265/fix-pkgconfig-version.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/source/cmake/version.cmake b/source/cmake/version.cmake
-index b1e995f..d7df148 100644
---- a/source/cmake/version.cmake
-+++ b/source/cmake/version.cmake
-@@ -7,7 +7,7 @@ find_package(Git QUIET) # present in 2.8.8
- 
- # defaults, in case everything below fails
- set(X265_VERSION "unknown")
--set(X265_LATEST_TAG "0.0")
-+set(X265_LATEST_TAG "0.0" CACHE STRING "x265 version")
- set(X265_TAG_DISTANCE "0")
- 
- if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../.hg_archival.txt)
diff --git a/external_imported/vcpkg/ports/x265/portfile.cmake b/external_imported/vcpkg/ports/x265/portfile.cmake
index 4aace861c..e4b5bc353 100644
--- a/external_imported/vcpkg/ports/x265/portfile.cmake
+++ b/external_imported/vcpkg/ports/x265/portfile.cmake
@@ -1,12 +1,12 @@
-vcpkg_from_github(
+vcpkg_from_bitbucket(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO videolan/x265
-    REF 07295ba7ab551bb9c1580fdaee3200f1b45711b7 #v3.4
-    SHA512 21a4ef8733a9011eec8b336106c835fbe04689e3a1b820acb11205e35d2baba8c786d9d8cf5f395e78277f921857e4eb8622cf2ef3597bce952d374f7fe9ec29
+    REPO multicoreware/x265_git
+    REF "${VERSION}"
+    SHA512 e95e454b438114cf90e32818847afa65b54caf69442a4a39dc92f125a7ec6f99c83ec509549ced3395cd5a77305abef0ecdad38b4a359f82fb17fce6c4c7cc7a
     HEAD_REF master
     PATCHES
         disable-install-pdb.patch
-        fix-pkgconfig-version.patch
+        version.patch
 )
 
 set(ASSEMBLY_OPTIONS "-DENABLE_ASSEMBLY=OFF")
@@ -23,7 +23,7 @@ vcpkg_cmake_configure(
         ${ASSEMBLY_OPTIONS}
         -DENABLE_SHARED=${ENABLE_SHARED}
         -DENABLE_LIBNUMA=OFF
-        -DX265_LATEST_TAG=3.4
+        "-DVERSION=${VERSION}"
     OPTIONS_DEBUG
         -DENABLE_CLI=OFF
     MAYBE_UNUSED_VARIABLES
@@ -42,6 +42,10 @@ if(VCPKG_TARGET_IS_MINGW AND ENABLE_SHARED)
 endif()
 
 vcpkg_fixup_pkgconfig()
+if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW AND ENABLE_SHARED)
+    file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/x265-static.lib")
+    file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/x265-static.lib")
+endif()
 vcpkg_list(SET pc_files "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/x265.pc")
 if(NOT VCPKG_BUILD_TYPE)
     vcpkg_list(APPEND pc_files "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/x265.pc")
@@ -49,7 +53,9 @@ endif()
 foreach(FILE IN LISTS pc_files)
     file(READ "${FILE}" _contents)
     if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
-        string(REPLACE "-lx265" "-lx265-static" _contents "${_contents}")
+        if (NOT ENABLE_SHARED)
+            string(REPLACE "-lx265" "-lx265-static" _contents "${_contents}")
+        endif()
     else()
         string(REPLACE " -lgcc_s" "" _contents "${_contents}")
         string(REPLACE " -lgcc" "" _contents "${_contents}")
@@ -58,4 +64,4 @@ foreach(FILE IN LISTS pc_files)
 endforeach()
 
 # Handle copyright
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/x265/vcpkg.json b/external_imported/vcpkg/ports/x265/vcpkg.json
index 983e4cca8..651eec5e3 100644
--- a/external_imported/vcpkg/ports/x265/vcpkg.json
+++ b/external_imported/vcpkg/ports/x265/vcpkg.json
@@ -1,11 +1,10 @@
 {
   "name": "x265",
-  "version": "3.4",
-  "port-version": 8,
+  "version": "3.5",
   "description": "x265 is a H.265 / HEVC video encoder application library, designed to encode video or images into an H.265 / HEVC encoded bitstream.",
   "homepage": "https://github.com/videolan/x265",
   "license": "GPL-2.0-or-later",
-  "supports": "!uwp & !(arm & windows)",
+  "supports": "!uwp & !(arm & windows) & !xbox",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/external_imported/vcpkg/ports/x265/version.patch b/external_imported/vcpkg/ports/x265/version.patch
new file mode 100644
index 000000000..b9cb75a51
--- /dev/null
+++ b/external_imported/vcpkg/ports/x265/version.patch
@@ -0,0 +1,16 @@
+diff --git a/source/cmake/Version.cmake b/source/cmake/Version.cmake
+index 3bbf42f..e77f639 100644
+--- a/source/cmake/Version.cmake
++++ b/source/cmake/Version.cmake
+@@ -28,6 +28,11 @@
+ set(X265_VERSION "unknown")
+ set(X265_LATEST_TAG "0.0")
+ set(X265_TAG_DISTANCE "0")
++if(VERSION)
++    set(X265_VERSION "${VERSION}-vcpkg")
++    set(X265_LATEST_TAG "${VERSION}")
++    return()
++endif()
+ 
+ #Find version control software to be used for live and extracted repositories from compressed tarballs
+ if(CMAKE_VERSION VERSION_LESS "2.8.10")
diff --git a/external_imported/vcpkg/ports/x86-simd-sort/portfile.cmake b/external_imported/vcpkg/ports/x86-simd-sort/portfile.cmake
index 5d5b2f872..8ba994d1b 100644
--- a/external_imported/vcpkg/ports/x86-simd-sort/portfile.cmake
+++ b/external_imported/vcpkg/ports/x86-simd-sort/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO intel/x86-simd-sort
-    REF 7d7591cf5927e83e4a1e7c4b6f2c4dc91a97889f
-    SHA512 6b71f25e0ec1adcd81a6ce3ecf60316a841c48d9b438ae2afde9b2a17a90d13047cb1d7bce7dcecf15718f4fb299adad7875b022b57f90965f5e7a25e16e6721
+    REF "v${VERSION}"
+    SHA512 2e95f026515f5616a43dfdb8d2b6a0e6da3027b74bb8e21db5f7db6710cb7bf290ab147a117093fd7bfba66de6c4c0fcfde16fbe8278bd4966031662bff34ba8
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/x86-simd-sort/vcpkg.json b/external_imported/vcpkg/ports/x86-simd-sort/vcpkg.json
index 7802f4f1d..81a6d442c 100644
--- a/external_imported/vcpkg/ports/x86-simd-sort/vcpkg.json
+++ b/external_imported/vcpkg/ports/x86-simd-sort/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "x86-simd-sort",
-  "version-date": "2023-03-04",
+  "version": "4.0",
   "description": "C++ header file library for high-performance SIMD-based sorting algorithms for primitive datatypes",
   "homepage": "https://github.com/intel/x86-simd-sort",
   "license": "BSD-3-Clause"
diff --git a/external_imported/vcpkg/ports/xapian/configure.diff b/external_imported/vcpkg/ports/xapian/configure.diff
new file mode 100644
index 000000000..9c2ce041a
--- /dev/null
+++ b/external_imported/vcpkg/ports/xapian/configure.diff
@@ -0,0 +1,23 @@
+diff --git a/configure.ac b/configure.ac
+index ca5b7b2..b059402 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -870,6 +870,7 @@ case $enable_backend_chert$enable_backend_glass in
+   dnl
+   dnl Similarly for uuid support.
+ 
++  if false; then
+   dnl Check for zlib.h.
+   AC_CHECK_HEADERS([zlib.h], [], [
+     AC_MSG_ERROR([zlib.h not found - required for chert and glass (you may need to install the zlib1g-dev or zlib-devel package)])
+@@ -879,6 +880,10 @@ case $enable_backend_chert$enable_backend_glass in
+   AC_SEARCH_LIBS([zlibVersion], [z zlib zdll], [], [
+     AC_MSG_ERROR([zlibVersion() not found in -lz, -lzlib, or -lzdll - required for chert and glass (you may need to install the zlib1g-dev or zlib-devel package)])
+     ])
++  fi
++  PKG_CHECK_MODULES([ZLIB], [zlib], [],[AC_MSG_ERROR([zlib library not found])])
++  CFLAGS="$LIBS $ZLIB_CFLAGS"
++  LIBS="$ZLIB_LIBS $LIBS"
+ 
+   dnl Find a way to generate UUIDs.
+ 
diff --git a/external_imported/vcpkg/ports/xapian/msvc-no-debug.diff b/external_imported/vcpkg/ports/xapian/msvc-no-debug.diff
new file mode 100644
index 000000000..1d41a3201
--- /dev/null
+++ b/external_imported/vcpkg/ports/xapian/msvc-no-debug.diff
@@ -0,0 +1,13 @@
+diff --git a/include/xapian/version_h.cc b/include/xapian/version_h.cc
+index b36ae4d..c61e31a 100644
+--- a/include/xapian/version_h.cc
++++ b/include/xapian/version_h.cc
+@@ -75,7 +75,7 @@ const char * dummy[] = {
+ "#endif",
+ "#endif",
+ "",
+-#elif defined _MSC_VER
++#elif 0
+ // When building the library with MSVC, generate preprocessor code to check
+ // that the same setting of _DEBUG is used for building applications as was
+ // used for building the library.
diff --git a/external_imported/vcpkg/ports/xapian/portfile.cmake b/external_imported/vcpkg/ports/xapian/portfile.cmake
index bd41b1b97..2d432e81d 100644
--- a/external_imported/vcpkg/ports/xapian/portfile.cmake
+++ b/external_imported/vcpkg/ports/xapian/portfile.cmake
@@ -1,31 +1,31 @@
 vcpkg_download_distfile(ARCHIVE
-    URLS https://oligarchy.co.uk/xapian/1.4.21/xapian-core-1.4.21.tar.xz
-    FILENAME xapian-core-1.4.21.tar.xz
-    SHA512 4071791daf47f5ae77f32f358c6020fcfa9aa81c15c8da25489b055eef30383695e449ab1cb73670f2f5db2b2a5f78056da0e8eea89d83aaad91dfe340a6b13a
+    URLS "https://oligarchy.co.uk/xapian/${VERSION}/xapian-core-${VERSION}.tar.xz"
+    FILENAME "xapian-core-${VERSION}.tar.xz"
+    SHA512 60d66adbacbd59622d25e392060984bd1dc6c870f9031765f54cb335fb29f72f6d006d27af82a50c8da2cfbebd08dac4503a8afa8ad51bc4e6fa9cb367a59d29
 )
 
 vcpkg_extract_source_archive(
     SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
+    PATCHES
+        configure.diff
+        msvc-no-debug.diff
 )
 
-if(WIN32)
-    vcpkg_replace_string("${SOURCE_PATH}/configure.ac" "z zlib zdll" "z zlib zdll zlibd")
-
-    # xapian does not support debug lib on Windows
-    # if use `set(VCPKG_BUILD_TYPE release)` ，the vcpkg post check can not passed，
-    # it will throw exception "Mismatching number of debug and release binaries. Found 0 for debug but 1 for release."
-    # that means the `set(VCPKG_BUILD_TYPE release)` can not be used in the WIN32 environment.
-    if(VCPKG_BUILD_TYPE STREQUAL "release")
-        set(OPTIONS "CXXFLAGS=-EHsc")
-    endif()
+set(OPTIONS "")
+if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
+    list(APPEND OPTIONS
+        ac_cv_have_decl___popcnt=no
+        ac_cv_have_decl___popcnt64=no
+    )
 endif()
 
 vcpkg_configure_make(
     SOURCE_PATH "${SOURCE_PATH}"
     AUTOCONFIG
     USE_WRAPPERS
-    OPTIONS ${OPTIONS}
+    OPTIONS
+        ${OPTIONS}
 )
 
 vcpkg_install_make()
@@ -33,7 +33,7 @@ vcpkg_install_make()
 vcpkg_fixup_pkgconfig()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/xapian)
 
-if (NOT VCPKG_TARGET_IS_WINDOWS)
+if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW)
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/xapian-config" "\"${CURRENT_INSTALLED_DIR}\"" "`dirname $0`/../../..")
     if(NOT VCPKG_BUILD_TYPE)
         vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/xapian-config" "\"${CURRENT_INSTALLED_DIR}/debug\"" "`dirname $0`/../../../../debug")
@@ -41,4 +41,4 @@ if (NOT VCPKG_TARGET_IS_WINDOWS)
 endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/xapian/vcpkg.json b/external_imported/vcpkg/ports/xapian/vcpkg.json
index d185f263b..33bf4ffd5 100644
--- a/external_imported/vcpkg/ports/xapian/vcpkg.json
+++ b/external_imported/vcpkg/ports/xapian/vcpkg.json
@@ -1,11 +1,11 @@
 {
   "name": "xapian",
-  "version": "1.4.21",
-  "port-version": 1,
+  "version": "1.4.22",
+  "port-version": 2,
   "description": "Xapian is an Open Source Search Engine Library, released under the GPL v2+. It's written in C++, with bindings to allow use from Perl, Python 2, Python 3, PHP 5, PHP 7, Java, Tcl, C#, Ruby, Lua, Erlang, Node.js and R (so far!)",
-  "homepage": "https://github.com/xapian/xapian",
+  "homepage": "https://xapian.org/",
   "license": "GPL-2.0-or-later",
-  "supports": "!(windows & arm) & !uwp",
+  "supports": "(!arm | arm64) & !uwp & !xbox",
   "dependencies": [
     {
       "name": "vcpkg-cmake-config",
diff --git a/external_imported/vcpkg/ports/xbyak/portfile.cmake b/external_imported/vcpkg/ports/xbyak/portfile.cmake
index fd08f1af9..916e9fa40 100644
--- a/external_imported/vcpkg/ports/xbyak/portfile.cmake
+++ b/external_imported/vcpkg/ports/xbyak/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO herumi/xbyak
-    REF v6.60
-    SHA512 83dba532c7aaa618d61f2d345caeb0ca0b1c3e4946b758095410f269ba954d1870325ed05aa7a1f8aab0b5a2961ecd878980ab835f3db3078a969d2d951aa7e9
+    REF "v${VERSION}"
+    SHA512 1af11bea9e75b9b2842197e52d21283fc5ea7ea3ae1034a3e4584e6ca7b364a60589675a0b171d4ff205029730948b91d353f13d11d52c07f1befedc106971b2
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/xbyak/vcpkg.json b/external_imported/vcpkg/ports/xbyak/vcpkg.json
index 8244ab284..506539001 100644
--- a/external_imported/vcpkg/ports/xbyak/vcpkg.json
+++ b/external_imported/vcpkg/ports/xbyak/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "xbyak",
-  "version": "6.60",
+  "version": "6.73",
   "description": "Xbyak is a JIT assembler for x86(IA-32)/x64(AMD64, x86-64).",
   "homepage": "https://github.com/herumi/xbyak",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/xcb-proto/portfile.cmake b/external_imported/vcpkg/ports/xcb-proto/portfile.cmake
index 8927d2a8d..e79eb88d8 100644
--- a/external_imported/vcpkg/ports/xcb-proto/portfile.cmake
+++ b/external_imported/vcpkg/ports/xcb-proto/portfile.cmake
@@ -45,5 +45,5 @@ vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
 endif()
diff --git a/external_imported/vcpkg/ports/xcb-proto/vcpkg.json b/external_imported/vcpkg/ports/xcb-proto/vcpkg.json
index 0f285d781..a78735d9e 100644
--- a/external_imported/vcpkg/ports/xcb-proto/vcpkg.json
+++ b/external_imported/vcpkg/ports/xcb-proto/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "xcb-proto",
   "version": "1.14.1",
+  "port-version": 1,
   "description": "XML-XCB protocol descriptions used by libxcb for the X11 protocol & extensions",
   "homepage": "https://xcb.freedesktop.org/",
-  "license": null,
+  "license": "X11-distribute-modifications-variant",
   "dependencies": [
     "bzip2",
     {
diff --git a/external_imported/vcpkg/ports/xerces-c/dependencies.patch b/external_imported/vcpkg/ports/xerces-c/dependencies.patch
index 01b5cab27..84f80c0d3 100644
--- a/external_imported/vcpkg/ports/xerces-c/dependencies.patch
+++ b/external_imported/vcpkg/ports/xerces-c/dependencies.patch
@@ -1,8 +1,54 @@
+diff --git a/cmake/XercesNetAccessorSelection.cmake b/cmake/XercesNetAccessorSelection.cmake
+index 7a63f1f..22ea65b 100644
+--- a/cmake/XercesNetAccessorSelection.cmake
++++ b/cmake/XercesNetAccessorSelection.cmake
+@@ -23,7 +23,7 @@ option(network "Network support" ON)
+ 
+ if(network)
+   find_library(SOCKET_LIBRARY socket)
+-  find_library(NSL_LIBRARY nsl)
++  set(NSL_LIBRARY "" CACHE INTERNAL "Not used")
+ 
+   # netaccessors in order of preference
+ 
+diff --git a/cmake/XercesTranscoderSelection.cmake b/cmake/XercesTranscoderSelection.cmake
+index 4ff5b16..48e274c 100644
+--- a/cmake/XercesTranscoderSelection.cmake
++++ b/cmake/XercesTranscoderSelection.cmake
+@@ -25,6 +25,7 @@
+ 
+ if(ICU_FOUND)
+   list(APPEND transcoders icu)
++  set(TRANSCODER_REQUIRES "icu-uc")
+ endif()
+ 
+ # MacOS
+@@ -41,6 +42,20 @@ endif()
+ 
+ # GNU iconv
+ 
++if(NOT transcoder AND NOT transcoders AND NOT WIN32)
++  find_package(Iconv)
++  set(FIND_DEPENDENCY_ICONV "${Iconv_FOUND}")
++  if(Iconv_FOUND AND NOT Iconv_IS_BUILT_IN)
++    list(APPEND libxerces_c_DEPS Iconv::Iconv)
++    set(TRANSCODER_LIBS "-liconv -lcharset")
++    list(APPEND CMAKE_REQUIRED_LIBRARIES Iconv::Iconv)
++    include(CheckSymbolExists)
++    check_symbol_exists(iconv_open "iconv.h" HAVE_ICONV_OPEN)
++    check_symbol_exists(iconv_close "iconv.h" HAVE_ICONV_CLOSE)
++    check_symbol_exists(iconv "iconv.h" HAVE_ICONV)
++  endif()
++endif()
++
+ check_include_file_cxx(iconv.h HAVE_ICONV_H)
+ check_include_file_cxx(wchar.h HAVE_WCHAR_H)
+ check_include_file_cxx(string.h HAVE_STRING_H)
 diff --git a/src/XercesCConfig.cmake.in b/src/XercesCConfig.cmake.in
-index aa8fc2e..07ec56d 100644
+index aa8fc2e..754c425 100644
 --- a/src/XercesCConfig.cmake.in
 +++ b/src/XercesCConfig.cmake.in
-@@ -1,5 +1,11 @@
+@@ -1,5 +1,14 @@
  @PACKAGE_INIT@
  
 +include(CMakeFindDependencyMacro)
@@ -10,7 +56,22 @@ index aa8fc2e..07ec56d 100644
 +if("@CMAKE_REQUIRE_FIND_PACKAGE_ICU@")
 +    find_dependency(ICU COMPONENTS uc data)
 +endif()
++if("@FIND_DEPENDENCY_ICONV@")
++    find_dependency(Iconv)
++endif()
 +
  include(${CMAKE_CURRENT_LIST_DIR}/XercesCConfigInternal.cmake)
  
  add_library(XercesC::XercesC INTERFACE IMPORTED)
+diff --git a/xerces-c.pc.in b/xerces-c.pc.in
+index 16b18c7..077296b 100644
+--- a/xerces-c.pc.in
++++ b/xerces-c.pc.in
+@@ -7,5 +7,6 @@ Name: Xerces-C++
+ Description: Validating XML parser library for C++
+ Version: @VERSION@
+ Libs: -L${libdir} -lxerces-c
+-Libs.private: @CURL_LIBS@
++Libs.private: @CURL_LIBS@ @TRANSCODER_LIBS@
++Requires.private: @TRANSCODER_REQUIRES@
+ Cflags: -I${includedir}
diff --git a/external_imported/vcpkg/ports/xerces-c/portfile.cmake b/external_imported/vcpkg/ports/xerces-c/portfile.cmake
index 307909c04..27c011b6b 100644
--- a/external_imported/vcpkg/ports/xerces-c/portfile.cmake
+++ b/external_imported/vcpkg/ports/xerces-c/portfile.cmake
@@ -3,7 +3,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO apache/xerces-c
     REF "v${VERSION}"
-    SHA512 0da61e000e871c045fb6e546cabba244eb6470a7a972c1d1b817ba5ce91c0d1d12dfb3ff1479d8b57ab06c49deefd1c16c36dc2541055e41a1cdb15dbd769fcf
+    SHA512 55bf16456408af7c5aa420a55b27555889fc102a24e86aecb918c165acc80bbc344420687061e020fe223ea04dd78bef929ceedc4b3e24727787f12b8d79b610
     HEAD_REF master
     PATCHES
         dependencies.patch
@@ -16,6 +16,7 @@ vcpkg_check_features(
     OUT_FEATURE_OPTIONS options
     FEATURES
         icu     CMAKE_REQUIRE_FIND_PACKAGE_ICU
+        network network
     INVERTED_FEATURES
         icu     CMAKE_DISABLE_FIND_PACKAGE_ICU
 )
@@ -47,6 +48,8 @@ vcpkg_cmake_configure(
         -DDISABLE_SAMPLES=ON
         -DCMAKE_DISABLE_FIND_PACKAGE_CURL=ON
         ${options}
+    MAYBE_UNUSED_VARIABLES
+        CMAKE_DISABLE_FIND_PACKAGE_CURL
 )
 
 vcpkg_cmake_install()
diff --git a/external_imported/vcpkg/ports/xerces-c/vcpkg.json b/external_imported/vcpkg/ports/xerces-c/vcpkg.json
index 94c8a41dc..636ca4809 100644
--- a/external_imported/vcpkg/ports/xerces-c/vcpkg.json
+++ b/external_imported/vcpkg/ports/xerces-c/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "xerces-c",
-  "version": "3.2.4",
-  "port-version": 2,
+  "version-semver": "3.2.5",
   "description": "Xerces-C++ is a XML parser, for parsing, generating, manipulating, and validating XML documents using the DOM, SAX, and SAX2 APIs.",
   "homepage": "https://github.com/apache/xerces-c",
   "license": "Apache-2.0",
+  "supports": "!uwp",
   "dependencies": [
     {
       "name": "libiconv",
@@ -19,6 +19,9 @@
       "host": true
     }
   ],
+  "default-features": [
+    "network"
+  ],
   "features": {
     "icu": {
       "description": "ICU support",
@@ -26,6 +29,9 @@
         "icu"
       ]
     },
+    "network": {
+      "description": "Network support"
+    },
     "xmlch-wchar": {
       "description": "XMLCh type uses wchar_t"
     }
diff --git a/external_imported/vcpkg/ports/xeus/vcpkg.json b/external_imported/vcpkg/ports/xeus/vcpkg.json
index 89f8f67ad..35562d0fd 100644
--- a/external_imported/vcpkg/ports/xeus/vcpkg.json
+++ b/external_imported/vcpkg/ports/xeus/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "xeus",
   "version": "0.24.3",
-  "port-version": 2,
+  "port-version": 3,
   "description": "C++ implementation of the Jupyter kernel protocol",
   "homepage": "https://github.com/jupyter-xeus/xeus",
   "license": "BSD-3-Clause",
@@ -9,7 +9,7 @@
     "cppzmq",
     {
       "name": "libuuid",
-      "platform": "linux"
+      "platform": "!windows & !osx"
     },
     "nlohmann-json",
     "openssl",
diff --git a/external_imported/vcpkg/ports/xframe/vcpkg.json b/external_imported/vcpkg/ports/xframe/vcpkg.json
index bf21d3323..f6c4e73c4 100644
--- a/external_imported/vcpkg/ports/xframe/vcpkg.json
+++ b/external_imported/vcpkg/ports/xframe/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "xframe",
-  "version-string": "0.3.0",
-  "port-version": 2,
+  "version": "0.3.0",
+  "port-version": 3,
   "description": "xframe is a dataframe for C++, based on xtensor and xtl.",
   "homepage": "https://github.com/xtensor-stack/xframe",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/xlsxio/export-targets.patch b/external_imported/vcpkg/ports/xlsxio/export-targets.patch
deleted file mode 100644
index 112473771..000000000
--- a/external_imported/vcpkg/ports/xlsxio/export-targets.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 05c7ee5..28a0206 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -87,7 +87,8 @@ INCLUDE_DIRECTORIES(${ANYZIP_INCLUDE_DIRS})
- INCLUDE_DIRECTORIES(${EXPAT_INCLUDE_DIRS})
- 
- # build definitions
--SET(ALLTARGETS)
-+SET(ALLTARGETS_LIB)
-+SET(ALLTARGETS_EXE)
- SET(LINKTYPES)
- IF(BUILD_STATIC)
-   LIST(APPEND LINKTYPES "STATIC")
-@@ -106,7 +107,7 @@ FOREACH(LINKTYPE ${LINKTYPES})
-   ENDIF()
-   TARGET_INCLUDE_DIRECTORIES(xlsxio_read_${LINKTYPE} PRIVATE lib)
-   TARGET_LINK_LIBRARIES(xlsxio_read_${LINKTYPE} ${ANYZIP_LIBRARIES} ${EXPAT_LIBRARIES})
--  SET(ALLTARGETS ${ALLTARGETS} xlsxio_read_${LINKTYPE})
-+  SET(ALLTARGETS_LIB ${ALLTARGETS_LIB} xlsxio_read_${LINKTYPE})
- 
-   ADD_LIBRARY(xlsxio_write_${LINKTYPE} ${LINKTYPE} lib/xlsxio_write.c)
-   SET_TARGET_PROPERTIES(xlsxio_write_${LINKTYPE} PROPERTIES COMPILE_DEFINITIONS "BUILD_XLSXIO;${ANYZIP_DEF};BUILD_XLSXIO_${LINKTYPE}")
-@@ -115,7 +116,7 @@ FOREACH(LINKTYPE ${LINKTYPES})
-     SET_TARGET_PROPERTIES(xlsxio_write_${LINKTYPE} PROPERTIES LINK_FLAGS "-Wl,--output-def=libxlsxio_write.def")
-   ENDIF()
-   TARGET_LINK_LIBRARIES(xlsxio_write_${LINKTYPE} ${ANYZIP_LIBRARIES} ${THREADLIB})
--  SET(ALLTARGETS ${ALLTARGETS} xlsxio_write_${LINKTYPE})
-+  SET(ALLTARGETS_LIB ${ALLTARGETS_LIB} xlsxio_write_${LINKTYPE})
- 
-   IF(WITH_WIDE)
-     ADD_LIBRARY(xlsxio_readw_${LINKTYPE} ${LINKTYPE} lib/xlsxio_read.c lib/xlsxio_read_sharedstrings.c)
-@@ -127,7 +128,7 @@ FOREACH(LINKTYPE ${LINKTYPES})
-     ENDIF()
-     TARGET_INCLUDE_DIRECTORIES(xlsxio_readw_${LINKTYPE} PRIVATE lib)
-     TARGET_LINK_LIBRARIES(xlsxio_readw_${LINKTYPE} ${ANYZIP_LIBRARIES} ${EXPATW_LIBRARIES})
--    SET(ALLTARGETS ${ALLTARGETS} xlsxio_readw_${LINKTYPE})
-+    SET(ALLTARGETS_LIB ${ALLTARGETS_LIB} xlsxio_readw_${LINKTYPE})
- 
-     #ADD_LIBRARY(xlsxio_writew_${LINKTYPE} ${LINKTYPE} lib/xlsxio_write.c)
-     #SET_TARGET_PROPERTIES(xlsxio_writew_${LINKTYPE} PROPERTIES DEFINE_SYMBOL "BUILD_XLSXIO_DLL")
-@@ -137,7 +138,7 @@ FOREACH(LINKTYPE ${LINKTYPES})
-     #  SET_TARGET_PROPERTIES(xlsxio_writew_${LINKTYPE} PROPERTIES LINK_FLAGS "-Wl,--output-def=libxlsxio_writew.def")
-     #ENDIF()
-     #TARGET_LINK_LIBRARIES(xlsxio_writew_${LINKTYPE} ${ANYZIP_LIBRARIES} ${THREADLIB})
--    #SET(ALLTARGETS ${ALLTARGETS} xlsxio_writew_${LINKTYPE})
-+    #SET(ALLTARGETS_LIB ${ALLTARGETS_LIB} xlsxio_writew_${LINKTYPE})
-   ENDIF()
- 
-   SET(EXELINKTYPE ${LINKTYPE})
-@@ -148,35 +149,35 @@ ENDFOREACH()
- IF(BUILD_TOOLS)
-   ADD_EXECUTABLE(xlsxio_xlsx2csv src/xlsxio_xlsx2csv.c)
-   TARGET_LINK_LIBRARIES(xlsxio_xlsx2csv xlsxio_read_${EXELINKTYPE})
--  SET(ALLTARGETS ${ALLTARGETS} xlsxio_xlsx2csv)
-+  SET(ALLTARGETS_EXE ${ALLTARGETS_EXE} xlsxio_xlsx2csv)
- 
-   ADD_EXECUTABLE(xlsxio_csv2xlsx src/xlsxio_csv2xlsx.c)
-   TARGET_LINK_LIBRARIES(xlsxio_csv2xlsx xlsxio_write_${EXELINKTYPE})
--  SET(ALLTARGETS ${ALLTARGETS} xlsxio_csv2xlsx)
-+  SET(ALLTARGETS_EXE ${ALLTARGETS_EXE} xlsxio_csv2xlsx)
- ENDIF()
- 
- IF(BUILD_EXAMPLES)
-   ADD_EXECUTABLE(example_xlsxio_write_getversion examples/example_xlsxio_write_getversion.c)
-   TARGET_LINK_LIBRARIES(example_xlsxio_write_getversion xlsxio_write_${EXELINKTYPE})
--  SET(ALLTARGETS ${ALLTARGETS} example_xlsxio_write_getversion)
-+  SET(ALLTARGETS_EXE ${ALLTARGETS_EXE} example_xlsxio_write_getversion)
- 
-   ADD_EXECUTABLE(example_xlsxio_write examples/example_xlsxio_write.c)
-   TARGET_LINK_LIBRARIES(example_xlsxio_write xlsxio_write_${EXELINKTYPE})
--  SET(ALLTARGETS ${ALLTARGETS} example_xlsxio_write)
-+  SET(ALLTARGETS_EXE ${ALLTARGETS_EXE} example_xlsxio_write)
- 
-   ADD_EXECUTABLE(example_xlsxio_read examples/example_xlsxio_read.c)
-   TARGET_LINK_LIBRARIES(example_xlsxio_read xlsxio_read_${EXELINKTYPE})
--  SET(ALLTARGETS ${ALLTARGETS} example_xlsxio_read)
-+  SET(ALLTARGETS_EXE ${ALLTARGETS_EXE} example_xlsxio_read)
- 
-   ADD_EXECUTABLE(example_xlsxio_read_advanced examples/example_xlsxio_read_advanced.c)
-   TARGET_LINK_LIBRARIES(example_xlsxio_read_advanced xlsxio_read_${EXELINKTYPE})
--  SET(ALLTARGETS ${ALLTARGETS} example_xlsxio_read_advanced)
-+  SET(ALLTARGETS_EXE ${ALLTARGETS_EXE} example_xlsxio_read_advanced)
- 
-   IF(WITH_WIDE)
-     ADD_EXECUTABLE(example_xlsxio_readw examples/example_xlsxio_read.c)
-     SET_TARGET_PROPERTIES(example_xlsxio_readw PROPERTIES COMPILE_DEFINITIONS "XML_UNICODE")
-     TARGET_LINK_LIBRARIES(example_xlsxio_readw xlsxio_readw_${EXELINKTYPE})
--    SET(ALLTARGETS ${ALLTARGETS} example_xlsxio_readw)
-+    SET(ALLTARGETS_EXE ${ALLTARGETS_EXE} example_xlsxio_readw)
-   ENDIF()
- ENDIF()
- 
-@@ -200,7 +201,43 @@ IF(BUILD_DOCUMENTATION)
- ENDIF()
- 
- # installation specifications
--INSTALL(TARGETS ${ALLTARGETS}
-+INSTALL(TARGETS ${ALLTARGETS_LIB}
-+  EXPORT  xlsxioTargets
-+  ARCHIVE DESTINATION lib
-+  LIBRARY DESTINATION lib
-+  RUNTIME DESTINATION bin
-+)
-+INSTALL(EXPORT xlsxioTargets
-+    NAMESPACE xlsxio::
-+    DESTINATION cmake
-+)
-+FILE(WRITE "${CMAKE_CURRENT_BINARY_DIR}/xlsxio-config.cmake.in"
-+[[INCLUDE(CMakeFindDependencyMacro)
-+IF (@WITH_LIBZIP@)
-+  FIND_DEPENDENCY(LibZip)
-+ELSE()
-+  FIND_DEPENDENCY(minizip CONFIG)
-+ENDIF()
-+IF (@EXPAT_DIR@)
-+  FIND_PATH(EXPAT_INCLUDE_DIR NAMES expat.h NO_DEFAULT_PATH PATHS ${EXPAT_DIR}/include ${EXPAT_DIR})
-+  FIND_LIBRARY(EXPAT_LIBRARIES NAMES expat libexpat NO_DEFAULT_PATH PATHS ${EXPAT_DIR}/lib ${EXPAT_DIR})
-+ELSE()
-+  FIND_DEPENDENCY(EXPAT)
-+ENDIF()
-+
-+IF(@WITH_WIDE@)
-+  IF(@EXPAT_DIR@)
-+    FIND_LIBRARY(EXPATW_LIBRARIES NAMES expatw libexpatw NO_DEFAULT_PATH PATHS ${EXPAT_DIR}/lib ${EXPAT_DIR})
-+  ELSE()
-+    FIND_LIBRARY(EXPATW_LIBRARIES NAMES expatw)
-+  ENDIF()
-+ENDIF()
-+INCLUDE("${CMAKE_CURRENT_LIST_DIR}/xlsxioTargets.cmake")
-+]])
-+CONFIGURE_FILE("${CMAKE_CURRENT_BINARY_DIR}/xlsxio-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/xlsxio-config.cmake" @ONLY)
-+INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/xlsxio-config.cmake" DESTINATION cmake)
-+
-+INSTALL(TARGETS ${ALLTARGETS_EXE}
-   ARCHIVE DESTINATION lib
-   LIBRARY DESTINATION lib
-   RUNTIME DESTINATION bin
diff --git a/external_imported/vcpkg/ports/xlsxio/fix-dependencies.patch b/external_imported/vcpkg/ports/xlsxio/fix-dependencies.patch
index 7a02d8f9d..70b2cdfa5 100644
--- a/external_imported/vcpkg/ports/xlsxio/fix-dependencies.patch
+++ b/external_imported/vcpkg/ports/xlsxio/fix-dependencies.patch
@@ -1,16 +1,41 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 490ee5c..05c7ee5 100644
+index 7e86706..f2bdc36 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -49,9 +49,8 @@ IF(WITH_LIBZIP)
-   SET(ANYZIP_LIBRARIES ${LIBZIP_LIBRARIES})
-   SET(ANYZIP_DEF USE_LIBZIP)
+@@ -57,7 +57,9 @@ ELSEIF(WITH_MINIZIP_NG)
+   SET(ANYZIP_LIBRARIES minizip${MINIZIP_NG_SUFFIX})
+   SET(ANYZIP_DEF USE_MINIZIP;USE_MINIZIP_NG)
  ELSE()
 -  FIND_PACKAGE(Minizip REQUIRED)
--  SET(ANYZIP_INCLUDE_DIRS ${MINIZIP_INCLUDE_DIRS})
--  SET(ANYZIP_LIBRARIES ${MINIZIP_LIBRARIES})
-+  FIND_PACKAGE(minizip CONFIG REQUIRED)
-+  SET(ANYZIP_LIBRARIES minizip::minizip)
++  FIND_PACKAGE(Minizip NAMES unofficial-minizip REQUIRED)
++  SET(MINIZIP_INCLUDE_DIRS "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include")
++  SET(MINIZIP_LIBRARIES unofficial::minizip::minizip)
+   SET(ANYZIP_INCLUDE_DIRS ${MINIZIP_INCLUDE_DIRS})
+   SET(ANYZIP_LIBRARIES ${MINIZIP_LIBRARIES})
    SET(ANYZIP_DEF USE_MINIZIP)
+@@ -68,7 +70,8 @@ IF(EXPAT_DIR)
+   FIND_PATH(EXPAT_INCLUDE_DIR NAMES expat.h NO_DEFAULT_PATH PATHS ${EXPAT_DIR}/include ${EXPAT_DIR})
+   FIND_LIBRARY(EXPAT_LIBRARIES NAMES expat libexpat NO_DEFAULT_PATH PATHS ${EXPAT_DIR}/lib ${EXPAT_DIR})
+ ELSE()
+-  FIND_PACKAGE(EXPAT REQUIRED)
++  FIND_PACKAGE(EXPAT NAMES expat REQUIRED)
++  SET(EXPAT_LIBRARIES expat::expat)
+ ENDIF()
+ #   dependancy: expatw (if wide library was requested)
+ IF(WITH_WIDE)
+@@ -225,13 +228,13 @@ FILE(WRITE "${CMAKE_CURRENT_BINARY_DIR}/xlsxio-config.cmake.in"
+ IF (@WITH_LIBZIP@)
+   FIND_DEPENDENCY(LibZip)
+ ELSE()
+-  FIND_DEPENDENCY(minizip CONFIG)
++  FIND_DEPENDENCY(unofficial-minizip CONFIG)
+ ENDIF()
+ IF (@EXPAT_DIR@)
+   FIND_PATH(EXPAT_INCLUDE_DIR NAMES expat.h NO_DEFAULT_PATH PATHS ${EXPAT_DIR}/include ${EXPAT_DIR})
+   FIND_LIBRARY(EXPAT_LIBRARIES NAMES expat libexpat NO_DEFAULT_PATH PATHS ${EXPAT_DIR}/lib ${EXPAT_DIR})
+ ELSE()
+-  FIND_DEPENDENCY(EXPAT)
++  FIND_DEPENDENCY(expat CONFIG)
  ENDIF()
- #   dependancy: expat
+ 
+ IF(@WITH_WIDE@)
diff --git a/external_imported/vcpkg/ports/xlsxio/portfile.cmake b/external_imported/vcpkg/ports/xlsxio/portfile.cmake
index 7d7915e9c..ad0230c1b 100644
--- a/external_imported/vcpkg/ports/xlsxio/portfile.cmake
+++ b/external_imported/vcpkg/ports/xlsxio/portfile.cmake
@@ -1,29 +1,22 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO brechtsanders/xlsxio
-    REF e3acace39e5fb153f5ce3500a4952c2bf93175bd
-    SHA512 8148b89c43cf45653c583d51fb8050714d3cd0a76ab9a05d46604f3671a06487e4fc58d3f6f9f2a9f9b57a9f9fe1863ef07017c74197f151390576c5aac360ea
+    REF "${VERSION}"
+    SHA512 67b9a4e275446f3ca08e91d31f05236855e761c06ed84ea3aea8c25a7cd6729191f6c95b9efe07392775a75e2713e7ec2c6d216b8d310e7b46bee531cccba8be
     HEAD_REF master
     PATCHES
         fix-dependencies.patch
-        export-targets.patch # https://github.com/brechtsanders/xlsxio/pull/105
 )
 
 file(REMOVE "${SOURCE_PATH}/CMake/FindMinizip.cmake")
 
-vcpkg_check_features(
-    OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    FEATURES
-        libzip WITH_LIBZIP
-)
-
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED)
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-        ${FEATURE_OPTIONS}
+        -DCMAKE_POLICY_DEFAULT_CMP0012=NEW
         -DBUILD_SHARED=${BUILD_SHARED}
         -DBUILD_STATIC=${BUILD_STATIC}
         -DWITH_WIDE=OFF
@@ -41,4 +34,4 @@ vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/external_imported/vcpkg/ports/xlsxio/vcpkg.json b/external_imported/vcpkg/ports/xlsxio/vcpkg.json
index 376964779..56522fdc4 100644
--- a/external_imported/vcpkg/ports/xlsxio/vcpkg.json
+++ b/external_imported/vcpkg/ports/xlsxio/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "xlsxio",
-  "version-date": "2021-03-24",
-  "port-version": 1,
+  "version": "0.2.34",
   "description": "Cross-platform C library for reading values from and writing values to .xlsx files",
   "homepage": "https://github.com/brechtsanders/xlsxio",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/xmlsec/portfile.cmake b/external_imported/vcpkg/ports/xmlsec/portfile.cmake
index a8795bde6..eb879f938 100644
--- a/external_imported/vcpkg/ports/xmlsec/portfile.cmake
+++ b/external_imported/vcpkg/ports/xmlsec/portfile.cmake
@@ -1,11 +1,11 @@
 vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
 
-string(REPLACE "." "_" release_tag "xmlsec-${VERSION}")
+string(REPLACE "." "_" release_tag "xmlsec_${VERSION}")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO lsh123/xmlsec
     REF "${release_tag}"
-    SHA512 c74c0854f0afdf97651cb8ae26430a43ebb7d849b7715fdec3abcd96e61f67f0d2bac82b68b10c97dc90ee52b14ba426bbf9413f71caa7de5fa6ecb945cba0d1
+    SHA512 c7b867edc23cb6cf08228f9737fc50e3bd08ac7baedc43e26d3cfd113ea54256ff357335b23aea7b5e49cd24809c3de9da1c9314eb5ab90727aa821530b72ef8
     HEAD_REF master
     PATCHES 
         pkgconfig_fixes.patch
@@ -23,6 +23,14 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-xmlsec)
 vcpkg_fixup_pkgconfig()
 vcpkg_copy_pdbs()
 
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+  vcpkg_replace_string(
+    "${CURRENT_PACKAGES_DIR}/include/xmlsec/xmlsec.h"
+    "ifdef XMLSEC_NO_SIZE_T"
+    "if 1 //ifdef XMLSEC_NO_SIZE_T"
+  )
+endif()
+
 # unofficial legacy usage
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/xmlsec-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 
diff --git a/external_imported/vcpkg/ports/xmlsec/vcpkg.json b/external_imported/vcpkg/ports/xmlsec/vcpkg.json
index 39bbc5844..17faf2ef1 100644
--- a/external_imported/vcpkg/ports/xmlsec/vcpkg.json
+++ b/external_imported/vcpkg/ports/xmlsec/vcpkg.json
@@ -1,9 +1,11 @@
 {
   "name": "xmlsec",
-  "version": "1.2.36",
+  "version": "1.3.1",
+  "port-version": 2,
   "description": "XML Security Library is a C library based on LibXML2. The library supports major XML security standards.",
   "homepage": "https://www.aleksey.com/xmlsec/",
   "license": "X11 AND MPL-1.1",
+  "supports": "!xbox & !uwp",
   "dependencies": [
     "libxml2",
     "openssl",
diff --git a/external_imported/vcpkg/ports/xmlsec/xmlsec-config.cmake b/external_imported/vcpkg/ports/xmlsec/xmlsec-config.cmake
index d93c36aed..5c8b6f34b 100644
--- a/external_imported/vcpkg/ports/xmlsec/xmlsec-config.cmake
+++ b/external_imported/vcpkg/ports/xmlsec/xmlsec-config.cmake
@@ -2,5 +2,9 @@ file(READ "${CMAKE_CURRENT_LIST_DIR}/usage" usage)
 message(WARNING "find_package(xmlsec) is deprecated.\n${usage}")
 include(CMakeFindDependencyMacro)
 find_dependency(unofficial-xmlsec CONFIG REQUIRED)
-add_library(xmlsec1 ALIAS unofficial::xmlsec::xmlsec1)
-add_library(xmlsec1-openssl ALIAS unofficial::xmlsec::xmlsec1-openssl)
+if(NOT TARGET xmlsec1)
+    add_library(xmlsec1 ALIAS unofficial::xmlsec::xmlsec1)
+endif()
+if(NOT TARGET xmlsec1-openssl)
+    add_library(xmlsec1-openssl ALIAS unofficial::xmlsec::xmlsec1-openssl)
+endif()
diff --git a/external_imported/vcpkg/ports/xnnpack/fix-build.patch b/external_imported/vcpkg/ports/xnnpack/fix-build.patch
new file mode 100644
index 000000000..a455c96ee
--- /dev/null
+++ b/external_imported/vcpkg/ports/xnnpack/fix-build.patch
@@ -0,0 +1,94 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 95df99eae0..7e969cfbb8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -704,7 +704,7 @@ IF(MSVC)
+     TARGET_COMPILE_DEFINITIONS(operator-utils PRIVATE "restrict=")
+     TARGET_COMPILE_DEFINITIONS(XNNPACK PRIVATE "restrict=")
+   ENDIF()
+-
++  if(0)
+   TARGET_COMPILE_OPTIONS(microkernels-all PRIVATE "$<$<NOT:$<CONFIG:Debug>>:/O2>")
+   TARGET_COMPILE_OPTIONS(microkernels-prod PRIVATE "$<$<NOT:$<CONFIG:Debug>>:/O2>")
+   TARGET_COMPILE_OPTIONS(hardware-config PRIVATE "$<$<NOT:$<CONFIG:Debug>>:/O2>")
+@@ -723,6 +723,7 @@ IF(MSVC)
+     TARGET_COMPILE_OPTIONS(operators PRIVATE "$<$<NOT:$<CONFIG:Debug>>:/O1>")
+     TARGET_COMPILE_OPTIONS(XNNPACK PRIVATE "$<$<NOT:$<CONFIG:Debug>>:/O1>")
+   ENDIF()
++  endif()
+ ELSE()
+   TARGET_COMPILE_OPTIONS(microkernels-all PRIVATE "$<$<NOT:$<CONFIG:Debug>>:-O2>")
+   TARGET_COMPILE_OPTIONS(microkernels-prod PRIVATE "$<$<NOT:$<CONFIG:Debug>>:-O2>")
+@@ -797,8 +798,8 @@ IF(NOT TARGET clog)
+     # We build static version of clog but a dynamic library may indirectly depend on it
+     SET_PROPERTY(TARGET clog PROPERTY POSITION_INDEPENDENT_CODE ON)
+   ELSE()
+-    ADD_LIBRARY(clog STATIC IMPORTED)
+-    FIND_LIBRARY(CLOG_LIBRARY clog)
++    ADD_LIBRARY(clog UNKNOWN IMPORTED)
++    FIND_LIBRARY(CLOG_LIBRARY NAMES clog REQUIRED)
+     IF(NOT CLOG_LIBRARY)
+       MESSAGE(FATAL_ERROR "Cannot find clog")
+     ENDIF()
+@@ -817,8 +818,8 @@ IF(NOT TARGET cpuinfo)
+       "${CPUINFO_SOURCE_DIR}"
+       "${CMAKE_BINARY_DIR}/cpuinfo")
+   ELSE()
+-    ADD_LIBRARY(cpuinfo SHARED IMPORTED)
+-    FIND_LIBRARY(CPUINFO_LIBRARY cpuinfo)
++    ADD_LIBRARY(cpuinfo UNKNOWN IMPORTED)
++    FIND_LIBRARY(CPUINFO_LIBRARY NAMES cpuinfo REQUIRED)
+     IF(NOT CPUINFO_LIBRARY)
+       MESSAGE(FATAL_ERROR "Cannot find cpuinfo")
+     ENDIF()
+@@ -841,13 +842,15 @@ IF(NOT TARGET pthreadpool)
+       "${PTHREADPOOL_SOURCE_DIR}"
+       "${CMAKE_BINARY_DIR}/pthreadpool")
+   ELSE()
+-    ADD_LIBRARY(pthreadpool SHARED IMPORTED)
+-    FIND_LIBRARY(PTHREADPOOL_LIBRARY pthreadpool)
++    ADD_LIBRARY(pthreadpool UNKNOWN IMPORTED)
++    FIND_LIBRARY(PTHREADPOOL_LIBRARY NAMES pthreadpool REQUIRED)
++    find_path(PTHREADPOOL_INCLUDE NAMES pthreadpool.h REQUIRED PATH_SUFFIXES include)
++    target_include_directories(pthreadpool INTERFACE "${PTHREADPOOL_INCLUDE}")
+     IF(NOT PTHREADPOOL_LIBRARY)
+       MESSAGE(FATAL_ERROR "Cannot find pthreadpool")
+     ENDIF()
+     SET_PROPERTY(TARGET pthreadpool PROPERTY IMPORTED_LOCATION "${PTHREADPOOL_LIBRARY}")
+-    SET_PROPERTY(TARGET pthreadpool PROPERTY IMPORTED_IMPLIB "${PTHREADPOOL_LIBRARY}")
++    #SET_PROPERTY(TARGET pthreadpool PROPERTY IMPORTED_IMPLIB "${PTHREADPOOL_LIBRARY}")
+   ENDIF()
+ ENDIF()
+ TARGET_LINK_LIBRARIES(microkernels-all PRIVATE pthreadpool)
+@@ -881,12 +884,12 @@ IF(NOT TARGET fxdiv)
+       "${FXDIV_SOURCE_DIR}"
+       "${CMAKE_BINARY_DIR}/FXdiv")
+   ELSE()
+-    FIND_FILE(FXDIV_HDR fxdiv.h PATH_SUFFIXES include)
++    FIND_PATH(FXDIV_HDR fxdiv.h PATH_SUFFIXES include)
+     IF(NOT FXDIV_HDR)
+       MESSAGE(FATAL_ERROR "Cannot find fxdiv")
+     ENDIF()
+-    ADD_LIBRARY(fxdiv STATIC "${FXDIV_HDR}")
+-    SET_PROPERTY(TARGET fxdiv PROPERTY LINKER_LANGUAGE C)
++    ADD_LIBRARY(fxdiv INTERFACE IMPORTED)
++    target_include_directories(fxdiv INTERFACE "${FXDIV_HDR}")
+   ENDIF()
+ ENDIF()
+ TARGET_LINK_LIBRARIES(microkernels-all PRIVATE fxdiv)
+@@ -905,12 +908,12 @@ IF(NOT TARGET fp16)
+       "${FP16_SOURCE_DIR}"
+       "${CMAKE_BINARY_DIR}/FP16")
+   ELSE()
+-    FIND_FILE(FP16_HDR fp16.h PATH_SUFFIXES include)
++    FIND_PATH(FP16_HDR fp16.h PATH_SUFFIXES include REQUIRED)
+     IF(NOT FP16_HDR)
+       MESSAGE(FATAL_ERROR "Cannot find fp16")
+     ENDIF()
+-    ADD_LIBRARY(fp16 STATIC "${FP16_HDR}")
+-    SET_PROPERTY(TARGET fp16 PROPERTY LINKER_LANGUAGE C)
++    ADD_LIBRARY(fp16 INTERFACE IMPORTED)
++    target_include_directories(fp16 INTERFACE "${FP16_HDR}")
+   ENDIF()
+ ENDIF()
+ TARGET_LINK_LIBRARIES(microkernels-all PRIVATE fp16)
diff --git a/external_imported/vcpkg/ports/xnnpack/portfile.cmake b/external_imported/vcpkg/ports/xnnpack/portfile.cmake
index 6b106c264..11470028d 100644
--- a/external_imported/vcpkg/ports/xnnpack/portfile.cmake
+++ b/external_imported/vcpkg/ports/xnnpack/portfile.cmake
@@ -5,12 +5,11 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/XNNPACK
-    REF ae108ef49aa5623b896fc93d4298c49d1750d9ba # 2022-02-17
-    SHA512 597354c8c5b786ba24a8c9759409fee7b090ec497547919da4c5786a571b5ef237d1da204b7fd553217089792acb5e40ea1e6d26e3a638aa32df1e63c14d1c91
+    REF 51a987591a6fc9f0fc0707077f53d763ac132cbf # 2022-12-22
+    SHA512 1742ad4de3aa1a67cd5a3cbf15d82afc2cc8569a2abac92542f748a440ef37fef4e9d9c302b7b2813e3176934b637c761c1c0956d20ab1ba28b280d9b121d91b
     HEAD_REF master
     PATCHES
-        use-packages.patch
-        use-c-cpp-11.patch
+        fix-build.patch
 )
 
 vcpkg_cmake_configure(
@@ -25,7 +24,6 @@ vcpkg_cmake_configure(
 )
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
-vcpkg_cmake_config_fixup()
 
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include"
diff --git a/external_imported/vcpkg/ports/xnnpack/use-c-cpp-11.patch b/external_imported/vcpkg/ports/xnnpack/use-c-cpp-11.patch
deleted file mode 100644
index 28a14efd1..000000000
--- a/external_imported/vcpkg/ports/xnnpack/use-c-cpp-11.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c924b45..72ffd64 100755
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -12,6 +12,9 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.12 FATAL_ERROR)
- # ---[ Project and semantic versioning.
- PROJECT(XNNPACK C CXX ASM)
- 
-+set(CMAKE_CXX_STANDARD 11)
-+set(CMAKE_C_STANDARD 11)
-+
- # ---[ Options.
- SET(XNNPACK_LIBRARY_TYPE "default" CACHE STRING "Type of library (shared, static, or default) to build")
- SET_PROPERTY(CACHE XNNPACK_LIBRARY_TYPE PROPERTY STRINGS default static shared)
diff --git a/external_imported/vcpkg/ports/xnnpack/use-packages.patch b/external_imported/vcpkg/ports/xnnpack/use-packages.patch
deleted file mode 100644
index b468ef69c..000000000
--- a/external_imported/vcpkg/ports/xnnpack/use-packages.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2ca06ee..b0d8873 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -6526,7 +6526,7 @@ ELSE()
-   SET_PROPERTY(SOURCE ${COLD_SRCS} APPEND_STRING PROPERTY COMPILE_FLAGS "$<$<NOT:$<CONFIG:Debug>>: -Os >")
- ENDIF()
- 
--TARGET_INCLUDE_DIRECTORIES(XNNPACK PUBLIC include)
-+TARGET_INCLUDE_DIRECTORIES(XNNPACK PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
- TARGET_INCLUDE_DIRECTORIES(XNNPACK PRIVATE src)
- TARGET_INCLUDE_DIRECTORIES(all_microkernels PRIVATE include src)
- TARGET_INCLUDE_DIRECTORIES(packing PRIVATE include src)
-@@ -6547,7 +6547,7 @@ IF(LIBM)
- ENDIF()
- 
- # ---[ Configure clog
--IF(NOT TARGET clog)
-+IF(FALSE)
-   IF(NOT XNNPACK_USE_SYSTEM_LIBS)
-     SET(CLOG_BUILD_TESTS OFF CACHE BOOL "")
-     SET(CLOG_RUNTIME_TYPE "${CPUINFO_RUNTIME_TYPE}" CACHE STRING "")
-@@ -6565,11 +6565,9 @@ IF(NOT TARGET clog)
-     SET_PROPERTY(TARGET clog PROPERTY IMPORTED_LOCATION "${CLOG_LIBRARY}")
-   ENDIF()
- ENDIF()
--TARGET_LINK_LIBRARIES(XNNPACK PRIVATE clog)
--TARGET_LINK_LIBRARIES(jit PRIVATE clog)
- 
- # ---[ Configure cpuinfo
--IF(NOT TARGET cpuinfo)
-+IF(false)
-   IF(NOT XNNPACK_USE_SYSTEM_LIBS)
-     SET(CPUINFO_BUILD_TOOLS OFF CACHE BOOL "")
-     SET(CPUINFO_BUILD_UNIT_TESTS OFF CACHE BOOL "")
-@@ -6587,10 +6585,12 @@ IF(NOT TARGET cpuinfo)
-     SET_PROPERTY(TARGET cpuinfo PROPERTY IMPORTED_LOCATION "${CPUINFO_LIBRARY}")
-   ENDIF()
- ENDIF()
--TARGET_LINK_LIBRARIES(XNNPACK PRIVATE cpuinfo)
-+find_package(cpuinfo CONFIG REQUIRED)
-+TARGET_LINK_LIBRARIES(XNNPACK PRIVATE cpuinfo::clog cpuinfo::cpuinfo)
-+TARGET_LINK_LIBRARIES(jit PRIVATE cpuinfo::clog)
- 
- # ---[ Configure pthreadpool
--IF(NOT TARGET pthreadpool)
-+IF(FALSE)
-   IF(NOT XNNPACK_USE_SYSTEM_LIBS)
-     SET(PTHREADPOOL_BUILD_TESTS OFF CACHE BOOL "")
-     SET(PTHREADPOOL_BUILD_BENCHMARKS OFF CACHE BOOL "")
-@@ -6607,14 +6607,15 @@ IF(NOT TARGET pthreadpool)
-     SET_PROPERTY(TARGET pthreadpool PROPERTY IMPORTED_LOCATION "${PTHREADPOOL_LIBRARY}")
-   ENDIF()
- ENDIF()
--TARGET_LINK_LIBRARIES(XNNPACK PUBLIC pthreadpool)
--TARGET_LINK_LIBRARIES(all_microkernels PRIVATE pthreadpool)
--TARGET_LINK_LIBRARIES(indirection PRIVATE pthreadpool)
--TARGET_LINK_LIBRARIES(jit PRIVATE pthreadpool)
--TARGET_LINK_LIBRARIES(packing PRIVATE pthreadpool)
-+find_package(unofficial-pthreadpool CONFIG REQUIRED)
-+target_link_libraries(XNNPACK PUBLIC unofficial::pthreadpool)
-+target_link_libraries(all_microkernels PRIVATE unofficial::pthreadpool)
-+target_link_libraries(indirection PRIVATE unofficial::pthreadpool)
-+target_link_libraries(jit PRIVATE unofficial::pthreadpool)
-+target_link_libraries(packing PRIVATE unofficial::pthreadpool)
- 
- # ---[ Configure FXdiv
--IF(NOT TARGET fxdiv)
-+IF(FALSE)
-   IF(NOT XNNPACK_USE_SYSTEM_LIBS)
-     SET(FXDIV_BUILD_TESTS OFF CACHE BOOL "")
-     SET(FXDIV_BUILD_BENCHMARKS OFF CACHE BOOL "")
-@@ -6630,12 +6631,13 @@ IF(NOT TARGET fxdiv)
-     SET_PROPERTY(TARGET fxdiv PROPERTY LINKER_LANGUAGE C)
-   ENDIF()
- ENDIF()
--TARGET_LINK_LIBRARIES(XNNPACK PRIVATE fxdiv)
--TARGET_LINK_LIBRARIES(all_microkernels PRIVATE fxdiv)
--TARGET_LINK_LIBRARIES(indirection PRIVATE fxdiv)
-+find_path(FXDIV_INCLUDE_DIRS "fxdiv.h" REQUIRED)
-+target_include_directories(XNNPACK PRIVATE ${FXDIV_INCLUDE_DIRS})
-+target_include_directories(all_microkernels PRIVATE ${FXDIV_INCLUDE_DIRS})
-+target_include_directories(indirection PRIVATE ${FXDIV_INCLUDE_DIRS})
- 
- # ---[ Configure FP16
--IF(NOT TARGET fp16)
-+IF(FALSE)
-   IF(NOT XNNPACK_USE_SYSTEM_LIBS)
-     SET(FP16_BUILD_TESTS OFF CACHE BOOL "")
-     SET(FP16_BUILD_BENCHMARKS OFF CACHE BOOL "")
-@@ -6651,15 +6653,21 @@ IF(NOT TARGET fp16)
-     SET_PROPERTY(TARGET fp16 PROPERTY LINKER_LANGUAGE C)
-   ENDIF()
- ENDIF()
--TARGET_LINK_LIBRARIES(XNNPACK PRIVATE fp16)
--TARGET_LINK_LIBRARIES(all_microkernels PRIVATE fp16)
--TARGET_LINK_LIBRARIES(packing PRIVATE fp16)
--TARGET_LINK_LIBRARIES(indirection PRIVATE fp16)
-+find_path(FP16_INCLUDE_DIRS "fp16.h" REQUIRED)
-+target_include_directories(XNNPACK PRIVATE ${FP16_INCLUDE_DIRS})
-+target_include_directories(all_microkernels PRIVATE ${FP16_INCLUDE_DIRS})
-+target_include_directories(packing PRIVATE ${FP16_INCLUDE_DIRS})
-+target_include_directories(indirection PRIVATE ${FP16_INCLUDE_DIRS})
- 
- INSTALL(TARGETS XNNPACK
-+    EXPORT xnnpack-config
-+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-     PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-+install(EXPORT xnnpack-config
-+    NAMESPACE unofficial::
-+    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/xnnpack)
- 
- # ---[ XNNPACK unit tests
- IF(XNNPACK_BUILD_TESTS)
diff --git a/external_imported/vcpkg/ports/xnnpack/vcpkg.json b/external_imported/vcpkg/ports/xnnpack/vcpkg.json
index 5769f43f8..19831ed7b 100644
--- a/external_imported/vcpkg/ports/xnnpack/vcpkg.json
+++ b/external_imported/vcpkg/ports/xnnpack/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "xnnpack",
-  "version-date": "2022-02-17",
+  "version-date": "2022-12-22",
   "description": "High-efficiency floating-point neural network inference operators for mobile, server, and Web",
   "homepage": "https://github.com/google/XNNPACK",
   "license": "BSD-3-Clause",
-  "supports": "!(arm & windows) & !uwp",
+  "supports": "!(arm & windows) & !uwp & !arm32",
   "dependencies": [
     "cpuinfo",
     "fp16",
@@ -13,10 +13,6 @@
     {
       "name": "vcpkg-cmake",
       "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
     }
   ]
 }
diff --git a/external_imported/vcpkg/ports/xpack/portfile.cmake b/external_imported/vcpkg/ports/xpack/portfile.cmake
index 8fb9bf86d..723f6eebc 100644
--- a/external_imported/vcpkg/ports/xpack/portfile.cmake
+++ b/external_imported/vcpkg/ports/xpack/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO xyz347/xpack
-    REF 137467c05badd88b8569d161f27afb498ea4ff9a
-    SHA512 349ff9fb9ca74bd1401d8f0f121b263e40c021fde57a500d31eb14eeba8f3d3e8d7f6f629fc696d3052095d311700aa42b7b3a0a19c61787246e6680ea27928e
+    REF f7985ea64426d09f9c3d65558e905b7773f9de2e
+    SHA512 db4793536648084868c6645306d89026e7fefddc9875dcacb6e44abf7513ff1ce690f41681a35503ba6ad0ab5510ca80418065216a1c2d8f40df6114c1eee2ab
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/xpack/vcpkg.json b/external_imported/vcpkg/ports/xpack/vcpkg.json
index bc5ab5e06..34c3036a1 100644
--- a/external_imported/vcpkg/ports/xpack/vcpkg.json
+++ b/external_imported/vcpkg/ports/xpack/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "xpack",
-  "version-date": "2023-02-06",
+  "version": "1.0.5",
   "description": "Convert C++ struct from/to json/xml",
   "homepage": "https://github.com/xyz347/xpack",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/xproperty/vcpkg.json b/external_imported/vcpkg/ports/xproperty/vcpkg.json
index 137b9c071..14c2b3cde 100644
--- a/external_imported/vcpkg/ports/xproperty/vcpkg.json
+++ b/external_imported/vcpkg/ports/xproperty/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "xproperty",
-  "version-string": "0.8.1",
-  "port-version": 2,
+  "version": "0.8.1",
+  "port-version": 3,
   "description": "Traitlets-like C++ properties and implementation of the observer pattern",
   "dependencies": [
     {
diff --git a/external_imported/vcpkg/ports/xqilla/portfile.cmake b/external_imported/vcpkg/ports/xqilla/portfile.cmake
index c02aa2753..480e331e2 100644
--- a/external_imported/vcpkg/ports/xqilla/portfile.cmake
+++ b/external_imported/vcpkg/ports/xqilla/portfile.cmake
@@ -4,8 +4,8 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 f744ff883675887494780d24ecdc94afa394d3795d1544b1c598016b3f936c340ad7cd84529ac12962e3c5ce2f1be928a0cd4f9b9eb70e6645a38b0728cb1994
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE ${ARCHIVE}
     PATCHES "fix-compare.patch"
 )
diff --git a/external_imported/vcpkg/ports/xqilla/vcpkg.json b/external_imported/vcpkg/ports/xqilla/vcpkg.json
index 5206797d1..3c0ec5509 100644
--- a/external_imported/vcpkg/ports/xqilla/vcpkg.json
+++ b/external_imported/vcpkg/ports/xqilla/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "xqilla",
   "version": "2.3.4",
-  "port-version": 1,
+  "port-version": 2,
   "description": "XQuery and XPath 2 library",
   "homepage": "http://xqilla.sourceforge.net/HomePage",
   "license": "Apache-2.0",
diff --git a/external_imported/vcpkg/ports/xsimd/portfile.cmake b/external_imported/vcpkg/ports/xsimd/portfile.cmake
index cc72510da..a81346597 100644
--- a/external_imported/vcpkg/ports/xsimd/portfile.cmake
+++ b/external_imported/vcpkg/ports/xsimd/portfile.cmake
@@ -1,10 +1,8 @@
-# header-only library
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO xtensor-stack/xsimd
-    REF 9.0.1
-    SHA512 ed56287f608ccdf5bc5d5fc2918e313e7c4cecdd9ef2c9993a72ea900d9ff662c57ac5326c7a809eb11505c6f39d4599f3f161b97b6e03c65783b824b8d700d2
+    REF "${VERSION}"
+    SHA512 6b8ec8d3ab7ca850dbcf9f97707b72dc443a17693eb040c187802c161c85a65029ccb1690219a33c4018afcd303a2f93eb69facbf8178e286cd9fc36ec63f0c1
     HEAD_REF master
 )
 
@@ -13,12 +11,12 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
         xcomplex ENABLE_XTL_COMPLEX
 )
 
+set(VCPKG_BUILD_TYPE release) # header-only port
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-        -DENABLE_FALLBACK=OFF
         -DBUILD_TESTS=OFF
-        -DDOWNLOAD_GTEST=OFF
         ${FEATURE_OPTIONS}
 )
 
@@ -26,6 +24,7 @@ vcpkg_cmake_install()
 
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/external_imported/vcpkg/ports/xsimd/usage b/external_imported/vcpkg/ports/xsimd/usage
new file mode 100644
index 000000000..af6f6519b
--- /dev/null
+++ b/external_imported/vcpkg/ports/xsimd/usage
@@ -0,0 +1,4 @@
+xsimd provides CMake targets:
+
+    find_package(xsimd CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE xsimd)
diff --git a/external_imported/vcpkg/ports/xsimd/vcpkg.json b/external_imported/vcpkg/ports/xsimd/vcpkg.json
index 898f22f99..b19a1e16b 100644
--- a/external_imported/vcpkg/ports/xsimd/vcpkg.json
+++ b/external_imported/vcpkg/ports/xsimd/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "xsimd",
-  "version": "9.0.1",
+  "version": "12.0.0",
   "description": "Modern, portable C++ wrappers for SIMD intrinsics",
   "homepage": "https://github.com/xtensor-stack/xsimd",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/xtensor-fftw/vcpkg.json b/external_imported/vcpkg/ports/xtensor-fftw/vcpkg.json
index 4edda0924..2356600f8 100644
--- a/external_imported/vcpkg/ports/xtensor-fftw/vcpkg.json
+++ b/external_imported/vcpkg/ports/xtensor-fftw/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "xtensor-fftw",
-  "version-string": "2019-11-30",
-  "port-version": 3,
+  "version-date": "2019-11-30",
+  "port-version": 4,
   "description": "FFTW bindings for the xtensor C++14 multi-dimensional array library",
   "homepage": "https://github.com/xtensor-stack/xtensor-fftw",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/xtensor/fix-find-tbb-and-install-destination.patch b/external_imported/vcpkg/ports/xtensor/fix-find-tbb-and-install-destination.patch
new file mode 100644
index 000000000..51ac35e1e
--- /dev/null
+++ b/external_imported/vcpkg/ports/xtensor/fix-find-tbb-and-install-destination.patch
@@ -0,0 +1,33 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7535649..5c93655 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -75,8 +75,8 @@ if(XTENSOR_USE_XSIMD)
+ endif()
+ 
+ if(XTENSOR_USE_TBB)
+-    set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
+-    find_package(TBB REQUIRED)
++    #set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
++    find_package(TBB CONFIG REQUIRED)
+     message(STATUS "Found intel TBB: ${TBB_INCLUDE_DIRS}")
+ endif()
+ 
+@@ -261,7 +261,7 @@ export(EXPORT ${PROJECT_NAME}-targets
+ install(FILES ${XTENSOR_HEADERS}
+         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/xtensor)
+ 
+-set(XTENSOR_CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/cmake/${PROJECT_NAME}" CACHE
++set(XTENSOR_CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" CACHE
+     STRING "install path for xtensorConfig.cmake")
+ 
+ configure_package_config_file(${PROJECT_NAME}Config.cmake.in
+@@ -288,7 +288,7 @@ configure_file(${PROJECT_NAME}.pc.in
+                "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
+                 @ONLY)
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
+-        DESTINATION "${CMAKE_INSTALL_DATADIR}/pkgconfig/")
++        DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/")
+ 
+ # Write single include
+ # ====================
diff --git a/external_imported/vcpkg/ports/xtensor/fix-find-xsimd.patch b/external_imported/vcpkg/ports/xtensor/fix-find-xsimd.patch
new file mode 100644
index 000000000..ff8d38bdf
--- /dev/null
+++ b/external_imported/vcpkg/ports/xtensor/fix-find-xsimd.patch
@@ -0,0 +1,31 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5c93655..f02dc48 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -69,7 +69,12 @@ if(XTENSOR_USE_XSIMD)
+             message(STATUS "Found xsimd v${xsimd_VERSION}")
+         endif()
+     else()
+-        find_package(xsimd ${xsimd_REQUIRED_VERSION} REQUIRED)
++        find_package(xsimd CONFIG REQUIRED)
++        if(${xsimd_VERSION} GREATER_EQUAL ${xsimd_REQUIRED_VERSION})
++            set(xsimd_REQUIRED_VERSION ${xsimd_VERSION})
++        else()
++            message(ERROR "Mismatch xsimd versions. Found '${xsimd_VERSION}' but requires: '${xsimd_REQUIRED_VERSION}'")
++        endif()
+         message(STATUS "Found xsimd: ${xsimd_INCLUDE_DIRS}/xsimd")
+     endif()
+ endif()
+diff --git a/xtensorConfig.cmake.in b/xtensorConfig.cmake.in
+index ec72abb..7825612 100644
+--- a/xtensorConfig.cmake.in
++++ b/xtensorConfig.cmake.in
+@@ -25,7 +25,7 @@ if(NOT TARGET @PROJECT_NAME@)
+ endif()
+ 
+ if(XTENSOR_USE_XSIMD)
+-    find_dependency(xsimd @xsimd_REQUIRED_VERSION@)
++    find_dependency(xsimd @xsimd_REQUIRED_VERSION@ CONFIG)
+     target_link_libraries(@PROJECT_NAME@ INTERFACE xsimd)
+     target_compile_definitions(@PROJECT_NAME@ INTERFACE XTENSOR_USE_XSIMD)
+ endif()
diff --git a/external_imported/vcpkg/ports/xtensor/portfile.cmake b/external_imported/vcpkg/ports/xtensor/portfile.cmake
index 2cd7a14df..4f441d7fb 100644
--- a/external_imported/vcpkg/ports/xtensor/portfile.cmake
+++ b/external_imported/vcpkg/ports/xtensor/portfile.cmake
@@ -3,9 +3,12 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO xtensor-stack/xtensor
-    REF 0.24.3
-    SHA512 3519541ce659d800dca386cdbb4c7aa5331e5297779239230cbfb78b22c541af22a98aae30a9e8604ee855378fa8e67be720dab1e0005135575d9738e64797c8
+    REF "${VERSION}"
+    SHA512 d8ff5bdb2af66db5ba84cceb2e5138728b7e689b81d5aab904c4f5dfbebdcde67b8ecf38e69750edb85e30a6f45ce70ff618ca3d1a76f38a2b4013a6a6320de6
     HEAD_REF master
+    PATCHES
+        fix-find-tbb-and-install-destination.patch
+        fix-find-xsimd.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -34,4 +37,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/xtensor/vcpkg.json b/external_imported/vcpkg/ports/xtensor/vcpkg.json
index 4185f4cc9..6b2677784 100644
--- a/external_imported/vcpkg/ports/xtensor/vcpkg.json
+++ b/external_imported/vcpkg/ports/xtensor/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "xtensor",
-  "version": "0.24.3",
+  "version": "0.25.0",
   "description": "C++ tensors with broadcasting and lazy computing",
   "homepage": "https://github.com/xtensor-stack/xtensor",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/xtl/portfile.cmake b/external_imported/vcpkg/ports/xtl/portfile.cmake
index 92805da57..2c1318531 100644
--- a/external_imported/vcpkg/ports/xtl/portfile.cmake
+++ b/external_imported/vcpkg/ports/xtl/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO xtensor-stack/xtl
-    REF e0f00666d90086bb245ae73abb6123d0e2c1b30b # 0.7.2
-    SHA512 d7a552dc4e43a3270a56c57fde8fdc48a108909d4fa1e3fdd7ab12b178b3e271ed4d89aac9fd184e2739ddacfb3b5cb248538ed50a0ba56e740875c0faf5aa62
+    REF "${VERSION}"
+    SHA512 fb447334f68f255d7d28c9202eee2cec70d007c1031f3756a6acd0cc019c0d95ed1d12ec63f2e9fb3df184f9ec305e6a3c808bb88c1e3eb922916ad059d2e856
     HEAD_REF master
     PATCHES
         fix-fixup-cmake.patch
@@ -25,4 +25,4 @@ vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/xtl/vcpkg.json b/external_imported/vcpkg/ports/xtl/vcpkg.json
index 852ce3427..29d3dadc0 100644
--- a/external_imported/vcpkg/ports/xtl/vcpkg.json
+++ b/external_imported/vcpkg/ports/xtl/vcpkg.json
@@ -1,9 +1,9 @@
 {
   "name": "xtl",
-  "version": "0.7.2",
-  "port-version": 1,
+  "version": "0.7.5",
   "description": "The x template library",
   "homepage": "https://github.com/xtensor-stack/xtl",
+  "license": "BSD-3-Clause",
   "dependencies": [
     "nlohmann-json",
     {
diff --git a/external_imported/vcpkg/ports/xxhash/portfile.cmake b/external_imported/vcpkg/ports/xxhash/portfile.cmake
index 03f988e82..2a2a19134 100644
--- a/external_imported/vcpkg/ports/xxhash/portfile.cmake
+++ b/external_imported/vcpkg/ports/xxhash/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Cyan4973/xxHash
-    REF v0.8.1
-    SHA512 12feedd6a1859ef55e27218dbd6dcceccbb5a4da34cd80240d2f7d44cd246c7afdeb59830c2d5b90189bb5159293532208bf5bb622250102e12d6e1bad14a193
+    REF "v${VERSION}"
+    SHA512 3e3eef21432fe88bc4dd9940ccad0308fdea3537b06fa5ac0e74c1bde53413dff29c8b3fc617a8a42b9ce88fcf213311d338a31b1ce73b3729342c9e68f06c78
     HEAD_REF dev
 )
 
@@ -11,7 +11,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
 )
 
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}/cmake_unofficial
+    SOURCE_PATH "${SOURCE_PATH}/cmake_unofficial"
     OPTIONS ${FEATURE_OPTIONS}
 )
 
@@ -23,9 +23,9 @@ if("xxhsum" IN_LIST FEATURES)
     vcpkg_copy_tools(TOOL_NAMES xxhsum AUTO_CLEAN)
 endif()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 vcpkg_fixup_pkgconfig()
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/xxhash/vcpkg.json b/external_imported/vcpkg/ports/xxhash/vcpkg.json
index 22b45b81b..f12ece831 100644
--- a/external_imported/vcpkg/ports/xxhash/vcpkg.json
+++ b/external_imported/vcpkg/ports/xxhash/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "xxhash",
-  "version": "0.8.1",
-  "port-version": 1,
+  "version": "0.8.2",
   "description": "Extremely fast hash algorithm",
   "homepage": "https://github.com/Cyan4973/xxHash",
   "dependencies": [
diff --git a/external_imported/vcpkg/ports/yajl/vcpkg.json b/external_imported/vcpkg/ports/yajl/vcpkg.json
index d031be7ce..03c8bca94 100644
--- a/external_imported/vcpkg/ports/yajl/vcpkg.json
+++ b/external_imported/vcpkg/ports/yajl/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "yajl",
-  "version-string": "2.1.0",
-  "port-version": 3,
+  "version": "2.1.0",
+  "port-version": 4,
   "description": "Yet Another JSON Library",
   "homepage": "https://github.com/lloyd/yajl",
   "license": "ISC",
diff --git a/external_imported/vcpkg/ports/yaml-cpp/portfile.cmake b/external_imported/vcpkg/ports/yaml-cpp/portfile.cmake
index de519bd60..795d93e24 100644
--- a/external_imported/vcpkg/ports/yaml-cpp/portfile.cmake
+++ b/external_imported/vcpkg/ports/yaml-cpp/portfile.cmake
@@ -1,9 +1,11 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO jbeder/yaml-cpp
-    REF 0579ae3d976091d7d664aa9d2527e0d0cff25763 # yaml-cpp-0.7.0
-    SHA512 930f13737c23faf06be3fa9821492d6c677359e532212ced495173367a8aec45f87fbf3a5da47d4d1b61a95c25e0101bc7f8d175752434c63b25e097186e1745
+    REF "${VERSION}"
+    SHA512 aae9d618f906117d620d63173e95572c738db518f4ff1901a06de2117d8deeb8045f554102ca0ba4735ac0c4d060153a938ef78da3e0da3406d27b8298e5f38e
     HEAD_REF master
+    PATCHES
+        "yaml-cpp-pr-1212.patch"
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" YAML_BUILD_SHARED_LIBS)
@@ -14,29 +16,26 @@ vcpkg_cmake_configure(
         -DYAML_CPP_BUILD_TOOLS=OFF
         -DYAML_CPP_BUILD_TESTS=OFF
         -DYAML_BUILD_SHARED_LIBS=${YAML_BUILD_SHARED_LIBS}
+        -DYAML_CPP_INSTALL_CMAKEDIR=share/${PORT}
 )
 
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
-vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/${PORT})
+vcpkg_cmake_config_fixup()
 if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/yaml-cpp.pc" "-lyaml-cpp" "-lyaml-cppd")
 endif()
-file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig")
 vcpkg_fixup_pkgconfig()
 
-# Remove debug include and pkgconfig files
+# Remove debug include
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/pkgconfig")
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND VCPKG_TARGET_IS_WINDOWS)
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/yaml-cpp/dll.h" "#ifdef YAML_CPP_DLL" "#if 1")
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/yaml-cpp/dll.h" "#ifdef YAML_CPP_STATIC_DEFINE" "#if 0")
 else()
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/yaml-cpp/dll.h" "#ifdef YAML_CPP_DLL" "#if 0")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/yaml-cpp/dll.h" "#ifdef YAML_CPP_STATIC_DEFINE" "#if 1")
 endif()
 
 # Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/yaml-cpp/vcpkg.json b/external_imported/vcpkg/ports/yaml-cpp/vcpkg.json
index 039bcd47e..6e5818e2e 100644
--- a/external_imported/vcpkg/ports/yaml-cpp/vcpkg.json
+++ b/external_imported/vcpkg/ports/yaml-cpp/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "yaml-cpp",
-  "version-semver": "0.7.0",
+  "version-semver": "0.8.0",
   "port-version": 1,
   "description": "yaml-cpp is a YAML parser and emitter in C++ matching the YAML 1.2 spec.",
   "homepage": "https://github.com/jbeder/yaml-cpp",
diff --git a/external_imported/vcpkg/ports/yaml-cpp/yaml-cpp-pr-1212.patch b/external_imported/vcpkg/ports/yaml-cpp/yaml-cpp-pr-1212.patch
new file mode 100644
index 000000000..784f3d5d5
--- /dev/null
+++ b/external_imported/vcpkg/ports/yaml-cpp/yaml-cpp-pr-1212.patch
@@ -0,0 +1,79 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 46dc180..5055c24 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -31,6 +31,8 @@ cmake_dependent_option(YAML_CPP_BUILD_TESTS
+ cmake_dependent_option(YAML_MSVC_SHARED_RT
+   "MSVC: Build yaml-cpp with shared runtime libs (/MD)" ON
+   "CMAKE_SYSTEM_NAME MATCHES Windows" OFF)
++set(YAML_CPP_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/yaml-cpp"
++  CACHE STRING "Path to install the CMake package to")
+  
+ if (YAML_CPP_FORMAT_SOURCE)
+     find_program(YAML_CPP_CLANG_FORMAT_EXE NAMES clang-format)
+@@ -143,13 +145,12 @@ set_target_properties(yaml-cpp PROPERTIES
+   PROJECT_LABEL "yaml-cpp ${yaml-cpp-label-postfix}"
+   DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}")
+ 
+-set(CONFIG_EXPORT_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/yaml-cpp")
+-set(EXPORT_TARGETS yaml-cpp)
++set(EXPORT_TARGETS yaml-cpp::yaml-cpp)
+ configure_package_config_file(
+   "${PROJECT_SOURCE_DIR}/yaml-cpp-config.cmake.in"
+   "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake"
+-  INSTALL_DESTINATION "${CONFIG_EXPORT_DIR}"
+-  PATH_VARS CMAKE_INSTALL_INCLUDEDIR CMAKE_INSTALL_LIBDIR CONFIG_EXPORT_DIR YAML_BUILD_SHARED_LIBS)
++  INSTALL_DESTINATION "${YAML_CPP_INSTALL_CMAKEDIR}"
++  PATH_VARS CMAKE_INSTALL_INCLUDEDIR CMAKE_INSTALL_LIBDIR)
+ unset(EXPORT_TARGETS)
+ 
+ write_basic_package_version_file(
+@@ -169,15 +170,14 @@ if (YAML_CPP_INSTALL)
+                 FILES_MATCHING PATTERN "*.h")
+   install(EXPORT yaml-cpp-targets
+     NAMESPACE yaml-cpp::
+-    DESTINATION "${CONFIG_EXPORT_DIR}")
++    DESTINATION "${YAML_CPP_INSTALL_CMAKEDIR}")
+   install(FILES
+       "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake"
+       "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake"
+-    DESTINATION "${CONFIG_EXPORT_DIR}")
++    DESTINATION "${YAML_CPP_INSTALL_CMAKEDIR}")
+   install(FILES "${PROJECT_BINARY_DIR}/yaml-cpp.pc"
+     DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ endif()
+-unset(CONFIG_EXPORT_DIR)
+ 
+ if(YAML_CPP_BUILD_TESTS)
+   add_subdirectory(test)
+diff --git a/yaml-cpp-config.cmake.in b/yaml-cpp-config.cmake.in
+index 799b9b4..cbbc773 100644
+--- a/yaml-cpp-config.cmake.in
++++ b/yaml-cpp-config.cmake.in
+@@ -11,12 +11,23 @@ set_and_check(YAML_CPP_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
+ set_and_check(YAML_CPP_LIBRARY_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@")
+ 
+ # Are we building shared libraries?
+-set(YAML_CPP_SHARED_LIBS_BUILT "@PACKAGE_YAML_BUILD_SHARED_LIBS@")
++set(YAML_CPP_SHARED_LIBS_BUILT @YAML_BUILD_SHARED_LIBS@)
+ 
+ # Our library dependencies (contains definitions for IMPORTED targets)
+-include(@PACKAGE_CONFIG_EXPORT_DIR@/yaml-cpp-targets.cmake)
++include("${CMAKE_CURRENT_LIST_DIR}/yaml-cpp-targets.cmake")
+ 
+ # These are IMPORTED targets created by yaml-cpp-targets.cmake
+ set(YAML_CPP_LIBRARIES "@EXPORT_TARGETS@")
+ 
+-check_required_components(@EXPORT_TARGETS@)
++# Protect against multiple inclusion, which would fail when already imported targets are added once more.
++if(NOT TARGET yaml-cpp)
++  add_library(yaml-cpp INTERFACE IMPORTED)
++  target_link_libraries(yaml-cpp INTERFACE yaml-cpp::yaml-cpp)
++  if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.17)
++    set_target_properties(yaml-cpp PROPERTIES
++      DEPRECATION "The target yaml-cpp is deprecated and will be removed in version 0.10.0. Use the yaml-cpp::yaml-cpp target instead."
++    )
++  endif()
++endif()
++
++check_required_components(yaml-cpp)
diff --git a/external_imported/vcpkg/ports/yara/CMakeLists.txt b/external_imported/vcpkg/ports/yara/CMakeLists.txt
index 659fd48d2..ed3f28a71 100644
--- a/external_imported/vcpkg/ports/yara/CMakeLists.txt
+++ b/external_imported/vcpkg/ports/yara/CMakeLists.txt
@@ -7,9 +7,6 @@ endif()
 
 
 find_package(OpenSSL REQUIRED)
-find_path(JANSSON_INCLUDE_DIR NAMES jansson.h)
-find_library(JANSSON_LIBRARY NAMES jansson)
-
 
 include_directories(
   .
@@ -53,16 +50,19 @@ set(
   libyara/mem.c
   libyara/modules.c
   libyara/modules/console/console.c
-  libyara/modules/cuckoo/cuckoo.c
-  libyara/modules/dotnet/dotnet.c
-  libyara/modules/elf/elf.c
   libyara/modules/hash/hash.c
   libyara/modules/math/math.c
   libyara/modules/macho/macho.c
   libyara/modules/pe/pe.c
   libyara/modules/pe/pe_utils.c
+  libyara/modules/pe/authenticode-parser/authenticode.c
+  libyara/modules/pe/authenticode-parser/certificate.c
+  libyara/modules/pe/authenticode-parser/helper.c
+  libyara/modules/pe/authenticode-parser/countersignature.c
+  libyara/modules/pe/authenticode-parser/structs.c
   libyara/modules/tests/tests.c
   libyara/modules/time/time.c
+  libyara/modules/string/string.c  
   libyara/notebook.c
   libyara/object.c
   libyara/parser.c
@@ -80,6 +80,12 @@ set(
   libyara/stream.c
   libyara/strutils.c
   libyara/threading.c
+  
+  # Module elf request new library tlshc(https://github.com/avast/tlshc), the related upstream PR: https://github.com/VirusTotal/yara/pull/1624.
+  # libyara/modules/elf/elf.c
+  # libyara/tlshc/tlsh.c
+  # libyara/tlshc/tlsh_impl.c
+  # libyara/tlshc/tlsh_util.c
 )
 
 set(
@@ -95,7 +101,6 @@ set( yarac_sources
   cli/yarac.c
 )
 
-
 find_package(Threads REQUIRED)
 
 set(
@@ -103,10 +108,9 @@ set(
   OpenSSL::SSL
   OpenSSL::Crypto 
   Threads::Threads
-  ${JANSSON_LIBRARY}
 )
 
-IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
+if(CMAKE_SYSTEM_NAME MATCHES "Windows")
 list(APPEND libyara_dependencies Crypt32.lib Ws2_32.lib)
 endif()
 if("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
@@ -117,15 +121,25 @@ set(
   libyara_definitions
   -DHAVE_LIBCRYPTO
   -D${PROC_PLATFORM_INTERFACE}
-  -DCUCKOO_MODULE
   -DHASH_MODULE
-  -DDOTNET_MODULE
 )
 
+if(CUCKOO_MODULE)
+  list(APPEND libyara_definitions -DCUCKOO_MODULE)
+  list(APPEND libyara_sources libyara/modules/cuckoo/cuckoo.c)
+  find_package(jansson CONFIG REQUIRED)
+  list(APPEND libyara_dependencies jansson::jansson)
+endif()
+
+if(DOTNET_MODULE)
+  list(APPEND libyara_definitions -DDOTNET_MODULE)
+  list(APPEND libyara_sources libyara/modules/dotnet/dotnet.c libyara/simple_str.c)
+endif()
+
 add_library(libyara ${libyara_sources})
 target_link_libraries(libyara PRIVATE ${libyara_dependencies})
 target_compile_definitions(libyara PRIVATE ${libyara_definitions})
-
+target_include_directories(libyara INTERFACE $<INSTALL_INTERFACE:include>)
 
 add_executable(yara  ${yara_sources})
 add_executable(yarac  ${yarac_sources})
@@ -134,12 +148,27 @@ target_link_libraries(yarac PRIVATE libyara ${libyara_dependencies})
 target_link_libraries(yara PRIVATE libyara ${libyara_dependencies})
 
 install(
-  TARGETS libyara
-  RUNTIME DESTINATION bin
+  TARGETS libyara EXPORT unofficial-libyaraTargets
   LIBRARY DESTINATION lib
   ARCHIVE DESTINATION lib
 )
 
+install(EXPORT unofficial-libyaraTargets
+    NAMESPACE unofficial::libyara::
+    DESTINATION share/unofficial-libyara
+)
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-libyara-config.cmake.in"
+[[include(CMakeFindDependencyMacro)
+find_dependency(OpenSSL)
+find_dependency(Threads)
+if(@CUCKOO_MODULE@)
+  find_dependency(jansson CONFIG)
+endif()
+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-libyaraTargets.cmake")
+]])
+configure_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-libyara-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-libyara-config.cmake" @ONLY)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-libyara-config.cmake DESTINATION share/unofficial-libyara)
+
 if(NOT DISABLE_INSTALL_TOOLS)
   install (
     TARGETS yarac yara
diff --git a/external_imported/vcpkg/ports/yara/Disable-module-elf.patch b/external_imported/vcpkg/ports/yara/Disable-module-elf.patch
new file mode 100644
index 000000000..8cdc98a8d
--- /dev/null
+++ b/external_imported/vcpkg/ports/yara/Disable-module-elf.patch
@@ -0,0 +1,13 @@
+diff --git a/libyara/modules/module_list b/libyara/modules/module_list
+index 35e848a..e11433e 100644
+--- a/libyara/modules/module_list
++++ b/libyara/modules/module_list
+@@ -1,6 +1,8 @@
+ MODULE(tests)
+ MODULE(pe)
++#ifdef DELF_MODULE
+ MODULE(elf)
++#endif
+ MODULE(math)
+ MODULE(time)
+ MODULE(console)
diff --git a/external_imported/vcpkg/ports/yara/portfile.cmake b/external_imported/vcpkg/ports/yara/portfile.cmake
index 207bca6d7..4259fbea0 100644
--- a/external_imported/vcpkg/ports/yara/portfile.cmake
+++ b/external_imported/vcpkg/ports/yara/portfile.cmake
@@ -3,21 +3,33 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO VirusTotal/yara
-  REF ba94b4f8ebb6d56786d14f6a0f7529b32d7c216f #v4.2.3
-  SHA512 34bbe80c0f108691c7dd36fe56a2f866fc90424417a14df80781670f8150662a6160fecc4b697c6ff7eca3f98d78cdcb91f38e7f2a6542814b739869662d6608
+  REF "v${VERSION}"
+  SHA512 dc77ec46a30ca2fff33b639166fc554c9c6d9e955642774e23da3ea7dbb25fe154cfd4ef83c9808920193028b9099258a63b3f1b9a66864a1f3905f0a8e8053f
   HEAD_REF master
+  PATCHES
+    # Module elf request new library tlshc(https://github.com/avast/tlshc), the related upstream PR: https://github.com/VirusTotal/yara/pull/1624.
+    Disable-module-elf.patch
+)
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+  FEATURES
+    cuckoo    CUCKOO_MODULE
+    dotnet    DOTNET_MODULE
 )
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
 vcpkg_cmake_configure(
   SOURCE_PATH "${SOURCE_PATH}"
+  OPTIONS
+      ${FEATURE_OPTIONS}
   OPTIONS_DEBUG 
       -DDISABLE_INSTALL_HEADERS=ON 
       -DDISABLE_INSTALL_TOOLS=ON
 )
 
 vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-libyara)
 
 # Handle copyright
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/external_imported/vcpkg/ports/yara/vcpkg.json b/external_imported/vcpkg/ports/yara/vcpkg.json
index 8e9f32856..4692a0ef9 100644
--- a/external_imported/vcpkg/ports/yara/vcpkg.json
+++ b/external_imported/vcpkg/ports/yara/vcpkg.json
@@ -1,15 +1,31 @@
 {
   "name": "yara",
-  "version": "4.2.3",
+  "version": "4.3.2",
+  "port-version": 1,
   "description": "The pattern matching swiss knife",
   "homepage": "https://github.com/VirusTotal/yara",
   "license": "BSD-3-Clause",
+  "supports": "!uwp",
   "dependencies": [
-    "jansson",
     "openssl",
     {
       "name": "vcpkg-cmake",
       "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
+  "features": {
+    "cuckoo": {
+      "description": "The Cuckoo module enables you to create YARA rules based on behavioral information generated by Cuckoo sandbox.",
+      "dependencies": [
+        "jansson"
+      ]
+    },
+    "dotnet": {
+      "description": "The dotnet module allows you to create more fine-grained rules for .NET files by using attributes and features of the .NET file format."
     }
-  ]
+  }
 }
diff --git a/external_imported/vcpkg/ports/yoga/portfile.cmake b/external_imported/vcpkg/ports/yoga/portfile.cmake
index 7cf4f7e82..c918a1953 100644
--- a/external_imported/vcpkg/ports/yoga/portfile.cmake
+++ b/external_imported/vcpkg/ports/yoga/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/yoga
-    REF 220d2582c94517b59d1c36f1c2faf5e3f88306f1
-    SHA512 fbb3d2bb4e48f571f25aab140fbda89472f0800128487141f4cb5b53e121017b06535e7bfd3a0f9f1ba726845e0b90da26da1b428a1d4b7c23d751635d4115cf
+    REF "v${VERSION}"
+    SHA512 54ec9d4cee822d7480bb10f973769b3bc4c408720bfbaf9b8247747ae64ca75dca62b2d53dd4cb29addc9ec99d135d090c0e3e831108ac36e34863bf814448eb
     HEAD_REF master
     PATCHES
         disable_tests.patch
diff --git a/external_imported/vcpkg/ports/yoga/vcpkg.json b/external_imported/vcpkg/ports/yoga/vcpkg.json
index b3b8a6ddf..f4cbb39bc 100644
--- a/external_imported/vcpkg/ports/yoga/vcpkg.json
+++ b/external_imported/vcpkg/ports/yoga/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "yoga",
-  "version": "1.19.0+20230215",
+  "version": "2.0.1",
   "description": "Yoga is a cross-platform layout engine which implements Flexbox",
   "homepage": "https://github.com/facebook/yoga",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/yomm2/fix_find_boost.patch b/external_imported/vcpkg/ports/yomm2/fix_find_boost.patch
deleted file mode 100644
index f5b167083..000000000
--- a/external_imported/vcpkg/ports/yomm2/fix_find_boost.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b7b88b1..02297e7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -11,7 +11,7 @@ project(YOMM2 VERSION 1.0)
- # Find Boost dependency
- list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
- include(find_or_download_package)
--find_or_download_package(Boost INSTALL_WITH_YOMM)
-+find_package(Boost REQUIRED)
- message(STATUS "Using Boost libraries from ${Boost_INCLUDE_DIRS}")
- 
- if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in
-index 7272504..9f8b2ae 100644
---- a/cmake/Config.cmake.in
-+++ b/cmake/Config.cmake.in
-@@ -1,7 +1,7 @@
- include(CMakeFindDependencyMacro)
- 
- # Tell library users about the Boost dependency
--find_dependency(Boost 1.53 HINTS ${CMAKE_CURRENT_LIST_DIR}/..)
-+find_dependency(Boost 1.53)
- 
- # Add the targets file
- include("${CMAKE_CURRENT_LIST_DIR}/YOMM2Targets.cmake")
diff --git a/external_imported/vcpkg/ports/yomm2/fix_install.patch b/external_imported/vcpkg/ports/yomm2/fix_install.patch
new file mode 100644
index 000000000..97d7c481d
--- /dev/null
+++ b/external_imported/vcpkg/ports/yomm2/fix_install.patch
@@ -0,0 +1,47 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7e8a282..f550c2d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -15,7 +15,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+ # Find Boost dependency
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+ include(find_or_download_package)
+-find_or_download_package(Boost INSTALL_WITH_YOMM)
++find_package(Boost REQUIRED)
+ message(STATUS "Using Boost libraries from ${Boost_INCLUDE_DIRS}")
+ 
+ if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in
+index 7272504..6423a17 100644
+--- a/cmake/Config.cmake.in
++++ b/cmake/Config.cmake.in
+@@ -1,7 +1,7 @@
+ include(CMakeFindDependencyMacro)
+ 
+ # Tell library users about the Boost dependency
+-find_dependency(Boost 1.53 HINTS ${CMAKE_CURRENT_LIST_DIR}/..)
++find_dependency(Boost REQUIRED)
+ 
+ # Add the targets file
+ include("${CMAKE_CURRENT_LIST_DIR}/YOMM2Targets.cmake")
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 7e8a282..f550c2d 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -26,6 +29,5 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+   target_include_directories(
+     yomm2 INTERFACE
+     $<BUILD_INTERFACE:${YOMM2_SOURCE_DIR}/include>
+     $<INSTALL_INTERFACE:include>
+-    $<INSTALL_INTERFACE:Boost::yomm2>
+   )
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -36,5 +36,6 @@
+ install(TARGETS yomm2
+   EXPORT YOMM2Targets
+   LIBRARY DESTINATION lib
+   ARCHIVE DESTINATION lib
++  RUNTIME DESTINATION bin
+ )
diff --git a/external_imported/vcpkg/ports/yomm2/fix_uwp_osx.patch b/external_imported/vcpkg/ports/yomm2/fix_uwp_osx.patch
deleted file mode 100644
index 34ee35c8f..000000000
--- a/external_imported/vcpkg/ports/yomm2/fix_uwp_osx.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2f16eb6..a46c8b7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -15,14 +15,15 @@ find_package(Boost)
- message(STATUS "Using Boost libraries from ${Boost_INCLUDE_DIRS}")
- 
- if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
-   if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -save-temps")
-   endif()
- endif()
- 
- if(MSVC)
--  set(CMAKE_CXX_FLAGS "/std:c++17 -D_SCL_SECURE_NO_WARNINGS /EHsc")
-+  set(CMAKE_CXX_FLAGS "/std:c++17 -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS /EHsc")
-+else()
-+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
- endif()
- 
- add_subdirectory(src)
diff --git a/external_imported/vcpkg/ports/yomm2/portfile.cmake b/external_imported/vcpkg/ports/yomm2/portfile.cmake
index 889af6167..46c1fc435 100644
--- a/external_imported/vcpkg/ports/yomm2/portfile.cmake
+++ b/external_imported/vcpkg/ports/yomm2/portfile.cmake
@@ -1,17 +1,29 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO jll63/yomm2
-    REF v1.1.2
-    SHA512  f45c3f3d267dedaa3c76f9dab1a75be01941e3715e71b30b878be49157a5ba97f2188c9e635272be3ca396019b161bb21a30199ca504c94a18673685f5dbf06d
+    REF "v${VERSION}"
+    SHA512  35d869f79b278ae219d61e0ae3b01902c5df5457d2ced7bfd109cf0e75f3f7835ce3d4751c34838d134531f6483dc89b7d67d5ecab6e8af42b4b735284573db4
     HEAD_REF master
-    PATCHES "fix_find_boost.patch" "fix_uwp_osx.patch"
+    PATCHES "fix_install.patch"
 )
+
+set(YOMM2_SHARED OFF)
+if(VCPKG_LIBRARY_LINKAGE MATCHES "dynamic")
+    set(YOMM2_SHARED ON)
+endif()
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS -DYOMM2_ENABLE_EXAMPLES=OFF
+    OPTIONS 
+        -DYOMM2_ENABLE_EXAMPLES=OFF
+        -DYOMM2_SHARED=${YOMM2_SHARED}
 )
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/YOMM2)
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+if(VCPKG_LIBRARY_LINKAGE MATCHES "static") # header only library in static build
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug")
+endif()
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/yomm2/vcpkg.json b/external_imported/vcpkg/ports/yomm2/vcpkg.json
index 57cc1c6a1..09af20dc4 100644
--- a/external_imported/vcpkg/ports/yomm2/vcpkg.json
+++ b/external_imported/vcpkg/ports/yomm2/vcpkg.json
@@ -1,15 +1,14 @@
 {
   "name": "yomm2",
-  "version-string": "1.1.2",
+  "version": "1.4.0",
   "port-version": 1,
   "description": "YOMM2 is an implementation of open multi-methods.",
   "homepage": "https://github.com/jll63/yomm2",
+  "license": "BSL-1.0",
   "dependencies": [
     "boost-dynamic-bitset",
-    "boost-integer",
-    "boost-move",
+    "boost-mp11",
     "boost-preprocessor",
-    "boost-type-traits",
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/external_imported/vcpkg/ports/yyjson/portfile.cmake b/external_imported/vcpkg/ports/yyjson/portfile.cmake
index fe84c5743..f9943a429 100644
--- a/external_imported/vcpkg/ports/yyjson/portfile.cmake
+++ b/external_imported/vcpkg/ports/yyjson/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ibireme/yyjson
-    REF 0.6.0
-    SHA512 ad8b9d904ecd6c745d8b261d5c20879922db01a8e4f3d9df2949f2cc7ec40360411d571cb8d0a8d4e1bab39f9b8f9ddf4c54db42f4e5f35b1ea005197374ee17
+    REF "${VERSION}"
+    SHA512 3872b46930fd0f4d659004a4d08cdb1c506ccc2bf2888f5ee50523929a2b72f9d8e72ee71dc958ebca630f1886858d4350521bffc18c300a27d25436833384a9
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/yyjson/vcpkg.json b/external_imported/vcpkg/ports/yyjson/vcpkg.json
index d05e66b3e..72162733e 100644
--- a/external_imported/vcpkg/ports/yyjson/vcpkg.json
+++ b/external_imported/vcpkg/ports/yyjson/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "yyjson",
-  "version": "0.6.0",
+  "version": "0.8.0",
   "description": "A high performance JSON library written in ANSI C",
   "homepage": "https://github.com/ibireme/yyjson",
   "license": "MIT",
@@ -31,7 +31,16 @@
       "description": "Build with JSON reader"
     },
     "writer": {
-      "description": "Build with JSON writer"
+      "description": "Build with JSON writer",
+      "dependencies": [
+        {
+          "name": "yyjson",
+          "default-features": false,
+          "features": [
+            "reader"
+          ]
+        }
+      ]
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/z3/portfile.cmake b/external_imported/vcpkg/ports/z3/portfile.cmake
index d9558d75a..cb62dc82c 100644
--- a/external_imported/vcpkg/ports/z3/portfile.cmake
+++ b/external_imported/vcpkg/ports/z3/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_add_to_path("${PYTHON3_DIR}")
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO Z3Prover/z3
-  REF z3-4.11.0
-  SHA512 a3fd7e013948de6683b16aca03641bb845d02187152bebdee8c62c2a3f80a7710a1d3b9aef9c1490c2340571bb225f457928ac57a2ed28c0084ced34bcf3e905
+  REF z3-${VERSION}
+  SHA512 b5055468d1380c54b959f826e10846c323c0ef73cf6bba0970e187c38cabd5869786261cd9b89a89d8369144417180870627782bf705e5494286dfe75053c9a7
   HEAD_REF master
   PATCHES
       fix-install-path.patch
diff --git a/external_imported/vcpkg/ports/z3/remove-flag-overrides.patch b/external_imported/vcpkg/ports/z3/remove-flag-overrides.patch
index e7dbc81b0..cf8b15841 100644
--- a/external_imported/vcpkg/ports/z3/remove-flag-overrides.patch
+++ b/external_imported/vcpkg/ports/z3/remove-flag-overrides.patch
@@ -4,9 +4,9 @@ index 477410ba8..fcca03917 100644
 +++ b/CMakeLists.txt
 @@ -1,7 +1,6 @@
  # Enforce some CMake policies
- cmake_minimum_required(VERSION 3.4)
- 
+ cmake_minimum_required(VERSION 3.16)
+
 -set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cxx_compiler_flags_overrides.cmake")
- project(Z3 VERSION 4.11.0.0 LANGUAGES CXX)
- 
+ project(Z3 VERSION 4.12.5.0 LANGUAGES CXX)
+
  ################################################################################
diff --git a/external_imported/vcpkg/ports/z3/vcpkg.json b/external_imported/vcpkg/ports/z3/vcpkg.json
index fad42df39..0c86c22fd 100644
--- a/external_imported/vcpkg/ports/z3/vcpkg.json
+++ b/external_imported/vcpkg/ports/z3/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "z3",
-  "version": "4.11.0",
+  "version": "4.12.5",
   "description": "Z3 is a theorem prover from Microsoft Research",
   "homepage": "https://github.com/Z3Prover/z3",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/z85/vcpkg.json b/external_imported/vcpkg/ports/z85/vcpkg.json
index 66f96178a..2bf093296 100644
--- a/external_imported/vcpkg/ports/z85/vcpkg.json
+++ b/external_imported/vcpkg/ports/z85/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "z85",
-  "version-string": "1.0",
-  "port-version": 1,
+  "version": "1.0",
+  "port-version": 2,
   "description": "Z85 is a binary-to-text encoding library. It implements ZeroMQ Base-85 Encoding Algorithm and provides custom padding."
 }
diff --git a/external_imported/vcpkg/ports/zeroc-ice/fix-missing-functional.patch b/external_imported/vcpkg/ports/zeroc-ice/fix-missing-functional.patch
new file mode 100644
index 000000000..1125a3f38
--- /dev/null
+++ b/external_imported/vcpkg/ports/zeroc-ice/fix-missing-functional.patch
@@ -0,0 +1,12 @@
+diff --git a/cpp/include/IceUtil/Timer.h b/cpp/include/IceUtil/Timer.h
+index 177a7f8..19b8c09 100644
+--- a/cpp/include/IceUtil/Timer.h
++++ b/cpp/include/IceUtil/Timer.h
+@@ -12,6 +12,7 @@
+ 
+ #include <set>
+ #include <map>
++#include <functional>
+ 
+ namespace IceUtil
+ {
diff --git a/external_imported/vcpkg/ports/zeroc-ice/md5i_fix.patch b/external_imported/vcpkg/ports/zeroc-ice/md5i_fix.patch
deleted file mode 100644
index 0e45588d0..000000000
--- a/external_imported/vcpkg/ports/zeroc-ice/md5i_fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/cpp/src/Slice/MD5I.cpp b/cpp/src/Slice/MD5I.cpp
-index 66f4de545b..271352d1ea 100644
---- a/cpp/src/Slice/MD5I.cpp
-+++ b/cpp/src/Slice/MD5I.cpp
-@@ -52,6 +52,7 @@
-  */
-
- #include <Slice/MD5I.h>
-+#include <stdint.h>
- #include <string.h>
-
- #ifdef __GNUC__
-@@ -172,7 +173,7 @@ md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
-              * On little-endian machines, we can process properly aligned
-              * data without copying it.
-              */
--            if (!((data - (const md5_byte_t *)0) & 3)) {
-+            if (!((reinterpret_cast<uintptr_t>(data)) & 3)) {
-                 /* data are properly aligned */
-                 X = (const md5_word_t *)data;
-             } else {
diff --git a/external_imported/vcpkg/ports/zeroc-ice/no-werror.patch b/external_imported/vcpkg/ports/zeroc-ice/no-werror.patch
new file mode 100644
index 000000000..655d0bddb
--- /dev/null
+++ b/external_imported/vcpkg/ports/zeroc-ice/no-werror.patch
@@ -0,0 +1,13 @@
+diff --git a/config/Make.rules.Darwin b/config/Make.rules.Darwin
+index e978836..2276b5d 100644
+--- a/config/Make.rules.Darwin
++++ b/config/Make.rules.Darwin
+@@ -35,7 +35,7 @@ endif
+ shared_cppflags = $(if $(filter-out program,$($1_target)),-fPIC) -fvisibility=hidden
+ 
+ cppflags        = -Wall -Wextra -Wshadow -Wshadow-all -Wredundant-decls -Wno-shadow-field \
+-                  -Wdeprecated -Wstrict-prototypes -Werror -Wconversion -Wdocumentation -pthread \
++                  -Wdeprecated -Wstrict-prototypes -Wconversion -Wdocumentation -pthread \
+                   $(if $(filter yes,$(OPTIMIZE)),-O2 -DNDEBUG,-g)
+ 
+ ifeq ($(MAXWARN),yes)
diff --git a/external_imported/vcpkg/ports/zeroc-ice/portfile.cmake b/external_imported/vcpkg/ports/zeroc-ice/portfile.cmake
index ff083f4a2..13f4955a7 100644
--- a/external_imported/vcpkg/ports/zeroc-ice/portfile.cmake
+++ b/external_imported/vcpkg/ports/zeroc-ice/portfile.cmake
@@ -2,25 +2,27 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO zeroc-ice/ice
-    REF v3.7.7
-    SHA512 73c3a2bb14c9e145383e4026206edd3e03b29c60a33af628611bfdab71d69a3aed108ce4e6cbfd67eb852560110e3495b4bd238c8cdf0de9d1f8e2f1088513ee
-    PATCHES md5i_fix.patch slice2swift.patch mcppd_fix.patch
+    REF "v${VERSION}"
+    SHA512 07d7c439fbe1f69d808d05a11f32e09cdd8d4df2a93b6f253496304e0a521d417212ae688e316b4450dae406b59d1a460025b51ecd0614c69e48d86c0a6f81c5
+    PATCHES
+        mcppd_fix.patch
+        no-werror.patch
+        fix-missing-functional.patch
 )
 
 set(RELEASE_TRIPLET ${TARGET_TRIPLET}-rel)
 set(DEBUG_TRIPLET ${TARGET_TRIPLET}-dbg)
 
-get_filename_component(SOURCE_PATH_SUFFIX ${SOURCE_PATH} NAME)
 set(UNIX_BUILD_DIR "${SOURCE_PATH}")
-set(WIN_DEBUG_BUILD_DIR ${CURRENT_BUILDTREES_DIR}/${DEBUG_TRIPLET}/${SOURCE_PATH_SUFFIX})
-set(WIN_RELEASE_BUILD_DIR ${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/${SOURCE_PATH_SUFFIX})
+set(WIN_DEBUG_BUILD_DIR "${CURRENT_BUILDTREES_DIR}/${DEBUG_TRIPLET}")
+set(WIN_RELEASE_BUILD_DIR "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}")
 
 # install_includes
 function(install_includes ORIGINAL_PATH RELATIVE_PATHS)
     foreach(RELATIVE_PATH ${RELATIVE_PATHS})
         file(GLOB HEADER_FILES ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.h)
-        if(EXISTS ${ORIGINAL_PATH}/${RELATIVE_PATH})
-            file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${RELATIVE_PATH})
+        if(EXISTS "${ORIGINAL_PATH}/${RELATIVE_PATH}")
+            file(COPY ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/${RELATIVE_PATH}")
         endif()
     endforeach()
 endfunction()
@@ -30,7 +32,7 @@ function(install_slices ORIGINAL_PATH RELATIVE_PATHS)
     foreach(RELATIVE_PATH ${RELATIVE_PATHS})
         file(GLOB HEADER_FILES ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.ice)
         if(EXISTS ${ORIGINAL_PATH}/${RELATIVE_PATH})
-            file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/share/ice/slice/${RELATIVE_PATH})
+            file(COPY ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/share/ice/slice/${RELATIVE_PATH}")
         endif()
     endforeach()
 endfunction()
@@ -38,6 +40,7 @@ endfunction()
 vcpkg_list(SET ICE_INCLUDE_SUB_DIRECTORIES
   "Glacier2"
   "Ice"
+  "IceUtil"
   "IceBT"
   "IceBox"
   "IceBT"
@@ -52,6 +55,7 @@ vcpkg_list(SET ICE_INCLUDE_SUB_DIRECTORIES
 
 set(ICE_OPTIONAL_COMPONENTS_MSBUILD "")
 set(ICE_OPTIONAL_COMPONENTS_MAKE "Ice") # Intentional!
+set(pkgconfig_packages "")
 
 # IceSSL
 if("icessl" IN_LIST FEATURES)
@@ -101,6 +105,7 @@ if("icegridtools" IN_LIST FEATURES)
     vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "icegridnode")
     vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "icegridregistry")
     vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "icegridnode")
+    list(APPEND pkgconfig_packages expat)
 endif()
 
 # IceStorm
@@ -131,6 +136,12 @@ if("icediscovery" IN_LIST FEATURES)
     vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "IceDiscovery")
 endif()
 
+# IceLocatorDiscovery
+if("icelocatordiscovery" IN_LIST FEATURES)
+    vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++11\\icelocatordiscovery++11")
+    vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "IceLocatorDiscovery")
+endif()
+
 if(NOT VCPKG_TARGET_IS_WINDOWS)
     # Clean up for the first round (important for install --editable)
     vcpkg_execute_build_process(
@@ -264,14 +275,16 @@ else() # VCPKG_TARGET_IS_WINDOWS
     )
 
     # Build Ice
-    vcpkg_install_msbuild(
-        SOURCE_PATH ${SOURCE_PATH}
+    vcpkg_msbuild_install(
+        SOURCE_PATH "${SOURCE_PATH}"
         PROJECT_SUBPATH "cpp/msbuild/ice.${VCPKG_PLATFORM_TOOLSET}.sln"
-        SKIP_CLEAN
         TARGET "C++11\\ice++11"
-        USE_VCPKG_INTEGRATION
         OPTIONS
             ${MSBUILD_OPTIONS}
+        DEPENDENT_PKGCONFIG bzip2 ${pkgconfig_packages}
+        ADDITIONAL_LIBS lmdb.lib
+        ADDITIONAL_LIBS_RELEASE mcpp.lib ${libs_rel}
+        ADDITIONAL_LIBS_DEBUG mcppd.lib ${libs_dbg}
     )
 
     if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/zeroc.icebuilder.msbuild.dll")
@@ -303,4 +316,4 @@ list(FILTER PRLIBS INCLUDE REGEX ".*(([Ii]ce[Uu]til|[Ss]lice)d?\.([a-z]+))$")
 file(REMOVE ${PDLIBS} ${PRLIBS})
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/zeroc-ice RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/zeroc-ice/prepare_for_build.cmake b/external_imported/vcpkg/ports/zeroc-ice/prepare_for_build.cmake
index df3e93003..e49303c99 100644
--- a/external_imported/vcpkg/ports/zeroc-ice/prepare_for_build.cmake
+++ b/external_imported/vcpkg/ports/zeroc-ice/prepare_for_build.cmake
@@ -8,6 +8,7 @@ function(prepare_for_build ICE_SOURCE_DIR)
     message("-- Modifying hardcoded 'RuntimeLibrary' directives in .vcxproj files")
     set(CPP_SOURCE_DIR "${ICE_SOURCE_DIR}/cpp/src")
     file(GLOB_RECURSE PROJ_FILES "${CPP_SOURCE_DIR}/*.vcxproj")
+	
     foreach(PROJ_FILE ${PROJ_FILES})
         file(READ ${PROJ_FILE} PROJ_FILE_CONTENT)
         STRING(REGEX
@@ -50,15 +51,16 @@ function(prepare_for_build ICE_SOURCE_DIR)
         )
     endforeach()
 
+    set(ICE_BUILDER_VERSION "5.0.9")
     set(ICE_CPP_MSBUILD_PACKAGES_DIR "${ICE_SOURCE_DIR}/cpp/msbuild/packages")
-    set(ICE_BUILDER_DEST_DIRECTORY "${ICE_CPP_MSBUILD_PACKAGES_DIR}/zeroc.icebuilder.msbuild.5.0.7")
+    set(ICE_BUILDER_DEST_DIRECTORY "${ICE_CPP_MSBUILD_PACKAGES_DIR}/zeroc.icebuilder.msbuild.${ICE_BUILDER_VERSION}")
     if(NOT EXISTS "${ICE_BUILDER_DEST_DIRECTORY}")
         message("-- Making Ice Builder for MSBuild available")
         vcpkg_download_distfile(
             ICE_BUILDER_MSBUILD_ARCHIVE
-            URLS https://globalcdn.nuget.org/packages/zeroc.icebuilder.msbuild.5.0.7.nupkg
-            FILENAME zeroc.icebuilder.msbuild.5.0.7.zip
-            SHA512 d4afed8a3c67daf2e1cde09e7747ec9f088fa1354069bb7c7782c1089ea0f4e50b669f45a88502ad341dbccafbc1394d74fe764479f25bf4be1d3f70e66cb174
+            URLS https://globalcdn.nuget.org/packages/zeroc.icebuilder.msbuild.5.0.9.nupkg
+            FILENAME "zeroc.icebuilder.msbuild.${ICE_BUILDER_VERSION}.zip"
+            SHA512 E65620F3B667A48B28EC770443296BB0B8058168197DB3AE877A36531FFC6CE7E9289C7FE37DFAD751877FBDBA03C55E37122931BBF001EA6F1906DFEEBACFCB
         )
 
         vcpkg_extract_source_archive(
diff --git a/external_imported/vcpkg/ports/zeroc-ice/slice2swift.patch b/external_imported/vcpkg/ports/zeroc-ice/slice2swift.patch
deleted file mode 100644
index 6c45cb82d..000000000
--- a/external_imported/vcpkg/ports/zeroc-ice/slice2swift.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/cpp/src/slice2swift/SwiftUtil.cpp b/cpp/src/slice2swift/SwiftUtil.cpp
-index 404dee7670..01e144de90 100644
---- a/cpp/src/slice2swift/SwiftUtil.cpp
-+++ b/cpp/src/slice2swift/SwiftUtil.cpp
-@@ -1523,7 +1523,7 @@ SwiftGenerator::writeMemberwiseInitializer(IceUtilInternal::Output& out,
-                                            const DataMemberList& baseMembers,
-                                            const DataMemberList& allMembers,
-                                            const ContainedPtr& p,
--                                           bool local,
-+                                           bool /*local*/,
-                                            bool rootClass,
-                                            const StringPairList& extraParams)
- {
-@@ -1531,11 +1531,6 @@ SwiftGenerator::writeMemberwiseInitializer(IceUtilInternal::Output& out,
-     {
-         out << sp;
-         out << nl;
--        int typeCtx = TypeContextInParam;
--        if(local)
--        {
--            typeCtx |= TypeContextLocal;
--        }
-         out << "public init" << spar;
-         for(DataMemberList::const_iterator i = allMembers.begin(); i != allMembers.end(); ++i)
-         {
diff --git a/external_imported/vcpkg/ports/zeroc-ice/vcpkg.json b/external_imported/vcpkg/ports/zeroc-ice/vcpkg.json
index c0c8bb2f8..db1a1c1e7 100644
--- a/external_imported/vcpkg/ports/zeroc-ice/vcpkg.json
+++ b/external_imported/vcpkg/ports/zeroc-ice/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "zeroc-ice",
-  "version": "3.7.7",
-  "port-version": 3,
+  "version": "3.7.9",
+  "port-version": 4,
   "maintainers": "Benjamin Oldenburg <benjamin.oldenburg@ordis.co.th>",
   "description": "Comprehensive RPC framework with support for C++, CSharp, Java, JavaScript, Python and more.",
   "homepage": "https://github.com/zeroc-ice/ice",
@@ -16,14 +16,25 @@
       "name": "openssl",
       "platform": "!windows"
     },
+    {
+      "name": "vcpkg-msbuild",
+      "host": true,
+      "platform": "windows"
+    },
     "zlib"
   ],
+  "default-features": [
+    "glacier2lib",
+    "icegridlib",
+    "icestormlib"
+  ],
   "features": {
     "glacier2lib": {
       "description": "Glacier2 libraries"
     },
     "glacier2router": {
       "description": "Glacier2Router",
+      "supports": "!(windows & static)",
       "dependencies": [
         {
           "name": "zeroc-ice",
@@ -35,13 +46,16 @@
       ]
     },
     "iceboxlib": {
-      "description": "IceBox libraries and runtime"
+      "description": "IceBox libraries and runtime",
+      "supports": "!(windows & static)"
     },
     "iceboxtools": {
-      "description": "IceBox tools"
+      "description": "IceBox tools",
+      "supports": "!(windows & static)"
     },
     "icebridge": {
       "description": "IceBridge",
+      "supports": "!(windows & static)",
       "dependencies": [
         {
           "name": "zeroc-ice",
@@ -78,6 +92,7 @@
     },
     "icegridtools": {
       "description": "IceGrid tools",
+      "supports": "!(windows & static)",
       "dependencies": [
         "expat",
         {
@@ -91,6 +106,20 @@
         }
       ]
     },
+    "icelocatordiscovery": {
+      "description": "IceLocatorDiscovery",
+      "dependencies": [
+        {
+          "name": "zeroc-ice",
+          "features": [
+            "glacier2lib",
+            "iceboxlib",
+            "icessl",
+            "icestormlib"
+          ]
+        }
+      ]
+    },
     "icessl": {
       "description": "IceSSL",
       "dependencies": [
@@ -105,6 +134,7 @@
     },
     "icestormtools": {
       "description": "IceStorm tools",
+      "supports": "!(windows & static)",
       "dependencies": [
         "lmdb",
         {
diff --git a/external_imported/vcpkg/ports/zeromq/portfile.cmake b/external_imported/vcpkg/ports/zeromq/portfile.cmake
index d020ad13e..b07ca41fb 100644
--- a/external_imported/vcpkg/ports/zeromq/portfile.cmake
+++ b/external_imported/vcpkg/ports/zeromq/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO zeromq/libzmq
-    REF ce6d48c578a08770fb171486750300fd534d0254
-    SHA512 e204db3e40d99df2206f9537bf7dbc9bb8994174f4f9c4770dcc7a92622e6ff0e2b1be537d7fff96cfbdb0cdd0174bfd11ba60d08c4bab0ccb4db3ec25c06593
+    REF "v${VERSION}"
+    SHA512 108d9c5fa761c111585c30f9c651ed92942dda0ac661155bca52cc7b6dbeb3d27b0dd994abde206eacfc3bc88d19ed24e45b291050c38469e34dca5f8c9a037d
     PATCHES 
         fix-arm.patch
 )
@@ -13,14 +13,16 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED)
 vcpkg_check_features(
     OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
-        sodium          WITH_LIBSODIUM
-        draft           ENABLE_DRAFTS
-        websockets-sha1 ENABLE_WS
+        sodium            WITH_LIBSODIUM
+        draft             ENABLE_DRAFTS
+        websockets        ENABLE_WS
+        websockets-secure WITH_TLS
+        curve             ENABLE_CURVE
 )
 
 set(PLATFORM_OPTIONS "")
 if(VCPKG_TARGET_IS_MINGW)
-    set(PLATFORM_OPTIONS -DCMAKE_SYSTEM_VERSION=6.0 -DZMQ_HAVE_IPC=0)
+    list(APPEND PLATFORM_OPTIONS "-DCMAKE_SYSTEM_VERSION=6.0" "-DZMQ_HAVE_IPC=0")
 endif()
 
 vcpkg_cmake_configure(
@@ -32,13 +34,18 @@ vcpkg_cmake_configure(
         -DWITH_PERF_TOOL=OFF
         -DWITH_DOCS=OFF
         -DWITH_NSS=OFF
+        -DWITH_LIBBSD=OFF
+        -DCMAKE_REQUIRE_FIND_PACKAGE_GnuTLS=ON
         -DWITH_LIBSODIUM_STATIC=${BUILD_STATIC}
         ${FEATURE_OPTIONS}
         ${PLATFORM_OPTIONS}
     OPTIONS_DEBUG
         "-DCMAKE_PDB_OUTPUT_DIRECTORY=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg"
     MAYBE_UNUSED_VARIABLES
-        USE_PERF_TOOLS
+        CMAKE_REQUIRE_FIND_PACKAGE_GnuTLS
+        WITH_LIBBSD
+        WITH_PERF_TOOL
+        WITH_TLS
 )
 
 vcpkg_cmake_install()
@@ -61,8 +68,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
 endif()
 
 # Handle copyright
-file(RENAME "${CURRENT_PACKAGES_DIR}/share/zmq/COPYING.LESSER.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
-
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/share/zmq")
 
 vcpkg_fixup_pkgconfig()
diff --git a/external_imported/vcpkg/ports/zeromq/vcpkg.json b/external_imported/vcpkg/ports/zeromq/vcpkg.json
index ee9656ec8..a0ec4fef3 100644
--- a/external_imported/vcpkg/ports/zeromq/vcpkg.json
+++ b/external_imported/vcpkg/ports/zeromq/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "zeromq",
-  "version-date": "2023-01-31",
+  "version": "4.3.5",
+  "port-version": 1,
   "description": "The ZeroMQ lightweight messaging kernel is a library which extends the standard socket interfaces with features traditionally provided by specialised messaging middleware products",
   "homepage": "https://github.com/zeromq/libzmq",
-  "license": "LGPL-3.0-only",
-  "supports": "!uwp",
+  "license": "MPL-2.0",
+  "supports": "!uwp & !xbox",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
@@ -16,17 +17,40 @@
     }
   ],
   "features": {
+    "curve": {
+      "description": "Enable CURVE security"
+    },
     "draft": {
       "description": "Build and install draft APIs"
     },
     "sodium": {
       "description": "Using libsodium for CURVE security",
       "dependencies": [
-        "libsodium"
+        "libsodium",
+        {
+          "name": "zeromq",
+          "default-features": false,
+          "features": [
+            "curve"
+          ]
+        }
       ]
     },
-    "websockets-sha1": {
-      "description": "Enable WebSocket transport through builtin sha1 (libzmq#3676)"
+    "websockets": {
+      "description": "Enable WebSocket transport"
+    },
+    "websockets-secure": {
+      "description": "Enable WebSocket transport with TSL (wss)",
+      "dependencies": [
+        "libgnutls",
+        {
+          "name": "zeromq",
+          "default-features": false,
+          "features": [
+            "websockets"
+          ]
+        }
+      ]
     }
   }
 }
diff --git a/external_imported/vcpkg/ports/zimpl/libm.diff b/external_imported/vcpkg/ports/zimpl/libm.diff
new file mode 100644
index 000000000..6b340cc47
--- /dev/null
+++ b/external_imported/vcpkg/ports/zimpl/libm.diff
@@ -0,0 +1,13 @@
+diff --git a/zimpl/CMakeLists.txt b/zimpl/CMakeLists.txt
+index 7cf9d85..07fa187 100644
+--- a/zimpl/CMakeLists.txt
++++ b/zimpl/CMakeLists.txt
+@@ -151,6 +151,8 @@ include(CheckSymbolExists)
+ find_library(libm m)
+ if(NOT libm)
+   set(libm "")
++else()
++  set(libm m)
+ endif()
+ 
+ set(libs ${libs} ${libm})
diff --git a/external_imported/vcpkg/ports/zimpl/msvc.diff b/external_imported/vcpkg/ports/zimpl/msvc.diff
new file mode 100644
index 000000000..dc152d064
--- /dev/null
+++ b/external_imported/vcpkg/ports/zimpl/msvc.diff
@@ -0,0 +1,48 @@
+diff --git a/zimpl/CMakeLists.txt b/zimpl/CMakeLists.txt
+index 7cf9d85..85d33a7 100644
+--- a/zimpl/CMakeLists.txt
++++ b/zimpl/CMakeLists.txt
+@@ -4,7 +4,7 @@ project(ZIMPL
+     VERSION 3.5.3
+     LANGUAGES C)
+ 
+-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
++if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND NOT WIN32)
+     # if changing these flags, also update GCCWARN/GXXWARN in make/make.project
+     set(ADD_C_FLAGS -Wall -Wextra -Wno-unknown-pragmas -Wpointer-arith -Wcast-align -Wwrite-strings -Winline -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-noreturn -Wmissing-declarations -fno-omit-frame-pointer)
+ 
+@@ -112,7 +112,6 @@ if(MSVC)
+     )
+ 
+     foreach(variable ${variables})
+-       string(REGEX REPLACE "/M[T,D][ d]" "" ${variable} "${${variable}}")
+        # message("${variable} = ${${variable}}")
+     endforeach()
+ endif()
+@@ -128,9 +127,11 @@ if(ZLIB_FOUND)
+     include_directories(${ZLIB_INCLUDE_DIRS})
+ else()
+     add_definitions(-DWITHOUT_ZLIB)
++endif()
+ 
+-    # look for pcre if ZLIB could not be found
+-    find_package(PCRE)
++if(WIN32)
++    find_package(PCRE NAMES pcre2 REQUIRED)
++    set(PCRE_LIBRARIES "$<TARGET_NAME:PCRE2::POSIX>")
+     if(PCRE_FOUND)
+         add_definitions(-DWITH_PCRE)
+         add_definitions(-DPCRE2_STATIC)
+diff --git a/zimpl/zimpl-config.cmake.in b/zimpl/zimpl-config.cmake.in
+index b653f0c..946f6f2 100644
+--- a/zimpl/zimpl-config.cmake.in
++++ b/zimpl/zimpl-config.cmake.in
+@@ -1,3 +1,8 @@
++if(WIN32)
++  include(CMakeFindDependencyMacro)
++  find_dependency(pcre2)
++endif()
++
+ if(NOT TARGET libzimpl)
+   include("${CMAKE_CURRENT_LIST_DIR}/zimpl-targets.cmake")
+ endif()
diff --git a/external_imported/vcpkg/ports/zimpl/portfile.cmake b/external_imported/vcpkg/ports/zimpl/portfile.cmake
new file mode 100644
index 000000000..03da58ee0
--- /dev/null
+++ b/external_imported/vcpkg/ports/zimpl/portfile.cmake
@@ -0,0 +1,40 @@
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+# The latest version of ZIMPL is included in the SCIP Optimization Suite.
+set(scipoptsuite_version 8.0.4)
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://scipopt.org/download/release/scipoptsuite-${scipoptsuite_version}.tgz"
+    SHA512 46b56b3a4a5fcb4d6d53b5ffd9320bdf37fb55b9b8450a065312aa1e4f88863d3c563a495cf2622ef70a80132149c7b8f36cdb9a9e43906f4cfcafcb9dd6d606
+    FILENAME "scipoptsuite-${scipoptsuite_version}.tgz"
+)
+vcpkg_extract_source_archive(
+    SOURCE_PATH
+    ARCHIVE "${ARCHIVE}"
+    PATCHES
+        libm.diff
+        msvc.diff
+)
+
+vcpkg_find_acquire_program(BISON)
+vcpkg_find_acquire_program(FLEX)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}/zimpl"
+    OPTIONS
+        -DBREW=false
+        "-DBISON_EXECUTABLE=${BISON}"
+        "-DFLEX_EXECUTABLE=${FLEX}"
+        -DCMAKE_REQUIRE_FIND_PACKAGE_ZLIB=1
+    MAYBE_UNUSED_VARIABLES
+        BREW
+)
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/zimpl)
+vcpkg_copy_tools(TOOL_NAMES zimpl AUTO_CLEAN)
+
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/zimpl/zimpl-config.cmake" "../../../include" "../../include")
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/zimpl/mmlparse2.h" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/zimpl/" "")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/zimpl/LICENSE")
diff --git a/external_imported/vcpkg/ports/zimpl/vcpkg.json b/external_imported/vcpkg/ports/zimpl/vcpkg.json
new file mode 100644
index 000000000..a2d2e04d9
--- /dev/null
+++ b/external_imported/vcpkg/ports/zimpl/vcpkg.json
@@ -0,0 +1,24 @@
+{
+  "name": "zimpl",
+  "version": "3.5.3",
+  "description": "Zuse Institut Mathematical Programming Language",
+  "homepage": "http://zimpl.zib.de/",
+  "license": "LGPL-3.0-or-later",
+  "supports": "!uwp",
+  "dependencies": [
+    "gmp",
+    {
+      "name": "pcre2",
+      "platform": "windows"
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    "zlib"
+  ]
+}
diff --git a/external_imported/vcpkg/ports/zlib-ng/portfile.cmake b/external_imported/vcpkg/ports/zlib-ng/portfile.cmake
index 4b9f595a1..62dfbcb82 100644
--- a/external_imported/vcpkg/ports/zlib-ng/portfile.cmake
+++ b/external_imported/vcpkg/ports/zlib-ng/portfile.cmake
@@ -1,10 +1,8 @@
-set(ZLIB_FULL_VERSION 2.0.6)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO zlib-ng/zlib-ng
-    REF "${ZLIB_FULL_VERSION}"
-    SHA512 4888f17160d0a87a9b349704047ae0d0dc57237a10e11adae09ace957afa9743cce5191db67cb082991421fc961ce68011199621034d2369c0e7724fad58b4c5
+    REF "${VERSION}"
+    SHA512 9212d87c63a2da4e5355a7a1c75380aeba40fbd0ea3d71d3784cb3eac94237f9bea2a1b7993a08f39d4197725c4c133087d3a9d213d3944aa48a7559de2be920
     HEAD_REF develop
 )
 
@@ -24,6 +22,4 @@ vcpkg_fixup_pkgconfig()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share"
                     "${CURRENT_PACKAGES_DIR}/debug/include"
 )
-file(INSTALL "${SOURCE_PATH}/LICENSE.md"
-     DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright
-)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
diff --git a/external_imported/vcpkg/ports/zlib-ng/vcpkg.json b/external_imported/vcpkg/ports/zlib-ng/vcpkg.json
index c36f24e4f..330500613 100644
--- a/external_imported/vcpkg/ports/zlib-ng/vcpkg.json
+++ b/external_imported/vcpkg/ports/zlib-ng/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "zlib-ng",
-  "version": "2.0.6",
-  "port-version": 1,
+  "version": "2.1.5",
   "description": "zlib replacement with optimizations for 'next generation' systems",
   "homepage": "https://github.com/zlib-ng/zlib-ng",
   "license": "Zlib",
diff --git a/external_imported/vcpkg/ports/zlib/0002-build-static-or-shared-not-both.patch b/external_imported/vcpkg/ports/zlib/0002-build-static-or-shared-not-both.patch
new file mode 100644
index 000000000..60e3f8d39
--- /dev/null
+++ b/external_imported/vcpkg/ports/zlib/0002-build-static-or-shared-not-both.patch
@@ -0,0 +1,54 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -123,9 +123,11 @@ set(ZLIB_SRCS
+ )
+ 
+ if(NOT MINGW)
++    if(BUILD_SHARED_LIBS)
+     set(ZLIB_DLL_SRCS
+         win32/zlib1.rc # If present will override custom build rule below.
+     )
++    endif()
+ endif()
+ 
+ # parse the full version number from zlib.h and include in ZLIB_FULL_VERSION
+@@ -146,15 +148,17 @@ if(MINGW)
+                             -I ${CMAKE_CURRENT_BINARY_DIR}
+                             -o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
+                             -i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc)
++    if(BUILD_SHARED_LIBS)
+     set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
++    endif()
+ endif(MINGW)
+ 
+-add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
++add_library(zlib ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+ target_include_directories(zlib PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+-add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+-target_include_directories(zlibstatic PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
++if (BUILD_SHARED_LIBS)
+ set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
+ set_target_properties(zlib PROPERTIES SOVERSION 1)
++endif()
+ 
+ if(NOT CYGWIN)
+     # This property causes shared libraries on Linux to have the full version
+@@ -169,7 +173,7 @@ endif()
+ 
+ if(UNIX)
+     # On unix-like platforms the library is almost always called libz
+-   set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
++   set_target_properties(zlib PROPERTIES OUTPUT_NAME z)
+    if(NOT APPLE AND NOT(CMAKE_SYSTEM_NAME STREQUAL AIX))
+      set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")
+    endif()
+@@ -179,7 +183,7 @@ elseif(BUILD_SHARED_LIBS AND WIN32)
+ endif()
+ 
+ if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
+-    install(TARGETS zlib zlibstatic
++    install(TARGETS zlib 
+         RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
+         ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
+         LIBRARY DESTINATION "${INSTALL_LIB_DIR}" )
diff --git a/external_imported/vcpkg/ports/zlib/0002-skip-building-examples.patch b/external_imported/vcpkg/ports/zlib/0002-skip-building-examples.patch
deleted file mode 100644
index 8183f2ab2..000000000
--- a/external_imported/vcpkg/ports/zlib/0002-skip-building-examples.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b412dc7..f46c8e6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -194,6 +194,7 @@ endif()
- # Example binaries
- #============================================================================
- 
-+if (0)
- add_executable(example test/example.c)
- target_link_libraries(example zlib)
- add_test(example example)
-@@ -211,3 +212,4 @@ if(HAVE_OFF64_T)
-     target_link_libraries(minigzip64 zlib)
-     set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
- endif()
-+endif()
diff --git a/external_imported/vcpkg/ports/zlib/0003-android-and-mingw-fixes.patch b/external_imported/vcpkg/ports/zlib/0003-android-and-mingw-fixes.patch
new file mode 100644
index 000000000..a051372ca
--- /dev/null
+++ b/external_imported/vcpkg/ports/zlib/0003-android-and-mingw-fixes.patch
@@ -0,0 +1,30 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -58,7 +58,7 @@ endif()
+ #
+ check_include_file(unistd.h Z_HAVE_UNISTD_H)
+ 
+-if(MSVC)
++if(WIN32)
+     set(CMAKE_DEBUG_POSTFIX "d")
+     add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
+     add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
+@@ -135,7 +135,7 @@ file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents)
+ string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*"
+     "\\1" ZLIB_FULL_VERSION ${_zlib_h_contents})
+ 
+-if(MINGW)
++if(MINGW AND NOT ANDROID)
+     # This gets us DLL resource information when compiling on MinGW.
+     if(NOT CMAKE_RC_COMPILER)
+         set(CMAKE_RC_COMPILER windres.exe)
+@@ -151,7 +151,7 @@ if(MINGW)
+     if(BUILD_SHARED_LIBS)
+     set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
+     endif()
+-endif(MINGW)
++endif(MINGW AND NOT ANDROID)
+ 
+ add_library(zlib ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+ target_include_directories(zlib PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/external_imported/vcpkg/ports/zlib/0003-build-static-or-shared-not-both.patch b/external_imported/vcpkg/ports/zlib/0003-build-static-or-shared-not-both.patch
deleted file mode 100644
index c9f2ecf19..000000000
--- a/external_imported/vcpkg/ports/zlib/0003-build-static-or-shared-not-both.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f46c8e6..6fa5575 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -121,9 +121,11 @@ set(ZLIB_SRCS
- )
- 
- if(NOT MINGW)
-+    if(BUILD_SHARED_LIBS)
-     set(ZLIB_DLL_SRCS
-         win32/zlib1.rc # If present will override custom build rule below.
-     )
-+    endif()
- endif()
- 
- # parse the full version number from zlib.h and include in ZLIB_FULL_VERSION
-@@ -144,13 +146,16 @@ if(MINGW)
-                             -I ${CMAKE_CURRENT_BINARY_DIR}
-                             -o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
-                             -i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc)
-+    if(BUILD_SHARED_LIBS)
-     set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
-+    endif()
- endif(MINGW)
- 
--add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
--add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
-+add_library(zlib ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
-+if (BUILD_SHARED_LIBS)
- set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
- set_target_properties(zlib PROPERTIES SOVERSION 1)
-+endif()
- 
- if(NOT CYGWIN)
-     # This property causes shared libraries on Linux to have the full version
-@@ -165,7 +170,7 @@ endif()
- 
- if(UNIX)
-     # On unix-like platforms the library is almost always called libz
--   set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
-+   set_target_properties(zlib PROPERTIES OUTPUT_NAME z)
-    if(NOT APPLE)
-      set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")
-    endif()
-@@ -175,7 +180,7 @@ elseif(BUILD_SHARED_LIBS AND WIN32)
- endif()
- 
- if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
--    install(TARGETS zlib zlibstatic
-+    install(TARGETS zlib
-         RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
-         ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
-         LIBRARY DESTINATION "${INSTALL_LIB_DIR}" )
diff --git a/external_imported/vcpkg/ports/zlib/0004-android-and-mingw-fixes.patch b/external_imported/vcpkg/ports/zlib/0004-android-and-mingw-fixes.patch
deleted file mode 100644
index e93173f24..000000000
--- a/external_imported/vcpkg/ports/zlib/0004-android-and-mingw-fixes.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6fa5575..7c345db 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -56,7 +56,7 @@ endif()
- #
- check_include_file(unistd.h Z_HAVE_UNISTD_H)
- 
--if(MSVC)
-+if(WIN32)
-     set(CMAKE_DEBUG_POSTFIX "d")
-     add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
-     add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
-@@ -133,7 +133,7 @@ file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents)
- string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*"
-     "\\1" ZLIB_FULL_VERSION ${_zlib_h_contents})
- 
--if(MINGW)
-+if(MINGW AND NOT ANDROID)
-     # This gets us DLL resource information when compiling on MinGW.
-     if(NOT CMAKE_RC_COMPILER)
-         set(CMAKE_RC_COMPILER windres.exe)
-@@ -149,7 +149,7 @@ if(MINGW)
-     if(BUILD_SHARED_LIBS)
-     set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
-     endif()
--endif(MINGW)
-+endif(MINGW AND NOT ANDROID)
- 
- add_library(zlib ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
- if (BUILD_SHARED_LIBS)
diff --git a/external_imported/vcpkg/ports/zlib/portfile.cmake b/external_imported/vcpkg/ports/zlib/portfile.cmake
index 450cb2c19..61733a4b2 100644
--- a/external_imported/vcpkg/ports/zlib/portfile.cmake
+++ b/external_imported/vcpkg/ports/zlib/portfile.cmake
@@ -2,14 +2,13 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO madler/zlib
-    REF v1.2.13
-    SHA512 44b834fbfb50cca229209b8dbe1f96b258f19a49f5df23b80970b716371d856a4adf525edb4c6e0e645b180ea949cb90f5365a1d896160f297f56794dd888659
+    REF v${VERSION}
+    SHA512 8c9642495bafd6fad4ab9fb67f09b268c69ff9af0f4f20cf15dfc18852ff1f312bd8ca41de761b3f8d8e90e77d79f2ccacd3d4c5b19e475ecf09d021fdfe9088
     HEAD_REF master
     PATCHES
         0001-Prevent-invalid-inclusions-when-HAVE_-is-set-to-0.patch
-        0002-skip-building-examples.patch
-        0003-build-static-or-shared-not-both.patch
-        0004-android-and-mingw-fixes.patch
+        0002-build-static-or-shared-not-both.patch
+        0003-android-and-mingw-fixes.patch
 )
 
 # This is generated during the cmake build
@@ -19,6 +18,7 @@ vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DSKIP_INSTALL_FILES=ON
+        -DZLIB_BUILD_EXAMPLES=OFF
     OPTIONS_DEBUG
         -DSKIP_INSTALL_HEADERS=ON
 )
diff --git a/external_imported/vcpkg/ports/zlib/vcpkg.json b/external_imported/vcpkg/ports/zlib/vcpkg.json
index 7ef1f29d8..f54a99d43 100644
--- a/external_imported/vcpkg/ports/zlib/vcpkg.json
+++ b/external_imported/vcpkg/ports/zlib/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "zlib",
-  "version": "1.2.13",
+  "version": "1.3.1",
   "description": "A compression library",
   "homepage": "https://www.zlib.net/",
   "license": "Zlib",
diff --git a/external_imported/vcpkg/ports/zlmediakit/fix-dependency.patch b/external_imported/vcpkg/ports/zlmediakit/fix-dependency.patch
new file mode 100644
index 000000000..95769946c
--- /dev/null
+++ b/external_imported/vcpkg/ports/zlmediakit/fix-dependency.patch
@@ -0,0 +1,34 @@
+diff --git a/3rdpart/CMakeLists.txt b/3rdpart/CMakeLists.txt
+index c90129d..06bde42 100644
+--- a/3rdpart/CMakeLists.txt
++++ b/3rdpart/CMakeLists.txt
+@@ -24,6 +24,7 @@
+ ##############################################################################
+ 
+ # jsoncpp
++if (0)
+ file(GLOB JSONCPP_SRC_LIST
+   ${CMAKE_CURRENT_SOURCE_DIR}/jsoncpp/include/json/*.h
+   ${CMAKE_CURRENT_SOURCE_DIR}/jsoncpp/src/lib_json/*.cpp
+@@ -38,7 +39,8 @@ target_include_directories(jsoncpp
+   PUBLIC
+     "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/jsoncpp/include")
+ 
+-update_cached_list(MK_LINK_LIBRARIES jsoncpp)
++endif()
++update_cached_list(MK_LINK_LIBRARIES JsonCpp::JsonCpp)
+ 
+ ##############################################################################
+ 
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cb85679..c9390bb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -434,6 +434,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+ # for assert.h
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/3rdpart)
+ 
++find_package(jsoncpp CONFIG REQUIRED)
+ add_subdirectory(3rdpart)
+ 
+ add_subdirectory(src)
diff --git a/external_imported/vcpkg/ports/zlmediakit/portfile.cmake b/external_imported/vcpkg/ports/zlmediakit/portfile.cmake
new file mode 100644
index 000000000..b39236125
--- /dev/null
+++ b/external_imported/vcpkg/ports/zlmediakit/portfile.cmake
@@ -0,0 +1,82 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO ZLMediaKit/ZLMediaKit
+    REF 2e05119df12ba0721a2b7061dba55187569d891b
+    SHA512 8b72af231ff2080b7472284e0c89977c8d6c9c32ec35cbb4fe3700f58543c3b831722b58f39288ef44b274c61f746869f530eaccddfa0e8b242df11f729c3ba1
+    HEAD_REF master
+    PATCHES fix-dependency.patch
+)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH TOOL_KIT_SOURCE_PATH
+    REPO ZLMediaKit/ZLToolKit
+    REF d2016522a0e4b1d8df51a78b7415fe148f7245ca
+    SHA512 350730903fb24ce8e22710adea7af67dc1f74d157ae17b9f2e5fabd1c5aced8f45de0abce985130f5013871a3e31f9eaf78b161f734c16a9966da5b876a90e1b
+    HEAD_REF master
+)
+
+file(REMOVE_RECURSE "${SOURCE_PATH}/3rdpart/ZLToolKit")
+file(COPY "${TOOL_KIT_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/3rdpart/ZLToolKit")
+
+if ("mp4" IN_LIST FEATURES)
+    vcpkg_from_github(
+        OUT_SOURCE_PATH MEDIA_SRV_SOURCE_PATH
+        REPO ireader/media-server
+        REF cdbb3d6b9ea254f454c6e466c5962af5ace01199
+        SHA512 c9b6ed487ec283572022fe6eb8562258063a84b513ccc3f8783e4da9f46b19705ce41baf9603277a7642683e24ac4168a11a0c4e7a18b5f56145bf4986064664
+        HEAD_REF master
+    )
+
+    file(REMOVE_RECURSE "${SOURCE_PATH}/3rdpart/media-server")
+    file(COPY "${MEDIA_SRV_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/3rdpart/media-server")
+endif()
+
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" static ZLMEDIAKIT_BUILD_STATIC)
+string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" static ZLMEDIAKIT_CRT_STATIC)
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        openssl ENABLE_OPENSSL
+        mp4     ENABLE_MP4
+        mp4     ENABLE_HLS_FMP4
+        mp4     ENABLE_RTPPROXY
+        mp4     ENABLE_HLS
+        sctp    ENABLE_SCTP
+        webrtc  ENABLE_WEBRTC
+    INVERTED_FEATURES
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DENABLE_API=ON
+        -DENABLE_API_STATIC_LIB=${ZLMEDIAKIT_BUILD_STATIC}
+        -DENABLE_MSVC_MT=${ZLMEDIAKIT_CRT_STATIC}
+        -DENABLE_ASAN=OFF
+        -DENABLE_CXX_API=OFF
+        -DENABLE_JEMALLOC_STATIC=OFF
+        -DENABLE_FAAC=OFF
+        -DENABLE_FFMPEG=OFF
+        -DENABLE_PLAYER=OFF
+        -DENABLE_SERVER=ON
+        -DENABLE_SERVER_LIB=OFF
+        -DENABLE_SRT=ON
+        -DENABLE_MYSQL=OFF
+        -DENABLE_X264=OFF
+        -DENABLE_WEPOLL=ON
+        -DDISABLE_REPORT=OFF
+        -DUSE_SOLUTION_FOLDERS=ON
+        -DENABLE_TESTS=OFF
+        -DENABLE_MEM_DEBUG=OFF # only valid on Linux
+        ${FEATURE_OPTIONS}
+)
+
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+
+vcpkg_copy_tools(TOOL_NAMES MediaServer AUTO_CLEAN)
+    
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/zlmediakit/vcpkg.json b/external_imported/vcpkg/ports/zlmediakit/vcpkg.json
new file mode 100644
index 000000000..5482e2ca4
--- /dev/null
+++ b/external_imported/vcpkg/ports/zlmediakit/vcpkg.json
@@ -0,0 +1,61 @@
+{
+  "name": "zlmediakit",
+  "version-date": "2023-08-12",
+  "description": "A high-performance carrier-grade streaming media service framework based on C++11.",
+  "homepage": "https://github.com/ZLMediaKit/ZLMediaKit",
+  "license": "MIT",
+  "supports": "!uwp & !android",
+  "dependencies": [
+    "jsoncpp",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
+  "default-features": [
+    "mp4",
+    "openssl",
+    "webrtc"
+  ],
+  "features": {
+    "mp4": {
+      "description": "Enable MP4"
+    },
+    "openssl": {
+      "description": "Enable OpenSSL",
+      "dependencies": [
+        "openssl"
+      ]
+    },
+    "sctp": {
+      "description": "Enable SCTP",
+      "dependencies": [
+        "usrsctp",
+        {
+          "name": "zlmediakit",
+          "default-features": false,
+          "features": [
+            "webrtc"
+          ]
+        }
+      ]
+    },
+    "webrtc": {
+      "description": "Enable WebRTC",
+      "dependencies": [
+        "libsrtp",
+        {
+          "name": "zlmediakit",
+          "default-features": false,
+          "features": [
+            "openssl"
+          ]
+        }
+      ]
+    }
+  }
+}
diff --git a/external_imported/vcpkg/ports/zoe/portfile.cmake b/external_imported/vcpkg/ports/zoe/portfile.cmake
new file mode 100644
index 000000000..1ff3517cb
--- /dev/null
+++ b/external_imported/vcpkg/ports/zoe/portfile.cmake
@@ -0,0 +1,28 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO winsoft666/zoe
+    HEAD_REF master
+    REF c4de5eef2139050dc6919170487bc5c5044c9fcf
+    SHA512 72e439b27405784878c1784fbac7308b021636231402e1fd88cfe3e850f0f539d726dc121278bbe3017aea613c6d4dff0a4034ad5488ebea06d681d81e4c8063
+)
+
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ZOE_BUILD_SHARED_LIBS)
+string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" ZOE_USE_STATIC_CRT)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DZOE_BUILD_SHARED_LIBS:BOOL=${ZOE_BUILD_SHARED_LIBS}
+        -DZOE_USE_STATIC_CRT:BOOL=${ZOE_USE_STATIC_CRT}
+        -DZOE_BUILD_TESTS:BOOL=OFF
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(CONFIG_PATH share/zoe)
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_copy_pdbs()
diff --git a/external_imported/vcpkg/ports/zoe/vcpkg.json b/external_imported/vcpkg/ports/zoe/vcpkg.json
new file mode 100644
index 000000000..007ed9c2b
--- /dev/null
+++ b/external_imported/vcpkg/ports/zoe/vcpkg.json
@@ -0,0 +1,22 @@
+{
+  "name": "zoe",
+  "version": "3.0",
+  "maintainers": "winsoft666 <winsoft666@outlook.com>",
+  "description": "C++ File Download Library, support Multithreading, Breakpoint Transmission, Speed Limit, Real-time Speed.",
+  "homepage": "https://github.com/winsoft666/zoe",
+  "supports": "!osx & !uwp & !arm & !android",
+  "dependencies": [
+    {
+      "name": "curl",
+      "default-features": false
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/zookeeper/portfile.cmake b/external_imported/vcpkg/ports/zookeeper/portfile.cmake
index ff67f0750..2ee2ac124 100644
--- a/external_imported/vcpkg/ports/zookeeper/portfile.cmake
+++ b/external_imported/vcpkg/ports/zookeeper/portfile.cmake
@@ -6,8 +6,8 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 7f45817cbbc42aec5a7817fa2ae99656128e666dc58ace23d86bcfc5ca0dc49e418d1a7d1f082ad80ccb916f9f1b490167d16f836886af1a56fbcf720ad3b9d0
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE ${ARCHIVE}
     PATCHES
         cmake.patch
diff --git a/external_imported/vcpkg/ports/zookeeper/vcpkg.json b/external_imported/vcpkg/ports/zookeeper/vcpkg.json
index eee539a28..48fe25b77 100644
--- a/external_imported/vcpkg/ports/zookeeper/vcpkg.json
+++ b/external_imported/vcpkg/ports/zookeeper/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "zookeeper",
   "version": "3.5.6",
+  "port-version": 1,
   "description": "ZooKeeper C bindings",
   "homepage": "https://github.com/apache/zookeeper",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/ports/zpp-bits/portfile.cmake b/external_imported/vcpkg/ports/zpp-bits/portfile.cmake
index a0064d1d6..df75a3bf9 100644
--- a/external_imported/vcpkg/ports/zpp-bits/portfile.cmake
+++ b/external_imported/vcpkg/ports/zpp-bits/portfile.cmake
@@ -1,11 +1,11 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO eyalz800/zpp_bits
-    REF v4.4.13
-    SHA512 26298d4485b364ac19a2d5375842052bc21f6f0c6fd355bd41078fc41885a8d26c5386a5cd6169044a4e476bd7b7540832f520ca75c06791e8e30dffb018b557
+    REF "v${VERSION}"
+    SHA512 55757e4a02b680b8eae9e72073bd5612ba7e167bb82c40e89a3e27e3be520b1cd6db11dbb89bfaa4b046ba5b0dab11e02f481cbf93faebc96afc34ab49cd737a
     HEAD_REF master
 )
 
 file(INSTALL "${SOURCE_PATH}/zpp_bits.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/zpp-bits/vcpkg.json b/external_imported/vcpkg/ports/zpp-bits/vcpkg.json
index ed5ec15e4..8c8ab51d0 100644
--- a/external_imported/vcpkg/ports/zpp-bits/vcpkg.json
+++ b/external_imported/vcpkg/ports/zpp-bits/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "zpp-bits",
-  "version": "4.4.13",
+  "version": "4.4.17",
   "description": "A lightweight C++20 serialization and RPC library",
   "homepage": "https://github.com/eyalz800/zpp_bits",
   "license": "MIT"
diff --git a/external_imported/vcpkg/ports/zserge-webview/portfile.cmake b/external_imported/vcpkg/ports/zserge-webview/portfile.cmake
index 9bd482b8b..2caa4c403 100644
--- a/external_imported/vcpkg/ports/zserge-webview/portfile.cmake
+++ b/external_imported/vcpkg/ports/zserge-webview/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO webview/webview
-    REF 2ee04ccd0530e3928a872f5d508c114403803e61 #commit-2022-09-07
-    SHA512 c784635a0c0948d91fea12643b04f0125e0be64d34aeddafbd0240aa977e867fa74efaf4e5dea7fe207bc0d1461b544f483d6228bf92dade7dc0d5e2c5a585a6
+    REF 8387ff8945fc010e7c4203c021943ce4ca12a276 #commit-2023-04-15
+    SHA512 def8d4d5322546a0d3a767f76a6024c0c09e0da184445836f9c1887ab5bdfa1276fb8f2ed65b1b366c237cb22e935b1c6dd99151417c652cd3c5881255494f69
     HEAD_REF master
 )
 
diff --git a/external_imported/vcpkg/ports/zserge-webview/vcpkg.json b/external_imported/vcpkg/ports/zserge-webview/vcpkg.json
index f7b41f314..4088f23f1 100644
--- a/external_imported/vcpkg/ports/zserge-webview/vcpkg.json
+++ b/external_imported/vcpkg/ports/zserge-webview/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "zserge-webview",
-  "version-date": "2022-09-07",
+  "version-date": "2023-04-15",
   "description": "Tiny cross-platform webview library for C/C++/Golang.",
   "homepage": "https://github.com/webview/webview",
   "license": "MIT"
diff --git a/external_imported/vcpkg/ports/zstd/emscripten.patch b/external_imported/vcpkg/ports/zstd/emscripten.patch
deleted file mode 100644
index b7ee7a2f7..000000000
--- a/external_imported/vcpkg/ports/zstd/emscripten.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake b/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake
-index 0265349..1807d6e 100644
---- a/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake
-+++ b/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake
-@@ -54,7 +54,9 @@ macro(ADD_ZSTD_COMPILATION_FLAGS)
-         endif ()
-         # Add noexecstack flags
-         # LDFLAGS
-+        if(NOT EMSCRIPTEN)
-         EnableCompilerFlag("-z noexecstack" false false true)
-+        endif()
-         # CFLAGS & CXXFLAGS
-         EnableCompilerFlag("-Qunused-arguments" true true false)
-         EnableCompilerFlag("-Wa,--noexecstack" true true false)
diff --git a/external_imported/vcpkg/ports/zstd/fix-emscripten-and-clang-cl.patch b/external_imported/vcpkg/ports/zstd/fix-emscripten-and-clang-cl.patch
new file mode 100644
index 000000000..c8dae329e
--- /dev/null
+++ b/external_imported/vcpkg/ports/zstd/fix-emscripten-and-clang-cl.patch
@@ -0,0 +1,31 @@
+diff --git a/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake b/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake
+index 0265349..4a50a67 100644
+--- a/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake
++++ b/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake
+@@ -54,10 +54,22 @@ macro(ADD_ZSTD_COMPILATION_FLAGS)
+         endif ()
+         # Add noexecstack flags
+         # LDFLAGS
+-        EnableCompilerFlag("-z noexecstack" false false true)
+-        # CFLAGS & CXXFLAGS
+-        EnableCompilerFlag("-Qunused-arguments" true true false)
+-        EnableCompilerFlag("-Wa,--noexecstack" true true false)
++        if(MSVC)
++            # UNICODE SUPPORT
++            EnableCompilerFlag("/D_UNICODE" true true false)
++            EnableCompilerFlag("/DUNICODE" true true false)
++            # Enable asserts in Debug mode
++            if (CMAKE_BUILD_TYPE MATCHES "Debug")
++                EnableCompilerFlag("/DDEBUGLEVEL=1" true true false)
++            endif ()
++        else()
++        if(NOT EMSCRIPTEN)
++            EnableCompilerFlag("-z noexecstack" false false true)
++        endif()
++            # CFLAGS & CXXFLAGS
++            EnableCompilerFlag("-Qunused-arguments" true true false)
++            EnableCompilerFlag("-Wa,--noexecstack" true true false)
++        endif()
+     elseif (MSVC) # Add specific compilation flags for Windows Visual
+ 
+         set(ACTIVATE_MULTITHREADED_COMPILATION "ON" CACHE BOOL "activate multi-threaded compilation (/MP flag)")
diff --git a/external_imported/vcpkg/ports/zstd/portfile.cmake b/external_imported/vcpkg/ports/zstd/portfile.cmake
index 53446dca9..86c59cfb8 100644
--- a/external_imported/vcpkg/ports/zstd/portfile.cmake
+++ b/external_imported/vcpkg/ports/zstd/portfile.cmake
@@ -2,26 +2,35 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/zstd
     REF "v${VERSION}"
-    SHA512 b6f64850ceb6cfed831fff3c43508d2a72338862a96dd9430b1d3ebbfcee40201c8b6dcf8b6b603e252bb96f3f283c9cb07da7f24414187f5f1fea3b51e01863
+    SHA512 356994e0d8188ce97590bf86b602eb50cbcb2f951594afb9c2d6e03cc68f966862505afc4a50e76efd55e4cfb11dbc9b15c7837b7827a961a1311ef72cd23505
     HEAD_REF dev
     PATCHES
         no-static-suffix.patch
-        emscripten.patch
+        fix-emscripten-and-clang-cl.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ZSTD_BUILD_STATIC)
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ZSTD_BUILD_SHARED)
 
+if("tools" IN_LIST FEATURES)
+   set(ZSTD_BUILD_PROGRAMS 1)
+else()
+   set(ZSTD_BUILD_PROGRAMS 0)
+endif()
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}/build/cmake"
     OPTIONS
         -DZSTD_BUILD_SHARED=${ZSTD_BUILD_SHARED}
         -DZSTD_BUILD_STATIC=${ZSTD_BUILD_STATIC}
         -DZSTD_LEGACY_SUPPORT=1
-        -DZSTD_BUILD_PROGRAMS=0
         -DZSTD_BUILD_TESTS=0
         -DZSTD_BUILD_CONTRIB=0
         -DZSTD_MULTITHREAD_SUPPORT=1
+    OPTIONS_RELEASE
+        -DZSTD_BUILD_PROGRAMS=${ZSTD_BUILD_PROGRAMS}
+    OPTIONS_DEBUG
+        -DZSTD_BUILD_PROGRAMS=OFF
 )
 
 vcpkg_cmake_install()
@@ -45,6 +54,10 @@ if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
     endforeach()
 endif()
 
+if(VCPKG_TARGET_IS_WINDOWS AND ZSTD_BUILD_PROGRAMS)
+    vcpkg_copy_tools(TOOL_NAMES zstd AUTO_CLEAN)
+endif()
+
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 vcpkg_install_copyright(
     COMMENT "ZSTD is dual licensed under BSD and GPLv2."
diff --git a/external_imported/vcpkg/ports/zstd/vcpkg.json b/external_imported/vcpkg/ports/zstd/vcpkg.json
index 26277dc44..2baf0003b 100644
--- a/external_imported/vcpkg/ports/zstd/vcpkg.json
+++ b/external_imported/vcpkg/ports/zstd/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "zstd",
-  "version": "1.5.4",
-  "port-version": 1,
+  "version": "1.5.5",
+  "port-version": 2,
   "description": "Zstandard - Fast real-time compression algorithm",
   "homepage": "https://facebook.github.io/zstd/",
   "license": "BSD-3-Clause OR GPL-2.0-only",
@@ -14,5 +14,11 @@
       "name": "vcpkg-cmake-config",
       "host": true
     }
-  ]
+  ],
+  "features": {
+    "tools": {
+      "description": "Build zstd binary",
+      "supports": "!uwp & static"
+    }
+  }
 }
diff --git a/external_imported/vcpkg/ports/ztd-cuneicode/fix-cmake-install.patch b/external_imported/vcpkg/ports/ztd-cuneicode/fix-cmake-install.patch
new file mode 100644
index 000000000..431530bfb
--- /dev/null
+++ b/external_imported/vcpkg/ports/ztd-cuneicode/fix-cmake-install.patch
@@ -0,0 +1,95 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 00aa8b6..d49889b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -39,6 +39,12 @@ FetchContent_Declare(ztd.cmake
+ 	GIT_TAG main)
+ FetchContent_MakeAvailable(ztd.cmake)
+ set(CMAKE_PROJECT_INCLUDE ${ZTD_CMAKE_PROJECT_PRELUDE})
++include(FetchContent)
++FetchContent_Declare(ztd.cmake
++	GIT_REPOSITORY https://github.com/soasis/cmake
++	GIT_TAG main)
++FetchContent_MakeAvailable(ztd.cmake)
++set(CMAKE_PROJECT_INCLUDE ${ZTD_CMAKE_PROJECT_PRELUDE})
+ 
+ # # Project declaration
+ # informs about the project, gives a description, version and MOST IMPORTANTLY
+@@ -49,6 +55,8 @@ project(ztd.cuneicode
+ 	HOMEPAGE_URL "https://ztdcuneicode.readthedocs.io/en/latest/"
+ 	LANGUAGES C CXX)
+ 
++include(CMakePackageConfigHelpers)
++include(GNUInstallDirs)
+ if(ZTD_CUNEICODE_READTHEDOCS)
+ 	# ReadTheDocs seems unable to handle the include at the project level: something must be going wrong?
+ 	include(CheckCXXCompilerFlag)
+@@ -132,15 +140,7 @@ option(ZTD_CUNEICODE_SIMDUTF_SHARED "Enable the simdutf shared target for cuneic
+ 
+ # # Dependencies
+ # ztd.idk
+-FetchContent_Declare(ztd.idk
+-	GIT_REPOSITORY https://github.com/soasis/idk.git
+-	GIT_TAG main)
+-FetchContent_MakeAvailable(ztd.idk)
+-# ztd.encoding_tables
+-FetchContent_Declare(ztd.encoding_tables
+-	GIT_REPOSITORY https://github.com/soasis/encoding_tables.git
+-	GIT_TAG main)
+-FetchContent_MakeAvailable(ztd.encoding_tables)
++find_package(ztd.encoding_tables CONFIG REQUIRED)
+ 
+ # # Main Library
+ file(GLOB ztd.cuneicode.includes CONFIGURE_DEPENDS include/*.hpp)
+@@ -187,15 +187,12 @@ target_compile_options(ztd.cuneicode PUBLIC
+ 	${--enable-conforming-preprocessor}
+ )
+ 
++install(TARGETS ztd.cuneicode
++        EXPORT ztd.cuneicode-targets
++        DESTINATION lib)
+ install(DIRECTORY include/
+ 	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+ )
+-install(TARGETS ztd.cuneicode
+-	PUBLIC_HEADER
+-	RUNTIME
+-	ARCHIVE
+-	LIBRARY
+-)
+ 
+ # # Config / Version packaging
+ # Version configurations
+@@ -213,6 +210,15 @@ export(TARGETS ztd.cuneicode
+ 	FILE
+ 	"${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.cuneicode/ztd.cuneicode-targets.cmake")
+ 
++install(FILES
++  ${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.cuneicode/ztd.cuneicode-config.cmake
++  ${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.cuneicode/ztd.cuneicode-config-version.cmake
++  DESTINATION share/ztd.cuneicode
++  )
++install(EXPORT ztd.cuneicode-targets
++  FILE ztd.cuneicode-targets.cmake
++  DESTINATION share/ztd.cuneicode
++)
+ if(ZTD_CUNEICODE_GENERATE_SINGLE)
+ 	add_subdirectory(single)
+ endif()
+diff --git a/cmake/ztd.cuneicode-config.cmake.in b/cmake/ztd.cuneicode-config.cmake.in
+index 4bfb041..823d50b 100644
+--- a/cmake/ztd.cuneicode-config.cmake.in
++++ b/cmake/ztd.cuneicode-config.cmake.in
+@@ -1,6 +1,11 @@
+ @PACKAGE_INIT@
++include(CMakeFindDependencyMacro)
++find_dependency(ztd.encoding_tables CONFIG)
+ 
+-if (TARGET ztd::cuneicode)
++include(${CMAKE_CURRENT_LIST_DIR}/ztd.cuneicode-targets.cmake)
++
++if (TARGET ztd.cuneicode)
++	add_library(ztd::cuneicode ALIAS ztd.cuneicode)
+ 	get_target_property(ZTD_CUNEICODE_INCLUDE_DIRS
+ 		ztd.cuneicode.single INTERFACE_INCLUDE_DIRECTORIES)
+ 	set_and_check(ZTD_CUNEICODE_INCLUDE_DIRS "${ZTD_CUNEICODE_INCLUDE_DIRS}")
diff --git a/external_imported/vcpkg/ports/ztd-cuneicode/portfile.cmake b/external_imported/vcpkg/ports/ztd-cuneicode/portfile.cmake
new file mode 100644
index 000000000..0bff55040
--- /dev/null
+++ b/external_imported/vcpkg/ports/ztd-cuneicode/portfile.cmake
@@ -0,0 +1,22 @@
+if (VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
+vcpkg_from_github(
+  OUT_SOURCE_PATH SOURCE_PATH
+  REPO soasis/cuneicode
+  REF 093041aa934b7b09e7ee7300abdc3f54bb57e389
+  SHA512 0066fee5cf75fa07dc97934153e4206e4add69f15602526c1953b0302d5a6f8b56256e837a73acee187b0e02e676fba1350ad39b162c4901c624b12fa4e0fb03
+  HEAD_REF main
+  PATCHES fix-cmake-install.patch
+)
+
+vcpkg_cmake_configure(
+  SOURCE_PATH ${SOURCE_PATH}
+)
+
+vcpkg_cmake_install()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/ztd-cuneicode/vcpkg.json b/external_imported/vcpkg/ports/ztd-cuneicode/vcpkg.json
new file mode 100644
index 000000000..dc1d8fd0f
--- /dev/null
+++ b/external_imported/vcpkg/ports/ztd-cuneicode/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "ztd-cuneicode",
+  "version-date": "2023-11-03",
+  "description": "Shared tables between C and C++ for encoding infrastructure",
+  "homepage": "http://ztdcuneicode.rtfd.io/",
+  "license": "Apache-2.0",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    "ztd-encoding-tables"
+  ]
+}
diff --git a/external_imported/vcpkg/ports/ztd-encoding-tables/fix-cmake-install.patch b/external_imported/vcpkg/ports/ztd-encoding-tables/fix-cmake-install.patch
new file mode 100644
index 000000000..c56beb7af
--- /dev/null
+++ b/external_imported/vcpkg/ports/ztd-encoding-tables/fix-cmake-install.patch
@@ -0,0 +1,68 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7612c6c..8d2233d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -50,6 +50,8 @@ project(ztd.encoding_tables
+ 	HOMEPAGE_URL "https://ztdencoding_tables.rtfd.io/"
+ 	LANGUAGES CXX C)
+ 
++include(CMakePackageConfigHelpers)
++include(GNUInstallDirs)
+ if(ZTD_ENCODING_TABLES_READTHEDOCS)
+ 	# ReadTheDocs seems unable to handle the include at the project level: something must be going wrong?
+ 	include(CheckCXXCompilerFlag)
+@@ -127,10 +129,7 @@ if(ZTD_ENCODING_TABLES_IS_TOP_LEVEL_PROJECT)
+ endif()
+ 
+ # # Main Dependency
+-FetchContent_Declare(ztd.idk
+-	GIT_REPOSITORY https://github.com/soasis/idk.git
+-	GIT_TAG main)
+-FetchContent_MakeAvailable(ztd.idk)
++find_package(ztd.idk CONFIG REQUIRED)
+ 
+ # # Main library declarations
+ # ztd.encoding_tables
+@@ -179,7 +178,9 @@ if(ZTD_ENCODING_TABLES_IS_TOP_LEVEL_PROJECT)
+ 	)
+ endif()
+ 
+-install(TARGETS ztd.encoding_tables)
++install(TARGETS ztd.encoding_tables
++        EXPORT ztd.encoding_tables-targets
++        DESTINATION lib)
+ install(DIRECTORY include/
+ 	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+ )
+@@ -199,9 +200,15 @@ export(TARGETS ztd.encoding_tables
+ 	"${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.encoding_tables/ztd.encoding_tables-targets.cmake"
+ )
+ 
+-install(
+-	DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/cmake"
+-	TYPE DATA
++install(FILES
++  ${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.encoding_tables/ztd.encoding_tables-config.cmake
++  ${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.encoding_tables/ztd.encoding_tables-config-version.cmake
++  DESTINATION share/ztd.encoding_tables
++  )
++
++install(EXPORT ztd.encoding_tables-targets
++  FILE ztd.encoding_tables-targets.cmake
++  DESTINATION share/ztd.encoding_tables
+ )
+ 
+ if(ZTD_ENCODING_TABLES_GENERATE_SINGLE)
+diff --git a/cmake/ztd.encoding_tables-config.cmake.in b/cmake/ztd.encoding_tables-config.cmake.in
+index 2b8db83..579f865 100644
+--- a/cmake/ztd.encoding_tables-config.cmake.in
++++ b/cmake/ztd.encoding_tables-config.cmake.in
+@@ -1,6 +1,7 @@
+ @PACKAGE_INIT@
+ 
+-find_package(ztd.encoding_tables CONFIG REQUIRED)
++include(CMakeFindDependencyMacro)
++find_dependency(ztd.idk CONFIG)
+ include(${CMAKE_CURRENT_LIST_DIR}/ztd.encoding_tables-targets.cmake)
+ 
+ if (TARGET ztd.encoding_tables)
diff --git a/external_imported/vcpkg/ports/ztd-encoding-tables/portfile.cmake b/external_imported/vcpkg/ports/ztd-encoding-tables/portfile.cmake
new file mode 100644
index 000000000..7b97b0d16
--- /dev/null
+++ b/external_imported/vcpkg/ports/ztd-encoding-tables/portfile.cmake
@@ -0,0 +1,22 @@
+if (VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
+vcpkg_from_github(
+  OUT_SOURCE_PATH SOURCE_PATH
+  REPO soasis/encoding_tables
+  REF 2f4324b3d84db2300d0bf3d0e568a28992df2b55
+  SHA512 ec8684bca5673609c0b3014228b6b35647896f8288d6ef85778a7bb8a191c4c92985a11d625e7e5e306b738c16dce232f2604e7cf583ca5e9b76ff4a9f447732
+  HEAD_REF main
+  PATCHES fix-cmake-install.patch
+)
+
+vcpkg_cmake_configure(
+  SOURCE_PATH ${SOURCE_PATH}
+)
+
+vcpkg_cmake_install()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/ztd-encoding-tables/vcpkg.json b/external_imported/vcpkg/ports/ztd-encoding-tables/vcpkg.json
new file mode 100644
index 000000000..e4a8d1307
--- /dev/null
+++ b/external_imported/vcpkg/ports/ztd-encoding-tables/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "ztd-encoding-tables",
+  "version-date": "2023-06-10",
+  "description": "Shared tables between C and C++ for encoding infrastructure",
+  "homepage": "https://github.com/soasis/encoding_tables",
+  "license": "Apache-2.0",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    "ztd-idk"
+  ]
+}
diff --git a/external_imported/vcpkg/ports/ztd-idk/fix-cmake-install.patch b/external_imported/vcpkg/ports/ztd-idk/fix-cmake-install.patch
new file mode 100644
index 000000000..e657f4968
--- /dev/null
+++ b/external_imported/vcpkg/ports/ztd-idk/fix-cmake-install.patch
@@ -0,0 +1,187 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 746afa7..803b82e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -34,11 +34,6 @@ cmake_policy(VERSION 3.21)
+ # # Project kickstart
+ # Includes a bunch of basic flags and utilities shared across projects
+ # See more at the github repository link below
+-include(FetchContent)
+-FetchContent_Declare(ztd.cmake
+-	GIT_REPOSITORY https://github.com/soasis/cmake.git
+-	GIT_TAG main)
+-FetchContent_MakeAvailable(ztd.cmake)
+ set(CMAKE_PROJECT_INCLUDE ${ZTD_CMAKE_PROJECT_PRELUDE})
+ 
+ # # Project declaration
+@@ -50,6 +45,8 @@ project(ztd.idk
+ 	HOMEPAGE_URL "https://ztdidk.rtfd.io/"
+ 	LANGUAGES CXX C)
+ 
++include(GNUInstallDirs)
++include(CMakePackageConfigHelpers)
+ if(ZTD_IDK_READTHEDOCS)
+ 	# ReadTheDocs seems unable to handle the include at the project level: something must be going wrong?
+ 	include(CheckCXXCompilerFlag)
+@@ -89,9 +86,6 @@ if(ZTD_IDK_IS_TOP_LEVEL_PROJECT)
+ 	set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin")
+ 	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin")
+ 
+-	if(NOT DEFINED CMAKE_CXX_STANDARD)
+-		set(CMAKE_CXX_STANDARD 17)
+-	endif()
+ 
+ 	if(NOT DEFINED CMAKE_C_STANDARD)
+ 		set(CMAKE_C_STANDARD 11)
+@@ -133,6 +127,7 @@ endif()
+ # ztd.version
+ add_library(ztd.version INTERFACE)
+ add_library(ztd::version ALIAS ztd.version)
++target_compile_features(ztd.version INTERFACE cxx_std_20)
+ target_include_directories(ztd.version
+ 	INTERFACE
+ 	$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
+@@ -143,20 +138,32 @@ install(DIRECTORY include/
+ 	${CMAKE_INSTALL_INCLUDEDIR}
+ )
+ 
++install(TARGETS ztd.version
++        EXPORT ztd.version-targets
++        DESTINATION lib)
+ configure_package_config_file(
+ 	cmake/ztd.version-config.cmake.in
+ 	"${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.version/ztd.version-config.cmake"
+-	INSTALL_DESTINATION lib/cmake/ztd.version
++	INSTALL_DESTINATION share/ztd.version
+ 	NO_CHECK_REQUIRED_COMPONENTS_MACRO
+ )
+ write_basic_package_version_file(
+ 	"${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.version/ztd.version-config-version.cmake"
+ 	COMPATIBILITY SameMajorVersion
+ )
++install(FILES
++  ${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.version/ztd.version-config.cmake
++  ${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.version/ztd.version-config-version.cmake
++  DESTINATION share/ztd.version
++  )
+ export(TARGETS ztd.version
+ 	FILE
+ 	"${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.version/ztd.version-targets.cmake"
+ )
++install(EXPORT ztd.version-targets
++  FILE ztd.version-targets.cmake
++  DESTINATION share/ztd.version
++)
+ 
+ # ztd.tag_invoke
+ file(GLOB_RECURSE ztd.tag_invoke.includes
+@@ -166,6 +173,7 @@ file(GLOB_RECURSE ztd.tag_invoke.includes
+ )
+ 
+ add_library(ztd.tag_invoke INTERFACE)
++target_compile_features(ztd.tag_invoke INTERFACE cxx_std_20)
+ add_library(ztd::tag_invoke ALIAS ztd.tag_invoke)
+ target_include_directories(ztd.tag_invoke
+ 	INTERFACE
+@@ -179,10 +187,14 @@ install(DIRECTORY include/
+ 	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+ )
+ 
++install(TARGETS ztd.tag_invoke
++        EXPORT ztd.tag_invoke-targets
++        DESTINATION lib)
++
+ configure_package_config_file(
+ 	cmake/ztd.tag_invoke-config.cmake.in
+ 	"${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.tag_invoke/ztd.tag_invoke-config.cmake"
+-	INSTALL_DESTINATION lib/cmake/ztd.tag_invoke
++	INSTALL_DESTINATION share/ztd.tag_invoke
+ 	NO_CHECK_REQUIRED_COMPONENTS_MACRO
+ )
+ write_basic_package_version_file(
+@@ -193,6 +205,16 @@ export(TARGETS ztd.tag_invoke
+ 	FILE
+ 	"${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.tag_invoke/ztd.tag_invoke-targets.cmake"
+ )
++install(FILES
++  ${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.tag_invoke/ztd.tag_invoke-config.cmake
++  ${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.tag_invoke/ztd.tag_invoke-config-version.cmake
++  DESTINATION share/ztd.tag_invoke
++)
++install(EXPORT ztd.tag_invoke-targets
++  FILE ztd.tag_invoke-targets.cmake
++  DESTINATION share/ztd.tag_invoke
++)
++
+ 
+ # ztd.idk
+ file(GLOB_RECURSE ztd.idk.includes
+@@ -241,7 +263,9 @@ if(ZTD_IDK_IS_TOP_LEVEL_PROJECT)
+ 	)
+ endif()
+ 
+-install(TARGETS ztd.idk)
++install(TARGETS ztd.idk
++        EXPORT ztd.idk-targets
++        DESTINATION lib)
+ install(DIRECTORY include/
+ 	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+ )
+@@ -249,7 +273,7 @@ install(DIRECTORY include/
+ configure_package_config_file(
+ 	cmake/ztd.idk-config.cmake.in
+ 	"${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.idk/ztd.idk-config.cmake"
+-	INSTALL_DESTINATION lib/cmake/ztd.idk
++	INSTALL_DESTINATION share/ztd.idk
+ 	NO_CHECK_REQUIRED_COMPONENTS_MACRO
+ )
+ write_basic_package_version_file(
+@@ -261,11 +285,17 @@ export(TARGETS ztd.idk
+ 	"${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.idk/ztd.idk-targets.cmake"
+ )
+ 
+-install(
+-	DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/cmake"
+-	TYPE DATA
++install(FILES
++  ${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.idk/ztd.idk-config.cmake
++  ${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.idk/ztd.idk-config-version.cmake
++  DESTINATION share/ztd.idk/
++  )
++install(EXPORT ztd.idk-targets
++  FILE ztd.idk-targets.cmake
++  DESTINATION share/ztd.idk/
+ )
+ 
++
+ if(ZTD_IDK_GENERATE_SINGLE)
+ 	add_subdirectory(single)
+ endif()
+diff --git a/cmake/ztd.idk-config.cmake.in b/cmake/ztd.idk-config.cmake.in
+index 4ceb0ec..8377221 100644
+--- a/cmake/ztd.idk-config.cmake.in
++++ b/cmake/ztd.idk-config.cmake.in
+@@ -1,7 +1,8 @@
+ @PACKAGE_INIT@
+ 
+-find_package(ztd.version CONFIG REQUIRED)
+-find_package(ztd.tag_invoke CONFIG REQUIRED)
++include(CMakeFindDependencyMacro)
++find_dependency(ztd.version CONFIG )
++find_dependency(ztd.tag_invoke CONFIG)
+ include(${CMAKE_CURRENT_LIST_DIR}/ztd.idk-targets.cmake)
+ 
+ if (TARGET ztd.idk)
+diff --git a/cmake/ztd.tag_invoke-config.cmake.in b/cmake/ztd.tag_invoke-config.cmake.in
+index 504c60b..ee2f5cd 100644
+--- a/cmake/ztd.tag_invoke-config.cmake.in
++++ b/cmake/ztd.tag_invoke-config.cmake.in
+@@ -1,6 +1,6 @@
+ @PACKAGE_INIT@
+-
+-find_package(ztd.version CONFIG REQUIRED)
++include(CMakeFindDependencyMacro)
++find_dependency(ztd.version CONFIG )
+ include(${CMAKE_CURRENT_LIST_DIR}/ztd.tag_invoke-targets.cmake)
+ 
+ if (TARGET ztd.tag_invoke)
diff --git a/external_imported/vcpkg/ports/ztd-idk/portfile.cmake b/external_imported/vcpkg/ports/ztd-idk/portfile.cmake
new file mode 100644
index 000000000..4cfbb5799
--- /dev/null
+++ b/external_imported/vcpkg/ports/ztd-idk/portfile.cmake
@@ -0,0 +1,22 @@
+if (VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
+vcpkg_from_github(
+  OUT_SOURCE_PATH SOURCE_PATH
+  REPO soasis/idk
+  REF ad64a1759a506bb0761c7b20c40da8c91865f50e
+  SHA512 b6f1afa78b23331ba19116101667bb9dd070deafb9d685f99f165c75ec30d7bfe90443034b6f1882c3186c490f3fc4ed648cdc3fff6fa8450375676d8e9c4727
+  HEAD_REF main
+  PATCHES 
+      fix-cmake-install.patch
+)
+
+vcpkg_cmake_configure(
+  SOURCE_PATH ${SOURCE_PATH}
+)
+vcpkg_cmake_install()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/ztd-idk/vcpkg.json b/external_imported/vcpkg/ports/ztd-idk/vcpkg.json
new file mode 100644
index 000000000..0a28ce692
--- /dev/null
+++ b/external_imported/vcpkg/ports/ztd-idk/vcpkg.json
@@ -0,0 +1,17 @@
+{
+  "name": "ztd-idk",
+  "version-date": "2023-11-03",
+  "description": "The IDK (Industrial Development Kit) library!",
+  "homepage": "https://github.com/soasis/idk",
+  "license": "Apache-2.0",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/ports/ztd-platform/fix-cmake-install.patch b/external_imported/vcpkg/ports/ztd-platform/fix-cmake-install.patch
new file mode 100644
index 000000000..f793fd614
--- /dev/null
+++ b/external_imported/vcpkg/ports/ztd-platform/fix-cmake-install.patch
@@ -0,0 +1,72 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 57c97c4..d0e0da9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -49,6 +49,8 @@ project(ztd.platform
+ 	HOMEPAGE_URL "https://ztdplatform.readthedocs.io/en/latest/"
+ 	LANGUAGES C CXX)
+ 
++include(CMakePackageConfigHelpers)
++include(GNUInstallDirs)
+ if(ZTD_PLATFORM_READTHEDOCS)
+ 	# ReadTheDocs seems unable to handle the include at the project level: something must be going wrong?
+ 	include(CheckCXXCompilerFlag)
+@@ -121,10 +123,7 @@ option(ZTD_PLATFORM_USE_ENCODING_C "Enable encoding_rs's C bindings with ztd::pl
+ 
+ # # Dependencies
+ # ztd.idk
+-FetchContent_Declare(ztd.idk
+-	GIT_REPOSITORY https://github.com/soasis/idk.git
+-	GIT_TAG main)
+-FetchContent_MakeAvailable(ztd.idk)
++find_package(ztd.idk CONFIG REQUIRED)
+ 
+ # encoding_c
+ if (ZTD_PLATFORM_USE_ENCODING_C)
+@@ -408,11 +407,8 @@ install(DIRECTORY include/
+ 	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+ )
+ install(TARGETS ztd.platform
+-	PUBLIC_HEADER
+-	RUNTIME
+-	ARCHIVE
+-	LIBRARY
+-)
++        EXPORT ztd.platform-targets
++        DESTINATION lib)
+ 
+ # # Config / Version packaging
+ # Version configurations
+@@ -430,6 +426,15 @@ export(TARGETS ztd.platform
+ 	FILE
+ 	"${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.platform/ztd.platform-targets.cmake")
+ 
++install(FILES
++  ${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.platform/ztd.platform-config.cmake
++  ${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.platform/ztd.platform-config-version.cmake
++  DESTINATION share/ztd.platform
++  )
++install(EXPORT ztd.platform-targets
++  FILE ztd.platform-targets.cmake
++  DESTINATION share/ztd.platform
++)
+ # # Benchmarks, Tests, Examples
+ if(ZTD_PLATFORM_TESTS)
+ 	include(CTest)
+diff --git a/cmake/ztd.platform-config.cmake.in b/cmake/ztd.platform-config.cmake.in
+index 37629fc..5d5886c 100644
+--- a/cmake/ztd.platform-config.cmake.in
++++ b/cmake/ztd.platform-config.cmake.in
+@@ -1,6 +1,11 @@
+ @PACKAGE_INIT@
+ 
+-if (TARGET ztd::platform)
++include(CMakeFindDependencyMacro)
++find_dependency(ztd.idk CONFIG)
++
++include(${CMAKE_CURRENT_LIST_DIR}/ztd.platform-targets.cmake)
++if (TARGET ztd.platform)
++	add_library(ztd::platform ALIAS ztd.platform)
+ 	get_target_property(ZTD_PLATFORM_INCLUDE_DIRS
+ 		ztd.platform INTERFACE_INCLUDE_DIRECTORIES)
+ 	set_and_check(ZTD_PLATFORM_INCLUDE_DIRS "${ZTD_PLATFORM_INCLUDE_DIRS}")
diff --git a/external_imported/vcpkg/ports/ztd-platform/portfile.cmake b/external_imported/vcpkg/ports/ztd-platform/portfile.cmake
new file mode 100644
index 000000000..0d2a97287
--- /dev/null
+++ b/external_imported/vcpkg/ports/ztd-platform/portfile.cmake
@@ -0,0 +1,22 @@
+if (VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
+vcpkg_from_github(
+  OUT_SOURCE_PATH SOURCE_PATH
+  REPO soasis/platform
+  REF d92b8e5b85a4cabae62ad19ccfcc5c3f94ab1a14
+  SHA512 d7482bbfa00c6c8226e368fde664ee77e915b4d01ea93e79dffb43b51b44808628c1d3d3daa5e6c8e5cd239dcd4c1ae31c3d0f534df9e1e9bf7a134b24322cfa
+  HEAD_REF main
+  PATCHES fix-cmake-install.patch
+)
+
+vcpkg_cmake_configure(
+  SOURCE_PATH ${SOURCE_PATH}
+)
+
+vcpkg_cmake_install()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/ztd-platform/vcpkg.json b/external_imported/vcpkg/ports/ztd-platform/vcpkg.json
new file mode 100644
index 000000000..e0283782f
--- /dev/null
+++ b/external_imported/vcpkg/ports/ztd-platform/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "ztd-platform",
+  "version-date": "2022-12-30",
+  "description": "A library for messing with platfom-dependent configurations and libraries, and sometimes hiding their cores.",
+  "homepage": "https://github.com/soasis/platform",
+  "license": "Apache-2.0",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    "ztd-idk"
+  ]
+}
diff --git a/external_imported/vcpkg/ports/ztd-static-containers/fix-cmake.patch b/external_imported/vcpkg/ports/ztd-static-containers/fix-cmake.patch
new file mode 100644
index 000000000..cef15e5a2
--- /dev/null
+++ b/external_imported/vcpkg/ports/ztd-static-containers/fix-cmake.patch
@@ -0,0 +1,68 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 32371d4..22223ed 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -33,6 +33,8 @@ project(ztd.static_containers
+ 	VERSION 0.5.0
+ 	DESCRIPTION "A library for a fixed-capacity vector."
+ 	LANGUAGES C CXX)
++include(CMakePackageConfigHelpers)
++include(GNUInstallDirs)
+ 
+ if(ZTD_STATIC_CONTAINERS_READTHEDOCS)
+ 	# ReadTheDocs seems unable to handle the include at the project level: something must be going wrong?
+@@ -113,10 +115,7 @@ option(ZTD_STATIC_CONTAINERS_BENCHMARKS "Enable build of benchmarks" OFF)
+ 
+ # # Dependencies
+ # ztd.idk
+-FetchContent_Declare(ztd.idk
+-	GIT_REPOSITORY https://github.com/soasis/idk.git
+-	GIT_TAG main)
+-FetchContent_MakeAvailable(ztd.idk)
++find_package(ztd.idk CONFIG REQUIRED)
+ 
+ file(GLOB_RECURSE ztd.static_containers.sources
+ 	LIST_DIRECTORIES FALSE
+@@ -126,7 +125,6 @@ file(GLOB_RECURSE ztd.static_containers.sources
+ 
+ add_library(ztd.static_containers INTERFACE)
+ add_library(ztd::static_containers ALIAS ztd.static_containers)
+-target_sources(ztd.static_containers INTERFACE ${ztd.static_containers.sources})
+ target_link_libraries(ztd.static_containers
+ 	INTERFACE
+ 	ztd::idk
+@@ -155,6 +153,18 @@ export(TARGETS ztd.static_containers
+ 	FILE
+ 	"${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.static_containers/ztd.static_containers-targets.cmake")
+ 
++install(TARGETS ztd.static_containers
++	EXPORT ztd.static_containers-targets)
++install(EXPORT ztd.static_containers-targets
++  FILE ztd.static_containers-targets.cmake
++  DESTINATION share/ztd.static_containers
++)
++install(FILES
++  ${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.static_containers/ztd.static_containers-config.cmake
++  ${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.static_containers/ztd.static_containers-config-version.cmake
++  DESTINATION share/ztd.static_containers
++)
++ 
+ # # Benchmarks, Tests, Examples
+ if(ZTD_STATIC_CONTAINERS_TESTS)
+ 	enable_testing()
+diff --git a/cmake/ztd.static_containers-config.cmake.in b/cmake/ztd.static_containers-config.cmake.in
+index f96ace2..94340c1 100644
+--- a/cmake/ztd.static_containers-config.cmake.in
++++ b/cmake/ztd.static_containers-config.cmake.in
+@@ -1,6 +1,9 @@
+ @PACKAGE_INIT@
+-
+-if (TARGET ztd::static_containers)
++include(CMakeFindDependencyMacro)
++find_dependency(ztd.idk CONFIG)
++include("${CMAKE_CURRENT_LIST_DIR}/ztd.static_containers-targets.cmake")
++if (TARGET ztd.static_containers)
++	add_library(ztd::static_containers ALIAS ztd.static_containers)
+ 	get_target_property(ZTD_STATIC_CONTAINERS_INCLUDE_DIRS
+ 		ztd.static_containers INTERFACE_INCLUDE_DIRECTORIES)
+ 	set_and_check(ZTD_STATIC_CONTAINERS_INCLUDE_DIRS "${ZTD_STATIC_CONTAINERS_INCLUDE_DIRS}")
diff --git a/external_imported/vcpkg/ports/ztd-static-containers/portfile.cmake b/external_imported/vcpkg/ports/ztd-static-containers/portfile.cmake
new file mode 100644
index 000000000..54db52084
--- /dev/null
+++ b/external_imported/vcpkg/ports/ztd-static-containers/portfile.cmake
@@ -0,0 +1,18 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO soasis/static_containers
+    REF e1a21217b6dba3028e6cc6bf0f9562972ea1c43d
+    SHA512 ec5b98e2282e72eb09617006afaf2522a471b6eb3928c90fb878c46b7453bb94ddafb19cb4738c5561905003d299bb23d15ebf71c555259b5e500594fbadd97f
+    HEAD_REF main
+    PATCHES fix-cmake.patch
+)
+
+set(VCPKG_BUILD_TYPE release) # header-only
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+)
+
+vcpkg_cmake_install()
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/ztd-static-containers/vcpkg.json b/external_imported/vcpkg/ports/ztd-static-containers/vcpkg.json
new file mode 100644
index 000000000..f268e09dc
--- /dev/null
+++ b/external_imported/vcpkg/ports/ztd-static-containers/vcpkg.json
@@ -0,0 +1,19 @@
+{
+  "name": "ztd-static-containers",
+  "version-date": "2022-12-12",
+  "port-version": 1,
+  "description": "Containers of fixed capacity",
+  "homepage": "https://github.com/soasis/static_containers",
+  "license": "CC0-1.0",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    "ztd-idk"
+  ]
+}
diff --git a/external_imported/vcpkg/ports/ztd-text/fix-cmake-install.patch b/external_imported/vcpkg/ports/ztd-text/fix-cmake-install.patch
new file mode 100644
index 000000000..f053e76ef
--- /dev/null
+++ b/external_imported/vcpkg/ports/ztd-text/fix-cmake-install.patch
@@ -0,0 +1,109 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fd8e1c8..c92aaa5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -51,6 +51,8 @@ project(ztd.text
+ 	HOMEPAGE_URL "https://ztdtext.readthedocs.io/en/latest/"
+ 	LANGUAGES C CXX)
+ 
++include(GNUInstallDirs)
++include(CMakePackageConfigHelpers)
+ if(ZTD_TEXT_READTHEDOCS)
+ 	# ReadTheDocs seems unable to handle the include at the project level: something must be going wrong?
+ 	include(CheckCXXCompilerFlag)
+@@ -139,40 +141,17 @@ option(ZTD_TEXT_BOOST.TEXT "Enable usage of Boost.Text benchmarks and examples"
+ 
+ # # Dependencies
+ # ztd.idk
+-FetchContent_Declare(ztd.idk
+-	GIT_REPOSITORY https://github.com/soasis/idk.git
+-	GIT_SHALLOW    ON
+-	GIT_TAG        main)
+-FetchContent_MakeAvailable(ztd.idk)
+ 
+ # ztd.static_containers
+-FetchContent_Declare(ztd.static_containers
+-	GIT_REPOSITORY https://github.com/soasis/static_containers.git
+-	GIT_SHALLOW    ON
+-	GIT_TAG        main)
+-FetchContent_MakeAvailable(ztd.static_containers)
++find_package(ztd.static_containers CONFIG REQUIRED)
+ 
+ # ztd.encoding_tables
+-FetchContent_Declare(ztd.encoding_tables
+-	GIT_REPOSITORY https://github.com/soasis/encoding_tables.git
+-	GIT_SHALLOW    ON
+-	GIT_TAG        main)
+-FetchContent_MakeAvailable(ztd.encoding_tables)
+ 
+ # ztd.cuneicode
+ set(ZTD_CUNEICODE_SIMDUTF_SHARED ${ZTD_TEXT_BENCHMARKS})
+-FetchContent_Declare(ztd.cuneicode
+-	GIT_REPOSITORY https://github.com/soasis/cuneicode.git
+-	GIT_SHALLOW    ON
+-	GIT_TAG        main)
+-FetchContent_MakeAvailable(ztd.cuneicode)
+ 
+ # ztd.platform
+-FetchContent_Declare(ztd.platform
+-	GIT_REPOSITORY https://github.com/soasis/platform.git
+-	GIT_SHALLOW    ON
+-	GIT_TAG        main)
+-FetchContent_MakeAvailable(ztd.platform)
++find_package(ztd.platform CONFIG REQUIRED)
+ 
+ if (ZTD_TEXT_BENCHAMRKS OR ZTD_TEXT_GENERATE_SINGLE OR ZTD_TEXT_DOCUMENTATION)
+ 	find_package(Python3 REQUIRED COMPONENTS Interpreter)
+@@ -187,16 +166,17 @@ target_include_directories(ztd.text
+ 	INTERFACE
+ 	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+ 	$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+-target_sources(ztd.text INTERFACE ${ztd.text.includes})
+ target_link_libraries(ztd.text
+ 	INTERFACE
+-	ztd::idk
+ 	ztd::static_containers
+ 	ztd::platform
+ 	ztd::cuneicode)
+ install(DIRECTORY include/
+ 	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ 
++install(TARGETS ztd.text
++        EXPORT ztd.text-targets
++        DESTINATION lib)
+ # # Config / Version packaging
+ # Version configurations
+ configure_package_config_file(
+@@ -213,6 +193,15 @@ export(TARGETS ztd.text
+ 	FILE
+ 	"${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.text/ztd.text-targets.cmake")
+ 
++install(FILES
++  ${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.text/ztd.text-config.cmake
++  ${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.text/ztd.text-config-version.cmake
++  DESTINATION share/ztd.text
++  )
++install(EXPORT ztd.text-targets
++  FILE ztd.text-targets.cmake
++  DESTINATION share/ztd.text
++)
+ if(ZTD_TEXT_GENERATE_SINGLE)
+ 	add_subdirectory(single)
+ endif()
+diff --git a/cmake/ztd.text-config.cmake.in b/cmake/ztd.text-config.cmake.in
+index a526740..e11ce0c 100644
+--- a/cmake/ztd.text-config.cmake.in
++++ b/cmake/ztd.text-config.cmake.in
+@@ -1,6 +1,11 @@
+ @PACKAGE_INIT@
++include(CMakeFindDependencyMacro)
++find_dependency(ztd.platform CONFIG)
++find_dependency(ztd.static_containers CONFIG)
+ 
+-if (TARGET ztd::text)
++include (${CMAKE_CURRENT_LIST_DIR}/ztd.text-targets.cmake)
++if (TARGET ztd.text)
++	add_library(ztd::text ALIAS ztd.text)
+ 	get_target_property(ZTD_TEXT_INCLUDE_DIRS
+ 		ztd.text INTERFACE_INCLUDE_DIRECTORIES)
+ 	set_and_check(ZTD_TEXT_INCLUDE_DIRS "${ZTD_TEXT_INCLUDE_DIRS}")
diff --git a/external_imported/vcpkg/ports/ztd-text/portfile.cmake b/external_imported/vcpkg/ports/ztd-text/portfile.cmake
index 377a475b0..600221a96 100644
--- a/external_imported/vcpkg/ports/ztd-text/portfile.cmake
+++ b/external_imported/vcpkg/ports/ztd-text/portfile.cmake
@@ -1,37 +1,18 @@
-vcpkg_from_github(
-  OUT_SOURCE_PATH ZTD_CMAKE_PATH
-  REPO soasis/cmake
-  REF 4277edaf7bf237de07c4a9833f6546872ab9f151
-  SHA512 f05143068a1f22bd46aa0d8c250afb04b29ffbc0f32d746093bfb61f274d0e212ff9786a5163608097ed989b5b212d73811179f311a37d2b2eedce89cc75ee94
-  HEAD_REF main
-)
-
-vcpkg_from_github(
-  OUT_SOURCE_PATH ZTD_IDK_PATH
-  REPO soasis/idk
-  REF 6173bb3d433a3dab65e8c356ef69441aa5a86275
-  SHA512 083711e9fc9b03aac34c5a7e182691a9bc9ee2d7c2d9ed2f55093423e2655f7a3829bd3e3db82bc42a78721795ca2d21a7b64c71f05e3c03ea3198f6228eb6f2
-  HEAD_REF main
-)
-
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO soasis/text
-  REF d76205c12300234f815e099e5f8152f443515df5
-  SHA512 836b6cb1a59cd1138bc4c00f9f511bced912d1d5dc36a4a7d757ef1cd7e31cf5046b5a32476ffa89ea9c0ca7834028774f9baa8c74bfc9287cc16ef3b4e987df
+  REF c07fba735ee8389d328103c10ce9a8d49f345060 
+  SHA512 ca9ecacf3260f3915b7d2d90fb1d84f4083775043d592ac5d869a15debf5512d42488d43bd0d3d981180519359a423314e563f2065fa3effe2749904706f483a
   HEAD_REF main
+  PATCHES fix-cmake-install.patch
 )
 
+set(VCPKG_BUILD_TYPE release) # header-only
+
 vcpkg_cmake_configure(
   SOURCE_PATH ${SOURCE_PATH}
-  OPTIONS
-    -DFETCHCONTENT_FULLY_DISCONNECTED=ON
-    -DFETCHCONTENT_SOURCE_DIR_ZTD.CMAKE=${ZTD_CMAKE_PATH}
-    -DFETCHCONTENT_SOURCE_DIR_ZTD.IDK=${ZTD_IDK_PATH}
 )
-vcpkg_cmake_install()
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/lib")
+vcpkg_cmake_install()
 
-file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/ztd-text/usage b/external_imported/vcpkg/ports/ztd-text/usage
deleted file mode 100644
index 86c8ef9fc..000000000
--- a/external_imported/vcpkg/ports/ztd-text/usage
+++ /dev/null
@@ -1,4 +0,0 @@
-The package ztd-text is header only and can be used from CMake via:
-
-    find_path(ZTD_INCLUDE_DIRS ztd)
-    target_include_directories(main PRIVATE ${ZTD_INCLUDE_DIRS})
diff --git a/external_imported/vcpkg/ports/ztd-text/vcpkg.json b/external_imported/vcpkg/ports/ztd-text/vcpkg.json
index 1de4a1396..965edd819 100644
--- a/external_imported/vcpkg/ports/ztd-text/vcpkg.json
+++ b/external_imported/vcpkg/ports/ztd-text/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "ztd-text",
-  "version-date": "2022-03-21",
+  "version-date": "2023-11-03",
   "description": "A spicy text library.",
   "homepage": "https://github.com/soasis/text",
   "license": "Apache-2.0",
@@ -9,6 +9,8 @@
     {
       "name": "vcpkg-cmake",
       "host": true
-    }
+    },
+    "ztd-platform",
+    "ztd-static-containers"
   ]
 }
diff --git a/external_imported/vcpkg/ports/zydis/fix-arm64-build.patch b/external_imported/vcpkg/ports/zydis/fix-arm64-build.patch
deleted file mode 100644
index f93f72e98..000000000
--- a/external_imported/vcpkg/ports/zydis/fix-arm64-build.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/include/Zydis/ShortString.h b/include/Zydis/ShortString.h
-index bed45af6..566d673a 100644
---- a/include/Zydis/ShortString.h
-+++ b/include/Zydis/ShortString.h
-@@ -45,7 +45,9 @@ extern "C" {
- /* Enums and types                                                                                */
- /* ============================================================================================== */
- 
--#pragma pack(push, 1)
-+#if !(defined(ZYAN_AARCH64) && defined(ZYAN_APPLE))
-+#   pragma pack(push, 1)
-+#endif
- 
- /**
-  * Defines the `ZydisShortString` struct.
-@@ -67,7 +69,9 @@ typedef struct ZydisShortString_
-     ZyanU8 size;
- } ZydisShortString;
- 
--#pragma pack(pop)
-+#if !(defined(ZYAN_AARCH64) && defined(ZYAN_APPLE))
-+#   pragma pack(pop)
-+#endif
- 
- /* ============================================================================================== */
- /* Macros                                                                                         */
diff --git a/external_imported/vcpkg/ports/zydis/portfile.cmake b/external_imported/vcpkg/ports/zydis/portfile.cmake
index 5e7e64295..fe635961c 100644
--- a/external_imported/vcpkg/ports/zydis/portfile.cmake
+++ b/external_imported/vcpkg/ports/zydis/portfile.cmake
@@ -1,12 +1,19 @@
+vcpkg_download_distfile(
+    OSX_INTEL_ALIGNMENT_FIX
+    URLS https://github.com/zyantific/zydis/commit/a605f54580c26d2164530fab323057834569d169.patch?full_index=1
+    SHA512 15fad10e4880ab2ee494babc0451b96604a6cc00c09c6740c6b97b83718e01d8e117614bf8f9ec8a6777e9baa1336c7f540709b21dcdc9b53f912bd117f1d3c0
+    FILENAME zydis-intel-alignment-fix-a605f54580c26d2164530fab323057834569d169.patch
+)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO zyantific/zydis
-    REF 4022f22f9280650082a9480519c86a6e2afde2f3 #v3.2.1
-    SHA512 da3ff582d3c4cbb5e4053cd468f181550f02d0a1713a39944266e6d1b0e3249e24461f87171ef99e249e6d5b2fc39fcca402518c569399ae5d4a64e0d3dc4b3b
+    REF "v${VERSION}"
+    SHA512 334284bccfb6ce61cc530fd479d6278db3e4df1fb52b311acd7d21558843c9bf14e74a199cd937041d434260b65c506c07ae1a37243d2240eb9443ae5e56e000
     HEAD_REF master
     PATCHES
         zycore.patch
-        fix-arm64-build.patch # from https://github.com/zyantific/zydis/pull/259
+        "${OSX_INTEL_ALIGNMENT_FIX}"
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ZYDIS_BUILD_SHARED_LIB)
@@ -14,7 +21,7 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ZYDIS_BUILD_SHARED_LIB
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-        "-DZYDIS_BUILD_SHARED_LIB=${ZYDIS_BUILD_SHARED_LIB}"
+        -DZYDIS_BUILD_SHARED_LIB=${ZYDIS_BUILD_SHARED_LIB}
         -DZYDIS_BUILD_EXAMPLES=OFF
     OPTIONS_DEBUG
         -DZYDIS_BUILD_TOOLS=OFF
@@ -28,10 +35,11 @@ vcpkg_copy_tools(TOOL_NAMES ZydisDisasm ZydisInfo AUTO_CLEAN)
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/Zydis/Defines.h" "defined(ZYDIS_STATIC_BUILD)" "1")
 endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 vcpkg_copy_pdbs()
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/external_imported/vcpkg/ports/zydis/vcpkg.json b/external_imported/vcpkg/ports/zydis/vcpkg.json
index 43b27b13b..c9459b1d9 100644
--- a/external_imported/vcpkg/ports/zydis/vcpkg.json
+++ b/external_imported/vcpkg/ports/zydis/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "zydis",
-  "version-semver": "3.2.1",
-  "port-version": 3,
+  "version-semver": "4.0.0",
+  "port-version": 2,
   "description": "Fast and lightweight x86/x86-64 disassembler library.",
   "homepage": "https://zydis.re",
   "license": "MIT",
diff --git a/external_imported/vcpkg/ports/zydis/zycore.patch b/external_imported/vcpkg/ports/zydis/zycore.patch
index d58b8dcc1..5e62c7f29 100644
--- a/external_imported/vcpkg/ports/zydis/zycore.patch
+++ b/external_imported/vcpkg/ports/zydis/zycore.patch
@@ -1,41 +1,66 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9898f424..8cba0e96 100644
+index 5e812fb..64c6e97 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -54,8 +54,7 @@ set(ZYDIS_ZYCORE_PATH
- # =============================================================================================== #
+@@ -78,8 +78,7 @@ if (ZYAN_SYSTEM_ZYCORE)
+     find_package(Zycore)
+ else ()
+     # Try to initialize the Zycore submodule using Git
+-    if (NOT EXISTS "${ZYAN_ZYCORE_PATH}/CMakeLists.txt" AND 
+-        "${ZYAN_ZYCORE_PATH}" STREQUAL "${CMAKE_CURRENT_LIST_DIR}/dependencies/zycore")
++    if (0)
+         find_package(Git QUIET)
+         if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
+             execute_process(
+@@ -89,7 +88,7 @@ else ()
+         endif()
+     endif ()
  
- # Try to initialize the Zycore submodule using Git
--if (NOT EXISTS "${ZYDIS_ZYCORE_PATH}/CMakeLists.txt" AND 
--    "${ZYDIS_ZYCORE_PATH}" STREQUAL "${CMAKE_CURRENT_LIST_DIR}/dependencies/zycore")
-+if (0)
-     find_package(Git QUIET)
-     if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
-         execute_process(
-@@ -65,7 +64,7 @@ if (NOT EXISTS "${ZYDIS_ZYCORE_PATH}/CMakeLists.txt" AND
-     endif()
- endif ()
+-    if (NOT EXISTS "${ZYAN_ZYCORE_PATH}/CMakeLists.txt")
++    if (0)
+         message(
+             FATAL_ERROR
+             "Can't find zycore submodule. Please make sure to clone the repo recursively.\n"
+@@ -101,7 +100,7 @@ else ()
+         )
+     endif ()
  
--if (NOT EXISTS "${ZYDIS_ZYCORE_PATH}/CMakeLists.txt")
-+if (0)
-     message(
-         FATAL_ERROR
-         "Can't find zycore submodule. Please make sure to clone the repo recursively.\n"
-@@ -77,7 +76,7 @@ if (NOT EXISTS "${ZYDIS_ZYCORE_PATH}/CMakeLists.txt")
-     )
+-    add_subdirectory(${ZYAN_ZYCORE_PATH} "zycore" EXCLUDE_FROM_ALL)
++    find_package(zycore CONFIG REQUIRED)
  endif ()
  
--add_subdirectory(${ZYDIS_ZYCORE_PATH} "zycore" EXCLUDE_FROM_ALL)
-+find_package(zycore CONFIG REQUIRED)
- 
  # =============================================================================================== #
- # Library configuration                                                                           #
-@@ -89,7 +88,7 @@ else ()
-     add_library("Zydis" STATIC)
+@@ -115,7 +114,7 @@ else ()
+     target_compile_definitions("Zydis" PUBLIC "ZYDIS_STATIC_BUILD")
  endif ()
  
 -target_link_libraries("Zydis" PUBLIC "Zycore")
-+target_link_libraries(Zydis PUBLIC Zycore::Zycore)
++target_link_libraries("Zydis" PUBLIC Zycore::Zycore)
  target_include_directories("Zydis"
      PUBLIC
          $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+@@ -383,14 +382,16 @@ if (ZYDIS_BUILD_TOOLS AND NOT ZYAN_NO_LIBC)
+                 target_compile_definitions("ZydisFuzzReEncoding" PRIVATE "ZYDIS_LIBFUZZER")
+             endif ()
+ 
+-            add_executable("ZydisTestEncoderAbsolute"
+-                "tools/ZydisTestEncoderAbsolute.c")
+-            target_link_libraries("ZydisTestEncoderAbsolute" "Zydis")
+-            set_target_properties("ZydisTestEncoderAbsolute" PROPERTIES FOLDER "Tools")
+-            target_compile_definitions("ZydisTestEncoderAbsolute" PRIVATE "_CRT_SECURE_NO_WARNINGS")
+-            zyan_set_common_flags("ZydisTestEncoderAbsolute")
+-            zyan_maybe_enable_wpo("ZydisTestEncoderAbsolute")
+-            _maybe_set_emscripten_cfg("ZydisTestEncoderAbsolute")
++            if (NOT ZYDIS_BUILD_SHARED_LIB)
++                add_executable("ZydisTestEncoderAbsolute"
++                    "tools/ZydisTestEncoderAbsolute.c")
++                target_link_libraries("ZydisTestEncoderAbsolute" "Zydis")
++                set_target_properties("ZydisTestEncoderAbsolute" PROPERTIES FOLDER "Tools")
++                target_compile_definitions("ZydisTestEncoderAbsolute" PRIVATE "_CRT_SECURE_NO_WARNINGS")
++                zyan_set_common_flags("ZydisTestEncoderAbsolute")
++                zyan_maybe_enable_wpo("ZydisTestEncoderAbsolute")
++                _maybe_set_emscripten_cfg("ZydisTestEncoderAbsolute")
++            endif ()
+         endif ()
+ 
+         add_executable("ZydisInfo" "tools/ZydisInfo.c")
diff --git a/external_imported/vcpkg/ports/zyre/vcpkg.json b/external_imported/vcpkg/ports/zyre/vcpkg.json
index fac1e8bc5..0e5cb090e 100644
--- a/external_imported/vcpkg/ports/zyre/vcpkg.json
+++ b/external_imported/vcpkg/ports/zyre/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "zyre",
-  "version-string": "2019-07-07",
-  "port-version": 4,
+  "version-date": "2019-07-07",
+  "port-version": 5,
   "description": "An open-source framework for proximity-based peer-to-peer applications",
   "homepage": "https://github.com/zeromq/zyre",
   "dependencies": [
diff --git a/external_imported/vcpkg/scripts/Get-Changelog.ps1 b/external_imported/vcpkg/scripts/Get-Changelog.ps1
deleted file mode 100644
index 5beebce6e..000000000
--- a/external_imported/vcpkg/scripts/Get-Changelog.ps1
+++ /dev/null
@@ -1,498 +0,0 @@
-#Requires -Version 5.0
-# We are not using Powershell >= 6.0, as the only supported debugger (vscode powershell extension) breaks on complex code. See: https://github.com/PowerShell/PowerShellEditorServices/issues/1295
-# This code can be run on PowerShell Core on any platform, but it is recommend to debug this code in Windows PowerShell ISE unless debugging happens to "just work" on your machine.
-# Expect the fix to be out at around the end of 2020/beginning of 2021, at which point consider upgrading this script to PowerShell 7 the next time maintenance is necessary.
-# -- Griffin Downs 2020-12-15 (@grdowns)
-
-using namespace System.Management.Automation
-using namespace System.Collections.Generic
-
-<#
-.SYNOPSIS
-    Changelog generator for vcpkg.
-.DESCRIPTION
-    The changelog generator uses GitHub's Pull Request and Files API to get
-    pull requests and their associated file changes over the provided date range.
-    Then, the data is processed into buckets which are presented to the user
-    as a markdown file.
-.EXAMPLE
-    Get-Changelog
-.EXAMPLE
-    Get-Changelog -StartDate 11/1/20 -EndDate 12/1/20
-.EXAMPLE
-    $cred = Get-Credential
-    Get-Changelog -Credentials $cred
-.OUTPUTS
-    A "CHANGELOG.md" file in the working directory. If the file already exists,
-    suffix is added to the filename and a new file is created to prevent overwriting.
-#>
-[CmdletBinding(PositionalBinding=$True)]
-Param (
-    # The begin date range (inclusive)
-    [Parameter(Mandatory=$True, Position=0)]
-    [ValidateScript({$_ -le (Get-Date)})]
-    [DateTime]$StartDate,
-
-    # The end date range (exclusive)
-    [Parameter(Mandatory, Position=1)]
-    [ValidateScript({$_ -le (Get-Date)})]
-    [DateTime]$EndDate,
-
-    [Parameter(Mandatory=$True)]
-    [String]$OutFile,
-
-    # GitHub credentials (username and PAT)
-    [Parameter()]
-    [Credential()]
-    [PSCredential]$Credentials
-)
-
-Set-StrictMode -Version 2
-
-if (-not $Credentials) {
-    $Credentials = Get-Credential -Message 'Enter GitHub Credentials (username and PAT)'
-    if (-not $Credentials) {
-        throw [System.ArgumentException]::new(
-            'Cannot process command because of the missing mandatory parameter: Credentials.'
-        )
-    }
-}
-
-function Get-AuthHeader() {
-    [CmdletBinding()]
-    Param(
-        [Parameter(Mandatory=$True)]
-        [Credential()]
-        [PSCredential]$Credentials
-    )
-    @{ Authorization = 'Basic ' + [System.Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes(
-        "$($Credentials.UserName):$($Credentials.GetNetworkCredential().Password)")) }
-}
-
-$response = Invoke-WebRequest -uri 'https://api.github.com' -Headers (Get-AuthHeader $Credentials)
-if ('X-OAuth-Scopes' -notin $response.Headers.Keys) {
-    throw [System.ArgumentException]::new(
-        "Cannot validate argument on parameter 'Credentials'. Incorrect GitHub credentials"
-    )
-}
-
-
-function Get-MergedPullRequests {
-    [CmdletBinding()]
-    [OutputType([Object[]])]
-   Param(
-        [Parameter(Mandatory=$True, Position=0)]
-        [ValidateScript({$_ -le (Get-Date)})]
-        [DateTime]$StartDate,
-
-        # The end date range (exclusive)
-        [Parameter(Mandatory, Position=1)]
-        [ValidateScript({$_ -le (Get-Date)})]
-        [DateTime]$EndDate,
-
-        [Parameter(Mandatory=$True)]
-        [Credential()]
-        [PSCredential]$Credentials
-    )
-    Begin {
-        $RequestSplat = @{
-            Uri = 'https://api.github.com/repos/Microsoft/vcpkg/pulls'
-            Body = @{
-                state = 'closed'
-                sort = 'updated'
-                base = 'master'
-                per_page = 100
-                direction = 'desc'
-                page = 1
-            }
-        }
-        $Epoch = Get-Date -AsUTC
-        $DeltaEpochStart = ($Epoch - $StartDate).Ticks
-
-        $ProgressSplat = @{
-            Activity = "Searching for merged Pull Requests in date range: $($StartDate.ToString('yyyy-MM-dd')) - $($EndDate.ToString('yyyy-MM-dd'))"
-            PercentComplete = 0
-        }
-
-        Write-Progress @ProgressSplat
-
-        $writeProgress = {
-            $ProgressSplat.PercentComplete = 100 * ($Epoch - $_.updated_at).Ticks / $DeltaEpochStart
-            Write-Progress @ProgressSplat -Status "Current item date: $($_.updated_at.ToString('yyyy-MM-dd'))"
-        }
-    }
-    Process {
-        while ($True) {
-            $response = Invoke-WebRequest -Headers (Get-AuthHeader $Credentials) @RequestSplat | ConvertFrom-Json
-
-            foreach ($_ in $response) {
-                foreach ($x in 'created_at', 'merged_at', 'updated_at', 'closed_at') {
-                    if ($_.$x) { $_.$x = [DateTime]::Parse($_.$x,
-                        [System.Globalization.CultureInfo]::InvariantCulture,
-                        [System.Globalization.DateTimeStyles]::AdjustToUniversal -bor [System.Globalization.DateTimeStyles]::AssumeUniversal) }
-                }
-
-                if (-not $_.merged_at) { continue }
-                if ($_.updated_at -lt $StartDate) { return }
-
-                &$WriteProgress
-
-                if ($_.merged_at -ge $EndDate -or $_.merged_at -lt $StartDate) { continue }
-
-                $_
-            }
-
-            $RequestSplat.Body.page++
-        }
-    }
-}
-
-
-class PRFileMap {
-    [Object]$Pull
-    [Object[]]$Files
-}
-
-
-function Get-PullRequestFileMap {
-    [CmdletBinding()]
-    [OutputType([PRFileMap[]])]
-    Param (
-        [Parameter(Mandatory=$True,ValueFromPipeline=$True)]
-        [Object]$Pull,
-        [Parameter(Mandatory=$True)]
-        [Credential()]
-        [PSCredential]$Credentials
-    )
-    Begin {
-        $Pulls = [List[Object]]::new()
-
-        $ProgressSplat = @{
-            Activity = 'Getting Pull Request files'
-            PercentComplete = 0
-        }
-
-        $Count = 0
-        $WriteProgress = {
-            $ProgressSplat.Status = 'Getting files for: #{0} ({1}/{2})' -f $_.number, $Count, $Pulls.Length
-            $ProgressSplat.PercentComplete = 100 * $Count / $Pulls.Length
-            Write-Progress @ProgressSplat
-        }
-    }
-    Process {
-        $Pulls += $Pull
-    }
-    End {
-        Write-Progress @ProgressSplat
-        $ProgressSplat += @{ Status = '' }
-
-        $Pulls | ForEach-Object {
-            $Count++
-
-            [PRFileMap]@{
-                Pull = $_
-                Files = $(
-                    $requestSplat = @{
-                        Uri = 'https://api.github.com/repos/Microsoft/vcpkg/pulls/{0}/files' -f $_.number
-                        Body = @{ page = 0; per_page = 100 }
-                    }
-                    do {
-                        $requestSplat.Body.page++
-
-                        $response = Invoke-WebRequest -Headers (Get-AuthHeader $Credentials) @requestSplat | ConvertFrom-Json
-
-                        $response
-                    } until ($response.Length -lt $requestSplat.Body.per_page)
-                )
-            }
-
-            &$WriteProgress
-        }
-    }
-}
-
-
-class DocumentationUpdate {
-    [String]$Path
-    [Boolean]$New
-    [List[Object]]$Pulls
-}
-
-
-function Select-Documentation {
-    [CmdletBinding()]
-    [OutputType([DocumentationUpdate])]
-    Param (
-        [Parameter(Mandatory=$True,ValueFromPipeline=$True)]
-        [PRFileMap]$PRFileMap
-    )
-    Begin {
-        $UpdatedDocumentation = @{}
-    }
-    Process {
-        $PRFileMap.Files | ForEach-Object {
-            if ($_.filename -notlike 'docs/*') { return }
-
-            $new = $_.status -eq 'added'
-            if ($entry = $UpdatedDocumentation[$_.filename]) {
-                $entry.Pulls += $PRFileMap.Pull
-                $entry.New = $entry.New -or $new
-            } else {
-                $UpdatedDocumentation[$_.filename] = @{
-                    Pulls = [List[Object]]::new(@($PRFileMap.Pull))
-                    New = $new
-                }
-            }
-        }
-    }
-    End {
-        $UpdatedDocumentation.GetEnumerator() | ForEach-Object {
-            [DocumentationUpdate]@{
-                Path = $_.Key
-                Pulls = $_.Value.Pulls
-                New = $_.Value.New
-            }
-        }
-    }
-}
-
-
-function Select-InfrastructurePullRequests {
-    [CmdletBinding()]
-    [OutputType([Object])]
-    Param (
-        [Parameter(Mandatory=$True,ValueFromPipeline=$True)]
-        [PRFileMap]$PRFileMap
-    )
-    Process {
-        switch -Wildcard ($PRFileMap.Files | Foreach-Object {$_.filename}) {
-            "docs/*" { continue }
-            "ports/*" { continue }
-            "versions/*" { continue }
-            "scripts/ci.baseline.txt" { continue }
-            Default { return $PRFileMap.Pull }
-        }
-    }
-}
-
-
-class Version {
-    [String]$Begin
-    [String]$End
-    [String]$BeginPort
-    [String]$EndPort
-}
-
-
-function Select-Version {
-    [CmdletBinding()]
-    [OutputType([Version])]
-    Param (
-        [Parameter(Mandatory=$True,ValueFromPipeline=$True)]
-        [Object]$VersionFile
-    )
-    Begin {
-        $V = [Version]@{}
-    }
-    Process {
-        $regex = switch ($VersionFile.filename | Split-Path -Leaf) {
-            'CONTROL' {
-                '(?<operation>^[\+|\-]|)(?<field>Version|[\+|\-]Port-Version):\s(?<version>\S+)'
-            }
-            'vcpkg.json' {
-                '(?<operation>^[\+|\-]|)\s*(\"(?<field>version|version-date|version-string|version-semver)\":\s\"(?<version>.+)\"|\"(?<field>port-version)\":\s(?<version>.+))'
-            }
-            Default { return }
-        }
-
-        $VersionFile.Patch -split '\n' | ForEach-Object {
-            if ($_ -notmatch $regex) { return }
-
-            $m = $Matches
-            switch -Wildcard ($m.operation + $m.field) {
-                'Version*' { $V.Begin = $V.End = $m.version }
-                '-Version*' { $V.Begin = ($V.Begin, $m.version | Measure-Object -Minimum).Minimum }
-                '+Version*' { $V.End = ($V.End, $m.version | Measure-Object -Minimum).Minimum }
-                'Port-Version' { $V.BeginPort = $V.EndPort = $m.version }
-                '-Port-Version' { $V.BeginPort = ($V.BeginPort, $m.version | Measure-Object -Minimum).Minimum }
-                '+Port-Version' { $V.EndPort = ($V.EndPort, $m.version | Measure-Object -Maximum).Maximum }
-            }
-        }
-    }
-    End {
-        if (-not $V.Begin) { $V.Begin = $V.End }
-        elseif (-not $V.End) { $V.End = $V.Begin }
-
-        if (-not $V.BeginPort) { $V.BeginPort = '0' }
-        if (-not $V.EndPort) { $V.EndPort = '0' }
-
-        $V
-    }
-}
-
-
-class PortUpdate {
-    [String]$Port
-    [Object[]]$Pulls
-    [Version]$Version
-    [Boolean]$New
-}
-
-
-function Select-UpdatedPorts {
-    [CmdletBinding()]
-    [OutputType([PortUpdate])]
-    Param (
-        [Parameter(Mandatory=$True,ValueFromPipeline=$True)]
-        [PRFileMap]$PRFileMap
-    )
-    Begin {
-        $ModifiedPorts = @{}
-    }
-    Process {
-        $PRFileMap.Files | Where-Object {
-            $_.filename -like 'ports/*/CONTROL' -or
-            $_.filename -like 'ports/*/vcpkg.json'
-        } | ForEach-Object {
-            $port = $_.filename.split('/')[1]
-            if ($entry = $ModifiedPorts[$port]) {
-                $entry.VersionFiles += $_
-                if (-not $entry.Pulls.Contains($PRFileMap.Pull)) { $entry.Pulls += $PRFileMap.Pull }
-            } else {
-                $ModifiedPorts[$port] = @{
-                    VersionFiles = [List[Object]]::new(@($_))
-                    Pulls = [List[Object]]::new(@($PRFileMap.Pull))
-                }
-            }
-        }
-    }
-    End {
-        $ModifiedPorts.GetEnumerator() | ForEach-Object {
-            $versionFiles = $_.Value.VersionFiles
-            if (-not ($versionChange = $versionFiles | Select-Version)) { return }
-
-            function Find-File($x) { [bool]($versionFiles | Where-Object { $_.filename -like "*$x" }) }
-            function Find-NewFile($x)
-                { [bool]($versionFiles | Where-Object { $_.filename -like "*$x" -and $_.status -eq 'added' }) }
-
-            [PortUpdate]@{
-                Port = $_.Key
-                Pulls = $_.Value.Pulls
-                Version = $versionChange
-                New = (Find-NewFile 'CONTROL') -or (-not (Find-File 'CONTROL') -and (Find-NewFile 'vcpkg.json'))
-            }
-        }
-    }
-}
-
-$MergedPRs = Get-MergedPullRequests -StartDate $StartDate -EndDate $EndDate -Credentials $Credentials
-$MergedPRsSorted = $MergedPRs | Sort-Object -Property 'number'
-$PRFileMaps = $MergedPRsSorted | Get-PullRequestFileMap -Credentials $Credentials
-
-$sortSplat = @{ Property =
-    @{ Expression = 'New'; Descending = $True }, @{ Expression = 'Path'; Descending = $False } }
-$UpdatedDocumentation = $PRFileMaps | Select-Documentation | Sort-Object @sortSplat
-$UpdatedInfrastructure = $PRFileMaps | Select-InfrastructurePullRequests
-$UpdatedPorts = $PRFileMaps | Select-UpdatedPorts
-$NewPorts = $UpdatedPorts | Where-Object { $_.New }
-$ChangedPorts = $UpdatedPorts | Where-Object { -not $_.New }
-
-Write-Progress -Activity 'Selecting updates from pull request files' -Completed
-
-Write-Progress -Activity 'Writing changelog file' -PercentComplete -1
-
-$output = @"
-vcpkg ($($StartDate.ToString('yyyy.MM.dd')) - $((($EndDate).AddSeconds(-1)).ToString('yyyy.MM.dd')))
----
-#### Total port count:
-#### Total port count per triplet (tested) (tentative): LINK TO BUILD
-|triplet|ports available|
-|---|---|
-|x86-windows|NUM|
-|**x64-windows**|NUM|
-|x64-windows-static|NUM|
-|x64-windows-static-md|NUM|
-|x64-uwp|NUM|
-|arm64-windows|NUM|
-|arm-uwp|NUM|
-|**x64-osx**|NUM|
-|**x64-linux**|NUM|
-
-"@
-
-if ($UpdatedDocumentation) {
-    $output += @"
-#### The following documentation has been updated:
-
-$(-join ($UpdatedDocumentation | Sort-Object -Property 'Path' | ForEach-Object {
-    $PathWithoutDocs =  ([string]$_.Path).Remove(0, 5) # 'docs/'
-    "- [{0}](https://github.com/microsoft/vcpkg/blob/master/docs/{0}){1}`n" -f $PathWithoutDocs, ($(if ($_.New) { ' ***[NEW]***' } else { '' }))
-
-    $_.Pulls | ForEach-Object {
-        "    - {0} (by @{1}, in #{2})`n" -f $_.title, $_.user.login, $_.number
-    }
-}))
-
-"@
-}
-
-if ($NewPorts) {
-    $output += @"
-<details>
-<summary><b>The following $($NewPorts.Length) ports have been added:</b></summary>
-
-|port|version|
-|---|---|
-$(-join ($NewPorts | Sort-Object -Property 'Port' | ForEach-Object {
-    "|[{0}]({1})" -f $_.Port, $_.Pulls[0].html_url
-
-    if ($_.Pulls.Length -gt 1 ) {
-        '<sup>'
-        $_.Pulls[1..($_.Pulls.Length - 1)] | ForEach-Object {
-            " #{0}" -f $_.number
-        }
-        '</sup>'
-    }
-
-    "|{0}`n" -f $_.Version.End
-}))
-</details>
-
-"@
-}
-
-if ($ChangedPorts) {
-    $output += @"
-<details>
-<summary><b>The following $($ChangedPorts.Length) ports have been updated:</b></summary>
-
-$(-join ($ChangedPorts | Sort-Object -Property 'Port' | ForEach-Object {
-    "- {0} ``{1}#{2}``" -f $_.Port, $_.Version.Begin, $_.Version.BeginPort
-    ' -> '
-    "``{0}#{1}```n" -f $_.Version.End, $_.Version.EndPort
-
-    $_.Pulls | ForEach-Object {
-        "    - {0} (by @{1}, in #{2})`n" -f $_.title, $_.user.login, $_.number
-    }
-}))
-</details>
-
-"@
-}
-
-if ($UpdatedInfrastructure) {
-    $output += @"
-<details>
-<summary>The following additional changes have been made to vcpkg's infrastructure:</summary>
-
-$(-join ($UpdatedInfrastructure | ForEach-Object {
-    "- {0} (by @{1}, in #{2})`n" -f $_.title, $_.user.login, $_.number
-}))
-</details>
-
-"@
-}
-
-Set-Content -Value $Output -Path $OutFile
-
-Write-Progress -Activity 'Writing changelog file' -Completed
diff --git a/external_imported/vcpkg/scripts/azure-pipelines/android/Dockerfile b/external_imported/vcpkg/scripts/azure-pipelines/android/Dockerfile
new file mode 100644
index 000000000..e08922128
--- /dev/null
+++ b/external_imported/vcpkg/scripts/azure-pipelines/android/Dockerfile
@@ -0,0 +1,65 @@
+# syntax=docker/dockerfile:1.4
+FROM ubuntu:focal-20231211
+
+ADD https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb /packages-microsoft-prod.deb
+ADD https://dl.google.com/android/repository/android-ndk-r25c-linux.zip /android-ndk-r25c-linux.zip
+
+# Add apt packages
+
+## vcpkg prerequisites
+ENV APT_PACKAGES="git curl zip unzip tar"
+
+## Common build prereqs
+ENV APT_PACKAGES="$APT_PACKAGES g++ vim pkg-config cmake ca-certificates"
+
+ENV APT_PACKAGES="$APT_PACKAGES autoconf nasm bison python2 flex build-essential libtool libtool-bin gettext automake autoconf-archive"
+
+## Python related
+ENV APT_PACKAGES="$APT_PACKAGES python3-setuptools python3-pip python3-venv"
+
+## freeglut
+ENV APT_PACKAGES="$APT_PACKAGES libxi-dev libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxrandr-dev libxxf86vm-dev"
+
+# glfw3
+ENV APT_PACKAGES="$APT_PACKAGES libxinerama-dev libxcursor-dev"
+
+# qt5-base
+ENV APT_PACKAGES="$APT_PACKAGES libxext-dev libxfixes-dev libxrender-dev \
+  libxcb1-dev libx11-xcb-dev libxcb-glx0-dev libxcb-util0-dev \
+  libxkbcommon-dev libxcb-keysyms1-dev \
+  libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev libxcb-sync-dev \
+  libxcb-xfixes0-dev libxcb-shape0-dev libxcb-randr0-dev \
+  libxcb-render-util0-dev libxcb-xinerama0-dev libxcb-xkb-dev libxcb-xinput-dev \
+  libxcb-cursor-dev libxkbcommon-x11-dev"
+
+## PowerShell
+ENV APT_PACKAGES="$APT_PACKAGES powershell"
+
+RUN <<END_OF_SCRIPT bash
+export DEBIAN_FRONTEND=noninteractive
+
+# Apt prereqs itself
+apt-get -y update
+apt-get -y --no-install-recommends install ca-certificates
+
+# Add apt repos
+
+## PowerShell
+dpkg -i packages-microsoft-prod.deb
+rm -f packages-microsoft-prod.deb
+add-apt-repository universe
+
+# Run apt things
+apt-get -y update
+apt-get -y dist-upgrade
+
+apt-get -y --no-install-recommends install $APT_PACKAGES
+
+# Android NDK
+unzip /android-ndk-r25c-linux.zip
+rm -f android-ndk-r25c-linux.zip
+END_OF_SCRIPT
+
+ENV ANDROID_NDK_HOME /android-ndk-r25c
+
+WORKDIR /vcpkg
diff --git a/external_imported/vcpkg/scripts/azure-pipelines/android/azure-pipelines.yml b/external_imported/vcpkg/scripts/azure-pipelines/android/azure-pipelines.yml
new file mode 100644
index 000000000..79c3362b5
--- /dev/null
+++ b/external_imported/vcpkg/scripts/azure-pipelines/android/azure-pipelines.yml
@@ -0,0 +1,136 @@
+# Copyright (c) Microsoft Corporation.
+# SPDX-License-Identifier: MIT
+#
+
+parameters:
+  - name: vcpkgToolSha
+    displayName: 'Custom SHA of vcpkg-tool to use rather than bootstrap'
+    type: string
+    default: 'use default'
+  - name: triplet
+    type: string
+  - name: jobName
+    type: string
+  - name: poolName
+    type: string
+  - name: dockerImage
+    type: string
+  - name: tripletPattern
+    displayName: 'Enable the triplets which contain this substring'
+    type: string
+    default: ''
+
+jobs:
+- job: ${{ parameters.jobName }}
+  condition: and(succeeded(), contains('^${{ parameters.triplet }}$', '${{ parameters.tripletPattern }}'))
+  pool:
+    name: ${{ parameters.poolName }}
+  workspace:
+    clean: resources
+  timeoutInMinutes: 1440 # 1 day
+  cancelTimeoutInMinutes: 1
+  variables:
+  - name: WORKING_ROOT
+    value: /mnt/vcpkg-ci
+  - name: VCPKG_DOWNLOADS
+    value: /mnt/vcpkg-ci/downloads
+  - group: vcpkg-asset-caching-credentials
+  - name: X_VCPKG_ASSET_SOURCES
+    value: "x-azurl,$(root-url-ea),$(sas-ea),readwrite"
+  - group: vcpkg-binary-caching-credentials
+  - name: X_VCPKG_BINARY_SOURCE_STUB
+    value: "x-azblob,$(root-bin-url-wus3),$(sas-bin-wus3)"
+
+  steps:
+    # Note: /mnt is the Azure machines' temporary disk.
+  - bash: |
+      curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
+      az login --identity
+      az acr login --name AndContainerRegistry
+    displayName: 'Set up managed identity'
+  - bash: |
+      sudo mkdir /home/agent -m=777
+      sudo chown `id -u` /home/agent
+      sudo mkdir ${{ variables.WORKING_ROOT }} -m=777
+      sudo rm -rf ${{ variables.WORKING_ROOT }}/failure-logs
+      sudo mkdir ${{ variables.WORKING_ROOT }}/failure-logs -m=777
+      sudo mkdir ${{ variables.VCPKG_DOWNLOADS }} -m=777
+      exit 0
+    displayName: 'Create working directories'
+  - bash: |
+      docker run --rm \
+      --mount type=bind,source=$(Build.Repository.LocalPath),target=/vcpkg \
+      ${{ parameters.dockerImage }} \
+      ./bootstrap-vcpkg.sh
+    displayName: 'Bootstrap vcpkg'
+    condition: eq('use default', '${{ parameters.vcpkgToolSha }}')
+  - bash: |
+      docker run --rm \
+      --mount type=bind,source=$(Build.Repository.LocalPath),target=/vcpkg \
+      ${{ parameters.dockerImage }} \
+      ./scripts/azure-pipelines/bootstrap-from-source.sh ${{ parameters.vcpkgToolSha }}
+    displayName: "Build vcpkg with CMake"
+    condition: ne('use default', '${{ parameters.vcpkgToolSha }}')
+  - bash: |
+      CONTAINERS=$(docker ps -a -q)
+      if [ -n "$CONTAINERS" ]; then
+        docker rm -f $CONTAINERS
+      fi
+    displayName: 'Stop and remove all docker containers'
+  - bash: |
+      docker pull ${{ parameters.dockerImage }}
+    displayName: 'Pull Docker Container'
+  - task: Bash@3
+    inputs:
+      targetType: inline
+      script: |
+        USER=$(id --user)
+        docker run --init -i \
+        -a stderr \
+        -a stdout \
+        --user $USER \
+        --mount type=bind,source=$(Build.Repository.LocalPath),target=/vcpkg \
+        --mount type=bind,source=$(WORKING_ROOT)/failure-logs,target=/vcpkg/failure-logs \
+        --mount type=bind,source=/mnt/vcpkg-ci,target=/mnt/vcpkg-ci \
+        --env X_VCPKG_ASSET_SOURCES="x-azurl,$(root-url-ea),$(sas-ea),readwrite" \
+        ${{ parameters.dockerImage }} \
+        pwsh \
+         -File /vcpkg/scripts/azure-pipelines/test-modified-ports.ps1 \
+         -Triplet ${{ parameters.triplet }} \
+         -BuildReason $(Build.Reason) \
+         -BinarySourceStub "$(X_VCPKG_BINARY_SOURCE_STUB)" \
+         -WorkingRoot ${{ variables.WORKING_ROOT }} \
+         -IsLinuxHost
+      failOnStderr: true
+    displayName: '*** Test Modified Ports'
+  - bash: |
+      CONTAINERS=$(docker ps -a -q)
+      if [ -n "$CONTAINERS" ]; then
+        docker rm -f $CONTAINERS
+      fi
+    displayName: 'Stop and remove all docker containers'
+    condition: always()
+  - task: PublishBuildArtifacts@1
+    displayName: 'Publish Artifact: failure logs for ${{ parameters.triplet }}'
+    inputs:
+      PathtoPublish: '$(WORKING_ROOT)/failure-logs'
+      ArtifactName: 'failure logs for ${{ parameters.triplet }}'
+    condition: ne(variables['FAILURE_LOGS_EMPTY'], 'True')
+  - bash: |
+      python3 scripts/file_script.py /mnt/vcpkg-ci/installed/vcpkg/info/
+    displayName: 'Build a file list for all packages'
+    condition: always()
+  - task: PublishBuildArtifacts@1
+    displayName: 'Publish Artifact: file lists for ${{ parameters.triplet }}'
+    condition: always()
+    inputs:
+      PathtoPublish: scripts/list_files
+      ArtifactName: 'file lists for ${{ parameters.triplet }}'
+  - task: PublishTestResults@2
+    displayName: 'Publish Test Results'
+    condition: ne(variables['XML_RESULTS_FILE'], '')
+    inputs:
+      testRunTitle: ${{ parameters.triplet }}
+      testResultsFormat: xUnit
+      testResultsFiles: $(XML_RESULTS_FILE)
+      platform: ${{ parameters.triplet }}
diff --git a/external_imported/vcpkg/scripts/azure-pipelines/android/create-docker-image.ps1 b/external_imported/vcpkg/scripts/azure-pipelines/android/create-docker-image.ps1
new file mode 100644
index 000000000..a912c014a
--- /dev/null
+++ b/external_imported/vcpkg/scripts/azure-pipelines/android/create-docker-image.ps1
@@ -0,0 +1,39 @@
+# Create Docker image for Android
+
+$Location = 'westus3'
+$Date = (Get-Date -Format 'yyyy-MM-dd')
+$ResourceGroupName = "And-Registry"
+$ContainerRegistryName = "AndContainerRegistry"
+$ErrorActionPreference = 'Stop'
+
+Get-AzResourceGroup -Name $ResourceGroupName -ErrorVariable error -ErrorAction SilentlyContinue
+if ($error) {
+    New-AzResourceGroup -Name $ResourceGroupName -Location $Location
+    New-AzContainerRegistry -ResourceGroupName $ResourceGroupName -Name $ContainerRegistryName -EnableAdminUser -Sku Basic
+}
+
+$registry = Get-AzContainerRegistry -ResourceGroupName $ResourceGroupName -Name $ContainerRegistryName
+Connect-AzContainerRegistry -Name $registry.Name
+
+$imageName = "vcpkg-android"
+Push-Location $PSScriptRoot
+try {
+    docker builder prune -f --filter "until=24h"
+
+    docker build . -t $imageName
+    
+    $remote = [string]::Format('andcontainerregistry.azurecr.io/{0}:{1}', $imageName, $Date)
+    docker tag $imageName $remote
+    
+    docker push $remote
+    
+    #removes from local environment
+    docker rmi --force $remote $imageName
+    
+    # pulls and runs ...
+    docker logout
+} finally {
+    Pop-Location
+}
+
+Write-Host "Remote: $remote"
diff --git a/external_imported/vcpkg/scripts/azure-pipelines/android/provision-image.sh b/external_imported/vcpkg/scripts/azure-pipelines/android/provision-image.sh
new file mode 100644
index 000000000..350493821
--- /dev/null
+++ b/external_imported/vcpkg/scripts/azure-pipelines/android/provision-image.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+# Copyright (c) Microsoft Corporation.
+# SPDX-License-Identifier: MIT
+#
+# This script is to set up the machine for the Docker host.
+
+export DEBIAN_FRONTEND=noninteractive
+
+## Docker
+apt-get -y --no-install-recommends install ca-certificates gnupg lsb-release
+mkdir -p /etc/apt/keyrings
+curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \
+  $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
+apt-get update
+apt-get -y --no-install-recommends install docker-ce docker-ce-cli
diff --git a/external_imported/vcpkg/scripts/azure-pipelines/azure-pipelines.yml b/external_imported/vcpkg/scripts/azure-pipelines/azure-pipelines.yml
index 7c40eadd0..cd501e5bb 100644
--- a/external_imported/vcpkg/scripts/azure-pipelines/azure-pipelines.yml
+++ b/external_imported/vcpkg/scripts/azure-pipelines/azure-pipelines.yml
@@ -2,9 +2,12 @@
 # SPDX-License-Identifier: MIT
 #
 variables:
-  windows-pool: 'PrWin-2023-03-15'
-  linux-pool: 'PrLin-2023-03-15'
-  osx-pool: 'PrOsx-2022-02-04'
+  android-pool: 'PrAnd-1ES-Pool'
+  linux-pool: 'PrLin-1ES-Pool'
+  windows-pool: 'PrWin-2024-01-11'
+  osx-pool: 'PrOsx-2024-01-18'
+  osx-arm64-pool: 'PrOsx-2024-01-22-arm64'
+  linux-docker-image: 'andcontainerregistry.azurecr.io/vcpkg-android:2024-01-11'
 
 parameters:
   - name: vcpkgToolSha
@@ -67,20 +70,57 @@ jobs:
 
 - template: windows/azure-pipelines.yml
   parameters:
-    triplet: arm-uwp
-    jobName: arm_uwp
+    triplet: arm64-uwp
+    jobName: arm64_uwp
     poolName: $(windows-pool)
     vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
     tripletPattern: ${{ parameters.tripletPattern }}
 
 - template: osx/azure-pipelines.yml
   parameters:
+    triplet: x64-osx
+    jobName: x64_osx
     poolName: $(osx-pool)
     vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
     tripletPattern: ${{ parameters.tripletPattern }}
 
+- template: osx/azure-pipelines.yml
+  parameters:
+    triplet: arm64-osx
+    jobName: arm64_osx
+    poolName: $(osx-arm64-pool)
+    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
+    tripletPattern: ${{ parameters.tripletPattern }}
+
 - template: linux/azure-pipelines.yml
   parameters:
     poolName: $(linux-pool)
     vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
     tripletPattern: ${{ parameters.tripletPattern }}
+
+- template: android/azure-pipelines.yml
+  parameters:
+    triplet: arm-neon-android
+    jobName: arm_neon_android
+    poolName: $(android-pool)
+    dockerImage: $(linux-docker-image)
+    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
+    tripletPattern: ${{ parameters.tripletPattern }}
+
+- template: android/azure-pipelines.yml
+  parameters:
+    triplet: x64-android
+    jobName: x64_android
+    poolName: $(android-pool)
+    dockerImage: $(linux-docker-image)
+    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
+    tripletPattern: ${{ parameters.tripletPattern }}
+
+- template: android/azure-pipelines.yml
+  parameters:
+    triplet: arm64-android
+    jobName: arm64_android
+    poolName: $(android-pool)
+    dockerImage: $(linux-docker-image)
+    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
+    tripletPattern: ${{ parameters.tripletPattern }}
diff --git a/external_imported/vcpkg/scripts/azure-pipelines/generate-sas-tokens.ps1 b/external_imported/vcpkg/scripts/azure-pipelines/generate-sas-tokens.ps1
new file mode 100644
index 000000000..04cc8a534
--- /dev/null
+++ b/external_imported/vcpkg/scripts/azure-pipelines/generate-sas-tokens.ps1
@@ -0,0 +1,61 @@
+Param(
+    [Parameter(Mandatory=$true)]
+    [int]$KeyNumber
+)
+
+function Get-SasToken {
+    Param(
+        [Parameter(Mandatory=$true)]
+        [int]$KeyNumber,
+        [Parameter(Mandatory=$true)]
+        [ValidateNotNullOrEmpty()]
+        [string]$ResourceGroupName,
+        [Parameter(Mandatory=$true)]
+        [ValidateNotNullOrEmpty()]
+        [string]$StorageAccountName,
+        [Parameter(Mandatory=$true)]
+        [ValidateNotNullOrEmpty()]
+        [string]$ContainerName,
+        [Parameter(Mandatory=$true)]
+        [ValidateNotNullOrEmpty()]
+        [string]$Permission
+    )
+
+    $keys = Get-AzStorageAccountKey -ResourceGroupName $ResourceGroupName -Name $StorageAccountName
+    $key = $keys[$KeyNumber - 1]
+    $ctx = New-AzStorageContext -StorageAccountName $StorageAccountName -StorageAccountKey $key.Value
+    $start = Get-Date -AsUTC
+    $end = $start.AddDays(90)
+    $token = New-AzStorageContainerSASToken -Name $ContainerName -Permission $Permission -StartTime $start -ExpiryTime $end -Context $ctx
+    return $token.Substring(1)
+}
+
+# Asset Cache:
+# Read, Create, List
+$assetSas = Get-SasToken -KeyNumber $KeyNumber -ResourceGroupName vcpkg-asset-cache -StorageAccountName vcpkgassetcacheeastasia -ContainerName cache -Permission rcl
+
+# Binary Cache:
+# Read, Create, List, Write
+$binarySas = Get-SasToken -KeyNumber $KeyNumber -ResourceGroupName vcpkg-binary-cache -StorageAccountName vcpkgbinarycache -ContainerName cache -Permission rclw
+$binaryEASas = Get-SasToken -KeyNumber $KeyNumber -ResourceGroupName vcpkg-binary-cache -StorageAccountName vcpkgbinarycacheeastasia -ContainerName cache -Permission rclw
+$binaryWUS3as = Get-SasToken -KeyNumber $KeyNumber -ResourceGroupName vcpkg-binary-cache -StorageAccountName vcpkgbinarycachewus3 -ContainerName cache -Permission rclw
+
+$response = "Asset Cache SAS: Update`n" + `
+    "https://dev.azure.com/vcpkg/public/_library?itemType=VariableGroups&view=VariableGroupView&variableGroupId=6&path=vcpkg-asset-caching-credentials`n" + `
+    "and`n" + `
+    "https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_library?itemType=VariableGroups&view=VariableGroupView&variableGroupId=355&path=vcpkg-asset-caching-credentials`n" + `
+    "`n" + `
+    "token:`n" + `
+    "$assetSas`n" + `
+    "`n" + `
+    "Binary Cache SAS: Update`n" + `
+    "https://dev.azure.com/vcpkg/public/_library?itemType=VariableGroups&view=VariableGroupView&variableGroupId=8&path=vcpkg-binary-caching-credentials`n" + `
+    "`n" + `
+    "sas-bin:`n" + `
+    "$binarySas`n" + `
+    "sas-bin-ea:`n" + `
+    "$binaryEASas`n" + `
+    "sas-bin-wus3:`n" + `
+    "$binaryWUS3as`n"
+
+Write-Host $response
diff --git a/external_imported/vcpkg/scripts/azure-pipelines/linux/azure-pipelines.yml b/external_imported/vcpkg/scripts/azure-pipelines/linux/azure-pipelines.yml
index 2b50cf3b6..35d3d4384 100644
--- a/external_imported/vcpkg/scripts/azure-pipelines/linux/azure-pipelines.yml
+++ b/external_imported/vcpkg/scripts/azure-pipelines/linux/azure-pipelines.yml
@@ -16,7 +16,7 @@ parameters:
 
 jobs:
 - job: x64_linux
-  condition: contains('^x64-linux$', '${{ parameters.tripletPattern }}')
+  condition: and(succeeded(), contains('^x64-linux$', '${{ parameters.tripletPattern }}'))
   pool:
     name: ${{ parameters.poolName }}
   workspace:
@@ -32,7 +32,7 @@ jobs:
     value: "x-azurl,$(root-url-ea),$(sas-ea),readwrite"
   - group: vcpkg-binary-caching-credentials
   - name: X_VCPKG_BINARY_SOURCE_STUB
-    value: "x-azblob,$(root-bin-url-ea),$(sas-bin-ea)"
+    value: "x-azblob,$(root-bin-url-wus3),$(sas-bin-wus3)"
 
   steps:
     # Note: /mnt is the Azure machines' temporary disk.
@@ -54,7 +54,7 @@ jobs:
     inputs:
       failOnStderr: true
       filePath: 'scripts/azure-pipelines/test-modified-ports.ps1'
-      arguments: '-Triplet x64-linux -BuildReason $(Build.Reason) -BinarySourceStub "$(X_VCPKG_BINARY_SOURCE_STUB)" -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)'
+      arguments: '-Triplet x64-linux -BuildReason $(Build.Reason) -BinarySourceStub "$(X_VCPKG_BINARY_SOURCE_STUB)" -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory) -IsLinuxHost'
       pwsh: true
   - task: PublishBuildArtifacts@1
     displayName: 'Publish Artifact: failure logs for x64-linux'
diff --git a/external_imported/vcpkg/scripts/azure-pipelines/linux/changing-linux-packages.md b/external_imported/vcpkg/scripts/azure-pipelines/linux/changing-linux-packages.md
new file mode 100644
index 000000000..f8b5f8265
--- /dev/null
+++ b/external_imported/vcpkg/scripts/azure-pipelines/linux/changing-linux-packages.md
@@ -0,0 +1,3 @@
+- [ ] Update `provision-image.sh` to add the new apt package.
+- [ ] Update `managed-image.json` to add the new apt package to the very long line of packages.
+- [ ] Update the managed image named CPP_GITHUB\PrLin-1ES\PrLin-1ESImage by copying the contents of `managed-image.json` to the Settings\Image text box.
diff --git a/external_imported/vcpkg/scripts/azure-pipelines/linux/create-image.ps1 b/external_imported/vcpkg/scripts/azure-pipelines/linux/create-image.ps1
deleted file mode 100644
index 932d25aec..000000000
--- a/external_imported/vcpkg/scripts/azure-pipelines/linux/create-image.ps1
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# SPDX-License-Identifier: MIT
-#
-
-<#
-.SYNOPSIS
-Creates a Linux virtual machine image, set up for vcpkg's CI.
-
-.DESCRIPTION
-create-image.ps1 creates an Azure Linux VM image, set up for vcpkg's CI system.
-This script assumes you have installed Azure tools into PowerShell by following the instructions
-at https://docs.microsoft.com/en-us/powershell/azure/install-az-ps?view=azps-3.6.1
-or are running from Azure Cloud Shell.
-
-This script assumes you have installed the OpenSSH Client optional Windows component.
-#>
-
-$Location = 'eastasia'
-$Prefix = 'Lin-'
-$Prefix += (Get-Date -Format 'yyyy-MM-dd')
-$VMSize = 'Standard_D8a_v4'
-$ProtoVMName = 'PROTOTYPE'
-$ErrorActionPreference = 'Stop'
-
-$ProgressActivity = 'Creating Linux Image'
-$TotalProgress = 11
-$CurrentProgress = 1
-
-Import-Module "$PSScriptRoot/../create-vmss-helpers.psm1" -DisableNameChecking
-
-####################################################################################################
-Write-Progress `
-  -Activity $ProgressActivity `
-  -Status 'Creating SSH key' `
-  -PercentComplete (100 / $TotalProgress * $CurrentProgress++)
-
-$sshDir = [System.IO.Path]::GetTempPath() + [System.IO.Path]::GetRandomFileName()
-mkdir $sshDir
-try {
-  ssh-keygen.exe -q -b 2048 -t rsa -f "$sshDir/key" -P [string]::Empty
-  $sshPublicKey = Get-Content "$sshDir/key.pub"
-} finally {
-  Remove-Item $sshDir -Recurse -Force
-}
-
-####################################################################################################
-Write-Progress `
-  -Activity $ProgressActivity `
-  -Status 'Creating resource group' `
-  -PercentComplete (100 / $TotalProgress * $CurrentProgress++)
-
-$ResourceGroupName = Find-ResourceGroupName $Prefix
-$AdminPW = New-Password
-New-AzResourceGroup -Name $ResourceGroupName -Location $Location
-$AdminPWSecure = ConvertTo-SecureString $AdminPW -AsPlainText -Force
-$Credential = New-Object System.Management.Automation.PSCredential ("AdminUser", $AdminPWSecure)
-
-####################################################################################################
-Write-Progress `
-  -Activity $ProgressActivity `
-  -Status 'Creating virtual network' `
-  -PercentComplete (100 / $TotalProgress * $CurrentProgress++)
-
-$VirtualNetwork = Create-LockedDownNetwork -ResourceGroupName $ResourceGroupName -Location $Location
-
-####################################################################################################
-Write-Progress `
-  -Activity $ProgressActivity `
-  -Status 'Creating prototype VM' `
-  -PercentComplete (100 / $TotalProgress * $CurrentProgress++)
-
-$NicName = $ResourceGroupName + 'NIC'
-$Nic = New-AzNetworkInterface `
-  -Name $NicName `
-  -ResourceGroupName $ResourceGroupName `
-  -Location $Location `
-  -Subnet $VirtualNetwork.Subnets[0]
-
-$VM = New-AzVMConfig -Name $ProtoVMName -VMSize $VMSize -Priority 'Spot' -MaxPrice -1
-$VM = Set-AzVMOperatingSystem `
-  -VM $VM `
-  -Linux `
-  -ComputerName $ProtoVMName `
-  -Credential $Credential `
-  -DisablePasswordAuthentication
-
-$VM = Add-AzVMNetworkInterface -VM $VM -Id $Nic.Id
-$VM = Set-AzVMSourceImage `
-  -VM $VM `
-  -PublisherName 'Canonical' `
-  -Offer '0001-com-ubuntu-server-focal' `
-  -Skus '20_04-lts' `
-  -Version latest
-
-$VM = Set-AzVMBootDiagnostic -VM $VM -Disable
-
-$VM = Add-AzVMSshPublicKey `
-  -VM $VM `
-  -KeyData $sshPublicKey `
-  -Path "/home/AdminUser/.ssh/authorized_keys"
-
-New-AzVm `
-  -ResourceGroupName $ResourceGroupName `
-  -Location $Location `
-  -VM $VM
-
-####################################################################################################
-Write-Progress `
-  -Activity $ProgressActivity `
-  -Status 'Waiting 1 minute to let Azure VM customizations be applied' `
-  -PercentComplete (100 / $TotalProgress * $CurrentProgress++)
-
-Start-Sleep -Seconds 60
-
-####################################################################################################
-Write-Progress `
-  -Activity $ProgressActivity `
-  -Status 'Restarting VM' `
-  -PercentComplete (100 / $TotalProgress * $CurrentProgress++)
-
-Restart-AzVm -ResourceGroupName $ResourceGroupName -Name $ProtoVMName
-
-####################################################################################################
-Write-Progress `
-  -Activity $ProgressActivity `
-  -Status 'Running provisioning script provision-image.sh in VM' `
-  -PercentComplete (100 / $TotalProgress * $CurrentProgress++)
-
-$ProvisionImageResult = Invoke-AzVMRunCommandWithRetries `
-  -ResourceGroupName $ResourceGroupName `
-  -VMName $ProtoVMName `
-  -CommandId 'RunShellScript' `
-  -ScriptPath "$PSScriptRoot\provision-image.sh"
-
-Write-Host "provision-image.sh output: $($ProvisionImageResult.value.Message)"
-
-####################################################################################################
-Write-Progress `
-  -Activity $ProgressActivity `
-  -Status 'Restarting VM' `
-  -PercentComplete (100 / $TotalProgress * $CurrentProgress++)
-
-Restart-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName
-
-####################################################################################################
-Write-Progress `
-  -Activity $ProgressActivity `
-  -Status 'Converting VM to Image' `
-  -PercentComplete (100 / $TotalProgress * $CurrentProgress++)
-
-Stop-AzVM `
-  -ResourceGroupName $ResourceGroupName `
-  -Name $ProtoVMName `
-  -Force
-
-Set-AzVM `
-  -ResourceGroupName $ResourceGroupName `
-  -Name $ProtoVMName `
-  -Generalized
-
-$VM = Get-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName
-$ImageConfig = New-AzImageConfig -Location $Location -SourceVirtualMachineId $VM.ID
-$ImageName = Find-ImageName -ResourceGroupName 'vcpkg-image-minting' -Prefix $Prefix
-New-AzImage -Image $ImageConfig -ImageName $ImageName -ResourceGroupName 'vcpkg-image-minting'
-
-####################################################################################################
-Write-Progress `
-  -Activity $ProgressActivity `
-  -Status 'Deleting unused temporary resources' `
-  -PercentComplete (100 / $TotalProgress * $CurrentProgress++)
-
-Remove-AzResourceGroup $ResourceGroupName -Force
-
-####################################################################################################
-Write-Progress -Activity $ProgressActivity -Completed
-Write-Host "Generated Image:  $ImageName"
-Write-Host 'Finished!'
diff --git a/external_imported/vcpkg/scripts/azure-pipelines/linux/create-vmss.ps1 b/external_imported/vcpkg/scripts/azure-pipelines/linux/create-vmss.ps1
deleted file mode 100755
index 54ed2142b..000000000
--- a/external_imported/vcpkg/scripts/azure-pipelines/linux/create-vmss.ps1
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# SPDX-License-Identifier: MIT
-#
-
-<#
-.SYNOPSIS
-Creates a Linux virtual machine scale set, set up for vcpkg's CI.
-
-.DESCRIPTION
-create-vmss.ps1 creates an Azure Linux VM scale set, set up for vcpkg's CI
-system. See https://docs.microsoft.com/en-us/azure/virtual-machine-scale-sets/overview
-for more information.
-
-This script assumes you have installed Azure tools into PowerShell by following the instructions
-at https://docs.microsoft.com/en-us/powershell/azure/install-az-ps?view=azps-3.6.1
-or are running from Azure Cloud Shell.
-
-This script assumes you have installed the OpenSSH Client optional Windows component.
-
-
-.PARAMETER ImageName
-The name of the image to deploy into the scale set.
-#>
-
-[CmdLetBinding()]
-Param(
-  [parameter(Mandatory=$true)]
-  [string]$ImageName
-)
-
-$Location = 'eastasia'
-$Prefix = 'PrLin-'
-$Prefix += (Get-Date -Format 'yyyy-MM-dd')
-$VMSize = 'Standard_D32a_v4'
-$LiveVMPrefix = 'BUILD'
-$ErrorActionPreference = 'Stop'
-
-Import-Module "$PSScriptRoot/../create-vmss-helpers.psm1" -DisableNameChecking
-
-$sshDir = [System.IO.Path]::GetTempPath() + [System.IO.Path]::GetRandomFileName()
-mkdir $sshDir
-try {
-  ssh-keygen.exe -q -b 2048 -t rsa -f "$sshDir/key" -P [string]::Empty
-  $sshPublicKey = Get-Content "$sshDir/key.pub"
-} finally {
-  Remove-Item $sshDir -Recurse -Force
-}
-$ResourceGroupName = Find-ResourceGroupName $Prefix
-$AdminPW = New-Password
-$Image = Get-AzImage -ResourceGroupName 'vcpkg-image-minting' -ImageName $ImageName
-
-New-AzResourceGroup -Name $ResourceGroupName -Location $Location
-
-$VirtualNetwork = Create-LockedDownNetwork -ResourceGroupName $ResourceGroupName -Location $Location
-$VmssIpConfigName = $ResourceGroupName + 'VmssIpConfig'
-$VmssIpConfig = New-AzVmssIpConfig -SubnetId $VirtualNetwork.Subnets[0].Id -Primary -Name $VmssIpConfigName
-$VmssName = $ResourceGroupName + 'Vmss'
-$Vmss = New-AzVmssConfig `
-  -Location $Location `
-  -SkuCapacity 0 `
-  -SkuName $VMSize `
-  -SkuTier 'Standard' `
-  -Overprovision $false `
-  -UpgradePolicyMode Manual `
-  -EvictionPolicy Delete `
-  -Priority Spot `
-  -MaxPrice -1
-
-$NicName = $ResourceGroupName + 'NIC'
-New-AzNetworkInterface `
-  -Name $NicName `
-  -ResourceGroupName $ResourceGroupName `
-  -Location $Location `
-  -Subnet $VirtualNetwork.Subnets[0]
-
-$Vmss = Add-AzVmssNetworkInterfaceConfiguration `
-  -VirtualMachineScaleSet $Vmss `
-  -Primary $true `
-  -IpConfiguration $VmssIpConfig `
-  -NetworkSecurityGroupId $VirtualNetwork.Subnets[0].NetworkSecurityGroup.Id `
-  -Name $NicName
-
-$VmssPublicKey = New-Object -TypeName 'Microsoft.Azure.Management.Compute.Models.SshPublicKey' `
-  -ArgumentList @('/home/AdminUser/.ssh/authorized_keys', $sshPublicKey)
-
-$Vmss = Set-AzVmssOsProfile `
-  -VirtualMachineScaleSet $Vmss `
-  -ComputerNamePrefix $LiveVMPrefix `
-  -AdminUsername AdminUser `
-  -AdminPassword $AdminPW `
-  -LinuxConfigurationDisablePasswordAuthentication $true `
-  -PublicKey @($VmssPublicKey)
-
-$Vmss = Set-AzVmssStorageProfile `
-  -VirtualMachineScaleSet $Vmss `
-  -OsDiskCreateOption 'FromImage' `
-  -OsDiskCaching ReadOnly `
-  -DiffDiskSetting Local `
-  -ImageReferenceId $Image.Id
-
-$Vmss = Set-AzVmssBootDiagnostic `
-  -VirtualMachineScaleSet $Vmss `
-  -Enabled $true
-
-New-AzVmss `
-  -ResourceGroupName $ResourceGroupName `
-  -Name $VmssName `
-  -VirtualMachineScaleSet $Vmss
-
-Write-Host "Location: $Location"
-Write-Host "Resource group name: $ResourceGroupName"
-Write-Host 'Finished!'
diff --git a/external_imported/vcpkg/scripts/azure-pipelines/linux/managed-image.json b/external_imported/vcpkg/scripts/azure-pipelines/linux/managed-image.json
new file mode 100644
index 000000000..090ae8a90
--- /dev/null
+++ b/external_imported/vcpkg/scripts/azure-pipelines/linux/managed-image.json
@@ -0,0 +1,16 @@
+{
+    "artifacts": [
+        {
+            "name": "linux-install-packages",
+            "parameters": {
+                "packages": "git curl zip unzip tar at libxt-dev gperf libxaw7-dev cifs-utils build-essential g++ gfortran libx11-dev libxkbcommon-x11-dev libxi-dev libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxinerama-dev libxxf86vm-dev libxcursor-dev yasm libnuma1 libnuma-dev libtool-bin flex bison libbison-dev autoconf libudev-dev libncurses5-dev libtool libxrandr-dev xutils-dev dh-autoreconf autoconf-archive libgles2-mesa-dev ruby-full pkg-config meson nasm cmake ninja-build libxext-dev libxfixes-dev libxrender-dev libxcb1-dev libx11-xcb-dev libxcb-glx0-dev libxcb-util0-dev libxkbcommon-dev libxcb-keysyms1-dev libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-shape0-dev libxcb-randr0-dev libxcb-render-util0-dev libxcb-xinerama0-dev libxcb-xkb-dev libxcb-xinput-dev libxcb-cursor-dev libkrb5-dev libxcb-res0-dev libxcb-keysyms1-dev libxcb-xkb-dev libxcb-record0-dev python3-setuptools python3-mako python3-pip python3-venv nodejs libwayland-dev python-is-python3 guile-2.2-dev libxdamage-dev libdbus-1-dev libxtst-dev haskell-stack golang-go wayland-protocols"
+            }
+        },
+        {
+            "name": "linux-ubuntu2204-nvidia-cuda-cudnn"
+        },
+        {
+            "name": "linux-install-powershell"
+        }
+    ]
+}
diff --git a/external_imported/vcpkg/scripts/azure-pipelines/linux/provision-image.sh b/external_imported/vcpkg/scripts/azure-pipelines/linux/provision-image.sh
index 4b5ebd7f8..28ad54864 100755
--- a/external_imported/vcpkg/scripts/azure-pipelines/linux/provision-image.sh
+++ b/external_imported/vcpkg/scripts/azure-pipelines/linux/provision-image.sh
@@ -8,14 +8,13 @@ export DEBIAN_FRONTEND=noninteractive
 # Add apt repos
 
 ## CUDA
-apt-key del 7fa2af80
-wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-ubuntu2004.pin
-mv cuda-ubuntu2004.pin /etc/apt/preferences.d/cuda-repository-pin-600
-apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/3bf863cc.pub
-add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/ /"
+wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/cuda-ubuntu2204.pin
+mv cuda-ubuntu2204.pin /etc/apt/preferences.d/cuda-repository-pin-600
+apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/3bf863cc.pub
+add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/ /"
 
 ## PowerShell
-wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb
+wget -q https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb
 dpkg -i packages-microsoft-prod.deb
 rm -f packages-microsoft-prod.deb
 add-apt-repository universe
@@ -72,7 +71,7 @@ APT_PACKAGES="$APT_PACKAGES nodejs"
 APT_PACKAGES="$APT_PACKAGES libwayland-dev"
 
 ## required by all GN projects
-APT_PACKAGES="$APT_PACKAGES python2 python-is-python3"
+APT_PACKAGES="$APT_PACKAGES python-is-python3"
 
 ## required by libctl
 APT_PACKAGES="$APT_PACKAGES guile-2.2-dev"
@@ -89,8 +88,11 @@ APT_PACKAGES="$APT_PACKAGES libxtst-dev"
 ## required by bond
 APT_PACKAGES="$APT_PACKAGES haskell-stack"
 
-## required by duktape
-APT_PACKAGES="$APT_PACKAGES python-yaml"
+## required by boringssl
+APT_PACKAGES="$APT_PACKAGES golang-go"
+
+## required by libdecor
+APT_PACKAGES="$APT_PACKAGES wayland-protocols"
 
 ## CUDA
 APT_PACKAGES="$APT_PACKAGES cuda-compiler-12-1 cuda-libraries-dev-12-1 cuda-driver-dev-12-1 \
@@ -104,7 +106,7 @@ APT_PACKAGES="$APT_PACKAGES powershell"
 if [[ $(grep microsoft /proc/version) ]]; then
 echo "Skipping install of ADO prerequisites on WSL."
 else
-APT_PACKAGES="$APT_PACKAGES libkrb5-3 zlib1g libicu66"
+APT_PACKAGES="$APT_PACKAGES libkrb5-3 zlib1g libicu70 debsums liblttng-ust1"
 fi
 
 apt-get -y --no-install-recommends install $APT_PACKAGES
diff --git a/external_imported/vcpkg/scripts/azure-pipelines/osx/Install-Prerequisites.ps1 b/external_imported/vcpkg/scripts/azure-pipelines/osx/Install-Prerequisites.ps1
deleted file mode 100755
index 979c41a74..000000000
--- a/external_imported/vcpkg/scripts/azure-pipelines/osx/Install-Prerequisites.ps1
+++ /dev/null
@@ -1,128 +0,0 @@
-#!pwsh
-#Requires -Version 6.0
-
-<#
-.SYNOPSIS
-Installs the set of prerequisites for the macOS CI hosts.
-
-.DESCRIPTION
-Install-Prerequisites.ps1 installs all of the necessary prerequisites
-to run the vcpkg macOS CI in a vagrant virtual machine,
-skipping all prerequisites that are already installed and of the right version.
-
-.INPUTS
-None
-
-.OUTPUTS
-None
-#>
-[CmdletBinding()]
-Param()
-
-Set-StrictMode -Version 2
-
-if (-not $IsMacOS) {
-    Write-Error 'This script should only be run on a macOS host'
-    throw
-}
-
-Import-Module "$PSScriptRoot/Utilities.psm1"
-
-$Installables = Get-Content "$PSScriptRoot/configuration/installables.json" | ConvertFrom-Json
-
-$Installables.Applications | ForEach-Object {
-    $VersionCommand = $_.VersionCommand
-    $InstalledVersion = (& $VersionCommand[0] $VersionCommand[1..$VersionCommand.Length])
-    if (-not $?) {
-        Write-Host "$($_.Name) not installed; installing now"
-    } else {
-        $InstalledVersion = $InstalledVersion -join "`n"
-        if ($InstalledVersion -match $_.VersionRegex) {
-            if ($Matches.Count -ne 2) {
-                Write-Error "$($_.Name) has a malformed version regex ($($_.VersionRegex)); it should have a single capture group
-    (it has $($Matches.Count - 1))"
-                throw
-            }
-            if ($Matches[1] -eq $_.Version) {
-                Write-Host "$($_.Name) already installed and at the correct version ($($Matches[1]))"
-                return
-            } else {
-                Write-Host "$($_.Name) already installed but with the incorrect version
-    installed version: '$($Matches[1])'
-    required version : '$($_.Version)'
-upgrading now."
-            }
-        } else {
-            Write-Warning "$($_.Name)'s version command ($($VersionCommand -join ' ')) returned a value we did not expect:
-    $InstalledVersion
-    expected a version matching the regex: $($_.VersionRegex)
-Installing anyways."
-        }
-    }
-
-    if ($null -ne (Get-Member -InputObject $_ -Name 'DmgUrl')) {
-        $pathToDmg = "~/Downloads/$($_.Name).dmg"
-        Get-RemoteFile -OutFile $pathToDmg -Uri $_.DmgUrl -Sha256 $_.Sha256
-
-        hdiutil attach $pathToDmg -mountpoint /Volumes/setup-installer
-
-        if ($null -ne (Get-Member -InputObject $_ -Name 'InstallationCommands')) {
-            $_.InstallationCommands | % {
-                Write-Host "> $($_ -join ' ')"
-                & $_[0] $_[1..$_.Length] | Write-Host
-            }
-        } elseif ($null -ne (Get-Member -InputObject $_ -Name 'InstallerPath')) {
-            sudo installer -pkg "/Volumes/setup-installer/$($_.InstallerPath)" -target /
-            hdiutil detach /Volumes/setup-installer
-        } else {
-            Write-Error "$($_.Name) installer object has a DmgUrl, but neither an InstallerPath nor an InstallationCommands"
-            throw
-        }
-    } elseif ($null -ne (Get-Member -InputObject $_ -Name 'PkgUrl')) {
-        $pathToPkg = "~/Downloads/$($_.Name).pkg"
-        Get-RemoteFile -OutFile $pathToPkg -Uri $_.PkgUrl -Sha256 $_.Sha256
-
-        sudo installer -pkg $pathToPkg -target /
-    } else {
-        Write-Error "$($_.Name) does not have an installer in the configuration file."
-        throw
-    }
-}
-
-$installedVagrantPlugins = @{}
-vagrant plugin list --machine-readable | ForEach-Object {
-    $timestamp, $target, $type, $data = $_ -split ','
-    switch ($type) {
-        # these are not important
-        'ui' { }
-        'plugin-version-constraint' { }
-        'plugin-name' {
-            $installedVagrantPlugins[$data] = $Null
-        }
-        'plugin-version' {
-            $version = $data -replace '%!\(VAGRANT_COMMA\)',','
-            if ($version -notmatch '^(.*), global') {
-                Write-Error "Invalid version string for plugin ${target}: $version"
-                throw
-            }
-            $installedVagrantPlugins[$target] = $Matches[1]
-        }
-        default {
-            Write-Warning "Unknown plugin list member type $type for plugin $target"
-        }
-    }
-}
-$Installables.VagrantPlugins | ForEach-Object {
-    if (-not $installedVagrantPlugins.Contains($_.Name)) {
-        Write-Host "$($_.Name) not installed; installing now"
-    } elseif ($installedVagrantPlugins[$_.Name] -ne $_.Version) {
-        Write-Host "$($_.Name) already installed but with the incorrect version
-    installed version: '$($installedVagrantPlugins[$_.Name])'
-    required version:  '$($_.Version)'"
-    } else {
-        Write-Host "$($_.Name) already installed and at the correct version ($($_.Version))"
-        return
-    }
-
-    vagrant plugin install $_.Name --plugin-version $_.Version
-}
diff --git a/external_imported/vcpkg/scripts/azure-pipelines/osx/README.md b/external_imported/vcpkg/scripts/azure-pipelines/osx/README.md
index 9dffe7249..98a4f1284 100644
--- a/external_imported/vcpkg/scripts/azure-pipelines/osx/README.md
+++ b/external_imported/vcpkg/scripts/azure-pipelines/osx/README.md
@@ -1,181 +1,246 @@
 # `vcpkg-eg-mac` VMs
 
-## Table of Contents
+This is the checklist for what the vcpkg team does when updating the macOS machines in the pool.
+
+## Creating new base images
+
+### Prerequisites
+
+- [ ] A Parallels license for amd64 or [macosvm](https://github.com/s-u/macosvm) allow-listed
+  by macOS for arm64. Note that the directory 'Parallels' is still used when using `macosvm`
+  just so that scripts know where to find the VM and friends.
+- [ ] An Xcode installer - you can get this from Apple's developer website,
+  although you'll need to sign in first: <https://developer.apple.com/downloads>  
+  If you are doing this from a local macos box, you can skip to the "update the macos host" step.  
+  If copying from a local box to one of the macOS machines, you can use scp:
+    ```sh
+    scp Command_Line_Tools_for_Xcode_15.dmg vcpkg@<DNS of the machine>:/Users/vcpkg/clt.dmg
+    ```
+
+### Instructions (AMD64)
+
+- [ ] Go to https://dev.azure.com/vcpkg/public/_settings/agentqueues , pick the current osx queue,
+      and delete one of the agents that are idle.
+- [ ] Go to that machine in the KVM. (Passwords are stored as secrets in the CPP_GITHUB\vcpkg\vcpkgmm-passwords key vault)
+- [ ] Open a terminal and destroy any old vagrant VMs or boxes
+    ```sh
+    cd ~/vagrant
+    vagrant halt
+    vagrant destroy
+    vagrant box list
+    vagrant box remove <any boxes listed by previous command>
+    brew remove hashicorp-vagrant
+    ```
+- [ ] Open the Parallels Control Center, and delete the active VM.
+- [ ] Update the macos host
+- [ ] Update or install parallels
+- [ ] Download the macOS installer from the app store. See https://support.apple.com/en-us/102662  
+      Note: This portion of the instructions is that which breaks most often depending on what Parallels and macOS are doing.
+      You might need to use `softwareupdate --fetch-full-installer --full-installer-version 14.2` and point Parallels
+      at that resulting installer in 'Applications' instead.
+- [ ] Run parallels, and select that installer you just downloaded. Name the VM "vcpkg-osx-<DATE>-amd64", for example "vcpkg-osx-2024-01-18-amd64".
+- [ ] When creating the VM, customize the hardware to the following:
+    * 12 processors
+    * 24000 MB of memory
+    * 350 GB disk
+    * Do not share mac camera
+- [ ] Install MacOS like you would on real hardware.
+    * Apple ID: 'Set Up Later' / Skip
+    * Account name: vcpkg
+    * Account password: vcpkg
+- [ ] Install Parallels Tools
+- [ ] Restart the VM
+- [ ] Change the desktop background to a solid color
+- [ ] Enable remote login in System Settings -> General -> Sharing -> Remote Login
+- [ ] Shut down the VM cleanly
+- [ ] Set the VM 'Isolated'
+- [ ] Update the Azure Agent URI in setup-box.sh to the current version. You can find this by going to the agent pool, selecting "New agent", picking macOS, and copying the link. For example https://vstsagentpackage.azureedge.net/agent/3.232.0/vsts-agent-osx-x64-3.232.0.tar.gz
+- [ ] In the guest, set the vcpkg user to be able to use sudo without a password:
+    ```sh
+    printf 'vcpkg\tALL=(ALL)\tNOPASSWD:\tALL\n' | sudo tee -a '/etc/sudoers.d/vcpkg'
+    sudo chmod 0440 '/etc/sudoers.d/vcpkg'
+    ```
+- [ ] Copy setup-guest, setup-box.sh, and the xcode installer renamed to 'clt.dmg' to the host, and run setup-guest.sh. For example:
+    ```sh
+    scp ./setup-guest.sh vcpkg@MACHINE:/Users/vcpkg/Downloads
+    scp ./setup-box.sh vcpkg@MACHINE:/Users/vcpkg/Downloads
+    scp path/to/console/tools.dmg vcpkg@MACHINE:/Users/vcpkg/Downloads/clt.dmg
+    ssh vcpkg@MACHINE
+    cd /Users/vcpkg/Downloads
+    chmod +x ./setup-guest.sh
+    ./setup-guest.sh
+    exit
+    ```
+- [ ] Shut down the VM cleanly.
+- [ ] In Parallels control center, right click the VM and select "Prepare for Transfer"
+- [ ] In Parallels control center, right click the VM and remove it, but "Keep Files"
+- [ ] Copy the packaged VM to Azure Storage, with something like:
+    ```sh
+    ssh vcpkg@MACHINE
+    brew install azcopy
+    azcopy copy ~/Parallels/vcpkg-macos-2024-01-18-amd64.pvmp "https://vcpkgimageminting...../pvms?<SAS>"
+    azcopy copy ~/Parallels/vcpkg-macos-2024-01-18-amd64.sha256.txt "https://vcpkgimageminting...../pvms?<SAS>"
+    ```
+- [ ] Go to https://dev.azure.com/vcpkg/public/_settings/agentqueues and create a new self hosted Agent pool named `PrOsx-YYYY-MM-DD` based on the current date. Check 'Grant access permission to all pipelines.'
+- [ ] Remove the macOS installer from Applications
+- [ ] Follow the "Deploying images" steps below for each machine in the fleet.
+
+### Instructions (ARM64)
+
+- [ ] Go to https://dev.azure.com/vcpkg/public/_settings/agentqueues , pick the current osx queue,
+      and delete one of the agents that are idle.
+- [ ] Go to that machine in the KVM. (Passwords are stored as secrets in the CPP_GITHUB\vcpkg\vcpkgmm-passwords key vault)
+- [ ] Update the macos host
+- [ ] (Once only) install `macosvm` to `~` (this tarball is also backed up in our `vcpkg-image-minting` storage account):
+    ```sh
+    curl -L -o macosvm-0.2-1-arm64-darwin21.tar.gz https://github.com/s-u/macosvm/releases/download/0.2-1/macosvm-0.2-1-arm64-darwin21.tar.gz
+    tar xvf macosvm-0.2-1-arm64-darwin21.tar.gz
+    rm macosvm-0.2-1-arm64-darwin21.tar.gz
+    ```
+- [ ] Download the matching `.ipsw` for the macOS copy to install. See https://mrmacintosh.com/apple-silicon-m1-full-macos-restore-ipsw-firmware-files-database/ ; links there to find the .ipsw. Example: https://updates.cdn-apple.com/2024WinterFCS/fullrestores/042-78241/B45074EB-2891-4C05-BCA4-7463F3AC0982/UniversalMac_14.3_23D56_Restore.ipsw
+- [ ] Determine the VM name using the form "vcpkg-osx-<date>-arm64", for example "vcpkg-osx-2024-01-22-arm64".
+- [ ] Open a terminal and run the following commands to create the VM with vcpkg-osx-2024-01-22-arm64 and UniversalMac_14.3_23D56_Restore.ipsw replaced as appropriate.
+    ```sh
+    mkdir -p ~/Parallels/vcpkg-osx-2024-01-22-arm64
+    cd ~/Parallels/vcpkg-osx-2024-01-22-arm64
+    ~/macosvm --disk disk.img,size=500g --aux aux.img -c 8 -r 12g --restore ~/UniversalMac_14.3_23D56_Restore.ipsw ./vm.json
+    ~/macosvm -g ./vm.json
+    ```
+- [ ] Follow prompts as you would on real hardware.
+    * Apple ID: 'Set Up Later' / Skip
+    * Account name: vcpkg
+    * Account password: vcpkg
+    * No location services
+    * Yes send crash reports
+- [ ] Set the desktop wallpaper to a fixed color from Settings -> Wallpaper . (This makes the KVM a lot easier to use :) )
+- [ ] Enable remote login in the VM: Settings -> General -> Sharing -> Remote Login
+- [ ] Set the vcpkg user to be able to use sudo without a password:
+    ```sh
+    ssh -o StrictHostKeychecking=no vcpkg@vcpkgs-Virtual-Machine.local
+    printf 'vcpkg\tALL=(ALL)\tNOPASSWD:\tALL\n' | sudo tee -a '/etc/sudoers.d/vcpkg'
+    sudo chmod 0440 '/etc/sudoers.d/vcpkg'
+    exit
+    ```
+- [ ] Update the Azure Agent URI in setup-box.sh to the current version. You can find this by going to the agent pool, selecting "New agent", picking macOS, and copying the link. For example https://vstsagentpackage.azureedge.net/agent/3.232.1/vsts-agent-osx-arm64-3.232.1.tar.gz
+- [ ] Copy setup-box.sh and the xcode installer renamed to 'clt.dmg' to the host. For example from a dev workstation:
+    ```sh
+    scp ./setup-guest.sh vcpkg@MACHINE:/Users/vcpkg
+    scp ./setup-box.sh vcpkg@MACHINE:/Users/vcpkg
+    scp path/to/console/tools.dmg vcpkg@MACHINE:/Users/vcpkg/clt.dmg
+    ssh vcpkg@MACHINE
+    chmod +x setup-guest.sh
+    ./setup-guest.sh
+    rm setup-guest.sh
+    rm setup-box.sh
+    ```
+- [ ] Shut down the VM cleanly.
+- [ ] Remove the VM in Parallels Control Center, and 'Keep Files'
+- [ ] Mint a SAS token to vcpkgimageminting/pvms with read, add, create, write, and list permissions.
+- [ ] Open a terminal on the host and package the VM into a tarball:
+    ```sh
+    cd ~/Parallels
+    aa archive -d vcpkg-osx-<date>-arm64 -o vcpkg-osx-<date>-arm64.aar -enable-holes
+    brew install azcopy
+    azcopy copy vcpkg-osx-<date>-arm64.aar "https://vcpkgimageminting.blob.core.windows.net/pvms?<SAS>"
+    rm *.aar
+    ```
+- [ ] Go to https://dev.azure.com/vcpkg/public/_settings/agentqueues and create a new self hosted Agent pool named `PrOsx-YYYY-MM-DD-arm64` based on the current date. Check 'Grant access permission to all pipelines.'
+- [ ] Follow the "Deploying images" steps below for each machine in the fleet.
+
+## Deploying images
+
+### Running the VM (AMD64)
+
+Run these steps on each machine to add to the fleet. Skip steps that were done implicitly above if this machine was used to build a box.
+
+- [ ] If this machine was used before, delete it from the pool of which it is a member from https://dev.azure.com/vcpkg/public/_settings/agentqueues
+- [ ] Log in to the machine using the KVM.
+- [ ] Open a terminal and destroy any old vagrant VMs or boxes
+    ```sh
+    $ cd ~/vagrant
+    $ vagrant halt
+    $ vagrant destroy
+    $ vagrant box list
+    $ vagrant box remove <any boxes listed by previous command except the one to use>
+    $ brew remove hashicorp-vagrant
+    ```
+- [ ] Check for software updates in macOS system settings
+- [ ] Check for software updates in Parallels' UI
+- [ ] Mint a SAS token URI to the box to use from the Azure portal if you don't already have one, and download the VM. (Recommend running this via SSH from domain joined machine due to containing SAS tokens)
+    ```sh
+    brew install azcopy
+    cd ~/Parallels
+    azcopy copy "https://vcpkgimageminting.blob.core.windows.net/pvms/vcpkg-osx-<DATE>-amd64.pvmp?<SAS>" .
+    azcopy copy "https://vcpkgimageminting.blob.core.windows.net/pvms/vcpkg-osx-<DATE>-amd64.sha256.txt?<SAS>" .
+    ```
+- [ ] Open the .pvmp in Parallels, and unpack it.
+- [ ] Start the VM
+- [ ] [grab a PAT][] if you don't already have one
+- [ ] Copy the guest deploy script to the host, and run it with a first parameter of your PAT
+    ```sh
+    scp ./register-guest.sh vcpkg@MACHINE:/Users/vcpkg
+    ssh vcpkg@MACHINE
+    chmod +x /Users/vcpkg/register-guest.sh
+    /Users/vcpkg/register-guest.sh <PAT>
+    ```
+- [ ] Open a terminal window on the host and run the agent
+    ```
+    ssh -i ~/Parallels/*/id_guest -o StrictHostKeychecking=no vcpkg@`prlctl list --full | sed -nr 's/^.*running *([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}).*/\1/p'`
+    ~/myagent/run.sh
+    ```
+- [ ] Check that the machine shows up in the pool, and lock the vcpkg user on the host.
+- [ ] Lock the screen on the host.
+- [ ] Update the "vcpkg Macs" spreadsheet line for the machine with the new pool.
 
-- [`vcpkg-eg-mac` VMs](#vcpkg-eg-mac-vms)
-  - [Table of Contents](#table-of-contents)
-  - [Basic Usage](#basic-usage)
-    - [Creating a new Vagrant box](#creating-a-new-vagrant-box)
-      - [VM Software Versions](#vm-software-versions)
-    - [Creating a New Azure Agent Pool](#creating-a-new-azure-agent-pool)
-    - [Running the VM](#running-the-vm)
-  - [Getting an Azure Pipelines PAT](#getting-an-azure-pipelines-pat)
-  - [Setting up a new macOS machine](#setting-up-a-new-macos-machine)
-  - [Troubleshooting](#troubleshooting)
-  - [(Internal) Accessing the macOS fileshare](#internal-accessing-the-macos-fileshare)
-
-## Basic Usage
-
-The most common operation here is to set up a new VM for Azure
-pipelines; we try to make that operation as easy as possible.
-It should take all of three steps, assuming the machine is
-already set up (or read [these instructions] for how to set up a machine):
-
-1. [Create a new vagrant box](#creating-a-new-vagrant-box)
-2. [Create a new agent pool](#creating-a-new-azure-agent-pool)
-3. [Setup and run the vagrant VM](#running-the-vm)
-4. Update `azure-pipelines.yml` and `azure-pipelines-osx.yml` to point to the new macOS pool.
-
-[these instructions]: #setting-up-a-new-macos-machine
-
-### Creating a new Vagrant box
-
-Whenever we want to install updated versions of the command line tools,
-or of macOS, we need to create a new vagrant box.
-This is pretty easy, but the results of the creation are not public,
-since we're concerned about licensing.
-However, if you're sure you're following Apple's licensing,
-you can set up your own vagrant boxes that are the same as ours by doing the following:
-
-You'll need some prerequisites:
-
-- An Xcode installer - you can get this from Apple's developer website,
-  although you'll need to sign in first: <https://developer.apple.com/downloads>
-- The software installed by `Install-Prerequisites.ps1`
-
-If you're updating the CI pool, make sure you update macOS.
-
-First, you'll need to create a base VM;
-this is where you determine what version of macOS is installed.
-Follow the Parallels process for creating a macOS VM; this involves
-updating to whatever version, and then scrolling right until you find
-"Install macOS from recovery partition".
-
-Once you've done this, you can run through the installation of macOS onto a new VM.
-You should set the username to `vagrant`.
-
-Once it's finished installing, make sure to turn on the SSH server.
-Open System Preferences, then go to Sharing > Remote Login,
-and turn it on.
-You'll then want to add the vagrant SSH keys to the VM's vagrant user.
-Open the terminal application and run the following:
-
-```sh
-$ # basic stuff
-$ date | sudo tee '/etc/vagrant_box_build_time'
-$ printf 'vagrant\tALL=(ALL)\tNOPASSWD:\tALL\n' | sudo tee -a '/etc/sudoers.d/vagrant'
-$ sudo chmod 0440 '/etc/sudoers.d/vagrant'
-$ # then install vagrant keys
-$ mkdir -p ~/.ssh
-$ curl -fsSL 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' >~/.ssh/authorized_keys
-$ chmod 0600 ~/.ssh/authorized_keys
-```
-
-Finally, you'll need to install the Parallel Tools.
-From your host, in the top bar,
-go to Actions > Install Parallels Tools...,
-and then follow the instructions.
-
-Now, let's package the VM into a base box.
-(The following instructions are adapted from
-[these official instructions][base-box-instructions]).
-
-Run the following commands:
-
-```sh
-$ cd ~/Parallels
-$ echo '{ "provider": "parallels" }' >metadata.json
-$ tar zcvf <macos version>.box ./metadata.json ./<name of VM>.pvm
-```
-
-This will create a box file which contains all the necessary data.
-You can delete the `metadata.json` file after.
-
-Once you've done that, you can upload it to the fileshare,
-under `share/boxes/macos-base`, add it to `share/boxes/macos-base.json`,
-and finally add it to vagrant:
-
-```sh
-$ vagrant box add ~/vagrant/share/boxes/macos-base.json
-```
-
-Then, we'll create the final box,
-which contains all the necessary programs for doing CI work.
-Copy `configuration/Vagrantfile-box.rb` as `Vagrantfile`, and
-`configuration/vagrant-box-configuration.json`
-into a new directory; into that same directory,
-download the Xcode command line tools dmg, and name it `clt.dmg`.
-Then, run the following in that directory:
-
-```sh
-$ vagrant up
-$ vagrant package
-```
-
-This will create a `package.box`, which is the box file for the base VM.
-Once you've created this box, if you're making it the new box for the CI,
-upload it to the fileshare, under `share/boxes/macos-ci`.
-Then, add the metadata about the box (the name and version) to
-`share/boxes/macos-ci.json`.
-Once you've done that, add the software versions under [VM Software Versions](#vm-software-versions).
-
-[base-box-instructions]: https://parallels.github.io/vagrant-parallels/docs/boxes/base.html
-
-#### VM Software Versions
-
-* 2022-02-04 (minor update to 2022-01-03)
-  * macOS: 12.1
-  * Xcode CLTs: 13.2
-* 2022-01-03:
-  * macOS: 12.1
-  * Xcode CLTs: 13.2
-* 2021-07-27:
-  * macOS: 11.5.1
-  * Xcode CLTs: 12.5.1
-* 2021-04-16:
-  * macOS: 11.2.3
-  * Xcode CLTs: 12.4
-* 2020-09-28:
-  * macOS: 10.15.6
-  * Xcode CLTs: 12
-
-### Creating a New Azure Agent Pool
-
-When updating the macOS machines to a new version, you'll need to create
-a new agent pool for the machines to join. The standard for this is to
-name it `PrOsx-YYYY-MM-DD`, with `YYYY-MM-DD` the day that the process
-is started.
-
-In order to create a new agent pool, go to the `vcpkg/public` project;
-go to `Project settings`, then go to `Agent pools` under `Pipelines`.
-Add a new self-hosted pool, name it as above, and make certain to check
-the box for "Grant access permission to all pipelines".
-
-Once you've done this, you are done; you can start adding new machines
-to the pool!
-
-### Running the VM
-
-First, make sure that your software is up to date:
-```sh
-$ cd ~/vcpkg
-$ git fetch
-$ git switch -d origin/master
-$ ./scripts/azure-pipelines/osx/Install-Prerequisites.ps1
-```
-
-as well as checking to make sure macOS is up to date.
-
-Then, follow the instructions for [accessing ~/vagrant/share][access-fileshare].
+[grab a PAT]: #getting-an-azure-pipelines-pat
 
-And finally, [grab a PAT], update the vagrant box, set up the VM, and run it:
-```sh
-$ vagrant box remove -f vcpkg/macos-ci # This won't do anything if the machine never had a box before
-$ vagrant box add ~/vagrant/share/boxes/macos-ci.json
-$ ~/vcpkg/scripts/azure-pipelines/osx/Setup-VagrantMachines.ps1 -Date <box version YYYY-MM-DD> -DevopsPat <PAT>
-$ cd ~/vagrant/vcpkg-eg-mac
-$ vagrant up # if this fails, reboot through the kvm and/or log in interactively, then come back here
-```
+### Running the VM (ARM64)
+
+Run these steps on each machine to add to the fleet. Skip steps that were done implicitly above if this machine was used to build a box.
+
+- [ ] If this machine was used before, delete it from the pool of which it is a member from https://dev.azure.com/vcpkg/public/_settings/agentqueues
+- [ ] Log in to the machine using the KVM.
+- [ ] Check for software updates in macOS system settings
+- [ ] (Once only) install `macosvm` to `~` (this tarball is also backed up in our `vcpkg-image-minting` storage account):
+    ```sh
+    curl -L -o macosvm-0.2-1-arm64-darwin21.tar.gz https://github.com/s-u/macosvm/releases/download/0.2-1/macosvm-0.2-1-arm64-darwin21.tar.gz
+    tar xvf macosvm-0.2-1-arm64-darwin21.tar.gz
+    rm macosvm-0.2-1-arm64-darwin21.tar.gz
+    ```
+- [ ] Skip if this is the image building machine. Mint a SAS token URI to the box to use from the Azure portal if you don't already have one, and download the VM. (Recommend running this via SSH from domain joined machine due to containing SAS tokens)
+    ```sh
+    mkdir -p ~/Parallels
+    cd ~/Parallels
+    azcopy copy "https://vcpkgimageminting.blob.core.windows.net/pvms/vcpkg-osx-<DATE>-arm64.aar?<SAS>" vcpkg-osx-<DATE>-arm64.aar
+    aa extract -d vcpkg-osx-<DATE>-arm64 -i ./vcpkg-osx-<DATE>-arm64.aar -enable-holes
+    ```
+- [ ] Open a separate terminal window on the host and start the VM by running:
+    ```sh
+    cd ~/Parallels/vcpkg-osx-<DATE>-arm64
+    ~/macosvm ./vm.json
+    ```
+- [ ] [grab a PAT][] if you don't already have one
+- [ ] Copy the guest deploy script to the host, and run it with a first parameter of your PAT. From a developer machine:
+    ```sh
+    scp ./register-guest.sh vcpkg@MACHINE:/Users/vcpkg
+    ssh vcpkg@MACHINE
+    chmod +x register-guest.sh
+    ./register-guest.sh <PAT>
+    rm register-guest.sh
+    exit
+    ```
+- [ ] In the KVM's terminal, relaunch the VM in ephemeral mode with:
+    ```sh
+    ~/macosvm --ephemeral ./vm.json
+    ```
+- [ ] Open a terminal window on the host and run the agent
+    ```sh
+    ssh -i ~/Parallels/*/id_guest -o StrictHostKeychecking=no vcpkg@vcpkgs-Virtual-Machine.local
+    ~/myagent/run.sh
+    ```
+- [ ] Check that the machine shows up in the pool, and lock the vcpkg user on the host.
+- [ ] Lock the screen on the host.
+- [ ] Update the "vcpkg Macs" spreadsheet line for the machine with the new pool.
 
 [grab a PAT]: #getting-an-azure-pipelines-pat
 
@@ -192,67 +257,3 @@ and give it a custom defined scope that includes the
 "Agent pools: Read & manage" permission (you'll need to "Show all scopes"
 to access this).
 You can now copy this token and use it to allow machines to join.
-
-## Setting up a new macOS machine
-
-Before anything else, one must download `brew` and `powershell`.
-
-```sh
-$ /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
-$ brew cask install powershell
-```
-
-Then, we need to download the `vcpkg` repository:
-
-```sh
-$ git clone https://github.com/microsoft/vcpkg
-```
-
-Then, we need to mint an SSH key:
-
-```sh
-$ ssh-keygen
-$ cat .ssh/id_rsa.pub
-```
-
-Add that SSH key to `authorized_keys` on the file share machine with the base box.
-
-Next, install prerequisites:
-```sh
-$ cd vcpkg/scripts/azure-pipelines/osx
-$ ./Install-Prerequisites.ps1 -Force
-```
-
-And finally, make sure you can [access ~/vagrant/share][access-fileshare].
-
-## Troubleshooting
-
-The following are issues that we've run into:
-
-- (with a Parallels box) `vagrant up` doesn't work, and vagrant gives the error that the VM is `'stopped'`.
-  - Try logging into the GUI with the KVM, and retrying `vagrant up`.
-- (when running a powershell script) The error `Failed to initialize CoreCLR, HRESULT: 0x8007001F` is printed.
-  - Reboot the machine; run
-  ```sh
-  $ sudo shutdown -r now
-  ```
-  and wait for the machine to start back up. Then, start again from where the error was emitted.
-
-## (Internal) Accessing the macOS fileshare
-
-The fileshare is located on `vcpkgmm-01`, under the `fileshare` user, in the `share` directory.
-In order to get `sshfs` working on the physical machine,
-You can run `Install-Prerequisites.ps1` to grab the right software, then either:
-
-```sh
-$ mkdir -p ~/vagrant/share
-$ sshfs fileshare@vcpkgmm-01:share ~/vagrant/share
-```
-
-If you get an error, that means that gatekeeper has prevented the kernel extension from loading,
-so you'll need to access the GUI of the machine, go to System Preferences,
-Security & Privacy, General, unlock the settings,
-and allow system extensions from the osxfuse developer to run.
-Then, you'll be able to add ~/vagrant/share as an sshfs.
-
-[access-fileshare]: #internal-accessing-the-macos-fileshare
diff --git a/external_imported/vcpkg/scripts/azure-pipelines/osx/Setup-VagrantMachines.ps1 b/external_imported/vcpkg/scripts/azure-pipelines/osx/Setup-VagrantMachines.ps1
deleted file mode 100755
index eb978d42c..000000000
--- a/external_imported/vcpkg/scripts/azure-pipelines/osx/Setup-VagrantMachines.ps1
+++ /dev/null
@@ -1,126 +0,0 @@
-#!pwsh
-#Requires -Version 6.0
-
-<#
-.SYNOPSIS
-Sets up the configuration for the vagrant virtual machines.
-
-.DESCRIPTION
-Setup-VagrantMachines.ps1 sets up the virtual machines for
-vcpkg's macOS CI. It puts the VagrantFile and necessary
-configuration JSON file into ~/vagrant/vcpkg-eg-mac.
-
-.PARAMETER MachineId
-The number to give the machine; should match [0-9]{2}.
-Defaults to the numbers at the end of the machine name,
-assuming that that machine name matches `VCPKGMM-[0-9]{2}`.
-
-.PARAMETER DevopsPat
-The personal access token which has Read & Manage permissions on the ADO pool.
-
-.PARAMETER Date
-The date on which this pool is being created. Sets the default values for BoxVersion and AgentPool.
-
-.PARAMETER BoxVersion
-The version of the box to use. If -Date is passed, uses that as the version.
-
-.PARAMETER AgentPool
-The agent pool to add the machine to. If -Date is passed, uses "PrOsx-$Date" as the pool.
-
-.PARAMETER DevopsUrl
-The URL of the ADO instance; defaults to vcpkg's, which is https://dev.azure.com/vcpkg.
-
-.PARAMETER BaseName
-The base name for the vagrant VM; the machine name is $BaseName-$MachineId.
-Defaults to 'vcpkg-eg-mac'.
-
-.PARAMETER BoxName
-The name of the box to use. Defaults to 'vcpkg/macos-ci',
-which is only available internally.
-
-.INPUTS
-None
-
-.OUTPUTS
-None
-#>
-[CmdletBinding(PositionalBinding=$False, DefaultParameterSetName='DefineDate')]
-Param(
-    [Parameter(Mandatory=$False)]
-    [String]$MachineId,
-
-    [Parameter(Mandatory=$True)]
-    [String]$DevopsPat,
-
-    [Parameter(Mandatory=$True, ParameterSetName='DefineDate')]
-    [String]$Date,
-
-    [Parameter(Mandatory=$True, ParameterSetName='DefineVersionAndAgentPool')]
-    [String]$BoxVersion,
-
-    [Parameter(Mandatory=$True, ParameterSetName='DefineVersionAndAgentPool')]
-    [String]$AgentPool,
-
-    [Parameter(Mandatory=$False)]
-    [String]$DevopsUrl = 'https://dev.azure.com/vcpkg',
-
-    [Parameter()]
-    [String]$BaseName = 'vcpkg-eg-mac',
-
-    [Parameter()]
-    [String]$BoxName = 'vcpkg/macos-ci'
-)
-
-Set-StrictMode -Version 2
-
-if (-not $IsMacOS) {
-    throw 'This script should only be run on a macOS host'
-}
-
-if (-not [String]::IsNullOrEmpty($Date)) {
-    $BoxVersion = $Date
-    $AgentPool = "PrOsx-$Date"
-}
-
-if ([String]::IsNullOrEmpty($MachineId)) {
-    $hostname = hostname -s
-    if ($hostname -match '^VCPKGMM-([0-9]{2})$') {
-        $MachineId = $matches[1]
-    } else {
-        Write-Error "Hostname ($hostname) does not match the expected format (VCPKGMM-NN). Please pass -MachineId in order to give the VM a number."
-    }
-}
-
-if (Test-Path '~/vagrant/vcpkg-eg-mac') {
-    Write-Host 'Deleting existing directories'
-
-    Push-Location '~/vagrant/vcpkg-eg-mac'
-    vagrant destroy -f
-    if (-not $?) {
-        throw "Failed to destroy vagrant VM."
-    }
-    Pop-Location
-
-    Remove-Item -Recurse -Force -LiteralPath '~/vagrant/vcpkg-eg-mac' | Out-Null
-}
-
-Write-Host 'Creating new directories'
-if (-not (Test-Path -Path '~/vagrant')) {
-    New-Item -ItemType 'Directory' -Path '~/vagrant' | Out-Null
-}
-New-Item -ItemType 'Directory' -Path '~/vagrant/vcpkg-eg-mac' | Out-Null
-
-Copy-Item `
-    -Path "$PSScriptRoot/configuration/Vagrantfile-vm.rb" `
-    -Destination '~/vagrant/vcpkg-eg-mac/Vagrantfile'
-
-$configuration = @{
-    pat = $DevopsPat
-    agent_pool = $AgentPool
-    devops_url = $DevopsUrl
-    machine_name = "${BaseName}-${MachineId}"
-    box_name = $BoxName
-    box_version = $BoxVersion
-}
-ConvertTo-Json -InputObject $configuration -Depth 5 `
-    | Set-Content -Path '~/vagrant/vcpkg-eg-mac/vagrant-configuration.json'
diff --git a/external_imported/vcpkg/scripts/azure-pipelines/osx/Utilities.psm1 b/external_imported/vcpkg/scripts/azure-pipelines/osx/Utilities.psm1
deleted file mode 100644
index 620ec7f4b..000000000
--- a/external_imported/vcpkg/scripts/azure-pipelines/osx/Utilities.psm1
+++ /dev/null
@@ -1,90 +0,0 @@
-#Requires -Version 6.0
-Set-StrictMode -Version 2
-
-<#
-.SYNOPSIS
-Returns whether the specified command exists in the current environment.
-
-.DESCRIPTION
-Get-CommandExists takes a string as a parameter,
-and returns whether it exists in the current environment;
-either a function, alias, or an executable in the path.
-It's somewhat equivalent to `which`.
-
-.PARAMETER Name
-Specifies the name of the command which may or may not exist.
-
-.INPUTS
-System.String
-    The name of the command.
-
-.OUTPUTS
-System.Boolean
-    Whether the command exists.
-#>
-function Get-CommandExists
-{
-    [CmdletBinding()]
-    [OutputType([Boolean])]
-    Param(
-        [Parameter(ValueFromPipeline)]
-        [String]$Name
-    )
-
-    $null -ne (Get-Command -Name $Name -ErrorAction SilentlyContinue)
-}
-
-<#
-.SYNOPSIS
-Downloads a file and checks its hash.
-
-.DESCRIPTION
-Get-RemoteFile takes a URI and a hash,
-downloads the file at that URI to OutFile,
-and checks that the hash of the downloaded file.
-It then returns a FileInfo object corresponding to the downloaded file.
-
-.PARAMETER OutFile
-Specifies the file path to download to.
-
-.PARAMETER Uri
-The URI to download from.
-
-.PARAMETER Sha256
-The expected SHA256 of the downloaded file.
-
-.INPUTS
-None
-
-.OUTPUTS
-System.IO.FileInfo
-    The FileInfo for the downloaded file.
-#>
-function Get-RemoteFile
-{
-    [CmdletBinding(PositionalBinding=$False)]
-    [OutputType([System.IO.FileInfo])]
-    Param(
-        [Parameter(Mandatory=$True)]
-        [String]$OutFile,
-        [Parameter(Mandatory=$True)]
-        [String]$Uri,
-        [Parameter(Mandatory=$True)]
-        [String]$Sha256
-    )
-
-    Invoke-WebRequest -OutFile $OutFile -Uri $Uri
-    $actualHash = Get-FileHash -Algorithm SHA256 -Path $OutFile
-
-    if ($actualHash.Hash -ne $Sha256) {
-        throw @"
-Invalid hash for file $OutFile;
-    expected: $Sha256
-    found:    $($actualHash.Hash)
-Please make sure that the hash in the powershell file is correct.
-"@
-    }
-
-    Get-Item $OutFile
-}
-
diff --git a/external_imported/vcpkg/scripts/azure-pipelines/osx/azure-pipelines.yml b/external_imported/vcpkg/scripts/azure-pipelines/osx/azure-pipelines.yml
index 332144e56..5a02b92d2 100644
--- a/external_imported/vcpkg/scripts/azure-pipelines/osx/azure-pipelines.yml
+++ b/external_imported/vcpkg/scripts/azure-pipelines/osx/azure-pipelines.yml
@@ -7,6 +7,12 @@ parameters:
     displayName: 'Custom SHA of vcpkg-tool to use rather than bootstrap'
     type: string
     default: 'use default'
+  - name: triplet
+    type: string
+    default: 'x64-osx'
+  - name: jobName
+    type: string
+    default: 'x64_osx'
   - name: poolName
     type: string
   - name: tripletPattern
@@ -15,8 +21,8 @@ parameters:
     default: ''
 
 jobs:
-- job: x64_osx
-  condition: contains('^x64-osx$', '${{ parameters.tripletPattern }}')
+- job: ${{ parameters.jobName }}
+  condition: and(succeeded(), contains('^${{ parameters.triplet }}$', '${{ parameters.tripletPattern }}'))
   pool:
     name: ${{ parameters.poolName }}
   workspace:
@@ -24,9 +30,9 @@ jobs:
   timeoutInMinutes: 2880 # 2 days
   variables:
   - name: WORKING_ROOT
-    value: /Users/vagrant/Data
+    value: /Users/vcpkg/Data
   - name: VCPKG_DOWNLOADS
-    value: /Users/vagrant/Data/downloads
+    value: /Users/vcpkg/Data/downloads
   - group: vcpkg-binary-caching-credentials
   - name: X_VCPKG_BINARY_SOURCE_STUB
     value: "x-azblob,$(root-bin-url),$(sas-bin)" # not in eastasia due to physical location
@@ -43,9 +49,7 @@ jobs:
   - bash: ./bootstrap-vcpkg.sh
     displayName: 'Bootstrap vcpkg'
     condition: eq('use default', '${{ parameters.vcpkgToolSha }}')
-  - bash: |
-      brew install cmake
-      ./scripts/azure-pipelines/bootstrap-from-source.sh ${{ parameters.vcpkgToolSha }}
+  - bash: ./scripts/azure-pipelines/bootstrap-from-source.sh ${{ parameters.vcpkgToolSha }}
     displayName: "Build vcpkg with CMake"
     condition: ne('use default', '${{ parameters.vcpkgToolSha }}')
   - task: PowerShell@2
@@ -54,7 +58,7 @@ jobs:
       failOnStderr: true
       filePath: 'scripts/azure-pipelines/test-modified-ports.ps1'
       arguments: >
-        -Triplet "x64-osx"
+        -Triplet ${{ parameters.triplet }}
         -BuildReason "$(Build.Reason)"
         -BinarySourceStub "${{ variables.X_VCPKG_BINARY_SOURCE_STUB }}"
         -WorkingRoot "${{ variables.WORKING_ROOT }}"
@@ -64,23 +68,23 @@ jobs:
     displayName: 'Publish Artifact: failure logs for x64-osx'
     inputs:
       PathtoPublish: '$(Build.ArtifactStagingDirectory)/failure-logs'
-      ArtifactName: 'failure logs for x64-osx${{ variables.Postfix }}'
+      ArtifactName: 'failure logs for ${{ parameters.triplet }}'
     condition: ne(variables['FAILURE_LOGS_EMPTY'], 'True')
-  - bash: python3 scripts/file_script.py /Users/vagrant/Data/installed/vcpkg/info/
+  - bash: python3 scripts/file_script.py /Users/vcpkg/Data/installed/vcpkg/info/
     displayName: 'Build a file list for all packages'
     condition: always()
   - task: PublishBuildArtifacts@1
-    displayName: 'Publish Artifact: file lists for x64-osx${{ variables.Postfix }}'
+    displayName: 'Publish Artifact: file lists for ${{ parameters.triplet }}'
     condition: always()
     inputs:
       PathtoPublish: scripts/list_files
-      ArtifactName: 'file lists for x64-osx${{ variables.Postfix }}'
+      ArtifactName: 'file lists for ${{ parameters.triplet }}'
   - task: PublishTestResults@2
     displayName: 'Publish Test Results'
     condition: ne(variables['XML_RESULTS_FILE'], '')
     inputs:
-      testRunTitle: x64-osx
+      testRunTitle: ${{ parameters.triplet }}
       testResultsFormat: xUnit
       testResultsFiles: $(XML_RESULTS_FILE)
-      platform: x64-osx
+      platform: ${{ parameters.triplet }}
       configuration: static
diff --git a/external_imported/vcpkg/scripts/azure-pipelines/osx/configuration/Vagrantfile-box.rb b/external_imported/vcpkg/scripts/azure-pipelines/osx/configuration/Vagrantfile-box.rb
deleted file mode 100644
index cbe76a720..000000000
--- a/external_imported/vcpkg/scripts/azure-pipelines/osx/configuration/Vagrantfile-box.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require 'json'
-
-configuration = JSON.parse(File.read("#{__dir__}/vagrant-box-configuration.json"))
-
-Vagrant.configure('2') do |config|
-  config.vm.box = 'vcpkg/macos-base'
-  config.vm.synced_folder '.', '/Users/vagrant/shared'
-
-  config.vm.provision 'shell',
-    run: 'once',
-    name: 'Install Xcode Command Line Tools: attach dmg file',
-    inline: 'hdiutil attach shared/clt.dmg -mountpoint /Volumes/setup-installer',
-    privileged: false
-  config.vm.provision 'shell',
-    run: 'once',
-    name: 'Install Xcode Command Line Tools: run installer',
-    inline: 'installer -pkg "/Volumes/setup-installer/Command Line Tools.pkg" -target /',
-    privileged: true
-  config.vm.provision 'shell',
-    run: 'once',
-    name: 'Install XCode Command Line Tools: detach dmg file',
-    inline: 'hdiutil detach /Volumes/setup-installer',
-    privileged: false
-
-  config.vm.provision 'shell',
-    run: 'once',
-    name: 'Install brew',
-    inline: '/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"',
-    privileged: false
-  config.vm.provision 'shell',
-    run: 'once',
-    name: 'Install brew applications',
-    inline: "brew install #{configuration['brew'].join(' ')} && brew install --cask #{configuration['brew-cask'].join(' ')}",
-    privileged: false
-end
diff --git a/external_imported/vcpkg/scripts/azure-pipelines/osx/configuration/Vagrantfile-vm.rb b/external_imported/vcpkg/scripts/azure-pipelines/osx/configuration/Vagrantfile-vm.rb
deleted file mode 100644
index 0b2df0219..000000000
--- a/external_imported/vcpkg/scripts/azure-pipelines/osx/configuration/Vagrantfile-vm.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-require 'json'
-
-configuration = JSON.parse(File.read("#{__dir__}/vagrant-configuration.json"))
-
-server = {
-  :machine_name => configuration['machine_name'],
-  :box => configuration['box_name'],
-  :box_version => configuration['box_version'],
-  :ram => 24000,
-  :cpu => 11
-}
-
-azure_agent_url = 'https://vstsagentpackage.azureedge.net/agent/2.198.3/vsts-agent-osx-x64-2.198.3.tar.gz'
-devops_url = configuration['devops_url']
-agent_pool = configuration['agent_pool']
-pat = configuration['pat']
-
-Vagrant.configure('2') do |config|
-  config.vm.box = server[:box]
-  config.vm.box_version = server[:box_version]
-  config.vm.synced_folder '.', '/vagrant', disabled: true
-
-  config.vm.provider 'parallels' do |prl|
-    prl.memory = server[:ram]
-    prl.cpus = server[:cpu]
-  end
-
-  config.vm.provision 'shell',
-    run: 'once',
-    name: 'Create the data directory',
-    inline: "mkdir ~/Data",
-    privileged: false
-
-  config.vm.provision 'shell',
-    run: 'once',
-    name: 'Download azure agent',
-    inline: "curl -s -o ~/Downloads/azure-agent.tar.gz #{azure_agent_url}",
-    privileged: false
-
-  config.vm.provision 'shell',
-    run: 'once',
-    name: 'Unpack azure agent',
-    inline: 'mkdir myagent; cd myagent; tar xf ~/Downloads/azure-agent.tar.gz',
-    privileged: false
-
-  config.vm.provision 'shell',
-    run: 'once',
-    name: 'Add VM to azure agent pool',
-    inline: "cd ~/myagent;\
-      ./config.sh --unattended \
-        --url #{devops_url} \
-        --work ~/Data/work \
-        --auth pat --token #{pat} \
-        --pool #{agent_pool} \
-        --agent #{server[:machine_name]} \
-        --replace \
-        --acceptTeeEula",
-    privileged: false
-
-  # Start listening for jobs
-  config.vm.provision 'shell',
-    run: 'always',
-    name: 'Start running azure pipelines',
-    inline: 'cd /Users/vagrant/myagent;\
-      nohup ./run.sh&',
-    privileged: false
-end
diff --git a/external_imported/vcpkg/scripts/azure-pipelines/osx/configuration/installables.json b/external_imported/vcpkg/scripts/azure-pipelines/osx/configuration/installables.json
deleted file mode 100644
index 3ae97f355..000000000
--- a/external_imported/vcpkg/scripts/azure-pipelines/osx/configuration/installables.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "$schema": "./installables.schema.json",
-
-  "Applications": [
-    {
-      "Name": "vagrant",
-      "VersionCommand": [ "vagrant", "-v" ],
-      "VersionRegex": "Vagrant (.*)",
-      "Version": "2.2.19",
-      "DmgUrl": "https://releases.hashicorp.com/vagrant/2.2.19/vagrant_2.2.19_x86_64.dmg",
-      "Sha256": "6307BE217813A11C9E106448BF232803031E434A08C8B2DF8C62FDC9E8543845",
-      "InstallerPath": "vagrant.pkg"
-    },
-    {
-      "Name": "Parallels",
-      "VersionCommand": [ "cat", "/Applications/Parallels Desktop.app/Contents/Info.plist" ],
-      "VersionRegex": "<key>CFBundleShortVersionString</key>[\\n\\t ]*<string>([0-9.]+)</string>",
-      "Version": "17.1.1",
-      "DmgUrl": "https://download.parallels.com/desktop/v17/17.1.1-51537/ParallelsDesktop-17.1.1-51537.dmg",
-      "Sha256": "BD7BE2DF4D1B3508C127CF1D9C1EF93CDDA63384BCF3893A77FBC9F1169765A9",
-      "InstallationCommands": [
-        [ "bash", "-c", "ps x | grep 'Parallels Desktop' | grep -v 'grep' | sed -E 's/^ *([0-9]+).*(\\/Applications.*)$/\\1: \\2/'" ],
-        [ "bash", "-c", "ps x | grep 'Parallels Desktop' | grep -v 'grep' | sed -E 's/^ *([0-9]+).*$/\\1/' | xargs -p kill" ],
-        [ "sudo", "rm", "-rf", "/Applications/Parallels Desktop.app" ],
-        [ "sudo", "cp", "-r", "/Volumes/setup-installer/Parallels Desktop.app", "/Applications" ],
-        [ "sudo", "/Applications/Parallels Desktop.app/Contents/MacOS/inittool2", "init", "-b", "/Applications/Parallels Desktop.app" ]
-      ]
-    },
-    {
-      "Name": "osxfuse",
-      "VersionCommand": [ "cat", "/Library/Filesystems/macfuse.fs/Contents/version.plist" ],
-      "VersionRegex": "<key>CFBundleVersion</key>[\\n\\t ]*<string>([0-9.]+)</string>",
-      "Version": "4.2.4",
-      "DmgUrl": "https://github.com/osxfuse/osxfuse/releases/download/macfuse-4.2.4/macfuse-4.2.4.dmg",
-      "Sha256": "82A2C30B3A7BF56AA2755C0C192FB50D9EECC3FE42505AB4E8679B50306188BD",
-      "InstallerPath": "Install macFUSE.pkg"
-    },
-    {
-      "Name": "sshfs",
-      "VersionCommand": [ "sshfs", "--version" ],
-      "VersionRegex": "SSHFS version [0-9.]* \\(OSXFUSE SSHFS (.*)\\)",
-      "Version": "2.5.0",
-      "PkgUrl": "https://github.com/osxfuse/sshfs/releases/download/osxfuse-sshfs-2.5.0/sshfs-2.5.0.pkg",
-      "Sha256": "F8F4F71814273EA42DBE6CD92199F7CFF418571FFD1B10C0608878D3472D2162"
-    }
-  ],
-  "VagrantPlugins": [
-    {
-      "Name": "vagrant-parallels",
-      "Version": "2.2.4"
-    }
-  ]
-}
diff --git a/external_imported/vcpkg/scripts/azure-pipelines/osx/configuration/installables.schema.json b/external_imported/vcpkg/scripts/azure-pipelines/osx/configuration/installables.schema.json
deleted file mode 100644
index 6237243c2..000000000
--- a/external_imported/vcpkg/scripts/azure-pipelines/osx/configuration/installables.schema.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft-07/schema",
-  "type": "object",
-  "definitions": {
-    "sha256": {
-      "type": "string",
-      "pattern": "[A-Z0-9]{64}"
-    }
-  },
-  "required": [
-    "Applications",
-    "VagrantPlugins"
-  ],
-  "properties": {
-    "Applications": {
-      "type": "array",
-      "items": {
-        "type": "object",
-        "properties": {
-          "Name": {
-            "type": "string"
-          },
-          "VersionCommand": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            },
-            "minItems": 1
-          },
-          "VersionRegex": {
-            "type": "string",
-            "format": "regex"
-          },
-          "Version": {
-            "type": "string"
-          },
-          "DmgUrl": {
-            "type": "string",
-            "format": "uri"
-          },
-          "Sha256": {
-            "$ref": "#/definitions/sha256"
-          },
-          "InstallerPath": {
-            "type": "string"
-          }
-        }
-      }
-    },
-    "VagrantPlugins": {
-      "type": "array",
-      "items": {
-        "type": "object",
-        "required": [ "Name", "Version" ],
-        "properties": {
-          "Name": {
-            "type": "string"
-          },
-          "Version": {
-            "type": "string"
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/external_imported/vcpkg/scripts/azure-pipelines/osx/configuration/vagrant-box-configuration.json b/external_imported/vcpkg/scripts/azure-pipelines/osx/configuration/vagrant-box-configuration.json
deleted file mode 100644
index 75cb83719..000000000
--- a/external_imported/vcpkg/scripts/azure-pipelines/osx/configuration/vagrant-box-configuration.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "$schema": "./vagrant-box-configuration.schema.json",
-  "brew": [
-    "autoconf-archive",
-    "autoconf",
-    "automake",
-    "bison",
-    "cmake",
-    "gettext",
-    "gfortran",
-    "gperf",
-    "gtk-doc",
-    "libtool",
-    "meson",
-    "mono",
-    "nasm",
-    "ninja",
-    "pkg-config",
-    "texinfo",
-    "yasm"
-  ],
-  "brew-cask": [
-    "powershell"
-  ]
-}
diff --git a/external_imported/vcpkg/scripts/azure-pipelines/osx/configuration/vagrant-box-configuration.schema.json b/external_imported/vcpkg/scripts/azure-pipelines/osx/configuration/vagrant-box-configuration.schema.json
deleted file mode 100644
index 80845f70f..000000000
--- a/external_imported/vcpkg/scripts/azure-pipelines/osx/configuration/vagrant-box-configuration.schema.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft-07/schema",
-  "type": "object",
-  "required": [
-    "brew",
-    "brew-cask"
-  ],
-  "properties": {
-    "brew": {
-      "type": "array",
-      "items": { "type": "string" }
-    },
-    "brew-cask": {
-      "type": "array",
-      "items": { "type": "string" }
-    }
-  }
-}
diff --git a/external_imported/vcpkg/scripts/azure-pipelines/osx/configuration/vagrant-configuration.schema.json b/external_imported/vcpkg/scripts/azure-pipelines/osx/configuration/vagrant-configuration.schema.json
deleted file mode 100644
index 91540d77c..000000000
--- a/external_imported/vcpkg/scripts/azure-pipelines/osx/configuration/vagrant-configuration.schema.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2019-09/schema",
-
-  "type": "object",
-
-  "required": [
-    "pat",
-    "agent_pool",
-    "devops_url",
-    "machine_name",
-    "box_name",
-    "box_version"
-  ],
-
-  "properties": {
-    "pat": {
-      "type": "string"
-    },
-    "agent_pool": {
-      "type": "string"
-    },
-    "devops_url": {
-      "type": "string"
-    },
-    "machine_name": {
-      "type": "string"
-    },
-    "box_name": {
-      "type": "string"
-    },
-    "box_version": {
-      "type": "string"
-    }
-  }
-}
diff --git a/external_imported/vcpkg/scripts/azure-pipelines/osx/register-guest.sh b/external_imported/vcpkg/scripts/azure-pipelines/osx/register-guest.sh
new file mode 100644
index 000000000..5448a6ff6
--- /dev/null
+++ b/external_imported/vcpkg/scripts/azure-pipelines/osx/register-guest.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+if [ -z "$1" ]; then
+    echo "PAT missing"
+    exit 1
+fi
+export AGENT=`hostname | sed -nr 's/([^.]+).+/\1/p'`
+if [ `uname -m` = 'arm64' ]; then
+export POOL=`echo ~/Parallels/* | sed -nr 's/\/Users\/vcpkg\/Parallels\/vcpkg-osx-([0-9]{4}-[0-9]{2}-[0-9]{2})-arm64/PrOsx-\1-arm64/p'`
+# on arm64, DNS works
+export SSH_COOKIE=vcpkg@vcpkgs-Virtual-Machine.local
+else
+export POOL=`echo ~/Parallels/*.pvm | sed -nr 's/\/Users\/vcpkg\/Parallels\/vcpkg-osx-([0-9]{4}-[0-9]{2}-[0-9]{2})-amd64\.pvm/PrOsx-\1/p'`
+# on amd64, DNS does not work, but luckily for us prlctl does know the IP
+export GUEST_IP=`prlctl list --full | sed -nr 's/^.*running *([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}).*/\1/p'`
+export SSH_COOKIE=vcpkg@$GUEST_IP
+fi
+ssh $SSH_COOKIE -i ~/Parallels/*/id_guest -o StrictHostKeychecking=no "~/myagent/config.sh --unattended --url https://dev.azure.com/vcpkg --work ~/Data/work --auth pat --token $1 --pool $POOL --agent $AGENT --replace --acceptTeeEula"
+if [ `uname -m` = 'arm64' ]; then
+ssh $SSH_COOKIE -i ~/Parallels/*/id_guest -o StrictHostKeychecking=no "sudo shutdown -h now"
+fi
diff --git a/external_imported/vcpkg/scripts/azure-pipelines/osx/setup-box.sh b/external_imported/vcpkg/scripts/azure-pipelines/osx/setup-box.sh
new file mode 100644
index 000000000..104decf87
--- /dev/null
+++ b/external_imported/vcpkg/scripts/azure-pipelines/osx/setup-box.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+hdiutil attach clt.dmg -mountpoint /Volumes/setup-installer
+sudo installer -pkg "/Volumes/setup-installer/Command Line Tools.pkg" -target /
+hdiutil detach /Volumes/setup-installer
+rm clt.dmg
+/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+if [ `uname -m` = 'arm64' ]; then
+    (echo; echo 'eval "$(/opt/homebrew/bin/brew shellenv)"') >> /Users/vcpkg/.zprofile
+    eval "$(/opt/homebrew/bin/brew shellenv)"
+else
+    (echo; echo 'eval "$(/usr/local/bin/brew shellenv)"') >> /Users/vcpkg/.zprofile
+    eval "$(/usr/local/bin/brew shellenv)"
+fi
+brew install autoconf-archive autoconf automake bison cmake gettext gfortran gperf gtk-doc libtool meson mono nasm ninja pkg-config powershell texinfo yasm
+mkdir ~/Data
+if [ `uname -m` = 'arm64' ]; then
+curl -s -o ~/Downloads/azure-agent.tar.gz https://vstsagentpackage.azureedge.net/agent/3.232.1/vsts-agent-osx-arm64-3.232.1.tar.gz
+else
+curl -s -o ~/Downloads/azure-agent.tar.gz https://vstsagentpackage.azureedge.net/agent/3.232.1/vsts-agent-osx-x64-3.232.1.tar.gz
+fi
+mkdir ~/myagent
+tar xf ~/Downloads/azure-agent.tar.gz -C ~/myagent
+rm ~/Downloads/azure-agent.tar.gz
+rm setup-box.sh
diff --git a/external_imported/vcpkg/scripts/azure-pipelines/osx/setup-guest.sh b/external_imported/vcpkg/scripts/azure-pipelines/osx/setup-guest.sh
new file mode 100644
index 000000000..73e55aa90
--- /dev/null
+++ b/external_imported/vcpkg/scripts/azure-pipelines/osx/setup-guest.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+export VM_DIRECTORY=`ls ~/Parallels | grep vcpkg-osx`
+export SSH_KEY="$HOME/Parallels/$VM_DIRECTORY/id_guest"
+export SSH_PUBLIC_KEY="$SSH_KEY.pub"
+ssh-keygen -P '' -f "$SSH_KEY"
+if [ `uname -m` = 'arm64' ]; then
+# on arm64, prlctl does not know the IP address, but luckily for us DNS works
+export SSH_COOKIE=vcpkg@vcpkgs-Virtual-Machine.local
+else
+# on amd64, DNS does not work, but luckily for us prlctl does know the IP
+export GUEST_IP=`prlctl list --full | sed -nr 's/^.*running *([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}).*/\1/p'`
+export SSH_COOKIE=vcpkg@$GUEST_IP
+fi
+echo Type 'vcpkg' and press enter
+ssh-copy-id -o StrictHostKeychecking=no -i "$SSH_PUBLIC_KEY" $SSH_COOKIE
+echo Keys deployed
+ssh $SSH_COOKIE -o StrictHostKeychecking=no -i "$SSH_KEY" echo hello from \`hostname\`
+scp -o StrictHostKeychecking=no -i "$SSH_KEY" ./setup-box.sh $SSH_COOKIE:/Users/vcpkg/setup-box.sh
+ssh $SSH_COOKIE -o StrictHostKeychecking=no -i "$SSH_KEY" chmod +x /Users/vcpkg/setup-box.sh
+ssh $SSH_COOKIE  -o StrictHostKeychecking=no -i "$SSH_KEY" /Users/vcpkg/setup-box.sh
diff --git a/external_imported/vcpkg/scripts/azure-pipelines/patch-tuesday-checklist.md b/external_imported/vcpkg/scripts/azure-pipelines/patch-tuesday-checklist.md
new file mode 100644
index 000000000..e03ea634e
--- /dev/null
+++ b/external_imported/vcpkg/scripts/azure-pipelines/patch-tuesday-checklist.md
@@ -0,0 +1,40 @@
+## First time machine setup:
+* [ ] Install Azure PowerShell: https://docs.microsoft.com/en-us/powershell/azure/install-az-ps
+* [ ] Run `Connect-AzAccount -Subscription CPP_GITHUB`
+* [ ] Install Docker
+
+## Each Patch Tuesday:
+* [ ] Check for depends:vm-update PRs and make relevant changes if possible.
+* [ ] Check for Service 360 alerts (possibly at https://aka.ms/s360 ?) against the service named
+      "C++ VCPKG Validation" about vulnerable software we are installing in the VMs and update that.
+      (Most often PowerShell needs to be updated)
+* [ ] Check for any other software for the Windows images we wish to update and make the edits to do
+      so in `scripts/azure-pipelines/windows`
+* [ ] Run android/create-docker-image.ps1
+* [ ] Update azure-pipelines.yml to point to the new linux docker image from Azure Container Registry
+* [ ] Run windows/create-image.ps1
+* [ ] Run windows/create-vmss.ps1
+* [ ] Create new pools for these in Azure DevOps: https://dev.azure.com/vcpkg/public/_settings/agentqueues
+    * Windows: 22 agents
+    * Make sure to check 'Grant access permission to all pipelines'
+* [ ] Update azure-pipelines.yml to point to the new pools.
+* [ ] Submit PR with those changes.
+* [ ] Submit a full CI rebuild with those changes: https://dev.azure.com/vcpkg/public/_build?definitionId=29  
+      refs/pull/NUMBER/head
+* [ ] Look at that and compare with recent build and resolve anything that's not an existing baseline issue.
+* [ ] Merge the PR.
+* [ ] Update the managed image for compiler testing and delete unused images.
+     * CPP_GITHUB\vcpkg-image-minting\PrWinEA
+     * Standard HDD LRS
+         * East Asia, 1 Replica
+         * West US 2, 1 Replica
+         * West US 3, 1 Replica
+* [ ] After the last build finishes on the previous pool, delete it in the Azure Devops *Organization* UI and its Resource Group. ( https://dev.azure.com/vcpkg/_settings/agentpools ?)
+* [ ] Run `generate-sas-tokens.ps1 -KeyNumber N`, where N is whether the month is even
+      (Jan = 1, Feb = 2, Mar = 1, and so on) and update the relevant libraries on
+      dev.azure.com/vcpkg and devdiv.visualstudio.com
+* [ ] After builds using previous SAS tokens complete, run `roll-sas-tokens.ps1 -KeyNumber N` where
+      this N is the other key. (Jan = 2, Feb = 1, Mar = 2, and so on)
+* [ ] Mint a new macOS base box.  (See instructions in `scripts/azure-pipelines/osx/README.md`)
+* [ ] Deploy the new base box to all hosts.
+* [ ] Update the software on the CTI's machine #12 to match.
diff --git a/external_imported/vcpkg/scripts/azure-pipelines/roll-sas-tokens.ps1 b/external_imported/vcpkg/scripts/azure-pipelines/roll-sas-tokens.ps1
new file mode 100644
index 000000000..5968a4da3
--- /dev/null
+++ b/external_imported/vcpkg/scripts/azure-pipelines/roll-sas-tokens.ps1
@@ -0,0 +1,15 @@
+
+Param(
+    [Parameter(Mandatory=$true)]
+    [int]$KeyNumber
+)
+
+$keyName = "key$KeyNumber"
+
+# Asset Cache:
+New-AzStorageAccountKey -ResourceGroupName vcpkg-asset-cache -StorageAccountName vcpkgassetcacheeastasia -KeyName $keyName
+
+# Binary Cache:
+New-AzStorageAccountKey -ResourceGroupName vcpkg-binary-cache -StorageAccountName vcpkgbinarycache -KeyName $keyName
+New-AzStorageAccountKey -ResourceGroupName vcpkg-binary-cache -StorageAccountName vcpkgbinarycacheeastasia -KeyName $keyName
+New-AzStorageAccountKey -ResourceGroupName vcpkg-binary-cache -StorageAccountName vcpkgbinarycachewus3 -KeyName $keyName
diff --git a/external_imported/vcpkg/scripts/azure-pipelines/test-modified-ports.ps1 b/external_imported/vcpkg/scripts/azure-pipelines/test-modified-ports.ps1
index 55a05aef3..05e193ed4 100755
--- a/external_imported/vcpkg/scripts/azure-pipelines/test-modified-ports.ps1
+++ b/external_imported/vcpkg/scripts/azure-pipelines/test-modified-ports.ps1
@@ -53,7 +53,8 @@ Param(
     $BinarySourceStub = $null,
     [String]$BuildReason = $null,
     [switch]$NoParentHashes = $false,
-    [switch]$PassingIsPassing = $false
+    [switch]$PassingIsPassing = $false,
+    [switch]$IsLinuxHost = $false
 )
 
 if (-Not ((Test-Path "triplets/$Triplet.cmake") -or (Test-Path "triplets/community/$Triplet.cmake"))) {
@@ -70,10 +71,9 @@ if ((-Not [string]::IsNullOrWhiteSpace($ArchivesRoot))) {
     $BinarySourceStub = "files,$ArchivesRoot"
 }
 
-$env:VCPKG_DOWNLOADS = Join-Path $WorkingRoot 'downloads'
-$buildtreesRoot = Join-Path $WorkingRoot 'buildtrees'
+$buildtreesRoot = Join-Path $WorkingRoot 'b'
 $installRoot = Join-Path $WorkingRoot 'installed'
-$packagesRoot = Join-Path $WorkingRoot 'packages'
+$packagesRoot = Join-Path $WorkingRoot 'p'
 
 $commonArgs = @(
     "--x-buildtrees-root=$buildtreesRoot",
@@ -104,11 +104,11 @@ if ([string]::IsNullOrWhiteSpace($BinarySourceStub)) {
     $cachingArgs += @("--binarysource=clear;$BinarySourceStub,$binaryCachingMode")
 }
 
-if ($Triplet -eq 'x64-linux') {
+if ($IsLinuxHost) {
     $env:HOME = '/home/agent'
     $executableExtension = [string]::Empty
 }
-elseif ($Triplet -eq 'x64-osx') {
+elseif ($Triplet -eq 'x64-osx' -or $Triplet -eq 'arm64-osx') {
     $executableExtension = [string]::Empty
 }
 else {
@@ -136,6 +136,8 @@ if ($LASTEXITCODE -ne 0)
 $parentHashes = @()
 if (($BuildReason -eq 'PullRequest') -and -not $NoParentHashes)
 {
+    $headBaseline = Get-Content "$PSScriptRoot/../ci.baseline.txt" -Raw
+
     # Prefetch tools for better output
     foreach ($tool in @('cmake', 'ninja', 'git')) {
         & "./vcpkg$executableExtension" fetch $tool
@@ -145,17 +147,25 @@ if (($BuildReason -eq 'PullRequest') -and -not $NoParentHashes)
         }
     }
 
-    Write-Host "Determining parent hashes using HEAD~1"
-    $parentHashesFile = Join-Path $ArtifactStagingDirectory 'parent-hashes.json'
-    $parentHashes = @("--parent-hashes=$parentHashesFile")
+    Write-Host "Comparing with HEAD~1"
     & git revert -n -m 1 HEAD | Out-Null
-    # The vcpkg.cmake toolchain file is not part of ABI hashing,
-    # but changes must trigger at least some testing.
-    Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake"
-    Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake-user"
-    & "./vcpkg$executableExtension" ci "--triplet=$Triplet" --dry-run "--ci-baseline=$PSScriptRoot/../ci.baseline.txt" @commonArgs --no-binarycaching "--output-hashes=$parentHashesFile"
-
-    Write-Host "Running CI using parent hashes"
+    $parentBaseline = Get-Content "$PSScriptRoot/../ci.baseline.txt" -Raw
+    if ($parentBaseline -eq $headBaseline)
+    {
+        Write-Host "CI baseline unchanged, determining parent hashes"
+        $parentHashesFile = Join-Path $ArtifactStagingDirectory 'parent-hashes.json'
+        $parentHashes = @("--parent-hashes=$parentHashesFile")
+        # The vcpkg.cmake toolchain file is not part of ABI hashing,
+        # but changes must trigger at least some testing.
+        Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake"
+        Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake-user"
+        & "./vcpkg$executableExtension" ci "--triplet=$Triplet" --dry-run "--ci-baseline=$PSScriptRoot/../ci.baseline.txt" @commonArgs --no-binarycaching "--output-hashes=$parentHashesFile"
+    }
+    else
+    {
+        Write-Host "CI baseline was modified, not using parent hashes"
+    }
+    Write-Host "Running CI for HEAD"
     & git reset --hard HEAD
 }
 
diff --git a/external_imported/vcpkg/scripts/azure-pipelines/windows-unstable/job.yml b/external_imported/vcpkg/scripts/azure-pipelines/windows-unstable/job.yml
index a4b09cd6e..59f68d3a9 100644
--- a/external_imported/vcpkg/scripts/azure-pipelines/windows-unstable/job.yml
+++ b/external_imported/vcpkg/scripts/azure-pipelines/windows-unstable/job.yml
@@ -8,7 +8,7 @@ jobs:
     name: $(unstable-pool)
   workspace:
     clean: resources
-  timeoutInMinutes: 2880 # 2 days
+  timeoutInMinutes: 5760 # 4 days
   variables:
   - name: WORKING_ROOT
     value: D:\
diff --git a/external_imported/vcpkg/scripts/azure-pipelines/windows/azure-pipelines.yml b/external_imported/vcpkg/scripts/azure-pipelines/windows/azure-pipelines.yml
index 3caf700ef..e99758c73 100644
--- a/external_imported/vcpkg/scripts/azure-pipelines/windows/azure-pipelines.yml
+++ b/external_imported/vcpkg/scripts/azure-pipelines/windows/azure-pipelines.yml
@@ -22,7 +22,7 @@ parameters:
 
 jobs:
 - job: ${{ parameters.jobName }}
-  condition: contains('^${{ parameters.triplet }}$', '${{ parameters.tripletPattern }}')
+  condition: and(succeeded(), contains('^${{ parameters.triplet }}$', '${{ parameters.tripletPattern }}'))
   pool:
     name: ${{ parameters.poolName }}
   workspace:
diff --git a/external_imported/vcpkg/scripts/azure-pipelines/windows/deploy-pwsh.ps1 b/external_imported/vcpkg/scripts/azure-pipelines/windows/deploy-pwsh.ps1
index 75970784f..2bb6d2597 100644
--- a/external_imported/vcpkg/scripts/azure-pipelines/windows/deploy-pwsh.ps1
+++ b/external_imported/vcpkg/scripts/azure-pipelines/windows/deploy-pwsh.ps1
@@ -5,5 +5,5 @@
 
 # REPLACE WITH UTILITY-PREFIX.ps1
 
-$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.3.3/PowerShell-7.3.3-win-x64.msi'
+$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.4.1/PowerShell-7.4.1-win-x64.msi'
 InstallMSI -Url $PwshUrl -Name 'PowerShell Core'
diff --git a/external_imported/vcpkg/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 b/external_imported/vcpkg/scripts/azure-pipelines/windows/deploy-visual-studio.ps1
index 7ba3490f1..65164c310 100644
--- a/external_imported/vcpkg/scripts/azure-pipelines/windows/deploy-visual-studio.ps1
+++ b/external_imported/vcpkg/scripts/azure-pipelines/windows/deploy-visual-studio.ps1
@@ -9,14 +9,13 @@ $VisualStudioBootstrapperUrl = 'https://aka.ms/vs/17/release/vs_enterprise.exe'
 $Workloads = @(
   'Microsoft.VisualStudio.Workload.NativeDesktop',
   'Microsoft.VisualStudio.Workload.Universal',
+  'Microsoft.VisualStudio.Component.UWP.VC.ARM64',
   'Microsoft.VisualStudio.Component.VC.Tools.x86.x64',
-  'Microsoft.VisualStudio.Component.VC.Tools.ARM',
   'Microsoft.VisualStudio.Component.VC.Tools.ARM64',
+  'Microsoft.VisualStudio.Component.VC.ASAN',
   'Microsoft.VisualStudio.Component.VC.ATL',
   'Microsoft.VisualStudio.Component.VC.ATLMFC',
-  'Microsoft.VisualStudio.Component.VC.ATL.ARM',
   'Microsoft.VisualStudio.Component.VC.ATL.ARM64',
-  'Microsoft.VisualStudio.Component.VC.MFC.ARM',
   'Microsoft.VisualStudio.Component.VC.MFC.ARM64',
   "Microsoft.VisualStudio.Component.Windows11SDK.22621",
   "Microsoft.VisualStudio.Component.Windows10SDK.20348",
diff --git a/external_imported/vcpkg/scripts/boost/generate-ports.ps1 b/external_imported/vcpkg/scripts/boost/generate-ports.ps1
index e92f32be6..bd8e449af 100644
--- a/external_imported/vcpkg/scripts/boost/generate-ports.ps1
+++ b/external_imported/vcpkg/scripts/boost/generate-ports.ps1
@@ -1,7 +1,7 @@
 [CmdletBinding()]
 param (
     $libraries = @(),
-    $version = "1.81.0",
+    $version = "1.84.0",
     $portsDir = $null
 )
 
@@ -21,15 +21,13 @@ else {
     $curl = "curl"
 }
 
+# Beta builds contains a text in the version string
+$semverVersion = ($version -replace "(\d+(\.\d+){1,3}).*", "`$1")
+
 # Clear this array when moving to a new boost version
-$defaultPortVersion = 2
+$defaultPortVersion = 0
 $portVersions = @{
-    #e.g. "boost-asio" = 1;
-    "boost" = 3;
-    "boost-build" = 3;
-    "boost-locale" = 3;
-    "boost-modular-build-helper" = 4;
-    "boost-vcpkg-helpers" = 3;
+    'boost-modular-build-helper' = 2;
 }
 
 function Get-PortVersion {
@@ -38,7 +36,7 @@ function Get-PortVersion {
     )
 
     $nonDefault = $portVersions[$PortName]
-    if ($nonDefault -ne $null) {
+    if ($null -ne $nonDefault) {
         return $nonDefault
     }
 
@@ -64,7 +62,7 @@ $portData = @{
     };
     "boost-beast"            = @{ "supports" = "!emscripten" };
     "boost-fiber"            = @{
-        "supports" = "!uwp & !arm & !emscripten";
+        "supports" = "!uwp & !(arm & windows) & !emscripten";
         "features" = @{
             "numa" = @{
                 "description" = "Enable NUMA support";
@@ -94,6 +92,7 @@ $portData = @{
             };
         };
     };
+    "boost-cobalt"           = @{ "supports" = "!osx & !ios & !android" };
     "boost-context"          = @{ "supports" = "!uwp & !emscripten" };
     "boost-coroutine"        = @{ "supports" = "!(arm & windows) & !uwp & !emscripten" };
     "boost-coroutine2"       = @{ "supports" = "!emscripten" };
@@ -182,41 +181,29 @@ function GeneratePortDependency() {
     }
 }
 
-function MakePortVersionString() {
-    param (
-        [string]$PortName
-    )
-    $thisPortVersion = Get-PortVersion $PortName
-    if ($thisPortVersion -ne 0) {
-        return $version + '#' + $thisPortVersion
-    }
-
-    return $version
-}
-
 function AddBoostVersionConstraints() {
     param (
         $Dependencies = @()
     )
 
-    $updated_dependencies = @()
+    $updatedDependencies = @()
     foreach ($dependency in $Dependencies) {
         if ($dependency.Contains("name")) {
             if ($dependency.name.StartsWith("boost")) {
-                $dependency["version>="] = MakePortVersionString $dependency.name
+                $dependency["version>="] = $semverVersion
             }
         }
         else {
             if ($dependency.StartsWith("boost")) {
                 $dependency = @{
                     "name"       = $dependency
-                    "version>="  = MakePortVersionString $dependency
+                    "version>="  = $semverVersion
                 }
             }
         }
-        $updated_dependencies += $dependency
+        $updatedDependencies += $dependency
     }
-    $updated_dependencies
+    $updatedDependencies
 }
 
 function GeneratePortManifest() {
@@ -228,11 +215,16 @@ function GeneratePortManifest() {
         $Dependencies = @()
     )
     $manifest = @{
-        "`$comment"     = "Automatically generated by scripts/boost/generate-ports.ps1"
-        "name"          = $PortName
-        "version"       = $version
-        "homepage"      = $Homepage
-        "description"   = $Description
+        "`$comment"       = "Automatically generated by scripts/boost/generate-ports.ps1"
+        "name"            = $PortName
+        "homepage"        = $Homepage
+        "description"     = $Description
+    }
+    if ($version -eq $semverVersion) {
+        $manifest["version"] = $version
+    }
+    else {
+        $manifest["version-string"] = $version
     }
     if ($License) {
         $manifest["license"] += $License
@@ -317,7 +309,7 @@ function GeneratePort() {
         "vcpkg_from_github("
         "    OUT_SOURCE_PATH SOURCE_PATH"
         "    REPO boostorg/$Library"
-        "    REF boost-$version"
+        "    REF boost-`${VERSION}"
         "    SHA512 $Hash"
         "    HEAD_REF master"
     )
@@ -445,7 +437,7 @@ foreach ($library in $libraries) {
         & $curl -L "https://github.com/boostorg/$library/archive/boost-$version.tar.gz" --output "$scriptsDir/downloads/$library-boost-$version.tar.gz"
     }
     $hash = & $vcpkg --x-wait-for-lock hash $archive
-    # remove prefix "Waiting to take filesystem lock on <path>/.vcpkg-root... "
+    # Remove prefix "Waiting to take filesystem lock on <path>/.vcpkg-root... "
     if ($hash -is [Object[]]) {
         $hash = $hash[1]
     }
@@ -474,12 +466,12 @@ foreach ($library in $libraries) {
             $_ -match ' *# *include *[<"]boost\/'
         } `
         | ForEach-Object {
-            # extract path from the line
+            # Extract path from the line
             Write-Verbose "${library}: processing line: $_"
             $_ -replace " *# *include *[<`"]boost\/([a-zA-Z0-9\.\-_\/]*)[>`"].*", "`$1"
         }`
         | ForEach-Object {
-            # map the path to the library name
+            # Map the path to the library name
             Write-Verbose "${library}: processing path: $_"
             if ($_ -match "^detail\/winapi\/") { "winapi" }
             elseif ($_ -eq "detail/algorithm.hpp") { "graph" }
@@ -540,11 +532,11 @@ foreach ($library in $libraries) {
             elseif ($_ -eq "utility/enable_if.hpp") { "core" }
             elseif ($_ -eq "utility/explicit_operator_bool.hpp") { "core" }
             elseif ($_ -eq "utility/swap.hpp") { "core" }
-            # extract first directory name or file name from the path
+            # Extract first directory name or file name from the path
             else { $_ -replace "([a-zA-Z0-9\.\-_]*).*", "`$1" }
         } `
         | ForEach-Object {
-            # map directory/file name to the library name
+            # Map directory/file name to the library name
             Write-Verbose "${library}: processing name: $_"
             if ($_ -eq "current_function.hpp") { "assert" }
             elseif ($_ -eq "memory_order.hpp") { "atomic" }
@@ -580,7 +572,7 @@ foreach ($library in $libraries) {
             elseif ($_ -match "aligned_storage.hpp") { "type_traits" }
             elseif ($_ -match "unordered_map.hpp|unordered_set.hpp") { "unordered" }
             elseif ($_ -match "call_traits.hpp|compressed_pair.hpp|operators.hpp|operators_v1.hpp") { "utility" }
-            # by dafault use the name as is, just remove the file extension if available
+            # By dafault use the name as is, just remove the file extension if available
             else { $_ -replace "\.hp?p?", "" }
         } `
         | Where-Object {
@@ -588,16 +580,28 @@ foreach ($library in $libraries) {
         } `
         | Group-Object -NoElement | ForEach-Object Name
 
-        "      [known] " + $($usedLibraries | Where-Object { $foundLibraries -contains $_ })
-        "    [unknown] " + $($usedLibraries | Where-Object { $foundLibraries -notcontains $_ })
+        "  [known] " + $($usedLibraries | Where-Object { $foundLibraries -contains $_ })
+        "[unknown] " + $($usedLibraries | Where-Object { $foundLibraries -notcontains $_ })
 
         $deps = @($usedLibraries | Where-Object { $foundLibraries -contains $_ })
-        # break unnecessary dependencies
-        $deps = @($deps | ? {
+
+        # Remove optional dependencies that are only used for tests or examples
+        $deps = @($deps | Where-Object {
             -not (
+                ($library -eq 'ublas' -and $_ -eq 'compute') -or # PR #29325
                 ($library -eq 'gil' -and $_ -eq 'filesystem') # PR #20575
             )
         })
+
+        # Add dependency to the config for all libraries except the config library itself
+        if ($library -ne 'config') {
+            # Note: CMake's built-in finder (FindBoost.cmake) looks for Boost header files (boost/version.h or boost/config.h)
+            # and stores the result in the Boost_INCLUDE_DIR variable. The files boost/version.h or boost/config.h are owned by the config library.
+            # Without these files, the Boost_INCLUDE_DIR variable will not be set and the Boost version will not be detected.
+            $deps += @('config')
+            $deps = $deps | Select-Object -Unique
+        }
+
         $deps = @($deps | ForEach-Object { GeneratePortDependency $_ })
         $deps += @("boost-vcpkg-helpers")
 
@@ -665,24 +669,4 @@ if ($updateServicePorts) {
         -Description "Boost.Build" `
         -License "BSL-1.0" `
         -Dependencies @("boost-uninstall")
-
-    # Update Boost version in CMake files
-    $files_with_boost_version = @(
-        "$portsDir/boost-build/portfile.cmake",
-        "$portsDir/boost-modular-build-helper/boost-modular-build.cmake",
-        "$portsDir/boost-vcpkg-helpers/portfile.cmake"
-    )
-    $files_with_boost_version | % {
-        $content = Get-Content -LiteralPath $_ `
-            -Encoding UTF8 `
-            -Raw
-        $content = $content -replace `
-            "set\(BOOST_VERSION [0-9\.a-zA-Z]+\)", `
-            "set(BOOST_VERSION $version)"
-
-        Set-Content -LiteralPath $_ `
-            -Value $content `
-            -Encoding UTF8 `
-            -NoNewline
-    }
 }
diff --git a/external_imported/vcpkg/scripts/boost/post-build-stubs/atomic.cmake b/external_imported/vcpkg/scripts/boost/post-build-stubs/atomic.cmake
new file mode 100644
index 000000000..883c85bf2
--- /dev/null
+++ b/external_imported/vcpkg/scripts/boost/post-build-stubs/atomic.cmake
@@ -0,0 +1,2 @@
+# has_synchronization_lib.cpp is used in boost-modular-build-helper/Jamroot.jam.in
+file(COPY "${SOURCE_PATH}/config/has_synchronization_lib.cpp" DESTINATION "${CURRENT_PACKAGES_DIR}/share/boost-atomic")
\ No newline at end of file
diff --git a/external_imported/vcpkg/scripts/boost/post-source-stubs/atomic.cmake b/external_imported/vcpkg/scripts/boost/post-source-stubs/atomic.cmake
index ec5779192..832fe8538 100644
--- a/external_imported/vcpkg/scripts/boost/post-source-stubs/atomic.cmake
+++ b/external_imported/vcpkg/scripts/boost/post-source-stubs/atomic.cmake
@@ -1,5 +1,5 @@
-vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2"
-    "project.load [ path.join [ path.make $(here:D) ] ../../config/checks/architecture ]"
-    "project.load [ path.join [ path.make $(here:D) ] ../config/checks/architecture ]"
-)
-file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config")
+file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents)
+string(REPLACE "import config : requires" "import ../config/checks/config : requires" _contents "${_contents}")
+string(REPLACE "project.load [ path.join [ path.make $(here:D) ] ../../config/checks/architecture ]" "project.load [ path.join [ path.make $(here:D) ] ../config/checks/architecture ]" _contents "${_contents}")
+file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}")
+file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config")
\ No newline at end of file
diff --git a/external_imported/vcpkg/scripts/boost/post-source-stubs/cobalt.cmake b/external_imported/vcpkg/scripts/boost/post-source-stubs/cobalt.cmake
new file mode 100644
index 000000000..c3c289b68
--- /dev/null
+++ b/external_imported/vcpkg/scripts/boost/post-source-stubs/cobalt.cmake
@@ -0,0 +1,5 @@
+vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile"
+    "import ../../config/checks/config"
+    "import ../config/checks/config"
+)
+file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config")
diff --git a/external_imported/vcpkg/scripts/boost/post-source-stubs/locale.cmake b/external_imported/vcpkg/scripts/boost/post-source-stubs/locale.cmake
index 25743a842..dd2c64097 100644
--- a/external_imported/vcpkg/scripts/boost/post-source-stubs/locale.cmake
+++ b/external_imported/vcpkg/scripts/boost/post-source-stubs/locale.cmake
@@ -1,5 +1,5 @@
 vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2"
-    "import config : requires ;"
-    "import ../config/checks/config : requires ;"
+    "import config : requires"
+    "import ../config/checks/config : requires"
 )
 file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config")
diff --git a/external_imported/vcpkg/scripts/boost/post-source-stubs/log.cmake b/external_imported/vcpkg/scripts/boost/post-source-stubs/log.cmake
index fd3d495a7..f0b1ff061 100644
--- a/external_imported/vcpkg/scripts/boost/post-source-stubs/log.cmake
+++ b/external_imported/vcpkg/scripts/boost/post-source-stubs/log.cmake
@@ -1,5 +1,5 @@
 file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents)
-string(REPLACE "import ../../config/checks/config" "import ../config/checks/config" _contents "${_contents}")
+string(REPLACE "import config : requires" "import ../config/checks/config : requires" _contents "${_contents}")
 string(REPLACE " <conditional>@select-arch-specific-sources" "#<conditional>@select-arch-specific-sources" _contents "${_contents}")
 file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}")
 vcpkg_replace_string("${SOURCE_PATH}/build/log-arch-config.jam"
diff --git a/external_imported/vcpkg/scripts/boost/post-source-stubs/math.cmake b/external_imported/vcpkg/scripts/boost/post-source-stubs/math.cmake
new file mode 100644
index 000000000..52703ec1e
--- /dev/null
+++ b/external_imported/vcpkg/scripts/boost/post-source-stubs/math.cmake
@@ -0,0 +1,5 @@
+vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2"
+    "import ../../config/checks/config"
+    "import ../config/checks/config"
+)
+file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config")
diff --git a/external_imported/vcpkg/scripts/boost/post-source-stubs/serialization.cmake b/external_imported/vcpkg/scripts/boost/post-source-stubs/serialization.cmake
new file mode 100644
index 000000000..ec3ae6f5b
--- /dev/null
+++ b/external_imported/vcpkg/scripts/boost/post-source-stubs/serialization.cmake
@@ -0,0 +1,5 @@
+file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents)
+string(REPLACE "import ../../config/checks/config" "import ../config/checks/config" _contents "${_contents}")
+string(REPLACE "check-target-builds ../../config/checks//std_wstreambuf" "check-target-builds ../config/checks//std_wstreambuf" _contents "${_contents}")
+file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}")
+file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config")
diff --git a/external_imported/vcpkg/scripts/boost/post-source-stubs/stacktrace.cmake b/external_imported/vcpkg/scripts/boost/post-source-stubs/stacktrace.cmake
new file mode 100644
index 000000000..52703ec1e
--- /dev/null
+++ b/external_imported/vcpkg/scripts/boost/post-source-stubs/stacktrace.cmake
@@ -0,0 +1,5 @@
+vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2"
+    "import ../../config/checks/config"
+    "import ../config/checks/config"
+)
+file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config")
diff --git a/external_imported/vcpkg/scripts/boost/post-source-stubs/url.cmake b/external_imported/vcpkg/scripts/boost/post-source-stubs/url.cmake
index dfcdffd32..916ff6f2e 100644
--- a/external_imported/vcpkg/scripts/boost/post-source-stubs/url.cmake
+++ b/external_imported/vcpkg/scripts/boost/post-source-stubs/url.cmake
@@ -1,5 +1,5 @@
 vcpkg_replace_string("${SOURCE_PATH}/Jamfile"
-    "import ../../config/checks/config : requires ;"
-    "import config/checks/config : requires ;"
+    "import ../../config/checks/config"
+    "import config/checks/config"
 )
 file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config")
diff --git a/external_imported/vcpkg/scripts/bootstrap.ps1 b/external_imported/vcpkg/scripts/bootstrap.ps1
index 316bf59a6..e1338c7b3 100644
--- a/external_imported/vcpkg/scripts/bootstrap.ps1
+++ b/external_imported/vcpkg/scripts/bootstrap.ps1
@@ -45,7 +45,10 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root"))
 
 Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found"
 
-$versionDate = '2023-03-14'
+# Read the vcpkg-tool config file to determine what release to download
+$Config = ConvertFrom-StringData (Get-Content "$PSScriptRoot\vcpkg-tool-metadata.txt" -Raw)
+$versionDate = $Config.VCPKG_TOOL_RELEASE_TAG
+
 if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64' -or $env:PROCESSOR_IDENTIFIER -match "ARMv[8,9] \(64-bit\)") {
     & "$scriptsDir/tls12-download-arm64.exe" github.com "/microsoft/vcpkg-tool/releases/download/$versionDate/vcpkg-arm64.exe" "$vcpkgRootDir\vcpkg.exe"
 } else {
@@ -60,6 +63,8 @@ if ($LASTEXITCODE -ne 0)
     throw
 }
 
+& "$vcpkgRootDir\vcpkg.exe" version --disable-metrics
+
 if ($disableMetrics)
 {
     Set-Content -Value "" -Path "$vcpkgRootDir\vcpkg.disable-metrics" -Force
diff --git a/external_imported/vcpkg/scripts/bootstrap.sh b/external_imported/vcpkg/scripts/bootstrap.sh
index 9c0871b6a..a5140ccd4 100644
--- a/external_imported/vcpkg/scripts/bootstrap.sh
+++ b/external_imported/vcpkg/scripts/bootstrap.sh
@@ -95,7 +95,9 @@ ARCH="$(uname -m)"
 
 if [ -e /etc/alpine-release ]; then
     vcpkgUseSystem="ON"
-    vcpkgUseMuslC="ON"
+    if [ "$ARCH" = "x86_64" ]; then
+        vcpkgUseMuslC="ON"
+    fi
 fi
 
 if [ "$UNAME" = "OpenBSD" ]; then
@@ -116,36 +118,6 @@ if [ "$vcpkgUseSystem" = "ON" ]; then
     vcpkgCheckRepoTool gcc
 fi
 
-# Determine what we are going to do to bootstrap:
-# MacOS -> Download vcpkg-macos
-# Linux
-#   useMuslC -> download vcpkg-muslc
-#   amd64 -> download vcpkg-glibc
-# Otherwise
-#   Download and build from source
-
-# Choose the vcpkg binary to download
-vcpkgDownloadTool="ON"
-vcpkgToolReleaseTag="2023-03-14"
-if [ "$UNAME" = "Darwin" ]; then
-    echo "Downloading vcpkg-macos..."
-    vcpkgToolReleaseSha="1483466835306542826520b554f63c9edd9c7c202249e87fa25e0d7b24b81b1fd1deb46b7adab23c93bb81bbb71455d32a4d77e158c834e6194fbf51540f86bb"
-    vcpkgToolName="vcpkg-macos"
-elif [ "$vcpkgUseMuslC" = "ON" ]; then
-    echo "Downloading vcpkg-muslc..."
-    vcpkgToolReleaseSha="eed287d99ea524e06b9806d03edee0af65fe68be782cb54c0660e4df1a10bd68d580521aaaa32b186cd6ee2c0b309e7c5151c5a1de8bf978bd4dcc203ce0f1cc"
-    vcpkgToolName="vcpkg-muslc"
-elif [ "$ARCH" = "x86_64" ]; then
-    echo "Downloading vcpkg-glibc..."
-    vcpkgToolReleaseSha="333c5a74be1d9b2e4e9854724947b5b5d2ba56ef4b1a5cde33141156c4a8e7b18588f5a3c8a44dd8a0665758bac494f862987f5b7fb6f09e35f6f3ff54c849b4"
-    vcpkgToolName="vcpkg-glibc"
-else
-    echo "Unable to determine a binary release of vcpkg; attempting to build from source."
-    vcpkgDownloadTool="OFF"
-    vcpkgToolReleaseSha="2002d3826e359a35b34c0b75966d60abfa09d7c39472a57742ee6cea6c1341215826336e48dd845b0a33e8d1134f924eb3b0b9f516d0ea6e46b57f2ac489e270"
-fi
-
-# Do the download or build.
 vcpkgCheckEqualFileHash()
 {
     url=$1; filePath=$2; expectedHash=$3
@@ -191,8 +163,39 @@ vcpkgExtractTar()
     mv "$toPath.partial" "$toPath"
 }
 
+# Determine what we are going to do to bootstrap:
+# MacOS -> Download vcpkg-macos
+# Linux
+#   useMuslC -> download vcpkg-muslc
+#   amd64 -> download vcpkg-glibc
+# Otherwise
+#   Download and build from source
+
+# Read the vcpkg-tool config file to determine what release to download
+. "$vcpkgRootDir/scripts/vcpkg-tool-metadata.txt"
+
+vcpkgDownloadTool="ON"
+if [ "$UNAME" = "Darwin" ]; then
+    echo "Downloading vcpkg-macos..."
+    vcpkgToolReleaseSha=$VCPKG_MACOS_SHA
+    vcpkgToolName="vcpkg-macos"
+elif [ "$vcpkgUseMuslC" = "ON" ]; then
+    echo "Downloading vcpkg-muslc..."
+    vcpkgToolReleaseSha=$VCPKG_MUSLC_SHA
+    vcpkgToolName="vcpkg-muslc"
+elif [ "$ARCH" = "x86_64" ]; then
+    echo "Downloading vcpkg-glibc..."
+    vcpkgToolReleaseSha=$VCPKG_GLIBC_SHA
+    vcpkgToolName="vcpkg-glibc"
+else
+    echo "Unable to determine a binary release of vcpkg; attempting to build from source."
+    vcpkgDownloadTool="OFF"
+    vcpkgToolReleaseSha=$VCPKG_TOOL_SOURCE_SHA
+fi
+
+# Do the download or build.
 if [ "$vcpkgDownloadTool" = "ON" ]; then
-    vcpkgDownloadFile "https://github.com/microsoft/vcpkg-tool/releases/download/$vcpkgToolReleaseTag/$vcpkgToolName" "$vcpkgRootDir/vcpkg" $vcpkgToolReleaseSha
+    vcpkgDownloadFile "https://github.com/microsoft/vcpkg-tool/releases/download/$VCPKG_TOOL_RELEASE_TAG/$vcpkgToolName" "$vcpkgRootDir/vcpkg" $vcpkgToolReleaseSha
 else
     if [ "x$CXX" = "x" ]; then
         if which g++-12 >/dev/null 2>&1; then
@@ -215,13 +218,13 @@ else
         # If we can't find g++, allow CMake to do the look-up
     fi
 
-    vcpkgToolReleaseTarball="$vcpkgToolReleaseTag.tar.gz"
+    vcpkgToolReleaseTarball="$VCPKG_TOOL_RELEASE_TAG.tar.gz"
     vcpkgToolUrl="https://github.com/microsoft/vcpkg-tool/archive/$vcpkgToolReleaseTarball"
     baseBuildDir="$vcpkgRootDir/buildtrees/_vcpkg"
     buildDir="$baseBuildDir/build"
     tarballPath="$downloadsDir/$vcpkgToolReleaseTarball"
     srcBaseDir="$baseBuildDir/src"
-    srcDir="$srcBaseDir/vcpkg-tool-$vcpkgToolReleaseTag"
+    srcDir="$srcBaseDir/vcpkg-tool-$VCPKG_TOOL_RELEASE_TAG"
 
     if [ -e "$tarballPath" ]; then
         vcpkgCheckEqualFileHash "$vcpkgToolUrl" "$tarballPath" "$vcpkgToolReleaseSha"
@@ -247,6 +250,8 @@ else
     cp "$buildDir/vcpkg" "$vcpkgRootDir/"
 fi
 
+"$vcpkgRootDir/vcpkg" version --disable-metrics
+
 # Apply the disable-metrics marker file.
 if [ "$vcpkgDisableMetrics" = "ON" ]; then
     touch "$vcpkgRootDir/vcpkg.disable-metrics"
diff --git a/external_imported/vcpkg/scripts/buildsystems/msbuild/vcpkg-general.xml b/external_imported/vcpkg/scripts/buildsystems/msbuild/vcpkg-general.xml
index 32610684d..af45f5ca7 100644
--- a/external_imported/vcpkg/scripts/buildsystems/msbuild/vcpkg-general.xml
+++ b/external_imported/vcpkg/scripts/buildsystems/msbuild/vcpkg-general.xml
@@ -41,6 +41,20 @@
     </BoolProperty.DataSource>
   </BoolProperty>
 
+  <BoolProperty Name="VcpkgApplocalDeps" DisplayName="App-locally deploy DLLs" Category="General" Default="true"
+                Description="Copies DLL dependencies from the vcpkg installed tree to the project output directory.">
+    <BoolProperty.DataSource>
+      <DataSource Persistence="ProjectFile" Label="Vcpkg" HasConfigurationCondition="false" />
+    </BoolProperty.DataSource>
+  </BoolProperty>
+
+  <BoolProperty Name="VcpkgXUseBuiltInApplocalDeps" DisplayName="Use built-in app-local deployment" Category="General" Default="false"
+                Description="(experimental) When copying DLL dependencies, use built-in-to-vcpkg implementation rather than PowerShell script.">
+    <BoolProperty.DataSource>
+      <DataSource Persistence="ProjectFile" Label="Vcpkg" HasConfigurationCondition="false" />
+    </BoolProperty.DataSource>
+  </BoolProperty>
+
   <StringProperty Name="VcpkgRoot" DisplayName="Vcpkg Root" Category="General" Subtype="folder" Visible="false"
                   Description="Root path where Vcpkg is located. Be careful with changing this one. It is, for example, unable to update this property page from the new location without restarting visual studio.">
     <StringProperty.DataSource>
diff --git a/external_imported/vcpkg/scripts/buildsystems/msbuild/vcpkg.props b/external_imported/vcpkg/scripts/buildsystems/msbuild/vcpkg.props
index f728dc737..a2f8adcc8 100644
--- a/external_imported/vcpkg/scripts/buildsystems/msbuild/vcpkg.props
+++ b/external_imported/vcpkg/scripts/buildsystems/msbuild/vcpkg.props
@@ -32,8 +32,12 @@
     <VcpkgAutoLink Condition="'$(VcpkgAutoLink)' == ''">true</VcpkgAutoLink>
     <!-- Deactivate Autolinking if lld is used as a linker. (Until a better way to solve the problem is found!).
     Tried to add /lib as a parameter to the linker call but was unable to find a way to pass it as the first parameter. -->
-    <VcpkgAutoLink Condition="'$(UseLldLink)' == 'true'">false</VcpkgAutoLink>
+    <VcpkgAutoLink Condition="'$(UseLldLink)' == 'true' OR '$(PlatformToolset.ToLower())' == 'clangcl'">false</VcpkgAutoLink>
     <VcpkgApplocalDeps Condition="'$(VcpkgApplocalDeps)' == ''">true</VcpkgApplocalDeps>
+    <VcpkgXUseBuiltInApplocalDeps Condition="'$(VcpkgXUseBuiltInApplocalDeps)' == ''">false</VcpkgXUseBuiltInApplocalDeps>
+
+    <!-- Classic Mode: The following line is edited by the mint standalone bundle script to be false for standlone copies -->
+    <VcpkgEnableClassic Condition="'$(VcpkgEnableClassic)' == ''">true</VcpkgEnableClassic>
 
     <!-- Manifest files -->
     <VcpkgEnableManifest Condition="'$(VcpkgEnableManifest)' == ''">false</VcpkgEnableManifest>
diff --git a/external_imported/vcpkg/scripts/buildsystems/msbuild/vcpkg.targets b/external_imported/vcpkg/scripts/buildsystems/msbuild/vcpkg.targets
index 2217c25d0..c831b0fce 100644
--- a/external_imported/vcpkg/scripts/buildsystems/msbuild/vcpkg.targets
+++ b/external_imported/vcpkg/scripts/buildsystems/msbuild/vcpkg.targets
@@ -24,6 +24,11 @@
     <_ZVcpkgInstalledDir Condition="'$(_ZVcpkgInstalledDir)' != '' and !$(_ZVcpkgInstalledDir.EndsWith('\'))">$(_ZVcpkgInstalledDir)\</_ZVcpkgInstalledDir>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <_ZVcpkgClassicOrManifest Condition="'$(VcpkgEnabled)' == 'true' And ('$(VcpkgEnableClassic)' == 'true' Or '$(VcpkgEnableManifest)' == 'true')">true</_ZVcpkgClassicOrManifest>
+    <_ZVcpkgClassicOrManifest Condition="'$(_ZVcpkgClassicOrManifest)' == ''">false</_ZVcpkgClassicOrManifest>
+  </PropertyGroup>
+
   <!-- Special-case custom MSBuild platforms defined in the Microsoft GDK. See https://aka.ms/gdk and https://aka.ms/gdkx -->
   <PropertyGroup Condition="'$(VcpkgOSTarget)' == '' AND '$(VcpkgPlatformTarget)' == '' AND '$(Platform)'=='Gaming.Desktop.x64'">
     <VcpkgOSTarget>windows</VcpkgOSTarget>
@@ -88,7 +93,7 @@
 
     <_ZVcpkgConfigSubdir Condition="'$(_ZVcpkgNormalizedConfiguration)' == 'Debug'">debug\</_ZVcpkgConfigSubdir>
     <_ZVcpkgExecutable>$(_ZVcpkgRoot)vcpkg.exe</_ZVcpkgExecutable>
-    <ExternalIncludePath Condition="'$(VcpkgEnabled)' == 'true'">$(ExternalIncludePath);$(_ZVcpkgCurrentInstalledDir)include</ExternalIncludePath>
+    <ExternalIncludePath Condition="'$(_ZVcpkgClassicOrManifest)' == 'true'">$(ExternalIncludePath);$(_ZVcpkgCurrentInstalledDir)include</ExternalIncludePath>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -103,7 +108,7 @@
   </ItemGroup>
 
   <!-- Install settings to get headers and import libs for the currently selected _ZVcpkgCurrentInstalledDir -->
-  <ItemDefinitionGroup Condition="'$(VcpkgEnabled)' == 'true'">
+  <ItemDefinitionGroup Condition="'$(_ZVcpkgClassicOrManifest)' == 'true'">
     <Lib>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(_ZVcpkgCurrentInstalledDir)$(_ZVcpkgConfigSubdir)lib;$(_ZVcpkgCurrentInstalledDir)$(_ZVcpkgConfigSubdir)lib\manual-link</AdditionalLibraryDirectories>
     </Lib>
@@ -126,7 +131,7 @@
              Importance="High" Condition="'$(VcpkgEnableManifest)' != 'true' and '$(_ZVcpkgManifestRoot)' != ''" />
   </Target>
 
-  <Target Name="VcpkgTripletSelection" BeforeTargets="ClCompile">
+  <Target Name="VcpkgTripletSelection" BeforeTargets="ClCompile" Condition="'$(_ZVcpkgClassicOrManifest)' == 'true'">
     <Message Text="Using triplet &quot;$(VcpkgTriplet)&quot; from &quot;$(_ZVcpkgCurrentInstalledDir)&quot;"
              Importance="Normal" Condition="'$(VcpkgEnabled)' == 'true'"/>
     <Message Text="Using normalized configuration &quot;$(_ZVcpkgNormalizedConfiguration)&quot;"
@@ -158,7 +163,7 @@
     <_ZVcpkgMSBuildStampFile>$(_ZVcpkgInstalledDir).msbuildstamp-$(VcpkgTriplet).$(_ZVcpkgHostTripletSuffix)stamp</_ZVcpkgMSBuildStampFile>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(VcpkgEnabled)' == 'true'">
+  <ItemGroup Condition="'$(VcpkgEnabled)' == 'true' and '$(VcpkgEnableManifest)' == 'true' and '$(VcpkgManifestInstall)' == 'true'">
     <_ZVcpkgInstallManifestDependenciesInputs Include="$(_ZVcpkgManifestFileLocation)"/>
     <_ZVcpkgInstallManifestDependenciesInputs Include="$(_ZVcpkgConfigurationFileLocation)" Condition="Exists('$(_ZVcpkgConfigurationFileLocation)')"/>
   </ItemGroup>
@@ -177,8 +182,12 @@
           Importance="High" />
     <Exec Command="%22$(_ZVcpkgExecutable)%22 install $(_ZVcpkgHostTripletParameter) --x-wait-for-lock --triplet %22$(VcpkgTriplet)%22 --vcpkg-root %22$(_ZVcpkgRoot)\%22 %22--x-manifest-root=$(_ZVcpkgManifestRoot)\%22 %22--x-install-root=$(_ZVcpkgInstalledDir)\%22 $(VcpkgAdditionalInstallOptions)"
           StandardOutputImportance="High"
-          IgnoreStandardErrorWarningFormat="true"
-          CustomWarningRegularExpression="([Ee]rror|[Ww]arning):" />
+          StandardErrorImportance="High"
+          UseUtf8Encoding="Always"
+          StdOutEncoding="utf-8"
+          StdErrEncoding="utf-8"
+          UseCommandProcessor="false"
+          />
     <WriteLinesToFile File="$(_ZVcpkgTLogFileLocation)"
                       Lines="@(_ZVcpkgInstallManifestDependenciesInputs -> '^%(Identity)')"
                       Encoding="Unicode"
@@ -191,16 +200,33 @@
   </Target>
 
   <Target Name="AppLocalFromInstalled" AfterTargets="CopyFilesToOutputDirectory" BeforeTargets="CopyLocalFilesOutputGroup;RegisterOutput"
-          Condition="'$(VcpkgEnabled)' == 'true' and '$(VcpkgApplocalDeps)' == 'true' and '$(LinkSkippedExecution)' != 'true'">
+          Condition="'$(_ZVcpkgClassicOrManifest)' == 'true' and '$(VcpkgApplocalDeps)' == 'true' and '$(LinkSkippedExecution)' != 'true' and '@(Link)' != ''">
     <Message Text="[vcpkg] Starting VcpkgApplocalDeps" Importance="low" />
     <PropertyGroup>
-      <_ZVcpkgAppLocalPowerShellCommonArguments>-ExecutionPolicy Bypass -noprofile -File "$(MSBuildThisFileDirectory)applocal.ps1" "$(TargetPath)" "$(_ZVcpkgCurrentInstalledDir)$(_ZVcpkgConfigSubdir)bin" "$(TLogLocation)$(ProjectName).write.1u.tlog" "$(IntDir)vcpkg.applocal.log"</_ZVcpkgAppLocalPowerShellCommonArguments>
+      <_ZVcpkgApplocalInstalledBinDir>$(_ZVcpkgCurrentInstalledDir)$(_ZVcpkgConfigSubdir)bin</_ZVcpkgApplocalInstalledBinDir>
+      <_ZVcpkgApplocalTLogPath>$(TLogLocation)$(ProjectName).write.1u.tlog</_ZVcpkgApplocalTLogPath>
+      <_ZVcpkgApplocalCopiedFilesLogPath>$(IntDir)vcpkg.applocal.log</_ZVcpkgApplocalCopiedFilesLogPath>
+      <_ZVcpkgApplocalBuiltinArguments>--target-binary="$(TargetPath)" --installed-bin-dir="$(_ZVcpkgApplocalInstalledBinDir)" --tlog-file="$(_ZVcpkgApplocalTLogPath)" --copied-files-log="$(_ZVcpkgApplocalCopiedFilesLogPath)"</_ZVcpkgApplocalBuiltinArguments>
+      <_ZVcpkgAppLocalPowerShellCommonArguments>-ExecutionPolicy Bypass -noprofile -File "$(MSBuildThisFileDirectory)applocal.ps1" "$(TargetPath)" "$(_ZVcpkgApplocalInstalledBinDir)" "$(_ZVcpkgApplocalTLogPath)" "$(_ZVcpkgApplocalCopiedFilesLogPath)"</_ZVcpkgAppLocalPowerShellCommonArguments>
     </PropertyGroup>
+    <Exec
+      Condition="'$(VcpkgXUseBuiltInApplocalDeps)' == 'true'"
+      Command="%22$(_ZVcpkgExecutable)%22 z-applocal $(_ZVcpkgApplocalBuiltinArguments)"
+      UseUtf8Encoding="Always"
+      StdOutEncoding="utf-8"
+      StdErrEncoding="utf-8"
+      UseCommandProcessor="false"
+      IgnoreExitCode="true">
+      <Output TaskParameter="ExitCode"
+              PropertyName="_ZVcpkgAppLocalExitCode" />
+    </Exec>
+    <Warning Text="[vcpkg] Failed to gather app local DLL dependencies, program may not run. Set VcpkgApplocalDeps to false in your project file to suppress this warning. Builtin arguments: $(_ZVcpkgApplocalBuiltinArguments)"
+      Condition="$(_ZVcpkgAppLocalExitCode) != 0 and '$(VcpkgXUseBuiltInApplocalDeps)' == 'true'"/>
+
     <!-- Search %PATH% for pwsh.exe if it is available. -->
     <Exec
+      Condition="'$(VcpkgXUseBuiltInApplocalDeps)' != 'true'"
       Command="pwsh.exe $(_ZVcpkgAppLocalPowerShellCommonArguments)"
-      StandardOutputImportance="Normal"
-      StandardErrorImportance="Normal"
       IgnoreExitCode="true"
       UseCommandProcessor="false">
       <Output TaskParameter="ExitCode"
@@ -211,17 +237,16 @@
              Condition="$(_ZVcpkgAppLocalExitCode) == 9009" />
     <Exec
       Command="%22$(SystemRoot)\System32\WindowsPowerShell\v1.0\powershell.exe%22 $(_ZVcpkgAppLocalPowerShellCommonArguments)"
-      StandardOutputImportance="Normal"
-      StandardErrorImportance="Normal"
       IgnoreExitCode="true"
       UseCommandProcessor="false"
-      Condition="$(_ZVcpkgAppLocalExitCode) == 9009">
+      Condition="$(_ZVcpkgAppLocalExitCode) == 9009 and '$(VcpkgXUseBuiltInApplocalDeps)' != 'true'">
       <Output TaskParameter="ExitCode"
               PropertyName="_ZVcpkgAppLocalExitCode" />
     </Exec>
     <!-- We're ignoring the above exit codes, so translate into a warning if both failed. -->
     <Warning Text="[vcpkg] Failed to gather app local DLL dependencies, program may not run. Set VcpkgApplocalDeps to false in your project file to suppress this warning. PowerShell arguments: $(_ZVcpkgAppLocalPowerShellCommonArguments)"
-      Condition="$(_ZVcpkgAppLocalExitCode) != 0"/>
+      Condition="$(_ZVcpkgAppLocalExitCode) != 0 and '$(VcpkgXUseBuiltInApplocalDeps)' != 'true'"/>
+
     <ReadLinesFromFile File="$(IntDir)vcpkg.applocal.log"
       Condition="$(_ZVcpkgAppLocalExitCode) == 0">
       <Output TaskParameter="Lines" ItemName="VcpkgAppLocalDLLs" />
diff --git a/external_imported/vcpkg/scripts/buildsystems/vcpkg.cmake b/external_imported/vcpkg/scripts/buildsystems/vcpkg.cmake
index efdfdcb9b..fdd82f07c 100644
--- a/external_imported/vcpkg/scripts/buildsystems/vcpkg.cmake
+++ b/external_imported/vcpkg/scripts/buildsystems/vcpkg.cmake
@@ -56,12 +56,13 @@ if(VCPKG_PREFER_SYSTEM_LIBS)
 endif()
 
 # Manifest options and settings
+set(Z_VCPKG_MANIFEST_DIR_INITIAL_VALUE "${VCPKG_MANIFEST_DIR}")
 if(NOT DEFINED VCPKG_MANIFEST_DIR)
     if(EXISTS "${CMAKE_SOURCE_DIR}/vcpkg.json")
-        set(VCPKG_MANIFEST_DIR "${CMAKE_SOURCE_DIR}")
+        set(Z_VCPKG_MANIFEST_DIR_INITIAL_VALUE "${CMAKE_SOURCE_DIR}")
     endif()
 endif()
-set(VCPKG_MANIFEST_DIR "${VCPKG_MANIFEST_DIR}"
+set(VCPKG_MANIFEST_DIR "${Z_VCPKG_MANIFEST_DIR_INITIAL_VALUE}"
     CACHE PATH "The path to the vcpkg manifest directory." FORCE)
 
 if(DEFINED VCPKG_MANIFEST_DIR AND NOT VCPKG_MANIFEST_DIR STREQUAL "")
@@ -217,15 +218,15 @@ endif()
 #it will map those configuration to the first valid configuration in CMAKE_CONFIGURATION_TYPES or the targets IMPORTED_CONFIGURATIONS.
 #In most cases this is the debug configuration which is wrong.
 if(NOT DEFINED CMAKE_MAP_IMPORTED_CONFIG_MINSIZEREL)
-    set(CMAKE_MAP_IMPORTED_CONFIG_MINSIZEREL "MinSizeRel;Release;")
+    set(CMAKE_MAP_IMPORTED_CONFIG_MINSIZEREL "MinSizeRel;Release;None;")
     if(VCPKG_VERBOSE)
-        message(STATUS "VCPKG-Info: CMAKE_MAP_IMPORTED_CONFIG_MINSIZEREL set to MinSizeRel;Release;")
+        message(STATUS "VCPKG-Info: CMAKE_MAP_IMPORTED_CONFIG_MINSIZEREL set to MinSizeRel;Release;None;")
     endif()
 endif()
 if(NOT DEFINED CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO)
-    set(CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO "RelWithDebInfo;Release;")
+    set(CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO "RelWithDebInfo;Release;None;")
     if(VCPKG_VERBOSE)
-        message(STATUS "VCPKG-Info: CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO set to RelWithDebInfo;Release;")
+        message(STATUS "VCPKG-Info: CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO set to RelWithDebInfo;Release;None;")
     endif()
 endif()
 
@@ -267,6 +268,39 @@ else()
         set(Z_VCPKG_TARGET_TRIPLET_ARCH arm64)
     elseif(CMAKE_GENERATOR STREQUAL "Visual Studio 17 2022")
         set(Z_VCPKG_TARGET_TRIPLET_ARCH x64)
+    elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin" AND DEFINED CMAKE_OSX_ARCHITECTURES)
+        list(LENGTH CMAKE_OSX_ARCHITECTURES Z_VCPKG_OSX_ARCH_COUNT)
+        if(Z_VCPKG_OSX_ARCH_COUNT EQUAL "0")
+            message(WARNING "Unable to determine target architecture. "
+                            "Consider providing a value for the CMAKE_OSX_ARCHITECTURES cache variable. "
+                            "Continuing without vcpkg.")
+            set(VCPKG_TOOLCHAIN ON)
+            cmake_policy(POP)
+            return()
+        endif()
+
+        if(Z_VCPKG_OSX_ARCH_COUNT GREATER "1")
+            message(WARNING "Detected more than one target architecture. Using the first one.")
+        endif()
+        list(GET CMAKE_OSX_ARCHITECTURES "0" Z_VCPKG_OSX_TARGET_ARCH)
+        if(Z_VCPKG_OSX_TARGET_ARCH STREQUAL "arm64")
+            set(Z_VCPKG_TARGET_TRIPLET_ARCH arm64)
+        elseif(Z_VCPKG_OSX_TARGET_ARCH STREQUAL "arm64s")
+            set(Z_VCPKG_TARGET_TRIPLET_ARCH arm64s)
+        elseif(Z_VCPKG_OSX_TARGET_ARCH STREQUAL "armv7s")
+            set(Z_VCPKG_TARGET_TRIPLET_ARCH armv7s)
+        elseif(Z_VCPKG_OSX_TARGET_ARCH STREQUAL "armv7")
+            set(Z_VCPKG_TARGET_TRIPLET_ARCH arm)
+        elseif(Z_VCPKG_OSX_TARGET_ARCH STREQUAL "x86_64")
+            set(Z_VCPKG_TARGET_TRIPLET_ARCH x64)
+        elseif(Z_VCPKG_OSX_TARGET_ARCH STREQUAL "i386")
+            set(Z_VCPKG_TARGET_TRIPLET_ARCH x86)
+        else()
+            message(WARNING "Unable to determine target architecture, continuing without vcpkg.")
+            set(VCPKG_TOOLCHAIN ON)
+            cmake_policy(POP)
+            return()
+        endif()
     else()
         find_program(Z_VCPKG_CL cl)
         if(Z_VCPKG_CL MATCHES "amd64/cl.exe$" OR Z_VCPKG_CL MATCHES "x64/cl.exe$")
@@ -277,39 +311,6 @@ else()
             set(Z_VCPKG_TARGET_TRIPLET_ARCH arm64)
         elseif(Z_VCPKG_CL MATCHES "bin/cl.exe$" OR Z_VCPKG_CL MATCHES "x86/cl.exe$")
             set(Z_VCPKG_TARGET_TRIPLET_ARCH x86)
-        elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin" AND DEFINED CMAKE_SYSTEM_NAME AND NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-            list(LENGTH CMAKE_OSX_ARCHITECTURES Z_VCPKG_OSX_ARCH_COUNT)
-            if(Z_VCPKG_OSX_ARCH_COUNT EQUAL "0")
-                message(WARNING "Unable to determine target architecture. "
-                                "Consider providing a value for the CMAKE_OSX_ARCHITECTURES cache variable. "
-                                "Continuing without vcpkg.")
-                set(VCPKG_TOOLCHAIN ON)
-                cmake_policy(POP)
-                return()
-            endif()
-
-            if(Z_VCPKG_OSX_ARCH_COUNT GREATER "1")
-                message(WARNING "Detected more than one target architecture. Using the first one.")
-            endif()
-            list(GET CMAKE_OSX_ARCHITECTURES "0" Z_VCPKG_OSX_TARGET_ARCH)
-            if(Z_VCPKG_OSX_TARGET_ARCH STREQUAL "arm64")
-                set(Z_VCPKG_TARGET_TRIPLET_ARCH arm64)
-            elseif(Z_VCPKG_OSX_TARGET_ARCH STREQUAL "arm64s")
-                set(Z_VCPKG_TARGET_TRIPLET_ARCH arm64s)
-            elseif(Z_VCPKG_OSX_TARGET_ARCH STREQUAL "armv7s")
-                set(Z_VCPKG_TARGET_TRIPLET_ARCH armv7s)
-            elseif(Z_VCPKG_OSX_TARGET_ARCH STREQUAL "armv7")
-                set(Z_VCPKG_TARGET_TRIPLET_ARCH arm)
-            elseif(Z_VCPKG_OSX_TARGET_ARCH STREQUAL "x86_64")
-                set(Z_VCPKG_TARGET_TRIPLET_ARCH x64)
-            elseif(Z_VCPKG_OSX_TARGET_ARCH STREQUAL "i386")
-                set(Z_VCPKG_TARGET_TRIPLET_ARCH x86)
-            else()
-                message(WARNING "Unable to determine target architecture, continuing without vcpkg.")
-                set(VCPKG_TOOLCHAIN ON)
-                cmake_policy(POP)
-                return()
-            endif()
         elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64" OR
                CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "AMD64" OR
                CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "amd64")
@@ -326,6 +327,10 @@ else()
 	    set(Z_VCPKG_TARGET_TRIPLET_ARCH riscv32)
 	elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "riscv64")
 	    set(Z_VCPKG_TARGET_TRIPLET_ARCH riscv64)
+        elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "loongarch32")
+            set(Z_VCPKG_TARGET_TRIPLET_ARCH loongarch32)
+        elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "loongarch64")
+            set(Z_VCPKG_TARGET_TRIPLET_ARCH loongarch64)
         else()
             if(Z_VCPKG_CMAKE_IN_TRY_COMPILE)
                 message(STATUS "Unable to determine target architecture, continuing without vcpkg.")
@@ -359,6 +364,8 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows" OR (NOT CMAKE_SYSTEM_NAME AND CMAKE_
     endif()
 elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR (NOT CMAKE_SYSTEM_NAME AND CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD"))
     set(Z_VCPKG_TARGET_TRIPLET_PLAT freebsd)
+elseif(CMAKE_SYSTEM_NAME STREQUAL "Android" OR (NOT CMAKE_SYSTEM_NAME AND CMAKE_HOST_SYSTEM_NAME STREQUAL "Android"))
+    set(Z_VCPKG_TARGET_TRIPLET_PLAT android)
 endif()
 
 if(EMSCRIPTEN)
@@ -392,16 +399,16 @@ if(NOT Z_VCPKG_ROOT_DIR)
 endif()
 
 if(DEFINED VCPKG_INSTALLED_DIR)
-    # do nothing
+    set(Z_VCPKG_INSTALLED_DIR_INITIAL_VALUE "${VCPKG_INSTALLED_DIR}")
 elseif(DEFINED _VCPKG_INSTALLED_DIR)
-    set(VCPKG_INSTALLED_DIR "${_VCPKG_INSTALLED_DIR}")
+    set(Z_VCPKG_INSTALLED_DIR_INITIAL_VALUE "${_VCPKG_INSTALLED_DIR}")
 elseif(VCPKG_MANIFEST_MODE)
-    set(VCPKG_INSTALLED_DIR "${CMAKE_BINARY_DIR}/vcpkg_installed")
+    set(Z_VCPKG_INSTALLED_DIR_INITIAL_VALUE "${CMAKE_BINARY_DIR}/vcpkg_installed")
 else()
-    set(VCPKG_INSTALLED_DIR "${Z_VCPKG_ROOT_DIR}/installed")
+    set(Z_VCPKG_INSTALLED_DIR_INITIAL_VALUE "${Z_VCPKG_ROOT_DIR}/installed")
 endif()
 
-set(VCPKG_INSTALLED_DIR "${VCPKG_INSTALLED_DIR}"
+set(VCPKG_INSTALLED_DIR "${Z_VCPKG_INSTALLED_DIR_INITIAL_VALUE}"
     CACHE PATH
     "The directory which contains the installed libraries for each triplet" FORCE)
 set(_VCPKG_INSTALLED_DIR "${VCPKG_INSTALLED_DIR}"
@@ -519,7 +526,7 @@ if(VCPKG_MANIFEST_MODE AND VCPKG_MANIFEST_INSTALL AND NOT Z_VCPKG_CMAKE_IN_TRY_C
                 "--x-wait-for-lock"
                 "--x-manifest-root=${VCPKG_MANIFEST_DIR}"
                 "--x-install-root=${_VCPKG_INSTALLED_DIR}"
-                "${Z_VCPKG_FEATURE_FLAGS}"
+                ${Z_VCPKG_FEATURE_FLAGS}
                 ${Z_VCPKG_ADDITIONAL_MANIFEST_PARAMS}
                 ${VCPKG_INSTALL_OPTIONS}
             OUTPUT_VARIABLE Z_VCPKG_MANIFEST_INSTALL_LOGTEXT
@@ -741,7 +748,7 @@ if(X_VCPKG_APPLOCAL_DEPS_INSTALL)
                 if(last_command STREQUAL "DESTINATION" AND (modifier STREQUAL "" OR modifier STREQUAL "RUNTIME"))
                     set(destination "${arg}")
                 endif()
-                if(last_command STREQUAL "COMPONENT")
+                if(last_command STREQUAL "COMPONENT" AND (modifier STREQUAL "" OR modifier STREQUAL "RUNTIME"))
                     set(component_param "COMPONENT" "${arg}")
                 endif()
             endforeach()
@@ -877,7 +884,7 @@ set(Z_VCPKG_UNUSED "${CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY}")
 set(Z_VCPKG_UNUSED "${CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY}")
 set(Z_VCPKG_UNUSED "${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP}")
 
-# Propogate these values to try-compile configurations so the triplet and toolchain load
+# Propagate these values to try-compile configurations so the triplet and toolchain load
 if(NOT Z_VCPKG_CMAKE_IN_TRY_COMPILE)
     list(APPEND CMAKE_TRY_COMPILE_PLATFORM_VARIABLES
         VCPKG_TARGET_TRIPLET
diff --git a/external_imported/vcpkg/scripts/ci.baseline.txt b/external_imported/vcpkg/scripts/ci.baseline.txt
index 081047eb7..804f184b7 100644
--- a/external_imported/vcpkg/scripts/ci.baseline.txt
+++ b/external_imported/vcpkg/scripts/ci.baseline.txt
@@ -21,8 +21,11 @@
 ##
 ##
 ## CI tested triplets:
+##    arm64-android
 ##    arm64-windows
-##    arm-uwp
+##    arm-neon-android
+##    arm64-uwp
+##    x64-android
 ##    x64-linux
 ##    x64-osx
 ##    x64-uwp
@@ -34,21 +37,57 @@
 
 # Add new items alphabetically
 
-# Broken with CUDA 12; needs update to 3.8.3 and https://github.com/arrayfire/arrayfire/issues/3349 fixed
-arrayfire:x64-linux=fail
-# Fails with "fatal error LNK1322: cannot avoid potential ARM hazard" even with /Gy
-allegro5:arm64-windows=fail
+7zip:arm-neon-android=fail
+7zip:arm64-android=fail
+ace:arm-neon-android=fail
+ace:arm64-android=fail
+ace:x64-android=fail
+# Needs SDK (in ENV{ANDROID_HOME})
+allegro5:arm-neon-android=fail
+allegro5:arm64-android=fail
+allegro5:x64-android=fail
+ampl-asl:x64-android=fail
+apr:arm-neon-android=fail
+apr:arm64-android=fail
+apr:x64-android=fail
 # Cross compiling CI machine cannot run gen_test_char to generate apr_escape_test_char.h
 apr:arm64-windows=fail
-# broken when `python` is python3, https://github.com/microsoft/vcpkg/issues/18937
-bde:x64-linux=fail
-bitserializer:arm64-osx=fail
-blitz:x64-uwp=fail
-blitz:arm64-windows=fail
-blitz:arm-uwp=fail
+apsi:arm-neon-android=fail
+apsi:x64-android=fail
+# Broken with CUDA 12; needs update to 3.8.3 and https://github.com/arrayfire/arrayfire/issues/3349 fixed
+arrayfire:x64-linux=fail
+avro-c:arm-neon-android=fail
+avro-c:arm64-android=fail
+avro-c:x64-android=fail
+azure-identity-cpp:arm-neon-android=fail
+azure-identity-cpp:arm64-android=fail
+azure-identity-cpp:x64-android=fail
+backward-cpp:arm-neon-android=fail
+backward-cpp:arm64-android=fail
+backward-cpp:x64-android=fail
+bde:x64-linux=skip
+bento4:arm-neon-android=fail
+berkeleydb:arm-neon-android=fail
+berkeleydb:arm64-android=fail
+berkeleydb:x64-android=fail
+binlog:arm-neon-android=fail
+blitz:x64-android=fail
+blitz:x64-linux=fail # python2
+blitz:x64-osx=fail
+boinc:arm-neon-android=fail
+boinc:arm64-android=fail
+boinc:x64-android=fail
+bond:arm-neon-android=fail
+bond:arm64-android=fail
+bond:arm64-osx=fail
+bond:x64-android=fail
+bond:x64-osx=fail
 # Conflicts with openssl
+boringssl:arm-neon-android=skip
+boringssl:arm64-android=skip
 boringssl:arm64-windows=skip
-boringssl:arm-uwp=skip
+boringssl:arm64-uwp=skip
+boringssl:x64-android=skip
 boringssl:x64-linux=skip
 boringssl:x64-osx=skip
 boringssl:arm64-osx=skip
@@ -57,15 +96,18 @@ boringssl:x64-windows=skip
 boringssl:x64-windows-static=skip
 boringssl:x64-windows-static-md=skip
 boringssl:x86-windows=skip
-bond:arm-uwp=fail
-bond:x64-osx=fail
-bond:arm64-osx=fail
-bond:x64-uwp=fail
-caf:arm-uwp=fail
+brpc:x64-android=fail
+buck-yeh-bux:x64-android=fail
+c4core:arm-neon-android=fail
+c4core:arm64-android=fail
+c4core:x64-android=fail
+caf:arm-neon-android=fail
+caf:arm64-uwp=fail
+caf:arm64-android=fail
+caf:x64-android=fail
 caf:x64-uwp=fail
 caffe2:x86-windows=fail
-caffe2:arm64-windows=fail
-
+cairo:x64-android=fail
 # file conflict with dbg-macro
 c-dbg-macro:x86-windows=skip
 c-dbg-macro:x64-windows=skip
@@ -73,15 +115,18 @@ c-dbg-macro:x64-windows-static=skip
 c-dbg-macro:x64-windows-static-md=skip
 c-dbg-macro:x64-uwp=skip
 c-dbg-macro:arm64-windows=skip
-c-dbg-macro:arm-uwp=skip
+c-dbg-macro:arm64-uwp=skip
 c-dbg-macro:x64-osx=skip
 c-dbg-macro:arm64-osx=skip
 c-dbg-macro:x64-linux=skip
 
-casclib:arm-uwp=fail
+casclib:arm64-uwp=fail
 casclib:x64-uwp=fail
+catch-classic:arm-neon-android=skip
+catch-classic:arm64-android=skip
 catch-classic:arm64-windows      = skip
-catch-classic:arm-uwp            = skip
+catch-classic:arm64-uwp            = skip
+catch-classic:x64-android=skip
 catch-classic:x64-linux          = skip
 catch-classic:x64-osx            = skip
 catch-classic:arm64-osx          = skip
@@ -91,14 +136,12 @@ catch-classic:x64-windows-static = skip
 catch-classic:x64-windows-static-md=skip
 catch-classic:x86-windows        = skip
 cctag:x64-windows-static-md=fail
-cello:arm-uwp=fail
+cello:arm64-uwp=fail
 cello:x64-uwp=fail
-cfitsio:arm-uwp=fail
-cfitsio:x64-uwp=fail
 chakracore:x64-linux=skip
 # DCMTK currently has a vendored copy of libcharls.a, which causes conflicts with charls (TODO: use charls' copy)
 charls:arm64-windows=skip
-charls:arm-uwp=skip
+charls:arm64-uwp=skip
 charls:x64-linux=skip
 charls:x64-osx=skip
 charls:x64-uwp=skip
@@ -107,8 +150,11 @@ charls:x64-windows-static=skip
 charls:x64-windows-static-md=skip
 charls:x86-windows=skip
 # chartdir does not offer stable download URLs
+chartdir:arm-neon-android=fail
+chartdir:arm64-android=fail
 chartdir:arm64-windows=skip
-chartdir:arm-uwp=skip
+chartdir:arm64-uwp=skip
+chartdir:x64-android=fail
 chartdir:x64-uwp=skip
 chartdir:x64-windows-static=skip
 chartdir:x86-windows=skip
@@ -127,103 +173,139 @@ chromium-base:x64-linux=skip
 #  because the first attempt to build it fails, but subsequent attempts succeed
 chromium-base:x64-osx=skip
 
-civetweb:arm64-windows      = skip
-civetweb:arm-uwp            = skip
-civetweb:x64-uwp            = skip
 clamav:arm64-windows=fail
-clockutils:x64-linux=fail
-cmcstl2:arm64-windows      = skip
-cmcstl2:arm-uwp            = skip
-cmcstl2:x64-linux          = skip
-cmcstl2:x64-osx            = skip
-cmcstl2:x64-uwp            = skip
-cmcstl2:x64-windows        = skip
-cmcstl2:x64-windows-static = skip
-cmcstl2:x64-windows-static-md=skip
-cmcstl2:x86-windows        = skip
-coin:arm64-windows=fail
-coin:arm-uwp=fail
-coin:x64-uwp=fail
-# coinutils requires autoconf2.71 not yet available in CI
-coinutils:x64-linux=fail
-# there is an ICE in VS2022 with colmap in release mode
-colmap:x86-windows=fail
-colmap:x64-windows=fail
-colmap:x64-windows-static=fail
-colmap:x64-windows-static-md=fail
 
-concurrencpp:x64-linux=fail
-concurrencpp:x64-osx=fail
-constexpr-contracts:x64-linux=fail
-coolprop:arm-uwp=fail
-coolprop:x64-uwp=fail
-coroutine:arm-uwp=fail
-coroutine:x64-linux=fail
-coroutine:x64-uwp=fail
+# clapack is replaced by lapack-reference on the platforms lapack-reference supports
+clapack:x64-linux=skip
+clapack:x64-osx=skip
+clapack:arm64-osx=skip
+clapack:x64-windows-static=skip
+clapack:x64-windows-static-md=skip
+clapack:x64-windows=skip
+clapack:x86-windows=skip
+lapack-reference:arm64-windows=skip
+lapack-reference:arm64-uwp=skip
+lapack-reference:x64-uwp=skip
+
+clblas:arm-neon-android=fail
+clblas:arm64-android=fail
+clblas:x64-android=fail
+clockutils:arm-neon-android=fail
+clockutils:arm64-android=fail
+clockutils:x64-android=fail
+clockutils:x64-linux=fail
+clrng:arm-neon-android=fail
+cnats:arm-neon-android=fail
+cnats:arm64-android=fail
+cnats:x64-android=fail
+coin-or-ipopt:x64-linux=fail
+concurrencpp:arm-neon-android=fail
+concurrencpp:arm64-android=fail
+concurrencpp:x64-android=fail
+coroutine:arm-neon-android=fail
+coroutine:arm64-android=fail
+coroutine:x64-android=fail
+coroutine:x64-osx=fail
+coroutine:arm64-osx=fail
+cpp-ipc:arm-neon-android=fail
+cpp-ipc:arm64-android=fail
+cpp-ipc:x64-android=fail
+cppgraphqlgen:arm-neon-android=fail
+cppgraphqlgen:arm64-android=fail
+cppgraphqlgen:x64-android=fail
+cppmicroservices:arm-neon-android=fail
+cppmicroservices:arm64-android=fail
 cppmicroservices:arm64-windows=fail
-cppmicroservices:arm-uwp=fail
+cppmicroservices:arm64-uwp=fail
+cppmicroservices:x64-android=fail
 cppmicroservices:x64-uwp=fail
-cpp-netlib:arm-uwp=fail
-cpp-netlib:x64-uwp=fail
+# Requires full C++20 support, currently absent from CI for these triplets.
+cppslippi:arm-neon-android=fail
+cppslippi:arm64-android=fail
+cppslippi:x64-android=fail
+cppslippi:x64-linux=fail
+cppslippi:x64-osx=fail
+cppslippi:arm64-osx=fail
 cppcoro:x64-linux=fail
-cppcoro:arm-uwp=fail
-cppcoro:x64-uwp=fail
-# The x64-linux pipeline uses gcc 9.3.0, which lacks C++20 coroutine support.
-# This is known to work on x64-linux as of gcc 10.3.0.
-cppgraphqlgen:x64-linux=fail
-crashpad:arm-uwp=fail
-cuda:x64-osx=fail
+cpputest:arm-neon-android=fail
+crashpad:x64-linux=fail
+cserialport:arm-neon-android=fail
+cserialport:arm64-android=fail
+cserialport:x64-android=fail
+ctbench:x64-osx=fail
+ctbench:arm64-osx=fail
+czmq:arm-neon-android=fail
+czmq:arm64-android=fail
+czmq:x64-android=fail
+darknet:arm-neon-android=fail
+darknet:arm64-android=fail
+darknet:x64-android=fail
+dbg-macro:arm-neon-android=fail
+dbg-macro:arm64-android=fail
+dbg-macro:x64-android=fail
 # Since pipeline cannot automatically install dbghelp dependency, skip this detection
-dbghelp:arm-uwp=skip
+dbghelp:arm64-uwp=skip
 dbghelp:arm64-windows=skip
-dbghelp:x64-linux=fail
-dbghelp:x64-osx=fail
 dbghelp:x64-uwp=skip
 dbghelp:x64-windows-static=skip
 dbghelp:x64-windows-static-md=skip
 dbghelp:x64-windows=skip
 dbghelp:x86-windows=skip
+dcmtk:arm-neon-android=fail
+dcmtk:arm64-android=fail
+dcmtk:x64-android=fail
 dcmtk:x64-uwp=fail
+# VS2019 version 16.9.4's project system changes where PDBs are placed in a way that breaks the
+# upstream build script of this port.
+# See https://developercommunity.visualstudio.com/t/Toolset-169-regression-vcxproj-producin/1356639
+dimcli:x64-windows-static-md=fail
+dimcli:x64-windows-static=fail
 # legacy directxsdk which conflicts with dxsdk-d3dx
 directxsdk:x86-windows=skip
 directxsdk:x64-windows=skip
 directxsdk:x64-windows-static-md=skip
-discord-game-sdk:x64-windows-static=fail
-discord-game-sdk:x64-windows-static-md=fail
-discord-rpc:arm-uwp=fail
+discord-rpc:arm64-uwp=fail
 discord-rpc:x64-uwp=fail
-# requires g++11
 discordcoreapi:x64-linux=fail
-dlib:arm-uwp=fail
-dlib:x64-uwp=fail
-dmlc:arm-uwp=fail
-dmlc:x64-uwp=fail
+discordcoreapi:x64-osx=fail
+discount:x64-android=fail
 
-# requires python@2 from brew, but that no longer exists
-# python2 EOL yay!
-duktape:x64-osx=skip
-duktape:arm64-osx=skip
-
-eastl:arm-uwp=fail
-easyloggingpp:arm-uwp=fail
-easyloggingpp:x64-uwp=fail
-ebml:arm-uwp=fail
-ebml:x64-uwp=fail
+eathread:x64-android=fail
+elfio:arm-neon-android=fail
+elfio:arm64-android=fail
+elfio:x64-android=fail
 # Checks for gnu extension so only works with gcc.
+elfutils:arm-neon-android=fail
+elfutils:arm64-android=fail
+elfutils:x64-android=fail
 elfutils:x64-osx=fail
 elfutils:arm64-osx=fail
-epsilon:arm-uwp=fail
+epsilon:arm64-uwp=fail
 epsilon:x64-uwp=fail
+evpp:arm-neon-android=fail
+evpp:arm64-android=fail
+evpp:x64-android=fail
 faiss:arm64-windows=fail
-fastrtps:arm-uwp=fail
-fastrtps:x64-uwp=fail
-fastrtps:x64-windows-static=fail
+fastrtps:arm-neon-android=fail
+fastrtps:arm64-android=fail
+fastrtps:x64-android=fail
 fastrtps:x64-windows-static-md=fail
+fastrtps:x64-windows-static=fail
+fdk-aac:arm-neon-android=fail
+fdk-aac:arm64-android=fail
+fdk-aac:x64-android=fail
 flashlight-cpu:x64-linux=fail
 flashlight-cuda:x64-linux=fail
+
+flint:arm-neon-android=fail
+flint:arm64-android=fail
+flint:x64-android=fail
+fltk:arm-neon-android=fail
+fltk:arm64-android=fail
+fltk:x64-android=fail
 # fluidlite conflicts with fluidsynth; we test fluidsynth rather than fluidlite because
 # fluidlite has no dependencies and thus is less likely to be broken by another package.
-fluidlite:arm-uwp=skip
+fluidlite:arm64-uwp=skip
 fluidlite:arm64-windows=skip
 fluidlite:x64-linux=skip
 fluidlite:x64-osx=skip
@@ -233,44 +315,58 @@ fluidlite:x64-windows-static=skip
 fluidlite:x64-windows-static-md=skip
 fluidlite:x64-windows=skip
 fluidlite:x86-windows=skip
-fmi4cpp:arm-uwp=fail
+fmem:arm-neon-android=fail
+fmem:arm64-android=fail
+fmem:x64-android=fail
+fmi4cpp:arm64-uwp=fail
 fmi4cpp:x64-uwp=fail
-fontconfig:x64-uwp=fail
-fontconfig:arm-uwp=fail
-foonathan-memory:arm64-windows=fail
-foonathan-memory:arm-uwp=fail
-foonathan-memory:x64-uwp=fail
-freeglut:arm-uwp=fail
-freeglut:x64-uwp=fail
+folly:arm64-android=fail
+folly:x64-android=fail
+# Needs XQuartz
 freeglut:x64-osx=fail
+freeglut:arm64-osx=fail
 # Needs /bigobj
+freeopcua:arm-neon-android=fail
+freeopcua:arm64-android=fail
 freeopcua:arm64-windows=fail
-ftgl:x64-uwp=fail
-ftgl:arm-uwp=fail
-
+freeopcua:x64-android=fail
+fruit:arm-neon-android=fail
+fruit:arm64-android=fail
+fruit:x64-android=fail
+ftgl:arm-neon-android=fail
+ftgl:arm64-android=fail
+ftgl:x64-android=fail
+fuzzylite:arm-neon-android=fail
+fuzzylite:arm64-android=fail
+fuzzylite:x64-android=fail
+g2o:arm64-uwp=fail
+g3log:arm-neon-android=fail
+g3log:arm64-android=fail
+g3log:x64-android=fail
+gainput:arm-neon-android=fail
+gainput:arm64-android=fail
+gainput:x64-android=fail
+gamenetworkingsockets:arm-neon-android=fail
+gamenetworkingsockets:arm64-android=fail
+gamenetworkingsockets:x64-android=fail
 # VS 2022 Update 3 seems to have broken Gazebo: https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/1522474
+# gazebo is broken due it depend on old ports that already in the new versions.
+# There is an open PR that try to fix that.
 gazebo:x64-windows=fail
 gazebo:x64-linux=fail
-
-# gsoap does not offer stable public source downloads
-gsoap:x64-windows        = skip
-gsoap:x86-windows        = skip
-gsoap:x64-windows-static = skip
-gsoap:x64-windows-static-md = skip
-
-# Port geotrans source ftp://ftp.nga.mil server
-# extremely slow may take several hours to download
-geotrans:x64-linux           = skip
-geotrans:x64-windows         = skip
-geotrans:x86-windows         = skip
-getopt:arm-uwp=fail
-getopt:x64-uwp=fail
-gflags:arm-uwp=fail
-gflags:x64-uwp=fail
-
+gazebo:x86-windows=fail
+gdk-pixbuf:arm-neon-android=fail
+gdk-pixbuf:arm64-android=fail
+gdk-pixbuf:x64-android=fail
+gemmlowp:arm-neon-android=fail
+gemmlowp:arm64-android=fail
+gemmlowp:x64-android=fail
+gherkin-c:arm-neon-android=fail
+gherkin-c:arm64-android=fail
+gherkin-c:x64-android=fail
 # Conflicts with libevent
 gherkin-c:arm64-windows         = skip
-gherkin-c:arm-uwp               = skip
+gherkin-c:arm64-uwp               = skip
 gherkin-c:x64-linux             = skip
 gherkin-c:x64-osx               = skip
 gherkin-c:x64-uwp               = skip
@@ -278,129 +374,181 @@ gherkin-c:x64-windows           = skip
 gherkin-c:x64-windows-static    = skip
 gherkin-c:x64-windows-static-md = skip
 gherkin-c:x86-windows           = skip
-glew:arm64-windows=fail
-glfw3:arm-uwp=fail
+gl3w:arm-neon-android=fail
+gl3w:arm64-android=fail
+gl3w:x64-android=fail
+glew:arm-neon-android=fail
+glew:arm64-android=fail
+glew:x64-android=fail
+glfw3:arm-neon-android=fail
+glfw3:arm64-uwp=fail
+glfw3:arm64-android=fail
+glfw3:x64-android=fail
 glfw3:x64-uwp=fail
 glibmm:x64-windows-static-md=fail
 glibmm:x64-windows-static=fail
-gmmlib:arm-uwp=fail
-gmmlib:arm64-windows=fail
-gmmlib:x64-osx=fail
-gmmlib:x64-uwp=fail
-gmmlib:x64-windows-static-md=fail
-gmmlib:x64-windows-static=fail
-gmmlib:x64-windows=fail
-gmmlib:x86-windows=fail
-google-cloud-cpp:arm-uwp=fail
-google-cloud-cpp:x64-uwp=fail
-gperftools:arm64-windows=fail
-gperftools:x64-uwp=fail
-gperftools:arm-uwp=fail
-graphicsmagick:arm-uwp=fail
+graphicsmagick:arm64-uwp=fail
 graphicsmagick:x64-uwp=fail
 # graphicsmagick non-uwp trigger an ICE in VS 2022 17.3 https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/1557251
-graphicsmagick:x86-windows=fail
-graphicsmagick:x64-windows=fail
-graphicsmagick:x64-windows-static=fail
-graphicsmagick:x64-windows-static-md=fail
+graphicsmagick:arm-neon-android=fail
+graphicsmagick:arm64-android=fail
+graphicsmagick:x64-android=fail
+graphqlparser:arm-neon-android=fail
+graphqlparser:arm64-android=fail
 graphqlparser:arm64-osx=fail # python2 required
-gtk:x64-windows-static=fail
+graphqlparser:x64-android=fail
+
+# gsoap does not offer stable public source downloads
+gsoap:x64-android=fail
+gsoap:x64-windows        = skip
+gsoap:x86-windows        = skip
+gsoap:x64-windows-static = skip
+gsoap:x64-windows-static-md = skip
+
+gstreamer:arm-neon-android=fail
+gstreamer:arm64-android=fail
+gstreamer:x64-android=fail
+# upstream issue https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1629.
+gstreamer:x64-windows-static = skip
+gstreamer:x64-windows-static-md = skip
 gtk:x64-windows-static-md=fail
+gul14:arm-neon-android=fail
+gul14:arm64-android=fail
+gul14:x64-android=fail
+# see ignition skips below
+gz-tools2:arm-neon-android=fail
+gz-tools2:x64-android=fail
+gz-tools2:arm64-android=fail
+gz-gui7:x64-osx=fail
 halide:x64-windows-static=fail
 hdf5:arm64-windows=fail
-hdf5:arm-uwp=fail
-hdf5:x64-uwp=fail
-healpix:x86-windows=fail
-healpix:x64-windows=fail
-healpix:x64-windows-static=fail
-healpix:x64-windows-static-md=fail
-healpix:x64-uwp=fail
-healpix:arm64-windows=fail
-healpix:arm-uwp=fail
-healpix:x64-osx=fail
+hdf5:arm-neon-android=fail
+hdf5:arm64-android=fail
+hdf5:x64-android=fail
+hexl:x64-android=fail
+highs:arm-neon-android=fail
+highs:arm64-android=fail
+highs:x64-android=fail
 hpx:x64-windows-static=fail
 hpx:arm64-windows=fail
-idevicerestore:x64-linux=fail
-idevicerestore:x64-osx=fail
-ignition-common1:x64-linux=fail
+hwloc:arm-neon-android=fail
+hwloc:arm64-android=fail
+hwloc:x64-android=fail
+hyperscan:x64-android=fail
+iceoryx:x64-android=fail
+iceoryx:arm64-android=fail
+iceoryx:arm-neon-android=fail
+ignition-msgs1:arm-neon-android=fail
+ignition-msgs1:arm64-android=fail
 ignition-msgs1:arm64-windows=fail
-ignition-msgs1:arm-uwp=fail
+ignition-msgs1:arm64-uwp=fail
+ignition-msgs1:x64-android=fail
 ignition-msgs1:x64-uwp=fail
-ignition-msgs5:arm64-windows=fail
-ignition-msgs5:arm-uwp=fail
-ignition-msgs5:x64-uwp=fail
+ignition-msgs5:x64-android=fail
 ignition-msgs5:x64-osx=skip
 # Conflicts with libjpeg-turbo, mozjpeg
+ignition-msgs6:x64-android=fail
+ignition-tools:arm-neon-android=fail
+ignition-tools:arm64-android=fail
+ignition-tools:x64-android=fail
+ijg-libjpeg:arm-neon-android=fail
+ijg-libjpeg:arm64-uwp            = skip
+ijg-libjpeg:arm64-android=fail
+ijg-libjpeg:arm64-osx          = skip
 ijg-libjpeg:arm64-windows      = skip
-ijg-libjpeg:arm-uwp            = skip
+ijg-libjpeg:x64-android=fail
 ijg-libjpeg:x64-linux          = skip
 ijg-libjpeg:x64-osx            = skip
-ijg-libjpeg:arm64-osx          = skip
 ijg-libjpeg:x64-uwp            = skip
 ijg-libjpeg:x64-windows        = skip
 ijg-libjpeg:x64-windows-static = skip
+ijg-libjpeg:x64-windows-static-md=fail
 ijg-libjpeg:x86-windows        = skip
-irrlicht:arm64-windows=fail
-irrlicht:arm-uwp=fail
-irrlicht:x64-uwp=fail
-ismrmrd:x86-windows=fail
+intelrdfpmathlib:arm-neon-android=fail
+intelrdfpmathlib:arm64-android=fail
+intelrdfpmathlib:x64-android=fail
+irrlicht:x64-android=fail
+isal:x64-android=fail
+jaeger-client-cpp:arm-neon-android=fail
+jaeger-client-cpp:x64-android=fail
+jemalloc:arm-neon-android=fail
+jemalloc:arm64-android=fail
 jemalloc:arm64-windows=fail
-jemalloc:arm-uwp=fail
+jemalloc:arm64-uwp=fail
+jemalloc:x64-android=fail
 jemalloc:x64-uwp=fail
-jinja2cpplight:arm-uwp=fail
-jinja2cpplight:x64-uwp=fail
-kfr:arm64-windows=fail
+jinja2cpplight:arm-neon-android=fail
+jinja2cpplight:arm64-android=fail
+jinja2cpplight:x64-android=fail
+kfr:x64-android=fail
 kfr:x64-uwp=fail
-kfr:arm-uwp=fail
-kfr:x64-linux=fail
+lastools:arm-neon-android=fail
+lastools:arm64-android=fail
+lastools:x64-android=fail
 lcm:x64-windows-static=fail
 lcm:x64-windows-static-md=fail
+lcm:arm-neon-android=fail
+lcm:arm64-android=fail
+lcm:x64-android=fail
 leptonica:x64-uwp=fail
-leptonica:arm-uwp=fail
-leveldb:arm-uwp=fail
-leveldb:x64-uwp=fail
+leptonica:arm64-uwp=fail
 libaiff:x64-linux=fail
-libarchive:arm-uwp=fail
+libbson:arm-neon-android=fail
+libbson:arm64-android=fail
+libbson:x64-android=fail
+libcanberra:arm-neon-android=fail
+libcanberra:arm64-android=fail
+libcanberra:x64-android=fail
+libcerf:x64-windows-static-md=fail
+libcoro:arm-neon-android=fail
+libcoro:arm64-android=fail
+libcoro:x64-android=fail
+libcoro:x64-osx=fail
+libcoro:arm64-osx=fail
+libcpplocate:arm-neon-android=fail
+libcpplocate:arm64-android=fail
+libcpplocate:x64-android=fail
+libcrafter:arm-neon-android=fail
+libcrafter:arm64-android=fail
+libcrafter:x64-android=fail
+libdc1394:arm-neon-android=fail
+libdc1394:x64-android=fail
+libdc1394:arm64-android=fail
+# Fails to build due to incompatible delcaration of select in macOS 14.2
+libgo:x64-osx=fail
+libgo:x64-android=fail
+libgpg-error:arm-neon-android=fail
+libgpg-error:arm64-android=fail
+libgpg-error:x64-android=fail
 # Missing system libraries on linux to run/prepare autoconf
 libgpod:x64-linux=fail
-libgpod:x64-osx=fail
-libepoxy:arm-uwp=fail
-libepoxy:x64-uwp=fail
-libepoxy:x64-windows-static=fail
-libevhtp:x86-windows=fail
-libevhtp:x64-windows=fail
-libevhtp:x64-windows-static=fail
-libevhtp:x64-windows-static-md=fail
-libevhtp:x64-uwp=fail
-libevhtp:arm64-windows=fail
-libevhtp:arm-uwp=fail
-libexif:arm-uwp=fail
-libexif:x64-uwp=fail
 libfreenect2:arm64-windows=fail
-libgit2:arm-uwp=fail
-libgit2:x64-uwp=fail
-libgo:arm-uwp=fail
-libgo:x64-uwp=fail
-libgo:arm64-windows=fail
+libgpod:arm-neon-android=fail
+libgpod:arm64-android=fail
+libgpod:x64-android=fail
 libgxps:x64-windows-static=fail
 libgxps:x64-windows-static-md=fail
+libhdfs3:arm-neon-android=fail
+libhdfs3:arm64-android=fail
+libhdfs3:x64-android=fail
 libhdfs3:x64-linux=fail
 libhdfs3:x64-osx=fail
 libhdfs3:arm64-osx=fail
-libigl:arm64-windows=fail
-libigl:arm-uwp=fail
-libigl:x64-uwp=fail
-libirecovery:x64-windows-static-md=fail
-# 120 min build time for libjxl arm-uwp-rel, reason unknown
-libjxl:arm-uwp=skip
-liblemon:arm-uwp=fail
-liblemon:x64-uwp=fail
-liblo:arm-uwp=fail
+libidn2:arm-neon-android=fail
+libidn2:arm64-android=fail
+libidn2:x64-android=fail
+# 120 min build time for libjxl arm64-uwp-rel, reason unknown
+libjxl:arm64-uwp=skip
+liblo:arm-neon-android=fail
+liblo:arm64-uwp=fail
+liblo:arm64-android=fail
+liblo:x64-android=fail
 liblo:x64-uwp=fail
-libmagic:x64-uwp=fail
-libmagic:arm-uwp=fail
+libmariadb:arm-neon-android=fail
+libmariadb:arm64-android=fail
 libmariadb:arm64-windows      = skip
-libmariadb:arm-uwp            = skip
+libmariadb:arm64-uwp            = skip
+libmariadb:x64-android=fail
 libmariadb:x64-linux          = skip
 libmariadb:x64-osx            = skip
 libmariadb:arm64-osx          = skip
@@ -408,34 +556,29 @@ libmariadb:x64-uwp            = skip
 libmariadb:x64-windows        = skip
 libmariadb:x64-windows-static = skip
 libmariadb:x64-windows-static-md=skip
+libmaxminddb:arm64-android=fail
+libmaxminddb:arm-neon-android=fail
+libmaxminddb:x64-android=fail
 # libmesh installs tons of problematic files that conflict with other ports (boost, eigen, etc)
-libmesh:arm64-windows=skip
-libmesh:arm-uwp=skip
-libmesh:x64-uwp=skip
-libmesh:x64-windows=skip
-libmesh:x64-windows-static=skip
-libmesh:x64-windows-static-md=skip
-libmesh:x86-windows=skip
-libmesh:x64-osx=skip
-libmesh:arm64-osx=skip
 libmesh:x64-linux=skip
-# Build fails since PIC is not enabled and some configuration tests do not work properly on UWP
-libmicrodns:arm-uwp=fail
-libmicrodns:x64-uwp=fail
+libmikmod:arm-neon-android=fail
+libmikmod:arm64-android=fail
+libmikmod:x64-android=fail
 libmodman:x64-windows-static=fail
-libmodplug:arm-uwp=fail
-libmodplug:x64-uwp=fail
-libmpeg2:arm-uwp=fail
-libmpeg2:x64-linux=fail
-libmpeg2:x64-osx=fail
-libmpeg2:x64-uwp=fail
-libmysql:x86-windows=fail
-libmysql:arm64-windows=fail
-libopusenc:arm-uwp=fail
-libopusenc:x64-uwp=fail
-libosip2:x64-windows-static-md=fail
+libmpeg2:arm-neon-android=fail
+libmpeg2:arm64-android=fail
+libmpeg2:x64-android=fail
+libmysql:x86-windows=skip
+libodb:x64-linux=fail # dynamic exception specifications
+libopensp:arm-neon-android=fail
+libopensp:arm64-android=fail
+libopensp:x64-android=fail
+libosip2:arm-neon-android=fail
+libosip2:arm64-android=fail
+libosip2:x64-android=fail
+libp7client:x64-android=fail
 libpng-apng:arm64-windows      = skip
-libpng-apng:arm-uwp            = skip
+libpng-apng:arm64-uwp            = skip
 libpng-apng:x64-linux          = skip
 libpng-apng:x64-osx            = skip
 libpng-apng:x64-uwp            = skip
@@ -444,7 +587,10 @@ libpng-apng:x64-windows-static = skip
 libpng-apng:x64-windows-static-md=skip
 libpng-apng:x86-windows        = skip
 # The developer of libqcow does not offer stable release archives
-libqcow:arm-uwp=skip
+libqcow:arm-neon-android=skip
+libqcow:arm64-uwp=skip
+libqcow:arm64-android=skip
+libqcow:x64-android=skip
 libqcow:x64-uwp=skip
 libqcow:x64-windows-static=skip
 libqcow:x64-windows-static-md=skip
@@ -453,38 +599,32 @@ libqcow:x64-windows=skip
 libqcow:x64-linux=skip
 libqcow:x86-windows=skip
 libqcow:arm64-windows=skip
+# needs ftello
+libraw:arm-neon-android=fail
 # Conflicts with openssl
+libressl:arm-neon-android=skip
+libressl:arm64-android=skip
+libressl:arm64-osx=skip
+libressl:arm64-uwp=skip
 libressl:arm64-windows=skip
-libressl:arm-uwp=skip
+libressl:x64-android=skip
 libressl:x64-linux=skip
 libressl:x64-osx=skip
 libressl:x64-uwp=skip
-libressl:x64-windows=skip
-libressl:x64-windows-static=skip
 libressl:x64-windows-static-md=skip
+libressl:x64-windows-static=skip
+libressl:x64-windows=skip
 libressl:x86-windows=skip
 libsoundio:arm64-windows=fail
-libsoundio:arm-uwp=fail
-libsoundio:x64-uwp=fail
-libspatialite:arm-uwp=fail
-libspatialite:x64-uwp=fail
-libssh:arm-uwp=fail
-libssh:x64-uwp=fail
-libtins:arm-uwp=fail
-libtins:x64-uwp=fail
+libtar:arm-neon-android=fail
+libtar:arm64-android=fail
+libtcod:arm-neon-android=fail
+libtcod:arm64-android=fail
+libtcod:x64-android=fail
 libtomcrypt:arm64-windows=fail
-libtomcrypt:arm-uwp=fail
-libusb:arm-uwp=fail
-libusb:x64-uwp=fail
-libusb:arm64-windows=fail
-libusb-win32:arm-uwp=fail
-libusb-win32:x64-linux=fail
-libusb-win32:x64-osx=fail
+libtomcrypt:arm64-uwp=fail
+libusb-win32:arm64-uwp=fail
 libusb-win32:x64-uwp=fail
-libuv:arm-uwp=fail
-libuv:x64-uwp=fail
-libvmdk:arm-uwp=fail
-libvmdk:x64-uwp=fail
 #Skip detection to avoid upstream remove older releases
 libvmdk:x86-windows=skip
 libvmdk:x64-windows=skip
@@ -494,56 +634,66 @@ libvmdk:arm64=skip
 libvmdk:x64-linux=skip
 libvmdk:x64-osx=skip
 libvmdk:arm64-osx=skip
-libwandio:x86-windows=fail
-libwandio:x64-windows=fail
-libwandio:x64-windows-static=fail
-libwandio:x64-windows-static-md=fail
-libwandio:x64-uwp=fail
-libwandio:arm64-windows=fail
-libwandio:arm-uwp=fail
+libwandio:arm-neon-android=fail
+libwandio:arm64-android=fail
+libwandio:x64-android=fail
 libxaw:x64-windows-static=skip
 # clang-cl ICEd
 libxt:arm64-windows=fail
-licensepp:arm-uwp=fail
-licensepp:x64-uwp=fail
-linenoise-ng:arm-uwp=fail
+libzen:arm-neon-android=fail
+linenoise-ng:arm64-uwp=fail
 linenoise-ng:x64-uwp=fail
-live555:arm-uwp=fail
-live555:x64-osx=fail
-live555:arm64-osx=fail
+linenoise-ng:x64-windows-static-md=fail
+live555:arm-neon-android=fail
+live555:arm64-uwp=fail
+live555:arm64-android=fail
+live555:x64-android=fail
 live555:x64-uwp=fail
-# fails due to an outdated gcc version
-llfio:x64-linux=fail
-log4cplus:arm-uwp=fail
+llfio:arm-neon-android=fail
+llfio:arm64-android=fail
+llfio:x64-android=fail
+llgl:arm-neon-android=fail
+llgl:arm64-android=fail
+llgl:x64-android=fail
+llvm:arm-neon-android=fail
+llvm:arm64-android=fail
+llvm:x64-android=fail
+log4cplus:arm64-uwp=fail
 log4cplus:x64-uwp=fail
-log4cxx:arm-uwp=fail
-log4cxx:x64-uwp=fail
-luajit:arm64-windows=fail
-luafilesystem:arm-uwp=fail
-luafilesystem:x64-uwp=fail
-luasec:x64-windows-static=fail
-lzfse:arm-uwp=fail
-magnum:arm64-windows=skip
+log4cpp:x64-linux=fail # dynamic exception specifications
+loguru:arm-neon-android=fail
+loguru:arm64-android=fail
+loguru:x64-android=fail
+magma:x64-linux=fail
+mchehab-zbar:arm-neon-android=fail
+mchehab-zbar:arm64-android=fail
+mchehab-zbar:x64-android=fail
 mecab:arm64-windows      = skip
-mecab:arm-uwp            = skip
+mecab:arm64-uwp            = skip
 mecab:x64-linux          = skip
 mecab:x64-uwp            = skip
 mecab:x64-windows        = skip
 mecab:x64-windows-static = skip
 mecab:x64-windows-static-md=skip
 mecab:x86-windows        = skip
+memorymodule:arm-neon-android=fail
+memorymodule:arm64-android=fail
+memorymodule:x64-android=fail
 # Missing dependent libraries.
 mesa:x64-linux=fail
 mesa:x64-osx=fail
-mfl:x64-linux=fail # requires a c++20 compiler
+mfx-dispatch:arm-neon-android=fail
+mfx-dispatch:arm64-android=fail
+mfx-dispatch:x64-android=fail
 milerius-sfml-imgui:x64-windows-static=fail
-miniupnpc:arm-uwp=fail
-miniupnpc:x64-uwp=fail
-minizip:arm-uwp=fail
-minizip:x64-uwp=fail
+minifb:arm-neon-android=fail
+minifb:arm64-android=fail
+minifb:x64-android=fail
+minio-cpp:arm-neon-android=fail
+miniply:arm-neon-android=fail
 # Conflicts with signalrclient
 microsoft-signalr:arm64-windows=skip
-microsoft-signalr:arm-uwp=skip
+microsoft-signalr:arm64-uwp=skip
 microsoft-signalr:x64-linux=skip
 microsoft-signalr:x64-osx=skip
 microsoft-signalr:arm64-osx=skip
@@ -552,9 +702,31 @@ microsoft-signalr:x64-windows=skip
 microsoft-signalr:x64-windows-static=skip
 microsoft-signalr:x64-windows-static-md=skip
 microsoft-signalr:x86-windows=skip
-# https://github.com/mlpack/mlpack/pull/2945
-mlpack:x64-uwp=fail
-ms-quic:arm-uwp=fail
+monkeys-audio:arm-neon-android=fail
+monkeys-audio:arm64-android=fail
+monkeys-audio:x64-android=fail
+moos-core:arm-neon-android=fail
+moos-core:arm64-android=fail
+moos-core:x64-android=fail
+mozjpeg:arm-neon-android=fail
+mozjpeg:arm64-android=fail
+mozjpeg:x64-android=fail
+mp3lame:arm-neon-android=fail
+mp3lame:arm64-android=fail
+mp3lame:x64-android=fail
+mpir:x64-android=fail
+# ms-gltf and ms-quic require the Microsoft GDK with Xbox Extensions which is not installed on the CI pipeline machines
+ms-gdkx:x64-windows=fail
+ms-gdkx:x64-windows-static=fail
+ms-gdkx:x64-windows-static-md=fail
+ms-gltf:arm-neon-android=fail
+ms-gltf:arm64-android=fail
+ms-gltf:x64-android=fail
+# ms-ifc-sdk requires a very recent compiler (C++23)
+ms-ifc-sdk:arm-neon-android=fail
+ms-ifc-sdk:arm64-android=fail
+ms-ifc-sdk:x64-android=fail
+ms-quic:arm64-uwp=fail
 ms-quic:arm64-windows=fail
 ms-quic:x64-uwp=fail
 ms-quic:x64-windows-static-md=fail
@@ -562,8 +734,6 @@ ms-quic:x64-windows=fail
 ms-quic:x86-windows=fail
 monkeys-audio:arm64-windows=fail
 monkeys-audio:x64-windows-static=fail
-moos-core:arm-uwp=fail
-moos-core:x64-uwp=fail
 moos-core:x64-windows-static=fail
 moos-essential:arm64-windows=fail
 moos-essential:x64-windows-static-md=fail
@@ -571,7 +741,7 @@ moos-essential:x64-windows=fail
 moos-essential:x86-windows=fail
 # Conflicts with libjpeg-turbo
 mozjpeg:arm64-windows      = skip
-mozjpeg:arm-uwp            = skip
+mozjpeg:arm64-uwp            = skip
 mozjpeg:x64-linux          = skip
 mozjpeg:x64-osx            = skip
 mozjpeg:arm64-osx          = skip
@@ -590,58 +760,33 @@ mpir:arm64-windows=skip
 mpir:x64-osx=skip
 mpir:x64-linux=skip
 msmpi:arm64-windows=fail
-msmpi:arm-uwp=fail
-msmpi:x64-linux=fail
-msmpi:x64-osx=fail
-msmpi:x64-uwp=fail
-munit:arm-uwp=fail
-munit:arm64-windows=fail
-munit:x64-uwp=fail
-nana:arm-uwp=fail
+munit:x64-android=fail
+mysql-connector-cpp:arm-neon-android=fail
+mysql-connector-cpp:arm64-android=fail
+mysql-connector-cpp:x64-android=fail
+nana:arm-neon-android=fail
+nana:arm64-android=fail
+nana:x64-android=fail
 nana:x64-linux=fail
 nana:x64-osx=fail
-nana:x64-uwp=fail
-nanodbc:arm-uwp=fail
-nanodbc:x64-uwp=fail
+nana:arm64-osx=fail
 nanodbc:x64-linux=skip
-nativefiledialog:arm-uwp=fail
-nativefiledialog:x64-uwp=fail
-nettle:arm-uwp=fail
-nettle:arm64-windows=fail
+netcdf-cxx4:x64-windows-static-md=fail
+ngspice:x64-android=fail
 ngspice:x64-windows-static=fail
-nng:arm-uwp=fail
-nng:x64-uwp=fail
-numactl:arm64-windows=fail
-numactl:arm-uwp=fail
-numactl:x64-osx=fail
-numactl:x64-uwp=fail
-numactl:x64-windows=fail
-numactl:x64-windows-static=fail
-numactl:x64-windows-static-md=fail
-numactl:x86-windows=fail
-ocilib:arm-uwp=fail
-ocilib:arm64-windows=fail
-ocilib:x64-uwp=fail
-ocilib:x64-windows-static-md=fail
-octomap:arm-uwp=fail
-octomap:x64-uwp=fail
+nmap:arm-neon-android=fail
+nmap:arm64-android=fail
+nmap:x64-android=fail
+nrf-ble-driver:arm-neon-android=fail
+nrf-ble-driver:arm64-android=fail
+nrf-ble-driver:x64-android=fail
+nvtt:x64-android=fail
+oatpp-libressl:x64-android=fail
 ode:arm64-windows=fail
-ode:arm-uwp=fail
-ode:x64-uwp=fail
-offscale-libetcd-cpp:arm-uwp=fail
+offscale-libetcd-cpp:arm64-uwp=fail
 offscale-libetcd-cpp:x64-uwp=fail
-ogre:arm64-osx=fail
-# Conflicts with ogre
-ogre-next:arm64-windows      = skip
-ogre-next:arm-uwp            = skip
-ogre-next:x64-osx            = skip
-ogre-next:arm64-osx          = skip
-ogre-next:x64-linux          = skip
-ogre-next:x64-uwp            = skip
-ogre-next:x64-windows        = skip
-ogre-next:x64-windows-static = skip
-ogre-next:x64-windows-static-md=skip
-ogre-next:x86-windows        = skip
+ogdf:arm64-android=fail
+ois:x64-android=fail
 # ompl is vulnerable to some form of race in its dependent ports, and adding 'ode' as a dependency
 # does not resolve the issue
 # src/ompl/CMakeFiles/ompl.dir/extensions/ode/src/OpenDEStateValidityChecker.cpp.o
@@ -651,20 +796,27 @@ ogre-next:x86-windows        = skip
 # /mnt/vcpkg-ci/installed/x64-linux/debug/lib/libboost_filesystem.a
 # /mnt/vcpkg-ci/installed/x64-linux/debug/lib/libboost_system.a  -lpthread && :
 # /usr/bin/ld: cannot find -lode
+ompl:arm-neon-android=fail
+ompl:arm64-android=fail
+ompl:x64-android=fail
 ompl:x64-osx=fail
 ompl:arm64-osx=fail
 ompl:x64-linux=fail
 # opencc/deps/rapidjson-1.1.0/rapidjson.h: Unknown machine endianess detected
-opencc:arm64-windows=fail
+omplapp:arm-neon-android=fail
+omplapp:arm64-android=fail
+omplapp:x64-android=fail
+onednn:x64-android=fail
+openblas:arm-neon-android=fail
+openblas:arm64-android=fail
+openblas:x64-android=fail
 # opencc/deps/marisa-0.2.5/lib/marisa/grimoire/io/mapper.cc currently doesn't support UWP.
-opencc:arm-uwp=fail
-opencc:x64-uwp=fail
-opencl:arm-uwp=fail
-opencl:x64-uwp=fail
-opencsg:arm-uwp=fail
-opencsg:x64-uwp=fail
+opencc:x64-android=fail
+opencv2:arm-neon-android=fail
+opencv2:arm64-android=fail
 opencv2:arm64-windows         = skip
-opencv2:arm-uwp               = skip
+opencv2:arm64-uwp               = skip
+opencv2:x64-android=fail
 opencv2:x64-linux             = skip
 opencv2:x64-osx               = skip
 opencv2:x64-uwp               = skip
@@ -673,7 +825,7 @@ opencv2:x64-windows-static    = skip
 opencv2:x64-windows-static-md = skip
 opencv2:x86-windows           = skip
 opencv3:arm64-windows         = skip
-opencv3:arm-uwp               = skip
+opencv3:arm64-uwp               = skip
 opencv3:x64-linux             = skip
 opencv3:x64-osx               = skip
 opencv3:x64-uwp               = skip
@@ -681,70 +833,89 @@ opencv3:x64-windows           = skip
 opencv3:x64-windows-static    = skip
 opencv3:x64-windows-static-md = skip
 opencv3:x86-windows           = skip
-opendnp3:x64-uwp=fail
-opendnp3:arm-uwp=fail
+openfbx:arm-neon-android=fail
+openimageio:arm-neon-android=fail
+openimageio:arm64-android=fail
+openimageio:x64-android=fail
+openldap:arm-neon-android=fail
+openldap:arm64-android=fail
+openldap:x64-android=fail
 openmama:x64-windows-static-md=fail
 openmesh:arm64-windows=fail
-openmesh:arm-uwp=fail
+openmesh:arm64-uwp=fail
 openmesh:x64-uwp=fail
-openscap:x64-windows-static=fail
+openmpi:arm-neon-android=fail
+openmpi:arm64-android=fail
+openmpi:x64-android=fail
+openmvg:x64-linux=fail
+openscap:arm-neon-android=fail
+openscap:arm64-android=fail
+openscap:x64-android=fail
 openscap:x64-osx=fail
-# osx needs bison 3.4 installed
-openturns:x64-osx=fail
-# https://github.com/AcademySoftwareFoundation/openvdb/issues/1362
-# openvdb\openvdb\libopenvdb.lib : fatal error LNK1248: image size (109A36020) exceeds maximum allowable size (FFFFFFFF)
-openvdb:x64-windows-static=fail
-openvdb:x64-windows-static-md=fail
+openscap:arm64-osx=fail
+openscap:x64-windows-static-md=fail
+openscap:x64-windows-static=fail
+opensubdiv:x64-android=fail
 openvpn3:x64-osx=fail
 openvpn3:arm64-osx=fail
-openvr:arm64-windows=fail
-openvr:arm-uwp=fail
-openvr:x64-osx=fail
-openvr:x64-uwp=fail
 openvr:x64-windows-static=fail
-optional-bare:arm64-windows      = skip
-optional-bare:arm-uwp            = skip
-optional-bare:x64-linux          = skip
-optional-bare:x64-osx            = skip
-optional-bare:x64-uwp            = skip
-optional-bare:x64-windows        = skip
-optional-bare:x64-windows-static = skip
+# Conflicts with optional-lite, by the same author
+optional-bare:arm-neon-android=skip
+optional-bare:arm64-android=skip
+optional-bare:arm64-osx=skip
+optional-bare:arm64-uwp=skip
+optional-bare:arm64-windows=skip
+optional-bare:x64-android=skip
+optional-bare:x64-linux=skip
+optional-bare:x64-osx=skip
+optional-bare:x64-uwp=skip
 optional-bare:x64-windows-static-md=skip
-optional-bare:x86-windows        = skip
-opusfile:arm-uwp=fail
-opusfile:x64-uwp=fail
-paho-mqtt:arm-uwp=fail
+optional-bare:x64-windows-static=skip
+optional-bare:x64-windows=skip
+optional-bare:x86-windows=skip
+orc:arm-neon-android=fail
+orc:arm64-android=fail
+orc:x64-android=fail
+paho-mqtt:arm64-uwp=fail
 paho-mqtt:x64-uwp=fail
-pfring:x64-osx=fail
-pfring:arm64-osx=fail
-# pfring on Linux currently fails because its build scripts enable warnings as
-# errors, and warnings trigger with the Linux kernel headers in the Azure images.
-pfring:x64-linux=fail
-platform-folders:arm-uwp=fail
+pcl:arm-neon-android=fail
+pcl:arm64-android=fail
+pcl:x64-android=fail
+pixman:arm-neon-android=fail
+pixman:arm64-android=fail
+platform-folders:arm64-uwp=fail
 platform-folders:x64-uwp=fail
-plibsys:arm-uwp=fail
-plibsys:x64-uwp=fail
+plib:arm-neon-android=fail
+plib:arm64-android=fail
+plib:x64-android=fail
 plplot:arm64-windows=fail
-plplot:arm-uwp=fail
-plplot:x64-uwp=fail
-pmdk:arm-uwp=fail
-pmdk:arm64-windows=fail
-pmdk:x64-linux=fail
+pmdk:x64-android=fail
 pmdk:x64-osx=fail
-pmdk:x64-uwp=fail
 pmdk:x64-windows-static=fail
-pmdk:x86-windows=fail
 popsift:x64-windows-static-md=fail
 popsift:x64-linux=fail # segfaults :(
-portable-snippets:arm-uwp=fail
+ptex:arm-neon-android=fail
+ptex:arm64-android=fail
+ptex:x64-android=fail
+python2:arm-neon-android=fail
+python2:arm64-android=fail
+python2:x64-android=fail
+python3:arm-neon-android=fail
+python3:arm64-android=fail
+python3:x64-android=fail
 # Not yet ready for these platforms.
 qbittorrent:x64-osx=fail
 qbittorrent:x64-linux=fail
-qpid-proton:arm-uwp=fail
+qpid-proton:arm-neon-android=fail
+qpid-proton:arm64-uwp=fail
+qpid-proton:arm64-android=fail
+qpid-proton:x64-android=fail
 qpid-proton:x64-uwp=fail
 qpid-proton:x64-windows-static=fail
+qt5-base:arm-neon-android=fail
+qt5-base:arm64-android=fail
 qt5-base:arm64-windows=fail
-
+qt5-base:x64-android=fail
 # Skip deprecated Qt module
 # (remove after 1 year or longer due to vcpkg upgrade not handling removed ports correctly)
 qt5-canvas3d:x64-linux=skip
@@ -755,12 +926,9 @@ qt5-canvas3d:x64-windows-static=skip
 qt5-canvas3d:x64-windows-static-md=skip
 qt5-canvas3d:x86-windows=skip
 # Missing system libraries
-qt5-wayland:x64-osx=fail
 qtwayland:x64-osx=fail
 qtwayland:arm64-osx=fail
 # Missing prerequisites for CI success
-qt5-webengine:x64-linux=fail
-qt5-webengine:x64-osx=fail
 # Fail due to outdated protoc headers.
 # D:\buildtrees\qt5-webengine\x64-windows-dbg\src\core\debug\gen\net/third_party/quiche/src/quic/core/proto/cached_network_parameters.pb.h(17):
 # fatal error C1189: #error:  This file was generated by an older version of protoc which is
@@ -770,12 +938,17 @@ qt5-webengine:x86-windows=skip
 # Missing system libraries
 qt5-x11extras:x64-osx=fail
 qt5-x11extras:arm64-osx=fail
-qwt:x64-osx=fail
-qwt:arm64-osx=fail
+quickfix:arm-neon-android=fail
+quickfix:arm64-android=fail
 qwt-qt6:x64-osx=fail
-rabit:arm64-osx=fail
+rabit:arm-neon-android=fail
+rabit:arm64-android=fail
+rabit:x64-android=fail
+range-v3-vs2015:arm-neon-android=fail
+range-v3-vs2015:arm64-android=fail
 range-v3-vs2015:arm64-windows      = skip
-range-v3-vs2015:arm-uwp            = skip
+range-v3-vs2015:arm64-uwp            = skip
+range-v3-vs2015:x64-android=fail
 range-v3-vs2015:x64-linux          = skip
 range-v3-vs2015:x64-osx            = skip
 range-v3-vs2015:arm64-osx          = skip
@@ -785,34 +958,35 @@ range-v3-vs2015:x64-windows-static = skip
 range-v3-vs2015:x64-windows-static-md=skip
 range-v3-vs2015:x86-windows        = skip
 rapidstring:arm64-windows=fail
-rapidstring:arm-uwp=fail
+rapidstring:arm64-uwp=fail
 rapidstring:x64-linux=fail
 rapidstring:x64-uwp=fail
 rapidstring:x64-windows=fail
 rapidstring:x64-windows-static=fail
 rapidstring:x64-windows-static-md=fail
 rapidstring:x86-windows=fail
-raylib:arm64-windows=fail
-raylib:arm-uwp=fail
-raylib:x64-uwp=fail
 # file conflicts with rbdl
 rbdl-orb:x86-windows=skip
 rbdl-orb:x64-windows=skip
 rbdl-orb:x64-windows-static=skip
 rbdl-orb:x64-windows-static-md=skip
 rbdl-orb:x64-uwp=skip
-rbdl-orb:arm-uwp=skip
+rbdl-orb:arm64-uwp=skip
 rbdl-orb:arm64-windows=skip
 rbdl-orb:x64-linux=skip
 rbdl-orb:x64-osx=skip
-readline:arm-uwp=fail
-readline:x64-uwp=fail
-realsense2:arm64-windows=fail
-realsense2:arm-uwp=fail
-realsense2:x64-uwp=fail
-replxx:arm-uwp=fail
-replxx:x64-uwp=fail
-restbed:arm-uwp=fail
+rbdl:arm-neon-android=fail
+rbdl:arm64-android=fail
+rbdl:x64-android=fail
+replxx:arm-neon-android=fail
+replxx:arm64-android=fail
+replxx:x64-android=fail
+rest-rpc:arm-neon-android=fail
+rest-rpc:arm64-android=fail
+rest-rpc:x64-android=fail
+restbed:arm-neon-android=fail
+restbed:arm64-uwp=fail
+restbed:arm64-android=fail
 restbed:x64-uwp=fail
 # file conflicts with msgpack
 rest-rpc:x86-windows=skip
@@ -820,16 +994,13 @@ rest-rpc:x64-windows=skip
 rest-rpc:x64-windows-static=skip
 rest-rpc:x64-windows-static-md=skip
 rest-rpc:x64-uwp=skip
-rest-rpc:arm-uwp=skip
+rest-rpc:arm64-uwp=skip
 rest-rpc:arm64-windows=skip
 rest-rpc:x64-linux=skip
 rest-rpc:x64-osx=skip
 rest-rpc:arm64-osx=skip
-rhash:arm64-windows=fail
-rocksdb:arm-uwp=fail
-rocksdb:x64-uwp=fail
 rpclib:arm64-windows=fail
-rpclib:arm-uwp=fail
+rpclib:arm64-uwp=fail
 rpclib:x64-uwp=fail
 #The website of rply http://w3.impa.br/~diego/software/rply cannot be accessed
 rply:x86-windows=skip
@@ -840,27 +1011,18 @@ rply:arm64-windows=skip
 rply:x64-linux=skip
 rply:x64-osx=skip
 rply:x64-windows-static-md=skip
-rsasynccpp:arm64-windows=fail
-rsasynccpp:arm-uwp=fail
-rsasynccpp:x64-linux=fail
-rsasynccpp:x64-osx=fail
-# Requires g++10 but CI compiler only has g++9
-rsm-binary-io:x64-linux=fail
-# Requires g++10 but CI compiler only has g++9
-rsm-bsa:x64-linux=fail
-rtlsdr:x64-uwp=fail
-rtlsdr:arm64-windows=fail
-rtlsdr:arm-uwp=fail
-rtlsdr:x64-linux=fail
-rtlsdr:x64-osx=fail
-
-# ryu does not support VS2022 yet
-ryu:x64-windows=fail
-ryu:x64-windows-static=fail
-ryu:x64-windows-static-md=fail
-
+rttr:arm-neon-android=fail
+rttr:arm64-android=fail
+rttr:x64-android=fail
+salome-medcoupling:x64-linux=fail
+scintilla:arm-neon-android=fail
+scintilla:arm64-android=fail
+scintilla:x64-android=fail
+sciter:arm-neon-android=fail
+sciter:arm64-android=fail
 sciter:arm64-windows=skip
-sciter:arm-uwp=skip
+sciter:arm64-uwp=skip
+sciter:x64-android=fail
 sciter:x64-linux=skip
 sciter:x64-osx=skip
 sciter:arm64-osx=skip
@@ -869,128 +1031,128 @@ sciter:x64-windows=skip
 sciter:x64-windows-static=skip
 sciter:x64-windows-static-md=skip
 sciter:x86-windows=skip
-scnlib:arm-uwp=fail
+scnlib:arm64-uwp=fail
 scnlib:x64-uwp=fail
 sdformat10:x64-windows-static-md=fail
-sdformat6:arm-uwp=fail
-sdformat6:arm64-windows=fail
-sdformat6:x64-uwp=fail
 sdformat6:x64-windows-static-md=fail
-sdformat9:arm-uwp=fail
-sdformat9:x64-uwp=fail
 sdformat9:x64-windows-static-md=fail
-sdl2-net:arm-uwp=fail
-sdl2-net:x64-uwp=fail
-septag-sx:arm64-windows=fail
-septag-sx:arm-uwp=fail
-septag-sx:x64-uwp=fail
-shiva:x64-windows-static=fail
-shiva:x64-windows-static-md=fail
-shiva-sfml:x64-linux=fail
-shiva-sfml:x64-osx=fail
-shiva-sfml:arm64-osx=fail
-shiva-sfml:x86-windows=fail
-shiva-sfml:x64-windows=fail
+sdl1:arm-neon-android=fail
+sdl1:arm64-android=fail
+sdl1:x64-android=fail
+sentencepiece:arm-neon-android=fail
+sentencepiece:arm64-android=fail
+sentencepiece:x64-android=fail
+sentencepiece:x64-windows-static-md=fail
+septag-sx:x64-android=fail
+sfml:arm-neon-android=fail
+sfml:arm64-android=fail
+sfml:x64-android=fail
 shogun:arm64-windows      = skip
-shogun:arm-uwp            = skip
+shogun:arm64-uwp            = skip
 shogun:x64-osx            = skip
 shogun:x64-uwp            = skip
 shogun:x64-windows        = skip
 shogun:x64-windows-static = skip
 shogun:x64-windows-static-md=skip
 shogun:x86-windows        = skip
-signalrclient:x64-uwp=fail
-signalrclient:arm-uwp=fail
+signalrclient:arm-neon-android=fail
+signalrclient:arm64-android=fail
+signalrclient:x64-android=fail
 simbody:arm64-windows=fail
+simd:arm-neon-android=fail
+simd:arm64-android=fail
+simd:x64-android=fail
+sjpeg:arm-neon-android=fail
+sjpeg:arm64-android=fail
+sjpeg:x64-android=fail
+sleef:arm-neon-android=fail
+sleef:arm64-android=fail
+sleef:x64-android=fail
 sleef:x86-windows=fail
-slikenet:arm-uwp=fail
-slikenet:x64-uwp=fail
-smpeg2:x64-linux=fail
-sockpp:arm-uwp=fail
-sockpp:x64-uwp=fail
-soil2:arm-uwp=fail
-soil2:x64-uwp=fail
-soqt:arm64-windows=fail
-soqt:arm-uwp=fail
-soqt:x64-uwp=fail
-soundtouch:arm-uwp=fail
-soundtouch:x64-uwp=fail
+sleepy-discord:arm-neon-android=fail
+sleepy-discord:arm64-android=fail
+slikenet:arm-neon-android=fail
+slikenet:arm64-android=fail
+slikenet:x64-android=fail
+soem:arm-neon-android=fail
+soem:arm64-android=fail
+soem:x64-android=fail
+soil:arm-neon-android=fail
+soil:arm64-android=fail
+soil:x64-android=fail
+solid3:arm64-android=fail
+spaceland:arm64-android=fail
 spaceland:arm64-windows=fail
-spaceland:arm-uwp=fail
+spaceland:arm64-uwp=fail
+spaceland:x64-android=fail
 spaceland:x64-uwp=fail
+spatialite-tools:arm-neon-android=fail
+spatialite-tools:arm64-android=fail
+spatialite-tools:x64-android=fail
+spdk-isal:arm-neon-android=fail
+spdk-isal:arm64-android=fail
+spdk-isal:x64-android=fail
 spdk:x64-linux=fail
-spdk-dpdk:arm64-windows=fail
-spdk-dpdk:arm-uwp=fail
-spdk-dpdk:x64-osx=fail
-spdk-dpdk:x64-uwp=fail
-spdk-dpdk:x64-windows=fail
-spdk-dpdk:x64-windows-static=fail
-spdk-dpdk:x64-windows-static-md=fail
-spdk-dpdk:x86-windows=fail
-spdk-ipsec:arm64-windows=fail
-spdk-ipsec:arm-uwp=fail
-spdk-ipsec:x64-osx=fail
-spdk-ipsec:x64-uwp=fail
-spdk-ipsec:x64-windows=fail
-spdk-ipsec:x64-windows-static=fail
-spdk-ipsec:x64-windows-static-md=fail
-spdk-ipsec:x86-windows=fail
 # Conflict with isal, and "internal" dep of spdk:x64-linux=fail
 spdk-isal:x64-linux=skip
-stormlib:arm-uwp=fail
+spscqueue:arm-neon-android=fail
+spscqueue:arm64-android=fail
+spscqueue:x64-android=fail
+stormlib:arm64-uwp=fail
 stormlib:x64-uwp=fail
-stxxl:arm-uwp=fail
-stxxl:x64-uwp=fail
+stx:arm-neon-android=fail
+stx:arm64-android=fail
+stx:x64-android=fail
+stxxl:arm-neon-android=fail
 # upstream issue https://github.com/stxxl/stxxl/issues/99
 stxxl:x86-windows=skip
 stxxl:x64-windows=skip
 stxxl:x64-windows-static=skip
 stxxl:x64-windows-static-md=skip
-symengine:arm-uwp=fail
 systemc:arm64-windows=fail
-systemc:arm-uwp=fail
+systemc:arm64-uwp=fail
 systemc:x64-uwp=fail
-tcl:arm-uwp=fail
-tcl:arm64-windows=fail
-tcl:x64-uwp=fail
-telnetpp:arm-uwp=fail
-telnetpp:x64-uwp=fail
+teemo:x64-android=fail
 
 # tensorflow does not support VS2022
-tensorflow:x64-windows=fail
-tensorflow:x64-windows-static=fail
+tensorflow:x64-android=fail
 tensorflow:x64-windows-static-md=fail
-tensorflow-cc:x64-windows=fail
-tensorflow-cc:x64-windows-static=fail
+tensorflow:x64-windows-static=fail
+tensorflow:x64-windows=fail
+tensorflow-cc:x64-android=fail
 tensorflow-cc:x64-windows-static-md=fail
+tensorflow-cc:x64-windows-static=fail
+tensorflow-cc:x64-windows=fail
+# tensorflow is broken with system libraries on macOS 13.5
+# Also skipping because our macOS machines are relatively underpowered and this saves 8 hours of CI
+# time for a relatively unpopular library / system combo.
+tensorflow:x64-osx=skip
+tensorflow:arm-osx=skip
+tensorflow-cc:x64-osx=skip
+tensorflow-cc:arm-osx=skip
 
-theia:arm64-windows      = skip
-theia:arm-uwp            = skip
-theia:x64-uwp            = skip
-theia:x64-windows        = skip
-theia:x64-windows-static = skip
-theia:x64-windows-static-md=skip
-theia:x86-windows        = skip
-tidy-html5:arm-uwp=fail
-tidy-html5:x64-uwp=fail
-tinkerforge:arm-uwp=fail
-tinkerforge:x64-uwp=fail
-tiny-process-library:arm-uwp=fail
-tiny-process-library:x64-uwp=fail
+thorvg:arm-neon-android=fail
+tinycthread:arm-neon-android=fail
+tinycthread:arm64-android=fail
+tinycthread:x64-android=fail
+tlx:arm-neon-android=fail
+tlx:arm64-android=fail
+tlx:x64-android=fail
+torch-th:arm-neon-android=fail
+torch-th:arm64-android=fail
 torch-th:arm64-windows=fail
-torch-th:arm-uwp=fail
+torch-th:arm64-uwp=fail
+torch-th:x64-android=fail
 torch-th:x64-uwp=fail
 torch-th:x64-windows-static=fail
-treehopper:x64-windows-static=fail
-treehopper:x64-linux=fail
-unicorn-lib:arm-uwp=fail
-unicorn-lib:x64-uwp=fail
-unittest-cpp:arm64-windows=fail
-unittest-cpp:arm-uwp=fail
-unittest-cpp:x64-uwp=fail
+turbobase64:arm-neon-android=fail
+tvision:arm-neon-android=fail
+tvision:arm64-android=fail
+tvision:x64-android=fail
+unicorn:x64-windows-static-md=fail
 # USD has set official policy that they will not update to be compatible with TBB in the near term (https://github.com/PixarAnimationStudios/USD/issues/1600)
 usd:arm64-windows=skip
-usd:arm-uwp=skip
+usd:arm64-uwp=skip
 usd:x64-uwp=skip
 usd:x64-windows=skip
 usd:x64-windows-static=skip
@@ -998,28 +1160,33 @@ usd:x64-windows-static-md=skip
 usd:x64-linux=skip
 usd:x64-osx=skip
 usd:x86-windows=skip
-uthenticode:arm-uwp=fail
-uthenticode:x64-uwp=fail
-v8:arm64-windows=fail
-v8:arm-uwp=fail
-v8:x64-osx=fail
-v8:x64-uwp=fail
-vectorclass:arm64-windows=fail
-vectorclass:arm-uwp=fail
-vulkan:arm64-windows=fail
-vulkan:arm-uwp=fail
-vulkan:x64-linux=fail
-vulkan:x64-osx=fail
-vulkan:arm64-osx=fail
-vulkan:x64-uwp=fail
-vulkan:x64-windows=fail
-vulkan:x64-windows-static=fail
-vulkan:x64-windows-static-md=fail
-vulkan:x86-windows=fail
+# the version of v8 we have in the repo doesn't support VS2022
+v8:x64-android=fail
+v8:x64-windows-static-md=fail
+v8:x64-windows-static=fail
+v8:x64-windows=fail
+v8:x86-windows=fail
+vowpal-wabbit:arm-neon-android=fail
+vowpal-wabbit:arm64-android=fail
+vowpal-wabbit:x64-android=fail
+vtk-m:arm-neon-android=fail
+vtk-m:arm64-android=fail
+vtk-m:x64-android=fail
+# Needs android-24 to supply a vulkan loader library
+vulkan:arm-neon-android=fail
+vulkan:arm64-android=fail
+vulkan:x64-android=fail
+# Needs android-26
+vulkan-utility-libraries:arm-neon-android=fail
+vulkan-utility-libraries:arm64-android=fail
+vulkan-utility-libraries:x64-android=fail
 # Conflicts with latest openjpeg port (vxl ships with an old version of openjpeg)
 # conflicts with qt5-location
+vxl:arm-neon-android=skip
+vxl:arm64-android=skip
 vxl:arm64-windows      = skip
-vxl:arm-uwp            = skip
+vxl:arm64-uwp            = skip
+vxl:x64-android=fail
 vxl:x64-linux          = skip
 vxl:x64-osx            = skip
 vxl:x64-uwp            = skip
@@ -1027,87 +1194,40 @@ vxl:x64-windows        = skip
 vxl:x64-windows-static = skip
 vxl:x64-windows-static-md=skip
 vxl:x86-windows        = skip
-winpcap:arm64-windows      = skip
-winpcap:arm-uwp            = skip
-winpcap:x64-uwp            = skip
-winpcap:x64-windows        = skip
-winpcap:x64-windows-static = skip
-winpcap:x64-windows-static-md=skip
-winpcap:x86-windows        = skip
-winsock2:arm64-windows=skip # https://github.com/microsoft/vcpkg-tool/pull/599
-wpilib:arm64-windows=fail
-wpilib:x64-osx=fail
-wincrypt:arm64-windows=skip # https://github.com/microsoft/vcpkg-tool/pull/599
-x265:arm64-windows=fail
-x265:arm-uwp=fail
-x265:x64-uwp=fail
-xalan-c:x64-windows-static=fail
-xalan-c:arm64-windows=fail
+wasmedge:arm-neon-android=fail
+wasmedge:arm64-android=fail
+wasmedge:x64-android=fail
+wavpack:arm-neon-android=fail
+wavpack:x64-android=fail
+# Collides with libpcap -> similar headers
+winpcap:x64-windows = skip
+winpcap:x86-windows = skip
+wordnet:arm-neon-android=fail
+wordnet:arm64-android=fail
+wordnet:x64-android=fail
+workflow:arm-neon-android=fail
+workflow:arm64-uwp=fail
+workflow:arm64-android=fail
+workflow:x64-android=fail
+workflow:x64-uwp=fail
+wpilib:arm-neon-android=fail # requires full c++20 support
+wpilib:arm64-android=fail # requires full c++20 support
+wpilib:x64-android=fail # requires full c++20 support
+x264:arm-neon-android=fail
+x264:arm64-android=fail
+x265:arm-neon-android=fail
+x265:arm64-android=fail
+x265:x64-android=fail
 # No xorg-macros available on osx
+xbitmaps:arm-neon-android=fail
+xbitmaps:arm64-android=fail
+xbitmaps:x64-android=fail
 xbitmaps:x64-osx=skip
-xerces-c:arm-uwp=fail
-xerces-c:x64-uwp=fail
-xmlsec:arm-uwp=fail
-xmlsec:x64-uwp=fail
-yara:arm-uwp=fail
-yara:x64-uwp=fail
-z3:arm-uwp=fail
-z3:x64-uwp=fail
-
-# clapack is replaced by lapack-reference on the platforms lapack-reference supports
-clapack:x64-linux=skip
-clapack:x64-osx=skip
-clapack:arm64-osx=skip
-clapack:x64-windows-static=skip
-clapack:x64-windows-static-md=skip
-clapack:x64-windows=skip
-clapack:x86-windows=skip
-lapack-reference:arm64-windows=skip
-lapack-reference:arm-uwp=skip
-lapack-reference:x64-uwp=skip
-
-# failures for x64-windows-static-md
-ace:x64-windows-static-md=fail
-ijg-libjpeg:x64-windows-static-md=fail
-libcerf:x64-windows-static-md=fail
-libmicrohttpd:x64-windows-static-md=fail
-linenoise-ng:x64-windows-static-md=fail
-netcdf-cxx4:x64-windows-static-md=fail
-open62541:x64-windows-static-md=fail
-openscap:x64-windows-static-md=fail
-sentencepiece:x64-windows-static-md=fail
-symengine:x64-windows-static-md=fail
-unicorn:x64-windows-static-md=fail
-
-# these ports require the Microsoft GDK with Xbox Extensions which is not installed on the CI pipeline machines
-ms-gdkx:x64-windows=fail
-ms-gdkx:x64-windows-static=fail
-ms-gdkx:x64-windows-static-md=fail
-
-# the version of v8 we have in the repo doesn't support VS2022
-v8:x86-windows=fail
-v8:x64-windows=fail
-v8:x64-windows-static=fail
-v8:x64-windows-static-md=fail
-
+xbitmaps:arm64-osx=skip
+zeroc-ice:arm-neon-android=fail
+zeroc-ice:arm64-android=fail
+zeroc-ice:x64-android=fail
 zyre:x64-windows-static-md=fail
-usbmuxd:x64-windows-static-md=fail
-workflow:x64-uwp=fail
-workflow:arm-uwp=fail
-
-# VS2019 version 16.9.4's project system changes where PDBs are placed in a way that breaks the
-# upstream build script of this port.
-# See https://developercommunity.visualstudio.com/t/Toolset-169-regression-vcxproj-producin/1356639
-dimcli:x64-windows-static-md=fail
-dimcli:x64-windows-static=fail
-
-zeroc-ice:x86-windows=fail
-zeroc-ice:x64-windows=fail
-zeroc-ice:x64-windows-static-md=fail
-# ZeroC doesn't provide ARM tagets in project files.
-zeroc-ice:arm64-windows=fail
-zeroc-ice:arm-uwp=fail
-zeroc-ice:x64-uwp=fail
 
 # Ports which needs to pass in CI
 cmake:x64-windows=pass
@@ -1116,7 +1236,7 @@ cmake:x64-windows-static-md=pass
 cmake:arm64-windows=pass
 cmake:x64-linux=pass
 cmake:x64-osx=pass
-cmake-user:arm-uwp=pass
+cmake-user:arm64-uwp=pass
 cmake-user:arm64-windows=pass
 cmake-user:x64-linux=pass
 cmake-user:x64-osx=pass
@@ -1135,13 +1255,19 @@ vcpkg-ci-arrow:x64-windows-static=pass
 vcpkg-ci-arrow:x64-windows-static-md=pass
 vcpkg-ci-arrow:x64-osx=pass
 vcpkg-ci-arrow:x64-linux=pass
+vcpkg-ci-boost:arm-neon-android=pass
+vcpkg-ci-boost:arm64-android=pass
+vcpkg-ci-boost:arm64-uwp=pass
+vcpkg-ci-boost:arm64-windows=pass
+vcpkg-ci-boost:x64-android=pass
 vcpkg-ci-boost:x64-linux=pass
 vcpkg-ci-boost:x64-osx=pass
+vcpkg-ci-boost:x64-uwp=pass
 vcpkg-ci-boost:x64-windows-static-md=pass
 vcpkg-ci-boost:x64-windows-static=pass
 vcpkg-ci-boost:x64-windows=pass
 vcpkg-ci-boost:x86-windows=pass
-vcpkg-ci-ffmpeg:arm-uwp=pass
+vcpkg-ci-ffmpeg:arm64-uwp=pass
 vcpkg-ci-ffmpeg:arm64-windows=pass
 vcpkg-ci-ffmpeg:x64-linux=pass
 vcpkg-ci-ffmpeg:x64-uwp=pass
@@ -1149,6 +1275,24 @@ vcpkg-ci-ffmpeg:x64-windows-static-md=pass
 vcpkg-ci-ffmpeg:x64-windows-static=pass
 vcpkg-ci-ffmpeg:x64-windows=pass
 vcpkg-ci-ffmpeg:x86-windows=pass
+vcpkg-ci-freerdp:arm-neon-android=pass
+vcpkg-ci-freerdp:arm64-android=pass
+vcpkg-ci-freerdp:x64-android=pass
+vcpkg-ci-freerdp:x64-linux=pass
+vcpkg-ci-freerdp:x64-osx=pass
+vcpkg-ci-freerdp:x64-windows-static-md=pass
+vcpkg-ci-freerdp:x64-windows-static=pass
+vcpkg-ci-freerdp:x64-windows=pass
+vcpkg-ci-freerdp:x86-windows=pass
+vcpkg-ci-gdal:arm-neon-android=pass
+vcpkg-ci-gdal:arm64-android=pass
+vcpkg-ci-gdal:x64-android=pass
+vcpkg-ci-gdal:x64-linux=pass
+vcpkg-ci-gdal:x64-osx=pass
+vcpkg-ci-gdal:x64-windows-static-md=pass
+vcpkg-ci-gdal:x64-windows-static=pass
+vcpkg-ci-gdal:x64-windows=pass
+vcpkg-ci-gdal:x86-windows=pass
 vcpkg-ci-llvm:x64-linux=pass
 vcpkg-ci-llvm:x64-osx=pass
 vcpkg-ci-llvm:x64-windows-static-md=pass
@@ -1161,7 +1305,7 @@ vcpkg-ci-mathgl:x64-windows=pass
 vcpkg-ci-mathgl:x64-windows-static=pass
 vcpkg-ci-mathgl:x64-windows-static-md=pass
 vcpkg-ci-mathgl:x86-windows=pass
-vcpkg-ci-opencv:arm-uwp=pass
+vcpkg-ci-opencv:arm64-uwp=pass
 vcpkg-ci-opencv:arm64-windows=pass
 vcpkg-ci-opencv:x64-linux=pass
 vcpkg-ci-opencv:x64-uwp=pass
@@ -1181,6 +1325,23 @@ vcpkg-ci-paraview:x64-windows-static-md=pass
 vcpkg-ci-paraview:x64-windows-static=pass
 vcpkg-ci-paraview:x64-windows=pass
 vcpkg-ci-paraview:x86-windows=pass
+vcpkg-ci-skia:arm-neon-android=pass
+vcpkg-ci-skia:arm64-android=pass
+vcpkg-ci-skia:arm64-uwp=pass
+vcpkg-ci-skia:arm64-windows=pass
+vcpkg-ci-skia:x64-android=pass
+vcpkg-ci-skia:x64-linux=pass
+vcpkg-ci-skia:x64-osx=pass
+vcpkg-ci-skia:x64-uwp=pass
+vcpkg-ci-skia:x64-windows-static-md=pass
+vcpkg-ci-skia:x64-windows-static=pass
+vcpkg-ci-skia:x64-windows=pass
+vcpkg-ci-skia:x86-windows=pass
+vcpkg-ci-soci:x64-linux=pass
+vcpkg-ci-soci:x64-osx=pass
+vcpkg-ci-soci:x64-windows=pass
+vcpkg-ci-soci:x64-windows-static=pass
+vcpkg-ci-soci:x64-windows-static-md=pass
 vcpkg-ci-wxwidgets:arm64-windows=pass
 vcpkg-ci-wxwidgets:x64-linux=pass
 vcpkg-ci-wxwidgets:x64-osx=pass
diff --git a/external_imported/vcpkg/scripts/msys/compile_wrapper_consider_clang-cl.patch b/external_imported/vcpkg/scripts/cmake/compile_wrapper_consider_clang-cl.patch
similarity index 100%
rename from external_imported/vcpkg/scripts/msys/compile_wrapper_consider_clang-cl.patch
rename to external_imported/vcpkg/scripts/cmake/compile_wrapper_consider_clang-cl.patch
diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_acquire_msys.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_acquire_msys.cmake
index 8b0b3d931..feabb1194 100644
--- a/external_imported/vcpkg/scripts/cmake/vcpkg_acquire_msys.cmake
+++ b/external_imported/vcpkg/scripts/cmake/vcpkg_acquire_msys.cmake
@@ -1,45 +1,49 @@
-# Mirror list from https://github.com/msys2/MSYS2-packages/blob/master/pacman-mirrors/mirrorlist.msys
-# Sourceforge is not used because it does not keep older package versions
+# Full mirror list: https://github.com/msys2/MSYS2-packages/blob/master/pacman-mirrors/mirrorlist.msys
 set(Z_VCPKG_ACQUIRE_MSYS_MIRRORS
-    "https://www2.futureware.at/~nickoe/msys2-mirror/"
+    # Alternative primary
+    "https://repo.msys2.org/"
+    # Tier 1
     "https://mirror.yandex.ru/mirrors/msys2/"
     "https://mirrors.tuna.tsinghua.edu.cn/msys2/"
     "https://mirrors.ustc.edu.cn/msys2/"
-    "https://mirror.bit.edu.cn/msys2/"
     "https://mirror.selfnet.de/msys2/"
-    "https://mirrors.sjtug.sjtu.edu.cn/msys2/"
 )
 
+# Downloads the given package
 function(z_vcpkg_acquire_msys_download_package out_archive)
     cmake_parse_arguments(PARSE_ARGV 1 "arg" "" "URL;SHA512;FILENAME" "")
     if(DEFINED arg_UNPARSED_ARGUMENTS)
         message(FATAL_ERROR "internal error: z_vcpkg_acquire_msys_download_package passed extra args: ${arg_UNPARSED_ARGUMENTS}")
     endif()
 
-    set(all_urls "${arg_URL}")
-
+    string(REPLACE "https://repo.msys2.org/" "https://mirror.msys2.org/" all_urls "${arg_URL}")
     foreach(mirror IN LISTS Z_VCPKG_ACQUIRE_MSYS_MIRRORS)
-        string(REPLACE "https://repo.msys2.org/" "${mirror}" mirror_url "${arg_URL}")
+        string(REPLACE "https://mirror.msys2.org/" "${mirror}" mirror_url "${arg_URL}")
         list(APPEND all_urls "${mirror_url}")
     endforeach()
 
     vcpkg_download_distfile(msys_archive
         URLS ${all_urls}
         SHA512 "${arg_SHA512}"
-        FILENAME "msys-${arg_FILENAME}"
+        FILENAME "${arg_FILENAME}"
         QUIET
     )
     set("${out_archive}" "${msys_archive}" PARENT_SCOPE)
 endfunction()
 
-# writes to the following variables in parent scope:
-#   - Z_VCPKG_MSYS_ARCHIVES
-#   - Z_VCPKG_MSYS_TOTAL_HASH
-#   - Z_VCPKG_MSYS_PACKAGES
-#   - Z_VCPKG_MSYS_${arg_NAME}_ARCHIVE
+# Declares a package
+# Writes to the following cache variables:
+#   - Z_VCPKG_MSYS_PACKAGES_AVAILABLE
+#   - Z_VCPKG_MSYS_${arg_NAME}_URL
+#   - Z_VCPKG_MSYS_${arg_NAME}_SHA512
+#   - Z_VCPKG_MSYS_${arg_NAME}_FILENAME
+#   - Z_VCPKG_MSYS_${arg_NAME}_DEPS
 #   - Z_VCPKG_MSYS_${arg_NAME}_PATCHES
+#   - Z_VCPKG_MSYS_${arg_NAME}_DIRECT
+#   - Z_VCPKG_MSYS_${arg_NAME}_PROVIDES
+#   - Z_VCPKG_MSYS_${alias}_PROVIDED_BY
 function(z_vcpkg_acquire_msys_declare_package)
-    cmake_parse_arguments(PARSE_ARGV 0 arg "" "NAME;URL;SHA512" "DEPS;PATCHES")
+    cmake_parse_arguments(PARSE_ARGV 0 arg "DIRECT" "NAME;URL;SHA512" "DEPS;PATCHES;PROVIDES")
 
     if(DEFINED arg_UNPARSED_ARGUMENTS)
         message(FATAL_ERROR "internal error: z_vcpkg_acquire_msys_declare_package passed extra args: ${arg_UNPARSED_ARGUMENTS}")
@@ -50,43 +54,110 @@ function(z_vcpkg_acquire_msys_declare_package)
         endif()
     endforeach()
 
-    if(NOT arg_URL MATCHES [[^https://repo\.msys2\.org/.*/(([^-]+(-[^0-9][^-]*)*)-.+\.pkg\.tar\.(xz|zst))$]])
-        message(FATAL_ERROR "internal error: regex does not match supplied URL to vcpkg_acquire_msys: ${arg_URL}")
+    if(arg_DIRECT)
+        if(NOT arg_NAME)
+            message(FATAL_ERROR "internal error: z_vcpkg_acquire_msys_declare_package requires argument: NAME")
+        endif()
+        get_filename_component(filename "${arg_URL}" NAME)
+    else()
+        if(NOT arg_URL MATCHES [[^https://mirror\.msys2\.org/.*/(([^/]*)-[^-/]+-[^-/]+-[^-/]+\.pkg\.tar\.(xz|zst))$]])
+            message(FATAL_ERROR "internal error: regex does not match supplied URL to vcpkg_acquire_msys: ${arg_URL}")
+        endif()
+        set(filename "msys2-${CMAKE_MATCH_1}")
+        if(NOT DEFINED arg_NAME)
+            set(arg_NAME "${CMAKE_MATCH_2}")
+        endif()
+        if(Z_VCPKG_MSYS_${arg_NAME}_DIRECT)
+            return()
+        endif()
+        if(arg_NAME IN_LIST Z_VCPKG_MSYS_PACKAGES_AVAILABLE)
+            message(FATAL_ERROR "Redeclaration of package '${arg_NAME}'")
+        endif()
     endif()
 
-    set(filename "${CMAKE_MATCH_1}")
-    if(NOT DEFINED arg_NAME)
-        set(arg_NAME "${CMAKE_MATCH_2}")
+    list(APPEND Z_VCPKG_MSYS_PACKAGES_AVAILABLE "${arg_NAME}")
+    set(Z_VCPKG_MSYS_PACKAGES_AVAILABLE "${Z_VCPKG_MSYS_PACKAGES_AVAILABLE}" CACHE INTERNAL "")
+    set(Z_VCPKG_MSYS_${arg_NAME}_URL "${arg_URL}" CACHE INTERNAL "")
+    set(Z_VCPKG_MSYS_${arg_NAME}_SHA512 "${arg_SHA512}" CACHE INTERNAL "")
+    set(Z_VCPKG_MSYS_${arg_NAME}_FILENAME "${filename}" CACHE INTERNAL "")
+    set(Z_VCPKG_MSYS_${arg_NAME}_DEPS "${arg_DEPS}" CACHE INTERNAL "")
+    set(Z_VCPKG_MSYS_${arg_NAME}_PATCHES "${arg_PATCHES}" CACHE INTERNAL "")
+    set(Z_VCPKG_MSYS_${arg_NAME}_DIRECT "${arg_DIRECT}" CACHE INTERNAL "")
+    set(Z_VCPKG_MSYS_${arg_NAME}_PROVIDES "${arg_PROVIDES}" CACHE INTERNAL "")
+    foreach(name IN LISTS arg_PROVIDES)
+        set(Z_VCPKG_MSYS_${name}_PROVIDED_BY "${arg_NAME}" CACHE INTERNAL "")
+    endforeach()
+endfunction()
+
+# Collects all required packages to satisfy the given input set
+# Writes to the following cache variables:
+#   - Z_VCPKG_MSYS_<name>_ARCHIVE
+function(z_vcpkg_acquire_msys_download_packages)
+    cmake_parse_arguments(PARSE_ARGV 0 "arg" "" "OUT_UNKNOWN;OUT_RESOLVED" "PACKAGES")
+    set(backlog "${arg_PACKAGES}")
+    list(REMOVE_DUPLICATES backlog)
+
+    list(FILTER arg_PACKAGES EXCLUDE REGEX "^mingw64")
+    if(NOT arg_PACKAGES STREQUAL "" AND NOT "msys2-runtime" IN_LIST arg_PACKAGES)
+        list(APPEND backlog "msys2-runtime")
     endif()
 
-    if("${arg_NAME}" IN_LIST Z_VCPKG_MSYS_PACKAGES OR arg_Z_ALL_PACKAGES)
-        list(REMOVE_ITEM Z_VCPKG_MSYS_PACKAGES "${arg_NAME}")
-        list(APPEND Z_VCPKG_MSYS_PACKAGES ${arg_DEPS})
-        set(Z_VCPKG_MSYS_PACKAGES "${Z_VCPKG_MSYS_PACKAGES}" PARENT_SCOPE)
+    set(unknown "")
+    set(resolved "")
+    set(need_msys_runtime 0)
+    while(NOT backlog STREQUAL "")
+        list(POP_FRONT backlog name)
+        if(DEFINED Z_VCPKG_MSYS_${name}_PROVIDED_BY AND NOT name IN_LIST Z_VCPKG_MSYS_PACKAGES_AVAILABLE)
+            set(name "${Z_VCPKG_MSYS_${name}_PROVIDED_BY}")
+            if(name IN_LIST resolved)
+                continue()
+            endif()
+        endif()
+        if(NOT name IN_LIST Z_VCPKG_MSYS_PACKAGES_AVAILABLE)
+            list(APPEND unknown "${name}")
+            continue()
+        endif()
+        list(APPEND resolved "${name}")
+        list(REMOVE_ITEM Z_VCPKG_MSYS_${name}_DEPS ${resolved} ${backlog})
+        list(APPEND backlog ${Z_VCPKG_MSYS_${name}_DEPS})
 
         z_vcpkg_acquire_msys_download_package(archive
-            URL "${arg_URL}"
-            SHA512 "${arg_SHA512}"
-            FILENAME "${filename}"
+            URL "${Z_VCPKG_MSYS_${name}_URL}"
+            SHA512 "${Z_VCPKG_MSYS_${name}_SHA512}"
+            FILENAME "${Z_VCPKG_MSYS_${name}_FILENAME}"
         )
+        set(Z_VCPKG_MSYS_${name}_ARCHIVE "${archive}" CACHE INTERNAL "")
+    endwhile()
+    if(DEFINED arg_OUT_UNKNOWN)
+        set("${arg_OUT_UNKNOWN}" "${unknown}" PARENT_SCOPE)
+    endif()
+    if(DEFINED arg_OUT_RESOLVED)
+        set("${arg_OUT_RESOLVED}" "${resolved}" PARENT_SCOPE)
+    endif()
+endfunction()
 
-        list(APPEND Z_VCPKG_MSYS_ARCHIVES "${arg_NAME}")
-        set(Z_VCPKG_MSYS_ARCHIVES "${Z_VCPKG_MSYS_ARCHIVES}" PARENT_SCOPE)
-        set(Z_VCPKG_MSYS_${arg_NAME}_ARCHIVE "${archive}" PARENT_SCOPE)
-        set(Z_VCPKG_MSYS_${arg_NAME}_PATCHES "${arg_PATCHES}" PARENT_SCOPE)
-        string(APPEND Z_VCPKG_MSYS_TOTAL_HASH "${arg_SHA512}")
-        foreach(patch IN LISTS arg_PATCHES)
+# Returns a stable collection of hashes, regardless of package order
+function(z_vcpkg_acquire_msys_collect_hashes out_hash)
+    cmake_parse_arguments(PARSE_ARGV 1 "arg" "" "" "PACKAGES")
+    list(SORT arg_PACKAGES)
+    set(result "")
+    foreach(name IN LISTS arg_PACKAGES)
+        if(NOT DEFINED Z_VCPKG_MSYS_${name}_SHA512)
+            message(FATAL_ERROR "SHA512 unknown for '${name}'.")
+        endif()
+        string(APPEND result "${Z_VCPKG_MSYS_${name}_SHA512}")
+        foreach(patch IN LISTS Z_VCPKG_MSYS_${name}_PATCHES)
             file(SHA512 "${patch}" patch_sha)
-            string(APPEND Z_VCPKG_MSYS_TOTAL_HASH "${patch_sha}")
+            string(APPEND result "${patch_sha}")
         endforeach()
-        set(Z_VCPKG_MSYS_TOTAL_HASH "${Z_VCPKG_MSYS_TOTAL_HASH}" PARENT_SCOPE)
-    endif()
+    endforeach()
+    set(${out_hash} "${result}" PARENT_SCOPE)
 endfunction()
 
 function(vcpkg_acquire_msys out_msys_root)
     cmake_parse_arguments(PARSE_ARGV 1 "arg"
         "NO_DEFAULT_PACKAGES;Z_ALL_PACKAGES"
-        ""
+        "Z_DECLARE_EXTRA_PACKAGES_COMMAND"
         "PACKAGES;DIRECT_PACKAGES"
     )
 
@@ -94,13 +165,15 @@ function(vcpkg_acquire_msys out_msys_root)
         message(WARNING "vcpkg_acquire_msys was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}")
     endif()
 
-    set(Z_VCPKG_MSYS_TOTAL_HASH "")
-    set(Z_VCPKG_MSYS_ARCHIVES "")
-
-    set(Z_VCPKG_MSYS_PACKAGES "${arg_PACKAGES}")
-
-    if(NOT arg_NO_DEFAULT_PACKAGES)
-        list(APPEND Z_VCPKG_MSYS_PACKAGES bash coreutils sed grep gawk gzip diffutils make pkg-config)
+    z_vcpkg_acquire_msys_declare_all_packages()
+    if(NOT "${arg_Z_DECLARE_EXTRA_PACKAGES_COMMAND}" STREQUAL "")
+        cmake_language(CALL "${arg_Z_DECLARE_EXTRA_PACKAGES_COMMAND}")
+    endif()
+    set(requested "${arg_PACKAGES}")
+    if(arg_Z_ALL_PACKAGES)
+        set(requested "${Z_VCPKG_MSYS_PACKAGES_AVAILABLE}")
+    elseif(NOT arg_NO_DEFAULT_PACKAGES)
+        list(APPEND requested bash coreutils file gawk grep gzip diffutils make pkgconf sed)
     endif()
 
     if(DEFINED arg_DIRECT_PACKAGES AND NOT arg_DIRECT_PACKAGES STREQUAL "")
@@ -113,421 +186,459 @@ function(vcpkg_acquire_msys out_msys_root)
             message(FATAL_ERROR "vcpkg_acquire_msys(... DIRECT_PACKAGES ...) requires exactly pairs of URL/SHA512")
         endif()
 
+        set(direct_packages "")
         # direct_packages_last > direct_packages_number - 1 > 0 - 1 >= 0, so this is fine
         foreach(index RANGE "${direct_packages_last}")
             math(EXPR url_index "${index} * 2")
             math(EXPR sha512_index "${url_index} + 1")
             list(GET arg_DIRECT_PACKAGES "${url_index}" url)
             list(GET arg_DIRECT_PACKAGES "${sha512_index}" sha512)
-
             get_filename_component(filename "${url}" NAME)
-            z_vcpkg_acquire_msys_download_package(archive
+            if(NOT filename MATCHES "^(.*)-[^-]+-[^-]+-[^-]+\.pkg\.tar\..*$")
+                message(FATAL_ERROR "Cannot determine package name for '${filename}'")
+            endif()
+            set(pkg_name "${CMAKE_MATCH_1}")
+            z_vcpkg_acquire_msys_declare_package(
+                NAME "${pkg_name}"
                 URL "${url}"
                 SHA512 "${sha512}"
-                FILENAME "${filename}"
+                DIRECT
+            )
+            list(APPEND direct_packages "${pkg_name}")
+        endforeach()
+        list(INSERT requested 0 ${direct_packages})
+    endif()
+ 
+    z_vcpkg_acquire_msys_download_packages(
+        PACKAGES ${requested}
+        OUT_RESOLVED resolved
+        OUT_UNKNOWN unknown
+    )
+    if(NOT unknown STREQUAL "")
+        message(FATAL_ERROR "Unknown packages were required for vcpkg_acquire_msys(${requested}): ${unknown}
+This can be resolved by explicitly passing URL/SHA pairs to DIRECT_PACKAGES.")
+    endif()
+    set(Z_VCPKG_MSYS_PACKAGES_RESOLVED "${resolved}" CACHE INTERNAL "Export for CI")
+
+    z_vcpkg_acquire_msys_collect_hashes(hashes PACKAGES ${resolved})
+    string(SHA512 total_hash "${hashes}")
+    string(SUBSTRING "${total_hash}" 0 16 total_hash)
+    set(path_to_root "${DOWNLOADS}/tools/msys2/${total_hash}")
+
+    if(NOT EXISTS "${path_to_root}")
+        file(REMOVE_RECURSE "${path_to_root}.tmp")
+        file(MAKE_DIRECTORY "${path_to_root}.tmp/tmp")
+        foreach(name IN LISTS resolved)
+            file(ARCHIVE_EXTRACT
+                INPUT "${Z_VCPKG_MSYS_${name}_ARCHIVE}"
+                DESTINATION "${path_to_root}.tmp"
             )
-            string(REGEX MATCH "^(([^-]+(-[^0-9][^-]*)*)-.+\.pkg\.tar\.(xz|zst))$" pkg_name "${filename}")
-            set(pkg_name "${CMAKE_MATCH_2}")
-            list(APPEND Z_VCPKG_MSYS_ARCHIVES "${pkg_name}")
-            set(Z_VCPKG_MSYS_${pkg_name}_ARCHIVE "${archive}")
-            string(APPEND Z_VCPKG_MSYS_TOTAL_HASH "${sha512}")
+            if(Z_VCPKG_MSYS_${name}_PATCHES)
+                z_vcpkg_apply_patches(
+                    SOURCE_PATH "${path_to_root}.tmp"
+                    PATCHES ${Z_VCPKG_MSYS_${name}_PATCHES}
+                )
+            endif()
         endforeach()
+        file(RENAME "${path_to_root}.tmp" "${path_to_root}")
     endif()
+    # Due to skipping the regular MSYS2 installer,
+    # some config files need to be established explicitly.
+    if(NOT EXISTS "${path_to_root}/etc/fstab")
+        # This fstab entry removes the cygdrive prefix from paths.
+        file(WRITE "${path_to_root}/etc/fstab" "none  /  cygdrive  binary,posix=0,noacl,user  0  0")
+    endif()
+    message(STATUS "Using msys root at ${path_to_root}")
+    set("${out_msys_root}" "${path_to_root}" PARENT_SCOPE)
+endfunction()
 
-    # To add new entries, use https://packages.msys2.org/package/$PACKAGE?repo=msys
+# Expand this while CMAKE_CURRENT_LIST_DIR is for this file.
+set(Z_VCPKG_AUTOMAKE_CLANG_CL_PATCH "${CMAKE_CURRENT_LIST_DIR}/compile_wrapper_consider_clang-cl.patch")
+
+macro(z_vcpkg_acquire_msys_declare_all_packages)
+    set(Z_VCPKG_MSYS_PACKAGES_AVAILABLE "" CACHE INTERNAL "")
+
+    # The following list can be updated via test port vcpkg-ci-msys2[update-all].
+    # Upstream binary package information is available via
+    # https://packages.msys2.org/search?t=binpkg&q=<Pkg>
+
+    # msys subsystem
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/unzip-6.0-2-x86_64.pkg.tar.xz"
-        SHA512 b8a1e0ce6deff26939cb46267f80ada0a623b7d782e80873cea3d388b4dc3a1053b14d7565b31f70bc904bf66f66ab58ccc1cd6bfa677065de1f279dd331afb9
-        DEPS libbz2
+        URL "https://mirror.msys2.org/msys/x86_64/autoconf-wrapper-20221207-2-any.pkg.tar.zst"
+        SHA512 a4034378a142321d4cc7299a73e65f01c158524c4f3a5a86109da111eb3aecba3e944d848b99b8a90b783e7bdf410e75e7331e8f14961ceca5764659da92f2e5
+        PROVIDES autoconf
+        DEPS autoconf2.72 bash sed
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/libbz2-1.0.8-3-x86_64.pkg.tar.zst"
-        SHA512 955420cabd45a02f431f5b685d8dc8acbd07a8dcdda5fdf8b9de37d3ab02d427bdb0a6d8b67c448e307f21094e405e916fd37a8e9805abd03610f45c02d64b9e
+        URL "https://mirror.msys2.org/msys/x86_64/autoconf2.72-2.72-1-any.pkg.tar.zst"
+        SHA512 c8dc3e317dc4befc5f2848ac339a74f9dc8f021767aadb3d2c50b13869e0ef49fb48c62a0a1df5176a15a4f10196fcd2307efb83ff143ba1d20301882ba8dd1e
+        DEPS awk bash diffutils m4 perl sed
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/patch-2.7.6-1-x86_64.pkg.tar.xz"
-        SHA512 04d06b9d5479f129f56e8290e0afe25217ffa457ec7bed3e576df08d4a85effd80d6e0ad82bd7541043100799b608a64da3c8f535f8ea173d326da6194902e8c
+        URL "https://mirror.msys2.org/msys/x86_64/autoconf-archive-2023.02.20-1-any.pkg.tar.zst"
+        SHA512 0dbdba67934402eeb974e6738eb9857d013342b4e3a11200710b87fbf085d5bebf49b29b6a14b6ff2511b126549919a375b68f19cc22aa18f6ba23c57290ac72
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/gzip-1.11-1-x86_64.pkg.tar.zst"
-        SHA512 bcd9d7839aef5f2b73c4d39b51838e62626c201c808d512806ba0a1619aee83c7deddb0d499fd93f9815fe351d7ab656c31c9dc7ee1171d77ad6d598e04dfcbe
-        DEPS msys2-runtime
+        URL "https://mirror.msys2.org/msys/x86_64/automake-wrapper-20221207-2-any.pkg.tar.zst"
+        SHA512 4351c607edcf00df055b1310a790e41a63c575fbd80a6888d3693b88cad31d4628f9b96f849e319089893c826cf4473d9b31206d7ccb4cea15fd05b6b0ccb582
+        PROVIDES automake
+        DEPS automake1.16 bash gawk
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/texinfo-6.8-3-x86_64.pkg.tar.zst"
-        SHA512 5cc16d3b3c3b9859fe61233fa27f2146526e2b4d6e626814d283b35bfd77bc15eb4ffaec00bde6c10df93466d9155a06854a7ecf2e0d9af746dd56c4d88d192e
+        URL "https://mirror.msys2.org/msys/x86_64/automake1.16-1.16.5-1-any.pkg.tar.zst"
+        SHA512 62c9dfe28d6f1d60310f49319723862d29fc1a49f7be82513a4bf1e2187ecd4023086faf9914ddb6701c7c1e066ac852c0209db2c058f3865910035372a4840a
         DEPS bash perl
+        PATCHES "${Z_VCPKG_AUTOMAKE_CLANG_CL_PATCH}"
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/bash-5.1.008-1-x86_64.pkg.tar.zst"
-        SHA512 a2ab8c958615134dc666254baca8cb13ed773036954e458de74ffb3bfe661bb33149082d38b677024da451755098a9201ab7dd435ced6e7f6b4e94c3ae368daf
-        DEPS msys2-runtime
+        URL "https://mirror.msys2.org/msys/x86_64/bash-5.2.026-1-x86_64.pkg.tar.zst"
+        SHA512 f69046b27b0ecec6afc60b3ba107491c50c70f6f41b989fe6fcc58da798345cb8336ff6cc668bc13ee49ff24d3be4b5932bc8fe87e80da4e6243063c18f0dcf8
+        PROVIDES sh
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/autoconf-2.71-3-any.pkg.tar.zst"
-        SHA512 f639deac9b2191c2096584cf374103bbb1e9d2476dd0ebec94b1e80da59be25b88e362ac5280487a89f0bb0ed57f99b66e314f36b7de9cda03c0974806a3a4e2
-        DEPS m4 perl
+        URL "https://mirror.msys2.org/msys/x86_64/binutils-2.42-1-x86_64.pkg.tar.zst"
+        SHA512 6e12fbb6e7a14bac5cf3665d0e9867d40ef47ba76d4887748671e46e9ea288dbfc59b40461e6552559aa24651a057c18c022d2f24d679edfc42d8ca7e43af28d
+        DEPS libiconv libintl zlib
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/autoconf-archive-2019.01.06-1-any.pkg.tar.xz"
-        SHA512 77540d3d3644d94a52ade1f5db27b7b4b5910bbcd6995195d511378ca6d394a1dd8d606d57161c744699e6c63c5e55dfe6e8664d032cc8c650af9fdbb2db08b0
-        DEPS m4 perl
+        URL "https://mirror.msys2.org/msys/x86_64/bzip2-1.0.8-4-x86_64.pkg.tar.zst"
+        SHA512 1d2ce42c6775c0cb0fe9c2863c975fd076579131d0a5bce907355315f357df4ee66869c9c58325f5b698f3aba2413b2823deda86dd27fdb6e2e5e5d4de045259
+        DEPS libbz2
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/diffutils-3.8-2-x86_64.pkg.tar.zst"
-        SHA512 ee74e457c417d6978b3185f2fb8e15c9c30ecfc316c2474d69c978e7eb2282a3bd050d68dbf43d694cb5ab6f159b0e7ca319d01f8192071d82a224dde87d69b5
-        DEPS msys2-runtime
+        URL "https://mirror.msys2.org/msys/x86_64/coreutils-8.32-5-x86_64.pkg.tar.zst"
+        SHA512 63f99348e654440458f26e9f52ae3289759a5a03428cf2fcf5ac7b47fdf7bf7f51d08e3346f074a21102bee6fa0aeaf88b8ebeba1e1f02a45c8f98f69c8db59c
+        DEPS libiconv libintl gmp
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/binutils-2.37-5-x86_64.pkg.tar.zst"
-        SHA512 32129cf97b53d5f6d87b42f17643e9dfc2e41b9ab4e4dfdc10e69725a9349bb25e57e0937e7504798cae91f7a88e0f4f5814e9f6a021bb68779d023176d2f311
-        DEPS libiconv libintl
+        URL "https://mirror.msys2.org/msys/x86_64/diffutils-3.10-1-x86_64.pkg.tar.zst"
+        SHA512 7ed406370a699be98bff4eeb156a063de80ac8e332fb1873639e0b95b2e72e626351e24c5ca0021af9c0e56c4a3d91bd6669e6245b21c9d4ebdbb36888d8e39d
+        DEPS libiconv libintl sh
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/libtool-2.4.7-3-x86_64.pkg.tar.zst"
-        SHA512 a202ddaefa93d8a4b15431dc514e3a6200c47275c5a0027c09cc32b28bc079b1b9a93d5ef65adafdc9aba5f76a42f3303b1492106ddf72e67f1801ebfe6d02cc
-        DEPS grep sed coreutils file findutils
+        URL "https://mirror.msys2.org/msys/x86_64/file-5.45-1-x86_64.pkg.tar.zst"
+        SHA512 fae01c7e2c88357be024aa09dba7b805d596cec7cde5c29a46c3ab209c67de64a005887e346edaad84b5173c033cb6618997d864f7fad4a7555bd38a3f7831c5
+        DEPS gcc-libs libbz2 liblzma libzstd zlib
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/file-5.41-2-x86_64.pkg.tar.zst"
-        SHA512 124c3983608879362acea7d487bf23690f371b3cfe0355385f0e643263b2a5568abe5cebda92ef9bc534e81f850138f589e75982f36a53f509676056d71de642
-        DEPS gcc-libs zlib libbz2
+        URL "https://mirror.msys2.org/msys/x86_64/findutils-4.9.0-3-x86_64.pkg.tar.zst"
+        SHA512 1538733929ecc11bc7c19797577e4cd59cc88499b375e3c2ea4a8ed4d66a1a02f4468ff916046c76195ba92f4c591d0e351371768117a423595d2e43b3321aad
+        DEPS libintl libiconv
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/zlib-1.2.11-1-x86_64.pkg.tar.xz"
-        SHA512 b607da40d3388b440f2a09e154f21966cd55ad77e02d47805f78a9dee5de40226225bf0b8335fdfd4b83f25ead3098e9cb974d4f202f28827f8468e30e3b790d
-        DEPS gcc-libs
+        URL "https://mirror.msys2.org/msys/x86_64/gawk-5.3.0-1-x86_64.pkg.tar.zst"
+        SHA512 01a65153ffa109c51f05ef014534feecde9fc3e83ab4f5fc7f0ae957ea8a0bad2756fc65a86e20ab87a063c92161f7a7fccc8232b51c44c6ee506b7cff3762e7
+        PROVIDES awk
+        DEPS libintl libreadline mpfr sh
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/bzip2-1.0.8-3-x86_64.pkg.tar.zst"
-        SHA512 9d03e8fc5677dd1386454bd27a683667e829ad5b1b87fc0879027920b2e79b25a2d773ab2556cd29844b18dd25b26fef5a57bf89e35ca318e39443dcaf0ca3ba
-        DEPS gcc-libs
+        URL "https://mirror.msys2.org/msys/x86_64/gcc-libs-13.2.0-2-x86_64.pkg.tar.zst" # 05-Jul-2022
+        SHA512 0bf8d56516ed7f14db2d1a991ccced0977d33a560f1844b114b62b2cd93d96374d3b85c5257adc0c4f141c3f3533bc4e8914349547092d607c22dea3bdbbbd0d
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/libbz2-1.0.8-3-x86_64.pkg.tar.zst"
-        SHA512 955420cabd45a02f431f5b685d8dc8acbd07a8dcdda5fdf8b9de37d3ab02d427bdb0a6d8b67c448e307f21094e405e916fd37a8e9805abd03610f45c02d64b9e
-        DEPS gcc-libs
+        URL "https://mirror.msys2.org/msys/x86_64/gettext-0.22.4-1-x86_64.pkg.tar.zst"
+        SHA512 7bd1dc50df8a973a075286fdf115fa30c8a78aa23d2845e2bdeb6068bf3391321d9b3ce3241626453bb660d1a57563bea44eebadf81cb2f98f15fbaf266648ec
+        DEPS libasprintf libgettextpo libintl
     )
+    # This package shouldn't be a here
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/coreutils-8.32-2-x86_64.pkg.tar.zst"
-        SHA512 0719e8d3683711453ff77496cad11583e877ea52806e5ea3f470444705705db20a8a9fe99987166b02c6bd240c06c7d86faa979a7bc5536c9c804d800b60b7be
-        DEPS libiconv libintl gmp
+        URL "https://mirror.msys2.org/msys/x86_64/gettext-devel-0.22.4-1-x86_64.pkg.tar.zst"
+        SHA512 e7748736014b0aa47f2bc740189a5e8e1bcc99a82ccd02d6f75e226b041704e4f353107df175c0547651a05f5a352ec474a7af693fb33d42a8885e47ac371d2e
+        DEPS gettext # libiconv-devel
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/grep-3.0-2-x86_64.pkg.tar.xz"
-        SHA512 c784d5f8a929ae251f2ffaccf7ab0b3936ae9f012041e8f074826dd6077ad0a859abba19feade1e71b3289cc640626dfe827afe91c272b38a1808f228f2fdd00
-        DEPS libiconv libintl libpcre
+        URL "https://mirror.msys2.org/msys/x86_64/gmp-6.3.0-1-x86_64.pkg.tar.zst"
+        SHA512 d4e8549e55d4088eca30753f867bf82d9287955209766f488f2a07ecc71bc63ef2c50fcc9d47470ea3b0d2f149f1648d9c2453e366e3eb2c2e2d60939f311a40
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/sed-4.8-2-x86_64.pkg.tar.zst"
-        SHA512 8391be777239e0bfc19dc477995ee581ea9dbb1ba34fc27f57ba9d858e7489ac9b7200479d405712b43fa88434dd597be71d161fa8c05606e7ef991711bfc4c1
-        DEPS libintl
+        URL "https://mirror.msys2.org/msys/x86_64/grep-1~3.0-6-x86_64.pkg.tar.zst"
+        SHA512 79b4c652082db04c2ca8a46ed43a86d74c47112932802b7c463469d2b73e731003adb1daf06b08cf75dc1087f0e2cdfa6fec0e8386ada47714b4cff8a2d841e1
+        DEPS libiconv libintl libpcre sh
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/libpcre-8.45-1-x86_64.pkg.tar.zst"
-        SHA512 b10a69380c44ea35367f310a7400eae26beacf347ddbb5da650b54924b80ffd791f12a9d70923567e5081e3c7098f042e47bcff1328d95b0b27ce63bcd762e88
-        DEPS gcc-libs
+        URL "https://mirror.msys2.org/msys/x86_64/gzip-1.13-1-x86_64.pkg.tar.zst"
+        SHA512 4dbcfe5df7c213b10f003fc2a15123a5ed0d1a6d09638c467098f7b7db2e4fdd75a7ceee03b3a26c2492ae485267d626db981c5b9167e3acb3d7436de97d0e97
+        DEPS bash
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/m4-1.4.19-2-x86_64.pkg.tar.zst"
-        SHA512 7471099ba7e3b47e5b019dc0e563165a8660722f2bbd337fb579e6d1832c0e7dcab0ca9297c4692b18add92c4ad49e94391c621cf38874e2ff63d4f926bac38c
-        DEPS msys2-runtime
+        URL "https://mirror.msys2.org/msys/x86_64/libasprintf-0.22.4-1-x86_64.pkg.tar.zst"
+        SHA512 06f353d2020d1e7168f4084e9fc17856a158a67a61098314e4b1d7db075542eb29dfe8a84bd154dad28942ee8eaae1e13a6510a4d2caab4509d9f3ea22db6d87
+        DEPS gcc-libs
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/automake-wrapper-11-4-any.pkg.tar.zst"
-        SHA512 175940ebccb490c25d2c431dd025f24a7d0c930a7ee8cb81a44a4989c1d07f4b5a8134e1d05a7a1b206f8e19a2308ee198b1295e31b2e139f5d9c1c077252c94
-        DEPS gawk
+        URL "https://mirror.msys2.org/msys/x86_64/libbz2-1.0.8-4-x86_64.pkg.tar.zst"
+        SHA512 5a7be6d04e55e6fb1dc0770a8c020ca24a317807c8c8a4813146cd5d559c12a6c61040797b062e441645bc2257b390e12dd6df42519e56278a1fe849fe76a1c4
+        DEPS gcc-libs
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/gawk-5.1.0-2-x86_64.pkg.tar.zst"
-        SHA512 d4b00e2b53ce99ddd3ee8e41c41add5ab36d26a54107acf7f5a5bf4a0033d72465cdab86f5b2eb8b7aca2cb5027a3e35cb194794c3bf563c0075ca3dbcad6987
-        DEPS libintl libreadline mpfr
+        URL "https://mirror.msys2.org/msys/x86_64/libgettextpo-0.22.4-1-x86_64.pkg.tar.zst"
+        SHA512 7552bc873331f07a4c006f27fe9f72186eed9717d68c4cbf54a75ff65c9445f874c43ccced2f9fa75ff1602c1209f6f1f4335a6ae6bf9bd5e951292584db7539
+        DEPS gcc-libs
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/mpfr-4.1.0-1-x86_64.pkg.tar.zst"
-        SHA512 d64fa60e188124591d41fc097d7eb51d7ea4940bac05cdcf5eafde951ed1eaa174468f5ede03e61106e1633e3428964b34c96de76321ed8853b398fbe8c4d072
-        DEPS gmp gcc-libs
+        URL "https://mirror.msys2.org/msys/x86_64/libiconv-1.17-1-x86_64.pkg.tar.zst"
+        SHA512 e8fc6338d499ccf3a143b3dbdb91838697de76e1c9582bb44b0f80c1d2da5dcfe8102b7512efa798c5409ba9258f4014eb4eccd24a9a46d89631c06afc615678
+        DEPS gcc-libs libintl
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/gmp-6.2.1-1-x86_64.pkg.tar.zst"
-        SHA512 c5c8009ef069d05c2209b69c8e87094b09aac4b5c3dfdbea474d8262e55d286b400f1360c6a9778fd5eb87fb76a6463c21188286a1a1919ad79153eae3c44b0f
+        URL "https://mirror.msys2.org/msys/x86_64/libintl-0.22.4-1-x86_64.pkg.tar.zst"
+        SHA512 07f41f7fa53967bb5b0aca72255c70d7aeed58ea86b67bd0e765e08c20c50187ef2e775b630c0d48b3afbe62203754f7e8653a5f2e1a87a38b4af5753c7bd232
+        DEPS gcc-libs libiconv
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/xz-5.2.5-1-x86_64.pkg.tar.xz" # this seems to require immediate updating on version bumps.
-        SHA512 99d092c3398277e47586cead103b41e023e9432911fb7bdeafb967b826f6a57d32e58afc94c8230dad5b5ec2aef4f10d61362a6d9e410a6645cf23f076736bba
-        DEPS liblzma libiconv gettext
+        URL "https://mirror.msys2.org/msys/x86_64/liblzma-5.4.6-2-x86_64.pkg.tar.zst"
+        SHA512 d79bf6089f258e17226b30c1d68ee7b391048174386d366007f2361f2db0dc069a056549f483ac62285db238d9812d801bc347684ab485058d55cad16ce36dc0
+        # This package installs only a DLL. No extra deps.
+        DEPS # gettext libiconv sh
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/liblzma-5.2.5-1-x86_64.pkg.tar.xz"
-        SHA512 8d5c04354fdc7309e73abce679a4369c0be3dc342de51cef9d2a932b7df6a961c8cb1f7e373b1b8b2be40343a95fbd57ac29ebef63d4a2074be1d865e28ca6ad
+        URL "https://mirror.msys2.org/msys/x86_64/libpcre-8.45-4-x86_64.pkg.tar.zst"
+        SHA512 e1eb5cb38dce22012527bba2e92f908bf23c7725d77dcbd7fa14597af0f5b413319e0a7dd66555370afffc3b55d6074b8b83fd3c384d31ac505b74db246d54ac
+        DEPS gcc-libs
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/libreadline-8.1.001-1-x86_64.pkg.tar.zst"
-        SHA512 4104eb0c18b8c06ab3bd4ba6420e3464df8293bec673c88da49e2f74cf1d583c922e9ead5691271fe593d424f92d1fd8668a3002174d756993d5b18337459bab
+        URL "https://mirror.msys2.org/msys/x86_64/libreadline-8.2.010-1-x86_64.pkg.tar.zst"
+        SHA512 ce5e4b4abd347a2e8d4a48860aca062b0478000b3696859d0e143643f16b845bc0e7c84bf4fbf95cbcc043a6acebe2d28acc65b763d2de6a95f13ab6b3a3649f
         DEPS ncurses
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/ncurses-6.2-2-x86_64.pkg.tar.zst"
-        SHA512 4bf744a21ab2030ea9d65eb4d824ec5bed4532b7a489859e5e19bba11b5ba9be08613de48acb38baacfd2a7295722e4d858d7c577565f1999d2583defbbb58f2
-        DEPS msys2-runtime
-    )
-    z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/automake1.16-1.16.3-3-any.pkg.tar.zst"
-        SHA512 77a195a9fe8680bee55c04b8ecc0e9ee43e2d89607c745098dfac4687f4f853885cabbb005202d70e9a9cdf9facf6849cc47c6b2f25573b5af8201696d926c72
-        DEPS perl
-        PATCHES "${SCRIPTS}/msys/compile_wrapper_consider_clang-cl.patch"
+        URL "https://mirror.msys2.org/msys/x86_64/libtool-2.4.7-3-x86_64.pkg.tar.zst"
+        SHA512 a202ddaefa93d8a4b15431dc514e3a6200c47275c5a0027c09cc32b28bc079b1b9a93d5ef65adafdc9aba5f76a42f3303b1492106ddf72e67f1801ebfe6d02cc
+        DEPS sh tar
+             # extra deps which are really needed
+             awk findutils grep sed
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/perl-5.32.1-2-x86_64.pkg.tar.zst"
-        SHA512 ad21734c05bc7faa809bc4ba761fb41a3b448d31794d1fd3d430cf4afe05ae991aabece4ec9a25718c01cc323d507bf97530533f0a20aabc18a7a2ccc0ae02b1
-        DEPS libcrypt
+        URL "https://mirror.msys2.org/msys/x86_64/libxcrypt-4.4.36-1-x86_64.pkg.tar.zst"
+        SHA512 457320daebd1aa45461788fb52dd4772fe91c34902201fac81d94ee2cbbfa216b02b3831a3e32a5ac638a3f12ac31fcec94ee95b19696fec6624e10e3dc5ffff
+        DEPS gcc-libs
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/libcrypt-2.1-3-x86_64.pkg.tar.zst"
-        SHA512 15cee333a82b55ff6072b7be30bf1c33c926d8ac21a0a91bc4cbf655b6f547bc29496df5fa288eb47ca2f88af2a4696f9b718394437b65dd06e3d6669ca0c2e5
+        URL "https://mirror.msys2.org/msys/x86_64/libzstd-1.5.5-1-x86_64.pkg.tar.zst"
+        SHA512 c3d491f90bef0cbd7447303ff6f5a647e9fcf7bb0af9116cfe5fe421180e2283ec9403c768caa9434e9b158ce6ebde1a4750c56db8f67dfac4d6282d0ac30413
         DEPS gcc-libs
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/pkg-config-0.29.2-4-x86_64.pkg.tar.zst"
-        SHA512 9f72c81d8095ca1c341998bc80788f7ce125770ec4252f1eb6445b9cba74db5614caf9a6cc7c0fcc2ac18d4a0f972c49b9f245c3c9c8e588126be6c72a8c1818
-        DEPS libiconv
+        URL "https://mirror.msys2.org/msys/x86_64/m4-1.4.19-2-x86_64.pkg.tar.zst"
+        SHA512 7471099ba7e3b47e5b019dc0e563165a8660722f2bbd337fb579e6d1832c0e7dcab0ca9297c4692b18add92c4ad49e94391c621cf38874e2ff63d4f926bac38c
+        DEPS bash gcc-libs libiconv
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/make-4.3-3-x86_64.pkg.tar.zst"
-        SHA512 1d991bfc2f076c8288023c7dd71c65470ad852e0744870368a4ab56644f88c7f6bbeca89dbeb7ac8b2719340cfec737a8bceae49569bbe4e75b6b8ffdcfe76f1
-        DEPS libintl msys2-runtime
+        URL "https://mirror.msys2.org/msys/x86_64/make-4.4.1-1-x86_64.pkg.tar.zst"
+        SHA512 7e1c95b976d949db4b74c444e0d1495bbee26649aa82eadf34076dba3c1223d4e7b901e07935ba73dceda67f0a0cf25dd99fe3eed5300a5163fdaab14ca8d9fc
+        DEPS libintl sh
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/gettext-devel-0.21-1-x86_64.pkg.tar.zst"
-        SHA512 44444064b9860dbd3cb886812fb20ee97ab04a65616cca497be69c592d5507e7bc66bfe8dbd060a4df9c5d9bb44cb0f231584d65cb04351146d54d15852227af
-        DEPS gettext
+        URL "https://mirror.msys2.org/msys/x86_64/mpfr-4.2.1-1-x86_64.pkg.tar.zst"
+        SHA512 7417bb02a0f1073b8c1a64732463ec178d28f75eebd9621d02117cda1d214aff3e28277bd20e1e4731e191daab26e38333ace007ed44459ce3e2feae27aedc00
+        DEPS gmp
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/gettext-0.21-1-x86_64.pkg.tar.zst"
-        SHA512 6ef5f4094c4a174550a898cac4f60215d22de09f7e5f72bdb297d18a6f027e6122b4a519aa8d5781f9b0201dcae14ad7910b181b1499d6d8bbeb5a35b3a08581
-        DEPS libintl libgettextpo libasprintf tar
+        URL "https://mirror.msys2.org/msys/x86_64/msys2-runtime-3.4.10-4-x86_64.pkg.tar.zst"
+        SHA512 b921b59b840dc2813825917dcff0c3686658f9af556bdb95b536fcb949d593886c9815e4bff136472797218e1f0462fbc49f87f2a31ec9abb2407c5506807f88
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/tar-1.34-2-x86_64.pkg.tar.zst"
-        SHA512 127a971f5c087500ec4858697205b36ae76dba82307f1bcaaa44e746337d85d97360e46e55ef7fecbfa2a4af428ee26d804fa7d7c2b8ce6de1b86328dd14ef2d
-        DEPS libiconv libintl
+        URL "https://mirror.msys2.org/msys/x86_64/ncurses-6.4-2-x86_64.pkg.tar.zst"
+        SHA512 31d1e75071158aae970209de79adc3b3ff1d189ffc18460b3f1c818784e571ff3e0ff2767013516f9bb3fd0e62c2038444f1e8c1816db357d57e31f8663f4420
+        DEPS gcc-libs
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/libgettextpo-0.21-1-x86_64.pkg.tar.zst"
-        SHA512 bb217639deadb36734bafb8db5217e654d00b93a3ef366116cc6c9b8b8951abef9a7e9b04be3fae09074cf68576f18575a0d09f3d2f344985606c1449a17222e
-        DEPS gcc-libs
+        URL "https://mirror.msys2.org/msys/x86_64/patch-2.7.6-2-x86_64.pkg.tar.zst"
+        SHA512 eb484156e6e93da061645437859531f7b04abe6fef9973027343302f088a8681d413d87c5635a10b61ddc4a3e4d537af1de7552b3a13106639e451b95831ec91
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/libasprintf-0.21-1-x86_64.pkg.tar.zst"
-        SHA512 62dde7bfcfea75ea9adb463807d7c128019ffeec0fb23e73bc39f760e45483c61f4f29e89cdbfab1e317d520c83fe3b65306fbd7258fe11ea951612dbee479fe
-        DEPS gcc-libs
+        URL "https://mirror.msys2.org/msys/x86_64/perl-5.38.2-1-x86_64.pkg.tar.zst"
+        SHA512 00c992e0fd8847f579dd33a82140034c6a81b650f456d2b22706f82c5c6db04dce4f1194024775081ae7bffa01afc476df1815ec7cc98ebb0a676726a0c1c2b2
+        DEPS coreutils libxcrypt sh
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/findutils-4.8.0-1-x86_64.pkg.tar.zst"
-        SHA512 74f8750636becefd3675c89957dfb8a244d2db6fec80bf352998edfef93f66d0e2a37d7f2869a79dd197acf2057ccd6aefd12c58e94154765896a432831ab49c
-        DEPS libintl libiconv
+        URL "https://mirror.msys2.org/msys/x86_64/pkgconf-2.1.0-1-x86_64.pkg.tar.zst"
+        SHA512 4376aba6fd2c118b1cb7e2008a23724aae62e9c972849b984a087079eaff1a29f423d3dedc3d7cfa682d931eb9a72891c8630196507a4a2cbe15f80a359bfa58
+        PROVIDES pkg-config
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/libintl-0.21-1-x86_64.pkg.tar.zst"
-        SHA512 be0242eed25793e86e0560868f76cf06a358ffc0b2beb357e776d6c7819e545ac90f9358b17a85aa598584babe3ab4bb4544e360a28f5cec965f314178b930d1
-        DEPS libiconv
+        URL "https://mirror.msys2.org/msys/x86_64/sed-4.9-1-x86_64.pkg.tar.zst"
+        SHA512 8006a83f0cc6417e3f23ffd15d0cbca2cd332f2d2690232a872ae59795ac63e8919eb361111b78f6f2675c843758cc4782d816ca472fe841f7be8a42c36e8237
+        DEPS libintl sh
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/libiconv-1.16-2-x86_64.pkg.tar.zst"
-        SHA512 3ab569eca9887ef85e7dd5dbca3143d8a60f7103f370a7ecc979a58a56b0c8dcf1f54ac3df4495bc306bd44bf36ee285aaebbb221c4eebfc912cf47d347d45fc
-        DEPS gcc-libs
+        URL "https://mirror.msys2.org/msys/x86_64/tar-1.35-2-x86_64.pkg.tar.zst"
+        SHA512 86269fe17729e5381f8236a0251088110725c3eb930215b8378b6673e5ee136847997bb6a667fe0398b65b85e3f3a7e4679a0fd4bb2ebcb9429a5d7273a02d54
+        DEPS libiconv libintl sh
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/gcc-libs-11.2.0-3-x86_64.pkg.tar.zst"
-        SHA512 be7bb61d1b87eafbb91cf9d0fee3270b9d5e2420c403ea394967941195d52ae248ce4ffde20af41a05310527a920269018f49487be617211a5e340486babd0f8
-        DEPS msys2-runtime
+        URL "https://mirror.msys2.org/msys/x86_64/texinfo-7.1-2-x86_64.pkg.tar.zst"
+        SHA512 10edea1d3e2720afd47f0ff77ba47849b3eaf5d62d6025c3bce1d683302ae11126e7ee7b26751d1a6a66bc86a4c09021feb373434b1808441897e02245235c7b
+        DEPS perl sh
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/msys2-runtime-3.2.0-8-x86_64.pkg.tar.zst"
-        SHA512 fdd86f4ffa6e274d6fef1676a4987971b1f2e1ec556eee947adcb4240dc562180afc4914c2bdecba284012967d3d3cf4d1a392f798a3b32a3668d6678a86e8d3
+        URL "https://mirror.msys2.org/msys/x86_64/unzip-6.0-3-x86_64.pkg.tar.zst"
+        SHA512 1d6df49e826617ef3d3976be33361e189d8a5aee3a33ae79474fd08ca44ebd113981e6ba25c968b3cf5fb9826edd42dee21a97261cbc86fd8b143c950ba1f357
+        DEPS bash libbz2
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/msys/x86_64/which-2.21-4-x86_64.pkg.tar.zst"
+        URL "https://mirror.msys2.org/msys/x86_64/which-2.21-4-x86_64.pkg.tar.zst"
         SHA512 5323fd6635093adf67c24889f469e1ca8ac969188c7f087244a43b3afa0bf8f14579bd87d9d7beb16a7cd61a5ca1108515a46b331868b4817b35cebcb4eba1d1
+        DEPS sh
     )
-
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-numpy-1.20.3-1-any.pkg.tar.zst"
-        SHA512 ce73d4270942f61963e8307f6bec945d14e3774455684842b8fde836b19a4e9cbf8efd0663ffb28ad872493db70fa3a4e14bd0b248c2067199f4fee94e80e77e
-        DEPS mingw-w64-x86_64-openblas mingw-w64-x86_64-python
+        URL "https://mirror.msys2.org/msys/x86_64/xz-5.4.6-2-x86_64.pkg.tar.zst"
+        SHA512 301e612ce0174b1d80a0e40c96f6bc2941c57f5e2a6c0e8e05b9d479cc000204d0df364c0a4df6eeb923107bee3e8f20cbef35825a2eec3e489c525ce2605534
+        DEPS libiconv libintl liblzma
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-openblas-0.3.19-1-any.pkg.tar.zst"
-        SHA512 0d18a93d7804d6469b8566cf4ad3a7efbdf8a4a4b05d191b23a30e107586423c6338b9f4a5ea2cc93052e6c0336dc82a43c26189c410263a6e705e6f3ebe261a
-        DEPS mingw-w64-x86_64-gcc-libgfortran mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libwinpthread
+        URL "https://mirror.msys2.org/msys/x86_64/zlib-1.3.1-1-x86_64.pkg.tar.zst"
+        SHA512 a432b0f927d342b678df706487595eff1b780371548933f956adcf697eea11ddbca2863d9d9fb88675a7040dcfddab56f8f71a8ae4d0cd4969e715545c77e87c
+        DEPS gcc-libs
     )
+
+    # mingw64 subsystem
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libgfortran-11.2.0-8-any.pkg.tar.zst"
-        SHA512 8537b55633bc83d81d528378590e417ffe8c26b6c327d8b6d7ba50a8b5f4e090fbe2dc500deb834120edf25ac3c493055f4de2dc64bde061be23ce0f625a8893
+        URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-bzip2-1.0.8-3-any.pkg.tar.zst"
+        SHA512 fb1ae524d7b04e1f35c3101c318136dbe08da8093bda98f6aea7e6c2564fec5f8533fb61cac5001b6425105cd982511964ec04099c6651f990dc3b8baf7f7057
         DEPS mingw-w64-x86_64-gcc-libs
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-3.8.9-2-any.pkg.tar.zst"
-        SHA512 8a45b28b2b0471718bd1ab096958872b18ae3b25f06c30718c54d1edaf04214397330a51776f3e4eee556ac47d9e3aa5e1b211c5df0cf6be3046a6f3a79cfa7d
-        DEPS mingw-w64-x86_64-bzip2 mingw-w64-x86_64-expat mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libffi mingw-w64-x86_64-mpdecimal mingw-w64-x86_64-ncurses mingw-w64-x86_64-openssl mingw-w64-x86_64-sqlite3 mingw-w64-x86_64-tcl mingw-w64-x86_64-tk mingw-w64-x86_64-xz mingw-w64-x86_64-zlib
+        URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-ca-certificates-20230311-1-any.pkg.tar.zst"
+        SHA512 f7526ad35bccc5edba3fcf1354a85eacbd61dba5780b1bc65c7e8795ecb252432004af809052bb0ba981b1dea174c40e2d3f20655d8e2b29be95ad54d2aa5782
+        DEPS mingw-w64-x86_64-p11-kit
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-bzip2-1.0.8-2-any.pkg.tar.zst"
-        SHA512 4f7ba44189d953d4d00e7bbf5a7697233f759c92847c074f0f2888d2a641c59ce4bd3c39617adac0ad7b53c5836e529f9ffd889f976444016976bb517e5c24a2
-        DEPS mingw-w64-x86_64-gcc-libs
+        URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-expat-2.5.0-1-any.pkg.tar.zst"
+        SHA512 b49ec84750387af5b73a78d654673d62cf0e2cb2b59b4d25acb7eca3830018f7a2aefe600d67d843417cfbdd97db81ecfd49a8811e312f53b42c21fb106b230d
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpdecimal-2.5.1-1-any.pkg.tar.zst"
-        SHA512 1204c31367f9268ffd6658be04af7687c01f984c9d6be8c7a20ee0ebde1ca9a03b766ef1aeb1fa7aaa97b88a57f7a73afa7f7a7fed9c6b895a032db11e6133bf
+        URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-libgfortran-13.2.0-3-any.pkg.tar.zst"
+        SHA512 da0902979b2fd1a556d639587caeb24a756bdab29f6179fdb2deac3463bb7c150f13db6b944da2a7ade69d496199b7e8bd22ec1515beb26fab1a01e3b4e6c2bd
+        PROVIDES mingw-w64-x86_64-fc-libs
         DEPS mingw-w64-x86_64-gcc-libs
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-ncurses-6.3-3-any.pkg.tar.zst"
-        SHA512 888c155d878651dc31c9a01455ab689d7b644cec759521b69b8399c20b6ddc77c90f3ee4ddeed8857084335335b4b30e182d826fb5b78719b704f13a1dfdbd54
-        DEPS mingw-w64-x86_64-libsystre
+        URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-libs-13.2.0-3-any.pkg.tar.zst"
+        SHA512 f904ee75196ab63df4b63b84f08bfd5956a178c72fea21fdcf8727f7d70f538b358a546316c4542c36a5c3169f88437426c785ac8e2a99d8eb952be7429216d4
+        PROVIDES mingw-w64-x86_64-omp
+        DEPS mingw-w64-x86_64-libwinpthread
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libsystre-1.0.1-4-any.pkg.tar.xz"
-        SHA512 6540e896636d00d1ea4782965b3fe4d4ef1e32e689a98d25e2987191295b319eb1de2e56be3a4b524ff94f522a6c3e55f8159c1a6f58c8739e90f8e24e2d40d8
-        DEPS mingw-w64-x86_64-libtre
+        URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gettext-runtime-0.22.4-5-any.pkg.tar.zst"
+        SHA512 03a0210dd2c57a282e8de6a96d871cf8957b16a88464f62fa0cbf42e6ccf60046ce2ff7fcabd086775893f7ade92bb9f9bf5740e92aba6efbdc2aea3ece35c73
+        DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libiconv
     )
     z_vcpkg_acquire_msys_declare_package(
-        NAME "mingw-w64-x86_64-libtre"
-        URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libtre-git-r128.6fb7206-2-any.pkg.tar.xz"
-        SHA512 d595dbcf3a3b6ed098e46f370533ab86433efcd6b4d3dcf00bbe944ab8c17db7a20f6535b523da43b061f071a3b8aa651700b443ae14ec752ae87500ccc0332d
-        DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-gettext
+        URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gmp-6.3.0-2-any.pkg.tar.zst"
+        SHA512 38ab150051d787e44f1c75b3703d6c8deb429d244acb2a973ee232043b708e6c9e29a1f9e28f12e242c136d433e8eb5a5133a4d9ac7b87157a9749a8d215d2f0
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-openssl-1.1.1.m-1-any.pkg.tar.zst"
-        SHA512 9471b0e5b01453f6ee5c92be6e259446c6b5be45d1da8985a4735b3e54c835d9b86286b2af126546419bf968df096442bd4f60f30efa1a901316e3c02b98525f
-        DEPS mingw-w64-x86_64-ca-certificates mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-zlib
+        URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libffi-3.4.4-1-any.pkg.tar.zst"
+        SHA512 ec88a0e0cb9b3ff3879d3fd952d3ad52f0d86a42669eddaeca47778ab0d5213abdea7d480a23aa3870e08d6b93b9c4988855e368474be7186e9719456baae5df
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-ca-certificates-20210119-1-any.pkg.tar.zst"
-        SHA512 5590ca116d73572eb336ad73ea5df9da34286d8ff8f6b162b38564d0057aa23b74a30858153013324516af26671046addd6bcade221e94e7b8ed5e8f886e1c58
-        DEPS mingw-w64-x86_64-p11-kit
+        URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libiconv-1.17-4-any.pkg.tar.zst"
+        SHA512 dc703b103291a5b89175c3ddf4282c1a40bcd91549c8f993300671b9afffb28559e118a2c665f47a465bd7286b9e3400c29d42761e0189c425fb156b37783927
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-p11-kit-0.24.1-1-any.pkg.tar.zst"
-        SHA512 6437919cd61c8b1a59b346bbd93d960adb7f11206e8c0010311d71d0fe9aa03f950ecf08f19a5555b27f481cc0d61b88650b165ae9336ac1a1a0a9be553239b9
-        DEPS mingw-w64-x86_64-gettext mingw-w64-x86_64-libffi mingw-w64-x86_64-libtasn1
+        URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libsystre-1.0.1-5-any.pkg.tar.zst"
+        SHA512 10ea2bacebb8b05c642f34c0ecf61710b9f1906615851825d1104d0e25b1a911f7541a3068b97de2eb71aa13d6963f61c7fdf051c5582e0868a6f90b93f7aa77
+        PROVIDES mingw-w64-x86_64-libgnurx
+        DEPS mingw-w64-x86_64-libtre
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libtasn1-4.18.0-1-any.pkg.tar.zst"
-        SHA512 2584a6e0bc2b7d145f026487951b8690e3d8e79f475a7b77f95fc27ca9a9f1887fe9303e340ba2635353c4a6f6a2f10a907dd8778e54be7506a15459f616d4a4
+        URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libtasn1-4.19.0-1-any.pkg.tar.zst"
+        SHA512 761a7c316914d7f98ec6489fb4c06d227e5956d50f2e233ad9be119cfd6301f6b7e4f872316c0bae3913268c1aa9b224b172ab94130489fbd5d7269ff9064cfb
         DEPS mingw-w64-x86_64-gcc-libs
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-sqlite3-3.37.2-1-any.pkg.tar.zst"
-        SHA512 0f83f10b0c8f4699a6b84deb6986fcd471cb80b995561ad793e827f9dd66110d555744918ed91982aec8d9743f6064726dd5eba3e695aa9ab5381ea4f8e76dbe
-        DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-readline mingw-w64-x86_64-tcl
+        URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libtre-git-r177.07e66d0-2-any.pkg.tar.zst"
+        SHA512 a21a03fd446707f748f4101e723f71d5f2c93c736d86205dc9eee6681d1bb1248283b8921f897391b56143d8dcf6be29cf8c2c57abcf32e1e4d0b2ea2309a790
+        PROVIDES mingw-w64-x86_64-libtre
+        DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-gettext-runtime
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-readline-8.1.001-1-any.pkg.tar.zst"
-        SHA512 b38aef9216ea2ba7edd82ce57a48dbc913b9bdcb44b96b9800342fe097d706ba39c9d5ba08d793d2c3388722479258bb05388ae09d74a1edcaaf9002e9d71853
-        DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-termcap
+        URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libwinpthread-git-11.0.0.r551.g86a5e0f41-1-any.pkg.tar.zst"
+        SHA512 2742d5939e6f677d148f0f07ddc399bf8e4bf3c07f9b90160f20314f1c69e549b9f9d6cbf0df35d7f950d2e09e57c56c0496475cb66f053dcf0bcfdf3bb14bb1
+        PROVIDES mingw-w64-x86_64-libwinpthread
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-termcap-1.3.1-6-any.pkg.tar.zst"
-        SHA512 602d182ba0f1e20c4c51ae09b327c345bd736e6e4f22cd7d58374ac68c705dd0af97663b9b94d41870457f46bb9110abb29186d182196133618fc460f71d1300
+        URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-mpc-1.3.1-2-any.pkg.tar.zst"
+        SHA512 3fe183d4af3b3935a4394502eab75a8f7b7692f551fd44e54c67935a4691388d23a021ee1147f0345ed27ffe8a8db3e9e7e37caf2348df3413e0acd519c12a0c
+        DEPS mingw-w64-x86_64-gmp mingw-w64-x86_64-mpfr
+    )
+    z_vcpkg_acquire_msys_declare_package(
+        URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-mpdecimal-2.5.1-1-any.pkg.tar.zst"
+        SHA512 1204c31367f9268ffd6658be04af7687c01f984c9d6be8c7a20ee0ebde1ca9a03b766ef1aeb1fa7aaa97b88a57f7a73afa7f7a7fed9c6b895a032db11e6133bf
         DEPS mingw-w64-x86_64-gcc-libs
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-tk-8.6.11.1-2-any.pkg.tar.zst"
-        SHA512 15fd4e085fabe2281f33c8f36f4b1b0be132e5b100f6d4eaf54688842791aa2cf4e6d38a855f74f42be3f86c52e20044518f5843f8e9ca13c54a6ea4adb973a8
-        DEPS mingw-w64-x86_64-tcl
+        URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-mpfr-4.2.1-2-any.pkg.tar.zst"
+        SHA512 03a727e1622b09ed0b6e0cb93a6b1040c31c9504c3f14bd1a2e12b8293153609796bc99882393b343c4d96e45f402f847317a3a65212b972ff96a964e5e52815
+        DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-gmp
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-tcl-8.6.11-5-any.pkg.tar.zst"
-        SHA512 9db75ff47260ea3652d1abf60cd44649d0e8cbe5c4d26c316b99a6edb08252fb87ed017c856f151da99bcaa0bd90c0bebae28234035b008c5bd6508511639852
-        DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-zlib
+        URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-ncurses-6.4.20231217-1-any.pkg.tar.zst"
+        SHA512 54a936731589a1af653dc73da983b683e8fc687e9c3737f5215acdef70e3596cddce44d01a6e98e482fd3f071da20cd5ab10b54d52cbdc0b34bbdc090a1cf3d3
+        DEPS mingw-w64-x86_64-libsystre
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-xz-5.2.5-2-any.pkg.tar.zst"
-        SHA512 94fcf8b9f9fbc2cfdb2ed53dbe72797806aa3399c4dcfea9c6204702c4504eb4d4204000accd965fcd0680d994bf947eae308bc576e629bbaa3a4cefda3aea52
-        DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-gettext
+        URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-openblas-0.3.26-1-any.pkg.tar.zst"
+        SHA512 de5b2b3eca6976a26dded23d5be6f1cdccb68e4a41a3568f917f78aee2bc9c91b5ff7e566cbc2fa9d6852c57b90bb92a36b95efe458c88f1819961a27d91129b
+        PROVIDES mingw-w64-x86_64-OpenBLAS
+        DEPS mingw-w64-x86_64-gcc-libgfortran mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libwinpthread mingw-w64-x86_64-omp
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gettext-0.21-3-any.pkg.tar.zst"
-        SHA512 38daa0edd1a2c1efdd56baeb6805d10501a57e0c8ab98942e4a16f8b021908dac315513ea85f5278adf300bce3052a44a3f8b473adb0d5d3656aa4a48fe61081
-        DEPS mingw-w64-x86_64-expat mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libiconv
+        URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-openssl-3.2.1-1-any.pkg.tar.zst"
+        SHA512 706218c8d7321358cf7f1c472c89c19f88245eeff5037712b2a64c9f81166bcd7b2a06cc3343af5a75a65c520890d845d8d1234feddbe622992b6e9825e81f5c
+        #DEPS mingw-w64-x86_64-ca-certificates mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-zlib
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libs-11.2.0-8-any.pkg.tar.zst"
-        SHA512 2481f7c8db7cca549911bc71715af86ca287ffed6d673c9a6c3a4c792b68899a129dd959214af7067f434e74fc518c43749e7d928cbd2232ab4fbc65880dad98
-        DEPS mingw-w64-x86_64-gmp mingw-w64-x86_64-libwinpthread mingw-w64-x86_64-mpc mingw-w64-x86_64-mpfr
+        URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-p11-kit-0.25.3-2-any.pkg.tar.zst"
+        SHA512 81e62ad4b1bdf7da3b2de20a3a444b2a30a7b38dda8df41ca7e8baed0954a335cc9594ddd577f4ea5b6000d945348dc7d0364c9408e8a3e3afef34cc5c083c85
+        DEPS mingw-w64-x86_64-gettext-runtime mingw-w64-x86_64-libffi mingw-w64-x86_64-libtasn1
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpc-1.2.1-1-any.pkg.tar.zst"
-        SHA512 f2c137dbb0b6feea68dde9739c38b44dcb570324e3947adf991028e8f63c9ff50a11f47be15b90279ff40bcac7f320d952cfc14e69ba8d02cf8190c848d976a1
-        DEPS mingw-w64-x86_64-mpfr
+        URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-3.11.7-1-any.pkg.tar.zst"
+        SHA512 f94e2e53887da29bdcdafd4ad86d709e98c1bd271fdf9c5a85904cf20eae7690b8efef5b858a8bc979f6106343cec6ab6a828fcad631e4c30ce89c736603375e
+        PROVIDES mingw-w64-x86_64-python3 mingw-w64-x86_64-python3.11
+        DEPS mingw-w64-x86_64-bzip2 mingw-w64-x86_64-expat mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libffi mingw-w64-x86_64-mpdecimal mingw-w64-x86_64-ncurses mingw-w64-x86_64-openssl mingw-w64-x86_64-sqlite3 mingw-w64-x86_64-tcl mingw-w64-x86_64-tk mingw-w64-x86_64-xz mingw-w64-x86_64-zlib
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpfr-4.1.0-3-any.pkg.tar.zst"
-        SHA512 be8ad04e53804f18cfeec5b9cba1877af1516762de60891e115826fcfe95166751a68e24cdf351a021294e3189c31ce3c2db0ebf9c1d4d4ab6fea1468f73ced5
-        DEPS mingw-w64-x86_64-gmp
+        URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-numpy-1.26.3-1-any.pkg.tar.zst"
+        SHA512 62fac7ca3c936bc42902652933373420fb422fb49bfe808e4a4d71183983c5d386f88c1772e6e07477c5b76f5fd489ef5084bef33588c3db63edccaa361520d2
+        PROVIDES mingw-w64-x86_64-python3-numpy
+        DEPS mingw-w64-x86_64-openblas mingw-w64-x86_64-python
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gmp-6.2.1-3-any.pkg.tar.zst"
-        SHA512 d0d4ed1a046b64f437e72bbcf722b30311dde5f5e768a520141423fc0a3127b116bd62cfd4b5cf5c01a71ee0f9cf6479fcc31277904652d8f6ddbf16e33e0b72
+        URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-readline-8.2.010-1-any.pkg.tar.zst"
+        SHA512 ade6caf9e97e762cb2a129a838e1b73e4a2cc4488a7db5c1b6a3ec5db7206d9108a9a7fc5e0e6d7099f26d15ddf71238006dd09467ad2a7617ad9dd925ea04e2
+        DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-termcap
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-expat-2.4.4-1-any.pkg.tar.zst"
-        SHA512 479e6591d06eee2686591d7232a60d4092540deb40cf0c2c418de861b1da6b21fb4be82e603dd4a3b88f5a1b1d21cdb4f016780dda8131e32be5c3dec85dfc4d
+        URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-sqlite3-3.45.1-1-any.pkg.tar.zst"
+        SHA512 b54ae774fc82f83a19a78910cc068597f85fbd798d52c518fee24030043b606986f235ed86f99879d8de3360c2cbaf53500108a3db8638da1f32096d9439e90f
+        PROVIDES mingw-w64-x86_64-sqlite mingw-w64-x86_64-sqlite-analyzer
+        DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-readline mingw-w64-x86_64-tcl mingw-w64-x86_64-zlib
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libffi-3.3-4-any.pkg.tar.zst"
-        SHA512 1d7be396ef132289be0c33792c4e81dea6cb7b1eafa249fb3e8abc0b393d14e5114905c0c0262b6a7aed8f196ae4d7a10fbafd342b08ec76c9196921332747b5
+        URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-termcap-1.3.1-7-any.pkg.tar.zst"
+        SHA512 2610355be441fd933f660f8181a5ad074057361a9aadeaad85961230dcf6df5d5165b94ccf9887144c91812485be57c2d79f39e8191ff525889bdff042d34ce6
+        DEPS mingw-w64-x86_64-gcc-libs
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libiconv-1.16-2-any.pkg.tar.zst"
-        SHA512 542ed5d898a57a79d3523458f8f3409669b411f87d0852bb566d66f75c96422433f70628314338993461bcb19d4bfac4dadd9d21390cb4d95ef0445669288658
+        URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-tcl-8.6.13-1-any.pkg.tar.zst"
+        SHA512 e143405ed45da7986d30d2f14bde9dff16fb0ea85a01df45d15cbe8fc52065f5efcb22f8da98962022efbfee3a704fc20e38839ec448cdbb5809336b6b97d550
+        DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-zlib
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-zlib-1.2.11-9-any.pkg.tar.zst"
-        SHA512 f386d3a8d8c169a62a4580af074b7fdc0760ef0fde22ef7020a349382dd374a9e946606c757d12da1c1fe68baf5e2eaf459446e653477035a63e0e20df8f4aa0
+        URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-tk-8.6.12-2-any.pkg.tar.zst"
+        SHA512 832c98f2bb8963540d175bc6511f00747483d86b0e0d3219c7b6e5b0bd5e7d038018db08875bf26b3fbe6082b4ff1958777e5cfd1920f5d235493f0a1ce071b2
+        DEPS mingw-w64-x86_64-tcl
     )
     z_vcpkg_acquire_msys_declare_package(
-        NAME "mingw-w64-x86_64-libwinpthread"
-        URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libwinpthread-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst"
-        SHA512 a2c9e60d23b1310a6cec1fadd2b15a8c07223f3fe90d41b1579e9fc27ee2b0b408456291a55fad54a156e6a247efc20f6fcc247cc567e64fe190938aa3b672e9
+        URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-xz-5.4.6-2-any.pkg.tar.zst"
+        SHA512 4ca1f3707003d43bdf5c6e7df1d0ea2a9ea56acfaa8a1b8db89f76d97ac8eb709b8af4d4233da412fdec3bffb72f7809462356d2afe61675bce8d2b23a7ce1d6
+        DEPS mingw-w64-x86_64-gettext-runtime
     )
-
-    if(NOT Z_VCPKG_MSYS_PACKAGES STREQUAL "")
-        message(FATAL_ERROR "Unknown packages were required for vcpkg_acquire_msys(${arg_PACKAGES}): ${packages}
-This can be resolved by explicitly passing URL/SHA pairs to DIRECT_PACKAGES.")
-    endif()
-
-    string(SHA512 total_hash "${Z_VCPKG_MSYS_TOTAL_HASH}")
-    string(SUBSTRING "${total_hash}" 0 16 total_hash)
-    set(path_to_root "${DOWNLOADS}/tools/msys2/${total_hash}")
-    if(NOT EXISTS "${path_to_root}")
-        file(REMOVE_RECURSE "${path_to_root}.tmp")
-        file(MAKE_DIRECTORY "${path_to_root}.tmp/tmp")
-        set(index 0)
-        foreach(archive IN LISTS Z_VCPKG_MSYS_ARCHIVES)
-            vcpkg_execute_required_process(
-                ALLOW_IN_DOWNLOAD_MODE
-                COMMAND "${CMAKE_COMMAND}" -E tar xzf "${Z_VCPKG_MSYS_${archive}_ARCHIVE}"
-                LOGNAME "msys-${TARGET_TRIPLET}-${index}"
-                WORKING_DIRECTORY "${path_to_root}.tmp"
-            )
-            math(EXPR index "${index} + 1")
-            if(Z_VCPKG_MSYS_${archive}_PATCHES)
-                z_vcpkg_apply_patches(
-                    SOURCE_PATH "${path_to_root}.tmp"
-                    PATCHES ${Z_VCPKG_MSYS_${archive}_PATCHES}
-                )
-            endif()
-        endforeach()
-        file(RENAME "${path_to_root}.tmp" "${path_to_root}")
-    endif()
-    # Due to skipping the regular MSYS2 installer,
-    # some config files need to be established explicitly.
-    if(NOT EXISTS "${path_to_root}/etc/fstab")
-        # This fstab entry removes the cygdrive prefix from paths.
-        file(WRITE "${path_to_root}/etc/fstab" "none  /  cygdrive  binary,posix=0,noacl,user  0  0")
-    endif()
-    message(STATUS "Using msys root at ${path_to_root}")
-    set("${out_msys_root}" "${path_to_root}" PARENT_SCOPE)
-endfunction()
+    z_vcpkg_acquire_msys_declare_package(
+        URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-zlib-1.3.1-1-any.pkg.tar.zst"
+        SHA512 1336cd0db102af495d8bbfc6a1956f365750b19d2377fe809e9b26f61a8a6600394e7343677645c5743f4974161535dad5c0503ff50f6126d27bb927754e7320
+    )
+endmacro()
diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_build_make.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_build_make.cmake
index 4aa327043..ddf56f4f6 100644
--- a/external_imported/vcpkg/scripts/cmake/vcpkg_build_make.cmake
+++ b/external_imported/vcpkg/scripts/cmake/vcpkg_build_make.cmake
@@ -55,7 +55,7 @@ function(vcpkg_build_make)
         #TODO: optimize for install-data (release) and install-exec (release/debug)
 
     else()
-        if(VCPKG_HOST_IS_OPENBSD)
+        if(VCPKG_HOST_IS_FREEBSD OR VCPKG_HOST_IS_OPENBSD)
             find_program(Z_VCPKG_MAKE gmake REQUIRED)
         else()
             find_program(Z_VCPKG_MAKE make REQUIRED)
@@ -70,45 +70,30 @@ function(vcpkg_build_make)
     # Since includes are buildtype independent those are setup by vcpkg_configure_make
     vcpkg_backup_env_variables(VARS LIB LIBPATH LIBRARY_PATH LD_LIBRARY_PATH CPPFLAGS CFLAGS CXXFLAGS RCFLAGS)
 
+    z_vcpkg_configure_make_common_definitions()
+
     foreach(buildtype IN ITEMS "debug" "release")
         if (buildtype STREQUAL "debug" AND _VCPKG_MAKE_NO_DEBUG)
             continue()
         endif()
         if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "${buildtype}")
-            if("${buildtype}" STREQUAL "debug")
-                set(short_buildtype "-dbg")
-                set(cmake_buildtype "DEBUG")
-                set(path_suffix "/debug")
-            else()
-                # In NO_DEBUG mode, we only use ${TARGET_TRIPLET} directory.
-                set(short_buildtype "-rel")
-                set(cmake_buildtype "RELEASE")
-                set(path_suffix "")
+            string(TOUPPER "${buildtype}" cmake_buildtype)
+            set(short_buildtype "${short_name_${cmake_buildtype}}")
+            set(path_suffix "${path_suffix_${cmake_buildtype}}")
+
+            set(working_directory "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${short_buildtype}/${arg_SUBPATH}")
+            message(STATUS "Building ${TARGET_TRIPLET}-${short_buildtype}")
+
+            if("libtool-link-pass-target" IN_LIST VCPKG_BUILD_MAKE_FIXUP)
+                # Pass --target to the linker, e.g. for Android
+                file(GLOB_RECURSE libtool_files "${working_directory}/libtool")
+                foreach(file IN LISTS libtool_files)
+                    vcpkg_replace_string("${file}" [[-xtarget=*|]] [[-xtarget=*|--target=*|]])
+                endforeach()
             endif()
 
-            set(working_directory "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}${short_buildtype}/${arg_SUBPATH}")
-            message(STATUS "Building ${TARGET_TRIPLET}${short_buildtype}")
+            z_vcpkg_configure_make_process_flags("${cmake_buildtype}")
 
-            z_vcpkg_extract_cpp_flags_and_set_cflags_and_cxxflags("${cmake_buildtype}")
-
-            if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-                set(LINKER_FLAGS_${cmake_buildtype} "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${cmake_buildtype}}")
-            else() # dynamic
-                set(LINKER_FLAGS_${cmake_buildtype} "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_${cmake_buildtype}}")
-            endif()            
-            set(LDFLAGS_${cmake_buildtype} "")
-            if(EXISTS "${Z_VCPKG_INSTALLED}${path_suffix}/lib")
-                string(APPEND LDFLAGS_${cmake_buildtype} " -L${Z_VCPKG_INSTALLED}${path_suffix}/lib")
-            endif()
-            if(EXISTS "${Z_VCPKG_INSTALLED}${path_suffix}/lib/manual-link")
-                string(APPEND LDFLAGS_${cmake_buildtype} " -L${Z_VCPKG_INSTALLED}${path_suffix}/lib/manual-link")
-            endif()
-            if (CMAKE_HOST_WIN32 AND VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "cl.exe")
-                set(LINK_ENV_${cmake_buildtype} "$ENV{_LINK_} ${LINKER_FLAGS_${cmake_buildtype}}")
-            else()
-                string(APPEND LDFLAGS_${cmake_buildtype} " ${LINKER_FLAGS_${cmake_buildtype}}")
-            endif()
-            
             # Setup environment
             set(ENV{CPPFLAGS} "${CPPFLAGS_${cmake_buildtype}}")
             set(ENV{CFLAGS} "${CFLAGS_${cmake_buildtype}}")
@@ -145,31 +130,31 @@ function(vcpkg_build_make)
                 vcpkg_execute_build_process(
                         COMMAND ${no_parallel_make_cmd_line}
                         WORKING_DIRECTORY "${working_directory}"
-                        LOGNAME "${arg_LOGFILE_ROOT}-${TARGET_TRIPLET}${short_buildtype}"
+                        LOGNAME "${arg_LOGFILE_ROOT}-${TARGET_TRIPLET}-${short_buildtype}"
                 )
             else()
                 vcpkg_execute_build_process(
                         COMMAND ${make_cmd_line}
                         NO_PARALLEL_COMMAND ${no_parallel_make_cmd_line}
                         WORKING_DIRECTORY "${working_directory}"
-                        LOGNAME "${arg_LOGFILE_ROOT}-${TARGET_TRIPLET}${short_buildtype}"
+                        LOGNAME "${arg_LOGFILE_ROOT}-${TARGET_TRIPLET}-${short_buildtype}"
                 )
             endif()
 
-            file(READ "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_ROOT}-${TARGET_TRIPLET}${short_buildtype}-out.log" logdata) 
+            file(READ "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_ROOT}-${TARGET_TRIPLET}-${short_buildtype}-out.log" logdata) 
             if(logdata MATCHES "Warning: linker path does not have real file for library")
                 message(FATAL_ERROR "libtool could not find a file being linked against!")
             endif()
 
             if (arg_ENABLE_INSTALL)
-                message(STATUS "Installing ${TARGET_TRIPLET}${short_buildtype}")
+                message(STATUS "Installing ${TARGET_TRIPLET}-${short_buildtype}")
                 vcpkg_list(SET make_cmd_line ${make_command} ${install_opts})
                 vcpkg_list(SET no_parallel_make_cmd_line ${make_command} ${no_parallel_install_opts})
                 vcpkg_execute_build_process(
                     COMMAND ${make_cmd_line}
                     NO_PARALLEL_COMMAND ${no_parallel_make_cmd_line}
                     WORKING_DIRECTORY "${working_directory}"
-                    LOGNAME "install-${TARGET_TRIPLET}${short_buildtype}"
+                    LOGNAME "install-${TARGET_TRIPLET}-${short_buildtype}"
                 )
             endif()
 
diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_check_features.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_check_features.cmake
index d0573d77a..c6bec1fa3 100644
--- a/external_imported/vcpkg/scripts/cmake/vcpkg_check_features.cmake
+++ b/external_imported/vcpkg/scripts/cmake/vcpkg_check_features.cmake
@@ -87,8 +87,9 @@ function(vcpkg_check_features)
     set(last_variable)
     foreach(variable IN LISTS feature_variables)
         if(variable STREQUAL last_variable)
-            message(FATAL_ERROR "vcpkg_check_features passed the same feature variable multiple times: '${variable}'")
+            message("${Z_VCPKG_BACKCOMPAT_MESSAGE_LEVEL}" "vcpkg_check_features passed the same feature variable multiple times: '${variable}'")
         endif()
+        set(last_variable ${variable})
     endforeach()
 
     set("${arg_OUT_FEATURE_OPTIONS}" "${feature_options}" PARENT_SCOPE)
diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_common_definitions.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_common_definitions.cmake
index 58730a897..b248208a2 100644
--- a/external_imported/vcpkg/scripts/cmake/vcpkg_common_definitions.cmake
+++ b/external_imported/vcpkg/scripts/cmake/vcpkg_common_definitions.cmake
@@ -2,6 +2,10 @@ string(COMPARE NOTEQUAL "${TARGET_TRIPLET}" "${HOST_TRIPLET}" VCPKG_CROSSCOMPILI
 #Helper variable to identify the Target system. VCPKG_TARGET_IS_<targetname>
 if (NOT DEFINED VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "")
     set(VCPKG_TARGET_IS_WINDOWS ON)
+
+    if(DEFINED VCPKG_XBOX_CONSOLE_TARGET AND NOT "${VCPKG_XBOX_CONSOLE_TARGET}" STREQUAL "")
+        set(VCPKG_TARGET_IS_XBOX ON)
+    endif()
 elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
     set(VCPKG_TARGET_IS_WINDOWS ON)
     set(VCPKG_TARGET_IS_UWP ON)
diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_configure_cmake.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_configure_cmake.cmake
index 24c64a6ec..b051bf821 100644
--- a/external_imported/vcpkg/scripts/cmake/vcpkg_configure_cmake.cmake
+++ b/external_imported/vcpkg/scripts/cmake/vcpkg_configure_cmake.cmake
@@ -185,6 +185,10 @@ function(vcpkg_configure_cmake)
         endif()
     endif()
 
+    if(DEFINED VCPKG_XBOX_CONSOLE_TARGET)
+        vcpkg_list(APPEND arg_OPTIONS "-DXBOX_CONSOLE_TARGET=${VCPKG_XBOX_CONSOLE_TARGET}")
+    endif()
+
     if(DEFINED VCPKG_CMAKE_SYSTEM_VERSION)
         vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION}")
     endif()
diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_configure_make.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_configure_make.cmake
index c28fb4795..ca15f182c 100644
--- a/external_imported/vcpkg/scripts/cmake/vcpkg_configure_make.cmake
+++ b/external_imported/vcpkg/scripts/cmake/vcpkg_configure_make.cmake
@@ -35,73 +35,192 @@ macro(z_vcpkg_determine_autotools_target_cpu out_var)
     endif()
 endmacro()
 
+macro(z_vcpkg_set_arch_mac out_var value)
+    # Better match the arch behavior of config.guess
+    # See: https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+    if("${value}" MATCHES "^(ARM|arm)64$")
+        set(${out_var} "aarch64")
+    else()
+        set(${out_var} "${value}")
+    endif()
+endmacro()
+
 macro(z_vcpkg_determine_autotools_host_arch_mac out_var)
-    set(${out_var} "${VCPKG_DETECTED_CMAKE_HOST_SYSTEM_PROCESSOR}")
+    z_vcpkg_set_arch_mac(${out_var} "${VCPKG_DETECTED_CMAKE_HOST_SYSTEM_PROCESSOR}")
 endmacro()
 
 macro(z_vcpkg_determine_autotools_target_arch_mac out_var)
     list(LENGTH VCPKG_OSX_ARCHITECTURES osx_archs_num)
     if(osx_archs_num EQUAL 0)
-        set(${out_var} "${VCPKG_DETECTED_CMAKE_HOST_SYSTEM_PROCESSOR}")
+        z_vcpkg_set_arch_mac(${out_var} "${VCPKG_DETECTED_CMAKE_HOST_SYSTEM_PROCESSOR}")
     elseif(osx_archs_num GREATER_EQUAL 2)
         set(${out_var} "universal")
     else()
-        # Better match the arch behavior of config.guess
-        # See: https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-        if(VCPKG_OSX_ARCHITECTURES MATCHES "^(ARM|arm)64$")
-            set(${out_var} "aarch64")
-        else()
-            set(${out_var} "${VCPKG_OSX_ARCHITECTURES}")
-        endif()
+        z_vcpkg_set_arch_mac(${out_var} "${VCPKG_OSX_ARCHITECTURES}")
     endif()
     unset(osx_archs_num)
 endmacro()
 
-macro(z_vcpkg_extract_cpp_flags_and_set_cflags_and_cxxflags flag_suffix)
-    string(REGEX MATCHALL "( |^)(-D|-isysroot|--sysroot=|-isystem|-m?[Aa][Rr][Cc][Hh]|--target=|-target) ?[^ ]+" CPPFLAGS_${flag_suffix} "${VCPKG_DETECTED_CMAKE_C_FLAGS_${flag_suffix}}")
-    string(REGEX MATCHALL "( |^)(-D|-isysroot|--sysroot=|-isystem|-m?[Aa][Rr][Cc][Hh]|--target=|-target) ?[^ ]+" CXXPPFLAGS_${flag_suffix} "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${flag_suffix}}")
-    list(JOIN CXXPPFLAGS_${flag_suffix} "|" CXXREGEX)
-    if(CXXREGEX)
-        list(FILTER CPPFLAGS_${flag_suffix} INCLUDE REGEX "(${CXXREGEX})")
-    else()
-        set(CPPFLAGS_${flag_suffix})
-    endif()
-    list(JOIN CPPFLAGS_${flag_suffix} "|" CPPREGEX)
-    list(JOIN CPPFLAGS_${flag_suffix} " " CPPFLAGS_${flag_suffix})
-    set(CPPFLAGS_${flag_suffix} "${CPPFLAGS_${flag_suffix}}")
-    if(CPPREGEX)
-        string(REGEX REPLACE "(${CPPREGEX})" "" CFLAGS_${flag_suffix} "${VCPKG_DETECTED_CMAKE_C_FLAGS_${flag_suffix}}")
-        string(REGEX REPLACE "(${CPPREGEX})" "" CXXFLAGS_${flag_suffix} "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${flag_suffix}}")
-    else()
-        set(CFLAGS_${flag_suffix} "${VCPKG_DETECTED_CMAKE_C_FLAGS_${flag_suffix}}")
-        set(CXXFLAGS_${flag_suffix} "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${flag_suffix}}")
-    endif()
-    string(REGEX REPLACE " +" " " CPPFLAGS_${flag_suffix} "${CPPFLAGS_${flag_suffix}}")
-    string(REGEX REPLACE " +" " " CFLAGS_${flag_suffix} "${CFLAGS_${flag_suffix}}")
-    string(REGEX REPLACE " +" " " CXXFLAGS_${flag_suffix} "${CXXFLAGS_${flag_suffix}}")
-    string(STRIP "${CPPFLAGS_${flag_suffix}}" CPPFLAGS_${flag_suffix})
-    string(STRIP "${CFLAGS_${flag_suffix}}" CFLAGS_${flag_suffix})
-    string(STRIP "${CXXFLAGS_${flag_suffix}}" CXXFLAGS_${flag_suffix})
+# Define variables used in both vcpkg_configure_make and vcpkg_build_make:
+# short_name_<CONFIG>:           unique abbreviation for the given build type (rel, dbg)
+# path_suffix_<CONFIG>:          installation path suffix for the given build type ('', /debug)
+# current_installed_dir_escaped: CURRENT_INSTALLED_DIR with escaped space characters
+# current_installed_dir_msys:    CURRENT_INSTALLED_DIR with unprotected spaces, but drive letters transformed for msys
+macro(z_vcpkg_configure_make_common_definitions)
+    set(short_name_RELEASE "rel")
+    set(short_name_DEBUG "dbg")
+
+    set(path_suffix_RELEASE "")
+    set(path_suffix_DEBUG "/debug")
+
+    # Some PATH handling for dealing with spaces....some tools will still fail with that!
+    # In particular, the libtool install command is unable to install correctly to paths with spaces.
+    string(REPLACE " " "\\ " current_installed_dir_escaped "${CURRENT_INSTALLED_DIR}")
+    set(current_installed_dir_msys "${CURRENT_INSTALLED_DIR}")
+    if(CMAKE_HOST_WIN32)
+        string(REGEX REPLACE "^([a-zA-Z]):/" "/\\1/" current_installed_dir_msys "${current_installed_dir_msys}")
+    endif()
+endmacro()
+
+# Initializes well-known and auxiliary variables for flags
+# - CPPFLAGS_<CONFIG>: preprocessor flags common to C and CXX
+# - CFLAGS_<CONFIG>
+# - CXXFLAGS_<CONFIG>
+# - LDFLAGS_<CONFIG>
+# - ARFLAGS_<CONFIG>
+# - LINK_ENV_${var_suffix}
+# Prerequisite: VCPKG_DETECTED_CMAKE_... vars loaded
+function(z_vcpkg_configure_make_process_flags var_suffix)
+    # separate_arguments is needed to remove outer quotes from detected cmake variables.
+    # (e.g. Android NDK has "--sysroot=...")
+    separate_arguments(CFLAGS NATIVE_COMMAND "Z_VCM_WRAP ${VCPKG_DETECTED_CMAKE_C_FLAGS_${var_suffix}} Z_VCM_WRAP")
+    separate_arguments(CXXFLAGS NATIVE_COMMAND "Z_VCM_WRAP ${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${var_suffix}} Z_VCM_WRAP")
+    separate_arguments(LDFLAGS NATIVE_COMMAND "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_${var_suffix}}")
+    separate_arguments(ARFLAGS NATIVE_COMMAND "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${var_suffix}}")
+    foreach(var IN ITEMS CFLAGS CXXFLAGS LDFLAGS ARFLAGS)
+        vcpkg_list(APPEND z_vcm_all_flags ${${var}})
+    endforeach()
+    set(z_vcm_all_flags "${z_vcm_all_flags}" PARENT_SCOPE)
+
+    # Filter common CPPFLAGS out of CFLAGS and CXXFLAGS
+    vcpkg_list(SET CPPFLAGS)
+    vcpkg_list(SET pattern)
+    foreach(arg IN LISTS CXXFLAGS)
+        if(arg STREQUAL "Z_VCM_WRAP")
+            continue()
+        elseif(NOT pattern STREQUAL "")
+            vcpkg_list(APPEND pattern "${arg}")
+        elseif(arg MATCHES "^-(D|isystem).")
+            vcpkg_list(SET pattern "${arg}")
+        elseif(arg MATCHES "^-(D|isystem)\$")
+            vcpkg_list(SET pattern "${arg}")
+            continue()
+        elseif(arg MATCHES "^-(-sysroot|-target|m?[Aa][Rr][Cc][Hh])=.")
+            vcpkg_list(SET pattern "${arg}")
+        elseif(arg MATCHES "^-(isysroot|m32|m64|m?[Aa][Rr][Cc][Hh]|target)\$")
+            vcpkg_list(SET pattern "${arg}")
+            continue()
+        else()
+            continue()
+        endif()
+        string(FIND "${CFLAGS}" ";${pattern};" index)
+        if(NOT index STREQUAL "-1")
+            vcpkg_list(APPEND CPPFLAGS ${pattern})
+            string(REPLACE ";${pattern};" ";" CFLAGS "${CFLAGS}")
+            string(REPLACE ";${pattern};" ";" CXXFLAGS "${CXXFLAGS}")
+        endif()
+        vcpkg_list(SET pattern)
+    endforeach()
+    vcpkg_list(SET pattern)
+    foreach(arg IN LISTS CFLAGS)
+        if(arg STREQUAL "Z_VCM_WRAP")
+            continue()
+        elseif(NOT pattern STREQUAL "")
+            vcpkg_list(APPEND pattern "${arg}")
+        elseif(arg MATCHES "^-(D|isystem)\$")
+            vcpkg_list(SET pattern "${arg}")
+            continue()
+        elseif(arg MATCHES "^-(D|isystem).")
+            vcpkg_list(SET pattern "${arg}")
+        elseif(arg MATCHES "^-(-sysroot|-target|m?[Aa][Rr][Cc][Hh])=.")
+            vcpkg_list(SET pattern "${arg}")
+        elseif(arg MATCHES "^-(isysroot|m32|m64|m?[Aa][Rr][Cc][Hh]|target)\$")
+            vcpkg_list(SET pattern "${arg}")
+            continue()
+        else()
+            continue()
+        endif()
+        string(FIND "${CXXFLAGS}" ";${pattern};" index)
+        if(NOT index STREQUAL "-1")
+            vcpkg_list(APPEND CPPFLAGS ${pattern})
+            string(REPLACE ";${pattern};" ";" CFLAGS "${CFLAGS}")
+            string(REPLACE ";${pattern};" ";" CXXFLAGS "${CXXFLAGS}")
+        endif()
+        vcpkg_list(SET pattern)
+    endforeach()
+
+    # Remove start/end placeholders
+    foreach(list IN ITEMS CFLAGS CXXFLAGS)
+        vcpkg_list(REMOVE_ITEM ${list} "Z_VCM_WRAP")
+    endforeach()
+
     # libtool tries to filter CFLAGS passed to the link stage via a whitelist.
-    # that approach is flawed since it fails to pass flags unknown to libtool
+    # This approach is flawed since it fails to pass flags unknown to libtool
     # but required for linking to the link stage (e.g. -fsanitize=<x>).
-    # libtool has an -R option so we need to guard against -RTC by using -Xcompiler
-    # while configuring there might be a lot of unknown compiler option warnings due to that
-    # just ignore them.
+    # libtool has an -R option so we need to guard against -RTC by using -Xcompiler.
+    # While configuring there might be a lot of unknown compiler option warnings
+    # due to that; just ignore them.
+    set(compiler_flag_escape "")
     if(VCPKG_DETECTED_CMAKE_C_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC" OR VCPKG_DETECTED_CMAKE_C_COMPILER_ID STREQUAL "MSVC")
-      separate_arguments(CFLAGS_LIST NATIVE_COMMAND "${CFLAGS_${flag_suffix}}")
-      list(JOIN CFLAGS_LIST " -Xcompiler " CFLAGS_${var_suffix})
-      string(PREPEND CFLAGS_${var_suffix} "-Xcompiler ")
-    endif()
-    if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC" OR VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-      separate_arguments(CXXFLAGS_LIST NATIVE_COMMAND "${CXXFLAGS_${flag_suffix}}")
-      list(JOIN CXXFLAGS_LIST " -Xcompiler " CXXFLAGS_${var_suffix})
-      string(PREPEND CXXFLAGS_${var_suffix} "-Xcompiler ")
-    endif()
-    debug_message("CPPFLAGS_${flag_suffix}: ${CPPFLAGS_${flag_suffix}}")
-    debug_message("CFLAGS_${flag_suffix}: ${CFLAGS_${flag_suffix}}")
-    debug_message("CXXFLAGS_${flag_suffix}: ${CXXFLAGS_${flag_suffix}}")
-endmacro()
+        set(compiler_flag_escape "-Xcompiler ")
+    endif()
+    if(compiler_flag_escape)
+        list(TRANSFORM CFLAGS PREPEND "${compiler_flag_escape}")
+        list(TRANSFORM CXXFLAGS PREPEND "${compiler_flag_escape}")
+    endif()
+
+    # Could use a future VCPKG_DETECTED_CMAKE_LIBRARY_PATH_FLAG
+    set(library_path_flag "-L")
+    # Could use a future VCPKG_DETECTED_MSVC
+    if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_DETECTED_CMAKE_LINKER MATCHES [[link\.exe$]])
+        set(library_path_flag "-LIBPATH:")
+    endif()
+    set(linker_flag_escape "")
+    if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES [[cl\.exe$]])
+        # Removed by libtool
+        set(linker_flag_escape "-Xlinker ")
+        if(arg_USE_WRAPPERS)
+            # 1st and 3rd are removed by libtool, 2nd by wrapper
+            set(linker_flag_escape "-Xlinker -Xlinker -Xlinker ")
+        endif()
+        if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+            string(STRIP "$ENV{_LINK_} ${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${var_suffix}}" LINK_ENV)
+        else()
+            string(STRIP "$ENV{_LINK_} ${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_${var_suffix}}" LINK_ENV)
+        endif()
+    endif()
+    if(linker_flag_escape)
+        list(TRANSFORM LDFLAGS PREPEND "${linker_flag_escape}")
+    endif()
+    if(EXISTS "${CURRENT_INSTALLED_DIR}${path_suffix_${var_suffix}}/lib/manual-link")
+        vcpkg_list(PREPEND LDFLAGS "${linker_flag_escape}${library_path_flag}${current_installed_dir_escaped}${path_suffix_${var_suffix}}/lib/manual-link")
+    endif()
+    if(EXISTS "${CURRENT_INSTALLED_DIR}${path_suffix_${var_suffix}}/lib")
+        vcpkg_list(PREPEND LDFLAGS "${linker_flag_escape}${library_path_flag}${current_installed_dir_escaped}${path_suffix_${var_suffix}}/lib")
+    endif()
+
+    if(ARFLAGS)
+        # ARFLAGS need to know the command for creating an archive (Maybe needs user customization?)
+        # or extract it from CMake via CMAKE_${lang}_ARCHIVE_CREATE ?
+        # or from CMAKE_${lang}_${rule} with rule being one of CREATE_SHARED_MODULE CREATE_SHARED_LIBRARY LINK_EXECUTABLE
+        vcpkg_list(PREPEND ARFLAGS "cr")
+    endif()
+
+    foreach(var IN ITEMS CPPFLAGS CFLAGS CXXFLAGS LDFLAGS ARFLAGS)
+        list(JOIN ${var} " " string)
+        set(${var}_${var_suffix} "${string}" PARENT_SCOPE)
+    endforeach()
+endfunction()
 
 macro(z_vcpkg_append_to_configure_environment inoutstring var defaultval)
     # Allows to overwrite settings in custom triplets via the environment on windows
@@ -112,10 +231,6 @@ macro(z_vcpkg_append_to_configure_environment inoutstring var defaultval)
     endif()
 endmacro()
 
-macro(z_convert_to_list input output)
-    string(REGEX MATCHALL "(( +|^ *)[^ ]+)" ${output} "${${input}}")
-endmacro()
-
 function(vcpkg_configure_make)
     # parse parameters such that semicolons in options arguments to COMMAND don't get erased
     cmake_parse_arguments(PARSE_ARGV 0 arg
@@ -136,23 +251,6 @@ function(vcpkg_configure_make)
     debug_message("Including cmake vars from: ${cmake_vars_file}")
     include("${cmake_vars_file}")
 
-    # Remove outer quotes from cmake variables which will be forwarded via makefile/shell variables
-    # substituted into makefile commands (e.g. Android NDK has "--sysroot=...")
-    foreach(var IN ITEMS VCPKG_DETECTED_CMAKE_C_FLAGS_DEBUG
-                         VCPKG_DETECTED_CMAKE_C_FLAGS_RELEASE
-                         VCPKG_DETECTED_CMAKE_CXX_FLAGS_DEBUG
-                         VCPKG_DETECTED_CMAKE_CXX_FLAGS_RELEASE
-                         VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_DEBUG
-                         VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_RELEASE
-                         VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_DEBUG
-                         VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_RELEASE
-                         VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES
-                         VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES
-    )
-        separate_arguments(cmake_list NATIVE_COMMAND "${${var}}")
-        list(JOIN cmake_list " " "${var}")
-    endforeach()
-
     if(DEFINED VCPKG_MAKE_BUILD_TRIPLET)
         set(arg_BUILD_TRIPLET ${VCPKG_MAKE_BUILD_TRIPLET}) # Triplet overwrite for crosscompiling
     endif()
@@ -164,7 +262,10 @@ function(vcpkg_configure_make)
     if(EXISTS "${src_dir}/configure" AND EXISTS "${src_dir}/configure.ac" AND arg_AUTOCONFIG) # remove configure; rerun autoconf
         set(requires_autoconfig ON)
         file(REMOVE "${SRC_DIR}/configure") # remove possible outdated configure scripts
-    elseif(EXISTS "${src_dir}/configure" AND NOT arg_SKIP_CONFIGURE) # run normally; no autoconf or autogen required
+    elseif(arg_SKIP_CONFIGURE)
+        # no action requested
+    elseif(EXISTS "${src_dir}/configure")
+        # run normally; no autoconf or autogen required
     elseif(EXISTS "${src_dir}/configure.ac") # Run autoconfig
         set(requires_autoconfig ON)
         set(arg_AUTOCONFIG ON)
@@ -203,24 +304,31 @@ function(vcpkg_configure_make)
     # LDFLAGS -> pass -L flags
     # LIBS -> pass -l flags
 
-    #Used by gcc/linux
+    # Used by gcc/linux
     vcpkg_backup_env_variables(VARS C_INCLUDE_PATH CPLUS_INCLUDE_PATH LIBRARY_PATH LD_LIBRARY_PATH)
 
-    #Used by cl
+    # Used by cl
     vcpkg_backup_env_variables(VARS INCLUDE LIB LIBPATH)
 
-    set(vcm_paths_with_spaces OFF)
-    if(CURRENT_PACKAGES_DIR MATCHES " " OR CURRENT_INSTALLED_DIR MATCHES " ")
+    vcpkg_list(SET z_vcm_paths_with_spaces)
+    if(CURRENT_PACKAGES_DIR MATCHES " ")
+        vcpkg_list(APPEND z_vcm_paths_with_spaces "${CURRENT_PACKAGES_DIR}")
+    endif()
+    if(CURRENT_INSTALLED_DIR MATCHES " ")
+        vcpkg_list(APPEND z_vcm_paths_with_spaces "${CURRENT_INSTALLED_DIR}")
+    endif()
+    if(z_vcm_paths_with_spaces)
         # Don't bother with whitespace. The tools will probably fail and I tried very hard trying to make it work (no success so far)!
-        message(WARNING "Detected whitespace in root directory. Please move the path to one without whitespaces! The required tools do not handle whitespaces correctly and the build will most likely fail")
-        set(vcm_paths_with_spaces ON)
+        vcpkg_list(APPEND z_vcm_paths_with_spaces "Please move the path to one without whitespaces!")
+        list(JOIN z_vcm_paths_with_spaces "\n   " z_vcm_paths_with_spaces)
+        message(STATUS "Warning: Paths with embedded space may be handled incorrectly by configure:\n   ${z_vcm_paths_with_spaces}")
     endif()
 
     set(configure_env "V=1")
 
     # Establish a bash environment as expected by autotools.
     if(CMAKE_HOST_WIN32)
-        list(APPEND msys_require_packages binutils libtool autoconf automake-wrapper automake1.16 m4 which)
+        list(APPEND msys_require_packages autoconf-wrapper automake-wrapper binutils libtool make pkgconf which)
         vcpkg_acquire_msys(MSYS_ROOT PACKAGES ${msys_require_packages} ${arg_ADDITIONAL_MSYS_PACKAGES})
         set(base_cmd "${MSYS_ROOT}/usr/bin/bash.exe" --noprofile --norc --debug)
         vcpkg_list(SET add_to_env)
@@ -236,9 +344,7 @@ function(vcpkg_configure_make)
         message(DEBUG "path_list:${path_list}") # Just to have --trace-expand output
 
         vcpkg_list(SET find_system_dirs 
-            "${system_root}/system32"
             "${system_root}/System32"
-            "${system_root}/system32/"
             "${system_root}/System32/"
             "${local_app_data}/Microsoft/WindowsApps"
             "${local_app_data}/Microsoft/WindowsApps/"
@@ -249,7 +355,8 @@ function(vcpkg_configure_make)
         set(index 0)
         set(appending TRUE)
         foreach(item IN LISTS path_list)
-            if(item IN_LIST find_system_dirs OR item IN_LIST find_system_dirs_upper)
+            string(TOUPPER "${item}" item_upper)
+            if(item_upper IN_LIST find_system_dirs_upper)
                 set(appending FALSE)
                 break()
             endif()
@@ -336,14 +443,13 @@ function(vcpkg_configure_make)
                   VCPKG_DETECTED_CMAKE_LINKER VCPKG_DETECTED_CMAKE_RANLIB VCPKG_DETECTED_CMAKE_OBJDUMP
                   VCPKG_DETECTED_CMAKE_STRIP VCPKG_DETECTED_CMAKE_NM VCPKG_DETECTED_CMAKE_DLLTOOL VCPKG_DETECTED_CMAKE_RC_COMPILER)
         foreach(prog IN LISTS progs)
-            if(${prog})
-                set(path "${${prog}}")
-                unset(prog_found CACHE)
-                get_filename_component(${prog} "${${prog}}" NAME)
-                find_program(prog_found ${${prog}} PATHS ENV PATH NO_DEFAULT_PATH)
-                if(NOT path STREQUAL prog_found)
-                    get_filename_component(path "${path}" DIRECTORY)
-                    vcpkg_add_to_path(PREPEND ${path})
+            set(filepath "${${prog}}")
+            if(filepath MATCHES " ")
+                cmake_path(GET filepath FILENAME ${prog})
+                find_program(z_vcm_prog_found NAMES "${${prog}}" PATHS ENV PATH NO_DEFAULT_PATH NO_CACHE)
+                if(NOT z_vcm_prog_found STREQUAL filepath)
+                    cmake_path(GET filepath PARENT_PATH dir)
+                    vcpkg_add_to_path(PREPEND "${dir}")
                 endif()
             endif()
         endforeach()
@@ -443,14 +549,16 @@ function(vcpkg_configure_make)
             list(APPEND arg_OPTIONS lt_cv_deplibs_check_method=pass_all)
         endif()
     else()
-        # Because OSX dosn't like CMAKE_C(XX)_COMPILER (cc) in CC/CXX and rather wants to have gcc/g++
+        # OSX dosn't like CMAKE_C(XX)_COMPILER (cc) in CC/CXX and rather wants to have gcc/g++
+        vcpkg_list(SET z_vcm_all_tools)
         function(z_vcpkg_make_set_env envvar cmakevar)
-            set(prog "${VCPKG_DETECTED_CMAKE_${cmakevar}} ${ARGN}")
-            string(STRIP "${prog}" prog)
-            if(DEFINED ENV{${envvar}})
-                return()
-            endif()
-            if(VCPKG_DETECTED_CMAKE_${cmakevar})
+            set(prog "${VCPKG_DETECTED_CMAKE_${cmakevar}}")
+            if(NOT DEFINED ENV{${envvar}} AND NOT prog STREQUAL "")
+                vcpkg_list(APPEND z_vcm_all_tools "${prog}")
+                if(ARGN)
+                    string(APPEND prog " ${ARGN}")
+                endif()
+                set(z_vcm_all_tools "${z_vcm_all_tools}" PARENT_SCOPE)
                 set(ENV{${envvar}} "${prog}")
             endif()
         endfunction()
@@ -477,29 +585,26 @@ function(vcpkg_configure_make)
         unset(z_vcpkg_make_set_env)
     endif()
 
-    # Some PATH handling for dealing with spaces....some tools will still fail with that!
-    # In particular, the libtool install command is unable to install correctly to paths with spaces.
-    # CURRENT_INSTALLED_DIR: Pristine native path (unprotected spaces, Windows drive letters)
-    # z_vcpkg_installed_path:      Native path with escaped space characters
-    # z_vcpkg_prefix_path:         Path with unprotected spaces, but drive letters transformed for mingw/msys
-    string(REPLACE " " "\\ " z_vcpkg_installed_path "${CURRENT_INSTALLED_DIR}")
-    if(CMAKE_HOST_WIN32)
-        string(REGEX REPLACE "([a-zA-Z]):/" "/\\1/" z_vcpkg_prefix_path "${CURRENT_INSTALLED_DIR}")
-    else()
-        set(z_vcpkg_prefix_path "${CURRENT_INSTALLED_DIR}")
+    list(FILTER z_vcm_all_tools INCLUDE REGEX " ")
+    if(z_vcm_all_tools)
+        list(REMOVE_DUPLICATES z_vcm_all_tools)
+        list(JOIN z_vcm_all_tools "\n   " tools)
+        message(STATUS "Warning: Tools with embedded space may be handled incorrectly by configure:\n   ${tools}")
     endif()
 
+    z_vcpkg_configure_make_common_definitions()
+
     # Cleanup previous build dirs
-    file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
-                        "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg"
+    file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${short_name_RELEASE}"
+                        "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${short_name_DEBUG}"
                         "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}")
 
     # Set configure paths
-    set(arg_OPTIONS_RELEASE ${arg_OPTIONS_RELEASE} "--prefix=${z_vcpkg_prefix_path}")
-    set(arg_OPTIONS_DEBUG ${arg_OPTIONS_DEBUG} "--prefix=${z_vcpkg_prefix_path}/debug")
+    vcpkg_list(APPEND arg_OPTIONS_RELEASE "--prefix=${current_installed_dir_msys}")
+    vcpkg_list(APPEND arg_OPTIONS_DEBUG "--prefix=${current_installed_dir_msys}${path_suffix_DEBUG}")
     if(NOT arg_NO_ADDITIONAL_PATHS)
         # ${prefix} has an extra backslash to prevent early expansion when calling `bash -c configure "..."`.
-        set(arg_OPTIONS_RELEASE ${arg_OPTIONS_RELEASE}
+        vcpkg_list(APPEND arg_OPTIONS_RELEASE
                             # Important: These should all be relative to prefix!
                             "--bindir=\\\${prefix}/tools/${PORT}/bin"
                             "--sbindir=\\\${prefix}/tools/${PORT}/sbin"
@@ -508,10 +613,10 @@ function(vcpkg_configure_make)
                             "--mandir=\\\${prefix}/share/${PORT}"
                             "--docdir=\\\${prefix}/share/${PORT}"
                             "--datarootdir=\\\${prefix}/share/${PORT}")
-        set(arg_OPTIONS_DEBUG ${arg_OPTIONS_DEBUG}
+        vcpkg_list(APPEND arg_OPTIONS_DEBUG
                             # Important: These should all be relative to prefix!
-                            "--bindir=\\\${prefix}/../tools/${PORT}/debug/bin"
-                            "--sbindir=\\\${prefix}/../tools/${PORT}/debug/sbin"
+                            "--bindir=\\\${prefix}/../tools/${PORT}${path_suffix_DEBUG}/bin"
+                            "--sbindir=\\\${prefix}/../tools/${PORT}${path_suffix_DEBUG}/sbin"
                             "--libdir=\\\${prefix}/lib" # On some Linux distributions lib64 is the default
                             "--includedir=\\\${prefix}/../include"
                             "--datarootdir=\\\${prefix}/share/${PORT}")
@@ -569,11 +674,12 @@ function(vcpkg_configure_make)
         endif()
     endif()
 
-    z_convert_to_list(VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES c_libs_list)
-    z_convert_to_list(VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES cxx_libs_list)
-    set(all_libs_list ${c_libs_list} ${cxx_libs_list})
-    list(REMOVE_DUPLICATES all_libs_list)
-    list(TRANSFORM all_libs_list STRIP)
+    # Remove outer quotes from cmake variables which will be forwarded via makefile/shell variables
+    # substituted into makefile commands (e.g. Android NDK has "--sysroot=...")
+    separate_arguments(c_libs_list NATIVE_COMMAND "${VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES}")
+    separate_arguments(cxx_libs_list NATIVE_COMMAND "${VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES}")
+    list(REMOVE_ITEM cxx_libs_list ${c_libs_list})
+    set(all_libs_list ${cxx_libs_list} ${c_libs_list})
     #Do lib list transformation from name.lib to -lname if necessary
     set(x_vcpkg_transform_libs ON)
     if(VCPKG_TARGET_IS_UWP)
@@ -583,24 +689,20 @@ function(vcpkg_configure_make)
         # Note: Env LIBPATH;LIB are on the search path for libtool by default on windows. 
         # It even does unix/dos-short/unix transformation with the path to get rid of spaces. 
     endif()
-    set(l_prefix)
     if(x_vcpkg_transform_libs)
-        set(l_prefix "-l")
-        list(TRANSFORM all_libs_list REPLACE "(.dll.lib|.lib|.a|.so)$" "")
+        list(TRANSFORM all_libs_list REPLACE "[.](dll[.]lib|lib|a|so)$" "")
         if(VCPKG_TARGET_IS_WINDOWS)
             list(REMOVE_ITEM all_libs_list "uuid")
         endif()
-        list(TRANSFORM all_libs_list REPLACE "^(${l_prefix})" "")
-    endif()
-    list(JOIN all_libs_list " ${l_prefix}" all_libs_string)
-    if(VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-        # libtool must be told explicitly that there is no dynamic linkage for uuid.
-        # The "-Wl,..." syntax is understood by libtool and gcc, but no by ld.
-        string(REPLACE " -luuid" " -Wl,-Bstatic,-luuid,-Bdynamic" all_libs_string "${all_libs_string}")
+        list(TRANSFORM all_libs_list REPLACE "^([^-].*)" "-l\\1")
+        if(VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+            # libtool must be told explicitly that there is no dynamic linkage for uuid.
+            # The "-Wl,..." syntax is understood by libtool and gcc, but no by ld.
+            list(TRANSFORM all_libs_list REPLACE "^-luuid\$" "-Wl,-Bstatic,-luuid,-Bdynamic")
+        endif()
     endif()
-
-    if(all_libs_string)
-        set(all_libs_string "${l_prefix}${all_libs_string}")
+    if(all_libs_list)
+        list(JOIN all_libs_list " " all_libs_string)
         if(DEFINED ENV{LIBS})
             set(ENV{LIBS} "$ENV{LIBS} ${all_libs_string}")
         else()
@@ -666,76 +768,19 @@ function(vcpkg_configure_make)
         endif()
     endif()
 
-    macro(z_vcpkg_setup_make_linker_flags_vars var_suffix)
-        if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-            set(LINKER_FLAGS_${var_suffix} "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${var_suffix}}")
-        else() # dynamic
-            set(LINKER_FLAGS_${var_suffix} "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_${var_suffix}}")
-        endif()
-        set(ARFLAGS_${var_suffix} "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${var_suffix}}")
-        set(LDFLAGS_${var_suffix} "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_${var_suffix}}")
-        if (CMAKE_HOST_WIN32 AND VCPKG_DETECTED_CMAKE_C_COMPILER_ID MATCHES [[cl\.exe$]])
-            if(NOT vcm_paths_with_spaces)
-                string(APPEND LDFLAGS_${var_suffix} " -L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib -L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib/manual-link")
-            endif()
-            if(DEFINED ENV{_LINK_})
-                set(LINK_ENV_${var_suffix} "$ENV{_LINK_} ${LINKER_FLAGS_${var_suffix}}")
-            else()
-                set(LINK_ENV_${var_suffix} "${LINKER_FLAGS_${var_suffix}}")
-            endif()
-        else()
-            set(link_required_dirs "")
-            if(EXISTS "${CURRENT_INSTALLED_DIR}${path_suffix_${var_suffix}}/lib")
-                set(link_required_dirs "-L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib")
-            endif()
-            if(EXISTS "{CURRENT_INSTALLED_DIR}${path_suffix_${var_suffix}}/lib/manual-link")
-                set(link_required_dirs "${link_required_dirs} -L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib/manual-link")
-            endif()
-            string(STRIP "${link_required_dirs}" link_required_dirs)
-            if(link_required_dirs)
-                string(PREPEND LDFLAGS_${var_suffix} "${link_required_dirs} ")
-                # ARFLAGS doesn't need -L search paths since it just bundles object files
-            endif()
-            if(ARFLAGS_${var_suffix})
-                # ARFLAGS need to know the command for creating an archive (Maybe needs user customization?)
-                # or extract it from CMake via CMAKE_${lang}_ARCHIVE_CREATE ?
-                # or from CMAKE_${lang}_${rule} with rule being one of CREATE_SHARED_MODULE CREATE_SHARED_LIBRARY LINK_EXECUTABLE
-                string(PREPEND ARFLAGS_${var_suffix} "cr ")
-            endif()
-            string(STRIP "${LDFLAGS_${var_suffix}}" LDFLAGS_${var_suffix})
-            string(STRIP "${ARFLAGS_${var_suffix}}" ARFLAGS_${var_suffix})
-            if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_DETECTED_CMAKE_LINKER MATCHES [[link\.exe$]])
-                # Do not touch autotools quirks incoming!
-                # -Xlinker is repeated three times because:
-                # - libtool script eats -Xlinker
-                # - the compile wrapper eats -Xlinker
-                # - passing through both tools requires 3 -Xlinker; two being eaten in the first script.
-                # passing only through one script will keep one -Xlinker (done in configure)
-                # but cl will just ignore those with a warning. (Just like -Xcompiler)
-                separate_arguments(LDFLAGS_LIST NATIVE_COMMAND "${LDFLAGS_${var_suffix}}")
-                list(JOIN LDFLAGS_LIST " -Xlinker -Xlinker -Xlinker " LDFLAGS_${var_suffix})
-                string(PREPEND LDFLAGS_${var_suffix} "-Xlinker -Xlinker -Xlinker ")
-            endif()
-        endif()
-    endmacro()
-
     if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug" AND NOT arg_NO_DEBUG)
-        set(var_suffix DEBUG)
-        set(path_suffix_${var_suffix} "/debug")
-        set(short_name_${var_suffix} "dbg")
-        list(APPEND all_buildtypes ${var_suffix})
-        z_vcpkg_extract_cpp_flags_and_set_cflags_and_cxxflags(${var_suffix})
-        z_vcpkg_setup_make_linker_flags_vars(${var_suffix})
-        unset(var_suffix)
+        list(APPEND all_buildtypes DEBUG)
+        z_vcpkg_configure_make_process_flags(DEBUG)
     endif()
     if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-        set(var_suffix RELEASE)
-        set(path_suffix_${var_suffix} "")
-        set(short_name_${var_suffix} "rel")
-        list(APPEND all_buildtypes ${var_suffix})
-        z_vcpkg_extract_cpp_flags_and_set_cflags_and_cxxflags(${var_suffix})
-        z_vcpkg_setup_make_linker_flags_vars(${var_suffix})
-        unset(var_suffix)
+        list(APPEND all_buildtypes RELEASE)
+        z_vcpkg_configure_make_process_flags(RELEASE)
+    endif()
+    list(FILTER z_vcm_all_flags INCLUDE REGEX " ")
+    if(z_vcm_all_flags)
+        list(REMOVE_DUPLICATES z_vcm_all_flags)
+        list(JOIN z_vcm_all_flags "\n   " flags)
+        message(STATUS "Warning: Arguments with embedded space may be handled incorrectly by configure:\n   ${flags}")
     endif()
 
     foreach(var IN ITEMS arg_OPTIONS arg_OPTIONS_RELEASE arg_OPTIONS_DEBUG)
@@ -764,12 +809,7 @@ function(vcpkg_configure_make)
             set(relative_build_path .)
         endif()
 
-        # Setup PKG_CONFIG_PATH
-        if ("${current_buildtype}" STREQUAL "DEBUG")
-            z_vcpkg_setup_pkgconfig_path(BASE_DIRS "${CURRENT_INSTALLED_DIR}/debug")
-        else()
-            z_vcpkg_setup_pkgconfig_path(BASE_DIRS "${CURRENT_INSTALLED_DIR}")
-        endif()
+        z_vcpkg_setup_pkgconfig_path(BASE_DIRS "${CURRENT_INSTALLED_DIR}${path_suffix_${current_buildtype}}")
 
         # Setup environment
         set(ENV{CPPFLAGS} "${CPPFLAGS_${current_buildtype}}")
@@ -785,13 +825,6 @@ function(vcpkg_configure_make)
             # Target windows with wrappers enabled cannot forward ARFLAGS since it breaks the wrapper
             set(ENV{ARFLAGS} "${ARFLAGS_${current_buildtype}}")
         endif()
-        # https://www.gnu.org/software/libtool/manual/html_node/Link-mode.html
-        # -avoid-version is handled specially by libtool link mode, this flag is not forwarded to linker,
-        # and libtool tries to avoid versioning for shared libraries and no symbolic links are created.
-        if(VCPKG_TARGET_IS_ANDROID)
-            set(ENV{LDFLAGS} "-avoid-version $ENV{LDFLAGS}")
-            set(ENV{LDFLAGS_FOR_BUILD} "-avoid-version $ENV{LDFLAGS_FOR_BUILD}")
-        endif()
 
         if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS)
             # configure not using all flags to check if compiler works ...
@@ -863,7 +896,7 @@ function(vcpkg_configure_make)
     # Export matching make program for vcpkg_build_make (cache variable)
     if(CMAKE_HOST_WIN32 AND MSYS_ROOT)
         find_program(Z_VCPKG_MAKE make PATHS "${MSYS_ROOT}/usr/bin" NO_DEFAULT_PATH REQUIRED)
-    elseif(VCPKG_HOST_IS_OPENBSD)
+    elseif(VCPKG_HOST_IS_FREEBSD OR VCPKG_HOST_IS_OPENBSD)
         find_program(Z_VCPKG_MAKE gmake REQUIRED)
     else()
         find_program(Z_VCPKG_MAKE make REQUIRED)
diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_download_sourceforge.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_download_sourceforge.cmake
new file mode 100644
index 000000000..ad10ad690
--- /dev/null
+++ b/external_imported/vcpkg/scripts/cmake/vcpkg_download_sourceforge.cmake
@@ -0,0 +1,85 @@
+function(vcpkg_download_sourceforge out_var)
+    cmake_parse_arguments(PARSE_ARGV 1 "arg"
+        ""
+        "REPO;REF;SHA512;FILENAME"
+        "")
+
+    foreach(arg_name IN ITEMS REPO SHA512 FILENAME)
+        if(NOT DEFINED "arg_${arg_name}")
+            message(FATAL_ERROR "${arg_name} is required.")
+        endif()
+    endforeach()
+
+    if(DEFINED arg_UNPARSED_ARGUMENTS)
+        message(FATAL_ERROR "Unrecognized arguments: ${arg_UNPARSED_ARGUMENTS}")
+    endif()
+
+    set(sourceforge_host "https://sourceforge.net/projects")
+
+    if(arg_REPO MATCHES "^([^/]*)$") # just one element
+        set(org_name "${CMAKE_MATCH_1}")
+        set(repo_name "")
+    elseif(arg_REPO MATCHES "^([^/]*)/([^/]*)$") # two elements
+        set(org_name "${CMAKE_MATCH_1}")
+        set(repo_name "${CMAKE_MATCH_2}")
+    else()
+        message(FATAL_ERROR "REPO (${arg_REPO}) is not a valid repo name. It must be:
+    - an organization name without any slashes, or
+    - an organization name followed by a repository name separated by a single slash")
+    endif()
+    
+    if(DEFINED arg_REF)
+        set(url "${sourceforge_host}/${org_name}/files/${repo_name}/${arg_REF}/${arg_FILENAME}")
+    elseif(DEFINED repo_name)
+        set(url "${sourceforge_host}/${org_name}/${repo_name}/files/${arg_FILENAME}")
+    else()
+        set(url "${sourceforge_host}/${org_name}/files/${arg_FILENAME}")
+    endif()
+        
+    string(SUBSTRING "${arg_SHA512}" 0 10 sanitized_ref)
+
+    set(sourceforge_mirrors
+        cfhcable        # United States
+        pilotfiber      # New York, NY
+        gigenet         # Chicago, IL
+        versaweb        # Las Vegas, NV
+        ayera           # Modesto, CA
+        netactuate      # Durham, NC
+        phoenixnap      # Tempe, AZ
+        astuteinternet  # Vancouver, BC
+        freefr          # Paris, France
+        netcologne      # Cologne, Germany
+        deac-riga       # Latvia
+        excellmedia     # Hyderabad, India
+        iweb            # Montreal, QC
+        jaist           # Nomi, Japan
+        jztkft          # Mezotur, Hungary
+        managedway      # Detroit, MI
+        nchc            # Taipei, Taiwan
+        netix           # Bulgaria
+        ufpr            # Curitiba, Brazil
+        tenet           # Wynberg, South Africa
+    )
+    if(DEFINED SOURCEFORGE_MIRRORS AND NOT DEFINED VCPKG_SOURCEFORGE_EXTRA_MIRRORS)
+        message(WARNING "Extension point SOURCEFORGE_MIRRORS has been deprecated.
+    Please use the replacement VCPKG_SOURCEFORGE_EXTRA_MIRRORS variable instead.")
+        list(APPEND sourceforge_mirrors "${SOURCEFORGE_MIRRORS}")
+        list(REMOVE_DUPLICATES sourceforge_mirrors)
+    elseif(DEFINED VCPKG_SOURCEFORGE_EXTRA_MIRRORS)
+        list(APPEND sourceforge_mirrors "${VCPKG_SOURCEFORGE_EXTRA_MIRRORS}")
+        list(REMOVE_DUPLICATES sourceforge_mirrors)
+    endif()
+
+    set(all_urls "${url}/download")
+    foreach(mirror IN LISTS sourceforge_mirrors)
+        list(APPEND all_urls "${url}/download?use_mirror=${mirror}")
+    endforeach()
+    
+    vcpkg_download_distfile(archive
+        URLS ${all_urls}
+        SHA512 "${arg_SHA512}"
+        FILENAME "${arg_FILENAME}"
+    )
+
+    set("${out_var}" "${archive}" PARENT_SCOPE)
+endfunction()
diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_execute_build_process.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_execute_build_process.cmake
index 153ce6be1..60fd5b587 100644
--- a/external_imported/vcpkg/scripts/cmake/vcpkg_execute_build_process.cmake
+++ b/external_imported/vcpkg/scripts/cmake/vcpkg_execute_build_process.cmake
@@ -86,7 +86,7 @@ function(vcpkg_execute_build_process)
                     RESULT_VARIABLE error_code
                 )
             endif()
-        elseif(all_contents MATCHES "mt : general error c101008d: ")
+        elseif(all_contents MATCHES "mt(\\.exe)? : general error c101008d: ")
             # Antivirus workaround - occasionally files are locked and cause mt.exe to fail
             message(STATUS "mt.exe has failed. This may be the result of anti-virus. Disabling anti-virus on the buildtree folder may improve build speed")
             foreach(iteration RANGE 1 3)
diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_extract_archive.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_extract_archive.cmake
new file mode 100644
index 000000000..b6bc86847
--- /dev/null
+++ b/external_imported/vcpkg/scripts/cmake/vcpkg_extract_archive.cmake
@@ -0,0 +1,51 @@
+function(vcpkg_extract_archive)
+    cmake_parse_arguments(PARSE_ARGV 0 "arg"
+        ""
+        "ARCHIVE;DESTINATION"
+        ""
+    )
+
+    foreach(arg_name IN ITEMS ARCHIVE DESTINATION)
+        if(NOT DEFINED "arg_${arg_name}")
+            message(FATAL_ERROR "${arg_name} is required.")
+        endif()
+    endforeach()
+
+    if(DEFINED arg_UNPARSED_ARGUMENTS)
+        message(FATAL_ERROR "Unrecognized arguments: ${arg_UNPARSED_ARGUMENTS}")
+    endif()
+
+    if(EXISTS "${arg_DESTINATION}")
+        message(FATAL_ERROR "${arg_DESTINATION} was an extraction target, but it already exists.")
+    endif()
+
+    file(MAKE_DIRECTORY "${arg_DESTINATION}")
+
+    cmake_path(GET arg_ARCHIVE EXTENSION archive_extension)
+    string(TOLOWER "${archive_extension}" archive_extension)
+    if("${archive_extension}" MATCHES [[\.msi$]])
+        cmake_path(NATIVE_PATH arg_ARCHIVE archive_native_path)
+        cmake_path(NATIVE_PATH arg_DESTINATION destination_native_path)
+        cmake_path(GET arg_ARCHIVE PARENT_PATH archive_directory)
+        vcpkg_execute_in_download_mode(
+            COMMAND msiexec
+                /a "${archive_native_path}"
+                /qn "TARGETDIR=${destination_native_path}"
+            WORKING_DIRECTORY "${archive_directory}"
+        )
+    elseif("${archive_extension}" MATCHES [[\.7z\.exe$]])
+        vcpkg_find_acquire_program(7Z)
+        vcpkg_execute_in_download_mode(
+            COMMAND ${7Z} x
+                "${arg_ARCHIVE}"
+                "-o${arg_DESTINATION}"
+                -y -bso0 -bsp0
+            WORKING_DIRECTORY "${arg_DESTINATION}"
+        )
+    else()
+        vcpkg_execute_in_download_mode(
+            COMMAND "${CMAKE_COMMAND}" -E tar xzf "${arg_ARCHIVE}"
+            WORKING_DIRECTORY "${arg_DESTINATION}"
+        )
+    endif()
+endfunction()
diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_extract_source_archive.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_extract_source_archive.cmake
index f1ecb44e2..7b090c5eb 100644
--- a/external_imported/vcpkg/scripts/cmake/vcpkg_extract_source_archive.cmake
+++ b/external_imported/vcpkg/scripts/cmake/vcpkg_extract_source_archive.cmake
@@ -2,13 +2,7 @@ function(z_vcpkg_extract_source_archive_deprecated_mode archive working_director
     cmake_path(GET archive FILENAME archive_filename)
     if(NOT EXISTS "${working_directory}/${archive_filename}.extracted")
         message(STATUS "Extracting source ${archive}")
-        file(MAKE_DIRECTORY "${working_directory}")
-        vcpkg_execute_required_process(
-            ALLOW_IN_DOWNLOAD_MODE
-            COMMAND "${CMAKE_COMMAND}" -E tar xjf "${archive}"
-            WORKING_DIRECTORY "${working_directory}"
-            LOGNAME extract
-        )
+        vcpkg_extract_archive(ARCHIVE "${archive}" DESTINATION "${working_directory}")
         file(TOUCH "${working_directory}/${archive_filename}.extracted")
     endif()
 endfunction()
diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(7Z).cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(7Z).cmake
new file mode 100644
index 000000000..53e6f66d7
--- /dev/null
+++ b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(7Z).cmake
@@ -0,0 +1,9 @@
+set(program_name 7z)
+if(CMAKE_HOST_WIN32)
+    set(tool_subdirectory "23.01")
+    set(paths_to_search "${DOWNLOADS}/tools/7zip_msi-${tool_subdirectory}-windows/Files/7-Zip") # vcpkg fetch 7zip_msi path
+    list(APPEND paths_to_search "${DOWNLOADS}/tools/7z/${tool_subdirectory}/Files/7-Zip")
+    set(download_urls "https://github.com/ip7z/7zip/releases/download/23.01/7z2301.msi" "https://7-zip.org/a/7z2301.msi")
+    set(download_filename "7z2301.msi")
+    set(download_sha512 002c8ab30be802fa5fa90896d2bdf710bfbd89e39487af25af9d63821986e6d11c42b1c4f4acc79d325719b10193cd31c38f648403ef16f0580609afa8da9596)
+endif()
diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(ARIA2).cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(ARIA2).cmake
new file mode 100644
index 000000000..16153deff
--- /dev/null
+++ b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(ARIA2).cmake
@@ -0,0 +1,8 @@
+set(program_name aria2c)
+set(program_version 1.35.0)
+if(CMAKE_HOST_WIN32)
+    set(paths_to_search "${DOWNLOADS}/tools/aria2c/aria2-${program_version}-win-32bit-build1")
+    set(download_urls "https://github.com/aria2/aria2/releases/download/release-${program_version}/aria2-${program_version}-win-32bit-build1.zip")
+    set(download_filename "aria2-${program_version}-win-32bit-build1.zip")
+    set(download_sha512 933537cad820b1cecf43a9eeca7e1b241dd7b1c902ee942441a166f2c38845f16046321efbdfa2f83c7e9fc50c7ecc5da6fd00e0c6e2124c07d3b783aa5092a4)
+endif()
diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(BAZEL).cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(BAZEL).cmake
new file mode 100644
index 000000000..59153af6e
--- /dev/null
+++ b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(BAZEL).cmake
@@ -0,0 +1,21 @@
+set(program_name bazel)
+set(program_version 4.2.2)
+set(rename_binary_to "bazel")
+if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
+    set(tool_subdirectory "${program_version}-linux")
+    set(download_urls "https://github.com/bazelbuild/bazel/releases/download/${program_version}/bazel-${tool_subdirectory}-x86_64")
+    set(download_filename "bazel-${tool_subdirectory}-x86_64")
+    set(raw_executable ON)
+    set(download_sha512 f38619e054df78cab38278a5901b2798f2e25b5cec53358d98278002e713d225fd3df96a209b7f22a2357835a279cee8ef1768e10561b3e9fe6361f324563bb9)
+elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
+    set(tool_subdirectory "${program_version}-darwin")
+    set(download_urls "https://github.com/bazelbuild/bazel/releases/download/${program_version}/bazel-${tool_subdirectory}-x86_64")
+    set(download_filename "bazel-${tool_subdirectory}-x86_64")
+    set(raw_executable ON)
+    set(download_sha512 a3fd8f9d71b0669d742439200f27ee0a3891c1f248df62c841ebb2b416a47534562f429f8a08793b074e9b74f2ede3d97a7e13ac9921c7ee2dc6a2dca8b7f275)
+else()
+    set(tool_subdirectory "${program_version}-windows")
+    set(download_urls "https://github.com/bazelbuild/bazel/releases/download/${program_version}/bazel-${tool_subdirectory}-x86_64.zip")
+    set(download_filename "bazel-${tool_subdirectory}-x86_64.zip")
+    set(download_sha512 8a8196e242964114316232818cb81bfa19ebfd3a029ebf550a241e33b22a6e9ed636dade06411a8706c05c4e73def0bc8d7f45ff0ec5478bcc5de21b5638204d)
+endif()
diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(BISON).cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(BISON).cmake
new file mode 100644
index 000000000..10f9a7d7a
--- /dev/null
+++ b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(BISON).cmake
@@ -0,0 +1,20 @@
+if(CMAKE_HOST_WIN32)
+    # This download shall be the same as in vcpkg_find_acquire_program(FLEX).cmake
+    set(program_version 2.5.25)
+    set(download_urls "https://github.com/lexxmark/winflexbison/releases/download/v${program_version}/win_flex_bison-${program_version}.zip")
+    set(download_filename "win_flex_bison-${program_version}.zip")
+    set(download_sha512 2a829eb05003178c89f891dd0a67add360c112e74821ff28e38feb61dac5b66e9d3d5636ff9eef055616aaf282ee8d6be9f14c6ae4577f60bdcec96cec9f364e)
+    set(tool_subdirectory "${program_version}")
+    set(program_name win_bison)
+    set(paths_to_search "${DOWNLOADS}/tools/win_flex/${program_version}")
+    if(NOT EXISTS "${paths_to_search}/data/m4sugar/m4sugar.m4")
+        file(REMOVE_RECURSE "${paths_to_search}")
+    endif()
+else()
+    set(program_name bison)
+    set(apt_package_name bison)
+    set(brew_package_name bison)
+    if (APPLE)
+        set(paths_to_search /opt/homebrew/opt/bison/bin /usr/local/opt/bison/bin)
+    endif()
+endif()
diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(CLANG).cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(CLANG).cmake
new file mode 100644
index 000000000..0826c8751
--- /dev/null
+++ b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(CLANG).cmake
@@ -0,0 +1,31 @@
+set(program_name clang)
+set(tool_subdirectory "clang-15.0.6")
+set(program_version 15.0.6)
+if(CMAKE_HOST_WIN32)
+    set(paths_to_search
+        # Support LLVM in Visual Studio 2019
+        "$ENV{LLVMInstallDir}/x64/bin"
+        "$ENV{LLVMInstallDir}/bin"
+        "$ENV{VCINSTALLDIR}/Tools/Llvm/x64/bin"
+        "$ENV{VCINSTALLDIR}/Tools/Llvm/bin"
+        "${DOWNLOADS}/tools/${tool_subdirectory}-windows/bin"
+        "${DOWNLOADS}/tools/clang/${tool_subdirectory}/bin")
+
+    if(DEFINED ENV{PROCESSOR_ARCHITEW6432})
+        set(host_arch "$ENV{PROCESSOR_ARCHITEW6432}")
+    else()
+        set(host_arch "$ENV{PROCESSOR_ARCHITECTURE}")
+    endif()
+
+    if(host_arch MATCHES "64")
+        set(download_urls "https://github.com/llvm/llvm-project/releases/download/llvmorg-${program_version}/LLVM-${program_version}-win64.exe")
+        set(download_filename "LLVM-${program_version}-win64.7z.exe")
+        set(download_sha512 2dd6f3eea106f2b905e6658ea5ea12856d17285adbfba055edc2d6b6389c4c2f7aa001df5cb0d8fb84fa7fa47d5035a7fddf276523b472dd55f150ae25938768)
+    else()
+        set(download_urls "https://github.com/llvm/llvm-project/releases/download/llvmorg-${program_version}/LLVM-${program_version}-win32.exe")
+        set(download_filename "LLVM-${program_version}-win32.7z.exe")
+        set(download_sha512 90225D650EADB0E590A9912B479B46A575D41A19EB5F2DA03C4DC8B032DC0790222F0E3706DFE2A35C0E7747941972AC26CB47D3EB13730DB76168931F37E5F1)
+    endif()
+endif()
+set(brew_package_name "llvm")
+set(apt_package_name "clang")
diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(DARK).cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(DARK).cmake
new file mode 100644
index 000000000..9362a7ed2
--- /dev/null
+++ b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(DARK).cmake
@@ -0,0 +1,8 @@
+set(program_name dark)
+if(CMAKE_HOST_WIN32)
+    set(tool_subdirectory "wix311-binaries")
+    set(paths_to_search "${DOWNLOADS}/tools/dark/${tool_subdirectory}")
+    set(download_urls "https://github.com/wixtoolset/wix3/releases/download/wix311rtm/wix311-binaries.zip")
+    set(download_filename "wix311-binaries.zip")
+    set(download_sha512 74f0fa29b5991ca655e34a9d1000d47d4272e071113fada86727ee943d913177ae96dc3d435eaf494d2158f37560cd4c2c5274176946ebdb17bf2354ced1c516)
+endif()
diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(DOXYGEN).cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(DOXYGEN).cmake
new file mode 100644
index 000000000..86ebf4f5a
--- /dev/null
+++ b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(DOXYGEN).cmake
@@ -0,0 +1,11 @@
+set(program_name doxygen)
+set(program_version 1.9.1)
+if(CMAKE_HOST_WIN32)
+    set(download_filename "doxygen-${program_version}.windows.bin.zip")
+    set(download_sha512 "c3eeb6b9fa4eab70fb6b0864fbbf94fb8050f3fee38d117cf470921a80e3569cc1c8b0272604d6731e05f01790cfaa70e159bec5d0882fc4f2d8ae4a5d52a21b")
+    vcpkg_list(SET sourceforge_args
+        REPO doxygen
+        REF "rel-${program_version}"
+        )
+    set(tool_subdirectory c3eeb6b9fa-76d69c6db5)
+endif()
diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(FLEX).cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(FLEX).cmake
new file mode 100644
index 000000000..b686c7fd7
--- /dev/null
+++ b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(FLEX).cmake
@@ -0,0 +1,17 @@
+if(CMAKE_HOST_WIN32)
+    # This download shall be the same as in vcpkg_find_acquire_program(BISON).cmake
+    set(program_version 2.5.25)
+    set(download_urls "https://github.com/lexxmark/winflexbison/releases/download/v${program_version}/win_flex_bison-${program_version}.zip")
+    set(download_filename "win_flex_bison-${program_version}.zip")
+    set(download_sha512 2a829eb05003178c89f891dd0a67add360c112e74821ff28e38feb61dac5b66e9d3d5636ff9eef055616aaf282ee8d6be9f14c6ae4577f60bdcec96cec9f364e)
+    set(tool_subdirectory "${program_version}")
+    set(program_name win_flex)
+    set(paths_to_search "${DOWNLOADS}/tools/win_flex/${program_version}")
+    if(NOT EXISTS "${paths_to_search}/data/m4sugar/m4sugar.m4")
+        file(REMOVE_RECURSE "${paths_to_search}")
+    endif()
+else()
+    set(program_name flex)
+    set(apt_package_name flex)
+    set(brew_package_name flex)
+endif()
diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(GASPREPROCESSOR).cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(GASPREPROCESSOR).cmake
new file mode 100644
index 000000000..b20086447
--- /dev/null
+++ b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(GASPREPROCESSOR).cmake
@@ -0,0 +1,11 @@
+set(raw_executable true)
+set(program_name gas-preprocessor)
+set(interpreter PERL)
+set(search_names "gas-preprocessor.pl")
+set(paths_to_search "${DOWNLOADS}/tools/gas-preprocessor/${tool_subdirectory}")
+set(rename_binary_to "gas-preprocessor.pl")
+set(commit_id 9309c67acb535ca6248f092e96131d8eb07eefc1)
+set(download_urls "https://raw.githubusercontent.com/FFmpeg/gas-preprocessor/${commit_id}/gas-preprocessor.pl")
+string(SUBSTRING ${commit_id} 0 8 tool_subdirectory)
+set(download_filename "gas-preprocessor-${tool_subdirectory}.pl")
+set(download_sha512 b4749cf8aa758e3f28d4b21803422a5c2588f5fc48cfd317564606b374f8d739c636067cf7a4956d7365d63b055bc6e7626c304857e6c9013d6b4a0db9d8ad4f)
diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(GIT).cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(GIT).cmake
new file mode 100644
index 000000000..dc6f708de
--- /dev/null
+++ b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(GIT).cmake
@@ -0,0 +1,15 @@
+set(program_name git)
+if(CMAKE_HOST_WIN32)
+    set(base_version 2.32.0)
+    set(program_version 2.32.0.2)
+    set(tool_subdirectory "git-${program_version}-2-windows")
+    set(download_urls "https://github.com/git-for-windows/git/releases/download/v${base_version}.windows.2/PortableGit-${program_version}-32-bit.7z.exe")
+    set(download_filename "PortableGit-${program_version}-32-bit.7z.exe")
+    set(download_sha512 867d8534972cbaf7a4224e25a14d484f8d17ef186f8d79e9a758afb90cf69541375cb7615a39702311f4809cb8371ef85c2b1a15bfffe9e48f0e597ac011b348)
+    set(paths_to_search
+        "${DOWNLOADS}/tools/${tool_subdirectory}/mingw32/bin"
+        "${DOWNLOADS}/tools/git/${tool_subdirectory}/mingw32/bin")
+else()
+    set(brew_package_name "git")
+    set(apt_package_name "git")
+endif()
diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(GN).cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(GN).cmake
new file mode 100644
index 000000000..94b569022
--- /dev/null
+++ b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(GN).cmake
@@ -0,0 +1,45 @@
+set(program_name gn)
+set(rename_binary_to "gn")
+if(EXISTS "${CURRENT_HOST_INSTALLED_DIR}/share/gn/version.txt")
+    file(READ "${CURRENT_HOST_INSTALLED_DIR}/share/gn/version.txt" program_version)
+    set(paths_to_search "${CURRENT_HOST_INSTALLED_DIR}/tools/gn")
+else() # Old behavior
+    message("Consider adding vcpkg-tool-gn as a host dependency of this port or create an issue at https://github.com/microsoft/vcpkg/issues")
+    set(cipd_download_gn "https://chrome-infra-packages.appspot.com/dl/gn/gn")
+    if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
+        EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE HOST_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
+        if(HOST_ARCH STREQUAL "aarch64")
+            set(program_version "GkfFAfAUyE-qfeWkdUMaeM1Ov64Fk3SjSj9pwKqZX7gC")
+            set(gn_platform "linux-arm64")
+            set(download_sha512 "E88201309A12C00CE60137261B8E1A759780C81D1925B819583B16D2095A16A7D32EFB2AF36C1E1D6EAA142BF6A6A811847D3140E4E94967EE28F4ADF6373E4B")
+        else()
+            set(program_version "Fv1ENXodhXmEXy_xpZr2gQkVJh57w_IsbsrEJOU0_EoC")
+            set(gn_platform "linux-amd64")
+            set(download_sha512 "A7A5CD5633C5547EC1B1A95958486DDAAC91F1A65881EDC0AD8F74DF44E82F08BA74358E9A72DFCDDE6F534A6B9C9A430D3E16ACE2E4346C4D2E9113F7654B3F")
+        endif()
+    elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
+        EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE HOST_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
+        if(HOST_ARCH STREQUAL "arm64")
+            set(program_version "qMPtGq7xZlpb-lHjP-SK27ftT4X71WIvguuyx6X14DEC")
+            set(gn_platform "mac-arm64")
+            set(download_sha512 "D096FB958D017807427911089AB5A7655AED117F6851C0491AC8063CEDB544423122EF64DF4264ECA86C20A2BDE9E64D7B72DA7ED8C95C2BA79A68B8247D36B8")
+        else()
+            set(program_version "0x2juPLNfP9603GIyZrUfflxK6LiMcppLAoxEpYuIYoC")
+            set(gn_platform "mac-amd64")
+            set(download_sha512 "2696ECE7B2C8008CABDDF10024017E2ECF875F8679424E77052252BDDC83A2096DF3C61D89CD25120EF27E0458C8914BEEED9D418593BDBC4F6ED33A8D4C3DC5")
+        endif()
+    else()
+        if("$ENV{PROCESSOR_ARCHITECTURE}" STREQUAL "ARM64")
+            set(program_version "q5ExVHmXyD34Q_Tzb-aRxsPipO-e37-csVRhVM7IJh0C")
+            set(gn_platform "windows-amd64")
+            set(download_sha512 "FA764AA44EB6F48ED50E855B4DC1DD1ABE35E45FD4AAC7F059A35293A14894C1B591215E34FB0CE9362E646EA9463BA3B489EFB7EBBAA2693D14238B50E4E686")
+        else() # AMD64
+            set(program_version "q5ExVHmXyD34Q_Tzb-aRxsPipO-e37-csVRhVM7IJh0C")
+            set(gn_platform "windows-amd64")
+            set(download_sha512 "FA764AA44EB6F48ED50E855B4DC1DD1ABE35E45FD4AAC7F059A35293A14894C1B591215E34FB0CE9362E646EA9463BA3B489EFB7EBBAA2693D14238B50E4E686")
+        endif()
+    endif()
+endif()
+set(tool_subdirectory "${program_version}")
+set(download_urls "${cipd_download_gn}/${gn_platform}/+/${program_version}")
+set(download_filename "gn-${gn_platform}.zip")
diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(GO).cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(GO).cmake
new file mode 100644
index 000000000..d2e59abd8
--- /dev/null
+++ b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(GO).cmake
@@ -0,0 +1,10 @@
+set(program_name go)
+set(brew_package_name "go")
+set(apt_package_name "golang-go")
+if(CMAKE_HOST_WIN32)
+    set(tool_subdirectory 1.21.1.windows-386)
+    set(paths_to_search "${DOWNLOADS}/tools/go/${tool_subdirectory}/go/bin")
+    set(download_urls "https://dl.google.com/go/go${tool_subdirectory}.zip")
+    set(download_filename "go${tool_subdirectory}.zip")
+    set(download_sha512 417a4bd95a10f21c2166badd2303e1956d91d0e783e334c99ea0176a323e815729c8c3af3f7ec68f057b757d06bcc75be82584031c4069c89a2db62bbfa902e8)
+endif()
diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(GPERF).cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(GPERF).cmake
new file mode 100644
index 000000000..dc5216265
--- /dev/null
+++ b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(GPERF).cmake
@@ -0,0 +1,8 @@
+set(program_name gperf)
+set(program_version 3.0.1)
+if(CMAKE_HOST_WIN32)
+    set(download_filename "gperf-${program_version}-bin.zip")
+    set(download_sha512 3f2d3418304390ecd729b85f65240a9e4d204b218345f82ea466ca3d7467789f43d0d2129fcffc18eaad3513f49963e79775b10cc223979540fa2e502fe7d4d9)
+    set(download_urls "https://sourceforge.net/projects/gnuwin32/files/gperf/${program_version}/gperf-${program_version}-bin.zip/download")
+    set(paths_to_search "${DOWNLOADS}/tools/gperf/bin")
+endif()
diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(JOM).cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(JOM).cmake
new file mode 100644
index 000000000..f3d5a2d1d
--- /dev/null
+++ b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(JOM).cmake
@@ -0,0 +1,13 @@
+set(program_name jom)
+set(program_version_string 1_1_4)
+if(CMAKE_HOST_WIN32)
+    set(download_urls
+        "https://download.qt.io/official_releases/jom/jom_${program_version_string}.zip"
+        "https://mirrors.ocf.berkeley.edu/qt/official_releases/jom/jom_${program_version_string}.zip"
+        "https://mirrors.ukfast.co.uk/sites/qt.io/official_releases/jom/jom_${program_version_string}.zip"
+    )
+    set(download_filename "jom_${program_version_string}.zip")
+    set(download_sha512 a683bd829c84942223a791dae8abac5cfc2e3fa7de84c6fdc490ad3aa996a26c9fa0be0636890f02c9d56948bbe3225b43497cb590d1cb01e70c6fac447fa17b)
+    set(tool_subdirectory "jom-${program_version_string}")
+    set(paths_to_search "${DOWNLOADS}/tools/jom/${tool_subdirectory}")
+endif()
diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(MESON).cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(MESON).cmake
new file mode 100644
index 000000000..d927040bf
--- /dev/null
+++ b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(MESON).cmake
@@ -0,0 +1,18 @@
+set(program_name meson)
+set(search_names meson meson.py)
+set(interpreter PYTHON3)
+set(apt_package_name "meson")
+set(brew_package_name "meson")
+set(version_command --version)
+set(extra_search_args EXACT_VERSION_MATCH)
+if(EXISTS "${CURRENT_HOST_INSTALLED_DIR}/share/meson/version.txt")
+    file(READ "${CURRENT_HOST_INSTALLED_DIR}/share/meson/version.txt" program_version)
+    set(paths_to_search "${CURRENT_HOST_INSTALLED_DIR}/tools/meson")
+else() # Old behavior
+    set(program_version 0.58.1)
+    set(ref aeda7f249c4a5dbbecc52e44f382246a2377b5b0)
+    set(paths_to_search "${DOWNLOADS}/tools/meson/meson-${ref}")
+    set(download_urls "https://github.com/mesonbuild/meson/archive/${ref}.tar.gz")
+    set(download_filename "meson-${ref}.tar.gz")
+    set(download_sha512 18a012a45274dbb4582e99fd69d920f38831e788d9860f9553c64847bedb1c2010ae0b5c0ef4a4350c03f5e0f95aaa0395378e1208109b59640c1a70b1e202d2)
+endif()
diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(NASM).cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(NASM).cmake
new file mode 100644
index 000000000..8e76bede8
--- /dev/null
+++ b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(NASM).cmake
@@ -0,0 +1,13 @@
+set(program_name nasm)
+set(program_version 2.16.01)
+set(brew_package_name "nasm")
+set(apt_package_name "nasm")
+if(CMAKE_HOST_WIN32)
+    set(download_urls
+        "https://www.nasm.us/pub/nasm/releasebuilds/${program_version}/win64/nasm-${program_version}-win64.zip"
+        "https://gstreamer.freedesktop.org/src/mirror/nasm-${program_version}-win64.zip"
+    )
+    set(download_filename "nasm-${program_version}-win64.zip")
+    set(download_sha512 ce4d02f530dc3376b4513f219bbcec128ee5bebd8a5c332599b48d8071f803d1538d7258fec7c2e9b4d725b8d7314cea2696289d0493017eb13bfe70e5cb5062)
+    set(paths_to_search "${DOWNLOADS}/tools/nasm/nasm-${program_version}")
+endif()
diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(NINJA).cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(NINJA).cmake
new file mode 100644
index 000000000..a7bbc9add
--- /dev/null
+++ b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(NINJA).cmake
@@ -0,0 +1,28 @@
+set(program_name ninja)
+set(program_version 1.10.2)
+set(version_command --version)
+if(CMAKE_HOST_WIN32)
+    set(download_filename "ninja-win-${program_version}.zip")
+    set(tool_subdirectory "${program_version}-windows")
+    set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-win.zip")
+    set(download_sha512 6004140d92e86afbb17b49c49037ccd0786ce238f340f7d0e62b4b0c29ed0d6ad0bab11feda2094ae849c387d70d63504393714ed0a1f4d3a1f155af7a4f1ba3)
+elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
+    set(download_filename "ninja-mac-${program_version}.zip")
+    set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-mac.zip")
+    set(tool_subdirectory "${program_version}-osx")
+    set(paths_to_search "${DOWNLOADS}/tools/ninja-${program_version}-osx")
+    set(download_sha512 bcd12f6a3337591306d1b99a7a25a6933779ba68db79f17c1d3087d7b6308d245daac08df99087ff6be8dc7dd0dcdbb3a50839a144745fa719502b3a7a07260b)
+elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD")
+    set(paths_to_search "${DOWNLOADS}/tools/${tool_subdirectory}-freebsd")
+else()
+    execute_process(COMMAND "uname" "-m" OUTPUT_VARIABLE HOST_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if(HOST_ARCH MATCHES "x86_64|amd64|AMD64")
+        set(download_filename "ninja-linux-${program_version}.zip")
+        set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-linux.zip")
+        set(tool_subdirectory "${program_version}-linux")
+        set(paths_to_search "${DOWNLOADS}/tools/ninja-${program_version}-linux")
+        set(download_sha512 93e802e9c17fb59636cddde4bad1ddaadad624f4ecfee00d5c78790330a4e9d433180e795718cda27da57215ce643c3929cf72c85337ee019d868c56f2deeef3)
+    else()
+        set(version_command "") # somewhat hacky way to skip version check and use system binary
+    endif()
+endif()
diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(NUGET).cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(NUGET).cmake
new file mode 100644
index 000000000..f7c1ffbb7
--- /dev/null
+++ b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(NUGET).cmake
@@ -0,0 +1,11 @@
+set(program_name nuget)
+set(brew_package_name "nuget")
+if(CMAKE_HOST_WIN32)
+    set(download_urls "https://dist.nuget.org/win-x86-commandline/v5.11.0/nuget.exe")
+    set(download_filename "nuget.5.11.0.exe")
+    set(download_sha512 06a337c9404dec392709834ef2cdbdce611e104b510ef40201849595d46d242151749aef65bc2d7ce5ade9ebfda83b64c03ce14c8f35ca9957a17a8c02b8c4b7)
+    set(tool_subdirectory "5.11.0")
+    set(paths_to_search "${DOWNLOADS}/tools/nuget-${tool_subdirectory}-windows")
+    set(raw_executable ON)
+    set(rename_binary_to "nuget.exe")
+endif()
diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(PATCHELF).cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(PATCHELF).cmake
new file mode 100644
index 000000000..a10c75d2b
--- /dev/null
+++ b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(PATCHELF).cmake
@@ -0,0 +1,19 @@
+set(program_name patchelf)
+set(program_version 0.14.5)
+if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
+    execute_process(COMMAND "uname" "-m" OUTPUT_VARIABLE HOST_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if(HOST_ARCH STREQUAL "aarch64")
+        set(patchelf_platform "aarch64")
+        set(download_sha512 "3B5EB4405FAB1D5202728AA390DD9F059CD7AFD582BAD9C50383CAD605127BC77DFCE3F2F26E9714F6BD5CCFFD49D3973BA2F061D2E2931B6E1BD0C263B99E75")
+    elseif(HOST_ARCH STREQUAL "armv7l")
+        set(patchelf_platform "armv7l")
+        set(download_sha512 "30160d750784f5e8805bffe96ca80b40ed10441549e10f47b61e0d21b32979e01865cd770f1de9162988d4daabc6984dcdb7438f67bcd5eee76ad5f01b00276d")
+    else()
+        set(patchelf_platform "x86_64")
+        set(download_sha512 "5E983A25B3F3F3B8582D1DE6C7DE30812E8D6E58E96F711F33A2634D3FB1F2370531DA179927AA401328319F92465E6F76274A6F994D1DC54C74B98E704D0D29")
+    endif()
+    set(download_filename "${program_name}-${program_version}-${patchelf_platform}.tar.gz")
+    set(download_urls "https://github.com/NixOS/patchelf/releases/download/${program_version}/${download_filename}")
+    set(tool_subdirectory "${program_version}-${patchelf_platform}-linux")
+    set(paths_to_search "${DOWNLOADS}/tools/patchelf/${program_version}-${patchelf_platform}-linux/bin")
+endif()
diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(PERL).cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(PERL).cmake
new file mode 100644
index 000000000..aba77e4b0
--- /dev/null
+++ b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(PERL).cmake
@@ -0,0 +1,13 @@
+set(program_name perl)
+set(program_version 5.38.0.1)
+set(brew_package_name "perl")
+set(apt_package_name "perl")
+if(CMAKE_HOST_WIN32)
+    set(download_urls
+        "https://github.com/StrawberryPerl/Perl-Dist-Strawberry/releases/download/SP_5380_5361/strawberry-perl-5.38.0.1-64bit-portable.zip"
+    )
+    set(download_filename "strawberry-perl-5.38.0.1-64bit-portable.zip")
+    set(download_sha512 9b604f19e245a809bd18857bd91ebaec81ca031394ec69a3369df64d3590d2c9d557326d8aa10f91e78b1f1d56689aa57a8ec3a8cad4d2e542c96eb714a3831d)
+    set(tool_subdirectory ${program_version})
+    set(paths_to_search ${DOWNLOADS}/tools/perl/${tool_subdirectory}/perl/bin)
+endif()
diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(PKGCONFIG).cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(PKGCONFIG).cmake
new file mode 100644
index 000000000..e50c1a965
--- /dev/null
+++ b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(PKGCONFIG).cmake
@@ -0,0 +1,76 @@
+macro(z_vcpkg_find_acquire_pkgconfig_msys_declare_packages)
+    z_vcpkg_acquire_msys_declare_package(
+        URL "https://mirror.msys2.org/mingw/clangarm64/mingw-w64-clang-aarch64-pkgconf-1~2.1.0-1-any.pkg.tar.zst"
+        SHA512 d988b6a9d3704d63d0dfa21f5388b3de8b74d84533491e2facc2ce4e67e8efac611ebf4df422e90476ec2624fe766da441ad7b0fe0a3ee99ff9fd3ae84b18292
+        PROVIDES mingw-w64-clang-aarch64-pkg-config
+    )
+    z_vcpkg_acquire_msys_declare_package(
+        URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-pkgconf-1~2.1.0-1-any.pkg.tar.zst"
+        SHA512 1567ba9fc947b3a1a983f5a23dcc0982950190cd92d7527684ba219253c5fa4b340b315f25ee695be1cdf6bfbb2cc5c3bdf7a5758b1d66b761748b5aad9afe39
+        PROVIDES mingw-w64-x86_64-pkg-config
+    )
+    z_vcpkg_acquire_msys_declare_package(
+        URL "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-pkgconf-1~2.1.0-1-any.pkg.tar.zst"
+        SHA512 55626f0b7a6c950da75c4f7579b94859027f127c075042ab1f65b5387659eceb9e4c73dd3b79f54227772bd39a5759fbe10aa024cd38c8ac76677d0aec8458c1
+        PROVIDES mingw-w64-i686-pkg-config
+    )
+endmacro()
+
+set(program_name pkg-config)
+if(DEFINED "ENV{PKG_CONFIG}")
+    debug_message(STATUS "PKG_CONFIG found in ENV! Using $ENV{PKG_CONFIG}")
+    set(PKGCONFIG "$ENV{PKG_CONFIG}" CACHE INTERNAL "")
+    set(PKGCONFIG "${PKGCONFIG}" PARENT_SCOPE)
+    return()
+elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "OpenBSD")
+    # As of 6.8, the OpenBSD specific pkg-config doesn't support {pcfiledir}
+    set(rename_binary_to "pkg-config")
+    set(program_version 0.29.2.1)
+    set(raw_executable ON)
+    set(download_filename "pkg-config.openbsd")
+    set(tool_subdirectory "openbsd")
+    set(download_urls "https://raw.githubusercontent.com/jgilje/pkg-config-openbsd/master/pkg-config")
+    set(download_sha512 b7ec9017b445e00ae1377e36e774cf3f5194ab262595840b449832707d11e443a102675f66d8b7e8b2e2f28cebd6e256835507b1e0c69644cc9febab8285080b)
+    set(version_command --version)
+elseif(CMAKE_HOST_WIN32)
+    if(NOT EXISTS "${PKGCONFIG}")
+        set(program_version 2.1.0)
+        if(DEFINED ENV{PROCESSOR_ARCHITEW6432})
+            set(host_arch "$ENV{PROCESSOR_ARCHITEW6432}")
+        else()
+            set(host_arch "$ENV{PROCESSOR_ARCHITECTURE}")
+        endif()
+
+        if("${host_arch}" STREQUAL "ARM64")
+            vcpkg_acquire_msys(PKGCONFIG_ROOT
+                NO_DEFAULT_PACKAGES
+                Z_DECLARE_EXTRA_PACKAGES_COMMAND "z_vcpkg_find_acquire_pkgconfig_msys_declare_packages"
+                PACKAGES mingw-w64-clang-aarch64-pkgconf
+            )
+            set("${program}" "${PKGCONFIG_ROOT}/clangarm64/bin/pkg-config.exe" CACHE INTERNAL "")
+        elseif("${host_arch}" MATCHES "64")
+            vcpkg_acquire_msys(PKGCONFIG_ROOT
+                NO_DEFAULT_PACKAGES
+                Z_DECLARE_EXTRA_PACKAGES_COMMAND "z_vcpkg_find_acquire_pkgconfig_msys_declare_packages"
+                PACKAGES mingw-w64-x86_64-pkgconf
+            )
+            set("${program}" "${PKGCONFIG_ROOT}/mingw64/bin/pkg-config.exe" CACHE INTERNAL "")
+        else()
+            vcpkg_acquire_msys(PKGCONFIG_ROOT
+                NO_DEFAULT_PACKAGES
+                Z_DECLARE_EXTRA_PACKAGES_COMMAND "z_vcpkg_find_acquire_pkgconfig_msys_declare_packages"
+                PACKAGES mingw-w64-i686-pkgconf
+            )
+            set("${program}" "${PKGCONFIG_ROOT}/mingw32/bin/pkg-config.exe" CACHE INTERNAL "")
+        endif()
+    endif()
+    set("${program}" "${${program}}" PARENT_SCOPE)
+    return()
+else()
+    set(brew_package_name pkg-config)
+    set(apt_package_name pkg-config)
+    set(paths_to_search "/bin" "/usr/bin" "/usr/local/bin")
+    if(VCPKG_HOST_IS_OSX)
+        vcpkg_list(PREPEND paths_to_search "/opt/homebrew/bin")
+    endif()
+endif()
diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(PYTHON2).cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(PYTHON2).cmake
new file mode 100644
index 000000000..7e7905b17
--- /dev/null
+++ b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(PYTHON2).cmake
@@ -0,0 +1,27 @@
+if(CMAKE_HOST_WIN32)
+    set(program_name python)
+    set(program_version 2.7.18)
+    if(EXISTS "${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-tool-python2/details.cmake")
+        include("${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-tool-python2/details.cmake")
+    else() # Old behavior
+        if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86)
+            set(tool_subdirectory "python-${program_version}-x86")
+            set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}.msi")
+            set(download_filename "python-${program_version}.msi")
+            set(download_sha512 2c112733c777ddbf189b0a54047a9d5851ebce0564cc38b9687d79ce6c7a09006109dbad8627fb1a60c3ad55e261db850d9dfa454af0533b460b2afc316fe115)
+        else()
+            set(tool_subdirectory "python-${program_version}-x64")
+            set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}.amd64.msi")
+            set(download_filename "python-${program_version}.amd64.msi")
+            set(download_sha512 6a81a413b80fd39893e7444fd47efa455d240cbb77a456c9d12f7cf64962b38c08cfa244cd9c50a65947c40f936c6c8c5782f7236d7b92445ab3dd01e82af23e)
+        endif()
+        set(paths_to_search "${DOWNLOADS}/tools/python/${tool_subdirectory}")
+    endif()
+elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
+    # macOS includes Python 2.7 built-in as `python`
+    set(program_name python)
+    set(brew_package_name "python2")
+else()
+    set(program_name python2)
+    set(apt_package_name "python")
+endif()
diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(PYTHON3).cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(PYTHON3).cmake
new file mode 100644
index 000000000..8a7c9f9d6
--- /dev/null
+++ b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(PYTHON3).cmake
@@ -0,0 +1,32 @@
+if(CMAKE_HOST_WIN32)
+    set(program_name python)
+    set(program_version 3.11.5)
+    if(DEFINED ENV{PROCESSOR_ARCHITEW6432})
+        set(build_arch $ENV{PROCESSOR_ARCHITEW6432})
+    else()
+        set(build_arch $ENV{PROCESSOR_ARCHITECTURE})
+    endif()
+    if(build_arch MATCHES "^(ARM|arm)64$")
+        set(tool_subdirectory "python-${program_version}-arm64")
+        set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}-embed-arm64.zip")
+        set(download_filename "python-${program_version}-embed-arm64.zip")
+        set(download_sha512 23d67fa89176fb47f564df9713039e86d1957831866c20d474be03fe6616bd15292e9912e44d3c1830747c24eb2131aeda53f19b3d4e7d1c8bd2bbb461e56f6c)
+    elseif(build_arch MATCHES "(amd|AMD)64")
+        set(tool_subdirectory "python-${program_version}-x64")
+        set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}-embed-amd64.zip")
+        set(download_filename "python-${program_version}-embed-amd64.zip")
+        set(download_sha512 29a526da7624423b09ea1c8f94d83e5ad2d7ba7553c5651d8fcbe1b2483c62f27f9db105d1fdcfca3357b44d456fe1141274725bc97ad5166edfec14f251eb36)
+    else()
+        set(tool_subdirectory "python-${program_version}-x86")
+        set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}-embed-win32.zip")
+        set(download_filename "python-${program_version}-embed-win32.zip")
+        set(download_sha512 d5412c5bc2a0664f86e504a536c201789c8fd8b97c641bbb7b254c87c2f13504d25fa9d0b74e27a1c54c2d9fb592f9546d8c1e82c506dc9c76a21774c4c3ea75)
+    endif()
+
+    set(paths_to_search "${DOWNLOADS}/tools/python/${tool_subdirectory}")
+    vcpkg_list(SET post_install_command "${CMAKE_COMMAND}" -E rm python311._pth)
+else()
+    set(program_name python3)
+    set(brew_package_name "python")
+    set(apt_package_name "python3")
+endif()
diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(RUBY).cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(RUBY).cmake
new file mode 100644
index 000000000..c955e6ad6
--- /dev/null
+++ b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(RUBY).cmake
@@ -0,0 +1,8 @@
+set(program_name "ruby")
+set(program_version 2.7.4-1)
+if(CMAKE_HOST_WIN32)
+    set(download_urls "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-${program_version}/rubyinstaller-${program_version}-x86.7z")
+    set(download_filename "rubyinstaller-${program_version}-x86.7z")
+    set(download_sha512 4bf459c987b407bdda328c52d95060bf6ad48fc3e5ed5f64d4b205c5b4153c7a00cb6f9da6c0bcd5f2e001e9dc3dda0b72269ec4afdeffd658b93c085cd1d859)
+    set(paths_to_search "${DOWNLOADS}/tools/ruby/rubyinstaller-${program_version}-x86/bin")
+endif()
diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(SCONS).cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(SCONS).cmake
new file mode 100644
index 000000000..e5056a9e7
--- /dev/null
+++ b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(SCONS).cmake
@@ -0,0 +1,10 @@
+set(program_name scons)
+set(program_version 4.1.0)
+set(interpreter PYTHON2)
+set(search_names "scons.py")
+if(CMAKE_HOST_WIN32)
+    set(download_urls "https://sourceforge.net/projects/scons/files/scons-local-${program_version}.zip/download")
+    set(download_filename "scons-local-${program_version}.zip")
+    set(download_sha512 b173176ce8aca25039c64fcc68ec1b9ad31e03a926fd545e7631b3f9b374d914adffc593f505e3e7e2867b0ffe85e8deb0b39afe314edf05d02974ce5db1badb)
+    set(tool_subdirectory "${program_version}")
+endif()
diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(SWIG).cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(SWIG).cmake
new file mode 100644
index 000000000..5189eda22
--- /dev/null
+++ b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(SWIG).cmake
@@ -0,0 +1,16 @@
+set(program_version 4.0.2)
+set(program_name swig)
+if(CMAKE_HOST_WIN32)
+    set(download_filename "swigwin-${program_version}.zip")
+    set(download_sha512 "b8f105f9b9db6acc1f6e3741990915b533cd1bc206eb9645fd6836457fd30789b7229d2e3219d8e35f2390605ade0fbca493ae162ec3b4bc4e428b57155db03d")
+    vcpkg_list(SET sourceforge_args
+        REPO swig/swigwin
+        REF "swigwin-${program_version}"
+    )
+
+    set(tool_subdirectory "b8f105f9b9-f0518bc3b7")
+    set(paths_to_search "${DOWNLOADS}/tools/swig/b8f105f9b9-f0518bc3b7/swigwin-${program_version}")
+else()
+    set(apt_package_name "swig")
+    set(brew_package_name "swig")
+endif()
diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(YASM).cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(YASM).cmake
new file mode 100644
index 000000000..ae8c8771d
--- /dev/null
+++ b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program(YASM).cmake
@@ -0,0 +1,12 @@
+set(program_name yasm)
+set(program_version 1.3.0.6.g1962)
+set(brew_package_name "yasm")
+set(apt_package_name "yasm")
+if(CMAKE_HOST_WIN32)
+    set(download_urls "https://www.tortall.net/projects/yasm/snapshots/v${program_version}/yasm-${program_version}.exe")
+    set(download_filename "yasm-${program_version}.exe")
+    set(download_sha512 c1945669d983b632a10c5ff31e86d6ecbff143c3d8b2c433c0d3d18f84356d2b351f71ac05fd44e5403651b00c31db0d14615d7f9a6ecce5750438d37105c55b)
+    set(tool_subdirectory 1.3.0.6)
+    set(raw_executable ON)
+    set(rename_binary_to "yasm.exe")
+endif()
diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program.cmake
index a18077356..1d653cf6f 100644
--- a/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program.cmake
+++ b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program.cmake
@@ -84,7 +84,11 @@ function(z_vcpkg_find_acquire_program_find_internal program)
             PATHS ${arg_PATHS}
             NO_DEFAULT_PATH)
         if(SCRIPT_${program})
-            set("${program}" ${${arg_INTERPRETER}} ${SCRIPT_${program}} CACHE INTERNAL "")
+            if(arg_INTERPRETER MATCHES "PYTHON")
+              set("${program}" ${${arg_INTERPRETER}} -I ${SCRIPT_${program}} CACHE INTERNAL "")
+            else()
+              set("${program}" ${${arg_INTERPRETER}} ${SCRIPT_${program}} CACHE INTERNAL "")
+            endif()
         endif()
         unset(SCRIPT_${program} CACHE)
     endif()
@@ -105,7 +109,6 @@ function(vcpkg_find_acquire_program program)
     set(rename_binary_to "")
     set(tool_subdirectory "")
     set(interpreter "")
-    set(supported_on_unix "")
     set(post_install_command "")
     set(paths_to_search "")
     set(version_command "")
@@ -113,463 +116,9 @@ function(vcpkg_find_acquire_program program)
     set(brew_package_name "")
     set(apt_package_name "")
 
-    if(program STREQUAL "PERL")
-        set(program_name perl)
-        set(program_version 5.32.1.1)
-        set(tool_subdirectory ${program_version})
-        set(paths_to_search ${DOWNLOADS}/tools/perl/${tool_subdirectory}/perl/bin)
-        set(brew_package_name "perl")
-        set(apt_package_name "perl")
-        set(download_urls
-            "https://strawberryperl.com/download/${program_version}/strawberry-perl-${program_version}-32bit.zip"
-        )
-        set(download_filename "strawberry-perl-${program_version}-32bit.zip")
-        set(download_sha512 936381254fea2e596db6a16c23b08ced25c4081fda484e1b8c4356755016e4b956bd00f3d2ee651d5f41a7695e9998f6c1ac3f4a237212b9c55aca8c5fea14e9)
-    elseif(program STREQUAL "NASM")
-        set(program_name nasm)
-        set(program_version 2.16.01)
-        set(paths_to_search "${DOWNLOADS}/tools/nasm/nasm-${program_version}")
-        set(brew_package_name "nasm")
-        set(apt_package_name "nasm")
-        set(download_urls "https://www.nasm.us/pub/nasm/releasebuilds/${program_version}/win64/nasm-${program_version}-win64.zip")
-        set(download_filename "nasm-${program_version}-win64.zip")
-        set(download_sha512 ce4d02f530dc3376b4513f219bbcec128ee5bebd8a5c332599b48d8071f803d1538d7258fec7c2e9b4d725b8d7314cea2696289d0493017eb13bfe70e5cb5062)
-    elseif(program STREQUAL "YASM")
-        set(program_name yasm)
-        set(program_version 1.3.0.6.g1962)
-        set(tool_subdirectory 1.3.0.6)
-        set(brew_package_name "yasm")
-        set(apt_package_name "yasm")
-        set(download_urls "https://www.tortall.net/projects/yasm/snapshots/v${program_version}/yasm-${program_version}.exe")
-        set(download_filename "yasm-${program_version}.exe")
-        set(rename_binary_to "yasm.exe")
-        set(raw_executable ON)
-        set(download_sha512 c1945669d983b632a10c5ff31e86d6ecbff143c3d8b2c433c0d3d18f84356d2b351f71ac05fd44e5403651b00c31db0d14615d7f9a6ecce5750438d37105c55b)
-    elseif(program STREQUAL "GIT")
-        set(program_name git)
-        if(CMAKE_HOST_WIN32)
-            set(base_version 2.32.0)
-            set(program_version 2.32.0.2)
-            set(tool_subdirectory "git-${program_version}-2-windows")
-            set(download_urls "https://github.com/git-for-windows/git/releases/download/v${base_version}.windows.2/PortableGit-${program_version}-32-bit.7z.exe")
-            set(download_filename "PortableGit-${program_version}-32-bit.7z.exe")
-            set(download_sha512 867d8534972cbaf7a4224e25a14d484f8d17ef186f8d79e9a758afb90cf69541375cb7615a39702311f4809cb8371ef85c2b1a15bfffe9e48f0e597ac011b348)
-            set(paths_to_search
-                "${DOWNLOADS}/tools/${tool_subdirectory}/mingw32/bin"
-                "${DOWNLOADS}/tools/git/${tool_subdirectory}/mingw32/bin")
-        else()
-            set(brew_package_name "git")
-            set(apt_package_name "git")
-        endif()
-    elseif(program STREQUAL "GN")
-        set(program_name gn)
-        set(rename_binary_to "gn")
-        if(EXISTS "${CURRENT_HOST_INSTALLED_DIR}/share/gn/version.txt")
-            file(READ "${CURRENT_HOST_INSTALLED_DIR}/share/gn/version.txt" program_version)
-            set(paths_to_search "${CURRENT_HOST_INSTALLED_DIR}/tools/gn")
-        else() # Old behavior
-            message("Consider adding vcpkg-tool-gn as a host dependency of this port or create an issue at https://github.com/microsoft/vcpkg/issues")
-            set(cipd_download_gn "https://chrome-infra-packages.appspot.com/dl/gn/gn")
-            if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
-                set(supported_on_unix ON)
-                EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE HOST_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
-                if(HOST_ARCH STREQUAL "aarch64")
-                    set(program_version "GkfFAfAUyE-qfeWkdUMaeM1Ov64Fk3SjSj9pwKqZX7gC")
-                    set(gn_platform "linux-arm64")
-                    set(download_sha512 "E88201309A12C00CE60137261B8E1A759780C81D1925B819583B16D2095A16A7D32EFB2AF36C1E1D6EAA142BF6A6A811847D3140E4E94967EE28F4ADF6373E4B")
-                else()
-                    set(program_version "Fv1ENXodhXmEXy_xpZr2gQkVJh57w_IsbsrEJOU0_EoC")
-                    set(gn_platform "linux-amd64")
-                    set(download_sha512 "A7A5CD5633C5547EC1B1A95958486DDAAC91F1A65881EDC0AD8F74DF44E82F08BA74358E9A72DFCDDE6F534A6B9C9A430D3E16ACE2E4346C4D2E9113F7654B3F")
-                endif()
-            elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
-                set(supported_on_unix ON)
-                EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE HOST_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
-                if(HOST_ARCH STREQUAL "arm64")
-                    set(program_version "qMPtGq7xZlpb-lHjP-SK27ftT4X71WIvguuyx6X14DEC")
-                    set(gn_platform "mac-arm64")
-                    set(download_sha512 "D096FB958D017807427911089AB5A7655AED117F6851C0491AC8063CEDB544423122EF64DF4264ECA86C20A2BDE9E64D7B72DA7ED8C95C2BA79A68B8247D36B8")
-                else()
-                    set(program_version "0x2juPLNfP9603GIyZrUfflxK6LiMcppLAoxEpYuIYoC")
-                    set(gn_platform "mac-amd64")
-                    set(download_sha512 "2696ECE7B2C8008CABDDF10024017E2ECF875F8679424E77052252BDDC83A2096DF3C61D89CD25120EF27E0458C8914BEEED9D418593BDBC4F6ED33A8D4C3DC5")
-                endif()
-            else()
-                if($ENV{PROCESSOR_ARCHITECTURE} STREQUAL "ARM64")
-                    set(program_version "q5ExVHmXyD34Q_Tzb-aRxsPipO-e37-csVRhVM7IJh0C")
-                    set(gn_platform "windows-amd64")
-                    set(download_sha512 "FA764AA44EB6F48ED50E855B4DC1DD1ABE35E45FD4AAC7F059A35293A14894C1B591215E34FB0CE9362E646EA9463BA3B489EFB7EBBAA2693D14238B50E4E686")
-                else() # AMD64
-                    set(program_version "q5ExVHmXyD34Q_Tzb-aRxsPipO-e37-csVRhVM7IJh0C")
-                    set(gn_platform "windows-amd64")
-                    set(download_sha512 "FA764AA44EB6F48ED50E855B4DC1DD1ABE35E45FD4AAC7F059A35293A14894C1B591215E34FB0CE9362E646EA9463BA3B489EFB7EBBAA2693D14238B50E4E686")
-                endif()
-            endif()
-        endif()
-        set(tool_subdirectory "${program_version}")
-        set(download_urls "${cipd_download_gn}/${gn_platform}/+/${program_version}")
-        set(download_filename "gn-${gn_platform}.zip")
-    elseif(program STREQUAL "GO")
-        set(program_name go)
-        set(tool_subdirectory 1.16.6.windows-386)
-        set(paths_to_search ${DOWNLOADS}/tools/go/${tool_subdirectory}/go/bin)
-        set(brew_package_name "go")
-        set(apt_package_name "golang-go")
-        set(download_urls "https://dl.google.com/go/go${tool_subdirectory}.zip")
-        set(download_filename "go${tool_subdirectory}.zip")
-        set(download_sha512 2a1e539ed628c0cca5935d24d22cf3a7165f5c80e12a4003ac184deae6a6d0aa31f582f3e8257b0730adfc09aeec3a0e62f4732e658c312d5382170bcd8c94d8)
-    elseif(program STREQUAL "PYTHON3")
-        if(CMAKE_HOST_WIN32)
-            set(program_name python)
-            set(program_version 3.10.7)
-            if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
-                set(tool_subdirectory "python-${program_version}-x86")
-                set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}-embed-win32.zip")
-                set(download_filename "python-${program_version}-embed-win32.zip")
-                set(download_sha512 a69445906a909ce5f2554c544fe4251a8ab9c5028b531975b8c78fa8e98295b2bf06e1840f346a3c0edf485a7792c40c9d318bffd36b9c7829ac72b7cf8697bc)
-            else()
-                set(tool_subdirectory "python-${program_version}-x64")
-                set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}-embed-amd64.zip")
-                set(download_filename "python-${program_version}-embed-amd64.zip")
-                set(download_sha512 29b47f8073b54c092a2c8b39b09ab392f757a8c09149e8d2de043907fffb250b5f6801175e16fedb4fae7b6555822acdc57d81d13c2fea95ef0f6ed717f86cb9)
-            endif()
-            set(paths_to_search "${DOWNLOADS}/tools/python/${tool_subdirectory}")
-            vcpkg_list(SET post_install_command "${CMAKE_COMMAND}" -E rm python310._pth)
-        else()
-            set(program_name python3)
-            set(brew_package_name "python")
-            set(apt_package_name "python3")
-        endif()
-    elseif(program STREQUAL "PYTHON2")
-        if(CMAKE_HOST_WIN32)
-            set(program_name python)
-            set(program_version 2.7.18)
-            if(EXISTS "${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-tool-python2/details.cmake")
-                include("${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-tool-python2/details.cmake")
-            else() # Old behavior
-                if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86)
-                    set(tool_subdirectory "python-${program_version}-x86")
-                    set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}.msi")
-                    set(download_filename "python-${program_version}.msi")
-                    set(download_sha512 2c112733c777ddbf189b0a54047a9d5851ebce0564cc38b9687d79ce6c7a09006109dbad8627fb1a60c3ad55e261db850d9dfa454af0533b460b2afc316fe115)
-                else()
-                    set(tool_subdirectory "python-${program_version}-x64")
-                    set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}.amd64.msi")
-                    set(download_filename "python-${program_version}.amd64.msi")
-                    set(download_sha512 6a81a413b80fd39893e7444fd47efa455d240cbb77a456c9d12f7cf64962b38c08cfa244cd9c50a65947c40f936c6c8c5782f7236d7b92445ab3dd01e82af23e)
-                endif()
-                set(paths_to_search "${DOWNLOADS}/tools/python/${tool_subdirectory}")
-            endif()
-        elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
-            # macOS includes Python 2.7 built-in as `python`
-            set(program_name python)
-            set(brew_package_name "python2")
-        else()
-            set(program_name python2)
-            set(apt_package_name "python")
-        endif()
-    elseif(program STREQUAL "RUBY")
-        set(program_name "ruby")
-        set(program_version 2.7.4-1)
-        set(paths_to_search "${DOWNLOADS}/tools/ruby/rubyinstaller-${program_version}-x86/bin")
-        set(download_urls "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-${program_version}/rubyinstaller-${program_version}-x86.7z")
-        set(download_filename "rubyinstaller-${program_version}-x86.7z")
-        set(download_sha512 4bf459c987b407bdda328c52d95060bf6ad48fc3e5ed5f64d4b205c5b4153c7a00cb6f9da6c0bcd5f2e001e9dc3dda0b72269ec4afdeffd658b93c085cd1d859)
-    elseif(program STREQUAL "JOM")
-        set(program_name jom)
-        set(tool_subdirectory "jom-1.1.3")
-        set(paths_to_search "${DOWNLOADS}/tools/jom/${tool_subdirectory}")
-        set(download_urls
-            "https://download.qt.io/official_releases/jom/jom_1_1_3.zip"
-            "https://mirrors.ocf.berkeley.edu/qt/official_releases/jom/jom_1_1_3.zip"
-        )
-        set(download_filename "jom_1_1_3.zip")
-        set(download_sha512 5b158ead86be4eb3a6780928d9163f8562372f30bde051d8c281d81027b766119a6e9241166b91de0aa6146836cea77e5121290e62e31b7a959407840fc57b33)
-    elseif(program STREQUAL "7Z")
-        set(program_name 7z)
-        set(paths_to_search "${DOWNLOADS}/tools/7z/Files/7-Zip")
-        set(download_urls "https://7-zip.org/a/7z1900.msi")
-        set(download_filename "7z1900.msi")
-        set(download_sha512 f73b04e2d9f29d4393fde572dcf3c3f0f6fa27e747e5df292294ab7536ae24c239bf917689d71eb10cc49f6b9a4ace26d7c122ee887d93cc935f268c404e9067)
-    elseif(program STREQUAL "NINJA")
-        set(program_name ninja)
-        set(program_version 1.10.2)
-        set(supported_on_unix ON)
-        set(version_command --version)
-        if(CMAKE_HOST_WIN32)
-            set(download_filename "ninja-win-${program_version}.zip")
-            set(tool_subdirectory "${program_version}-windows")
-            set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-win.zip")
-            set(download_sha512 6004140d92e86afbb17b49c49037ccd0786ce238f340f7d0e62b4b0c29ed0d6ad0bab11feda2094ae849c387d70d63504393714ed0a1f4d3a1f155af7a4f1ba3)
-        elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
-            set(download_filename "ninja-mac-${program_version}.zip")
-            set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-mac.zip")
-            set(tool_subdirectory "${program_version}-osx")
-            set(paths_to_search "${DOWNLOADS}/tools/ninja-${program_version}-osx")
-            set(download_sha512 bcd12f6a3337591306d1b99a7a25a6933779ba68db79f17c1d3087d7b6308d245daac08df99087ff6be8dc7dd0dcdbb3a50839a144745fa719502b3a7a07260b)
-        elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD")
-            set(paths_to_search "${DOWNLOADS}/tools/${tool_subdirectory}-freebsd")
-            set(supported_on_unix OFF)
-        else()
-            execute_process(COMMAND "uname" "-m" OUTPUT_VARIABLE HOST_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
-            if(HOST_ARCH MATCHES "x86_64|amd64|AMD64")
-                set(download_filename "ninja-linux-${program_version}.zip")
-                set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-linux.zip")
-                set(tool_subdirectory "${program_version}-linux")
-                set(paths_to_search "${DOWNLOADS}/tools/ninja-${program_version}-linux")
-                set(download_sha512 93e802e9c17fb59636cddde4bad1ddaadad624f4ecfee00d5c78790330a4e9d433180e795718cda27da57215ce643c3929cf72c85337ee019d868c56f2deeef3)
-            else()
-                set(version_command "") # somewhat hacky way to skip version check and use system binary
-            endif()
-        endif()
-    elseif(program STREQUAL "NUGET")
-        set(program_name nuget)
-        set(tool_subdirectory "5.11.0")
-        set(paths_to_search "${DOWNLOADS}/tools/nuget-${tool_subdirectory}-windows")
-        set(brew_package_name "nuget")
-        set(download_urls "https://dist.nuget.org/win-x86-commandline/v5.11.0/nuget.exe")
-        set(rename_binary_to "nuget.exe")
-        set(download_filename "nuget.5.11.0.exe")
-        set(raw_executable ON)
-        set(download_sha512 06a337c9404dec392709834ef2cdbdce611e104b510ef40201849595d46d242151749aef65bc2d7ce5ade9ebfda83b64c03ce14c8f35ca9957a17a8c02b8c4b7)
-    elseif(program STREQUAL "MESON") # Should always be found!
-        set(program_name meson)
-        set(search_names meson meson.py)
-        set(interpreter PYTHON3)
-        set(apt_package_name "meson")
-        set(brew_package_name "meson")
-        set(version_command --version)
-        set(extra_search_args EXACT_VERSION_MATCH)
-        if(EXISTS "${CURRENT_HOST_INSTALLED_DIR}/share/meson/version.txt")
-            file(READ "${CURRENT_HOST_INSTALLED_DIR}/share/meson/version.txt" program_version)
-            set(paths_to_search "${CURRENT_HOST_INSTALLED_DIR}/tools/meson")
-        else() # Old behavior
-            set(program_version 0.58.1)
-            set(ref aeda7f249c4a5dbbecc52e44f382246a2377b5b0)
-            set(paths_to_search "${DOWNLOADS}/tools/meson/meson-${ref}")
-            set(download_urls "https://github.com/mesonbuild/meson/archive/${ref}.tar.gz")
-            set(download_filename "meson-${ref}.tar.gz")
-            set(download_sha512 18a012a45274dbb4582e99fd69d920f38831e788d9860f9553c64847bedb1c2010ae0b5c0ef4a4350c03f5e0f95aaa0395378e1208109b59640c1a70b1e202d2)
-            set(supported_on_unix ON)
-        endif()
-    elseif(program STREQUAL "FLEX" OR program STREQUAL "BISON")
-        if(CMAKE_HOST_WIN32)
-            set(program_version 2.5.25)
-            set(download_urls "https://github.com/lexxmark/winflexbison/releases/download/v${program_version}/win_flex_bison-${program_version}.zip")
-            set(download_filename "win_flex_bison-${program_version}.zip")
-            set(download_sha512 2a829eb05003178c89f891dd0a67add360c112e74821ff28e38feb61dac5b66e9d3d5636ff9eef055616aaf282ee8d6be9f14c6ae4577f60bdcec96cec9f364e)
-            set(tool_subdirectory "${program_version}")
-            if(program STREQUAL "FLEX")
-                set(program_name win_flex)
-            else()
-                set(program_name win_bison)
-            endif()
-            set(paths_to_search ${DOWNLOADS}/tools/win_flex/${program_version})
-            if(NOT EXISTS "${paths_to_search}/data/m4sugar/m4sugar.m4")
-                file(REMOVE_RECURSE "${paths_to_search}")
-            endif()
-        elseif(program STREQUAL "FLEX")
-            set(program_name flex)
-            set(apt_package_name flex)
-            set(brew_package_name flex)
-        else()
-            set(program_name bison)
-            set(apt_package_name bison)
-            set(brew_package_name bison)
-            if (APPLE)
-                set(paths_to_search /usr/local/opt/bison/bin)
-            endif()
-        endif()
-    elseif(program STREQUAL "CLANG")
-        set(program_name clang)
-        set(tool_subdirectory "clang-15.0.6")
-        set(program_version 15.0.6)
-        if(CMAKE_HOST_WIN32)
-            set(paths_to_search
-                # Support LLVM in Visual Studio 2019
-                "$ENV{LLVMInstallDir}/x64/bin"
-                "$ENV{LLVMInstallDir}/bin"
-                "$ENV{VCINSTALLDIR}/Tools/Llvm/x64/bin"
-                "$ENV{VCINSTALLDIR}/Tools/Llvm/bin"
-                "${DOWNLOADS}/tools/${tool_subdirectory}-windows/bin"
-                "${DOWNLOADS}/tools/clang/${tool_subdirectory}/bin")
-
-            if(DEFINED ENV{PROCESSOR_ARCHITEW6432})
-                set(host_arch "$ENV{PROCESSOR_ARCHITEW6432}")
-            else()
-                set(host_arch "$ENV{PROCESSOR_ARCHITECTURE}")
-            endif()
-
-            if(host_arch MATCHES "64")
-                set(download_urls "https://github.com/llvm/llvm-project/releases/download/llvmorg-${program_version}/LLVM-${program_version}-win64.exe")
-                set(download_filename "LLVM-${program_version}-win64.7z.exe")
-                set(download_sha512 2dd6f3eea106f2b905e6658ea5ea12856d17285adbfba055edc2d6b6389c4c2f7aa001df5cb0d8fb84fa7fa47d5035a7fddf276523b472dd55f150ae25938768)
-            else()
-                set(download_urls "https://github.com/llvm/llvm-project/releases/download/llvmorg-${program_version}/LLVM-${program_version}-win32.exe")
-                set(download_filename "LLVM-${program_version}-win32.7z.exe")
-                set(download_sha512 90225D650EADB0E590A9912B479B46A575D41A19EB5F2DA03C4DC8B032DC0790222F0E3706DFE2A35C0E7747941972AC26CB47D3EB13730DB76168931F37E5F1)
-            endif()
-        endif()
-        set(brew_package_name "llvm")
-        set(apt_package_name "clang")
-    elseif(program STREQUAL "GPERF")
-        set(program_name gperf)
-        set(program_version 3.0.1)
-        set(paths_to_search "${DOWNLOADS}/tools/gperf/bin")
-        set(download_urls "https://sourceforge.net/projects/gnuwin32/files/gperf/${program_version}/gperf-${program_version}-bin.zip/download")
-        set(download_filename "gperf-${program_version}-bin.zip")
-        set(download_sha512 3f2d3418304390ecd729b85f65240a9e4d204b218345f82ea466ca3d7467789f43d0d2129fcffc18eaad3513f49963e79775b10cc223979540fa2e502fe7d4d9)
-    elseif(program STREQUAL "GASPREPROCESSOR")
-        set(raw_executable true)
-        set(program_name gas-preprocessor)
-        set(interpreter PERL)
-        set(search_names "gas-preprocessor.pl")
-        set(paths_to_search "${DOWNLOADS}/tools/gas-preprocessor/${tool_subdirectory}")
-        set(rename_binary_to "gas-preprocessor.pl")
-        set(commit_id 9309c67acb535ca6248f092e96131d8eb07eefc1)
-        set(download_urls "https://raw.githubusercontent.com/FFmpeg/gas-preprocessor/${commit_id}/gas-preprocessor.pl")
-        string(SUBSTRING ${commit_id} 0 8 tool_subdirectory)
-        set(download_filename "gas-preprocessor-${tool_subdirectory}.pl")
-        set(download_sha512 b4749cf8aa758e3f28d4b21803422a5c2588f5fc48cfd317564606b374f8d739c636067cf7a4956d7365d63b055bc6e7626c304857e6c9013d6b4a0db9d8ad4f)
-    elseif(program STREQUAL "DARK")
-        set(program_name dark)
-        set(tool_subdirectory "wix311-binaries")
-        set(paths_to_search "${DOWNLOADS}/tools/dark/${tool_subdirectory}")
-        set(download_urls "https://github.com/wixtoolset/wix3/releases/download/wix311rtm/wix311-binaries.zip")
-        set(download_filename "wix311-binaries.zip")
-        set(download_sha512 74f0fa29b5991ca655e34a9d1000d47d4272e071113fada86727ee943d913177ae96dc3d435eaf494d2158f37560cd4c2c5274176946ebdb17bf2354ced1c516)
-    elseif(program STREQUAL "SCONS")
-        set(program_name scons)
-        set(program_version 4.1.0)
-        set(tool_subdirectory "${program_version}")
-        set(interpreter PYTHON2)
-        set(search_names "scons.py")
-        set(download_urls "https://sourceforge.net/projects/scons/files/scons-local-${program_version}.zip/download")
-        set(download_filename "scons-local-${program_version}.zip")
-        set(download_sha512 b173176ce8aca25039c64fcc68ec1b9ad31e03a926fd545e7631b3f9b374d914adffc593f505e3e7e2867b0ffe85e8deb0b39afe314edf05d02974ce5db1badb)
-    elseif(program STREQUAL "SWIG")
-        set(program_version 4.0.2)
-        set(program_name swig)
-        if(CMAKE_HOST_WIN32)
-            vcpkg_list(SET sourceforge_args
-                REPO swig/swigwin
-                REF "swigwin-${program_version}"
-                FILENAME "swigwin-${program_version}.zip"
-                SHA512 b8f105f9b9db6acc1f6e3741990915b533cd1bc206eb9645fd6836457fd30789b7229d2e3219d8e35f2390605ade0fbca493ae162ec3b4bc4e428b57155db03d
-                NO_REMOVE_ONE_LEVEL
-                WORKING_DIRECTORY "${DOWNLOADS}/tools/swig"
-            )
-            set(tool_subdirectory "b8f105f9b9-f0518bc3b7/swigwin-${program_version}")
-        else()
-            set(apt_package_name "swig")
-            set(brew_package_name "swig")
-        endif()
-
-    elseif(program STREQUAL "DOXYGEN")
-        set(program_name doxygen)
-        set(program_version 1.9.1)
-        vcpkg_list(SET sourceforge_args
-            REPO doxygen
-            REF "rel-${program_version}"
-            FILENAME "doxygen-${program_version}.windows.bin.zip"
-            SHA512 c3eeb6b9fa4eab70fb6b0864fbbf94fb8050f3fee38d117cf470921a80e3569cc1c8b0272604d6731e05f01790cfaa70e159bec5d0882fc4f2d8ae4a5d52a21b
-            NO_REMOVE_ONE_LEVEL
-            WORKING_DIRECTORY "${DOWNLOADS}/tools/doxygen"
-         )
-        set(tool_subdirectory c3eeb6b9fa-76d69c6db5)
-    elseif(program STREQUAL "BAZEL")
-        set(program_name bazel)
-        set(program_version 4.2.2)
-        set(rename_binary_to "bazel")
-        if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
-            set(supported_on_unix ON)
-            set(tool_subdirectory "${program_version}-linux")
-            set(download_urls "https://github.com/bazelbuild/bazel/releases/download/${program_version}/bazel-${tool_subdirectory}-x86_64")
-            set(download_filename "bazel-${tool_subdirectory}-x86_64")
-            set(raw_executable ON)
-            set(download_sha512 f38619e054df78cab38278a5901b2798f2e25b5cec53358d98278002e713d225fd3df96a209b7f22a2357835a279cee8ef1768e10561b3e9fe6361f324563bb9)
-        elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
-            set(supported_on_unix ON)
-            set(tool_subdirectory "${program_version}-darwin")
-            set(download_urls "https://github.com/bazelbuild/bazel/releases/download/${program_version}/bazel-${tool_subdirectory}-x86_64")
-            set(download_filename "bazel-${tool_subdirectory}-x86_64")
-            set(raw_executable ON)
-            set(download_sha512 a3fd8f9d71b0669d742439200f27ee0a3891c1f248df62c841ebb2b416a47534562f429f8a08793b074e9b74f2ede3d97a7e13ac9921c7ee2dc6a2dca8b7f275)
-        else()
-            set(tool_subdirectory "${program_version}-windows")
-            set(download_urls "https://github.com/bazelbuild/bazel/releases/download/${program_version}/bazel-${tool_subdirectory}-x86_64.zip")
-            set(download_filename "bazel-${tool_subdirectory}-x86_64.zip")
-            set(download_sha512 8a8196e242964114316232818cb81bfa19ebfd3a029ebf550a241e33b22a6e9ed636dade06411a8706c05c4e73def0bc8d7f45ff0ec5478bcc5de21b5638204d)
-        endif()
-    elseif(program STREQUAL "ARIA2")
-        set(program_name aria2c)
-        set(program_version 1.35.0)
-        set(paths_to_search "${DOWNLOADS}/tools/aria2c/aria2-${program_version}-win-32bit-build1")
-        set(download_urls "https://github.com/aria2/aria2/releases/download/release-${program_version}/aria2-${program_version}-win-32bit-build1.zip")
-        set(download_filename "aria2-${program_version}-win-32bit-build1.zip")
-        set(download_sha512 933537cad820b1cecf43a9eeca7e1b241dd7b1c902ee942441a166f2c38845f16046321efbdfa2f83c7e9fc50c7ecc5da6fd00e0c6e2124c07d3b783aa5092a4)
-    elseif(program STREQUAL "PKGCONFIG")
-        set(program_name pkg-config)
-        if(DEFINED ENV{PKG_CONFIG})
-            debug_message(STATUS "PKG_CONFIG found in ENV! Using $ENV{PKG_CONFIG}")
-            set(PKGCONFIG "$ENV{PKG_CONFIG}" CACHE INTERNAL "")
-            set(PKGCONFIG "${PKGCONFIG}" PARENT_SCOPE)
-            return()
-        elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "OpenBSD")
-            # As of 6.8, the OpenBSD specific pkg-config doesn't support {pcfiledir}
-            set(supported_on_unix ON)
-            set(rename_binary_to "pkg-config")
-            set(program_version 0.29.2.1)
-            set(raw_executable ON)
-            set(download_filename "pkg-config.openbsd")
-            set(tool_subdirectory "openbsd")
-            set(download_urls "https://raw.githubusercontent.com/jgilje/pkg-config-openbsd/master/pkg-config")
-            set(download_sha512 b7ec9017b445e00ae1377e36e774cf3f5194ab262595840b449832707d11e443a102675f66d8b7e8b2e2f28cebd6e256835507b1e0c69644cc9febab8285080b)
-            set(version_command --version)
-        elseif(CMAKE_HOST_WIN32)
-            if(NOT EXISTS "${PKGCONFIG}")
-                set(VERSION 0.29.2-3)
-                set(program_version git-9.0.0.6373.5be8fcd83-1)
-                vcpkg_acquire_msys(
-                    PKGCONFIG_ROOT
-                    NO_DEFAULT_PACKAGES
-                    DIRECT_PACKAGES
-                        "https://repo.msys2.org/mingw/i686/mingw-w64-i686-pkg-config-${VERSION}-any.pkg.tar.zst"
-                        0c086bf306b6a18988cc982b3c3828c4d922a1b60fd24e17c3bead4e296ee6de48ce148bc6f9214af98be6a86cb39c37003d2dcb6561800fdf7d0d1028cf73a4
-                        "https://repo.msys2.org/mingw/i686/mingw-w64-i686-libwinpthread-${program_version}-any.pkg.tar.zst"
-                        c89c27b5afe4cf5fdaaa354544f070c45ace5e9d2f2ebb4b956a148f61681f050e67976894e6f52e42e708dadbf730fee176ac9add3c9864c21249034c342810
-                )
-            endif()
-            set("${program}" "${PKGCONFIG_ROOT}/mingw32/bin/pkg-config.exe" CACHE INTERNAL "")
-            set("${program}" "${${program}}" PARENT_SCOPE)
-            return()
-        else()
-            set(brew_package_name pkg-config)
-            set(apt_package_name pkg-config)
-            set(paths_to_search "/bin" "/usr/bin" "/usr/local/bin")
-        endif()
-    elseif(program STREQUAL "PATCHELF")
-        set(program_name patchelf)
-        set(program_version 0.14.5)
-        set(supported_on_unix ON)
-        if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
-            execute_process(COMMAND "uname" "-m" OUTPUT_VARIABLE HOST_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
-            if(HOST_ARCH STREQUAL "aarch64")
-                set(patchelf_platform "aarch64")
-                set(download_sha512 "3B5EB4405FAB1D5202728AA390DD9F059CD7AFD582BAD9C50383CAD605127BC77DFCE3F2F26E9714F6BD5CCFFD49D3973BA2F061D2E2931B6E1BD0C263B99E75")
-            elseif(HOST_ARCH STREQUAL "armv7l")
-                set(patchelf_platform "armv7l")
-                set(download_sha512 "30160d750784f5e8805bffe96ca80b40ed10441549e10f47b61e0d21b32979e01865cd770f1de9162988d4daabc6984dcdb7438f67bcd5eee76ad5f01b00276d")
-            else()
-                set(patchelf_platform "x86_64")
-                set(download_sha512 "5E983A25B3F3F3B8582D1DE6C7DE30812E8D6E58E96F711F33A2634D3FB1F2370531DA179927AA401328319F92465E6F76274A6F994D1DC54C74B98E704D0D29")
-            endif()
-            set(download_filename "${program_name}-${program_version}-${patchelf_platform}.tar.gz")
-            set(download_urls "https://github.com/NixOS/patchelf/releases/download/${program_version}/${download_filename}")
-            set(tool_subdirectory "${program_version}-${patchelf_platform}-linux")
-            set(paths_to_search "${DOWNLOADS}/tools/patchelf/${program_version}-${patchelf_platform}-linux/bin")
-        endif()
-        set(version_command --version)
+    set(program_information "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/vcpkg_find_acquire_program(${program}).cmake")
+    if(program MATCHES "^[A-Z0-9]+\$" AND EXISTS "${program_information}")
+        include("${program_information}")
     else()
         message(FATAL_ERROR "unknown tool ${program} -- unable to acquire.")
     endif()
@@ -607,7 +156,7 @@ function(vcpkg_find_acquire_program program)
         )
     endif()
     if(NOT ${program})
-        if(NOT VCPKG_HOST_IS_WINDOWS AND NOT supported_on_unix)
+        if("${download_urls}" STREQUAL "" AND "${sourceforge_args}" STREQUAL "")
             set(example ".")
             if(NOT "${brew_package_name}" STREQUAL "" AND VCPKG_HOST_IS_OSX)
                 set(example ":\n    brew install ${brew_package_name}")
@@ -617,66 +166,41 @@ function(vcpkg_find_acquire_program program)
             message(FATAL_ERROR "Could not find ${program_name}. Please install it via your package manager${example}")
         endif()
 
-        if(NOT "${sourceforge_args}" STREQUAL "")
-            # Locally change editable to suppress re-extraction each time
-            set(_VCPKG_EDITABLE 1)
-            vcpkg_from_sourceforge(OUT_SOURCE_PATH SFPATH ${sourceforge_args})
-            unset(_VCPKG_EDITABLE)
-        else()
+        if("${sourceforge_args}" STREQUAL "")
             vcpkg_download_distfile(archive_path
                 URLS ${download_urls}
                 SHA512 "${download_sha512}"
                 FILENAME "${download_filename}"
             )
-
+        else()
+            vcpkg_download_sourceforge(archive_path
+                ${sourceforge_args}
+                SHA512 "${download_sha512}"
+                FILENAME "${download_filename}"
+            )
+        endif()
+        if(raw_executable)
             file(MAKE_DIRECTORY "${full_subdirectory}")
-            if(raw_executable)
-                if(NOT "${rename_binary_to}" STREQUAL "")
-                    file(INSTALL "${archive_path}"
-                        DESTINATION "${full_subdirectory}"
-                        RENAME "${rename_binary_to}"
-                        FILE_PERMISSIONS
-                            OWNER_READ OWNER_WRITE OWNER_EXECUTE
-                            GROUP_READ GROUP_EXECUTE
-                            WORLD_READ WORLD_EXECUTE
-                    )
-                else()
-                    file(COPY "${archive_path}"
-                        DESTINATION "${full_subdirectory}"
-                        FILE_PERMISSIONS
-                            OWNER_READ OWNER_WRITE OWNER_EXECUTE
-                            GROUP_READ GROUP_EXECUTE
-                            WORLD_READ WORLD_EXECUTE
-                    )
-                endif()
+            if("${rename_binary_to}" STREQUAL "")
+                file(COPY "${archive_path}"
+                    DESTINATION "${full_subdirectory}"
+                    FILE_PERMISSIONS
+                        OWNER_READ OWNER_WRITE OWNER_EXECUTE
+                        GROUP_READ GROUP_EXECUTE
+                        WORLD_READ WORLD_EXECUTE
+                )
             else()
-                cmake_path(GET download_filename EXTENSION archive_extension)
-                string(TOLOWER "${archive_extension}" archive_extension)
-                if("${archive_extension}" MATCHES [[\.msi$]])
-                    cmake_path(NATIVE_PATH archive_path archive_native_path)
-                    cmake_path(NATIVE_PATH full_subdirectory destination_native_path)
-                    vcpkg_execute_in_download_mode(
-                        COMMAND msiexec
-                            /a "${archive_native_path}"
-                            /qn "TARGETDIR=${destination_native_path}"
-                        WORKING_DIRECTORY "${DOWNLOADS}"
-                    )
-                elseif("${archive_extension}" MATCHES [[\.7z\.exe$]])
-                    vcpkg_find_acquire_program(7Z)
-                    vcpkg_execute_in_download_mode(
-                        COMMAND ${7Z} x
-                            "${archive_path}"
-                            "-o${full_subdirectory}"
-                            -y -bso0 -bsp0
-                        WORKING_DIRECTORY "${full_subdirectory}"
-                    )
-                else()
-                    vcpkg_execute_in_download_mode(
-                        COMMAND "${CMAKE_COMMAND}" -E tar xzf "${archive_path}"
-                        WORKING_DIRECTORY "${full_subdirectory}"
-                    )
-                endif()
+                file(INSTALL "${archive_path}"
+                    DESTINATION "${full_subdirectory}"
+                    RENAME "${rename_binary_to}"
+                    FILE_PERMISSIONS
+                        OWNER_READ OWNER_WRITE OWNER_EXECUTE
+                        GROUP_READ GROUP_EXECUTE
+                        WORLD_READ WORLD_EXECUTE
+                )
             endif()
+        else()
+            vcpkg_extract_archive(ARCHIVE "${archive_path}" DESTINATION "${full_subdirectory}")
         endif()
 
         if(NOT "${post_install_command}" STREQUAL "")
diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_find_fortran.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_find_fortran.cmake
index 2f1c49722..126151e4e 100644
--- a/external_imported/vcpkg/scripts/cmake/vcpkg_find_fortran.cmake
+++ b/external_imported/vcpkg/scripts/cmake/vcpkg_find_fortran.cmake
@@ -1,3 +1,5 @@
+list(APPEND Z_VCPKG_ACQUIRE_MSYS_DECLARE_PACKAGE_COMMANDS "z_vcpkg_find_fortran_declare_msys_packages")
+
 function(vcpkg_find_fortran out_var)
     if("${ARGC}" GREATER "1")
         message(WARNING "${CMAKE_CURRENT_FUNCTION} was passed extra args: ${ARGN}")
@@ -19,77 +21,17 @@ function(vcpkg_find_fortran out_var)
                 set(mingw_path mingw32)
                 set(machine_flag -m32)
                 vcpkg_acquire_msys(msys_root
-                    DIRECT_PACKAGES
-                        "https://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-fortran-11.2.0-8-any.pkg.tar.zst"
-                        9337dafdeb4f5eaf41bf13441c345b999dd0561b4fc757a67b4e362c3e0afea5828cd68b35d2823c545d74ea81b2c34bd1624f97817690a2931f3a890b5273bd
-                        "https://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-libgfortran-11.2.0-8-any.pkg.tar.zst"
-                        3e6396eb4dcbe730bb63f4534e25b654008be49f0e113cf34cfb640dba3f67b508a6f5c78f7ab1cc57686936e709bc37a1fdbc20df5ee17fd708a21c1b844af4
-                        "https://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-libs-11.2.0-8-any.pkg.tar.zst"
-                        bdf253bb627cfc108407ea0d1f5fc643da0b229a8f7fcc346fcdf7709e0ffbf8d1f75bdea755116c6b30834d1c764496a23c0546ef1048075d312136c6ebe9d9
-                        "https://repo.msys2.org/mingw/i686/mingw-w64-i686-gmp-6.2.1-3-any.pkg.tar.zst"
-                        10787443380a89a3491596946354645899daad07bc159ffcee96243cb51637dfbc163d52751ffd14682b66be8fd65c0379c642df16132f16a80709c4af921bac
-                        "https://repo.msys2.org/mingw/i686/mingw-w64-i686-libwinpthread-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst"
-                        c89c27b5afe4cf5fdaaa354544f070c45ace5e9d2f2ebb4b956a148f61681f050e67976894e6f52e42e708dadbf730fee176ac9add3c9864c21249034c342810
-                        "https://repo.msys2.org/mingw/i686/mingw-w64-i686-winpthreads-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst"
-                        85980183879da0d0ea74b9ad1fdfb09e5ed9d2e2212877d47d0f621ce721566e205be0b1913a643d0a95b256441e0bafd803fa9c848a8203dffd7d72109e32c2
-                        "https://repo.msys2.org/mingw/i686/mingw-w64-i686-mpc-1.2.1-1-any.pkg.tar.zst"
-                        f4cda83c26bf4225a8c387e0710ea086896e9c89e7863b9a2947982636664b64ffa880cbddfe6d85f8cf7cb3be18296b04874026cdf8b1b702a2820dad135ba4
-                        "https://repo.msys2.org/mingw/i686/mingw-w64-i686-mpfr-4.1.0.p13-1-any.pkg.tar.zst"
-                        038a1cc6bb080d415b9fc19965a1f1c9419f5c42023e29c87f97b4f630c152602abb706036aa3e0f02e337e9d7ab3a43bd7b1234b3775a43ffceb348e79bac1a
-                        "https://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-11.2.0-8-any.pkg.tar.zst"
-                        a6183f0fc80c2e37316b6eb60fdbdccc30b865053dad270c9c96e93cd6fdb2af28a75f981ac1de2fdc22a47494cdb54b8d41d4ecffdf1b1d3a54e85437c20dcf
-                        "https://repo.msys2.org/mingw/i686/mingw-w64-i686-binutils-2.37-4-any.pkg.tar.zst"
-                        1c2fbb8b94778c562aed01010c06c804d1cc2c446837879e4f1187470259adaecd86699b084c69e254d98201333db69a55126ea2cd0c188e55c9af849c37315a
-                        "https://repo.msys2.org/mingw/i686/mingw-w64-i686-crt-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst"
-                        495834d72313021b7553d92a897932f5efc66a0f6f79ebeec574ecd7ddd23e0eed9aacb32601007606abb10b44ba7c7c1ccf6d3437a4338839b2d7b1792327f9
-                        "https://repo.msys2.org/mingw/i686/mingw-w64-i686-headers-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst"
-                        7959ae9267306c862b8b23be2ab21498f6e7890c936feae3ec9cf5607434e87e446f7c75ff7bd975f23aa24eb1c23d6068957f6af4e8c358f5f4861db64248b8
-                        "https://repo.msys2.org/mingw/i686/mingw-w64-i686-libiconv-1.16-2-any.pkg.tar.zst"
-                        fe48d0d3c582fee1edb178425c6daf619d86362442c729047b3c356be26491164f92be1d87950429d2faca4ed3cf76cb4aafef1af3c87b780eee85ee85a4b4c5
-                        "https://repo.msys2.org/mingw/i686/mingw-w64-i686-windows-default-manifest-6.4-3-any.pkg.tar.xz"
-                        5b99abc55eaa74cf85ca64a9c91542554cb5c1098bc71effba9bd36242694cfd348503fcd3507fb9ba97486108c092c925e2f38cd744493386b3dc9ab28bc526
-                        "https://repo.msys2.org/mingw/i686/mingw-w64-i686-zlib-1.2.11-9-any.pkg.tar.zst"
-                        3e461e835641a2a755a42221011871f8a1ed5fa4b6b23c74db286e29bbcfa2fcd30d4a7c41216728df62c9131dbc1e554720da633ed6b2ba3d6f2b6d5d50a300
-                        "https://repo.msys2.org/mingw/i686/mingw-w64-i686-zstd-1.5.2-1-any.pkg.tar.zst"
-                        8e27911a2a5884faa95e1c55058ca15f233d432ed8aa607b04a019758aa21f1357bd5de5ce8709fa47f4fbed6eb00fdfd94e7e2d82023bbc1f1653e95f439e0a
+                    NO_DEFAULT_PACKAGES
+                    Z_DECLARE_EXTRA_PACKAGES_COMMAND "z_vcpkg_find_fortran_msys_declare_packages"
+                    PACKAGES mingw-w64-i686-gcc-fortran
                 )
             elseif("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "x64")
                 set(mingw_path mingw64)
                 set(machine_flag -m64)
                 vcpkg_acquire_msys(msys_root
-                    DIRECT_PACKAGES
-                        "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-fortran-11.2.0-8-any.pkg.tar.zst"
-                        d56483e090f86410b87526dda7774e010d0bd6beda97edcaeb1dead1128fd5ad870bc761a8a190759c48d58c2526b6975fb849f9c03a6be193741a0fd0bf2812
-                        "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libgfortran-11.2.0-8-any.pkg.tar.zst"
-                        8537b55633bc83d81d528378590e417ffe8c26b6c327d8b6d7ba50a8b5f4e090fbe2dc500deb834120edf25ac3c493055f4de2dc64bde061be23ce0f625a8893
-                        "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libs-11.2.0-8-any.pkg.tar.zst"
-                        2481f7c8db7cca549911bc71715af86ca287ffed6d673c9a6c3a4c792b68899a129dd959214af7067f434e74fc518c43749e7d928cbd2232ab4fbc65880dad98
-                        "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gmp-6.2.1-3-any.pkg.tar.zst"
-                        d0d4ed1a046b64f437e72bbcf722b30311dde5f5e768a520141423fc0a3127b116bd62cfd4b5cf5c01a71ee0f9cf6479fcc31277904652d8f6ddbf16e33e0b72
-                        "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libwinpthread-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst"
-                        a2c9e60d23b1310a6cec1fadd2b15a8c07223f3fe90d41b1579e9fc27ee2b0b408456291a55fad54a156e6a247efc20f6fcc247cc567e64fe190938aa3b672e9
-                        "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-winpthreads-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst"
-                        be03433e6006166e5b4794f2a01730cdb6c9f19fa96bd10a8bc50cf06ad389cbc66d44ea3eda46f53c3b2c89e2fc86aec21a372828e9527b24480c87ed88348c
-                        "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpc-1.2.1-1-any.pkg.tar.zst"
-                        f2c137dbb0b6feea68dde9739c38b44dcb570324e3947adf991028e8f63c9ff50a11f47be15b90279ff40bcac7f320d952cfc14e69ba8d02cf8190c848d976a1
-                        "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpfr-4.1.0.p13-1-any.pkg.tar.zst"
-                        a1425169c1570dbd736c31d50bedfab88636bf9565376e2da566be67fcc771e6c76f95895f382d81097e7c0580acb42aa49e34dec5d7a868d73a5dc6a7461c95
-                        "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-11.2.0-8-any.pkg.tar.zst"
-                        26ab2cab684206978a254f1e1595b1ce688e6db12e57ed1d243a5f1b3b21b314f640c7c6fe90eedccb6b9788e1886415ca3290d03b1e71f67f8a99108068336a
-                        "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-binutils-2.37-4-any.pkg.tar.zst"
-                        f09ea70810fb337d7f3ec673342ab90df511e6af451e273fe88fe41a2f30bd972b79c830b61bb5388743d00a0ba7885503e143987413db5170c4befffef66303
-                        "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-crt-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst"
-                        63d081fedd1f70e8d58670d4d0698535a67f04c31caf02d0b23026ac23fc5064e9423d73c79854bbce41cc99dd0b70e4137af3a609e05cdd867fdcea120d356e
-                        "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-headers-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst"
-                        05860f2bcfacf54089b750099f9ddc52d9b4b8ae8f69028a198dfb51fab09c37a941ae551e5d361a2a11302d48bd4fa95c44131ddee4c1df5a14f28013398f63
-                        "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libiconv-1.16-2-any.pkg.tar.zst"
-                        542ed5d898a57a79d3523458f8f3409669b411f87d0852bb566d66f75c96422433f70628314338993461bcb19d4bfac4dadd9d21390cb4d95ef0445669288658
-                        "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-windows-default-manifest-6.4-3-any.pkg.tar.xz"
-                        77d02121416e42ff32a702e21266ce9031b4d8fc9ecdb5dc049d92570b658b3099b65d167ca156367d17a76e53e172ca52d468e440c2cdfd14701da210ffea37
-                        "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-zlib-1.2.11-9-any.pkg.tar.zst"
-                        f386d3a8d8c169a62a4580af074b7fdc0760ef0fde22ef7020a349382dd374a9e946606c757d12da1c1fe68baf5e2eaf459446e653477035a63e0e20df8f4aa0
-                        "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-zstd-1.5.2-1-any.pkg.tar.zst"
-                        38ec5ca99c5b955bf8a892a3edaf4e18572977736809b7671c554526b13cb4e53d45c5b83e37e0fb7628483ba98831b3203e3e404dac720d5b2ed95cfe4505c4
+                    NO_DEFAULT_PACKAGES
+                    Z_DECLARE_EXTRA_PACKAGES_COMMAND "z_vcpkg_find_fortran_msys_declare_packages"
+                    PACKAGES mingw-w64-x86_64-gcc-fortran
                 )
             else()
                 message(FATAL_ERROR "Unknown architecture '${VCPKG_TARGET_ARCHITECTURE}' for MinGW Fortran build!")
@@ -122,3 +64,149 @@ function(vcpkg_find_fortran out_var)
     endif()
     set("${out_var}" "${additional_cmake_args}" PARENT_SCOPE)
 endfunction()
+
+macro(z_vcpkg_find_fortran_msys_declare_packages)
+    # primary package for x86
+    z_vcpkg_acquire_msys_declare_package(
+        URL "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-gcc-fortran-13.2.0-3-any.pkg.tar.zst"
+        SHA512 3f30692ebdbfa10d55f978ef05a8b8ae9b194d57f4e05dded6d4159186a62848109dabf4448b12d2b6fc734a19f61b47f3d8e25efb3bb3c318e9c27cd8d629fb
+        PROVIDES mingw-w64-i686-fc
+        DEPS mingw-w64-i686-gcc mingw-w64-i686-gcc-libgfortran
+    )
+    z_vcpkg_acquire_msys_declare_package(
+        URL "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-binutils-2.42-1-any.pkg.tar.zst"
+        SHA512 9f26be2ad7ff05e38c849e6c722eec817328d8604c753fbb6cc8e54bc8ae638a97beb59fc144fdd10cded4f626bb997892bde91d314b18c96ed35c4a4b3bde01
+        DEPS mingw-w64-i686-gettext-runtime mingw-w64-i686-zlib mingw-w64-i686-zstd
+    )
+    z_vcpkg_acquire_msys_declare_package(
+        URL "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-crt-git-11.0.0.r551.g86a5e0f41-1-any.pkg.tar.zst"
+        SHA512 5d862184baf667b357d156409552f6b72ad59db53972bdc7bea4b36775ab5c6bfc6cd5697f11be3ec5e58f6f733cc396984ee9cd0aa394cf28536a0a73881826
+        PROVIDES mingw-w64-i686-crt
+        DEPS mingw-w64-i686-headers-git
+    )
+    z_vcpkg_acquire_msys_declare_package(
+        URL "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-gcc-13.2.0-3-any.pkg.tar.zst"
+        SHA512 4d360d82ce0cef2cf3a5078419465fd502c2b6751f3cadc9bf362c8ef4e4c32a426495d59b8904fd46b2f6fe3feaad7e0f952fcc0152735eed70e083175a303d
+        PROVIDES mingw-w64-i686-gcc-base mingw-w64-i686-cc
+        DEPS mingw-w64-i686-binutils mingw-w64-i686-crt mingw-w64-i686-gcc-libs mingw-w64-i686-gmp mingw-w64-i686-headers mingw-w64-i686-isl mingw-w64-i686-libiconv mingw-w64-i686-mpc mingw-w64-i686-mpfr mingw-w64-i686-windows-default-manifest mingw-w64-i686-winpthreads mingw-w64-i686-zlib mingw-w64-i686-zstd
+    )
+    z_vcpkg_acquire_msys_declare_package(
+        URL "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-gcc-libgfortran-13.2.0-3-any.pkg.tar.zst"
+        SHA512 6eefe2e1500f80a0484856847bee128b60fb16e54151b1e2b0f6627f8d7820521e9bc1c81f4cbccb68a42029ccee0cbcb72d448a31a780b222268e6be1ae6f97
+        PROVIDES mingw-w64-i686-fc-libs
+        DEPS mingw-w64-i686-gcc-libs
+    )
+    z_vcpkg_acquire_msys_declare_package(
+        URL "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-gcc-libs-13.2.0-3-any.pkg.tar.zst"
+        SHA512 342d751cfc33539059d87d3de74048b5ec29139cd2aa757d18781381e5f16878a983dd76f5116ca66d6c7e1a64d1e6be56cc7ff4d5189e46746dbaca03bcbdac
+        PROVIDES mingw-w64-i686-omp
+        DEPS mingw-w64-i686-libwinpthread
+    )
+    z_vcpkg_acquire_msys_declare_package(
+        URL "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-gettext-runtime-0.22.4-5-any.pkg.tar.zst"
+        SHA512 db1c25c2e21e79791703e19ff7b1c92c95e7a7fba59140dd05ae5f3acedd2f5d9e34f5c20aae9fb2d360e1da268265f0d2405106d117abe14fc4c1db1cae122e
+        DEPS mingw-w64-i686-gcc-libs mingw-w64-i686-libiconv
+    )
+    z_vcpkg_acquire_msys_declare_package(
+        URL "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-gmp-6.3.0-2-any.pkg.tar.zst"
+        SHA512 4a9e0ace05ea441fe6cd69b1b1af4c29e35727069ab1f22d0da7febc7aaba219502b5b4dea8b1aa070cb2c8b731da112429c3339fd03fe77828d9fa262b4a818
+    )
+    z_vcpkg_acquire_msys_declare_package(
+        URL "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-headers-git-11.0.0.r551.g86a5e0f41-1-any.pkg.tar.zst"
+        SHA512 65c52c5ab7cb0c1238a116dcb730079369e7cf012b98c56a4214e0502045c0370f5e32abe658c190db7b9bcca78699401f7d76e5a457072c6464d067d6a5a8e9
+        PROVIDES mingw-w64-i686-headers
+    )
+    z_vcpkg_acquire_msys_declare_package(
+        URL "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-isl-0.26-1-any.pkg.tar.zst"
+        SHA512 2011de9ac6ed85fa4346f9c9b39136854f049a9e21fb2fbd8db066ccf443301a65ab0c7aa7daed6730d5163ca70ebf25fd39209bd5226f2b70f000ce9de0df8d
+        DEPS mingw-w64-i686-gmp
+    )
+    z_vcpkg_acquire_msys_declare_package(
+        URL "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-libiconv-1.17-4-any.pkg.tar.zst"
+        SHA512 7b8c0861fe404e6a94e19e2f539c8b8eebd438ebd453960655478109c22cb1ace689031a5fc2ed2430df7bb204f83989726ea3552a58f7c323b150bb3f117578
+    )
+    z_vcpkg_acquire_msys_declare_package(
+        URL "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-libwinpthread-git-11.0.0.r551.g86a5e0f41-1-any.pkg.tar.zst"
+        SHA512 98c9b36bee8a6aef5f47eae6ecc4577859865aecc7b8fadfccbb5b6a2b6e5a26a3725b6017004004e2468773f1b9d7c0ac59b2940476c5af2f92c158f9c24880
+        PROVIDES mingw-w64-i686-libwinpthread
+    )
+    z_vcpkg_acquire_msys_declare_package(
+        URL "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-mpc-1.3.1-2-any.pkg.tar.zst"
+        SHA512 936acdedea20b9892f90ebdb0b75250d1ed3d65487316ee986b8672683b01d4e1f2922387f18ea8d6befb71bf273995d4940ff55b645d07996c98bd50c9382ae
+        DEPS mingw-w64-i686-gmp mingw-w64-i686-mpfr
+    )
+    z_vcpkg_acquire_msys_declare_package(
+        URL "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-mpfr-4.2.1-2-any.pkg.tar.zst"
+        SHA512 0de842b6c3b68c0f743aa4d4a08ca2c9c3f1a1cb426950365e885a55add3966eb545a0634177857e077545ae97950acd49613768bdc13305f08041637e27f8f6
+        DEPS mingw-w64-i686-gcc-libs mingw-w64-i686-gmp
+    )
+    z_vcpkg_acquire_msys_declare_package(
+        URL "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-windows-default-manifest-6.4-4-any.pkg.tar.zst"
+        SHA512 103f8437e13fb2a839c5eb89f49f5888c71f7934771cf3b2dcca46d520277fe7f7d4841c9d415b454a6a581c6d1f806d6be7f614027df0484f2642ef2563e889
+    )
+    z_vcpkg_acquire_msys_declare_package(
+        URL "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-winpthreads-git-11.0.0.r551.g86a5e0f41-1-any.pkg.tar.zst"
+        SHA512 ff3220bc13e1e1931a013a72d030fa0e8a16c9c920256e33ab8fb0cef4d13c15e03b842e5299b81aaad873fad5a079fb828c65b708d6d79459601a817bc76750
+        PROVIDES mingw-w64-i686-winpthreads
+        DEPS mingw-w64-i686-crt-git mingw-w64-i686-libwinpthread-git
+    )
+    z_vcpkg_acquire_msys_declare_package(
+        URL "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-zlib-1.3.1-1-any.pkg.tar.zst"
+        SHA512 881cf37f59bfbc3d8a6a6d16226360b63cf3d5abc82bb25fa1d9f871aa3e620fa22a8ae6b0cec619633d08550b72ad289f16b75d5819e3e117de0607125b0140
+    )
+    z_vcpkg_acquire_msys_declare_package(
+        URL "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-zstd-1.5.5-1-any.pkg.tar.zst"
+        SHA512 415be9f2ef78d72109f5888c31248b328ba96f1e2472d488bf45da4fe969875e0e3020a77ceb10cd885f50a18954105e06ce9d122d8c47dc9848944ea71ac49c
+        DEPS mingw-w64-i686-gcc-libs
+    )
+
+    # primary package for x64
+    z_vcpkg_acquire_msys_declare_package(
+        URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-fortran-13.2.0-3-any.pkg.tar.zst"
+        SHA512 8bb2beea8dc3dfa07db0be9294ae057205b122e018bba7c90a840dc73ab894339d91b0b801deff1e7d808d542af79cce211cdd9d16b06fe988a4be99a68a6b05
+        PROVIDES mingw-w64-x86_64-fc
+        DEPS mingw-w64-x86_64-gcc mingw-w64-x86_64-gcc-libgfortran
+    )
+    z_vcpkg_acquire_msys_declare_package(
+        URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-binutils-2.42-1-any.pkg.tar.zst"
+        SHA512 6e26b960447a825ac08bec8fffc5288fae9c38fab4e065d4f6ebf977ef06fe503a10ad10e2581cb733400b1f41ca5f68b19ba7838a8ef0db132d54683b1ff827
+        DEPS mingw-w64-x86_64-gettext-runtime mingw-w64-x86_64-zlib mingw-w64-x86_64-zstd
+    )
+    z_vcpkg_acquire_msys_declare_package(
+        URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-crt-git-11.0.0.r551.g86a5e0f41-1-any.pkg.tar.zst"
+        SHA512 656cd64827f9a17fe1c49b6a84430d96ab81b382947aa412ea9c5545121aa1c07f4d342d23c9ddfa1d25e2221d57471c02a2fa1b97796396d5d0802394a0fd72
+        PROVIDES mingw-w64-x86_64-crt
+        DEPS mingw-w64-x86_64-headers-git
+    )
+    z_vcpkg_acquire_msys_declare_package(
+        URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-13.2.0-3-any.pkg.tar.zst"
+        SHA512 75cf55088a3ca09d9a53be7d5f390e26a3686d12b7172a9bf029c81b7055981fbc9ce9c3e353f5e2aa065144a6520bf499900d0cf2eef49dc637e37d68422e5a
+        PROVIDES mingw-w64-x86_64-gcc-base mingw-w64-x86_64-cc
+        DEPS mingw-w64-x86_64-binutils mingw-w64-x86_64-crt mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-gmp mingw-w64-x86_64-headers mingw-w64-x86_64-isl mingw-w64-x86_64-libiconv mingw-w64-x86_64-mpc mingw-w64-x86_64-mpfr mingw-w64-x86_64-windows-default-manifest mingw-w64-x86_64-winpthreads mingw-w64-x86_64-zlib mingw-w64-x86_64-zstd
+    )
+    z_vcpkg_acquire_msys_declare_package(
+        URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-headers-git-11.0.0.r551.g86a5e0f41-1-any.pkg.tar.zst"
+        SHA512 a14e8249b202e31ca071d579fa23b2a668df0fd9fed4480c9071ba8489a5110c0c8fd84264676e1ebc922dfe73c720a9bb7514a7c1bf87aebefa7c99b2be8b98
+        PROVIDES mingw-w64-x86_64-headers
+    )
+    z_vcpkg_acquire_msys_declare_package(
+        URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-isl-0.26-1-any.pkg.tar.zst"
+        SHA512 2c715b50807ea2c134784210553d0c725f8eeb1221d64f0510c76f7538098d8400ac1ef329656a2fcb0bda270f9e1d82917d00b9ba11a985ce64ae7c3bf24977
+        DEPS mingw-w64-x86_64-gmp
+    )
+    z_vcpkg_acquire_msys_declare_package(
+        URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-windows-default-manifest-6.4-4-any.pkg.tar.zst"
+        SHA512 d7e1e4c79f6c7db3bd97305ff89e407a32d3ce9f2a18083b9674538d018651e889efb6fdef00cc79c78f8c07852eab63d7fc705e9567b1ad5684f0a704adeaf3
+    )
+    z_vcpkg_acquire_msys_declare_package(
+        URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-winpthreads-git-11.0.0.r551.g86a5e0f41-1-any.pkg.tar.zst"
+        SHA512 f3ed9c1c147d284fb684d54d8b045020047e44fc34159e2841ce13625b58879c5320b6606077db7a362559dea367c39ce794f69f4fd4af9c079baf70336e89c7
+        PROVIDES mingw-w64-x86_64-winpthreads
+        DEPS mingw-w64-x86_64-crt-git mingw-w64-x86_64-libwinpthread-git
+    )
+    z_vcpkg_acquire_msys_declare_package(
+        URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-zstd-1.5.5-1-any.pkg.tar.zst"
+        SHA512 bc03e39ac48f40e53e2cbff9d48770d8267793608aa6698ddd01371872544e2c023f4be68c638aa349a4c006b6967ac9bf45ce927cf4e4a156c39fa7cb8c27d1
+        DEPS mingw-w64-x86_64-gcc-libs
+    )
+endmacro()
\ No newline at end of file
diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_from_gitlab.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_from_gitlab.cmake
index 6a0e29c18..93e8e60bd 100644
--- a/external_imported/vcpkg/scripts/cmake/vcpkg_from_gitlab.cmake
+++ b/external_imported/vcpkg/scripts/cmake/vcpkg_from_gitlab.cmake
@@ -18,7 +18,7 @@ endfunction()
 function(vcpkg_from_gitlab)
     cmake_parse_arguments(PARSE_ARGV 0 "arg"
         ""
-        "OUT_SOURCE_PATH;GITLAB_URL;REPO;REF;SHA512;HEAD_REF;FILE_DISAMBIGUATOR"
+        "OUT_SOURCE_PATH;GITLAB_URL;REPO;REF;SHA512;HEAD_REF;FILE_DISAMBIGUATOR;AUTHORIZATION_TOKEN"
         "PATCHES")
 
     if(DEFINED arg_UNPARSED_ARGUMENTS)
@@ -45,27 +45,22 @@ function(vcpkg_from_gitlab)
 
     set(headers_param "")
     if(DEFINED arg_AUTHORIZATION_TOKEN)
-        set(headers_param "HEADERS" "Authorization: token ${arg_AUTHORIZATION_TOKEN}")
+        set(headers_param "HEADERS" "PRIVATE-TOKEN: ${arg_AUTHORIZATION_TOKEN}")
     endif()
 
     if(NOT DEFINED arg_REF AND NOT DEFINED arg_HEAD_REF)
         message(FATAL_ERROR "At least one of REF or HEAD_REF must be specified.")
     endif()
 
-    if(arg_REPO MATCHES [[^([^/]*)/([^/]*)$]]) # 2 elements
-        set(org_name "${CMAKE_MATCH_1}")
-        set(repo_name "${CMAKE_MATCH_2}")
-        set(gitlab_link "${arg_GITLAB_URL}/${org_name}/${repo_name}")
-    elseif(arg_REPO MATCHES [[^([^/]*)/([^/]*)/([^/]*)$]]) # 3 elements
-        set(org_name "${CMAKE_MATCH_1}")
-        set(group_name "${CMAKE_MATCH_2}")
-        set(repo_name "${CMAKE_MATCH_3}")
-        set(gitlab_link "${arg_GITLAB_URL}/${org_name}/${group_name}/${repo_name}")
-    else()
+    if (NOT arg_REPO MATCHES [[^([^/;]+/)+([^/;]+)$]])
         message(FATAL_ERROR "REPO (${arg_REPO}) is not a valid repo name. It must be:
     - an organization name followed by a repository name separated by a single slash, or
-    - an organization name, group name, and repository name separated by slashes.")
+    - an organization name, group name, subgroup names and repository name separated by slashes.")
     endif()
+    set(gitlab_link "${arg_GITLAB_URL}/${arg_REPO}")
+    string(REPLACE "/" "-" downloaded_file_name_base "${arg_REPO}")
+    string(REPLACE "/" ";" repo_parts "${arg_REPO}")
+    list(GET repo_parts -1 repo_name)
 
     set(redownload_param "")
     set(working_directory_param "")
@@ -88,9 +83,9 @@ function(vcpkg_from_gitlab)
     # we assume that no one will name a ref "foo_-bar"
     string(REPLACE "/" "_-" sanitized_ref "${ref_to_use}")
     if(DEFINED arg_FILE_DISAMBIGUATOR AND NOT VCPKG_USE_HEAD_VERSION)
-        set(downloaded_file_name "${org_name}-${repo_name}-${sanitized_ref}-${arg_FILE_DISAMBIGUATOR}.tar.gz")
+        set(downloaded_file_name "${downloaded_file_name_base}-${sanitized_ref}-${arg_FILE_DISAMBIGUATOR}.tar.gz")
     else()
-        set(downloaded_file_name "${org_name}-${repo_name}-${sanitized_ref}.tar.gz")
+        set(downloaded_file_name "${downloaded_file_name_base}-${sanitized_ref}.tar.gz")
     endif()
 
 
diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_from_sourceforge.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_from_sourceforge.cmake
index b2209ab35..19772c305 100644
--- a/external_imported/vcpkg/scripts/cmake/vcpkg_from_sourceforge.cmake
+++ b/external_imported/vcpkg/scripts/cmake/vcpkg_from_sourceforge.cmake
@@ -4,93 +4,32 @@ function(vcpkg_from_sourceforge)
         "OUT_SOURCE_PATH;REPO;REF;SHA512;FILENAME;WORKING_DIRECTORY"
         "PATCHES")
 
-    if(NOT DEFINED arg_OUT_SOURCE_PATH)
-        message(FATAL_ERROR "OUT_SOURCE_PATH must be specified.")
-    endif()
-    if(NOT DEFINED arg_SHA512)
-        message(FATAL_ERROR "SHA512 must be specified.")
-    endif()
-    if(NOT DEFINED arg_REPO)
-        message(FATAL_ERROR "The sourceforge repository must be specified.")
-    endif()
-
+    foreach(arg_name IN ITEMS OUT_SOURCE_PATH SHA512 REPO FILENAME)
+        if(NOT DEFINED "arg_${arg_name}")
+            message(FATAL_ERROR "${arg_name} is required.")
+        endif()
+    endforeach()
 
     if(arg_DISABLE_SSL)
         message(WARNING "DISABLE_SSL has been deprecated and has no effect")
     endif()
-    
-    set(sourceforge_host "https://sourceforge.net/projects")
-
-    if(arg_REPO MATCHES "^([^/]*)$") # just one element
-        set(org_name "${CMAKE_MATCH_1}")
-        set(repo_name "")
-    elseif(arg_REPO MATCHES "^([^/]*)/([^/]*)$") # two elements
-        set(org_name "${CMAKE_MATCH_1}")
-        set(repo_name "${CMAKE_MATCH_2}")
-    else()
-        message(FATAL_ERROR "REPO (${arg_REPO}) is not a valid repo name. It must be:
-    - an organization name without any slashes, or
-    - an organization name followed by a repository name separated by a single slash")
-    endif()
-    
-    if(DEFINED arg_REF)
-        set(url "${sourceforge_host}/${org_name}/files/${repo_name}/${arg_REF}/${arg_FILENAME}")
-    elseif(DEFINED repo_name)
-        set(url "${sourceforge_host}/${org_name}/${repo_name}/files/${arg_FILENAME}")
-    else()
-        set(url "${sourceforge_host}/${org_name}/files/${arg_FILENAME}")
-    endif()
-        
-    string(SUBSTRING "${arg_SHA512}" 0 10 sanitized_ref)
 
-    set(sourceforge_mirrors
-        cfhcable        # United States
-        pilotfiber      # New York, NY
-        gigenet         # Chicago, IL
-        versaweb        # Las Vegas, NV
-        ayera           # Modesto, CA
-        netactuate      # Durham, NC
-        phoenixnap      # Tempe, AZ
-        astuteinternet  # Vancouver, BC
-        freefr          # Paris, France
-        netcologne      # Cologne, Germany
-        deac-riga       # Latvia
-        excellmedia     # Hyderabad, India
-        iweb            # Montreal, QC
-        jaist           # Nomi, Japan
-        jztkft          # Mezotur, Hungary
-        managedway      # Detroit, MI
-        nchc            # Taipei, Taiwan
-        netix           # Bulgaria
-        ufpr            # Curitiba, Brazil
-        tenet           # Wynberg, South Africa
-    )
-    if(DEFINED SOURCEFORGE_MIRRORS AND NOT DEFINED VCPKG_SOURCEFORGE_EXTRA_MIRRORS)
-        message(WARNING "Extension point SOURCEFORGE_MIRRORS has been deprecated.
-    Please use the replacement VCPKG_SOURCEFORGE_EXTRA_MIRRORS variable instead.")
-        list(APPEND sourceforge_mirrors "${SOURCEFORGE_MIRRORS}")
-        list(REMOVE_DUPLICATES sourceforge_mirrors)
-    elseif(DEFINED VCPKG_SOURCEFORGE_EXTRA_MIRRORS)
-        list(APPEND sourceforge_mirrors "${VCPKG_SOURCEFORGE_EXTRA_MIRRORS}")
-        list(REMOVE_DUPLICATES sourceforge_mirrors)
+    if(DEFINED arg_UNPARSED_ARGUMENTS)
+        message(FATAL_ERROR "Unrecognized arguments: ${arg_UNPARSED_ARGUMENTS}")
     endif()
 
-    set(all_urls "${url}/download")
-    foreach(mirror IN LISTS sourceforge_mirrors)
-        list(APPEND all_urls "${url}/download?use_mirror=${mirror}")
-    endforeach()
-    
-    vcpkg_download_distfile(ARCHIVE
-        URLS ${all_urls}
+    vcpkg_download_sourceforge(ARCHIVE
+        REPO "${arg_REPO}"
+        REF "${arg_REF}"
         SHA512 "${arg_SHA512}"
         FILENAME "${arg_FILENAME}"
     )
 
     set(no_remove_one_level_param "")
-    set(working_directory_param "")
     if(arg_NO_REMOVE_ONE_LEVEL)
         set(no_remove_one_level_param "NO_REMOVE_ONE_LEVEL")
     endif()
+    set(working_directory_param "")
     if(DEFINED arg_WORKING_DIRECTORY)
         set(working_directory_param "WORKING_DIRECTORY" "${arg_WORKING_DIRECTORY}")
     endif()
diff --git a/external_imported/vcpkg/scripts/cmake/z_vcpkg_apply_patches.cmake b/external_imported/vcpkg/scripts/cmake/z_vcpkg_apply_patches.cmake
index 77af63b3b..9a270ba2b 100644
--- a/external_imported/vcpkg/scripts/cmake/z_vcpkg_apply_patches.cmake
+++ b/external_imported/vcpkg/scripts/cmake/z_vcpkg_apply_patches.cmake
@@ -19,7 +19,7 @@ function(z_vcpkg_apply_patches)
         message(STATUS "Applying patch ${patch}")
         set(logname "patch-${TARGET_TRIPLET}-${patchnum}")
         vcpkg_execute_in_download_mode(
-            COMMAND "${GIT}" -c core.longpaths=true -c core.autocrlf=false --work-tree=. --git-dir=.git apply "${absolute_patch}" --ignore-whitespace --whitespace=nowarn --verbose
+            COMMAND "${GIT}" -c core.longpaths=true -c core.autocrlf=false -c core.filemode=true --work-tree=. --git-dir=.git apply "${absolute_patch}" --ignore-whitespace --whitespace=nowarn --verbose
             OUTPUT_FILE "${CURRENT_BUILDTREES_DIR}/${logname}-out.log"
             ERROR_VARIABLE error
             WORKING_DIRECTORY "${arg_SOURCE_PATH}"
diff --git a/external_imported/vcpkg/scripts/get_cmake_vars/CMakeLists.txt b/external_imported/vcpkg/scripts/get_cmake_vars/CMakeLists.txt
index d2135a165..934515dd1 100644
--- a/external_imported/vcpkg/scripts/get_cmake_vars/CMakeLists.txt
+++ b/external_imported/vcpkg/scripts/get_cmake_vars/CMakeLists.txt
@@ -11,6 +11,9 @@ else()
 endif()
 
 set(VCPKG_LANGUAGES "C;CXX" CACHE STRING "Languages to enables for this project")
+if(VCPKG_ENABLE_OBJC)
+    list(APPEND VCPKG_LANGUAGES "OBJC")
+endif()
 
 project(get_cmake_vars LANGUAGES ${VCPKG_LANGUAGES})
 
diff --git a/external_imported/vcpkg/scripts/ports.cmake b/external_imported/vcpkg/scripts/ports.cmake
index c9bb4eda0..e18ee37bd 100644
--- a/external_imported/vcpkg/scripts/ports.cmake
+++ b/external_imported/vcpkg/scripts/ports.cmake
@@ -1,5 +1,26 @@
 cmake_minimum_required(VERSION 3.21)
 
+# Remove CMAKE_ variables from the script call
+foreach(i RANGE 0 "${CMAKE_ARGC}")
+    unset(CMAKE_ARGV${i})
+endforeach()
+unset(CMAKE_ARGN)
+unset(CMAKE_ARGC)
+unset(i)
+# These don't make sense in script context
+unset(CMAKE_BINARY_DIR)
+unset(CMAKE_SOURCE_DIR)
+unset(CMAKE_CURRENT_BINARY_DIR)
+unset(CMAKE_CURRENT_SOURCE_DIR)
+unset(CMAKE_FILES_DIRECTORY)
+# Minimum CMake version is forced within vcpkg
+unset(CMAKE_MINIMUM_REQUIRED_VERSION)
+# CMAKE_VERSION is enough for doing version checks
+unset(CMAKE_MAJOR_VERSION)
+unset(CMAKE_MINOR_VERSION)
+unset(CMAKE_PATCH_VERSION)
+unset(CMAKE_TWEAK_VERSION)
+
 set(SCRIPTS "${CMAKE_CURRENT_LIST_DIR}" CACHE PATH "Location to stored scripts")
 list(APPEND CMAKE_MODULE_PATH "${SCRIPTS}/cmake")
 include("${SCRIPTS}/cmake/execute_process.cmake")
@@ -27,9 +48,11 @@ include("${SCRIPTS}/cmake/vcpkg_copy_pdbs.cmake")
 include("${SCRIPTS}/cmake/vcpkg_copy_tool_dependencies.cmake")
 include("${SCRIPTS}/cmake/vcpkg_copy_tools.cmake")
 include("${SCRIPTS}/cmake/vcpkg_download_distfile.cmake")
+include("${SCRIPTS}/cmake/vcpkg_download_sourceforge.cmake")
 include("${SCRIPTS}/cmake/vcpkg_execute_build_process.cmake")
 include("${SCRIPTS}/cmake/vcpkg_execute_required_process.cmake")
 include("${SCRIPTS}/cmake/vcpkg_execute_required_process_repeat.cmake")
+include("${SCRIPTS}/cmake/vcpkg_extract_archive.cmake")
 include("${SCRIPTS}/cmake/vcpkg_extract_source_archive.cmake")
 include("${SCRIPTS}/cmake/vcpkg_extract_source_archive_ex.cmake")
 include("${SCRIPTS}/cmake/vcpkg_fail_port_install.cmake")
@@ -129,18 +152,18 @@ if(CMD STREQUAL "BUILD")
 
     include("${CMAKE_TRIPLET_FILE}")
 
-    if (DEFINED VCPKG_PORT_CONFIGS)
-        foreach(VCPKG_PORT_CONFIG IN LISTS VCPKG_PORT_CONFIGS)
-            include("${VCPKG_PORT_CONFIG}")
-        endforeach()
-    endif()
-
     set(HOST_TRIPLET "${_HOST_TRIPLET}")
     set(CURRENT_HOST_INSTALLED_DIR "${_VCPKG_INSTALLED_DIR}/${HOST_TRIPLET}" CACHE PATH "Location to install final packages for the host")
 
     set(TRIPLET_SYSTEM_ARCH "${VCPKG_TARGET_ARCHITECTURE}")
     include("${SCRIPTS}/cmake/vcpkg_common_definitions.cmake")
 
+    if (DEFINED VCPKG_PORT_CONFIGS)
+        foreach(VCPKG_PORT_CONFIG IN LISTS VCPKG_PORT_CONFIGS)
+            include("${VCPKG_PORT_CONFIG}")
+        endforeach()
+    endif()
+
     set(Z_VCPKG_ERROR_LOG_COLLECTION_FILE "${CURRENT_BUILDTREES_DIR}/error-logs-${TARGET_TRIPLET}.txt")
     file(REMOVE "${Z_VCPKG_ERROR_LOG_COLLECTION_FILE}")
 
diff --git a/external_imported/vcpkg/scripts/templates/portfile.in.cmake b/external_imported/vcpkg/scripts/templates/portfile.in.cmake
index 91b62753b..9587622d4 100644
--- a/external_imported/vcpkg/scripts/templates/portfile.in.cmake
+++ b/external_imported/vcpkg/scripts/templates/portfile.in.cmake
@@ -13,7 +13,6 @@
 #   VCPKG_TOOLCHAIN           = ON OFF
 #   TRIPLET_SYSTEM_ARCH       = arm x86 x64
 #   BUILD_ARCH                = "Win32" "x64" "ARM"
-#   MSBUILD_PLATFORM          = "Win32"/"x64"/${TRIPLET_SYSTEM_ARCH}
 #   DEBUG_CONFIG              = "Debug Static" "Debug Dll"
 #   RELEASE_CONFIG            = "Release Static"" "Release DLL"
 #   VCPKG_TARGET_IS_WINDOWS
@@ -47,7 +46,7 @@ vcpkg_extract_source_archive_ex(
     # (Optional) A friendly name to use instead of the filename of the archive (e.g.: a version number or tag).
     # REF 1.0.0
     # (Optional) Read the docs for how to generate patches at:
-    # https://github.com/Microsoft/vcpkg/blob/master/docs/examples/patching.md
+    # https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/examples/patching.md
     # PATCHES
     #   001_port_fixes.patch
     #   002_more_port_fixes.patch
@@ -56,7 +55,7 @@ vcpkg_extract_source_archive_ex(
 # # Check if one or more features are a part of a package installation.
 # # See /docs/maintainers/vcpkg_check_features.md for more details
 # vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-#   FEATURES # <- Keyword FEATURES is required because INVERTED_FEATURES are being used
+#   FEATURES
 #     tbb   WITH_TBB
 #   INVERTED_FEATURES
 #     tbb   ROCKSDB_IGNORE_PACKAGE_TBB
diff --git a/external_imported/vcpkg/scripts/templates/vcpkg.json.in b/external_imported/vcpkg/scripts/templates/vcpkg.json.in
index 81004e8ee..03476f8ff 100644
--- a/external_imported/vcpkg/scripts/templates/vcpkg.json.in
+++ b/external_imported/vcpkg/scripts/templates/vcpkg.json.in
@@ -3,6 +3,7 @@
   "version": "",
   "homepage": "",
   "description": "",
+  "license": "",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
@@ -11,11 +12,10 @@
   ],
 
   "default-features": [],
-  "features": [
-    {
-      "name": "",
+  "features": {
+    "example-feature": {
       "description": "",
       "dependencies": []
     }
-  ]
+  }
 }
diff --git a/external_imported/vcpkg/scripts/test_ports/cmake-user/portfile.cmake b/external_imported/vcpkg/scripts/test_ports/cmake-user/portfile.cmake
index ab30c4ccd..d9154ebc0 100644
--- a/external_imported/vcpkg/scripts/test_ports/cmake-user/portfile.cmake
+++ b/external_imported/vcpkg/scripts/test_ports/cmake-user/portfile.cmake
@@ -129,6 +129,10 @@ function(test_cmake_project)
             list(APPEND base_options "-DCMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION}")
         endif()
     endif()
+
+    if(DEFINED VCPKG_XBOX_CONSOLE_TARGET)
+        list(APPEND arg_OPTIONS "-DXBOX_CONSOLE_TARGET=${VCPKG_XBOX_CONSOLE_TARGET}")
+    endif()
     
     if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
         list(APPEND base_options -DBUILD_SHARED_LIBS=ON)
diff --git a/external_imported/vcpkg/scripts/test_ports/cmake-user/vcpkg.json b/external_imported/vcpkg/scripts/test_ports/cmake-user/vcpkg.json
index fc8fde3f5..1e727be0e 100644
--- a/external_imported/vcpkg/scripts/test_ports/cmake-user/vcpkg.json
+++ b/external_imported/vcpkg/scripts/test_ports/cmake-user/vcpkg.json
@@ -38,6 +38,11 @@
     "find-package": {
       "description": "Ports to be tested via find_package($package)",
       "dependencies": [
+        {
+          "$package": "Boost",
+          "name": "boost",
+          "platform": "!uwp"
+        },
         {
           "$package": "BZip2",
           "name": "bzip2"
@@ -79,7 +84,7 @@
         },
         {
           "$package": "Intl",
-          "name": "gettext"
+          "name": "gettext-libintl"
         },
         {
           "$package": "GIF",
@@ -153,6 +158,7 @@
           "name": "tiff",
           "default-features": false,
           "features": [
+            "libdeflate",
             "zstd"
           ]
         },
diff --git a/external_imported/vcpkg/scripts/test_ports/cmake/fix-dependency-libuv.patch b/external_imported/vcpkg/scripts/test_ports/cmake/fix-dependency-libuv.patch
index 5402a7887..e847f6549 100644
--- a/external_imported/vcpkg/scripts/test_ports/cmake/fix-dependency-libuv.patch
+++ b/external_imported/vcpkg/scripts/test_ports/cmake/fix-dependency-libuv.patch
@@ -18,10 +18,10 @@ index fdfe456..ef2d329 100644
          "CMAKE_USE_SYSTEM_LIBUV is ON but a libuv is not found!")
      endif()
 -    set(CMAKE_LIBUV_LIBRARIES LibUV::LibUV)
-+    if (TARGET uv)
-+    set(CMAKE_LIBUV_LIBRARIES uv)
++    if (TARGET libuv::uv)
++    set(CMAKE_LIBUV_LIBRARIES libuv::uv)
 +    else()
-+    set(CMAKE_LIBUV_LIBRARIES uv_a)
++    set(CMAKE_LIBUV_LIBRARIES libuv::uv_a)
 +    endif()
    else()
      set(CMAKE_LIBUV_LIBRARIES cmlibuv)
diff --git a/external_imported/vcpkg/scripts/test_ports/cmake/portfile.cmake b/external_imported/vcpkg/scripts/test_ports/cmake/portfile.cmake
index 87ad4eb6d..cdbd2d6ad 100644
--- a/external_imported/vcpkg/scripts/test_ports/cmake/portfile.cmake
+++ b/external_imported/vcpkg/scripts/test_ports/cmake/portfile.cmake
@@ -6,7 +6,7 @@ vcpkg_from_gitlab(
     REF
         8428e39ed9cddb3b7f1a6f7a58cb8617503183d2
     SHA512
-        4a40656efe5854bd6b893d0b2b86eed5df42992d080edb9c0cb2da2c55ad8dd489a85072b138947933d94ef5ba90c7a59f0a4460e3722d0f898ceefbbf74d226 
+        12df5d68aad6bf1bfa34c3a83b428e1ecdc0b2b746e92bf71157eec4b4c114c86f21e91509f26f5da6e8916941563750e63cc3218970eaba33d6de231599de34
     HEAD_REF master
     PATCHES fix-dependency-libuv.patch
 )
diff --git a/external_imported/vcpkg/scripts/test_ports/cmake/vcpkg.json b/external_imported/vcpkg/scripts/test_ports/cmake/vcpkg.json
index 3f2a38a1e..f1c6364d9 100644
--- a/external_imported/vcpkg/scripts/test_ports/cmake/vcpkg.json
+++ b/external_imported/vcpkg/scripts/test_ports/cmake/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "cmake",
   "version": "3.22.2",
-  "port-version": 2,
+  "port-version": 4,
   "description": "CMake is an open-source, cross-platform family of tools designed to build, test and package software.",
   "homepage": "https://cmake.org/",
   "license": "BSD-3-Clause",
diff --git a/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/portfile.cmake b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/portfile.cmake
new file mode 100644
index 000000000..bc785962c
--- /dev/null
+++ b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/portfile.cmake
@@ -0,0 +1,4 @@
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+
+vcpkg_cmake_configure(SOURCE_PATH "${CURRENT_PORT_DIR}/project")
+vcpkg_cmake_build()
diff --git a/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/project/CMakeLists.txt b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/project/CMakeLists.txt
new file mode 100644
index 000000000..8bbcf70da
--- /dev/null
+++ b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/project/CMakeLists.txt
@@ -0,0 +1,45 @@
+cmake_minimum_required(VERSION 3.12)
+
+project(embedresource-test VERSION 0.0.1)
+
+set(CMAKE_CXX_STANDARD 17)
+
+find_package(EmbedResource REQUIRED)
+
+file(SIZE "${CMAKE_CURRENT_LIST_DIR}/main.cpp" MAIN_CPP_FILE_SIZE)
+file(SIZE "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" CMAKELISTS_TXT_FILE_SIZE)
+
+add_resource_library(sample_test_resources OBJECT RESOURCE_COLLECTION_NAME testdata1 RESOURCES main.cpp GENERATOR_COMMAND echo "CMakeLists.txt" GENERATOR_DEPEND CMakeLists.txt)
+add_resource_library(testdata3 OBJECT RESOURCES main.cpp)
+
+macro(setup_target target)
+    target_add_resource(${target} RESOURCE_COLLECTION_NAME testdata2 RESOURCES main.cpp)
+    get_target_property(type ${target} TYPE)
+    if ("${type}" STREQUAL "STATIC_LIBRARY")
+        target_link_libraries(${target} PRIVATE $<BUILD_INTERFACE:sample_test_resources> $<BUILD_INTERFACE:testdata3>)
+    else()
+        target_link_libraries(${target} PRIVATE sample_test_resources testdata3)
+    endif()
+
+    target_compile_definitions(${target} PRIVATE MAIN_CPP_FILE_SIZE=${MAIN_CPP_FILE_SIZE})
+    target_compile_definitions(${target} PRIVATE CMAKELISTS_TXT_FILE_SIZE=${CMAKELISTS_TXT_FILE_SIZE})
+endmacro()
+
+add_executable(sample_test_exe main.cpp)
+setup_target(sample_test_exe)
+
+add_library(sample_test_shlib SHARED main.cpp)
+target_compile_features(sample_test_shlib PRIVATE cxx_std_20)
+setup_target(sample_test_shlib)
+
+add_library(sample_test_lib STATIC main.cpp)
+setup_target(sample_test_lib)
+
+install(TARGETS sample_test_shlib EXPORT sample_test_shlib)
+install(EXPORT sample_test_shlib  FILE sampleTargets.cmake DESTINATION cmake)
+
+install(TARGETS sample_test_lib EXPORT sample_test_lib)
+install(EXPORT sample_test_lib  FILE sampleTargets.cmake DESTINATION cmake)
+
+enable_testing()
+add_test(NAME sample_test_exe COMMAND sample_test_exe)
diff --git a/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/project/main.cpp b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/project/main.cpp
new file mode 100644
index 000000000..39d7a8304
--- /dev/null
+++ b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/project/main.cpp
@@ -0,0 +1,58 @@
+#include <EmbeddedResource.h>
+#include <exception>
+#include <iostream>
+#include <stdexcept>
+#include <string_view>
+
+DECLARE_RESOURCE_COLLECTION(testdata1);
+DECLARE_RESOURCE_COLLECTION(testdata2);
+DECLARE_RESOURCE_COLLECTION(testdata3);
+DECLARE_RESOURCE(testdata3, main_cpp);
+
+void verify_resource(ResourceLoader const& r)
+{
+    if (r.name() == L"main.cpp")
+    {
+#ifdef __cpp_lib_span
+        if (r.template data<uint8_t>().size() != MAIN_CPP_FILE_SIZE) { throw std::runtime_error("r.data.len() != MAIN_CPP_FILE_SIZE"); }
+#endif
+#ifdef __cpp_lib_string_view
+        if (r.string().size() != MAIN_CPP_FILE_SIZE) { throw std::runtime_error("r.string().size() != MAIN_CPP_FILE_SIZE"); }
+#endif
+    }
+    else if (r.name() == L"CMakeLists.txt")
+    {
+#ifdef __cpp_lib_span
+        if (r.template data<uint8_t>().size() != CMAKELISTS_TXT_FILE_SIZE)
+        {
+            throw std::runtime_error("r.data.len() != CMAKELISTS_TXT_FILE_SIZE");
+        }
+#endif
+#ifdef __cpp_lib_string_view
+        if (r.string().size() != CMAKELISTS_TXT_FILE_SIZE) { throw std::runtime_error("r.string().size() != CMAKELISTS_TXT_FILE_SIZE"); }
+#endif
+    }
+    else { throw std::runtime_error("Unknown resource name"); }
+}
+
+int main(int argc, char* argv[])
+try
+{
+    std::string_view res = LOAD_RESOURCE(testdata3, main_cpp).data;
+    if (res.size() != MAIN_CPP_FILE_SIZE) { throw std::runtime_error("r.data.len() != MAIN_CPP_FILE_SIZE"); }
+
+    auto resourceCollection1 = LOAD_RESOURCE_COLLECTION(testdata1);
+    for (auto const r : resourceCollection1) { verify_resource(r); }
+
+    auto resourceCollection2 = LOAD_RESOURCE_COLLECTION(testdata2);
+    for (auto const r : resourceCollection2) { verify_resource(r); }
+
+    auto resourceCollection3 = LOAD_RESOURCE_COLLECTION(testdata3);
+    for (auto const r : resourceCollection2) { verify_resource(r); }
+
+    return 0;
+} catch (const std::exception& ex)
+{
+    std::cerr << "Failed: " << ex.what() << std::endl;
+    return -1;
+}
\ No newline at end of file
diff --git a/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/vcpkg.json b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/vcpkg.json
new file mode 100644
index 000000000..1c13e8176
--- /dev/null
+++ b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/vcpkg.json
@@ -0,0 +1,15 @@
+{
+  "name": "vcpkg-ci-ankurvdev-embedresource",
+  "version-string": "ci",
+  "description": "Validates ankurvdev-embedresource",
+  "license": "BSD-3-Clause",
+  "dependencies": [
+    {
+      "name": "ankurvdev-embedresource"
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-boost/vcpkg.json b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-boost/vcpkg.json
index c8c19f49e..472288ac0 100644
--- a/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-boost/vcpkg.json
+++ b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-boost/vcpkg.json
@@ -8,7 +8,8 @@
       "default-features": false,
       "features": [
         "mpi"
-      ]
+      ],
+      "platform": "!staticcrt & !(arm & windows) & !uwp"
     },
     {
       "name": "boost-asio",
@@ -22,14 +23,16 @@
       "default-features": false,
       "features": [
         "numa"
-      ]
+      ],
+      "platform": "!uwp & !arm & !emscripten"
     },
     {
       "name": "boost-locale",
       "default-features": false,
       "features": [
         "icu"
-      ]
+      ],
+      "platform": "!uwp"
     },
     {
       "name": "boost-mpi",
@@ -37,22 +40,35 @@
       "features": [
         "python3"
       ],
-      "platform": "!static"
+      "platform": "!staticcrt & !static & !uwp & !(arm & windows)"
+    },
+    {
+      "name": "boost-odeint",
+      "default-features": false
     },
     {
       "name": "boost-odeint",
       "default-features": false,
       "features": [
         "mpi"
-      ]
+      ],
+      "platform": "!staticcrt & !uwp & !(windows & arm)"
     },
     {
       "name": "boost-python",
       "default-features": false,
       "features": [
-        "python2",
         "python3"
-      ]
+      ],
+      "platform": "!emscripten & !ios & !android & !uwp"
+    },
+    {
+      "name": "boost-python",
+      "default-features": false,
+      "features": [
+        "python2"
+      ],
+      "platform": "!android & !emscripten & !ios & !(arm & osx) & !(arm & windows) & !uwp"
     },
     {
       "name": "boost-regex",
diff --git a/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json
index d3f597073..b43b1048c 100644
--- a/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json
+++ b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json
@@ -23,6 +23,7 @@
         "mp3lame",
         "nonfree",
         "openjpeg",
+        "openmpt",
         "openssl",
         "opus",
         "postproc",
@@ -97,25 +98,25 @@
       "name": "ffmpeg",
       "default-features": false,
       "features": [
-        "x265"
+        "aom"
       ],
-      "platform": "!uwp & !(arm & windows)"
+      "platform": "!(windows & arm & !uwp)"
     },
     {
       "name": "ffmpeg",
       "default-features": false,
       "features": [
-        "aom"
+        "dav1d"
       ],
-      "platform": "!(windows & arm & !uwp)"
+      "platform": "!(uwp | arm | x86 | osx)"
     },
     {
       "name": "ffmpeg",
       "default-features": false,
       "features": [
-        "dav1d"
+        "x265"
       ],
-      "platform": "!(uwp | arm | x86 | osx)"
+      "platform": "!uwp & !(arm & windows)"
     },
     {
       "name": "ffmpeg",
diff --git a/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-freerdp/portfile.cmake b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-freerdp/portfile.cmake
new file mode 100644
index 000000000..065116c27
--- /dev/null
+++ b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-freerdp/portfile.cmake
@@ -0,0 +1 @@
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
diff --git a/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-freerdp/vcpkg.json b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-freerdp/vcpkg.json
new file mode 100644
index 000000000..8f7055e5e
--- /dev/null
+++ b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-freerdp/vcpkg.json
@@ -0,0 +1,32 @@
+{
+  "name": "vcpkg-ci-freerdp",
+  "version-string": "ci",
+  "description": "Force non-default features of freerdp within vcpkg CI",
+  "homepage": "https://github.com/microsoft/vcpkg",
+  "dependencies": [
+    {
+      "name": "freerdp",
+      "features": [
+        "wayland",
+        "x11"
+      ],
+      "platform": "linux"
+    },
+    {
+      "name": "freerdp",
+      "features": [
+        "ffmpeg"
+      ],
+      "platform": "linux | osx"
+    },
+    {
+      "name": "freerdp",
+      "features": [
+        "server",
+        "urbdrc",
+        "winpr-tools"
+      ],
+      "platform": "linux | osx | windows"
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-gdal/portfile.cmake b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-gdal/portfile.cmake
new file mode 100644
index 000000000..065116c27
--- /dev/null
+++ b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-gdal/portfile.cmake
@@ -0,0 +1 @@
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
diff --git a/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-gdal/vcpkg.json b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-gdal/vcpkg.json
new file mode 100644
index 000000000..d72dae1b7
--- /dev/null
+++ b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-gdal/vcpkg.json
@@ -0,0 +1,44 @@
+{
+  "name": "vcpkg-ci-gdal",
+  "version-date": "2023-12-21",
+  "description": "Port to force features of certain ports within CI",
+  "homepage": "https://github.com/microsoft/vcpkg",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "gdal",
+      "features": [
+        "freexl"
+      ]
+    },
+    {
+      "name": "gdal",
+      "features": [
+        "postgresql"
+      ],
+      "platform": "linux"
+    },
+    {
+      "name": "gdal",
+      "features": [
+        "cfitsio",
+        "kea"
+      ],
+      "platform": "native"
+    },
+    {
+      "name": "gdal",
+      "features": [
+        "mysql-libmariadb"
+      ],
+      "platform": "windows & x86"
+    },
+    {
+      "name": "gdal",
+      "features": [
+        "aws-ec2-windows"
+      ],
+      "platform": "windows & !mingw"
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-libgit2/portfile.cmake b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-libgit2/portfile.cmake
new file mode 100644
index 000000000..065116c27
--- /dev/null
+++ b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-libgit2/portfile.cmake
@@ -0,0 +1 @@
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
diff --git a/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-libgit2/vcpkg.json b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-libgit2/vcpkg.json
new file mode 100644
index 000000000..f4c01aa8c
--- /dev/null
+++ b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-libgit2/vcpkg.json
@@ -0,0 +1,15 @@
+{
+  "name": "vcpkg-ci-libgit2",
+  "version-string": "ci",
+  "description": "Validates libgit2 with ssh and tools.",
+  "dependencies": [
+    {
+      "name": "libgit2",
+      "default-features": false,
+      "features": [
+        "ssh",
+        "tools"
+      ]
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-llvm/vcpkg.json b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-llvm/vcpkg.json
index eb563a511..afa1a3eb7 100644
--- a/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-llvm/vcpkg.json
+++ b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-llvm/vcpkg.json
@@ -9,39 +9,40 @@
       "name": "llvm",
       "default-features": false,
       "features": [
-        "bolt",
         "clang",
-        "disable-assertions",
-        "disable-clang-static-analyzer",
+        "compiler-rt",
+        "default-targets",
         "enable-abi-breaking-checks",
         "enable-bindings",
         "enable-eh",
         "enable-rtti",
         "enable-terminfo",
-        "enable-threads",
         "enable-zlib",
         "lld",
         "lldb",
-        "openmp",
-        "polly",
-        "target-aarch64",
-        "target-amdgpu",
-        "target-arm",
-        "target-webassembly",
-        "target-x86",
         "tools"
       ]
     },
     {
-      "$comment": "Only for osx artifact upload in CI succeeds when these features are enabled",
+      "$comment": "Platform restriction due to CI artifact upload quirks; features which need utils",
       "name": "llvm",
       "default-features": false,
       "features": [
-        "flang",
-        "target-all",
+        "bolt",
+        "openmp",
+        "polly",
         "utils"
       ],
-      "platform": "osx"
+      "platform": "!static"
+    },
+    {
+      "$comment": "Platform restriction due to CI artifact upload quirks; libc",
+      "name": "llvm",
+      "default-features": false,
+      "features": [
+        "libc"
+      ],
+      "platform": "linux"
     }
   ]
 }
diff --git a/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-msys2/portfile.cmake b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-msys2/portfile.cmake
new file mode 100644
index 000000000..fe2753e7c
--- /dev/null
+++ b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-msys2/portfile.cmake
@@ -0,0 +1,364 @@
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+
+set(msys_repo_url    "https://mirror.msys2.org/msys/x86_64")
+set(mingw64_repo_url "https://mirror.msys2.org/mingw/mingw64")
+set(mingw32_repo_url "https://mirror.msys2.org/mingw/mingw32")
+set(clangarm64_repo_url "https://mirror.msys2.org/mingw/clangarm64")
+
+# Ignore these updates (e.g. for known problems)
+vcpkg_list(SET ignored_updates
+    https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-ca-certificates-20211016-3-any.pkg.tar.zst
+)
+
+# Known removals that shall not be reported as errors
+# (Packages to be removed from vcpkg scripts ASAP.)
+vcpkg_list(SET known_delisted
+    libcrypt
+)
+
+# Ignore these dependencies (e.g. interactive or effectively optional)
+vcpkg_list(SET ignored_dependencies
+    autoconf2.13 autoconf2.69 autoconf2.71
+    automake1.11 automake1.12 automake1.13 automake1.14 automake1.15
+    db
+    gdbm
+    info
+    less
+    libiconv-devel
+    libltdl
+    mingw-w64-x86_64-tzdata
+)
+
+# Ignore these provides (e.g. effectively optional)
+vcpkg_list(SET ignored_provides
+    gnome-common
+    perl-Archive-Tar perl-Attribute-Handlers perl-AutoLoader perl-CPAN-Meta-Requirements perl-CPAN-Meta-YAML perl-CPAN-Meta perl-CPAN perl-Carp perl-Compress-Raw-Bzip2 perl-Compress-Raw-Zlib perl-Config-Perl-V perl-DB_File perl-Data-Dumper perl-Devel-PPPort perl-Devel-SelfStubber perl-Digest-MD5 perl-Digest-SHA perl-Digest perl-Dumpvalue perl-Encode perl-Env perl-Exporter perl-ExtUtils-CBuilder perl-ExtUtils-Constant perl-ExtUtils-Install perl-ExtUtils-MakeMaker perl-ExtUtils-Manifest perl-ExtUtils-PL2Bat perl-ExtUtils-ParseXS perl-File-Fetch perl-File-Path perl-File-Temp perl-Filter-Simple perl-Filter-Util-Call perl-FindBin perl-Getopt-Long perl-HTTP-Tiny perl-I18N-Collate perl-I18N-LangTags perl-IO-Compress perl-IO-Socket-IP perl-IO-Zlib perl-IO perl-IPC-Cmd perl-IPC-SysV perl-JSON-PP perl-Locale-Maketext-Simple perl-Locale-Maketext perl-MIME-Base64 perl-Math-BigInt-FastCalc perl-Math-BigInt perl-Math-BigRat perl-Math-Complex perl-Memoize perl-Module-CoreList perl-Module-Load-Conditional perl-Module-Load perl-Module-Loaded perl-Module-Metadata perl-NEXT perl-Net-Ping perl-Params-Check perl-PathTools perl-Perl-OSType perl-PerlIO-via-QuotedPrint perl-Pod-Checker perl-Pod-Escapes perl-Pod-Perldoc perl-Pod-Simple perl-Pod-Usage perl-Safe perl-Scalar-List-Utils perl-Search-Dict perl-SelfLoader perl-Socket perl-Storable perl-Sys-Syslog perl-Term-ANSIColor perl-Term-Cap perl-Term-Complete perl-Term-ReadLine perl-Test-Harness perl-Test-Simple perl-Test perl-Text-Abbrev perl-Text-Balanced perl-Text-ParseWords perl-Text-Tabs perl-Thread-Queue perl-Thread-Semaphore perl-Tie-File perl-Tie-RefHash perl-Time-HiRes perl-Time-Local perl-Time-Piece perl-Unicode-Collate perl-Unicode-Normalize perl-Win32 perl-Win32API-File perl-XSLoader perl-autodie perl-autouse perl-base perl-bignum perl-constant perl-encoding-warnings perl-experimental perl-if perl-lib perl-libnet perl-parent perl-perlfaq perl-podlators perl-threads-shared perl-threads perl-version
+)
+
+
+string(TIMESTAMP now "%s" UTC)
+
+function(age_in_days out_var timestamp)
+    set(age "")
+    if(timestamp)
+        math(EXPR age "(${now} - ${timestamp}) / 3600 / 24")
+    endif()
+    set(${out_var} "${age}" PARENT_SCOPE)
+endfunction()
+
+function(pretty_age out_var age_in_days)
+    if(age_in_days STREQUAL "")
+        set(${out_var} "(timestamp unknown)" PARENT_SCOPE)
+    else()
+        set(${out_var} "(${age_in_days} days ago)" PARENT_SCOPE)
+    endif()
+endfunction()
+
+function(get_vcpkg_builddate out_var name)
+    if(NOT DEFINED Z_VCPKG_MSYS_${name}_ARCHIVE)
+        z_vcpkg_acquire_msys_download_package(Z_VCPKG_MSYS_${name}_ARCHIVE
+            URL "${Z_VCPKG_MSYS_${name}_URL}"
+            SHA512 "${Z_VCPKG_MSYS_${name}_SHA512}"
+            FILENAME "${Z_VCPKG_MSYS_${name}_FILENAME}"
+        )
+        set(Z_VCPKG_MSYS_${name}_ARCHIVE "${Z_VCPKG_MSYS_${name}_ARCHIVE}" PARENT_SCOPE)
+    endif()
+    set(pkginfo_dir "${CURRENT_BUILDTREES_DIR}/vcpkg")
+    file(REMOVE_RECURSE "${pkginfo_dir}/${name}.txt" "${pkginfo_dir}/_tmp")
+    file(MAKE_DIRECTORY "${pkginfo_dir}/_tmp")
+    execute_process(
+        COMMAND "${CMAKE_COMMAND}" -E tar xzf "${Z_VCPKG_MSYS_${name}_ARCHIVE}" .PKGINFO
+        WORKING_DIRECTORY "${pkginfo_dir}/_tmp"
+    )
+    file(RENAME "${pkginfo_dir}/_tmp/.PKGINFO" "${pkginfo_dir}/${name}.txt")
+    file(STRINGS "${pkginfo_dir}/${name}.txt" builddate REGEX "builddate = [0-9]+")
+    string(REPLACE "builddate = " "" builddate "${builddate}")
+    set(${out_var} "${builddate}" PARENT_SCOPE)
+endfunction()
+
+function(get_vcpkg_provides out_var name)
+    if(NOT DEFINED Z_VCPKG_MSYS_${name}_ARCHIVE)
+        z_vcpkg_acquire_msys_download_package(Z_VCPKG_MSYS_${name}_ARCHIVE
+            URL "${Z_VCPKG_MSYS_${name}_URL}"
+            SHA512 "${Z_VCPKG_MSYS_${name}_SHA512}"
+            FILENAME "${Z_VCPKG_MSYS_${name}_FILENAME}"
+        )
+        set(Z_VCPKG_MSYS_${name}_ARCHIVE "${Z_VCPKG_MSYS_${name}_ARCHIVE}" PARENT_SCOPE)
+    endif()
+    set(pkginfo_dir "${CURRENT_BUILDTREES_DIR}/vcpkg")
+    file(REMOVE_RECURSE "${pkginfo_dir}/${name}.txt" "${pkginfo_dir}/_tmp")
+    file(MAKE_DIRECTORY "${pkginfo_dir}/_tmp")
+    execute_process(
+        COMMAND "${CMAKE_COMMAND}" -E tar xzf "${Z_VCPKG_MSYS_${name}_ARCHIVE}" .PKGINFO
+        WORKING_DIRECTORY "${pkginfo_dir}/_tmp"
+    )
+    file(RENAME "${pkginfo_dir}/_tmp/.PKGINFO" "${pkginfo_dir}/${name}.txt")
+    file(STRINGS "${pkginfo_dir}/${name}.txt" provides REGEX "provides = .+")
+    string(REPLACE "provides = " "" provides "${provides}")
+    set(${out_var} "${provides}" PARENT_SCOPE)
+endfunction()
+
+function(update_vcpkg_download script_file name new_url)
+    message(STATUS "- Updating vcpkg...")
+    if(NOT new_url MATCHES [[^https://mirror\.msys2\.org/.*/(([^/]*)-[^-/]+-[^-/]+-[^-/]+\.pkg\.tar\.(xz|zst))$]])
+        message(FATAL_ERROR "Supplied URL does not match the expected pattern: ${arg_URL}")
+    endif()
+    set(filename "msys2-${CMAKE_MATCH_1}")
+    vcpkg_download_distfile(archive
+        URLS "${new_url}"
+        FILENAME "${filename}"
+        SKIP_SHA512
+    )
+    execute_process(
+        COMMAND "${CMAKE_COMMAND}" -E sha512sum "${archive}"
+        OUTPUT_VARIABLE sha512
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+    string(REGEX REPLACE " .*" "" sha512 "${sha512}")
+    vcpkg_replace_string("${SCRIPTS}/cmake/${script_file}" "${Z_VCPKG_MSYS_${name}_URL}" "${new_url}")
+    vcpkg_replace_string("${SCRIPTS}/cmake/${script_file}" "${Z_VCPKG_MSYS_${name}_SHA512}" "${sha512}")
+endfunction()
+
+function(pretty_dependencies out_var list_name)
+    foreach(dependency IN LISTS ignored_dependencies)
+        list(TRANSFORM ${list_name} REPLACE "^${dependency}\$" "(${dependency})")
+    endforeach()
+    list(JOIN ${list_name} " " list_string)
+    set(${out_var} "${list_string}" PARENT_SCOPE)
+endfunction()
+
+function(analyze_package_list list_var script)
+    message(STATUS "*** Analyzing packages in '${script}'")
+    vcpkg_list(SET critical)         # Packages which can be upgraded and are fairly old in vcpkg
+    vcpkg_list(SET mismatched_deps)  # Packages which have vcpkg deps different from msys2 deps
+    vcpkg_list(SET missing)          # Packages used in (new) deps but not declared
+    vcpkg_list(SET upgradable)       # Packages which can be upgrade but are fairly fresh in vcpkg
+    vcpkg_list(SET vanished)         # Packages which vanished from the msys2 database
+
+    # Preload details from direct packages
+    foreach(name IN LISTS ${list_var})
+        if(NOT Z_VCPKG_MSYS_${name}_DIRECT)
+            continue()
+        endif()
+        get_vcpkg_provides(vcpkg_provides "${name}")
+        set(Z_VCPKG_MSYS_${name}_PROVIDES "${vcpkg_provides}")
+        foreach(provided IN LISTS vcpkg_provides)
+            set(Z_VCPKG_MSYS_${provided}_PROVIDED_BY "${name}")
+        endforeach()
+    endforeach()
+
+    # msys2.org removes packages 1.75 years after it was removed from the active database,
+    # cf. https://www.msys2.org/docs/faq/#how-long-are-old-packages-kept-on-repomsys2org
+    # We don't know the date of that replacement, and mirrors might use a shorter time.
+    # But we can compare the build date of the package currently downloaded by vcpkg
+    # and the build date of the package in the msys2 database.
+    # If this time span exceeds 'max_age', an update is marked as critical.
+    set(max_age 365) # days
+    math(EXPR minimum_builddate "${now} - 6 * 30 * 24 * 3600")
+    foreach(name IN LISTS ${list_var})
+        if(Z_VCPKG_MSYS_${name}_DIRECT)
+            message(STATUS "${name} (DIRECT)")
+        elseif("DIRECT_ONLY" IN_LIST ARGN)
+            continue()
+        else()
+            message(STATUS "${name}")
+        endif()
+        set(vcpkg_url "${Z_VCPKG_MSYS_${name}_URL}")
+        set(vcpkg_deps "${Z_VCPKG_MSYS_${name}_DEPS}")
+        set(vcpkg_provides "${Z_VCPKG_MSYS_${name}_PROVIDES}")
+
+        set(repo "msys")
+        if(name MATCHES "^mingw-w64-x86_64")
+            set(repo "mingw64")
+        elseif(name MATCHES "^mingw-w64-i686")
+            set(repo "mingw32")
+        elseif(name MATCHES "^mingw-w64-clang-aarch64")
+            set(repo "clangarm64")
+        endif()
+
+        file(GLOB files "${${repo}_repo_files}/${name}-*/desc")
+        set(found 0)
+        foreach(file IN LISTS files)
+            # Find the package
+            file(STRINGS "${file}" desc)
+            if(NOT desc MATCHES "%NAME%;${name};")
+                continue()
+            elseif(NOT desc MATCHES "%FILENAME%;([^;]+)")
+                continue()
+            endif()
+            set(found 1)
+            set(current_url "${${repo}_repo_url}/${CMAKE_MATCH_1}")
+            # Check the URL
+            if(NOT vcpkg_url STREQUAL current_url AND NOT current_url IN_LIST ignored_updates)
+                get_vcpkg_builddate(vcpkg_builddate "${name}")
+                age_in_days(vcpkg_age "${vcpkg_builddate}")
+                pretty_age(vcpkg_age_pretty "${vcpkg_age}")
+                set(current_age "")
+                if(desc MATCHES "%BUILDDATE%;([0-9]+)")
+                    age_in_days(current_age "${CMAKE_MATCH_1}")
+                endif()
+                pretty_age(current_age_string "${current_age}")
+                message(STATUS "- vcpkg: ${vcpkg_url} ${vcpkg_age_pretty}")
+                message(STATUS "+ msys2: ${current_url} ${current_age_string}")
+
+                set(age_diff "0")
+                if(NOT vcpkg_age STREQUAL "" AND NOT current_age STREQUAL "")
+                    math(EXPR age_diff "${current_age} - ${vcpkg_age}")
+                endif()
+                if(age_diff GREATER max_age)
+                    if("update-all" IN_LIST FEATURES)
+                        update_vcpkg_download("${script}" "${name}" "${current_url}")
+                    else()
+                        vcpkg_list(APPEND critical "${name}")
+                    endif()
+                elseif(NOT vcpkg_url STREQUAL current_url)
+                    if("update-all" IN_LIST FEATURES)
+                        update_vcpkg_download("${script}" "${name}" "${current_url}")
+                    else()
+                        vcpkg_list(APPEND upgradable "${name}")
+                    endif()
+                endif()
+            endif()
+            # Check the dependencies
+            if(desc MATCHES "%DEPENDS%;([^%]*)" OR vcpkg_deps)
+                list(JOIN CMAKE_MATCH_1 " " current_deps)
+                separate_arguments(current_deps UNIX_COMMAND "${current_deps}")
+                list(TRANSFORM current_deps REPLACE "[<=>].*" "")
+                list(SORT current_deps)
+                list(SORT vcpkg_deps)
+                pretty_dependencies(current_deps_string current_deps)
+                if(Z_VCPKG_MSYS_${name}_DIRECT AND NOT current_deps STREQUAL "")
+                    message(STATUS "* msys2 dependencies: ${current_deps_string}")
+                elseif(NOT vcpkg_deps STREQUAL current_deps)
+                    pretty_dependencies(vcpkg_deps_string vcpkg_deps)
+                    message(STATUS "- vcpkg dependencies: ${vcpkg_deps_string}")
+                    message(STATUS "+ msys2 dependencies: ${current_deps_string}")
+                    list(REMOVE_ITEM current_deps ${ignored_dependencies})
+                    if(NOT vcpkg_deps STREQUAL current_deps)
+                        vcpkg_list(APPEND mismatched_deps "${name}")
+                    endif()
+                    list(REMOVE_ITEM current_deps ${known_packages} ${${list_var}} ${ignored_dependencies})
+                    set(missing_deps "")
+                    foreach(dep IN LISTS current_deps)
+                        if(NOT DEFINED Z_VCPKG_MSYS_${dep}_PROVIDED_BY)
+                            list(APPEND missing_deps "${dep}")
+                        endif()
+                    endforeach()
+                    if(missing_deps)
+                        list(JOIN missing_deps " " missing_deps_string)
+                        message(STATUS "! unknown dependencies: ${missing_deps_string}")
+                        vcpkg_list(APPEND missing ${missing_deps})
+                    endif()
+                endif()
+            endif()
+            # Check the "provides"
+            if(desc MATCHES "%PROVIDES%;([^%]*)" OR vcpkg_provides)
+                list(JOIN CMAKE_MATCH_1 " " current_provides)
+                separate_arguments(current_provides UNIX_COMMAND "${current_provides}")
+                list(TRANSFORM current_provides REPLACE "[<=>].*" "")
+                list(REMOVE_ITEM current_provides ${ignored_provides})
+                list(JOIN vcpkg_provides " " vcpkg_provides_string)
+                if(NOT vcpkg_provides STREQUAL current_provides)
+                    list(JOIN vcpkg_provides " " vcpkg_provides_string)
+                    list(JOIN current_provides " " current_provides_string)
+                    message(STATUS "- vcpkg provides: ${vcpkg_provides_string}")
+                    message(STATUS "+ msys2 provides: ${current_provides_string}")
+                elseif(NOT vcpkg_provides STREQUAL "")
+                    message(STATUS "* provides: ${vcpkg_provides_string}")
+                endif()
+            endif()
+        endforeach()
+        if(NOT found AND NOT name IN_LIST known_delisted)
+            vcpkg_list(APPEND vanished "${name}")
+            get_vcpkg_builddate(vcpkg_builddate "${name}")
+            age_in_days(vcpkg_age "${vcpkg_builddate}")
+            pretty_age(vcpkg_age_pretty "${vcpkg_age}")
+            message(STATUS "- vcpkg: ${vcpkg_url} ${vcpkg_age_pretty}")
+            message(STATUS "! msys2: no match for ${name}")
+
+            age_in_days(current_age "${now}")
+            set(age_diff "0")
+            if(NOT vcpkg_age STREQUAL "" AND NOT current_age STREQUAL "")
+                math(EXPR age_diff "${current_age} - ${vcpkg_age}")
+            endif()
+            if(age_diff GREATER max_age)
+                vcpkg_list(APPEND critical "${name}")
+            endif()
+        endif()
+    endforeach()
+
+    if(mismatched_deps)
+        list(JOIN mismatched_deps " " mismatched_deps)
+        message(WARNING "The following msys2 packages have changed dependencies: ${mismatched_deps}")
+    endif()
+    if(missing)
+        list(SORT missing)
+        list(REMOVE_DUPLICATES missing)
+        list(JOIN missing " " missing)
+        message(WARNING "The following msys2 packages would be needed to update all dependencies: ${missing}")
+    endif()
+    if(upgradable)
+        list(JOIN upgradable " " upgradable)
+        message(WARNING "The following msys2 packages could be updated: ${upgradable}")
+    endif()
+    if(critical)
+        list(JOIN critical " " critical)
+        message(SEND_ERROR "The following msys2 packages were build more than 6 months ago and should be updated: ${critical}")
+    endif()
+    if(vanished)
+        list(JOIN vanished " " vanished)
+        message(SEND_ERROR "The following msys2 packages are no longer in the database: ${vanished}")
+    endif()
+    message(STATUS "*** Analyzing packages in '${script}' done")
+endfunction()
+
+message(STATUS "*** Downloading current msys2 package lists")
+string(TIMESTAMP stamp "%Y-%m-%d" UTC)
+foreach(repo IN ITEMS msys mingw32 mingw64 clangarm64)
+    string(REPLACE "/" "-" local_file "msys2-${stamp}-${repo}.files")
+    set(archive "${DOWNLOADS}/${local_file}")
+    vcpkg_download_distfile(repo_files_archive
+        URLS "${${repo}_repo_url}/${repo}.files"
+        FILENAME "${local_file}"
+        SKIP_SHA512
+    )
+    vcpkg_extract_source_archive(repo_files
+        ARCHIVE "${repo_files_archive}"
+        NO_REMOVE_ONE_LEVEL
+    )
+    set(${repo}_repo_files "${repo_files}")
+endforeach()
+message(STATUS "*** Downloading current msys2 package lists done")
+
+set(Z_VCPKG_MSYS_PACKAGES_RESOLVED "" CACHE INTERNAL "")
+vcpkg_acquire_msys(msys_root Z_ALL_PACKAGES)
+analyze_package_list(Z_VCPKG_MSYS_PACKAGES_RESOLVED "vcpkg_acquire_msys.cmake")
+set(known_packages "${Z_VCPKG_MSYS_PACKAGES_RESOLVED}")
+
+set(Z_VCPKG_MSYS_PACKAGES_RESOLVED "" CACHE INTERNAL "")
+vcpkg_find_acquire_program(PKGCONFIG)
+vcpkg_acquire_msys(msys_root
+    NO_DEFAULT_PACKAGES
+    Z_DECLARE_EXTRA_PACKAGES_COMMAND "z_vcpkg_find_acquire_pkgconfig_msys_declare_packages"
+    PACKAGES
+        mingw-w64-clang-aarch64-pkgconf
+        mingw-w64-x86_64-pkgconf
+        mingw-w64-i686-pkgconf
+)
+analyze_package_list(Z_VCPKG_MSYS_PACKAGES_RESOLVED "vcpkg_find_acquire_program(PKGCONFIG).cmake")
+
+set(CMAKE_Fortran_COMPILER "")
+if(NOT VCPKG_TARGET_IS_WINDOWS)
+    set(CMAKE_Fortran_COMPILER "true")
+endif()
+set(Z_VCPKG_MSYS_PACKAGES_RESOLVED "" CACHE INTERNAL "")
+include("${SCRIPTS}/cmake/vcpkg_find_fortran.cmake")
+vcpkg_find_fortran(FORTRAN)
+vcpkg_acquire_msys(msys_root
+    NO_DEFAULT_PACKAGES
+    Z_DECLARE_EXTRA_PACKAGES_COMMAND "z_vcpkg_find_fortran_msys_declare_packages"
+    PACKAGES
+        mingw-w64-x86_64-gcc-fortran
+        mingw-w64-i686-gcc-fortran
+)
+analyze_package_list(Z_VCPKG_MSYS_PACKAGES_RESOLVED "vcpkg_find_fortran.cmake")
diff --git a/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-msys2/vcpkg.json b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-msys2/vcpkg.json
new file mode 100644
index 000000000..039d3df81
--- /dev/null
+++ b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-msys2/vcpkg.json
@@ -0,0 +1,12 @@
+{
+  "name": "vcpkg-ci-msys2",
+  "version": "1",
+  "description": "Test vcpkg msys2 freshness",
+  "license": "MIT",
+  "supports": "(windows | mingw) & native",
+  "features": {
+    "update-all": {
+      "description": "Update all outdated packages in vcpkg_acquire_msys.cmake"
+    }
+  }
+}
diff --git a/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-skia/vcpkg.json b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-skia/vcpkg.json
index 9a573f4cf..54a5c2c64 100644
--- a/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-skia/vcpkg.json
+++ b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-skia/vcpkg.json
@@ -1,16 +1,24 @@
 {
   "name": "vcpkg-ci-skia",
-  "version-date": "2022-11-24",
+  "version-date": "2023-12-22",
   "description": "Builds an app in order to validate the skia port.",
   "license": "BSD-3-Clause",
   "dependencies": [
     {
-      "name": "vcpkg-cmake",
-      "host": true
+      "name": "skia",
+      "default-features": false
     },
     {
       "name": "skia",
-      "default-features": false
+      "default-features": false,
+      "features": [
+        "vulkan"
+      ],
+      "platform": "linux | osx | (windows & !uwp)"
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
     }
   ]
 }
diff --git a/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-soci/portfile.cmake b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-soci/portfile.cmake
new file mode 100644
index 000000000..bc785962c
--- /dev/null
+++ b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-soci/portfile.cmake
@@ -0,0 +1,4 @@
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+
+vcpkg_cmake_configure(SOURCE_PATH "${CURRENT_PORT_DIR}/project")
+vcpkg_cmake_build()
diff --git a/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-soci/project/CMakeLists.txt b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-soci/project/CMakeLists.txt
new file mode 100644
index 000000000..31535c1b8
--- /dev/null
+++ b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-soci/project/CMakeLists.txt
@@ -0,0 +1,13 @@
+cmake_minimum_required(VERSION 3.7)
+project(soci-test CXX)
+
+if(APPLE)
+    set(CMAKE_CXX_STANDARD 11)
+endif()
+
+add_executable(main main.cpp)
+
+find_package(SOCI CONFIG REQUIRED)
+target_link_libraries(main PRIVATE $<IF:$<TARGET_EXISTS:SOCI::soci_mysql>,SOCI::soci_mysql,SOCI::soci_mysql_static>)
+target_link_libraries(main PRIVATE $<IF:$<TARGET_EXISTS:SOCI::soci_postgresql>,SOCI::soci_postgresql,SOCI::soci_postgresql_static>)
+target_link_libraries(main PRIVATE $<IF:$<TARGET_EXISTS:SOCI::soci_sqlite3>,SOCI::soci_sqlite3,SOCI::soci_sqlite3_static>)
diff --git a/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-soci/project/main.cpp b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-soci/project/main.cpp
new file mode 100644
index 000000000..86377acc5
--- /dev/null
+++ b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-soci/project/main.cpp
@@ -0,0 +1,11 @@
+#include <soci/soci.h>
+#include <soci/mysql/soci-mysql.h>
+#include <soci/postgresql/soci-postgresql.h>
+#include <soci/sqlite3/soci-sqlite3.h>
+
+int main()
+{
+    soci::session mysql_db(soci::mysql, "test:mysql");
+    soci::session pgsql_db(soci::postgresql, "test:postgresql");
+    soci::session sqlite3_db(soci::sqlite3, "test.db");
+}
diff --git a/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-soci/vcpkg.json b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-soci/vcpkg.json
new file mode 100644
index 000000000..8ff0c2916
--- /dev/null
+++ b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-soci/vcpkg.json
@@ -0,0 +1,20 @@
+{
+  "name": "vcpkg-ci-soci",
+  "version-string": "ci",
+  "description": "Validates soci",
+  "supports": "x64 & (linux | osx | windows) & !uwp",
+  "dependencies": [
+    {
+      "name": "soci",
+      "features": [
+        "mysql",
+        "postgresql",
+        "sqlite3"
+      ]
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/scripts/test_ports/vcpkg-find-acquire-program/portfile.cmake b/external_imported/vcpkg/scripts/test_ports/vcpkg-find-acquire-program/portfile.cmake
index 88a4856c5..f6ce20fef 100644
--- a/external_imported/vcpkg/scripts/test_ports/vcpkg-find-acquire-program/portfile.cmake
+++ b/external_imported/vcpkg/scripts/test_ports/vcpkg-find-acquire-program/portfile.cmake
@@ -1,21 +1,62 @@
-set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
-
-if(CMAKE_HOST_WIN32)
-    foreach(PROG GO JOM NASM PERL YASM GIT PYTHON3 PYTHON2 RUBY 7Z NUGET FLEX BISON GPERF GASPREPROCESSOR DARK SCONS SWIG DOXYGEN ARIA2 PKGCONFIG)
-        vcpkg_find_acquire_program(${PROG})
-        foreach(SUBPROG IN LISTS ${PROG})
-            if(NOT EXISTS "${SUBPROG}")
-                message(FATAL_ERROR "Program ${SUBPROG} did not exist.")
-            endif()
-        endforeach()
-    endforeach()
-endif()
-
-foreach(PROG GN NINJA MESON BAZEL)
-    vcpkg_find_acquire_program(${PROG})
-    foreach(SUBPROG IN LISTS ${PROG})
-        if(NOT EXISTS "${SUBPROG}")
-            message(FATAL_ERROR "Program ${SUBPROG} did not exist.")
-        endif()
-    endforeach()
-endforeach()
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+
+# For each vcpkg_find_acquire_program(NAME).cmake script,
+# there must be a literal call to vcpkg_find_acquire_program(NAME).cmake
+
+set(variables BAZEL BISON FLEX GIT GN NINJA PERL PKGCONFIG PYTHON3 YASM)
+vcpkg_find_acquire_program(BAZEL)
+vcpkg_find_acquire_program(BISON)
+vcpkg_find_acquire_program(FLEX)
+vcpkg_find_acquire_program(GIT)
+vcpkg_find_acquire_program(GN)
+vcpkg_find_acquire_program(NINJA)
+vcpkg_find_acquire_program(PERL)
+vcpkg_find_acquire_program(PKGCONFIG)
+vcpkg_find_acquire_program(PYTHON3)
+vcpkg_find_acquire_program(YASM)
+
+if(NOT VCPKG_TARGET_IS_OSX)
+    # System python too old (3.9; meson needs 3.10)
+    list(APPEND variables MESON)
+    vcpkg_find_acquire_program(MESON)
+endif()
+
+if(VCPKG_HOST_IS_LINUX)
+    list(APPEND variables PATCHELF)
+    vcpkg_find_acquire_program(PATCHELF)
+endif()
+
+if(VCPKG_HOST_IS_WINDOWS)
+    list(APPEND variables 7Z ARIA2 CLANG DARK DOXYGEN GASPREPROCESSOR GO GPERF JOM NASM NUGET PYTHON2 RUBY SCONS SWIG)
+    vcpkg_find_acquire_program(7Z)
+    vcpkg_find_acquire_program(ARIA2)
+    vcpkg_find_acquire_program(CLANG)
+    vcpkg_find_acquire_program(DARK)
+    vcpkg_find_acquire_program(DOXYGEN)
+    vcpkg_find_acquire_program(GASPREPROCESSOR)
+    vcpkg_find_acquire_program(GO)
+    vcpkg_find_acquire_program(GPERF)
+    vcpkg_find_acquire_program(JOM)
+    vcpkg_find_acquire_program(NASM)
+    vcpkg_find_acquire_program(NUGET)
+    vcpkg_find_acquire_program(PYTHON2)
+    vcpkg_find_acquire_program(RUBY)
+    vcpkg_find_acquire_program(SCONS)
+    vcpkg_find_acquire_program(SWIG)
+endif()
+
+set(missing "")
+foreach(variable IN LISTS variables)
+    list(POP_BACK "${variable}" program)
+    if(NOT EXISTS "${program}")
+        list(APPEND missing "${variable}: ${program}")
+    endif()
+    list(POP_FRONT "${variable}" interpreter)
+    if(interpreter AND NOT EXISTS "${interpreter}")
+        list(APPEND missing "${variable} (interpreter): ${interpreter}")
+    endif()
+endforeach()
+if(missing)
+    list(JOIN missing "\n   " missing)
+    message(FATAL_ERROR "The following programs do not exist:\n   ${missing}")
+endif()
diff --git a/external_imported/vcpkg/scripts/test_ports/vcpkg-find-acquire-program/vcpkg.json b/external_imported/vcpkg/scripts/test_ports/vcpkg-find-acquire-program/vcpkg.json
index 987003b4c..fb9166ef5 100644
--- a/external_imported/vcpkg/scripts/test_ports/vcpkg-find-acquire-program/vcpkg.json
+++ b/external_imported/vcpkg/scripts/test_ports/vcpkg-find-acquire-program/vcpkg.json
@@ -3,5 +3,5 @@
   "version-string": "0",
   "port-version": 1,
   "description": "Test port to exercise vcpkg_find_acquire_program",
-  "supports": "windows"
+  "supports": "native"
 }
diff --git a/external_imported/vcpkg/scripts/toolchains/android.cmake b/external_imported/vcpkg/scripts/toolchains/android.cmake
index fb4e66cd6..c8243ff1f 100644
--- a/external_imported/vcpkg/scripts/toolchains/android.cmake
+++ b/external_imported/vcpkg/scripts/toolchains/android.cmake
@@ -9,25 +9,6 @@ else()
 endif()
 set(CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION clang CACHE STRING "")
 
-if (VCPKG_TARGET_TRIPLET MATCHES "arm64-android")
-    set(ANDROID_ABI arm64-v8a CACHE STRING "")
-elseif(VCPKG_TARGET_TRIPLET MATCHES "armv6-android")
-    set(ANDROID_ABI armeabi CACHE STRING "")
-    set(ANDROID_ARM_MODE arm CACHE STRING "")
-elseif(VCPKG_TARGET_TRIPLET MATCHES "arm-neon-android")
-    set(ANDROID_ABI armeabi-v7a CACHE STRING "")
-    set(ANDROID_ARM_NEON ON CACHE BOOL "")
-elseif(VCPKG_TARGET_TRIPLET MATCHES "arm-android")
-    set(ANDROID_ABI armeabi-v7a CACHE STRING "")
-    set(ANDROID_ARM_NEON OFF CACHE BOOL "")
-elseif(VCPKG_TARGET_TRIPLET MATCHES "x64-android")
-    set(ANDROID_ABI x86_64 CACHE STRING "")
-elseif(VCPKG_TARGET_TRIPLET MATCHES "x86-android")
-    set(ANDROID_ABI x86 CACHE STRING "")
-else()
-    message(FATAL_ERROR "Unknown ABI for target triplet ${VCPKG_TARGET_TRIPLET}")
-endif()
-
 if (VCPKG_CRT_LINKAGE STREQUAL "dynamic")
     set(ANDROID_STL c++_shared CACHE STRING "")
 else()
@@ -61,10 +42,13 @@ if(NOT _VCPKG_ANDROID_TOOLCHAIN)
         string(APPEND CMAKE_C_FLAGS_RELEASE " ${VCPKG_C_FLAGS_RELEASE} ")
         string(APPEND CMAKE_CXX_FLAGS_RELEASE " ${VCPKG_CXX_FLAGS_RELEASE} ")
 
+        string(APPEND CMAKE_MODULE_LINKER_FLAGS " ${VCPKG_LINKER_FLAGS} ")
         string(APPEND CMAKE_SHARED_LINKER_FLAGS " ${VCPKG_LINKER_FLAGS} ")
         string(APPEND CMAKE_EXE_LINKER_FLAGS " ${VCPKG_LINKER_FLAGS} ")
+        string(APPEND CMAKE_MODULE_LINKER_FLAGS_DEBUG " ${VCPKG_LINKER_FLAGS_DEBUG} ")
         string(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG " ${VCPKG_LINKER_FLAGS_DEBUG} ")
         string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG " ${VCPKG_LINKER_FLAGS_DEBUG} ")
+        string(APPEND CMAKE_MODULE_LINKER_FLAGS_RELEASE " ${VCPKG_LINKER_FLAGS_RELEASE} ")
         string(APPEND CMAKE_SHARED_LINKER_FLAGS_RELEASE " ${VCPKG_LINKER_FLAGS_RELEASE} ")
         string(APPEND CMAKE_EXE_LINKER_FLAGS_RELEASE " ${VCPKG_LINKER_FLAGS_RELEASE} ")
     endif()
diff --git a/external_imported/vcpkg/scripts/toolchains/freebsd.cmake b/external_imported/vcpkg/scripts/toolchains/freebsd.cmake
index 4b1cc3e8c..016b2f152 100644
--- a/external_imported/vcpkg/scripts/toolchains/freebsd.cmake
+++ b/external_imported/vcpkg/scripts/toolchains/freebsd.cmake
@@ -14,10 +14,13 @@ if(NOT _CMAKE_IN_TRY_COMPILE)
     string(APPEND CMAKE_C_FLAGS_RELEASE_INIT " ${VCPKG_C_FLAGS_RELEASE} ")
     string(APPEND CMAKE_CXX_FLAGS_RELEASE_INIT " ${VCPKG_CXX_FLAGS_RELEASE} ")
 
+    string(APPEND CMAKE_MODULE_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ")
     string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ")
     string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ")
+    string(APPEND CMAKE_MODULE_LINKER_FLAGS_DEBUG_INIT " ${VCPKG_LINKER_FLAGS_DEBUG} ")
     string(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT " ${VCPKG_LINKER_FLAGS_DEBUG} ")
     string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT " ${VCPKG_LINKER_FLAGS_DEBUG} ")
+    string(APPEND CMAKE_MODULE_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ")
     string(APPEND CMAKE_SHARED_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ")
     string(APPEND CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ")
 endif()
diff --git a/external_imported/vcpkg/scripts/toolchains/ios.cmake b/external_imported/vcpkg/scripts/toolchains/ios.cmake
index f173662c0..d9c3f8a31 100644
--- a/external_imported/vcpkg/scripts/toolchains/ios.cmake
+++ b/external_imported/vcpkg/scripts/toolchains/ios.cmake
@@ -50,10 +50,13 @@ if(NOT _VCPKG_IOS_TOOLCHAIN)
         string(APPEND CMAKE_C_FLAGS_RELEASE_INIT " ${VCPKG_C_FLAGS_RELEASE} ")
         string(APPEND CMAKE_CXX_FLAGS_RELEASE_INIT " ${VCPKG_CXX_FLAGS_RELEASE} ")
 
+        string(APPEND CMAKE_MODULE_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ")
         string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ")
         string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ")
+        string(APPEND CMAKE_MODULE_LINKER_FLAGS_DEBUG_INIT " ${VCPKG_LINKER_FLAGS_DEBUG} ")
         string(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT " ${VCPKG_LINKER_FLAGS_DEBUG} ")
         string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT " ${VCPKG_LINKER_FLAGS_DEBUG} ")
+        string(APPEND CMAKE_MODULE_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ")
         string(APPEND CMAKE_SHARED_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ")
         string(APPEND CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ")
     endif()
diff --git a/external_imported/vcpkg/scripts/toolchains/linux.cmake b/external_imported/vcpkg/scripts/toolchains/linux.cmake
index 2fac4922d..f22c71076 100644
--- a/external_imported/vcpkg/scripts/toolchains/linux.cmake
+++ b/external_imported/vcpkg/scripts/toolchains/linux.cmake
@@ -10,9 +10,10 @@ elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
    set(CMAKE_SYSTEM_PROCESSOR x86 CACHE STRING "")
    string(APPEND VCPKG_C_FLAGS " -m32")
    string(APPEND VCPKG_CXX_FLAGS " -m32")
+   string(APPEND VCPKG_LINKER_FLAGS " -m32")
 elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
     set(CMAKE_SYSTEM_PROCESSOR armv7l CACHE STRING "")
-    if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64")
+    if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
         if(NOT DEFINED CMAKE_CXX_COMPILER)
             set(CMAKE_CXX_COMPILER "arm-linux-gnueabihf-g++")
         endif()
@@ -24,12 +25,12 @@ elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
         endif()
         if(NOT DEFINED CMAKE_ASM-ATT_COMPILER)
             set(CMAKE_ASM-ATT_COMPILER "arm-linux-gnueabihf-as")
-        endif()      
-        message(STATUS "Cross compiling arm on host x86_64, use cross compiler: ${CMAKE_CXX_COMPILER}/${CMAKE_C_COMPILER}")
+        endif()
+        message(STATUS "Cross compiling arm on host ${CMAKE_HOST_SYSTEM_PROCESSOR}, use cross compiler: ${CMAKE_CXX_COMPILER}/${CMAKE_C_COMPILER}")
     endif()
 elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
     set(CMAKE_SYSTEM_PROCESSOR aarch64 CACHE STRING "")
-    if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux"  AND CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64")
+    if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
         if(NOT DEFINED CMAKE_CXX_COMPILER)
             set(CMAKE_CXX_COMPILER "aarch64-linux-gnu-g++")
         endif()
@@ -41,8 +42,8 @@ elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
         endif()
         if(NOT DEFINED CMAKE_ASM-ATT_COMPILER)
             set(CMAKE_ASM-ATT_COMPILER "aarch64-linux-gnu-as")
-        endif()  
-        message(STATUS "Cross compiling arm64 on host x86_64, use cross compiler: ${CMAKE_CXX_COMPILER}/${CMAKE_C_COMPILER}")
+        endif()
+        message(STATUS "Cross compiling arm64 on host ${CMAKE_HOST_SYSTEM_PROCESSOR}, use cross compiler: ${CMAKE_CXX_COMPILER}/${CMAKE_C_COMPILER}")
     endif()
 endif()
 
@@ -55,14 +56,18 @@ if(NOT _CMAKE_IN_TRY_COMPILE)
     string(APPEND CMAKE_C_FLAGS_RELEASE_INIT " ${VCPKG_C_FLAGS_RELEASE} ")
     string(APPEND CMAKE_CXX_FLAGS_RELEASE_INIT " ${VCPKG_CXX_FLAGS_RELEASE} ")
 
+    string(APPEND CMAKE_MODULE_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ")
     string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ")
     string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ")
     if(VCPKG_CRT_LINKAGE STREQUAL "static")
+        string(APPEND CMAKE_MODULE_LINKER_FLAGS_INIT "-static ")
         string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT "-static ")
         string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT "-static ")
     endif()
+    string(APPEND CMAKE_MODULE_LINKER_FLAGS_DEBUG_INIT " ${VCPKG_LINKER_FLAGS_DEBUG} ")
     string(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT " ${VCPKG_LINKER_FLAGS_DEBUG} ")
     string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT " ${VCPKG_LINKER_FLAGS_DEBUG} ")
+    string(APPEND CMAKE_MODULE_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ")
     string(APPEND CMAKE_SHARED_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ")
     string(APPEND CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ")
 endif()
diff --git a/external_imported/vcpkg/scripts/toolchains/mingw.cmake b/external_imported/vcpkg/scripts/toolchains/mingw.cmake
index 195e337f7..eead4b1f0 100644
--- a/external_imported/vcpkg/scripts/toolchains/mingw.cmake
+++ b/external_imported/vcpkg/scripts/toolchains/mingw.cmake
@@ -37,14 +37,18 @@ if(NOT _CMAKE_IN_TRY_COMPILE)
     string(APPEND CMAKE_C_FLAGS_RELEASE_INIT " ${VCPKG_C_FLAGS_RELEASE} ")
     string(APPEND CMAKE_CXX_FLAGS_RELEASE_INIT " ${VCPKG_CXX_FLAGS_RELEASE} ")
 
+    string(APPEND CMAKE_MODULE_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ")
     string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ")
     string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ")
     if(VCPKG_CRT_LINKAGE STREQUAL "static")
+        string(APPEND CMAKE_MODULE_LINKER_FLAGS_INIT "-static ")
         string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT "-static ")
         string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT "-static ")
     endif()
+    string(APPEND CMAKE_MODULE_LINKER_FLAGS_DEBUG_INIT " ${VCPKG_LINKER_FLAGS_DEBUG} ")
     string(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT " ${VCPKG_LINKER_FLAGS_DEBUG} ")
     string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT " ${VCPKG_LINKER_FLAGS_DEBUG} ")
+    string(APPEND CMAKE_MODULE_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ")
     string(APPEND CMAKE_SHARED_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ")
     string(APPEND CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ")
 endif()
diff --git a/external_imported/vcpkg/scripts/toolchains/openbsd.cmake b/external_imported/vcpkg/scripts/toolchains/openbsd.cmake
index 9eb8f3a0b..d606e8307 100644
--- a/external_imported/vcpkg/scripts/toolchains/openbsd.cmake
+++ b/external_imported/vcpkg/scripts/toolchains/openbsd.cmake
@@ -22,10 +22,13 @@ if(NOT _CMAKE_IN_TRY_COMPILE)
     string(APPEND CMAKE_C_FLAGS_RELEASE_INIT " ${VCPKG_C_FLAGS_RELEASE} ")
     string(APPEND CMAKE_CXX_FLAGS_RELEASE_INIT " ${VCPKG_CXX_FLAGS_RELEASE} ")
 
+    string(APPEND CMAKE_MODULE_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ")
     string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ")
     string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ")
+    string(APPEND CMAKE_MODULE_LINKER_FLAGS_DEBUG_INIT " ${VCPKG_LINKER_FLAGS_DEBUG} ")
     string(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT " ${VCPKG_LINKER_FLAGS_DEBUG} ")
     string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT " ${VCPKG_LINKER_FLAGS_DEBUG} ")
+    string(APPEND CMAKE_MODULE_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ")
     string(APPEND CMAKE_SHARED_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ")
     string(APPEND CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ")
 endif(NOT _CMAKE_IN_TRY_COMPILE)
diff --git a/external_imported/vcpkg/scripts/toolchains/osx.cmake b/external_imported/vcpkg/scripts/toolchains/osx.cmake
index 56a32b669..4066d3924 100644
--- a/external_imported/vcpkg/scripts/toolchains/osx.cmake
+++ b/external_imported/vcpkg/scripts/toolchains/osx.cmake
@@ -43,10 +43,13 @@ if(NOT _CMAKE_IN_TRY_COMPILE)
     string(APPEND CMAKE_C_FLAGS_RELEASE_INIT " ${VCPKG_C_FLAGS_RELEASE} ")
     string(APPEND CMAKE_CXX_FLAGS_RELEASE_INIT " ${VCPKG_CXX_FLAGS_RELEASE} ")
 
+    string(APPEND CMAKE_MODULE_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ")
     string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ")
     string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ")
+    string(APPEND CMAKE_MODULE_LINKER_FLAGS_DEBUG_INIT " ${VCPKG_LINKER_FLAGS_DEBUG} ")
     string(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT " ${VCPKG_LINKER_FLAGS_DEBUG} ")
     string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT " ${VCPKG_LINKER_FLAGS_DEBUG} ")
+    string(APPEND CMAKE_MODULE_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ")
     string(APPEND CMAKE_SHARED_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ")
     string(APPEND CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ")
 endif()
diff --git a/external_imported/vcpkg/scripts/toolchains/uwp.cmake b/external_imported/vcpkg/scripts/toolchains/uwp.cmake
index 465610878..9da602287 100644
--- a/external_imported/vcpkg/scripts/toolchains/uwp.cmake
+++ b/external_imported/vcpkg/scripts/toolchains/uwp.cmake
@@ -1,6 +1,7 @@
 if(NOT _VCPKG_WINDOWS_TOOLCHAIN)
 set(_VCPKG_WINDOWS_TOOLCHAIN 1)
 set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>$<$<STREQUAL:${VCPKG_CRT_LINKAGE},dynamic>:DLL>" CACHE STRING "")
+set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "")
 
 set(CMAKE_SYSTEM_NAME WindowsStore CACHE STRING "")
 
@@ -27,6 +28,10 @@ endif()
 get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE )
 if(NOT _CMAKE_IN_TRY_COMPILE)
 
+    if(NOT (DEFINED VCPKG_MSVC_CXX_WINRT_EXTENSIONS))
+        set(VCPKG_MSVC_CXX_WINRT_EXTENSIONS ON)
+    endif()
+
     if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
         set(VCPKG_CRT_LINK_FLAG_PREFIX "/MD")
     elseif(VCPKG_CRT_LINKAGE STREQUAL "static")
@@ -41,14 +46,22 @@ if(NOT _CMAKE_IN_TRY_COMPILE)
         set(CHARSET_FLAG)
     endif()
 
+    set(MP_BUILD_FLAG "")
+    if(NOT (CMAKE_CXX_COMPILER MATCHES "clang-cl.exe"))
+        set(MP_BUILD_FLAG "/MP")
+    endif()
+
     set(_vcpkg_cpp_flags "/DWIN32 /D_WINDOWS /D_UNICODE /DUNICODE /DWINAPI_FAMILY=WINAPI_FAMILY_APP /D__WRL_NO_DEFAULT_LIB__" ) # VS adds /D "_WINDLL" for DLLs;
-    set(_vcpkg_common_flags "/nologo /Z7 /MP /GS /Gd /Gm- /W3 /WX- /Zc:wchar_t /Zc:inline /Zc:forScope /fp:precise /Oy- /EHsc")
+    set(_vcpkg_common_flags "/nologo /Z7 ${MP_BUILD_FLAG} /GS /Gd /Gm- /W3 /WX- /Zc:wchar_t /Zc:inline /Zc:forScope /fp:precise /Oy- /EHsc")
+
     #/ZW:nostdlib -> ZW is added by CMake # VS also normally adds /sdl but not cmake MSBUILD
     set(_vcpkg_winmd_flag "")
-    file(TO_CMAKE_PATH "$ENV{VCToolsInstallDir}" _vcpkg_vctools)
-    set(ENV{_CL_} "/FU\"${_vcpkg_vctools}/lib/x86/store/references/platform.winmd\" $ENV{_CL_}")
-    # CMake has problems to correctly pass this in the compiler test so probably need special care in get_cmake_vars
-    #set(_vcpkg_winmd_flag "/FU\\\\\"${_vcpkg_vctools}/lib/x86/store/references/platform.winmd\\\\\"") # VS normally passes /ZW for Apps
+    if(VCPKG_MSVC_CXX_WINRT_EXTENSIONS)
+        file(TO_CMAKE_PATH "$ENV{VCToolsInstallDir}" _vcpkg_vctools)
+        set(ENV{_CL_} "/FU\"${_vcpkg_vctools}/lib/x86/store/references/platform.winmd\" $ENV{_CL_}")
+        # CMake has problems to correctly pass this in the compiler test so probably need special care in get_cmake_vars
+        #set(_vcpkg_winmd_flag "/FU\\\\\"${_vcpkg_vctools}/lib/x86/store/references/platform.winmd\\\\\"") # VS normally passes /ZW for Apps
+    endif()
 
     set(CMAKE_CXX_FLAGS "${_vcpkg_cpp_flags} ${_vcpkg_common_flags} ${_vcpkg_winmd_flag} ${CHARSET_FLAG} ${VCPKG_CXX_FLAGS}" CACHE STRING "")
     set(CMAKE_C_FLAGS "${_vcpkg_cpp_flags} ${_vcpkg_common_flags} ${_vcpkg_winmd_flag} ${CHARSET_FLAG} ${VCPKG_C_FLAGS}" CACHE STRING "")
@@ -67,16 +80,22 @@ if(NOT _CMAKE_IN_TRY_COMPILE)
 
     string(APPEND CMAKE_STATIC_LINKER_FLAGS_RELEASE_INIT " /nologo ") # VS adds /LTCG
 
-    if(CMAKE_GENERATOR MATCHES "Ninja")
-        set(additional_exe_flags "/WINMD") # VS Generator chokes on this in the compiler detection
+    if(VCPKG_MSVC_CXX_WINRT_EXTENSIONS)
+        set(additional_dll_flags "/WINMD:NO")
+        if(CMAKE_GENERATOR MATCHES "Ninja")
+            set(additional_exe_flags "/WINMD") # VS Generator chokes on this in the compiler detection
+        endif()
     endif()
-    string(APPEND CMAKE_SHARED_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE /DEBUG /WINMD:NO /APPCONTAINER /SUBSYSTEM:CONSOLE /MANIFESTUAC:NO ${VCPKG_LINKER_FLAGS}")
+    string(APPEND CMAKE_MODULE_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE /DEBUG ${additional_dll_flags} /APPCONTAINER /SUBSYSTEM:CONSOLE /MANIFESTUAC:NO ${VCPKG_LINKER_FLAGS}")
+    string(APPEND CMAKE_SHARED_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE /DEBUG ${additional_dll_flags} /APPCONTAINER /SUBSYSTEM:CONSOLE /MANIFESTUAC:NO ${VCPKG_LINKER_FLAGS}")
     # VS adds /DEBUG:FULL /TLBID:1.    WindowsApp.lib is in CMAKE_C|CXX_STANDARD_LIBRARIES
     string(APPEND CMAKE_EXE_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE /DEBUG ${additional_exe_flags} /APPCONTAINER /MANIFESTUAC:NO ${VCPKG_LINKER_FLAGS}")
 
+    set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF ${VCPKG_LINKER_FLAGS_RELEASE}" CACHE STRING "") # VS uses /LTCG:incremental
     set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF ${VCPKG_LINKER_FLAGS_RELEASE}" CACHE STRING "") # VS uses /LTCG:incremental
     set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF ${VCPKG_LINKER_FLAGS_RELEASE}" CACHE STRING "")
     string(APPEND CMAKE_STATIC_LINKER_FLAGS_DEBUG_INIT " /nologo ")
+    string(APPEND CMAKE_MODULE_LINKER_FLAGS_DEBUG_INIT " /nologo ")
     string(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT " /nologo ")
     string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT " /nologo ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_DEBUG} ")
 endif()
diff --git a/external_imported/vcpkg/scripts/toolchains/windows.cmake b/external_imported/vcpkg/scripts/toolchains/windows.cmake
index 03a142bab..559d5c551 100644
--- a/external_imported/vcpkg/scripts/toolchains/windows.cmake
+++ b/external_imported/vcpkg/scripts/toolchains/windows.cmake
@@ -1,6 +1,7 @@
 if(NOT _VCPKG_WINDOWS_TOOLCHAIN)
 set(_VCPKG_WINDOWS_TOOLCHAIN 1)
 set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>$<$<STREQUAL:${VCPKG_CRT_LINKAGE},dynamic>:DLL>" CACHE STRING "")
+set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "")
 
 set(CMAKE_SYSTEM_NAME Windows CACHE STRING "")
 
@@ -51,8 +52,13 @@ if(NOT _CMAKE_IN_TRY_COMPILE)
         set(CHARSET_FLAG)
     endif()
 
-    set(CMAKE_CXX_FLAGS " /nologo /DWIN32 /D_WINDOWS /W3 ${CHARSET_FLAG} /GR /EHsc /MP ${VCPKG_CXX_FLAGS}" CACHE STRING "")
-    set(CMAKE_C_FLAGS " /nologo /DWIN32 /D_WINDOWS /W3 ${CHARSET_FLAG} /MP ${VCPKG_C_FLAGS}" CACHE STRING "")
+    set(MP_BUILD_FLAG "")
+    if(NOT (CMAKE_CXX_COMPILER MATCHES "clang-cl.exe"))
+        set(MP_BUILD_FLAG "/MP")
+    endif()
+
+    set(CMAKE_CXX_FLAGS " /nologo /DWIN32 /D_WINDOWS /W3 ${CHARSET_FLAG} /GR /EHsc ${MP_BUILD_FLAG} ${VCPKG_CXX_FLAGS}" CACHE STRING "")
+    set(CMAKE_C_FLAGS " /nologo /DWIN32 /D_WINDOWS /W3 ${CHARSET_FLAG} ${MP_BUILD_FLAG} ${VCPKG_C_FLAGS}" CACHE STRING "")
 
     if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64ec")
         string(APPEND CMAKE_CXX_FLAGS " /arm64EC /D_AMD64_ /DAMD64 /D_ARM64EC_ /DARM64EC")
@@ -68,10 +74,12 @@ if(NOT _CMAKE_IN_TRY_COMPILE)
     set(CMAKE_C_FLAGS_RELEASE "${VCPKG_CRT_LINK_FLAG_PREFIX} /O2 /Oi /Gy /DNDEBUG /Z7 ${VCPKG_C_FLAGS_RELEASE}" CACHE STRING "")
 
     string(APPEND CMAKE_STATIC_LINKER_FLAGS_RELEASE_INIT " /nologo ")
+    set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "/nologo /DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_RELEASE}" CACHE STRING "")
     set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "/nologo /DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_RELEASE}" CACHE STRING "")
     set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/nologo /DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_RELEASE}" CACHE STRING "")
 
     string(APPEND CMAKE_STATIC_LINKER_FLAGS_DEBUG_INIT " /nologo ")
+    string(APPEND CMAKE_MODULE_LINKER_FLAGS_DEBUG_INIT " /nologo ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_DEBUG} ")
     string(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT " /nologo ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_DEBUG} ")
     string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT " /nologo ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_DEBUG} ")
 endif()
diff --git a/external_imported/vcpkg/scripts/toolchains/xbox.cmake b/external_imported/vcpkg/scripts/toolchains/xbox.cmake
index f79d7b343..b1b2eb1d3 100644
--- a/external_imported/vcpkg/scripts/toolchains/xbox.cmake
+++ b/external_imported/vcpkg/scripts/toolchains/xbox.cmake
@@ -1,6 +1,7 @@
 if(NOT _VCPKG_WINDOWS_TOOLCHAIN)
 set(_VCPKG_WINDOWS_TOOLCHAIN 1)
 set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>$<$<STREQUAL:${VCPKG_CRT_LINKAGE},dynamic>:DLL>" CACHE STRING "")
+set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "")
 
 set(CMAKE_SYSTEM_NAME Windows CACHE STRING "")
 
@@ -12,18 +13,17 @@ endif()
 
 if(DEFINED VCPKG_CMAKE_SYSTEM_VERSION)
     set(CMAKE_SYSTEM_VERSION "${VCPKG_CMAKE_SYSTEM_VERSION}" CACHE STRING "" FORCE)
+else()
+    set(CMAKE_SYSTEM_VERSION "10.0" CACHE STRING "" FORCE)
 endif()
 
 set(CMAKE_CROSSCOMPILING ON CACHE STRING "")
 
-if(NOT DEFINED CMAKE_SYSTEM_VERSION)
-    set(CMAKE_SYSTEM_VERSION "${CMAKE_HOST_SYSTEM_VERSION}" CACHE STRING "")
-endif()
-
 # Add the Microsoft GDK if present
 if (DEFINED ENV{GRDKLatest})
     cmake_path(SET _vcpkg_grdk "$ENV{GRDKLatest}")
 
+    list(APPEND CMAKE_REQUIRED_INCLUDES "${_vcpkg_grdk}/gameKit/Include")
     include_directories(BEFORE SYSTEM "${_vcpkg_grdk}/gameKit/Include")
     cmake_path(CONVERT "${_vcpkg_grdk}/gameKit/Include" TO_NATIVE_PATH_LIST _vcpkg_inc NORMALIZE)
 
@@ -36,12 +36,14 @@ if (DEFINED ENV{GXDKLatest})
     cmake_path(SET _vcpkg_gxdk "$ENV{GXDKLatest}")
 
     if(XBOX_CONSOLE_TARGET STREQUAL "scarlett")
+        list(APPEND CMAKE_REQUIRED_INCLUDES "${_vcpkg_gxdk}/gameKit/Include" "${_vcpkg_gxdk}/gameKit/Include/Scarlett")
         include_directories(BEFORE SYSTEM "${_vcpkg_gxdk}/gameKit/Include" "${_vcpkg_gxdk}/gameKit/Include/Scarlett")
         cmake_path(CONVERT "${_vcpkg_gxdk}/gameKit/Include;${_vcpkg_gxdk}/gameKit/Include/Scarlett" TO_NATIVE_PATH_LIST _vcpkg_inc NORMALIZE)
 
         link_directories(BEFORE SYSTEM "${_vcpkg_gxdk}/gameKit/Lib/amd64" "${_vcpkg_gxdk}/gameKit/Include/Lib/amd64/Scarlett")
         cmake_path(CONVERT "${_vcpkg_gxdk}/gameKit/Lib/amd64;${_vcpkg_gxdk}/gameKit/Include/Lib/amd64/Scarlett" TO_NATIVE_PATH_LIST _vcpkg_lib NORMALIZE)
     elseif(XBOX_CONSOLE_TARGET STREQUAL "xboxone")
+        list(APPEND CMAKE_REQUIRED_INCLUDES "${_vcpkg_gxdk}/gameKit/Include" "${_vcpkg_gxdk}/gameKit/Include/XboxOne")
         include_directories(BEFORE SYSTEM "${_vcpkg_gxdk}/gameKit/Include" "${_vcpkg_gxdk}/gameKit/Include/XboxOne")
         cmake_path(CONVERT "${_vcpkg_gxdk}/gameKit/Include;${_vcpkg_gxdk}/gameKit/Include/XboxOne" TO_NATIVE_PATH_LIST _vcpkg_inc NORMALIZE)
 
@@ -64,8 +66,13 @@ if(NOT _CMAKE_IN_TRY_COMPILE)
     set(_vcpkg_core_libs onecore_apiset.lib)
     set(_vcpkg_default_lib onecore_apiset.lib)
 
+    set(MP_BUILD_FLAG "")
+    if(NOT (CMAKE_CXX_COMPILER MATCHES "clang-cl.exe"))
+        set(MP_BUILD_FLAG "/MP")
+    endif()
+
     set(_vcpkg_cpp_flags "/DWIN32 /D_WINDOWS /D_UNICODE /DUNICODE /DWINAPI_FAMILY=WINAPI_FAMILY_GAMES /D_WIN32_WINNT=0x0A00 /D_ATL_NO_DEFAULT_LIBS /D__WRL_NO_DEFAULT_LIB__ /D__WRL_CLASSIC_COM_STRICT__ /D_UITHREADCTXT_SUPPORT=0 /D_CRT_USE_WINAPI_PARTITION_APP")
-    set(_vcpkg_common_flags "/nologo /Z7 /MP /GS /Gd /W3 /WX- /Zc:wchar_t /Zc:inline /Zc:forScope /fp:precise /Oy- /EHsc /utf-8")
+    set(_vcpkg_common_flags "/nologo /Z7 ${MP_BUILD_FLAG} /GS /Gd /W3 /WX- /Zc:wchar_t /Zc:inline /Zc:forScope /fp:precise /Oy- /EHsc /utf-8")
 
     # Add the Microsoft GDK if present
     if (DEFINED _vcpkg_grdk)
@@ -134,6 +141,7 @@ if(NOT _CMAKE_IN_TRY_COMPILE)
     # Some upstream projects don't respect STANDARD_LIBRARIES_INIT and rely on default libs instead.
     set(_vcpkg_common_lflags "/MANIFEST:NO /NXCOMPAT /DYNAMICBASE /DEBUG /MANIFESTUAC:NO /SUBSYSTEM:WINDOWS,10.0 /DEFAULTLIB:${_vcpkg_default_lib}")
 
+    string(APPEND CMAKE_MODULE_LINKER_FLAGS " ${_vcpkg_common_lflags} ${VCPKG_LINKER_FLAGS} ${_vcpkg_nodefaultlib}")
     string(APPEND CMAKE_SHARED_LINKER_FLAGS " ${_vcpkg_common_lflags} ${VCPKG_LINKER_FLAGS} ${_vcpkg_nodefaultlib}")
     string(APPEND CMAKE_EXE_LINKER_FLAGS " ${_vcpkg_common_lflags} ${VCPKG_LINKER_FLAGS} ${_vcpkg_nodefaultlib}")
 
@@ -142,9 +150,11 @@ if(NOT _CMAKE_IN_TRY_COMPILE)
     unset(_vcpkg_default_lib)
     unset(_vcpkg_common_lflags)
 
+    set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF ${VCPKG_LINKER_FLAGS_RELEASE}" CACHE STRING "")
     set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF ${VCPKG_LINKER_FLAGS_RELEASE}" CACHE STRING "")
     set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF ${VCPKG_LINKER_FLAGS_RELEASE}" CACHE STRING "")
     string(APPEND CMAKE_STATIC_LINKER_FLAGS_DEBUG_INIT " /nologo ")
+    string(APPEND CMAKE_MODULE_LINKER_FLAGS_DEBUG_INIT " /nologo ")
     string(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT " /nologo ")
     string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT " /nologo ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_DEBUG} ")
 endif()
diff --git a/external_imported/vcpkg/scripts/update-vcpkg-tool-metadata.ps1 b/external_imported/vcpkg/scripts/update-vcpkg-tool-metadata.ps1
new file mode 100644
index 000000000..aafcc6141
--- /dev/null
+++ b/external_imported/vcpkg/scripts/update-vcpkg-tool-metadata.ps1
@@ -0,0 +1,75 @@
+[CmdletBinding()]
+Param(
+    [Parameter(Mandatory=$true)]
+    [ValidateNotNullOrEmpty()]
+    [string]$Date
+)
+
+function Get-Sha256 {
+    Param([string]$File)
+    $content = [System.IO.File]::ReadAllBytes($File)
+    $shaHasher = $null
+    [string]$shaHash = ''
+    try {
+        $shaHasher = [System.Security.Cryptography.SHA256]::Create()
+        $hashBytes = $shaHasher.ComputeHash($content)
+        $shaHash = [System.BitConverter]::ToString($hashBytes).Replace('-', '').ToLowerInvariant()
+    } finally {
+        if ($shaHasher -ne $null) {
+            $shaHasher.Dispose();
+        }
+    }
+
+    return $shaHash
+}
+
+[string]$metadata = "VCPKG_TOOL_RELEASE_TAG=$Date`n"
+$vsCodeHashes = [ordered]@{}
+Set-Content -LiteralPath "$PSScriptRoot\vcpkg-tool-metadata.txt" -Value $metadata -NoNewline -Encoding utf8NoBOM
+& "$PSScriptRoot\bootstrap.ps1"
+[string]$vcpkg = "$PSScriptRoot\..\vcpkg.exe"
+
+# Windows arm64 (VS Code only)
+& $vcpkg x-download "$PSScriptRoot\vcpkg-arm64.exe" `
+    "--url=https://github.com/microsoft/vcpkg-tool/releases/download/$Date/vcpkg-arm64.exe" --skip-sha512
+$vsCodeHashes["vcpkg-arm64.exe"] = Get-Sha256 "$PSScriptRoot\vcpkg-arm64.exe"
+
+# Linux Binaries
+foreach ($binary in @('macos', 'muslc', 'glibc')) {
+    $caps = $binary.ToUpperInvariant()
+    & $vcpkg x-download "$PSScriptRoot\vcpkg-$binary" `
+      "--url=https://github.com/microsoft/vcpkg-tool/releases/download/$Date/vcpkg-$binary" --skip-sha512
+    $sha512 = & $vcpkg hash "$PSScriptRoot\vcpkg-$binary"
+    $metadata += "VCPKG_$($caps)_SHA=$sha512`n"
+    $vsCodeHashes["vcpkg-$binary"] = Get-Sha256 "$PSScriptRoot\vcpkg-$binary"
+}
+
+# Windows x64 (assumed to be host)
+$vsCodeHashes["vcpkg.exe"] = Get-Sha256 "$vcpkg"
+
+# Source
+$sourceName = "$Date.tar.gz"
+& $vcpkg x-download "$PSScriptRoot\$sourceName" `
+    "--url=https://github.com/microsoft/vcpkg-tool/archive/refs/tags/$Date.tar.gz" --skip-sha512
+$sha512 = & $vcpkg hash "$PSScriptRoot\$sourceName"
+$metadata += "VCPKG_TOOL_SOURCE_SHA=$sha512`n"
+
+# Cleanup
+Remove-Item @(
+    "$PSScriptRoot\vcpkg-arm64.exe",
+    "$PSScriptRoot\vcpkg-macos",
+    "$PSScriptRoot\vcpkg-muslc",
+    "$PSScriptRoot\vcpkg-glibc",
+    "$PSScriptRoot\$sourceName"
+)
+
+Set-Content -LiteralPath "$PSScriptRoot\vcpkg-tool-metadata.txt" -Value $metadata -NoNewline -Encoding utf8NoBOM
+
+Write-Host "Metadata Written"
+Write-Host "VS Code Block"
+$vsCodeOverall = [ordered]@{
+    version = $Date;
+    hashes = $vsCodeHashes;
+}
+
+Write-Host (ConvertTo-Json $vsCodeOverall)
diff --git a/external_imported/vcpkg/scripts/vcpkg-tool-metadata.txt b/external_imported/vcpkg/scripts/vcpkg-tool-metadata.txt
new file mode 100644
index 000000000..fc74fd07e
--- /dev/null
+++ b/external_imported/vcpkg/scripts/vcpkg-tool-metadata.txt
@@ -0,0 +1,5 @@
+VCPKG_TOOL_RELEASE_TAG=2024-02-05
+VCPKG_MACOS_SHA=5febda36a0aa9c1fe7a491cce1258c9a7358a1c0e5eb99443df25647b0c27bc27625a4f2f43394362f0fdfe52377470cd4eb5b8dbf541100109198597aa74c5e
+VCPKG_MUSLC_SHA=95365095f066c1ead03370ab98a3e8ffa3620b28e895b7943dc2fa338e725f8de4abfff844acdf0334cc3d33eae7f3b87d04e58a156ddf2e5e8390c41cfbed4d
+VCPKG_GLIBC_SHA=dfcdba9a5b285f9fedc8f12c3bc957b757e68cba37455c6e401fb5c5d6a65b0a52765285577835cb91eba1a599737c1702bb4ca999c415bed1876c8af0aa552b
+VCPKG_TOOL_SOURCE_SHA=72a1149e9a20931629bf1237984819af629ccb5b410a9661d717c69c9e705a1f258322e624daa596015d4ad7275bf63ece5b539e4e0b69a603157c8d5d32b855
diff --git a/external_imported/vcpkg/scripts/vcpkgTools.xml b/external_imported/vcpkg/scripts/vcpkgTools.xml
index 32778c733..10af27246 100644
--- a/external_imported/vcpkg/scripts/vcpkgTools.xml
+++ b/external_imported/vcpkg/scripts/vcpkgTools.xml
@@ -1,53 +1,46 @@
 <?xml version="1.0"?>
 <tools version="2">
     <tool name="python3" os="windows">
-        <version>3.10.7</version>
+        <version>3.11.5</version>
         <exeRelativePath>python.exe</exeRelativePath>
-        <url>https://www.python.org/ftp/python/3.10.7/python-3.10.7-embed-win32.zip</url>
-        <sha512>a69445906a909ce5f2554c544fe4251a8ab9c5028b531975b8c78fa8e98295b2bf06e1840f346a3c0edf485a7792c40c9d318bffd36b9c7829ac72b7cf8697bc</sha512>
-        <archiveName>python-3.10.7-embed-win32.zip</archiveName>
+        <url>https://www.python.org/ftp/python/3.11.5/python-3.11.5-embed-win32.zip</url>
+        <sha512>d5412c5bc2a0664f86e504a536c201789c8fd8b97c641bbb7b254c87c2f13504d25fa9d0b74e27a1c54c2d9fb592f9546d8c1e82c506dc9c76a21774c4c3ea75</sha512>
+        <archiveName>python-3.11.5-embed-win32.zip</archiveName>
     </tool>
     <tool name="python3_with_venv" os="windows">
-        <version>3.10.7</version>
+        <version>3.11.5</version>
         <exeRelativePath>tools\python.exe</exeRelativePath>
-        <url>https://www.nuget.org/api/v2/package/python/3.10.7</url>
-        <sha512>dc763c4f3e9594619173a99740a6b54686c768c240efe316d4d3f8914383bd06420c0802781baf983ea840c49412b8330c1af93f31d2c73eb0ea22a55e71aa13</sha512>
-        <archiveName>python-3.10.7.nupkg.zip</archiveName>
+        <url>https://www.nuget.org/api/v2/package/python/3.11.5</url>
+        <sha512>d2f0557c7ebe5f3e8cc2a2102fc061abed6aeeb49a2e315241c453346750e3f725261dcac4efb171da9eb44c7b9f791d7a6b59b5072902b1007939e8596a2426</sha512>
+        <archiveName>python-3.11.5.nupkg.zip</archiveName>
     </tool>
     <tool name="cmake" os="windows">
-        <version>3.25.1</version>
-        <exeRelativePath>cmake-3.25.1-windows-i386\bin\cmake.exe</exeRelativePath>
-        <url>https://github.com/Kitware/CMake/releases/download/v3.25.1/cmake-3.25.1-windows-i386.zip</url>
-        <sha512>4a84abdb53781178a99046aa09cf6a6b2bfe159d6b6bbdd2449839d2f50b872b4cc783c44774343b6122ec9400bcfdec65fffd4a246575ba55d178bc180f6adc</sha512>
-        <archiveName>cmake-3.25.1-windows-i386.zip</archiveName>
+        <version>3.27.1</version>
+        <exeRelativePath>cmake-3.27.1-windows-i386/bin/cmake.exe</exeRelativePath>
+        <url>https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1-windows-i386.zip</url>
+        <sha512>a847f636fb27ba41ba9e6eaafa56937c614bcb39c6d0c9723241c229a9b0a77b4d00ebee88639561035d43f9aa64895f387eab56c628990c01191da57839cda0</sha512>
+        <archiveName>cmake-3.27.1-windows-i386.zip</archiveName>
     </tool>
     <tool name="cmake" os="osx">
-        <version>3.25.1</version>
-        <exeRelativePath>cmake-3.25.1-macos-universal/CMake.app/Contents/bin/cmake</exeRelativePath>
-        <url>https://github.com/Kitware/CMake/releases/download/v3.25.1/cmake-3.25.1-macos-universal.tar.gz</url>
-        <sha512>6009ff799ee516c1ca3bf3a31bacdd59fc48f772a03c822f49e1e9b6a6582e64d75c6005a90574539d61b7094dfe36bfe4b4c1560a4fb7d1287be472c0fd146a</sha512>
-        <archiveName>cmake-3.25.1-macos-universal.tar.gz</archiveName>
+        <version>3.27.1</version>
+        <exeRelativePath>cmake-3.27.1-macos-universal/CMake.app/Contents/bin/cmake</exeRelativePath>
+        <url>https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1-macos-universal.tar.gz</url>
+        <sha512>78e639b93786eb994bdbc6263afc48267d42d9305c1cb1cb9482adf012e7b4f45934e744a98eaf93d8361f154e642cada13398cca064c1700f009a7795746fe7</sha512>
+        <archiveName>cmake-3.27.1-macos-universal.tar.gz</archiveName>
     </tool>
     <tool name="cmake" os="linux">
-        <version>3.25.1</version>
-        <exeRelativePath>cmake-3.25.1-linux-x86_64/bin/cmake</exeRelativePath>
-        <url>https://github.com/Kitware/CMake/releases/download/v3.25.1/cmake-3.25.1-linux-x86_64.tar.gz</url>
-        <sha512>df456fafa9e63ab0105a6355cc3f66d0567c43172fb424ba75b364f65c6da100dbb303ddd11abd68b42b3b52a90805dfda36aae2468c64c204446f4befda0c78</sha512>
-        <archiveName>cmake-3.25.1-linux-x86_64.tar.gz</archiveName>
-    </tool>
-    <tool name="cmake" os="freebsd">
-        <version>3.20.4</version>
-        <exeRelativePath>usr/local/bin/cmake</exeRelativePath>
-        <url>https://pkg.freebsd.org/FreeBSD:13:amd64/quarterly/All/cmake-3.20.4.txz</url>
-        <sha512>3e5b675d7ff924f92996d912e2365582e687375109ef99c9073fb8196bb329243a406b218cf1358d7cc518988b311ce9e5bf87de4d64f2e6377b7c2bc8894475</sha512>
-        <archiveName>cmake-3.20.4.txz</archiveName>
+        <version>3.27.1</version>
+        <exeRelativePath>cmake-3.27.1-linux-x86_64/bin/cmake</exeRelativePath>
+        <url>https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1-linux-x86_64.tar.gz</url>
+        <sha512>192374a68e2971f04974a194645726196d9b8ee7abd650d1e6f65f7aa2ccc9b186c3edb473bb4958c764532edcdd42f4182ee1fcb86b17d78b0bcd6305ce3df1</sha512>
+        <archiveName>cmake-3.27.1-linux-x86_64.tar.gz</archiveName>
     </tool>
     <tool name="git" os="windows">
         <version>2.7.4</version>
         <exeRelativePath>mingw32\bin\git.exe</exeRelativePath>
-        <url>https://github.com/git-for-windows/git/releases/download/v2.35.1.windows.2/PortableGit-2.35.1.2-32-bit.7z.exe</url>
-        <sha512>f98df16641a615bbc36c5c319c78abb780d824ff35ed5f2a095e2d5fce2acacfc7f6532c96f1c81d3d3cd8a642858cbd9de0e0e5fcde9ca11e6ad9f6598bb82f</sha512>
-        <archiveName>PortableGit-2.35.1.2-32-bit.7z.exe</archiveName>
+        <url>https://github.com/git-for-windows/git/releases/download/v2.41.0.windows.1/PortableGit-2.41.0-32-bit.7z.exe</url>
+        <sha512>e483a890e77b427c20785e7528279338c7d99651e0afbf704bf2ff3cde23d0895c07e961603d133d5d78aea2308a2994e532974de41674e4f334423b1b47bd0e</sha512>
+        <archiveName>PortableGit-2.41.0-32-bit.7z.exe</archiveName>
     </tool>
     <tool name="git" os="linux">
         <version>2.7.4</version>
@@ -138,18 +131,18 @@
         <archiveName>installer-framework-opensource-src-4.4.0.zip</archiveName>
     </tool>
     <tool name="7zip_msi" os="windows">
-        <version>21.07</version>
+        <version>23.01</version>
         <exeRelativePath>Files\7-Zip\7z.exe</exeRelativePath>
-        <url>https://www.7-zip.org/a/7z2107-x64.msi</url>
-        <sha512>d55b44f1255d1b0e629719383a600a7e83dc6378d470096337b886ce24684d26bcc2b04f9cea39ad888179edce23ad2bd0e8e1863ddc40106c176adece8c012d</sha512>
-        <archiveName>7z2107-x64.msi</archiveName>
+        <url>https://github.com/ip7z/7zip/releases/download/23.01/7z2301-x64.msi</url>
+        <sha512>09e3ce970ea8383e8c736a51ebb61e3036e655c81d59bc64c5eecb041abdad2cbce2f400fcf4478e22f56fe40f8d912c639f550a5f990e24abfd4e86cdd3755c</sha512>
+        <archiveName>7z2301-x64.msi</archiveName>
     </tool>
     <tool name="7zip" os="windows">
-        <version>21.07</version>
+        <version>23.01</version>
         <exeRelativePath>7za.exe</exeRelativePath>
-        <url>https://www.7-zip.org/a/7z2107-extra.7z</url>
-        <sha512>648d894940bcc29951752d7a8fd18c770ee8d4fd944e17f1a52588e51ca8f58375ba48514538f2e1387786fd812bb86f75fd6bdd0892685cdcafb2989942c848</sha512>
-        <archiveName>7z2107-extra.7z</archiveName>
+        <url>https://github.com/ip7z/7zip/releases/download/23.01/7z2301-extra.7z</url>
+        <sha512>c849c2cb489cf5b6eeb92bfbc27dcb37d0349c36971e1bc7ef32c7cde1b659e19e8b46d734ba90f47affe07fdfd5b4774cbfa0fdf4b681e9f60bb46bba1f7f9b</sha512>
+        <archiveName>7z2301-extra.7z</archiveName>
      </tool>
     <tool name="aria2" os="windows">
         <version>1.35.0</version>
@@ -166,39 +159,32 @@
         <archiveName>aria2-1.35.0-osx-darwin.tar.bz2</archiveName>
     </tool>
     <tool name="ninja" os="windows">
-        <version>1.10.2</version>
+        <version>1.11.1</version>
         <exeRelativePath>ninja.exe</exeRelativePath>
-        <url>https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-win.zip</url>
-        <sha512>6004140d92e86afbb17b49c49037ccd0786ce238f340f7d0e62b4b0c29ed0d6ad0bab11feda2094ae849c387d70d63504393714ed0a1f4d3a1f155af7a4f1ba3</sha512>
-        <archiveName>ninja-win-1.10.2.zip</archiveName>
+        <url>https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-win.zip</url>
+        <sha512>a700e794c32eb67b9f87040db7f1ba3a8e891636696fc54d416b01661c2421ff46fa517c97fd904adacdf8e621df3e68ea380105b909ae8b6651a78ae7eb3199</sha512>
+        <archiveName>ninja-win-1.11.1.zip</archiveName>
     </tool>
     <tool name="ninja" os="linux">
-        <version>1.10.2</version>
+        <version>1.11.1</version>
         <exeRelativePath>ninja</exeRelativePath>
-        <url>https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-linux.zip</url>
-        <sha512>93e802e9c17fb59636cddde4bad1ddaadad624f4ecfee00d5c78790330a4e9d433180e795718cda27da57215ce643c3929cf72c85337ee019d868c56f2deeef3</sha512>
-        <archiveName>ninja-linux-1.10.2.zip</archiveName>
+        <url>https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-linux.zip</url>
+        <sha512>6403dac9196baffcff614fa73ea530752997c8db6bbfbaa0446b4b09d7327e2aa6e8615d1283c961d3bf0df497e85ba86604149f1505ee75f89d600245a45dde</sha512>
+        <archiveName>ninja-linux-1.11.1.zip</archiveName>
     </tool>
     <tool name="ninja" os="osx">
-        <version>1.10.2</version>
+        <version>1.11.1</version>
         <exeRelativePath>ninja</exeRelativePath>
-        <url>https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-mac.zip</url>
-        <sha512>bcd12f6a3337591306d1b99a7a25a6933779ba68db79f17c1d3087d7b6308d245daac08df99087ff6be8dc7dd0dcdbb3a50839a144745fa719502b3a7a07260b</sha512>
-        <archiveName>ninja-mac-1.10.2.zip</archiveName>
-    </tool>
-    <tool name="ninja" os="freebsd">
-        <version>1.8.2</version>
-        <exeRelativePath>ninja</exeRelativePath>
-        <url>https://github.com/ivysnow/ninja/releases/download/v1.8.2/ninja-freebsd.zip</url>
-        <sha512>56a55ae9a6b5dfad4f28f9fe9b8114f1475c999d2f07fff7efa7375f987e74b498e9b63c41fc6c577756f15f3a1459c6d5d367902de3bedebdf9a9fd49089a86</sha512>
-        <archiveName>ninja-freebsd-1.8.2.zip</archiveName>
+        <url>https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-mac.zip</url>
+        <sha512>dad33b0918c60bbf5107951a936175b1610b4894a408f4ba4b47a2f5b328fc982a52a2aed6a0cb75028ee4765af5083bea66611c37516826eb0c851366bb4427</sha512>
+        <archiveName>ninja-mac-1.11.1.zip</archiveName>
     </tool>
     <tool name="powershell-core" os="windows">
-        <version>7.2.8</version>
+        <version>7.2.11</version>
         <exeRelativePath>pwsh.exe</exeRelativePath>
-        <url>https://github.com/PowerShell/PowerShell/releases/download/v7.2.8/PowerShell-7.2.8-win-x86.zip</url>
-        <sha512>b91ad901837099b34f689ae654b238a1171141adce8be6fc52f48373a7e79117072e84ab38e427c1ac66647dd86a19f1c6c6cba2b8e365d656c65c8447069c72</sha512>
-        <archiveName>PowerShell-7.2.8-win-x86.zip</archiveName>
+        <url>https://github.com/PowerShell/PowerShell/releases/download/v7.2.11/PowerShell-7.2.11-win-x86.zip</url>
+        <sha512>e9581122101ad161ad628a6feb63e61d3ef8f064a3f325465e8a1a4a6cfc1affbc9bf63146efae0aa65ff9ea5c93018af2c413dc0940f0d162edef805659ec84</sha512>
+        <archiveName>PowerShell-7.2.11-win-x86.zip</archiveName>
     </tool>
     <tool name="node" os="windows">
         <version>16.15.1</version>
diff --git a/external_imported/vcpkg/scripts/vcpkg_get_dep_info.cmake b/external_imported/vcpkg/scripts/vcpkg_get_dep_info.cmake
deleted file mode 100644
index 92212b82d..000000000
--- a/external_imported/vcpkg/scripts/vcpkg_get_dep_info.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-function(vcpkg_get_dep_info PORT VCPKG_TRIPLET_ID)
-    message("d8187afd-ea4a-4fc3-9aa4-a6782e1ed9af")
-    vcpkg_triplet_file(${VCPKG_TRIPLET_ID})
-
-    # GUID used as a flag - "cut here line"
-    message("c35112b6-d1ba-415b-aa5d-81de856ef8eb
-VCPKG_TARGET_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE}
-VCPKG_CMAKE_SYSTEM_NAME=${VCPKG_CMAKE_SYSTEM_NAME}
-VCPKG_CMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION}
-VCPKG_LIBRARY_LINKAGE=${VCPKG_LIBRARY_LINKAGE}
-VCPKG_CRT_LINKAGE=${VCPKG_CRT_LINKAGE}
-VCPKG_DEP_INFO_OVERRIDE_VARS=${VCPKG_DEP_INFO_OVERRIDE_VARS}
-CMAKE_HOST_SYSTEM_NAME=${CMAKE_HOST_SYSTEM_NAME}
-CMAKE_HOST_SYSTEM_PROCESSOR=${CMAKE_HOST_SYSTEM_PROCESSOR}
-CMAKE_HOST_SYSTEM_VERSION=${CMAKE_HOST_SYSTEM_VERSION}
-CMAKE_HOST_SYSTEM=${CMAKE_HOST_SYSTEM}
-e1e74b5c-18cb-4474-a6bd-5c1c8bc81f3f
-8c504940-be29-4cba-9f8f-6cd83e9d87b7")
-endfunction()
diff --git a/external_imported/vcpkg/scripts/vcpkg_get_tags.cmake b/external_imported/vcpkg/scripts/vcpkg_get_tags.cmake
deleted file mode 100644
index 6a948d129..000000000
--- a/external_imported/vcpkg/scripts/vcpkg_get_tags.cmake
+++ /dev/null
@@ -1,33 +0,0 @@
-function(vcpkg_get_tags PORT FEATURES VCPKG_TRIPLET_ID VCPKG_ABI_SETTINGS_FILE)
-    message("d8187afd-ea4a-4fc3-9aa4-a6782e1ed9af")
-    vcpkg_triplet_file(${VCPKG_TRIPLET_ID})
-
-    # GUID used as a flag - "cut here line"
-    message("c35112b6-d1ba-415b-aa5d-81de856ef8eb
-VCPKG_TARGET_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE}
-VCPKG_CMAKE_SYSTEM_NAME=${VCPKG_CMAKE_SYSTEM_NAME}
-VCPKG_CMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION}
-VCPKG_PLATFORM_TOOLSET=${VCPKG_PLATFORM_TOOLSET}
-VCPKG_VISUAL_STUDIO_PATH=${VCPKG_VISUAL_STUDIO_PATH}
-VCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}
-VCPKG_BUILD_TYPE=${VCPKG_BUILD_TYPE}
-VCPKG_LIBRARY_LINKAGE=${VCPKG_LIBRARY_LINKAGE}
-VCPKG_CRT_LINKAGE=${VCPKG_CRT_LINKAGE}
-VCPKG_DISABLE_COMPILER_TRACKING=${VCPKG_DISABLE_COMPILER_TRACKING}
-e1e74b5c-18cb-4474-a6bd-5c1c8bc81f3f")
-
-    # Just to enforce the user didn't set it in the triplet file
-    if (DEFINED VCPKG_PUBLIC_ABI_OVERRIDE)
-        set(VCPKG_PUBLIC_ABI_OVERRIDE)
-        message(WARNING "VCPKG_PUBLIC_ABI_OVERRIDE set in the triplet will be ignored.")
-    endif()
-    include("${VCPKG_ABI_SETTINGS_FILE}" OPTIONAL)
-
-    message("c35112b6-d1ba-415b-aa5d-81de856ef8eb
-VCPKG_PUBLIC_ABI_OVERRIDE=${VCPKG_PUBLIC_ABI_OVERRIDE}
-VCPKG_ENV_PASSTHROUGH=${VCPKG_ENV_PASSTHROUGH}
-VCPKG_ENV_PASSTHROUGH_UNTRACKED=${VCPKG_ENV_PASSTHROUGH_UNTRACKED}
-VCPKG_LOAD_VCVARS_ENV=${VCPKG_LOAD_VCVARS_ENV}
-e1e74b5c-18cb-4474-a6bd-5c1c8bc81f3f
-8c504940-be29-4cba-9f8f-6cd83e9d87b7")
-endfunction()
diff --git a/external_imported/vcpkg/triplets/arm-neon-android.cmake b/external_imported/vcpkg/triplets/arm-neon-android.cmake
new file mode 100644
index 000000000..a26d9aa3e
--- /dev/null
+++ b/external_imported/vcpkg/triplets/arm-neon-android.cmake
@@ -0,0 +1,6 @@
+set(VCPKG_TARGET_ARCHITECTURE arm)
+set(VCPKG_CRT_LINKAGE static)
+set(VCPKG_LIBRARY_LINKAGE static)
+set(VCPKG_CMAKE_SYSTEM_NAME Android)
+set(VCPKG_MAKE_BUILD_TRIPLET "--host=armv7a-linux-androideabi")
+set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DANDROID_ABI=armeabi-v7a -DANDROID_ARM_NEON=ON)
diff --git a/external_imported/vcpkg/triplets/community/arm64-android.cmake b/external_imported/vcpkg/triplets/arm64-android.cmake
similarity index 75%
rename from external_imported/vcpkg/triplets/community/arm64-android.cmake
rename to external_imported/vcpkg/triplets/arm64-android.cmake
index 46ad5f166..784f0d39c 100644
--- a/external_imported/vcpkg/triplets/community/arm64-android.cmake
+++ b/external_imported/vcpkg/triplets/arm64-android.cmake
@@ -3,3 +3,4 @@ set(VCPKG_CRT_LINKAGE static)
 set(VCPKG_LIBRARY_LINKAGE static)
 set(VCPKG_CMAKE_SYSTEM_NAME Android)
 set(VCPKG_MAKE_BUILD_TRIPLET "--host=aarch64-linux-android")
+set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DANDROID_ABI=arm64-v8a)
diff --git a/external_imported/vcpkg/triplets/community/arm64-osx.cmake b/external_imported/vcpkg/triplets/arm64-osx.cmake
similarity index 100%
rename from external_imported/vcpkg/triplets/community/arm64-osx.cmake
rename to external_imported/vcpkg/triplets/arm64-osx.cmake
diff --git a/external_imported/vcpkg/triplets/community/arm64-uwp.cmake b/external_imported/vcpkg/triplets/arm64-uwp.cmake
similarity index 100%
rename from external_imported/vcpkg/triplets/community/arm64-uwp.cmake
rename to external_imported/vcpkg/triplets/arm64-uwp.cmake
diff --git a/external_imported/vcpkg/triplets/community/arm-android.cmake b/external_imported/vcpkg/triplets/community/arm-android.cmake
index feb8f186b..1376baede 100644
--- a/external_imported/vcpkg/triplets/community/arm-android.cmake
+++ b/external_imported/vcpkg/triplets/community/arm-android.cmake
@@ -3,3 +3,4 @@ set(VCPKG_CRT_LINKAGE static)
 set(VCPKG_LIBRARY_LINKAGE static)
 set(VCPKG_CMAKE_SYSTEM_NAME Android)
 set(VCPKG_MAKE_BUILD_TRIPLET "--host=armv7a-linux-androideabi")
+set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DANDROID_ABI=armeabi-v7a -DANDROID_ARM_NEON=OFF)
diff --git a/external_imported/vcpkg/triplets/community/arm-neon-android.cmake b/external_imported/vcpkg/triplets/community/arm-neon-android.cmake
deleted file mode 100644
index feb8f186b..000000000
--- a/external_imported/vcpkg/triplets/community/arm-neon-android.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-set(VCPKG_TARGET_ARCHITECTURE arm)
-set(VCPKG_CRT_LINKAGE static)
-set(VCPKG_LIBRARY_LINKAGE static)
-set(VCPKG_CMAKE_SYSTEM_NAME Android)
-set(VCPKG_MAKE_BUILD_TRIPLET "--host=armv7a-linux-androideabi")
diff --git a/external_imported/vcpkg/triplets/arm-uwp.cmake b/external_imported/vcpkg/triplets/community/arm-uwp.cmake
similarity index 100%
rename from external_imported/vcpkg/triplets/arm-uwp.cmake
rename to external_imported/vcpkg/triplets/community/arm-uwp.cmake
diff --git a/external_imported/vcpkg/triplets/community/arm64-ios-release.cmake b/external_imported/vcpkg/triplets/community/arm64-ios-release.cmake
new file mode 100644
index 000000000..39eca20ba
--- /dev/null
+++ b/external_imported/vcpkg/triplets/community/arm64-ios-release.cmake
@@ -0,0 +1,6 @@
+set(VCPKG_TARGET_ARCHITECTURE arm64)
+set(VCPKG_CRT_LINKAGE dynamic)
+set(VCPKG_LIBRARY_LINKAGE static)
+set(VCPKG_CMAKE_SYSTEM_NAME iOS)
+
+set(VCPKG_BUILD_TYPE release)
diff --git a/external_imported/vcpkg/triplets/community/armv6-android.cmake b/external_imported/vcpkg/triplets/community/armv6-android.cmake
index 29ba5655a..7e6015cc9 100644
--- a/external_imported/vcpkg/triplets/community/armv6-android.cmake
+++ b/external_imported/vcpkg/triplets/community/armv6-android.cmake
@@ -2,3 +2,4 @@ set(VCPKG_TARGET_ARCHITECTURE arm)
 set(VCPKG_CRT_LINKAGE static)
 set(VCPKG_LIBRARY_LINKAGE static)
 set(VCPKG_CMAKE_SYSTEM_NAME Android)
+set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DANDROID_ABI=armeabi -DANDROID_ARM_MODE=arm)
diff --git a/external_imported/vcpkg/triplets/community/loongarch32-linux-release.cmake b/external_imported/vcpkg/triplets/community/loongarch32-linux-release.cmake
new file mode 100644
index 000000000..0c0c0c4f3
--- /dev/null
+++ b/external_imported/vcpkg/triplets/community/loongarch32-linux-release.cmake
@@ -0,0 +1,6 @@
+set(VCPKG_TARGET_ARCHITECTURE loongarch32)
+set(VCPKG_CRT_LINKAGE dynamic)
+set(VCPKG_LIBRARY_LINKAGE static)
+
+set(VCPKG_CMAKE_SYSTEM_NAME Linux)
+set(VCPKG_BUILD_TYPE release)
diff --git a/external_imported/vcpkg/triplets/community/loongarch32-linux.cmake b/external_imported/vcpkg/triplets/community/loongarch32-linux.cmake
new file mode 100644
index 000000000..c6d954e6d
--- /dev/null
+++ b/external_imported/vcpkg/triplets/community/loongarch32-linux.cmake
@@ -0,0 +1,5 @@
+set(VCPKG_TARGET_ARCHITECTURE loongarch32)
+set(VCPKG_CRT_LINKAGE dynamic)
+set(VCPKG_LIBRARY_LINKAGE static)
+
+set(VCPKG_CMAKE_SYSTEM_NAME Linux)
diff --git a/external_imported/vcpkg/triplets/community/loongarch64-linux-release.cmake b/external_imported/vcpkg/triplets/community/loongarch64-linux-release.cmake
new file mode 100644
index 000000000..004fc1416
--- /dev/null
+++ b/external_imported/vcpkg/triplets/community/loongarch64-linux-release.cmake
@@ -0,0 +1,6 @@
+set(VCPKG_TARGET_ARCHITECTURE loongarch64)
+set(VCPKG_CRT_LINKAGE dynamic)
+set(VCPKG_LIBRARY_LINKAGE static)
+
+set(VCPKG_CMAKE_SYSTEM_NAME Linux)
+set(VCPKG_BUILD_TYPE release)
diff --git a/external_imported/vcpkg/triplets/community/loongarch64-linux.cmake b/external_imported/vcpkg/triplets/community/loongarch64-linux.cmake
new file mode 100644
index 000000000..2a70e0a95
--- /dev/null
+++ b/external_imported/vcpkg/triplets/community/loongarch64-linux.cmake
@@ -0,0 +1,5 @@
+set(VCPKG_TARGET_ARCHITECTURE loongarch64)
+set(VCPKG_CRT_LINKAGE dynamic)
+set(VCPKG_LIBRARY_LINKAGE static)
+
+set(VCPKG_CMAKE_SYSTEM_NAME Linux)
diff --git a/external_imported/vcpkg/triplets/community/mips64-linux.cmake b/external_imported/vcpkg/triplets/community/mips64-linux.cmake
new file mode 100644
index 000000000..25ba947ee
--- /dev/null
+++ b/external_imported/vcpkg/triplets/community/mips64-linux.cmake
@@ -0,0 +1,6 @@
+set(VCPKG_TARGET_ARCHITECTURE mips64)
+set(VCPKG_CRT_LINKAGE dynamic)
+set(VCPKG_LIBRARY_LINKAGE static)
+
+set(VCPKG_CMAKE_SYSTEM_NAME Linux)
+
diff --git a/external_imported/vcpkg/triplets/community/x64-xbox-scarlett-static.cmake b/external_imported/vcpkg/triplets/community/x64-xbox-scarlett-static.cmake
index e7c687708..acf742674 100644
--- a/external_imported/vcpkg/triplets/community/x64-xbox-scarlett-static.cmake
+++ b/external_imported/vcpkg/triplets/community/x64-xbox-scarlett-static.cmake
@@ -1,10 +1,4 @@
 set(VCPKG_TARGET_ARCHITECTURE x64)
 set(VCPKG_CRT_LINKAGE dynamic)
 set(VCPKG_LIBRARY_LINKAGE static)
-set(VCPKG_ENV_PASSTHROUGH GameDKLatest GRDKLatest GXDKLatest)
-set(VCPKG_CMAKE_SYSTEM_VERSION 10.0)
-set(VCPKG_CMAKE_CONFIGURE_OPTIONS "-DXBOX_CONSOLE_TARGET=scarlett")
-set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/../../scripts/toolchains/xbox.cmake")
-set(VCPKG_LOAD_VCVARS_ENV ON)
-set(VCPKG_TARGET_IS_XBOX ON)
-set(VCPKG_DEP_INFO_OVERRIDE_VARS xbox)
+set(VCPKG_XBOX_CONSOLE_TARGET scarlett)
diff --git a/external_imported/vcpkg/triplets/community/x64-xbox-scarlett.cmake b/external_imported/vcpkg/triplets/community/x64-xbox-scarlett.cmake
index 5faeb7cad..0cf353b3a 100644
--- a/external_imported/vcpkg/triplets/community/x64-xbox-scarlett.cmake
+++ b/external_imported/vcpkg/triplets/community/x64-xbox-scarlett.cmake
@@ -1,10 +1,4 @@
 set(VCPKG_TARGET_ARCHITECTURE x64)
 set(VCPKG_CRT_LINKAGE dynamic)
 set(VCPKG_LIBRARY_LINKAGE dynamic)
-set(VCPKG_ENV_PASSTHROUGH GameDKLatest GRDKLatest GXDKLatest)
-set(VCPKG_CMAKE_SYSTEM_VERSION 10.0)
-set(VCPKG_CMAKE_CONFIGURE_OPTIONS "-DXBOX_CONSOLE_TARGET=scarlett")
-set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/../../scripts/toolchains/xbox.cmake")
-set(VCPKG_LOAD_VCVARS_ENV ON)
-set(VCPKG_TARGET_IS_XBOX ON)
-set(VCPKG_DEP_INFO_OVERRIDE_VARS xbox)
+set(VCPKG_XBOX_CONSOLE_TARGET scarlett)
diff --git a/external_imported/vcpkg/triplets/community/x64-xbox-xboxone-static.cmake b/external_imported/vcpkg/triplets/community/x64-xbox-xboxone-static.cmake
index a08e675b5..1202acc8b 100644
--- a/external_imported/vcpkg/triplets/community/x64-xbox-xboxone-static.cmake
+++ b/external_imported/vcpkg/triplets/community/x64-xbox-xboxone-static.cmake
@@ -1,10 +1,4 @@
 set(VCPKG_TARGET_ARCHITECTURE x64)
 set(VCPKG_CRT_LINKAGE dynamic)
 set(VCPKG_LIBRARY_LINKAGE static)
-set(VCPKG_ENV_PASSTHROUGH GameDKLatest GRDKLatest GXDKLatest)
-set(VCPKG_CMAKE_SYSTEM_VERSION 10.0)
-set(VCPKG_CMAKE_CONFIGURE_OPTIONS "-DXBOX_CONSOLE_TARGET=xboxone")
-set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/../../scripts/toolchains/xbox.cmake")
-set(VCPKG_LOAD_VCVARS_ENV ON)
-set(VCPKG_TARGET_IS_XBOX ON)
-set(VCPKG_DEP_INFO_OVERRIDE_VARS xbox)
+set(VCPKG_XBOX_CONSOLE_TARGET xboxone)
diff --git a/external_imported/vcpkg/triplets/community/x64-xbox-xboxone.cmake b/external_imported/vcpkg/triplets/community/x64-xbox-xboxone.cmake
index b9838cd07..36061fc77 100644
--- a/external_imported/vcpkg/triplets/community/x64-xbox-xboxone.cmake
+++ b/external_imported/vcpkg/triplets/community/x64-xbox-xboxone.cmake
@@ -1,10 +1,4 @@
 set(VCPKG_TARGET_ARCHITECTURE x64)
 set(VCPKG_CRT_LINKAGE dynamic)
 set(VCPKG_LIBRARY_LINKAGE dynamic)
-set(VCPKG_ENV_PASSTHROUGH GameDKLatest GRDKLatest GXDKLatest)
-set(VCPKG_CMAKE_SYSTEM_VERSION 10.0)
-set(VCPKG_CMAKE_CONFIGURE_OPTIONS "-DXBOX_CONSOLE_TARGET=xboxone")
-set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/../../scripts/toolchains/xbox.cmake")
-set(VCPKG_LOAD_VCVARS_ENV ON)
-set(VCPKG_TARGET_IS_XBOX ON)
-set(VCPKG_DEP_INFO_OVERRIDE_VARS xbox)
+set(VCPKG_XBOX_CONSOLE_TARGET xboxone)
diff --git a/external_imported/vcpkg/triplets/community/x86-android.cmake b/external_imported/vcpkg/triplets/community/x86-android.cmake
index f909598cb..ef668467a 100644
--- a/external_imported/vcpkg/triplets/community/x86-android.cmake
+++ b/external_imported/vcpkg/triplets/community/x86-android.cmake
@@ -3,3 +3,4 @@ set(VCPKG_CRT_LINKAGE static)
 set(VCPKG_LIBRARY_LINKAGE static)
 set(VCPKG_CMAKE_SYSTEM_NAME Android)
 set(VCPKG_MAKE_BUILD_TRIPLET "--host=i686-linux-android")
+set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DANDROID_ABI=x86)
diff --git a/external_imported/vcpkg/triplets/community/x64-android.cmake b/external_imported/vcpkg/triplets/x64-android.cmake
similarity index 75%
rename from external_imported/vcpkg/triplets/community/x64-android.cmake
rename to external_imported/vcpkg/triplets/x64-android.cmake
index 7ef27c2b8..28404f4ed 100644
--- a/external_imported/vcpkg/triplets/community/x64-android.cmake
+++ b/external_imported/vcpkg/triplets/x64-android.cmake
@@ -3,3 +3,4 @@ set(VCPKG_CRT_LINKAGE static)
 set(VCPKG_LIBRARY_LINKAGE static)
 set(VCPKG_CMAKE_SYSTEM_NAME Android)
 set(VCPKG_MAKE_BUILD_TRIPLET "--host=x86_64-linux-android")
+set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DANDROID_ABI=x86_64)
diff --git a/external_imported/vcpkg/versions/3-/3fd.json b/external_imported/vcpkg/versions/3-/3fd.json
index a4398c8df..0ad755d50 100644
--- a/external_imported/vcpkg/versions/3-/3fd.json
+++ b/external_imported/vcpkg/versions/3-/3fd.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "81e9fd75ff6a4fee6ab7a5d4d09e7e3a735fbaaa",
+      "version": "2.6.3",
+      "port-version": 4
+    },
+    {
+      "git-tree": "0bfff492ed0b9ee3f31bb7593443572bc0fcf2d4",
+      "version": "2.6.3",
+      "port-version": 3
+    },
     {
       "git-tree": "3b52e6aff44ca4e11335754570701f692ea14184",
       "version": "2.6.3",
diff --git a/external_imported/vcpkg/versions/7-/7zip.json b/external_imported/vcpkg/versions/7-/7zip.json
index 2ef7dd171..507b06a81 100644
--- a/external_imported/vcpkg/versions/7-/7zip.json
+++ b/external_imported/vcpkg/versions/7-/7zip.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "23256cddd31991c2df4d96a07fc016fd446c2d2d",
+      "version-string": "23.01",
+      "port-version": 2
+    },
+    {
+      "git-tree": "2f1fa323db9a88dd410e7d46ad651f7fe5cb620c",
+      "version-string": "23.01",
+      "port-version": 1
+    },
+    {
+      "git-tree": "770ce8dc829180bfcf2c396aa780474a87289f89",
+      "version-string": "23.01",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b0a5040bfab9f50a386dc1b40f291fa581b21c79",
+      "version-string": "22.01",
+      "port-version": 1
+    },
     {
       "git-tree": "e28ef5008a5e93e67db2904c72586f4a667ef5ed",
       "version-string": "22.01",
diff --git a/external_imported/vcpkg/versions/a-/ableton-link.json b/external_imported/vcpkg/versions/a-/ableton-link.json
index 7707f5f9b..475a3506b 100644
--- a/external_imported/vcpkg/versions/a-/ableton-link.json
+++ b/external_imported/vcpkg/versions/a-/ableton-link.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "4827f8ad0a42e763cffae490000a08bbd52d7cdf",
+      "version": "3.1.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3c37c3cf9ca37c0c0d9ddffec58b8deb9c968723",
+      "version": "3.0.6",
+      "port-version": 2
+    },
+    {
+      "git-tree": "e88d1fcc5959b44924c1bec7ae3b5535327f41ef",
+      "version": "3.0.6",
+      "port-version": 1
+    },
     {
       "git-tree": "eb603bd61d919dd4db44c901c00e47198fe186c5",
       "version": "3.0.6",
diff --git a/external_imported/vcpkg/versions/a-/abseil.json b/external_imported/vcpkg/versions/a-/abseil.json
index f73f44a1d..2a280e9f4 100644
--- a/external_imported/vcpkg/versions/a-/abseil.json
+++ b/external_imported/vcpkg/versions/a-/abseil.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "49a35a30915907a4e46b57bb33b8aa1f2185e757",
+      "version": "20230802.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "95cfb844950f2cc3e1a530bd23967ee2ea218f74",
+      "version": "20230802.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "370a6da6fa1c5e259a8c8deec863e705aa423be6",
+      "version": "20230125.3",
+      "port-version": 1
+    },
+    {
+      "git-tree": "6a337fa251c0ac4489d9c0ea1e2f1c9a7d019eb5",
+      "version": "20230125.3",
+      "port-version": 0
+    },
     {
       "git-tree": "a88e9003e0d38c2cfbcc676931a0204d749e6629",
       "version": "20230125.0",
@@ -65,11 +85,6 @@
       "version-string": "2020-03-03",
       "port-version": 8
     },
-    {
-      "git-tree": "28fa609b06eec70bb06e61891e94b94f35f7d06e",
-      "version-string": "2020-03-03",
-      "port-version": 7
-    },
     {
       "git-tree": "606b9214364983e5df021d0556dbec5e44f4b0a8",
       "version-string": "2020-03-03-7",
diff --git a/external_imported/vcpkg/versions/a-/absent.json b/external_imported/vcpkg/versions/a-/absent.json
index e6148197f..8cc30040f 100644
--- a/external_imported/vcpkg/versions/a-/absent.json
+++ b/external_imported/vcpkg/versions/a-/absent.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "84a42adaeabc3fb5db1b9f8c4bb6c4155db57d17",
+      "version": "0.3.1",
+      "port-version": 3
+    },
     {
       "git-tree": "4245977c7070822c223161421a31aa6fe5042017",
       "version-string": "0.3.1",
diff --git a/external_imported/vcpkg/versions/a-/ace.json b/external_imported/vcpkg/versions/a-/ace.json
index 845a7ece6..100465d94 100644
--- a/external_imported/vcpkg/versions/a-/ace.json
+++ b/external_imported/vcpkg/versions/a-/ace.json
@@ -1,5 +1,40 @@
 {
   "versions": [
+    {
+      "git-tree": "00c6b2eb50cad87d13e5a6a59f38e30cfa954651",
+      "version": "7.1.2",
+      "port-version": 1
+    },
+    {
+      "git-tree": "696c1096e0de3cd394392720aa34e0ceceac52e7",
+      "version": "7.1.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "acebbd833daa493d4e2075ce547646719d8cd080",
+      "version": "7.1.1",
+      "port-version": 2
+    },
+    {
+      "git-tree": "b9ee0ab32f4cbb2e1df0b0b060e0691e5e684261",
+      "version": "7.1.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "a8efd3ae98a66b7cb6de80d09db896b13a6300e7",
+      "version": "7.1.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "df4ee7b5111a86e0bc99f45b39447bff68d102bd",
+      "version": "7.1.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "9a2a1876f2f625494b16da42b27ace343255d691",
+      "version": "7.1.0",
+      "port-version": 0
+    },
     {
       "git-tree": "25ea14090fceba8ae684e0c6ab047a719250ef56",
       "version": "7.0.11",
diff --git a/external_imported/vcpkg/versions/a-/acl.json b/external_imported/vcpkg/versions/a-/acl.json
index f09a71ef2..86639be0b 100644
--- a/external_imported/vcpkg/versions/a-/acl.json
+++ b/external_imported/vcpkg/versions/a-/acl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2d8c536397cb3a1f7c8979db3df870ae53a439cf",
+      "version-semver": "2.3.1",
+      "port-version": 2
+    },
     {
       "git-tree": "4c930bf34406e76819ad7b83ff26536e64ad09f0",
       "version-semver": "2.3.1",
diff --git a/external_imported/vcpkg/versions/a-/activemq-cpp.json b/external_imported/vcpkg/versions/a-/activemq-cpp.json
index 54b58b9bb..5c04182b3 100644
--- a/external_imported/vcpkg/versions/a-/activemq-cpp.json
+++ b/external_imported/vcpkg/versions/a-/activemq-cpp.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "c1aa825d176f58217f5fe94a3386923ffe2f924e",
+      "version-semver": "3.9.5",
+      "port-version": 15
+    },
+    {
+      "git-tree": "7af309821bf9e2fdfaaf67e38eae1a073b4d1acc",
+      "version-semver": "3.9.5",
+      "port-version": 14
+    },
+    {
+      "git-tree": "75c1e838f461bba7a78802919b2ec16bdbfd154e",
+      "version-semver": "3.9.5",
+      "port-version": 13
+    },
+    {
+      "git-tree": "d8cbff606d12daa3bf08a8fa623c2d524f1e05e5",
+      "version-semver": "3.9.5",
+      "port-version": 12
+    },
+    {
+      "git-tree": "8674469ca3e9968a8473861000056e09a190ced4",
+      "version-semver": "3.9.5",
+      "port-version": 11
+    },
     {
       "git-tree": "2cf2310a238e646e62043be2f553332d8bd4c171",
       "version-semver": "3.9.5",
diff --git a/external_imported/vcpkg/versions/a-/ada-url.json b/external_imported/vcpkg/versions/a-/ada-url.json
new file mode 100644
index 000000000..27017672a
--- /dev/null
+++ b/external_imported/vcpkg/versions/a-/ada-url.json
@@ -0,0 +1,34 @@
+{
+  "versions": [
+    {
+      "git-tree": "bb2fecfc860c0e8a6483de55069b826d8c556004",
+      "version": "2.7.6",
+      "port-version": 0
+    },
+    {
+      "git-tree": "da619020bc25fc94014a434ab3e2ea77937d00f8",
+      "version": "2.7.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "793a12bdf6a056b11297c61d8129764722fd04b0",
+      "version": "2.6.8",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5eeb54c3da6362aa30bddf522b944e1e95bdc005",
+      "version": "2.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e613c15954b7650fd68c9f46109ba536dad6a27a",
+      "version": "2.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "184ab96a9e448d759aafb20f540502f43b5fc7f9",
+      "version": "2.4.2",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/a-/ade.json b/external_imported/vcpkg/versions/a-/ade.json
index e93cef701..a7f75babf 100644
--- a/external_imported/vcpkg/versions/a-/ade.json
+++ b/external_imported/vcpkg/versions/a-/ade.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "005ca3815ef985e0e10d716652be95e7775cf8de",
+      "version-string": "0.1.2d",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c42175dddb51914574ff7fdcb8f653ed342f8ff2",
+      "version-string": "0.1.2c",
+      "port-version": 0
+    },
+    {
+      "git-tree": "be78a5027373a1ff6c75587da2aa96126c832b1c",
+      "version": "0.1.2",
+      "port-version": 0
+    },
     {
       "git-tree": "a1fe12280de42d63d57dd77fd43ac40a7840bae5",
       "version-string": "0.1.1f",
diff --git a/external_imported/vcpkg/versions/a-/aklomp-base64.json b/external_imported/vcpkg/versions/a-/aklomp-base64.json
new file mode 100644
index 000000000..d5495e292
--- /dev/null
+++ b/external_imported/vcpkg/versions/a-/aklomp-base64.json
@@ -0,0 +1,19 @@
+{
+  "versions": [
+    {
+      "git-tree": "ed49981a592ca849cbb3274159c8ed21392e73df",
+      "version": "0.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4785f09421c2636709249ad7a555c7420b9bcfe8",
+      "version-date": "2023-01-06",
+      "port-version": 1
+    },
+    {
+      "git-tree": "f73a4f50ab2a515962e939dad478916a5f44842f",
+      "version-date": "2023-01-06",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/a-/alac-decoder.json b/external_imported/vcpkg/versions/a-/alac-decoder.json
index 8e444511f..b64eae86d 100644
--- a/external_imported/vcpkg/versions/a-/alac-decoder.json
+++ b/external_imported/vcpkg/versions/a-/alac-decoder.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2812ce639bc0f6f2c8fbb93f348d721b1c2df14d",
+      "version": "0.2",
+      "port-version": 7
+    },
     {
       "git-tree": "4b02da71863a4f88b910c23f05909e2cbb9ab9cc",
       "version-string": "0.2",
diff --git a/external_imported/vcpkg/versions/a-/alac.json b/external_imported/vcpkg/versions/a-/alac.json
index 043bc9fe1..8f8917b57 100644
--- a/external_imported/vcpkg/versions/a-/alac.json
+++ b/external_imported/vcpkg/versions/a-/alac.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "88a9f4cee49d77de933447fad12491899c59ab70",
+      "version": "2017-11-03-c38887c5",
+      "port-version": 4
+    },
     {
       "git-tree": "71902d13114760bafba205b06f2c7e0ff65a4974",
       "version-string": "2017-11-03-c38887c5",
diff --git a/external_imported/vcpkg/versions/a-/alembic.json b/external_imported/vcpkg/versions/a-/alembic.json
index 8bebb133f..3f84f4eb2 100644
--- a/external_imported/vcpkg/versions/a-/alembic.json
+++ b/external_imported/vcpkg/versions/a-/alembic.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "ca5f035424c794b8cde9d41c7103b612e912a275",
+      "version": "1.8.6",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5cb4b9d32a6098f48e3d0a75ddd7eaae7a7df085",
+      "version": "1.8.5",
+      "port-version": 0
+    },
     {
       "git-tree": "16bef528ef38e7426a333739878188d9ca909bc5",
       "version": "1.8.3",
diff --git a/external_imported/vcpkg/versions/a-/aliyun-oss-c-sdk.json b/external_imported/vcpkg/versions/a-/aliyun-oss-c-sdk.json
index 195a46f4c..622883aac 100644
--- a/external_imported/vcpkg/versions/a-/aliyun-oss-c-sdk.json
+++ b/external_imported/vcpkg/versions/a-/aliyun-oss-c-sdk.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4a6710098ecdb98956fdde32c883a45e2abae333",
+      "version": "3.10.0",
+      "port-version": 3
+    },
     {
       "git-tree": "a05ad4fd2bde4c19dccdbfd66c18130e5bed7902",
       "version-string": "3.10.0",
diff --git a/external_imported/vcpkg/versions/a-/allegro5.json b/external_imported/vcpkg/versions/a-/allegro5.json
index 006def03d..20657dc6d 100644
--- a/external_imported/vcpkg/versions/a-/allegro5.json
+++ b/external_imported/vcpkg/versions/a-/allegro5.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "1162ff1bdc43ad43036a30af2ca8214eeea566d9",
+      "version": "5.2.9.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "93860d1ef432006526823ace61750eb6b0e86ec2",
+      "version": "5.2.9.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a50ae858c1ef5e8d94fa850e2857b7a449cc5f55",
+      "version": "5.2.6.0",
+      "port-version": 4
+    },
     {
       "git-tree": "09b555503c34ca7a0052436996b19bb4deb5d701",
       "version": "5.2.6.0",
diff --git a/external_imported/vcpkg/versions/a-/alpaca.json b/external_imported/vcpkg/versions/a-/alpaca.json
index 402a7fdb9..cfbf6b292 100644
--- a/external_imported/vcpkg/versions/a-/alpaca.json
+++ b/external_imported/vcpkg/versions/a-/alpaca.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9533d25c8a1eabb24839c4ed613d10be95101b4b",
+      "version": "0.2.1",
+      "port-version": 0
+    },
     {
       "git-tree": "d8a880634d8e1b510b01820aea947721639c0d14",
       "version": "0.2.0",
diff --git a/external_imported/vcpkg/versions/a-/alpaka.json b/external_imported/vcpkg/versions/a-/alpaka.json
index 92ee62669..cbbeb85f9 100644
--- a/external_imported/vcpkg/versions/a-/alpaka.json
+++ b/external_imported/vcpkg/versions/a-/alpaka.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "61ecfc7faca32c8f1918d7e78fa7b31db5352290",
+      "version": "1.1.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8de339e1b25c07aa1f0eda93117730b60da400e5",
+      "version": "1.0.0",
+      "port-version": 0
+    },
     {
       "git-tree": "7149b432a8cfdb7406ce5979d11c11c5caa8fe3f",
       "version": "0.9.0",
diff --git a/external_imported/vcpkg/versions/a-/alsa.json b/external_imported/vcpkg/versions/a-/alsa.json
index 6e0f989a1..4d0e4799c 100644
--- a/external_imported/vcpkg/versions/a-/alsa.json
+++ b/external_imported/vcpkg/versions/a-/alsa.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "1ea8f5d1e2f27c55e80e1bcce24aacc37849074e",
+      "version": "1.2.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d3fa8b1fd27e767f429d0736b6636df796e2c335",
+      "version": "1.2.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "18d67806b319dea0e3c2e9c921a1864901af1d22",
+      "version": "1.2.8",
+      "port-version": 1
+    },
+    {
+      "git-tree": "1e4f79a1681c6c40c4b500bf4c8c5d3746916bab",
+      "version": "1.2.8",
+      "port-version": 0
+    },
     {
       "git-tree": "658bd201adf1ade8dcfceacc5678f4b790a799c8",
       "version": "1.2.6.1",
diff --git a/external_imported/vcpkg/versions/a-/amd-adl-sdk.json b/external_imported/vcpkg/versions/a-/amd-adl-sdk.json
new file mode 100644
index 000000000..d16ffb1b1
--- /dev/null
+++ b/external_imported/vcpkg/versions/a-/amd-adl-sdk.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "839f4b627dbcc1304fc47f6d3d8d142b80a6206d",
+      "version": "17.1",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/a-/amd-amf.json b/external_imported/vcpkg/versions/a-/amd-amf.json
index c5568b582..c9384f200 100644
--- a/external_imported/vcpkg/versions/a-/amd-amf.json
+++ b/external_imported/vcpkg/versions/a-/amd-amf.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1ab17b71ee3b3f99c9a7c83abd3a4cb1c6c5bcfc",
+      "version": "1.4.29",
+      "port-version": 0
+    },
     {
       "git-tree": "c65d944ff736b48b7b94298ed4627cb49458e7ba",
       "version": "1.4.26",
diff --git a/external_imported/vcpkg/versions/a-/amqpcpp.json b/external_imported/vcpkg/versions/a-/amqpcpp.json
index 237a7fd9f..85d72391e 100644
--- a/external_imported/vcpkg/versions/a-/amqpcpp.json
+++ b/external_imported/vcpkg/versions/a-/amqpcpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4a0661ec390526889afac4ba693c92ab00a4937c",
+      "version": "4.3.23",
+      "port-version": 0
+    },
     {
       "git-tree": "cdf5751364452365ad13aeecc8a74bc6ab15076a",
       "version": "4.3.19",
diff --git a/external_imported/vcpkg/versions/a-/anari.json b/external_imported/vcpkg/versions/a-/anari.json
new file mode 100644
index 000000000..7553b296d
--- /dev/null
+++ b/external_imported/vcpkg/versions/a-/anari.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "bb2704cfb92a03677f5d7dfbf1d81f1d924accd3",
+      "version": "0.7.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "cf756ca650e9d72324024441ad48b760fb587f86",
+      "version": "0.7.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/a-/angelscript.json b/external_imported/vcpkg/versions/a-/angelscript.json
index 332aa8c26..d6c134f04 100644
--- a/external_imported/vcpkg/versions/a-/angelscript.json
+++ b/external_imported/vcpkg/versions/a-/angelscript.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "5c1bc126371829227e923c11f029a539a234a483",
+      "version": "2.36.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "e90e0fe54ab8038226b849471fba169157753c19",
+      "version": "2.36.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "579a4c31ad7d7972339105a9c043a3658af5705d",
+      "version": "2.36.0",
+      "port-version": 1
+    },
     {
       "git-tree": "e82bacd16784a617c44319de8e23d0557f72095f",
       "version": "2.36.0",
diff --git a/external_imported/vcpkg/versions/a-/angle.json b/external_imported/vcpkg/versions/a-/angle.json
index f5f1544a2..ee8d454e3 100644
--- a/external_imported/vcpkg/versions/a-/angle.json
+++ b/external_imported/vcpkg/versions/a-/angle.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "b5502570ef18abdcf0535470f3ea6589db70607b",
+      "version-string": "chromium_5414",
+      "port-version": 7
+    },
+    {
+      "git-tree": "28f33feb91072e2df5daa5b7e10846db4a6f3a50",
+      "version-string": "chromium_5414",
+      "port-version": 6
+    },
+    {
+      "git-tree": "d8849e7cee8eb5754ec1aefba7644bb393863f94",
+      "version-string": "chromium_5414",
+      "port-version": 5
+    },
+    {
+      "git-tree": "f5963e0a9c6de152e825e610333e626e8a9df144",
+      "version-string": "chromium_5414",
+      "port-version": 4
+    },
+    {
+      "git-tree": "d5671959f9f2a59ecd232c72df54682bb10a14be",
+      "version-string": "chromium_5414",
+      "port-version": 3
+    },
+    {
+      "git-tree": "784aa16c1dacc9aedb49de3bd1393bb6ef6b853d",
+      "version-string": "chromium_5414",
+      "port-version": 2
+    },
     {
       "git-tree": "b9840e4a2d643b94dc27bf1adc2803f16501cadd",
       "version-string": "chromium_5414",
diff --git a/external_imported/vcpkg/versions/a-/ankurvdev-embedresource.json b/external_imported/vcpkg/versions/a-/ankurvdev-embedresource.json
new file mode 100644
index 000000000..e80c7ad8d
--- /dev/null
+++ b/external_imported/vcpkg/versions/a-/ankurvdev-embedresource.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "b200fce22ffffeb4174ca68fcca609a9c4857c38",
+      "version": "0.0.10",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/a-/annoy.json b/external_imported/vcpkg/versions/a-/annoy.json
index 3d64f3ebb..d04a679e8 100644
--- a/external_imported/vcpkg/versions/a-/annoy.json
+++ b/external_imported/vcpkg/versions/a-/annoy.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9fbb9d06a1f5a44af0146faddb75f1fb74a0842d",
+      "version": "1.17.2",
+      "port-version": 0
+    },
     {
       "git-tree": "fb0fa777748e35b69b4d3206cccc7ba770d12ee4",
       "version-date": "2023-02-25",
diff --git a/external_imported/vcpkg/versions/a-/antlr4.json b/external_imported/vcpkg/versions/a-/antlr4.json
index b155b9d10..5e0417513 100644
--- a/external_imported/vcpkg/versions/a-/antlr4.json
+++ b/external_imported/vcpkg/versions/a-/antlr4.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "b8a6e8e88f1e6f604f094ce3a3927a8412eb6011",
+      "version": "4.13.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "1fd51b053d31e5215682e6c2970aca92e24d488b",
+      "version": "4.13.0",
+      "port-version": 0
+    },
     {
       "git-tree": "162afe92eab004d57c6b0c972ea5e9b371ccb23a",
       "version": "4.11.1",
diff --git a/external_imported/vcpkg/versions/a-/aom.json b/external_imported/vcpkg/versions/a-/aom.json
index 10580b099..98b24f818 100644
--- a/external_imported/vcpkg/versions/a-/aom.json
+++ b/external_imported/vcpkg/versions/a-/aom.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "7ec15ea1e8e0e6c1401fc91f2dd167eba6122b20",
+      "version-semver": "3.8.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "71fe99b6007b153a98a5058a2d2212117af8031a",
+      "version-semver": "3.7.0",
+      "port-version": 0
+    },
     {
       "git-tree": "daaa6d5ccf417cb9e4997d35b9574f18eaa98cd3",
       "version-semver": "3.5.0",
diff --git a/external_imported/vcpkg/versions/a-/apache-datasketches.json b/external_imported/vcpkg/versions/a-/apache-datasketches.json
new file mode 100644
index 000000000..10bc137a8
--- /dev/null
+++ b/external_imported/vcpkg/versions/a-/apache-datasketches.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "7b8ef82b48832de95bf297231d0019f5cb2b4e82",
+      "version": "4.1.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/a-/apr-util.json b/external_imported/vcpkg/versions/a-/apr-util.json
index c143aa2b1..c73011dfa 100644
--- a/external_imported/vcpkg/versions/a-/apr-util.json
+++ b/external_imported/vcpkg/versions/a-/apr-util.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c6555c2af4f36e5aeb1eabc818738e4ffbba77d8",
+      "version": "1.6.3",
+      "port-version": 0
+    },
     {
       "git-tree": "41451c5e1e1fa8344f6c2d1baf6c0f14b656c433",
       "version": "1.6.1",
diff --git a/external_imported/vcpkg/versions/a-/apr.json b/external_imported/vcpkg/versions/a-/apr.json
index 440e5c4c5..f2acd7ee8 100644
--- a/external_imported/vcpkg/versions/a-/apr.json
+++ b/external_imported/vcpkg/versions/a-/apr.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "106ba582ba3d56fd1db284670ed7d94b6cae9f47",
+      "version": "1.7.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b28b577d536f3eeeb00392ce5f1f7da76f3a9eaa",
+      "version": "1.7.2",
+      "port-version": 1
+    },
     {
       "git-tree": "a68bb37ae242709eb2fab09e1326168d28ab1a56",
       "version": "1.7.2",
diff --git a/external_imported/vcpkg/versions/a-/apriltag.json b/external_imported/vcpkg/versions/a-/apriltag.json
new file mode 100644
index 000000000..3ce1c7624
--- /dev/null
+++ b/external_imported/vcpkg/versions/a-/apriltag.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "5c64c401307d5ae0c4ee91fc2e9e1b3950776feb",
+      "version": "3.3.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3523f2ad6198164afda1782327470188dc3f7221",
+      "version": "3.2.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/a-/apsi.json b/external_imported/vcpkg/versions/a-/apsi.json
index 057b0460d..a4b3eda20 100644
--- a/external_imported/vcpkg/versions/a-/apsi.json
+++ b/external_imported/vcpkg/versions/a-/apsi.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "d846cf4ccf985e33eea10fa2ac4ff44da9086dad",
+      "version-semver": "0.11.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6a3eba819cf2ad5252c8ecae5c0d23f77238d98f",
+      "version-semver": "0.9.0",
+      "port-version": 2
+    },
     {
       "git-tree": "c1614133f3e08c8203102a2dd519c759b01d7156",
       "version-semver": "0.9.0",
diff --git a/external_imported/vcpkg/versions/a-/arb.json b/external_imported/vcpkg/versions/a-/arb.json
index f01bc86bd..1ea3d18cc 100644
--- a/external_imported/vcpkg/versions/a-/arb.json
+++ b/external_imported/vcpkg/versions/a-/arb.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "979cfcc7b4326308bf376e69fd60982d28afef72",
+      "version": "2.21.1",
+      "port-version": 2
+    },
     {
       "git-tree": "e1b560a5a2aa835d54da9fdabac5eea48255e93d",
       "version": "2.21.1",
diff --git a/external_imported/vcpkg/versions/a-/arg-router.json b/external_imported/vcpkg/versions/a-/arg-router.json
index 8d2762f52..2cb30d9c0 100644
--- a/external_imported/vcpkg/versions/a-/arg-router.json
+++ b/external_imported/vcpkg/versions/a-/arg-router.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "b0415ac98a98ec00c2c579c6925588b089bdc158",
+      "version": "1.4.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0342b5a6a038dcb69eb623a70adf911d1e94d523",
+      "version": "1.3.0",
+      "port-version": 0
+    },
     {
       "git-tree": "9e1db4d06fe1aa7b5f0677d4e843331e7c7b2bca",
       "version": "1.2.2",
diff --git a/external_imported/vcpkg/versions/a-/argagg.json b/external_imported/vcpkg/versions/a-/argagg.json
index 930e71e80..992fa28a2 100644
--- a/external_imported/vcpkg/versions/a-/argagg.json
+++ b/external_imported/vcpkg/versions/a-/argagg.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "83071d0926bdea724da61b1977f16e819a56500d",
+      "version": "0.4.7",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2a90b715c9fa23c9e723c4fac3725a73c9007d5b",
+      "version": "0.4.6",
+      "port-version": 3
+    },
     {
       "git-tree": "89a9b4bc7d3ecb518a5a78d3ce9731cf974df7f8",
       "version-string": "0.4.6",
diff --git a/external_imported/vcpkg/versions/a-/argon2.json b/external_imported/vcpkg/versions/a-/argon2.json
index c13b5d118..31a947fda 100644
--- a/external_imported/vcpkg/versions/a-/argon2.json
+++ b/external_imported/vcpkg/versions/a-/argon2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "08a4ee53f1f5330c8f911dff530810c762551675",
+      "version": "20190702",
+      "port-version": 1
+    },
     {
       "git-tree": "3a15f9b44e7ae1ef03f6f92a5552bc85951fd3a1",
       "version": "20190702",
diff --git a/external_imported/vcpkg/versions/a-/argparse.json b/external_imported/vcpkg/versions/a-/argparse.json
index 3f5371922..ee0688713 100644
--- a/external_imported/vcpkg/versions/a-/argparse.json
+++ b/external_imported/vcpkg/versions/a-/argparse.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b8e0c44d4dfe3359b308711daac1e201dc4f8a21",
+      "version": "3.0",
+      "port-version": 0
+    },
     {
       "git-tree": "007156cde2fbc16b990f1a8cd0a29664873a923c",
       "version": "2.9",
diff --git a/external_imported/vcpkg/versions/a-/args.json b/external_imported/vcpkg/versions/a-/args.json
index f011bbad0..3b22e6003 100644
--- a/external_imported/vcpkg/versions/a-/args.json
+++ b/external_imported/vcpkg/versions/a-/args.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6b8449188caa97cb07c87641c977a969846153f5",
+      "version": "6.4.6",
+      "port-version": 0
+    },
     {
       "git-tree": "6da2a8e30a8640e0cb9fe55decd3a634d8c42cb6",
       "version": "6.3.0",
diff --git a/external_imported/vcpkg/versions/a-/argtable3.json b/external_imported/vcpkg/versions/a-/argtable3.json
index 44141564d..ae6317071 100644
--- a/external_imported/vcpkg/versions/a-/argtable3.json
+++ b/external_imported/vcpkg/versions/a-/argtable3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "949eef38520716ab831bb7f008cce93b28af8f54",
+      "version-string": "3.2.2.f25c624",
+      "port-version": 0
+    },
     {
       "git-tree": "b84ef22a845ccccda6197d1865ddd1d8df9098c1",
       "version": "3.2.1",
diff --git a/external_imported/vcpkg/versions/a-/argumentum.json b/external_imported/vcpkg/versions/a-/argumentum.json
index 38bd8a950..ee13801c4 100644
--- a/external_imported/vcpkg/versions/a-/argumentum.json
+++ b/external_imported/vcpkg/versions/a-/argumentum.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7457d6852fec884e90a92c822d424b2a5d114adc",
+      "version": "0.3.2",
+      "port-version": 0
+    },
     {
       "git-tree": "fe42808ab9e1d7f94eb77d40dd8777a0a2510837",
       "version-string": "0.3.1",
diff --git a/external_imported/vcpkg/versions/a-/armadillo.json b/external_imported/vcpkg/versions/a-/armadillo.json
index 1945df2d6..ea55c14c0 100644
--- a/external_imported/vcpkg/versions/a-/armadillo.json
+++ b/external_imported/vcpkg/versions/a-/armadillo.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "c47c5cebd38878763558370cea0db1d527f2fc0a",
+      "version": "12.6.6",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b90cf9e80b6fc606809b1cdfa6b61c433848e197",
+      "version": "12.4.1",
+      "port-version": 0
+    },
     {
       "git-tree": "8e222a2972a96da2fbb07a76585574e9512b107f",
       "version": "12.0.1",
diff --git a/external_imported/vcpkg/versions/a-/arrayfire.json b/external_imported/vcpkg/versions/a-/arrayfire.json
index f2b92b352..034ec71f5 100644
--- a/external_imported/vcpkg/versions/a-/arrayfire.json
+++ b/external_imported/vcpkg/versions/a-/arrayfire.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "4e9b4b24be953b97638224c3563759c7d8a86602",
+      "version-semver": "3.8.0",
+      "port-version": 5
+    },
+    {
+      "git-tree": "37adfc5544ac7301c3ff4a8e16d84804d45b566a",
+      "version-semver": "3.8.0",
+      "port-version": 4
+    },
     {
       "git-tree": "ad19da32c793c60f4f40241792cee65d3c225d10",
       "version-semver": "3.8.0",
diff --git a/external_imported/vcpkg/versions/a-/arrow.json b/external_imported/vcpkg/versions/a-/arrow.json
index 797f4ff29..221a95693 100644
--- a/external_imported/vcpkg/versions/a-/arrow.json
+++ b/external_imported/vcpkg/versions/a-/arrow.json
@@ -1,5 +1,75 @@
 {
   "versions": [
+    {
+      "git-tree": "d736db2f9ac170765f1e6ac8c90f4d46c94a3552",
+      "version": "15.0.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "68021accce836c6b394076d1494379df640dcb8c",
+      "version": "14.0.2",
+      "port-version": 2
+    },
+    {
+      "git-tree": "93a9cd414e5d170755234571e42746b413b7deb3",
+      "version": "14.0.2",
+      "port-version": 1
+    },
+    {
+      "git-tree": "a8cadbfff7756e4b3ae2589f7312f80b82e0ff88",
+      "version": "14.0.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f73c538acb0a7dbda211654b354286af98b399f0",
+      "version": "14.0.1",
+      "port-version": 2
+    },
+    {
+      "git-tree": "f3517d0d8bf39d98d806b0c84eac2f5f1acbbf32",
+      "version": "14.0.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "c1c1beba87b3d9ac5ffc73764c62622cbd31eace",
+      "version": "14.0.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "58708e6a9ecca81874ff79869e9006d42ca2bbfe",
+      "version": "13.0.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "ef87d769431fcefcb1d2864a9266cba168602fa2",
+      "version": "13.0.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e1f5c7d4ca0f45c1629b3f393d360d5c8d035a01",
+      "version": "12.0.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f4aba951b4604b0846af32c50cf4e6959e0e119d",
+      "version": "12.0.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "4e29a49e78533ec10e3142ae7ad69fdd12c8d163",
+      "version": "12.0.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "881bfaaab349dae46929b36e5b84e7036a009ad3",
+      "version": "12.0.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "21fea47a1e9c7bf68e6c088ad5a6b7b6e33c2fcb",
+      "version": "11.0.0",
+      "port-version": 0
+    },
     {
       "git-tree": "04944a4d39fe590b7fed071475502fa8bcfe5a27",
       "version": "10.0.1",
diff --git a/external_imported/vcpkg/versions/a-/ashes.json b/external_imported/vcpkg/versions/a-/ashes.json
index d8c48afc4..fe3439236 100644
--- a/external_imported/vcpkg/versions/a-/ashes.json
+++ b/external_imported/vcpkg/versions/a-/ashes.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f2a5f4f80d32f3b72e20d5eeff4838cea13f76ef",
+      "version-date": "2023-03-12",
+      "port-version": 0
+    },
     {
       "git-tree": "f87e3684259242b878a7ab5617dd0350a6565a15",
       "version-date": "2022-06-08",
diff --git a/external_imported/vcpkg/versions/a-/asio-grpc.json b/external_imported/vcpkg/versions/a-/asio-grpc.json
index f3b6d499f..8e8cd53db 100644
--- a/external_imported/vcpkg/versions/a-/asio-grpc.json
+++ b/external_imported/vcpkg/versions/a-/asio-grpc.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "9442924978688fdb467c605e2944a6b1c6749981",
+      "version": "2.9.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4f03cf73ec5ddb5be5e21f4ce6c7f442ac53a769",
+      "version": "2.9.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ab210d20b701caf5c71159529c8b4f163df0c5cc",
+      "version": "2.8.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b0650c5252b1fb7f0ec616bb3aa9ef7c51732698",
+      "version": "2.7.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "bc957d3a72f3565dfa6511e3d18948f136c926d2",
+      "version": "2.6.0",
+      "port-version": 0
+    },
     {
       "git-tree": "90bb2e110b91caee0ca783b9652cbf212f8fed5b",
       "version": "2.5.1",
diff --git a/external_imported/vcpkg/versions/a-/asio.json b/external_imported/vcpkg/versions/a-/asio.json
index 4b1f8d334..7ecfc22ec 100644
--- a/external_imported/vcpkg/versions/a-/asio.json
+++ b/external_imported/vcpkg/versions/a-/asio.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "9e307fe0a4e0e82f761ef6b6b15dc34f847fae6d",
+      "version": "1.29.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4c8d95a50172d0fd6bf736540379a37a4ec0a512",
+      "version": "1.28.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c0b1256bf350481cdba09fb8586852ca0560e024",
+      "version": "1.28.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "726d66784925af6062a5a8f285c76dab2469572f",
+      "version": "1.28.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "7dde6674d23759f187d73d08f3bd869562a41e8d",
+      "version": "1.28.0",
+      "port-version": 0
+    },
     {
       "git-tree": "b134a3e21a2ef661aa5e3802cefc22386c095aaa",
       "version": "1.24.0",
diff --git a/external_imported/vcpkg/versions/a-/asiochan.json b/external_imported/vcpkg/versions/a-/asiochan.json
new file mode 100644
index 000000000..5e14cd8b2
--- /dev/null
+++ b/external_imported/vcpkg/versions/a-/asiochan.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "857feb5fd868cdae02e6bb9d6252174a9a39cb61",
+      "version-date": "2022-11-25",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/a-/asiosdk.json b/external_imported/vcpkg/versions/a-/asiosdk.json
index b5f3f1c86..eb2789904 100644
--- a/external_imported/vcpkg/versions/a-/asiosdk.json
+++ b/external_imported/vcpkg/versions/a-/asiosdk.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "798527dff966ba5c7ef8aab89eb941791d682090",
+      "version": "2.3.3",
+      "port-version": 7
+    },
+    {
+      "git-tree": "a58f240a86a38690339c96b11db0a62fd2388e4f",
+      "version": "2.3.3",
+      "port-version": 6
+    },
     {
       "git-tree": "75f1c1ef95024543bf7298ba4389eafe67b9f473",
       "version": "2.3.3",
diff --git a/external_imported/vcpkg/versions/a-/asmjit.json b/external_imported/vcpkg/versions/a-/asmjit.json
index b6222d240..82ef33035 100644
--- a/external_imported/vcpkg/versions/a-/asmjit.json
+++ b/external_imported/vcpkg/versions/a-/asmjit.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "e226149f3b22da2162e7d93eacc9f19411401e62",
+      "version-date": "2023-03-25",
+      "port-version": 0
+    },
+    {
+      "git-tree": "adc2ad6be145c9cbf66d606bddc56267b02e41bf",
+      "version-date": "2022-11-06",
+      "port-version": 0
+    },
     {
       "git-tree": "f67010904c0f2d7a1d79a647ea928aece3e66750",
       "version-date": "2021-10-26",
diff --git a/external_imported/vcpkg/versions/a-/asmtk.json b/external_imported/vcpkg/versions/a-/asmtk.json
new file mode 100644
index 000000000..c96f70a0a
--- /dev/null
+++ b/external_imported/vcpkg/versions/a-/asmtk.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "29f1e796d085204c9552c62adbe7279acfd8f3d9",
+      "version-date": "2022-11-06",
+      "port-version": 1
+    },
+    {
+      "git-tree": "9805dcacbdaa6f23d28fac07d973d22c2d00aec5",
+      "version-date": "2022-11-06",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/a-/assimp.json b/external_imported/vcpkg/versions/a-/assimp.json
index a150b0743..88dc1473b 100644
--- a/external_imported/vcpkg/versions/a-/assimp.json
+++ b/external_imported/vcpkg/versions/a-/assimp.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "379f3ceb0d492f5d41bd9320cfd519da9b94bfa8",
+      "version": "5.3.1",
+      "port-version": 4
+    },
+    {
+      "git-tree": "76ae4b01818ee27c5beac4d0b18cb566f94f27ec",
+      "version": "5.3.1",
+      "port-version": 3
+    },
+    {
+      "git-tree": "a825878e38726e638f29d4defeadb9108ac20697",
+      "version": "5.3.1",
+      "port-version": 2
+    },
+    {
+      "git-tree": "572034c626843af86fe62b64905fd4e79f19535f",
+      "version": "5.3.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "f9934603cb6f42343b122951f22b5af3c1967cde",
+      "version": "5.3.1",
+      "port-version": 0
+    },
     {
       "git-tree": "bdd963b2ef327bf5e8533689aff4707226e22851",
       "version": "5.2.5",
diff --git a/external_imported/vcpkg/versions/a-/async-mqtt.json b/external_imported/vcpkg/versions/a-/async-mqtt.json
new file mode 100644
index 000000000..1d5bdf2c0
--- /dev/null
+++ b/external_imported/vcpkg/versions/a-/async-mqtt.json
@@ -0,0 +1,59 @@
+{
+  "versions": [
+    {
+      "git-tree": "5cdfa2d3e21b56533c7862336237abeae866b8da",
+      "version": "4.0.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "54a9da56ebb673479269e266208e7b1133ff128a",
+      "version": "3.0.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "1785cef2cfd89416b423c3a67c5ef0ef29c76100",
+      "version": "2.0.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f7194dfdf664f2037e9917fd58220d421dc9de76",
+      "version": "1.0.9",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e68200b49b2f55aaf0e4a597af4dcd6d3f91d478",
+      "version": "1.0.7",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9c89da20b589c01a60d633c5a1db2ed36215eb31",
+      "version": "1.0.6",
+      "port-version": 1
+    },
+    {
+      "git-tree": "cd1032beeb26ec19d1a9c384b0c8335249292e66",
+      "version": "1.0.6",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5d6da6090c0d80cca553b35ad733f0f3a879f0f7",
+      "version": "1.0.5",
+      "port-version": 0
+    },
+    {
+      "git-tree": "12788eb6a749ef28ef1dca9d6ab141bdf0458208",
+      "version": "1.0.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "624a7f874eca273e12ebe2ac104d13294c4126bd",
+      "version": "1.0.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "035119f49547730765ec2a296355d550b8ac7920",
+      "version": "1.0.2",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/a-/async-simple.json b/external_imported/vcpkg/versions/a-/async-simple.json
new file mode 100644
index 000000000..7c4fe94b2
--- /dev/null
+++ b/external_imported/vcpkg/versions/a-/async-simple.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "f2ba1d445f31f11bc0311be0de36f56fc40531da",
+      "version": "1.3",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/a-/asynch.json b/external_imported/vcpkg/versions/a-/asynch.json
index 629b9978a..6747c3ea8 100644
--- a/external_imported/vcpkg/versions/a-/asynch.json
+++ b/external_imported/vcpkg/versions/a-/asynch.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4aa950187368ee03bd5ee5739468fc68ea4c9e0c",
+      "version-date": "2019-09-21",
+      "port-version": 3
+    },
     {
       "git-tree": "e656692601ab76c652a9b09c98bb36ee8723f9c0",
       "version-string": "2019-09-21",
diff --git a/external_imported/vcpkg/versions/a-/at-spi2-atk.json b/external_imported/vcpkg/versions/a-/at-spi2-atk.json
index a97e2158f..69e2bf28d 100644
--- a/external_imported/vcpkg/versions/a-/at-spi2-atk.json
+++ b/external_imported/vcpkg/versions/a-/at-spi2-atk.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "97535464d9f15ce3bcadaf78ad8031fa3df5eda5",
+      "version": "2.38.0",
+      "port-version": 1
+    },
     {
       "git-tree": "ebb28a9cdbd06d3185ba2e0cfc1945be23a0a608",
       "version": "2.38.0",
diff --git a/external_imported/vcpkg/versions/a-/at-spi2-core.json b/external_imported/vcpkg/versions/a-/at-spi2-core.json
index 90206cfee..b3509184c 100644
--- a/external_imported/vcpkg/versions/a-/at-spi2-core.json
+++ b/external_imported/vcpkg/versions/a-/at-spi2-core.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "5143414003b96ead1ffe40c57c9bf764bf64b0c0",
+      "version": "2.44.1",
+      "port-version": 3
+    },
+    {
+      "git-tree": "897df7693a8a1addc3a5ab84efabef89e4cef1d8",
+      "version": "2.44.1",
+      "port-version": 2
+    },
     {
       "git-tree": "72611608fcbd5e1a1b867a88e4810d75ddc94fdf",
       "version": "2.44.1",
diff --git a/external_imported/vcpkg/versions/a-/atk.json b/external_imported/vcpkg/versions/a-/atk.json
index 15a1a354c..dcfc9f090 100644
--- a/external_imported/vcpkg/versions/a-/atk.json
+++ b/external_imported/vcpkg/versions/a-/atk.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "c97f8dd9d133fb3e75abf33040b3ec61e032734d",
+      "version": "2.38.0",
+      "port-version": 8
+    },
+    {
+      "git-tree": "d21ac2c541d67128cafda7c4b190e217cb943174",
+      "version": "2.38.0",
+      "port-version": 7
+    },
+    {
+      "git-tree": "6c40b0b29185c3bf172af4eaca94e38a892221b2",
+      "version": "2.38.0",
+      "port-version": 6
+    },
     {
       "git-tree": "0287be8f06bb4da8b89f9edb0aa93258c6d36f1e",
       "version": "2.38.0",
diff --git a/external_imported/vcpkg/versions/a-/atkmm.json b/external_imported/vcpkg/versions/a-/atkmm.json
index 18d71ff6f..00ab30dbe 100644
--- a/external_imported/vcpkg/versions/a-/atkmm.json
+++ b/external_imported/vcpkg/versions/a-/atkmm.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "98ad8f81a31186ba590b553c5e99d4ea5415eb64",
+      "version": "2.36.1",
+      "port-version": 2
+    },
+    {
+      "git-tree": "d9acaf9d071486528917fa62e0315a65d2c4ed6d",
+      "version": "2.36.1",
+      "port-version": 1
+    },
     {
       "git-tree": "f0bad5eb22d4affecd3eb08be801a8692b5704c6",
       "version": "2.36.1",
diff --git a/external_imported/vcpkg/versions/a-/atl.json b/external_imported/vcpkg/versions/a-/atl.json
new file mode 100644
index 000000000..458b1eed6
--- /dev/null
+++ b/external_imported/vcpkg/versions/a-/atl.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "0cf33fe03c09b26209c1162fee2bb2c5538f8b0f",
+      "version": "0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/a-/atlmfc.json b/external_imported/vcpkg/versions/a-/atlmfc.json
index 7f6fcbf60..f9be7ff97 100644
--- a/external_imported/vcpkg/versions/a-/atlmfc.json
+++ b/external_imported/vcpkg/versions/a-/atlmfc.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "1a6d710d7d3ffd42089aa001571c625805f59918",
+      "version": "0",
+      "port-version": 3
+    },
+    {
+      "git-tree": "60bac7802a9cdb32192315262495b647af36b723",
+      "version": "0",
+      "port-version": 2
+    },
     {
       "git-tree": "509a448c797ddb6cf67ba179b6edff02fee17865",
       "version-string": "0",
diff --git a/external_imported/vcpkg/versions/a-/atomic-queue.json b/external_imported/vcpkg/versions/a-/atomic-queue.json
index 56784d4b3..328de0fc0 100644
--- a/external_imported/vcpkg/versions/a-/atomic-queue.json
+++ b/external_imported/vcpkg/versions/a-/atomic-queue.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "045962c06085fe2da8633106b2170b29f4febe47",
+      "version": "1.5",
+      "port-version": 0
+    },
     {
       "git-tree": "a32a426d9c16a0067532134ecb6680ee7928f7f7",
       "version-date": "2021-05-03",
diff --git a/external_imported/vcpkg/versions/a-/attr.json b/external_imported/vcpkg/versions/a-/attr.json
index b20df63da..06f9530a2 100644
--- a/external_imported/vcpkg/versions/a-/attr.json
+++ b/external_imported/vcpkg/versions/a-/attr.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "8c3b068a238cc47f966236ab2c5e190970923f1a",
+      "version-semver": "2.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2348d8cea7b1c70c26139bbf366d57830cea8bf5",
+      "version-semver": "2.5.1",
+      "port-version": 1
+    },
     {
       "git-tree": "99ae42f2118c5c6d128b332dd5e914aeba6702d9",
       "version-semver": "2.5.1",
diff --git a/external_imported/vcpkg/versions/a-/aubio.json b/external_imported/vcpkg/versions/a-/aubio.json
index 8117a0dce..d8521908b 100644
--- a/external_imported/vcpkg/versions/a-/aubio.json
+++ b/external_imported/vcpkg/versions/a-/aubio.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e51e332257e4b788828390a39d86109000d5b960",
+      "version-date": "2022-01-26",
+      "port-version": 1
+    },
     {
       "git-tree": "2e15f362018acee6d200577e41252e911eef35f0",
       "version-date": "2022-01-26",
diff --git a/external_imported/vcpkg/versions/a-/audiofile.json b/external_imported/vcpkg/versions/a-/audiofile.json
index f928b164c..d4f3bebe0 100644
--- a/external_imported/vcpkg/versions/a-/audiofile.json
+++ b/external_imported/vcpkg/versions/a-/audiofile.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6f06a6467594b612bfd24dc86f696d07e1c4b500",
+      "version": "1.1.1",
+      "port-version": 0
+    },
     {
       "git-tree": "fa276b1ad374c2ae6034445b6655518d8f9a23de",
       "version": "1.1.0",
diff --git a/external_imported/vcpkg/versions/a-/aurora.json b/external_imported/vcpkg/versions/a-/aurora.json
index 5fb067e57..430a249aa 100644
--- a/external_imported/vcpkg/versions/a-/aurora.json
+++ b/external_imported/vcpkg/versions/a-/aurora.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "05d122ad98c50099a3bdbfd845faf2460df6659a",
+      "version": "2017-06-21-c75699d2a8caa726260c29b6d7a0fd35f8f28933",
+      "port-version": 2
+    },
     {
       "git-tree": "a41f2335fd703ebb6a3dbd4eb20260754cff110c",
       "version-string": "2017-06-21-c75699d2a8caa726260c29b6d7a0fd35f8f28933",
diff --git a/external_imported/vcpkg/versions/a-/autobahn.json b/external_imported/vcpkg/versions/a-/autobahn.json
index 5aaa23e76..44a825b55 100644
--- a/external_imported/vcpkg/versions/a-/autobahn.json
+++ b/external_imported/vcpkg/versions/a-/autobahn.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6d30e9c65f3f7f62c0020630f26df0f772854996",
+      "version": "20.8.1",
+      "port-version": 2
+    },
     {
       "git-tree": "2d7687436a474abcf18dd1b5689437218f8f6d36",
       "version-string": "20.8.1",
diff --git a/external_imported/vcpkg/versions/a-/autodock-vina.json b/external_imported/vcpkg/versions/a-/autodock-vina.json
index c0e43d1be..a3e989fce 100644
--- a/external_imported/vcpkg/versions/a-/autodock-vina.json
+++ b/external_imported/vcpkg/versions/a-/autodock-vina.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "d962d4e25cc8a74a34729a493203c3060826fa1e",
+      "version-semver": "1.2.5",
+      "port-version": 1
+    },
+    {
+      "git-tree": "fbbf68e11b2e95110b26735162c7c07b4db2d670",
+      "version-semver": "1.2.5",
+      "port-version": 0
+    },
     {
       "git-tree": "05bd7ebce99db7a1d6fb9fa3194e53583d2b3b25",
       "version-semver": "1.2.3",
diff --git a/external_imported/vcpkg/versions/a-/avcpp.json b/external_imported/vcpkg/versions/a-/avcpp.json
index 2c47c0d68..1493f9931 100644
--- a/external_imported/vcpkg/versions/a-/avcpp.json
+++ b/external_imported/vcpkg/versions/a-/avcpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "37ae9f7b52ea3f3ce0da3c7564f006639816c084",
+      "version": "2.2.1",
+      "port-version": 0
+    },
     {
       "git-tree": "7227fc33d6f65475816f10bffcdbedd6d2485298",
       "version": "2.1.0",
diff --git a/external_imported/vcpkg/versions/a-/avisynthplus.json b/external_imported/vcpkg/versions/a-/avisynthplus.json
index feb78b21b..966009bac 100644
--- a/external_imported/vcpkg/versions/a-/avisynthplus.json
+++ b/external_imported/vcpkg/versions/a-/avisynthplus.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "d6a5198252f84212548934db0f73184919283928",
+      "version": "3.7.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4e89f515dc497bb37dd138d024d572ef318a10fb",
+      "version": "3.7.2",
+      "port-version": 2
+    },
     {
       "git-tree": "10f62c32226c4f588e4524ebe1ffc36a2ad2165a",
       "version": "3.7.2",
diff --git a/external_imported/vcpkg/versions/a-/avro-c.json b/external_imported/vcpkg/versions/a-/avro-c.json
index 35574415d..0805932df 100644
--- a/external_imported/vcpkg/versions/a-/avro-c.json
+++ b/external_imported/vcpkg/versions/a-/avro-c.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "76ef10758076c92faaae286e1d38c1770dc4f23c",
+      "version": "1.11.3",
+      "port-version": 0
+    },
     {
       "git-tree": "7b07da3abd56565c8d2e75942aab468ece0f3115",
       "version": "1.11.0",
diff --git a/external_imported/vcpkg/versions/a-/avro-cpp.json b/external_imported/vcpkg/versions/a-/avro-cpp.json
index 2475b975d..bc055ef7d 100644
--- a/external_imported/vcpkg/versions/a-/avro-cpp.json
+++ b/external_imported/vcpkg/versions/a-/avro-cpp.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "e5b130595cfdd2c5fcecf41bcbbed730aab60285",
+      "version": "1.11.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0f04b2076c299b830bfdd3a698db754f4f8cf269",
+      "version-date": "2022-11-07",
+      "port-version": 1
+    },
     {
       "git-tree": "08f82323ee0bb00a297cc1318c04dd3bce5d963e",
       "version-date": "2022-11-07",
diff --git a/external_imported/vcpkg/versions/a-/aws-c-auth.json b/external_imported/vcpkg/versions/a-/aws-c-auth.json
index 5397c9551..a3b56b83a 100644
--- a/external_imported/vcpkg/versions/a-/aws-c-auth.json
+++ b/external_imported/vcpkg/versions/a-/aws-c-auth.json
@@ -1,5 +1,45 @@
 {
   "versions": [
+    {
+      "git-tree": "d2b36610b15f3007dcdc328c29b4db5c0862f27f",
+      "version": "0.7.14",
+      "port-version": 0
+    },
+    {
+      "git-tree": "47a0b91751e137d79b7c6e8ca614d98171ab95a9",
+      "version": "0.7.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e80f8a3a15231a8d513d03ff7761acf4a5c18269",
+      "version": "0.7.8",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ab09a6f41712ba35a021c3d6392a804e47858668",
+      "version": "0.7.6",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f5aba6169081364e7585dfc613a0a476bac838f2",
+      "version": "0.7.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8c6d3fc7a7471133d8fa5c12f019432a89678da2",
+      "version": "0.7.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2540832abbf669a0efdf221f74ba3bb68f795056",
+      "version": "0.7.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "33b7db583ea58cd2516c5bdc3d2f331dc767eaad",
+      "version": "0.7.0",
+      "port-version": 0
+    },
     {
       "git-tree": "51a9d9adaa80e798b6d856653cbece6dbc52c41c",
       "version": "0.6.22",
diff --git a/external_imported/vcpkg/versions/a-/aws-c-cal.json b/external_imported/vcpkg/versions/a-/aws-c-cal.json
index 889c99b0a..f2ce100b5 100644
--- a/external_imported/vcpkg/versions/a-/aws-c-cal.json
+++ b/external_imported/vcpkg/versions/a-/aws-c-cal.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "43c961d933d7a928c15cdfb7c5f7a6c16875bed5",
+      "version": "0.6.9",
+      "port-version": 0
+    },
+    {
+      "git-tree": "df757b731aa4c59ac71c43d02fe87edaff5680b3",
+      "version": "0.6.2",
+      "port-version": 1
+    },
+    {
+      "git-tree": "5633a1e4fad4542c5e3a665a09bf77d276031429",
+      "version": "0.6.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c833007ab0c5b36c45e555487117c271d52c4236",
+      "version": "0.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "17bf60e8e810ac219b328b2337afc58d65c6b8dd",
+      "version": "0.6.0",
+      "port-version": 0
+    },
     {
       "git-tree": "e9b46cbe5ae06bae580a43efd676aee7de00df08",
       "version": "0.5.20",
diff --git a/external_imported/vcpkg/versions/a-/aws-c-common.json b/external_imported/vcpkg/versions/a-/aws-c-common.json
index 85bd83bb4..2117c1be7 100644
--- a/external_imported/vcpkg/versions/a-/aws-c-common.json
+++ b/external_imported/vcpkg/versions/a-/aws-c-common.json
@@ -1,5 +1,45 @@
 {
   "versions": [
+    {
+      "git-tree": "21a8991014f0f7b8678c4e8c4d6958a214b1f04b",
+      "version": "0.9.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e07be2013141ae49e6bf3340ccce57b0031cfb17",
+      "version": "0.9.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "30465cfdc4851970efc5767fd57ad6e0dedad46a",
+      "version": "0.9.9",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6d58a5944c2340297985dc05678671129c45d40f",
+      "version": "0.9.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "be7b04f5af0c0b475733738be33d3596936764ac",
+      "version": "0.9.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ce8953debbd46bc73523d3e214f42e5a088adae5",
+      "version": "0.9.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6447f286aa87615dbf0a2d9227939dd537297d92",
+      "version": "0.8.23",
+      "port-version": 0
+    },
+    {
+      "git-tree": "54a4a42c299e7b32a1199ad382c4b537a18df034",
+      "version": "0.8.9",
+      "port-version": 1
+    },
     {
       "git-tree": "d2ef01e925f6168e81c00ab304be70d312ea2ba9",
       "version": "0.8.9",
diff --git a/external_imported/vcpkg/versions/a-/aws-c-compression.json b/external_imported/vcpkg/versions/a-/aws-c-compression.json
index cd640cb62..3d01df7bd 100644
--- a/external_imported/vcpkg/versions/a-/aws-c-compression.json
+++ b/external_imported/vcpkg/versions/a-/aws-c-compression.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a0373f54fe747cd91672c56b2d86ce0e8d9e4491",
+      "version": "0.2.17",
+      "port-version": 0
+    },
     {
       "git-tree": "770807ecff5bc7a1d5387b956a643bf5e3205078",
       "version": "0.2.16",
diff --git a/external_imported/vcpkg/versions/a-/aws-c-event-stream.json b/external_imported/vcpkg/versions/a-/aws-c-event-stream.json
index 998f0cfac..a3a42431a 100644
--- a/external_imported/vcpkg/versions/a-/aws-c-event-stream.json
+++ b/external_imported/vcpkg/versions/a-/aws-c-event-stream.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "26154860990d45f57dc53a6e7ce291112af3c4e3",
+      "version": "0.4.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c0c5daf2e95fa6a4e02f178c8ff091b0c8ed6b0e",
+      "version": "0.3.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9e169d96e976e9c9afae3b1b5d9045f49c6cbec2",
+      "version": "0.3.1",
+      "port-version": 0
+    },
     {
       "git-tree": "cd36c61d2769534dbe9e4813e1269e88961ff5fe",
       "version": "0.2.18",
diff --git a/external_imported/vcpkg/versions/a-/aws-c-http.json b/external_imported/vcpkg/versions/a-/aws-c-http.json
index 0b61da30e..37e35089b 100644
--- a/external_imported/vcpkg/versions/a-/aws-c-http.json
+++ b/external_imported/vcpkg/versions/a-/aws-c-http.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "aa98598f65061ac8a183b36862eac0c4e89d38a8",
+      "version": "0.8.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "eb6f67641f77b8ba24d435c6cf49b7a36cf80536",
+      "version": "0.7.14",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ab0c882c2d7c32b58e11c9e7124574933b701d8f",
+      "version": "0.7.13",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6333ba487074d6b76f7270654796334049371d08",
+      "version": "0.7.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c33f11482c79e72522708d43522665505d47730d",
+      "version": "0.7.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c9d908413ad0bba2f32673c4b5b16dcdc6abc559",
+      "version": "0.7.10",
+      "port-version": 0
+    },
     {
       "git-tree": "c097685110e260e91a1ac843ec20eba29f67574c",
       "version": "0.7.3",
diff --git a/external_imported/vcpkg/versions/a-/aws-c-io.json b/external_imported/vcpkg/versions/a-/aws-c-io.json
index 4633cfa73..763cbd533 100644
--- a/external_imported/vcpkg/versions/a-/aws-c-io.json
+++ b/external_imported/vcpkg/versions/a-/aws-c-io.json
@@ -1,5 +1,45 @@
 {
   "versions": [
+    {
+      "git-tree": "a8cf3e80c656857ed3959d2d2088c2bd590eceb3",
+      "version": "0.14.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d821d965f7ef5ea73553cd6131cdfbf081924e7c",
+      "version": "0.14.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "346cdc018fbb4d19764457fe205fd0e8db0d8088",
+      "version": "0.14.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "586cb06ad50ef2627c4dd30ab97b88d79e559fd5",
+      "version": "0.13.36",
+      "port-version": 0
+    },
+    {
+      "git-tree": "caab59ca1fe5071d552eaf073a501151ac6099a5",
+      "version": "0.13.35",
+      "port-version": 0
+    },
+    {
+      "git-tree": "888ba4e86b810e8181ed897d4dc03b1a9f78c9f7",
+      "version": "0.13.32",
+      "port-version": 0
+    },
+    {
+      "git-tree": "702a1838bbe3f84ac08e515007467ae513eab4da",
+      "version": "0.13.31",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5b3bb7fda57741248eff888afaea9724d68b7b5e",
+      "version": "0.13.27",
+      "port-version": 0
+    },
     {
       "git-tree": "af0f6d934c56ef089365a8c27c8c9f183e554ef9",
       "version": "0.13.14",
diff --git a/external_imported/vcpkg/versions/a-/aws-c-mqtt.json b/external_imported/vcpkg/versions/a-/aws-c-mqtt.json
index d027a6da5..4109de747 100644
--- a/external_imported/vcpkg/versions/a-/aws-c-mqtt.json
+++ b/external_imported/vcpkg/versions/a-/aws-c-mqtt.json
@@ -1,5 +1,40 @@
 {
   "versions": [
+    {
+      "git-tree": "e288b3c65ad4a03bbadfc763aa362a4bce51ea25",
+      "version": "0.10.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "79c21d94b22888e395bd53041457397fcb013486",
+      "version": "0.9.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9210c6a8260e7b5058fd4d9bb7d1a42cd6d78079",
+      "version": "0.9.9",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c48dfcca0c391e496b3ba1709f491d3cba914e89",
+      "version": "0.9.6",
+      "port-version": 0
+    },
+    {
+      "git-tree": "96d192387fd36708a0cd3cc41552e473c8bcb2f9",
+      "version": "0.9.5",
+      "port-version": 0
+    },
+    {
+      "git-tree": "7ef9969a5ceba966df73fb157fa6f74b45f8e8f0",
+      "version": "0.9.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "627f6778158776948501ca6a5516ccad59d05a25",
+      "version": "0.8.14",
+      "port-version": 0
+    },
     {
       "git-tree": "240cc0cba578a941b0a23d8dfdbdaf930257b029",
       "version": "0.8.5",
diff --git a/external_imported/vcpkg/versions/a-/aws-c-s3.json b/external_imported/vcpkg/versions/a-/aws-c-s3.json
index 409ca51c3..8e4efc017 100644
--- a/external_imported/vcpkg/versions/a-/aws-c-s3.json
+++ b/external_imported/vcpkg/versions/a-/aws-c-s3.json
@@ -1,5 +1,45 @@
 {
   "versions": [
+    {
+      "git-tree": "078a6a0fb48d0f7051c34811347b5e93a647c368",
+      "version": "0.5.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "74a12ce42334826f8eae659d435ebe39bf0f2c16",
+      "version": "0.4.9",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e12d01447182cce36c5524fbd6a22f8135dd9ecb",
+      "version": "0.4.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "709e576231214f693d747d8187e44b30c77f4443",
+      "version": "0.3.24",
+      "port-version": 0
+    },
+    {
+      "git-tree": "11800b01a8e9e48aa7fe4c7e5f2e64592b5d7ebd",
+      "version": "0.3.17",
+      "port-version": 0
+    },
+    {
+      "git-tree": "47d21c2fbae187617f4781cd3e6bec932da788d6",
+      "version": "0.3.14",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d081cc24b4c9c6af3f47087da235d5684c60128b",
+      "version": "0.3.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b5022c40fb60e0fa219d4f8ea52239f5625546c1",
+      "version": "0.2.3",
+      "port-version": 1
+    },
     {
       "git-tree": "b320e0f3acafe6dc3733a511e4e2b7e2fadeda4d",
       "version": "0.2.3",
diff --git a/external_imported/vcpkg/versions/a-/aws-c-sdkutils.json b/external_imported/vcpkg/versions/a-/aws-c-sdkutils.json
index 18fb90c62..e7aebe6d8 100644
--- a/external_imported/vcpkg/versions/a-/aws-c-sdkutils.json
+++ b/external_imported/vcpkg/versions/a-/aws-c-sdkutils.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "40dbafcbc75133f129ea11d38162703f40dadd86",
+      "version": "0.1.14",
+      "port-version": 0
+    },
+    {
+      "git-tree": "7bf3d0be0a297cd59345aa56a1b00017e989957c",
+      "version": "0.1.13",
+      "port-version": 0
+    },
+    {
+      "git-tree": "23164b5e925decd15773f93c5fbe0330be7ac9f5",
+      "version": "0.1.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5cb38bd6a7671f8a9ee981121f485b78d28aaa0f",
+      "version": "0.1.11",
+      "port-version": 0
+    },
     {
       "git-tree": "613cee18da297b892541b45ffe696560865052fb",
       "version": "0.1.7",
diff --git a/external_imported/vcpkg/versions/a-/aws-checksums.json b/external_imported/vcpkg/versions/a-/aws-checksums.json
index 2113aa32a..166da7bcc 100644
--- a/external_imported/vcpkg/versions/a-/aws-checksums.json
+++ b/external_imported/vcpkg/versions/a-/aws-checksums.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "05e17cee2b7d221bb49bebe55e8801f9cea99014",
+      "version": "0.1.17",
+      "port-version": 0
+    },
+    {
+      "git-tree": "7b723c21e8848802c057f18cac7185bf0be37a2c",
+      "version": "0.1.16",
+      "port-version": 0
+    },
     {
       "git-tree": "753f3e1f6c5054abb9ee014f45a4fcffd9a93678",
       "version": "0.1.14",
diff --git a/external_imported/vcpkg/versions/a-/aws-crt-cpp.json b/external_imported/vcpkg/versions/a-/aws-crt-cpp.json
index dc2d5a5e6..6fe1379c3 100644
--- a/external_imported/vcpkg/versions/a-/aws-crt-cpp.json
+++ b/external_imported/vcpkg/versions/a-/aws-crt-cpp.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "110c01a23de8f129c041243ea29a8d9483665ec8",
+      "version": "0.26.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0ec1e5fdb18e38dc54d06842860ec7f95df53c5a",
+      "version": "0.24.8",
+      "port-version": 0
+    },
+    {
+      "git-tree": "855f83fcf951b5fcaf0af75159ff979980670088",
+      "version": "0.24.7",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8c9935cdadd2baa48566f59d5ca1c253d3187ed1",
+      "version": "0.23.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "05d7275131943efc847ecbec0dc1c204b9ee8eb1",
+      "version": "0.23.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5e1e41fc6b37ccd7b0ddfd9d15c9b06339748feb",
+      "version": "0.20.3",
+      "port-version": 0
+    },
     {
       "git-tree": "0473f0c74e9a4530d0b53d3298828eb42ce45ec4",
       "version": "0.19.5",
diff --git a/external_imported/vcpkg/versions/a-/aws-lambda-cpp.json b/external_imported/vcpkg/versions/a-/aws-lambda-cpp.json
index 0b7b5dab2..1f6572a8f 100644
--- a/external_imported/vcpkg/versions/a-/aws-lambda-cpp.json
+++ b/external_imported/vcpkg/versions/a-/aws-lambda-cpp.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "f50bbb34da1be6d30e004ed7a6227151792c1920",
+      "version": "0.2.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3cc6fdf7e7744d5aef38bee127751f62367f72d4",
+      "version": "0.2.9",
+      "port-version": 0
+    },
     {
       "git-tree": "f1bca88dcd24c6f64b69e49c99bc76db2e4f91bb",
       "version": "0.2.8",
diff --git a/external_imported/vcpkg/versions/a-/aws-sdk-cpp.json b/external_imported/vcpkg/versions/a-/aws-sdk-cpp.json
index 620982062..1337d87ee 100644
--- a/external_imported/vcpkg/versions/a-/aws-sdk-cpp.json
+++ b/external_imported/vcpkg/versions/a-/aws-sdk-cpp.json
@@ -1,5 +1,85 @@
 {
   "versions": [
+    {
+      "git-tree": "192340da352851921d2c706648ce973435657d35",
+      "version": "1.11.255",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9dbb54ababc4137e3a91f50aeb8801a89ec6234c",
+      "version": "1.11.245",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2390f58d566a9a1a25ae4cf7b7862e344eaff2b1",
+      "version": "1.11.225",
+      "port-version": 0
+    },
+    {
+      "git-tree": "eeab7418483a9b578bb186acde08a1130301e0a1",
+      "version": "1.11.215",
+      "port-version": 1
+    },
+    {
+      "git-tree": "bbebf005503aa74f6725df8f4d04eb21a894e127",
+      "version": "1.11.215",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f669bd77e23c643da0c15162dc46d84b924938a0",
+      "version": "1.11.201",
+      "port-version": 1
+    },
+    {
+      "git-tree": "7e0ba4822d4dcc90eac626f351d7a3fd215a68a8",
+      "version": "1.11.201",
+      "port-version": 0
+    },
+    {
+      "git-tree": "bb95756096209a013e786b104a11b0aa6357119d",
+      "version": "1.11.169",
+      "port-version": 2
+    },
+    {
+      "git-tree": "5c0ad10a852e7facc0cea54e3990f16e0cb1ea8b",
+      "version": "1.11.169",
+      "port-version": 1
+    },
+    {
+      "git-tree": "714b1b2815e2a3f57c79c8703a9cdc9892240acd",
+      "version": "1.11.169",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3fb36e871ff39d82abfb7eca5bedbaa2b177c72e",
+      "version": "1.11.160",
+      "port-version": 0
+    },
+    {
+      "git-tree": "94f8f9c8774eda639d96a707cf3fda55fc9df034",
+      "version": "1.11.155",
+      "port-version": 1
+    },
+    {
+      "git-tree": "f0cc899ce753e066c26bec70fdfb87c84feaf28f",
+      "version": "1.11.155",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f8b598e9d9b0ecde285a6898a1962f937f9511e9",
+      "version": "1.11.149",
+      "port-version": 0
+    },
+    {
+      "git-tree": "bacc82ba5052ad66e3b20ad1cae53c36989a28ea",
+      "version": "1.11.132",
+      "port-version": 0
+    },
+    {
+      "git-tree": "785c086e68c5e4d5257587ee6deeae566140b8fe",
+      "version": "1.11.65",
+      "port-version": 0
+    },
     {
       "git-tree": "495471c4071406ec6929d77a553dc03ebd6df095",
       "version": "1.11.4",
diff --git a/external_imported/vcpkg/versions/a-/azmq.json b/external_imported/vcpkg/versions/a-/azmq.json
index d29dbb586..cf38a99ac 100644
--- a/external_imported/vcpkg/versions/a-/azmq.json
+++ b/external_imported/vcpkg/versions/a-/azmq.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0a99701bb7160639ec7d75187271a16f6c6c42d8",
+      "version-date": "2023-03-23",
+      "port-version": 0
+    },
     {
       "git-tree": "4c4381f52a268bbf8084db2b1684ad740d3e4408",
       "version": "1.0.3",
diff --git a/external_imported/vcpkg/versions/a-/azure-c-shared-utility.json b/external_imported/vcpkg/versions/a-/azure-c-shared-utility.json
index 8acf4b87b..25b74c196 100644
--- a/external_imported/vcpkg/versions/a-/azure-c-shared-utility.json
+++ b/external_imported/vcpkg/versions/a-/azure-c-shared-utility.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "c5938bd8175ca21aa30c5e9b2989b776ec50a481",
+      "version-date": "2023-08-07",
+      "port-version": 0
+    },
+    {
+      "git-tree": "7fed72b2797511395842d94efefa040e0fd1f65a",
+      "version-date": "2023-01-18",
+      "port-version": 1
+    },
     {
       "git-tree": "78c535284693d96c19026445e363459b37a4aca9",
       "version-date": "2023-01-18",
diff --git a/external_imported/vcpkg/versions/a-/azure-core-amqp-cpp.json b/external_imported/vcpkg/versions/a-/azure-core-amqp-cpp.json
new file mode 100644
index 000000000..357ec3f9c
--- /dev/null
+++ b/external_imported/vcpkg/versions/a-/azure-core-amqp-cpp.json
@@ -0,0 +1,49 @@
+{
+  "versions": [
+    {
+      "git-tree": "ef715da3b8f753c90e4f18df2bb34b9b31749490",
+      "version-semver": "1.0.0-beta.7",
+      "port-version": 0
+    },
+    {
+      "git-tree": "67e6280661e8992e3fd118517ac0f1d0f0cc662e",
+      "version-semver": "1.0.0-beta.6",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a5742923375357a52887b2c969db207937b01592",
+      "version-semver": "1.0.0-beta.5",
+      "port-version": 0
+    },
+    {
+      "git-tree": "50c7a85fdc78ded123beb5dd15e2b4557ace24b2",
+      "version-semver": "1.0.0-beta.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f2454e03858a910421f6fd248968fd1cb7999ba7",
+      "version-semver": "1.0.0-beta.3",
+      "port-version": 1
+    },
+    {
+      "git-tree": "cdd44f43f4a8020582266cf5ac32d701281d2e88",
+      "version-semver": "1.0.0-beta.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "88712b0277f9501bbeab4d9244338fd5411eef93",
+      "version-semver": "1.0.0-beta.2",
+      "port-version": 1
+    },
+    {
+      "git-tree": "22f82ee324a3d5a33f8e3f9896b780f5a90f786e",
+      "version-semver": "1.0.0-beta.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c42a4ff250d353e2d0764b8f58dfec820b3cea69",
+      "version-semver": "1.0.0-beta.1",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/a-/azure-core-cpp.json b/external_imported/vcpkg/versions/a-/azure-core-cpp.json
index 5c9a1330c..dcac52daa 100644
--- a/external_imported/vcpkg/versions/a-/azure-core-cpp.json
+++ b/external_imported/vcpkg/versions/a-/azure-core-cpp.json
@@ -1,5 +1,85 @@
 {
   "versions": [
+    {
+      "git-tree": "830e9f51cb0a1f435da75021a1254edb52fc0498",
+      "version-semver": "1.11.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "30673e31e776858e870bff22344de32cada95d13",
+      "version-semver": "1.11.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3de5ec61efe0f113131a5a7847a2964b930b8f88",
+      "version-semver": "1.10.3",
+      "port-version": 2
+    },
+    {
+      "git-tree": "0f2e80c3e438f6738b7f0910f3122f21d52eb653",
+      "version-semver": "1.10.3",
+      "port-version": 1
+    },
+    {
+      "git-tree": "a6323331b6946093d5e0c3dd11e33d3e83203dc3",
+      "version-semver": "1.10.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5f406f6bf6084c74a6a234f35bc6e232fae15cae",
+      "version-semver": "1.10.2",
+      "port-version": 5
+    },
+    {
+      "git-tree": "dc5ce5e0d496bbae8d2cd2f8908f7a01b5cfbc48",
+      "version-semver": "1.10.2",
+      "port-version": 4
+    },
+    {
+      "git-tree": "371ce124f91e0b9d64a44e47b573b5a3f4602498",
+      "version-semver": "1.10.2",
+      "port-version": 3
+    },
+    {
+      "git-tree": "0988f8606d4a1ee55446b680b6ea134cfae20569",
+      "version-semver": "1.10.2",
+      "port-version": 2
+    },
+    {
+      "git-tree": "bfb8b85899d4e6783f93392104d7ee80c8d0a89c",
+      "version-semver": "1.10.2",
+      "port-version": 1
+    },
+    {
+      "git-tree": "d3a1b3382bddaf219a0fef6dafd6a31c43d28e02",
+      "version-semver": "1.10.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "52af14a3a0795d87c3fd9f09b9026c91fcae4b81",
+      "version-semver": "1.10.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b74424cb6faf3443c02effba66f048e0539437aa",
+      "version-semver": "1.10.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "307d4685a0813bb00150dfe87aed0b3fbf88c179",
+      "version-semver": "1.9.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "43ab8aacc87b3d2644b7845af700baf9320f139f",
+      "version-semver": "1.8.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "66add6b6952292833b50c4f3bbcf9ea90d192b38",
+      "version-semver": "1.8.1",
+      "port-version": 0
+    },
     {
       "git-tree": "a18e2b1efaf5843b0eb5fe27a88c4306d5572970",
       "version-semver": "1.8.0",
diff --git a/external_imported/vcpkg/versions/a-/azure-core-tracing-opentelemetry-cpp.json b/external_imported/vcpkg/versions/a-/azure-core-tracing-opentelemetry-cpp.json
index 9c465dd27..5b216d059 100644
--- a/external_imported/vcpkg/versions/a-/azure-core-tracing-opentelemetry-cpp.json
+++ b/external_imported/vcpkg/versions/a-/azure-core-tracing-opentelemetry-cpp.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "0fb3475fbd40be762b7bb9a1a85fef10eb4af9a3",
+      "version-semver": "1.0.0-beta.4",
+      "port-version": 2
+    },
+    {
+      "git-tree": "001d1fc3f1ecbaa77894355634624bc5a7c7d7f2",
+      "version-semver": "1.0.0-beta.4",
+      "port-version": 1
+    },
     {
       "git-tree": "a17fe14abb083b59b9ef5d25157a6cd85acb3ee9",
       "version-semver": "1.0.0-beta.4",
diff --git a/external_imported/vcpkg/versions/a-/azure-data-tables-cpp.json b/external_imported/vcpkg/versions/a-/azure-data-tables-cpp.json
new file mode 100644
index 000000000..61ed6026d
--- /dev/null
+++ b/external_imported/vcpkg/versions/a-/azure-data-tables-cpp.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "0b296b42b6c89f3400486fbf366d34ebaea13530",
+      "version-semver": "1.0.0-beta.1",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/a-/azure-identity-cpp.json b/external_imported/vcpkg/versions/a-/azure-identity-cpp.json
index 1af34635a..c5d73670a 100644
--- a/external_imported/vcpkg/versions/a-/azure-identity-cpp.json
+++ b/external_imported/vcpkg/versions/a-/azure-identity-cpp.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "cb43628d1a08baa198ed4cdc7d317ed73ed3815f",
+      "version-semver": "1.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5fd04f09c1fc0efef3008e8407828b368d75ee5d",
+      "version-semver": "1.5.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "2855fbb155aacc587ca1e2d518ab2e8369e6d8c0",
+      "version-semver": "1.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "abdd671a9667a8b13e439410503d5bb582189fdc",
+      "version-semver": "1.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "07078cbe0cd0059af61369f8794ff5d652eaf506",
       "version-semver": "1.4.0",
diff --git a/external_imported/vcpkg/versions/a-/azure-iot-sdk-c.json b/external_imported/vcpkg/versions/a-/azure-iot-sdk-c.json
index 0b98f438a..fa4be628d 100644
--- a/external_imported/vcpkg/versions/a-/azure-iot-sdk-c.json
+++ b/external_imported/vcpkg/versions/a-/azure-iot-sdk-c.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "2761c8c3302243693aaa2877b54a904d5cbed96f",
+      "version-date": "2023-08-07",
+      "port-version": 0
+    },
+    {
+      "git-tree": "197034166d7fc06ba2ed5562d8548c9404a736ae",
+      "version-date": "2023-08-06",
+      "port-version": 0
+    },
     {
       "git-tree": "0013d7074456da0e8be20a9e56ed79a7aa96f1c4",
       "version-date": "2023-01-18",
diff --git a/external_imported/vcpkg/versions/a-/azure-kinect-sensor-sdk.json b/external_imported/vcpkg/versions/a-/azure-kinect-sensor-sdk.json
index 98ae08516..773adf3b1 100644
--- a/external_imported/vcpkg/versions/a-/azure-kinect-sensor-sdk.json
+++ b/external_imported/vcpkg/versions/a-/azure-kinect-sensor-sdk.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "f5fbd0b39a805bc47da22f4bc462bec175518ae1",
+      "version": "1.4.1",
+      "port-version": 6
+    },
+    {
+      "git-tree": "e2a1e6a1a145f9436731cbcc9019f807325298c1",
+      "version": "1.4.1",
+      "port-version": 5
+    },
     {
       "git-tree": "379c37baf28190bb33ccf1d512c22a21c664e41e",
       "version": "1.4.1",
diff --git a/external_imported/vcpkg/versions/a-/azure-messaging-eventhubs-checkpointstore-blob-cpp.json b/external_imported/vcpkg/versions/a-/azure-messaging-eventhubs-checkpointstore-blob-cpp.json
new file mode 100644
index 000000000..74335cde7
--- /dev/null
+++ b/external_imported/vcpkg/versions/a-/azure-messaging-eventhubs-checkpointstore-blob-cpp.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "44c7021f43e5786d7be87b935868e4c283d72755",
+      "version-semver": "1.0.0-beta.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "9289b19329d8fc1b12ef5a71d1cf2d743a32cc2a",
+      "version-semver": "1.0.0-beta.1",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/a-/azure-messaging-eventhubs-cpp.json b/external_imported/vcpkg/versions/a-/azure-messaging-eventhubs-cpp.json
new file mode 100644
index 000000000..09f67a277
--- /dev/null
+++ b/external_imported/vcpkg/versions/a-/azure-messaging-eventhubs-cpp.json
@@ -0,0 +1,39 @@
+{
+  "versions": [
+    {
+      "git-tree": "2823cc22f2097df4705b1ab925822f6ba19e40f9",
+      "version-semver": "1.0.0-beta.6",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b863a91f0ee55df12d178fb00837d37d640e6f80",
+      "version-semver": "1.0.0-beta.5",
+      "port-version": 0
+    },
+    {
+      "git-tree": "bde9f1c76919eecaaf6680e602eba5126c8d1fad",
+      "version-semver": "1.0.0-beta.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d50578e6b52b84c8be16a01ee83b4777c3c4bc9d",
+      "version-semver": "1.0.0-beta.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2e4e38f8b37bd9c3c6af8bd95887d9108ba1ca67",
+      "version-semver": "1.0.0-beta.2",
+      "port-version": 1
+    },
+    {
+      "git-tree": "983c9c2a6615afc22cd76bdbbef3f403a608bbbf",
+      "version-semver": "1.0.0-beta.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d749c9b65d616fc776e8c71e352890d84ddd6c1c",
+      "version-semver": "1.0.0-beta.1",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/a-/azure-security-attestation-cpp.json b/external_imported/vcpkg/versions/a-/azure-security-attestation-cpp.json
index 9b29c2e0a..61f551f7d 100644
--- a/external_imported/vcpkg/versions/a-/azure-security-attestation-cpp.json
+++ b/external_imported/vcpkg/versions/a-/azure-security-attestation-cpp.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "ece7b864d0d0ab18ba081e5695efea98c5aa2bdf",
+      "version-semver": "1.1.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "812294d664f9765544343cfc8b5265edfb88d061",
+      "version-semver": "1.1.0",
+      "port-version": 1
+    },
     {
       "git-tree": "11cd3682ae481f52a58478f4379bc21e627ed5f8",
       "version-semver": "1.1.0",
diff --git a/external_imported/vcpkg/versions/a-/azure-security-keyvault-administration-cpp.json b/external_imported/vcpkg/versions/a-/azure-security-keyvault-administration-cpp.json
index 4497fa26f..371d66c82 100644
--- a/external_imported/vcpkg/versions/a-/azure-security-keyvault-administration-cpp.json
+++ b/external_imported/vcpkg/versions/a-/azure-security-keyvault-administration-cpp.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "dd36ccbfee4987cbea6cee9fae8e752b1fc9f3cb",
+      "version-semver": "4.0.0-beta.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "478811ebfa9d552d2b1fcf03e1721cc9175b17bf",
+      "version-semver": "4.0.0-beta.3",
+      "port-version": 1
+    },
+    {
+      "git-tree": "6c7bbcafaacfef51314e05b648c3634a3d324916",
+      "version-semver": "4.0.0-beta.3",
+      "port-version": 0
+    },
     {
       "git-tree": "51aaf65e62ea28b9af84af79e4d655ea13c40ba3",
       "version-semver": "4.0.0-beta.2",
diff --git a/external_imported/vcpkg/versions/a-/azure-security-keyvault-certificates-cpp.json b/external_imported/vcpkg/versions/a-/azure-security-keyvault-certificates-cpp.json
index b12d34b70..97a90f52b 100644
--- a/external_imported/vcpkg/versions/a-/azure-security-keyvault-certificates-cpp.json
+++ b/external_imported/vcpkg/versions/a-/azure-security-keyvault-certificates-cpp.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "24b5030675a24e25b0fb571b39d33e7ee6caa61e",
+      "version-semver": "4.2.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b0dd2ae87c69a4637e82ea188db1ee1e2624ac2c",
+      "version-semver": "4.2.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "6f480f2686c90dc9985e9c827ecc2f3c086985f0",
+      "version-semver": "4.2.0",
+      "port-version": 0
+    },
     {
       "git-tree": "4f575471af05af66923fe548074d30f1aa0fdc2c",
       "version-semver": "4.1.0",
diff --git a/external_imported/vcpkg/versions/a-/azure-security-keyvault-keys-cpp.json b/external_imported/vcpkg/versions/a-/azure-security-keyvault-keys-cpp.json
index f21e164fe..8d6dc18f5 100644
--- a/external_imported/vcpkg/versions/a-/azure-security-keyvault-keys-cpp.json
+++ b/external_imported/vcpkg/versions/a-/azure-security-keyvault-keys-cpp.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "6ca701263f474612b070c37fbc5a7932a562838e",
+      "version-semver": "4.4.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "7e455823cb2d81cf79f550f26d1fa3b9cff61e86",
+      "version-semver": "4.4.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "404efdca4682f39039fe7e76541db56b6cab3e3e",
+      "version-semver": "4.4.0",
+      "port-version": 0
+    },
     {
       "git-tree": "f4d8db5aff7d24803e3a2605d3bf3051343fb9a0",
       "version-semver": "4.3.0",
diff --git a/external_imported/vcpkg/versions/a-/azure-security-keyvault-secrets-cpp.json b/external_imported/vcpkg/versions/a-/azure-security-keyvault-secrets-cpp.json
index d985aa4e3..c0cba7187 100644
--- a/external_imported/vcpkg/versions/a-/azure-security-keyvault-secrets-cpp.json
+++ b/external_imported/vcpkg/versions/a-/azure-security-keyvault-secrets-cpp.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "5edd7b9816c3c93ff452244bb579effa3c863787",
+      "version-semver": "4.2.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5c41c5b32fe02aeb4ab47a5ddaa19df33fac9ee7",
+      "version-semver": "4.2.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "a795e3eddbe6ced53ba732f9793679e78d79d359",
+      "version-semver": "4.2.0",
+      "port-version": 0
+    },
     {
       "git-tree": "7b5d805e78f564ff27138c6f005175979b6740c6",
       "version-semver": "4.1.0",
diff --git a/external_imported/vcpkg/versions/a-/azure-storage-blobs-cpp.json b/external_imported/vcpkg/versions/a-/azure-storage-blobs-cpp.json
index 16064dfbd..ea9aa76c5 100644
--- a/external_imported/vcpkg/versions/a-/azure-storage-blobs-cpp.json
+++ b/external_imported/vcpkg/versions/a-/azure-storage-blobs-cpp.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "902107525b099bb6c915311567519dcd55bd2aea",
+      "version-semver": "12.10.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "83ac6004707e784a7a57a72574548579a9ab79d0",
+      "version-semver": "12.9.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "b0699f9368ea7fbc2c6528711c29eb896c76d0a6",
+      "version-semver": "12.9.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "984b2a3258596a074a6a79be8b0d7c3128137981",
+      "version-semver": "12.8.0",
+      "port-version": 0
+    },
     {
       "git-tree": "40ca58231897346f0bf37910ae4c431aa8a5f56d",
       "version-semver": "12.7.0",
diff --git a/external_imported/vcpkg/versions/a-/azure-storage-common-cpp.json b/external_imported/vcpkg/versions/a-/azure-storage-common-cpp.json
index ef5e077ab..b353f67a8 100644
--- a/external_imported/vcpkg/versions/a-/azure-storage-common-cpp.json
+++ b/external_imported/vcpkg/versions/a-/azure-storage-common-cpp.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "97351c3b87aae118c657334bb527c220e196aac7",
+      "version-semver": "12.5.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8a12fa7967664e0823c8ab1be3ef80ba4faf9245",
+      "version-semver": "12.4.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "973a9aaaa49d33f6afdac2337795bd2ee26bbf7e",
+      "version-semver": "12.4.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "041e401b3394eefc002af8a93bccbb7edc0732b5",
+      "version-semver": "12.4.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b147e96bd4b49d4803cf8a3c4b5359bfe3bec275",
+      "version-semver": "12.3.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "13de7bf9db0ab19424dcbf7413c3bf2aa5798653",
+      "version-semver": "12.3.2",
+      "port-version": 0
+    },
     {
       "git-tree": "934133a1c7576ddd824292411199b9bc8f4629f9",
       "version-semver": "12.3.1",
diff --git a/external_imported/vcpkg/versions/a-/azure-storage-cpp.json b/external_imported/vcpkg/versions/a-/azure-storage-cpp.json
index 39ab19170..299717df1 100644
--- a/external_imported/vcpkg/versions/a-/azure-storage-cpp.json
+++ b/external_imported/vcpkg/versions/a-/azure-storage-cpp.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "38122f7f0972f1c4d6b01b776f9c1edf81e5dfd0",
+      "version": "7.5.0",
+      "port-version": 6
+    },
+    {
+      "git-tree": "bbbb3a066c3002438b0a002b334d861f48887ad3",
+      "version": "7.5.0",
+      "port-version": 5
+    },
     {
       "git-tree": "245884377d005f8265e75b9b6eff339d687de0e9",
       "version-string": "7.5.0",
diff --git a/external_imported/vcpkg/versions/a-/azure-storage-files-datalake-cpp.json b/external_imported/vcpkg/versions/a-/azure-storage-files-datalake-cpp.json
index ae63987d2..664adc31b 100644
--- a/external_imported/vcpkg/versions/a-/azure-storage-files-datalake-cpp.json
+++ b/external_imported/vcpkg/versions/a-/azure-storage-files-datalake-cpp.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "eef43191bf50fe79ddd687b71761765a2400a0c2",
+      "version-semver": "12.9.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "980d78708b5b02d395f9bd7342c18dc35e48dcbd",
+      "version-semver": "12.8.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "0f289490671675363d6e2e07eb6277c569602878",
+      "version-semver": "12.8.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ca459a11301918aa1296233d473a865032323673",
+      "version-semver": "12.7.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9c8ba7dabf8011127712dc95628ca1029b0c92c3",
+      "version-semver": "12.6.0",
+      "port-version": 0
+    },
     {
       "git-tree": "12acf62b792b5b9b406eea20f8b3b25e30a32eca",
       "version-semver": "12.5.0",
diff --git a/external_imported/vcpkg/versions/a-/azure-storage-files-shares-cpp.json b/external_imported/vcpkg/versions/a-/azure-storage-files-shares-cpp.json
index 50113d2ad..92f3ce52e 100644
--- a/external_imported/vcpkg/versions/a-/azure-storage-files-shares-cpp.json
+++ b/external_imported/vcpkg/versions/a-/azure-storage-files-shares-cpp.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "98ae8cc3d7bad139e05b550c17fc37da3c5c1cef",
+      "version-semver": "12.8.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "7aad330cd95f2b69127ca9950d1c4295f5be937e",
+      "version-semver": "12.7.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "d1c2beb619e08e7c675312136c0cc427e3ee59e5",
+      "version-semver": "12.7.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f51dca176615cce496b5fb2d869b467279c31e7c",
+      "version-semver": "12.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "856f4e474ec45831593123a281fe650ba86387ab",
+      "version-semver": "12.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f264428685ea6f882d9c58a9915c83665d428456",
+      "version-semver": "12.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "10d67bcd4301e8b3fa5d89b9f8e6eecd835b276f",
       "version-semver": "12.4.0",
diff --git a/external_imported/vcpkg/versions/a-/azure-storage-queues-cpp.json b/external_imported/vcpkg/versions/a-/azure-storage-queues-cpp.json
index bafb23a67..f2e944ded 100644
--- a/external_imported/vcpkg/versions/a-/azure-storage-queues-cpp.json
+++ b/external_imported/vcpkg/versions/a-/azure-storage-queues-cpp.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "7e74bf6adaa2794ef229e4a605d31fea0b3b19bd",
+      "version-semver": "12.2.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "116fd90e1af9c32dabd414ac99ef121d6bacf0bf",
+      "version-semver": "12.1.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "31256aaa2dbb1508ea777fc03cbec8ddbfd9ca18",
+      "version-semver": "12.1.0",
+      "port-version": 0
+    },
     {
       "git-tree": "a04f50e6f79e53d47d4721529709e8e1f02462e1",
       "version-semver": "12.0.0",
diff --git a/external_imported/vcpkg/versions/a-/azure-uamqp-c.json b/external_imported/vcpkg/versions/a-/azure-uamqp-c.json
index 0fc0fa7ba..4d0bd25a1 100644
--- a/external_imported/vcpkg/versions/a-/azure-uamqp-c.json
+++ b/external_imported/vcpkg/versions/a-/azure-uamqp-c.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0ca3c3ded9e4bfee0d22f68201e4bf89462d4cff",
+      "version-date": "2023-08-07",
+      "port-version": 0
+    },
     {
       "git-tree": "c4183ed8c03559df3b5821d0149192a95dba5b50",
       "version-date": "2023-01-18",
diff --git a/external_imported/vcpkg/versions/a-/azure-uhttp-c.json b/external_imported/vcpkg/versions/a-/azure-uhttp-c.json
index 347cfa6c5..0ade88af2 100644
--- a/external_imported/vcpkg/versions/a-/azure-uhttp-c.json
+++ b/external_imported/vcpkg/versions/a-/azure-uhttp-c.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "70faa0f3e0eb5d1f3aa0c3fed59147515404c5bf",
+      "version-date": "2023-08-07",
+      "port-version": 0
+    },
     {
       "git-tree": "6076f8569c54a752f30d97f3b5654190a716722a",
       "version-date": "2023-01-18",
diff --git a/external_imported/vcpkg/versions/a-/azure-umqtt-c.json b/external_imported/vcpkg/versions/a-/azure-umqtt-c.json
index a87ba3801..59714a1f7 100644
--- a/external_imported/vcpkg/versions/a-/azure-umqtt-c.json
+++ b/external_imported/vcpkg/versions/a-/azure-umqtt-c.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f6b50934a467b9bf7a494290ebc34ff8d036937f",
+      "version-date": "2023-08-03",
+      "port-version": 0
+    },
     {
       "git-tree": "e484fe484d0feac8170d1dc7a3f2a3a72bd262fb",
       "version-date": "2023-01-18",
diff --git a/external_imported/vcpkg/versions/b-/backward-cpp.json b/external_imported/vcpkg/versions/b-/backward-cpp.json
new file mode 100644
index 000000000..79ddd5385
--- /dev/null
+++ b/external_imported/vcpkg/versions/b-/backward-cpp.json
@@ -0,0 +1,19 @@
+{
+  "versions": [
+    {
+      "git-tree": "7b8009fe2173eac9490fd50428585a19cd85b043",
+      "version-date": "2023-11-24",
+      "port-version": 0
+    },
+    {
+      "git-tree": "748c91a2ed90cad10b92d4c527dc855ec8f15db0",
+      "version": "1.6",
+      "port-version": 1
+    },
+    {
+      "git-tree": "9f204819a5063dea81b56369e5ce424219e56ca5",
+      "version": "1.6",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/b-/baresip-libre.json b/external_imported/vcpkg/versions/b-/baresip-libre.json
new file mode 100644
index 000000000..410c95ce3
--- /dev/null
+++ b/external_imported/vcpkg/versions/b-/baresip-libre.json
@@ -0,0 +1,54 @@
+{
+  "versions": [
+    {
+      "git-tree": "7b7cfa061bebae8f9628f0d56ca21de4ec1c68fa",
+      "version": "3.9.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "eac42649337bc140a827e4ae83eb7ec1ccac3917",
+      "version": "3.8.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e34b5bc2855e62826520ee68fb21d063d42b53d4",
+      "version": "3.7.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "00dc0e14dfa16f98420ac3a15b9b158af7cf87f8",
+      "version": "3.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b000665b80ffaa20107836324b4360bad62861a7",
+      "version": "3.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "db0ceb9ad55c2c774fac30663522efc247a1ce04",
+      "version": "3.4.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ece07432ef22395a14fe6cbdf5026d4b0f49872a",
+      "version": "3.3.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8eba692c2b454a491269fec62a993c0b08b24d34",
+      "version": "3.2.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "c32aafef7c464cd6b860327ea35759e708f96a77",
+      "version": "3.2.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "64ff48f8f4f42472f614ddece58f1249217d252c",
+      "version": "3.2.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/b-/basisu.json b/external_imported/vcpkg/versions/b-/basisu.json
index ec05207fd..01876593f 100644
--- a/external_imported/vcpkg/versions/b-/basisu.json
+++ b/external_imported/vcpkg/versions/b-/basisu.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d355537e7392dad769a0c435f2a2cedf310b322c",
+      "version": "1.16.4",
+      "port-version": 0
+    },
     {
       "git-tree": "31adec97dda19e99a5745f46a5d2031981206bb1",
       "version": "1.11",
diff --git a/external_imported/vcpkg/versions/b-/bde.json b/external_imported/vcpkg/versions/b-/bde.json
index 5d27e439a..db5555f57 100644
--- a/external_imported/vcpkg/versions/b-/bde.json
+++ b/external_imported/vcpkg/versions/b-/bde.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "f8c8bc5beb99b215e68af4269bc1bac20957d485",
+      "version": "3.124.0.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "71df70f3716434e8069b394593ba8859b6556959",
+      "version": "3.123.0.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a8fc4329574711907399309f06012a486d373c64",
+      "version": "3.117.0.0",
+      "port-version": 0
+    },
     {
       "git-tree": "7ce72f2854f44eee806e6e5f3e97d29897549787",
       "version": "3.2.0.0",
diff --git a/external_imported/vcpkg/versions/b-/bdwgc.json b/external_imported/vcpkg/versions/b-/bdwgc.json
index 6029dfc21..48e964829 100644
--- a/external_imported/vcpkg/versions/b-/bdwgc.json
+++ b/external_imported/vcpkg/versions/b-/bdwgc.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "6bf6340168ebda8d87ec21411dbb4d27e0ce3363",
+      "version": "8.2.6",
+      "port-version": 0
+    },
+    {
+      "git-tree": "12a48f09e61ae946a6858c69e2c40688bdff3980",
+      "version": "8.2.4",
+      "port-version": 0
+    },
     {
       "git-tree": "f99370553e85e9f6a10878253cdee86883b0ff30",
       "version": "8.2.2",
diff --git a/external_imported/vcpkg/versions/b-/beast.json b/external_imported/vcpkg/versions/b-/beast.json
index 4b88457c2..b3232f7dc 100644
--- a/external_imported/vcpkg/versions/b-/beast.json
+++ b/external_imported/vcpkg/versions/b-/beast.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "608757dbb0f830eedf5b1416fb8a79731dd5240c",
+      "version": "0",
+      "port-version": 2
+    },
     {
       "git-tree": "eea4815ae315b38373961c8ff9a5be8556857b3f",
       "version-string": "0",
diff --git a/external_imported/vcpkg/versions/b-/behaviortree-cpp.json b/external_imported/vcpkg/versions/b-/behaviortree-cpp.json
index bc7a1610b..b8fb42fe1 100644
--- a/external_imported/vcpkg/versions/b-/behaviortree-cpp.json
+++ b/external_imported/vcpkg/versions/b-/behaviortree-cpp.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "4cacd1d5f1a465b3ca9d23ebb0b9b4626a26db63",
+      "version": "4.3.7",
+      "port-version": 0
+    },
+    {
+      "git-tree": "66a97129b31a5e70e45a40c767ea96b1e0477a93",
+      "version": "4.1.1",
+      "port-version": 0
+    },
     {
       "git-tree": "7518e59f9f1e994e3af289b8de87115834dcb758",
       "version": "3.5.6",
diff --git a/external_imported/vcpkg/versions/b-/benchmark.json b/external_imported/vcpkg/versions/b-/benchmark.json
index 61e53ffd2..8a8d3b125 100644
--- a/external_imported/vcpkg/versions/b-/benchmark.json
+++ b/external_imported/vcpkg/versions/b-/benchmark.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "5e8efca95a7d5d9c74f8a2c5c2ee05bbd2271451",
+      "version-semver": "1.8.3",
+      "port-version": 1
+    },
+    {
+      "git-tree": "fc61bd374495cb30bb9c58c6e9d0d4568898f0c8",
+      "version-semver": "1.8.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "54f61ab31bcb486a12c859c33db17905f397cc0c",
+      "version-semver": "1.8.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "faeb0b56e68483860ab8cc468a6c594ac361167f",
+      "version-semver": "1.8.0",
+      "port-version": 0
+    },
     {
       "git-tree": "2b8e34d5f083c7c674469078f5e80521e3b77d58",
       "version-semver": "1.7.1",
diff --git a/external_imported/vcpkg/versions/b-/bento4.json b/external_imported/vcpkg/versions/b-/bento4.json
index d56f92670..86e26b249 100644
--- a/external_imported/vcpkg/versions/b-/bento4.json
+++ b/external_imported/vcpkg/versions/b-/bento4.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "b7f9a6725e58b313fd796cf333dab7dd1d1a3bbb",
+      "version": "1.6.0-641",
+      "port-version": 0
+    },
+    {
+      "git-tree": "06b152ff36998df474bd8cf0fa61435d1315b609",
+      "version": "1.6.0-640",
+      "port-version": 0
+    },
     {
       "git-tree": "4da8906f31697785969422135a52cb2d0861fe53",
       "version": "1.6.0-639",
diff --git a/external_imported/vcpkg/versions/b-/better-enums.json b/external_imported/vcpkg/versions/b-/better-enums.json
new file mode 100644
index 000000000..f7905caa2
--- /dev/null
+++ b/external_imported/vcpkg/versions/b-/better-enums.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "64e0dbffe12134b2198b81043cc0dcfd0a340f33",
+      "version": "0.11.3",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/b-/bext-di.json b/external_imported/vcpkg/versions/b-/bext-di.json
index c53b8f6e1..6a14ef9d8 100644
--- a/external_imported/vcpkg/versions/b-/bext-di.json
+++ b/external_imported/vcpkg/versions/b-/bext-di.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b4882fdad119370cd0496487cd2b2cfc4db087ce",
+      "version": "1.3.0",
+      "port-version": 0
+    },
     {
       "git-tree": "8b3c494eee383a036b07453ff9b34d1be65be06d",
       "version": "1.2.0",
diff --git a/external_imported/vcpkg/versions/b-/bext-mp.json b/external_imported/vcpkg/versions/b-/bext-mp.json
new file mode 100644
index 000000000..7bfb4d9a2
--- /dev/null
+++ b/external_imported/vcpkg/versions/b-/bext-mp.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "506fb6ec5f2a49a2b7e0bb637e6e8ef0f4e966ac",
+      "version-date": "2023-03-02",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/b-/bext-sml.json b/external_imported/vcpkg/versions/b-/bext-sml.json
index 0f6fd7284..f956810b4 100644
--- a/external_imported/vcpkg/versions/b-/bext-sml.json
+++ b/external_imported/vcpkg/versions/b-/bext-sml.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4a92a1e011efcac69647356c0806c794d4d8ceac",
+      "version": "1.1.9",
+      "port-version": 0
+    },
     {
       "git-tree": "607e0e94d37ca023fd393c42e8acb43881ea8025",
       "version": "1.1.5",
diff --git a/external_imported/vcpkg/versions/b-/bext-sml2.json b/external_imported/vcpkg/versions/b-/bext-sml2.json
new file mode 100644
index 000000000..1129ba807
--- /dev/null
+++ b/external_imported/vcpkg/versions/b-/bext-sml2.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "b61fcb31fd93d5b99b7f039aa2c1bab7b5eec83a",
+      "version-date": "2023-09-20",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/b-/bext-ut.json b/external_imported/vcpkg/versions/b-/bext-ut.json
index b62fdd1a0..faf78db57 100644
--- a/external_imported/vcpkg/versions/b-/bext-ut.json
+++ b/external_imported/vcpkg/versions/b-/bext-ut.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a778eac38758ba4adaedb0098ee069c90ead7faa",
+      "version": "1.1.9",
+      "port-version": 2
+    },
     {
       "git-tree": "c80b6f438634bb91f77d03f18bcafe5486f8aaab",
       "version": "1.1.9",
diff --git a/external_imported/vcpkg/versions/b-/bext-wintls.json b/external_imported/vcpkg/versions/b-/bext-wintls.json
index b57b16672..f5fffd6cb 100644
--- a/external_imported/vcpkg/versions/b-/bext-wintls.json
+++ b/external_imported/vcpkg/versions/b-/bext-wintls.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "bc8c1307f16b47fb5fd638e719f0157323be3919",
+      "version": "0.9.7",
+      "port-version": 0
+    },
     {
       "git-tree": "1bed92afff8085f2d8f888b35ce0049e5986aa8a",
       "version": "0.9.5",
diff --git a/external_imported/vcpkg/versions/b-/bfgroup-lyra.json b/external_imported/vcpkg/versions/b-/bfgroup-lyra.json
index ef5ca5bf3..c3a9a564c 100644
--- a/external_imported/vcpkg/versions/b-/bfgroup-lyra.json
+++ b/external_imported/vcpkg/versions/b-/bfgroup-lyra.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b58cd66176db34198f2a59a06f87afe194db2a45",
+      "version": "1.6.1",
+      "port-version": 0
+    },
     {
       "git-tree": "bbd3e635da6198f0f2458ec62ff937287c5c5b45",
       "version": "1.6",
diff --git a/external_imported/vcpkg/versions/b-/bgfx.json b/external_imported/vcpkg/versions/b-/bgfx.json
index 677349513..08f0a6ca2 100644
--- a/external_imported/vcpkg/versions/b-/bgfx.json
+++ b/external_imported/vcpkg/versions/b-/bgfx.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "c5af63ea2a285a9577943683a6e1347d17487402",
+      "version": "1.122.8595-458",
+      "port-version": 0
+    },
+    {
+      "git-tree": "11c8b127eab949129fb5adf3006c9655ab1bb525",
+      "version": "1.121.8534-453",
+      "port-version": 0
+    },
     {
       "git-tree": "583f89c30b68d43070737982e0b0f8748aa23199",
       "version": "1.118.8417-415",
diff --git a/external_imported/vcpkg/versions/b-/binlog.json b/external_imported/vcpkg/versions/b-/binlog.json
index f6d3cc586..966905acd 100644
--- a/external_imported/vcpkg/versions/b-/binlog.json
+++ b/external_imported/vcpkg/versions/b-/binlog.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "53449cd8c7572c72137ace92720d632b671f2d17",
+      "version-date": "2021-04-16",
+      "port-version": 1
+    },
     {
       "git-tree": "eb0ae943fc2b0c1c19ad62308d1f321439967fd4",
       "version-date": "2021-04-16",
diff --git a/external_imported/vcpkg/versions/b-/binn.json b/external_imported/vcpkg/versions/b-/binn.json
index 9de7af6da..8dae08a43 100644
--- a/external_imported/vcpkg/versions/b-/binn.json
+++ b/external_imported/vcpkg/versions/b-/binn.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e9c0f4de4aef736aa3b11d4cce436973f85e03a6",
+      "version": "3.0",
+      "port-version": 3
+    },
     {
       "git-tree": "aef73e4b20836cfc1913984d75d560f331b51fc1",
       "version-string": "3.0",
diff --git a/external_imported/vcpkg/versions/b-/bitmagic.json b/external_imported/vcpkg/versions/b-/bitmagic.json
index b086c0a2d..8c426f4ed 100644
--- a/external_imported/vcpkg/versions/b-/bitmagic.json
+++ b/external_imported/vcpkg/versions/b-/bitmagic.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "98fb920eba690a2a64666a6a76e16af95a797ae8",
+      "version": "7.13.4",
+      "port-version": 0
+    },
     {
       "git-tree": "d8f4a3a305e2872a295f493450a96b093ad39ef7",
       "version": "7.12.3",
diff --git a/external_imported/vcpkg/versions/b-/bitserializer.json b/external_imported/vcpkg/versions/b-/bitserializer.json
index 82aaa60e2..813a818a5 100644
--- a/external_imported/vcpkg/versions/b-/bitserializer.json
+++ b/external_imported/vcpkg/versions/b-/bitserializer.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e942a227c05c00b773fa341f08ed56e360fbd45e",
+      "version": "0.65",
+      "port-version": 0
+    },
     {
       "git-tree": "8f6f0ca62f24edb91a4b605b045f46653442d1d5",
       "version": "0.50",
diff --git a/external_imported/vcpkg/versions/b-/bitsery.json b/external_imported/vcpkg/versions/b-/bitsery.json
index bff5f7ba5..8035f8322 100644
--- a/external_imported/vcpkg/versions/b-/bitsery.json
+++ b/external_imported/vcpkg/versions/b-/bitsery.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7c511e7c691fc3d0c4f146298daa7e0a4f4446e5",
+      "version": "5.2.3",
+      "port-version": 0
+    },
     {
       "git-tree": "6fdd20d510ccb63049b899419af07461f42097e5",
       "version": "5.2.2",
diff --git a/external_imported/vcpkg/versions/b-/blake3.json b/external_imported/vcpkg/versions/b-/blake3.json
index 1d73c6e30..cae5fef2e 100644
--- a/external_imported/vcpkg/versions/b-/blake3.json
+++ b/external_imported/vcpkg/versions/b-/blake3.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "3d62ef88b0bacbb197e9bb921b8b7d0fea336f1d",
+      "version": "1.5.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a198a87b5478bee28b2e4d35ed9787cf3950faef",
+      "version": "1.4.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "13ac9cc003839e6730587218103f4912e7886311",
+      "version": "1.3.3",
+      "port-version": 1
+    },
     {
       "git-tree": "707d127029e3c2e2c2216fba6e36247ce43414b3",
       "version": "1.3.3",
diff --git a/external_imported/vcpkg/versions/b-/blas.json b/external_imported/vcpkg/versions/b-/blas.json
index a1139c63b..20a9eb299 100644
--- a/external_imported/vcpkg/versions/b-/blas.json
+++ b/external_imported/vcpkg/versions/b-/blas.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0fe7611c8bb3098083440074a6c59f35bfee4f99",
+      "version-date": "2023-03-25",
+      "port-version": 0
+    },
     {
       "git-tree": "13cc4359c6888f16fdde35e618096b67a9177a6b",
       "version-string": "1",
diff --git a/external_imported/vcpkg/versions/b-/blaze.json b/external_imported/vcpkg/versions/b-/blaze.json
index 2a94caab1..be8283c11 100644
--- a/external_imported/vcpkg/versions/b-/blaze.json
+++ b/external_imported/vcpkg/versions/b-/blaze.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9f237bb789d83a4004b263f9544ed3d6668f160f",
+      "version": "3.8.2",
+      "port-version": 0
+    },
     {
       "git-tree": "6bea7e024ba776f0a7c5462056054529f79aa86d",
       "version": "3.8.1",
diff --git a/external_imported/vcpkg/versions/b-/blend2d.json b/external_imported/vcpkg/versions/b-/blend2d.json
index 0962ef77e..1b5ba71ad 100644
--- a/external_imported/vcpkg/versions/b-/blend2d.json
+++ b/external_imported/vcpkg/versions/b-/blend2d.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "a5440e80d03f5d70356c3295281949898811ff97",
+      "version-date": "2023-06-16",
+      "port-version": 1
+    },
+    {
+      "git-tree": "7e16be134e98cabefdf318161ef7f74d83b0512d",
+      "version-date": "2023-06-16",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d6de437ccd239433cc34d21212797c4755a6c8f4",
+      "version": "0.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b29172f6f8dd5479a5123214f403137b0180b61f",
+      "version-date": "2022-12-31",
+      "port-version": 3
+    },
     {
       "git-tree": "89ccc58cff0cc74468ab31076901e5e74b68c6ba",
       "version-date": "2022-12-31",
@@ -45,16 +65,6 @@
       "version-string": "beta_2020-08-24",
       "port-version": 0
     },
-    {
-      "git-tree": "ffce764b880d8cc24e3b00328aa3861f15bae91d",
-      "version-string": "beta_2020-07-31",
-      "port-version": 0
-    },
-    {
-      "git-tree": "03a43f03eb0cab95aac27a77b71273fc4aa2e94d",
-      "version-string": "beta_2020-07-09",
-      "port-version": 0
-    },
     {
       "git-tree": "4b67e6ac18485e7209ec86219d16ce3659446e8a",
       "version-string": "beta_2020-06-01",
diff --git a/external_imported/vcpkg/versions/b-/blingfire.json b/external_imported/vcpkg/versions/b-/blingfire.json
new file mode 100644
index 000000000..ce4a39c58
--- /dev/null
+++ b/external_imported/vcpkg/versions/b-/blingfire.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "70822350369b68d60a5640eca1b668e1829c8054",
+      "version": "0.1.8.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "8352e7a158da2568b5c67c973b3692681be8b0d6",
+      "version": "0.1.8.1",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/b-/bloomberg-quantum.json b/external_imported/vcpkg/versions/b-/bloomberg-quantum.json
new file mode 100644
index 000000000..2478e6fa9
--- /dev/null
+++ b/external_imported/vcpkg/versions/b-/bloomberg-quantum.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "9099d9be8e575f44a311cf7d5032ee5c9dcdc82f",
+      "version-date": "2023-02-03",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/b-/blosc.json b/external_imported/vcpkg/versions/b-/blosc.json
index af1083339..db75f6608 100644
--- a/external_imported/vcpkg/versions/b-/blosc.json
+++ b/external_imported/vcpkg/versions/b-/blosc.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7c0e6152db6058a53ff21fc8037e5c9e685a0fe8",
+      "version": "1.21.5",
+      "port-version": 0
+    },
     {
       "git-tree": "08be7493a8b0644853e545f50d243680b1d13fd9",
       "version": "1.21.3",
diff --git a/external_imported/vcpkg/versions/b-/blpapi.json b/external_imported/vcpkg/versions/b-/blpapi.json
new file mode 100644
index 000000000..5d744a2e9
--- /dev/null
+++ b/external_imported/vcpkg/versions/b-/blpapi.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "78171a41201cdb236d95e50ed26f6b76675f97de",
+      "version": "3.20.2",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/b-/boinc.json b/external_imported/vcpkg/versions/b-/boinc.json
index 2b867f4fa..24c7e6238 100644
--- a/external_imported/vcpkg/versions/b-/boinc.json
+++ b/external_imported/vcpkg/versions/b-/boinc.json
@@ -1,5 +1,40 @@
 {
   "versions": [
+    {
+      "git-tree": "b49e9a16d262cfdde45934d7a3c9a6aebf391225",
+      "version": "7.24.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "1108b5895433bd23e8a9d6b8695adf85438382c2",
+      "version": "7.24.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a90973a47e6ea052123787fd347b6dc68c8f77de",
+      "version": "7.22.2",
+      "port-version": 2
+    },
+    {
+      "git-tree": "61b5ebb30db7da8972a235b11ffc92f667c597eb",
+      "version": "7.22.2",
+      "port-version": 1
+    },
+    {
+      "git-tree": "b0f6f1b59e54a64b321aba20d196531d6e181d2c",
+      "version": "7.22.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0d3f7220d72e02720ad44a15cfc46ebc1a6c26b4",
+      "version": "7.22.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "05fdc41be633efa59debd81ec8a95c584972e54b",
+      "version": "7.22.1",
+      "port-version": 0
+    },
     {
       "git-tree": "634e281c399c5bdd7f47977241fce65e88faa595",
       "version": "7.22.0",
diff --git a/external_imported/vcpkg/versions/b-/bond.json b/external_imported/vcpkg/versions/b-/bond.json
index be81891da..40c221566 100644
--- a/external_imported/vcpkg/versions/b-/bond.json
+++ b/external_imported/vcpkg/versions/b-/bond.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "800bba87d345e620b88cd1b31b34fb76ac80aee6",
+      "version": "10.0.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "5d9b960403809575097267ac43d1ce18e9b2a7f2",
+      "version": "10.0.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "5ce8875d8de21ca31d61b521c2e84a974e325436",
+      "version": "10.0.0",
+      "port-version": 0
+    },
     {
       "git-tree": "96ecc1c6ea2a8fabfbdfd7d0a8535821446af89f",
       "version": "9.0.3",
diff --git a/external_imported/vcpkg/versions/b-/boost-accumulators.json b/external_imported/vcpkg/versions/b-/boost-accumulators.json
index fad0469e2..166401788 100644
--- a/external_imported/vcpkg/versions/b-/boost-accumulators.json
+++ b/external_imported/vcpkg/versions/b-/boost-accumulators.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "5cdf726ffdb94b1312ded97480dd8d532431d126",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "fbc8e739bd519a5da1db826cb1cd6b14c0072533",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "fcd575a4e482f3a331107dcbad72468cb9c14e50",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "d45f601cdc5cfb7a4e6d1ec9fdd8396ece8699e9",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "f201a4318c1e2b666d9e4e335b3724db492f75a5",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "b7046b6940dd0ce710ee59f69eb4ba3d0a43df71",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-algorithm.json b/external_imported/vcpkg/versions/b-/boost-algorithm.json
index 80efb5595..0a5ec17e2 100644
--- a/external_imported/vcpkg/versions/b-/boost-algorithm.json
+++ b/external_imported/vcpkg/versions/b-/boost-algorithm.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "1649f898d6dd9c8904fab6a7c1194a5c30bdb274",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "064c9bd0deddb764f57008b07c0d42af035c1a50",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "1fbb6d9a02e64aaa4c3f61605b2fac87f8dd8347",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "6a184d48bcf1a89a12f66255625340ce9cbfda92",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "437bf58b244741d6ca3857cccf1b3cc937be2e4b",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "a59b4c65c0a50339334a001172d62f06cd4daea7",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-align.json b/external_imported/vcpkg/versions/b-/boost-align.json
index 14ce2984b..16a0e66ef 100644
--- a/external_imported/vcpkg/versions/b-/boost-align.json
+++ b/external_imported/vcpkg/versions/b-/boost-align.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "676ef901af2b5986c71fb85788ba0a08979bad8e",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6312ca6cedb77e48b123aa19e7ef98f5401b4020",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b1e1ddf5d00f6698be329c809d1a29e59742a7e2",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "6dcfc6f69223f8fffff4c82db31be7495f17062d",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "be964fa6b68ed5d5cdcb97aa936a3cae0e1b9059",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "d6134309afc69966529d238e26b5d1efff320341",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-any.json b/external_imported/vcpkg/versions/b-/boost-any.json
index 0d5dd0265..6876891b5 100644
--- a/external_imported/vcpkg/versions/b-/boost-any.json
+++ b/external_imported/vcpkg/versions/b-/boost-any.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "2f43ed76aaa6cda19c30e95260ad50cb779cf98c",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8995a49c0eb70b1e306323f70d79dc5b6343bd6b",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e1ee12b057e7762b98a5bd7fdd190480e1f51b0f",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "798ddb57d8d3bb7a77e424cd5d60f88cc4e6bee7",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "d24eb2359b8796ce2eef84f44b7315acf19b353c",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "ef6ce48af997915c4ca3789d4d7f9a2bf11a36fe",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-array.json b/external_imported/vcpkg/versions/b-/boost-array.json
index f7103a1b5..5d4cf28c6 100644
--- a/external_imported/vcpkg/versions/b-/boost-array.json
+++ b/external_imported/vcpkg/versions/b-/boost-array.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "7feefc063119142cc2eaedfc11255fdfdaa2025a",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "98d20d502bbd77d5a4312254bd47d83c55b4bbac",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "58b11354551eb994ef8636b3ade5447ae6524a3c",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "8503faaf38485a913d4daf3efd2076b67bebdc0b",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "b26e79e8c3b69fb7111fe82632be1cca86440b65",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "7f15966c717d1cdbf9efb62fdf83b39ef043fcff",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-asio.json b/external_imported/vcpkg/versions/b-/boost-asio.json
index da9261fdd..3e6506349 100644
--- a/external_imported/vcpkg/versions/b-/boost-asio.json
+++ b/external_imported/vcpkg/versions/b-/boost-asio.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "7a9e250345837a2083dea856b1f4c74c4d664226",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0d4a6f6c528811c3c79ac046e738e5bab3db995f",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2ae81c27afef052cdab26f3bbadb1154905cfecc",
+      "version": "1.82.0",
+      "port-version": 3
+    },
+    {
+      "git-tree": "12dc4325ca29b508676211dfadc95ff688a00395",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "8f22e5c36ac147808ab3acaa7782f590134ccbd3",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "78b9ee5bb522309c5cfbcba93332aeb5f386f199",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "44564a47bb01772ece30464d74f48603bc247c63",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-assert.json b/external_imported/vcpkg/versions/b-/boost-assert.json
index bbbfb237a..06678f4dd 100644
--- a/external_imported/vcpkg/versions/b-/boost-assert.json
+++ b/external_imported/vcpkg/versions/b-/boost-assert.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "fe832ada2e45a096248738b11897f54498df72e2",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "058c55df927f8a8180003c576bb4b536a46cf3e8",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9ab1404e2abab757e8c136c9fcd89fbca14e3696",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "f07d2980139502309087821ca9a78a9a43a766ec",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "fb48cd65e86476285b8968bf3d74c949b5c0f8bd",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "024f6e2d8aa74bc6987f101ccd02bbe47dedde8c",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-assign.json b/external_imported/vcpkg/versions/b-/boost-assign.json
index 9d42002b4..923f27638 100644
--- a/external_imported/vcpkg/versions/b-/boost-assign.json
+++ b/external_imported/vcpkg/versions/b-/boost-assign.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "5bdd9000a8f91de7ab9d340670f5138c94d7456a",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9ba196ef5fe0c4127c48503b32b1107c3d2575e6",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "393709d7b07cf6b886f9491aff50cbf1338ec6ce",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "cd60150bd194b26b188ecb47675c1ab7963049d1",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "e76da275d1922ac8cfc93970005a446c1dba3c3b",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "10372dc236c7754a077115666833b658c739ab59",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-atomic.json b/external_imported/vcpkg/versions/b-/boost-atomic.json
index 7ecc93290..38daabcca 100644
--- a/external_imported/vcpkg/versions/b-/boost-atomic.json
+++ b/external_imported/vcpkg/versions/b-/boost-atomic.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "d599f640fca933cace45c60f6b5967f4230c4f84",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c51cf6bc71c21154cca513d51d62a8f31ad3dd81",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "05f82c6b7fe3a31ffb4f16f25eb98473131f201a",
+      "version": "1.82.0",
+      "port-version": 3
+    },
+    {
+      "git-tree": "4cd58a1ad5ec2c381440b733e3799368df678b49",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "ed19c1a3b7f57d00917b260e35cd662b28c1f6eb",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "d79273e42045876ab4d660b653b45c714ad54651",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "cd00fc6028c5c49704962f17ea74c9e0c0bad930",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-beast.json b/external_imported/vcpkg/versions/b-/boost-beast.json
index 139dc27b1..be80d63c7 100644
--- a/external_imported/vcpkg/versions/b-/boost-beast.json
+++ b/external_imported/vcpkg/versions/b-/boost-beast.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "4081838367ea27df0e58bb626e84c6637a5e0e97",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "cf5be95a5b8d706f46ad14f219b940a3fb0c3ef4",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6fdb6d58154d59554f7f6f3456f715f847dcdf12",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "f6a7a34fa0113b74cf593ce3786dc6ad108d779b",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "5824f6d8e202c8763de70d7aad7855c705f16105",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "f771fad1234461dfc02462569dba435c64bfa94e",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-bimap.json b/external_imported/vcpkg/versions/b-/boost-bimap.json
index db73b2f77..d0be67a7e 100644
--- a/external_imported/vcpkg/versions/b-/boost-bimap.json
+++ b/external_imported/vcpkg/versions/b-/boost-bimap.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "91d9529e404f5ad80f0b021787c224a558ecc2b3",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0c07fcb928615b411a23ca3676e62494c3304f31",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "630d6888f373108130d81a96b7a406387f8cd96f",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "de17313ae17a0044043195c76fd61a75854d4f0d",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "5fbb607f180c58dc6fa488e089d5e6d645eae75f",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "f4ca69ca926a9481dd59582c5fce575685a708eb",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-bind.json b/external_imported/vcpkg/versions/b-/boost-bind.json
index 77a76cb0a..d653c2e2f 100644
--- a/external_imported/vcpkg/versions/b-/boost-bind.json
+++ b/external_imported/vcpkg/versions/b-/boost-bind.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "5c28cd6fd3a92cac6eda977ec133bf611665c7c4",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b846d10f5df5d2d6f27bd2fe13170cf3c09d8cbf",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9c07d5ea417668fe7606ace4749f1577c7c2a8c1",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "1d9372948d3c0fe1da8965e76ded151513f16a52",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "97f32a43b457e26b8ee223c6c7201c995541d149",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "76811578923b601d64f43e851c91ac540982caa5",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-build.json b/external_imported/vcpkg/versions/b-/boost-build.json
index cf6d506da..6fd7a2d3a 100644
--- a/external_imported/vcpkg/versions/b-/boost-build.json
+++ b/external_imported/vcpkg/versions/b-/boost-build.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "b23026b68d2bb711b73afd419b917a67f98677ad",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "bd9d972c221f9e5bdd839246960791cdcfe80524",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c9cbed98f75a402e9f61689754e78e237f44988e",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "9d4a35930b7414144551dc9c2e00b31bcb0ca8b2",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "cf70df3193d092c65a4b3728a5410f59e9de1c9d",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "17ed662b7ab56c9dd93973417f6cedf6f6aeb55d",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-callable-traits.json b/external_imported/vcpkg/versions/b-/boost-callable-traits.json
index 328f4ae98..0f1a3e406 100644
--- a/external_imported/vcpkg/versions/b-/boost-callable-traits.json
+++ b/external_imported/vcpkg/versions/b-/boost-callable-traits.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "50f3c519d696856ff1b096e8ac2428d737304d0d",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0558d1c063b8c2137f5e44644bc4c47180f30da1",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3d9d1716d512c7c972cf109e2d27a3c3cf4f0054",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "7d252dc8bb4e187e63ea76041f922a308a5b3705",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "58534b65547e8c89e93ce1ba96016c6bc3ebe186",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "c46d137a8dde5ba4966af64695f479ce54bd37ff",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-chrono.json b/external_imported/vcpkg/versions/b-/boost-chrono.json
index 579761c5e..dad7ae0ba 100644
--- a/external_imported/vcpkg/versions/b-/boost-chrono.json
+++ b/external_imported/vcpkg/versions/b-/boost-chrono.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "8e71f32f08e2a8e74687c85beaa5d6aaa4753c03",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b291334ee942d090c037f8ce5cb53874af9f3f8a",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6e35fba1cfd226e9ae4e4a4b54a5b88c4103e440",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "6e550f08c345804346e807206cff87fbb07689c1",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "c9471308173e215c8fb471c891366bf8b8c05a48",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "cf0809f1dc32b08b842bea5df43136c7de0207d7",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-circular-buffer.json b/external_imported/vcpkg/versions/b-/boost-circular-buffer.json
index e8483b495..4e85ee365 100644
--- a/external_imported/vcpkg/versions/b-/boost-circular-buffer.json
+++ b/external_imported/vcpkg/versions/b-/boost-circular-buffer.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "0653ffae64a58892f055ef0e8d9af237295f7420",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4df4c980c22d3b54856d81430343e6ce70a18521",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9a08e079bd1986adeb839ac17690dbd1b0c0cbf5",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "babfe7cd25186b48ed2ceab45108cf5fd1dfc6e4",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "b98dd3e591b0859edcd04280b9b143899a1bb4ce",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "0b08a8a271bb97ed52ccb791286975dbd59a63c9",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-cobalt.json b/external_imported/vcpkg/versions/b-/boost-cobalt.json
new file mode 100644
index 000000000..7455080f6
--- /dev/null
+++ b/external_imported/vcpkg/versions/b-/boost-cobalt.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "b2b3e30a1a036742bcfb22766083cc1a4c0ceefc",
+      "version": "1.84.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/b-/boost-compat.json b/external_imported/vcpkg/versions/b-/boost-compat.json
new file mode 100644
index 000000000..cdd9eedcb
--- /dev/null
+++ b/external_imported/vcpkg/versions/b-/boost-compat.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "669244fa16e98132cd0141aabbd78516ba206fee",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "790894b29260c3cb8b2bd6be3bd2822e3118789e",
+      "version": "1.83.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/b-/boost-compatibility.json b/external_imported/vcpkg/versions/b-/boost-compatibility.json
index 21de6ba2b..0f54afb81 100644
--- a/external_imported/vcpkg/versions/b-/boost-compatibility.json
+++ b/external_imported/vcpkg/versions/b-/boost-compatibility.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "b659e6ab02f5aa2ebfb395d9ba6e80b2c9497ad6",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f503e07b29b61e3679b9efd9986ac64503808dea",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8e3c4c3602abf9d5417317f7461393eb801864cc",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "5af14050c2efc2528e61019b46813fb1fe2025bb",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "694a9116ac59b0fb3f9e72a9608deb94e3168e84",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "6dc8c52f304e2ff5c4ad24da160a98bd01018c3e",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-compute.json b/external_imported/vcpkg/versions/b-/boost-compute.json
index c73d55849..23a1e5988 100644
--- a/external_imported/vcpkg/versions/b-/boost-compute.json
+++ b/external_imported/vcpkg/versions/b-/boost-compute.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "e30139272ac79c1dd19e49319e5c9f791a225106",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3e4c8cd7be193c46ac0e3633dd63b723dac6f363",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b303d9b14bc148147d90600791358321c8f95c3f",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "d6ce60d84f6a1da95496e017153a19ec2a425d63",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "e275a197f98ac8e99c9c602945f31b7c9bf5ff77",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "613c3b5b6833d8ff9e0076dd428dafebacd7ab1e",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-concept-check.json b/external_imported/vcpkg/versions/b-/boost-concept-check.json
index 66d746684..f44c031b3 100644
--- a/external_imported/vcpkg/versions/b-/boost-concept-check.json
+++ b/external_imported/vcpkg/versions/b-/boost-concept-check.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "f1658ec6a2ab024a4d4c741ee471c0db4344238b",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ec7a65ff7072399f9a926316cac0b1c6162d4ee5",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e3db560953c33956f9ba0b19303f99e37d2c6486",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "c266d37e02d494dcf4c3623bae07775c2a7baa45",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "776d22b1210657b1a1de2f93d7c3310881671cb3",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "9e3997ced53ed93bff12b273be6d8a0adc500960",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-config.json b/external_imported/vcpkg/versions/b-/boost-config.json
index de031beee..8810de09d 100644
--- a/external_imported/vcpkg/versions/b-/boost-config.json
+++ b/external_imported/vcpkg/versions/b-/boost-config.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "30ccc94aba0f43bf905a641c39e3cb991e882d30",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "26e9082aeb3829b11d9f0ea82de37db9a93b6620",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b4dcdf4527bb037a6b6d2973176e4a662c9853e6",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "af2f41ef14357f44466182d783e8cb218d677b1f",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "ff890d416fce1b2c209ee4df8e773f0d285d0fb4",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "f22c9c2d371b0d3bad68760622075512860f5379",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-container-hash.json b/external_imported/vcpkg/versions/b-/boost-container-hash.json
index 64a05151c..07aacafa5 100644
--- a/external_imported/vcpkg/versions/b-/boost-container-hash.json
+++ b/external_imported/vcpkg/versions/b-/boost-container-hash.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "72beb1a98959147c41efd1661e10c37827313511",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "058bb680534a2375ec78dd366d9969967bd7570e",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ce9e91e833ca8eb5ddb0a19df8eb7fa5c809359c",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "c5bde693ed8971a4e0ba6e22854386d4054898a8",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "1e889b9b867df555de44167d6b1ffcb8cb050649",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "54f2c7dd6ccb8e6c7d1e64a0042f8126777e8bff",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-container.json b/external_imported/vcpkg/versions/b-/boost-container.json
index 026b72993..d20578ec0 100644
--- a/external_imported/vcpkg/versions/b-/boost-container.json
+++ b/external_imported/vcpkg/versions/b-/boost-container.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "ee15da00e28be69db05ea8b29e19b6a6fc6ca132",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "06dc49b47f365371fd98d0373e46369bb97056c8",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "7d7b26fb8d896742162db28bca0f3aa2c4bf5fa5",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "54ac399bdf18e9c6ab8c9df4d81df4bd86a547d9",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "66f4954b8b554a045b06e911054e8b83d5bcccce",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "1034bcf6a037a9f630689ea7f993efcac839fe99",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-context.json b/external_imported/vcpkg/versions/b-/boost-context.json
index 0e8132f81..204a90d48 100644
--- a/external_imported/vcpkg/versions/b-/boost-context.json
+++ b/external_imported/vcpkg/versions/b-/boost-context.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "2c3c5db88cb7118fcde973914702e885cf53005d",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2c0ccde97a196bd6c78f0fbb52ae9c8b33a525b5",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b57cef3d65241ee8769759b0c4d4f54adea12f12",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "350b9696e8454d9121ffa7ad1c78d56cd378af58",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "6a382535970a62b1b4100d06187bac8f0010ad6d",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "80f5ddcc31b857b87df6d3dd0c0eba3473338229",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-contract.json b/external_imported/vcpkg/versions/b-/boost-contract.json
index 2c3450f48..77dbb5505 100644
--- a/external_imported/vcpkg/versions/b-/boost-contract.json
+++ b/external_imported/vcpkg/versions/b-/boost-contract.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "e08e8686355f85e72f127468e9593970a3dc7d01",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2c3cb8d14edbf7d1f72bcb9604c134828c52db92",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "128a5459bfe24ef077e6c55f9048115d5b62119f",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "2c9e501f72013d017f7422869c77eb6b20f29f46",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "adf8656d4faf6e9ff1b87681b7d085242fe430e1",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "59da1705a0acc9858789b96442767113c2434241",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-conversion.json b/external_imported/vcpkg/versions/b-/boost-conversion.json
index d151fde7f..8e2de8596 100644
--- a/external_imported/vcpkg/versions/b-/boost-conversion.json
+++ b/external_imported/vcpkg/versions/b-/boost-conversion.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "e3b83a29a2979a917316fece1572314a0e7b2c81",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "45d1d99389896f68454518ac9e7d516c88598fcd",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "42db7c7d2cd967a8602ccbecd50d17ecc45c0f9b",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "e99972dc970d3a2229996b240d5dc4362204b6dc",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "644c76f8de63bc034d0214ccbf408889f84d82cc",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "9571b8eb4c9d1952899c01b198cd42c7872e7ece",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-convert.json b/external_imported/vcpkg/versions/b-/boost-convert.json
index dcf8dabc8..f71952984 100644
--- a/external_imported/vcpkg/versions/b-/boost-convert.json
+++ b/external_imported/vcpkg/versions/b-/boost-convert.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "f2c5123bf4c682b7a729001e1e5d7b78c7839e13",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "7b29caca0f13ed5f5c083216a177a43984cab5fb",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2d1a4418e25c86642d9382f57d1d5b2713bdd12c",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "54d69671454ab2db9d34730a216a5c5efe7d6f0e",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "fbe8594d66a5ff237bda8ca4d0f5f3ab8853d8b5",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "3982b106a915dfaea9b62c981c0b64dd5b1709c1",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-core.json b/external_imported/vcpkg/versions/b-/boost-core.json
index ecf1af125..5b0072ac9 100644
--- a/external_imported/vcpkg/versions/b-/boost-core.json
+++ b/external_imported/vcpkg/versions/b-/boost-core.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "9092a51e0f86979692442d98202d839240721e6d",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "736b9319578faba560f1bccd62ae53421c290ac4",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "fc2d558e972d703d21819dc33f5178d6bf529a22",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "f406b6bfcf32cb14d17d1df5e57a1162a2f2d703",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "dc7d8f36b88e86bd33b77fd98e30efc3df0bbb40",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "a01f204e91421776b3891acbf59eb8ba27be6d7a",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-coroutine.json b/external_imported/vcpkg/versions/b-/boost-coroutine.json
index 2230e2bf3..c87a06baf 100644
--- a/external_imported/vcpkg/versions/b-/boost-coroutine.json
+++ b/external_imported/vcpkg/versions/b-/boost-coroutine.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "b6c89a5afa462111f3180af3c843fbc11ed3fd63",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d8a5c2cff3de497580fc8dc363ebc3e8ec0c9a1d",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6a7abe4f1fe4283093d5eadbbfd76b9b37d188b0",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "ee6ae12c7b1d5dc36ced3db516336e96211d239c",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "c909b46a21eb931b15bad934a065a7b353b5250a",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "bb2505f3d476d390b0c3470ab09b4e62b7b954dd",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-coroutine2.json b/external_imported/vcpkg/versions/b-/boost-coroutine2.json
index bf8a06871..1586cbffa 100644
--- a/external_imported/vcpkg/versions/b-/boost-coroutine2.json
+++ b/external_imported/vcpkg/versions/b-/boost-coroutine2.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "8cf4fa067f24591f4c30e6cf54f44284a421991c",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "07cd3acf80575853ec41795a24803f75605f9c9b",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "dba0f9beca895b21c5059b07c9f173e007ee3cd8",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "7fb813154ce459ddd8d72dfa8cef59b033be2dad",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "52c774d7851dad25ca80ec7e591ea02741a79acd",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "c0cc6d4bdd6034a5026ca00075e1f2d767dff50b",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-crc.json b/external_imported/vcpkg/versions/b-/boost-crc.json
index 2d4d22a37..47d6f53a6 100644
--- a/external_imported/vcpkg/versions/b-/boost-crc.json
+++ b/external_imported/vcpkg/versions/b-/boost-crc.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "7096b802ae31e2690189123f41f63d70d5fbfd39",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b0f11a830b77b6a039d0d008a18b066d99a87672",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "04d885f67c14d286734f0904d56d57338a5e9d8e",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "7146ce31ceb0cdce252cdf556502fbd358eb30d5",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "bfeeb9c8d98a0eca5cdf3886bf0757d89828e4a8",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "12a7379b52e6f64ca68b76844b9c8c40911661d2",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-date-time.json b/external_imported/vcpkg/versions/b-/boost-date-time.json
index b8c38d7b1..5883a2b2a 100644
--- a/external_imported/vcpkg/versions/b-/boost-date-time.json
+++ b/external_imported/vcpkg/versions/b-/boost-date-time.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "7946ff22e340ee7a7933de620506a49f0c02e14d",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d56b06972d62749f2f7c9c9950b275d4d4668bcb",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6deadcbe773d183966325ed291aecaba15da86dc",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "d121b1d895d48eb80ef58fc6627e192365decfab",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "f3ff9fc6d82b63ddd51210f54a338afd739536e0",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "3428af10c812e17dc628b3744aa5ddfefe36279f",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-describe.json b/external_imported/vcpkg/versions/b-/boost-describe.json
index 18f721203..a41a5bece 100644
--- a/external_imported/vcpkg/versions/b-/boost-describe.json
+++ b/external_imported/vcpkg/versions/b-/boost-describe.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "c6782cbba94dda30916f801d4b68160f7b6063fe",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5287728efcb90f341cbdbf3e40edd2568baa3d98",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "57b9e703cb64af9391eb2410ef649a94cb34e4fb",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "631c0781e5719b44d906954a57f3a9a42bb37e8a",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "c52e0602d54045f5635b7b00215aaae4d7d13cbb",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "261e53ba26d72a19e154f649475a944f868acb86",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-detail.json b/external_imported/vcpkg/versions/b-/boost-detail.json
index 6f2b40b94..5beaa49c8 100644
--- a/external_imported/vcpkg/versions/b-/boost-detail.json
+++ b/external_imported/vcpkg/versions/b-/boost-detail.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "cd5519c5cf4815126782e82cafcce472281ced51",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9a596ae27e05912ce6ac9430ad0a2c60b0874517",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e6869735032c72f50cd3e5cfdfd08a317fbe1efd",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "ea40bd02426af4c5ce99995762c452e3a70b5189",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "174c7c69d063d88df48d2a6adf91a10f247bc90c",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "dc4274ca2fa7e6b2d65316758632a414ec22ad40",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-dll.json b/external_imported/vcpkg/versions/b-/boost-dll.json
index 9b592d871..e4ee72cce 100644
--- a/external_imported/vcpkg/versions/b-/boost-dll.json
+++ b/external_imported/vcpkg/versions/b-/boost-dll.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "4ad1aef2db0b3f484236b4664e38e8eee0bdca5e",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9458e313715bc4132ded9a04a5d991f9993dcafb",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "92417614fbe01c2ebdf9e5c57dca684fb899f9b4",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "6cfca57c17b2728555ca512c5912af0787eb067a",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "1afca5053a668148d101174768dffa95e676b9c9",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "363bbf3c6f24f93ed58881c0e4d2feefe7cde15b",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-dynamic-bitset.json b/external_imported/vcpkg/versions/b-/boost-dynamic-bitset.json
index 6706b9fc5..c489eddb3 100644
--- a/external_imported/vcpkg/versions/b-/boost-dynamic-bitset.json
+++ b/external_imported/vcpkg/versions/b-/boost-dynamic-bitset.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "9b8fa2fe1a46c7f77f890f83eb124e2f62d21594",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "783e8e0c0387114a445ad62dacbbb2f2ce910cd2",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5ef863abb9f1f4ca201881743fffe4f47930b472",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "d350f9d70da182a7abddd0cadc649394fb144113",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "c274178dc34bcc511ed3bb313c7752be5619a75d",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "7c7d49f54faf119739e0c7ed84cc2c392b69efc5",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-endian.json b/external_imported/vcpkg/versions/b-/boost-endian.json
index 72f6215e6..bab554145 100644
--- a/external_imported/vcpkg/versions/b-/boost-endian.json
+++ b/external_imported/vcpkg/versions/b-/boost-endian.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "169cba73d600248a5fea41b768f150a0ab23a1c6",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5321b25b38e55ebe1bbeb54242c104e208b643f8",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "02c550779838f584656e52ce62aa84913040be26",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "6890ed08d6a7b2c9b54ed6150c2c73570cc512c6",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "4a9b5d84ff2016ea4d8d532a67528f2aed22308a",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "8b246e0a762f2dc709580f4d35d41c14e1ec6036",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-exception.json b/external_imported/vcpkg/versions/b-/boost-exception.json
index 45b2be6db..40ce98106 100644
--- a/external_imported/vcpkg/versions/b-/boost-exception.json
+++ b/external_imported/vcpkg/versions/b-/boost-exception.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "97298e7547c5c7b015c8a55f46428f50fb53753f",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8dce130433b2a5fc44ee576f9b39bb97d916661e",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8eb353034a1a470c5168e00c6d97e5912f7c4cdf",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "ef4cfcde16100435562ccebf90edca8cfc4e204c",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "4fcf9d94526da9da3fb012252c729d063f3327eb",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "eae566a04e22f1d282cb55c0afa3d21b9e376208",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-fiber.json b/external_imported/vcpkg/versions/b-/boost-fiber.json
index 5260e5043..e0b1c9658 100644
--- a/external_imported/vcpkg/versions/b-/boost-fiber.json
+++ b/external_imported/vcpkg/versions/b-/boost-fiber.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "8fa513e456d7d9a92feed2cdec9596d8e07e8055",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "7eadb0ddae816cfed4358cb08ef2bc90c5c0bfa5",
+      "version": "1.83.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "b90277a937de15b5f0701db9933e8af38c399fc2",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d474f76c374b4e212ba4e855c8c91c97a76c9dbc",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "73b5c84611b826d9526898701fac02f83e305c63",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "655088a9e6f77757e30f0fb0375c80e5cb76279f",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "e7a28ac75f376fe846ce57d52d5c3f07f72ce755",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-filesystem.json b/external_imported/vcpkg/versions/b-/boost-filesystem.json
index 5c211ab9f..edddf173b 100644
--- a/external_imported/vcpkg/versions/b-/boost-filesystem.json
+++ b/external_imported/vcpkg/versions/b-/boost-filesystem.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "a85785c880dc278413f4c9c30a64f21ca848335e",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f6419d12dfeb0010846e425acd9e5b27772e1ac9",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0ce33f60fe1f1bca7cabdf40085a6f9fc50d7609",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "9e51e733f0ddb9e287a6ee03bf9cbb1f3f65f081",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "c08aaff5a0420e89b7c31aac9fb993c1151a483b",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "291c2d3312f0513c7f75fc088dbf4b21a7a5a3d6",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-flyweight.json b/external_imported/vcpkg/versions/b-/boost-flyweight.json
index 49b679476..576196aca 100644
--- a/external_imported/vcpkg/versions/b-/boost-flyweight.json
+++ b/external_imported/vcpkg/versions/b-/boost-flyweight.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "dbb2cb540041ff638b5167c378d6dc17a434d23e",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ef75501a5a95e34a23f190e5d41792311f4b29fe",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8ae93d92af918047cdbce0acb4e28bfe8b3917a4",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "2145b81bf66231976f183f4f45084b70e4cbdc90",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "1bec69f27d7277ac4a0d6b423a53506bce68419a",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "e579a7550fe58a6a6f43de989ffa33a961e278e4",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-foreach.json b/external_imported/vcpkg/versions/b-/boost-foreach.json
index f2c2a59e3..9189d51bc 100644
--- a/external_imported/vcpkg/versions/b-/boost-foreach.json
+++ b/external_imported/vcpkg/versions/b-/boost-foreach.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "2e9fa5e50246a289f352f1cbdc225b35f228339e",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "10ddba1bb2b7513dc1459166eed1f4f1b25aa49d",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "72825aa9cfe566882f23cb67085eb649be57ab57",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "561a41ff688b0ef41aa59abc13345b228ae8831e",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "24fb0ddfb7c99858a59c7ed443777a02e37e68a0",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "ac60a3ecf1ac0d0148ab8f75761dbf8fa2994853",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-format.json b/external_imported/vcpkg/versions/b-/boost-format.json
index d82c260d9..9863e9616 100644
--- a/external_imported/vcpkg/versions/b-/boost-format.json
+++ b/external_imported/vcpkg/versions/b-/boost-format.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "bca3fb74a1f4a9c93c6f223f91f20b905590fec6",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8b4697f0c1e3cc49f4bf08c12b748544c132db48",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "82fdf64c7a6daccebb04097c2264eccd4b753447",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "9562adeb23d81f0bfb89adb5c920ead09b302ec5",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "8e1014808cb10f2d5396609b3e5a771db46c14b6",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "873acebaf40c0c9e0483ae74f0c9bb3b3c2e5d7f",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-function-types.json b/external_imported/vcpkg/versions/b-/boost-function-types.json
index d148734a0..9fe6d2a17 100644
--- a/external_imported/vcpkg/versions/b-/boost-function-types.json
+++ b/external_imported/vcpkg/versions/b-/boost-function-types.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "ae386f84f582456bae7c4f304930bad8cb3c3a43",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "77f27d230b3784277075862bba2c282977ea1f0a",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "bf2f0ad26a4cfe85854392e5579bc75d7a4a60d3",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "1da109d6c53f82fdac9bdf6efa17af3d47dacb54",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "16f002900e349d02179d662c54e35e4ba95bba4f",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "c88f49eddde9b3bf50a57e13d824400c9a75a7b4",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-function.json b/external_imported/vcpkg/versions/b-/boost-function.json
index 187a16e47..9f68e66dd 100644
--- a/external_imported/vcpkg/versions/b-/boost-function.json
+++ b/external_imported/vcpkg/versions/b-/boost-function.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "8c317e18c45ba2eac464e2f8e1e179356183c063",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f066c30c0481a6f75452d3a1372ea3425adea156",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9dec477afa8d43d2a95ff257974e703a5fe7835d",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "dce4e73b054f0b611a8d1e0f9efc9dd8cd79071f",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "68d39a15284d4d7eeffdeeee4364b496e262cf39",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "137f9eb9242e4fa1aac35c77497f39b830d74943",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-functional.json b/external_imported/vcpkg/versions/b-/boost-functional.json
index d6f50eee1..425eb7e74 100644
--- a/external_imported/vcpkg/versions/b-/boost-functional.json
+++ b/external_imported/vcpkg/versions/b-/boost-functional.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "76acd323a71cab65354fd244a1b6cd5d38950b8c",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "aba27201e0794309bf68a44e8727378345927b38",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "fd5a2fb579f798abd7b8b0c118543c92ee0f0774",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "3c428ee1b1238a5fbf337fd549d3b3c3afc17930",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "cd3cfc8c7f87e4f36bfc5ec9e6309349707370fb",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "2d8468f160d82e789c30d2431053324c0885d4de",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-fusion.json b/external_imported/vcpkg/versions/b-/boost-fusion.json
index 1bc606757..28d0a5b13 100644
--- a/external_imported/vcpkg/versions/b-/boost-fusion.json
+++ b/external_imported/vcpkg/versions/b-/boost-fusion.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "108d3dffaa34eb6e0102031318f6f81dd4e6af18",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0475f7220a08b37bfbea03b873211f9ea76fac08",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b150ab085d5b818a169fc105e3b096bf7493e5b0",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "0c32122b9244e041424874f6657451169ab9522d",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "bda2444dbc209c5096c98f45d83c7185cf5d8c20",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "fb97e9c73403b64b7bf75665dd1077069cf089b6",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-geometry.json b/external_imported/vcpkg/versions/b-/boost-geometry.json
index 698745032..19aa8c7a4 100644
--- a/external_imported/vcpkg/versions/b-/boost-geometry.json
+++ b/external_imported/vcpkg/versions/b-/boost-geometry.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "9c52ecf6eca52c8bb966f602b037d2ea8df66ef4",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "24efcc4edf764482c058e70a2ce8ab500d40d1c2",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d4067f77462e9b8846d9a00471584a4d8ffbb857",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "76191c9a206f916d0bdb9619bdad1499c426741c",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "72bf3411fd298c17563829e75df8c40cea2f9b9b",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "dc16ecf82aed90badcd28666763e8928f8712e4f",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-gil.json b/external_imported/vcpkg/versions/b-/boost-gil.json
index 05f847e03..0f67c55ff 100644
--- a/external_imported/vcpkg/versions/b-/boost-gil.json
+++ b/external_imported/vcpkg/versions/b-/boost-gil.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "60b79d49cc7db6de724ea225d18f4a3f5c087d2a",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0a3fb8c8c6ef3abbe51fb887be13d94d8c4bb983",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f8dd74ecbae93b5f746fbe67d895a00cfeb9d231",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "ccdfbbf147613d95e1a7fe3cbdbb56aa91dd2b86",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "3ea5df9a76efbaa25e8693cced4b310ae9a3bcb9",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "8fa5151d0d17d7fa4d3a9c649ad83e77ea37de72",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-graph-parallel.json b/external_imported/vcpkg/versions/b-/boost-graph-parallel.json
index de9dd1970..7b9e775f6 100644
--- a/external_imported/vcpkg/versions/b-/boost-graph-parallel.json
+++ b/external_imported/vcpkg/versions/b-/boost-graph-parallel.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "186c9274336af104cdf417d254641ae280b84764",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "bbc5095f32aeabbce7ade0bc7708f44f6cd65718",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f43ba5b79672a46bbf62a53ad000a7e7d14c041b",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "d3c482730f924eeac5f136bf8bd6cc87f8866ecf",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "8f99da9c560fc02f2616387c452bf488df834c96",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "5a97932ba05361ac44593d13f4988f60cb504674",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-graph.json b/external_imported/vcpkg/versions/b-/boost-graph.json
index a4a2d298f..5a88558a9 100644
--- a/external_imported/vcpkg/versions/b-/boost-graph.json
+++ b/external_imported/vcpkg/versions/b-/boost-graph.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "d88bd441d8170ad7029d932c97557f276cb283c2",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6647f8f09420268c0381bf2416492cedcc348c73",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "1eb9dc73511a762ae15c9a114f1ccf8e43c73bf9",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "e4d430a0ca0203e374d282579904323b025a7e3c",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "2f835213c3acc49e139e652da9a3f3e3585fa195",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "18151e6663e64a1bda78ba949dd5dbf882ae5469",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-hana.json b/external_imported/vcpkg/versions/b-/boost-hana.json
index a47f2141e..069b79744 100644
--- a/external_imported/vcpkg/versions/b-/boost-hana.json
+++ b/external_imported/vcpkg/versions/b-/boost-hana.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "6fac64afc8b870205efaf625ed00cf2eaa196bfa",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "75994d0511e21fcd96453070b4bfe104c76e8a21",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5d7127090cf4379d6bd5cb94f6c24567b25d5213",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "4d522c647f882aae8c81ae652b2a5d23d8422f09",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "038723361793eae30d853d3b03776d5e627fef5c",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "89a6fbc04abf3095e7d74157d2e684c208cd670a",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-heap.json b/external_imported/vcpkg/versions/b-/boost-heap.json
index 558527fb4..e691ee702 100644
--- a/external_imported/vcpkg/versions/b-/boost-heap.json
+++ b/external_imported/vcpkg/versions/b-/boost-heap.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "6e142c237b9a50af6eea02bb60cb8e076b3cc017",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c7dc9b45d83570bc364f2eec2caa556ca1cbb5a3",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "910fd038954c6cf54b603c02fca5fb21802a1758",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "034d09501ee6199f969a158831419ae14853e73c",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "ace4872c79b9dae444e5b0805637cb4167763643",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "26a032a3687e89048236a9ad8ce14514d4653121",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-histogram.json b/external_imported/vcpkg/versions/b-/boost-histogram.json
index aa24f00a2..3a007e2ff 100644
--- a/external_imported/vcpkg/versions/b-/boost-histogram.json
+++ b/external_imported/vcpkg/versions/b-/boost-histogram.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "d638494a36a082a981187d2c559bf339160f1948",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "cfb8451fad642630b3bd4072178d9ac1b318d705",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "7a09aa03b51de15b9544589aea569de877eeed1d",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "366641b5e6528033cc0067bec3847f26d9031edd",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "b5667fe6ae81029e94fd3b4617af18b93f06937e",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "91d6246873413ea16a04b2454ac88fbf17448874",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-hof.json b/external_imported/vcpkg/versions/b-/boost-hof.json
index 3bd71f7a5..fdc2f7649 100644
--- a/external_imported/vcpkg/versions/b-/boost-hof.json
+++ b/external_imported/vcpkg/versions/b-/boost-hof.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "dbc18283a5d5acaab16d2165fc3ea2c4501d6649",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "56156c027ebd8af07a502ea9b5fc58fee6cc0b64",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f1277a21ad4a01b42013c1e4324a5ad47004bff9",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "662c6f191b2d2991f86cb15e71c7297d5d9acd02",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "f832ed0aa13f9f03feabb69c40a91d8e31b090c9",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "b5f24a2434567a16b1c40e96f5da71b3f604fc3a",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-icl.json b/external_imported/vcpkg/versions/b-/boost-icl.json
index 32e94c918..c5184ce21 100644
--- a/external_imported/vcpkg/versions/b-/boost-icl.json
+++ b/external_imported/vcpkg/versions/b-/boost-icl.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "90556ca7d9068087ce741aec8e268256176af6db",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d8cf7df44d1c0d7579411af9d8c0decdf498475d",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5d24993000e79436df3c10f8424df464e20da8bd",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "91d333f8870517291000ce2d269485286a4fd9bf",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "0246484074b61bbc8623021e87922ef06ecf84c2",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "cc8a315d67b9f86a015d0f261dd8c15be0f746a4",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-integer.json b/external_imported/vcpkg/versions/b-/boost-integer.json
index 0d14f63bc..12f5ccf37 100644
--- a/external_imported/vcpkg/versions/b-/boost-integer.json
+++ b/external_imported/vcpkg/versions/b-/boost-integer.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "ebfef65ee52f5566976920e3cac7f451f66c7ced",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f70c3d065ad54b0b64e16541cfdd86aceec513f3",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "46935203002bae9d52b70d217abde7758c21d2ba",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "ed95b549c8719f65d4599fb6a612db94043c033f",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "7b810bfe282f052259b5b6bb4e93bc16491e48d2",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "ae7317b7aa788f978c871b93e027ac7e0f90b287",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-interprocess.json b/external_imported/vcpkg/versions/b-/boost-interprocess.json
index 3922345b1..bd9c8a24b 100644
--- a/external_imported/vcpkg/versions/b-/boost-interprocess.json
+++ b/external_imported/vcpkg/versions/b-/boost-interprocess.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "54fee6877683ea31ecb7d9f4e3f62e65ad1f76fd",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "685634ef2e0b7c514fc454d668e27c17937dc005",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ae2d2c05c7433c83dc9eed47f7cd13b6a4c6c46f",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "dc0de1141c5074cd88b9de17d7ea2b39c58b6afc",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "6f3b7d8cd436c4dae51ae807f8a7b04888f06447",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "a2fcc6726c54c13660a87ac4440e91c762041f82",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-interval.json b/external_imported/vcpkg/versions/b-/boost-interval.json
index f0c4691f0..0c298071f 100644
--- a/external_imported/vcpkg/versions/b-/boost-interval.json
+++ b/external_imported/vcpkg/versions/b-/boost-interval.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "52084af2ce6522507fc50f224eb944690263560d",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a3eb772da1f0b5a2fe86601716b0fa8fc8aae645",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "10e93bc8db9627499e8681ccbac7f42e5869b75b",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "d189e52a32b8ef2ca41b5afe112f5a4e6430ec70",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "3e31f7965f783bb5f03cd50a94fbec422cfe7a9a",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "00f8cddccbe6c6c6ec78ed9502322ef70c89c9b0",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-intrusive.json b/external_imported/vcpkg/versions/b-/boost-intrusive.json
index 6fa582025..d00508e8f 100644
--- a/external_imported/vcpkg/versions/b-/boost-intrusive.json
+++ b/external_imported/vcpkg/versions/b-/boost-intrusive.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "b5f197c773d23bb868ae6ccce4c28dc0b97997ac",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "05886d36db2ae6ecb44cf3b964c2d0a4d486c129",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9c1632e270e737c9f035585137c26841952c337f",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "c6ef0a6523433599c5a6e0bebedd4b2caa6b56cf",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "7c4e469b6d426fdbfe13ca7cbddd98caffbc7942",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "cab2fe961140ed73233aa308135f1c97b00dde44",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-io.json b/external_imported/vcpkg/versions/b-/boost-io.json
index 1d0de0225..91a251c1d 100644
--- a/external_imported/vcpkg/versions/b-/boost-io.json
+++ b/external_imported/vcpkg/versions/b-/boost-io.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "dca15cab49b7b33ab58762315d107336d28b404e",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f5d84659eada088f612945a42ae940ee7dcc37be",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2e824cb312fdf8d4b782b625053595e9bb13dc3c",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "21da7534c21a1dfd1ff5833e330837ad8fa26341",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "7b5af6b0a01341944b40737a439c4242a6f44b6a",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "51dfeafbde1b365b08a8e802e89057312f92657a",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-iostreams.json b/external_imported/vcpkg/versions/b-/boost-iostreams.json
index 158bab786..f0fa5b85a 100644
--- a/external_imported/vcpkg/versions/b-/boost-iostreams.json
+++ b/external_imported/vcpkg/versions/b-/boost-iostreams.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "01c0a85616fd0d4f8529c0ffa48bd358833d9ea4",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "be97780ebb3e46185f1838115f642ec2d110f76d",
+      "version": "1.83.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "da8972f0e4c59981021913e4ef16a39a9ff8d491",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ac82b98be4e5ba2e754a532ba2754ae4f0496469",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "9a39f5835d29b23ad73b036797cb4f6f000e83c2",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "3938aa03b3ebf9177ab9f922455ae29bf02c8330",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "d5913a98e3d5443e488ba65ee874214487b7b1aa",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-iterator.json b/external_imported/vcpkg/versions/b-/boost-iterator.json
index f4c3c4f54..3a73a0b86 100644
--- a/external_imported/vcpkg/versions/b-/boost-iterator.json
+++ b/external_imported/vcpkg/versions/b-/boost-iterator.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "0d18698f7abe635814d1a4887b5b94157c5fe2b0",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8870bee36b1dee543b554c3e0264e6871a6ad6e2",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "32b20eaa8ec0539f484ba8dc1a08fd163757d48d",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "06e57442234e51fd436cc31ac285319baaf83e26",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "f5dc624248bbaa34b1614bd5de984c149e127544",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "68a8ec26ae2f81487bfd0ccbff5a707229f996cd",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-json.json b/external_imported/vcpkg/versions/b-/boost-json.json
index ca0ef4927..af29e3aeb 100644
--- a/external_imported/vcpkg/versions/b-/boost-json.json
+++ b/external_imported/vcpkg/versions/b-/boost-json.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "071f85fda05b2ea3fa45d6b1dee3070950074762",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "bf515b1083df1c9d11c17713ea9cd22ad8deee20",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a88bb521a85cb7e8577f49eed059f656b0d81d07",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "5fb8cff5e879195843741626bde8a0cb9955e1aa",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "8258d6ffb06571b088d3d6d1119d8106c3acae42",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "e1823e435f5b0a89baadc0aedbd7b80cd3c8b4ef",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-lambda.json b/external_imported/vcpkg/versions/b-/boost-lambda.json
index 28838bde5..c02efa2ac 100644
--- a/external_imported/vcpkg/versions/b-/boost-lambda.json
+++ b/external_imported/vcpkg/versions/b-/boost-lambda.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "43da545cb3f4c5f999a69afa8588efded1489161",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9f5b545dcb43d7901ce68b14f598605e86b2711a",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4fe41ac7e3024b92d857b855f8833f83d4abd11e",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "7a7a8a65879f8262d502979631cd082afdf2d6c6",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "5f935f0fb24747b61dad58b0da1c4a307d0ae125",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "07560825826af31beb117e969084c236ad5daa59",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-lambda2.json b/external_imported/vcpkg/versions/b-/boost-lambda2.json
index 560b68254..177a154b1 100644
--- a/external_imported/vcpkg/versions/b-/boost-lambda2.json
+++ b/external_imported/vcpkg/versions/b-/boost-lambda2.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "09bd21488a9a351da1a26d00dbd76f1da8f50a8a",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "399a7528e08b7a9e7a888cbb7d4a60c3212d3fc4",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0594208903bfe03699a0b1c4a549156425bc0bdd",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "5ac3cfaa7a77c860f9ad676a028c0a79976c4e64",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "551076a74a5ed1a80ddac2c5838406b3d23968bc",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "b86a3afd40cb32ccb1b8e6e59df60d471e5d11a1",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-leaf.json b/external_imported/vcpkg/versions/b-/boost-leaf.json
index 4784ca5fd..f8e813dbf 100644
--- a/external_imported/vcpkg/versions/b-/boost-leaf.json
+++ b/external_imported/vcpkg/versions/b-/boost-leaf.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "ef47c8ddb007015f138d7d2f6c1942f1859c6e54",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9c5d7bf52009af1e4fa9ab2bf88a8592a3f9c2f0",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "cb036779325e545fd6138cfbaa0703d729aa401b",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "43c810b64420088a3446c74e4d54db10f16c271b",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "9cbc39c935546af60a873c21b53c97943e90a85b",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "272d3619c543d063bd0e23ae8f23e8c677f419e9",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-lexical-cast.json b/external_imported/vcpkg/versions/b-/boost-lexical-cast.json
index d94329719..c1bd40a23 100644
--- a/external_imported/vcpkg/versions/b-/boost-lexical-cast.json
+++ b/external_imported/vcpkg/versions/b-/boost-lexical-cast.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "270740ecb9a0bf6d8536fa654ef862fdfd706ad5",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "dde0974bedf5d7539835eeadb3183b72d0df75f0",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "27cd4bbb12ad5a785f7e32723dbb72c4e4bf023a",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "54b82af182eb01789c463148630e7e897ae3f3b7",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "1784c7d294604acdd3dc3179e7ae1967631f1122",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "677997615028f116ea892e8a0731200a2bd3f306",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-local-function.json b/external_imported/vcpkg/versions/b-/boost-local-function.json
index 3757c5a9b..a6dce43ed 100644
--- a/external_imported/vcpkg/versions/b-/boost-local-function.json
+++ b/external_imported/vcpkg/versions/b-/boost-local-function.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "bbecd00568ae32f048bb6cb48355547c889fd361",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f059d8e9dc60d429ca4910eb0603b7ad768339b1",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "51ae33edcf3e425aa42f2cfbdcc926ef3996ce6d",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "9e386bbe69f3d754f0771134ef2bd349b9e9d381",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "c14954836274ffec27319627c787e0b5d34a9db9",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "1658e6ae0eac14c1e10378d6299c59a0c889f01e",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-locale.json b/external_imported/vcpkg/versions/b-/boost-locale.json
index 597d6d026..36db6e160 100644
--- a/external_imported/vcpkg/versions/b-/boost-locale.json
+++ b/external_imported/vcpkg/versions/b-/boost-locale.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "890a580576001c650e84c6b92fd995a048317e3e",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "41e9801248d577c58c9827d2177ec7a88719b116",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3ed08854668287984c74498fb95f081740459048",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "d9c9d24ad31946e6bf5bcb2adac9f0124e7534d1",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "42049ec2a8514f4a4456399d147f39bae465e2c7",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "c88f686dacd0853cb980f5170fc52e2ee0852033",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-lockfree.json b/external_imported/vcpkg/versions/b-/boost-lockfree.json
index 49e93f373..228662c88 100644
--- a/external_imported/vcpkg/versions/b-/boost-lockfree.json
+++ b/external_imported/vcpkg/versions/b-/boost-lockfree.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "0d45e99b757eda86d272cc1142e9cc348296bd2e",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "db32f8262d243ce50d3dd2b67e9f13ce9fb584f0",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4e5234382d1b899deef16bbbeb58b19bcf5661dd",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "084161896f614963e296c5ebd58f23ee613988fb",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "d5a6ea1e9d6a0d73e57526511ab5a7082417fb95",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "3fe452d3e96f55d8c49b289f2f101cb274b275be",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-log.json b/external_imported/vcpkg/versions/b-/boost-log.json
index 3c1631f18..aa9ca70b5 100644
--- a/external_imported/vcpkg/versions/b-/boost-log.json
+++ b/external_imported/vcpkg/versions/b-/boost-log.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "db4f5d820c44affa3f47654fb2396d88493968a0",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a9fc311a8361a136d6723b2a45e98af511749e7d",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "486c465bb29be1d743d50fd66134aafc9ff6f820",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "3c03453e91b6d10cfd41e5113aea15c9070ba310",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "34ff06ba71408f9f2d5dbaa0649a5a6660731c70",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "caf66e1400f40a88d45f8411351c04a15fe764bf",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-logic.json b/external_imported/vcpkg/versions/b-/boost-logic.json
index 084f8f7c2..f140418c4 100644
--- a/external_imported/vcpkg/versions/b-/boost-logic.json
+++ b/external_imported/vcpkg/versions/b-/boost-logic.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "17ac346b6e90c114fca29894244340845440e183",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4caeef24d5d621a2a42819bdcea2ee90b4414f5a",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "99d96e2a54223f8db7b94429392de363cd69ee61",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "418ee0f83e1b41fddeb9d416fc383abf40ebcb03",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "e6a9a74ea009da01f7a815b560dbae631bc4aa23",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "5ccbe9c525ab9f5b69d1f6bcbd318c71384a1e8d",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-math.json b/external_imported/vcpkg/versions/b-/boost-math.json
index 327350fa7..0be17fe21 100644
--- a/external_imported/vcpkg/versions/b-/boost-math.json
+++ b/external_imported/vcpkg/versions/b-/boost-math.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "b6e62a61bbf90ebc1f36bfd01892b793476e1d9b",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d2b21d46b8da00d788266ec6b386602f345659c1",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "7c52621d3f785a3aee44d5a741597a0a4ffd8912",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "61b0ddfd8a1a5e18f97584b57143de200770bd56",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "588fc3a51b43097feee421ca66c5d436914a1364",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "c380e71e2820131a30349ad89bc1c0240c17c4f2",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-metaparse.json b/external_imported/vcpkg/versions/b-/boost-metaparse.json
index ef175bab6..b62ba4665 100644
--- a/external_imported/vcpkg/versions/b-/boost-metaparse.json
+++ b/external_imported/vcpkg/versions/b-/boost-metaparse.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "922b74624b73c61779da3d81acb8b99b98d25970",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5994a689a2da98a3effa716ab52de1b13266fe13",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c34b7fa72446bdd3037f8986d0e653dee79d5df5",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "fed3e04ea8531c9c7b141eca201e24a6ae24e420",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "eea7060a597e867d171a778a6cff2e56f364cf78",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "1174474032e8403f7f9acff6c8dd01b5add784c4",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-modular-build-helper.json b/external_imported/vcpkg/versions/b-/boost-modular-build-helper.json
index 8895e693a..f1eddf016 100644
--- a/external_imported/vcpkg/versions/b-/boost-modular-build-helper.json
+++ b/external_imported/vcpkg/versions/b-/boost-modular-build-helper.json
@@ -1,5 +1,55 @@
 {
   "versions": [
+    {
+      "git-tree": "b3eb3e3fdc08ffe6e8f9e19e761e583790aaf308",
+      "version": "1.84.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "dc7e88a84383b497c7d9e117a00319fd2b2ded98",
+      "version": "1.84.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "846d3e5195faf74db827dd0197a4fbc6a56315bb",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "95d209e069cf1a82d48fa32cef7a7c39edc33c22",
+      "version": "1.83.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "843c4331dc1453c80f99e25be4513c99074c5cf2",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2d374869ba7aa60ab439300ed4d032f95c9b88a7",
+      "version": "1.82.0",
+      "port-version": 4
+    },
+    {
+      "git-tree": "98f75b07bdab1080c9470eb115836035d7142397",
+      "version": "1.82.0",
+      "port-version": 3
+    },
+    {
+      "git-tree": "3ae088c69a58eb9a5854ff99807397a0c09daf6a",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "5c1a238cc20c885e785bc05a36b974deb5e02db7",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "91d3f81ba22427aecb2b551da48e54f684f056a2",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "976b927d38ce533c1c403b80c9e0e23e62737195",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-move.json b/external_imported/vcpkg/versions/b-/boost-move.json
index 5d06a0df0..b5a8ebee1 100644
--- a/external_imported/vcpkg/versions/b-/boost-move.json
+++ b/external_imported/vcpkg/versions/b-/boost-move.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "1159c6a1d6b15517994acbd64c0407ce57161723",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3f4770bf9904c733be328e32d4017a0ed1157d2d",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "bda03863857c818ffb310f45d2d148553a5de381",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "1ce5f627ac0c30d041b9f2981fd3c11e4b504825",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "bbce4dbf27e6888c1313ac461a97746eda2ccc88",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "603b2620f750f75988513a9c5657685bd6e6e049",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-mp11.json b/external_imported/vcpkg/versions/b-/boost-mp11.json
index 8d9b1e4d4..6a5fb2180 100644
--- a/external_imported/vcpkg/versions/b-/boost-mp11.json
+++ b/external_imported/vcpkg/versions/b-/boost-mp11.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "a26261cdb9cc5232b748066ee61799564c3d3be2",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "68c2556b43afbb853b5e724eb0fd5269a92088f1",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a90f12d1eca80483d10bbd93deccf5439f904e04",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "80e104d697b7ff7a283c5f7ee83ae25fe1192bd7",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "24bc0a7070d454449f3ee96728d01208d5e8f944",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "4a3070ba5150b33b08d90a7938ec2ba249b5780a",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-mpi.json b/external_imported/vcpkg/versions/b-/boost-mpi.json
index cb433ebcb..8303bb36f 100644
--- a/external_imported/vcpkg/versions/b-/boost-mpi.json
+++ b/external_imported/vcpkg/versions/b-/boost-mpi.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "82cf05256f02b93cf70ccdc141ff467d1ba2e9a2",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d9f0ba74af84204dab8f9a68f2eab345ed493295",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f67b743f8b04e8d1e7135745b3a18abe62a4eb5c",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "e922f77680d62cda6668cff0096eb4c34f04f4c1",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "989754aa4a5a73a526e65389199751b066bea263",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "dbc4c4053a5bf691a7fe428c8445eeee859680ed",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-mpl.json b/external_imported/vcpkg/versions/b-/boost-mpl.json
index 43cebf97b..ca3b8c7f0 100644
--- a/external_imported/vcpkg/versions/b-/boost-mpl.json
+++ b/external_imported/vcpkg/versions/b-/boost-mpl.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "48ec467749d6a874076f755bf8d5a131381b5c82",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "dfcb80d8d1b767426e6714d6ba1b6a1473c0cc23",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f2d9b906b09ffd6317c9de5f97537688cde482bd",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "e08d5a2eb5d5edfc5a62469dbaa283cf56570d07",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "a93828eeb5ef739da0d8669fca6f7fbccbfdfc1d",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "1acb02099065a7bdb39a002a990ab8424205d6bf",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-msm.json b/external_imported/vcpkg/versions/b-/boost-msm.json
index 655bff126..67cf10ef1 100644
--- a/external_imported/vcpkg/versions/b-/boost-msm.json
+++ b/external_imported/vcpkg/versions/b-/boost-msm.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "4276a1ca74ca3c612b74540d12b9a09a0bfd9a29",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "1e6c265d4b9681f5da0f23cb3a3912498fe4fbb2",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8536dd1583d433e00586c1cae10d6e8d6e02e330",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "46d34f9c642921c949f7f9122d41f3d679392003",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "f465acb8c11b21def4825b5fbe283df0d265941a",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "5e74b1d6cfadd49df6bb58b46d93c07d36d71724",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-multi-array.json b/external_imported/vcpkg/versions/b-/boost-multi-array.json
index c4d778648..f454073b6 100644
--- a/external_imported/vcpkg/versions/b-/boost-multi-array.json
+++ b/external_imported/vcpkg/versions/b-/boost-multi-array.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "462e009bd4e8e260a24f52b69b34d6a44bed2fbe",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f7c1d6533820072446bd68c928c72964501def1e",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2a850ad389c07479589bfc617aff5b03a2b98c17",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "62357ac27e3d8d2eefc9bf42f8bb8ab6e417859d",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "551544b7e67836202f43899772bd9ef1dd223640",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "52a3cf587864ba5ffea5902b57582d0f550d2546",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-multi-index.json b/external_imported/vcpkg/versions/b-/boost-multi-index.json
index 09db107f7..ead5a9131 100644
--- a/external_imported/vcpkg/versions/b-/boost-multi-index.json
+++ b/external_imported/vcpkg/versions/b-/boost-multi-index.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "4d1d3bfd05ed85d3ea3712df38f0a07864d53d56",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "7d40ee58c3e54b9c841abc6dd57033366218f064",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6fe88d1349bd1ddf78ded3e786a539514d285835",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "a5add430816876d69afa4df43bd91f776c8c2f7b",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "92f38ef6bc273bbbfd373bef060315f6cafb34c2",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "354572a93cdd0f2ef64b285ca013d250854359f1",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-multiprecision.json b/external_imported/vcpkg/versions/b-/boost-multiprecision.json
index 741a0ebc5..972916769 100644
--- a/external_imported/vcpkg/versions/b-/boost-multiprecision.json
+++ b/external_imported/vcpkg/versions/b-/boost-multiprecision.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "4c868a1c871bf2be340548a13614ee761780ccd5",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d5c0acb2f8f25475a0a69d41460e377e6ce66749",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d678e2c33ccdd2e64aa71ea623e1b89109502482",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "7b0e294a0e563b3c9580683dafea094dd3e96849",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "2276ca63882c838c8ab2c9b4888f1264f5c46174",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "f12752f8d8f890ae24db6c35d181aa4a9e408082",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-mysql.json b/external_imported/vcpkg/versions/b-/boost-mysql.json
new file mode 100644
index 000000000..c572d3bd9
--- /dev/null
+++ b/external_imported/vcpkg/versions/b-/boost-mysql.json
@@ -0,0 +1,29 @@
+{
+  "versions": [
+    {
+      "git-tree": "445cb1123a3d51d6cefd5954fea6cf3d06f83351",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0acda793061ac85e68029b15c6fa6919a2f87e8d",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d85c256826e13a62169b1f38bf7c3f8288a697c0",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "93979a186a11766a973ba4d204213cc0237f71d1",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "3b07f53eb29e4832821872d4beff53b5c2cf1ff4",
+      "version": "1.82.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/b-/boost-nowide.json b/external_imported/vcpkg/versions/b-/boost-nowide.json
index 7b69be10d..d365e3739 100644
--- a/external_imported/vcpkg/versions/b-/boost-nowide.json
+++ b/external_imported/vcpkg/versions/b-/boost-nowide.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "ba0821bedf1027ee9fe1e6e93543115ecd2f069a",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b4c07fcec5ae6b5f94811dbd50ee720884d65752",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ea86cbf24b6f2bf242d24bd8047699cbe644b68a",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "0a33bddbce29068b61dc012e6326446175b79184",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "27a80db62b918cf6940cf344794fe82a09656f94",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "7f2c197f872e761742ba027d9379eab35d344231",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-numeric-conversion.json b/external_imported/vcpkg/versions/b-/boost-numeric-conversion.json
index 229b4eae8..3417d8f27 100644
--- a/external_imported/vcpkg/versions/b-/boost-numeric-conversion.json
+++ b/external_imported/vcpkg/versions/b-/boost-numeric-conversion.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "2c04732bf0a8b5a4025226e584091e3998e1b224",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c3a65f3521df33b8a76605097a3046795f1107e7",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "00e6f269cd4fab6986205b397e46394795941f31",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "97842146c6a87912141dd1d4654e1576d12e5cef",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "232cc2c101d565009c9c60968bd2c7eab1891e4d",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "63173b669cafa107010dc0615254f7338fef22da",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-odeint.json b/external_imported/vcpkg/versions/b-/boost-odeint.json
index a6eb6801f..63af38f02 100644
--- a/external_imported/vcpkg/versions/b-/boost-odeint.json
+++ b/external_imported/vcpkg/versions/b-/boost-odeint.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "2fcbd140edeb2924fc474103591e7c2f93bee130",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f65beca22b3663038f2d5da292a1dd7f63c1fc23",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "70ec7a68fae7d61cd0fb694743e84f327ba34272",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "ad9209f191bcf6d65e9fae09c5d722ae1b058004",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "ae52c4534ac39a38a782f8f5b076883061f6326e",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "040c449827191e183d02552e8a125f47f95be31b",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-optional.json b/external_imported/vcpkg/versions/b-/boost-optional.json
index ee5b4f3e0..092a5ae2e 100644
--- a/external_imported/vcpkg/versions/b-/boost-optional.json
+++ b/external_imported/vcpkg/versions/b-/boost-optional.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "48bb7c9174d9321f4b41f787edc318581972437c",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "145809a6e99a8ba579c3c0bef2c48969555a2bd5",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "26a359b912dd2fb42978ddf8ae39fbbccc1e34bb",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "100ff3094e97d23516718679d59d9f86821074b8",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "a6a111b76b0488b4b2c3a889876b9fcdcccdfb67",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "a76d1e59a1f3809b82cfd8f43851e51ecf1c7e15",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-outcome.json b/external_imported/vcpkg/versions/b-/boost-outcome.json
index 69abf87af..f450ac1e8 100644
--- a/external_imported/vcpkg/versions/b-/boost-outcome.json
+++ b/external_imported/vcpkg/versions/b-/boost-outcome.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "3c30498b367ff02b3edf49c4e2e726fb64258200",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b4f9214c118d7d3ee45f5c2624f8383ff596fa14",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "089f7ec14f71ee4d59db5bcc795551da347f63df",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "bca5b674d3737aeab820ca2f36e4db187031f296",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "7747ed969228bb72b00135c0e2f9e8be23de8f3d",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "dc4fde7c569c4edd73ef2e764f28cadec09f6c01",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-parameter-python.json b/external_imported/vcpkg/versions/b-/boost-parameter-python.json
index 855d6f96c..ac2d06e3f 100644
--- a/external_imported/vcpkg/versions/b-/boost-parameter-python.json
+++ b/external_imported/vcpkg/versions/b-/boost-parameter-python.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "e226c53878059005c1a0f38be081c3bfef1f7483",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3894f883ee35b2bae2f102c520e81deca80f6643",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ce2b59b01e836bb57415dd89d2895e52efa67970",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "375d3ead166d0600ebedb713227e05b52b624129",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "481c35c8ce42352acd91bad72bd96528f7eca160",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "0308f77b36482007673cf703034443cf65e55415",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-parameter.json b/external_imported/vcpkg/versions/b-/boost-parameter.json
index 8ecfb766c..fa1765050 100644
--- a/external_imported/vcpkg/versions/b-/boost-parameter.json
+++ b/external_imported/vcpkg/versions/b-/boost-parameter.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "675460856203c4e36b59035ce05148bf5d6c4103",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "1dce1428072cad1f8bc7b6c02f14cc6ba12da3fd",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ba542be6ce0920e0fbc12d2fe1d3fd4edb02c4ec",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "6170f4f4b0b7b9105de27ddd1caeb5f92c7feac5",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "a80705ae417e52c0ed302f2192dc26addccdb8b2",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "432a7587942a58d632200ef03b28f5a4fc3fd7bc",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-pfr.json b/external_imported/vcpkg/versions/b-/boost-pfr.json
index 5a97af049..186b653a9 100644
--- a/external_imported/vcpkg/versions/b-/boost-pfr.json
+++ b/external_imported/vcpkg/versions/b-/boost-pfr.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "2ccc905349d8ac698ee9900b86e952d7ead3f1db",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2a38c23f0ff2226b879e1ef04aefd19f479bc5a6",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "84e8832ae82979a2748d319fca9f8e5fb397e1b9",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "441d806b60674a7f79367de3675633972151823e",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "aef1c06093c494f9dbd3dff370adf7259342896f",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "e8e3a29f5a07aa3f57e92a281a32d9da85faf155",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-phoenix.json b/external_imported/vcpkg/versions/b-/boost-phoenix.json
index 9b2d520ca..811226ffe 100644
--- a/external_imported/vcpkg/versions/b-/boost-phoenix.json
+++ b/external_imported/vcpkg/versions/b-/boost-phoenix.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "0c29dec6a299097d811bc9b76439f2ad7afe9fb6",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a4c5832e8ebf68cd4f2ee601a10aa7adfc12e6e9",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c68391dd87698c5d288e7e6f937d72597e0e749f",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "cfcda2e56bf879d0c3d09399abb8eddcfd1b2d27",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "fe32678fa216e5b70cec84ebf08eefb55ab1a99e",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "dc96247cd9251f11421495082404e4ef6f1fb074",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-poly-collection.json b/external_imported/vcpkg/versions/b-/boost-poly-collection.json
index 57884d8ff..a0844b12e 100644
--- a/external_imported/vcpkg/versions/b-/boost-poly-collection.json
+++ b/external_imported/vcpkg/versions/b-/boost-poly-collection.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "5eac8cdcf86fc0fc2753efa6acd11f23463e8069",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "28e876df1967c012343839a6258191ce5107e5f7",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3a905d35b62d85eb36ef4a2748fde453ffa8ac2f",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "11d5d87f8e0701ad7c591b83b75d69a27249e8d0",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "8dc25d07f3374565adb6cbec2b66c72e5001f0f7",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "4256eb60f0d91c480186af87acaf8a45bedb4833",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-polygon.json b/external_imported/vcpkg/versions/b-/boost-polygon.json
index 5b7fe653c..40ab64772 100644
--- a/external_imported/vcpkg/versions/b-/boost-polygon.json
+++ b/external_imported/vcpkg/versions/b-/boost-polygon.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "f9f254f2317b0f98b79fba8239b81ef3c65a30bb",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a2cd356928aae40e3ed8a5764f868de84dde981d",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ff0451ec470d4d15f7eb41a37fb9aa5b960b7348",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "c5072bfa0aced94778153484b7b3c9302e0ff0f3",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "a9f865a95d609cf845c7df90a24bd2c4a3e8d3fb",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "0da0dedd618fda4f546705035a6cb04243cf3c08",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-pool.json b/external_imported/vcpkg/versions/b-/boost-pool.json
index c6a5e823d..0f9dc3da7 100644
--- a/external_imported/vcpkg/versions/b-/boost-pool.json
+++ b/external_imported/vcpkg/versions/b-/boost-pool.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "359af8d863109dc52bf2a7f7de75bfc5cc912b6b",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e5c81fe62cb0da4fdc940d21d87837678a2e67cf",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f31154b251747a951b5100f83cff4c065eb1295f",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "0a399a01f9750acf2d7ac62288452f3d4319eb0e",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "4e15663be62c3d1a300c193ca87353ce8055b3cb",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "1f3da20be03fe0e6f6027b6ddf35a3cca1fdcaf5",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-predef.json b/external_imported/vcpkg/versions/b-/boost-predef.json
index d6e76853a..22d8a92e7 100644
--- a/external_imported/vcpkg/versions/b-/boost-predef.json
+++ b/external_imported/vcpkg/versions/b-/boost-predef.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "087c63189a60b36df9891096809a9cd3393c914f",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8e76add266584a1177e9a0f2c59c43a78d88e578",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a7efd1a99c14c79b469d86bbf9d39898ffde1858",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "3a0c5194d7a4d8825efff8d67e0c75cae0b058d7",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "347ee427d1c355f706f0ebe28bdd2b6ade08366e",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "d4f932a1cdc8e5f0230299efcb8817f859937692",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-preprocessor.json b/external_imported/vcpkg/versions/b-/boost-preprocessor.json
index 6ac620a3f..fc4fd74d0 100644
--- a/external_imported/vcpkg/versions/b-/boost-preprocessor.json
+++ b/external_imported/vcpkg/versions/b-/boost-preprocessor.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "87a9dcc2d893cb4b0463fc054b761dd2fb446df4",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "07609446e5cce5a0d9afed4570e0664708444b54",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "11fa54ebde61dcf9ca2e18a42aa7445b76ce9400",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "85819cdd004323b0afe1a361b9e05fdb55ab6838",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "1ca0aa370a73a31b99dbba3853293e00bb984ebf",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "84a76a2f6986793db34bfd413c3ef8aa5e994697",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-process.json b/external_imported/vcpkg/versions/b-/boost-process.json
index e1b53c598..5f76a3d6d 100644
--- a/external_imported/vcpkg/versions/b-/boost-process.json
+++ b/external_imported/vcpkg/versions/b-/boost-process.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "b6a63d216875e9454cbfe56402b554ce08df2ddb",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d0426afce7bf4a50b9928232515951043a59bcd3",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2c4af3d39b6e980d59ecc1baa8f07f9aac97eca2",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "54d30d2c4ffbd008fab793649b57a09338d91b32",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "d5bbe25fb9d58954910bf9b99678dda4ca24ef6c",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "087e6fd8563e7c1df08ce40069a117f0e86d457b",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-program-options.json b/external_imported/vcpkg/versions/b-/boost-program-options.json
index ad1c8972f..4ab5df59b 100644
--- a/external_imported/vcpkg/versions/b-/boost-program-options.json
+++ b/external_imported/vcpkg/versions/b-/boost-program-options.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "775755221b75c1b8c48727ef5894fbd29db4478f",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ce15d2fa5ea81e6da9f8ec078cfe466f4d4e0339",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b15733a9444492f8882068981b01f270d301b994",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "c39f818a3734e996eb777117eb8d1492d7b1b26f",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "bccb010e7166f6260c14e7a3ecd45ac896063f5b",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "cc5109dfdf796698dc21eda3f65dccc1dbb2b375",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-property-map-parallel.json b/external_imported/vcpkg/versions/b-/boost-property-map-parallel.json
index 9088639e7..8c4cd82a6 100644
--- a/external_imported/vcpkg/versions/b-/boost-property-map-parallel.json
+++ b/external_imported/vcpkg/versions/b-/boost-property-map-parallel.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "96a4e6e0494da5c3c9bbfc537f21d64b976473f3",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "715673e9e1beb9a6dba4422f317f4778b98b1bf2",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "35b35b75e5be38fcdd1d0f2ea49403a3d168bbca",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "6906d1d7dc7e80215f7889096b950d7c3b984bc2",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "cbb8b88eaa70e08c2df902783a8a3445998611ca",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "ca3887d48c4227a0b06d09aa6059793b0e61c72d",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-property-map.json b/external_imported/vcpkg/versions/b-/boost-property-map.json
index 357bfffe9..4f17760f4 100644
--- a/external_imported/vcpkg/versions/b-/boost-property-map.json
+++ b/external_imported/vcpkg/versions/b-/boost-property-map.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "afa1c14b9ca8ba001f7dc5fbed165fb9f7e34a37",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "1b4cf346ccedc4c90c63a8676b0115554301a62c",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2fb0d2bae69811fc5b3aec9cae898cddc6177cbc",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "2f85d45654b717daeeba34ae150afcdc1df309a2",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "ba64fd3f205f23b2f4b0d38d743f64ef4cff5234",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "575f1a849205d7f80887fedc5d7b0d68c3605807",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-property-tree.json b/external_imported/vcpkg/versions/b-/boost-property-tree.json
index b972f4adb..9a475724a 100644
--- a/external_imported/vcpkg/versions/b-/boost-property-tree.json
+++ b/external_imported/vcpkg/versions/b-/boost-property-tree.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "fe19ef0bba9fdf21f3b3dd86ba9ce16142270082",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "caa9ef5866c4dcf2869fca47fb3a478f74e07f7a",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ba292d3a56bdcbc9be58eba676f68c604e16e6ea",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "c183cb16868f5bc299ff89a868eaf6b1a0a2f74a",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "2d28ee4ccdf7228708cdaf57631fda57e304fa6f",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "adf734f102e54d2ed73159ff2fca71f9c7fe9ed0",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-proto.json b/external_imported/vcpkg/versions/b-/boost-proto.json
index 829a51e4a..443ad4125 100644
--- a/external_imported/vcpkg/versions/b-/boost-proto.json
+++ b/external_imported/vcpkg/versions/b-/boost-proto.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "0a54634df836af7950a3962c00de9b92d1d8351a",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "7bb3591b035347ce419b85ae321c0e1b6c71084a",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a88c491de292efd0f32b41b78f69d5da1baf53f7",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "1bce55f9406e1c918ef220127ac1608811d04926",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "37a65b0b4d70f7150dba9a026747b916f8994dfd",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "30ebf6222b12dc6f415bf0e8818da3b115d84306",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-ptr-container.json b/external_imported/vcpkg/versions/b-/boost-ptr-container.json
index 6860c3f35..fba74c1c8 100644
--- a/external_imported/vcpkg/versions/b-/boost-ptr-container.json
+++ b/external_imported/vcpkg/versions/b-/boost-ptr-container.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "c0559a42951f7af1dab2fe477fb4cd63434ddaec",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5b926ddc4f1044a202ed6b5a052fab6d6578f051",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "623acfd1039e24498326d202bc3aac4aed87e91c",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "fbf9f674a0c21a43d0aa0e1fe4a02cdcef8da616",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "356dc81e710c1a2fdb8b03039bcf9be27ac0e58a",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "be4f59a7efd19446541a57794c7bf233f9909af9",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-python.json b/external_imported/vcpkg/versions/b-/boost-python.json
index c32ba523f..9f4c05307 100644
--- a/external_imported/vcpkg/versions/b-/boost-python.json
+++ b/external_imported/vcpkg/versions/b-/boost-python.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "43674e733eca3a97529383f6732a3dc2c1e2544b",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2e89ec0e4997ffd54bfbbd891df39df068d84fc7",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b408c26dbce69d97b4ec2bac833c18284c06979d",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "e27c5fc20456f37dc552c8002ada45ede962be4e",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "08b3120f932fa085229ab4aaa68cbd97481663fe",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "3788a31404344b58dc74fa8844b30153e6bc3254",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-qvm.json b/external_imported/vcpkg/versions/b-/boost-qvm.json
index 03463ca4b..1344362d4 100644
--- a/external_imported/vcpkg/versions/b-/boost-qvm.json
+++ b/external_imported/vcpkg/versions/b-/boost-qvm.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "118696ac11e3fd3c266cf23fb88ed0a1627de68a",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "7f023cb85fbc266b836aabc8f0b66d55332869d6",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "01f2e32794bd62e7f6409a14bd7c1126ef335d46",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "71b16c8f7212d75d5088b97301030044f3d924f8",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "2e613c337ef37aa5201d6e6eaa66d8699ac986c9",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "5b978e84334796ec2cde5251a83c1fff650559f2",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-random.json b/external_imported/vcpkg/versions/b-/boost-random.json
index 827e14bc6..a9e88826e 100644
--- a/external_imported/vcpkg/versions/b-/boost-random.json
+++ b/external_imported/vcpkg/versions/b-/boost-random.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "7e18eb4875eee251ddbac6ead758d4e20e1b1f71",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "045960cb6d4295d363e1748931ea56fc245f7c09",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c440ed1d17008e8a77ff3cdcc495af47103f05be",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "0c97951b0f38d6c9b469b367ac136249e1fa23fd",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "c05105528f974ce1a2b709f10f3f8c351e2a3991",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "e757f43e9530224bd993eaf6dde5210936eb055f",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-range.json b/external_imported/vcpkg/versions/b-/boost-range.json
index e7f86a738..fbeede30d 100644
--- a/external_imported/vcpkg/versions/b-/boost-range.json
+++ b/external_imported/vcpkg/versions/b-/boost-range.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "2c03982fc0e52976188f003f72055cac0e3b0295",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "7d5d869d86b0abdd19022ee0b0c5f24192769291",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "1b034bcdf929c6bc7cfd900580907fd1ca6620fd",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "fc4c6c85df6efb4afe27a53499abdcd17da71a69",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "355c16dc4d5e773a1ed735b6d74234c5540457d0",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "6af5cb1fbc3dc3ed087153266d9f7e6df3c8808b",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-ratio.json b/external_imported/vcpkg/versions/b-/boost-ratio.json
index 6d099f996..76405a728 100644
--- a/external_imported/vcpkg/versions/b-/boost-ratio.json
+++ b/external_imported/vcpkg/versions/b-/boost-ratio.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "082d4cc51e82e8c352926eb2873e9abdf891732f",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0fafb812427bea7d49dd318f3e72778149f443ab",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "fb8691f0340e091213aff8763edb106d19d132c4",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "cdb2522204e612067abded077c6ec1f783210f10",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "c5e609cc2aed611b76c584596105bc25c3df10c6",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "335b163023058d8c0fc1f256e56dbe5ab30f03f0",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-rational.json b/external_imported/vcpkg/versions/b-/boost-rational.json
index cf4c250da..3f40294ea 100644
--- a/external_imported/vcpkg/versions/b-/boost-rational.json
+++ b/external_imported/vcpkg/versions/b-/boost-rational.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "8824769e6c009d6bf3b750c3a7914ba0476ef476",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "55ec23b1953b2e44dc43fda4547cf0b96bfe140f",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "27a8384584574ad32bd6daed2a7454bd0d3c6fcb",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "6120e3b8498d9976ad2d49093939c03a032d1609",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "9c516223d2f1e307b951fa1735351ddad9b6fc10",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "230937cbe2644aa72fa3487fa36f8e07bef76e82",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-redis.json b/external_imported/vcpkg/versions/b-/boost-redis.json
new file mode 100644
index 000000000..7e6008458
--- /dev/null
+++ b/external_imported/vcpkg/versions/b-/boost-redis.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "be30e78685a77344e2115c36b317c776951bb9db",
+      "version": "1.84.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/b-/boost-regex.json b/external_imported/vcpkg/versions/b-/boost-regex.json
index 8fd69ec00..c3c1cd88f 100644
--- a/external_imported/vcpkg/versions/b-/boost-regex.json
+++ b/external_imported/vcpkg/versions/b-/boost-regex.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "79565c2c7713679611f25b158373a1063de42fb3",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "423f035001a6e046e2f94dc3ac68201a4a3d0307",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "fc3fcb5815c297112283b9fd5eabab3106f6e93e",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "d31af2d45fe496fd2d89b734027e72c92d23f1d1",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "3b5d4d8bf6461bad9584cfcd9a5402d3c6fde17d",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "172bf85987f58e14b7471bedff57e03790292538",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-safe-numerics.json b/external_imported/vcpkg/versions/b-/boost-safe-numerics.json
index 6c1fc003a..76c59c1f3 100644
--- a/external_imported/vcpkg/versions/b-/boost-safe-numerics.json
+++ b/external_imported/vcpkg/versions/b-/boost-safe-numerics.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "7b34b4b91f840fbd91f16568d9094ec592ef2bc7",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6ddd605460c8155173f242e5ec867b8baf9d0ec2",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "13e759cd59d56323d9c3079a28502a8d6814c6d3",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "0e786aeb741e3f8444c7252c33039216a9b74c11",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "d20295b553a82d4772b75b6b2aab8240359ae20b",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "86ae8f2fb46f5d370e92690b0c0cc8b8bb99c561",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-scope-exit.json b/external_imported/vcpkg/versions/b-/boost-scope-exit.json
index 22d16b082..8c0e297e6 100644
--- a/external_imported/vcpkg/versions/b-/boost-scope-exit.json
+++ b/external_imported/vcpkg/versions/b-/boost-scope-exit.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "621d3782c24cfb1e35566b350a8b026975e09a69",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "735ee02b2601c7a8777fbe1d421d8e6933f7c40b",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8b1854be566e473fe24ae03d88e2312764dd1917",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "32c1f14869bea00029a8b45bb94cb63ff70cc85a",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "38b294de8545f98716f165966eb6e93137134975",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "1b2d7071e7f4db8ef844cdf22a9352c4644ba2f8",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-serialization.json b/external_imported/vcpkg/versions/b-/boost-serialization.json
index 0845e1068..1b5ab93df 100644
--- a/external_imported/vcpkg/versions/b-/boost-serialization.json
+++ b/external_imported/vcpkg/versions/b-/boost-serialization.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "1503200e82a30cc47c9b3b6bf93b4109eea195b9",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "7ebe53455e9721a76ebe14c651a2deafbcb758b8",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "13b68c431b9c906d036a83aa17358f0778de6a97",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "b1b42d850a39f2675bdd583b6138994090f47bb4",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "b096b460eacdde8817d706be02e5538158765168",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "35eea20a5dba97412f01658e1334a766089dcc62",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-signals2.json b/external_imported/vcpkg/versions/b-/boost-signals2.json
index 2c7560200..bf86e7565 100644
--- a/external_imported/vcpkg/versions/b-/boost-signals2.json
+++ b/external_imported/vcpkg/versions/b-/boost-signals2.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "455e1a1c7cb7c023f425c31af5d3577559167219",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "41fa1cbba1b311066df31c154e0926fe003039df",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f6f60c82002c81f4e03209ebffe7f410b926d64d",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "62baba852c7f10c46fb042bd70d316e4b0178382",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "612a8c8753bfe3c064186f7ff0596c87ae202b83",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "1ff3e296103d255821323aebc556c4a1e535c69d",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-smart-ptr.json b/external_imported/vcpkg/versions/b-/boost-smart-ptr.json
index 34eb87b20..8d275a9d4 100644
--- a/external_imported/vcpkg/versions/b-/boost-smart-ptr.json
+++ b/external_imported/vcpkg/versions/b-/boost-smart-ptr.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "4d235b9c9f410296263cf6d1cbf598befae87dc0",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "81506ee1238bf93218cef84de86dca96dd0b3682",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "890abd9cae8fc0c9a3a6f9a6b67a4cfab375a775",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "a61a6534966bd4a70b051538a287de38be4345ba",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "5a3d3e5c44e52ffa9640751a4ff611c9a0c2d1a1",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "9658d324de2ff7661eb9b9a94c50c2c32fe61e38",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-sort.json b/external_imported/vcpkg/versions/b-/boost-sort.json
index db164c531..edcb91731 100644
--- a/external_imported/vcpkg/versions/b-/boost-sort.json
+++ b/external_imported/vcpkg/versions/b-/boost-sort.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "62b775c8967ce4347072c17881484188faf5871f",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "71805d53be199c5d3b2566456b9ae7cff9a8a94a",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5fd7339a68a26cae5e7f10dc5fc7b01a7763e5bb",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "52a94c57d228888c823e75ffb50c1ada6243d400",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "c80dbce839b8b0a842817958af53d490db5d91e3",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "4986baa8d4778863b3374e787098adb5d3ae24df",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-spirit.json b/external_imported/vcpkg/versions/b-/boost-spirit.json
index 411fb9c23..b24d02829 100644
--- a/external_imported/vcpkg/versions/b-/boost-spirit.json
+++ b/external_imported/vcpkg/versions/b-/boost-spirit.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "2af169b76d74cf6612d702c3cb5df9fc51303592",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e2ebc2bcf72d8ae953ac54163a7c5b43f17396f0",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "292c5391f0b78b7009740961762e199aa33d5a0a",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "e3722a0c3169cbadc658d55b9c5042821f38c0ed",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "1c21c7df41e751a8b80af93154fbc5839e52dc8a",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "f536ce478ead1239c82201c2f6160ea3e6db9d86",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-stacktrace.json b/external_imported/vcpkg/versions/b-/boost-stacktrace.json
index 66f6f28f2..70acfa70d 100644
--- a/external_imported/vcpkg/versions/b-/boost-stacktrace.json
+++ b/external_imported/vcpkg/versions/b-/boost-stacktrace.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "e4bcf4968926d3320effea3f1e0389783fa6d073",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d9fe043e8398589eaa7c319295a87114acb55538",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d9ec91eb7e104db3c699004fee94ffecbb09a827",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "e396fb4ba828edc96c7843024fac4c95d0c3dca6",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "ae18b290cc8132b982f7ee9ec59199f86ab199fa",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "39f36093419faf46f0a41d57e2d4acd5c38a0054",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-statechart.json b/external_imported/vcpkg/versions/b-/boost-statechart.json
index 7e13177f0..d6c9eba73 100644
--- a/external_imported/vcpkg/versions/b-/boost-statechart.json
+++ b/external_imported/vcpkg/versions/b-/boost-statechart.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "21398359f6a56d42c75929dca6a5fda68ffe219a",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5d2243b3611cb12d9317e672fb7fbc296e87494c",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2664cfe208b1eff1257e2de86a72ba359ed3e3f4",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "73dbf3ff6a02ae856ea69c4a9c6f32905463ff3a",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "e2dbb2792189ed8380b551cdefc615f72aa58aff",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "38e529d1388ce4dedb22e847324b30aab1f97444",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-static-assert.json b/external_imported/vcpkg/versions/b-/boost-static-assert.json
index 129efe219..5d188756b 100644
--- a/external_imported/vcpkg/versions/b-/boost-static-assert.json
+++ b/external_imported/vcpkg/versions/b-/boost-static-assert.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "c79455c647747893ea950dedb858fad16d0819c3",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "50eac53fdc886f9de87fc06717a4ae3a939b28e9",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "bb7f6ee1209b0760b458727da129653965e7e98a",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "e6e55a999a301eb62d7c4da853a6aeb296713943",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "3c7509ddc456f0a85962fbb51df4f998c3062999",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "bf5777cf607209edba1236a1cf87721ad896ead5",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-static-string.json b/external_imported/vcpkg/versions/b-/boost-static-string.json
index 5ee994dcd..11f245438 100644
--- a/external_imported/vcpkg/versions/b-/boost-static-string.json
+++ b/external_imported/vcpkg/versions/b-/boost-static-string.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "d4713f1a2398b6e21a7d5906456621f5eb46156c",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "dba046b1b41f91b5927d8f4198157bc135d6a705",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b01da85ea910c32e62403ec6e7d7749750e6809b",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "d6659ace5ff022455382adf6078c00bf015d5170",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "6f767f97f025574cf3a14d6390759ff063c3b7c0",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "b428f9b5942c135a898619782258dd4a4d453c33",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-stl-interfaces.json b/external_imported/vcpkg/versions/b-/boost-stl-interfaces.json
index 0b2a774ff..950f13c7e 100644
--- a/external_imported/vcpkg/versions/b-/boost-stl-interfaces.json
+++ b/external_imported/vcpkg/versions/b-/boost-stl-interfaces.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "593aabdb7f8997f9147068a5222eaa68d3642814",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c11bab85b94163499bbc4e7931ef1270fb64213d",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2c8e63f22b9a633855cb9be3712ae8010cf0dda7",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "8a8da16449c627e1e3514b6f0c865423def32aef",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "b3df561ef1e62cfb1f2210d12fe99ca3b019d0eb",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "e3d2a9d9eb7bd34df9111f68e506e0645ce343d3",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-system.json b/external_imported/vcpkg/versions/b-/boost-system.json
index 51ec52bff..250f0c909 100644
--- a/external_imported/vcpkg/versions/b-/boost-system.json
+++ b/external_imported/vcpkg/versions/b-/boost-system.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "c87d6964da1b27c95fc19c5ddd44c2f20ba4524a",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0090d008796452ba40264bb11437e0122a325e23",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b1bea82cc5898b04f9f797eb47026b667a03de00",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "48fb125e52a85de87f4ff03475742d79f84b42cb",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "b4c52641930b283d8706bdadb3a00f0d4713c304",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "b5bda1dda74953d8b2ecfd6f2a67b3503a47e9ab",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-test.json b/external_imported/vcpkg/versions/b-/boost-test.json
index eba26205d..b677fea82 100644
--- a/external_imported/vcpkg/versions/b-/boost-test.json
+++ b/external_imported/vcpkg/versions/b-/boost-test.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "28298078d066a4a0b3b27a0c3f9acadeb7e01260",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2e21f61b617327941161649451b4a022747fbc1e",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b6d22c3109a795ff79ca53f0b07afbe683d83558",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "7f9b16012eb50bf79ca3c7193b3a91900342fe1b",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "77df201a3df02a2fa21de18433474671cf2f41c0",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "7e47dbce4949b5085b51a15ebb1041c86c7dde88",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-thread.json b/external_imported/vcpkg/versions/b-/boost-thread.json
index 45d131fba..48ce12458 100644
--- a/external_imported/vcpkg/versions/b-/boost-thread.json
+++ b/external_imported/vcpkg/versions/b-/boost-thread.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "f7aa0651df5b4e391357cfc58db1b87f11af97e5",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f2f50fecd4338161565a0425c3e9b55fdbe68424",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "183d7fba1820b773404a6ea7351f4da539612367",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "10385bb625d17d57f636154ab2b2ec6d35bb4615",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "73ab1bc58c1a66ca2d230d584b5a3f3277ff7698",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "7769fa8b3f14741a465e312f373c670392d88986",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-throw-exception.json b/external_imported/vcpkg/versions/b-/boost-throw-exception.json
index e3ba2f01f..5e74da99a 100644
--- a/external_imported/vcpkg/versions/b-/boost-throw-exception.json
+++ b/external_imported/vcpkg/versions/b-/boost-throw-exception.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "f3c85344985a864fb5d2245f788197ad3c727ff4",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "22bf09f8d91024cc1e74b19bb6333baeea262b69",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3416e3ed72a0b469169cc290cafeabafe2bc4859",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "c51c9fa76f925c5824688c6ca9f451716373b5d5",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "ff4d027351210c3566727fee101f01de90240345",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "24786ddf6fd042eff7e75cbb3573d5ba5401530e",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-timer.json b/external_imported/vcpkg/versions/b-/boost-timer.json
index 7d4c6e016..08d2e9291 100644
--- a/external_imported/vcpkg/versions/b-/boost-timer.json
+++ b/external_imported/vcpkg/versions/b-/boost-timer.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "95a50501b5eba119f8732c2fc02ea00b926ec740",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c143993e19cd4999f4199d79190b48058bd13a1a",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "161c4be7bd7c9021a41bd62b3b5d06ded0f1bae4",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "df30d3eccc932381af5653911a0708436c1db576",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "c86715f4f50f065882791fb8fdee4f42b2533084",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "c3e14b189e9ba8356438d69471038ffe993ba9e6",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-tokenizer.json b/external_imported/vcpkg/versions/b-/boost-tokenizer.json
index cf0b4d7e6..76bdcc543 100644
--- a/external_imported/vcpkg/versions/b-/boost-tokenizer.json
+++ b/external_imported/vcpkg/versions/b-/boost-tokenizer.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "f813c482e33e213480b75d69780c4d795769e581",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "05ada2a1cc63fe9b4f5b4e9ac1d6ec63961e281b",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8d3578a014b8545ce2e4be7e6243c50e3fe2f41b",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "4a53c730b20cacfbd8e6bbbd8faaeee0720c9fc1",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "b49b178a2beeaf3b919c3e4535b45abf89de6818",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "7deb519f49fe9ca4814c3ee10da9cec1c73428f7",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-tti.json b/external_imported/vcpkg/versions/b-/boost-tti.json
index bae7d1b53..23fa5c69d 100644
--- a/external_imported/vcpkg/versions/b-/boost-tti.json
+++ b/external_imported/vcpkg/versions/b-/boost-tti.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "2a8f4cecd47d8c713d8efd3cebc2567f16ba2050",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "06c466d2662d638138c5318e4ad3a165974de862",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6fbbc2a47d406102ec479ff755beab26984a20be",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "cf4ae2c2fc67d7878842950e97e57c28811b1fd5",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "7ceff9b2a8616cf2279c68d70a29abf07ca10e17",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "ac4f1da7b85d3cc5746463d7fafd9d2dfe23e2ca",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-tuple.json b/external_imported/vcpkg/versions/b-/boost-tuple.json
index 35cfed9b0..c9017b796 100644
--- a/external_imported/vcpkg/versions/b-/boost-tuple.json
+++ b/external_imported/vcpkg/versions/b-/boost-tuple.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "226ff3eec30fe4b68902e7bb3f36db6dc580faf6",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a5a7d3cf0427278418ddc0e91a3858218535c8a9",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "005084a92857215f3e0db64c3a7a1d1d70c91850",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "c9173d5394c4b31fdf698b156b542c29031d03fe",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "54dbf60f65b0931002de7684e7755ae35d16eea4",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "dbde6147fcec0717164899b0964444188d38be89",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-type-erasure.json b/external_imported/vcpkg/versions/b-/boost-type-erasure.json
index ed636a6d6..f967751e4 100644
--- a/external_imported/vcpkg/versions/b-/boost-type-erasure.json
+++ b/external_imported/vcpkg/versions/b-/boost-type-erasure.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "eaf1e9af3557cce341ffd8853e02c019f03dc7da",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9897b32081b334c6519a7252247d7dd292414e5d",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8672547278454bfc8a842f788ed797c834ca050a",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "abc972b6543f779324d60f5c619a205edda22b2b",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "89ca8e5140e7b6b31db688b4fb4819cf8256570f",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "2db0ac9588dd25a7088c7b5967ebd1e479f235ac",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-type-index.json b/external_imported/vcpkg/versions/b-/boost-type-index.json
index 02fb3c1de..2799f275f 100644
--- a/external_imported/vcpkg/versions/b-/boost-type-index.json
+++ b/external_imported/vcpkg/versions/b-/boost-type-index.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "2b9d415a252b453a95dac06c8f5d658e3f529bf2",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "58d41ff7ca046c8997ddd3f6c8ab801291edd9c4",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "af9dcc786a5ca7717b4d2d04471b7ee12288080c",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "d02bcbc9c4ee9a4b27e90ab03010bea7b6c70eb3",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "c2264baedf368a03a865ec3e1236a1e94c996b65",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "f43797ae5b94d44803685ae038d0bab71c4a3250",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-type-traits.json b/external_imported/vcpkg/versions/b-/boost-type-traits.json
index a51ecb281..b32fb296b 100644
--- a/external_imported/vcpkg/versions/b-/boost-type-traits.json
+++ b/external_imported/vcpkg/versions/b-/boost-type-traits.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "a4ddf58a08ee20266007e39a261fc556b5b6e0ce",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6595fdcc50c1d1d5587ade48484a0b074ddb079b",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "16673cfc230fda05b63868f9cbf21d0e0a206b53",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "34773fec432e120d3f2d9dd482461da7c36ef897",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "223d017c75c79909d143515a84ba95360b5e6ba1",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "4bb18781eb0901d50703978cb7f93329af8a0c0d",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-typeof.json b/external_imported/vcpkg/versions/b-/boost-typeof.json
index d96f8d809..bbbf8e5ec 100644
--- a/external_imported/vcpkg/versions/b-/boost-typeof.json
+++ b/external_imported/vcpkg/versions/b-/boost-typeof.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "f5a00c4b05c0b35835446dd44ff7777fae86fe52",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ec85052de49f1335b474cee0689971b9ad4df92c",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3a15a938616612d49b404940a26fbf8f518816d8",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "ab6e440573d5f3ac964c50b3efc24055500a772f",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "77380a21ac442dd476825ca01d1ace199d1631b7",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "7b24cb9fc6e02e419870fc6c10d214c4ae0c0a41",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-ublas.json b/external_imported/vcpkg/versions/b-/boost-ublas.json
index 1efe7e264..174c24eaa 100644
--- a/external_imported/vcpkg/versions/b-/boost-ublas.json
+++ b/external_imported/vcpkg/versions/b-/boost-ublas.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "55aefb0337e99e5d51c9c859aa73e19a8bb2dbf7",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0a77eac23b724a17117bf6b25d8a40482d805b5f",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "08ca3e3e8708563241aa02fdb7d6c6e406ae30e6",
+      "version": "1.82.0",
+      "port-version": 3
+    },
+    {
+      "git-tree": "c0dd4493fe63a58cd9fdec0d48b9855a09ecbdd2",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "48342bc4e28a5dea5e4e6ccb8cb0333b5feebfeb",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "b1652104f4dfa41d11e9238edeefd1330d6d216c",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "f9548ffa375198ab22ef334a0d9d0c759d785831",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-uninstall.json b/external_imported/vcpkg/versions/b-/boost-uninstall.json
index 54824194a..31883a80f 100644
--- a/external_imported/vcpkg/versions/b-/boost-uninstall.json
+++ b/external_imported/vcpkg/versions/b-/boost-uninstall.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "6ed88ee3e093c9419fb4fcbdc17904d15d377129",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "1dfbff4a218e77e371ebc397f0573859136c7c92",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "dcca7487581acb01e55bddd3ec306ff543c24ce6",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "d96807810fa612b038f9268c8df545d421fda1a6",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "3651d7a858bd04f7bf933e71110de4b9a46e3df1",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "4caf44a6883820726e6d25b015769ec375758f81",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-units.json b/external_imported/vcpkg/versions/b-/boost-units.json
index 03ec8eb6e..38f746ff0 100644
--- a/external_imported/vcpkg/versions/b-/boost-units.json
+++ b/external_imported/vcpkg/versions/b-/boost-units.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "9088c5fd6a2540312f4236ad82367122d5faead3",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c9dffd7cd1fdc999f543b7d140f119f962ae076c",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5a76707af8205f16c15f69fa930aa39e7763472d",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "60fbfc84c6785572c1385528afb5616429828138",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "b15188b886cec9daf54c334fa401d68b56146138",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "505fb723fea2df6581043bf1d90e0628a025321e",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-unordered.json b/external_imported/vcpkg/versions/b-/boost-unordered.json
index cb04e0491..079f9498e 100644
--- a/external_imported/vcpkg/versions/b-/boost-unordered.json
+++ b/external_imported/vcpkg/versions/b-/boost-unordered.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "77a20edb9c6e3efec862eb37310f410a95544a30",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d78bed13cd960d7723ac5b0c82d2223c321ee0a9",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "53a764549e3664798aad8a1cb9bc3e74669c7f6a",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "ee2a3d19df6c91036cb772b4747bc7244307cda1",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "df88891653e7f24ffb101bc34513396b20cb4fc5",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "c37e40c50347d534ab95ba2355c72112821490f6",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-url.json b/external_imported/vcpkg/versions/b-/boost-url.json
index baa521d8b..ed254902e 100644
--- a/external_imported/vcpkg/versions/b-/boost-url.json
+++ b/external_imported/vcpkg/versions/b-/boost-url.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "0dc7321b2d28cd349ace799644efd4f471e8ce03",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2cfc398b72ab925f876eb071d9577cbf9a84f33d",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0bb3a49bd4739d46d1b09bf657a172bdd91deca9",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "5b6110be396379503f9305de47e76d364019b6c6",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "ab148b1f9a35d70c6e647644207c14b2d1e9c472",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "f42a5aeebeb06f6fdb239e0913e2510ba4fab98d",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-utility.json b/external_imported/vcpkg/versions/b-/boost-utility.json
index f52f7869e..f9c72f558 100644
--- a/external_imported/vcpkg/versions/b-/boost-utility.json
+++ b/external_imported/vcpkg/versions/b-/boost-utility.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "0ea45d787be2fc247a434638a832b85acd3c5e3b",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "175e91f86d24ff49330e7f5f95db441ceb85886e",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "353c3edd45cc926548492197f73164d5831728f0",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "b94486558c58f29bb5165d952196d448719caae5",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "6fc53182947ed5525e426f934b440f22d4f04327",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "88534910a9049a40b8d8752913f69dae3cbec37c",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-uuid.json b/external_imported/vcpkg/versions/b-/boost-uuid.json
index d91e20f72..392074150 100644
--- a/external_imported/vcpkg/versions/b-/boost-uuid.json
+++ b/external_imported/vcpkg/versions/b-/boost-uuid.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "1dd155b365ce1df4bb524d11672c4ad2b3b2b43c",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f87e5dc08c5466a56e32d055878d39dbdbdc18d4",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d98133d8840363483b9f34baeec1b32696bbbd8b",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "718fe77c580850e2dd881ff115ffb0f3d8612774",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "db382885cfe159def0504877ac283b57b7efbf8f",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "e9af468276d059ca478a6d42f3d0b343a749443f",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-variant.json b/external_imported/vcpkg/versions/b-/boost-variant.json
index e831b5840..f55e9815f 100644
--- a/external_imported/vcpkg/versions/b-/boost-variant.json
+++ b/external_imported/vcpkg/versions/b-/boost-variant.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "0fae6f2ad84c37a644b0f2902f653e16b26e65f6",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "60ca10585ea590b82692a0f715cfcc596d4799db",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "7951625567bf2413827f614a1ee917035a5e59ec",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "8f71e0d63ff1504559355737dba1f2ef2452d557",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "7b85b37781c02dbccca8b62035a9f40e18df6af3",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "13d77a8e8902136d832ae58e9ae4373366ee2fd4",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-variant2.json b/external_imported/vcpkg/versions/b-/boost-variant2.json
index e3d74f3f4..19c06c146 100644
--- a/external_imported/vcpkg/versions/b-/boost-variant2.json
+++ b/external_imported/vcpkg/versions/b-/boost-variant2.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "90849fda39c8a2201b80eac6b04dc32ab6ae2c73",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a249f8469b4c3ccb2aee3ece628d69a71d54b35f",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "dd3e6bcf37179efe2425ffb104be151a9f1133f8",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "3acfc977da209b860fd7cf1365180af919be0eeb",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "e5d41ae488efffaadaffffc5a1d0b122e7bb3f2e",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "5c84dc87fee7da432b626fca25612d0a05604eb5",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-vcpkg-helpers.json b/external_imported/vcpkg/versions/b-/boost-vcpkg-helpers.json
index acfc8e9ac..20bc55c52 100644
--- a/external_imported/vcpkg/versions/b-/boost-vcpkg-helpers.json
+++ b/external_imported/vcpkg/versions/b-/boost-vcpkg-helpers.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "5ec9b3e713c09e2827e07c9784676bad6cc9cc08",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "18a50fedd4344db5ce1f82546be1889215381f78",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9a0f2ba2f59ce1040abe835b1e5adcd0a6dbc8af",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "f99477ea8dcfb463d2f0a2cce3c60914c2e5adb4",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "16b00921be68c4108060687df8a4ded18b7f9b29",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "2aa63aed3fe5106f44a56b33d8754d045358f662",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-vmd.json b/external_imported/vcpkg/versions/b-/boost-vmd.json
index c3f6668d8..49dd595b1 100644
--- a/external_imported/vcpkg/versions/b-/boost-vmd.json
+++ b/external_imported/vcpkg/versions/b-/boost-vmd.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "908151c9b7afd64cbaebd7d88d6121de0be81b7b",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "eaa0b491a87169b97213b923582836a9d3cd88ed",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "01fa69ff11a1e1e086b621a92ca334d99483a040",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "29976ffbb57716e6bfdf06b84e9958fd890a55c0",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "d31a0367a6f1c2540f682fa1636fab7486cead6a",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "2d02fada2420d5210e54536cbc6b6bc865eec00b",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-wave.json b/external_imported/vcpkg/versions/b-/boost-wave.json
index b79a6ad1c..23f9836af 100644
--- a/external_imported/vcpkg/versions/b-/boost-wave.json
+++ b/external_imported/vcpkg/versions/b-/boost-wave.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "1ddcecc1cbfc5d699bbb99eb75577b237d070227",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "298ef29ed61665419dfb1f05e4823f63086afb14",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c04f5117190e977f1a7a7067ce483ae581dcf111",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "26703fa9be9c0ca33ead77b9430a714bd672a523",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "cf1f8eb1ffd37f2abf4a9c8dc6199db7037c1825",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "f6aef641dfdf7f20ec1dbcd1280a260391b255ee",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-winapi.json b/external_imported/vcpkg/versions/b-/boost-winapi.json
index c3596f97e..f226c6541 100644
--- a/external_imported/vcpkg/versions/b-/boost-winapi.json
+++ b/external_imported/vcpkg/versions/b-/boost-winapi.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "32f9d89e087c4a777e62688c75a643608e3f9f6e",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "cfd68f543033ed6b8cee9235ef287b7fd4f8709a",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4fb732247dac823b0563bd50e4fc518c25eb9334",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "db66242e796c29abd3622cf41d506bee622b4d10",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "d4a71323289449db56daf93cc840d416a42779b8",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "3a6773e846ce5a089ab2c4648f2b2b150870c7ee",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-xpressive.json b/external_imported/vcpkg/versions/b-/boost-xpressive.json
index 9d1e212e8..c40ba5661 100644
--- a/external_imported/vcpkg/versions/b-/boost-xpressive.json
+++ b/external_imported/vcpkg/versions/b-/boost-xpressive.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "44168cef786140f27bd0efd38d258a3894cea3c2",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "55de0dfb037123cd093c56acf61b22948e98295b",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "55106712d15cf7092591e0e6a36681274e8f0401",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "ed6d3e07b8e933869bbe2148898adc5916928405",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "68252d54930bb7e7188b93869d914e49b8fc0177",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "ef345601e061511a9c1ca790d5d3f4c2cbb2ba20",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost-yap.json b/external_imported/vcpkg/versions/b-/boost-yap.json
index 2472e7a33..0509b82a4 100644
--- a/external_imported/vcpkg/versions/b-/boost-yap.json
+++ b/external_imported/vcpkg/versions/b-/boost-yap.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "94c0722f970f8d44f1dafe2a2def5deceed9a99f",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4a0f05ec51176c56f01c9edd8888358ae74eabec",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "bdad26185e13b995615f4979050d3fd47db4fa32",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "a1b7fd0e064cb4fc3911bfe16e5b89e46bf3b5bb",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "f21651c6a3bdb74377860287634f40c40c745af7",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "7b50cfbdaf3d3ff461a9523d0378faa789f76ed7",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boost.json b/external_imported/vcpkg/versions/b-/boost.json
index 63b07be37..4b2316510 100644
--- a/external_imported/vcpkg/versions/b-/boost.json
+++ b/external_imported/vcpkg/versions/b-/boost.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "827b5b48531aaa3fa9293a6d344f829c6529776c",
+      "version": "1.84.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "315139e076ff5ea5672a158688934b04d2b7a815",
+      "version": "1.83.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "d8d71d69890583a886663db2d2ac45ddf3fd9835",
+      "version": "1.83.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ef99d3992511da66e8f354441fb291ed0cac08f9",
+      "version": "1.82.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "7714a26cfdcdc9633297140c227198fb18f64061",
+      "version": "1.82.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "42eb34ebc0c22a3f2babbafb457981ac8a1da6d5",
+      "version": "1.82.0",
+      "port-version": 0
+    },
     {
       "git-tree": "afc980d4093ddd9d122b1bba1a894edd549c43a1",
       "version": "1.81.0",
diff --git a/external_imported/vcpkg/versions/b-/boringssl.json b/external_imported/vcpkg/versions/b-/boringssl.json
index 893c242e8..fe013489a 100644
--- a/external_imported/vcpkg/versions/b-/boringssl.json
+++ b/external_imported/vcpkg/versions/b-/boringssl.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "2b809260036c7ee69cbf1a8a06e015354121d741",
+      "version-date": "2023-10-13",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5f833bab8ecfc28f45a9034291e79f8cd126ad01",
+      "version-date": "2023-09-25",
+      "port-version": 0
+    },
+    {
+      "git-tree": "01164d48fa5667c3e6885d010cb110b84b6f2e78",
+      "version-date": "2021-06-23",
+      "port-version": 4
+    },
     {
       "git-tree": "cb83700b7bf53177773421dfb803fb8478e6a72d",
       "version-date": "2021-06-23",
diff --git a/external_imported/vcpkg/versions/b-/botan.json b/external_imported/vcpkg/versions/b-/botan.json
index 5fc78b921..a2fa214d3 100644
--- a/external_imported/vcpkg/versions/b-/botan.json
+++ b/external_imported/vcpkg/versions/b-/botan.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "3482b0255e093b6d091aa4aff11992c89ec45d6e",
+      "version": "3.2.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c031a70866fae7751496d7edfd01caad2773dd08",
+      "version": "3.1.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "d66e60d97a7a4e77df4e559fed1926a45dac3f52",
+      "version": "3.1.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "575322265c701c0ff15d79c65a47ad38e7958235",
+      "version": "2.19.3",
+      "port-version": 2
+    },
+    {
+      "git-tree": "7b9240ee18f12e8acaedf11613aa6bc1d7aad9d5",
+      "version": "2.19.3",
+      "port-version": 1
+    },
     {
       "git-tree": "1ad976f3e650d7188414a0c2c62ec7290bed64e8",
       "version": "2.19.3",
diff --git a/external_imported/vcpkg/versions/b-/braft.json b/external_imported/vcpkg/versions/b-/braft.json
index 9744235f2..524955541 100644
--- a/external_imported/vcpkg/versions/b-/braft.json
+++ b/external_imported/vcpkg/versions/b-/braft.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "774dbc3ef386eed16fd345f23109f94a899f39e8",
+      "version-date": "2021-26-04",
+      "port-version": 1
+    },
     {
       "git-tree": "d9afe1afea46ce35f64aaed5c2702c34113fe683",
       "version-date": "2021-26-04",
diff --git a/external_imported/vcpkg/versions/b-/breakpad.json b/external_imported/vcpkg/versions/b-/breakpad.json
index f07d04697..1c8d22296 100644
--- a/external_imported/vcpkg/versions/b-/breakpad.json
+++ b/external_imported/vcpkg/versions/b-/breakpad.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "5643527026fecb43d487919191b02c41bfced6f9",
+      "version-date": "2023-01-27",
+      "port-version": 1
+    },
+    {
+      "git-tree": "b2b2523acc1c56222313e8fe01065c1e130440e1",
+      "version-date": "2023-01-27",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a451811c203f1ec086288b40dd4571d97bb7033e",
+      "version-date": "2022-07-12",
+      "port-version": 5
+    },
     {
       "git-tree": "26e6e78bdd989c749aa0f61ad6357374480bc184",
       "version-date": "2022-07-12",
diff --git a/external_imported/vcpkg/versions/b-/brigand.json b/external_imported/vcpkg/versions/b-/brigand.json
index d5b9f4b2f..a7c08f1c1 100644
--- a/external_imported/vcpkg/versions/b-/brigand.json
+++ b/external_imported/vcpkg/versions/b-/brigand.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b68860ce9e8aac4f7e605535571295ba5be9e2a3",
+      "version": "1.3.0",
+      "port-version": 3
+    },
     {
       "git-tree": "a27641e46efb007b46792b7bd803f32437fe4178",
       "version-string": "1.3.0",
diff --git a/external_imported/vcpkg/versions/b-/brotli.json b/external_imported/vcpkg/versions/b-/brotli.json
index cc5a71320..16e39e99d 100644
--- a/external_imported/vcpkg/versions/b-/brotli.json
+++ b/external_imported/vcpkg/versions/b-/brotli.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "4e5b5ae1ad26c80535c893cc0307121f0398549e",
+      "version": "1.1.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "4156ea7744047f9ace2769b857d97d11154de28f",
+      "version": "1.1.0",
+      "port-version": 0
+    },
     {
       "git-tree": "32ea6c4b0d18fa3172ad52147599983acc71d748",
       "version": "1.0.9",
diff --git a/external_imported/vcpkg/versions/b-/brpc.json b/external_imported/vcpkg/versions/b-/brpc.json
index cc433073a..5c3b825a8 100644
--- a/external_imported/vcpkg/versions/b-/brpc.json
+++ b/external_imported/vcpkg/versions/b-/brpc.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "e8671f4e4a1523a2f58b71e7413ad0b8dab7c1c4",
+      "version": "1.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a2cedfb3411d57def85e6337b08570e518c2f992",
+      "version": "1.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8c3039a58b23207cc87a0a938dbd943ef521b235",
+      "version": "1.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "a75ac2b64eae33d6ba6fc7494f6ea02d7156a23c",
       "version": "1.4.0",
diff --git a/external_imported/vcpkg/versions/b-/bshoshany-thread-pool.json b/external_imported/vcpkg/versions/b-/bshoshany-thread-pool.json
index 0ccb4edef..9cc090985 100644
--- a/external_imported/vcpkg/versions/b-/bshoshany-thread-pool.json
+++ b/external_imported/vcpkg/versions/b-/bshoshany-thread-pool.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "eedda7057a9359ec30cec22194f7a5da5320ac16",
+      "version": "4.0.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0dab54b91bf4c70fc898cb14fb2505773f54660b",
+      "version": "4.0.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ed9b93bfd6a7031b7d96fa5443873f4c2634a049",
+      "version": "3.5.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e7d60a5fc41c5f4aa283aeb1527a4bc8b55e934c",
+      "version": "3.4.0",
+      "port-version": 0
+    },
     {
       "git-tree": "dbe9095cfdb6128d117003b2495f84e50653c220",
       "version": "3.3.0",
diff --git a/external_imported/vcpkg/versions/b-/bullet3.json b/external_imported/vcpkg/versions/b-/bullet3.json
index 71f9c895a..119dc2e3a 100644
--- a/external_imported/vcpkg/versions/b-/bullet3.json
+++ b/external_imported/vcpkg/versions/b-/bullet3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9ecadb6b6e0651347e89555207f28c4ee5b1b51c",
+      "version": "3.25",
+      "port-version": 1
+    },
     {
       "git-tree": "2ddb8da6a7bd04aff093231935f5ead2a8ee7c79",
       "version": "3.25",
diff --git a/external_imported/vcpkg/versions/b-/butteraugli.json b/external_imported/vcpkg/versions/b-/butteraugli.json
index 81c077084..de1ff5fb2 100644
--- a/external_imported/vcpkg/versions/b-/butteraugli.json
+++ b/external_imported/vcpkg/versions/b-/butteraugli.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "abd41dd5d42cd344aab7266f0c9d6b9d1ebb8ed1",
+      "version-date": "2019-05-08",
+      "port-version": 4
+    },
     {
       "git-tree": "4a06f382d1c12d38bd578aca7d4cfe4a94b9e492",
       "version-string": "2019-05-08",
diff --git a/external_imported/vcpkg/versions/b-/bxzstr.json b/external_imported/vcpkg/versions/b-/bxzstr.json
new file mode 100644
index 000000000..66c4b744f
--- /dev/null
+++ b/external_imported/vcpkg/versions/b-/bxzstr.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "23e9ed2e92c2146d490f3d2b61de409c0201adeb",
+      "version": "1.2.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "ad9511ac67f069a83b89c91a8fb0c995a6aca196",
+      "version": "1.2.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/b-/bzip2.json b/external_imported/vcpkg/versions/b-/bzip2.json
index b5fb289ec..1d7e2b047 100644
--- a/external_imported/vcpkg/versions/b-/bzip2.json
+++ b/external_imported/vcpkg/versions/b-/bzip2.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "92e9a8bbf1abbd89872b48ad82fcf75852de1006",
+      "version-semver": "1.0.8",
+      "port-version": 5
+    },
+    {
+      "git-tree": "6165360d15e6de08dff3a5f079d51e69908cc55d",
+      "version-semver": "1.0.8",
+      "port-version": 4
+    },
     {
       "git-tree": "6ee6ad1d0bf78137f7f77671f393abc83363a710",
       "version-semver": "1.0.8",
diff --git a/external_imported/vcpkg/versions/baseline.json b/external_imported/vcpkg/versions/baseline.json
index 1ffd1c6f6..9331bc81a 100644
--- a/external_imported/vcpkg/versions/baseline.json
+++ b/external_imported/vcpkg/versions/baseline.json
@@ -2,43 +2,47 @@
   "default": {
     "3fd": {
       "baseline": "2.6.3",
-      "port-version": 2
+      "port-version": 4
     },
     "7zip": {
-      "baseline": "22.01",
-      "port-version": 0
+      "baseline": "23.01",
+      "port-version": 2
     },
     "ableton": {
       "baseline": "3.0.6",
       "port-version": 2
     },
     "ableton-link": {
-      "baseline": "3.0.6",
+      "baseline": "3.1.0",
       "port-version": 0
     },
     "abseil": {
-      "baseline": "20230125.0",
-      "port-version": 1
+      "baseline": "20230802.1",
+      "port-version": 0
     },
     "absent": {
       "baseline": "0.3.1",
-      "port-version": 2
+      "port-version": 3
     },
     "ace": {
-      "baseline": "7.0.11",
-      "port-version": 2
+      "baseline": "7.1.2",
+      "port-version": 1
     },
     "acl": {
       "baseline": "2.3.1",
-      "port-version": 1
+      "port-version": 2
     },
     "activemq-cpp": {
       "baseline": "3.9.5",
-      "port-version": 10
+      "port-version": 15
+    },
+    "ada-url": {
+      "baseline": "2.7.6",
+      "port-version": 0
     },
     "ade": {
-      "baseline": "0.1.1f",
-      "port-version": 3
+      "baseline": "0.1.2d",
+      "port-version": 0
     },
     "adios2": {
       "baseline": "2.8.3",
@@ -56,44 +60,48 @@
       "baseline": "1.5.0",
       "port-version": 1
     },
-    "akali": {
-      "baseline": "1.43",
-      "port-version": 1
+    "aklomp-base64": {
+      "baseline": "0.5.1",
+      "port-version": 0
     },
     "alac": {
       "baseline": "2017-11-03-c38887c5",
-      "port-version": 3
+      "port-version": 4
     },
     "alac-decoder": {
       "baseline": "0.2",
-      "port-version": 6
+      "port-version": 7
     },
     "alembic": {
-      "baseline": "1.8.3",
-      "port-version": 1
+      "baseline": "1.8.6",
+      "port-version": 0
     },
     "aliyun-oss-c-sdk": {
       "baseline": "3.10.0",
-      "port-version": 2
+      "port-version": 3
     },
     "allegro5": {
-      "baseline": "5.2.6.0",
-      "port-version": 3
+      "baseline": "5.2.9.1",
+      "port-version": 0
     },
     "alpaca": {
-      "baseline": "0.2.0",
+      "baseline": "0.2.1",
       "port-version": 0
     },
     "alpaka": {
-      "baseline": "0.9.0",
-      "port-version": 1
+      "baseline": "1.1.0",
+      "port-version": 0
     },
     "alsa": {
-      "baseline": "1.2.6.1",
-      "port-version": 2
+      "baseline": "1.2.11",
+      "port-version": 0
+    },
+    "amd-adl-sdk": {
+      "baseline": "17.1",
+      "port-version": 0
     },
     "amd-amf": {
-      "baseline": "1.4.26",
+      "baseline": "1.4.29",
       "port-version": 0
     },
     "ampl-asl": {
@@ -105,28 +113,36 @@
       "port-version": 4
     },
     "amqpcpp": {
-      "baseline": "4.3.19",
+      "baseline": "4.3.23",
       "port-version": 0
     },
+    "anari": {
+      "baseline": "0.7.0",
+      "port-version": 1
+    },
     "anax": {
       "baseline": "2.1.0",
       "port-version": 8
     },
     "angelscript": {
-      "baseline": "2.36.0",
-      "port-version": 0
+      "baseline": "2.36.1",
+      "port-version": 1
     },
     "angle": {
       "baseline": "chromium_5414",
-      "port-version": 1
+      "port-version": 7
+    },
+    "ankurvdev-embedresource": {
+      "baseline": "0.0.10",
+      "port-version": 0
     },
     "annoy": {
-      "baseline": "2023-02-25",
+      "baseline": "1.17.2",
       "port-version": 0
     },
     "antlr4": {
-      "baseline": "4.11.1",
-      "port-version": 1
+      "baseline": "4.13.1",
+      "port-version": 0
     },
     "any-lite": {
       "baseline": "0.4.0",
@@ -137,40 +153,48 @@
       "port-version": 2
     },
     "aom": {
-      "baseline": "3.5.0",
-      "port-version": 1
+      "baseline": "3.8.1",
+      "port-version": 0
+    },
+    "apache-datasketches": {
+      "baseline": "4.1.0",
+      "port-version": 0
     },
     "approval-tests-cpp": {
       "baseline": "10.12.2",
       "port-version": 0
     },
     "apr": {
-      "baseline": "1.7.2",
+      "baseline": "1.7.4",
       "port-version": 0
     },
     "apr-util": {
-      "baseline": "1.6.1",
-      "port-version": 10
+      "baseline": "1.6.3",
+      "port-version": 0
+    },
+    "apriltag": {
+      "baseline": "3.3.0",
+      "port-version": 0
     },
     "apsi": {
-      "baseline": "0.9.0",
-      "port-version": 1
+      "baseline": "0.11.0",
+      "port-version": 0
     },
     "arb": {
       "baseline": "2.21.1",
-      "port-version": 1
+      "port-version": 2
     },
     "arcus": {
       "baseline": "4.10.0",
       "port-version": 2
     },
     "arg-router": {
-      "baseline": "1.2.2",
+      "baseline": "1.4.0",
       "port-version": 0
     },
     "argagg": {
-      "baseline": "0.4.6",
-      "port-version": 2
+      "baseline": "0.4.7",
+      "port-version": 0
     },
     "argh": {
       "baseline": "1.3.2",
@@ -178,14 +202,14 @@
     },
     "argon2": {
       "baseline": "20190702",
-      "port-version": 0
+      "port-version": 1
     },
     "argparse": {
-      "baseline": "2.9",
+      "baseline": "3.0",
       "port-version": 0
     },
     "args": {
-      "baseline": "6.3.0",
+      "baseline": "6.4.6",
       "port-version": 0
     },
     "argtable2": {
@@ -193,19 +217,19 @@
       "port-version": 10
     },
     "argtable3": {
-      "baseline": "3.2.1",
-      "port-version": 3
+      "baseline": "3.2.2.f25c624",
+      "port-version": 0
     },
     "argumentum": {
-      "baseline": "0.3.1",
-      "port-version": 2
+      "baseline": "0.3.2",
+      "port-version": 0
     },
     "aricpp": {
       "baseline": "1.1.2",
       "port-version": 0
     },
     "armadillo": {
-      "baseline": "12.0.1",
+      "baseline": "12.6.6",
       "port-version": 0
     },
     "arpack-ng": {
@@ -214,43 +238,59 @@
     },
     "arrayfire": {
       "baseline": "3.8.0",
-      "port-version": 3
+      "port-version": 5
     },
     "arrow": {
-      "baseline": "10.0.1",
-      "port-version": 4
+      "baseline": "15.0.0",
+      "port-version": 0
     },
     "arsenalgear": {
       "baseline": "2.1.0",
       "port-version": 0
     },
     "ashes": {
-      "baseline": "2022-06-08",
+      "baseline": "2023-03-12",
       "port-version": 0
     },
     "asio": {
-      "baseline": "1.24.0",
-      "port-version": 1
+      "baseline": "1.29.0",
+      "port-version": 0
     },
     "asio-grpc": {
-      "baseline": "2.5.1",
+      "baseline": "2.9.2",
+      "port-version": 0
+    },
+    "asiochan": {
+      "baseline": "2022-11-25",
       "port-version": 0
     },
     "asiosdk": {
       "baseline": "2.3.3",
-      "port-version": 5
+      "port-version": 7
     },
     "asmjit": {
-      "baseline": "2021-10-26",
+      "baseline": "2023-03-25",
+      "port-version": 0
+    },
+    "asmtk": {
+      "baseline": "2022-11-06",
       "port-version": 1
     },
     "assimp": {
-      "baseline": "5.2.5",
+      "baseline": "5.3.1",
+      "port-version": 4
+    },
+    "async-mqtt": {
+      "baseline": "4.0.0",
+      "port-version": 0
+    },
+    "async-simple": {
+      "baseline": "1.3",
       "port-version": 0
     },
     "asynch": {
       "baseline": "2019-09-21",
-      "port-version": 2
+      "port-version": 3
     },
     "asyncplusplus": {
       "baseline": "1.1",
@@ -258,219 +298,247 @@
     },
     "at-spi2-atk": {
       "baseline": "2.38.0",
-      "port-version": 0
+      "port-version": 1
     },
     "at-spi2-core": {
       "baseline": "2.44.1",
-      "port-version": 1
+      "port-version": 3
     },
     "atk": {
       "baseline": "2.38.0",
-      "port-version": 5
+      "port-version": 8
     },
     "atkmm": {
       "baseline": "2.36.1",
+      "port-version": 2
+    },
+    "atl": {
+      "baseline": "0",
       "port-version": 0
     },
     "atlmfc": {
       "baseline": "0",
-      "port-version": 1
+      "port-version": 3
     },
     "atomic-queue": {
-      "baseline": "2021-05-03",
+      "baseline": "1.5",
       "port-version": 0
     },
     "attr": {
-      "baseline": "2.5.1",
+      "baseline": "2.5.2",
       "port-version": 0
     },
     "aubio": {
       "baseline": "2022-01-26",
-      "port-version": 0
+      "port-version": 1
     },
     "audiofile": {
-      "baseline": "1.1.0",
+      "baseline": "1.1.1",
       "port-version": 0
     },
     "aurora": {
       "baseline": "2017-06-21-c75699d2a8caa726260c29b6d7a0fd35f8f28933",
-      "port-version": 1
+      "port-version": 2
     },
     "autobahn": {
       "baseline": "20.8.1",
-      "port-version": 1
+      "port-version": 2
     },
     "autodock-vina": {
-      "baseline": "1.2.3",
-      "port-version": 0
+      "baseline": "1.2.5",
+      "port-version": 1
     },
     "avcpp": {
-      "baseline": "2.1.0",
+      "baseline": "2.2.1",
       "port-version": 0
     },
     "avisynthplus": {
-      "baseline": "3.7.2",
-      "port-version": 1
+      "baseline": "3.7.3",
+      "port-version": 0
     },
     "avro-c": {
-      "baseline": "1.11.0",
-      "port-version": 3
+      "baseline": "1.11.3",
+      "port-version": 0
     },
     "avro-cpp": {
-      "baseline": "2022-11-07",
+      "baseline": "1.11.3",
       "port-version": 0
     },
     "aws-c-auth": {
-      "baseline": "0.6.22",
+      "baseline": "0.7.14",
       "port-version": 0
     },
     "aws-c-cal": {
-      "baseline": "0.5.20",
+      "baseline": "0.6.9",
       "port-version": 0
     },
     "aws-c-common": {
-      "baseline": "0.8.9",
+      "baseline": "0.9.12",
       "port-version": 0
     },
     "aws-c-compression": {
-      "baseline": "0.2.16",
+      "baseline": "0.2.17",
       "port-version": 0
     },
     "aws-c-event-stream": {
-      "baseline": "0.2.18",
+      "baseline": "0.4.1",
       "port-version": 0
     },
     "aws-c-http": {
-      "baseline": "0.7.3",
+      "baseline": "0.8.0",
       "port-version": 0
     },
     "aws-c-io": {
-      "baseline": "0.13.14",
+      "baseline": "0.14.3",
       "port-version": 0
     },
     "aws-c-mqtt": {
-      "baseline": "0.8.5",
+      "baseline": "0.10.1",
       "port-version": 0
     },
     "aws-c-s3": {
-      "baseline": "0.2.3",
+      "baseline": "0.5.0",
       "port-version": 0
     },
     "aws-c-sdkutils": {
-      "baseline": "0.1.7",
+      "baseline": "0.1.14",
       "port-version": 0
     },
     "aws-checksums": {
-      "baseline": "0.1.14",
+      "baseline": "0.1.17",
       "port-version": 0
     },
     "aws-crt-cpp": {
-      "baseline": "0.19.5",
+      "baseline": "0.26.1",
       "port-version": 0
     },
     "aws-lambda-cpp": {
-      "baseline": "0.2.8",
-      "port-version": 1
+      "baseline": "0.2.10",
+      "port-version": 0
     },
     "aws-sdk-cpp": {
-      "baseline": "1.11.4",
+      "baseline": "1.11.255",
       "port-version": 0
     },
     "azmq": {
-      "baseline": "1.0.3",
+      "baseline": "2023-03-23",
       "port-version": 0
     },
     "azure-c-shared-utility": {
-      "baseline": "2023-01-18",
+      "baseline": "2023-08-07",
+      "port-version": 0
+    },
+    "azure-core-amqp-cpp": {
+      "baseline": "1.0.0-beta.7",
       "port-version": 0
     },
     "azure-core-cpp": {
-      "baseline": "1.8.0",
+      "baseline": "1.11.1",
       "port-version": 0
     },
     "azure-core-tracing-opentelemetry-cpp": {
       "baseline": "1.0.0-beta.4",
+      "port-version": 2
+    },
+    "azure-data-tables-cpp": {
+      "baseline": "1.0.0-beta.1",
       "port-version": 0
     },
     "azure-identity-cpp": {
-      "baseline": "1.4.0",
+      "baseline": "1.6.0",
       "port-version": 0
     },
     "azure-iot-sdk-c": {
-      "baseline": "2023-01-18",
+      "baseline": "2023-08-07",
       "port-version": 0
     },
     "azure-kinect-sensor-sdk": {
       "baseline": "1.4.1",
-      "port-version": 4
+      "port-version": 6
     },
     "azure-macro-utils-c": {
       "baseline": "2022-01-21",
       "port-version": 1
     },
+    "azure-messaging-eventhubs-checkpointstore-blob-cpp": {
+      "baseline": "1.0.0-beta.1",
+      "port-version": 1
+    },
+    "azure-messaging-eventhubs-cpp": {
+      "baseline": "1.0.0-beta.6",
+      "port-version": 0
+    },
     "azure-security-attestation-cpp": {
       "baseline": "1.1.0",
-      "port-version": 0
+      "port-version": 2
     },
     "azure-security-keyvault-administration-cpp": {
-      "baseline": "4.0.0-beta.2",
+      "baseline": "4.0.0-beta.4",
       "port-version": 0
     },
     "azure-security-keyvault-certificates-cpp": {
-      "baseline": "4.1.0",
+      "baseline": "4.2.1",
       "port-version": 0
     },
     "azure-security-keyvault-keys-cpp": {
-      "baseline": "4.3.0",
+      "baseline": "4.4.1",
       "port-version": 0
     },
     "azure-security-keyvault-secrets-cpp": {
-      "baseline": "4.1.0",
+      "baseline": "4.2.1",
       "port-version": 0
     },
     "azure-storage-blobs-cpp": {
-      "baseline": "12.7.0",
+      "baseline": "12.10.0",
       "port-version": 0
     },
     "azure-storage-common-cpp": {
-      "baseline": "12.3.1",
+      "baseline": "12.5.0",
       "port-version": 0
     },
     "azure-storage-cpp": {
       "baseline": "7.5.0",
-      "port-version": 4
+      "port-version": 6
     },
     "azure-storage-files-datalake-cpp": {
-      "baseline": "12.5.0",
+      "baseline": "12.9.0",
       "port-version": 0
     },
     "azure-storage-files-shares-cpp": {
-      "baseline": "12.4.0",
+      "baseline": "12.8.0",
       "port-version": 0
     },
     "azure-storage-queues-cpp": {
-      "baseline": "12.0.0",
+      "baseline": "12.2.0",
       "port-version": 0
     },
     "azure-uamqp-c": {
-      "baseline": "2023-01-18",
+      "baseline": "2023-08-07",
       "port-version": 0
     },
     "azure-uhttp-c": {
-      "baseline": "2023-01-18",
+      "baseline": "2023-08-07",
       "port-version": 0
     },
     "azure-umqtt-c": {
-      "baseline": "2023-01-18",
+      "baseline": "2023-08-03",
       "port-version": 0
     },
     "b64": {
       "baseline": "2.0.0.1",
       "port-version": 2
     },
+    "backward-cpp": {
+      "baseline": "2023-11-24",
+      "port-version": 0
+    },
+    "baresip-libre": {
+      "baseline": "3.9.0",
+      "port-version": 0
+    },
     "basisu": {
-      "baseline": "1.11",
-      "port-version": 7
+      "baseline": "1.16.4",
+      "port-version": 0
     },
     "bcg729": {
       "baseline": "1.1.1",
@@ -481,55 +549,67 @@
       "port-version": 0
     },
     "bde": {
-      "baseline": "3.2.0.0",
-      "port-version": 5
+      "baseline": "3.124.0.0",
+      "port-version": 0
     },
     "bdwgc": {
-      "baseline": "8.2.2",
+      "baseline": "8.2.6",
       "port-version": 0
     },
     "beast": {
       "baseline": "0",
-      "port-version": 1
+      "port-version": 2
     },
     "behaviortree-cpp": {
-      "baseline": "3.5.6",
-      "port-version": 3
+      "baseline": "4.3.7",
+      "port-version": 0
     },
     "benchmark": {
-      "baseline": "1.7.1",
-      "port-version": 0
+      "baseline": "1.8.3",
+      "port-version": 1
     },
     "bento4": {
-      "baseline": "1.6.0-639",
-      "port-version": 1
+      "baseline": "1.6.0-641",
+      "port-version": 0
     },
     "berkeleydb": {
       "baseline": "4.8.30",
       "port-version": 9
     },
+    "better-enums": {
+      "baseline": "0.11.3",
+      "port-version": 0
+    },
     "bext-di": {
-      "baseline": "1.2.0",
-      "port-version": 1
+      "baseline": "1.3.0",
+      "port-version": 0
+    },
+    "bext-mp": {
+      "baseline": "2023-03-02",
+      "port-version": 0
     },
     "bext-sml": {
-      "baseline": "1.1.5",
+      "baseline": "1.1.9",
+      "port-version": 0
+    },
+    "bext-sml2": {
+      "baseline": "2023-09-20",
       "port-version": 0
     },
     "bext-ut": {
       "baseline": "1.1.9",
-      "port-version": 1
+      "port-version": 2
     },
     "bext-wintls": {
-      "baseline": "0.9.5",
+      "baseline": "0.9.7",
       "port-version": 0
     },
     "bfgroup-lyra": {
-      "baseline": "1.6",
+      "baseline": "1.6.1",
       "port-version": 0
     },
     "bgfx": {
-      "baseline": "1.118.8417-415",
+      "baseline": "1.122.8595-458",
       "port-version": 0
     },
     "bigint": {
@@ -538,18 +618,18 @@
     },
     "binlog": {
       "baseline": "2021-04-16",
-      "port-version": 0
+      "port-version": 1
     },
     "binn": {
       "baseline": "3.0",
-      "port-version": 2
+      "port-version": 3
     },
     "bitmagic": {
-      "baseline": "7.12.3",
+      "baseline": "7.13.4",
       "port-version": 0
     },
     "bitserializer": {
-      "baseline": "0.50",
+      "baseline": "0.65",
       "port-version": 0
     },
     "bitserializer-cpprestjson": {
@@ -569,659 +649,683 @@
       "port-version": 3
     },
     "bitsery": {
-      "baseline": "5.2.2",
+      "baseline": "5.2.3",
       "port-version": 0
     },
     "blake3": {
-      "baseline": "1.3.3",
+      "baseline": "1.5.0",
       "port-version": 0
     },
     "blas": {
-      "baseline": "1",
-      "port-version": 2
+      "baseline": "2023-03-25",
+      "port-version": 0
     },
     "blaze": {
-      "baseline": "3.8.1",
+      "baseline": "3.8.2",
       "port-version": 0
     },
     "blend2d": {
-      "baseline": "2022-12-31",
-      "port-version": 2
+      "baseline": "2023-06-16",
+      "port-version": 1
+    },
+    "blingfire": {
+      "baseline": "0.1.8.1",
+      "port-version": 1
     },
     "blitz": {
       "baseline": "2020-03-25",
       "port-version": 5
     },
+    "bloomberg-quantum": {
+      "baseline": "2023-02-03",
+      "port-version": 0
+    },
     "blosc": {
-      "baseline": "1.21.3",
+      "baseline": "1.21.5",
       "port-version": 0
     },
-    "boinc": {
-      "baseline": "7.22.0",
+    "blpapi": {
+      "baseline": "3.20.2",
+      "port-version": 0
+    },
+    "boinc": {
+      "baseline": "7.24.3",
       "port-version": 0
     },
     "bond": {
-      "baseline": "9.0.3",
-      "port-version": 3
+      "baseline": "10.0.0",
+      "port-version": 2
     },
     "boolinq": {
       "baseline": "3.0.4",
       "port-version": 0
     },
     "boost": {
-      "baseline": "1.81.0",
-      "port-version": 3
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-accumulators": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-algorithm": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-align": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-any": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-array": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-asio": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-assert": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-assign": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-atomic": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-beast": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-bimap": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-bind": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-build": {
-      "baseline": "1.81.0",
-      "port-version": 3
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-callable-traits": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-chrono": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-circular-buffer": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
+    },
+    "boost-cobalt": {
+      "baseline": "1.84.0",
+      "port-version": 0
+    },
+    "boost-compat": {
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-compatibility": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-compute": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-concept-check": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-config": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-container": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-container-hash": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-context": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-contract": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-conversion": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-convert": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-core": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-coroutine": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-coroutine2": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-crc": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-date-time": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-describe": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-detail": {
-      "baseline": "1.81.0",
-      "port-version": 2
-    },
-    "boost-di": {
-      "baseline": "1.2.0",
+      "baseline": "1.84.0",
       "port-version": 0
     },
     "boost-dll": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-dynamic-bitset": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-endian": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-exception": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-fiber": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-filesystem": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-flyweight": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-foreach": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-format": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-function": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-function-types": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-functional": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-fusion": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-geometry": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-gil": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-graph": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-graph-parallel": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-hana": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-heap": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-histogram": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-hof": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-icl": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-integer": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-interprocess": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-interval": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-intrusive": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-io": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-iostreams": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-iterator": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-json": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-lambda": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-lambda2": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-leaf": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-lexical-cast": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-local-function": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-locale": {
-      "baseline": "1.81.0",
-      "port-version": 3
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-lockfree": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-log": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-logic": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-math": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-metaparse": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-modular-build-helper": {
-      "baseline": "1.81.0",
-      "port-version": 5
+      "baseline": "1.84.0",
+      "port-version": 2
     },
     "boost-move": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-mp11": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-mpi": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-mpl": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-msm": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-multi-array": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-multi-index": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-multiprecision": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
+    },
+    "boost-mysql": {
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-nowide": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-numeric-conversion": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-odeint": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-optional": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-outcome": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-parameter": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-parameter-python": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-pfr": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-phoenix": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-poly-collection": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-polygon": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-pool": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-predef": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-preprocessor": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-process": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-program-options": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-property-map": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-property-map-parallel": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-property-tree": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-proto": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-ptr-container": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-python": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-qvm": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-random": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-range": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-ratio": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-rational": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
+    },
+    "boost-redis": {
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-regex": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-safe-numerics": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-scope-exit": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-serialization": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-signals2": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-smart-ptr": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-sort": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-spirit": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-stacktrace": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-statechart": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-static-assert": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-static-string": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-stl-interfaces": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-system": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-test": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-thread": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-throw-exception": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-timer": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-tokenizer": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-tti": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-tuple": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-type-erasure": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-type-index": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-type-traits": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-typeof": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-ublas": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-uninstall": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-units": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-unordered": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-url": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-utility": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-uuid": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-variant": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-variant2": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-vcpkg-helpers": {
-      "baseline": "1.81.0",
-      "port-version": 3
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-vmd": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-wave": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-winapi": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-xpressive": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boost-yap": {
-      "baseline": "1.81.0",
-      "port-version": 2
+      "baseline": "1.84.0",
+      "port-version": 0
     },
     "boringssl": {
-      "baseline": "2021-06-23",
-      "port-version": 3
+      "baseline": "2023-10-13",
+      "port-version": 0
     },
     "botan": {
-      "baseline": "2.19.3",
+      "baseline": "3.2.0",
       "port-version": 0
     },
     "box2d": {
@@ -1230,22 +1334,22 @@
     },
     "braft": {
       "baseline": "2021-26-04",
-      "port-version": 0
+      "port-version": 1
     },
     "breakpad": {
-      "baseline": "2022-07-12",
-      "port-version": 4
+      "baseline": "2023-01-27",
+      "port-version": 1
     },
     "brigand": {
       "baseline": "1.3.0",
-      "port-version": 2
+      "port-version": 3
     },
     "brotli": {
-      "baseline": "1.0.9",
-      "port-version": 5
+      "baseline": "1.1.0",
+      "port-version": 1
     },
     "brpc": {
-      "baseline": "1.4.0",
+      "baseline": "1.6.1",
       "port-version": 0
     },
     "brunocodutra-metal": {
@@ -1257,7 +1361,7 @@
       "port-version": 0
     },
     "bshoshany-thread-pool": {
-      "baseline": "3.3.0",
+      "baseline": "4.0.1",
       "port-version": 0
     },
     "bsio": {
@@ -1278,7 +1382,7 @@
     },
     "bullet3": {
       "baseline": "3.25",
-      "port-version": 0
+      "port-version": 1
     },
     "bustache": {
       "baseline": "1.1.0",
@@ -1286,7 +1390,11 @@
     },
     "butteraugli": {
       "baseline": "2019-05-08",
-      "port-version": 3
+      "port-version": 4
+    },
+    "bxzstr": {
+      "baseline": "1.2.0",
+      "port-version": 1
     },
     "byte-lite": {
       "baseline": "0.3.0",
@@ -1294,10 +1402,10 @@
     },
     "bzip2": {
       "baseline": "1.0.8",
-      "port-version": 3
+      "port-version": 5
     },
     "c-ares": {
-      "baseline": "1.19.0",
+      "baseline": "1.26.0",
       "port-version": 0
     },
     "c-dbg-macro": {
@@ -1309,20 +1417,20 @@
       "port-version": 0
     },
     "c89stringutils": {
-      "baseline": "0.0.1",
-      "port-version": 1
+      "baseline": "0.0.2",
+      "port-version": 0
     },
     "c9y": {
-      "baseline": "0.7.0",
+      "baseline": "0.8.0",
       "port-version": 0
     },
     "cachelib": {
-      "baseline": "2023.02.27.00",
+      "baseline": "2023.05.08.00",
       "port-version": 0
     },
     "caf": {
-      "baseline": "0.18.6",
-      "port-version": 1
+      "baseline": "0.19.3",
+      "port-version": 0
     },
     "caffe2": {
       "baseline": "0.8.1",
@@ -1330,30 +1438,34 @@
     },
     "cairo": {
       "baseline": "1.17.8",
-      "port-version": 0
+      "port-version": 4
     },
     "cairomm": {
-      "baseline": "1.16.2",
-      "port-version": 2
+      "baseline": "1.17.1",
+      "port-version": 1
     },
     "calceph": {
-      "baseline": "3.5.1",
+      "baseline": "3.5.5",
       "port-version": 0
     },
     "camport3": {
       "baseline": "1.6.2",
       "port-version": 0
     },
+    "canvas-ity": {
+      "baseline": "1.0",
+      "port-version": 0
+    },
     "capnproto": {
-      "baseline": "0.10.3",
+      "baseline": "1.0.2",
       "port-version": 0
     },
     "capstone": {
-      "baseline": "5.0.0-rc2",
+      "baseline": "5.0.1",
       "port-version": 1
     },
     "cargs": {
-      "baseline": "1.0.3",
+      "baseline": "1.1.0",
       "port-version": 0
     },
     "cartographer": {
@@ -1370,10 +1482,10 @@
     },
     "catch-classic": {
       "baseline": "1.12.2",
-      "port-version": 1
+      "port-version": 2
     },
     "catch2": {
-      "baseline": "3.3.2",
+      "baseline": "3.5.2",
       "port-version": 0
     },
     "cccapstone": {
@@ -1386,18 +1498,22 @@
     },
     "ccfits": {
       "baseline": "2.5",
-      "port-version": 9
+      "port-version": 11
     },
     "cctag": {
       "baseline": "1.0.2",
-      "port-version": 3
+      "port-version": 5
     },
     "cctz": {
       "baseline": "2.3",
-      "port-version": 4
+      "port-version": 7
+    },
+    "cdt": {
+      "baseline": "1.4.0",
+      "port-version": 0
     },
     "celero": {
-      "baseline": "2.8.5",
+      "baseline": "2.9.0",
       "port-version": 0
     },
     "cello": {
@@ -1414,22 +1530,18 @@
     },
     "cfitsio": {
       "baseline": "3.49",
-      "port-version": 3
+      "port-version": 5
     },
     "cgal": {
-      "baseline": "5.5.1",
-      "port-version": 0
+      "baseline": "5.6",
+      "port-version": 1
     },
     "cgicc": {
-      "baseline": "3.2.19",
-      "port-version": 6
-    },
-    "cgl": {
-      "baseline": "0.60.3",
+      "baseline": "3.2.20",
       "port-version": 0
     },
     "cglm": {
-      "baseline": "0.8.8",
+      "baseline": "0.9.2",
       "port-version": 0
     },
     "cgltf": {
@@ -1437,40 +1549,40 @@
       "port-version": 0
     },
     "cgns": {
-      "baseline": "4.3.0",
-      "port-version": 3
+      "baseline": "4.4.0",
+      "port-version": 0
     },
     "chaiscript": {
       "baseline": "6.1.0",
-      "port-version": 2
+      "port-version": 3
     },
     "chakracore": {
       "baseline": "2022-11-09",
-      "port-version": 2
+      "port-version": 5
     },
     "charls": {
-      "baseline": "2.4.1",
+      "baseline": "2.4.2",
       "port-version": 0
     },
     "chartdir": {
       "baseline": "7.0.0",
-      "port-version": 6
+      "port-version": 7
     },
     "check": {
       "baseline": "0.15.2",
-      "port-version": 4
+      "port-version": 5
     },
     "chipmunk": {
       "baseline": "7.0.3",
-      "port-version": 3
+      "port-version": 6
     },
     "chmlib": {
       "baseline": "0.40",
-      "port-version": 6
+      "port-version": 7
     },
     "chromaprint": {
-      "baseline": "1.5.0",
-      "port-version": 2
+      "baseline": "1.5.1",
+      "port-version": 0
     },
     "chromium-base": {
       "baseline": "86.0.4199.1",
@@ -1480,60 +1592,72 @@
       "baseline": "8.0.0",
       "port-version": 0
     },
+    "cialloo-rcon": {
+      "baseline": "1.0.0",
+      "port-version": 0
+    },
     "cimg": {
-      "baseline": "2.9.9",
+      "baseline": "3.3.2",
       "port-version": 0
     },
     "cista": {
-      "baseline": "0.11",
+      "baseline": "0.14",
       "port-version": 0
     },
     "cityhash": {
       "baseline": "2013-01-08",
-      "port-version": 2
+      "port-version": 3
     },
     "civetweb": {
-      "baseline": "1.15",
+      "baseline": "1.16",
       "port-version": 2
     },
     "cjson": {
-      "baseline": "1.7.15",
-      "port-version": 2
+      "baseline": "1.7.17",
+      "port-version": 0
     },
     "clamav": {
-      "baseline": "0.103.0",
-      "port-version": 4
+      "baseline": "0.103.11",
+      "port-version": 0
+    },
+    "clap-cleveraudio": {
+      "baseline": "1.2.0",
+      "port-version": 0
     },
     "clapack": {
       "baseline": "3.2.1",
-      "port-version": 21
+      "port-version": 22
     },
     "clara": {
       "baseline": "1.1.5",
-      "port-version": 1
+      "port-version": 2
     },
     "clblas": {
       "baseline": "2.12",
       "port-version": 7
     },
     "clblast": {
-      "baseline": "1.5.2",
-      "port-version": 2
+      "baseline": "1.6.1",
+      "port-version": 0
+    },
+    "cld3": {
+      "baseline": "3.0.14",
+      "port-version": 1
     },
     "clfft": {
       "baseline": "2.12.2",
       "port-version": 6
     },
     "cli": {
-      "baseline": "2.0.2",
+      "baseline": "2.1.0",
       "port-version": 0
     },
     "cli11": {
-      "baseline": "2.3.1",
+      "baseline": "2.4.0",
       "port-version": 0
     },
     "clickhouse-cpp": {
-      "baseline": "2.2.1",
+      "baseline": "2.5.1",
       "port-version": 0
     },
     "clipboardxx": {
@@ -1545,17 +1669,13 @@
       "port-version": 2
     },
     "clipper2": {
-      "baseline": "1.1.1",
+      "baseline": "1.3.0",
       "port-version": 1
     },
     "clockutils": {
       "baseline": "1.1.1",
       "port-version": 1
     },
-    "clp": {
-      "baseline": "1.17.6",
-      "port-version": 1
-    },
     "clrng": {
       "baseline": "2020-12-01",
       "port-version": 3
@@ -1565,32 +1685,28 @@
       "port-version": 0
     },
     "cmakerc": {
-      "baseline": "2022-09-08",
+      "baseline": "2023-07-24",
       "port-version": 0
     },
     "cmark": {
-      "baseline": "0.30.1",
+      "baseline": "0.30.3",
       "port-version": 0
     },
-    "cmcstl2": {
-      "baseline": "2019-07-20",
-      "port-version": 2
-    },
     "cminpack": {
       "baseline": "1.3.8",
-      "port-version": 2
+      "port-version": 4
     },
     "cmocka": {
       "baseline": "2020-08-01",
-      "port-version": 2
+      "port-version": 3
     },
     "cnats": {
-      "baseline": "3.6.0",
-      "port-version": 0
+      "baseline": "3.7.0",
+      "port-version": 1
     },
     "cnl": {
       "baseline": "1.1.7",
-      "port-version": 2
+      "port-version": 3
     },
     "co": {
       "baseline": "2.0.3",
@@ -1601,13 +1717,17 @@
       "port-version": 1
     },
     "coin": {
-      "baseline": "4.0.0",
-      "port-version": 6
+      "baseline": "4.0.2",
+      "port-version": 2
     },
     "coin-or-buildtools": {
       "baseline": "2023-02-02",
       "port-version": 0
     },
+    "coin-or-cbc": {
+      "baseline": "2023-02-01",
+      "port-version": 0
+    },
     "coin-or-cgl": {
       "baseline": "2023-02-01",
       "port-version": 0
@@ -1626,14 +1746,14 @@
     },
     "coinutils": {
       "baseline": "2023-02-02",
-      "port-version": 0
+      "port-version": 1
     },
     "collada-dom": {
       "baseline": "2.5.0",
-      "port-version": 8
+      "port-version": 10
     },
     "colmap": {
-      "baseline": "2023-03-12",
+      "baseline": "2023-10-01",
       "port-version": 0
     },
     "color-console": {
@@ -1657,15 +1777,15 @@
       "port-version": 0
     },
     "concurrencpp": {
-      "baseline": "0.1.5",
+      "baseline": "0.1.7",
       "port-version": 0
     },
     "concurrentqueue": {
-      "baseline": "1.0.3",
-      "port-version": 1
+      "baseline": "1.0.4",
+      "port-version": 0
     },
     "configcat": {
-      "baseline": "2.0.1",
+      "baseline": "3.2.0",
       "port-version": 0
     },
     "console-bridge": {
@@ -1678,10 +1798,10 @@
     },
     "constexpr-contracts": {
       "baseline": "2020-08-09",
-      "port-version": 2
+      "port-version": 3
     },
     "continuable": {
-      "baseline": "4.2.0",
+      "baseline": "4.2.2",
       "port-version": 0
     },
     "convectionkernels": {
@@ -1690,6 +1810,10 @@
     },
     "coolprop": {
       "baseline": "6.4.3",
+      "port-version": 3
+    },
+    "copypp": {
+      "baseline": "0.3.0",
       "port-version": 0
     },
     "coroutine": {
@@ -1698,18 +1822,22 @@
     },
     "corrade": {
       "baseline": "2020.06",
-      "port-version": 5
+      "port-version": 8
+    },
+    "cpp-async": {
+      "baseline": "1.1.0",
+      "port-version": 0
     },
     "cpp-base64": {
       "baseline": "V2.rc.08",
       "port-version": 0
     },
     "cpp-httplib": {
-      "baseline": "0.11.3",
-      "port-version": 1
+      "baseline": "0.15.3",
+      "port-version": 0
     },
     "cpp-ipc": {
-      "baseline": "1.2.0",
+      "baseline": "1.3.0",
       "port-version": 0
     },
     "cpp-jwt": {
@@ -1718,31 +1846,35 @@
     },
     "cpp-netlib": {
       "baseline": "0.13.0",
-      "port-version": 7
+      "port-version": 9
     },
     "cpp-peglib": {
-      "baseline": "1.3.10",
+      "baseline": "1.8.6",
       "port-version": 0
     },
     "cpp-redis": {
       "baseline": "4.3.1",
       "port-version": 5
     },
+    "cpp-sort": {
+      "baseline": "1.15.0",
+      "port-version": 0
+    },
     "cpp-taskflow": {
       "baseline": "2.6.0",
-      "port-version": 1
+      "port-version": 2
     },
     "cpp-timsort": {
       "baseline": "2.1.0",
       "port-version": 0
     },
     "cppad": {
-      "baseline": "20230000.0",
+      "baseline": "20240000.2",
       "port-version": 0
     },
     "cppcms": {
       "baseline": "1.2.1",
-      "port-version": 6
+      "port-version": 7
     },
     "cppcodec": {
       "baseline": "0.2",
@@ -1752,12 +1884,16 @@
       "baseline": "2022-10-25",
       "port-version": 0
     },
+    "cppdap": {
+      "baseline": "1.58.0-a",
+      "port-version": 0
+    },
     "cppfs": {
       "baseline": "1.3.0",
-      "port-version": 2
+      "port-version": 3
     },
     "cppgraphqlgen": {
-      "baseline": "4.5.1",
+      "baseline": "4.5.5",
       "port-version": 0
     },
     "cppitertools": {
@@ -1765,24 +1901,36 @@
       "port-version": 3
     },
     "cppkafka": {
-      "baseline": "0.3.1",
-      "port-version": 5
+      "baseline": "0.4.0",
+      "port-version": 0
     },
     "cppmicroservices": {
-      "baseline": "3.6.0",
+      "baseline": "3.7.6",
       "port-version": 1
     },
+    "cppp-reiconv": {
+      "baseline": "2.1.0",
+      "port-version": 0
+    },
     "cpprestsdk": {
-      "baseline": "2.10.18",
-      "port-version": 2
+      "baseline": "2.10.19",
+      "port-version": 0
+    },
+    "cppslippi": {
+      "baseline": "1.3.3.14",
+      "port-version": 0
     },
     "cpptoml": {
-      "baseline": "v0.1.1",
-      "port-version": 2
+      "baseline": "0.1.1",
+      "port-version": 4
+    },
+    "cpptrace": {
+      "baseline": "0.3.1",
+      "port-version": 1
     },
     "cppunit": {
       "baseline": "1.15.1",
-      "port-version": 3
+      "port-version": 4
     },
     "cpputest": {
       "baseline": "2019-9-16",
@@ -1797,15 +1945,15 @@
       "port-version": 1
     },
     "cppzmq": {
-      "baseline": "4.9.0",
+      "baseline": "4.10.0",
       "port-version": 0
     },
     "cpr": {
-      "baseline": "1.9.3",
-      "port-version": 0
+      "baseline": "1.10.5",
+      "port-version": 1
     },
     "cpu-features": {
-      "baseline": "0.7.0",
+      "baseline": "0.9.0",
       "port-version": 0
     },
     "cpuid": {
@@ -1814,15 +1962,15 @@
     },
     "cpuinfo": {
       "baseline": "2022-07-19",
-      "port-version": 2
+      "port-version": 3
     },
     "cr": {
       "baseline": "2020-04-26",
-      "port-version": 1
+      "port-version": 2
     },
     "crashpad": {
       "baseline": "2022-09-05",
-      "port-version": 3
+      "port-version": 4
     },
     "crashrpt": {
       "baseline": "1.4.3",
@@ -1830,39 +1978,43 @@
     },
     "crc32c": {
       "baseline": "1.1.2",
-      "port-version": 1
+      "port-version": 2
     },
     "crfsuite": {
       "baseline": "2020-08-27",
       "port-version": 0
     },
     "croncpp": {
-      "baseline": "2020-09-04",
-      "port-version": 3
+      "baseline": "2023-03-30",
+      "port-version": 0
     },
     "crossguid": {
       "baseline": "2021-10-22",
-      "port-version": 2
+      "port-version": 3
     },
     "crow": {
       "baseline": "1.0-5",
       "port-version": 0
     },
     "cryptopp": {
-      "baseline": "8.7.0",
-      "port-version": 3
+      "baseline": "8.9.0",
+      "port-version": 0
     },
     "cserialport": {
       "baseline": "4.3.0",
-      "port-version": 0
+      "port-version": 1
     },
     "cspice": {
       "baseline": "67",
-      "port-version": 2
+      "port-version": 3
+    },
+    "ctbench": {
+      "baseline": "1.3.3",
+      "port-version": 0
     },
     "ctbignum": {
       "baseline": "2019-08-02",
-      "port-version": 2
+      "port-version": 3
     },
     "ctemplate": {
       "baseline": "2020-09-14",
@@ -1870,54 +2022,66 @@
     },
     "ctp": {
       "baseline": "6.6.1_P1_20210406_se",
-      "port-version": 3
+      "port-version": 4
     },
     "ctpg": {
       "baseline": "1.3.7",
       "port-version": 2
     },
     "ctre": {
-      "baseline": "3.7.2",
+      "baseline": "3.8.1",
+      "port-version": 0
+    },
+    "ctstraffic": {
+      "baseline": "2.0.3.2",
       "port-version": 0
     },
     "cub": {
-      "baseline": "1.16.0",
+      "baseline": "2.1.0",
       "port-version": 0
     },
     "cubeb": {
-      "baseline": "2022-07-22",
-      "port-version": 0
+      "baseline": "2023-09-26",
+      "port-version": 1
     },
     "cuda": {
       "baseline": "10.1",
       "port-version": 13
     },
+    "cuda-api-wrappers": {
+      "baseline": "0.6.7",
+      "port-version": 0
+    },
     "cudnn": {
       "baseline": "7.6.5",
-      "port-version": 9
+      "port-version": 10
     },
     "cunit": {
       "baseline": "2.1.3",
       "port-version": 8
     },
     "curl": {
-      "baseline": "7.88.1",
+      "baseline": "8.5.0",
       "port-version": 1
     },
     "curlpp": {
       "baseline": "2018-06-15",
-      "port-version": 7
+      "port-version": 9
     },
     "cute-headers": {
       "baseline": "2019-09-20",
-      "port-version": 1
+      "port-version": 2
     },
     "cutelyst2": {
       "baseline": "2.12.0",
       "port-version": 2
     },
     "cwalk": {
-      "baseline": "1.2.6",
+      "baseline": "1.2.9",
+      "port-version": 0
+    },
+    "cxxgraph": {
+      "baseline": "2.0.0",
       "port-version": 0
     },
     "cxxopts": {
@@ -1925,20 +2089,20 @@
       "port-version": 0
     },
     "cyclonedds": {
-      "baseline": "0.10.2",
-      "port-version": 2
+      "baseline": "0.10.4",
+      "port-version": 0
     },
     "cyclonedds-cxx": {
-      "baseline": "0.10.2",
-      "port-version": 1
+      "baseline": "0.10.4",
+      "port-version": 0
     },
     "czmq": {
       "baseline": "4.2.1",
-      "port-version": 1
+      "port-version": 4
     },
     "d3d12-memory-allocator": {
       "baseline": "2021-05-05",
-      "port-version": 0
+      "port-version": 1
     },
     "d3dx12": {
       "baseline": "may2021",
@@ -1946,7 +2110,7 @@
     },
     "darknet": {
       "baseline": "2022-03-06",
-      "port-version": 2
+      "port-version": 4
     },
     "darts-clone": {
       "baseline": "1767ab87cffe",
@@ -1954,26 +2118,30 @@
     },
     "dartsim": {
       "baseline": "6.12.2",
-      "port-version": 1
+      "port-version": 3
     },
     "dataframe": {
-      "baseline": "1.22.0",
+      "baseline": "3.0.0",
       "port-version": 0
     },
     "date": {
       "baseline": "3.0.1",
-      "port-version": 2
+      "port-version": 5
+    },
+    "datraw": {
+      "baseline": "1.0.9",
+      "port-version": 0
     },
     "dav1d": {
-      "baseline": "1.1.0",
+      "baseline": "1.3.0",
       "port-version": 1
     },
     "daw-header-libraries": {
-      "baseline": "2.88.0",
+      "baseline": "2.98.5",
       "port-version": 0
     },
     "daw-json-link": {
-      "baseline": "3.15.0",
+      "baseline": "3.23.0",
       "port-version": 0
     },
     "daw-utf-range": {
@@ -1981,11 +2149,11 @@
       "port-version": 0
     },
     "daxa": {
-      "baseline": "1.0.0",
+      "baseline": "2.0.0",
       "port-version": 0
     },
     "dbg-macro": {
-      "baseline": "2021-11-02",
+      "baseline": "0.5.1",
       "port-version": 0
     },
     "dbghelp": {
@@ -1994,27 +2162,27 @@
     },
     "dbow2": {
       "baseline": "2019-08-05",
-      "port-version": 2
+      "port-version": 3
     },
     "dbow3": {
       "baseline": "1.0.0",
-      "port-version": 2
+      "port-version": 3
     },
     "dbus": {
-      "baseline": "1.15.2",
-      "port-version": 0
+      "baseline": "1.15.8",
+      "port-version": 2
     },
     "dcmtk": {
-      "baseline": "3.6.7",
-      "port-version": 4
+      "baseline": "3.6.8",
+      "port-version": 2
     },
     "debug-assert": {
       "baseline": "1.3.3",
-      "port-version": 1
+      "port-version": 2
     },
     "decimal-for-cpp": {
       "baseline": "1.18",
-      "port-version": 0
+      "port-version": 1
     },
     "detours": {
       "baseline": "4.0.1",
@@ -2026,79 +2194,79 @@
     },
     "devil": {
       "baseline": "1.8.0",
-      "port-version": 10
+      "port-version": 11
     },
     "dimcli": {
       "baseline": "7.1.0",
       "port-version": 0
     },
     "directx-dxc": {
-      "baseline": "2023-03-01",
-      "port-version": 1
+      "baseline": "2023-08-14",
+      "port-version": 0
     },
     "directx-headers": {
-      "baseline": "1.608.2",
-      "port-version": 1
+      "baseline": "1.611.0",
+      "port-version": 0
     },
     "directxmath": {
-      "baseline": "2022-12-12",
+      "baseline": "2023-12-31",
       "port-version": 0
     },
     "directxmesh": {
-      "baseline": "2022-12-15",
-      "port-version": 1
+      "baseline": "2023-12-31",
+      "port-version": 0
     },
     "directxsdk": {
       "baseline": "jun10",
-      "port-version": 6
+      "port-version": 8
     },
     "directxtex": {
-      "baseline": "2023-01-31",
-      "port-version": 2
+      "baseline": "2023-12-31",
+      "port-version": 0
     },
     "directxtk": {
-      "baseline": "2023-02-06",
-      "port-version": 1
+      "baseline": "2023-12-31",
+      "port-version": 0
     },
     "directxtk12": {
-      "baseline": "2023-02-06",
-      "port-version": 1
+      "baseline": "2023-12-31",
+      "port-version": 0
     },
     "dirent": {
-      "baseline": "1.23.2",
-      "port-version": 1
+      "baseline": "1.24",
+      "port-version": 0
     },
     "discord-game-sdk": {
-      "baseline": "2.5.6",
-      "port-version": 5
+      "baseline": "3.2.1",
+      "port-version": 0
     },
     "discord-rpc": {
       "baseline": "3.4.0",
-      "port-version": 2
+      "port-version": 3
     },
     "discordcoreapi": {
-      "baseline": "2023-01-02",
+      "baseline": "2.0.5",
       "port-version": 0
     },
     "discount": {
-      "baseline": "2.2.6",
-      "port-version": 2
+      "baseline": "3.0.0a",
+      "port-version": 0
     },
     "discreture": {
       "baseline": "2020-01-29",
-      "port-version": 2
+      "port-version": 3
     },
     "distorm": {
       "baseline": "3.5.2b",
       "port-version": 0
     },
     "dlfcn-win32": {
-      "baseline": "1.3.1",
-      "port-version": 1
+      "baseline": "1.4.1",
+      "port-version": 0
     },
     "dlib": {
       "baseline": "19.24",
-      "port-version": 2
+      "port-version": 3
     },
     "dmlc": {
       "baseline": "2022-06-22",
@@ -2106,14 +2274,18 @@
     },
     "docopt": {
       "baseline": "2018-11-01",
-      "port-version": 2
+      "port-version": 3
     },
     "doctest": {
-      "baseline": "2.4.9",
+      "baseline": "2.4.11",
       "port-version": 0
     },
     "double-conversion": {
-      "baseline": "3.2.1",
+      "baseline": "3.3.0",
+      "port-version": 0
+    },
+    "dp-thread-pool": {
+      "baseline": "0.6.2",
       "port-version": 0
     },
     "dpdk": {
@@ -2121,24 +2293,24 @@
       "port-version": 1
     },
     "dpp": {
-      "baseline": "10.0.23",
-      "port-version": 1
+      "baseline": "10.0.29",
+      "port-version": 0
     },
     "draco": {
-      "baseline": "1.5.3",
+      "baseline": "1.5.7",
       "port-version": 0
     },
     "drlibs": {
-      "baseline": "2022-09-26",
+      "baseline": "2023-08-16",
       "port-version": 0
     },
     "drogon": {
-      "baseline": "1.8.2",
-      "port-version": 1
+      "baseline": "1.9.2",
+      "port-version": 0
     },
     "dstorage": {
-      "baseline": "1.1.0",
-      "port-version": 2
+      "baseline": "1.2.2",
+      "port-version": 0
     },
     "dtl": {
       "baseline": "1.20",
@@ -2152,25 +2324,41 @@
       "baseline": "2019-04-28",
       "port-version": 5
     },
+    "dukglue": {
+      "baseline": "2022-11-08",
+      "port-version": 0
+    },
     "duktape": {
-      "baseline": "2.5.0",
-      "port-version": 3
+      "baseline": "2.7.0",
+      "port-version": 0
+    },
+    "dumb": {
+      "baseline": "2.0.3",
+      "port-version": 0
     },
     "dv-processing": {
-      "baseline": "1.7.8",
+      "baseline": "1.7.9",
       "port-version": 1
     },
     "dx": {
       "baseline": "1.0.1",
-      "port-version": 2
+      "port-version": 3
     },
     "dxsdk-d3dx": {
       "baseline": "9.29.952.8",
-      "port-version": 5
+      "port-version": 6
     },
     "dxut": {
       "baseline": "11.31",
-      "port-version": 2
+      "port-version": 3
+    },
+    "dylib": {
+      "baseline": "2.2.1",
+      "port-version": 0
+    },
+    "dyno": {
+      "baseline": "2019-11-13",
+      "port-version": 0
     },
     "eabase": {
       "baseline": "2.09.12",
@@ -2181,12 +2369,12 @@
       "port-version": 0
     },
     "eastl": {
-      "baseline": "3.18.00",
-      "port-version": 3
+      "baseline": "3.21.12",
+      "port-version": 0
     },
     "easycl": {
       "baseline": "0.3",
-      "port-version": 1
+      "port-version": 2
     },
     "easyexif": {
       "baseline": "2022-10-07",
@@ -2194,34 +2382,42 @@
     },
     "easyhook": {
       "baseline": "2.7.7097.0",
-      "port-version": 5
+      "port-version": 7
     },
     "easyloggingpp": {
-      "baseline": "9.97.0",
-      "port-version": 2
+      "baseline": "9.97.1",
+      "port-version": 0
     },
     "eathread": {
       "baseline": "1.32.09",
-      "port-version": 3
+      "port-version": 5
     },
     "ebml": {
-      "baseline": "1.4.2",
+      "baseline": "1.4.4",
       "port-version": 1
     },
+    "ecal": {
+      "baseline": "5.12.0",
+      "port-version": 0
+    },
     "ecm": {
       "baseline": "5.98.0",
       "port-version": 0
     },
     "ecos": {
-      "baseline": "2.0.8",
-      "port-version": 1
+      "baseline": "2.0.10",
+      "port-version": 0
     },
     "ecsutil": {
       "baseline": "1.0.7.15",
-      "port-version": 3
+      "port-version": 5
+    },
+    "ed25519": {
+      "baseline": "2017-02-10",
+      "port-version": 0
     },
     "edflib": {
-      "baseline": "1.21",
+      "baseline": "1.25",
       "port-version": 0
     },
     "edlib": {
@@ -2230,10 +2426,10 @@
     },
     "effects11": {
       "baseline": "11.29",
-      "port-version": 2
+      "port-version": 3
     },
     "effolkronium-random": {
-      "baseline": "1.4.1",
+      "baseline": "1.5.0",
       "port-version": 0
     },
     "efsw": {
@@ -2250,14 +2446,14 @@
     },
     "eigen3": {
       "baseline": "3.4.0",
-      "port-version": 2
+      "port-version": 3
     },
     "elements": {
       "baseline": "2022-12-07",
       "port-version": 0
     },
     "elfio": {
-      "baseline": "3.11",
+      "baseline": "3.12",
       "port-version": 0
     },
     "elfutils": {
@@ -2266,30 +2462,34 @@
     },
     "embree3": {
       "baseline": "3.13.5",
-      "port-version": 1
+      "port-version": 2
     },
     "enet": {
       "baseline": "1.3.17",
+      "port-version": 2
+    },
+    "enkits": {
+      "baseline": "1.11",
       "port-version": 1
     },
     "ensmallen": {
-      "baseline": "2.19.0",
+      "baseline": "2.19.1",
       "port-version": 0
     },
     "entityx": {
       "baseline": "1.3.0",
-      "port-version": 3
+      "port-version": 5
     },
     "entt": {
-      "baseline": "3.11.1",
+      "baseline": "3.13.1",
       "port-version": 0
     },
     "epsilon": {
       "baseline": "0.9.2",
-      "port-version": 7
+      "port-version": 8
     },
     "ereignis": {
-      "baseline": "1.1",
+      "baseline": "2.3",
       "port-version": 0
     },
     "esaxx": {
@@ -2297,19 +2497,19 @@
       "port-version": 1
     },
     "etcd-cpp-apiv3": {
-      "baseline": "0.14.2",
+      "baseline": "0.15.3",
       "port-version": 0
     },
     "etl": {
-      "baseline": "20.35.4",
+      "baseline": "20.38.10",
       "port-version": 0
     },
     "eve": {
-      "baseline": "2022.9.1",
+      "baseline": "2023.2.15",
       "port-version": 0
     },
     "eventpp": {
-      "baseline": "0.1.2",
+      "baseline": "0.1.3",
       "port-version": 0
     },
     "evpp": {
@@ -2317,15 +2517,15 @@
       "port-version": 7
     },
     "exiv2": {
-      "baseline": "0.27.6",
-      "port-version": 0
+      "baseline": "0.28.1",
+      "port-version": 1
     },
     "expat": {
       "baseline": "2.5.0",
       "port-version": 3
     },
     "expected-lite": {
-      "baseline": "0.6.2",
+      "baseline": "0.6.3",
       "port-version": 0
     },
     "exprtk": {
@@ -2333,7 +2533,7 @@
       "port-version": 2
     },
     "ezc3d": {
-      "baseline": "1.4.7",
+      "baseline": "1.5.7",
       "port-version": 0
     },
     "ezfoundation": {
@@ -2346,34 +2546,38 @@
     },
     "fadbad": {
       "baseline": "2.1.0",
-      "port-version": 1
+      "port-version": 2
     },
     "faiss": {
-      "baseline": "1.7.3",
+      "baseline": "1.7.4",
       "port-version": 0
     },
     "fakeit": {
-      "baseline": "2.3.0",
+      "baseline": "2.4.0",
+      "port-version": 2
+    },
+    "fameta-counter": {
+      "baseline": "2021-02-13",
       "port-version": 0
     },
     "fann": {
-      "baseline": "2.2.0",
-      "port-version": 3
+      "baseline": "2023-01-26",
+      "port-version": 0
     },
     "farmhash": {
       "baseline": "1.1",
-      "port-version": 5
+      "port-version": 6
     },
     "fast-cpp-csv-parser": {
       "baseline": "2021-01-03",
       "port-version": 2
     },
     "fast-float": {
-      "baseline": "3.5.1",
+      "baseline": "6.0.0",
       "port-version": 0
     },
     "fastcdr": {
-      "baseline": "1.0.26",
+      "baseline": "1.1.0",
       "port-version": 0
     },
     "fastcgi": {
@@ -2382,19 +2586,19 @@
     },
     "fastfeat": {
       "baseline": "391d5e9",
-      "port-version": 2
+      "port-version": 4
     },
     "fastgltf": {
-      "baseline": "0.2.0",
-      "port-version": 0
+      "baseline": "0.6.1",
+      "port-version": 1
     },
     "fastio": {
-      "baseline": "2022-11-14",
+      "baseline": "2023-11-06",
       "port-version": 0
     },
     "fastlz": {
       "baseline": "2021-05-10",
-      "port-version": 0
+      "port-version": 2
     },
     "fastor": {
       "baseline": "2021-11-22",
@@ -2402,19 +2606,19 @@
     },
     "fastrtps": {
       "baseline": "2.7.0",
-      "port-version": 0
+      "port-version": 5
     },
     "fawdlstty-libfv": {
       "baseline": "0.0.8",
       "port-version": 0
     },
     "fbgemm": {
-      "baseline": "2021-03-18",
-      "port-version": 4
+      "baseline": "0.4.1",
+      "port-version": 0
     },
     "fbthrift": {
-      "baseline": "2022.03.21.00",
-      "port-version": 2
+      "baseline": "2024.01.01.00",
+      "port-version": 0
     },
     "fcl": {
       "baseline": "0.7.0",
@@ -2422,39 +2626,51 @@
     },
     "fdk-aac": {
       "baseline": "2.0.2",
-      "port-version": 1
+      "port-version": 2
     },
     "fdlibm": {
       "baseline": "5.3",
-      "port-version": 5
+      "port-version": 7
     },
     "ffmpeg": {
-      "baseline": "5.1.2",
-      "port-version": 5
+      "baseline": "6.1.1",
+      "port-version": 0
     },
     "ffnvcodec": {
-      "baseline": "11.1.5.0",
-      "port-version": 1
+      "baseline": "11.1.5.3",
+      "port-version": 0
     },
     "fftw3": {
       "baseline": "3.3.10",
-      "port-version": 5
+      "port-version": 8
     },
     "fftwpp": {
       "baseline": "2019-12-19",
       "port-version": 2
     },
+    "fineftp": {
+      "baseline": "1.3.4",
+      "port-version": 0
+    },
+    "fins": {
+      "baseline": "2023-07-31",
+      "port-version": 0
+    },
     "fixed-string": {
       "baseline": "0.1.1",
       "port-version": 0
     },
     "fizz": {
-      "baseline": "2022.10.31.00",
+      "baseline": "2024.01.01.00",
+      "port-version": 0
+    },
+    "flagpp": {
+      "baseline": "2.1",
       "port-version": 0
     },
     "flann": {
       "baseline": "2019-04-07",
-      "port-version": 6
+      "port-version": 7
     },
     "flash-runtime-extensions": {
       "baseline": "2.4",
@@ -2462,43 +2678,59 @@
     },
     "flashlight-cpu": {
       "baseline": "0.3",
-      "port-version": 3
+      "port-version": 5
     },
     "flashlight-cuda": {
       "baseline": "0.3",
-      "port-version": 4
+      "port-version": 6
+    },
+    "flashlight-sequence": {
+      "baseline": "0.0.1",
+      "port-version": 0
+    },
+    "flashlight-text": {
+      "baseline": "0.0.4",
+      "port-version": 0
     },
     "flat": {
       "baseline": "2022-08-30",
       "port-version": 0
     },
     "flatbuffers": {
-      "baseline": "23.3.3",
+      "baseline": "23.5.26",
+      "port-version": 1
+    },
+    "flatbush": {
+      "baseline": "1.2.0",
       "port-version": 0
     },
     "flecs": {
-      "baseline": "3.1.5",
+      "baseline": "3.2.11",
       "port-version": 0
     },
     "flint": {
-      "baseline": "2.8.0",
-      "port-version": 1
+      "baseline": "2.9.0",
+      "port-version": 0
     },
     "fltk": {
-      "baseline": "1.3.8",
-      "port-version": 5
+      "baseline": "1.3.9",
+      "port-version": 0
     },
     "fluidlite": {
-      "baseline": "2020-08-27",
-      "port-version": 3
+      "baseline": "2023-04-18",
+      "port-version": 0
     },
     "fluidsynth": {
-      "baseline": "2.3.1",
-      "port-version": 2
+      "baseline": "2.3.4",
+      "port-version": 0
+    },
+    "flux": {
+      "baseline": "2023-08-25",
+      "port-version": 0
     },
     "fmem": {
       "baseline": "c-libs-2ccee3d2fb",
-      "port-version": 1
+      "port-version": 3
     },
     "fmi4cpp": {
       "baseline": "0.8.0",
@@ -2506,26 +2738,26 @@
     },
     "fmilib": {
       "baseline": "2.4.1",
-      "port-version": 1
+      "port-version": 2
     },
     "fmt": {
-      "baseline": "9.1.0",
-      "port-version": 1
+      "baseline": "10.2.1",
+      "port-version": 0
     },
     "folly": {
-      "baseline": "2022.10.31.00",
-      "port-version": 4
+      "baseline": "2024.01.01.00",
+      "port-version": 0
     },
     "font-chef": {
       "baseline": "1.1.0",
       "port-version": 0
     },
     "font-util": {
-      "baseline": "1.3.2",
-      "port-version": 1
+      "baseline": "1.4.1",
+      "port-version": 0
     },
     "fontconfig": {
-      "baseline": "2.14.1",
+      "baseline": "2.14.2",
       "port-version": 1
     },
     "foonathan-lexy": {
@@ -2533,16 +2765,12 @@
       "port-version": 0
     },
     "foonathan-memory": {
-      "baseline": "2019-07-21",
-      "port-version": 2
-    },
-    "forest": {
-      "baseline": "12.1.0",
-      "port-version": 0
+      "baseline": "0.7.3",
+      "port-version": 1
     },
     "forge": {
       "baseline": "1.0.8",
-      "port-version": 1
+      "port-version": 3
     },
     "foxi": {
       "baseline": "2021-12-01",
@@ -2550,19 +2778,19 @@
     },
     "fp16": {
       "baseline": "2021-02-21",
-      "port-version": 0
+      "port-version": 2
     },
     "fplus": {
-      "baseline": "0.2.18-p0",
+      "baseline": "0.2.22",
       "port-version": 0
     },
     "freealut": {
       "baseline": "1.1.0",
-      "port-version": 3
+      "port-version": 4
     },
     "freeglut": {
       "baseline": "3.4.0",
-      "port-version": 0
+      "port-version": 1
     },
     "freeimage": {
       "baseline": "3.18.0",
@@ -2570,30 +2798,30 @@
     },
     "freeopcua": {
       "baseline": "20190125",
-      "port-version": 5
+      "port-version": 7
     },
     "freerdp": {
-      "baseline": "2.9.0",
-      "port-version": 0
+      "baseline": "3.0.0",
+      "port-version": 1
     },
     "freetds": {
       "baseline": "1.3.10",
-      "port-version": 1
+      "port-version": 2
     },
     "freetype": {
-      "baseline": "2.12.1",
-      "port-version": 3
+      "baseline": "2.13.2",
+      "port-version": 0
     },
     "freetype-gl": {
       "baseline": "2022-01-17",
-      "port-version": 1
+      "port-version": 3
     },
     "freexl": {
-      "baseline": "1.0.6",
-      "port-version": 1
+      "baseline": "2.0.0",
+      "port-version": 0
     },
     "fribidi": {
-      "baseline": "1.0.12",
+      "baseline": "1.0.13",
       "port-version": 0
     },
     "frozen": {
@@ -2601,11 +2829,11 @@
       "port-version": 0
     },
     "frugally-deep": {
-      "baseline": "0.15.19-p0",
+      "baseline": "0.15.30",
       "port-version": 0
     },
     "fruit": {
-      "baseline": "3.7.0",
+      "baseline": "3.7.1",
       "port-version": 0
     },
     "ftgl": {
@@ -2613,16 +2841,16 @@
       "port-version": 1
     },
     "ftxui": {
-      "baseline": "4.0.0",
+      "baseline": "5.0.0",
       "port-version": 0
     },
     "function2": {
-      "baseline": "4.2.2",
+      "baseline": "4.2.4",
       "port-version": 0
     },
     "functions-framework-cpp": {
-      "baseline": "1.1.0",
-      "port-version": 1
+      "baseline": "1.2.0",
+      "port-version": 0
     },
     "fuzzylite": {
       "baseline": "6.0",
@@ -2630,63 +2858,71 @@
     },
     "fxdiv": {
       "baseline": "2021-02-21",
-      "port-version": 0
+      "port-version": 2
     },
     "g2o": {
       "baseline": "2020-02-07",
-      "port-version": 2
+      "port-version": 4
     },
     "g3log": {
-      "baseline": "2.1",
-      "port-version": 0
+      "baseline": "2.3",
+      "port-version": 1
     },
     "gainput": {
       "baseline": "1.0.0",
       "port-version": 6
     },
     "gamedev-framework": {
-      "baseline": "1.0.0",
+      "baseline": "1.2.0",
       "port-version": 0
     },
     "gamenetworkingsockets": {
       "baseline": "1.4.1",
       "port-version": 1
     },
+    "games101-cgl": {
+      "baseline": "0.1.0",
+      "port-version": 0
+    },
     "gamma": {
       "baseline": "gamma-2018-01-27",
-      "port-version": 4
+      "port-version": 6
+    },
+    "gapp": {
+      "baseline": "0.2.0",
+      "port-version": 0
     },
     "gasol": {
       "baseline": "2018-01-04",
-      "port-version": 2
+      "port-version": 4
     },
     "gaussianlib": {
-      "baseline": "2019-08-04",
-      "port-version": 1
+      "baseline": "2023-02-17",
+      "port-version": 0
     },
     "gazebo": {
       "baseline": "2022-01-20",
-      "port-version": 4
+      "port-version": 5
     },
     "gcem": {
-      "baseline": "1.16.0",
+      "baseline": "1.17.0",
       "port-version": 0
     },
     "gdal": {
-      "baseline": "3.6.3",
+      "baseline": "3.8.3",
       "port-version": 0
     },
     "gdcm": {
-      "baseline": "3.0.12",
-      "port-version": 1
+      "baseline": "3.0.22",
+      "port-version": 0
     },
     "gdcm2": {
       "baseline": "deprecated",
       "port-version": 1
     },
     "gdk-pixbuf": {
-      "baseline": "2.42.9",
-      "port-version": 5
+      "baseline": "2.42.10",
+      "port-version": 2
     },
     "gemmlowp": {
       "baseline": "2021-09-28",
@@ -2694,50 +2930,54 @@
     },
     "genann": {
       "baseline": "2019-07-10",
-      "port-version": 1
+      "port-version": 3
     },
     "geogram": {
-      "baseline": "1.7.6",
-      "port-version": 4
+      "baseline": "1.8.3",
+      "port-version": 1
     },
     "geographiclib": {
-      "baseline": "2.2",
-      "port-version": 0
+      "baseline": "2.3",
+      "port-version": 1
     },
     "geos": {
-      "baseline": "3.11.1",
-      "port-version": 0
+      "baseline": "3.11.3",
+      "port-version": 1
     },
     "geotrans": {
       "baseline": "3.9",
-      "port-version": 0
+      "port-version": 1
     },
     "getdns": {
-      "baseline": "1.7.0",
-      "port-version": 3
+      "baseline": "1.7.3",
+      "port-version": 0
     },
     "getopt": {
       "baseline": "0",
-      "port-version": 2
+      "port-version": 3
     },
     "getopt-win32": {
-      "baseline": "0.1",
-      "port-version": 7
+      "baseline": "1.1.0.20220925",
+      "port-version": 0
     },
     "gettext": {
-      "baseline": "0.21.1",
-      "port-version": 0
+      "baseline": "0.22.4",
+      "port-version": 2
+    },
+    "gettext-libintl": {
+      "baseline": "0.22.4",
+      "port-version": 1
     },
     "gettimeofday": {
       "baseline": "2017-10-14",
-      "port-version": 4
+      "port-version": 6
     },
     "gflags": {
       "baseline": "2.2.2",
-      "port-version": 5
+      "port-version": 9
     },
     "ghc-filesystem": {
-      "baseline": "1.5.12",
+      "baseline": "1.5.14",
       "port-version": 0
     },
     "gherkin-c": {
@@ -2749,8 +2989,8 @@
       "port-version": 3
     },
     "ginkgo": {
-      "baseline": "1.4.0",
-      "port-version": 1
+      "baseline": "1.7.0",
+      "port-version": 0
     },
     "gklib": {
       "baseline": "2022-07-27",
@@ -2758,7 +2998,7 @@
     },
     "gl2ps": {
       "baseline": "1.4.2",
-      "port-version": 1
+      "port-version": 4
     },
     "gl3w": {
       "baseline": "2018-05-31",
@@ -2768,80 +3008,84 @@
       "baseline": "0.1.36",
       "port-version": 0
     },
+    "glaze": {
+      "baseline": "2.0.6",
+      "port-version": 0
+    },
     "glbinding": {
       "baseline": "3.1.0",
       "port-version": 4
     },
     "glew": {
       "baseline": "2.2.0",
-      "port-version": 0
+      "port-version": 3
     },
     "glfw3": {
-      "baseline": "3.3.8",
-      "port-version": 2
+      "baseline": "3.3.9",
+      "port-version": 0
     },
     "gli": {
       "baseline": "2021-07-06",
-      "port-version": 0
+      "port-version": 2
     },
     "glib": {
-      "baseline": "2.75.3",
+      "baseline": "2.78.4",
       "port-version": 0
     },
     "glibmm": {
-      "baseline": "2.74.0",
-      "port-version": 0
+      "baseline": "2.76.0",
+      "port-version": 1
     },
     "glm": {
-      "baseline": "0.9.9.8",
-      "port-version": 2
+      "baseline": "1.0.0",
+      "port-version": 0
     },
     "globjects": {
       "baseline": "1.1.0",
-      "port-version": 4
+      "port-version": 6
     },
     "glog": {
       "baseline": "0.6.0",
-      "port-version": 2
+      "port-version": 3
     },
     "gloo": {
       "baseline": "20201203",
-      "port-version": 0
+      "port-version": 2
     },
     "glpk": {
       "baseline": "5.0",
-      "port-version": 1
+      "port-version": 3
     },
     "glslang": {
-      "baseline": "11.13.0",
-      "port-version": 0
+      "baseline": "13.1.1",
+      "port-version": 1
     },
     "glui": {
       "baseline": "2019-11-30",
-      "port-version": 1
+      "port-version": 4
     },
     "gmime": {
       "baseline": "3.2.6",
-      "port-version": 3
+      "port-version": 6
     },
     "gmmlib": {
-      "baseline": "21.3.2",
-      "port-version": 1
+      "baseline": "22.3.17",
+      "port-version": 0
     },
     "gmp": {
       "baseline": "6.2.1",
-      "port-version": 17
+      "port-version": 21
     },
     "gmsh": {
-      "baseline": "4.9.0",
+      "baseline": "4.11.1",
       "port-version": 0
     },
     "gobject-introspection": {
       "baseline": "1.72.0",
-      "port-version": 1
+      "port-version": 7
     },
     "google-cloud-cpp": {
-      "baseline": "2.8.0",
+      "baseline": "2.21.0",
       "port-version": 0
     },
     "google-cloud-cpp-common": {
@@ -2858,14 +3102,14 @@
     },
     "gperf": {
       "baseline": "3.1",
-      "port-version": 4
+      "port-version": 6
     },
     "gperftools": {
-      "baseline": "2019-09-02",
-      "port-version": 3
+      "baseline": "2.10",
+      "port-version": 1
     },
     "gpgme": {
-      "baseline": "1.18.0",
+      "baseline": "1.22.0",
       "port-version": 0
     },
     "gpgmm": {
@@ -2874,31 +3118,31 @@
     },
     "gppanel": {
       "baseline": "2020-05-20",
-      "port-version": 2
+      "port-version": 4
     },
     "grantlee": {
       "baseline": "5.3.1",
-      "port-version": 0
+      "port-version": 2
     },
     "graphene": {
       "baseline": "1.10.8",
-      "port-version": 1
+      "port-version": 2
     },
     "graphicsmagick": {
-      "baseline": "1.3.37",
-      "port-version": 1
+      "baseline": "1.3.41",
+      "port-version": 0
     },
     "graphite2": {
       "baseline": "1.3.14",
-      "port-version": 3
+      "port-version": 4
     },
     "graphqlparser": {
       "baseline": "0.7.0",
       "port-version": 4
     },
     "graphviz": {
-      "baseline": "7.0.0",
-      "port-version": 1
+      "baseline": "9.0.0",
+      "port-version": 2
     },
     "greatest": {
       "baseline": "1.5.0",
@@ -2906,7 +3150,7 @@
     },
     "grpc": {
       "baseline": "1.51.1",
-      "port-version": 0
+      "port-version": 1
     },
     "grppi": {
       "baseline": "0.4.0",
@@ -2914,47 +3158,51 @@
     },
     "gsl": {
       "baseline": "2.7.1",
-      "port-version": 1
+      "port-version": 3
     },
     "gsl-lite": {
-      "baseline": "0.40.0",
+      "baseline": "0.41.0",
       "port-version": 0
     },
     "gsoap": {
       "baseline": "2.8.112",
-      "port-version": 1
+      "port-version": 2
     },
     "gst-rtsp-server": {
       "baseline": "1.20.5",
-      "port-version": 0
+      "port-version": 2
     },
     "gstreamer": {
-      "baseline": "1.20.5",
-      "port-version": 2
+      "baseline": "1.22.5",
+      "port-version": 7
     },
     "gtest": {
-      "baseline": "1.13.0",
+      "baseline": "1.14.0",
       "port-version": 0
     },
     "gtk": {
-      "baseline": "4.6.8",
+      "baseline": "4.10.5",
       "port-version": 1
     },
     "gtk3": {
-      "baseline": "3.24.34",
-      "port-version": 2
+      "baseline": "3.24.38",
+      "port-version": 1
     },
     "gtkmm": {
-      "baseline": "4.6.0",
-      "port-version": 0
+      "baseline": "4.10.0",
+      "port-version": 1
     },
     "gtl": {
-      "baseline": "1.1.5",
+      "baseline": "1.1.8",
       "port-version": 0
     },
     "gts": {
       "baseline": "0.7.6",
-      "port-version": 7
+      "port-version": 8
+    },
+    "gtsam": {
+      "baseline": "4.2a9",
+      "port-version": 1
     },
     "guetzli": {
       "baseline": "2020-09-14",
@@ -2969,16 +3217,68 @@
       "port-version": 0
     },
     "gul14": {
-      "baseline": "2.7.1",
+      "baseline": "2.10.0",
       "port-version": 0
     },
     "gumbo": {
       "baseline": "0.10.1",
       "port-version": 6
     },
+    "gz-cmake3": {
+      "baseline": "3.4.1",
+      "port-version": 5
+    },
+    "gz-common5": {
+      "baseline": "5.4.1",
+      "port-version": 1
+    },
+    "gz-fuel-tools8": {
+      "baseline": "8.1.0",
+      "port-version": 0
+    },
+    "gz-gui7": {
+      "baseline": "7.2.1",
+      "port-version": 0
+    },
+    "gz-math7": {
+      "baseline": "7.3.0",
+      "port-version": 0
+    },
+    "gz-msgs9": {
+      "baseline": "9.5.0",
+      "port-version": 0
+    },
+    "gz-physics6": {
+      "baseline": "6.5.1",
+      "port-version": 1
+    },
+    "gz-plugin2": {
+      "baseline": "2.0.1",
+      "port-version": 0
+    },
+    "gz-rendering7": {
+      "baseline": "7.4.1",
+      "port-version": 1
+    },
+    "gz-sensors7": {
+      "baseline": "7.3.0",
+      "port-version": 0
+    },
+    "gz-tools2": {
+      "baseline": "2.0.0",
+      "port-version": 1
+    },
+    "gz-transport12": {
+      "baseline": "12.2.0",
+      "port-version": 0
+    },
+    "gz-utils2": {
+      "baseline": "2.0.0",
+      "port-version": 0
+    },
     "gzip-hpp": {
       "baseline": "0.1.0",
-      "port-version": 1
+      "port-version": 2
     },
     "h3": {
       "baseline": "4.1.0",
@@ -2986,10 +3286,10 @@
     },
     "h5py-lzf": {
       "baseline": "2019-12-04",
-      "port-version": 1
+      "port-version": 3
     },
     "halide": {
-      "baseline": "14.0.0",
+      "baseline": "16.0.0",
       "port-version": 1
     },
     "happly": {
@@ -2998,11 +3298,11 @@
     },
     "hareflow": {
       "baseline": "0.1.0",
-      "port-version": 0
+      "port-version": 1
     },
     "harfbuzz": {
-      "baseline": "7.0.0",
-      "port-version": 0
+      "baseline": "8.3.0",
+      "port-version": 3
     },
     "hash-library": {
       "baseline": "8",
@@ -3014,30 +3314,34 @@
     },
     "hayai": {
       "baseline": "2019-08-10",
-      "port-version": 1
+      "port-version": 3
     },
     "hazelcast-cpp-client": {
-      "baseline": "5.2.0",
+      "baseline": "5.3.0",
       "port-version": 0
     },
     "hdf5": {
-      "baseline": "1.14.0",
+      "baseline": "1.14.2",
       "port-version": 0
     },
     "healpix": {
       "baseline": "1.12.10",
-      "port-version": 8
+      "port-version": 9
     },
     "hedley": {
       "baseline": "15",
       "port-version": 0
     },
+    "hello-imgui": {
+      "baseline": "1.4.2",
+      "port-version": 0
+    },
     "hexl": {
       "baseline": "1.2.4",
       "port-version": 0
     },
     "hffix": {
-      "baseline": "1.2.1",
+      "baseline": "1.3.0",
       "port-version": 0
     },
     "hfsm2": {
@@ -3045,27 +3349,31 @@
       "port-version": 0
     },
     "hidapi": {
-      "baseline": "0.13.1",
+      "baseline": "0.14.0",
       "port-version": 0
     },
     "highfive": {
-      "baseline": "2.6.2",
-      "port-version": 2
+      "baseline": "2.9.0",
+      "port-version": 0
+    },
+    "highs": {
+      "baseline": "1.6.0",
+      "port-version": 1
     },
     "highway": {
-      "baseline": "1.0.3",
+      "baseline": "1.0.7",
       "port-version": 0
     },
     "hikogui": {
-      "baseline": "0.7.0",
-      "port-version": 0
+      "baseline": "0.8.1",
+      "port-version": 2
     },
     "hiredis": {
-      "baseline": "1.0.2",
-      "port-version": 4
+      "baseline": "1.2.0",
+      "port-version": 0
     },
     "hnswlib": {
-      "baseline": "0.7.0",
+      "baseline": "0.8.0",
       "port-version": 0
     },
     "hps": {
@@ -3073,27 +3381,27 @@
       "port-version": 0
     },
     "hpx": {
-      "baseline": "1.8.0",
-      "port-version": 2
+      "baseline": "1.9.1",
+      "port-version": 0
     },
     "http-parser": {
       "baseline": "2.9.4",
-      "port-version": 1
+      "port-version": 3
     },
     "hungarian": {
-      "baseline": "v0.1.3",
-      "port-version": 1
+      "baseline": "0.1.3",
+      "port-version": 3
     },
     "hunspell": {
-      "baseline": "1.7.1",
-      "port-version": 2
+      "baseline": "1.7.2",
+      "port-version": 0
     },
     "hwloc": {
-      "baseline": "2.9.0",
+      "baseline": "2.10.0",
       "port-version": 0
     },
     "hyperscan": {
-      "baseline": "5.4.0",
+      "baseline": "5.4.2",
       "port-version": 0
     },
     "hypodermic": {
@@ -3101,32 +3409,36 @@
       "port-version": 0
     },
     "hypre": {
-      "baseline": "2.23.0",
-      "port-version": 0
+      "baseline": "2.29.0",
+      "port-version": 1
     },
     "iceoryx": {
       "baseline": "2.0.3",
       "port-version": 0
     },
     "icu": {
-      "baseline": "72.1",
-      "port-version": 3
+      "baseline": "74.1",
+      "port-version": 1
     },
     "ideviceinstaller": {
-      "baseline": "1.1.2.23",
-      "port-version": 5
+      "baseline": "2023-07-21",
+      "port-version": 0
     },
     "idevicerestore": {
-      "baseline": "1.0.12",
-      "port-version": 7
+      "baseline": "2023-05-23",
+      "port-version": 0
+    },
+    "idyntree": {
+      "baseline": "10.0.0",
+      "port-version": 0
     },
     "if97": {
       "baseline": "2.1.3",
-      "port-version": 0
+      "port-version": 1
     },
     "igloo": {
       "baseline": "1.1.1",
-      "port-version": 1
+      "port-version": 2
     },
     "ignition-cmake0": {
       "baseline": "0.6.2",
@@ -3134,14 +3446,14 @@
     },
     "ignition-cmake2": {
       "baseline": "2.16.0",
-      "port-version": 1
+      "port-version": 2
     },
     "ignition-common1": {
       "baseline": "1.1.1",
-      "port-version": 3
+      "port-version": 4
     },
     "ignition-common3": {
-      "baseline": "3.14.1",
+      "baseline": "3.16.0",
       "port-version": 0
     },
     "ignition-fuel-tools1": {
@@ -3157,12 +3469,12 @@
       "port-version": 3
     },
     "ignition-math6": {
-      "baseline": "6.9.2",
-      "port-version": 1
+      "baseline": "6.14.0",
+      "port-version": 0
     },
     "ignition-modularscripts": {
-      "baseline": "2022-05-11",
-      "port-version": 1
+      "baseline": "2023-05-05",
+      "port-version": 0
     },
     "ignition-msgs1": {
       "baseline": "1.0.0",
@@ -3177,12 +3489,12 @@
       "port-version": 5
     },
     "ignition-plugin1": {
-      "baseline": "1.1.0",
-      "port-version": 2
+      "baseline": "1.4.0",
+      "port-version": 0
     },
     "ignition-tools": {
       "baseline": "1.5.0",
-      "port-version": 0
+      "port-version": 1
     },
     "ignition-transport4": {
       "baseline": "4.0.0",
@@ -3197,20 +3509,20 @@
       "port-version": 4
     },
     "ignition-utils1": {
-      "baseline": "1.4.0",
+      "baseline": "1.5.1",
       "port-version": 0
     },
     "igraph": {
-      "baseline": "0.10.4",
+      "baseline": "0.10.9",
       "port-version": 0
     },
     "iir1": {
-      "baseline": "1.9.1",
+      "baseline": "1.9.4",
       "port-version": 0
     },
     "ijg-libjpeg": {
       "baseline": "9e",
-      "port-version": 0
+      "port-version": 1
     },
     "ilmbase": {
       "baseline": "3",
@@ -3221,52 +3533,60 @@
       "port-version": 0
     },
     "imageinfo": {
-      "baseline": "2023-01-31",
+      "baseline": "2024-01-19",
       "port-version": 0
     },
     "imath": {
-      "baseline": "3.1.5",
-      "port-version": 0
+      "baseline": "3.1.9",
+      "port-version": 1
     },
     "imgui": {
-      "baseline": "1.89.4",
+      "baseline": "1.90",
+      "port-version": 4
+    },
+    "imgui-node-editor": {
+      "baseline": "0.9.3",
       "port-version": 0
     },
     "imgui-sfml": {
-      "baseline": "2.5",
-      "port-version": 3
+      "baseline": "2.6",
+      "port-version": 0
     },
     "imguizmo": {
       "baseline": "1.83",
       "port-version": 1
     },
     "immer": {
-      "baseline": "0.8.0",
-      "port-version": 1
+      "baseline": "0.8.1",
+      "port-version": 0
     },
     "implot": {
-      "baseline": "0.14",
-      "port-version": 1
+      "baseline": "0.16",
+      "port-version": 0
     },
     "indicators": {
-      "baseline": "2.2",
+      "baseline": "2.3",
       "port-version": 0
     },
-    "influxdb-cxx": {
-      "baseline": "2022-09-02",
+    "indirect-value": {
+      "baseline": "2023-06-01",
       "port-version": 0
     },
-    "infoware": {
-      "baseline": "2021-06-16",
+    "influxdb-cxx": {
+      "baseline": "0.7.1",
       "port-version": 1
     },
+    "infoware": {
+      "baseline": "2023-04-12",
+      "port-version": 0
+    },
     "inih": {
-      "baseline": "56",
+      "baseline": "57",
       "port-version": 0
     },
     "iniparser": {
       "baseline": "2020-04-06",
-      "port-version": 3
+      "port-version": 5
     },
     "inipp": {
       "baseline": "1.0.12",
@@ -3282,46 +3602,54 @@
     },
     "intel-mkl": {
       "baseline": "2023.0.0",
-      "port-version": 0
+      "port-version": 3
     },
     "intelrdfpmathlib": {
       "baseline": "20U2",
-      "port-version": 4
+      "port-version": 6
     },
     "io2d": {
       "baseline": "2020-09-14",
-      "port-version": 3
+      "port-version": 5
     },
     "irrlicht": {
-      "baseline": "1.8.4",
-      "port-version": 13
+      "baseline": "1.8.5",
+      "port-version": 0
     },
     "irrxml": {
       "baseline": "0",
-      "port-version": 0
+      "port-version": 1
     },
     "isal": {
       "baseline": "2.30.0",
       "port-version": 0
     },
     "ismrmrd": {
-      "baseline": "1.13.2",
+      "baseline": "1.13.7",
+      "port-version": 0
+    },
+    "itay-grudev-singleapplication": {
+      "baseline": "3.5.1",
       "port-version": 0
     },
     "itk": {
-      "baseline": "5.2.1",
-      "port-version": 5
+      "baseline": "5.3rc02",
+      "port-version": 0
     },
     "itpp": {
       "baseline": "4.3.1",
-      "port-version": 8
+      "port-version": 10
     },
-    "ixwebsocket": {
-      "baseline": "11.4.3",
+    "itsy-bitsy": {
+      "baseline": "2022-08-02",
       "port-version": 0
     },
+    "ixwebsocket": {
+      "baseline": "11.4.4",
+      "port-version": 2
+    },
     "jack2": {
-      "baseline": "1.9.21",
+      "baseline": "1.9.22",
       "port-version": 0
     },
     "jaeger-client-cpp": {
@@ -3333,72 +3661,92 @@
       "port-version": 1
     },
     "jasper": {
-      "baseline": "4.0.0",
+      "baseline": "4.1.0",
       "port-version": 1
     },
     "jbig2dec": {
-      "baseline": "0.19",
-      "port-version": 1
+      "baseline": "0.20",
+      "port-version": 0
     },
     "jbigkit": {
       "baseline": "2.1",
-      "port-version": 5
+      "port-version": 7
     },
     "jemalloc": {
       "baseline": "5.3.0",
       "port-version": 1
     },
+    "jhasse-poly2tri": {
+      "baseline": "2023-12-27",
+      "port-version": 0
+    },
     "jinja2cpplight": {
       "baseline": "2018-05-08",
+      "port-version": 3
+    },
+    "jkqtplotter": {
+      "baseline": "2023-10-24",
       "port-version": 1
     },
     "joltphysics": {
-      "baseline": "2.0.1",
-      "port-version": 2
+      "baseline": "4.0.0",
+      "port-version": 0
     },
     "josuttis-jthread": {
       "baseline": "2020-07-21",
-      "port-version": 2
+      "port-version": 3
     },
     "jsmn": {
       "baseline": "2019-04-27",
-      "port-version": 1
+      "port-version": 2
     },
     "json-c": {
-      "baseline": "2022-06-26",
-      "port-version": 2
+      "baseline": "2023-08-12",
+      "port-version": 0
     },
     "json-dto": {
+      "baseline": "0.3.3",
+      "port-version": 0
+    },
+    "json-rpc-cxx": {
       "baseline": "0.3.1",
       "port-version": 0
     },
     "json-schema-validator": {
-      "baseline": "2.2.0",
-      "port-version": 0
+      "baseline": "2.3.0",
+      "port-version": 1
     },
     "json-spirit": {
       "baseline": "4.1.0",
-      "port-version": 2
+      "port-version": 4
     },
     "json11": {
       "baseline": "2017-06-20",
-      "port-version": 4
+      "port-version": 6
     },
     "json5-parser": {
       "baseline": "1.0.0",
-      "port-version": 3
+      "port-version": 6
     },
     "jsoncons": {
-      "baseline": "0.170.0",
+      "baseline": "0.173.4",
       "port-version": 0
     },
     "jsoncpp": {
       "baseline": "1.9.5",
+      "port-version": 2
+    },
+    "jsonifier": {
+      "baseline": "0.9.94",
       "port-version": 0
     },
     "jsonnet": {
-      "baseline": "0.18.0",
-      "port-version": 1
+      "baseline": "0.20.0",
+      "port-version": 0
+    },
+    "juce": {
+      "baseline": "7.0.9",
+      "port-version": 0
     },
     "jwt-cpp": {
       "baseline": "0.6.0",
@@ -3409,8 +3757,8 @@
       "port-version": 6
     },
     "kaitai-struct-cpp-stl-runtime": {
-      "baseline": "0.10",
-      "port-version": 0
+      "baseline": "0.10.1",
+      "port-version": 1
     },
     "kangaru": {
       "baseline": "4.3.1",
@@ -3421,36 +3769,48 @@
       "port-version": 0
     },
     "kd-soap": {
-      "baseline": "1.9.0",
+      "baseline": "2.1.1",
       "port-version": 1
     },
     "kdalgorithms": {
-      "baseline": "2023-02-11",
+      "baseline": "1.2",
       "port-version": 0
     },
     "kdbindings": {
-      "baseline": "1.0.0",
+      "baseline": "1.0.3",
       "port-version": 0
     },
     "kddockwidgets": {
-      "baseline": "1.5.0",
+      "baseline": "2.0.0",
+      "port-version": 0
+    },
+    "kdsoap": {
+      "baseline": "2.2.0",
       "port-version": 0
     },
     "kealib": {
-      "baseline": "1.4.14",
+      "baseline": "1.5.3",
+      "port-version": 0
+    },
+    "keccak-tiny": {
+      "baseline": "2014-09-08",
       "port-version": 0
     },
     "kenlm": {
-      "baseline": "20200924",
+      "baseline": "20230531",
       "port-version": 1
     },
+    "kerbal": {
+      "baseline": "2023.12.1",
+      "port-version": 0
+    },
     "keystone": {
       "baseline": "0.9.2",
-      "port-version": 2
+      "port-version": 3
     },
     "kf5archive": {
       "baseline": "5.98.0",
-      "port-version": 0
+      "port-version": 1
     },
     "kf5attica": {
       "baseline": "5.98.0",
@@ -3514,7 +3874,7 @@
     },
     "kf5i18n": {
       "baseline": "5.98.0",
-      "port-version": 0
+      "port-version": 1
     },
     "kf5iconthemes": {
       "baseline": "5.98.0",
@@ -3552,17 +3912,21 @@
       "baseline": "5.98.0",
       "port-version": 0
     },
+    "kf5parts": {
+      "baseline": "5.98.0",
+      "port-version": 1
+    },
     "kf5plotting": {
       "baseline": "5.98.0",
       "port-version": 0
     },
     "kf5service": {
       "baseline": "5.98.0",
-      "port-version": 0
+      "port-version": 1
     },
     "kf5solid": {
       "baseline": "5.98.0",
-      "port-version": 1
+      "port-version": 3
     },
     "kf5sonnet": {
       "baseline": "5.98.0",
@@ -3572,6 +3936,10 @@
       "baseline": "5.98.0",
       "port-version": 0
     },
+    "kf5texteditor": {
+      "baseline": "5.98.0",
+      "port-version": 0
+    },
     "kf5textwidgets": {
       "baseline": "5.98.0",
       "port-version": 0
@@ -3594,22 +3962,22 @@
     },
     "kfr": {
       "baseline": "5.0.1",
-      "port-version": 0
+      "port-version": 1
     },
     "kinectsdk1": {
       "baseline": "1.8",
-      "port-version": 7
+      "port-version": 8
     },
     "kinectsdk2": {
       "baseline": "2.0",
-      "port-version": 6
+      "port-version": 7
     },
     "kissfft": {
-      "baseline": "2021-11-14",
+      "baseline": "131.1.0",
       "port-version": 0
     },
     "kissnet": {
-      "baseline": "2022-10-18",
+      "baseline": "2023-02-04",
       "port-version": 0
     },
     "klein": {
@@ -3621,15 +3989,15 @@
       "port-version": 1
     },
     "krabsetw": {
-      "baseline": "4.1.18",
-      "port-version": 1
+      "baseline": "4.3.2",
+      "port-version": 0
     },
     "ktx": {
-      "baseline": "4.1.0-rc3",
+      "baseline": "4.3.0-beta1",
       "port-version": 1
     },
     "kubazip": {
-      "baseline": "0.2.4",
+      "baseline": "0.2.6",
       "port-version": 0
     },
     "kubernetes": {
@@ -3637,28 +4005,28 @@
       "port-version": 1
     },
     "kuku": {
-      "baseline": "2.1",
-      "port-version": 1
+      "baseline": "2.1.0",
+      "port-version": 0
     },
     "kvasir-mpl": {
       "baseline": "2019-08-06",
-      "port-version": 1
+      "port-version": 3
     },
     "kwsys": {
       "baseline": "2021-08-06",
       "port-version": 1
     },
     "lager": {
-      "baseline": "2022-02-21",
+      "baseline": "2023-03-19",
       "port-version": 0
     },
     "lapack": {
       "baseline": "2022-02-22",
-      "port-version": 0
+      "port-version": 2
     },
     "lapack-reference": {
       "baseline": "3.11.0",
-      "port-version": 1
+      "port-version": 2
     },
     "lastools": {
       "baseline": "2.0.2+20230206",
@@ -3670,15 +4038,15 @@
     },
     "launch-darkly-server": {
       "baseline": "2.8.6",
-      "port-version": 0
+      "port-version": 2
     },
     "lazy-importer": {
-      "baseline": "2022-02-09",
+      "baseline": "2023-08-03",
       "port-version": 0
     },
     "lcm": {
       "baseline": "1.4.0",
-      "port-version": 5
+      "port-version": 6
     },
     "lcms": {
       "baseline": "2.14",
@@ -3686,16 +4054,20 @@
     },
     "leaf": {
       "baseline": "0.2.2",
-      "port-version": 1
+      "port-version": 2
     },
     "lemon": {
       "baseline": "0",
-      "port-version": 1
+      "port-version": 2
     },
     "lemon-parser-generator": {
       "baseline": "3.39.3",
       "port-version": 0
     },
+    "lensfun": {
+      "baseline": "0.3.4",
+      "port-version": 2
+    },
     "leptonica": {
       "baseline": "1.83.1",
       "port-version": 0
@@ -3706,58 +4078,70 @@
     },
     "lest": {
       "baseline": "1.35.1",
-      "port-version": 2
+      "port-version": 3
     },
     "leveldb": {
-      "baseline": "1.22",
-      "port-version": 6
+      "baseline": "1.23",
+      "port-version": 0
     },
     "levmar": {
       "baseline": "2.6",
-      "port-version": 1
+      "port-version": 3
+    },
+    "lexbor": {
+      "baseline": "2.3.0",
+      "port-version": 0
     },
     "libaaplus": {
       "baseline": "2.36",
-      "port-version": 0
+      "port-version": 1
     },
     "libadlmidi": {
       "baseline": "1.5.1",
-      "port-version": 0
+      "port-version": 1
     },
     "libadwaita": {
-      "baseline": "1.2.0",
+      "baseline": "1.3.2",
+      "port-version": 1
+    },
+    "libaes-siv": {
+      "baseline": "2020-10-15",
       "port-version": 0
     },
     "libaiff": {
       "baseline": "5.0",
-      "port-version": 7
+      "port-version": 9
     },
     "libalkimia": {
-      "baseline": "8.1.70",
-      "port-version": 1
+      "baseline": "8.1.72",
+      "port-version": 0
     },
     "libao": {
       "baseline": "1.2.2",
-      "port-version": 4
+      "port-version": 5
     },
     "libarchive": {
       "baseline": "3.6.2",
       "port-version": 0
     },
     "libass": {
-      "baseline": "0.16.0",
+      "baseline": "0.17.1",
+      "port-version": 0
+    },
+    "libassert": {
+      "baseline": "1.2.2",
       "port-version": 0
     },
     "libassuan": {
-      "baseline": "2.5.5",
+      "baseline": "2.5.6",
       "port-version": 0
     },
     "libatomic-ops": {
-      "baseline": "7.7.0",
-      "port-version": 1
+      "baseline": "7.8.2",
+      "port-version": 0
     },
     "libavif": {
-      "baseline": "0.11.1",
+      "baseline": "1.0.3",
       "port-version": 0
     },
     "libb2": {
@@ -3765,47 +4149,55 @@
       "port-version": 6
     },
     "libbacktrace": {
-      "baseline": "2021-03-14",
-      "port-version": 1
+      "baseline": "2023-11-30",
+      "port-version": 0
     },
     "libbf": {
       "baseline": "1.0.0",
-      "port-version": 3
+      "port-version": 4
     },
     "libbson": {
-      "baseline": "1.22.2",
+      "baseline": "1.25.4",
       "port-version": 0
     },
     "libcaer": {
-      "baseline": "2022-07-25",
-      "port-version": 3
+      "baseline": "3.3.15",
+      "port-version": 1
     },
     "libcanberra": {
       "baseline": "0.30",
       "port-version": 4
     },
+    "libcap": {
+      "baseline": "2.69",
+      "port-version": 3
+    },
     "libcbor": {
       "baseline": "0.10.2",
       "port-version": 0
     },
     "libcds": {
       "baseline": "2.3.3",
-      "port-version": 2
+      "port-version": 4
     },
     "libcerf": {
       "baseline": "1.13",
-      "port-version": 3
+      "port-version": 4
     },
     "libconfig": {
       "baseline": "1.7.3",
-      "port-version": 1
+      "port-version": 5
     },
     "libconfuse": {
       "baseline": "2019-07-14",
-      "port-version": 3
+      "port-version": 4
     },
     "libcopp": {
-      "baseline": "2.1.2",
+      "baseline": "2.2.0",
+      "port-version": 0
+    },
+    "libcoro": {
+      "baseline": "0.10",
       "port-version": 0
     },
     "libcorrect": {
@@ -3822,11 +4214,11 @@
     },
     "libcroco": {
       "baseline": "0.6.13",
-      "port-version": 4
+      "port-version": 6
     },
     "libcsv": {
       "baseline": "3.0.3",
-      "port-version": 0
+      "port-version": 1
     },
     "libcuckoo": {
       "baseline": "0.3.1",
@@ -3837,8 +4229,8 @@
       "port-version": 0
     },
     "libdatachannel": {
-      "baseline": "0.18.2",
-      "port-version": 0
+      "baseline": "0.19.5",
+      "port-version": 2
     },
     "libdatrie": {
       "baseline": "0.2.13",
@@ -3849,23 +4241,23 @@
       "port-version": 1
     },
     "libde265": {
-      "baseline": "1.0.8",
-      "port-version": 7
+      "baseline": "1.0.15",
+      "port-version": 0
     },
     "libdeflate": {
-      "baseline": "1.17",
-      "port-version": 0
+      "baseline": "1.19",
+      "port-version": 1
     },
     "libdisasm": {
       "baseline": "0.23",
-      "port-version": 9
+      "port-version": 11
     },
     "libdivide": {
       "baseline": "5.0",
       "port-version": 1
     },
     "libdjinterop": {
-      "baseline": "0.16.0",
+      "baseline": "0.20.1",
       "port-version": 0
     },
     "libdmx": {
@@ -3876,52 +4268,68 @@
       "baseline": "0.6.0",
       "port-version": 3
     },
+    "libdwarf": {
+      "baseline": "0.9.1",
+      "port-version": 0
+    },
     "libe57": {
       "baseline": "1.1.332",
-      "port-version": 3
+      "port-version": 4
     },
     "libe57format": {
-      "baseline": "3.0.0",
+      "baseline": "3.1.1",
       "port-version": 0
     },
     "libebur128": {
       "baseline": "1.2.6",
-      "port-version": 1
+      "port-version": 2
     },
     "libenvpp": {
-      "baseline": "1.0.0",
+      "baseline": "1.4.0",
       "port-version": 0
     },
     "libepoxy": {
       "baseline": "1.5.10",
-      "port-version": 1
+      "port-version": 2
+    },
+    "libev": {
+      "baseline": "4.33",
+      "port-version": 2
     },
     "libevent": {
       "baseline": "2.1.12+20230128",
       "port-version": 0
     },
+    "libeventheader-decode": {
+      "baseline": "1.3.0",
+      "port-version": 0
+    },
+    "libeventheader-tracepoint": {
+      "baseline": "1.3.0",
+      "port-version": 0
+    },
     "libevhtp": {
       "baseline": "1.2.18",
-      "port-version": 4
+      "port-version": 5
     },
     "libexif": {
       "baseline": "0.6.24",
-      "port-version": 0
+      "port-version": 2
     },
     "libfabric": {
       "baseline": "1.13.2",
-      "port-version": 1
+      "port-version": 2
     },
     "libffi": {
       "baseline": "3.4.4",
-      "port-version": 1
+      "port-version": 6
     },
     "libfido2": {
       "baseline": "1.13.0",
       "port-version": 0
     },
     "libflac": {
-      "baseline": "1.4.2",
+      "baseline": "1.4.3",
       "port-version": 0
     },
     "libfontenc": {
@@ -3933,8 +4341,8 @@
       "port-version": 1
     },
     "libfreenect2": {
-      "baseline": "0.2.0",
-      "port-version": 9
+      "baseline": "0.2.1",
+      "port-version": 1
     },
     "libfs": {
       "baseline": "1.0.8",
@@ -3942,15 +4350,15 @@
     },
     "libftdi": {
       "baseline": "0.20",
-      "port-version": 4
+      "port-version": 5
     },
     "libftdi1": {
       "baseline": "1.5",
-      "port-version": 3
+      "port-version": 4
     },
     "libgcrypt": {
-      "baseline": "1.10.1",
-      "port-version": 1
+      "baseline": "1.10.2",
+      "port-version": 0
     },
     "libgd": {
       "baseline": "2.3.3",
@@ -3958,27 +4366,35 @@
     },
     "libgeotiff": {
       "baseline": "1.7.1",
-      "port-version": 2
+      "port-version": 3
+    },
+    "libgig": {
+      "baseline": "4.3.0",
+      "port-version": 0
     },
     "libgit2": {
-      "baseline": "1.4.2",
+      "baseline": "1.6.4",
+      "port-version": 1
+    },
+    "libgme": {
+      "baseline": "0.6.3",
       "port-version": 0
     },
     "libgnutls": {
-      "baseline": "3.7.8",
-      "port-version": 0
+      "baseline": "3.8.1",
+      "port-version": 1
     },
     "libgo": {
       "baseline": "3.1",
       "port-version": 5
     },
     "libgpg-error": {
-      "baseline": "1.46",
+      "baseline": "1.47",
       "port-version": 0
     },
     "libgpiod": {
-      "baseline": "1.6.3",
-      "port-version": 2
+      "baseline": "2.1",
+      "port-version": 0
     },
     "libgpod": {
       "baseline": "2019-08-29",
@@ -3986,47 +4402,47 @@
     },
     "libgta": {
       "baseline": "1.0.8",
-      "port-version": 4
+      "port-version": 5
     },
     "libguarded": {
-      "baseline": "2019-08-27",
-      "port-version": 2
+      "baseline": "1.4.1",
+      "port-version": 0
     },
     "libgwenhywfar": {
       "baseline": "5.6.0",
-      "port-version": 2
+      "port-version": 5
     },
     "libgxps": {
       "baseline": "0.3.2",
-      "port-version": 1
+      "port-version": 2
     },
     "libharu": {
-      "baseline": "2.4.3",
+      "baseline": "2.4.4",
       "port-version": 0
     },
     "libhdfs3": {
       "baseline": "2019-11-05",
-      "port-version": 4
+      "port-version": 5
     },
     "libheif": {
-      "baseline": "1.15.1",
+      "baseline": "1.17.6",
       "port-version": 0
     },
     "libhsplasma": {
-      "baseline": "2022-05-19",
+      "baseline": "2023-05-08",
       "port-version": 0
     },
     "libhv": {
-      "baseline": "1.3.0",
-      "port-version": 1
+      "baseline": "1.3.2",
+      "port-version": 0
     },
     "libhydrogen": {
       "baseline": "2022-06-21",
       "port-version": 0
     },
     "libical": {
-      "baseline": "3.0.16",
-      "port-version": 1
+      "baseline": "3.0.17",
+      "port-version": 0
     },
     "libice": {
       "baseline": "1.0.10",
@@ -4034,71 +4450,75 @@
     },
     "libiconv": {
       "baseline": "1.17",
-      "port-version": 1
+      "port-version": 2
     },
     "libics": {
-      "baseline": "1.6.5",
+      "baseline": "1.6.6",
       "port-version": 0
     },
     "libideviceactivation": {
-      "baseline": "1.3.17",
-      "port-version": 0
+      "baseline": "2023-05-01",
+      "port-version": 1
     },
     "libidn2": {
       "baseline": "2.3.4",
-      "port-version": 2
+      "port-version": 3
     },
     "libigl": {
-      "baseline": "2.3.0",
-      "port-version": 2
+      "baseline": "2.5.0",
+      "port-version": 0
     },
     "libilbc": {
       "baseline": "3.0.4",
       "port-version": 0
     },
     "libimobiledevice": {
-      "baseline": "1.3.17",
-      "port-version": 2
+      "baseline": "2023-07-05",
+      "port-version": 1
+    },
+    "libimobiledevice-glue": {
+      "baseline": "2023-05-13",
+      "port-version": 0
     },
     "libirecovery": {
-      "baseline": "1.0.25",
-      "port-version": 6
+      "baseline": "2023-05-13",
+      "port-version": 2
     },
     "libjpeg-turbo": {
-      "baseline": "2.1.5.1",
+      "baseline": "3.0.2",
       "port-version": 0
     },
     "libjuice": {
-      "baseline": "1.0.6",
-      "port-version": 0
+      "baseline": "1.3.4",
+      "port-version": 1
     },
     "libjxl": {
-      "baseline": "0.8.1",
-      "port-version": 0
+      "baseline": "0.8.2",
+      "port-version": 1
     },
     "libkeyfinder": {
       "baseline": "2.2.6",
-      "port-version": 0
+      "port-version": 1
     },
     "libkml": {
       "baseline": "1.3.0",
-      "port-version": 11
+      "port-version": 13
     },
     "liblas": {
       "baseline": "1.8.1",
-      "port-version": 11
+      "port-version": 14
     },
     "liblbfgs": {
       "baseline": "1.10",
       "port-version": 2
     },
     "libleidenalg": {
-      "baseline": "0.9.0",
+      "baseline": "0.10.0",
       "port-version": 1
     },
     "liblemon": {
       "baseline": "2019-06-13",
-      "port-version": 4
+      "port-version": 9
     },
     "liblinear": {
       "baseline": "243",
@@ -4106,110 +4526,122 @@
     },
     "liblo": {
       "baseline": "0.31",
-      "port-version": 3
+      "port-version": 4
     },
     "liblrc": {
       "baseline": "1.0.0",
       "port-version": 0
     },
     "liblsl": {
-      "baseline": "1.16.1",
-      "port-version": 1
+      "baseline": "1.16.2",
+      "port-version": 0
     },
     "liblsquic": {
-      "baseline": "3.1.1",
-      "port-version": 1
+      "baseline": "3.3.2",
+      "port-version": 0
     },
     "liblzma": {
-      "baseline": "5.4.1",
-      "port-version": 1
+      "baseline": "5.4.4",
+      "port-version": 0
     },
     "libmad": {
-      "baseline": "0.15.1",
-      "port-version": 10
+      "baseline": "0.16.4",
+      "port-version": 1
     },
     "libmagic": {
-      "baseline": "5.40",
+      "baseline": "5.45",
       "port-version": 1
     },
     "libmariadb": {
       "baseline": "3.3.1",
-      "port-version": 2
+      "port-version": 3
     },
     "libmaxminddb": {
-      "baseline": "1.4.3",
-      "port-version": 2
+      "baseline": "1.9.1",
+      "port-version": 0
     },
     "libmediainfo": {
-      "baseline": "21.03",
-      "port-version": 2
+      "baseline": "23.10",
+      "port-version": 0
     },
     "libmesh": {
       "baseline": "1.5.0",
-      "port-version": 4
+      "port-version": 6
     },
     "libmicrodns": {
       "baseline": "0.2.0",
-      "port-version": 0
+      "port-version": 2
     },
     "libmicrohttpd": {
-      "baseline": "0.9.75",
-      "port-version": 0
+      "baseline": "0.9.77",
+      "port-version": 2
     },
     "libmikmod": {
       "baseline": "3.3.11.1",
-      "port-version": 11
+      "port-version": 12
     },
     "libmodbus": {
-      "baseline": "3.1.6",
-      "port-version": 4
+      "baseline": "3.1.10",
+      "port-version": 0
     },
     "libmodman": {
       "baseline": "2.0.1",
-      "port-version": 4
+      "port-version": 5
     },
     "libmodplug": {
       "baseline": "0.8.9.0",
       "port-version": 10
     },
     "libmorton": {
-      "baseline": "0.2.11",
+      "baseline": "0.2.12",
       "port-version": 0
     },
     "libmount": {
-      "baseline": "2.38",
-      "port-version": 1
+      "baseline": "2.39",
+      "port-version": 0
     },
     "libmpeg2": {
       "baseline": "0.5.1",
       "port-version": 3
     },
     "libmspack": {
-      "baseline": "0.10.1",
-      "port-version": 5
+      "baseline": "0.11",
+      "port-version": 0
     },
     "libmt32emu": {
-      "baseline": "2.7.0",
+      "baseline": "2.7.1",
       "port-version": 0
     },
     "libmupdf": {
-      "baseline": "1.19.0-rc2",
+      "baseline": "1.22.1",
       "port-version": 1
     },
     "libmysql": {
-      "baseline": "8.0.20",
-      "port-version": 10
+      "baseline": "8.0.34",
+      "port-version": 1
     },
     "libnice": {
-      "baseline": "0.1.18",
+      "baseline": "0.1.21",
       "port-version": 1
     },
+    "libnice-gst": {
+      "baseline": "0.1.21",
+      "port-version": 3
+    },
+    "libnick": {
+      "baseline": "2024.2.1",
+      "port-version": 0
+    },
     "libnoise": {
       "baseline": "1.0.0",
       "port-version": 3
     },
     "libnop": {
-      "baseline": "2021-03-01",
+      "baseline": "2021-11-03",
+      "port-version": 0
+    },
+    "libobfuscate": {
+      "baseline": "2023-03-23",
       "port-version": 0
     },
     "libodb": {
@@ -4226,7 +4658,7 @@
     },
     "libodb-pgsql": {
       "baseline": "2.4.0",
-      "port-version": 6
+      "port-version": 7
     },
     "libodb-sqlite": {
       "baseline": "2.4.0",
@@ -4234,39 +4666,39 @@
     },
     "libofx": {
       "baseline": "0.10.9",
-      "port-version": 0
+      "port-version": 1
     },
     "libogg": {
       "baseline": "1.3.5",
       "port-version": 1
     },
     "libopenmpt": {
-      "baseline": "0.6.7",
+      "baseline": "0.6.12",
       "port-version": 0
     },
     "libopensp": {
       "baseline": "1.5.2",
-      "port-version": 1
+      "port-version": 3
     },
     "libopnmidi": {
       "baseline": "1.5.1",
-      "port-version": 0
+      "port-version": 1
     },
     "libopusenc": {
       "baseline": "0.2.1",
-      "port-version": 2
+      "port-version": 3
     },
     "libosip2": {
-      "baseline": "5.2.0",
-      "port-version": 2
+      "baseline": "5.3.1",
+      "port-version": 0
     },
     "libosmium": {
-      "baseline": "2.18.0",
+      "baseline": "2.20.0",
       "port-version": 1
     },
     "libosmscout": {
       "baseline": "1.1.1",
-      "port-version": 1
+      "port-version": 4
     },
     "libp7-baical": {
       "baseline": "replaced",
@@ -4274,95 +4706,103 @@
     },
     "libp7client": {
       "baseline": "5.6",
-      "port-version": 3
+      "port-version": 4
     },
     "libpcap": {
-      "baseline": "1.10.1",
+      "baseline": "1.10.4",
       "port-version": 1
     },
     "libpff": {
       "baseline": "2021-11-14",
-      "port-version": 0
+      "port-version": 2
     },
     "libphonenumber": {
-      "baseline": "8.13.7",
+      "baseline": "8.13.29",
       "port-version": 0
     },
     "libplist": {
-      "baseline": "1.3.6",
-      "port-version": 2
+      "baseline": "2023-06-15",
+      "port-version": 1
     },
     "libpmemobj-cpp": {
       "baseline": "1.13.0",
       "port-version": 1
     },
     "libpng": {
-      "baseline": "1.6.39",
+      "baseline": "1.6.40",
       "port-version": 1
     },
     "libpopt": {
       "baseline": "1.16",
-      "port-version": 15
+      "port-version": 16
     },
     "libpq": {
-      "baseline": "15.2",
-      "port-version": 1
+      "baseline": "16.0",
+      "port-version": 2
     },
     "libpqxx": {
-      "baseline": "7.7.4",
+      "baseline": "7.8.1",
       "port-version": 0
     },
     "libprotobuf-mutator": {
-      "baseline": "1.0",
-      "port-version": 1
+      "baseline": "1.1",
+      "port-version": 0
     },
     "libproxy": {
       "baseline": "0.4.18",
-      "port-version": 1
+      "port-version": 3
     },
     "libqcow": {
       "baseline": "20221124",
-      "port-version": 0
+      "port-version": 1
     },
     "libqglviewer": {
-      "baseline": "2.7.2",
-      "port-version": 4
+      "baseline": "2.9.1",
+      "port-version": 2
     },
     "libqrencode": {
       "baseline": "4.1.1",
       "port-version": 2
     },
+    "libqtrest": {
+      "baseline": "0.4.0",
+      "port-version": 0
+    },
     "librabbitmq": {
       "baseline": "0.11.0",
       "port-version": 2
     },
     "libraqm": {
-      "baseline": "0.9.0",
+      "baseline": "0.10.1",
       "port-version": 0
     },
     "libraw": {
-      "baseline": "0.21.1",
+      "baseline": "0.21.2",
       "port-version": 0
     },
     "librdkafka": {
-      "baseline": "2.0.2",
+      "baseline": "2.3.0",
       "port-version": 0
     },
     "libredwg": {
       "baseline": "0.12.5.5178",
+      "port-version": 1
+    },
+    "libremidi": {
+      "baseline": "4.3.0",
       "port-version": 0
     },
     "libressl": {
-      "baseline": "3.6.2",
+      "baseline": "3.8.2",
       "port-version": 0
     },
     "librsvg": {
       "baseline": "2.40.20",
-      "port-version": 5
+      "port-version": 10
     },
     "librsync": {
-      "baseline": "2.3.2",
-      "port-version": 1
+      "baseline": "2.3.4",
+      "port-version": 0
     },
     "librtmp": {
       "baseline": "2019-11-11",
@@ -4370,7 +4810,7 @@
     },
     "librttopo": {
       "baseline": "1.1.0",
-      "port-version": 7
+      "port-version": 8
     },
     "libsamplerate": {
       "baseline": "0.2.2",
@@ -4381,8 +4821,8 @@
       "port-version": 1
     },
     "libsbml": {
-      "baseline": "5.19.0",
-      "port-version": 2
+      "baseline": "5.20.2",
+      "port-version": 0
     },
     "libsbsms": {
       "baseline": "2.3.0",
@@ -4390,14 +4830,14 @@
     },
     "libsecret": {
       "baseline": "0.20.4",
-      "port-version": 1
+      "port-version": 2
     },
     "libsercomm": {
       "baseline": "1.3.2",
       "port-version": 0
     },
     "libsigcpp": {
-      "baseline": "3.4.0",
+      "baseline": "3.6.0",
       "port-version": 0
     },
     "libsigcpp-3": {
@@ -4417,11 +4857,11 @@
       "port-version": 0
     },
     "libsmb2": {
-      "baseline": "2021-04-29",
-      "port-version": 2
+      "baseline": "2023-08-11",
+      "port-version": 0
     },
     "libsndfile": {
-      "baseline": "1.2.0",
+      "baseline": "1.2.2",
       "port-version": 0
     },
     "libsnoretoast": {
@@ -4429,8 +4869,12 @@
       "port-version": 2
     },
     "libsodium": {
-      "baseline": "1.0.18",
-      "port-version": 8
+      "baseline": "1.0.19",
+      "port-version": 0
+    },
+    "libsonic": {
+      "baseline": "0.2.0",
+      "port-version": 0
     },
     "libsoundio": {
       "baseline": "2.0.0",
@@ -4441,43 +4885,55 @@
       "port-version": 3
     },
     "libspatialite": {
-      "baseline": "5.0.1",
-      "port-version": 10
+      "baseline": "5.1.0",
+      "port-version": 1
     },
     "libspnav": {
       "baseline": "0.2.3",
       "port-version": 2
     },
+    "libspng": {
+      "baseline": "0.7.4",
+      "port-version": 0
+    },
     "libsquish": {
       "baseline": "1.15",
       "port-version": 13
     },
     "libsrt": {
       "baseline": "1.5.0",
-      "port-version": 2
+      "port-version": 3
     },
     "libsrtp": {
-      "baseline": "2.4.2",
-      "port-version": 3
+      "baseline": "2.5.0",
+      "port-version": 1
     },
     "libssh": {
-      "baseline": "0.10.4+20221123",
-      "port-version": 3
+      "baseline": "0.10.5",
+      "port-version": 1
     },
     "libssh2": {
-      "baseline": "1.10.0",
-      "port-version": 4
+      "baseline": "1.11.0",
+      "port-version": 1
     },
     "libstemmer": {
       "baseline": "2017-9",
-      "port-version": 7
+      "port-version": 8
     },
     "libstk": {
       "baseline": "4.6.1",
-      "port-version": 2
+      "port-version": 3
     },
     "libsvm": {
-      "baseline": "3.25",
+      "baseline": "3.32",
+      "port-version": 0
+    },
+    "libsystemd": {
+      "baseline": "254",
+      "port-version": 2
+    },
+    "libtar": {
+      "baseline": "1.2.20",
       "port-version": 0
     },
     "libtasn1": {
@@ -4485,7 +4941,7 @@
       "port-version": 1
     },
     "libtcod": {
-      "baseline": "1.23.1",
+      "baseline": "1.24.0",
       "port-version": 0
     },
     "libtess2": {
@@ -4494,26 +4950,38 @@
     },
     "libtheora": {
       "baseline": "1.2.0alpha1-20170719",
-      "port-version": 6
+      "port-version": 7
     },
     "libtins": {
-      "baseline": "4.3",
-      "port-version": 6
+      "baseline": "4.5",
+      "port-version": 0
     },
     "libtomcrypt": {
       "baseline": "1.18.2",
-      "port-version": 2
+      "port-version": 3
     },
     "libtommath": {
-      "baseline": "1.2.0",
-      "port-version": 2
+      "baseline": "1.2.1",
+      "port-version": 0
     },
     "libtorch": {
-      "baseline": "1.12.1",
-      "port-version": 1
+      "baseline": "2.1.2",
+      "port-version": 0
     },
     "libtorrent": {
-      "baseline": "2.0.8",
+      "baseline": "2.0.9",
+      "port-version": 0
+    },
+    "libtracepoint": {
+      "baseline": "1.3.0",
+      "port-version": 0
+    },
+    "libtracepoint-control": {
+      "baseline": "1.3.0",
+      "port-version": 0
+    },
+    "libtracepoint-decode": {
+      "baseline": "1.3.0",
       "port-version": 0
     },
     "libu2f-server": {
@@ -4526,63 +4994,71 @@
     },
     "libudns": {
       "baseline": "0.4",
-      "port-version": 4
+      "port-version": 5
     },
     "libui": {
       "baseline": "2018-11-03",
       "port-version": 3
     },
     "libunibreak": {
-      "baseline": "5.0",
-      "port-version": 1
+      "baseline": "5.1",
+      "port-version": 0
     },
     "libunifex": {
-      "baseline": "2023-01-25",
+      "baseline": "0.4.0",
       "port-version": 0
     },
     "libunistring": {
       "baseline": "1.1",
-      "port-version": 2
+      "port-version": 3
+    },
+    "libunwind": {
+      "baseline": "1.7.2",
+      "port-version": 0
     },
     "liburing": {
-      "baseline": "2.2",
-      "port-version": 1
+      "baseline": "2.5",
+      "port-version": 0
     },
     "libusb": {
-      "baseline": "1.0.26",
-      "port-version": 3
+      "baseline": "1.0.26.11791",
+      "port-version": 7
     },
     "libusb-win32": {
       "baseline": "1.2.6.0",
-      "port-version": 9
+      "port-version": 10
     },
     "libusbmuxd": {
-      "baseline": "1.2.219",
-      "port-version": 3
+      "baseline": "2023-06-21",
+      "port-version": 1
     },
     "libuuid": {
       "baseline": "1.0.3",
-      "port-version": 12
+      "port-version": 14
     },
     "libuv": {
-      "baseline": "1.44.2",
-      "port-version": 0
+      "baseline": "1.46.0",
+      "port-version": 1
     },
     "libuvc": {
-      "baseline": "2020-11-24",
-      "port-version": 3
+      "baseline": "0.0.7",
+      "port-version": 0
+    },
+    "libvault": {
+      "baseline": "0.56.0",
+      "port-version": 0
     },
     "libvmdk": {
-      "baseline": "20200926",
-      "port-version": 3
+      "baseline": "20221124",
+      "port-version": 0
     },
     "libvorbis": {
       "baseline": "1.3.7",
       "port-version": 2
     },
     "libvpx": {
-      "baseline": "1.12.0",
-      "port-version": 0
+      "baseline": "1.13.1",
+      "port-version": 2
     },
     "libwandio": {
       "baseline": "4.2.1",
@@ -4593,7 +5069,7 @@
       "port-version": 1
     },
     "libwebp": {
-      "baseline": "1.3.0",
+      "baseline": "1.3.2",
       "port-version": 0
     },
     "libwebsockets": {
@@ -4616,6 +5092,10 @@
       "baseline": "0.4.5",
       "port-version": 0
     },
+    "libxcrypt": {
+      "baseline": "4.4.36",
+      "port-version": 0
+    },
     "libxcvt": {
       "baseline": "0.1.2",
       "port-version": 0
@@ -4624,9 +5104,13 @@
       "baseline": "1.1.5",
       "port-version": 0
     },
+    "libxdf": {
+      "baseline": "0.99.8",
+      "port-version": 0
+    },
     "libxdiff": {
       "baseline": "0.23",
-      "port-version": 3
+      "port-version": 4
     },
     "libxdmcp": {
       "baseline": "1.1.3",
@@ -4658,7 +5142,7 @@
     },
     "libxkbcommon": {
       "baseline": "1.4.1",
-      "port-version": 0
+      "port-version": 1
     },
     "libxkbfile": {
       "baseline": "1.1.0",
@@ -4666,11 +5150,11 @@
     },
     "libxlsxwriter": {
       "baseline": "1.1.5",
-      "port-version": 0
+      "port-version": 2
     },
     "libxml2": {
-      "baseline": "2.10.3",
-      "port-version": 0
+      "baseline": "2.11.6",
+      "port-version": 1
     },
     "libxmlmm": {
       "baseline": "0.6.0",
@@ -4678,18 +5162,18 @@
     },
     "libxmlpp": {
       "baseline": "5.0.0",
-      "port-version": 2
+      "port-version": 3
     },
-    "libxmp-lite": {
-      "baseline": "4.4.1",
-      "port-version": 8
+    "libxmp": {
+      "baseline": "4.6.0",
+      "port-version": 1
     },
     "libxmu": {
       "baseline": "1.1.3",
       "port-version": 1
     },
     "libxpm": {
-      "baseline": "3.5.14",
+      "baseline": "3.5.16",
       "port-version": 0
     },
     "libxpresent": {
@@ -4714,11 +5198,11 @@
     },
     "libxslt": {
       "baseline": "1.1.37",
-      "port-version": 1
+      "port-version": 3
     },
     "libxt": {
       "baseline": "1.2.1",
-      "port-version": 0
+      "port-version": 1
     },
     "libxtst": {
       "baseline": "1.2.4",
@@ -4734,35 +5218,43 @@
     },
     "libyaml": {
       "baseline": "0.2.5",
-      "port-version": 3
+      "port-version": 4
     },
     "libyuv": {
       "baseline": "1857",
       "port-version": 0
     },
     "libzen": {
-      "baseline": "0.4.39",
-      "port-version": 1
+      "baseline": "0.4.41",
+      "port-version": 0
+    },
+    "libzim": {
+      "baseline": "9.0.0",
+      "port-version": 0
     },
     "libzip": {
-      "baseline": "1.9.2",
+      "baseline": "1.10.1",
       "port-version": 0
     },
     "libzippp": {
-      "baseline": "6.0-1.9.2",
+      "baseline": "7.0-1.10.1",
       "port-version": 0
     },
     "licensepp": {
-      "baseline": "2020-05-19",
-      "port-version": 4
+      "baseline": "2020-11-24",
+      "port-version": 0
+    },
+    "lightningscanner": {
+      "baseline": "1.0.1",
+      "port-version": 0
     },
     "lilv": {
       "baseline": "0.24.10",
       "port-version": 2
     },
     "linalg": {
-      "baseline": "2.1",
-      "port-version": 1
+      "baseline": "2.2",
+      "port-version": 0
     },
     "linenoise-ng": {
       "baseline": "4754bee2d8eb3",
@@ -4773,7 +5265,7 @@
       "port-version": 0
     },
     "lionkor-commandline": {
-      "baseline": "2.0.0",
+      "baseline": "2.2.0",
       "port-version": 0
     },
     "litehtml": {
@@ -4781,31 +5273,35 @@
       "port-version": 2
     },
     "live555": {
-      "baseline": "2023-01-19",
-      "port-version": 0
+      "baseline": "2023-11-30",
+      "port-version": 1
     },
     "llfio": {
-      "baseline": "2023-03-13",
-      "port-version": 1
+      "baseline": "2023-11-06",
+      "port-version": 0
+    },
+    "llgi": {
+      "baseline": "2023-12-19",
+      "port-version": 0
     },
     "llgl": {
       "baseline": "2023-03-05",
       "port-version": 0
     },
     "llhttp": {
-      "baseline": "8.1.0",
-      "port-version": 1
+      "baseline": "9.1.3",
+      "port-version": 0
     },
     "llvm": {
-      "baseline": "14.0.6",
-      "port-version": 0
+      "baseline": "17.0.2",
+      "port-version": 3
     },
     "lmdb": {
-      "baseline": "0.9.29",
-      "port-version": 2
+      "baseline": "0.9.31",
+      "port-version": 0
     },
     "lockpp": {
-      "baseline": "1.0.2",
+      "baseline": "2.6",
       "port-version": 0
     },
     "lodepng": {
@@ -4817,15 +5313,15 @@
       "port-version": 0
     },
     "log4cplus": {
-      "baseline": "2.0.7",
-      "port-version": 1
+      "baseline": "2.1.1",
+      "port-version": 0
     },
-    "log4cpp": {
-      "baseline": "2.9.1",
-      "port-version": 8
+    "log4cpp-log4cpp": {
+      "baseline": "1.1.4",
+      "port-version": 0
     },
     "log4cxx": {
-      "baseline": "0.13.0.1",
+      "baseline": "1.2.0",
       "port-version": 0
     },
     "loguru": {
@@ -4833,12 +5329,36 @@
       "port-version": 3
     },
     "lpeg": {
-      "baseline": "1.0.2",
-      "port-version": 3
+      "baseline": "1.1.0",
+      "port-version": 0
+    },
+    "ltla-aarand": {
+      "baseline": "2023-03-19",
+      "port-version": 0
+    },
+    "ltla-cppirlba": {
+      "baseline": "2023-09-20",
+      "port-version": 0
+    },
+    "ltla-cppkmeans": {
+      "baseline": "2023-03-20",
+      "port-version": 0
+    },
+    "ltla-knncolle": {
+      "baseline": "2023-05-09",
+      "port-version": 0
+    },
+    "ltla-powerit": {
+      "baseline": "2023-03-19",
+      "port-version": 0
+    },
+    "ltla-umappp": {
+      "baseline": "2023-05-11",
+      "port-version": 0
     },
     "lua": {
-      "baseline": "5.4.4",
-      "port-version": 5
+      "baseline": "5.4.6",
+      "port-version": 0
     },
     "lua-compat53": {
       "baseline": "0.10",
@@ -4849,36 +5369,40 @@
       "port-version": 0
     },
     "luabridge3": {
-      "baseline": "3.0-beta4",
+      "baseline": "3.0-rc3",
       "port-version": 0
     },
     "luafilesystem": {
       "baseline": "1.8.0",
-      "port-version": 3
+      "port-version": 5
     },
     "luajit": {
       "baseline": "2023-01-04",
-      "port-version": 0
+      "port-version": 5
     },
     "luasec": {
-      "baseline": "1.1.0",
+      "baseline": "1.3.1",
       "port-version": 0
     },
     "luasocket": {
-      "baseline": "3.0.0",
-      "port-version": 1
+      "baseline": "3.1.0",
+      "port-version": 0
     },
     "luminoengine": {
       "baseline": "0.10.1",
       "port-version": 1
     },
-    "lunasvg": {
-      "baseline": "2.3.1",
+    "lunarg-vulkantools": {
+      "baseline": "1.3.275.0",
       "port-version": 0
     },
+    "lunasvg": {
+      "baseline": "2.3.8",
+      "port-version": 1
+    },
     "luv": {
       "baseline": "1.44.2",
-      "port-version": 0
+      "port-version": 1
     },
     "lv2": {
       "baseline": "1.18.2",
@@ -4888,29 +5412,41 @@
       "baseline": "1.9.4",
       "port-version": 1
     },
+    "lzav": {
+      "baseline": "3.13",
+      "port-version": 0
+    },
     "lzfse": {
       "baseline": "1.0",
-      "port-version": 4
+      "port-version": 5
     },
     "lzo": {
       "baseline": "2.10",
-      "port-version": 8
+      "port-version": 9
     },
     "lzokay": {
       "baseline": "2020-07-30",
-      "port-version": 1
+      "port-version": 2
+    },
+    "maddy": {
+      "baseline": "1.3.0",
+      "port-version": 0
     },
     "magic-enum": {
-      "baseline": "0.8.2",
+      "baseline": "0.9.5",
       "port-version": 0
     },
     "magic-get": {
       "baseline": "2019-09-02",
-      "port-version": 2
+      "port-version": 3
+    },
+    "magma": {
+      "baseline": "2.7.2",
+      "port-version": 0
     },
     "magnum": {
       "baseline": "2020.06",
-      "port-version": 12
+      "port-version": 17
     },
     "magnum-extras": {
       "baseline": "2020.06",
@@ -4918,15 +5454,23 @@
     },
     "magnum-integration": {
       "baseline": "2020.06",
-      "port-version": 2
+      "port-version": 3
     },
     "magnum-plugins": {
       "baseline": "2020.06",
-      "port-version": 10
+      "port-version": 12
     },
     "mailio": {
-      "baseline": "0.21.0",
-      "port-version": 2
+      "baseline": "0.23.0",
+      "port-version": 0
+    },
+    "makeid": {
+      "baseline": "1.0.3",
+      "port-version": 0
+    },
+    "manif": {
+      "baseline": "2023-07-17",
+      "port-version": 0
     },
     "mapbox-geojson-cpp": {
       "baseline": "0.5.1",
@@ -4946,26 +5490,26 @@
     },
     "mapbox-variant": {
       "baseline": "1.2.0",
-      "port-version": 1
+      "port-version": 2
     },
     "mapbox-wagyu": {
       "baseline": "0.5.0",
       "port-version": 0
     },
     "mapnik": {
-      "baseline": "2023-01-17",
-      "port-version": 0
+      "baseline": "2023-06-12",
+      "port-version": 3
     },
     "marble": {
       "baseline": "22.04.0",
-      "port-version": 1
+      "port-version": 2
     },
     "marisa-trie": {
       "baseline": "0.2.6+20200926",
       "port-version": 2
     },
     "marl": {
-      "baseline": "2022-03-02",
+      "baseline": "2023-06-28",
       "port-version": 0
     },
     "matchit": {
@@ -4973,80 +5517,80 @@
       "port-version": 0
     },
     "materialx": {
-      "baseline": "1.38.4",
-      "port-version": 0
+      "baseline": "1.38.8",
+      "port-version": 1
     },
     "mathc": {
       "baseline": "2019-09-29",
-      "port-version": 2
+      "port-version": 3
     },
     "mathgl": {
       "baseline": "8.0.1",
-      "port-version": 0
+      "port-version": 5
     },
     "matio": {
-      "baseline": "1.5.23",
-      "port-version": 2
+      "baseline": "1.5.26",
+      "port-version": 0
     },
     "matplotlib-cpp": {
       "baseline": "2020-08-27",
-      "port-version": 1
+      "port-version": 2
     },
     "matplotplusplus": {
-      "baseline": "2021-04-11",
-      "port-version": 6
+      "baseline": "1.2.0",
+      "port-version": 1
     },
     "matroska": {
-      "baseline": "1.6.3",
-      "port-version": 0
+      "baseline": "1.7.1",
+      "port-version": 2
     },
     "mbedtls": {
-      "baseline": "2.28.1",
+      "baseline": "2.28.7",
       "port-version": 0
     },
     "mchehab-zbar": {
       "baseline": "0.23.90",
-      "port-version": 3
+      "port-version": 5
     },
     "mcpp": {
       "baseline": "2.7.2.14",
-      "port-version": 4
+      "port-version": 5
     },
     "mdl-sdk": {
       "baseline": "2021.1.2",
-      "port-version": 0
+      "port-version": 4
     },
     "mdns": {
-      "baseline": "1.4.2",
+      "baseline": "1.4.3",
       "port-version": 0
     },
     "mdnsresponder": {
       "baseline": "1557.140.5.0.1",
-      "port-version": 0
+      "port-version": 1
     },
     "mdspan": {
-      "baseline": "0.5.0",
+      "baseline": "0.6.0",
       "port-version": 0
     },
     "mecab": {
       "baseline": "2019-09-25",
-      "port-version": 3
+      "port-version": 5
     },
     "memorymodule": {
       "baseline": "2019-12-31",
-      "port-version": 2
+      "port-version": 3
     },
     "mesa": {
-      "baseline": "22.1.7",
-      "port-version": 1
+      "baseline": "23.2.1",
+      "port-version": 0
     },
     "meschach": {
       "baseline": "1.2b",
       "port-version": 6
     },
     "meshoptimizer": {
-      "baseline": "0.18",
-      "port-version": 1
+      "baseline": "0.20",
+      "port-version": 0
     },
     "metis": {
       "baseline": "2022-07-27",
@@ -5058,11 +5602,11 @@
     },
     "mfl": {
       "baseline": "0.0.1",
-      "port-version": 2
+      "port-version": 3
     },
     "mfx-dispatch": {
       "baseline": "1.35.1",
-      "port-version": 1
+      "port-version": 3
     },
     "mgnlibs": {
       "baseline": "2019-09-29",
@@ -5074,19 +5618,19 @@
     },
     "microsoft-signalr": {
       "baseline": "0.1.0-alpha4",
-      "port-version": 2
+      "port-version": 8
     },
     "mikktspace": {
       "baseline": "2020-10-06",
-      "port-version": 2
+      "port-version": 3
     },
     "milerius-sfml-imgui": {
       "baseline": "1.1",
       "port-version": 6
     },
     "mimalloc": {
-      "baseline": "2.0.9",
-      "port-version": 0
+      "baseline": "2.1.2",
+      "port-version": 1
     },
     "minc": {
       "baseline": "2.4.03",
@@ -5094,14 +5638,14 @@
     },
     "minhook": {
       "baseline": "1.3.3",
-      "port-version": 3
+      "port-version": 4
     },
     "miniaudio": {
-      "baseline": "0.11.11",
+      "baseline": "0.11.21",
       "port-version": 0
     },
     "minifb": {
-      "baseline": "2023-02-03",
+      "baseline": "2023-09-21",
       "port-version": 0
     },
     "minimp3": {
@@ -5112,36 +5656,40 @@
       "baseline": "0.1.1",
       "port-version": 1
     },
+    "miniply": {
+      "baseline": "2022-09-15",
+      "port-version": 1
+    },
     "minisat-master-keying": {
       "baseline": "2.3.6",
-      "port-version": 0
+      "port-version": 1
     },
     "minitrace": {
-      "baseline": "2019.02.06",
-      "port-version": 2
+      "baseline": "2023-04-23",
+      "port-version": 0
     },
     "miniupnpc": {
-      "baseline": "2.1",
-      "port-version": 3
+      "baseline": "2.2.5",
+      "port-version": 0
     },
     "miniz": {
       "baseline": "3.0.2",
       "port-version": 0
     },
     "minizip": {
-      "baseline": "1.2.13",
+      "baseline": "1.3.1",
       "port-version": 0
     },
     "minizip-ng": {
-      "baseline": "3.0.7",
+      "baseline": "4.0.4",
       "port-version": 0
     },
     "mio": {
-      "baseline": "2023-01-25",
+      "baseline": "2023-03-03",
       "port-version": 0
     },
     "mlpack": {
-      "baseline": "4.0.1",
+      "baseline": "4.3.0",
       "port-version": 0
     },
     "mman": {
@@ -5150,7 +5698,7 @@
     },
     "mmloader": {
       "baseline": "1.0.1",
-      "port-version": 2
+      "port-version": 3
     },
     "mmx": {
       "baseline": "2022-03-27",
@@ -5158,90 +5706,98 @@
     },
     "mnn": {
       "baseline": "1.1.0",
-      "port-version": 4
+      "port-version": 5
+    },
+    "modern-cpp-kafka": {
+      "baseline": "2023.03.07",
+      "port-version": 0
     },
     "modp-base64": {
       "baseline": "2020-09-26",
       "port-version": 2
     },
     "mongo-c-driver": {
-      "baseline": "1.22.2",
-      "port-version": 0
+      "baseline": "1.25.4",
+      "port-version": 1
     },
     "mongo-cxx-driver": {
-      "baseline": "3.7.0",
+      "baseline": "3.9.0",
       "port-version": 0
     },
     "mongoose": {
-      "baseline": "7.9",
+      "baseline": "7.12",
       "port-version": 0
     },
     "monkeys-audio": {
-      "baseline": "9.04",
-      "port-version": 4
+      "baseline": "10.08",
+      "port-version": 1
     },
     "moos-core": {
       "baseline": "10.4.0",
-      "port-version": 7
+      "port-version": 10
     },
     "moos-essential": {
       "baseline": "10.0.1",
-      "port-version": 4
+      "port-version": 5
     },
     "moos-ui": {
       "baseline": "10.0.1",
-      "port-version": 4
+      "port-version": 5
     },
     "morton-nd": {
       "baseline": "4.0.0",
-      "port-version": 2
+      "port-version": 3
     },
     "mosquitto": {
-      "baseline": "2.0.14",
+      "baseline": "2.0.18",
       "port-version": 0
     },
     "mozjpeg": {
-      "baseline": "4.1.1",
+      "baseline": "4.1.5",
       "port-version": 0
     },
     "mp-units": {
-      "baseline": "0.7.0",
-      "port-version": 1
+      "baseline": "2.1.0",
+      "port-version": 0
     },
     "mp3lame": {
       "baseline": "3.100",
-      "port-version": 10
+      "port-version": 11
+    },
+    "mpark-patterns": {
+      "baseline": "2019-10-03",
+      "port-version": 0
     },
     "mpark-variant": {
       "baseline": "1.4.0",
-      "port-version": 2
+      "port-version": 3
     },
     "mpc": {
-      "baseline": "1.2.0",
-      "port-version": 2
+      "baseline": "1.3.1",
+      "port-version": 0
     },
     "mpfr": {
-      "baseline": "4.2.0",
+      "baseline": "4.2.1",
       "port-version": 0
     },
     "mpg123": {
       "baseline": "1.31.3",
-      "port-version": 0
+      "port-version": 4
     },
     "mpi": {
       "baseline": "1",
-      "port-version": 3
+      "port-version": 4
     },
     "mpir": {
       "baseline": "2022-03-02",
-      "port-version": 1
+      "port-version": 3
     },
     "mpmcqueue": {
       "baseline": "2021-12-01",
       "port-version": 0
     },
     "mqtt-cpp": {
-      "baseline": "13.1.0",
+      "baseline": "13.2.1",
       "port-version": 0
     },
     "ms-angle": {
@@ -5254,10 +5810,14 @@
     },
     "ms-gltf": {
       "baseline": "2022-06-28",
-      "port-version": 1
+      "port-version": 2
     },
     "ms-gsl": {
       "baseline": "4.0.0",
+      "port-version": 1
+    },
+    "ms-ifc-sdk": {
+      "baseline": "0.43.1",
       "port-version": 0
     },
     "ms-quic": {
@@ -5265,11 +5825,15 @@
       "port-version": 0
     },
     "msdfgen": {
-      "baseline": "1.10.0",
+      "baseline": "1.11.0",
       "port-version": 0
     },
     "msgpack": {
-      "baseline": "4.1.3",
+      "baseline": "6.0.0",
+      "port-version": 1
+    },
+    "msgpack-c": {
+      "baseline": "6.0.0",
       "port-version": 0
     },
     "msgpack11": {
@@ -5278,7 +5842,7 @@
     },
     "msinttypes": {
       "baseline": "2018-02-25",
-      "port-version": 1
+      "port-version": 2
     },
     "msix": {
       "baseline": "1.7",
@@ -5290,11 +5854,15 @@
     },
     "mstch": {
       "baseline": "1.0.2",
-      "port-version": 4
+      "port-version": 5
+    },
+    "mtlt": {
+      "baseline": "1.0.0",
+      "port-version": 0
     },
     "mujoco": {
       "baseline": "2.3.2",
-      "port-version": 0
+      "port-version": 1
     },
     "mujs": {
       "baseline": "1.3.2",
@@ -5308,61 +5876,69 @@
       "baseline": "2.3.4",
       "port-version": 0
     },
+    "murmur3": {
+      "baseline": "2015-05-02",
+      "port-version": 0
+    },
     "murmurhash": {
       "baseline": "2016-01-09",
-      "port-version": 6
+      "port-version": 7
     },
     "mvfst": {
-      "baseline": "2022-11-03",
+      "baseline": "2024.01.01.00",
       "port-version": 0
     },
     "mygui": {
-      "baseline": "3.4.1",
-      "port-version": 4
+      "baseline": "3.4.3",
+      "port-version": 0
     },
     "mysql-connector-cpp": {
-      "baseline": "8.0.30",
+      "baseline": "8.0.32",
       "port-version": 1
     },
     "nameof": {
-      "baseline": "0.10.2",
+      "baseline": "0.10.3",
       "port-version": 0
     },
     "nana": {
       "baseline": "1.7.4",
-      "port-version": 3
+      "port-version": 5
     },
     "nano-signal-slot": {
       "baseline": "2.0.1",
-      "port-version": 1
+      "port-version": 2
     },
     "nanobench": {
-      "baseline": "4.3.10",
-      "port-version": 1
+      "baseline": "4.3.11",
+      "port-version": 0
     },
     "nanodbc": {
       "baseline": "2.13.0",
-      "port-version": 6
+      "port-version": 8
     },
     "nanoflann": {
-      "baseline": "1.4.3",
+      "baseline": "1.5.1",
       "port-version": 0
     },
     "nanogui": {
       "baseline": "2019-09-23",
       "port-version": 5
     },
+    "nanojsonc": {
+      "baseline": "1.0.0",
+      "port-version": 0
+    },
     "nanomsg": {
       "baseline": "1.2.0",
-      "port-version": 0
+      "port-version": 1
     },
     "nanopb": {
       "baseline": "0.4.7",
-      "port-version": 0
+      "port-version": 2
     },
     "nanoprintf": {
-      "baseline": "2020-05-27",
-      "port-version": 1
+      "baseline": "0.3.4",
+      "port-version": 0
     },
     "nanorange": {
       "baseline": "2020-07-06",
@@ -5370,7 +5946,7 @@
     },
     "nanort": {
       "baseline": "2019-08-20",
-      "port-version": 2
+      "port-version": 3
     },
     "nanosvg": {
       "baseline": "2022-12-04",
@@ -5385,7 +5961,7 @@
       "port-version": 0
     },
     "nayuki-qr-code-generator": {
-      "baseline": "1.7.0",
+      "baseline": "1.8.0",
       "port-version": 1
     },
     "nccl": {
@@ -5393,19 +5969,23 @@
       "port-version": 2
     },
     "ncnn": {
-      "baseline": "20221128",
+      "baseline": "20231027",
       "port-version": 0
     },
     "ncurses": {
       "baseline": "6.4",
       "port-version": 1
     },
+    "ndis-driver-library": {
+      "baseline": "1.2.0",
+      "port-version": 0
+    },
     "neargye-semver": {
       "baseline": "0.3.0",
       "port-version": 1
     },
     "ned14-internal-quickcpplib": {
-      "baseline": "2023-03-13",
+      "baseline": "2023-11-22",
       "port-version": 0
     },
     "neon2sse": {
@@ -5414,58 +5994,62 @@
     },
     "netcdf-c": {
       "baseline": "4.8.1",
-      "port-version": 2
+      "port-version": 4
     },
     "netcdf-cxx4": {
       "baseline": "4.3.1",
-      "port-version": 4
+      "port-version": 5
+    },
+    "netgen": {
+      "baseline": "6.2.2307",
+      "port-version": 1
     },
     "nethost": {
-      "baseline": "7.0.0",
+      "baseline": "8.0.0",
       "port-version": 0
     },
     "nettle": {
       "baseline": "3.8.1",
-      "port-version": 0
+      "port-version": 1
     },
     "networkdirect-sdk": {
       "baseline": "2.0.1",
-      "port-version": 3
+      "port-version": 4
     },
     "nghttp2": {
-      "baseline": "1.51.0",
-      "port-version": 1
+      "baseline": "1.59.0",
+      "port-version": 0
     },
     "nghttp2-asio": {
       "baseline": "2022-08-11",
-      "port-version": 0
+      "port-version": 1
     },
     "nghttp3": {
-      "baseline": "0.9.0",
+      "baseline": "1.1.0",
       "port-version": 0
     },
     "ngspice": {
-      "baseline": "37",
+      "baseline": "41",
       "port-version": 0
     },
     "ngtcp2": {
-      "baseline": "0.13.1",
-      "port-version": 1
+      "baseline": "1.2.0",
+      "port-version": 0
     },
     "nifly": {
       "baseline": "1.0.0",
-      "port-version": 0
+      "port-version": 1
     },
     "nifticlib": {
-      "baseline": "2020-04-30",
-      "port-version": 4
+      "baseline": "2022-07-04",
+      "port-version": 0
     },
     "nlohmann-fifo-map": {
       "baseline": "2018.05.07",
       "port-version": 3
     },
     "nlohmann-json": {
-      "baseline": "3.11.2",
+      "baseline": "3.11.3",
       "port-version": 0
     },
     "nlopt": {
@@ -5474,62 +6058,70 @@
     },
     "nmap": {
       "baseline": "7.70",
-      "port-version": 8
+      "port-version": 11
     },
     "nmslib": {
       "baseline": "2.1.1",
       "port-version": 1
     },
     "nng": {
-      "baseline": "1.5.2",
+      "baseline": "1.6.0",
       "port-version": 0
     },
     "nngpp": {
       "baseline": "1.3.0",
-      "port-version": 2
+      "port-version": 3
     },
     "nnpack": {
       "baseline": "2021-02-21",
       "port-version": 3
     },
     "node-addon-api": {
-      "baseline": "6.0.0",
+      "baseline": "7.0.0",
       "port-version": 0
     },
-    "node-api": {
-      "baseline": "18.12.1",
-      "port-version": 2
+    "node-api-headers": {
+      "baseline": "1.1.0",
+      "port-version": 0
+    },
+    "nodesoup": {
+      "baseline": "2023-06-12",
+      "port-version": 0
     },
     "nonius": {
       "baseline": "2019-04-20",
-      "port-version": 3
+      "port-version": 4
     },
     "nowide": {
-      "baseline": "11.2.0",
+      "baseline": "11.3.0",
       "port-version": 0
     },
     "nrf-ble-driver": {
       "baseline": "4.1.4",
-      "port-version": 0
+      "port-version": 1
     },
     "nspr": {
       "baseline": "4.35",
-      "port-version": 2
+      "port-version": 4
     },
     "nss": {
       "baseline": "3.87",
-      "port-version": 0
+      "port-version": 2
     },
     "nsync": {
-      "baseline": "1.24.0",
-      "port-version": 1
+      "baseline": "1.26.0",
+      "port-version": 0
     },
     "nt-wrapper": {
       "baseline": "2019-08-10",
-      "port-version": 2
+      "port-version": 3
+    },
+    "ntf-core": {
+      "baseline": "2.1.0",
+      "port-version": 1
     },
     "nu-book-zxing-cpp": {
-      "baseline": "2.0.0",
+      "baseline": "2.1.0",
       "port-version": 0
     },
     "nuklear": {
@@ -5537,24 +6129,28 @@
       "port-version": 0
     },
     "numactl": {
-      "baseline": "2.0.14",
-      "port-version": 1
+      "baseline": "2.0.17",
+      "port-version": 0
     },
     "numcpp": {
-      "baseline": "2.6.0",
+      "baseline": "2.12.1",
       "port-version": 0
     },
     "nuspell": {
-      "baseline": "5.1.2",
+      "baseline": "5.1.4",
       "port-version": 0
     },
     "nvtt": {
       "baseline": "2.1.2",
       "port-version": 8
     },
+    "nyan-lang": {
+      "baseline": "0.3",
+      "port-version": 0
+    },
     "oatpp": {
       "baseline": "1.3.0",
-      "port-version": 1
+      "port-version": 2
     },
     "oatpp-consul": {
       "baseline": "1.3.0",
@@ -5586,7 +6182,7 @@
     },
     "oatpp-sqlite": {
       "baseline": "1.3.0",
-      "port-version": 1
+      "port-version": 2
     },
     "oatpp-ssdp": {
       "baseline": "1.3.0",
@@ -5602,23 +6198,27 @@
     },
     "oatpp-zlib": {
       "baseline": "1.3.0",
-      "port-version": 1
+      "port-version": 2
+    },
+    "oboe": {
+      "baseline": "1.8.0",
+      "port-version": 0
     },
     "observer-ptr-lite": {
       "baseline": "0.4.0",
-      "port-version": 2
+      "port-version": 3
     },
     "ocilib": {
-      "baseline": "4.7.5",
+      "baseline": "4.7.6",
       "port-version": 0
     },
     "octomap": {
-      "baseline": "1.9.6",
-      "port-version": 0
+      "baseline": "1.9.8",
+      "port-version": 1
     },
     "ode": {
-      "baseline": "0.16.3",
-      "port-version": 0
+      "baseline": "0.16.4",
+      "port-version": 1
     },
     "offscale-libetcd-cpp": {
       "baseline": "2019-07-10",
@@ -5629,17 +6229,21 @@
       "port-version": 0
     },
     "ogre": {
-      "baseline": "13.6.2",
-      "port-version": 0
+      "baseline": "14.0.1",
+      "port-version": 2
     },
     "ogre-next": {
-      "baseline": "2.3.1",
-      "port-version": 0
+      "baseline": "2.3.3",
+      "port-version": 2
     },
     "ois": {
       "baseline": "1.5.1",
       "port-version": 1
     },
+    "omniorb": {
+      "baseline": "4.3.0",
+      "port-version": 2
+    },
     "ompl": {
       "baseline": "1.5.1",
       "port-version": 5
@@ -5649,7 +6253,7 @@
       "port-version": 5
     },
     "onednn": {
-      "baseline": "3.0.0",
+      "baseline": "3.3",
       "port-version": 0
     },
     "oniguruma": {
@@ -5657,15 +6261,15 @@
       "port-version": 1
     },
     "onnx": {
-      "baseline": "1.13.1",
+      "baseline": "1.15.0",
       "port-version": 0
     },
     "onnx-optimizer": {
-      "baseline": "0.2.6",
+      "baseline": "0.3.18",
       "port-version": 0
     },
     "onnxruntime-gpu": {
-      "baseline": "1.14.1",
+      "baseline": "1.16.3",
       "port-version": 0
     },
     "oof": {
@@ -5677,20 +6281,24 @@
       "port-version": 0
     },
     "open62541": {
-      "baseline": "1.2.3",
-      "port-version": 1
+      "baseline": "1.3.9",
+      "port-version": 0
+    },
+    "open62541pp": {
+      "baseline": "0.11.0",
+      "port-version": 0
     },
     "openal-soft": {
-      "baseline": "1.23.0",
+      "baseline": "1.23.1",
       "port-version": 0
     },
     "openblas": {
-      "baseline": "0.3.21",
-      "port-version": 1
+      "baseline": "0.3.26",
+      "port-version": 0
     },
     "opencascade": {
-      "baseline": "7.6.2",
-      "port-version": 1
+      "baseline": "7.8.0",
+      "port-version": 0
     },
     "opencc": {
       "baseline": "1.1.6",
@@ -5701,47 +6309,43 @@
       "port-version": 2
     },
     "opencl": {
-      "baseline": "v2022.09.30",
-      "port-version": 0
+      "baseline": "v2023.02.06",
+      "port-version": 2
     },
     "opencolorio": {
-      "baseline": "2.1.2",
-      "port-version": 0
-    },
-    "opencolorio-tools": {
-      "baseline": "1.1.1",
-      "port-version": 0
+      "baseline": "2.2.1",
+      "port-version": 1
     },
     "opencsg": {
       "baseline": "1.4.2",
-      "port-version": 3
+      "port-version": 4
     },
     "openctm": {
       "baseline": "1.0.3",
       "port-version": 0
     },
     "opencv": {
-      "baseline": "4.7.0",
+      "baseline": "4.8.0",
       "port-version": 1
     },
     "opencv2": {
       "baseline": "2.4.13.7",
-      "port-version": 16
+      "port-version": 19
     },
     "opencv3": {
       "baseline": "3.4.18",
-      "port-version": 6
+      "port-version": 13
     },
     "opencv4": {
-      "baseline": "4.7.0",
-      "port-version": 3
+      "baseline": "4.8.0",
+      "port-version": 15
     },
     "opendnp3": {
       "baseline": "3.1.1",
       "port-version": 1
     },
     "openexr": {
-      "baseline": "3.1.5",
+      "baseline": "3.1.8",
       "port-version": 1
     },
     "openfbx": {
@@ -5762,54 +6366,54 @@
     },
     "openigtlink": {
       "baseline": "3.0",
-      "port-version": 3
+      "port-version": 4
     },
     "openimageio": {
-      "baseline": "2.4.9.0",
-      "port-version": 0
+      "baseline": "2.4.14.0",
+      "port-version": 3
     },
     "openjpeg": {
       "baseline": "2.5.0",
-      "port-version": 0
+      "port-version": 1
     },
     "openldap": {
       "baseline": "2.5.13",
-      "port-version": 0
+      "port-version": 1
     },
     "openmama": {
-      "baseline": "6.3.1",
-      "port-version": 2
+      "baseline": "6.3.2",
+      "port-version": 3
     },
     "openmesh": {
-      "baseline": "9.0",
-      "port-version": 1
+      "baseline": "10.0",
+      "port-version": 0
     },
     "openmpi": {
-      "baseline": "4.1.3",
+      "baseline": "4.1.6",
       "port-version": 1
     },
     "openmvg": {
       "baseline": "2.0",
-      "port-version": 6
+      "port-version": 9
     },
     "openmvs": {
       "baseline": "2.1.0",
-      "port-version": 0
+      "port-version": 2
     },
     "openni2": {
       "baseline": "2.2.0.33",
-      "port-version": 14
+      "port-version": 15
     },
     "openscap": {
-      "baseline": "1.3.1",
-      "port-version": 4
+      "baseline": "1.3.7",
+      "port-version": 2
     },
     "openslide": {
       "baseline": "3.4.1",
-      "port-version": 0
+      "port-version": 3
     },
     "openssl": {
-      "baseline": "3.1.0",
+      "baseline": "3.2.1",
       "port-version": 0
     },
     "openssl-unix": {
@@ -5826,11 +6430,15 @@
     },
     "opensubdiv": {
       "baseline": "3.5.0",
-      "port-version": 0
+      "port-version": 1
     },
     "opentelemetry-cpp": {
-      "baseline": "1.8.3",
-      "port-version": 0
+      "baseline": "1.13.0",
+      "port-version": 4
+    },
+    "opentelemetry-fluentd": {
+      "baseline": "2.0.0",
+      "port-version": 2
     },
     "opentracing": {
       "baseline": "1.6.0",
@@ -5838,23 +6446,27 @@
     },
     "openturns": {
       "baseline": "1.20",
-      "port-version": 0
+      "port-version": 1
     },
     "openvdb": {
-      "baseline": "10.0.0",
-      "port-version": 2
+      "baseline": "11.0.0",
+      "port-version": 0
+    },
+    "openvino": {
+      "baseline": "2023.3.0",
+      "port-version": 0
     },
     "openvpn3": {
       "baseline": "3.7.0",
-      "port-version": 1
+      "port-version": 2
     },
     "openvr": {
       "baseline": "1.23.7",
       "port-version": 0
     },
     "openxr-loader": {
-      "baseline": "1.0.22",
-      "port-version": 3
+      "baseline": "1.0.31",
+      "port-version": 0
     },
     "optimus-cpp": {
       "baseline": "0.3.0",
@@ -5862,46 +6474,42 @@
     },
     "optional-bare": {
       "baseline": "1.1.0",
-      "port-version": 2
+      "port-version": 3
     },
     "optional-lite": {
       "baseline": "3.5.0",
       "port-version": 1
     },
     "opus": {
-      "baseline": "1.3.1",
-      "port-version": 9
+      "baseline": "1.4",
+      "port-version": 0
     },
     "opusfile": {
       "baseline": "0.12+20221121",
       "port-version": 1
     },
     "orc": {
-      "baseline": "1.7.6",
+      "baseline": "1.9.2",
       "port-version": 0
     },
     "orocos-kdl": {
-      "baseline": "1.4",
-      "port-version": 6
+      "baseline": "1.5.1",
+      "port-version": 0
     },
     "osg": {
       "baseline": "3.6.5",
-      "port-version": 18
+      "port-version": 22
     },
     "osg-qt": {
       "baseline": "Qt5",
       "port-version": 3
     },
     "osgearth": {
-      "baseline": "3.3",
-      "port-version": 5
-    },
-    "osi": {
-      "baseline": "0.108.6",
+      "baseline": "3.4",
       "port-version": 1
     },
     "osmanip": {
-      "baseline": "4.5.1",
+      "baseline": "4.6.1",
       "port-version": 0
     },
     "otl": {
@@ -5909,36 +6517,36 @@
       "port-version": 0
     },
     "outcome": {
-      "baseline": "2.2.4",
-      "port-version": 1
+      "baseline": "2.2.7",
+      "port-version": 0
     },
     "p-ranav-csv": {
       "baseline": "2019-07-11",
-      "port-version": 2
+      "port-version": 3
     },
     "p-ranav-csv2": {
       "baseline": "2020-12-14",
-      "port-version": 3
+      "port-version": 4
     },
     "pagmo2": {
       "baseline": "2.19.0",
-      "port-version": 0
+      "port-version": 2
     },
     "paho-mqtt": {
-      "baseline": "1.3.10",
-      "port-version": 0
+      "baseline": "1.3.13",
+      "port-version": 1
     },
     "paho-mqttpp3": {
-      "baseline": "1.2.0",
-      "port-version": 1
+      "baseline": "1.3.2",
+      "port-version": 0
     },
     "palsigslot": {
-      "baseline": "1.2.1",
+      "baseline": "1.2.2",
       "port-version": 0
     },
     "pango": {
-      "baseline": "1.50.12",
-      "port-version": 2
+      "baseline": "1.50.14",
+      "port-version": 4
     },
     "pangolin": {
       "baseline": "0.8",
@@ -5946,19 +6554,19 @@
     },
     "pangomm": {
       "baseline": "2.50.1",
-      "port-version": 0
+      "port-version": 3
     },
     "parallel-hashmap": {
-      "baseline": "1.3.8",
+      "baseline": "1.3.11",
       "port-version": 0
     },
     "parallelstl": {
       "baseline": "20200330",
-      "port-version": 2
+      "port-version": 3
     },
     "paraview": {
       "baseline": "5.11.0",
-      "port-version": 2
+      "port-version": 4
     },
     "parmetis": {
       "baseline": "2022-07-27",
@@ -5966,7 +6574,7 @@
     },
     "parquet": {
       "baseline": "0",
-      "port-version": 1
+      "port-version": 2
     },
     "parson": {
       "baseline": "2022-11-13",
@@ -5974,18 +6582,22 @@
     },
     "pbc": {
       "baseline": "0.5.14",
-      "port-version": 6
+      "port-version": 9
     },
     "pcapplusplus": {
-      "baseline": "22.11",
-      "port-version": 0
+      "baseline": "23.9",
+      "port-version": 1
     },
     "pcg": {
       "baseline": "2021-04-06",
-      "port-version": 1
+      "port-version": 2
+    },
+    "pciids": {
+      "baseline": "2023-04-11",
+      "port-version": 0
     },
     "pcl": {
-      "baseline": "1.13.0",
+      "baseline": "1.14.0",
       "port-version": 1
     },
     "pcre": {
@@ -5993,48 +6605,48 @@
       "port-version": 5
     },
     "pcre2": {
-      "baseline": "10.40",
+      "baseline": "10.42",
       "port-version": 1
     },
     "pdal": {
-      "baseline": "2.4.3",
-      "port-version": 1
+      "baseline": "2.5.3",
+      "port-version": 3
     },
     "pdal-c": {
-      "baseline": "2.1",
+      "baseline": "2.2.0",
       "port-version": 0
     },
     "pdcurses": {
       "baseline": "3.9",
-      "port-version": 3
+      "port-version": 6
     },
     "pdqsort": {
       "baseline": "2019-07-30",
-      "port-version": 1
+      "port-version": 2
     },
     "pe-parse": {
       "baseline": "2.1.0",
-      "port-version": 0
+      "port-version": 1
     },
     "pegtl": {
-      "baseline": "3.2.6",
+      "baseline": "3.2.7",
       "port-version": 0
     },
     "pegtl-2": {
       "baseline": "2.8.3",
-      "port-version": 2
+      "port-version": 3
     },
     "pffft": {
       "baseline": "2021-10-09",
       "port-version": 1
     },
     "pfring": {
-      "baseline": "2019-10-17",
-      "port-version": 4
+      "baseline": "8.4.0",
+      "port-version": 0
     },
     "pfultz2-linq": {
       "baseline": "2019-05-14",
-      "port-version": 2
+      "port-version": 3
     },
     "phnt": {
       "baseline": "2020-12-21",
@@ -6049,23 +6661,23 @@
       "port-version": 1
     },
     "physx": {
-      "baseline": "4.1.2",
-      "port-version": 6
+      "baseline": "5.3.0",
+      "port-version": 0
     },
     "picojson": {
       "baseline": "1.3.0",
-      "port-version": 2
+      "port-version": 3
     },
     "picosha2": {
       "baseline": "2018-07-30",
-      "port-version": 1
+      "port-version": 2
     },
     "piex": {
       "baseline": "2019-07-11",
       "port-version": 2
     },
     "pipewire": {
-      "baseline": "0.3.62",
+      "baseline": "1.0.2",
       "port-version": 0
     },
     "pistache": {
@@ -6081,8 +6693,8 @@
       "port-version": 2
     },
     "pkgconf": {
-      "baseline": "1.8.0",
-      "port-version": 5
+      "baseline": "2.1.0",
+      "port-version": 0
     },
     "plasma-wayland-protocols": {
       "baseline": "1.8.0",
@@ -6090,10 +6702,10 @@
     },
     "platform-folders": {
       "baseline": "4.2.0",
-      "port-version": 0
+      "port-version": 1
     },
     "plf-colony": {
-      "baseline": "6.33",
+      "baseline": "7.41",
       "port-version": 0
     },
     "plf-hive": {
@@ -6102,70 +6714,74 @@
     },
     "plf-list": {
       "baseline": "2019-08-10",
-      "port-version": 1
+      "port-version": 2
     },
     "plf-nanotimer": {
       "baseline": "2019-08-10",
-      "port-version": 1
+      "port-version": 2
     },
     "plf-stack": {
       "baseline": "2019-08-10",
-      "port-version": 1
+      "port-version": 2
     },
     "plib": {
       "baseline": "1.8.5",
-      "port-version": 6
+      "port-version": 8
     },
     "plibsys": {
       "baseline": "0.0.4",
       "port-version": 7
     },
     "plog": {
-      "baseline": "1.1.9",
+      "baseline": "1.1.10",
       "port-version": 0
     },
     "plplot": {
       "baseline": "5.15.0",
-      "port-version": 1
+      "port-version": 2
     },
     "plustache": {
       "baseline": "0.4.0",
-      "port-version": 3
+      "port-version": 4
     },
     "pmdk": {
       "baseline": "1.12.0",
+      "port-version": 2
+    },
+    "pmp-library": {
+      "baseline": "3.0.0",
       "port-version": 0
     },
     "pngpp": {
       "baseline": "0.2.10",
-      "port-version": 1
+      "port-version": 2
     },
     "pngwriter": {
       "baseline": "0.7.0",
-      "port-version": 4
+      "port-version": 5
+    },
+    "pocketfft": {
+      "baseline": "2023-09-25",
+      "port-version": 0
     },
     "poco": {
-      "baseline": "1.12.4",
-      "port-version": 4
+      "baseline": "1.13.0",
+      "port-version": 0
     },
     "podofo": {
-      "baseline": "0.9.8",
+      "baseline": "0.10.3",
       "port-version": 0
     },
     "poissonrecon": {
       "baseline": "2021-09-26",
       "port-version": 0
     },
-    "poly2tri": {
-      "baseline": "2020-07-21",
-      "port-version": 3
-    },
     "polyclipping": {
       "baseline": "6.4.2",
-      "port-version": 11
+      "port-version": 12
     },
     "polyhook2": {
-      "baseline": "2022-03-01",
+      "baseline": "2023-08-11",
       "port-version": 0
     },
     "polymorphic-value": {
@@ -6174,54 +6790,66 @@
     },
     "ponder": {
       "baseline": "3.0.0",
-      "port-version": 4
+      "port-version": 5
     },
     "poppler": {
-      "baseline": "23.1.0",
-      "port-version": 2
+      "baseline": "23.11.0",
+      "port-version": 0
     },
     "popsift": {
       "baseline": "0.9",
       "port-version": 5
     },
+    "portable-file-dialogs": {
+      "baseline": "0.1.0",
+      "port-version": 0
+    },
     "portable-snippets": {
       "baseline": "2019-09-20",
-      "port-version": 3
+      "port-version": 4
     },
     "portaudio": {
       "baseline": "19.7",
-      "port-version": 4
+      "port-version": 5
     },
     "portmidi": {
       "baseline": "2.0.4",
-      "port-version": 1
+      "port-version": 3
     },
     "portsmf": {
-      "baseline": "0.238",
-      "port-version": 1
+      "baseline": "239",
+      "port-version": 0
     },
     "ppconsul": {
       "baseline": "0.5",
-      "port-version": 4
+      "port-version": 5
     },
     "ppmagic": {
       "baseline": "2020-07-03",
-      "port-version": 1
+      "port-version": 2
     },
     "pprint": {
       "baseline": "2019-07-19",
-      "port-version": 2
+      "port-version": 3
     },
     "pqp": {
       "baseline": "1.3",
-      "port-version": 6
+      "port-version": 7
+    },
+    "pravila00-enum-string": {
+      "baseline": "2023-10-16",
+      "port-version": 0
+    },
+    "pravila00-make-vector": {
+      "baseline": "2023-04-10",
+      "port-version": 0
     },
     "presentmon": {
       "baseline": "1.7.0",
       "port-version": 2
     },
     "proj": {
-      "baseline": "9.2.0",
+      "baseline": "9.3.1",
       "port-version": 0
     },
     "proj4": {
@@ -6238,11 +6866,11 @@
     },
     "protobuf": {
       "baseline": "3.21.12",
-      "port-version": 0
+      "port-version": 1
     },
     "protobuf-c": {
-      "baseline": "1.4.0",
-      "port-version": 2
+      "baseline": "1.4.1",
+      "port-version": 1
     },
     "protopuf": {
       "baseline": "2.2.1",
@@ -6252,20 +6880,24 @@
       "baseline": "1.7.1",
       "port-version": 0
     },
+    "proxsuite": {
+      "baseline": "0.5.0",
+      "port-version": 0
+    },
     "proxy": {
-      "baseline": "1.1.1",
+      "baseline": "2.1.2",
       "port-version": 0
     },
     "proxygen": {
-      "baseline": "2022.07.11.00",
+      "baseline": "2024.01.01.00",
       "port-version": 0
     },
     "psimd": {
       "baseline": "2021-02-21",
-      "port-version": 1
+      "port-version": 2
     },
     "ptc-print": {
-      "baseline": "1.4.0",
+      "baseline": "1.4.1",
       "port-version": 1
     },
     "ptex": {
@@ -6274,7 +6906,7 @@
     },
     "pthread": {
       "baseline": "3.0.0",
-      "port-version": 1
+      "port-version": 2
     },
     "pthread-stubs": {
       "baseline": "0.4",
@@ -6286,18 +6918,26 @@
     },
     "pthreads": {
       "baseline": "3.0.0",
-      "port-version": 13
+      "port-version": 14
     },
     "ptyqt": {
       "baseline": "0.6.5",
       "port-version": 0
     },
     "pugixml": {
-      "baseline": "1.13.0",
+      "baseline": "1.14",
+      "port-version": 0
+    },
+    "pulsar-client-cpp": {
+      "baseline": "3.4.2",
+      "port-version": 2
+    },
+    "pulzed-mini": {
+      "baseline": "0.9.14",
       "port-version": 0
     },
     "pybind11": {
-      "baseline": "2.10.3",
+      "baseline": "2.11.1",
       "port-version": 0
     },
     "pystring": {
@@ -6306,19 +6946,23 @@
     },
     "python2": {
       "baseline": "2.7.18",
-      "port-version": 5
+      "port-version": 7
     },
     "python3": {
-      "baseline": "3.10.7",
-      "port-version": 5
+      "baseline": "3.11.5",
+      "port-version": 4
     },
     "qca": {
-      "baseline": "2.3.5",
+      "baseline": "2.3.7",
+      "port-version": 0
+    },
+    "qcoro": {
+      "baseline": "0.10.0",
       "port-version": 0
     },
     "qcustomplot": {
-      "baseline": "2.0.1",
-      "port-version": 5
+      "baseline": "2.1.1",
+      "port-version": 1
     },
     "qhttpengine": {
       "baseline": "1.0.2",
@@ -6332,88 +6976,96 @@
       "baseline": "2021-02-26",
       "port-version": 3
     },
+    "qoi": {
+      "baseline": "2023-08-10",
+      "port-version": 0
+    },
+    "qoixx": {
+      "baseline": "2022-12-07",
+      "port-version": 0
+    },
     "qpid-proton": {
-      "baseline": "0.37.0",
-      "port-version": 3
+      "baseline": "0.38.0",
+      "port-version": 1
     },
     "qscintilla": {
       "baseline": "2.13.4",
-      "port-version": 0
+      "port-version": 2
     },
     "qt": {
-      "baseline": "6.4.3",
+      "baseline": "6.6.1",
       "port-version": 0
     },
     "qt-advanced-docking-system": {
-      "baseline": "3.8.2",
-      "port-version": 2
+      "baseline": "4.2.1",
+      "port-version": 0
     },
     "qt3d": {
-      "baseline": "6.4.3",
+      "baseline": "6.6.1",
       "port-version": 0
     },
     "qt5": {
-      "baseline": "5.15.8",
-      "port-version": 1
+      "baseline": "5.15.12",
+      "port-version": 0
     },
     "qt5-3d": {
-      "baseline": "5.15.8",
+      "baseline": "5.15.12",
       "port-version": 0
     },
     "qt5-activeqt": {
-      "baseline": "5.15.8",
+      "baseline": "5.15.12",
       "port-version": 0
     },
     "qt5-androidextras": {
-      "baseline": "5.15.8",
+      "baseline": "5.15.12",
       "port-version": 0
     },
     "qt5-base": {
-      "baseline": "5.15.8",
-      "port-version": 5
+      "baseline": "5.15.12",
+      "port-version": 1
     },
     "qt5-canvas3d": {
       "baseline": "0",
-      "port-version": 1
+      "port-version": 2
     },
     "qt5-charts": {
-      "baseline": "5.15.8",
+      "baseline": "5.15.12",
       "port-version": 0
     },
     "qt5-connectivity": {
-      "baseline": "5.15.8",
+      "baseline": "5.15.12",
       "port-version": 0
     },
     "qt5-datavis3d": {
-      "baseline": "5.15.8",
+      "baseline": "5.15.12",
       "port-version": 0
     },
     "qt5-declarative": {
-      "baseline": "5.15.8",
+      "baseline": "5.15.12",
       "port-version": 0
     },
     "qt5-doc": {
-      "baseline": "5.15.8",
+      "baseline": "5.15.12",
       "port-version": 0
     },
     "qt5-gamepad": {
-      "baseline": "5.15.8",
+      "baseline": "5.15.12",
       "port-version": 0
     },
     "qt5-graphicaleffects": {
-      "baseline": "5.15.8",
+      "baseline": "5.15.12",
       "port-version": 0
     },
     "qt5-imageformats": {
-      "baseline": "5.15.8",
-      "port-version": 1
+      "baseline": "5.15.12",
+      "port-version": 0
     },
     "qt5-location": {
-      "baseline": "5.15.8",
+      "baseline": "5.15.12",
       "port-version": 0
     },
     "qt5-macextras": {
-      "baseline": "5.15.8",
+      "baseline": "5.15.12",
       "port-version": 0
     },
     "qt5-modularscripts": {
@@ -6421,287 +7073,295 @@
       "port-version": 1
     },
     "qt5-mqtt": {
-      "baseline": "5.15.8",
+      "baseline": "5.15.12",
       "port-version": 0
     },
     "qt5-multimedia": {
-      "baseline": "5.15.8",
+      "baseline": "5.15.12",
       "port-version": 0
     },
     "qt5-networkauth": {
-      "baseline": "5.15.8",
+      "baseline": "5.15.12",
       "port-version": 0
     },
     "qt5-purchasing": {
-      "baseline": "5.15.8",
+      "baseline": "5.15.12",
       "port-version": 0
     },
     "qt5-quickcontrols": {
-      "baseline": "5.15.8",
+      "baseline": "5.15.12",
       "port-version": 0
     },
     "qt5-quickcontrols2": {
-      "baseline": "5.15.8",
+      "baseline": "5.15.12",
       "port-version": 0
     },
     "qt5-remoteobjects": {
-      "baseline": "5.15.8",
+      "baseline": "5.15.12",
       "port-version": 0
     },
     "qt5-script": {
-      "baseline": "5.15.8",
+      "baseline": "5.15.12",
       "port-version": 0
     },
     "qt5-scxml": {
-      "baseline": "5.15.8",
+      "baseline": "5.15.12",
       "port-version": 0
     },
     "qt5-sensors": {
-      "baseline": "5.15.8",
+      "baseline": "5.15.12",
       "port-version": 0
     },
     "qt5-serialbus": {
-      "baseline": "5.15.8",
+      "baseline": "5.15.12",
       "port-version": 0
     },
     "qt5-serialport": {
-      "baseline": "5.15.8",
+      "baseline": "5.15.12",
       "port-version": 0
     },
     "qt5-speech": {
-      "baseline": "5.15.8",
+      "baseline": "5.15.12",
       "port-version": 0
     },
     "qt5-svg": {
-      "baseline": "5.15.8",
+      "baseline": "5.15.12",
       "port-version": 0
     },
     "qt5-tools": {
-      "baseline": "5.15.8",
+      "baseline": "5.15.12",
       "port-version": 0
     },
     "qt5-translations": {
-      "baseline": "5.15.8",
+      "baseline": "5.15.12",
       "port-version": 0
     },
     "qt5-virtualkeyboard": {
-      "baseline": "5.15.8",
+      "baseline": "5.15.12",
       "port-version": 0
     },
     "qt5-wayland": {
-      "baseline": "5.15.8",
+      "baseline": "5.15.12",
       "port-version": 0
     },
     "qt5-webchannel": {
-      "baseline": "5.15.8",
+      "baseline": "5.15.12",
       "port-version": 0
     },
     "qt5-webengine": {
-      "baseline": "5.15.8",
-      "port-version": 1
+      "baseline": "5.15.12",
+      "port-version": 0
     },
     "qt5-webglplugin": {
-      "baseline": "5.15.8",
+      "baseline": "5.15.12",
       "port-version": 0
     },
     "qt5-websockets": {
-      "baseline": "5.15.8",
+      "baseline": "5.15.12",
       "port-version": 0
     },
     "qt5-webview": {
-      "baseline": "5.15.8",
+      "baseline": "5.15.12",
       "port-version": 0
     },
     "qt5-winextras": {
-      "baseline": "5.15.8",
+      "baseline": "5.15.12",
       "port-version": 0
     },
     "qt5-x11extras": {
-      "baseline": "5.15.8",
-      "port-version": 1
+      "baseline": "5.15.12",
+      "port-version": 0
     },
     "qt5-xmlpatterns": {
-      "baseline": "5.15.8",
+      "baseline": "5.15.12",
       "port-version": 0
     },
     "qt5compat": {
-      "baseline": "6.4.3",
-      "port-version": 0
-    },
-    "qt6betablock": {
-      "baseline": "6.2.0-beta",
+      "baseline": "6.6.1",
       "port-version": 0
     },
     "qtactiveqt": {
-      "baseline": "6.4.3",
+      "baseline": "6.6.1",
       "port-version": 0
     },
     "qtapplicationmanager": {
-      "baseline": "6.4.3",
+      "baseline": "6.6.1",
       "port-version": 0
     },
     "qtbase": {
-      "baseline": "6.4.3",
-      "port-version": 0
+      "baseline": "6.6.1",
+      "port-version": 9
     },
     "qtcharts": {
-      "baseline": "6.4.3",
+      "baseline": "6.6.1",
       "port-version": 0
     },
     "qtcoap": {
-      "baseline": "6.4.3",
+      "baseline": "6.6.1",
       "port-version": 0
     },
     "qtconnectivity": {
-      "baseline": "6.4.3",
+      "baseline": "6.6.1",
       "port-version": 0
     },
     "qtdatavis3d": {
-      "baseline": "6.4.3",
+      "baseline": "6.6.1",
       "port-version": 0
     },
     "qtdeclarative": {
-      "baseline": "6.4.3",
+      "baseline": "6.6.1",
       "port-version": 0
     },
     "qtdeviceutilities": {
-      "baseline": "6.4.3",
+      "baseline": "6.6.1",
       "port-version": 0
     },
     "qtdoc": {
-      "baseline": "6.4.3",
+      "baseline": "6.6.1",
+      "port-version": 0
+    },
+    "qtgraphs": {
+      "baseline": "6.6.1",
+      "port-version": 0
+    },
+    "qtgrpc": {
+      "baseline": "6.6.1",
       "port-version": 0
     },
     "qthttpserver": {
-      "baseline": "6.4.3",
+      "baseline": "6.6.1",
       "port-version": 0
     },
     "qtimageformats": {
-      "baseline": "6.4.3",
+      "baseline": "6.6.1",
       "port-version": 0
     },
     "qtinterfaceframework": {
-      "baseline": "6.4.3",
+      "baseline": "6.6.1",
       "port-version": 0
     },
     "qtkeychain": {
-      "baseline": "0.13.2",
-      "port-version": 3
+      "baseline": "0.14.1",
+      "port-version": 0
     },
     "qtkeychain-qt6": {
-      "baseline": "0.13.2",
-      "port-version": 1
+      "baseline": "0.14.1",
+      "port-version": 0
     },
     "qtlanguageserver": {
-      "baseline": "6.4.3",
+      "baseline": "6.6.1",
       "port-version": 0
     },
     "qtlocation": {
-      "baseline": "6.4.3",
+      "baseline": "6.6.1",
       "port-version": 0
     },
     "qtlottie": {
-      "baseline": "6.4.3",
+      "baseline": "6.6.1",
       "port-version": 0
     },
     "qtmqtt": {
-      "baseline": "6.4.3",
+      "baseline": "6.6.1",
       "port-version": 0
     },
     "qtmultimedia": {
-      "baseline": "6.4.3",
-      "port-version": 0
+      "baseline": "6.6.1",
+      "port-version": 1
     },
     "qtnetworkauth": {
-      "baseline": "6.4.3",
+      "baseline": "6.6.1",
       "port-version": 0
     },
     "qtopcua": {
-      "baseline": "6.4.3",
-      "port-version": 0
+      "baseline": "6.6.1",
+      "port-version": 1
     },
     "qtpositioning": {
-      "baseline": "6.4.3",
-      "port-version": 0
+      "baseline": "6.6.1",
+      "port-version": 2
     },
     "qtquick3d": {
-      "baseline": "6.4.3",
+      "baseline": "6.6.1",
       "port-version": 0
     },
     "qtquick3dphysics": {
-      "baseline": "6.4.3",
+      "baseline": "6.6.1",
       "port-version": 0
     },
     "qtquickcontrols2": {
       "baseline": "deprecated",
       "port-version": 0
     },
+    "qtquickeffectmaker": {
+      "baseline": "6.6.1",
+      "port-version": 0
+    },
     "qtquicktimeline": {
-      "baseline": "6.4.3",
+      "baseline": "6.6.1",
       "port-version": 0
     },
     "qtremoteobjects": {
-      "baseline": "6.4.3",
+      "baseline": "6.6.1",
       "port-version": 0
     },
     "qtscxml": {
-      "baseline": "6.4.3",
+      "baseline": "6.6.1",
       "port-version": 0
     },
     "qtsensors": {
-      "baseline": "6.4.3",
+      "baseline": "6.6.1",
       "port-version": 0
     },
     "qtserialbus": {
-      "baseline": "6.4.3",
+      "baseline": "6.6.1",
       "port-version": 0
     },
     "qtserialport": {
-      "baseline": "6.4.3",
-      "port-version": 0
+      "baseline": "6.6.1",
+      "port-version": 1
     },
     "qtshadertools": {
-      "baseline": "6.4.3",
+      "baseline": "6.6.1",
       "port-version": 0
     },
     "qtspeech": {
-      "baseline": "6.4.3",
+      "baseline": "6.6.1",
       "port-version": 0
     },
     "qtsvg": {
-      "baseline": "6.4.3",
+      "baseline": "6.6.1",
       "port-version": 0
     },
     "qttools": {
-      "baseline": "6.4.3",
+      "baseline": "6.6.1",
       "port-version": 0
     },
     "qttranslations": {
-      "baseline": "6.4.3",
+      "baseline": "6.6.1",
       "port-version": 0
     },
     "qtvirtualkeyboard": {
-      "baseline": "6.4.3",
+      "baseline": "6.6.1",
       "port-version": 0
     },
     "qtwayland": {
-      "baseline": "6.4.3",
+      "baseline": "6.6.1",
       "port-version": 0
     },
     "qtwebchannel": {
-      "baseline": "6.4.3",
+      "baseline": "6.6.1",
       "port-version": 0
     },
     "qtwebengine": {
-      "baseline": "6.4.3",
-      "port-version": 0
+      "baseline": "6.6.1",
+      "port-version": 3
     },
     "qtwebsockets": {
-      "baseline": "6.4.3",
+      "baseline": "6.6.1",
       "port-version": 0
     },
     "qtwebview": {
-      "baseline": "6.4.3",
+      "baseline": "6.6.1",
       "port-version": 0
     },
     "quadtree": {
@@ -6709,27 +7369,27 @@
       "port-version": 0
     },
     "quantlib": {
-      "baseline": "1.29",
+      "baseline": "1.33",
       "port-version": 0
     },
     "quaternions": {
       "baseline": "1.0.0",
-      "port-version": 1
+      "port-version": 2
     },
     "quazip": {
-      "baseline": "1.3",
-      "port-version": 2
+      "baseline": "1.4",
+      "port-version": 1
     },
     "quickfast": {
       "baseline": "1.5",
-      "port-version": 3
+      "port-version": 4
     },
     "quickfix": {
       "baseline": "1.15.1",
-      "port-version": 8
+      "port-version": 9
     },
     "quill": {
-      "baseline": "2.7.0",
+      "baseline": "3.6.0",
       "port-version": 0
     },
     "quirc": {
@@ -6737,8 +7397,8 @@
       "port-version": 3
     },
     "qwt": {
-      "baseline": "6.2.0+20220616",
-      "port-version": 1
+      "baseline": "2023-05-12",
+      "port-version": 0
     },
     "qwtw": {
       "baseline": "3.1.0",
@@ -6746,11 +7406,11 @@
     },
     "rabit": {
       "baseline": "0.1",
-      "port-version": 4
+      "port-version": 5
     },
     "ragel": {
       "baseline": "6.10",
-      "port-version": 5
+      "port-version": 6
     },
     "random123": {
       "baseline": "1.14.0",
@@ -6770,7 +7430,7 @@
     },
     "range-v3-vs2015": {
       "baseline": "20151130-vcpkg5",
-      "port-version": 1
+      "port-version": 2
     },
     "rapidcheck": {
       "baseline": "2023-01-13",
@@ -6781,47 +7441,47 @@
       "port-version": 0
     },
     "rapidfuzz": {
-      "baseline": "1.8.0",
+      "baseline": "2.0.0",
       "port-version": 0
     },
     "rapidjson": {
-      "baseline": "2022-06-28",
-      "port-version": 3
+      "baseline": "2023-07-17",
+      "port-version": 1
     },
     "rapidxml": {
       "baseline": "1.13",
-      "port-version": 5
+      "port-version": 6
     },
     "rapidxml-ns": {
       "baseline": "1.13.2",
-      "port-version": 1
+      "port-version": 2
     },
     "rappture": {
       "baseline": "1.9",
-      "port-version": 2
+      "port-version": 4
     },
     "raygui": {
-      "baseline": "3.2",
+      "baseline": "4.0",
       "port-version": 0
     },
     "raylib": {
-      "baseline": "4.5.0",
+      "baseline": "5.0",
       "port-version": 0
     },
     "rbdl": {
-      "baseline": "3.2.0",
-      "port-version": 4
+      "baseline": "3.3.0",
+      "port-version": 5
     },
     "rbdl-orb": {
       "baseline": "3.2.0",
       "port-version": 2
     },
     "re2": {
-      "baseline": "2023-02-01",
+      "baseline": "2023-07-01",
       "port-version": 0
     },
     "reactiveplusplus": {
-      "baseline": "0.2.2",
+      "baseline": "2.0.0",
       "port-version": 0
     },
     "readerwriterqueue": {
@@ -6830,7 +7490,7 @@
     },
     "readline": {
       "baseline": "0",
-      "port-version": 3
+      "port-version": 5
     },
     "readline-osx": {
       "baseline": "2020-01-04",
@@ -6838,42 +7498,46 @@
     },
     "readline-unix": {
       "baseline": "8.2",
-      "port-version": 0
+      "port-version": 1
     },
     "readline-win32": {
       "baseline": "5.0",
-      "port-version": 5
+      "port-version": 8
     },
     "readosm": {
       "baseline": "1.1.0a",
       "port-version": 4
     },
     "realsense2": {
-      "baseline": "2.53.1",
-      "port-version": 0
+      "baseline": "2.54.2",
+      "port-version": 2
     },
     "recast": {
-      "baseline": "1.5.1",
-      "port-version": 6
+      "baseline": "deprecated",
+      "port-version": 0
+    },
+    "recastnavigation": {
+      "baseline": "1.6.0",
+      "port-version": 1
     },
     "recycle": {
       "baseline": "6.0.0",
       "port-version": 0
     },
     "redis-plus-plus": {
-      "baseline": "1.3.7",
+      "baseline": "1.3.10",
       "port-version": 0
     },
     "refl-cpp": {
-      "baseline": "0.12.3",
-      "port-version": 1
+      "baseline": "0.12.4",
+      "port-version": 0
     },
     "refprop-headers": {
-      "baseline": "2019-04-14",
-      "port-version": 1
+      "baseline": "2022-12-07",
+      "port-version": 0
     },
     "rendergraph": {
-      "baseline": "1.2.0",
+      "baseline": "1.4.0",
       "port-version": 0
     },
     "replxx": {
@@ -6882,7 +7546,7 @@
     },
     "reproc": {
       "baseline": "14.2.4",
-      "port-version": 1
+      "port-version": 2
     },
     "rest-rpc": {
       "baseline": "0.07",
@@ -6890,7 +7554,7 @@
     },
     "restbed": {
       "baseline": "4.8",
-      "port-version": 2
+      "port-version": 3
     },
     "restc-cpp": {
       "baseline": "0.10.0",
@@ -6901,7 +7565,7 @@
       "port-version": 0
     },
     "restinio": {
-      "baseline": "0.6.17",
+      "baseline": "0.7.1",
       "port-version": 0
     },
     "rexo": {
@@ -6909,16 +7573,16 @@
       "port-version": 0
     },
     "rhash": {
-      "baseline": "1.4.2",
-      "port-version": 1
+      "baseline": "1.4.4",
+      "port-version": 0
     },
     "rhasheq": {
-      "baseline": "0.0.1",
+      "baseline": "2023-06-17",
       "port-version": 0
     },
     "riffcpp": {
       "baseline": "2.2.4",
-      "port-version": 2
+      "port-version": 3
     },
     "ring-span-lite": {
       "baseline": "0.6.0",
@@ -6928,16 +7592,24 @@
       "baseline": "0.2.1",
       "port-version": 0
     },
+    "rivers": {
+      "baseline": "2022-05-16",
+      "port-version": 0
+    },
     "rkcommon": {
       "baseline": "1.10.0",
       "port-version": 0
     },
     "rmlui": {
-      "baseline": "5.0",
+      "baseline": "5.1",
+      "port-version": 0
+    },
+    "rmqcpp": {
+      "baseline": "1.0.0",
       "port-version": 0
     },
     "roaring": {
-      "baseline": "0.9.6",
+      "baseline": "2.0.4",
       "port-version": 0
     },
     "robin-hood-hashing": {
@@ -6949,7 +7621,7 @@
       "port-version": 0
     },
     "rocksdb": {
-      "baseline": "7.10.2",
+      "baseline": "8.10.0",
       "port-version": 0
     },
     "rpclib": {
@@ -6958,39 +7630,39 @@
     },
     "rply": {
       "baseline": "1.1.4",
-      "port-version": 2
+      "port-version": 3
     },
     "rsasynccpp": {
       "baseline": "0.0.7",
-      "port-version": 1
+      "port-version": 3
     },
     "rsig": {
       "baseline": "0.1.1",
       "port-version": 0
     },
     "rsm-binary-io": {
-      "baseline": "2.0.5",
+      "baseline": "2.0.6",
       "port-version": 0
     },
     "rsm-bsa": {
-      "baseline": "4.0.3",
+      "baseline": "4.1.0",
       "port-version": 0
     },
     "rsm-mmio": {
-      "baseline": "1.1.0",
-      "port-version": 2
+      "baseline": "2.0.0",
+      "port-version": 0
     },
     "rsocket": {
       "baseline": "2021.08.30.00",
-      "port-version": 1
+      "port-version": 3
     },
     "rtabmap": {
-      "baseline": "0.20.23",
-      "port-version": 2
+      "baseline": "0.21.0",
+      "port-version": 3
     },
     "rtaudio": {
-      "baseline": "2021-11-16",
-      "port-version": 1
+      "baseline": "6.0.1",
+      "port-version": 0
     },
     "rtlsdr": {
       "baseline": "2020-04-16",
@@ -7002,14 +7674,14 @@
     },
     "rtmidi": {
       "baseline": "5.0.0",
-      "port-version": 2
+      "port-version": 3
     },
     "rttr": {
       "baseline": "0.9.6+20210811",
       "port-version": 0
     },
     "rubberband": {
-      "baseline": "3.1.1",
+      "baseline": "3.3.0",
       "port-version": 0
     },
     "rxcpp": {
@@ -7030,14 +7702,14 @@
     },
     "ryu": {
       "baseline": "2.0",
-      "port-version": 6
+      "port-version": 9
     },
     "s2geometry": {
-      "baseline": "0.10.0",
+      "baseline": "0.11.1",
       "port-version": 0
     },
     "s2n": {
-      "baseline": "1.3.34",
+      "baseline": "1.3.56",
       "port-version": 0
     },
     "safeint": {
@@ -7045,36 +7717,44 @@
       "port-version": 0
     },
     "sail": {
-      "baseline": "0.9.0-rc3",
-      "port-version": 1
-    },
-    "sais": {
-      "baseline": "2.4.1",
-      "port-version": 4
+      "baseline": "0.9.1",
+      "port-version": 0
     },
     "sajson": {
       "baseline": "2018-09-21",
-      "port-version": 2
+      "port-version": 3
+    },
+    "salome-configuration": {
+      "baseline": "9.10.0",
+      "port-version": 0
+    },
+    "salome-med-fichier": {
+      "baseline": "4.1.1",
+      "port-version": 1
+    },
+    "salome-medcoupling": {
+      "baseline": "9.10.0",
+      "port-version": 0
     },
     "sassc": {
       "baseline": "3.6.2",
       "port-version": 0
     },
     "saucer": {
-      "baseline": "1.0.1",
-      "port-version": 2
+      "baseline": "2.1.0",
+      "port-version": 0
     },
     "sbp": {
       "baseline": "3.4.10",
       "port-version": 1
     },
     "scenepic": {
-      "baseline": "1.0.16",
+      "baseline": "1.1.0",
       "port-version": 1
     },
     "scintilla": {
       "baseline": "4.4.6",
-      "port-version": 1
+      "port-version": 3
     },
     "sciplot": {
       "baseline": "0.3.1",
@@ -7085,29 +7765,41 @@
       "port-version": 1
     },
     "sciter-js": {
-      "baseline": "4.4.8.31",
+      "baseline": "5.0.3.0",
       "port-version": 0
     },
     "scnlib": {
-      "baseline": "1.0",
-      "port-version": 1
+      "baseline": "1.1.2",
+      "port-version": 0
     },
     "scope-guard": {
       "baseline": "1.1.0",
       "port-version": 0
     },
+    "scotch": {
+      "baseline": "7.0.3",
+      "port-version": 0
+    },
     "scottt-debugbreak": {
       "baseline": "1.0",
       "port-version": 0
     },
     "scylla-wrapper": {
       "baseline": "2018-08-26-16e6f435",
-      "port-version": 2
+      "port-version": 3
+    },
+    "sdbus-cpp": {
+      "baseline": "1.3.0",
+      "port-version": 1
     },
     "sdformat10": {
       "baseline": "10.0.0",
       "port-version": 3
     },
+    "sdformat13": {
+      "baseline": "13.5.0",
+      "port-version": 1
+    },
     "sdformat6": {
       "baseline": "6.2.0",
       "port-version": 6
@@ -7118,46 +7810,58 @@
     },
     "sdl1": {
       "baseline": "1.2.15",
-      "port-version": 17
+      "port-version": 19
+    },
+    "sdl1-mixer": {
+      "baseline": "2023-03-25",
+      "port-version": 2
     },
     "sdl1-net": {
       "baseline": "1.2.8",
-      "port-version": 5
+      "port-version": 6
     },
     "sdl2": {
-      "baseline": "2.26.4",
+      "baseline": "2.30.0",
       "port-version": 0
     },
     "sdl2-gfx": {
       "baseline": "1.0.4",
-      "port-version": 9
+      "port-version": 11
     },
     "sdl2-image": {
       "baseline": "2.6.3",
-      "port-version": 0
+      "port-version": 1
     },
     "sdl2-mixer": {
-      "baseline": "2.6.3",
+      "baseline": "2.8.0",
+      "port-version": 0
+    },
+    "sdl2-mixer-ext": {
+      "baseline": "2.6.0",
       "port-version": 1
     },
     "sdl2-net": {
       "baseline": "2.2.0",
-      "port-version": 1
+      "port-version": 3
     },
     "sdl2-ttf": {
       "baseline": "2.20.2",
-      "port-version": 0
+      "port-version": 1
     },
     "sdl2pp": {
       "baseline": "0.16.1",
-      "port-version": 7
+      "port-version": 8
     },
     "seacas": {
       "baseline": "2022-11-22",
-      "port-version": 2
+      "port-version": 5
     },
     "seal": {
       "baseline": "4.1.1",
+      "port-version": 1
+    },
+    "seasocks": {
+      "baseline": "1.4.6",
       "port-version": 0
     },
     "secp256k1": {
@@ -7169,12 +7873,12 @@
       "port-version": 6
     },
     "sentencepiece": {
-      "baseline": "0.1.97",
-      "port-version": 2
+      "baseline": "0.1.99",
+      "port-version": 1
     },
     "sentry-native": {
-      "baseline": "0.6.0",
-      "port-version": 0
+      "baseline": "0.7.0",
+      "port-version": 1
     },
     "septag-dmon": {
       "baseline": "2022-02-08",
@@ -7182,15 +7886,15 @@
     },
     "septag-sx": {
       "baseline": "2019-05-07",
-      "port-version": 4
+      "port-version": 5
     },
     "seqan": {
       "baseline": "2.4.0",
-      "port-version": 2
+      "port-version": 3
     },
     "serd": {
       "baseline": "0.30.4",
-      "port-version": 1
+      "port-version": 2
     },
     "serdepp": {
       "baseline": "0.1.4.1",
@@ -7198,35 +7902,35 @@
     },
     "sf2cute": {
       "baseline": "0.2.0",
-      "port-version": 3
+      "port-version": 4
     },
     "sfgui": {
       "baseline": "0.4.0",
       "port-version": 6
     },
     "sfml": {
-      "baseline": "2.5.1",
-      "port-version": 14
+      "baseline": "2.6.1",
+      "port-version": 0
     },
     "sfsexp": {
       "baseline": "1.3.1",
       "port-version": 1
     },
     "shader-slang": {
-      "baseline": "0.24.43",
-      "port-version": 1
+      "baseline": "2023.5.1",
+      "port-version": 0
     },
     "shaderc": {
-      "baseline": "2021.1",
-      "port-version": 3
+      "baseline": "2023.7",
+      "port-version": 0
     },
     "shaderwriter": {
-      "baseline": "2.5.0",
+      "baseline": "2.7.0",
       "port-version": 0
     },
     "shapelib": {
-      "baseline": "1.5.0",
-      "port-version": 3
+      "baseline": "1.6.0",
+      "port-version": 0
     },
     "shiftmedia-libgcrypt": {
       "baseline": "1.10.1-1",
@@ -7234,64 +7938,80 @@
     },
     "shiftmedia-libgnutls": {
       "baseline": "3.7.6",
-      "port-version": 0
+      "port-version": 3
     },
     "shiftmedia-libgpg-error": {
       "baseline": "1.45",
-      "port-version": 0
+      "port-version": 1
     },
     "shiva": {
       "baseline": "1.0",
-      "port-version": 5
-    },
-    "shiva-sfml": {
-      "baseline": "1.0",
-      "port-version": 3
+      "port-version": 7
     },
     "shogun": {
       "baseline": "6.1.4",
-      "port-version": 8
+      "port-version": 9
+    },
+    "si": {
+      "baseline": "2.5.1",
+      "port-version": 0
+    },
+    "sigmatch": {
+      "baseline": "0.2.0",
+      "port-version": 0
     },
     "signalrclient": {
       "baseline": "1.0.0-beta1-9",
-      "port-version": 3
+      "port-version": 5
     },
     "sigslot": {
       "baseline": "1.0.0",
-      "port-version": 4
+      "port-version": 5
     },
     "simage": {
-      "baseline": "1.8.2",
-      "port-version": 2
+      "baseline": "1.8.3",
+      "port-version": 0
     },
     "simbody": {
       "baseline": "2023-01-10",
       "port-version": 0
     },
     "simd": {
-      "baseline": "5.2.123",
+      "baseline": "5.3.128",
       "port-version": 0
     },
     "simde": {
-      "baseline": "0.7.2",
-      "port-version": 1
+      "baseline": "0.7.6",
+      "port-version": 0
     },
     "simdjson": {
-      "baseline": "3.1.5",
+      "baseline": "3.6.2",
       "port-version": 0
     },
     "simdutf": {
-      "baseline": "1.0.0",
-      "port-version": 1
+      "baseline": "3.2.16",
+      "port-version": 0
+    },
+    "simonbrunel-qtpromise": {
+      "baseline": "0.7.0",
+      "port-version": 0
     },
     "simple-fft": {
       "baseline": "2020-06-14",
-      "port-version": 1
+      "port-version": 2
+    },
+    "simpleble": {
+      "baseline": "2023-07-29",
+      "port-version": 0
     },
     "simpleini": {
       "baseline": "4.19",
       "port-version": 0
     },
+    "simsimd": {
+      "baseline": "1.4.0",
+      "port-version": 0
+    },
     "sjpeg": {
       "baseline": "2021-10-31",
       "port-version": 0
@@ -7301,8 +8021,8 @@
       "port-version": 0
     },
     "skia": {
-      "baseline": "0.36.0",
-      "port-version": 7
+      "baseline": "0.38.2",
+      "port-version": 4
     },
     "skyr-url": {
       "baseline": "1.13.0",
@@ -7310,11 +8030,11 @@
     },
     "sleef": {
       "baseline": "3.5.1",
-      "port-version": 3
+      "port-version": 4
     },
     "sleepy-discord": {
       "baseline": "2022-02-05",
-      "port-version": 0
+      "port-version": 2
     },
     "slikenet": {
       "baseline": "2021-06-07",
@@ -7322,7 +8042,7 @@
     },
     "sltbench": {
       "baseline": "2.4.0",
-      "port-version": 1
+      "port-version": 3
     },
     "smf": {
       "baseline": "0.1.1",
@@ -7330,43 +8050,51 @@
     },
     "smpeg2": {
       "baseline": "2.0.0",
-      "port-version": 8
+      "port-version": 10
+    },
+    "snap7": {
+      "baseline": "1.4.2",
+      "port-version": 1
     },
     "snappy": {
-      "baseline": "1.1.9",
-      "port-version": 5
+      "baseline": "1.1.10",
+      "port-version": 0
     },
     "sndfile": {
       "baseline": "0",
-      "port-version": 1
+      "port-version": 2
+    },
+    "snitch": {
+      "baseline": "1.2.4",
+      "port-version": 0
     },
     "snowhouse": {
       "baseline": "5.0.0",
-      "port-version": 1
+      "port-version": 2
     },
     "so5extra": {
-      "baseline": "1.5.2",
+      "baseline": "1.6.1",
       "port-version": 0
     },
     "sobjectizer": {
-      "baseline": "5.7.4.2",
+      "baseline": "5.8.1.1",
       "port-version": 0
     },
     "soci": {
       "baseline": "4.0.3",
-      "port-version": 0
+      "port-version": 3
     },
     "socket-io-client": {
-      "baseline": "2022-08-19",
+      "baseline": "2023-11-11",
       "port-version": 0
     },
     "sockpp": {
-      "baseline": "0.7.1",
-      "port-version": 1
+      "baseline": "0.8.1",
+      "port-version": 0
     },
     "soem": {
-      "baseline": "1.4.0",
-      "port-version": 4
+      "baseline": "2023-06-09",
+      "port-version": 1
     },
     "soil": {
       "baseline": "2021-04-22",
@@ -7374,14 +8102,14 @@
     },
     "soil2": {
       "baseline": "1.3.0",
-      "port-version": 0
+      "port-version": 1
     },
     "sokol": {
-      "baseline": "2019-09-09",
-      "port-version": 1
+      "baseline": "2023-10-07",
+      "port-version": 0
     },
     "sol2": {
-      "baseline": "3.3.0",
+      "baseline": "3.3.1",
       "port-version": 0
     },
     "solid3": {
@@ -7389,7 +8117,7 @@
       "port-version": 2
     },
     "sophus": {
-      "baseline": "2021-09-14",
+      "baseline": "1.22.10",
       "port-version": 0
     },
     "soqt": {
@@ -7398,19 +8126,19 @@
     },
     "sord": {
       "baseline": "0.16.4",
-      "port-version": 1
+      "port-version": 2
     },
     "soundtouch": {
-      "baseline": "2.3.1",
-      "port-version": 2
+      "baseline": "2.3.2",
+      "port-version": 1
     },
     "soxr": {
       "baseline": "0.1.3",
-      "port-version": 7
+      "port-version": 8
     },
     "spaceland": {
       "baseline": "7.8.2",
-      "port-version": 6
+      "port-version": 8
     },
     "span-lite": {
       "baseline": "0.10.3",
@@ -7422,11 +8150,11 @@
     },
     "sparsepp": {
       "baseline": "1.22",
-      "port-version": 3
+      "port-version": 4
     },
     "spatialite-tools": {
-      "baseline": "5.0.1",
-      "port-version": 2
+      "baseline": "5.1.0-a",
+      "port-version": 0
     },
     "spdk": {
       "baseline": "19.01.1",
@@ -7445,7 +8173,7 @@
       "port-version": 3
     },
     "spdlog": {
-      "baseline": "1.11.0",
+      "baseline": "1.13.0",
       "port-version": 0
     },
     "spectra": {
@@ -7458,7 +8186,7 @@
     },
     "speexdsp": {
       "baseline": "1.2.1",
-      "port-version": 0
+      "port-version": 1
     },
     "spine-runtimes": {
       "baseline": "4.1.0",
@@ -7466,63 +8194,59 @@
     },
     "spirit-po": {
       "baseline": "1.1.2",
-      "port-version": 2
+      "port-version": 3
     },
     "spirv-cross": {
-      "baseline": "2021-01-15",
-      "port-version": 2
+      "baseline": "1.3.275.0",
+      "port-version": 0
     },
     "spirv-headers": {
-      "baseline": "1.3.231.1",
-      "port-version": 1
+      "baseline": "1.3.275.0",
+      "port-version": 0
     },
     "spirv-reflect": {
-      "baseline": "1.3.236.0",
+      "baseline": "1.3.275.0",
       "port-version": 0
     },
     "spirv-tools": {
-      "baseline": "2022.4",
-      "port-version": 0
-    },
-    "spix": {
-      "baseline": "0.4",
+      "baseline": "1.3.275.0",
       "port-version": 0
     },
     "spout2": {
-      "baseline": "2.007.009",
+      "baseline": "2.007.010",
       "port-version": 0
     },
     "sprout": {
       "baseline": "2019-06-20",
-      "port-version": 1
+      "port-version": 2
     },
     "spscqueue": {
       "baseline": "1.1",
-      "port-version": 2
+      "port-version": 3
     },
     "sqlcipher": {
-      "baseline": "4.5.2",
+      "baseline": "4.5.4",
       "port-version": 0
     },
     "sqlite-modern-cpp": {
       "baseline": "3.2-936cd0c8",
-      "port-version": 1
+      "port-version": 2
     },
     "sqlite-orm": {
-      "baseline": "1.8.1",
-      "port-version": 0
+      "baseline": "1.8.2",
+      "port-version": 1
     },
     "sqlite3": {
-      "baseline": "3.40.1",
-      "port-version": 1
+      "baseline": "3.45.0",
+      "port-version": 0
     },
     "sqlitecpp": {
-      "baseline": "3.2.0",
-      "port-version": 1
+      "baseline": "3.3.1",
+      "port-version": 0
     },
     "sqlpp11": {
-      "baseline": "0.61",
-      "port-version": 2
+      "baseline": "0.64",
+      "port-version": 0
     },
     "sqlpp11-connector-mysql": {
       "baseline": "0.61",
@@ -7538,7 +8262,7 @@
     },
     "sratom": {
       "baseline": "0.6.4",
-      "port-version": 1
+      "port-version": 2
     },
     "srell": {
       "baseline": "3.010",
@@ -7549,11 +8273,15 @@
       "port-version": 0
     },
     "sse2neon": {
-      "baseline": "1.5.1",
-      "port-version": 1
+      "baseline": "1.6.0",
+      "port-version": 0
+    },
+    "stackwalker": {
+      "baseline": "2023-06-24",
+      "port-version": 0
     },
     "starlink-ast": {
-      "baseline": "9.2.7",
+      "baseline": "9.2.10",
       "port-version": 1
     },
     "staticjson": {
@@ -7561,23 +8289,23 @@
       "port-version": 0
     },
     "status-code": {
-      "baseline": "2023-01-27",
+      "baseline": "2023-11-06",
       "port-version": 1
     },
     "status-value-lite": {
       "baseline": "1.1.0",
-      "port-version": 2
+      "port-version": 3
     },
     "stb": {
-      "baseline": "2022-09-09",
-      "port-version": 0
+      "baseline": "2023-04-11",
+      "port-version": 1
     },
     "stdexec": {
-      "baseline": "2023-03-05",
-      "port-version": 0
+      "baseline": "2023-09-06",
+      "port-version": 3
     },
     "stduuid": {
-      "baseline": "1.2.2",
+      "baseline": "1.2.3",
       "port-version": 0
     },
     "stftpitchshift": {
@@ -7585,19 +8313,19 @@
       "port-version": 0
     },
     "stlab": {
-      "baseline": "1.6.2",
-      "port-version": 2
+      "baseline": "1.7.1",
+      "port-version": 1
     },
     "stormlib": {
       "baseline": "2019-05-10",
-      "port-version": 4
+      "port-version": 5
     },
     "strict-variant": {
       "baseline": "0.5",
-      "port-version": 1
+      "port-version": 2
     },
     "string-theory": {
-      "baseline": "3.6",
+      "baseline": "3.8",
       "port-version": 0
     },
     "string-view-lite": {
@@ -7605,7 +8333,7 @@
       "port-version": 1
     },
     "strong-type": {
-      "baseline": "8",
+      "baseline": "12",
       "port-version": 0
     },
     "stronk": {
@@ -7614,7 +8342,7 @@
     },
     "strtk": {
       "baseline": "2020-09-14",
-      "port-version": 1
+      "port-version": 3
     },
     "stx": {
       "baseline": "0.0.3",
@@ -7622,7 +8350,7 @@
     },
     "stxxl": {
       "baseline": "2018-11-15",
-      "port-version": 6
+      "port-version": 7
     },
     "suitesparse": {
       "baseline": "5.8.0",
@@ -7633,56 +8361,68 @@
       "port-version": 0
     },
     "superlu": {
-      "baseline": "5.3.0",
-      "port-version": 1
+      "baseline": "6.0.0",
+      "port-version": 0
+    },
+    "swenson-sort": {
+      "baseline": "2021-05-22",
+      "port-version": 0
     },
     "symengine": {
-      "baseline": "0.9.0",
+      "baseline": "0.11.1",
       "port-version": 0
     },
     "systemc": {
       "baseline": "2.3.3",
-      "port-version": 7
+      "port-version": 8
     },
     "szip": {
       "baseline": "2.1.1",
-      "port-version": 10
+      "port-version": 12
     },
     "tabulate": {
-      "baseline": "1.4",
+      "baseline": "1.5",
       "port-version": 0
     },
     "tacopie": {
       "baseline": "3.2.0",
-      "port-version": 4
+      "port-version": 6
     },
     "taglib": {
-      "baseline": "1.13.0",
+      "baseline": "1.13.1",
+      "port-version": 1
+    },
+    "talib": {
+      "baseline": "0.4.0",
       "port-version": 1
     },
     "taocpp-json": {
       "baseline": "2020-09-14",
-      "port-version": 2
+      "port-version": 3
     },
     "tap-windows6": {
       "baseline": "9.21.2-0e30f5c",
-      "port-version": 1
+      "port-version": 2
+    },
+    "task-thread-pool": {
+      "baseline": "1.0.7",
+      "port-version": 0
     },
     "taskflow": {
-      "baseline": "3.5.0",
+      "baseline": "3.6.0",
       "port-version": 0
     },
     "tbb": {
-      "baseline": "2021.8.0",
+      "baseline": "2021.11.0",
       "port-version": 0
     },
     "tcb-span": {
-      "baseline": "2021-12-15",
+      "baseline": "2022-06-15",
       "port-version": 0
     },
     "tcl": {
       "baseline": "core-9-0-a1",
-      "port-version": 5
+      "port-version": 6
     },
     "tclap": {
       "baseline": "1.2.5",
@@ -7692,13 +8432,9 @@
       "baseline": "1.0.3",
       "port-version": 0
     },
-    "teemo": {
-      "baseline": "2.7",
-      "port-version": 0
-    },
     "telnetpp": {
       "baseline": "2.1.2",
-      "port-version": 2
+      "port-version": 3
     },
     "tensorflow": {
       "baseline": "2.10.0",
@@ -7714,14 +8450,14 @@
     },
     "tensorpipe": {
       "baseline": "2022-03-16",
-      "port-version": 2
+      "port-version": 5
     },
     "termcolor": {
       "baseline": "2.1.0",
       "port-version": 0
     },
     "tesseract": {
-      "baseline": "5.3.0",
+      "baseline": "5.3.4",
       "port-version": 0
     },
     "tfhe": {
@@ -7729,47 +8465,51 @@
       "port-version": 5
     },
     "tgbot-cpp": {
-      "baseline": "1.6",
+      "baseline": "1.7.2",
       "port-version": 0
     },
     "tgc": {
       "baseline": "2019-08-11",
-      "port-version": 3
+      "port-version": 4
     },
     "tgui": {
-      "baseline": "0.9.5",
-      "port-version": 0
+      "baseline": "1.1.0",
+      "port-version": 1
     },
     "theia": {
       "baseline": "0.8",
-      "port-version": 8
+      "port-version": 9
     },
     "think-cell-range": {
-      "baseline": "498839d",
+      "baseline": "2023.1",
+      "port-version": 0
+    },
+    "thomasmonkman-filewatch": {
+      "baseline": "2023-01-16",
       "port-version": 2
     },
     "thor": {
-      "baseline": "2.0",
-      "port-version": 6
+      "baseline": "2022-04-16",
+      "port-version": 0
     },
     "thorvg": {
-      "baseline": "0.8.3",
+      "baseline": "0.12.1",
       "port-version": 0
     },
     "threadpool": {
       "baseline": "0.2.5",
-      "port-version": 2
+      "port-version": 3
     },
     "thrift": {
-      "baseline": "0.16.0",
+      "baseline": "0.19.0",
       "port-version": 0
     },
     "tidy-html5": {
       "baseline": "5.8.0",
-      "port-version": 0
+      "port-version": 1
     },
     "tiff": {
-      "baseline": "4.5.0",
+      "baseline": "4.6.0",
       "port-version": 2
     },
     "tinkerforge": {
@@ -7778,23 +8518,23 @@
     },
     "tiny-aes-c": {
       "baseline": "2019-07-31",
-      "port-version": 2
+      "port-version": 3
     },
     "tiny-bignum-c": {
       "baseline": "2019-07-31",
-      "port-version": 2
+      "port-version": 3
     },
     "tiny-dnn": {
       "baseline": "2018-10-25",
-      "port-version": 1
+      "port-version": 2
     },
     "tiny-process-library": {
       "baseline": "2.0.4",
-      "port-version": 2
+      "port-version": 3
     },
     "tiny-regex-c": {
       "baseline": "2019-07-31",
-      "port-version": 2
+      "port-version": 3
     },
     "tinycbor": {
       "baseline": "0.6.0",
@@ -7802,7 +8542,7 @@
     },
     "tinycthread": {
       "baseline": "2019-08-06",
-      "port-version": 2
+      "port-version": 3
     },
     "tinydir": {
       "baseline": "1.2.5",
@@ -7814,28 +8554,36 @@
     },
     "tinyexpr": {
       "baseline": "2020-09-25",
-      "port-version": 1
+      "port-version": 2
     },
     "tinyexr": {
-      "baseline": "1.0.1",
+      "baseline": "1.0.5",
       "port-version": 0
     },
     "tinyfiledialogs": {
       "baseline": "3.8.8",
       "port-version": 4
     },
+    "tinyfsm": {
+      "baseline": "0.3.3",
+      "port-version": 0
+    },
     "tinygltf": {
-      "baseline": "2.8.4",
+      "baseline": "2.8.20",
       "port-version": 0
     },
     "tinynpy": {
       "baseline": "1.0.0",
-      "port-version": 5
+      "port-version": 6
     },
     "tinyobjloader": {
       "baseline": "2.0.0-rc9",
       "port-version": 0
     },
+    "tinyorm": {
+      "baseline": "0.36.5",
+      "port-version": 2
+    },
     "tinyply": {
       "baseline": "2.3.4",
       "port-version": 0
@@ -7846,11 +8594,11 @@
     },
     "tinythread": {
       "baseline": "1.1",
-      "port-version": 5
+      "port-version": 6
     },
     "tinytoml": {
       "baseline": "20180219",
-      "port-version": 2
+      "port-version": 3
     },
     "tinyutf8": {
       "baseline": "4.4.3",
@@ -7858,19 +8606,19 @@
     },
     "tinyxml": {
       "baseline": "2.6.2",
-      "port-version": 9
+      "port-version": 10
     },
     "tinyxml2": {
       "baseline": "9.0.0",
       "port-version": 2
     },
     "tl-expected": {
-      "baseline": "2022-11-24",
+      "baseline": "1.1.0",
       "port-version": 0
     },
     "tl-function-ref": {
       "baseline": "1.0.0",
-      "port-version": 3
+      "port-version": 4
     },
     "tl-generator": {
       "baseline": "2021-09-28",
@@ -7886,15 +8634,15 @@
     },
     "tlx": {
       "baseline": "0.5.20191212",
-      "port-version": 3
+      "port-version": 4
     },
     "tmx": {
       "baseline": "1.2.0",
       "port-version": 2
     },
     "tmxlite": {
-      "baseline": "1.3.0",
-      "port-version": 1
+      "baseline": "1.4.4",
+      "port-version": 0
     },
     "tmxparser": {
       "baseline": "2019-10-14",
@@ -7905,11 +8653,7 @@
       "port-version": 0
     },
     "tomlplusplus": {
-      "baseline": "3.1.0",
-      "port-version": 0
-    },
-    "tool-meson": {
-      "baseline": "2022-01-21",
+      "baseline": "3.4.0",
       "port-version": 0
     },
     "torch-th": {
@@ -7917,24 +8661,28 @@
       "port-version": 4
     },
     "tracy": {
-      "baseline": "0.9.0",
-      "port-version": 3
+      "baseline": "0.10.0",
+      "port-version": 1
     },
     "transwarp": {
       "baseline": "2.2.2",
       "port-version": 0
     },
     "trantor": {
-      "baseline": "1.5.11",
+      "baseline": "1.5.16",
       "port-version": 0
     },
     "tre": {
       "baseline": "0.8.0",
-      "port-version": 5
+      "port-version": 6
+    },
+    "tree-similarity": {
+      "baseline": "0.1.1",
+      "port-version": 1
     },
     "tree-sitter": {
       "baseline": "0.20.6",
-      "port-version": 0
+      "port-version": 1
     },
     "treehh": {
       "baseline": "3.18",
@@ -7942,36 +8690,40 @@
     },
     "treehopper": {
       "baseline": "1.11.3",
-      "port-version": 6
+      "port-version": 9
     },
     "triangle": {
       "baseline": "1.6",
       "port-version": 3
     },
     "triton": {
-      "baseline": "0.9",
-      "port-version": 5
+      "baseline": "2023-08-16",
+      "port-version": 0
     },
     "trompeloeil": {
-      "baseline": "43",
+      "baseline": "45",
       "port-version": 0
     },
     "tsl-hopscotch-map": {
       "baseline": "2.3.0",
-      "port-version": 2
+      "port-version": 3
     },
     "tsl-ordered-map": {
       "baseline": "1.0.0",
-      "port-version": 2
+      "port-version": 3
     },
     "tsl-sparse-map": {
       "baseline": "0.6.2",
-      "port-version": 2
+      "port-version": 3
     },
     "ttauri": {
       "baseline": "0.5.0",
       "port-version": 2
     },
+    "tuplet": {
+      "baseline": "2.1.1",
+      "port-version": 0
+    },
     "turbobase64": {
       "baseline": "2020-01-12",
       "port-version": 3
@@ -7986,31 +8738,35 @@
     },
     "type-lite": {
       "baseline": "0.1.0",
-      "port-version": 2
+      "port-version": 3
     },
     "type-safe": {
-      "baseline": "0.2.2",
-      "port-version": 1
+      "baseline": "0.2.3",
+      "port-version": 0
     },
     "uchardet": {
       "baseline": "0.0.8",
       "port-version": 0
     },
+    "udt": {
+      "baseline": "4.11",
+      "port-version": 0
+    },
     "umock-c": {
       "baseline": "2022-01-21",
       "port-version": 1
     },
     "uni-algo": {
-      "baseline": "0.7.0",
+      "baseline": "1.0.0",
       "port-version": 0
     },
     "unicorn": {
-      "baseline": "1.0.3",
+      "baseline": "2.0.1",
       "port-version": 0
     },
     "unicorn-lib": {
       "baseline": "2022-01-24",
-      "port-version": 0
+      "port-version": 2
     },
     "units": {
       "baseline": "2.3.3",
@@ -8018,26 +8774,30 @@
     },
     "unittest-cpp": {
       "baseline": "2.0.0",
-      "port-version": 4
+      "port-version": 5
     },
     "unixodbc": {
       "baseline": "2.3.11",
       "port-version": 2
     },
+    "unordered-dense": {
+      "baseline": "4.4.0",
+      "port-version": 0
+    },
     "unqlite": {
       "baseline": "1.1.9",
-      "port-version": 1
+      "port-version": 2
     },
     "unrar": {
       "baseline": "6.1.7",
-      "port-version": 1
+      "port-version": 3
     },
     "upb": {
       "baseline": "2022-06-21",
-      "port-version": 0
+      "port-version": 1
     },
     "urdfdom": {
-      "baseline": "3.1.0",
+      "baseline": "3.1.1",
       "port-version": 0
     },
     "urdfdom-headers": {
@@ -8046,27 +8806,35 @@
     },
     "urho3d": {
       "baseline": "2021-03-01",
-      "port-version": 3
+      "port-version": 5
     },
     "uriparser": {
       "baseline": "0.9.7",
       "port-version": 0
     },
     "usbmuxd": {
-      "baseline": "1.2.235",
-      "port-version": 3
+      "baseline": "2023-07-21",
+      "port-version": 1
     },
     "usd": {
-      "baseline": "23.2",
+      "baseline": "23.5",
+      "port-version": 3
+    },
+    "usearch": {
+      "baseline": "2.3.2",
       "port-version": 0
     },
     "usockets": {
-      "baseline": "0.8.5",
-      "port-version": 0
+      "baseline": "0.8.6",
+      "port-version": 1
     },
     "usrsctp": {
       "baseline": "0.9.5.0",
-      "port-version": 1
+      "port-version": 3
+    },
+    "utf8-range": {
+      "baseline": "2023-11-09",
+      "port-version": 0
     },
     "utf8h": {
       "baseline": "2021-11-18",
@@ -8077,12 +8845,12 @@
       "port-version": 1
     },
     "utfcpp": {
-      "baseline": "3.2.3",
+      "baseline": "4.0.5",
       "port-version": 0
     },
     "utfz": {
       "baseline": "1.2",
-      "port-version": 3
+      "port-version": 4
     },
     "uthash": {
       "baseline": "2.3.0",
@@ -8093,15 +8861,15 @@
       "port-version": 2
     },
     "uvatlas": {
-      "baseline": "2023-02-06",
-      "port-version": 2
+      "baseline": "2023-12-31",
+      "port-version": 0
     },
     "uvw": {
-      "baseline": "2.12.1",
-      "port-version": 2
+      "baseline": "3.2.0",
+      "port-version": 0
     },
     "uwebsockets": {
-      "baseline": "20.36.0",
+      "baseline": "20.57.0",
       "port-version": 0
     },
     "v-hacd": {
@@ -8110,10 +8878,10 @@
     },
     "v8": {
       "baseline": "9.1.269.39",
-      "port-version": 5
+      "port-version": 6
     },
     "valijson": {
-      "baseline": "0.6",
+      "baseline": "1.0.1",
       "port-version": 0
     },
     "value-ptr-lite": {
@@ -8129,7 +8897,7 @@
       "port-version": 0
     },
     "vc": {
-      "baseline": "1.4.3",
+      "baseline": "1.4.4",
       "port-version": 0
     },
     "vcglib": {
@@ -8137,7 +8905,7 @@
       "port-version": 0
     },
     "vcpkg-cmake": {
-      "baseline": "2022-12-22",
+      "baseline": "2023-05-04",
       "port-version": 0
     },
     "vcpkg-cmake-config": {
@@ -8145,11 +8913,11 @@
       "port-version": 1
     },
     "vcpkg-cmake-get-vars": {
-      "baseline": "2023-03-02",
+      "baseline": "2023-12-31",
       "port-version": 0
     },
     "vcpkg-get-python-packages": {
-      "baseline": "2022-06-30",
+      "baseline": "2024-01-24",
       "port-version": 0
     },
     "vcpkg-gfortran": {
@@ -8160,12 +8928,16 @@
       "baseline": "2021-11-16",
       "port-version": 3
     },
+    "vcpkg-msbuild": {
+      "baseline": "2023-08-08",
+      "port-version": 0
+    },
     "vcpkg-pkgconfig-get-modules": {
-      "baseline": "2022-02-10",
-      "port-version": 1
+      "baseline": "2023-09-06",
+      "port-version": 0
     },
     "vcpkg-qmake": {
-      "baseline": "2022-11-16",
+      "baseline": "2023-03-22",
       "port-version": 0
     },
     "vcpkg-tool-bazel": {
@@ -8186,7 +8958,7 @@
     },
     "vcpkg-tool-meson": {
       "baseline": "0.63",
-      "port-version": 0
+      "port-version": 2
     },
     "vcpkg-tool-mozbuild": {
       "baseline": "4.0.2",
@@ -8194,7 +8966,7 @@
     },
     "vcpkg-tool-ninja": {
       "baseline": "2022-03-31",
-      "port-version": 1
+      "port-version": 2
     },
     "vcpkg-tool-nodejs": {
       "baseline": "16.18.0",
@@ -8208,6 +8980,10 @@
       "baseline": "2.02.00",
       "port-version": 0
     },
+    "veigar": {
+      "baseline": "1.0",
+      "port-version": 0
+    },
     "verdict": {
       "baseline": "1.4.0",
       "port-version": 0
@@ -8216,89 +8992,129 @@
       "baseline": "1.0.0+20221123",
       "port-version": 1
     },
+    "vincentlaucsb-csv-parser": {
+      "baseline": "2.1.3",
+      "port-version": 0
+    },
     "visit-struct": {
-      "baseline": "1.0",
-      "port-version": 3
+      "baseline": "1.1.0",
+      "port-version": 0
+    },
+    "vit-vit-ctpl": {
+      "baseline": "0.0.2",
+      "port-version": 0
     },
     "vk-bootstrap": {
-      "baseline": "0.5",
-      "port-version": 1
+      "baseline": "1.3.273",
+      "port-version": 0
     },
     "vkfft": {
-      "baseline": "1.2.17",
+      "baseline": "1.2.31",
       "port-version": 0
     },
     "vlfeat": {
       "baseline": "2020-07-10",
-      "port-version": 2
+      "port-version": 3
     },
     "vlpp": {
       "baseline": "1.1.0.0",
-      "port-version": 0
+      "port-version": 1
     },
     "volk": {
-      "baseline": "1.3.233",
-      "port-version": 1
+      "baseline": "1.3.275.0",
+      "port-version": 0
     },
     "vowpal-wabbit": {
       "baseline": "9.8.0",
-      "port-version": 0
+      "port-version": 2
     },
     "vs-yasm": {
       "baseline": "0.5.0",
+      "port-version": 2
+    },
+    "vsg": {
+      "baseline": "1.0.9",
+      "port-version": 0
+    },
+    "vsgimgui": {
+      "baseline": "0.1.0",
+      "port-version": 0
+    },
+    "vsgxchange": {
+      "baseline": "1.0.5",
       "port-version": 1
     },
     "vtk": {
       "baseline": "9.2.0-pv5.11.0",
-      "port-version": 5
+      "port-version": 10
     },
     "vtk-dicom": {
       "baseline": "0.8.14",
-      "port-version": 1
+      "port-version": 2
     },
     "vtk-m": {
       "baseline": "1.9.0",
-      "port-version": 1
+      "port-version": 2
     },
     "vulkan": {
-      "baseline": "1.1.82.1",
-      "port-version": 5
+      "baseline": "2023-12-17",
+      "port-version": 0
     },
     "vulkan-headers": {
-      "baseline": "1.3.239",
-      "port-version": 2
+      "baseline": "1.3.275.0",
+      "port-version": 0
     },
     "vulkan-hpp": {
-      "baseline": "1.3.231",
-      "port-version": 2
+      "baseline": "deprecated",
+      "port-version": 0
+    },
+    "vulkan-loader": {
+      "baseline": "1.3.275.0",
+      "port-version": 0
     },
     "vulkan-memory-allocator": {
       "baseline": "3.0.1",
-      "port-version": 1
+      "port-version": 4
     },
     "vulkan-memory-allocator-hpp": {
-      "baseline": "3.0.1",
+      "baseline": "3.0.1.1",
+      "port-version": 0
+    },
+    "vulkan-sdk-components": {
+      "baseline": "1.3.275.0",
+      "port-version": 0
+    },
+    "vulkan-tools": {
+      "baseline": "1.3.275.0",
+      "port-version": 0
+    },
+    "vulkan-utility-libraries": {
+      "baseline": "1.3.275.0",
       "port-version": 1
     },
+    "vulkan-validationlayers": {
+      "baseline": "1.3.275.0",
+      "port-version": 0
+    },
     "vvenc": {
       "baseline": "1.7.0",
       "port-version": 0
     },
     "vxl": {
       "baseline": "2.0.2",
-      "port-version": 4
+      "port-version": 5
     },
     "wampcc": {
       "baseline": "2019-09-04",
-      "port-version": 4
+      "port-version": 5
     },
     "wangle": {
-      "baseline": "2022.03.21.00",
+      "baseline": "2024.01.01.00",
       "port-version": 0
     },
     "wasmedge": {
-      "baseline": "0.12.0-alpha.1",
-      "port-version": 0
+      "baseline": "0.13.5",
+      "port-version": 1
     },
     "wavelib": {
       "baseline": "2021-11-26",
@@ -8306,7 +9122,7 @@
     },
     "wavpack": {
       "baseline": "5.6.0",
-      "port-version": 0
+      "port-version": 1
     },
     "wayland": {
       "baseline": "1.21.0",
@@ -8316,28 +9132,32 @@
       "baseline": "1.31",
       "port-version": 1
     },
+    "wcslib": {
+      "baseline": "8.2.1",
+      "port-version": 0
+    },
     "websocketpp": {
       "baseline": "0.8.2",
-      "port-version": 2
+      "port-version": 3
     },
     "webview2": {
-      "baseline": "1.0.1210.39",
+      "baseline": "1.0.2088.41",
       "port-version": 0
     },
     "wepoll": {
       "baseline": "1.5.8",
-      "port-version": 2
+      "port-version": 3
     },
     "wg21-linear-algebra": {
-      "baseline": "0.7.2",
+      "baseline": "0.7.3",
       "port-version": 0
     },
     "wg21-sg14": {
       "baseline": "2019-08-13",
-      "port-version": 1
+      "port-version": 2
     },
     "wil": {
-      "baseline": "2023-02-02",
+      "baseline": "2024-01-22",
       "port-version": 0
     },
     "wildmidi": {
@@ -8354,7 +9174,7 @@
     },
     "winpcap": {
       "baseline": "4.1.3",
-      "port-version": 8
+      "port-version": 12
     },
     "winpty": {
       "baseline": "0.4.3",
@@ -8369,40 +9189,44 @@
       "port-version": 5
     },
     "winsparkle": {
-      "baseline": "0.7.0",
-      "port-version": 1
+      "baseline": "0.8.1",
+      "port-version": 0
     },
     "wintoast": {
+      "baseline": "1.3.0",
+      "port-version": 0
+    },
+    "wmipp": {
       "baseline": "1.2.0",
-      "port-version": 2
+      "port-version": 0
     },
     "woff2": {
       "baseline": "1.0.2",
-      "port-version": 3
+      "port-version": 4
     },
     "wolfmqtt": {
-      "baseline": "1.15.0",
+      "baseline": "1.16.0",
       "port-version": 0
     },
     "wolfssl": {
-      "baseline": "5.5.4",
+      "baseline": "5.6.6",
       "port-version": 0
     },
     "wolftpm": {
       "baseline": "2.7.0",
-      "port-version": 0
+      "port-version": 2
     },
     "wordnet": {
       "baseline": "3.0",
-      "port-version": 2
+      "port-version": 3
     },
     "workflow": {
-      "baseline": "0.10.5",
-      "port-version": 1
+      "baseline": "0.10.9",
+      "port-version": 0
     },
     "wpilib": {
-      "baseline": "2020-03-02",
-      "port-version": 3
+      "baseline": "2023-08-24",
+      "port-version": 0
     },
     "wren": {
       "baseline": "0.4.0",
@@ -8410,7 +9234,7 @@
     },
     "wt": {
       "baseline": "4.9.1",
-      "port-version": 0
+      "port-version": 2
     },
     "wtl": {
       "baseline": "10.0.10320",
@@ -8418,39 +9242,39 @@
     },
     "wxchartdir": {
       "baseline": "2.0.0",
-      "port-version": 1
+      "port-version": 2
     },
     "wxcharts": {
       "baseline": "2022-07-05",
       "port-version": 0
     },
     "wxwidgets": {
-      "baseline": "3.2.2.1",
-      "port-version": 1
+      "baseline": "3.2.4",
+      "port-version": 0
     },
     "wyhash": {
       "baseline": "2023-01-25",
       "port-version": 0
     },
     "x-plane": {
-      "baseline": "3.0.3",
-      "port-version": 1
+      "baseline": "4.0.1",
+      "port-version": 0
     },
     "x264": {
-      "baseline": "0.164.3095",
-      "port-version": 2
+      "baseline": "0.164.3107",
+      "port-version": 0
     },
     "x265": {
-      "baseline": "3.4",
-      "port-version": 8
+      "baseline": "3.5",
+      "port-version": 0
     },
     "x86-simd-sort": {
-      "baseline": "2023-03-04",
+      "baseline": "4.0",
       "port-version": 0
     },
     "xapian": {
-      "baseline": "1.4.21",
-      "port-version": 1
+      "baseline": "1.4.22",
+      "port-version": 2
     },
     "xaudio2redist": {
       "baseline": "1.2.11",
@@ -8461,7 +9285,7 @@
       "port-version": 0
     },
     "xbyak": {
-      "baseline": "6.60",
+      "baseline": "6.73",
       "port-version": 0
     },
     "xcb": {
@@ -8478,7 +9302,7 @@
     },
     "xcb-proto": {
       "baseline": "1.14.1",
-      "port-version": 0
+      "port-version": 1
     },
     "xcb-render-util": {
       "baseline": "0.3.10",
@@ -8501,31 +9325,31 @@
       "port-version": 1
     },
     "xerces-c": {
-      "baseline": "3.2.4",
-      "port-version": 2
+      "baseline": "3.2.5",
+      "port-version": 0
     },
     "xeus": {
       "baseline": "0.24.3",
-      "port-version": 2
+      "port-version": 3
     },
     "xframe": {
       "baseline": "0.3.0",
-      "port-version": 2
+      "port-version": 3
     },
     "xlnt": {
       "baseline": "1.5.0",
       "port-version": 4
     },
     "xlsxio": {
-      "baseline": "2021-03-24",
-      "port-version": 1
+      "baseline": "0.2.34",
+      "port-version": 0
     },
     "xmlsec": {
-      "baseline": "1.2.36",
-      "port-version": 0
+      "baseline": "1.3.1",
+      "port-version": 2
     },
     "xnnpack": {
-      "baseline": "2022-02-17",
+      "baseline": "2022-12-22",
       "port-version": 0
     },
     "xorg-macros": {
@@ -8537,12 +9361,12 @@
       "port-version": 0
     },
     "xpack": {
-      "baseline": "2023-02-06",
+      "baseline": "1.0.5",
       "port-version": 0
     },
     "xproperty": {
       "baseline": "0.8.1",
-      "port-version": 2
+      "port-version": 3
     },
     "xproto": {
       "baseline": "2021.5",
@@ -8550,14 +9374,14 @@
     },
     "xqilla": {
       "baseline": "2.3.4",
-      "port-version": 1
+      "port-version": 2
     },
     "xsimd": {
-      "baseline": "9.0.1",
+      "baseline": "12.0.0",
       "port-version": 0
     },
     "xtensor": {
-      "baseline": "0.24.3",
+      "baseline": "0.25.0",
       "port-version": 0
     },
     "xtensor-blas": {
@@ -8566,35 +9390,35 @@
     },
     "xtensor-fftw": {
       "baseline": "2019-11-30",
-      "port-version": 3
+      "port-version": 4
     },
     "xtensor-io": {
       "baseline": "0.13.0",
       "port-version": 1
     },
     "xtl": {
-      "baseline": "0.7.2",
-      "port-version": 1
+      "baseline": "0.7.5",
+      "port-version": 0
     },
     "xtrans": {
       "baseline": "1.4.0",
       "port-version": 1
     },
     "xxhash": {
-      "baseline": "0.8.1",
-      "port-version": 1
+      "baseline": "0.8.2",
+      "port-version": 0
     },
     "yajl": {
       "baseline": "2.1.0",
-      "port-version": 3
+      "port-version": 4
     },
     "yaml-cpp": {
-      "baseline": "0.7.0",
+      "baseline": "0.8.0",
       "port-version": 1
     },
     "yara": {
-      "baseline": "4.2.3",
-      "port-version": 0
+      "baseline": "4.3.2",
+      "port-version": 1
     },
     "yas": {
       "baseline": "7.1.0",
@@ -8617,19 +9441,19 @@
       "port-version": 0
     },
     "yoga": {
-      "baseline": "1.19.0+20230215",
+      "baseline": "2.0.1",
       "port-version": 0
     },
     "yomm2": {
-      "baseline": "1.1.2",
+      "baseline": "1.4.0",
       "port-version": 1
     },
     "yyjson": {
-      "baseline": "0.6.0",
+      "baseline": "0.8.0",
       "port-version": 0
     },
     "z3": {
-      "baseline": "4.11.0",
+      "baseline": "4.12.5",
       "port-version": 0
     },
     "z4kn4fein-semver": {
@@ -8638,20 +9462,24 @@
     },
     "z85": {
       "baseline": "1.0",
-      "port-version": 1
+      "port-version": 2
     },
     "zeroc-ice": {
-      "baseline": "3.7.7",
-      "port-version": 3
+      "baseline": "3.7.9",
+      "port-version": 4
     },
     "zeromq": {
-      "baseline": "2023-01-31",
-      "port-version": 0
+      "baseline": "4.3.5",
+      "port-version": 1
     },
     "zfp": {
       "baseline": "1.0.0",
       "port-version": 1
     },
+    "zimpl": {
+      "baseline": "3.5.3",
+      "port-version": 0
+    },
     "zint": {
       "baseline": "2.12.0",
       "port-version": 1
@@ -8661,39 +9489,67 @@
       "port-version": 3
     },
     "zlib": {
-      "baseline": "1.2.13",
+      "baseline": "1.3.1",
       "port-version": 0
     },
     "zlib-ng": {
-      "baseline": "2.0.6",
-      "port-version": 1
+      "baseline": "2.1.5",
+      "port-version": 0
+    },
+    "zlmediakit": {
+      "baseline": "2023-08-12",
+      "port-version": 0
+    },
+    "zoe": {
+      "baseline": "3.0",
+      "port-version": 0
     },
     "zookeeper": {
       "baseline": "3.5.6",
-      "port-version": 0
+      "port-version": 1
     },
     "zopfli": {
       "baseline": "1.0.3",
       "port-version": 3
     },
     "zpp-bits": {
-      "baseline": "4.4.13",
+      "baseline": "4.4.17",
       "port-version": 0
     },
     "zserge-webview": {
-      "baseline": "2022-09-07",
+      "baseline": "2023-04-15",
       "port-version": 0
     },
     "zstd": {
-      "baseline": "1.5.4",
-      "port-version": 1
+      "baseline": "1.5.5",
+      "port-version": 2
     },
     "zstr": {
       "baseline": "1.0.7",
       "port-version": 0
     },
+    "ztd-cuneicode": {
+      "baseline": "2023-11-03",
+      "port-version": 0
+    },
+    "ztd-encoding-tables": {
+      "baseline": "2023-06-10",
+      "port-version": 0
+    },
+    "ztd-idk": {
+      "baseline": "2023-11-03",
+      "port-version": 0
+    },
+    "ztd-platform": {
+      "baseline": "2022-12-30",
+      "port-version": 0
+    },
+    "ztd-static-containers": {
+      "baseline": "2022-12-12",
+      "port-version": 1
+    },
     "ztd-text": {
-      "baseline": "2022-03-21",
+      "baseline": "2023-11-03",
       "port-version": 0
     },
     "zug": {
@@ -8705,12 +9561,12 @@
       "port-version": 1
     },
     "zydis": {
-      "baseline": "3.2.1",
-      "port-version": 3
+      "baseline": "4.0.0",
+      "port-version": 2
     },
     "zyre": {
       "baseline": "2019-07-07",
-      "port-version": 4
+      "port-version": 5
     },
     "zziplib": {
       "baseline": "0.13.72",
diff --git a/external_imported/vcpkg/versions/c-/c-ares.json b/external_imported/vcpkg/versions/c-/c-ares.json
index b147cbda3..8e7b6fa29 100644
--- a/external_imported/vcpkg/versions/c-/c-ares.json
+++ b/external_imported/vcpkg/versions/c-/c-ares.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "2c98426c40efeeefe1eadb00c943dc80f72e9f99",
+      "version-semver": "1.26.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "79f168b5491191bf701a2683c2352c67d664e99a",
+      "version-semver": "1.25.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "55836d9576708f8126f2070e2a698afe72f5f948",
+      "version-semver": "1.19.1",
+      "port-version": 0
+    },
     {
       "git-tree": "a38a19b569f3763e2e63957687d4af9dcf19bd3e",
       "version-semver": "1.19.0",
diff --git a/external_imported/vcpkg/versions/c-/c89stringutils.json b/external_imported/vcpkg/versions/c-/c89stringutils.json
index 826d84dec..cb2a1f316 100644
--- a/external_imported/vcpkg/versions/c-/c89stringutils.json
+++ b/external_imported/vcpkg/versions/c-/c89stringutils.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c50f8f8a4bfb937214a3327ea7099ef8c9ea8e4c",
+      "version": "0.0.2",
+      "port-version": 0
+    },
     {
       "git-tree": "e4c282e10d69a020f581a2bd7b8d8ead1e29d9a2",
       "version": "0.0.1",
diff --git a/external_imported/vcpkg/versions/c-/c9y.json b/external_imported/vcpkg/versions/c-/c9y.json
index 4b9b1782c..5b8f4a8bf 100644
--- a/external_imported/vcpkg/versions/c-/c9y.json
+++ b/external_imported/vcpkg/versions/c-/c9y.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9f7e3a1f7a70d40127c90193447fe5595f86c9fb",
+      "version-semver": "0.8.0",
+      "port-version": 0
+    },
     {
       "git-tree": "c9ab8ee7af65218c39d096c8d8d369bb413a49a5",
       "version-semver": "0.7.0",
diff --git a/external_imported/vcpkg/versions/c-/cachelib.json b/external_imported/vcpkg/versions/c-/cachelib.json
index 7f7598cb2..804a6f8f8 100644
--- a/external_imported/vcpkg/versions/c-/cachelib.json
+++ b/external_imported/vcpkg/versions/c-/cachelib.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0a22cdb1063bfa706ab5a7085ba8724785eabc53",
+      "version-string": "2023.05.08.00",
+      "port-version": 0
+    },
     {
       "git-tree": "0311771f0b688e0ff8ffd3c6d297dfbbf43dfd33",
       "version-string": "2023.02.27.00",
diff --git a/external_imported/vcpkg/versions/c-/caf.json b/external_imported/vcpkg/versions/c-/caf.json
index b2ef7f0a4..d1f951290 100644
--- a/external_imported/vcpkg/versions/c-/caf.json
+++ b/external_imported/vcpkg/versions/c-/caf.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "2b744b08352077e2bf620c383d9924f4a008cbca",
+      "version": "0.19.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0561defb72007b054cede4fed6ef5950f8c2e2bc",
+      "version": "0.19.1",
+      "port-version": 0
+    },
     {
       "git-tree": "9b7001bd4d131fa36b766ca44a6ddbb47d3304a1",
       "version": "0.18.6",
diff --git a/external_imported/vcpkg/versions/c-/cairo.json b/external_imported/vcpkg/versions/c-/cairo.json
index 56b7c17db..22aa06a6a 100644
--- a/external_imported/vcpkg/versions/c-/cairo.json
+++ b/external_imported/vcpkg/versions/c-/cairo.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "127eefeeba4725293adb6ea574b7bad98c845298",
+      "version": "1.17.8",
+      "port-version": 4
+    },
+    {
+      "git-tree": "e8fda1b05b3f6a99f08c23f8ad94ed43d4a69875",
+      "version": "1.17.8",
+      "port-version": 3
+    },
+    {
+      "git-tree": "e94aef48f94b5cdac2387269b5f2ad421a684873",
+      "version": "1.17.8",
+      "port-version": 2
+    },
+    {
+      "git-tree": "b28395e25157c57307d10e37eba8c9018dcd8f75",
+      "version": "1.17.8",
+      "port-version": 1
+    },
     {
       "git-tree": "062c7e11a8b910e76a2f16e57e3ffe0d59bd905e",
       "version": "1.17.8",
diff --git a/external_imported/vcpkg/versions/c-/cairomm.json b/external_imported/vcpkg/versions/c-/cairomm.json
index 491d73266..edf8821e5 100644
--- a/external_imported/vcpkg/versions/c-/cairomm.json
+++ b/external_imported/vcpkg/versions/c-/cairomm.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "f6f54756edc3cdf81b1fbac86522410f64bda856",
+      "version": "1.17.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "e8edc870e28366ad88709f1232d002ffd9810cf3",
+      "version": "1.17.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c5804d5f576169610ec03d2803f9d8a03678cc95",
+      "version": "1.16.2",
+      "port-version": 4
+    },
+    {
+      "git-tree": "7a7e6f9ecf73d0a2ec27e9a70a099746e643ec84",
+      "version": "1.16.2",
+      "port-version": 3
+    },
     {
       "git-tree": "9e3f77f8b4d02d2a5bd898b0ca96031da57aae12",
       "version": "1.16.2",
diff --git a/external_imported/vcpkg/versions/c-/calceph.json b/external_imported/vcpkg/versions/c-/calceph.json
index 8e60196c2..8cf34cea2 100644
--- a/external_imported/vcpkg/versions/c-/calceph.json
+++ b/external_imported/vcpkg/versions/c-/calceph.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "068e74605df6b8a253d6f659db2e2114d1764588",
+      "version": "3.5.5",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3602c8d1030d2f0260d5de2104b5111fd4f7f253",
+      "version": "3.5.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e1167b91f758af9aa0077bdee620995c65898554",
+      "version": "3.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "66e61e880b832f24343545815d796cc529c4f503",
+      "version": "3.5.1",
+      "port-version": 1
+    },
     {
       "git-tree": "98f9a949826498f0929b5745fff07fb9747b82fa",
       "version": "3.5.1",
diff --git a/external_imported/vcpkg/versions/c-/canvas-ity.json b/external_imported/vcpkg/versions/c-/canvas-ity.json
new file mode 100644
index 000000000..560454c5c
--- /dev/null
+++ b/external_imported/vcpkg/versions/c-/canvas-ity.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "ba934f25e09c4ade51de82b8b8213ec2068aa826",
+      "version": "1.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/c-/capnproto.json b/external_imported/vcpkg/versions/c-/capnproto.json
index e894e6609..76c44eefc 100644
--- a/external_imported/vcpkg/versions/c-/capnproto.json
+++ b/external_imported/vcpkg/versions/c-/capnproto.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "52f73df5478fbcdb34b8dd5dd8d488672031cc32",
+      "version": "1.0.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4a615543c6406b84fc52a931335d7fdb70037627",
+      "version": "1.0.1",
+      "port-version": 0
+    },
     {
       "git-tree": "928a9a658c34e9a664531e0a6762a60408737e54",
       "version": "0.10.3",
diff --git a/external_imported/vcpkg/versions/c-/capstone.json b/external_imported/vcpkg/versions/c-/capstone.json
index acdfcd871..4690994da 100644
--- a/external_imported/vcpkg/versions/c-/capstone.json
+++ b/external_imported/vcpkg/versions/c-/capstone.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "d2879a914b5c261ad9fb1b48b921a4d53a486eb0",
+      "version": "5.0.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "4c89ad8669fdc6aa946d13cfe053a64fa50f75a7",
+      "version": "5.0.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3c9184889dd21d609401fe4ea34fa5320a9443a2",
+      "version": "5.0.0-rc2",
+      "port-version": 2
+    },
     {
       "git-tree": "f31ba3baba34c74dea464d864cca666c8793b1e7",
       "version": "5.0.0-rc2",
diff --git a/external_imported/vcpkg/versions/c-/cargs.json b/external_imported/vcpkg/versions/c-/cargs.json
index b25f1fc0f..684fbc957 100644
--- a/external_imported/vcpkg/versions/c-/cargs.json
+++ b/external_imported/vcpkg/versions/c-/cargs.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "88fea433a3287ccd49ae6a5bb168071418fa4469",
+      "version": "1.1.0",
+      "port-version": 0
+    },
     {
       "git-tree": "afa520193b882259b02bd2f8646982d340374d2d",
       "version": "1.0.3",
diff --git a/external_imported/vcpkg/versions/c-/catch-classic.json b/external_imported/vcpkg/versions/c-/catch-classic.json
index 18bb78d6f..56dd26722 100644
--- a/external_imported/vcpkg/versions/c-/catch-classic.json
+++ b/external_imported/vcpkg/versions/c-/catch-classic.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "69c262237024b0aa361d06923511a4d571355b50",
+      "version": "1.12.2",
+      "port-version": 2
+    },
     {
       "git-tree": "a85b3103dd134a7fadafe0c7c5d67042ab4c2b18",
       "version-string": "1.12.2",
diff --git a/external_imported/vcpkg/versions/c-/catch2.json b/external_imported/vcpkg/versions/c-/catch2.json
index ec1e5fbc9..1de555e61 100644
--- a/external_imported/vcpkg/versions/c-/catch2.json
+++ b/external_imported/vcpkg/versions/c-/catch2.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "9f5159aa8db5056e1f5531bc4292c27499e23f9a",
+      "version-semver": "3.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9b749693bba3f346f03e2ccd047ee26b22c123c3",
+      "version-semver": "3.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6bac6509e806556e539c116680228c6df5802ed4",
+      "version-semver": "3.5.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5796c1c0513a7b49f135e8acdd1976f53e9944ea",
+      "version-semver": "3.4.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8dc2e0cb32d0c1e0a12684a3628c926157f36ddd",
+      "version-semver": "3.3.2",
+      "port-version": 1
+    },
     {
       "git-tree": "e776d4cb313c846f6de82c05fa2ab9b7748edb6b",
       "version-semver": "3.3.2",
diff --git a/external_imported/vcpkg/versions/c-/ccfits.json b/external_imported/vcpkg/versions/c-/ccfits.json
index 466b8ade8..e7d066a88 100644
--- a/external_imported/vcpkg/versions/c-/ccfits.json
+++ b/external_imported/vcpkg/versions/c-/ccfits.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "69b00d0813b3ec9b7b963f07cf570cca5a8e2fd5",
+      "version": "2.5",
+      "port-version": 11
+    },
+    {
+      "git-tree": "77b570d63ebf64b4110d2555ce945144cc695364",
+      "version": "2.5",
+      "port-version": 10
+    },
     {
       "git-tree": "659ca5a77df9383a31166079a5f08ce70400d4ab",
       "version": "2.5",
diff --git a/external_imported/vcpkg/versions/c-/cctag.json b/external_imported/vcpkg/versions/c-/cctag.json
index 1090f7be1..54b350441 100644
--- a/external_imported/vcpkg/versions/c-/cctag.json
+++ b/external_imported/vcpkg/versions/c-/cctag.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "e4342449ae8be5c660e94cbb11588ea4649520cd",
+      "version-semver": "1.0.2",
+      "port-version": 5
+    },
+    {
+      "git-tree": "2827046cf8d7fe6c0d9003a927dcfc1f33d4469b",
+      "version-semver": "1.0.2",
+      "port-version": 4
+    },
     {
       "git-tree": "a54aac960d7c5e10bf85b66fb8e1cd9a7a384f64",
       "version-semver": "1.0.2",
diff --git a/external_imported/vcpkg/versions/c-/cctz.json b/external_imported/vcpkg/versions/c-/cctz.json
index efd6b2878..5a2d1989a 100644
--- a/external_imported/vcpkg/versions/c-/cctz.json
+++ b/external_imported/vcpkg/versions/c-/cctz.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "527442456bc48c0fd960541f6489dd0ac2add02c",
+      "version": "2.3",
+      "port-version": 7
+    },
+    {
+      "git-tree": "02114f18edd1088204f039ab6bc662e23d2e4fcc",
+      "version": "2.3",
+      "port-version": 6
+    },
+    {
+      "git-tree": "4fb611037401f6c457c45f90d7a462fa13f6f1b1",
+      "version": "2.3",
+      "port-version": 5
+    },
     {
       "git-tree": "d9230440e30edf443d69ac13244f53b6191742ae",
       "version-string": "2.3",
diff --git a/external_imported/vcpkg/versions/c-/cdt.json b/external_imported/vcpkg/versions/c-/cdt.json
new file mode 100644
index 000000000..69934015f
--- /dev/null
+++ b/external_imported/vcpkg/versions/c-/cdt.json
@@ -0,0 +1,24 @@
+{
+  "versions": [
+    {
+      "git-tree": "c36b649de1fc9f199628cbceb460d9304dd87a99",
+      "version": "1.4.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2455f0f823d6e0f87540a29206f2779004aedce0",
+      "version": "1.3.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ddc92ab3ef284f9643001138f8ed320a2417a80f",
+      "version": "1.2.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "d04985a703ae8b9201876879003d44c84f719a3a",
+      "version": "1.2.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/c-/celero.json b/external_imported/vcpkg/versions/c-/celero.json
index 4d584c927..94486f28f 100644
--- a/external_imported/vcpkg/versions/c-/celero.json
+++ b/external_imported/vcpkg/versions/c-/celero.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1b4a2230664d3439e53d60370aa383ec540f6362",
+      "version": "2.9.0",
+      "port-version": 0
+    },
     {
       "git-tree": "cf7909a1c7934793bb36ecf3d70a7dade2dcf983",
       "version": "2.8.5",
diff --git a/external_imported/vcpkg/versions/c-/cfitsio.json b/external_imported/vcpkg/versions/c-/cfitsio.json
index af756dc2b..101a9d419 100644
--- a/external_imported/vcpkg/versions/c-/cfitsio.json
+++ b/external_imported/vcpkg/versions/c-/cfitsio.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "373230dbd5e9968b5efd6b9d7227accc836b840f",
+      "version": "3.49",
+      "port-version": 5
+    },
+    {
+      "git-tree": "b2df854891a5beda50e8cf8004a7af0766c5c5bc",
+      "version": "3.49",
+      "port-version": 4
+    },
     {
       "git-tree": "b3f1a4860fc51b43140dc7139dd262f93e4a949d",
       "version": "3.49",
diff --git a/external_imported/vcpkg/versions/c-/cgal.json b/external_imported/vcpkg/versions/c-/cgal.json
index 4b9aa4373..7f7f147eb 100644
--- a/external_imported/vcpkg/versions/c-/cgal.json
+++ b/external_imported/vcpkg/versions/c-/cgal.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "daf7cc06ce0247101d1f713013a1a12416da5111",
+      "version": "5.6",
+      "port-version": 1
+    },
+    {
+      "git-tree": "313da2aa8d1221c449a211a4d04a0d5976ae8930",
+      "version": "5.6",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2361640f4f9d33c828b66c32b900beda59a63036",
+      "version": "5.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "339e2b1de050beafb97938c210b823c04182e206",
+      "version": "5.5.2",
+      "port-version": 1
+    },
+    {
+      "git-tree": "ddfb9d5fd8c8cd1a799af276c972b376f35f1267",
+      "version": "5.5.2",
+      "port-version": 0
+    },
     {
       "git-tree": "c86a34d296e485658d16306521425545f3e625ab",
       "version": "5.5.1",
diff --git a/external_imported/vcpkg/versions/c-/cgicc.json b/external_imported/vcpkg/versions/c-/cgicc.json
index e043b0673..8eb95ea79 100644
--- a/external_imported/vcpkg/versions/c-/cgicc.json
+++ b/external_imported/vcpkg/versions/c-/cgicc.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "f9e35a8d1360fc1eb4f323ef22e461d0e5926a90",
+      "version": "3.2.20",
+      "port-version": 0
+    },
+    {
+      "git-tree": "60fd4672dd6d913e3af2560314dd31bed192a205",
+      "version": "3.2.19",
+      "port-version": 7
+    },
     {
       "git-tree": "e5359ace765633e6912eb2898e175f797c6b2d45",
       "version-string": "3.2.19",
diff --git a/external_imported/vcpkg/versions/c-/cglm.json b/external_imported/vcpkg/versions/c-/cglm.json
index 73e8e46b0..7a4b79b4c 100644
--- a/external_imported/vcpkg/versions/c-/cglm.json
+++ b/external_imported/vcpkg/versions/c-/cglm.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "307a5dca27758987b25ae8f1868c50f3c332d3d6",
+      "version-semver": "0.9.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "996a91ff669c42bc3976231465129ab0f706eb54",
+      "version-semver": "0.9.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "bd33408300b3151706176a80ff4ef80bf6e10284",
+      "version-semver": "0.9.1",
+      "port-version": 0
+    },
     {
       "git-tree": "557e5a80c4a0ef39aa20af00929e2234794b3c3d",
       "version-semver": "0.8.8",
diff --git a/external_imported/vcpkg/versions/c-/cgns.json b/external_imported/vcpkg/versions/c-/cgns.json
index a7321919c..3965ff727 100644
--- a/external_imported/vcpkg/versions/c-/cgns.json
+++ b/external_imported/vcpkg/versions/c-/cgns.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "3888323fcc200e6d78c882a04c0604acd8281084",
+      "version-semver": "4.4.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9d4b2d4f75c71bf4a4b66a6cb8bf79e119be4dd7",
+      "version-semver": "4.3.0",
+      "port-version": 5
+    },
+    {
+      "git-tree": "98f56fa77d5ab2c24d5d8a9932129626feb65df5",
+      "version-semver": "4.3.0",
+      "port-version": 4
+    },
     {
       "git-tree": "3a5778901a44a39370c08cf42ad0de44223090c0",
       "version-semver": "4.3.0",
diff --git a/external_imported/vcpkg/versions/c-/chaiscript.json b/external_imported/vcpkg/versions/c-/chaiscript.json
index 39bb67f16..a61224cd6 100644
--- a/external_imported/vcpkg/versions/c-/chaiscript.json
+++ b/external_imported/vcpkg/versions/c-/chaiscript.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2745618f1726fd950c1f3aae35c8ceff2e11796e",
+      "version": "6.1.0",
+      "port-version": 3
+    },
     {
       "git-tree": "e661b450987c9f41f4cda3faed9067e54fe65f62",
       "version-string": "6.1.0",
diff --git a/external_imported/vcpkg/versions/c-/chakracore.json b/external_imported/vcpkg/versions/c-/chakracore.json
index bc7b91cf0..10b4b0fd2 100644
--- a/external_imported/vcpkg/versions/c-/chakracore.json
+++ b/external_imported/vcpkg/versions/c-/chakracore.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "98c62c0fbb2d410646eec57ce65ec0b91ad19fcf",
+      "version-date": "2022-11-09",
+      "port-version": 5
+    },
+    {
+      "git-tree": "cc06634190b18bc8003202b9490c6af7919821a3",
+      "version-date": "2022-11-09",
+      "port-version": 4
+    },
+    {
+      "git-tree": "0e3461099e02572100a3a6731b04fa0c3d12b223",
+      "version-date": "2022-11-09",
+      "port-version": 3
+    },
     {
       "git-tree": "637e8045c68adfe4a6164f368027093dffb79ab6",
       "version-date": "2022-11-09",
diff --git a/external_imported/vcpkg/versions/c-/charls.json b/external_imported/vcpkg/versions/c-/charls.json
index 77407faf5..ae697074c 100644
--- a/external_imported/vcpkg/versions/c-/charls.json
+++ b/external_imported/vcpkg/versions/c-/charls.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f9909aaef0219e8727c8f7e22ab93cf3aabbc685",
+      "version": "2.4.2",
+      "port-version": 0
+    },
     {
       "git-tree": "5459a82cfd650a18a79539aa30a03fa751a8cfcb",
       "version": "2.4.1",
diff --git a/external_imported/vcpkg/versions/c-/chartdir.json b/external_imported/vcpkg/versions/c-/chartdir.json
index b6cfe3467..8df13628b 100644
--- a/external_imported/vcpkg/versions/c-/chartdir.json
+++ b/external_imported/vcpkg/versions/c-/chartdir.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4de62166c67f2104f1e7180f04f1d5954d8e464a",
+      "version": "7.0.0",
+      "port-version": 7
+    },
     {
       "git-tree": "fecdbc20f2f4e027680223768c9a312c13cf4a75",
       "version": "7.0.0",
diff --git a/external_imported/vcpkg/versions/c-/check.json b/external_imported/vcpkg/versions/c-/check.json
index d66579d74..2be960805 100644
--- a/external_imported/vcpkg/versions/c-/check.json
+++ b/external_imported/vcpkg/versions/c-/check.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c993fcbc415d3c12c9161215529c1d36ba7e5f96",
+      "version": "0.15.2",
+      "port-version": 5
+    },
     {
       "git-tree": "d3b96c10d08746796f0e7540f9cb896b263cd4a9",
       "version": "0.15.2",
diff --git a/external_imported/vcpkg/versions/c-/chipmunk.json b/external_imported/vcpkg/versions/c-/chipmunk.json
index 9c1e1af23..c0624b547 100644
--- a/external_imported/vcpkg/versions/c-/chipmunk.json
+++ b/external_imported/vcpkg/versions/c-/chipmunk.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "daaeebb368f5c367d7005bb828913f8e158648c1",
+      "version": "7.0.3",
+      "port-version": 6
+    },
+    {
+      "git-tree": "949b207c326b9ded582e3360db0375bfbde8e136",
+      "version": "7.0.3",
+      "port-version": 5
+    },
+    {
+      "git-tree": "0e48ba1fd1de2d9df5d51fa83d6563777053a9e2",
+      "version": "7.0.3",
+      "port-version": 4
+    },
     {
       "git-tree": "2d56c98d1d491f822d5f74d312e45b51a0cfccfc",
       "version-string": "7.0.3",
diff --git a/external_imported/vcpkg/versions/c-/chmlib.json b/external_imported/vcpkg/versions/c-/chmlib.json
index 4b0e16833..0f191f677 100644
--- a/external_imported/vcpkg/versions/c-/chmlib.json
+++ b/external_imported/vcpkg/versions/c-/chmlib.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "bfe4841377722e56ccb7817f6ad93fcf24eab13b",
+      "version": "0.40",
+      "port-version": 7
+    },
     {
       "git-tree": "eb8f888eae3c5747154d09844daadc5c117a8c38",
       "version": "0.40",
diff --git a/external_imported/vcpkg/versions/c-/chromaprint.json b/external_imported/vcpkg/versions/c-/chromaprint.json
index 1ac3ded2e..4d02a2d38 100644
--- a/external_imported/vcpkg/versions/c-/chromaprint.json
+++ b/external_imported/vcpkg/versions/c-/chromaprint.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "a33e3947df39a3ac4e7d434f7f3890d0bf80cf39",
+      "version": "1.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2186fe85098c877929c5e1a8916ae9d23fc0a540",
+      "version": "1.5.0",
+      "port-version": 3
+    },
     {
       "git-tree": "d50d41c54f3aa2854ae05e64715100761517cb31",
       "version": "1.5.0",
diff --git a/external_imported/vcpkg/versions/c-/cialloo-rcon.json b/external_imported/vcpkg/versions/c-/cialloo-rcon.json
new file mode 100644
index 000000000..d02323dbc
--- /dev/null
+++ b/external_imported/vcpkg/versions/c-/cialloo-rcon.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "15e453031d883d06102b67a48336af5c3930a1ae",
+      "version": "1.0.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/c-/cimg.json b/external_imported/vcpkg/versions/c-/cimg.json
index 7f900ec61..07f2b8617 100644
--- a/external_imported/vcpkg/versions/c-/cimg.json
+++ b/external_imported/vcpkg/versions/c-/cimg.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0b73bf0046233dd69f0dc7962a7e0c3f961be2bc",
+      "version": "3.3.2",
+      "port-version": 0
+    },
     {
       "git-tree": "2eac332b873f6a2b9108c3e71e59feec8efe5026",
       "version": "2.9.9",
diff --git a/external_imported/vcpkg/versions/c-/cista.json b/external_imported/vcpkg/versions/c-/cista.json
index 8930728fc..7e38db6f9 100644
--- a/external_imported/vcpkg/versions/c-/cista.json
+++ b/external_imported/vcpkg/versions/c-/cista.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3fa4647485a95f3a0c72bf81938a4307ef0fa694",
+      "version": "0.14",
+      "port-version": 0
+    },
     {
       "git-tree": "3d9245928fb19ec93b7c1e98bd5acc2e8e56faa3",
       "version": "0.11",
diff --git a/external_imported/vcpkg/versions/c-/cityhash.json b/external_imported/vcpkg/versions/c-/cityhash.json
index 8b55fa672..8fb5a0090 100644
--- a/external_imported/vcpkg/versions/c-/cityhash.json
+++ b/external_imported/vcpkg/versions/c-/cityhash.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6ac425da00e37d679f49357b7871fff3f1c5f597",
+      "version-date": "2013-01-08",
+      "port-version": 3
+    },
     {
       "git-tree": "9c1b6eaaf15c06d436ce42331b84566abd931f53",
       "version-date": "2013-01-08",
diff --git a/external_imported/vcpkg/versions/c-/civetweb.json b/external_imported/vcpkg/versions/c-/civetweb.json
index 07285a0c4..1e1a69ef0 100644
--- a/external_imported/vcpkg/versions/c-/civetweb.json
+++ b/external_imported/vcpkg/versions/c-/civetweb.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "e4dd629e48dc2fc142165bf825c99512544b568c",
+      "version": "1.16",
+      "port-version": 2
+    },
+    {
+      "git-tree": "23fa18e460290d6b0629ca6487f69b56845cfbda",
+      "version": "1.16",
+      "port-version": 1
+    },
+    {
+      "git-tree": "46ba5309a5759827c0d729344e8f17cc5f3132b9",
+      "version": "1.16",
+      "port-version": 0
+    },
+    {
+      "git-tree": "10dad0fc40c4cb9fe210cabab019806d2b32230d",
+      "version": "1.15",
+      "port-version": 4
+    },
+    {
+      "git-tree": "a3847be52c382b4546939abf4ab3bf422bde1be3",
+      "version": "1.15",
+      "port-version": 3
+    },
     {
       "git-tree": "f5c4ed510288187d465737a301891b1101d6c373",
       "version": "1.15",
diff --git a/external_imported/vcpkg/versions/c-/cjson.json b/external_imported/vcpkg/versions/c-/cjson.json
index f2f67dd1a..ef97b59e1 100644
--- a/external_imported/vcpkg/versions/c-/cjson.json
+++ b/external_imported/vcpkg/versions/c-/cjson.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "3641d0d369b02515b4979956d884a2be91ac515b",
+      "version": "1.7.17",
+      "port-version": 0
+    },
+    {
+      "git-tree": "54c20c07a3f92d176d53cbe908313d717f746f6b",
+      "version": "1.7.16",
+      "port-version": 0
+    },
     {
       "git-tree": "025e76be26389108c3e0cf79e5ed1ea589c7b90e",
       "version": "1.7.15",
diff --git a/external_imported/vcpkg/versions/c-/clamav.json b/external_imported/vcpkg/versions/c-/clamav.json
index 09e10a7e3..a51d72a69 100644
--- a/external_imported/vcpkg/versions/c-/clamav.json
+++ b/external_imported/vcpkg/versions/c-/clamav.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7a5d72a0592ed756c359a514d629900bdccd0e9a",
+      "version-semver": "0.103.11",
+      "port-version": 0
+    },
     {
       "git-tree": "e6af13bd82992b466df39229e4d4045895dbd023",
       "version-semver": "0.103.0",
diff --git a/external_imported/vcpkg/versions/c-/clap-cleveraudio.json b/external_imported/vcpkg/versions/c-/clap-cleveraudio.json
new file mode 100644
index 000000000..452c6cba0
--- /dev/null
+++ b/external_imported/vcpkg/versions/c-/clap-cleveraudio.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "5ac28878d2cf7c0703073dda31120f634fb161a0",
+      "version-semver": "1.2.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "53d2e109c8c510419c0e2ecfc15beb707bb1215a",
+      "version-semver": "1.1.10",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/c-/clapack.json b/external_imported/vcpkg/versions/c-/clapack.json
index 3ae3ce285..02e660a7d 100644
--- a/external_imported/vcpkg/versions/c-/clapack.json
+++ b/external_imported/vcpkg/versions/c-/clapack.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0736bfcd19b6aaa7f1c75c10122433d4b4cc50a9",
+      "version": "3.2.1",
+      "port-version": 22
+    },
     {
       "git-tree": "f6f25a8699a34ca09b840a5e71b22ab8f6d01fda",
       "version": "3.2.1",
diff --git a/external_imported/vcpkg/versions/c-/clara.json b/external_imported/vcpkg/versions/c-/clara.json
index 9b9ce7df3..0661ae879 100644
--- a/external_imported/vcpkg/versions/c-/clara.json
+++ b/external_imported/vcpkg/versions/c-/clara.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ea0e36e1acd8ce030d956c34f063cdce1bc53e83",
+      "version": "1.1.5",
+      "port-version": 2
+    },
     {
       "git-tree": "dd2473115d2b12883de5a00cdbb2aaa309702042",
       "version-string": "1.1.5",
diff --git a/external_imported/vcpkg/versions/c-/clblast.json b/external_imported/vcpkg/versions/c-/clblast.json
index 8ae9e3d63..06b95e18e 100644
--- a/external_imported/vcpkg/versions/c-/clblast.json
+++ b/external_imported/vcpkg/versions/c-/clblast.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "2f514afe9163a9445befe8ddc91f8cd8f0105c9d",
+      "version": "1.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5d3c066f06df46440c055d265aa2dee1c21a9971",
+      "version": "1.5.2",
+      "port-version": 3
+    },
     {
       "git-tree": "f3fc8c351cba8b45e06d835b27101617a5ba74b0",
       "version": "1.5.2",
diff --git a/external_imported/vcpkg/versions/c-/cld3.json b/external_imported/vcpkg/versions/c-/cld3.json
new file mode 100644
index 000000000..234220540
--- /dev/null
+++ b/external_imported/vcpkg/versions/c-/cld3.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "a9553fd0c6e8053c54c83a51d8e93bdfab419c8e",
+      "version": "3.0.14",
+      "port-version": 1
+    },
+    {
+      "git-tree": "188a3b8fe8c84224f44d3d88b4e74ca34363cf9b",
+      "version": "3.0.14",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/c-/cli.json b/external_imported/vcpkg/versions/c-/cli.json
index 3e0b9f990..c42c5c55a 100644
--- a/external_imported/vcpkg/versions/c-/cli.json
+++ b/external_imported/vcpkg/versions/c-/cli.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8333092a454e35d835756f955c12622342964b05",
+      "version": "2.1.0",
+      "port-version": 0
+    },
     {
       "git-tree": "72fd89f268dc5d3318561366f54ee6aed341669f",
       "version": "2.0.2",
diff --git a/external_imported/vcpkg/versions/c-/cli11.json b/external_imported/vcpkg/versions/c-/cli11.json
index f896f831c..3bec07540 100644
--- a/external_imported/vcpkg/versions/c-/cli11.json
+++ b/external_imported/vcpkg/versions/c-/cli11.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "396b497f39aff89e8cbfec62a6e2ed8bd5df73a0",
+      "version": "2.4.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5f95180758a2703f23b8202b9e1c449551e11ea9",
+      "version": "2.3.2",
+      "port-version": 0
+    },
     {
       "git-tree": "47f8293bf52200e08a166ac4e22bee925d63f04a",
       "version": "2.3.1",
diff --git a/external_imported/vcpkg/versions/c-/clickhouse-cpp.json b/external_imported/vcpkg/versions/c-/clickhouse-cpp.json
index 2e1b3e08c..7459b5e88 100644
--- a/external_imported/vcpkg/versions/c-/clickhouse-cpp.json
+++ b/external_imported/vcpkg/versions/c-/clickhouse-cpp.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "91e161642e06b5e3f6f86a16714a4b58453a36b5",
+      "version": "2.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d665e3d36b571b68596140563d1934e8b416aa23",
+      "version": "2.4.0",
+      "port-version": 0
+    },
     {
       "git-tree": "10588d8080311cbc920f1805d3dd51e5b9c27ebe",
       "version": "2.2.1",
diff --git a/external_imported/vcpkg/versions/c-/clipper2.json b/external_imported/vcpkg/versions/c-/clipper2.json
index d8eef8bd9..0a3a6cc46 100644
--- a/external_imported/vcpkg/versions/c-/clipper2.json
+++ b/external_imported/vcpkg/versions/c-/clipper2.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "666b9d81d31d70d3d691e2286d951168c5d9d970",
+      "version": "1.3.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "649bee1fd1497da0ee3120c985ab6f465f2ad3c2",
+      "version": "1.3.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2a78eeaf159608c707e8191ce0ae9aed946c2e45",
+      "version": "1.2.2",
+      "port-version": 1
+    },
+    {
+      "git-tree": "59bb15f5ddaeb1198a06437295f808d03669373f",
+      "version": "1.2.2",
+      "port-version": 0
+    },
     {
       "git-tree": "bacf3c04856a20109d6eca303fc22432e3e77777",
       "version": "1.1.1",
diff --git a/external_imported/vcpkg/versions/c-/cmakerc.json b/external_imported/vcpkg/versions/c-/cmakerc.json
index 34c9439b6..0d7e49eb3 100644
--- a/external_imported/vcpkg/versions/c-/cmakerc.json
+++ b/external_imported/vcpkg/versions/c-/cmakerc.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2f7f10a967ae634c2636fd361119065446923ace",
+      "version-date": "2023-07-24",
+      "port-version": 0
+    },
     {
       "git-tree": "d330c8e9d121cf84522ca97f3e0f92f01efb9bc7",
       "version-date": "2022-09-08",
diff --git a/external_imported/vcpkg/versions/c-/cmark.json b/external_imported/vcpkg/versions/c-/cmark.json
index 2ae2ccef7..588371973 100644
--- a/external_imported/vcpkg/versions/c-/cmark.json
+++ b/external_imported/vcpkg/versions/c-/cmark.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "46de0e92eb13e52bb044f1d925a477483fe23c80",
+      "version-semver": "0.30.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4225c9caf09938ef676f688bf246026bc26fef3f",
+      "version-semver": "0.30.1",
+      "port-version": 1
+    },
     {
       "git-tree": "63d8e9056589a885ec4a36ba739903199206fff1",
       "version-semver": "0.30.1",
diff --git a/external_imported/vcpkg/versions/c-/cmcstl2.json b/external_imported/vcpkg/versions/c-/cmcstl2.json
index 80c091769..6ce17c987 100644
--- a/external_imported/vcpkg/versions/c-/cmcstl2.json
+++ b/external_imported/vcpkg/versions/c-/cmcstl2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3f2bfc5aadfc40719cf012a9b43d0a0037259738",
+      "version-date": "2019-07-20",
+      "port-version": 3
+    },
     {
       "git-tree": "71dc25003baa7f85cfb3924b553bf8642e7ea97e",
       "version-string": "2019-07-20",
diff --git a/external_imported/vcpkg/versions/c-/cminpack.json b/external_imported/vcpkg/versions/c-/cminpack.json
index 763056363..0c82eea0b 100644
--- a/external_imported/vcpkg/versions/c-/cminpack.json
+++ b/external_imported/vcpkg/versions/c-/cminpack.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "0401d2c926529b034913ab84852eef3fac28f6d4",
+      "version": "1.3.8",
+      "port-version": 4
+    },
+    {
+      "git-tree": "c2b1d33d31878445649cbc22e23d10a7b0e5d0b3",
+      "version": "1.3.8",
+      "port-version": 3
+    },
     {
       "git-tree": "141d26f7fd5eb7d8bebdabbbb05d4ca23fd8fbbf",
       "version": "1.3.8",
diff --git a/external_imported/vcpkg/versions/c-/cmocka.json b/external_imported/vcpkg/versions/c-/cmocka.json
index c463d3364..86d30f61a 100644
--- a/external_imported/vcpkg/versions/c-/cmocka.json
+++ b/external_imported/vcpkg/versions/c-/cmocka.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "296011d6dba4e267659df3c55989319334655604",
+      "version-date": "2020-08-01",
+      "port-version": 3
+    },
     {
       "git-tree": "b9b3ab47324bb53d72b5868cd190fdae50a49d24",
       "version-string": "2020-08-01",
diff --git a/external_imported/vcpkg/versions/c-/cnats.json b/external_imported/vcpkg/versions/c-/cnats.json
index 58862a418..f04424341 100644
--- a/external_imported/vcpkg/versions/c-/cnats.json
+++ b/external_imported/vcpkg/versions/c-/cnats.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "cce27b1efc5af15e4222a5fdc5502959f24e9d03",
+      "version": "3.7.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "438cfff2ee224f9d414bda9bcf796c13534443ba",
+      "version": "3.7.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "809d101d1791bc6cd3f51c8c9fa8e86dc923113b",
+      "version": "3.6.1",
+      "port-version": 0
+    },
     {
       "git-tree": "868bb4267af7b0b9ca3500a11656ea21f78fff4c",
       "version": "3.6.0",
diff --git a/external_imported/vcpkg/versions/c-/cnl.json b/external_imported/vcpkg/versions/c-/cnl.json
index 586e01516..9d4a51060 100644
--- a/external_imported/vcpkg/versions/c-/cnl.json
+++ b/external_imported/vcpkg/versions/c-/cnl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4acafdbd8f1d4eecb1130668df0503173add00c3",
+      "version": "1.1.7",
+      "port-version": 3
+    },
     {
       "git-tree": "f491a42c0680489de38159c7dd1486afc766c7fe",
       "version-string": "1.1.7",
diff --git a/external_imported/vcpkg/versions/c-/coin-or-cbc.json b/external_imported/vcpkg/versions/c-/coin-or-cbc.json
new file mode 100644
index 000000000..225d570ca
--- /dev/null
+++ b/external_imported/vcpkg/versions/c-/coin-or-cbc.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "0ed0ac8c729439ae3549b949ff6a02c803eabb34",
+      "version-date": "2023-02-01",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/c-/coin.json b/external_imported/vcpkg/versions/c-/coin.json
index 01a96feb1..f4134869b 100644
--- a/external_imported/vcpkg/versions/c-/coin.json
+++ b/external_imported/vcpkg/versions/c-/coin.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "31a9fad74627bcee6a866110f1377acaf8d81c04",
+      "version": "4.0.2",
+      "port-version": 2
+    },
+    {
+      "git-tree": "f679393fe0adfac4fbc6aa8235ce8a35e106cd7a",
+      "version": "4.0.2",
+      "port-version": 1
+    },
+    {
+      "git-tree": "1f151412ad103c9cafd511a97783d60b85aae246",
+      "version": "4.0.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "bb22aa623ff6abbc31ab908a584855f8ee278e67",
+      "version": "4.0.0",
+      "port-version": 8
+    },
+    {
+      "git-tree": "329db8f62c8f5a6f9774670833471ad4decb75cc",
+      "version": "4.0.0",
+      "port-version": 7
+    },
     {
       "git-tree": "6a7f1c48f1f508f4935fc44a83645305ac5d6da4",
       "version-string": "4.0.0",
diff --git a/external_imported/vcpkg/versions/c-/coinutils.json b/external_imported/vcpkg/versions/c-/coinutils.json
index 14681e96d..e55d18c35 100644
--- a/external_imported/vcpkg/versions/c-/coinutils.json
+++ b/external_imported/vcpkg/versions/c-/coinutils.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5ab5035f6a4fc5601ecc3e644a107b1763426259",
+      "version-date": "2023-02-02",
+      "port-version": 1
+    },
     {
       "git-tree": "9f78d3e4a95d02a06ad5fe90773ca39a25cd93de",
       "version-date": "2023-02-02",
diff --git a/external_imported/vcpkg/versions/c-/collada-dom.json b/external_imported/vcpkg/versions/c-/collada-dom.json
index ef1e53e01..9241e7a39 100644
--- a/external_imported/vcpkg/versions/c-/collada-dom.json
+++ b/external_imported/vcpkg/versions/c-/collada-dom.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "9efe9cf28c36df64035b505810bf68f445be62a1",
+      "version": "2.5.0",
+      "port-version": 10
+    },
+    {
+      "git-tree": "d9c3011f64673cff7d61bac99def8048f4027f32",
+      "version": "2.5.0",
+      "port-version": 9
+    },
     {
       "git-tree": "52229b10acbed6e24eefd37ef20b30e24c6c7e71",
       "version": "2.5.0",
diff --git a/external_imported/vcpkg/versions/c-/colmap.json b/external_imported/vcpkg/versions/c-/colmap.json
index c9fe34dc3..46334e0df 100644
--- a/external_imported/vcpkg/versions/c-/colmap.json
+++ b/external_imported/vcpkg/versions/c-/colmap.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "c3482baa430e8733afa927fae4d3951e300a5c67",
+      "version-date": "2023-10-01",
+      "port-version": 0
+    },
+    {
+      "git-tree": "be5a8b2aa2354b0d3aec03253dcd13358ba950da",
+      "version-date": "2023-03-12",
+      "port-version": 1
+    },
     {
       "git-tree": "31fb7f3106b019ceca3838a9461d372244125f63",
       "version-date": "2023-03-12",
diff --git a/external_imported/vcpkg/versions/c-/concurrencpp.json b/external_imported/vcpkg/versions/c-/concurrencpp.json
index c11849897..cd8356382 100644
--- a/external_imported/vcpkg/versions/c-/concurrencpp.json
+++ b/external_imported/vcpkg/versions/c-/concurrencpp.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "5eb63527141d7d261b6e99945f81bf43e293cc8b",
+      "version": "0.1.7",
+      "port-version": 0
+    },
+    {
+      "git-tree": "80e475aa0cf6a50936090964cdd032108453eade",
+      "version": "0.1.6",
+      "port-version": 2
+    },
+    {
+      "git-tree": "692f9ce2162c5dd6ee54170400c4df33aaec6b5d",
+      "version": "0.1.6",
+      "port-version": 1
+    },
+    {
+      "git-tree": "d4d183249579167e00a7717a088721716d66635b",
+      "version": "0.1.6",
+      "port-version": 0
+    },
     {
       "git-tree": "b83d01e0edaa7fa36ca4e67542201b5fc7354b58",
       "version": "0.1.5",
diff --git a/external_imported/vcpkg/versions/c-/concurrentqueue.json b/external_imported/vcpkg/versions/c-/concurrentqueue.json
index e17ada662..385cb5aac 100644
--- a/external_imported/vcpkg/versions/c-/concurrentqueue.json
+++ b/external_imported/vcpkg/versions/c-/concurrentqueue.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d9e893a30c08cf74ea4155c9110c47d605e1e534",
+      "version": "1.0.4",
+      "port-version": 0
+    },
     {
       "git-tree": "2a8223a8b75af74f94551fb342fd576e893c1ba7",
       "version": "1.0.3",
diff --git a/external_imported/vcpkg/versions/c-/configcat.json b/external_imported/vcpkg/versions/c-/configcat.json
index 95d20efd6..09f3e0386 100644
--- a/external_imported/vcpkg/versions/c-/configcat.json
+++ b/external_imported/vcpkg/versions/c-/configcat.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "4f1f87e186100760a5a093476a921eb6396b46c7",
+      "version": "3.2.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "278ce6bc975733e7807d36490f0e6d5c5c786ebb",
+      "version": "3.1.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8beddf56b4ad53f7c2bbd1e457c31858f1906e9c",
+      "version": "3.1.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5a5b038429eeed3e978742cb13ea7c207ad57d33",
+      "version": "3.0.0",
+      "port-version": 0
+    },
     {
       "git-tree": "f17f0bf439de376567a91361e85e3602ac5acd74",
       "version": "2.0.1",
diff --git a/external_imported/vcpkg/versions/c-/constexpr-contracts.json b/external_imported/vcpkg/versions/c-/constexpr-contracts.json
index fd33869dd..3f1fa7a5c 100644
--- a/external_imported/vcpkg/versions/c-/constexpr-contracts.json
+++ b/external_imported/vcpkg/versions/c-/constexpr-contracts.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ec1e4e87a25936620618f4807b63e2c03ca30f4d",
+      "version-date": "2020-08-09",
+      "port-version": 3
+    },
     {
       "git-tree": "57c829c4a74272397d4901cf6ed525b2200e1d93",
       "version-string": "2020-08-09",
diff --git a/external_imported/vcpkg/versions/c-/continuable.json b/external_imported/vcpkg/versions/c-/continuable.json
index a3eb44398..77cae9bf0 100644
--- a/external_imported/vcpkg/versions/c-/continuable.json
+++ b/external_imported/vcpkg/versions/c-/continuable.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "00cab767f56ad46e53d6b140ab675fecfa0fb427",
+      "version": "4.2.2",
+      "port-version": 0
+    },
     {
       "git-tree": "9cb413050363e8549bbc5a5f50a7882441241416",
       "version": "4.2.0",
diff --git a/external_imported/vcpkg/versions/c-/coolprop.json b/external_imported/vcpkg/versions/c-/coolprop.json
index d264b4896..ef17f0ddd 100644
--- a/external_imported/vcpkg/versions/c-/coolprop.json
+++ b/external_imported/vcpkg/versions/c-/coolprop.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "941407fb13d6b17cf04b6186a80db2e59d145a3f",
+      "version-semver": "6.4.3",
+      "port-version": 3
+    },
+    {
+      "git-tree": "5f114941efb93eadb6df38f9493de8bdab0b496a",
+      "version-semver": "6.4.3",
+      "port-version": 2
+    },
+    {
+      "git-tree": "b0bdc5514d6d96d6767c50a09840b164fbf86d93",
+      "version-semver": "6.4.3",
+      "port-version": 1
+    },
     {
       "git-tree": "ecf4aa81e29286ea194307b2379ef1fd0e3e311f",
       "version-semver": "6.4.3",
diff --git a/external_imported/vcpkg/versions/c-/copypp.json b/external_imported/vcpkg/versions/c-/copypp.json
new file mode 100644
index 000000000..8babb1178
--- /dev/null
+++ b/external_imported/vcpkg/versions/c-/copypp.json
@@ -0,0 +1,24 @@
+{
+  "versions": [
+    {
+      "git-tree": "5a681be8127821639bed4c4886a351b0640d5c04",
+      "version": "0.3.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "19d47125ad84c71c928f7ea266a6d7543b65ef23",
+      "version": "0.2.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "7be5573b44b0520d8f4cb7619bf8755184bb4019",
+      "version": "0.1.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "30342b837d13819393c9f898e82f5c2cf25bed32",
+      "version": "0.1.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/c-/corrade.json b/external_imported/vcpkg/versions/c-/corrade.json
index a15500a6d..f3b881e1c 100644
--- a/external_imported/vcpkg/versions/c-/corrade.json
+++ b/external_imported/vcpkg/versions/c-/corrade.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "a7c12fdbe3c15ad76eced6d157af6e09d49329e5",
+      "version-string": "2020.06",
+      "port-version": 8
+    },
+    {
+      "git-tree": "8630a6d00fec6c7462af2e03bd0e1946f6812069",
+      "version-string": "2020.06",
+      "port-version": 7
+    },
+    {
+      "git-tree": "1a278fdbd46715f454e366df7d06410ae2fc9747",
+      "version-string": "2020.06",
+      "port-version": 6
+    },
     {
       "git-tree": "fed547a7951672a5a7b1c430df8a9b179f674ac6",
       "version-string": "2020.06",
diff --git a/external_imported/vcpkg/versions/c-/cpp-async.json b/external_imported/vcpkg/versions/c-/cpp-async.json
new file mode 100644
index 000000000..0bafe8c02
--- /dev/null
+++ b/external_imported/vcpkg/versions/c-/cpp-async.json
@@ -0,0 +1,19 @@
+{
+  "versions": [
+    {
+      "git-tree": "3f29e519d60913ea86ca5cee69d9129a1e04b337",
+      "version": "1.1.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c9b2e9c3ddd004c4201a27963d4b1bedb2dc2b2c",
+      "version": "1.0.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f1eaddcca26f72bb7be5a6227bffd3897798341c",
+      "version": "1.0.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/c-/cpp-httplib.json b/external_imported/vcpkg/versions/c-/cpp-httplib.json
index 7bc87a999..180e395ac 100644
--- a/external_imported/vcpkg/versions/c-/cpp-httplib.json
+++ b/external_imported/vcpkg/versions/c-/cpp-httplib.json
@@ -1,5 +1,60 @@
 {
   "versions": [
+    {
+      "git-tree": "8378b4e8bb46f2879c44465e1084a8eef0dd4318",
+      "version": "0.15.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f8ebd2e6ba742af05a5fe992c267ae338f0999d5",
+      "version": "0.15.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9d30a8829eb12f979aaeb5c4c5eebd76c0d150aa",
+      "version": "0.15.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "cf7ac80d06d049094fbf0742fcc99ecbd0c3396c",
+      "version": "0.15.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6f65092ce5157b3cf987bf0daba4db53f5d10d37",
+      "version": "0.14.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "209025ac7de89c4a8292aeffd8a59259dfc433c5",
+      "version": "0.14.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5ed5d9de6eeab399563ab93d52f73b7d4691d1cc",
+      "version": "0.14.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e1a8cffe02efe8a9c92d1aa1e802f12a8d893aa8",
+      "version": "0.13.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "795e219c0d92adb47551a8a8a4a1e800d5fe70a9",
+      "version": "0.13.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "570d0fcd52fa9bb8048dfe84df6a31b2473949b5",
+      "version": "0.12.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "05e123da2bcd7b05fc8c31fd88e6d3d5aa06d520",
+      "version": "0.12.2",
+      "port-version": 0
+    },
     {
       "git-tree": "d5bea8aab6eaa201dfd01b054327e3c379ab0864",
       "version": "0.11.3",
diff --git a/external_imported/vcpkg/versions/c-/cpp-ipc.json b/external_imported/vcpkg/versions/c-/cpp-ipc.json
index 53f75c34f..70e444c14 100644
--- a/external_imported/vcpkg/versions/c-/cpp-ipc.json
+++ b/external_imported/vcpkg/versions/c-/cpp-ipc.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "36fd22ee76a212829a835b36934e27d825b58183",
+      "version": "1.3.0",
+      "port-version": 0
+    },
     {
       "git-tree": "e86c1547d0be3d2acbe7cebdb799f24359c29e85",
       "version": "1.2.0",
diff --git a/external_imported/vcpkg/versions/c-/cpp-netlib.json b/external_imported/vcpkg/versions/c-/cpp-netlib.json
index 1d759c535..fae5f1a9c 100644
--- a/external_imported/vcpkg/versions/c-/cpp-netlib.json
+++ b/external_imported/vcpkg/versions/c-/cpp-netlib.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "f4a974a775695cdf6b1bcc82fc98c993f887b006",
+      "version": "0.13.0",
+      "port-version": 9
+    },
+    {
+      "git-tree": "ac3709aa4c5d5b70f38764f2fa7e0b8f8e891d96",
+      "version": "0.13.0",
+      "port-version": 8
+    },
     {
       "git-tree": "a71758ba258596edd94871670c3d8f7cec334e37",
       "version-string": "0.13.0",
diff --git a/external_imported/vcpkg/versions/c-/cpp-peglib.json b/external_imported/vcpkg/versions/c-/cpp-peglib.json
index 9d631ff42..e75bfec2c 100644
--- a/external_imported/vcpkg/versions/c-/cpp-peglib.json
+++ b/external_imported/vcpkg/versions/c-/cpp-peglib.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "aab20faa46849572df0241317b6b5c309a77ac70",
+      "version": "1.8.6",
+      "port-version": 0
+    },
+    {
+      "git-tree": "1db90f789f11e0bcb31b569171d0fc3fda779dfc",
+      "version": "1.8.5",
+      "port-version": 0
+    },
     {
       "git-tree": "883e76f3473565fdd800411dfa980eae2e19a131",
       "version": "1.3.10",
diff --git a/external_imported/vcpkg/versions/c-/cpp-sort.json b/external_imported/vcpkg/versions/c-/cpp-sort.json
new file mode 100644
index 000000000..cc9068388
--- /dev/null
+++ b/external_imported/vcpkg/versions/c-/cpp-sort.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "b474d4009aeb5dd69f5024899bff6fbbb92a78f6",
+      "version": "1.15.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/c-/cpp-taskflow.json b/external_imported/vcpkg/versions/c-/cpp-taskflow.json
index 9e6d783e0..0b4f9c982 100644
--- a/external_imported/vcpkg/versions/c-/cpp-taskflow.json
+++ b/external_imported/vcpkg/versions/c-/cpp-taskflow.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "00114add33f7d8a7e8f4fb0d22f9206178181b8b",
+      "version": "2.6.0",
+      "port-version": 2
+    },
     {
       "git-tree": "edbd9a48db629e8b2c264cdd60fba4ca4e218f03",
       "version-string": "2.6.0",
diff --git a/external_imported/vcpkg/versions/c-/cppad.json b/external_imported/vcpkg/versions/c-/cppad.json
index 70aa4a843..a72a7dc69 100644
--- a/external_imported/vcpkg/versions/c-/cppad.json
+++ b/external_imported/vcpkg/versions/c-/cppad.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6a571c72f89fb09b2d665cbb244a620e60a07f35",
+      "version": "20240000.2",
+      "port-version": 0
+    },
     {
       "git-tree": "198bea4d165c47868b56e47297c6f46f84dfd3af",
       "version": "20230000.0",
diff --git a/external_imported/vcpkg/versions/c-/cppcms.json b/external_imported/vcpkg/versions/c-/cppcms.json
index ca34ce025..24139f93a 100644
--- a/external_imported/vcpkg/versions/c-/cppcms.json
+++ b/external_imported/vcpkg/versions/c-/cppcms.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "44e220f750bca1f74095cf460adb1753a4deb423",
+      "version": "1.2.1",
+      "port-version": 7
+    },
     {
       "git-tree": "e2fff22eecee1fc50eee291ea49bed2717704031",
       "version": "1.2.1",
diff --git a/external_imported/vcpkg/versions/c-/cppdap.json b/external_imported/vcpkg/versions/c-/cppdap.json
new file mode 100644
index 000000000..73e4394ed
--- /dev/null
+++ b/external_imported/vcpkg/versions/c-/cppdap.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "ab1e5e1b50226ecd6d45d53b357dac35051a8a47",
+      "version-semver": "1.58.0-a",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/c-/cppfs.json b/external_imported/vcpkg/versions/c-/cppfs.json
index 530b7a7fd..9284ea9b8 100644
--- a/external_imported/vcpkg/versions/c-/cppfs.json
+++ b/external_imported/vcpkg/versions/c-/cppfs.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "effae8e598d06cff2d1c7b0a084e6394ff1ee6ed",
+      "version": "1.3.0",
+      "port-version": 3
+    },
     {
       "git-tree": "d018bbc2767ee2fec0398bd1131e5ae70d1ad5cf",
       "version": "1.3.0",
diff --git a/external_imported/vcpkg/versions/c-/cppgraphqlgen.json b/external_imported/vcpkg/versions/c-/cppgraphqlgen.json
index 1d5f32067..2dc440011 100644
--- a/external_imported/vcpkg/versions/c-/cppgraphqlgen.json
+++ b/external_imported/vcpkg/versions/c-/cppgraphqlgen.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "3e5e70f3ccff87b9b39412aaf1f2c0382a3d3274",
+      "version": "4.5.5",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8d87ba9b4921a48271c8c6abbe7e9c3f96651b4f",
+      "version": "4.5.3",
+      "port-version": 0
+    },
     {
       "git-tree": "28aa180fcf127016dd1d8ceca4fd964228af191a",
       "version": "4.5.1",
diff --git a/external_imported/vcpkg/versions/c-/cppkafka.json b/external_imported/vcpkg/versions/c-/cppkafka.json
index e063e2964..14a93e023 100644
--- a/external_imported/vcpkg/versions/c-/cppkafka.json
+++ b/external_imported/vcpkg/versions/c-/cppkafka.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "708cf007605104bc59394d47c9937b203c155b37",
+      "version": "0.4.0",
+      "port-version": 0
+    },
     {
       "git-tree": "a33f71df221cb16bb2f7b1ce5d9cd0043a525e00",
       "version": "0.3.1",
diff --git a/external_imported/vcpkg/versions/c-/cppmicroservices.json b/external_imported/vcpkg/versions/c-/cppmicroservices.json
index ed5d72e5e..34f83579f 100644
--- a/external_imported/vcpkg/versions/c-/cppmicroservices.json
+++ b/external_imported/vcpkg/versions/c-/cppmicroservices.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "b438280ccc1012bda6457141a3dea8071711ffb9",
+      "version": "3.7.6",
+      "port-version": 1
+    },
+    {
+      "git-tree": "3399e4ad64f4b4c0d32f4b5df723384a1bd98dbe",
+      "version": "3.7.6",
+      "port-version": 0
+    },
     {
       "git-tree": "4d97b6213a9f6a77e8f1062229ead80ffd4703a7",
       "version": "3.6.0",
diff --git a/external_imported/vcpkg/versions/c-/cppp-reiconv.json b/external_imported/vcpkg/versions/c-/cppp-reiconv.json
new file mode 100644
index 000000000..546e9979c
--- /dev/null
+++ b/external_imported/vcpkg/versions/c-/cppp-reiconv.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "48b338ed3b71e8f573134ce0ddc26921c4f3ead7",
+      "version": "2.1.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/c-/cpprestsdk.json b/external_imported/vcpkg/versions/c-/cpprestsdk.json
index 1cc399353..43cb0fcac 100644
--- a/external_imported/vcpkg/versions/c-/cpprestsdk.json
+++ b/external_imported/vcpkg/versions/c-/cpprestsdk.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "110c2c2a08e520877aa3fa9231ab69e0a76f388d",
+      "version": "2.10.19",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e906f25fb64a3b11da4b1e551d63fe569fd300e3",
+      "version": "2.10.18",
+      "port-version": 4
+    },
+    {
+      "git-tree": "53f896a9d80f0fd51e2645ee7deccbc0c955859a",
+      "version": "2.10.18",
+      "port-version": 3
+    },
     {
       "git-tree": "e1fb46f5d043e3a354bfbc6f77df5df3b321f74b",
       "version": "2.10.18",
diff --git a/external_imported/vcpkg/versions/c-/cppslippi.json b/external_imported/vcpkg/versions/c-/cppslippi.json
new file mode 100644
index 000000000..2d1302828
--- /dev/null
+++ b/external_imported/vcpkg/versions/c-/cppslippi.json
@@ -0,0 +1,24 @@
+{
+  "versions": [
+    {
+      "git-tree": "a7df05e339a6d25e29d35374e4f7ff1a4b78dbab",
+      "version": "1.3.3.14",
+      "port-version": 0
+    },
+    {
+      "git-tree": "bdb4a9aadefc971d10cb8c37bd13570e3c7fab0e",
+      "version": "1.2.3.14",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0534d15dbe06459887eeddf859ebab443701c6d7",
+      "version": "1.1.3.14",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3cb6381580bcf82551009114b87021b0b1bc9885",
+      "version": "1.0.3.14",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/c-/cpptoml.json b/external_imported/vcpkg/versions/c-/cpptoml.json
index dc7f7d13b..e42d19dcb 100644
--- a/external_imported/vcpkg/versions/c-/cpptoml.json
+++ b/external_imported/vcpkg/versions/c-/cpptoml.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "6993c08a35db3961ad0543456f236e3e5a2492c9",
+      "version": "0.1.1",
+      "port-version": 4
+    },
+    {
+      "git-tree": "fde8b7854f0796406eada5609cb2cc54728d73db",
+      "version": "0.1.1",
+      "port-version": 3
+    },
     {
       "git-tree": "56b510542b03ac901331cc1d074c140ff7aaaad1",
       "version-string": "v0.1.1",
diff --git a/external_imported/vcpkg/versions/c-/cpptrace.json b/external_imported/vcpkg/versions/c-/cpptrace.json
new file mode 100644
index 000000000..90e5522b8
--- /dev/null
+++ b/external_imported/vcpkg/versions/c-/cpptrace.json
@@ -0,0 +1,24 @@
+{
+  "versions": [
+    {
+      "git-tree": "a47f178584948b2b0b797d538c43fb41664ca96d",
+      "version": "0.3.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "a9dc1989a430b531df437790e61d09b411342ec3",
+      "version": "0.3.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "620e293efe2a80f6abdf9499855b09718cd8a051",
+      "version": "0.3.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c91d65da151c8d10bd59b6980c5a98c797e68679",
+      "version": "0.2.1",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/c-/cppunit.json b/external_imported/vcpkg/versions/c-/cppunit.json
index 46d182a4b..dcb6acca6 100644
--- a/external_imported/vcpkg/versions/c-/cppunit.json
+++ b/external_imported/vcpkg/versions/c-/cppunit.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f41d796c28175989ae33707289645752d8b6c3f8",
+      "version": "1.15.1",
+      "port-version": 4
+    },
     {
       "git-tree": "671d125960c9cce11a92b65b8bdfba73f85b09b5",
       "version": "1.15.1",
diff --git a/external_imported/vcpkg/versions/c-/cppzmq.json b/external_imported/vcpkg/versions/c-/cppzmq.json
index 8b0863a0d..a5d444951 100644
--- a/external_imported/vcpkg/versions/c-/cppzmq.json
+++ b/external_imported/vcpkg/versions/c-/cppzmq.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "8e7a8ca62f55304268afb4ddd9220cc39d6b4831",
+      "version": "4.10.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f50d93799a1982bbbdd22e88c7a784f9a7e38368",
+      "version": "4.9.0",
+      "port-version": 1
+    },
     {
       "git-tree": "7f4360cc5fa484c4ecd286ef6c545bde4b01bc39",
       "version": "4.9.0",
diff --git a/external_imported/vcpkg/versions/c-/cpr.json b/external_imported/vcpkg/versions/c-/cpr.json
index dde66f02e..79a0fd5c9 100644
--- a/external_imported/vcpkg/versions/c-/cpr.json
+++ b/external_imported/vcpkg/versions/c-/cpr.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "83379af62bd0d170537dd4ee3abba017d4a54659",
+      "version-semver": "1.10.5",
+      "port-version": 1
+    },
+    {
+      "git-tree": "b734e9b119682ee4c98e2b4a127a8e29fc750844",
+      "version-semver": "1.10.5",
+      "port-version": 0
+    },
+    {
+      "git-tree": "96f05ba23a7dc5ba102ba451210b2c367669c1ad",
+      "version-semver": "1.10.2+3",
+      "port-version": 0
+    },
     {
       "git-tree": "13181536fae6181da65a2d2522a814fffb61bb83",
       "version-semver": "1.9.3",
diff --git a/external_imported/vcpkg/versions/c-/cpu-features.json b/external_imported/vcpkg/versions/c-/cpu-features.json
index 09591a646..a4c323605 100644
--- a/external_imported/vcpkg/versions/c-/cpu-features.json
+++ b/external_imported/vcpkg/versions/c-/cpu-features.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "dfa189c9350c179c90db6f7dfe4352ecddcd2b6a",
+      "version": "0.9.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5e090d7020fbfe7ca8a7c2f70b6cc3f4520f2fea",
+      "version": "0.8.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "b7b519ccb7eebe02086e062e34a6d3d6b0f54cde",
+      "version": "0.8.0",
+      "port-version": 0
+    },
     {
       "git-tree": "389a30511ba8ab8c2891ee40ad9cc6ae89561739",
       "version": "0.7.0",
diff --git a/external_imported/vcpkg/versions/c-/cpuinfo.json b/external_imported/vcpkg/versions/c-/cpuinfo.json
index 8542dfde8..d2a0178a0 100644
--- a/external_imported/vcpkg/versions/c-/cpuinfo.json
+++ b/external_imported/vcpkg/versions/c-/cpuinfo.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f1b7e10e1de1dcd09118adc19c5bc831417dcc8c",
+      "version-date": "2022-07-19",
+      "port-version": 3
+    },
     {
       "git-tree": "b48fc0cf93034d06bb34c5f83da8be921006b283",
       "version-date": "2022-07-19",
diff --git a/external_imported/vcpkg/versions/c-/cr.json b/external_imported/vcpkg/versions/c-/cr.json
index eec55d22a..3cda19c5e 100644
--- a/external_imported/vcpkg/versions/c-/cr.json
+++ b/external_imported/vcpkg/versions/c-/cr.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "992f08365509f46e7d51f252317ef8b6da7e11a9",
+      "version-date": "2020-04-26",
+      "port-version": 2
+    },
     {
       "git-tree": "67c46561394de15aee2a56d57590eeef1060019d",
       "version-string": "2020-04-26",
diff --git a/external_imported/vcpkg/versions/c-/crashpad.json b/external_imported/vcpkg/versions/c-/crashpad.json
index 65c869107..72aa3bf04 100644
--- a/external_imported/vcpkg/versions/c-/crashpad.json
+++ b/external_imported/vcpkg/versions/c-/crashpad.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "63c757af964d6d69f6abdeb0a3849889ad3531a9",
+      "version-date": "2022-09-05",
+      "port-version": 4
+    },
     {
       "git-tree": "699f5caaac594c10928ddf73ba45e64ad764252f",
       "version-date": "2022-09-05",
diff --git a/external_imported/vcpkg/versions/c-/crc32c.json b/external_imported/vcpkg/versions/c-/crc32c.json
index 1b603575e..d275079e7 100644
--- a/external_imported/vcpkg/versions/c-/crc32c.json
+++ b/external_imported/vcpkg/versions/c-/crc32c.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "65cab652a6fffba3e3b25332d7935bf57aa3c4f0",
+      "version": "1.1.2",
+      "port-version": 2
+    },
     {
       "git-tree": "9704ed68003973bdffcd5224f720b97c424d1fa5",
       "version": "1.1.2",
diff --git a/external_imported/vcpkg/versions/c-/croncpp.json b/external_imported/vcpkg/versions/c-/croncpp.json
index 99f598042..1eea5b9ff 100644
--- a/external_imported/vcpkg/versions/c-/croncpp.json
+++ b/external_imported/vcpkg/versions/c-/croncpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "13457e7a1989326119d3e30d7ce8c4d2809697c4",
+      "version-date": "2023-03-30",
+      "port-version": 0
+    },
     {
       "git-tree": "0fb4aefe39d2d695cb5cc89a4f3c92e4229605f5",
       "version-date": "2020-09-04",
diff --git a/external_imported/vcpkg/versions/c-/crossguid.json b/external_imported/vcpkg/versions/c-/crossguid.json
index ce2ce308a..8a0904314 100644
--- a/external_imported/vcpkg/versions/c-/crossguid.json
+++ b/external_imported/vcpkg/versions/c-/crossguid.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "39a8ec44dcb709796a0ecdc4c170f67ad5ad1175",
+      "version-date": "2021-10-22",
+      "port-version": 3
+    },
     {
       "git-tree": "93714099ddf83b2f3437a080c8acc08ff74cbe37",
       "version-date": "2021-10-22",
diff --git a/external_imported/vcpkg/versions/c-/cryptopp.json b/external_imported/vcpkg/versions/c-/cryptopp.json
index 1ca10defa..162b5a68e 100644
--- a/external_imported/vcpkg/versions/c-/cryptopp.json
+++ b/external_imported/vcpkg/versions/c-/cryptopp.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "48788514ae1e84dea9055e603527c91f92c124fb",
+      "version": "8.9.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ecb46c9c0fbce15e4238443a6d93275a052b3c9e",
+      "version": "8.8.0",
+      "port-version": 0
+    },
     {
       "git-tree": "21a45a2fb90fe76c026e8033c58c699d63cbf4e9",
       "version": "8.7.0",
diff --git a/external_imported/vcpkg/versions/c-/cserialport.json b/external_imported/vcpkg/versions/c-/cserialport.json
index cfa392e78..7e2690436 100644
--- a/external_imported/vcpkg/versions/c-/cserialport.json
+++ b/external_imported/vcpkg/versions/c-/cserialport.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "842df8d9c0fac5c130724643392f828bb20a6f97",
+      "version": "4.3.0",
+      "port-version": 1
+    },
     {
       "git-tree": "28d4a472a2587c890738ebb66b79bfd3ab052ac9",
       "version": "4.3.0",
diff --git a/external_imported/vcpkg/versions/c-/cspice.json b/external_imported/vcpkg/versions/c-/cspice.json
index 9cb27a05f..c8b587b7b 100644
--- a/external_imported/vcpkg/versions/c-/cspice.json
+++ b/external_imported/vcpkg/versions/c-/cspice.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a87828fb249f8a2f9d6ded34e0c8e79f4349d842",
+      "version": "67",
+      "port-version": 3
+    },
     {
       "git-tree": "1da82692c98d788552288f73818983fc3b561b7b",
       "version": "67",
diff --git a/external_imported/vcpkg/versions/c-/ctbench.json b/external_imported/vcpkg/versions/c-/ctbench.json
new file mode 100644
index 000000000..76a097da6
--- /dev/null
+++ b/external_imported/vcpkg/versions/c-/ctbench.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "a53ddf49e4e46a3e876af7be40a08c6016ecc5b7",
+      "version": "1.3.3",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/c-/ctbignum.json b/external_imported/vcpkg/versions/c-/ctbignum.json
index 5765ddf2e..ba35020b6 100644
--- a/external_imported/vcpkg/versions/c-/ctbignum.json
+++ b/external_imported/vcpkg/versions/c-/ctbignum.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b3b10f0256bff010503b6ebcbb966235308947f2",
+      "version-date": "2019-08-02",
+      "port-version": 3
+    },
     {
       "git-tree": "555cc4f7caade3a6d817fd65d15ff2274ed0f5eb",
       "version-string": "2019-08-02",
diff --git a/external_imported/vcpkg/versions/c-/ctp.json b/external_imported/vcpkg/versions/c-/ctp.json
index 90896c07c..f22b5c7f0 100644
--- a/external_imported/vcpkg/versions/c-/ctp.json
+++ b/external_imported/vcpkg/versions/c-/ctp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "711ec7abed5a21f5dbb07573e9895a9611fc6a11",
+      "version-string": "6.6.1_P1_20210406_se",
+      "port-version": 4
+    },
     {
       "git-tree": "11ff3d437cca5956d99f8690143f12a0ebd5e839",
       "version-string": "6.6.1_P1_20210406_se",
diff --git a/external_imported/vcpkg/versions/c-/ctre.json b/external_imported/vcpkg/versions/c-/ctre.json
index afd8b6448..d4a21c7e9 100644
--- a/external_imported/vcpkg/versions/c-/ctre.json
+++ b/external_imported/vcpkg/versions/c-/ctre.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "0de95344cb3e667b9514cc77fefe7597648e7729",
+      "version": "3.8.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "70b866377c945c0c024c7379e0f06b00b898fcfb",
+      "version": "3.8",
+      "port-version": 0
+    },
     {
       "git-tree": "f1277ac9132e7a6c91bdfd6cc355eccedbb28732",
       "version-semver": "3.7.2",
diff --git a/external_imported/vcpkg/versions/c-/ctstraffic.json b/external_imported/vcpkg/versions/c-/ctstraffic.json
new file mode 100644
index 000000000..70d462cf1
--- /dev/null
+++ b/external_imported/vcpkg/versions/c-/ctstraffic.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "e97cd84703f8c6e44d38be51561113c564590876",
+      "version": "2.0.3.2",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/c-/cub.json b/external_imported/vcpkg/versions/c-/cub.json
index 4dc47df08..6538ac26f 100644
--- a/external_imported/vcpkg/versions/c-/cub.json
+++ b/external_imported/vcpkg/versions/c-/cub.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c7b6e0430fa6c7701a81090f35c8344c7889d790",
+      "version": "2.1.0",
+      "port-version": 0
+    },
     {
       "git-tree": "d6fe5c753cf67eeb18b536ea933864d15a88331d",
       "version": "1.16.0",
diff --git a/external_imported/vcpkg/versions/c-/cubeb.json b/external_imported/vcpkg/versions/c-/cubeb.json
index 1c096d127..575a01b83 100644
--- a/external_imported/vcpkg/versions/c-/cubeb.json
+++ b/external_imported/vcpkg/versions/c-/cubeb.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "9eac0d45fa24887b010ffdd09284d936950d6b0e",
+      "version-date": "2023-09-26",
+      "port-version": 1
+    },
+    {
+      "git-tree": "734318573d1aab99ec902221d209cd01940b37e7",
+      "version-date": "2023-09-26",
+      "port-version": 0
+    },
     {
       "git-tree": "7d7979530500923609dae0ce99dc4a63fea13056",
       "version-date": "2022-07-22",
diff --git a/external_imported/vcpkg/versions/c-/cuda-api-wrappers.json b/external_imported/vcpkg/versions/c-/cuda-api-wrappers.json
new file mode 100644
index 000000000..faa7d3143
--- /dev/null
+++ b/external_imported/vcpkg/versions/c-/cuda-api-wrappers.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "7a504ca0e13729c26c4df96ba5b7a321069219be",
+      "version": "0.6.7",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f31ca06768d00b72f8387dce98f3a8d2d867cfcb",
+      "version": "0.6.6",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/c-/cudnn.json b/external_imported/vcpkg/versions/c-/cudnn.json
index 91538d8b6..fbe1b3f5e 100644
--- a/external_imported/vcpkg/versions/c-/cudnn.json
+++ b/external_imported/vcpkg/versions/c-/cudnn.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "406576a41668942aa5f0be5ee12ea54239be2d84",
+      "version": "7.6.5",
+      "port-version": 10
+    },
     {
       "git-tree": "77f6c8d8f5669619fde9b2bc596a406d0fee2839",
       "version": "7.6.5",
diff --git a/external_imported/vcpkg/versions/c-/curl.json b/external_imported/vcpkg/versions/c-/curl.json
index cb9213850..99f7e7433 100644
--- a/external_imported/vcpkg/versions/c-/curl.json
+++ b/external_imported/vcpkg/versions/c-/curl.json
@@ -1,5 +1,60 @@
 {
   "versions": [
+    {
+      "git-tree": "7b2bf8e8f4e0c7d000cb3b3311f4b9f185cb2d52",
+      "version": "8.5.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "b30c6697e314cdba601dee9bdef0ed01e1d09c8f",
+      "version": "8.5.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8ad22809b9ba0e1e140a8ef45c4502bb2d669e1f",
+      "version": "8.4.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "6125c796d6e2913a89a2996d7082375ce16b02dd",
+      "version": "8.4.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "11ef099083754220ca800477b81e5ea6e51730ff",
+      "version": "8.3.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "1e4df4c9590fb15d2d73014c66dbbc151b624b9b",
+      "version": "8.2.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c82d0a822ec7d4044a58c18f2e198df681822cf6",
+      "version": "8.2.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c2681b59ec41e4ec760fe10a60385202ee4763bb",
+      "version": "8.1.2",
+      "port-version": 2
+    },
+    {
+      "git-tree": "7d8ee40552d5b1c103d52b2b28d9577cb45e2593",
+      "version": "8.1.2",
+      "port-version": 1
+    },
+    {
+      "git-tree": "b70ded19f70e4b198d8c3f844324c7884d3faa7d",
+      "version": "8.1.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "08eea1b0a159f6555603ac8d26a9f8ab4738d02f",
+      "version": "8.0.1",
+      "port-version": 0
+    },
     {
       "git-tree": "9be28a8022b91c14e868d88a74eedc0dd891e966",
       "version": "7.88.1",
diff --git a/external_imported/vcpkg/versions/c-/curlpp.json b/external_imported/vcpkg/versions/c-/curlpp.json
index 1398ea703..8ecfa361b 100644
--- a/external_imported/vcpkg/versions/c-/curlpp.json
+++ b/external_imported/vcpkg/versions/c-/curlpp.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "5f1ce1e78bf1fca65c8f47bde61824589bd11e5c",
+      "version-date": "2018-06-15",
+      "port-version": 9
+    },
+    {
+      "git-tree": "bce2ac6d85261a2aca4b9ea5e974e5a7ee45be3a",
+      "version-date": "2018-06-15",
+      "port-version": 8
+    },
     {
       "git-tree": "ebde1c1d303f750ce06e530295a820787878e6cd",
       "version-date": "2018-06-15",
diff --git a/external_imported/vcpkg/versions/c-/cute-headers.json b/external_imported/vcpkg/versions/c-/cute-headers.json
index a0d7ca06e..292674418 100644
--- a/external_imported/vcpkg/versions/c-/cute-headers.json
+++ b/external_imported/vcpkg/versions/c-/cute-headers.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "73671c8a457d848d2fdb535fc56b72c48c344dcc",
+      "version-date": "2019-09-20",
+      "port-version": 2
+    },
     {
       "git-tree": "d6eb7ff72e3cede19e1f8900fe715014b3fa6d81",
       "version-string": "2019-09-20",
diff --git a/external_imported/vcpkg/versions/c-/cwalk.json b/external_imported/vcpkg/versions/c-/cwalk.json
index d69923111..37ce4cd12 100644
--- a/external_imported/vcpkg/versions/c-/cwalk.json
+++ b/external_imported/vcpkg/versions/c-/cwalk.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "b4ec2b9231b37caee854ffcb82093c79a7e03c71",
+      "version": "1.2.9",
+      "port-version": 0
+    },
+    {
+      "git-tree": "377300b55c1158f1eaa90ba492441adb12845fbb",
+      "version": "1.2.7",
+      "port-version": 0
+    },
     {
       "git-tree": "d538350d056fb42b77d28894f67a2bc9dbfe1403",
       "version": "1.2.6",
diff --git a/external_imported/vcpkg/versions/c-/cxxgraph.json b/external_imported/vcpkg/versions/c-/cxxgraph.json
new file mode 100644
index 000000000..d27e3a04a
--- /dev/null
+++ b/external_imported/vcpkg/versions/c-/cxxgraph.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "84cc008947dc5a40193ec5bc5ce10d175b0cf893",
+      "version": "2.0.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/c-/cyclonedds-cxx.json b/external_imported/vcpkg/versions/c-/cyclonedds-cxx.json
index 47c9ef135..0293d8a16 100644
--- a/external_imported/vcpkg/versions/c-/cyclonedds-cxx.json
+++ b/external_imported/vcpkg/versions/c-/cyclonedds-cxx.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7bbab31be1c21a028381872309f99c05b5393daf",
+      "version": "0.10.4",
+      "port-version": 0
+    },
     {
       "git-tree": "4b29e2454be8abe4661edb20bde4cd35871202d4",
       "version": "0.10.2",
diff --git a/external_imported/vcpkg/versions/c-/cyclonedds.json b/external_imported/vcpkg/versions/c-/cyclonedds.json
index 151f43694..2c281ca38 100644
--- a/external_imported/vcpkg/versions/c-/cyclonedds.json
+++ b/external_imported/vcpkg/versions/c-/cyclonedds.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "abbec0baa12c866bcb3446d55a87c936a62720d2",
+      "version-semver": "0.10.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c255b603065059864d3a144db77cf44b15514222",
+      "version-semver": "0.10.3",
+      "port-version": 0
+    },
     {
       "git-tree": "88e7a85946eae33b8e9d686107d7e303afa2a59e",
       "version-semver": "0.10.2",
diff --git a/external_imported/vcpkg/versions/c-/czmq.json b/external_imported/vcpkg/versions/c-/czmq.json
index 982b8f19e..e5f1d914f 100644
--- a/external_imported/vcpkg/versions/c-/czmq.json
+++ b/external_imported/vcpkg/versions/c-/czmq.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "f2c4f3cb55eecf90232bdaabef1fd9b6d0426c7c",
+      "version-semver": "4.2.1",
+      "port-version": 4
+    },
+    {
+      "git-tree": "ec9f27596e7ff9e8b8aa401f27525075abec28ea",
+      "version-semver": "4.2.1",
+      "port-version": 3
+    },
+    {
+      "git-tree": "5bebd4e3a17c277fc4813a24cbdde5d2a06ccc01",
+      "version-semver": "4.2.1",
+      "port-version": 2
+    },
     {
       "git-tree": "fd4ccb9b894541d10e393139468aaac97419b0f2",
       "version-semver": "4.2.1",
diff --git a/external_imported/vcpkg/versions/d-/d3d12-memory-allocator.json b/external_imported/vcpkg/versions/d-/d3d12-memory-allocator.json
index 0be166fc9..38b67458f 100644
--- a/external_imported/vcpkg/versions/d-/d3d12-memory-allocator.json
+++ b/external_imported/vcpkg/versions/d-/d3d12-memory-allocator.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7ada5dd1ad2d93ae0c4d56924dfaea88f8fc0e55",
+      "version-date": "2021-05-05",
+      "port-version": 1
+    },
     {
       "git-tree": "988836f8b901c1a30f4b667ac37f81f1ef3bcdd8",
       "version-date": "2021-05-05",
diff --git a/external_imported/vcpkg/versions/d-/darknet.json b/external_imported/vcpkg/versions/d-/darknet.json
index 6f2fa46c7..3b988ac06 100644
--- a/external_imported/vcpkg/versions/d-/darknet.json
+++ b/external_imported/vcpkg/versions/d-/darknet.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "b61e4babb5696ae0a5b1d85f9d81540c69688675",
+      "version-date": "2022-03-06",
+      "port-version": 4
+    },
+    {
+      "git-tree": "0143bad2181e6280f1c59918b5c1767ff166ad31",
+      "version-date": "2022-03-06",
+      "port-version": 3
+    },
     {
       "git-tree": "979891799df34103a8312038f12bb6e6b73301d5",
       "version-date": "2022-03-06",
diff --git a/external_imported/vcpkg/versions/d-/dartsim.json b/external_imported/vcpkg/versions/d-/dartsim.json
index 478eef48b..a9dbbddca 100644
--- a/external_imported/vcpkg/versions/d-/dartsim.json
+++ b/external_imported/vcpkg/versions/d-/dartsim.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "4d586df3f633aafc829fd66b18ad22120a9bbed2",
+      "version": "6.12.2",
+      "port-version": 3
+    },
+    {
+      "git-tree": "af3970efb060832f60efe9ad00eef7bc0e824a90",
+      "version": "6.12.2",
+      "port-version": 2
+    },
     {
       "git-tree": "746ffa24744bf10e2ce9b04332c8dcde2222ba39",
       "version": "6.12.2",
diff --git a/external_imported/vcpkg/versions/d-/dataframe.json b/external_imported/vcpkg/versions/d-/dataframe.json
index 02e13d493..8af088bfd 100644
--- a/external_imported/vcpkg/versions/d-/dataframe.json
+++ b/external_imported/vcpkg/versions/d-/dataframe.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "8ca4466cc7b7f6e520341079abff4dd1476e362e",
+      "version": "3.0.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2d385417bae605d78f4c7c9d7188b51649c69deb",
+      "version": "2.3.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9e44b0c459e2d1d35a587de3b8126794d57c7f8c",
+      "version": "2.1.0",
+      "port-version": 0
+    },
     {
       "git-tree": "1dbcb0119d811c5e0ef7e36d5ee456396ac3c10a",
       "version": "1.22.0",
diff --git a/external_imported/vcpkg/versions/d-/date.json b/external_imported/vcpkg/versions/d-/date.json
index e845993b0..7a904c964 100644
--- a/external_imported/vcpkg/versions/d-/date.json
+++ b/external_imported/vcpkg/versions/d-/date.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "cf7d19c233055e8ffa12b200af6afb894ed76447",
+      "version": "3.0.1",
+      "port-version": 5
+    },
+    {
+      "git-tree": "4f6b5d17f3cf8ffb0330963bf0b6d8efa9175e13",
+      "version": "3.0.1",
+      "port-version": 4
+    },
+    {
+      "git-tree": "b3ca1bdc08676cd1bb802421bd94a18872305737",
+      "version": "3.0.1",
+      "port-version": 3
+    },
     {
       "git-tree": "14d5c6822908ad2fd1d700cca2067ae4b8ef4404",
       "version": "3.0.1",
diff --git a/external_imported/vcpkg/versions/d-/datraw.json b/external_imported/vcpkg/versions/d-/datraw.json
new file mode 100644
index 000000000..f91e7ec0a
--- /dev/null
+++ b/external_imported/vcpkg/versions/d-/datraw.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "b125e43a3f58c35a31755006e118216a94c72036",
+      "version": "1.0.9",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/d-/dav1d.json b/external_imported/vcpkg/versions/d-/dav1d.json
index 1b0aa21ec..6d077fdfe 100644
--- a/external_imported/vcpkg/versions/d-/dav1d.json
+++ b/external_imported/vcpkg/versions/d-/dav1d.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "68bf154a3ecc55fd1ad71ff6773ed3f0c418fbba",
+      "version": "1.3.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "99fc7f3cc963cb7a3e567d13f313e5f0dbf46c72",
+      "version": "1.3.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e819aee6d5e62ecd2981c858897773239e66b496",
+      "version": "1.2.1",
+      "port-version": 0
+    },
     {
       "git-tree": "33290c0ea8117f5ba572eaee0a27c0213ec3fe30",
       "version": "1.1.0",
diff --git a/external_imported/vcpkg/versions/d-/daw-header-libraries.json b/external_imported/vcpkg/versions/d-/daw-header-libraries.json
index 5f343f3aa..669bd2ab4 100644
--- a/external_imported/vcpkg/versions/d-/daw-header-libraries.json
+++ b/external_imported/vcpkg/versions/d-/daw-header-libraries.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "30edee4980890f4dbdb9a1c982ddf0b845c1e9cc",
+      "version": "2.98.5",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3646a7d51cdffec8d94d24bd71ea60ffeab50cbd",
+      "version": "2.97.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6d22d6790c0b6ef8ae4ab570ff55882b410e52b4",
+      "version": "2.96.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ff99cdb3f50ade01a8d2e56cf5bc3eb481e5c736",
+      "version": "2.93.1",
+      "port-version": 0
+    },
     {
       "git-tree": "4d509d523fd58793c43034e371dd65d499cec986",
       "version": "2.88.0",
diff --git a/external_imported/vcpkg/versions/d-/daw-json-link.json b/external_imported/vcpkg/versions/d-/daw-json-link.json
index 46dcb5a88..05f2d35a1 100644
--- a/external_imported/vcpkg/versions/d-/daw-json-link.json
+++ b/external_imported/vcpkg/versions/d-/daw-json-link.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "4ada82d47074683e87c8e39629fca2619a4f47c9",
+      "version": "3.23.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d54d49c20629be977b5a3f07934d7edeb9f01f67",
+      "version": "3.20.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c16b653b1f1d195aece3261bf4d244f444e7dabf",
+      "version": "3.19.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "cf2815582532566a0526546e16b40d60127c8fdb",
+      "version": "3.17.2",
+      "port-version": 0
+    },
     {
       "git-tree": "2b4fd6d994392648fb87dec71c1f23e0d8fc6d85",
       "version": "3.15.0",
diff --git a/external_imported/vcpkg/versions/d-/daxa.json b/external_imported/vcpkg/versions/d-/daxa.json
index 14c1adec6..c5a5643ef 100644
--- a/external_imported/vcpkg/versions/d-/daxa.json
+++ b/external_imported/vcpkg/versions/d-/daxa.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2f57bd48f2c32dfad7e8a7dc51e167c9e0832848",
+      "version": "2.0.0",
+      "port-version": 0
+    },
     {
       "git-tree": "25a96e0311836a1151731079225a381779fb3a4b",
       "version": "1.0.0",
diff --git a/external_imported/vcpkg/versions/d-/dbg-macro.json b/external_imported/vcpkg/versions/d-/dbg-macro.json
index 9fa5bd8d3..b7fc1dd4e 100644
--- a/external_imported/vcpkg/versions/d-/dbg-macro.json
+++ b/external_imported/vcpkg/versions/d-/dbg-macro.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "d2182df6402c97759e95b4b0f1f506e8df6e42fb",
+      "version": "0.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "7b6ca099516f914231ec442bea3e6c5f43a91e43",
+      "version": "0.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "69061b0a26aff6be4f73d8f5fb8e028e5460d34b",
       "version-date": "2021-11-02",
diff --git a/external_imported/vcpkg/versions/d-/dbow2.json b/external_imported/vcpkg/versions/d-/dbow2.json
index b78b28f91..089ebdf08 100644
--- a/external_imported/vcpkg/versions/d-/dbow2.json
+++ b/external_imported/vcpkg/versions/d-/dbow2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "94bdc02d1c0ea384086f9d3756da1e19b1c133b4",
+      "version-date": "2019-08-05",
+      "port-version": 3
+    },
     {
       "git-tree": "3494ca270396d5b2f8b496b5fc7b3043a8796069",
       "version-string": "2019-08-05",
diff --git a/external_imported/vcpkg/versions/d-/dbow3.json b/external_imported/vcpkg/versions/d-/dbow3.json
index 9747e1f56..79c875475 100644
--- a/external_imported/vcpkg/versions/d-/dbow3.json
+++ b/external_imported/vcpkg/versions/d-/dbow3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "93b9dd598ac996f1dba459030964ba8fb79ae9dd",
+      "version": "1.0.0",
+      "port-version": 3
+    },
     {
       "git-tree": "0942151a7555bcac51e84d94474111ca96ff5974",
       "version": "1.0.0",
diff --git a/external_imported/vcpkg/versions/d-/dbus.json b/external_imported/vcpkg/versions/d-/dbus.json
index d5541e518..f4bf2e5a9 100644
--- a/external_imported/vcpkg/versions/d-/dbus.json
+++ b/external_imported/vcpkg/versions/d-/dbus.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "d91a1718705f5d0d6ba7922cf832759a58469ff8",
+      "version": "1.15.8",
+      "port-version": 2
+    },
+    {
+      "git-tree": "9104cc6d890ace8c14067e7cbf29c39f7a93b937",
+      "version": "1.15.8",
+      "port-version": 1
+    },
+    {
+      "git-tree": "a49c03bc95822c2f376e3f3758ac3087a428ddec",
+      "version": "1.15.8",
+      "port-version": 0
+    },
     {
       "git-tree": "1805ee4cbe77b30b7e922f8854acbd7bd3733e83",
       "version": "1.15.2",
diff --git a/external_imported/vcpkg/versions/d-/dcmtk.json b/external_imported/vcpkg/versions/d-/dcmtk.json
index e0d808fc0..98ac3ace1 100644
--- a/external_imported/vcpkg/versions/d-/dcmtk.json
+++ b/external_imported/vcpkg/versions/d-/dcmtk.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "86607f6cdca69d2aca997eead93dfa2b767679a1",
+      "version": "3.6.8",
+      "port-version": 2
+    },
+    {
+      "git-tree": "bec215b4880ee37ff46a69fdbc6bd3888901c52a",
+      "version": "3.6.8",
+      "port-version": 1
+    },
+    {
+      "git-tree": "04c152f7113c88dcfb84b3f4963cadd60c254a74",
+      "version": "3.6.8",
+      "port-version": 0
+    },
+    {
+      "git-tree": "bea28d42632b9740c795d645252307fe02c273cc",
+      "version": "3.6.7",
+      "port-version": 6
+    },
+    {
+      "git-tree": "a66dd62879ace07389aae2f77cc909744f9d7458",
+      "version": "3.6.7",
+      "port-version": 5
+    },
     {
       "git-tree": "99287653b98406054ee56cb8447c38aff0528444",
       "version": "3.6.7",
diff --git a/external_imported/vcpkg/versions/d-/debug-assert.json b/external_imported/vcpkg/versions/d-/debug-assert.json
index 559f18d78..931ff9e66 100644
--- a/external_imported/vcpkg/versions/d-/debug-assert.json
+++ b/external_imported/vcpkg/versions/d-/debug-assert.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ac34fbcc09f0613c2dc9dbe8a513d29db6d73f6f",
+      "version": "1.3.3",
+      "port-version": 2
+    },
     {
       "git-tree": "b41dd0f27f6eb99b63780eed36a9f3170acd60df",
       "version-string": "1.3.3",
diff --git a/external_imported/vcpkg/versions/d-/decimal-for-cpp.json b/external_imported/vcpkg/versions/d-/decimal-for-cpp.json
index 2923eaa7d..cae6e1825 100644
--- a/external_imported/vcpkg/versions/d-/decimal-for-cpp.json
+++ b/external_imported/vcpkg/versions/d-/decimal-for-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a78e582f830db392c8d551f3008a5977dad45692",
+      "version": "1.18",
+      "port-version": 1
+    },
     {
       "git-tree": "e6b418fe87e9affcbb4605d4aeb10e5e6883b239",
       "version-string": "1.18",
diff --git a/external_imported/vcpkg/versions/d-/devil.json b/external_imported/vcpkg/versions/d-/devil.json
index b6fba8b5c..515f85043 100644
--- a/external_imported/vcpkg/versions/d-/devil.json
+++ b/external_imported/vcpkg/versions/d-/devil.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "03010167ad1849c5f1a8e5bc044115b3c84478a3",
+      "version": "1.8.0",
+      "port-version": 11
+    },
     {
       "git-tree": "ed3ecd6484dfd9737eee0c415817fdddffcc03e2",
       "version": "1.8.0",
diff --git a/external_imported/vcpkg/versions/d-/directx-dxc.json b/external_imported/vcpkg/versions/d-/directx-dxc.json
index 7ac7a3d10..d021a9c11 100644
--- a/external_imported/vcpkg/versions/d-/directx-dxc.json
+++ b/external_imported/vcpkg/versions/d-/directx-dxc.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "24aa8f49b169cce15400a6b90aec8f20b609ea24",
+      "version-date": "2023-08-14",
+      "port-version": 0
+    },
+    {
+      "git-tree": "bdf7371f02d10ea110ecef427916c0f3fd78cd4d",
+      "version-date": "2023-03-01",
+      "port-version": 2
+    },
     {
       "git-tree": "d9531dd561af13a58e38e173002e599c7ad1182f",
       "version-date": "2023-03-01",
diff --git a/external_imported/vcpkg/versions/d-/directx-headers.json b/external_imported/vcpkg/versions/d-/directx-headers.json
index 885cf647e..28019e7fa 100644
--- a/external_imported/vcpkg/versions/d-/directx-headers.json
+++ b/external_imported/vcpkg/versions/d-/directx-headers.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "fb40a4684c1b18daa80a09fc344d94622a275161",
+      "version": "1.611.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "36881ec4ee5f1623dc083ef7afcfe1133c3fbd32",
+      "version": "1.610.2",
+      "port-version": 0
+    },
     {
       "git-tree": "9e443c72abae6f6a090ba8eec8983b7d5a99c4e4",
       "version": "1.608.2",
diff --git a/external_imported/vcpkg/versions/d-/directxmath.json b/external_imported/vcpkg/versions/d-/directxmath.json
index d31db6cdd..c51264486 100644
--- a/external_imported/vcpkg/versions/d-/directxmath.json
+++ b/external_imported/vcpkg/versions/d-/directxmath.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a7b031efa3bb41535fde116ad3cec2674a2764cd",
+      "version-date": "2023-12-31",
+      "port-version": 0
+    },
     {
       "git-tree": "ecd21e108091a293a27869c9c093ad558ffcdc42",
       "version-date": "2022-12-12",
diff --git a/external_imported/vcpkg/versions/d-/directxmesh.json b/external_imported/vcpkg/versions/d-/directxmesh.json
index dd708506f..348901327 100644
--- a/external_imported/vcpkg/versions/d-/directxmesh.json
+++ b/external_imported/vcpkg/versions/d-/directxmesh.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "9e63a47ffc37c894672b093434b97137d86e599f",
+      "version-date": "2023-12-31",
+      "port-version": 0
+    },
+    {
+      "git-tree": "174e5777bf0c14a32b9182a55f29a4f6c23c2226",
+      "version-date": "2023-10-28",
+      "port-version": 0
+    },
+    {
+      "git-tree": "abb5d2c283eb23c36dc1e0f1330f4aa302d0de4d",
+      "version-date": "2023-06-13",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4cf91137f48f28bc44cb34d28b3d03113f109e2d",
+      "version-date": "2023-04-28",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ca0059f3e1281fd0e23c37327b2d7db6fb0a5c17",
+      "version-date": "2023-03-30",
+      "port-version": 0
+    },
     {
       "git-tree": "1611f6525922335db956702b8c81357c38b4d497",
       "version-date": "2022-12-15",
diff --git a/external_imported/vcpkg/versions/d-/directxsdk.json b/external_imported/vcpkg/versions/d-/directxsdk.json
index 78d37a857..5504311c4 100644
--- a/external_imported/vcpkg/versions/d-/directxsdk.json
+++ b/external_imported/vcpkg/versions/d-/directxsdk.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "c82a75b02160ef435f13eb2fda1f2079013bca68",
+      "version-string": "jun10",
+      "port-version": 8
+    },
+    {
+      "git-tree": "10f6ac11c6480f52d70ff2725cf34fd39b942376",
+      "version-string": "jun10",
+      "port-version": 7
+    },
     {
       "git-tree": "d39d11be448d2aae6541b902b33dcf23282250f2",
       "version-string": "jun10",
diff --git a/external_imported/vcpkg/versions/d-/directxtex.json b/external_imported/vcpkg/versions/d-/directxtex.json
index fe4aee0f7..23b2e0cd2 100644
--- a/external_imported/vcpkg/versions/d-/directxtex.json
+++ b/external_imported/vcpkg/versions/d-/directxtex.json
@@ -1,5 +1,45 @@
 {
   "versions": [
+    {
+      "git-tree": "badb59a9a275010d4edfa78e2f63d35a91341126",
+      "version-date": "2023-12-31",
+      "port-version": 0
+    },
+    {
+      "git-tree": "7721548fe4f3648dae608b765e757f69db31fe02",
+      "version-date": "2023-10-28",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f6f049027d47e20e719f6a0f3f888509b63befad",
+      "version-date": "2023-09-01",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6b99ef3202ed870bad345dddc5e1fba67ff70281",
+      "version-date": "2023-06-13",
+      "port-version": 1
+    },
+    {
+      "git-tree": "61211f80ff16adc6b3d278c7a35cf4c3579feaa3",
+      "version-date": "2023-06-13",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6d6f4042f6d636d2e24281cd5d0c1e29a28207d9",
+      "version-date": "2023-04-28",
+      "port-version": 1
+    },
+    {
+      "git-tree": "14daf71a3dffda45222d771968e399ec56e1c0e1",
+      "version-date": "2023-03-30",
+      "port-version": 1
+    },
+    {
+      "git-tree": "49ac22c74d82cd2a67dc98755d3bd78d1ff3be45",
+      "version-date": "2023-03-30",
+      "port-version": 0
+    },
     {
       "git-tree": "ce86b52d28836d76d7d62265633440c76f5cc28a",
       "version-date": "2023-01-31",
diff --git a/external_imported/vcpkg/versions/d-/directxtk.json b/external_imported/vcpkg/versions/d-/directxtk.json
index 13e3c41d8..0e63a430c 100644
--- a/external_imported/vcpkg/versions/d-/directxtk.json
+++ b/external_imported/vcpkg/versions/d-/directxtk.json
@@ -1,5 +1,40 @@
 {
   "versions": [
+    {
+      "git-tree": "6c817d9e4e03e8e1b848d90681b3ae042dbf3f50",
+      "version-date": "2023-12-31",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8f18ff4afb77acfd3b6383375fd2016746b192d2",
+      "version-date": "2023-10-28",
+      "port-version": 0
+    },
+    {
+      "git-tree": "67b1d9a329c9e9d8d067359c18bb997148f4e84e",
+      "version-date": "2023-09-01",
+      "port-version": 1
+    },
+    {
+      "git-tree": "bf6287265ca9c166405069e8ed3d54e79388cf14",
+      "version-date": "2023-09-01",
+      "port-version": 0
+    },
+    {
+      "git-tree": "aeeec09ca589bb93e5ec21960e5c0e84bd1b94e3",
+      "version-date": "2023-06-13",
+      "port-version": 0
+    },
+    {
+      "git-tree": "39f3ce588272b32b67881fb0e226c68e3255a0cb",
+      "version-date": "2023-04-28",
+      "port-version": 0
+    },
+    {
+      "git-tree": "87649cefdd3b789e8e29cd6da4396be1f18f7fd7",
+      "version-date": "2023-03-30",
+      "port-version": 0
+    },
     {
       "git-tree": "5bcf0651d2cc84914169b0c253588d6b247e1617",
       "version-date": "2023-02-06",
diff --git a/external_imported/vcpkg/versions/d-/directxtk12.json b/external_imported/vcpkg/versions/d-/directxtk12.json
index fca91024b..d8317980d 100644
--- a/external_imported/vcpkg/versions/d-/directxtk12.json
+++ b/external_imported/vcpkg/versions/d-/directxtk12.json
@@ -1,5 +1,40 @@
 {
   "versions": [
+    {
+      "git-tree": "812ae3f8a37d56767d5bf058d1c02320a5b10183",
+      "version-date": "2023-12-31",
+      "port-version": 0
+    },
+    {
+      "git-tree": "753353fa24f0d2c86cb75b0c6a881b621835a572",
+      "version-date": "2023-10-28",
+      "port-version": 0
+    },
+    {
+      "git-tree": "981fd27befe2b9d8afaab87f1b66c1f8c6f31c18",
+      "version-date": "2023-09-01",
+      "port-version": 1
+    },
+    {
+      "git-tree": "5e74058955f67b88369b4cc3f600dc6a65be1035",
+      "version-date": "2023-09-01",
+      "port-version": 0
+    },
+    {
+      "git-tree": "1a18359efb872f674283fb30d838cb014f74063c",
+      "version-date": "2023-06-13",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b77dc8e9667b0717ed8c44333327a948e9f98eaa",
+      "version-date": "2023-04-28",
+      "port-version": 0
+    },
+    {
+      "git-tree": "95f45e85acae1eb5e82d00b3e6f2f4bc48ba87f4",
+      "version-date": "2023-03-30",
+      "port-version": 0
+    },
     {
       "git-tree": "f546a33c817a7307dae695d1d83cca865ceec6d8",
       "version-date": "2023-02-06",
diff --git a/external_imported/vcpkg/versions/d-/dirent.json b/external_imported/vcpkg/versions/d-/dirent.json
index 7bd05e891..c1af536dd 100644
--- a/external_imported/vcpkg/versions/d-/dirent.json
+++ b/external_imported/vcpkg/versions/d-/dirent.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "bcace8750d2b6080c63877eed432f8b862501012",
+      "version": "1.24",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6df6238f6f97735c39e2e9b19d90f3895c4a636b",
+      "version": "1.23.2",
+      "port-version": 3
+    },
+    {
+      "git-tree": "9d27b241631b1f540dd16824cd8a2df735233733",
+      "version": "1.23.2",
+      "port-version": 2
+    },
     {
       "git-tree": "75a51df9f74a0b771b858caf42d3111a6386945c",
       "version-string": "1.23.2",
diff --git a/external_imported/vcpkg/versions/d-/discord-game-sdk.json b/external_imported/vcpkg/versions/d-/discord-game-sdk.json
index 58f913b56..c1b4197ba 100644
--- a/external_imported/vcpkg/versions/d-/discord-game-sdk.json
+++ b/external_imported/vcpkg/versions/d-/discord-game-sdk.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b81659584b418c89a25dc9c6e68cb8d7d75fee5f",
+      "version": "3.2.1",
+      "port-version": 0
+    },
     {
       "git-tree": "87af266946b8e9b9f6ed5b439b3af5e185b84766",
       "version": "2.5.6",
diff --git a/external_imported/vcpkg/versions/d-/discord-rpc.json b/external_imported/vcpkg/versions/d-/discord-rpc.json
index eb420539e..d57acc7f4 100644
--- a/external_imported/vcpkg/versions/d-/discord-rpc.json
+++ b/external_imported/vcpkg/versions/d-/discord-rpc.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "929ff2e2379863aabc478dfb7773549404c3f74f",
+      "version": "3.4.0",
+      "port-version": 3
+    },
     {
       "git-tree": "5f69d097fd478421946aceaaca5b2fca43de4f20",
       "version-string": "3.4.0",
diff --git a/external_imported/vcpkg/versions/d-/discordcoreapi.json b/external_imported/vcpkg/versions/d-/discordcoreapi.json
index 1c362a90c..cefe0421f 100644
--- a/external_imported/vcpkg/versions/d-/discordcoreapi.json
+++ b/external_imported/vcpkg/versions/d-/discordcoreapi.json
@@ -1,5 +1,75 @@
 {
   "versions": [
+    {
+      "git-tree": "4cfa99c19a8811ae210dc76d37a27dae5c636aca",
+      "version": "2.0.5",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9ee6373146d5c81a3e7bd75e4f32da5ec846299d",
+      "version": "2.0.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a836f4645f8f1dd567ed87160f62c4026b8db784",
+      "version": "2.0.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4105594f2f8aef84bb0aa20917d473727e0d9700",
+      "version": "2.0.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3b4e38bd8dd9683ee4923d31a64426a01e8b3466",
+      "version": "2.0.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "374bc763a70ab0e9556a40bdea62ea9a9cf7d8bd",
+      "version": "2.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0c13b373bc9e51c1e18062b280fe6edcbe104d5f",
+      "version": "1.90",
+      "port-version": 0
+    },
+    {
+      "git-tree": "789b50745e33c0e6eaa40302779200a613b44a08",
+      "version": "1.80",
+      "port-version": 0
+    },
+    {
+      "git-tree": "dfd9cf5247abe59fa2e2465e9768f4da42ae3508",
+      "version": "1.70",
+      "port-version": 0
+    },
+    {
+      "git-tree": "1ed32e38f0959575a32ad92111e6e2b157184cfd",
+      "version": "1.60",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5470dc11ff71563bac3bd6d27b677561051a995f",
+      "version": "1.50",
+      "port-version": 0
+    },
+    {
+      "git-tree": "67dcb76ec4a6669264f61e9718533d9fd253a066",
+      "version": "1.40",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c9c84716a494279e16d9f85834ecb7e130dfa561",
+      "version-date": "2023-05-30",
+      "port-version": 1
+    },
+    {
+      "git-tree": "d24e2b697098510aeb4799426a66c5749f9a3b97",
+      "version-date": "2023-05-30",
+      "port-version": 0
+    },
     {
       "git-tree": "90c3313d8c31b532ab7e876d0b2f962d29e757f7",
       "version-date": "2023-01-02",
diff --git a/external_imported/vcpkg/versions/d-/discount.json b/external_imported/vcpkg/versions/d-/discount.json
index 87f7756a2..af395e682 100644
--- a/external_imported/vcpkg/versions/d-/discount.json
+++ b/external_imported/vcpkg/versions/d-/discount.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "0964d0b7e61494ef8a5c81def6fe5070b3d60d4f",
+      "version-string": "3.0.0a",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4cd434c2eb8785c098c1bedc33764a78291fbf2b",
+      "version": "2.2.6",
+      "port-version": 3
+    },
     {
       "git-tree": "acdff2b22e0fc2351a96d099dedf2e4bbeb5ce9f",
       "version-string": "2.2.6",
diff --git a/external_imported/vcpkg/versions/d-/discreture.json b/external_imported/vcpkg/versions/d-/discreture.json
index 315b4bdda..8abf0fb99 100644
--- a/external_imported/vcpkg/versions/d-/discreture.json
+++ b/external_imported/vcpkg/versions/d-/discreture.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6ce6e0d3477245bce82e42445571ec25010be703",
+      "version-date": "2020-01-29",
+      "port-version": 3
+    },
     {
       "git-tree": "99f5fe641e52f034dc3fe62f2b5372d772a5ce42",
       "version-string": "2020-01-29",
diff --git a/external_imported/vcpkg/versions/d-/dlfcn-win32.json b/external_imported/vcpkg/versions/d-/dlfcn-win32.json
index 8252c743f..0ac064faa 100644
--- a/external_imported/vcpkg/versions/d-/dlfcn-win32.json
+++ b/external_imported/vcpkg/versions/d-/dlfcn-win32.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9eb1d5778fcb3bfa4d46ade382ae6b6e924d301f",
+      "version": "1.4.1",
+      "port-version": 0
+    },
     {
       "git-tree": "39fcef74b0e249a6e49b28eb8b4be8d1f6bc3d54",
       "version": "1.3.1",
diff --git a/external_imported/vcpkg/versions/d-/dlib.json b/external_imported/vcpkg/versions/d-/dlib.json
index 3ab172ef7..2d62df629 100644
--- a/external_imported/vcpkg/versions/d-/dlib.json
+++ b/external_imported/vcpkg/versions/d-/dlib.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5a2fe0fe58b23b16ef1f94c5b68bbd560ac54649",
+      "version": "19.24",
+      "port-version": 3
+    },
     {
       "git-tree": "9eaa35254408c210c84c3bfebb8e8651bab075e0",
       "version": "19.24",
diff --git a/external_imported/vcpkg/versions/d-/docopt.json b/external_imported/vcpkg/versions/d-/docopt.json
index 11f1cab05..033bd747b 100644
--- a/external_imported/vcpkg/versions/d-/docopt.json
+++ b/external_imported/vcpkg/versions/d-/docopt.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a18c91830f3f709c03b3d0e245f404e8cf7a99c3",
+      "version-date": "2018-11-01",
+      "port-version": 3
+    },
     {
       "git-tree": "9fe0c66a1eca6672184cb33b92ea744df0efc0b3",
       "version-string": "2018-11-01",
diff --git a/external_imported/vcpkg/versions/d-/doctest.json b/external_imported/vcpkg/versions/d-/doctest.json
index 6049f6a60..14375f1eb 100644
--- a/external_imported/vcpkg/versions/d-/doctest.json
+++ b/external_imported/vcpkg/versions/d-/doctest.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "619b544477f70ef777fcc294e0b31650e2bd4c05",
+      "version": "2.4.11",
+      "port-version": 0
+    },
     {
       "git-tree": "6f1ded501cbcf08445218ca0c5bee9df28188df9",
       "version": "2.4.9",
diff --git a/external_imported/vcpkg/versions/d-/double-conversion.json b/external_imported/vcpkg/versions/d-/double-conversion.json
index e6a5ccb2c..60ebfa7e2 100644
--- a/external_imported/vcpkg/versions/d-/double-conversion.json
+++ b/external_imported/vcpkg/versions/d-/double-conversion.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "63037e8b38231f15de1dddb0593eebfb0bf32496",
+      "version": "3.3.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2c3184965fe6c2b602348a73c58752c2ef72bf9d",
+      "version": "3.2.1",
+      "port-version": 1
+    },
     {
       "git-tree": "16b23d889f831b492aaa819cfde4d5d263be5bed",
       "version": "3.2.1",
diff --git a/external_imported/vcpkg/versions/d-/dp-thread-pool.json b/external_imported/vcpkg/versions/d-/dp-thread-pool.json
new file mode 100644
index 000000000..47de052e0
--- /dev/null
+++ b/external_imported/vcpkg/versions/d-/dp-thread-pool.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "a8e355c1d995271f753fc560da82f65a3f5f8f02",
+      "version": "0.6.2",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/d-/dpp.json b/external_imported/vcpkg/versions/d-/dpp.json
index a05124cc0..57360900c 100644
--- a/external_imported/vcpkg/versions/d-/dpp.json
+++ b/external_imported/vcpkg/versions/d-/dpp.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "57e513b7c5b9b43418e0be4bdbb739359878baaa",
+      "version": "10.0.29",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f9104c5be5bad205d3b5210b5ba79dfe577e51de",
+      "version": "10.0.28",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c9ad04c95ab1097720e988a5879045b575d8eb18",
+      "version": "10.0.27",
+      "port-version": 0
+    },
+    {
+      "git-tree": "bb85393fcea63ff5e643c3bb0cf15bbdad6d8a2e",
+      "version": "10.0.26",
+      "port-version": 0
+    },
+    {
+      "git-tree": "20fb1fc7a015ebb43e9d01ddbdcb10e351feeeb7",
+      "version": "10.0.25",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8c631e7b3f93d40c4aea0d65e722e1ff1ac028ac",
+      "version": "10.0.24",
+      "port-version": 0
+    },
     {
       "git-tree": "f5258ce203526b7be2ba77c9ab6deb7a197273af",
       "version": "10.0.23",
diff --git a/external_imported/vcpkg/versions/d-/draco.json b/external_imported/vcpkg/versions/d-/draco.json
index dace9381a..76e5c03c6 100644
--- a/external_imported/vcpkg/versions/d-/draco.json
+++ b/external_imported/vcpkg/versions/d-/draco.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "06799add74da6e9e4634e4c7f27b82b1149a8bb6",
+      "version": "1.5.7",
+      "port-version": 0
+    },
+    {
+      "git-tree": "7766920ec32ef9da00121a0668edf41bf9d1d76b",
+      "version": "1.5.6",
+      "port-version": 1
+    },
+    {
+      "git-tree": "bed378402e689e540a924f99869f7134d74bbdfb",
+      "version": "1.5.6",
+      "port-version": 0
+    },
     {
       "git-tree": "b4f39e03fdf47c2c1e9a945b362ed52ec098a354",
       "version": "1.5.3",
diff --git a/external_imported/vcpkg/versions/d-/drlibs.json b/external_imported/vcpkg/versions/d-/drlibs.json
index 4862bb458..c03686ca5 100644
--- a/external_imported/vcpkg/versions/d-/drlibs.json
+++ b/external_imported/vcpkg/versions/d-/drlibs.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "54c4836e6d8403c42520823d58b89c4632201f61",
+      "version-date": "2023-08-16",
+      "port-version": 0
+    },
     {
       "git-tree": "2b4bfd32103ed7afb27e12281caf95c81930c955",
       "version-date": "2022-09-26",
diff --git a/external_imported/vcpkg/versions/d-/drogon.json b/external_imported/vcpkg/versions/d-/drogon.json
index 664109c6c..c5380c9ee 100644
--- a/external_imported/vcpkg/versions/d-/drogon.json
+++ b/external_imported/vcpkg/versions/d-/drogon.json
@@ -1,5 +1,55 @@
 {
   "versions": [
+    {
+      "git-tree": "881a2d3fe8ed95836190c20c36471e47168954c5",
+      "version-semver": "1.9.2",
+      "port-version": 0 
+    },
+    {
+      "git-tree": "2258c21d158a9c39a058f30d88d6a8a9e8172e5b",
+      "version-semver": "1.9.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "72953f06e1c7a3195daa8549c9d2b46d42125822",
+      "version-semver": "1.9.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3dc8fd6d40ad624513353e295fbd39a0dd237c91",
+      "version": "1.8.7",
+      "port-version": 1
+    },
+    {
+      "git-tree": "01b8dcf586886018269bc888cc651751d074d4c6",
+      "version": "1.8.7",
+      "port-version": 0
+    },
+    {
+      "git-tree": "7f8d8eadd014bf7d28bfff57e3e11e211fa8c4ae",
+      "version": "1.8.4",
+      "port-version": 4
+    },
+    {
+      "git-tree": "dde2eb171931557ecf9c74459cceb6a7b1d7ce9a",
+      "version": "1.8.4",
+      "port-version": 3
+    },
+    {
+      "git-tree": "ddae8d79f08366e60ecaddf472fcf24a2c8c2ffd",
+      "version": "1.8.4",
+      "port-version": 2
+    },
+    {
+      "git-tree": "29376f140626e1d34d6ca573b5a00e6dd7006d2f",
+      "version": "1.8.4",
+      "port-version": 1
+    },
+    {
+      "git-tree": "92af14d325c1fce661625e6adef2cf633acb5a37",
+      "version": "1.8.4",
+      "port-version": 0
+    },
     {
       "git-tree": "670f02828b60f7a11c6b7a7feff0396d6cec4483",
       "version": "1.8.2",
diff --git a/external_imported/vcpkg/versions/d-/dstorage.json b/external_imported/vcpkg/versions/d-/dstorage.json
index 4d34860b0..48bc43cc5 100644
--- a/external_imported/vcpkg/versions/d-/dstorage.json
+++ b/external_imported/vcpkg/versions/d-/dstorage.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "7577afa856f2cf3d3ce28d32f3272344987f2a71",
+      "version": "1.2.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "18440695231677ed659b391e4a31c0100996cdb6",
+      "version": "1.2.0",
+      "port-version": 0
+    },
     {
       "git-tree": "065715cb0fcd3b94934da5de3db5e2341cf1912c",
       "version": "1.1.0",
diff --git a/external_imported/vcpkg/versions/d-/dukglue.json b/external_imported/vcpkg/versions/d-/dukglue.json
new file mode 100644
index 000000000..795016b44
--- /dev/null
+++ b/external_imported/vcpkg/versions/d-/dukglue.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "449645283a2e3de0824c9e448135059f26d7626c",
+      "version-date": "2022-11-08",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/d-/duktape.json b/external_imported/vcpkg/versions/d-/duktape.json
index fff518033..e0cbafb5f 100644
--- a/external_imported/vcpkg/versions/d-/duktape.json
+++ b/external_imported/vcpkg/versions/d-/duktape.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "dddb2510d64d70d7c0cb632039123a1721857e72",
+      "version": "2.7.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d5a2a59ce6d8477151b1bd30ad12e5a65ce86331",
+      "version": "2.5.0",
+      "port-version": 4
+    },
     {
       "git-tree": "ec86279e8f26e8d5d45b3292d7bdf6750da9439f",
       "version-string": "2.5.0",
diff --git a/external_imported/vcpkg/versions/d-/dumb.json b/external_imported/vcpkg/versions/d-/dumb.json
new file mode 100644
index 000000000..ad4a77513
--- /dev/null
+++ b/external_imported/vcpkg/versions/d-/dumb.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "fb0e42347cd9ec43e40d2b123990e1705399dc02",
+      "version": "2.0.3",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/d-/dv-processing.json b/external_imported/vcpkg/versions/d-/dv-processing.json
index 9b201c068..a3526399d 100644
--- a/external_imported/vcpkg/versions/d-/dv-processing.json
+++ b/external_imported/vcpkg/versions/d-/dv-processing.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "cd165ee3da5e52cb1a2a9bf22a87d04c2e100d4e",
+      "version": "1.7.9",
+      "port-version": 1
+    },
+    {
+      "git-tree": "70c0ee933303903d8a550f89a138bba0541222dc",
+      "version": "1.7.9",
+      "port-version": 0
+    },
     {
       "git-tree": "8b60bb354ea9ab03a96d4ab7c0c51bca9580cf72",
       "version": "1.7.8",
diff --git a/external_imported/vcpkg/versions/d-/dx.json b/external_imported/vcpkg/versions/d-/dx.json
index 96dffa0a8..26416ab12 100644
--- a/external_imported/vcpkg/versions/d-/dx.json
+++ b/external_imported/vcpkg/versions/d-/dx.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "268d4fc68703cfcc25aa8cca04a67a80312dd2e9",
+      "version": "1.0.1",
+      "port-version": 3
+    },
     {
       "git-tree": "684efcf0d9ea4c1a8b7ec6d9440e0097ab38d586",
       "version-string": "1.0.1",
diff --git a/external_imported/vcpkg/versions/d-/dxsdk-d3dx.json b/external_imported/vcpkg/versions/d-/dxsdk-d3dx.json
index 41ed89add..d39618094 100644
--- a/external_imported/vcpkg/versions/d-/dxsdk-d3dx.json
+++ b/external_imported/vcpkg/versions/d-/dxsdk-d3dx.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "bca406e04cfde4f63d430a5f2f10273701747f31",
+      "version": "9.29.952.8",
+      "port-version": 6
+    },
     {
       "git-tree": "b12c3d78e879e1cd9608e02851132ae683bb587e",
       "version": "9.29.952.8",
diff --git a/external_imported/vcpkg/versions/d-/dxut.json b/external_imported/vcpkg/versions/d-/dxut.json
index 20231953a..86452a2c5 100644
--- a/external_imported/vcpkg/versions/d-/dxut.json
+++ b/external_imported/vcpkg/versions/d-/dxut.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0a23af22ce7047b4caba055c92bb2c7f31571321",
+      "version": "11.31",
+      "port-version": 3
+    },
     {
       "git-tree": "878ebc5ed10a20cb6d6c292e44b6eb7163296a0f",
       "version": "11.31",
diff --git a/external_imported/vcpkg/versions/d-/dylib.json b/external_imported/vcpkg/versions/d-/dylib.json
new file mode 100644
index 000000000..19054b4d3
--- /dev/null
+++ b/external_imported/vcpkg/versions/d-/dylib.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "5fcb0f058217dc6352d308f18015ef37b3f5f23c",
+      "version-semver": "2.2.1",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/d-/dyno.json b/external_imported/vcpkg/versions/d-/dyno.json
new file mode 100644
index 000000000..a305f30d7
--- /dev/null
+++ b/external_imported/vcpkg/versions/d-/dyno.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "3af5237e2f59d877c47c333a5c006eae66f9d00c",
+      "version-date": "2019-11-13",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/e-/eastl.json b/external_imported/vcpkg/versions/e-/eastl.json
index e851e47cf..87e144fbb 100644
--- a/external_imported/vcpkg/versions/e-/eastl.json
+++ b/external_imported/vcpkg/versions/e-/eastl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2c5cde8f3324d5cdc8ee405da863177ca8aa7c52",
+      "version": "3.21.12",
+      "port-version": 0
+    },
     {
       "git-tree": "1e7b533fac097c3aa75f7b46630ea62f10980f87",
       "version-string": "3.18.00",
diff --git a/external_imported/vcpkg/versions/e-/easycl.json b/external_imported/vcpkg/versions/e-/easycl.json
index 88f7e35dd..ceeebc47f 100644
--- a/external_imported/vcpkg/versions/e-/easycl.json
+++ b/external_imported/vcpkg/versions/e-/easycl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "54235bb93553dde5363e98f4b8e24f74f4a57481",
+      "version": "0.3",
+      "port-version": 2
+    },
     {
       "git-tree": "f25251c36cd3423ca13cdf773e124ce01e7b08fe",
       "version-string": "0.3",
diff --git a/external_imported/vcpkg/versions/e-/easyhook.json b/external_imported/vcpkg/versions/e-/easyhook.json
index 4c770cc0e..54ac1ede7 100644
--- a/external_imported/vcpkg/versions/e-/easyhook.json
+++ b/external_imported/vcpkg/versions/e-/easyhook.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "311bf5152e8f8ba46dc9123c9bc4d66c0cabad24",
+      "version": "2.7.7097.0",
+      "port-version": 7
+    },
+    {
+      "git-tree": "8877642f19052e820932928a49049719516ebf9b",
+      "version": "2.7.7097.0",
+      "port-version": 6
+    },
     {
       "git-tree": "71b209c038081c700231ebc3be136c6976f22c4b",
       "version": "2.7.7097.0",
diff --git a/external_imported/vcpkg/versions/e-/easyloggingpp.json b/external_imported/vcpkg/versions/e-/easyloggingpp.json
index a6e90e0aa..683e4e09d 100644
--- a/external_imported/vcpkg/versions/e-/easyloggingpp.json
+++ b/external_imported/vcpkg/versions/e-/easyloggingpp.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "38a4e115b196ff65465edaf05ce8a89a2640128a",
+      "version": "9.97.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "89605d63db69f67c4dfaf9a5b2cc33650967e065",
+      "version": "9.97.0",
+      "port-version": 4
+    },
+    {
+      "git-tree": "69f6b238899967e671f818a164f21de0219546bc",
+      "version": "9.97.0",
+      "port-version": 3
+    },
     {
       "git-tree": "40ca985ab8030ca0daf7c902e413423801d3e3d4",
       "version": "9.97.0",
diff --git a/external_imported/vcpkg/versions/e-/eathread.json b/external_imported/vcpkg/versions/e-/eathread.json
index 4568b724d..1a560b921 100644
--- a/external_imported/vcpkg/versions/e-/eathread.json
+++ b/external_imported/vcpkg/versions/e-/eathread.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "34f9cb023b8968a396617b8ff04abc086b1c02d7",
+      "version-string": "1.32.09",
+      "port-version": 5
+    },
+    {
+      "git-tree": "88ecba1014ac560fb1083f5e8b74c10cddf8d6ea",
+      "version-string": "1.32.09",
+      "port-version": 4
+    },
     {
       "git-tree": "341734fa50c34beff0593368922f71829fb0ff19",
       "version-string": "1.32.09",
diff --git a/external_imported/vcpkg/versions/e-/ebml.json b/external_imported/vcpkg/versions/e-/ebml.json
index d6ea50e46..1d3427d45 100644
--- a/external_imported/vcpkg/versions/e-/ebml.json
+++ b/external_imported/vcpkg/versions/e-/ebml.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "4dd27fceafb402b6a634a2a934e7c3df0c1a64c0",
+      "version": "1.4.4",
+      "port-version": 1
+    },
+    {
+      "git-tree": "a4b2091951270259a38b2b900547a544bfad046f",
+      "version": "1.4.4",
+      "port-version": 0
+    },
     {
       "git-tree": "4fc7059101f067e639c84844996c77eaba7908e6",
       "version": "1.4.2",
diff --git a/external_imported/vcpkg/versions/e-/ecal.json b/external_imported/vcpkg/versions/e-/ecal.json
new file mode 100644
index 000000000..da14ddb89
--- /dev/null
+++ b/external_imported/vcpkg/versions/e-/ecal.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "cfba9f382140cce351a69ed174cc1b93d0c97483",
+      "version-semver": "5.12.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/e-/ecos.json b/external_imported/vcpkg/versions/e-/ecos.json
index 6f456c3f7..900f9608c 100644
--- a/external_imported/vcpkg/versions/e-/ecos.json
+++ b/external_imported/vcpkg/versions/e-/ecos.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "27839500a8e0bfa142a3486e32410ea3c5c1de42",
+      "version": "2.0.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "78694a162b97c80fc2b0017c3dc13c9c7e79f9c2",
+      "version": "2.0.8",
+      "port-version": 3
+    },
+    {
+      "git-tree": "7dff762b4bcf1a168140c6c69aa8180c579d8fd9",
+      "version": "2.0.8",
+      "port-version": 2
+    },
     {
       "git-tree": "10196c7185540fa8faccc2f3afcce7be58ab5a1f",
       "version-string": "2.0.8",
diff --git a/external_imported/vcpkg/versions/e-/ecsutil.json b/external_imported/vcpkg/versions/e-/ecsutil.json
index 2ca0f3a19..24461990b 100644
--- a/external_imported/vcpkg/versions/e-/ecsutil.json
+++ b/external_imported/vcpkg/versions/e-/ecsutil.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "6ca7f3b29a9f7263185ae0576f75a229f13afa94",
+      "version": "1.0.7.15",
+      "port-version": 5
+    },
+    {
+      "git-tree": "1758edf3915aba62cd6eaf2c70d1401acf663175",
+      "version": "1.0.7.15",
+      "port-version": 4
+    },
     {
       "git-tree": "9526f049f789b79ac68f8937a9af15da13de53b4",
       "version": "1.0.7.15",
diff --git a/external_imported/vcpkg/versions/e-/ed25519.json b/external_imported/vcpkg/versions/e-/ed25519.json
new file mode 100644
index 000000000..3540c4705
--- /dev/null
+++ b/external_imported/vcpkg/versions/e-/ed25519.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "c62f7e2a6268b66c80e20287872725e8bc273032",
+      "version-date": "2017-02-10",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/e-/edflib.json b/external_imported/vcpkg/versions/e-/edflib.json
index 03caf49f1..f34be9be1 100644
--- a/external_imported/vcpkg/versions/e-/edflib.json
+++ b/external_imported/vcpkg/versions/e-/edflib.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "28eece0b454594cd00d8c878320908b7e39e4c9b",
+      "version": "1.25",
+      "port-version": 0
+    },
+    {
+      "git-tree": "1866b8a8e3db616811041a4f147a0dbed3db64cc",
+      "version": "1.24",
+      "port-version": 0
+    },
     {
       "git-tree": "161f6ffc0519e0944bce2573bbfb7ed800899690",
       "version": "1.21",
diff --git a/external_imported/vcpkg/versions/e-/effects11.json b/external_imported/vcpkg/versions/e-/effects11.json
index 58f5f92b8..793d2681b 100644
--- a/external_imported/vcpkg/versions/e-/effects11.json
+++ b/external_imported/vcpkg/versions/e-/effects11.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4d7d6262892fede7f8fee3fa410dac968e49ed99",
+      "version": "11.29",
+      "port-version": 3
+    },
     {
       "git-tree": "fe385ae61317ac6744d0587322237979de227284",
       "version": "11.29",
diff --git a/external_imported/vcpkg/versions/e-/effolkronium-random.json b/external_imported/vcpkg/versions/e-/effolkronium-random.json
index fd709ffc2..b907a839d 100644
--- a/external_imported/vcpkg/versions/e-/effolkronium-random.json
+++ b/external_imported/vcpkg/versions/e-/effolkronium-random.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "92d5b3e1b94743447e68f6c774bbbc56b3556461",
+      "version": "1.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "2ffd6600668e6304e7e60f9ef447855efc89a0a0",
       "version": "1.4.1",
diff --git a/external_imported/vcpkg/versions/e-/eigen3.json b/external_imported/vcpkg/versions/e-/eigen3.json
index 850e31dcc..cb5c46737 100644
--- a/external_imported/vcpkg/versions/e-/eigen3.json
+++ b/external_imported/vcpkg/versions/e-/eigen3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "38fc865a94dea7a84f8b1350936ed4fcc3e638cc",
+      "version": "3.4.0",
+      "port-version": 3
+    },
     {
       "git-tree": "250d10d414a5542aaf832350264498ba727c4c03",
       "version": "3.4.0",
diff --git a/external_imported/vcpkg/versions/e-/elfio.json b/external_imported/vcpkg/versions/e-/elfio.json
index 0f5112d21..c5a2e0144 100644
--- a/external_imported/vcpkg/versions/e-/elfio.json
+++ b/external_imported/vcpkg/versions/e-/elfio.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "96b9160e3d2440526fac5a7630d4fec4d26c49e5",
+      "version": "3.12",
+      "port-version": 0
+    },
     {
       "git-tree": "d5bb36bfbec63a059c47cd839da14a84719ae768",
       "version": "3.11",
@@ -17,7 +22,7 @@
     },
     {
       "git-tree": "19659f0b36d05c1643f7ecb4b553341a942b1fd5",
-      "version": "3.8",
+      "version-string": "3.8",
       "port-version": 0
     }
   ]
diff --git a/external_imported/vcpkg/versions/e-/embree3.json b/external_imported/vcpkg/versions/e-/embree3.json
index fabc52c15..29c7d3827 100644
--- a/external_imported/vcpkg/versions/e-/embree3.json
+++ b/external_imported/vcpkg/versions/e-/embree3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "23414ba5fbc71fc0db19bbc4133762e552a3bbec",
+      "version": "3.13.5",
+      "port-version": 2
+    },
     {
       "git-tree": "dcd33aea68c2058b380f0617fe5524a3939c3ac7",
       "version": "3.13.5",
diff --git a/external_imported/vcpkg/versions/e-/enet.json b/external_imported/vcpkg/versions/e-/enet.json
index b2f8a6fee..895ebb97d 100644
--- a/external_imported/vcpkg/versions/e-/enet.json
+++ b/external_imported/vcpkg/versions/e-/enet.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "17a08430b1e76eae1ff5ea036084bee2d9a09775",
+      "version": "1.3.17",
+      "port-version": 2
+    },
     {
       "git-tree": "a31699670612c88cdf69dd80af975d44c10ac1f6",
       "version": "1.3.17",
diff --git a/external_imported/vcpkg/versions/e-/enkits.json b/external_imported/vcpkg/versions/e-/enkits.json
new file mode 100644
index 000000000..f40def58d
--- /dev/null
+++ b/external_imported/vcpkg/versions/e-/enkits.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "d83be5a37b104f4c67030a8184af78bfa248137c",
+      "version": "1.11",
+      "port-version": 1
+    },
+    {
+      "git-tree": "8fe0e538a1d8685844297f35b7e00f4984d4bb09",
+      "version": "1.11",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/e-/ensmallen.json b/external_imported/vcpkg/versions/e-/ensmallen.json
index ba23af4c8..1a7e99375 100644
--- a/external_imported/vcpkg/versions/e-/ensmallen.json
+++ b/external_imported/vcpkg/versions/e-/ensmallen.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9cc70243efdfb4af7cc5e482a6e976d650487e86",
+      "version-semver": "2.19.1",
+      "port-version": 0
+    },
     {
       "git-tree": "00de3f8f709bd51bba23d6aa8f01636a1e99f298",
       "version-semver": "2.19.0",
diff --git a/external_imported/vcpkg/versions/e-/entityx.json b/external_imported/vcpkg/versions/e-/entityx.json
index 2d7bb14ca..1545ee642 100644
--- a/external_imported/vcpkg/versions/e-/entityx.json
+++ b/external_imported/vcpkg/versions/e-/entityx.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "ad5351451933af0b68354f8ff7f018017c48d5c5",
+      "version": "1.3.0",
+      "port-version": 5
+    },
+    {
+      "git-tree": "e642d746ab67cfffbde02f5a78c2f5ee7acf635e",
+      "version": "1.3.0",
+      "port-version": 4
+    },
     {
       "git-tree": "191e57655630e9862440dd860de69d4baa62b089",
       "version-string": "1.3.0",
diff --git a/external_imported/vcpkg/versions/e-/entt.json b/external_imported/vcpkg/versions/e-/entt.json
index b1a703c95..97db2b1b4 100644
--- a/external_imported/vcpkg/versions/e-/entt.json
+++ b/external_imported/vcpkg/versions/e-/entt.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "7dbe8b313e49ea2a5be64c6e4da5676437637939",
+      "version": "3.13.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e3643359b0f55263734639170eb29b481f86436a",
+      "version": "3.13.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "556ac85a20d7294c42222cb292a2753113953015",
+      "version": "3.12.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "715488654a998a72da8fff6596cbeedf1962fa56",
+      "version": "3.12.0",
+      "port-version": 0
+    },
     {
       "git-tree": "d9bf4ab0cc1354ea754f3038dee29ae00ded6331",
       "version": "3.11.1",
diff --git a/external_imported/vcpkg/versions/e-/epsilon.json b/external_imported/vcpkg/versions/e-/epsilon.json
index 39b536af2..964231723 100644
--- a/external_imported/vcpkg/versions/e-/epsilon.json
+++ b/external_imported/vcpkg/versions/e-/epsilon.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1c976014bade32edb4c7fc233fe92823ae6d5340",
+      "version": "0.9.2",
+      "port-version": 8
+    },
     {
       "git-tree": "800dbc074727df7eded3e5707b828be676bb5943",
       "version": "0.9.2",
diff --git a/external_imported/vcpkg/versions/e-/ereignis.json b/external_imported/vcpkg/versions/e-/ereignis.json
index f5ec1c4e6..a0ebb40c8 100644
--- a/external_imported/vcpkg/versions/e-/ereignis.json
+++ b/external_imported/vcpkg/versions/e-/ereignis.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "53ba30ec67abd936ea33d4c4136ca83a3e9c145c",
+      "version": "2.3",
+      "port-version": 0
+    },
     {
       "git-tree": "9fae65f1e52927feaf919019a722da7f20982e4c",
       "version": "1.1",
diff --git a/external_imported/vcpkg/versions/e-/etcd-cpp-apiv3.json b/external_imported/vcpkg/versions/e-/etcd-cpp-apiv3.json
index b182c9437..b551f2919 100644
--- a/external_imported/vcpkg/versions/e-/etcd-cpp-apiv3.json
+++ b/external_imported/vcpkg/versions/e-/etcd-cpp-apiv3.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "6b581f1d83d15c382c94c2929838f928588285c9",
+      "version": "0.15.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "fcdd53892f918548cbe88add5b6224c19ed941f7",
+      "version": "0.14.2",
+      "port-version": 1
+    },
     {
       "git-tree": "dd97517ebe389d53e5b32703d9c6744f2031d389",
       "version": "0.14.2",
diff --git a/external_imported/vcpkg/versions/e-/etl.json b/external_imported/vcpkg/versions/e-/etl.json
index 4a5381948..6ef21c459 100644
--- a/external_imported/vcpkg/versions/e-/etl.json
+++ b/external_imported/vcpkg/versions/e-/etl.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "079f0debc933d6e50b2a2e2cda340343f6bf6a6d",
+      "version": "20.38.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c192d31b7a1db34a2a2de4cab11ed949c54f35da",
+      "version": "20.38.0",
+      "port-version": 0
+    },
     {
       "git-tree": "4c71341c1081f0135ba14fcc8e1f5007264cdf92",
       "version": "20.35.4",
diff --git a/external_imported/vcpkg/versions/e-/eve.json b/external_imported/vcpkg/versions/e-/eve.json
index 23738390f..3d85da7f6 100644
--- a/external_imported/vcpkg/versions/e-/eve.json
+++ b/external_imported/vcpkg/versions/e-/eve.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f76e41a1a878a665a45ca3b3eef2c8ec8d406778",
+      "version": "2023.2.15",
+      "port-version": 0
+    },
     {
       "git-tree": "701ec863d463d1a8c570336d3c5bd672f540793c",
       "version": "2022.9.1",
diff --git a/external_imported/vcpkg/versions/e-/eventpp.json b/external_imported/vcpkg/versions/e-/eventpp.json
index 4b723916d..24a65b661 100644
--- a/external_imported/vcpkg/versions/e-/eventpp.json
+++ b/external_imported/vcpkg/versions/e-/eventpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "13f41aca93677fedad3baaf9ed698546434ae379",
+      "version-semver": "0.1.3",
+      "port-version": 0
+    },
     {
       "git-tree": "3f11cacc8b5a6f9f2951992d29cee39e52ef601f",
       "version-semver": "0.1.2",
diff --git a/external_imported/vcpkg/versions/e-/exiv2.json b/external_imported/vcpkg/versions/e-/exiv2.json
index f0619c8d0..4df48d3c4 100644
--- a/external_imported/vcpkg/versions/e-/exiv2.json
+++ b/external_imported/vcpkg/versions/e-/exiv2.json
@@ -1,5 +1,40 @@
 {
   "versions": [
+    {
+      "git-tree": "c718e83fc18023db2be57de6fb8873555aabdccb",
+      "version": "0.28.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "0c1020def33eb27e28b1cb0bd2cfd53dfe5fbae5",
+      "version": "0.28.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "550a17385502e498859987df6696ffdccc55190d",
+      "version": "0.28.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "8d3de5f93cf2b1fa2e4a6c3b9ef5b6a30087bb22",
+      "version": "0.28.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3966c9ebea089fea43d1730cc2b1b21bd5703d3e",
+      "version": "0.27.6",
+      "port-version": 3
+    },
+    {
+      "git-tree": "9616cd1c578515f6aa85ab9dc6e00cdbbda31371",
+      "version": "0.27.6",
+      "port-version": 2
+    },
+    {
+      "git-tree": "4e3ce02246c1ef4cdc28caed2afa2fe2b394476f",
+      "version": "0.27.6",
+      "port-version": 1
+    },
     {
       "git-tree": "19442ed87a9f3827ddb22debf6b446e4cdca2d4f",
       "version": "0.27.6",
diff --git a/external_imported/vcpkg/versions/e-/expected-lite.json b/external_imported/vcpkg/versions/e-/expected-lite.json
index 54293e66d..8910e5995 100644
--- a/external_imported/vcpkg/versions/e-/expected-lite.json
+++ b/external_imported/vcpkg/versions/e-/expected-lite.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f15c8963416782cdd215cf6b9a3f85ded0e4d2de",
+      "version": "0.6.3",
+      "port-version": 0
+    },
     {
       "git-tree": "9c8f107476fb8d2afc13ab7b743b31d1e07ea5cd",
       "version": "0.6.2",
diff --git a/external_imported/vcpkg/versions/e-/ezc3d.json b/external_imported/vcpkg/versions/e-/ezc3d.json
index 116bab01a..bbe16fd32 100644
--- a/external_imported/vcpkg/versions/e-/ezc3d.json
+++ b/external_imported/vcpkg/versions/e-/ezc3d.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "1331eec1377ca1e720afdd9c3cf2660c49b58084",
+      "version": "1.5.7",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f41d466838bd526b6e8717bf3c962b29a7bb47c5",
+      "version": "1.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "21ec5f8371f785c406c466171aadff744e2b34e2",
       "version": "1.4.7",
diff --git a/external_imported/vcpkg/versions/f-/fadbad.json b/external_imported/vcpkg/versions/f-/fadbad.json
index 8c67fe49e..3810de5f1 100644
--- a/external_imported/vcpkg/versions/f-/fadbad.json
+++ b/external_imported/vcpkg/versions/f-/fadbad.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a607ac03a90c00969c67d2ec609924e9b80795bc",
+      "version": "2.1.0",
+      "port-version": 2
+    },
     {
       "git-tree": "508423e28f6d567501bcfe9e8733627dcb9df7ec",
       "version-string": "2.1.0",
diff --git a/external_imported/vcpkg/versions/f-/faiss.json b/external_imported/vcpkg/versions/f-/faiss.json
index ef8aae608..ca5567ba5 100644
--- a/external_imported/vcpkg/versions/f-/faiss.json
+++ b/external_imported/vcpkg/versions/f-/faiss.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e2f2e6695629b11c85f79e4fc8b962134396a953",
+      "version": "1.7.4",
+      "port-version": 0
+    },
     {
       "git-tree": "f346ac31428205c546269f8107390836185f0d72",
       "version": "1.7.3",
diff --git a/external_imported/vcpkg/versions/f-/fakeit.json b/external_imported/vcpkg/versions/f-/fakeit.json
index 473350b62..a72611c84 100644
--- a/external_imported/vcpkg/versions/f-/fakeit.json
+++ b/external_imported/vcpkg/versions/f-/fakeit.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "808389303a7bd3b6a4d3b9614c8b7e582f4dc6d5",
+      "version": "2.4.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "4975f837bbd496c621a2b6cd11fc6745357c61c5",
+      "version": "2.4.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "a226f1d679f9c3acf8c67d69d24086e236b67a29",
+      "version": "2.4.0",
+      "port-version": 0
+    },
     {
       "git-tree": "a167ae0c79d73a0c9802b41992c668a41209a390",
       "version": "2.3.0",
diff --git a/external_imported/vcpkg/versions/f-/fameta-counter.json b/external_imported/vcpkg/versions/f-/fameta-counter.json
new file mode 100644
index 000000000..6a6a92b58
--- /dev/null
+++ b/external_imported/vcpkg/versions/f-/fameta-counter.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "e830075f562957049cad7d3d3526e4707884ff0a",
+      "version-date": "2021-02-13",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/f-/fann.json b/external_imported/vcpkg/versions/f-/fann.json
index e005396d3..c99cc402c 100644
--- a/external_imported/vcpkg/versions/f-/fann.json
+++ b/external_imported/vcpkg/versions/f-/fann.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "94b730a699257765fce03efa37433036770904c4",
+      "version-date": "2023-01-26",
+      "port-version": 0
+    },
     {
       "git-tree": "05d4d344a7295f604f3cf541a9d92b9a680fd830",
       "version": "2.2.0",
diff --git a/external_imported/vcpkg/versions/f-/farmhash.json b/external_imported/vcpkg/versions/f-/farmhash.json
index e4083b973..6fe2af7a8 100644
--- a/external_imported/vcpkg/versions/f-/farmhash.json
+++ b/external_imported/vcpkg/versions/f-/farmhash.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1c4cd2b5f5afa61f7192b3e1b175749317189eb9",
+      "version": "1.1",
+      "port-version": 6
+    },
     {
       "git-tree": "860c81df38a838331a4a2d7895427248d594e5c5",
       "version": "1.1",
diff --git a/external_imported/vcpkg/versions/f-/fast-float.json b/external_imported/vcpkg/versions/f-/fast-float.json
index 38b638032..f5ebcfa44 100644
--- a/external_imported/vcpkg/versions/f-/fast-float.json
+++ b/external_imported/vcpkg/versions/f-/fast-float.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "4f36d745c12126b63e7f6b1dc5f41f6c644e1367",
+      "version": "6.0.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b78d9590504b99e64f96cdddac42bf67fed57feb",
+      "version": "5.2.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4b3850e475298431083406c88bd1ced0a0c6e740",
+      "version": "4.0.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "90a05053bff1f356dc27f0227210840d8a26ef27",
+      "version": "3.11.0",
+      "port-version": 0
+    },
     {
       "git-tree": "166b1343d7e66bb8e6d29ba612620ae55f5a615e",
       "version": "3.5.1",
diff --git a/external_imported/vcpkg/versions/f-/fastcdr.json b/external_imported/vcpkg/versions/f-/fastcdr.json
index fc462dc58..f0a793ccf 100644
--- a/external_imported/vcpkg/versions/f-/fastcdr.json
+++ b/external_imported/vcpkg/versions/f-/fastcdr.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9f8b9c01af9c5166bc7666ca9aac688747ff7a03",
+      "version-semver": "1.1.0",
+      "port-version": 0
+    },
     {
       "git-tree": "8ac25a2de2fa721da695d61b5346f05e93a51bf7",
       "version-semver": "1.0.26",
diff --git a/external_imported/vcpkg/versions/f-/fastfeat.json b/external_imported/vcpkg/versions/f-/fastfeat.json
index 7a85559db..3fe8b2057 100644
--- a/external_imported/vcpkg/versions/f-/fastfeat.json
+++ b/external_imported/vcpkg/versions/f-/fastfeat.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "358fa85ceb7b5e03878d6a14880e2ea990f19b70",
+      "version-string": "391d5e9",
+      "port-version": 4
+    },
+    {
+      "git-tree": "541afe72f533ebfd48289a605d3d6652245a7196",
+      "version-string": "391d5e9",
+      "port-version": 3
+    },
     {
       "git-tree": "c6df4d7e64a7c9cb69a300aa50f62e2fbb261138",
       "version-string": "391d5e9",
diff --git a/external_imported/vcpkg/versions/f-/fastgltf.json b/external_imported/vcpkg/versions/f-/fastgltf.json
index d8c041054..12206cd57 100644
--- a/external_imported/vcpkg/versions/f-/fastgltf.json
+++ b/external_imported/vcpkg/versions/f-/fastgltf.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "b098e0b272a75e2c12b898a54b6b83a49f981599",
+      "version": "0.6.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "28cc725ac91ea72117083d152661ba131f8bca94",
+      "version": "0.5.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "5fdd22bd96978abf4f7d8b8fef6406eb8d79ec3f",
+      "version": "0.5.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b74244ec99460cdaf1e81a401e423fe6975ce252",
+      "version": "0.4.0",
+      "port-version": 0
+    },
     {
       "git-tree": "e761e2221600a90d65726d363b996818d60e0ad7",
       "version": "0.2.0",
diff --git a/external_imported/vcpkg/versions/f-/fastio.json b/external_imported/vcpkg/versions/f-/fastio.json
index 5dcf6c1b3..6ad0fbfd0 100644
--- a/external_imported/vcpkg/versions/f-/fastio.json
+++ b/external_imported/vcpkg/versions/f-/fastio.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "d5c900f8e88aaa9a8c41a16af374634ca5120289",
+      "version-date": "2023-11-06",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3cfcdfee62b62a815b8ea72c22e41a40b6c24610",
+      "version-date": "2023-07-06",
+      "port-version": 0
+    },
     {
       "git-tree": "03ff13377e65b89408d2b0eba2b7ad1f34201641",
       "version-date": "2022-11-14",
diff --git a/external_imported/vcpkg/versions/f-/fastlz.json b/external_imported/vcpkg/versions/f-/fastlz.json
index d8485dc2c..6b5542bca 100644
--- a/external_imported/vcpkg/versions/f-/fastlz.json
+++ b/external_imported/vcpkg/versions/f-/fastlz.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "c0b4a47d599f386343ef30714e7ad2757c07e969",
+      "version-date": "2021-05-10",
+      "port-version": 2
+    },
+    {
+      "git-tree": "85820ff391f7eb605232c0ae7e8db844ff8a4f18",
+      "version-date": "2021-05-10",
+      "port-version": 1
+    },
     {
       "git-tree": "638b6220eb5ca72dae00fb3b8bdd19834cf6b938",
       "version-date": "2021-05-10",
diff --git a/external_imported/vcpkg/versions/f-/fastrtps.json b/external_imported/vcpkg/versions/f-/fastrtps.json
index 8b7d8d081..df7195502 100644
--- a/external_imported/vcpkg/versions/f-/fastrtps.json
+++ b/external_imported/vcpkg/versions/f-/fastrtps.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "e60f3fa00c69cc283d5ba48b642abdd8464c49f8",
+      "version": "2.7.0",
+      "port-version": 5
+    },
+    {
+      "git-tree": "2b2c27c3a92da80b837e5f14641cd6ea2b5fc6f6",
+      "version": "2.7.0",
+      "port-version": 4
+    },
+    {
+      "git-tree": "75ba9fed16853532cfc26487e85e4309289b8dd2",
+      "version": "2.7.0",
+      "port-version": 3
+    },
+    {
+      "git-tree": "443f550810af037dae538dc5555d7e069f2896ec",
+      "version": "2.7.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "b2d64bc038a30ea7ad49dc5cb923c0e13618281c",
+      "version": "2.7.0",
+      "port-version": 1
+    },
     {
       "git-tree": "7a1b9df69d8a4219b390a65056d837dc6c0f385c",
       "version": "2.7.0",
diff --git a/external_imported/vcpkg/versions/f-/fbgemm.json b/external_imported/vcpkg/versions/f-/fbgemm.json
index 5f34b896f..33cf5cea7 100644
--- a/external_imported/vcpkg/versions/f-/fbgemm.json
+++ b/external_imported/vcpkg/versions/f-/fbgemm.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e19b797fb42fad6dae0f9aca0890ddc62535800f",
+      "version": "0.4.1",
+      "port-version": 0
+    },
     {
       "git-tree": "e3afaf099d4759d2d2a57caccb7d54ca2d5b2359",
       "version-date": "2021-03-18",
diff --git a/external_imported/vcpkg/versions/f-/fbthrift.json b/external_imported/vcpkg/versions/f-/fbthrift.json
index 49f8193e4..92cabbf06 100644
--- a/external_imported/vcpkg/versions/f-/fbthrift.json
+++ b/external_imported/vcpkg/versions/f-/fbthrift.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "824b246c1bf15c6d96a4ca1126d3e9a279663585",
+      "version-string": "2024.01.01.00",
+      "port-version": 0
+    },
+    {
+      "git-tree": "80891c5a004015fd7a5c4334de145c92474f2cec",
+      "version-string": "2023.10.02.00",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c2384982312ce0a1ee08ff0da69ff562e3690ffe",
+      "version-string": "2023.07.03.00",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4ad62e4d34a61f43fee3a61b14aae377ed73249a",
+      "version-string": "2023.05.15.00",
+      "port-version": 0
+    },
+    {
+      "git-tree": "74805d5c9147b3255703cdce511d9082cdfee016",
+      "version-string": "2022.03.21.00",
+      "port-version": 3
+    },
     {
       "git-tree": "60135cc9f7a4bf698b67d275e1ad66a542d9acb4",
       "version-string": "2022.03.21.00",
diff --git a/external_imported/vcpkg/versions/f-/fdk-aac.json b/external_imported/vcpkg/versions/f-/fdk-aac.json
index 31c4b7a24..6ff3b4e9a 100644
--- a/external_imported/vcpkg/versions/f-/fdk-aac.json
+++ b/external_imported/vcpkg/versions/f-/fdk-aac.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "85e6f9518580daf2454d9db89b0e813d0e9d4008",
+      "version-semver": "2.0.2",
+      "port-version": 2
+    },
     {
       "git-tree": "56f6b0699ef8d63059cd4ecb1bdc7613104d7cf8",
       "version-semver": "2.0.2",
diff --git a/external_imported/vcpkg/versions/f-/fdlibm.json b/external_imported/vcpkg/versions/f-/fdlibm.json
index 51bdc1f0d..8b80e1e0c 100644
--- a/external_imported/vcpkg/versions/f-/fdlibm.json
+++ b/external_imported/vcpkg/versions/f-/fdlibm.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "b557ee44621e4f2935b37aee54d24addcbb418d2",
+      "version": "5.3",
+      "port-version": 7
+    },
+    {
+      "git-tree": "7b714eec8a6d6d491d3efa59688b7cc94bacf460",
+      "version": "5.3",
+      "port-version": 6
+    },
     {
       "git-tree": "7edc287bacd598a942ca6b29ed47329204b07faa",
       "version-string": "5.3",
diff --git a/external_imported/vcpkg/versions/f-/ffmpeg.json b/external_imported/vcpkg/versions/f-/ffmpeg.json
index 43a3d70c6..f2d8064f6 100644
--- a/external_imported/vcpkg/versions/f-/ffmpeg.json
+++ b/external_imported/vcpkg/versions/f-/ffmpeg.json
@@ -1,5 +1,65 @@
 {
   "versions": [
+    {
+      "git-tree": "1bb35d5c0d560a56e6429ca412c7bc5f3e55e930",
+      "version": "6.1.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e749968704c8ad09bb7d2d9cfda93777fe94b563",
+      "version": "6.1",
+      "port-version": 2
+    },
+    {
+      "git-tree": "aa26e2742d2c653f1f74843dce3120c753376f50",
+      "version": "6.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "e350faae831bb8d75c4ebcee81d9161484aecdba",
+      "version": "6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9f33fe16e3a4e278bc2eb92b24483d00b90e9f3a",
+      "version": "6.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "70c25989395c92bd79faf0b136fb4636e96d541c",
+      "version": "6.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "515f4b8df7a66e74ef6bcde4eae3841d3a96038f",
+      "version": "6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "713c943d5cce36c51128eea921489e0770c28857",
+      "version": "5.1.2",
+      "port-version": 10
+    },
+    {
+      "git-tree": "dfcd8db452a85e6e6a0ad751dd4610ff1b0e1662",
+      "version": "5.1.2",
+      "port-version": 9
+    },
+    {
+      "git-tree": "3ee8d10aa504c74cfef80d47e1901afa3289a544",
+      "version": "5.1.2",
+      "port-version": 8
+    },
+    {
+      "git-tree": "1fcd248f6f655e6aecb94976680b1c537da6d918",
+      "version": "5.1.2",
+      "port-version": 7
+    },
+    {
+      "git-tree": "a7e0c378cd0a6564b28c28d6d970e3d633b4382e",
+      "version": "5.1.2",
+      "port-version": 6
+    },
     {
       "git-tree": "14577b12f56accfce4428caf17e4b47542f365ec",
       "version": "5.1.2",
diff --git a/external_imported/vcpkg/versions/f-/ffnvcodec.json b/external_imported/vcpkg/versions/f-/ffnvcodec.json
index dc6a492f9..a7e570d69 100644
--- a/external_imported/vcpkg/versions/f-/ffnvcodec.json
+++ b/external_imported/vcpkg/versions/f-/ffnvcodec.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "1e9c042e433dca081ec8f18d57d19851bc6182a3",
+      "version": "11.1.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "129a409f9a9a143a3964c7d6cdb5fef51c777cc4",
+      "version": "11.1.5.2",
+      "port-version": 0
+    },
     {
       "git-tree": "9f49e200522747c711e28db563004ce1f5a2f816",
       "version": "11.1.5.0",
diff --git a/external_imported/vcpkg/versions/f-/fftw3.json b/external_imported/vcpkg/versions/f-/fftw3.json
index 378a0a9d5..fc997d8e3 100644
--- a/external_imported/vcpkg/versions/f-/fftw3.json
+++ b/external_imported/vcpkg/versions/f-/fftw3.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "824a4cda47df1a63c0b13f2a603e7d0fb0dac900",
+      "version": "3.3.10",
+      "port-version": 8
+    },
+    {
+      "git-tree": "5b1eac37609e9187b1ddf4666cc564ce6e07e891",
+      "version": "3.3.10",
+      "port-version": 7
+    },
+    {
+      "git-tree": "a23ec27bf6a069ab7b60cc7c3b890a9224bf341c",
+      "version": "3.3.10",
+      "port-version": 6
+    },
     {
       "git-tree": "8dcd10c7fca8d58af1f601a45a74148942cff752",
       "version": "3.3.10",
diff --git a/external_imported/vcpkg/versions/f-/fineftp.json b/external_imported/vcpkg/versions/f-/fineftp.json
new file mode 100644
index 000000000..44056b036
--- /dev/null
+++ b/external_imported/vcpkg/versions/f-/fineftp.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "379dd5cfe0c3cad96197e14aa9782daf51daca3d",
+      "version": "1.3.4",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/f-/fins.json b/external_imported/vcpkg/versions/f-/fins.json
new file mode 100644
index 000000000..09eb82bf8
--- /dev/null
+++ b/external_imported/vcpkg/versions/f-/fins.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "116698010e51dae8ec84b81e8224e5f84a1a4d97",
+      "version-date": "2023-07-31",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/f-/fizz.json b/external_imported/vcpkg/versions/f-/fizz.json
index 3f1788bbe..abaced4d0 100644
--- a/external_imported/vcpkg/versions/f-/fizz.json
+++ b/external_imported/vcpkg/versions/f-/fizz.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "b3a03c5a987e674153efbc6e8a9ab1ed9655b0b0",
+      "version-string": "2024.01.01.00",
+      "port-version": 0
+    },
+    {
+      "git-tree": "1d8026070e16e8f91275e5f97699bfd5452166d4",
+      "version-string": "2023.10.02.00",
+      "port-version": 0
+    },
+    {
+      "git-tree": "813216afa42f8549aac52519655ab62f8d552c64",
+      "version-string": "2023.07.03.00",
+      "port-version": 0
+    },
+    {
+      "git-tree": "81e1764f1bcde018ea8a73fc36c4f4d14b03e978",
+      "version-string": "2023.05.15.00",
+      "port-version": 0
+    },
+    {
+      "git-tree": "df45ebd305a5416215667058e31729d6f28f7b64",
+      "version-string": "2022.10.31.00",
+      "port-version": 1
+    },
     {
       "git-tree": "aa78418cc3a270fb236d03b946e1658feabd19dc",
       "version-string": "2022.10.31.00",
diff --git a/external_imported/vcpkg/versions/f-/flagpp.json b/external_imported/vcpkg/versions/f-/flagpp.json
new file mode 100644
index 000000000..325d9a9f0
--- /dev/null
+++ b/external_imported/vcpkg/versions/f-/flagpp.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "faf42d8daa5b595fe7225a10072be86387a41947",
+      "version": "2.1",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/f-/flann.json b/external_imported/vcpkg/versions/f-/flann.json
index d951e22e0..94e299066 100644
--- a/external_imported/vcpkg/versions/f-/flann.json
+++ b/external_imported/vcpkg/versions/f-/flann.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "827bba7345ec924adeee28bacb5b0a79f705920d",
+      "version-date": "2019-04-07",
+      "port-version": 7
+    },
     {
       "git-tree": "300415ad416640a5b4a4f0895a3250b306726181",
       "version-date": "2019-04-07",
diff --git a/external_imported/vcpkg/versions/f-/flashlight-cpu.json b/external_imported/vcpkg/versions/f-/flashlight-cpu.json
index 9f6e60deb..8b648b3f5 100644
--- a/external_imported/vcpkg/versions/f-/flashlight-cpu.json
+++ b/external_imported/vcpkg/versions/f-/flashlight-cpu.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "fdd9cc7867f46f759c1376e35cd098e79a8adacd",
+      "version": "0.3",
+      "port-version": 5
+    },
+    {
+      "git-tree": "39bf5a47d9bf74db777caf107115e55fdedcf98e",
+      "version": "0.3",
+      "port-version": 4
+    },
     {
       "git-tree": "217b238dc2abf773a66a004f21d4c89dcc9324e3",
       "version": "0.3",
diff --git a/external_imported/vcpkg/versions/f-/flashlight-cuda.json b/external_imported/vcpkg/versions/f-/flashlight-cuda.json
index 3c6f29741..9b4d91f07 100644
--- a/external_imported/vcpkg/versions/f-/flashlight-cuda.json
+++ b/external_imported/vcpkg/versions/f-/flashlight-cuda.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "c6d4ea65707f91031fb354aaeb2c76897256d861",
+      "version": "0.3",
+      "port-version": 6
+    },
+    {
+      "git-tree": "97fa08fe5524aef7cbaa3d1b428d2b65245f2708",
+      "version": "0.3",
+      "port-version": 5
+    },
     {
       "git-tree": "0c59cec24c52379832bb5b227963c0b6681346a7",
       "version": "0.3",
diff --git a/external_imported/vcpkg/versions/f-/flashlight-sequence.json b/external_imported/vcpkg/versions/f-/flashlight-sequence.json
new file mode 100644
index 000000000..85310ded3
--- /dev/null
+++ b/external_imported/vcpkg/versions/f-/flashlight-sequence.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "0391c7bfa30bca396dadf39e7d9844cc7b43b38a",
+      "version": "0.0.1",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/f-/flashlight-text.json b/external_imported/vcpkg/versions/f-/flashlight-text.json
new file mode 100644
index 000000000..b9db5df58
--- /dev/null
+++ b/external_imported/vcpkg/versions/f-/flashlight-text.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "fdf18ae36763962256b235eec31becbe02f2534d",
+      "version": "0.0.4",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/f-/flatbuffers.json b/external_imported/vcpkg/versions/f-/flatbuffers.json
index 461dd091f..d2e5996c1 100644
--- a/external_imported/vcpkg/versions/f-/flatbuffers.json
+++ b/external_imported/vcpkg/versions/f-/flatbuffers.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "2f827d9a5f37614af7cdb44c15075dbaac88d740",
+      "version": "23.5.26",
+      "port-version": 1
+    },
+    {
+      "git-tree": "5146d5516c8570263780a1cdf73df98d70936e07",
+      "version": "23.5.26",
+      "port-version": 0
+    },
+    {
+      "git-tree": "787f5c089a87c5896ef5f0f8b200de1d1081158c",
+      "version": "23.5.9",
+      "port-version": 0
+    },
     {
       "git-tree": "007f5be0ca9f1fb0e4cd747153edafe584f3e090",
       "version": "23.3.3",
diff --git a/external_imported/vcpkg/versions/f-/flatbush.json b/external_imported/vcpkg/versions/f-/flatbush.json
new file mode 100644
index 000000000..9e04d810b
--- /dev/null
+++ b/external_imported/vcpkg/versions/f-/flatbush.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "f9a8b3e1671e29e5a3ad36935f66f7d7bac0e0ab",
+      "version": "1.2.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8c59357025e0ee6a44855c384d3defd0a9ee525d",
+      "version": "1.1.2",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/f-/flecs.json b/external_imported/vcpkg/versions/f-/flecs.json
index 7393d5a9b..b134fbc1a 100644
--- a/external_imported/vcpkg/versions/f-/flecs.json
+++ b/external_imported/vcpkg/versions/f-/flecs.json
@@ -1,5 +1,60 @@
 {
   "versions": [
+    {
+      "git-tree": "c3a3d918f17431929f8f58845c4e6a857449cf3a",
+      "version": "3.2.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6771a5d63e42bb0cfe6c732ead2b0724352f3a59",
+      "version": "3.2.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a3e457520cb62f9b06079dc826ef63666ceb132b",
+      "version": "3.2.9",
+      "port-version": 0
+    },
+    {
+      "git-tree": "524cb7cfd119c5f71730df87f81208d2dc1c28a2",
+      "version": "3.2.8",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ac488e485debfb252900bb5e9b6129f19628032b",
+      "version": "3.2.7",
+      "port-version": 0
+    },
+    {
+      "git-tree": "df4249183060e697a375b85bc597932f93d47499",
+      "version": "3.2.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a231eef7e805676077c2db021b773fbe143413b2",
+      "version": "3.2.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2a59e268b884b19cbc93cb11f25d838af9c09f17",
+      "version": "3.2.2",
+      "port-version": 1
+    },
+    {
+      "git-tree": "912f444db03f6f652a404608a75df8fed734a701",
+      "version": "3.2.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "800db7e769bc8e59e56d9e7aeac0b5e48ab928f8",
+      "version": "3.2.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e1672e3bbd728fbe2c7e652160e5fd0f714e40eb",
+      "version": "3.2.0",
+      "port-version": 0
+    },
     {
       "git-tree": "59a86921e460254df47f94bc331e348148406914",
       "version": "3.1.5",
diff --git a/external_imported/vcpkg/versions/f-/flint.json b/external_imported/vcpkg/versions/f-/flint.json
index ea685f8d1..8653d031e 100644
--- a/external_imported/vcpkg/versions/f-/flint.json
+++ b/external_imported/vcpkg/versions/f-/flint.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "282413c373b7f2f2d2d38783fc9c9d8c4492de16",
+      "version-semver": "2.9.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "76d3f8bbb7b1b87a907a338070bfd83938c66986",
+      "version-semver": "2.8.0",
+      "port-version": 2
+    },
     {
       "git-tree": "26e57956bebf9fb602b989791e663db8cd4f686b",
       "version-semver": "2.8.0",
diff --git a/external_imported/vcpkg/versions/f-/fltk.json b/external_imported/vcpkg/versions/f-/fltk.json
index 6d08fa04b..f5286b436 100644
--- a/external_imported/vcpkg/versions/f-/fltk.json
+++ b/external_imported/vcpkg/versions/f-/fltk.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "171647047716e78f2a85309b6d3b8cb7ca1309c9",
+      "version": "1.3.9",
+      "port-version": 0
+    },
     {
       "git-tree": "bb00fc235046a91ebcdb47e9bcb4474b82cb81d8",
       "version": "1.3.8",
diff --git a/external_imported/vcpkg/versions/f-/fluidlite.json b/external_imported/vcpkg/versions/f-/fluidlite.json
index 851b69385..c171f4b22 100644
--- a/external_imported/vcpkg/versions/f-/fluidlite.json
+++ b/external_imported/vcpkg/versions/f-/fluidlite.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2cb547c733a48a1c7448c6db9e22432bca431ea6",
+      "version-date": "2023-04-18",
+      "port-version": 0
+    },
     {
       "git-tree": "280ded5f814d25cc6db5336f016ed4e26b704ffe",
       "version-date": "2020-08-27",
diff --git a/external_imported/vcpkg/versions/f-/fluidsynth.json b/external_imported/vcpkg/versions/f-/fluidsynth.json
index 2ea7668d7..3f344caf6 100644
--- a/external_imported/vcpkg/versions/f-/fluidsynth.json
+++ b/external_imported/vcpkg/versions/f-/fluidsynth.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "a3a06acfea8bc59c70ac08c3028f9afa40134852",
+      "version": "2.3.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "48d3e215031eef593ac67de67ad986d1cd094e9f",
+      "version": "2.3.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "89822d934c8cfc857147fb1aa1baed78694b0b51",
+      "version": "2.3.2",
+      "port-version": 3
+    },
+    {
+      "git-tree": "eb9b815d5af8da59d2cb5a42361a9c88e7d6a1f4",
+      "version": "2.3.2",
+      "port-version": 2
+    },
+    {
+      "git-tree": "0deaa03650b97bd28bcaa13d05fb3502f8651e48",
+      "version": "2.3.2",
+      "port-version": 1
+    },
+    {
+      "git-tree": "f52a32808a5cca54bfe78d97e3201abce4dc7c34",
+      "version": "2.3.2",
+      "port-version": 0
+    },
     {
       "git-tree": "f7f1e0961e62f96d41646e7eb07ac177e5b240e2",
       "version": "2.3.1",
diff --git a/external_imported/vcpkg/versions/f-/flux.json b/external_imported/vcpkg/versions/f-/flux.json
new file mode 100644
index 000000000..1241c2902
--- /dev/null
+++ b/external_imported/vcpkg/versions/f-/flux.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "3be6cb846e140bc6b745f684bbd4141cae6c4dbd",
+      "version-date": "2023-08-25",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/f-/fmem.json b/external_imported/vcpkg/versions/f-/fmem.json
index 7f4d3a6ae..58781db39 100644
--- a/external_imported/vcpkg/versions/f-/fmem.json
+++ b/external_imported/vcpkg/versions/f-/fmem.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "167b469ebdee2b6b9400980dba003882576bc803",
+      "version-string": "c-libs-2ccee3d2fb",
+      "port-version": 3
+    },
+    {
+      "git-tree": "c55d5bf565b64649e07fab3056d5f8cbc802f9ae",
+      "version-string": "c-libs-2ccee3d2fb",
+      "port-version": 2
+    },
     {
       "git-tree": "eedcb4d269e8f834eaeaceb6fd3b3f477c46b8b4",
       "version-string": "c-libs-2ccee3d2fb",
diff --git a/external_imported/vcpkg/versions/f-/fmilib.json b/external_imported/vcpkg/versions/f-/fmilib.json
index 756e21d91..4d0323198 100644
--- a/external_imported/vcpkg/versions/f-/fmilib.json
+++ b/external_imported/vcpkg/versions/f-/fmilib.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e875efe56416de71aa671c57a77817c67290f0a9",
+      "version": "2.4.1",
+      "port-version": 2
+    },
     {
       "git-tree": "aa8b7d569a23fd953d1e4de558a034a6d9f95e33",
       "version": "2.4.1",
diff --git a/external_imported/vcpkg/versions/f-/fmt.json b/external_imported/vcpkg/versions/f-/fmt.json
index 5f084dead..b3ad55cf2 100644
--- a/external_imported/vcpkg/versions/f-/fmt.json
+++ b/external_imported/vcpkg/versions/f-/fmt.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "405156a2b01c91258bf66768ceb3ae75c1caba7f",
+      "version": "10.2.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f91bb86075f45f6fad0c35ab9e87d8ea43c9d389",
+      "version": "10.2.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "dfe9aa860f5a8317f341a21d317be1cf44e89f18",
+      "version": "10.1.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d8209382ca192426861c6aa91d217ea8512bda46",
+      "version": "10.1.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "eedb31bb1318118ec6a2d1bec60ab12e484092fd",
+      "version": "10.0.0",
+      "port-version": 0
+    },
     {
       "git-tree": "3f452404270b508daf355b72031ad3ee7d0d5751",
       "version": "9.1.0",
diff --git a/external_imported/vcpkg/versions/f-/folly.json b/external_imported/vcpkg/versions/f-/folly.json
index 0fe1e2792..e6820fe7e 100644
--- a/external_imported/vcpkg/versions/f-/folly.json
+++ b/external_imported/vcpkg/versions/f-/folly.json
@@ -1,5 +1,55 @@
 {
   "versions": [
+    {
+      "git-tree": "14d0ea48901f854308ce005f8de818b0a0bb06b2",
+      "version-string": "2024.01.01.00",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5d4dff9c56b8324d2e6b7ca2ba6ad0b60845de56",
+      "version-string": "2023.10.02.00",
+      "port-version": 1
+    },
+    {
+      "git-tree": "a909b9222ac4ded463976431d65b6b24fa486bd3",
+      "version-string": "2023.10.02.00",
+      "port-version": 0
+    },
+    {
+      "git-tree": "16c4e4b0e25b9eb99d5a4b17de525a42a1ecdf48",
+      "version-string": "2023.07.03.00",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e5c2e858383fffea763ce85c2672d1d2aeead9e6",
+      "version-string": "2023.05.22.00",
+      "port-version": 1
+    },
+    {
+      "git-tree": "4af22bbbe7fd8616fc5dfdeef6c2475f4fc3a4e5",
+      "version-string": "2023.05.22.00",
+      "port-version": 0
+    },
+    {
+      "git-tree": "691eb72c1ad244629c0993986a9f33240afa4710",
+      "version-string": "2023.05.15.00",
+      "port-version": 0
+    },
+    {
+      "git-tree": "003ae8b1bc9dc0a460b5c6f6cacda76fa5931cf8",
+      "version-string": "2022.10.31.00",
+      "port-version": 7
+    },
+    {
+      "git-tree": "204d88dbc53dc5ff37c58459c1af0c6f19f446db",
+      "version-string": "2022.10.31.00",
+      "port-version": 6
+    },
+    {
+      "git-tree": "2be8536b3faaf9f907284548e4db1f49b77054c1",
+      "version-string": "2022.10.31.00",
+      "port-version": 5
+    },
     {
       "git-tree": "9f031566a728d2a7adf76c1026324cfc993b02a6",
       "version-string": "2022.10.31.00",
diff --git a/external_imported/vcpkg/versions/f-/font-util.json b/external_imported/vcpkg/versions/f-/font-util.json
index 0d765cf2e..a46821bde 100644
--- a/external_imported/vcpkg/versions/f-/font-util.json
+++ b/external_imported/vcpkg/versions/f-/font-util.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "13ebd42f06ed8e809382f48f36c729219e1182eb",
+      "version": "1.4.1",
+      "port-version": 0
+    },
     {
       "git-tree": "67faf30776c5600c8cfe00f9def5143b5e36eb08",
       "version": "1.3.2",
diff --git a/external_imported/vcpkg/versions/f-/fontconfig.json b/external_imported/vcpkg/versions/f-/fontconfig.json
index 2bf090145..48fef57f6 100644
--- a/external_imported/vcpkg/versions/f-/fontconfig.json
+++ b/external_imported/vcpkg/versions/f-/fontconfig.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "de73339d579963e68fed652ed2e206b307a0c03f",
+      "version": "2.14.2",
+      "port-version": 1
+    },
+    {
+      "git-tree": "26490bc4c9aa1377da98980ba6e1089525fdaa55",
+      "version": "2.14.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b97a0d2144c26df38257732da8e15f133a084782",
+      "version": "2.14.1",
+      "port-version": 2
+    },
     {
       "git-tree": "8d149d92c9082b4aa83474ae25f2033574a9cd84",
       "version": "2.14.1",
diff --git a/external_imported/vcpkg/versions/f-/foonathan-memory.json b/external_imported/vcpkg/versions/f-/foonathan-memory.json
index 735e3eff8..19312fcb7 100644
--- a/external_imported/vcpkg/versions/f-/foonathan-memory.json
+++ b/external_imported/vcpkg/versions/f-/foonathan-memory.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "3b259607933426427c0e9cac415275c1738a6f34",
+      "version": "0.7.3",
+      "port-version": 1
+    },
+    {
+      "git-tree": "e5d8f014667fd2e794d0e4dab67adc193731b246",
+      "version": "0.7.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "815422e5bf77feefa4e1c277832d307b6bb47438",
+      "version-date": "2019-07-21",
+      "port-version": 4
+    },
+    {
+      "git-tree": "9741bb189e28cb460ce563613aa3857e19fb9d0d",
+      "version-date": "2019-07-21",
+      "port-version": 3
+    },
     {
       "git-tree": "6e97aca605e065b0df1adaed316adc03d63b6334",
       "version-string": "2019-07-21",
diff --git a/external_imported/vcpkg/versions/f-/forge.json b/external_imported/vcpkg/versions/f-/forge.json
index e34c8b7e6..e0b71ea86 100644
--- a/external_imported/vcpkg/versions/f-/forge.json
+++ b/external_imported/vcpkg/versions/f-/forge.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "020557ffe8bd7c66464eb1a19eb1a67b3151aa25",
+      "version-semver": "1.0.8",
+      "port-version": 3
+    },
+    {
+      "git-tree": "9d711924c7973e7f5fe16131a16b90b2317caf9e",
+      "version-semver": "1.0.8",
+      "port-version": 2
+    },
     {
       "git-tree": "780a8dc57ae2360af3705b400bc96b03914ef45a",
       "version-semver": "1.0.8",
diff --git a/external_imported/vcpkg/versions/f-/fp16.json b/external_imported/vcpkg/versions/f-/fp16.json
index 2785c93e5..f84859f44 100644
--- a/external_imported/vcpkg/versions/f-/fp16.json
+++ b/external_imported/vcpkg/versions/f-/fp16.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "387e9258cbd17b68a16e44b7fcd6bf20662aa7b1",
+      "version-date": "2021-02-21",
+      "port-version": 2
+    },
+    {
+      "git-tree": "99eb0d42bcecc27ff7831a478884bd84a5138563",
+      "version-date": "2021-02-21",
+      "port-version": 1
+    },
     {
       "git-tree": "849acf1f87e0194fda4cd5459e51c564874c60ed",
       "version-date": "2021-02-21",
diff --git a/external_imported/vcpkg/versions/f-/fplus.json b/external_imported/vcpkg/versions/f-/fplus.json
index 13b59b456..55af71de4 100644
--- a/external_imported/vcpkg/versions/f-/fplus.json
+++ b/external_imported/vcpkg/versions/f-/fplus.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "754768124cbee8d04ff59b7401e071dec918a487",
+      "version": "0.2.22",
+      "port-version": 0
+    },
+    {
+      "git-tree": "32f77339885e4a1a1b398c0be917880b991c95dc",
+      "version": "0.2.20-p0",
+      "port-version": 0
+    },
     {
       "git-tree": "e982e423baaf3d7728a2122368494d1c57c8e55e",
       "version": "0.2.18-p0",
diff --git a/external_imported/vcpkg/versions/f-/freealut.json b/external_imported/vcpkg/versions/f-/freealut.json
index e8da86da4..e7597c86d 100644
--- a/external_imported/vcpkg/versions/f-/freealut.json
+++ b/external_imported/vcpkg/versions/f-/freealut.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4f2e347e59d7834de007c46ea8eff150b9e55487",
+      "version": "1.1.0",
+      "port-version": 4
+    },
     {
       "git-tree": "969ad25e70aeab73962cb7bea1df1ea30644ad20",
       "version": "1.1.0",
diff --git a/external_imported/vcpkg/versions/f-/freeglut.json b/external_imported/vcpkg/versions/f-/freeglut.json
index 1d92627f0..81073ba5c 100644
--- a/external_imported/vcpkg/versions/f-/freeglut.json
+++ b/external_imported/vcpkg/versions/f-/freeglut.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f948f7bed9cac147c0687d4b170b99bc6b59f157",
+      "version": "3.4.0",
+      "port-version": 1
+    },
     {
       "git-tree": "51a55df4538f3ecdeeb6d9846afd156ec3255630",
       "version": "3.4.0",
diff --git a/external_imported/vcpkg/versions/f-/freeopcua.json b/external_imported/vcpkg/versions/f-/freeopcua.json
index 1ee029185..f30ef68ba 100644
--- a/external_imported/vcpkg/versions/f-/freeopcua.json
+++ b/external_imported/vcpkg/versions/f-/freeopcua.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "adfdfa8138aa47929d7e6f1e03809d00c6bf8aa2",
+      "version": "20190125",
+      "port-version": 7
+    },
+    {
+      "git-tree": "3a355dca9d180e973ffaf9ab282c03575d75aa86",
+      "version": "20190125",
+      "port-version": 6
+    },
     {
       "git-tree": "15fe1dbb4b4b3283072825b22ef29acdf5835950",
       "version-string": "20190125",
diff --git a/external_imported/vcpkg/versions/f-/freerdp.json b/external_imported/vcpkg/versions/f-/freerdp.json
index 9f5c7658b..9a6b614dd 100644
--- a/external_imported/vcpkg/versions/f-/freerdp.json
+++ b/external_imported/vcpkg/versions/f-/freerdp.json
@@ -1,5 +1,40 @@
 {
   "versions": [
+    {
+      "git-tree": "58d88811f61ec9063eb70b837f23c6ceeceb0198",
+      "version": "3.0.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "dfb634ed4a717897d4cb646a34dc9c663dcfceb8",
+      "version": "3.0.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "00aea4e71fcfa8fa2ea4c294996726290abe3243",
+      "version": "2.11.2",
+      "port-version": 2
+    },
+    {
+      "git-tree": "980f914c0856191ef155ede267bc4553ccc49ac2",
+      "version": "2.11.2",
+      "port-version": 1
+    },
+    {
+      "git-tree": "90f838d8fb3b7d8d45b9d64f951486cee618ab8e",
+      "version": "2.11.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "43135a7f0ecf1e2fa292ea7f1fbe69dc0d2ec09d",
+      "version": "2.11.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "576db0702d3a36fbca154e4ee18030d28d0e05d0",
+      "version": "2.10.0",
+      "port-version": 0
+    },
     {
       "git-tree": "e3b6d222459b1a4ff5d0e0b16d4330620d47715a",
       "version": "2.9.0",
diff --git a/external_imported/vcpkg/versions/f-/freetds.json b/external_imported/vcpkg/versions/f-/freetds.json
index 0deb3189e..a3d571208 100644
--- a/external_imported/vcpkg/versions/f-/freetds.json
+++ b/external_imported/vcpkg/versions/f-/freetds.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5eded489fe66e5c21c2ad93db8d8f5b9fc5fe4d4",
+      "version": "1.3.10",
+      "port-version": 2
+    },
     {
       "git-tree": "7d2a8c09978586d81a52529c94a96dd2f1208ebe",
       "version": "1.3.10",
diff --git a/external_imported/vcpkg/versions/f-/freetype-gl.json b/external_imported/vcpkg/versions/f-/freetype-gl.json
index 0e74040b0..56ff994fa 100644
--- a/external_imported/vcpkg/versions/f-/freetype-gl.json
+++ b/external_imported/vcpkg/versions/f-/freetype-gl.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "e61e27b5a7928879435242d50ac2470fe79cb3e3",
+      "version-date": "2022-01-17",
+      "port-version": 3
+    },
+    {
+      "git-tree": "a356f56c15dd0a66094c00cc35670791c545027e",
+      "version-date": "2022-01-17",
+      "port-version": 2
+    },
     {
       "git-tree": "c966935c663878c91381818cae1b87590be48191",
       "version-date": "2022-01-17",
diff --git a/external_imported/vcpkg/versions/f-/freetype.json b/external_imported/vcpkg/versions/f-/freetype.json
index 77d3ed64c..213ecfb75 100644
--- a/external_imported/vcpkg/versions/f-/freetype.json
+++ b/external_imported/vcpkg/versions/f-/freetype.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "443f320ccf3139bc1818f0cc273944a56e960d6e",
+      "version": "2.13.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e5480587e6a2faf047bc6d8520e48c12fc57604a",
+      "version": "2.12.1",
+      "port-version": 5
+    },
+    {
+      "git-tree": "4e52babe5d382c3f9cdb1b8037874d78eceb3512",
+      "version": "2.12.1",
+      "port-version": 4
+    },
     {
       "git-tree": "db92ea87ff12339808263710675221df6a06ac15",
       "version": "2.12.1",
diff --git a/external_imported/vcpkg/versions/f-/freexl.json b/external_imported/vcpkg/versions/f-/freexl.json
index 4f24d7422..610b6015f 100644
--- a/external_imported/vcpkg/versions/f-/freexl.json
+++ b/external_imported/vcpkg/versions/f-/freexl.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "d2f0c530b5cb259f17171cb8fc6b58e3642e9334",
+      "version": "2.0.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "7ffd19cd7345be08a7b93d1d4c806d27b98a83ef",
+      "version": "1.0.6",
+      "port-version": 2
+    },
     {
       "git-tree": "fa2b9775bc6c9594fc2f67ace1e80f54def8efe9",
       "version": "1.0.6",
diff --git a/external_imported/vcpkg/versions/f-/fribidi.json b/external_imported/vcpkg/versions/f-/fribidi.json
index c164cdf54..07f33557e 100644
--- a/external_imported/vcpkg/versions/f-/fribidi.json
+++ b/external_imported/vcpkg/versions/f-/fribidi.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "a946b16fa88c02cd11e2e3011fe9ca61e31214b6",
+      "version": "1.0.13",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b611119763d80fa18b07cf2e3c99c02069b0ec55",
+      "version": "1.0.12",
+      "port-version": 1
+    },
     {
       "git-tree": "43f84b32dcc2e675fac20a42c0cf0c7f801c1fbc",
       "version": "1.0.12",
diff --git a/external_imported/vcpkg/versions/f-/frugally-deep.json b/external_imported/vcpkg/versions/f-/frugally-deep.json
index 25d93e7aa..860cf646f 100644
--- a/external_imported/vcpkg/versions/f-/frugally-deep.json
+++ b/external_imported/vcpkg/versions/f-/frugally-deep.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "29bccc24fe184c3f063bdfda3b41c333465652c8",
+      "version-semver": "0.15.30",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d25ec18e137e21fcdd4e2770377e7a3e9c5434f1",
+      "version-semver": "0.15.24",
+      "port-version": 0
+    },
     {
       "git-tree": "c3100096175d535c2c9bc09e3d2195f5729203bc",
       "version-semver": "0.15.19-p0",
diff --git a/external_imported/vcpkg/versions/f-/fruit.json b/external_imported/vcpkg/versions/f-/fruit.json
index 286b7f39b..ea37c1678 100644
--- a/external_imported/vcpkg/versions/f-/fruit.json
+++ b/external_imported/vcpkg/versions/f-/fruit.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f727757ffc9579175eb3e80ae6fee2bf176779b2",
+      "version": "3.7.1",
+      "port-version": 0
+    },
     {
       "git-tree": "3877043f08c074020d222a58e552523c15923b63",
       "version": "3.7.0",
diff --git a/external_imported/vcpkg/versions/f-/ftxui.json b/external_imported/vcpkg/versions/f-/ftxui.json
index 25b26fc8e..36e539f34 100644
--- a/external_imported/vcpkg/versions/f-/ftxui.json
+++ b/external_imported/vcpkg/versions/f-/ftxui.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "876ee1aa2ce39652ff1d759eead5a1552402b11d",
+      "version-semver": "5.0.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e69be1052699ec7fee92c1aaf9b4c1e66f9d47ef",
+      "version-semver": "4.1.1",
+      "port-version": 0
+    },
     {
       "git-tree": "acaddb4b8448c853dac8d132d591fd8062692ae8",
       "version-semver": "4.0.0",
diff --git a/external_imported/vcpkg/versions/f-/function2.json b/external_imported/vcpkg/versions/f-/function2.json
index c4716152b..27ac3aefc 100644
--- a/external_imported/vcpkg/versions/f-/function2.json
+++ b/external_imported/vcpkg/versions/f-/function2.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "c4404d6b58a606e08069dbba605b376f12c21d67",
+      "version-semver": "4.2.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "dabfb1835fc765d2091deaae8d556ff300aea4a4",
+      "version-semver": "4.2.3",
+      "port-version": 0
+    },
     {
       "git-tree": "afa334fcb26a441121e2426e39e879c6574db698",
       "version-semver": "4.2.2",
diff --git a/external_imported/vcpkg/versions/f-/functions-framework-cpp.json b/external_imported/vcpkg/versions/f-/functions-framework-cpp.json
index f0118ceec..78c450664 100644
--- a/external_imported/vcpkg/versions/f-/functions-framework-cpp.json
+++ b/external_imported/vcpkg/versions/f-/functions-framework-cpp.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "bcad4c80171c219e3f7ad02be34f1de48cf88889",
+      "version": "1.2.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e4ad257a93efebb34ffabde85fa4a548d5038706",
+      "version": "1.1.0",
+      "port-version": 4
+    },
+    {
+      "git-tree": "61df7f37f44d59355e0ded6bb1241924a44143c8",
+      "version": "1.1.0",
+      "port-version": 3
+    },
+    {
+      "git-tree": "c640d5d8ccd519f8217444cc50a2ab3426e5de95",
+      "version": "1.1.0",
+      "port-version": 2
+    },
     {
       "git-tree": "b768a3659402920019edfe8455e08e350743bd78",
       "version": "1.1.0",
diff --git a/external_imported/vcpkg/versions/f-/fxdiv.json b/external_imported/vcpkg/versions/f-/fxdiv.json
index faae1bc5e..4c8b464b8 100644
--- a/external_imported/vcpkg/versions/f-/fxdiv.json
+++ b/external_imported/vcpkg/versions/f-/fxdiv.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "409284eafee5c5712bbf7c9efa301a12824d094f",
+      "version-date": "2021-02-21",
+      "port-version": 2
+    },
+    {
+      "git-tree": "c00d510e636391fa33a1fcb52c1e767f00a7aecf",
+      "version-date": "2021-02-21",
+      "port-version": 1
+    },
     {
       "git-tree": "58ee7e759479e81a3218ff4d5efb8ada40c40d65",
       "version-string": "2021-02-21",
diff --git a/external_imported/vcpkg/versions/g-/g2o.json b/external_imported/vcpkg/versions/g-/g2o.json
index 34e9d0dfa..19caa853b 100644
--- a/external_imported/vcpkg/versions/g-/g2o.json
+++ b/external_imported/vcpkg/versions/g-/g2o.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "fb61dcf5596f2a9212644c4ac8736831b7448ba5",
+      "version-date": "2020-02-07",
+      "port-version": 4
+    },
+    {
+      "git-tree": "3c19fe8da1b3f679aa832330cd4ef565c0ee45dc",
+      "version-date": "2020-02-07",
+      "port-version": 3
+    },
     {
       "git-tree": "4fb8813de02bd243b25d9ed93065f9f9cba09e93",
       "version-string": "2020-02-07",
diff --git a/external_imported/vcpkg/versions/g-/g3log.json b/external_imported/vcpkg/versions/g-/g3log.json
index 73458e706..8b568c6f5 100644
--- a/external_imported/vcpkg/versions/g-/g3log.json
+++ b/external_imported/vcpkg/versions/g-/g3log.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "09cefbb1c15c19b4d15983286f70f39a819703d3",
+      "version": "2.3",
+      "port-version": 1
+    },
+    {
+      "git-tree": "f1bbc871ee36db0c3ff9d17d0885a151866b4a56",
+      "version": "2.3",
+      "port-version": 0
+    },
     {
       "git-tree": "ce2eee87993ff26684fad107624adebc23e64737",
       "version": "2.1",
diff --git a/external_imported/vcpkg/versions/g-/gamedev-framework.json b/external_imported/vcpkg/versions/g-/gamedev-framework.json
index 83a46775c..249a31836 100644
--- a/external_imported/vcpkg/versions/g-/gamedev-framework.json
+++ b/external_imported/vcpkg/versions/g-/gamedev-framework.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "41406fe6c392ff7fa81d07d288e5e61ca0db8bd0",
+      "version-semver": "1.2.0",
+      "port-version": 0
+    },
     {
       "git-tree": "66a45568c161b8eb5ae64471a466545b96b15818",
       "version-semver": "1.0.0",
diff --git a/external_imported/vcpkg/versions/g-/games101-cgl.json b/external_imported/vcpkg/versions/g-/games101-cgl.json
new file mode 100644
index 000000000..ae210f854
--- /dev/null
+++ b/external_imported/vcpkg/versions/g-/games101-cgl.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "976ee066a06bc29768e1fd575da2e7d622cf6465",
+      "version": "0.1.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/g-/gamma.json b/external_imported/vcpkg/versions/g-/gamma.json
index f507b7da0..0cdda4722 100644
--- a/external_imported/vcpkg/versions/g-/gamma.json
+++ b/external_imported/vcpkg/versions/g-/gamma.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "dfa73b7b224977c60e757cd9eaa286c6db2bd90d",
+      "version-string": "gamma-2018-01-27",
+      "port-version": 6
+    },
+    {
+      "git-tree": "c81bf8a72f815cb3feaf26e0f8e82032bdb62e88",
+      "version-string": "gamma-2018-01-27",
+      "port-version": 5
+    },
     {
       "git-tree": "335e66b704d42844b1fef58f31a05545aec2e328",
       "version-string": "gamma-2018-01-27",
diff --git a/external_imported/vcpkg/versions/g-/gapp.json b/external_imported/vcpkg/versions/g-/gapp.json
new file mode 100644
index 000000000..6f25cf3e6
--- /dev/null
+++ b/external_imported/vcpkg/versions/g-/gapp.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "31fc6c2ca0e58b6133db03eeaa3e31398810ccc2",
+      "version": "0.2.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/g-/gasol.json b/external_imported/vcpkg/versions/g-/gasol.json
index f9e5c97d4..d949a04b0 100644
--- a/external_imported/vcpkg/versions/g-/gasol.json
+++ b/external_imported/vcpkg/versions/g-/gasol.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "f6963a5230e144f34c86f0b846d028567859449f",
+      "version-date": "2018-01-04",
+      "port-version": 4
+    },
+    {
+      "git-tree": "70bdc4eeb2b24a5b03dcd34b2a2d507a96e23d7e",
+      "version-date": "2018-01-04",
+      "port-version": 3
+    },
     {
       "git-tree": "50bd4cd06666ebc284bb8d8157057c5a451bc11d",
       "version-date": "2018-01-04",
diff --git a/external_imported/vcpkg/versions/g-/gaussianlib.json b/external_imported/vcpkg/versions/g-/gaussianlib.json
index 231aa36b0..aebc510e6 100644
--- a/external_imported/vcpkg/versions/g-/gaussianlib.json
+++ b/external_imported/vcpkg/versions/g-/gaussianlib.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "323865bad084941748ff0e99a25d7ef090d765f4",
+      "version-date": "2023-02-17",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e3e4e44965a910829b7c5872bec340826e2c4559",
+      "version-date": "2019-08-04",
+      "port-version": 2
+    },
     {
       "git-tree": "9cce82b2b2013b0ccc2b2f3e827cd5911f9a473d",
       "version-string": "2019-08-04",
diff --git a/external_imported/vcpkg/versions/g-/gazebo.json b/external_imported/vcpkg/versions/g-/gazebo.json
index 97ee3164a..003ebba8f 100644
--- a/external_imported/vcpkg/versions/g-/gazebo.json
+++ b/external_imported/vcpkg/versions/g-/gazebo.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c5ff2241343daba9b2e89620fc5502104b459476",
+      "version-date": "2022-01-20",
+      "port-version": 5
+    },
     {
       "git-tree": "b1f5088e196340aad31ea3700aceae72df1407ae",
       "version-date": "2022-01-20",
diff --git a/external_imported/vcpkg/versions/g-/gcem.json b/external_imported/vcpkg/versions/g-/gcem.json
index 8e3e15c99..8c98cb8e6 100644
--- a/external_imported/vcpkg/versions/g-/gcem.json
+++ b/external_imported/vcpkg/versions/g-/gcem.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "789017cc9de9b4147df9ccdb2b6b156bf487df1a",
+      "version": "1.17.0",
+      "port-version": 0
+    },
     {
       "git-tree": "573f10694a3f7eb8fbc2ffdfbce1131a76253c3f",
       "version": "1.16.0",
diff --git a/external_imported/vcpkg/versions/g-/gdal.json b/external_imported/vcpkg/versions/g-/gdal.json
index 86ec1e902..6de632a82 100644
--- a/external_imported/vcpkg/versions/g-/gdal.json
+++ b/external_imported/vcpkg/versions/g-/gdal.json
@@ -1,5 +1,105 @@
 {
   "versions": [
+    {
+      "git-tree": "cf4439e847b66a9af7d5789d19f0752e8a634fb9",
+      "version-semver": "3.8.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "833ca497db5bfb3e95b313c6bfbf793d20548326",
+      "version-semver": "3.8.2",
+      "port-version": 1
+    },
+    {
+      "git-tree": "8c455ae6529676c606b6a031fa62d2c87e72ec86",
+      "version-semver": "3.8.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "33a60f073f77b16b9364659fea34df2cff9ea3ae",
+      "version-semver": "3.8.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4eb6f65b6e278d02d05adff2de5e9fc0b068dd39",
+      "version-semver": "3.8.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "388e85b332e219ece9bdb669274ca04762500330",
+      "version-semver": "3.7.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3931fc54de192cbee6b4683bc2261b2f3093130f",
+      "version-semver": "3.7.2",
+      "port-version": 1
+    },
+    {
+      "git-tree": "d01864aaa21a85e1e8f7bb6748d607e953c52e77",
+      "version-semver": "3.7.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "eb6b9c542c7c01651906fee737d73fab64482700",
+      "version-semver": "3.7.1",
+      "port-version": 4
+    },
+    {
+      "git-tree": "1bffcf8c8f2b02ed041a099723115cbbd0c39b2c",
+      "version-semver": "3.7.1",
+      "port-version": 3
+    },
+    {
+      "git-tree": "fe574600c39e044d7aa3f4a0e58c1de47f95a430",
+      "version-semver": "3.7.1",
+      "port-version": 2
+    },
+    {
+      "git-tree": "80d4c30d98e502446c16c8f7665713916934aca3",
+      "version-semver": "3.7.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "a532cd9881bfbd8e3665ff4244dccef8af62ffff",
+      "version-semver": "3.7.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9e2de2263a527e2135c8532fcc9967e63378a552",
+      "version-semver": "3.7.0",
+      "port-version": 4
+    },
+    {
+      "git-tree": "35cbea48f44c5d0836cd0b6f171396eae2745177",
+      "version-semver": "3.7.0",
+      "port-version": 3
+    },
+    {
+      "git-tree": "f287b8dfcfba6e4f2d8ee8cdba0e63f0ae326fd7",
+      "version-semver": "3.7.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "119c87c321a3a925253f5503cfac1e6960d5923e",
+      "version-semver": "3.7.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "befcd2fe67a87498bfdaea5601b58f120e984038",
+      "version-semver": "3.7.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f83039e70646a59b782781b3c805f276fb4c72be",
+      "version-semver": "3.6.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "fd3b78eb622e4b5f176e4c72cb9aa855f1e6d985",
+      "version-semver": "3.6.3",
+      "port-version": 1
+    },
     {
       "git-tree": "145b046001c2cbbddc6e987df1f24cde16c32c99",
       "version-semver": "3.6.3",
diff --git a/external_imported/vcpkg/versions/g-/gdcm.json b/external_imported/vcpkg/versions/g-/gdcm.json
index 09eb12e92..092b7ba49 100644
--- a/external_imported/vcpkg/versions/g-/gdcm.json
+++ b/external_imported/vcpkg/versions/g-/gdcm.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4083ad5a17c338266c7e0b74adf6126c55112b0d",
+      "version": "3.0.22",
+      "port-version": 0
+    },
     {
       "git-tree": "cb3870f85a108727ba53c35d59633f9d6fdb4c4e",
       "version": "3.0.12",
diff --git a/external_imported/vcpkg/versions/g-/gdk-pixbuf.json b/external_imported/vcpkg/versions/g-/gdk-pixbuf.json
index a8ff76d0c..8addc98cf 100644
--- a/external_imported/vcpkg/versions/g-/gdk-pixbuf.json
+++ b/external_imported/vcpkg/versions/g-/gdk-pixbuf.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "3dc0bb4b0113c8043f2ed716694303d1bdc08d88",
+      "version": "2.42.10",
+      "port-version": 2
+    },
+    {
+      "git-tree": "ca75f73ba67cdacfd245b67e6dca8c45fb97ee93",
+      "version": "2.42.10",
+      "port-version": 1
+    },
+    {
+      "git-tree": "39ca957973ae4f5cbeb0e658172c079e6ad0362c",
+      "version": "2.42.10",
+      "port-version": 0
+    },
     {
       "git-tree": "a2c86123a10143a8df7fe450b82a5f018a28058f",
       "version": "2.42.9",
diff --git a/external_imported/vcpkg/versions/g-/genann.json b/external_imported/vcpkg/versions/g-/genann.json
index 84c36d720..79146466e 100644
--- a/external_imported/vcpkg/versions/g-/genann.json
+++ b/external_imported/vcpkg/versions/g-/genann.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "06697b312b624b447c7f8c4ba48e82ce6528883c",
+      "version-date": "2019-07-10",
+      "port-version": 3
+    },
+    {
+      "git-tree": "0f58751b97524c749b52f3953abab3cb9e962edc",
+      "version-date": "2019-07-10",
+      "port-version": 2
+    },
     {
       "git-tree": "74f4d685e744a09163c7bfcf502e3facc2d9bf95",
       "version-string": "2019-07-10",
diff --git a/external_imported/vcpkg/versions/g-/geogram.json b/external_imported/vcpkg/versions/g-/geogram.json
index 542180948..a75e45274 100644
--- a/external_imported/vcpkg/versions/g-/geogram.json
+++ b/external_imported/vcpkg/versions/g-/geogram.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "ee6286e71522b6c0bd498066597094e57ff505b4",
+      "version": "1.8.3",
+      "port-version": 1
+    },
+    {
+      "git-tree": "86346ad187bf9f8b54be1e50b3bb52dd4c69171d",
+      "version": "1.8.3",
+      "port-version": 0
+    },
     {
       "git-tree": "902027c917fa8e2047dd0655721a753305432010",
       "version": "1.7.6",
diff --git a/external_imported/vcpkg/versions/g-/geographiclib.json b/external_imported/vcpkg/versions/g-/geographiclib.json
index fc9104c40..7c05789fc 100644
--- a/external_imported/vcpkg/versions/g-/geographiclib.json
+++ b/external_imported/vcpkg/versions/g-/geographiclib.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "d81b3f7975338273ed42ce6544734e24b6c7915a",
+      "version": "2.3",
+      "port-version": 1
+    },
+    {
+      "git-tree": "f24840f27f1c858b85e449c3066cec7978c304c6",
+      "version": "2.3",
+      "port-version": 0
+    },
     {
       "git-tree": "1f367e37fa03f3909ab0817475ded728bbb3d9ec",
       "version": "2.2",
diff --git a/external_imported/vcpkg/versions/g-/geos.json b/external_imported/vcpkg/versions/g-/geos.json
index a964fb43f..fa24c1a0d 100644
--- a/external_imported/vcpkg/versions/g-/geos.json
+++ b/external_imported/vcpkg/versions/g-/geos.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "41bb89a641e2fd76a21cdf259893ef3ab187aeaf",
+      "version": "3.11.3",
+      "port-version": 1
+    },
+    {
+      "git-tree": "74ed7ac2ba209cbd984174705b2e3fc7fcf99e9a",
+      "version": "3.11.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6e3173bfbaacdb8fee9ac698f0b6dc668136ed9b",
+      "version": "3.11.2",
+      "port-version": 0
+    },
     {
       "git-tree": "1f2b8b7ba62c8e0ca9e17f7ac5a2312c559eb547",
       "version": "3.11.1",
diff --git a/external_imported/vcpkg/versions/g-/geotrans.json b/external_imported/vcpkg/versions/g-/geotrans.json
index 8d1633629..43fe4cc12 100644
--- a/external_imported/vcpkg/versions/g-/geotrans.json
+++ b/external_imported/vcpkg/versions/g-/geotrans.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b392617570c01a75595f982080630925b27ba3bf",
+      "version": "3.9",
+      "port-version": 1
+    },
     {
       "git-tree": "2649a6e046a3e72681606d14a091512447aade75",
       "version": "3.9",
diff --git a/external_imported/vcpkg/versions/g-/getdns.json b/external_imported/vcpkg/versions/g-/getdns.json
index 33ed8e70d..858c315f9 100644
--- a/external_imported/vcpkg/versions/g-/getdns.json
+++ b/external_imported/vcpkg/versions/g-/getdns.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "bc99e968335624d1ff606befa894103b540fbde2",
+      "version": "1.7.3",
+      "port-version": 0
+    },
     {
       "git-tree": "b604fb24c9b81bf4bc5c30e7ca86e52750a86935",
       "version": "1.7.0",
diff --git a/external_imported/vcpkg/versions/g-/getopt-win32.json b/external_imported/vcpkg/versions/g-/getopt-win32.json
index 79f9dcd1d..cc974aa83 100644
--- a/external_imported/vcpkg/versions/g-/getopt-win32.json
+++ b/external_imported/vcpkg/versions/g-/getopt-win32.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d735f424134507a2d87a4ab6d5a8d768ca555dbc",
+      "version": "1.1.0.20220925",
+      "port-version": 0
+    },
     {
       "git-tree": "28d4331693c8c94a354365fff55df5f5762b7be6",
       "version": "0.1",
diff --git a/external_imported/vcpkg/versions/g-/getopt.json b/external_imported/vcpkg/versions/g-/getopt.json
index a0183d27f..aecd5566a 100644
--- a/external_imported/vcpkg/versions/g-/getopt.json
+++ b/external_imported/vcpkg/versions/g-/getopt.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ba541c1ce4012fae6dfdf34021b03d7253235b24",
+      "version": "0",
+      "port-version": 3
+    },
     {
       "git-tree": "be2552adc01c2ba30044325925f7348121de5c3d",
       "version-string": "0",
diff --git a/external_imported/vcpkg/versions/g-/gettext-libintl.json b/external_imported/vcpkg/versions/g-/gettext-libintl.json
new file mode 100644
index 000000000..808a708f9
--- /dev/null
+++ b/external_imported/vcpkg/versions/g-/gettext-libintl.json
@@ -0,0 +1,24 @@
+{
+  "versions": [
+    {
+      "git-tree": "b81c3757a4f5b2eb78c45e29d51803e5a3418fdb",
+      "version": "0.22.4",
+      "port-version": 1
+    },
+    {
+      "git-tree": "003232270da6a899ac59d4e61d7fead638584deb",
+      "version": "0.22.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "25450f3473f6c62f28af9702a772d8b48a6170b7",
+      "version": "0.21.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "783d7b1a2ddaf29b0f1a2d785ccfbb4a05615667",
+      "version": "0.21.1",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/g-/gettext.json b/external_imported/vcpkg/versions/g-/gettext.json
index 93a76292e..d5a06f5c7 100644
--- a/external_imported/vcpkg/versions/g-/gettext.json
+++ b/external_imported/vcpkg/versions/g-/gettext.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "d9cc9b8256d9653fe2d484ecf268f7368666d942",
+      "version": "0.22.4",
+      "port-version": 2
+    },
+    {
+      "git-tree": "bd31edd407c0889c864c1e8854be92b602a4e29f",
+      "version": "0.22.4",
+      "port-version": 1
+    },
+    {
+      "git-tree": "e30ed5daac31351d72a221b74c1b8c4ecd06b694",
+      "version": "0.22.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "20e8e3535959bba6066d8887bb1c95e622d86f5a",
+      "version": "0.21.1",
+      "port-version": 3
+    },
+    {
+      "git-tree": "0915f060ea0fb91c5a2356f2171de0a714e79437",
+      "version": "0.21.1",
+      "port-version": 2
+    },
+    {
+      "git-tree": "6cc01d324fb1fc9a461212e5577ec9897d7da345",
+      "version": "0.21.1",
+      "port-version": 1
+    },
     {
       "git-tree": "4c583e9adc3ab9a044b241466cebedf162cdc410",
       "version": "0.21.1",
diff --git a/external_imported/vcpkg/versions/g-/gettimeofday.json b/external_imported/vcpkg/versions/g-/gettimeofday.json
index 3dc3c259e..48ec6f483 100644
--- a/external_imported/vcpkg/versions/g-/gettimeofday.json
+++ b/external_imported/vcpkg/versions/g-/gettimeofday.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "31b00a1043898e49c04087100294c10d37094e8d",
+      "version-date": "2017-10-14",
+      "port-version": 6
+    },
+    {
+      "git-tree": "2e68f17377612bdb5d084079d8d1376f696bb4a6",
+      "version-date": "2017-10-14",
+      "port-version": 5
+    },
     {
       "git-tree": "c39979379abaf1ecee42cbae6e83d68cfb201f13",
       "version-string": "2017-10-14",
diff --git a/external_imported/vcpkg/versions/g-/gflags.json b/external_imported/vcpkg/versions/g-/gflags.json
index e20ff4129..ce83cff9e 100644
--- a/external_imported/vcpkg/versions/g-/gflags.json
+++ b/external_imported/vcpkg/versions/g-/gflags.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "a5da46db14e97a98ba1469ae46d14ce80308d5a8",
+      "version": "2.2.2",
+      "port-version": 9
+    },
+    {
+      "git-tree": "606a0a3ad49f6e6276672e230431e6797d56180e",
+      "version": "2.2.2",
+      "port-version": 8
+    },
+    {
+      "git-tree": "1c57a920065312afe80b1b8a3595f82005da61ee",
+      "version": "2.2.2",
+      "port-version": 7
+    },
+    {
+      "git-tree": "8231f09b610ad8610fbbdcbb53fc9bb32af807a7",
+      "version": "2.2.2",
+      "port-version": 6
+    },
     {
       "git-tree": "7c1fe35b0a7e9b5b9f58b16c6cc08caa108fb945",
       "version-string": "2.2.2",
diff --git a/external_imported/vcpkg/versions/g-/ghc-filesystem.json b/external_imported/vcpkg/versions/g-/ghc-filesystem.json
index 7b9a6689a..6513b4580 100644
--- a/external_imported/vcpkg/versions/g-/ghc-filesystem.json
+++ b/external_imported/vcpkg/versions/g-/ghc-filesystem.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f97ed716062394f0aefd66abc090cbdcc4dff1ae",
+      "version": "1.5.14",
+      "port-version": 0
+    },
     {
       "git-tree": "5b9f92d368901abd7af0b622f0c32f7e76e62093",
       "version": "1.5.12",
diff --git a/external_imported/vcpkg/versions/g-/ginkgo.json b/external_imported/vcpkg/versions/g-/ginkgo.json
index 1c79cf259..6f93f91da 100644
--- a/external_imported/vcpkg/versions/g-/ginkgo.json
+++ b/external_imported/vcpkg/versions/g-/ginkgo.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "5bb942245eec037ad042ba29ec426573031513e7",
+      "version-semver": "1.7.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "09962781615d028b2b96be5aef56b0590fd7b54f",
+      "version-semver": "1.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "779490458d51f75bc22ed324afceffe0c3b0ee12",
+      "version-semver": "1.4.0",
+      "port-version": 2
+    },
     {
       "git-tree": "8b8d35300c7b2bd3efcd7e645579df0a9e67d86d",
       "version-semver": "1.4.0",
diff --git a/external_imported/vcpkg/versions/g-/gl2ps.json b/external_imported/vcpkg/versions/g-/gl2ps.json
index 87cc00eaf..c4ba38036 100644
--- a/external_imported/vcpkg/versions/g-/gl2ps.json
+++ b/external_imported/vcpkg/versions/g-/gl2ps.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "1f0cdea5ea747e24f3a5fba076e645e1292a832f",
+      "version": "1.4.2",
+      "port-version": 4
+    },
+    {
+      "git-tree": "3607998f92ba0e61fbcae891aa6a8aa996e3bf0a",
+      "version": "1.4.2",
+      "port-version": 3
+    },
+    {
+      "git-tree": "65c00e3d59f426a74f7696bebc18ca8cf441c20d",
+      "version": "1.4.2",
+      "port-version": 2
+    },
     {
       "git-tree": "25f89a8ea4ae01f360444c1583dc6549d3857966",
       "version-string": "1.4.2",
diff --git a/external_imported/vcpkg/versions/g-/glaze.json b/external_imported/vcpkg/versions/g-/glaze.json
new file mode 100644
index 000000000..eebbee861
--- /dev/null
+++ b/external_imported/vcpkg/versions/g-/glaze.json
@@ -0,0 +1,139 @@
+{
+  "versions": [
+    {
+      "git-tree": "b044bd9936e35c88fa4ea093f037ba9ecf42e0f9",
+      "version": "2.0.6",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f0eec0f3dc54bd24ecb320dc13258b193992ce11",
+      "version": "2.0.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "292cb129d7afdb63c4cd1881b863581725fa1f29",
+      "version": "1.9.9",
+      "port-version": 0
+    },
+    {
+      "git-tree": "90e9524cec84329ef65d58ce265d64567ff861f5",
+      "version": "1.9.6",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ddf42a4875b810fc720e4bf4ae95613e1d79e29b",
+      "version": "1.9.5",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8f6415b681ece13c2834e83c9876a845ce718eb4",
+      "version": "1.9.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "dfb0ed37ac62c7704664274ee0219d7823fec9d1",
+      "version": "1.9.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "feacc21a5c09665421fdbf6bbfe8c5bf8553f4d9",
+      "version": "1.8.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8bc431f655de61084866947ee92fcf59cba56e0e",
+      "version": "1.8.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "69ee3541bd226042e5dab58f37f9b89ade5be622",
+      "version": "1.8.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "62292c7ec8c2e2d5ad2b5b3197cbf1647cbee342",
+      "version": "1.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "55fc4a50001f9e0da4aecfa3ffb82fd988cde742",
+      "version": "1.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "50a00a801ec368382628caa2da7c8a0f09815456",
+      "version": "1.5.7",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4146e402c56c4d3678ccf0fc30a303fe4a628bcb",
+      "version": "1.5.6",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c4b6e2335f681c7d5183776b595718244791df78",
+      "version": "1.5.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "bfeb3e970fc4dd67fcf667cc5e50d3833a07561b",
+      "version": "1.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0364df0e7dfc35c4b82b73583cc259bd51580a80",
+      "version": "1.4.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "88849c5a68d5bb707658928cb55d9b3fd24c6617",
+      "version": "1.4.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2ab2277d5f2a066a86c9c67d394b8449d3257c66",
+      "version": "1.3.5",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6df476658691fa765546e70d6cc9530d0901bd83",
+      "version": "1.3.3",
+      "port-version": 1
+    },
+    {
+      "git-tree": "b9542adda87119b7456e9c6f57d31c19cebcc880",
+      "version": "1.3.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6669c8c2a94f932485ee5b2e708d95c672f13b8c",
+      "version": "1.3.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f158620e34813dc071685d10ccc40c079f2b2ca9",
+      "version": "1.3.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "fe60168d31fea0898c1282a01d8fddead9af6bd7",
+      "version": "1.2.6",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ccae5c60306415e7f7bd44e4ebb91b972b550c10",
+      "version": "1.2.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "16c37a75de3f8e60dca6acec5bb868b869cb7e76",
+      "version": "1.2.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e4e6b08e9aa73b948606044ed5c5c95c471a8f1f",
+      "version": "1.2.1",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/g-/glew.json b/external_imported/vcpkg/versions/g-/glew.json
index 48da58276..f101a1817 100644
--- a/external_imported/vcpkg/versions/g-/glew.json
+++ b/external_imported/vcpkg/versions/g-/glew.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "cfd894e57985fdb9c772bbf28a4aa261759bb6ac",
+      "version": "2.2.0",
+      "port-version": 3
+    },
+    {
+      "git-tree": "1fbf96a084cd511f49fa7f7009b56bd3d3361fb0",
+      "version": "2.2.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "90dfc684e6af42587e36df4e2167d7420424e829",
+      "version": "2.2.0",
+      "port-version": 1
+    },
     {
       "git-tree": "3211ed09c36542372ab3f1f690a42e2edbb072bc",
       "version-string": "2.2.0",
diff --git a/external_imported/vcpkg/versions/g-/glfw3.json b/external_imported/vcpkg/versions/g-/glfw3.json
index ddbd52f79..6e95d8b71 100644
--- a/external_imported/vcpkg/versions/g-/glfw3.json
+++ b/external_imported/vcpkg/versions/g-/glfw3.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "347c2801030056251468ce87934b4e9b02c41741",
+      "version-semver": "3.3.9",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c21a08a861a502b0e10c4a82de391a60bba6a4e6",
+      "version-semver": "3.3.8",
+      "port-version": 3
+    },
     {
       "git-tree": "308cd3ebdf6752e9d5eeb2933f33972c784aa8bd",
       "version-semver": "3.3.8",
diff --git a/external_imported/vcpkg/versions/g-/gli.json b/external_imported/vcpkg/versions/g-/gli.json
index bf68470d3..e01c2e762 100644
--- a/external_imported/vcpkg/versions/g-/gli.json
+++ b/external_imported/vcpkg/versions/g-/gli.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "7505483cb3f7c8f2a8b1c1fccd460687cac6dbf3",
+      "version-date": "2021-07-06",
+      "port-version": 2
+    },
+    {
+      "git-tree": "773ce8321a978f3dcbdb0755a666715ad00f7b01",
+      "version-date": "2021-07-06",
+      "port-version": 1
+    },
     {
       "git-tree": "c8960dd5e56bd32e4cd09edacd38a7a311e05fcd",
       "version-date": "2021-07-06",
diff --git a/external_imported/vcpkg/versions/g-/glib.json b/external_imported/vcpkg/versions/g-/glib.json
index 91f96951d..99b01e585 100644
--- a/external_imported/vcpkg/versions/g-/glib.json
+++ b/external_imported/vcpkg/versions/g-/glib.json
@@ -1,5 +1,70 @@
 {
   "versions": [
+    {
+      "git-tree": "d67b03e0a09ec580d051b79321b03182c0030c5f",
+      "version": "2.78.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6c91a4d4382d4d271d13397214c536389fd4a122",
+      "version": "2.78.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "cd9adf35a5c743b40cedce00c43542980f338229",
+      "version": "2.78.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4ae4475a91c8ec7f156e5904da9f0c3f02224cdc",
+      "version": "2.76.5",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ac7af1a224e7dfe9c18e629bf8de7798a0cda932",
+      "version": "2.76.3",
+      "port-version": 3
+    },
+    {
+      "git-tree": "c4aa04cd3294219ddd4b43c2f02b95c100683156",
+      "version": "2.76.3",
+      "port-version": 2
+    },
+    {
+      "git-tree": "1d1c3788ae7982f573db3e59116dd1ca885b88a4",
+      "version": "2.76.3",
+      "port-version": 1
+    },
+    {
+      "git-tree": "32c3e0235a72e62db8c1b248e3096c1d51415ba7",
+      "version": "2.76.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "219fb684c85e933ff56764423c86055a7a23ee62",
+      "version": "2.76.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "82258d825872b8c0987fe62b759b7602edbed17b",
+      "version": "2.76.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "c44e4f3f2265fbdb713b8fecc8dd15418d99021e",
+      "version": "2.76.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e08d2fbb65a5c4cb8a38c83726b35fe5f89dc785",
+      "version": "2.76.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "d0f2655ee0af323897720bb9aaf48bc08073b98c",
+      "version": "2.76.0",
+      "port-version": 0
+    },
     {
       "git-tree": "787197c9431b9d1f8a5436aeca0fd1155d26c83b",
       "version": "2.75.3",
diff --git a/external_imported/vcpkg/versions/g-/glibmm.json b/external_imported/vcpkg/versions/g-/glibmm.json
index 24f9c0a6f..12b6e8256 100644
--- a/external_imported/vcpkg/versions/g-/glibmm.json
+++ b/external_imported/vcpkg/versions/g-/glibmm.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "d8a2235a74e6c215246a3ade8ad3248b7e04e439",
+      "version": "2.76.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "16125400e378b3a45ff56a2f26573d9312ead0d1",
+      "version": "2.76.0",
+      "port-version": 0
+    },
     {
       "git-tree": "d633ca7a15a77e20cdf515ba74448d59f4e49021",
       "version": "2.74.0",
diff --git a/external_imported/vcpkg/versions/g-/glm.json b/external_imported/vcpkg/versions/g-/glm.json
index cdded4a40..b6fcf3d52 100644
--- a/external_imported/vcpkg/versions/g-/glm.json
+++ b/external_imported/vcpkg/versions/g-/glm.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "ed558e712eafccb124025c665c39f21998c71438",
+      "version": "1.0.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6687c48e237aab1c30cf4c589d08f698f73cf178",
+      "version-date": "2023-06-08",
+      "port-version": 0
+    },
     {
       "git-tree": "b940020b1f2958fcc468c615becec6ca5ad3bff5",
       "version": "0.9.9.8",
diff --git a/external_imported/vcpkg/versions/g-/globjects.json b/external_imported/vcpkg/versions/g-/globjects.json
index 75340cf93..ad69ec0d2 100644
--- a/external_imported/vcpkg/versions/g-/globjects.json
+++ b/external_imported/vcpkg/versions/g-/globjects.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "8ec42a207e240c2fa9d6d2a2b9e794a39ff60784",
+      "version": "1.1.0",
+      "port-version": 6
+    },
+    {
+      "git-tree": "fb8535a1b4b8e4068db9e102a11c3931c4db22ed",
+      "version": "1.1.0",
+      "port-version": 5
+    },
     {
       "git-tree": "0d9e98af47d7eb383a98e39c5661e573b1197e8c",
       "version-string": "1.1.0",
diff --git a/external_imported/vcpkg/versions/g-/glog.json b/external_imported/vcpkg/versions/g-/glog.json
index 9e2e21986..3bb72a9d3 100644
--- a/external_imported/vcpkg/versions/g-/glog.json
+++ b/external_imported/vcpkg/versions/g-/glog.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3e4dcaa54d409ed758073ef4964cf41d57996e90",
+      "version": "0.6.0",
+      "port-version": 3
+    },
     {
       "git-tree": "cce45164ee522a505686c1794e7c228e44f52d76",
       "version": "0.6.0",
diff --git a/external_imported/vcpkg/versions/g-/gloo.json b/external_imported/vcpkg/versions/g-/gloo.json
index ca6fac1e0..e3983a9d9 100644
--- a/external_imported/vcpkg/versions/g-/gloo.json
+++ b/external_imported/vcpkg/versions/g-/gloo.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "a48ea12e9618f830268147a2c05fc65769182f0d",
+      "version": "20201203",
+      "port-version": 2
+    },
+    {
+      "git-tree": "bd6e28e31f8b5d76a887e8b284c63596b9ffd65b",
+      "version": "20201203",
+      "port-version": 1
+    },
     {
       "git-tree": "18761f45d66d3eae3a73891f39142bbae80460b8",
       "version-string": "20201203",
diff --git a/external_imported/vcpkg/versions/g-/glpk.json b/external_imported/vcpkg/versions/g-/glpk.json
index 28f3db816..4490c03ef 100644
--- a/external_imported/vcpkg/versions/g-/glpk.json
+++ b/external_imported/vcpkg/versions/g-/glpk.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "00933f2c7f77149899b7c69c6d09410fca7f5b1d",
+      "version": "5.0",
+      "port-version": 3
+    },
+    {
+      "git-tree": "ebfbd1278a8d3e33d1cb52ed7806bf690642ffa6",
+      "version": "5.0",
+      "port-version": 2
+    },
     {
       "git-tree": "4ccc68be5d979b64412919b488ed88b798903ccf",
       "version": "5.0",
diff --git a/external_imported/vcpkg/versions/g-/glslang.json b/external_imported/vcpkg/versions/g-/glslang.json
index d5675e00c..d371c9678 100644
--- a/external_imported/vcpkg/versions/g-/glslang.json
+++ b/external_imported/vcpkg/versions/g-/glslang.json
@@ -1,5 +1,45 @@
 {
   "versions": [
+    {
+      "git-tree": "4a5fb278065c7505c6c2814d8dab0bba3642f194",
+      "version": "13.1.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "8296ce09ec51c8495a5bec8d65445b681df27b74",
+      "version": "13.1.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "488d78f12e3a376002a80d0058e3973ac75d4fe7",
+      "version": "13.0.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "c5c6c37e6477580e47bd5645a3760ff534c689f6",
+      "version": "13.0.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "07a60a91ac63383677c203954125ba981d08f53b",
+      "version": "13.0.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "796a20fde44858a311783328a0555813894631bb",
+      "version": "12.2.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "aaa917d7743ac6e466f2d4ecf20b5745cd44fe98",
+      "version": "12.2.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a2bca93dc0c41e31d464bfed8b2057bdc155abcb",
+      "version": "12.1.0",
+      "port-version": 0
+    },
     {
       "git-tree": "293344780ca0d14b1c23c0b78db72fdf5a059ce0",
       "version": "11.13.0",
diff --git a/external_imported/vcpkg/versions/g-/glui.json b/external_imported/vcpkg/versions/g-/glui.json
index 00a7d98d6..1a32a34bd 100644
--- a/external_imported/vcpkg/versions/g-/glui.json
+++ b/external_imported/vcpkg/versions/g-/glui.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "8c2b09ac7fb9d890c835c7580c3e0addb996752d",
+      "version-date": "2019-11-30",
+      "port-version": 4
+    },
+    {
+      "git-tree": "5fb1a005d3f676d62e974dbb3b96dba5c3c7369a",
+      "version-date": "2019-11-30",
+      "port-version": 3
+    },
+    {
+      "git-tree": "09f3f7fe385d4a84c2b987c3b233a3279837c05f",
+      "version-date": "2019-11-30",
+      "port-version": 2
+    },
     {
       "git-tree": "435b850a183a1fe599f56df300530e81c107cdfa",
       "version-string": "2019-11-30",
diff --git a/external_imported/vcpkg/versions/g-/gmime.json b/external_imported/vcpkg/versions/g-/gmime.json
index be91778a8..4f6711334 100644
--- a/external_imported/vcpkg/versions/g-/gmime.json
+++ b/external_imported/vcpkg/versions/g-/gmime.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "93e8b6f02474e1edb7e99db85020d864ee071ce0",
+      "version": "3.2.6",
+      "port-version": 6
+    },
+    {
+      "git-tree": "6db1f443a21e7c2f4004f8039b562ca1506f966c",
+      "version": "3.2.6",
+      "port-version": 5
+    },
+    {
+      "git-tree": "05c799167bca25a0ed69cf87d63cfe087a5daa83",
+      "version": "3.2.6",
+      "port-version": 4
+    },
     {
       "git-tree": "84aa2f50c54bb6f9bff5623b67ec8b7c2e427cbd",
       "version": "3.2.6",
diff --git a/external_imported/vcpkg/versions/g-/gmmlib.json b/external_imported/vcpkg/versions/g-/gmmlib.json
index 4f40f75e7..b5c538d53 100644
--- a/external_imported/vcpkg/versions/g-/gmmlib.json
+++ b/external_imported/vcpkg/versions/g-/gmmlib.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "7f7e953649b6c9b189ade0aa39fb4ac5689322c3",
+      "version": "22.3.17",
+      "port-version": 0
+    },
+    {
+      "git-tree": "04bd253bdd2f2e7e02b69feb0d72854fd663d3fb",
+      "version": "22.3.12",
+      "port-version": 0
+    },
     {
       "git-tree": "d7dbf37aa324f038b12f99d697da82299d3ec9a0",
       "version": "21.3.2",
diff --git a/external_imported/vcpkg/versions/g-/gmp.json b/external_imported/vcpkg/versions/g-/gmp.json
index ff76049a7..80efb83c9 100644
--- a/external_imported/vcpkg/versions/g-/gmp.json
+++ b/external_imported/vcpkg/versions/g-/gmp.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "726604ff590362102d805e16508ae20730583101",
+      "version": "6.2.1",
+      "port-version": 21
+    },
+    {
+      "git-tree": "5925ffa7bf1165b7ca3144e4253a19dcfc47a5ad",
+      "version": "6.2.1",
+      "port-version": 20
+    },
+    {
+      "git-tree": "e0f2cfc5cc1dea868ccad4363887bf9593b6c021",
+      "version": "6.2.1",
+      "port-version": 19
+    },
+    {
+      "git-tree": "efae5abe8271dc5c25bfa47b9cc146a29e02dc05",
+      "version": "6.2.1",
+      "port-version": 18
+    },
     {
       "git-tree": "82d0d40ea6ffa93a17c696a2c2fac9a436d67958",
       "version": "6.2.1",
diff --git a/external_imported/vcpkg/versions/g-/gmsh.json b/external_imported/vcpkg/versions/g-/gmsh.json
index 1b357c663..b381591bd 100644
--- a/external_imported/vcpkg/versions/g-/gmsh.json
+++ b/external_imported/vcpkg/versions/g-/gmsh.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4b2ce12dd16815e31348c4dba93b40ec10e815f3",
+      "version": "4.11.1",
+      "port-version": 0
+    },
     {
       "git-tree": "d01377e2003c3ea5ef7a6b9fb215a086e5f75eed",
       "version": "4.9.0",
diff --git a/external_imported/vcpkg/versions/g-/gobject-introspection.json b/external_imported/vcpkg/versions/g-/gobject-introspection.json
index e9f565479..f87d5c78e 100644
--- a/external_imported/vcpkg/versions/g-/gobject-introspection.json
+++ b/external_imported/vcpkg/versions/g-/gobject-introspection.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "9d0cfb4e7056136db4c9def1e64b88b7417dc0e8",
+      "version": "1.72.0",
+      "port-version": 7
+    },
+    {
+      "git-tree": "aa7163808411a8ff5641022957909a6d681cea69",
+      "version": "1.72.0",
+      "port-version": 6
+    },
+    {
+      "git-tree": "a697a0e2fa6d441dc5008a6d128a9a8f3e2440ab",
+      "version": "1.72.0",
+      "port-version": 5
+    },
+    {
+      "git-tree": "097d9982b8667ff8d67107e9de262d3900e59631",
+      "version": "1.72.0",
+      "port-version": 4
+    },
+    {
+      "git-tree": "47ab422de57e980b1294daf095a942d3ea36ae98",
+      "version": "1.72.0",
+      "port-version": 3
+    },
+    {
+      "git-tree": "1c57bf1b1ead704fc0899cb496732c42e5330cc4",
+      "version": "1.72.0",
+      "port-version": 2
+    },
     {
       "git-tree": "a74d57d679dac22f5b60c5b7da97cad7ecb3d0fb",
       "version": "1.72.0",
diff --git a/external_imported/vcpkg/versions/g-/google-cloud-cpp.json b/external_imported/vcpkg/versions/g-/google-cloud-cpp.json
index b7588c10f..b8dc298e3 100644
--- a/external_imported/vcpkg/versions/g-/google-cloud-cpp.json
+++ b/external_imported/vcpkg/versions/g-/google-cloud-cpp.json
@@ -1,5 +1,100 @@
 {
   "versions": [
+    {
+      "git-tree": "d8f3be8b308c4858ec0226b7aebe1e55a21298f4",
+      "version": "2.21.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "363eb6725f35aaefdbd1da17ab0a3d1bd93e90cd",
+      "version": "2.20.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "3b6b859d3c9db3328c9cb34949d5d618f4999090",
+      "version": "2.20.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "815f9e2c25c4aa47b16ec69ac6c41e2d52655d89",
+      "version": "2.19.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "cda5a5192b0d1310376b1370890e1d38755c076a",
+      "version": "2.19.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "21cf84757dd988f8b1ea4aa318002a4cc047b697",
+      "version": "2.18.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2a52d32521f59da4d2ecfe7beffe13bab448ea64",
+      "version": "2.17.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "eb4b2fd7eea450ced2e6f33dcd9af1237f2de3c2",
+      "version": "2.17.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "cfe978bbc8c0f0e98f02aaaf2ab546f08107ce95",
+      "version": "2.17.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "76121e57d4d9f0ce925973295ee30a574d448e4f",
+      "version": "2.16.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6b622eca80c311ef081e80432d56f13d9c8f0d72",
+      "version": "2.15.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "abe57efc591eb204c5e39b2a78c5c1d6832fc236",
+      "version": "2.15.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d32a3fa190564c35057874f3912f61ebf07852b7",
+      "version": "2.14.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "696c1d17cd2174ffde1c0d53779b76e8d98d924a",
+      "version": "2.14.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c067a236b62d38d1f56a658b086039bf22441c4a",
+      "version": "2.13.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f7179212beeb134849f381dbe2c200580cc37c97",
+      "version": "2.12.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0a4dc6845aca21d78853e4f6bc11e9bc5174b7b2",
+      "version": "2.11.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c3c69ec65e243e929646ca08f0697849d2d78191",
+      "version": "2.10.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4f9ab675a9cb385078d01716543e99db9a95135a",
+      "version": "2.9.0",
+      "port-version": 0
+    },
     {
       "git-tree": "cd39ca22d68218395284a484878ecf7774f1a23c",
       "version": "2.8.0",
diff --git a/external_imported/vcpkg/versions/g-/gperf.json b/external_imported/vcpkg/versions/g-/gperf.json
index 9421e9188..11fb42d0f 100644
--- a/external_imported/vcpkg/versions/g-/gperf.json
+++ b/external_imported/vcpkg/versions/g-/gperf.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "590e19515bff5b0abc6d9f73ba20a19a71555a32",
+      "version": "3.1",
+      "port-version": 6
+    },
+    {
+      "git-tree": "c1dc7145f2a0607798bfdaede7bf064b88e908ac",
+      "version": "3.1",
+      "port-version": 5
+    },
     {
       "git-tree": "2fd0763af6d1af5d123d81c77fe9062d33b3e918",
       "version": "3.1",
diff --git a/external_imported/vcpkg/versions/g-/gperftools.json b/external_imported/vcpkg/versions/g-/gperftools.json
index 426994d61..778108dac 100644
--- a/external_imported/vcpkg/versions/g-/gperftools.json
+++ b/external_imported/vcpkg/versions/g-/gperftools.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "ebb8ef920067346d4633cc78ee176f7ed9bc89d4",
+      "version": "2.10",
+      "port-version": 1
+    },
+    {
+      "git-tree": "a3e7b08a6dcd261b62d0fee3d7f00de84c3b0094",
+      "version": "2.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0840bfaf247735ffd902de5536b4ce2f411a77e3",
+      "version-date": "2019-09-02",
+      "port-version": 5
+    },
+    {
+      "git-tree": "f6296ad4ccaeca6a3f7747fc173c78cb8f21b095",
+      "version-date": "2019-09-02",
+      "port-version": 4
+    },
     {
       "git-tree": "cc4a899d2089a6a683a2cbc8fc5ab6dae3fc45de",
       "version-date": "2019-09-02",
diff --git a/external_imported/vcpkg/versions/g-/gpgme.json b/external_imported/vcpkg/versions/g-/gpgme.json
index 9682d45c4..7974a38bd 100644
--- a/external_imported/vcpkg/versions/g-/gpgme.json
+++ b/external_imported/vcpkg/versions/g-/gpgme.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "71d1688aa684def46e7303068d31cbac5a90c010",
+      "version": "1.22.0",
+      "port-version": 0
+    },
     {
       "git-tree": "ac2d5bcf5b538ac0c93f5af00fb210e1da266911",
       "version": "1.18.0",
diff --git a/external_imported/vcpkg/versions/g-/gppanel.json b/external_imported/vcpkg/versions/g-/gppanel.json
index d83b89752..0695359da 100644
--- a/external_imported/vcpkg/versions/g-/gppanel.json
+++ b/external_imported/vcpkg/versions/g-/gppanel.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "275a8f2deb026e033572cc5ccea803dbe4bc45dd",
+      "version-date": "2020-05-20",
+      "port-version": 4
+    },
+    {
+      "git-tree": "ba97170231ed485d5ba3dfbfe2ed7a66c0260517",
+      "version-date": "2020-05-20",
+      "port-version": 3
+    },
     {
       "git-tree": "9e5dbacb2efcf80443e7d7c42bc2c98b3622a7c8",
       "version-date": "2020-05-20",
diff --git a/external_imported/vcpkg/versions/g-/grantlee.json b/external_imported/vcpkg/versions/g-/grantlee.json
index ff295954d..5bca5c1bd 100644
--- a/external_imported/vcpkg/versions/g-/grantlee.json
+++ b/external_imported/vcpkg/versions/g-/grantlee.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "5c8ada7d8eca1a8b8926d25e9cbcd861f3e00f24",
+      "version": "5.3.1",
+      "port-version": 2
+    },
+    {
+      "git-tree": "5828abf42559b6f3db682f7827f502cf75c7ec32",
+      "version": "5.3.1",
+      "port-version": 1
+    },
     {
       "git-tree": "36162cae49c2b9664a73f0e2a1f74544e4447a7b",
       "version": "5.3.1",
diff --git a/external_imported/vcpkg/versions/g-/graphene.json b/external_imported/vcpkg/versions/g-/graphene.json
index ace90f309..5c49f3ad3 100644
--- a/external_imported/vcpkg/versions/g-/graphene.json
+++ b/external_imported/vcpkg/versions/g-/graphene.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "abffc31a5c8762671618bdca4bbcd620e171f6d1",
+      "version": "1.10.8",
+      "port-version": 2
+    },
     {
       "git-tree": "e8c7b10cc1bdcca2e09b0f42da6ad645699680a9",
       "version": "1.10.8",
diff --git a/external_imported/vcpkg/versions/g-/graphicsmagick.json b/external_imported/vcpkg/versions/g-/graphicsmagick.json
index 696ce14ce..edeba88a5 100644
--- a/external_imported/vcpkg/versions/g-/graphicsmagick.json
+++ b/external_imported/vcpkg/versions/g-/graphicsmagick.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "6bbaf421dd38787bf4bd5b335bc97417041838bd",
+      "version": "1.3.41",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a4995e38b85cfc409f1a61561fde3bada483c23a",
+      "version": "1.3.37",
+      "port-version": 3
+    },
+    {
+      "git-tree": "7f5570af30ba3e4d38341fc16ae5fa98b2145f03",
+      "version": "1.3.37",
+      "port-version": 2
+    },
     {
       "git-tree": "c6ed21bf630e77483e7df659e7fd65eeefc6b543",
       "version": "1.3.37",
diff --git a/external_imported/vcpkg/versions/g-/graphite2.json b/external_imported/vcpkg/versions/g-/graphite2.json
index 19e5978ba..afaf3248b 100644
--- a/external_imported/vcpkg/versions/g-/graphite2.json
+++ b/external_imported/vcpkg/versions/g-/graphite2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7d9a7404bf9dece906b2f6d8d8a70d7139d5e998",
+      "version": "1.3.14",
+      "port-version": 4
+    },
     {
       "git-tree": "247c12c09e9766df6a90a8a45dad08320f4e0493",
       "version": "1.3.14",
diff --git a/external_imported/vcpkg/versions/g-/graphviz.json b/external_imported/vcpkg/versions/g-/graphviz.json
index c1f93f1d7..c896650db 100644
--- a/external_imported/vcpkg/versions/g-/graphviz.json
+++ b/external_imported/vcpkg/versions/g-/graphviz.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "83813d9389be10cbd741a2e6dbd32924972e6b82",
+      "version-semver": "9.0.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "ba712eb597e2f6b4cd9113689ccb72cb95025d6f",
+      "version-semver": "9.0.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "a1450baf722dffefe9e4e4c4b5939ed1933ba269",
+      "version-semver": "9.0.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "793ff2f4883ca15332814044876e57a9b0921c43",
+      "version-semver": "7.0.0",
+      "port-version": 2
+    },
     {
       "git-tree": "2a730e87b6af42e6fbf3af0fc7e5c4dc6785e9df",
       "version-semver": "7.0.0",
diff --git a/external_imported/vcpkg/versions/g-/grpc.json b/external_imported/vcpkg/versions/g-/grpc.json
index cde4dede1..789caf91b 100644
--- a/external_imported/vcpkg/versions/g-/grpc.json
+++ b/external_imported/vcpkg/versions/g-/grpc.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "cb74de57b43021aafda930876608035b03eb80a8",
+      "version-semver": "1.51.1",
+      "port-version": 1
+    },
     {
       "git-tree": "7c026ebb0835a3e342a5aad8e0c2674d3ec77a67",
       "version-semver": "1.51.1",
diff --git a/external_imported/vcpkg/versions/g-/gsl-lite.json b/external_imported/vcpkg/versions/g-/gsl-lite.json
index 8a386430a..eaa588c4a 100644
--- a/external_imported/vcpkg/versions/g-/gsl-lite.json
+++ b/external_imported/vcpkg/versions/g-/gsl-lite.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ac07f676c563a519da1342d50de8cd9db68ac09f",
+      "version": "0.41.0",
+      "port-version": 0
+    },
     {
       "git-tree": "8d3c1399fe44414aaf2c88d845b8c03bfdb66d46",
       "version": "0.40.0",
diff --git a/external_imported/vcpkg/versions/g-/gsl.json b/external_imported/vcpkg/versions/g-/gsl.json
index c80bd8801..d01dca282 100644
--- a/external_imported/vcpkg/versions/g-/gsl.json
+++ b/external_imported/vcpkg/versions/g-/gsl.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "533b0147bfc479e315c3dc4c181675c302272ae4",
+      "version": "2.7.1",
+      "port-version": 3
+    },
+    {
+      "git-tree": "c9aa024bd4ce8327328a818b75cc6188de15ddd2",
+      "version": "2.7.1",
+      "port-version": 2
+    },
     {
       "git-tree": "0bf0e1015fe68141e3c5d0b6777c2d38c352b72d",
       "version": "2.7.1",
diff --git a/external_imported/vcpkg/versions/g-/gsoap.json b/external_imported/vcpkg/versions/g-/gsoap.json
index ec7cae019..292dd993e 100644
--- a/external_imported/vcpkg/versions/g-/gsoap.json
+++ b/external_imported/vcpkg/versions/g-/gsoap.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "86dc8a8487c3f3dd327cc36c94e19fe371fa4c4f",
+      "version": "2.8.112",
+      "port-version": 2
+    },
     {
       "git-tree": "1fa5f6d124e48e4c9c80949c5b8e9c6d40dc2e43",
       "version": "2.8.112",
diff --git a/external_imported/vcpkg/versions/g-/gst-rtsp-server.json b/external_imported/vcpkg/versions/g-/gst-rtsp-server.json
index 0e9545699..1706f8bc6 100644
--- a/external_imported/vcpkg/versions/g-/gst-rtsp-server.json
+++ b/external_imported/vcpkg/versions/g-/gst-rtsp-server.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "74327fa3eac21619a868533135c685bcee046a24",
+      "version": "1.20.5",
+      "port-version": 2
+    },
+    {
+      "git-tree": "85ca43c538fdb1f41292003c458eb209a1478906",
+      "version": "1.20.5",
+      "port-version": 1
+    },
     {
       "git-tree": "6bde18badd06f4466ca4cb75b83aa98b1f24f3bd",
       "version": "1.20.5",
diff --git a/external_imported/vcpkg/versions/g-/gstreamer.json b/external_imported/vcpkg/versions/g-/gstreamer.json
index 7decd60f4..4ab5d33bd 100644
--- a/external_imported/vcpkg/versions/g-/gstreamer.json
+++ b/external_imported/vcpkg/versions/g-/gstreamer.json
@@ -1,5 +1,90 @@
 {
   "versions": [
+    {
+      "git-tree": "563a58509d4f74fed0d8819ec9182a5da8700d02",
+      "version": "1.22.5",
+      "port-version": 7
+    },
+    {
+      "git-tree": "27425db97df2c329de0baf5d00c719982659c9c4",
+      "version": "1.22.5",
+      "port-version": 6
+    },
+    {
+      "git-tree": "c6339c24dbe60ed13ff8d6b5e646d11e192f4ec0",
+      "version": "1.22.5",
+      "port-version": 5
+    },
+    {
+      "git-tree": "b18eecdb79cdeb95b0c5e003cf14ababd9bca7c9",
+      "version": "1.22.5",
+      "port-version": 4
+    },
+    {
+      "git-tree": "5bcd4e4f541fb90ffef24a354db74f5555f2ba6d",
+      "version": "1.22.5",
+      "port-version": 3
+    },
+    {
+      "git-tree": "921fefd3f9b9ce85c031881f5861074957d1a7f1",
+      "version": "1.22.5",
+      "port-version": 2
+    },
+    {
+      "git-tree": "7f37f12f5a39fa6eea841721c51bb591039c3251",
+      "version": "1.22.5",
+      "port-version": 1
+    },
+    {
+      "git-tree": "76183f0a0e77acbf09ac1ae73b1b2a27f986fcf6",
+      "version": "1.22.5",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9ad3c702668f673319b620729150bce73d2181eb",
+      "version": "1.20.5",
+      "port-version": 11
+    },
+    {
+      "git-tree": "24a88414ae4d8f37c01ffc726f3c7eb264edc478",
+      "version": "1.20.5",
+      "port-version": 10
+    },
+    {
+      "git-tree": "75810a0d259dd1294e994266d469dde9423dc209",
+      "version": "1.20.5",
+      "port-version": 9
+    },
+    {
+      "git-tree": "f4fa840c6345c1b7bf4c35e2977ed3f680d6584a",
+      "version": "1.20.5",
+      "port-version": 8
+    },
+    {
+      "git-tree": "877a4687de4ef7b958624b55a558f91b4b34c32b",
+      "version": "1.20.5",
+      "port-version": 7
+    },
+    {
+      "git-tree": "631b03d07848f5a632168da7e3f9e1bc753d4085",
+      "version": "1.20.5",
+      "port-version": 6
+    },
+    {
+      "git-tree": "86757cb6fd9f50813cadb3779f1096fe1377eef9",
+      "version": "1.20.5",
+      "port-version": 5
+    },
+    {
+      "git-tree": "084ea66aed42ba882e19b103de4042d676be1530",
+      "version": "1.20.5",
+      "port-version": 4
+    },
+    {
+      "git-tree": "e9724606bfcc594bbdde72fbcba7fbd019312ae6",
+      "version": "1.20.5",
+      "port-version": 3
+    },
     {
       "git-tree": "6289f1269af159388f8a9cfed08c52acd1a297da",
       "version": "1.20.5",
diff --git a/external_imported/vcpkg/versions/g-/gtest.json b/external_imported/vcpkg/versions/g-/gtest.json
index 3af261892..8de53841d 100644
--- a/external_imported/vcpkg/versions/g-/gtest.json
+++ b/external_imported/vcpkg/versions/g-/gtest.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c6dde67781b31b556e0868cc9f45f3eec59dc2a8",
+      "version-semver": "1.14.0",
+      "port-version": 0
+    },
     {
       "git-tree": "3f70f42192aacc5f8242c14d959d02a802f7559c",
       "version-semver": "1.13.0",
diff --git a/external_imported/vcpkg/versions/g-/gtk.json b/external_imported/vcpkg/versions/g-/gtk.json
index f6f179237..055364a53 100644
--- a/external_imported/vcpkg/versions/g-/gtk.json
+++ b/external_imported/vcpkg/versions/g-/gtk.json
@@ -1,5 +1,45 @@
 {
   "versions": [
+    {
+      "git-tree": "814624705f6cc11a3468d9c3418bc20521b6b207",
+      "version": "4.10.5",
+      "port-version": 1
+    },
+    {
+      "git-tree": "1d2910bafafe5342d557621dfb784fab156ae169",
+      "version": "4.10.5",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a0674344415ac7da9b123e4dedfe61160c4b6d6a",
+      "version": "4.10.4",
+      "port-version": 2
+    },
+    {
+      "git-tree": "a79d7945c3db191e81a4cc3367efb9972b8df29e",
+      "version": "4.10.4",
+      "port-version": 1
+    },
+    {
+      "git-tree": "d527905d8bda9bb0f59ab326013dcfc0154613a7",
+      "version": "4.10.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f6542974036eeeb96bcfa2f343a58dc9a07c54b3",
+      "version": "4.10.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "416961a907f2f0412d4d59517a904d06b4985ffb",
+      "version": "4.10.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "52d572bf77d0fa30174893ca6fe1bf6c17935cb2",
+      "version": "4.6.8",
+      "port-version": 2
+    },
     {
       "git-tree": "cadf0f3efc6e75b1a1978f5c29126ffaf4a75c8c",
       "version": "4.6.8",
diff --git a/external_imported/vcpkg/versions/g-/gtk3.json b/external_imported/vcpkg/versions/g-/gtk3.json
index 058310ffa..f725fc7e2 100644
--- a/external_imported/vcpkg/versions/g-/gtk3.json
+++ b/external_imported/vcpkg/versions/g-/gtk3.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "1362bb3978886e043fd12c089f2c1337a4f1adf8",
+      "version": "3.24.38",
+      "port-version": 1
+    },
+    {
+      "git-tree": "63636acf7b77eead112fc9faa84680d1df97acd3",
+      "version": "3.24.38",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f4e197166d448971a8856734debc428f05b456cb",
+      "version": "3.24.37",
+      "port-version": 0
+    },
+    {
+      "git-tree": "93a006967f4d1c6e3ce8409cd1a134f81c2b1288",
+      "version": "3.24.36",
+      "port-version": 0
+    },
     {
       "git-tree": "0c25a1f1fc2d3f166ea007a97b845fb85769588e",
       "version": "3.24.34",
diff --git a/external_imported/vcpkg/versions/g-/gtkmm.json b/external_imported/vcpkg/versions/g-/gtkmm.json
index ef30294f4..2f3b4ec32 100644
--- a/external_imported/vcpkg/versions/g-/gtkmm.json
+++ b/external_imported/vcpkg/versions/g-/gtkmm.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "e9e63e49ac6c8ade89bf2df6bf73bb32f3b18f9b",
+      "version": "4.10.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "5bede7b8a7ab28981640b17d73708e710c5e8701",
+      "version": "4.10.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c20c4893b7e0aada402db3895d38d840123ae8c5",
+      "version": "4.6.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "8adcadbba0b316ce33796f84c2fe878c9f2cfa94",
+      "version": "4.6.0",
+      "port-version": 1
+    },
     {
       "git-tree": "f39d8f061ae7242baf2b1b78b76253b2ee21c936",
       "version": "4.6.0",
diff --git a/external_imported/vcpkg/versions/g-/gtl.json b/external_imported/vcpkg/versions/g-/gtl.json
index bc8ed1da4..d78d1194f 100644
--- a/external_imported/vcpkg/versions/g-/gtl.json
+++ b/external_imported/vcpkg/versions/g-/gtl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1da92945b6f2d37dbf8c5e8f2c7804d7f02080fb",
+      "version": "1.1.8",
+      "port-version": 0
+    },
     {
       "git-tree": "1e858eb1464aecbfd828e88515da6c75dc9277bd",
       "version": "1.1.5",
diff --git a/external_imported/vcpkg/versions/g-/gts.json b/external_imported/vcpkg/versions/g-/gts.json
index dbd92b127..ed71a2901 100644
--- a/external_imported/vcpkg/versions/g-/gts.json
+++ b/external_imported/vcpkg/versions/g-/gts.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1c12aefc981ca389e3235cf1940883f881dddb4d",
+      "version": "0.7.6",
+      "port-version": 8
+    },
     {
       "git-tree": "1bce412085edcd46e3f358cca2c3bb1cffb25cfa",
       "version": "0.7.6",
diff --git a/external_imported/vcpkg/versions/g-/gtsam.json b/external_imported/vcpkg/versions/g-/gtsam.json
new file mode 100644
index 000000000..23b172441
--- /dev/null
+++ b/external_imported/vcpkg/versions/g-/gtsam.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "e7b2023df7e13e479e6861ba1c6ace9ae9d2cfbf",
+      "version-string": "4.2a9",
+      "port-version": 1
+    },
+    {
+      "git-tree": "7eb7ebb6abd8256e41114fb25eea3be2b7c8a6a5",
+      "version-string": "4.2a9",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/g-/gul14.json b/external_imported/vcpkg/versions/g-/gul14.json
index df44d91e5..9892d1420 100644
--- a/external_imported/vcpkg/versions/g-/gul14.json
+++ b/external_imported/vcpkg/versions/g-/gul14.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "4b96d6a06013e4d0d58af377c43728ca2e78e592",
+      "version": "2.10.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "83f62f0824bba51279ec18b9e4dedfa607bc2e3b",
+      "version": "2.9.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0ef663cd26e5a6fea87578b1662e28cae9caf233",
+      "version": "2.9.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "cdf7849b2344332aa6cdcbee58c03452009ec4bc",
+      "version": "2.9.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ff0bf240e106cb41da3f21fba4ab9c04aa14463f",
+      "version": "2.8.0",
+      "port-version": 0
+    },
     {
       "git-tree": "a9415538b1b84af12b84d45fe190af822d10b5bb",
       "version": "2.7.1",
diff --git a/external_imported/vcpkg/versions/g-/gz-cmake3.json b/external_imported/vcpkg/versions/g-/gz-cmake3.json
new file mode 100644
index 000000000..bb94cf5d5
--- /dev/null
+++ b/external_imported/vcpkg/versions/g-/gz-cmake3.json
@@ -0,0 +1,44 @@
+{
+  "versions": [
+    {
+      "git-tree": "76e06938007614b4fe523e37e368d7e39a40a9bc",
+      "version": "3.4.1",
+      "port-version": 5
+    },
+    {
+      "git-tree": "0238546ece05d52d030eb6dd62373ae4b65d1503",
+      "version": "3.4.1",
+      "port-version": 4
+    },
+    {
+      "git-tree": "5ac0952f283b1e4a700a12c0d616066b36fdeff2",
+      "version": "3.4.1",
+      "port-version": 3
+    },
+    {
+      "git-tree": "f0b0d35ac8f99280de71a64494d8597f09986362",
+      "version": "3.4.1",
+      "port-version": 2
+    },
+    {
+      "git-tree": "8d7ac07eb757d7a69f1df27ad7a1ef71c26957d4",
+      "version": "3.4.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "c0061f3363187e8da74f252ff3c21c42e382e8c9",
+      "version": "3.4.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "04e105aecf5f7805dde15ac905cacb77ffcd3225",
+      "version": "3.4.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a1a12dbb8647dbc12381aa63fe0c66c48e2b4b31",
+      "version": "3.0.1",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/g-/gz-common5.json b/external_imported/vcpkg/versions/g-/gz-common5.json
new file mode 100644
index 000000000..152a6d4e7
--- /dev/null
+++ b/external_imported/vcpkg/versions/g-/gz-common5.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "15fd6996514765a386996566e63fd0fff58c3db4",
+      "version": "5.4.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "ecb88cbb8c52027d083348a8d28705ef7fe861ca",
+      "version": "5.4.1",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/g-/gz-fuel-tools8.json b/external_imported/vcpkg/versions/g-/gz-fuel-tools8.json
new file mode 100644
index 000000000..acc0ad72a
--- /dev/null
+++ b/external_imported/vcpkg/versions/g-/gz-fuel-tools8.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "8d0ee2efa09bb7debd7475b8cc7f8745b3f712aa",
+      "version": "8.1.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/g-/gz-gui7.json b/external_imported/vcpkg/versions/g-/gz-gui7.json
new file mode 100644
index 000000000..737ccb5c2
--- /dev/null
+++ b/external_imported/vcpkg/versions/g-/gz-gui7.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "3fc2d2bd35c8d9c5dad86739f113b952cb65913a",
+      "version": "7.2.1",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/g-/gz-math7.json b/external_imported/vcpkg/versions/g-/gz-math7.json
new file mode 100644
index 000000000..61f24bdb5
--- /dev/null
+++ b/external_imported/vcpkg/versions/g-/gz-math7.json
@@ -0,0 +1,19 @@
+{
+  "versions": [
+    {
+      "git-tree": "788bff7f23bcb592cfbe23a0077ce5e338633515",
+      "version": "7.3.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "687462541825396052367baec48a08e4657d63d4",
+      "version": "7.0.2",
+      "port-version": 1
+    },
+    {
+      "git-tree": "13b399f38d70db748d1babf9296d2a4fc80dc302",
+      "version": "7.0.2",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/g-/gz-msgs9.json b/external_imported/vcpkg/versions/g-/gz-msgs9.json
new file mode 100644
index 000000000..f9f78f24a
--- /dev/null
+++ b/external_imported/vcpkg/versions/g-/gz-msgs9.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "1eb43a446ea3b27c5d7f54505f6588c76f3ad210",
+      "version": "9.5.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/g-/gz-physics6.json b/external_imported/vcpkg/versions/g-/gz-physics6.json
new file mode 100644
index 000000000..4fc4b1644
--- /dev/null
+++ b/external_imported/vcpkg/versions/g-/gz-physics6.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "f21733a38332420967e218df27d7adfc125c6f07",
+      "version": "6.5.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "9e84a89c5e37806e67295d51b6bd1ec565ccaede",
+      "version": "6.5.1",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/g-/gz-plugin2.json b/external_imported/vcpkg/versions/g-/gz-plugin2.json
new file mode 100644
index 000000000..2b46ff5d9
--- /dev/null
+++ b/external_imported/vcpkg/versions/g-/gz-plugin2.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "aa376761e8fe39c9ff89a989e18e798a831bf273",
+      "version": "2.0.1",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/g-/gz-rendering7.json b/external_imported/vcpkg/versions/g-/gz-rendering7.json
new file mode 100644
index 000000000..8a9c1bcd2
--- /dev/null
+++ b/external_imported/vcpkg/versions/g-/gz-rendering7.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "29ca14723fbc8c73390ab5abe48b4e58cb0674b2",
+      "version": "7.4.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "5fa361453bcae9a0e8acee956057e9436f8d1377",
+      "version": "7.4.1",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/g-/gz-sensors7.json b/external_imported/vcpkg/versions/g-/gz-sensors7.json
new file mode 100644
index 000000000..fe5d9eadb
--- /dev/null
+++ b/external_imported/vcpkg/versions/g-/gz-sensors7.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "30989166a9bafd435a3344a388265a26f3aa9492",
+      "version": "7.3.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/g-/gz-tools2.json b/external_imported/vcpkg/versions/g-/gz-tools2.json
new file mode 100644
index 000000000..0a73dc150
--- /dev/null
+++ b/external_imported/vcpkg/versions/g-/gz-tools2.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "31343bbe7d8ae7e4bfaa5bf8e7a29dc653d98acc",
+      "version": "2.0.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "10058238d27070a39c55eeb9ec6a4e5246a9f853",
+      "version": "2.0.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/g-/gz-transport12.json b/external_imported/vcpkg/versions/g-/gz-transport12.json
new file mode 100644
index 000000000..64d23ddc6
--- /dev/null
+++ b/external_imported/vcpkg/versions/g-/gz-transport12.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "0cff2b97b9f6d2e46b5fea0158431fb2c3a92fba",
+      "version": "12.2.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/g-/gz-utils2.json b/external_imported/vcpkg/versions/g-/gz-utils2.json
new file mode 100644
index 000000000..6b2613885
--- /dev/null
+++ b/external_imported/vcpkg/versions/g-/gz-utils2.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "427940c7d970bbcefb22b7930dd1196a90e42bc9",
+      "version": "2.0.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/g-/gzip-hpp.json b/external_imported/vcpkg/versions/g-/gzip-hpp.json
index c9f7c1d17..30c3c2fa0 100644
--- a/external_imported/vcpkg/versions/g-/gzip-hpp.json
+++ b/external_imported/vcpkg/versions/g-/gzip-hpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "384745bc1f743b41fc1973ac4efefa82fea5d46c",
+      "version": "0.1.0",
+      "port-version": 2
+    },
     {
       "git-tree": "fa20c97f9bdf61c0adf326307bfeda1b24babfb1",
       "version-string": "0.1.0",
diff --git a/external_imported/vcpkg/versions/h-/h5py-lzf.json b/external_imported/vcpkg/versions/h-/h5py-lzf.json
index 1339053f3..25f03b4df 100644
--- a/external_imported/vcpkg/versions/h-/h5py-lzf.json
+++ b/external_imported/vcpkg/versions/h-/h5py-lzf.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "bc038605ccbdc888df201ec6296f442e1b47c42a",
+      "version-date": "2019-12-04",
+      "port-version": 3
+    },
+    {
+      "git-tree": "e8323d8d5c2ced7273acaf951f5b62c87c112008",
+      "version-date": "2019-12-04",
+      "port-version": 2
+    },
     {
       "git-tree": "9852b593ea75baeff7131615d49a46d32af54dfb",
       "version-string": "2019-12-04",
diff --git a/external_imported/vcpkg/versions/h-/halide.json b/external_imported/vcpkg/versions/h-/halide.json
index 11eba04a6..5ba8cace1 100644
--- a/external_imported/vcpkg/versions/h-/halide.json
+++ b/external_imported/vcpkg/versions/h-/halide.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "c12d736ad0a8329d09a23dc7ae3a094d4ce02df1",
+      "version": "16.0.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "be8971ecbab0879a1db7aedfec5095c0d1d942b3",
+      "version": "16.0.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "747567f07492ad16950a115456d31ba746a3bd10",
+      "version": "15.0.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "1d7e84604e36eb833964af361772ebcf5e3953c5",
+      "version": "15.0.0",
+      "port-version": 0
+    },
     {
       "git-tree": "958cd321f20007534db5859498f8153017271b2f",
       "version": "14.0.0",
diff --git a/external_imported/vcpkg/versions/h-/hareflow.json b/external_imported/vcpkg/versions/h-/hareflow.json
index 1eeae5b86..4a6693800 100644
--- a/external_imported/vcpkg/versions/h-/hareflow.json
+++ b/external_imported/vcpkg/versions/h-/hareflow.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0bd1ffea6cb09dc32a66641bbe120501d1e9f9ac",
+      "version-semver": "0.1.0",
+      "port-version": 1
+    },
     {
       "git-tree": "80c6cc2de2019b438b3eb7caecc26277e5cc836c",
       "version-semver": "0.1.0",
diff --git a/external_imported/vcpkg/versions/h-/harfbuzz.json b/external_imported/vcpkg/versions/h-/harfbuzz.json
index 73c49c489..7701af112 100644
--- a/external_imported/vcpkg/versions/h-/harfbuzz.json
+++ b/external_imported/vcpkg/versions/h-/harfbuzz.json
@@ -1,5 +1,80 @@
 {
   "versions": [
+    {
+      "git-tree": "f22f35a345a42b356292d5c480208c6c395ed5a0",
+      "version": "8.3.0",
+      "port-version": 3
+    },
+    {
+      "git-tree": "ff776c837e28a47a91cad45946d7ab6b51dc3c67",
+      "version": "8.3.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "6e2d07391d009a33797b19b707bf5bc60cdb17e5",
+      "version": "8.3.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "43649e54cfda3d4673975cf61daf8e501edf63e6",
+      "version": "8.3.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5baafcf92a1de9e3b94fba26f36f4287dad722fb",
+      "version": "8.2.1",
+      "port-version": 3
+    },
+    {
+      "git-tree": "d6359755bd398188b67a216f7627e9f297f47889",
+      "version": "8.2.1",
+      "port-version": 2
+    },
+    {
+      "git-tree": "1f39a3081e7055cbf5e8cc27b5f91fef2a274415",
+      "version": "8.2.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "6894af0b171aea403718ebb131b454a60b0c961a",
+      "version": "8.2.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "053b71e591f5599aa5e887fbf6531c7baa58b23d",
+      "version": "8.2.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "d804324af44593c0877fdf035cda178123d9c87f",
+      "version": "8.2.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "458a6aee4457133d8ea6b97f1a18724fead35551",
+      "version": "8.1.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4f0320d0c3d8f57f1665f30b98bd64ff0181181d",
+      "version": "8.0.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "7b0e10a3d5e7e49990e7a19f29cdba04571725f4",
+      "version": "7.3.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6715cbef7e30e10a6888a737e49a3f971b08f24c",
+      "version": "7.2.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e5129b8eb8c89bcf3564adce7328ed5fd5548794",
+      "version": "7.1.0",
+      "port-version": 0
+    },
     {
       "git-tree": "74d44792360393e3c1fee924def05c9d21a5fe3d",
       "version": "7.0.0",
diff --git a/external_imported/vcpkg/versions/h-/hayai.json b/external_imported/vcpkg/versions/h-/hayai.json
index a5fa0b26b..f446e905c 100644
--- a/external_imported/vcpkg/versions/h-/hayai.json
+++ b/external_imported/vcpkg/versions/h-/hayai.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "e016dbda8d2a5e66c6e9c50c6c819454fbebd341",
+      "version-date": "2019-08-10",
+      "port-version": 3
+    },
+    {
+      "git-tree": "068157b1c13d6e05c56cecb01eb18431402e69e2",
+      "version-date": "2019-08-10",
+      "port-version": 2
+    },
     {
       "git-tree": "fd5029e80c71cecda898075929dd64666be78885",
       "version-string": "2019-08-10",
diff --git a/external_imported/vcpkg/versions/h-/hazelcast-cpp-client.json b/external_imported/vcpkg/versions/h-/hazelcast-cpp-client.json
index ddb757f8e..c3b71d6c4 100644
--- a/external_imported/vcpkg/versions/h-/hazelcast-cpp-client.json
+++ b/external_imported/vcpkg/versions/h-/hazelcast-cpp-client.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4940909398dd70e7610c314749ca143bb0c23918",
+      "version": "5.3.0",
+      "port-version": 0
+    },
     {
       "git-tree": "eda58413d2940bc24bef92485ff1fce31e2e583c",
       "version": "5.2.0",
diff --git a/external_imported/vcpkg/versions/h-/hdf5.json b/external_imported/vcpkg/versions/h-/hdf5.json
index cf4c99d6d..e2d073401 100644
--- a/external_imported/vcpkg/versions/h-/hdf5.json
+++ b/external_imported/vcpkg/versions/h-/hdf5.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "24055818f16022ee4fe1feca4008df0a20d2cdb1",
+      "version": "1.14.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "1266e52ebeeb58e015af053d4e87e5356efe130e",
+      "version": "1.14.0",
+      "port-version": 1
+    },
     {
       "git-tree": "a4600f49dc4a0f8d522a408fb5486b77ce6ae7ed",
       "version": "1.14.0",
diff --git a/external_imported/vcpkg/versions/h-/healpix.json b/external_imported/vcpkg/versions/h-/healpix.json
index a85f5293c..ee4220feb 100644
--- a/external_imported/vcpkg/versions/h-/healpix.json
+++ b/external_imported/vcpkg/versions/h-/healpix.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8785aa8b74708a7614b1bcdc71f9ce46d4dca27b",
+      "version": "1.12.10",
+      "port-version": 9
+    },
     {
       "git-tree": "38bd9d397f3ba4e227f09a36ecb0af034f5f0c98",
       "version-string": "1.12.10",
diff --git a/external_imported/vcpkg/versions/h-/hello-imgui.json b/external_imported/vcpkg/versions/h-/hello-imgui.json
new file mode 100644
index 000000000..3f7cec428
--- /dev/null
+++ b/external_imported/vcpkg/versions/h-/hello-imgui.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "5ecf61526918746249b229e66d820f4da98e0c5a",
+      "version": "1.4.2",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/h-/hffix.json b/external_imported/vcpkg/versions/h-/hffix.json
index 0b6f095fb..dee2f129b 100644
--- a/external_imported/vcpkg/versions/h-/hffix.json
+++ b/external_imported/vcpkg/versions/h-/hffix.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3aab9fe5c85f6055d5df986ca8c6a8e67cd7014c",
+      "version": "1.3.0",
+      "port-version": 0
+    },
     {
       "git-tree": "ae376d1e63858194fc64a2c32221d273d0e2d953",
       "version": "1.2.1",
diff --git a/external_imported/vcpkg/versions/h-/hidapi.json b/external_imported/vcpkg/versions/h-/hidapi.json
index 22044b723..343bc2822 100644
--- a/external_imported/vcpkg/versions/h-/hidapi.json
+++ b/external_imported/vcpkg/versions/h-/hidapi.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ef7fae56bd9bec8a3b50d4ab3f87ba7537ea330b",
+      "version-semver": "0.14.0",
+      "port-version": 0
+    },
     {
       "git-tree": "7deb8cf068244c5583ce565bf1d302b369ed622b",
       "version-semver": "0.13.1",
diff --git a/external_imported/vcpkg/versions/h-/highfive.json b/external_imported/vcpkg/versions/h-/highfive.json
index cf55ddfb0..16c78707b 100644
--- a/external_imported/vcpkg/versions/h-/highfive.json
+++ b/external_imported/vcpkg/versions/h-/highfive.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "a51e538002dbc46c5fbe1f2fec622387acd3742b",
+      "version": "2.9.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2eb72663fb8f48a01e0caaef98c56d8cf60ffdf7",
+      "version": "2.7.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "de97a368e21a37ade6556f064c16409a0a3132dd",
+      "version": "2.7.1",
+      "port-version": 0
+    },
     {
       "git-tree": "6139bdb8e7791f8cc8cf5a355dad303f277e2c6e",
       "version": "2.6.2",
diff --git a/external_imported/vcpkg/versions/h-/highs.json b/external_imported/vcpkg/versions/h-/highs.json
new file mode 100644
index 000000000..28519ab17
--- /dev/null
+++ b/external_imported/vcpkg/versions/h-/highs.json
@@ -0,0 +1,19 @@
+{
+  "versions": [
+    {
+      "git-tree": "70dcabf84d768dffa37123812c300637dc9231a5",
+      "version": "1.6.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "bf3c23e1f9f53ae9d35cd62b49a064556bf9ec13",
+      "version": "1.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0480e56032ae6758dd2e09528a02ab5bc175b537",
+      "version": "1.5.1",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/h-/highway.json b/external_imported/vcpkg/versions/h-/highway.json
index db26d1902..2f93afb33 100644
--- a/external_imported/vcpkg/versions/h-/highway.json
+++ b/external_imported/vcpkg/versions/h-/highway.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "38d663dc2875706f01a199516d1c3ddef59296e7",
+      "version": "1.0.7",
+      "port-version": 0
+    },
+    {
+      "git-tree": "221bc90fda5b814132f77cac6e28750dc7525323",
+      "version": "1.0.6",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d516ee6b19d52dce62aae1d9ced2b7d9b18cb5cf",
+      "version": "1.0.4",
+      "port-version": 0
+    },
     {
       "git-tree": "c5445e6987068f7752475cf5f26c3402d3d8ef82",
       "version-semver": "1.0.3",
diff --git a/external_imported/vcpkg/versions/h-/hikogui.json b/external_imported/vcpkg/versions/h-/hikogui.json
index 2bc102777..6607857d1 100644
--- a/external_imported/vcpkg/versions/h-/hikogui.json
+++ b/external_imported/vcpkg/versions/h-/hikogui.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "d007fc919e0734e139f89d285000d2d166315f73",
+      "version": "0.8.1",
+      "port-version": 2
+    },
+    {
+      "git-tree": "89a94b29c6cf63fb3e99c979281751279f02031e",
+      "version": "0.8.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "92a9a5aedbc104981ec2fe41b097e8f2c65896f7",
+      "version": "0.8.1",
+      "port-version": 0
+    },
     {
       "git-tree": "3ed99f330c9de6be97e6e2e25c3ff55080fbbcd5",
       "version": "0.7.0",
diff --git a/external_imported/vcpkg/versions/h-/hiredis.json b/external_imported/vcpkg/versions/h-/hiredis.json
index 2c59b0b7f..d5f2e1b4b 100644
--- a/external_imported/vcpkg/versions/h-/hiredis.json
+++ b/external_imported/vcpkg/versions/h-/hiredis.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "4a9b927af18cb3f5df500b3ee1ea49ac734910cd",
+      "version": "1.2.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "863fe622cf3050ab1722a81950283e9a354da473",
+      "version": "1.1.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "413b1dbea0dd87e4a12a646ba12411d319e5bf38",
+      "version": "1.0.2",
+      "port-version": 5
+    },
     {
       "git-tree": "448374fa990c04aa7964508d32817a6d7868600b",
       "version": "1.0.2",
diff --git a/external_imported/vcpkg/versions/h-/hnswlib.json b/external_imported/vcpkg/versions/h-/hnswlib.json
index 1ed277d68..45b276ae1 100644
--- a/external_imported/vcpkg/versions/h-/hnswlib.json
+++ b/external_imported/vcpkg/versions/h-/hnswlib.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "e476d41813814f2180e5a898c81ca394339c4cf3",
+      "version": "0.8.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "497030f03d37d63ff86c9e99d24d9e8f048ea067",
+      "version": "0.7.0",
+      "port-version": 1
+    },
     {
       "git-tree": "7053d263445d46410589894d921fa6c85fbf107c",
       "version": "0.7.0",
diff --git a/external_imported/vcpkg/versions/h-/hpx.json b/external_imported/vcpkg/versions/h-/hpx.json
index 7334a4957..0ae7c9f0e 100644
--- a/external_imported/vcpkg/versions/h-/hpx.json
+++ b/external_imported/vcpkg/versions/h-/hpx.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "94d5f165d483752d4b7996bd1414497c5299208f",
+      "version": "1.9.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2d21a35d6723060eccbe376e9e694991cadb90b2",
+      "version": "1.8.1",
+      "port-version": 0
+    },
     {
       "git-tree": "65b93e6c2b9660897d82d6dd32c0edb6689aa6e6",
       "version": "1.8.0",
diff --git a/external_imported/vcpkg/versions/h-/http-parser.json b/external_imported/vcpkg/versions/h-/http-parser.json
index 8ed211695..890105c8f 100644
--- a/external_imported/vcpkg/versions/h-/http-parser.json
+++ b/external_imported/vcpkg/versions/h-/http-parser.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "8da57f708336be4ff2f58ab004147f01708a5cac",
+      "version": "2.9.4",
+      "port-version": 3
+    },
+    {
+      "git-tree": "efc0b81d99faca7a109c910d43816f8fc10470c9",
+      "version": "2.9.4",
+      "port-version": 2
+    },
     {
       "git-tree": "55d462cc4fb637891cc2d1dda24a9bd97c7d38f5",
       "version-string": "2.9.4",
diff --git a/external_imported/vcpkg/versions/h-/hungarian.json b/external_imported/vcpkg/versions/h-/hungarian.json
index 116c8e859..ed272292f 100644
--- a/external_imported/vcpkg/versions/h-/hungarian.json
+++ b/external_imported/vcpkg/versions/h-/hungarian.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "b5060bc0e31ae7abd3c95888c24c9f31ba691885",
+      "version": "0.1.3",
+      "port-version": 3
+    },
+    {
+      "git-tree": "32186cf61ba587da9ed75c14d0a289fbd76080b6",
+      "version-string": "v0.1.3",
+      "port-version": 2
+    },
     {
       "git-tree": "4440d428d76082b3b8af21c5eda247a33794b4ef",
       "version-string": "v0.1.3",
diff --git a/external_imported/vcpkg/versions/h-/hunspell.json b/external_imported/vcpkg/versions/h-/hunspell.json
index 2388fc117..4ea29fa14 100644
--- a/external_imported/vcpkg/versions/h-/hunspell.json
+++ b/external_imported/vcpkg/versions/h-/hunspell.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "adbb8a9460f3c540d3d5719c519c32b97b3f5844",
+      "version": "1.7.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "661af60066452aeb627f9cf0675303b7ac677a02",
+      "version": "1.7.1",
+      "port-version": 4
+    },
+    {
+      "git-tree": "798ac2e490d16afc2713b95740101c03fa555f84",
+      "version": "1.7.1",
+      "port-version": 3
+    },
     {
       "git-tree": "eb238e0094c8177b2b9ddfe8146c5e516ccbb7dc",
       "version": "1.7.1",
diff --git a/external_imported/vcpkg/versions/h-/hwloc.json b/external_imported/vcpkg/versions/h-/hwloc.json
index cff54c680..ea61f0b69 100644
--- a/external_imported/vcpkg/versions/h-/hwloc.json
+++ b/external_imported/vcpkg/versions/h-/hwloc.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "f21a1b350aea6164f80b41c45980189c6d561ffa",
+      "version": "2.10.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8c536aed23026d6f8a30f1815e47f30652112c22",
+      "version": "2.9.3",
+      "port-version": 0
+    },
     {
       "git-tree": "a5178039005718c78a3a9a0386fb4e6113797576",
       "version": "2.9.0",
diff --git a/external_imported/vcpkg/versions/h-/hyperscan.json b/external_imported/vcpkg/versions/h-/hyperscan.json
index 432e36530..2dfb8c0b2 100644
--- a/external_imported/vcpkg/versions/h-/hyperscan.json
+++ b/external_imported/vcpkg/versions/h-/hyperscan.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "174fd7953b696f08703b580901a840cc53157439",
+      "version": "5.4.2",
+      "port-version": 0
+    },
     {
       "git-tree": "72c36aba3fff7cd403bdf02ad8f691ced9da30a9",
       "version": "5.4.0",
diff --git a/external_imported/vcpkg/versions/h-/hypre.json b/external_imported/vcpkg/versions/h-/hypre.json
index 758633abb..67e936f1c 100644
--- a/external_imported/vcpkg/versions/h-/hypre.json
+++ b/external_imported/vcpkg/versions/h-/hypre.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "c86dd4b42c27ebdfbfa8c276e3e1b1d8f9ca7333",
+      "version": "2.29.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "bb61b149787c812f654a86f6863a6e4b8cb011cb",
+      "version": "2.29.0",
+      "port-version": 0
+    },
     {
       "git-tree": "8e59caf45e83417ef29aec09ecb532d5e39ef6b5",
       "version": "2.23.0",
diff --git a/external_imported/vcpkg/versions/i-/icu.json b/external_imported/vcpkg/versions/i-/icu.json
index 6448300dc..69924c967 100644
--- a/external_imported/vcpkg/versions/i-/icu.json
+++ b/external_imported/vcpkg/versions/i-/icu.json
@@ -1,5 +1,40 @@
 {
   "versions": [
+    {
+      "git-tree": "8fda8f4d0ca5b0a97ac61432d85ad0449995a763",
+      "version": "74.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "0a6f5ea29d6445c8af30f19952c62cc5dd5e2a5b",
+      "version": "74.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b6ac20c2420a4f7118d5db326c8c599e50b2c5a4",
+      "version": "73.1",
+      "port-version": 2
+    },
+    {
+      "git-tree": "deb5694d7965a264d6eb579df49aff4fe6362c24",
+      "version": "73.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "acc3cf9137af5fc8fdd3e8607377026cf88f144d",
+      "version": "73.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c1735b83e7793135a9d1e3689f7d36475f6d5ff7",
+      "version": "72.1",
+      "port-version": 5
+    },
+    {
+      "git-tree": "1a0b575f86d37844108f940fd5f6a312a68d234c",
+      "version": "72.1",
+      "port-version": 4
+    },
     {
       "git-tree": "36a3246630c4794b3781e881e5a57db36092deea",
       "version": "72.1",
diff --git a/external_imported/vcpkg/versions/i-/ideviceinstaller.json b/external_imported/vcpkg/versions/i-/ideviceinstaller.json
index cf24d12e2..b8f1d1fdd 100644
--- a/external_imported/vcpkg/versions/i-/ideviceinstaller.json
+++ b/external_imported/vcpkg/versions/i-/ideviceinstaller.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "eff7fcd07b94280ed7c5517ac113b95b3b3bd6a3",
+      "version-date": "2023-07-21",
+      "port-version": 0
+    },
+    {
+      "git-tree": "7aba247c233ef7200fd22094b8a44c7c836a62d8",
+      "version": "1.1.2.23",
+      "port-version": 7
+    },
+    {
+      "git-tree": "7e90c045618ecd5001790b38c44567d47397801e",
+      "version": "1.1.2.23",
+      "port-version": 6
+    },
     {
       "git-tree": "3e54543ef504b74edb836a2c47abb3845b83b7c3",
       "version": "1.1.2.23",
diff --git a/external_imported/vcpkg/versions/i-/idevicerestore.json b/external_imported/vcpkg/versions/i-/idevicerestore.json
index 1db7a148e..60f2555a6 100644
--- a/external_imported/vcpkg/versions/i-/idevicerestore.json
+++ b/external_imported/vcpkg/versions/i-/idevicerestore.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "b2bbff840af200a3f2b21b5d19f95f223aca4428",
+      "version-date": "2023-05-23",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6d1dcd84f69fa4a5006fd26741e2dfd6fbf38a16",
+      "version": "1.0.12",
+      "port-version": 8
+    },
     {
       "git-tree": "0269d10da20f4f0b8d1317f21b71a7e8cac0ff16",
       "version": "1.0.12",
diff --git a/external_imported/vcpkg/versions/i-/idyntree.json b/external_imported/vcpkg/versions/i-/idyntree.json
new file mode 100644
index 000000000..e21ba6552
--- /dev/null
+++ b/external_imported/vcpkg/versions/i-/idyntree.json
@@ -0,0 +1,24 @@
+{
+  "versions": [
+    {
+      "git-tree": "d1899c3e91178e266bedb71a79fcf173f009db6b",
+      "version": "10.0.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "50658eb0c1ccc3ada2d91638cddb51bec93dd2c5",
+      "version": "9.0.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "4c7bc2d8282bf918d6be1b0b63af3f4612e673ef",
+      "version": "9.0.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "65e8740ace938a59b21dc97e30ab531c005ce399",
+      "version": "8.1.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/i-/if97.json b/external_imported/vcpkg/versions/i-/if97.json
index 0bf82e794..4b7c4a44f 100644
--- a/external_imported/vcpkg/versions/i-/if97.json
+++ b/external_imported/vcpkg/versions/i-/if97.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2177f39e3ea1add06da2e665c0e34d2f620ec9a5",
+      "version": "2.1.3",
+      "port-version": 1
+    },
     {
       "git-tree": "71c163c4d2b1ef30310ba2c87ce66fa6f616034c",
       "version": "2.1.3",
diff --git a/external_imported/vcpkg/versions/i-/igloo.json b/external_imported/vcpkg/versions/i-/igloo.json
index 928dbfd5e..511acffc2 100644
--- a/external_imported/vcpkg/versions/i-/igloo.json
+++ b/external_imported/vcpkg/versions/i-/igloo.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "92673b7970f94973bcdb16ac50a37555128353a0",
+      "version": "1.1.1",
+      "port-version": 2
+    },
     {
       "git-tree": "6ff1a6861322e6b0084c5f74a014a386a5e1040b",
       "version-string": "1.1.1",
diff --git a/external_imported/vcpkg/versions/i-/ignition-cmake2.json b/external_imported/vcpkg/versions/i-/ignition-cmake2.json
index 6841d81aa..86ddc0d2f 100644
--- a/external_imported/vcpkg/versions/i-/ignition-cmake2.json
+++ b/external_imported/vcpkg/versions/i-/ignition-cmake2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b27712039b4d79cf56407894ede3681292712649",
+      "version": "2.16.0",
+      "port-version": 2
+    },
     {
       "git-tree": "fefe057cb14c0f698b0ebb1a717b5bba189ab355",
       "version": "2.16.0",
diff --git a/external_imported/vcpkg/versions/i-/ignition-common1.json b/external_imported/vcpkg/versions/i-/ignition-common1.json
index 8ec4ff082..0543274dc 100644
--- a/external_imported/vcpkg/versions/i-/ignition-common1.json
+++ b/external_imported/vcpkg/versions/i-/ignition-common1.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c41c38488af45c9721e56792886250ef144bc050",
+      "version": "1.1.1",
+      "port-version": 4
+    },
     {
       "git-tree": "7759642adcf3e61cc1ce5b55699db02d31a94591",
       "version": "1.1.1",
diff --git a/external_imported/vcpkg/versions/i-/ignition-common3.json b/external_imported/vcpkg/versions/i-/ignition-common3.json
index 375f3e432..bdd40778d 100644
--- a/external_imported/vcpkg/versions/i-/ignition-common3.json
+++ b/external_imported/vcpkg/versions/i-/ignition-common3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ae2e9feb5941cbe46f6aeaa757078c0074ed33fe",
+      "version": "3.16.0",
+      "port-version": 0
+    },
     {
       "git-tree": "f63b7872dccdd6f71e0a075ea4bbf677c679a9d8",
       "version": "3.14.1",
diff --git a/external_imported/vcpkg/versions/i-/ignition-math6.json b/external_imported/vcpkg/versions/i-/ignition-math6.json
index 39bd611e6..4d790ebb0 100644
--- a/external_imported/vcpkg/versions/i-/ignition-math6.json
+++ b/external_imported/vcpkg/versions/i-/ignition-math6.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fc4451a5996b8de09041e1aac247380197feb780",
+      "version": "6.14.0",
+      "port-version": 0
+    },
     {
       "git-tree": "4c64259804945e426650515f5de69bb29107a167",
       "version": "6.9.2",
diff --git a/external_imported/vcpkg/versions/i-/ignition-modularscripts.json b/external_imported/vcpkg/versions/i-/ignition-modularscripts.json
index 1ee29b448..f217614af 100644
--- a/external_imported/vcpkg/versions/i-/ignition-modularscripts.json
+++ b/external_imported/vcpkg/versions/i-/ignition-modularscripts.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "f770940cc2085c2f24a1673730fd8d642b49717f",
+      "version-date": "2023-05-05",
+      "port-version": 0
+    },
+    {
+      "git-tree": "bc5dc2fa00b5023e9f2fa1610a986e8d61874380",
+      "version-date": "2022-05-11",
+      "port-version": 2
+    },
     {
       "git-tree": "ae302700b77870b26543f2df7764304d848c198a",
       "version-date": "2022-05-11",
diff --git a/external_imported/vcpkg/versions/i-/ignition-plugin1.json b/external_imported/vcpkg/versions/i-/ignition-plugin1.json
index b9db2a478..86ea40991 100644
--- a/external_imported/vcpkg/versions/i-/ignition-plugin1.json
+++ b/external_imported/vcpkg/versions/i-/ignition-plugin1.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "193fcc24d2558a5edd5b4907344048e8562bc669",
+      "version": "1.4.0",
+      "port-version": 0
+    },
     {
       "git-tree": "1f04ba4b936f3f2885c7a463d2a86a1359990931",
       "version": "1.1.0",
diff --git a/external_imported/vcpkg/versions/i-/ignition-tools.json b/external_imported/vcpkg/versions/i-/ignition-tools.json
index 27201bf42..8e3a024b4 100644
--- a/external_imported/vcpkg/versions/i-/ignition-tools.json
+++ b/external_imported/vcpkg/versions/i-/ignition-tools.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b47d5830dfaf7b6f136f5b26002b50adb0804bde",
+      "version": "1.5.0",
+      "port-version": 1
+    },
     {
       "git-tree": "5567f256c2183bacba71d78d26362a1b76021bcf",
       "version": "1.5.0",
diff --git a/external_imported/vcpkg/versions/i-/ignition-utils1.json b/external_imported/vcpkg/versions/i-/ignition-utils1.json
index 557ef4099..439b5022e 100644
--- a/external_imported/vcpkg/versions/i-/ignition-utils1.json
+++ b/external_imported/vcpkg/versions/i-/ignition-utils1.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e7d8c75978b3991ee12215ce61e06993e30634aa",
+      "version": "1.5.1",
+      "port-version": 0
+    },
     {
       "git-tree": "020c2c9b24d3d0a0d627a762e4c780ba1af2e154",
       "version": "1.4.0",
diff --git a/external_imported/vcpkg/versions/i-/igraph.json b/external_imported/vcpkg/versions/i-/igraph.json
index 8483314bc..4aa651f7a 100644
--- a/external_imported/vcpkg/versions/i-/igraph.json
+++ b/external_imported/vcpkg/versions/i-/igraph.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "ddeb7519cb4fd801586272d469754459764856d3",
+      "version": "0.10.9",
+      "port-version": 0
+    },
+    {
+      "git-tree": "252ff6ec89848e702d2d587d52ea161d317a7961",
+      "version": "0.10.8",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ebbf67005ba6625597ef12c78cccf2d67854701d",
+      "version": "0.10.7",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9af4a5b0f4764e59cb3c107a55646b9c26555aaf",
+      "version": "0.10.6",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8c7854267587378a0a276b4cba6267d950042f77",
+      "version": "0.10.5",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b366fc43d220a0243a9e16860dee50c62ea4cf35",
+      "version": "0.10.4",
+      "port-version": 1
+    },
     {
       "git-tree": "6821431944042e175acb75af3e2164949361f887",
       "version": "0.10.4",
diff --git a/external_imported/vcpkg/versions/i-/iir1.json b/external_imported/vcpkg/versions/i-/iir1.json
index 3d176ff4d..a303a1549 100644
--- a/external_imported/vcpkg/versions/i-/iir1.json
+++ b/external_imported/vcpkg/versions/i-/iir1.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a2d76abe2dc41ff907a66db3a54a510edc322d2d",
+      "version": "1.9.4",
+      "port-version": 0
+    },
     {
       "git-tree": "b684559e0b19d393deae83fdf6e2182937942a76",
       "version": "1.9.1",
diff --git a/external_imported/vcpkg/versions/i-/ijg-libjpeg.json b/external_imported/vcpkg/versions/i-/ijg-libjpeg.json
index ab35bd732..4c3da57e5 100644
--- a/external_imported/vcpkg/versions/i-/ijg-libjpeg.json
+++ b/external_imported/vcpkg/versions/i-/ijg-libjpeg.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e5d413cf2a1c70df27136df1328ba1c344eb935a",
+      "version-string": "9e",
+      "port-version": 1
+    },
     {
       "git-tree": "fb37d14790c59df2657d83e21009faa54643f19d",
       "version-string": "9e",
diff --git a/external_imported/vcpkg/versions/i-/imageinfo.json b/external_imported/vcpkg/versions/i-/imageinfo.json
index c70ad20e5..a5999ca03 100644
--- a/external_imported/vcpkg/versions/i-/imageinfo.json
+++ b/external_imported/vcpkg/versions/i-/imageinfo.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "08efe02a552cf7bce5a61a088fa5768dd4b4d84d",
+      "version-date": "2024-01-19",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0061c49ae5be9cb32e197fd56a0a71e793d49f42",
+      "version-date": "2023-12-25",
+      "port-version": 0
+    },
     {
       "git-tree": "66f45650934f8561d3779ca4a29d808b8d1cea98",
       "version-date": "2023-01-31",
diff --git a/external_imported/vcpkg/versions/i-/imath.json b/external_imported/vcpkg/versions/i-/imath.json
index f1385c4d1..a04da5782 100644
--- a/external_imported/vcpkg/versions/i-/imath.json
+++ b/external_imported/vcpkg/versions/i-/imath.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "47c02f0c550c3639178d554a27475f376c2fdcbc",
+      "version": "3.1.9",
+      "port-version": 1
+    },
+    {
+      "git-tree": "1853273c56448fff5ec5e2c9133895922df682bd",
+      "version": "3.1.9",
+      "port-version": 0
+    },
     {
       "git-tree": "e72149f2fce9434300bbdd84562ad7a58aa4ac90",
       "version": "3.1.5",
diff --git a/external_imported/vcpkg/versions/i-/imgui-node-editor.json b/external_imported/vcpkg/versions/i-/imgui-node-editor.json
new file mode 100644
index 000000000..d22e01fd9
--- /dev/null
+++ b/external_imported/vcpkg/versions/i-/imgui-node-editor.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "b660409ffe6d690ff6a3fae999b249e4521b5583",
+      "version": "0.9.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "26e2cf3260ea1e08e61912431635f49d24b6ea87",
+      "version": "0.9.2",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/i-/imgui-sfml.json b/external_imported/vcpkg/versions/i-/imgui-sfml.json
index 1946aff9d..912d81d20 100644
--- a/external_imported/vcpkg/versions/i-/imgui-sfml.json
+++ b/external_imported/vcpkg/versions/i-/imgui-sfml.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "534384362159db50f833348914cf01bd8c1fb648",
+      "version": "2.6",
+      "port-version": 0
+    },
+    {
+      "git-tree": "62fe2b504e6630d4d191ba92ffb288e109260835",
+      "version": "2.5",
+      "port-version": 4
+    },
     {
       "git-tree": "824afd9c0aaca961fb9346dff3a957b26ee5eb2c",
       "version": "2.5",
diff --git a/external_imported/vcpkg/versions/i-/imgui.json b/external_imported/vcpkg/versions/i-/imgui.json
index f3fd02c6b..a5f6dbbbb 100644
--- a/external_imported/vcpkg/versions/i-/imgui.json
+++ b/external_imported/vcpkg/versions/i-/imgui.json
@@ -1,5 +1,60 @@
 {
   "versions": [
+    {
+      "git-tree": "0c0f46ea7e2a764b13e8dcf7348ce9c29923836c",
+      "version": "1.90",
+      "port-version": 4
+    },
+    {
+      "git-tree": "12ab98a00e6c2eda3393c25bda6458194d0cc42c",
+      "version": "1.90",
+      "port-version": 3
+    },
+    {
+      "git-tree": "a9fd7997ab3813f71b87171213ea8fbd4e70b863",
+      "version": "1.90",
+      "port-version": 2
+    },
+    {
+      "git-tree": "027b657658f9b4dd643fd35895496c685d300021",
+      "version": "1.90",
+      "port-version": 1
+    },
+    {
+      "git-tree": "f570e820b63f5f087134076b2343e390eb62daad",
+      "version": "1.90",
+      "port-version": 0
+    },
+    {
+      "git-tree": "37d78911bfdf98548568771acd72f7e6a88d1e58",
+      "version": "1.89.9",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5be94cd09a52d92e1ad194fa7f29846619529be2",
+      "version": "1.89.7",
+      "port-version": 1
+    },
+    {
+      "git-tree": "9b44fd53ec5a9aa2f9b272bab4a9a5d97e0aa82f",
+      "version": "1.89.7",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a6ac001e889c4162a36f628cbfd921aadcb1b602",
+      "version": "1.89.6",
+      "port-version": 1
+    },
+    {
+      "git-tree": "0250b6b7e1c8c70d405ba160e85ee153118fb23e",
+      "version": "1.89.6",
+      "port-version": 0
+    },
+    {
+      "git-tree": "68cf6847418f27dbd3ae70c557b1ef1357875fa1",
+      "version": "1.89.4",
+      "port-version": 1
+    },
     {
       "git-tree": "337ea84e098e85d4706ecdd807fe292933d9e6f8",
       "version": "1.89.4",
diff --git a/external_imported/vcpkg/versions/i-/immer.json b/external_imported/vcpkg/versions/i-/immer.json
index 4874b8925..4f5e56105 100644
--- a/external_imported/vcpkg/versions/i-/immer.json
+++ b/external_imported/vcpkg/versions/i-/immer.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9495490d64d82334b0cf687ceb2ba810d14b7755",
+      "version": "0.8.1",
+      "port-version": 0
+    },
     {
       "git-tree": "e133c376f7ef7d4e7c8b78245b70231e8df5b601",
       "version": "0.8.0",
diff --git a/external_imported/vcpkg/versions/i-/implot.json b/external_imported/vcpkg/versions/i-/implot.json
index 1b0165739..61f00acd7 100644
--- a/external_imported/vcpkg/versions/i-/implot.json
+++ b/external_imported/vcpkg/versions/i-/implot.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "688b48b9fc371ad59a57d92b05d7fd3699c4a57e",
+      "version": "0.16",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8cd7aca733072549426cfb1e309c4831340713b1",
+      "version": "0.15",
+      "port-version": 1
+    },
+    {
+      "git-tree": "67023cbc6fc4301549ef49fa263c70995d693cf5",
+      "version": "0.15",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3ecadd10832f0628f406b27e5470c3d35db6824c",
+      "version": "0.14",
+      "port-version": 2
+    },
     {
       "git-tree": "d43f2b42e6c869ff277987364c11f7c1e6e01938",
       "version": "0.14",
diff --git a/external_imported/vcpkg/versions/i-/indicators.json b/external_imported/vcpkg/versions/i-/indicators.json
index 014ea5458..349176c34 100644
--- a/external_imported/vcpkg/versions/i-/indicators.json
+++ b/external_imported/vcpkg/versions/i-/indicators.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8677c687ae2c0aebadf9db2535ac7af952b64661",
+      "version": "2.3",
+      "port-version": 0
+    },
     {
       "git-tree": "1f6f4a44b4af9900116de9bd567e78372d3f7278",
       "version": "2.2",
diff --git a/external_imported/vcpkg/versions/i-/indirect-value.json b/external_imported/vcpkg/versions/i-/indirect-value.json
new file mode 100644
index 000000000..6c311f592
--- /dev/null
+++ b/external_imported/vcpkg/versions/i-/indirect-value.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "d62fd633114abe776446de54ddae3249cb4e7617",
+      "version-date": "2023-06-01",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/i-/influxdb-cxx.json b/external_imported/vcpkg/versions/i-/influxdb-cxx.json
index 0318e65be..a9b69f080 100644
--- a/external_imported/vcpkg/versions/i-/influxdb-cxx.json
+++ b/external_imported/vcpkg/versions/i-/influxdb-cxx.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "d2b48983d5264e3524e619757f16eac814337ecb",
+      "version": "0.7.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "d03720b58912770380a8101fdbb729a57598a904",
+      "version": "0.7.1",
+      "port-version": 0
+    },
     {
       "git-tree": "4eba82142d2afb448bc5295fe22e0849cd0f8ca7",
       "version-date": "2022-09-02",
diff --git a/external_imported/vcpkg/versions/i-/infoware.json b/external_imported/vcpkg/versions/i-/infoware.json
index 7c148d6b7..1adf69d07 100644
--- a/external_imported/vcpkg/versions/i-/infoware.json
+++ b/external_imported/vcpkg/versions/i-/infoware.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "10ceed518afc0c84b79aa36c1263a034b320511e",
+      "version-date": "2023-04-12",
+      "port-version": 0
+    },
     {
       "git-tree": "5501ab1b5d5391ca168856f073f6a46d5ea83268",
       "version-date": "2021-06-16",
diff --git a/external_imported/vcpkg/versions/i-/inih.json b/external_imported/vcpkg/versions/i-/inih.json
index 000f4f53b..1768adc13 100644
--- a/external_imported/vcpkg/versions/i-/inih.json
+++ b/external_imported/vcpkg/versions/i-/inih.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c5a05cc38f61274fdbef602c91505397b7cd43e8",
+      "version": "57",
+      "port-version": 0
+    },
     {
       "git-tree": "ccae9a4d18198ac2d9303cac12c4dbb1fbe0bf24",
       "version": "56",
diff --git a/external_imported/vcpkg/versions/i-/iniparser.json b/external_imported/vcpkg/versions/i-/iniparser.json
index a52fdeec1..5efd9a7e4 100644
--- a/external_imported/vcpkg/versions/i-/iniparser.json
+++ b/external_imported/vcpkg/versions/i-/iniparser.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "1f0fd9b0b224858a2bba125fae9cbfaa899e954b",
+      "version-date": "2020-04-06",
+      "port-version": 5
+    },
+    {
+      "git-tree": "e9b64e1b73f6befd9a565c43f5bbe4757fdd0a75",
+      "version-date": "2020-04-06",
+      "port-version": 4
+    },
     {
       "git-tree": "b1a9b214d253fa9d677b4ed158bd5e0d0e4e8a31",
       "version-date": "2020-04-06",
diff --git a/external_imported/vcpkg/versions/i-/intel-mkl.json b/external_imported/vcpkg/versions/i-/intel-mkl.json
index c0d958ef4..7045e4a98 100644
--- a/external_imported/vcpkg/versions/i-/intel-mkl.json
+++ b/external_imported/vcpkg/versions/i-/intel-mkl.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "3dd3ebb16924351eed10c170704517f54a72f274",
+      "version": "2023.0.0",
+      "port-version": 3
+    },
+    {
+      "git-tree": "2d2adb8cb7c54dd3dc17a92c22db24204c638e72",
+      "version": "2023.0.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "285fa0de9d6f05022ce06e53f7c8c21048ff586f",
+      "version": "2023.0.0",
+      "port-version": 1
+    },
     {
       "git-tree": "e5a15d03509e3eaf676a2e3ec935acff7fbb9285",
       "version": "2023.0.0",
diff --git a/external_imported/vcpkg/versions/i-/intelrdfpmathlib.json b/external_imported/vcpkg/versions/i-/intelrdfpmathlib.json
index fdeefa02e..b8d448fc2 100644
--- a/external_imported/vcpkg/versions/i-/intelrdfpmathlib.json
+++ b/external_imported/vcpkg/versions/i-/intelrdfpmathlib.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "7cf5496b9f4fbf09ed05be9b87e063a0094ac331",
+      "version-string": "20U2",
+      "port-version": 6
+    },
+    {
+      "git-tree": "c829bd814e973cf55e135f1d9e50a36b9d73d551",
+      "version-string": "20U2",
+      "port-version": 5
+    },
     {
       "git-tree": "47e6c0bf433235a53c450a3c1c61388a10a643e0",
       "version-string": "20U2",
diff --git a/external_imported/vcpkg/versions/i-/io2d.json b/external_imported/vcpkg/versions/i-/io2d.json
index a6c53b3c8..1d5099ef8 100644
--- a/external_imported/vcpkg/versions/i-/io2d.json
+++ b/external_imported/vcpkg/versions/i-/io2d.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "662e296b47ae6e51ee6e96470833c87d7728714d",
+      "version-date": "2020-09-14",
+      "port-version": 5
+    },
+    {
+      "git-tree": "3acb6249cb7bf330233e36df8cde602597abcac5",
+      "version-date": "2020-09-14",
+      "port-version": 4
+    },
     {
       "git-tree": "281370843416f78e7c715a85db1b5754253b38ed",
       "version-date": "2020-09-14",
diff --git a/external_imported/vcpkg/versions/i-/irrlicht.json b/external_imported/vcpkg/versions/i-/irrlicht.json
index 39261a9df..f9d7634c4 100644
--- a/external_imported/vcpkg/versions/i-/irrlicht.json
+++ b/external_imported/vcpkg/versions/i-/irrlicht.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "708fa654ac49d99ff5c6a3146c806d576b1b94a3",
+      "version": "1.8.5",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a66d1403393733885e625b5f95fc1b7d3ed03505",
+      "version": "1.8.4",
+      "port-version": 14
+    },
     {
       "git-tree": "a824dffa239fccbb9b780c9926c91f1a25d000df",
       "version-string": "1.8.4",
diff --git a/external_imported/vcpkg/versions/i-/irrxml.json b/external_imported/vcpkg/versions/i-/irrxml.json
index a5d182df8..b9aa9cd86 100644
--- a/external_imported/vcpkg/versions/i-/irrxml.json
+++ b/external_imported/vcpkg/versions/i-/irrxml.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "85d4823526e4e7475669d2657e978382e23fddaa",
+      "version": "0",
+      "port-version": 1
+    },
     {
       "git-tree": "3bce4522729dab80e9a91571a9b772ac05970974",
       "version-string": "0",
diff --git a/external_imported/vcpkg/versions/i-/ismrmrd.json b/external_imported/vcpkg/versions/i-/ismrmrd.json
index b1faa991d..7a4ee9834 100644
--- a/external_imported/vcpkg/versions/i-/ismrmrd.json
+++ b/external_imported/vcpkg/versions/i-/ismrmrd.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "2d06eae0d931f4c173562d89e9b4239f844910ab",
+      "version": "1.13.7",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b378ab76b7b723dd6b9091f897c87b5a99fc11b7",
+      "version": "1.13.2",
+      "port-version": 1
+    },
     {
       "git-tree": "f8f4bb483f585631015c8991706874b535628dec",
       "version": "1.13.2",
diff --git a/external_imported/vcpkg/versions/i-/itay-grudev-singleapplication.json b/external_imported/vcpkg/versions/i-/itay-grudev-singleapplication.json
new file mode 100644
index 000000000..7173a60c1
--- /dev/null
+++ b/external_imported/vcpkg/versions/i-/itay-grudev-singleapplication.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "7b08f908fc4c8f97f323dc6ebbc1562483fded0e",
+      "version": "3.5.1",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/i-/itk.json b/external_imported/vcpkg/versions/i-/itk.json
index b848437c2..924de2af6 100644
--- a/external_imported/vcpkg/versions/i-/itk.json
+++ b/external_imported/vcpkg/versions/i-/itk.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "b74bb68b58026e759112afb8155d44650cee24b4",
+      "version-string": "5.3rc02",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9da4bc8949edd65bc3e0afa8e694480e330f5f40",
+      "version": "5.3-rc02",
+      "port-version": 6
+    },
     {
       "git-tree": "33def29a955f79fae7497d8be276decf175a9881",
       "version": "5.2.1",
diff --git a/external_imported/vcpkg/versions/i-/itpp.json b/external_imported/vcpkg/versions/i-/itpp.json
index 9c7418be6..44d121b8f 100644
--- a/external_imported/vcpkg/versions/i-/itpp.json
+++ b/external_imported/vcpkg/versions/i-/itpp.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "bb2b4a2f0b7fed9c43bf3587695b1c8c99079e32",
+      "version-semver": "4.3.1",
+      "port-version": 10
+    },
+    {
+      "git-tree": "8ba9ee864fcdbf30998904724db69a1cb515ebc2",
+      "version-semver": "4.3.1",
+      "port-version": 9
+    },
     {
       "git-tree": "be87bf8b58b5f6b0fb3f19dfc14acf24114332d0",
       "version-semver": "4.3.1",
diff --git a/external_imported/vcpkg/versions/i-/itsy-bitsy.json b/external_imported/vcpkg/versions/i-/itsy-bitsy.json
new file mode 100644
index 000000000..63647594c
--- /dev/null
+++ b/external_imported/vcpkg/versions/i-/itsy-bitsy.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "47a87b2c492f644c8d64be60e192e2511f725fb3",
+      "version-date": "2022-08-02",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/i-/ixwebsocket.json b/external_imported/vcpkg/versions/i-/ixwebsocket.json
index 0c4f7fde8..f30b38447 100644
--- a/external_imported/vcpkg/versions/i-/ixwebsocket.json
+++ b/external_imported/vcpkg/versions/i-/ixwebsocket.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "f0154088c4d12066bd00f7794ccb90feaa1f3d92",
+      "version-semver": "11.4.4",
+      "port-version": 2
+    },
+    {
+      "git-tree": "5b7a553c76d49514bc70203959be6b7bd4981090",
+      "version-semver": "11.4.4",
+      "port-version": 1
+    },
+    {
+      "git-tree": "8831fc46f1465a5630978a28255c9edab0fed860",
+      "version-semver": "11.4.4",
+      "port-version": 0
+    },
     {
       "git-tree": "c5abcb4348cb05507367eeaac8fb075c5cf8ed35",
       "version-semver": "11.4.3",
diff --git a/external_imported/vcpkg/versions/j-/jack2.json b/external_imported/vcpkg/versions/j-/jack2.json
index a3105dccd..69c82d989 100644
--- a/external_imported/vcpkg/versions/j-/jack2.json
+++ b/external_imported/vcpkg/versions/j-/jack2.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "c91c996f53c11dc1e5d4b3602e78355042f54382",
+      "version-semver": "1.9.22",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a0a0853f6b57a72e4a8d33eb0dd5dd29716224ea",
+      "version-semver": "1.9.21",
+      "port-version": 1
+    },
     {
       "git-tree": "84f683fbf07cae4c021f1d0d5fd5cab7b58d991e",
       "version-semver": "1.9.21",
diff --git a/external_imported/vcpkg/versions/j-/jasper.json b/external_imported/vcpkg/versions/j-/jasper.json
index e9d4e36af..498bc7053 100644
--- a/external_imported/vcpkg/versions/j-/jasper.json
+++ b/external_imported/vcpkg/versions/j-/jasper.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "3155b993a1ac52e0101edecb422a74513fc3a470",
+      "version": "4.1.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "bbbc1e3a2819d3e823e778a5a35045cc44946c23",
+      "version": "4.1.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d7f51c26899ba9433a5a3ab92fc5b5887d5c764c",
+      "version": "4.0.0",
+      "port-version": 2
+    },
     {
       "git-tree": "1da5fa9a12bf207bf641f903856418e3aed7258d",
       "version": "4.0.0",
diff --git a/external_imported/vcpkg/versions/j-/jbig2dec.json b/external_imported/vcpkg/versions/j-/jbig2dec.json
index 7fbff5da5..2f080b961 100644
--- a/external_imported/vcpkg/versions/j-/jbig2dec.json
+++ b/external_imported/vcpkg/versions/j-/jbig2dec.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "d34cf9e520c5866b3facce621e46e438eb1b31c5",
+      "version": "0.20",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ff97df9b9703a6314f50e608b155efb780d6deb7",
+      "version": "0.19",
+      "port-version": 3
+    },
+    {
+      "git-tree": "4622bedc189a466db46f55ab78e895b2c2eb4fef",
+      "version": "0.19",
+      "port-version": 2
+    },
     {
       "git-tree": "e60aa2c30fefe1269d1d8a6fede748cfa5736aed",
       "version-string": "0.19",
diff --git a/external_imported/vcpkg/versions/j-/jbigkit.json b/external_imported/vcpkg/versions/j-/jbigkit.json
index 242ea13a0..d0f0572a0 100644
--- a/external_imported/vcpkg/versions/j-/jbigkit.json
+++ b/external_imported/vcpkg/versions/j-/jbigkit.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "b91151a54db723a66541029866bd3011e405ade9",
+      "version": "2.1",
+      "port-version": 7
+    },
+    {
+      "git-tree": "6d6f0004f10c5977c83106a38debd04554a4b4a7",
+      "version": "2.1",
+      "port-version": 6
+    },
     {
       "git-tree": "fa2f967c15904877cd541d3c9d59f0c2f20f3fb4",
       "version-string": "2.1",
diff --git a/external_imported/vcpkg/versions/j-/jhasse-poly2tri.json b/external_imported/vcpkg/versions/j-/jhasse-poly2tri.json
new file mode 100644
index 000000000..37b96f678
--- /dev/null
+++ b/external_imported/vcpkg/versions/j-/jhasse-poly2tri.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "f66a3f7e61a71546a6aeb3dafddaa1bde7681468",
+      "version-date": "2023-12-27",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/j-/jinja2cpplight.json b/external_imported/vcpkg/versions/j-/jinja2cpplight.json
index 8adffeb62..596f9a173 100644
--- a/external_imported/vcpkg/versions/j-/jinja2cpplight.json
+++ b/external_imported/vcpkg/versions/j-/jinja2cpplight.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "a57eb0a010f89aa5d43a4aba792c4d25dca5af8e",
+      "version-date": "2018-05-08",
+      "port-version": 3
+    },
+    {
+      "git-tree": "a0768865a046b0bd51d90af67d0059c7d158474d",
+      "version-date": "2018-05-08",
+      "port-version": 2
+    },
     {
       "git-tree": "14ce844353cb5d4b2dbca4d36daf84c248208de2",
       "version-string": "2018-05-08",
diff --git a/external_imported/vcpkg/versions/j-/jkqtplotter.json b/external_imported/vcpkg/versions/j-/jkqtplotter.json
new file mode 100644
index 000000000..0e2e35409
--- /dev/null
+++ b/external_imported/vcpkg/versions/j-/jkqtplotter.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "c6818df9457df540c1c0fd88b1ff2da3c844c8fa",
+      "version-date": "2023-10-24",
+      "port-version": 1
+    },
+    {
+      "git-tree": "87ffb0cb05a71f4338bd068bc14a348770b7d4ff",
+      "version-date": "2023-10-24",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/j-/joltphysics.json b/external_imported/vcpkg/versions/j-/joltphysics.json
index 8b953f90f..10e69e578 100644
--- a/external_imported/vcpkg/versions/j-/joltphysics.json
+++ b/external_imported/vcpkg/versions/j-/joltphysics.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "f7ea4a51e3f8cfa76e079f80d8ece87ef6695553",
+      "version": "4.0.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f8fca568d1ae240c8d3ca23ae3b9a09f6fb518ba",
+      "version": "3.0.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "aa3834efa767ca95d2a0f7b367fe4f154101a35e",
+      "version": "3.0.1",
+      "port-version": 0
+    },
     {
       "git-tree": "845755ddfb9fa5d6f88c836cffdb1f497e69ad46",
       "version": "2.0.1",
diff --git a/external_imported/vcpkg/versions/j-/josuttis-jthread.json b/external_imported/vcpkg/versions/j-/josuttis-jthread.json
index 34c83ced9..6d74e8af4 100644
--- a/external_imported/vcpkg/versions/j-/josuttis-jthread.json
+++ b/external_imported/vcpkg/versions/j-/josuttis-jthread.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9d514a02f7eb9cf97eaba9112de40bdf08608fc4",
+      "version-date": "2020-07-21",
+      "port-version": 3
+    },
     {
       "git-tree": "5f37dd21a591e8f7ae566f16a085a10dbfe1ccbc",
       "version-string": "2020-07-21",
diff --git a/external_imported/vcpkg/versions/j-/jsmn.json b/external_imported/vcpkg/versions/j-/jsmn.json
index 9f3ba75be..2634d6a97 100644
--- a/external_imported/vcpkg/versions/j-/jsmn.json
+++ b/external_imported/vcpkg/versions/j-/jsmn.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "953e10924a7606aabb3181ae9bcfb68a6c808b2d",
+      "version-date": "2019-04-27",
+      "port-version": 2
+    },
     {
       "git-tree": "b05c2b522963eeacbcfcad169cf5ffc802bc7a42",
       "version-string": "2019-04-27",
diff --git a/external_imported/vcpkg/versions/j-/json-c.json b/external_imported/vcpkg/versions/j-/json-c.json
index b08334fc8..bc29eb13f 100644
--- a/external_imported/vcpkg/versions/j-/json-c.json
+++ b/external_imported/vcpkg/versions/j-/json-c.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "dcfc2cbe17b88101d8e40f6eb6141b77caff68e9",
+      "version-date": "2023-08-12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "787ad6eeafc631bea9f68c3ad2047a031575bb0f",
+      "version-date": "2022-06-26",
+      "port-version": 3
+    },
     {
       "git-tree": "2090ebb6a6e0be1d0f6331c266bd0bc6eef1cd57",
       "version-date": "2022-06-26",
diff --git a/external_imported/vcpkg/versions/j-/json-dto.json b/external_imported/vcpkg/versions/j-/json-dto.json
index 80ba6b3a8..c88203926 100644
--- a/external_imported/vcpkg/versions/j-/json-dto.json
+++ b/external_imported/vcpkg/versions/j-/json-dto.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "f087895b63b47221f3f3bca7c2b300c05817f0be",
+      "version": "0.3.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "217034e6dfd4139a952dea7e21091522367f8189",
+      "version": "0.3.2",
+      "port-version": 0
+    },
     {
       "git-tree": "39f955915ba68ad247df8963e6427bd3c0f3479a",
       "version": "0.3.1",
diff --git a/external_imported/vcpkg/versions/j-/json-rpc-cxx.json b/external_imported/vcpkg/versions/j-/json-rpc-cxx.json
new file mode 100644
index 000000000..b28d56820
--- /dev/null
+++ b/external_imported/vcpkg/versions/j-/json-rpc-cxx.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "e5c4ccb3e679891167fa7d4b6a14ac5dbae14c40",
+      "version": "0.3.1",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/j-/json-schema-validator.json b/external_imported/vcpkg/versions/j-/json-schema-validator.json
index 4ae8bcba3..11eda9400 100644
--- a/external_imported/vcpkg/versions/j-/json-schema-validator.json
+++ b/external_imported/vcpkg/versions/j-/json-schema-validator.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "31c71975b94068010a3985ac84deed50047c6820",
+      "version": "2.3.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "4466bee34b5544a3ecfaf5f480464b1f9d45e9b1",
+      "version": "2.3.0",
+      "port-version": 0
+    },
     {
       "git-tree": "968aee6b22bf2b1248b38ae25aed43a1760fec0d",
       "version": "2.2.0",
diff --git a/external_imported/vcpkg/versions/j-/json-spirit.json b/external_imported/vcpkg/versions/j-/json-spirit.json
index 8fb1586f2..c40d91d0a 100644
--- a/external_imported/vcpkg/versions/j-/json-spirit.json
+++ b/external_imported/vcpkg/versions/j-/json-spirit.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "a03472c9bc3c75081ffdd05a8aaf9aa4e86b9d01",
+      "version": "4.1.0",
+      "port-version": 4
+    },
+    {
+      "git-tree": "eebfdfbc7a3e422c96bb8c7205f5696dac6d4457",
+      "version": "4.1.0",
+      "port-version": 3
+    },
     {
       "git-tree": "d219034cdee1f6237e4863a001aece539df2ce8c",
       "version-string": "4.1.0",
diff --git a/external_imported/vcpkg/versions/j-/json11.json b/external_imported/vcpkg/versions/j-/json11.json
index 688a24f27..34e38bb51 100644
--- a/external_imported/vcpkg/versions/j-/json11.json
+++ b/external_imported/vcpkg/versions/j-/json11.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "8b58dc7ee84c7424009066dd57f9b9f9a804f895",
+      "version-date": "2017-06-20",
+      "port-version": 6
+    },
+    {
+      "git-tree": "65ec4b34a9141b4f35e0870c383bbad03c7097b3",
+      "version-date": "2017-06-20",
+      "port-version": 5
+    },
     {
       "git-tree": "b99e54cd236396200e19e414a7375d0463d5ba5a",
       "version-string": "2017-06-20",
diff --git a/external_imported/vcpkg/versions/j-/json5-parser.json b/external_imported/vcpkg/versions/j-/json5-parser.json
index 4a6728194..f6f522a54 100644
--- a/external_imported/vcpkg/versions/j-/json5-parser.json
+++ b/external_imported/vcpkg/versions/j-/json5-parser.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "e0cb35861057c4523a395d7d9e59f9447ac0b139",
+      "version": "1.0.0",
+      "port-version": 6
+    },
+    {
+      "git-tree": "931114b0187ebc307e231658525cacfef79345ac",
+      "version": "1.0.0",
+      "port-version": 5
+    },
+    {
+      "git-tree": "94f6125fdc5c6624c9ca969d62ea8514ab2ed8c0",
+      "version": "1.0.0",
+      "port-version": 4
+    },
     {
       "git-tree": "e874e19b4f9b56647b5be1537ed0792041e96c25",
       "version-string": "1.0.0",
diff --git a/external_imported/vcpkg/versions/j-/jsoncons.json b/external_imported/vcpkg/versions/j-/jsoncons.json
index eaba417f4..033c4fd42 100644
--- a/external_imported/vcpkg/versions/j-/jsoncons.json
+++ b/external_imported/vcpkg/versions/j-/jsoncons.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "67af9fd33f09c21ff9f5a6de4e28a558542114a7",
+      "version": "0.173.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "067500e38e95bfc4ba3a02470871628b640b73c5",
+      "version": "0.173.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9ac2b57ee5cadef41175e8b3e2a13b28751bfb2d",
+      "version": "0.171.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "281de10de972059292e2850f6f509eb6cb9b2c40",
+      "version": "0.170.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a5e66f5d2ae477089e3f87c432bdfdb7a7929da9",
+      "version": "0.170.1",
+      "port-version": 0
+    },
     {
       "git-tree": "32422a6f4405b4c330cc992bc40fc11e4e274450",
       "version": "0.170.0",
diff --git a/external_imported/vcpkg/versions/j-/jsoncpp.json b/external_imported/vcpkg/versions/j-/jsoncpp.json
index ca8db9323..2fe36b86e 100644
--- a/external_imported/vcpkg/versions/j-/jsoncpp.json
+++ b/external_imported/vcpkg/versions/j-/jsoncpp.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "203c873c5425a71cb8a0d0ada6e5263a3bd13ff4",
+      "version": "1.9.5",
+      "port-version": 2
+    },
+    {
+      "git-tree": "0213314186f58bfac60d8dee9895c137291db35d",
+      "version": "1.9.5",
+      "port-version": 1
+    },
     {
       "git-tree": "ee92c743e235ebd2eda342c656704f20a329bda9",
       "version": "1.9.5",
diff --git a/external_imported/vcpkg/versions/j-/jsonifier.json b/external_imported/vcpkg/versions/j-/jsonifier.json
new file mode 100644
index 000000000..84d1b5b3d
--- /dev/null
+++ b/external_imported/vcpkg/versions/j-/jsonifier.json
@@ -0,0 +1,89 @@
+{
+  "versions": [
+    {
+      "git-tree": "b2a298ce7fae729f6d3e45e1ba669d33a77983d0",
+      "version": "0.9.94",
+      "port-version": 0
+    },
+    {
+      "git-tree": "250b98a91d7bf114d5616c193cfb8ed3f8ee7aa7",
+      "version": "0.9.93",
+      "port-version": 0
+    },
+    {
+      "git-tree": "58dc6092ed3ff864e9b96b10b265586bffac3eeb",
+      "version": "0.9.92",
+      "port-version": 0
+    },
+    {
+      "git-tree": "be9213f10f70e56d8f7fad547c9691558f9babc9",
+      "version": "0.9.91",
+      "port-version": 1
+    },
+    {
+      "git-tree": "b8901c8d3fee5951e101c1b8a3b64de58c6ebeed",
+      "version": "0.9.91",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9e89f30157ff02233bb4ec6661f40356e6a94260",
+      "version": "0.9.9",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3e076a2668e15aa6ad44ff29f45356467f745766",
+      "version": "0.9.8",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3cd676f349ff8f3ee120d87428d06c8cf80560e9",
+      "version": "0.9.7",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a7b70ee5b86b8dcecc7c0661491a4f1b84adc315",
+      "version": "0.9.6",
+      "port-version": 0
+    },
+    {
+      "git-tree": "fb8f713395cadfb17465e75f390763ae796b0a11",
+      "version": "0.9.5",
+      "port-version": 0
+    },
+    {
+      "git-tree": "81bce1af7b2990ff2664572b50e320b112044b78",
+      "version": "0.9.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "29c1237004abf2ca9bb395ab8f2d211f7ba563f3",
+      "version": "0.9.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a8093800ff625535fd7bddaedc1394fb5412c80c",
+      "version": "0.9.2",
+      "port-version": 1
+    },
+    {
+      "git-tree": "46dce3bb23c3edd1ae77e46fa11543d678ae26e6",
+      "version": "0.9.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "990249b807aba05002ba2ac406e0bebc9af26a64",
+      "version": "0.9.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "61f861161144679903d44d5bf7de6aa29f159140",
+      "version": "0.9.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "53b9b35d88088e1f3177a25800fc2043a86e8289",
+      "version": "0.9.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/j-/jsonnet.json b/external_imported/vcpkg/versions/j-/jsonnet.json
index 2eb4d1b35..87af791d6 100644
--- a/external_imported/vcpkg/versions/j-/jsonnet.json
+++ b/external_imported/vcpkg/versions/j-/jsonnet.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d58bf2d0d8b29fbcd87bfa9bcc4725aaec9283ad",
+      "version": "0.20.0",
+      "port-version": 0
+    },
     {
       "git-tree": "d44312d784436a66ae779d4b644aa29e3ebe23e8",
       "version": "0.18.0",
diff --git a/external_imported/vcpkg/versions/j-/juce.json b/external_imported/vcpkg/versions/j-/juce.json
new file mode 100644
index 000000000..e3dda1ab0
--- /dev/null
+++ b/external_imported/vcpkg/versions/j-/juce.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "884ac8253be9804c493b3dfc00a792570797716d",
+      "version": "7.0.9",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/k-/kaitai-struct-cpp-stl-runtime.json b/external_imported/vcpkg/versions/k-/kaitai-struct-cpp-stl-runtime.json
index 24a228747..96824966b 100644
--- a/external_imported/vcpkg/versions/k-/kaitai-struct-cpp-stl-runtime.json
+++ b/external_imported/vcpkg/versions/k-/kaitai-struct-cpp-stl-runtime.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "6955b0e08a1013a8e3fc43984ddd4a9455bec5ed",
+      "version": "0.10.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "5a70cdc32238d97c453f129e298c03bebdc2e7fd",
+      "version": "0.10.1",
+      "port-version": 0
+    },
     {
       "git-tree": "217ac9f83467405995c7d1356604661f0edf9970",
       "version": "0.10",
diff --git a/external_imported/vcpkg/versions/k-/kd-soap.json b/external_imported/vcpkg/versions/k-/kd-soap.json
index f621fc50c..a855dfa6b 100644
--- a/external_imported/vcpkg/versions/k-/kd-soap.json
+++ b/external_imported/vcpkg/versions/k-/kd-soap.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "4965d8dc59b019e7a99cc0f3ebc705d4c1e18752",
+      "version": "2.1.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "25205691e2c5a4f621d6b4c7fbe78f56324a311f",
+      "version": "2.1.1",
+      "port-version": 0
+    },
     {
       "git-tree": "64e16ff8d17d3cadb5a951b5b20e15f99b6d82b1",
       "version-string": "1.9.0",
diff --git a/external_imported/vcpkg/versions/k-/kdalgorithms.json b/external_imported/vcpkg/versions/k-/kdalgorithms.json
index def1e1a7a..7a329b1fc 100644
--- a/external_imported/vcpkg/versions/k-/kdalgorithms.json
+++ b/external_imported/vcpkg/versions/k-/kdalgorithms.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "05bf1ff5e346918f8fa5e6ece05126d72a6409f4",
+      "version": "1.2",
+      "port-version": 0
+    },
     {
       "git-tree": "c1d9ec1859767d60adf003d94fe81eb7eaac668e",
       "version-date": "2023-02-11",
diff --git a/external_imported/vcpkg/versions/k-/kdbindings.json b/external_imported/vcpkg/versions/k-/kdbindings.json
index fbcc9ef3c..d084614bb 100644
--- a/external_imported/vcpkg/versions/k-/kdbindings.json
+++ b/external_imported/vcpkg/versions/k-/kdbindings.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f0fb5ebfb45d90dd4a270978c49e490ffe5ea133",
+      "version": "1.0.3",
+      "port-version": 0
+    },
     {
       "git-tree": "5dc85351398a57c7b222ac7a57952849c327c18b",
       "version": "1.0.0",
diff --git a/external_imported/vcpkg/versions/k-/kddockwidgets.json b/external_imported/vcpkg/versions/k-/kddockwidgets.json
index 7f3042426..fc4bfc8bf 100644
--- a/external_imported/vcpkg/versions/k-/kddockwidgets.json
+++ b/external_imported/vcpkg/versions/k-/kddockwidgets.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5dcce3389ff415798302c843980052dd03314ddc",
+      "version": "2.0.0",
+      "port-version": 0
+    },
     {
       "git-tree": "5b5e511f49b28d447aafde193422e3b7961a4e62",
       "version": "1.5.0",
diff --git a/external_imported/vcpkg/versions/k-/kdsoap.json b/external_imported/vcpkg/versions/k-/kdsoap.json
new file mode 100644
index 000000000..49deb0109
--- /dev/null
+++ b/external_imported/vcpkg/versions/k-/kdsoap.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "fb0537658cffb2606f6eed9d444a5d8f88cdf2a4",
+      "version": "2.2.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/k-/kealib.json b/external_imported/vcpkg/versions/k-/kealib.json
index a4fe941e3..76481aac7 100644
--- a/external_imported/vcpkg/versions/k-/kealib.json
+++ b/external_imported/vcpkg/versions/k-/kealib.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "56a7c2f40ce5bb8f1674cf676d80c20a32e32d14",
+      "version": "1.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a32984c499e3b89d71c221916c41d59cf8cb1834",
+      "version": "1.5.2",
+      "port-version": 1
+    },
+    {
+      "git-tree": "e23b8bf23a4254e1028ca0c93f722a2691012852",
+      "version": "1.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d6136ef42467c0204cd6a082a272c16ab955caa3",
+      "version": "1.4.14",
+      "port-version": 1
+    },
     {
       "git-tree": "11878c71d1418c0bdcc380e7ebf8e90f9e563260",
       "version": "1.4.14",
diff --git a/external_imported/vcpkg/versions/k-/keccak-tiny.json b/external_imported/vcpkg/versions/k-/keccak-tiny.json
new file mode 100644
index 000000000..1a1c9c5af
--- /dev/null
+++ b/external_imported/vcpkg/versions/k-/keccak-tiny.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "068d9cedaf0a577eabe71f008037116929435931",
+      "version-date": "2014-09-08",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/k-/kenlm.json b/external_imported/vcpkg/versions/k-/kenlm.json
index 0ad8159ae..33d960b7b 100644
--- a/external_imported/vcpkg/versions/k-/kenlm.json
+++ b/external_imported/vcpkg/versions/k-/kenlm.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "3473d89b5d9e5bfc847a3b3575a5843b729b71ee",
+      "version": "20230531",
+      "port-version": 1
+    },
+    {
+      "git-tree": "bb9e0ae36b74ecd5bfb6a8855e761138eeda9185",
+      "version": "20230531",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6f1bed68940353855027de67f5f6d33c5dbe8617",
+      "version": "20200924",
+      "port-version": 4
+    },
+    {
+      "git-tree": "4947aeed6f0e7817a4be646bbb7685e4e5ebf62a",
+      "version": "20200924",
+      "port-version": 3
+    },
+    {
+      "git-tree": "8154d9ed8e6458688478aae1e09c2334362bc198",
+      "version": "20200924",
+      "port-version": 2
+    },
     {
       "git-tree": "5fd24bb27699940f72b94a9c3cf3e77a7d645a76",
       "version-string": "20200924",
diff --git a/external_imported/vcpkg/versions/k-/kerbal.json b/external_imported/vcpkg/versions/k-/kerbal.json
new file mode 100644
index 000000000..7930f3958
--- /dev/null
+++ b/external_imported/vcpkg/versions/k-/kerbal.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "b4d5ce6370b4c2a345ba96cbebbce8632667fac1",
+      "version": "2023.12.1",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/k-/keystone.json b/external_imported/vcpkg/versions/k-/keystone.json
index 68b76c7ca..7ed0f91dd 100644
--- a/external_imported/vcpkg/versions/k-/keystone.json
+++ b/external_imported/vcpkg/versions/k-/keystone.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c08eb2c84899fd5de79744b811c859667c7cfc17",
+      "version-semver": "0.9.2",
+      "port-version": 3
+    },
     {
       "git-tree": "f0094b1730f5973d7c3661eec95eb009d1d272b9",
       "version-semver": "0.9.2",
diff --git a/external_imported/vcpkg/versions/k-/kf5archive.json b/external_imported/vcpkg/versions/k-/kf5archive.json
index 67c87c37b..893943493 100644
--- a/external_imported/vcpkg/versions/k-/kf5archive.json
+++ b/external_imported/vcpkg/versions/k-/kf5archive.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "bc79165deff9b9e843f9078cd2b0f4190588929d",
+      "version": "5.98.0",
+      "port-version": 1
+    },
     {
       "git-tree": "2c232fe1786179a6c7c2e21f98336d6645fb5cae",
       "version": "5.98.0",
diff --git a/external_imported/vcpkg/versions/k-/kf5i18n.json b/external_imported/vcpkg/versions/k-/kf5i18n.json
index 86c7ac0fc..d2e337d4d 100644
--- a/external_imported/vcpkg/versions/k-/kf5i18n.json
+++ b/external_imported/vcpkg/versions/k-/kf5i18n.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f2263f5dbba39bdf456b8f1606f29ab4dc6e66cb",
+      "version": "5.98.0",
+      "port-version": 1
+    },
     {
       "git-tree": "8ce72b628f7998df3f90bcf7f9d313d9242ad5d8",
       "version": "5.98.0",
diff --git a/external_imported/vcpkg/versions/k-/kf5parts.json b/external_imported/vcpkg/versions/k-/kf5parts.json
new file mode 100644
index 000000000..56b0526e4
--- /dev/null
+++ b/external_imported/vcpkg/versions/k-/kf5parts.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "60bbc73ecd2ebcc910f7ea6c1553f79e33ccfb4f",
+      "version": "5.98.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "6d66ab25d03620f9df39a90fd00d00b0d6271620",
+      "version": "5.98.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/k-/kf5service.json b/external_imported/vcpkg/versions/k-/kf5service.json
index cad8462d1..89fc5b19d 100644
--- a/external_imported/vcpkg/versions/k-/kf5service.json
+++ b/external_imported/vcpkg/versions/k-/kf5service.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1f72425338783888d31486fed4fddd847e915f38",
+      "version": "5.98.0",
+      "port-version": 1
+    },
     {
       "git-tree": "70f03de0d90a7592d61c95a44b83894dfedb1dc2",
       "version": "5.98.0",
diff --git a/external_imported/vcpkg/versions/k-/kf5solid.json b/external_imported/vcpkg/versions/k-/kf5solid.json
index 4daa0f0f3..46e632f2b 100644
--- a/external_imported/vcpkg/versions/k-/kf5solid.json
+++ b/external_imported/vcpkg/versions/k-/kf5solid.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "8c660cbdee5e0b076d034c774bdd4ac2e92d18eb",
+      "version": "5.98.0",
+      "port-version": 3
+    },
+    {
+      "git-tree": "3a95b547baf6f1c849928b20dfc319a2374f975f",
+      "version": "5.98.0",
+      "port-version": 2
+    },
     {
       "git-tree": "7b532dd98f6da51797e2f14681dfc859fb02d8de",
       "version": "5.98.0",
diff --git a/external_imported/vcpkg/versions/k-/kf5texteditor.json b/external_imported/vcpkg/versions/k-/kf5texteditor.json
new file mode 100644
index 000000000..6f7c4f11d
--- /dev/null
+++ b/external_imported/vcpkg/versions/k-/kf5texteditor.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "65e3187a9352f45ef33cc466b1c809eff7bc2bc4",
+      "version": "5.98.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/k-/kfr.json b/external_imported/vcpkg/versions/k-/kfr.json
index 7bbe01012..7c5f1db76 100644
--- a/external_imported/vcpkg/versions/k-/kfr.json
+++ b/external_imported/vcpkg/versions/k-/kfr.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b00300796a5d295a7e55dca654c19fffd3916242",
+      "version-semver": "5.0.1",
+      "port-version": 1
+    },
     {
       "git-tree": "98355b4aa76624a4542c63890145d9b6e19b919d",
       "version-semver": "5.0.1",
diff --git a/external_imported/vcpkg/versions/k-/kinectsdk1.json b/external_imported/vcpkg/versions/k-/kinectsdk1.json
index 3c12c23ce..c0355d7ce 100644
--- a/external_imported/vcpkg/versions/k-/kinectsdk1.json
+++ b/external_imported/vcpkg/versions/k-/kinectsdk1.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "13e4fb052326c67afb016cb1e4ad9de60dd15fe5",
+      "version": "1.8",
+      "port-version": 8
+    },
     {
       "git-tree": "95650640a3c97fff440182fb35e878cc0b3111de",
       "version": "1.8",
diff --git a/external_imported/vcpkg/versions/k-/kinectsdk2.json b/external_imported/vcpkg/versions/k-/kinectsdk2.json
index 805c9c7d6..6e84e1c12 100644
--- a/external_imported/vcpkg/versions/k-/kinectsdk2.json
+++ b/external_imported/vcpkg/versions/k-/kinectsdk2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d794c2a74ee00c3ed932903f7d0587024fab247e",
+      "version": "2.0",
+      "port-version": 7
+    },
     {
       "git-tree": "e703f6797d85c9d99a150e4325c67bf7f3a7ea3f",
       "version": "2.0",
diff --git a/external_imported/vcpkg/versions/k-/kissfft.json b/external_imported/vcpkg/versions/k-/kissfft.json
index 836435055..fc863e23c 100644
--- a/external_imported/vcpkg/versions/k-/kissfft.json
+++ b/external_imported/vcpkg/versions/k-/kissfft.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a0a9f47bf62471468dd9f73727f03e580fca14c4",
+      "version": "131.1.0",
+      "port-version": 0
+    },
     {
       "git-tree": "f55a890b3e3bf5068dfdcf921ceb36080a146d9d",
       "version-date": "2021-11-14",
diff --git a/external_imported/vcpkg/versions/k-/kissnet.json b/external_imported/vcpkg/versions/k-/kissnet.json
index 2e699fda8..c567469ea 100644
--- a/external_imported/vcpkg/versions/k-/kissnet.json
+++ b/external_imported/vcpkg/versions/k-/kissnet.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8abd6a40d03e28a8c4f23c8eaaccff4e840ee800",
+      "version-date": "2023-02-04",
+      "port-version": 0
+    },
     {
       "git-tree": "a8b6b18919cd26da45a720b5fb0b22fcc0282180",
       "version-date": "2022-10-18",
diff --git a/external_imported/vcpkg/versions/k-/krabsetw.json b/external_imported/vcpkg/versions/k-/krabsetw.json
index 101a63128..ebf9881b3 100644
--- a/external_imported/vcpkg/versions/k-/krabsetw.json
+++ b/external_imported/vcpkg/versions/k-/krabsetw.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "be73b46ea3a3a59a80d5c45870b495d6081a4ba5",
+      "version": "4.3.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "131b7ae7482a9c9eedcd0c819265d3ab39b0d4c5",
+      "version": "4.3.1",
+      "port-version": 0
+    },
     {
       "git-tree": "b1f3fa7092c3cb91e5891fcf8f0923dd1f604887",
       "version": "4.1.18",
diff --git a/external_imported/vcpkg/versions/k-/ktx.json b/external_imported/vcpkg/versions/k-/ktx.json
index 763dec938..a5cac1a81 100644
--- a/external_imported/vcpkg/versions/k-/ktx.json
+++ b/external_imported/vcpkg/versions/k-/ktx.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "7db3fff00913b362bd7ac3c0a3611209f5d038df",
+      "version-semver": "4.3.0-beta1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "e5d9ea81aabca83f512d64a46fd545d353552034",
+      "version-semver": "4.3.0-beta1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "47559725520a0015829f65dfda7f3b28a7a7d78f",
+      "version-semver": "4.3.0-alpha3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "74b3fa8f53d6a1d173c09c2f87f865125717d894",
+      "version-semver": "4.1.0",
+      "port-version": 0
+    },
     {
       "git-tree": "b347df16db358ecb56e49c982c9a48f732f5da2f",
       "version-semver": "4.1.0-rc3",
diff --git a/external_imported/vcpkg/versions/k-/kubazip.json b/external_imported/vcpkg/versions/k-/kubazip.json
index f895e05b2..4b72a03b5 100644
--- a/external_imported/vcpkg/versions/k-/kubazip.json
+++ b/external_imported/vcpkg/versions/k-/kubazip.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a53b15054c06a67cd7ba9f19e54476893cddad72",
+      "version": "0.2.6",
+      "port-version": 0
+    },
     {
       "git-tree": "14bf9d5b15ecf5769d10e5000e74167e97b0ade1",
       "version": "0.2.4",
diff --git a/external_imported/vcpkg/versions/k-/kuku.json b/external_imported/vcpkg/versions/k-/kuku.json
index f12b159a3..7257778ae 100644
--- a/external_imported/vcpkg/versions/k-/kuku.json
+++ b/external_imported/vcpkg/versions/k-/kuku.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "55d5b6509ad53b413c0f4bd71a15f71ab79d8c8b",
+      "version": "2.1.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "1a78898dbb7cbacda021768b5468af708035474b",
+      "version": "2.1",
+      "port-version": 3
+    },
+    {
+      "git-tree": "8d894f573635f4ccfa90ef38fa9b12ce90c27a7d",
+      "version": "2.1",
+      "port-version": 2
+    },
     {
       "git-tree": "fa4e0b6cf1ce1e5f0cd13fa2dba7953ddcfc3d6f",
       "version-string": "2.1",
diff --git a/external_imported/vcpkg/versions/k-/kvasir-mpl.json b/external_imported/vcpkg/versions/k-/kvasir-mpl.json
index 042536ad3..191b23b1c 100644
--- a/external_imported/vcpkg/versions/k-/kvasir-mpl.json
+++ b/external_imported/vcpkg/versions/k-/kvasir-mpl.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "4a0535a96e146cdd0412da4db03afc7c414581a2",
+      "version-date": "2019-08-06",
+      "port-version": 3
+    },
+    {
+      "git-tree": "5ff2749ed8f663ea06f6e3422e11192ac083d8cc",
+      "version-date": "2019-08-06",
+      "port-version": 2
+    },
     {
       "git-tree": "0eed1d5cd20c82b4cd2031f0fb21c2a5655b13d1",
       "version-string": "2019-08-06",
diff --git a/external_imported/vcpkg/versions/l-/lager.json b/external_imported/vcpkg/versions/l-/lager.json
index 7da3ee095..92e09d29f 100644
--- a/external_imported/vcpkg/versions/l-/lager.json
+++ b/external_imported/vcpkg/versions/l-/lager.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a1669f03cca9f55a2952772a25942fcad3ca3a33",
+      "version-date": "2023-03-19",
+      "port-version": 0
+    },
     {
       "git-tree": "8dd0744209e866c731522176fdcdf056fcbb853f",
       "version-date": "2022-02-21",
diff --git a/external_imported/vcpkg/versions/l-/lapack-reference.json b/external_imported/vcpkg/versions/l-/lapack-reference.json
index 0b841e182..1cd14ec48 100644
--- a/external_imported/vcpkg/versions/l-/lapack-reference.json
+++ b/external_imported/vcpkg/versions/l-/lapack-reference.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "34ccaaa835e90fc739829db6ea9b72c58151960e",
+      "version": "3.11.0",
+      "port-version": 2
+    },
     {
       "git-tree": "d71a74d50d88f3cf337d7cefccadcb192e7d12ab",
       "version": "3.11.0",
diff --git a/external_imported/vcpkg/versions/l-/lapack.json b/external_imported/vcpkg/versions/l-/lapack.json
index 5803b5922..fedbceca3 100644
--- a/external_imported/vcpkg/versions/l-/lapack.json
+++ b/external_imported/vcpkg/versions/l-/lapack.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "7c892b58c70ebc7d83444c4e727272cad40e28c2",
+      "version-date": "2022-02-22",
+      "port-version": 2
+    },
+    {
+      "git-tree": "5897ee099a5aa43bcb50c0d5a19cda3a9ed6a50c",
+      "version-date": "2022-02-22",
+      "port-version": 1
+    },
     {
       "git-tree": "3a9c5b51e3480db058719db223df981e0e679819",
       "version-date": "2022-02-22",
diff --git a/external_imported/vcpkg/versions/l-/launch-darkly-server.json b/external_imported/vcpkg/versions/l-/launch-darkly-server.json
index 92e1c4fbc..ea76effe1 100644
--- a/external_imported/vcpkg/versions/l-/launch-darkly-server.json
+++ b/external_imported/vcpkg/versions/l-/launch-darkly-server.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "cf4d27e890d7becddd87f89a3a0622199892ebd2",
+      "version": "2.8.6",
+      "port-version": 2
+    },
+    {
+      "git-tree": "d2e41e5748cc5b77167205b83be64003e979e637",
+      "version": "2.8.6",
+      "port-version": 1
+    },
     {
       "git-tree": "1d45ebf10971a96ca975c36630545acfbc37b64b",
       "version": "2.8.6",
diff --git a/external_imported/vcpkg/versions/l-/lazy-importer.json b/external_imported/vcpkg/versions/l-/lazy-importer.json
index 85591f3cb..bfb31e551 100644
--- a/external_imported/vcpkg/versions/l-/lazy-importer.json
+++ b/external_imported/vcpkg/versions/l-/lazy-importer.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "dc2b18f5f193267ac091e6495ea097e67d60d33b",
+      "version-date": "2023-08-03",
+      "port-version": 0
+    },
     {
       "git-tree": "ba952940f6531135428e3827d0610d3596b683cb",
       "version-date": "2022-02-09",
diff --git a/external_imported/vcpkg/versions/l-/lcm.json b/external_imported/vcpkg/versions/l-/lcm.json
index 6e435957c..7d1c87cb9 100644
--- a/external_imported/vcpkg/versions/l-/lcm.json
+++ b/external_imported/vcpkg/versions/l-/lcm.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b282016c7e5f1aacff821854e8fab52d64b4c970",
+      "version": "1.4.0",
+      "port-version": 6
+    },
     {
       "git-tree": "06163d8d06a5f6b22e76ed353743da7370d73602",
       "version": "1.4.0",
diff --git a/external_imported/vcpkg/versions/l-/leaf.json b/external_imported/vcpkg/versions/l-/leaf.json
index 13fd9940e..678f75d54 100644
--- a/external_imported/vcpkg/versions/l-/leaf.json
+++ b/external_imported/vcpkg/versions/l-/leaf.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4fb10737acdbc570266b8e23e9b435869374a822",
+      "version": "0.2.2",
+      "port-version": 2
+    },
     {
       "git-tree": "276f8e1eb0a3ea4e0b0bd72dee0822660e6704f7",
       "version-string": "0.2.2",
diff --git a/external_imported/vcpkg/versions/l-/lemon.json b/external_imported/vcpkg/versions/l-/lemon.json
index 04d37dbe2..5d4ca85d7 100644
--- a/external_imported/vcpkg/versions/l-/lemon.json
+++ b/external_imported/vcpkg/versions/l-/lemon.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "23f3790faebba60c744722f27efd4c031eb7fe62",
+      "version": "0",
+      "port-version": 2
+    },
     {
       "git-tree": "20bb9fd243449f9c1376ae916567331839375a90",
       "version-string": "0",
diff --git a/external_imported/vcpkg/versions/l-/lensfun.json b/external_imported/vcpkg/versions/l-/lensfun.json
new file mode 100644
index 000000000..dc14f54de
--- /dev/null
+++ b/external_imported/vcpkg/versions/l-/lensfun.json
@@ -0,0 +1,19 @@
+{
+  "versions": [
+    {
+      "git-tree": "84eb6a4d2a0d8d670e0f54ec70bb4ad36cb004df",
+      "version": "0.3.4",
+      "port-version": 2
+    },
+    {
+      "git-tree": "a085269b70f184d8dbf07c595e37ce336bd79906",
+      "version": "0.3.4",
+      "port-version": 1
+    },
+    {
+      "git-tree": "1dd927cfac7033fe1aa1031d588ebe8295f7765c",
+      "version": "0.3.4",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/l-/lest.json b/external_imported/vcpkg/versions/l-/lest.json
index 1eddbca5a..0d61e8129 100644
--- a/external_imported/vcpkg/versions/l-/lest.json
+++ b/external_imported/vcpkg/versions/l-/lest.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0e79639edebf73ebe6a4243c00d9ab6370c07f07",
+      "version": "1.35.1",
+      "port-version": 3
+    },
     {
       "git-tree": "94a9fb0d9b6b57287a652feea7268760986bb448",
       "version-string": "1.35.1",
diff --git a/external_imported/vcpkg/versions/l-/leveldb.json b/external_imported/vcpkg/versions/l-/leveldb.json
index ca60686d3..94917e8cf 100644
--- a/external_imported/vcpkg/versions/l-/leveldb.json
+++ b/external_imported/vcpkg/versions/l-/leveldb.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "893680e6d71d61d7bcf7c132c8a2263c0fa4c72a",
+      "version": "1.23",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9eff4d1f18a28c13709e987d759a116a36a6a14a",
+      "version": "1.22",
+      "port-version": 7
+    },
     {
       "git-tree": "c7a1016e970ae104981e8a8fcc5069593bf716b3",
       "version": "1.22",
diff --git a/external_imported/vcpkg/versions/l-/levmar.json b/external_imported/vcpkg/versions/l-/levmar.json
index d7490901a..923a8ea49 100644
--- a/external_imported/vcpkg/versions/l-/levmar.json
+++ b/external_imported/vcpkg/versions/l-/levmar.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "cba09ff1cf1b17d901bd60ff2505b31e98bc862e",
+      "version": "2.6",
+      "port-version": 3
+    },
+    {
+      "git-tree": "dbdc4f754e8573fdad2ce75cb1b476d828dad76e",
+      "version": "2.6",
+      "port-version": 2
+    },
     {
       "git-tree": "a869430352021a5fcecdd780a25e5ee0a4d769f5",
       "version": "2.6",
diff --git a/external_imported/vcpkg/versions/l-/lexbor.json b/external_imported/vcpkg/versions/l-/lexbor.json
new file mode 100644
index 000000000..1d99be982
--- /dev/null
+++ b/external_imported/vcpkg/versions/l-/lexbor.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "ae940a82ff44ebbeea58d1022e28ae1d1f853213",
+      "version": "2.3.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f5c7890c5fb34ec0622b01dfdff10f11e8dccdbd",
+      "version": "2.2.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/l-/libaaplus.json b/external_imported/vcpkg/versions/l-/libaaplus.json
index 4e7d376fb..cc3fae04a 100644
--- a/external_imported/vcpkg/versions/l-/libaaplus.json
+++ b/external_imported/vcpkg/versions/l-/libaaplus.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2254865f7618bb8f116d18156b41d307d32b0a6d",
+      "version": "2.36",
+      "port-version": 1
+    },
     {
       "git-tree": "196f02649779e1a3b06c9d0c32b41082205c69b5",
       "version": "2.36",
diff --git a/external_imported/vcpkg/versions/l-/libadlmidi.json b/external_imported/vcpkg/versions/l-/libadlmidi.json
index b01b3e84d..7e12fd2ae 100644
--- a/external_imported/vcpkg/versions/l-/libadlmidi.json
+++ b/external_imported/vcpkg/versions/l-/libadlmidi.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5cbc0a9338616c735a4cf4d8ccc2b4c81ccc61c5",
+      "version": "1.5.1",
+      "port-version": 1
+    },
     {
       "git-tree": "81e5c1700a6eab87c9d855b0a206ad6dadaf6ff2",
       "version": "1.5.1",
diff --git a/external_imported/vcpkg/versions/l-/libadwaita.json b/external_imported/vcpkg/versions/l-/libadwaita.json
index ead14d630..511a4a2d4 100644
--- a/external_imported/vcpkg/versions/l-/libadwaita.json
+++ b/external_imported/vcpkg/versions/l-/libadwaita.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "ed0c59fcd97bfea68ea94baf161a1c9e6d5c673d",
+      "version": "1.3.2",
+      "port-version": 1
+    },
+    {
+      "git-tree": "3c273bec50ed1314ccfb55bd957905df22c9ed61",
+      "version": "1.3.2",
+      "port-version": 0
+    },
     {
       "git-tree": "259b1d8ef5c02605235b773df4382e86ef0df01a",
       "version": "1.2.0",
diff --git a/external_imported/vcpkg/versions/l-/libaes-siv.json b/external_imported/vcpkg/versions/l-/libaes-siv.json
new file mode 100644
index 000000000..253c87361
--- /dev/null
+++ b/external_imported/vcpkg/versions/l-/libaes-siv.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "ecae087c343539db9225d7a31c076e245925d30b",
+      "version-date": "2020-10-15",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/l-/libaiff.json b/external_imported/vcpkg/versions/l-/libaiff.json
index 0204fed5b..db18870e5 100644
--- a/external_imported/vcpkg/versions/l-/libaiff.json
+++ b/external_imported/vcpkg/versions/l-/libaiff.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "9d32c6814dfaaf072180ad43068025fdc60713a9",
+      "version": "5.0",
+      "port-version": 9
+    },
+    {
+      "git-tree": "bb6134943648934661d3e2f2b9b5bd561cfe8822",
+      "version": "5.0",
+      "port-version": 8
+    },
     {
       "git-tree": "1bd67ed6002176c79933b7e4c237e06604e16b1d",
       "version-string": "5.0",
diff --git a/external_imported/vcpkg/versions/l-/libalkimia.json b/external_imported/vcpkg/versions/l-/libalkimia.json
index 2bd6b715e..7466aaa87 100644
--- a/external_imported/vcpkg/versions/l-/libalkimia.json
+++ b/external_imported/vcpkg/versions/l-/libalkimia.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "ce16d689569ac3f63e5c46e9384f7e54d203bfe1",
+      "version": "8.1.72",
+      "port-version": 0
+    },
+    {
+      "git-tree": "7f9b0ce11bf52ea4e33323b2587234a6b40f7d94",
+      "version": "8.1.70",
+      "port-version": 2
+    },
     {
       "git-tree": "09e0633aca7ce1433e7cd6542404a12f90bf1de1",
       "version": "8.1.70",
diff --git a/external_imported/vcpkg/versions/l-/libao.json b/external_imported/vcpkg/versions/l-/libao.json
index c0d0833c8..db12138fa 100644
--- a/external_imported/vcpkg/versions/l-/libao.json
+++ b/external_imported/vcpkg/versions/l-/libao.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6c128d640fa4cb28b96cb398411bba846febdb5f",
+      "version": "1.2.2",
+      "port-version": 5
+    },
     {
       "git-tree": "11240d91b73e6a968da37b8053a8a64a6d9ea55f",
       "version": "1.2.2",
diff --git a/external_imported/vcpkg/versions/l-/libass.json b/external_imported/vcpkg/versions/l-/libass.json
index 1ab96ad46..2b132b248 100644
--- a/external_imported/vcpkg/versions/l-/libass.json
+++ b/external_imported/vcpkg/versions/l-/libass.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c71ba164ee51e31be931c03973fbeb756de7631e",
+      "version": "0.17.1",
+      "port-version": 0
+    },
     {
       "git-tree": "b5dfc84a884c525317deec9d8e62df51d64a8e3d",
       "version": "0.16.0",
diff --git a/external_imported/vcpkg/versions/l-/libassert.json b/external_imported/vcpkg/versions/l-/libassert.json
new file mode 100644
index 000000000..d9299f721
--- /dev/null
+++ b/external_imported/vcpkg/versions/l-/libassert.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "b67ed1f09482482afcb344d882f99fa6fa53caf4",
+      "version": "1.2.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4e767d8be1af178c0ed841aa70839076e025aca0",
+      "version": "1.2.1",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/l-/libassuan.json b/external_imported/vcpkg/versions/l-/libassuan.json
index fa8b9bd77..09e021a51 100644
--- a/external_imported/vcpkg/versions/l-/libassuan.json
+++ b/external_imported/vcpkg/versions/l-/libassuan.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5eb84b4591e790d4fe81a7a5cd37ebd6e567d40e",
+      "version": "2.5.6",
+      "port-version": 0
+    },
     {
       "git-tree": "0072ae5afdd0e25564266077bd7600faf20d2770",
       "version": "2.5.5",
diff --git a/external_imported/vcpkg/versions/l-/libatomic-ops.json b/external_imported/vcpkg/versions/l-/libatomic-ops.json
index df1982c85..5c72cb419 100644
--- a/external_imported/vcpkg/versions/l-/libatomic-ops.json
+++ b/external_imported/vcpkg/versions/l-/libatomic-ops.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "46231da262a01373e326ad31eeb8ac03cecbbeb3",
+      "version": "7.8.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c4a1f1354f550bce6ae190b82bf984c3827937a3",
+      "version": "7.8.0",
+      "port-version": 0
+    },
     {
       "git-tree": "a0165283f0349283e2d14bd752fc428fb9fffd6b",
       "version": "7.7.0",
diff --git a/external_imported/vcpkg/versions/l-/libavif.json b/external_imported/vcpkg/versions/l-/libavif.json
index b90ae2bb8..9e2649788 100644
--- a/external_imported/vcpkg/versions/l-/libavif.json
+++ b/external_imported/vcpkg/versions/l-/libavif.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "4532b7082f91c3b906444106b2fed0023178fad1",
+      "version-semver": "1.0.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "204b6c51e6d23a77e275b5ec370e15e1c9fccaf1",
+      "version-semver": "1.0.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "864c480bb39144c9905eb74976a59efd74224429",
+      "version-semver": "0.11.1",
+      "port-version": 2
+    },
+    {
+      "git-tree": "775b04db12d2353cc6e69d54faef89b857dd32eb",
+      "version-semver": "0.11.1",
+      "port-version": 1
+    },
     {
       "git-tree": "11db2c9c2c399768d55d5b54f203e1f789d06936",
       "version-semver": "0.11.1",
diff --git a/external_imported/vcpkg/versions/l-/libbacktrace.json b/external_imported/vcpkg/versions/l-/libbacktrace.json
index 7204869c5..6c88e1c71 100644
--- a/external_imported/vcpkg/versions/l-/libbacktrace.json
+++ b/external_imported/vcpkg/versions/l-/libbacktrace.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "273bcea92baf4dde93589d50f1e131e96002c358",
+      "version-date": "2023-11-30",
+      "port-version": 0
+    },
     {
       "git-tree": "a9544b83bfa32d57ce62d9193a427a246b71f685",
       "version-date": "2021-03-14",
diff --git a/external_imported/vcpkg/versions/l-/libbf.json b/external_imported/vcpkg/versions/l-/libbf.json
index 183b294f4..708156bd0 100644
--- a/external_imported/vcpkg/versions/l-/libbf.json
+++ b/external_imported/vcpkg/versions/l-/libbf.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "741e60d3785dedb5bcb187e5e049bf97494e3822",
+      "version": "1.0.0",
+      "port-version": 4
+    },
     {
       "git-tree": "3c699adb88cb4cf15b0fb52cb9e506bc91672bf2",
       "version": "1.0.0",
diff --git a/external_imported/vcpkg/versions/l-/libbson.json b/external_imported/vcpkg/versions/l-/libbson.json
index 2a8edfb47..6a8b98cb7 100644
--- a/external_imported/vcpkg/versions/l-/libbson.json
+++ b/external_imported/vcpkg/versions/l-/libbson.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "d14fb7001fd70dd80e15562bbe90a30060adef40",
+      "version": "1.25.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0c4c352f8b6c44b8cb678e906b8f8431b54d2d27",
+      "version": "1.25.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "cefffe3ffeb41cff3720044ea92a8734c42dc31c",
+      "version": "1.25.1",
+      "port-version": 2
+    },
+    {
+      "git-tree": "4e2365e51faaf5bea56b3466e7c94342cb43a9e4",
+      "version": "1.25.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "9cc5cb4ec6ee37e4a07e65f6e8aee04f83f535ec",
+      "version": "1.25.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3a3f08e9e91a77ee7b6b56f88d1e0013349c34e1",
+      "version": "1.24.3",
+      "port-version": 0
+    },
     {
       "git-tree": "c50f1bbb02e6ac4f6b6f928f4c931922017997d9",
       "version": "1.22.2",
diff --git a/external_imported/vcpkg/versions/l-/libcaer.json b/external_imported/vcpkg/versions/l-/libcaer.json
index fa5aa2e7d..8740283ca 100644
--- a/external_imported/vcpkg/versions/l-/libcaer.json
+++ b/external_imported/vcpkg/versions/l-/libcaer.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "45485054e1276ff51ad1ec68a8c31de0ecf9d795",
+      "version": "3.3.15",
+      "port-version": 1
+    },
+    {
+      "git-tree": "f90f31425f85b3bb2544a34fc0b9247491ecbf2b",
+      "version": "3.3.15",
+      "port-version": 0
+    },
+    {
+      "git-tree": "52791fbed0e817d00944e3ad1f9ab76759f543f8",
+      "version-date": "2022-07-25",
+      "port-version": 4
+    },
     {
       "git-tree": "131181ae3b3608e511cf7db3c3091612b8af0e03",
       "version-date": "2022-07-25",
diff --git a/external_imported/vcpkg/versions/l-/libcap.json b/external_imported/vcpkg/versions/l-/libcap.json
new file mode 100644
index 000000000..12d366643
--- /dev/null
+++ b/external_imported/vcpkg/versions/l-/libcap.json
@@ -0,0 +1,24 @@
+{
+  "versions": [
+    {
+      "git-tree": "23bb9f2743e684bacba57b8cc8a931756f0e7447",
+      "version": "2.69",
+      "port-version": 3
+    },
+    {
+      "git-tree": "d699cd38c2cf76ab59628fc3437c381ccabd2383",
+      "version": "2.69",
+      "port-version": 2
+    },
+    {
+      "git-tree": "3f8091b1a094e5a0ab51652478289c040e98e7ca",
+      "version": "2.69",
+      "port-version": 1
+    },
+    {
+      "git-tree": "78c061106eac6df0a86b27df684998c780c70008",
+      "version": "2.69",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/l-/libcds.json b/external_imported/vcpkg/versions/l-/libcds.json
index 60bbde654..216c8e3e5 100644
--- a/external_imported/vcpkg/versions/l-/libcds.json
+++ b/external_imported/vcpkg/versions/l-/libcds.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "2c2c64b70b3c99a15ddef75323dd98b8b4d066bc",
+      "version": "2.3.3",
+      "port-version": 4
+    },
+    {
+      "git-tree": "a9e46c27d63e8b303be787baa7349f1b1fe09e17",
+      "version": "2.3.3",
+      "port-version": 3
+    },
     {
       "git-tree": "2030ee3d0c39352e9617f28fb14ed17c20b96741",
       "version": "2.3.3",
diff --git a/external_imported/vcpkg/versions/l-/libcerf.json b/external_imported/vcpkg/versions/l-/libcerf.json
index 471bb29f3..012d99e04 100644
--- a/external_imported/vcpkg/versions/l-/libcerf.json
+++ b/external_imported/vcpkg/versions/l-/libcerf.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7d9138bfd878a5de79822e201b0e83649715121c",
+      "version": "1.13",
+      "port-version": 4
+    },
     {
       "git-tree": "1aed61567fd3da5dc36a9a5290262b389ab79fa5",
       "version": "1.13",
diff --git a/external_imported/vcpkg/versions/l-/libconfig.json b/external_imported/vcpkg/versions/l-/libconfig.json
index 9ec9af593..c140962e0 100644
--- a/external_imported/vcpkg/versions/l-/libconfig.json
+++ b/external_imported/vcpkg/versions/l-/libconfig.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "bb011bd374885434cf90d445526e42aca185c1e7",
+      "version": "1.7.3",
+      "port-version": 5
+    },
+    {
+      "git-tree": "378d40ce036cf220dfaedf27f625a28d6e72d3e9",
+      "version": "1.7.3",
+      "port-version": 4
+    },
+    {
+      "git-tree": "9056cd67b1885ed4721a931467fb7fd1eb5b4bf3",
+      "version": "1.7.3",
+      "port-version": 3
+    },
+    {
+      "git-tree": "cf6ab494ef19e4fb5bf1effcd86246cb758000af",
+      "version": "1.7.3",
+      "port-version": 2
+    },
     {
       "git-tree": "c9149e9c9d7a08455647bcadb1f178b7ee6ff3d2",
       "version-string": "1.7.3",
diff --git a/external_imported/vcpkg/versions/l-/libconfuse.json b/external_imported/vcpkg/versions/l-/libconfuse.json
index 3a22abe1e..96eefd9a6 100644
--- a/external_imported/vcpkg/versions/l-/libconfuse.json
+++ b/external_imported/vcpkg/versions/l-/libconfuse.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "395e64637b555a051b308e0e2e69b1bfd152b381",
+      "version-date": "2019-07-14",
+      "port-version": 4
+    },
     {
       "git-tree": "3de4b13956cc303338de0b311a0c35a72c2d0a22",
       "version-string": "2019-07-14",
diff --git a/external_imported/vcpkg/versions/l-/libcopp.json b/external_imported/vcpkg/versions/l-/libcopp.json
index 4af464c23..81a62990f 100644
--- a/external_imported/vcpkg/versions/l-/libcopp.json
+++ b/external_imported/vcpkg/versions/l-/libcopp.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "45c928d0a5c7281930ae8f7cd424a939da766f1a",
+      "version": "2.2.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9a5300e82b2e96e71c1357f2dbb4b7c311a18022",
+      "version": "2.1.4",
+      "port-version": 0
+    },
     {
       "git-tree": "7c8f92b9a9feb08ffcb8212368c74a56efe6c1c8",
       "version": "2.1.2",
diff --git a/external_imported/vcpkg/versions/l-/libcoro.json b/external_imported/vcpkg/versions/l-/libcoro.json
new file mode 100644
index 000000000..197233ad9
--- /dev/null
+++ b/external_imported/vcpkg/versions/l-/libcoro.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "da37665bbdb4cdb391d48037308acb4db271aacf",
+      "version": "0.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "36f9c61aa64e8be9670199b9efad6cec4e83b805",
+      "version": "0.9",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/l-/libcroco.json b/external_imported/vcpkg/versions/l-/libcroco.json
index 6451fe1ff..7a5927adc 100644
--- a/external_imported/vcpkg/versions/l-/libcroco.json
+++ b/external_imported/vcpkg/versions/l-/libcroco.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "fb00cde342d5aad9f925f36c471d4e047a1dca23",
+      "version": "0.6.13",
+      "port-version": 6
+    },
+    {
+      "git-tree": "c6962c2f97aca37a74b56870cc7ff032605cfba2",
+      "version": "0.6.13",
+      "port-version": 5
+    },
     {
       "git-tree": "04dc173766f01e3ddad3bcd53c62ed56741ab3a8",
       "version": "0.6.13",
diff --git a/external_imported/vcpkg/versions/l-/libcsv.json b/external_imported/vcpkg/versions/l-/libcsv.json
index 6fd09c8a9..a1d95cdbc 100644
--- a/external_imported/vcpkg/versions/l-/libcsv.json
+++ b/external_imported/vcpkg/versions/l-/libcsv.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "936ce0ff18976c35cec212d25fbcc143dafd7b6b",
+      "version": "3.0.3",
+      "port-version": 1
+    },
     {
       "git-tree": "05dbce143e6757c7df2df6813ac7d559b2d908a1",
       "version": "3.0.3",
diff --git a/external_imported/vcpkg/versions/l-/libdatachannel.json b/external_imported/vcpkg/versions/l-/libdatachannel.json
index 8cbc24c8e..6f2e9d482 100644
--- a/external_imported/vcpkg/versions/l-/libdatachannel.json
+++ b/external_imported/vcpkg/versions/l-/libdatachannel.json
@@ -1,5 +1,45 @@
 {
   "versions": [
+    {
+      "git-tree": "73a4d8cba18306b14a98b1fb70d35bfa588ce386",
+      "version-semver": "0.19.5",
+      "port-version": 2
+    },
+    {
+      "git-tree": "2b2d69b30260c468757b11bea046e2dabcba0516",
+      "version-semver": "0.19.5",
+      "port-version": 1
+    },
+    {
+      "git-tree": "1a9fb42ed13d38aae4df0b774cde05e26dcea241",
+      "version-semver": "0.19.5",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b3364c6dfb715277d483a8e0410a98fe84a65345",
+      "version-semver": "0.19.4",
+      "port-version": 1
+    },
+    {
+      "git-tree": "3e45715d7c64f9b22c87aff96594979f11e872a7",
+      "version-semver": "0.19.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3552621ddd4919b86e0b0333bf6530cc1402ec6f",
+      "version-semver": "0.18.6",
+      "port-version": 2
+    },
+    {
+      "git-tree": "8b22ab8a6787704e52d3b715feb12e38522540ab",
+      "version-semver": "0.18.2",
+      "port-version": 2
+    },
+    {
+      "git-tree": "96f395b47c8ee56f6a268f3e1da86eb23a4ba0ea",
+      "version-semver": "0.18.2",
+      "port-version": 1
+    },
     {
       "git-tree": "9bbf4ea991fbad7ab746fc1ff8c0ce121260715f",
       "version-semver": "0.18.2",
diff --git a/external_imported/vcpkg/versions/l-/libde265.json b/external_imported/vcpkg/versions/l-/libde265.json
index c7bb6e852..3a969c6f2 100644
--- a/external_imported/vcpkg/versions/l-/libde265.json
+++ b/external_imported/vcpkg/versions/l-/libde265.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "386663192fc988e45cc4c16378b3a5a0549a7366",
+      "version": "1.0.15",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f66d0188266eee664296198145c0380a1557915d",
+      "version": "1.0.14",
+      "port-version": 0
+    },
+    {
+      "git-tree": "59b6113962afdbc8f5c2a06e21b1fdb59b4cf56f",
+      "version": "1.0.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e24685d5b2c9686f77369463e32b307d03580059",
+      "version": "1.0.11",
+      "port-version": 2
+    },
+    {
+      "git-tree": "35f74e1100615e9ff16d6b05529baf8e7de774aa",
+      "version": "1.0.11",
+      "port-version": 1
+    },
+    {
+      "git-tree": "3c0c0eec97e9b7d9a46d6f1f5fb22c5b07aa5550",
+      "version": "1.0.11",
+      "port-version": 0
+    },
     {
       "git-tree": "bba9b6bf501c046f81f7335d1efff23ed0845ed4",
       "version": "1.0.8",
diff --git a/external_imported/vcpkg/versions/l-/libdeflate.json b/external_imported/vcpkg/versions/l-/libdeflate.json
index 92a1afdf6..8f30f6ce2 100644
--- a/external_imported/vcpkg/versions/l-/libdeflate.json
+++ b/external_imported/vcpkg/versions/l-/libdeflate.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "76f16e38faecc95d0dc0c1a4a2ac32a4983f4775",
+      "version": "1.19",
+      "port-version": 1
+    },
+    {
+      "git-tree": "60231c270c3eca938a64b43dfb0b66846787a464",
+      "version": "1.19",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6a0df33e92ed3be5674c6c0a4fd63faff93dea9d",
+      "version": "1.18",
+      "port-version": 0
+    },
     {
       "git-tree": "023c8297e1d45d680194366783974818522294bd",
       "version": "1.17",
diff --git a/external_imported/vcpkg/versions/l-/libdisasm.json b/external_imported/vcpkg/versions/l-/libdisasm.json
index 62593ea30..2aa1cb449 100644
--- a/external_imported/vcpkg/versions/l-/libdisasm.json
+++ b/external_imported/vcpkg/versions/l-/libdisasm.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "d98ead706d535c81198d0b4fd3a1744cd0e0a23e",
+      "version": "0.23",
+      "port-version": 11
+    },
+    {
+      "git-tree": "e6870682ac5d76671fbe396235d4667f5edf669b",
+      "version": "0.23",
+      "port-version": 10
+    },
     {
       "git-tree": "ab983230ac21cfc3d2849abfa70551755ffcb5f8",
       "version-string": "0.23",
diff --git a/external_imported/vcpkg/versions/l-/libdjinterop.json b/external_imported/vcpkg/versions/l-/libdjinterop.json
index 324976efb..75328ed52 100644
--- a/external_imported/vcpkg/versions/l-/libdjinterop.json
+++ b/external_imported/vcpkg/versions/l-/libdjinterop.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "2f886c676ab640fe3ab80c7caa4a1dce77d9400d",
+      "version": "0.20.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "33f7bc90315ef3a477504fcf9a9b42339bb963d5",
+      "version": "0.20.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "78aec7e730a45c7a576233e68ed1858d2e8a9cd7",
+      "version": "0.19.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "997b5a399c620329f5f77f2bff49ffc4413bc2c9",
+      "version": "0.19.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "ccc1b924f1e3c41f94f22f26ceec66c89f469f74",
+      "version": "0.19.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "07081634d12b7ede73b9921d461f55061410a6c7",
+      "version": "0.16.0",
+      "port-version": 1
+    },
     {
       "git-tree": "c1c63ff4c5483425a19992ddefa98a3c1e2fabf3",
       "version": "0.16.0",
diff --git a/external_imported/vcpkg/versions/l-/libdwarf.json b/external_imported/vcpkg/versions/l-/libdwarf.json
new file mode 100644
index 000000000..a8c22a858
--- /dev/null
+++ b/external_imported/vcpkg/versions/l-/libdwarf.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "6159822bb45daaf469ba049ac34ab10bc78bc843",
+      "version": "0.9.1",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/l-/libe57.json b/external_imported/vcpkg/versions/l-/libe57.json
index cefe0269e..4947e5a8b 100644
--- a/external_imported/vcpkg/versions/l-/libe57.json
+++ b/external_imported/vcpkg/versions/l-/libe57.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d5a7a88a7e28608ff30f48533cec32ac07f6f7c2",
+      "version-semver": "1.1.332",
+      "port-version": 4
+    },
     {
       "git-tree": "ecdcbb16ecd99e8d8a25b7dde4b2b1f040c5c3ed",
       "version-semver": "1.1.332",
diff --git a/external_imported/vcpkg/versions/l-/libe57format.json b/external_imported/vcpkg/versions/l-/libe57format.json
index c70f993ff..b537e07c7 100644
--- a/external_imported/vcpkg/versions/l-/libe57format.json
+++ b/external_imported/vcpkg/versions/l-/libe57format.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "fb409510c8365dadc49053428c15e36163d204e2",
+      "version": "3.1.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6fc957c8c7eef98a7d7ba0688057399fa8aa2537",
+      "version": "3.1.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3974e65293fa5a2b211751a766336b7d9f916ace",
+      "version": "3.0.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "420f72aa03611d2e9c0418eaf2d442d2ae260cfd",
+      "version": "3.0.1",
+      "port-version": 0
+    },
     {
       "git-tree": "fc02f3676ee791122d4afca45f363564a293da8a",
       "version": "3.0.0",
diff --git a/external_imported/vcpkg/versions/l-/libebur128.json b/external_imported/vcpkg/versions/l-/libebur128.json
index f306ea2bd..b4af5e280 100644
--- a/external_imported/vcpkg/versions/l-/libebur128.json
+++ b/external_imported/vcpkg/versions/l-/libebur128.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "97dd5a1812c03f1822d75e8fa10ade616c7d9f15",
+      "version": "1.2.6",
+      "port-version": 2
+    },
     {
       "git-tree": "640f92877a6bde91d968b0b0668767b714297f6c",
       "version-string": "1.2.6",
diff --git a/external_imported/vcpkg/versions/l-/libenvpp.json b/external_imported/vcpkg/versions/l-/libenvpp.json
index b94e65ef0..141613e87 100644
--- a/external_imported/vcpkg/versions/l-/libenvpp.json
+++ b/external_imported/vcpkg/versions/l-/libenvpp.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "f962d07f14dc8c86cb927e566bb8dd58670f00c7",
+      "version": "1.4.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5388e430f77d77307fe2d4358241e684886390bb",
+      "version": "1.3.0",
+      "port-version": 0
+    },
     {
       "git-tree": "8eb66698367b380452b1f693237d383381e2373e",
       "version": "1.0.0",
diff --git a/external_imported/vcpkg/versions/l-/libepoxy.json b/external_imported/vcpkg/versions/l-/libepoxy.json
index 516e3df45..b004fce9a 100644
--- a/external_imported/vcpkg/versions/l-/libepoxy.json
+++ b/external_imported/vcpkg/versions/l-/libepoxy.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "df7389605ff392a312b77b633ca658167c14221a",
+      "version": "1.5.10",
+      "port-version": 2
+    },
     {
       "git-tree": "76a3ae8e21ad9736741ecc58522805647fdbb7b9",
       "version": "1.5.10",
diff --git a/external_imported/vcpkg/versions/l-/libev.json b/external_imported/vcpkg/versions/l-/libev.json
new file mode 100644
index 000000000..2a759b211
--- /dev/null
+++ b/external_imported/vcpkg/versions/l-/libev.json
@@ -0,0 +1,19 @@
+{
+  "versions": [
+    {
+      "git-tree": "1287c21bdb7398762b3906c5daaab7b537bea188",
+      "version": "4.33",
+      "port-version": 2
+    },
+    {
+      "git-tree": "cfde981a39ab06f99274a246ccbb342b51efe55f",
+      "version": "4.33",
+      "port-version": 1
+    },
+    {
+      "git-tree": "8602cc86e0ede2c2f32fb03b1e2bfd0698331bf3",
+      "version": "4.33",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/l-/libeventheader-decode.json b/external_imported/vcpkg/versions/l-/libeventheader-decode.json
new file mode 100644
index 000000000..46ee8b0a9
--- /dev/null
+++ b/external_imported/vcpkg/versions/l-/libeventheader-decode.json
@@ -0,0 +1,24 @@
+{
+  "versions": [
+    {
+      "git-tree": "857383da3bf1b1947838e23bb1a9066c31cb00da",
+      "version": "1.3.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "75e4da728961822b82de47fb036aeae025893fb6",
+      "version": "1.2.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0e830f1815ed8de8c73a7e90841533854b54261c",
+      "version": "1.1.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "fd67531cc60d91c4d8b45da15cd7414b398b9cd7",
+      "version": "1.0.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/l-/libeventheader-tracepoint.json b/external_imported/vcpkg/versions/l-/libeventheader-tracepoint.json
new file mode 100644
index 000000000..ae92c6a02
--- /dev/null
+++ b/external_imported/vcpkg/versions/l-/libeventheader-tracepoint.json
@@ -0,0 +1,24 @@
+{
+  "versions": [
+    {
+      "git-tree": "32f98983357ea758d5d4e9a7fd6ccd119fa5d598",
+      "version": "1.3.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "076106bc342a9e9253ced5bfd4e13ac16b360d20",
+      "version": "1.2.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ba5030dde966e742b068efb77cab8f820f0ab7ea",
+      "version": "1.1.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d8ba8b72bb5c6dde050b85f84e01efb6b36d535c",
+      "version": "1.0.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/l-/libevhtp.json b/external_imported/vcpkg/versions/l-/libevhtp.json
index 9f95de9fb..384d6b725 100644
--- a/external_imported/vcpkg/versions/l-/libevhtp.json
+++ b/external_imported/vcpkg/versions/l-/libevhtp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "21ee98ebfdc5d2b8992e13025b5d3ebdb8f91c0b",
+      "version": "1.2.18",
+      "port-version": 5
+    },
     {
       "git-tree": "9c59887d9051f4888af2a2ab5528e134ef9dce5a",
       "version": "1.2.18",
diff --git a/external_imported/vcpkg/versions/l-/libexif.json b/external_imported/vcpkg/versions/l-/libexif.json
index 40d2a2cbe..58ea732ad 100644
--- a/external_imported/vcpkg/versions/l-/libexif.json
+++ b/external_imported/vcpkg/versions/l-/libexif.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "de3b3a5ade33ccafbeb4a00cde07954717240eee",
+      "version": "0.6.24",
+      "port-version": 2
+    },
+    {
+      "git-tree": "40f7058e18a937bab35b7213595fc4eef5de7dec",
+      "version": "0.6.24",
+      "port-version": 1
+    },
     {
       "git-tree": "7194d724b7e14c0d3661153bc81f614a86276c6a",
       "version": "0.6.24",
diff --git a/external_imported/vcpkg/versions/l-/libfabric.json b/external_imported/vcpkg/versions/l-/libfabric.json
index f12f77fad..913c91063 100644
--- a/external_imported/vcpkg/versions/l-/libfabric.json
+++ b/external_imported/vcpkg/versions/l-/libfabric.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "19c6e0eeaef3d31e6a2f722a99d418bc03275f1a",
+      "version-semver": "1.13.2",
+      "port-version": 2
+    },
     {
       "git-tree": "d0a766bd1f01a742dcc12e13bafd741b94d7a3c0",
       "version-semver": "1.13.2",
diff --git a/external_imported/vcpkg/versions/l-/libffi.json b/external_imported/vcpkg/versions/l-/libffi.json
index a5e726fd6..547478dfc 100644
--- a/external_imported/vcpkg/versions/l-/libffi.json
+++ b/external_imported/vcpkg/versions/l-/libffi.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "982248d325407b09d26ad0d929f67fd0b873f984",
+      "version": "3.4.4",
+      "port-version": 6
+    },
+    {
+      "git-tree": "db85488447cfda7bcc5e08452d8581ac0295b4c9",
+      "version": "3.4.4",
+      "port-version": 5
+    },
+    {
+      "git-tree": "d189744d6e4f29ab0a2f88f3c75f01d0c3719618",
+      "version": "3.4.4",
+      "port-version": 4
+    },
+    {
+      "git-tree": "5229da2e57e35c0ab7d043b27c19a29355e0a2c2",
+      "version": "3.4.4",
+      "port-version": 3
+    },
+    {
+      "git-tree": "df29b345dbd3f713c6bad15ca3d5f19ec961d79f",
+      "version": "3.4.4",
+      "port-version": 2
+    },
     {
       "git-tree": "2422375e9ac93e01de0b511e1181000c340da613",
       "version": "3.4.4",
diff --git a/external_imported/vcpkg/versions/l-/libflac.json b/external_imported/vcpkg/versions/l-/libflac.json
index 7ee0e0f54..488180317 100644
--- a/external_imported/vcpkg/versions/l-/libflac.json
+++ b/external_imported/vcpkg/versions/l-/libflac.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b03480bcc5f27cdc9a5f51fef012f880f1b0bf8d",
+      "version": "1.4.3",
+      "port-version": 0
+    },
     {
       "git-tree": "d5f68de2a2c015247322b369a6b94052135df51a",
       "version": "1.4.2",
diff --git a/external_imported/vcpkg/versions/l-/libfreenect2.json b/external_imported/vcpkg/versions/l-/libfreenect2.json
index 3100a1da8..5e459c46d 100644
--- a/external_imported/vcpkg/versions/l-/libfreenect2.json
+++ b/external_imported/vcpkg/versions/l-/libfreenect2.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "41b1ddb75208930631ff81c5a19a86c7f0308791",
+      "version": "0.2.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "bfa5e96443079122b324178a6ed421423067039a",
+      "version": "0.2.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "68766f591851bf3b1bf97eff04a69dcd894d712a",
+      "version": "0.2.0",
+      "port-version": 10
+    },
     {
       "git-tree": "33bfc70d84b528fa549f57401c884abda1073526",
       "version": "0.2.0",
diff --git a/external_imported/vcpkg/versions/l-/libftdi.json b/external_imported/vcpkg/versions/l-/libftdi.json
index 56af2c4eb..c22539bd1 100644
--- a/external_imported/vcpkg/versions/l-/libftdi.json
+++ b/external_imported/vcpkg/versions/l-/libftdi.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "add947883422e59d9fec0bbd2080ac8dc95b29d0",
+      "version": "0.20",
+      "port-version": 5
+    },
     {
       "git-tree": "8dbb6c205662e734acdf218146e78db6bd3795a1",
       "version-string": "0.20",
diff --git a/external_imported/vcpkg/versions/l-/libftdi1.json b/external_imported/vcpkg/versions/l-/libftdi1.json
index a03ff9797..9794117a3 100644
--- a/external_imported/vcpkg/versions/l-/libftdi1.json
+++ b/external_imported/vcpkg/versions/l-/libftdi1.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ef6feb3ad01d1d2483c5a369fd4e6bf3587ff52d",
+      "version": "1.5",
+      "port-version": 4
+    },
     {
       "git-tree": "bfed0e0f6e07e8ce7a94f47efbad9dde21f193c8",
       "version": "1.5",
diff --git a/external_imported/vcpkg/versions/l-/libgcrypt.json b/external_imported/vcpkg/versions/l-/libgcrypt.json
index b959ae209..3e9265716 100644
--- a/external_imported/vcpkg/versions/l-/libgcrypt.json
+++ b/external_imported/vcpkg/versions/l-/libgcrypt.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fb85f5dab3e4cacb5da45cf352ca23a25d7c4d18",
+      "version": "1.10.2",
+      "port-version": 0
+    },
     {
       "git-tree": "47460b53b2ea4430d6b020f00d4a4557ef690427",
       "version": "1.10.1",
diff --git a/external_imported/vcpkg/versions/l-/libgeotiff.json b/external_imported/vcpkg/versions/l-/libgeotiff.json
index c539bb5da..d231b03ab 100644
--- a/external_imported/vcpkg/versions/l-/libgeotiff.json
+++ b/external_imported/vcpkg/versions/l-/libgeotiff.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f42371900964fce2757e37ad8d36ca2b7bd0dfd8",
+      "version": "1.7.1",
+      "port-version": 3
+    },
     {
       "git-tree": "2397fd7d09c89af1810821e9b4c47ec71e2748c5",
       "version": "1.7.1",
diff --git a/external_imported/vcpkg/versions/l-/libgig.json b/external_imported/vcpkg/versions/l-/libgig.json
new file mode 100644
index 000000000..b68106b2e
--- /dev/null
+++ b/external_imported/vcpkg/versions/l-/libgig.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "328bc5b2b64bc33badee7d282589b14d49aadb55",
+      "version": "4.3.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/l-/libgit2.json b/external_imported/vcpkg/versions/l-/libgit2.json
index 170466619..3f4938ddc 100644
--- a/external_imported/vcpkg/versions/l-/libgit2.json
+++ b/external_imported/vcpkg/versions/l-/libgit2.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "7a3e64338633f5a89dca3586094f3f156f5a0a42",
+      "version-semver": "1.6.4",
+      "port-version": 1
+    },
+    {
+      "git-tree": "e400f294d284f6a7ff3a19b2454c919873405f08",
+      "version-semver": "1.6.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "7c2173f86743e6e3c6759d5c781f236c08adbec4",
+      "version-semver": "1.4.2",
+      "port-version": 3
+    },
+    {
+      "git-tree": "d5c636f8eb77d7d68c2a4b41fcd7d68759fb9ad0",
+      "version-semver": "1.4.2",
+      "port-version": 2
+    },
+    {
+      "git-tree": "53a1a7485857995d3b4cc5a2b6eaa22d6c6b036c",
+      "version-semver": "1.4.2",
+      "port-version": 1
+    },
     {
       "git-tree": "e036ca61d2e12b110c920cadf92f0aa4f39cac9b",
       "version-semver": "1.4.2",
diff --git a/external_imported/vcpkg/versions/l-/libgme.json b/external_imported/vcpkg/versions/l-/libgme.json
new file mode 100644
index 000000000..3c2b9a244
--- /dev/null
+++ b/external_imported/vcpkg/versions/l-/libgme.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "2472a6f203e9ed53baddf37ab2c075a57254d68a",
+      "version": "0.6.3",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/l-/libgnutls.json b/external_imported/vcpkg/versions/l-/libgnutls.json
index 74beeb301..997bb9db7 100644
--- a/external_imported/vcpkg/versions/l-/libgnutls.json
+++ b/external_imported/vcpkg/versions/l-/libgnutls.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "cdcde91b6757c786647f9bfafef1e0f02591a859",
+      "version": "3.8.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "7818d88f0b76ec5775b8bc6269ebf22d9aea466d",
+      "version": "3.8.1",
+      "port-version": 0
+    },
     {
       "git-tree": "93d9f1a3a919257ac3d518297d3ef4d34b5f5e3e",
       "version": "3.7.8",
diff --git a/external_imported/vcpkg/versions/l-/libgpg-error.json b/external_imported/vcpkg/versions/l-/libgpg-error.json
index f7edf93a2..e49bc8616 100644
--- a/external_imported/vcpkg/versions/l-/libgpg-error.json
+++ b/external_imported/vcpkg/versions/l-/libgpg-error.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4375cd3cc867a96a2d8b5e99a425b9b3efb4f863",
+      "version": "1.47",
+      "port-version": 0
+    },
     {
       "git-tree": "29784b31b199a3d0c00583b6619f73b834e1b3ed",
       "version": "1.46",
diff --git a/external_imported/vcpkg/versions/l-/libgpiod.json b/external_imported/vcpkg/versions/l-/libgpiod.json
index 4e8ba921e..bd2c95640 100644
--- a/external_imported/vcpkg/versions/l-/libgpiod.json
+++ b/external_imported/vcpkg/versions/l-/libgpiod.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "713a85c4d9f0bd1ac4875689d6fde524ba416f33",
+      "version": "2.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c470b2f0c5a31ebee904f7486e50b2adf0f8e8c2",
+      "version": "2.0.2",
+      "port-version": 1
+    },
+    {
+      "git-tree": "e78935fc408abcc2e62d8d1ca1831b0fd5510b7d",
+      "version": "2.0.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d5fde793827568c4be74cb76793650e37e3e5354",
+      "version": "2.0.1",
+      "port-version": 0
+    },
     {
       "git-tree": "effc79de6dafb6ef6762bd2863a222c6090881e8",
       "version": "1.6.3",
diff --git a/external_imported/vcpkg/versions/l-/libgta.json b/external_imported/vcpkg/versions/l-/libgta.json
index 11b71b662..7ce423a65 100644
--- a/external_imported/vcpkg/versions/l-/libgta.json
+++ b/external_imported/vcpkg/versions/l-/libgta.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ad7c16c2d14fa0d5a68a29c2a1cf3708897578ca",
+      "version": "1.0.8",
+      "port-version": 5
+    },
     {
       "git-tree": "644750a061baad1274a079365e11001849aa901e",
       "version-string": "1.0.8",
diff --git a/external_imported/vcpkg/versions/l-/libguarded.json b/external_imported/vcpkg/versions/l-/libguarded.json
index 2e1bb5fe2..6d263f335 100644
--- a/external_imported/vcpkg/versions/l-/libguarded.json
+++ b/external_imported/vcpkg/versions/l-/libguarded.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "626fd11ff4faf2724d17861ab93b4fa9bb002591",
+      "version": "1.4.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "139aa9fff34e4003d7dab0be9699501c91a6d8ad",
+      "version-date": "2019-08-27",
+      "port-version": 3
+    },
     {
       "git-tree": "f3bf2a0dfd157d2505e5e992ec7c1fdc6a301198",
       "version-string": "2019-08-27",
diff --git a/external_imported/vcpkg/versions/l-/libgwenhywfar.json b/external_imported/vcpkg/versions/l-/libgwenhywfar.json
index 2fe591469..2bd0cd1d5 100644
--- a/external_imported/vcpkg/versions/l-/libgwenhywfar.json
+++ b/external_imported/vcpkg/versions/l-/libgwenhywfar.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "8b4376fdc006cc932f5bc581b32479ebd273b275",
+      "version-semver": "5.6.0",
+      "port-version": 5
+    },
+    {
+      "git-tree": "6402ae94301ce25a7f846286954d8847e1360871",
+      "version-semver": "5.6.0",
+      "port-version": 4
+    },
+    {
+      "git-tree": "82aafb480367645c4ef047b08b420a8926b1b24e",
+      "version-semver": "5.6.0",
+      "port-version": 3
+    },
     {
       "git-tree": "0aa4c84df4c2b05214574c2dbd524dfee2b694f8",
       "version-semver": "5.6.0",
diff --git a/external_imported/vcpkg/versions/l-/libgxps.json b/external_imported/vcpkg/versions/l-/libgxps.json
index ef93cc3ff..9228e066b 100644
--- a/external_imported/vcpkg/versions/l-/libgxps.json
+++ b/external_imported/vcpkg/versions/l-/libgxps.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "125d54e29f5fc30ff36b06a7aad569d5f6064289",
+      "version": "0.3.2",
+      "port-version": 2
+    },
     {
       "git-tree": "bc4e4576421dec679fb4a7c09497cbc13f99df00",
       "version": "0.3.2",
diff --git a/external_imported/vcpkg/versions/l-/libharu.json b/external_imported/vcpkg/versions/l-/libharu.json
index d5a4d1a30..6529e3e2a 100644
--- a/external_imported/vcpkg/versions/l-/libharu.json
+++ b/external_imported/vcpkg/versions/l-/libharu.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0acfe5296a4986caf51cea318361967f5d57e3ee",
+      "version": "2.4.4",
+      "port-version": 0
+    },
     {
       "git-tree": "0418db9cf0a5dac68fd54f5a6dfc384bbece1406",
       "version": "2.4.3",
diff --git a/external_imported/vcpkg/versions/l-/libhdfs3.json b/external_imported/vcpkg/versions/l-/libhdfs3.json
index 4a2c60eab..2ab51ca74 100644
--- a/external_imported/vcpkg/versions/l-/libhdfs3.json
+++ b/external_imported/vcpkg/versions/l-/libhdfs3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b7c6b5d79957e7f11f9cc7b0890275edd627606d",
+      "version-date": "2019-11-05",
+      "port-version": 5
+    },
     {
       "git-tree": "802dd2510f39b3d717606d2dfa047278e8772ff4",
       "version-date": "2019-11-05",
diff --git a/external_imported/vcpkg/versions/l-/libheif.json b/external_imported/vcpkg/versions/l-/libheif.json
index 2b7637235..8d45c4f14 100644
--- a/external_imported/vcpkg/versions/l-/libheif.json
+++ b/external_imported/vcpkg/versions/l-/libheif.json
@@ -1,5 +1,50 @@
 {
   "versions": [
+    {
+      "git-tree": "b5871a26f6e90560089b413fc136e7f0062885b8",
+      "version": "1.17.6",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5eb0bdc7d44de9fae5e799b6f5a34121daf181f2",
+      "version": "1.17.5",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c2055d6d66f9ba0a12257bc2fa852b3c9e234091",
+      "version": "1.17.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "32b640f029df01a4322b7d36d9405cf366c7811d",
+      "version": "1.17.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "bfddf765a3840434bd1306bc48193566642e9bef",
+      "version": "1.17.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "1874b1dd0f2756a3254c8eec416430b941af7b6e",
+      "version": "1.16.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4ee9a2b84e8279ba555de6f0f5e3f93b93b98d5d",
+      "version": "1.16.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "30bfad0af10297606d1687eba9fabe7b5eda60e8",
+      "version": "1.16.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e2b6e5599374567a1f1f61821adc8064fcfaaa0f",
+      "version": "1.15.1",
+      "port-version": 1
+    },
     {
       "git-tree": "b1cec44f5cafb35417b528d35cad601c3b1c6952",
       "version": "1.15.1",
diff --git a/external_imported/vcpkg/versions/l-/libhsplasma.json b/external_imported/vcpkg/versions/l-/libhsplasma.json
index dcfd8672a..c037aba83 100644
--- a/external_imported/vcpkg/versions/l-/libhsplasma.json
+++ b/external_imported/vcpkg/versions/l-/libhsplasma.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "445149c7279ad9aa32d1fb947b2d2c331de5fffa",
+      "version-date": "2023-05-08",
+      "port-version": 0
+    },
+    {
+      "git-tree": "23a51f404cad21bb38d5d663ff90af099ec63562",
+      "version-date": "2022-05-19",
+      "port-version": 1
+    },
     {
       "git-tree": "8b2f7f61711ccfb81d5d9a8b34e057494bd5f902",
       "version-date": "2022-05-19",
diff --git a/external_imported/vcpkg/versions/l-/libhv.json b/external_imported/vcpkg/versions/l-/libhv.json
index ea7436d41..36960a2df 100644
--- a/external_imported/vcpkg/versions/l-/libhv.json
+++ b/external_imported/vcpkg/versions/l-/libhv.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "f76c5430e5899a88a85fa7366d046310882f9223",
+      "version": "1.3.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3cccf7a4fde6f5c23138ac228d6d581dba11a76b",
+      "version": "1.3.1",
+      "port-version": 0
+    },
     {
       "git-tree": "13870ce60cbe4c1f12030a7d2319f9f08e860d03",
       "version": "1.3.0",
diff --git a/external_imported/vcpkg/versions/l-/libical.json b/external_imported/vcpkg/versions/l-/libical.json
index 63677c2b6..b2e6426e5 100644
--- a/external_imported/vcpkg/versions/l-/libical.json
+++ b/external_imported/vcpkg/versions/l-/libical.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ef8cbea0185c5c9154f2ef0a38db78541f2e5769",
+      "version": "3.0.17",
+      "port-version": 0
+    },
     {
       "git-tree": "86f667b283c1e7d92dd68a3733d80d2e074db342",
       "version": "3.0.16",
diff --git a/external_imported/vcpkg/versions/l-/libiconv.json b/external_imported/vcpkg/versions/l-/libiconv.json
index bd0520181..142978f11 100644
--- a/external_imported/vcpkg/versions/l-/libiconv.json
+++ b/external_imported/vcpkg/versions/l-/libiconv.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6103c3aaaf279f20df4c758fd25d5954c8582cbd",
+      "version": "1.17",
+      "port-version": 2
+    },
     {
       "git-tree": "4226589d5d658f4d96df83f8539de54dc57a5996",
       "version": "1.17",
diff --git a/external_imported/vcpkg/versions/l-/libics.json b/external_imported/vcpkg/versions/l-/libics.json
index dd0bcac49..5c7597217 100644
--- a/external_imported/vcpkg/versions/l-/libics.json
+++ b/external_imported/vcpkg/versions/l-/libics.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "dd79bb59a4716358360e475a7aaa3ec6a20c80e1",
+      "version": "1.6.6",
+      "port-version": 0
+    },
     {
       "git-tree": "aea77d2369ae831edee51b05bc8dcad585795990",
       "version": "1.6.5",
diff --git a/external_imported/vcpkg/versions/l-/libideviceactivation.json b/external_imported/vcpkg/versions/l-/libideviceactivation.json
index 8d33991d9..29d1637dd 100644
--- a/external_imported/vcpkg/versions/l-/libideviceactivation.json
+++ b/external_imported/vcpkg/versions/l-/libideviceactivation.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "2926e108a78ecdd707c707720093af757292f800",
+      "version-date": "2023-05-01",
+      "port-version": 1
+    },
+    {
+      "git-tree": "5f8ea4177ba77bb2eb82284c8ee31504cb7dfbc7",
+      "version-date": "2023-05-01",
+      "port-version": 0
+    },
     {
       "git-tree": "5ff1d3dc1c70954efdb1b56ea38660c8e2817a68",
       "version": "1.3.17",
diff --git a/external_imported/vcpkg/versions/l-/libidn2.json b/external_imported/vcpkg/versions/l-/libidn2.json
index 552f76f23..65f1e8507 100644
--- a/external_imported/vcpkg/versions/l-/libidn2.json
+++ b/external_imported/vcpkg/versions/l-/libidn2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "20e169744f242f67bc4b4dc310f5785d55dba58c",
+      "version": "2.3.4",
+      "port-version": 3
+    },
     {
       "git-tree": "4784d5f7f99d7ea1ebe6f1ef01943e402e7bfddf",
       "version": "2.3.4",
diff --git a/external_imported/vcpkg/versions/l-/libigl.json b/external_imported/vcpkg/versions/l-/libigl.json
index da1c5373e..c6e149855 100644
--- a/external_imported/vcpkg/versions/l-/libigl.json
+++ b/external_imported/vcpkg/versions/l-/libigl.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "e9b48cd75312e9e77df2c2e7307b063d8737f4ba",
+      "version": "2.5.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "260c09078445cfce5ce800b1d3cfa47877f6f783",
+      "version": "2.4.0",
+      "port-version": 4
+    },
+    {
+      "git-tree": "4754633723fc5e93c13f54e405ce0b8662bb570b",
+      "version": "2.4.0",
+      "port-version": 3
+    },
+    {
+      "git-tree": "b1f7e5126f4bca6f7d6800bb8eb143d1640f8a80",
+      "version": "2.4.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "7a44d46fb03c0127710107883208300358ad960f",
+      "version": "2.4.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "f3426c36bc18bb524834ef9f4482964a3d980fb9",
+      "version": "2.4.0",
+      "port-version": 0
+    },
     {
       "git-tree": "3fbdb4cb097785d6b9814e4a4ec89f8530a51c1a",
       "version": "2.3.0",
diff --git a/external_imported/vcpkg/versions/l-/libimobiledevice-glue.json b/external_imported/vcpkg/versions/l-/libimobiledevice-glue.json
new file mode 100644
index 000000000..0002b1799
--- /dev/null
+++ b/external_imported/vcpkg/versions/l-/libimobiledevice-glue.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "8511a9380c2fc23a78609fd9aaf5a7dde1aef135",
+      "version-date": "2023-05-13",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/l-/libimobiledevice.json b/external_imported/vcpkg/versions/l-/libimobiledevice.json
index 499cdff0b..7704d200e 100644
--- a/external_imported/vcpkg/versions/l-/libimobiledevice.json
+++ b/external_imported/vcpkg/versions/l-/libimobiledevice.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "cdbf91c1b491bd8230042a4c90a3cb3a5baa2e2e",
+      "version-date": "2023-07-05",
+      "port-version": 1
+    },
+    {
+      "git-tree": "b7b8456460bdd58cd90cd74a468c6e16a2053f36",
+      "version-date": "2023-07-05",
+      "port-version": 0
+    },
+    {
+      "git-tree": "7b950fc1c05e12ac6349b88de19d2df84e9393a7",
+      "version": "1.3.17",
+      "port-version": 4
+    },
+    {
+      "git-tree": "c29103e4c8a3225f67bcfbc45b1eb128ab2c8939",
+      "version": "1.3.17",
+      "port-version": 3
+    },
     {
       "git-tree": "2945a66f7411d4b12ab5733be25abd5319a12718",
       "version": "1.3.17",
diff --git a/external_imported/vcpkg/versions/l-/libirecovery.json b/external_imported/vcpkg/versions/l-/libirecovery.json
index bbd8f7740..d831fbc0b 100644
--- a/external_imported/vcpkg/versions/l-/libirecovery.json
+++ b/external_imported/vcpkg/versions/l-/libirecovery.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "d47bd1d38f72799238f2d815b96b11bb11d9ea14",
+      "version-date": "2023-05-13",
+      "port-version": 2
+    },
+    {
+      "git-tree": "72b9637bc62e62eb478d09618545c419bf21ed48",
+      "version-date": "2023-05-13",
+      "port-version": 1
+    },
+    {
+      "git-tree": "0e9b8ce22a277344a7f29c62f38bf44458a129ba",
+      "version-date": "2023-05-13",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d3d139450efc9411edc51dea49130dddf09a08d0",
+      "version": "1.0.25",
+      "port-version": 8
+    },
+    {
+      "git-tree": "bd02ed99ae380b71fb4bc55f98012c20e7d73bb8",
+      "version": "1.0.25",
+      "port-version": 7
+    },
     {
       "git-tree": "da471f398ce0264ef333dfbaaa521c79c51ab5f9",
       "version": "1.0.25",
diff --git a/external_imported/vcpkg/versions/l-/libjpeg-turbo.json b/external_imported/vcpkg/versions/l-/libjpeg-turbo.json
index 777ed5143..465350837 100644
--- a/external_imported/vcpkg/versions/l-/libjpeg-turbo.json
+++ b/external_imported/vcpkg/versions/l-/libjpeg-turbo.json
@@ -1,5 +1,40 @@
 {
   "versions": [
+    {
+      "git-tree": "6d061c71a48ca2abff5cf471f77ef14d7222aa52",
+      "version": "3.0.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "481b08127d4002ba7441f144df259e03271e7592",
+      "version": "3.0.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4510832adaa3f5f415a59d26f5520ca250a8ff77",
+      "version": "3.0.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "91d431c26902a8c0b21e7956caa136093b7d7d6b",
+      "version": "3.0.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "3cd08939c6dab1963ac5b309a4205b2f4534fb79",
+      "version": "3.0.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a54bb2bec4dfc177249e2c10b31a665c249c660c",
+      "version": "2.1.5.1",
+      "port-version": 2
+    },
+    {
+      "git-tree": "2764640a1b2cc36636084470108de50f2b531085",
+      "version": "2.1.5.1",
+      "port-version": 1
+    },
     {
       "git-tree": "2b3b3fe0c258463586c0e421a2665ca1d2df9b4d",
       "version": "2.1.5.1",
diff --git a/external_imported/vcpkg/versions/l-/libjuice.json b/external_imported/vcpkg/versions/l-/libjuice.json
index 43ac165f4..53fc9f9c2 100644
--- a/external_imported/vcpkg/versions/l-/libjuice.json
+++ b/external_imported/vcpkg/versions/l-/libjuice.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "cec7d18be0750c35cd874ffa3a494a44f37e2aa9",
+      "version": "1.3.4",
+      "port-version": 1
+    },
+    {
+      "git-tree": "124bb0aff578c4ef748087f00e23f0b0e038c91d",
+      "version": "1.3.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "1ace25316c085db75ac26220e854bd83baa86294",
+      "version": "1.3.1",
+      "port-version": 0
+    },
     {
       "git-tree": "f93f38276ee4097f4b4e85f58b14aaa7e0cda3d4",
       "version": "1.0.6",
diff --git a/external_imported/vcpkg/versions/l-/libjxl.json b/external_imported/vcpkg/versions/l-/libjxl.json
index 32aa6c43a..518d68885 100644
--- a/external_imported/vcpkg/versions/l-/libjxl.json
+++ b/external_imported/vcpkg/versions/l-/libjxl.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "9e8bdc34b806242bb7ed7fbabdf75d4781b3f7b7",
+      "version-semver": "0.8.2",
+      "port-version": 1
+    },
+    {
+      "git-tree": "f97d35060ccfc751fc3729988cef203437c5a0dc",
+      "version-semver": "0.8.2",
+      "port-version": 0
+    },
     {
       "git-tree": "71f8a111c3c34f376f7b8031205dcec298ec0410",
       "version-semver": "0.8.1",
diff --git a/external_imported/vcpkg/versions/l-/libkeyfinder.json b/external_imported/vcpkg/versions/l-/libkeyfinder.json
index 15caacdc3..08a8f2d6b 100644
--- a/external_imported/vcpkg/versions/l-/libkeyfinder.json
+++ b/external_imported/vcpkg/versions/l-/libkeyfinder.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fb2b9f8da5e789508d5ceb645907d8e4d73236ce",
+      "version": "2.2.6",
+      "port-version": 1
+    },
     {
       "git-tree": "567c6574c6e38d9a10b7e08951c4c3a0fc72e3cb",
       "version": "2.2.6",
diff --git a/external_imported/vcpkg/versions/l-/libkml.json b/external_imported/vcpkg/versions/l-/libkml.json
index 8196268bb..2819edd60 100644
--- a/external_imported/vcpkg/versions/l-/libkml.json
+++ b/external_imported/vcpkg/versions/l-/libkml.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "010ce552eaee999aaf220936eb3e46b5bb88a9fc",
+      "version": "1.3.0",
+      "port-version": 13
+    },
+    {
+      "git-tree": "84ea1bd884a5d5afee127b15e73ef5bb7ba638dc",
+      "version": "1.3.0",
+      "port-version": 12
+    },
     {
       "git-tree": "4969a3e81df3ef13b5e3f2f94e652311df8bbafe",
       "version": "1.3.0",
diff --git a/external_imported/vcpkg/versions/l-/liblas.json b/external_imported/vcpkg/versions/l-/liblas.json
index 2320dddf3..139dc3fad 100644
--- a/external_imported/vcpkg/versions/l-/liblas.json
+++ b/external_imported/vcpkg/versions/l-/liblas.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "96d1baf788089a2e886fc46cc5e10851df613374",
+      "version": "1.8.1",
+      "port-version": 14
+    },
+    {
+      "git-tree": "a72a32ce085b262e26bcadc55efd0159fdf00c4f",
+      "version": "1.8.1",
+      "port-version": 13
+    },
+    {
+      "git-tree": "c8f90c515041e9c2633daee8e536e8e5e9ce0170",
+      "version": "1.8.1",
+      "port-version": 12
+    },
     {
       "git-tree": "aff83be201bcfe7db23231cf8ab667541294c4a6",
       "version": "1.8.1",
diff --git a/external_imported/vcpkg/versions/l-/libleidenalg.json b/external_imported/vcpkg/versions/l-/libleidenalg.json
index e559f6158..289c3cbb5 100644
--- a/external_imported/vcpkg/versions/l-/libleidenalg.json
+++ b/external_imported/vcpkg/versions/l-/libleidenalg.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "54e658de6b5148a82e4f7ef8e56e5d56db8deedb",
+      "version": "0.10.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "4c059e549496795874b93130451377bb09a78630",
+      "version": "0.10.0",
+      "port-version": 0
+    },
     {
       "git-tree": "9696d8a2ec996f80576288839bc059f5adf65eaa",
       "version": "0.9.0",
diff --git a/external_imported/vcpkg/versions/l-/liblemon.json b/external_imported/vcpkg/versions/l-/liblemon.json
index a41680654..55c66a450 100644
--- a/external_imported/vcpkg/versions/l-/liblemon.json
+++ b/external_imported/vcpkg/versions/l-/liblemon.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "2bf1f61e61e2ed7917a9ec102b564a6c68229d7b",
+      "version-date": "2019-06-13",
+      "port-version": 9
+    },
+    {
+      "git-tree": "6bdd7ed9804fee3e743082bb048916a213777a79",
+      "version-date": "2019-06-13",
+      "port-version": 8
+    },
+    {
+      "git-tree": "e7357874ce9b71f43cb1c298dbb1228ac9241a69",
+      "version-date": "2019-06-13",
+      "port-version": 7
+    },
+    {
+      "git-tree": "b51839207be0c83364a5fa07660067ea774cc814",
+      "version-date": "2019-06-13",
+      "port-version": 6
+    },
+    {
+      "git-tree": "bc35a6ae066974d006a1d3a50f2072acd6f4fcc5",
+      "version-date": "2019-06-13",
+      "port-version": 5
+    },
     {
       "git-tree": "49e74def611d3992ae671c2972eff648fe9437ed",
       "version-string": "2019-06-13",
diff --git a/external_imported/vcpkg/versions/l-/liblo.json b/external_imported/vcpkg/versions/l-/liblo.json
index e16802018..e95270bb7 100644
--- a/external_imported/vcpkg/versions/l-/liblo.json
+++ b/external_imported/vcpkg/versions/l-/liblo.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "31c66c76504889c3dbcbea04424b8ea993e2c63a",
+      "version": "0.31",
+      "port-version": 4
+    },
     {
       "git-tree": "a70409d660234bfbc8c3cbeaff029d9e5f5b890c",
       "version-string": "0.31",
diff --git a/external_imported/vcpkg/versions/l-/liblsl.json b/external_imported/vcpkg/versions/l-/liblsl.json
index 4d9b63a7d..4ad750d22 100644
--- a/external_imported/vcpkg/versions/l-/liblsl.json
+++ b/external_imported/vcpkg/versions/l-/liblsl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "bc1c3d9c2142ad970d88c0a79f680b31c8d674f9",
+      "version": "1.16.2",
+      "port-version": 0
+    },
     {
       "git-tree": "6849296814880dca06ffd923d7d5c8fc3e4f2a9c",
       "version": "1.16.1",
diff --git a/external_imported/vcpkg/versions/l-/liblsquic.json b/external_imported/vcpkg/versions/l-/liblsquic.json
index 0280cb1bd..d94777b3e 100644
--- a/external_imported/vcpkg/versions/l-/liblsquic.json
+++ b/external_imported/vcpkg/versions/l-/liblsquic.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "0368e7d992fcf1272735695f405a56c9a7c35ff6",
+      "version": "3.3.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9117a86afaed60857454ba0b5a5e684fc947ba56",
+      "version": "3.1.1",
+      "port-version": 2
+    },
     {
       "git-tree": "2a2383de53efd9458419db7bd82db49b342023da",
       "version": "3.1.1",
diff --git a/external_imported/vcpkg/versions/l-/liblzma.json b/external_imported/vcpkg/versions/l-/liblzma.json
index 9805c267d..ee12a2142 100644
--- a/external_imported/vcpkg/versions/l-/liblzma.json
+++ b/external_imported/vcpkg/versions/l-/liblzma.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "f285b7c4ffa2cc065c7c6fec4b61006f7fa2714e",
+      "version": "5.4.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3f97f6a0904a3add9c3273f8ab1993902d75d5ef",
+      "version": "5.4.3",
+      "port-version": 1
+    },
+    {
+      "git-tree": "ba357d6805e44b3df1ed4343801f1b61a5d63de0",
+      "version": "5.4.3",
+      "port-version": 0
+    },
     {
       "git-tree": "9a3ebbf75e1c3adb76d7e71717c1f03bb291036a",
       "version-semver": "5.4.1",
diff --git a/external_imported/vcpkg/versions/l-/libmad.json b/external_imported/vcpkg/versions/l-/libmad.json
index 5e0cd6eab..2529730c1 100644
--- a/external_imported/vcpkg/versions/l-/libmad.json
+++ b/external_imported/vcpkg/versions/l-/libmad.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "7016c2c6c5e65a6420a176aa97696897bb134c40",
+      "version": "0.16.4",
+      "port-version": 1
+    },
+    {
+      "git-tree": "ca6bd50225347461a9d72269c1b7d082a691f31d",
+      "version": "0.16.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "88e56333079029031e808b84c95ded6dd33a2bbd",
+      "version": "0.15.1",
+      "port-version": 13
+    },
+    {
+      "git-tree": "eaed142825775ca972204c5c2d7720043eef3c2b",
+      "version": "0.15.1",
+      "port-version": 12
+    },
+    {
+      "git-tree": "c4393712733ce1f3078a4ec0a042736e5862efa7",
+      "version": "0.15.1",
+      "port-version": 11
+    },
     {
       "git-tree": "ff3cd79e45546dc58e00a69696ae1f8b900e231a",
       "version-string": "0.15.1",
diff --git a/external_imported/vcpkg/versions/l-/libmagic.json b/external_imported/vcpkg/versions/l-/libmagic.json
index 9f7690d0d..a1d52c3b1 100644
--- a/external_imported/vcpkg/versions/l-/libmagic.json
+++ b/external_imported/vcpkg/versions/l-/libmagic.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "65715ba20e3afecd46e0fb81326503257174585f",
+      "version": "5.45",
+      "port-version": 1
+    },
+    {
+      "git-tree": "30ebcd2ff5522b8c72ba5a5cadd840df34350382",
+      "version": "5.45",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2bb05dd744d7eb83ad0a8d887ef589aaea37f6b3",
+      "version": "5.40",
+      "port-version": 3
+    },
+    {
+      "git-tree": "d70a57e09ed4060b2ade1cb1f80bcbdbd8a7a1ec",
+      "version": "5.40",
+      "port-version": 2
+    },
     {
       "git-tree": "7bc1a88e28473967fafa7be73db0304f127ae202",
       "version-string": "5.40",
diff --git a/external_imported/vcpkg/versions/l-/libmariadb.json b/external_imported/vcpkg/versions/l-/libmariadb.json
index 806f9ba2a..d32ea0733 100644
--- a/external_imported/vcpkg/versions/l-/libmariadb.json
+++ b/external_imported/vcpkg/versions/l-/libmariadb.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c3d524a86a6280626f4955396e2dc21ad5f8be35",
+      "version-semver": "3.3.1",
+      "port-version": 3
+    },
     {
       "git-tree": "99cf48b4599872b087d938a2f4ccdbca34f61f1a",
       "version-semver": "3.3.1",
diff --git a/external_imported/vcpkg/versions/l-/libmaxminddb.json b/external_imported/vcpkg/versions/l-/libmaxminddb.json
index f0b9548d5..992f08d71 100644
--- a/external_imported/vcpkg/versions/l-/libmaxminddb.json
+++ b/external_imported/vcpkg/versions/l-/libmaxminddb.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "446fd110747f3e6bc09f822e89d30f144eb52a9f",
+      "version": "1.9.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a396718bfaa9c8e9e950cb3aaedb7bd562a157a7",
+      "version": "1.7.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2bac54e78c424e4420145ae4a407e7b88229a387",
+      "version": "1.4.3",
+      "port-version": 3
+    },
     {
       "git-tree": "71bed10d6ad6ff2a80692e0b920e01e3c7509bf7",
       "version-string": "1.4.3",
diff --git a/external_imported/vcpkg/versions/l-/libmediainfo.json b/external_imported/vcpkg/versions/l-/libmediainfo.json
index d4f1014c7..126956d97 100644
--- a/external_imported/vcpkg/versions/l-/libmediainfo.json
+++ b/external_imported/vcpkg/versions/l-/libmediainfo.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "e2bccca86faecebdacabafa1ff7b63e34168d342",
+      "version": "23.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a5adf3a515c6144124fe9bb1825505de0f234b8c",
+      "version": "23.4",
+      "port-version": 0
+    },
     {
       "git-tree": "a6b640103a75b965e6527d10819d276c2193775d",
       "version-string": "21.03",
diff --git a/external_imported/vcpkg/versions/l-/libmesh.json b/external_imported/vcpkg/versions/l-/libmesh.json
index 555e78ddd..6aae1b7e5 100644
--- a/external_imported/vcpkg/versions/l-/libmesh.json
+++ b/external_imported/vcpkg/versions/l-/libmesh.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "7c6d096079002a5a867cccb4f6204f871eeaf2e1",
+      "version": "1.5.0",
+      "port-version": 6
+    },
+    {
+      "git-tree": "73d90f24859b402b05ffe0e27eea3db3ab58a2ea",
+      "version": "1.5.0",
+      "port-version": 5
+    },
     {
       "git-tree": "347e56f7cd6e4bf1ca5621c564e4421a7f5a45cd",
       "version": "1.5.0",
diff --git a/external_imported/vcpkg/versions/l-/libmicrodns.json b/external_imported/vcpkg/versions/l-/libmicrodns.json
index 03ec5150c..753246036 100644
--- a/external_imported/vcpkg/versions/l-/libmicrodns.json
+++ b/external_imported/vcpkg/versions/l-/libmicrodns.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "7476d4e62a4bec9d779d445ae3222c505aa4babe",
+      "version": "0.2.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "6ea7d0ad7b306f0c554fff32499486c6c4758105",
+      "version": "0.2.0",
+      "port-version": 1
+    },
     {
       "git-tree": "479151454954c9fe2e5ddce7f1b358f3c8688ce8",
       "version": "0.2.0",
diff --git a/external_imported/vcpkg/versions/l-/libmicrohttpd.json b/external_imported/vcpkg/versions/l-/libmicrohttpd.json
index d90a9e06b..deb1c8061 100644
--- a/external_imported/vcpkg/versions/l-/libmicrohttpd.json
+++ b/external_imported/vcpkg/versions/l-/libmicrohttpd.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "528d4043cc7a0784b2f1e1ba77455a8559498b2e",
+      "version": "0.9.77",
+      "port-version": 2
+    },
+    {
+      "git-tree": "0adb976e126f21ec1db080fe45b8b6e084bbbd5b",
+      "version": "0.9.77",
+      "port-version": 1
+    },
+    {
+      "git-tree": "99533d05bd2e457102ebabc8c74a065bc62eb900",
+      "version": "0.9.77",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f1b42f3ba710ee2202398b46cc349adfa90cd3d9",
+      "version": "0.9.75",
+      "port-version": 1
+    },
     {
       "git-tree": "059bfe5715b9179cbd4d365ca571e6fade762700",
       "version": "0.9.75",
diff --git a/external_imported/vcpkg/versions/l-/libmikmod.json b/external_imported/vcpkg/versions/l-/libmikmod.json
index de3f9ad5c..ff0c44123 100644
--- a/external_imported/vcpkg/versions/l-/libmikmod.json
+++ b/external_imported/vcpkg/versions/l-/libmikmod.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f76309c386e04e04888bb094d32b960d0c3cdc39",
+      "version": "3.3.11.1",
+      "port-version": 12
+    },
     {
       "git-tree": "688a0ecd6fe11127c1f75e04390beea8f582860f",
       "version": "3.3.11.1",
diff --git a/external_imported/vcpkg/versions/l-/libmodbus.json b/external_imported/vcpkg/versions/l-/libmodbus.json
index 2b18b1f3b..8f80b0bcc 100644
--- a/external_imported/vcpkg/versions/l-/libmodbus.json
+++ b/external_imported/vcpkg/versions/l-/libmodbus.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "5af2a746eeb644d4c228d03f4bb7854cf4f5691b",
+      "version": "3.1.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "803427a42499df9013b9e6a4dc3501384fc69760",
+      "version": "3.1.6",
+      "port-version": 5
+    },
     {
       "git-tree": "6fedbd1a42b56a0b3325c6d4bf1e7682a99aafa4",
       "version": "3.1.6",
diff --git a/external_imported/vcpkg/versions/l-/libmodman.json b/external_imported/vcpkg/versions/l-/libmodman.json
index b7eb568c7..44bc210a0 100644
--- a/external_imported/vcpkg/versions/l-/libmodman.json
+++ b/external_imported/vcpkg/versions/l-/libmodman.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "02bcbb8a675722c0d2c205b762074c35805e6bf9",
+      "version": "2.0.1",
+      "port-version": 5
+    },
     {
       "git-tree": "64d71ad6052dd0027325c7e9390ad4264dbef108",
       "version-string": "2.0.1",
diff --git a/external_imported/vcpkg/versions/l-/libmorton.json b/external_imported/vcpkg/versions/l-/libmorton.json
index 1ff7edfe2..baafdd4f9 100644
--- a/external_imported/vcpkg/versions/l-/libmorton.json
+++ b/external_imported/vcpkg/versions/l-/libmorton.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6f00ce462ab2d581aa3d0bb33c2ff37ff745377c",
+      "version": "0.2.12",
+      "port-version": 0
+    },
     {
       "git-tree": "01b61d968554cd38b6d3df05d11beda85750ff11",
       "version": "0.2.11",
diff --git a/external_imported/vcpkg/versions/l-/libmount.json b/external_imported/vcpkg/versions/l-/libmount.json
index 59c6ecef6..a75dfb568 100644
--- a/external_imported/vcpkg/versions/l-/libmount.json
+++ b/external_imported/vcpkg/versions/l-/libmount.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "5fbc2733330a3bac410e90c460db96f54e39e0a5",
+      "version": "2.39",
+      "port-version": 0
+    },
+    {
+      "git-tree": "747604a5c97736ced9e0ef3b2963c2c949bdc655",
+      "version": "2.38",
+      "port-version": 2
+    },
     {
       "git-tree": "a006357933a743ef48b94ce80a0565a1ce608769",
       "version": "2.38",
diff --git a/external_imported/vcpkg/versions/l-/libmspack.json b/external_imported/vcpkg/versions/l-/libmspack.json
index 0cc838253..f0d460cb1 100644
--- a/external_imported/vcpkg/versions/l-/libmspack.json
+++ b/external_imported/vcpkg/versions/l-/libmspack.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "198f4c8a1eac2254110eaed939dc99744c78a58f",
+      "version": "0.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b26826abcd6d912b526809624f838431cb470b3d",
+      "version": "0.10.1",
+      "port-version": 6
+    },
     {
       "git-tree": "4448cdf014a452f1da35c2dd48a2c8b9dca3e08b",
       "version-string": "0.10.1",
diff --git a/external_imported/vcpkg/versions/l-/libmt32emu.json b/external_imported/vcpkg/versions/l-/libmt32emu.json
index b202270b3..3473b4c09 100644
--- a/external_imported/vcpkg/versions/l-/libmt32emu.json
+++ b/external_imported/vcpkg/versions/l-/libmt32emu.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5e0ccfe803d0e3248671df0f3db4d1374a5a31c5",
+      "version": "2.7.1",
+      "port-version": 0
+    },
     {
       "git-tree": "bf84211f16b9b598e1ebd2cee0be2487d2e49fca",
       "version": "2.7.0",
diff --git a/external_imported/vcpkg/versions/l-/libmupdf.json b/external_imported/vcpkg/versions/l-/libmupdf.json
index 67e2b7dc0..e17fd0daa 100644
--- a/external_imported/vcpkg/versions/l-/libmupdf.json
+++ b/external_imported/vcpkg/versions/l-/libmupdf.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "06c0e6bccfaf2ab9f729bfc79318da68cb4897dc",
+      "version": "1.22.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "c1684ff15eed2c86ba792de4e92d21b2ea58c188",
+      "version": "1.22.1",
+      "port-version": 0
+    },
     {
       "git-tree": "9ca3ac09949f15d339ff747bb36f8593ff087959",
       "version": "1.19.0-rc2",
diff --git a/external_imported/vcpkg/versions/l-/libmysql.json b/external_imported/vcpkg/versions/l-/libmysql.json
index 3d97708d5..b8147475c 100644
--- a/external_imported/vcpkg/versions/l-/libmysql.json
+++ b/external_imported/vcpkg/versions/l-/libmysql.json
@@ -1,5 +1,50 @@
 {
   "versions": [
+    {
+      "git-tree": "4fa6006119f50a9baff9cdf0966b065097113fd7",
+      "version": "8.0.34",
+      "port-version": 1
+    },
+    {
+      "git-tree": "91349aeb1e56c0b95d609361ae974a08abace26c",
+      "version": "8.0.34",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5696eb818512a5f9375068dc057c3e074de4bc3d",
+      "version": "8.0.32",
+      "port-version": 6
+    },
+    {
+      "git-tree": "d32101a913ac66b95dff40eb0ce3e315438566ab",
+      "version": "8.0.32",
+      "port-version": 5
+    },
+    {
+      "git-tree": "95618ed8c0e55195ee395eaf7bb230cc61776b33",
+      "version": "8.0.32",
+      "port-version": 4
+    },
+    {
+      "git-tree": "79e48f5efa358526cd1cd290fd477f366863129e",
+      "version": "8.0.32",
+      "port-version": 3
+    },
+    {
+      "git-tree": "8c4f68caa6f20ecfc912028a0f94ef956c154410",
+      "version": "8.0.32",
+      "port-version": 2
+    },
+    {
+      "git-tree": "1c2161c6415adf63a68c648172ff414eef484d4e",
+      "version": "8.0.32",
+      "port-version": 1
+    },
+    {
+      "git-tree": "217137c054653de9a691dce47638979c0f667e2e",
+      "version": "8.0.32",
+      "port-version": 0
+    },
     {
       "git-tree": "099f0d084c8fdad082e86d8291fb2de18f9e73d4",
       "version": "8.0.20",
diff --git a/external_imported/vcpkg/versions/l-/libnice-gst.json b/external_imported/vcpkg/versions/l-/libnice-gst.json
new file mode 100644
index 000000000..d33bcc193
--- /dev/null
+++ b/external_imported/vcpkg/versions/l-/libnice-gst.json
@@ -0,0 +1,24 @@
+{
+  "versions": [
+    {
+      "git-tree": "0454363efa550f5437e9bafac810b425ad2cef12",
+      "version": "0.1.21",
+      "port-version": 3
+    },
+    {
+      "git-tree": "e61d1c0b43c2f4feca65ea7a20ab901ff6e4c025",
+      "version": "0.1.21",
+      "port-version": 2
+    },
+    {
+      "git-tree": "9ea8f77a4a4f70cceb4d65650ee5de24e14e8190",
+      "version": "0.1.21",
+      "port-version": 1
+    },
+    {
+      "git-tree": "3d7072d7e0810ec844b7f4b3ecaa1e325e407be6",
+      "version": "0.1.21",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/l-/libnice.json b/external_imported/vcpkg/versions/l-/libnice.json
index 8e64beb7f..192231bba 100644
--- a/external_imported/vcpkg/versions/l-/libnice.json
+++ b/external_imported/vcpkg/versions/l-/libnice.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "752ea02df5a3ae83ff67c4bfcfc34e9570cc27f9",
+      "version": "0.1.21",
+      "port-version": 1
+    },
+    {
+      "git-tree": "6efccae4d0017390516e28abce03705114131b16",
+      "version": "0.1.21",
+      "port-version": 0
+    },
     {
       "git-tree": "e15c3356146049f0dffd9aef46786677bb4b007e",
       "version": "0.1.18",
diff --git a/external_imported/vcpkg/versions/l-/libnick.json b/external_imported/vcpkg/versions/l-/libnick.json
new file mode 100644
index 000000000..451d6cfb9
--- /dev/null
+++ b/external_imported/vcpkg/versions/l-/libnick.json
@@ -0,0 +1,34 @@
+{
+  "versions": [
+    {
+      "git-tree": "e6712e6417754f570920d80d6ea4be8e25474535",
+      "version": "2024.2.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e57df1f6c0ed8e765854d4caf3f9b5d354f77d6f",
+      "version": "2024.2.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e500915440f276fc2e525223ead70aea6ad40374",
+      "version": "2024.1.6",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0da9e05ccca28d860df92a3f8b43b7e657de0540",
+      "version": "2024.1.5",
+      "port-version": 0
+    },
+    {
+      "git-tree": "38683a613ad0152233a04004b14707675c696189",
+      "version": "2024.1.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "35ec7d0edb38c8b621ca1a20bbe0eca5d0415ed2",
+      "version": "2024.1.3",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/l-/libnop.json b/external_imported/vcpkg/versions/l-/libnop.json
index 2b8d1a131..1e049f0fa 100644
--- a/external_imported/vcpkg/versions/l-/libnop.json
+++ b/external_imported/vcpkg/versions/l-/libnop.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b3612fe75503c2bf24d2e6069f7cd8dfff289d90",
+      "version-date": "2021-11-03",
+      "port-version": 0
+    },
     {
       "git-tree": "97da98d4a3cd4e60972f53211892baa5b2f066df",
       "version-date": "2021-03-01",
diff --git a/external_imported/vcpkg/versions/l-/libobfuscate.json b/external_imported/vcpkg/versions/l-/libobfuscate.json
new file mode 100644
index 000000000..f5c3f59cb
--- /dev/null
+++ b/external_imported/vcpkg/versions/l-/libobfuscate.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "5751c998780a780e002a23faffc94d7d328d74c0",
+      "version-date": "2023-03-23",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/l-/libodb-pgsql.json b/external_imported/vcpkg/versions/l-/libodb-pgsql.json
index b3ad365b1..3f6d2a34c 100644
--- a/external_imported/vcpkg/versions/l-/libodb-pgsql.json
+++ b/external_imported/vcpkg/versions/l-/libodb-pgsql.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "793728785becb5235725430c432d1acfb9496cdb",
+      "version": "2.4.0",
+      "port-version": 7
+    },
     {
       "git-tree": "2026f9dfa22bc2a9b7c5d865268cd53d1f6870ee",
       "version": "2.4.0",
diff --git a/external_imported/vcpkg/versions/l-/libofx.json b/external_imported/vcpkg/versions/l-/libofx.json
index 482c77d85..65f39f4e2 100644
--- a/external_imported/vcpkg/versions/l-/libofx.json
+++ b/external_imported/vcpkg/versions/l-/libofx.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2b01272b9801e2885f990f376956f8058851b9fe",
+      "version": "0.10.9",
+      "port-version": 1
+    },
     {
       "git-tree": "3f68c536d0f30c47c36d02d0bf6e7eda76ea7e08",
       "version": "0.10.9",
diff --git a/external_imported/vcpkg/versions/l-/libopenmpt.json b/external_imported/vcpkg/versions/l-/libopenmpt.json
index fe08a0b10..8b7fd4d0b 100644
--- a/external_imported/vcpkg/versions/l-/libopenmpt.json
+++ b/external_imported/vcpkg/versions/l-/libopenmpt.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f46d9666ff500c3694970f2031cdf0583d3be2e4",
+      "version": "0.6.12",
+      "port-version": 0
+    },
     {
       "git-tree": "5d66142c7858d9ac23b31a1ab5d596e2370ef7c2",
       "version": "0.6.7",
diff --git a/external_imported/vcpkg/versions/l-/libopensp.json b/external_imported/vcpkg/versions/l-/libopensp.json
index 717e6e2cc..4e9e79dfe 100644
--- a/external_imported/vcpkg/versions/l-/libopensp.json
+++ b/external_imported/vcpkg/versions/l-/libopensp.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "a3322b1400f902d5b02c9bebb18dbde53f88c4ce",
+      "version": "1.5.2",
+      "port-version": 3
+    },
+    {
+      "git-tree": "88324b68d25d7301351327cd25493d4f13658cf1",
+      "version": "1.5.2",
+      "port-version": 2
+    },
     {
       "git-tree": "1c38530c26ffb1fc7fb2e0bd40f76ca8fa2bfb57",
       "version": "1.5.2",
diff --git a/external_imported/vcpkg/versions/l-/libopnmidi.json b/external_imported/vcpkg/versions/l-/libopnmidi.json
index 46be2b68b..01b5525a4 100644
--- a/external_imported/vcpkg/versions/l-/libopnmidi.json
+++ b/external_imported/vcpkg/versions/l-/libopnmidi.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2451642c9d81eff6810839a5174ca60053330780",
+      "version": "1.5.1",
+      "port-version": 1
+    },
     {
       "git-tree": "552bea42a6f0f15bb5564602b51d9cda0a09dfd7",
       "version": "1.5.1",
diff --git a/external_imported/vcpkg/versions/l-/libopusenc.json b/external_imported/vcpkg/versions/l-/libopusenc.json
index b843b3e7e..5dc3b04cb 100644
--- a/external_imported/vcpkg/versions/l-/libopusenc.json
+++ b/external_imported/vcpkg/versions/l-/libopusenc.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4ddd48b3ea7d3363285602a3442c0e160316850a",
+      "version": "0.2.1",
+      "port-version": 3
+    },
     {
       "git-tree": "221b251f3848c9121ec517dc0c7d97cb19ea2297",
       "version-string": "0.2.1",
diff --git a/external_imported/vcpkg/versions/l-/libosip2.json b/external_imported/vcpkg/versions/l-/libosip2.json
index e94b9362b..df0a6daa2 100644
--- a/external_imported/vcpkg/versions/l-/libosip2.json
+++ b/external_imported/vcpkg/versions/l-/libosip2.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "cb02960c7156b49272969e224ccb0903c0a42a24",
+      "version": "5.3.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e2811fe1a0d4cb7faabaebfa4cf47e1296bcddd2",
+      "version": "5.2.0",
+      "port-version": 5
+    },
+    {
+      "git-tree": "9b3b93c2039a5369ddd07c5dfb482644ce18c961",
+      "version": "5.2.0",
+      "port-version": 4
+    },
+    {
+      "git-tree": "564b7ffdb88b7d1b1823d7ec1166325337ae3ec5",
+      "version": "5.2.0",
+      "port-version": 3
+    },
     {
       "git-tree": "711e04603ccba9622918413848035af14335ef63",
       "version": "5.2.0",
diff --git a/external_imported/vcpkg/versions/l-/libosmium.json b/external_imported/vcpkg/versions/l-/libosmium.json
index 9d8d8210e..702721ca4 100644
--- a/external_imported/vcpkg/versions/l-/libosmium.json
+++ b/external_imported/vcpkg/versions/l-/libosmium.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "4e43abda3d2ab79b2d813717eef1b330b390557f",
+      "version-semver": "2.20.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "b77d6ee3568b3a3fedb7b00984ae085253e46506",
+      "version-semver": "2.20.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e6b30515f2657f3623fa5f0f006a28d9891046ac",
+      "version-semver": "2.19.0",
+      "port-version": 0
+    },
     {
       "git-tree": "d4f1daf8d87c98ec46d720ff10449e520614b677",
       "version-semver": "2.18.0",
diff --git a/external_imported/vcpkg/versions/l-/libosmscout.json b/external_imported/vcpkg/versions/l-/libosmscout.json
index bba085aeb..95ed7b0a8 100644
--- a/external_imported/vcpkg/versions/l-/libosmscout.json
+++ b/external_imported/vcpkg/versions/l-/libosmscout.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "55b989b709d0c12649e6b2a522249bbf3d0788c7",
+      "version": "1.1.1",
+      "port-version": 4
+    },
+    {
+      "git-tree": "6a036a2f5b16cbc586266834abfe3c7a3f712c7e",
+      "version": "1.1.1",
+      "port-version": 3
+    },
+    {
+      "git-tree": "4a9ab34b9b12105e070411d8be66aeb3a1baf246",
+      "version": "1.1.1",
+      "port-version": 2
+    },
     {
       "git-tree": "ebb31600572c819a33a2c7b5e013e2cd2bc85b85",
       "version-string": "1.1.1",
diff --git a/external_imported/vcpkg/versions/l-/libp7client.json b/external_imported/vcpkg/versions/l-/libp7client.json
index 238124ffc..10badb818 100644
--- a/external_imported/vcpkg/versions/l-/libp7client.json
+++ b/external_imported/vcpkg/versions/l-/libp7client.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e0cf3d22ea3a838a2190f5d0ed1c804c42364268",
+      "version": "5.6",
+      "port-version": 4
+    },
     {
       "git-tree": "ff87a34ba0c530746a255fc3ee2ce3762781b50c",
       "version-string": "5.6",
diff --git a/external_imported/vcpkg/versions/l-/libpcap.json b/external_imported/vcpkg/versions/l-/libpcap.json
index 5322e122c..480eef1d4 100644
--- a/external_imported/vcpkg/versions/l-/libpcap.json
+++ b/external_imported/vcpkg/versions/l-/libpcap.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "7bfda50e586151e14fb6704ed154e8747bc64ea9",
+      "version-semver": "1.10.4",
+      "port-version": 1
+    },
+    {
+      "git-tree": "3af367bec0a2e0049f723ffb3654d262e775ac45",
+      "version-semver": "1.10.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6cf3667c0320e2ff5d92d45e91b07fb3bf2fe05e",
+      "version-semver": "1.10.1",
+      "port-version": 3
+    },
+    {
+      "git-tree": "b21dafcbcbd4a428b3800a6a686a473db8625ca6",
+      "version-semver": "1.10.1",
+      "port-version": 2
+    },
     {
       "git-tree": "4a0a395c4b517e9a54e1b96327b1ac90e317c225",
       "version-semver": "1.10.1",
diff --git a/external_imported/vcpkg/versions/l-/libpff.json b/external_imported/vcpkg/versions/l-/libpff.json
index 3b6c8eb07..6aeb1f384 100644
--- a/external_imported/vcpkg/versions/l-/libpff.json
+++ b/external_imported/vcpkg/versions/l-/libpff.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "6000969a75ea417329af263110993a00910d1b1b",
+      "version-date": "2021-11-14",
+      "port-version": 2
+    },
+    {
+      "git-tree": "5358a29d95b177de74fe31072cfa21a7adf4254b",
+      "version-date": "2021-11-14",
+      "port-version": 1
+    },
     {
       "git-tree": "a47e314b091400914616ff8c5e017110f2493018",
       "version-date": "2021-11-14",
diff --git a/external_imported/vcpkg/versions/l-/libphonenumber.json b/external_imported/vcpkg/versions/l-/libphonenumber.json
index c13c846f1..f91127cdf 100644
--- a/external_imported/vcpkg/versions/l-/libphonenumber.json
+++ b/external_imported/vcpkg/versions/l-/libphonenumber.json
@@ -1,5 +1,40 @@
 {
   "versions": [
+    {
+      "git-tree": "c6968832284b2011625dfc11d47cd2cf0c92d2a1",
+      "version": "8.13.29",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9df18bd6b1bab30de04c91942cf6724b6ff26f0c",
+      "version": "8.13.23",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8c0eab944c22034092f0200dcbdd5a422eddc7f9",
+      "version": "8.13.17",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5942baf68c6c369476c955e28dea2dd4fda11d1b",
+      "version": "8.13.13",
+      "port-version": 1
+    },
+    {
+      "git-tree": "2289b15c4eee8082041820c9eb1bfc2cb3982cd9",
+      "version": "8.13.13",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8f6bcac3d621a03907f69278cb2a1e303fa414f1",
+      "version": "8.13.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c67ed43ff7bcb68e7d676e1a3be1139e7f5bdc2f",
+      "version": "8.13.9",
+      "port-version": 0
+    },
     {
       "git-tree": "8384c5dbad4f7fc159e2e01ebcc1d3202157d963",
       "version": "8.13.7",
diff --git a/external_imported/vcpkg/versions/l-/libplist.json b/external_imported/vcpkg/versions/l-/libplist.json
index 5c5d1a0c5..d502fdd37 100644
--- a/external_imported/vcpkg/versions/l-/libplist.json
+++ b/external_imported/vcpkg/versions/l-/libplist.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "c0550bd82aaa3f3ae23f9b481285c6cb9f92b44c",
+      "version-date": "2023-06-15",
+      "port-version": 1
+    },
+    {
+      "git-tree": "8a79aaf94792ae73eea5094eebac773fe6705b54",
+      "version-date": "2023-06-15",
+      "port-version": 0
+    },
     {
       "git-tree": "e18bc499ccc42a248f2d88c1f5614d4f4314f4eb",
       "version": "1.3.6",
diff --git a/external_imported/vcpkg/versions/l-/libpng.json b/external_imported/vcpkg/versions/l-/libpng.json
index 55b6f9c28..b3dbf52a5 100644
--- a/external_imported/vcpkg/versions/l-/libpng.json
+++ b/external_imported/vcpkg/versions/l-/libpng.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "8b6d2c1150541a94c0ca5b2f060eb21eed4a40b2",
+      "version": "1.6.40",
+      "port-version": 1
+    },
+    {
+      "git-tree": "1a2a7f489e57c9e55e049b7c5f0a28c8ff4464ed",
+      "version": "1.6.40",
+      "port-version": 0
+    },
     {
       "git-tree": "af144fe56e6e4c08cd8089d2e1dd46bae60a5062",
       "version": "1.6.39",
diff --git a/external_imported/vcpkg/versions/l-/libpopt.json b/external_imported/vcpkg/versions/l-/libpopt.json
index 1bc1a6143..c6b6c0d87 100644
--- a/external_imported/vcpkg/versions/l-/libpopt.json
+++ b/external_imported/vcpkg/versions/l-/libpopt.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0610bc947719ba9009a8e99444332fd27d315033",
+      "version": "1.16",
+      "port-version": 16
+    },
     {
       "git-tree": "ba5769f936a4234dc9803bee2476b757d0a0f0f9",
       "version-string": "1.16",
diff --git a/external_imported/vcpkg/versions/l-/libpq.json b/external_imported/vcpkg/versions/l-/libpq.json
index b9c23f119..7d8e5094a 100644
--- a/external_imported/vcpkg/versions/l-/libpq.json
+++ b/external_imported/vcpkg/versions/l-/libpq.json
@@ -1,5 +1,45 @@
 {
   "versions": [
+    {
+      "git-tree": "308af7b81ee1abf1d533d93f28eb3a423dd2ea3d",
+      "version": "16.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "1f0007ec87e337d4f484164ecf589395b174d044",
+      "version": "16.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "cbd6314cbfd04132985a7a6412184d368c3cd0b6",
+      "version": "16.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "859b43f8db33293c411c365d945ecd4ae2cc056b",
+      "version": "15.3",
+      "port-version": 2
+    },
+    {
+      "git-tree": "a62f65ad38aa981b6ff7474e16f739a3ffbc622b",
+      "version": "15.3",
+      "port-version": 1
+    },
+    {
+      "git-tree": "d5388715a119316e407f15a6612bf05d2292d73d",
+      "version": "15.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "74cc57fa79744500aef02f0b66be5f46b8005af3",
+      "version": "15.2",
+      "port-version": 3
+    },
+    {
+      "git-tree": "29b49eb009f412e692853ca40d353f31711829ea",
+      "version": "15.2",
+      "port-version": 2
+    },
     {
       "git-tree": "215b5533383016a897deb00d90b9ca5ebefc0469",
       "version": "15.2",
diff --git a/external_imported/vcpkg/versions/l-/libpqxx.json b/external_imported/vcpkg/versions/l-/libpqxx.json
index 21896623d..404df4b63 100644
--- a/external_imported/vcpkg/versions/l-/libpqxx.json
+++ b/external_imported/vcpkg/versions/l-/libpqxx.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8083e94ed4ded4546cbad5263a7efb4b9b154b73",
+      "version": "7.8.1",
+      "port-version": 0
+    },
     {
       "git-tree": "7ddefb009a457fb899a8661e46ba79544da6b2df",
       "version": "7.7.4",
diff --git a/external_imported/vcpkg/versions/l-/libprotobuf-mutator.json b/external_imported/vcpkg/versions/l-/libprotobuf-mutator.json
index a53656b97..52281f5d2 100644
--- a/external_imported/vcpkg/versions/l-/libprotobuf-mutator.json
+++ b/external_imported/vcpkg/versions/l-/libprotobuf-mutator.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "711a63d6cbb8a9556e4d5df54aa17383780a46b1",
+      "version": "1.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "df52e818f4a57b22720260014d5adf089281af3c",
+      "version": "1.0",
+      "port-version": 2
+    },
     {
       "git-tree": "f0ca8762869223e88b2fa7aad7e1dc89c1dc0568",
       "version-string": "1.0",
diff --git a/external_imported/vcpkg/versions/l-/libproxy.json b/external_imported/vcpkg/versions/l-/libproxy.json
index b82123c97..25ae34237 100644
--- a/external_imported/vcpkg/versions/l-/libproxy.json
+++ b/external_imported/vcpkg/versions/l-/libproxy.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "b7f8bc39ce8dc00ea1dfca802a8a1c58cdf257c1",
+      "version": "0.4.18",
+      "port-version": 3
+    },
+    {
+      "git-tree": "190bb3f2c7dcb0e36636bbed1e4619f1072c86f2",
+      "version": "0.4.18",
+      "port-version": 2
+    },
     {
       "git-tree": "74ecff4623774abaa9333489e644bdbc881e268f",
       "version": "0.4.18",
diff --git a/external_imported/vcpkg/versions/l-/libqcow.json b/external_imported/vcpkg/versions/l-/libqcow.json
index e4a908a85..2b2d39161 100644
--- a/external_imported/vcpkg/versions/l-/libqcow.json
+++ b/external_imported/vcpkg/versions/l-/libqcow.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4b1e94b2b7373b63353193be9ff260cf543b8460",
+      "version": "20221124",
+      "port-version": 1
+    },
     {
       "git-tree": "70abb044b3b25aff006a6858812325ad2a923e7f",
       "version": "20221124",
diff --git a/external_imported/vcpkg/versions/l-/libqglviewer.json b/external_imported/vcpkg/versions/l-/libqglviewer.json
index 3d2e59951..5a7e5585e 100644
--- a/external_imported/vcpkg/versions/l-/libqglviewer.json
+++ b/external_imported/vcpkg/versions/l-/libqglviewer.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "bfaae9deb95ec0d71a5d9ba8342fd3c83c8871fa",
+      "version": "2.9.1",
+      "port-version": 2
+    },
+    {
+      "git-tree": "fb8cb610ce82055671ffb7e84836da4a02cc3127",
+      "version": "2.9.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "ad6a8d25fcd68d39367a45811a58379f3cea0d01",
+      "version": "2.9.1",
+      "port-version": 0
+    },
     {
       "git-tree": "af8c797ea264a95603d8d825a75d73d5cc408d4d",
       "version-string": "2.7.2",
diff --git a/external_imported/vcpkg/versions/l-/libqtrest.json b/external_imported/vcpkg/versions/l-/libqtrest.json
new file mode 100644
index 000000000..767651289
--- /dev/null
+++ b/external_imported/vcpkg/versions/l-/libqtrest.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "efcb288a743d19fa7e795479221b17644864890e",
+      "version": "0.4.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/l-/libraqm.json b/external_imported/vcpkg/versions/l-/libraqm.json
index b024ba019..1cfd676f9 100644
--- a/external_imported/vcpkg/versions/l-/libraqm.json
+++ b/external_imported/vcpkg/versions/l-/libraqm.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "65a919304f99dbe9ed1c5f2777785cd89ed97ad2",
+      "version": "0.10.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "aae562aa1a91357654efbd688ca511ae34d1afed",
+      "version": "0.9.0",
+      "port-version": 1
+    },
     {
       "git-tree": "e5cdb799bec1a56eba248db499ac2e64d8a3b059",
       "version-string": "0.9.0",
diff --git a/external_imported/vcpkg/versions/l-/libraw.json b/external_imported/vcpkg/versions/l-/libraw.json
index d5fe53d53..5e5b2e1f6 100644
--- a/external_imported/vcpkg/versions/l-/libraw.json
+++ b/external_imported/vcpkg/versions/l-/libraw.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "02d6abd8ed64b06dde0b3b029c39f30819eea276",
+      "version": "0.21.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3a10e9f3c0a023e53a82eb8408365f50e6825e80",
+      "version": "0.21.1",
+      "port-version": 3
+    },
+    {
+      "git-tree": "ca8608b21d32cbd238b21eafc1ceb19ab91729b5",
+      "version": "0.21.1",
+      "port-version": 2
+    },
+    {
+      "git-tree": "1b27d2a7401506c017a98e896c3dee2db0a01bfa",
+      "version": "0.21.1",
+      "port-version": 1
+    },
     {
       "git-tree": "fda25697452394dfb723fa576576a76b67b32468",
       "version": "0.21.1",
diff --git a/external_imported/vcpkg/versions/l-/librdkafka.json b/external_imported/vcpkg/versions/l-/librdkafka.json
index c5f272186..1c518a29a 100644
--- a/external_imported/vcpkg/versions/l-/librdkafka.json
+++ b/external_imported/vcpkg/versions/l-/librdkafka.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "a84ea0202e606993c8377b34bdbea3c84e08d792",
+      "version": "2.3.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a9d47253bd654c0affeb4ec5798cfc390fe28d22",
+      "version": "2.2.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "65bfe7c79910979e418a3c20b1cc615a64997e82",
+      "version": "2.1.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e524f201bfa539b35c11c270d3e25a9c48eeff14",
+      "version": "2.1.0",
+      "port-version": 0
+    },
     {
       "git-tree": "d5396e9968358ea9b99e1204b37dd8cba68fef6b",
       "version": "2.0.2",
diff --git a/external_imported/vcpkg/versions/l-/libredwg.json b/external_imported/vcpkg/versions/l-/libredwg.json
index c0d20d032..5a74cb668 100644
--- a/external_imported/vcpkg/versions/l-/libredwg.json
+++ b/external_imported/vcpkg/versions/l-/libredwg.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "17dd1242cc7c640c0b51f493eef55d3c12ad6e52",
+      "version": "0.12.5.5178",
+      "port-version": 1
+    },
     {
       "git-tree": "aa161067eef7398933b726e81cd4824733a9c9a6",
       "version": "0.12.5.5178",
diff --git a/external_imported/vcpkg/versions/l-/libremidi.json b/external_imported/vcpkg/versions/l-/libremidi.json
new file mode 100644
index 000000000..076c82944
--- /dev/null
+++ b/external_imported/vcpkg/versions/l-/libremidi.json
@@ -0,0 +1,34 @@
+{
+  "versions": [
+    {
+      "git-tree": "1692e19d688d509754fe2ec125a37ac8818b56ad",
+      "version": "4.3.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f84b9c0ea6498dad5b9e184bc21f95c614a15625",
+      "version": "4.2.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4269a93684ffd5145f2b5a79421824b6efd87372",
+      "version": "4.2.3",
+      "port-version": 2
+    },
+    {
+      "git-tree": "4427d9259242a0dbc53753710b42b6531276f392",
+      "version": "4.2.3",
+      "port-version": 1
+    },
+    {
+      "git-tree": "0a6cac97560ba37eae699bdb65f6561a8415d362",
+      "version": "4.1.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "4c1473e864943f0e6189d315c1eb09a77ce3a3f0",
+      "version": "4.1.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/l-/libressl.json b/external_imported/vcpkg/versions/l-/libressl.json
index 988050fd2..e38541f9d 100644
--- a/external_imported/vcpkg/versions/l-/libressl.json
+++ b/external_imported/vcpkg/versions/l-/libressl.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "e0c1bbd2daed29ca5fcc86c53b276db8df36e6be",
+      "version": "3.8.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "213551b173db269dfd275c34a776ab7d093c5012",
+      "version": "3.6.2",
+      "port-version": 2
+    },
+    {
+      "git-tree": "ad22d9c62107c65630cd57d97749920a02016095",
+      "version": "3.6.2",
+      "port-version": 1
+    },
     {
       "git-tree": "dbc5385ec4d693da812158dc9e2c1eaaaf9c6908",
       "version": "3.6.2",
diff --git a/external_imported/vcpkg/versions/l-/librsvg.json b/external_imported/vcpkg/versions/l-/librsvg.json
index 735241c8a..e7346994f 100644
--- a/external_imported/vcpkg/versions/l-/librsvg.json
+++ b/external_imported/vcpkg/versions/l-/librsvg.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "ba6e6aad1557505c8ede7b320d554bd2cab6bb7d",
+      "version": "2.40.20",
+      "port-version": 10
+    },
+    {
+      "git-tree": "c75d4ca281d1bba78571abdb035e025ded217c00",
+      "version": "2.40.20",
+      "port-version": 9
+    },
+    {
+      "git-tree": "d72d62fa58fa959323e0bda46bcf26991e460289",
+      "version": "2.40.20",
+      "port-version": 8
+    },
+    {
+      "git-tree": "7896420ce5b25f27747238c63c89bd09d551d817",
+      "version": "2.40.20",
+      "port-version": 7
+    },
+    {
+      "git-tree": "3e077a8a58a07c8c3d869ff6b875cc2dd7325025",
+      "version": "2.40.20",
+      "port-version": 6
+    },
     {
       "git-tree": "f1c471322f23a090a973337e83f0d9743adc549d",
       "version": "2.40.20",
diff --git a/external_imported/vcpkg/versions/l-/librsync.json b/external_imported/vcpkg/versions/l-/librsync.json
index 6ea83e07f..5fde3f12a 100644
--- a/external_imported/vcpkg/versions/l-/librsync.json
+++ b/external_imported/vcpkg/versions/l-/librsync.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "28eb3afb0d9fb4a4e84c59fb829f206f3e409152",
+      "version-semver": "2.3.4",
+      "port-version": 0
+    },
     {
       "git-tree": "1d252092a8f0d2ecbf57a4113324b363d4c43db1",
       "version-semver": "2.3.2",
diff --git a/external_imported/vcpkg/versions/l-/librttopo.json b/external_imported/vcpkg/versions/l-/librttopo.json
index 63ce7e7f9..8da0fffff 100644
--- a/external_imported/vcpkg/versions/l-/librttopo.json
+++ b/external_imported/vcpkg/versions/l-/librttopo.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "adc1d3db75fdf633bfcf3ffd908a45005a576163",
+      "version": "1.1.0",
+      "port-version": 8
+    },
     {
       "git-tree": "d7e9514837d372d0a952762f6e7ea600c8a625f9",
       "version": "1.1.0",
diff --git a/external_imported/vcpkg/versions/l-/libsbml.json b/external_imported/vcpkg/versions/l-/libsbml.json
index 2f488b144..e00d74be3 100644
--- a/external_imported/vcpkg/versions/l-/libsbml.json
+++ b/external_imported/vcpkg/versions/l-/libsbml.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "5610c6abee862e6ef538a8c62fde2c6ff62325e0",
+      "version": "5.20.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9d718a41ed85525971eb0cc46dbb31e91673c576",
+      "version": "5.20.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "6b592087185a6576e30cc29e129bec77d12c4aeb",
+      "version": "5.20.0",
+      "port-version": 0
+    },
     {
       "git-tree": "9793402aaa4679187a9a703f189239544e3daf77",
       "version": "5.19.0",
diff --git a/external_imported/vcpkg/versions/l-/libsecret.json b/external_imported/vcpkg/versions/l-/libsecret.json
index 4b17d8ff5..b360a7424 100644
--- a/external_imported/vcpkg/versions/l-/libsecret.json
+++ b/external_imported/vcpkg/versions/l-/libsecret.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "56f3e1a575e955fb58859b9a50695c700f527325",
+      "version": "0.20.4",
+      "port-version": 2
+    },
     {
       "git-tree": "a5e91b4b0043a5deb14f9ab62710b3410e969d54",
       "version": "0.20.4",
diff --git a/external_imported/vcpkg/versions/l-/libsigcpp.json b/external_imported/vcpkg/versions/l-/libsigcpp.json
index a0b40c0d3..32e1c709f 100644
--- a/external_imported/vcpkg/versions/l-/libsigcpp.json
+++ b/external_imported/vcpkg/versions/l-/libsigcpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1175893c04f864b29d4fd2052ab0daf7d83a3f7f",
+      "version": "3.6.0",
+      "port-version": 0
+    },
     {
       "git-tree": "4aba60e7d2936fd4a786b50f14cbdd99dbf21805",
       "version": "3.4.0",
diff --git a/external_imported/vcpkg/versions/l-/libsmb2.json b/external_imported/vcpkg/versions/l-/libsmb2.json
index 4bc2bbdde..b6fee31f2 100644
--- a/external_imported/vcpkg/versions/l-/libsmb2.json
+++ b/external_imported/vcpkg/versions/l-/libsmb2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e925ba41cc6441c6f2491462a26bea64d0cdeb16",
+      "version-date": "2023-08-11",
+      "port-version": 0
+    },
     {
       "git-tree": "a70cca2c9bcfe6b7848efbf21a9b2779b4e47055",
       "version-date": "2021-04-29",
diff --git a/external_imported/vcpkg/versions/l-/libsndfile.json b/external_imported/vcpkg/versions/l-/libsndfile.json
index b8939316f..416229efc 100644
--- a/external_imported/vcpkg/versions/l-/libsndfile.json
+++ b/external_imported/vcpkg/versions/l-/libsndfile.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "c973dc3a659457ad4bd00a68da7903b674720f69",
+      "version-semver": "1.2.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f78736afe548520c2bd5675eec91a9c15112a0fb",
+      "version-semver": "1.2.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "6f4a276bfb9911abd9901cb6c977d7a132eff35d",
+      "version-semver": "1.2.0",
+      "port-version": 1
+    },
     {
       "git-tree": "50c34624e4951e4b4919717f63b8f4fcbdacf088",
       "version-semver": "1.2.0",
diff --git a/external_imported/vcpkg/versions/l-/libsodium.json b/external_imported/vcpkg/versions/l-/libsodium.json
index 9cf0250a3..a30678407 100644
--- a/external_imported/vcpkg/versions/l-/libsodium.json
+++ b/external_imported/vcpkg/versions/l-/libsodium.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "a8fa2db17dd4845eaa7b2ffd3c165a9d1fa31cce",
+      "version": "1.0.19",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6c75abf2ec95a8c9b498d2e18e9f854d75941048",
+      "version": "1.0.18",
+      "port-version": 9
+    },
     {
       "git-tree": "72748d8d6030aac034e5b74229898016f833b33a",
       "version": "1.0.18",
diff --git a/external_imported/vcpkg/versions/l-/libsonic.json b/external_imported/vcpkg/versions/l-/libsonic.json
new file mode 100644
index 000000000..e0c8976a6
--- /dev/null
+++ b/external_imported/vcpkg/versions/l-/libsonic.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "b81fb841c7bcf7ce50cedfbdec8ff83b627a2d7a",
+      "version": "0.2.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/l-/libspatialite.json b/external_imported/vcpkg/versions/l-/libspatialite.json
index aa6ea3bf7..15da6a328 100644
--- a/external_imported/vcpkg/versions/l-/libspatialite.json
+++ b/external_imported/vcpkg/versions/l-/libspatialite.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "583ff9e938f0ca09b16f01fc5fb228b42dc13c7a",
+      "version": "5.1.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "6c988a575680cb06fded62a1f63d43426d683dfd",
+      "version": "5.1.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ea959bb978266565d868fff1aed8641b56493131",
+      "version": "5.0.1",
+      "port-version": 12
+    },
+    {
+      "git-tree": "08ee2fddd99e37491e2ea37872716b5ff70f1d81",
+      "version": "5.0.1",
+      "port-version": 11
+    },
     {
       "git-tree": "da8932bd2fee04aa815f758bb119f072d39051d6",
       "version": "5.0.1",
diff --git a/external_imported/vcpkg/versions/l-/libspng.json b/external_imported/vcpkg/versions/l-/libspng.json
new file mode 100644
index 000000000..5c77ab884
--- /dev/null
+++ b/external_imported/vcpkg/versions/l-/libspng.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "ed674df56d8b39d76443c7db3ae893c08394bf9c",
+      "version": "0.7.4",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/l-/libsrt.json b/external_imported/vcpkg/versions/l-/libsrt.json
index 92f696814..ca0ef0a36 100644
--- a/external_imported/vcpkg/versions/l-/libsrt.json
+++ b/external_imported/vcpkg/versions/l-/libsrt.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "96864197a0d35ea5a746ac1076b625c0372c37ae",
+      "version": "1.5.0",
+      "port-version": 3
+    },
     {
       "git-tree": "08022cd3b0ae3348a7af42013e5245fb5929d037",
       "version": "1.5.0",
diff --git a/external_imported/vcpkg/versions/l-/libsrtp.json b/external_imported/vcpkg/versions/l-/libsrtp.json
index 8d751f5ff..b1a0349b2 100644
--- a/external_imported/vcpkg/versions/l-/libsrtp.json
+++ b/external_imported/vcpkg/versions/l-/libsrtp.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "15577c99d2d078770d2e07d2bc8cce770797adb8",
+      "version": "2.5.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "27c325c9851b5c07e172e74e312e8070af7b9d0b",
+      "version": "2.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "d66d808ef040f2802ffa00ec6c4728d5603e76f9",
       "version": "2.4.2",
diff --git a/external_imported/vcpkg/versions/l-/libssh.json b/external_imported/vcpkg/versions/l-/libssh.json
index ad0f8d8d5..bb8db0092 100644
--- a/external_imported/vcpkg/versions/l-/libssh.json
+++ b/external_imported/vcpkg/versions/l-/libssh.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "000173abb6b45433339e0c85179bd3b4e4a36684",
+      "version": "0.10.5",
+      "port-version": 1
+    },
+    {
+      "git-tree": "d6af07ebaeb4ab52ff509bc7637ad1d278d3d16b",
+      "version": "0.10.5",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d2f4d398d1b82025b8aec8dba4e844f867286d38",
+      "version": "0.10.4+20221123",
+      "port-version": 4
+    },
     {
       "git-tree": "e15d10eb435fbd46abba95b50c8d47d2ff166603",
       "version": "0.10.4+20221123",
diff --git a/external_imported/vcpkg/versions/l-/libssh2.json b/external_imported/vcpkg/versions/l-/libssh2.json
index 821615909..46ca7ec35 100644
--- a/external_imported/vcpkg/versions/l-/libssh2.json
+++ b/external_imported/vcpkg/versions/l-/libssh2.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "a17fdd9cf1d6c1f7af5967ee961a41c6dcc40788",
+      "version": "1.11.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "e57c6157ce67a01ce0b98152d9ccfd544e32b381",
+      "version": "1.11.0",
+      "port-version": 0
+    },
     {
       "git-tree": "5d6f965bcf911a4750731aad9785a4b40686a2b3",
       "version": "1.10.0",
diff --git a/external_imported/vcpkg/versions/l-/libstemmer.json b/external_imported/vcpkg/versions/l-/libstemmer.json
index b3521b887..0f113f04a 100644
--- a/external_imported/vcpkg/versions/l-/libstemmer.json
+++ b/external_imported/vcpkg/versions/l-/libstemmer.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "df38970bafcdd4475d3d15732a891ad2f897bede",
+      "version": "2017-9",
+      "port-version": 8
+    },
     {
       "git-tree": "576c66a3306ca3023e63dcaf12edad79a3784f32",
       "version-string": "2017-9",
diff --git a/external_imported/vcpkg/versions/l-/libstk.json b/external_imported/vcpkg/versions/l-/libstk.json
index 317d63163..860d4d029 100644
--- a/external_imported/vcpkg/versions/l-/libstk.json
+++ b/external_imported/vcpkg/versions/l-/libstk.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "799334749f6ca3302c25b1db53dd27d03f7b9f2b",
+      "version": "4.6.1",
+      "port-version": 3
+    },
     {
       "git-tree": "237ff5e1bfd88a6a20172fd888ac539749052486",
       "version-string": "4.6.1",
diff --git a/external_imported/vcpkg/versions/l-/libsvm.json b/external_imported/vcpkg/versions/l-/libsvm.json
index aba9aa6c2..51339f2f8 100644
--- a/external_imported/vcpkg/versions/l-/libsvm.json
+++ b/external_imported/vcpkg/versions/l-/libsvm.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "322988838e09b1a1ce9766a803eab0e9867e0e1d",
+      "version": "3.32",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6ee5de615b1449a216f61cb83ec2704e93a34495",
+      "version": "3.25",
+      "port-version": 1
+    },
     {
       "git-tree": "a5bcb4cdaf7906a6e12948dcb5b170f79fba900e",
       "version": "3.25",
diff --git a/external_imported/vcpkg/versions/l-/libsystemd.json b/external_imported/vcpkg/versions/l-/libsystemd.json
new file mode 100644
index 000000000..984f74d84
--- /dev/null
+++ b/external_imported/vcpkg/versions/l-/libsystemd.json
@@ -0,0 +1,19 @@
+{
+  "versions": [
+    {
+      "git-tree": "5213227454790bf5e953a66d807e04059742381e",
+      "version": "254",
+      "port-version": 2
+    },
+    {
+      "git-tree": "2ac525bd287e8a58992f263adce78483b0513cb0",
+      "version": "254",
+      "port-version": 1
+    },
+    {
+      "git-tree": "bc87d660ee35fa2665c12cbd8cb80896f21f99af",
+      "version": "254",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/l-/libtar.json b/external_imported/vcpkg/versions/l-/libtar.json
new file mode 100644
index 000000000..f78a73baa
--- /dev/null
+++ b/external_imported/vcpkg/versions/l-/libtar.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "88cec24f0726abad060a2741dcd064b2698a886a",
+      "version": "1.2.20",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/l-/libtcod.json b/external_imported/vcpkg/versions/l-/libtcod.json
index 954b9ccd1..12ccd5c0d 100644
--- a/external_imported/vcpkg/versions/l-/libtcod.json
+++ b/external_imported/vcpkg/versions/l-/libtcod.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ae0678aa4f8c3675932de4d2e8986f4a5ca7d30e",
+      "version": "1.24.0",
+      "port-version": 0
+    },
     {
       "git-tree": "09fe9037f9dc927b39eac5ed74cbce37dbb62f12",
       "version": "1.23.1",
diff --git a/external_imported/vcpkg/versions/l-/libtheora.json b/external_imported/vcpkg/versions/l-/libtheora.json
index 927fce183..2829cd15d 100644
--- a/external_imported/vcpkg/versions/l-/libtheora.json
+++ b/external_imported/vcpkg/versions/l-/libtheora.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f6cc1235f841d9f9a7b7d1a278dc63b788c63659",
+      "version-string": "1.2.0alpha1-20170719",
+      "port-version": 7
+    },
     {
       "git-tree": "66646fe9dde7ac30894403ba659941879387904e",
       "version-string": "1.2.0alpha1-20170719",
diff --git a/external_imported/vcpkg/versions/l-/libtins.json b/external_imported/vcpkg/versions/l-/libtins.json
index d81d747b0..f616561cd 100644
--- a/external_imported/vcpkg/versions/l-/libtins.json
+++ b/external_imported/vcpkg/versions/l-/libtins.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "2aca4b43d1b64057b5316e609514d41ee7013c4b",
+      "version": "4.5",
+      "port-version": 0
+    },
+    {
+      "git-tree": "30fbfd14d90e9aedac77f8272135a7e51444b01f",
+      "version": "4.3",
+      "port-version": 7
+    },
     {
       "git-tree": "4a1470befea5c6b5c7418f9b85f37d6f8733d7d5",
       "version": "4.3",
diff --git a/external_imported/vcpkg/versions/l-/libtomcrypt.json b/external_imported/vcpkg/versions/l-/libtomcrypt.json
index 11775d9b2..7bf9486a1 100644
--- a/external_imported/vcpkg/versions/l-/libtomcrypt.json
+++ b/external_imported/vcpkg/versions/l-/libtomcrypt.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ef279d3115e2f464337bed057d24e9072a3918e7",
+      "version": "1.18.2",
+      "port-version": 3
+    },
     {
       "git-tree": "b339006b76f8211aa40e6d88fc6adc843d1048fa",
       "version-string": "1.18.2",
diff --git a/external_imported/vcpkg/versions/l-/libtommath.json b/external_imported/vcpkg/versions/l-/libtommath.json
index f1a832ad5..1616c91b6 100644
--- a/external_imported/vcpkg/versions/l-/libtommath.json
+++ b/external_imported/vcpkg/versions/l-/libtommath.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "cc02d14942e13f536bc7d8d08d9af160f8bbd387",
+      "version": "1.2.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "70acf033d012ad744340243d73cdd40b07501f0e",
+      "version": "1.2.0",
+      "port-version": 3
+    },
     {
       "git-tree": "745f0ffe9bd56bb065e987124a7d0afebc445dc2",
       "version-string": "1.2.0",
diff --git a/external_imported/vcpkg/versions/l-/libtorch.json b/external_imported/vcpkg/versions/l-/libtorch.json
index 5ab087576..ee8bf4cb3 100644
--- a/external_imported/vcpkg/versions/l-/libtorch.json
+++ b/external_imported/vcpkg/versions/l-/libtorch.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "418db4a2514c9530b67097fca0ce7cafde5a2a15",
+      "version": "2.1.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "20a2f323fb33dab29315fd18217e263ade2a9bd6",
+      "version": "1.12.1",
+      "port-version": 5
+    },
+    {
+      "git-tree": "de2d4bfd4a26268b29c3be02790c16d23ecd3d5e",
+      "version": "1.12.1",
+      "port-version": 4
+    },
+    {
+      "git-tree": "7f8ee520ffcef31a008c2c73b1155b38151ebae4",
+      "version": "1.12.1",
+      "port-version": 3
+    },
+    {
+      "git-tree": "1fb6e115393430795e4173a45155e80c5462cd00",
+      "version": "1.12.1",
+      "port-version": 2
+    },
     {
       "git-tree": "99e1c00f462716fc1899f7c0f5773e5dccbe8ee8",
       "version": "1.12.1",
diff --git a/external_imported/vcpkg/versions/l-/libtorrent.json b/external_imported/vcpkg/versions/l-/libtorrent.json
index f95abca51..9078366a2 100644
--- a/external_imported/vcpkg/versions/l-/libtorrent.json
+++ b/external_imported/vcpkg/versions/l-/libtorrent.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "659f86cfa8b1e0f62ba1d7c6376ec5d7f292fb7c",
+      "version": "2.0.9",
+      "port-version": 0
+    },
     {
       "git-tree": "884acf58813237198df4d1265661ad93b6b57955",
       "version": "2.0.8",
diff --git a/external_imported/vcpkg/versions/l-/libtracepoint-control.json b/external_imported/vcpkg/versions/l-/libtracepoint-control.json
new file mode 100644
index 000000000..a56050274
--- /dev/null
+++ b/external_imported/vcpkg/versions/l-/libtracepoint-control.json
@@ -0,0 +1,19 @@
+{
+  "versions": [
+    {
+      "git-tree": "26f974a4e3a3dbbdea53a0111f0e854875df4f62",
+      "version": "1.3.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "410f33d930822507551474d486031021c4fea1dd",
+      "version": "1.2.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "46fe85ffc8eb1f431685a49dace1cf330d54d6c9",
+      "version": "1.1.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/l-/libtracepoint-decode.json b/external_imported/vcpkg/versions/l-/libtracepoint-decode.json
new file mode 100644
index 000000000..878aaa0e8
--- /dev/null
+++ b/external_imported/vcpkg/versions/l-/libtracepoint-decode.json
@@ -0,0 +1,24 @@
+{
+  "versions": [
+    {
+      "git-tree": "a0783b839d7fd6457a9f26ec6c51d85e51aa7104",
+      "version": "1.3.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "51ab3448c97daa75b873c3e4b70f2894908fc2f4",
+      "version": "1.2.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3559772cf7c926b54b92bdc0e72ecaa9e06534d6",
+      "version": "1.1.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6bd99da97aa18ca05fd3a67eb77f6df1ea210d2e",
+      "version": "1.0.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/l-/libtracepoint.json b/external_imported/vcpkg/versions/l-/libtracepoint.json
new file mode 100644
index 000000000..c56dbcd70
--- /dev/null
+++ b/external_imported/vcpkg/versions/l-/libtracepoint.json
@@ -0,0 +1,24 @@
+{
+  "versions": [
+    {
+      "git-tree": "701e69ab507fc9cd97aaf936d5b82dfebe17c046",
+      "version": "1.3.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9f85708521c851b4c64ad10c04ad0261343fef25",
+      "version": "1.2.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0106479d49132d017d8c89f4189bce8cb4251479",
+      "version": "1.1.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f60f9a909a55a04c9bc87b6a3e10df5f0faec1a4",
+      "version": "1.0.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/l-/libudns.json b/external_imported/vcpkg/versions/l-/libudns.json
index f1851a169..5eb542c70 100644
--- a/external_imported/vcpkg/versions/l-/libudns.json
+++ b/external_imported/vcpkg/versions/l-/libudns.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b5b2efa89aac8ab7f97487cf72ed8aa489b2c6af",
+      "version": "0.4",
+      "port-version": 5
+    },
     {
       "git-tree": "277ba57e6f9840670698c62196ea9b30c74485e0",
       "version-string": "0.4",
diff --git a/external_imported/vcpkg/versions/l-/libunibreak.json b/external_imported/vcpkg/versions/l-/libunibreak.json
index 364e54e6a..2bca3c35f 100644
--- a/external_imported/vcpkg/versions/l-/libunibreak.json
+++ b/external_imported/vcpkg/versions/l-/libunibreak.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "82fb16a307e33e75cbdbd3726f4b7bbcea42eb23",
+      "version": "5.1",
+      "port-version": 0
+    },
     {
       "git-tree": "724f588851a5f81f6ddd8eb1fc01a45bedfa5517",
       "version": "5.0",
diff --git a/external_imported/vcpkg/versions/l-/libunifex.json b/external_imported/vcpkg/versions/l-/libunifex.json
index a9319450f..c41999680 100644
--- a/external_imported/vcpkg/versions/l-/libunifex.json
+++ b/external_imported/vcpkg/versions/l-/libunifex.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "e7524481edfefbd5145b3a1d5a4caad55601e714",
+      "version": "0.4.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c60e3416d322f4e80f25e565190f679c99967931",
+      "version": "0.3.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4cc9469cbd38b11cc3966599bcb60c29d4dc34bc",
+      "version-date": "2023-01-25",
+      "port-version": 2
+    },
+    {
+      "git-tree": "f3613daa6d59dd1ebb7077c181171b9f60f21ced",
+      "version-date": "2023-01-25",
+      "port-version": 1
+    },
     {
       "git-tree": "b199e662b7eadaba2830a26892c2174b7f4ba3b3",
       "version-date": "2023-01-25",
diff --git a/external_imported/vcpkg/versions/l-/libunistring.json b/external_imported/vcpkg/versions/l-/libunistring.json
index 7945beb56..d2713261b 100644
--- a/external_imported/vcpkg/versions/l-/libunistring.json
+++ b/external_imported/vcpkg/versions/l-/libunistring.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2ba0cbad49845cff90c4368b3e2459a9fdd18c00",
+      "version": "1.1",
+      "port-version": 3
+    },
     {
       "git-tree": "8bcb2f939ea16732abab03352b951cf12713bc54",
       "version": "1.1",
diff --git a/external_imported/vcpkg/versions/l-/libunwind.json b/external_imported/vcpkg/versions/l-/libunwind.json
new file mode 100644
index 000000000..b538e13db
--- /dev/null
+++ b/external_imported/vcpkg/versions/l-/libunwind.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "294a42641c25a25372ce73673ad0ec151ed50fac",
+      "version": "1.7.2",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/l-/liburing.json b/external_imported/vcpkg/versions/l-/liburing.json
index 175bdc541..1d3ea6122 100644
--- a/external_imported/vcpkg/versions/l-/liburing.json
+++ b/external_imported/vcpkg/versions/l-/liburing.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "b66acf8da313f79a9cdcc12ee6daf8f621e7bcce",
+      "version": "2.5",
+      "port-version": 0
+    },
+    {
+      "git-tree": "317cfa2c23f9e0e285b1c36140cdb54739ebf328",
+      "version": "2.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c51f4ef4488799a1c1389216ea8f7cec8be14b62",
+      "version": "2.3",
+      "port-version": 1
+    },
+    {
+      "git-tree": "0c8b60f54ff0c4e9a0ae2a1a2cbcf72e2cfeaf04",
+      "version": "2.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "92a2fd81331f9b6ad3119a166ed18159499fa403",
+      "version": "2.2",
+      "port-version": 2
+    },
     {
       "git-tree": "e41ee56c7ceb8925a59b8d427a63990f581c0328",
       "version": "2.2",
diff --git a/external_imported/vcpkg/versions/l-/libusb-win32.json b/external_imported/vcpkg/versions/l-/libusb-win32.json
index cc828432d..a1d4034cb 100644
--- a/external_imported/vcpkg/versions/l-/libusb-win32.json
+++ b/external_imported/vcpkg/versions/l-/libusb-win32.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "af8b466e97e4d465147eb08289328d9cdf6f077d",
+      "version": "1.2.6.0",
+      "port-version": 10
+    },
     {
       "git-tree": "33a59191d5fa27f6d37b37e39dd1f100d4faed0f",
       "version": "1.2.6.0",
diff --git a/external_imported/vcpkg/versions/l-/libusb.json b/external_imported/vcpkg/versions/l-/libusb.json
index 290251d6d..4f838418e 100644
--- a/external_imported/vcpkg/versions/l-/libusb.json
+++ b/external_imported/vcpkg/versions/l-/libusb.json
@@ -1,5 +1,45 @@
 {
   "versions": [
+    {
+      "git-tree": "ae02e3ed7014fe0c328b2c3ec6ed60cff9c0b956",
+      "version": "1.0.26.11791",
+      "port-version": 7
+    },
+    {
+      "git-tree": "53ad48778a3278668b2ede66ac49fa20a9d03414",
+      "version": "1.0.26.11791",
+      "port-version": 6
+    },
+    {
+      "git-tree": "f4d325ede3cd1de2acd9a2d8f2708ec1e758cf0a",
+      "version": "1.0.26.11791",
+      "port-version": 5
+    },
+    {
+      "git-tree": "1e6400f24988b86ad461447df4eef8efc56a919f",
+      "version": "1.0.26.11791",
+      "port-version": 4
+    },
+    {
+      "git-tree": "d286a5e0a74eda464b96375fe35cba969dfc2545",
+      "version": "1.0.26.11791",
+      "port-version": 3
+    },
+    {
+      "git-tree": "87cd196b403364febf719d64fe6f08ab0bf6b285",
+      "version": "1.0.26.11791",
+      "port-version": 2
+    },
+    {
+      "git-tree": "653d47743e90abaa28a3d17b49fe479a0096f8ef",
+      "version": "1.0.26.11791",
+      "port-version": 1
+    },
+    {
+      "git-tree": "230bacd99c77786d65d0cfe9ba51ec472521c382",
+      "version": "1.0.26.11791",
+      "port-version": 0
+    },
     {
       "git-tree": "540652cc1251aa3894206c20296f6119da1ccea4",
       "version": "1.0.26",
diff --git a/external_imported/vcpkg/versions/l-/libusbmuxd.json b/external_imported/vcpkg/versions/l-/libusbmuxd.json
index 520deb97c..f040decba 100644
--- a/external_imported/vcpkg/versions/l-/libusbmuxd.json
+++ b/external_imported/vcpkg/versions/l-/libusbmuxd.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "ba5bfe9a2e679d22d3b3b520e432c493df3919e9",
+      "version-date": "2023-06-21",
+      "port-version": 1
+    },
+    {
+      "git-tree": "7a9145917e1df41e8820d26c2e167f3839d7a947",
+      "version-date": "2023-06-21",
+      "port-version": 0
+    },
     {
       "git-tree": "82278a08f20aabe20c5ba0981de631ad6f9df469",
       "version": "1.2.219",
diff --git a/external_imported/vcpkg/versions/l-/libuuid.json b/external_imported/vcpkg/versions/l-/libuuid.json
index 1636fbcf6..95e9210f4 100644
--- a/external_imported/vcpkg/versions/l-/libuuid.json
+++ b/external_imported/vcpkg/versions/l-/libuuid.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "09be6774f518692bc418aa03623cc9dbc19e6516",
+      "version": "1.0.3",
+      "port-version": 14
+    },
+    {
+      "git-tree": "356948d66a6dd59bd830d26c78d1df673de20ea1",
+      "version": "1.0.3",
+      "port-version": 13
+    },
     {
       "git-tree": "70aca4a70f3235201b05de87aa7ee6258d7c0231",
       "version": "1.0.3",
diff --git a/external_imported/vcpkg/versions/l-/libuv.json b/external_imported/vcpkg/versions/l-/libuv.json
index 0b2382838..60d499a6e 100644
--- a/external_imported/vcpkg/versions/l-/libuv.json
+++ b/external_imported/vcpkg/versions/l-/libuv.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "2267bb7c14ae2201b02e2d708631e4a228355543",
+      "version-semver": "1.46.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "0cd421b9c0bc8a89bf76892f99c87560cbde8d93",
+      "version-semver": "1.46.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c99175c380930fd7a51719f7247618cceaa51529",
+      "version-semver": "1.45.0",
+      "port-version": 0
+    },
     {
       "git-tree": "dad61360b9c0fb825e23a4ccc01dcd9658e2f253",
       "version-semver": "1.44.2",
diff --git a/external_imported/vcpkg/versions/l-/libuvc.json b/external_imported/vcpkg/versions/l-/libuvc.json
index c29691ba5..f5933a532 100644
--- a/external_imported/vcpkg/versions/l-/libuvc.json
+++ b/external_imported/vcpkg/versions/l-/libuvc.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "930185d807e87c0ebec6aefd21e2ca336ee0cc3c",
+      "version": "0.0.7",
+      "port-version": 0
+    },
+    {
+      "git-tree": "578c4d06e3d518e46edee324e3c8048826c503ec",
+      "version-date": "2020-11-24",
+      "port-version": 4
+    },
     {
       "git-tree": "b254a9fb5aa3fc5d709a3f708d9c3dbb5d0a26bd",
       "version-date": "2020-11-24",
diff --git a/external_imported/vcpkg/versions/l-/libvault.json b/external_imported/vcpkg/versions/l-/libvault.json
new file mode 100644
index 000000000..441d33f1c
--- /dev/null
+++ b/external_imported/vcpkg/versions/l-/libvault.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "3ab55180dfc75f58d833bae81f6e303416c992e6",
+      "version": "0.56.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/l-/libvmdk.json b/external_imported/vcpkg/versions/l-/libvmdk.json
index 4d421a0a0..e69c40ab7 100644
--- a/external_imported/vcpkg/versions/l-/libvmdk.json
+++ b/external_imported/vcpkg/versions/l-/libvmdk.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "2065c045d5787d9fff6469d31fe6bbe2f925d367",
+      "version": "20221124",
+      "port-version": 0
+    },
+    {
+      "git-tree": "1e57cc839896d460f87ccf1a48562dcb876f7f6b",
+      "version": "20200926",
+      "port-version": 4
+    },
     {
       "git-tree": "f7144e40ca7cfd22875c2aa308e4e9b023ef3033",
       "version-string": "20200926",
diff --git a/external_imported/vcpkg/versions/l-/libvpx.json b/external_imported/vcpkg/versions/l-/libvpx.json
index 87e023c64..a1bcc673b 100644
--- a/external_imported/vcpkg/versions/l-/libvpx.json
+++ b/external_imported/vcpkg/versions/l-/libvpx.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "66ea767e9ce55da152694d49a74ad2125ca4d937",
+      "version": "1.13.1",
+      "port-version": 2
+    },
+    {
+      "git-tree": "88491a53de6cdc69ec82882d44aab8cf3b315577",
+      "version": "1.13.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "1484fb529e99fdedd95f2b46f65738a9e95fcaa1",
+      "version": "1.13.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "255c8c5ca6526bd7a0ac6f3a6a7838c77ee97e5e",
+      "version": "1.12.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "7b346f9dc851b8598c461ae9b856c11d222848ec",
+      "version": "1.12.0",
+      "port-version": 1
+    },
     {
       "git-tree": "5bad78764d9138da1f5f2b1c49ec291377166a30",
       "version": "1.12.0",
diff --git a/external_imported/vcpkg/versions/l-/libwebp.json b/external_imported/vcpkg/versions/l-/libwebp.json
index f6af4d999..f113c1c62 100644
--- a/external_imported/vcpkg/versions/l-/libwebp.json
+++ b/external_imported/vcpkg/versions/l-/libwebp.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "0b981028589375097039d5e39e7d87659cdfa824",
+      "version": "1.3.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ce9a702064516d77e0b1239edc29efd603ee323e",
+      "version": "1.3.1",
+      "port-version": 2
+    },
+    {
+      "git-tree": "42095edcaa6f9fb7a29822896d45b772f694a9cf",
+      "version": "1.3.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "3a14f8bd920b63d510d85da200f0b6f1847e270a",
+      "version": "1.3.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "519daa6213a5995a860ed724c465adf9ff83b52a",
+      "version": "1.3.0",
+      "port-version": 1
+    },
     {
       "git-tree": "d11b6a22e2acdba95c761dd4045cd8d66095f42d",
       "version": "1.3.0",
@@ -50,21 +75,6 @@
       "version-string": "1.1.0",
       "port-version": 1
     },
-    {
-      "git-tree": "a05e0de81085231df86f6902aba1e0a364e2ca7b",
-      "version-string": "1.1.0",
-      "port-version": 0
-    },
-    {
-      "git-tree": "5066566c98bc1913b678347c4cbae0a6aff4cf2d",
-      "version-string": "1.0.3-1",
-      "port-version": 0
-    },
-    {
-      "git-tree": "6ff3a23b154fad821db2d8236bf9d0382f0229cf",
-      "version-string": "1.0.3",
-      "port-version": 0
-    },
     {
       "git-tree": "256b8e8b5d64cb6f66da47f1a361e5538d341023",
       "version-string": "1.0.2-8",
diff --git a/external_imported/vcpkg/versions/l-/libxcrypt.json b/external_imported/vcpkg/versions/l-/libxcrypt.json
new file mode 100644
index 000000000..c2b8418ba
--- /dev/null
+++ b/external_imported/vcpkg/versions/l-/libxcrypt.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "85a0274aca1b0c7bf756cb41f77d9dbfc2b6fb78",
+      "version": "4.4.36",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/l-/libxdf.json b/external_imported/vcpkg/versions/l-/libxdf.json
new file mode 100644
index 000000000..dbfffcfc3
--- /dev/null
+++ b/external_imported/vcpkg/versions/l-/libxdf.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "c1a0ecbb62eb5c0d6411498644c94fe08120f3b5",
+      "version": "0.99.8",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/l-/libxdiff.json b/external_imported/vcpkg/versions/l-/libxdiff.json
index 09e24cee0..2d640a34a 100644
--- a/external_imported/vcpkg/versions/l-/libxdiff.json
+++ b/external_imported/vcpkg/versions/l-/libxdiff.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3c416f4eaabd3ca0697fcf4e004e99975d23bd00",
+      "version": "0.23",
+      "port-version": 4
+    },
     {
       "git-tree": "ce9f54a13c2317e8249e154d852fa5d7ee0940c3",
       "version": "0.23",
diff --git a/external_imported/vcpkg/versions/l-/libxkbcommon.json b/external_imported/vcpkg/versions/l-/libxkbcommon.json
index 5cdbd5a14..f1216f558 100644
--- a/external_imported/vcpkg/versions/l-/libxkbcommon.json
+++ b/external_imported/vcpkg/versions/l-/libxkbcommon.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b5024c3a86021f781de98ec7351ae6c6f48df704",
+      "version": "1.4.1",
+      "port-version": 1
+    },
     {
       "git-tree": "41ae34eb1eb104faea75a726f115e0e774c17d65",
       "version": "1.4.1",
diff --git a/external_imported/vcpkg/versions/l-/libxlsxwriter.json b/external_imported/vcpkg/versions/l-/libxlsxwriter.json
index 4014a6064..c1b7e5a08 100644
--- a/external_imported/vcpkg/versions/l-/libxlsxwriter.json
+++ b/external_imported/vcpkg/versions/l-/libxlsxwriter.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "a877e6dd9e9652cedcb94daa467c8fd7580bf5fb",
+      "version": "1.1.5",
+      "port-version": 2
+    },
+    {
+      "git-tree": "2769eadc216de088f724efd09edce1c73f9e8b4b",
+      "version": "1.1.5",
+      "port-version": 1
+    },
     {
       "git-tree": "1fec6d7beb6dff8486fb16b04849725ac466d409",
       "version": "1.1.5",
diff --git a/external_imported/vcpkg/versions/l-/libxml2.json b/external_imported/vcpkg/versions/l-/libxml2.json
index 79a7a8cc4..56dd4815c 100644
--- a/external_imported/vcpkg/versions/l-/libxml2.json
+++ b/external_imported/vcpkg/versions/l-/libxml2.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "b2fd11805c5e6714215c5dd9630400c4ad32e833",
+      "version": "2.11.6",
+      "port-version": 1
+    },
+    {
+      "git-tree": "a347ee0ddfd928d4f61ec12b3b95c1c7740d46df",
+      "version": "2.11.6",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5ce0144d5c48f5140af55d0fbb58396b955d87a3",
+      "version": "2.11.5",
+      "port-version": 1
+    },
+    {
+      "git-tree": "a8c20b561ed09ee9bd274071751dafbf8c0825ed",
+      "version": "2.11.5",
+      "port-version": 0
+    },
+    {
+      "git-tree": "fd1e750ce7851d72bf39c0b6d30a4a8d1d717c45",
+      "version": "2.10.3",
+      "port-version": 1
+    },
     {
       "git-tree": "aa09deda9fa69a3d56a39504e85e72affb3139d9",
       "version": "2.10.3",
diff --git a/external_imported/vcpkg/versions/l-/libxmlpp.json b/external_imported/vcpkg/versions/l-/libxmlpp.json
index 526fed6df..a9e868cad 100644
--- a/external_imported/vcpkg/versions/l-/libxmlpp.json
+++ b/external_imported/vcpkg/versions/l-/libxmlpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "361ec896634a0f947949dcf71e2dbf991c066d44",
+      "version": "5.0.0",
+      "port-version": 3
+    },
     {
       "git-tree": "a603edc93c74d92bdbcef0bd8c38bbe331d1aa9d",
       "version": "5.0.0",
diff --git a/external_imported/vcpkg/versions/l-/libxmp.json b/external_imported/vcpkg/versions/l-/libxmp.json
new file mode 100644
index 000000000..49323a214
--- /dev/null
+++ b/external_imported/vcpkg/versions/l-/libxmp.json
@@ -0,0 +1,24 @@
+{
+  "versions": [
+    {
+      "git-tree": "cd5e84c88c79658a97f5f370b148ea59a1abd344",
+      "version": "4.6.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "9822e97892e95d5804274ce1076e1abbbed706ce",
+      "version": "4.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a5c05ac5a1e4a0ff9580fc5bba923b39a48b033e",
+      "version-date": "2023-04-13",
+      "port-version": 1
+    },
+    {
+      "git-tree": "2773b355a7b3a41ab6739548277b9b828d163242",
+      "version-date": "2023-04-13",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/l-/libxpm.json b/external_imported/vcpkg/versions/l-/libxpm.json
index 60207c816..e969a79cc 100644
--- a/external_imported/vcpkg/versions/l-/libxpm.json
+++ b/external_imported/vcpkg/versions/l-/libxpm.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ab78e7ef1aa0fd25dfc94278d05e4c1f983aa71a",
+      "version": "3.5.16",
+      "port-version": 0
+    },
     {
       "git-tree": "6fb796fec0f4bcbf52d4da236bce4e3394c619e9",
       "version": "3.5.14",
diff --git a/external_imported/vcpkg/versions/l-/libxslt.json b/external_imported/vcpkg/versions/l-/libxslt.json
index 2f867897a..cd4077330 100644
--- a/external_imported/vcpkg/versions/l-/libxslt.json
+++ b/external_imported/vcpkg/versions/l-/libxslt.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "8c34fe62d32f65f3a4b188a327eda7a4f134fea2",
+      "version": "1.1.37",
+      "port-version": 3
+    },
+    {
+      "git-tree": "b5013956f82220811954d9ed3b68e122c11e88a0",
+      "version": "1.1.37",
+      "port-version": 2
+    },
     {
       "git-tree": "1e2ad3abc4c5d53f33c43f0a1b7aa09ca7e06dc1",
       "version": "1.1.37",
diff --git a/external_imported/vcpkg/versions/l-/libxt.json b/external_imported/vcpkg/versions/l-/libxt.json
index f50675f2c..50aec8bc7 100644
--- a/external_imported/vcpkg/versions/l-/libxt.json
+++ b/external_imported/vcpkg/versions/l-/libxt.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f31aa9aa9e1f86b0f2ca59be16b76ceb156696e1",
+      "version": "1.2.1",
+      "port-version": 1
+    },
     {
       "git-tree": "ec0636529740c0931c0c31006dc22d5d599f080d",
       "version": "1.2.1",
diff --git a/external_imported/vcpkg/versions/l-/libyaml.json b/external_imported/vcpkg/versions/l-/libyaml.json
index 3c90caf31..e8db03dad 100644
--- a/external_imported/vcpkg/versions/l-/libyaml.json
+++ b/external_imported/vcpkg/versions/l-/libyaml.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ae6fcd42cb9d1448913be2c7eb536df813601230",
+      "version": "0.2.5",
+      "port-version": 4
+    },
     {
       "git-tree": "0a7af4d5e003c4971aa031bf5533ac14f35e91d7",
       "version-string": "0.2.5",
diff --git a/external_imported/vcpkg/versions/l-/libzen.json b/external_imported/vcpkg/versions/l-/libzen.json
index 80dbf2093..5af1c768c 100644
--- a/external_imported/vcpkg/versions/l-/libzen.json
+++ b/external_imported/vcpkg/versions/l-/libzen.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "ab92638577d4a71ffc7acd3bee65dc7d8c0e7bca",
+      "version": "0.4.41",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e3635609bd53140cc191a65b168d1a131f84366a",
+      "version": "0.4.40",
+      "port-version": 0
+    },
     {
       "git-tree": "37c7d9f6e950b43bc62ed633bc8fc1964bb2ada3",
       "version": "0.4.39",
diff --git a/external_imported/vcpkg/versions/l-/libzim.json b/external_imported/vcpkg/versions/l-/libzim.json
new file mode 100644
index 000000000..5aa24ca12
--- /dev/null
+++ b/external_imported/vcpkg/versions/l-/libzim.json
@@ -0,0 +1,24 @@
+{
+  "versions": [
+    {
+      "git-tree": "1b50ef00c5ff7e2ba8f3b064c8ffe6eb14a74f28",
+      "version": "9.0.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "96c23c527ace6213975b81955373f37d96977063",
+      "version": "8.2.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "1488a183ad98b3610343e68c207554492b1e8c8e",
+      "version": "8.2.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "93b2790850e120148daf03563e24e6ed3ee9e02e",
+      "version": "8.2.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/l-/libzip.json b/external_imported/vcpkg/versions/l-/libzip.json
index 6e694aafb..4e233d6ef 100644
--- a/external_imported/vcpkg/versions/l-/libzip.json
+++ b/external_imported/vcpkg/versions/l-/libzip.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "7f4b7231355f6774a5b6915dace3826173b76cee",
+      "version": "1.10.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "59242c6974f6245813fa69d09f9c6df6c501b895",
+      "version": "1.9.2",
+      "port-version": 2
+    },
+    {
+      "git-tree": "42ad3093c3b335f0ae0bf54179faa30bd751d00c",
+      "version": "1.9.2",
+      "port-version": 1
+    },
     {
       "git-tree": "ec8e48c035f43c65ce9f0f5b455affaa92aa477e",
       "version": "1.9.2",
diff --git a/external_imported/vcpkg/versions/l-/libzippp.json b/external_imported/vcpkg/versions/l-/libzippp.json
index 1dcb2b6b9..5d2f23f4a 100644
--- a/external_imported/vcpkg/versions/l-/libzippp.json
+++ b/external_imported/vcpkg/versions/l-/libzippp.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "8bde37380220a7418e4f0e461ebb02bfba83858d",
+      "version": "7.0-1.10.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c15b10fa38a22c6ff395d7a87c3a4f02c5586add",
+      "version": "6.1-1.9.2",
+      "port-version": 0
+    },
     {
       "git-tree": "9b0548bad2ec87607ee6dec3e94ee4d3140ff726",
       "version": "6.0-1.9.2",
diff --git a/external_imported/vcpkg/versions/l-/licensepp.json b/external_imported/vcpkg/versions/l-/licensepp.json
index 382d7d62a..2ffc57fa4 100644
--- a/external_imported/vcpkg/versions/l-/licensepp.json
+++ b/external_imported/vcpkg/versions/l-/licensepp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "00707f2d2df73ed1303b493178c791ef41996505",
+      "version-date": "2020-11-24",
+      "port-version": 0
+    },
     {
       "git-tree": "242d2988823856d4bec19a6a8844fb0d6a30eb33",
       "version-date": "2020-05-19",
diff --git a/external_imported/vcpkg/versions/l-/lightningscanner.json b/external_imported/vcpkg/versions/l-/lightningscanner.json
new file mode 100644
index 000000000..dd77c50da
--- /dev/null
+++ b/external_imported/vcpkg/versions/l-/lightningscanner.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "a9096d7c2c2c14b7e438e48f6aecd194c2356172",
+      "version": "1.0.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "25cfcf5944e73bfe349e264a37f98ea36558da18",
+      "version": "1.0.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/l-/linalg.json b/external_imported/vcpkg/versions/l-/linalg.json
index 10c2b9324..600cdcb55 100644
--- a/external_imported/vcpkg/versions/l-/linalg.json
+++ b/external_imported/vcpkg/versions/l-/linalg.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "b8287026554baea7ac2fbbf2ec7c54d3ebe181b7",
+      "version": "2.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "dec66a04dc695329609da7aad70ecfde3e36aa4b",
+      "version": "2.1",
+      "port-version": 2
+    },
     {
       "git-tree": "19b7c7f697dab441e8d16c883a66682f090fb0cf",
       "version-string": "2.1",
diff --git a/external_imported/vcpkg/versions/l-/lionkor-commandline.json b/external_imported/vcpkg/versions/l-/lionkor-commandline.json
index 0283efb57..b10eb4f42 100644
--- a/external_imported/vcpkg/versions/l-/lionkor-commandline.json
+++ b/external_imported/vcpkg/versions/l-/lionkor-commandline.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5588648e1995f79458647db04b18ddf68c6ddcd6",
+      "version-semver": "2.2.0",
+      "port-version": 0
+    },
     {
       "git-tree": "bb56d3f901805ac69ea5d7bd27a07b789f3232e5",
       "version-semver": "2.0.0",
diff --git a/external_imported/vcpkg/versions/l-/live555.json b/external_imported/vcpkg/versions/l-/live555.json
index 5b6aa653c..cd16fc8d9 100644
--- a/external_imported/vcpkg/versions/l-/live555.json
+++ b/external_imported/vcpkg/versions/l-/live555.json
@@ -1,5 +1,50 @@
 {
   "versions": [
+    {
+      "git-tree": "2402cdcc3405afe25f02e4a6d3c44ec1b1c68aaf",
+      "version-date": "2023-11-30",
+      "port-version": 1
+    },
+    {
+      "git-tree": "80eb597529bc497ceb274509b6224bf0524930c1",
+      "version-date": "2023-11-30",
+      "port-version": 0
+    },
+    {
+      "git-tree": "302e545ae4e1386eb3048b429fff813c336ff0c7",
+      "version-date": "2023-11-08",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9e83e021123610806240ac1742b68f25bcbc3ff7",
+      "version-date": "2023-07-24",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3145196c0ec759988b77ab9ef787f426b0efc02d",
+      "version-date": "2023-06-20",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e7944bec69900cba45393bcacfb4d903a3569300",
+      "version-date": "2023-06-10",
+      "port-version": 1
+    },
+    {
+      "git-tree": "087f65196bb8a0fe3a7e8012e3e2970106e085fd",
+      "version-date": "2023-06-10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4042dde466ab9adcd96e5271751a65a8b67270f7",
+      "version-date": "2023-05-10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0a8b18570460ba3155d5c6cba9f5c05c95d876e2",
+      "version-date": "2023-03-30",
+      "port-version": 0
+    },
     {
       "git-tree": "43dd99ed461fd0fef750ceb08527b761fd8ba384",
       "version-date": "2023-01-19",
diff --git a/external_imported/vcpkg/versions/l-/llfio.json b/external_imported/vcpkg/versions/l-/llfio.json
index c4cac7b44..1005d2608 100644
--- a/external_imported/vcpkg/versions/l-/llfio.json
+++ b/external_imported/vcpkg/versions/l-/llfio.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "dc1f2c9ef08627e6330c223e15dbe9f798545f0a",
+      "version-date": "2023-11-06",
+      "port-version": 0
+    },
     {
       "git-tree": "45b00c3d0af2dfae0043832ca9b6f86393a9b432",
       "version-date": "2023-03-13",
diff --git a/external_imported/vcpkg/versions/l-/llgi.json b/external_imported/vcpkg/versions/l-/llgi.json
new file mode 100644
index 000000000..6c69b2598
--- /dev/null
+++ b/external_imported/vcpkg/versions/l-/llgi.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "70bc60ef323833846200e1ffe0937de2cfaaf77e",
+      "version-date": "2023-12-19",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a0f885d3531458ac1a7748ce8af641b30a80a166",
+      "version-date": "2023-11-04",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/l-/llhttp.json b/external_imported/vcpkg/versions/l-/llhttp.json
index 0b7b6dc5d..1a12b26f0 100644
--- a/external_imported/vcpkg/versions/l-/llhttp.json
+++ b/external_imported/vcpkg/versions/l-/llhttp.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "3422384dc0ec7e58827c138826bb666efe850eaa",
+      "version": "9.1.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3a46d3c8233039a700b07997705cc2a49d832e15",
+      "version": "9.1.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "02d4bf2e1a15712c39a825aa81791f032b06fd10",
+      "version": "8.1.0",
+      "port-version": 2
+    },
     {
       "git-tree": "655fdc5f25da19400df907e4d82fc0b148f02e9d",
       "version": "8.1.0",
diff --git a/external_imported/vcpkg/versions/l-/llvm.json b/external_imported/vcpkg/versions/l-/llvm.json
index 3d3423260..c4039fd6a 100644
--- a/external_imported/vcpkg/versions/l-/llvm.json
+++ b/external_imported/vcpkg/versions/l-/llvm.json
@@ -1,5 +1,65 @@
 {
   "versions": [
+    {
+      "git-tree": "ce44a7977e6376d53613ed81224eb992a0b82a98",
+      "version": "17.0.2",
+      "port-version": 3
+    },
+    {
+      "git-tree": "af2e23c1205568f576321133141a51439ef1059f",
+      "version": "17.0.2",
+      "port-version": 2
+    },
+    {
+      "git-tree": "3d195e85c468428553d0aed0eeb76e3714231e3a",
+      "version": "17.0.2",
+      "port-version": 1
+    },
+    {
+      "git-tree": "7bbd8fe3bd9dd7f507ec0b0713c5de3109d312b5",
+      "version": "17.0.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "484d2a5abb5ffc10d18e18603adb20bd01854012",
+      "version": "15.0.7",
+      "port-version": 6
+    },
+    {
+      "git-tree": "ce05511c7bf08ffecc627b73ae566e1a1e7e6b20",
+      "version": "15.0.7",
+      "port-version": 5
+    },
+    {
+      "git-tree": "bd0b5a20abf736cc78645980e56569eae2e076ba",
+      "version": "15.0.7",
+      "port-version": 4
+    },
+    {
+      "git-tree": "1ba26e4d72f4d6112c483a09d9a2dd0aa42067f3",
+      "version": "15.0.7",
+      "port-version": 3
+    },
+    {
+      "git-tree": "9c069ac90689417940c7a8e5a972afac79042619",
+      "version": "15.0.7",
+      "port-version": 2
+    },
+    {
+      "git-tree": "da5caa3f08a5e52f4d46559e0f5be3a73958dd2c",
+      "version": "15.0.7",
+      "port-version": 1
+    },
+    {
+      "git-tree": "cb3f603740884034c2a28562e35c47f3c8e45ad6",
+      "version": "15.0.7",
+      "port-version": 0
+    },
+    {
+      "git-tree": "321559ad78e1741e396fc25d5f51d4f99d1f40fc",
+      "version": "14.0.6",
+      "port-version": 1
+    },
     {
       "git-tree": "a5e218fee4a3c429f4e2c9586de5083c1b13c7da",
       "version": "14.0.6",
diff --git a/external_imported/vcpkg/versions/l-/lmdb.json b/external_imported/vcpkg/versions/l-/lmdb.json
index d150fa7f1..0c9880b1d 100644
--- a/external_imported/vcpkg/versions/l-/lmdb.json
+++ b/external_imported/vcpkg/versions/l-/lmdb.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3a13501d369f479e4b9a5e14c3f75022c07a18dd",
+      "version": "0.9.31",
+      "port-version": 0
+    },
     {
       "git-tree": "1c94e6b90d91bc39a4307502116b20d7b38de413",
       "version": "0.9.29",
diff --git a/external_imported/vcpkg/versions/l-/lockpp.json b/external_imported/vcpkg/versions/l-/lockpp.json
index fbd5055fb..4ef6fa113 100644
--- a/external_imported/vcpkg/versions/l-/lockpp.json
+++ b/external_imported/vcpkg/versions/l-/lockpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fe1a86b6361bc55051cd31928d876ba7f0f6a8ab",
+      "version": "2.6",
+      "port-version": 0
+    },
     {
       "git-tree": "a186ea76115669b87e581cdc125423e950322d70",
       "version": "1.0.2",
diff --git a/external_imported/vcpkg/versions/l-/log4cplus.json b/external_imported/vcpkg/versions/l-/log4cplus.json
index ac896243b..b9feeb216 100644
--- a/external_imported/vcpkg/versions/l-/log4cplus.json
+++ b/external_imported/vcpkg/versions/l-/log4cplus.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "450db8aa0bcccc8479b3f3d2d1c63b71510c5dd4",
+      "version": "2.1.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c0a2d8577299ff33c61cbb08d3eb4d4616e4e392",
+      "version": "2.1.0",
+      "port-version": 0
+    },
     {
       "git-tree": "7eb39878c5311e28d66f4a25e0c1583c1c99ff82",
       "version": "2.0.7",
diff --git a/external_imported/vcpkg/versions/l-/log4cpp-log4cpp.json b/external_imported/vcpkg/versions/l-/log4cpp-log4cpp.json
new file mode 100644
index 000000000..3b25e0790
--- /dev/null
+++ b/external_imported/vcpkg/versions/l-/log4cpp-log4cpp.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "3ac5e6e898eeac3db01d2f9c70bc4df663e035f2",
+      "version": "1.1.4",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/l-/log4cxx.json b/external_imported/vcpkg/versions/l-/log4cxx.json
index 33fc5613a..071d48a2d 100644
--- a/external_imported/vcpkg/versions/l-/log4cxx.json
+++ b/external_imported/vcpkg/versions/l-/log4cxx.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "d24b9474cf8ec8bca0ec3dce1f0d9e4a030836bd",
+      "version": "1.2.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c030a796829f4525b2369a135d7bdc615b6fb14b",
+      "version": "1.1.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "eca29ecb5127d26bd46aad143468b069a045d104",
+      "version": "1.1.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3f8391924df847ec08d25424cb7482be557c3d49",
+      "version": "1.0.0",
+      "port-version": 0
+    },
     {
       "git-tree": "65dd3e2c021462bc3445c9f215ace6936a177bb6",
       "version": "0.13.0.1",
diff --git a/external_imported/vcpkg/versions/l-/lpeg.json b/external_imported/vcpkg/versions/l-/lpeg.json
index 4151d8e6b..617853a15 100644
--- a/external_imported/vcpkg/versions/l-/lpeg.json
+++ b/external_imported/vcpkg/versions/l-/lpeg.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "a1832dfc0fc6e11738a1653cdf7a65ccde8903ba",
+      "version": "1.1.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e364c24f0029fc6589aae6051eec09af14cc02d2",
+      "version": "1.0.2",
+      "port-version": 4
+    },
     {
       "git-tree": "d8bf7969434ee53a126d419ba7387322658967bb",
       "version-string": "1.0.2",
diff --git a/external_imported/vcpkg/versions/l-/ltla-aarand.json b/external_imported/vcpkg/versions/l-/ltla-aarand.json
new file mode 100644
index 000000000..9a6bf9a8e
--- /dev/null
+++ b/external_imported/vcpkg/versions/l-/ltla-aarand.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "78cd0fcfb69b096fb2f4261e02c0b0dbaa85b89a",
+      "version-date": "2023-03-19",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/l-/ltla-cppirlba.json b/external_imported/vcpkg/versions/l-/ltla-cppirlba.json
new file mode 100644
index 000000000..24d3483a7
--- /dev/null
+++ b/external_imported/vcpkg/versions/l-/ltla-cppirlba.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "6edf2cf4964bd6d76488af4320eea69e6604b226",
+      "version-date": "2023-09-20",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a1a4fe3742a5fecbadcb34155df9230a279a3e1c",
+      "version-date": "2023-04-07",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/l-/ltla-cppkmeans.json b/external_imported/vcpkg/versions/l-/ltla-cppkmeans.json
new file mode 100644
index 000000000..2342a0fd7
--- /dev/null
+++ b/external_imported/vcpkg/versions/l-/ltla-cppkmeans.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "98167fd1d30ddefc1bbb44a321af164cf59aee31",
+      "version-date": "2023-03-20",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/l-/ltla-knncolle.json b/external_imported/vcpkg/versions/l-/ltla-knncolle.json
new file mode 100644
index 000000000..844029f74
--- /dev/null
+++ b/external_imported/vcpkg/versions/l-/ltla-knncolle.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "543f312cf96c53b41e8501bf473e5e8a336d8b12",
+      "version-date": "2023-05-09",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/l-/ltla-powerit.json b/external_imported/vcpkg/versions/l-/ltla-powerit.json
new file mode 100644
index 000000000..af8b6d92f
--- /dev/null
+++ b/external_imported/vcpkg/versions/l-/ltla-powerit.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "522b483967df42ac83d0876893d81becf3e88ab6",
+      "version-date": "2023-03-19",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/l-/ltla-umappp.json b/external_imported/vcpkg/versions/l-/ltla-umappp.json
new file mode 100644
index 000000000..db0c44c68
--- /dev/null
+++ b/external_imported/vcpkg/versions/l-/ltla-umappp.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "b96e4bc54041c787e0c15d884c0968aade97cfae",
+      "version-date": "2023-05-11",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/l-/lua.json b/external_imported/vcpkg/versions/l-/lua.json
index 7c151ed69..0cdae44d1 100644
--- a/external_imported/vcpkg/versions/l-/lua.json
+++ b/external_imported/vcpkg/versions/l-/lua.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "a25521a101ee330fd29139a6d4f377be3d814326",
+      "version": "5.4.6",
+      "port-version": 0
+    },
+    {
+      "git-tree": "804a148ba3bbecf8f998d38c682eaee628725fbb",
+      "version": "5.4.4",
+      "port-version": 7
+    },
+    {
+      "git-tree": "d250107f0ea435eb8145cd8b0db97aebee05f0b6",
+      "version": "5.4.4",
+      "port-version": 6
+    },
     {
       "git-tree": "0a579d274fbb147e35fc45578cc446cad2c76079",
       "version": "5.4.4",
diff --git a/external_imported/vcpkg/versions/l-/luabridge3.json b/external_imported/vcpkg/versions/l-/luabridge3.json
index ae8ea7a53..c9ecd4908 100644
--- a/external_imported/vcpkg/versions/l-/luabridge3.json
+++ b/external_imported/vcpkg/versions/l-/luabridge3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8dffa17cfaea6d146adf781428a24f78347386e6",
+      "version": "3.0-rc3",
+      "port-version": 0
+    },
     {
       "git-tree": "832dcdfc1e99b85241865abda8434a33424a3f4b",
       "version": "3.0-beta4",
diff --git a/external_imported/vcpkg/versions/l-/luafilesystem.json b/external_imported/vcpkg/versions/l-/luafilesystem.json
index 237944ca1..b7d9d3d6e 100644
--- a/external_imported/vcpkg/versions/l-/luafilesystem.json
+++ b/external_imported/vcpkg/versions/l-/luafilesystem.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "7a2e981db39265f79730f1c73502dfa362db30b5",
+      "version": "1.8.0",
+      "port-version": 5
+    },
+    {
+      "git-tree": "d399198385c222305569f32166f965843da16cdf",
+      "version": "1.8.0",
+      "port-version": 4
+    },
     {
       "git-tree": "b823db113deca954d5354f3e9f0cda24adcf9a7e",
       "version-string": "1.8.0",
diff --git a/external_imported/vcpkg/versions/l-/luajit.json b/external_imported/vcpkg/versions/l-/luajit.json
index 88937b705..aec86ddbc 100644
--- a/external_imported/vcpkg/versions/l-/luajit.json
+++ b/external_imported/vcpkg/versions/l-/luajit.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "ca00ef84f25e0b841d36d6aa5403c525ea476b9c",
+      "version-date": "2023-01-04",
+      "port-version": 5
+    },
+    {
+      "git-tree": "53de073fe6d5962408626e251fce79e2d5bb49bf",
+      "version-date": "2023-01-04",
+      "port-version": 4
+    },
+    {
+      "git-tree": "450f447cc860d3cc59b93304c13ad92637c6b63d",
+      "version-date": "2023-01-04",
+      "port-version": 3
+    },
+    {
+      "git-tree": "9b724aa5af80b253739609f1173da343d55251cd",
+      "version-date": "2023-01-04",
+      "port-version": 2
+    },
+    {
+      "git-tree": "5a564decc9569af8e940353cab9623b6f93f3a4b",
+      "version-date": "2023-01-04",
+      "port-version": 1
+    },
     {
       "git-tree": "3c7f639efd41b49e93c61ae54fd99bb332d80bf9",
       "version-date": "2023-01-04",
diff --git a/external_imported/vcpkg/versions/l-/luasec.json b/external_imported/vcpkg/versions/l-/luasec.json
index 4881a9987..20a920360 100644
--- a/external_imported/vcpkg/versions/l-/luasec.json
+++ b/external_imported/vcpkg/versions/l-/luasec.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d4f635627a073d4fbf97a5e54a974fadc788f7ac",
+      "version": "1.3.1",
+      "port-version": 0
+    },
     {
       "git-tree": "9c562198b62737a1b5c47ef51bb4a5a7b46fd3ce",
       "version": "1.1.0",
diff --git a/external_imported/vcpkg/versions/l-/luasocket.json b/external_imported/vcpkg/versions/l-/luasocket.json
index fcddb746f..93873451e 100644
--- a/external_imported/vcpkg/versions/l-/luasocket.json
+++ b/external_imported/vcpkg/versions/l-/luasocket.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "faad47eddfeeb72b135a34c713c20f821ab0261b",
+      "version": "3.1.0",
+      "port-version": 0
+    },
     {
       "git-tree": "b4e4099cfa80585c7df33b66e37580cea982e83d",
       "version": "3.0.0",
diff --git a/external_imported/vcpkg/versions/l-/lunarg-vulkantools.json b/external_imported/vcpkg/versions/l-/lunarg-vulkantools.json
new file mode 100644
index 000000000..3027d454f
--- /dev/null
+++ b/external_imported/vcpkg/versions/l-/lunarg-vulkantools.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "ea54ec6c488d1f5ba33497de042aade3d49c29fb",
+      "version": "1.3.275.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f6b2a11e7bfefb0423ba878f8bbf6030c27f5c77",
+      "version": "1.3.268.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/l-/lunasvg.json b/external_imported/vcpkg/versions/l-/lunasvg.json
index fb076139e..8e0936fd1 100644
--- a/external_imported/vcpkg/versions/l-/lunasvg.json
+++ b/external_imported/vcpkg/versions/l-/lunasvg.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "27a82fac0168f7e17be4e9b8981833ed381197dc",
+      "version": "2.3.8",
+      "port-version": 1
+    },
+    {
+      "git-tree": "064296e0fbadcd3113e5ee2a65202614c9125acc",
+      "version": "2.3.8",
+      "port-version": 0
+    },
     {
       "git-tree": "bf20380ca537151f7d1e02a6ca5b19c302db18c7",
       "version": "2.3.1",
diff --git a/external_imported/vcpkg/versions/l-/luv.json b/external_imported/vcpkg/versions/l-/luv.json
index 18de69d6e..4bdcced04 100644
--- a/external_imported/vcpkg/versions/l-/luv.json
+++ b/external_imported/vcpkg/versions/l-/luv.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d18a8a0efcd76a0b4615d85c8bda26dd4ba1b7ad",
+      "version-semver": "1.44.2",
+      "port-version": 1
+    },
     {
       "git-tree": "dfb9cba0c0da80351b575c758df8f2b03048315f",
       "version-semver": "1.44.2",
diff --git a/external_imported/vcpkg/versions/l-/lzav.json b/external_imported/vcpkg/versions/l-/lzav.json
new file mode 100644
index 000000000..1c1b60836
--- /dev/null
+++ b/external_imported/vcpkg/versions/l-/lzav.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "1a5770f80546cae8b85c0a259b019a35abf00a4c",
+      "version": "3.13",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f3486855e1c408ebcb28fb6eaf519d0cd31f460d",
+      "version": "3.10",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/l-/lzfse.json b/external_imported/vcpkg/versions/l-/lzfse.json
index d1b447fd4..35bf544a8 100644
--- a/external_imported/vcpkg/versions/l-/lzfse.json
+++ b/external_imported/vcpkg/versions/l-/lzfse.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b47ba3c21e10b55e1fa8761b8ddaf062ac0bb792",
+      "version": "1.0",
+      "port-version": 5
+    },
     {
       "git-tree": "c42d879181140bf395967f7c28e439056effc193",
       "version-string": "1.0",
diff --git a/external_imported/vcpkg/versions/l-/lzo.json b/external_imported/vcpkg/versions/l-/lzo.json
index b1b8c4a62..2d5d3ecbb 100644
--- a/external_imported/vcpkg/versions/l-/lzo.json
+++ b/external_imported/vcpkg/versions/l-/lzo.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fcd8844a4e80d418bf894cf93a0453f067e404de",
+      "version": "2.10",
+      "port-version": 9
+    },
     {
       "git-tree": "1a8143f905204b72c9753894bb397aa96a415216",
       "version-string": "2.10",
diff --git a/external_imported/vcpkg/versions/l-/lzokay.json b/external_imported/vcpkg/versions/l-/lzokay.json
index 900fdc649..a1238b0a3 100644
--- a/external_imported/vcpkg/versions/l-/lzokay.json
+++ b/external_imported/vcpkg/versions/l-/lzokay.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2a04a58317804702e2dc099904e39a58fb148d25",
+      "version-date": "2020-07-30",
+      "port-version": 2
+    },
     {
       "git-tree": "909885572ad121a7c7504af41fd2571ca01870ec",
       "version-string": "2020-07-30",
diff --git a/external_imported/vcpkg/versions/m-/maddy.json b/external_imported/vcpkg/versions/m-/maddy.json
new file mode 100644
index 000000000..6a4236c56
--- /dev/null
+++ b/external_imported/vcpkg/versions/m-/maddy.json
@@ -0,0 +1,19 @@
+{
+  "versions": [
+    {
+      "git-tree": "b0cc952f85939e4547be6e9c020903940e282fa1",
+      "version": "1.3.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a66b84dc2bc83f2e84ff78021584ca8d7291c258",
+      "version": "1.2.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "469c585ac08f057d3716d962b9d048fe0b851e83",
+      "version": "1.1.2+20210419",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/m-/magic-enum.json b/external_imported/vcpkg/versions/m-/magic-enum.json
index c9a857a5c..72f9f591c 100644
--- a/external_imported/vcpkg/versions/m-/magic-enum.json
+++ b/external_imported/vcpkg/versions/m-/magic-enum.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "331117fc7825903e23c611f793c21251148c4458",
+      "version": "0.9.5",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3900ab3a53f394e82cc65e071fb7ffc3641024c1",
+      "version": "0.9.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f2261a86b9d2e1ff3f42c80919f58d59e4e4335c",
+      "version": "0.9.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "52780f8b8e0c2f55c3841e133c813f2bc739abcc",
+      "version": "0.9.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d423a24705ddc48956d0c7683f3f8e418ae44b0d",
+      "version": "0.9.1",
+      "port-version": 0
+    },
     {
       "git-tree": "579c97b898c772c488b1de1fef924cb8c767c511",
       "version": "0.8.2",
diff --git a/external_imported/vcpkg/versions/m-/magic-get.json b/external_imported/vcpkg/versions/m-/magic-get.json
index 6fcd5f61d..2d2900420 100644
--- a/external_imported/vcpkg/versions/m-/magic-get.json
+++ b/external_imported/vcpkg/versions/m-/magic-get.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "210c8bce711a4602b27ade5743bdb4126caa79ee",
+      "version-date": "2019-09-02",
+      "port-version": 3
+    },
     {
       "git-tree": "c74c7f4f5516bdfeffc916c0e72a650d65fe61fb",
       "version-string": "2019-09-02",
diff --git a/external_imported/vcpkg/versions/m-/magma.json b/external_imported/vcpkg/versions/m-/magma.json
new file mode 100644
index 000000000..29a77b62f
--- /dev/null
+++ b/external_imported/vcpkg/versions/m-/magma.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "44b519ef789c70ffb247ac2fc1686038b0616515",
+      "version": "2.7.2",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/m-/magnum-integration.json b/external_imported/vcpkg/versions/m-/magnum-integration.json
index 096cdb068..8e21a14de 100644
--- a/external_imported/vcpkg/versions/m-/magnum-integration.json
+++ b/external_imported/vcpkg/versions/m-/magnum-integration.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "191049e602f776d41b02b21f74df5c36393f8de0",
+      "version-string": "2020.06",
+      "port-version": 3
+    },
     {
       "git-tree": "7485cdf34b865de5cca00d40ee315a0504e226f1",
       "version-string": "2020.06",
diff --git a/external_imported/vcpkg/versions/m-/magnum-plugins.json b/external_imported/vcpkg/versions/m-/magnum-plugins.json
index d48cd8e3a..69b9b44ae 100644
--- a/external_imported/vcpkg/versions/m-/magnum-plugins.json
+++ b/external_imported/vcpkg/versions/m-/magnum-plugins.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "d1a7c4da316314fb8973e23a20c65fa926a96d44",
+      "version-string": "2020.06",
+      "port-version": 12
+    },
+    {
+      "git-tree": "73324e7e695dd281c2813fc17b709af7cc2eed58",
+      "version-string": "2020.06",
+      "port-version": 11
+    },
     {
       "git-tree": "3f087961f6f29a588e562a66946d7738eb752129",
       "version-string": "2020.06",
diff --git a/external_imported/vcpkg/versions/m-/magnum.json b/external_imported/vcpkg/versions/m-/magnum.json
index e71d55482..07f0746ce 100644
--- a/external_imported/vcpkg/versions/m-/magnum.json
+++ b/external_imported/vcpkg/versions/m-/magnum.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "fa47736590b34d1ce7158f0ebf783c2b54dcb004",
+      "version-string": "2020.06",
+      "port-version": 17
+    },
+    {
+      "git-tree": "d923e5792a77042485ffd4b32afecca23f18c7d9",
+      "version-string": "2020.06",
+      "port-version": 16
+    },
+    {
+      "git-tree": "b1b8f84dd450902aec2b555eb577dfd2a0129592",
+      "version-string": "2020.06",
+      "port-version": 15
+    },
+    {
+      "git-tree": "9153bafdfb1c8f5ef113947611b1c916a3e472c3",
+      "version-string": "2020.06",
+      "port-version": 14
+    },
+    {
+      "git-tree": "d0adac5f186692119e9a2b9826ac5ed7357ed8a1",
+      "version-string": "2020.06",
+      "port-version": 13
+    },
     {
       "git-tree": "8ea35ff59474f3e0eaf9c13c2d5b4bae6519d651",
       "version-string": "2020.06",
diff --git a/external_imported/vcpkg/versions/m-/mailio.json b/external_imported/vcpkg/versions/m-/mailio.json
index 505193296..6f3b93064 100644
--- a/external_imported/vcpkg/versions/m-/mailio.json
+++ b/external_imported/vcpkg/versions/m-/mailio.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "33d20bc50f33f690863c4b8cce28d16123762ab7",
+      "version": "0.23.0",
+      "port-version": 0
+    },
     {
       "git-tree": "a9f20b309b2d9f68c5e10eb193ef19c3c51a3faa",
       "version": "0.21.0",
diff --git a/external_imported/vcpkg/versions/m-/makeid.json b/external_imported/vcpkg/versions/m-/makeid.json
new file mode 100644
index 000000000..72598a80f
--- /dev/null
+++ b/external_imported/vcpkg/versions/m-/makeid.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "d1e67fd4892325f13527874899102c734da3333d",
+      "version": "1.0.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "08114cbf3e65a21af7fa59508fc838fb4cac067c",
+      "version": "1.0.2",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/m-/manif.json b/external_imported/vcpkg/versions/m-/manif.json
new file mode 100644
index 000000000..4a7c957b7
--- /dev/null
+++ b/external_imported/vcpkg/versions/m-/manif.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "85cbc740d2b88302059e858e4f0fe74cf59c5a08",
+      "version-date": "2023-07-17",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/m-/mapbox-variant.json b/external_imported/vcpkg/versions/m-/mapbox-variant.json
index 99c66d762..307b09bf1 100644
--- a/external_imported/vcpkg/versions/m-/mapbox-variant.json
+++ b/external_imported/vcpkg/versions/m-/mapbox-variant.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2bbebe72c660725c3540133f722ad9cac7dc2c5c",
+      "version": "1.2.0",
+      "port-version": 2
+    },
     {
       "git-tree": "33967b083c32aab183281126cde3fdab878e71be",
       "version-string": "1.2.0",
diff --git a/external_imported/vcpkg/versions/m-/mapnik.json b/external_imported/vcpkg/versions/m-/mapnik.json
index f2f1466d3..9628ec898 100644
--- a/external_imported/vcpkg/versions/m-/mapnik.json
+++ b/external_imported/vcpkg/versions/m-/mapnik.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "0d63e2e713a5c02f6699c71b65f7bbe529f040c7",
+      "version-date": "2023-06-12",
+      "port-version": 3
+    },
+    {
+      "git-tree": "cdb516de71b06cb77bb51196e59709278606e32a",
+      "version-date": "2023-06-12",
+      "port-version": 2
+    },
+    {
+      "git-tree": "64501290af397067ec972c69113abd28139efdcc",
+      "version-date": "2023-06-12",
+      "port-version": 1
+    },
+    {
+      "git-tree": "55a1af72282030a832c73b5fe9bedb2089b1b08c",
+      "version-date": "2023-06-12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5d63cf0864443e19122d1901bc944a89274aba0c",
+      "version-date": "2023-01-17",
+      "port-version": 1
+    },
     {
       "git-tree": "6fc189206b9c2055b544278ede1ce5be2e0f48ff",
       "version-date": "2023-01-17",
diff --git a/external_imported/vcpkg/versions/m-/marble.json b/external_imported/vcpkg/versions/m-/marble.json
index c9d010a3d..29751e931 100644
--- a/external_imported/vcpkg/versions/m-/marble.json
+++ b/external_imported/vcpkg/versions/m-/marble.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b5f88df6aa916d5bfcfbf3396df344d90de36778",
+      "version-string": "22.04.0",
+      "port-version": 2
+    },
     {
       "git-tree": "c1e722f12de290f18b92e662040c499a51d57249",
       "version-string": "22.04.0",
diff --git a/external_imported/vcpkg/versions/m-/marl.json b/external_imported/vcpkg/versions/m-/marl.json
index fe8b7b988..9246a3468 100644
--- a/external_imported/vcpkg/versions/m-/marl.json
+++ b/external_imported/vcpkg/versions/m-/marl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5a91c2cc68fc789dfe15333d97f138dc5e900ee3",
+      "version-date": "2023-06-28",
+      "port-version": 0
+    },
     {
       "git-tree": "b6430e8be3b742d1466c45570a5d4946c427dd25",
       "version-date": "2022-03-02",
diff --git a/external_imported/vcpkg/versions/m-/materialx.json b/external_imported/vcpkg/versions/m-/materialx.json
index b2b5b2346..dca703505 100644
--- a/external_imported/vcpkg/versions/m-/materialx.json
+++ b/external_imported/vcpkg/versions/m-/materialx.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "51acf72a500446d2a9d101be11fb24b86a1a18ad",
+      "version": "1.38.8",
+      "port-version": 1
+    },
+    {
+      "git-tree": "b8895aa1059cf4106a82265c242871ae6db5b815",
+      "version": "1.38.8",
+      "port-version": 0
+    },
     {
       "git-tree": "f0dc3a4ac664a5b4fe18a946a35965b519c148e7",
       "version": "1.38.4",
diff --git a/external_imported/vcpkg/versions/m-/mathc.json b/external_imported/vcpkg/versions/m-/mathc.json
index 1edddb103..875de4c34 100644
--- a/external_imported/vcpkg/versions/m-/mathc.json
+++ b/external_imported/vcpkg/versions/m-/mathc.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a622f49155eedd08e32999ae7642251a1f1e30b4",
+      "version-date": "2019-09-29",
+      "port-version": 3
+    },
     {
       "git-tree": "1bf40ce6eb363cb8981612f34fb96c41be4c804a",
       "version-string": "2019-09-29",
diff --git a/external_imported/vcpkg/versions/m-/mathgl.json b/external_imported/vcpkg/versions/m-/mathgl.json
index e5bf286b1..4fa18701d 100644
--- a/external_imported/vcpkg/versions/m-/mathgl.json
+++ b/external_imported/vcpkg/versions/m-/mathgl.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "21cc2f6ab97eed24ec95774335e364a7737c83d2",
+      "version": "8.0.1",
+      "port-version": 5
+    },
+    {
+      "git-tree": "629d09b4394436b3821f1871eaa6caa27bf04be0",
+      "version": "8.0.1",
+      "port-version": 4
+    },
+    {
+      "git-tree": "2c1da85e695d3767410b3acf59567da2faf32ea2",
+      "version": "8.0.1",
+      "port-version": 3
+    },
+    {
+      "git-tree": "34ffe72f88b0fa47c8bf8ad235ed3cf109560f65",
+      "version": "8.0.1",
+      "port-version": 2
+    },
+    {
+      "git-tree": "edd98363d2569c9ef358506313ce110045708f6a",
+      "version": "8.0.1",
+      "port-version": 1
+    },
     {
       "git-tree": "8fd2208b95f6ebc6f17a30cc79c3b57b1a8bcfb7",
       "version": "8.0.1",
diff --git a/external_imported/vcpkg/versions/m-/matio.json b/external_imported/vcpkg/versions/m-/matio.json
index bfd65ec39..229c737f7 100644
--- a/external_imported/vcpkg/versions/m-/matio.json
+++ b/external_imported/vcpkg/versions/m-/matio.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "9fd8ec3eacecc04384ff5a048c0962f852cdb793",
+      "version": "1.5.26",
+      "port-version": 0
+    },
+    {
+      "git-tree": "08eada66141696ad861d881ac1639d41682916e1",
+      "version": "1.5.24",
+      "port-version": 0
+    },
+    {
+      "git-tree": "42d087530e333855d74225712aab7755d2eb6be2",
+      "version": "1.5.23",
+      "port-version": 3
+    },
     {
       "git-tree": "28df0a44f618c5fd412fafda91507f3bad6ac4b1",
       "version": "1.5.23",
diff --git a/external_imported/vcpkg/versions/m-/matplotlib-cpp.json b/external_imported/vcpkg/versions/m-/matplotlib-cpp.json
index f237470b3..77b7e6054 100644
--- a/external_imported/vcpkg/versions/m-/matplotlib-cpp.json
+++ b/external_imported/vcpkg/versions/m-/matplotlib-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e6daa977bec3896a8b102b44aaf1918778412e8a",
+      "version-date": "2020-08-27",
+      "port-version": 2
+    },
     {
       "git-tree": "baade687391a8a12d426361c378e7c1ee31d1182",
       "version-string": "2020-08-27",
diff --git a/external_imported/vcpkg/versions/m-/matplotplusplus.json b/external_imported/vcpkg/versions/m-/matplotplusplus.json
index 8dc2b38c2..ff11423e6 100644
--- a/external_imported/vcpkg/versions/m-/matplotplusplus.json
+++ b/external_imported/vcpkg/versions/m-/matplotplusplus.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "99828f36e20657952b4574a84c4281f684a0afeb",
+      "version": "1.2.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "4e65bffccaa1a5061002c38b7bdf6a0e464caf39",
+      "version": "1.2.0",
+      "port-version": 0
+    },
     {
       "git-tree": "8554ae7ec807245bdcd27b44ddebd39608edfe53",
       "version-date": "2021-04-11",
diff --git a/external_imported/vcpkg/versions/m-/matroska.json b/external_imported/vcpkg/versions/m-/matroska.json
index 8bf36eb8f..302eb64db 100644
--- a/external_imported/vcpkg/versions/m-/matroska.json
+++ b/external_imported/vcpkg/versions/m-/matroska.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "3d414c27a074d4262517bf3fe72571e8f16ccab0",
+      "version": "1.7.1",
+      "port-version": 2
+    },
+    {
+      "git-tree": "12137590eb6e5ec4e644e61b664d83a4ed6c8022",
+      "version": "1.7.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "041bae8554d02be4ce2909d9a01a8fd2bced588b",
+      "version": "1.7.1",
+      "port-version": 0
+    },
     {
       "git-tree": "4f42c70e6e7b730f43e59e3dd7e0b4b8e7e7abd8",
       "version": "1.6.3",
diff --git a/external_imported/vcpkg/versions/m-/mbedtls.json b/external_imported/vcpkg/versions/m-/mbedtls.json
index 161576939..b9d58e07a 100644
--- a/external_imported/vcpkg/versions/m-/mbedtls.json
+++ b/external_imported/vcpkg/versions/m-/mbedtls.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "b8ca11fc0285875347dc1203913af7f84f9c7cad",
+      "version": "2.28.7",
+      "port-version": 0
+    },
+    {
+      "git-tree": "909516904f06e3379f7ac434b967cb165d8020c2",
+      "version": "2.28.5",
+      "port-version": 0
+    },
     {
       "git-tree": "f6fd876a24f60e3034438c6793627be091ab6426",
       "version": "2.28.1",
diff --git a/external_imported/vcpkg/versions/m-/mchehab-zbar.json b/external_imported/vcpkg/versions/m-/mchehab-zbar.json
index ac77fde99..a09be3be3 100644
--- a/external_imported/vcpkg/versions/m-/mchehab-zbar.json
+++ b/external_imported/vcpkg/versions/m-/mchehab-zbar.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "368a491e8bad201ee1b88e88314b77c540dcea2b",
+      "version": "0.23.90",
+      "port-version": 5
+    },
+    {
+      "git-tree": "34932d2a4b1c53aefeed99ef9133f8a307ad9958",
+      "version": "0.23.90",
+      "port-version": 4
+    },
     {
       "git-tree": "09371ba90d3c31d038bffd54a90203b5b4f7fdc8",
       "version": "0.23.90",
diff --git a/external_imported/vcpkg/versions/m-/mcpp.json b/external_imported/vcpkg/versions/m-/mcpp.json
index 932f03470..413d75f9a 100644
--- a/external_imported/vcpkg/versions/m-/mcpp.json
+++ b/external_imported/vcpkg/versions/m-/mcpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7041df1b28901785cee16019a1fb8a0cef7c6bb1",
+      "version": "2.7.2.14",
+      "port-version": 5
+    },
     {
       "git-tree": "c8e9fb1b912244a0d844e2748210a805ae2a7a93",
       "version-string": "2.7.2.14",
diff --git a/external_imported/vcpkg/versions/m-/mdl-sdk.json b/external_imported/vcpkg/versions/m-/mdl-sdk.json
index 5befda98f..ff004d1d5 100644
--- a/external_imported/vcpkg/versions/m-/mdl-sdk.json
+++ b/external_imported/vcpkg/versions/m-/mdl-sdk.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "7c4084ba04dcadc57086603e341b7d74e6926f00",
+      "version": "2021.1.2",
+      "port-version": 4
+    },
+    {
+      "git-tree": "a8fcd0cdebe6b073993485aba6fa0dd24445f9f5",
+      "version": "2021.1.2",
+      "port-version": 3
+    },
+    {
+      "git-tree": "04186cc5442b20b27d3a47f901dfd4c7eef16353",
+      "version": "2021.1.2",
+      "port-version": 2
+    },
+    {
+      "git-tree": "7b540090b50df32e1bdcab5953994590e0fb37bd",
+      "version": "2021.1.2",
+      "port-version": 1
+    },
     {
       "git-tree": "1ea6f971b1824f51c7beed4983f54733b24f1bed",
       "version": "2021.1.2",
diff --git a/external_imported/vcpkg/versions/m-/mdns.json b/external_imported/vcpkg/versions/m-/mdns.json
index 1f40a43a9..a53d9320f 100644
--- a/external_imported/vcpkg/versions/m-/mdns.json
+++ b/external_imported/vcpkg/versions/m-/mdns.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "67bfd722fb49f35c6a08ca9c1e4e1dea2a53d5df",
+      "version": "1.4.3",
+      "port-version": 0
+    },
     {
       "git-tree": "56cbde1a40c13e9584e62d15f69c2579f6bcd476",
       "version": "1.4.2",
diff --git a/external_imported/vcpkg/versions/m-/mdnsresponder.json b/external_imported/vcpkg/versions/m-/mdnsresponder.json
index 93cc45087..3629c6dc2 100644
--- a/external_imported/vcpkg/versions/m-/mdnsresponder.json
+++ b/external_imported/vcpkg/versions/m-/mdnsresponder.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2c54f504ea29603c2a46be74893d406db0956336",
+      "version": "1557.140.5.0.1",
+      "port-version": 1
+    },
     {
       "git-tree": "da77ffdd863076ef906fa3d5b50e8190f1241a57",
       "version": "1557.140.5.0.1",
diff --git a/external_imported/vcpkg/versions/m-/mdspan.json b/external_imported/vcpkg/versions/m-/mdspan.json
index 98773627e..fc243a516 100644
--- a/external_imported/vcpkg/versions/m-/mdspan.json
+++ b/external_imported/vcpkg/versions/m-/mdspan.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f0a8dad5240bcaa137ad2b68ff3097a8d5e37109",
+      "version": "0.6.0",
+      "port-version": 0
+    },
     {
       "git-tree": "4532b6ddb077c99218420a09a482a978903e162b",
       "version": "0.5.0",
diff --git a/external_imported/vcpkg/versions/m-/mecab.json b/external_imported/vcpkg/versions/m-/mecab.json
index 826e065e2..8c33858cb 100644
--- a/external_imported/vcpkg/versions/m-/mecab.json
+++ b/external_imported/vcpkg/versions/m-/mecab.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "66081fbeecacd152e3964b0f64f25e0f0b10d461",
+      "version-date": "2019-09-25",
+      "port-version": 5
+    },
+    {
+      "git-tree": "d5f64d85fddc71ff872f675cda3ed8ee767193f1",
+      "version-date": "2019-09-25",
+      "port-version": 4
+    },
     {
       "git-tree": "0728379df6bdd38f71f90bff5b1d75dcd3f0b6d0",
       "version-string": "2019-09-25",
diff --git a/external_imported/vcpkg/versions/m-/memorymodule.json b/external_imported/vcpkg/versions/m-/memorymodule.json
index 990365470..f309495fe 100644
--- a/external_imported/vcpkg/versions/m-/memorymodule.json
+++ b/external_imported/vcpkg/versions/m-/memorymodule.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ffb374d5bca41e19f8bdc69582814e3fc65a93aa",
+      "version-date": "2019-12-31",
+      "port-version": 3
+    },
     {
       "git-tree": "f7818f51e182a651a0b090ea0d315c32b928d7c3",
       "version-string": "2019-12-31",
diff --git a/external_imported/vcpkg/versions/m-/mesa.json b/external_imported/vcpkg/versions/m-/mesa.json
index 5bee751c2..2832dbd48 100644
--- a/external_imported/vcpkg/versions/m-/mesa.json
+++ b/external_imported/vcpkg/versions/m-/mesa.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "3f318339b0c26814bbd53fce78471f1a95fdfe0d",
+      "version": "23.2.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "cdf9e52bbaf36ffdf540342ea090d8535ad7a883",
+      "version": "23.0.1",
+      "port-version": 2
+    },
+    {
+      "git-tree": "d76e69afa98f38f1b3102572a8a5516ce088b9ca",
+      "version": "23.0.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "87fb0741a264517b99f37f4ff2ba43264cdfe0f9",
+      "version": "23.0.1",
+      "port-version": 0
+    },
     {
       "git-tree": "ff0e8b2a943a94c7f1c3d13fbacbddd6d0c2aa3e",
       "version": "22.1.7",
diff --git a/external_imported/vcpkg/versions/m-/meshoptimizer.json b/external_imported/vcpkg/versions/m-/meshoptimizer.json
index e3456a136..39b7d1bee 100644
--- a/external_imported/vcpkg/versions/m-/meshoptimizer.json
+++ b/external_imported/vcpkg/versions/m-/meshoptimizer.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "3ed757afdbfbbe133e9c4ae31e8288ea80f66860",
+      "version": "0.20",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4443e075e83187322a4323485d302fb52746a9e4",
+      "version": "0.19",
+      "port-version": 1
+    },
+    {
+      "git-tree": "c13ff2acc01518548a4d669e3d2976235c55780f",
+      "version": "0.19",
+      "port-version": 0
+    },
     {
       "git-tree": "82831888ef7242fd8d00cc2b9710d33d895d76f1",
       "version": "0.18",
diff --git a/external_imported/vcpkg/versions/m-/mfl.json b/external_imported/vcpkg/versions/m-/mfl.json
index f495fb963..128fe9d11 100644
--- a/external_imported/vcpkg/versions/m-/mfl.json
+++ b/external_imported/vcpkg/versions/m-/mfl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e78930d433356d545a61de55d6a23a6debb704b0",
+      "version": "0.0.1",
+      "port-version": 3
+    },
     {
       "git-tree": "a987e0da7b7b8bee335c9764cf2b8abcc6b68d2a",
       "version": "0.0.1",
diff --git a/external_imported/vcpkg/versions/m-/mfx-dispatch.json b/external_imported/vcpkg/versions/m-/mfx-dispatch.json
index 613e1f69d..2b6b68576 100644
--- a/external_imported/vcpkg/versions/m-/mfx-dispatch.json
+++ b/external_imported/vcpkg/versions/m-/mfx-dispatch.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "4372c27465a70b6b113adc8fb69ea86da3c21a3f",
+      "version": "1.35.1",
+      "port-version": 3
+    },
+    {
+      "git-tree": "07eb6cc5ee276c7e965868d1cb6de113d41e0e41",
+      "version": "1.35.1",
+      "port-version": 2
+    },
     {
       "git-tree": "5d0fd959ef687e9180ea230b8eea4d2f944423a4",
       "version": "1.35.1",
diff --git a/external_imported/vcpkg/versions/m-/microsoft-signalr.json b/external_imported/vcpkg/versions/m-/microsoft-signalr.json
index e3bd9400b..33f5c2739 100644
--- a/external_imported/vcpkg/versions/m-/microsoft-signalr.json
+++ b/external_imported/vcpkg/versions/m-/microsoft-signalr.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "31b63c815c4f6877e688b163a083df208d8ca133",
+      "version": "0.1.0-alpha4",
+      "port-version": 8
+    },
+    {
+      "git-tree": "777629bd31d9a4885b696623304b030c29b552c4",
+      "version": "0.1.0-alpha4",
+      "port-version": 7
+    },
+    {
+      "git-tree": "9a366b0a8f7b8177b0c91de00d652dfac38ed927",
+      "version": "0.1.0-alpha4",
+      "port-version": 6
+    },
+    {
+      "git-tree": "4d404283aa7fbee588db56cbe0a470d82c1f9258",
+      "version": "0.1.0-alpha4",
+      "port-version": 5
+    },
+    {
+      "git-tree": "1ea9d11c361ff46b14b9872df5b71b634ff1d709",
+      "version": "0.1.0-alpha4",
+      "port-version": 4
+    },
+    {
+      "git-tree": "756cbce0122778f80b0029e5efbec95f76e04457",
+      "version": "0.1.0-alpha4",
+      "port-version": 3
+    },
     {
       "git-tree": "3941fa934e8ae400f7cd47d0311f4e4f945dbacd",
       "version": "0.1.0-alpha4",
diff --git a/external_imported/vcpkg/versions/m-/mikktspace.json b/external_imported/vcpkg/versions/m-/mikktspace.json
index 66a232d22..ee346c8cb 100644
--- a/external_imported/vcpkg/versions/m-/mikktspace.json
+++ b/external_imported/vcpkg/versions/m-/mikktspace.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d17da931820ec6b21851d8ad62927e33c8afd119",
+      "version-date": "2020-10-06",
+      "port-version": 3
+    },
     {
       "git-tree": "d568c517b4a55fcc8031ae6b7b1d9ccff6682185",
       "version-string": "2020-10-06",
diff --git a/external_imported/vcpkg/versions/m-/mimalloc.json b/external_imported/vcpkg/versions/m-/mimalloc.json
index da9006fa3..8c4654742 100644
--- a/external_imported/vcpkg/versions/m-/mimalloc.json
+++ b/external_imported/vcpkg/versions/m-/mimalloc.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "db19c496e6855e8aeb3a8666ffae862910b403c4",
+      "version": "2.1.2",
+      "port-version": 1
+    },
+    {
+      "git-tree": "bffb93e0abd806e613f2d6dbe35db0768368cae2",
+      "version": "2.1.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f6055b5cb8a3a2d744cac4781fed65cf1da1064f",
+      "version": "2.1.1",
+      "port-version": 0
+    },
     {
       "git-tree": "aaa17dfe033cf63a5884ab214e39a790181ae8a3",
       "version": "2.0.9",
diff --git a/external_imported/vcpkg/versions/m-/minhook.json b/external_imported/vcpkg/versions/m-/minhook.json
index 6cab06468..882ad36d1 100644
--- a/external_imported/vcpkg/versions/m-/minhook.json
+++ b/external_imported/vcpkg/versions/m-/minhook.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c9751daba9242a47e7beb2e21a4211226aee316f",
+      "version": "1.3.3",
+      "port-version": 4
+    },
     {
       "git-tree": "fea414bee13115e201fe93699ba5b55c7ae031b8",
       "version": "1.3.3",
diff --git a/external_imported/vcpkg/versions/m-/miniaudio.json b/external_imported/vcpkg/versions/m-/miniaudio.json
index afc76827a..14b3839e5 100644
--- a/external_imported/vcpkg/versions/m-/miniaudio.json
+++ b/external_imported/vcpkg/versions/m-/miniaudio.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "980dc0e20ab6855dfe916b881f580cd9f371f991",
+      "version": "0.11.21",
+      "port-version": 0
+    },
+    {
+      "git-tree": "62c26f2cd7ae5eb016e30a1555ff384f045047d5",
+      "version": "0.11.19",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3e5f5e31bc86e07e943aa7d88ec8af21cd8f7013",
+      "version": "0.11.14",
+      "port-version": 0
+    },
     {
       "git-tree": "8a7494389f8cefc6d039938d2416fa56d94ee72d",
       "version": "0.11.11",
diff --git a/external_imported/vcpkg/versions/m-/minifb.json b/external_imported/vcpkg/versions/m-/minifb.json
index fdf852f28..e40af52e6 100644
--- a/external_imported/vcpkg/versions/m-/minifb.json
+++ b/external_imported/vcpkg/versions/m-/minifb.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "745289bcc43c14f1f4c5b1f9f2d319d42fe1d299",
+      "version-date": "2023-09-21",
+      "port-version": 0
+    },
     {
       "git-tree": "071e8c4877c43b767d0afce0ad085255b6f68622",
       "version-date": "2023-02-03",
diff --git a/external_imported/vcpkg/versions/m-/miniply.json b/external_imported/vcpkg/versions/m-/miniply.json
new file mode 100644
index 000000000..79d77fad1
--- /dev/null
+++ b/external_imported/vcpkg/versions/m-/miniply.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "20ddfb09455e95fa20fcebc8d9e0d99409526a35",
+      "version-date": "2022-09-15",
+      "port-version": 1
+    },
+    {
+      "git-tree": "648516b62e07a6e5c6387f110f9f4bce0d6c67e9",
+      "version-date": "2022-09-15",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/m-/minisat-master-keying.json b/external_imported/vcpkg/versions/m-/minisat-master-keying.json
index 9012522e4..34bcb247c 100644
--- a/external_imported/vcpkg/versions/m-/minisat-master-keying.json
+++ b/external_imported/vcpkg/versions/m-/minisat-master-keying.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "96e49304f51f7f37b5813ccb64cb6469a3301425",
+      "version": "2.3.6",
+      "port-version": 1
+    },
     {
       "git-tree": "e7f174538407ae3f279ab4c7d2025a8545d220c9",
       "version": "2.3.6",
diff --git a/external_imported/vcpkg/versions/m-/minitrace.json b/external_imported/vcpkg/versions/m-/minitrace.json
index 42a7e6e1c..ffee09093 100644
--- a/external_imported/vcpkg/versions/m-/minitrace.json
+++ b/external_imported/vcpkg/versions/m-/minitrace.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e6bb405d13f5270e92c492306f317cb01dc4ab30",
+      "version-date": "2023-04-23",
+      "port-version": 0
+    },
     {
       "git-tree": "a108afe478661d93adbf6ca758501a543d89f2b1",
       "version-string": "2019.02.06",
diff --git a/external_imported/vcpkg/versions/m-/miniupnpc.json b/external_imported/vcpkg/versions/m-/miniupnpc.json
index ffbbbfca6..228b78446 100644
--- a/external_imported/vcpkg/versions/m-/miniupnpc.json
+++ b/external_imported/vcpkg/versions/m-/miniupnpc.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "4178b65263cd78046a728561065f5957d5f2f6ca",
+      "version": "2.2.5",
+      "port-version": 0
+    },
+    {
+      "git-tree": "7cf1368b7969b30d49c1666b690b8e18ab265ebc",
+      "version": "2.1",
+      "port-version": 5
+    },
+    {
+      "git-tree": "d63b7b18c08e0d968612093f1ada8f872c955688",
+      "version": "2.1",
+      "port-version": 4
+    },
     {
       "git-tree": "0c33ab6d1ebb5bc580617eaf6fd34930ec0d8233",
       "version-string": "2.1",
diff --git a/external_imported/vcpkg/versions/m-/minizip-ng.json b/external_imported/vcpkg/versions/m-/minizip-ng.json
index 9df368d51..0d0749eba 100644
--- a/external_imported/vcpkg/versions/m-/minizip-ng.json
+++ b/external_imported/vcpkg/versions/m-/minizip-ng.json
@@ -1,5 +1,45 @@
 {
   "versions": [
+    {
+      "git-tree": "cfab4e259bccd7d7f1a0470b32c7b7bf912609f4",
+      "version": "4.0.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "33b696b13c4de3a5319c042daab76baa51945f8f",
+      "version": "4.0.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d77f713bae64d416bf60adb3395a3b295feccc9b",
+      "version": "4.0.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "fb59eb8b735f74193a79326e33fb6f9abc66846a",
+      "version": "4.0.0",
+      "port-version": 4
+    },
+    {
+      "git-tree": "1483ef1293bbd3eea5edd9b5051bb4457eebfa2e",
+      "version": "4.0.0",
+      "port-version": 3
+    },
+    {
+      "git-tree": "89c9968274d731d513a3eadc259c73c95cfe058c",
+      "version": "4.0.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "1e55bf50acfd71d5f37f98bee270ff687f65219f",
+      "version": "4.0.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "f9a2226720f5e72647d6b0399f9c0bd5baf8f9b9",
+      "version": "4.0.0",
+      "port-version": 0
+    },
     {
       "git-tree": "e97e41aa57defe3c82bebab5941a4e4320f5a704",
       "version": "3.0.7",
diff --git a/external_imported/vcpkg/versions/m-/minizip.json b/external_imported/vcpkg/versions/m-/minizip.json
index 4cd399240..2e77c3f60 100644
--- a/external_imported/vcpkg/versions/m-/minizip.json
+++ b/external_imported/vcpkg/versions/m-/minizip.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "8a421d5b61058bace21296039e5f5bcbe9c9010a",
+      "version": "1.3.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "91fe1aaa8a5d696bda657a3d2b687fecfa92a7c3",
+      "version": "1.3",
+      "port-version": 1
+    },
+    {
+      "git-tree": "2295a5b26e2cbbbf59706f08dc1c5717da951bd1",
+      "version": "1.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "68d2e759e03b54cd9970328b1cede845ebccf7c2",
+      "version-semver": "1.2.13",
+      "port-version": 3
+    },
+    {
+      "git-tree": "48d519ab0025623c54756c482453f8405d2646bd",
+      "version-semver": "1.2.13",
+      "port-version": 2
+    },
+    {
+      "git-tree": "c8831fffa825d9fafc38f1e3587046c49051ecba",
+      "version-semver": "1.2.13",
+      "port-version": 1
+    },
     {
       "git-tree": "c0843dcfad42a538a772797a3f50627b5c8d411a",
       "version-semver": "1.2.13",
diff --git a/external_imported/vcpkg/versions/m-/mio.json b/external_imported/vcpkg/versions/m-/mio.json
index be24b5882..5c452f7d3 100644
--- a/external_imported/vcpkg/versions/m-/mio.json
+++ b/external_imported/vcpkg/versions/m-/mio.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "32e1d9bb77df214fec0e6ea240671114e3d3df30",
+      "version-date": "2023-03-03",
+      "port-version": 0
+    },
     {
       "git-tree": "a71deb82d263c979ed9077747778cc2295baee36",
       "version-date": "2023-01-25",
diff --git a/external_imported/vcpkg/versions/m-/mlpack.json b/external_imported/vcpkg/versions/m-/mlpack.json
index f9ced169f..92440685a 100644
--- a/external_imported/vcpkg/versions/m-/mlpack.json
+++ b/external_imported/vcpkg/versions/m-/mlpack.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "7439b5dbdc37394f6bb291343d634642d919f9d1",
+      "version": "4.3.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e749963ad973dd29c0c573e0307fd4eaecea29d6",
+      "version": "4.2.0",
+      "port-version": 0
+    },
     {
       "git-tree": "274dd7a42860f7c70f7b94d5f8e3ad9083fa6e0d",
       "version": "4.0.1",
diff --git a/external_imported/vcpkg/versions/m-/mmloader.json b/external_imported/vcpkg/versions/m-/mmloader.json
index 3257087c7..0a10695a6 100644
--- a/external_imported/vcpkg/versions/m-/mmloader.json
+++ b/external_imported/vcpkg/versions/m-/mmloader.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8f73c54685c38e7d210174f134723badde70879d",
+      "version": "1.0.1",
+      "port-version": 3
+    },
     {
       "git-tree": "4b102ccdbd92919d2f3f62fff55b2a51839199ad",
       "version": "1.0.1",
diff --git a/external_imported/vcpkg/versions/m-/mnn.json b/external_imported/vcpkg/versions/m-/mnn.json
index 348ebc01f..8b95f81a1 100644
--- a/external_imported/vcpkg/versions/m-/mnn.json
+++ b/external_imported/vcpkg/versions/m-/mnn.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4f755e0b91f277b483ce9b157d7e10fb99b49878",
+      "version": "1.1.0",
+      "port-version": 5
+    },
     {
       "git-tree": "e0bd733035bf0f532457f0d03b2aed538afe5cc1",
       "version": "1.1.0",
diff --git a/external_imported/vcpkg/versions/m-/modern-cpp-kafka.json b/external_imported/vcpkg/versions/m-/modern-cpp-kafka.json
new file mode 100644
index 000000000..d2381ae3f
--- /dev/null
+++ b/external_imported/vcpkg/versions/m-/modern-cpp-kafka.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "2da384edebac3371ee02b0a1d06606e93add35d5",
+      "version-string": "2023.03.07",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/m-/mongo-c-driver.json b/external_imported/vcpkg/versions/m-/mongo-c-driver.json
index 6fd3feed8..394c36ac8 100644
--- a/external_imported/vcpkg/versions/m-/mongo-c-driver.json
+++ b/external_imported/vcpkg/versions/m-/mongo-c-driver.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "7a6dfbb8124275c3987495969f7f79e5a7023b74",
+      "version": "1.25.4",
+      "port-version": 1
+    },
+    {
+      "git-tree": "219d51be972af0596a2c538b530fc379d136fcb2",
+      "version": "1.25.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "654476156359ba012d49880fbf0acf549c6eaa35",
+      "version": "1.25.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "988570f6f3cad6a77c519990851d9d2208d5970d",
+      "version": "1.25.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "7bc0eb795e698bac0f4d77bed4b6ecbde0f57857",
+      "version": "1.25.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c9ddb78bc06cb779848d6afffa88938870ae8a7b",
+      "version": "1.24.3",
+      "port-version": 0
+    },
     {
       "git-tree": "b840350590e947daec430cfea1445d958ae6f5fa",
       "version": "1.22.2",
diff --git a/external_imported/vcpkg/versions/m-/mongo-cxx-driver.json b/external_imported/vcpkg/versions/m-/mongo-cxx-driver.json
index 55cd6285a..fe043b3f1 100644
--- a/external_imported/vcpkg/versions/m-/mongo-cxx-driver.json
+++ b/external_imported/vcpkg/versions/m-/mongo-cxx-driver.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "9682855a28fdd67511a8b454e361f4a7841584a8",
+      "version": "3.9.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d8fc862744aad29acd0e6a0d947fc5b561d3f5f7",
+      "version": "3.8.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "00588be07af8844394ca81106324a42f5d29d684",
+      "version": "3.7.2",
+      "port-version": 0
+    },
     {
       "git-tree": "b1003de5a9787e8f819b67f4ca0fdf709af706e5",
       "version": "3.7.0",
diff --git a/external_imported/vcpkg/versions/m-/mongoose.json b/external_imported/vcpkg/versions/m-/mongoose.json
index 79de63a3f..ceba3f6d1 100644
--- a/external_imported/vcpkg/versions/m-/mongoose.json
+++ b/external_imported/vcpkg/versions/m-/mongoose.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "bfea1ea4e50f4361b3381a638ac89d023d91c51a",
+      "version": "7.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "1da80484966f8ca2b0840d8bb37c523bd0ddbc87",
+      "version": "7.11",
+      "port-version": 0
+    },
     {
       "git-tree": "322dc89811cd8590e93dce9f3bfc48b41f2c61b9",
       "version": "7.9",
diff --git a/external_imported/vcpkg/versions/m-/monkeys-audio.json b/external_imported/vcpkg/versions/m-/monkeys-audio.json
index efb573fc9..75bb283bb 100644
--- a/external_imported/vcpkg/versions/m-/monkeys-audio.json
+++ b/external_imported/vcpkg/versions/m-/monkeys-audio.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "9334281a45f4a9a85f9a3fac1fac959b00201bab",
+      "version-string": "10.08",
+      "port-version": 1
+    },
+    {
+      "git-tree": "55e5b52ffc64a4b2604fa01522d8ebbe53accf56",
+      "version-string": "10.08",
+      "port-version": 0
+    },
     {
       "git-tree": "19c0d2d18d6517fe98d5619755acfa8737021cc5",
       "version-string": "9.04",
diff --git a/external_imported/vcpkg/versions/m-/moos-core.json b/external_imported/vcpkg/versions/m-/moos-core.json
index b3c3d744a..b46a0b76e 100644
--- a/external_imported/vcpkg/versions/m-/moos-core.json
+++ b/external_imported/vcpkg/versions/m-/moos-core.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "21e3020509ccf12a2ef1f855a2761e6a17abc86a",
+      "version": "10.4.0",
+      "port-version": 10
+    },
+    {
+      "git-tree": "a409b13d5b8375d40c505f08f7c1d1e43ac54975",
+      "version": "10.4.0",
+      "port-version": 9
+    },
+    {
+      "git-tree": "9f2f00b654a7a9a9a810ae8d84099c9567f847cf",
+      "version": "10.4.0",
+      "port-version": 8
+    },
     {
       "git-tree": "2081cab97d387c22addea1cec2a244f45a1a6b09",
       "version": "10.4.0",
diff --git a/external_imported/vcpkg/versions/m-/moos-essential.json b/external_imported/vcpkg/versions/m-/moos-essential.json
index 7b9b278e1..08ff17bef 100644
--- a/external_imported/vcpkg/versions/m-/moos-essential.json
+++ b/external_imported/vcpkg/versions/m-/moos-essential.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6ffee2f0ff0958105ea47afa647a7903843f7163",
+      "version": "10.0.1",
+      "port-version": 5
+    },
     {
       "git-tree": "92e1bf2cd4c25ce4d4cf529f9b1848973199d3e4",
       "version-string": "10.0.1",
diff --git a/external_imported/vcpkg/versions/m-/moos-ui.json b/external_imported/vcpkg/versions/m-/moos-ui.json
index f736f296b..baf50fe01 100644
--- a/external_imported/vcpkg/versions/m-/moos-ui.json
+++ b/external_imported/vcpkg/versions/m-/moos-ui.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b3a4cd845b217a94361bc21770a315dfcdec91b3",
+      "version": "10.0.1",
+      "port-version": 5
+    },
     {
       "git-tree": "41137f783f7948b1623b67b9fd96005fe2582e5a",
       "version-string": "10.0.1",
diff --git a/external_imported/vcpkg/versions/m-/morton-nd.json b/external_imported/vcpkg/versions/m-/morton-nd.json
index 81df6bad0..9e1fb3f04 100644
--- a/external_imported/vcpkg/versions/m-/morton-nd.json
+++ b/external_imported/vcpkg/versions/m-/morton-nd.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5fa044c2e3de0da061e78acd5ebbdd9abaa11881",
+      "version": "4.0.0",
+      "port-version": 3
+    },
     {
       "git-tree": "c77c3725f93cfc65ae3882b9f7293ef85e89931b",
       "version-string": "4.0.0",
diff --git a/external_imported/vcpkg/versions/m-/mosquitto.json b/external_imported/vcpkg/versions/m-/mosquitto.json
index b8884b9e3..20220eac4 100644
--- a/external_imported/vcpkg/versions/m-/mosquitto.json
+++ b/external_imported/vcpkg/versions/m-/mosquitto.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6fbbe753533949d40d9ff4307bab2bb61432a117",
+      "version": "2.0.18",
+      "port-version": 0
+    },
     {
       "git-tree": "c8f2f0732c56a4cc622139bba1b7cb110dea985d",
       "version": "2.0.14",
diff --git a/external_imported/vcpkg/versions/m-/mozjpeg.json b/external_imported/vcpkg/versions/m-/mozjpeg.json
index 6319dcac1..ae1e565fe 100644
--- a/external_imported/vcpkg/versions/m-/mozjpeg.json
+++ b/external_imported/vcpkg/versions/m-/mozjpeg.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6d5cda3e9c9c8f0ed895897d457afaf8d9604363",
+      "version": "4.1.5",
+      "port-version": 0
+    },
     {
       "git-tree": "0eb278a28c1706df4c9ce1413968d9e2a40edda8",
       "version": "4.1.1",
diff --git a/external_imported/vcpkg/versions/m-/mp-units.json b/external_imported/vcpkg/versions/m-/mp-units.json
index ef5ebfecc..7c0bddaa7 100644
--- a/external_imported/vcpkg/versions/m-/mp-units.json
+++ b/external_imported/vcpkg/versions/m-/mp-units.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "8ecbe0c671bd440c941d9c88fb326743a5584f00",
+      "version": "2.1.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f410b971351069e2e9f1b140104a8e836b76c1b8",
+      "version": "2.0.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f26957340de86e12abc971d4db95b5a2a2cd7d37",
+      "version": "0.8.0",
+      "port-version": 0
+    },
     {
       "git-tree": "b4bce95b7e67f66db9d613e7e3601c2b90cec665",
       "version-semver": "0.7.0",
diff --git a/external_imported/vcpkg/versions/m-/mp3lame.json b/external_imported/vcpkg/versions/m-/mp3lame.json
index 7fee754ca..e368662e4 100644
--- a/external_imported/vcpkg/versions/m-/mp3lame.json
+++ b/external_imported/vcpkg/versions/m-/mp3lame.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "59014e1d1c1232612124cd30de2e73688713c295",
+      "version": "3.100",
+      "port-version": 11
+    },
     {
       "git-tree": "86d297de90265851ff47145e3aeb48738139a4d9",
       "version": "3.100",
diff --git a/external_imported/vcpkg/versions/m-/mpark-patterns.json b/external_imported/vcpkg/versions/m-/mpark-patterns.json
new file mode 100644
index 000000000..0c522ba9e
--- /dev/null
+++ b/external_imported/vcpkg/versions/m-/mpark-patterns.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "f8b22778a3c1393308468021303beb56ff392a03",
+      "version-date": "2019-10-03",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/m-/mpark-variant.json b/external_imported/vcpkg/versions/m-/mpark-variant.json
index 3e88cae56..31dbc014e 100644
--- a/external_imported/vcpkg/versions/m-/mpark-variant.json
+++ b/external_imported/vcpkg/versions/m-/mpark-variant.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "85fff47d4ae330fa186b8244975e2a211b12f4da",
+      "version": "1.4.0",
+      "port-version": 3
+    },
     {
       "git-tree": "01299a260338dce6a94d3b82eb8b478859a403b7",
       "version-string": "1.4.0",
diff --git a/external_imported/vcpkg/versions/m-/mpc.json b/external_imported/vcpkg/versions/m-/mpc.json
index da45380dc..dce036dac 100644
--- a/external_imported/vcpkg/versions/m-/mpc.json
+++ b/external_imported/vcpkg/versions/m-/mpc.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "741646f873002e3a712397c3f91b8e4f5b99ded4",
+      "version": "1.3.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ac9e33d7db3d83459eeadc2c47a6dea8d3358dc0",
+      "version": "1.2.0",
+      "port-version": 3
+    },
     {
       "git-tree": "c38230459b115da37fe9fe0161c7462de85549d5",
       "version": "1.2.0",
diff --git a/external_imported/vcpkg/versions/m-/mpfr.json b/external_imported/vcpkg/versions/m-/mpfr.json
index 960fed220..302ac9a54 100644
--- a/external_imported/vcpkg/versions/m-/mpfr.json
+++ b/external_imported/vcpkg/versions/m-/mpfr.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "d612486f81111c3f56a2ac56727dde81fda96f8e",
+      "version": "4.2.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a2163475ac427c02bc7a7c24142b45662d5993cc",
+      "version": "4.2.0",
+      "port-version": 1
+    },
     {
       "git-tree": "843923d6f0b86ada254232a971968923c83bc1b5",
       "version": "4.2.0",
diff --git a/external_imported/vcpkg/versions/m-/mpg123.json b/external_imported/vcpkg/versions/m-/mpg123.json
index 4057c0b92..0633842bd 100644
--- a/external_imported/vcpkg/versions/m-/mpg123.json
+++ b/external_imported/vcpkg/versions/m-/mpg123.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "37566a41dbc98698c2fb1236e378f181a965b0d3",
+      "version": "1.31.3",
+      "port-version": 4
+    },
+    {
+      "git-tree": "6e990602e7caa6965db94c4ef01e3f1b44fb4f67",
+      "version": "1.31.3",
+      "port-version": 3
+    },
+    {
+      "git-tree": "58fbb0bf0ec6307689125ef1ba71112b670a42a9",
+      "version": "1.31.3",
+      "port-version": 2
+    },
+    {
+      "git-tree": "73f380749ae40814a07c7a0952e94db2970a9b85",
+      "version": "1.31.3",
+      "port-version": 1
+    },
     {
       "git-tree": "a328d4e2a48af20df2ff33217be9c27343a56d4b",
       "version": "1.31.3",
diff --git a/external_imported/vcpkg/versions/m-/mpi.json b/external_imported/vcpkg/versions/m-/mpi.json
index d177803d6..5ab104a08 100644
--- a/external_imported/vcpkg/versions/m-/mpi.json
+++ b/external_imported/vcpkg/versions/m-/mpi.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7ae77ae0460cf7e6cfe308614e74e1d94b1ca641",
+      "version": "1",
+      "port-version": 4
+    },
     {
       "git-tree": "2eacb3d18a3407d1ceb6211ee7cad0b157249d22",
       "version-string": "1",
diff --git a/external_imported/vcpkg/versions/m-/mpir.json b/external_imported/vcpkg/versions/m-/mpir.json
index 8f7790807..5b4626a44 100644
--- a/external_imported/vcpkg/versions/m-/mpir.json
+++ b/external_imported/vcpkg/versions/m-/mpir.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "66630c57080280e1089146536f7d5d21c7504600",
+      "version-date": "2022-03-02",
+      "port-version": 3
+    },
+    {
+      "git-tree": "de9b5962358546e5cc0d7ac9b6dd9bfba95e1763",
+      "version-date": "2022-03-02",
+      "port-version": 2
+    },
     {
       "git-tree": "9191f07cfaade82121abb4d37cb652182c0e55f6",
       "version-date": "2022-03-02",
diff --git a/external_imported/vcpkg/versions/m-/mqtt-cpp.json b/external_imported/vcpkg/versions/m-/mqtt-cpp.json
index 6dfe0ed74..3dbca2566 100644
--- a/external_imported/vcpkg/versions/m-/mqtt-cpp.json
+++ b/external_imported/vcpkg/versions/m-/mqtt-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b8d3a5621c52680097b6b22266034c6999b43100",
+      "version-semver": "13.2.1",
+      "port-version": 0
+    },
     {
       "git-tree": "ad3936ccb89401e0752c0325604b80c2dc63ace8",
       "version-semver": "13.1.0",
diff --git a/external_imported/vcpkg/versions/m-/ms-gltf.json b/external_imported/vcpkg/versions/m-/ms-gltf.json
index 82b9a8bda..192e4f6d1 100644
--- a/external_imported/vcpkg/versions/m-/ms-gltf.json
+++ b/external_imported/vcpkg/versions/m-/ms-gltf.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5fb5ea5c5659fa04f4038a9df76b469f39c4e8f0",
+      "version-date": "2022-06-28",
+      "port-version": 2
+    },
     {
       "git-tree": "b189e4d23ebe85437573b386d94b06b3f9fb6238",
       "version-date": "2022-06-28",
diff --git a/external_imported/vcpkg/versions/m-/ms-gsl.json b/external_imported/vcpkg/versions/m-/ms-gsl.json
index 3693c2721..fe599f252 100644
--- a/external_imported/vcpkg/versions/m-/ms-gsl.json
+++ b/external_imported/vcpkg/versions/m-/ms-gsl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7d8da50e7ffaa4a1460036950f527b0a5e64c02a",
+      "version": "4.0.0",
+      "port-version": 1
+    },
     {
       "git-tree": "9d8d320f8c5db1a6b0c7517d110b854bc4b551e5",
       "version": "4.0.0",
diff --git a/external_imported/vcpkg/versions/m-/ms-ifc-sdk.json b/external_imported/vcpkg/versions/m-/ms-ifc-sdk.json
new file mode 100644
index 000000000..1d6b0c776
--- /dev/null
+++ b/external_imported/vcpkg/versions/m-/ms-ifc-sdk.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "1c24ff4ae05b7f1b10e071e516d4fb07cedfee16",
+      "version": "0.43.1",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/m-/msdfgen.json b/external_imported/vcpkg/versions/m-/msdfgen.json
index 0aa51d6ae..b1a4b4ee5 100644
--- a/external_imported/vcpkg/versions/m-/msdfgen.json
+++ b/external_imported/vcpkg/versions/m-/msdfgen.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "eb66c5ad525b3152e1f73a029dfd0a2caa4a7f5c",
+      "version": "1.11.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "22eb77c9256846ad9c1e01e6ffff25b02b5edbd5",
+      "version": "1.10.0",
+      "port-version": 1
+    },
     {
       "git-tree": "f03e46126dcb57f2ff08f5834eb6e84f84e14e2b",
       "version": "1.10.0",
diff --git a/external_imported/vcpkg/versions/m-/msgpack-c.json b/external_imported/vcpkg/versions/m-/msgpack-c.json
new file mode 100644
index 000000000..601789ac6
--- /dev/null
+++ b/external_imported/vcpkg/versions/m-/msgpack-c.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "eb07de381e11c13f6d4aa2e2b151efb2d405b85e",
+      "version": "6.0.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/m-/msgpack.json b/external_imported/vcpkg/versions/m-/msgpack.json
index 7bfbfc118..bad0ee95d 100644
--- a/external_imported/vcpkg/versions/m-/msgpack.json
+++ b/external_imported/vcpkg/versions/m-/msgpack.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "f9f798edc049a449e0fe3dffb9401659339b371a",
+      "version": "6.0.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "fc124bda56c5eca176379c3e17f9c2f2d63bbdd9",
+      "version": "6.0.0",
+      "port-version": 0
+    },
     {
       "git-tree": "006d17cf08d5bb92fdb2f4bf33ba97d18cbcc090",
       "version": "4.1.3",
diff --git a/external_imported/vcpkg/versions/m-/msinttypes.json b/external_imported/vcpkg/versions/m-/msinttypes.json
index f59de2c3b..3f0b64b96 100644
--- a/external_imported/vcpkg/versions/m-/msinttypes.json
+++ b/external_imported/vcpkg/versions/m-/msinttypes.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "34e86ded5171b1516fe2e5b51c5122ccd078f8ae",
+      "version-date": "2018-02-25",
+      "port-version": 2
+    },
     {
       "git-tree": "e912f42451c0d3a2563a68db50d96318bd277e40",
       "version-string": "2018-02-25",
diff --git a/external_imported/vcpkg/versions/m-/mstch.json b/external_imported/vcpkg/versions/m-/mstch.json
index c04d397cc..a6c72c92b 100644
--- a/external_imported/vcpkg/versions/m-/mstch.json
+++ b/external_imported/vcpkg/versions/m-/mstch.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "105e9bad13386dd0b785eb38884c375834f6a7bb",
+      "version": "1.0.2",
+      "port-version": 5
+    },
     {
       "git-tree": "8fe89ac9440d83aa39cda5e17f0787c90673dced",
       "version-string": "1.0.2",
diff --git a/external_imported/vcpkg/versions/m-/mtlt.json b/external_imported/vcpkg/versions/m-/mtlt.json
new file mode 100644
index 000000000..dce0e7a53
--- /dev/null
+++ b/external_imported/vcpkg/versions/m-/mtlt.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "8f0c1e8f63efeb1e1cd7c6484837539caa0dc1d1",
+      "version": "1.0.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/m-/mujoco.json b/external_imported/vcpkg/versions/m-/mujoco.json
index fc68f3fd8..6a2268805 100644
--- a/external_imported/vcpkg/versions/m-/mujoco.json
+++ b/external_imported/vcpkg/versions/m-/mujoco.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c70b9104b75fe8947ddac6e9450207cadb59cb0b",
+      "version": "2.3.2",
+      "port-version": 1
+    },
     {
       "git-tree": "086053d3e52e0d7565733cf06db736f2e1617a63",
       "version": "2.3.2",
diff --git a/external_imported/vcpkg/versions/m-/murmur3.json b/external_imported/vcpkg/versions/m-/murmur3.json
new file mode 100644
index 000000000..44d1791a4
--- /dev/null
+++ b/external_imported/vcpkg/versions/m-/murmur3.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "5f4ab89578aaab8f3e4edf66398db2a693753abb",
+      "version-date": "2015-05-02",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/m-/murmurhash.json b/external_imported/vcpkg/versions/m-/murmurhash.json
index 461ee4cfd..6147fe0dc 100644
--- a/external_imported/vcpkg/versions/m-/murmurhash.json
+++ b/external_imported/vcpkg/versions/m-/murmurhash.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "53f2656ff91aeec6d11585b61c650390b23e6340",
+      "version-date": "2016-01-09",
+      "port-version": 7
+    },
     {
       "git-tree": "e5ec901e9cab9845f18d18276ddea5e4ad5d4538",
       "version-date": "2016-01-09",
diff --git a/external_imported/vcpkg/versions/m-/mvfst.json b/external_imported/vcpkg/versions/m-/mvfst.json
index 4b7412e2a..01e782f98 100644
--- a/external_imported/vcpkg/versions/m-/mvfst.json
+++ b/external_imported/vcpkg/versions/m-/mvfst.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "c0b5b25444aee23d293543cb07f671e422d131a1",
+      "version-string": "2024.01.01.00",
+      "port-version": 0
+    },
+    {
+      "git-tree": "082167d3253fd7af5973a5e970a407c117702841",
+      "version-string": "2023.10.02.00",
+      "port-version": 0
+    },
+    {
+      "git-tree": "345723d54eef6854daed66dedae0b9d4ead2f9a4",
+      "version-date": "2023-05-18",
+      "port-version": 0
+    },
     {
       "git-tree": "6187a6048afe0846ffb243d00981f0da0666aa38",
       "version-date": "2022-11-03",
diff --git a/external_imported/vcpkg/versions/m-/mygui.json b/external_imported/vcpkg/versions/m-/mygui.json
index 7fc17d104..df7eaedb2 100644
--- a/external_imported/vcpkg/versions/m-/mygui.json
+++ b/external_imported/vcpkg/versions/m-/mygui.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "99d1cea52873da58281082ab47f35ba73bd13a18",
+      "version": "3.4.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "bc0449cfc21fca4e1ee5afda7c0919fffb9cd864",
+      "version": "3.4.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4b68ea2f9e7d24c34d86ea4d45050adc7ac29663",
+      "version": "3.4.1",
+      "port-version": 5
+    },
     {
       "git-tree": "006d47cf87a29b68cbf5f7d1fbbc7e12a38e3cb7",
       "version": "3.4.1",
diff --git a/external_imported/vcpkg/versions/m-/mysql-connector-cpp.json b/external_imported/vcpkg/versions/m-/mysql-connector-cpp.json
index 8dd35179f..c5b154f22 100644
--- a/external_imported/vcpkg/versions/m-/mysql-connector-cpp.json
+++ b/external_imported/vcpkg/versions/m-/mysql-connector-cpp.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "89b1c4d68211753ab836de3dde9664a3d611b78e",
+      "version": "8.0.32",
+      "port-version": 1
+    },
+    {
+      "git-tree": "b78f858b560a7a1fb4d13646a7652f86465885fd",
+      "version": "8.0.32",
+      "port-version": 0
+    },
     {
       "git-tree": "0cb6021de557d4669a9483690da1500b2b83ba26",
       "version": "8.0.30",
diff --git a/external_imported/vcpkg/versions/n-/nameof.json b/external_imported/vcpkg/versions/n-/nameof.json
index 9db7ec0e2..125944e28 100644
--- a/external_imported/vcpkg/versions/n-/nameof.json
+++ b/external_imported/vcpkg/versions/n-/nameof.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f82961138b18791ffba3efef021f008c467988fb",
+      "version": "0.10.3",
+      "port-version": 0
+    },
     {
       "git-tree": "c6e74d9d06b8f8982ecfbad4b07e5215c8ea054b",
       "version": "0.10.2",
diff --git a/external_imported/vcpkg/versions/n-/nana.json b/external_imported/vcpkg/versions/n-/nana.json
index 478116c09..235058fa3 100644
--- a/external_imported/vcpkg/versions/n-/nana.json
+++ b/external_imported/vcpkg/versions/n-/nana.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "1d8a6bacbbb014166cfcb552726c9d13f472811a",
+      "version": "1.7.4",
+      "port-version": 5
+    },
+    {
+      "git-tree": "9a9b07b69a2b4c5adec89f6de54c4ad45df86b88",
+      "version": "1.7.4",
+      "port-version": 4
+    },
     {
       "git-tree": "e18604f3c78c739c1e1e127c0c0ab3e41345db5d",
       "version-string": "1.7.4",
diff --git a/external_imported/vcpkg/versions/n-/nano-signal-slot.json b/external_imported/vcpkg/versions/n-/nano-signal-slot.json
index c5ca118d7..f100e79df 100644
--- a/external_imported/vcpkg/versions/n-/nano-signal-slot.json
+++ b/external_imported/vcpkg/versions/n-/nano-signal-slot.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b8fe131fc48fcc5a0935df8458dd39dccfbac755",
+      "version": "2.0.1",
+      "port-version": 2
+    },
     {
       "git-tree": "b46cf4c106c7a062c72ff464ad172d52f9f2a642",
       "version-string": "2.0.1",
diff --git a/external_imported/vcpkg/versions/n-/nanobench.json b/external_imported/vcpkg/versions/n-/nanobench.json
index a1024d4d6..5541e86bb 100644
--- a/external_imported/vcpkg/versions/n-/nanobench.json
+++ b/external_imported/vcpkg/versions/n-/nanobench.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "811f5b66a36111a71c33f7b7ed5924f04caba4d8",
+      "version": "4.3.11",
+      "port-version": 0
+    },
     {
       "git-tree": "90dbaf4276576bc0ae73f4af33109639f01d698a",
       "version": "4.3.10",
diff --git a/external_imported/vcpkg/versions/n-/nanodbc.json b/external_imported/vcpkg/versions/n-/nanodbc.json
index ef870e927..834645fbc 100644
--- a/external_imported/vcpkg/versions/n-/nanodbc.json
+++ b/external_imported/vcpkg/versions/n-/nanodbc.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "47782a521b53acaa6ee44a2956a2e98d17a20e50",
+      "version": "2.13.0",
+      "port-version": 8
+    },
+    {
+      "git-tree": "b57473b86bc71733209e195206d253f1dd3658b2",
+      "version": "2.13.0",
+      "port-version": 7
+    },
     {
       "git-tree": "7de6296fc337f181517f8ed4c2e6ed35d749e414",
       "version": "2.13.0",
diff --git a/external_imported/vcpkg/versions/n-/nanoflann.json b/external_imported/vcpkg/versions/n-/nanoflann.json
index c59ba1bc2..86f6f2628 100644
--- a/external_imported/vcpkg/versions/n-/nanoflann.json
+++ b/external_imported/vcpkg/versions/n-/nanoflann.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "a2d0d87e714fc8a7ec923469a4bf2ae0ceb405c3",
+      "version": "1.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "23c05262f235796a1f01174f1dedc48c346e96af",
+      "version": "1.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "91e87dd11fdfc2cb98925ded3aab041f5f507715",
       "version": "1.4.3",
diff --git a/external_imported/vcpkg/versions/n-/nanojsonc.json b/external_imported/vcpkg/versions/n-/nanojsonc.json
new file mode 100644
index 000000000..3a8ad2e97
--- /dev/null
+++ b/external_imported/vcpkg/versions/n-/nanojsonc.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "7680709fd527db1cc26d47f8897c0669cacbfb0f",
+      "version": "1.0.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/n-/nanomsg.json b/external_imported/vcpkg/versions/n-/nanomsg.json
index 5850fbc6c..fb3861deb 100644
--- a/external_imported/vcpkg/versions/n-/nanomsg.json
+++ b/external_imported/vcpkg/versions/n-/nanomsg.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "776c37386c83ec3b242fb17bf418f4a22e5cc300",
+      "version-semver": "1.2.0",
+      "port-version": 1
+    },
     {
       "git-tree": "9c6dee5730547fccf7eae09ec55d2cea5fb593d1",
       "version-semver": "1.2.0",
diff --git a/external_imported/vcpkg/versions/n-/nanopb.json b/external_imported/vcpkg/versions/n-/nanopb.json
index 972b5ab6f..d77e89c69 100644
--- a/external_imported/vcpkg/versions/n-/nanopb.json
+++ b/external_imported/vcpkg/versions/n-/nanopb.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "b27e85ab51605be4fee299a1dcb14f4fe0ac2429",
+      "version-semver": "0.4.7",
+      "port-version": 2
+    },
+    {
+      "git-tree": "4d78bf2dbff06f0540e971677c39641b9057dc57",
+      "version-semver": "0.4.7",
+      "port-version": 1
+    },
     {
       "git-tree": "230c55c9370ee3756674be33a6d5740ff04fccda",
       "version-semver": "0.4.7",
diff --git a/external_imported/vcpkg/versions/n-/nanoprintf.json b/external_imported/vcpkg/versions/n-/nanoprintf.json
index 44d94b76f..c9ac5b4f7 100644
--- a/external_imported/vcpkg/versions/n-/nanoprintf.json
+++ b/external_imported/vcpkg/versions/n-/nanoprintf.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "88e688e729a34f99b0ec4185786fb67fb9fda107",
+      "version": "0.3.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4dc3b1f718f303cda846f07207bc62a4acc6274b",
+      "version-date": "2020-05-27",
+      "port-version": 2
+    },
     {
       "git-tree": "eb37eca3c4891582693eb5a769cf307c60b059ac",
       "version-string": "2020-05-27",
diff --git a/external_imported/vcpkg/versions/n-/nanort.json b/external_imported/vcpkg/versions/n-/nanort.json
index 54e855482..c2ac3826d 100644
--- a/external_imported/vcpkg/versions/n-/nanort.json
+++ b/external_imported/vcpkg/versions/n-/nanort.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f299ee1037140bda3d4cd6ef09b2d877cc61db07",
+      "version-date": "2019-08-20",
+      "port-version": 3
+    },
     {
       "git-tree": "9fab3a6181cbaace8875990f9aab595cdad59956",
       "version-string": "2019-08-20",
diff --git a/external_imported/vcpkg/versions/n-/nayuki-qr-code-generator.json b/external_imported/vcpkg/versions/n-/nayuki-qr-code-generator.json
index f1e9a11df..878120093 100644
--- a/external_imported/vcpkg/versions/n-/nayuki-qr-code-generator.json
+++ b/external_imported/vcpkg/versions/n-/nayuki-qr-code-generator.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "6f3345b4889287461620da1c6c3220666d8bb8f3",
+      "version": "1.8.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "376b1b6483e138ceda93ab3b1aab6f3e51be74ad",
+      "version": "1.8.0",
+      "port-version": 0
+    },
     {
       "git-tree": "a53df304990ba731189df6b4391c5eede88bd90c",
       "version": "1.7.0",
diff --git a/external_imported/vcpkg/versions/n-/ncnn.json b/external_imported/vcpkg/versions/n-/ncnn.json
index 3084d2f0f..348ed94bf 100644
--- a/external_imported/vcpkg/versions/n-/ncnn.json
+++ b/external_imported/vcpkg/versions/n-/ncnn.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2a6a2a9cc4c71cac799469f587478b987a63e0ed",
+      "version": "20231027",
+      "port-version": 0
+    },
     {
       "git-tree": "792660456e6b0e405ad0c67b0474ae80fea47878",
       "version": "20221128",
diff --git a/external_imported/vcpkg/versions/n-/ndis-driver-library.json b/external_imported/vcpkg/versions/n-/ndis-driver-library.json
new file mode 100644
index 000000000..b03abd5fa
--- /dev/null
+++ b/external_imported/vcpkg/versions/n-/ndis-driver-library.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "b86a9cee58f4826c91b9126e10edb311b3149dfe",
+      "version": "1.2.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/n-/ned14-internal-quickcpplib.json b/external_imported/vcpkg/versions/n-/ned14-internal-quickcpplib.json
index 46a54ffcf..de227f0f4 100644
--- a/external_imported/vcpkg/versions/n-/ned14-internal-quickcpplib.json
+++ b/external_imported/vcpkg/versions/n-/ned14-internal-quickcpplib.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "fd29cd78a6d8aa5689620b077e062c8844d27871",
+      "version-date": "2023-11-22",
+      "port-version": 0
+    },
+    {
+      "git-tree": "7be7cf3170221b9393f84ec28a2b940956cabb9f",
+      "version-date": "2023-11-06",
+      "port-version": 0
+    },
     {
       "git-tree": "59fa084ab6de6874b5dc5e56665312104d0f454a",
       "version-date": "2023-03-13",
diff --git a/external_imported/vcpkg/versions/n-/netcdf-c.json b/external_imported/vcpkg/versions/n-/netcdf-c.json
index af3e5e2b4..5fc756df9 100644
--- a/external_imported/vcpkg/versions/n-/netcdf-c.json
+++ b/external_imported/vcpkg/versions/n-/netcdf-c.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "12002458bc69dbcd92c6792a3edd1f5e3931ae95",
+      "version": "4.8.1",
+      "port-version": 4
+    },
+    {
+      "git-tree": "2d17052df3479de37b4c756f4e90661c9fa85e7d",
+      "version": "4.8.1",
+      "port-version": 3
+    },
     {
       "git-tree": "f4d487e2f7e093b2406887023bb3a0856735bad5",
       "version": "4.8.1",
diff --git a/external_imported/vcpkg/versions/n-/netcdf-cxx4.json b/external_imported/vcpkg/versions/n-/netcdf-cxx4.json
index a71d832b6..f494867f1 100644
--- a/external_imported/vcpkg/versions/n-/netcdf-cxx4.json
+++ b/external_imported/vcpkg/versions/n-/netcdf-cxx4.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e923110ddc48818ad472b7b577823caabfb203ab",
+      "version": "4.3.1",
+      "port-version": 5
+    },
     {
       "git-tree": "58540066d5e44f206328ac7cc9744153dbd39a68",
       "version-string": "4.3.1",
diff --git a/external_imported/vcpkg/versions/n-/netgen.json b/external_imported/vcpkg/versions/n-/netgen.json
new file mode 100644
index 000000000..176f0e167
--- /dev/null
+++ b/external_imported/vcpkg/versions/n-/netgen.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "9d4a861ae09a1f970a8a0e100f63ab46bc601d93",
+      "version": "6.2.2307",
+      "port-version": 1
+    },
+    {
+      "git-tree": "9326bf9f2364487f83d80a4b594e469db805a511",
+      "version": "6.2.2307",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/n-/nethost.json b/external_imported/vcpkg/versions/n-/nethost.json
index de75f4bd8..2dd791baf 100644
--- a/external_imported/vcpkg/versions/n-/nethost.json
+++ b/external_imported/vcpkg/versions/n-/nethost.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4e306025f6213b286479afaf20f15ab10c5a9d51",
+      "version": "8.0.0",
+      "port-version": 0
+    },
     {
       "git-tree": "d0dbe0f8de11978aea0148c9474377cdc8e88aaf",
       "version": "7.0.0",
diff --git a/external_imported/vcpkg/versions/n-/nettle.json b/external_imported/vcpkg/versions/n-/nettle.json
index 641565843..ce348da97 100644
--- a/external_imported/vcpkg/versions/n-/nettle.json
+++ b/external_imported/vcpkg/versions/n-/nettle.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7734b67cb656bf12488ea137779b56d8865bbb02",
+      "version": "3.8.1",
+      "port-version": 1
+    },
     {
       "git-tree": "1ca3c1210bb511a4d94b53684fcb557e92678d7b",
       "version": "3.8.1",
diff --git a/external_imported/vcpkg/versions/n-/networkdirect-sdk.json b/external_imported/vcpkg/versions/n-/networkdirect-sdk.json
index 36ef8dc50..0537e8a01 100644
--- a/external_imported/vcpkg/versions/n-/networkdirect-sdk.json
+++ b/external_imported/vcpkg/versions/n-/networkdirect-sdk.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a772a084c23789a5e43d7a8880cb7e980a6314b6",
+      "version": "2.0.1",
+      "port-version": 4
+    },
     {
       "git-tree": "4ae7e238a2a00496c78d2d2bb2101f9e054975e9",
       "version": "2.0.1",
diff --git a/external_imported/vcpkg/versions/n-/nghttp2-asio.json b/external_imported/vcpkg/versions/n-/nghttp2-asio.json
index 40f58ac1c..7d4bc7362 100644
--- a/external_imported/vcpkg/versions/n-/nghttp2-asio.json
+++ b/external_imported/vcpkg/versions/n-/nghttp2-asio.json
@@ -1,9 +1,14 @@
 {
   "versions": [
+    {
+      "git-tree": "ad42ffe88b18eda0e2807ada97bc51b76239e953",
+      "version-date": "2022-08-11",
+      "port-version": 1
+    },
     {
       "git-tree": "a2ef24d2428ea9d1a4cb733d3e4ce00e3f6f5c8d",
-      "port-version": 0,
-      "version-date": "2022-08-11"
+      "version-date": "2022-08-11",
+      "port-version": 0
     }
   ]
 }
diff --git a/external_imported/vcpkg/versions/n-/nghttp2.json b/external_imported/vcpkg/versions/n-/nghttp2.json
index 684b4bc53..15722e376 100644
--- a/external_imported/vcpkg/versions/n-/nghttp2.json
+++ b/external_imported/vcpkg/versions/n-/nghttp2.json
@@ -1,5 +1,45 @@
 {
   "versions": [
+    {
+      "git-tree": "3b5a94a4eb9a90dcd3b34534bd14768d94e7e538",
+      "version": "1.59.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8beb4b8f6dab88296ee6ef57f5eb0f60c9fff72d",
+      "version": "1.58.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0a369a1a84bf659607d06fcfdcf2b38996c0f935",
+      "version": "1.57.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "fbaeb01777a225a56a3f29ea40db69711f06256f",
+      "version": "1.56.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "772366dba6fcdf37e0ca244d4539b2fd73faca2f",
+      "version": "1.55.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b79d36373533804ca437bc13144b9614c0612f1a",
+      "version": "1.55.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4bc602a9f1721052cae35a9c91b829df65398f86",
+      "version": "1.54.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0eb9ce7e6486785e3b3581274097e4d0e34ad828",
+      "version": "1.53.0",
+      "port-version": 0
+    },
     {
       "git-tree": "74c421607d322d652065b5414ddd4d7f0989c0bf",
       "version": "1.51.0",
diff --git a/external_imported/vcpkg/versions/n-/nghttp3.json b/external_imported/vcpkg/versions/n-/nghttp3.json
index bd421c32d..522ddfcb8 100644
--- a/external_imported/vcpkg/versions/n-/nghttp3.json
+++ b/external_imported/vcpkg/versions/n-/nghttp3.json
@@ -1,5 +1,45 @@
 {
   "versions": [
+    {
+      "git-tree": "e17655971ccd459fb7886958988cf1334bc5572c",
+      "version": "1.1.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9552b83f2dfc8fc3211ce4e18708570193d9625f",
+      "version": "1.0.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "dc20ed3b2fc048cdcebb7f936b2614b42e66c286",
+      "version": "0.15.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c3db373f95298070305be9546fa5b5676e0d717d",
+      "version": "0.14.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6bd84b01197cd87cc5ca7cb73d458da9a504caa5",
+      "version": "0.13.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "868b3e41f403af9da33191e05418e37f71a46c30",
+      "version": "0.12.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8139cb08a1dea31b13af01d3027129cf7874acab",
+      "version": "0.11.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b490beccb519c1faa3bfbfae0bb6e8e873aed843",
+      "version": "0.10.0",
+      "port-version": 0
+    },
     {
       "git-tree": "bb3cac335e3b52e2a03a49a48173b085541c4341",
       "version": "0.9.0",
diff --git a/external_imported/vcpkg/versions/n-/ngspice.json b/external_imported/vcpkg/versions/n-/ngspice.json
index cf170a13f..24e9fd26a 100644
--- a/external_imported/vcpkg/versions/n-/ngspice.json
+++ b/external_imported/vcpkg/versions/n-/ngspice.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "ae82af35f1dfb0ac52968de34d29a7de809cf575",
+      "version": "41",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2810bbc81dca4d7c2cc27859dc4403b347e6e40d",
+      "version": "39",
+      "port-version": 1
+    },
+    {
+      "git-tree": "a0b81daaa09f8f109edf6870909050067ad5bd90",
+      "version": "39",
+      "port-version": 0
+    },
     {
       "git-tree": "7a20625f4656372060074ee98cf95ef002b16178",
       "version": "37",
diff --git a/external_imported/vcpkg/versions/n-/ngtcp2.json b/external_imported/vcpkg/versions/n-/ngtcp2.json
index 359830224..8e83d3a4b 100644
--- a/external_imported/vcpkg/versions/n-/ngtcp2.json
+++ b/external_imported/vcpkg/versions/n-/ngtcp2.json
@@ -1,5 +1,55 @@
 {
   "versions": [
+    {
+      "git-tree": "afc1585394c775f2989331db3baaa1b2c7449516",
+      "version": "1.2.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c373297464e5a9b8bc18bd89703571e3ebf2417d",
+      "version": "1.1.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b2b2e40609c45b92b199a998590bb1074f1226d4",
+      "version": "1.0.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "40104b5c6052054c49211e1a9098f833dba4a63d",
+      "version": "1.0.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "05c0bba60ffa39b1368709bb4ef25102b4b74c7a",
+      "version": "0.19.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4daeb8ad745feeafd60b7fcf856907745ed6e4d8",
+      "version": "0.18.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d0d7665d44dfadb8bd4ac73c842d33f54b888802",
+      "version": "0.17.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5c23d20c06e58c61401f02c07a05bce9cf6a3eb4",
+      "version": "0.16.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ae54f702f177016f67025862105af12921ccb325",
+      "version": "0.14.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2ed43a821081be8b08e5e93265f04def890da42f",
+      "version": "0.14.0",
+      "port-version": 0
+    },
     {
       "git-tree": "650ddd9f22d59c17ff9adbb88b23c99c4cd2a742",
       "version": "0.13.1",
diff --git a/external_imported/vcpkg/versions/n-/nifly.json b/external_imported/vcpkg/versions/n-/nifly.json
index 07e020487..d99c8f087 100644
--- a/external_imported/vcpkg/versions/n-/nifly.json
+++ b/external_imported/vcpkg/versions/n-/nifly.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "65dfaaae3bb9e8549f5b0f0a8b802cc4fae50164",
+      "version": "1.0.0",
+      "port-version": 1
+    },
     {
       "git-tree": "208094a8ee378aaa7a4de63e4d7e59401fecdb9b",
       "version": "1.0.0",
diff --git a/external_imported/vcpkg/versions/n-/nifticlib.json b/external_imported/vcpkg/versions/n-/nifticlib.json
index eecb403b5..5be5f702c 100644
--- a/external_imported/vcpkg/versions/n-/nifticlib.json
+++ b/external_imported/vcpkg/versions/n-/nifticlib.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "04096233d605e377c31588273d928c15538713ac",
+      "version-date": "2022-07-04",
+      "port-version": 0
+    },
     {
       "git-tree": "d889870db5d6d2e5afc8e738c6f6451c7d237a4c",
       "version-date": "2020-04-30",
diff --git a/external_imported/vcpkg/versions/n-/nlohmann-json.json b/external_imported/vcpkg/versions/n-/nlohmann-json.json
index 382f3b167..ac520132f 100644
--- a/external_imported/vcpkg/versions/n-/nlohmann-json.json
+++ b/external_imported/vcpkg/versions/n-/nlohmann-json.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a728b86fa36d4885a4c57c79432660950644d6d4",
+      "version-semver": "3.11.3",
+      "port-version": 0
+    },
     {
       "git-tree": "caa64b8c731ac2457575ea3c5f1827bc82ecac84",
       "version-semver": "3.11.2",
diff --git a/external_imported/vcpkg/versions/n-/nmap.json b/external_imported/vcpkg/versions/n-/nmap.json
index 91784fbcc..cd1029d5c 100644
--- a/external_imported/vcpkg/versions/n-/nmap.json
+++ b/external_imported/vcpkg/versions/n-/nmap.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "d96fe27573cd4c06549f6a711e54f0f26a1c4485",
+      "version": "7.70",
+      "port-version": 11
+    },
+    {
+      "git-tree": "fd1dcfaf73ff23b171247d76abdca50cd7f10f33",
+      "version": "7.70",
+      "port-version": 10
+    },
+    {
+      "git-tree": "6822fee19cc3071389e5a218c77e4ffadb963327",
+      "version": "7.70",
+      "port-version": 9
+    },
     {
       "git-tree": "429c00ca8882e0c2046de753bc8699603aa77343",
       "version": "7.70",
diff --git a/external_imported/vcpkg/versions/n-/nng.json b/external_imported/vcpkg/versions/n-/nng.json
index b13488a6a..3a9d2765a 100644
--- a/external_imported/vcpkg/versions/n-/nng.json
+++ b/external_imported/vcpkg/versions/n-/nng.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "4ac0d0be55aed606e5db8e253d9bf5cc8586e7c2",
+      "version-semver": "1.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "83ce54077bc3c44805db7725549b28e7bc90d536",
+      "version-semver": "1.5.2",
+      "port-version": 1
+    },
     {
       "git-tree": "8e400d4ac38af1eafba51433102b0963d06053b2",
       "version-semver": "1.5.2",
diff --git a/external_imported/vcpkg/versions/n-/nngpp.json b/external_imported/vcpkg/versions/n-/nngpp.json
index e4a53d1ab..880e59c1f 100644
--- a/external_imported/vcpkg/versions/n-/nngpp.json
+++ b/external_imported/vcpkg/versions/n-/nngpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e61e4c2585eb86f360f925d8c522c5d6764fc6a6",
+      "version": "1.3.0",
+      "port-version": 3
+    },
     {
       "git-tree": "753d69bc50dbc03626d362d132de28e4f8079b19",
       "version-string": "1.3.0",
diff --git a/external_imported/vcpkg/versions/n-/node-addon-api.json b/external_imported/vcpkg/versions/n-/node-addon-api.json
index bda5bcc63..079963974 100644
--- a/external_imported/vcpkg/versions/n-/node-addon-api.json
+++ b/external_imported/vcpkg/versions/n-/node-addon-api.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "81fa7773a3a022325f43fa266ce809c1bb3ceffd",
+      "version": "7.0.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "33617d9929f3a05c2f3a98781dd6508a1b2ba1cd",
+      "version": "6.1.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "cfdebff816f735bc5922266b54623e0a70b667cf",
+      "version": "6.0.0",
+      "port-version": 1
+    },
     {
       "git-tree": "45cf82eea2cea9f8fa60b8a476f6484f75f81ca5",
       "version": "6.0.0",
diff --git a/external_imported/vcpkg/versions/n-/node-api-headers.json b/external_imported/vcpkg/versions/n-/node-api-headers.json
new file mode 100644
index 000000000..2fc654d28
--- /dev/null
+++ b/external_imported/vcpkg/versions/n-/node-api-headers.json
@@ -0,0 +1,29 @@
+{
+  "versions": [
+    {
+      "git-tree": "913a99892edcb72bcc2a479471caf0f9edb35311",
+      "version": "1.1.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "273191974015356594e8288781f46c01fd882d43",
+      "version": "1.0.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "a38314df5ed9495e8e15abc596a5cd75e0116824",
+      "version": "1.0.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "1a4d676ae2409acc29b77934186b1232e3a80408",
+      "version": "0.0.5",
+      "port-version": 1
+    },
+    {
+      "git-tree": "d8703d51a9b88c204782885707fc580ab490e9f4",
+      "version": "0.0.5",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/n-/nodesoup.json b/external_imported/vcpkg/versions/n-/nodesoup.json
new file mode 100644
index 000000000..9b2e2fabf
--- /dev/null
+++ b/external_imported/vcpkg/versions/n-/nodesoup.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "43d30f8e5e0cd4b45a590027d0c9ea5036f0ba40",
+      "version-date": "2023-06-12",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/n-/nonius.json b/external_imported/vcpkg/versions/n-/nonius.json
index 92c4d5764..f2b983187 100644
--- a/external_imported/vcpkg/versions/n-/nonius.json
+++ b/external_imported/vcpkg/versions/n-/nonius.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4b44b6979dba8939009d769f36a90196e93afe9f",
+      "version-date": "2019-04-20",
+      "port-version": 4
+    },
     {
       "git-tree": "9c9da5344edbd70d4941eec3b1b1ef7ce90a3c1a",
       "version-string": "2019-04-20",
diff --git a/external_imported/vcpkg/versions/n-/nowide.json b/external_imported/vcpkg/versions/n-/nowide.json
index a90912bd7..ba5bcdea1 100644
--- a/external_imported/vcpkg/versions/n-/nowide.json
+++ b/external_imported/vcpkg/versions/n-/nowide.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "8d782a748c6b9013ca434f77a3c2b1838fce734d",
+      "version": "11.3.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d91d4dcfdca6cb36e7c2235e9a14ccc131ed165e",
+      "version": "11.2.0",
+      "port-version": 1
+    },
     {
       "git-tree": "dc71e4553a59625e8daaf2c3e1d54af1f19a0279",
       "version": "11.2.0",
diff --git a/external_imported/vcpkg/versions/n-/nrf-ble-driver.json b/external_imported/vcpkg/versions/n-/nrf-ble-driver.json
index d7907e56d..5edfed930 100644
--- a/external_imported/vcpkg/versions/n-/nrf-ble-driver.json
+++ b/external_imported/vcpkg/versions/n-/nrf-ble-driver.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4eaac577bc7f0f8d3bf2cc6281f96d848937ccaa",
+      "version": "4.1.4",
+      "port-version": 1
+    },
     {
       "git-tree": "f7eb0b4a2be63dfe15611d96725869023f7b438c",
       "version": "4.1.4",
diff --git a/external_imported/vcpkg/versions/n-/nspr.json b/external_imported/vcpkg/versions/n-/nspr.json
index 354249c8b..a2cf66873 100644
--- a/external_imported/vcpkg/versions/n-/nspr.json
+++ b/external_imported/vcpkg/versions/n-/nspr.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "2ac026e89f8d32d1b421bdc000ca17f0c7d3e3c7",
+      "version": "4.35",
+      "port-version": 4
+    },
+    {
+      "git-tree": "f6ae665af0bc5a8b98f846bf8e8468e823f09509",
+      "version": "4.35",
+      "port-version": 3
+    },
     {
       "git-tree": "26de592ee740014b5e1a5d038e5f2132671312b5",
       "version": "4.35",
diff --git a/external_imported/vcpkg/versions/n-/nss.json b/external_imported/vcpkg/versions/n-/nss.json
index 0938d6760..a06dde1c6 100644
--- a/external_imported/vcpkg/versions/n-/nss.json
+++ b/external_imported/vcpkg/versions/n-/nss.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "761d0ded1579714c014fed176818feb0b07b953f",
+      "version": "3.87",
+      "port-version": 2
+    },
+    {
+      "git-tree": "3ee50028600372dc454e15907e4f3168463c5570",
+      "version": "3.87",
+      "port-version": 1
+    },
     {
       "git-tree": "dde235e6a76604d088e7fc8701354fea880c1065",
       "version": "3.87",
diff --git a/external_imported/vcpkg/versions/n-/nsync.json b/external_imported/vcpkg/versions/n-/nsync.json
index e88b93ba9..810d7003e 100644
--- a/external_imported/vcpkg/versions/n-/nsync.json
+++ b/external_imported/vcpkg/versions/n-/nsync.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2861341c0435829734827dc84d7166d95d8e8bee",
+      "version": "1.26.0",
+      "port-version": 0
+    },
     {
       "git-tree": "f2333cb932309608aa164aadaacb8d4592c71068",
       "version": "1.24.0",
diff --git a/external_imported/vcpkg/versions/n-/nt-wrapper.json b/external_imported/vcpkg/versions/n-/nt-wrapper.json
index db8f024b3..e823b9be1 100644
--- a/external_imported/vcpkg/versions/n-/nt-wrapper.json
+++ b/external_imported/vcpkg/versions/n-/nt-wrapper.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "dca74052bdbd3af026eb8b37e3222beed0a43276",
+      "version-date": "2019-08-10",
+      "port-version": 3
+    },
     {
       "git-tree": "57d9be46d1ad11b6438efd40a0392c78ddbcfd9a",
       "version-string": "2019-08-10",
diff --git a/external_imported/vcpkg/versions/n-/ntf-core.json b/external_imported/vcpkg/versions/n-/ntf-core.json
new file mode 100644
index 000000000..ce960fee5
--- /dev/null
+++ b/external_imported/vcpkg/versions/n-/ntf-core.json
@@ -0,0 +1,14 @@
+{
+    "versions": [
+        {
+            "version": "2.1.0",
+            "port-version": 1,
+            "git-tree": "1e517e2393650769e701f62317e905a3f1776367"   
+        },
+        {
+            "version": "2.1.0",
+            "port-version": 0,
+            "git-tree": "eabeb2b30205bef45e72e4a069f21d71797f3f5d"   
+        }
+    ]
+}
diff --git a/external_imported/vcpkg/versions/n-/nu-book-zxing-cpp.json b/external_imported/vcpkg/versions/n-/nu-book-zxing-cpp.json
index 71bb7e9d0..d64d4ed44 100644
--- a/external_imported/vcpkg/versions/n-/nu-book-zxing-cpp.json
+++ b/external_imported/vcpkg/versions/n-/nu-book-zxing-cpp.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "032cebebe24ebafeffe077cd64808235cbcbe453",
+      "version": "2.1.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d4cd1e936d33ae825fc57284f37bd29b1b0b08c5",
+      "version": "2.0.0",
+      "port-version": 1
+    },
     {
       "git-tree": "78c8636186395a676c941dc214b01d4576d643b6",
       "version": "2.0.0",
diff --git a/external_imported/vcpkg/versions/n-/numactl.json b/external_imported/vcpkg/versions/n-/numactl.json
index ce482e60d..5b4733bd4 100644
--- a/external_imported/vcpkg/versions/n-/numactl.json
+++ b/external_imported/vcpkg/versions/n-/numactl.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "b849a1a9049852792f8441dece9ee35964dec1de",
+      "version": "2.0.17",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2a43cd7692e36347f0bef1c92c982253051f9027",
+      "version": "2.0.16",
+      "port-version": 0
+    },
     {
       "git-tree": "38b7d6feca43ff05b6a059aae8ce218fa382853e",
       "version": "2.0.14",
diff --git a/external_imported/vcpkg/versions/n-/numcpp.json b/external_imported/vcpkg/versions/n-/numcpp.json
index 6d168e28a..1374bff88 100644
--- a/external_imported/vcpkg/versions/n-/numcpp.json
+++ b/external_imported/vcpkg/versions/n-/numcpp.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "7a6e04f1febb3a78dbb37c375e8e0b322802c244",
+      "version": "2.12.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "aa42201ab3a189b38031fe0d912e3d62e9a44b8f",
+      "version": "2.11.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "99f0dc5efa2ee18b46af92901b34426516cf3390",
+      "version": "2.10.1",
+      "port-version": 0
+    },
     {
       "git-tree": "648047125e8e78a10fec23ab02b10037197206a6",
       "version": "2.6.0",
diff --git a/external_imported/vcpkg/versions/n-/nuspell.json b/external_imported/vcpkg/versions/n-/nuspell.json
index 3e29a9478..5914d4e88 100644
--- a/external_imported/vcpkg/versions/n-/nuspell.json
+++ b/external_imported/vcpkg/versions/n-/nuspell.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "060ff508c132af5317809061a91139e6e99f3fda",
+      "version-semver": "5.1.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a9dfb4c97779fd3bd294df93a76aa309578949c9",
+      "version-semver": "5.1.2",
+      "port-version": 1
+    },
     {
       "git-tree": "6175a848b3c05c1adf0816f1b3b4dd056c12ed40",
       "version-semver": "5.1.2",
diff --git a/external_imported/vcpkg/versions/n-/nyan-lang.json b/external_imported/vcpkg/versions/n-/nyan-lang.json
new file mode 100644
index 000000000..d686edb3f
--- /dev/null
+++ b/external_imported/vcpkg/versions/n-/nyan-lang.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "63356577d6522c8d99dd8bb9214d9808f7f115b6",
+      "version": "0.3",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/o-/oatpp-sqlite.json b/external_imported/vcpkg/versions/o-/oatpp-sqlite.json
index c10220090..cb55ebcdb 100644
--- a/external_imported/vcpkg/versions/o-/oatpp-sqlite.json
+++ b/external_imported/vcpkg/versions/o-/oatpp-sqlite.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9bde9ba480ed1c17d74a09b924c849595f795b9c",
+      "version": "1.3.0",
+      "port-version": 2
+    },
     {
       "git-tree": "b28e241610e463b41e9c3e3f16f5805b19fb5fa5",
       "version": "1.3.0",
diff --git a/external_imported/vcpkg/versions/o-/oatpp-zlib.json b/external_imported/vcpkg/versions/o-/oatpp-zlib.json
index a07cde70d..cf9a15841 100644
--- a/external_imported/vcpkg/versions/o-/oatpp-zlib.json
+++ b/external_imported/vcpkg/versions/o-/oatpp-zlib.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d73da3c88835636ace280c7a29fa13fbcde0b2d8",
+      "version": "1.3.0",
+      "port-version": 2
+    },
     {
       "git-tree": "0f40812d2446d50d41add9deba46e0baa042ac53",
       "version": "1.3.0",
diff --git a/external_imported/vcpkg/versions/o-/oatpp.json b/external_imported/vcpkg/versions/o-/oatpp.json
index aad89efa1..ec85c0c1e 100644
--- a/external_imported/vcpkg/versions/o-/oatpp.json
+++ b/external_imported/vcpkg/versions/o-/oatpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "36f425ca9c764945b824bfe5ff506fe09a5361d8",
+      "version": "1.3.0",
+      "port-version": 2
+    },
     {
       "git-tree": "f3700f7d93bbb8922878c25705d0e00cd7049066",
       "version": "1.3.0",
diff --git a/external_imported/vcpkg/versions/o-/oboe.json b/external_imported/vcpkg/versions/o-/oboe.json
new file mode 100644
index 000000000..90d279467
--- /dev/null
+++ b/external_imported/vcpkg/versions/o-/oboe.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "844ba873a3df24fb50fcb6fc5deef22642dfccb1",
+      "version": "1.8.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/o-/observer-ptr-lite.json b/external_imported/vcpkg/versions/o-/observer-ptr-lite.json
index 122b57582..798e6706c 100644
--- a/external_imported/vcpkg/versions/o-/observer-ptr-lite.json
+++ b/external_imported/vcpkg/versions/o-/observer-ptr-lite.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "444c3b0a5c01cee300caac2c33b3cc738a2dc988",
+      "version": "0.4.0",
+      "port-version": 3
+    },
     {
       "git-tree": "c85545f2cf9bab22c6e35c60723c3cc594a6bd49",
       "version-string": "0.4.0",
diff --git a/external_imported/vcpkg/versions/o-/ocilib.json b/external_imported/vcpkg/versions/o-/ocilib.json
index b9f09c0c9..5538b2cfb 100644
--- a/external_imported/vcpkg/versions/o-/ocilib.json
+++ b/external_imported/vcpkg/versions/o-/ocilib.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "8b2fb9dbc546b1b9853f48e5bd9ed971d791c730",
+      "version": "4.7.6",
+      "port-version": 0
+    },
+    {
+      "git-tree": "1e3f69c5100f621f5d80f87ae669626be2f88e59",
+      "version": "4.7.5",
+      "port-version": 3
+    },
+    {
+      "git-tree": "2e11027c9b427b4c46e47227da9ce270119f6ea1",
+      "version": "4.7.5",
+      "port-version": 2
+    },
+    {
+      "git-tree": "9a48c5a6650bc58fdea2fe06d75c3347d89e483a",
+      "version": "4.7.5",
+      "port-version": 1
+    },
     {
       "git-tree": "e77dfc3008f996ea2defcaf771f46d33d81a4470",
       "version": "4.7.5",
diff --git a/external_imported/vcpkg/versions/o-/octomap.json b/external_imported/vcpkg/versions/o-/octomap.json
index b12660857..a458c41f9 100644
--- a/external_imported/vcpkg/versions/o-/octomap.json
+++ b/external_imported/vcpkg/versions/o-/octomap.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "18c703e99a9e7da9184b9ebcee3ddfa80d66502e",
+      "version": "1.9.8",
+      "port-version": 1
+    },
+    {
+      "git-tree": "d24dd4ca217fd0e4b7fcb86301556f96d8f8d0c7",
+      "version": "1.9.8",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b778b0aef20fee697a18865995fff021501e8509",
+      "version": "1.9.6",
+      "port-version": 1
+    },
     {
       "git-tree": "b6146ecee8dcf9ba6573d11f26c1574e89c546d8",
       "version": "1.9.6",
diff --git a/external_imported/vcpkg/versions/o-/ode.json b/external_imported/vcpkg/versions/o-/ode.json
index abd69349d..79ef9cd1f 100644
--- a/external_imported/vcpkg/versions/o-/ode.json
+++ b/external_imported/vcpkg/versions/o-/ode.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "33843f7332287ffa6dab9f56ad9967f0a5afd061",
+      "version": "0.16.4",
+      "port-version": 1
+    },
+    {
+      "git-tree": "46b8d731d701f329ee4dd983ea196bddf1e32545",
+      "version": "0.16.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a60eef1df499ade4a7442bd3caa8a7e684aedb72",
+      "version": "0.16.3",
+      "port-version": 1
+    },
     {
       "git-tree": "254c6b22b73ff9ce79f38f282f61cd85ca590128",
       "version": "0.16.3",
diff --git a/external_imported/vcpkg/versions/o-/ogre-next.json b/external_imported/vcpkg/versions/o-/ogre-next.json
index 535b7c4dd..9cc87644b 100644
--- a/external_imported/vcpkg/versions/o-/ogre-next.json
+++ b/external_imported/vcpkg/versions/o-/ogre-next.json
@@ -1,5 +1,45 @@
 {
   "versions": [
+    {
+      "git-tree": "1563ee76136a49e438bd5229b68635ce8fdc347a",
+      "version": "2.3.3",
+      "port-version": 2
+    },
+    {
+      "git-tree": "92372bf7078f6e5f955072f35696788f09849b71",
+      "version": "2.3.3",
+      "port-version": 1
+    },
+    {
+      "git-tree": "ecf4c650a53fe5d7427f5fcb1e28302d42aad2c7",
+      "version": "2.3.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e79346cd0f83209b8d6b14b8d486971918013ce9",
+      "version": "2.3.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9005bf2b8f0d060493c44cd2c2f49d411faa2141",
+      "version": "2.3.1",
+      "port-version": 4
+    },
+    {
+      "git-tree": "c93cd3ebf7b2a50082e97f5f7a6f4ed1cf1f5c94",
+      "version": "2.3.1",
+      "port-version": 3
+    },
+    {
+      "git-tree": "0089cd2cc3d48d19a5b465f43454dfb0124f9723",
+      "version": "2.3.1",
+      "port-version": 2
+    },
+    {
+      "git-tree": "6af271c0d09d27f6cea912e0b3f81a310d3992be",
+      "version": "2.3.1",
+      "port-version": 1
+    },
     {
       "git-tree": "41790e82daaddc561ebaf5ea9f589bd2e148e31a",
       "version": "2.3.1",
diff --git a/external_imported/vcpkg/versions/o-/ogre.json b/external_imported/vcpkg/versions/o-/ogre.json
index 028117c83..a8b9511de 100644
--- a/external_imported/vcpkg/versions/o-/ogre.json
+++ b/external_imported/vcpkg/versions/o-/ogre.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "a445b3c7be57d018422e139945ff622292cd5cff",
+      "version": "14.0.1",
+      "port-version": 2
+    },
+    {
+      "git-tree": "ba65238d3998c84df40961d63f7c254fbac7639d",
+      "version": "14.0.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "d244c75813c1f05a64a4a763166fa4f8e3e63eb0",
+      "version": "14.0.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c8e30fd12c47569a6d5eb430db1393a1a5143686",
+      "version": "13.6.2",
+      "port-version": 3
+    },
+    {
+      "git-tree": "9a0701fa116eca04bd8a2446f6e44c732084857b",
+      "version": "13.6.2",
+      "port-version": 2
+    },
+    {
+      "git-tree": "b7ec525c0cd854d1da91a5a11cd05109693b9333",
+      "version": "13.6.2",
+      "port-version": 1
+    },
     {
       "git-tree": "dda1cee749cebb6fc251073a702e6a698fd4521e",
       "version": "13.6.2",
diff --git a/external_imported/vcpkg/versions/o-/omniorb.json b/external_imported/vcpkg/versions/o-/omniorb.json
new file mode 100644
index 000000000..50dbc8ff6
--- /dev/null
+++ b/external_imported/vcpkg/versions/o-/omniorb.json
@@ -0,0 +1,19 @@
+{
+  "versions": [
+    {
+      "git-tree": "cca89d0b204e2a74c3e822ef7f8b4878886239d4",
+      "version": "4.3.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "a03b9df1f3ad5b4d5de0b3bc278af0ff52d06703",
+      "version": "4.3.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "51fa63a0e4615dd806fd5ac4cd532f81123ddd4d",
+      "version": "4.3.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/o-/omniverse-physx-sdk.json b/external_imported/vcpkg/versions/o-/omniverse-physx-sdk.json
new file mode 100644
index 000000000..d2a262726
--- /dev/null
+++ b/external_imported/vcpkg/versions/o-/omniverse-physx-sdk.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "58beb4786b3ae288d6412d1ca9140c33ef1b2cb7",
+      "version": "5.2.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b52f26ab4b10a8ff473da92959ba29ce9d297711",
+      "version": "5.1.3",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/o-/onednn.json b/external_imported/vcpkg/versions/o-/onednn.json
index 5155c1a25..00f5c2a6f 100644
--- a/external_imported/vcpkg/versions/o-/onednn.json
+++ b/external_imported/vcpkg/versions/o-/onednn.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "77f9320fe4e3c1452838c1fd098239b0a4c8e4b4",
+      "version": "3.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "151a4ce15e279a44a305bc438e5beed45c7054b9",
+      "version": "3.1.1",
+      "port-version": 0
+    },
     {
       "git-tree": "8d9dad8bf4f6fa7eae90870c5c3aac1ec4346f40",
       "version": "3.0.0",
diff --git a/external_imported/vcpkg/versions/o-/onnx-optimizer.json b/external_imported/vcpkg/versions/o-/onnx-optimizer.json
index 3a6bc01dc..8833f7dc1 100644
--- a/external_imported/vcpkg/versions/o-/onnx-optimizer.json
+++ b/external_imported/vcpkg/versions/o-/onnx-optimizer.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "e574f424edd5d2fd9ca36c5058f96163d9018725",
+      "version-semver": "0.3.18",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0bc5be29ebb8c6a63883d7e76fab6c2613273384",
+      "version-semver": "0.3.17",
+      "port-version": 0
+    },
     {
       "git-tree": "e98d775d36ccb84c9ffa20e2cf6f8ef1b7ab0461",
       "version-semver": "0.2.6",
diff --git a/external_imported/vcpkg/versions/o-/onnx.json b/external_imported/vcpkg/versions/o-/onnx.json
index a954f4936..cf05c4756 100644
--- a/external_imported/vcpkg/versions/o-/onnx.json
+++ b/external_imported/vcpkg/versions/o-/onnx.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "c143b899cbe396d82182568746203a3375fc23df",
+      "version-semver": "1.15.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "1937b77767085a7447df95efbe366e1d098a9b53",
+      "version-semver": "1.14.0",
+      "port-version": 0
+    },
     {
       "git-tree": "9b31a613878d713e6573b82752f4aa6b78e71820",
       "version-semver": "1.13.1",
diff --git a/external_imported/vcpkg/versions/o-/onnxruntime-gpu.json b/external_imported/vcpkg/versions/o-/onnxruntime-gpu.json
index aade8e0e7..beee180b6 100644
--- a/external_imported/vcpkg/versions/o-/onnxruntime-gpu.json
+++ b/external_imported/vcpkg/versions/o-/onnxruntime-gpu.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "77632d67293cb70293c7fd22a3897e48c6efabe4",
+      "version": "1.16.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3836c30f0e39aa6c9f9a9dbfa8f146e3ae5e97cf",
+      "version": "1.15.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "7b91d7cf9e629be0d5581c85e8520a1850d0bf2a",
+      "version": "1.14.1",
+      "port-version": 1
+    },
     {
       "git-tree": "74bcaaeb54e99b6aee5e6c7560e6fa9935bcbf28",
       "version": "1.14.1",
diff --git a/external_imported/vcpkg/versions/o-/open62541.json b/external_imported/vcpkg/versions/o-/open62541.json
index 30f520ebd..6b9644191 100644
--- a/external_imported/vcpkg/versions/o-/open62541.json
+++ b/external_imported/vcpkg/versions/o-/open62541.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "2cab251773b17791187e59d83a27ec09d344a49c",
+      "version": "1.3.9",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6bfbedbf2007596294583ab894f5481d754991f2",
+      "version": "1.3.8",
+      "port-version": 2
+    },
+    {
+      "git-tree": "66034a6a77c3169eba0a175a4b67fe2ad3eab48b",
+      "version": "1.3.8",
+      "port-version": 1
+    },
+    {
+      "git-tree": "a50cf77d055c6249b2568880f61fb72b8f916d62",
+      "version": "1.3.8",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3f1e010d847419f3f68439f1ad1d76df9b118f26",
+      "version": "1.3.5",
+      "port-version": 1
+    },
+    {
+      "git-tree": "e7412d5c63f5b77eb06f485b7fb89bb718b2f712",
+      "version": "1.3.5",
+      "port-version": 0
+    },
     {
       "git-tree": "78181e46126a93ba6bbea749a985ba675fb53c03",
       "version": "1.2.3",
diff --git a/external_imported/vcpkg/versions/o-/open62541pp.json b/external_imported/vcpkg/versions/o-/open62541pp.json
new file mode 100644
index 000000000..e5da22e4f
--- /dev/null
+++ b/external_imported/vcpkg/versions/o-/open62541pp.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "28d7aa666af8c2b3db214bb936678fc5bd1798cf",
+      "version": "0.11.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/o-/openal-soft.json b/external_imported/vcpkg/versions/o-/openal-soft.json
index 125d81210..d4a0000ab 100644
--- a/external_imported/vcpkg/versions/o-/openal-soft.json
+++ b/external_imported/vcpkg/versions/o-/openal-soft.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "d23d6573247830bd439e418fe0e31321de778d85",
+      "version": "1.23.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "98c0f637759df2df98bf090cb115ad19cc2fdc06",
+      "version": "1.23.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "2179403cae57a853e75e3d30363750c39e370bc6",
+      "version": "1.23.0",
+      "port-version": 1
+    },
     {
       "git-tree": "3c25d8ead902160593b570f4696cf2eba2d86511",
       "version": "1.23.0",
diff --git a/external_imported/vcpkg/versions/o-/openblas.json b/external_imported/vcpkg/versions/o-/openblas.json
index ee9384a20..a36deac02 100644
--- a/external_imported/vcpkg/versions/o-/openblas.json
+++ b/external_imported/vcpkg/versions/o-/openblas.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "3fde0f066aa319941b8f352596f28a92f099b2f5",
+      "version": "0.3.26",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4c2a355bc21475a2a4a69f6a3c227f54efc5c425",
+      "version": "0.3.25",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c876665c0fa5b8d427ee9cadd4185a1a08d008da",
+      "version": "0.3.24",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d701021ccf4a0729f77788b2d90da377bfdd1486",
+      "version": "0.3.23",
+      "port-version": 1
+    },
+    {
+      "git-tree": "716c00140c032ec22773130b006af542e011f00e",
+      "version": "0.3.23",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ad5694adc46ca2974329e57896d0097e80d65c7d",
+      "version": "0.3.21",
+      "port-version": 2
+    },
     {
       "git-tree": "86949dd1db1c79ae88f2354225c4363e7200ad66",
       "version": "0.3.21",
diff --git a/external_imported/vcpkg/versions/o-/opencascade.json b/external_imported/vcpkg/versions/o-/opencascade.json
index 9938358af..faefcd83b 100644
--- a/external_imported/vcpkg/versions/o-/opencascade.json
+++ b/external_imported/vcpkg/versions/o-/opencascade.json
@@ -1,5 +1,60 @@
 {
   "versions": [
+    {
+      "git-tree": "b53f4c5f2a5e1b878488d7076761faf6284bfc32",
+      "version": "7.8.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "cff97ecb51449af3dc81c849ba7ceb36eedd4917",
+      "version": "7.7.2",
+      "port-version": 3
+    },
+    {
+      "git-tree": "2b1d21c510a4aa414a64ac5e2e46fa0767ff76b1",
+      "version": "7.7.2",
+      "port-version": 2
+    },
+    {
+      "git-tree": "8e9c9fb982bef129111ea811c3948ffd570a16dc",
+      "version": "7.7.2",
+      "port-version": 1
+    },
+    {
+      "git-tree": "5eb5e2e8cacf7653315ee887ad2d19e0e5ab5d7f",
+      "version": "7.7.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "23b7ba4d766b45ff9e93dae282a3f8e461a57dcc",
+      "version": "7.6.2",
+      "port-version": 7
+    },
+    {
+      "git-tree": "3a62400394101d54a0bea8a45ac0c1f68cf27b68",
+      "version": "7.6.2",
+      "port-version": 6
+    },
+    {
+      "git-tree": "c368cdc0775dea309e247518b3931795487cb5f0",
+      "version": "7.6.2",
+      "port-version": 5
+    },
+    {
+      "git-tree": "935cc481bbce6ae22ed3257376f0a3edb198d3e2",
+      "version": "7.6.2",
+      "port-version": 4
+    },
+    {
+      "git-tree": "3bf7c68565ee022f685f20eb18bb2e38cfdffb17",
+      "version": "7.6.2",
+      "port-version": 3
+    },
+    {
+      "git-tree": "58939d51b0f33a014e48f1d7100ab8888d068c2d",
+      "version": "7.6.2",
+      "port-version": 2
+    },
     {
       "git-tree": "137097588b2328c3d7f66c4f0e46e6e4fe1559cf",
       "version": "7.6.2",
diff --git a/external_imported/vcpkg/versions/o-/opencl.json b/external_imported/vcpkg/versions/o-/opencl.json
index f96750ab2..73222e54e 100644
--- a/external_imported/vcpkg/versions/o-/opencl.json
+++ b/external_imported/vcpkg/versions/o-/opencl.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "c55e82e4ec70906ec28b692d2625584025de4725",
+      "version-string": "v2023.02.06",
+      "port-version": 2
+    },
+    {
+      "git-tree": "d206a1716a411eb9862c98d65ab3552def0c6492",
+      "version-string": "v2023.02.06",
+      "port-version": 1
+    },
+    {
+      "git-tree": "2bdf9379777f48897786b5a69d395325c0eb4aec",
+      "version-string": "v2023.02.06",
+      "port-version": 0
+    },
     {
       "git-tree": "6deb90df8f43de66c9ff5f5c71f2aa0fdc0c015c",
       "version-string": "v2022.09.30",
diff --git a/external_imported/vcpkg/versions/o-/opencolorio.json b/external_imported/vcpkg/versions/o-/opencolorio.json
index 4d749dfe2..469b9749c 100644
--- a/external_imported/vcpkg/versions/o-/opencolorio.json
+++ b/external_imported/vcpkg/versions/o-/opencolorio.json
@@ -1,8 +1,13 @@
 {
   "versions": [
     {
-      "git-tree": "d728bb2681e89ffbe9c6e1ec2811d5d194d9fd09",
-      "version-semver": "2.1.2",
+      "git-tree": "661b43b1d2c452e40476bbb64bb6e68dfc437c7b",
+      "version-semver": "2.2.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "d5c69dc2c181e658e67ba57e3836a548c469477a",
+      "version-semver": "2.2.1",
       "port-version": 0
     },
     {
diff --git a/external_imported/vcpkg/versions/o-/opencsg.json b/external_imported/vcpkg/versions/o-/opencsg.json
index 818722052..d6e513e33 100644
--- a/external_imported/vcpkg/versions/o-/opencsg.json
+++ b/external_imported/vcpkg/versions/o-/opencsg.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "48c6aea4f747325a26bec13cf9a93f94c21f4fd2",
+      "version": "1.4.2",
+      "port-version": 4
+    },
     {
       "git-tree": "05f30c495ec6a79342b90446b3ecfe63c5f0edde",
       "version-string": "1.4.2",
diff --git a/external_imported/vcpkg/versions/o-/opencv.json b/external_imported/vcpkg/versions/o-/opencv.json
index e26c65f35..492a0b94b 100644
--- a/external_imported/vcpkg/versions/o-/opencv.json
+++ b/external_imported/vcpkg/versions/o-/opencv.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "bc3a2d25b8cca6c318cdd710381ca152b18ae3cd",
+      "version": "4.8.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "50df5c317df5af01b65a405e31a86e9a7ceead1c",
+      "version": "4.8.0",
+      "port-version": 0
+    },
     {
       "git-tree": "7c13270745cf85fc4146cd4f21ee4f71eb2ca7e1",
       "version": "4.7.0",
diff --git a/external_imported/vcpkg/versions/o-/opencv2.json b/external_imported/vcpkg/versions/o-/opencv2.json
index 0931d6612..1d218ef46 100644
--- a/external_imported/vcpkg/versions/o-/opencv2.json
+++ b/external_imported/vcpkg/versions/o-/opencv2.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "7a4e55d470b2cff8fddb4f6f44ab15b4b5c0f603",
+      "version": "2.4.13.7",
+      "port-version": 19
+    },
+    {
+      "git-tree": "246c2e39fa6e117cbea4548446b7f66909de3329",
+      "version": "2.4.13.7",
+      "port-version": 18
+    },
+    {
+      "git-tree": "0a9a6ab1907e36f372e3b379dcd1ddc7cfd96980",
+      "version": "2.4.13.7",
+      "port-version": 17
+    },
     {
       "git-tree": "27ef38b20b5788492a6a27370160f435b7d71502",
       "version": "2.4.13.7",
diff --git a/external_imported/vcpkg/versions/o-/opencv3.json b/external_imported/vcpkg/versions/o-/opencv3.json
index f75ec971a..832720a0a 100644
--- a/external_imported/vcpkg/versions/o-/opencv3.json
+++ b/external_imported/vcpkg/versions/o-/opencv3.json
@@ -1,5 +1,40 @@
 {
   "versions": [
+    {
+      "git-tree": "577dd8933e58290664f4290476069978692ed4f2",
+      "version": "3.4.18",
+      "port-version": 13
+    },
+    {
+      "git-tree": "f5ee69ffa1b6c98a28fc805afffaeb799b4d22a8",
+      "version": "3.4.18",
+      "port-version": 12
+    },
+    {
+      "git-tree": "8eca838beb277535a53756ceb5da17aa8b5050a8",
+      "version": "3.4.18",
+      "port-version": 11
+    },
+    {
+      "git-tree": "b66d5bf3d61ae3bd5e71952b7642658d8562ae5d",
+      "version": "3.4.18",
+      "port-version": 10
+    },
+    {
+      "git-tree": "402e9aac0f32db08e2d69f70ba6384f8c7bf4733",
+      "version": "3.4.18",
+      "port-version": 9
+    },
+    {
+      "git-tree": "e026bd638aec52f279cbf10d7e75a0f6ca03feb6",
+      "version": "3.4.18",
+      "port-version": 8
+    },
+    {
+      "git-tree": "e28602bbfb118017bb2bf45795e0bfd9900af4dc",
+      "version": "3.4.18",
+      "port-version": 7
+    },
     {
       "git-tree": "2b9cff1ffb1822e359c63e291e1377af4b831c09",
       "version": "3.4.18",
diff --git a/external_imported/vcpkg/versions/o-/opencv4.json b/external_imported/vcpkg/versions/o-/opencv4.json
index 1890c4fbe..5752ba2e0 100644
--- a/external_imported/vcpkg/versions/o-/opencv4.json
+++ b/external_imported/vcpkg/versions/o-/opencv4.json
@@ -1,5 +1,100 @@
 {
   "versions": [
+    {
+      "git-tree": "ec4e040d476cee60b2fc21a1f847d30905ac9726",
+      "version": "4.8.0",
+      "port-version": 15
+    },
+    {
+      "git-tree": "852583d8f7a5bb15998efad9c0305a8ce686e59b",
+      "version": "4.8.0",
+      "port-version": 14
+    },
+    {
+      "git-tree": "757561dc37010d966ad90a8a1f7d2942e9286154",
+      "version": "4.8.0",
+      "port-version": 13
+    },
+    {
+      "git-tree": "c3d46b66df37511cf7b49ceffe96f5ff62acf6ea",
+      "version": "4.8.0",
+      "port-version": 12
+    },
+    {
+      "git-tree": "9d3433d44aaf404378dff91625448de76738a95f",
+      "version": "4.8.0",
+      "port-version": 11
+    },
+    {
+      "git-tree": "83f4fcf20bc429d1a01edb9fdf423ef78d18c9b6",
+      "version": "4.8.0",
+      "port-version": 10
+    },
+    {
+      "git-tree": "7ed8c48a9b2be5df262ccbcfa876f5314f429c10",
+      "version": "4.8.0",
+      "port-version": 9
+    },
+    {
+      "git-tree": "48c97b54fceaef9a96d374693f47e3ea91383f3c",
+      "version": "4.8.0",
+      "port-version": 8
+    },
+    {
+      "git-tree": "ef78c1958b122045e9d1e353150049431b3162fa",
+      "version": "4.8.0",
+      "port-version": 7
+    },
+    {
+      "git-tree": "6a1280a0a3854032ba4ae9172b509ce46f81795f",
+      "version": "4.8.0",
+      "port-version": 6
+    },
+    {
+      "git-tree": "6deec5bdb97d4d3a667aa10e31698ce54abdc9a7",
+      "version": "4.8.0",
+      "port-version": 5
+    },
+    {
+      "git-tree": "0d0ef2f6aa4911ca1cf367093c0b6a89cea97fe3",
+      "version": "4.8.0",
+      "port-version": 4
+    },
+    {
+      "git-tree": "d22421d8b63a7e2221f91520e9dcfcce1ca7bb48",
+      "version": "4.8.0",
+      "port-version": 3
+    },
+    {
+      "git-tree": "89d6da3b45b7e1667bdc3083f9641e57ad4930a9",
+      "version": "4.8.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "78f4556a682ebb41e2ff3f26090ef51cafe5a66c",
+      "version": "4.8.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "0bae188d52a71f441df28b25278e5506502dfd03",
+      "version": "4.8.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d435a87c7a3f4dd38d623503d5200abe65c249d1",
+      "version": "4.7.0",
+      "port-version": 6
+    },
+    {
+      "git-tree": "0c3c175e672cc3a6f0d1465adba8a40a042ff717",
+      "version": "4.7.0",
+      "port-version": 5
+    },
+    {
+      "git-tree": "99e88adacfd87e496dddba403025e0fdd3b336b7",
+      "version": "4.7.0",
+      "port-version": 4
+    },
     {
       "git-tree": "ca4b616630bef409960661592549086539a7e28e",
       "version": "4.7.0",
diff --git a/external_imported/vcpkg/versions/o-/openexr.json b/external_imported/vcpkg/versions/o-/openexr.json
index 66544b75c..05859ca34 100644
--- a/external_imported/vcpkg/versions/o-/openexr.json
+++ b/external_imported/vcpkg/versions/o-/openexr.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "c3823a9121b31308e654b79c1be1dd2d3f195f4c",
+      "version": "3.1.8",
+      "port-version": 1
+    },
+    {
+      "git-tree": "36064f5fe46f2399a9a532fdb6d7542dae7faede",
+      "version": "3.1.8",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5bf66027763e861e804aee6113c5afc8bb0e1e7e",
+      "version": "3.1.7",
+      "port-version": 0
+    },
     {
       "git-tree": "1bdfd5d68efb96110d15fb1244b7413f1a5edcfe",
       "version": "3.1.5",
diff --git a/external_imported/vcpkg/versions/o-/openigtlink.json b/external_imported/vcpkg/versions/o-/openigtlink.json
index 3b952b491..313fab899 100644
--- a/external_imported/vcpkg/versions/o-/openigtlink.json
+++ b/external_imported/vcpkg/versions/o-/openigtlink.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "519e18eaedd0beb68be3be8cd58f0877e3c40107",
+      "version": "3.0",
+      "port-version": 4
+    },
     {
       "git-tree": "b6ceb757ce8cc6ee189d7d2adb5df6b3cc0da87d",
       "version-string": "3.0",
diff --git a/external_imported/vcpkg/versions/o-/openimageio.json b/external_imported/vcpkg/versions/o-/openimageio.json
index 809e78e2d..22f1419ab 100644
--- a/external_imported/vcpkg/versions/o-/openimageio.json
+++ b/external_imported/vcpkg/versions/o-/openimageio.json
@@ -1,5 +1,40 @@
 {
   "versions": [
+    {
+      "git-tree": "76cadb5ec79b57f840f2dae9dc39501b027f6a9f",
+      "version": "2.4.14.0",
+      "port-version": 3
+    },
+    {
+      "git-tree": "fed3a9ba9a7731e30376ded1d6bdaba3e41b1ec6",
+      "version": "2.4.14.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "c74249169c46dbedf60590f672fb709294ffc7c6",
+      "version": "2.4.14.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "965f6cf8bde18cb53a219f9b61b5099105b7fd2f",
+      "version": "2.4.14.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "1d6d564f1848ae68ece423fa0597c8a5fe6c9d5d",
+      "version": "2.4.13.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "7c06030b088b87143ff7a85c23af606bbd967496",
+      "version": "2.4.11.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "34493d776df3b1fee4ba5e01c882d1237a135362",
+      "version": "2.4.9.0",
+      "port-version": 1
+    },
     {
       "git-tree": "82fe27ff1713dd3f0fbaaa7399257fc4d56cf1b0",
       "version": "2.4.9.0",
diff --git a/external_imported/vcpkg/versions/o-/openjpeg.json b/external_imported/vcpkg/versions/o-/openjpeg.json
index e49ff61f4..1909da474 100644
--- a/external_imported/vcpkg/versions/o-/openjpeg.json
+++ b/external_imported/vcpkg/versions/o-/openjpeg.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "608f895171abcfb72dd690a0f7121d265d0904b5",
+      "version": "2.5.0",
+      "port-version": 1
+    },
     {
       "git-tree": "3451436f9bb5f5ad8946b45868929488fe2c39dd",
       "version": "2.5.0",
diff --git a/external_imported/vcpkg/versions/o-/openldap.json b/external_imported/vcpkg/versions/o-/openldap.json
index 293f8b15a..7bee389de 100644
--- a/external_imported/vcpkg/versions/o-/openldap.json
+++ b/external_imported/vcpkg/versions/o-/openldap.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0e20086782fc80cf2c6571a54237e86d0cadf84e",
+      "version": "2.5.13",
+      "port-version": 1
+    },
     {
       "git-tree": "63f4c67d336142daba83711983e54a8954794331",
       "version": "2.5.13",
diff --git a/external_imported/vcpkg/versions/o-/openmama.json b/external_imported/vcpkg/versions/o-/openmama.json
index cddac1661..dd9543a4e 100644
--- a/external_imported/vcpkg/versions/o-/openmama.json
+++ b/external_imported/vcpkg/versions/o-/openmama.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "f6db41ddb8cabc06e9df68962e43d64b7e1ab7b7",
+      "version-semver": "6.3.2",
+      "port-version": 3
+    },
+    {
+      "git-tree": "e1a0265c65af044c234b3724715e089272679d40",
+      "version-semver": "6.3.2",
+      "port-version": 2
+    },
+    {
+      "git-tree": "0a928ad97fe18f50da889c2e468f5070d1c4e4b6",
+      "version-semver": "6.3.2",
+      "port-version": 1
+    },
+    {
+      "git-tree": "a385a51389791fdee1a47efdcfec5fffa7c4cbd3",
+      "version-semver": "6.3.2",
+      "port-version": 0
+    },
     {
       "git-tree": "e5f4f2e62bf5825132077e6abf19b99014a91755",
       "version-semver": "6.3.1",
diff --git a/external_imported/vcpkg/versions/o-/openmesh.json b/external_imported/vcpkg/versions/o-/openmesh.json
index 57c17bf4e..ebb2825e3 100644
--- a/external_imported/vcpkg/versions/o-/openmesh.json
+++ b/external_imported/vcpkg/versions/o-/openmesh.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "bea5d6796009e8156570bbfae1c9fb60d86d7286",
+      "version": "10.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8228f40bfdd38a2049f284b9a1d0b6e58ce86c57",
+      "version": "9.0",
+      "port-version": 2
+    },
     {
       "git-tree": "8df48dff71b98687732978a2fa7a44083d6c9cd3",
       "version": "9.0",
diff --git a/external_imported/vcpkg/versions/o-/openmpi.json b/external_imported/vcpkg/versions/o-/openmpi.json
index a4277359d..62d674300 100644
--- a/external_imported/vcpkg/versions/o-/openmpi.json
+++ b/external_imported/vcpkg/versions/o-/openmpi.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "a63c7aeb8e42d6ebdac726767ec7a0ba46ddf86f",
+      "version": "4.1.6",
+      "port-version": 1
+    },
+    {
+      "git-tree": "a35bc145d32795f1a71cbe596de040805c3af780",
+      "version": "4.1.6",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0958d31a6843d3961c39fb6d459543d9be852bad",
+      "version": "4.1.3",
+      "port-version": 2
+    },
     {
       "git-tree": "c24d22620b08b5839cf13480633e6a736fb5a038",
       "version": "4.1.3",
diff --git a/external_imported/vcpkg/versions/o-/openmvg.json b/external_imported/vcpkg/versions/o-/openmvg.json
index 2597f7c00..e1a853297 100644
--- a/external_imported/vcpkg/versions/o-/openmvg.json
+++ b/external_imported/vcpkg/versions/o-/openmvg.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "6ddaa3bedcc57eb498c9e180bb8546a2726a1ddc",
+      "version": "2.0",
+      "port-version": 9
+    },
+    {
+      "git-tree": "3712d684593f777107e58a37bf601083a6351738",
+      "version": "2.0",
+      "port-version": 8
+    },
+    {
+      "git-tree": "58d0c2b4b7785f8ace8ff861d5e45ef40619dcc6",
+      "version": "2.0",
+      "port-version": 7
+    },
     {
       "git-tree": "5c54c4aa02d2a668bd3d97a1b2a9d412efe284d3",
       "version": "2.0",
diff --git a/external_imported/vcpkg/versions/o-/openmvs.json b/external_imported/vcpkg/versions/o-/openmvs.json
index bf7e22379..4649a87c6 100644
--- a/external_imported/vcpkg/versions/o-/openmvs.json
+++ b/external_imported/vcpkg/versions/o-/openmvs.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "8779bcf1acd942b029c79791b2335b252e151f20",
+      "version": "2.1.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "93c2bb0fd968757d60afa8ce2de0d456a3ae5cc0",
+      "version": "2.1.0",
+      "port-version": 1
+    },
     {
       "git-tree": "fbeb86b69f146df9049966d4e58117f38e166257",
       "version": "2.1.0",
diff --git a/external_imported/vcpkg/versions/o-/openni2.json b/external_imported/vcpkg/versions/o-/openni2.json
index 36caa8dde..60ca5f01a 100644
--- a/external_imported/vcpkg/versions/o-/openni2.json
+++ b/external_imported/vcpkg/versions/o-/openni2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5713db6efa79dd4b37af0ac38ed516f807d30db0",
+      "version": "2.2.0.33",
+      "port-version": 15
+    },
     {
       "git-tree": "31c61be8515cff93cca9a905969a8292023f0b4e",
       "version": "2.2.0.33",
diff --git a/external_imported/vcpkg/versions/o-/openscap.json b/external_imported/vcpkg/versions/o-/openscap.json
index 0799d6036..346df50bc 100644
--- a/external_imported/vcpkg/versions/o-/openscap.json
+++ b/external_imported/vcpkg/versions/o-/openscap.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "5317006070f414abe07df69cea20ee7a7ebfc1d4",
+      "version": "1.3.7",
+      "port-version": 2
+    },
+    {
+      "git-tree": "da537eeaaeb13c275a44fac02d7262875e5c29f4",
+      "version": "1.3.7",
+      "port-version": 1
+    },
+    {
+      "git-tree": "453f57565bf1882caf7355c14c079725153cd844",
+      "version": "1.3.7",
+      "port-version": 0
+    },
     {
       "git-tree": "e19b3163cda0978696c4a2b6fc6db92800051398",
       "version": "1.3.1",
diff --git a/external_imported/vcpkg/versions/o-/openslide.json b/external_imported/vcpkg/versions/o-/openslide.json
index 4758964dd..b4955a18b 100644
--- a/external_imported/vcpkg/versions/o-/openslide.json
+++ b/external_imported/vcpkg/versions/o-/openslide.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "3693e3b54096deebd97f8a71e91636d88941637a",
+      "version": "3.4.1",
+      "port-version": 3
+    },
+    {
+      "git-tree": "dafb9bb4d2ad8dc07570e45c4f5a4794ca016778",
+      "version": "3.4.1",
+      "port-version": 2
+    },
+    {
+      "git-tree": "ff177e74dacffe2a12dec525304bac97b7f67a9f",
+      "version": "3.4.1",
+      "port-version": 1
+    },
     {
       "git-tree": "e709084d5ff53f55afd332eac4b43ed9bf79e199",
       "version": "3.4.1",
diff --git a/external_imported/vcpkg/versions/o-/openssl.json b/external_imported/vcpkg/versions/o-/openssl.json
index d79706f23..91bddacc2 100644
--- a/external_imported/vcpkg/versions/o-/openssl.json
+++ b/external_imported/vcpkg/versions/o-/openssl.json
@@ -1,5 +1,90 @@
 {
   "versions": [
+    {
+      "git-tree": "53fb72a19981a3439cd569f58b722ca6cd26e23d",
+      "version": "3.2.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8865e51e2cd2c891df13f80e1a2585d8b69eab9c",
+      "version": "3.2.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "dd76b04663283d999c149033c3fac211d08f0324",
+      "version": "3.2.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "b9b4587c2e00e793e735d8ac5094f64dbfcf44e1",
+      "version": "3.2.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5ee74387a1dd212dc9754c614809ff86bd0638fa",
+      "version": "3.1.4",
+      "port-version": 1
+    },
+    {
+      "git-tree": "3dc34c6428cc5a086a56695e0e0e8c2363e029b5",
+      "version": "3.1.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e57c0f392fd8486892a91ca82b7bf2e34c59e374",
+      "version": "3.1.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "11cbc05950decb26474353fb9c0bfed3be3008c4",
+      "version": "3.1.2",
+      "port-version": 3
+    },
+    {
+      "git-tree": "4e8e2c30ede50b2df35ecf5a0ee574076cfbe06f",
+      "version": "3.1.2",
+      "port-version": 2
+    },
+    {
+      "git-tree": "5a99562f8ac47a68a58efba5f0d40259fedeecc5",
+      "version": "3.1.2",
+      "port-version": 1
+    },
+    {
+      "git-tree": "db4486fff3146088dd150f067ebf940c649ffe42",
+      "version": "3.1.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "da3981b5b899f4e74db269ca4854f4bf05d9d387",
+      "version": "3.1.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "dc8edd2b6e1e1552688c29dc46d5cd5c9183804b",
+      "version": "3.1.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "68137d1e48b5f9424e9de3d038a9e2c92f1baf39",
+      "version": "3.1.0",
+      "port-version": 4
+    },
+    {
+      "git-tree": "b99152f5be63f45b2f3be6eb1624d96d70b21b49",
+      "version": "3.1.0",
+      "port-version": 3
+    },
+    {
+      "git-tree": "64fc47730d346ecacc9f948c2c3138363ed8f702",
+      "version": "3.1.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "b123beef6759b490ff8679b5cd4db0f721a2808a",
+      "version": "3.1.0",
+      "port-version": 1
+    },
     {
       "git-tree": "179a1ad3f5a5bbcb77f2e00688e4c467f03d4311",
       "version": "3.1.0",
diff --git a/external_imported/vcpkg/versions/o-/opensubdiv.json b/external_imported/vcpkg/versions/o-/opensubdiv.json
index dc5e1a7ff..b5b28391b 100644
--- a/external_imported/vcpkg/versions/o-/opensubdiv.json
+++ b/external_imported/vcpkg/versions/o-/opensubdiv.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8cc627798709caed394f31456098644f359f0936",
+      "version-semver": "3.5.0",
+      "port-version": 1
+    },
     {
       "git-tree": "38f4d0720a8f9f0610f327382977951421d3ce98",
       "version-semver": "3.5.0",
diff --git a/external_imported/vcpkg/versions/o-/opentelemetry-cpp.json b/external_imported/vcpkg/versions/o-/opentelemetry-cpp.json
index d18ab3c7a..54a6060c4 100644
--- a/external_imported/vcpkg/versions/o-/opentelemetry-cpp.json
+++ b/external_imported/vcpkg/versions/o-/opentelemetry-cpp.json
@@ -1,5 +1,80 @@
 {
   "versions": [
+    {
+      "git-tree": "03054c83c227b0d62db194cb111cb9885f787abe",
+      "version-semver": "1.13.0",
+      "port-version": 4
+    },
+    {
+      "git-tree": "f732f422f031bbc6b126743a388bcf50280acb0e",
+      "version-semver": "1.13.0",
+      "port-version": 3
+    },
+    {
+      "git-tree": "34b7683811362c31ff5e3742dd47ee8a721817f0",
+      "version-semver": "1.13.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "6df7abbc5ea5cb1da3d33640ccfa7d0f086319c0",
+      "version-semver": "1.13.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "fe04f9f3867c1225a0636a9f410871b30dce6670",
+      "version-semver": "1.13.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "71dd31a63ee43f477bad710ccce04ffac2be5238",
+      "version-semver": "1.12.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "5fd8cacd9fd3aaa30b0ad133f2de052ba3ff869f",
+      "version-semver": "1.12.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3ad2a8625bd852a203f6156970c0eada6f90c192",
+      "version-semver": "1.9.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "47c5c172ee9a7c663746a3c1cbabb359a1cbaf56",
+      "version-semver": "1.9.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "dfd999f93f24e916631d57bf73c0bf02f8c2da0a",
+      "version-semver": "1.8.3",
+      "port-version": 6
+    },
+    {
+      "git-tree": "d01c3006eaa3db92a643c8b6e275e5275561d443",
+      "version-semver": "1.8.3",
+      "port-version": 5
+    },
+    {
+      "git-tree": "a2aaa1296022784fb28719885a59fe905dd80e06",
+      "version-semver": "1.8.3",
+      "port-version": 4
+    },
+    {
+      "git-tree": "ce4bc10a4f0ebad5cafd14de836017b281cba1f9",
+      "version-semver": "1.8.3",
+      "port-version": 3
+    },
+    {
+      "git-tree": "152ee0a0f79c1fc26d81291c9d1eb0417f9deeeb",
+      "version-semver": "1.8.3",
+      "port-version": 2
+    },
+    {
+      "git-tree": "3777014ad8e4997a8c0afbbc7f37ff949497059c",
+      "version-semver": "1.8.3",
+      "port-version": 1
+    },
     {
       "git-tree": "7b038c874943ff65c4753c535698f6f409391dab",
       "version-semver": "1.8.3",
diff --git a/external_imported/vcpkg/versions/o-/opentelemetry-fluentd.json b/external_imported/vcpkg/versions/o-/opentelemetry-fluentd.json
new file mode 100644
index 000000000..6b3bb31c2
--- /dev/null
+++ b/external_imported/vcpkg/versions/o-/opentelemetry-fluentd.json
@@ -0,0 +1,19 @@
+{
+  "versions": [
+    {
+      "git-tree": "8fbaf952420269223ba6185ec91ffedb87882aa3",
+      "version-semver": "2.0.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "e9ffc101ca11ffd64b1a2bd73ae7e11bf7f28cfc",
+      "version-semver": "2.0.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "4c8cdb3314a3a35268d4ce9b786c6632c79e0f97",
+      "version-semver": "2.0.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/o-/openturns.json b/external_imported/vcpkg/versions/o-/openturns.json
index 8b74a498b..d7a9eee4f 100644
--- a/external_imported/vcpkg/versions/o-/openturns.json
+++ b/external_imported/vcpkg/versions/o-/openturns.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1533ede792f48bee5c53f35de06c493e6ed0ab0a",
+      "version": "1.20",
+      "port-version": 1
+    },
     {
       "git-tree": "7df4639f8285df19714604b6df8f55f170c938f4",
       "version": "1.20",
diff --git a/external_imported/vcpkg/versions/o-/openvdb.json b/external_imported/vcpkg/versions/o-/openvdb.json
index 42ea99b0d..edc8ae9cb 100644
--- a/external_imported/vcpkg/versions/o-/openvdb.json
+++ b/external_imported/vcpkg/versions/o-/openvdb.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "6997652c81d0f91033cb3cce2bf6e55674725400",
+      "version": "11.0.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8565eefd07d9a9d108cec2545039261b53d2e3b1",
+      "version": "10.0.0",
+      "port-version": 6
+    },
+    {
+      "git-tree": "6200720b464b3cc005edd767613f3978f614a32f",
+      "version": "10.0.0",
+      "port-version": 5
+    },
+    {
+      "git-tree": "34b77a62946c569224d4aacc863e8ba9d7aea31f",
+      "version": "10.0.0",
+      "port-version": 4
+    },
+    {
+      "git-tree": "dc6551f1e86bf8c86ce9fd0133e6e979f3729faa",
+      "version": "10.0.0",
+      "port-version": 3
+    },
     {
       "git-tree": "65264bf4e9ac9e13e48374147f7b4454b8e45b97",
       "version": "10.0.0",
diff --git a/external_imported/vcpkg/versions/o-/openvino.json b/external_imported/vcpkg/versions/o-/openvino.json
new file mode 100644
index 000000000..250c29243
--- /dev/null
+++ b/external_imported/vcpkg/versions/o-/openvino.json
@@ -0,0 +1,74 @@
+{
+  "versions": [
+    {
+      "git-tree": "141f51cbc33785e0e327a425d7aadb59ec9d148d",
+      "version": "2023.3.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "008bb3450506fc167c8928022a1f8782cddff866",
+      "version": "2023.2.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e33c2a6c920269c1564d88ac95d0933771763ca3",
+      "version": "2023.1.0",
+      "port-version": 4
+    },
+    {
+      "git-tree": "185f20b166701fdc9c255e0ca7e574a88c1a34d9",
+      "version": "2023.1.0",
+      "port-version": 3
+    },
+    {
+      "git-tree": "142339d6db532cdecd3d59ccdb43411769bed1ca",
+      "version": "2023.1.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "b038a324f094f69ef18efe7cd9b4c3e7c71d7c9b",
+      "version": "2023.1.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "717114b7751c8866fc2f475267dea3c04a5cedcc",
+      "version": "2023.1.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ad00a0dadb3ecf1eff66f9de71017808ade00d0f",
+      "version-date": "2023-06-11",
+      "port-version": 6
+    },
+    {
+      "git-tree": "7737d9d905aa9a31e47e32abf5ef420bd1446def",
+      "version-date": "2023-06-11",
+      "port-version": 5
+    },
+    {
+      "git-tree": "a27f3d63ace7db21e84b4e42eef2ab776a6dcb69",
+      "version-date": "2023-06-11",
+      "port-version": 4
+    },
+    {
+      "git-tree": "be798c823b9abdb477acbbe2541368067263f268",
+      "version-date": "2023-06-11",
+      "port-version": 3
+    },
+    {
+      "git-tree": "42a42b174342b956f51bfd641761787fc3ced98a",
+      "version-date": "2023-06-11",
+      "port-version": 2
+    },
+    {
+      "git-tree": "b845ea9bb49b0f44f2423d210e950003b67bfac4",
+      "version-date": "2023-06-11",
+      "port-version": 1
+    },
+    {
+      "git-tree": "85c70516c12c1c3544e7a2996e6f83e35aa6a88f",
+      "version-date": "2023-06-11",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/o-/openvpn3.json b/external_imported/vcpkg/versions/o-/openvpn3.json
index 7f9fd3361..265e51fa6 100644
--- a/external_imported/vcpkg/versions/o-/openvpn3.json
+++ b/external_imported/vcpkg/versions/o-/openvpn3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "97a26dd437bb027004b075333db96473652ca1fd",
+      "version": "3.7.0",
+      "port-version": 2
+    },
     {
       "git-tree": "352f972ff2ff0cfb7305f779253f322ba72e14f5",
       "version": "3.7.0",
diff --git a/external_imported/vcpkg/versions/o-/openxr-loader.json b/external_imported/vcpkg/versions/o-/openxr-loader.json
index 6385ac6a9..81c538268 100644
--- a/external_imported/vcpkg/versions/o-/openxr-loader.json
+++ b/external_imported/vcpkg/versions/o-/openxr-loader.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a8275bf000597b3d7cd12109347f21552bcd39cc",
+      "version": "1.0.31",
+      "port-version": 0
+    },
     {
       "git-tree": "e26b91f539cbbba23cc6ccd2eb9106322ba1c81c",
       "version": "1.0.22",
diff --git a/external_imported/vcpkg/versions/o-/optional-bare.json b/external_imported/vcpkg/versions/o-/optional-bare.json
index e5f6ddb0e..9b91305a9 100644
--- a/external_imported/vcpkg/versions/o-/optional-bare.json
+++ b/external_imported/vcpkg/versions/o-/optional-bare.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a8ed63e195d0f747d80e48d9c36d37fa388eb65a",
+      "version": "1.1.0",
+      "port-version": 3
+    },
     {
       "git-tree": "4174971e91de4c7fd5eb1e487ec73976579e7995",
       "version-string": "1.1.0",
diff --git a/external_imported/vcpkg/versions/o-/opus.json b/external_imported/vcpkg/versions/o-/opus.json
index ff7b4e205..dd59293b6 100644
--- a/external_imported/vcpkg/versions/o-/opus.json
+++ b/external_imported/vcpkg/versions/o-/opus.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b1bf537b6144eb7899c56f1a9bda5de3fd4e2025",
+      "version": "1.4",
+      "port-version": 0
+    },
     {
       "git-tree": "969377a42b9e5887f42419aff6182d9c111f65c2",
       "version": "1.3.1",
diff --git a/external_imported/vcpkg/versions/o-/orc.json b/external_imported/vcpkg/versions/o-/orc.json
index 502e8fa6b..8b587ad02 100644
--- a/external_imported/vcpkg/versions/o-/orc.json
+++ b/external_imported/vcpkg/versions/o-/orc.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "181bf753a7e9da2d5c98907c58270f9ccb64e4db",
+      "version": "1.9.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "1d045d211a7c1a657c3c6d1f2df0df8faf69c459",
+      "version": "1.9.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "101fdb5683877574e2730084978b77dfdf91d8ad",
+      "version": "1.9.0",
+      "port-version": 0
+    },
     {
       "git-tree": "8db2855196eeddb1ac131df74e028367480613d5",
       "version": "1.7.6",
diff --git a/external_imported/vcpkg/versions/o-/orocos-kdl.json b/external_imported/vcpkg/versions/o-/orocos-kdl.json
index de3ef7352..2ba686831 100644
--- a/external_imported/vcpkg/versions/o-/orocos-kdl.json
+++ b/external_imported/vcpkg/versions/o-/orocos-kdl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e9fdf57afeb547c9e5fdad47dff693fe8f96f4b5",
+      "version": "1.5.1",
+      "port-version": 0
+    },
     {
       "git-tree": "4c2ee586866fcf7a9f3c3930bd1af16763047aa4",
       "version": "1.4",
diff --git a/external_imported/vcpkg/versions/o-/osg.json b/external_imported/vcpkg/versions/o-/osg.json
index 2db46a091..40d4e8d98 100644
--- a/external_imported/vcpkg/versions/o-/osg.json
+++ b/external_imported/vcpkg/versions/o-/osg.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "27f28ccf9745bc2ca1757d5fa32b92373c176e2a",
+      "version": "3.6.5",
+      "port-version": 22
+    },
+    {
+      "git-tree": "6e9d4d04aae606c5ac02c497b17774d37e74de7a",
+      "version": "3.6.5",
+      "port-version": 21
+    },
+    {
+      "git-tree": "87727f247e97af37e53f77acadff05d6d06559d0",
+      "version": "3.6.5",
+      "port-version": 20
+    },
+    {
+      "git-tree": "50d656eed69f1bb2d38d5ead688d555f4faf8224",
+      "version": "3.6.5",
+      "port-version": 19
+    },
     {
       "git-tree": "cb957f4950031c9c7fedfbcfe1ba698cc435dedd",
       "version": "3.6.5",
diff --git a/external_imported/vcpkg/versions/o-/osgearth.json b/external_imported/vcpkg/versions/o-/osgearth.json
index 1dd35dc26..6e98d6cbb 100644
--- a/external_imported/vcpkg/versions/o-/osgearth.json
+++ b/external_imported/vcpkg/versions/o-/osgearth.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "4c7eac5ebac0fb2f82b730a863d50278a83955a9",
+      "version": "3.4",
+      "port-version": 1
+    },
+    {
+      "git-tree": "765cddcfc821c355b20c1fed7a43f181f8eb0817",
+      "version": "3.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c39e21352cff6e65fe8f6315ee9b7828143e0eb8",
+      "version": "3.3",
+      "port-version": 7
+    },
+    {
+      "git-tree": "93f980541af3527f2940eede908836a7cfc63166",
+      "version": "3.3",
+      "port-version": 6
+    },
     {
       "git-tree": "606bbaf1456dc9d5a6f5ef879a54b894c4ace5b3",
       "version": "3.3",
diff --git a/external_imported/vcpkg/versions/o-/osmanip.json b/external_imported/vcpkg/versions/o-/osmanip.json
index 151e41224..df8266e22 100644
--- a/external_imported/vcpkg/versions/o-/osmanip.json
+++ b/external_imported/vcpkg/versions/o-/osmanip.json
@@ -1,8 +1,8 @@
 {
     "versions": [
       {
-        "git-tree": "6af4e2a6986f37a24820ea99fd52c0b1d6ccf1a0",
-        "version": "4.5.1",
+        "git-tree": "964b4a1ed36e246a65052a658361835dacafa823",
+        "version": "4.6.1",
         "port-version": 0
       }
     ]
diff --git a/external_imported/vcpkg/versions/o-/outcome.json b/external_imported/vcpkg/versions/o-/outcome.json
index ed92afed9..4f85aaa36 100644
--- a/external_imported/vcpkg/versions/o-/outcome.json
+++ b/external_imported/vcpkg/versions/o-/outcome.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "47944a9cbc611b2c0b1d0a3acb1d0a38881dbc87",
+      "version": "2.2.7",
+      "port-version": 0
+    },
     {
       "git-tree": "504177d3c3f3d1a063db2ce6d12292141e874d37",
       "version": "2.2.4",
diff --git a/external_imported/vcpkg/versions/p-/p-ranav-csv.json b/external_imported/vcpkg/versions/p-/p-ranav-csv.json
index 3c5cc75ee..0d9f1734a 100644
--- a/external_imported/vcpkg/versions/p-/p-ranav-csv.json
+++ b/external_imported/vcpkg/versions/p-/p-ranav-csv.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1b8c39e843a84b3c24987d688412eb5346cd6b5d",
+      "version-date": "2019-07-11",
+      "port-version": 3
+    },
     {
       "git-tree": "47066c91320e9526c1eefebfcaf4862420f90794",
       "version-string": "2019-07-11",
diff --git a/external_imported/vcpkg/versions/p-/p-ranav-csv2.json b/external_imported/vcpkg/versions/p-/p-ranav-csv2.json
index d33a36654..f3e13c759 100644
--- a/external_imported/vcpkg/versions/p-/p-ranav-csv2.json
+++ b/external_imported/vcpkg/versions/p-/p-ranav-csv2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9fed336f391db2faf9b7c96b7b32d5838bd6c5e7",
+      "version-date": "2020-12-14",
+      "port-version": 4
+    },
     {
       "git-tree": "3562046ef991d88c67599b6e736b3e00d0409327",
       "version-string": "2020-12-14",
diff --git a/external_imported/vcpkg/versions/p-/pagmo2.json b/external_imported/vcpkg/versions/p-/pagmo2.json
index c356ae7fe..1eef61142 100644
--- a/external_imported/vcpkg/versions/p-/pagmo2.json
+++ b/external_imported/vcpkg/versions/p-/pagmo2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ebff91665e8cced80124a56db196cd800cd02f79",
+      "version": "2.19.0",
+      "port-version": 2
+    },
     {
       "git-tree": "77f146b96ad3179551dca78c832542683cf3801e",
       "version": "2.19.0",
diff --git a/external_imported/vcpkg/versions/p-/paho-mqtt.json b/external_imported/vcpkg/versions/p-/paho-mqtt.json
index 8bb1182a4..c708abf97 100644
--- a/external_imported/vcpkg/versions/p-/paho-mqtt.json
+++ b/external_imported/vcpkg/versions/p-/paho-mqtt.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "7ea6a82c6e59b0300a88ba3ce22c81cc0346af9f",
+      "version": "1.3.13",
+      "port-version": 1
+    },
+    {
+      "git-tree": "afbbb351ea649d52651cd70c71bd133d6527215f",
+      "version": "1.3.13",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3e686950d2f0329bc5076bec1d8432e83aaf45fd",
+      "version": "1.3.12",
+      "port-version": 1
+    },
+    {
+      "git-tree": "db58caf818518c074d1ab00297ce3a2fc784bc0a",
+      "version": "1.3.12",
+      "port-version": 0
+    },
     {
       "git-tree": "9edde45ee5a278ee52bbb1891e9a30cab33669f8",
       "version-semver": "1.3.10",
diff --git a/external_imported/vcpkg/versions/p-/paho-mqttpp3.json b/external_imported/vcpkg/versions/p-/paho-mqttpp3.json
index 20df1bcb3..26aeba1eb 100644
--- a/external_imported/vcpkg/versions/p-/paho-mqttpp3.json
+++ b/external_imported/vcpkg/versions/p-/paho-mqttpp3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "eaf93e3c80805f50d436446e913e3f1bb6668054",
+      "version": "1.3.2",
+      "port-version": 0
+    },
     {
       "git-tree": "4e5982f9707bb0222b6694cee8d4a0d23698e20f",
       "version": "1.2.0",
diff --git a/external_imported/vcpkg/versions/p-/palsigslot.json b/external_imported/vcpkg/versions/p-/palsigslot.json
index 0339cee7a..99ba0d700 100644
--- a/external_imported/vcpkg/versions/p-/palsigslot.json
+++ b/external_imported/vcpkg/versions/p-/palsigslot.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "db0f38f4ec93dc19183222e89759d4355733e75f",
+      "version": "1.2.2",
+      "port-version": 0
+    },
     {
       "git-tree": "dd7ff9df2ee3a39656ab22a6fc6f210afa843513",
       "version": "1.2.1",
diff --git a/external_imported/vcpkg/versions/p-/pango.json b/external_imported/vcpkg/versions/p-/pango.json
index 6f20bb6a5..3a32719f1 100644
--- a/external_imported/vcpkg/versions/p-/pango.json
+++ b/external_imported/vcpkg/versions/p-/pango.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "e2a88ce998fab5ed3f3a2edf817f32734c78187b",
+      "version": "1.50.14",
+      "port-version": 4
+    },
+    {
+      "git-tree": "4c3bbb58011a3e259be06531c08854dfd7bbabee",
+      "version": "1.50.14",
+      "port-version": 3
+    },
+    {
+      "git-tree": "d4a19a3119134de662a854a19436609b484d60ce",
+      "version": "1.50.14",
+      "port-version": 2
+    },
+    {
+      "git-tree": "ae2c0487d81de23e5f928edd4905c379be0bac54",
+      "version": "1.50.14",
+      "port-version": 1
+    },
+    {
+      "git-tree": "3985e71b9e3446f57995321a290a75a7bf5101dc",
+      "version": "1.50.14",
+      "port-version": 0
+    },
     {
       "git-tree": "5f1f5e6f18ba1451a6fd4dadf82463a2ac3f9326",
       "version": "1.50.12",
diff --git a/external_imported/vcpkg/versions/p-/pangomm.json b/external_imported/vcpkg/versions/p-/pangomm.json
index 008d6b202..acd02fcce 100644
--- a/external_imported/vcpkg/versions/p-/pangomm.json
+++ b/external_imported/vcpkg/versions/p-/pangomm.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "934da9592c2710373598b3f3d3a53103bad2b1e4",
+      "version": "2.50.1",
+      "port-version": 3
+    },
+    {
+      "git-tree": "359b0fe0cdacbc56edd56143da7d545633e50960",
+      "version": "2.50.1",
+      "port-version": 2
+    },
+    {
+      "git-tree": "34b3f456c3c28463b38376b91dddb715ec4a6b7c",
+      "version": "2.50.1",
+      "port-version": 1
+    },
     {
       "git-tree": "10147b103c8e2678a9a45161a861a239c73d7d17",
       "version": "2.50.1",
diff --git a/external_imported/vcpkg/versions/p-/parallel-hashmap.json b/external_imported/vcpkg/versions/p-/parallel-hashmap.json
index 6586a5d3b..3f13fcb1f 100644
--- a/external_imported/vcpkg/versions/p-/parallel-hashmap.json
+++ b/external_imported/vcpkg/versions/p-/parallel-hashmap.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "48536bee28b7473d0e838f70946ddfe8afdba2e2",
+      "version": "1.3.11",
+      "port-version": 0
+    },
     {
       "git-tree": "65be62557bbdb29d6d0ee383b70a6f84ef401b2f",
       "version": "1.3.8",
diff --git a/external_imported/vcpkg/versions/p-/parallelstl.json b/external_imported/vcpkg/versions/p-/parallelstl.json
index 243b840f1..0aa4dcbc0 100644
--- a/external_imported/vcpkg/versions/p-/parallelstl.json
+++ b/external_imported/vcpkg/versions/p-/parallelstl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ebb3771df9c41c1ce97f00d55a3a303390a53cfd",
+      "version": "20200330",
+      "port-version": 3
+    },
     {
       "git-tree": "c346357a00664a95f183ba0d0565b7badac24635",
       "version-string": "20200330",
diff --git a/external_imported/vcpkg/versions/p-/paraview.json b/external_imported/vcpkg/versions/p-/paraview.json
index 1282e3075..d6876c736 100644
--- a/external_imported/vcpkg/versions/p-/paraview.json
+++ b/external_imported/vcpkg/versions/p-/paraview.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "2aa3d8185a319a76c7961608ecce8b2f03c08cd7",
+      "version": "5.11.0",
+      "port-version": 4
+    },
+    {
+      "git-tree": "ef783841125e47d511ecc6d0108e7b1ecaef1469",
+      "version": "5.11.0",
+      "port-version": 3
+    },
     {
       "git-tree": "1b93a58c420dc6478318aba2958a0334a7759b36",
       "version": "5.11.0",
diff --git a/external_imported/vcpkg/versions/p-/parquet.json b/external_imported/vcpkg/versions/p-/parquet.json
index 91b6e1e7f..fbee3b5f7 100644
--- a/external_imported/vcpkg/versions/p-/parquet.json
+++ b/external_imported/vcpkg/versions/p-/parquet.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "bf699327dbf4ef8d8f7f94eb1c21305c7b71579f",
+      "version": "0",
+      "port-version": 2
+    },
     {
       "git-tree": "35d3995589a5c775f1f64cb1f3f331fd38362fb9",
       "version-string": "0",
diff --git a/external_imported/vcpkg/versions/p-/pbc.json b/external_imported/vcpkg/versions/p-/pbc.json
index 1e3b17445..3b0353201 100644
--- a/external_imported/vcpkg/versions/p-/pbc.json
+++ b/external_imported/vcpkg/versions/p-/pbc.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "6789ed942578afe4baac765d5e7549d421c25c76",
+      "version": "0.5.14",
+      "port-version": 9
+    },
+    {
+      "git-tree": "096b1e1d4077f9fbe44e8b0a6fa306e83270c632",
+      "version": "0.5.14",
+      "port-version": 8
+    },
+    {
+      "git-tree": "23f4f1804aaa515560fdd3efa19485c9714d2a20",
+      "version": "0.5.14",
+      "port-version": 7
+    },
     {
       "git-tree": "23742abe8879e71a911c56845977ad2387e9bfa6",
       "version": "0.5.14",
diff --git a/external_imported/vcpkg/versions/p-/pcapplusplus.json b/external_imported/vcpkg/versions/p-/pcapplusplus.json
index 69f45a370..8f030c183 100644
--- a/external_imported/vcpkg/versions/p-/pcapplusplus.json
+++ b/external_imported/vcpkg/versions/p-/pcapplusplus.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "51f8425ebc003224002c45c5f7454ebf2fb79a82",
+      "version": "23.9",
+      "port-version": 1
+    },
+    {
+      "git-tree": "3dc217621a6ef6ef4f4bd353a1e5088b15960428",
+      "version": "22.11",
+      "port-version": 1
+    },
     {
       "git-tree": "0959bc0d3b12e4e90af3ce1d6983566957af555b",
       "version-string": "22.11",
diff --git a/external_imported/vcpkg/versions/p-/pcg.json b/external_imported/vcpkg/versions/p-/pcg.json
index 52b5f3c7c..e8ecf30f7 100644
--- a/external_imported/vcpkg/versions/p-/pcg.json
+++ b/external_imported/vcpkg/versions/p-/pcg.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e99f9b5bed0586fa85e5410bb27917496450481b",
+      "version-date": "2021-04-06",
+      "port-version": 2
+    },
     {
       "git-tree": "dfdbf3fad0c295b94b400509530d3642d5a6abcc",
       "version-string": "2021-04-06",
diff --git a/external_imported/vcpkg/versions/p-/pciids.json b/external_imported/vcpkg/versions/p-/pciids.json
new file mode 100644
index 000000000..970dd93e6
--- /dev/null
+++ b/external_imported/vcpkg/versions/p-/pciids.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "ffc7c82fb249347c25b294b6c8131e1f3b2156c2",
+      "version-date": "2023-04-11",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/p-/pcl.json b/external_imported/vcpkg/versions/p-/pcl.json
index d4e9d9c82..92ea7bbf3 100644
--- a/external_imported/vcpkg/versions/p-/pcl.json
+++ b/external_imported/vcpkg/versions/p-/pcl.json
@@ -1,5 +1,40 @@
 {
   "versions": [
+    {
+      "git-tree": "e4a3a2d2b7ad47ad0f55b10f1ba7401e65343610",
+      "version": "1.14.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "547556098f29483403ca91d1b4ece9b7dc73d104",
+      "version": "1.14.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "55fa760d44b858555a5c350ec8b2a1f26e97e84e",
+      "version": "1.13.1",
+      "port-version": 2
+    },
+    {
+      "git-tree": "8f4bb7a9a1e628b9444dad7f5a36a2163df572ac",
+      "version": "1.13.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "83f84dc2de83d25e4eb58d69fcf09086ee8b65b5",
+      "version": "1.13.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c780fc254eb97b60360f60c43034a625667c6530",
+      "version": "1.13.0",
+      "port-version": 3
+    },
+    {
+      "git-tree": "0c53a841b49d311f52e047bc61455479475c446e",
+      "version": "1.13.0",
+      "port-version": 2
+    },
     {
       "git-tree": "b992407a0319c7dc434236acb567e629367d8eff",
       "version": "1.13.0",
diff --git a/external_imported/vcpkg/versions/p-/pcre2.json b/external_imported/vcpkg/versions/p-/pcre2.json
index 46b57427e..f615a1d26 100644
--- a/external_imported/vcpkg/versions/p-/pcre2.json
+++ b/external_imported/vcpkg/versions/p-/pcre2.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "678c2336c4102c5a8868570c60140fdc2a8d1dcf",
+      "version": "10.42",
+      "port-version": 1
+    },
+    {
+      "git-tree": "148d5898b3c1925fd8e82663589917255172d5c9",
+      "version": "10.42",
+      "port-version": 0
+    },
+    {
+      "git-tree": "533fc8ada3da33f695eb499fe8190a5e9b24a5c8",
+      "version": "10.40",
+      "port-version": 2
+    },
     {
       "git-tree": "941f187c16a9385815fd353a9b79abf55bd2a7ec",
       "version": "10.40",
diff --git a/external_imported/vcpkg/versions/p-/pdal-c.json b/external_imported/vcpkg/versions/p-/pdal-c.json
index 0eb2c8be9..99ecbc977 100644
--- a/external_imported/vcpkg/versions/p-/pdal-c.json
+++ b/external_imported/vcpkg/versions/p-/pdal-c.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "d7916bf5653f1e62814a0a975e2af90d6862c881",
+      "version": "2.2.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e84b5eb190d2b4885ff56ec4168b1c6ba5569fb9",
+      "version": "2.1",
+      "port-version": 1
+    },
     {
       "git-tree": "c19bcf077b95f0d81ef14bfdf9774795521d6013",
       "version-string": "2.1",
diff --git a/external_imported/vcpkg/versions/p-/pdal.json b/external_imported/vcpkg/versions/p-/pdal.json
index 080e9fd04..dc5b4daf7 100644
--- a/external_imported/vcpkg/versions/p-/pdal.json
+++ b/external_imported/vcpkg/versions/p-/pdal.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "91391b35fb1af3810e79110564bcf6e668dd9194",
+      "version": "2.5.3",
+      "port-version": 3
+    },
+    {
+      "git-tree": "59463f5cf4dccd2c2167abad2e290413cdc91d22",
+      "version": "2.5.3",
+      "port-version": 2
+    },
+    {
+      "git-tree": "a8618eb3877634f95eb6edbbba64f3e4cccb1d58",
+      "version": "2.5.3",
+      "port-version": 1
+    },
+    {
+      "git-tree": "36cec2be04df8ba1771c374ccc8ae3c8a0cc96f3",
+      "version": "2.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e0e82c8480da2e69cc7532911895844095466aad",
+      "version": "2.4.3",
+      "port-version": 3
+    },
+    {
+      "git-tree": "ecc35d5b8ff83ebb84e0f2edfa7c5fef7630467f",
+      "version": "2.4.3",
+      "port-version": 2
+    },
     {
       "git-tree": "be0fc52801df7c7409e934914c7cca650f507f8e",
       "version": "2.4.3",
diff --git a/external_imported/vcpkg/versions/p-/pdcurses.json b/external_imported/vcpkg/versions/p-/pdcurses.json
index 68869abfc..7760ad057 100644
--- a/external_imported/vcpkg/versions/p-/pdcurses.json
+++ b/external_imported/vcpkg/versions/p-/pdcurses.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "61d47c082b38bc7c50c5b81d730c698dd4cea04f",
+      "version": "3.9",
+      "port-version": 6
+    },
+    {
+      "git-tree": "a74893fbd7290450958bf2beddbb59486bb8c04f",
+      "version": "3.9",
+      "port-version": 5
+    },
+    {
+      "git-tree": "cb1edd90103d19fa2ecf7e6343416a35714ffe43",
+      "version": "3.9",
+      "port-version": 4
+    },
     {
       "git-tree": "e09ec910aff6b25bd1e1554b15dce08656b3f3d5",
       "version-string": "3.9",
diff --git a/external_imported/vcpkg/versions/p-/pdqsort.json b/external_imported/vcpkg/versions/p-/pdqsort.json
index cda3f3dc4..6f112c926 100644
--- a/external_imported/vcpkg/versions/p-/pdqsort.json
+++ b/external_imported/vcpkg/versions/p-/pdqsort.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5b8febcdb827ff644e65b87287e69a322e90d959",
+      "version-date": "2019-07-30",
+      "port-version": 2
+    },
     {
       "git-tree": "70783c2d8d848d78dd2d725fd1cf16d669b7c356",
       "version-string": "2019-07-30",
diff --git a/external_imported/vcpkg/versions/p-/pe-parse.json b/external_imported/vcpkg/versions/p-/pe-parse.json
index b6b8efc02..c70d96a2b 100644
--- a/external_imported/vcpkg/versions/p-/pe-parse.json
+++ b/external_imported/vcpkg/versions/p-/pe-parse.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d3e0e5dcb11738632d8eba03e22e4f0530ae5445",
+      "version": "2.1.0",
+      "port-version": 1
+    },
     {
       "git-tree": "94a994b08f738c94aa751def532be843595ebf62",
       "version": "2.1.0",
diff --git a/external_imported/vcpkg/versions/p-/pegtl-2.json b/external_imported/vcpkg/versions/p-/pegtl-2.json
index af590a1b9..fc0015e9d 100644
--- a/external_imported/vcpkg/versions/p-/pegtl-2.json
+++ b/external_imported/vcpkg/versions/p-/pegtl-2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a2d2306e1021faeb0c473f1e67896a48f039de17",
+      "version": "2.8.3",
+      "port-version": 3
+    },
     {
       "git-tree": "7f33030e3ca062aaa5b8c5cd1c17b5062a1d077f",
       "version-string": "2.8.3",
diff --git a/external_imported/vcpkg/versions/p-/pegtl.json b/external_imported/vcpkg/versions/p-/pegtl.json
index 45bf43ca6..66ce733e7 100644
--- a/external_imported/vcpkg/versions/p-/pegtl.json
+++ b/external_imported/vcpkg/versions/p-/pegtl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ee1dbb5f06f7dee38ef4a535efcbe4488556d349",
+      "version-semver": "3.2.7",
+      "port-version": 0
+    },
     {
       "git-tree": "ed96fd80f2820b9e5ad6f38a9ea24d7aebfb64be",
       "version-semver": "3.2.6",
diff --git a/external_imported/vcpkg/versions/p-/pfring.json b/external_imported/vcpkg/versions/p-/pfring.json
index c16247064..089731ba8 100644
--- a/external_imported/vcpkg/versions/p-/pfring.json
+++ b/external_imported/vcpkg/versions/p-/pfring.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3bb6f251467f6c02a873020247ec2982935dc9f3",
+      "version": "8.4.0",
+      "port-version": 0
+    },
     {
       "git-tree": "ed3dbffb4364b80331f2b986435bad956f39ad09",
       "version-date": "2019-10-17",
diff --git a/external_imported/vcpkg/versions/p-/pfultz2-linq.json b/external_imported/vcpkg/versions/p-/pfultz2-linq.json
index 0defc4ade..8164ebc79 100644
--- a/external_imported/vcpkg/versions/p-/pfultz2-linq.json
+++ b/external_imported/vcpkg/versions/p-/pfultz2-linq.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f2ad1ee9e58e3e6afcc6bf0872583a3871a65bcf",
+      "version-date": "2019-05-14",
+      "port-version": 3
+    },
     {
       "git-tree": "debf87753624003ec29fcf03e8ae9d53fd8660b4",
       "version-string": "2019-05-14",
diff --git a/external_imported/vcpkg/versions/p-/physx.json b/external_imported/vcpkg/versions/p-/physx.json
index 1dd96b9c2..ef29a8f69 100644
--- a/external_imported/vcpkg/versions/p-/physx.json
+++ b/external_imported/vcpkg/versions/p-/physx.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "890453e6b337c77f35dbb33620ac0ab32113f22f",
+      "version": "5.3.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9663323fd4b0d5ff6623bad944b8f60ea2455821",
+      "version": "5.2.1",
+      "port-version": 0
+    },
     {
       "git-tree": "038801f9419a356c7082b1501620bdef60da6d66",
       "version": "4.1.2",
@@ -76,4 +86,4 @@
       "port-version": 0
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/external_imported/vcpkg/versions/p-/picojson.json b/external_imported/vcpkg/versions/p-/picojson.json
index 05665cd4d..e4168b75c 100644
--- a/external_imported/vcpkg/versions/p-/picojson.json
+++ b/external_imported/vcpkg/versions/p-/picojson.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "38eb00e2d3f94c17ae204744d95228441bbc51e3",
+      "version": "1.3.0",
+      "port-version": 3
+    },
     {
       "git-tree": "2d186166bf75e9e77fce5e6a93440d5aa21fc830",
       "version-string": "1.3.0",
diff --git a/external_imported/vcpkg/versions/p-/picosha2.json b/external_imported/vcpkg/versions/p-/picosha2.json
index 57e22ab28..160e50f92 100644
--- a/external_imported/vcpkg/versions/p-/picosha2.json
+++ b/external_imported/vcpkg/versions/p-/picosha2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c873a8748f3e35ae1be390b0de9cc3754191c987",
+      "version-date": "2018-07-30",
+      "port-version": 2
+    },
     {
       "git-tree": "8192d1108b62d31bcb879332175c994fa62878dc",
       "version-string": "2018-07-30",
diff --git a/external_imported/vcpkg/versions/p-/pipewire.json b/external_imported/vcpkg/versions/p-/pipewire.json
index 305b1592f..f5d797952 100644
--- a/external_imported/vcpkg/versions/p-/pipewire.json
+++ b/external_imported/vcpkg/versions/p-/pipewire.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "f70021c500177982cf69785bf73ee0a02fe321ca",
+      "version": "1.0.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "482bffaec768a8c253cd14b8dec373db14a49338",
+      "version": "0.3.83",
+      "port-version": 0
+    },
     {
       "git-tree": "a013a40facd5bdfc94419f5ce591b2c776922462",
       "version": "0.3.62",
diff --git a/external_imported/vcpkg/versions/p-/pkgconf.json b/external_imported/vcpkg/versions/p-/pkgconf.json
index 62cac3dcc..eba083956 100644
--- a/external_imported/vcpkg/versions/p-/pkgconf.json
+++ b/external_imported/vcpkg/versions/p-/pkgconf.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ea46d2e90c7d74f952d99b6640a88cb9bef6438f",
+      "version": "2.1.0",
+      "port-version": 0
+    },
     {
       "git-tree": "8848e56b32837456dfb872f6ca3cc9953558d453",
       "version": "1.8.0",
diff --git a/external_imported/vcpkg/versions/p-/platform-folders.json b/external_imported/vcpkg/versions/p-/platform-folders.json
index bd9244193..80c0445cf 100644
--- a/external_imported/vcpkg/versions/p-/platform-folders.json
+++ b/external_imported/vcpkg/versions/p-/platform-folders.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "cf5e8d5b3192a857b2e85276a2ff8c6f76e28d82",
+      "version": "4.2.0",
+      "port-version": 1
+    },
     {
       "git-tree": "8448d41ddd7f2f2302c9a6a80dde44bb8494b096",
       "version": "4.2.0",
diff --git a/external_imported/vcpkg/versions/p-/plf-colony.json b/external_imported/vcpkg/versions/p-/plf-colony.json
index 16d3e369d..8833814de 100644
--- a/external_imported/vcpkg/versions/p-/plf-colony.json
+++ b/external_imported/vcpkg/versions/p-/plf-colony.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "5ee670387acdc49f20ccdddd328b38182515cbd5",
+      "version": "7.41",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b4c1ef0be7895ecc0e4deb82cb3a4fad3b29c03f",
+      "version": "7.3.1",
+      "port-version": 0
+    },
     {
       "git-tree": "7e90bb5fdf6e933b8d5c14e07d85c920e7a7afea",
       "version": "6.33",
diff --git a/external_imported/vcpkg/versions/p-/plf-list.json b/external_imported/vcpkg/versions/p-/plf-list.json
index 27493b787..2f3e7ddf8 100644
--- a/external_imported/vcpkg/versions/p-/plf-list.json
+++ b/external_imported/vcpkg/versions/p-/plf-list.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "942af5dfaf5c57871605ea4a07e74748cdd3cb71",
+      "version-date": "2019-08-10",
+      "port-version": 2
+    },
     {
       "git-tree": "91600934f8054e05c6716dbcb08f287c2ae22c44",
       "version-string": "2019-08-10",
diff --git a/external_imported/vcpkg/versions/p-/plf-nanotimer.json b/external_imported/vcpkg/versions/p-/plf-nanotimer.json
index c114c1a8a..3d2c5961f 100644
--- a/external_imported/vcpkg/versions/p-/plf-nanotimer.json
+++ b/external_imported/vcpkg/versions/p-/plf-nanotimer.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "13a0687d35296ff50a7db2cea6f3d1f13616036c",
+      "version-date": "2019-08-10",
+      "port-version": 2
+    },
     {
       "git-tree": "f669e0df9a7af5bae94971f1b625143893f3ee72",
       "version-string": "2019-08-10",
diff --git a/external_imported/vcpkg/versions/p-/plf-stack.json b/external_imported/vcpkg/versions/p-/plf-stack.json
index a047b9dfd..b060ffa3a 100644
--- a/external_imported/vcpkg/versions/p-/plf-stack.json
+++ b/external_imported/vcpkg/versions/p-/plf-stack.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c49e48114d693f6ef74eddadd15ceafffb125ac8",
+      "version-date": "2019-08-10",
+      "port-version": 2
+    },
     {
       "git-tree": "a4212c7276e8c1881b76e58ae6d20dafaec3628d",
       "version-string": "2019-08-10",
diff --git a/external_imported/vcpkg/versions/p-/plib.json b/external_imported/vcpkg/versions/p-/plib.json
index c77021e1c..018736342 100644
--- a/external_imported/vcpkg/versions/p-/plib.json
+++ b/external_imported/vcpkg/versions/p-/plib.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "31a68c9911b826a760e8be17864b7d6dc1830e88",
+      "version": "1.8.5",
+      "port-version": 8
+    },
+    {
+      "git-tree": "fe0ee99ffd2bcad6cc3709d85477c174fb9773f7",
+      "version": "1.8.5",
+      "port-version": 7
+    },
     {
       "git-tree": "df2cccd607d973a945593bfec6ef15bd7549e6c0",
       "version": "1.8.5",
diff --git a/external_imported/vcpkg/versions/p-/plog.json b/external_imported/vcpkg/versions/p-/plog.json
index 8850a9fd5..fede13af8 100644
--- a/external_imported/vcpkg/versions/p-/plog.json
+++ b/external_imported/vcpkg/versions/p-/plog.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "773c53426d316bfe1e35ae7cf9a5afe5c41b8a70",
+      "version": "1.1.10",
+      "port-version": 0
+    },
     {
       "git-tree": "8123d0f93ad451c1bbf9cb25b57ea290f4124030",
       "version": "1.1.9",
diff --git a/external_imported/vcpkg/versions/p-/plplot.json b/external_imported/vcpkg/versions/p-/plplot.json
index 4f67b2bde..de2860c2d 100644
--- a/external_imported/vcpkg/versions/p-/plplot.json
+++ b/external_imported/vcpkg/versions/p-/plplot.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "650f7b8973b4a28f84fc0e8ab1711e468417f564",
+      "version-semver": "5.15.0",
+      "port-version": 2
+    },
     {
       "git-tree": "3fb1fa2f2f5f9c3ea3543f5ba3074138be2d2320",
       "version-semver": "5.15.0",
diff --git a/external_imported/vcpkg/versions/p-/plustache.json b/external_imported/vcpkg/versions/p-/plustache.json
index 1c0aa702f..c54754fb0 100644
--- a/external_imported/vcpkg/versions/p-/plustache.json
+++ b/external_imported/vcpkg/versions/p-/plustache.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ed120794f8dee3abcddbf4aafcf13cb76d73dcb4",
+      "version": "0.4.0",
+      "port-version": 4
+    },
     {
       "git-tree": "a3906d7df26b970381ac0f802678c10cab6cd857",
       "version-string": "0.4.0",
diff --git a/external_imported/vcpkg/versions/p-/pmdk.json b/external_imported/vcpkg/versions/p-/pmdk.json
index 89f2fd710..ed5c59c15 100644
--- a/external_imported/vcpkg/versions/p-/pmdk.json
+++ b/external_imported/vcpkg/versions/p-/pmdk.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "b208389a2bc32898f0f4d13c5f222015ce9bd072",
+      "version": "1.12.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "5dc7f0e5a4d6348ac49617010105730775580f78",
+      "version": "1.12.0",
+      "port-version": 1
+    },
     {
       "git-tree": "a5b1d48503eab5f709ccc7cb62630817275f93e5",
       "version": "1.12.0",
diff --git a/external_imported/vcpkg/versions/p-/pmp-library.json b/external_imported/vcpkg/versions/p-/pmp-library.json
new file mode 100644
index 000000000..6195479b4
--- /dev/null
+++ b/external_imported/vcpkg/versions/p-/pmp-library.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "33881ff54702d1e4d2d35ba545953a4044294b22",
+      "version": "3.0.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/p-/pngpp.json b/external_imported/vcpkg/versions/p-/pngpp.json
index 0e5892898..ac502247c 100644
--- a/external_imported/vcpkg/versions/p-/pngpp.json
+++ b/external_imported/vcpkg/versions/p-/pngpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "944223fc9e521ccae17b526845278a3b71ed9bba",
+      "version": "0.2.10",
+      "port-version": 2
+    },
     {
       "git-tree": "088d8489ba3b0778d1612d59682ea0b6b3c2eb88",
       "version": "0.2.10",
diff --git a/external_imported/vcpkg/versions/p-/pngwriter.json b/external_imported/vcpkg/versions/p-/pngwriter.json
index e07508157..c3054759b 100644
--- a/external_imported/vcpkg/versions/p-/pngwriter.json
+++ b/external_imported/vcpkg/versions/p-/pngwriter.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "64ea498d769bb149dfa99fd0e37a5b5e21ff1cf7",
+      "version": "0.7.0",
+      "port-version": 5
+    },
     {
       "git-tree": "4aca96434bc9128c143f8924560e76010cc39b87",
       "version-string": "0.7.0",
diff --git a/external_imported/vcpkg/versions/p-/pocketfft.json b/external_imported/vcpkg/versions/p-/pocketfft.json
new file mode 100644
index 000000000..94cc10276
--- /dev/null
+++ b/external_imported/vcpkg/versions/p-/pocketfft.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "46ffdbd8c95362eee33d5cdf0dce36c77f332a7f",
+      "version-date": "2023-09-25",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/p-/poco.json b/external_imported/vcpkg/versions/p-/poco.json
index 48bf2fe10..a09a403d5 100644
--- a/external_imported/vcpkg/versions/p-/poco.json
+++ b/external_imported/vcpkg/versions/p-/poco.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "659229d449f9bbbdf29ab52068c22fcfc5990bc7",
+      "version": "1.13.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d77c1da4e506a178da0c3d87acde20b8cb0dd550",
+      "version": "1.12.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "baaee315b717f3b0a819aed2f78b8a2059cb1726",
+      "version": "1.12.5",
+      "port-version": 0
+    },
     {
       "git-tree": "5fb22214a00901cbf3697a76442f5f360cbc74ef",
       "version": "1.12.4",
diff --git a/external_imported/vcpkg/versions/p-/podofo.json b/external_imported/vcpkg/versions/p-/podofo.json
index 8d6ab7135..4116f09a1 100644
--- a/external_imported/vcpkg/versions/p-/podofo.json
+++ b/external_imported/vcpkg/versions/p-/podofo.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "f4d60835f5584606317c7c3ea4fbc5187d5d4b00",
+      "version": "0.10.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0323e740780ecead10bd47ca5bfb89ca6140c3b7",
+      "version": "0.10.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "75683a46d35cfff92866f9c559833c7d1962cc55",
+      "version": "0.10.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2b550a1cf9eabeb17534710cb767f971c57184c1",
+      "version": "0.10.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "8282e8f30863ef7d8a84928ef5dbe0625b09fa2a",
+      "version": "0.10.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "179964b988c6b05e259e8e631b2a3db4539589a1",
+      "version": "0.10.0",
+      "port-version": 0
+    },
     {
       "git-tree": "e302c730989d9f85b236c00b51e44dd067af7e6d",
       "version": "0.9.8",
diff --git a/external_imported/vcpkg/versions/p-/polyclipping.json b/external_imported/vcpkg/versions/p-/polyclipping.json
index 3bf5d8474..3675ad3b5 100644
--- a/external_imported/vcpkg/versions/p-/polyclipping.json
+++ b/external_imported/vcpkg/versions/p-/polyclipping.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7de01c0a001bc72c4d934184b3bd4ae97f860c01",
+      "version": "6.4.2",
+      "port-version": 12
+    },
     {
       "git-tree": "bb17ed7201d587053828c88e1bf1f1ed1fc0025a",
       "version-string": "6.4.2",
diff --git a/external_imported/vcpkg/versions/p-/polyhook2.json b/external_imported/vcpkg/versions/p-/polyhook2.json
index 33d7a2951..ba1fc504b 100644
--- a/external_imported/vcpkg/versions/p-/polyhook2.json
+++ b/external_imported/vcpkg/versions/p-/polyhook2.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "00a3d485f743b08f8c407139e5e8210468f44573",
+      "version-date": "2023-08-11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "def3f21d5fdcf75184eff747c70e7dcf5be18517",
+      "version-date": "2023-05-16",
+      "port-version": 2
+    },
+    {
+      "git-tree": "4d6b2480d856d0e6009923d176fb68392e201ac8",
+      "version-date": "2023-05-16",
+      "port-version": 1
+    },
+    {
+      "git-tree": "3e46e50c70de16dfea86f4a7a8ceea6d19b3c46b",
+      "version-date": "2023-05-16",
+      "port-version": 0
+    },
+    {
+      "git-tree": "61f26f962dfbb071aeb0f22c4cfe15e100c0524c",
+      "version-date": "2023-02-24",
+      "port-version": 0
+    },
     {
       "git-tree": "bd2324e09d967fab5a098f0c2d42682abf5b4113",
       "version-date": "2022-03-01",
diff --git a/external_imported/vcpkg/versions/p-/ponder.json b/external_imported/vcpkg/versions/p-/ponder.json
index 0ba234e3e..a89681c44 100644
--- a/external_imported/vcpkg/versions/p-/ponder.json
+++ b/external_imported/vcpkg/versions/p-/ponder.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e88e9908caf5e81e073a7b0fa0e082a6a917df04",
+      "version": "3.0.0",
+      "port-version": 5
+    },
     {
       "git-tree": "82147bc05cb5c080baabe1085f8ab690f71ba6e2",
       "version-string": "3.0.0",
diff --git a/external_imported/vcpkg/versions/p-/poppler.json b/external_imported/vcpkg/versions/p-/poppler.json
index 0e45ad338..f553b2d9f 100644
--- a/external_imported/vcpkg/versions/p-/poppler.json
+++ b/external_imported/vcpkg/versions/p-/poppler.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "59fe9d32b68bf9d4bc186eea35c45ceaddac1848",
+      "version": "23.11.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0c07d1b54b7ce6cd8a4ce8ba9da7cf9f3ae2af70",
+      "version": "23.1.0",
+      "port-version": 4
+    },
+    {
+      "git-tree": "7b2c553e564102940f72ca3c649d651dc8807848",
+      "version": "23.1.0",
+      "port-version": 3
+    },
     {
       "git-tree": "57de7768cd6196be9140b0d59d19444586b5dfc3",
       "version": "23.1.0",
diff --git a/external_imported/vcpkg/versions/p-/portable-file-dialogs.json b/external_imported/vcpkg/versions/p-/portable-file-dialogs.json
new file mode 100644
index 000000000..961a58fc1
--- /dev/null
+++ b/external_imported/vcpkg/versions/p-/portable-file-dialogs.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "c205f3002701aeb61986151fb84016f820f04103",
+      "version": "0.1.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/p-/portable-snippets.json b/external_imported/vcpkg/versions/p-/portable-snippets.json
index 7235f311e..090d30c43 100644
--- a/external_imported/vcpkg/versions/p-/portable-snippets.json
+++ b/external_imported/vcpkg/versions/p-/portable-snippets.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e84e5d30ffa9c566c1a27ff12416163694c8ff26",
+      "version-date": "2019-09-20",
+      "port-version": 4
+    },
     {
       "git-tree": "cb5584d76235e5a975e7c201d244c385cfd1dae7",
       "version-date": "2019-09-20",
diff --git a/external_imported/vcpkg/versions/p-/portaudio.json b/external_imported/vcpkg/versions/p-/portaudio.json
index 9a312f203..557e48435 100644
--- a/external_imported/vcpkg/versions/p-/portaudio.json
+++ b/external_imported/vcpkg/versions/p-/portaudio.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "34d770f3357878c7b7668acf63e7a3095f1b5afc",
+      "version": "19.7",
+      "port-version": 5
+    },
     {
       "git-tree": "25fb6802e88b978f349df2e6af0ecfadb85e9e9b",
       "version": "19.7",
diff --git a/external_imported/vcpkg/versions/p-/portmidi.json b/external_imported/vcpkg/versions/p-/portmidi.json
index a16238053..5400745b8 100644
--- a/external_imported/vcpkg/versions/p-/portmidi.json
+++ b/external_imported/vcpkg/versions/p-/portmidi.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "2e836f32941f2eb402cecca7bff1e0ec566c4287",
+      "version": "2.0.4",
+      "port-version": 3
+    },
+    {
+      "git-tree": "73cae77fb0424c85894d1165fd2cc162bd4cd98a",
+      "version": "2.0.4",
+      "port-version": 2
+    },
     {
       "git-tree": "b8607f833773d8d45e83a3390c2096d28226c1d2",
       "version": "2.0.4",
diff --git a/external_imported/vcpkg/versions/p-/portsmf.json b/external_imported/vcpkg/versions/p-/portsmf.json
index 807b4337a..0c84961b8 100644
--- a/external_imported/vcpkg/versions/p-/portsmf.json
+++ b/external_imported/vcpkg/versions/p-/portsmf.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3fb3e1fa8a02794b84b7a9d15171886845c91474",
+      "version": "239",
+      "port-version": 0
+    },
     {
       "git-tree": "60b00990b46bbac28e91a94533d212be1af49ffb",
       "version": "0.238",
diff --git a/external_imported/vcpkg/versions/p-/ppconsul.json b/external_imported/vcpkg/versions/p-/ppconsul.json
index a5cb66648..7ca915d35 100644
--- a/external_imported/vcpkg/versions/p-/ppconsul.json
+++ b/external_imported/vcpkg/versions/p-/ppconsul.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "15a4740ba0476c6490c353b004eb8acbbdbb8a32",
+      "version": "0.5",
+      "port-version": 5
+    },
     {
       "git-tree": "1de0499185f0f0915b69dbd0d932f2781aa62ecc",
       "version-string": "0.5",
diff --git a/external_imported/vcpkg/versions/p-/ppmagic.json b/external_imported/vcpkg/versions/p-/ppmagic.json
index e631a8826..ba91d765b 100644
--- a/external_imported/vcpkg/versions/p-/ppmagic.json
+++ b/external_imported/vcpkg/versions/p-/ppmagic.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "97538f3bb1177f8239ef9fa0a0f26d4a53100183",
+      "version-date": "2020-07-03",
+      "port-version": 2
+    },
     {
       "git-tree": "7b985dc0f03d5df0b9fb71e88c3a3a4ab0b05d56",
       "version-string": "2020-07-03",
diff --git a/external_imported/vcpkg/versions/p-/pprint.json b/external_imported/vcpkg/versions/p-/pprint.json
index 6f8fe4392..b1ca7b016 100644
--- a/external_imported/vcpkg/versions/p-/pprint.json
+++ b/external_imported/vcpkg/versions/p-/pprint.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f0d7e1794f816538df660aaee158c0d9674b6d46",
+      "version-date": "2019-07-19",
+      "port-version": 3
+    },
     {
       "git-tree": "b2697245181487e6cd80664355c1eaea7aa8f7bf",
       "version-string": "2019-07-19",
diff --git a/external_imported/vcpkg/versions/p-/pqp.json b/external_imported/vcpkg/versions/p-/pqp.json
index 47d44d01a..f52de4160 100644
--- a/external_imported/vcpkg/versions/p-/pqp.json
+++ b/external_imported/vcpkg/versions/p-/pqp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4260f6ff5614f3a8e85aeb773224362635b47337",
+      "version": "1.3",
+      "port-version": 7
+    },
     {
       "git-tree": "1fa6daf5d0017a40b45a47d4827eff295569b4b7",
       "version-string": "1.3",
diff --git a/external_imported/vcpkg/versions/p-/pravila00-enum-string.json b/external_imported/vcpkg/versions/p-/pravila00-enum-string.json
new file mode 100644
index 000000000..0a3a67d04
--- /dev/null
+++ b/external_imported/vcpkg/versions/p-/pravila00-enum-string.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "a5172f6fa4786d4b0d4f41d843e24c04799a2d85",
+      "version-date": "2023-10-16",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/p-/pravila00-make-vector.json b/external_imported/vcpkg/versions/p-/pravila00-make-vector.json
new file mode 100644
index 000000000..3b694dd47
--- /dev/null
+++ b/external_imported/vcpkg/versions/p-/pravila00-make-vector.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "b4a9f4a88cb5645d9a5f6827293bc3732a57e043",
+      "version-date": "2023-04-10",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/p-/proj.json b/external_imported/vcpkg/versions/p-/proj.json
index 0e195241c..6a64b45ee 100644
--- a/external_imported/vcpkg/versions/p-/proj.json
+++ b/external_imported/vcpkg/versions/p-/proj.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "fa1294c10c33d46c0294b3c1952d1c7aa57439a5",
+      "version": "9.3.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6e31164b906c96903b8352e6a9211ae019672ac4",
+      "version": "9.3.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "d3932aae445fce753fd58b103e1dcb0acfff0a39",
+      "version": "9.3.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b3f5ec4ce13a932cb9f05f074e48b386fd5e4130",
+      "version": "9.2.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "e7dc980fc3b1ca19e8ca6aa5b1ad625949229b2e",
+      "version": "9.2.1",
+      "port-version": 0
+    },
     {
       "git-tree": "24665244df24460f20293fc879787852554b16c7",
       "version": "9.2.0",
diff --git a/external_imported/vcpkg/versions/p-/protobuf-c.json b/external_imported/vcpkg/versions/p-/protobuf-c.json
index 7f0316e49..b7aa0fa3d 100644
--- a/external_imported/vcpkg/versions/p-/protobuf-c.json
+++ b/external_imported/vcpkg/versions/p-/protobuf-c.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "32d120b5b3a9225b973b135f632ee82be3e7860b",
+      "version-semver": "1.4.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "f1adcf184e617f9f77bd727e6f5085665e471826",
+      "version-semver": "1.4.1",
+      "port-version": 0
+    },
     {
       "git-tree": "0ff60f2fb0722cbd851e37aebf489207c3743e18",
       "version-semver": "1.4.0",
diff --git a/external_imported/vcpkg/versions/p-/protobuf.json b/external_imported/vcpkg/versions/p-/protobuf.json
index 73ecbe384..470827282 100644
--- a/external_imported/vcpkg/versions/p-/protobuf.json
+++ b/external_imported/vcpkg/versions/p-/protobuf.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8d742753b6c35666168a4178f0aae986740ae42c",
+      "version": "3.21.12",
+      "port-version": 1
+    },
     {
       "git-tree": "3b145508ba614fe26989b23f6317f15bf6467be4",
       "version": "3.21.12",
diff --git a/external_imported/vcpkg/versions/p-/proxsuite.json b/external_imported/vcpkg/versions/p-/proxsuite.json
new file mode 100644
index 000000000..193a49c45
--- /dev/null
+++ b/external_imported/vcpkg/versions/p-/proxsuite.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "d43b63f01c1240a12c85794fdde566064996b845",
+      "version": "0.5.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/p-/proxy.json b/external_imported/vcpkg/versions/p-/proxy.json
index a310c169a..c417ac5c3 100644
--- a/external_imported/vcpkg/versions/p-/proxy.json
+++ b/external_imported/vcpkg/versions/p-/proxy.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "5a1c9b5683c080a7ef0e35f968bc912e0fac88d4",
+      "version": "2.1.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6d6ef205bfb7dac5655566fafba65ebc4df5d961",
+      "version": "2.1.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "02fdcb0499f6f91a041a8e444f33256f4284e808",
+      "version": "2.0.0",
+      "port-version": 0
+    },
     {
       "git-tree": "259a1e2615c5bd167974fcd5d8148434a1040319",
       "version": "1.1.1",
diff --git a/external_imported/vcpkg/versions/p-/proxygen.json b/external_imported/vcpkg/versions/p-/proxygen.json
index 6c1060086..55e58c9d4 100644
--- a/external_imported/vcpkg/versions/p-/proxygen.json
+++ b/external_imported/vcpkg/versions/p-/proxygen.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "dd720dffa16fc78103cb6e6fc9aae13e94d33fb3",
+      "version-string": "2024.01.01.00",
+      "port-version": 0
+    },
+    {
+      "git-tree": "193a933153e2cfab49dd265a48ebeb650a9107e4",
+      "version-string": "2023.10.02.00",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9c24a9089256797b853fdf56833eafa213a51f2d",
+      "version-string": "2023.07.03.00",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8b7e41b105fbb8e30443037e04098621d31a4fb2",
+      "version-string": "2023.05.15.00",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e66bcd352675efbaf2ff458ae1709c165ed26696",
+      "version-string": "2022.07.11.00",
+      "port-version": 1
+    },
     {
       "git-tree": "7f8e28d0d1ec8591df5cdfa602d60e0efaa8ee7a",
       "version-string": "2022.07.11.00",
diff --git a/external_imported/vcpkg/versions/p-/psimd.json b/external_imported/vcpkg/versions/p-/psimd.json
index 81f7b316f..266ff3675 100644
--- a/external_imported/vcpkg/versions/p-/psimd.json
+++ b/external_imported/vcpkg/versions/p-/psimd.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c2958518cdbe3f8902fe0b056cf37bf1eec26137",
+      "version-date": "2021-02-21",
+      "port-version": 2
+    },
     {
       "git-tree": "b67508201a4c33896694e1e5b3ed732bf1bbf0c3",
       "version-string": "2021-02-21",
diff --git a/external_imported/vcpkg/versions/p-/ptc-print.json b/external_imported/vcpkg/versions/p-/ptc-print.json
index c66eaa04f..bce546021 100644
--- a/external_imported/vcpkg/versions/p-/ptc-print.json
+++ b/external_imported/vcpkg/versions/p-/ptc-print.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b5a6a899a1a03b040d2bfd0e2cb9ef5b2e6dcde1",
+      "version": "1.4.1",
+      "port-version": 1
+    },
     {
       "git-tree": "03f588ecdd3b7638a92dd2c61ea3ca0adaa28eb6",
       "version": "1.4.0",
diff --git a/external_imported/vcpkg/versions/p-/pthread.json b/external_imported/vcpkg/versions/p-/pthread.json
index eacfe2e53..2a050c686 100644
--- a/external_imported/vcpkg/versions/p-/pthread.json
+++ b/external_imported/vcpkg/versions/p-/pthread.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e32a8cb12153277234e7c7e04322bdf90580659a",
+      "version": "3.0.0",
+      "port-version": 2
+    },
     {
       "git-tree": "22a35f55dc3993fb589e44781ae36dbdf1c625fa",
       "version-string": "3.0.0",
diff --git a/external_imported/vcpkg/versions/p-/pthreads.json b/external_imported/vcpkg/versions/p-/pthreads.json
index ba81c8c3f..044b0af61 100644
--- a/external_imported/vcpkg/versions/p-/pthreads.json
+++ b/external_imported/vcpkg/versions/p-/pthreads.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2e0a6df2800d3677b941dc6504f083965b7886d9",
+      "version": "3.0.0",
+      "port-version": 14
+    },
     {
       "git-tree": "f4037e12c8075b814cab20c65509b49bd7f59257",
       "version": "3.0.0",
diff --git a/external_imported/vcpkg/versions/p-/pugixml.json b/external_imported/vcpkg/versions/p-/pugixml.json
index d1ef05aa0..dccc7cd1c 100644
--- a/external_imported/vcpkg/versions/p-/pugixml.json
+++ b/external_imported/vcpkg/versions/p-/pugixml.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6e38344aea6e7529afde3895e0885ed5cb0c0542",
+      "version": "1.14",
+      "port-version": 0
+    },
     {
       "git-tree": "4547c4ff9371f06f34f087f2989f884ab3ef7b71",
       "version": "1.13.0",
diff --git a/external_imported/vcpkg/versions/p-/pulsar-client-cpp.json b/external_imported/vcpkg/versions/p-/pulsar-client-cpp.json
new file mode 100644
index 000000000..c4cb48a98
--- /dev/null
+++ b/external_imported/vcpkg/versions/p-/pulsar-client-cpp.json
@@ -0,0 +1,19 @@
+{
+  "versions": [
+    {
+      "git-tree": "f379abbe0e7bc96c4ff51290a2972b6a3a4fc094",
+      "version": "3.4.2",
+      "port-version": 2
+    },
+    {
+      "git-tree": "4dc7014a2c8493a0124f08335cb9056c359604e4",
+      "version": "3.4.2",
+      "port-version": 1
+    },
+    {
+      "git-tree": "f022e5dacbf10b0a6cead0f065ce6ab885b4c9af",
+      "version": "3.4.2",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/p-/pulzed-mini.json b/external_imported/vcpkg/versions/p-/pulzed-mini.json
new file mode 100644
index 000000000..c56daefda
--- /dev/null
+++ b/external_imported/vcpkg/versions/p-/pulzed-mini.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "784f59f1926b4dc6b103c5fdb9142ed0767bdae7",
+      "version": "0.9.14",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/p-/pybind11.json b/external_imported/vcpkg/versions/p-/pybind11.json
index 361969cb3..605fade3c 100644
--- a/external_imported/vcpkg/versions/p-/pybind11.json
+++ b/external_imported/vcpkg/versions/p-/pybind11.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "7001887fb9e72bb5590da8407998dedbb4aa2719",
+      "version": "2.11.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3aeca2d8bc4821ab8e508e9097386fdaa6f12eef",
+      "version": "2.11.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "14db30027dba1e9d7ba976dd0645dac59ec553a8",
+      "version": "2.10.4",
+      "port-version": 1
+    },
+    {
+      "git-tree": "ed50c1b3263ecefd48d008f522bf966c9e4347d1",
+      "version": "2.10.4",
+      "port-version": 0
+    },
     {
       "git-tree": "a3b13210bfd5f8dcbab60336dd54f0ed7230c5c3",
       "version": "2.10.3",
diff --git a/external_imported/vcpkg/versions/p-/python2.json b/external_imported/vcpkg/versions/p-/python2.json
index 8460f2562..7dd282fbf 100644
--- a/external_imported/vcpkg/versions/p-/python2.json
+++ b/external_imported/vcpkg/versions/p-/python2.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "7da4d853b4fdc4a0b1c183b327ef04d1af33c68b",
+      "version": "2.7.18",
+      "port-version": 7
+    },
+    {
+      "git-tree": "c2e0390fa02b868d438156ccfc47bbc85ea98660",
+      "version": "2.7.18",
+      "port-version": 6
+    },
     {
       "git-tree": "33912f36bba22e343da793d7de1a2dde41ab9da0",
       "version": "2.7.18",
diff --git a/external_imported/vcpkg/versions/p-/python3.json b/external_imported/vcpkg/versions/p-/python3.json
index b418509a7..c8f25cfa5 100644
--- a/external_imported/vcpkg/versions/p-/python3.json
+++ b/external_imported/vcpkg/versions/p-/python3.json
@@ -1,5 +1,65 @@
 {
   "versions": [
+    {
+      "git-tree": "196d8baf56879fd416fbcfb05a7033ea61febf24",
+      "version": "3.11.5",
+      "port-version": 4
+    },
+    {
+      "git-tree": "e6acf202b9752a04a0b9557d1ea9e4fa2f427e8d",
+      "version": "3.11.5",
+      "port-version": 3
+    },
+    {
+      "git-tree": "f51d67945e156a17ca72a743f04455a368e73272",
+      "version": "3.11.5",
+      "port-version": 2
+    },
+    {
+      "git-tree": "a428056a4e0e86adce9344f051e4678e50e6cb35",
+      "version": "3.11.5",
+      "port-version": 1
+    },
+    {
+      "git-tree": "52f5c3a91d997108f5acebea1748176156dbefc9",
+      "version": "3.11.5",
+      "port-version": 0
+    },
+    {
+      "git-tree": "905c4ed6b6bb377fc9f7ed367f9ed39259083ba1",
+      "version": "3.11.4",
+      "port-version": 4
+    },
+    {
+      "git-tree": "f4df0070e757f97d325679377298c7de091e75f7",
+      "version": "3.11.4",
+      "port-version": 3
+    },
+    {
+      "git-tree": "4f49a2d2249cb9f81e3a5c83329f383de36faf16",
+      "version": "3.11.4",
+      "port-version": 2
+    },
+    {
+      "git-tree": "531061b4485adebb80364473d227b0edf4ee8ed9",
+      "version": "3.11.4",
+      "port-version": 1
+    },
+    {
+      "git-tree": "1ed9aa74ea44d2e4457410ad732d165317c6f8aa",
+      "version": "3.11.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a0f1ead9323b9521f3c3016469f028be712c0252",
+      "version": "3.10.7",
+      "port-version": 7
+    },
+    {
+      "git-tree": "d3a8a2c668d77aaf0fa1862c6b3eff5018519e19",
+      "version": "3.10.7",
+      "port-version": 6
+    },
     {
       "git-tree": "43e3e2453968d19d674b96aea99718541c96d852",
       "version": "3.10.7",
diff --git a/external_imported/vcpkg/versions/q-/qca.json b/external_imported/vcpkg/versions/q-/qca.json
index 2184a5c29..24a56166d 100644
--- a/external_imported/vcpkg/versions/q-/qca.json
+++ b/external_imported/vcpkg/versions/q-/qca.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "f4a6f18e51fa29570a8e35e20668aa86e60f6ff7",
+      "version": "2.3.7",
+      "port-version": 0
+    },
+    {
+      "git-tree": "32321bfdc0e4563ed40687585b48038d551f6149",
+      "version": "2.3.5",
+      "port-version": 2
+    },
+    {
+      "git-tree": "a5af940aef31f91feea8cb12daddb268a7cf4608",
+      "version": "2.3.5",
+      "port-version": 1
+    },
     {
       "git-tree": "8d7c38d61627baf7ae04a7f069fad8f506e5f82d",
       "version": "2.3.5",
diff --git a/external_imported/vcpkg/versions/q-/qcoro.json b/external_imported/vcpkg/versions/q-/qcoro.json
new file mode 100644
index 000000000..245b1245b
--- /dev/null
+++ b/external_imported/vcpkg/versions/q-/qcoro.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "98bf3c0f6c546401e5976e2d474765d838050fd3",
+      "version": "0.10.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0b82c30bd542212b17946094149433dda747515f",
+      "version": "0.9.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/q-/qcustomplot.json b/external_imported/vcpkg/versions/q-/qcustomplot.json
index f22ce4aeb..f8b3bc04d 100644
--- a/external_imported/vcpkg/versions/q-/qcustomplot.json
+++ b/external_imported/vcpkg/versions/q-/qcustomplot.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "9777b7a98f80b51511f9a266053ff1373c5aee72",
+      "version": "2.1.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "5fa5ea943fa7d0b35422a11a04d01491745bf990",
+      "version": "2.1.1",
+      "port-version": 0
+    },
     {
       "git-tree": "7fcc18d2987ed5b3af803d5e0ac5c9afd026fc37",
       "version": "2.0.1",
diff --git a/external_imported/vcpkg/versions/q-/qoi.json b/external_imported/vcpkg/versions/q-/qoi.json
new file mode 100644
index 000000000..770c27d48
--- /dev/null
+++ b/external_imported/vcpkg/versions/q-/qoi.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "2501f06dad0450b48676652e4f8b053071f874fb",
+      "version-date": "2023-08-10",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/q-/qoixx.json b/external_imported/vcpkg/versions/q-/qoixx.json
new file mode 100644
index 000000000..acf5e0376
--- /dev/null
+++ b/external_imported/vcpkg/versions/q-/qoixx.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "6f87694d4959ad4f4cd207b7225b73c113157855",
+      "version-date": "2022-12-07",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/q-/qpid-proton.json b/external_imported/vcpkg/versions/q-/qpid-proton.json
index 3a79b51b0..d722b9145 100644
--- a/external_imported/vcpkg/versions/q-/qpid-proton.json
+++ b/external_imported/vcpkg/versions/q-/qpid-proton.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "0a69d30375c0d5848b12cbdcaab4820b9d639223",
+      "version": "0.38.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "848bfbdf75b68fadddcddd6c501d095a8f21f63d",
+      "version": "0.38.0",
+      "port-version": 0
+    },
     {
       "git-tree": "32527f3a05b41a04ad42ab2e0827dfee69b18ec0",
       "version": "0.37.0",
diff --git a/external_imported/vcpkg/versions/q-/qscintilla.json b/external_imported/vcpkg/versions/q-/qscintilla.json
index 75e97b7a1..931d5e268 100644
--- a/external_imported/vcpkg/versions/q-/qscintilla.json
+++ b/external_imported/vcpkg/versions/q-/qscintilla.json
@@ -1,9 +1,14 @@
 {
   "versions": [
     {
-      "git-tree": "7698a4b73e3ed54fd0cf66cf9e754317763750cb",
+      "git-tree": "9b86f317966ccab4dcfecbff35fd2496ac29541e",
       "version": "2.13.4",
-      "port-version": 0
+      "port-version": 2
+    },
+    {
+      "git-tree": "4920a3d743be78d0d5be05132786873977677665",
+      "version": "2.13.4",
+      "port-version": 1
     },
     {
       "git-tree": "63f2d1f0287a6d61b5c85b428920b0fbe102adec",
diff --git a/external_imported/vcpkg/versions/q-/qt-advanced-docking-system.json b/external_imported/vcpkg/versions/q-/qt-advanced-docking-system.json
index db37199fb..c15fb6f1c 100644
--- a/external_imported/vcpkg/versions/q-/qt-advanced-docking-system.json
+++ b/external_imported/vcpkg/versions/q-/qt-advanced-docking-system.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "628b6d9fc6b20da81f18c74bb9673c083b5206b9",
+      "version": "4.2.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ce9908d6903a343d5b5d22750c4c29fe097ff418",
+      "version": "4.2.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "98c020f1eda45cfc5d1eee6369bbdb5c1a52825a",
+      "version": "4.0.3",
+      "port-version": 1
+    },
+    {
+      "git-tree": "152f31d925c8f0d75f41ad9f656abbe8f30c1b44",
+      "version": "4.0.3",
+      "port-version": 0
+    },
     {
       "git-tree": "0e2298c569112e322898697b9680723c35a55cd5",
       "version": "3.8.2",
diff --git a/external_imported/vcpkg/versions/q-/qt.json b/external_imported/vcpkg/versions/q-/qt.json
index 3ea4d61d8..9fa4f9fe3 100644
--- a/external_imported/vcpkg/versions/q-/qt.json
+++ b/external_imported/vcpkg/versions/q-/qt.json
@@ -1,5 +1,40 @@
 {
   "versions": [
+    {
+      "git-tree": "cd6a0c4b4f56e81db4ba5fedc5e07b8b2b896780",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "766ab007c0d703f29b892b6496af3ae458aab9c0",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9f70e09569f7a3dc11f7efe9acb2fe646e0354c9",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8c51d3d09aed70fbbe41960be34875dbe211a88d",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "da935525e462432e2d89412513704c8c4d04b7cd",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ecd656220f58ebf6651801b9fc439ba5d8f6b62b",
+      "version": "6.5.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6e93109d6a3a6a6ef65470ce467a01a931a723b9",
+      "version": "6.4.3",
+      "port-version": 1
+    },
     {
       "git-tree": "01393fc66b4bf4414a40b6dfe895e025c1778fe6",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/qt3d.json b/external_imported/vcpkg/versions/q-/qt3d.json
index 90bd05b2f..39089e1ca 100644
--- a/external_imported/vcpkg/versions/q-/qt3d.json
+++ b/external_imported/vcpkg/versions/q-/qt3d.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "f14756a5feca4f0d8dcf6161ef129c1144b25af6",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d3c2532ea0b16b01aeb17c7e1bcdb0e4c1d3ff0a",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "02baf17bff3c96ec6e5e2f79576528b095b6f6b8",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6363a118373460520fc6cfe3f2bc70625d76ea7e",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c367d3e4afaa2271628a5608d9144f912c830236",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "56a3a7a27a022640d0f965aeb1d56ece4c63006d",
+      "version": "6.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "c3c0d24660bf42af84e27538b011b36e831ba942",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/qt5-3d.json b/external_imported/vcpkg/versions/q-/qt5-3d.json
index 634f01473..a23229781 100644
--- a/external_imported/vcpkg/versions/q-/qt5-3d.json
+++ b/external_imported/vcpkg/versions/q-/qt5-3d.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "a0f73e9f36b58bb194c21d495bb0a4e8fc9a4d41",
+      "version": "5.15.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "fd3a019873d77d8951d137f3f5a4bd3ae8fc147a",
+      "version": "5.15.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "be8daf4a45d4f87e7867bd9110ba974c3db3aa00",
+      "version": "5.15.10",
+      "port-version": 1
+    },
+    {
+      "git-tree": "3476fd00f9a99f7993cb70835c78fc9d998f1974",
+      "version": "5.15.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f4cd3a7a30f7ffa9d3bd66371293a0427f3d2fa9",
+      "version": "5.15.9",
+      "port-version": 0
+    },
     {
       "git-tree": "57e1c6c944b35af1de16f24d8871c42c44e90b23",
       "version": "5.15.8",
diff --git a/external_imported/vcpkg/versions/q-/qt5-activeqt.json b/external_imported/vcpkg/versions/q-/qt5-activeqt.json
index d32b5099d..5fa77c024 100644
--- a/external_imported/vcpkg/versions/q-/qt5-activeqt.json
+++ b/external_imported/vcpkg/versions/q-/qt5-activeqt.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "c5105fba54b83485f15754fe858dd8b8318a88eb",
+      "version": "5.15.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "45de7184a24f527bbccf33013f1c6667d5e6f668",
+      "version": "5.15.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "7862807b3cdd0a4647ba2f9db4eb3c1338536e9e",
+      "version": "5.15.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "76aaf6a6e40ee58a40a88ae725c230623cfd0762",
+      "version": "5.15.9",
+      "port-version": 0
+    },
     {
       "git-tree": "a65cfaf1d3657b487df5a7d18e886b4c638ec182",
       "version": "5.15.8",
diff --git a/external_imported/vcpkg/versions/q-/qt5-androidextras.json b/external_imported/vcpkg/versions/q-/qt5-androidextras.json
index fae4ea892..1d295ac37 100644
--- a/external_imported/vcpkg/versions/q-/qt5-androidextras.json
+++ b/external_imported/vcpkg/versions/q-/qt5-androidextras.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "bb3e1de9127ad2c1bda4ebf21f441adfa5facf63",
+      "version": "5.15.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "382ab13532eab56c75a3a4150a8bdb2cf9464200",
+      "version": "5.15.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "11a9fee7235b0de6c54f4b1ee65e103bc94a6075",
+      "version": "5.15.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e877be0fe4f6fbb37edc7f97f90fcddb32dc7913",
+      "version": "5.15.9",
+      "port-version": 0
+    },
     {
       "git-tree": "f0dd22632c0c5ceef5194777566b4a18a5222504",
       "version": "5.15.8",
diff --git a/external_imported/vcpkg/versions/q-/qt5-base.json b/external_imported/vcpkg/versions/q-/qt5-base.json
index e9619a976..359d37620 100644
--- a/external_imported/vcpkg/versions/q-/qt5-base.json
+++ b/external_imported/vcpkg/versions/q-/qt5-base.json
@@ -1,5 +1,85 @@
 {
   "versions": [
+    {
+      "git-tree": "2932bd39b46da13edde2cf5715b0308c53b1d426",
+      "version": "5.15.12",
+      "port-version": 1
+    },
+    {
+      "git-tree": "e2a320e35b03c115bc674b6006f7a8a9907835b0",
+      "version": "5.15.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c09b409166a1cb3e4881ee5b0081069227a7ae45",
+      "version": "5.15.11",
+      "port-version": 1
+    },
+    {
+      "git-tree": "d26db1adfbe17c91d6c2858d38290ce2277cd8a3",
+      "version": "5.15.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0ee4e266c41088bae8b961529841eebc5696a749",
+      "version": "5.15.10",
+      "port-version": 7
+    },
+    {
+      "git-tree": "3910010e49edbdf2f8a7bf917ee51f5ab888769e",
+      "version": "5.15.10",
+      "port-version": 6
+    },
+    {
+      "git-tree": "36129e539ff3df7757bf3074b977dd32d6e85926",
+      "version": "5.15.10",
+      "port-version": 5
+    },
+    {
+      "git-tree": "bd1318b6c207ed69b8a5c5ab75f143263b6bc522",
+      "version": "5.15.10",
+      "port-version": 4
+    },
+    {
+      "git-tree": "527c937f1bc15252b1397447900bc93c13f16b5e",
+      "version": "5.15.10",
+      "port-version": 3
+    },
+    {
+      "git-tree": "47eb2c538dd9220fcf44ca6a72f1aa64e4fb8d26",
+      "version": "5.15.10",
+      "port-version": 2
+    },
+    {
+      "git-tree": "3088e8df941cddfdc7dd5a5b6efae7386cb3d388",
+      "version": "5.15.10",
+      "port-version": 1
+    },
+    {
+      "git-tree": "a90de4f154709723b9a837d25b1572ca33f2a8b4",
+      "version": "5.15.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9107483664812c119937623d402bea6395c24cd3",
+      "version": "5.15.9",
+      "port-version": 3
+    },
+    {
+      "git-tree": "1137d1509e996fa4bde14ec310c6955b50408c8a",
+      "version": "5.15.9",
+      "port-version": 2
+    },
+    {
+      "git-tree": "11985a25ce0eb80b4a66246fc5962140f454225f",
+      "version": "5.15.9",
+      "port-version": 1
+    },
+    {
+      "git-tree": "0dbe8668bfb03c43ce4fec9edf98da248e581774",
+      "version": "5.15.9",
+      "port-version": 0
+    },
     {
       "git-tree": "51c0d7f3e15a664dba88e8c9891d4a045661f4ec",
       "version": "5.15.8",
diff --git a/external_imported/vcpkg/versions/q-/qt5-canvas3d.json b/external_imported/vcpkg/versions/q-/qt5-canvas3d.json
index c7ed4c737..cee8affb1 100644
--- a/external_imported/vcpkg/versions/q-/qt5-canvas3d.json
+++ b/external_imported/vcpkg/versions/q-/qt5-canvas3d.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "335184e95b862a3548cd14e4336e870082fde3d1",
+      "version": "0",
+      "port-version": 2
+    },
     {
       "git-tree": "7c880f36024ca1fe697ebfa6bfe4b9ae47c9b33a",
       "version-string": "0",
diff --git a/external_imported/vcpkg/versions/q-/qt5-charts.json b/external_imported/vcpkg/versions/q-/qt5-charts.json
index 21a21aa97..bf38bfaf0 100644
--- a/external_imported/vcpkg/versions/q-/qt5-charts.json
+++ b/external_imported/vcpkg/versions/q-/qt5-charts.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "4a21040c82b8746bd1feb8d7830defa42f9cff7a",
+      "version": "5.15.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "917d2b5a9ee716031be8a168076d174ec6712788",
+      "version": "5.15.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "21cff64c27a49de9aeebf975fa890c7de64b2ede",
+      "version": "5.15.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "98ec3df0bc18cf346f84be63fe575377f87ab053",
+      "version": "5.15.9",
+      "port-version": 0
+    },
     {
       "git-tree": "db1bc883831fe3210e65d31c3b20e16c75537ed8",
       "version": "5.15.8",
diff --git a/external_imported/vcpkg/versions/q-/qt5-connectivity.json b/external_imported/vcpkg/versions/q-/qt5-connectivity.json
index 52b4fcc31..c693ddb7d 100644
--- a/external_imported/vcpkg/versions/q-/qt5-connectivity.json
+++ b/external_imported/vcpkg/versions/q-/qt5-connectivity.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "4de0c9f255cb601469ad4e7d42e55f14e27dba11",
+      "version": "5.15.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b623eee1a6ff0e483580654a60d9e6eb4787be92",
+      "version": "5.15.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8b9f8ae492cb7fb0ad32863279bfd1796779a043",
+      "version": "5.15.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b92dc1593710e8d95fd2c43788bb9d5788bc0d83",
+      "version": "5.15.9",
+      "port-version": 0
+    },
     {
       "git-tree": "af4a5faaf3806fbd80687094df924674b6b6a125",
       "version": "5.15.8",
diff --git a/external_imported/vcpkg/versions/q-/qt5-datavis3d.json b/external_imported/vcpkg/versions/q-/qt5-datavis3d.json
index 233b13918..54af97fd7 100644
--- a/external_imported/vcpkg/versions/q-/qt5-datavis3d.json
+++ b/external_imported/vcpkg/versions/q-/qt5-datavis3d.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "d4af2cbfb2191d9525a25bfcf9b7633cfa62890b",
+      "version": "5.15.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "80f8d82fe81bf098c225ca52b7ea49478512be67",
+      "version": "5.15.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "734a01140c22505395e27032cdbadebbdb0d1cdc",
+      "version": "5.15.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d35ff571bdff05dbbb479eee33741e289137abdd",
+      "version": "5.15.9",
+      "port-version": 0
+    },
     {
       "git-tree": "6a0e0d0e81419e2844de1d518444fd79400f965a",
       "version": "5.15.8",
diff --git a/external_imported/vcpkg/versions/q-/qt5-declarative.json b/external_imported/vcpkg/versions/q-/qt5-declarative.json
index c616a54be..53ea5449e 100644
--- a/external_imported/vcpkg/versions/q-/qt5-declarative.json
+++ b/external_imported/vcpkg/versions/q-/qt5-declarative.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "859e5b2f20ce9e1d782b9a2190b273249f5fb44e",
+      "version": "5.15.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "880d2e0ae6f6042a0cb4baae85bc7bc7c950b746",
+      "version": "5.15.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c7cc59aec9e75dc548a741b01b94b13438904e99",
+      "version": "5.15.10",
+      "port-version": 1
+    },
+    {
+      "git-tree": "141dbdc4e7d234f55b336444a9e0a7f5add2e32b",
+      "version": "5.15.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d3485a7652a098831fc278dd06952308704ed906",
+      "version": "5.15.9",
+      "port-version": 1
+    },
+    {
+      "git-tree": "c1e284599a1003dcb722972309215a0e13155f7b",
+      "version": "5.15.9",
+      "port-version": 0
+    },
     {
       "git-tree": "cacc1062f632a0f2984356abcbeb690c18eecfa4",
       "version": "5.15.8",
diff --git a/external_imported/vcpkg/versions/q-/qt5-doc.json b/external_imported/vcpkg/versions/q-/qt5-doc.json
index aaed42b9a..c92997cf8 100644
--- a/external_imported/vcpkg/versions/q-/qt5-doc.json
+++ b/external_imported/vcpkg/versions/q-/qt5-doc.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "b67cd829b2cdff91e51d2da5651a98d4d02cc6e2",
+      "version": "5.15.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8e2640c2eff33d0d16d7a3168aeb75bccb8fbc37",
+      "version": "5.15.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "260c42f72e3b608905415b0570f98a354264d9e0",
+      "version": "5.15.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c3f3b6a93468d062c26ccfb117d42bc988fb20a0",
+      "version": "5.15.9",
+      "port-version": 0
+    },
     {
       "git-tree": "ce002bfdb26ee7bd9a4fe8c953a899ce0afa74f1",
       "version": "5.15.8",
diff --git a/external_imported/vcpkg/versions/q-/qt5-gamepad.json b/external_imported/vcpkg/versions/q-/qt5-gamepad.json
index 1d38e0a11..7a82f9ebb 100644
--- a/external_imported/vcpkg/versions/q-/qt5-gamepad.json
+++ b/external_imported/vcpkg/versions/q-/qt5-gamepad.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "7aa1ca558402bd1cedda0c2c466a51bc1272f8ff",
+      "version": "5.15.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9a02c1cd4d355720fc3b2af9d0ddad446279a731",
+      "version": "5.15.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "556adf6709fe319be9960166e72a30c03372d370",
+      "version": "5.15.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f26357a04aa8c322ef4eb762501e153c6aaf2fa3",
+      "version": "5.15.9",
+      "port-version": 0
+    },
     {
       "git-tree": "f5c4a80b19479a187dba37aeaaab4a0b4eabc02c",
       "version": "5.15.8",
diff --git a/external_imported/vcpkg/versions/q-/qt5-graphicaleffects.json b/external_imported/vcpkg/versions/q-/qt5-graphicaleffects.json
index 9490f0272..a6a25be37 100644
--- a/external_imported/vcpkg/versions/q-/qt5-graphicaleffects.json
+++ b/external_imported/vcpkg/versions/q-/qt5-graphicaleffects.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "27e65ecf7fdd5ff87e1409d76edbfcec7da55415",
+      "version": "5.15.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "209e1c20fbc69e0bd69bf50aad1a5b049f7cf5fd",
+      "version": "5.15.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "53cf70df24a80e1b6c72b85f9d6ff8c4765b7af2",
+      "version": "5.15.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "cc31ed992b42598677d387fc1d8736b312c957e5",
+      "version": "5.15.9",
+      "port-version": 0
+    },
     {
       "git-tree": "12b13611d9c467a5502523a796e71238bebb3eb6",
       "version": "5.15.8",
diff --git a/external_imported/vcpkg/versions/q-/qt5-imageformats.json b/external_imported/vcpkg/versions/q-/qt5-imageformats.json
index 684534a7a..4148a5e13 100644
--- a/external_imported/vcpkg/versions/q-/qt5-imageformats.json
+++ b/external_imported/vcpkg/versions/q-/qt5-imageformats.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "22923758113a31c2d0570b192358fecb3e3a4c2f",
+      "version": "5.15.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ea581d5a2583209a4b276fd9a20f8c04194e29c0",
+      "version": "5.15.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "39d5acff58afd279f8249487ea29263910b24220",
+      "version": "5.15.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2f076f78b7733120039477509c1472f270ad3e88",
+      "version": "5.15.9",
+      "port-version": 1
+    },
+    {
+      "git-tree": "889e130592f375153e49fc8d334204ccdaf6010d",
+      "version": "5.15.9",
+      "port-version": 0
+    },
     {
       "git-tree": "51299732d963e9fa181b759715ecf78b4ee01698",
       "version": "5.15.8",
diff --git a/external_imported/vcpkg/versions/q-/qt5-location.json b/external_imported/vcpkg/versions/q-/qt5-location.json
index 868e117ce..567740194 100644
--- a/external_imported/vcpkg/versions/q-/qt5-location.json
+++ b/external_imported/vcpkg/versions/q-/qt5-location.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "c27c0c3d8bf68ec89a3b0a7e75192d2b5a6eb970",
+      "version": "5.15.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "55991602e3deb4103599fc04c287a4959c847016",
+      "version": "5.15.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "fc2aca1d6bd39aba9d6e45651d8f2908e3a555c8",
+      "version": "5.15.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "dcf89830b5916153b3bb982f389b3d034ed3e0fd",
+      "version": "5.15.9",
+      "port-version": 1
+    },
+    {
+      "git-tree": "b5380b9e781af61e3e32a65248aa7eae321214ae",
+      "version": "5.15.9",
+      "port-version": 0
+    },
     {
       "git-tree": "a435ee12c98f4b76b372e29f7c562adea269d0e1",
       "version": "5.15.8",
diff --git a/external_imported/vcpkg/versions/q-/qt5-macextras.json b/external_imported/vcpkg/versions/q-/qt5-macextras.json
index a4a6690fe..286434299 100644
--- a/external_imported/vcpkg/versions/q-/qt5-macextras.json
+++ b/external_imported/vcpkg/versions/q-/qt5-macextras.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "480132dc9a67d2dfcbb94be62c8d35f31a901a86",
+      "version": "5.15.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a50e9a0fc524758440c3715855627b8b8bd531f0",
+      "version": "5.15.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "12b1fde22a5acf67e0ac9e5066ff280363131c14",
+      "version": "5.15.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "055e2050aaf199ae2b8ada774ae2ec5c76dc1141",
+      "version": "5.15.9",
+      "port-version": 0
+    },
     {
       "git-tree": "0f09f1569ac92f2a01e9f00b9b3e912de8d1ec03",
       "version": "5.15.8",
diff --git a/external_imported/vcpkg/versions/q-/qt5-mqtt.json b/external_imported/vcpkg/versions/q-/qt5-mqtt.json
index 29ebc5e89..e8d0ab065 100644
--- a/external_imported/vcpkg/versions/q-/qt5-mqtt.json
+++ b/external_imported/vcpkg/versions/q-/qt5-mqtt.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "380e4063bfa14b26f098b4ae1244c1a09f1ca5f8",
+      "version": "5.15.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e0fc4bdfce63f3f7410762189b98448182f9b3ab",
+      "version": "5.15.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "398e7c0eab3505667a21ba09a66acbaf434f2469",
+      "version": "5.15.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "bada513b94e08f849d485063acaf985344960091",
+      "version": "5.15.9",
+      "port-version": 0
+    },
     {
       "git-tree": "a4db323b888193bbda28b58b39652a26d4749f18",
       "version": "5.15.8",
diff --git a/external_imported/vcpkg/versions/q-/qt5-multimedia.json b/external_imported/vcpkg/versions/q-/qt5-multimedia.json
index 54f7e6bb4..7e973235c 100644
--- a/external_imported/vcpkg/versions/q-/qt5-multimedia.json
+++ b/external_imported/vcpkg/versions/q-/qt5-multimedia.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "f9b0f60b7c990d5f202833234f553ba4424c471d",
+      "version": "5.15.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e4c6f73398cdab1711339020a1dfe0630e0f89c4",
+      "version": "5.15.11",
+      "port-version": 1
+    },
+    {
+      "git-tree": "3c3d01a70310ae2d017d0e08428b1902c45b872f",
+      "version": "5.15.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a6c4649e892aeb5e8c154336702ee48f0dfcfcf9",
+      "version": "5.15.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "79586b3e3936c0f3f7e4ec1ed42cadb7fb464050",
+      "version": "5.15.9",
+      "port-version": 0
+    },
     {
       "git-tree": "a380134b399bd02c84d5240f3e6381c9605613a2",
       "version": "5.15.8",
diff --git a/external_imported/vcpkg/versions/q-/qt5-networkauth.json b/external_imported/vcpkg/versions/q-/qt5-networkauth.json
index aa4c484ac..4a2ba69f2 100644
--- a/external_imported/vcpkg/versions/q-/qt5-networkauth.json
+++ b/external_imported/vcpkg/versions/q-/qt5-networkauth.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "3ebb64c3ef7457b6050874adc7fa69e1797613c1",
+      "version": "5.15.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2245d4d7c2e1064fd19a893f34ee247bdb07322b",
+      "version": "5.15.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "dae7f812fc32b8659a16029d431fe0fe0156681e",
+      "version": "5.15.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "bd367c42034978d2fe8e73265e9dbd18eb18cbdd",
+      "version": "5.15.9",
+      "port-version": 0
+    },
     {
       "git-tree": "37b1dbc52bd3008a7ca6f224b2c477be5b590c73",
       "version": "5.15.8",
diff --git a/external_imported/vcpkg/versions/q-/qt5-purchasing.json b/external_imported/vcpkg/versions/q-/qt5-purchasing.json
index b3c014339..d361f1b87 100644
--- a/external_imported/vcpkg/versions/q-/qt5-purchasing.json
+++ b/external_imported/vcpkg/versions/q-/qt5-purchasing.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "ede9ad9a147c9f953d0b1ea54f7a6ed1f3c37cbe",
+      "version": "5.15.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "714b9adc89ab6a09174e73be5497e982e4e830fa",
+      "version": "5.15.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9769b05f79a109d7fcd2ace8c3500638504f586b",
+      "version": "5.15.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "50f67d52fdd3dd85f8d02b7b14074a7dcf573ead",
+      "version": "5.15.9",
+      "port-version": 0
+    },
     {
       "git-tree": "fac98903a6cab2776756d60696bbfc63509cb4b7",
       "version": "5.15.8",
diff --git a/external_imported/vcpkg/versions/q-/qt5-quickcontrols.json b/external_imported/vcpkg/versions/q-/qt5-quickcontrols.json
index 54d0a0347..2281b072b 100644
--- a/external_imported/vcpkg/versions/q-/qt5-quickcontrols.json
+++ b/external_imported/vcpkg/versions/q-/qt5-quickcontrols.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "fbb429884146fe7493bf515aa1762c495de51c9b",
+      "version": "5.15.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9e63a158c8c9551554c2986dab6d771efabd38c7",
+      "version": "5.15.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "342b8c5a23f4f9690bedb464a32e171dbb5ef2e4",
+      "version": "5.15.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e50966048714ac6d7e309ff3f7b07f848d6c4cbe",
+      "version": "5.15.9",
+      "port-version": 0
+    },
     {
       "git-tree": "216c7c7cbdce99d9243b50236cb14ab65720c724",
       "version": "5.15.8",
diff --git a/external_imported/vcpkg/versions/q-/qt5-quickcontrols2.json b/external_imported/vcpkg/versions/q-/qt5-quickcontrols2.json
index fa634eeee..eb665385e 100644
--- a/external_imported/vcpkg/versions/q-/qt5-quickcontrols2.json
+++ b/external_imported/vcpkg/versions/q-/qt5-quickcontrols2.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "8ed4347c3fe7f8e2d57a5aa06b03d5b6a1c37e93",
+      "version": "5.15.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e1d335409f6c5c9af37eb6721b5d68d78a8dbdb1",
+      "version": "5.15.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e22bfd152605c0559014192e82b46e465e16dac6",
+      "version": "5.15.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "bc05632d8e9b8d4914b3787433fe508dade58f55",
+      "version": "5.15.9",
+      "port-version": 0
+    },
     {
       "git-tree": "ce95955e6e1dadc2b37464200d62f7f8421adc13",
       "version": "5.15.8",
diff --git a/external_imported/vcpkg/versions/q-/qt5-remoteobjects.json b/external_imported/vcpkg/versions/q-/qt5-remoteobjects.json
index 21fd7b54d..342a87889 100644
--- a/external_imported/vcpkg/versions/q-/qt5-remoteobjects.json
+++ b/external_imported/vcpkg/versions/q-/qt5-remoteobjects.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "c46f7b7f674a1ac79a7c8edc63c1e4e16c23c6d6",
+      "version": "5.15.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "83e7e782900b0f016a0f7b659e6cb235f7677cf7",
+      "version": "5.15.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6f93d74b2bcca02aee5e9e4e7e0126f5c445aeaa",
+      "version": "5.15.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2a24133acd1d8a33e3cbdca79de311b291d18b0a",
+      "version": "5.15.9",
+      "port-version": 0
+    },
     {
       "git-tree": "7dc7b7c919bafb726a7be0c919f14c96d239d095",
       "version": "5.15.8",
diff --git a/external_imported/vcpkg/versions/q-/qt5-script.json b/external_imported/vcpkg/versions/q-/qt5-script.json
index 5cae18302..1eda08e40 100644
--- a/external_imported/vcpkg/versions/q-/qt5-script.json
+++ b/external_imported/vcpkg/versions/q-/qt5-script.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "ac33071fd5ddde84d056539669c67071e85f3691",
+      "version": "5.15.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d4c21b90523ce92847d4b1f675a84ba4f34a9710",
+      "version": "5.15.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "bf51477b296f65a9b1548f1f895fb123aba0c792",
+      "version": "5.15.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d15191c2760ad90868e2f1f9b430a378f3b049f8",
+      "version": "5.15.9",
+      "port-version": 0
+    },
     {
       "git-tree": "a41ea5542a7f045fbf76026f81b2ce2f143cff9a",
       "version": "5.15.8",
diff --git a/external_imported/vcpkg/versions/q-/qt5-scxml.json b/external_imported/vcpkg/versions/q-/qt5-scxml.json
index 263e140c1..c476f83c3 100644
--- a/external_imported/vcpkg/versions/q-/qt5-scxml.json
+++ b/external_imported/vcpkg/versions/q-/qt5-scxml.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "cc9e39cd307b641892aec0e5a2972c781ac68f20",
+      "version": "5.15.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6eb406a4e80cd474efe6f42e896438b7b90ee96c",
+      "version": "5.15.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "26f667cea870335a6f46ca414baa020c8f6aba35",
+      "version": "5.15.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "85edf08e60bcd7025af68908b62fd39dccc22b4e",
+      "version": "5.15.9",
+      "port-version": 0
+    },
     {
       "git-tree": "9e4132deecb0af1b0a0351d2e28cf45ce9a40621",
       "version": "5.15.8",
diff --git a/external_imported/vcpkg/versions/q-/qt5-sensors.json b/external_imported/vcpkg/versions/q-/qt5-sensors.json
index 58cbda549..0d191b590 100644
--- a/external_imported/vcpkg/versions/q-/qt5-sensors.json
+++ b/external_imported/vcpkg/versions/q-/qt5-sensors.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "b437048a241025e9baaf71a07587958d11e7dfd2",
+      "version": "5.15.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5883a76574d6f2b6077898a5fd3ca52d1788dd88",
+      "version": "5.15.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "dbca7fa67ff94eee8d6e3de297d737170190ff6f",
+      "version": "5.15.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "36b4ecf4a66c6c8152157e94c91626d559d17fee",
+      "version": "5.15.9",
+      "port-version": 0
+    },
     {
       "git-tree": "37f42a4f1235e29d71cd14af250e3ee5a15de97b",
       "version": "5.15.8",
diff --git a/external_imported/vcpkg/versions/q-/qt5-serialbus.json b/external_imported/vcpkg/versions/q-/qt5-serialbus.json
index 1df946992..3300fe677 100644
--- a/external_imported/vcpkg/versions/q-/qt5-serialbus.json
+++ b/external_imported/vcpkg/versions/q-/qt5-serialbus.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "4c22dac467d42914d078721e71c047eba6738518",
+      "version": "5.15.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a1259ec9f3eea78cad8e057fbc7d765a47929154",
+      "version": "5.15.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "66becab038e0bc1ebd91613c96f32203edfd2933",
+      "version": "5.15.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5cadf58b50b49925073fafb754be7da26b893630",
+      "version": "5.15.9",
+      "port-version": 0
+    },
     {
       "git-tree": "37153882132a0701ac327cd5051af0b8e49b7bc6",
       "version": "5.15.8",
diff --git a/external_imported/vcpkg/versions/q-/qt5-serialport.json b/external_imported/vcpkg/versions/q-/qt5-serialport.json
index 73bc9e24e..9d9d2878d 100644
--- a/external_imported/vcpkg/versions/q-/qt5-serialport.json
+++ b/external_imported/vcpkg/versions/q-/qt5-serialport.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "8339392414afac8b6d179b19ad01db6460d77318",
+      "version": "5.15.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "081a6b53bdb5d7dd70f8e8315deaa8e71a160714",
+      "version": "5.15.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "051b6d588faeba97c3ee9e53e96c5a619ac38352",
+      "version": "5.15.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3db00ae0c957077673d439f3c84d58680dd76090",
+      "version": "5.15.9",
+      "port-version": 0
+    },
     {
       "git-tree": "aaeca01bff54a12e6796d5d2208910e2e4b953c5",
       "version": "5.15.8",
diff --git a/external_imported/vcpkg/versions/q-/qt5-speech.json b/external_imported/vcpkg/versions/q-/qt5-speech.json
index 3dac0bb70..c45866ba8 100644
--- a/external_imported/vcpkg/versions/q-/qt5-speech.json
+++ b/external_imported/vcpkg/versions/q-/qt5-speech.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "213220011e61695380694601622b75e4bd781a8f",
+      "version": "5.15.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "bf9d4d8eab1658f34274dcdf5e83c2624e7727bb",
+      "version": "5.15.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3530341f63252d313281374bb000e761889a0de6",
+      "version": "5.15.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0a8a7c0b36409296d3d03d3b346ee684f9342e77",
+      "version": "5.15.9",
+      "port-version": 0
+    },
     {
       "git-tree": "3e77ae03d7a86138f8b9995ce0760310f6477632",
       "version": "5.15.8",
diff --git a/external_imported/vcpkg/versions/q-/qt5-svg.json b/external_imported/vcpkg/versions/q-/qt5-svg.json
index 76579bd81..34a397a19 100644
--- a/external_imported/vcpkg/versions/q-/qt5-svg.json
+++ b/external_imported/vcpkg/versions/q-/qt5-svg.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "f47fe4971f6a0d3fc7991fc6dfa76f4dab3ef6c3",
+      "version": "5.15.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c938a0870f30cebe24c31abefa8ac8a8dc60722a",
+      "version": "5.15.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "632ca34b395881412e1694d350f605a2dd6d54f0",
+      "version": "5.15.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a16175a9771d1e7556bcfb785956f0ce5afc26fb",
+      "version": "5.15.9",
+      "port-version": 1
+    },
+    {
+      "git-tree": "2182d0b3d29d1e3c4cf58c5a93e896f304d86805",
+      "version": "5.15.9",
+      "port-version": 0
+    },
     {
       "git-tree": "2e2b2b3fc8842ad5afe280847ebf39954a72de64",
       "version": "5.15.8",
diff --git a/external_imported/vcpkg/versions/q-/qt5-tools.json b/external_imported/vcpkg/versions/q-/qt5-tools.json
index d6e93cf31..3420a04ae 100644
--- a/external_imported/vcpkg/versions/q-/qt5-tools.json
+++ b/external_imported/vcpkg/versions/q-/qt5-tools.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "350c9197bc751e17c5e0ea532322f1483a6bf1e4",
+      "version": "5.15.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5b41d2e4f17b9cbcb85f1fe67b9e1adfaa70a0cb",
+      "version": "5.15.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c3e934f75a0e506d6c3329e0fa0b2a56d6f71324",
+      "version": "5.15.10",
+      "port-version": 1
+    },
+    {
+      "git-tree": "994691ced838ba1d2eab1f5531e9ebfc4bd046f1",
+      "version": "5.15.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "504602318bcd6faffa35b309bbf083860792bab6",
+      "version": "5.15.9",
+      "port-version": 0
+    },
     {
       "git-tree": "4a12956237942365c39cf8d98a51874bb6329c72",
       "version": "5.15.8",
diff --git a/external_imported/vcpkg/versions/q-/qt5-translations.json b/external_imported/vcpkg/versions/q-/qt5-translations.json
index 33e462690..c8eac9ddf 100644
--- a/external_imported/vcpkg/versions/q-/qt5-translations.json
+++ b/external_imported/vcpkg/versions/q-/qt5-translations.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "87a765320bb699ab1b716b5a4bcc1cc70efc8239",
+      "version": "5.15.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0d49653566c4a0eae04e6b56cb9b3904b7c826af",
+      "version": "5.15.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "7a8ae0c894141bd285fa02a23a9d4eb6f40604aa",
+      "version": "5.15.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d7cbb16a11e55adb2e957a5ed4828e7b2d1037b9",
+      "version": "5.15.9",
+      "port-version": 0
+    },
     {
       "git-tree": "bc4bd1d81b2929a66be97b04a78c1ad901438ede",
       "version": "5.15.8",
diff --git a/external_imported/vcpkg/versions/q-/qt5-virtualkeyboard.json b/external_imported/vcpkg/versions/q-/qt5-virtualkeyboard.json
index d992efa10..857676808 100644
--- a/external_imported/vcpkg/versions/q-/qt5-virtualkeyboard.json
+++ b/external_imported/vcpkg/versions/q-/qt5-virtualkeyboard.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "d0a93247e4efaad743aa47711f947efa6a4424ea",
+      "version": "5.15.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "144f57127630eec25443579a16d72fd4eb2c0378",
+      "version": "5.15.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "eca137a635e6a4aa62a40609dc1a09029ca02733",
+      "version": "5.15.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5653adcb47c0b00c694d7a311c893da13fc3a2a2",
+      "version": "5.15.9",
+      "port-version": 1
+    },
+    {
+      "git-tree": "97391cc291fbe059b044e26c3718b1e6f2fb831c",
+      "version": "5.15.9",
+      "port-version": 0
+    },
     {
       "git-tree": "6aac3d5b8af9387d6b487283a4105056626872f3",
       "version": "5.15.8",
diff --git a/external_imported/vcpkg/versions/q-/qt5-wayland.json b/external_imported/vcpkg/versions/q-/qt5-wayland.json
index 0b5e377c7..0b221a16e 100644
--- a/external_imported/vcpkg/versions/q-/qt5-wayland.json
+++ b/external_imported/vcpkg/versions/q-/qt5-wayland.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "44d19f3afd9be463c0cce1fa189dcb08d7ad9c82",
+      "version": "5.15.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "1fe250be41e03ec6404fb5b38d8db2d52e68ef78",
+      "version": "5.15.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f45281462dfeef2426bd9e6cc4d15d87fdd5f888",
+      "version": "5.15.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "955af6470f524a9537ae0d2d72e7857497c46a9c",
+      "version": "5.15.9",
+      "port-version": 0
+    },
     {
       "git-tree": "b64c3f347e804369e84b3bf03bd2a233cca38d3e",
       "version": "5.15.8",
diff --git a/external_imported/vcpkg/versions/q-/qt5-webchannel.json b/external_imported/vcpkg/versions/q-/qt5-webchannel.json
index 60a8a85af..1a16957cc 100644
--- a/external_imported/vcpkg/versions/q-/qt5-webchannel.json
+++ b/external_imported/vcpkg/versions/q-/qt5-webchannel.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "c21a5e697bcf761c902064dec1325d34e016e9fc",
+      "version": "5.15.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "834b6ab045a2739e6fa6d85f3687423e66417d7a",
+      "version": "5.15.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "688b1af87eb544cc7828bfa75df01c0dc2efe4d8",
+      "version": "5.15.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "7f5d72f36efa8cdd8b1d248b124f99f4a0e58fb0",
+      "version": "5.15.9",
+      "port-version": 0
+    },
     {
       "git-tree": "18c9307e7a141b9a2c34f64978ac1cb79fd2ecf4",
       "version": "5.15.8",
diff --git a/external_imported/vcpkg/versions/q-/qt5-webengine.json b/external_imported/vcpkg/versions/q-/qt5-webengine.json
index 3294d7ab4..726e580aa 100644
--- a/external_imported/vcpkg/versions/q-/qt5-webengine.json
+++ b/external_imported/vcpkg/versions/q-/qt5-webengine.json
@@ -1,5 +1,40 @@
 {
   "versions": [
+    {
+      "git-tree": "0bebbe2367c700cb1c309eb1d1f0b22b1463c61a",
+      "version": "5.15.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f4609e43287d1db55e04e0553d85039adebffacd",
+      "version": "5.15.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "cf5ac17e7409f445cbfc1cffc1d8a138a24582a0",
+      "version": "5.15.10",
+      "port-version": 1
+    },
+    {
+      "git-tree": "f088e5761d91d1539ecb60aed67afcdb197dccef",
+      "version": "5.15.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "47b6255a30e17081a1a9c0201c243ce6d908cca9",
+      "version": "5.15.9",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0bc99174795ada551c8bfbae6d829a2a8fd208a8",
+      "version": "5.15.8",
+      "port-version": 3
+    },
+    {
+      "git-tree": "c4972fb3229687755800c282621e1ef1939f3e66",
+      "version": "5.15.8",
+      "port-version": 2
+    },
     {
       "git-tree": "4cb036e21b5fa8db1033739c264a6bf2936960db",
       "version": "5.15.8",
diff --git a/external_imported/vcpkg/versions/q-/qt5-webglplugin.json b/external_imported/vcpkg/versions/q-/qt5-webglplugin.json
index 6a23a5e22..a68926745 100644
--- a/external_imported/vcpkg/versions/q-/qt5-webglplugin.json
+++ b/external_imported/vcpkg/versions/q-/qt5-webglplugin.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "6a7a0fbea2f47aa24e61928cbe4836164d66a8f9",
+      "version": "5.15.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0b2a0472f4b91117a702ed605c443c71d3393862",
+      "version": "5.15.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d056d88bfc82130467bf524e8c7285850b71c594",
+      "version": "5.15.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "75f0da5f93d565350bc869ac119786e63354a520",
+      "version": "5.15.9",
+      "port-version": 0
+    },
     {
       "git-tree": "977263a84371c116e22d1a717ea32ffc6e756777",
       "version": "5.15.8",
diff --git a/external_imported/vcpkg/versions/q-/qt5-websockets.json b/external_imported/vcpkg/versions/q-/qt5-websockets.json
index 6255a0e07..78337ed41 100644
--- a/external_imported/vcpkg/versions/q-/qt5-websockets.json
+++ b/external_imported/vcpkg/versions/q-/qt5-websockets.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "478c0eea8a9b638f8e79083d16c3ad3ba378f60f",
+      "version": "5.15.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b8589b41f61533965537f8a6701d2f8ea015f1f2",
+      "version": "5.15.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "13d815c2479b4a47f6b617ff2e1de3379d0a44b7",
+      "version": "5.15.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b3c4b86102dc85ea933fb02679306d4a514174c7",
+      "version": "5.15.9",
+      "port-version": 0
+    },
     {
       "git-tree": "ed5892e08e10ad7b2fd2182b8c7abd99f1dce3ed",
       "version": "5.15.8",
diff --git a/external_imported/vcpkg/versions/q-/qt5-webview.json b/external_imported/vcpkg/versions/q-/qt5-webview.json
index 83962ea7d..823246942 100644
--- a/external_imported/vcpkg/versions/q-/qt5-webview.json
+++ b/external_imported/vcpkg/versions/q-/qt5-webview.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "359fb6a2340821f4e375568af9f3736c9f8d5989",
+      "version": "5.15.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "bf926864a58a4777c63c25c856ea5f4c544b1fd2",
+      "version": "5.15.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d70201641dafec375d2ac778fce87a73c5f451b3",
+      "version": "5.15.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2e9fa2103c4b8f738ba8786e9c2a5bacb4bd935c",
+      "version": "5.15.9",
+      "port-version": 0
+    },
     {
       "git-tree": "e4f6c2e023e8e7f69fdaa6537f1313d204985fef",
       "version": "5.15.8",
diff --git a/external_imported/vcpkg/versions/q-/qt5-winextras.json b/external_imported/vcpkg/versions/q-/qt5-winextras.json
index 7791664f8..cc5c9f76d 100644
--- a/external_imported/vcpkg/versions/q-/qt5-winextras.json
+++ b/external_imported/vcpkg/versions/q-/qt5-winextras.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "3094cfb44b2edc3284f22378ac0a9d2f847d9d85",
+      "version": "5.15.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "913946992a50661e33d59f4452c3d322d5341400",
+      "version": "5.15.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9e40a0af7bdebc43925450f1e51e2c2f8b49a067",
+      "version": "5.15.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ea585f612f4470a52c850b68664f95fea52c766e",
+      "version": "5.15.9",
+      "port-version": 0
+    },
     {
       "git-tree": "a4eb0168059ec5bd56cb782a005b91262ebd421f",
       "version": "5.15.8",
diff --git a/external_imported/vcpkg/versions/q-/qt5-x11extras.json b/external_imported/vcpkg/versions/q-/qt5-x11extras.json
index b07bcecb8..478172c3c 100644
--- a/external_imported/vcpkg/versions/q-/qt5-x11extras.json
+++ b/external_imported/vcpkg/versions/q-/qt5-x11extras.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "467b63b17863b78a47afe3675bf35de910c09871",
+      "version": "5.15.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "08d312b3a2e6e0016aa0b6d2bdac1d3d3d864d23",
+      "version": "5.15.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e2042c06d5c6007ed72d9df7f8dae8d1148eb1cc",
+      "version": "5.15.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ac580d5217fcefbe07addb7cf42bc7fb03eba7eb",
+      "version": "5.15.9",
+      "port-version": 0
+    },
     {
       "git-tree": "c2128b2d148d58eabb6106cbc093713c62a20c5f",
       "version": "5.15.8",
diff --git a/external_imported/vcpkg/versions/q-/qt5-xmlpatterns.json b/external_imported/vcpkg/versions/q-/qt5-xmlpatterns.json
index 4dd354984..efc309484 100644
--- a/external_imported/vcpkg/versions/q-/qt5-xmlpatterns.json
+++ b/external_imported/vcpkg/versions/q-/qt5-xmlpatterns.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "7d7d728be5f21d29d82251a43f4600bde5b5c404",
+      "version": "5.15.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8d366bc9e9536eb8db2be796afdd35eb0ad05c8b",
+      "version": "5.15.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "510fff85661604ebc087feee170a857bc08d31d9",
+      "version": "5.15.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a4a3d14b71ff33f5aef8316c46fc2b0c79f7ea60",
+      "version": "5.15.9",
+      "port-version": 0
+    },
     {
       "git-tree": "1a97f09b82d545dceecdfb2b2320fa88535ea595",
       "version": "5.15.8",
diff --git a/external_imported/vcpkg/versions/q-/qt5.json b/external_imported/vcpkg/versions/q-/qt5.json
index 9f5617b55..ab28c8db5 100644
--- a/external_imported/vcpkg/versions/q-/qt5.json
+++ b/external_imported/vcpkg/versions/q-/qt5.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "1af37c43da6f3720cf0d805fb13333a42a07fce9",
+      "version": "5.15.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "83c7937d7b60d45f3f9e5006fa6cbcdead8b62e0",
+      "version": "5.15.11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "50fe0254b5caf977970fd69dfed756799a54120c",
+      "version": "5.15.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "1b194230fb11eb7bf37092591a917b024ac96a9b",
+      "version": "5.15.9",
+      "port-version": 0
+    },
     {
       "git-tree": "f770e40ee8bc91d18f208ceee737d2c8abfaf8d0",
       "version": "5.15.8",
diff --git a/external_imported/vcpkg/versions/q-/qt5compat.json b/external_imported/vcpkg/versions/q-/qt5compat.json
index d0821b58b..02836c823 100644
--- a/external_imported/vcpkg/versions/q-/qt5compat.json
+++ b/external_imported/vcpkg/versions/q-/qt5compat.json
@@ -1,5 +1,40 @@
 {
   "versions": [
+    {
+      "git-tree": "31c729a2bff1118d75ed9a363b40ac1aac61fe54",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e1188f496b30f0e4a2ed309dca03300c2f02c983",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "796db01f88dcd7b21cc357eba90ed6b1ce6c1669",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8153e0282226733d322d2e2c42c1d488a913875a",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8c953278f6f3c74a1976bc64198fea68cdb8cf33",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b4a3c116018e4b6f97e056193c82af718bda10b3",
+      "version": "6.5.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0a79c6cfb2113f764e603ee13a4c12493f16b6d5",
+      "version": "6.4.3",
+      "port-version": 1
+    },
     {
       "git-tree": "df64fa51cb5aaaf59cbe76b91476db4b5c272152",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/qtactiveqt.json b/external_imported/vcpkg/versions/q-/qtactiveqt.json
index 0ca3bd6c7..50d3decd6 100644
--- a/external_imported/vcpkg/versions/q-/qtactiveqt.json
+++ b/external_imported/vcpkg/versions/q-/qtactiveqt.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "c3d7834925f1e86b2a662b94aeefb9a7faa835a6",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b4e05b3e0a3ce481228324c480ac8106295a6cec",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "fb16d16a9320a29c3186de89a48d7407bcf00766",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e4e77288d2aeeb9e4d69bb5bf56833ddb0b2414a",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ac50dbe92da8d65ed1109b1d5aa29ee11a3c8484",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "906e0b257af28f5690907f94ad79bc95f3a34f5c",
+      "version": "6.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "f2ba14310d63294366c151fc33bc22807ddc4381",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/qtapplicationmanager.json b/external_imported/vcpkg/versions/q-/qtapplicationmanager.json
index 31fc3ff60..f09b61f3a 100644
--- a/external_imported/vcpkg/versions/q-/qtapplicationmanager.json
+++ b/external_imported/vcpkg/versions/q-/qtapplicationmanager.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "6d94e40cc436fab8410d8d104453a39c77ea39c3",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "1baea015b866f295c1724220bf214796a8013d8a",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "df9800b840b0972676b0d95ef8b7e86986e5a24b",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "46708d0e771040647dcd94e89eb2b7be73f4008b",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "176431e9f906352e8c2d98e040ae240f5e1af12b",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "02767f9ffe5a4a96fa2555440e17e92d1795548d",
+      "version": "6.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "abe5601cca736c754b78f7451584d76fa06387f7",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/qtbase.json b/external_imported/vcpkg/versions/q-/qtbase.json
index 65d833607..f3a6f6a57 100644
--- a/external_imported/vcpkg/versions/q-/qtbase.json
+++ b/external_imported/vcpkg/versions/q-/qtbase.json
@@ -1,5 +1,135 @@
 {
   "versions": [
+    {
+      "git-tree": "99b63c90d57e03fb23c3750b28f70e810c981474",
+      "version": "6.6.1",
+      "port-version": 9
+    },
+    {
+      "git-tree": "5e2e2b00fd42bc15c333b7dded4e7db4109ca11f",
+      "version": "6.6.1",
+      "port-version": 8
+    },
+    {
+      "git-tree": "f21d3613038a80d31b8b1aaec2c16a55f45da52e",
+      "version": "6.6.1",
+      "port-version": 7
+    },
+    {
+      "git-tree": "755a330be8ae94a58fc0030d666abd8355ba44f2",
+      "version": "6.6.1",
+      "port-version": 6
+    },
+    {
+      "git-tree": "1b947014e92b75d7bf37427fc4a9ce3fd463af2c",
+      "version": "6.6.1",
+      "port-version": 5
+    },
+    {
+      "git-tree": "7e1dba7994d7d228fee34f8f5b646e7d9aff62ac",
+      "version": "6.6.1",
+      "port-version": 4
+    },
+    {
+      "git-tree": "b85d2c16c027edb173f51037d9c5a3e05746efa0",
+      "version": "6.6.1",
+      "port-version": 3
+    },
+    {
+      "git-tree": "43986c6051eb870340850c13b94ea6cb9a28925c",
+      "version": "6.6.1",
+      "port-version": 2
+    },
+    {
+      "git-tree": "1a05b4f8f0ecf48816dfe2dd648bf0b1202d771e",
+      "version": "6.6.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "4e2fc7540c9a576e44a03dcdb011864e6ecdff8a",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "11861d085aeee91737a5dede66bb78845d99b0e7",
+      "version": "6.6.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "eb1e1a00df34c350c817ee3d9ab90d2c52ced194",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "348dbf9cdcda0559adb72c98c249e06f8a2e50e8",
+      "version": "6.5.3",
+      "port-version": 1
+    },
+    {
+      "git-tree": "8ff10ec91d1eda17f49dd867924e6e034a0abd5c",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d3e2f2eea0533fae78469704453203038e8e838a",
+      "version": "6.5.2",
+      "port-version": 1
+    },
+    {
+      "git-tree": "cb0ae3e8e3b92dc1272047ea709b83b93e0e880d",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "198ba2cfff57e3ccc7a2f6f40002127d8d0abb6e",
+      "version": "6.5.1",
+      "port-version": 3
+    },
+    {
+      "git-tree": "384ddcfe175f58d6f498c91f6b8e790bb6ad70ac",
+      "version": "6.5.1",
+      "port-version": 2
+    },
+    {
+      "git-tree": "f5e0f416352dc6207bf48ac656e3747140232a31",
+      "version": "6.5.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "ce56d3e7af720645f1c4be18d11e659c1d3e48bf",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8a00cef259fdf1a9198f95e0618c98b7f1b21527",
+      "version": "6.5.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "a66d81c3d9432499f24c76df346a4daf5725f90b",
+      "version": "6.5.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "501903e9d1d55ca5dbeee2ff61c8c846e77fe7b3",
+      "version": "6.5.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "cc1cc5c1a5d6a7c4c10feebe8d43a069d3a375a7",
+      "version": "6.4.3",
+      "port-version": 3
+    },
+    {
+      "git-tree": "b694b6e51c89c8610540165e6e8b3a236acb4301",
+      "version": "6.4.3",
+      "port-version": 2
+    },
+    {
+      "git-tree": "425f6dcfce1eadab0723c4ec5e9085da0272ab6d",
+      "version": "6.4.3",
+      "port-version": 1
+    },
     {
       "git-tree": "89edfb1ac3a234d7bdaefcaf2f9d77981bafd9db",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/qtcharts.json b/external_imported/vcpkg/versions/q-/qtcharts.json
index 7bafe6243..ba0a60904 100644
--- a/external_imported/vcpkg/versions/q-/qtcharts.json
+++ b/external_imported/vcpkg/versions/q-/qtcharts.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "95a1151d8a815110f6641a373411d5b2783fe89b",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "da08464343df644146582857a4f560da79b76f06",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "84c40bfb820f201f6e431fff8298e82acd0e7951",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "489227e7e214d04f752a3838e9d802b0d0fab4f9",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b89cbc106466e35706c76769266b48a6f6c4a7dc",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a9cb7b445154fb5957aec5455428d0bde929fcda",
+      "version": "6.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "2cf33ba2051247bb8a97afec744df43f608f995f",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/qtcoap.json b/external_imported/vcpkg/versions/q-/qtcoap.json
index fa3d2a682..7ce0a4990 100644
--- a/external_imported/vcpkg/versions/q-/qtcoap.json
+++ b/external_imported/vcpkg/versions/q-/qtcoap.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "0a696a475ba2d214cb228b5b83ae06a875a342b9",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "7d18fea1869e4a37cde80de8e31294da8aa38fe1",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3c16003284dc1a246e17025e2831ec61e26ebde7",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "447a2ef6ef1109d9022f37eefd18e87db30b983a",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8611534889e66c2c8754af713351c1638a481fd5",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f5c864cedd1698478c95617d82ba56b1dd240ab2",
+      "version": "6.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "0ec02fcfbcdf7429b89d559491dce4912d93533a",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/qtconnectivity.json b/external_imported/vcpkg/versions/q-/qtconnectivity.json
index ab1ed5496..469a036dd 100644
--- a/external_imported/vcpkg/versions/q-/qtconnectivity.json
+++ b/external_imported/vcpkg/versions/q-/qtconnectivity.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "83b610993d47952dc7cf1a117899d35d1232eaf0",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b130a6686447df20bc5ae96bd6153cbac5aa1977",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "09ef297e42457aa0c3bded1d834760d3fefb402a",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "1a77d33e54322275fc5e903d49eb732afbfd3486",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e2f10a4251e58ed95aed33cb1fa65be236b9aa93",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4e87723595352e8637721bea77ffc9c1ad73c031",
+      "version": "6.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "3c207cf03cd774a0540d8199ca4c3e5d1279949b",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/qtdatavis3d.json b/external_imported/vcpkg/versions/q-/qtdatavis3d.json
index 751dc6a84..7c4d23c73 100644
--- a/external_imported/vcpkg/versions/q-/qtdatavis3d.json
+++ b/external_imported/vcpkg/versions/q-/qtdatavis3d.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "22f5db80fc03af7c934a4f48d79e9df63514383f",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "256b706e812d3da7b4eb279e79b04095dcadde98",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "18cd1d93b0a6560a076444c03d76e5339d17abee",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9542502f4e10861691b7da5df3802959120eaa8a",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "72b95739835b676e075323ca63ef5aaff5b08599",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "55f14b0a4149603a1d171ebf4cc99d8dfb2739c3",
+      "version": "6.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "b240e1a2bf68f450855c7a93d6ff755e9e519afb",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/qtdeclarative.json b/external_imported/vcpkg/versions/q-/qtdeclarative.json
index e3a1a3389..8ec466f8d 100644
--- a/external_imported/vcpkg/versions/q-/qtdeclarative.json
+++ b/external_imported/vcpkg/versions/q-/qtdeclarative.json
@@ -1,5 +1,40 @@
 {
   "versions": [
+    {
+      "git-tree": "9f3e05d9f7a05f314c0c38c07b7ceb91b257f8cf",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "7fcbb7948afc44ea3d2d5ebff7cf9fd9c576010c",
+      "version": "6.6.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "a1b753b4c94c95edf6c8ab7bac9c4577f060b9a4",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8d65969f28fb847dbfcd93ae76a2bc3019c6ab81",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "dba82b0a0cafa163aa6742efe438a6a5756efe87",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b2c7cddc945b4f3d00f6cda3b2fc99406a2b8aab",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c0d4c48a9b7ef8047bb2068271fb433deddd3ffb",
+      "version": "6.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "d95042b70d48866fce13c9474b4bedd62ac9be7f",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/qtdeviceutilities.json b/external_imported/vcpkg/versions/q-/qtdeviceutilities.json
index d6d53bb78..d55180ce2 100644
--- a/external_imported/vcpkg/versions/q-/qtdeviceutilities.json
+++ b/external_imported/vcpkg/versions/q-/qtdeviceutilities.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "4d4936a7676dacfd1954ccab4ab56cf66fc29d12",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "49d4c0efba0c96742ba85c1699c5c0a39ac0937d",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "766f2aba652da721ddec6c476ecd2f1481ad030b",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b77242456ce4629252f57093f5039be85c38b376",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5ea28da9eb4c9533b02f9033b1e15e2dab30a411",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "21885adf14cf548990d1a47fb4baf3c75bc00859",
+      "version": "6.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "30f0d972b16884ce41d64dea7550976b4bb102d5",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/qtdoc.json b/external_imported/vcpkg/versions/q-/qtdoc.json
index 52ace62f3..148cce57c 100644
--- a/external_imported/vcpkg/versions/q-/qtdoc.json
+++ b/external_imported/vcpkg/versions/q-/qtdoc.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "5c1caa1eb1ce53c8e7096dc477c0878a885157b6",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ed7bf70cb4a5e21fb76e7f7cc89d234fffd3201e",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "de18f463e0a97321b9eb039e9ddb1674600b993f",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e80b76bc95256a794532cba53f7d72fa4eea8700",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f443139e15746d7e481577bc491bf6aa6bcbe21a",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "54a7e5b497830856aad12dec08b7bb01c37b4999",
+      "version": "6.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "6b0bc07f88766c3534b163684451151b4f7346ef",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/qtgraphs.json b/external_imported/vcpkg/versions/q-/qtgraphs.json
new file mode 100644
index 000000000..77a4b750f
--- /dev/null
+++ b/external_imported/vcpkg/versions/q-/qtgraphs.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "ae9bcc804f472bd60275ad1f73a8cf12574390ea",
+      "version": "6.6.1",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/q-/qtgrpc.json b/external_imported/vcpkg/versions/q-/qtgrpc.json
new file mode 100644
index 000000000..e9f15ec4a
--- /dev/null
+++ b/external_imported/vcpkg/versions/q-/qtgrpc.json
@@ -0,0 +1,34 @@
+{
+  "versions": [
+    {
+      "git-tree": "4abad64b5fbebe9eff491e26fe91212b0c55e094",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "65fd752fc052bc1cbf13d66417e9c6c1aedc238a",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a7dc614f31a77ea86fc407ecdd994ae597ac9e94",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "1763921c7316e6a3aba9414e94f56bb7261df4de",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ee1ca6322fefa8ed2e2b6ac36cd884017773eb3e",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8fb784c858ca56e7ed43e80c0d5937962a2f72b2",
+      "version": "6.5.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/q-/qthttpserver.json b/external_imported/vcpkg/versions/q-/qthttpserver.json
index 74f074768..7398cdf06 100644
--- a/external_imported/vcpkg/versions/q-/qthttpserver.json
+++ b/external_imported/vcpkg/versions/q-/qthttpserver.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "5f14429d07fb8ad95b822c2a330f11cb3423e67d",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "06ae6f390b9ea2025c189ecdadbeddde662b4f6e",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a1bef888af2bc8f653336ee8c817e1e3ea9b514a",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f5824d09b2d937061ee4a7e86a558f63b4a7b1d1",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f1706eb781c19e5462e3571cece087413afb5f9d",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9467160ab402bfd2f04461aee718cb9043d3a094",
+      "version": "6.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "0725482920b4594c7f9345ef21124041aa648075",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/qtimageformats.json b/external_imported/vcpkg/versions/q-/qtimageformats.json
index 9c774a45b..7d98d1e72 100644
--- a/external_imported/vcpkg/versions/q-/qtimageformats.json
+++ b/external_imported/vcpkg/versions/q-/qtimageformats.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "7fc433dbdd7a4f8151de5219b08d18f9a3296f8a",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "bf58f188746291ad38bafa413affa145fe792ee7",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "102ca43cd0aa09e7c5ad522d983179e77bdb563e",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "741e655e5197d49f078cc20e745dfe5bca2cd4d4",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5f034441ea62f407b1950448250507277defe3d1",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6a6f759bf37a0bbc86ccdac3eccbfa40816cbd79",
+      "version": "6.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "bf254edd44146eaac43755ff680855122d2a8705",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/qtinterfaceframework.json b/external_imported/vcpkg/versions/q-/qtinterfaceframework.json
index 43f58f66f..21da0609b 100644
--- a/external_imported/vcpkg/versions/q-/qtinterfaceframework.json
+++ b/external_imported/vcpkg/versions/q-/qtinterfaceframework.json
@@ -1,5 +1,40 @@
 {
   "versions": [
+    {
+      "git-tree": "1bcb4f2fd5111908f77a8b70692b935ec23c2d27",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "aef598c3223519da2bbb08353d365661f8959856",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a9ea8f81cfcb1c6b58edb0ac0fc9301bb28500b8",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "691ae1fd4a36582c8017a79459fd96655784b2ee",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4605314d419179ae92fc2e96a364e75b43a6615e",
+      "version": "6.5.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "f68eabb8f185b700ff927d6bbf92a9442d7997c9",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3c0fac0141ef882b26d1904189a1aafd4dc4540f",
+      "version": "6.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "0bb5fdc2bde29cd083a90c67dc1892d68772dadc",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/qtkeychain-qt6.json b/external_imported/vcpkg/versions/q-/qtkeychain-qt6.json
index aa49b7faf..d004ef1bd 100644
--- a/external_imported/vcpkg/versions/q-/qtkeychain-qt6.json
+++ b/external_imported/vcpkg/versions/q-/qtkeychain-qt6.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "dcb9fb0fa722410c03a4d6fbfdb3608af68de9d5",
+      "version": "0.14.1",
+      "port-version": 0
+    },
     {
       "git-tree": "3733fba48696a40e64b18c2d52d4adc04e6eb22d",
       "version": "0.13.2",
diff --git a/external_imported/vcpkg/versions/q-/qtkeychain.json b/external_imported/vcpkg/versions/q-/qtkeychain.json
index f949e3cad..10ed2378d 100644
--- a/external_imported/vcpkg/versions/q-/qtkeychain.json
+++ b/external_imported/vcpkg/versions/q-/qtkeychain.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "a1cf630fddc142e2a81d7f198eb8c93b40c64a34",
+      "version": "0.14.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "516e24d31a7d28d7b5df372f99cf2780a3a7edbc",
+      "version": "0.13.2",
+      "port-version": 4
+    },
     {
       "git-tree": "eda48d2b83676b8209a40d68b286c570aeed785e",
       "version": "0.13.2",
diff --git a/external_imported/vcpkg/versions/q-/qtlanguageserver.json b/external_imported/vcpkg/versions/q-/qtlanguageserver.json
index 6a2eb47fe..804fe0ee3 100644
--- a/external_imported/vcpkg/versions/q-/qtlanguageserver.json
+++ b/external_imported/vcpkg/versions/q-/qtlanguageserver.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "6f636ad4c9bb289cd9ea0eaa1e876a7189670736",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c8ae2fe1a207df127db279e437784cf63a1a2b7d",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "83bd9154b17ba720fb96ffa099ab841809f676ec",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "fea12c05097db9136b8963271b4a5a5acbe70cb7",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e7f571ef4fa6f184badc8c18c602f8c16e6a6241",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "248be805b9a3c9d95efa723392d374a9c94a5c27",
+      "version": "6.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "9e626f373f4ca8f18e9bde990f75c34aef89baa2",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/qtlocation.json b/external_imported/vcpkg/versions/q-/qtlocation.json
index 27419f012..f58e03d3b 100644
--- a/external_imported/vcpkg/versions/q-/qtlocation.json
+++ b/external_imported/vcpkg/versions/q-/qtlocation.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "b7cf327c103531729a525c4260e10f49ee99cbb6",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f58c7ebb91f69f42a31504da406ece6d5d120593",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a84cfd1e4542f3a6f61d7b9f21090bc15c2e3ee5",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "188fe7e059ff53af461d6ed7c84417e8fe3ce464",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6e02cff0ad1cc428f9cb4b1a3913c2a8e94b5269",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d015b0691674d099f1a1ab1c6b812a914f3bad80",
+      "version": "6.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "9ff1609af9be7a187f0edcc495b0d646dc36a976",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/qtlottie.json b/external_imported/vcpkg/versions/q-/qtlottie.json
index 935d5a4b5..8193dbd07 100644
--- a/external_imported/vcpkg/versions/q-/qtlottie.json
+++ b/external_imported/vcpkg/versions/q-/qtlottie.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "d71d7d1f4430a6830526ff437908abac994479aa",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0c6ada64395147597928ad9d5af7e4fd5e7b4f0e",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3ac387660fd91aebf9fdbeb678d45fb7fc7fb68f",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f23d066ab0193faaa9310eb9c153be241eff7d15",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6520cf06147823c43100bdb90f5028c362f32241",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5c8d01536a9c595ddc58327caac428c86ffe2262",
+      "version": "6.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "d8887bee44785f3c285c103d31d6c1436908ea8f",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/qtmqtt.json b/external_imported/vcpkg/versions/q-/qtmqtt.json
index 38699392f..4dc3b8c5a 100644
--- a/external_imported/vcpkg/versions/q-/qtmqtt.json
+++ b/external_imported/vcpkg/versions/q-/qtmqtt.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "c2551a8b3a525cabea535ca067c247df902082fb",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "7cb4cc198bfe6cec44ec059a9f2f516032edee04",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "400ebbcd072b0b19822683e9060078196e7fafc6",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "db62f07a65602a4590c626e7e85f97c37167c873",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "571de902d0fb9afca17431fa67b9538e9d044435",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3129ca4a0ba4f6e94550a56d32228560cb3483f9",
+      "version": "6.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "67ca11347716f0408dd58bec49c52b8bc3c04da5",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/qtmultimedia.json b/external_imported/vcpkg/versions/q-/qtmultimedia.json
index 8643b0e2c..6db5e28c7 100644
--- a/external_imported/vcpkg/versions/q-/qtmultimedia.json
+++ b/external_imported/vcpkg/versions/q-/qtmultimedia.json
@@ -1,5 +1,45 @@
 {
   "versions": [
+    {
+      "git-tree": "52e73bfd242a271f6147df96f811412a325e2bb7",
+      "version": "6.6.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "04543c19ec8a0f02404b1d58fc84396c3ff50357",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d9c5671dd094e509c890955ee1f267b160bffa2c",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "620531e56bfde6f0c2f158222e6d3fe174e94e7d",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "40dc02a348397ddcb72826b43ac92f904f792003",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d52c87cf46872d7383c2ce8e1ea8fc733278d801",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a10258ebedf8a3f71b8d761b58933e40bf70fac3",
+      "version": "6.5.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "833b2e1397868c7a5ba8f195dca85ac73ddd93bc",
+      "version": "6.4.3",
+      "port-version": 1
+    },
     {
       "git-tree": "2a9eedae47a3b44c519f165c7fbceec2f1deb331",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/qtnetworkauth.json b/external_imported/vcpkg/versions/q-/qtnetworkauth.json
index 385ec93f4..0fe514272 100644
--- a/external_imported/vcpkg/versions/q-/qtnetworkauth.json
+++ b/external_imported/vcpkg/versions/q-/qtnetworkauth.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "89ef84d21ebae8cf3d9270e70ec6cc31ce053df7",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ca177a05c921704e599d85961e52d6ee25d6b862",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "843c419d80c9d87f46e8b9233ce9d4b8813ec173",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4c19109158d36523cce9666a8aecde0339bdb50c",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "fd5935ec38e0763e16b5114b3cfd11a8637356e6",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "767609a9d9713dae6a4c0fd2696a1ec994e28e21",
+      "version": "6.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "e521ca0bc29e9c96290d6765997d4c7df3712599",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/qtopcua.json b/external_imported/vcpkg/versions/q-/qtopcua.json
index 7016ba536..89e2d6027 100644
--- a/external_imported/vcpkg/versions/q-/qtopcua.json
+++ b/external_imported/vcpkg/versions/q-/qtopcua.json
@@ -1,5 +1,55 @@
 {
   "versions": [
+    {
+      "git-tree": "158f8110a6d3d504c64bf24e2ec68552b8e34097",
+      "version": "6.6.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "bbd569723a9e84b190ba938c4f040d0cc83af21d",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8ce50eb99dc427d5b17a01f839f70a3cc2d0cfea",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "87ddfbf3e66eebc33fb874c57a8a98644546f9c4",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9b9a0c669614dfa4a16bfb33f8e0179f88ad267e",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "efd0da43f5e4b4f2b82e450c4221447a911ceec5",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "efe3fbd8d37c121fbb7758de82fac9bd4b315a77",
+      "version": "6.5.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "4e08f45ca76dba44e3de1c48d6210e1d987f44b3",
+      "version": "6.5.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4c9519c0e8f61a9f9cddd4711fb8d8a6139baef9",
+      "version": "6.4.3",
+      "port-version": 2
+    },
+    {
+      "git-tree": "9adaecfcef9783e8df0e92acbd817a4051b11ffb",
+      "version": "6.4.3",
+      "port-version": 1
+    },
     {
       "git-tree": "2271b5bd852c0d9afdcee54b6f335667e7883501",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/qtpositioning.json b/external_imported/vcpkg/versions/q-/qtpositioning.json
index 1dcc9a49c..fd0e3668b 100644
--- a/external_imported/vcpkg/versions/q-/qtpositioning.json
+++ b/external_imported/vcpkg/versions/q-/qtpositioning.json
@@ -1,5 +1,50 @@
 {
   "versions": [
+    {
+      "git-tree": "40a0c9a9db2b270e73edaae7f96073f764ad2078",
+      "version": "6.6.1",
+      "port-version": 2
+    },
+    {
+      "git-tree": "61988bd841be21af4ae3bf2748ac8f6ec071e56c",
+      "version": "6.6.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "8c0c21c983c3f010540a7b11c3896af2388a0531",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "80617e2f8e7186192365523150d3169d9b5a9061",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "59b3203201b5711114749a093647e1deb8f433d3",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2b677b0d3285e9f762ecf7f5c04a139b9bc8b207",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "584655742d0c13b02e93e6ee399db6b815240ae9",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "440f18e3ab2e18be1de9550ed16ddb7164c5b826",
+      "version": "6.5.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "0da142e2b032f345e88aed41ef444684523be056",
+      "version": "6.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "e6e37d5325bba76a2c912dcc537c36f5214e45d7",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/qtquick3d.json b/external_imported/vcpkg/versions/q-/qtquick3d.json
index 470059b68..c6d16e50c 100644
--- a/external_imported/vcpkg/versions/q-/qtquick3d.json
+++ b/external_imported/vcpkg/versions/q-/qtquick3d.json
@@ -1,5 +1,40 @@
 {
   "versions": [
+    {
+      "git-tree": "1fa6e34d1ad27b721739dd6c25b6bc7af7280ba4",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c54c8417690bd1ebe375cd71a48388c6bf1d5782",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b91395b12a8c64d6622a18a54c1f92203c70d591",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "60c7d74e37ffb1ecb1ec573e139995b2ad499bed",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "fbcfad3bdbfc6ce6b91af6022fc4356cb9d7d121",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ab3f7bbf20de8d370d5ac8711f2190d96db87f7e",
+      "version": "6.5.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a927a30de733a8bb6f1149dd4a5a37aeeca8f521",
+      "version": "6.4.3",
+      "port-version": 1
+    },
     {
       "git-tree": "4fcbc24a4f09f2e43f69d771ed87ac6cc187a629",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/qtquick3dphysics.json b/external_imported/vcpkg/versions/q-/qtquick3dphysics.json
index 860df2f1d..6e4770bab 100644
--- a/external_imported/vcpkg/versions/q-/qtquick3dphysics.json
+++ b/external_imported/vcpkg/versions/q-/qtquick3dphysics.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "975bb448a0623c02d5fd2334d5febe0dfa7603e3",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "bcb4cf2b1a80ff497ce7fafc885882aac775a6de",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0cfacf9011d6a0ac51afade0fb3f560d8738c877",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "95a602581be8db01b45f5d82ac888e8b53118bca",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8adad221bc2099c9d260511d3089c8ed2095e08d",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "dc5e1726976f64617ee280062596560c791d4b38",
+      "version": "6.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "2fe5d74e187c7131e0b799d59a9bdf056a921396",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/qtquickeffectmaker.json b/external_imported/vcpkg/versions/q-/qtquickeffectmaker.json
new file mode 100644
index 000000000..916fa9066
--- /dev/null
+++ b/external_imported/vcpkg/versions/q-/qtquickeffectmaker.json
@@ -0,0 +1,34 @@
+{
+  "versions": [
+    {
+      "git-tree": "1862d1d3e018b1e69bf86a2f404e7f94a4ab5213",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4325f77bda6cdda94f1dea48423dbbff111c97ae",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a35495b91cd073de54bb5429d96c5e2f13bcef76",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ca186afca8453a7d146b627732c60522cc1c33e1",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b1281941d8283e90e488de0850976dc7c931f90b",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "fafa1b506a25f0b343afc09ee5708e885ac56076",
+      "version": "6.5.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/q-/qtquicktimeline.json b/external_imported/vcpkg/versions/q-/qtquicktimeline.json
index c28cbcc86..b98789bbf 100644
--- a/external_imported/vcpkg/versions/q-/qtquicktimeline.json
+++ b/external_imported/vcpkg/versions/q-/qtquicktimeline.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "4efff9158d154e6277cbab103862ac4ba8d0ffb2",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8c089d10397f5bb8155b9e96fbbc1f7c1392b53f",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "45b571612589ee8327ee557fb23ebe6196de724a",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "af56a3ad90062d14975145eba080f6feb24ce572",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ee7485463ea5cecaf0588e3981f92f5383b5de23",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3f9caf40f1987be65ca3ce699cd176c4453bea14",
+      "version": "6.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "8272dedda604707ed4bdd252fb855ca828b41719",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/qtremoteobjects.json b/external_imported/vcpkg/versions/q-/qtremoteobjects.json
index 4a3f29912..abee2b81f 100644
--- a/external_imported/vcpkg/versions/q-/qtremoteobjects.json
+++ b/external_imported/vcpkg/versions/q-/qtremoteobjects.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "c76d00e0a4811d4854281c90e35c122470fc179d",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ad083b7bdf871b65fa3f68cda2823f51e8cfe797",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0326668fb829b020e66b53d8595e29fc2ac9d10d",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "82a9a1e72cf8a0111510d408ce6422aee6fe622a",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "31dc41d8cdd92f1338d68c02d92c6d82131d893c",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "cce29bbf6dbad6125ffd59ca29bbc0fd8f9d1108",
+      "version": "6.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "bcb4cf681ccbf7b720b26eb93cf4d656a107652f",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/qtscxml.json b/external_imported/vcpkg/versions/q-/qtscxml.json
index 08194fe23..09094298f 100644
--- a/external_imported/vcpkg/versions/q-/qtscxml.json
+++ b/external_imported/vcpkg/versions/q-/qtscxml.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "02277a0edef829aa3f48719ea0fc080230eeb7d3",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "25674eaa881bd361a4a333903f72a16656ee8ce6",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "38f9e0bb70c3b510e0496dd9678ae8051b7086ef",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8d194a3a3cb4fea142a05be1674fed18ac2475d6",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "aa85f82d720805365a3aee69c035d6a36f458852",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a900efa4d344d886cba9d538ecee24346957a76f",
+      "version": "6.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "60116e86139859df7acad954b48f839240e78272",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/qtsensors.json b/external_imported/vcpkg/versions/q-/qtsensors.json
index f0773c115..7d202ad0f 100644
--- a/external_imported/vcpkg/versions/q-/qtsensors.json
+++ b/external_imported/vcpkg/versions/q-/qtsensors.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "4b3f793528f4f59df67bcd9598c4d5878402ac6b",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "12ee32f418c15549486f21fd1fda55c629b01124",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a68065c7c255aa4e07c10f140cf539ddf9481ca9",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e2212f2468cacf17837a95da5a5d431ea2171a9b",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6563eec17634cc4113685b766af209e123d0403d",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2520f438dda2ec0a8b244be6e1b0fc839e26948d",
+      "version": "6.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "21c5259e771214cb14555b2b0310a4ef4c068294",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/qtserialbus.json b/external_imported/vcpkg/versions/q-/qtserialbus.json
index 120c5579c..cda4c1f6d 100644
--- a/external_imported/vcpkg/versions/q-/qtserialbus.json
+++ b/external_imported/vcpkg/versions/q-/qtserialbus.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "2eaae9870e669397b0ae6da75224f99fb23b6005",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d32539a07f99298f75e4006ff7c966a7d9e9f3ef",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "894d8e4754494932a42bc1e5be1fe3094af6e299",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f19591f70cbb86be89c7c669786a55cda7c26b6b",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2bd32a069bea0cd0bc541e079d5ec54cc00067e1",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8a3dea63a3bfc75f36c32fffd27ff7e300febc8f",
+      "version": "6.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "3dba771f89dc1c260819b83479a1daba0a822936",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/qtserialport.json b/external_imported/vcpkg/versions/q-/qtserialport.json
index 8358f2985..4c3e9664a 100644
--- a/external_imported/vcpkg/versions/q-/qtserialport.json
+++ b/external_imported/vcpkg/versions/q-/qtserialport.json
@@ -1,5 +1,40 @@
 {
   "versions": [
+    {
+      "git-tree": "5bfa96397e62f539b329016ceeb31a4c7fa1b9ed",
+      "version": "6.6.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "b0fe6127a189519fdb6c51b00d1fd14759459f96",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a3224730e30748c1b7c57f6210cd375cd2a45f81",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "74930da655fbc25f2ca02eb8e069732f566dc1d9",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3003ea5237749657ca07cac13518a9b875fdff9b",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6b47a09c1a8be3ad3663701e234582b96c44b919",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e16e52bb2baeb3a3af3d096cf6357e2494b325d6",
+      "version": "6.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "32ebc82d527f3da5977dcfae337c4eab9e6f228f",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/qtshadertools.json b/external_imported/vcpkg/versions/q-/qtshadertools.json
index 2fb92580b..3856b9516 100644
--- a/external_imported/vcpkg/versions/q-/qtshadertools.json
+++ b/external_imported/vcpkg/versions/q-/qtshadertools.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "bf2116fb4c0cdd945db89589094443e4304e043f",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f84dd4728eb9792df16ff1b956ffdb806b04c016",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0c3ce884f17ccc857975e2d0247c13d7f07e733c",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8023bcbf7bd359f9deabd2e7085a856ba279ec75",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "98f9ec2c71036ec90f472a4dd927a8ba3ca58e4c",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "664a5427ec4a5d715d4e09f9bbe1222810ddb898",
+      "version": "6.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "c935fae16c7d0dba049dae8b7cc5709c2cc237cf",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/qtspeech.json b/external_imported/vcpkg/versions/q-/qtspeech.json
index 8e3b0d0bd..78aa66c18 100644
--- a/external_imported/vcpkg/versions/q-/qtspeech.json
+++ b/external_imported/vcpkg/versions/q-/qtspeech.json
@@ -1,5 +1,40 @@
 {
   "versions": [
+    {
+      "git-tree": "3be7b2606212665cabee66d33b125a452ab18b26",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "328df565e4640e536a8f6dde383feed0105fffc8",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a6bb68e8f537cc9f201e30c56122b615fac0da48",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "59c3a9ed2002e2e7123a3bcc2651df6ceff63d53",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8ce40cf354db1eac0e6b54e428113a9cf693af33",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6407a70cfbb2ced50ed116bd1e51b8f3a7e54c8a",
+      "version": "6.5.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3e3478f6de5a8d655c7d97e40b158bc7dfdfa39c",
+      "version": "6.4.3",
+      "port-version": 1
+    },
     {
       "git-tree": "93a6cd65b0db0994bbedef360adbe246b5df6d91",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/qtsvg.json b/external_imported/vcpkg/versions/q-/qtsvg.json
index e25bfc500..f7fc4c151 100644
--- a/external_imported/vcpkg/versions/q-/qtsvg.json
+++ b/external_imported/vcpkg/versions/q-/qtsvg.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "654797512930b598c214eea4834db531b1bba48c",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d1fcfd06b00e6e9f71dbe6e83bb796e89d774228",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5c69ed714c8ae47743eb654424d1bdac65b1ac07",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f71487ce49dbff9ada7e7774ae100114fbe91ad0",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e0cbdb8adac05f3e67bcf95b7c03e8ecb7ae7bc6",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "816b0eb532cf6901c8448ccba8363cfe9938ef5b",
+      "version": "6.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "864d53d5bedd0946c9790551a06258580647478f",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/qttools.json b/external_imported/vcpkg/versions/q-/qttools.json
index 40631ad08..e69cebdf1 100644
--- a/external_imported/vcpkg/versions/q-/qttools.json
+++ b/external_imported/vcpkg/versions/q-/qttools.json
@@ -1,5 +1,45 @@
 {
   "versions": [
+    {
+      "git-tree": "727534f61f2786b70ed0ba51c56fc9dcf2191fb4",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "fabca872bf0e61547c64af674e33d557915d70c7",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5481b3959bc7fbfc044326799d1c32f8ac42fc87",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d8e1794649af0680e60316087e9892502ded7e1b",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5c5bb58bb17966dd13c0ca571efb413a60633c5a",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "98c6a3ef4410b89a77895592986355c43674a881",
+      "version": "6.5.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "1e559212d2b8a05e7e59a21a6fd035e7f0e05347",
+      "version": "6.5.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f3e02443f5bc251e7fdaffdfe1079ac2d1492a42",
+      "version": "6.4.3",
+      "port-version": 1
+    },
     {
       "git-tree": "5cd027bf0913c633be6757fac34fb5cb0ebea6ac",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/qttranslations.json b/external_imported/vcpkg/versions/q-/qttranslations.json
index a657006ad..2da31ed8f 100644
--- a/external_imported/vcpkg/versions/q-/qttranslations.json
+++ b/external_imported/vcpkg/versions/q-/qttranslations.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "c6e6d58f96b90b6fca92cabacdd98fbb9d79585b",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "74986f47f213bebd33f07dbcc8a01c68719ac223",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "32afed31d843b9020943e27ce3ee3357d9f78ae5",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6d17a7c50cfa57c7bc599b7fc4cedcf2d7b8aa95",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "93a8ee0c9d08e15552ec7fe153a7ba70ece3024b",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b75cda024ccc8c8ba3f9a196a9a6149309d93425",
+      "version": "6.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "48b6fd21acccdffacd9390b9b860a5b2e3ba554a",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/qtvirtualkeyboard.json b/external_imported/vcpkg/versions/q-/qtvirtualkeyboard.json
index 5b282747e..38c484a45 100644
--- a/external_imported/vcpkg/versions/q-/qtvirtualkeyboard.json
+++ b/external_imported/vcpkg/versions/q-/qtvirtualkeyboard.json
@@ -1,5 +1,40 @@
 {
   "versions": [
+    {
+      "git-tree": "f9d3720c2252c8c75dc80cc6e48b3bfe7e6d4546",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "1c8dffb036b8e24cbfab8dc4fa4c49cdd02b4221",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5be43c5f5cfe34aafe055afb69d844eedfcaf9e6",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8b5060f737cdf43c76dee17eb62ec5992d5ed6c3",
+      "version": "6.5.2",
+      "port-version": 1
+    },
+    {
+      "git-tree": "56528dbb98540dc6267def8ffa5ea971982870bb",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "dd796171aaa99042b420d9e8bbaf78f68b67ee8c",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2591b11ad8fe48bb353ece5a06c8c27492cb1c1d",
+      "version": "6.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "6cbb11db41affe7798e62dbec8ebb5aa8e728b5d",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/qtwayland.json b/external_imported/vcpkg/versions/q-/qtwayland.json
index f241ad6db..895a8606c 100644
--- a/external_imported/vcpkg/versions/q-/qtwayland.json
+++ b/external_imported/vcpkg/versions/q-/qtwayland.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "a7d47223e41c55acc88b5a851730e253e244a79b",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0bfb4cdda4d01946240acd3f5c2a16a4971f4f4d",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "568cb23f986ab02df124f82d9b9db980092f05fd",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6a7bfa9db606a9849407ef81e575c95a76bb404b",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8f02347f31fc483b355d5cf812a28a278ce27413",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "860b82f5d06b7f0eed9ed449507a47d156cfb4ca",
+      "version": "6.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "f40d9bfc0c57c9facd1b4db9da9eaa7ba565692c",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/qtwebchannel.json b/external_imported/vcpkg/versions/q-/qtwebchannel.json
index 9a798ee8c..cea94ca5f 100644
--- a/external_imported/vcpkg/versions/q-/qtwebchannel.json
+++ b/external_imported/vcpkg/versions/q-/qtwebchannel.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "0ee9cba56e75f0dab9bc3118345e48ae39beef3c",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d0c717f680978ecdd279354833ccc0ee99558f77",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a7793967dcf8f178741f048ff03687f79ffbc894",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "eb71691fb50da5650494a971b17d1939a125c6bf",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a0fcf659cccb63f7924f92e042a08b13bb1a82c7",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "40d6a94591187d5fdfb57beebbbad45aa26a1859",
+      "version": "6.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "27b0c979401491880b2dad92b728e14fb5b7e37b",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/qtwebengine.json b/external_imported/vcpkg/versions/q-/qtwebengine.json
index c7d109d2f..b08a90499 100644
--- a/external_imported/vcpkg/versions/q-/qtwebengine.json
+++ b/external_imported/vcpkg/versions/q-/qtwebengine.json
@@ -1,5 +1,50 @@
 {
   "versions": [
+    {
+      "git-tree": "d2585496a5eec4f9f08df3a69483157640acb3cf",
+      "version": "6.6.1",
+      "port-version": 3
+    },
+    {
+      "git-tree": "0da0e5d03340ccc05f77e90cb898e62237746107",
+      "version": "6.6.1",
+      "port-version": 2
+    },
+    {
+      "git-tree": "f84af713f1090d7294c2707dc722373c06857114",
+      "version": "6.6.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "60b5738d6361d11f4dea17e82df45014ffddd6be",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4df86b328fb276cf0cc5e9803390da032bb79f8a",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0b0b645beae52a3390e57bb7c51c0795dd46ab15",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "da376af9fa349263e8bce84856b15f107c4cc57f",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6ed2eac3d05493db52c3bf31dd9b25893cdc287c",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2d44e1b4b4683a771c3457652baef60f290f1776",
+      "version": "6.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "7a5dda5f36b2686d421d061f93a73da169815174",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/qtwebsockets.json b/external_imported/vcpkg/versions/q-/qtwebsockets.json
index 28cd5b519..656a51b5e 100644
--- a/external_imported/vcpkg/versions/q-/qtwebsockets.json
+++ b/external_imported/vcpkg/versions/q-/qtwebsockets.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "381d32890ac07fd2b095bcd55d9954e962c6b3b6",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "94038f6ef3143b15b2143e2521897b71d33c9750",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "864d67ee1194e13ff845a6ff17efc165c198fd55",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b004232cc580fa7bdee24662b1596e65388933ca",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "389d6233f9bca6f05e244de47e42add02f15f52e",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c325d5163eea00256739eb59ac084c0c386c2b0d",
+      "version": "6.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "89352bf06b1d966295a7b5e919836e9994eef0a9",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/qtwebview.json b/external_imported/vcpkg/versions/q-/qtwebview.json
index 95ffe29ea..0618f133e 100644
--- a/external_imported/vcpkg/versions/q-/qtwebview.json
+++ b/external_imported/vcpkg/versions/q-/qtwebview.json
@@ -1,5 +1,40 @@
 {
   "versions": [
+    {
+      "git-tree": "6d46010ea6deab96d673fa42dfa126641472a808",
+      "version": "6.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "7bcd4ac467a6c0707c315f722457bd691adfcf83",
+      "version": "6.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e442e9a131ddc682ac5adae8a16cafa801100583",
+      "version": "6.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0d831987d781f596f45dbadc4619260f44969ba1",
+      "version": "6.5.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b9854803006b93e0c755bad2e044a79973818db1",
+      "version": "6.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "250bcb4eb32ec73ee4376ec7af6a365c8f8f61f1",
+      "version": "6.5.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "cef8861fee214027a5ade446692eafb6490fb7ea",
+      "version": "6.4.3",
+      "port-version": 1
+    },
     {
       "git-tree": "9b5466522d3ff72530716724384c7122f4ffe8c1",
       "version": "6.4.3",
diff --git a/external_imported/vcpkg/versions/q-/quantlib.json b/external_imported/vcpkg/versions/q-/quantlib.json
index 9774fee3b..5345552d9 100644
--- a/external_imported/vcpkg/versions/q-/quantlib.json
+++ b/external_imported/vcpkg/versions/q-/quantlib.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "3180c49a9f9f6091aafc085dc5fc132c9ec67f9c",
+      "version": "1.33",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8c1dde04a75974f93af79e0ee812e43f1260ab4b",
+      "version": "1.32",
+      "port-version": 0
+    },
+    {
+      "git-tree": "eb8bae6053207228b42d957b8a2e0d187f4173e7",
+      "version": "1.31.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8ac6c8c86ff5e72374f06da30e08bea335041ee6",
+      "version": "1.31",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8a4c25e9a7ca2099d8a528f7477a43fd60a271bb",
+      "version": "1.30",
+      "port-version": 0
+    },
     {
       "git-tree": "0b303bae8ef48f28c1cf4cf88b717756c1a20a1b",
       "version": "1.29",
diff --git a/external_imported/vcpkg/versions/q-/quaternions.json b/external_imported/vcpkg/versions/q-/quaternions.json
index 045481f05..7dc8557d7 100644
--- a/external_imported/vcpkg/versions/q-/quaternions.json
+++ b/external_imported/vcpkg/versions/q-/quaternions.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4d4dbad40b4bc58a73f0c49490f43204130b8bd8",
+      "version": "1.0.0",
+      "port-version": 2
+    },
     {
       "git-tree": "99b78fe0eae2a9ccdad34ba39bc165eccc547c3b",
       "version-string": "1.0.0",
diff --git a/external_imported/vcpkg/versions/q-/quazip.json b/external_imported/vcpkg/versions/q-/quazip.json
index a1da466a1..eb15a68e4 100644
--- a/external_imported/vcpkg/versions/q-/quazip.json
+++ b/external_imported/vcpkg/versions/q-/quazip.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "0e981c8d145807aac756fc5e289f7190cf106c91",
+      "version": "1.4",
+      "port-version": 1
+    },
+    {
+      "git-tree": "20b5c279bf0a7075a9d6cddb9c1de0e4e4adc0ec",
+      "version": "1.4",
+      "port-version": 0
+    },
     {
       "git-tree": "54222787c577b97f8051aa2e69fa89956be6e4b6",
       "version": "1.3",
diff --git a/external_imported/vcpkg/versions/q-/quickfast.json b/external_imported/vcpkg/versions/q-/quickfast.json
index 73a3d345b..a784ef564 100644
--- a/external_imported/vcpkg/versions/q-/quickfast.json
+++ b/external_imported/vcpkg/versions/q-/quickfast.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a91e7769068c7d5d6bb16dbdff559d85027a0dff",
+      "version": "1.5",
+      "port-version": 4
+    },
     {
       "git-tree": "77f7681738424a915e7c12e3b9ea0576c5549032",
       "version": "1.5",
diff --git a/external_imported/vcpkg/versions/q-/quickfix.json b/external_imported/vcpkg/versions/q-/quickfix.json
index 572afd7c5..969cfa66d 100644
--- a/external_imported/vcpkg/versions/q-/quickfix.json
+++ b/external_imported/vcpkg/versions/q-/quickfix.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "08f8b2eb6b5493a1faae9707021fe1d287ed6fa5",
+      "version": "1.15.1",
+      "port-version": 9
+    },
     {
       "git-tree": "a8cdc0c05fb161bb28059f93d8dc05ea60d4c118",
       "version": "1.15.1",
diff --git a/external_imported/vcpkg/versions/q-/quill.json b/external_imported/vcpkg/versions/q-/quill.json
index 261907cd9..6e1875f37 100644
--- a/external_imported/vcpkg/versions/q-/quill.json
+++ b/external_imported/vcpkg/versions/q-/quill.json
@@ -1,5 +1,75 @@
 {
   "versions": [
+    {
+      "git-tree": "b89cd42d5b7c6ea3fb7ca7daa2469d661b9f4b94",
+      "version": "3.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9d6c9021a753a5c95afe327c1e6262c3a7312506",
+      "version": "3.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9a01ed0ad565d67bf90a71b996c45b767e4f88ba",
+      "version": "3.5.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8c2da56c7367f81e726a9a9e346b0c718447671b",
+      "version": "3.4.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "97fc8d7f2a2d08df4f1f8b9d69a9e1d28e66aecc",
+      "version": "3.4.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "06ce851a1057845ec0b0eb879eb49e208a2c319e",
+      "version": "3.3.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "01864ad09e447d83801734e67bb68681323d050f",
+      "version": "3.3.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d6a0bc935a79b82c346bdd0ea001ed7b051ed571",
+      "version": "3.2.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "115bc3d12264c44fbbe7fbe6469044e7b873aa9a",
+      "version": "3.1.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9b47e691385beaa29c7906dad0b911602c601ccd",
+      "version": "3.0.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e99204ad49b5de261987492e81a290fa15d66626",
+      "version": "3.0.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "7d0b893d24e4034db0e663e68c95188a26523d29",
+      "version": "2.9.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "134b2fe4a72269e7e9be72b882fcf21f37ed1809",
+      "version": "2.9.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "bbf59f883b4fd8de5efdb3401847fa1f8e486a95",
+      "version": "2.8.0",
+      "port-version": 0
+    },
     {
       "git-tree": "4e295cb41ae38fae9cc3330af5ef0c000f515959",
       "version": "2.7.0",
diff --git a/external_imported/vcpkg/versions/q-/qwt.json b/external_imported/vcpkg/versions/q-/qwt.json
index b83b57371..c3cad9280 100644
--- a/external_imported/vcpkg/versions/q-/qwt.json
+++ b/external_imported/vcpkg/versions/q-/qwt.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a1e2a09246f114b613350042641546934ea0ff27",
+      "version-date": "2023-05-12",
+      "port-version": 0
+    },
     {
       "git-tree": "1b200939b471ac5ff1f02f62ed38715d4efc6df8",
       "version": "6.2.0+20220616",
diff --git a/external_imported/vcpkg/versions/r-/rabit.json b/external_imported/vcpkg/versions/r-/rabit.json
index 95acbc992..453f4e180 100644
--- a/external_imported/vcpkg/versions/r-/rabit.json
+++ b/external_imported/vcpkg/versions/r-/rabit.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "35485a2d9060abcad1c7bd21647986b7e88d9bc0",
+      "version": "0.1",
+      "port-version": 5
+    },
     {
       "git-tree": "50ee4512e6e59245f356eceed9c60d036d5983ab",
       "version-string": "0.1",
diff --git a/external_imported/vcpkg/versions/r-/ragel.json b/external_imported/vcpkg/versions/r-/ragel.json
index baecf4828..657359e7c 100644
--- a/external_imported/vcpkg/versions/r-/ragel.json
+++ b/external_imported/vcpkg/versions/r-/ragel.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "efacd9dde74b0cd221344329fd3f950f60ba39ca",
+      "version": "6.10",
+      "port-version": 6
+    },
     {
       "git-tree": "a3d1aa86cc062c7e0e6b1233388150f57da301dd",
       "version-string": "6.10",
diff --git a/external_imported/vcpkg/versions/r-/range-v3-vs2015.json b/external_imported/vcpkg/versions/r-/range-v3-vs2015.json
index 49e74ab86..e7b47e907 100644
--- a/external_imported/vcpkg/versions/r-/range-v3-vs2015.json
+++ b/external_imported/vcpkg/versions/r-/range-v3-vs2015.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0f067993520ed7aa3241b7af46d6e3b9120b9950",
+      "version": "20151130-vcpkg5",
+      "port-version": 2
+    },
     {
       "git-tree": "7323da8a61ce8b5fc2e0cb3a59cff779c484e4e0",
       "version-string": "20151130-vcpkg5",
diff --git a/external_imported/vcpkg/versions/r-/rapidfuzz.json b/external_imported/vcpkg/versions/r-/rapidfuzz.json
index 5215e99a8..69584cc3e 100644
--- a/external_imported/vcpkg/versions/r-/rapidfuzz.json
+++ b/external_imported/vcpkg/versions/r-/rapidfuzz.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5adbaf988800a6554ee8fcada97f56a62d89e722",
+      "version": "2.0.0",
+      "port-version": 0
+    },
     {
       "git-tree": "e4ccc785af13a54ced4b4333612323f98a85b68b",
       "version": "1.8.0",
diff --git a/external_imported/vcpkg/versions/r-/rapidjson.json b/external_imported/vcpkg/versions/r-/rapidjson.json
index 0837af0b5..c0a5a6df2 100644
--- a/external_imported/vcpkg/versions/r-/rapidjson.json
+++ b/external_imported/vcpkg/versions/r-/rapidjson.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "a3dfe7dca3a1a27564b1fc5a9aea657cd9dae01c",
+      "version-date": "2023-07-17",
+      "port-version": 1
+    },
+    {
+      "git-tree": "9da8fa409b1afef5674fe412237db0504cf6156e",
+      "version-date": "2023-07-17",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ea1032a866631acc7d63b4804be4ece09baeb47f",
+      "version-date": "2023-04-27",
+      "port-version": 0
+    },
     {
       "git-tree": "b33122751fc9d722f05cc50538aa9b6d08e2d105",
       "version-date": "2022-06-28",
diff --git a/external_imported/vcpkg/versions/r-/rapidxml-ns.json b/external_imported/vcpkg/versions/r-/rapidxml-ns.json
index ea933065d..7349eb2cb 100644
--- a/external_imported/vcpkg/versions/r-/rapidxml-ns.json
+++ b/external_imported/vcpkg/versions/r-/rapidxml-ns.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1549988737e5a9e2215e8bf782e66db4cf03c373",
+      "version": "1.13.2",
+      "port-version": 2
+    },
     {
       "git-tree": "073f99111cb3bba2632117601ccc024e3f98b508",
       "version-string": "1.13.2",
diff --git a/external_imported/vcpkg/versions/r-/rapidxml.json b/external_imported/vcpkg/versions/r-/rapidxml.json
index af020f2d7..feeda9e74 100644
--- a/external_imported/vcpkg/versions/r-/rapidxml.json
+++ b/external_imported/vcpkg/versions/r-/rapidxml.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a460282de022af98f967771cdecab3efee97bc5d",
+      "version": "1.13",
+      "port-version": 6
+    },
     {
       "git-tree": "160f717432a1eed69af62a9eb7c724031609994a",
       "version-string": "1.13",
diff --git a/external_imported/vcpkg/versions/r-/rappture.json b/external_imported/vcpkg/versions/r-/rappture.json
index c1622b438..ffb1871ba 100644
--- a/external_imported/vcpkg/versions/r-/rappture.json
+++ b/external_imported/vcpkg/versions/r-/rappture.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "31376dbc3c6b3f397f76819c46c05a653c47e1ce",
+      "version": "1.9",
+      "port-version": 4
+    },
+    {
+      "git-tree": "fabc9ec282c2f7ec7f5d5e2ae48fbaacb9227876",
+      "version": "1.9",
+      "port-version": 3
+    },
     {
       "git-tree": "8a477ff69e89f147d8d51545dce1eaf309401bc2",
       "version": "1.9",
diff --git a/external_imported/vcpkg/versions/r-/raygui.json b/external_imported/vcpkg/versions/r-/raygui.json
index 052aa4c03..541e3deba 100644
--- a/external_imported/vcpkg/versions/r-/raygui.json
+++ b/external_imported/vcpkg/versions/r-/raygui.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "d9b03e4c1effd2eabeac64b8475b55aedea84511",
+      "version": "4.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9de0bb8aebc0b8a41b4c973b5820ace3c0015ad3",
+      "version": "3.6",
+      "port-version": 0
+    },
     {
       "git-tree": "96eade6012fdd28a62fd21748edfd06d63674317",
       "version": "3.2",
diff --git a/external_imported/vcpkg/versions/r-/raylib.json b/external_imported/vcpkg/versions/r-/raylib.json
index 33455aecb..bc644a731 100644
--- a/external_imported/vcpkg/versions/r-/raylib.json
+++ b/external_imported/vcpkg/versions/r-/raylib.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "7cf5ce249c066d11ea5afe9ed15972663992c0f2",
+      "version": "5.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8481bb808a6e0cdd0862e22df7b59cc0e13542cc",
+      "version-semver": "4.5.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "1ae048ec33152df88804d243fd6e89691d5712d2",
+      "version-semver": "4.5.0",
+      "port-version": 1
+    },
     {
       "git-tree": "f8a98453d76631d6a8f4f8d762646808cc3e9e1a",
       "version-semver": "4.5.0",
diff --git a/external_imported/vcpkg/versions/r-/rbdl.json b/external_imported/vcpkg/versions/r-/rbdl.json
index 1a4a35f22..59219fab3 100644
--- a/external_imported/vcpkg/versions/r-/rbdl.json
+++ b/external_imported/vcpkg/versions/r-/rbdl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9a6d8dcfc91836032a5365ce4cd5a31aca1338a3",
+      "version": "3.3.0",
+      "port-version": 5
+    },
     {
       "git-tree": "70c51c8d79d0dab6a483d160024c6bc68a8169c3",
       "version": "3.2.0",
diff --git a/external_imported/vcpkg/versions/r-/re2.json b/external_imported/vcpkg/versions/r-/re2.json
index 296bb8289..26de9d780 100644
--- a/external_imported/vcpkg/versions/r-/re2.json
+++ b/external_imported/vcpkg/versions/r-/re2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b37a5ff97ad79996c84fcdf0984a57ea03a0aaf8",
+      "version-date": "2023-07-01",
+      "port-version": 0
+    },
     {
       "git-tree": "14eb0d3352692934f5fe5300aaec9139b4962b58",
       "version-date": "2023-02-01",
diff --git a/external_imported/vcpkg/versions/r-/reactiveplusplus.json b/external_imported/vcpkg/versions/r-/reactiveplusplus.json
index 02c43d205..c1dbdb2c5 100644
--- a/external_imported/vcpkg/versions/r-/reactiveplusplus.json
+++ b/external_imported/vcpkg/versions/r-/reactiveplusplus.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "774134fb825ed931da1baa9285611c9a6c606fb5",
+      "version": "2.0.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5c5e055740d26b07149cc34e3dc41ef0674844b2",
+      "version": "0.2.3",
+      "port-version": 0
+    },
     {
       "git-tree": "352a13ae0dacf015a5c79bbfcaceea5d0a5877cf",
       "version": "0.2.2",
diff --git a/external_imported/vcpkg/versions/r-/readline-unix.json b/external_imported/vcpkg/versions/r-/readline-unix.json
index e27d0632d..5c2834dce 100644
--- a/external_imported/vcpkg/versions/r-/readline-unix.json
+++ b/external_imported/vcpkg/versions/r-/readline-unix.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4ad0f063e0bf86f7bfbf455e7a1f7f16883528f0",
+      "version": "8.2",
+      "port-version": 1
+    },
     {
       "git-tree": "19fcd2b764ea6d261dfbd80961833e807cf93ea0",
       "version": "8.2",
diff --git a/external_imported/vcpkg/versions/r-/readline-win32.json b/external_imported/vcpkg/versions/r-/readline-win32.json
index 9776c9f0b..8fbd3e32b 100644
--- a/external_imported/vcpkg/versions/r-/readline-win32.json
+++ b/external_imported/vcpkg/versions/r-/readline-win32.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "9c7dd189ed4434c993da75506f0b6d4e94b7f952",
+      "version": "5.0",
+      "port-version": 8
+    },
+    {
+      "git-tree": "932081e9a1f922cd1f3e710fd9fd426f882360aa",
+      "version": "5.0",
+      "port-version": 7
+    },
+    {
+      "git-tree": "c54e93659340794a88b8122fde8123941f0be228",
+      "version": "5.0",
+      "port-version": 6
+    },
     {
       "git-tree": "19f9684f55a9aa01b5612a5ebec47960f51bacdd",
       "version": "5.0",
diff --git a/external_imported/vcpkg/versions/r-/readline.json b/external_imported/vcpkg/versions/r-/readline.json
index 1581311c2..26acc5d43 100644
--- a/external_imported/vcpkg/versions/r-/readline.json
+++ b/external_imported/vcpkg/versions/r-/readline.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "f4d85b7efb4b5a01e60852a81a351971c8c5dd78",
+      "version": "0",
+      "port-version": 5
+    },
+    {
+      "git-tree": "24b7f806888a5db397f8d737e361e2c9e5025c1f",
+      "version": "0",
+      "port-version": 4
+    },
     {
       "git-tree": "87822d2ce5b0936d374d94185da700e8a1cf4619",
       "version-string": "0",
diff --git a/external_imported/vcpkg/versions/r-/realsense2.json b/external_imported/vcpkg/versions/r-/realsense2.json
index dc6ce8140..345fb90cd 100644
--- a/external_imported/vcpkg/versions/r-/realsense2.json
+++ b/external_imported/vcpkg/versions/r-/realsense2.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "b15354f0a205d2288e63564e2789e317442bd999",
+      "version": "2.54.2",
+      "port-version": 2
+    },
+    {
+      "git-tree": "17434b2bd3e05364a70afea06d2d7ccb9db544c6",
+      "version": "2.54.2",
+      "port-version": 1
+    },
+    {
+      "git-tree": "c860a042c288cc1618ea5e728e8eb715b233ff44",
+      "version": "2.54.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "29719e1172d7bb950bc88a29ba009e4c4c2d5f27",
+      "version": "2.54.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "ba09c586ba854502c24f6abf1b3307e964c8ae16",
+      "version": "2.54.1",
+      "port-version": 0
+    },
     {
       "git-tree": "90cd2f16e28c916f46da66fea9e6de742a26b0c2",
       "version": "2.53.1",
diff --git a/external_imported/vcpkg/versions/r-/recast.json b/external_imported/vcpkg/versions/r-/recast.json
index 521da8273..b9f2a59db 100644
--- a/external_imported/vcpkg/versions/r-/recast.json
+++ b/external_imported/vcpkg/versions/r-/recast.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "08f63ca8f875d78682decac6a5084cf72589ce1f",
+      "version-string": "deprecated",
+      "port-version": 0
+    },
     {
       "git-tree": "f6f99b923ad8fbbee1aafd0deb361f8cf7eb7bd6",
       "version": "1.5.1",
diff --git a/external_imported/vcpkg/versions/r-/recastnavigation.json b/external_imported/vcpkg/versions/r-/recastnavigation.json
new file mode 100644
index 000000000..38cf40fa9
--- /dev/null
+++ b/external_imported/vcpkg/versions/r-/recastnavigation.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "806d9850ce88d7190649eb90863455084516d519",
+      "version": "1.6.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "d08244dcfe4974f58b9dd481f1e3e34414a46207",
+      "version": "1.6.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/r-/redis-plus-plus.json b/external_imported/vcpkg/versions/r-/redis-plus-plus.json
index 11bfa678f..a94f13a9c 100644
--- a/external_imported/vcpkg/versions/r-/redis-plus-plus.json
+++ b/external_imported/vcpkg/versions/r-/redis-plus-plus.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "0304c085aa643a482f93ed391ba61bed356577f9",
+      "version-semver": "1.3.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8c31ae593f450352915471514d517a772cd5099b",
+      "version-semver": "1.3.9",
+      "port-version": 1
+    },
+    {
+      "git-tree": "ce8c8a22b5a791c7a3a96d72d5e2ce47881db17c",
+      "version-semver": "1.3.9",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6be6c4d075dc736952132603d31f0ca568a0edde",
+      "version-semver": "1.3.8",
+      "port-version": 1
+    },
+    {
+      "git-tree": "c359e3bd938ceb9f3f5cde1b8aa4e435c9123534",
+      "version-semver": "1.3.8",
+      "port-version": 0
+    },
     {
       "git-tree": "6a48ccb1b618d7dedeeb50bde2ecc413b63c3742",
       "version-semver": "1.3.7",
diff --git a/external_imported/vcpkg/versions/r-/refl-cpp.json b/external_imported/vcpkg/versions/r-/refl-cpp.json
index 349e371cd..8f2ae2b1d 100644
--- a/external_imported/vcpkg/versions/r-/refl-cpp.json
+++ b/external_imported/vcpkg/versions/r-/refl-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "765482ded64bcc076b2e2140ebff7128643d4811",
+      "version": "0.12.4",
+      "port-version": 0
+    },
     {
       "git-tree": "cb8d6fa4720dd349ab60b95ad01380b55d0d4e1c",
       "version": "0.12.3",
diff --git a/external_imported/vcpkg/versions/r-/refprop-headers.json b/external_imported/vcpkg/versions/r-/refprop-headers.json
index a1f653985..bdb95e647 100644
--- a/external_imported/vcpkg/versions/r-/refprop-headers.json
+++ b/external_imported/vcpkg/versions/r-/refprop-headers.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "cd807170148b9b1e7ae93fe6073004fe5438193f",
+      "version-date": "2022-12-07",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d7ea98d3dfab53c440e5b2da61a3c347b4d00beb",
+      "version-date": "2019-04-14",
+      "port-version": 2
+    },
     {
       "git-tree": "d8224d6d1e5b4d151c557a1055307624848ce8db",
       "version-string": "2019-04-14",
diff --git a/external_imported/vcpkg/versions/r-/rendergraph.json b/external_imported/vcpkg/versions/r-/rendergraph.json
index d5cd382c7..13e8f1c60 100644
--- a/external_imported/vcpkg/versions/r-/rendergraph.json
+++ b/external_imported/vcpkg/versions/r-/rendergraph.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "21b4a86663cc8e58b90c3298520db171f349ffbc",
+      "version": "1.4.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "189085fb654a90d03e8e1b15971e0b9d6f575270",
+      "version": "1.3.0",
+      "port-version": 0
+    },
     {
       "git-tree": "21270b3d8f507068a293df066628704e1de96d82",
       "version": "1.2.0",
diff --git a/external_imported/vcpkg/versions/r-/reproc.json b/external_imported/vcpkg/versions/r-/reproc.json
index b90be3789..f73340533 100644
--- a/external_imported/vcpkg/versions/r-/reproc.json
+++ b/external_imported/vcpkg/versions/r-/reproc.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6fc63b3c029742441d22a288db9f37f5e016abbe",
+      "version": "14.2.4",
+      "port-version": 2
+    },
     {
       "git-tree": "eeac14685480439ee52ac05ec68faebb2cbaffad",
       "version": "14.2.4",
diff --git a/external_imported/vcpkg/versions/r-/restbed.json b/external_imported/vcpkg/versions/r-/restbed.json
index 872ce7046..4eaea4fb6 100644
--- a/external_imported/vcpkg/versions/r-/restbed.json
+++ b/external_imported/vcpkg/versions/r-/restbed.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1d606ecb46ac21637b8d40e1dc3fe175e721e987",
+      "version": "4.8",
+      "port-version": 3
+    },
     {
       "git-tree": "c41ea5f5396b24a4566efaea78d996fcbc2c4ec2",
       "version": "4.8",
diff --git a/external_imported/vcpkg/versions/r-/restinio.json b/external_imported/vcpkg/versions/r-/restinio.json
index 8e177cb71..cb880017f 100644
--- a/external_imported/vcpkg/versions/r-/restinio.json
+++ b/external_imported/vcpkg/versions/r-/restinio.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "b59b3fc1e00b5abdfbbedaeb495e2816aeee1b44",
+      "version": "0.7.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "06ab98765576c8b3d11f5a9a1d4125e0176c482a",
+      "version": "0.7.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "fa95495106621bad74854c9f376a2c5e1b936f05",
+      "version": "0.6.19",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f749e69b703a537f74f52fcef9327950e7d56ea9",
+      "version": "0.6.18",
+      "port-version": 0
+    },
     {
       "git-tree": "7b285cfa0e43e1964ca4a91d2375516aa8121d79",
       "version": "0.6.17",
diff --git a/external_imported/vcpkg/versions/r-/rhash.json b/external_imported/vcpkg/versions/r-/rhash.json
index 194462b1b..d31d125d1 100644
--- a/external_imported/vcpkg/versions/r-/rhash.json
+++ b/external_imported/vcpkg/versions/r-/rhash.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "cb7e94fe8d5d109574fd0e304e246c780f0b43c5",
+      "version": "1.4.4",
+      "port-version": 0
+    },
     {
       "git-tree": "85de223344c08a1efc2f9f6ec6bcb69529851199",
       "version": "1.4.2",
diff --git a/external_imported/vcpkg/versions/r-/rhasheq.json b/external_imported/vcpkg/versions/r-/rhasheq.json
index 74506bc1e..00f0060c8 100644
--- a/external_imported/vcpkg/versions/r-/rhasheq.json
+++ b/external_imported/vcpkg/versions/r-/rhasheq.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ba4955f3d43cf99dfa0d770482ba6cf62d97ab4e",
+      "version-date": "2023-06-17",
+      "port-version": 0
+    },
     {
       "git-tree": "1f26547ad3e879dcf8083e3db488bdb1cda587f4",
       "version": "0.0.1",
diff --git a/external_imported/vcpkg/versions/r-/riffcpp.json b/external_imported/vcpkg/versions/r-/riffcpp.json
index 06446aa79..cc84e5acd 100644
--- a/external_imported/vcpkg/versions/r-/riffcpp.json
+++ b/external_imported/vcpkg/versions/r-/riffcpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2726a0276bb4fb9f93c818173ec5d46d84d40f08",
+      "version": "2.2.4",
+      "port-version": 3
+    },
     {
       "git-tree": "2709604490dce2c3a52b6818542cd4ce71d8712d",
       "version-string": "2.2.4",
diff --git a/external_imported/vcpkg/versions/r-/rivers.json b/external_imported/vcpkg/versions/r-/rivers.json
new file mode 100644
index 000000000..aa284ec96
--- /dev/null
+++ b/external_imported/vcpkg/versions/r-/rivers.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "9a0a33765347e8652eecf77097b57cfdbc7e4184",
+      "version-date": "2022-05-16",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/r-/rmlui.json b/external_imported/vcpkg/versions/r-/rmlui.json
index 8d48628b5..6b6f5bb08 100644
--- a/external_imported/vcpkg/versions/r-/rmlui.json
+++ b/external_imported/vcpkg/versions/r-/rmlui.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "eef365a991fcf66a1848ed65bb9af75e767ffce6",
+      "version": "5.1",
+      "port-version": 0
+    },
     {
       "git-tree": "7938b94aadfdba5af77643ebec4d36a7e6037e29",
       "version": "5.0",
diff --git a/external_imported/vcpkg/versions/r-/rmqcpp.json b/external_imported/vcpkg/versions/r-/rmqcpp.json
new file mode 100644
index 000000000..8b38d6371
--- /dev/null
+++ b/external_imported/vcpkg/versions/r-/rmqcpp.json
@@ -0,0 +1,9 @@
+{
+    "versions": [
+        {
+            "version": "1.0.0",
+            "port-version": 0,
+            "git-tree": "3ad0bdbdcfd0050a646feb6586d8c13931f8e602"   
+        }
+    ]
+}
diff --git a/external_imported/vcpkg/versions/r-/roaring.json b/external_imported/vcpkg/versions/r-/roaring.json
index 4e24e50e0..2e81b9abe 100644
--- a/external_imported/vcpkg/versions/r-/roaring.json
+++ b/external_imported/vcpkg/versions/r-/roaring.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0179f926fd785b55019104fb010fb99ebcfa5e06",
+      "version": "2.0.4",
+      "port-version": 0
+    },
     {
       "git-tree": "d1f8636ba82d39c12bea0f5a09409a5a5321432a",
       "version": "0.9.6",
diff --git a/external_imported/vcpkg/versions/r-/robin-map.json b/external_imported/vcpkg/versions/r-/robin-map.json
index c70a28997..3aabec38f 100644
--- a/external_imported/vcpkg/versions/r-/robin-map.json
+++ b/external_imported/vcpkg/versions/r-/robin-map.json
@@ -22,7 +22,7 @@
     },
     {
       "git-tree": "84f1433234bb4813feee71e4042174ec9e8d5a7a",
-      "version-semver": "0.6.3",
+      "version-string": "0.6.3",
       "port-version": 0
     },
     {
diff --git a/external_imported/vcpkg/versions/r-/rocksdb.json b/external_imported/vcpkg/versions/r-/rocksdb.json
index 9e585550d..dd65ab165 100644
--- a/external_imported/vcpkg/versions/r-/rocksdb.json
+++ b/external_imported/vcpkg/versions/r-/rocksdb.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "00b3130e81114b517e3a4324c9a0408e1b9ac3d7",
+      "version": "8.10.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0262aa76211da9eacdd5e70f88bf172eaef286bd",
+      "version": "8.9.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "caf00463e9aa52209110783d90fa39066eaa4249",
+      "version": "8.5.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3d5c9033fedfbf0a9e993125f5511616b894f493",
+      "version": "8.3.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "284f182a8687ee7818ab84d5e7ada9bd5612cfcb",
+      "version": "8.0.0",
+      "port-version": 0
+    },
     {
       "git-tree": "b09fc2a59392bb41e23e2eb0120eac2a77faca97",
       "version": "7.10.2",
diff --git a/external_imported/vcpkg/versions/r-/rply.json b/external_imported/vcpkg/versions/r-/rply.json
index 75a6e14ee..6c5d8eea8 100644
--- a/external_imported/vcpkg/versions/r-/rply.json
+++ b/external_imported/vcpkg/versions/r-/rply.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "824058a46ec01bf8d290a56e3b42f1b01ef4ce68",
+      "version": "1.1.4",
+      "port-version": 3
+    },
     {
       "git-tree": "bd6882d9bea26ba3fafbebd6327e2ca075af5a32",
       "version-string": "1.1.4",
diff --git a/external_imported/vcpkg/versions/r-/rsasynccpp.json b/external_imported/vcpkg/versions/r-/rsasynccpp.json
index fbd102a5d..27731d034 100644
--- a/external_imported/vcpkg/versions/r-/rsasynccpp.json
+++ b/external_imported/vcpkg/versions/r-/rsasynccpp.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "7f6d24a0e92e32d4bfdba144d4c449d672313c89",
+      "version": "0.0.7",
+      "port-version": 3
+    },
+    {
+      "git-tree": "44c0663e6c7ee48730c4db3336c455e1e45c473a",
+      "version": "0.0.7",
+      "port-version": 2
+    },
     {
       "git-tree": "7fc33d5002210774c5e4d7450a0cd88c3be82ca8",
       "version": "0.0.7",
diff --git a/external_imported/vcpkg/versions/r-/rsm-binary-io.json b/external_imported/vcpkg/versions/r-/rsm-binary-io.json
index 213de95d5..f935cd2e6 100644
--- a/external_imported/vcpkg/versions/r-/rsm-binary-io.json
+++ b/external_imported/vcpkg/versions/r-/rsm-binary-io.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f89c1962171e765068e679e0e89c4607f97ce8cb",
+      "version-semver": "2.0.6",
+      "port-version": 0
+    },
     {
       "git-tree": "a170dd2013d45c86b272169552cf4ac52a5d1c79",
       "version-semver": "2.0.5",
diff --git a/external_imported/vcpkg/versions/r-/rsm-bsa.json b/external_imported/vcpkg/versions/r-/rsm-bsa.json
index 4211b79cd..efcfde9a1 100644
--- a/external_imported/vcpkg/versions/r-/rsm-bsa.json
+++ b/external_imported/vcpkg/versions/r-/rsm-bsa.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "56763c1c1befe44030f14704e1be0c05424f039e",
+      "version-semver": "4.1.0",
+      "port-version": 0
+    },
     {
       "git-tree": "f91c3a5ffa0abe0eb4b3dc47421fb302dd258b05",
       "version-semver": "4.0.3",
diff --git a/external_imported/vcpkg/versions/r-/rsm-mmio.json b/external_imported/vcpkg/versions/r-/rsm-mmio.json
index 31ae61086..7f14bad77 100644
--- a/external_imported/vcpkg/versions/r-/rsm-mmio.json
+++ b/external_imported/vcpkg/versions/r-/rsm-mmio.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9e1a7d844e1e48dab00aab46943a739a4fe2f3e4",
+      "version-semver": "2.0.0",
+      "port-version": 0
+    },
     {
       "git-tree": "b64c5538a5de9cc3e4e516ba97f437480b94c6f0",
       "version-semver": "1.1.0",
diff --git a/external_imported/vcpkg/versions/r-/rsocket.json b/external_imported/vcpkg/versions/r-/rsocket.json
index 9b4d581a3..672439d8f 100644
--- a/external_imported/vcpkg/versions/r-/rsocket.json
+++ b/external_imported/vcpkg/versions/r-/rsocket.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "52b82b815b431e296ffea53c1ce955c7df267d82",
+      "version-string": "2021.08.30.00",
+      "port-version": 3
+    },
+    {
+      "git-tree": "b1d02b39aaa70e97e3ec2551d1cfc6ae1a163199",
+      "version-string": "2021.08.30.00",
+      "port-version": 2
+    },
     {
       "git-tree": "073c3faa3992179768ce7e76cc7d39b654db9e8c",
       "version-string": "2021.08.30.00",
diff --git a/external_imported/vcpkg/versions/r-/rtabmap.json b/external_imported/vcpkg/versions/r-/rtabmap.json
index 9202c3612..0ec172c88 100644
--- a/external_imported/vcpkg/versions/r-/rtabmap.json
+++ b/external_imported/vcpkg/versions/r-/rtabmap.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "9764edeececed7fb37c356a6e00cb3f983dbf1fb",
+      "version": "0.21.0",
+      "port-version": 3
+    },
+    {
+      "git-tree": "63d580588bb49ec2767eed209af0c854cc2d5da2",
+      "version": "0.21.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "6a0ba7b4b9ea0239aa474d40263d96919a81958c",
+      "version": "0.21.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "557a37dc751f64ec6040505e57074251f2441822",
+      "version": "0.21.0",
+      "port-version": 0
+    },
     {
       "git-tree": "f820f54d02aada9453b8d26fb72d03dc30e04bf9",
       "version": "0.20.23",
diff --git a/external_imported/vcpkg/versions/r-/rtaudio.json b/external_imported/vcpkg/versions/r-/rtaudio.json
index 11a12d04f..b0cc7141a 100644
--- a/external_imported/vcpkg/versions/r-/rtaudio.json
+++ b/external_imported/vcpkg/versions/r-/rtaudio.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "b97a9859776e7d23b21a9660e9b31e69fdb84185",
+      "version": "6.0.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "989c7dceafbd4ea849445d86bdc1b4bbf7133960",
+      "version-date": "2021-11-16",
+      "port-version": 2
+    },
     {
       "git-tree": "f1adbba529fbfd9b66a7951556a088e0834baa09",
       "version-date": "2021-11-16",
diff --git a/external_imported/vcpkg/versions/r-/rtmidi.json b/external_imported/vcpkg/versions/r-/rtmidi.json
index ec95ea91a..6dcf99a4a 100644
--- a/external_imported/vcpkg/versions/r-/rtmidi.json
+++ b/external_imported/vcpkg/versions/r-/rtmidi.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "83f2bd1bc41359997ee59a894bbfe5aab7e5a5df",
+      "version": "5.0.0",
+      "port-version": 3
+    },
     {
       "git-tree": "70873823ce910dcf80078a94f12191371523d84c",
       "version": "5.0.0",
diff --git a/external_imported/vcpkg/versions/r-/rubberband.json b/external_imported/vcpkg/versions/r-/rubberband.json
index d93d3b55c..05335a996 100644
--- a/external_imported/vcpkg/versions/r-/rubberband.json
+++ b/external_imported/vcpkg/versions/r-/rubberband.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "f3a5ed426944950b92d114499028a3c4c5ed3219",
+      "version": "3.3.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e89e7b8691ae1ce66b0e82d00ec50061b23b593a",
+      "version": "3.2.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "66dc21d5c29b7406cf1408081b8d99d6df217d4b",
+      "version": "3.2.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2cdedb774d373326dd7b2f2d138280653f97c89b",
+      "version": "3.2.0",
+      "port-version": 0
+    },
     {
       "git-tree": "ce88046ebe45fa738789a3bf6dd843392bcb6fd2",
       "version": "3.1.1",
diff --git a/external_imported/vcpkg/versions/r-/ryu.json b/external_imported/vcpkg/versions/r-/ryu.json
index 5b448e6a1..d4e4ddb62 100644
--- a/external_imported/vcpkg/versions/r-/ryu.json
+++ b/external_imported/vcpkg/versions/r-/ryu.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "c19f7f75e6695396873fa98b4d39512899a34fb5",
+      "version": "2.0",
+      "port-version": 9
+    },
+    {
+      "git-tree": "660ffa1a7a15e75dbcff064ac704f53b8a2da880",
+      "version": "2.0",
+      "port-version": 8
+    },
+    {
+      "git-tree": "9eef3ab0a0bafea6db1a02920f60b756c3eeabfc",
+      "version": "2.0",
+      "port-version": 7
+    },
     {
       "git-tree": "b500b4b86daab326db966564fcd439215eae86ee",
       "version": "2.0",
diff --git a/external_imported/vcpkg/versions/s-/s2geometry.json b/external_imported/vcpkg/versions/s-/s2geometry.json
index 037c957f9..a0760cc9d 100644
--- a/external_imported/vcpkg/versions/s-/s2geometry.json
+++ b/external_imported/vcpkg/versions/s-/s2geometry.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "3fd94490409a17aef62732c674d5e12b4804fdd8",
+      "version": "0.11.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "457e437a209e83c66216a6cd3213d1d2e8791e7e",
+      "version": "0.11.0",
+      "port-version": 0
+    },
     {
       "git-tree": "a42a3249df4efb18f66fccab283c69973e1a535b",
       "version": "0.10.0",
diff --git a/external_imported/vcpkg/versions/s-/s2n.json b/external_imported/vcpkg/versions/s-/s2n.json
index 7cb031d6d..870385eaa 100644
--- a/external_imported/vcpkg/versions/s-/s2n.json
+++ b/external_imported/vcpkg/versions/s-/s2n.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1a5705f86914ceeaa101adb9b7aca73c785aa584",
+      "version": "1.3.56",
+      "port-version": 0
+    },
     {
       "git-tree": "2928707380a76632c3953b843ce34019fbf2c90c",
       "version": "1.3.34",
diff --git a/external_imported/vcpkg/versions/s-/sail.json b/external_imported/vcpkg/versions/s-/sail.json
index bd3b36a56..4dec55081 100644
--- a/external_imported/vcpkg/versions/s-/sail.json
+++ b/external_imported/vcpkg/versions/s-/sail.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "6e673bf75a449ebb5474953cb8eaa69333fc08b4",
+      "version-semver": "0.9.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "63143e644f5e386b1b8aae22194e8b157bcdca5e",
+      "version-semver": "0.9.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0c604af0721281506a77f887d07abca30fe350c3",
+      "version-semver": "0.9.0-rc3",
+      "port-version": 2
+    },
     {
       "git-tree": "66576c788934d4684f862ba663b49f1bb80c4d4d",
       "version-semver": "0.9.0-rc3",
diff --git a/external_imported/vcpkg/versions/s-/sais.json b/external_imported/vcpkg/versions/s-/sais.json
index 6077ca3f2..01802a73e 100644
--- a/external_imported/vcpkg/versions/s-/sais.json
+++ b/external_imported/vcpkg/versions/s-/sais.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e417443d4480212c41ff38d6356e7ed0ba349116",
+      "version": "2.4.1",
+      "port-version": 5
+    },
     {
       "git-tree": "557f4ba1ab3603ba23d82024f83fb41ab4a6e288",
       "version-string": "2.4.1",
diff --git a/external_imported/vcpkg/versions/s-/sajson.json b/external_imported/vcpkg/versions/s-/sajson.json
index fa69fbf92..24d7e5ca5 100644
--- a/external_imported/vcpkg/versions/s-/sajson.json
+++ b/external_imported/vcpkg/versions/s-/sajson.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a0e624249788d999ef739af061ce797c49cbe7b6",
+      "version-date": "2018-09-21",
+      "port-version": 3
+    },
     {
       "git-tree": "7401d8ffce21268a90491dcf853727b9c8ec569c",
       "version-string": "2018-09-21",
diff --git a/external_imported/vcpkg/versions/s-/salome-configuration.json b/external_imported/vcpkg/versions/s-/salome-configuration.json
new file mode 100644
index 000000000..b3bb0594a
--- /dev/null
+++ b/external_imported/vcpkg/versions/s-/salome-configuration.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "2cbf34b9ab5a63d3b341c3a8c3e1b0cf48c1c6d9",
+      "version": "9.10.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/s-/salome-med-fichier.json b/external_imported/vcpkg/versions/s-/salome-med-fichier.json
new file mode 100644
index 000000000..3a69fdf05
--- /dev/null
+++ b/external_imported/vcpkg/versions/s-/salome-med-fichier.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "26a3c208d3498e3c40c3f423f2493d1df53d49db",
+      "version": "4.1.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "20cd7a3c38b2cef44fa45511e39c82488bb3aa0b",
+      "version": "4.1.1",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/s-/salome-medcoupling.json b/external_imported/vcpkg/versions/s-/salome-medcoupling.json
new file mode 100644
index 000000000..45123a6a9
--- /dev/null
+++ b/external_imported/vcpkg/versions/s-/salome-medcoupling.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "5b007fe28cfb58ed83464e901ce70e8a1ef4bfa5",
+      "version": "9.10.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/s-/saucer.json b/external_imported/vcpkg/versions/s-/saucer.json
index 4957071ec..b60f0e084 100644
--- a/external_imported/vcpkg/versions/s-/saucer.json
+++ b/external_imported/vcpkg/versions/s-/saucer.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "0ad0dc8844c60450afe70ba393b6d31a517b553d",
+      "version": "2.1.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "15c87104efda5c84346ed7a7302713283e82eaaa",
+      "version": "1.0.1",
+      "port-version": 3
+    },
     {
       "git-tree": "ce7e88eac61c5e370dbf6d5dc7ad56dbdded879d",
       "version": "1.0.1",
diff --git a/external_imported/vcpkg/versions/s-/scenepic.json b/external_imported/vcpkg/versions/s-/scenepic.json
index 35ba1d88e..b7b814464 100644
--- a/external_imported/vcpkg/versions/s-/scenepic.json
+++ b/external_imported/vcpkg/versions/s-/scenepic.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "70b1207796dcdf599a5ede346b4a1748106d2c02",
+      "version": "1.1.0",
+      "port-version": 1
+    },
     {
       "git-tree": "57d4ac99e32e53ed59ea56871fefb332a01e7481",
       "version": "1.0.16",
diff --git a/external_imported/vcpkg/versions/s-/scintilla.json b/external_imported/vcpkg/versions/s-/scintilla.json
index 649075160..8bf6bdbe9 100644
--- a/external_imported/vcpkg/versions/s-/scintilla.json
+++ b/external_imported/vcpkg/versions/s-/scintilla.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "8851877b637605265f10c086366f022205fcc1f7",
+      "version": "4.4.6",
+      "port-version": 3
+    },
+    {
+      "git-tree": "f6d2625e3fbec10fec4c9ee4de19143df3656213",
+      "version": "4.4.6",
+      "port-version": 2
+    },
     {
       "git-tree": "65fa530f4695dbecf4c90bc60d89d59abc6eab2f",
       "version": "4.4.6",
diff --git a/external_imported/vcpkg/versions/s-/sciter-js.json b/external_imported/vcpkg/versions/s-/sciter-js.json
index c8c3f6352..6e98787a2 100644
--- a/external_imported/vcpkg/versions/s-/sciter-js.json
+++ b/external_imported/vcpkg/versions/s-/sciter-js.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "ae9c6653c9c58a2fa2a2e8023206029bf0d90805",
+      "version": "5.0.3.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ba302b640aa47ee3768bae1daa0ac5477081e52a",
+      "version": "5.0.2.17",
+      "port-version": 0
+    },
     {
       "git-tree": "01c76a267b6924a5f1f03349738e479e8bbe2c0b",
       "version": "4.4.8.31",
diff --git a/external_imported/vcpkg/versions/s-/scnlib.json b/external_imported/vcpkg/versions/s-/scnlib.json
index 429cb991d..e2e858116 100644
--- a/external_imported/vcpkg/versions/s-/scnlib.json
+++ b/external_imported/vcpkg/versions/s-/scnlib.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9d2d619116db10c60c0553f9ca6e155f16e05bdd",
+      "version": "1.1.2",
+      "port-version": 0
+    },
     {
       "git-tree": "2d7e548589e4fb172fd5fbb61bbd9a816d971b92",
       "version": "1.0",
diff --git a/external_imported/vcpkg/versions/s-/scotch.json b/external_imported/vcpkg/versions/s-/scotch.json
new file mode 100644
index 000000000..fff55d184
--- /dev/null
+++ b/external_imported/vcpkg/versions/s-/scotch.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "6038e864e74954b29c48485287ba15b015cc3901",
+      "version": "7.0.3",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/s-/scylla-wrapper.json b/external_imported/vcpkg/versions/s-/scylla-wrapper.json
index 2b12423a4..bd439e14e 100644
--- a/external_imported/vcpkg/versions/s-/scylla-wrapper.json
+++ b/external_imported/vcpkg/versions/s-/scylla-wrapper.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "22f98506f8fe59a6d4a1b2a052a96d46aeb2d20e",
+      "version": "2018-08-26-16e6f435",
+      "port-version": 3
+    },
     {
       "git-tree": "c1633de82a41a7dac94c972377145d3bf67b80a4",
       "version-string": "2018-08-26-16e6f435",
diff --git a/external_imported/vcpkg/versions/s-/sdbus-cpp.json b/external_imported/vcpkg/versions/s-/sdbus-cpp.json
new file mode 100644
index 000000000..b069067cc
--- /dev/null
+++ b/external_imported/vcpkg/versions/s-/sdbus-cpp.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "31c0a3bedc3ced9d4ffdeb92b241546f13b9a1fc",
+      "version": "1.3.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "cae6cd5686aeefb86b4b97cda6d258d80a9eb5b6",
+      "version": "1.3.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/s-/sdformat13.json b/external_imported/vcpkg/versions/s-/sdformat13.json
new file mode 100644
index 000000000..5e08f899e
--- /dev/null
+++ b/external_imported/vcpkg/versions/s-/sdformat13.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "88424090fdd3b2122094e75be5c68b3f2f58cda5",
+      "version": "13.5.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "b8f7d3bdbefa0795808f6c9a42764584d6e96f2c",
+      "version": "13.5.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/s-/sdl1-mixer.json b/external_imported/vcpkg/versions/s-/sdl1-mixer.json
new file mode 100644
index 000000000..aae68871f
--- /dev/null
+++ b/external_imported/vcpkg/versions/s-/sdl1-mixer.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "d9948f6d30a19d1be8d0de5406f7874c5991aec1",
+      "version-date": "2023-03-25",
+      "port-version": 2
+    },
+    {
+      "git-tree": "2e208f00e12332057ca6986afe060ff5fc1ef7cc",
+      "version-date": "2023-03-25",
+      "port-version": 1
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/s-/sdl1-net.json b/external_imported/vcpkg/versions/s-/sdl1-net.json
index d7ba09100..cc499e489 100644
--- a/external_imported/vcpkg/versions/s-/sdl1-net.json
+++ b/external_imported/vcpkg/versions/s-/sdl1-net.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2824fc580a2bee556194640f973257f342e31b79",
+      "version": "1.2.8",
+      "port-version": 6
+    },
     {
       "git-tree": "8fcf264bba028ea84bf1a7ed6c0bd63c749bd082",
       "version-string": "1.2.8",
diff --git a/external_imported/vcpkg/versions/s-/sdl1.json b/external_imported/vcpkg/versions/s-/sdl1.json
index 65c464975..8d959596f 100644
--- a/external_imported/vcpkg/versions/s-/sdl1.json
+++ b/external_imported/vcpkg/versions/s-/sdl1.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "201b5219b28e0c1299f7ebda041cbc85115983ba",
+      "version": "1.2.15",
+      "port-version": 19
+    },
+    {
+      "git-tree": "5463be881042b7d98bf14377bb790a2a83c3a39e",
+      "version": "1.2.15",
+      "port-version": 18
+    },
     {
       "git-tree": "45b686784ad1b01e7cfa7988bc3f95bf9aff6b6a",
       "version": "1.2.15",
diff --git a/external_imported/vcpkg/versions/s-/sdl2-gfx.json b/external_imported/vcpkg/versions/s-/sdl2-gfx.json
index 759d0ebf3..db923c68b 100644
--- a/external_imported/vcpkg/versions/s-/sdl2-gfx.json
+++ b/external_imported/vcpkg/versions/s-/sdl2-gfx.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "47c97b80725181cf21b62229de6194b92d74f0fa",
+      "version": "1.0.4",
+      "port-version": 11
+    },
+    {
+      "git-tree": "6799c7e90f7c606835a0544db0852f31dbf99cbb",
+      "version": "1.0.4",
+      "port-version": 10
+    },
     {
       "git-tree": "bbbde3e3c97c7bca48c0509f20ff3858b6522abc",
       "version-string": "1.0.4",
diff --git a/external_imported/vcpkg/versions/s-/sdl2-image.json b/external_imported/vcpkg/versions/s-/sdl2-image.json
index 38f9a2a45..5292e9b68 100644
--- a/external_imported/vcpkg/versions/s-/sdl2-image.json
+++ b/external_imported/vcpkg/versions/s-/sdl2-image.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "641c3eeecdd7f109ac777e1a2792dd2b755f07fc",
+      "version": "2.6.3",
+      "port-version": 1
+    },
     {
       "git-tree": "cea786776b9bf5d0af613153194d58fa74aaf011",
       "version": "2.6.3",
diff --git a/external_imported/vcpkg/versions/s-/sdl2-mixer-ext.json b/external_imported/vcpkg/versions/s-/sdl2-mixer-ext.json
new file mode 100644
index 000000000..4d116f1f5
--- /dev/null
+++ b/external_imported/vcpkg/versions/s-/sdl2-mixer-ext.json
@@ -0,0 +1,24 @@
+{
+  "versions": [
+    {
+      "git-tree": "84e15f8ee51675059344358a920f2c9f4d3caa36",
+      "version": "2.6.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "4585bc468e6fbd0b8315dfa4dddbc2501945fbf8",
+      "version": "2.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "72599d1d3f046b10ba695a83a5de68a98bf86ec8",
+      "version-date": "2023-05-04",
+      "port-version": 1
+    },
+    {
+      "git-tree": "04312072ef4ea392cb39c240e579f06b4d62b955",
+      "version-date": "2023-05-04",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/s-/sdl2-mixer.json b/external_imported/vcpkg/versions/s-/sdl2-mixer.json
index 1f24d00ed..87dc92745 100644
--- a/external_imported/vcpkg/versions/s-/sdl2-mixer.json
+++ b/external_imported/vcpkg/versions/s-/sdl2-mixer.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "21406093a22cbd3a55befe2ff61f81011d055036",
+      "version": "2.8.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "bf530acd7b5169aaea8a4a7ec8c8d9a1987f7164",
+      "version": "2.6.3",
+      "port-version": 2
+    },
     {
       "git-tree": "4c169dd178363fec7d46194a45dc250b604b1f2e",
       "version": "2.6.3",
diff --git a/external_imported/vcpkg/versions/s-/sdl2-net.json b/external_imported/vcpkg/versions/s-/sdl2-net.json
index 8a937d9af..1a4e1c3c1 100644
--- a/external_imported/vcpkg/versions/s-/sdl2-net.json
+++ b/external_imported/vcpkg/versions/s-/sdl2-net.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "f735d9ac81c56778c5a317db55d1c1f2cce78e87",
+      "version": "2.2.0",
+      "port-version": 3
+    },
+    {
+      "git-tree": "755d96f16afae7c5b7cae15eb97fe5da85951a72",
+      "version": "2.2.0",
+      "port-version": 2
+    },
     {
       "git-tree": "b34dc64f26f414003d909391145491128bdcf636",
       "version": "2.2.0",
diff --git a/external_imported/vcpkg/versions/s-/sdl2-ttf.json b/external_imported/vcpkg/versions/s-/sdl2-ttf.json
index 3441119d6..7d1a1116a 100644
--- a/external_imported/vcpkg/versions/s-/sdl2-ttf.json
+++ b/external_imported/vcpkg/versions/s-/sdl2-ttf.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5727e1037aeb6698eda35ad791157d78d22b1a93",
+      "version": "2.20.2",
+      "port-version": 1
+    },
     {
       "git-tree": "8ea231424114356e940ea3ac40fdc7da27ea95ad",
       "version": "2.20.2",
diff --git a/external_imported/vcpkg/versions/s-/sdl2.json b/external_imported/vcpkg/versions/s-/sdl2.json
index 1d6acf434..f936da001 100644
--- a/external_imported/vcpkg/versions/s-/sdl2.json
+++ b/external_imported/vcpkg/versions/s-/sdl2.json
@@ -1,5 +1,50 @@
 {
   "versions": [
+    {
+      "git-tree": "4ab64007873e4e383360819f5227ad0747c649d1",
+      "version": "2.30.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "46ab8ddbed64fe98dab84eb0d95b8bb6e6d2d531",
+      "version": "2.28.5",
+      "port-version": 1
+    },
+    {
+      "git-tree": "06cf4722fa0f5f8467136faebe34cef0e85e1a4c",
+      "version": "2.28.5",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3d625914314454b36d303ce86753840f6193f2bd",
+      "version": "2.28.4",
+      "port-version": 1
+    },
+    {
+      "git-tree": "289db88c23499b30e20bf972b2e1e68c093e5dea",
+      "version": "2.28.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6b6220c48794ae1238dd8a6b491059446a8d3ebb",
+      "version": "2.28.3",
+      "port-version": 1
+    },
+    {
+      "git-tree": "cd85a856abc649e2717e838cf498052704226ed9",
+      "version": "2.28.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e2235ea94a5142fe57d9c27f6d2c3307177df933",
+      "version": "2.28.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "778bb1c06d96198619bbd75704bbd4592e5f4f3a",
+      "version": "2.26.5",
+      "port-version": 0
+    },
     {
       "git-tree": "b63b10452df400319db87cadc9a3e1d9d1b752a5",
       "version": "2.26.4",
diff --git a/external_imported/vcpkg/versions/s-/sdl2pp.json b/external_imported/vcpkg/versions/s-/sdl2pp.json
index f5603adc5..9bdb0f8af 100644
--- a/external_imported/vcpkg/versions/s-/sdl2pp.json
+++ b/external_imported/vcpkg/versions/s-/sdl2pp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "77e56d86771c6c97f8d9c7d8fa121dc2312ef509",
+      "version": "0.16.1",
+      "port-version": 8
+    },
     {
       "git-tree": "bad32a45cda4bfc70197d99e62b840794bd0b747",
       "version": "0.16.1",
diff --git a/external_imported/vcpkg/versions/s-/seacas.json b/external_imported/vcpkg/versions/s-/seacas.json
index 122208356..faa6b3c98 100644
--- a/external_imported/vcpkg/versions/s-/seacas.json
+++ b/external_imported/vcpkg/versions/s-/seacas.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "0107d3359b2fa880981554b822946ccb2109baea",
+      "version-date": "2022-11-22",
+      "port-version": 5
+    },
+    {
+      "git-tree": "709e85621b7fe043156154d04e5d9c174e47fab9",
+      "version-date": "2022-11-22",
+      "port-version": 4
+    },
+    {
+      "git-tree": "f49bca0bdf21c4b79c80ecefe3d3aa9a75ba49e7",
+      "version-date": "2022-11-22",
+      "port-version": 3
+    },
     {
       "git-tree": "00566c22630c8b3dff31a47c3be03389e4d33b3d",
       "version-date": "2022-11-22",
diff --git a/external_imported/vcpkg/versions/s-/seal.json b/external_imported/vcpkg/versions/s-/seal.json
index 78286d0ec..90d127f54 100644
--- a/external_imported/vcpkg/versions/s-/seal.json
+++ b/external_imported/vcpkg/versions/s-/seal.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b40b9aa4145e13facd191ec957a4cefa586d6f7f",
+      "version": "4.1.1",
+      "port-version": 1
+    },
     {
       "git-tree": "7a0927f22f4552984e2f651ea11c7c14f030d879",
       "version": "4.1.1",
diff --git a/external_imported/vcpkg/versions/s-/seasocks.json b/external_imported/vcpkg/versions/s-/seasocks.json
new file mode 100644
index 000000000..29f4c1533
--- /dev/null
+++ b/external_imported/vcpkg/versions/s-/seasocks.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "03e48020c7de7692366f75676b4f8567d96e22f0",
+      "version": "1.4.6",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2477e55b543e20d96c95546ff5a362d8a1a72044",
+      "version": "1.4.5",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/s-/sentencepiece.json b/external_imported/vcpkg/versions/s-/sentencepiece.json
index 4733c8251..2841da808 100644
--- a/external_imported/vcpkg/versions/s-/sentencepiece.json
+++ b/external_imported/vcpkg/versions/s-/sentencepiece.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "7c21445dada5c5ad8efb9bcf2729648155a7c391",
+      "version": "0.1.99",
+      "port-version": 1
+    },
+    {
+      "git-tree": "e4113b95c56e98d9c59787730bdc69978d23e290",
+      "version": "0.1.99",
+      "port-version": 0
+    },
     {
       "git-tree": "301c8902039b2ebb65ede78d6d17174a2ca4e8f6",
       "version": "0.1.97",
diff --git a/external_imported/vcpkg/versions/s-/sentry-native.json b/external_imported/vcpkg/versions/s-/sentry-native.json
index 79574bb0c..6798e512f 100644
--- a/external_imported/vcpkg/versions/s-/sentry-native.json
+++ b/external_imported/vcpkg/versions/s-/sentry-native.json
@@ -1,5 +1,50 @@
 {
   "versions": [
+    {
+      "git-tree": "3b95acbd27868522d2e27abe48d9f108d439f523",
+      "version": "0.7.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "5b7467839d13128952c0f944197f8d2fcbc7a763",
+      "version": "0.7.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "095696cc8cbe39b017311226154e23b909318ef1",
+      "version": "0.6.7",
+      "port-version": 0
+    },
+    {
+      "git-tree": "eda2bc26483b80cda6cb44c7aa2506de7c254547",
+      "version": "0.6.6",
+      "port-version": 0
+    },
+    {
+      "git-tree": "57e5580a75a4aa261871733eeda97721e557fe58",
+      "version": "0.6.5",
+      "port-version": 0
+    },
+    {
+      "git-tree": "fd5779f3ac082cce4ffa01f13b9ed0f9f4f74d73",
+      "version": "0.6.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "26846f654fd9638934b225f981999759025ff252",
+      "version": "0.6.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d7e8c1737ce3b69ee1dda758a40891fc460c8ff9",
+      "version": "0.6.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b3b1a8af6979eb89aefb53e29667592309485c18",
+      "version": "0.6.1",
+      "port-version": 0
+    },
     {
       "git-tree": "4c8485e46d8fe7b95d8e3cd0e3423ef80b328c8f",
       "version": "0.6.0",
diff --git a/external_imported/vcpkg/versions/s-/septag-sx.json b/external_imported/vcpkg/versions/s-/septag-sx.json
index 00bdc85e8..b520a3167 100644
--- a/external_imported/vcpkg/versions/s-/septag-sx.json
+++ b/external_imported/vcpkg/versions/s-/septag-sx.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "bb36ba5d776b41de1b33781f478d455046e1d9e3",
+      "version-date": "2019-05-07",
+      "port-version": 5
+    },
     {
       "git-tree": "3455654e48ff0abd3dc1babfc0bf163a9f567ed5",
       "version-string": "2019-05-07",
diff --git a/external_imported/vcpkg/versions/s-/seqan.json b/external_imported/vcpkg/versions/s-/seqan.json
index 7fda5058f..3aff9bf3a 100644
--- a/external_imported/vcpkg/versions/s-/seqan.json
+++ b/external_imported/vcpkg/versions/s-/seqan.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d9c24c4c48a7664bc9b685cd6c931d534ff6164b",
+      "version": "2.4.0",
+      "port-version": 3
+    },
     {
       "git-tree": "308d1d7ca45d981ec55da094763b72c2ffc062ca",
       "version-string": "2.4.0",
diff --git a/external_imported/vcpkg/versions/s-/serd.json b/external_imported/vcpkg/versions/s-/serd.json
index a29faa2a9..0d43b2b1b 100644
--- a/external_imported/vcpkg/versions/s-/serd.json
+++ b/external_imported/vcpkg/versions/s-/serd.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8f1848f6d4c698376b95a53e329eba78ff6ae893",
+      "version": "0.30.4",
+      "port-version": 2
+    },
     {
       "git-tree": "8ad1dbe412b4b19067a792c18f690d84b245eafb",
       "version-string": "0.30.4",
diff --git a/external_imported/vcpkg/versions/s-/sf2cute.json b/external_imported/vcpkg/versions/s-/sf2cute.json
index 93ab863c0..d70125ab8 100644
--- a/external_imported/vcpkg/versions/s-/sf2cute.json
+++ b/external_imported/vcpkg/versions/s-/sf2cute.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "909fbb570e221be633377b03cc7831c64d860c96",
+      "version": "0.2.0",
+      "port-version": 4
+    },
     {
       "git-tree": "e1ef32c3c0950a30ebd1b857009193245488f9ed",
       "version-string": "0.2.0",
diff --git a/external_imported/vcpkg/versions/s-/sfml.json b/external_imported/vcpkg/versions/s-/sfml.json
index dc814d0bf..8f37cff22 100644
--- a/external_imported/vcpkg/versions/s-/sfml.json
+++ b/external_imported/vcpkg/versions/s-/sfml.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "3cf9cce0cc82c37f5a37c1c97d05c7fcb4609486",
+      "version": "2.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "29d5488afb2bc4a0ea9a986412d569ba9575809b",
+      "version": "2.6.0",
+      "port-version": 19
+    },
+    {
+      "git-tree": "7712e31893217c566173961ad3681c19856e69e6",
+      "version": "2.6.0",
+      "port-version": 18
+    },
+    {
+      "git-tree": "8d61263f546c87d3c26f45ade4f92d65f1203816",
+      "version": "2.6.0",
+      "port-version": 17
+    },
+    {
+      "git-tree": "d9e87b4e23cdcec8d249517f14a69d8e453d3418",
+      "version": "2.5.1",
+      "port-version": 16
+    },
+    {
+      "git-tree": "477c029a9588d5f24c19fd0b6dbc82813fdc2150",
+      "version": "2.5.1",
+      "port-version": 15
+    },
     {
       "git-tree": "8ab010b7ce899203149c75197c19380506984683",
       "version": "2.5.1",
diff --git a/external_imported/vcpkg/versions/s-/shader-slang.json b/external_imported/vcpkg/versions/s-/shader-slang.json
index 19bbeef97..a05703e90 100644
--- a/external_imported/vcpkg/versions/s-/shader-slang.json
+++ b/external_imported/vcpkg/versions/s-/shader-slang.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "fddc74efcc306f4a4d24364f0a3b9dddbcda7f18",
+      "version": "2023.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "1a21463df58c9c2fb4af01bc6c9197ddb98804db",
+      "version": "0.27.20",
+      "port-version": 0
+    },
     {
       "git-tree": "b03b5bc45ef502e0ce522ce6fb71eba994348cf2",
       "version": "0.24.43",
diff --git a/external_imported/vcpkg/versions/s-/shaderc.json b/external_imported/vcpkg/versions/s-/shaderc.json
index 9ae975b85..e0c31bde1 100644
--- a/external_imported/vcpkg/versions/s-/shaderc.json
+++ b/external_imported/vcpkg/versions/s-/shaderc.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "d90cdfaa52413836f8f4557bae2eff84dbb2c322",
+      "version": "2023.7",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3a6e1c8ff08a6437170e17cc7b9c6c0bc0113ba2",
+      "version": "2021.1",
+      "port-version": 4
+    },
     {
       "git-tree": "b33d795ee7bc7bb9a02f904dc4d8e08e5f5f4900",
       "version": "2021.1",
diff --git a/external_imported/vcpkg/versions/s-/shaderwriter.json b/external_imported/vcpkg/versions/s-/shaderwriter.json
index d5680d6b9..d637749b7 100644
--- a/external_imported/vcpkg/versions/s-/shaderwriter.json
+++ b/external_imported/vcpkg/versions/s-/shaderwriter.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "fa83579d72d0cf7bc11c2bd264ad15e80536eb21",
+      "version": "2.7.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ab41ceb262232d4ccc5cccbdba599f2f40d7a241",
+      "version": "2.6.0",
+      "port-version": 0
+    },
     {
       "git-tree": "d87eb1ff4e1e6208bb7be494740e5ab7ac8c9b83",
       "version": "2.5.0",
diff --git a/external_imported/vcpkg/versions/s-/shapelib.json b/external_imported/vcpkg/versions/s-/shapelib.json
index e558b2abd..7c575b57d 100644
--- a/external_imported/vcpkg/versions/s-/shapelib.json
+++ b/external_imported/vcpkg/versions/s-/shapelib.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "6b89a941de4bb79399a81b9199cf15e66a882956",
+      "version": "1.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "07bc870ae6b0fd620c817bd35c8ec499ecbf4f22",
+      "version": "1.5.0",
+      "port-version": 4
+    },
     {
       "git-tree": "befbba83687abe4b10f1fb55ac5ccc344bd11084",
       "version": "1.5.0",
diff --git a/external_imported/vcpkg/versions/s-/shiftmedia-libgnutls.json b/external_imported/vcpkg/versions/s-/shiftmedia-libgnutls.json
index 82eeb9204..6404b7548 100644
--- a/external_imported/vcpkg/versions/s-/shiftmedia-libgnutls.json
+++ b/external_imported/vcpkg/versions/s-/shiftmedia-libgnutls.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "9016464ed8d222fec37cee5ff63cf786731342a1",
+      "version": "3.7.6",
+      "port-version": 3
+    },
+    {
+      "git-tree": "44e16573e54fa8a8c8599c0b2cb82a0d1f829e22",
+      "version": "3.7.6",
+      "port-version": 2
+    },
+    {
+      "git-tree": "1af7188530a656fe2103e74844333d8c37c5232d",
+      "version": "3.7.6",
+      "port-version": 1
+    },
     {
       "git-tree": "c204a889320c521ef348d1108a3f665be0bbe07a",
       "version": "3.7.6",
diff --git a/external_imported/vcpkg/versions/s-/shiftmedia-libgpg-error.json b/external_imported/vcpkg/versions/s-/shiftmedia-libgpg-error.json
index 88987e7db..1e00f201b 100644
--- a/external_imported/vcpkg/versions/s-/shiftmedia-libgpg-error.json
+++ b/external_imported/vcpkg/versions/s-/shiftmedia-libgpg-error.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "980fe2b368e256297c645b1a326b460d7ffef016",
+      "version": "1.45",
+      "port-version": 1
+    },
     {
       "git-tree": "194526ea5431d93f00f3e48d1ab2d0aad0e86c48",
       "version": "1.45",
diff --git a/external_imported/vcpkg/versions/s-/shiva-sfml.json b/external_imported/vcpkg/versions/s-/shiva-sfml.json
index aec1258e1..157073a64 100644
--- a/external_imported/vcpkg/versions/s-/shiva-sfml.json
+++ b/external_imported/vcpkg/versions/s-/shiva-sfml.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "243e316b0f03e7473f24e379ca8fa22992695f2b",
+      "version": "1.0",
+      "port-version": 4
+    },
     {
       "git-tree": "15b34188ab13ed064aabffac0b2faca203b214a1",
       "version-string": "1.0",
diff --git a/external_imported/vcpkg/versions/s-/shiva.json b/external_imported/vcpkg/versions/s-/shiva.json
index 81d1b1b42..a476c4e3b 100644
--- a/external_imported/vcpkg/versions/s-/shiva.json
+++ b/external_imported/vcpkg/versions/s-/shiva.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "f3ad56d6d26b5b6003846ded935d9e5727ed725b",
+      "version": "1.0",
+      "port-version": 7
+    },
+    {
+      "git-tree": "1f99562a0a906db852e4ff3a7caf03ad4c4fbcab",
+      "version": "1.0",
+      "port-version": 6
+    },
     {
       "git-tree": "821cf61c76079cfd5c7a635dc36e01c0f33c38f5",
       "version": "1.0",
diff --git a/external_imported/vcpkg/versions/s-/shogun.json b/external_imported/vcpkg/versions/s-/shogun.json
index c00522459..ad4f7c93a 100644
--- a/external_imported/vcpkg/versions/s-/shogun.json
+++ b/external_imported/vcpkg/versions/s-/shogun.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "66286469fa661da12735a2f8267a293bd63117a8",
+      "version": "6.1.4",
+      "port-version": 9
+    },
     {
       "git-tree": "3164a64864f9758f6dede7b1ea6bcdb2ae199dd9",
       "version-string": "6.1.4",
diff --git a/external_imported/vcpkg/versions/s-/si.json b/external_imported/vcpkg/versions/s-/si.json
new file mode 100644
index 000000000..a1595c895
--- /dev/null
+++ b/external_imported/vcpkg/versions/s-/si.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "288cfb02ca17822810538628dab87c6773081160",
+      "version": "2.5.1",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/s-/sigmatch.json b/external_imported/vcpkg/versions/s-/sigmatch.json
new file mode 100644
index 000000000..4500fbd15
--- /dev/null
+++ b/external_imported/vcpkg/versions/s-/sigmatch.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "83b6f5b1da02efa0313fdf8caa5ee44f41047143",
+      "version": "0.2.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/s-/signalrclient.json b/external_imported/vcpkg/versions/s-/signalrclient.json
index faba98cba..ce4b00ca0 100644
--- a/external_imported/vcpkg/versions/s-/signalrclient.json
+++ b/external_imported/vcpkg/versions/s-/signalrclient.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "28135a6a807825f1fdfbb1e086c10569d385482c",
+      "version": "1.0.0-beta1-9",
+      "port-version": 5
+    },
+    {
+      "git-tree": "c2981e91dbe37fc7ab10d1c071d4a47b1388eb3b",
+      "version": "1.0.0-beta1-9",
+      "port-version": 4
+    },
     {
       "git-tree": "142a336533806e7d9e1fc0807363be351ecf5286",
       "version-string": "1.0.0-beta1-9",
diff --git a/external_imported/vcpkg/versions/s-/sigslot.json b/external_imported/vcpkg/versions/s-/sigslot.json
index 2ef6ef5f0..676b1d195 100644
--- a/external_imported/vcpkg/versions/s-/sigslot.json
+++ b/external_imported/vcpkg/versions/s-/sigslot.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "db470857420cb91f6f0e4ddcb3f7bcd33d540ab9",
+      "version": "1.0.0",
+      "port-version": 5
+    },
     {
       "git-tree": "78e94753c09651ef7e2c09cbb134ae2cb786ade4",
       "version-string": "1.0.0",
diff --git a/external_imported/vcpkg/versions/s-/simage.json b/external_imported/vcpkg/versions/s-/simage.json
index c8d5ae9c0..96ada004f 100644
--- a/external_imported/vcpkg/versions/s-/simage.json
+++ b/external_imported/vcpkg/versions/s-/simage.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "824535538b2f13b732f661d657380b480bebea82",
+      "version-semver": "1.8.3",
+      "port-version": 0
+    },
     {
       "git-tree": "1e3fa3cf60c5fa543b313ed36d80a09d7a9ec8cd",
       "version-semver": "1.8.2",
diff --git a/external_imported/vcpkg/versions/s-/simd.json b/external_imported/vcpkg/versions/s-/simd.json
index dfe05cb7e..cc7f40901 100644
--- a/external_imported/vcpkg/versions/s-/simd.json
+++ b/external_imported/vcpkg/versions/s-/simd.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "a2b30d3025f099db089990aed91ded39c41ffccd",
+      "version": "5.3.128",
+      "port-version": 0
+    },
+    {
+      "git-tree": "279d96ec1919311cad845670822f7cc376f503e6",
+      "version": "5.2.123",
+      "port-version": 1
+    },
     {
       "git-tree": "64cfb73836acffe8ff38e25477e0e8332707b4fc",
       "version": "5.2.123",
diff --git a/external_imported/vcpkg/versions/s-/simde.json b/external_imported/vcpkg/versions/s-/simde.json
index e60cf9df4..3f860fd31 100644
--- a/external_imported/vcpkg/versions/s-/simde.json
+++ b/external_imported/vcpkg/versions/s-/simde.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "3776be38dc5cf963db0a97cbb5b043488c43b79c",
+      "version": "0.7.6",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f46b6e3bc03d59a8f45ae99c0c0d08b8386f230a",
+      "version": "0.7.4",
+      "port-version": 0
+    },
     {
       "git-tree": "b9f97efd430bad429766d57361f329bb1e1597f4",
       "version": "0.7.2",
diff --git a/external_imported/vcpkg/versions/s-/simdjson.json b/external_imported/vcpkg/versions/s-/simdjson.json
index 9977756d7..0cebaef77 100644
--- a/external_imported/vcpkg/versions/s-/simdjson.json
+++ b/external_imported/vcpkg/versions/s-/simdjson.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "85480e0db4ff161c74400267ba3567d038fb15c7",
+      "version": "3.6.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "838a79135dfbc8b2870346447b3387543f94e067",
+      "version": "3.2.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9cfad57f29374b71827cbe3861a7f22558afedce",
+      "version": "3.2.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d62e75a24f4a107faf802fc187d3cf72e0041c51",
+      "version": "3.1.8",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9ef276894dacedca108836726f0e37278fb53861",
+      "version": "3.1.7",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8d4926521a5e488d316ec612c5cca368ae842cc9",
+      "version": "3.1.6",
+      "port-version": 0
+    },
     {
       "git-tree": "6694abe5993ac1fc09466303507bb0eccca53911",
       "version": "3.1.5",
diff --git a/external_imported/vcpkg/versions/s-/simdutf.json b/external_imported/vcpkg/versions/s-/simdutf.json
index f102a45a3..73d1b5a6a 100644
--- a/external_imported/vcpkg/versions/s-/simdutf.json
+++ b/external_imported/vcpkg/versions/s-/simdutf.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5c88dfda4ee0a79ae238b227b9866b5ad9f4651a",
+      "version-semver": "3.2.16",
+      "port-version": 0
+    },
     {
       "git-tree": "9d32f4a5bb9643b561a26f555064b2341a93df4b",
       "version-semver": "1.0.0",
diff --git a/external_imported/vcpkg/versions/s-/simonbrunel-qtpromise.json b/external_imported/vcpkg/versions/s-/simonbrunel-qtpromise.json
new file mode 100644
index 000000000..dfe3f3acb
--- /dev/null
+++ b/external_imported/vcpkg/versions/s-/simonbrunel-qtpromise.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "b416eec5f84996491c4656f6b01723453abac31f",
+      "version": "0.7.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/s-/simple-fft.json b/external_imported/vcpkg/versions/s-/simple-fft.json
index 8ea28d2b1..011039e84 100644
--- a/external_imported/vcpkg/versions/s-/simple-fft.json
+++ b/external_imported/vcpkg/versions/s-/simple-fft.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "711bb14f0925c407c350fb8428d0721692639342",
+      "version-date": "2020-06-14",
+      "port-version": 2
+    },
     {
       "git-tree": "c8c90beba45454e3e497fb7ef62b20a188bee1c2",
       "version-string": "2020-06-14",
diff --git a/external_imported/vcpkg/versions/s-/simpleble.json b/external_imported/vcpkg/versions/s-/simpleble.json
new file mode 100644
index 000000000..aec725c7e
--- /dev/null
+++ b/external_imported/vcpkg/versions/s-/simpleble.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "40042ec8c4a3d070cda1fd27f4ed5fc931219e3e",
+      "version-date": "2023-07-29",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/s-/simsimd.json b/external_imported/vcpkg/versions/s-/simsimd.json
new file mode 100644
index 000000000..97e785ba0
--- /dev/null
+++ b/external_imported/vcpkg/versions/s-/simsimd.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "3d7b5f4bfb287e7ac7f0a9ad241a566f53f959d4",
+      "version": "1.4.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/s-/skia.json b/external_imported/vcpkg/versions/s-/skia.json
index 886fade10..60cceb6a0 100644
--- a/external_imported/vcpkg/versions/s-/skia.json
+++ b/external_imported/vcpkg/versions/s-/skia.json
@@ -1,5 +1,45 @@
 {
   "versions": [
+    {
+      "git-tree": "b33b637ea6bf1d04acc4aac659b0238f9d16a0c1",
+      "version": "0.38.2",
+      "port-version": 4
+    },
+    {
+      "git-tree": "35eec017ed472e7061cc38768bb4aa9168464332",
+      "version": "0.38.2",
+      "port-version": 3
+    },
+    {
+      "git-tree": "ce919437fcbcbfe2c364757efdc117a286f44fa2",
+      "version": "0.38.2",
+      "port-version": 2
+    },
+    {
+      "git-tree": "7363d84372c8a2a6e3c06a7fcc6c1ef1d1b7b97a",
+      "version": "0.38.2",
+      "port-version": 1
+    },
+    {
+      "git-tree": "5a7376b3d299acc253980a36193079fbb42eea1b",
+      "version": "0.38.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "df5e0eb3dc6aa8ee9b5829caf01ce7876bc7c2fe",
+      "version": "0.36.0",
+      "port-version": 10
+    },
+    {
+      "git-tree": "9389efe5ea2540ef9a0885b796d13e0d730fb603",
+      "version": "0.36.0",
+      "port-version": 9
+    },
+    {
+      "git-tree": "59bcc7110298012cf8f0d6e68ec8d04a4cb01e8b",
+      "version": "0.36.0",
+      "port-version": 8
+    },
     {
       "git-tree": "508710af38e0b50675532741bf899ec4c3f20c3b",
       "version": "0.36.0",
diff --git a/external_imported/vcpkg/versions/s-/sleef.json b/external_imported/vcpkg/versions/s-/sleef.json
index 5e58f02d7..b404bed22 100644
--- a/external_imported/vcpkg/versions/s-/sleef.json
+++ b/external_imported/vcpkg/versions/s-/sleef.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "12afaa5146f51bf2912339befaafd1776e10442a",
+      "version": "3.5.1",
+      "port-version": 4
+    },
     {
       "git-tree": "bd282d0004a477385c5e6487aabc83bab31059ec",
       "version": "3.5.1",
diff --git a/external_imported/vcpkg/versions/s-/sleepy-discord.json b/external_imported/vcpkg/versions/s-/sleepy-discord.json
index 78559640b..0d382ccf9 100644
--- a/external_imported/vcpkg/versions/s-/sleepy-discord.json
+++ b/external_imported/vcpkg/versions/s-/sleepy-discord.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "594857bed2d04f35b594acbf4f1488c4ae4c4ad0",
+      "version-date": "2022-02-05",
+      "port-version": 2
+    },
+    {
+      "git-tree": "7d9b72be7b331d4451d11594b175b0e1f97a75ab",
+      "version-date": "2022-02-05",
+      "port-version": 1
+    },
     {
       "git-tree": "5e868f4817878ec1c9686ab467b60f8086c50a00",
       "version-date": "2022-02-05",
diff --git a/external_imported/vcpkg/versions/s-/sltbench.json b/external_imported/vcpkg/versions/s-/sltbench.json
index 3a39f7328..7efeddb85 100644
--- a/external_imported/vcpkg/versions/s-/sltbench.json
+++ b/external_imported/vcpkg/versions/s-/sltbench.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "ff6317efd629a2f1ec64e3ad14f9d6d11b139d39",
+      "version": "2.4.0",
+      "port-version": 3
+    },
+    {
+      "git-tree": "f5a607736f0e3c2bb0a3c0c9c3525dec4cc3c980",
+      "version": "2.4.0",
+      "port-version": 2
+    },
     {
       "git-tree": "5df47ef0674021ac20500e87c0b3c19c176fa005",
       "version-string": "2.4.0",
diff --git a/external_imported/vcpkg/versions/s-/smpeg2.json b/external_imported/vcpkg/versions/s-/smpeg2.json
index 5e14b9977..6c7c9d6ff 100644
--- a/external_imported/vcpkg/versions/s-/smpeg2.json
+++ b/external_imported/vcpkg/versions/s-/smpeg2.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "e72c715fb637688426feaa616ab0bc07c7758f8c",
+      "version": "2.0.0",
+      "port-version": 10
+    },
+    {
+      "git-tree": "8152688421f7023b7160c97976631b798025bb39",
+      "version": "2.0.0",
+      "port-version": 9
+    },
     {
       "git-tree": "a09fe59a859ca99ee652c6bfb0b27cbd4e99a9cd",
       "version-string": "2.0.0",
diff --git a/external_imported/vcpkg/versions/s-/snap7.json b/external_imported/vcpkg/versions/s-/snap7.json
new file mode 100644
index 000000000..dfacb4184
--- /dev/null
+++ b/external_imported/vcpkg/versions/s-/snap7.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "9183c4fc6d65ae695c68f0481e5a7dc0067f65fe",
+      "version": "1.4.2",
+      "port-version": 1
+    },
+    {
+      "git-tree": "7239966c661f1446977b064f7dec762248edf8d4",
+      "version": "1.4.2",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/s-/snappy.json b/external_imported/vcpkg/versions/s-/snappy.json
index b2a0fb21d..06d7e64ac 100644
--- a/external_imported/vcpkg/versions/s-/snappy.json
+++ b/external_imported/vcpkg/versions/s-/snappy.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "674abac6de71455f63c6649f436ff0801545ae00",
+      "version": "1.1.10",
+      "port-version": 0
+    },
     {
       "git-tree": "a97f6aac039dc2b5e6fdac753d66b94cfb408d30",
       "version": "1.1.9",
diff --git a/external_imported/vcpkg/versions/s-/sndfile.json b/external_imported/vcpkg/versions/s-/sndfile.json
index 0700452b2..99e2d2408 100644
--- a/external_imported/vcpkg/versions/s-/sndfile.json
+++ b/external_imported/vcpkg/versions/s-/sndfile.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fa2da433a3aae003670c43ef93492b9d27cc190e",
+      "version": "0",
+      "port-version": 2
+    },
     {
       "git-tree": "b0706d70c299fbe9e9e32d80e5ba2cb910dfd294",
       "version-string": "0",
diff --git a/external_imported/vcpkg/versions/s-/snitch.json b/external_imported/vcpkg/versions/s-/snitch.json
new file mode 100644
index 000000000..a7091cbbf
--- /dev/null
+++ b/external_imported/vcpkg/versions/s-/snitch.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "565f1464cf23c18da8ac0f547d3907f732249957",
+      "version": "1.2.4",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/s-/snowhouse.json b/external_imported/vcpkg/versions/s-/snowhouse.json
index 0031ac584..ff7777e46 100644
--- a/external_imported/vcpkg/versions/s-/snowhouse.json
+++ b/external_imported/vcpkg/versions/s-/snowhouse.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f8177477e8aad0ea23005b80b169029ff00aef04",
+      "version": "5.0.0",
+      "port-version": 2
+    },
     {
       "git-tree": "d49ba83122c461ba6d57aa2768241cc07ff3e32e",
       "version-string": "5.0.0",
diff --git a/external_imported/vcpkg/versions/s-/so5extra.json b/external_imported/vcpkg/versions/s-/so5extra.json
index f9490aa71..fcd658225 100644
--- a/external_imported/vcpkg/versions/s-/so5extra.json
+++ b/external_imported/vcpkg/versions/s-/so5extra.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "ec341c7fb5c8d09b831db9d31ce7ce70b9eb5252",
+      "version": "1.6.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c9d60e292e5e8e325a94f96069299824e59b1a90",
+      "version": "1.6.0",
+      "port-version": 0
+    },
     {
       "git-tree": "37cb69203bc26a671b5b9ccaa0dc6c486c35ddb4",
       "version": "1.5.2",
diff --git a/external_imported/vcpkg/versions/s-/sobjectizer.json b/external_imported/vcpkg/versions/s-/sobjectizer.json
index 246303007..84ff0173a 100644
--- a/external_imported/vcpkg/versions/s-/sobjectizer.json
+++ b/external_imported/vcpkg/versions/s-/sobjectizer.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "19bcadb4abff7ed5b5423eca7280259ab6b3045a",
+      "version": "5.8.1.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "318301f060f4853b2ed29d087e7d7730fe55d156",
+      "version": "5.8.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d0e513c72a3e180c47d0f1d9f68256aa5eb3ea2b",
+      "version": "5.8.0.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3dcf8c753611ce387e21d981d5a7df8079cfe704",
+      "version": "5.7.5",
+      "port-version": 0
+    },
+    {
+      "git-tree": "52eda985aee5e14e16a47573154b39f069824d49",
+      "version": "5.7.4.3",
+      "port-version": 0
+    },
     {
       "git-tree": "a77d86943e98697db670f9ee10fd24e8d19f08ce",
       "version": "5.7.4.2",
diff --git a/external_imported/vcpkg/versions/s-/soci.json b/external_imported/vcpkg/versions/s-/soci.json
index 712852752..c8b037402 100644
--- a/external_imported/vcpkg/versions/s-/soci.json
+++ b/external_imported/vcpkg/versions/s-/soci.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "24c340284022dab38da690548caa65c4f003bb7c",
+      "version": "4.0.3",
+      "port-version": 3
+    },
+    {
+      "git-tree": "63f4471adc41e108aed34cd585a06e354f1b4762",
+      "version": "4.0.3",
+      "port-version": 2
+    },
+    {
+      "git-tree": "9a70ee9344f5a66ed9ad34a5f64608b81e66bfde",
+      "version": "4.0.3",
+      "port-version": 1
+    },
     {
       "git-tree": "11a646f331554958a517bc644c54df99dfbbbd1b",
       "version": "4.0.3",
diff --git a/external_imported/vcpkg/versions/s-/socket-io-client.json b/external_imported/vcpkg/versions/s-/socket-io-client.json
index fd92a4d62..96b0a515e 100644
--- a/external_imported/vcpkg/versions/s-/socket-io-client.json
+++ b/external_imported/vcpkg/versions/s-/socket-io-client.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "2cb320ec7ddd2f7ec85d78172dae5904564b5e04",
+      "version-date": "2023-11-11",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2aa8fb06982abcd0918726ba79bf81edc9000a4b",
+      "version-date": "2023-02-14",
+      "port-version": 0
+    },
     {
       "git-tree": "f4f6bebb98623c2bf8602d7538ae4c1d7de6c0ad",
       "version-date": "2022-08-19",
diff --git a/external_imported/vcpkg/versions/s-/sockpp.json b/external_imported/vcpkg/versions/s-/sockpp.json
index 792eb3f5d..e1ca8344d 100644
--- a/external_imported/vcpkg/versions/s-/sockpp.json
+++ b/external_imported/vcpkg/versions/s-/sockpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ab2b9cfee212de99341c19d0604cf857c789dc60",
+      "version": "0.8.1",
+      "port-version": 0
+    },
     {
       "git-tree": "608151660b414b2bbcdec35bdd622fdce5620abb",
       "version": "0.7.1",
diff --git a/external_imported/vcpkg/versions/s-/soem.json b/external_imported/vcpkg/versions/s-/soem.json
index 059c56c68..fbab3c1f5 100644
--- a/external_imported/vcpkg/versions/s-/soem.json
+++ b/external_imported/vcpkg/versions/s-/soem.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "fdbb2e9fafc4dfc1aca0c45a872b3b202e2a9254",
+      "version-date": "2023-06-09",
+      "port-version": 1
+    },
+    {
+      "git-tree": "a02a02f57a58361241f7bb0890de819f94e198b3",
+      "version-date": "2023-06-09",
+      "port-version": 0
+    },
     {
       "git-tree": "442917830f982b5c1cfcf3a74fd251d92ddab6e9",
       "version": "1.4.0",
diff --git a/external_imported/vcpkg/versions/s-/soil2.json b/external_imported/vcpkg/versions/s-/soil2.json
index 187420ec9..741ba6ece 100644
--- a/external_imported/vcpkg/versions/s-/soil2.json
+++ b/external_imported/vcpkg/versions/s-/soil2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d39031bc410f4e384b777c895f5fb733efeb3e60",
+      "version": "1.3.0",
+      "port-version": 1
+    },
     {
       "git-tree": "9d6004f9bd4f228751d31a1921bb8ece30d3c6eb",
       "version": "1.3.0",
diff --git a/external_imported/vcpkg/versions/s-/sokol.json b/external_imported/vcpkg/versions/s-/sokol.json
index d1445dace..614b2ec14 100644
--- a/external_imported/vcpkg/versions/s-/sokol.json
+++ b/external_imported/vcpkg/versions/s-/sokol.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "2bc7a2147353f37a7902e5187718bbb74f6d1615",
+      "version-date": "2023-10-07",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5ba547d31c66bb41bf11cb755706b99e1b615e2e",
+      "version-date": "2019-09-09",
+      "port-version": 2
+    },
     {
       "git-tree": "18b4da89731b9e7cf61e56fc72594049c420d2e1",
       "version-string": "2019-09-09",
diff --git a/external_imported/vcpkg/versions/s-/sol2.json b/external_imported/vcpkg/versions/s-/sol2.json
index b84e76483..26dd3f938 100644
--- a/external_imported/vcpkg/versions/s-/sol2.json
+++ b/external_imported/vcpkg/versions/s-/sol2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "803f41c884606248b07d343e13716c1135da7957",
+      "version": "3.3.1",
+      "port-version": 0
+    },
     {
       "git-tree": "115cb8217bb876cfb71fadec889faa25954db8b1",
       "version": "3.3.0",
diff --git a/external_imported/vcpkg/versions/s-/sophus.json b/external_imported/vcpkg/versions/s-/sophus.json
index 64f100f3c..7f994e1b4 100644
--- a/external_imported/vcpkg/versions/s-/sophus.json
+++ b/external_imported/vcpkg/versions/s-/sophus.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0f1a3b01427b62e229fe879a09465c07834d469a",
+      "version": "1.22.10",
+      "port-version": 0
+    },
     {
       "git-tree": "90c7c425fb7d1af0e2201091c0ec00e97309e12e",
       "version-date": "2021-09-14",
diff --git a/external_imported/vcpkg/versions/s-/sord.json b/external_imported/vcpkg/versions/s-/sord.json
index 5965caea2..964632a17 100644
--- a/external_imported/vcpkg/versions/s-/sord.json
+++ b/external_imported/vcpkg/versions/s-/sord.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5d67b14f489ea7ebae790682dfe2beb9acb54720",
+      "version": "0.16.4",
+      "port-version": 2
+    },
     {
       "git-tree": "43058c5106d4162b43522646df027c913f088e61",
       "version-string": "0.16.4",
diff --git a/external_imported/vcpkg/versions/s-/soundtouch.json b/external_imported/vcpkg/versions/s-/soundtouch.json
index 5c37a47d7..428a6f976 100644
--- a/external_imported/vcpkg/versions/s-/soundtouch.json
+++ b/external_imported/vcpkg/versions/s-/soundtouch.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "a2f43b08cb75d26f5756e611a64f5708dcbfb0a1",
+      "version": "2.3.2",
+      "port-version": 1
+    },
+    {
+      "git-tree": "a50336df269c13ab5d50f840fdc02afbfda7244c",
+      "version": "2.3.2",
+      "port-version": 0
+    },
     {
       "git-tree": "f4f307065b40b131fd80ce953afcc121aba46f9f",
       "version": "2.3.1",
diff --git a/external_imported/vcpkg/versions/s-/soxr.json b/external_imported/vcpkg/versions/s-/soxr.json
index 84790c0df..5cd6749fb 100644
--- a/external_imported/vcpkg/versions/s-/soxr.json
+++ b/external_imported/vcpkg/versions/s-/soxr.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "89f01ea88aee3a0468ba3bf335a7a537a105cae1",
+      "version": "0.1.3",
+      "port-version": 8
+    },
     {
       "git-tree": "9eaa72e750312e0bacbd2a02e1a16fcc680489dd",
       "version": "0.1.3",
diff --git a/external_imported/vcpkg/versions/s-/spaceland.json b/external_imported/vcpkg/versions/s-/spaceland.json
index 365accca1..83a8d7825 100644
--- a/external_imported/vcpkg/versions/s-/spaceland.json
+++ b/external_imported/vcpkg/versions/s-/spaceland.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "261556139a5816276568790ac8b8c7eba3b58f72",
+      "version": "7.8.2",
+      "port-version": 8
+    },
+    {
+      "git-tree": "e8139a817a073bd514472aae3fb0366dcc52d620",
+      "version": "7.8.2",
+      "port-version": 7
+    },
     {
       "git-tree": "05079a1eaffbd5cdd7d2fae904816c3dd849ea24",
       "version-string": "7.8.2",
diff --git a/external_imported/vcpkg/versions/s-/sparsepp.json b/external_imported/vcpkg/versions/s-/sparsepp.json
index 6c14b57e3..af05620bb 100644
--- a/external_imported/vcpkg/versions/s-/sparsepp.json
+++ b/external_imported/vcpkg/versions/s-/sparsepp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "06d3ed1d599ab1737aa060480027d87d25505337",
+      "version": "1.22",
+      "port-version": 4
+    },
     {
       "git-tree": "37dc23bec7c8cd878b8ab1a808e2a177c0930644",
       "version-string": "1.22",
diff --git a/external_imported/vcpkg/versions/s-/spatialite-tools.json b/external_imported/vcpkg/versions/s-/spatialite-tools.json
index 3493dd6da..bf2e402a2 100644
--- a/external_imported/vcpkg/versions/s-/spatialite-tools.json
+++ b/external_imported/vcpkg/versions/s-/spatialite-tools.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "706b7879f1ae2e597ffefd6ab923251be8706605",
+      "version": "5.1.0-a",
+      "port-version": 0
+    },
+    {
+      "git-tree": "200da5b412aa158df73737b51ef1b679c5bbf27f",
+      "version": "5.0.1",
+      "port-version": 4
+    },
+    {
+      "git-tree": "d43ffc786b8af336ac589bde284a4a7393c950f0",
+      "version": "5.0.1",
+      "port-version": 3
+    },
     {
       "git-tree": "480ac025b9ad7cecc2cf17f935115a13c0de31a0",
       "version": "5.0.1",
diff --git a/external_imported/vcpkg/versions/s-/spdlog.json b/external_imported/vcpkg/versions/s-/spdlog.json
old mode 100755
new mode 100644
index 347c6b18a..0352b1745
--- a/external_imported/vcpkg/versions/s-/spdlog.json
+++ b/external_imported/vcpkg/versions/s-/spdlog.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "8ee97c0faf23e06508ca097e013e2bea40579d06",
+      "version-semver": "1.13.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "41cf31aa350a44644863d7777489501d240f248c",
+      "version-semver": "1.12.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "67656948712582d93d9096cc08871a3270908d38",
+      "version-semver": "1.11.0",
+      "port-version": 1
+    },
     {
       "git-tree": "296d78e54c14ce64474b66f60847026ddb1f576e",
       "version-semver": "1.11.0",
diff --git a/external_imported/vcpkg/versions/s-/speexdsp.json b/external_imported/vcpkg/versions/s-/speexdsp.json
index a598b990f..59f37fac7 100644
--- a/external_imported/vcpkg/versions/s-/speexdsp.json
+++ b/external_imported/vcpkg/versions/s-/speexdsp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "79efeda6f8cdd6f28e85bee7787e529da2d94c3c",
+      "version": "1.2.1",
+      "port-version": 1
+    },
     {
       "git-tree": "9d3a05d75970beec385a36ceb592f9f9e928d62f",
       "version": "1.2.1",
diff --git a/external_imported/vcpkg/versions/s-/spirit-po.json b/external_imported/vcpkg/versions/s-/spirit-po.json
index f1551b040..d1a481c8c 100644
--- a/external_imported/vcpkg/versions/s-/spirit-po.json
+++ b/external_imported/vcpkg/versions/s-/spirit-po.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9948e3b6cffe3bc1b61bf71089ad85247ecc1355",
+      "version": "1.1.2",
+      "port-version": 3
+    },
     {
       "git-tree": "9cebcf471848bf1b121a7335d3af54c64a038a9e",
       "version-string": "1.1.2",
diff --git a/external_imported/vcpkg/versions/s-/spirv-cross.json b/external_imported/vcpkg/versions/s-/spirv-cross.json
index 89d92c950..01da88066 100644
--- a/external_imported/vcpkg/versions/s-/spirv-cross.json
+++ b/external_imported/vcpkg/versions/s-/spirv-cross.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "84e71bc5b393bcd79a4093a3100d9a05f879d8b4",
+      "version": "1.3.275.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8c3a9c2839a67379dfebc9e4f3df038359a8383c",
+      "version": "1.3.268.0",
+      "port-version": 0
+    },
     {
       "git-tree": "9adc9e1ab78dd956558b40aa39767262a251eca6",
       "version-date": "2021-01-15",
diff --git a/external_imported/vcpkg/versions/s-/spirv-headers.json b/external_imported/vcpkg/versions/s-/spirv-headers.json
index 40021d33b..3ac43e24c 100644
--- a/external_imported/vcpkg/versions/s-/spirv-headers.json
+++ b/external_imported/vcpkg/versions/s-/spirv-headers.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "d0bd177162a784f4939c6e142a9fe590e4c10dce",
+      "version": "1.3.275.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a169757648a3ab575795f1d4b417d5c1e545fb81",
+      "version": "1.3.268.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9745c8474cd0d67262164092fe7283b7ecb36914",
+      "version": "1.3.246.1",
+      "port-version": 0
+    },
     {
       "git-tree": "1975a40807faf80ae5a8513b15f707ec9d583763",
       "version": "1.3.231.1",
diff --git a/external_imported/vcpkg/versions/s-/spirv-reflect.json b/external_imported/vcpkg/versions/s-/spirv-reflect.json
index 7c6916c2e..9c6235724 100644
--- a/external_imported/vcpkg/versions/s-/spirv-reflect.json
+++ b/external_imported/vcpkg/versions/s-/spirv-reflect.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "3ec7c21ce674b3369a7ca32f4822e463815931a5",
+      "version": "1.3.275.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "640aba022004347ac98e964b8a932dde3f677d5f",
+      "version": "1.3.268.0",
+      "port-version": 0
+    },
     {
       "git-tree": "e36ea589e8b33e978c90da2c33ee457cd948dfce",
       "version": "1.3.236.0",
diff --git a/external_imported/vcpkg/versions/s-/spirv-tools.json b/external_imported/vcpkg/versions/s-/spirv-tools.json
index d8482f5fa..3bef8c6c2 100644
--- a/external_imported/vcpkg/versions/s-/spirv-tools.json
+++ b/external_imported/vcpkg/versions/s-/spirv-tools.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "d85b9c9f0dcec75a5748e685d30b952fb97e431b",
+      "version": "1.3.275.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "73ef0c502cabbe79cfcef62b67ec352e8675c721",
+      "version": "1.3.268.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "47e4151499f10ce55584fc6818822bdc4a913353",
+      "version": "2023.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "082a2b7ca21aeafe82dc89765facb7c34675b7b9",
+      "version": "2022.4",
+      "port-version": 1
+    },
     {
       "git-tree": "38e7ee249f19adf3574548ce895be13919960fdf",
       "version": "2022.4",
diff --git a/external_imported/vcpkg/versions/s-/spix.json b/external_imported/vcpkg/versions/s-/spix.json
index 926c75f68..bae6b2a26 100644
--- a/external_imported/vcpkg/versions/s-/spix.json
+++ b/external_imported/vcpkg/versions/s-/spix.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "242f18b432502d15fba249b9b830ee7a4781599b",
+      "version": "0.5",
+      "port-version": 0
+    },
     {
       "git-tree": "4d26875159ee21430be1cff1f64ebe8dacdcbf7b",
       "version": "0.4",
diff --git a/external_imported/vcpkg/versions/s-/spout2.json b/external_imported/vcpkg/versions/s-/spout2.json
index 1983a58c0..001eb3bec 100644
--- a/external_imported/vcpkg/versions/s-/spout2.json
+++ b/external_imported/vcpkg/versions/s-/spout2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e3e3dddea59b3f446dab21b4e4e9ca3c397197f6",
+      "version-string": "2.007.010",
+      "port-version": 0
+    },
     {
       "git-tree": "6f13bac00168667a3628277bf6301fa4a25c954c",
       "version-string": "2.007.009",
diff --git a/external_imported/vcpkg/versions/s-/sprout.json b/external_imported/vcpkg/versions/s-/sprout.json
index a8aff6295..405af1745 100644
--- a/external_imported/vcpkg/versions/s-/sprout.json
+++ b/external_imported/vcpkg/versions/s-/sprout.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "795a63868d8c0d156de6a03b4b79c5ce9cb92461",
+      "version-date": "2019-06-20",
+      "port-version": 2
+    },
     {
       "git-tree": "614a0748fa2deac704af2170ab88ed64c7475e11",
       "version-string": "2019-06-20",
diff --git a/external_imported/vcpkg/versions/s-/spscqueue.json b/external_imported/vcpkg/versions/s-/spscqueue.json
index c69a556de..ac105d709 100644
--- a/external_imported/vcpkg/versions/s-/spscqueue.json
+++ b/external_imported/vcpkg/versions/s-/spscqueue.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1edb233f352fa0104a9ba8958788e5f6cc43830c",
+      "version": "1.1",
+      "port-version": 3
+    },
     {
       "git-tree": "ffd613482d5eb0a109b43a8e0eeae5a83ea4d840",
       "version-string": "1.1",
diff --git a/external_imported/vcpkg/versions/s-/sqlcipher.json b/external_imported/vcpkg/versions/s-/sqlcipher.json
index 44b5caf0e..715ef7ea6 100644
--- a/external_imported/vcpkg/versions/s-/sqlcipher.json
+++ b/external_imported/vcpkg/versions/s-/sqlcipher.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "81b4c14ac8275c922f1a972db7452c98b002526b",
+      "version": "4.5.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d270ac9cc648113c540f9f29e9ab0ebece65e369",
+      "version": "4.5.3",
+      "port-version": 2
+    },
+    {
+      "git-tree": "1debf9d86243c81b196302225f7c382958240a30",
+      "version": "4.5.3",
+      "port-version": 1
+    },
+    {
+      "git-tree": "2cbeeef2ddd185d1b41197c8b8abd6fbf0646047",
+      "version": "4.5.3",
+      "port-version": 0
+    },
     {
       "git-tree": "56c606b11bcc5de6e0a93cde32b9c876539d6df4",
       "version": "4.5.2",
diff --git a/external_imported/vcpkg/versions/s-/sqlite-modern-cpp.json b/external_imported/vcpkg/versions/s-/sqlite-modern-cpp.json
index 302e1a3ed..e45820219 100644
--- a/external_imported/vcpkg/versions/s-/sqlite-modern-cpp.json
+++ b/external_imported/vcpkg/versions/s-/sqlite-modern-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b468e28a38d1849eecaa0113410b214dbe41cd27",
+      "version": "3.2-936cd0c8",
+      "port-version": 2
+    },
     {
       "git-tree": "ac74c74504305a6929128356e348907745b01c11",
       "version-string": "3.2-936cd0c8",
diff --git a/external_imported/vcpkg/versions/s-/sqlite-orm.json b/external_imported/vcpkg/versions/s-/sqlite-orm.json
index 4bd15971b..1c77b648f 100644
--- a/external_imported/vcpkg/versions/s-/sqlite-orm.json
+++ b/external_imported/vcpkg/versions/s-/sqlite-orm.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "13e0d0b90109dcaf60af5d316ece18d4cf6ef50e",
+      "version": "1.8.2",
+      "port-version": 1
+    },
+    {
+      "git-tree": "d46221e51b059d05e7f65620b5e377fdc3673d74",
+      "version": "1.8.2",
+      "port-version": 0
+    },
     {
       "git-tree": "cbb80bd62fb69f81d00cc551f1033b31df52ca2d",
       "version": "1.8.1",
diff --git a/external_imported/vcpkg/versions/s-/sqlite3.json b/external_imported/vcpkg/versions/s-/sqlite3.json
index d8bb4d788..d75987b3f 100644
--- a/external_imported/vcpkg/versions/s-/sqlite3.json
+++ b/external_imported/vcpkg/versions/s-/sqlite3.json
@@ -1,5 +1,55 @@
 {
   "versions": [
+    {
+      "git-tree": "537fe5086cb7cad8b2c24f4182b0777b81d7c175",
+      "version": "3.45.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "73056e20fb351b2c6978b351c74112223791eb25",
+      "version": "3.43.2",
+      "port-version": 1
+    },
+    {
+      "git-tree": "45ea1b638c4911a25f145365f06a11802b12c81e",
+      "version": "3.43.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6497ccc9668ca1e0b17a080b01e8585b33660336",
+      "version": "3.43.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4f7a1dcf86377b6045fbf05eb0ec1baff1d2ceb6",
+      "version": "3.43.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3846bd7701a147c0ed20bb7715c0be031f471f92",
+      "version": "3.42.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "3414b2e79fd240d315ac9fc1165fc376966c8322",
+      "version": "3.42.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "a1b6deae3ce2f17e1384f02e7da3e7fae3a0865d",
+      "version": "3.42.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "846077eab115952eeb4dda0eaae97a3eb776fa9f",
+      "version": "3.40.1",
+      "port-version": 3
+    },
+    {
+      "git-tree": "6bb52479b5ab874f6283e585a3bf2294f52966ca",
+      "version": "3.40.1",
+      "port-version": 2
+    },
     {
       "git-tree": "a08d5bdc16bbeb6e156289d80416535f9cd0a073",
       "version": "3.40.1",
diff --git a/external_imported/vcpkg/versions/s-/sqlitecpp.json b/external_imported/vcpkg/versions/s-/sqlitecpp.json
index efd840260..4ece543ce 100644
--- a/external_imported/vcpkg/versions/s-/sqlitecpp.json
+++ b/external_imported/vcpkg/versions/s-/sqlitecpp.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "82921718a535a8c074d454e2b3a650467b866877",
+      "version": "3.3.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b239a7578034b934210ab61e462b789feffe2136",
+      "version": "3.3.0",
+      "port-version": 0
+    },
     {
       "git-tree": "3e0dea72ad51e6dd229ecb147989143608868369",
       "version": "3.2.0",
diff --git a/external_imported/vcpkg/versions/s-/sqlpp11.json b/external_imported/vcpkg/versions/s-/sqlpp11.json
index a7913d5cb..832b79dc5 100644
--- a/external_imported/vcpkg/versions/s-/sqlpp11.json
+++ b/external_imported/vcpkg/versions/s-/sqlpp11.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "6906f65042fff492746cfe95290e03ea4e89da4a",
+      "version": "0.64",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f84d46c5d6cac9efc370ba6d4a4d0788281481c5",
+      "version": "0.61",
+      "port-version": 3
+    },
     {
       "git-tree": "1800c18be7c4fe76b515891d6f7d51525873f264",
       "version": "0.61",
diff --git a/external_imported/vcpkg/versions/s-/sratom.json b/external_imported/vcpkg/versions/s-/sratom.json
index 39f170301..3f72b9a1e 100644
--- a/external_imported/vcpkg/versions/s-/sratom.json
+++ b/external_imported/vcpkg/versions/s-/sratom.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8659897618d9d3ac1f3d8ae10a136a57f3d05610",
+      "version": "0.6.4",
+      "port-version": 2
+    },
     {
       "git-tree": "5536e4cc0cc0e24c2e0ada700a5cbcc89b13d0fe",
       "version-string": "0.6.4",
diff --git a/external_imported/vcpkg/versions/s-/sse2neon.json b/external_imported/vcpkg/versions/s-/sse2neon.json
index 543de93b6..4b57812f9 100644
--- a/external_imported/vcpkg/versions/s-/sse2neon.json
+++ b/external_imported/vcpkg/versions/s-/sse2neon.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8277f06943fa53ab6c6211f0f71046cf1083aaf0",
+      "version": "1.6.0",
+      "port-version": 0
+    },
     {
       "git-tree": "8a4bda251b90a7bd189f57588bf9148cb294e0d5",
       "version-semver": "1.5.1",
diff --git a/external_imported/vcpkg/versions/s-/stackwalker.json b/external_imported/vcpkg/versions/s-/stackwalker.json
new file mode 100644
index 000000000..adf5218a6
--- /dev/null
+++ b/external_imported/vcpkg/versions/s-/stackwalker.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "20d0f7a4241172aa6694d7374784d7aa83798e17",
+      "version-date": "2023-06-24",
+      "port-version": 0
+    },
+    {
+      "git-tree": "31a65d527a4476b3ababfd0ec1b9bb78371900ca",
+      "version": "1.20",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/s-/starlink-ast.json b/external_imported/vcpkg/versions/s-/starlink-ast.json
index 1ebc5ce94..a2150030d 100644
--- a/external_imported/vcpkg/versions/s-/starlink-ast.json
+++ b/external_imported/vcpkg/versions/s-/starlink-ast.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "13d3dcf5fe4db3f9c3ec43869b4a4e343c35ff65",
+      "version": "9.2.10",
+      "port-version": 1
+    },
+    {
+      "git-tree": "f79db80b697effc13bf43a3d370701e0e7a244c4",
+      "version": "9.2.10",
+      "port-version": 0
+    },
+    {
+      "git-tree": "88677a462cafe1aea0ff773adb4b57ea1e89c9c5",
+      "version": "9.2.7",
+      "port-version": 3
+    },
+    {
+      "git-tree": "36d8a5acad3aceddae181c099448d336fdefb0e7",
+      "version": "9.2.7",
+      "port-version": 2
+    },
     {
       "git-tree": "f749208cd4ad912baf5f9b84482f32a176ef910a",
       "version": "9.2.7",
diff --git a/external_imported/vcpkg/versions/s-/status-code.json b/external_imported/vcpkg/versions/s-/status-code.json
index 86f5ad6f2..fb4f3cda3 100644
--- a/external_imported/vcpkg/versions/s-/status-code.json
+++ b/external_imported/vcpkg/versions/s-/status-code.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "e0ce8f71e6eb79014ecd92a629a245a1a25870cc",
+      "version-date": "2023-11-06",
+      "port-version": 1
+    },
+    {
+      "git-tree": "dca3b484e4be516afae962ee6760d3eef5eb4779",
+      "version-date": "2023-11-06",
+      "port-version": 0
+    },
+    {
+      "git-tree": "40d6b3bdc23cdb7de14e9f07eb229d0124b9c550",
+      "version-date": "2023-01-27",
+      "port-version": 2
+    },
     {
       "git-tree": "e920c8de8cd88a6a9f9a4d1c378c21a36759123b",
       "version-date": "2023-01-27",
diff --git a/external_imported/vcpkg/versions/s-/status-value-lite.json b/external_imported/vcpkg/versions/s-/status-value-lite.json
index c65a27ae1..20163f395 100644
--- a/external_imported/vcpkg/versions/s-/status-value-lite.json
+++ b/external_imported/vcpkg/versions/s-/status-value-lite.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7f68af4939ee1b22bd9f3e56dac9a7034e779d04",
+      "version": "1.1.0",
+      "port-version": 3
+    },
     {
       "git-tree": "8b5ac338ea6bcfa9e1da3c30a068b7ef84c4dd62",
       "version-string": "1.1.0",
diff --git a/external_imported/vcpkg/versions/s-/stb.json b/external_imported/vcpkg/versions/s-/stb.json
index 6103b111f..9e3985c56 100644
--- a/external_imported/vcpkg/versions/s-/stb.json
+++ b/external_imported/vcpkg/versions/s-/stb.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "acd9c2bf96a3e32fbf629b1bfd6cba4827761069",
+      "version-date": "2023-04-11",
+      "port-version": 1
+    },
+    {
+      "git-tree": "4da95279f1989ddca993d095fcd2c0e245c8b5d6",
+      "version-date": "2023-04-11",
+      "port-version": 0
+    },
     {
       "git-tree": "259df7e67a205697472aa4a3ff0326ac6fa60aa2",
       "version-date": "2022-09-09",
diff --git a/external_imported/vcpkg/versions/s-/stdexec.json b/external_imported/vcpkg/versions/s-/stdexec.json
index a3a009859..4abd1e795 100644
--- a/external_imported/vcpkg/versions/s-/stdexec.json
+++ b/external_imported/vcpkg/versions/s-/stdexec.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "e618d986f55789354b123286ca6ecf674358447a",
+      "version-date": "2023-09-06",
+      "port-version": 3
+    },
+    {
+      "git-tree": "945f9fceea838cc9f1c251a801a39244785cb08e",
+      "version-date": "2023-03-05",
+      "port-version": 2
+    },
+    {
+      "git-tree": "3435db06cfe7eb2aa08dd32988c2360017bb66f1",
+      "version-date": "2023-03-05",
+      "port-version": 1
+    },
     {
       "git-tree": "f0dea0ac2888c1fe01a7521f5cddabfc86d6fd8d",
       "version-date": "2023-03-05",
diff --git a/external_imported/vcpkg/versions/s-/stduuid.json b/external_imported/vcpkg/versions/s-/stduuid.json
index c89c5a626..8baded3bb 100644
--- a/external_imported/vcpkg/versions/s-/stduuid.json
+++ b/external_imported/vcpkg/versions/s-/stduuid.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a3a58db8b151c363a0f3df4a99e416d3a8dc0b62",
+      "version": "1.2.3",
+      "port-version": 0
+    },
     {
       "git-tree": "bd235773c953e5636a7b9f6356437daef6e5010c",
       "version": "1.2.2",
diff --git a/external_imported/vcpkg/versions/s-/stlab.json b/external_imported/vcpkg/versions/s-/stlab.json
index a40988477..d2f45242d 100644
--- a/external_imported/vcpkg/versions/s-/stlab.json
+++ b/external_imported/vcpkg/versions/s-/stlab.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "abb069e17e53344d850ff3b01ebf636a1734a6e0",
+      "version": "1.7.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "82ee8586032e3eb89368644e78fe4a4726a17774",
+      "version": "1.7.1",
+      "port-version": 0
+    },
     {
       "git-tree": "8e7a8c754181f223c69b2b67ed3cf928db44e4b9",
       "version-string": "1.6.2",
diff --git a/external_imported/vcpkg/versions/s-/stormlib.json b/external_imported/vcpkg/versions/s-/stormlib.json
index 31f59af4a..a3b7aa7d5 100644
--- a/external_imported/vcpkg/versions/s-/stormlib.json
+++ b/external_imported/vcpkg/versions/s-/stormlib.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "be1785249ddff2cfdcee25685c3775946edf9d6e",
+      "version-date": "2019-05-10",
+      "port-version": 5
+    },
     {
       "git-tree": "6041fce722face7562ea7e514f590a6c3e60b2d2",
       "version-string": "2019-05-10",
diff --git a/external_imported/vcpkg/versions/s-/strict-variant.json b/external_imported/vcpkg/versions/s-/strict-variant.json
index df6be4fb3..6828b4ef0 100644
--- a/external_imported/vcpkg/versions/s-/strict-variant.json
+++ b/external_imported/vcpkg/versions/s-/strict-variant.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1461f2e46ee70ef3690b836eab3270cf88322a1a",
+      "version": "0.5",
+      "port-version": 2
+    },
     {
       "git-tree": "f4589b1df5892a4966987c9a6d856b76c7c2481d",
       "version-string": "0.5",
diff --git a/external_imported/vcpkg/versions/s-/string-theory.json b/external_imported/vcpkg/versions/s-/string-theory.json
index 6408f4135..77a43aa73 100644
--- a/external_imported/vcpkg/versions/s-/string-theory.json
+++ b/external_imported/vcpkg/versions/s-/string-theory.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ca2ab2f3286c4b1f945ea10f070bfb0845755018",
+      "version": "3.8",
+      "port-version": 0
+    },
     {
       "git-tree": "e3c6df91d194be6ca56d8f4044cf0137041d4f04",
       "version": "3.6",
diff --git a/external_imported/vcpkg/versions/s-/strong-type.json b/external_imported/vcpkg/versions/s-/strong-type.json
index 0fb3641a1..3cb4130da 100644
--- a/external_imported/vcpkg/versions/s-/strong-type.json
+++ b/external_imported/vcpkg/versions/s-/strong-type.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "946a58c83d58700039546b6f177b1a1c97ba9487",
+      "version": "12",
+      "port-version": 0
+    },
     {
       "git-tree": "017b73a108f38fb46a32be946809985a6b1ab96c",
       "version": "8",
diff --git a/external_imported/vcpkg/versions/s-/strtk.json b/external_imported/vcpkg/versions/s-/strtk.json
index 111ce2ba6..e72fcf84b 100644
--- a/external_imported/vcpkg/versions/s-/strtk.json
+++ b/external_imported/vcpkg/versions/s-/strtk.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "25bd007473e6ece64e317dc8b4ea97d29188a173",
+      "version-date": "2020-09-14",
+      "port-version": 3
+    },
+    {
+      "git-tree": "42d71cbd4755eecc7183ac64b262ddd87450c431",
+      "version-date": "2020-09-14",
+      "port-version": 2
+    },
     {
       "git-tree": "ac754f80d0eec3321c07b9389b10ba93490ee148",
       "version-string": "2020-09-14",
diff --git a/external_imported/vcpkg/versions/s-/stxxl.json b/external_imported/vcpkg/versions/s-/stxxl.json
index 64edceb78..65ed9247b 100644
--- a/external_imported/vcpkg/versions/s-/stxxl.json
+++ b/external_imported/vcpkg/versions/s-/stxxl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fa0c9adb40f2fa8c67d8d56b3b3e37c37fc55c76",
+      "version-date": "2018-11-15",
+      "port-version": 7
+    },
     {
       "git-tree": "fa281074458ae24fb9e0cc56746476d52222fc51",
       "version-date": "2018-11-15",
diff --git a/external_imported/vcpkg/versions/s-/superlu.json b/external_imported/vcpkg/versions/s-/superlu.json
index 5e425fa78..45548e8cd 100644
--- a/external_imported/vcpkg/versions/s-/superlu.json
+++ b/external_imported/vcpkg/versions/s-/superlu.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8187a877fbae6bdc54d5922753a1d67141576be0",
+      "version": "6.0.0",
+      "port-version": 0
+    },
     {
       "git-tree": "bcc27a8221ab0323b537025944ebc20ae56c36ac",
       "version": "5.3.0",
diff --git a/external_imported/vcpkg/versions/s-/swenson-sort.json b/external_imported/vcpkg/versions/s-/swenson-sort.json
new file mode 100644
index 000000000..9cf81c73e
--- /dev/null
+++ b/external_imported/vcpkg/versions/s-/swenson-sort.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "df8ebeee5f40cc3cfc5d7c88e858621ef3622270",
+      "version-date": "2021-05-22",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/s-/symengine.json b/external_imported/vcpkg/versions/s-/symengine.json
index 3ac8fdb54..36453c7c5 100644
--- a/external_imported/vcpkg/versions/s-/symengine.json
+++ b/external_imported/vcpkg/versions/s-/symengine.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "2308025668dda013e8b55f395871ed7d73cd20d5",
+      "version": "0.11.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "af6b6ed24e9fd37de357cd126afe917b47febd25",
+      "version": "0.10.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "63418f8cd771072202c4155627e90e280ddecf3c",
+      "version": "0.10.1",
+      "port-version": 0
+    },
     {
       "git-tree": "dd28d6549b4c7db81ef2ee9e91a4e41b0c739191",
       "version": "0.9.0",
diff --git a/external_imported/vcpkg/versions/s-/systemc.json b/external_imported/vcpkg/versions/s-/systemc.json
index 9f5879f55..cf9f16f5f 100644
--- a/external_imported/vcpkg/versions/s-/systemc.json
+++ b/external_imported/vcpkg/versions/s-/systemc.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "dbe865a5931720b89f0c20153c65aecc71dd7336",
+      "version": "2.3.3",
+      "port-version": 8
+    },
     {
       "git-tree": "52e920673434754e167ac8136dad29d92069a7a4",
       "version-string": "2.3.3",
diff --git a/external_imported/vcpkg/versions/s-/szip.json b/external_imported/vcpkg/versions/s-/szip.json
index 80dddafbc..0e1de1262 100644
--- a/external_imported/vcpkg/versions/s-/szip.json
+++ b/external_imported/vcpkg/versions/s-/szip.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "bc7c8053e3d7b1926f2a1771e122d151282ecd8d",
+      "version": "2.1.1",
+      "port-version": 12
+    },
+    {
+      "git-tree": "d70141a3b02fbaec47b0aae75b6abdee3502a0b7",
+      "version": "2.1.1",
+      "port-version": 11
+    },
     {
       "git-tree": "0d56cd5d38926df8d26c6ed3a829a392726ee27a",
       "version": "2.1.1",
diff --git a/external_imported/vcpkg/versions/t-/tabulate.json b/external_imported/vcpkg/versions/t-/tabulate.json
index 581205299..5762648f1 100644
--- a/external_imported/vcpkg/versions/t-/tabulate.json
+++ b/external_imported/vcpkg/versions/t-/tabulate.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c0154785cec0295f02f3eed94d173c633c9cd9ee",
+      "version": "1.5",
+      "port-version": 0
+    },
     {
       "git-tree": "27a49e666dd469fbf41f27917b1cfd1640aa71f0",
       "version": "1.4",
diff --git a/external_imported/vcpkg/versions/t-/tacopie.json b/external_imported/vcpkg/versions/t-/tacopie.json
index a9c70548b..163c0e0ea 100644
--- a/external_imported/vcpkg/versions/t-/tacopie.json
+++ b/external_imported/vcpkg/versions/t-/tacopie.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "dc2035636502588b6cdac9c4d58c5f7b6c03c76a",
+      "version": "3.2.0",
+      "port-version": 6
+    },
+    {
+      "git-tree": "e9f280c1d8b799fd2b5617955348dd299b246c86",
+      "version": "3.2.0",
+      "port-version": 5
+    },
     {
       "git-tree": "e9eacb6c5a31c44cd1c8707ba92b0acf5133c13a",
       "version-string": "3.2.0",
diff --git a/external_imported/vcpkg/versions/t-/taglib.json b/external_imported/vcpkg/versions/t-/taglib.json
index fe866734b..1e1fac76f 100644
--- a/external_imported/vcpkg/versions/t-/taglib.json
+++ b/external_imported/vcpkg/versions/t-/taglib.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "c92006e63d77c27bda8b2f60517d7b21c1a62ca4",
+      "version-semver": "1.13.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "81b5a2b206dc7c7b17ac4a50656a7c3789c2505e",
+      "version-semver": "1.13.0",
+      "port-version": 2
+    },
     {
       "git-tree": "a3ab8e6485aab876d06d0e43ab29372b54863467",
       "version-semver": "1.13.0",
diff --git a/external_imported/vcpkg/versions/t-/talib.json b/external_imported/vcpkg/versions/t-/talib.json
new file mode 100644
index 000000000..5c49de26f
--- /dev/null
+++ b/external_imported/vcpkg/versions/t-/talib.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "b21601e58da50f810bacb160a8960a131227aa28",
+      "version-semver": "0.4.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "639b6ba11c1768faf5ab92f42d4cdf0a1bba2270",
+      "version-semver": "0.4.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/t-/taocpp-json.json b/external_imported/vcpkg/versions/t-/taocpp-json.json
index f3400c11d..6509314c2 100644
--- a/external_imported/vcpkg/versions/t-/taocpp-json.json
+++ b/external_imported/vcpkg/versions/t-/taocpp-json.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3efce615deb5e4414df2c3731c1e8eae333d32c9",
+      "version-date": "2020-09-14",
+      "port-version": 3
+    },
     {
       "git-tree": "d3ae444025a6267cf41b462f77061757254bc829",
       "version-string": "2020-09-14",
diff --git a/external_imported/vcpkg/versions/t-/tap-windows6.json b/external_imported/vcpkg/versions/t-/tap-windows6.json
index f22fe46dd..532dc6324 100644
--- a/external_imported/vcpkg/versions/t-/tap-windows6.json
+++ b/external_imported/vcpkg/versions/t-/tap-windows6.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e0096b2007c6e7854bf5cd89279c028f4c96dd50",
+      "version": "9.21.2-0e30f5c",
+      "port-version": 2
+    },
     {
       "git-tree": "2b35b39ca3996a529812b69654a194568127e4e1",
       "version-string": "9.21.2-0e30f5c",
diff --git a/external_imported/vcpkg/versions/t-/task-thread-pool.json b/external_imported/vcpkg/versions/t-/task-thread-pool.json
new file mode 100644
index 000000000..4cc180cdb
--- /dev/null
+++ b/external_imported/vcpkg/versions/t-/task-thread-pool.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "b64ff5ad8b40dbfe129aabe53f11b81ba71e4743",
+      "version": "1.0.7",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/t-/taskflow.json b/external_imported/vcpkg/versions/t-/taskflow.json
index 38343bf24..52f470e42 100644
--- a/external_imported/vcpkg/versions/t-/taskflow.json
+++ b/external_imported/vcpkg/versions/t-/taskflow.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ce89c70566c24ddbcaf7ddb1ee9dc3101c3c30e0",
+      "version": "3.6.0",
+      "port-version": 0
+    },
     {
       "git-tree": "fd5f9c87cc440939ef97da59cbd47bd044851751",
       "version": "3.5.0",
diff --git a/external_imported/vcpkg/versions/t-/tbb.json b/external_imported/vcpkg/versions/t-/tbb.json
index 23d443e1b..0b89c7450 100644
--- a/external_imported/vcpkg/versions/t-/tbb.json
+++ b/external_imported/vcpkg/versions/t-/tbb.json
@@ -1,5 +1,45 @@
 {
   "versions": [
+    {
+      "git-tree": "b4b70addeb87d3ab6ded6936566176ca31138f33",
+      "version": "2021.11.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b4cde1e2a3654b8540b76ac295675a37bdbca311",
+      "version": "2021.10.0",
+      "port-version": 3
+    },
+    {
+      "git-tree": "376c59cda9f516006ce87b0f5da05be5a67fed7d",
+      "version": "2021.10.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "e8bd03cdf65a8793c09146f67f942afa941c68a0",
+      "version": "2021.10.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "117288ebe187535733fd627985c192553c7b82e6",
+      "version": "2021.10.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d050b3a84687479bb03134f98f6360bfb72e64a8",
+      "version": "2021.9.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "97a86c92ba0419c50673782f0b3a7f1568aaaef7",
+      "version": "2021.9.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "3a44303f590164f98542c516a049e1328a178bc2",
+      "version": "2021.9.0",
+      "port-version": 0
+    },
     {
       "git-tree": "d08a7732c5a162a88ac98871ebf98869d5490a97",
       "version": "2021.8.0",
diff --git a/external_imported/vcpkg/versions/t-/tcb-span.json b/external_imported/vcpkg/versions/t-/tcb-span.json
index 64e48cc52..3ac4ed6c7 100644
--- a/external_imported/vcpkg/versions/t-/tcb-span.json
+++ b/external_imported/vcpkg/versions/t-/tcb-span.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "30ed04c5c6945c32f741ad007ef0bf4dca6051bd",
+      "version-date": "2022-06-15",
+      "port-version": 0
+    },
     {
       "git-tree": "191bf0b7971f5aac50a5d81224d04e8f9aef7e38",
       "version-date": "2021-12-15",
diff --git a/external_imported/vcpkg/versions/t-/tcl.json b/external_imported/vcpkg/versions/t-/tcl.json
index 908597dda..0f424272f 100644
--- a/external_imported/vcpkg/versions/t-/tcl.json
+++ b/external_imported/vcpkg/versions/t-/tcl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e825eeb13189650d5919608370935891a5cba218",
+      "version-string": "core-9-0-a1",
+      "port-version": 6
+    },
     {
       "git-tree": "cb31c47230370021b4bee86bf0d711e70ff546f4",
       "version-string": "core-9-0-a1",
diff --git a/external_imported/vcpkg/versions/t-/telnetpp.json b/external_imported/vcpkg/versions/t-/telnetpp.json
index d01032497..660dd40fa 100644
--- a/external_imported/vcpkg/versions/t-/telnetpp.json
+++ b/external_imported/vcpkg/versions/t-/telnetpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e251b079bf2c0424b1e06f60ecb93d8eb331704a",
+      "version": "2.1.2",
+      "port-version": 3
+    },
     {
       "git-tree": "b80086b6f36f27c3884929bbbfe0e25416cb2c08",
       "version-string": "2.1.2",
diff --git a/external_imported/vcpkg/versions/t-/tensorpipe.json b/external_imported/vcpkg/versions/t-/tensorpipe.json
index 97f803c14..3485df95d 100644
--- a/external_imported/vcpkg/versions/t-/tensorpipe.json
+++ b/external_imported/vcpkg/versions/t-/tensorpipe.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "5a085dcc97de3188e8fa82b123a7f3da7cd8de11",
+      "version-date": "2022-03-16",
+      "port-version": 5
+    },
+    {
+      "git-tree": "f470079788d337b13d5a7fb0b4f3663863f3c385",
+      "version-date": "2022-03-16",
+      "port-version": 4
+    },
+    {
+      "git-tree": "ea5e9e44827c85ad455621231cb7ca1f2447cdd9",
+      "version-date": "2022-03-16",
+      "port-version": 3
+    },
     {
       "git-tree": "eed8e7f9952716b9aa7fcde453fad358b6b7bd2f",
       "version-date": "2022-03-16",
diff --git a/external_imported/vcpkg/versions/t-/tesseract.json b/external_imported/vcpkg/versions/t-/tesseract.json
index c6ac4ef06..d0fb9c738 100644
--- a/external_imported/vcpkg/versions/t-/tesseract.json
+++ b/external_imported/vcpkg/versions/t-/tesseract.json
@@ -1,5 +1,45 @@
 {
   "versions": [
+    {
+      "git-tree": "b9f3dd8099292d868212894c3a97f72ddf0ae1f2",
+      "version": "5.3.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9f806a1d29bd65196abb77d6db253305d82e0c94",
+      "version": "5.3.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "894841bddec08acc323ddaf3f10f6dfdee9a92c6",
+      "version": "5.3.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "54030ed07fda737ddd8f8190177960d9d592821a",
+      "version": "5.3.1",
+      "port-version": 3
+    },
+    {
+      "git-tree": "044e8b2ab97dcd3de6080c6688ade20310e53d02",
+      "version": "5.3.1",
+      "port-version": 2
+    },
+    {
+      "git-tree": "d0b39327eee123cac1611afe9d88303822fedbdf",
+      "version": "5.3.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "aeb035e40f678090353d237cc6de1089fb58d89c",
+      "version": "5.3.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a43b33297fd09c075b57f2441b45cca4291a48a5",
+      "version": "5.3.0",
+      "port-version": 1
+    },
     {
       "git-tree": "9536858220896569da2d0e66fa3f6a4b95621186",
       "version": "5.3.0",
diff --git a/external_imported/vcpkg/versions/t-/tgbot-cpp.json b/external_imported/vcpkg/versions/t-/tgbot-cpp.json
index 7505193d6..9bf1e7cb0 100644
--- a/external_imported/vcpkg/versions/t-/tgbot-cpp.json
+++ b/external_imported/vcpkg/versions/t-/tgbot-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5311977e1c6bfe3576ac072a57689bdde68a5960",
+      "version": "1.7.2",
+      "port-version": 0
+    },
     {
       "git-tree": "8cb6fd8b7ed9c7480680419be52d971cee278569",
       "version": "1.6",
diff --git a/external_imported/vcpkg/versions/t-/tgc.json b/external_imported/vcpkg/versions/t-/tgc.json
index 57189f3b1..c336b2bca 100644
--- a/external_imported/vcpkg/versions/t-/tgc.json
+++ b/external_imported/vcpkg/versions/t-/tgc.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8be2721fdfa9114ab8fada6a4bd5b2f3e8778cc7",
+      "version-date": "2019-08-11",
+      "port-version": 4
+    },
     {
       "git-tree": "8388893f06b6027878f739f9e7d30c9bf74faf61",
       "version-string": "2019-08-11",
diff --git a/external_imported/vcpkg/versions/t-/tgui.json b/external_imported/vcpkg/versions/t-/tgui.json
index 23bbcafc4..f313c813b 100644
--- a/external_imported/vcpkg/versions/t-/tgui.json
+++ b/external_imported/vcpkg/versions/t-/tgui.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "3c00844f3560bff9d3e31acc247cfddd5edba024",
+      "version": "1.1.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "dd583943a94fda26c0fe58b498ebc8675af7e831",
+      "version": "1.1.0",
+      "port-version": 0
+    },
     {
       "git-tree": "99b11d7e5b91a6f1919402576952f951383e2c34",
       "version": "0.9.5",
diff --git a/external_imported/vcpkg/versions/t-/theia.json b/external_imported/vcpkg/versions/t-/theia.json
index 9ae4c13b8..de8ab5f9c 100644
--- a/external_imported/vcpkg/versions/t-/theia.json
+++ b/external_imported/vcpkg/versions/t-/theia.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "244b1ee4928a23a5394691a642a1b56125198228",
+      "version": "0.8",
+      "port-version": 10
+    },
+    {
+      "git-tree": "f33100aa143474a7207ee0f2ec7daf0fda3a74a5",
+      "version": "0.8",
+      "port-version": 9
+    },
     {
       "git-tree": "fe4bf7c896536d692bedb215d88cae3297b1ae1b",
       "version": "0.8",
diff --git a/external_imported/vcpkg/versions/t-/think-cell-range.json b/external_imported/vcpkg/versions/t-/think-cell-range.json
index f3a34c739..a6644e4f8 100644
--- a/external_imported/vcpkg/versions/t-/think-cell-range.json
+++ b/external_imported/vcpkg/versions/t-/think-cell-range.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "98fd2e4c5e01f3c8396c5bb35cfbdd81da45f47f",
+      "version": "2023.1",
+      "port-version": 0
+    },
     {
       "git-tree": "e39d38661e62f2c36eaa0026eabfb21e827e8456",
       "version-string": "498839d",
diff --git a/external_imported/vcpkg/versions/t-/thomasmonkman-filewatch.json b/external_imported/vcpkg/versions/t-/thomasmonkman-filewatch.json
new file mode 100644
index 000000000..f6975ed00
--- /dev/null
+++ b/external_imported/vcpkg/versions/t-/thomasmonkman-filewatch.json
@@ -0,0 +1,19 @@
+{
+  "versions": [
+    {
+      "git-tree": "f3f6f9e4f5a7ac943e3f0ec0c81bcdc3db371705",
+      "version-date": "2023-01-16",
+      "port-version": 2
+    },
+    {
+      "git-tree": "6dede6ba1ac505ea4bd64c60bf97edfe7b8d5647",
+      "version-date": "2023-01-16",
+      "port-version": 1
+    },
+    {
+      "git-tree": "09215796e0a4591e54d9aa37ab46dc5edc7bd491",
+      "version-date": "2023-01-16",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/t-/thor.json b/external_imported/vcpkg/versions/t-/thor.json
index 7a5b299f3..51714f136 100644
--- a/external_imported/vcpkg/versions/t-/thor.json
+++ b/external_imported/vcpkg/versions/t-/thor.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "52c5298a73cdd120b4138b72dd84085cf18f53c1",
+      "version-date": "2022-04-16",
+      "port-version": 0
+    },
     {
       "git-tree": "d337ec42ced0695748c94113eb08515810e3408f",
       "version": "2.0",
diff --git a/external_imported/vcpkg/versions/t-/thorvg.json b/external_imported/vcpkg/versions/t-/thorvg.json
index 5d0cb2939..3bef73b6c 100644
--- a/external_imported/vcpkg/versions/t-/thorvg.json
+++ b/external_imported/vcpkg/versions/t-/thorvg.json
@@ -1,5 +1,50 @@
 {
   "versions": [
+    {
+      "git-tree": "e76612a36df3034ad703e603692ae10c9ca315e1",
+      "version": "0.12.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d1d0212fb939be388b501f845991c03a56213ef8",
+      "version": "0.11.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "46f0b52581895d5c9deeaa582387fcc32c25fa15",
+      "version": "0.11.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f54024173375727d79da6658e23e99337a55a8a6",
+      "version": "0.11.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "11178391a67b24a7bbbe7950359aaad9e51cfce6",
+      "version": "0.10.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "36eecd20e7b2bd74489580f5b1b0e61a87be5dfc",
+      "version": "0.10.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4614b6b2399a749c1ac0699429f38e35d9faee9a",
+      "version": "0.10.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0e0dd9030c6e211cbf558dae00ea87e9591a09f8",
+      "version": "0.9.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "09d722c7f2cb784d571af9a6f46abb83aa907d2b",
+      "version": "0.8.4",
+      "port-version": 0
+    },
     {
       "git-tree": "0ca8e329f991f2fc88a65508cd83401882aac41c",
       "version": "0.8.3",
diff --git a/external_imported/vcpkg/versions/t-/threadpool.json b/external_imported/vcpkg/versions/t-/threadpool.json
index 6af078b54..70526ce93 100644
--- a/external_imported/vcpkg/versions/t-/threadpool.json
+++ b/external_imported/vcpkg/versions/t-/threadpool.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a5408b19ee78bb22c9d2b37cade5701463f6e085",
+      "version": "0.2.5",
+      "port-version": 3
+    },
     {
       "git-tree": "498f064539d36777494d54a9edcce63a012ac503",
       "version-string": "0.2.5",
diff --git a/external_imported/vcpkg/versions/t-/thrift.json b/external_imported/vcpkg/versions/t-/thrift.json
index 1f9daf0e2..97acd5397 100644
--- a/external_imported/vcpkg/versions/t-/thrift.json
+++ b/external_imported/vcpkg/versions/t-/thrift.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "a85bec1a50438e0a5d4edbfb7d507a26ace7f010",
+      "version": "0.19.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "fc85618cd8a4849e400d28916b733f2426c9246d",
+      "version": "0.16.0",
+      "port-version": 1
+    },
     {
       "git-tree": "075afb4c9f18e75caa0eb4b07609324fa35b5ca5",
       "version": "0.16.0",
diff --git a/external_imported/vcpkg/versions/t-/tidy-html5.json b/external_imported/vcpkg/versions/t-/tidy-html5.json
index adbb220c8..3b1e9c3b4 100644
--- a/external_imported/vcpkg/versions/t-/tidy-html5.json
+++ b/external_imported/vcpkg/versions/t-/tidy-html5.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3ff916aaab30ac5a85e702ab9cf4e8092db79477",
+      "version": "5.8.0",
+      "port-version": 1
+    },
     {
       "git-tree": "e16455cbec8214de37e3deb0ad41fe57323a7dd0",
       "version": "5.8.0",
diff --git a/external_imported/vcpkg/versions/t-/tiff.json b/external_imported/vcpkg/versions/t-/tiff.json
index 525edff7f..7596064aa 100644
--- a/external_imported/vcpkg/versions/t-/tiff.json
+++ b/external_imported/vcpkg/versions/t-/tiff.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "eee46c160d2fcf26a0013e7159adc2e6c03039d5",
+      "version": "4.6.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "1c0fc716f916833234f0fb5e7061d52e9063e7c6",
+      "version": "4.6.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "88ab604b58a0473cf643b6f3890c2d0c8174ff62",
+      "version": "4.6.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "68f4ecc87b5ddce6c328c0f600a4c8b81d967d4c",
+      "version": "4.5.1",
+      "port-version": 2
+    },
+    {
+      "git-tree": "5510d3f8317c71185268d5128e6a7c24b4d66863",
+      "version": "4.5.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "658dc44e4f5495f0820db6358d8edf74e6ac8d48",
+      "version": "4.5.0",
+      "port-version": 3
+    },
     {
       "git-tree": "b96d20619404c16ef469583437a776b2e74afcef",
       "version": "4.5.0",
diff --git a/external_imported/vcpkg/versions/t-/tiny-aes-c.json b/external_imported/vcpkg/versions/t-/tiny-aes-c.json
index 4e285f540..f3fb507d6 100644
--- a/external_imported/vcpkg/versions/t-/tiny-aes-c.json
+++ b/external_imported/vcpkg/versions/t-/tiny-aes-c.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e8b05d66491544d63c411f39744d4e0cedb45e38",
+      "version-date": "2019-07-31",
+      "port-version": 3
+    },
     {
       "git-tree": "08ce412a6bc1a1318909c6bf40160c64929599fc",
       "version-string": "2019-07-31",
diff --git a/external_imported/vcpkg/versions/t-/tiny-bignum-c.json b/external_imported/vcpkg/versions/t-/tiny-bignum-c.json
index 6c61a7a99..62aebfd55 100644
--- a/external_imported/vcpkg/versions/t-/tiny-bignum-c.json
+++ b/external_imported/vcpkg/versions/t-/tiny-bignum-c.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "42506150a5e1726cd12954d8aba925127a03a8ee",
+      "version-date": "2019-07-31",
+      "port-version": 3
+    },
     {
       "git-tree": "8ee270199f8de84b30355b48f8342ea917b573ba",
       "version-string": "2019-07-31",
diff --git a/external_imported/vcpkg/versions/t-/tiny-dnn.json b/external_imported/vcpkg/versions/t-/tiny-dnn.json
index ba0744415..40501ce3d 100644
--- a/external_imported/vcpkg/versions/t-/tiny-dnn.json
+++ b/external_imported/vcpkg/versions/t-/tiny-dnn.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fb93b92373f36876e6473490ec463db8a06cf901",
+      "version-date": "2018-10-25",
+      "port-version": 2
+    },
     {
       "git-tree": "6de81be7e06cac0652c8ffcc136ffdb889cb41f8",
       "version-string": "2018-10-25",
diff --git a/external_imported/vcpkg/versions/t-/tiny-process-library.json b/external_imported/vcpkg/versions/t-/tiny-process-library.json
index 9b0533d4c..553b0c487 100644
--- a/external_imported/vcpkg/versions/t-/tiny-process-library.json
+++ b/external_imported/vcpkg/versions/t-/tiny-process-library.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d4c8b55f88a72bb2aa2e10189ac5fb24fd0615f4",
+      "version": "2.0.4",
+      "port-version": 3
+    },
     {
       "git-tree": "f4e81e43ca82620d6c153b707cdd6626ae1705d2",
       "version": "2.0.4",
diff --git a/external_imported/vcpkg/versions/t-/tiny-regex-c.json b/external_imported/vcpkg/versions/t-/tiny-regex-c.json
index 8f7cfaa3a..f46592837 100644
--- a/external_imported/vcpkg/versions/t-/tiny-regex-c.json
+++ b/external_imported/vcpkg/versions/t-/tiny-regex-c.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "afd5a1b0b7618dd4848895024f2d52443dcdce47",
+      "version-date": "2019-07-31",
+      "port-version": 3
+    },
     {
       "git-tree": "9a8827f5b9bb6e24ad3746638423b618cf8a9085",
       "version-string": "2019-07-31",
diff --git a/external_imported/vcpkg/versions/t-/tinycthread.json b/external_imported/vcpkg/versions/t-/tinycthread.json
index 9d719113b..73317ee70 100644
--- a/external_imported/vcpkg/versions/t-/tinycthread.json
+++ b/external_imported/vcpkg/versions/t-/tinycthread.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e83b13c0c11b452c92d01925a2a80e437e8e074c",
+      "version-date": "2019-08-06",
+      "port-version": 3
+    },
     {
       "git-tree": "29aee6896d4b7a5f2b60a2d97f52082624d0f194",
       "version-string": "2019-08-06",
diff --git a/external_imported/vcpkg/versions/t-/tinyexpr.json b/external_imported/vcpkg/versions/t-/tinyexpr.json
index d07e1d135..9d0b25f70 100644
--- a/external_imported/vcpkg/versions/t-/tinyexpr.json
+++ b/external_imported/vcpkg/versions/t-/tinyexpr.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "30f7a31f5f6d12948d2f8650ea80859af56bb7aa",
+      "version-date": "2020-09-25",
+      "port-version": 2
+    },
     {
       "git-tree": "27a749014c1877a6c9cde48fda29f0128894741b",
       "version-string": "2020-09-25",
diff --git a/external_imported/vcpkg/versions/t-/tinyexr.json b/external_imported/vcpkg/versions/t-/tinyexr.json
index 6a36a8626..b8c2168df 100644
--- a/external_imported/vcpkg/versions/t-/tinyexr.json
+++ b/external_imported/vcpkg/versions/t-/tinyexr.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "14f0bcbec927dc73035b2642284f1329a113209f",
+      "version": "1.0.5",
+      "port-version": 0
+    },
     {
       "git-tree": "d0381d495cb1b502e1b5ccaafb2409f75c0726a3",
       "version": "1.0.1",
diff --git a/external_imported/vcpkg/versions/t-/tinyfsm.json b/external_imported/vcpkg/versions/t-/tinyfsm.json
new file mode 100644
index 000000000..cf5a66453
--- /dev/null
+++ b/external_imported/vcpkg/versions/t-/tinyfsm.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "f7e32a657087415c3c6bf4a62e399063e216f25e",
+      "version": "0.3.3",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/t-/tinygltf.json b/external_imported/vcpkg/versions/t-/tinygltf.json
index 7e9d0ee46..ad7736110 100644
--- a/external_imported/vcpkg/versions/t-/tinygltf.json
+++ b/external_imported/vcpkg/versions/t-/tinygltf.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "42238189ed2f5ce118ac799c5c8b865ee9c6a72c",
+      "version": "2.8.20",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a7a75083fb4ff9692e03a87d477b6e7b18ddb4b6",
+      "version": "2.8.19",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a828c964c3dac5b5b48545da10e8e357c3759042",
+      "version": "2.8.17",
+      "port-version": 0
+    },
     {
       "git-tree": "d642030fcb4784451290f7523460bdabfa96bd56",
       "version": "2.8.4",
diff --git a/external_imported/vcpkg/versions/t-/tinynpy.json b/external_imported/vcpkg/versions/t-/tinynpy.json
index d2a949a1e..7be9c3da3 100644
--- a/external_imported/vcpkg/versions/t-/tinynpy.json
+++ b/external_imported/vcpkg/versions/t-/tinynpy.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d38130d27f5897153ce1ca9770e81b7a23f65d63",
+      "version": "1.0.0",
+      "port-version": 6
+    },
     {
       "git-tree": "9d762ceb4183ad5e67099a7618346f7588b1b067",
       "version-string": "1.0.0",
diff --git a/external_imported/vcpkg/versions/t-/tinyorm.json b/external_imported/vcpkg/versions/t-/tinyorm.json
new file mode 100644
index 000000000..bc3e3b68e
--- /dev/null
+++ b/external_imported/vcpkg/versions/t-/tinyorm.json
@@ -0,0 +1,19 @@
+{
+  "versions": [
+    {
+      "git-tree": "4c2e5cc9f6f5dc6e526f1aae55d90485a0b8562d",
+      "version-semver": "0.36.5",
+      "port-version": 2
+    },
+    {
+      "git-tree": "7a9e99fe4b4dca20d2e2a7c3bc9d575e5f1700ba",
+      "version-semver": "0.36.5",
+      "port-version": 1
+    },
+    {
+      "git-tree": "b21b31342cfe5d58cce629fab598e6f968e5118e",
+      "version-semver": "0.36.5",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/t-/tinythread.json b/external_imported/vcpkg/versions/t-/tinythread.json
index 5c210ee11..c962ef296 100644
--- a/external_imported/vcpkg/versions/t-/tinythread.json
+++ b/external_imported/vcpkg/versions/t-/tinythread.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "44a036748075e5b49c49e5a2d2dc96ed9107fa11",
+      "version": "1.1",
+      "port-version": 6
+    },
     {
       "git-tree": "987670b38c02ffa4761d1ce547e76f76545aac3c",
       "version-string": "1.1",
diff --git a/external_imported/vcpkg/versions/t-/tinytoml.json b/external_imported/vcpkg/versions/t-/tinytoml.json
index b7eb2bbda..f56a51f43 100644
--- a/external_imported/vcpkg/versions/t-/tinytoml.json
+++ b/external_imported/vcpkg/versions/t-/tinytoml.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ef300476c58abc2799c021f745aaa66dae45f043",
+      "version": "20180219",
+      "port-version": 3
+    },
     {
       "git-tree": "1bc5fcab066d64cc4693428f2375e9232f17b7d0",
       "version-string": "20180219",
diff --git a/external_imported/vcpkg/versions/t-/tinyxml.json b/external_imported/vcpkg/versions/t-/tinyxml.json
index d67aa5864..3b8eaaf23 100644
--- a/external_imported/vcpkg/versions/t-/tinyxml.json
+++ b/external_imported/vcpkg/versions/t-/tinyxml.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4463cb1a60eed81cb34748d54b2ad5e3b8ed3a08",
+      "version": "2.6.2",
+      "port-version": 10
+    },
     {
       "git-tree": "a26a6fd0c41c77f82aba481a315e3a0f1e3d0eca",
       "version-string": "2.6.2",
diff --git a/external_imported/vcpkg/versions/t-/tl-expected.json b/external_imported/vcpkg/versions/t-/tl-expected.json
index 540c4efe1..500548896 100644
--- a/external_imported/vcpkg/versions/t-/tl-expected.json
+++ b/external_imported/vcpkg/versions/t-/tl-expected.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7a44a87fed865c8f8489a993d41defea5992a4d0",
+      "version": "1.1.0",
+      "port-version": 0
+    },
     {
       "git-tree": "5b521818cf86910000788131a556006c5141116d",
       "version-date": "2022-11-24",
diff --git a/external_imported/vcpkg/versions/t-/tl-function-ref.json b/external_imported/vcpkg/versions/t-/tl-function-ref.json
index 9e162cc49..ce6f759ba 100644
--- a/external_imported/vcpkg/versions/t-/tl-function-ref.json
+++ b/external_imported/vcpkg/versions/t-/tl-function-ref.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f74755cb477baa2fd51734a985fa1e95d4a6854d",
+      "version": "1.0.0",
+      "port-version": 4
+    },
     {
       "git-tree": "6afb229de5666e245476b0ca4152d2073f538a2e",
       "version-string": "1.0.0",
diff --git a/external_imported/vcpkg/versions/t-/tlx.json b/external_imported/vcpkg/versions/t-/tlx.json
index 647a3233b..e92d72b9a 100644
--- a/external_imported/vcpkg/versions/t-/tlx.json
+++ b/external_imported/vcpkg/versions/t-/tlx.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "160b776d3650302ac8cccc81357f11e54d81fbf4",
+      "version": "0.5.20191212",
+      "port-version": 4
+    },
     {
       "git-tree": "0e8a25c74e2f56ab5f033191bf7b00eb26084067",
       "version-string": "0.5.20191212",
diff --git a/external_imported/vcpkg/versions/t-/tmxlite.json b/external_imported/vcpkg/versions/t-/tmxlite.json
index 2469531f2..45f9bcb29 100644
--- a/external_imported/vcpkg/versions/t-/tmxlite.json
+++ b/external_imported/vcpkg/versions/t-/tmxlite.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b18995c78b7b6057c2a1d69eba2118bfcb17fa36",
+      "version": "1.4.4",
+      "port-version": 0
+    },
     {
       "git-tree": "b176cf2abbb6262dc616d68625f90f35e65fe4c1",
       "version": "1.3.0",
diff --git a/external_imported/vcpkg/versions/t-/tomlplusplus.json b/external_imported/vcpkg/versions/t-/tomlplusplus.json
index a5947f3b1..98b0f86af 100644
--- a/external_imported/vcpkg/versions/t-/tomlplusplus.json
+++ b/external_imported/vcpkg/versions/t-/tomlplusplus.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "9866e66fa79aa1addd508e672062392313fc6085",
+      "version": "3.4.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e5d2f60be4fafc9cf2f8a9fbf5b69c8001e7f461",
+      "version": "3.3.0",
+      "port-version": 0
+    },
     {
       "git-tree": "bf80fe2b73187c7a5ae1ea2d32cba894c13f7224",
       "version": "3.1.0",
diff --git a/external_imported/vcpkg/versions/t-/tracy.json b/external_imported/vcpkg/versions/t-/tracy.json
index c08acbbe2..61fd22f12 100644
--- a/external_imported/vcpkg/versions/t-/tracy.json
+++ b/external_imported/vcpkg/versions/t-/tracy.json
@@ -1,5 +1,40 @@
 {
   "versions": [
+    {
+      "git-tree": "a85cd6613805e9be8538768a8b03e5f04dabe490",
+      "version-semver": "0.10.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "2ffcc745825c95eec75922bfdf4433ccedf3981d",
+      "version-semver": "0.10.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ce810f0e5535da3969128dc5eee0ecf0fcb51162",
+      "version-semver": "0.9.1",
+      "port-version": 4
+    },
+    {
+      "git-tree": "2d84bb317ef020ff408ce8000ecb896d7fe4fe78",
+      "version-semver": "0.9.1",
+      "port-version": 3
+    },
+    {
+      "git-tree": "10b47fa5363e3108af03ccd6729f17b7a05c4804",
+      "version-semver": "0.9.1",
+      "port-version": 2
+    },
+    {
+      "git-tree": "77e2063ccf000ddf44db90335335b0d87efe0bf4",
+      "version-semver": "0.9.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "1dbe1080d7c00eb3aa76f87c8c62511d9d9671a7",
+      "version-semver": "0.9.1",
+      "port-version": 0
+    },
     {
       "git-tree": "0866d3457267bff478bd158261b25869adf3e480",
       "version-semver": "0.9.0",
diff --git a/external_imported/vcpkg/versions/t-/trantor.json b/external_imported/vcpkg/versions/t-/trantor.json
index 66062085e..ef6d73141 100644
--- a/external_imported/vcpkg/versions/t-/trantor.json
+++ b/external_imported/vcpkg/versions/t-/trantor.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "87607f8f4115c05d79fdcb63b060c0cf4cba7ece",
+      "version-semver": "1.5.16",
+      "port-version": 0
+    },
+    {
+      "git-tree": "47ee2615e8883f1daf13ffd3a32964782cf9b1c0",
+      "version-semver": "1.5.15",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d8c48e0f8f1877f0392dcb0f1d1d31011c9db957",
+      "version-semver": "1.5.14",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4ac910f7ba58f9ee8ceff1c8ac1d2dfa0200136f",
+      "version-semver": "1.5.11",
+      "port-version": 1
+    },
     {
       "git-tree": "bdeefc43943ee1bd39f5c46db28a89b01e446b8f",
       "version-semver": "1.5.11",
diff --git a/external_imported/vcpkg/versions/t-/tre.json b/external_imported/vcpkg/versions/t-/tre.json
index ce0b5be28..183646969 100644
--- a/external_imported/vcpkg/versions/t-/tre.json
+++ b/external_imported/vcpkg/versions/t-/tre.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "307fd730a8de00228602333743300ebadc2b301c",
+      "version": "0.8.0",
+      "port-version": 6
+    },
     {
       "git-tree": "601cf1197e7f531cf374926d949163b9c4bb8331",
       "version": "0.8.0",
diff --git a/external_imported/vcpkg/versions/t-/tree-similarity.json b/external_imported/vcpkg/versions/t-/tree-similarity.json
new file mode 100644
index 000000000..a13df722d
--- /dev/null
+++ b/external_imported/vcpkg/versions/t-/tree-similarity.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "3319b799dc1e36bc50a52468b9acdafaaf0cf380",
+      "version-semver": "0.1.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "d7f5637a5f1a5c0ba5d50a5734a69c6d190ac75d",
+      "version-semver": "0.1.1",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/t-/tree-sitter.json b/external_imported/vcpkg/versions/t-/tree-sitter.json
index 9e57b626e..998b1d0ce 100644
--- a/external_imported/vcpkg/versions/t-/tree-sitter.json
+++ b/external_imported/vcpkg/versions/t-/tree-sitter.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f818e329af89033c591416456e9c630280bd4ef8",
+      "version-semver": "0.20.6",
+      "port-version": 1
+    },
     {
       "git-tree": "a96085943d7eb28c30fa8d53eb5452e4dccdfd93",
       "version-semver": "0.20.6",
diff --git a/external_imported/vcpkg/versions/t-/treehopper.json b/external_imported/vcpkg/versions/t-/treehopper.json
index 572ae5dbb..06616ffa1 100644
--- a/external_imported/vcpkg/versions/t-/treehopper.json
+++ b/external_imported/vcpkg/versions/t-/treehopper.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "145e9145dba553063f0483909603c6369c5a4e63",
+      "version": "1.11.3",
+      "port-version": 9
+    },
+    {
+      "git-tree": "94c478388c393d8b174b2fd9c4ad0f77805583dc",
+      "version": "1.11.3",
+      "port-version": 8
+    },
+    {
+      "git-tree": "bfc0dea8339d81f05a040cd2ca7831c18c43f765",
+      "version": "1.11.3",
+      "port-version": 7
+    },
     {
       "git-tree": "d3eb869813ca17e782c54f3df95af48cbb47346c",
       "version-string": "1.11.3",
diff --git a/external_imported/vcpkg/versions/t-/triton.json b/external_imported/vcpkg/versions/t-/triton.json
index d38021f09..f06187d8d 100644
--- a/external_imported/vcpkg/versions/t-/triton.json
+++ b/external_imported/vcpkg/versions/t-/triton.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2d0facf413b0d9a2a4678af72776046a1c24f970",
+      "version-date": "2023-08-16",
+      "port-version": 0
+    },
     {
       "git-tree": "c3decfebbe5a1a8e132c0234074a82224a5335ce",
       "version": "0.9",
diff --git a/external_imported/vcpkg/versions/t-/trompeloeil.json b/external_imported/vcpkg/versions/t-/trompeloeil.json
index 1a3a6ac72..cca466315 100644
--- a/external_imported/vcpkg/versions/t-/trompeloeil.json
+++ b/external_imported/vcpkg/versions/t-/trompeloeil.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a00a802a482a267ddba63aae7ce5f89973427210",
+      "version": "45",
+      "port-version": 0
+    },
     {
       "git-tree": "876864d2915f8530d28bd8a2c6ca0fd418dd7829",
       "version": "43",
diff --git a/external_imported/vcpkg/versions/t-/tsl-hopscotch-map.json b/external_imported/vcpkg/versions/t-/tsl-hopscotch-map.json
index d0df7c62d..80a79d4c3 100644
--- a/external_imported/vcpkg/versions/t-/tsl-hopscotch-map.json
+++ b/external_imported/vcpkg/versions/t-/tsl-hopscotch-map.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6f6b67b30812de79b65fcd5764d45bec74411521",
+      "version": "2.3.0",
+      "port-version": 3
+    },
     {
       "git-tree": "cb999b94c279946d93639a2d54d3a8972a61519f",
       "version-string": "2.3.0",
diff --git a/external_imported/vcpkg/versions/t-/tsl-ordered-map.json b/external_imported/vcpkg/versions/t-/tsl-ordered-map.json
index e611a4835..6b6afcce3 100644
--- a/external_imported/vcpkg/versions/t-/tsl-ordered-map.json
+++ b/external_imported/vcpkg/versions/t-/tsl-ordered-map.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4adcef91a9fce2b4213e5402973b8afdb50baeb2",
+      "version": "1.0.0",
+      "port-version": 3
+    },
     {
       "git-tree": "2d21077c63a818b22dd0d4f3c1e3d70ebbf6de84",
       "version-string": "1.0.0",
diff --git a/external_imported/vcpkg/versions/t-/tsl-sparse-map.json b/external_imported/vcpkg/versions/t-/tsl-sparse-map.json
index 0a993a39d..28de0babe 100644
--- a/external_imported/vcpkg/versions/t-/tsl-sparse-map.json
+++ b/external_imported/vcpkg/versions/t-/tsl-sparse-map.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "71fff3f16d7b3d0d58d918e57d619225ffd1ff6e",
+      "version": "0.6.2",
+      "port-version": 3
+    },
     {
       "git-tree": "392c1afdb1f4ce3319f631466472de6d16924882",
       "version-string": "0.6.2",
diff --git a/external_imported/vcpkg/versions/t-/tuplet.json b/external_imported/vcpkg/versions/t-/tuplet.json
new file mode 100644
index 000000000..02b70bb74
--- /dev/null
+++ b/external_imported/vcpkg/versions/t-/tuplet.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "74fcd4cc246f7511749c6172bbbe333c0fa012d7",
+      "version": "2.1.1",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/t-/type-lite.json b/external_imported/vcpkg/versions/t-/type-lite.json
index 642854a2a..38111da8b 100644
--- a/external_imported/vcpkg/versions/t-/type-lite.json
+++ b/external_imported/vcpkg/versions/t-/type-lite.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "87b4ca306e885d75327f894c485304ca3ead022c",
+      "version": "0.1.0",
+      "port-version": 3
+    },
     {
       "git-tree": "fd2fb158fe4964b9f41777379d19bf0790c76fd4",
       "version-string": "0.1.0",
diff --git a/external_imported/vcpkg/versions/t-/type-safe.json b/external_imported/vcpkg/versions/t-/type-safe.json
index 835008819..36d0c1032 100644
--- a/external_imported/vcpkg/versions/t-/type-safe.json
+++ b/external_imported/vcpkg/versions/t-/type-safe.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "803fe8770512e68321e60560d9a303e4782c266e",
+      "version": "0.2.3",
+      "port-version": 0
+    },
     {
       "git-tree": "63cdf2cb69a2a7f3de1a5bf82d63e556b742e909",
       "version": "0.2.2",
diff --git a/external_imported/vcpkg/versions/u-/udt.json b/external_imported/vcpkg/versions/u-/udt.json
new file mode 100644
index 000000000..2b31d40be
--- /dev/null
+++ b/external_imported/vcpkg/versions/u-/udt.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "8c91a2b4c4f5b0fafeef59b6abda5efd3f30adcc",
+      "version": "4.11",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/u-/uni-algo.json b/external_imported/vcpkg/versions/u-/uni-algo.json
index 0800588a6..704b71dbf 100644
--- a/external_imported/vcpkg/versions/u-/uni-algo.json
+++ b/external_imported/vcpkg/versions/u-/uni-algo.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "507c5e80892a1390e2a5cb8b8fb1ab3ce275e42e",
+      "version-semver": "1.0.0",
+      "port-version": 0
+    },
     {
       "git-tree": "ae30ff42462d61d142eca81383fb9a7c9df3703a",
       "version-semver": "0.7.0",
diff --git a/external_imported/vcpkg/versions/u-/unicorn-lib.json b/external_imported/vcpkg/versions/u-/unicorn-lib.json
index db2bc9f78..fb371140d 100644
--- a/external_imported/vcpkg/versions/u-/unicorn-lib.json
+++ b/external_imported/vcpkg/versions/u-/unicorn-lib.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "7a392f38ad3deeac937482462e7253e332e4a672",
+      "version-date": "2022-01-24",
+      "port-version": 2
+    },
+    {
+      "git-tree": "20329e00e75f4f13bb1b77f3e19c23182861c6cd",
+      "version-date": "2022-01-24",
+      "port-version": 1
+    },
     {
       "git-tree": "278115c391839dcfc66ac80339c8dcd9a660c9e0",
       "version-date": "2022-01-24",
diff --git a/external_imported/vcpkg/versions/u-/unicorn.json b/external_imported/vcpkg/versions/u-/unicorn.json
index 3ff8b2895..a3fd4f274 100644
--- a/external_imported/vcpkg/versions/u-/unicorn.json
+++ b/external_imported/vcpkg/versions/u-/unicorn.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "d1d99593115946401db9ccd090cd53dc8ae303ba",
+      "version": "2.0.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "31ff77ab3e1221d27f0b4ea2432ac7002181f984",
+      "version": "1.0.3",
+      "port-version": 1
+    },
     {
       "git-tree": "ec4ae5e99d2204a11e112c2f1a596ac2d4f5f2f9",
       "version": "1.0.3",
diff --git a/external_imported/vcpkg/versions/u-/unittest-cpp.json b/external_imported/vcpkg/versions/u-/unittest-cpp.json
index d188aa939..04f13dc3e 100644
--- a/external_imported/vcpkg/versions/u-/unittest-cpp.json
+++ b/external_imported/vcpkg/versions/u-/unittest-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "bb7c434ff783ab8c87dfa014eb7142d4ca4727da",
+      "version-semver": "2.0.0",
+      "port-version": 5
+    },
     {
       "git-tree": "0e2e8b9a3b236e9777fb4a549162c4030c11460b",
       "version-semver": "2.0.0",
diff --git a/external_imported/vcpkg/versions/u-/unordered-dense.json b/external_imported/vcpkg/versions/u-/unordered-dense.json
new file mode 100644
index 000000000..8e4444782
--- /dev/null
+++ b/external_imported/vcpkg/versions/u-/unordered-dense.json
@@ -0,0 +1,29 @@
+{
+  "versions": [
+    {
+      "git-tree": "814c362d3218fc2f06ba7c2555c2aa977965ceb1",
+      "version": "4.4.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "92b6f3cc16f6fe577511e094a9b918b8af8fa360",
+      "version": "4.3.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c25f50471fcb367451a465853e405a50e372e279",
+      "version": "4.1.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "abbf5a684519e60642ad5113f5e2f63762f60f93",
+      "version": "4.1.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "404e82b0f085a6d68323630f530c04e86b5eeb2b",
+      "version": "4.0.1",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/u-/unqlite.json b/external_imported/vcpkg/versions/u-/unqlite.json
index e0ead45a2..3b4615999 100644
--- a/external_imported/vcpkg/versions/u-/unqlite.json
+++ b/external_imported/vcpkg/versions/u-/unqlite.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c553ddb0b70a37f30c5a61fca9c055cfebf345b0",
+      "version": "1.1.9",
+      "port-version": 2
+    },
     {
       "git-tree": "e62e679c8bef82c536cf33cb6f2a1f842930d98a",
       "version-string": "1.1.9",
diff --git a/external_imported/vcpkg/versions/u-/unrar.json b/external_imported/vcpkg/versions/u-/unrar.json
index 7ce46bc2f..d9863e013 100644
--- a/external_imported/vcpkg/versions/u-/unrar.json
+++ b/external_imported/vcpkg/versions/u-/unrar.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "6bc071be9e736a08d2826e81e000dbc6aa6d4b2b",
+      "version": "6.1.7",
+      "port-version": 3
+    },
+    {
+      "git-tree": "6849b794133f944030e40dc8c73b1fa4fc2a4f13",
+      "version": "6.1.7",
+      "port-version": 2
+    },
     {
       "git-tree": "282699df90f6c302560fa8fdb097e386ae9de7db",
       "version": "6.1.7",
diff --git a/external_imported/vcpkg/versions/u-/upb.json b/external_imported/vcpkg/versions/u-/upb.json
index 46a2d02d4..6e5152191 100644
--- a/external_imported/vcpkg/versions/u-/upb.json
+++ b/external_imported/vcpkg/versions/u-/upb.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1d7a6a503d8e111f919697470e47030cba1172b3",
+      "version-date": "2022-06-21",
+      "port-version": 1
+    },
     {
       "git-tree": "4a5b5306d38f1a58f65c98c236b84ca297501ab1",
       "version-date": "2022-06-21",
diff --git a/external_imported/vcpkg/versions/u-/urdfdom.json b/external_imported/vcpkg/versions/u-/urdfdom.json
index 391d13c43..d31d83fab 100644
--- a/external_imported/vcpkg/versions/u-/urdfdom.json
+++ b/external_imported/vcpkg/versions/u-/urdfdom.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "eb1c1a30329b850ac4450d3b1a72166697058bb8",
+      "version": "3.1.1",
+      "port-version": 0
+    },
     {
       "git-tree": "35eed492633e8ac2b137093a51d13ad325d9e7c5",
       "version": "3.1.0",
diff --git a/external_imported/vcpkg/versions/u-/urho3d.json b/external_imported/vcpkg/versions/u-/urho3d.json
index e0defa3c5..4c27e17c4 100644
--- a/external_imported/vcpkg/versions/u-/urho3d.json
+++ b/external_imported/vcpkg/versions/u-/urho3d.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "aceb5375954d594c93c9e75ff4fd7ea0cfdb9323",
+      "version-date": "2021-03-01",
+      "port-version": 5
+    },
+    {
+      "git-tree": "fe6e49016a6f15bc04e04727f2e4712e75625425",
+      "version-date": "2021-03-01",
+      "port-version": 4
+    },
     {
       "git-tree": "6f9e8452934bac3542907f50fd466a34e44b3fdc",
       "version-date": "2021-03-01",
diff --git a/external_imported/vcpkg/versions/u-/usbmuxd.json b/external_imported/vcpkg/versions/u-/usbmuxd.json
index e9f961439..6117b5faf 100644
--- a/external_imported/vcpkg/versions/u-/usbmuxd.json
+++ b/external_imported/vcpkg/versions/u-/usbmuxd.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "4aa97c2a8eb36aa9f4a3a7ca0fb028dc27f8215b",
+      "version-date": "2023-07-21",
+      "port-version": 1
+    },
+    {
+      "git-tree": "edc61063b642372c7d9de82f7ecc55ed39971c3d",
+      "version-date": "2023-07-21",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4116e3cd80421add75aeeb413386b03cbfad5670",
+      "version": "1.2.235",
+      "port-version": 5
+    },
+    {
+      "git-tree": "f2c137f8ea6a9f68922e301479aa2b251c130636",
+      "version": "1.2.235",
+      "port-version": 4
+    },
     {
       "git-tree": "b3f2cea522d35497750ecfd9446e29bf034b4d21",
       "version": "1.2.235",
diff --git a/external_imported/vcpkg/versions/u-/usd.json b/external_imported/vcpkg/versions/u-/usd.json
index 66cac186b..e772a406a 100644
--- a/external_imported/vcpkg/versions/u-/usd.json
+++ b/external_imported/vcpkg/versions/u-/usd.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "a589441a5a488b6ad5d797ae17dab850b8b03620",
+      "version": "23.5",
+      "port-version": 3
+    },
+    {
+      "git-tree": "b5cb814be5a5aec9d600aeb98cd2126f407ca062",
+      "version": "23.5",
+      "port-version": 2
+    },
+    {
+      "git-tree": "cfe836715c8cf43db76006deffa234cecf77745c",
+      "version": "23.5",
+      "port-version": 1
+    },
+    {
+      "git-tree": "5a5cb56688d1804bb35d8e361cfd41ef858919c9",
+      "version": "23.5",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9db13a48bde68c5107143c6a68fb50b6b71b8483",
+      "version": "23.2",
+      "port-version": 1
+    },
     {
       "git-tree": "f52bda67df8cc837cf678d105ecba88358c016c0",
       "version": "23.2",
diff --git a/external_imported/vcpkg/versions/u-/usearch.json b/external_imported/vcpkg/versions/u-/usearch.json
new file mode 100644
index 000000000..b674ad598
--- /dev/null
+++ b/external_imported/vcpkg/versions/u-/usearch.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "5ed129aec7ee2dec29767918714015211a556038",
+      "version": "2.3.2",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/u-/usockets.json b/external_imported/vcpkg/versions/u-/usockets.json
index 2cbf659ae..069f37b80 100644
--- a/external_imported/vcpkg/versions/u-/usockets.json
+++ b/external_imported/vcpkg/versions/u-/usockets.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "178ef570c3acdb03066628f05aa564af7609f48c",
+      "version": "0.8.6",
+      "port-version": 1
+    },
+    {
+      "git-tree": "648715b141f4bb501ebc83d09da547ee0b3fe467",
+      "version": "0.8.6",
+      "port-version": 0
+    },
     {
       "git-tree": "79d76cd232129419d6e9e3afdc6ba689f4c00bf7",
       "version": "0.8.5",
diff --git a/external_imported/vcpkg/versions/u-/usrsctp.json b/external_imported/vcpkg/versions/u-/usrsctp.json
index 44c86c944..2060e07dd 100644
--- a/external_imported/vcpkg/versions/u-/usrsctp.json
+++ b/external_imported/vcpkg/versions/u-/usrsctp.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "7c30cd146c1f7b69d5a8f43fbb615e3bbb42b6ee",
+      "version": "0.9.5.0",
+      "port-version": 3
+    },
+    {
+      "git-tree": "8ac1cb14a09660bf33bd8f3dc7727bcf8080ae02",
+      "version": "0.9.5.0",
+      "port-version": 2
+    },
     {
       "git-tree": "fcf79007e70c0b2872453841199dae68e7ac01fa",
       "version": "0.9.5.0",
diff --git a/external_imported/vcpkg/versions/u-/utf8-range.json b/external_imported/vcpkg/versions/u-/utf8-range.json
new file mode 100644
index 000000000..37bf59624
--- /dev/null
+++ b/external_imported/vcpkg/versions/u-/utf8-range.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "dd54a8c4b774935b2c164d0902185fa56a8694bb",
+      "version-date": "2023-11-09",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/u-/utfcpp.json b/external_imported/vcpkg/versions/u-/utfcpp.json
index d5a9dbac8..abc777780 100644
--- a/external_imported/vcpkg/versions/u-/utfcpp.json
+++ b/external_imported/vcpkg/versions/u-/utfcpp.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "4aa82d07c18c1a5b1ec311a0a23fddc81b162b5a",
+      "version": "4.0.5",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f3ceee3e19b95edf9e59c813da7764a68145bfd1",
+      "version": "4.0.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "323b2ffdbd38cf8e756a5ae5714ef2169c0cd6b3",
+      "version": "3.2.5",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6c3de7ba47b92f266d5cce0a4f69925af4abda8f",
+      "version": "3.2.4",
+      "port-version": 0
+    },
     {
       "git-tree": "6871a843dce2e99e0973ca0a2a837ea78c3add39",
       "version": "3.2.3",
diff --git a/external_imported/vcpkg/versions/u-/utfz.json b/external_imported/vcpkg/versions/u-/utfz.json
index 4f74bc897..5789078f2 100644
--- a/external_imported/vcpkg/versions/u-/utfz.json
+++ b/external_imported/vcpkg/versions/u-/utfz.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "29787ab2794e0e9cb0183207820b2e5f37a3e8f7",
+      "version": "1.2",
+      "port-version": 4
+    },
     {
       "git-tree": "e17e36e3f6a6d86a17ed5633baf9a45e1a4d7ce9",
       "version-string": "1.2",
diff --git a/external_imported/vcpkg/versions/u-/uvatlas.json b/external_imported/vcpkg/versions/u-/uvatlas.json
index 0cbef8798..4a5e30a16 100644
--- a/external_imported/vcpkg/versions/u-/uvatlas.json
+++ b/external_imported/vcpkg/versions/u-/uvatlas.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "5e9c34981bb0811581e42a967e3168cf4caae0b1",
+      "version-date": "2023-12-31",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b19700b61aeb3ea159f83d6f2184708142ebae73",
+      "version-date": "2023-10-31",
+      "port-version": 0
+    },
+    {
+      "git-tree": "1f28e65ddac26fdd4f5de13a5b31a3f460c7da37",
+      "version-date": "2023-06-13",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9d245ea2b1c8fe04d653e858d2c9dda5fde706da",
+      "version-date": "2023-04-28",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6e028b8207a31b10b755c11400d7c33f73fb5511",
+      "version-date": "2023-03-30",
+      "port-version": 0
+    },
     {
       "git-tree": "447767eafcf76143e72ee08847c27bbc8c604deb",
       "version-date": "2023-02-06",
diff --git a/external_imported/vcpkg/versions/u-/uvw.json b/external_imported/vcpkg/versions/u-/uvw.json
index 048053fbc..ff61acd1a 100644
--- a/external_imported/vcpkg/versions/u-/uvw.json
+++ b/external_imported/vcpkg/versions/u-/uvw.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "82ef2ed3a8ae1df65e8e922c5d7917d3271f457d",
+      "version": "3.2.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "67bc0402d4aa7c5cbb9f934c0e7c68fec4acdcfc",
+      "version": "3.0.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "ffc751aa641f583e42aad836b6bd7766661f789a",
+      "version": "3.0.0",
+      "port-version": 0
+    },
     {
       "git-tree": "c36c66a8d5f4a6eed4aa9fe4399f32a516d3883c",
       "version": "2.12.1",
diff --git a/external_imported/vcpkg/versions/u-/uwebsockets.json b/external_imported/vcpkg/versions/u-/uwebsockets.json
index 9a3cc140a..adee31062 100644
--- a/external_imported/vcpkg/versions/u-/uwebsockets.json
+++ b/external_imported/vcpkg/versions/u-/uwebsockets.json
@@ -1,5 +1,40 @@
 {
   "versions": [
+    {
+      "git-tree": "045e5a648de127461ada21b72d56b8c9ce6e8886",
+      "version-semver": "20.57.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e2d1e526ceac2a64d35063ef42990b83fb43e80e",
+      "version-semver": "20.54.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "accbc9586fca80fd1345c5f2f3cf8449c76dcb24",
+      "version-semver": "20.47.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "db7e8088e0a542c51cea89ed081e8bcae6baec8c",
+      "version-semver": "20.45.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "53155ed92665dafb62c89bcc7bb9722fd5875316",
+      "version-semver": "20.44.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0b0f3943b2e6e8260c638dc75c430d4975b87999",
+      "version-semver": "20.41.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "93461a35ff4e9611909379c0e64a1b22213a1c57",
+      "version-semver": "20.40.0",
+      "port-version": 0
+    },
     {
       "git-tree": "4d9dadfe2a7ad5ed25314c0511325f05c20702fc",
       "version-semver": "20.36.0",
diff --git a/external_imported/vcpkg/versions/v-/v8.json b/external_imported/vcpkg/versions/v-/v8.json
index 7d8073cf4..4225493c8 100644
--- a/external_imported/vcpkg/versions/v-/v8.json
+++ b/external_imported/vcpkg/versions/v-/v8.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ab4cfc5f196adbe34d9a4d75758137c5fddaafe9",
+      "version": "9.1.269.39",
+      "port-version": 6
+    },
     {
       "git-tree": "efe56a72380aed1323f5e19b4b20a3e02fae8112",
       "version": "9.1.269.39",
diff --git a/external_imported/vcpkg/versions/v-/valijson.json b/external_imported/vcpkg/versions/v-/valijson.json
index e63eb9a9d..09ccc00da 100644
--- a/external_imported/vcpkg/versions/v-/valijson.json
+++ b/external_imported/vcpkg/versions/v-/valijson.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9a05a76802a936f7549eec49d032a5e6fa220cfb",
+      "version": "1.0.1",
+      "port-version": 0
+    },
     {
       "git-tree": "7edd27211e0ef58ea307fe1fc4f34aea18cb8529",
       "version": "0.6",
diff --git a/external_imported/vcpkg/versions/v-/vc.json b/external_imported/vcpkg/versions/v-/vc.json
index f1232fc14..14fb131a9 100644
--- a/external_imported/vcpkg/versions/v-/vc.json
+++ b/external_imported/vcpkg/versions/v-/vc.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "219677dca49bb75959b61537111daca726e52a86",
+      "version": "1.4.4",
+      "port-version": 0
+    },
     {
       "git-tree": "933ac99201b15104edd8037e8bcc7959d36a6d67",
       "version": "1.4.3",
diff --git a/external_imported/vcpkg/versions/v-/vcpkg-cmake-get-vars.json b/external_imported/vcpkg/versions/v-/vcpkg-cmake-get-vars.json
index 4bfa475bc..32fcd9f04 100644
--- a/external_imported/vcpkg/versions/v-/vcpkg-cmake-get-vars.json
+++ b/external_imported/vcpkg/versions/v-/vcpkg-cmake-get-vars.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "725c841810ceb8de33da68ea879eb8f0b4d6c94c",
+      "version-date": "2023-12-31",
+      "port-version": 0
+    },
     {
       "git-tree": "2e624c2cf12a97a7a802e31ff1d28b9fa6ba9bde",
       "version-date": "2023-03-02",
diff --git a/external_imported/vcpkg/versions/v-/vcpkg-cmake.json b/external_imported/vcpkg/versions/v-/vcpkg-cmake.json
index 50bf52113..9d8b6f876 100644
--- a/external_imported/vcpkg/versions/v-/vcpkg-cmake.json
+++ b/external_imported/vcpkg/versions/v-/vcpkg-cmake.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "88a7058fc7fa73a9c4c99cfcae9d79e2abf87a5a",
+      "version-date": "2023-05-04",
+      "port-version": 0
+    },
     {
       "git-tree": "1913f86defd2140d0a6751be2d51952e4090efa4",
       "version-date": "2022-12-22",
diff --git a/external_imported/vcpkg/versions/v-/vcpkg-get-python-packages.json b/external_imported/vcpkg/versions/v-/vcpkg-get-python-packages.json
index e9eced18e..7733d8548 100644
--- a/external_imported/vcpkg/versions/v-/vcpkg-get-python-packages.json
+++ b/external_imported/vcpkg/versions/v-/vcpkg-get-python-packages.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "9205135e78e0cad47fd43c2f7abada1f4fbbdbaa",
+      "version-date": "2024-01-24",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b6f23effcf3057ccc837f864b9207b651209e608",
+      "version-date": "2024-01-02",
+      "port-version": 0
+    },
+    {
+      "git-tree": "80e0cf9d38d72126b34eb1ee9b33f936c778a696",
+      "version-date": "2023-07-28",
+      "port-version": 0
+    },
     {
       "git-tree": "e65762bfef05a4d380bb171409c48a694fb35435",
       "version-date": "2022-06-30",
diff --git a/external_imported/vcpkg/versions/v-/vcpkg-msbuild.json b/external_imported/vcpkg/versions/v-/vcpkg-msbuild.json
new file mode 100644
index 000000000..7cdd5c093
--- /dev/null
+++ b/external_imported/vcpkg/versions/v-/vcpkg-msbuild.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "09443e951188f7850761144fde77fe9edf0dceba",
+      "version-date": "2023-08-08",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e9effc7e0ed636888b0bf3660d602f0737cba97e",
+      "version-date": "2023-06-22",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/v-/vcpkg-pkgconfig-get-modules.json b/external_imported/vcpkg/versions/v-/vcpkg-pkgconfig-get-modules.json
index 3bb85c48b..b04399b18 100644
--- a/external_imported/vcpkg/versions/v-/vcpkg-pkgconfig-get-modules.json
+++ b/external_imported/vcpkg/versions/v-/vcpkg-pkgconfig-get-modules.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "365f7303c0f9fe13458a62e7e4998760e6d918a4",
+      "version-date": "2023-09-06",
+      "port-version": 0
+    },
+    {
+      "git-tree": "57e857fda6b1dadd02036d9c012963db900bfc33",
+      "version-date": "2023-02-25",
+      "port-version": 0
+    },
     {
       "git-tree": "48bfa748f78837921860329547ed6e5799665698",
       "version-date": "2022-02-10",
diff --git a/external_imported/vcpkg/versions/v-/vcpkg-qmake.json b/external_imported/vcpkg/versions/v-/vcpkg-qmake.json
index 4824c720c..f1c4ea99e 100644
--- a/external_imported/vcpkg/versions/v-/vcpkg-qmake.json
+++ b/external_imported/vcpkg/versions/v-/vcpkg-qmake.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "82e22019ae07b7150c3fb2a8672d4192eed2782c",
+      "version-date": "2023-03-22",
+      "port-version": 0
+    },
     {
       "git-tree": "993a25e3e7a43175fb3d7d4981bc3e0de1f65c32",
       "version-date": "2022-11-16",
diff --git a/external_imported/vcpkg/versions/v-/vcpkg-tool-meson.json b/external_imported/vcpkg/versions/v-/vcpkg-tool-meson.json
index 742ccaecd..f2e9f80dd 100644
--- a/external_imported/vcpkg/versions/v-/vcpkg-tool-meson.json
+++ b/external_imported/vcpkg/versions/v-/vcpkg-tool-meson.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "3f6f5419cfc743a85e4f1fb1b582d4728b79c1e2",
+      "version": "0.63",
+      "port-version": 2
+    },
+    {
+      "git-tree": "d4234634624fc778e5d80db63cf53bac8587ebb9",
+      "version": "0.63",
+      "port-version": 1
+    },
     {
       "git-tree": "bee0cb6c5edf45133ebc9643b86c9c775ab36cfe",
       "version": "0.63",
diff --git a/external_imported/vcpkg/versions/v-/vcpkg-tool-ninja.json b/external_imported/vcpkg/versions/v-/vcpkg-tool-ninja.json
index 989abb5d8..40503ccbc 100644
--- a/external_imported/vcpkg/versions/v-/vcpkg-tool-ninja.json
+++ b/external_imported/vcpkg/versions/v-/vcpkg-tool-ninja.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4000f008484105462069d70c1b70295ab72dafb3",
+      "version-date": "2022-03-31",
+      "port-version": 2
+    },
     {
       "git-tree": "e4dafd8bf3868653e8e4fa81340dfeaea288a43c",
       "version-date": "2022-03-31",
diff --git a/external_imported/vcpkg/versions/v-/veigar.json b/external_imported/vcpkg/versions/v-/veigar.json
new file mode 100644
index 000000000..f5dc4933f
--- /dev/null
+++ b/external_imported/vcpkg/versions/v-/veigar.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "ac6bbfdf9847f62c07cbaaaccd15e85aa7d60bb5",
+      "version": "1.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/v-/vincentlaucsb-csv-parser.json b/external_imported/vcpkg/versions/v-/vincentlaucsb-csv-parser.json
new file mode 100644
index 000000000..6f6e5984f
--- /dev/null
+++ b/external_imported/vcpkg/versions/v-/vincentlaucsb-csv-parser.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "85d641f84a8f718a13d9f7ac169a4f2542c4d7c8",
+      "version": "2.1.3",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/v-/visit-struct.json b/external_imported/vcpkg/versions/v-/visit-struct.json
index 110b6eb36..77c858ea1 100644
--- a/external_imported/vcpkg/versions/v-/visit-struct.json
+++ b/external_imported/vcpkg/versions/v-/visit-struct.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "59296ff30012685f7c9c1d7b0723fc940997a2b1",
+      "version": "1.1.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a803da3fde987d8abc319748c6a599e6ace6e650",
+      "version": "1.0",
+      "port-version": 4
+    },
     {
       "git-tree": "b3d55a4cdc5320d704eba7c458eed48fe0d59dff",
       "version-string": "1.0",
diff --git a/external_imported/vcpkg/versions/v-/vit-vit-ctpl.json b/external_imported/vcpkg/versions/v-/vit-vit-ctpl.json
new file mode 100644
index 000000000..974e70577
--- /dev/null
+++ b/external_imported/vcpkg/versions/v-/vit-vit-ctpl.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "05de52269dd018412cc3e79ea4fa116661d07c0f",
+      "version": "0.0.2",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/v-/vk-bootstrap.json b/external_imported/vcpkg/versions/v-/vk-bootstrap.json
index 1eddc88c0..f45439cc3 100644
--- a/external_imported/vcpkg/versions/v-/vk-bootstrap.json
+++ b/external_imported/vcpkg/versions/v-/vk-bootstrap.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "3daa2be00dbf53598e2e71dd9c96fddac37d0855",
+      "version": "1.3.273",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ff20e17db240f974d3afaae76bcf2afbe96a068c",
+      "version": "0.7",
+      "port-version": 1
+    },
+    {
+      "git-tree": "76afd9e4fb4d1ac5c3329b5f2db845a3923d4aa6",
+      "version": "0.7",
+      "port-version": 0
+    },
     {
       "git-tree": "5b4e562582567c73a3bad2120a3b23e0b6b32dde",
       "version": "0.5",
diff --git a/external_imported/vcpkg/versions/v-/vkfft.json b/external_imported/vcpkg/versions/v-/vkfft.json
index bc864103c..31e5bfbc6 100644
--- a/external_imported/vcpkg/versions/v-/vkfft.json
+++ b/external_imported/vcpkg/versions/v-/vkfft.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "cfc9ae6d28ea3043ce04e923fc7a4b0a0346c4db",
+      "version": "1.2.31",
+      "port-version": 0
+    },
     {
       "git-tree": "cefb73461bdbaf1e71eefa7bb7a9dce7352fd3b3",
       "version": "1.2.17",
diff --git a/external_imported/vcpkg/versions/v-/vlfeat.json b/external_imported/vcpkg/versions/v-/vlfeat.json
index 73a685f0f..01eda1022 100644
--- a/external_imported/vcpkg/versions/v-/vlfeat.json
+++ b/external_imported/vcpkg/versions/v-/vlfeat.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d8ae9112b64ac005ccb493693bf4f5f9f8753355",
+      "version-date": "2020-07-10",
+      "port-version": 3
+    },
     {
       "git-tree": "2d4ca95a246089f7b15bcbfc6d8e74e364f5f867",
       "version-string": "2020-07-10",
diff --git a/external_imported/vcpkg/versions/v-/vlpp.json b/external_imported/vcpkg/versions/v-/vlpp.json
index a6f0339e2..7dad74803 100644
--- a/external_imported/vcpkg/versions/v-/vlpp.json
+++ b/external_imported/vcpkg/versions/v-/vlpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "654b1fb66c8a083d723a6a655acf5eb706fe97f2",
+      "version": "1.1.0.0",
+      "port-version": 1
+    },
     {
       "git-tree": "8df8b965877d7d55e02b0563e1874d6c4fbbd9f2",
       "version": "1.1.0.0",
diff --git a/external_imported/vcpkg/versions/v-/volk.json b/external_imported/vcpkg/versions/v-/volk.json
index c4a4b6fcb..3f890164c 100644
--- a/external_imported/vcpkg/versions/v-/volk.json
+++ b/external_imported/vcpkg/versions/v-/volk.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "707ef05c176dde719096f9737b77ce51390c951d",
+      "version": "1.3.275.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8b2d72fd71caeb51d471a390221f70dfe27fd803",
+      "version": "1.3.250",
+      "port-version": 0
+    },
     {
       "git-tree": "0b1961a45b266c648b63febbe13d717ec65007c3",
       "version": "1.3.233",
diff --git a/external_imported/vcpkg/versions/v-/vowpal-wabbit.json b/external_imported/vcpkg/versions/v-/vowpal-wabbit.json
index 1c0d8fc23..bdc107fd3 100644
--- a/external_imported/vcpkg/versions/v-/vowpal-wabbit.json
+++ b/external_imported/vcpkg/versions/v-/vowpal-wabbit.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "67f9b52b83a34f59c3dd20cff11d2c968149bbfc",
+      "version": "9.8.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "26041121b5911f0f6fb2e755b74747ce3dd2a371",
+      "version": "9.8.0",
+      "port-version": 1
+    },
     {
       "git-tree": "ed8289aedc37dbd955273a2f211451a44e54d702",
       "version": "9.8.0",
diff --git a/external_imported/vcpkg/versions/v-/vs-yasm.json b/external_imported/vcpkg/versions/v-/vs-yasm.json
index 71ca133dd..c7d185269 100644
--- a/external_imported/vcpkg/versions/v-/vs-yasm.json
+++ b/external_imported/vcpkg/versions/v-/vs-yasm.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d3d803c82a542e9f105f72e7f01c18a68a3669b1",
+      "version": "0.5.0",
+      "port-version": 2
+    },
     {
       "git-tree": "578afbadfc6dd06f3e83fc3d40dbbcfe98a392ae",
       "version-string": "0.5.0",
diff --git a/external_imported/vcpkg/versions/v-/vsg.json b/external_imported/vcpkg/versions/v-/vsg.json
new file mode 100644
index 000000000..8de858a28
--- /dev/null
+++ b/external_imported/vcpkg/versions/v-/vsg.json
@@ -0,0 +1,29 @@
+{
+  "versions": [
+    {
+      "git-tree": "e541c0ad81c0926c15e5f362dcdac38f99dbed19",
+      "version": "1.0.9",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6c882aab471b516ea2137b20450773b5ae7c57c3",
+      "version": "1.0.8",
+      "port-version": 0
+    },
+    {
+      "git-tree": "083510fe30c973a53fe65f4565d7c4159fdff36a",
+      "version": "1.0.6",
+      "port-version": 0
+    },
+    {
+      "git-tree": "c2ade86b1dee203ecaa4a401e76d80a205b6c71f",
+      "version": "1.0.5",
+      "port-version": 1
+    },
+    {
+      "git-tree": "0542d7bb873d65fa6ecbf2c3a02d7a2c7221d34a",
+      "version": "1.0.5",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/v-/vsgimgui.json b/external_imported/vcpkg/versions/v-/vsgimgui.json
new file mode 100644
index 000000000..3579ead2a
--- /dev/null
+++ b/external_imported/vcpkg/versions/v-/vsgimgui.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "eb1104907bad19da30c10108718f012c7a1c6c22",
+      "version": "0.1.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/v-/vsgxchange.json b/external_imported/vcpkg/versions/v-/vsgxchange.json
new file mode 100644
index 000000000..47a0ea99a
--- /dev/null
+++ b/external_imported/vcpkg/versions/v-/vsgxchange.json
@@ -0,0 +1,19 @@
+{
+  "versions": [
+    {
+      "git-tree": "73b799a8d58def43da13c3642687cabbb917c630",
+      "version": "1.0.5",
+      "port-version": 1
+    },
+    {
+      "git-tree": "8a026d7763afb5ffa6081e9baf6de63a8d500790",
+      "version": "1.0.5",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4019eb900d9064c6cb03767678bf82dd9860033e",
+      "version": "1.0.4",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/v-/vtk-dicom.json b/external_imported/vcpkg/versions/v-/vtk-dicom.json
index 0dcb284a5..2bd6584a1 100644
--- a/external_imported/vcpkg/versions/v-/vtk-dicom.json
+++ b/external_imported/vcpkg/versions/v-/vtk-dicom.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "bbe795fdb0d7be6e03dbe99b4d0670237f088b67",
+      "version": "0.8.14",
+      "port-version": 2
+    },
     {
       "git-tree": "96d043efb89eb2522af31366de52c340ca5c5193",
       "version": "0.8.14",
diff --git a/external_imported/vcpkg/versions/v-/vtk-m.json b/external_imported/vcpkg/versions/v-/vtk-m.json
index b86a7682f..9b20ffd5c 100644
--- a/external_imported/vcpkg/versions/v-/vtk-m.json
+++ b/external_imported/vcpkg/versions/v-/vtk-m.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1d9c1ecc2af5787432fdebcdf6cd293b7af075bf",
+      "version": "1.9.0",
+      "port-version": 2
+    },
     {
       "git-tree": "7df5e71334a22b5dc19ffb3c02880554b2838f86",
       "version": "1.9.0",
diff --git a/external_imported/vcpkg/versions/v-/vtk.json b/external_imported/vcpkg/versions/v-/vtk.json
index 3234293a5..b927e043a 100644
--- a/external_imported/vcpkg/versions/v-/vtk.json
+++ b/external_imported/vcpkg/versions/v-/vtk.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "6365f197946995803914141a82c1830d165427b3",
+      "version-semver": "9.2.0-pv5.11.0",
+      "port-version": 10
+    },
+    {
+      "git-tree": "a2a544c0f17d33ceb785ecd4b263f6f540562974",
+      "version-semver": "9.2.0-pv5.11.0",
+      "port-version": 9
+    },
+    {
+      "git-tree": "8f707a1fc800b17b84e545a4aa5b9f2c3c28c6d6",
+      "version-semver": "9.2.0-pv5.11.0",
+      "port-version": 8
+    },
+    {
+      "git-tree": "9ec376669498a8b43b3dc1779386dcc383d7cc1f",
+      "version-semver": "9.2.0-pv5.11.0",
+      "port-version": 7
+    },
+    {
+      "git-tree": "340d82faf130e467fb4ed6d5e8ce5bf93101513e",
+      "version-semver": "9.2.0-pv5.11.0",
+      "port-version": 6
+    },
     {
       "git-tree": "d58e0bca42952f053f26534bad7771a29a1e16c8",
       "version-semver": "9.2.0-pv5.11.0",
diff --git a/external_imported/vcpkg/versions/v-/vulkan-headers.json b/external_imported/vcpkg/versions/v-/vulkan-headers.json
index 849b95c7d..ded4716d4 100644
--- a/external_imported/vcpkg/versions/v-/vulkan-headers.json
+++ b/external_imported/vcpkg/versions/v-/vulkan-headers.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "5fd55b5328f4cc92680685bb3492092e7a919fbe",
+      "version": "1.3.275.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ffd9715c99bc1d2b115a27616e17319ab10d47d2",
+      "version": "1.3.268.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4a67e5648f3203af599c115390d12fceb828b8fa",
+      "version": "1.3.260",
+      "port-version": 0
+    },
+    {
+      "git-tree": "58c480d0beaa5a34988bd99c452a6fcbfe08721a",
+      "version": "1.3.250",
+      "port-version": 2
+    },
+    {
+      "git-tree": "535abf6f9fe02ff97da42e5594a4c1fd55190ec1",
+      "version": "1.3.243",
+      "port-version": 2
+    },
     {
       "git-tree": "d0e10b5347c26f2917d90b107a6177af1c270b65",
       "version": "1.3.239",
diff --git a/external_imported/vcpkg/versions/v-/vulkan-hpp.json b/external_imported/vcpkg/versions/v-/vulkan-hpp.json
index 3c6b4f285..91ffac4dd 100644
--- a/external_imported/vcpkg/versions/v-/vulkan-hpp.json
+++ b/external_imported/vcpkg/versions/v-/vulkan-hpp.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "2ab29397d55ec0c9b71cb790c30656e4903a996c",
+      "version-string": "deprecated",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a9a9d60278b58e9bd4b8c301247f4a0e10076136",
+      "version": "1.3.259",
+      "port-version": 1
+    },
+    {
+      "git-tree": "d87342b4b1feb62ce7f97396981603c86358fecf",
+      "version": "1.3.259",
+      "port-version": 0
+    },
     {
       "git-tree": "61fc021c36380e8be0bf1742784dea14c9fe4a97",
       "version": "1.3.231",
diff --git a/external_imported/vcpkg/versions/v-/vulkan-loader.json b/external_imported/vcpkg/versions/v-/vulkan-loader.json
new file mode 100644
index 000000000..7d5de11cc
--- /dev/null
+++ b/external_imported/vcpkg/versions/v-/vulkan-loader.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "53fab978fa1af1363dd629deaedda328acafa01e",
+      "version": "1.3.275.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "058ede4fd9458f7fc471ea3663e4e8e6f455f638",
+      "version": "1.3.268.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/v-/vulkan-memory-allocator-hpp.json b/external_imported/vcpkg/versions/v-/vulkan-memory-allocator-hpp.json
index 5dfb4cd1d..41b4ddd54 100644
--- a/external_imported/vcpkg/versions/v-/vulkan-memory-allocator-hpp.json
+++ b/external_imported/vcpkg/versions/v-/vulkan-memory-allocator-hpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "917058b3096f3375a29ff9960e4cae4a988655ea",
+      "version": "3.0.1.1",
+      "port-version": 0
+    },
     {
       "git-tree": "572ac6bfc63ddd4a37633aa76f54ff4c8325cb85",
       "version": "3.0.1",
diff --git a/external_imported/vcpkg/versions/v-/vulkan-memory-allocator.json b/external_imported/vcpkg/versions/v-/vulkan-memory-allocator.json
index 0c9d5deed..657ffbef7 100644
--- a/external_imported/vcpkg/versions/v-/vulkan-memory-allocator.json
+++ b/external_imported/vcpkg/versions/v-/vulkan-memory-allocator.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "a687cd3066c8effcdec670ce92d389c36c217c14",
+      "version": "3.0.1",
+      "port-version": 4
+    },
+    {
+      "git-tree": "d57ebd5ba820e5d8a5f55d797199abe4734d5af8",
+      "version": "3.0.1",
+      "port-version": 3
+    },
+    {
+      "git-tree": "0295d831ef2217a424c4739767ecde90e5bc7554",
+      "version": "3.0.1",
+      "port-version": 2
+    },
     {
       "git-tree": "49c724c78cf76e8858c92ce7b1acdc52fd9bf62b",
       "version": "3.0.1",
diff --git a/external_imported/vcpkg/versions/v-/vulkan-sdk-components.json b/external_imported/vcpkg/versions/v-/vulkan-sdk-components.json
new file mode 100644
index 000000000..5797f286c
--- /dev/null
+++ b/external_imported/vcpkg/versions/v-/vulkan-sdk-components.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "d2488a944354eab0570fcda95657275850ea1c21",
+      "version": "1.3.275.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "efe1324e0d30a235687686111be4daa4605083e6",
+      "version": "1.3.268.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/v-/vulkan-tools.json b/external_imported/vcpkg/versions/v-/vulkan-tools.json
new file mode 100644
index 000000000..bcf24cb8e
--- /dev/null
+++ b/external_imported/vcpkg/versions/v-/vulkan-tools.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "9e8ff435bcda0de218d540c39c0796a446f6b6fe",
+      "version": "1.3.275.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "720b109686183339d148fb303b53abfd128e9ec2",
+      "version": "1.3.268.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/v-/vulkan-utility-libraries.json b/external_imported/vcpkg/versions/v-/vulkan-utility-libraries.json
new file mode 100644
index 000000000..16445ee57
--- /dev/null
+++ b/external_imported/vcpkg/versions/v-/vulkan-utility-libraries.json
@@ -0,0 +1,19 @@
+{
+  "versions": [
+    {
+      "git-tree": "d5abe73f20f44a0d03163eb8fdbd3714f1b57b8a",
+      "version": "1.3.275.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "d90089cebfde86dcb2c554b9e45271889503fc36",
+      "version": "1.3.268.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "0849291de2e14ef941d30aef9a17e45547329e44",
+      "version": "1.3.268.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/v-/vulkan-validationlayers.json b/external_imported/vcpkg/versions/v-/vulkan-validationlayers.json
new file mode 100644
index 000000000..e4aa7d209
--- /dev/null
+++ b/external_imported/vcpkg/versions/v-/vulkan-validationlayers.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "9e3c7cb8b034a637486a7a2fb1c695771170cb5d",
+      "version": "1.3.275.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "993862940154ca8e6692e31ad7387261566ca757",
+      "version": "1.3.268.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/v-/vulkan.json b/external_imported/vcpkg/versions/v-/vulkan.json
index 08a39ad3a..db9b05d55 100644
--- a/external_imported/vcpkg/versions/v-/vulkan.json
+++ b/external_imported/vcpkg/versions/v-/vulkan.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "3e8d64ec799440b97c7151f97dd00a53e8e1b5ea",
+      "version-date": "2023-12-17",
+      "port-version": 0
+    },
+    {
+      "git-tree": "27c107c7bd16ff68d2c9da45b0020713d4b2ea03",
+      "version": "1.3.268.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ea62236a3c91051f5ccb340442b60a026bf160c6",
+      "version": "1.1.82.1",
+      "port-version": 6
+    },
     {
       "git-tree": "80d4793fe3882fca0afcb470183f404d97c22981",
       "version": "1.1.82.1",
diff --git a/external_imported/vcpkg/versions/v-/vxl.json b/external_imported/vcpkg/versions/v-/vxl.json
index 80885d5e9..a102826bd 100644
--- a/external_imported/vcpkg/versions/v-/vxl.json
+++ b/external_imported/vcpkg/versions/v-/vxl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "63c0db04d12a2dbe25a0ec754983ca25415e3b38",
+      "version": "2.0.2",
+      "port-version": 5
+    },
     {
       "git-tree": "7a84f7e74335e755ba16066fa148e3d30a9d5af5",
       "version": "2.0.2",
diff --git a/external_imported/vcpkg/versions/w-/wampcc.json b/external_imported/vcpkg/versions/w-/wampcc.json
index 07bdca8b2..9578ec282 100644
--- a/external_imported/vcpkg/versions/w-/wampcc.json
+++ b/external_imported/vcpkg/versions/w-/wampcc.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "69c3d159720746a5321085dab7b543c1c95eed85",
+      "version-date": "2019-09-04",
+      "port-version": 5
+    },
     {
       "git-tree": "acfd463862ba55ebabe1f0b0105da56b965d5b90",
       "version-date": "2019-09-04",
diff --git a/external_imported/vcpkg/versions/w-/wangle.json b/external_imported/vcpkg/versions/w-/wangle.json
index d764dcfea..a1df8e0a4 100644
--- a/external_imported/vcpkg/versions/w-/wangle.json
+++ b/external_imported/vcpkg/versions/w-/wangle.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "efa950ad690a3f10060fe5c09cfea6a55201736a",
+      "version-string": "2024.01.01.00",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ff239f5d33f181256ff31bbb5cfc0bdc7329937c",
+      "version-string": "2023.10.02.00",
+      "port-version": 0
+    },
+    {
+      "git-tree": "105b20279ba475028db9848e6acc0950843e103c",
+      "version-string": "2023.07.03.00",
+      "port-version": 0
+    },
+    {
+      "git-tree": "05744fe658f891ca87fd5cdad73a382ace640bed",
+      "version-string": "2023.05.15.00",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e79739dcf42e3dd4d0e32c595b27ece48c762bdd",
+      "version-string": "2022.03.21.00",
+      "port-version": 1
+    },
     {
       "git-tree": "6f0fec69eddf934964ee77b9923f68da2c3c7724",
       "version-string": "2022.03.21.00",
diff --git a/external_imported/vcpkg/versions/w-/wasmedge.json b/external_imported/vcpkg/versions/w-/wasmedge.json
index 1e369422a..bdbc74276 100644
--- a/external_imported/vcpkg/versions/w-/wasmedge.json
+++ b/external_imported/vcpkg/versions/w-/wasmedge.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "45086bbec78c8152a37b5c487e103a4fd838b17a",
+      "version": "0.13.5",
+      "port-version": 1
+    },
+    {
+      "git-tree": "fdf400cacc3fafd5260b1bf7bc097a2e44160d00",
+      "version": "0.13.5",
+      "port-version": 0
+    },
+    {
+      "git-tree": "1c5d407c35a142f50bf1a79d7a720d8df43b54ec",
+      "version": "0.12.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "053400dd62ab5a02842f107aaad7dff7fdeb0a40",
+      "version": "0.12.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a13dbbe58cedd77daae5f42016df4f74101c34b0",
+      "version-semver": "0.12.0-alpha.1",
+      "port-version": 1
+    },
     {
       "git-tree": "8f45668b8b49bb5ac4cefd31ee7e41abddc15107",
       "version-semver": "0.12.0-alpha.1",
diff --git a/external_imported/vcpkg/versions/w-/wavpack.json b/external_imported/vcpkg/versions/w-/wavpack.json
index 55cdf3c16..9d0b775c2 100644
--- a/external_imported/vcpkg/versions/w-/wavpack.json
+++ b/external_imported/vcpkg/versions/w-/wavpack.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d58b3734d0a42c7309216ade0432f7787fbd6ff5",
+      "version": "5.6.0",
+      "port-version": 1
+    },
     {
       "git-tree": "040113ae230d1d94918ce7495157b1d404589a8b",
       "version": "5.6.0",
diff --git a/external_imported/vcpkg/versions/w-/wcslib.json b/external_imported/vcpkg/versions/w-/wcslib.json
new file mode 100644
index 000000000..ac7dbb016
--- /dev/null
+++ b/external_imported/vcpkg/versions/w-/wcslib.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "2e33104b54c3db79012234ded4db319a3464885b",
+      "version": "7.12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "a68a2412a39e7458698f2e4110d8a50dc8619c96",
+      "version": "8.2.1",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/w-/websocketpp.json b/external_imported/vcpkg/versions/w-/websocketpp.json
index d040079dc..9e6fad914 100644
--- a/external_imported/vcpkg/versions/w-/websocketpp.json
+++ b/external_imported/vcpkg/versions/w-/websocketpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "eb46cff6f9a23caefbc56ac8089d1fbee523e13e",
+      "version": "0.8.2",
+      "port-version": 3
+    },
     {
       "git-tree": "70d3b037559f580fa52bc50bb2dc26e58f5107d9",
       "version": "0.8.2",
diff --git a/external_imported/vcpkg/versions/w-/webview2.json b/external_imported/vcpkg/versions/w-/webview2.json
index 5a68306fe..bab3df155 100644
--- a/external_imported/vcpkg/versions/w-/webview2.json
+++ b/external_imported/vcpkg/versions/w-/webview2.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "5cd32d80f7fd65a498507ca2de77f8ce5449dd30",
+      "version": "1.0.2088.41",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8f620381c9d12e72ae72e693571bc98ab82510da",
+      "version": "1.0.1210.39",
+      "port-version": 1
+    },
     {
       "git-tree": "67a13efe8865489439c423563ee9fdaecf8baab1",
       "version": "1.0.1210.39",
diff --git a/external_imported/vcpkg/versions/w-/wepoll.json b/external_imported/vcpkg/versions/w-/wepoll.json
index b8cec5752..d5c7034f0 100644
--- a/external_imported/vcpkg/versions/w-/wepoll.json
+++ b/external_imported/vcpkg/versions/w-/wepoll.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "83177ec0e0684dc043f5a7f7f800d1c8c8df47d9",
+      "version": "1.5.8",
+      "port-version": 3
+    },
     {
       "git-tree": "ece0a454c25f5fba81265f1bc66bae4036efdcec",
       "version-string": "1.5.8",
diff --git a/external_imported/vcpkg/versions/w-/wg21-linear-algebra.json b/external_imported/vcpkg/versions/w-/wg21-linear-algebra.json
index b83a1d9e3..8889f6a60 100644
--- a/external_imported/vcpkg/versions/w-/wg21-linear-algebra.json
+++ b/external_imported/vcpkg/versions/w-/wg21-linear-algebra.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "85073707ba15d2e60bdcf7e7f0c513d6bebe6332",
+      "version": "0.7.3",
+      "port-version": 0
+    },
     {
       "git-tree": "d3968b4096fba4dbd1189fb9b7b1d33ba562fdc7",
       "version": "0.7.2",
diff --git a/external_imported/vcpkg/versions/w-/wg21-sg14.json b/external_imported/vcpkg/versions/w-/wg21-sg14.json
index 8b620cc22..9873b95c0 100644
--- a/external_imported/vcpkg/versions/w-/wg21-sg14.json
+++ b/external_imported/vcpkg/versions/w-/wg21-sg14.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f7477a801b9a1dfa1adcf2c59d486b0c3e602de3",
+      "version-date": "2019-08-13",
+      "port-version": 2
+    },
     {
       "git-tree": "2f11507c370b719e1a17ced7ab2dd0af19fe47d4",
       "version-string": "2019-08-13",
diff --git a/external_imported/vcpkg/versions/w-/wil.json b/external_imported/vcpkg/versions/w-/wil.json
index d060db361..70a1d38a9 100644
--- a/external_imported/vcpkg/versions/w-/wil.json
+++ b/external_imported/vcpkg/versions/w-/wil.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "500a409fc60e5a27c68778c4e3090d1fb8e0224c",
+      "version-date": "2024-01-22",
+      "port-version": 0
+    },
+    {
+      "git-tree": "39b5070b1e40ec7b9333c2fbb88941beef73155f",
+      "version-date": "2023-10-28",
+      "port-version": 0
+    },
+    {
+      "git-tree": "1305125361ca7587fdcdd0caac7609c15a94e48f",
+      "version-date": "2023-08-24",
+      "port-version": 1
+    },
+    {
+      "git-tree": "ddb021c58bdc3c24a0440d2e6f808797cd698bf8",
+      "version-date": "2023-08-24",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8e96d6798de6842dc009f957172841b8fcf711d7",
+      "version-date": "2023-04-11",
+      "port-version": 0
+    },
     {
       "git-tree": "15b6edcd080a9c2dab9a62a7d4a029b33b835f08",
       "version-date": "2023-02-02",
diff --git a/external_imported/vcpkg/versions/w-/winpcap.json b/external_imported/vcpkg/versions/w-/winpcap.json
index b29cb56e0..194f9641a 100644
--- a/external_imported/vcpkg/versions/w-/winpcap.json
+++ b/external_imported/vcpkg/versions/w-/winpcap.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "1a9aab1255bdc3aa23acbc3cbb89c175d56fdf9b",
+      "version": "4.1.3",
+      "port-version": 12
+    },
+    {
+      "git-tree": "fa00dc5de34d5076f7d7bad06b649b6ce4412b68",
+      "version": "4.1.3",
+      "port-version": 11
+    },
+    {
+      "git-tree": "93484c8257a6ac5a90f5d540d143a6f4fe5968f2",
+      "version": "4.1.3",
+      "port-version": 10
+    },
+    {
+      "git-tree": "5444737a0b6d0d6a1c5129ae7435f52ac5f6bcb4",
+      "version": "4.1.3",
+      "port-version": 9
+    },
     {
       "git-tree": "85d70a721afa26cf8ff26aec62fd04a16f8e6f7b",
       "version": "4.1.3",
diff --git a/external_imported/vcpkg/versions/w-/winsparkle.json b/external_imported/vcpkg/versions/w-/winsparkle.json
index b642ca7d9..748c84467 100644
--- a/external_imported/vcpkg/versions/w-/winsparkle.json
+++ b/external_imported/vcpkg/versions/w-/winsparkle.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "033cf81cd03bc5533ddb7e57d65f704db078ba44",
+      "version": "0.8.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4c6c0404e941beb4139069e5a5cb03e7e59655a4",
+      "version": "0.7.0",
+      "port-version": 2
+    },
     {
       "git-tree": "8f1aed9d3a5aac4c967bc6e8be9b8bbe0ce09a76",
       "version": "0.7.0",
diff --git a/external_imported/vcpkg/versions/w-/wintoast.json b/external_imported/vcpkg/versions/w-/wintoast.json
index b61765e3e..6ce73985a 100644
--- a/external_imported/vcpkg/versions/w-/wintoast.json
+++ b/external_imported/vcpkg/versions/w-/wintoast.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f0c791ec550f242764df15235770a4767c4e917a",
+      "version": "1.3.0",
+      "port-version": 0
+    },
     {
       "git-tree": "7e0b224e777c1a12676204204a97636e3639c4c1",
       "version": "1.2.0",
diff --git a/external_imported/vcpkg/versions/w-/wmipp.json b/external_imported/vcpkg/versions/w-/wmipp.json
new file mode 100644
index 000000000..1afd5fe3f
--- /dev/null
+++ b/external_imported/vcpkg/versions/w-/wmipp.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "62fe399df24f53348677d6ee7af427a6d0018aaf",
+      "version": "1.2.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "70a7cc2553e70e4a9e6f50110b0e8b6eedb8c0f9",
+      "version": "1.0.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/w-/woff2.json b/external_imported/vcpkg/versions/w-/woff2.json
index 64a7f4a77..60f4d2454 100644
--- a/external_imported/vcpkg/versions/w-/woff2.json
+++ b/external_imported/vcpkg/versions/w-/woff2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fbd2207ad0ad1e7e52b421b86f96deff9ed7ec65",
+      "version": "1.0.2",
+      "port-version": 4
+    },
     {
       "git-tree": "b60f5207764279d61a2bb9f35e4881c4af2a6b2c",
       "version": "1.0.2",
diff --git a/external_imported/vcpkg/versions/w-/wolfmqtt.json b/external_imported/vcpkg/versions/w-/wolfmqtt.json
index 99c46b932..ce5d8a2de 100644
--- a/external_imported/vcpkg/versions/w-/wolfmqtt.json
+++ b/external_imported/vcpkg/versions/w-/wolfmqtt.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d01462c764790a2ab97815a9f16a40186b62de14",
+      "version": "1.16.0",
+      "port-version": 0
+    },
     {
       "git-tree": "b17cfe13abcf334e7f4563d5c5699c4b32078e98",
       "version": "1.15.0",
diff --git a/external_imported/vcpkg/versions/w-/wolfssl.json b/external_imported/vcpkg/versions/w-/wolfssl.json
index ca090fc23..420226916 100644
--- a/external_imported/vcpkg/versions/w-/wolfssl.json
+++ b/external_imported/vcpkg/versions/w-/wolfssl.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "c03fac0a968b9bdba85d3baba48695e82e1e297d",
+      "version": "5.6.6",
+      "port-version": 0
+    },
+    {
+      "git-tree": "fb8d59a3965864a1330fa99418eef1df5c354a50",
+      "version": "5.6.4",
+      "port-version": 1
+    },
+    {
+      "git-tree": "65cc018a18a436969ef0fa7ff531d83994326f43",
+      "version": "5.6.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "b1ed14c731f84f9a8f885e9bf40898c318bd4986",
+      "version": "5.6.3",
+      "port-version": 1
+    },
+    {
+      "git-tree": "e809eb7090657113c8f628ce22975c7f3bd3dbfd",
+      "version": "5.6.3",
+      "port-version": 0
+    },
     {
       "git-tree": "71789bbc13920d34e74d8bc23af6d5d480e7b610",
       "version": "5.5.4",
diff --git a/external_imported/vcpkg/versions/w-/wolftpm.json b/external_imported/vcpkg/versions/w-/wolftpm.json
index 396cff0d2..29c002eda 100644
--- a/external_imported/vcpkg/versions/w-/wolftpm.json
+++ b/external_imported/vcpkg/versions/w-/wolftpm.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "fe055978dbd963b2969e104333a2b79d49ff6cee",
+      "version": "2.7.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "d6849bfc65dbf33f5d51d9bc8c7a4e365a1d3553",
+      "version": "2.7.0",
+      "port-version": 1
+    },
     {
       "git-tree": "c7c2224865bfcc21dc98ab68f0b53ce5ca07e640",
       "version": "2.7.0",
diff --git a/external_imported/vcpkg/versions/w-/wordnet.json b/external_imported/vcpkg/versions/w-/wordnet.json
index 0abcb3b71..90624a6e9 100644
--- a/external_imported/vcpkg/versions/w-/wordnet.json
+++ b/external_imported/vcpkg/versions/w-/wordnet.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c34a2cc15fdbba26554bfebc0142e7de7cb3264a",
+      "version": "3.0",
+      "port-version": 3
+    },
     {
       "git-tree": "ac5ddd0978d9192feed17e2c643d7c8c9451064a",
       "version-string": "3.0",
diff --git a/external_imported/vcpkg/versions/w-/workflow.json b/external_imported/vcpkg/versions/w-/workflow.json
index 09e52a2ff..171a16c6f 100644
--- a/external_imported/vcpkg/versions/w-/workflow.json
+++ b/external_imported/vcpkg/versions/w-/workflow.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6b72e08d163acabe70e7804d7b3acc719c406ebf",
+      "version": "0.10.9",
+      "port-version": 0
+    },
     {
       "git-tree": "6f084c7076efb69884874d9cccadf7317c42b370",
       "version": "0.10.5",
diff --git a/external_imported/vcpkg/versions/w-/wpilib.json b/external_imported/vcpkg/versions/w-/wpilib.json
index b4a4397f3..9cd67fb72 100644
--- a/external_imported/vcpkg/versions/w-/wpilib.json
+++ b/external_imported/vcpkg/versions/w-/wpilib.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "7da141104a256a768fa72c6b3f98104904ebe45e",
+      "version-date": "2023-08-24",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e62481ee582e81ab3ba9fe7ad99a89fa1671c230",
+      "version-date": "2020-03-02",
+      "port-version": 4
+    },
     {
       "git-tree": "1593dcc61c40d6205be6d47e3623dc6bb3ddbad3",
       "version-date": "2020-03-02",
diff --git a/external_imported/vcpkg/versions/w-/wt.json b/external_imported/vcpkg/versions/w-/wt.json
index 604e51509..5058494da 100644
--- a/external_imported/vcpkg/versions/w-/wt.json
+++ b/external_imported/vcpkg/versions/w-/wt.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "9246a50b2cb7aaf547b61a4343ab3849e22533e6",
+      "version": "4.9.1",
+      "port-version": 2
+    },
+    {
+      "git-tree": "9dd116caa8830e2d131b0d3ffbcde1002aa12333",
+      "version": "4.9.1",
+      "port-version": 1
+    },
     {
       "git-tree": "3c2ab01f0b1932d0a5f62632fe26a28ea4a25faa",
       "version": "4.9.1",
diff --git a/external_imported/vcpkg/versions/w-/wxchartdir.json b/external_imported/vcpkg/versions/w-/wxchartdir.json
index fdaa66e86..6481816e1 100644
--- a/external_imported/vcpkg/versions/w-/wxchartdir.json
+++ b/external_imported/vcpkg/versions/w-/wxchartdir.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4a868514047472153d999319f7cfd5d2f9c5af01",
+      "version": "2.0.0",
+      "port-version": 2
+    },
     {
       "git-tree": "2a61292a9c23a9ea0ba1f3ed9035441289bb0da2",
       "version": "2.0.0",
diff --git a/external_imported/vcpkg/versions/w-/wxwidgets.json b/external_imported/vcpkg/versions/w-/wxwidgets.json
index 15920a78b..314acc4b7 100644
--- a/external_imported/vcpkg/versions/w-/wxwidgets.json
+++ b/external_imported/vcpkg/versions/w-/wxwidgets.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "b76c48ce396ff7c6e49ec508b7c5bd749fb94fbb",
+      "version": "3.2.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8dfaace5786af8de744ecf9e02622b7b3e39087a",
+      "version": "3.2.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2cbbd8d7a9d521546e8bc9b8957560806c4902e1",
+      "version": "3.2.2.1",
+      "port-version": 3
+    },
+    {
+      "git-tree": "9f6e3030aa5a9fa6b83099a43a0e98c8c06f0f68",
+      "version": "3.2.2.1",
+      "port-version": 2
+    },
     {
       "git-tree": "73c660df48132ff4b831c5f3445b361476990c70",
       "version": "3.2.2.1",
diff --git a/external_imported/vcpkg/versions/x-/x-plane.json b/external_imported/vcpkg/versions/x-/x-plane.json
index 34333db07..572bc3d78 100644
--- a/external_imported/vcpkg/versions/x-/x-plane.json
+++ b/external_imported/vcpkg/versions/x-/x-plane.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "be6ff276d2a18e64a2cf91a50ef1a53d26a33fa8",
+      "version": "4.0.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4f081103e3e99e2d77b5b3124824ad6f0d7410fc",
+      "version": "3.0.3",
+      "port-version": 2
+    },
     {
       "git-tree": "5b49030933a1014e1e897438a29a52fbb163b5f3",
       "version": "3.0.3",
diff --git a/external_imported/vcpkg/versions/x-/x264.json b/external_imported/vcpkg/versions/x-/x264.json
index 8b98973cc..b1f6d3cca 100644
--- a/external_imported/vcpkg/versions/x-/x264.json
+++ b/external_imported/vcpkg/versions/x-/x264.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "8fdfc4bb17ed8a4942a78dafd2ca5174d0695774",
+      "version": "0.164.3107",
+      "port-version": 0
+    },
+    {
+      "git-tree": "36ff38fabd741ddef6ccf4c207ef99058383c0bb",
+      "version": "0.164.3095",
+      "port-version": 5
+    },
+    {
+      "git-tree": "0361283be94126cf5e42a4cf765f700f8f209ea5",
+      "version": "0.164.3095",
+      "port-version": 4
+    },
+    {
+      "git-tree": "18da69fb69b926e7784135262798356e7b1ee5e4",
+      "version": "0.164.3095",
+      "port-version": 3
+    },
     {
       "git-tree": "4ff53c90cd7222ae9d3e8dc579c1d198715585c2",
       "version": "0.164.3095",
diff --git a/external_imported/vcpkg/versions/x-/x265.json b/external_imported/vcpkg/versions/x-/x265.json
index 7edfd8fba..9032e9044 100644
--- a/external_imported/vcpkg/versions/x-/x265.json
+++ b/external_imported/vcpkg/versions/x-/x265.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "b234c25f697f72c031c5d243a78be3dbb98c93c2",
+      "version": "3.5",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8aa499d4919383c463198cedf2bc8cea9b01adff",
+      "version": "3.4",
+      "port-version": 10
+    },
+    {
+      "git-tree": "aa43c511cf7041c15a3a56b0527124fa5f1640f2",
+      "version": "3.4",
+      "port-version": 9
+    },
     {
       "git-tree": "e47c9f9c25b46dbf26b7db6843e23d6f0d329ddb",
       "version": "3.4",
diff --git a/external_imported/vcpkg/versions/x-/x86-simd-sort.json b/external_imported/vcpkg/versions/x-/x86-simd-sort.json
index 6cd7250da..2e1e1237f 100644
--- a/external_imported/vcpkg/versions/x-/x86-simd-sort.json
+++ b/external_imported/vcpkg/versions/x-/x86-simd-sort.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "61c4499598f2a99b82aacb241abbb215b51aa31c",
+      "version": "4.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "54331ace9e00eeff0f8508317ef48d011a8821bc",
+      "version": "3.0",
+      "port-version": 0
+    },
     {
       "git-tree": "dbe8f88ac8cc85689eb7666fa8beb6d819c4573a",
       "version-date": "2023-03-04",
diff --git a/external_imported/vcpkg/versions/x-/xapian.json b/external_imported/vcpkg/versions/x-/xapian.json
index 31672ba28..b217c36e4 100644
--- a/external_imported/vcpkg/versions/x-/xapian.json
+++ b/external_imported/vcpkg/versions/x-/xapian.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "09d9178c29620d437cfb26264b48e601c694aefd",
+      "version": "1.4.22",
+      "port-version": 2
+    },
+    {
+      "git-tree": "0a050725d62e180539040589c1691a5ec3974a30",
+      "version": "1.4.22",
+      "port-version": 1
+    },
+    {
+      "git-tree": "f2da71ae6ceb7c0d2317c1d06f11a302f48f89dd",
+      "version": "1.4.22",
+      "port-version": 0
+    },
     {
       "git-tree": "88d78609c12312fdd2b7260e1c4c1fb3838373b7",
       "version": "1.4.21",
diff --git a/external_imported/vcpkg/versions/x-/xbyak.json b/external_imported/vcpkg/versions/x-/xbyak.json
index 26a62ce56..b73385de3 100644
--- a/external_imported/vcpkg/versions/x-/xbyak.json
+++ b/external_imported/vcpkg/versions/x-/xbyak.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "c72f02ee8e100020f33b6f409cbabeca9fe8b0aa",
+      "version": "6.73",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9774b99e4f632c777b1f0d1cec57f4918acc591a",
+      "version": "6.69",
+      "port-version": 0
+    },
     {
       "git-tree": "d4441480fab1434594b5441612ae5158c81a6642",
       "version": "6.60",
diff --git a/external_imported/vcpkg/versions/x-/xcb-proto.json b/external_imported/vcpkg/versions/x-/xcb-proto.json
index 20e240c60..94c00710d 100644
--- a/external_imported/vcpkg/versions/x-/xcb-proto.json
+++ b/external_imported/vcpkg/versions/x-/xcb-proto.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f2eac40d0f3ae01205792344a254ac956e0adcd2",
+      "version": "1.14.1",
+      "port-version": 1
+    },
     {
       "git-tree": "e5933d2463549d6d3b00a8aa1f0279f2a974ec1c",
       "version": "1.14.1",
diff --git a/external_imported/vcpkg/versions/x-/xerces-c.json b/external_imported/vcpkg/versions/x-/xerces-c.json
index ad6889a0d..2f72440a6 100644
--- a/external_imported/vcpkg/versions/x-/xerces-c.json
+++ b/external_imported/vcpkg/versions/x-/xerces-c.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "2a127df4687908c60c7d7c7a37342a7ab6c509cf",
+      "version-semver": "3.2.5",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4026f062e68881d5a72ecd5d900c70a46f92a8d9",
+      "version": "3.2.4",
+      "port-version": 3
+    },
     {
       "git-tree": "2eabf69ed6317e6b9b9fbb7cdb19e884a762f545",
       "version": "3.2.4",
diff --git a/external_imported/vcpkg/versions/x-/xeus.json b/external_imported/vcpkg/versions/x-/xeus.json
index 15c72b6b7..eda395f43 100644
--- a/external_imported/vcpkg/versions/x-/xeus.json
+++ b/external_imported/vcpkg/versions/x-/xeus.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b36c5dea30b1657552313a07c10623753918b1bf",
+      "version": "0.24.3",
+      "port-version": 3
+    },
     {
       "git-tree": "58ccbb03903ad023da77a9a53225dc4bd25df600",
       "version": "0.24.3",
diff --git a/external_imported/vcpkg/versions/x-/xframe.json b/external_imported/vcpkg/versions/x-/xframe.json
index 42a8f16c9..2271f0b7c 100644
--- a/external_imported/vcpkg/versions/x-/xframe.json
+++ b/external_imported/vcpkg/versions/x-/xframe.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0dc724af03bbad13a480e399160f7cf03bb4219c",
+      "version": "0.3.0",
+      "port-version": 3
+    },
     {
       "git-tree": "e0e77fd0b1b188f69a5c08856e518e61845bed7f",
       "version-string": "0.3.0",
diff --git a/external_imported/vcpkg/versions/x-/xlsxio.json b/external_imported/vcpkg/versions/x-/xlsxio.json
index da0b39202..a56ac4283 100644
--- a/external_imported/vcpkg/versions/x-/xlsxio.json
+++ b/external_imported/vcpkg/versions/x-/xlsxio.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fd38fc13e5e2b58d149261e8d692e1df7f93b88a",
+      "version": "0.2.34",
+      "port-version": 0
+    },
     {
       "git-tree": "6b4eb1ccf9e863a9291e03521af9ff4d62f5eb3d",
       "version-date": "2021-03-24",
diff --git a/external_imported/vcpkg/versions/x-/xmlsec.json b/external_imported/vcpkg/versions/x-/xmlsec.json
index cf6edc82a..d52bf06ce 100644
--- a/external_imported/vcpkg/versions/x-/xmlsec.json
+++ b/external_imported/vcpkg/versions/x-/xmlsec.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "66d4ee9a9a576f6af80a2b830becab2f6ee7beb7",
+      "version": "1.3.1",
+      "port-version": 2
+    },
+    {
+      "git-tree": "9152aec5099de6e629c31adc81bd07fc6f87607e",
+      "version": "1.3.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "3ca82fa3b389ead91f8abe51fb628fc1959cf29b",
+      "version": "1.3.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "716c1bdec11ab1f1053e76b14604a5d166484465",
+      "version": "1.2.37",
+      "port-version": 2
+    },
+    {
+      "git-tree": "19b8aab695c131f0dcbb7498f0d6a10517d01b70",
+      "version": "1.2.37",
+      "port-version": 1
+    },
+    {
+      "git-tree": "90c79a327b276a7cb1f9eb3e76020cd7483e4899",
+      "version": "1.2.37",
+      "port-version": 0
+    },
     {
       "git-tree": "3b3111c9880e6e3737f334dc37432a121a3220ef",
       "version": "1.2.36",
diff --git a/external_imported/vcpkg/versions/x-/xnnpack.json b/external_imported/vcpkg/versions/x-/xnnpack.json
index 3e228b608..21835a86e 100644
--- a/external_imported/vcpkg/versions/x-/xnnpack.json
+++ b/external_imported/vcpkg/versions/x-/xnnpack.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7a84132ceac551e5ba3da8117fdc23f4f1571fd2",
+      "version-date": "2022-12-22",
+      "port-version": 0
+    },
     {
       "git-tree": "439631254e564280e520c848b6b16e259c79b422",
       "version-date": "2022-02-17",
diff --git a/external_imported/vcpkg/versions/x-/xpack.json b/external_imported/vcpkg/versions/x-/xpack.json
index b87511faf..432728c90 100644
--- a/external_imported/vcpkg/versions/x-/xpack.json
+++ b/external_imported/vcpkg/versions/x-/xpack.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "05f0ea1a83e35833ccf855d9cb507ab1c9a99a0b",
+      "version": "1.0.5",
+      "port-version": 0
+    },
     {
       "git-tree": "5123943d7e13cfac8d5a58f7fe3cf027275e5bee",
       "version-date": "2023-02-06",
diff --git a/external_imported/vcpkg/versions/x-/xproperty.json b/external_imported/vcpkg/versions/x-/xproperty.json
index 95e4bae55..dd3d8fddd 100644
--- a/external_imported/vcpkg/versions/x-/xproperty.json
+++ b/external_imported/vcpkg/versions/x-/xproperty.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "237cd26cda6bc5f75e9dd2d75e5a65725512065d",
+      "version": "0.8.1",
+      "port-version": 3
+    },
     {
       "git-tree": "efc510fa8cbd77c3effc463f019d8b7520d5c29b",
       "version-string": "0.8.1",
diff --git a/external_imported/vcpkg/versions/x-/xqilla.json b/external_imported/vcpkg/versions/x-/xqilla.json
index edca35147..36e81f327 100644
--- a/external_imported/vcpkg/versions/x-/xqilla.json
+++ b/external_imported/vcpkg/versions/x-/xqilla.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1e825e06e975c55c3a0811107d2488b32b1f600b",
+      "version": "2.3.4",
+      "port-version": 2
+    },
     {
       "git-tree": "110b08065d892a635f1a8f2dd76f42727788020f",
       "version": "2.3.4",
diff --git a/external_imported/vcpkg/versions/x-/xsimd.json b/external_imported/vcpkg/versions/x-/xsimd.json
index 9059dbc12..249fe757f 100644
--- a/external_imported/vcpkg/versions/x-/xsimd.json
+++ b/external_imported/vcpkg/versions/x-/xsimd.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "3e979cb9a0721fa813065c5783d604bac193f6c6",
+      "version": "12.0.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "55021644d976597e734aa0e9b678f369625b14c1",
+      "version": "11.1.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "0c67f06803f30a45e0dc0db77378869d4c3067a0",
+      "version": "10.0.0",
+      "port-version": 0
+    },
     {
       "git-tree": "be6cd49ae57f84d0d66692b388c2ee0ce25cd0e0",
       "version": "9.0.1",
diff --git a/external_imported/vcpkg/versions/x-/xtensor-fftw.json b/external_imported/vcpkg/versions/x-/xtensor-fftw.json
index 2624bdbcf..dbaf99685 100644
--- a/external_imported/vcpkg/versions/x-/xtensor-fftw.json
+++ b/external_imported/vcpkg/versions/x-/xtensor-fftw.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8f535672e2935cbbf33bd2a3f332d3a100cf6a4a",
+      "version-date": "2019-11-30",
+      "port-version": 4
+    },
     {
       "git-tree": "b0593649089167c5e7e5e8da3d48dc20bbb0e366",
       "version-string": "2019-11-30",
diff --git a/external_imported/vcpkg/versions/x-/xtensor.json b/external_imported/vcpkg/versions/x-/xtensor.json
index 8871db52b..5286df11c 100644
--- a/external_imported/vcpkg/versions/x-/xtensor.json
+++ b/external_imported/vcpkg/versions/x-/xtensor.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "4f8e8bf52ae7f55b38fabb98423beafc361cff28",
+      "version": "0.25.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "1f097c22efd106eadd130143bbe0ea4ce0355959",
+      "version": "0.24.7",
+      "port-version": 0
+    },
+    {
+      "git-tree": "3243d2557778b77adbd7b2dbc83ade2456e8fe5c",
+      "version": "0.24.6",
+      "port-version": 1
+    },
+    {
+      "git-tree": "aeb0efc2bdf326191f5dff18bb2506690902b162",
+      "version": "0.24.6",
+      "port-version": 0
+    },
     {
       "git-tree": "474191556a342fc77b9defef9ba63a4dcf2205c4",
       "version": "0.24.3",
diff --git a/external_imported/vcpkg/versions/x-/xtl.json b/external_imported/vcpkg/versions/x-/xtl.json
index 06d85fb16..978bdc9b9 100644
--- a/external_imported/vcpkg/versions/x-/xtl.json
+++ b/external_imported/vcpkg/versions/x-/xtl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f5cad9625b1b7459135265c4f8647b2bcae0e252",
+      "version": "0.7.5",
+      "port-version": 0
+    },
     {
       "git-tree": "8255a333f114b449c2578ec70e91970eace40598",
       "version": "0.7.2",
diff --git a/external_imported/vcpkg/versions/x-/xxhash.json b/external_imported/vcpkg/versions/x-/xxhash.json
index bd93be72c..02495ae74 100644
--- a/external_imported/vcpkg/versions/x-/xxhash.json
+++ b/external_imported/vcpkg/versions/x-/xxhash.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "4ebfe9c5b439ecc2f91beb32e6dbb7549dff29e4",
+      "version": "0.8.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8c45988bd467674cb21961646a9379645a235ba5",
+      "version": "0.8.1",
+      "port-version": 2
+    },
     {
       "git-tree": "895a0039b3cd40c7f66725608d07dc851e0d54b6",
       "version": "0.8.1",
diff --git a/external_imported/vcpkg/versions/y-/yajl.json b/external_imported/vcpkg/versions/y-/yajl.json
index a6494c169..74831ee23 100644
--- a/external_imported/vcpkg/versions/y-/yajl.json
+++ b/external_imported/vcpkg/versions/y-/yajl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3f4f50d7448d28c577777c09895a93847124e1d3",
+      "version": "2.1.0",
+      "port-version": 4
+    },
     {
       "git-tree": "348d0cb4e70b0db911dbd9e014d69164eb53cec4",
       "version-string": "2.1.0",
diff --git a/external_imported/vcpkg/versions/y-/yaml-cpp.json b/external_imported/vcpkg/versions/y-/yaml-cpp.json
index 8d7170546..7db95699a 100644
--- a/external_imported/vcpkg/versions/y-/yaml-cpp.json
+++ b/external_imported/vcpkg/versions/y-/yaml-cpp.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "eb1a38369faa80d2af500df32ef6d4a747336dcb",
+      "version-semver": "0.8.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "595f95f94e93c518b99e8c0e83ef35ced9e7867a",
+      "version-semver": "0.8.0",
+      "port-version": 0
+    },
     {
       "git-tree": "a79d9c026aefee69214dbd39294da49398b07c7b",
       "version-semver": "0.7.0",
diff --git a/external_imported/vcpkg/versions/y-/yara.json b/external_imported/vcpkg/versions/y-/yara.json
index e10d3ead5..ea69bcac5 100644
--- a/external_imported/vcpkg/versions/y-/yara.json
+++ b/external_imported/vcpkg/versions/y-/yara.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "f5f938703b1025e041b7ad9eb9ab28f954e39e57",
+      "version": "4.3.2",
+      "port-version": 1
+    },
+    {
+      "git-tree": "993e6ee9f366ecd84f0636ae4f7de293293a9068",
+      "version": "4.3.2",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4deddff9f05a4c7f2fc13b77da1717b50d25072a",
+      "version": "4.3.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "33fe4f18e0ce42f7ff01fde67f188eed7d74616e",
+      "version": "4.3.0",
+      "port-version": 0
+    },
     {
       "git-tree": "0551c4f9ac51859d9063f6482ff44acf3d7bfa2a",
       "version": "4.2.3",
diff --git a/external_imported/vcpkg/versions/y-/yoga.json b/external_imported/vcpkg/versions/y-/yoga.json
index dd038778e..a8dccaa40 100644
--- a/external_imported/vcpkg/versions/y-/yoga.json
+++ b/external_imported/vcpkg/versions/y-/yoga.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "a388f93a28c77a78787ec7456af92ef63d8f80a2",
+      "version": "2.0.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "e3693a2905113d25a725c3319740f069a37c60d7",
+      "version": "2.0.0",
+      "port-version": 0
+    },
     {
       "git-tree": "ddb16110f2f26fdbb40992c2c5308aaae1e00462",
       "version": "1.19.0+20230215",
diff --git a/external_imported/vcpkg/versions/y-/yomm2.json b/external_imported/vcpkg/versions/y-/yomm2.json
index 5bcc69e8e..b520e9609 100644
--- a/external_imported/vcpkg/versions/y-/yomm2.json
+++ b/external_imported/vcpkg/versions/y-/yomm2.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "7fb081bdba7637ab5c5bc26d1dfb2a80a1fd1303",
+      "version": "1.4.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "eb04c5f671a8ba74f8f98bb4c1b53716336ce441",
+      "version": "1.4.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9b2200dcba64aecc83b9009b7d8f1ccb383003c8",
+      "version": "1.3.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "8bd8a2b21272e70a16c55b55215a7b5f6bd295d3",
+      "version": "1.1.2",
+      "port-version": 2
+    },
     {
       "git-tree": "883f87feff25739b1922362bcc35438d86a6454d",
       "version-string": "1.1.2",
diff --git a/external_imported/vcpkg/versions/y-/yyjson.json b/external_imported/vcpkg/versions/y-/yyjson.json
index b3de3eae5..6bdb82399 100644
--- a/external_imported/vcpkg/versions/y-/yyjson.json
+++ b/external_imported/vcpkg/versions/y-/yyjson.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "23f8cd0e06d0c615ea534c70316b3f55a696912a",
+      "version": "0.8.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "658e0c2de9549d6330f76f33992a45e110bfcb74",
+      "version": "0.6.0",
+      "port-version": 1
+    },
     {
       "git-tree": "959e0191dd4850c8915d57c1ffeccfaf983e0616",
       "version": "0.6.0",
diff --git a/external_imported/vcpkg/versions/z-/z3.json b/external_imported/vcpkg/versions/z-/z3.json
index a1cca9f3b..52f75f2fa 100644
--- a/external_imported/vcpkg/versions/z-/z3.json
+++ b/external_imported/vcpkg/versions/z-/z3.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "294ec73e2b15fd55e0ac922bcaffad517366dbba",
+      "version": "4.12.5",
+      "port-version": 0
+    },
+    {
+      "git-tree": "98aa7c18e339247b197bab014d1a52310ba39a7a",
+      "version": "4.12.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "dcef04d626f19434eaf9d2a3afb43d927bbd372e",
+      "version": "4.12.2",
+      "port-version": 0
+    },
     {
       "git-tree": "4c57981e593026824fe9bedff234a82c13765e29",
       "version": "4.11.0",
diff --git a/external_imported/vcpkg/versions/z-/z85.json b/external_imported/vcpkg/versions/z-/z85.json
index 1301a3972..e5f3b0ec2 100644
--- a/external_imported/vcpkg/versions/z-/z85.json
+++ b/external_imported/vcpkg/versions/z-/z85.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b74a8c81b9118c04732c5e0c0f15714fc19ca73c",
+      "version": "1.0",
+      "port-version": 2
+    },
     {
       "git-tree": "eb7115fc8b2a5c84c958196521ec5f6c5f502ca6",
       "version-string": "1.0",
diff --git a/external_imported/vcpkg/versions/z-/zeroc-ice.json b/external_imported/vcpkg/versions/z-/zeroc-ice.json
index bd2bd4d33..5988b40ca 100644
--- a/external_imported/vcpkg/versions/z-/zeroc-ice.json
+++ b/external_imported/vcpkg/versions/z-/zeroc-ice.json
@@ -1,5 +1,35 @@
 {
   "versions": [
+    {
+      "git-tree": "9048b568a7f81f0a8788c6dd8b0215cb1cd300eb",
+      "version": "3.7.9",
+      "port-version": 4
+    },
+    {
+      "git-tree": "45f338a327c4b8ea7eb16fc81e650cd0f999449c",
+      "version": "3.7.9",
+      "port-version": 3
+    },
+    {
+      "git-tree": "dc07eee81cdf5c66efc83d606c635e722ef23d39",
+      "version": "3.7.9",
+      "port-version": 2
+    },
+    {
+      "git-tree": "bb449d6446b3700170a831c0b155d58be3613a26",
+      "version": "3.7.9",
+      "port-version": 1
+    },
+    {
+      "git-tree": "aba63efeb29d2249b285f6188b44fde25dbff9d3",
+      "version": "3.7.9",
+      "port-version": 0
+    },
+    {
+      "git-tree": "2ec016c70ea82b2ddb340c6c809aece865c7c2ce",
+      "version": "3.7.7",
+      "port-version": 4
+    },
     {
       "git-tree": "e57483820c975a5418fcd98645c7d1315dd8bced",
       "version": "3.7.7",
diff --git a/external_imported/vcpkg/versions/z-/zeromq.json b/external_imported/vcpkg/versions/z-/zeromq.json
index e74b41ab4..3f898f2fe 100644
--- a/external_imported/vcpkg/versions/z-/zeromq.json
+++ b/external_imported/vcpkg/versions/z-/zeromq.json
@@ -1,5 +1,50 @@
 {
   "versions": [
+    {
+      "git-tree": "3ac6a3ee94fb7235dc37fc7042e8270060c685c1",
+      "version": "4.3.5",
+      "port-version": 1
+    },
+    {
+      "git-tree": "7c31f33a815e20807d89d684435dcab872c37d2a",
+      "version": "4.3.5",
+      "port-version": 0
+    },
+    {
+      "git-tree": "6f361429d0511b651b4f7b98f0dc47adf2601843",
+      "version-date": "2023-06-20",
+      "port-version": 1
+    },
+    {
+      "git-tree": "3deda40ff74bb4d77071cefabd7d889589452425",
+      "version-date": "2023-06-20",
+      "port-version": 0
+    },
+    {
+      "git-tree": "910e9e92155a96a07837641615e3356c98edec9a",
+      "version-date": "2023-01-31",
+      "port-version": 5
+    },
+    {
+      "git-tree": "487c1669ab781a8adfa16097f1c7142165f5debf",
+      "version-date": "2023-01-31",
+      "port-version": 4
+    },
+    {
+      "git-tree": "3cbcf46fa4e8e9bdd5c586a15b9d4549497d8d6e",
+      "version-date": "2023-01-31",
+      "port-version": 3
+    },
+    {
+      "git-tree": "3926aa389f1ff91b3895fd51c502600effe6c4f2",
+      "version-date": "2023-01-31",
+      "port-version": 2
+    },
+    {
+      "git-tree": "faad6e9fea08c6740bc27652b7d3df33ee693a41",
+      "version-date": "2023-01-31",
+      "port-version": 1
+    },
     {
       "git-tree": "ea8e483d88e81e7472323575f5bfe28c6fc74e2e",
       "version-date": "2023-01-31",
diff --git a/external_imported/vcpkg/versions/z-/zimpl.json b/external_imported/vcpkg/versions/z-/zimpl.json
new file mode 100644
index 000000000..a9a926998
--- /dev/null
+++ b/external_imported/vcpkg/versions/z-/zimpl.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "6598ebbe8c537c546a9cc0d71c8fd9e0a4dd6b94",
+      "version": "3.5.3",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/z-/zlib-ng.json b/external_imported/vcpkg/versions/z-/zlib-ng.json
index d69c235c4..f1c5cef7b 100644
--- a/external_imported/vcpkg/versions/z-/zlib-ng.json
+++ b/external_imported/vcpkg/versions/z-/zlib-ng.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "e612211a2cf602a9a95796202f9cba452c6f5ebc",
+      "version": "2.1.5",
+      "port-version": 0
+    },
+    {
+      "git-tree": "f05a7ce2c95cfcf4720d911a72dc3b60b46eb1c9",
+      "version": "2.1.4",
+      "port-version": 0
+    },
+    {
+      "git-tree": "48a2a573758db5e1b96e889043fffaf453fa9cf4",
+      "version": "2.1.3",
+      "port-version": 1
+    },
+    {
+      "git-tree": "b5618019c0972a9e8bb9422609352679cf248f85",
+      "version": "2.1.3",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ea181bc5e9362185c5d5d85d23bbb15267c82cdb",
+      "version": "2.0.7",
+      "port-version": 0
+    },
     {
       "git-tree": "60e9a6f12ede4c5e87d2b3077c25e83991a02eea",
       "version": "2.0.6",
diff --git a/external_imported/vcpkg/versions/z-/zlib.json b/external_imported/vcpkg/versions/z-/zlib.json
index 9528646a6..a994f3607 100644
--- a/external_imported/vcpkg/versions/z-/zlib.json
+++ b/external_imported/vcpkg/versions/z-/zlib.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "3f05e04b9aededb96786a911a16193cdb711f0c9",
+      "version": "1.3.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "5ac18c6e6e3e2bf5a9e3d0bc8a845f198e4c4e05",
+      "version": "1.3",
+      "port-version": 0
+    },
     {
       "git-tree": "ad5a49006f73b45b715299515f31164131b51982",
       "version": "1.2.13",
diff --git a/external_imported/vcpkg/versions/z-/zlmediakit.json b/external_imported/vcpkg/versions/z-/zlmediakit.json
new file mode 100644
index 000000000..3b0f1c774
--- /dev/null
+++ b/external_imported/vcpkg/versions/z-/zlmediakit.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "d93e0b2a7502f835d4f23ba0fb2b3e5e8537aaec",
+      "version-date": "2023-08-12",
+      "port-version": 0
+    },
+    {
+      "git-tree": "df1d3b48288f3bed8699e277e3211542867c6959",
+      "version-date": "2023-08-08",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/z-/zoe.json b/external_imported/vcpkg/versions/z-/zoe.json
new file mode 100644
index 000000000..162359527
--- /dev/null
+++ b/external_imported/vcpkg/versions/z-/zoe.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "ef2391f6da7efe52725293a360d2d5f1611cf5d5",
+      "version": "3.0",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/z-/zookeeper.json b/external_imported/vcpkg/versions/z-/zookeeper.json
index 61432ca7d..3321d301e 100644
--- a/external_imported/vcpkg/versions/z-/zookeeper.json
+++ b/external_imported/vcpkg/versions/z-/zookeeper.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "cddd556547f1e8fef18c115b551f0ba9b5428def",
+      "version": "3.5.6",
+      "port-version": 1
+    },
     {
       "git-tree": "2ad08d6a8c4d4f812c50c02872d046c84dd4ccbc",
       "version": "3.5.6",
diff --git a/external_imported/vcpkg/versions/z-/zpp-bits.json b/external_imported/vcpkg/versions/z-/zpp-bits.json
index 155644b4c..92911980a 100644
--- a/external_imported/vcpkg/versions/z-/zpp-bits.json
+++ b/external_imported/vcpkg/versions/z-/zpp-bits.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2068c0855edbc51965c9001fb5af8d45e5115f26",
+      "version": "4.4.17",
+      "port-version": 0
+    },
     {
       "git-tree": "f1497476711852911f21a84e80c76a30530c98c7",
       "version": "4.4.13",
diff --git a/external_imported/vcpkg/versions/z-/zserge-webview.json b/external_imported/vcpkg/versions/z-/zserge-webview.json
index 6d2c4538a..c9537d07c 100644
--- a/external_imported/vcpkg/versions/z-/zserge-webview.json
+++ b/external_imported/vcpkg/versions/z-/zserge-webview.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7d184b0d8540c194ab3013884180efd8dfdc39d4",
+      "version-date": "2023-04-15",
+      "port-version": 0
+    },
     {
       "git-tree": "173fd4ea0d862f8cca595a8726fe7e0ef6444d45",
       "version-date": "2022-09-07",
diff --git a/external_imported/vcpkg/versions/z-/zstd.json b/external_imported/vcpkg/versions/z-/zstd.json
index 433e9ec15..42b93ffcb 100644
--- a/external_imported/vcpkg/versions/z-/zstd.json
+++ b/external_imported/vcpkg/versions/z-/zstd.json
@@ -1,5 +1,25 @@
 {
   "versions": [
+    {
+      "git-tree": "259dc461801ecb946995e13fd3d94b1381d02441",
+      "version": "1.5.5",
+      "port-version": 2
+    },
+    {
+      "git-tree": "44fdd2e1576b62ee75cdaab5ce74452ed08f84ce",
+      "version": "1.5.5",
+      "port-version": 1
+    },
+    {
+      "git-tree": "2a6d14da5f876e43859950a12a330f8b03cdc327",
+      "version": "1.5.5",
+      "port-version": 0
+    },
+    {
+      "git-tree": "fcc4fe2738d903bc347d20d2d4c836699e273509",
+      "version": "1.5.4",
+      "port-version": 2
+    },
     {
       "git-tree": "4b61cbe1e314aa678d7cbf37a24b59e37694f4a6",
       "version": "1.5.4",
diff --git a/external_imported/vcpkg/versions/z-/ztd-cuneicode.json b/external_imported/vcpkg/versions/z-/ztd-cuneicode.json
new file mode 100644
index 000000000..57913fa28
--- /dev/null
+++ b/external_imported/vcpkg/versions/z-/ztd-cuneicode.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "2730f0379c0ef98a286d57784b01649d5bb59d52",
+      "version-date": "2023-11-03",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/z-/ztd-encoding-tables.json b/external_imported/vcpkg/versions/z-/ztd-encoding-tables.json
new file mode 100644
index 000000000..9d27ea8f9
--- /dev/null
+++ b/external_imported/vcpkg/versions/z-/ztd-encoding-tables.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "e215ca14e25c6f458c76eb73e4de83eaea7aba57",
+      "version-date": "2023-06-10",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/z-/ztd-idk.json b/external_imported/vcpkg/versions/z-/ztd-idk.json
new file mode 100644
index 000000000..45584467a
--- /dev/null
+++ b/external_imported/vcpkg/versions/z-/ztd-idk.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "c79037b1bd68d612fdf0810c619361a715e37f4a",
+      "version-date": "2023-11-03",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/z-/ztd-platform.json b/external_imported/vcpkg/versions/z-/ztd-platform.json
new file mode 100644
index 000000000..8203b9ab4
--- /dev/null
+++ b/external_imported/vcpkg/versions/z-/ztd-platform.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "7211ea7b21e73ba018f6863d7d84db1545ecb63c",
+      "version-date": "2022-12-30",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/z-/ztd-static-containers.json b/external_imported/vcpkg/versions/z-/ztd-static-containers.json
new file mode 100644
index 000000000..db16f2dd9
--- /dev/null
+++ b/external_imported/vcpkg/versions/z-/ztd-static-containers.json
@@ -0,0 +1,14 @@
+{
+  "versions": [
+    {
+      "git-tree": "9178972642436ec0fdba9274b7107314d09df794",
+      "version-date": "2022-12-12",
+      "port-version": 1
+    },
+    {
+      "git-tree": "7df39e58c9b30ecd92335e2d3a49a8a793e8c956",
+      "version-date": "2022-12-12",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/external_imported/vcpkg/versions/z-/ztd-text.json b/external_imported/vcpkg/versions/z-/ztd-text.json
index 11d2b3dc2..af5e5b0ec 100644
--- a/external_imported/vcpkg/versions/z-/ztd-text.json
+++ b/external_imported/vcpkg/versions/z-/ztd-text.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e9d678e835ff88ff81c3fb1e6273d247f1ec33bd",
+      "version-date": "2023-11-03",
+      "port-version": 0
+    },
     {
       "git-tree": "594b7d2a437b6576bfd4993e9763cac18621e903",
       "version-date": "2022-03-21",
diff --git a/external_imported/vcpkg/versions/z-/zydis.json b/external_imported/vcpkg/versions/z-/zydis.json
index e73ace138..60a5fe1bf 100644
--- a/external_imported/vcpkg/versions/z-/zydis.json
+++ b/external_imported/vcpkg/versions/z-/zydis.json
@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "4057692f573c3990f5767e5e2952fc54a76cb1c9",
+      "version-semver": "4.0.0",
+      "port-version": 2
+    },
+    {
+      "git-tree": "743422a6b31df7e852fdc96cc14fe95a3f8a8136",
+      "version-semver": "4.0.0",
+      "port-version": 1
+    },
+    {
+      "git-tree": "3e5b3e4b01d2ff55d68c2f591d0dd523224844c5",
+      "version-semver": "4.0.0",
+      "port-version": 0
+    },
     {
       "git-tree": "88c0a32f293fa4ee48ce2fa89369c9fdceff200f",
       "version-semver": "3.2.1",
diff --git a/external_imported/vcpkg/versions/z-/zyre.json b/external_imported/vcpkg/versions/z-/zyre.json
index b9afab402..9f1bbeb1e 100644
--- a/external_imported/vcpkg/versions/z-/zyre.json
+++ b/external_imported/vcpkg/versions/z-/zyre.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f1d72fc5e7b5c99dcc352a92aa5850fe28a6ac44",
+      "version-date": "2019-07-07",
+      "port-version": 5
+    },
     {
       "git-tree": "7f6439c85ad5a70e10b42f4d4a6f34bc97a3b7fd",
       "version-string": "2019-07-07",